From 529e5d9b86d018d8bd8ba9e22c1abeabdaf2526e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Wed, 21 Oct 2020 19:05:52 +0200
Subject: [PATCH 0001/1194] Implements pallet versioning (#7208)

* Start

* Make macro work

* Rename `ModuleToIndex` to `PalletRuntimeSetup`

Besides the renaming it also adds support getting the name of a pallet
as configured in the runtime.

* Rename it to `PalletInfo`

* Remove accidentally added files

* Some work

* Make everything compile

* Adds a test and fixes some bugs

* Implement ordering for `PalletVersion`

* Apply suggestions from code review

* Review feedback

* Update frame/support/src/dispatch.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Update frame/support/src/dispatch.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Fix compilation

* Fix test

* Fix doc test

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>
Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
---
 frame/support/procedural/src/lib.rs           |   6 +
 .../support/procedural/src/pallet_version.rs  |  64 +++++++
 frame/support/src/dispatch.rs                 |  80 ++++++--
 frame/support/src/event.rs                    |  71 +++----
 frame/support/src/lib.rs                      |  23 ++-
 frame/support/src/metadata.rs                 |  27 +--
 .../src/storage/generator/double_map.rs       |   6 +-
 frame/support/src/storage/generator/map.rs    |   6 +-
 frame/support/src/storage/generator/mod.rs    |  11 +-
 frame/support/src/traits.rs                   | 106 ++++++++++-
 frame/support/src/weights.rs                  |   6 +-
 frame/support/test/src/lib.rs                 |  13 +-
 frame/support/test/src/pallet_version.rs      |  32 ++++
 frame/support/test/tests/construct_runtime.rs |   1 +
 frame/support/test/tests/decl_storage.rs      |  58 +++---
 .../tests/decl_storage_ui/config_duplicate.rs |   7 +-
 .../decl_storage_ui/config_duplicate.stderr   |   4 +-
 .../decl_storage_ui/config_get_duplicate.rs   |   7 +-
 .../config_get_duplicate.stderr               |   4 +-
 .../tests/decl_storage_ui/get_duplicate.rs    |   7 +-
 .../decl_storage_ui/get_duplicate.stderr      |   4 +-
 frame/support/test/tests/final_keys.rs        |  15 +-
 frame/support/test/tests/genesisconfig.rs     |  13 +-
 frame/support/test/tests/instance.rs          |   1 +
 frame/support/test/tests/issue2219.rs         |   1 +
 frame/support/test/tests/pallet_version.rs    | 175 ++++++++++++++++++
 .../tests/reserved_keyword/on_initialize.rs   |   7 +-
 .../reserved_keyword/on_initialize.stderr     |  20 +-
 .../support/test/tests/storage_transaction.rs |  21 +--
 frame/support/test/tests/system.rs            |   5 +-
 30 files changed, 640 insertions(+), 161 deletions(-)
 create mode 100644 frame/support/procedural/src/pallet_version.rs
 create mode 100644 frame/support/test/src/pallet_version.rs
 create mode 100644 frame/support/test/tests/pallet_version.rs

diff --git a/frame/support/procedural/src/lib.rs b/frame/support/procedural/src/lib.rs
index 009e02f3c265..a6fb58846cba 100644
--- a/frame/support/procedural/src/lib.rs
+++ b/frame/support/procedural/src/lib.rs
@@ -21,6 +21,7 @@
 
 mod storage;
 mod construct_runtime;
+mod pallet_version;
 mod transactional;
 mod debug_no_bound;
 mod clone_no_bound;
@@ -402,3 +403,8 @@ pub fn derive_eq_no_bound(input: TokenStream) -> TokenStream {
 pub fn require_transactional(attr: TokenStream, input: TokenStream) -> TokenStream {
 	transactional::require_transactional(attr, input).unwrap_or_else(|e| e.to_compile_error().into())
 }
+
+#[proc_macro]
+pub fn crate_to_pallet_version(input: TokenStream) -> TokenStream {
+	pallet_version::crate_to_pallet_version(input).unwrap_or_else(|e| e.to_compile_error()).into()
+}
diff --git a/frame/support/procedural/src/pallet_version.rs b/frame/support/procedural/src/pallet_version.rs
new file mode 100644
index 000000000000..ffd4b41208d5
--- /dev/null
+++ b/frame/support/procedural/src/pallet_version.rs
@@ -0,0 +1,64 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Implementation of macros related to pallet versioning.
+
+use proc_macro2::{TokenStream, Span};
+use syn::{Result, Error};
+use std::{env, str::FromStr};
+use frame_support_procedural_tools::generate_crate_access_2018;
+
+/// Get the version from the given version environment variable.
+///
+/// The version is parsed into the requested destination type.
+fn get_version<T: FromStr>(version_env: &str) -> std::result::Result<T, ()> {
+	let version = env::var(version_env)
+		.expect(&format!("`{}` is always set by cargo; qed", version_env));
+
+	T::from_str(&version).map_err(drop)
+}
+
+/// Create an error that will be shown by rustc at the call site of the macro.
+fn create_error(message: &str) -> Error {
+	Error::new(Span::call_site(), message)
+}
+
+/// Implementation of the `crate_to_pallet_version!` macro.
+pub fn crate_to_pallet_version(input: proc_macro::TokenStream) -> Result<TokenStream> {
+	if !input.is_empty() {
+		return Err(create_error("No arguments expected!"))
+	}
+
+	let major_version = get_version::<u16>("CARGO_PKG_VERSION_MAJOR")
+		.map_err(|_| create_error("Major version needs to fit into `u16`"))?;
+
+	let minor_version = get_version::<u8>("CARGO_PKG_VERSION_MINOR")
+		.map_err(|_| create_error("Minor version needs to fit into `u8`"))?;
+
+	let patch_version = get_version::<u8>("CARGO_PKG_VERSION_PATCH")
+		.map_err(|_| create_error("Patch version needs to fit into `u8`"))?;
+
+	let crate_ = generate_crate_access_2018()?;
+
+	Ok(quote::quote! {
+		#crate_::traits::PalletVersion {
+			major: #major_version,
+			minor: #minor_version,
+			patch: #patch_version,
+		}
+	})
+}
diff --git a/frame/support/src/dispatch.rs b/frame/support/src/dispatch.rs
index 057bba6b8f74..b96d6194ebff 100644
--- a/frame/support/src/dispatch.rs
+++ b/frame/support/src/dispatch.rs
@@ -29,7 +29,9 @@ pub use crate::weights::{
 	PaysFee, PostDispatchInfo, WithPostDispatchInfo,
 };
 pub use sp_runtime::{traits::Dispatchable, DispatchError};
-pub use crate::traits::{CallMetadata, GetCallMetadata, GetCallName, UnfilteredDispatchable};
+pub use crate::traits::{
+	CallMetadata, GetCallMetadata, GetCallName, UnfilteredDispatchable, GetPalletVersion,
+};
 
 /// The return typ of a `Dispatchable` in frame. When returned explicitly from
 /// a dispatchable function it allows overriding the default `PostDispatchInfo`
@@ -230,11 +232,11 @@ impl<T> Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 /// # #[macro_use]
 /// # extern crate frame_support;
 /// # use frame_support::dispatch;
-/// # use frame_system::{self as system, ensure_signed};
+/// # use frame_system::ensure_signed;
 /// # pub struct DefaultInstance;
-/// # pub trait Instance {}
+/// # pub trait Instance: 'static {}
 /// # impl Instance for DefaultInstance {}
-/// pub trait Trait<I: Instance=DefaultInstance>: system::Trait {}
+/// pub trait Trait<I: Instance=DefaultInstance>: frame_system::Trait {}
 ///
 /// decl_module! {
 /// 	pub struct Module<T: Trait<I>, I: Instance = DefaultInstance> for enum Call where origin: T::Origin {
@@ -1310,6 +1312,7 @@ macro_rules! decl_module {
 	};
 
 	(@impl_on_runtime_upgrade
+		{ $system:ident }
 		$module:ident<$trait_instance:ident: $trait_name:ident$(<I>, $instance:ident: $instantiable:path)?>;
 		{ $( $other_where_bounds:tt )* }
 		fn on_runtime_upgrade() -> $return:ty { $( $impl:tt )* }
@@ -1320,19 +1323,46 @@ macro_rules! decl_module {
 		{
 			fn on_runtime_upgrade() -> $return {
 				$crate::sp_tracing::enter_span!($crate::sp_tracing::trace_span!("on_runtime_upgrade"));
-				{ $( $impl )* }
+				let result: $return = (|| { $( $impl )* })();
+
+				let key = $crate::traits::PalletVersion::storage_key::<
+						<$trait_instance as $system::Trait>::PalletInfo, Self
+					>().expect("Every active pallet has a name in the runtime; qed");
+				let version = $crate::crate_to_pallet_version!();
+				$crate::storage::unhashed::put(&key, &version);
+
+				let additional_write = <
+					<$trait_instance as $system::Trait>::DbWeight as $crate::traits::Get<_>
+				>::get().writes(1);
+
+				result.saturating_add(additional_write)
 			}
 		}
 	};
 
 	(@impl_on_runtime_upgrade
+		{ $system:ident }
 		$module:ident<$trait_instance:ident: $trait_name:ident$(<I>, $instance:ident: $instantiable:path)?>;
 		{ $( $other_where_bounds:tt )* }
 	) => {
 		impl<$trait_instance: $trait_name$(<I>, $instance: $instantiable)?>
 			$crate::traits::OnRuntimeUpgrade
 			for $module<$trait_instance$(, $instance)?> where $( $other_where_bounds )*
-		{}
+		{
+			fn on_runtime_upgrade() -> $crate::dispatch::Weight {
+				$crate::sp_tracing::enter_span!($crate::sp_tracing::trace_span!("on_runtime_upgrade"));
+
+				let key = $crate::traits::PalletVersion::storage_key::<
+						<$trait_instance as $system::Trait>::PalletInfo, Self
+					>().expect("Every active pallet has a name in the runtime; qed");
+				let version = $crate::crate_to_pallet_version!();
+				$crate::storage::unhashed::put(&key, &version);
+
+				<
+					<$trait_instance as $system::Trait>::DbWeight as $crate::traits::Get<_>
+				>::get().writes(1)
+			}
+		}
 	};
 
 	(@impl_integrity_test
@@ -1652,6 +1682,7 @@ macro_rules! decl_module {
 
 		$crate::decl_module! {
 			@impl_on_runtime_upgrade
+			{ $system }
 			$mod_type<$trait_instance: $trait_name $(<I>, $instance: $instantiable)?>;
 			{ $( $other_where_bounds )* }
 			$( $on_runtime_upgrade )*
@@ -1787,6 +1818,25 @@ macro_rules! decl_module {
 			}
 		}
 
+		// Bring `GetPalletVersion` into scope to make it easily usable.
+		pub use $crate::traits::GetPalletVersion as _;
+		// Implement `GetPalletVersion` for `Module`
+		impl<$trait_instance: $trait_name $(<I>, $instance: $instantiable)?> $crate::traits::GetPalletVersion
+			for $mod_type<$trait_instance $(, $instance)?> where $( $other_where_bounds )*
+		{
+			fn current_version() -> $crate::traits::PalletVersion {
+				$crate::crate_to_pallet_version!()
+			}
+
+			fn storage_version() -> Option<$crate::traits::PalletVersion> {
+				let key = $crate::traits::PalletVersion::storage_key::<
+						<$trait_instance as $system::Trait>::PalletInfo, Self
+					>().expect("Every active pallet has a name in the runtime; qed");
+
+				$crate::storage::unhashed::get(&key)
+			}
+		}
+
 		// manual implementation of clone/eq/partialeq because using derive erroneously requires
 		// clone/eq/partialeq from T.
 		impl<$trait_instance: $trait_name $(<I>, $instance: $instantiable)?> $crate::dispatch::Clone
@@ -1802,6 +1852,7 @@ macro_rules! decl_module {
 				}
 			}
 		}
+
 		impl<$trait_instance: $trait_name $(<I>, $instance: $instantiable)?> $crate::dispatch::PartialEq
 			for $call_type<$trait_instance $(, $instance)?> where $( $other_where_bounds )*
 		{
@@ -1824,6 +1875,7 @@ macro_rules! decl_module {
 				}
 			}
 		}
+
 		impl<$trait_instance: $trait_name $(<I>, $instance: $instantiable)?> $crate::dispatch::Eq
 			for $call_type<$trait_instance $(, $instance)?> where $( $other_where_bounds )*
 		{}
@@ -2350,23 +2402,25 @@ macro_rules! __check_reserved_fn_name {
 #[allow(dead_code)]
 mod tests {
 	use super::*;
-	use crate::weights::{DispatchInfo, DispatchClass, Pays};
+	use crate::weights::{DispatchInfo, DispatchClass, Pays, RuntimeDbWeight};
 	use crate::traits::{
 		CallMetadata, GetCallMetadata, GetCallName, OnInitialize, OnFinalize, OnRuntimeUpgrade,
-		IntegrityTest,
+		IntegrityTest, Get,
 	};
 
 	pub trait Trait: system::Trait + Sized where Self::AccountId: From<u32> { }
 
 	pub mod system {
-		use codec::{Encode, Decode};
+		use super::*;
 
-		pub trait Trait {
+		pub trait Trait: 'static {
 			type AccountId;
 			type Call;
 			type BaseCallFilter;
 			type Origin: crate::traits::OriginTrait<Call = Self::Call>;
 			type BlockNumber: Into<u32>;
+			type PalletInfo: crate::traits::PalletInfo;
+			type DbWeight: Get<RuntimeDbWeight>;
 		}
 
 		#[derive(Clone, PartialEq, Eq, Debug, Encode, Decode)]
@@ -2510,6 +2564,8 @@ mod tests {
 		type Call = OuterCall;
 		type BaseCallFilter = ();
 		type BlockNumber = u32;
+		type PalletInfo = ();
+		type DbWeight = ();
 	}
 
 	#[test]
@@ -2565,7 +2621,9 @@ mod tests {
 
 	#[test]
 	fn on_runtime_upgrade_should_work() {
-		assert_eq!(<Module<TraitImpl> as OnRuntimeUpgrade>::on_runtime_upgrade(), 10);
+		sp_io::TestExternalities::default().execute_with(||
+			assert_eq!(<Module<TraitImpl> as OnRuntimeUpgrade>::on_runtime_upgrade(), 10)
+		);
 	}
 
 	#[test]
diff --git a/frame/support/src/event.rs b/frame/support/src/event.rs
index 0f889f97f40a..3538748c30fa 100644
--- a/frame/support/src/event.rs
+++ b/frame/support/src/event.rs
@@ -551,13 +551,15 @@ mod tests {
 	use codec::{Encode, Decode};
 
 	mod system {
-		pub trait Trait {
+		pub trait Trait: 'static {
 			type Origin;
 			type BlockNumber;
+			type PalletInfo: crate::traits::PalletInfo;
+			type DbWeight: crate::traits::Get<crate::weights::RuntimeDbWeight>;
 		}
 
 		decl_module! {
-			pub struct Module<T: Trait> for enum Call where origin: T::Origin {}
+			pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {}
 		}
 
 		decl_event!(
@@ -568,13 +570,15 @@ mod tests {
 	}
 
 	mod system_renamed {
-		pub trait Trait {
+		pub trait Trait: 'static {
 			type Origin;
 			type BlockNumber;
+			type PalletInfo: crate::traits::PalletInfo;
+			type DbWeight: crate::traits::Get<crate::weights::RuntimeDbWeight>;
 		}
 
 		decl_module! {
-			pub struct Module<T: Trait> for enum Call where origin: T::Origin {}
+			pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {}
 		}
 
 		decl_event!(
@@ -585,19 +589,19 @@ mod tests {
 	}
 
 	mod event_module {
-		pub trait Trait {
-			type Origin;
+		use super::system;
+
+		pub trait Trait: system::Trait {
 			type Balance;
-			type BlockNumber;
 		}
 
 		decl_module! {
-			pub struct Module<T: Trait> for enum Call where origin: T::Origin {}
+			pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=system {}
 		}
 
 		decl_event!(
 			/// Event without renaming the generic parameter `Balance` and `Origin`.
-			pub enum Event<T> where <T as Trait>::Balance, <T as Trait>::Origin
+			pub enum Event<T> where <T as Trait>::Balance, <T as system::Trait>::Origin
 			{
 				/// Hi, I am a comment.
 				TestEvent(Balance, Origin),
@@ -608,21 +612,21 @@ mod tests {
 	}
 
 	mod event_module2 {
-		pub trait Trait {
-			type Origin;
+		use super::system;
+
+		pub trait Trait: system::Trait {
 			type Balance;
-			type BlockNumber;
 		}
 
 		decl_module! {
-			pub struct Module<T: Trait> for enum Call where origin: T::Origin {}
+			pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=system {}
 		}
 
 		decl_event!(
 			/// Event with renamed generic parameter
 			pub enum Event<T> where
 				BalanceRenamed = <T as Trait>::Balance,
-				OriginRenamed = <T as Trait>::Origin
+				OriginRenamed = <T as system::Trait>::Origin
 			{
 				TestEvent(BalanceRenamed),
 				TestOrigin(OriginRenamed),
@@ -639,21 +643,21 @@ mod tests {
 	}
 
 	mod event_module4 {
-		pub trait Trait {
-			type Origin;
+		use super::system;
+
+		pub trait Trait: system::Trait {
 			type Balance;
-			type BlockNumber;
 		}
 
 		decl_module! {
-			pub struct Module<T: Trait> for enum Call where origin: T::Origin {}
+			pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=system {}
 		}
 
 		decl_event!(
 			/// Event finish formatting on an unnamed one with trailing comma
 			pub enum Event<T> where
 				<T as Trait>::Balance,
-				<T as Trait>::Origin,
+				<T as system::Trait>::Origin,
 			{
 				TestEvent(Balance, Origin),
 			}
@@ -661,21 +665,21 @@ mod tests {
 	}
 
 	mod event_module5 {
-		pub trait Trait {
-			type Origin;
+		use super::system;
+
+		pub trait Trait: system::Trait {
 			type Balance;
-			type BlockNumber;
 		}
 
 		decl_module! {
-			pub struct Module<T: Trait> for enum Call where origin: T::Origin {}
+			pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=system {}
 		}
 
 		decl_event!(
 			/// Event finish formatting on an named one with trailing comma
 			pub enum Event<T> where
 				BalanceRenamed = <T as Trait>::Balance,
-				OriginRenamed = <T as Trait>::Origin,
+				OriginRenamed = <T as system::Trait>::Origin,
 			{
 				TestEvent(BalanceRenamed, OriginRenamed),
 				TrailingCommaInArgs(
@@ -711,37 +715,40 @@ mod tests {
 	}
 
 	impl event_module::Trait for TestRuntime {
-		type Origin = u32;
 		type Balance = u32;
-		type BlockNumber = u32;
 	}
 
 	impl event_module2::Trait for TestRuntime {
-		type Origin = u32;
 		type Balance = u32;
-		type BlockNumber = u32;
 	}
 
 	impl system::Trait for TestRuntime {
 		type Origin = u32;
 		type BlockNumber = u32;
+		type PalletInfo = ();
+		type DbWeight = ();
 	}
 
 	impl event_module::Trait for TestRuntime2 {
-		type Origin = u32;
 		type Balance = u32;
-		type BlockNumber = u32;
 	}
 
 	impl event_module2::Trait for TestRuntime2 {
-		type Origin = u32;
 		type Balance = u32;
-		type BlockNumber = u32;
 	}
 
 	impl system_renamed::Trait for TestRuntime2 {
 		type Origin = u32;
 		type BlockNumber = u32;
+		type PalletInfo = ();
+		type DbWeight = ();
+	}
+
+	impl system::Trait for TestRuntime2 {
+		type Origin = u32;
+		type BlockNumber = u32;
+		type PalletInfo = ();
+		type DbWeight = ();
 	}
 
 	const EXPECTED_METADATA: OuterEventMetadata = OuterEventMetadata {
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 58fb3d031cf0..2380c8127d7a 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -375,6 +375,21 @@ pub use frame_support_procedural::DebugNoBound;
 /// ```
 pub use frame_support_procedural::require_transactional;
 
+/// Convert the current crate version into a [`PalletVersion`](crate::traits::PalletVersion).
+///
+/// It uses the `CARGO_PKG_VERSION_MAJOR`, `CARGO_PKG_VERSION_MINOR` and
+/// `CARGO_PKG_VERSION_PATCH` environment variables to fetch the crate version.
+/// This means that the [`PalletVersion`](crate::traits::PalletVersion)
+/// object will correspond to the version of the crate the macro is called in!
+///
+/// # Example
+///
+/// ```
+/// # use frame_support::{traits::PalletVersion, crate_to_pallet_version};
+/// const Version: PalletVersion = crate_to_pallet_version!();
+/// ```
+pub use frame_support_procedural::crate_to_pallet_version;
+
 /// Return Err of the expression: `return Err($expression);`.
 ///
 /// Used as `fail!(expression)`.
@@ -485,9 +500,11 @@ mod tests {
 	use sp_std::{marker::PhantomData, result};
 	use sp_io::TestExternalities;
 
-	pub trait Trait {
+	pub trait Trait: 'static {
 		type BlockNumber: Codec + EncodeLike + Default;
 		type Origin;
+		type PalletInfo: crate::traits::PalletInfo;
+		type DbWeight: crate::traits::Get<crate::weights::RuntimeDbWeight>;
 	}
 
 	mod module {
@@ -496,7 +513,7 @@ mod tests {
 		use super::Trait;
 
 		decl_module! {
-			pub struct Module<T: Trait> for enum Call where origin: T::Origin {}
+			pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self  {}
 		}
 	}
 	use self::module::Module;
@@ -527,6 +544,8 @@ mod tests {
 	impl Trait for Test {
 		type BlockNumber = u32;
 		type Origin = u32;
+		type PalletInfo = ();
+		type DbWeight = ();
 	}
 
 	fn new_test_ext() -> TestExternalities {
diff --git a/frame/support/src/metadata.rs b/frame/support/src/metadata.rs
index 9ae1d6ce663d..80737e4b13d6 100644
--- a/frame/support/src/metadata.rs
+++ b/frame/support/src/metadata.rs
@@ -27,12 +27,14 @@ pub use frame_metadata::{
 /// Example:
 /// ```
 ///# mod module0 {
-///#    pub trait Trait {
+///#    pub trait Trait: 'static {
 ///#        type Origin;
 ///#        type BlockNumber;
+///#        type PalletInfo: frame_support::traits::PalletInfo;
+///#        type DbWeight: frame_support::traits::Get<frame_support::weights::RuntimeDbWeight>;
 ///#    }
 ///#    frame_support::decl_module! {
-///#        pub struct Module<T: Trait> for enum Call where origin: T::Origin {}
+///#        pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {}
 ///#    }
 ///#
 ///#    frame_support::decl_storage! {
@@ -44,6 +46,8 @@ pub use frame_metadata::{
 ///# impl module0::Trait for Runtime {
 ///#     type Origin = u32;
 ///#     type BlockNumber = u32;
+///#     type PalletInfo = ();
+///#     type DbWeight = ();
 ///# }
 ///#
 ///# type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<(), (), (), ()>;
@@ -302,11 +306,12 @@ mod tests {
 			type BlockNumber: From<u32> + Encode;
 			type SomeValue: Get<u32>;
 			type PalletInfo: crate::traits::PalletInfo;
+			type DbWeight: crate::traits::Get<crate::weights::RuntimeDbWeight>;
 			type Call;
 		}
 
 		decl_module! {
-			pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+			pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {
 				/// Hi, I am a comment.
 				const BlockNumber: T::BlockNumber = 100.into();
 				const GetType: T::AccountId = T::SomeValue::get().into();
@@ -341,8 +346,9 @@ mod tests {
 
 	mod event_module {
 		use crate::dispatch::DispatchResult;
+		use super::system;
 
-		pub trait Trait: super::system::Trait {
+		pub trait Trait: system::Trait {
 			type Balance;
 		}
 
@@ -355,7 +361,7 @@ mod tests {
 		);
 
 		decl_module! {
-			pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+			pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=system {
 				type Error = Error<T>;
 
 				#[weight = 0]
@@ -375,10 +381,10 @@ mod tests {
 	}
 
 	mod event_module2 {
-		pub trait Trait {
-			type Origin;
+		use super::system;
+
+		pub trait Trait: system::Trait {
 			type Balance;
-			type BlockNumber;
 		}
 
 		decl_event!(
@@ -389,7 +395,7 @@ mod tests {
 		);
 
 		decl_module! {
-			pub struct Module<T: Trait> for enum Call where origin: T::Origin {}
+			pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=system {}
 		}
 
 		crate::decl_storage! {
@@ -432,9 +438,7 @@ mod tests {
 	}
 
 	impl event_module2::Trait for TestRuntime {
-		type Origin = Origin;
 		type Balance = u32;
-		type BlockNumber = u32;
 	}
 
 	crate::parameter_types! {
@@ -448,6 +452,7 @@ mod tests {
 		type BlockNumber = u32;
 		type SomeValue = SystemValue;
 		type PalletInfo = ();
+		type DbWeight = ();
 		type Call = Call;
 	}
 
diff --git a/frame/support/src/storage/generator/double_map.rs b/frame/support/src/storage/generator/double_map.rs
index 9454ab401da2..cbc62c83de88 100644
--- a/frame/support/src/storage/generator/double_map.rs
+++ b/frame/support/src/storage/generator/double_map.rs
@@ -425,13 +425,15 @@ mod test_iterators {
 		storage::{generator::StorageDoubleMap, IterableStorageDoubleMap, unhashed},
 	};
 
-	pub trait Trait {
+	pub trait Trait: 'static {
 		type Origin;
 		type BlockNumber;
+		type PalletInfo: crate::traits::PalletInfo;
+		type DbWeight: crate::traits::Get<crate::weights::RuntimeDbWeight>;
 	}
 
 	crate::decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: T::Origin {}
+		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {}
 	}
 
 	#[derive(PartialEq, Eq, Clone, Encode, Decode)]
diff --git a/frame/support/src/storage/generator/map.rs b/frame/support/src/storage/generator/map.rs
index 1c13de52e164..601fd4c4a8dd 100644
--- a/frame/support/src/storage/generator/map.rs
+++ b/frame/support/src/storage/generator/map.rs
@@ -325,13 +325,15 @@ mod test_iterators {
 		storage::{generator::StorageMap, IterableStorageMap, unhashed},
 	};
 
-	pub trait Trait {
+	pub trait Trait: 'static {
 		type Origin;
 		type BlockNumber;
+		type PalletInfo: crate::traits::PalletInfo;
+		type DbWeight: crate::traits::Get<crate::weights::RuntimeDbWeight>;
 	}
 
 	crate::decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: T::Origin {}
+		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {}
 	}
 
 	#[derive(PartialEq, Eq, Clone, Encode, Decode)]
diff --git a/frame/support/src/storage/generator/mod.rs b/frame/support/src/storage/generator/mod.rs
index 7df7dfd31739..9346718f6348 100644
--- a/frame/support/src/storage/generator/mod.rs
+++ b/frame/support/src/storage/generator/mod.rs
@@ -40,19 +40,24 @@ mod tests {
 	use crate::storage::{unhashed, generator::StorageValue, IterableStorageMap};
 	use crate::{assert_noop, assert_ok};
 
-	struct Runtime {}
-	pub trait Trait {
+	struct Runtime;
+
+	pub trait Trait: 'static {
 		type Origin;
 		type BlockNumber;
+		type PalletInfo: crate::traits::PalletInfo;
+		type DbWeight: crate::traits::Get<crate::weights::RuntimeDbWeight>;
 	}
 
 	impl Trait for Runtime {
 		type Origin = u32;
 		type BlockNumber = u32;
+		type PalletInfo = ();
+		type DbWeight = ();
 	}
 
 	decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: T::Origin {}
+		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {}
 	}
 
 	crate::decl_storage! {
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index 377bfaa56a55..af7a7ee3635e 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -1709,7 +1709,7 @@ impl<T> IsType<T> for T {
 /// "InstanceNMyModule".
 pub trait Instance: 'static {
 	/// Unique module prefix. E.g. "InstanceNMyModule" or "MyModule"
-	const PREFIX: &'static str ;
+	const PREFIX: &'static str;
 }
 
 /// A trait similar to `Convert` to convert values from `B` an abstract balance type
@@ -1826,6 +1826,96 @@ pub trait IsSubType<T> {
 	fn is_sub_type(&self) -> Option<&T>;
 }
 
+/// The storage key postfix that is used to store the [`PalletVersion`] per pallet.
+///
+/// The full storage key is built by using:
+/// Twox128([`PalletInfo::name`]) ++ Twox128([`PALLET_VERSION_STORAGE_KEY_POSTFIX`])
+pub const PALLET_VERSION_STORAGE_KEY_POSTFIX: &[u8] = b":__PALLET_VERSION__:";
+
+/// The version of a pallet.
+///
+/// Each pallet version is stored in the state under a fixed key. See
+/// [`PALLET_VERSION_STORAGE_KEY_POSTFIX`] for how this key is built.
+#[derive(RuntimeDebug, Eq, PartialEq, Encode, Decode, Ord)]
+pub struct PalletVersion {
+	/// The major version of the pallet.
+	pub major: u16,
+	/// The minor version of the pallet.
+	pub minor: u8,
+	/// The patch version of the pallet.
+	pub patch: u8,
+}
+
+impl PalletVersion {
+	/// Creates a new instance of `Self`.
+	pub fn new(major: u16, minor: u8, patch: u8) -> Self {
+		Self {
+			major,
+			minor,
+			patch,
+		}
+	}
+
+	/// Returns the storage key for a pallet version.
+	///
+	/// See [`PALLET_VERSION_STORAGE_KEY_POSTIFX`] on how this key is built.
+	///
+	/// Returns `None` if the given `PI` returned a `None` as name for the given
+	/// `Pallet`.
+	pub fn storage_key<PI: PalletInfo, Pallet: 'static>() -> Option<[u8; 32]> {
+		let pallet_name = PI::name::<Pallet>()?;
+
+		let pallet_name = sp_io::hashing::twox_128(pallet_name.as_bytes());
+		let postfix = sp_io::hashing::twox_128(PALLET_VERSION_STORAGE_KEY_POSTFIX);
+
+		let mut final_key = [0u8; 32];
+		final_key[..16].copy_from_slice(&pallet_name);
+		final_key[16..].copy_from_slice(&postfix);
+
+		Some(final_key)
+	}
+}
+
+impl sp_std::cmp::PartialOrd for PalletVersion {
+	fn partial_cmp(&self, other: &Self) -> Option<sp_std::cmp::Ordering> {
+		let res = self.major
+			.cmp(&other.major)
+			.then_with(||
+				self.minor
+					.cmp(&other.minor)
+					.then_with(|| self.patch.cmp(&other.patch)
+			));
+
+		Some(res)
+	}
+}
+
+/// Provides version information about a pallet.
+///
+/// This trait provides two functions for returning the version of a
+/// pallet. There is a state where both functions can return distinct versions.
+/// See [`GetPalletVersion::storage_version`] for more information about this.
+pub trait GetPalletVersion {
+	/// Returns the current version of the pallet.
+	fn current_version() -> PalletVersion;
+
+	/// Returns the version of the pallet that is stored in storage.
+	///
+	/// Most of the time this will return the exact same version as
+	/// [`GetPalletVersion::current_version`]. Only when being in
+	/// a state after a runtime upgrade happened and the pallet did
+	/// not yet updated its version in storage, this will return a
+	/// different(the previous, seen from the time of calling) version.
+	///
+	/// See [`PalletVersion`] for more information.
+	///
+	/// # Note
+	///
+	/// If there was no previous version of the pallet stored in the state,
+	/// this function returns `None`.
+	fn storage_version() -> Option<PalletVersion>;
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;
@@ -1847,4 +1937,18 @@ mod tests {
 		assert_eq!(<(Test, Test)>::on_initialize(0), 20);
 		assert_eq!(<(Test, Test)>::on_runtime_upgrade(), 40);
 	}
+
+	#[test]
+	fn check_pallet_version_ordering() {
+		let version = PalletVersion::new(1, 0, 0);
+		assert!(version > PalletVersion::new(0, 1, 2));
+		assert!(version == PalletVersion::new(1, 0, 0));
+		assert!(version < PalletVersion::new(1, 0, 1));
+		assert!(version < PalletVersion::new(1, 1, 0));
+
+		let version = PalletVersion::new(2, 50, 50);
+		assert!(version < PalletVersion::new(2, 50, 51));
+		assert!(version > PalletVersion::new(2, 49, 51));
+		assert!(version < PalletVersion::new(3, 49, 51));
+	}
 }
diff --git a/frame/support/src/weights.rs b/frame/support/src/weights.rs
index 1d19eeef70d7..74f0773aa541 100644
--- a/frame/support/src/weights.rs
+++ b/frame/support/src/weights.rs
@@ -701,11 +701,12 @@ mod tests {
 	use crate::{decl_module, parameter_types, traits::Get};
 	use super::*;
 
-	pub trait Trait {
+	pub trait Trait: 'static {
 		type Origin;
 		type Balance;
 		type BlockNumber;
 		type DbWeight: Get<RuntimeDbWeight>;
+		type PalletInfo: crate::traits::PalletInfo;
 	}
 
 	pub struct TraitImpl {}
@@ -722,10 +723,11 @@ mod tests {
 		type BlockNumber = u32;
 		type Balance = u32;
 		type DbWeight = DbWeight;
+		type PalletInfo = ();
 	}
 
 	decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {
 			// no arguments, fixed weight
 			#[weight = 1000]
 			fn f00(_origin) { unimplemented!(); }
diff --git a/frame/support/test/src/lib.rs b/frame/support/test/src/lib.rs
index d5f49299880c..a917c781c065 100644
--- a/frame/support/test/src/lib.rs
+++ b/frame/support/test/src/lib.rs
@@ -22,12 +22,19 @@
 #![warn(missing_docs)]
 #![deny(warnings)]
 
+#[cfg(test)]
+mod pallet_version;
+
 /// The configuration trait
-pub trait Trait {
+pub trait Trait: 'static {
 	/// The runtime origin type.
-	type Origin;
+	type Origin: codec::Codec + codec::EncodeLike + Default;
 	/// The block number type.
-	type BlockNumber;
+	type BlockNumber: codec::Codec + codec::EncodeLike + Default;
+	/// The information about the pallet setup in the runtime.
+	type PalletInfo: frame_support::traits::PalletInfo;
+	/// The db weights.
+	type DbWeight: frame_support::traits::Get<frame_support::weights::RuntimeDbWeight>;
 }
 
 frame_support::decl_module! {
diff --git a/frame/support/test/src/pallet_version.rs b/frame/support/test/src/pallet_version.rs
new file mode 100644
index 000000000000..5912bd5b8e47
--- /dev/null
+++ b/frame/support/test/src/pallet_version.rs
@@ -0,0 +1,32 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use frame_support::{crate_to_pallet_version, traits::PalletVersion};
+
+#[test]
+fn ensure_that_current_pallet_version_is_correct() {
+	let expected = PalletVersion {
+		major: env!("CARGO_PKG_VERSION_MAJOR").parse().unwrap(),
+		minor: env!("CARGO_PKG_VERSION_MINOR").parse().unwrap(),
+		patch: env!("CARGO_PKG_VERSION_PATCH").parse().unwrap(),
+	};
+
+	assert_eq!(
+		expected,
+		crate_to_pallet_version!(),
+	)
+}
diff --git a/frame/support/test/tests/construct_runtime.rs b/frame/support/test/tests/construct_runtime.rs
index 9a17e44dbef4..4ff4fc682860 100644
--- a/frame/support/test/tests/construct_runtime.rs
+++ b/frame/support/test/tests/construct_runtime.rs
@@ -129,6 +129,7 @@ impl system::Trait for Runtime {
 	type Event = Event;
 	type PalletInfo = PalletInfo;
 	type Call = Call;
+	type DbWeight = ();
 }
 
 frame_support::construct_runtime!(
diff --git a/frame/support/test/tests/decl_storage.rs b/frame/support/test/tests/decl_storage.rs
index 800ce459fed3..8d5727ce9104 100644
--- a/frame/support/test/tests/decl_storage.rs
+++ b/frame/support/test/tests/decl_storage.rs
@@ -22,16 +22,12 @@ mod tests {
 	use frame_support::metadata::*;
 	use sp_io::TestExternalities;
 	use std::marker::PhantomData;
-	use codec::{Encode, Decode, EncodeLike};
 
 	frame_support::decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {}
+		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=frame_support_test {}
 	}
 
-	pub trait Trait {
-		type Origin: Encode + Decode + EncodeLike + std::default::Default;
-		type BlockNumber;
-	}
+	pub trait Trait: frame_support_test::Trait {}
 
 	frame_support::decl_storage! {
 		trait Store for Module<T: Trait> as TestStorage {
@@ -74,7 +70,7 @@ mod tests {
 			pub PUBGETMAPU32MYDEF get(fn pub_map_u32_getter_mydef):
 				map hasher(blake2_128_concat) u32 => String = "pubmap".into();
 
-			COMPLEXTYPE1: ::std::vec::Vec<<T as Trait>::Origin>;
+			COMPLEXTYPE1: ::std::vec::Vec<T::Origin>;
 			COMPLEXTYPE2: (Vec<Vec<(u16, Box<()>)>>, u32);
 			COMPLEXTYPE3: [u32; 25];
 		}
@@ -85,11 +81,15 @@ mod tests {
 
 	struct TraitImpl {}
 
-	impl Trait for TraitImpl {
+	impl frame_support_test::Trait for TraitImpl {
 		type Origin = u32;
 		type BlockNumber = u32;
+		type PalletInfo = ();
+		type DbWeight = ();
 	}
 
+	impl Trait for TraitImpl {}
+
 	const EXPECTED_METADATA: StorageMetadata = StorageMetadata {
 		prefix: DecodeDifferent::Encode("TestStorage"),
 		entries: DecodeDifferent::Encode(
@@ -353,7 +353,7 @@ mod tests {
 				StorageEntryMetadata {
 					name: DecodeDifferent::Encode("COMPLEXTYPE1"),
 					modifier: StorageEntryModifier::Default,
-					ty: StorageEntryType::Plain(DecodeDifferent::Encode("::std::vec::Vec<<T as Trait>::Origin>")),
+					ty: StorageEntryType::Plain(DecodeDifferent::Encode("::std::vec::Vec<T::Origin>")),
 					default: DecodeDifferent::Encode(
 						DefaultByteGetter(&__GetByteStructCOMPLEXTYPE1(PhantomData::<TraitImpl>))
 					),
@@ -414,13 +414,10 @@ mod tests {
 #[cfg(test)]
 #[allow(dead_code)]
 mod test2 {
-	pub trait Trait {
-		type Origin;
-		type BlockNumber;
-	}
+	pub trait Trait: frame_support_test::Trait {}
 
 	frame_support::decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {}
+		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=frame_support_test {}
 	}
 
 	type PairOf<T> = (T, T);
@@ -441,21 +438,23 @@ mod test2 {
 
 	struct TraitImpl {}
 
-	impl Trait for TraitImpl {
+	impl frame_support_test::Trait for TraitImpl {
 		type Origin = u32;
 		type BlockNumber = u32;
+		type PalletInfo = ();
+		type DbWeight = ();
 	}
+
+	impl Trait for TraitImpl {}
 }
 
 #[cfg(test)]
 #[allow(dead_code)]
 mod test3 {
-	pub trait Trait {
-		type Origin;
-		type BlockNumber;
-	}
+	pub trait Trait: frame_support_test::Trait {}
+
 	frame_support::decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {}
+		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=frame_support_test {}
 	}
 	frame_support::decl_storage! {
 		trait Store for Module<T: Trait> as Test {
@@ -467,10 +466,14 @@ mod test3 {
 
 	struct TraitImpl {}
 
-	impl Trait for TraitImpl {
+	impl frame_support_test::Trait for TraitImpl {
 		type Origin = u32;
 		type BlockNumber = u32;
+		type PalletInfo = ();
+		type DbWeight = ();
 	}
+
+	impl Trait for TraitImpl {}
 }
 
 #[cfg(test)]
@@ -479,13 +482,10 @@ mod test_append_and_len {
 	use sp_io::TestExternalities;
 	use codec::{Encode, Decode};
 
-	pub trait Trait {
-		type Origin;
-		type BlockNumber;
-	}
+	pub trait Trait: frame_support_test::Trait {}
 
 	frame_support::decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {}
+		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=frame_support_test {}
 	}
 
 	#[derive(PartialEq, Eq, Clone, Encode, Decode)]
@@ -511,11 +511,15 @@ mod test_append_and_len {
 
 	struct Test {}
 
-	impl Trait for Test {
+	impl frame_support_test::Trait for Test {
 		type Origin = u32;
 		type BlockNumber = u32;
+		type PalletInfo = ();
+		type DbWeight = ();
 	}
 
+	impl Trait for Test {}
+
 	#[test]
 	fn default_for_option() {
 		TestExternalities::default().execute_with(|| {
diff --git a/frame/support/test/tests/decl_storage_ui/config_duplicate.rs b/frame/support/test/tests/decl_storage_ui/config_duplicate.rs
index f4f4ad7d48a9..58923ed19297 100644
--- a/frame/support/test/tests/decl_storage_ui/config_duplicate.rs
+++ b/frame/support/test/tests/decl_storage_ui/config_duplicate.rs
@@ -15,13 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-pub trait Trait {
-	type Origin;
-	type BlockNumber: codec::Codec + codec::EncodeLike + Default + Clone;
-}
+pub trait Trait: frame_support_test::Trait {}
 
 frame_support::decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {}
+	pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=frame_support_test {}
 }
 
 frame_support::decl_storage!{
diff --git a/frame/support/test/tests/decl_storage_ui/config_duplicate.stderr b/frame/support/test/tests/decl_storage_ui/config_duplicate.stderr
index 61f7c0bbe64a..f6303f277b56 100644
--- a/frame/support/test/tests/decl_storage_ui/config_duplicate.stderr
+++ b/frame/support/test/tests/decl_storage_ui/config_duplicate.stderr
@@ -1,5 +1,5 @@
 error: `config()`/`get()` with the same name already defined.
-  --> $DIR/config_duplicate.rs:30:21
+  --> $DIR/config_duplicate.rs:27:21
    |
-30 |         pub Value2 config(value): u32;
+27 |         pub Value2 config(value): u32;
    |                           ^^^^^
diff --git a/frame/support/test/tests/decl_storage_ui/config_get_duplicate.rs b/frame/support/test/tests/decl_storage_ui/config_get_duplicate.rs
index 3caa2d9c3360..e77dcea404cc 100644
--- a/frame/support/test/tests/decl_storage_ui/config_get_duplicate.rs
+++ b/frame/support/test/tests/decl_storage_ui/config_get_duplicate.rs
@@ -15,13 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-pub trait Trait {
-	type Origin;
-	type BlockNumber: codec::Codec + codec::EncodeLike + Default + Clone;
-}
+pub trait Trait: frame_support_test::Trait {}
 
 frame_support::decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {}
+	pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=frame_support_test {}
 }
 
 frame_support::decl_storage!{
diff --git a/frame/support/test/tests/decl_storage_ui/config_get_duplicate.stderr b/frame/support/test/tests/decl_storage_ui/config_get_duplicate.stderr
index 02e7d4108033..9377b718c066 100644
--- a/frame/support/test/tests/decl_storage_ui/config_get_duplicate.stderr
+++ b/frame/support/test/tests/decl_storage_ui/config_get_duplicate.stderr
@@ -1,5 +1,5 @@
 error: `config()`/`get()` with the same name already defined.
-  --> $DIR/config_get_duplicate.rs:30:21
+  --> $DIR/config_get_duplicate.rs:27:21
    |
-30 |         pub Value2 config(value): u32;
+27 |         pub Value2 config(value): u32;
    |                           ^^^^^
diff --git a/frame/support/test/tests/decl_storage_ui/get_duplicate.rs b/frame/support/test/tests/decl_storage_ui/get_duplicate.rs
index 1c24b3bf28ee..b6ccb7ebb7b7 100644
--- a/frame/support/test/tests/decl_storage_ui/get_duplicate.rs
+++ b/frame/support/test/tests/decl_storage_ui/get_duplicate.rs
@@ -15,13 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-pub trait Trait {
-	type Origin;
-	type BlockNumber: codec::Codec + codec::EncodeLike + Default + Clone;
-}
+pub trait Trait: frame_support_test::Trait {}
 
 frame_support::decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {}
+	pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=frame_support_test {}
 }
 
 frame_support::decl_storage!{
diff --git a/frame/support/test/tests/decl_storage_ui/get_duplicate.stderr b/frame/support/test/tests/decl_storage_ui/get_duplicate.stderr
index d9ce420a6f21..0039b10fb43b 100644
--- a/frame/support/test/tests/decl_storage_ui/get_duplicate.stderr
+++ b/frame/support/test/tests/decl_storage_ui/get_duplicate.stderr
@@ -1,5 +1,5 @@
 error: `config()`/`get()` with the same name already defined.
-  --> $DIR/get_duplicate.rs:30:21
+  --> $DIR/get_duplicate.rs:27:21
    |
-30 |         pub Value2 get(fn value) config(): u32;
+27 |         pub Value2 get(fn value) config(): u32;
    |                           ^^^^^
diff --git a/frame/support/test/tests/final_keys.rs b/frame/support/test/tests/final_keys.rs
index a9f0cdc8f184..6bd125282546 100644
--- a/frame/support/test/tests/final_keys.rs
+++ b/frame/support/test/tests/final_keys.rs
@@ -21,15 +21,10 @@ use frame_support::{StorageDoubleMap, StorageMap, StorageValue, StoragePrefixedM
 use sp_io::{TestExternalities, hashing::{twox_64, twox_128, blake2_128}};
 
 mod no_instance {
-	use codec::{Encode, Decode, EncodeLike};
-
-	pub trait Trait {
-		type Origin;
-		type BlockNumber: Encode + Decode + EncodeLike + Default + Clone;
-	}
+	pub trait Trait: frame_support_test::Trait {}
 
 	frame_support::decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {}
+		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=frame_support_test {}
 	}
 
 	frame_support::decl_storage!{
@@ -50,13 +45,11 @@ mod no_instance {
 }
 
 mod instance {
-	use super::no_instance;
-
-	pub trait Trait<I = DefaultInstance>: super::no_instance::Trait {}
+	pub trait Trait<I = DefaultInstance>: frame_support_test::Trait {}
 
 	frame_support::decl_module! {
 		pub struct Module<T: Trait<I>, I: Instance = DefaultInstance>
-			for enum Call where origin: T::Origin, system=no_instance {}
+			for enum Call where origin: T::Origin, system=frame_support_test {}
 	}
 
 	frame_support::decl_storage!{
diff --git a/frame/support/test/tests/genesisconfig.rs b/frame/support/test/tests/genesisconfig.rs
index af8b393800cf..f268f11a4dc1 100644
--- a/frame/support/test/tests/genesisconfig.rs
+++ b/frame/support/test/tests/genesisconfig.rs
@@ -15,13 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-pub trait Trait {
-	type BlockNumber: codec::Codec + codec::EncodeLike + Default;
-	type Origin;
-}
+pub trait Trait: frame_support_test::Trait {}
 
 frame_support::decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {}
+	pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=frame_support_test {}
 }
 
 frame_support::decl_storage! {
@@ -32,11 +29,15 @@ frame_support::decl_storage! {
 
 struct Test;
 
-impl Trait for Test {
+impl frame_support_test::Trait for Test {
 	type BlockNumber = u32;
 	type Origin = ();
+	type PalletInfo = ();
+	type DbWeight = ();
 }
 
+impl Trait for Test {}
+
 #[test]
 fn init_genesis_config() {
 	GenesisConfig::<Test> {
diff --git a/frame/support/test/tests/instance.rs b/frame/support/test/tests/instance.rs
index e1766082dd80..61df5d4eb818 100644
--- a/frame/support/test/tests/instance.rs
+++ b/frame/support/test/tests/instance.rs
@@ -250,6 +250,7 @@ impl system::Trait for Runtime {
 	type Event = Event;
 	type PalletInfo = ();
 	type Call = Call;
+	type DbWeight = ();
 }
 
 frame_support::construct_runtime!(
diff --git a/frame/support/test/tests/issue2219.rs b/frame/support/test/tests/issue2219.rs
index 34310c2f5876..596a3b6ffb25 100644
--- a/frame/support/test/tests/issue2219.rs
+++ b/frame/support/test/tests/issue2219.rs
@@ -166,6 +166,7 @@ impl system::Trait for Runtime {
 	type Event = Event;
 	type PalletInfo = ();
 	type Call = Call;
+	type DbWeight = ();
 }
 
 impl module::Trait for Runtime {}
diff --git a/frame/support/test/tests/pallet_version.rs b/frame/support/test/tests/pallet_version.rs
new file mode 100644
index 000000000000..f3f4029b0da5
--- /dev/null
+++ b/frame/support/test/tests/pallet_version.rs
@@ -0,0 +1,175 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Tests related to the pallet version.
+
+#![recursion_limit="128"]
+
+use codec::{Decode, Encode};
+use sp_runtime::{generic, traits::{BlakeTwo256, Block as _, Verify}};
+use frame_support::{
+	traits::{PALLET_VERSION_STORAGE_KEY_POSTFIX, PalletVersion, OnRuntimeUpgrade},
+	crate_to_pallet_version, weights::Weight,
+};
+use sp_core::{H256, sr25519};
+
+mod system;
+
+/// A version that we will check for in the tests
+const SOME_TEST_VERSION: PalletVersion = PalletVersion { major: 3000, minor: 30, patch: 13 };
+
+/// Checks that `on_runtime_upgrade` sets the latest pallet version when being called without
+/// being provided by the user.
+mod module1 {
+	use super::*;
+
+	pub trait Trait: system::Trait {}
+
+	frame_support::decl_module! {
+		pub struct Module<T: Trait> for enum Call where
+			origin: <T as system::Trait>::Origin,
+			system = system,
+		{}
+	}
+}
+
+/// Checks that `on_runtime_upgrade` sets the latest pallet version when being called and also
+/// being provided by the user.
+mod module2 {
+	use super::*;
+
+	pub trait Trait<I=DefaultInstance>: system::Trait {}
+
+	frame_support::decl_module! {
+		pub struct Module<T: Trait<I>, I: Instance=DefaultInstance> for enum Call where
+			origin: <T as system::Trait>::Origin,
+			system = system
+		{
+			fn on_runtime_upgrade() -> Weight {
+				assert_eq!(crate_to_pallet_version!(), Self::current_version());
+
+				let version_key = PalletVersion::storage_key::<T::PalletInfo, Self>().unwrap();
+				let version_value = sp_io::storage::get(&version_key);
+
+				if version_value.is_some() {
+					assert_eq!(SOME_TEST_VERSION, Self::storage_version().unwrap());
+				} else {
+					// As the storage version does not exist yet, it should be `None`.
+					assert!(Self::storage_version().is_none());
+				}
+
+				0
+			}
+		}
+	}
+
+	frame_support::decl_storage! {
+		trait Store for Module<T: Trait<I>, I: Instance=DefaultInstance> as Module2 {}
+	}
+}
+
+impl module1::Trait for Runtime {}
+impl module2::Trait for Runtime {}
+impl module2::Trait<module2::Instance1> for Runtime {}
+impl module2::Trait<module2::Instance2> for Runtime {}
+
+pub type Signature = sr25519::Signature;
+pub type AccountId = <Signature as Verify>::Signer;
+pub type BlockNumber = u64;
+pub type Index = u64;
+
+impl system::Trait for Runtime {
+	type BaseCallFilter= ();
+	type Hash = H256;
+	type Origin = Origin;
+	type BlockNumber = BlockNumber;
+	type AccountId = AccountId;
+	type Event = Event;
+	type PalletInfo = PalletInfo;
+	type Call = Call;
+	type DbWeight = ();
+}
+
+frame_support::construct_runtime!(
+	pub enum Runtime where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic
+	{
+		System: system::{Module, Call, Event<T>},
+		Module1: module1::{Module, Call},
+		Module2: module2::{Module, Call},
+		Module2_1: module2::<Instance1>::{Module, Call},
+		Module2_2: module2::<Instance2>::{Module, Call},
+	}
+);
+
+pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
+pub type Block = generic::Block<Header, UncheckedExtrinsic>;
+pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, Call, Signature, ()>;
+
+/// Returns the storage key for `PalletVersion` for the given `pallet`.
+fn get_pallet_version_storage_key_for_pallet(pallet: &str) -> [u8; 32] {
+	let pallet_name = sp_io::hashing::twox_128(pallet.as_bytes());
+	let postfix = sp_io::hashing::twox_128(PALLET_VERSION_STORAGE_KEY_POSTFIX);
+
+	let mut final_key = [0u8; 32];
+	final_key[..16].copy_from_slice(&pallet_name);
+	final_key[16..].copy_from_slice(&postfix);
+
+	final_key
+}
+
+/// Checks the version of the given `pallet`.
+///
+/// It is expected that the pallet version can be found in the storage and equals the
+/// current crate version.
+fn check_pallet_version(pallet: &str) {
+	let key = get_pallet_version_storage_key_for_pallet(pallet);
+	let value = sp_io::storage::get(&key).expect("Pallet version exists");
+	let version = PalletVersion::decode(&mut &value[..])
+		.expect("Pallet version is encoded correctly");
+
+	assert_eq!(crate_to_pallet_version!(), version);
+}
+
+#[test]
+fn on_runtime_upgrade_sets_the_pallet_versions_in_storage() {
+	sp_io::TestExternalities::new_empty().execute_with(|| {
+		AllModules::on_runtime_upgrade();
+
+		check_pallet_version("Module1");
+		check_pallet_version("Module2");
+		check_pallet_version("Module2_1");
+		check_pallet_version("Module2_2");
+	});
+}
+
+#[test]
+fn on_runtime_upgrade_overwrites_old_version() {
+	sp_io::TestExternalities::new_empty().execute_with(|| {
+		let key = get_pallet_version_storage_key_for_pallet("Module2");
+		sp_io::storage::set(&key, &SOME_TEST_VERSION.encode());
+
+		AllModules::on_runtime_upgrade();
+
+		check_pallet_version("Module1");
+		check_pallet_version("Module2");
+		check_pallet_version("Module2_1");
+		check_pallet_version("Module2_2");
+	});
+}
diff --git a/frame/support/test/tests/reserved_keyword/on_initialize.rs b/frame/support/test/tests/reserved_keyword/on_initialize.rs
index db71fe9a1e26..781b72bd04e8 100644
--- a/frame/support/test/tests/reserved_keyword/on_initialize.rs
+++ b/frame/support/test/tests/reserved_keyword/on_initialize.rs
@@ -4,10 +4,7 @@ macro_rules! reserved {
 			mod $reserved {
 				pub use frame_support::dispatch;
 
-				pub trait Trait {
-					type Origin;
-					type BlockNumber: Into<u32>;
-				}
+				pub trait Trait: frame_support_test::Trait {}
 
 				pub mod system {
 					use frame_support::dispatch;
@@ -18,7 +15,7 @@ macro_rules! reserved {
 				}
 
 				frame_support::decl_module! {
-					pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {
+					pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=frame_support_test {
 						#[weight = 0]
 						fn $reserved(_origin) -> dispatch::DispatchResult { unreachable!() }
 					}
diff --git a/frame/support/test/tests/reserved_keyword/on_initialize.stderr b/frame/support/test/tests/reserved_keyword/on_initialize.stderr
index dbe07195e89d..3df392dee900 100644
--- a/frame/support/test/tests/reserved_keyword/on_initialize.stderr
+++ b/frame/support/test/tests/reserved_keyword/on_initialize.stderr
@@ -1,39 +1,39 @@
 error: Invalid call fn name: `on_finalize`, name is reserved and doesn't match expected signature, please refer to `decl_module!` documentation to see the appropriate usage, or rename it to an unreserved keyword.
-  --> $DIR/on_initialize.rs:31:1
+  --> $DIR/on_initialize.rs:28:1
    |
-31 | reserved!(on_finalize on_initialize on_runtime_upgrade offchain_worker deposit_event);
+28 | reserved!(on_finalize on_initialize on_runtime_upgrade offchain_worker deposit_event);
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: Invalid call fn name: `on_initialize`, name is reserved and doesn't match expected signature, please refer to `decl_module!` documentation to see the appropriate usage, or rename it to an unreserved keyword.
-  --> $DIR/on_initialize.rs:31:1
+  --> $DIR/on_initialize.rs:28:1
    |
-31 | reserved!(on_finalize on_initialize on_runtime_upgrade offchain_worker deposit_event);
+28 | reserved!(on_finalize on_initialize on_runtime_upgrade offchain_worker deposit_event);
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: Invalid call fn name: `on_runtime_upgrade`, name is reserved and doesn't match expected signature, please refer to `decl_module!` documentation to see the appropriate usage, or rename it to an unreserved keyword.
-  --> $DIR/on_initialize.rs:31:1
+  --> $DIR/on_initialize.rs:28:1
    |
-31 | reserved!(on_finalize on_initialize on_runtime_upgrade offchain_worker deposit_event);
+28 | reserved!(on_finalize on_initialize on_runtime_upgrade offchain_worker deposit_event);
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: Invalid call fn name: `offchain_worker`, name is reserved and doesn't match expected signature, please refer to `decl_module!` documentation to see the appropriate usage, or rename it to an unreserved keyword.
-  --> $DIR/on_initialize.rs:31:1
+  --> $DIR/on_initialize.rs:28:1
    |
-31 | reserved!(on_finalize on_initialize on_runtime_upgrade offchain_worker deposit_event);
+28 | reserved!(on_finalize on_initialize on_runtime_upgrade offchain_worker deposit_event);
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: Invalid call fn name: `deposit_event`, name is reserved and doesn't match expected signature, please refer to `decl_module!` documentation to see the appropriate usage, or rename it to an unreserved keyword.
-  --> $DIR/on_initialize.rs:31:1
+  --> $DIR/on_initialize.rs:28:1
    |
-31 | reserved!(on_finalize on_initialize on_runtime_upgrade offchain_worker deposit_event);
+28 | reserved!(on_finalize on_initialize on_runtime_upgrade offchain_worker deposit_event);
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/frame/support/test/tests/storage_transaction.rs b/frame/support/test/tests/storage_transaction.rs
index be8b678c6dfd..5c687ef05005 100644
--- a/frame/support/test/tests/storage_transaction.rs
+++ b/frame/support/test/tests/storage_transaction.rs
@@ -15,23 +15,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use codec::{Encode, Decode, EncodeLike};
 use frame_support::{
-	assert_ok, assert_noop, transactional,
-	StorageMap, StorageValue,
-	dispatch::{DispatchError, DispatchResult},
-	storage::{with_transaction, TransactionOutcome::*},
+	assert_ok, assert_noop, transactional, StorageMap, StorageValue,
+	dispatch::{DispatchError, DispatchResult}, storage::{with_transaction, TransactionOutcome::*},
 };
 use sp_io::TestExternalities;
 use sp_std::result;
 
-pub trait Trait {
-	type Origin;
-	type BlockNumber: Encode + Decode + EncodeLike + Default + Clone;
-}
+pub trait Trait: frame_support_test::Trait {}
 
 frame_support::decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {
+	pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=frame_support_test {
 		#[weight = 0]
 		#[transactional]
 		fn value_commits(_origin, v: u32) {
@@ -55,11 +49,16 @@ frame_support::decl_storage!{
 }
 
 struct Runtime;
-impl Trait for Runtime {
+
+impl frame_support_test::Trait for Runtime {
 	type Origin = u32;
 	type BlockNumber = u32;
+	type PalletInfo = ();
+	type DbWeight = ();
 }
 
+impl Trait for Runtime {}
+
 #[test]
 fn storage_transaction_basic_commit() {
 	TestExternalities::default().execute_with(|| {
diff --git a/frame/support/test/tests/system.rs b/frame/support/test/tests/system.rs
index a7d4d43c341a..f30b6e4c2af9 100644
--- a/frame/support/test/tests/system.rs
+++ b/frame/support/test/tests/system.rs
@@ -15,7 +15,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use frame_support::codec::{Encode, Decode, EncodeLike};
+use frame_support::{
+	codec::{Encode, Decode, EncodeLike}, traits::Get, weights::RuntimeDbWeight,
+};
 
 pub trait Trait: 'static + Eq + Clone {
 	type Origin: Into<Result<RawOrigin<Self::AccountId>, Self::Origin>>
@@ -28,6 +30,7 @@ pub trait Trait: 'static + Eq + Clone {
 	type Call;
 	type Event: From<Event<Self>>;
 	type PalletInfo: frame_support::traits::PalletInfo;
+	type DbWeight: Get<RuntimeDbWeight>;
 }
 
 frame_support::decl_module! {

From 1f46ce3c79e68beea941aaac55b00b043249c85d Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Wed, 21 Oct 2020 20:06:35 +0200
Subject: [PATCH 0002/1194] client/network: Remove original_request in block
 request events (#7369)

The `original_request` field of each `block_request::Event` variant is
not used. With that in mind, this commit removes the field.
---
 client/network/src/behaviour.rs      | 2 +-
 client/network/src/block_requests.rs | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/client/network/src/behaviour.rs b/client/network/src/behaviour.rs
index 6b3cfac38ae9..c8684eba625c 100644
--- a/client/network/src/behaviour.rs
+++ b/client/network/src/behaviour.rs
@@ -429,7 +429,7 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviourEventProcess<block_requests::Event<B
 					result: Ok(total_handling_time),
 				});
 			},
-			block_requests::Event::Response { peer, original_request: _, response, request_duration } => {
+			block_requests::Event::Response { peer, response, request_duration } => {
 				self.events.push_back(BehaviourOut::OpaqueRequestFinished {
 					peer: peer.clone(),
 					protocol: self.block_requests.protocol_name().to_owned(),
diff --git a/client/network/src/block_requests.rs b/client/network/src/block_requests.rs
index 7ee8f18f3a26..ace63e6e1cdd 100644
--- a/client/network/src/block_requests.rs
+++ b/client/network/src/block_requests.rs
@@ -85,8 +85,6 @@ pub enum Event<B: Block> {
 	/// A response to a block request has arrived.
 	Response {
 		peer: PeerId,
-		/// The original request passed to `send_request`.
-		original_request: message::BlockRequest<B>,
 		response: message::BlockResponse<B>,
 		/// Time elapsed between the start of the request and the response.
 		request_duration: Duration,
@@ -99,8 +97,6 @@ pub enum Event<B: Block> {
 	/// > For that, you must check the value returned by `send_request`.
 	RequestCancelled {
 		peer: PeerId,
-		/// The original request passed to `send_request`.
-		original_request: message::BlockRequest<B>,
 		/// Time elapsed between the start of the request and the cancellation.
 		request_duration: Duration,
 	},
@@ -108,8 +104,6 @@ pub enum Event<B: Block> {
 	/// A request has timed out.
 	RequestTimeout {
 		peer: PeerId,
-		/// The original request passed to `send_request`.
-		original_request: message::BlockRequest<B>,
 		/// Time elapsed between the start of the request and the timeout.
 		request_duration: Duration,
 	}
@@ -515,7 +509,6 @@ where
 					);
 					let ev = Event::RequestCancelled {
 						peer: peer_id.clone(),
-						original_request: ongoing_request.request.clone(),
 						request_duration: ongoing_request.emitted.elapsed(),
 					};
 					self.pending_events.push_back(NetworkBehaviourAction::GenerateEvent(ev));
@@ -670,7 +663,6 @@ where
 						let id = original_request.id;
 						let ev = Event::Response {
 							peer,
-							original_request,
 							response: message::BlockResponse::<B> { id, blocks },
 							request_duration,
 						};
@@ -713,7 +705,6 @@ where
 					);
 					let ev = Event::RequestTimeout {
 						peer: peer.clone(),
-						original_request,
 						request_duration,
 					};
 					return Poll::Ready(NetworkBehaviourAction::GenerateEvent(ev));

From 4279f33b9aca92c51bc2178abcf440b3eb1d9d8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Wed, 21 Oct 2020 23:50:07 +0200
Subject: [PATCH 0003/1194] Make `decl_runtime_apis!` fail on methods with
 default implementation (#7371)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Make `decl_runtime_apis!` fail on methods with default implementation

Runtime api functions are not allowed to have default implementations.
This fixes this by throwing an error when we detect such a function.

* Update primitives/api/proc-macro/src/decl_runtime_apis.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Update primitives/api/test/tests/ui/no_default_implementation.stderr

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
---
 primitives/api/proc-macro/src/decl_runtime_apis.rs       | 7 +++++++
 .../api/test/tests/ui/no_default_implementation.rs       | 9 +++++++++
 .../api/test/tests/ui/no_default_implementation.stderr   | 8 ++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 primitives/api/test/tests/ui/no_default_implementation.rs
 create mode 100644 primitives/api/test/tests/ui/no_default_implementation.stderr

diff --git a/primitives/api/proc-macro/src/decl_runtime_apis.rs b/primitives/api/proc-macro/src/decl_runtime_apis.rs
index 8294c8bfbd68..a628ade6f9b4 100644
--- a/primitives/api/proc-macro/src/decl_runtime_apis.rs
+++ b/primitives/api/proc-macro/src/decl_runtime_apis.rs
@@ -912,6 +912,13 @@ impl CheckTraitDecl {
 				.entry(method.sig.ident.clone())
 				.or_default()
 				.push(changed_in);
+
+			if method.default.is_some() {
+				self.errors.push(Error::new(
+					method.default.span(),
+					"A runtime API function cannot have a default implementation!",
+				));
+			}
 		});
 
 		method_to_signature_changed.into_iter().for_each(|(f, changed)| {
diff --git a/primitives/api/test/tests/ui/no_default_implementation.rs b/primitives/api/test/tests/ui/no_default_implementation.rs
new file mode 100644
index 000000000000..6af93d6b8653
--- /dev/null
+++ b/primitives/api/test/tests/ui/no_default_implementation.rs
@@ -0,0 +1,9 @@
+sp_api::decl_runtime_apis! {
+	pub trait Api {
+		fn test() {
+			println!("Hey, I'm a default implementation!");
+		}
+	}
+}
+
+fn main() {}
diff --git a/primitives/api/test/tests/ui/no_default_implementation.stderr b/primitives/api/test/tests/ui/no_default_implementation.stderr
new file mode 100644
index 000000000000..0ccece144191
--- /dev/null
+++ b/primitives/api/test/tests/ui/no_default_implementation.stderr
@@ -0,0 +1,8 @@
+error: A runtime API function cannot have a default implementation!
+ --> $DIR/no_default_implementation.rs:3:13
+  |
+3 |           fn test() {
+  |  ___________________^
+4 | |             println!("Hey, I'm a default implementation!");
+5 | |         }
+  | |_________^

From 575cbf8bae23bffb1bc5ef50ed91e1524fd30197 Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Thu, 22 Oct 2020 11:15:39 +0200
Subject: [PATCH 0004/1194] client/network: Make
 NetworkService::set_priority_group async (#7352)

As done with `NetworkService::{add_to,remove_from}_priority_group`, make
`NetworkService::set_priority_group` async as well. This future-proofs
the API should we ever decide to use a bounded channel between
`NetworkService` and `NetworkWorker`.
---
 Cargo.lock                                     |  1 +
 client/authority-discovery/Cargo.toml          |  1 +
 client/authority-discovery/src/worker.rs       | 15 +++++++++------
 client/authority-discovery/src/worker/tests.rs |  8 +++++---
 client/network/src/service.rs                  |  5 ++++-
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f43bc9e7ec83..c165c3ccb972 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6309,6 +6309,7 @@ dependencies = [
 name = "sc-authority-discovery"
 version = "0.8.0"
 dependencies = [
+ "async-trait",
  "bytes 0.5.6",
  "derive_more",
  "either",
diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml
index 0e5c22380ded..3b60136eacda 100644
--- a/client/authority-discovery/Cargo.toml
+++ b/client/authority-discovery/Cargo.toml
@@ -17,6 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 prost-build = "0.6.1"
 
 [dependencies]
+async-trait = "0.1"
 bytes = "0.5.0"
 codec = { package = "parity-scale-codec", default-features = false, version = "1.3.4" }
 derive_more = "0.99.2"
diff --git a/client/authority-discovery/src/worker.rs b/client/authority-discovery/src/worker.rs
index ca8a1bdd6370..f204b3adf9bb 100644
--- a/client/authority-discovery/src/worker.rs
+++ b/client/authority-discovery/src/worker.rs
@@ -27,6 +27,7 @@ use futures::{FutureExt, Stream, StreamExt, stream::Fuse};
 use futures_timer::Delay;
 
 use addr_cache::AddrCache;
+use async_trait::async_trait;
 use codec::Decode;
 use either::Either;
 use libp2p::{core::multiaddr, multihash::Multihash};
@@ -267,7 +268,7 @@ where
 				},
 				// Set peerset priority group to a new random set of addresses.
 				_ = self.priority_group_set_interval.next().fuse() => {
-					if let Err(e) = self.set_priority_group() {
+					if let Err(e) = self.set_priority_group().await {
 						error!(
 							target: LOG_TARGET,
 							"Failed to set priority group: {:?}", e,
@@ -629,7 +630,7 @@ where
 
 	/// Set the peer set 'authority' priority group to a new random set of
 	/// [`Multiaddr`]s.
-	fn set_priority_group(&self) -> Result<()> {
+	async fn set_priority_group(&self) -> Result<()> {
 		let addresses = self.addr_cache.get_random_subset();
 
 		if addresses.is_empty() {
@@ -653,7 +654,7 @@ where
 			.set_priority_group(
 				AUTHORITIES_PRIORITY_GROUP_NAME.to_string(),
 				addresses.into_iter().collect(),
-			)
+			).await
 			.map_err(Error::SettingPeersetPriorityGroup)?;
 
 		Ok(())
@@ -663,9 +664,10 @@ where
 /// NetworkProvider provides [`Worker`] with all necessary hooks into the
 /// underlying Substrate networking. Using this trait abstraction instead of [`NetworkService`]
 /// directly is necessary to unit test [`Worker`].
+#[async_trait]
 pub trait NetworkProvider: NetworkStateInfo {
 	/// Modify a peerset priority group.
-	fn set_priority_group(
+	async fn set_priority_group(
 		&self,
 		group_id: String,
 		peers: HashSet<libp2p::Multiaddr>,
@@ -678,17 +680,18 @@ pub trait NetworkProvider: NetworkStateInfo {
 	fn get_value(&self, key: &libp2p::kad::record::Key);
 }
 
+#[async_trait::async_trait]
 impl<B, H> NetworkProvider for sc_network::NetworkService<B, H>
 where
 	B: BlockT + 'static,
 	H: ExHashT,
 {
-	fn set_priority_group(
+	async fn set_priority_group(
 		&self,
 		group_id: String,
 		peers: HashSet<libp2p::Multiaddr>,
 	) -> std::result::Result<(), String> {
-		self.set_priority_group(group_id, peers)
+		self.set_priority_group(group_id, peers).await
 	}
 	fn put_value(&self, key: libp2p::kad::record::Key, value: Vec<u8>) {
 		self.put_value(key, value)
diff --git a/client/authority-discovery/src/worker/tests.rs b/client/authority-discovery/src/worker/tests.rs
index cb1f8df8a822..98177f45729d 100644
--- a/client/authority-discovery/src/worker/tests.rs
+++ b/client/authority-discovery/src/worker/tests.rs
@@ -20,6 +20,7 @@ use crate::worker::schema;
 
 use std::{iter::FromIterator, sync::{Arc, Mutex}, task::Poll};
 
+use async_trait::async_trait;
 use futures::channel::mpsc::{self, channel};
 use futures::executor::{block_on, LocalPool};
 use futures::future::FutureExt;
@@ -213,8 +214,9 @@ impl Default for TestNetwork {
 	}
 }
 
+#[async_trait]
 impl NetworkProvider for TestNetwork {
-	fn set_priority_group(
+	async fn set_priority_group(
 		&self,
 		group_id: String,
 		peers: HashSet<Multiaddr>,
@@ -424,7 +426,7 @@ fn publish_discover_cycle() {
 		// Make authority discovery handle the event.
 		worker.handle_dht_event(dht_event).await;
 
-		worker.set_priority_group().unwrap();
+		worker.set_priority_group().await.unwrap();
 
 		// Expect authority discovery to set the priority set.
 		assert_eq!(network.set_priority_group_call.lock().unwrap().len(), 1);
@@ -623,7 +625,7 @@ fn never_add_own_address_to_priority_group() {
 	sentry_worker.start_new_lookups();
 
 	sentry_worker.handle_dht_value_found_event(vec![dht_event]).unwrap();
-	sentry_worker.set_priority_group().unwrap();
+	block_on(sentry_worker.set_priority_group()).unwrap();
 
 	assert_eq!(
 		sentry_network.set_priority_group_call.lock().unwrap().len(), 1,
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index f0cf79182bfc..9cb37e7700f3 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -973,7 +973,10 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	///
 	/// Returns an `Err` if one of the given addresses is invalid or contains an
 	/// invalid peer ID (which includes the local peer ID).
-	pub fn set_priority_group(&self, group_id: String, peers: HashSet<Multiaddr>) -> Result<(), String> {
+	//
+	// NOTE: even though this function is currently sync, it's marked as async for
+	// future-proofing, see https://github.com/paritytech/substrate/pull/7247#discussion_r502263451.
+	pub async fn set_priority_group(&self, group_id: String, peers: HashSet<Multiaddr>) -> Result<(), String> {
 		let peers = self.split_multiaddr_and_peer_id(peers)?;
 
 		let peer_ids = peers.iter().map(|(peer_id, _addr)| peer_id.clone()).collect();

From 27515376d0c500fad9ee4f803c126d9de1088942 Mon Sep 17 00:00:00 2001
From: Cecile Tonglet <cecile@parity.io>
Date: Thu, 22 Oct 2020 12:02:16 +0200
Subject: [PATCH 0005/1194] Small fix for log line prefix (#7373)

---
 client/cli/src/lib.rs     | 12 +++++--
 client/cli/src/logging.rs | 75 ++-------------------------------------
 2 files changed, 13 insertions(+), 74 deletions(-)

diff --git a/client/cli/src/lib.rs b/client/cli/src/lib.rs
index e63e379533a6..d64f0161312f 100644
--- a/client/cli/src/lib.rs
+++ b/client/cli/src/lib.rs
@@ -423,6 +423,11 @@ mod tests {
 
 	#[test]
 	fn prefix_in_log_lines() {
+		let re = regex::Regex::new(&format!(
+			r"^\d{{4}}-\d{{2}}-\d{{2}} \d{{2}}:\d{{2}}:\d{{2}}  \[{}\] {}$",
+			EXPECTED_NODE_NAME,
+			EXPECTED_LOG_MESSAGE,
+		)).unwrap();
 		let executable = env::current_exe().unwrap();
 		let output = Command::new(executable)
 			.env("ENABLE_LOGGING", "1")
@@ -431,7 +436,10 @@ mod tests {
 			.unwrap();
 
 		let output = String::from_utf8(output.stderr).unwrap();
-		assert!(output.contains(&format!(" [{}] ", EXPECTED_NODE_NAME)));
+		assert!(
+			re.is_match(output.trim()),
+			format!("Expected:\n{}\nGot:\n{}", re, output),
+		);
 	}
 
 	/// This is no actual test, it will be used by the `prefix_in_log_lines` test.
@@ -448,6 +456,6 @@ mod tests {
 
 	#[crate::prefix_logs_with(EXPECTED_NODE_NAME)]
 	fn prefix_in_log_lines_process() {
-		log::info!("Hello World!");
+		log::info!("{}", EXPECTED_LOG_MESSAGE);
 	}
 }
diff --git a/client/cli/src/logging.rs b/client/cli/src/logging.rs
index 3b87d95fe064..e1fc90505b45 100644
--- a/client/cli/src/logging.rs
+++ b/client/cli/src/logging.rs
@@ -16,12 +16,9 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use ansi_term::{Colour, Style};
-use std::{fmt::{self, Write as _}, iter};
-use tracing::{
-	span::{self, Attributes},
-	Event, Id, Level, Subscriber,
-};
+use ansi_term::Colour;
+use std::fmt;
+use tracing::{span::Attributes, Event, Id, Level, Subscriber};
 use tracing_log::NormalizeEvent;
 use tracing_subscriber::{
 	fmt::{
@@ -93,8 +90,6 @@ where
 			}
 		}
 
-		let fmt_ctx = { FmtCtx::new(&ctx, event.parent(), self.ansi) };
-		write!(writer, "{}", fmt_ctx)?;
 		if self.display_target {
 			write!(writer, "{}:", meta.target())?;
 		}
@@ -247,70 +242,6 @@ impl<'a> fmt::Display for FmtThreadName<'a> {
 	}
 }
 
-struct FmtCtx<'a, S, N> {
-	ctx: &'a FmtContext<'a, S, N>,
-	span: Option<&'a span::Id>,
-	ansi: bool,
-}
-
-impl<'a, S, N: 'a> FmtCtx<'a, S, N>
-where
-	S: Subscriber + for<'lookup> LookupSpan<'lookup>,
-	N: for<'writer> FormatFields<'writer> + 'static,
-{
-	pub(crate) fn new(
-		ctx: &'a FmtContext<'_, S, N>,
-		span: Option<&'a span::Id>,
-		ansi: bool,
-	) -> Self {
-		Self { ctx, ansi, span }
-	}
-
-	fn bold(&self) -> Style {
-		if self.ansi {
-			return Style::new().bold();
-		}
-
-		Style::new()
-	}
-}
-
-// NOTE: the following code took inspiration from tracing-subscriber
-//
-//       https://github.com/tokio-rs/tracing/blob/2f59b32/tracing-subscriber/src/fmt/format/mod.rs#L711
-impl<'a, S, N: 'a> fmt::Display for FmtCtx<'a, S, N>
-where
-	S: Subscriber + for<'lookup> LookupSpan<'lookup>,
-	N: for<'writer> FormatFields<'writer> + 'static,
-{
-	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-		let bold = self.bold();
-		let mut seen = false;
-
-		let span = self
-			.span
-			.and_then(|id| self.ctx.span(&id))
-			.or_else(|| self.ctx.lookup_current());
-
-		let scope = span
-			.into_iter()
-			.flat_map(|span| span.from_root().chain(iter::once(span)));
-
-		for name in scope
-			.map(|span| span.metadata().name())
-			.filter(|&x| x != "substrate-node")
-		{
-			seen = true;
-			write!(f, "{}:", bold.paint(name))?;
-		}
-
-		if seen {
-			f.write_char(' ')?;
-		}
-		Ok(())
-	}
-}
-
 // NOTE: the following code has been duplicated from tracing-subscriber
 //
 //       https://github.com/tokio-rs/tracing/blob/2f59b32/tracing-subscriber/src/fmt/time/mod.rs#L252

From 019019fff21a2ba7128eb3c23d8f65e9bb03caee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Thu, 22 Oct 2020 21:09:13 +0200
Subject: [PATCH 0006/1194] Improve `mock_impl_runtime_apis!` (#7370)

* Improve `mock_impl_runtime_apis!`

This adds a new attribute for functions being implemented in the
`mock_impl_runtime_apis!` macro, the `advanced` attribute. When this
attribute is given the user gets access to the `at` parameter and is
able to return a `Result`, instead of letting the macro generate this
stuff.

* Use the `at_param_name` directly

* Prevent clashing of `params`
---
 .../proc-macro/src/mock_impl_runtime_apis.rs  | 150 +++++++++++++++---
 primitives/api/src/lib.rs                     |  64 +++++++-
 primitives/api/test/tests/decl_and_impl.rs    |  27 +++-
 .../ui/mock_advanced_block_id_by_value.rs     |  20 +++
 .../ui/mock_advanced_block_id_by_value.stderr |  13 ++
 .../tests/ui/mock_advanced_missing_blockid.rs |  20 +++
 .../ui/mock_advanced_missing_blockid.stderr   |   5 +
 .../tests/ui/mock_only_one_error_type.stderr  |  27 ++--
 primitives/core/src/lib.rs                    |   7 +
 9 files changed, 287 insertions(+), 46 deletions(-)
 create mode 100644 primitives/api/test/tests/ui/mock_advanced_block_id_by_value.rs
 create mode 100644 primitives/api/test/tests/ui/mock_advanced_block_id_by_value.stderr
 create mode 100644 primitives/api/test/tests/ui/mock_advanced_missing_blockid.rs
 create mode 100644 primitives/api/test/tests/ui/mock_advanced_missing_blockid.stderr

diff --git a/primitives/api/proc-macro/src/mock_impl_runtime_apis.rs b/primitives/api/proc-macro/src/mock_impl_runtime_apis.rs
index 0e8f18e3e6f1..3e2fd42951b3 100644
--- a/primitives/api/proc-macro/src/mock_impl_runtime_apis.rs
+++ b/primitives/api/proc-macro/src/mock_impl_runtime_apis.rs
@@ -24,16 +24,22 @@ use crate::utils::{
 
 use proc_macro2::{Span, TokenStream};
 
-use quote::quote;
+use quote::{quote, quote_spanned};
 
 use syn::{
 	spanned::Spanned, parse_macro_input, Ident, Type, ItemImpl, ImplItem, TypePath, parse_quote,
-	parse::{Parse, ParseStream, Result, Error}, fold::{self, Fold},
+	parse::{Parse, ParseStream, Result, Error}, fold::{self, Fold}, Attribute, Pat,
 };
 
 /// Unique identifier used to make the hidden includes unique for this macro.
 const HIDDEN_INCLUDES_ID: &str = "MOCK_IMPL_RUNTIME_APIS";
 
+/// The `advanced` attribute.
+///
+/// If this attribute is given to a function, the function gets access to the `BlockId` as first
+/// parameter and needs to return a `Result` with the appropiate error type.
+const ADVANCED_ATTRIBUTE: &str = "advanced";
+
 /// The structure used for parsing the runtime api implementations.
 struct RuntimeApiImpls {
 	impls: Vec<ItemImpl>,
@@ -65,10 +71,16 @@ fn implement_common_api_traits(
 
 	let error_type = error_type.map(|e| quote!(#e)).unwrap_or_else(|| quote!(String));
 
-	Ok(quote!(
+	// Quote using the span from `error_type` to generate nice error messages when the type is
+	// not implementing a trait or similar.
+	let api_error_ext = quote_spanned! { error_type.span() =>
 		impl #crate_::ApiErrorExt for #self_ty {
 			type Error = #error_type;
 		}
+	};
+
+	Ok(quote!(
+		#api_error_ext
 
 		impl #crate_::ApiExt<#block_type> for #self_ty {
 			type StateBackend = #crate_::InMemoryBackend<#crate_::HashFor<#block_type>>;
@@ -89,7 +101,7 @@ fn implement_common_api_traits(
 
 			fn has_api_with<A: #crate_::RuntimeApiInfo + ?Sized, P: Fn(u32) -> bool>(
 				&self,
-				at: &#crate_::BlockId<#block_type>,
+				_: &#crate_::BlockId<#block_type>,
 				pred: P,
 			) -> std::result::Result<bool, #error_type> where Self: Sized {
 				Ok(pred(A::VERSION))
@@ -153,6 +165,61 @@ fn implement_common_api_traits(
 	))
 }
 
+/// Returns if the advanced attribute is present in the given `attributes`.
+///
+/// If the attribute was found, it will be automatically removed from the vec.
+fn has_advanced_attribute(attributes: &mut Vec<Attribute>) -> bool {
+	let mut found = false;
+	attributes.retain(|attr| if attr.path.is_ident(ADVANCED_ATTRIBUTE) {
+		found = true;
+		false
+	} else {
+		true
+	});
+
+	found
+}
+
+/// Get the name and type of the `at` parameter that is passed to a runtime api function.
+///
+/// If `is_advanced` is `false`, the name is `_`.
+fn get_at_param_name(
+	is_advanced: bool,
+	param_names: &mut Vec<Pat>,
+	param_types_and_borrows: &mut Vec<(TokenStream, bool)>,
+	function_span: Span,
+	default_block_id_type: &TokenStream,
+) -> Result<(TokenStream, TokenStream)> {
+	if is_advanced {
+		if param_names.is_empty() {
+			return Err(Error::new(
+				function_span,
+				format!(
+					"If using the `{}` attribute, it is required that the function \
+					 takes at least one argument, the `BlockId`.",
+					ADVANCED_ATTRIBUTE,
+				),
+			))
+		}
+
+		// `param_names` and `param_types` have the same length, so if `param_names` is not empty
+		// `param_types` can not be empty as well.
+		let ptype_and_borrows = param_types_and_borrows.remove(0);
+		let span = ptype_and_borrows.1.span();
+		if !ptype_and_borrows.1 {
+			return Err(Error::new(
+				span,
+				"`BlockId` needs to be taken by reference and not by value!",
+			))
+		}
+
+		let name = param_names.remove(0);
+		Ok((quote!( #name ), ptype_and_borrows.0))
+	} else {
+		Ok((quote!( _ ), default_block_id_type.clone()))
+	}
+}
+
 /// Auxialiry structure to fold a runtime api trait implementation into the expected format.
 ///
 /// This renames the methods, changes the method parameters and extracts the error type.
@@ -170,8 +237,10 @@ impl<'a> Fold for FoldRuntimeApiImpl<'a> {
 	fn fold_impl_item_method(&mut self, mut input: syn::ImplItemMethod) -> syn::ImplItemMethod {
 		let block = {
 			let crate_ = generate_crate_access(HIDDEN_INCLUDES_ID);
+			let is_advanced = has_advanced_attribute(&mut input.attrs);
+			let mut errors = Vec::new();
 
-			let (param_names, param_types, error) = match extract_parameter_names_types_and_borrows(
+			let (mut param_names, mut param_types_and_borrows) = match extract_parameter_names_types_and_borrows(
 				&input.sig,
 				AllowSelfRefInParameters::YesButIgnore,
 			) {
@@ -180,21 +249,40 @@ impl<'a> Fold for FoldRuntimeApiImpl<'a> {
 					res.iter().map(|v| {
 						let ty = &v.1;
 						let borrow = &v.2;
-						quote!( #borrow #ty )
+						(quote_spanned!(ty.span() => #borrow #ty ), v.2.is_some())
 					}).collect::<Vec<_>>(),
-					None
 				),
-				Err(e) => (Vec::new(), Vec::new(), Some(e.to_compile_error())),
+				Err(e) => {
+					errors.push(e.to_compile_error());
+
+					(Default::default(), Default::default())
+				}
 			};
 
 			let block_type = &self.block_type;
+			let block_id_type = quote!( &#crate_::BlockId<#block_type> );
+
+			let (at_param_name, block_id_type) = match get_at_param_name(
+				is_advanced,
+				&mut param_names,
+				&mut param_types_and_borrows,
+				input.span(),
+				&block_id_type,
+			) {
+				Ok(res) => res,
+				Err(e) => {
+					errors.push(e.to_compile_error());
+					(quote!( _ ), block_id_type)
+				}
+			};
 
+			let param_types = param_types_and_borrows.iter().map(|v| &v.0);
 			// Rewrite the input parameters.
 			input.sig.inputs = parse_quote! {
 				&self,
-				_: &#crate_::BlockId<#block_type>,
+				#at_param_name: #block_id_type,
 				_: #crate_::ExecutionContext,
-				params: Option<( #( #param_types ),* )>,
+				___params___sp___api___: Option<( #( #param_types ),* )>,
 				_: Vec<u8>,
 			};
 
@@ -202,27 +290,40 @@ impl<'a> Fold for FoldRuntimeApiImpl<'a> {
 				&self.impl_trait,
 				&input.sig.ident,
 			);
-			let ret_type = return_type_extract_type(&input.sig.output);
 
-			// Generate the correct return type.
-			input.sig.output = parse_quote!(
-				-> std::result::Result<#crate_::NativeOrEncoded<#ret_type>, Self::Error>
-			);
+			// When using advanced, the user needs to declare the correct return type on its own,
+			// otherwise do it for the user.
+			if !is_advanced {
+				let ret_type = return_type_extract_type(&input.sig.output);
+
+				// Generate the correct return type.
+				input.sig.output = parse_quote!(
+					-> std::result::Result<#crate_::NativeOrEncoded<#ret_type>, Self::Error>
+				);
+			}
 
 			let orig_block = input.block.clone();
 
+			let construct_return_value = if is_advanced {
+				quote!( (move || #orig_block)() )
+			} else {
+				quote! {
+					let __fn_implementation__ = move || #orig_block;
+
+					Ok(#crate_::NativeOrEncoded::Native(__fn_implementation__()))
+				}
+			};
+
 			// Generate the new method implementation that calls into the runtime.
 			parse_quote!(
 				{
 					// Get the error to the user (if we have one).
-					#error
+					#( #errors )*
 
-					let (#( #param_names ),*) = params
+					let (#( #param_names ),*) = ___params___sp___api___
 						.expect("Mocked runtime apis don't support calling deprecated api versions");
 
-					let __fn_implementation__ = move || #orig_block;
-
-					Ok(#crate_::NativeOrEncoded::Native(__fn_implementation__()))
+					#construct_return_value
 				}
 			)
 		};
@@ -240,10 +341,17 @@ impl<'a> Fold for FoldRuntimeApiImpl<'a> {
 				if ty.ident == "Error" {
 					if let Some(error_type) = self.error_type {
 						if *error_type != ty.ty {
-							let error = Error::new(
+							let mut error = Error::new(
 								ty.span(),
 								"Error type can not change between runtime apis",
 							);
+							let error_first = Error::new(
+								error_type.span(),
+								"First error type was declared here."
+							);
+
+							error.combine(error_first);
+
 							ImplItem::Verbatim(error.to_compile_error())
 						} else {
 							ImplItem::Verbatim(Default::default())
diff --git a/primitives/api/src/lib.rs b/primitives/api/src/lib.rs
index bad6c0305832..9dadce3b5545 100644
--- a/primitives/api/src/lib.rs
+++ b/primitives/api/src/lib.rs
@@ -241,20 +241,18 @@ pub use sp_api_proc_macro::impl_runtime_apis;
 
 /// Mocks given trait implementations as runtime apis.
 ///
-/// Accepts similar syntax as [`impl_runtime_apis!`](macro.impl_runtime_apis.html) and generates
+/// Accepts similar syntax as [`impl_runtime_apis!`] and generates
 /// simplified mock implementations of the given runtime apis. The difference in syntax is that the
 /// trait does not need to be referenced by a qualified path, methods accept the `&self` parameter
-/// and the error type can be specified as associated type. If no error type is specified `String`
+/// and the error type can be specified as associated type. If no error type is specified [`String`]
 /// is used as error type.
 ///
-/// Besides implementing the given traits, the [`Core`], [`ApiExt`] and [`ApiErrorExt`] are
-/// implemented automatically.
+/// Besides implementing the given traits, the [`Core`](sp_api::Core), [`ApiExt`](sp_api::ApiExt)
+/// and [`ApiErrorExt`](sp_api::ApiErrorExt) are implemented automatically.
 ///
 /// # Example
 ///
 /// ```rust
-/// use sp_version::create_runtime_str;
-/// #
 /// # use sp_runtime::traits::Block as BlockT;
 /// # use sp_test_primitives::Block;
 /// #
@@ -270,7 +268,6 @@ pub use sp_api_proc_macro::impl_runtime_apis;
 /// #        fn build_block() -> Block;
 /// #     }
 /// # }
-///
 /// struct MockApi {
 ///     balance: u64,
 /// }
@@ -301,6 +298,59 @@ pub use sp_api_proc_macro::impl_runtime_apis;
 ///
 /// # fn main() {}
 /// ```
+///
+/// # `advanced` attribute
+///
+/// This attribute can be placed above individual function in the mock implementation to request
+/// more control over the function declaration. From the client side each runtime api function is
+/// called with the `at` parameter that is a [`BlockId`](sp_api::BlockId). When using the `advanced`
+/// attribute, the macro expects that the first parameter of the function is this `at` parameter.
+/// Besides that the macro also doesn't do the automatic return value rewrite, which means that full
+/// return value must be specified. The full return value is constructed like
+/// [`Result`]`<`[`NativeOrEncoded`](sp_api::NativeOrEncoded)`<ReturnValue>, Error>` while
+/// `ReturnValue` being the return value that is specified in the trait declaration.
+///
+/// ## Example
+/// ```rust
+/// # use sp_runtime::{traits::Block as BlockT, generic::BlockId};
+/// # use sp_test_primitives::Block;
+/// # use sp_core::NativeOrEncoded;
+/// #
+/// # sp_api::decl_runtime_apis! {
+/// #     /// Declare the api trait.
+/// #     pub trait Balance {
+/// #         /// Get the balance.
+/// #         fn get_balance() -> u64;
+/// #         /// Set the balance.
+/// #         fn set_balance(val: u64);
+/// #     }
+/// # }
+/// struct MockApi {
+///     balance: u64,
+/// }
+///
+/// sp_api::mock_impl_runtime_apis! {
+///     impl Balance<Block> for MockApi {
+///         type Error = String;
+///         #[advanced]
+///         fn get_balance(&self, at: &BlockId<Block>) -> Result<NativeOrEncoded<u64>, String> {
+///             println!("Being called at: {}", at);
+///
+///             Ok(self.balance.into())
+///         }
+///         #[advanced]
+///         fn set_balance(at: &BlockId<Block>, val: u64) -> Result<NativeOrEncoded<()>, String> {
+///             if let BlockId::Number(1) = at {
+///                 println!("Being called to set balance to: {}", val);
+///             }
+///
+///             Ok(().into())
+///         }
+///     }
+/// }
+///
+/// # fn main() {}
+/// ```
 pub use sp_api_proc_macro::mock_impl_runtime_apis;
 
 /// A type that records all accessed trie nodes and generates a proof out of it.
diff --git a/primitives/api/test/tests/decl_and_impl.rs b/primitives/api/test/tests/decl_and_impl.rs
index f16f0bbe71c5..594882baf1e3 100644
--- a/primitives/api/test/tests/decl_and_impl.rs
+++ b/primitives/api/test/tests/decl_and_impl.rs
@@ -19,9 +19,8 @@ use sp_api::{
 	RuntimeApiInfo, decl_runtime_apis, impl_runtime_apis, mock_impl_runtime_apis,
 	ApiExt,
 };
-
 use sp_runtime::{traits::{GetNodeBlockType, Block as BlockT}, generic::BlockId};
-
+use sp_core::NativeOrEncoded;
 use substrate_test_runtime_client::runtime::Block;
 use sp_blockchain::Result;
 
@@ -103,9 +102,20 @@ mock_impl_runtime_apis! {
 			unimplemented!()
 		}
 
-		fn same_name() {}
+		#[advanced]
+		fn same_name(_: &BlockId<Block>) -> std::result::Result<NativeOrEncoded<()>, String> {
+			Ok(().into())
+		}
 
-		fn wild_card(_: u32) {}
+		#[advanced]
+		fn wild_card(at: &BlockId<Block>, _: u32) -> std::result::Result<NativeOrEncoded<()>, String> {
+			if let BlockId::Number(1337) = at {
+				// yeah
+				Ok(().into())
+			} else {
+				Err("Ohh noooo".into())
+			}
+		}
 	}
 
 	impl ApiWithCustomVersion<Block> for MockApi {
@@ -180,3 +190,12 @@ fn mock_runtime_api_panics_on_calling_old_version() {
 	#[allow(deprecated)]
 	let _ = mock.same_name_before_version_2(&BlockId::Number(0));
 }
+
+#[test]
+fn mock_runtime_api_works_with_advanced() {
+	let mock = MockApi { block: None };
+
+	Api::<Block>::same_name(&mock, &BlockId::Number(0)).unwrap();
+	mock.wild_card(&BlockId::Number(1337), 1).unwrap();
+	assert_eq!(String::from("Ohh noooo"), mock.wild_card(&BlockId::Number(1336), 1).unwrap_err());
+}
diff --git a/primitives/api/test/tests/ui/mock_advanced_block_id_by_value.rs b/primitives/api/test/tests/ui/mock_advanced_block_id_by_value.rs
new file mode 100644
index 000000000000..1e71730cd0a1
--- /dev/null
+++ b/primitives/api/test/tests/ui/mock_advanced_block_id_by_value.rs
@@ -0,0 +1,20 @@
+use substrate_test_runtime_client::runtime::Block;
+
+sp_api::decl_runtime_apis! {
+	pub trait Api {
+		fn test();
+	}
+}
+
+struct MockApi;
+
+sp_api::mock_impl_runtime_apis! {
+	impl Api<Block> for MockApi {
+		#[advanced]
+		fn test(&self, _: BlockId<Block>) -> Result<sp_core::NativeOrEncoded<()>, String> {
+			Ok(().into())
+		}
+	}
+}
+
+fn main() {}
diff --git a/primitives/api/test/tests/ui/mock_advanced_block_id_by_value.stderr b/primitives/api/test/tests/ui/mock_advanced_block_id_by_value.stderr
new file mode 100644
index 000000000000..efddce05f51b
--- /dev/null
+++ b/primitives/api/test/tests/ui/mock_advanced_block_id_by_value.stderr
@@ -0,0 +1,13 @@
+error: `BlockId` needs to be taken by reference and not by value!
+  --> $DIR/mock_advanced_block_id_by_value.rs:11:1
+   |
+11 | / sp_api::mock_impl_runtime_apis! {
+12 | |     impl Api<Block> for MockApi {
+13 | |         #[advanced]
+14 | |         fn test(&self, _: BlockId<Block>) -> Result<sp_core::NativeOrEncoded<()>, String> {
+...  |
+17 | |     }
+18 | | }
+   | |_^
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/primitives/api/test/tests/ui/mock_advanced_missing_blockid.rs b/primitives/api/test/tests/ui/mock_advanced_missing_blockid.rs
new file mode 100644
index 000000000000..407ea90ee882
--- /dev/null
+++ b/primitives/api/test/tests/ui/mock_advanced_missing_blockid.rs
@@ -0,0 +1,20 @@
+use substrate_test_runtime_client::runtime::Block;
+
+sp_api::decl_runtime_apis! {
+	pub trait Api {
+		fn test();
+	}
+}
+
+struct MockApi;
+
+sp_api::mock_impl_runtime_apis! {
+	impl Api<Block> for MockApi {
+		#[advanced]
+		fn test(&self) -> Result<sp_core::NativeOrEncoded<()>, String> {
+			Ok(().into())
+		}
+	}
+}
+
+fn main() {}
diff --git a/primitives/api/test/tests/ui/mock_advanced_missing_blockid.stderr b/primitives/api/test/tests/ui/mock_advanced_missing_blockid.stderr
new file mode 100644
index 000000000000..e7a66ebc5dba
--- /dev/null
+++ b/primitives/api/test/tests/ui/mock_advanced_missing_blockid.stderr
@@ -0,0 +1,5 @@
+error: If using the `advanced` attribute, it is required that the function takes at least one argument, the `BlockId`.
+  --> $DIR/mock_advanced_missing_blockid.rs:14:3
+   |
+14 |         fn test(&self) -> Result<sp_core::NativeOrEncoded<()>, String> {
+   |         ^^
diff --git a/primitives/api/test/tests/ui/mock_only_one_error_type.stderr b/primitives/api/test/tests/ui/mock_only_one_error_type.stderr
index 65d05e83a7f6..daac5674d6ff 100644
--- a/primitives/api/test/tests/ui/mock_only_one_error_type.stderr
+++ b/primitives/api/test/tests/ui/mock_only_one_error_type.stderr
@@ -4,22 +4,22 @@ error: Error type can not change between runtime apis
 23 |         type Error = u64;
    |         ^^^^
 
+error: First error type was declared here.
+  --> $DIR/mock_only_one_error_type.rs:17:16
+   |
+17 |         type Error = u32;
+   |                      ^^^
+
 error[E0277]: the trait bound `u32: std::convert::From<std::string::String>` is not satisfied
-   --> $DIR/mock_only_one_error_type.rs:15:1
+   --> $DIR/mock_only_one_error_type.rs:17:16
+    |
+17  |         type Error = u32;
+    |                      ^^^ the trait `std::convert::From<std::string::String>` is not implemented for `u32`
     |
-15  | / sp_api::mock_impl_runtime_apis! {
-16  | |     impl Api<Block> for MockApi {
-17  | |         type Error = u32;
-18  | |
-...   |
-26  | |     }
-27  | | }
-    | |_^ the trait `std::convert::From<std::string::String>` is not implemented for `u32`
-    | 
-   ::: $WORKSPACE/primitives/api/src/lib.rs:350:35
+   ::: $WORKSPACE/primitives/api/src/lib.rs
     |
-350 |       type Error: std::fmt::Debug + From<String>;
-    |                                     ------------ required by this bound in `sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ApiErrorExt`
+    |     type Error: std::fmt::Debug + From<String>;
+    |                                   ------------ required by this bound in `sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ApiErrorExt`
     |
     = help: the following implementations were found:
               <u32 as std::convert::From<bool>>
@@ -27,4 +27,3 @@ error[E0277]: the trait bound `u32: std::convert::From<std::string::String>` is
               <u32 as std::convert::From<h2::frame::reason::Reason>>
               <u32 as std::convert::From<h2::frame::reason::Reason>>
             and 18 others
-    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/primitives/core/src/lib.rs b/primitives/core/src/lib.rs
index bef033df6c9b..7857937aebfd 100644
--- a/primitives/core/src/lib.rs
+++ b/primitives/core/src/lib.rs
@@ -196,6 +196,13 @@ pub enum NativeOrEncoded<R> {
 	Encoded(Vec<u8>)
 }
 
+#[cfg(feature = "std")]
+impl<R> From<R> for NativeOrEncoded<R> {
+	fn from(val: R) -> Self {
+		Self::Native(val)
+	}
+}
+
 #[cfg(feature = "std")]
 impl<R: codec::Encode> sp_std::fmt::Debug for NativeOrEncoded<R> {
 	fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {

From 7142b928ba8a66d4b7a9c7f4a92cdc04b5983dc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Fri, 23 Oct 2020 10:21:59 +0100
Subject: [PATCH 0007/1194] build: add nix shell (#7376)

---
 shell.nix | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 shell.nix

diff --git a/shell.nix b/shell.nix
new file mode 100644
index 000000000000..79d9e67bde1f
--- /dev/null
+++ b/shell.nix
@@ -0,0 +1,23 @@
+let
+  mozillaOverlay =
+    import (builtins.fetchGit {
+      url = "https://github.com/mozilla/nixpkgs-mozilla.git";
+      rev = "57c8084c7ef41366993909c20491e359bbb90f54";
+    });
+  nixpkgs = import <nixpkgs> { overlays = [ mozillaOverlay ]; };
+  rust-nightly = with nixpkgs; ((rustChannelOf { date = "2020-10-01"; channel = "nightly"; }).rust.override {
+    targets = [ "wasm32-unknown-unknown" ];
+  });
+in
+with nixpkgs; pkgs.mkShell {
+  buildInputs = [
+    clang
+    cmake
+    pkg-config
+    rust-nightly
+  ];
+
+  LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
+  PROTOC = "${protobuf}/bin/protoc";
+  ROCKSDB_LIB_DIR = "${rocksdb}/lib";
+}

From bcd24684503a66ec01bd10610c7f6eb14687ed8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Fri, 23 Oct 2020 21:08:04 +0200
Subject: [PATCH 0008/1194] Make Substrate compile with latest nightly (#7381)

* Try to get it compiling

* One more

* Make stable happy

* Make stable even more happy ;)

* Update shell.nix
---
 client/cli/src/commands/export_blocks_cmd.rs  |  2 +-
 client/finality-grandpa/src/voting_rule.rs    |  2 +-
 client/informant/src/display.rs               |  2 +-
 client/network/src/light_client_handler.rs    |  2 +-
 client/service/src/chain_ops/export_blocks.rs |  2 +-
 client/service/src/chain_ops/import_blocks.rs |  4 ++--
 client/service/src/client/client.rs           |  4 ++--
 client/service/src/metrics.rs                 |  4 ++--
 client/transaction-pool/src/lib.rs            |  2 +-
 frame/aura/src/lib.rs                         |  4 ++--
 frame/babe/src/lib.rs                         |  2 +-
 frame/benchmarking/src/lib.rs                 |  4 ++--
 frame/contracts/src/wasm/runtime.rs           |  2 +-
 frame/example-offchain-worker/src/lib.rs      |  8 +++----
 frame/executive/src/lib.rs                    |  2 +-
 frame/grandpa/src/benchmarking.rs             |  4 ++--
 frame/grandpa/src/lib.rs                      |  2 +-
 frame/im-online/src/lib.rs                    |  6 ++---
 frame/offences/benchmarking/src/lib.rs        |  9 ++++----
 frame/randomness-collective-flip/src/lib.rs   |  2 +-
 frame/staking/src/benchmarking.rs             | 22 +++++++++----------
 frame/system/benchmarking/src/lib.rs          |  6 ++---
 frame/system/src/offchain.rs                  |  2 +-
 frame/timestamp/src/lib.rs                    |  2 +-
 frame/treasury/src/lib.rs                     |  7 +++++-
 primitives/arithmetic/src/fixed_point.rs      |  6 ++---
 primitives/npos-elections/src/mock.rs         |  2 +-
 shell.nix                                     |  2 +-
 test-utils/client/src/client_ext.rs           |  2 +-
 29 files changed, 63 insertions(+), 57 deletions(-)

diff --git a/client/cli/src/commands/export_blocks_cmd.rs b/client/cli/src/commands/export_blocks_cmd.rs
index e175d498941b..497531ad393b 100644
--- a/client/cli/src/commands/export_blocks_cmd.rs
+++ b/client/cli/src/commands/export_blocks_cmd.rs
@@ -85,7 +85,7 @@ impl ExportBlocksCmd {
 			info!("DB path: {}", path.display());
 		}
 
-		let from = self.from.as_ref().and_then(|f| f.parse().ok()).unwrap_or(1);
+		let from = self.from.as_ref().and_then(|f| f.parse().ok()).unwrap_or(1u32);
 		let to = self.to.as_ref().and_then(|t| t.parse().ok());
 
 		let binary = self.binary;
diff --git a/client/finality-grandpa/src/voting_rule.rs b/client/finality-grandpa/src/voting_rule.rs
index 60493867ce1f..700b0aeb551c 100644
--- a/client/finality-grandpa/src/voting_rule.rs
+++ b/client/finality-grandpa/src/voting_rule.rs
@@ -241,7 +241,7 @@ impl<Block, B> Default for VotingRulesBuilder<Block, B> where
 {
 	fn default() -> Self {
 		VotingRulesBuilder::new()
-			.add(BeforeBestBlockBy(2.into()))
+			.add(BeforeBestBlockBy(2u32.into()))
 			.add(ThreeQuartersOfTheUnfinalizedChain)
 	}
 }
diff --git a/client/informant/src/display.rs b/client/informant/src/display.rs
index aa2d883b5baa..5c8f5f8ef84a 100644
--- a/client/informant/src/display.rs
+++ b/client/informant/src/display.rs
@@ -166,7 +166,7 @@ fn speed<B: BlockT>(
 	} else {
 		// If the number of blocks can't be converted to a regular integer, then we need a more
 		// algebraic approach and we stay within the realm of integers.
-		let one_thousand = NumberFor::<B>::from(1_000);
+		let one_thousand = NumberFor::<B>::from(1_000u32);
 		let elapsed = NumberFor::<B>::from(
 			<u32 as TryFrom<_>>::try_from(elapsed_ms).unwrap_or(u32::max_value())
 		);
diff --git a/client/network/src/light_client_handler.rs b/client/network/src/light_client_handler.rs
index c1ff14fc82a2..d1c407c99695 100644
--- a/client/network/src/light_client_handler.rs
+++ b/client/network/src/light_client_handler.rs
@@ -1429,7 +1429,7 @@ mod tests {
 			_: ChangesProof<B::Header>
 		) -> Result<Vec<(NumberFor<B>, u32)>, ClientError> {
 			match self.ok {
-				true => Ok(vec![(100.into(), 2)]),
+				true => Ok(vec![(100u32.into(), 2)]),
 				false => Err(ClientError::Backend("Test error".into())),
 			}
 		}
diff --git a/client/service/src/chain_ops/export_blocks.rs b/client/service/src/chain_ops/export_blocks.rs
index 2f32cbf7fbdb..3d2dbcbb9d00 100644
--- a/client/service/src/chain_ops/export_blocks.rs
+++ b/client/service/src/chain_ops/export_blocks.rs
@@ -87,7 +87,7 @@ where
 			// Reached end of the chain.
 			None => return Poll::Ready(Ok(())),
 		}
-		if (block % 10000.into()).is_zero() {
+		if (block % 10000u32.into()).is_zero() {
 			info!("#{}", block);
 		}
 		if block == last {
diff --git a/client/service/src/chain_ops/import_blocks.rs b/client/service/src/chain_ops/import_blocks.rs
index 46ad0d0501d9..74a33c6557c9 100644
--- a/client/service/src/chain_ops/import_blocks.rs
+++ b/client/service/src/chain_ops/import_blocks.rs
@@ -200,7 +200,7 @@ impl<B: BlockT> Speedometer<B> {
 	/// Creates a fresh Speedometer.
 	fn new() -> Self {
 		Self {
-			best_number: NumberFor::<B>::from(0),
+			best_number: NumberFor::<B>::from(0u32),
 			last_number: None,
 			last_update: Instant::now(),
 		}
@@ -232,7 +232,7 @@ impl<B: BlockT> Speedometer<B> {
 		} else {
 			// If the number of blocks can't be converted to a regular integer, then we need a more
 			// algebraic approach and we stay within the realm of integers.
-			let one_thousand = NumberFor::<B>::from(1_000);
+			let one_thousand = NumberFor::<B>::from(1_000u32);
 			let elapsed = NumberFor::<B>::from(
 				<u32 as TryFrom<_>>::try_from(elapsed_ms).unwrap_or(u32::max_value())
 			);
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index 64b00f81905d..1b07e6b4f7b2 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -40,7 +40,7 @@ use sp_runtime::{
 	generic::{BlockId, SignedBlock, DigestItem},
 	traits::{
 		Block as BlockT, Header as HeaderT, Zero, NumberFor,
-		HashFor, SaturatedConversion, One, DigestFor,
+		HashFor, SaturatedConversion, One, DigestFor, UniqueSaturatedInto,
 	},
 };
 use sp_state_machine::{
@@ -1141,7 +1141,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		let mut ancestor = load_header(ancestor_hash)?;
 		let mut uncles = Vec::new();
 
-		for _generation in 0..max_generation.saturated_into() {
+		for _generation in 0u32..UniqueSaturatedInto::<u32>::unique_saturated_into(max_generation) {
 			let children = self.backend.blockchain().children(ancestor_hash)?;
 			uncles.extend(children.into_iter().filter(|h| h != &current_hash));
 			current_hash = ancestor_hash;
diff --git a/client/service/src/metrics.rs b/client/service/src/metrics.rs
index 0af393b53f51..d3ad780b5be6 100644
--- a/client/service/src/metrics.rs
+++ b/client/service/src/metrics.rs
@@ -316,9 +316,9 @@ impl MetricsService {
 			);
 
 			if let Some(metrics) = self.metrics.as_ref() {
-				let best_seen_block = net_status
+				let best_seen_block: Option<u64> = net_status
 					.best_seen_block
-					.map(|num: NumberFor<T>| num.unique_saturated_into() as u64);
+					.map(|num: NumberFor<T>| UniqueSaturatedInto::<u64>::unique_saturated_into(num));
 
 				if let Some(best_seen_block) = best_seen_block {
 					metrics.block_height.with_label_values(&["sync_target"]).set(best_seen_block);
diff --git a/client/transaction-pool/src/lib.rs b/client/transaction-pool/src/lib.rs
index 0b6a1e935b9d..e03c01bd1d81 100644
--- a/client/transaction-pool/src/lib.rs
+++ b/client/transaction-pool/src/lib.rs
@@ -569,7 +569,7 @@ impl<PoolApi, Block> MaintainedTransactionPool for BasicPool<PoolApi, Block>
 				let next_action = self.revalidation_strategy.lock().next(
 					block_number,
 					Some(std::time::Duration::from_secs(60)),
-					Some(20.into()),
+					Some(20u32.into()),
 				);
 				let revalidation_strategy = self.revalidation_strategy.clone();
 				let revalidation_queue = self.revalidation_queue.clone();
diff --git a/frame/aura/src/lib.rs b/frame/aura/src/lib.rs
index ca3d1f15f421..e8e0e616bc0d 100644
--- a/frame/aura/src/lib.rs
+++ b/frame/aura/src/lib.rs
@@ -74,7 +74,7 @@ pub trait Trait: pallet_timestamp::Trait {
 decl_storage! {
 	trait Store for Module<T: Trait> as Aura {
 		/// The last timestamp.
-		LastTimestamp get(fn last) build(|_| 0.into()): T::Moment;
+		LastTimestamp get(fn last): T::Moment;
 
 		/// The current authorities
 		pub Authorities get(fn authorities): Vec<T::AuthorityId>;
@@ -196,7 +196,7 @@ impl<T: Trait> Module<T> {
 	pub fn slot_duration() -> T::Moment {
 		// we double the minimum block-period so each author can always propose within
 		// the majority of its slot.
-		<T as pallet_timestamp::Trait>::MinimumPeriod::get().saturating_mul(2.into())
+		<T as pallet_timestamp::Trait>::MinimumPeriod::get().saturating_mul(2u32.into())
 	}
 
 	fn on_timestamp_set(now: T::Moment, slot_duration: T::Moment) {
diff --git a/frame/babe/src/lib.rs b/frame/babe/src/lib.rs
index efada5f18cbf..8cab698fda09 100644
--- a/frame/babe/src/lib.rs
+++ b/frame/babe/src/lib.rs
@@ -379,7 +379,7 @@ impl<T: Trait> Module<T> {
 	pub fn slot_duration() -> T::Moment {
 		// we double the minimum block-period so each author can always propose within
 		// the majority of their slot.
-		<T as pallet_timestamp::Trait>::MinimumPeriod::get().saturating_mul(2.into())
+		<T as pallet_timestamp::Trait>::MinimumPeriod::get().saturating_mul(2u32.into())
 	}
 
 	/// Determine whether an epoch change should take place at this block.
diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
index b189cdb6e705..284b0545d03a 100644
--- a/frame/benchmarking/src/lib.rs
+++ b/frame/benchmarking/src/lib.rs
@@ -820,7 +820,7 @@ macro_rules! impl_benchmark {
 
 						// Set the block number to at least 1 so events are deposited.
 						if $crate::Zero::is_zero(&frame_system::Module::<T>::block_number()) {
-							frame_system::Module::<T>::set_block_number(1.into());
+							frame_system::Module::<T>::set_block_number(1u32.into());
 						}
 
 						// Commit the externalities to the database, flushing the DB cache.
@@ -966,7 +966,7 @@ macro_rules! impl_benchmark_test {
 
 					// Set the block number to at least 1 so events are deposited.
 					if $crate::Zero::is_zero(&frame_system::Module::<T>::block_number()) {
-						frame_system::Module::<T>::set_block_number(1.into());
+						frame_system::Module::<T>::set_block_number(1u32.into());
 					}
 
 					// Run execution + verification
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index d966ff85d965..7d8ce26678c0 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -717,7 +717,7 @@ define_env!(Env, <E: Ext>,
 		let value: BalanceOf<<E as Ext>::T> = read_sandbox_memory_as(ctx, value_ptr, value_len)?;
 		let input_data = read_sandbox_memory(ctx, input_data_ptr, input_data_len)?;
 
-		if value > 0.into() {
+		if value > 0u32.into() {
 			charge_gas(ctx, RuntimeToken::CallSurchargeTransfer)?;
 		}
 
diff --git a/frame/example-offchain-worker/src/lib.rs b/frame/example-offchain-worker/src/lib.rs
index 8e02a09484ef..5fd5eff19bd7 100644
--- a/frame/example-offchain-worker/src/lib.rs
+++ b/frame/example-offchain-worker/src/lib.rs
@@ -269,7 +269,7 @@ decl_module! {
 			// to the storage and other included pallets.
 			//
 			// We can easily import `frame_system` and retrieve a block hash of the parent block.
-			let parent_hash = <system::Module<T>>::block_hash(block_number - 1.into());
+			let parent_hash = <system::Module<T>>::block_hash(block_number - 1u32.into());
 			debug::debug!("Current block: {:?} (parent hash: {:?})", block_number, parent_hash);
 
 			// It's a good practice to keep `fn offchain_worker()` function minimal, and move most
@@ -364,10 +364,10 @@ impl<T: Trait> Module<T> {
 				// transactions in a row. If a strict order is desired, it's better to use
 				// the storage entry for that. (for instance store both block number and a flag
 				// indicating the type of next transaction to send).
-				let transaction_type = block_number % 3.into();
+				let transaction_type = block_number % 3u32.into();
 				if transaction_type == Zero::zero() { TransactionType::Signed }
-				else if transaction_type == T::BlockNumber::from(1) { TransactionType::UnsignedForAny }
-				else if transaction_type == T::BlockNumber::from(2) { TransactionType::UnsignedForAll }
+				else if transaction_type == T::BlockNumber::from(1u32) { TransactionType::UnsignedForAny }
+				else if transaction_type == T::BlockNumber::from(2u32) { TransactionType::UnsignedForAll }
 				else { TransactionType::Raw }
 			},
 			// We are in the grace period, we should not send a transaction this time.
diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index bbd077227a29..43500bef90bb 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -468,7 +468,7 @@ where
 		<AllModules as OffchainWorker<System::BlockNumber>>::offchain_worker(
 			// to maintain backward compatibility we call module offchain workers
 			// with parent block number.
-			header.number().saturating_sub(1.into())
+			header.number().saturating_sub(1u32.into())
 		)
 	}
 }
diff --git a/frame/grandpa/src/benchmarking.rs b/frame/grandpa/src/benchmarking.rs
index 048f99fff7a9..bac2c2458446 100644
--- a/frame/grandpa/src/benchmarking.rs
+++ b/frame/grandpa/src/benchmarking.rs
@@ -65,8 +65,8 @@ benchmarks! {
 	}
 
 	note_stalled {
-		let delay = 1000.into();
-		let best_finalized_block_number = 1.into();
+		let delay = 1000u32.into();
+		let best_finalized_block_number = 1u32.into();
 
 	}: _(RawOrigin::Root, delay, best_finalized_block_number)
 	verify {
diff --git a/frame/grandpa/src/lib.rs b/frame/grandpa/src/lib.rs
index d4612e176005..fe836ac913cb 100644
--- a/frame/grandpa/src/lib.rs
+++ b/frame/grandpa/src/lib.rs
@@ -446,7 +446,7 @@ impl<T: Trait> Module<T> {
 
 				// only allow the next forced change when twice the window has passed since
 				// this one.
-				<NextForced<T>>::put(scheduled_at + in_blocks * 2.into());
+				<NextForced<T>>::put(scheduled_at + in_blocks * 2u32.into());
 			}
 
 			<PendingChange<T>>::put(StoredPendingChange {
diff --git a/frame/im-online/src/lib.rs b/frame/im-online/src/lib.rs
index ef9c6b9182af..716a2cbcb786 100644
--- a/frame/im-online/src/lib.rs
+++ b/frame/im-online/src/lib.rs
@@ -594,7 +594,7 @@ impl<T: Trait> Module<T> {
 
 		// clear the lock in case we have failed to send transaction.
 		if res.is_err() {
-			new_status.sent_at = 0.into();
+			new_status.sent_at = 0u32.into();
 			storage.set(&new_status);
 		}
 
@@ -635,7 +635,7 @@ impl<T: Trait> pallet_session::OneSessionHandler<T::AccountId> for Module<T> {
 		// Since we consider producing blocks as being online,
 		// the heartbeat is deferred a bit to prevent spamming.
 		let block_number = <frame_system::Module<T>>::block_number();
-		let half_session = T::SessionDuration::get() / 2.into();
+		let half_session = T::SessionDuration::get() / 2u32.into();
 		<HeartbeatAfter<T>>::put(block_number + half_session);
 
 		// Remember who the authorities are for the new session.
@@ -723,7 +723,7 @@ impl<T: Trait> frame_support::unsigned::ValidateUnsigned for Module<T> {
 				.priority(T::UnsignedPriority::get())
 				.and_provides((current_session, authority_id))
 				.longevity(TryInto::<u64>::try_into(
-					T::SessionDuration::get() / 2.into()
+					T::SessionDuration::get() / 2u32.into()
 				).unwrap_or(64_u64))
 				.propagate(true)
 				.build()
diff --git a/frame/offences/benchmarking/src/lib.rs b/frame/offences/benchmarking/src/lib.rs
index e35050992368..47055eab73d4 100644
--- a/frame/offences/benchmarking/src/lib.rs
+++ b/frame/offences/benchmarking/src/lib.rs
@@ -87,7 +87,7 @@ struct Offender<T: Trait> {
 }
 
 fn bond_amount<T: Trait>() -> BalanceOf<T> {
-	T::Currency::minimum_balance().saturating_mul(10_000.into())
+	T::Currency::minimum_balance().saturating_mul(10_000u32.into())
 }
 
 fn create_offender<T: Trait>(n: u32, nominators: u32) -> Result<Offender<T>, &'static str> {
@@ -97,7 +97,7 @@ fn create_offender<T: Trait>(n: u32, nominators: u32) -> Result<Offender<T>, &'s
 	let reward_destination = RewardDestination::Staked;
 	let raw_amount = bond_amount::<T>();
 	// add twice as much balance to prevent the account from being killed.
-	let free_amount = raw_amount.saturating_mul(2.into());
+	let free_amount = raw_amount.saturating_mul(2u32.into());
 	T::Currency::make_free_balance_be(&stash, free_amount);
 	let amount: BalanceOf<T> = raw_amount.into();
 	Staking::<T>::bond(
@@ -243,7 +243,8 @@ benchmarks! {
 	verify {
 		// make sure the report was not deferred
 		assert!(Offences::<T>::deferred_offences().is_empty());
-		let slash_amount = slash_fraction * bond_amount::<T>().unique_saturated_into() as u32;
+		let bond_amount: u32 = UniqueSaturatedInto::<u32>::unique_saturated_into(bond_amount::<T>());
+		let slash_amount = slash_fraction * bond_amount;
 		let reward_amount = slash_amount * (1 + n) / 2;
 		let mut slash_events = raw_offenders.into_iter()
 			.flat_map(|offender| {
@@ -379,7 +380,7 @@ benchmarks! {
 		Offences::<T>::set_deferred_offences(deferred_offences);
 		assert!(!Offences::<T>::deferred_offences().is_empty());
 	}: {
-		Offences::<T>::on_initialize(0.into());
+		Offences::<T>::on_initialize(0u32.into());
 	}
 	verify {
 		// make sure that all deferred offences were reported with Ok status.
diff --git a/frame/randomness-collective-flip/src/lib.rs b/frame/randomness-collective-flip/src/lib.rs
index 6b1b9f4f3744..c1747669dab0 100644
--- a/frame/randomness-collective-flip/src/lib.rs
+++ b/frame/randomness-collective-flip/src/lib.rs
@@ -69,7 +69,7 @@ const RANDOM_MATERIAL_LEN: u32 = 81;
 
 fn block_number_to_index<T: Trait>(block_number: T::BlockNumber) -> usize {
 	// on_initialize is called on the first block after genesis
-	let index = (block_number - 1.into()) % RANDOM_MATERIAL_LEN.into();
+	let index = (block_number - 1u32.into()) % RANDOM_MATERIAL_LEN.into();
 	index.try_into().ok().expect("Something % 81 is always smaller than usize; qed")
 }
 
diff --git a/frame/staking/src/benchmarking.rs b/frame/staking/src/benchmarking.rs
index e9467fa50be1..d2f769b06943 100644
--- a/frame/staking/src/benchmarking.rs
+++ b/frame/staking/src/benchmarking.rs
@@ -101,7 +101,7 @@ pub fn create_validator_with_nominators<T: Trait>(
 	// Create reward pool
 	let total_payout = T::Currency::minimum_balance()
 		.saturating_mul(upper_bound.into())
-		.saturating_mul(1000.into());
+		.saturating_mul(1000u32.into());
 	<ErasValidatorReward<T>>::insert(current_era, total_payout);
 
 	Ok((v_stash, nominators))
@@ -117,7 +117,7 @@ benchmarks! {
 		let controller = create_funded_user::<T>("controller", USER_SEED, 100);
 		let controller_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(controller.clone());
 		let reward_destination = RewardDestination::Staked;
-		let amount = T::Currency::minimum_balance() * 10.into();
+		let amount = T::Currency::minimum_balance() * 10u32.into();
 		whitelist_account!(stash);
 	}: _(RawOrigin::Signed(stash.clone()), controller_lookup, amount, reward_destination)
 	verify {
@@ -127,7 +127,7 @@ benchmarks! {
 
 	bond_extra {
 		let (stash, controller) = create_stash_controller::<T>(USER_SEED, 100, Default::default())?;
-		let max_additional = T::Currency::minimum_balance() * 10.into();
+		let max_additional = T::Currency::minimum_balance() * 10u32.into();
 		let ledger = Ledger::<T>::get(&controller).ok_or("ledger not created before")?;
 		let original_bonded: BalanceOf<T> = ledger.active;
 		whitelist_account!(stash);
@@ -140,7 +140,7 @@ benchmarks! {
 
 	unbond {
 		let (_, controller) = create_stash_controller::<T>(USER_SEED, 100, Default::default())?;
-		let amount = T::Currency::minimum_balance() * 10.into();
+		let amount = T::Currency::minimum_balance() * 10u32.into();
 		let ledger = Ledger::<T>::get(&controller).ok_or("ledger not created before")?;
 		let original_bonded: BalanceOf<T> = ledger.active;
 		whitelist_account!(controller);
@@ -157,7 +157,7 @@ benchmarks! {
 		let s in 0 .. MAX_SPANS;
 		let (stash, controller) = create_stash_controller::<T>(0, 100, Default::default())?;
 		add_slashing_spans::<T>(&stash, s);
-		let amount = T::Currency::minimum_balance() * 5.into(); // Half of total
+		let amount = T::Currency::minimum_balance() * 5u32.into(); // Half of total
 		Staking::<T>::unbond(RawOrigin::Signed(controller.clone()).into(), amount)?;
 		CurrentEra::put(EraIndex::max_value());
 		let ledger = Ledger::<T>::get(&controller).ok_or("ledger not created before")?;
@@ -176,7 +176,7 @@ benchmarks! {
 		let s in 0 .. MAX_SPANS;
 		let (stash, controller) = create_stash_controller::<T>(0, 100, Default::default())?;
 		add_slashing_spans::<T>(&stash, s);
-		let amount = T::Currency::minimum_balance() * 10.into();
+		let amount = T::Currency::minimum_balance() * 10u32.into();
 		Staking::<T>::unbond(RawOrigin::Signed(controller.clone()).into(), amount)?;
 		CurrentEra::put(EraIndex::max_value());
 		let ledger = Ledger::<T>::get(&controller).ok_or("ledger not created before")?;
@@ -362,7 +362,7 @@ benchmarks! {
 		let (_, controller) = create_stash_controller::<T>(USER_SEED, 100, Default::default())?;
 		let mut staking_ledger = Ledger::<T>::get(controller.clone()).unwrap();
 		let unlock_chunk = UnlockChunk::<BalanceOf<T>> {
-			value: 1.into(),
+			value: 1u32.into(),
 			era: EraIndex::zero(),
 		};
 		for _ in 0 .. l {
@@ -400,7 +400,7 @@ benchmarks! {
 		let s in 1 .. MAX_SPANS;
 		let (stash, controller) = create_stash_controller::<T>(0, 100, Default::default())?;
 		add_slashing_spans::<T>(&stash, s);
-		T::Currency::make_free_balance_be(&stash, 0.into());
+		T::Currency::make_free_balance_be(&stash, 0u32.into());
 		whitelist_account!(controller);
 	}: _(RawOrigin::Signed(controller), stash.clone(), s)
 	verify {
@@ -447,7 +447,7 @@ benchmarks! {
 		ErasRewardPoints::<T>::insert(current_era, reward);
 
 		// Create reward pool
-		let total_payout = T::Currency::minimum_balance() * 1000.into();
+		let total_payout = T::Currency::minimum_balance() * 1000u32.into();
 		<ErasValidatorReward<T>>::insert(current_era, total_payout);
 
 		let caller: T::AccountId = whitelisted_caller();
@@ -463,14 +463,14 @@ benchmarks! {
 		let (stash, controller) = create_stash_controller::<T>(0, 100, Default::default())?;
 		let mut staking_ledger = Ledger::<T>::get(controller.clone()).unwrap();
 		let unlock_chunk = UnlockChunk::<BalanceOf<T>> {
-			value: 1.into(),
+			value: 1u32.into(),
 			era: EraIndex::zero(),
 		};
 		for _ in 0 .. l {
 			staking_ledger.unlocking.push(unlock_chunk.clone())
 		}
 		Ledger::<T>::insert(controller, staking_ledger);
-		let slash_amount = T::Currency::minimum_balance() * 10.into();
+		let slash_amount = T::Currency::minimum_balance() * 10u32.into();
 		let balance_before = T::Currency::free_balance(&stash);
 	}: {
 		crate::slashing::do_slash::<T>(
diff --git a/frame/system/benchmarking/src/lib.rs b/frame/system/benchmarking/src/lib.rs
index 9b630520e65d..b631d00e47c5 100644
--- a/frame/system/benchmarking/src/lib.rs
+++ b/frame/system/benchmarking/src/lib.rs
@@ -139,17 +139,17 @@ benchmarks! {
 	suicide {
 		let caller: T::AccountId = whitelisted_caller();
 		let account_info = AccountInfo::<T::Index, T::AccountData> {
-			nonce: 1337.into(),
+			nonce: 1337u32.into(),
 			refcount: 0,
 			data: T::AccountData::default()
 		};
 		frame_system::Account::<T>::insert(&caller, account_info);
 		let new_account_info = System::<T>::account(caller.clone());
-		assert_eq!(new_account_info.nonce, 1337.into());
+		assert_eq!(new_account_info.nonce, 1337u32.into());
 	}: _(RawOrigin::Signed(caller.clone()))
 	verify {
 		let account_info = System::<T>::account(&caller);
-		assert_eq!(account_info.nonce, 0.into());
+		assert_eq!(account_info.nonce, 0u32.into());
 	}
 }
 
diff --git a/frame/system/src/offchain.rs b/frame/system/src/offchain.rs
index 6e6284b57fdc..ba5cfb8536f2 100644
--- a/frame/system/src/offchain.rs
+++ b/frame/system/src/offchain.rs
@@ -183,7 +183,7 @@ impl<T: SigningTypes, C: AppCrypto<T::Public, T::Signature>, X> Signer<T, C, X>
 			.enumerate()
 			.map(|(index, key)| {
 				let generic_public = C::GenericPublic::from(key);
-				let public = generic_public.into();
+				let public: T::Public = generic_public.into();
 				let account_id = public.clone().into_account();
 				Account::new(index, account_id, public)
 			})
diff --git a/frame/timestamp/src/lib.rs b/frame/timestamp/src/lib.rs
index f2a74d36e023..e03037f2e8e1 100644
--- a/frame/timestamp/src/lib.rs
+++ b/frame/timestamp/src/lib.rs
@@ -200,7 +200,7 @@ decl_module! {
 decl_storage! {
 	trait Store for Module<T: Trait> as Timestamp {
 		/// Current time for the current block.
-		pub Now get(fn now) build(|_| 0.into()): T::Moment;
+		pub Now get(fn now): T::Moment;
 
 		/// Did the timestamp get updated in this block?
 		DidUpdate: bool;
diff --git a/frame/treasury/src/lib.rs b/frame/treasury/src/lib.rs
index 7173f7c524fc..a61f64e907d8 100644
--- a/frame/treasury/src/lib.rs
+++ b/frame/treasury/src/lib.rs
@@ -1410,7 +1410,12 @@ impl<T: Trait<I>, I: Instance> Module<T, I> {
 		BountyCount::<I>::put(index + 1);
 
 		let bounty = Bounty {
-			proposer, value, fee: 0.into(), curator_deposit: 0.into(), bond, status: BountyStatus::Proposed,
+			proposer,
+			value,
+			fee: 0u32.into(),
+			curator_deposit: 0u32.into(),
+			bond,
+			status: BountyStatus::Proposed,
 		};
 
 		Bounties::<T, I>::insert(index, &bounty);
diff --git a/primitives/arithmetic/src/fixed_point.rs b/primitives/arithmetic/src/fixed_point.rs
index 970a24156027..8b882666946d 100644
--- a/primitives/arithmetic/src/fixed_point.rs
+++ b/primitives/arithmetic/src/fixed_point.rs
@@ -536,10 +536,10 @@ macro_rules! implement_fixed {
 			}
 		}
 
-		impl<P: PerThing> From<P> for $name {
+		impl<P: PerThing> From<P> for $name where P::Inner: FixedPointOperand {
 			fn from(p: P) -> Self {
-				let accuracy = P::ACCURACY.saturated_into();
-				let value = p.deconstruct().saturated_into();
+				let accuracy = P::ACCURACY;
+				let value = p.deconstruct();
 				$name::saturating_from_rational(value, accuracy)
 			}
 		}
diff --git a/primitives/npos-elections/src/mock.rs b/primitives/npos-elections/src/mock.rs
index 32c9d1223862..75ff292450df 100644
--- a/primitives/npos-elections/src/mock.rs
+++ b/primitives/npos-elections/src/mock.rs
@@ -308,7 +308,7 @@ pub(crate) fn create_stake_of(stakes: &[(AccountId, VoteWeight)])
 pub fn check_assignments_sum<T: PerThing>(assignments: Vec<Assignment<AccountId, T>>) {
 	for Assignment { distribution, .. } in assignments {
 		let mut sum: u128 = Zero::zero();
-		distribution.iter().for_each(|(_, p)| sum += p.deconstruct().saturated_into());
+		distribution.iter().for_each(|(_, p)| sum += p.deconstruct().saturated_into::<u128>());
 		assert_eq!(sum, T::ACCURACY.saturated_into(), "Assignment ratio sum is not 100%");
 	}
 }
diff --git a/shell.nix b/shell.nix
index 79d9e67bde1f..9d660df4a1ed 100644
--- a/shell.nix
+++ b/shell.nix
@@ -5,7 +5,7 @@ let
       rev = "57c8084c7ef41366993909c20491e359bbb90f54";
     });
   nixpkgs = import <nixpkgs> { overlays = [ mozillaOverlay ]; };
-  rust-nightly = with nixpkgs; ((rustChannelOf { date = "2020-10-01"; channel = "nightly"; }).rust.override {
+  rust-nightly = with nixpkgs; ((rustChannelOf { date = "2020-10-23"; channel = "nightly"; }).rust.override {
     targets = [ "wasm32-unknown-unknown" ];
   });
 in
diff --git a/test-utils/client/src/client_ext.rs b/test-utils/client/src/client_ext.rs
index a74bd3258ef0..43e89c8f10bc 100644
--- a/test-utils/client/src/client_ext.rs
+++ b/test-utils/client/src/client_ext.rs
@@ -79,7 +79,7 @@ impl<B, E, RA, Block> ClientExt<Block> for Client<B, E, Block, RA>
 	}
 
 	fn genesis_hash(&self) -> <Block as BlockT>::Hash {
-		self.block_hash(0.into()).unwrap().unwrap()
+		self.block_hash(0u32.into()).unwrap().unwrap()
 	}
 }
 

From b890b6037a379a490f6f33f831a4439f41dd7bee Mon Sep 17 00:00:00 2001
From: kaichao <kaichaosuna@gmail.com>
Date: Sat, 24 Oct 2020 17:50:25 +0800
Subject: [PATCH 0009/1194] fix darwin (#7385)

---
 shell.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/shell.nix b/shell.nix
index 9d660df4a1ed..85bdce797cb8 100644
--- a/shell.nix
+++ b/shell.nix
@@ -15,6 +15,8 @@ with nixpkgs; pkgs.mkShell {
     cmake
     pkg-config
     rust-nightly
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.Security
   ];
 
   LIBCLANG_PATH = "${llvmPackages.libclang}/lib";

From c60f00840034017d4b7e6d20bd4fcf9a3f5b529a Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Sat, 24 Oct 2020 13:52:59 +0200
Subject: [PATCH 0010/1194] Fix wrong outgoing calculation in election (#7384)

* Fix wrong outgoing calculation in election

* Add test.

* Lil bit better naming.
---
 frame/elections-phragmen/src/lib.rs | 84 +++++++++++++++++++++--------
 1 file changed, 62 insertions(+), 22 deletions(-)

diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index 964cf6daf2ce..b1c4ea5e679b 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -892,12 +892,15 @@ impl<T: Trait> Module<T> {
 			voters_and_votes.clone(),
 			None,
 		).map(|ElectionResult { winners, assignments: _ }| {
-			let old_members_ids = <Members<T>>::take().into_iter()
+			// this is already sorted by id.
+			let old_members_ids_sorted = <Members<T>>::take().into_iter()
 				.map(|(m, _)| m)
 				.collect::<Vec<T::AccountId>>();
-			let old_runners_up_ids = <RunnersUp<T>>::take().into_iter()
+			// this one needs a sort by id.
+			let mut old_runners_up_ids_sorted = <RunnersUp<T>>::take().into_iter()
 				.map(|(r, _)| r)
 				.collect::<Vec<T::AccountId>>();
+			old_runners_up_ids_sorted.sort();
 
 			// filter out those who end up with no backing stake.
 			let new_set_with_stake = winners
@@ -912,17 +915,17 @@ impl<T: Trait> Module<T> {
 
 			// split new set into winners and runners up.
 			let split_point = desired_seats.min(new_set_with_stake.len());
-			let mut new_members = (&new_set_with_stake[..split_point]).to_vec();
+			let mut new_members_sorted_by_id = (&new_set_with_stake[..split_point]).to_vec();
 
 			// save the runners up as-is. They are sorted based on desirability.
 			// save the members, sorted based on account id.
-			new_members.sort_by(|i, j| i.0.cmp(&j.0));
+			new_members_sorted_by_id.sort_by(|i, j| i.0.cmp(&j.0));
 
 			// Now we select a prime member using a [Borda count](https://en.wikipedia.org/wiki/Borda_count).
 			// We weigh everyone's vote for that new member by a multiplier based on the order
 			// of the votes. i.e. the first person a voter votes for gets a 16x multiplier,
 			// the next person gets a 15x multiplier, an so on... (assuming `MAXIMUM_VOTE` = 16)
-			let mut prime_votes: Vec<_> = new_members.iter().map(|c| (&c.0, BalanceOf::<T>::zero())).collect();
+			let mut prime_votes: Vec<_> = new_members_sorted_by_id.iter().map(|c| (&c.0, BalanceOf::<T>::zero())).collect();
 			for (_, stake, votes) in voters_and_stakes.into_iter() {
 				for (vote_multiplier, who) in votes.iter()
 					.enumerate()
@@ -940,54 +943,58 @@ impl<T: Trait> Module<T> {
 			// the person with the "highest" account id based on the sort above.
 			let prime = prime_votes.into_iter().max_by_key(|x| x.1).map(|x| x.0.clone());
 
-			// new_members_ids is sorted by account id.
-			let new_members_ids = new_members
+			// new_members_sorted_by_id is sorted by account id.
+			let new_members_ids_sorted = new_members_sorted_by_id
 				.iter()
 				.map(|(m, _)| m.clone())
 				.collect::<Vec<T::AccountId>>();
 
-			let new_runners_up = &new_set_with_stake[split_point..]
+			let new_runners_up_sorted_by_rank = &new_set_with_stake[split_point..]
 				.into_iter()
 				.cloned()
 				.rev()
 				.collect::<Vec<(T::AccountId, BalanceOf<T>)>>();
 			// new_runners_up remains sorted by desirability.
-			let new_runners_up_ids = new_runners_up
+			let mut new_runners_up_ids_sorted = new_runners_up_sorted_by_rank
 				.iter()
 				.map(|(r, _)| r.clone())
 				.collect::<Vec<T::AccountId>>();
+			new_runners_up_ids_sorted.sort();
 
 			// report member changes. We compute diff because we need the outgoing list.
 			let (incoming, outgoing) = T::ChangeMembers::compute_members_diff(
-				&new_members_ids,
-				&old_members_ids,
+				&new_members_ids_sorted,
+				&old_members_ids_sorted,
 			);
 			T::ChangeMembers::change_members_sorted(
 				&incoming,
 				&outgoing,
-				&new_members_ids,
+				&new_members_ids_sorted,
 			);
 			T::ChangeMembers::set_prime(prime);
 
-			// outgoing candidates lose their bond.
+			// outgoing members lose their bond.
 			let mut to_burn_bond = outgoing.to_vec();
 
 			// compute the outgoing of runners up as well and append them to the `to_burn_bond`
 			{
 				let (_, outgoing) = T::ChangeMembers::compute_members_diff(
-					&new_runners_up_ids,
-					&old_runners_up_ids,
+					&new_runners_up_ids_sorted,
+					&old_runners_up_ids_sorted,
 				);
+				// none of the ones computed to be outgoing must still be in the list.
+				debug_assert!(outgoing.iter().all(|o| !new_runners_up_ids_sorted.contains(o)));
 				to_burn_bond.extend(outgoing);
 			}
 
 			// Burn loser bond. members list is sorted. O(NLogM) (N candidates, M members)
-			// runner up list is not sorted. O(K*N) given K runner ups. Overall: O(NLogM + N*K)
+			// runner up list is also sorted. O(NLogK) given K runner ups. Overall: O(NLogM + N*K)
 			// both the member and runner counts are bounded.
 			exposed_candidates.into_iter().for_each(|c| {
 				// any candidate who is not a member and not a runner up.
-				if new_members.binary_search_by_key(&c, |(m, _)| m.clone()).is_err()
-					&& !new_runners_up_ids.contains(&c)
+				if
+					new_members_ids_sorted.binary_search(&c).is_err() &&
+					new_runners_up_ids_sorted.binary_search(&c).is_err()
 				{
 					let (imbalance, _) = T::Currency::slash_reserved(&c, T::CandidacyBond::get());
 					T::LoserCandidate::on_unbalanced(imbalance);
@@ -1000,10 +1007,10 @@ impl<T: Trait> Module<T> {
 				T::LoserCandidate::on_unbalanced(imbalance);
 			});
 
-			<Members<T>>::put(&new_members);
-			<RunnersUp<T>>::put(new_runners_up);
+			<Members<T>>::put(&new_members_sorted_by_id);
+			<RunnersUp<T>>::put(new_runners_up_sorted_by_rank);
 
-			Self::deposit_event(RawEvent::NewTerm(new_members.clone().to_vec()));
+			Self::deposit_event(RawEvent::NewTerm(new_members_sorted_by_id.clone().to_vec()));
 
 			// clean candidates.
 			<Candidates<T>>::kill();
@@ -1260,7 +1267,6 @@ mod tests {
 			self.genesis_members = members;
 			self
 		}
-		#[cfg(feature = "runtime-benchmarks")]
 		pub fn desired_members(mut self, count: u32) -> Self {
 			self.desired_members = count;
 			self
@@ -2836,4 +2842,38 @@ mod tests {
 			assert!(Elections::candidates().is_empty());
 		})
 	}
+
+	#[test]
+	fn unsorted_runners_up_are_detected() {
+		ExtBuilder::default().desired_runners_up(2).desired_members(1).build_and_execute(|| {
+			assert_ok!(submit_candidacy(Origin::signed(5)));
+			assert_ok!(submit_candidacy(Origin::signed(4)));
+			assert_ok!(submit_candidacy(Origin::signed(3)));
+
+
+			assert_ok!(vote(Origin::signed(5), vec![5], 50));
+			assert_ok!(vote(Origin::signed(4), vec![4], 5));
+			assert_ok!(vote(Origin::signed(3), vec![3], 15));
+
+			System::set_block_number(5);
+			Elections::end_block(System::block_number());
+
+			assert_eq!(Elections::members_ids(), vec![5]);
+			assert_eq!(Elections::runners_up_ids(), vec![4, 3]);
+
+			assert_ok!(submit_candidacy(Origin::signed(2)));
+			assert_ok!(vote(Origin::signed(2), vec![2], 10));
+
+			System::set_block_number(10);
+			Elections::end_block(System::block_number());
+
+			assert_eq!(Elections::members_ids(), vec![5]);
+			assert_eq!(Elections::runners_up_ids(), vec![2, 3]);
+
+			// 4 is outgoing runner-up. Slash candidacy bond.
+			assert_eq!(balances(&4), (35, 2));
+			// 3 stays.
+			assert_eq!(balances(&3), (25, 5));
+		})
+	}
 }

From 668390ae5a3cda309f37d5584e81dee522b883c8 Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Mon, 26 Oct 2020 11:06:56 +0100
Subject: [PATCH 0011/1194] client/authority-discovery: Remove sentry node
 logic (#7368)

* client/authority-discovery: Remove sentry node logic

The notion of sentry nodes has been deprecated (see [1] for details).
This commit removes support for sentry nodes in the
`client/authority-discovery` module.

While removing `Role::Sentry` this commit also introduces
`Role::Discover`, allowing a node to discover addresses of authorities
without publishing ones own addresses. This will be needed in Polkadot
for collator nodes.

[1] https://github.com/paritytech/substrate/issues/6845

* client/authority-discovery/service: Improve PeerId comment
---
 bin/node/cli/src/service.rs                   |  22 +--
 client/authority-discovery/src/lib.rs         |   7 +-
 client/authority-discovery/src/service.rs     |  12 +-
 client/authority-discovery/src/tests.rs       |   3 +-
 client/authority-discovery/src/worker.rs      | 128 ++++++------------
 .../authority-discovery/src/worker/tests.rs   | 111 ++-------------
 6 files changed, 69 insertions(+), 214 deletions(-)

diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index 3d5bb8a329af..ecf50dc14634 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -26,7 +26,7 @@ use grandpa::{self, FinalityProofProvider as GrandpaFinalityProofProvider};
 use node_primitives::Block;
 use node_runtime::RuntimeApi;
 use sc_service::{
-	config::{Role, Configuration}, error::{Error as ServiceError},
+	config::{Configuration}, error::{Error as ServiceError},
 	RpcHandlers, TaskManager,
 };
 use sp_inherents::InherentDataProviders;
@@ -258,21 +258,10 @@ pub fn new_full_base(
 	}
 
 	// Spawn authority discovery module.
-	if matches!(role, Role::Authority{..} | Role::Sentry {..}) {
-		let (sentries, authority_discovery_role) = match role {
-			sc_service::config::Role::Authority { ref sentry_nodes } => (
-				sentry_nodes.clone(),
-				sc_authority_discovery::Role::Authority (
-					keystore_container.keystore(),
-				),
-			),
-			sc_service::config::Role::Sentry {..} => (
-				vec![],
-				sc_authority_discovery::Role::Sentry,
-			),
-			_ => unreachable!("Due to outer matches! constraint; qed.")
-		};
-
+	if role.is_authority() {
+		let authority_discovery_role = sc_authority_discovery::Role::PublishAndDiscover(
+			keystore_container.keystore(),
+		);
 		let dht_event_stream = network.event_stream("authority-discovery")
 			.filter_map(|e| async move { match e {
 				Event::Dht(e) => Some(e),
@@ -281,7 +270,6 @@ pub fn new_full_base(
 		let (authority_discovery_worker, _service) = sc_authority_discovery::new_worker_and_service(
 			client.clone(),
 			network.clone(),
-			sentries,
 			Box::pin(dht_event_stream),
 			authority_discovery_role,
 			prometheus_registry.clone(),
diff --git a/client/authority-discovery/src/lib.rs b/client/authority-discovery/src/lib.rs
index 42cf120d70f8..2d789d1e6a08 100644
--- a/client/authority-discovery/src/lib.rs
+++ b/client/authority-discovery/src/lib.rs
@@ -32,7 +32,7 @@ use futures::channel::{mpsc, oneshot};
 use futures::Stream;
 
 use sc_client_api::blockchain::HeaderBackend;
-use sc_network::{config::MultiaddrWithPeerId, DhtEvent,	Multiaddr, PeerId};
+use sc_network::{DhtEvent, Multiaddr, PeerId};
 use sp_authority_discovery::{AuthorityDiscoveryApi, AuthorityId};
 use sp_runtime::traits::Block as BlockT;
 use sp_api::ProvideRuntimeApi;
@@ -44,10 +44,11 @@ mod tests;
 mod worker;
 
 /// Create a new authority discovery [`Worker`] and [`Service`].
+///
+/// See the struct documentation of each for more details.
 pub fn new_worker_and_service<Client, Network, Block, DhtEventStream>(
 	client: Arc<Client>,
 	network: Arc<Network>,
-	sentry_nodes: Vec<MultiaddrWithPeerId>,
 	dht_event_rx: DhtEventStream,
 	role: Role,
 	prometheus_registry: Option<prometheus_endpoint::Registry>,
@@ -62,7 +63,7 @@ where
 	let (to_worker, from_service) = mpsc::channel(0);
 
 	let worker = Worker::new(
-		from_service, client, network, sentry_nodes, dht_event_rx, role, prometheus_registry,
+		from_service, client, network, dht_event_rx, role, prometheus_registry,
 	);
 	let service = Service::new(to_worker);
 
diff --git a/client/authority-discovery/src/service.rs b/client/authority-discovery/src/service.rs
index ed0205d262fc..7eabeb3daf52 100644
--- a/client/authority-discovery/src/service.rs
+++ b/client/authority-discovery/src/service.rs
@@ -43,12 +43,12 @@ impl Service {
 	/// Returns `None` if no entry was present or connection to the
 	/// [`crate::Worker`] failed.
 	///
-	/// [`Multiaddr`]s returned always include a [`PeerId`] via a
-	/// [`libp2p::core::multiaddr:Protocol::P2p`] component. [`Multiaddr`]s
-	/// might differ in their [`PeerId`], e.g. when each [`Multiaddr`]
-	/// represents a different sentry node. This might change once support for
-	/// sentry nodes is removed (see
-	/// https://github.com/paritytech/substrate/issues/6845).
+	/// Note: [`Multiaddr`]s returned always include a [`PeerId`] via a
+	/// [`libp2p::core::multiaddr:Protocol::P2p`] component. Equality of
+	/// [`PeerId`]s across [`Multiaddr`]s returned by a single call is not
+	/// enforced today, given that there are still authorities out there
+	/// publishing the addresses of their sentry nodes on the DHT. In the future
+	/// this guarantee can be provided.
 	pub async fn get_addresses_by_authority_id(&mut self, authority: AuthorityId) -> Option<Vec<Multiaddr>> {
 		let (tx, rx) = oneshot::channel();
 
diff --git a/client/authority-discovery/src/tests.rs b/client/authority-discovery/src/tests.rs
index 88aad0af0696..414ffc1e3f39 100644
--- a/client/authority-discovery/src/tests.rs
+++ b/client/authority-discovery/src/tests.rs
@@ -55,9 +55,8 @@ fn get_addresses_and_authority_id() {
 	let (mut worker, mut service) = new_worker_and_service(
 		test_api,
 		network.clone(),
-		vec![],
 		Box::pin(dht_event_rx),
-		Role::Authority(key_store.into()),
+		Role::PublishAndDiscover(key_store.into()),
 		None,
 	);
 	worker.inject_addresses(remote_authority_id.clone(), vec![remote_addr.clone()]);
diff --git a/client/authority-discovery/src/worker.rs b/client/authority-discovery/src/worker.rs
index f204b3adf9bb..1a0a59f8c49f 100644
--- a/client/authority-discovery/src/worker.rs
+++ b/client/authority-discovery/src/worker.rs
@@ -29,7 +29,6 @@ use futures_timer::Delay;
 use addr_cache::AddrCache;
 use async_trait::async_trait;
 use codec::Decode;
-use either::Either;
 use libp2p::{core::multiaddr, multihash::Multihash};
 use log::{debug, error, log_enabled};
 use prometheus_endpoint::{Counter, CounterVec, Gauge, Opts, U64, register};
@@ -37,7 +36,6 @@ use prost::Message;
 use rand::{seq::SliceRandom, thread_rng};
 use sc_client_api::blockchain::HeaderBackend;
 use sc_network::{
-	config::MultiaddrWithPeerId,
 	DhtEvent,
 	ExHashT,
 	Multiaddr,
@@ -73,68 +71,47 @@ const MAX_ADDRESSES_PER_AUTHORITY: usize = 10;
 /// Maximum number of in-flight DHT lookups at any given point in time.
 const MAX_IN_FLIGHT_LOOKUPS: usize = 8;
 
-/// Role an authority discovery module can run as.
+/// Role an authority discovery [`Worker`] can run as.
 pub enum Role {
-	/// Actual authority as well as a reference to its key store.
-	Authority(Arc<dyn CryptoStore>),
-	/// Sentry node that guards an authority.
-	///
-	/// No reference to its key store needed, as sentry nodes don't have an identity to sign
-	/// addresses with in the first place.
-	Sentry,
+	/// Publish own addresses and discover addresses of others.
+	PublishAndDiscover(Arc<dyn CryptoStore>),
+	/// Discover addresses of others.
+	Discover,
 }
 
-/// A [`Worker`] makes a given authority discoverable and discovers other
-/// authorities.
-///
-/// The [`Worker`] implements the Future trait. By
-/// polling [`Worker`] an authority:
+
+/// An authority discovery [`Worker`] can publish the local node's addresses as well as discover
+/// those of other nodes via a Kademlia DHT.
 ///
-/// 1. **Makes itself discoverable**
+/// When constructed with [`Role::PublishAndDiscover`] a [`Worker`] will
 ///
-///    1. Retrieves its external addresses (including peer id) or the ones of
-///    its sentry nodes.
+///    1. Retrieve its external addresses (including peer id).
 ///
-///    2. Signs the above.
+///    2. Get the list of keys owned by the local node participating in the current authority set.
 ///
-///    3. Puts the signature and the addresses on the libp2p Kademlia DHT.
+///    3. Sign the addresses with the keys.
 ///
+///    4. Put addresses and signature as a record with the authority id as a key on a Kademlia DHT.
 ///
-/// 2. **Discovers other authorities**
+/// When constructed with either [`Role::PublishAndDiscover`] or [`Role::Publish`] a [`Worker`] will
 ///
-///    1. Retrieves the current and next set of authorities.
+///    1. Retrieve the current and next set of authorities.
 ///
-///    2. Starts DHT queries for the ids of the authorities.
+///    2. Start DHT queries for the ids of the authorities.
 ///
-///    3. Validates the signatures of the retrieved key value pairs.
+///    3. Validate the signatures of the retrieved key value pairs.
 ///
-///    4. Adds the retrieved external addresses as priority nodes to the
-///    peerset.
+///    4. Add the retrieved external addresses as priority nodes to the
+///    network peerset.
 ///
-/// When run as a sentry node, the [`Worker`] does not publish
-/// any addresses to the DHT but still discovers validators and sentry nodes of
-/// validators, i.e. only step 2 (Discovers other authorities) is executed.
-pub struct Worker<Client, Network, Block, DhtEventStream>
-where
-	Block: BlockT + 'static,
-	Network: NetworkProvider,
-	Client: ProvideRuntimeApi<Block> + Send + Sync + 'static + HeaderBackend<Block>,
-	<Client as ProvideRuntimeApi<Block>>::Api: AuthorityDiscoveryApi<Block>,
-{
-	/// Channel receiver for messages send by an [`Service`].
+///    5. Allow querying of the collected addresses via the [`crate::Service`].
+pub struct Worker<Client, Network, Block, DhtEventStream> {
+	/// Channel receiver for messages send by a [`Service`].
 	from_service: Fuse<mpsc::Receiver<ServicetoWorkerMsg>>,
 
 	client: Arc<Client>,
 
 	network: Arc<Network>,
-	/// List of sentry node public addresses.
-	//
-	// There are 3 states:
-	//   - None: No addresses were specified.
-	//   - Some(vec![]): Addresses were specified, but none could be parsed as proper
-	//     Multiaddresses.
-	//   - Some(vec![a, b, c, ...]): Valid addresses were specified.
-	sentry_nodes: Option<Vec<Multiaddr>>,
 	/// Channel we receive Dht events on.
 	dht_event_rx: DhtEventStream,
 
@@ -169,15 +146,11 @@ where
 		AuthorityDiscoveryApi<Block, Error = sp_blockchain::Error>,
 	DhtEventStream: Stream<Item = DhtEvent> + Unpin,
 {
-	/// Return a new [`Worker`].
-	///
-	/// Note: When specifying `sentry_nodes` this module will not advertise the public addresses of
-	/// the node itself but only the public addresses of its sentry nodes.
+	/// Construct a [`Worker`].
 	pub(crate) fn new(
 		from_service: mpsc::Receiver<ServicetoWorkerMsg>,
 		client: Arc<Client>,
 		network: Arc<Network>,
-		sentry_nodes: Vec<MultiaddrWithPeerId>,
 		dht_event_rx: DhtEventStream,
 		role: Role,
 		prometheus_registry: Option<prometheus_endpoint::Registry>,
@@ -207,12 +180,6 @@ where
 			query_interval_duration,
 		);
 
-		let sentry_nodes = if !sentry_nodes.is_empty() {
-			Some(sentry_nodes.into_iter().map(|ma| ma.concat()).collect::<Vec<_>>())
-		} else {
-			None
-		};
-
 		let addr_cache = AddrCache::new();
 
 		let metrics = match prometheus_registry {
@@ -232,7 +199,6 @@ where
 			from_service: from_service.fuse(),
 			client,
 			network,
-			sentry_nodes,
 			dht_event_rx,
 			publish_interval,
 			query_interval,
@@ -313,33 +279,23 @@ where
 	}
 
 	fn addresses_to_publish(&self) -> impl ExactSizeIterator<Item = Multiaddr> {
-		match &self.sentry_nodes {
-			Some(addrs) => Either::Left(addrs.clone().into_iter()),
-			None => {
-				let peer_id: Multihash = self.network.local_peer_id().into();
-				Either::Right(
-					self.network.external_addresses()
-						.into_iter()
-						.map(move |a| {
-							if a.iter().any(|p| matches!(p, multiaddr::Protocol::P2p(_))) {
-								a
-							} else {
-								a.with(multiaddr::Protocol::P2p(peer_id.clone()))
-							}
-						}),
-				)
-			}
-		}
+		let peer_id: Multihash = self.network.local_peer_id().into();
+		self.network.external_addresses()
+			.into_iter()
+			.map(move |a| {
+				if a.iter().any(|p| matches!(p, multiaddr::Protocol::P2p(_))) {
+					a
+				} else {
+					a.with(multiaddr::Protocol::P2p(peer_id.clone()))
+				}
+			})
 	}
 
-	/// Publish either our own or if specified the public addresses of our sentry nodes.
+	/// Publish own public addresses.
 	async fn publish_ext_addresses(&mut self) -> Result<()> {
 		let key_store = match &self.role {
-			Role::Authority(key_store) => key_store,
-			// Only authority nodes can put addresses (their own or the ones of their sentry nodes)
-			// on the Dht. Sentry nodes don't have a known identity to authenticate such addresses,
-			// thus `publish_ext_addresses` becomes a no-op.
-			Role::Sentry => return Ok(()),
+			Role::PublishAndDiscover(key_store) => key_store,
+			Role::Discover => return Ok(()),
 		};
 
 		let addresses = self.addresses_to_publish();
@@ -394,12 +350,12 @@ where
 		let id = BlockId::hash(self.client.info().best_hash);
 
 		let local_keys = match &self.role {
-			Role::Authority(key_store) => {
+			Role::PublishAndDiscover(key_store) => {
 				key_store.sr25519_public_keys(
 					key_types::AUTHORITY_DISCOVERY
 				).await.into_iter().collect::<HashSet<_>>()
 			},
-			Role::Sentry => HashSet::new(),
+			Role::Discover => HashSet::new(),
 		};
 
 		let mut authorities = self
@@ -798,13 +754,7 @@ impl Metrics {
 
 // Helper functions for unit testing.
 #[cfg(test)]
-impl<Block, Client, Network, DhtEventStream> Worker<Client, Network, Block, DhtEventStream>
-where
-	Block: BlockT + 'static,
-	Network: NetworkProvider,
-	Client: ProvideRuntimeApi<Block> + Send + Sync + 'static + HeaderBackend<Block>,
-	<Client as ProvideRuntimeApi<Block>>::Api: AuthorityDiscoveryApi<Block>,
-{
+impl<Block, Client, Network, DhtEventStream> Worker<Client, Network, Block, DhtEventStream> {
 	pub(crate) fn inject_addresses(&mut self, authority: AuthorityId, addresses: Vec<Multiaddr>) {
 		self.addr_cache.insert(authority, addresses);
 	}
diff --git a/client/authority-discovery/src/worker/tests.rs b/client/authority-discovery/src/worker/tests.rs
index 98177f45729d..ef78735a9b12 100644
--- a/client/authority-discovery/src/worker/tests.rs
+++ b/client/authority-discovery/src/worker/tests.rs
@@ -303,9 +303,8 @@ fn new_registers_metrics() {
 		from_service,
 		test_api,
 		network.clone(),
-		vec![],
 		Box::pin(dht_event_rx),
-		Role::Authority(key_store.into()),
+		Role::PublishAndDiscover(key_store.into()),
 		Some(registry.clone()),
 	);
 
@@ -332,9 +331,8 @@ fn triggers_dht_get_query() {
 		from_service,
 		test_api,
 		network.clone(),
-		vec![],
 		Box::pin(dht_event_rx),
-		Role::Authority(key_store.into()),
+		Role::PublishAndDiscover(key_store.into()),
 		None,
 	);
 
@@ -381,9 +379,8 @@ fn publish_discover_cycle() {
 			from_service,
 			test_api,
 			network.clone(),
-			vec![],
 			Box::pin(dht_event_rx),
-			Role::Authority(key_store.into()),
+			Role::PublishAndDiscover(key_store.into()),
 			None,
 		);
 
@@ -412,9 +409,8 @@ fn publish_discover_cycle() {
 			from_service,
 			test_api,
 			network.clone(),
-			vec![],
 			Box::pin(dht_event_rx),
-			Role::Authority(key_store.into()),
+			Role::PublishAndDiscover(key_store.into()),
 			None,
 		);
 
@@ -442,6 +438,7 @@ fn publish_discover_cycle() {
 
 	pool.run();
 }
+
 /// Don't terminate when sender side of service channel is dropped. Terminate when network event
 /// stream terminates.
 #[test]
@@ -458,9 +455,8 @@ fn terminate_when_event_stream_terminates() {
 		from_service,
 		test_api,
 		network.clone(),
-		vec![],
 		Box::pin(dht_event_rx),
-		Role::Authority(key_store.into()),
+		Role::PublishAndDiscover(key_store.into()),
 		None,
 	).run();
 	futures::pin_mut!(worker);
@@ -485,7 +481,8 @@ fn terminate_when_event_stream_terminates() {
 			"Expect the authority discovery module to terminate once the \
 			 sending side of the dht event channel is closed.",
 		);
-	});}
+	});
+}
 
 #[test]
 fn dont_stop_polling_dht_event_stream_after_bogus_event() {
@@ -520,9 +517,8 @@ fn dont_stop_polling_dht_event_stream_after_bogus_event() {
 		from_service,
 		test_api,
 		network.clone(),
-		vec![],
 		Box::pin(dht_event_rx),
-		Role::Authority(Arc::new(key_store)),
+		Role::PublishAndDiscover(Arc::new(key_store)),
 		None,
 	);
 
@@ -569,79 +565,6 @@ fn dont_stop_polling_dht_event_stream_after_bogus_event() {
 	});
 }
 
-/// In the scenario of a validator publishing the address of its sentry node to
-/// the DHT, said sentry node should not add its own Multiaddr to the
-/// peerset "authority" priority group.
-#[test]
-fn never_add_own_address_to_priority_group() {
-	let validator_key_store = KeyStore::new();
-	let validator_public = block_on(validator_key_store
-		.sr25519_generate_new(key_types::AUTHORITY_DISCOVERY, None))
-		.unwrap();
-
-	let sentry_network: Arc<TestNetwork> = Arc::new(Default::default());
-
-	let sentry_multiaddr = {
-		let peer_id = sentry_network.local_peer_id();
-		let address: Multiaddr = "/ip6/2001:db8:0:0:0:0:0:2/tcp/30333".parse().unwrap();
-
-		address.with(multiaddr::Protocol::P2p(peer_id.into()))
-	};
-
-	// Address of some other sentry node of `validator`.
-	let random_multiaddr = {
-		let peer_id = PeerId::random();
-		let address: Multiaddr = "/ip6/2001:db8:0:0:0:0:0:1/tcp/30333".parse().unwrap();
-
-		address.with(multiaddr::Protocol::P2p(
-			peer_id.into(),
-		))
-	};
-
-	let dht_event = block_on(build_dht_event(
-		vec![sentry_multiaddr, random_multiaddr.clone()],
-		validator_public.into(),
-		&validator_key_store,
-	));
-
-	let (_dht_event_tx, dht_event_rx) = channel(1);
-	let sentry_test_api = Arc::new(TestApi {
-		// Make sure the sentry node identifies its validator as an authority.
-		authorities: vec![validator_public.into()],
-	});
-
-	let (_to_worker, from_service) = mpsc::channel(0);
-	let mut sentry_worker = Worker::new(
-		from_service,
-		sentry_test_api,
-		sentry_network.clone(),
-		vec![],
-		Box::pin(dht_event_rx),
-		Role::Sentry,
-		None,
-	);
-
-	block_on(sentry_worker.refill_pending_lookups_queue()).unwrap();
-	sentry_worker.start_new_lookups();
-
-	sentry_worker.handle_dht_value_found_event(vec![dht_event]).unwrap();
-	block_on(sentry_worker.set_priority_group()).unwrap();
-
-	assert_eq!(
-		sentry_network.set_priority_group_call.lock().unwrap().len(), 1,
-		"Expect authority discovery to set the priority set.",
-	);
-
-	assert_eq!(
-		sentry_network.set_priority_group_call.lock().unwrap()[0],
-		(
-			"authorities".to_string(),
-			HashSet::from_iter(vec![random_multiaddr.clone()].into_iter(),)
-		),
-		"Expect authority discovery to only add `random_multiaddr`."
-	);
-}
-
 #[test]
 fn limit_number_of_addresses_added_to_cache_per_authority() {
 	let remote_key_store = KeyStore::new();
@@ -670,9 +593,8 @@ fn limit_number_of_addresses_added_to_cache_per_authority() {
 		from_service,
 		Arc::new(TestApi { authorities: vec![remote_public.into()] }),
 		Arc::new(TestNetwork::default()),
-		vec![],
 		Box::pin(dht_event_rx),
-		Role::Sentry,
+		Role::Discover,
 		None,
 	);
 
@@ -713,7 +635,6 @@ fn do_not_cache_addresses_without_peer_id() {
 
 	let (_dht_event_tx, dht_event_rx) = channel(1);
 	let local_test_api = Arc::new(TestApi {
-		// Make sure the sentry node identifies its validator as an authority.
 		authorities: vec![remote_public.into()],
 	});
 	let local_network: Arc<TestNetwork> = Arc::new(Default::default());
@@ -724,9 +645,8 @@ fn do_not_cache_addresses_without_peer_id() {
 		from_service,
 		local_test_api,
 		local_network.clone(),
-		vec![],
 		Box::pin(dht_event_rx),
-		Role::Authority(Arc::new(local_key_store)),
+		Role::PublishAndDiscover(Arc::new(local_key_store)),
 		None,
 	);
 
@@ -759,9 +679,8 @@ fn addresses_to_publish_adds_p2p() {
 			authorities: vec![],
 		}),
 		network.clone(),
-		vec![],
 		Box::pin(dht_event_rx),
-		Role::Authority(Arc::new(KeyStore::new())),
+		Role::PublishAndDiscover(Arc::new(KeyStore::new())),
 		Some(prometheus_endpoint::Registry::new()),
 	);
 
@@ -794,9 +713,8 @@ fn addresses_to_publish_respects_existing_p2p_protocol() {
 			authorities: vec![],
 		}),
 		network.clone(),
-		vec![],
 		Box::pin(dht_event_rx),
-		Role::Authority(Arc::new(KeyStore::new())),
+		Role::PublishAndDiscover(Arc::new(KeyStore::new())),
 		Some(prometheus_endpoint::Registry::new()),
 	);
 
@@ -836,9 +754,8 @@ fn lookup_throttling() {
 		from_service,
 		Arc::new(TestApi { authorities: remote_public_keys.clone() }),
 		network.clone(),
-		vec![],
 		dht_event_rx.boxed(),
-		Role::Sentry,
+		Role::Discover,
 		Some(default_registry().clone()),
 	);
 

From dac12988dee5d0949c0fff33276e7e3c25f41ea3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Mon, 26 Oct 2020 13:02:10 +0100
Subject: [PATCH 0012/1194] Make benchmarks compile with latest nightly (#7395)

---
 frame/balances/src/benchmarking.rs      |   4 +-
 frame/contracts/src/benchmarking/mod.rs | 116 ++++++++++++------------
 frame/democracy/src/benchmarking.rs     |  38 ++++----
 frame/identity/src/benchmarking.rs      |  20 ++--
 frame/treasury/src/benchmarking.rs      |  18 ++--
 frame/vesting/src/benchmarking.rs       |  30 +++---
 6 files changed, 113 insertions(+), 113 deletions(-)

diff --git a/frame/balances/src/benchmarking.rs b/frame/balances/src/benchmarking.rs
index 21f43c7c6364..078d74006ba2 100644
--- a/frame/balances/src/benchmarking.rs
+++ b/frame/balances/src/benchmarking.rs
@@ -49,7 +49,7 @@ benchmarks! {
 		// Transfer `e - 1` existential deposits + 1 unit, which guarantees to create one account, and reap this user.
 		let recipient: T::AccountId = account("recipient", 0, SEED);
 		let recipient_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(recipient.clone());
-		let transfer_amount = existential_deposit.saturating_mul((ED_MULTIPLIER - 1).into()) + 1.into();
+		let transfer_amount = existential_deposit.saturating_mul((ED_MULTIPLIER - 1).into()) + 1u32.into();
 	}: transfer(RawOrigin::Signed(caller.clone()), recipient_lookup, transfer_amount)
 	verify {
 		assert_eq!(Balances::<T>::free_balance(&caller), Zero::zero());
@@ -138,7 +138,7 @@ benchmarks! {
 		// Transfer `e - 1` existential deposits + 1 unit, which guarantees to create one account, and reap this user.
 		let recipient: T::AccountId = account("recipient", 0, SEED);
 		let recipient_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(recipient.clone());
-		let transfer_amount = existential_deposit.saturating_mul((ED_MULTIPLIER - 1).into()) + 1.into();
+		let transfer_amount = existential_deposit.saturating_mul((ED_MULTIPLIER - 1).into()) + 1u32.into();
 	}: force_transfer(RawOrigin::Root, source_lookup, recipient_lookup, transfer_amount)
 	verify {
 		assert_eq!(Balances::<T>::free_balance(&source), Zero::zero());
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index 22bcc3bc4e86..7c084a222a64 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -107,11 +107,11 @@ impl<T: Trait> Contract<T> {
 				// Endowment should be large but not as large to inhibit rent payments.
 				let endowment = T::RentDepositOffset::get()
 					.saturating_mul(storage_size + T::StorageSizeOffset::get().into())
-					.saturating_sub(1.into());
+					.saturating_sub(1u32.into());
 
 				(storage_size, endowment)
 			},
-			Endow::Max => (0.into(), Endow::max::<T>()),
+			Endow::Max => (0u32.into(), Endow::max::<T>()),
 		};
 		T::Currency::make_free_balance_be(&caller, caller_funding::<T>());
 		let addr = T::DetermineContractAddress::contract_address_for(&module.hash, &data, &caller);
@@ -202,7 +202,7 @@ impl<T: Trait> Tombstone<T> {
 		let storage_items = create_storage::<T>(stor_num, stor_size)?;
 		contract.store(&storage_items)?;
 		System::<T>::set_block_number(
-			contract.eviction_at()? + T::SignedClaimHandicap::get() + 5.into()
+			contract.eviction_at()? + T::SignedClaimHandicap::get() + 5u32.into()
 		);
 		crate::rent::collect_rent::<T>(&contract.account_id);
 		contract.ensure_tombstone()?;
@@ -230,7 +230,7 @@ fn create_storage<T: Trait>(
 
 /// The funding that each account that either calls or instantiates contracts is funded with.
 fn caller_funding<T: Trait>() -> BalanceOf<T> {
-	BalanceOf::<T>::max_value() / 2.into()
+	BalanceOf::<T>::max_value() / 2u32.into()
 }
 
 /// Set the block number to one.
@@ -241,7 +241,7 @@ fn caller_funding<T: Trait>() -> BalanceOf<T> {
 /// in the setup closure so that both the instantiate and subsequent call are run with the
 /// same block number.
 fn init_block_number<T: Trait>() {
-	System::<T>::set_block_number(1.into());
+	System::<T>::set_block_number(1u32.into());
 }
 
 benchmarks! {
@@ -301,12 +301,12 @@ benchmarks! {
 		let instance = Contract::<T>::with_caller(
 			whitelisted_caller(), WasmModule::dummy(), vec![], Endow::CollectRent
 		)?;
-		let value = T::Currency::minimum_balance() * 100.into();
+		let value = T::Currency::minimum_balance() * 100u32.into();
 		let origin = RawOrigin::Signed(instance.caller.clone());
 		let callee = instance.addr.clone();
 
 		// trigger rent collection for worst case performance of call
-		System::<T>::set_block_number(instance.eviction_at()? - 5.into());
+		System::<T>::set_block_number(instance.eviction_at()? - 5u32.into());
 		let before = T::Currency::free_balance(&instance.account_id);
 	}: _(origin, callee, value, Weight::max_value(), data)
 	verify {
@@ -339,7 +339,7 @@ benchmarks! {
 
 		// generate enough rent so that the contract is evicted
 		System::<T>::set_block_number(
-			instance.eviction_at()? + T::SignedClaimHandicap::get() + 5.into()
+			instance.eviction_at()? + T::SignedClaimHandicap::get() + 5u32.into()
 		);
 	}: _(origin, account_id, None)
 	verify {
@@ -359,7 +359,7 @@ benchmarks! {
 			"seal_caller", r * API_BENCHMARK_BATCH_SIZE
 		), vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	seal_address {
 		let r in 0 .. API_BENCHMARK_BATCHES;
@@ -367,7 +367,7 @@ benchmarks! {
 			"seal_address", r * API_BENCHMARK_BATCH_SIZE
 		), vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	seal_gas_left {
 		let r in 0 .. API_BENCHMARK_BATCHES;
@@ -375,7 +375,7 @@ benchmarks! {
 			"seal_gas_left", r * API_BENCHMARK_BATCH_SIZE
 		), vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	seal_balance {
 		let r in 0 .. API_BENCHMARK_BATCHES;
@@ -383,7 +383,7 @@ benchmarks! {
 			"seal_balance", r * API_BENCHMARK_BATCH_SIZE
 		), vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	seal_value_transferred {
 		let r in 0 .. API_BENCHMARK_BATCHES;
@@ -391,7 +391,7 @@ benchmarks! {
 			"seal_value_transferred", r * API_BENCHMARK_BATCH_SIZE
 		), vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	seal_minimum_balance {
 		let r in 0 .. API_BENCHMARK_BATCHES;
@@ -399,7 +399,7 @@ benchmarks! {
 			"seal_minimum_balance", r * API_BENCHMARK_BATCH_SIZE
 		), vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	seal_tombstone_deposit {
 		let r in 0 .. API_BENCHMARK_BATCHES;
@@ -407,7 +407,7 @@ benchmarks! {
 			"seal_tombstone_deposit", r * API_BENCHMARK_BATCH_SIZE
 		), vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	seal_rent_allowance {
 		let r in 0 .. API_BENCHMARK_BATCHES;
@@ -415,7 +415,7 @@ benchmarks! {
 			"seal_rent_allowance", r * API_BENCHMARK_BATCH_SIZE
 		), vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	seal_block_number {
 		let r in 0 .. API_BENCHMARK_BATCHES;
@@ -423,7 +423,7 @@ benchmarks! {
 			"seal_block_number", r * API_BENCHMARK_BATCH_SIZE
 		), vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	seal_now {
 		let r in 0 .. API_BENCHMARK_BATCHES;
@@ -431,7 +431,7 @@ benchmarks! {
 			"seal_now", r * API_BENCHMARK_BATCH_SIZE
 		), vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	seal_weight_to_fee {
 		let r in 0 .. API_BENCHMARK_BATCHES;
@@ -457,7 +457,7 @@ benchmarks! {
 		});
 		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	seal_gas {
 		let r in 0 .. API_BENCHMARK_BATCHES;
@@ -476,7 +476,7 @@ benchmarks! {
 		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	// We cannot call seal_input multiple times. Therefore our weight determination is not
 	// as precise as with other APIs. Because this function can only be called once per
@@ -505,7 +505,7 @@ benchmarks! {
 		});
 		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	seal_input_per_kb {
 		let n in 0 .. code::max_pages::<T>() * 64;
@@ -535,7 +535,7 @@ benchmarks! {
 		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
 		let data = vec![42u8; (n * 1024).min(buffer_size) as usize];
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), data)
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), data)
 
 	// The same argument as for `seal_input` is true here.
 	seal_return {
@@ -557,7 +557,7 @@ benchmarks! {
 		});
 		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	seal_return_per_kb {
 		let n in 0 .. code::max_pages::<T>() * 64;
@@ -579,7 +579,7 @@ benchmarks! {
 		});
 		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	// The same argument as for `seal_input` is true here.
 	seal_terminate {
@@ -609,12 +609,12 @@ benchmarks! {
 		});
 		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
-		assert_eq!(T::Currency::total_balance(&beneficiary), 0.into());
+		assert_eq!(T::Currency::total_balance(&beneficiary), 0u32.into());
 		assert_eq!(T::Currency::total_balance(&instance.account_id), Endow::max::<T>());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 	verify {
 		if r > 0 {
-			assert_eq!(T::Currency::total_balance(&instance.account_id), 0.into());
+			assert_eq!(T::Currency::total_balance(&instance.account_id), 0u32.into());
 			assert_eq!(T::Currency::total_balance(&beneficiary), Endow::max::<T>());
 		}
 	}
@@ -686,10 +686,10 @@ benchmarks! {
 			account("origin", 0, 0), code, vec![], Endow::Max
 		)?;
 		instance.store(&tombstone.storage)?;
-		System::<T>::set_block_number(System::<T>::block_number() + 1.into());
+		System::<T>::set_block_number(System::<T>::block_number() + 1u32.into());
 
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 	verify {
 		if r > 0 {
 			tombstone.contract.alive_info()?;
@@ -768,10 +768,10 @@ benchmarks! {
 		)?;
 		instance.store(&tombstone.storage)?;
 		instance.store(&delta)?;
-		System::<T>::set_block_number(System::<T>::block_number() + 1.into());
+		System::<T>::set_block_number(System::<T>::block_number() + 1u32.into());
 
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 	verify {
 		tombstone.contract.alive_info()?;
 	}
@@ -808,7 +808,7 @@ benchmarks! {
 		});
 		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	// Overhead of calling the function without any topic.
 	// We benchmark for the worst case (largest event).
@@ -832,7 +832,7 @@ benchmarks! {
 		});
 		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	// Benchmark the overhead that topics generate.
 	// `t`: Number of topics
@@ -870,7 +870,7 @@ benchmarks! {
 		});
 		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	seal_set_rent_allowance {
 		let r in 0 .. API_BENCHMARK_BATCHES;
@@ -898,7 +898,7 @@ benchmarks! {
 		});
 		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	// Only the overhead of calling the function itself with minimal arguments.
 	// The contract is a bit more complex because I needs to use different keys in order
@@ -934,7 +934,7 @@ benchmarks! {
 		});
 		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	seal_set_storage_per_kb {
 		let n in 0 .. T::MaxValueSize::get() / 1024;
@@ -963,7 +963,7 @@ benchmarks! {
 		});
 		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	// Similar to seal_set_storage. However, we store all the keys that we are about to
 	// delete beforehand in order to prevent any optimizations that could occur when
@@ -1007,7 +1007,7 @@ benchmarks! {
 			.map_err(|_| "Failed to write to storage during setup.")?;
 		}
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	// We make sure that all storage accesses are to unique keys.
 	seal_get_storage {
@@ -1053,7 +1053,7 @@ benchmarks! {
 			.map_err(|_| "Failed to write to storage during setup.")?;
 		}
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	seal_get_storage_per_kb {
 		let n in 0 .. T::MaxValueSize::get() / 1024;
@@ -1096,7 +1096,7 @@ benchmarks! {
 		)
 		.map_err(|_| "Failed to write to storage during setup.")?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	// We transfer to unique accounts.
 	seal_transfer {
@@ -1107,7 +1107,7 @@ benchmarks! {
 		let account_len = accounts.get(0).map(|i| i.encode().len()).unwrap_or(0);
 		let account_bytes = accounts.iter().flat_map(|x| x.encode()).collect();
 		let value = Config::<T>::subsistence_threshold_uncached();
-		assert!(value > 0.into());
+		assert!(value > 0u32.into());
 		let value_bytes = value.encode();
 		let value_len = value_bytes.len();
 		use body::CountedInstruction::{Counter, Regular};
@@ -1141,9 +1141,9 @@ benchmarks! {
 		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 		for account in &accounts {
-			assert_eq!(T::Currency::total_balance(account), 0.into());
+			assert_eq!(T::Currency::total_balance(account), 0u32.into());
 		}
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 	verify {
 		for account in &accounts {
 			assert_eq!(T::Currency::total_balance(account), value);
@@ -1159,7 +1159,7 @@ benchmarks! {
 			.collect::<Result<Vec<_>, _>>()?;
 		let callee_len = callees.get(0).map(|i| i.account_id.encode().len()).unwrap_or(0);
 		let callee_bytes = callees.iter().flat_map(|x| x.account_id.encode()).collect();
-		let value: BalanceOf<T> = 0.into();
+		let value: BalanceOf<T> = 0u32.into();
 		let value_bytes = value.encode();
 		let value_len = value_bytes.len();
 		use body::CountedInstruction::{Counter, Regular};
@@ -1207,7 +1207,7 @@ benchmarks! {
 		});
 		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	seal_call_per_transfer_input_output_kb {
 		let t in 0 .. 1;
@@ -1291,7 +1291,7 @@ benchmarks! {
 		});
 		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	// We assume that every instantiate sends at least the subsistence amount.
 	seal_instantiate {
@@ -1314,7 +1314,7 @@ benchmarks! {
 		let hashes_bytes = hashes.iter().flat_map(|x| x.encode()).collect::<Vec<_>>();
 		let hashes_len = hashes_bytes.len();
 		let value = Config::<T>::subsistence_threshold_uncached();
-		assert!(value > 0.into());
+		assert!(value > 0u32.into());
 		let value_bytes = value.encode();
 		let value_len = value_bytes.len();
 		let addr_len = sp_std::mem::size_of::<T::AccountId>();
@@ -1391,7 +1391,7 @@ benchmarks! {
 				return Err("Expected that contract does not exist at this point.");
 			}
 		}
-	}: call(origin, callee, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, callee, 0u32.into(), Weight::max_value(), vec![])
 	verify {
 		for addr in &addresses {
 			instance.alive_info()?;
@@ -1430,7 +1430,7 @@ benchmarks! {
 		let input_bytes = inputs.iter().cloned().flatten().collect::<Vec<_>>();
 		let inputs_len = input_bytes.len();
 		let value = Config::<T>::subsistence_threshold_uncached();
-		assert!(value > 0.into());
+		assert!(value > 0u32.into());
 		let value_bytes = value.encode();
 		let value_len = value_bytes.len();
 		let addr_len = sp_std::mem::size_of::<T::AccountId>();
@@ -1509,7 +1509,7 @@ benchmarks! {
 		});
 		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	// Only the overhead of calling the function itself with minimal arguments.
 	seal_hash_sha2_256 {
@@ -1518,7 +1518,7 @@ benchmarks! {
 			"seal_hash_sha2_256", r * API_BENCHMARK_BATCH_SIZE, 0,
 		), vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	// `n`: Input to hash in kilobytes
 	seal_hash_sha2_256_per_kb {
@@ -1527,7 +1527,7 @@ benchmarks! {
 			"seal_hash_sha2_256", API_BENCHMARK_BATCH_SIZE, n * 1024,
 		), vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	// Only the overhead of calling the function itself with minimal arguments.
 	seal_hash_keccak_256 {
@@ -1536,7 +1536,7 @@ benchmarks! {
 			"seal_hash_keccak_256", r * API_BENCHMARK_BATCH_SIZE, 0,
 		), vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	// `n`: Input to hash in kilobytes
 	seal_hash_keccak_256_per_kb {
@@ -1545,7 +1545,7 @@ benchmarks! {
 			"seal_hash_keccak_256", API_BENCHMARK_BATCH_SIZE, n * 1024,
 		), vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	// Only the overhead of calling the function itself with minimal arguments.
 	seal_hash_blake2_256 {
@@ -1554,7 +1554,7 @@ benchmarks! {
 			"seal_hash_blake2_256", r * API_BENCHMARK_BATCH_SIZE, 0,
 		), vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	// `n`: Input to hash in kilobytes
 	seal_hash_blake2_256_per_kb {
@@ -1563,7 +1563,7 @@ benchmarks! {
 			"seal_hash_blake2_256", API_BENCHMARK_BATCH_SIZE, n * 1024,
 		), vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	// Only the overhead of calling the function itself with minimal arguments.
 	seal_hash_blake2_128 {
@@ -1572,7 +1572,7 @@ benchmarks! {
 			"seal_hash_blake2_128", r * API_BENCHMARK_BATCH_SIZE, 0,
 		), vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	// `n`: Input to hash in kilobytes
 	seal_hash_blake2_128_per_kb {
@@ -1581,7 +1581,7 @@ benchmarks! {
 			"seal_hash_blake2_128", API_BENCHMARK_BATCH_SIZE, n * 1024,
 		), vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 }
 
 #[cfg(test)]
diff --git a/frame/democracy/src/benchmarking.rs b/frame/democracy/src/benchmarking.rs
index 0b822e885989..b5de1a91c17a 100644
--- a/frame/democracy/src/benchmarking.rs
+++ b/frame/democracy/src/benchmarking.rs
@@ -70,12 +70,12 @@ fn add_referendum<T: Trait>(n: u32) -> Result<ReferendumIndex, &'static str> {
 		T::LaunchPeriod::get(),
 		proposal_hash,
 		vote_threshold,
-		0.into(),
+		0u32.into(),
 	);
 	let referendum_index: ReferendumIndex = ReferendumCount::get() - 1;
 	T::Scheduler::schedule_named(
 		(DEMOCRACY_ID, referendum_index).encode(),
-		DispatchTime::At(1.into()),
+		DispatchTime::At(1u32.into()),
 		None,
 		63,
 		system::RawOrigin::Root.into(),
@@ -140,7 +140,7 @@ benchmarks! {
 		let r in 1 .. MAX_REFERENDUMS;
 
 		let caller = funded_account::<T>("caller", 0);
-		let account_vote = account_vote::<T>(100.into());
+		let account_vote = account_vote::<T>(100u32.into());
 
 		// We need to create existing direct votes
 		for i in 0 .. r {
@@ -168,7 +168,7 @@ benchmarks! {
 		let r in 1 .. MAX_REFERENDUMS;
 
 		let caller = funded_account::<T>("caller", 0);
-		let account_vote = account_vote::<T>(100.into());
+		let account_vote = account_vote::<T>(100u32.into());
 
 		// We need to create existing direct votes
 		for i in 0 ..=r {
@@ -183,7 +183,7 @@ benchmarks! {
 
 		// Change vote from aye to nay
 		let nay = Vote { aye: false, conviction: Conviction::Locked1x };
-		let new_vote = AccountVote::Standard { vote: nay, balance: 1000.into() };
+		let new_vote = AccountVote::Standard { vote: nay, balance: 1000u32.into() };
 		let referendum_index = Democracy::<T>::referendum_count() - 1;
 
 		// This tests when a user changes a vote
@@ -201,7 +201,7 @@ benchmarks! {
 			ReferendumInfo::Ongoing(r) => r.tally,
 			_ => return Err("referendum not ongoing"),
 		};
-		assert_eq!(tally.nays, 1000.into(), "changed vote was not recorded");
+		assert_eq!(tally.nays, 1000u32.into(), "changed vote was not recorded");
 	}
 
 	emergency_cancel {
@@ -287,7 +287,7 @@ benchmarks! {
 		// NOTE: Instant origin may invoke a little bit more logic, but may not always succeed.
 		let origin_fast_track = T::FastTrackOrigin::successful_origin();
 		let voting_period = T::FastTrackVotingPeriod::get();
-		let delay = 0;
+		let delay = 0u32;
 		let call = Call::<T>::fast_track(proposal_hash, voting_period.into(), delay.into());
 
 	}: { call.dispatch_bypass_filter(origin_fast_track)? }
@@ -429,7 +429,7 @@ benchmarks! {
 
 		for (key, mut info) in ReferendumInfoOf::<T>::iter() {
 			if let ReferendumInfo::Ongoing(ref mut status) = info {
-				status.end += 100.into();
+				status.end += 100u32.into();
 			}
 			ReferendumInfoOf::<T>::insert(key, info);
 		}
@@ -437,7 +437,7 @@ benchmarks! {
 		assert_eq!(Democracy::<T>::referendum_count(), r, "referenda not created");
 		assert_eq!(Democracy::<T>::lowest_unbaked(), 0, "invalid referenda init");
 
-	}: { Democracy::<T>::on_initialize(0.into()) }
+	}: { Democracy::<T>::on_initialize(0u32.into()) }
 	verify {
 		// All should be on going
 		for i in 0 .. r {
@@ -453,8 +453,8 @@ benchmarks! {
 	delegate {
 		let r in 1 .. MAX_REFERENDUMS;
 
-		let initial_balance: BalanceOf<T> = 100.into();
-		let delegated_balance: BalanceOf<T> = 1000.into();
+		let initial_balance: BalanceOf<T> = 100u32.into();
+		let delegated_balance: BalanceOf<T> = 1000u32.into();
 
 		let caller = funded_account::<T>("caller", 0);
 		// Caller will initially delegate to `old_delegate`
@@ -503,8 +503,8 @@ benchmarks! {
 	undelegate {
 		let r in 1 .. MAX_REFERENDUMS;
 
-		let initial_balance: BalanceOf<T> = 100.into();
-		let delegated_balance: BalanceOf<T> = 1000.into();
+		let initial_balance: BalanceOf<T> = 100u32.into();
+		let delegated_balance: BalanceOf<T> = 1000u32.into();
 
 		let caller = funded_account::<T>("caller", 0);
 		// Caller will delegate
@@ -619,7 +619,7 @@ benchmarks! {
 
 		let locker = funded_account::<T>("locker", 0);
 		// Populate votes so things are locked
-		let base_balance: BalanceOf<T> = 100.into();
+		let base_balance: BalanceOf<T> = 100u32.into();
 		let small_vote = account_vote::<T>(base_balance);
 		// Vote and immediately unvote
 		for i in 0 .. r {
@@ -643,7 +643,7 @@ benchmarks! {
 
 		let locker = funded_account::<T>("locker", 0);
 		// Populate votes so things are locked
-		let base_balance: BalanceOf<T> = 100.into();
+		let base_balance: BalanceOf<T> = 100u32.into();
 		let small_vote = account_vote::<T>(base_balance);
 		for i in 0 .. r {
 			let ref_idx = add_referendum::<T>(i)?;
@@ -651,7 +651,7 @@ benchmarks! {
 		}
 
 		// Create a big vote so lock increases
-		let big_vote = account_vote::<T>(base_balance * 10.into());
+		let big_vote = account_vote::<T>(base_balance * 10u32.into());
 		let referendum_index = add_referendum::<T>(r)?;
 		Democracy::<T>::vote(RawOrigin::Signed(locker.clone()).into(), referendum_index, big_vote)?;
 
@@ -662,7 +662,7 @@ benchmarks! {
 		assert_eq!(votes.len(), (r + 1) as usize, "Votes were not recorded.");
 
 		let voting = VotingOf::<T>::get(&locker);
-		assert_eq!(voting.locked_balance(), base_balance * 10.into());
+		assert_eq!(voting.locked_balance(), base_balance * 10u32.into());
 
 		Democracy::<T>::remove_vote(RawOrigin::Signed(locker.clone()).into(), referendum_index)?;
 
@@ -685,7 +685,7 @@ benchmarks! {
 		let r in 1 .. MAX_REFERENDUMS;
 
 		let caller = funded_account::<T>("caller", 0);
-		let account_vote = account_vote::<T>(100.into());
+		let account_vote = account_vote::<T>(100u32.into());
 
 		for i in 0 .. r {
 			let ref_idx = add_referendum::<T>(i)?;
@@ -714,7 +714,7 @@ benchmarks! {
 		let r in 1 .. MAX_REFERENDUMS;
 
 		let caller = funded_account::<T>("caller", r);
-		let account_vote = account_vote::<T>(100.into());
+		let account_vote = account_vote::<T>(100u32.into());
 
 		for i in 0 .. r {
 			let ref_idx = add_referendum::<T>(i)?;
diff --git a/frame/identity/src/benchmarking.rs b/frame/identity/src/benchmarking.rs
index d39df27017b7..d7876514452e 100644
--- a/frame/identity/src/benchmarking.rs
+++ b/frame/identity/src/benchmarking.rs
@@ -43,7 +43,7 @@ fn add_registrars<T: Trait>(r: u32) -> Result<(), &'static str> {
 		let registrar: T::AccountId = account("registrar", i, SEED);
 		let _ = T::Currency::make_free_balance_be(&registrar, BalanceOf::<T>::max_value());
 		Identity::<T>::add_registrar(RawOrigin::Root.into(), registrar.clone())?;
-		Identity::<T>::set_fee(RawOrigin::Signed(registrar.clone()).into(), i.into(), 10.into())?;
+		Identity::<T>::set_fee(RawOrigin::Signed(registrar.clone()).into(), i.into(), 10u32.into())?;
 		let fields = IdentityFields(
 			IdentityField::Display | IdentityField::Legal | IdentityField::Web | IdentityField::Riot
 			| IdentityField::Email | IdentityField::PgpFingerprint | IdentityField::Image | IdentityField::Twitter
@@ -152,7 +152,7 @@ benchmarks! {
 
 			// User requests judgement from all the registrars, and they approve
 			for i in 0..r {
-				Identity::<T>::request_judgement(caller_origin.clone(), i, 10.into())?;
+				Identity::<T>::request_judgement(caller_origin.clone(), i, 10u32.into())?;
 				Identity::<T>::provide_judgement(
 					RawOrigin::Signed(account("registrar", i, SEED)).into(),
 					i,
@@ -210,7 +210,7 @@ benchmarks! {
 
 		// User requests judgement from all the registrars, and they approve
 		for i in 0..r {
-			Identity::<T>::request_judgement(caller_origin.clone(), i, 10.into())?;
+			Identity::<T>::request_judgement(caller_origin.clone(), i, 10u32.into())?;
 			Identity::<T>::provide_judgement(
 				RawOrigin::Signed(account("registrar", i, SEED)).into(),
 				i,
@@ -230,7 +230,7 @@ benchmarks! {
 
 		let r in ...;
 		let x in ...;
-	}: _(RawOrigin::Signed(caller.clone()), r - 1, 10.into())
+	}: _(RawOrigin::Signed(caller.clone()), r - 1, 10u32.into())
 	verify {
 		assert_last_event::<T>(Event::<T>::JudgementRequested(caller, r-1).into());
 	}
@@ -243,7 +243,7 @@ benchmarks! {
 		let r in ...;
 		let x in ...;
 
-		Identity::<T>::request_judgement(caller_origin, r - 1, 10.into())?;
+		Identity::<T>::request_judgement(caller_origin, r - 1, 10u32.into())?;
 	}: _(RawOrigin::Signed(caller.clone()), r - 1)
 	verify {
 		assert_last_event::<T>(Event::<T>::JudgementUnrequested(caller, r-1).into());
@@ -256,11 +256,11 @@ benchmarks! {
 
 		Identity::<T>::add_registrar(RawOrigin::Root.into(), caller.clone())?;
 		let registrars = Registrars::<T>::get();
-		ensure!(registrars[r as usize].as_ref().unwrap().fee == 0.into(), "Fee already set.");
-	}: _(RawOrigin::Signed(caller), r, 100.into())
+		ensure!(registrars[r as usize].as_ref().unwrap().fee == 0u32.into(), "Fee already set.");
+	}: _(RawOrigin::Signed(caller), r, 100u32.into())
 	verify {
 		let registrars = Registrars::<T>::get();
-		ensure!(registrars[r as usize].as_ref().unwrap().fee == 100.into(), "Fee not changed.");
+		ensure!(registrars[r as usize].as_ref().unwrap().fee == 100u32.into(), "Fee not changed.");
 	}
 
 	set_account_id {
@@ -315,7 +315,7 @@ benchmarks! {
 		};
 
 		Identity::<T>::add_registrar(RawOrigin::Root.into(), caller.clone())?;
-		Identity::<T>::request_judgement(user_origin.clone(), r, 10.into())?;
+		Identity::<T>::request_judgement(user_origin.clone(), r, 10u32.into())?;
 	}: _(RawOrigin::Signed(caller), r, user_lookup, Judgement::Reasonable)
 	verify {
 		assert_last_event::<T>(Event::<T>::JudgementGiven(user, r).into())
@@ -338,7 +338,7 @@ benchmarks! {
 
 		// User requests judgement from all the registrars, and they approve
 		for i in 0..r {
-			Identity::<T>::request_judgement(target_origin.clone(), i, 10.into())?;
+			Identity::<T>::request_judgement(target_origin.clone(), i, 10u32.into())?;
 			Identity::<T>::provide_judgement(
 				RawOrigin::Signed(account("registrar", i, SEED)).into(),
 				i,
diff --git a/frame/treasury/src/benchmarking.rs b/frame/treasury/src/benchmarking.rs
index 1d6d7c6afceb..2794e6cc4320 100644
--- a/frame/treasury/src/benchmarking.rs
+++ b/frame/treasury/src/benchmarking.rs
@@ -36,7 +36,7 @@ fn setup_proposal<T: Trait<I>, I: Instance>(u: u32) -> (
 	<T::Lookup as StaticLookup>::Source,
 ) {
 	let caller = account("caller", u, SEED);
-	let value: BalanceOf<T, I> = T::ProposalBondMinimum::get().saturating_mul(100.into());
+	let value: BalanceOf<T, I> = T::ProposalBondMinimum::get().saturating_mul(100u32.into());
 	let _ = T::Currency::make_free_balance_be(&caller, value);
 	let beneficiary = account("beneficiary", u, SEED);
 	let beneficiary_lookup = T::Lookup::unlookup(beneficiary);
@@ -71,7 +71,7 @@ fn setup_tip<T: Trait<I>, I: Instance>(r: u32, t: u32) ->
 	let caller = account("member", t - 1, SEED);
 	let reason = vec![0; r as usize];
 	let beneficiary = account("beneficiary", t, SEED);
-	let value = T::Currency::minimum_balance().saturating_mul(100.into());
+	let value = T::Currency::minimum_balance().saturating_mul(100u32.into());
 	Ok((caller, reason, beneficiary, value))
 }
 
@@ -130,12 +130,12 @@ fn setup_bounty<T: Trait<I>, I: Instance>(u: u32, d: u32) -> (
 	Vec<u8>,
 ) {
 	let caller = account("caller", u, SEED);
-	let value: BalanceOf<T, I> = T::BountyValueMinimum::get().saturating_mul(100.into());
-	let fee = value / 2.into();
+	let value: BalanceOf<T, I> = T::BountyValueMinimum::get().saturating_mul(100u32.into());
+	let fee = value / 2u32.into();
 	let deposit = T::BountyDepositBase::get() + T::DataDepositPerByte::get() * MAX_BYTES.into();
 	let _ = T::Currency::make_free_balance_be(&caller, deposit);
 	let curator = account("curator", u, SEED);
-	let _ = T::Currency::make_free_balance_be(&curator, fee / 2.into());
+	let _ = T::Currency::make_free_balance_be(&curator, fee / 2u32.into());
 	let reason = vec![0; d as usize];
 	(caller, curator, fee, value, reason)
 }
@@ -157,7 +157,7 @@ fn create_bounty<T: Trait<I>, I: Instance>() -> Result<(
 
 fn setup_pod_account<T: Trait<I>, I: Instance>() {
 	let pot_account = Treasury::<T, I>::account_id();
-	let value = T::Currency::minimum_balance().saturating_mul(1_000_000_000.into());
+	let value = T::Currency::minimum_balance().saturating_mul(1_000_000_000u32.into());
 	let _ = T::Currency::make_free_balance_be(&pot_account, value);
 }
 
@@ -230,7 +230,7 @@ benchmarks_instance! {
 	tip {
 		let t in 1 .. MAX_TIPPERS;
 		let (member, reason, beneficiary, value) = setup_tip::<T, _>(0, t)?;
-		let value = T::Currency::minimum_balance().saturating_mul(100.into());
+		let value = T::Currency::minimum_balance().saturating_mul(100u32.into());
 		Treasury::<T, _>::tip_new(
 			RawOrigin::Signed(member).into(),
 			reason.clone(),
@@ -255,7 +255,7 @@ benchmarks_instance! {
 
 		// Set up a new tip proposal
 		let (member, reason, beneficiary, value) = setup_tip::<T, _>(0, t)?;
-		let value = T::Currency::minimum_balance().saturating_mul(100.into());
+		let value = T::Currency::minimum_balance().saturating_mul(100u32.into());
 		Treasury::<T, _>::tip_new(
 			RawOrigin::Signed(member).into(),
 			reason.clone(),
@@ -303,7 +303,7 @@ benchmarks_instance! {
 		let (curator_lookup, bounty_id) = create_bounty::<T, _>()?;
 		Treasury::<T, _>::on_initialize(T::BlockNumber::zero());
 		let bounty_id = BountyCount::<I>::get() - 1;
-		frame_system::Module::<T>::set_block_number(T::BountyUpdatePeriod::get() + 1.into());
+		frame_system::Module::<T>::set_block_number(T::BountyUpdatePeriod::get() + 1u32.into());
 		let caller = whitelisted_caller();
 	}: _(RawOrigin::Signed(caller), bounty_id)
 
diff --git a/frame/vesting/src/benchmarking.rs b/frame/vesting/src/benchmarking.rs
index 7c5478472f8a..69dc7abaa703 100644
--- a/frame/vesting/src/benchmarking.rs
+++ b/frame/vesting/src/benchmarking.rs
@@ -34,18 +34,18 @@ type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trai
 fn add_locks<T: Trait>(who: &T::AccountId, n: u8) {
 	for id in 0..n {
 		let lock_id = [id; 8];
-		let locked = 100;
+		let locked = 100u32;
 		let reasons = WithdrawReason::Transfer | WithdrawReason::Reserve;
 		T::Currency::set_lock(lock_id, who, locked.into(), reasons);
 	}
 }
 
 fn add_vesting_schedule<T: Trait>(who: &T::AccountId) -> Result<(), &'static str> {
-	let locked = 100;
-	let per_block = 10;
-	let starting_block = 1;
+	let locked = 100u32;
+	let per_block = 10u32;
+	let starting_block = 1u32;
 
-	System::<T>::set_block_number(0.into());
+	System::<T>::set_block_number(0u32.into());
 
 	// Add schedule to avoid `NotVesting` error.
 	Vesting::<T>::add_vesting_schedule(
@@ -71,7 +71,7 @@ benchmarks! {
 		System::<T>::set_block_number(T::BlockNumber::zero());
 		assert_eq!(
 			Vesting::<T>::vesting_balance(&caller),
-			Some(100.into()),
+			Some(100u32.into()),
 			"Vesting schedule not added",
 		);
 	}: vest(RawOrigin::Signed(caller.clone()))
@@ -79,7 +79,7 @@ benchmarks! {
 		// Nothing happened since everything is still vested.
 		assert_eq!(
 			Vesting::<T>::vesting_balance(&caller),
-			Some(100.into()),
+			Some(100u32.into()),
 			"Vesting schedule was removed",
 		);
 	}
@@ -92,7 +92,7 @@ benchmarks! {
 		add_locks::<T>(&caller, l as u8);
 		add_vesting_schedule::<T>(&caller)?;
 		// At block 20, everything is unvested.
-		System::<T>::set_block_number(20.into());
+		System::<T>::set_block_number(20u32.into());
 		assert_eq!(
 			Vesting::<T>::vesting_balance(&caller),
 			Some(BalanceOf::<T>::zero()),
@@ -120,7 +120,7 @@ benchmarks! {
 		System::<T>::set_block_number(T::BlockNumber::zero());
 		assert_eq!(
 			Vesting::<T>::vesting_balance(&other),
-			Some(100.into()),
+			Some(100u32.into()),
 			"Vesting schedule not added",
 		);
 
@@ -130,7 +130,7 @@ benchmarks! {
 		// Nothing happened since everything is still vested.
 		assert_eq!(
 			Vesting::<T>::vesting_balance(&other),
-			Some(100.into()),
+			Some(100u32.into()),
 			"Vesting schedule was removed",
 		);
 	}
@@ -144,7 +144,7 @@ benchmarks! {
 		add_locks::<T>(&other, l as u8);
 		add_vesting_schedule::<T>(&other)?;
 		// At block 20, everything is unvested.
-		System::<T>::set_block_number(20.into());
+		System::<T>::set_block_number(20u32.into());
 		assert_eq!(
 			Vesting::<T>::vesting_balance(&other),
 			Some(BalanceOf::<T>::zero()),
@@ -176,8 +176,8 @@ benchmarks! {
 
 		let vesting_schedule = VestingInfo {
 			locked: transfer_amount,
-			per_block: 10.into(),
-			starting_block: 1.into(),
+			per_block: 10u32.into(),
+			starting_block: 1u32.into(),
 		};
 	}: _(RawOrigin::Signed(caller), target_lookup, vesting_schedule)
 	verify {
@@ -208,8 +208,8 @@ benchmarks! {
 
 		let vesting_schedule = VestingInfo {
 			locked: transfer_amount,
-			per_block: 10.into(),
-			starting_block: 1.into(),
+			per_block: 10u32.into(),
+			starting_block: 1u32.into(),
 		};
 	}: _(RawOrigin::Root, source_lookup, target_lookup, vesting_schedule)
 	verify {

From 755514de62330b747cebe1cc56d5356a065c3bdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Mon, 26 Oct 2020 12:29:36 +0000
Subject: [PATCH 0013/1194] grandpa: fix early enactment of forced changes
 (#7321)

* grandpa: fix early enactment of forced authority set changes

* grandpa: add test for early enactment of forced changes

* grandpa: fix typo in log message

* grandpa: only allow one pending forced change per fork

* grandpa: fix tests
---
 client/finality-grandpa/src/authorities.rs | 331 ++++++++++++++++-----
 1 file changed, 252 insertions(+), 79 deletions(-)

diff --git a/client/finality-grandpa/src/authorities.rs b/client/finality-grandpa/src/authorities.rs
index 57c30bc3b25c..2de169fc8285 100644
--- a/client/finality-grandpa/src/authorities.rs
+++ b/client/finality-grandpa/src/authorities.rs
@@ -32,14 +32,42 @@ use std::ops::Add;
 use std::sync::Arc;
 
 /// Error type returned on operations on the `AuthoritySet`.
-#[derive(Debug, derive_more::Display, derive_more::From)]
-pub enum Error<E> {
-	#[display("Invalid authority set, either empty or with an authority weight set to 0.")]
+#[derive(Debug, derive_more::Display)]
+pub enum Error<N, E> {
+	#[display(fmt = "Invalid authority set, either empty or with an authority weight set to 0.")]
 	InvalidAuthoritySet,
+	#[display(fmt = "Client error during ancestry lookup: {}", _0)]
+	Client(E),
+	#[display(fmt = "Duplicate authority set change.")]
+	DuplicateAuthoritySetChange,
+	#[display(fmt = "Multiple pending forced authority set changes are not allowed.")]
+	MultiplePendingForcedAuthoritySetChanges,
+	#[display(
+		fmt = "A pending forced authority set change could not be applied since it must be applied after \
+		 the pending standard change at #{}",
+		_0
+	)]
+	ForcedAuthoritySetChangeDependencyUnsatisfied(N),
 	#[display(fmt = "Invalid operation in the pending changes tree: {}", _0)]
 	ForkTree(fork_tree::Error<E>),
 }
 
+impl<N, E> From<fork_tree::Error<E>> for Error<N, E> {
+	fn from(err: fork_tree::Error<E>) -> Error<N, E> {
+		match err {
+			fork_tree::Error::Client(err) => Error::Client(err),
+			fork_tree::Error::Duplicate => Error::DuplicateAuthoritySetChange,
+			err => Error::ForkTree(err),
+		}
+	}
+}
+
+impl<N, E: std::error::Error> From<E> for Error<N, E> {
+	fn from(err: E) -> Error<N, E> {
+		Error::Client(err)
+	}
+}
+
 /// A shared authority set.
 pub struct SharedAuthoritySet<H, N> {
 	inner: Arc<RwLock<AuthoritySet<H, N>>>,
@@ -116,14 +144,20 @@ pub struct AuthoritySet<H, N> {
 	/// a given branch
 	pub(crate) pending_standard_changes: ForkTree<H, N, PendingChange<H, N>>,
 	/// Pending forced changes across different forks (at most one per fork).
-	/// Forced changes are enacted on block depth (not finality), for this reason
-	/// only one forced change should exist per fork.
+	/// Forced changes are enacted on block depth (not finality), for this
+	/// reason only one forced change should exist per fork. When trying to
+	/// apply forced changes we keep track of any pending standard changes that
+	/// they may depend on, this is done by making sure that any pending change
+	/// that is an ancestor of the forced changed and its effective block number
+	/// is lower than the last finalized block (as signaled in the forced
+	/// change) must be applied beforehand.
 	pending_forced_changes: Vec<PendingChange<H, N>>,
 }
 
 impl<H, N> AuthoritySet<H, N>
-where H: PartialEq,
-	  N: Ord,
+where
+	H: PartialEq,
+	N: Ord,
 {
 	// authority sets must be non-empty and all weights must be greater than 0
 	fn invalid_authority_list(authorities: &AuthorityList) -> bool {
@@ -185,7 +219,7 @@ where
 		&self,
 		best_hash: &H,
 		is_descendent_of: &F,
-	) -> Result<Option<(H, N)>, fork_tree::Error<E>>
+	) -> Result<Option<(H, N)>, Error<N, E>>
 	where
 		F: Fn(&H, &H) -> Result<bool, E>,
 		E: std::error::Error,
@@ -224,7 +258,8 @@ where
 		&mut self,
 		pending: PendingChange<H, N>,
 		is_descendent_of: &F,
-	) -> Result<(), Error<E>> where
+	) -> Result<(), Error<N, E>>
+	where
 		F: Fn(&H, &H) -> Result<bool, E>,
 		E: std::error::Error,
 	{
@@ -255,16 +290,18 @@ where
 		&mut self,
 		pending: PendingChange<H, N>,
 		is_descendent_of: &F,
-	) -> Result<(), Error<E>> where
+	) -> Result<(), Error<N, E>>
+	where
 		F: Fn(&H, &H) -> Result<bool, E>,
 		E: std::error::Error,
 	{
-		for change in self.pending_forced_changes.iter() {
-			if change.canon_hash == pending.canon_hash ||
-				is_descendent_of(&change.canon_hash, &pending.canon_hash)
-					.map_err(fork_tree::Error::Client)?
-			{
-				return Err(fork_tree::Error::UnfinalizedAncestor.into());
+		for change in &self.pending_forced_changes {
+			if change.canon_hash == pending.canon_hash {
+				return Err(Error::DuplicateAuthoritySetChange);
+			}
+
+			if is_descendent_of(&change.canon_hash, &pending.canon_hash)? {
+				return Err(Error::MultiplePendingForcedAuthoritySetChanges);
 			}
 		}
 
@@ -298,7 +335,8 @@ where
 		&mut self,
 		pending: PendingChange<H, N>,
 		is_descendent_of: &F,
-	) -> Result<(), Error<E>> where
+	) -> Result<(), Error<N, E>>
+	where
 		F: Fn(&H, &H) -> Result<bool, E>,
 		E: std::error::Error,
 	{
@@ -346,52 +384,92 @@ where
 	///
 	/// These transitions are always forced and do not lead to justifications
 	/// which light clients can follow.
+	///
+	/// Forced changes can only be applied after all pending standard changes
+	/// that it depends on have been applied. If any pending standard change
+	/// exists that is an ancestor of a given forced changed and which effective
+	/// block number is lower than the last finalized block (as defined by the
+	/// forced change), then the forced change cannot be applied. An error will
+	/// be returned in that case which will prevent block import.
 	pub(crate) fn apply_forced_changes<F, E>(
 		&self,
 		best_hash: H,
 		best_number: N,
 		is_descendent_of: &F,
 		initial_sync: bool,
-	) -> Result<Option<(N, Self)>, E>
-		where F: Fn(&H, &H) -> Result<bool, E>,
+	) -> Result<Option<(N, Self)>, Error<N, E>>
+	where
+		F: Fn(&H, &H) -> Result<bool, E>,
+		E: std::error::Error,
 	{
 		let mut new_set = None;
 
-		for change in self.pending_forced_changes.iter()
+		for change in self
+			.pending_forced_changes
+			.iter()
 			.take_while(|c| c.effective_number() <= best_number) // to prevent iterating too far
 			.filter(|c| c.effective_number() == best_number)
 		{
 			// check if the given best block is in the same branch as
 			// the block that signaled the change.
 			if change.canon_hash == best_hash || is_descendent_of(&change.canon_hash, &best_hash)? {
+				let median_last_finalized = match change.delay_kind {
+					DelayKind::Best {
+						ref median_last_finalized,
+					} => median_last_finalized.clone(),
+					_ => unreachable!(
+						"pending_forced_changes only contains forced changes; forced changes have delay kind Best; qed."
+					),
+				};
+
+				// check if there's any pending standard change that we depend on
+				for (_, _, standard_change) in self.pending_standard_changes.roots() {
+					if standard_change.effective_number() <= median_last_finalized
+						&& is_descendent_of(&standard_change.canon_hash, &change.canon_hash)?
+					{
+						log::info!(target: "afg",
+							"Not applying authority set change forced at block #{:?}, due to pending standard change at block #{:?}",
+							change.canon_height,
+							standard_change.effective_number(),
+						);
+
+						return Err(
+							Error::ForcedAuthoritySetChangeDependencyUnsatisfied(
+								standard_change.effective_number()
+							)
+						);
+					}
+				}
+
 				// apply this change: make the set canonical
-				afg_log!(initial_sync,
+				afg_log!(
+					initial_sync,
 					"👴 Applying authority set change forced at block #{:?}",
 					change.canon_height,
 				);
-				telemetry!(CONSENSUS_INFO; "afg.applying_forced_authority_set_change";
+
+				telemetry!(
+					CONSENSUS_INFO;
+					"afg.applying_forced_authority_set_change";
 					"block" => ?change.canon_height
 				);
 
-				let median_last_finalized = match change.delay_kind {
-					DelayKind::Best { ref median_last_finalized } => median_last_finalized.clone(),
-					_ => unreachable!("pending_forced_changes only contains forced changes; forced changes have delay kind Best; qed."),
-				};
-
-				new_set = Some((median_last_finalized, AuthoritySet {
-					current_authorities: change.next_authorities.clone(),
-					set_id: self.set_id + 1,
-					pending_standard_changes: ForkTree::new(), // new set, new changes.
-					pending_forced_changes: Vec::new(),
-				}));
+				new_set = Some((
+					median_last_finalized,
+					AuthoritySet {
+						current_authorities: change.next_authorities.clone(),
+						set_id: self.set_id + 1,
+						pending_standard_changes: ForkTree::new(), // new set, new changes.
+						pending_forced_changes: Vec::new(),
+					},
+				));
 
 				break;
 			}
-
-			// we don't wipe forced changes until another change is
-			// applied
 		}
 
+		// we don't wipe forced changes until another change is applied, hence
+		// why we return a new set instead of mutating.
 		Ok(new_set)
 	}
 
@@ -411,7 +489,8 @@ where
 		finalized_number: N,
 		is_descendent_of: &F,
 		initial_sync: bool,
-	) -> Result<Status<H, N>, Error<E>> where
+	) -> Result<Status<H, N>, Error<N, E>>
+	where
 		F: Fn(&H, &H) -> Result<bool, E>,
 		E: std::error::Error,
 	{
@@ -434,12 +513,11 @@ where
 					Vec::new(),
 				);
 
-				// we will keep all forced change for any later blocks and that are a
-				// descendent of the finalized block (i.e. they are from this fork).
+				// we will keep all forced changes for any later blocks and that are a
+				// descendent of the finalized block (i.e. they are part of this branch).
 				for change in pending_forced_changes {
 					if change.effective_number() > finalized_number &&
-						is_descendent_of(&finalized_hash, &change.canon_hash)
-							.map_err(fork_tree::Error::Client)?
+						is_descendent_of(&finalized_hash, &change.canon_hash)?
 					{
 						self.pending_forced_changes.push(change)
 					}
@@ -484,7 +562,8 @@ where
 		finalized_hash: H,
 		finalized_number: N,
 		is_descendent_of: &F,
-	) -> Result<Option<bool>, Error<E>> where
+	) -> Result<Option<bool>, Error<N, E>>
+	where
 		F: Fn(&H, &H) -> Result<bool, E>,
 		E: std::error::Error,
 	{
@@ -933,7 +1012,13 @@ mod tests {
 		};
 
 		authorities.add_pending_change(change_a, &static_is_descendent_of(false)).unwrap();
-		authorities.add_pending_change(change_b, &static_is_descendent_of(false)).unwrap();
+		authorities.add_pending_change(change_b.clone(), &static_is_descendent_of(false)).unwrap();
+
+		// no duplicates are allowed
+		assert!(matches!(
+			authorities.add_pending_change(change_b, &static_is_descendent_of(false)),
+			Err(Error::DuplicateAuthoritySetChange)
+		));
 
 		// there's an effective change triggered at block 15 but not a standard one.
 		// so this should do nothing.
@@ -942,12 +1027,7 @@ mod tests {
 			None,
 		);
 
-		// throw a standard change into the mix to prove that it's discarded
-		// for being on the same fork.
-		//
-		// NOTE: after https://github.com/paritytech/substrate/issues/1861
-		// this should still be rejected based on the "span" rule -- it overlaps
-		// with another change on the same fork.
+		// there can only be one pending forced change per fork
 		let change_c = PendingChange {
 			next_authorities: set_b.clone(),
 			delay: 3,
@@ -956,37 +1036,45 @@ mod tests {
 			delay_kind: DelayKind::Best { median_last_finalized: 0 },
 		};
 
-		let is_descendent_of_a = is_descendent_of(|base: &&str, _| {
-			base.starts_with("hash_a")
-		});
+		let is_descendent_of_a = is_descendent_of(|base: &&str, _| base.starts_with("hash_a"));
 
-		assert!(authorities.add_pending_change(change_c, &is_descendent_of_a).is_err());
+		assert!(matches!(
+			authorities.add_pending_change(change_c, &is_descendent_of_a),
+			Err(Error::MultiplePendingForcedAuthoritySetChanges)
+		));
 
-		// too early.
+		// let's try and apply the forced changes.
+		// too early and there's no forced changes to apply.
 		assert!(
-			authorities.apply_forced_changes("hash_a10", 10, &static_is_descendent_of(true), false)
+			authorities
+				.apply_forced_changes("hash_a10", 10, &static_is_descendent_of(true), false)
 				.unwrap()
 				.is_none()
 		);
 
 		// too late.
 		assert!(
-			authorities.apply_forced_changes("hash_a16", 16, &static_is_descendent_of(true), false)
+			authorities
+				.apply_forced_changes("hash_a16", 16, &is_descendent_of_a, false)
 				.unwrap()
 				.is_none()
 		);
 
-		// on time -- chooses the right change.
+		// on time -- chooses the right change for this fork.
 		assert_eq!(
-			authorities.apply_forced_changes("hash_a15", 15, &is_descendent_of_a, false)
+			authorities
+				.apply_forced_changes("hash_a15", 15, &is_descendent_of_a, false)
 				.unwrap()
 				.unwrap(),
-			(42, AuthoritySet {
-				current_authorities: set_a,
-				set_id: 1,
-				pending_standard_changes: ForkTree::new(),
-				pending_forced_changes: Vec::new(),
-			}),
+			(
+				42,
+				AuthoritySet {
+					current_authorities: set_a,
+					set_id: 1,
+					pending_standard_changes: ForkTree::new(),
+					pending_forced_changes: Vec::new(),
+				},
+			)
 		);
 	}
 
@@ -1027,6 +1115,106 @@ mod tests {
 		);
 	}
 
+	#[test]
+	fn forced_changes_blocked_by_standard_changes() {
+		let set_a = vec![(AuthorityId::from_slice(&[1; 32]), 1)];
+
+		let mut authorities = AuthoritySet {
+			current_authorities: set_a.clone(),
+			set_id: 0,
+			pending_standard_changes: ForkTree::new(),
+			pending_forced_changes: Vec::new(),
+		};
+
+		// effective at #15
+		let change_a = PendingChange {
+			next_authorities: set_a.clone(),
+			delay: 5,
+			canon_height: 10,
+			canon_hash: "hash_a",
+			delay_kind: DelayKind::Finalized,
+		};
+
+		// effective #20
+		let change_b = PendingChange {
+			next_authorities: set_a.clone(),
+			delay: 0,
+			canon_height: 20,
+			canon_hash: "hash_b",
+			delay_kind: DelayKind::Finalized,
+		};
+
+		// effective at #35
+		let change_c = PendingChange {
+			next_authorities: set_a.clone(),
+			delay: 5,
+			canon_height: 30,
+			canon_hash: "hash_c",
+			delay_kind: DelayKind::Finalized,
+		};
+
+		// add some pending standard changes all on the same fork
+		authorities.add_pending_change(change_a, &static_is_descendent_of(true)).unwrap();
+		authorities.add_pending_change(change_b, &static_is_descendent_of(true)).unwrap();
+		authorities.add_pending_change(change_c, &static_is_descendent_of(true)).unwrap();
+
+		// effective at #45
+		let change_d = PendingChange {
+			next_authorities: set_a.clone(),
+			delay: 5,
+			canon_height: 40,
+			canon_hash: "hash_d",
+			delay_kind: DelayKind::Best {
+				median_last_finalized: 31,
+			},
+		};
+
+		// now add a forced change on the same fork
+		authorities.add_pending_change(change_d, &static_is_descendent_of(true)).unwrap();
+
+		// the forced change cannot be applied since the pending changes it depends on
+		// have not been applied yet.
+		assert!(matches!(
+			authorities.apply_forced_changes("hash_d45", 45, &static_is_descendent_of(true), false),
+			Err(Error::ForcedAuthoritySetChangeDependencyUnsatisfied(15))
+		));
+
+		// we apply the first pending standard change at #15
+		authorities
+			.apply_standard_changes("hash_a15", 15, &static_is_descendent_of(true), false)
+			.unwrap();
+
+		// but the forced change still depends on the next standard change
+		assert!(matches!(
+			authorities.apply_forced_changes("hash_d", 45, &static_is_descendent_of(true), false),
+			Err(Error::ForcedAuthoritySetChangeDependencyUnsatisfied(20))
+		));
+
+		// we apply the pending standard change at #20
+		authorities
+			.apply_standard_changes("hash_b", 20, &static_is_descendent_of(true), false)
+			.unwrap();
+
+		// afterwards the forced change at #45 can already be applied since it signals
+		// that finality stalled at #31, and the next pending standard change is effective
+		// at #35. subsequent forced changes on the same branch must be kept
+		assert_eq!(
+			authorities
+				.apply_forced_changes("hash_d", 45, &static_is_descendent_of(true), false)
+				.unwrap()
+				.unwrap(),
+			(
+				31,
+				AuthoritySet {
+					current_authorities: set_a.clone(),
+					set_id: 3,
+					pending_standard_changes: ForkTree::new(),
+					pending_forced_changes: Vec::new(),
+				}
+			),
+		);
+	}
+
 	#[test]
 	fn next_change_works() {
 		let current_authorities = vec![(AuthorityId::from_slice(&[1; 32]), 1)];
@@ -1283,26 +1471,11 @@ mod tests {
 		add_pending_change(15, "C3", true);
 		add_pending_change(20, "D", true);
 
-		println!(
-			"pending_changes: {:?}",
-			authorities
-				.pending_changes()
-				.map(|c| c.canon_hash)
-				.collect::<Vec<_>>()
-		);
-
 		// applying the standard change at A should not prune anything
 		// other then the change that was applied
 		authorities
 			.apply_standard_changes("A", 5, &is_descendent_of, false)
 			.unwrap();
-		println!(
-			"pending_changes: {:?}",
-			authorities
-				.pending_changes()
-				.map(|c| c.canon_hash)
-				.collect::<Vec<_>>()
-		);
 
 		assert_eq!(authorities.pending_changes().count(), 6);
 

From 891900a9b2d5ea7347426128f9abcb42941cce59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Mon, 26 Oct 2020 12:47:39 +0000
Subject: [PATCH 0014/1194] grandpa: don't send equivocation reports for local
 identities (#7372)

* grandpa: don't send equivocation reports for local identities

* grandpa: add test for self-report

* grandpa: fix test compilation

this works on rust nightly but breaks on ci which is using rust stable
---
 client/finality-grandpa/src/environment.rs | 22 +++++++----
 client/finality-grandpa/src/tests.rs       | 46 ++++++++++++++++++++++
 2 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/client/finality-grandpa/src/environment.rs b/client/finality-grandpa/src/environment.rs
index 95d7adb9578c..7f9e966c9acc 100644
--- a/client/finality-grandpa/src/environment.rs
+++ b/client/finality-grandpa/src/environment.rs
@@ -42,8 +42,8 @@ use sp_runtime::traits::{
 use sc_telemetry::{telemetry, CONSENSUS_DEBUG, CONSENSUS_INFO};
 
 use crate::{
-	CommandOrError, Commit, Config, Error, Precommit, Prevote,
-	PrimaryPropose, SignedMessage, NewAuthoritySet, VoterCommand,
+	local_authority_id, CommandOrError, Commit, Config, Error, NewAuthoritySet, Precommit, Prevote,
+	PrimaryPropose, SignedMessage, VoterCommand,
 };
 
 use sp_consensus::SelectChain;
@@ -467,10 +467,18 @@ where
 	/// extrinsic to report the equivocation. In particular, the session membership
 	/// proof must be generated at the block at which the given set was active which
 	/// isn't necessarily the best block if there are pending authority set changes.
-	fn report_equivocation(
+	pub(crate) fn report_equivocation(
 		&self,
 		equivocation: Equivocation<Block::Hash, NumberFor<Block>>,
 	) -> Result<(), Error> {
+		if let Some(local_id) = local_authority_id(&self.voters, self.config.keystore.as_ref()) {
+			if *equivocation.offender() == local_id {
+				return Err(Error::Safety(
+					"Refraining from sending equivocation report for our own equivocation.".into(),
+				));
+			}
+		}
+
 		let is_descendent_of = is_descendent_of(&*self.client, None);
 
 		let best_header = self.select_chain
@@ -724,7 +732,7 @@ where
 		let prevote_timer = Delay::new(self.config.gossip_duration * 2);
 		let precommit_timer = Delay::new(self.config.gossip_duration * 4);
 
-		let local_id = crate::local_authority_id(&self.voters, self.config.keystore.as_ref());
+		let local_id = local_authority_id(&self.voters, self.config.keystore.as_ref());
 
 		let has_voted = match self.voter_set_state.has_voted(round) {
 			HasVoted::Yes(id, vote) => {
@@ -776,7 +784,7 @@ where
 	}
 
 	fn proposed(&self, round: RoundNumber, propose: PrimaryPropose<Block>) -> Result<(), Self::Error> {
-		let local_id = crate::local_authority_id(&self.voters, self.config.keystore.as_ref());
+		let local_id = local_authority_id(&self.voters, self.config.keystore.as_ref());
 
 		let local_id = match local_id {
 			Some(id) => id,
@@ -815,7 +823,7 @@ where
 	}
 
 	fn prevoted(&self, round: RoundNumber, prevote: Prevote<Block>) -> Result<(), Self::Error> {
-		let local_id = crate::local_authority_id(&self.voters, self.config.keystore.as_ref());
+		let local_id = local_authority_id(&self.voters, self.config.keystore.as_ref());
 
 		let local_id = match local_id {
 			Some(id) => id,
@@ -876,7 +884,7 @@ where
 		round: RoundNumber,
 		precommit: Precommit<Block>,
 	) -> Result<(), Self::Error> {
-		let local_id = crate::local_authority_id(&self.voters, self.config.keystore.as_ref());
+		let local_id = local_authority_id(&self.voters, self.config.keystore.as_ref());
 
 		let local_id = match local_id {
 			Some(id) => id,
diff --git a/client/finality-grandpa/src/tests.rs b/client/finality-grandpa/src/tests.rs
index c9d9f717cdce..cf1b2ef98627 100644
--- a/client/finality-grandpa/src/tests.rs
+++ b/client/finality-grandpa/src/tests.rs
@@ -1813,3 +1813,49 @@ fn imports_justification_for_regular_blocks_on_import() {
 		client.justification(&BlockId::Hash(block_hash)).unwrap().is_some(),
 	);
 }
+
+#[test]
+fn grandpa_environment_doesnt_send_equivocation_reports_for_itself() {
+	let alice = Ed25519Keyring::Alice;
+	let voters = make_ids(&[alice]);
+
+	let environment = {
+		let mut net = GrandpaTestNet::new(TestApi::new(voters), 1);
+		let peer = net.peer(0);
+		let network_service = peer.network_service().clone();
+		let link = peer.data.lock().take().unwrap();
+		let (keystore, _keystore_path) = create_keystore(alice);
+		test_environment(&link, Some(keystore), network_service.clone(), ())
+	};
+
+	let signed_prevote = {
+		let prevote = finality_grandpa::Prevote {
+			target_hash: H256::random(),
+			target_number: 1,
+		};
+
+		let signed = alice.sign(&[]).into();
+		(prevote, signed)
+	};
+
+	let mut equivocation = finality_grandpa::Equivocation {
+		round_number: 1,
+		identity: alice.public().into(),
+		first: signed_prevote.clone(),
+		second: signed_prevote.clone(),
+	};
+
+	// reporting the equivocation should fail since the offender is a local
+	// authority (i.e. we have keys in our keystore for the given id)
+	let equivocation_proof = sp_finality_grandpa::Equivocation::Prevote(equivocation.clone());
+	assert!(matches!(
+		environment.report_equivocation(equivocation_proof),
+		Err(Error::Safety(_))
+	));
+
+	// if we set the equivocation offender to another id for which we don't have
+	// keys it should work
+	equivocation.identity = Default::default();
+	let equivocation_proof = sp_finality_grandpa::Equivocation::Prevote(equivocation);
+	assert!(environment.report_equivocation(equivocation_proof).is_ok());
+}

From d766e229466d63afadd19097e277d85146fee3c9 Mon Sep 17 00:00:00 2001
From: Andrew Plaza <aplaza@liquidthink.net>
Date: Mon, 26 Oct 2020 14:28:33 +0100
Subject: [PATCH 0015/1194] WASM Local-blob override (#7317)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Provide WASM overwrite functionality in LocalCallExecutor

- add a new module `wasm_overwrite.rs` in client
  - scrapes given folder for runtimes
- add two new CLI Options `wasm-overwrite` and `wasm_overwrite_path`

* formatting

* Make comment clearer

remove sc-runtime-test from dev-dependencies

* comments

* Update client/service/src/client/wasm_overwrite.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/service/src/client/wasm_overwrite.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Fix spaces, remove call into backend for 'heap_pages' in 'try_replace'

* Error if path is not a directory, Comments,

Doc Comment for WasmOverwrite

* make WasmOverwrite Option<>

* Change to one CLI argument for overwrites

- move getting runtime version into LocalCallExecutor

* change unwrap() to expect()

* comment

* Remove `check_overwrites`

* Encapsulate checking for overwrites in LocalCallExecutor

* move duplicate code into function

* Update client/cli/src/params/import_params.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* comma

* Update client/service/src/client/wasm_overwrite.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/service/src/client/wasm_overwrite.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* cache hash in WasmBlob

* Update client/service/src/client/wasm_overwrite.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/service/src/client/client.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* move getting overwrite into its own function

* fix error when directory is not a directory

* Error on duplicate WASM runtimes

* better comment, grammar

* docs

* Revert StateBackend back to _

* Update client/service/src/client/wasm_overwrite.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/service/src/client/wasm_overwrite.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/service/src/client/call_executor.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Add two tests, fix doc comments

Add a test for the runtime_version method of WasmOverwrite
Add a test for check_overwrite method of LocalCallExecutor

* remove redundant `Return` from expect msg

* Update client/cli/src/params/import_params.rs

Co-authored-by: David <dvdplm@gmail.com>

* Update client/service/src/client/call_executor.rs

Co-authored-by: David <dvdplm@gmail.com>

* Update client/service/src/client/wasm_overwrite.rs

Co-authored-by: David <dvdplm@gmail.com>

* Update client/service/src/config.rs

Co-authored-by: David <dvdplm@gmail.com>

* Update client/service/src/client/wasm_overwrite.rs

Co-authored-by: David <dvdplm@gmail.com>

* Add Module Documentation, match on '.wasm' extension

* Add test for scraping WASM blob

* fix expect

* remove creating another block in LocalCallExecutor test

* remove unused import

* add tests for duplicates and scraping wasm

* make tests a bit nicer

* add test for ignoring non-.wasm files

* check error message in test

* Update client/service/src/client/wasm_overwrite.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* remove println

* Update client/service/src/client/wasm_overwrite.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* make tests prettier

* Update client/service/src/client/wasm_overwrite.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* comment for seemingly random client

* locally-built -> custom

* remove unused import

* fix comment

* rename all references to overwrite with override

* fix cli flag in module documentation

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: David <dvdplm@gmail.com>
---
 Cargo.lock                                 |   1 +
 client/cli/src/config.rs                   |  10 +
 client/cli/src/params/import_params.rs     |  13 +
 client/service/Cargo.toml                  |   1 +
 client/service/src/builder.rs              |   5 +-
 client/service/src/client/call_executor.rs | 120 ++++++++-
 client/service/src/client/client.rs        |   5 +-
 client/service/src/client/light.rs         |   2 +-
 client/service/src/client/mod.rs           |   1 +
 client/service/src/client/wasm_override.rs | 267 +++++++++++++++++++++
 client/service/src/config.rs               |   4 +
 client/service/test/src/lib.rs             |   1 +
 test-utils/client/src/lib.rs               |   2 +-
 test-utils/runtime/client/src/lib.rs       |   2 +-
 utils/browser/src/lib.rs                   |   1 +
 15 files changed, 420 insertions(+), 15 deletions(-)
 create mode 100644 client/service/src/client/wasm_override.rs

diff --git a/Cargo.lock b/Cargo.lock
index c165c3ccb972..1560b7bdddc9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7321,6 +7321,7 @@ dependencies = [
  "sp-utils",
  "sp-version",
  "substrate-prometheus-endpoint",
+ "substrate-test-runtime",
  "substrate-test-runtime-client",
  "tempfile",
  "tokio 0.2.22",
diff --git a/client/cli/src/config.rs b/client/cli/src/config.rs
index 43b755100244..ab7a335c1ce6 100644
--- a/client/cli/src/config.rs
+++ b/client/cli/src/config.rs
@@ -278,6 +278,15 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 			.unwrap_or_default())
 	}
 
+	/// Get the path where WASM overrides live.
+	///
+	/// By default this is `None`.
+	fn wasm_runtime_overrides(&self) -> Option<PathBuf> {
+		self.import_params()
+			.map(|x| x.wasm_runtime_overrides())
+			.unwrap_or_default()
+	}
+
 	/// Get the execution strategies.
 	///
 	/// By default this is retrieved from `ImportParams` if it is available. Otherwise its
@@ -492,6 +501,7 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 			state_cache_child_ratio: self.state_cache_child_ratio()?,
 			pruning: self.pruning(unsafe_pruning, &role)?,
 			wasm_method: self.wasm_method()?,
+			wasm_runtime_overrides: self.wasm_runtime_overrides(),
 			execution_strategies: self.execution_strategies(is_dev, is_validator)?,
 			rpc_http: self.rpc_http(DCV::rpc_http_listen_port())?,
 			rpc_ws: self.rpc_ws(DCV::rpc_ws_listen_port())?,
diff --git a/client/cli/src/params/import_params.rs b/client/cli/src/params/import_params.rs
index e60779429b17..1efd4383432f 100644
--- a/client/cli/src/params/import_params.rs
+++ b/client/cli/src/params/import_params.rs
@@ -25,6 +25,7 @@ use crate::params::DatabaseParams;
 use crate::params::PruningParams;
 use sc_client_api::execution_extensions::ExecutionStrategies;
 use structopt::StructOpt;
+use std::path::PathBuf;
 
 /// Parameters for block import.
 #[derive(Debug, StructOpt)]
@@ -55,6 +56,12 @@ pub struct ImportParams {
 	)]
 	pub wasm_method: WasmExecutionMethod,
 
+	/// Specify the path where local WASM runtimes are stored.
+	///
+	/// These runtimes will override on-chain runtimes when the version matches.
+	#[structopt(long, value_name = "PATH", parse(from_os_str))]
+	pub wasm_runtime_overrides: Option<PathBuf>,
+
 	#[allow(missing_docs)]
 	#[structopt(flatten)]
 	pub execution_strategies: ExecutionStrategiesParams,
@@ -103,6 +110,12 @@ impl ImportParams {
 		self.wasm_method.into()
 	}
 
+	/// Enable overriding on-chain WASM with locally-stored WASM
+	/// by specifying the path where local WASM is stored.
+	pub fn wasm_runtime_overrides(&self) -> Option<PathBuf> {
+		self.wasm_runtime_overrides.clone()
+	}
+
 	/// Get execution strategies for the parameters
 	pub fn execution_strategies(&self, is_dev: bool, is_validator: bool) -> ExecutionStrategies {
 		let exec = &self.execution_strategies;
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index 14a1ce6aa0d8..5e2f8d051da3 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -86,6 +86,7 @@ directories = "2.0.2"
 
 [dev-dependencies]
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
+substrate-test-runtime = { versino = "2.0.0", path = "../../test-utils/runtime/" }
 sp-consensus-babe = { version = "0.8.0", path = "../../primitives/consensus/babe" }
 grandpa = { version = "0.8.0", package = "sc-finality-grandpa", path = "../finality-grandpa" }
 grandpa-primitives = { version = "2.0.0", package = "sp-finality-grandpa", path = "../../primitives/finality-grandpa" }
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index 3b60db7ec585..2a4dda477ab7 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -303,8 +303,9 @@ pub fn new_full_parts<TBl, TRtApi, TExecDisp>(
 			Box::new(task_manager.spawn_handle()),
 			config.prometheus_config.as_ref().map(|config| config.registry.clone()),
 			ClientConfig {
-				offchain_worker_enabled : config.offchain_worker.enabled ,
+				offchain_worker_enabled : config.offchain_worker.enabled,
 				offchain_indexing_api: config.offchain_worker.indexing_enabled,
+				wasm_runtime_overrides: config.wasm_runtime_overrides.clone(),
 			},
 		)?
 	};
@@ -396,7 +397,7 @@ pub fn new_client<E, Block, RA>(
 	const CANONICALIZATION_DELAY: u64 = 4096;
 
 	let backend = Arc::new(Backend::new(settings, CANONICALIZATION_DELAY)?);
-	let executor = crate::client::LocalCallExecutor::new(backend.clone(), executor, spawn_handle, config.clone());
+	let executor = crate::client::LocalCallExecutor::new(backend.clone(), executor, spawn_handle, config.clone())?;
 	Ok((
 		crate::client::Client::new(
 			backend.clone(),
diff --git a/client/service/src/client/call_executor.rs b/client/service/src/client/call_executor.rs
index 1919c76ff489..164976ecfe87 100644
--- a/client/service/src/client/call_executor.rs
+++ b/client/service/src/client/call_executor.rs
@@ -28,36 +28,71 @@ use sp_state_machine::{
 use sc_executor::{RuntimeVersion, RuntimeInfo, NativeVersion};
 use sp_externalities::Extensions;
 use sp_core::{
-	NativeOrEncoded, NeverNativeValue, traits::{CodeExecutor, SpawnNamed},
+	NativeOrEncoded, NeverNativeValue, traits::{CodeExecutor, SpawnNamed, RuntimeCode},
 	offchain::storage::OffchainOverlayedChanges,
 };
 use sp_api::{ProofRecorder, InitializeBlock, StorageTransactionCache};
 use sc_client_api::{backend, call_executor::CallExecutor};
-use super::client::ClientConfig;
+use super::{client::ClientConfig, wasm_override::WasmOverride};
 
 /// Call executor that executes methods locally, querying all required
 /// data from local backend.
 pub struct LocalCallExecutor<B, E> {
 	backend: Arc<B>,
 	executor: E,
+	wasm_override: Option<WasmOverride<E>>,
 	spawn_handle: Box<dyn SpawnNamed>,
 	client_config: ClientConfig,
 }
 
-impl<B, E> LocalCallExecutor<B, E> {
+impl<B, E> LocalCallExecutor<B, E>
+where
+	E: CodeExecutor + RuntimeInfo + Clone + 'static
+{
 	/// Creates new instance of local call executor.
 	pub fn new(
 		backend: Arc<B>,
 		executor: E,
 		spawn_handle: Box<dyn SpawnNamed>,
 		client_config: ClientConfig,
-	) -> Self {
-		LocalCallExecutor {
+	) -> sp_blockchain::Result<Self> {
+		let wasm_override = client_config.wasm_runtime_overrides
+			.as_ref()
+			.map(|p| WasmOverride::new(p.clone(), executor.clone()))
+			.transpose()?;
+
+		Ok(LocalCallExecutor {
 			backend,
 			executor,
+			wasm_override,
 			spawn_handle,
 			client_config,
-		}
+		})
+	}
+
+	/// Check if local runtime code overrides are enabled and one is available
+	/// for the given `BlockId`. If yes, return it; otherwise return the same
+	/// `RuntimeCode` instance that was passed.
+	fn check_override<'a, Block>(
+		&'a self,
+		onchain_code: RuntimeCode<'a>,
+		id: &BlockId<Block>,
+	) -> sp_blockchain::Result<RuntimeCode<'a>>
+	where
+		Block: BlockT,
+		B: backend::Backend<Block>,
+	{
+		let code = self.wasm_override
+			.as_ref()
+			.map::<sp_blockchain::Result<Option<RuntimeCode>>, _>(|o| {
+				let spec = self.runtime_version(id)?.spec_version;
+				Ok(o.get(&spec, onchain_code.heap_pages))
+			})
+			.transpose()?
+			.flatten()
+			.unwrap_or(onchain_code);
+
+		Ok(code)
 	}
 }
 
@@ -66,6 +101,7 @@ impl<B, E> Clone for LocalCallExecutor<B, E> where E: Clone {
 		LocalCallExecutor {
 			backend: self.backend.clone(),
 			executor: self.executor.clone(),
+			wasm_override: self.wasm_override.clone(),
 			spawn_handle: self.spawn_handle.clone(),
 			client_config: self.client_config.clone(),
 		}
@@ -101,6 +137,8 @@ where
 		)?;
 		let state = self.backend.state_at(*id)?;
 		let state_runtime_code = sp_state_machine::backend::BackendRuntimeCode::new(&state);
+		let runtime_code = self.check_override(state_runtime_code.runtime_code()?, id)?;
+
 		let return_data = StateMachine::new(
 			&state,
 			changes_trie,
@@ -110,7 +148,7 @@ where
 			method,
 			call_data,
 			extensions.unwrap_or_default(),
-			&state_runtime_code.runtime_code()?,
+			&runtime_code,
 			self.spawn_handle.clone(),
 		).execute_using_consensus_failure_handler::<_, NeverNativeValue, fn() -> _>(
 			strategy.get_manager(),
@@ -173,7 +211,7 @@ where
 				let state_runtime_code = sp_state_machine::backend::BackendRuntimeCode::new(&trie_state);
 				// It is important to extract the runtime code here before we create the proof
 				// recorder.
-				let runtime_code = state_runtime_code.runtime_code()?;
+				let runtime_code = self.check_override(state_runtime_code.runtime_code()?, at)?;
 
 				let backend = sp_state_machine::ProvingBackend::new_with_recorder(
 					trie_state,
@@ -198,7 +236,8 @@ where
 			},
 			None => {
 				let state_runtime_code = sp_state_machine::backend::BackendRuntimeCode::new(&state);
-				let runtime_code = state_runtime_code.runtime_code()?;
+				let runtime_code = self.check_override(state_runtime_code.runtime_code()?, at)?;
+
 				let mut state_machine = StateMachine::new(
 					&state,
 					changes_trie_state,
@@ -279,3 +318,66 @@ impl<B, E, Block> sp_version::GetRuntimeVersion<Block> for LocalCallExecutor<B,
 		CallExecutor::runtime_version(self, at).map_err(|e| format!("{:?}", e))
 	}
 }
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use substrate_test_runtime_client::{LocalExecutor, GenesisInit, runtime};
+	use sc_executor::{NativeExecutor, WasmExecutionMethod};
+	use sp_core::{traits::{WrappedRuntimeCode, FetchRuntimeCode}, testing::TaskExecutor};
+	use sc_client_api::in_mem;
+
+	#[test]
+	fn should_get_override_if_exists() {
+		let executor =
+			NativeExecutor::<LocalExecutor>::new(WasmExecutionMethod::Interpreted, Some(128), 1);
+
+		let overrides = crate::client::wasm_override::dummy_overrides(&executor);
+		let onchain_code = WrappedRuntimeCode(substrate_test_runtime::wasm_binary_unwrap().into());
+		let onchain_code = RuntimeCode {
+			code_fetcher: &onchain_code,
+			heap_pages: Some(128),
+			hash: vec![0, 0, 0, 0],
+		};
+
+		let backend = Arc::new(in_mem::Backend::<runtime::Block>::new());
+
+		// wasm_runtime_overrides is `None` here because we construct the
+		// LocalCallExecutor directly later on
+		let client_config = ClientConfig {
+			offchain_worker_enabled: false,
+			offchain_indexing_api: false,
+			wasm_runtime_overrides: None,
+		};
+
+		// client is used for the convenience of creating and inserting the genesis block.
+		let _client = substrate_test_runtime_client::client::new_with_backend::<
+			_,
+			_,
+			runtime::Block,
+			_,
+			runtime::RuntimeApi,
+		>(
+			backend.clone(),
+			executor.clone(),
+			&substrate_test_runtime_client::GenesisParameters::default().genesis_storage(),
+			None,
+			Box::new(TaskExecutor::new()),
+			None,
+			Default::default(),
+		).expect("Creates a client");
+
+		let call_executor = LocalCallExecutor {
+			backend: backend.clone(),
+			executor,
+			wasm_override: Some(overrides),
+			spawn_handle: Box::new(TaskExecutor::new()),
+			client_config,
+		};
+
+		let check = call_executor.check_override(onchain_code, &BlockId::Number(Default::default()))
+			.expect("RuntimeCode override");
+
+		assert_eq!(Some(vec![2, 2, 2, 2, 2, 2, 2, 2]), check.fetch_runtime_code().map(Into::into));
+	}
+}
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index 1b07e6b4f7b2..d423fdee39b6 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -22,6 +22,7 @@ use std::{
 	marker::PhantomData,
 	collections::{HashSet, BTreeMap, HashMap},
 	sync::Arc, panic::UnwindSafe, result,
+	path::PathBuf
 };
 use log::{info, trace, warn};
 use parking_lot::{Mutex, RwLock};
@@ -181,6 +182,8 @@ pub struct ClientConfig {
 	pub offchain_worker_enabled: bool,
 	/// If true, allows access from the runtime to write into offchain worker db.
 	pub offchain_indexing_api: bool,
+	/// Path where WASM files exist to override the on-chain WASM.
+	pub wasm_runtime_overrides: Option<PathBuf>,
 }
 
 /// Create a client with the explicitly provided backend.
@@ -201,7 +204,7 @@ pub fn new_with_backend<B, E, Block, S, RA>(
 		Block: BlockT,
 		B: backend::LocalBackend<Block> + 'static,
 {
-	let call_executor = LocalCallExecutor::new(backend.clone(), executor, spawn_handle, config.clone());
+	let call_executor = LocalCallExecutor::new(backend.clone(), executor, spawn_handle, config.clone())?;
 	let extensions = ExecutionExtensions::new(Default::default(), keystore);
 	Client::new(
 		backend,
diff --git a/client/service/src/client/light.rs b/client/service/src/client/light.rs
index e8e1286eccdb..6d4f9aa1c9d1 100644
--- a/client/service/src/client/light.rs
+++ b/client/service/src/client/light.rs
@@ -60,7 +60,7 @@ pub fn new_light<B, S, RA, E>(
 		code_executor,
 		spawn_handle.clone(),
 		ClientConfig::default()
-	);
+	)?;
 	let executor = GenesisCallExecutor::new(backend.clone(), local_executor);
 	Client::new(
 		backend,
diff --git a/client/service/src/client/mod.rs b/client/service/src/client/mod.rs
index 7c96f61a7867..b3aa2fa076af 100644
--- a/client/service/src/client/mod.rs
+++ b/client/service/src/client/mod.rs
@@ -49,6 +49,7 @@ pub mod light;
 mod call_executor;
 mod client;
 mod block_rules;
+mod wasm_override;
 
 pub use self::{
 	call_executor::LocalCallExecutor,
diff --git a/client/service/src/client/wasm_override.rs b/client/service/src/client/wasm_override.rs
new file mode 100644
index 000000000000..1025b9633887
--- /dev/null
+++ b/client/service/src/client/wasm_override.rs
@@ -0,0 +1,267 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! # WASM Local Blob-Override
+//!
+//! WASM Local blob override provides tools to replace on-chain WASM with custom WASM.
+//! These customized WASM blobs may include functionality that is not included in the
+//! on-chain WASM, such as tracing or debugging information. This extra information is especially
+//! useful in external scenarios, like exchanges or archive nodes.
+//!
+//! ## Usage
+//!
+//! WASM overrides may be enabled with the `--wasm-runtime-overrides` argument. The argument
+//! expects a path to a directory that holds custom WASM.
+//!
+//! Any file ending in '.wasm' will be scraped and instantiated as a WASM blob. WASM can be built by
+//! compiling the required runtime with the changes needed. For example, compiling a runtime with
+//! tracing enabled would produce a WASM blob that can used.
+//!
+//! A custom WASM blob will override on-chain WASM if the spec version matches. If it is
+//! required to overrides multiple runtimes, multiple WASM blobs matching each of the spec versions
+//! needed must be provided in the given directory.
+//!
+use std::{
+	fs, collections::{HashMap, hash_map::DefaultHasher}, path::Path,
+	hash::Hasher as _,
+};
+use sp_core::traits::FetchRuntimeCode;
+use sp_state_machine::BasicExternalities;
+use sp_blockchain::Result;
+use sc_executor::RuntimeInfo;
+use sp_version::RuntimeVersion;
+use sp_core::traits::RuntimeCode;
+
+#[derive(Clone, Debug, PartialEq)]
+/// Auxiliary structure that holds a wasm blob and its hash.
+struct WasmBlob {
+	code: Vec<u8>,
+	hash: Vec<u8>,
+}
+
+impl WasmBlob {
+	fn new(code: Vec<u8>) -> Self {
+		let hash = make_hash(&code);
+		Self { code, hash }
+	}
+
+	fn runtime_code(&self, heap_pages: Option<u64>) -> RuntimeCode {
+		RuntimeCode {
+			code_fetcher: self,
+			hash: self.hash.clone(),
+			heap_pages,
+		}
+	}
+}
+
+/// Make a hash out of a byte string using the default rust hasher
+fn make_hash<K: std::hash::Hash + ?Sized>(val: &K) -> Vec<u8> {
+	let mut state = DefaultHasher::new();
+	val.hash(&mut state);
+	state.finish().to_le_bytes().to_vec()
+}
+
+impl FetchRuntimeCode for WasmBlob {
+	fn fetch_runtime_code<'a>(&'a self) -> Option<std::borrow::Cow<'a, [u8]>> {
+		Some(self.code.as_slice().into())
+	}
+}
+
+/// Scrapes WASM from a folder and returns WASM from that folder
+/// if the runtime spec version matches.
+#[derive(Clone, Debug)]
+pub struct WasmOverride<E> {
+	// Map of runtime spec version -> Wasm Blob
+	overrides: HashMap<u32, WasmBlob>,
+	executor: E,
+}
+
+impl<E> WasmOverride<E>
+where
+	E: RuntimeInfo + Clone + 'static
+{
+	pub fn new<P>(path: P, executor: E) -> Result<Self>
+	where
+		P: AsRef<Path>,
+	{
+		let overrides = Self::scrape_overrides(path.as_ref(), &executor)?;
+		Ok(Self { overrides, executor })
+	}
+
+	/// Gets an override by it's runtime spec version.
+	///
+	/// Returns `None` if an override for a spec version does not exist.
+	pub fn get<'a, 'b: 'a>(
+		&'b self,
+		spec: &u32,
+		pages: Option<u64>,
+	) -> Option<RuntimeCode<'a>> {
+		self.overrides
+			.get(spec)
+			.map(|w| w.runtime_code(pages))
+	}
+
+	/// Scrapes a folder for WASM runtimes.
+	/// Returns a hashmap of the runtime version and wasm runtime code.
+	fn scrape_overrides(dir: &Path, executor: &E) -> Result<HashMap<u32, WasmBlob>> {
+		let handle_err = |e: std::io::Error | -> sp_blockchain::Error {
+			sp_blockchain::Error::Msg(format!("{}", e.to_string()))
+		};
+
+		if !dir.is_dir() {
+			return Err(sp_blockchain::Error::Msg(format!(
+				"Overwriting WASM requires a directory where \
+				 local WASM is stored. {:?} is not a directory",
+				 dir,
+			)));
+		}
+
+		let mut overrides = HashMap::new();
+		let mut duplicates = Vec::new();
+		for entry in fs::read_dir(dir).map_err(handle_err)? {
+			let entry = entry.map_err(handle_err)?;
+			let path = entry.path();
+			match path.extension().map(|e| e.to_str()).flatten() {
+				Some("wasm") => {
+					let wasm = WasmBlob::new(fs::read(&path).map_err(handle_err)?);
+					let version = Self::runtime_version(executor, &wasm, Some(128))?;
+					if let Some(_duplicate) = overrides.insert(version.spec_version, wasm) {
+						duplicates.push(format!("{}", path.display()));
+					}
+				}
+				_ => ()
+			}
+		}
+
+		if !duplicates.is_empty() {
+			let duplicate_file_list = duplicates.join("\n");
+			let msg = format!("Duplicate WASM Runtimes found: \n{}\n", duplicate_file_list);
+			return Err(sp_blockchain::Error::Msg(msg));
+		}
+
+		Ok(overrides)
+	}
+
+	fn runtime_version(
+		executor: &E,
+		code: &WasmBlob,
+		heap_pages: Option<u64>,
+	) -> Result<RuntimeVersion> {
+		let mut ext = BasicExternalities::default();
+		executor.runtime_version(&mut ext, &code.runtime_code(heap_pages))
+			.map_err(|e| sp_blockchain::Error::VersionInvalid(format!("{:?}", e)).into())
+	}
+}
+
+/// Returns a WasmOverride struct filled with dummy data for testing.
+#[cfg(test)]
+pub fn dummy_overrides<E>(executor: &E) -> WasmOverride<E>
+where
+	E: RuntimeInfo + Clone + 'static
+{
+	let mut overrides = HashMap::new();
+	overrides.insert(0, WasmBlob::new(vec![0, 0, 0, 0, 0, 0, 0, 0]));
+	overrides.insert(1, WasmBlob::new(vec![1, 1, 1, 1, 1, 1, 1, 1]));
+	overrides.insert(2, WasmBlob::new(vec![2, 2, 2, 2, 2, 2, 2, 2]));
+	WasmOverride {
+		overrides,
+		executor: executor.clone()
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use sc_executor::{NativeExecutor, WasmExecutionMethod};
+	use substrate_test_runtime_client::LocalExecutor;
+	use std::fs::{self, File};
+
+	fn wasm_test<F>(fun: F)
+	where
+		F: Fn(&Path, &[u8], &NativeExecutor::<LocalExecutor>)
+	{
+		let exec = NativeExecutor::<substrate_test_runtime_client::LocalExecutor>::new(
+			WasmExecutionMethod::Interpreted,
+			Some(128),
+			1,
+		);
+		let bytes = substrate_test_runtime::wasm_binary_unwrap();
+		let dir = tempfile::tempdir().expect("Create a temporary directory");
+		fun(dir.path(), bytes, &exec);
+		dir.close().expect("Temporary Directory should close");
+	}
+
+	#[test]
+	fn should_get_runtime_version() {
+		let wasm = WasmBlob::new(substrate_test_runtime::wasm_binary_unwrap().to_vec());
+		let executor =
+			NativeExecutor::<LocalExecutor>::new(WasmExecutionMethod::Interpreted, Some(128), 1);
+
+		let version = WasmOverride::runtime_version(&executor, &wasm, Some(128))
+			.expect("should get the `RuntimeVersion` of the test-runtime wasm blob");
+		assert_eq!(version.spec_version, 2);
+	}
+
+	#[test]
+	fn should_scrape_wasm() {
+		wasm_test(|dir, wasm_bytes, exec| {
+			fs::write(dir.join("test.wasm"), wasm_bytes).expect("Create test file");
+			let overrides = WasmOverride::scrape_overrides(dir, exec)
+				.expect("HashMap of u32 and WasmBlob");
+			let wasm = overrides.get(&2).expect("WASM binary");
+			assert_eq!(wasm.code, substrate_test_runtime::wasm_binary_unwrap().to_vec())
+		});
+	}
+
+	#[test]
+	fn should_check_for_duplicates() {
+		wasm_test(|dir, wasm_bytes, exec| {
+			fs::write(dir.join("test0.wasm"), wasm_bytes).expect("Create test file");
+			fs::write(dir.join("test1.wasm"), wasm_bytes).expect("Create test file");
+			let scraped = WasmOverride::scrape_overrides(dir, exec);
+
+			match scraped {
+				Err(e) => {
+					match e {
+						sp_blockchain::Error::Msg(msg) => {
+							let is_match = msg
+								.matches("Duplicate WASM Runtimes found")
+								.map(ToString::to_string)
+								.collect::<Vec<String>>();
+							assert!(is_match.len() >= 1)
+						},
+						_ => panic!("Test should end with Msg Error Variant")
+					}
+				},
+				_ => panic!("Test should end in error")
+			}
+		});
+	}
+
+	#[test]
+	fn should_ignore_non_wasm() {
+		wasm_test(|dir, wasm_bytes, exec| {
+			File::create(dir.join("README.md")).expect("Create test file");
+			File::create(dir.join("LICENSE")).expect("Create a test file");
+			fs::write(dir.join("test0.wasm"), wasm_bytes).expect("Create test file");
+			let scraped = WasmOverride::scrape_overrides(dir, exec)
+				.expect("HashMap of u32 and WasmBlob");
+			assert_eq!(scraped.len(), 1);
+		});
+	}
+}
diff --git a/client/service/src/config.rs b/client/service/src/config.rs
index 15783a87f991..0caf05b2485d 100644
--- a/client/service/src/config.rs
+++ b/client/service/src/config.rs
@@ -62,6 +62,10 @@ pub struct Configuration {
 	pub chain_spec: Box<dyn ChainSpec>,
 	/// Wasm execution method.
 	pub wasm_method: WasmExecutionMethod,
+	/// Directory where local WASM runtimes live. These runtimes take precedence
+	/// over on-chain runtimes when the spec version matches. Set to `None` to
+	/// disable overrides (default).
+	pub wasm_runtime_overrides: Option<PathBuf>,
 	/// Execution strategies.
 	pub execution_strategies: ExecutionStrategies,
 	/// RPC over HTTP binding address. `None` if disabled.
diff --git a/client/service/test/src/lib.rs b/client/service/test/src/lib.rs
index 6d8b4decb18c..8a9f0ace171d 100644
--- a/client/service/test/src/lib.rs
+++ b/client/service/test/src/lib.rs
@@ -252,6 +252,7 @@ fn node_config<G: RuntimeGenesis + 'static, E: ChainSpecExtension + Clone + 'sta
 		pruning: Default::default(),
 		chain_spec: Box::new((*spec).clone()),
 		wasm_method: sc_service::config::WasmExecutionMethod::Interpreted,
+		wasm_runtime_overrides: Default::default(),
 		execution_strategies: Default::default(),
 		rpc_http: None,
 		rpc_ipc: None,
diff --git a/test-utils/client/src/lib.rs b/test-utils/client/src/lib.rs
index 35d6e78ccd41..bde2156e0cc8 100644
--- a/test-utils/client/src/lib.rs
+++ b/test-utils/client/src/lib.rs
@@ -259,7 +259,7 @@ impl<Block: BlockT, E, Backend, G: GenesisInit> TestClientBuilder<
 			executor,
 			Box::new(sp_core::testing::TaskExecutor::new()),
 			Default::default(),
-		);
+		).expect("Creates LocalCallExecutor");
 
 		self.build_with_executor(executor)
 	}
diff --git a/test-utils/runtime/client/src/lib.rs b/test-utils/runtime/client/src/lib.rs
index 5b343f7748ea..9089be3ad4f4 100644
--- a/test-utils/runtime/client/src/lib.rs
+++ b/test-utils/runtime/client/src/lib.rs
@@ -355,7 +355,7 @@ pub fn new_light() -> (
 		executor,
 		Box::new(sp_core::testing::TaskExecutor::new()),
 		Default::default(),
-	);
+	).expect("Creates LocalCallExecutor");
 	let call_executor = LightExecutor::new(
 		backend.clone(),
 		local_call_executor,
diff --git a/utils/browser/src/lib.rs b/utils/browser/src/lib.rs
index f5d3faeb86a0..95ec7ca19c9a 100644
--- a/utils/browser/src/lib.rs
+++ b/utils/browser/src/lib.rs
@@ -98,6 +98,7 @@ where
 		tracing_targets: Default::default(),
 		transaction_pool: Default::default(),
 		wasm_method: Default::default(),
+		wasm_runtime_overrides: Default::default(),
 		max_runtime_instances: 8,
 		announce_block: true,
 		base_path: None,

From a3d783c91f2a0941b09d69c63160c26c011748ae Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Mon, 26 Oct 2020 19:02:17 +0100
Subject: [PATCH 0016/1194] Don't slash all outgoing members. (#7394)

* Don't slash all outgoing members.

* One more fix

* cargo run --release --features runtime-benchmarks --manifest-path bin/node/cli/Cargo.toml -- benchmark --chain dev --steps 50 --repeat 20 --extrinsic * --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output ./bin/node/runtime/src/weights --header ./HEADER --pallet pallet_elections_phragmen

Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
---
 .../src/weights/pallet_elections_phragmen.rs  |  42 ++++----
 frame/elections-phragmen/src/lib.rs           | 101 +++++++++++++++++-
 2 files changed, 119 insertions(+), 24 deletions(-)

diff --git a/bin/node/runtime/src/weights/pallet_elections_phragmen.rs b/bin/node/runtime/src/weights/pallet_elections_phragmen.rs
index 8da9838d5d7a..a77817fa1f54 100644
--- a/bin/node/runtime/src/weights/pallet_elections_phragmen.rs
+++ b/bin/node/runtime/src/weights/pallet_elections_phragmen.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
-
+//! Weights for pallet_elections_phragmen
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
+//! DATE: 2020-10-26, STEPS: [50], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
@@ -26,65 +28,65 @@ use sp_std::marker::PhantomData;
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Trait> pallet_elections_phragmen::WeightInfo for WeightInfo<T> {
 	fn vote(v: u32, ) -> Weight {
-		(91_489_000 as Weight)
-			.saturating_add((199_000 as Weight).saturating_mul(v as Weight))
+		(91_991_000 as Weight)
+			.saturating_add((184_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn vote_update(v: u32, ) -> Weight {
-		(56_511_000 as Weight)
-			.saturating_add((245_000 as Weight).saturating_mul(v as Weight))
+		(56_633_000 as Weight)
+			.saturating_add((228_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn remove_voter() -> Weight {
-		(76_714_000 as Weight)
+		(76_890_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn report_defunct_voter_correct(c: u32, v: u32, ) -> Weight {
 		(0 as Weight)
-			.saturating_add((1_743_000 as Weight).saturating_mul(c as Weight))
-			.saturating_add((31_750_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((1_769_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((32_244_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn report_defunct_voter_incorrect(c: u32, v: u32, ) -> Weight {
 		(0 as Weight)
-			.saturating_add((1_733_000 as Weight).saturating_mul(c as Weight))
-			.saturating_add((31_861_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((1_777_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((32_528_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn submit_candidacy(c: u32, ) -> Weight {
-		(74_714_000 as Weight)
-			.saturating_add((315_000 as Weight).saturating_mul(c as Weight))
+		(75_137_000 as Weight)
+			.saturating_add((310_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn renounce_candidacy_candidate(c: u32, ) -> Weight {
-		(50_408_000 as Weight)
-			.saturating_add((159_000 as Weight).saturating_mul(c as Weight))
+		(50_071_000 as Weight)
+			.saturating_add((184_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn renounce_candidacy_members() -> Weight {
-		(79_626_000 as Weight)
+		(79_471_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn renounce_candidacy_runners_up() -> Weight {
-		(49_715_000 as Weight)
+		(49_740_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn remove_member_with_replacement() -> Weight {
-		(76_572_000 as Weight)
+		(76_973_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
 	fn remove_member_wrong_refund() -> Weight {
-		(8_777_000 as Weight)
+		(8_871_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 	}
 }
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index b1c4ea5e679b..f743c3cde813 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -973,10 +973,15 @@ impl<T: Trait> Module<T> {
 			);
 			T::ChangeMembers::set_prime(prime);
 
-			// outgoing members lose their bond.
-			let mut to_burn_bond = outgoing.to_vec();
+			// outgoing members who are no longer a runner-up lose their bond.
+			let mut to_burn_bond = outgoing
+				.iter()
+				.filter(|o| new_runners_up_ids_sorted.binary_search(o).is_err())
+				.cloned()
+				.collect::<Vec<_>>();
 
-			// compute the outgoing of runners up as well and append them to the `to_burn_bond`
+			// compute the outgoing of runners up as well and append them to the `to_burn_bond`, if
+			// they are not members.
 			{
 				let (_, outgoing) = T::ChangeMembers::compute_members_diff(
 					&new_runners_up_ids_sorted,
@@ -984,7 +989,13 @@ impl<T: Trait> Module<T> {
 				);
 				// none of the ones computed to be outgoing must still be in the list.
 				debug_assert!(outgoing.iter().all(|o| !new_runners_up_ids_sorted.contains(o)));
-				to_burn_bond.extend(outgoing);
+				to_burn_bond.extend(
+					outgoing
+						.iter()
+						.filter(|o| new_members_ids_sorted.binary_search(o).is_err())
+						.cloned()
+						.collect::<Vec<_>>()
+				);
 			}
 
 			// Burn loser bond. members list is sorted. O(NLogM) (N candidates, M members)
@@ -2876,4 +2887,86 @@ mod tests {
 			assert_eq!(balances(&3), (25, 5));
 		})
 	}
+
+	#[test]
+	fn member_to_runner_up_wont_slash() {
+		ExtBuilder::default().desired_runners_up(2).desired_members(1).build_and_execute(|| {
+			assert_ok!(submit_candidacy(Origin::signed(4)));
+			assert_ok!(submit_candidacy(Origin::signed(3)));
+			assert_ok!(submit_candidacy(Origin::signed(2)));
+
+
+			assert_ok!(vote(Origin::signed(4), vec![4], 40));
+			assert_ok!(vote(Origin::signed(3), vec![3], 30));
+			assert_ok!(vote(Origin::signed(2), vec![2], 20));
+
+			System::set_block_number(5);
+			Elections::end_block(System::block_number());
+
+			assert_eq!(Elections::members_ids(), vec![4]);
+			assert_eq!(Elections::runners_up_ids(), vec![2, 3]);
+
+			assert_eq!(balances(&4), (35, 5));
+			assert_eq!(balances(&3), (25, 5));
+			assert_eq!(balances(&2), (15, 5));
+
+			// this guy will shift everyone down.
+			assert_ok!(submit_candidacy(Origin::signed(5)));
+			assert_ok!(vote(Origin::signed(5), vec![5], 50));
+
+			System::set_block_number(10);
+			Elections::end_block(System::block_number());
+
+			assert_eq!(Elections::members_ids(), vec![5]);
+			assert_eq!(Elections::runners_up_ids(), vec![3, 4]);
+
+			// 4 went from member to runner-up -- don't slash.
+			assert_eq!(balances(&4), (35, 5));
+			// 3 stayed runner-up -- don't slash.
+			assert_eq!(balances(&3), (25, 5));
+			// 2 was removed -- slash.
+			assert_eq!(balances(&2), (15, 2));
+		});
+	}
+
+	#[test]
+	fn runner_up_to_member_wont_slash() {
+		ExtBuilder::default().desired_runners_up(2).desired_members(1).build_and_execute(|| {
+			assert_ok!(submit_candidacy(Origin::signed(4)));
+			assert_ok!(submit_candidacy(Origin::signed(3)));
+			assert_ok!(submit_candidacy(Origin::signed(2)));
+
+
+			assert_ok!(vote(Origin::signed(4), vec![4], 40));
+			assert_ok!(vote(Origin::signed(3), vec![3], 30));
+			assert_ok!(vote(Origin::signed(2), vec![2], 20));
+
+			System::set_block_number(5);
+			Elections::end_block(System::block_number());
+
+			assert_eq!(Elections::members_ids(), vec![4]);
+			assert_eq!(Elections::runners_up_ids(), vec![2, 3]);
+
+			assert_eq!(balances(&4), (35, 5));
+			assert_eq!(balances(&3), (25, 5));
+			assert_eq!(balances(&2), (15, 5));
+
+			// swap some votes.
+			assert_ok!(vote(Origin::signed(4), vec![2], 40));
+			assert_ok!(vote(Origin::signed(2), vec![4], 20));
+
+			System::set_block_number(10);
+			Elections::end_block(System::block_number());
+
+			assert_eq!(Elections::members_ids(), vec![2]);
+			assert_eq!(Elections::runners_up_ids(), vec![4, 3]);
+
+			// 2 went from runner to member, don't slash
+			assert_eq!(balances(&2), (15, 5));
+			// 4 went from member to runner, don't slash
+			assert_eq!(balances(&4), (35, 5));
+			// 3 stayed the same
+			assert_eq!(balances(&3), (25, 5));
+		});
+	}
 }

From 9fdb708f66dc5e960cf40dbfeb09fae0d159aba1 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Mon, 26 Oct 2020 19:32:12 +0100
Subject: [PATCH 0017/1194] Fix doc for ChangeMember trait (#7396)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix doc

* Update frame/support/src/traits.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 frame/support/src/traits.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index af7a7ee3635e..bea768bf119d 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -1268,8 +1268,9 @@ pub trait ChangeMembers<AccountId: Clone + Ord> {
 		Self::change_members_sorted(&incoming[..], &outgoing[..], &new_members);
 	}
 
-	/// Set the new members; they **must already be sorted**. This will compute the diff and use it to
-	/// call `change_members_sorted`.
+	/// Compute diff between new and old members; they **must already be sorted**. 
+	///
+	/// Returns incoming and outgoing members.
 	fn compute_members_diff(
 		new_members: &[AccountId],
 		old_members: &[AccountId]

From 510e68b8d06a3d407eda0d4c1c330bd484140b65 Mon Sep 17 00:00:00 2001
From: Drew Stone <drewstone329@gmail.com>
Date: Mon, 26 Oct 2020 15:35:16 -0400
Subject: [PATCH 0018/1194] Add keccak512 hash (#7428)

* Add keccak512

* Update hashing.rs
---
 primitives/core/src/hashing.rs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/primitives/core/src/hashing.rs b/primitives/core/src/hashing.rs
index f61700a5a43c..98dc0c2efc59 100644
--- a/primitives/core/src/hashing.rs
+++ b/primitives/core/src/hashing.rs
@@ -146,6 +146,15 @@ pub fn keccak_256(data: &[u8]) -> [u8; 32] {
 	output
 }
 
+/// Do a keccak 512-bit hash and return result.
+pub fn keccak_512(data: &[u8]) -> [u8; 64] {
+	let mut keccak = Keccak::v512();
+	keccak.update(data);
+	let mut output = [0u8; 64];
+	keccak.finalize(&mut output);
+	output
+}
+
 /// Do a sha2 256-bit hash and return result.
 pub fn sha2_256(data: &[u8]) -> [u8; 32] {
 	let mut hasher = Sha256::new();

From ef8534ab2d12d87555d384a1688c4366df877a05 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Tue, 27 Oct 2020 11:52:56 +0100
Subject: [PATCH 0019/1194] Fix typo in toml (#7431)

---
 client/service/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index 5e2f8d051da3..3569b2e7e585 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -86,7 +86,7 @@ directories = "2.0.2"
 
 [dev-dependencies]
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
-substrate-test-runtime = { versino = "2.0.0", path = "../../test-utils/runtime/" }
+substrate-test-runtime = { version = "2.0.0", path = "../../test-utils/runtime/" }
 sp-consensus-babe = { version = "0.8.0", path = "../../primitives/consensus/babe" }
 grandpa = { version = "0.8.0", package = "sc-finality-grandpa", path = "../finality-grandpa" }
 grandpa-primitives = { version = "2.0.0", package = "sp-finality-grandpa", path = "../../primitives/finality-grandpa" }

From 4d3a372d6245a99ade9a929b0d4fe1f5178c46bb Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Tue, 27 Oct 2020 13:25:57 +0100
Subject: [PATCH 0020/1194] Use Handlebars Template for Benchmark CLI Output
 (#7390)

* add_handlebar_template_to_benchmark

- add benchmark-cli arg to take in a handlebar-template file

* update to always use template

* rewrite writer for handlebars

* polish

* pass cmd data

* update docs

* support custom filename output

* Update command.rs

* Create frame-weight-template.hbs

* use a vector to maintain benchmark order

* fix tests

* Custom string serializer, remove feature flag

* update docs

* docs on public objects

* small fix

Co-authored-by: Ezadkiel Marbella <zadkiel.m@gmail.com>
---
 .maintain/frame-weight-template.hbs           |  68 ++
 Cargo.lock                                    |  89 ++-
 frame/benchmarking/README.md                  |  36 +-
 utils/frame/benchmarking-cli/Cargo.toml       |   2 +
 utils/frame/benchmarking-cli/src/command.rs   |  15 +-
 utils/frame/benchmarking-cli/src/lib.rs       |  16 +-
 utils/frame/benchmarking-cli/src/template.hbs |  41 ++
 utils/frame/benchmarking-cli/src/writer.rs    | 607 ++++++++++--------
 8 files changed, 578 insertions(+), 296 deletions(-)
 create mode 100644 .maintain/frame-weight-template.hbs
 create mode 100644 utils/frame/benchmarking-cli/src/template.hbs

diff --git a/.maintain/frame-weight-template.hbs b/.maintain/frame-weight-template.hbs
new file mode 100644
index 000000000000..d0d7ef93d3ac
--- /dev/null
+++ b/.maintain/frame-weight-template.hbs
@@ -0,0 +1,68 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Weights for {{pallet}}
+//! {{join args}}
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION {{version}}
+//! DATE: {{date}}, STEPS: {{cmd.steps}}, REPEAT: {{cmd.repeat}}, LOW RANGE: {{cmd.lowest_range_values}}, HIGH RANGE: {{cmd.highest_range_values}}
+//! EXECUTION: {{cmd.execution}}, WASM-EXECUTION: {{cmd.wasm_execution}}, CHAIN: {{cmd.chain}}, DB CACHE: {{cmd.db_cache}}
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::Weight};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for {{pallet}}.
+pub trait WeightInfo {
+	{{#each benchmarks as |benchmark| ~}}
+	fn {{benchmark.name~}}
+	(
+		{{~#each benchmark.components as |c| ~}}
+		_{{c.name}}: u32, {{/each~}}
+	) -> Weight;
+	{{/each}}
+}
+
+/// Weights for {{pallet}} using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+	{{#each benchmarks as |benchmark| ~}}
+	fn {{benchmark.name~}}
+	(
+		{{~#each benchmark.components as |c| ~}}
+		{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
+	) -> Weight {
+		({{underscore benchmark.base_weight}} as Weight)
+			{{#each benchmark.component_weight as |cw| ~}}
+			.saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
+			{{/each}}
+			{{~#if (ne benchmark.base_reads "0") ~}}
+			.saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}} as Weight))
+			{{/if}}
+			{{~#each benchmark.component_reads as |cr| ~}}
+			.saturating_add(T::DbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight)))
+			{{/each}}
+			{{~#if (ne benchmark.base_writes "0") ~}}
+			.saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}} as Weight))
+			{{/if}}
+			{{~#each benchmark.component_writes as |cw| ~}}
+			.saturating_add(T::DbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
+			{{~/each}}
+	}
+	{{/each}}
+}
diff --git a/Cargo.lock b/Cargo.lock
index 1560b7bdddc9..f26f4b2ae054 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1231,7 +1231,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4d33be9473d06f75f58220f71f7a9317aca647dc061dbd3c361b0bef505fbea"
 dependencies = [
  "byteorder 1.3.4",
- "quick-error",
+ "quick-error 1.2.3",
 ]
 
 [[package]]
@@ -1599,11 +1599,13 @@ version = "2.0.0"
 dependencies = [
  "chrono",
  "frame-benchmarking",
+ "handlebars",
  "parity-scale-codec",
  "sc-cli",
  "sc-client-db",
  "sc-executor",
  "sc-service",
+ "serde",
  "sp-core",
  "sp-externalities",
  "sp-keystore",
@@ -2181,6 +2183,20 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d36fab90f82edc3c747f9d438e06cf0a491055896f2a279638bb5beed6c40177"
 
+[[package]]
+name = "handlebars"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcd1b5399b9884f9ae18b5d4105d180720c8f602aeb73d3ceae9d6b1d13a5fa7"
+dependencies = [
+ "log",
+ "pest",
+ "pest_derive",
+ "quick-error 2.0.0",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "hash-db"
 version = "0.15.2"
@@ -2350,7 +2366,7 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
 dependencies = [
- "quick-error",
+ "quick-error 1.2.3",
 ]
 
 [[package]]
@@ -3407,6 +3423,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "maplit"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
+
 [[package]]
 name = "matchers"
 version = "0.0.1"
@@ -5441,6 +5463,49 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
+[[package]]
+name = "pest"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
+dependencies = [
+ "ucd-trie",
+]
+
+[[package]]
+name = "pest_derive"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0"
+dependencies = [
+ "pest",
+ "pest_generator",
+]
+
+[[package]]
+name = "pest_generator"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55"
+dependencies = [
+ "pest",
+ "pest_meta",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "pest_meta"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d"
+dependencies = [
+ "maplit",
+ "pest",
+ "sha-1",
+]
+
 [[package]]
 name = "petgraph"
 version = "0.5.1"
@@ -5734,6 +5799,12 @@ version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
+[[package]]
+name = "quick-error"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ac73b1112776fc109b2e61909bc46c7e1bf0d7f690ffb1676553acce16d5cda"
+
 [[package]]
 name = "quickcheck"
 version = "0.9.2"
@@ -7653,9 +7724,9 @@ checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0"
 
 [[package]]
 name = "serde"
-version = "1.0.114"
+version = "1.0.116"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3"
+checksum = "96fe57af81d28386a513cbc6858332abc6117cfdb5999647c6444b8f43a370a5"
 dependencies = [
  "serde_derive",
 ]
@@ -7672,9 +7743,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.114"
+version = "1.0.116"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e"
+checksum = "f630a6370fd8e457873b4bd2ffdae75408bc291ba72be773772a4c2a065d9ae8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9700,6 +9771,12 @@ version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33"
 
+[[package]]
+name = "ucd-trie"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
+
 [[package]]
 name = "uint"
 version = "0.8.3"
diff --git a/frame/benchmarking/README.md b/frame/benchmarking/README.md
index bf4bf951aa2b..1727072709b2 100644
--- a/frame/benchmarking/README.md
+++ b/frame/benchmarking/README.md
@@ -116,10 +116,15 @@ need to move into your node's binary folder. For example, with the Substrate rep
 you would test the Balances pallet's benchmarks:
 
 ```bash
-cd bin/node/cli
 cargo test -p pallet-balances --features runtime-benchmarks
 ```
 
+> NOTE: Substrate uses a virtual workspace which does not allow you to compile with feature flags.
+> ```
+> error: --features is not allowed in the root of a virtual workspace`
+> ```
+> To solve this, navigate to the folder of the node (`cd bin/node/cli`) or pallet (`cd frame/pallet`) and run the command there.
+
 ## Adding Benchmarks
 
 The benchmarks included with each pallet are not automatically added to your node. To actually
@@ -163,14 +168,14 @@ Then you can run a benchmark like so:
 
 ```bash
 ./target/release/substrate benchmark \
-    --chain dev \               # Configurable Chain Spec
-    --execution=wasm \          # Always test with Wasm
-    --wasm-execution=compiled \ # Always used `wasm-time`
-    --pallet pallet_balances \  # Select the pallet
-    --extrinsic transfer \      # Select the extrinsic
-    --steps 50 \                # Number of samples across component ranges
-    --repeat 20 \               # Number of times we repeat a benchmark
-    --output \                  # Output benchmark results into a Rust file
+    --chain dev \                  # Configurable Chain Spec
+    --execution=wasm \             # Always test with Wasm
+    --wasm-execution=compiled \    # Always used `wasm-time`
+    --pallet pallet_balances \     # Select the pallet
+    --extrinsic transfer \         # Select the extrinsic
+    --steps 50 \                   # Number of samples across component ranges
+    --repeat 20 \                  # Number of times we repeat a benchmark
+    --output <path> \              # Output benchmark results into a folder or file
 ```
 
 This will output a file `pallet_name.rs` which implements the `WeightInfo` trait you should include
@@ -179,6 +184,19 @@ implementation of the `WeightInfo` trait. This means that you will be able to us
 Substrate pallets while still keeping your network safe for your specific configuration and
 requirements.
 
+The benchmarking CLI uses a Handlebars template to format the final output file. You can optionally
+pass the flag `--template` pointing to a custom template that can be used instead. Within the
+template, you have access to all the data provided by the `TemplateData` struct in the
+[benchmarking CLI writer](../../utils/frame/benchmarking-cli/src/writer.rs). You can find the
+default template used [here](../../utils/frame/benchmarking-cli/src/template.hbs).
+
+There are some custom Handlebars helpers included with our output generation:
+
+* `underscore`: Add an underscore to every 3rd character from the right of a string. Primarily to be
+used for delimiting large numbers.
+* `join`: Join an array of strings into a space-separated string for the template. Primarily to be
+used for joining all the arguments passed to the CLI.
+
 To get a full list of available options when running benchmarks, run:
 
 ```bash
diff --git a/utils/frame/benchmarking-cli/Cargo.toml b/utils/frame/benchmarking-cli/Cargo.toml
index f2c227f78228..4ee2454e708e 100644
--- a/utils/frame/benchmarking-cli/Cargo.toml
+++ b/utils/frame/benchmarking-cli/Cargo.toml
@@ -26,6 +26,8 @@ sp-state-machine = { version = "0.8.0", path = "../../../primitives/state-machin
 structopt = "0.3.8"
 codec = { version = "1.3.1", package = "parity-scale-codec" }
 chrono = "0.4"
+serde = "1.0.116"
+handlebars = "3.5.0"
 
 [features]
 default = ["db"]
diff --git a/utils/frame/benchmarking-cli/src/command.rs b/utils/frame/benchmarking-cli/src/command.rs
index f5ea83d7b0c4..00a2e7bd7f94 100644
--- a/utils/frame/benchmarking-cli/src/command.rs
+++ b/utils/frame/benchmarking-cli/src/command.rs
@@ -43,13 +43,19 @@ impl BenchmarkCmd {
 		ExecDispatch: NativeExecutionDispatch + 'static,
 	{
 		if let Some(output_path) = &self.output {
-			if !output_path.is_dir() { return Err("Output path is invalid!".into()) };
+			if !output_path.is_dir() && output_path.file_name().is_none() {
+				return Err("Output file or path is invalid!".into())
+			}
 		}
 
 		if let Some(header_file) = &self.header {
 			if !header_file.is_file() { return Err("Header file is invalid!".into()) };
 		}
 
+		if let Some(handlebars_template_file) = &self.template {
+			if !handlebars_template_file.is_file() { return Err("Handlebars template file is invalid!".into()) };
+		}
+
 		let spec = config.chain_spec;
 		let wasm_method = self.wasm_method.into();
 		let strategy = self.execution.unwrap_or(ExecutionStrategy::Native);
@@ -99,13 +105,8 @@ impl BenchmarkCmd {
 
 		match results {
 			Ok(batches) => {
-				// If we are going to output results to a file...
 				if let Some(output_path) = &self.output {
-					if self.trait_def {
-						crate::writer::write_trait(&batches, output_path, self)?;
-					} else {
-						crate::writer::write_results(&batches, output_path, self)?;
-					}
+					crate::writer::write_results(&batches, output_path, self)?;
 				}
 
 				for batch in batches.into_iter() {
diff --git a/utils/frame/benchmarking-cli/src/lib.rs b/utils/frame/benchmarking-cli/src/lib.rs
index 725ed3113bec..b89bceeb953c 100644
--- a/utils/frame/benchmarking-cli/src/lib.rs
+++ b/utils/frame/benchmarking-cli/src/lib.rs
@@ -68,9 +68,9 @@ pub struct BenchmarkCmd {
 	#[structopt(long)]
 	pub header: Option<std::path::PathBuf>,
 
-	/// Output the trait definition to a Rust file.
+	/// Path to Handlebars template file used for outputting benchmark results. (Optional)
 	#[structopt(long)]
-	pub trait_def: bool,
+	pub template: Option<std::path::PathBuf>,
 
 	/// Set the heap pages while running benchmarks.
 	#[structopt(long)]
@@ -84,18 +84,6 @@ pub struct BenchmarkCmd {
 	#[structopt(long)]
 	pub extra: bool,
 
-	/// Output files using spaces instead of tabs.
-	#[structopt(long)]
-	pub spaces: bool,
-
-	/// Output benchmarks file using this struct name.
-	#[structopt(long, default_value = "WeightInfo")]
-	pub r#struct: String,
-
-	/// Output benchmarks file using this trait name.
-	#[structopt(long, default_value = "WeightInfo")]
-	pub r#trait: String,
-
 	#[allow(missing_docs)]
 	#[structopt(flatten)]
 	pub shared_params: sc_cli::SharedParams,
diff --git a/utils/frame/benchmarking-cli/src/template.hbs b/utils/frame/benchmarking-cli/src/template.hbs
new file mode 100644
index 000000000000..3a7e57c95425
--- /dev/null
+++ b/utils/frame/benchmarking-cli/src/template.hbs
@@ -0,0 +1,41 @@
+{{header}}
+//! Weights for {{pallet}}
+//! {{join args}}
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION {{version}}
+//! DATE: {{date}}, STEPS: {{cmd.steps}}, REPEAT: {{cmd.repeat}}, LOW RANGE: {{cmd.lowest_range_values}}, HIGH RANGE: {{cmd.highest_range_values}}
+//! EXECUTION: {{cmd.execution}}, WASM-EXECUTION: {{cmd.wasm_execution}}, CHAIN: {{cmd.chain}}, DB CACHE: {{cmd.db_cache}}
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::Weight};
+use sp_std::marker::PhantomData;
+
+/// Weight functions for {{pallet}}.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Trait> {{pallet}}::WeightInfo for WeightInfo<T> {
+	{{#each benchmarks as |benchmark| ~}}
+	fn {{benchmark.name~}}
+	(
+		{{~#each benchmark.components as |c| ~}}
+		{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
+	) -> Weight {
+		({{underscore benchmark.base_weight}} as Weight)
+			{{#each benchmark.component_weight as |cw| ~}}
+			.saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
+			{{/each}}
+			{{~#if (ne benchmark.base_reads "0") ~}}
+			.saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}} as Weight))
+			{{/if}}
+			{{~#each benchmark.component_reads as |cr| ~}}
+			.saturating_add(T::DbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight)))
+			{{/each}}
+			{{~#if (ne benchmark.base_writes "0") ~}}
+			.saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}} as Weight))
+			{{/if}}
+			{{~#each benchmark.component_writes as |cw| ~}}
+			.saturating_add(T::DbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
+			{{~/each}}
+	}
+	{{/each}}
+}
diff --git a/utils/frame/benchmarking-cli/src/writer.rs b/utils/frame/benchmarking-cli/src/writer.rs
index 23c1db06fb9c..61423000231d 100644
--- a/utils/frame/benchmarking-cli/src/writer.rs
+++ b/utils/frame/benchmarking-cli/src/writer.rs
@@ -17,314 +17,401 @@
 
 // Outputs benchmark results to Rust files that can be ingested by the runtime.
 
-use crate::BenchmarkCmd;
-use std::fs::{self, File, OpenOptions};
-use std::io::prelude::*;
+use std::collections::HashMap;
+use std::fs;
 use std::path::PathBuf;
+
+use serde::Serialize;
+
+use crate::BenchmarkCmd;
 use frame_benchmarking::{BenchmarkBatch, BenchmarkSelector, Analysis};
 use sp_runtime::traits::Zero;
 
 const VERSION: &'static str = env!("CARGO_PKG_VERSION");
+const TEMPLATE: &str = include_str!("./template.hbs");
+
+// This is the final structure we will pass to the Handlebars template.
+#[derive(Serialize, Default, Debug, Clone)]
+struct TemplateData {
+	args: Vec<String>,
+	date: String,
+	version: String,
+	pallet: String,
+	header: String,
+	cmd: CmdData,
+	benchmarks: Vec<BenchmarkData>,
+}
 
-pub fn open_file(path: PathBuf) -> Result<File, std::io::Error> {
-	OpenOptions::new()
-		.create(true)
-		.write(true)
-		.truncate(true)
-		.open(path)
+// This was the final data we have about each benchmark.
+#[derive(Serialize, Default, Debug, Clone)]
+struct BenchmarkData {
+	name: String,
+	components: Vec<Component>,
+	#[serde(serialize_with = "string_serialize")]
+	base_weight: u128,
+	#[serde(serialize_with = "string_serialize")]
+	base_reads: u128,
+	#[serde(serialize_with = "string_serialize")]
+	base_writes: u128,
+	component_weight: Vec<ComponentSlope>,
+	component_reads: Vec<ComponentSlope>,
+	component_writes: Vec<ComponentSlope>,
 }
 
-fn underscore<Number>(i: Number) -> String
-	where Number: std::string::ToString
-{
-	let mut s = String::new();
-	let i_str = i.to_string();
-	let a = i_str.chars().rev().enumerate();
-	for (idx, val) in a {
-		if idx != 0 && idx % 3 == 0 {
-			s.insert(0, '_');
-		}
-		s.insert(0, val);
-	}
-	s
+// This forwards some specific metadata from the `BenchmarkCmd`
+#[derive(Serialize, Default, Debug, Clone)]
+struct CmdData {
+	steps: Vec<u32>,
+	repeat: u32,
+	lowest_range_values: Vec<u32>,
+	highest_range_values: Vec<u32>,
+	execution: String,
+	wasm_execution: String,
+	chain: String,
+	db_cache: u32,
 }
 
-pub fn write_trait(
-	batches: &[BenchmarkBatch],
-	path: &PathBuf,
-	cmd: &BenchmarkCmd,
-) -> Result<(), std::io::Error> {
-	let mut file_path = path.clone();
-	file_path.push("trait");
-	file_path.set_extension("rs");
-	let mut file = crate::writer::open_file(file_path)?;
+// This encodes the component name and whether that component is used.
+#[derive(Serialize, Debug, Clone, Eq, PartialEq)]
+struct Component {
+	name: String,
+	is_used: bool,
+}
 
-	let indent = if cmd.spaces {"    "} else {"\t"};
+// This encodes the slope of some benchmark related to a component.
+#[derive(Serialize, Debug, Clone, Eq, PartialEq)]
+struct ComponentSlope {
+	name: String,
+	#[serde(serialize_with = "string_serialize")]
+	slope: u128,
+}
 
-	let mut current_pallet = Vec::<u8>::new();
+// Small helper to create an `io::Error` from a string.
+fn io_error(s: &str) -> std::io::Error {
+	use std::io::{Error, ErrorKind};
+	Error::new(ErrorKind::Other, s)
+}
 
-	// Skip writing if there are no batches
-	if batches.is_empty() { return Ok(()) }
+// This function takes a list of `BenchmarkBatch` and organizes them by pallet into a `HashMap`.
+// So this: `[(p1, b1), (p1, b2), (p1, b3), (p2, b1), (p2, b2)]`
+// Becomes:
+//
+// ```
+// p1 -> [b1, b2, b3]
+// p2 -> [b1, b2]
+// ```
+fn map_results(batches: &[BenchmarkBatch]) -> Result<HashMap<String, Vec<BenchmarkData>>, std::io::Error> {
+	// Skip if batches is empty.
+	if batches.is_empty() { return Err(io_error("empty batches")) }
+
+	let mut all_benchmarks = HashMap::new();
+	let mut pallet_benchmarks = Vec::new();
 
-	for batch in batches {
-		// Skip writing if there are no results
+	let mut batches_iter = batches.iter().peekable();
+	while let Some(batch) = batches_iter.next() {
+		// Skip if there are no results
 		if batch.results.is_empty() { continue }
 
 		let pallet_string = String::from_utf8(batch.pallet.clone()).unwrap();
-		let benchmark_string = String::from_utf8(batch.benchmark.clone()).unwrap();
+		let benchmark_data = get_benchmark_data(batch);
+		pallet_benchmarks.push(benchmark_data);
 
-		// only create new trait definitions when we go to a new pallet
-		if batch.pallet != current_pallet {
-			if !current_pallet.is_empty() {
-				// close trait
-				write!(file, "}}\n")?;
+		// Check if this is the end of the iterator
+		if let Some(next) = batches_iter.peek() {
+			// Next pallet is different than current pallet, save and create new data.
+			let next_pallet = String::from_utf8(next.pallet.clone()).unwrap();
+			if next_pallet != pallet_string {
+				all_benchmarks.insert(pallet_string, pallet_benchmarks.clone());
+				pallet_benchmarks = Vec::new();
 			}
-
-			// trait wrapper
-			write!(file, "// {}\n", pallet_string)?;
-			write!(file, "pub trait {} {{\n", cmd.r#trait)?;
-
-			current_pallet = batch.pallet.clone()
+		} else {
+			// This is the end of the iterator, so push the final data.
+			all_benchmarks.insert(pallet_string, pallet_benchmarks.clone());
 		}
+	}
+	Ok(all_benchmarks)
+}
 
-		// function name
-		write!(file, "{}fn {}(", indent, benchmark_string)?;
-
-		// params
-		let components = &batch.results[0].components;
-		for component in components {
-			write!(file, "{:?}: u32, ", component.0)?;
+// Analyze and return the relevant results for a given benchmark.
+fn get_benchmark_data(batch: &BenchmarkBatch) -> BenchmarkData {
+	// Analyze benchmarks to get the linear regression.
+	let extrinsic_time = Analysis::min_squares_iqr(&batch.results, BenchmarkSelector::ExtrinsicTime).unwrap();
+	let reads = Analysis::min_squares_iqr(&batch.results, BenchmarkSelector::Reads).unwrap();
+	let writes = Analysis::min_squares_iqr(&batch.results, BenchmarkSelector::Writes).unwrap();
+
+	// Analysis data may include components that are not used, this filters out anything whose value is zero.
+	let mut used_components = Vec::new();
+	let mut used_extrinsic_time = Vec::new();
+	let mut used_reads = Vec::new();
+	let mut used_writes = Vec::new();
+
+	extrinsic_time.slopes.into_iter().zip(extrinsic_time.names.iter()).for_each(|(slope, name)| {
+		if !slope.is_zero() {
+			if !used_components.contains(&name) { used_components.push(name); }
+			used_extrinsic_time.push(ComponentSlope {
+				name: name.clone(),
+				slope: slope.saturating_mul(1000),
+			});
 		}
-		// return value
-		write!(file, ") -> Weight;\n")?;
+	});
+	reads.slopes.into_iter().zip(reads.names.iter()).for_each(|(slope, name)| {
+		if !slope.is_zero() {
+			if !used_components.contains(&name) { used_components.push(name); }
+			used_reads.push(ComponentSlope { name: name.clone(), slope });
+		}
+	});
+	writes.slopes.into_iter().zip(writes.names.iter()).for_each(|(slope, name)| {
+		if !slope.is_zero() {
+			if !used_components.contains(&name) { used_components.push(name); }
+			used_writes.push(ComponentSlope { name: name.clone(), slope });
+		}
+	});
+
+	// This puts a marker on any component which is entirely unused in the weight formula.
+	let components = batch.results[0].components
+		.iter()
+		.map(|(name, _)| -> Component {
+			let name_string = name.to_string();
+			let is_used = used_components.contains(&&name_string);
+			Component { name: name_string, is_used }
+		})
+		.collect::<Vec<_>>();
+
+	BenchmarkData {
+		name: String::from_utf8(batch.benchmark.clone()).unwrap(),
+		components,
+		base_weight: extrinsic_time.base.saturating_mul(1000),
+		base_reads: reads.base,
+		base_writes: writes.base,
+		component_weight: used_extrinsic_time,
+		component_reads: used_reads,
+		component_writes: used_writes,
 	}
-
-	// final close trait
-	write!(file, "}}\n")?;
-
-	Ok(())
 }
 
+// Create weight file from benchmark data and Handlebars template.
 pub fn write_results(
 	batches: &[BenchmarkBatch],
 	path: &PathBuf,
 	cmd: &BenchmarkCmd,
 ) -> Result<(), std::io::Error> {
+	// Use custom template if provided.
+	let template: String = match &cmd.template {
+		Some(template_file) => {
+			fs::read_to_string(template_file)?
+		},
+		None => {
+			TEMPLATE.to_string()
+		},
+	};
 
+	// Use header if provided
 	let header_text = match &cmd.header {
 		Some(header_file) => {
 			let text = fs::read_to_string(header_file)?;
-			Some(text)
+			text
 		},
-		None => None,
+		None => String::new(),
 	};
 
-	let indent = if cmd.spaces {"    "} else {"\t"};
-	let date = chrono::Utc::now();
-
-	let mut current_pallet = Vec::<u8>::new();
-
-	// Skip writing if there are no batches
-	if batches.is_empty() { return Ok(()) }
-
-	let mut batches_iter = batches.iter().peekable();
-
-	let first_pallet = String::from_utf8(
-		batches_iter.peek().expect("we checked that batches is not empty").pallet.clone()
-	).unwrap();
+	// Date string metadata
+	let date = chrono::Utc::now().format("%Y-%m-%d").to_string();
+
+	// Full CLI args passed to trigger the benchmark.
+	let args = std::env::args().collect::<Vec<String>>();
+
+	// Capture individual args
+	let cmd_data = CmdData {
+		steps: cmd.steps.clone(),
+		repeat: cmd.repeat.clone(),
+		lowest_range_values: cmd.lowest_range_values.clone(),
+		highest_range_values: cmd.highest_range_values.clone(),
+		execution: format!("{:?}", cmd.execution),
+		wasm_execution: cmd.wasm_method.to_string(),
+		chain: format!("{:?}", cmd.shared_params.chain),
+		db_cache: cmd.database_cache_size,
+	};
 
-	let mut file_path = path.clone();
-	file_path.push(first_pallet);
-	file_path.set_extension("rs");
+	// New Handlebars instance with helpers.
+	let mut handlebars = handlebars::Handlebars::new();
+	handlebars.register_helper("underscore", Box::new(UnderscoreHelper));
+	handlebars.register_helper("join", Box::new(JoinHelper));
+	// Don't HTML escape any characters.
+	handlebars.register_escape_fn(|s| -> String { s.to_string() });
+
+	// Organize results by pallet into a JSON map
+	let all_results = map_results(batches)?;
+	for (pallet, results) in all_results.into_iter() {
+		let mut file_path = path.clone();
+		// If a user only specified a directory...
+		if file_path.is_dir() {
+			// Create new file: "path/to/pallet_name.rs".
+			file_path.push(&pallet);
+			file_path.set_extension("rs");
+		}
 
-	let mut file = open_file(file_path)?;
+		let hbs_data = TemplateData {
+			args: args.clone(),
+			date: date.clone(),
+			version: VERSION.to_string(),
+			pallet: pallet,
+			header: header_text.clone(),
+			cmd: cmd_data.clone(),
+			benchmarks: results,
+		};
+
+		let mut output_file = fs::File::create(file_path)?;
+		handlebars.render_template_to_write(&template, &hbs_data, &mut output_file)
+			.map_err(|e| io_error(&e.to_string()))?;
+	}
+	Ok(())
+}
 
-	while let Some(batch) = batches_iter.next() {
-		// Skip writing if there are no results
-		if batch.results.is_empty() { continue }
+// Add an underscore after every 3rd character, i.e. a separator for large numbers.
+fn underscore<Number>(i: Number) -> String
+	where Number: std::string::ToString
+{
+	let mut s = String::new();
+	let i_str = i.to_string();
+	let a = i_str.chars().rev().enumerate();
+	for (idx, val) in a {
+		if idx != 0 && idx % 3 == 0 {
+			s.insert(0, '_');
+		}
+		s.insert(0, val);
+	}
+	s
+}
 
-		let pallet_string = String::from_utf8(batch.pallet.clone()).unwrap();
-		let benchmark_string = String::from_utf8(batch.benchmark.clone()).unwrap();
+// A Handlebars helper to add an underscore after every 3rd character,
+// i.e. a separator for large numbers.
+#[derive(Clone, Copy)]
+struct UnderscoreHelper;
+impl handlebars::HelperDef for UnderscoreHelper {
+	fn call<'reg: 'rc, 'rc>(
+		&self, h: &handlebars::Helper,
+		_: &handlebars::Handlebars,
+		_: &handlebars::Context,
+		_rc: &mut handlebars::RenderContext,
+		out: &mut dyn handlebars::Output
+	) -> handlebars::HelperResult {
+		use handlebars::JsonRender;
+		let param = h.param(0).unwrap();
+		let underscore_param = underscore(param.value().render());
+		out.write(&underscore_param)?;
+		Ok(())
+	}
+}
 
-		// only create new trait definitions when we go to a new pallet
-		if batch.pallet != current_pallet {
-			// optional header and copyright
-			if let Some(header) = &header_text {
-				write!(file, "{}\n", header)?;
-			}
+// A helper to join a string of vectors.
+#[derive(Clone, Copy)]
+struct JoinHelper;
+impl handlebars::HelperDef for JoinHelper {
+	fn call<'reg: 'rc, 'rc>(
+		&self, h: &handlebars::Helper,
+		_: &handlebars::Handlebars,
+		_: &handlebars::Context,
+		_rc: &mut handlebars::RenderContext,
+		out: &mut dyn handlebars::Output
+	) -> handlebars::HelperResult {
+		use handlebars::JsonRender;
+		let param = h.param(0).unwrap();
+		let value = param.value();
+		let joined = if value.is_array() {
+			value.as_array().unwrap()
+				.iter()
+				.map(|v| v.render())
+				.collect::<Vec<String>>()
+				.join(" ")
+		} else {
+			value.render()
+		};
+		out.write(&joined)?;
+		Ok(())
+	}
+}
 
-			// title of file
-			write!(file, "//! Weights for {}\n", pallet_string)?;
-
-			// auto-generation note
-			write!(
-				file,
-				"//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION {}\n",
-				VERSION,
-			)?;
-
-			// date of generation + some settings
-			write!(
-				file,
-				"//! DATE: {}, STEPS: {:?}, REPEAT: {}, LOW RANGE: {:?}, HIGH RANGE: {:?}\n",
-				date.format("%Y-%m-%d"),
-				cmd.steps,
-				cmd.repeat,
-				cmd.lowest_range_values,
-				cmd.highest_range_values,
-			)?;
-
-			// more settings
-			write!(
-				file,
-				"//! EXECUTION: {:?}, WASM-EXECUTION: {}, CHAIN: {:?}, DB CACHE: {}\n",
-				cmd.execution,
-				cmd.wasm_method,
-				cmd.shared_params.chain,
-				cmd.database_cache_size,
-			)?;
-
-			// allow statements
-			write!(
-				file,
-				"#![allow(unused_parens)]\n#![allow(unused_imports)]\n\n",
-			)?;
-
-			// general imports
-			write!(
-				file,
-				"use frame_support::{{traits::Get, weights::Weight}};\nuse sp_std::marker::PhantomData;\n\n"
-			)?;
-
-			// struct for weights
-			write!(file, "pub struct {}<T>(PhantomData<T>);\n", cmd.r#struct)?;
-
-			// trait wrapper
-			write!(
-				file,
-				"impl<T: frame_system::Trait> {}::{} for {}<T> {{\n",
-				pallet_string,
-				cmd.r#trait,
-				cmd.r#struct,
-			)?;
-
-			current_pallet = batch.pallet.clone()
-		}
+// u128 does not serialize well into JSON for `handlebars`, so we represent it as a string.
+fn string_serialize<S>(x: &u128, s: S) -> Result<S::Ok, S::Error>
+where
+    S: serde::Serializer,
+{
+    s.serialize_str(&x.to_string())
+}
 
-		// Analysis results
-		let extrinsic_time = Analysis::min_squares_iqr(&batch.results, BenchmarkSelector::ExtrinsicTime).unwrap();
-		let reads = Analysis::min_squares_iqr(&batch.results, BenchmarkSelector::Reads).unwrap();
-		let writes = Analysis::min_squares_iqr(&batch.results, BenchmarkSelector::Writes).unwrap();
-
-		// Analysis data may include components that are not used, this filters out anything whose value is zero.
-		let mut used_components = Vec::new();
-		let mut used_extrinsic_time = Vec::new();
-		let mut used_reads = Vec::new();
-		let mut used_writes = Vec::new();
-		extrinsic_time.slopes.iter().zip(extrinsic_time.names.iter()).for_each(|(slope, name)| {
-			if !slope.is_zero() {
-				if !used_components.contains(&name) { used_components.push(name); }
-				used_extrinsic_time.push((slope, name));
-			}
-		});
-		reads.slopes.iter().zip(reads.names.iter()).for_each(|(slope, name)| {
-			if !slope.is_zero() {
-				if !used_components.contains(&name) { used_components.push(name); }
-				used_reads.push((slope, name));
-			}
-		});
-		writes.slopes.iter().zip(writes.names.iter()).for_each(|(slope, name)| {
-			if !slope.is_zero() {
-				if !used_components.contains(&name) { used_components.push(name); }
-				used_writes.push((slope, name));
-			}
-		});
-
-		let all_components = batch.results[0].components
-			.iter()
-			.map(|(name, _)| -> String { return name.to_string() })
-			.collect::<Vec<String>>();
-
-		// function name
-		write!(file, "{}fn {}(", indent, benchmark_string)?;
-		// params
-		for component in all_components {
-			if used_components.contains(&&component) {
-				write!(file, "{}: u32, ", component)?;
-			} else {
-				write!(file, "_{}: u32, ", component)?;
-			}
-		}
-		// return value
-		write!(file, ") -> Weight {{\n")?;
-
-		write!(file, "{}{}({} as Weight)\n", indent, indent, underscore(extrinsic_time.base.saturating_mul(1000)))?;
-		used_extrinsic_time.iter().try_for_each(|(slope, name)| -> Result<(), std::io::Error> {
-			write!(
-				file,
-				"{}{}{}.saturating_add(({} as Weight).saturating_mul({} as Weight))\n",
-				indent, indent, indent,
-				underscore(slope.saturating_mul(1000)),
-				name,
+#[cfg(test)]
+mod test {
+	use super::*;
+	use frame_benchmarking::{BenchmarkBatch, BenchmarkParameter, BenchmarkResults};
+
+	fn test_data(pallet: &[u8], benchmark: &[u8], param: BenchmarkParameter, base: u32, slope: u32) -> BenchmarkBatch {
+		let mut results = Vec::new();
+		for i in 0 .. 5 {
+			results.push(
+				BenchmarkResults {
+					components: vec![(param, i), (BenchmarkParameter::z, 0)],
+					extrinsic_time: (base + slope * i).into(),
+					storage_root_time: (base + slope * i).into(),
+					reads: (base + slope * i).into(),
+					repeat_reads: 0,
+					writes: (base + slope * i).into(),
+					repeat_writes: 0,
+				}
 			)
-		})?;
-
-		if !reads.base.is_zero() {
-			write!(
-				file,
-				"{}{}{}.saturating_add(T::DbWeight::get().reads({} as Weight))\n",
-				indent, indent, indent,
-				reads.base,
-			)?;
 		}
-		used_reads.iter().try_for_each(|(slope, name)| -> Result<(), std::io::Error> {
-			write!(
-				file,
-				"{}{}{}.saturating_add(T::DbWeight::get().reads(({} as Weight).saturating_mul({} as Weight)))\n",
-				indent, indent, indent,
-				slope,
-				name,
-			)
-		})?;
-
-		if !writes.base.is_zero() {
-			write!(
-				file,
-				"{}{}{}.saturating_add(T::DbWeight::get().writes({} as Weight))\n",
-				indent, indent, indent,
-				writes.base,
-			)?;
-		}
-		used_writes.iter().try_for_each(|(slope, name)| -> Result<(), std::io::Error> {
-			write!(
-				file,
-				"{}{}{}.saturating_add(T::DbWeight::get().writes(({} as Weight).saturating_mul({} as Weight)))\n",
-				indent, indent, indent,
-				slope,
-				name,
-			)
-		})?;
 
-		// close function
-		write!(file, "{}}}\n", indent)?;
-
-		// Check if this is the end of the iterator
-		if let Some(next) = batches_iter.peek() {
-			// Next pallet is different than current pallet, so we close up the file and open a new one.
-			if next.pallet != current_pallet {
-				write!(file, "}}\n")?;
-				let next_pallet = String::from_utf8(next.pallet.clone()).unwrap();
-
-				let mut file_path = path.clone();
-				file_path.push(next_pallet);
-				file_path.set_extension("rs");
-				file = open_file(file_path)?;
-			}
-		} else {
-			// This is the end of the iterator, so we close up the final file.
-			write!(file, "}}\n")?;
+		return BenchmarkBatch {
+			pallet: [pallet.to_vec(), b"_pallet".to_vec()].concat(),
+			benchmark: [benchmark.to_vec(), b"_benchmark".to_vec()].concat(),
+			results,
 		}
 	}
 
-	Ok(())
+	fn check_data(benchmark: &BenchmarkData, component: &str, base: u128, slope: u128) {
+		assert_eq!(
+			benchmark.components,
+			vec![
+				Component { name: component.to_string(), is_used: true },
+				Component { name: "z".to_string(), is_used: false},
+			],
+		);
+		// Weights multiplied by 1,000
+		assert_eq!(benchmark.base_weight, base * 1_000);
+		assert_eq!(
+			benchmark.component_weight,
+			vec![ComponentSlope { name: component.to_string(), slope: slope * 1_000 }]
+		);
+		// DB Reads/Writes are untouched
+		assert_eq!(benchmark.base_reads, base);
+		assert_eq!(
+			benchmark.component_reads,
+			vec![ComponentSlope { name: component.to_string(), slope: slope }]
+		);
+		assert_eq!(benchmark.base_writes, base);
+		assert_eq!(
+			benchmark.component_writes,
+			vec![ComponentSlope { name: component.to_string(), slope: slope }]
+		);
+	}
+
+	#[test]
+	fn map_results_works() {
+		let mapped_results = map_results(&[
+			test_data(b"first", b"first", BenchmarkParameter::a, 10, 3),
+			test_data(b"first", b"second", BenchmarkParameter::b, 9, 2),
+			test_data(b"second", b"first", BenchmarkParameter::c, 3, 4),
+		]).unwrap();
+
+		let first_benchmark = &mapped_results.get("first_pallet").unwrap()[0];
+		assert_eq!(first_benchmark.name, "first_benchmark");
+		check_data(first_benchmark, "a", 10, 3);
+
+		let second_benchmark = &mapped_results.get("first_pallet").unwrap()[1];
+		assert_eq!(second_benchmark.name, "second_benchmark");
+		check_data(second_benchmark, "b", 9, 2);
+
+		let second_pallet_benchmark = &mapped_results.get("second_pallet").unwrap()[0];
+		assert_eq!(second_pallet_benchmark.name, "first_benchmark");
+		check_data(second_pallet_benchmark, "c", 3, 4);
+	}
 }

From d8ffae421edce1d7fb73c50d5370fff69b53e336 Mon Sep 17 00:00:00 2001
From: Bernhard Schuster <bernhard@ahoi.io>
Date: Tue, 27 Oct 2020 18:50:04 +0100
Subject: [PATCH 0021/1194] improve error handling in cli (#7436)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* other error variant should carry a dyn Error

* introduce thiserror for error derive, add explicit error variants, cleanup dependencies

* cleanup handle dev-deps of sc-cli too

* Update client/cli/src/error.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Co-authored-by: Bernhard Schuster <bernhard@parity.io>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 Cargo.lock                        | 22 ++------
 client/cli/Cargo.toml             | 18 +------
 client/cli/src/commands/insert.rs | 11 ++--
 client/cli/src/commands/utils.rs  |  3 +-
 client/cli/src/commands/verify.rs | 18 +++----
 client/cli/src/error.rs           | 88 ++++++++++++++++++++-----------
 client/cli/src/lib.rs             |  2 +
 frame/offences/src/lib.rs         |  2 +-
 8 files changed, 81 insertions(+), 83 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f26f4b2ae054..ae15dab886e3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6491,26 +6491,18 @@ dependencies = [
  "atty",
  "bip39",
  "chrono",
- "derive_more",
  "fdlimit",
  "futures 0.3.5",
  "hex",
- "lazy_static",
  "libp2p",
  "log",
  "names",
- "nix",
  "parity-scale-codec",
- "parity-util-mem",
  "rand 0.7.3",
  "regex",
  "rpassword",
  "sc-cli-proc-macro",
  "sc-client-api",
- "sc-consensus-babe",
- "sc-consensus-epochs",
- "sc-finality-grandpa",
- "sc-informant",
  "sc-keystore",
  "sc-network",
  "sc-service",
@@ -6518,21 +6510,17 @@ dependencies = [
  "sc-tracing",
  "serde",
  "serde_json",
- "sp-application-crypto",
  "sp-blockchain",
  "sp-core",
- "sp-io",
  "sp-keyring",
  "sp-keystore",
  "sp-panic-handler",
  "sp-runtime",
- "sp-state-machine",
  "sp-utils",
  "sp-version",
  "structopt",
- "substrate-prometheus-endpoint",
  "tempfile",
- "time",
+ "thiserror",
  "tokio 0.2.22",
  "tracing",
  "tracing-log",
@@ -9196,18 +9184,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.20"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08"
+checksum = "318234ffa22e0920fe9a40d7b8369b5f649d490980cf7aadcf1eb91594869b42"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.20"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793"
+checksum = "cae2447b6282786c3493999f40a9be2a6ad20cb8bd268b0a0dbf5a065535c0ab"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index c19d61aecc10..33fc39f8217e 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -13,13 +13,10 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-derive_more = "0.99.2"
-log = "0.4.8"
+log = "0.4.11"
 atty = "0.2.13"
 regex = "1.3.4"
-time = "0.1.42"
 ansi_term = "0.12.1"
-lazy_static = "1.4.0"
 tokio = { version = "0.2.21", features = [ "signal", "rt-core", "rt-threaded", "blocking" ] }
 futures = "0.3.4"
 fdlimit = "0.2.1"
@@ -30,7 +27,6 @@ rand = "0.7.3"
 bip39 = "0.6.0-beta.1"
 serde_json = "1.0.41"
 sc-keystore = { version = "2.0.0", path = "../keystore" }
-sc-informant = { version = "0.8.0", path = "../informant" }
 sp-panic-handler = { version = "2.0.0", path = "../../primitives/panic-handler" }
 sc-client-api = { version = "2.0.0", path = "../api" }
 sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
@@ -41,34 +37,24 @@ sp-version = { version = "2.0.0", path = "../../primitives/version" }
 sp-core = { version = "2.0.0", path = "../../primitives/core" }
 sp-keystore = { version = "0.8.0", path = "../../primitives/keystore" }
 sc-service = { version = "0.8.0", default-features = false, path = "../service" }
-sp-state-machine = { version = "0.8.0", path = "../../primitives/state-machine" }
 sc-telemetry = { version = "2.0.0", path = "../telemetry" }
-substrate-prometheus-endpoint = { path = "../../utils/prometheus" , version = "0.8.0"}
 sp-keyring = { version = "2.0.0", path = "../../primitives/keyring" }
-sc-consensus-babe = { version = "0.8.0", path = "../consensus/babe" }
-sc-consensus-epochs = { version = "0.8.0", path = "../consensus/epochs" }
-sc-finality-grandpa = { version = "0.8.0", path = "../finality-grandpa" }
 names = "0.11.0"
 structopt = "0.3.8"
 sc-tracing = { version = "2.0.0", path = "../tracing" }
 chrono = "0.4.10"
-parity-util-mem = { version = "0.7.0", default-features = false, features = ["primitive-types"] }
 serde = "1.0.111"
 tracing = "0.1.10"
 tracing-log = "0.1.1"
 tracing-subscriber = "0.2.10"
 sc-cli-proc-macro = { version = "2.0.0", path = "./proc-macro" }
+thiserror = "1.0.21"
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
 rpassword = "4.0.1"
 
-[target.'cfg(target_family = "unix")'.dependencies]
-nix = "0.17.0"
-
 [dev-dependencies]
 tempfile = "3.1.0"
-sp-io = { version = "2.0.0-rc3", path = "../../primitives/io" }
-sp-application-crypto = { version = "2.0.0-alpha.2", default-features = false, path = "../../primitives/application-crypto" }
 
 [features]
 wasmtime = [
diff --git a/client/cli/src/commands/insert.rs b/client/cli/src/commands/insert.rs
index 60cf9ff8c242..fc307e45e7ce 100644
--- a/client/cli/src/commands/insert.rs
+++ b/client/cli/src/commands/insert.rs
@@ -62,7 +62,7 @@ impl InsertCmd {
 	pub fn run(&self) -> Result<(), Error> {
 		let suri = utils::read_uri(self.suri.as_ref())?;
 		let base_path = self.shared_params.base_path.as_ref()
-			.ok_or_else(|| Error::Other("please supply base path".into()))?;
+			.ok_or_else(|| Error::MissingBasePath)?;
 
 		let (keystore, public) = match self.keystore_params.keystore_config(base_path)? {
 			KeystoreConfig::Path { path, password } => {
@@ -70,20 +70,19 @@ impl InsertCmd {
 					self.crypto_scheme.scheme,
 					to_vec(&suri, password.clone())
 				)?;
-				let keystore: SyncCryptoStorePtr = Arc::new(LocalKeystore::open(path, password)
-					.map_err(|e| format!("{}", e))?);
+				let keystore: SyncCryptoStorePtr = Arc::new(LocalKeystore::open(path, password)?);
 				(keystore, public)
 			},
 			_ => unreachable!("keystore_config always returns path and password; qed")
 		};
 
 		let key_type = KeyTypeId::try_from(self.key_type.as_str())
-			.map_err(|_| {
-				Error::Other("Cannot convert argument to keytype: argument should be 4-character string".into())
+			.map_err(|_e| {
+				Error::KeyTypeInvalid
 			})?;
 
 		SyncCryptoStore::insert_unknown(&*keystore, key_type, &suri, &public[..])
-			.map_err(|e| Error::Other(format!("{:?}", e)))?;
+			.map_err(|_| Error::KeyStoreOperation)?;
 
 		Ok(())
 	}
diff --git a/client/cli/src/commands/utils.rs b/client/cli/src/commands/utils.rs
index 38263af50cfb..6e48d04e1328 100644
--- a/client/cli/src/commands/utils.rs
+++ b/client/cli/src/commands/utils.rs
@@ -246,8 +246,7 @@ pub fn decode_hex<T: AsRef<[u8]>>(message: T) -> Result<Vec<u8>, Error> {
 	if message[..2] == [b'0', b'x'] {
 		message = &message[2..]
 	}
-	hex::decode(message)
-		.map_err(|e| Error::Other(format!("Invalid hex ({})", e)))
+	Ok(hex::decode(message)?)
 }
 
 /// checks if message is Some, otherwise reads message from stdin and optionally decodes hex
diff --git a/client/cli/src/commands/verify.rs b/client/cli/src/commands/verify.rs
index ad16c11d5e44..15abc04002f4 100644
--- a/client/cli/src/commands/verify.rs
+++ b/client/cli/src/commands/verify.rs
@@ -77,27 +77,25 @@ fn verify<Pair>(sig_data: Vec<u8>, message: Vec<u8>, uri: &str) -> error::Result
 {
 	let mut signature = Pair::Signature::default();
 	if sig_data.len() != signature.as_ref().len() {
-		return Err(error::Error::Other(format!(
-			"signature has an invalid length. read {} bytes, expected {} bytes",
-			sig_data.len(),
-			signature.as_ref().len(),
-		)));
+		return Err(
+			error::Error::SignatureInvalidLength {
+				read: sig_data.len(),
+				expected: signature.as_ref().len(),
+			}
+		);
 	}
 	signature.as_mut().copy_from_slice(&sig_data);
 
 	let pubkey = if let Ok(pubkey_vec) = hex::decode(uri) {
 		Pair::Public::from_slice(pubkey_vec.as_slice())
 	} else {
-		Pair::Public::from_string(uri)
-			.map_err(|_| {
-				error::Error::Other(format!("Invalid URI; expecting either a secret URI or a public URI."))
-			})?
+		Pair::Public::from_string(uri)?
 	};
 
 	if Pair::verify(&signature, &message, &pubkey) {
 		println!("Signature verifies correctly.");
 	} else {
-		return Err(error::Error::Other("Signature invalid.".into()))
+		return Err(error::Error::SignatureInvalid)
 	}
 
 	Ok(())
diff --git a/client/cli/src/error.rs b/client/cli/src/error.rs
index 7404d31fcf7b..48c2ac7ef1c6 100644
--- a/client/cli/src/error.rs
+++ b/client/cli/src/error.rs
@@ -18,61 +18,87 @@
 
 //! Initialization errors.
 
-
+use sp_core::crypto;
 
 /// Result type alias for the CLI.
 pub type Result<T> = std::result::Result<T, Error>;
 
 /// Error type for the CLI.
-#[derive(Debug, derive_more::Display, derive_more::From)]
+#[derive(Debug, thiserror::Error)]
 pub enum Error {
 	/// Io error
-	Io(std::io::Error),
+	#[error(transparent)]
+	Io(#[from] std::io::Error),
 	/// Cli error
-	Cli(structopt::clap::Error),
+	#[error(transparent)]
+	Cli(#[from] structopt::clap::Error),
 	/// Service error
-	Service(sc_service::Error),
+	#[error(transparent)]
+	Service(#[from] sc_service::Error),
 	/// Client error
-	Client(sp_blockchain::Error),
+	#[error(transparent)]
+	Client(#[from] sp_blockchain::Error),
 	/// scale codec error
-	Codec(parity_scale_codec::Error),
+	#[error(transparent)]
+	Codec(#[from] parity_scale_codec::Error),
 	/// Input error
-	#[from(ignore)]
+	#[error("Invalid input: {0}")]
 	Input(String),
 	/// Invalid listen multiaddress
-	#[display(fmt="Invalid listen multiaddress")]
-	#[from(ignore)]
+	#[error("Invalid listen multiaddress")]
 	InvalidListenMultiaddress,
-	/// Other uncategorized error.
-	#[from(ignore)]
+	/// Application specific error chain sequence forwarder.
+	#[error(transparent)]
+	Application(#[from] Box<dyn std::error::Error>),
+	/// URI error.
+	#[error("Invalid URI; expecting either a secret URI or a public URI.")]
+	InvalidUri(crypto::PublicError),
+	/// Signature length mismatch.
+	#[error("Signature has an invalid length. Read {read} bytes, expected {expected} bytes")]
+	SignatureInvalidLength {
+		/// Amount of signature bytes read.
+		read: usize,
+		/// Expected number of signature bytes.
+		expected: usize,
+	},
+	/// Missing base path argument.
+	#[error("The base path is missing, please provide one")]
+	MissingBasePath,
+	/// Unknown key type specifier or missing key type specifier.
+	#[error("Unknown key type, must be a known 4-character sequence")]
+	KeyTypeInvalid,
+	/// Signature verification failed.
+	#[error("Signature verification failed")]
+	SignatureInvalid,
+	/// Storing a given key failed.
+	#[error("Key store operation failed")]
+	KeyStoreOperation,
+	/// An issue with the underlying key storage was encountered.
+	#[error("Key storage issue encountered")]
+	KeyStorage(#[from] sc_keystore::Error),
+	/// Bytes are not decodable when interpreted as hexadecimal string.
+	#[error("Invalid hex base data")]
+	HexDataConversion(#[from] hex::FromHexError),
+	/// Shortcut type to specify types on the fly, discouraged.
+	#[deprecated = "Use `Forwarded` with an error type instead."]
+	#[error("Other: {0}")]
 	Other(String),
 }
 
-/// Must be implemented explicitly because `derive_more` won't generate this
-/// case due to conflicting derive for `Other(String)`.
-impl std::convert::From<String> for Error {
-	fn from(s: String) -> Error {
-		Error::Input(s)
+impl std::convert::From<&str> for Error {
+	fn from(s: &str) -> Error {
+		Error::Input(s.to_string())
 	}
 }
 
-impl std::convert::From<&str> for Error {
-	fn from(s: &str) -> Error {
+impl std::convert::From<String> for Error {
+	fn from(s: String) -> Error {
 		Error::Input(s.to_string())
 	}
 }
 
-impl std::error::Error for Error {
-	fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
-		match self {
-			Error::Io(ref err) => Some(err),
-			Error::Cli(ref err) => Some(err),
-			Error::Service(ref err) => Some(err),
-			Error::Client(ref err) => Some(err),
-			Error::Codec(ref err) => Some(err),
-			Error::Input(_) => None,
-			Error::InvalidListenMultiaddress => None,
-			Error::Other(_) => None,
-		}
+impl std::convert::From<crypto::PublicError> for Error {
+	fn from(e: crypto::PublicError) -> Error {
+		Error::InvalidUri(e)
 	}
 }
diff --git a/client/cli/src/lib.rs b/client/cli/src/lib.rs
index d64f0161312f..c25693dc418b 100644
--- a/client/cli/src/lib.rs
+++ b/client/cli/src/lib.rs
@@ -20,6 +20,8 @@
 
 #![warn(missing_docs)]
 #![warn(unused_extern_crates)]
+#![warn(unused_imports)]
+#![warn(unused_crate_dependencies)]
 
 pub mod arg_enums;
 mod commands;
diff --git a/frame/offences/src/lib.rs b/frame/offences/src/lib.rs
index bec198130121..e72498273cec 100644
--- a/frame/offences/src/lib.rs
+++ b/frame/offences/src/lib.rs
@@ -168,7 +168,7 @@ where
 		let time_slot = offence.time_slot();
 		let validator_set_count = offence.validator_set_count();
 
-		// Go through all offenders in the offence report and find all offenders that was spotted
+		// Go through all offenders in the offence report and find all offenders that were spotted
 		// in unique reports.
 		let TriageOutcome { concurrent_offenders } = match Self::triage_offence_report::<O>(
 			reporters,

From 668ecade60abe5a644868aefd3d231c9839fe652 Mon Sep 17 00:00:00 2001
From: Xiliang Chen <xlchen1291@gmail.com>
Date: Wed, 28 Oct 2020 08:08:51 +1300
Subject: [PATCH 0022/1194] Implement batch_all and update Utility pallet for
 weight refunds (#7188)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* implement batch_all

* bump version

* updates

* Better weight story for utility

* small fixes

* weights

* assert_noop_ignore_postinfo doesnt make sense

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 .../runtime/src/weights/pallet_utility.rs     |  16 +-
 frame/utility/src/benchmarking.rs             |  14 +
 frame/utility/src/default_weights.rs          |  16 +-
 frame/utility/src/lib.rs                      |  99 +++++-
 frame/utility/src/tests.rs                    | 293 +++++++++++++++++-
 5 files changed, 414 insertions(+), 24 deletions(-)

diff --git a/bin/node/runtime/src/weights/pallet_utility.rs b/bin/node/runtime/src/weights/pallet_utility.rs
index af48267d9b5d..5b2aace87cb6 100644
--- a/bin/node/runtime/src/weights/pallet_utility.rs
+++ b/bin/node/runtime/src/weights/pallet_utility.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +15,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc5
+//! Weights for pallet_utility
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
+//! DATE: 2020-10-02, STEPS: [50], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 
 #![allow(unused_parens)]
 #![allow(unused_imports)]
@@ -26,10 +28,14 @@ use sp_std::marker::PhantomData;
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Trait> pallet_utility::WeightInfo for WeightInfo<T> {
 	fn batch(c: u32, ) -> Weight {
-		(16461000 as Weight)
-			.saturating_add((1982000 as Weight).saturating_mul(c as Weight))
+		(20_803_000 as Weight)
+			.saturating_add((1_984_000 as Weight).saturating_mul(c as Weight))
 	}
 	fn as_derivative() -> Weight {
-		(4086000 as Weight)
+		(5_853_000 as Weight)
+	}
+	fn batch_all(c: u32, ) -> Weight {
+		(21_104_000 as Weight)
+			.saturating_add((1_509_000 as Weight).saturating_mul(c as Weight))
 	}
 }
diff --git a/frame/utility/src/benchmarking.rs b/frame/utility/src/benchmarking.rs
index 1c1b3f581500..413ed66ac849 100644
--- a/frame/utility/src/benchmarking.rs
+++ b/frame/utility/src/benchmarking.rs
@@ -56,6 +56,19 @@ benchmarks! {
 		let caller_key = frame_system::Account::<T>::hashed_key_for(&caller);
 		frame_benchmarking::benchmarking::add_to_whitelist(caller_key.into());
 	}: _(RawOrigin::Signed(caller), SEED as u16, call)
+
+	batch_all {
+		let c in 0 .. 1000;
+		let mut calls: Vec<<T as Trait>::Call> = Vec::new();
+		for i in 0 .. c {
+			let call = frame_system::Call::remark(vec![]).into();
+			calls.push(call);
+		}
+		let caller = whitelisted_caller();
+	}: _(RawOrigin::Signed(caller), calls)
+	verify {
+		assert_last_event::<T>(Event::BatchCompleted.into())
+	}
 }
 
 #[cfg(test)]
@@ -69,6 +82,7 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			assert_ok!(test_benchmark_batch::<Test>());
 			assert_ok!(test_benchmark_as_derivative::<Test>());
+			assert_ok!(test_benchmark_batch_all::<Test>());
 		});
 	}
 }
diff --git a/frame/utility/src/default_weights.rs b/frame/utility/src/default_weights.rs
index d63f010612ec..8dc9b6fb8c4b 100644
--- a/frame/utility/src/default_weights.rs
+++ b/frame/utility/src/default_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +15,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc5
+//! Weights for pallet_utility
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
+//! DATE: 2020-10-02, STEPS: [50], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 
 #![allow(unused_parens)]
 #![allow(unused_imports)]
@@ -24,10 +26,14 @@ use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
 
 impl crate::WeightInfo for () {
 	fn batch(c: u32, ) -> Weight {
-		(16461000 as Weight)
-			.saturating_add((1982000 as Weight).saturating_mul(c as Weight))
+		(20_803_000 as Weight)
+			.saturating_add((1_984_000 as Weight).saturating_mul(c as Weight))
 	}
 	fn as_derivative() -> Weight {
-		(4086000 as Weight)
+		(5_853_000 as Weight)
+	}
+	fn batch_all(c: u32, ) -> Weight {
+		(21_104_000 as Weight)
+			.saturating_add((1_509_000 as Weight).saturating_mul(c as Weight))
 	}
 }
diff --git a/frame/utility/src/lib.rs b/frame/utility/src/lib.rs
index d0bb99d91745..3aa310c8acb7 100644
--- a/frame/utility/src/lib.rs
+++ b/frame/utility/src/lib.rs
@@ -59,13 +59,14 @@ use sp_std::prelude::*;
 use codec::{Encode, Decode};
 use sp_core::TypeId;
 use sp_io::hashing::blake2_256;
-use frame_support::{decl_module, decl_event, decl_storage, Parameter};
+use frame_support::{decl_module, decl_event, decl_storage, Parameter, transactional};
 use frame_support::{
 	traits::{OriginTrait, UnfilteredDispatchable, Get},
-	weights::{Weight, GetDispatchInfo, DispatchClass}, dispatch::PostDispatchInfo,
+	weights::{Weight, GetDispatchInfo, DispatchClass, extract_actual_weight},
+	dispatch::{PostDispatchInfo, DispatchResultWithPostInfo},
 };
 use frame_system::{ensure_signed, ensure_root};
-use sp_runtime::{DispatchError, DispatchResult, traits::Dispatchable};
+use sp_runtime::{DispatchError, traits::Dispatchable};
 
 mod tests;
 mod benchmarking;
@@ -74,6 +75,7 @@ mod default_weights;
 pub trait WeightInfo {
 	fn batch(c: u32, ) -> Weight;
 	fn as_derivative() -> Weight;
+	fn batch_all(c: u32, ) -> Weight;
 }
 
 /// Configuration trait.
@@ -128,9 +130,7 @@ decl_module! {
 		/// bypassing `frame_system::Trait::BaseCallFilter`).
 		///
 		/// # <weight>
-		/// - Base weight: 14.39 + .987 * c µs
-		/// - Plus the sum of the weights of the `calls`.
-		/// - Plus one additional event. (repeat read/write)
+		/// - Complexity: O(C) where C is the number of calls to be batched.
 		/// # </weight>
 		///
 		/// This will return `Ok` in all circumstances. To determine the success of the batch, an
@@ -154,20 +154,32 @@ decl_module! {
 				}
 			},
 		)]
-		fn batch(origin, calls: Vec<<T as Trait>::Call>) {
+		fn batch(origin, calls: Vec<<T as Trait>::Call>) -> DispatchResultWithPostInfo {
 			let is_root = ensure_root(origin.clone()).is_ok();
+			let calls_len = calls.len();
+			// Track the actual weight of each of the batch calls.
+			let mut weight: Weight = 0;
 			for (index, call) in calls.into_iter().enumerate() {
+				let info = call.get_dispatch_info();
+				// If origin is root, don't apply any dispatch filters; root can call anything.
 				let result = if is_root {
 					call.dispatch_bypass_filter(origin.clone())
 				} else {
 					call.dispatch(origin.clone())
 				};
+				// Add the weight of this call.
+				weight = weight.saturating_add(extract_actual_weight(&result, &info));
 				if let Err(e) = result {
 					Self::deposit_event(Event::BatchInterrupted(index as u32, e.error));
-					return Ok(());
+					// Take the weight of this function itself into account.
+					let base_weight = T::WeightInfo::batch(index.saturating_add(1) as u32);
+					// Return the actual used weight + base_weight of this call.
+					return Ok(Some(base_weight + weight).into());
 				}
 			}
 			Self::deposit_event(Event::BatchCompleted);
+			let base_weight = T::WeightInfo::batch(calls_len as u32);
+			Ok(Some(base_weight + weight).into())
 		}
 
 		/// Send a call through an indexed pseudonym of the sender.
@@ -190,12 +202,79 @@ decl_module! {
 				.saturating_add(T::DbWeight::get().reads_writes(1, 1)),
 			call.get_dispatch_info().class,
 		)]
-		fn as_derivative(origin, index: u16, call: Box<<T as Trait>::Call>) -> DispatchResult {
+		fn as_derivative(origin, index: u16, call: Box<<T as Trait>::Call>) -> DispatchResultWithPostInfo {
 			let mut origin = origin;
 			let who = ensure_signed(origin.clone())?;
 			let pseudonym = Self::derivative_account_id(who, index);
 			origin.set_caller_from(frame_system::RawOrigin::Signed(pseudonym));
-			call.dispatch(origin).map(|_| ()).map_err(|e| e.error)
+			let info = call.get_dispatch_info();
+			let result = call.dispatch(origin);
+			// Always take into account the base weight of this call.
+			let mut weight = T::WeightInfo::as_derivative().saturating_add(T::DbWeight::get().reads_writes(1, 1));
+			// Add the real weight of the dispatch.
+			weight = weight.saturating_add(extract_actual_weight(&result, &info));
+			result.map_err(|mut err| {
+				err.post_info = Some(weight).into();
+				err
+			}).map(|_| Some(weight).into())
+		}
+
+		/// Send a batch of dispatch calls and atomically execute them.
+		/// The whole transaction will rollback and fail if any of the calls failed.
+		///
+		/// May be called from any origin.
+		///
+		/// - `calls`: The calls to be dispatched from the same origin.
+		///
+		/// If origin is root then call are dispatch without checking origin filter. (This includes
+		/// bypassing `frame_system::Trait::BaseCallFilter`).
+		///
+		/// # <weight>
+		/// - Complexity: O(C) where C is the number of calls to be batched.
+		/// # </weight>
+		#[weight = (
+			calls.iter()
+				.map(|call| call.get_dispatch_info().weight)
+				.fold(0, |total: Weight, weight: Weight| total.saturating_add(weight))
+				.saturating_add(T::WeightInfo::batch_all(calls.len() as u32)),
+			{
+				let all_operational = calls.iter()
+					.map(|call| call.get_dispatch_info().class)
+					.all(|class| class == DispatchClass::Operational);
+				if all_operational {
+					DispatchClass::Operational
+				} else {
+					DispatchClass::Normal
+				}
+			},
+		)]
+		#[transactional]
+		fn batch_all(origin, calls: Vec<<T as Trait>::Call>) -> DispatchResultWithPostInfo {
+			let is_root = ensure_root(origin.clone()).is_ok();
+			let calls_len = calls.len();
+			// Track the actual weight of each of the batch calls.
+			let mut weight: Weight = 0;
+			for (index, call) in calls.into_iter().enumerate() {
+				let info = call.get_dispatch_info();
+				// If origin is root, bypass any dispatch filter; root can call anything.
+				let result = if is_root {
+					call.dispatch_bypass_filter(origin.clone())
+				} else {
+					call.dispatch(origin.clone())
+				};
+				// Add the weight of this call.
+				weight = weight.saturating_add(extract_actual_weight(&result, &info));
+				result.map_err(|mut err| {
+					// Take the weight of this function itself into account.
+					let base_weight = T::WeightInfo::batch_all(index.saturating_add(1) as u32);
+					// Return the actual used weight + base_weight of this call.
+					err.post_info = Some(base_weight + weight).into();
+					err
+				})?;
+			}
+			Self::deposit_event(Event::BatchCompleted);
+			let base_weight = T::WeightInfo::batch_all(calls_len as u32);
+			Ok(Some(base_weight + weight).into())
 		}
 	}
 }
diff --git a/frame/utility/src/tests.rs b/frame/utility/src/tests.rs
index 8e693b234a93..a3c33bdf2081 100644
--- a/frame/utility/src/tests.rs
+++ b/frame/utility/src/tests.rs
@@ -22,13 +22,51 @@
 use super::*;
 
 use frame_support::{
-	assert_ok, assert_noop, impl_outer_origin, parameter_types, impl_outer_dispatch,
-	weights::Weight, impl_outer_event, dispatch::DispatchError, traits::Filter, storage,
+	assert_ok, assert_noop, impl_outer_origin, parameter_types, impl_outer_dispatch, impl_outer_event,
+	assert_err_ignore_postinfo,
+	weights::{Weight, Pays},
+	dispatch::{DispatchError, DispatchErrorWithPostInfo, Dispatchable},
+	traits::Filter,
+	storage,
 };
 use sp_core::H256;
 use sp_runtime::{Perbill, traits::{BlakeTwo256, IdentityLookup}, testing::Header};
 use crate as utility;
 
+// example module to test behaviors.
+pub mod example {
+	use super::*;
+	use frame_support::dispatch::WithPostDispatchInfo;
+	pub trait Trait: frame_system::Trait { }
+
+	decl_module! {
+		pub struct Module<T: Trait> for enum Call where origin: <T as frame_system::Trait>::Origin {
+			#[weight = *weight]
+			fn noop(_origin, weight: Weight) { }
+
+			#[weight = *start_weight]
+			fn foobar(
+				origin,
+				err: bool,
+				start_weight: Weight,
+				end_weight: Option<Weight>,
+			) -> DispatchResultWithPostInfo {
+				let _ = ensure_signed(origin)?;
+				if err {
+					let error: DispatchError = "The cake is a lie.".into();
+					if let Some(weight) = end_weight {
+						Err(error.with_weight(weight))
+					} else {
+						Err(error)?
+					}
+				} else {
+					Ok(end_weight.into())
+				}
+			}
+		}
+	}
+}
+
 impl_outer_origin! {
 	pub enum Origin for Test where system = frame_system {}
 }
@@ -44,6 +82,7 @@ impl_outer_dispatch! {
 		frame_system::System,
 		pallet_balances::Balances,
 		utility::Utility,
+		example::Example,
 	}
 }
 
@@ -102,13 +141,19 @@ parameter_types! {
 	pub const MultisigDepositFactor: u64 = 1;
 	pub const MaxSignatories: u16 = 3;
 }
+
+impl example::Trait for Test {}
+
 pub struct TestBaseCallFilter;
 impl Filter<Call> for TestBaseCallFilter {
 	fn filter(c: &Call) -> bool {
 		match *c {
 			Call::Balances(_) => true,
+			Call::Utility(_) => true,
 			// For benchmarking, this acts as a noop call
 			Call::System(frame_system::Call::remark(..)) => true,
+			// For tests
+			Call::Example(_) => true,
 			_ => false,
 		}
 	}
@@ -120,8 +165,12 @@ impl Trait for Test {
 }
 type System = frame_system::Module<Test>;
 type Balances = pallet_balances::Module<Test>;
+type Example = example::Module<Test>;
 type Utility = Module<Test>;
 
+type ExampleCall = example::Call<Test>;
+type UtilityCall = crate::Call<Test>;
+
 use frame_system::Call as SystemCall;
 use pallet_balances::Call as BalancesCall;
 use pallet_balances::Error as BalancesError;
@@ -149,7 +198,7 @@ fn as_derivative_works() {
 	new_test_ext().execute_with(|| {
 		let sub_1_0 = Utility::derivative_account_id(1, 0);
 		assert_ok!(Balances::transfer(Origin::signed(1), sub_1_0, 5));
-		assert_noop!(Utility::as_derivative(
+		assert_err_ignore_postinfo!(Utility::as_derivative(
 			Origin::signed(1),
 			1,
 			Box::new(Call::Balances(BalancesCall::transfer(6, 3))),
@@ -164,10 +213,70 @@ fn as_derivative_works() {
 	});
 }
 
+#[test]
+fn as_derivative_handles_weight_refund() {
+	new_test_ext().execute_with(|| {
+		let start_weight = 100;
+		let end_weight = 75;
+		let diff = start_weight - end_weight;
+
+		// Full weight when ok
+		let inner_call = Call::Example(ExampleCall::foobar(false, start_weight, None));
+		let call = Call::Utility(UtilityCall::as_derivative(0, Box::new(inner_call)));
+		let info = call.get_dispatch_info();
+		let result = call.dispatch(Origin::signed(1));
+		assert_ok!(result);
+		assert_eq!(extract_actual_weight(&result, &info), info.weight);
+
+		// Refund weight when ok
+		let inner_call = Call::Example(ExampleCall::foobar(false, start_weight, Some(end_weight)));
+		let call = Call::Utility(UtilityCall::as_derivative(0, Box::new(inner_call)));
+		let info = call.get_dispatch_info();
+		let result = call.dispatch(Origin::signed(1));
+		assert_ok!(result);
+		// Diff is refunded
+		assert_eq!(extract_actual_weight(&result, &info), info.weight - diff);
+
+		// Full weight when err
+		let inner_call = Call::Example(ExampleCall::foobar(true, start_weight, None));
+		let call = Call::Utility(UtilityCall::as_derivative(0, Box::new(inner_call)));
+		let info = call.get_dispatch_info();
+		let result = call.dispatch(Origin::signed(1));
+		assert_noop!(
+			result,
+			DispatchErrorWithPostInfo {
+				post_info: PostDispatchInfo {
+					// No weight is refunded
+					actual_weight: Some(info.weight),
+					pays_fee: Pays::Yes,
+				},
+				error: DispatchError::Other("The cake is a lie."),
+			}
+		);
+
+		// Refund weight when err
+		let inner_call = Call::Example(ExampleCall::foobar(true, start_weight, Some(end_weight)));
+		let call = Call::Utility(UtilityCall::as_derivative(0, Box::new(inner_call)));
+		let info = call.get_dispatch_info();
+		let result = call.dispatch(Origin::signed(1));
+		assert_noop!(
+			result,
+			DispatchErrorWithPostInfo {
+				post_info: PostDispatchInfo {
+					// Diff is refunded
+					actual_weight: Some(info.weight - diff),
+					pays_fee: Pays::Yes,
+				},
+				error: DispatchError::Other("The cake is a lie."),
+			}
+		);
+	});
+}
+
 #[test]
 fn as_derivative_filters() {
 	new_test_ext().execute_with(|| {
-		assert_noop!(Utility::as_derivative(
+		assert_err_ignore_postinfo!(Utility::as_derivative(
 			Origin::signed(1),
 			1,
 			Box::new(Call::System(frame_system::Call::suicide())),
@@ -255,3 +364,179 @@ fn batch_weight_calculation_doesnt_overflow() {
 		assert_eq!(batch_call.get_dispatch_info().weight, Weight::max_value());
 	});
 }
+
+#[test]
+fn batch_handles_weight_refund() {
+	new_test_ext().execute_with(|| {
+		let start_weight = 100;
+		let end_weight = 75;
+		let diff = start_weight - end_weight;
+		let batch_len: Weight = 4;
+
+		// Full weight when ok
+		let inner_call = Call::Example(ExampleCall::foobar(false, start_weight, None));
+		let batch_calls = vec![inner_call; batch_len as usize];
+		let call = Call::Utility(UtilityCall::batch(batch_calls));
+		let info = call.get_dispatch_info();
+		let result = call.dispatch(Origin::signed(1));
+		assert_ok!(result);
+		assert_eq!(extract_actual_weight(&result, &info), info.weight);
+
+		// Refund weight when ok
+		let inner_call = Call::Example(ExampleCall::foobar(false, start_weight, Some(end_weight)));
+		let batch_calls = vec![inner_call; batch_len as usize];
+		let call = Call::Utility(UtilityCall::batch(batch_calls));
+		let info = call.get_dispatch_info();
+		let result = call.dispatch(Origin::signed(1));
+		assert_ok!(result);
+		// Diff is refunded
+		assert_eq!(extract_actual_weight(&result, &info), info.weight - diff * batch_len);
+
+		// Full weight when err
+		let good_call = Call::Example(ExampleCall::foobar(false, start_weight, None));
+		let bad_call = Call::Example(ExampleCall::foobar(true, start_weight, None));
+		let batch_calls = vec![good_call, bad_call];
+		let call = Call::Utility(UtilityCall::batch(batch_calls));
+		let info = call.get_dispatch_info();
+		let result = call.dispatch(Origin::signed(1));
+		assert_ok!(result);
+		expect_event(Event::BatchInterrupted(1, DispatchError::Other("")));
+		// No weight is refunded
+		assert_eq!(extract_actual_weight(&result, &info), info.weight);
+
+		// Refund weight when err
+		let good_call = Call::Example(ExampleCall::foobar(false, start_weight, Some(end_weight)));
+		let bad_call = Call::Example(ExampleCall::foobar(true, start_weight, Some(end_weight)));
+		let batch_calls = vec![good_call, bad_call];
+		let batch_len = batch_calls.len() as Weight;
+		let call = Call::Utility(UtilityCall::batch(batch_calls));
+		let info = call.get_dispatch_info();
+		let result = call.dispatch(Origin::signed(1));
+		assert_ok!(result);
+		expect_event(Event::BatchInterrupted(1, DispatchError::Other("")));
+		assert_eq!(extract_actual_weight(&result, &info), info.weight - diff * batch_len);
+
+		// Partial batch completion
+		let good_call = Call::Example(ExampleCall::foobar(false, start_weight, Some(end_weight)));
+		let bad_call = Call::Example(ExampleCall::foobar(true, start_weight, Some(end_weight)));
+		let batch_calls = vec![good_call, bad_call.clone(), bad_call];
+		let call = Call::Utility(UtilityCall::batch(batch_calls));
+		let info = call.get_dispatch_info();
+		let result = call.dispatch(Origin::signed(1));
+		assert_ok!(result);
+		expect_event(Event::BatchInterrupted(1, DispatchError::Other("")));
+		assert_eq!(
+			extract_actual_weight(&result, &info),
+			// Real weight is 2 calls at end_weight
+			<Test as Trait>::WeightInfo::batch(2) + end_weight * 2,
+		);
+	});
+}
+
+#[test]
+fn batch_all_works() {
+	new_test_ext().execute_with(|| {
+		assert_eq!(Balances::free_balance(1), 10);
+		assert_eq!(Balances::free_balance(2), 10);
+		assert_ok!(
+			Utility::batch_all(Origin::signed(1), vec![
+				Call::Balances(BalancesCall::transfer(2, 5)),
+				Call::Balances(BalancesCall::transfer(2, 5))
+			]),
+		);
+		assert_eq!(Balances::free_balance(1), 0);
+		assert_eq!(Balances::free_balance(2), 20);
+	});
+}
+
+#[test]
+fn batch_all_revert() {
+	new_test_ext().execute_with(|| {
+		let call = Call::Balances(BalancesCall::transfer(2, 5));
+		let info = call.get_dispatch_info();
+
+		assert_eq!(Balances::free_balance(1), 10);
+		assert_eq!(Balances::free_balance(2), 10);
+		assert_noop!(
+			Utility::batch_all(Origin::signed(1), vec![
+				Call::Balances(BalancesCall::transfer(2, 5)),
+				Call::Balances(BalancesCall::transfer(2, 10)),
+				Call::Balances(BalancesCall::transfer(2, 5)),
+			]),
+			DispatchErrorWithPostInfo {
+				post_info: PostDispatchInfo {
+					actual_weight: Some(<Test as Trait>::WeightInfo::batch_all(2) + info.weight * 2),
+					pays_fee: Pays::Yes
+				},
+				error: pallet_balances::Error::<Test, _>::InsufficientBalance.into()
+			}
+		);
+		assert_eq!(Balances::free_balance(1), 10);
+		assert_eq!(Balances::free_balance(2), 10);
+	});
+}
+
+#[test]
+fn batch_all_handles_weight_refund() {
+	new_test_ext().execute_with(|| {
+		let start_weight = 100;
+		let end_weight = 75;
+		let diff = start_weight - end_weight;
+		let batch_len: Weight = 4;
+
+		// Full weight when ok
+		let inner_call = Call::Example(ExampleCall::foobar(false, start_weight, None));
+		let batch_calls = vec![inner_call; batch_len as usize];
+		let call = Call::Utility(UtilityCall::batch_all(batch_calls));
+		let info = call.get_dispatch_info();
+		let result = call.dispatch(Origin::signed(1));
+		assert_ok!(result);
+		assert_eq!(extract_actual_weight(&result, &info), info.weight);
+
+		// Refund weight when ok
+		let inner_call = Call::Example(ExampleCall::foobar(false, start_weight, Some(end_weight)));
+		let batch_calls = vec![inner_call; batch_len as usize];
+		let call = Call::Utility(UtilityCall::batch_all(batch_calls));
+		let info = call.get_dispatch_info();
+		let result = call.dispatch(Origin::signed(1));
+		assert_ok!(result);
+		// Diff is refunded
+		assert_eq!(extract_actual_weight(&result, &info), info.weight - diff * batch_len);
+
+		// Full weight when err
+		let good_call = Call::Example(ExampleCall::foobar(false, start_weight, None));
+		let bad_call = Call::Example(ExampleCall::foobar(true, start_weight, None));
+		let batch_calls = vec![good_call, bad_call];
+		let call = Call::Utility(UtilityCall::batch_all(batch_calls));
+		let info = call.get_dispatch_info();
+		let result = call.dispatch(Origin::signed(1));
+		assert_err_ignore_postinfo!(result, "The cake is a lie.");
+		// No weight is refunded
+		assert_eq!(extract_actual_weight(&result, &info), info.weight);
+
+		// Refund weight when err
+		let good_call = Call::Example(ExampleCall::foobar(false, start_weight, Some(end_weight)));
+		let bad_call = Call::Example(ExampleCall::foobar(true, start_weight, Some(end_weight)));
+		let batch_calls = vec![good_call, bad_call];
+		let batch_len = batch_calls.len() as Weight;
+		let call = Call::Utility(UtilityCall::batch_all(batch_calls));
+		let info = call.get_dispatch_info();
+		let result = call.dispatch(Origin::signed(1));
+		assert_err_ignore_postinfo!(result, "The cake is a lie.");
+		assert_eq!(extract_actual_weight(&result, &info), info.weight - diff * batch_len);
+
+		// Partial batch completion
+		let good_call = Call::Example(ExampleCall::foobar(false, start_weight, Some(end_weight)));
+		let bad_call = Call::Example(ExampleCall::foobar(true, start_weight, Some(end_weight)));
+		let batch_calls = vec![good_call, bad_call.clone(), bad_call];
+		let call = Call::Utility(UtilityCall::batch_all(batch_calls));
+		let info = call.get_dispatch_info();
+		let result = call.dispatch(Origin::signed(1));
+		assert_err_ignore_postinfo!(result, "The cake is a lie.");
+		assert_eq!(
+			extract_actual_weight(&result, &info),
+			// Real weight is 2 calls at end_weight
+			<Test as Trait>::WeightInfo::batch_all(2) + end_weight * 2,
+		);
+	});
+}

From 9c84afa6ac5f85b36e9a376abfd5bd4888a75561 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Tue, 27 Oct 2020 21:26:12 +0100
Subject: [PATCH 0023/1194] New Weight Template + Organization (#7391)

* add_handlebar_template_to_benchmark

- add benchmark-cli arg to take in a handlebar-template file

* update to always use template

* rewrite writer for handlebars

* polish

* pass cmd data

* update docs

* new weight layout

* separate templates

* support custom filename output

* Update command.rs

* Create frame-weight-template.hbs

* use a vector to maintain benchmark order

* bring back ()

* fix tests

* fix build

* Custom string serializer, remove feature flag

* temp

* rename

* nit

* update docs

* docs on public objects

* small fix

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* remove long line

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=frame_system --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/system/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* update for system

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* update for staking

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_identity --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/identity/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* update for identity and staking

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_collective --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/collective/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* update for collective

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_democracy --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/democracy/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* update for democracy

* clean up zeros

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_elections_phragmen --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/elections-phragmen/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* update for elections phragmen

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_im_online --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/im-online/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* update for im online

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_indices --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/indices/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* update for indices

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_multisig --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/multisig/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* update for multisig

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_proxy --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/proxy/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* update for proxy

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_scheduler --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/scheduler/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* update for scheduler

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_session --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/session/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* update for session

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_timestamp --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/timestamp/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* update for timestamp

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_treasury --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/treasury/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* update for treasury

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_utility --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/utility/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* update for utility

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_vesting --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/vesting/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* update for vesting

* temp update

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_utility --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/utility/src/weights.rs --template=./.maintain/frame-weight-template.hbs

Co-authored-by: Ezadkiel Marbella <zadkiel.m@gmail.com>
Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
---
 .maintain/frame-weight-template.hbs           |  38 +-
 bin/node-template/runtime/src/lib.rs          |   2 +-
 bin/node/runtime/src/lib.rs                   |  36 +-
 bin/node/runtime/src/weights/frame_system.rs  |  57 ---
 bin/node/runtime/src/weights/mod.rs           |  17 -
 .../runtime/src/weights/pallet_balances.rs    |  48 --
 .../runtime/src/weights/pallet_collective.rs  |  98 -----
 .../runtime/src/weights/pallet_democracy.rs   | 173 --------
 .../src/weights/pallet_elections_phragmen.rs  |  92 ----
 .../runtime/src/weights/pallet_identity.rs    | 137 ------
 .../runtime/src/weights/pallet_im_online.rs   |  35 --
 .../runtime/src/weights/pallet_indices.rs     |  53 ---
 .../runtime/src/weights/pallet_multisig.rs    |  91 ----
 bin/node/runtime/src/weights/pallet_proxy.rs  |  86 ----
 .../runtime/src/weights/pallet_scheduler.rs   |  52 ---
 .../runtime/src/weights/pallet_session.rs     |  38 --
 .../runtime/src/weights/pallet_staking.rs     | 171 --------
 .../runtime/src/weights/pallet_timestamp.rs   |  33 --
 .../runtime/src/weights/pallet_treasury.rs    | 140 ------
 .../runtime/src/weights/pallet_utility.rs     |  41 --
 .../runtime/src/weights/pallet_vesting.rs     |  64 ---
 frame/balances/src/default_weight.rs          |  46 --
 frame/balances/src/lib.rs                     |  12 +-
 frame/balances/src/weights.rs                 | 123 ++++++
 frame/collective/src/default_weight.rs        |  97 ----
 frame/collective/src/lib.rs                   |  16 +-
 frame/collective/src/weights.rs               | 230 ++++++++++
 frame/democracy/src/default_weight.rs         | 171 --------
 frame/democracy/src/lib.rs                    |  31 +-
 frame/democracy/src/weights.rs                | 415 ++++++++++++++++++
 .../elections-phragmen/src/default_weights.rs |  88 ----
 frame/elections-phragmen/src/lib.rs           |  21 +-
 frame/elections-phragmen/src/weights.rs       | 215 +++++++++
 frame/identity/src/default_weights.rs         | 135 ------
 frame/identity/src/lib.rs                     |  31 +-
 frame/identity/src/weights.rs                 | 312 +++++++++++++
 frame/im-online/src/default_weight.rs         |  33 --
 frame/im-online/src/lib.rs                    |   8 +-
 frame/im-online/src/weights.rs                |  75 ++++
 frame/indices/src/default_weights.rs          |  51 ---
 frame/indices/src/lib.rs                      |  22 +-
 frame/indices/src/weights.rs                  | 123 ++++++
 frame/multisig/src/default_weights.rs         |  89 ----
 frame/multisig/src/lib.rs                     |  22 +-
 frame/multisig/src/weights.rs                 | 214 +++++++++
 frame/proxy/src/default_weight.rs             |  84 ----
 frame/proxy/src/lib.rs                        |  22 +-
 frame/proxy/src/weights.rs                    | 214 +++++++++
 frame/scheduler/src/default_weights.rs        |  50 ---
 frame/scheduler/src/lib.rs                    |  10 +-
 frame/scheduler/src/weights.rs                | 118 +++++
 frame/session/src/default_weights.rs          |  36 --
 frame/session/src/lib.rs                      |  24 +-
 frame/session/src/weights.rs                  |  84 ++++
 frame/staking/src/default_weights.rs          | 169 -------
 frame/staking/src/lib.rs                      |  30 +-
 frame/staking/src/weights.rs                  | 406 +++++++++++++++++
 frame/system/src/default_weights.rs           |  55 ---
 frame/system/src/extensions/check_weight.rs   |   2 +-
 frame/system/src/lib.rs                       |  17 +-
 frame/system/src/weight.rs                    |  76 ++++
 frame/system/src/weights.rs                   | 145 ++++--
 frame/timestamp/src/default_weights.rs        |  33 --
 frame/timestamp/src/lib.rs                    |   8 +-
 frame/timestamp/src/weights.rs                |  80 ++++
 frame/treasury/src/default_weights.rs         | 138 ------
 frame/treasury/src/lib.rs                     |  32 +-
 frame/treasury/src/weights.rs                 | 338 ++++++++++++++
 frame/utility/src/default_weights.rs          |  39 --
 frame/utility/src/lib.rs                      |  15 +-
 frame/utility/src/weights.rs                  |  89 ++++
 frame/vesting/src/default_weights.rs          |  62 ---
 frame/vesting/src/lib.rs                      |  18 +-
 frame/vesting/src/weights.rs                  | 148 +++++++
 utils/frame/benchmarking-cli/src/template.hbs |   6 +-
 75 files changed, 3490 insertions(+), 3140 deletions(-)
 delete mode 100644 bin/node/runtime/src/weights/frame_system.rs
 delete mode 100644 bin/node/runtime/src/weights/pallet_balances.rs
 delete mode 100644 bin/node/runtime/src/weights/pallet_collective.rs
 delete mode 100644 bin/node/runtime/src/weights/pallet_democracy.rs
 delete mode 100644 bin/node/runtime/src/weights/pallet_elections_phragmen.rs
 delete mode 100644 bin/node/runtime/src/weights/pallet_identity.rs
 delete mode 100644 bin/node/runtime/src/weights/pallet_im_online.rs
 delete mode 100644 bin/node/runtime/src/weights/pallet_indices.rs
 delete mode 100644 bin/node/runtime/src/weights/pallet_multisig.rs
 delete mode 100644 bin/node/runtime/src/weights/pallet_proxy.rs
 delete mode 100644 bin/node/runtime/src/weights/pallet_scheduler.rs
 delete mode 100644 bin/node/runtime/src/weights/pallet_session.rs
 delete mode 100644 bin/node/runtime/src/weights/pallet_staking.rs
 delete mode 100644 bin/node/runtime/src/weights/pallet_timestamp.rs
 delete mode 100644 bin/node/runtime/src/weights/pallet_treasury.rs
 delete mode 100644 bin/node/runtime/src/weights/pallet_utility.rs
 delete mode 100644 bin/node/runtime/src/weights/pallet_vesting.rs
 delete mode 100644 frame/balances/src/default_weight.rs
 create mode 100644 frame/balances/src/weights.rs
 delete mode 100644 frame/collective/src/default_weight.rs
 create mode 100644 frame/collective/src/weights.rs
 delete mode 100644 frame/democracy/src/default_weight.rs
 create mode 100644 frame/democracy/src/weights.rs
 delete mode 100644 frame/elections-phragmen/src/default_weights.rs
 create mode 100644 frame/elections-phragmen/src/weights.rs
 delete mode 100644 frame/identity/src/default_weights.rs
 create mode 100644 frame/identity/src/weights.rs
 delete mode 100644 frame/im-online/src/default_weight.rs
 create mode 100644 frame/im-online/src/weights.rs
 delete mode 100644 frame/indices/src/default_weights.rs
 create mode 100644 frame/indices/src/weights.rs
 delete mode 100644 frame/multisig/src/default_weights.rs
 create mode 100644 frame/multisig/src/weights.rs
 delete mode 100644 frame/proxy/src/default_weight.rs
 create mode 100644 frame/proxy/src/weights.rs
 delete mode 100644 frame/scheduler/src/default_weights.rs
 create mode 100644 frame/scheduler/src/weights.rs
 delete mode 100644 frame/session/src/default_weights.rs
 create mode 100644 frame/session/src/weights.rs
 delete mode 100644 frame/staking/src/default_weights.rs
 create mode 100644 frame/staking/src/weights.rs
 delete mode 100644 frame/system/src/default_weights.rs
 create mode 100644 frame/system/src/weight.rs
 delete mode 100644 frame/timestamp/src/default_weights.rs
 create mode 100644 frame/timestamp/src/weights.rs
 delete mode 100644 frame/treasury/src/default_weights.rs
 create mode 100644 frame/treasury/src/weights.rs
 delete mode 100644 frame/utility/src/default_weights.rs
 create mode 100644 frame/utility/src/weights.rs
 delete mode 100644 frame/vesting/src/default_weights.rs
 create mode 100644 frame/vesting/src/weights.rs

diff --git a/.maintain/frame-weight-template.hbs b/.maintain/frame-weight-template.hbs
index d0d7ef93d3ac..595c2a7d3139 100644
--- a/.maintain/frame-weight-template.hbs
+++ b/.maintain/frame-weight-template.hbs
@@ -16,15 +16,19 @@
 // limitations under the License.
 
 //! Weights for {{pallet}}
-//! {{join args}}
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION {{version}}
 //! DATE: {{date}}, STEPS: {{cmd.steps}}, REPEAT: {{cmd.repeat}}, LOW RANGE: {{cmd.lowest_range_values}}, HIGH RANGE: {{cmd.highest_range_values}}
 //! EXECUTION: {{cmd.execution}}, WASM-EXECUTION: {{cmd.wasm_execution}}, CHAIN: {{cmd.chain}}, DB CACHE: {{cmd.db_cache}}
 
+// Executed Command:
+{{#each args as |arg|~}}
+// {{arg}}
+{{/each}}
+
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use sp_std::marker::PhantomData;
 
 /// Weight functions needed for {{pallet}}.
@@ -33,7 +37,7 @@ pub trait WeightInfo {
 	fn {{benchmark.name~}}
 	(
 		{{~#each benchmark.components as |c| ~}}
-		_{{c.name}}: u32, {{/each~}}
+		{{c.name}}: u32, {{/each~}}
 	) -> Weight;
 	{{/each}}
 }
@@ -66,3 +70,31 @@ impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
 	}
 	{{/each}}
 }
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+	{{#each benchmarks as |benchmark| ~}}
+	fn {{benchmark.name~}}
+	(
+		{{~#each benchmark.components as |c| ~}}
+		{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
+	) -> Weight {
+		({{underscore benchmark.base_weight}} as Weight)
+			{{#each benchmark.component_weight as |cw| ~}}
+			.saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
+			{{/each}}
+			{{~#if (ne benchmark.base_reads "0") ~}}
+			.saturating_add(RocksDbWeight::get().reads({{benchmark.base_reads}} as Weight))
+			{{/if}}
+			{{~#each benchmark.component_reads as |cr| ~}}
+			.saturating_add(RocksDbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight)))
+			{{/each}}
+			{{~#if (ne benchmark.base_writes "0") ~}}
+			.saturating_add(RocksDbWeight::get().writes({{benchmark.base_writes}} as Weight))
+			{{/if}}
+			{{~#each benchmark.component_writes as |cw| ~}}
+			.saturating_add(RocksDbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
+			{{~/each}}
+	}
+	{{/each}}
+}
diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index e96de6373174..e414631d97e3 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -241,7 +241,7 @@ impl pallet_balances::Trait for Runtime {
 	type DustRemoval = ();
 	type ExistentialDeposit = ExistentialDeposit;
 	type AccountStore = System;
-	type WeightInfo = ();
+	type WeightInfo = pallet_balances::weights::SubstrateWeight<Runtime>;
 }
 
 parameter_types! {
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index dfa7a4680abe..0718a1557e4d 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -185,13 +185,13 @@ impl frame_system::Trait for Runtime {
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
-	type SystemWeightInfo = weights::frame_system::WeightInfo<Runtime>;
+	type SystemWeightInfo = frame_system::weights::SubstrateWeight<Runtime>;
 }
 
 impl pallet_utility::Trait for Runtime {
 	type Event = Event;
 	type Call = Call;
-	type WeightInfo = weights::pallet_utility::WeightInfo<Runtime>;
+	type WeightInfo = pallet_utility::weights::SubstrateWeight<Runtime>;
 }
 
 parameter_types! {
@@ -209,7 +209,7 @@ impl pallet_multisig::Trait for Runtime {
 	type DepositBase = DepositBase;
 	type DepositFactor = DepositFactor;
 	type MaxSignatories = MaxSignatories;
-	type WeightInfo = weights::pallet_multisig::WeightInfo<Runtime>;
+	type WeightInfo = pallet_multisig::weights::SubstrateWeight<Runtime>;
 }
 
 parameter_types! {
@@ -273,7 +273,7 @@ impl pallet_proxy::Trait for Runtime {
 	type ProxyDepositBase = ProxyDepositBase;
 	type ProxyDepositFactor = ProxyDepositFactor;
 	type MaxProxies = MaxProxies;
-	type WeightInfo = weights::pallet_proxy::WeightInfo<Runtime>;
+	type WeightInfo = pallet_proxy::weights::SubstrateWeight<Runtime>;
 	type MaxPending = MaxPending;
 	type CallHasher = BlakeTwo256;
 	type AnnouncementDepositBase = AnnouncementDepositBase;
@@ -293,7 +293,7 @@ impl pallet_scheduler::Trait for Runtime {
 	type MaximumWeight = MaximumSchedulerWeight;
 	type ScheduleOrigin = EnsureRoot<AccountId>;
 	type MaxScheduledPerBlock = MaxScheduledPerBlock;
-	type WeightInfo = weights::pallet_scheduler::WeightInfo<Runtime>;
+	type WeightInfo = pallet_scheduler::weights::SubstrateWeight<Runtime>;
 }
 
 parameter_types! {
@@ -333,7 +333,7 @@ impl pallet_indices::Trait for Runtime {
 	type Currency = Balances;
 	type Deposit = IndexDeposit;
 	type Event = Event;
-	type WeightInfo = weights::pallet_indices::WeightInfo<Runtime>;
+	type WeightInfo = pallet_indices::weights::SubstrateWeight<Runtime>;
 }
 
 parameter_types! {
@@ -350,7 +350,7 @@ impl pallet_balances::Trait for Runtime {
 	type Event = Event;
 	type ExistentialDeposit = ExistentialDeposit;
 	type AccountStore = frame_system::Module<Runtime>;
-	type WeightInfo = weights::pallet_balances::WeightInfo<Runtime>;
+	type WeightInfo = pallet_balances::weights::SubstrateWeight<Runtime>;
 }
 
 parameter_types! {
@@ -377,7 +377,7 @@ impl pallet_timestamp::Trait for Runtime {
 	type Moment = Moment;
 	type OnTimestampSet = Babe;
 	type MinimumPeriod = MinimumPeriod;
-	type WeightInfo = weights::pallet_timestamp::WeightInfo<Runtime>;
+	type WeightInfo = pallet_timestamp::weights::SubstrateWeight<Runtime>;
 }
 
 parameter_types! {
@@ -414,7 +414,7 @@ impl pallet_session::Trait for Runtime {
 	type SessionHandler = <SessionKeys as OpaqueKeys>::KeyTypeIdProviders;
 	type Keys = SessionKeys;
 	type DisabledValidatorsThreshold = DisabledValidatorsThreshold;
-	type WeightInfo = weights::pallet_session::WeightInfo<Runtime>;
+	type WeightInfo = pallet_session::weights::SubstrateWeight<Runtime>;
 }
 
 impl pallet_session::historical::Trait for Runtime {
@@ -477,7 +477,7 @@ impl pallet_staking::Trait for Runtime {
 	// The unsigned solution weight targeted by the OCW. We set it to the maximum possible value of
 	// a single extrinsic.
 	type OffchainSolutionWeightLimit = OffchainSolutionWeightLimit;
-	type WeightInfo = weights::pallet_staking::WeightInfo<Runtime>;
+	type WeightInfo = pallet_staking::weights::SubstrateWeight<Runtime>;
 }
 
 parameter_types! {
@@ -535,7 +535,7 @@ impl pallet_democracy::Trait for Runtime {
 	type Scheduler = Scheduler;
 	type PalletsOrigin = OriginCaller;
 	type MaxVotes = MaxVotes;
-	type WeightInfo = weights::pallet_democracy::WeightInfo<Runtime>;
+	type WeightInfo = pallet_democracy::weights::SubstrateWeight<Runtime>;
 	type MaxProposals = MaxProposals;
 }
 
@@ -554,7 +554,7 @@ impl pallet_collective::Trait<CouncilCollective> for Runtime {
 	type MaxProposals = CouncilMaxProposals;
 	type MaxMembers = CouncilMaxMembers;
 	type DefaultVote = pallet_collective::PrimeDefaultVote;
-	type WeightInfo = weights::pallet_collective::WeightInfo<Runtime>;
+	type WeightInfo = pallet_collective::weights::SubstrateWeight<Runtime>;
 }
 
 parameter_types! {
@@ -586,7 +586,7 @@ impl pallet_elections_phragmen::Trait for Runtime {
 	type DesiredMembers = DesiredMembers;
 	type DesiredRunnersUp = DesiredRunnersUp;
 	type TermDuration = TermDuration;
-	type WeightInfo = weights::pallet_elections_phragmen::WeightInfo<Runtime>;
+	type WeightInfo = pallet_elections_phragmen::weights::SubstrateWeight<Runtime>;
 }
 
 parameter_types! {
@@ -604,7 +604,7 @@ impl pallet_collective::Trait<TechnicalCollective> for Runtime {
 	type MaxProposals = TechnicalMaxProposals;
 	type MaxMembers = TechnicalMaxMembers;
 	type DefaultVote = pallet_collective::PrimeDefaultVote;
-	type WeightInfo = weights::pallet_collective::WeightInfo<Runtime>;
+	type WeightInfo = pallet_collective::weights::SubstrateWeight<Runtime>;
 }
 
 type EnsureRootOrHalfCouncil = EnsureOneOf<
@@ -672,7 +672,7 @@ impl pallet_treasury::Trait for Runtime {
 	type BountyValueMinimum = BountyValueMinimum;
 	type MaximumReasonLength = MaximumReasonLength;
 	type BurnDestination = ();
-	type WeightInfo = weights::pallet_treasury::WeightInfo<Runtime>;
+	type WeightInfo = pallet_treasury::weights::SubstrateWeight<Runtime>;
 }
 
 parameter_types! {
@@ -778,7 +778,7 @@ impl pallet_im_online::Trait for Runtime {
 	type SessionDuration = SessionDuration;
 	type ReportUnresponsiveness = Offences;
 	type UnsignedPriority = ImOnlineUnsignedPriority;
-	type WeightInfo = weights::pallet_im_online::WeightInfo<Runtime>;
+	type WeightInfo = pallet_im_online::weights::SubstrateWeight<Runtime>;
 }
 
 parameter_types! {
@@ -835,7 +835,7 @@ impl pallet_identity::Trait for Runtime {
 	type Slashed = Treasury;
 	type ForceOrigin = EnsureRootOrHalfCouncil;
 	type RegistrarOrigin = EnsureRootOrHalfCouncil;
-	type WeightInfo = weights::pallet_identity::WeightInfo<Runtime>;
+	type WeightInfo = pallet_identity::weights::SubstrateWeight<Runtime>;
 }
 
 parameter_types! {
@@ -892,7 +892,7 @@ impl pallet_vesting::Trait for Runtime {
 	type Currency = Balances;
 	type BlockNumberToBalance = ConvertInto;
 	type MinVestedTransfer = MinVestedTransfer;
-	type WeightInfo = weights::pallet_vesting::WeightInfo<Runtime>;
+	type WeightInfo = pallet_vesting::weights::SubstrateWeight<Runtime>;
 }
 
 construct_runtime!(
diff --git a/bin/node/runtime/src/weights/frame_system.rs b/bin/node/runtime/src/weights/frame_system.rs
deleted file mode 100644
index 6831dad0620d..000000000000
--- a/bin/node/runtime/src/weights/frame_system.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc5
-
-#![allow(unused_parens)]
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Trait> frame_system::WeightInfo for WeightInfo<T> {
-	fn remark(_b: u32) -> Weight {
-		(1305000 as Weight)
-	}
-	fn set_heap_pages() -> Weight {
-		(2023000 as Weight)
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn set_changes_trie_config() -> Weight {
-		(10026000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn set_storage(i: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((656000 as Weight).saturating_mul(i as Weight))
-			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
-	}
-	fn kill_storage(i: u32, ) -> Weight {
-		(4327000 as Weight)
-			.saturating_add((478000 as Weight).saturating_mul(i as Weight))
-			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
-	}
-	fn kill_prefix(p: u32, ) -> Weight {
-		(8349000 as Weight)
-			.saturating_add((838000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
-	}
-	fn suicide() -> Weight {
-		(29247000 as Weight)
-	}
-}
diff --git a/bin/node/runtime/src/weights/mod.rs b/bin/node/runtime/src/weights/mod.rs
index c75ff83085b6..5de6286da9b7 100644
--- a/bin/node/runtime/src/weights/mod.rs
+++ b/bin/node/runtime/src/weights/mod.rs
@@ -15,21 +15,4 @@
 
 //! A list of the different weight modules for our runtime.
 
-pub mod frame_system;
-pub mod pallet_balances;
-pub mod pallet_collective;
 pub mod pallet_contracts;
-pub mod pallet_democracy;
-pub mod pallet_elections_phragmen;
-pub mod pallet_identity;
-pub mod pallet_im_online;
-pub mod pallet_indices;
-pub mod pallet_multisig;
-pub mod pallet_proxy;
-pub mod pallet_scheduler;
-pub mod pallet_session;
-pub mod pallet_staking;
-pub mod pallet_timestamp;
-pub mod pallet_treasury;
-pub mod pallet_utility;
-pub mod pallet_vesting;
diff --git a/bin/node/runtime/src/weights/pallet_balances.rs b/bin/node/runtime/src/weights/pallet_balances.rs
deleted file mode 100644
index 18a971b20c0e..000000000000
--- a/bin/node/runtime/src/weights/pallet_balances.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc5
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Trait> pallet_balances::WeightInfo for WeightInfo<T> {
-	fn transfer() -> Weight {
-		(65949000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn transfer_keep_alive() -> Weight {
-		(46665000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn set_balance_creating() -> Weight {
-		(27086000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn set_balance_killing() -> Weight {
-		(33424000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn force_transfer() -> Weight {
-		(65343000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-}
diff --git a/bin/node/runtime/src/weights/pallet_collective.rs b/bin/node/runtime/src/weights/pallet_collective.rs
deleted file mode 100644
index 5e91dc19abcb..000000000000
--- a/bin/node/runtime/src/weights/pallet_collective.rs
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
-
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Trait> pallet_collective::WeightInfo for WeightInfo<T> {
-	fn set_members(m: u32, n: u32, p: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((21040000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((173000 as Weight).saturating_mul(n as Weight))
-			.saturating_add((31595000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(p as Weight)))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
-	}
-	fn execute(b: u32, m: u32, ) -> Weight {
-		(43359000 as Weight)
-			.saturating_add((4000 as Weight).saturating_mul(b as Weight))
-			.saturating_add((123000 as Weight).saturating_mul(m as Weight))
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-	}
-	fn propose_execute(b: u32, m: u32, ) -> Weight {
-		(54134000 as Weight)
-			.saturating_add((4000 as Weight).saturating_mul(b as Weight))
-			.saturating_add((239000 as Weight).saturating_mul(m as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-	}
-	fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight {
-		(90650000 as Weight)
-			.saturating_add((5000 as Weight).saturating_mul(b as Weight))
-			.saturating_add((152000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((970000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().writes(4 as Weight))
-	}
-	fn vote(m: u32, ) -> Weight {
-		(74460000 as Weight)
-			.saturating_add((290000 as Weight).saturating_mul(m as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn close_early_disapproved(m: u32, p: u32, ) -> Weight {
-		(86360000 as Weight)
-			.saturating_add((232000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((954000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
-			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-	}
-	fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		(123653000 as Weight)
-			.saturating_add((1000 as Weight).saturating_mul(b as Weight))
-			.saturating_add((287000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((920000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-	}
-	fn close_disapproved(m: u32, p: u32, ) -> Weight {
-		(95395000 as Weight)
-			.saturating_add((236000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((965000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-	}
-	fn close_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		(135284000 as Weight)
-			.saturating_add((4000 as Weight).saturating_mul(b as Weight))
-			.saturating_add((218000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((951000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
-			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-	}
-	fn disapprove_proposal(p: u32, ) -> Weight {
-		(50500000 as Weight)
-			.saturating_add((966000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-	}
-}
diff --git a/bin/node/runtime/src/weights/pallet_democracy.rs b/bin/node/runtime/src/weights/pallet_democracy.rs
deleted file mode 100644
index 51eca2855a38..000000000000
--- a/bin/node/runtime/src/weights/pallet_democracy.rs
+++ /dev/null
@@ -1,173 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Weights for pallet_democracy
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-09-24, STEPS: [50], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
-
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Trait> pallet_democracy::WeightInfo for WeightInfo<T> {
-	fn propose() -> Weight {
-		(96_316_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
-			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-	}
-	fn second(s: u32, ) -> Weight {
-		(58_386_000 as Weight)
-			.saturating_add((259_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn vote_new(r: u32, ) -> Weight {
-		(70_374_000 as Weight)
-			.saturating_add((291_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
-			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-	}
-	fn vote_existing(r: u32, ) -> Weight {
-		(70_097_000 as Weight)
-			.saturating_add((296_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
-			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-	}
-	fn emergency_cancel() -> Weight {
-		(41_731_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn blacklist(p: u32, ) -> Weight {
-		(117_847_000 as Weight)
-			.saturating_add((871_000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
-			.saturating_add(T::DbWeight::get().writes(6 as Weight))
-	}
-	fn external_propose(v: u32, ) -> Weight {
-		(20_972_000 as Weight)
-			.saturating_add((114_000 as Weight).saturating_mul(v as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn external_propose_majority() -> Weight {
-		(5_030_000 as Weight)
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn external_propose_default() -> Weight {
-		(4_981_000 as Weight)
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn fast_track() -> Weight {
-		(42_801_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-	}
-	fn veto_external(v: u32, ) -> Weight {
-		(44_115_000 as Weight)
-			.saturating_add((194_000 as Weight).saturating_mul(v as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn cancel_proposal(p: u32, ) -> Weight {
-		(73_937_000 as Weight)
-			.saturating_add((962_000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
-			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-	}
-	fn cancel_referendum() -> Weight {
-		(25_233_000 as Weight)
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn cancel_queued(r: u32, ) -> Weight {
-		(48_251_000 as Weight)
-			.saturating_add((3_590_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn on_initialize_base(r: u32, ) -> Weight {
-		(17_597_000 as Weight)
-			.saturating_add((7_248_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
-			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
-	}
-	fn delegate(r: u32, ) -> Weight {
-		(93_916_000 as Weight)
-			.saturating_add((10_794_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
-			.saturating_add(T::DbWeight::get().writes(4 as Weight))
-			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight)))
-	}
-	fn undelegate(r: u32, ) -> Weight {
-		(47_855_000 as Weight)
-			.saturating_add((10_805_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight)))
-	}
-	fn clear_public_proposals() -> Weight {
-		(4_864_000 as Weight)
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn note_preimage(b: u32, ) -> Weight {
-		(66_754_000 as Weight)
-			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn note_imminent_preimage(b: u32, ) -> Weight {
-		(44_664_000 as Weight)
-			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn reap_preimage(b: u32, ) -> Weight {
-		(59_968_000 as Weight)
-			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn unlock_remove(r: u32, ) -> Weight {
-		(58_573_000 as Weight)
-			.saturating_add((131_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
-			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-	}
-	fn unlock_set(r: u32, ) -> Weight {
-		(53_831_000 as Weight)
-			.saturating_add((324_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
-			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-	}
-	fn remove_vote(r: u32, ) -> Weight {
-		(31_846_000 as Weight)
-			.saturating_add((327_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn remove_other_vote(r: u32, ) -> Weight {
-		(31_880_000 as Weight)
-			.saturating_add((222_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-}
diff --git a/bin/node/runtime/src/weights/pallet_elections_phragmen.rs b/bin/node/runtime/src/weights/pallet_elections_phragmen.rs
deleted file mode 100644
index a77817fa1f54..000000000000
--- a/bin/node/runtime/src/weights/pallet_elections_phragmen.rs
+++ /dev/null
@@ -1,92 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Weights for pallet_elections_phragmen
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-26, STEPS: [50], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Trait> pallet_elections_phragmen::WeightInfo for WeightInfo<T> {
-	fn vote(v: u32, ) -> Weight {
-		(91_991_000 as Weight)
-			.saturating_add((184_000 as Weight).saturating_mul(v as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn vote_update(v: u32, ) -> Weight {
-		(56_633_000 as Weight)
-			.saturating_add((228_000 as Weight).saturating_mul(v as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn remove_voter() -> Weight {
-		(76_890_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn report_defunct_voter_correct(c: u32, v: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((1_769_000 as Weight).saturating_mul(c as Weight))
-			.saturating_add((32_244_000 as Weight).saturating_mul(v as Weight))
-			.saturating_add(T::DbWeight::get().reads(7 as Weight))
-			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-	}
-	fn report_defunct_voter_incorrect(c: u32, v: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((1_777_000 as Weight).saturating_mul(c as Weight))
-			.saturating_add((32_528_000 as Weight).saturating_mul(v as Weight))
-			.saturating_add(T::DbWeight::get().reads(6 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn submit_candidacy(c: u32, ) -> Weight {
-		(75_137_000 as Weight)
-			.saturating_add((310_000 as Weight).saturating_mul(c as Weight))
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn renounce_candidacy_candidate(c: u32, ) -> Weight {
-		(50_071_000 as Weight)
-			.saturating_add((184_000 as Weight).saturating_mul(c as Weight))
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn renounce_candidacy_members() -> Weight {
-		(79_471_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
-			.saturating_add(T::DbWeight::get().writes(4 as Weight))
-	}
-	fn renounce_candidacy_runners_up() -> Weight {
-		(49_740_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn remove_member_with_replacement() -> Weight {
-		(76_973_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().writes(5 as Weight))
-	}
-	fn remove_member_wrong_refund() -> Weight {
-		(8_871_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-	}
-}
diff --git a/bin/node/runtime/src/weights/pallet_identity.rs b/bin/node/runtime/src/weights/pallet_identity.rs
deleted file mode 100644
index a43b63c0fb04..000000000000
--- a/bin/node/runtime/src/weights/pallet_identity.rs
+++ /dev/null
@@ -1,137 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
-
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Trait> pallet_identity::WeightInfo for WeightInfo<T> {
-	fn add_registrar(r: u32, ) -> Weight {
-		(39_603_000 as Weight)
-			.saturating_add((418_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn set_identity(r: u32, x: u32, ) -> Weight {
-		(110_679_000 as Weight)
-			.saturating_add((389_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((2_985_000 as Weight).saturating_mul(x as Weight))
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn set_subs_new(s: u32, ) -> Weight {
-		(78_697_000 as Weight)
-			.saturating_add((15_225_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
-	}
-	fn set_subs_old(p: u32, ) -> Weight {
-		(71_308_000 as Weight)
-			.saturating_add((5_772_000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
-	}
-	fn clear_identity(r: u32, s: u32, x: u32, ) -> Weight {
-		(91_553_000 as Weight)
-			.saturating_add((284_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((5_749_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add((1_621_000 as Weight).saturating_mul(x as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
-	}
-	fn request_judgement(r: u32, x: u32, ) -> Weight {
-		(110_856_000 as Weight)
-			.saturating_add((496_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((3_221_000 as Weight).saturating_mul(x as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn cancel_request(r: u32, x: u32, ) -> Weight {
-		(96_857_000 as Weight)
-			.saturating_add((311_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((3_204_000 as Weight).saturating_mul(x as Weight))
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn set_fee(r: u32, ) -> Weight {
-		(16_276_000 as Weight)
-			.saturating_add((381_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn set_account_id(r: u32, ) -> Weight {
-		(18_530_000 as Weight)
-			.saturating_add((391_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn set_fields(r: u32, ) -> Weight {
-		(16_359_000 as Weight)
-			.saturating_add((379_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn provide_judgement(r: u32, x: u32, ) -> Weight {
-		(72_869_000 as Weight)
-			.saturating_add((423_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((3_187_000 as Weight).saturating_mul(x as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn kill_identity(r: u32, s: u32, x: u32, ) -> Weight {
-		(123_199_000 as Weight)
-			.saturating_add((71_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((5_730_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add((2_000 as Weight).saturating_mul(x as Weight))
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
-			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
-	}
-	fn add_sub(s: u32, ) -> Weight {
-		(110_070_000 as Weight)
-			.saturating_add((262_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn rename_sub(s: u32, ) -> Weight {
-		(37_130_000 as Weight)
-			.saturating_add((79_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn remove_sub(s: u32, ) -> Weight {
-		(103_295_000 as Weight)
-			.saturating_add((235_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn quit_sub(s: u32, ) -> Weight {
-		(65_716_000 as Weight)
-			.saturating_add((227_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-}
diff --git a/bin/node/runtime/src/weights/pallet_im_online.rs b/bin/node/runtime/src/weights/pallet_im_online.rs
deleted file mode 100644
index a85672da51c5..000000000000
--- a/bin/node/runtime/src/weights/pallet_im_online.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
-
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Trait> pallet_im_online::WeightInfo for WeightInfo<T> {
-	fn validate_unsigned_and_then_heartbeat(k: u32, e: u32, ) -> Weight {
-		(139830000 as Weight)
-			.saturating_add((211000 as Weight).saturating_mul(k as Weight))
-			.saturating_add((654000 as Weight).saturating_mul(e as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-}
diff --git a/bin/node/runtime/src/weights/pallet_indices.rs b/bin/node/runtime/src/weights/pallet_indices.rs
deleted file mode 100644
index e8845f335289..000000000000
--- a/bin/node/runtime/src/weights/pallet_indices.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
-
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Trait> pallet_indices::WeightInfo for WeightInfo<T> {
-	fn claim() -> Weight {
-		(56_237_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn transfer() -> Weight {
-		(63_665_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn free() -> Weight {
-		(50_736_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn force_transfer() -> Weight {
-		(52_361_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn freeze() -> Weight {
-		(46_483_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-}
diff --git a/bin/node/runtime/src/weights/pallet_multisig.rs b/bin/node/runtime/src/weights/pallet_multisig.rs
deleted file mode 100644
index 0af7c7c75e1e..000000000000
--- a/bin/node/runtime/src/weights/pallet_multisig.rs
+++ /dev/null
@@ -1,91 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
-
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Trait> pallet_multisig::WeightInfo for WeightInfo<T> {
-	fn as_multi_threshold_1(z: u32, ) -> Weight {
-		(17_161_000 as Weight)
-			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
-	}
-	fn as_multi_create(s: u32, z: u32, ) -> Weight {
-		(79_857_000 as Weight)
-			.saturating_add((131_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn as_multi_create_store(s: u32, z: u32, ) -> Weight {
-		(90_218_000 as Weight)
-			.saturating_add((129_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add((3_000 as Weight).saturating_mul(z as Weight))
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn as_multi_approve(s: u32, z: u32, ) -> Weight {
-		(48_402_000 as Weight)
-			.saturating_add((132_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn as_multi_approve_store(s: u32, z: u32, ) -> Weight {
-		(88_390_000 as Weight)
-			.saturating_add((120_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add((3_000 as Weight).saturating_mul(z as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn as_multi_complete(s: u32, z: u32, ) -> Weight {
-		(98_960_000 as Weight)
-			.saturating_add((276_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add((6_000 as Weight).saturating_mul(z as Weight))
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
-			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-	}
-	fn approve_as_multi_create(s: u32, ) -> Weight {
-		(80_185_000 as Weight)
-			.saturating_add((121_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn approve_as_multi_approve(s: u32, ) -> Weight {
-		(48_386_000 as Weight)
-			.saturating_add((143_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn approve_as_multi_complete(s: u32, ) -> Weight {
-		(177_181_000 as Weight)
-			.saturating_add((273_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
-			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-	}
-	fn cancel_as_multi(s: u32, ) -> Weight {
-		(126_334_000 as Weight)
-			.saturating_add((124_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-}
diff --git a/bin/node/runtime/src/weights/pallet_proxy.rs b/bin/node/runtime/src/weights/pallet_proxy.rs
deleted file mode 100644
index c43b5db14ed9..000000000000
--- a/bin/node/runtime/src/weights/pallet_proxy.rs
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc5
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Trait> pallet_proxy::WeightInfo for WeightInfo<T> {
-	fn proxy(p: u32, ) -> Weight {
-		(26127000 as Weight)
-			.saturating_add((214000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-	}
-	fn proxy_announced(a: u32, p: u32, ) -> Weight {
-		(55405000 as Weight)
-			.saturating_add((774000 as Weight).saturating_mul(a as Weight))
-			.saturating_add((209000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn remove_announcement(a: u32, p: u32, ) -> Weight {
-		(35879000 as Weight)
-			.saturating_add((783000 as Weight).saturating_mul(a as Weight))
-			.saturating_add((20000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn reject_announcement(a: u32, p: u32, ) -> Weight {
-		(36097000 as Weight)
-			.saturating_add((780000 as Weight).saturating_mul(a as Weight))
-			.saturating_add((12000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn announce(a: u32, p: u32, ) -> Weight {
-		(53769000 as Weight)
-			.saturating_add((675000 as Weight).saturating_mul(a as Weight))
-			.saturating_add((214000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn add_proxy(p: u32, ) -> Weight {
-		(36082000 as Weight)
-			.saturating_add((234000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn remove_proxy(p: u32, ) -> Weight {
-		(32885000 as Weight)
-			.saturating_add((267000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn remove_proxies(p: u32, ) -> Weight {
-		(31735000 as Weight)
-			.saturating_add((215000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn anonymous(p: u32, ) -> Weight {
-		(50907000 as Weight)
-			.saturating_add((61000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn kill_anonymous(p: u32, ) -> Weight {
-		(33926000 as Weight)
-			.saturating_add((208000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-}
diff --git a/bin/node/runtime/src/weights/pallet_scheduler.rs b/bin/node/runtime/src/weights/pallet_scheduler.rs
deleted file mode 100644
index 895a28248831..000000000000
--- a/bin/node/runtime/src/weights/pallet_scheduler.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
-
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Trait> pallet_scheduler::WeightInfo for WeightInfo<T> {
-	fn schedule(s: u32, ) -> Weight {
-		(37_835_000 as Weight)
-			.saturating_add((81_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn cancel(s: u32, ) -> Weight {
-		(34_707_000 as Weight)
-			.saturating_add((3_125_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn schedule_named(s: u32, ) -> Weight {
-		(48_065_000 as Weight)
-			.saturating_add((110_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn cancel_named(s: u32, ) -> Weight {
-		(38_776_000 as Weight)
-			.saturating_add((3_138_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-}
diff --git a/bin/node/runtime/src/weights/pallet_session.rs b/bin/node/runtime/src/weights/pallet_session.rs
deleted file mode 100644
index 1ca5c29237b4..000000000000
--- a/bin/node/runtime/src/weights/pallet_session.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
-
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Trait> pallet_session::WeightInfo for WeightInfo<T> {
-	fn set_keys() -> Weight {
-		(88_411_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(6 as Weight))
-			.saturating_add(T::DbWeight::get().writes(5 as Weight))
-	}
-	fn purge_keys() -> Weight {
-		(51_843_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(5 as Weight))
-	}
-}
diff --git a/bin/node/runtime/src/weights/pallet_staking.rs b/bin/node/runtime/src/weights/pallet_staking.rs
deleted file mode 100644
index a4484a268594..000000000000
--- a/bin/node/runtime/src/weights/pallet_staking.rs
+++ /dev/null
@@ -1,171 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Default weights of pallet-staking.
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
-
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Trait> pallet_staking::WeightInfo for WeightInfo<T> {
-	fn bond() -> Weight {
-		(144278000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
-			.saturating_add(T::DbWeight::get().writes(4 as Weight))
-	}
-	fn bond_extra() -> Weight {
-		(110715000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn unbond() -> Weight {
-		(99840000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
-			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-	}
-	fn withdraw_unbonded_update(s: u32, ) -> Weight {
-		(100728000 as Weight)
-			.saturating_add((63000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
-			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-	}
-	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
-		(168879000 as Weight)
-			.saturating_add((6666000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(T::DbWeight::get().reads(7 as Weight))
-			.saturating_add(T::DbWeight::get().writes(8 as Weight))
-			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
-	}
-	fn validate() -> Weight {
-		(35539000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn nominate(n: u32, ) -> Weight {
-		(48596000 as Weight)
-			.saturating_add((308000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn chill() -> Weight {
-		(35144000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn set_payee() -> Weight {
-		(24255000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn set_controller() -> Weight {
-		(52294000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
-			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-	}
-	fn set_validator_count() -> Weight {
-		(5185000 as Weight)
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn force_no_eras() -> Weight {
-		(5907000 as Weight)
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn force_new_era() -> Weight {
-		(5917000 as Weight)
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn force_new_era_always() -> Weight {
-		(5952000 as Weight)
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn set_invulnerables(v: u32, ) -> Weight {
-		(6324000 as Weight)
-			.saturating_add((9000 as Weight).saturating_mul(v as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn force_unstake(s: u32, ) -> Weight {
-		(119691000 as Weight)
-			.saturating_add((6681000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().writes(8 as Weight))
-			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
-	}
-	fn cancel_deferred_slash(s: u32, ) -> Weight {
-		(5820201000 as Weight)
-			.saturating_add((34672000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn payout_stakers_dead_controller(n: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((92486000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
-			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(n as Weight)))
-	}
-	fn payout_stakers_alive_staked(n: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((117324000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads((5 as Weight).saturating_mul(n as Weight)))
-			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(n as Weight)))
-	}
-	fn rebond(l: u32, ) -> Weight {
-		(71316000 as Weight)
-			.saturating_add((142000 as Weight).saturating_mul(l as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-	}
-	fn set_history_depth(e: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((51901000 as Weight).saturating_mul(e as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(4 as Weight))
-			.saturating_add(T::DbWeight::get().writes((7 as Weight).saturating_mul(e as Weight)))
-	}
-	fn reap_stash(s: u32, ) -> Weight {
-		(147166000 as Weight)
-			.saturating_add((6661000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().writes(8 as Weight))
-			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
-	}
-	fn new_era(v: u32, n: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((1440459000 as Weight).saturating_mul(v as Weight))
-			.saturating_add((182580000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(10 as Weight))
-			.saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(v as Weight)))
-			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
-			.saturating_add(T::DbWeight::get().writes(8 as Weight))
-			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(v as Weight)))
-	}
-	fn submit_solution_better(v: u32, n: u32, a: u32, w: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((964000 as Weight).saturating_mul(v as Weight))
-			.saturating_add((432000 as Weight).saturating_mul(n as Weight))
-			.saturating_add((204294000 as Weight).saturating_mul(a as Weight))
-			.saturating_add((9546000 as Weight).saturating_mul(w as Weight))
-			.saturating_add(T::DbWeight::get().reads(6 as Weight))
-			.saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(a as Weight)))
-			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(w as Weight)))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-}
diff --git a/bin/node/runtime/src/weights/pallet_timestamp.rs b/bin/node/runtime/src/weights/pallet_timestamp.rs
deleted file mode 100644
index ee0dd77c63af..000000000000
--- a/bin/node/runtime/src/weights/pallet_timestamp.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc5
-
-#![allow(unused_parens)]
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Trait> pallet_timestamp::WeightInfo for WeightInfo<T> {
-	fn set() -> Weight {
-		(9133000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn on_finalize() -> Weight {
-		(5915000 as Weight)
-	}
-}
diff --git a/bin/node/runtime/src/weights/pallet_treasury.rs b/bin/node/runtime/src/weights/pallet_treasury.rs
deleted file mode 100644
index d8fe9b578b27..000000000000
--- a/bin/node/runtime/src/weights/pallet_treasury.rs
+++ /dev/null
@@ -1,140 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
-
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Trait> pallet_treasury::WeightInfo for WeightInfo<T> {
-	fn propose_spend() -> Weight {
-		(79604000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn reject_proposal() -> Weight {
-		(61001000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn approve_proposal() -> Weight {
-		(17835000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn report_awesome(r: u32, ) -> Weight {
-		(101602000 as Weight)
-			.saturating_add((2000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn retract_tip() -> Weight {
-		(82970000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn tip_new(r: u32, t: u32, ) -> Weight {
-		(63995000 as Weight)
-			.saturating_add((2000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((153000 as Weight).saturating_mul(t as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn tip(t: u32, ) -> Weight {
-		(46765000 as Weight)
-			.saturating_add((711000 as Weight).saturating_mul(t as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn close_tip(t: u32, ) -> Weight {
-		(160874000 as Weight)
-			.saturating_add((379000 as Weight).saturating_mul(t as Weight))
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
-			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-	}
-	fn propose_bounty(d: u32, ) -> Weight {
-		(86198000 as Weight)
-			.saturating_add((1000 as Weight).saturating_mul(d as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(4 as Weight))
-	}
-	fn approve_bounty() -> Weight {
-		(23063000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn propose_curator() -> Weight {
-		(18890000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn unassign_curator() -> Weight {
-		(66768000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn accept_curator() -> Weight {
-		(69131000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn award_bounty() -> Weight {
-		(48184000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn claim_bounty() -> Weight {
-		(243104000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().writes(5 as Weight))
-	}
-	fn close_bounty_proposed() -> Weight {
-		(65917000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-	}
-	fn close_bounty_active() -> Weight {
-		(157232000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
-			.saturating_add(T::DbWeight::get().writes(4 as Weight))
-	}
-	fn extend_bounty_expiry() -> Weight {
-		(46216000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn on_initialize_proposals(p: u32, ) -> Weight {
-		(119765000 as Weight)
-			.saturating_add((108368000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(p as Weight)))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(p as Weight)))
-	}
-	fn on_initialize_bounties(b: u32, ) -> Weight {
-		(112536000 as Weight)
-			.saturating_add((107132000 as Weight).saturating_mul(b as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(b as Weight)))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(b as Weight)))
-	}
-}
diff --git a/bin/node/runtime/src/weights/pallet_utility.rs b/bin/node/runtime/src/weights/pallet_utility.rs
deleted file mode 100644
index 5b2aace87cb6..000000000000
--- a/bin/node/runtime/src/weights/pallet_utility.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Weights for pallet_utility
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-02, STEPS: [50], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
-
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Trait> pallet_utility::WeightInfo for WeightInfo<T> {
-	fn batch(c: u32, ) -> Weight {
-		(20_803_000 as Weight)
-			.saturating_add((1_984_000 as Weight).saturating_mul(c as Weight))
-	}
-	fn as_derivative() -> Weight {
-		(5_853_000 as Weight)
-	}
-	fn batch_all(c: u32, ) -> Weight {
-		(21_104_000 as Weight)
-			.saturating_add((1_509_000 as Weight).saturating_mul(c as Weight))
-	}
-}
diff --git a/bin/node/runtime/src/weights/pallet_vesting.rs b/bin/node/runtime/src/weights/pallet_vesting.rs
deleted file mode 100644
index ac63b0177b81..000000000000
--- a/bin/node/runtime/src/weights/pallet_vesting.rs
+++ /dev/null
@@ -1,64 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
-
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Trait> pallet_vesting::WeightInfo for WeightInfo<T> {
-	fn vest_locked(l: u32, ) -> Weight {
-		(82109000 as Weight)
-			.saturating_add((332000 as Weight).saturating_mul(l as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn vest_unlocked(l: u32, ) -> Weight {
-		(88419000 as Weight)
-			.saturating_add((3000 as Weight).saturating_mul(l as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn vest_other_locked(l: u32, ) -> Weight {
-		(81277000 as Weight)
-			.saturating_add((321000 as Weight).saturating_mul(l as Weight))
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn vest_other_unlocked(l: u32, ) -> Weight {
-		(87584000 as Weight)
-			.saturating_add((19000 as Weight).saturating_mul(l as Weight))
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
-			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-	}
-	fn vested_transfer(l: u32, ) -> Weight {
-		(185916000 as Weight)
-			.saturating_add((625000 as Weight).saturating_mul(l as Weight))
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
-			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-	}
-	fn force_vested_transfer(l: u32, ) -> Weight {
-		(185916000 as Weight)
-			.saturating_add((625000 as Weight).saturating_mul(l as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().writes(4 as Weight))
-	}
-}
diff --git a/frame/balances/src/default_weight.rs b/frame/balances/src/default_weight.rs
deleted file mode 100644
index 47a919960056..000000000000
--- a/frame/balances/src/default_weight.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Weights for the Balances Pallet
-
-use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
-
-impl crate::WeightInfo for () {
-	fn transfer() -> Weight {
-		(65949000 as Weight)
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn transfer_keep_alive() -> Weight {
-		(46665000 as Weight)
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn set_balance_creating() -> Weight {
-		(27086000 as Weight)
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn set_balance_killing() -> Weight {
-		(33424000 as Weight)
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn force_transfer() -> Weight {
-		(65343000 as Weight)
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-}
diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index 422e112bdf27..fcf41bcf2627 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -154,14 +154,13 @@ mod tests;
 mod tests_local;
 mod tests_composite;
 mod benchmarking;
-mod default_weight;
+pub mod weights;
 
 use sp_std::prelude::*;
 use sp_std::{cmp, result, mem, fmt::Debug, ops::BitOr, convert::Infallible};
 use codec::{Codec, Encode, Decode};
 use frame_support::{
 	StorageValue, Parameter, decl_event, decl_storage, decl_module, decl_error, ensure,
-	weights::Weight,
 	traits::{
 		Currency, OnKilledAccount, OnUnbalanced, TryDrop, StoredMap,
 		WithdrawReason, WithdrawReasons, LockIdentifier, LockableCurrency, ExistenceRequirement,
@@ -178,14 +177,7 @@ use sp_runtime::{
 };
 use frame_system::{self as system, ensure_signed, ensure_root};
 pub use self::imbalances::{PositiveImbalance, NegativeImbalance};
-
-pub trait WeightInfo {
-	fn transfer() -> Weight;
-	fn transfer_keep_alive() -> Weight;
-	fn set_balance_creating() -> Weight;
-	fn set_balance_killing() -> Weight;
-	fn force_transfer() -> Weight;
-}
+pub use weights::WeightInfo;
 
 pub trait Subtrait<I: Instance = DefaultInstance>: frame_system::Trait {
 	/// The balance of an account.
diff --git a/frame/balances/src/weights.rs b/frame/balances/src/weights.rs
new file mode 100644
index 000000000000..45e4195f962d
--- /dev/null
+++ b/frame/balances/src/weights.rs
@@ -0,0 +1,123 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Weights for pallet_balances
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
+//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
+
+// Executed Command:
+// target/release/substrate
+// benchmark
+// --chain=dev
+// --steps=50
+// --repeat=20
+// --pallet=pallet_balances
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./frame/balances/src/weights.rs
+// --template=./.maintain/frame-weight-template.hbs
+
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for pallet_balances.
+pub trait WeightInfo {
+	fn transfer() -> Weight;
+	fn transfer_keep_alive() -> Weight;
+	fn set_balance_creating() -> Weight;
+	fn set_balance_killing() -> Weight;
+	fn force_transfer() -> Weight;
+	
+}
+
+/// Weights for pallet_balances using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+	fn transfer() -> Weight {
+		(94_088_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn transfer_keep_alive() -> Weight {
+		(64_828_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn set_balance_creating() -> Weight {
+		(36_151_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn set_balance_killing() -> Weight {
+		(45_505_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn force_transfer() -> Weight {
+		(92_986_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			
+	}
+	
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+	fn transfer() -> Weight {
+		(94_088_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn transfer_keep_alive() -> Weight {
+		(64_828_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn set_balance_creating() -> Weight {
+		(36_151_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn set_balance_killing() -> Weight {
+		(45_505_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn force_transfer() -> Weight {
+		(92_986_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			
+	}
+	
+}
diff --git a/frame/collective/src/default_weight.rs b/frame/collective/src/default_weight.rs
deleted file mode 100644
index bb6fe0ea2531..000000000000
--- a/frame/collective/src/default_weight.rs
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Default weights for the Collective Pallet
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
-
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
-
-impl crate::WeightInfo for () {
-	fn set_members(m: u32, n: u32, p: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((21040000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((173000 as Weight).saturating_mul(n as Weight))
-			.saturating_add((31595000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().reads((1 as Weight).saturating_mul(p as Weight)))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-			.saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
-	}
-	fn execute(b: u32, m: u32, ) -> Weight {
-		(43359000 as Weight)
-			.saturating_add((4000 as Weight).saturating_mul(b as Weight))
-			.saturating_add((123000 as Weight).saturating_mul(m as Weight))
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-	}
-	fn propose_execute(b: u32, m: u32, ) -> Weight {
-		(54134000 as Weight)
-			.saturating_add((4000 as Weight).saturating_mul(b as Weight))
-			.saturating_add((239000 as Weight).saturating_mul(m as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-	}
-	fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight {
-		(90650000 as Weight)
-			.saturating_add((5000 as Weight).saturating_mul(b as Weight))
-			.saturating_add((152000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((970000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-			.saturating_add(DbWeight::get().writes(4 as Weight))
-	}
-	fn vote(m: u32, ) -> Weight {
-		(74460000 as Weight)
-			.saturating_add((290000 as Weight).saturating_mul(m as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn close_early_disapproved(m: u32, p: u32, ) -> Weight {
-		(86360000 as Weight)
-			.saturating_add((232000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((954000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(DbWeight::get().reads(3 as Weight))
-			.saturating_add(DbWeight::get().writes(3 as Weight))
-	}
-	fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		(123653000 as Weight)
-			.saturating_add((1000 as Weight).saturating_mul(b as Weight))
-			.saturating_add((287000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((920000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-			.saturating_add(DbWeight::get().writes(3 as Weight))
-	}
-	fn close_disapproved(m: u32, p: u32, ) -> Weight {
-		(95395000 as Weight)
-			.saturating_add((236000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((965000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-			.saturating_add(DbWeight::get().writes(3 as Weight))
-	}
-	fn close_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		(135284000 as Weight)
-			.saturating_add((4000 as Weight).saturating_mul(b as Weight))
-			.saturating_add((218000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((951000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(DbWeight::get().reads(5 as Weight))
-			.saturating_add(DbWeight::get().writes(3 as Weight))
-	}
-	fn disapprove_proposal(p: u32, ) -> Weight {
-		(50500000 as Weight)
-			.saturating_add((966000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(3 as Weight))
-	}
-}
diff --git a/frame/collective/src/lib.rs b/frame/collective/src/lib.rs
index dd44f5e2aea9..b7d561672b82 100644
--- a/frame/collective/src/lib.rs
+++ b/frame/collective/src/lib.rs
@@ -63,7 +63,8 @@ use frame_system::{self as system, ensure_signed, ensure_root};
 #[cfg(feature = "runtime-benchmarks")]
 mod benchmarking;
 
-mod default_weight;
+pub mod weights;
+pub use weights::WeightInfo;
 
 /// Simple index type for proposal counting.
 pub type ProposalIndex = u32;
@@ -120,19 +121,6 @@ impl DefaultVote for MoreThanMajorityThenPrimeDefaultVote {
 	}
 }
 
-pub trait WeightInfo {
-	fn set_members(m: u32, n: u32, p: u32, ) -> Weight;
-	fn execute(b: u32, m: u32, ) -> Weight;
-	fn propose_execute(b: u32, m: u32, ) -> Weight;
-	fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight;
-	fn vote(m: u32, ) -> Weight;
-	fn close_early_disapproved(m: u32, p: u32, ) -> Weight;
-	fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight;
-	fn close_disapproved(m: u32, p: u32, ) -> Weight;
-	fn close_approved(b: u32, m: u32, p: u32, ) -> Weight;
-	fn disapprove_proposal(p: u32, ) -> Weight;
-}
-
 pub trait Trait<I: Instance=DefaultInstance>: frame_system::Trait {
 	/// The outer origin type.
 	type Origin: From<RawOrigin<Self::AccountId, I>>;
diff --git a/frame/collective/src/weights.rs b/frame/collective/src/weights.rs
new file mode 100644
index 000000000000..4e4ec5196d0a
--- /dev/null
+++ b/frame/collective/src/weights.rs
@@ -0,0 +1,230 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Weights for pallet_collective
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
+//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
+
+// Executed Command:
+// target/release/substrate
+// benchmark
+// --chain=dev
+// --steps=50
+// --repeat=20
+// --pallet=pallet_collective
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./frame/collective/src/weights.rs
+// --template=./.maintain/frame-weight-template.hbs
+
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for pallet_collective.
+pub trait WeightInfo {
+	fn set_members(_m: u32, _n: u32, _p: u32, ) -> Weight;
+	fn execute(_b: u32, _m: u32, ) -> Weight;
+	fn propose_execute(_b: u32, _m: u32, ) -> Weight;
+	fn propose_proposed(_b: u32, _m: u32, _p: u32, ) -> Weight;
+	fn vote(_m: u32, ) -> Weight;
+	fn close_early_disapproved(_m: u32, _p: u32, ) -> Weight;
+	fn close_early_approved(_b: u32, _m: u32, _p: u32, ) -> Weight;
+	fn close_disapproved(_m: u32, _p: u32, ) -> Weight;
+	fn close_approved(_b: u32, _m: u32, _p: u32, ) -> Weight;
+	fn disapprove_proposal(_p: u32, ) -> Weight;
+
+}
+
+/// Weights for pallet_collective using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+	fn set_members(m: u32, n: u32, p: u32, ) -> Weight {
+		(0 as Weight)
+			.saturating_add((20_933_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((254_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((28_233_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(p as Weight)))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
+	}
+	fn execute(b: u32, m: u32, ) -> Weight {
+		(31_147_000 as Weight)
+			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add((115_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+
+	}
+	fn propose_execute(b: u32, m: u32, ) -> Weight {
+		(38_774_000 as Weight)
+			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add((226_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+
+	}
+	fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight {
+		(64_230_000 as Weight)
+			.saturating_add((5_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add((138_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((637_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().writes(4 as Weight))
+
+	}
+	fn vote(m: u32, ) -> Weight {
+		(57_051_000 as Weight)
+			.saturating_add((220_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+
+	}
+	fn close_early_disapproved(m: u32, p: u32, ) -> Weight {
+		(61_406_000 as Weight)
+			.saturating_add((225_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((630_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+
+	}
+	fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight {
+		(92_864_000 as Weight)
+			.saturating_add((1_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add((233_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((597_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+
+	}
+	fn close_disapproved(m: u32, p: u32, ) -> Weight {
+		(67_942_000 as Weight)
+			.saturating_add((232_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((636_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+
+	}
+	fn close_approved(b: u32, m: u32, p: u32, ) -> Weight {
+		(99_742_000 as Weight)
+			.saturating_add((1_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add((233_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((598_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+
+	}
+	fn disapprove_proposal(p: u32, ) -> Weight {
+		(36_628_000 as Weight)
+			.saturating_add((640_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+
+	}
+
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+	fn set_members(m: u32, n: u32, p: u32, ) -> Weight {
+		(0 as Weight)
+			.saturating_add((20_933_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((254_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((28_233_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(p as Weight)))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
+	}
+	fn execute(b: u32, m: u32, ) -> Weight {
+		(31_147_000 as Weight)
+			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add((115_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+
+	}
+	fn propose_execute(b: u32, m: u32, ) -> Weight {
+		(38_774_000 as Weight)
+			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add((226_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+
+	}
+	fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight {
+		(64_230_000 as Weight)
+			.saturating_add((5_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add((138_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((637_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
+
+	}
+	fn vote(m: u32, ) -> Weight {
+		(57_051_000 as Weight)
+			.saturating_add((220_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+
+	}
+	fn close_early_disapproved(m: u32, p: u32, ) -> Weight {
+		(61_406_000 as Weight)
+			.saturating_add((225_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((630_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+
+	}
+	fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight {
+		(92_864_000 as Weight)
+			.saturating_add((1_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add((233_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((597_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+
+	}
+	fn close_disapproved(m: u32, p: u32, ) -> Weight {
+		(67_942_000 as Weight)
+			.saturating_add((232_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((636_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+
+	}
+	fn close_approved(b: u32, m: u32, p: u32, ) -> Weight {
+		(99_742_000 as Weight)
+			.saturating_add((1_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add((233_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((598_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+
+	}
+	fn disapprove_proposal(p: u32, ) -> Weight {
+		(36_628_000 as Weight)
+			.saturating_add((640_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+
+	}
+
+}
diff --git a/frame/democracy/src/default_weight.rs b/frame/democracy/src/default_weight.rs
deleted file mode 100644
index 28aa45ae2d60..000000000000
--- a/frame/democracy/src/default_weight.rs
+++ /dev/null
@@ -1,171 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Weights for pallet_democracy
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-09-24, STEPS: [50], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
-
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
-
-impl crate::WeightInfo for () {
-	fn propose() -> Weight {
-		(96_316_000 as Weight)
-			.saturating_add(DbWeight::get().reads(3 as Weight))
-			.saturating_add(DbWeight::get().writes(3 as Weight))
-	}
-	fn second(s: u32, ) -> Weight {
-		(58_386_000 as Weight)
-			.saturating_add((259_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn vote_new(r: u32, ) -> Weight {
-		(70_374_000 as Weight)
-			.saturating_add((291_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(3 as Weight))
-			.saturating_add(DbWeight::get().writes(3 as Weight))
-	}
-	fn vote_existing(r: u32, ) -> Weight {
-		(70_097_000 as Weight)
-			.saturating_add((296_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(3 as Weight))
-			.saturating_add(DbWeight::get().writes(3 as Weight))
-	}
-	fn emergency_cancel() -> Weight {
-		(41_731_000 as Weight)
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn blacklist(p: u32, ) -> Weight {
-		(117_847_000 as Weight)
-			.saturating_add((871_000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(DbWeight::get().reads(5 as Weight))
-			.saturating_add(DbWeight::get().writes(6 as Weight))
-	}
-	fn external_propose(v: u32, ) -> Weight {
-		(20_972_000 as Weight)
-			.saturating_add((114_000 as Weight).saturating_mul(v as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn external_propose_majority() -> Weight {
-		(5_030_000 as Weight)
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn external_propose_default() -> Weight {
-		(4_981_000 as Weight)
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn fast_track() -> Weight {
-		(42_801_000 as Weight)
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(3 as Weight))
-	}
-	fn veto_external(v: u32, ) -> Weight {
-		(44_115_000 as Weight)
-			.saturating_add((194_000 as Weight).saturating_mul(v as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn cancel_proposal(p: u32, ) -> Weight {
-		(73_937_000 as Weight)
-			.saturating_add((962_000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(DbWeight::get().reads(3 as Weight))
-			.saturating_add(DbWeight::get().writes(3 as Weight))
-	}
-	fn cancel_referendum() -> Weight {
-		(25_233_000 as Weight)
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn cancel_queued(r: u32, ) -> Weight {
-		(48_251_000 as Weight)
-			.saturating_add((3_590_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn on_initialize_base(r: u32, ) -> Weight {
-		(17_597_000 as Weight)
-			.saturating_add((7_248_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(5 as Weight))
-			.saturating_add(DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
-	}
-	fn delegate(r: u32, ) -> Weight {
-		(93_916_000 as Weight)
-			.saturating_add((10_794_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-			.saturating_add(DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
-			.saturating_add(DbWeight::get().writes(4 as Weight))
-			.saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight)))
-	}
-	fn undelegate(r: u32, ) -> Weight {
-		(47_855_000 as Weight)
-			.saturating_add((10_805_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-			.saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight)))
-	}
-	fn clear_public_proposals() -> Weight {
-		(4_864_000 as Weight)
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn note_preimage(b: u32, ) -> Weight {
-		(66_754_000 as Weight)
-			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn note_imminent_preimage(b: u32, ) -> Weight {
-		(44_664_000 as Weight)
-			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn reap_preimage(b: u32, ) -> Weight {
-		(59_968_000 as Weight)
-			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn unlock_remove(r: u32, ) -> Weight {
-		(58_573_000 as Weight)
-			.saturating_add((131_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(3 as Weight))
-			.saturating_add(DbWeight::get().writes(3 as Weight))
-	}
-	fn unlock_set(r: u32, ) -> Weight {
-		(53_831_000 as Weight)
-			.saturating_add((324_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(3 as Weight))
-			.saturating_add(DbWeight::get().writes(3 as Weight))
-	}
-	fn remove_vote(r: u32, ) -> Weight {
-		(31_846_000 as Weight)
-			.saturating_add((327_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn remove_other_vote(r: u32, ) -> Weight {
-		(31_880_000 as Weight)
-			.saturating_add((222_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-}
diff --git a/frame/democracy/src/lib.rs b/frame/democracy/src/lib.rs
index 884106a63b32..2eb0f89f3aed 100644
--- a/frame/democracy/src/lib.rs
+++ b/frame/democracy/src/lib.rs
@@ -173,7 +173,8 @@ mod vote_threshold;
 mod vote;
 mod conviction;
 mod types;
-mod default_weight;
+pub mod weights;
+pub use weights::WeightInfo;
 pub use vote_threshold::{Approved, VoteThreshold};
 pub use vote::{Vote, AccountVote, Voting};
 pub use conviction::Conviction;
@@ -202,34 +203,6 @@ type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trai
 type NegativeImbalanceOf<T> =
 	<<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::NegativeImbalance;
 
-pub trait WeightInfo {
-	fn propose() -> Weight;
-	fn second(s: u32, ) -> Weight;
-	fn vote_new(r: u32, ) -> Weight;
-	fn vote_existing(r: u32, ) -> Weight;
-	fn emergency_cancel() -> Weight;
-	fn blacklist(p: u32, ) -> Weight;
-	fn external_propose(v: u32, ) -> Weight;
-	fn external_propose_majority() -> Weight;
-	fn external_propose_default() -> Weight;
-	fn fast_track() -> Weight;
-	fn veto_external(v: u32, ) -> Weight;
-	fn cancel_referendum() -> Weight;
-	fn cancel_proposal(p: u32, ) -> Weight;
-	fn cancel_queued(r: u32, ) -> Weight;
-	fn on_initialize_base(r: u32, ) -> Weight;
-	fn delegate(r: u32, ) -> Weight;
-	fn undelegate(r: u32, ) -> Weight;
-	fn clear_public_proposals() -> Weight;
-	fn note_preimage(b: u32, ) -> Weight;
-	fn note_imminent_preimage(b: u32, ) -> Weight;
-	fn reap_preimage(b: u32, ) -> Weight;
-	fn unlock_remove(r: u32, ) -> Weight;
-	fn unlock_set(r: u32, ) -> Weight;
-	fn remove_vote(r: u32, ) -> Weight;
-	fn remove_other_vote(r: u32, ) -> Weight;
-}
-
 pub trait Trait: frame_system::Trait + Sized {
 	type Proposal: Parameter + Dispatchable<Origin=Self::Origin> + From<Call<Self>>;
 	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
diff --git a/frame/democracy/src/weights.rs b/frame/democracy/src/weights.rs
new file mode 100644
index 000000000000..9d17d3a76808
--- /dev/null
+++ b/frame/democracy/src/weights.rs
@@ -0,0 +1,415 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Weights for pallet_democracy
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
+//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
+
+// Executed Command:
+// target/release/substrate
+// benchmark
+// --chain=dev
+// --steps=50
+// --repeat=20
+// --pallet=pallet_democracy
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./frame/democracy/src/weights.rs
+// --template=./.maintain/frame-weight-template.hbs
+
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for pallet_democracy.
+pub trait WeightInfo {
+	fn propose() -> Weight;
+	fn second(_s: u32, ) -> Weight;
+	fn vote_new(_r: u32, ) -> Weight;
+	fn vote_existing(_r: u32, ) -> Weight;
+	fn emergency_cancel() -> Weight;
+	fn blacklist(_p: u32, ) -> Weight;
+	fn external_propose(_v: u32, ) -> Weight;
+	fn external_propose_majority() -> Weight;
+	fn external_propose_default() -> Weight;
+	fn fast_track() -> Weight;
+	fn veto_external(_v: u32, ) -> Weight;
+	fn cancel_proposal(_p: u32, ) -> Weight;
+	fn cancel_referendum() -> Weight;
+	fn cancel_queued(_r: u32, ) -> Weight;
+	fn on_initialize_base(_r: u32, ) -> Weight;
+	fn delegate(_r: u32, ) -> Weight;
+	fn undelegate(_r: u32, ) -> Weight;
+	fn clear_public_proposals() -> Weight;
+	fn note_preimage(_b: u32, ) -> Weight;
+	fn note_imminent_preimage(_b: u32, ) -> Weight;
+	fn reap_preimage(_b: u32, ) -> Weight;
+	fn unlock_remove(_r: u32, ) -> Weight;
+	fn unlock_set(_r: u32, ) -> Weight;
+	fn remove_vote(_r: u32, ) -> Weight;
+	fn remove_other_vote(_r: u32, ) -> Weight;
+
+}
+
+/// Weights for pallet_democracy using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+	fn propose() -> Weight {
+		(86_479_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+
+	}
+	fn second(s: u32, ) -> Weight {
+		(52_126_000 as Weight)
+			.saturating_add((211_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+
+	}
+	fn vote_new(r: u32, ) -> Weight {
+		(62_010_000 as Weight)
+			.saturating_add((288_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+
+	}
+	fn vote_existing(r: u32, ) -> Weight {
+		(61_870_000 as Weight)
+			.saturating_add((294_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+
+	}
+	fn emergency_cancel() -> Weight {
+		(37_329_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+
+	}
+	fn blacklist(p: u32, ) -> Weight {
+		(105_595_000 as Weight)
+			.saturating_add((812_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(6 as Weight))
+
+	}
+	fn external_propose(v: u32, ) -> Weight {
+		(18_670_000 as Weight)
+			.saturating_add((110_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+
+	}
+	fn external_propose_majority() -> Weight {
+		(4_413_000 as Weight)
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+
+	}
+	fn external_propose_default() -> Weight {
+		(4_365_000 as Weight)
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+
+	}
+	fn fast_track() -> Weight {
+		(37_914_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+
+	}
+	fn veto_external(v: u32, ) -> Weight {
+		(38_965_000 as Weight)
+			.saturating_add((188_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+
+	}
+	fn cancel_proposal(p: u32, ) -> Weight {
+		(66_560_000 as Weight)
+			.saturating_add((898_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+
+	}
+	fn cancel_referendum() -> Weight {
+		(22_971_000 as Weight)
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+
+	}
+	fn cancel_queued(r: u32, ) -> Weight {
+		(41_431_000 as Weight)
+			.saturating_add((4_598_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+
+	}
+	fn on_initialize_base(r: u32, ) -> Weight {
+		(14_908_000 as Weight)
+			.saturating_add((6_638_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
+
+	}
+	fn delegate(r: u32, ) -> Weight {
+		(82_620_000 as Weight)
+			.saturating_add((9_780_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(T::DbWeight::get().writes(4 as Weight))
+			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight)))
+	}
+	fn undelegate(r: u32, ) -> Weight {
+		(40_817_000 as Weight)
+			.saturating_add((9_870_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight)))
+	}
+	fn clear_public_proposals() -> Weight {
+		(4_071_000 as Weight)
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+
+	}
+	fn note_preimage(b: u32, ) -> Weight {
+		(58_361_000 as Weight)
+			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+
+	}
+	fn note_imminent_preimage(b: u32, ) -> Weight {
+		(39_294_000 as Weight)
+			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+
+	}
+	fn reap_preimage(b: u32, ) -> Weight {
+		(52_829_000 as Weight)
+			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+
+	}
+	fn unlock_remove(r: u32, ) -> Weight {
+		(52_058_000 as Weight)
+			.saturating_add((131_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+
+	}
+	fn unlock_set(r: u32, ) -> Weight {
+		(47_488_000 as Weight)
+			.saturating_add((317_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+
+	}
+	fn remove_vote(r: u32, ) -> Weight {
+		(28_231_000 as Weight)
+			.saturating_add((311_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+
+	}
+	fn remove_other_vote(r: u32, ) -> Weight {
+		(27_743_000 as Weight)
+			.saturating_add((217_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+
+	}
+
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+	fn propose() -> Weight {
+		(86_479_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+
+	}
+	fn second(s: u32, ) -> Weight {
+		(52_126_000 as Weight)
+			.saturating_add((211_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+
+	}
+	fn vote_new(r: u32, ) -> Weight {
+		(62_010_000 as Weight)
+			.saturating_add((288_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+
+	}
+	fn vote_existing(r: u32, ) -> Weight {
+		(61_870_000 as Weight)
+			.saturating_add((294_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+
+	}
+	fn emergency_cancel() -> Weight {
+		(37_329_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+
+	}
+	fn blacklist(p: u32, ) -> Weight {
+		(105_595_000 as Weight)
+			.saturating_add((812_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(6 as Weight))
+
+	}
+	fn external_propose(v: u32, ) -> Weight {
+		(18_670_000 as Weight)
+			.saturating_add((110_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+
+	}
+	fn external_propose_majority() -> Weight {
+		(4_413_000 as Weight)
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+
+	}
+	fn external_propose_default() -> Weight {
+		(4_365_000 as Weight)
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+
+	}
+	fn fast_track() -> Weight {
+		(37_914_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+
+	}
+	fn veto_external(v: u32, ) -> Weight {
+		(38_965_000 as Weight)
+			.saturating_add((188_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+
+	}
+	fn cancel_proposal(p: u32, ) -> Weight {
+		(66_560_000 as Weight)
+			.saturating_add((898_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+
+	}
+	fn cancel_referendum() -> Weight {
+		(22_971_000 as Weight)
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+
+	}
+	fn cancel_queued(r: u32, ) -> Weight {
+		(41_431_000 as Weight)
+			.saturating_add((4_598_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+
+	}
+	fn on_initialize_base(r: u32, ) -> Weight {
+		(14_908_000 as Weight)
+			.saturating_add((6_638_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
+
+	}
+	fn delegate(r: u32, ) -> Weight {
+		(82_620_000 as Weight)
+			.saturating_add((9_780_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(r as Weight)))
+	}
+	fn undelegate(r: u32, ) -> Weight {
+		(40_817_000 as Weight)
+			.saturating_add((9_870_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(r as Weight)))
+	}
+	fn clear_public_proposals() -> Weight {
+		(4_071_000 as Weight)
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+
+	}
+	fn note_preimage(b: u32, ) -> Weight {
+		(58_361_000 as Weight)
+			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+
+	}
+	fn note_imminent_preimage(b: u32, ) -> Weight {
+		(39_294_000 as Weight)
+			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+
+	}
+	fn reap_preimage(b: u32, ) -> Weight {
+		(52_829_000 as Weight)
+			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+
+	}
+	fn unlock_remove(r: u32, ) -> Weight {
+		(52_058_000 as Weight)
+			.saturating_add((131_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+
+	}
+	fn unlock_set(r: u32, ) -> Weight {
+		(47_488_000 as Weight)
+			.saturating_add((317_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+
+	}
+	fn remove_vote(r: u32, ) -> Weight {
+		(28_231_000 as Weight)
+			.saturating_add((311_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+
+	}
+	fn remove_other_vote(r: u32, ) -> Weight {
+		(27_743_000 as Weight)
+			.saturating_add((217_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+
+	}
+
+}
diff --git a/frame/elections-phragmen/src/default_weights.rs b/frame/elections-phragmen/src/default_weights.rs
deleted file mode 100644
index 4025e61d15af..000000000000
--- a/frame/elections-phragmen/src/default_weights.rs
+++ /dev/null
@@ -1,88 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
-
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
-
-impl crate::WeightInfo for () {
-	fn vote(v: u32, ) -> Weight {
-		(91_489_000 as Weight)
-			.saturating_add((199_000 as Weight).saturating_mul(v as Weight))
-			.saturating_add(DbWeight::get().reads(5 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn vote_update(v: u32, ) -> Weight {
-		(56_511_000 as Weight)
-			.saturating_add((245_000 as Weight).saturating_mul(v as Weight))
-			.saturating_add(DbWeight::get().reads(5 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn remove_voter() -> Weight {
-		(76_714_000 as Weight)
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn report_defunct_voter_correct(c: u32, v: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((1_743_000 as Weight).saturating_mul(c as Weight))
-			.saturating_add((31_750_000 as Weight).saturating_mul(v as Weight))
-			.saturating_add(DbWeight::get().reads(7 as Weight))
-			.saturating_add(DbWeight::get().writes(3 as Weight))
-	}
-	fn report_defunct_voter_incorrect(c: u32, v: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((1_733_000 as Weight).saturating_mul(c as Weight))
-			.saturating_add((31_861_000 as Weight).saturating_mul(v as Weight))
-			.saturating_add(DbWeight::get().reads(6 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn submit_candidacy(c: u32, ) -> Weight {
-		(74_714_000 as Weight)
-			.saturating_add((315_000 as Weight).saturating_mul(c as Weight))
-			.saturating_add(DbWeight::get().reads(3 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn renounce_candidacy_candidate(c: u32, ) -> Weight {
-		(50_408_000 as Weight)
-			.saturating_add((159_000 as Weight).saturating_mul(c as Weight))
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn renounce_candidacy_members() -> Weight {
-		(79_626_000 as Weight)
-			.saturating_add(DbWeight::get().reads(3 as Weight))
-			.saturating_add(DbWeight::get().writes(4 as Weight))
-	}
-	fn renounce_candidacy_runners_up() -> Weight {
-		(49_715_000 as Weight)
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn remove_member_with_replacement() -> Weight {
-		(76_572_000 as Weight)
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-			.saturating_add(DbWeight::get().writes(5 as Weight))
-	}
-	fn remove_member_wrong_refund() -> Weight {
-		(8_777_000 as Weight)
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-	}
-}
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index f743c3cde813..ba4606b9858c 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -105,7 +105,8 @@ use sp_runtime::{
 use sp_std::prelude::*;
 
 mod benchmarking;
-mod default_weights;
+pub mod weights;
+pub use weights::WeightInfo;
 
 /// The maximum votes allowed per voter.
 pub const MAXIMUM_VOTE: usize = 16;
@@ -139,20 +140,6 @@ pub struct DefunctVoter<AccountId> {
 	pub candidate_count: u32
 }
 
-pub trait WeightInfo {
-	fn vote(v: u32, ) -> Weight;
-	fn vote_update(v: u32, ) -> Weight;
-	fn remove_voter() -> Weight;
-	fn report_defunct_voter_correct(c: u32, v: u32, ) -> Weight;
-	fn report_defunct_voter_incorrect(c: u32, v: u32, ) -> Weight;
-	fn submit_candidacy(c: u32, ) -> Weight;
-	fn renounce_candidacy_candidate(c: u32, ) -> Weight;
-	fn renounce_candidacy_members() -> Weight;
-	fn renounce_candidacy_runners_up() -> Weight;
-	fn remove_member_with_replacement() -> Weight;
-	fn remove_member_wrong_refund() -> Weight;
-}
-
 pub trait Trait: frame_system::Trait {
 	/// The overarching event type.c
 	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
@@ -2443,7 +2430,7 @@ mod tests {
 			assert_err_with_weight!(
 				Elections::remove_member(Origin::root(), 4, true),
 				Error::<Test>::InvalidReplacement,
-				Some(33777000), // only thing that matters for now is that it is NOT the full block.
+				Some(33489000), // only thing that matters for now is that it is NOT the full block.
 			);
 		});
 
@@ -2465,7 +2452,7 @@ mod tests {
 			assert_err_with_weight!(
 				Elections::remove_member(Origin::root(), 4, false),
 				Error::<Test>::InvalidReplacement,
-				Some(33777000) // only thing that matters for now is that it is NOT the full block.
+				Some(33489000) // only thing that matters for now is that it is NOT the full block.
 			);
 		});
 	}
diff --git a/frame/elections-phragmen/src/weights.rs b/frame/elections-phragmen/src/weights.rs
new file mode 100644
index 000000000000..2702aec0a01c
--- /dev/null
+++ b/frame/elections-phragmen/src/weights.rs
@@ -0,0 +1,215 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Weights for pallet_elections_phragmen
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
+//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
+
+// Executed Command:
+// target/release/substrate
+// benchmark
+// --chain=dev
+// --steps=50
+// --repeat=20
+// --pallet=pallet_elections_phragmen
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./frame/elections-phragmen/src/weights.rs
+// --template=./.maintain/frame-weight-template.hbs
+
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for pallet_elections_phragmen.
+pub trait WeightInfo {
+	fn vote(_v: u32, ) -> Weight;
+	fn vote_update(_v: u32, ) -> Weight;
+	fn remove_voter() -> Weight;
+	fn report_defunct_voter_correct(_c: u32, _v: u32, ) -> Weight;
+	fn report_defunct_voter_incorrect(_c: u32, _v: u32, ) -> Weight;
+	fn submit_candidacy(_c: u32, ) -> Weight;
+	fn renounce_candidacy_candidate(_c: u32, ) -> Weight;
+	fn renounce_candidacy_members() -> Weight;
+	fn renounce_candidacy_runners_up() -> Weight;
+	fn remove_member_with_replacement() -> Weight;
+	fn remove_member_wrong_refund() -> Weight;
+	
+}
+
+/// Weights for pallet_elections_phragmen using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+	fn vote(v: u32, ) -> Weight {
+		(89_627_000 as Weight)
+			.saturating_add((197_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			
+	}
+	fn vote_update(v: u32, ) -> Weight {
+		(54_724_000 as Weight)
+			.saturating_add((213_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			
+	}
+	fn remove_voter() -> Weight {
+		(73_774_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			
+	}
+	fn report_defunct_voter_correct(c: u32, v: u32, ) -> Weight {
+		(0 as Weight)
+			.saturating_add((1_746_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((31_383_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add(T::DbWeight::get().reads(7 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+			
+	}
+	fn report_defunct_voter_incorrect(c: u32, v: u32, ) -> Weight {
+		(0 as Weight)
+			.saturating_add((1_725_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((31_293_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add(T::DbWeight::get().reads(6 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			
+	}
+	fn submit_candidacy(c: u32, ) -> Weight {
+		(73_403_000 as Weight)
+			.saturating_add((314_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn renounce_candidacy_candidate(c: u32, ) -> Weight {
+		(48_834_000 as Weight)
+			.saturating_add((187_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn renounce_candidacy_members() -> Weight {
+		(78_402_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(4 as Weight))
+			
+	}
+	fn renounce_candidacy_runners_up() -> Weight {
+		(49_054_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn remove_member_with_replacement() -> Weight {
+		(75_421_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().writes(5 as Weight))
+			
+	}
+	fn remove_member_wrong_refund() -> Weight {
+		(8_489_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			
+	}
+	
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+	fn vote(v: u32, ) -> Weight {
+		(89_627_000 as Weight)
+			.saturating_add((197_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			
+	}
+	fn vote_update(v: u32, ) -> Weight {
+		(54_724_000 as Weight)
+			.saturating_add((213_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			
+	}
+	fn remove_voter() -> Weight {
+		(73_774_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			
+	}
+	fn report_defunct_voter_correct(c: u32, v: u32, ) -> Weight {
+		(0 as Weight)
+			.saturating_add((1_746_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((31_383_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+			
+	}
+	fn report_defunct_voter_incorrect(c: u32, v: u32, ) -> Weight {
+		(0 as Weight)
+			.saturating_add((1_725_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((31_293_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			
+	}
+	fn submit_candidacy(c: u32, ) -> Weight {
+		(73_403_000 as Weight)
+			.saturating_add((314_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn renounce_candidacy_candidate(c: u32, ) -> Weight {
+		(48_834_000 as Weight)
+			.saturating_add((187_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn renounce_candidacy_members() -> Weight {
+		(78_402_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
+			
+	}
+	fn renounce_candidacy_runners_up() -> Weight {
+		(49_054_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn remove_member_with_replacement() -> Weight {
+		(75_421_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
+			
+	}
+	fn remove_member_wrong_refund() -> Weight {
+		(8_489_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			
+	}
+	
+}
diff --git a/frame/identity/src/default_weights.rs b/frame/identity/src/default_weights.rs
deleted file mode 100644
index 93b1c89ab93d..000000000000
--- a/frame/identity/src/default_weights.rs
+++ /dev/null
@@ -1,135 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
-
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
-
-impl crate::WeightInfo for () {
-	fn add_registrar(r: u32, ) -> Weight {
-		(39_603_000 as Weight)
-			.saturating_add((418_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn set_identity(r: u32, x: u32, ) -> Weight {
-		(110_679_000 as Weight)
-			.saturating_add((389_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((2_985_000 as Weight).saturating_mul(x as Weight))
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn set_subs_new(s: u32, ) -> Weight {
-		(78_697_000 as Weight)
-			.saturating_add((15_225_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-			.saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
-	}
-	fn set_subs_old(p: u32, ) -> Weight {
-		(71_308_000 as Weight)
-			.saturating_add((5_772_000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-			.saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
-	}
-	fn clear_identity(r: u32, s: u32, x: u32, ) -> Weight {
-		(91_553_000 as Weight)
-			.saturating_add((284_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((5_749_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add((1_621_000 as Weight).saturating_mul(x as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-			.saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
-	}
-	fn request_judgement(r: u32, x: u32, ) -> Weight {
-		(110_856_000 as Weight)
-			.saturating_add((496_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((3_221_000 as Weight).saturating_mul(x as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn cancel_request(r: u32, x: u32, ) -> Weight {
-		(96_857_000 as Weight)
-			.saturating_add((311_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((3_204_000 as Weight).saturating_mul(x as Weight))
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn set_fee(r: u32, ) -> Weight {
-		(16_276_000 as Weight)
-			.saturating_add((381_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn set_account_id(r: u32, ) -> Weight {
-		(18_530_000 as Weight)
-			.saturating_add((391_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn set_fields(r: u32, ) -> Weight {
-		(16_359_000 as Weight)
-			.saturating_add((379_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn provide_judgement(r: u32, x: u32, ) -> Weight {
-		(72_869_000 as Weight)
-			.saturating_add((423_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((3_187_000 as Weight).saturating_mul(x as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn kill_identity(r: u32, s: u32, x: u32, ) -> Weight {
-		(123_199_000 as Weight)
-			.saturating_add((71_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((5_730_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add((2_000 as Weight).saturating_mul(x as Weight))
-			.saturating_add(DbWeight::get().reads(3 as Weight))
-			.saturating_add(DbWeight::get().writes(3 as Weight))
-			.saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
-	}
-	fn add_sub(s: u32, ) -> Weight {
-		(110_070_000 as Weight)
-			.saturating_add((262_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(DbWeight::get().reads(3 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn rename_sub(s: u32, ) -> Weight {
-		(37_130_000 as Weight)
-			.saturating_add((79_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn remove_sub(s: u32, ) -> Weight {
-		(103_295_000 as Weight)
-			.saturating_add((235_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(DbWeight::get().reads(3 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn quit_sub(s: u32, ) -> Weight {
-		(65_716_000 as Weight)
-			.saturating_add((227_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-}
diff --git a/frame/identity/src/lib.rs b/frame/identity/src/lib.rs
index 1ff69af9a903..0ee6563a5611 100644
--- a/frame/identity/src/lib.rs
+++ b/frame/identity/src/lib.rs
@@ -72,6 +72,11 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
+#[cfg(test)]
+mod tests;
+mod benchmarking;
+pub mod weights;
+
 use sp_std::prelude::*;
 use sp_std::{fmt::Debug, ops::Add, iter::once};
 use enumflags2::BitFlags;
@@ -82,37 +87,13 @@ use frame_support::{
 	decl_module, decl_event, decl_storage, ensure, decl_error,
 	dispatch::DispatchResultWithPostInfo,
 	traits::{Currency, ReservableCurrency, OnUnbalanced, Get, BalanceStatus, EnsureOrigin},
-	weights::Weight,
 };
 use frame_system::ensure_signed;
-
-#[cfg(test)]
-mod tests;
-mod benchmarking;
-mod default_weights;
+pub use weights::WeightInfo;
 
 type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
 type NegativeImbalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::NegativeImbalance;
 
-pub trait WeightInfo {
-	fn add_registrar(r: u32, ) -> Weight;
-	fn set_identity(r: u32, x: u32, ) -> Weight;
-	fn set_subs_new(s: u32, ) -> Weight;
-	fn set_subs_old(p: u32, ) -> Weight;
-	fn add_sub(p: u32, ) -> Weight;
-	fn rename_sub(p: u32, ) -> Weight;
-	fn remove_sub(p: u32, ) -> Weight;
-	fn quit_sub(p: u32, ) -> Weight;
-	fn clear_identity(r: u32, s: u32, x: u32, ) -> Weight;
-	fn request_judgement(r: u32, x: u32, ) -> Weight;
-	fn cancel_request(r: u32, x: u32, ) -> Weight;
-	fn set_fee(r: u32, ) -> Weight;
-	fn set_account_id(r: u32, ) -> Weight;
-	fn set_fields(r: u32, ) -> Weight;
-	fn provide_judgement(r: u32, x: u32, ) -> Weight;
-	fn kill_identity(r: u32, s: u32, x: u32, ) -> Weight;
-}
-
 pub trait Trait: frame_system::Trait {
 	/// The overarching event type.
 	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
diff --git a/frame/identity/src/weights.rs b/frame/identity/src/weights.rs
new file mode 100644
index 000000000000..44efbb31035e
--- /dev/null
+++ b/frame/identity/src/weights.rs
@@ -0,0 +1,312 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Weights for pallet_identity
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
+//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
+
+// Executed Command:
+// target/release/substrate
+// benchmark
+// --chain=dev
+// --steps=50
+// --repeat=20
+// --pallet=pallet_identity
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./frame/identity/src/weights.rs
+// --template=./.maintain/frame-weight-template.hbs
+
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for pallet_identity.
+pub trait WeightInfo {
+	fn add_registrar(_r: u32, ) -> Weight;
+	fn set_identity(_r: u32, _x: u32, ) -> Weight;
+	fn set_subs_new(_s: u32, ) -> Weight;
+	fn set_subs_old(_p: u32, ) -> Weight;
+	fn clear_identity(_r: u32, _s: u32, _x: u32, ) -> Weight;
+	fn request_judgement(_r: u32, _x: u32, ) -> Weight;
+	fn cancel_request(_r: u32, _x: u32, ) -> Weight;
+	fn set_fee(_r: u32, ) -> Weight;
+	fn set_account_id(_r: u32, ) -> Weight;
+	fn set_fields(_r: u32, ) -> Weight;
+	fn provide_judgement(_r: u32, _x: u32, ) -> Weight;
+	fn kill_identity(_r: u32, _s: u32, _x: u32, ) -> Weight;
+	fn add_sub(_s: u32, ) -> Weight;
+	fn rename_sub(_s: u32, ) -> Weight;
+	fn remove_sub(_s: u32, ) -> Weight;
+	fn quit_sub(_s: u32, ) -> Weight;
+	
+}
+
+/// Weights for pallet_identity using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+	fn add_registrar(r: u32, ) -> Weight {
+		(28_965_000 as Weight)
+			.saturating_add((421_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn set_identity(r: u32, x: u32, ) -> Weight {
+		(71_923_000 as Weight)
+			.saturating_add((529_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((1_763_000 as Weight).saturating_mul(x as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn set_subs_new(s: u32, ) -> Weight {
+		(55_550_000 as Weight)
+			.saturating_add((9_760_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+	}
+	fn set_subs_old(p: u32, ) -> Weight {
+		(51_789_000 as Weight)
+			.saturating_add((3_484_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
+	}
+	fn clear_identity(r: u32, s: u32, x: u32, ) -> Weight {
+		(65_458_000 as Weight)
+			.saturating_add((230_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((3_437_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((1_023_000 as Weight).saturating_mul(x as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+	}
+	fn request_judgement(r: u32, x: u32, ) -> Weight {
+		(75_299_000 as Weight)
+			.saturating_add((493_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((2_014_000 as Weight).saturating_mul(x as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn cancel_request(r: u32, x: u32, ) -> Weight {
+		(67_492_000 as Weight)
+			.saturating_add((225_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((2_003_000 as Weight).saturating_mul(x as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn set_fee(r: u32, ) -> Weight {
+		(11_375_000 as Weight)
+			.saturating_add((382_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn set_account_id(r: u32, ) -> Weight {
+		(12_898_000 as Weight)
+			.saturating_add((384_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn set_fields(r: u32, ) -> Weight {
+		(11_419_000 as Weight)
+			.saturating_add((381_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn provide_judgement(r: u32, x: u32, ) -> Weight {
+		(51_115_000 as Weight)
+			.saturating_add((427_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((2_001_000 as Weight).saturating_mul(x as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn kill_identity(_r: u32, s: u32, _x: u32, ) -> Weight {
+		(90_911_000 as Weight)
+			.saturating_add((3_450_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+	}
+	fn add_sub(s: u32, ) -> Weight {
+		(76_957_000 as Weight)
+			.saturating_add((261_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			
+	}
+	fn rename_sub(s: u32, ) -> Weight {
+		(26_219_000 as Weight)
+			.saturating_add((84_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn remove_sub(s: u32, ) -> Weight {
+		(73_130_000 as Weight)
+			.saturating_add((239_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			
+	}
+	fn quit_sub(s: u32, ) -> Weight {
+		(48_088_000 as Weight)
+			.saturating_add((237_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			
+	}
+	
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+	fn add_registrar(r: u32, ) -> Weight {
+		(28_965_000 as Weight)
+			.saturating_add((421_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn set_identity(r: u32, x: u32, ) -> Weight {
+		(71_923_000 as Weight)
+			.saturating_add((529_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((1_763_000 as Weight).saturating_mul(x as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn set_subs_new(s: u32, ) -> Weight {
+		(55_550_000 as Weight)
+			.saturating_add((9_760_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+	}
+	fn set_subs_old(p: u32, ) -> Weight {
+		(51_789_000 as Weight)
+			.saturating_add((3_484_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
+	}
+	fn clear_identity(r: u32, s: u32, x: u32, ) -> Weight {
+		(65_458_000 as Weight)
+			.saturating_add((230_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((3_437_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((1_023_000 as Weight).saturating_mul(x as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+	}
+	fn request_judgement(r: u32, x: u32, ) -> Weight {
+		(75_299_000 as Weight)
+			.saturating_add((493_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((2_014_000 as Weight).saturating_mul(x as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn cancel_request(r: u32, x: u32, ) -> Weight {
+		(67_492_000 as Weight)
+			.saturating_add((225_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((2_003_000 as Weight).saturating_mul(x as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn set_fee(r: u32, ) -> Weight {
+		(11_375_000 as Weight)
+			.saturating_add((382_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn set_account_id(r: u32, ) -> Weight {
+		(12_898_000 as Weight)
+			.saturating_add((384_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn set_fields(r: u32, ) -> Weight {
+		(11_419_000 as Weight)
+			.saturating_add((381_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn provide_judgement(r: u32, x: u32, ) -> Weight {
+		(51_115_000 as Weight)
+			.saturating_add((427_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((2_001_000 as Weight).saturating_mul(x as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn kill_identity(_r: u32, s: u32, _x: u32, ) -> Weight {
+		(90_911_000 as Weight)
+			.saturating_add((3_450_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+	}
+	fn add_sub(s: u32, ) -> Weight {
+		(76_957_000 as Weight)
+			.saturating_add((261_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			
+	}
+	fn rename_sub(s: u32, ) -> Weight {
+		(26_219_000 as Weight)
+			.saturating_add((84_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn remove_sub(s: u32, ) -> Weight {
+		(73_130_000 as Weight)
+			.saturating_add((239_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			
+	}
+	fn quit_sub(s: u32, ) -> Weight {
+		(48_088_000 as Weight)
+			.saturating_add((237_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			
+	}
+	
+}
diff --git a/frame/im-online/src/default_weight.rs b/frame/im-online/src/default_weight.rs
deleted file mode 100644
index e6efb42f2e3d..000000000000
--- a/frame/im-online/src/default_weight.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
-
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
-
-impl crate::WeightInfo for () {
-	fn validate_unsigned_and_then_heartbeat(k: u32, e: u32, ) -> Weight {
-		(139830000 as Weight)
-			.saturating_add((211000 as Weight).saturating_mul(k as Weight))
-			.saturating_add((654000 as Weight).saturating_mul(e as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-}
diff --git a/frame/im-online/src/lib.rs b/frame/im-online/src/lib.rs
index 716a2cbcb786..2d3693d12720 100644
--- a/frame/im-online/src/lib.rs
+++ b/frame/im-online/src/lib.rs
@@ -72,7 +72,7 @@
 mod mock;
 mod tests;
 mod benchmarking;
-mod default_weight;
+pub mod weights;
 
 use sp_application_crypto::RuntimeAppPublic;
 use codec::{Encode, Decode};
@@ -96,13 +96,13 @@ use sp_staking::{
 use frame_support::{
 	decl_module, decl_event, decl_storage, Parameter, debug, decl_error,
 	traits::Get,
-	weights::Weight,
 };
 use frame_system::ensure_none;
 use frame_system::offchain::{
 	SendTransactionTypes,
 	SubmitTransaction,
 };
+pub use weights::WeightInfo;
 
 pub mod sr25519 {
 	mod app_sr25519 {
@@ -227,10 +227,6 @@ pub struct Heartbeat<BlockNumber>
 	pub validators_len: u32,
 }
 
-pub trait WeightInfo {
-	fn validate_unsigned_and_then_heartbeat(k: u32, e: u32, ) -> Weight;
-}
-
 pub trait Trait: SendTransactionTypes<Call<Self>> + pallet_session::historical::Trait {
 	/// The identifier type for an authority.
 	type AuthorityId: Member + Parameter + RuntimeAppPublic + Default + Ord;
diff --git a/frame/im-online/src/weights.rs b/frame/im-online/src/weights.rs
new file mode 100644
index 000000000000..f9df679bd2be
--- /dev/null
+++ b/frame/im-online/src/weights.rs
@@ -0,0 +1,75 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Weights for pallet_im_online
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
+//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
+
+// Executed Command:
+// target/release/substrate
+// benchmark
+// --chain=dev
+// --steps=50
+// --repeat=20
+// --pallet=pallet_im_online
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./frame/im-online/src/weights.rs
+// --template=./.maintain/frame-weight-template.hbs
+
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for pallet_im_online.
+pub trait WeightInfo {
+	fn validate_unsigned_and_then_heartbeat(k: u32, e: u32, ) -> Weight;
+	
+}
+
+/// Weights for pallet_im_online using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+	fn validate_unsigned_and_then_heartbeat(k: u32, e: u32, ) -> Weight {
+		(114_379_000 as Weight)
+			.saturating_add((219_000 as Weight).saturating_mul(k as Weight))
+			.saturating_add((481_000 as Weight).saturating_mul(e as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+	fn validate_unsigned_and_then_heartbeat(k: u32, e: u32, ) -> Weight {
+		(114_379_000 as Weight)
+			.saturating_add((219_000 as Weight).saturating_mul(k as Weight))
+			.saturating_add((481_000 as Weight).saturating_mul(e as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	
+}
diff --git a/frame/indices/src/default_weights.rs b/frame/indices/src/default_weights.rs
deleted file mode 100644
index 6b3b9c13e40a..000000000000
--- a/frame/indices/src/default_weights.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
-
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
-
-impl crate::WeightInfo for () {
-	fn claim() -> Weight {
-		(56_237_000 as Weight)
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn transfer() -> Weight {
-		(63_665_000 as Weight)
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn free() -> Weight {
-		(50_736_000 as Weight)
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn force_transfer() -> Weight {
-		(52_361_000 as Weight)
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn freeze() -> Weight {
-		(46_483_000 as Weight)
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-}
diff --git a/frame/indices/src/lib.rs b/frame/indices/src/lib.rs
index edbaed17e536..aa645d0cb9eb 100644
--- a/frame/indices/src/lib.rs
+++ b/frame/indices/src/lib.rs
@@ -20,6 +20,12 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
+mod mock;
+pub mod address;
+mod tests;
+mod benchmarking;
+pub mod weights;
+
 use sp_std::prelude::*;
 use codec::Codec;
 use sp_runtime::traits::{
@@ -28,27 +34,13 @@ use sp_runtime::traits::{
 use frame_support::{Parameter, decl_module, decl_error, decl_event, decl_storage, ensure};
 use frame_support::dispatch::DispatchResult;
 use frame_support::traits::{Currency, ReservableCurrency, Get, BalanceStatus::Reserved};
-use frame_support::weights::Weight;
 use frame_system::{ensure_signed, ensure_root};
 use self::address::Address as RawAddress;
-
-mod mock;
-pub mod address;
-mod tests;
-mod benchmarking;
-mod default_weights;
+pub use weights::WeightInfo;
 
 pub type Address<T> = RawAddress<<T as frame_system::Trait>::AccountId, <T as Trait>::AccountIndex>;
 type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
 
-pub trait WeightInfo {
-	fn claim() -> Weight;
-	fn transfer() -> Weight;
-	fn free() -> Weight;
-	fn force_transfer() -> Weight;
-	fn freeze() -> Weight;
-}
-
 /// The module's config trait.
 pub trait Trait: frame_system::Trait {
 	/// Type used for storing an account's index; implies the maximum number of accounts the system
diff --git a/frame/indices/src/weights.rs b/frame/indices/src/weights.rs
new file mode 100644
index 000000000000..36d990cec52a
--- /dev/null
+++ b/frame/indices/src/weights.rs
@@ -0,0 +1,123 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Weights for pallet_indices
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
+//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
+
+// Executed Command:
+// target/release/substrate
+// benchmark
+// --chain=dev
+// --steps=50
+// --repeat=20
+// --pallet=pallet_indices
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./frame/indices/src/weights.rs
+// --template=./.maintain/frame-weight-template.hbs
+
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for pallet_indices.
+pub trait WeightInfo {
+	fn claim() -> Weight;
+	fn transfer() -> Weight;
+	fn free() -> Weight;
+	fn force_transfer() -> Weight;
+	fn freeze() -> Weight;
+	
+}
+
+/// Weights for pallet_indices using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+	fn claim() -> Weight {
+		(53_799_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn transfer() -> Weight {
+		(60_294_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			
+	}
+	fn free() -> Weight {
+		(48_625_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn force_transfer() -> Weight {
+		(49_762_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			
+	}
+	fn freeze() -> Weight {
+		(44_869_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+	fn claim() -> Weight {
+		(53_799_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn transfer() -> Weight {
+		(60_294_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			
+	}
+	fn free() -> Weight {
+		(48_625_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn force_transfer() -> Weight {
+		(49_762_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			
+	}
+	fn freeze() -> Weight {
+		(44_869_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	
+}
diff --git a/frame/multisig/src/default_weights.rs b/frame/multisig/src/default_weights.rs
deleted file mode 100644
index 19d1528d9aaa..000000000000
--- a/frame/multisig/src/default_weights.rs
+++ /dev/null
@@ -1,89 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
-
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
-
-impl crate::WeightInfo for () {
-	fn as_multi_threshold_1(z: u32, ) -> Weight {
-		(17_161_000 as Weight)
-			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
-	}
-	fn as_multi_create(s: u32, z: u32, ) -> Weight {
-		(79_857_000 as Weight)
-			.saturating_add((131_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn as_multi_create_store(s: u32, z: u32, ) -> Weight {
-		(90_218_000 as Weight)
-			.saturating_add((129_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add((3_000 as Weight).saturating_mul(z as Weight))
-			.saturating_add(DbWeight::get().reads(3 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn as_multi_approve(s: u32, z: u32, ) -> Weight {
-		(48_402_000 as Weight)
-			.saturating_add((132_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn as_multi_approve_store(s: u32, z: u32, ) -> Weight {
-		(88_390_000 as Weight)
-			.saturating_add((120_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add((3_000 as Weight).saturating_mul(z as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn as_multi_complete(s: u32, z: u32, ) -> Weight {
-		(98_960_000 as Weight)
-			.saturating_add((276_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add((6_000 as Weight).saturating_mul(z as Weight))
-			.saturating_add(DbWeight::get().reads(3 as Weight))
-			.saturating_add(DbWeight::get().writes(3 as Weight))
-	}
-	fn approve_as_multi_create(s: u32, ) -> Weight {
-		(80_185_000 as Weight)
-			.saturating_add((121_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn approve_as_multi_approve(s: u32, ) -> Weight {
-		(48_386_000 as Weight)
-			.saturating_add((143_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn approve_as_multi_complete(s: u32, ) -> Weight {
-		(177_181_000 as Weight)
-			.saturating_add((273_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(DbWeight::get().reads(3 as Weight))
-			.saturating_add(DbWeight::get().writes(3 as Weight))
-	}
-	fn cancel_as_multi(s: u32, ) -> Weight {
-		(126_334_000 as Weight)
-			.saturating_add((124_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-}
diff --git a/frame/multisig/src/lib.rs b/frame/multisig/src/lib.rs
index b0119984038a..873508259a8d 100644
--- a/frame/multisig/src/lib.rs
+++ b/frame/multisig/src/lib.rs
@@ -46,6 +46,10 @@
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
 
+mod tests;
+mod benchmarking;
+pub mod weights;
+
 use sp_std::prelude::*;
 use codec::{Encode, Decode};
 use sp_io::hashing::blake2_256;
@@ -56,28 +60,12 @@ use frame_support::{traits::{Get, ReservableCurrency, Currency},
 };
 use frame_system::{self as system, ensure_signed, RawOrigin};
 use sp_runtime::{DispatchError, DispatchResult, traits::{Dispatchable, Zero}};
-
-mod tests;
-mod benchmarking;
-mod default_weights;
+pub use weights::WeightInfo;
 
 type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
 /// Just a bunch of bytes, but they should decode to a valid `Call`.
 pub type OpaqueCall = Vec<u8>;
 
-pub trait WeightInfo {
-	fn as_multi_threshold_1(z: u32, ) -> Weight;
-	fn as_multi_create(s: u32, z: u32, ) -> Weight;
-	fn as_multi_create_store(s: u32, z: u32, ) -> Weight;
-	fn as_multi_approve(s: u32, z: u32, ) -> Weight;
-	fn as_multi_approve_store(s: u32, z: u32, ) -> Weight;
-	fn as_multi_complete(s: u32, z: u32, ) -> Weight;
-	fn approve_as_multi_create(s: u32, ) -> Weight;
-	fn approve_as_multi_approve(s: u32, ) -> Weight;
-	fn approve_as_multi_complete(s: u32, ) -> Weight;
-	fn cancel_as_multi(s: u32, ) -> Weight;
-}
-
 /// Configuration trait.
 pub trait Trait: frame_system::Trait {
 	/// The overarching event type.
diff --git a/frame/multisig/src/weights.rs b/frame/multisig/src/weights.rs
new file mode 100644
index 000000000000..ab55b181f5a5
--- /dev/null
+++ b/frame/multisig/src/weights.rs
@@ -0,0 +1,214 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Weights for pallet_multisig
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
+//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
+
+// Executed Command:
+// target/release/substrate
+// benchmark
+// --chain=dev
+// --steps=50
+// --repeat=20
+// --pallet=pallet_multisig
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./frame/multisig/src/weights.rs
+// --template=./.maintain/frame-weight-template.hbs
+
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for pallet_multisig.
+pub trait WeightInfo {
+	fn as_multi_threshold_1(z: u32, ) -> Weight;
+	fn as_multi_create(s: u32, z: u32, ) -> Weight;
+	fn as_multi_create_store(s: u32, z: u32, ) -> Weight;
+	fn as_multi_approve(s: u32, z: u32, ) -> Weight;
+	fn as_multi_approve_store(s: u32, z: u32, ) -> Weight;
+	fn as_multi_complete(s: u32, z: u32, ) -> Weight;
+	fn approve_as_multi_create(s: u32, ) -> Weight;
+	fn approve_as_multi_approve(s: u32, ) -> Weight;
+	fn approve_as_multi_complete(s: u32, ) -> Weight;
+	fn cancel_as_multi(s: u32, ) -> Weight;
+	
+}
+
+/// Weights for pallet_multisig using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+	fn as_multi_threshold_1(z: u32, ) -> Weight {
+		(14_183_000 as Weight)
+			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
+			
+	}
+	fn as_multi_create(s: u32, z: u32, ) -> Weight {
+		(72_350_000 as Weight)
+			.saturating_add((64_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn as_multi_create_store(s: u32, z: u32, ) -> Weight {
+		(83_175_000 as Weight)
+			.saturating_add((72_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((3_000 as Weight).saturating_mul(z as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			
+	}
+	fn as_multi_approve(s: u32, z: u32, ) -> Weight {
+		(43_035_000 as Weight)
+			.saturating_add((140_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn as_multi_approve_store(s: u32, z: u32, ) -> Weight {
+		(75_190_000 as Weight)
+			.saturating_add((127_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((3_000 as Weight).saturating_mul(z as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			
+	}
+	fn as_multi_complete(s: u32, z: u32, ) -> Weight {
+		(92_751_000 as Weight)
+			.saturating_add((282_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((5_000 as Weight).saturating_mul(z as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+			
+	}
+	fn approve_as_multi_create(s: u32, ) -> Weight {
+		(71_937_000 as Weight)
+			.saturating_add((87_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn approve_as_multi_approve(s: u32, ) -> Weight {
+		(44_294_000 as Weight)
+			.saturating_add((89_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn approve_as_multi_complete(s: u32, ) -> Weight {
+		(163_098_000 as Weight)
+			.saturating_add((276_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+			
+	}
+	fn cancel_as_multi(s: u32, ) -> Weight {
+		(115_731_000 as Weight)
+			.saturating_add((104_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			
+	}
+	
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+	fn as_multi_threshold_1(z: u32, ) -> Weight {
+		(14_183_000 as Weight)
+			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
+			
+	}
+	fn as_multi_create(s: u32, z: u32, ) -> Weight {
+		(72_350_000 as Weight)
+			.saturating_add((64_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn as_multi_create_store(s: u32, z: u32, ) -> Weight {
+		(83_175_000 as Weight)
+			.saturating_add((72_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((3_000 as Weight).saturating_mul(z as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			
+	}
+	fn as_multi_approve(s: u32, z: u32, ) -> Weight {
+		(43_035_000 as Weight)
+			.saturating_add((140_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn as_multi_approve_store(s: u32, z: u32, ) -> Weight {
+		(75_190_000 as Weight)
+			.saturating_add((127_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((3_000 as Weight).saturating_mul(z as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			
+	}
+	fn as_multi_complete(s: u32, z: u32, ) -> Weight {
+		(92_751_000 as Weight)
+			.saturating_add((282_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((5_000 as Weight).saturating_mul(z as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+			
+	}
+	fn approve_as_multi_create(s: u32, ) -> Weight {
+		(71_937_000 as Weight)
+			.saturating_add((87_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn approve_as_multi_approve(s: u32, ) -> Weight {
+		(44_294_000 as Weight)
+			.saturating_add((89_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn approve_as_multi_complete(s: u32, ) -> Weight {
+		(163_098_000 as Weight)
+			.saturating_add((276_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+			
+	}
+	fn cancel_as_multi(s: u32, ) -> Weight {
+		(115_731_000 as Weight)
+			.saturating_add((104_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			
+	}
+	
+}
diff --git a/frame/proxy/src/default_weight.rs b/frame/proxy/src/default_weight.rs
deleted file mode 100644
index 183c0b81c8a0..000000000000
--- a/frame/proxy/src/default_weight.rs
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc5
-
-use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
-
-impl crate::WeightInfo for () {
-	fn proxy(p: u32, ) -> Weight {
-		(26127000 as Weight)
-			.saturating_add((214000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-	}
-	fn proxy_announced(a: u32, p: u32, ) -> Weight {
-		(55405000 as Weight)
-			.saturating_add((774000 as Weight).saturating_mul(a as Weight))
-			.saturating_add((209000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(DbWeight::get().reads(3 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn remove_announcement(a: u32, p: u32, ) -> Weight {
-		(35879000 as Weight)
-			.saturating_add((783000 as Weight).saturating_mul(a as Weight))
-			.saturating_add((20000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn reject_announcement(a: u32, p: u32, ) -> Weight {
-		(36097000 as Weight)
-			.saturating_add((780000 as Weight).saturating_mul(a as Weight))
-			.saturating_add((12000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn announce(a: u32, p: u32, ) -> Weight {
-		(53769000 as Weight)
-			.saturating_add((675000 as Weight).saturating_mul(a as Weight))
-			.saturating_add((214000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(DbWeight::get().reads(3 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn add_proxy(p: u32, ) -> Weight {
-		(36082000 as Weight)
-			.saturating_add((234000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn remove_proxy(p: u32, ) -> Weight {
-		(32885000 as Weight)
-			.saturating_add((267000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn remove_proxies(p: u32, ) -> Weight {
-		(31735000 as Weight)
-			.saturating_add((215000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn anonymous(p: u32, ) -> Weight {
-		(50907000 as Weight)
-			.saturating_add((61000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn kill_anonymous(p: u32, ) -> Weight {
-		(33926000 as Weight)
-			.saturating_add((208000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-}
diff --git a/frame/proxy/src/lib.rs b/frame/proxy/src/lib.rs
index 7649fe0ad440..75ab3902dc8d 100644
--- a/frame/proxy/src/lib.rs
+++ b/frame/proxy/src/lib.rs
@@ -38,6 +38,10 @@
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
 
+mod tests;
+mod benchmarking;
+pub mod weights;
+
 use sp_std::prelude::*;
 use codec::{Encode, Decode};
 use sp_io::hashing::blake2_256;
@@ -49,26 +53,10 @@ use frame_support::{
 };
 use frame_system::{self as system, ensure_signed};
 use frame_support::dispatch::DispatchError;
-
-mod tests;
-mod benchmarking;
-mod default_weight;
+pub use weights::WeightInfo;
 
 type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
 
-pub trait WeightInfo {
-	fn proxy_announced(a: u32, p: u32, ) -> Weight;
-	fn remove_announcement(a: u32, p: u32, ) -> Weight;
-	fn reject_announcement(a: u32, p: u32, ) -> Weight;
-	fn announce(a: u32, p: u32, ) -> Weight;
-	fn proxy(p: u32, ) -> Weight;
-	fn add_proxy(p: u32, ) -> Weight;
-	fn remove_proxy(p: u32, ) -> Weight;
-	fn remove_proxies(p: u32, ) -> Weight;
-	fn anonymous(p: u32, ) -> Weight;
-	fn kill_anonymous(p: u32, ) -> Weight;
-}
-
 /// Configuration trait.
 pub trait Trait: frame_system::Trait {
 	/// The overarching event type.
diff --git a/frame/proxy/src/weights.rs b/frame/proxy/src/weights.rs
new file mode 100644
index 000000000000..944fe53a149c
--- /dev/null
+++ b/frame/proxy/src/weights.rs
@@ -0,0 +1,214 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Weights for pallet_proxy
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
+//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
+
+// Executed Command:
+// target/release/substrate
+// benchmark
+// --chain=dev
+// --steps=50
+// --repeat=20
+// --pallet=pallet_proxy
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./frame/proxy/src/weights.rs
+// --template=./.maintain/frame-weight-template.hbs
+
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for pallet_proxy.
+pub trait WeightInfo {
+	fn proxy(p: u32, ) -> Weight;
+	fn proxy_announced(a: u32, p: u32, ) -> Weight;
+	fn remove_announcement(a: u32, p: u32, ) -> Weight;
+	fn reject_announcement(a: u32, p: u32, ) -> Weight;
+	fn announce(a: u32, p: u32, ) -> Weight;
+	fn add_proxy(p: u32, ) -> Weight;
+	fn remove_proxy(p: u32, ) -> Weight;
+	fn remove_proxies(p: u32, ) -> Weight;
+	fn anonymous(p: u32, ) -> Weight;
+	fn kill_anonymous(p: u32, ) -> Weight;
+	
+}
+
+/// Weights for pallet_proxy using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+	fn proxy(p: u32, ) -> Weight {
+		(32_194_000 as Weight)
+			.saturating_add((215_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			
+	}
+	fn proxy_announced(a: u32, p: u32, ) -> Weight {
+		(67_490_000 as Weight)
+			.saturating_add((859_000 as Weight).saturating_mul(a as Weight))
+			.saturating_add((215_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			
+	}
+	fn remove_announcement(a: u32, p: u32, ) -> Weight {
+		(40_768_000 as Weight)
+			.saturating_add((882_000 as Weight).saturating_mul(a as Weight))
+			.saturating_add((122_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			
+	}
+	fn reject_announcement(a: u32, p: u32, ) -> Weight {
+		(42_742_000 as Weight)
+			.saturating_add((852_000 as Weight).saturating_mul(a as Weight))
+			.saturating_add((22_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			
+	}
+	fn announce(a: u32, p: u32, ) -> Weight {
+		(67_967_000 as Weight)
+			.saturating_add((737_000 as Weight).saturating_mul(a as Weight))
+			.saturating_add((213_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			
+	}
+	fn add_proxy(p: u32, ) -> Weight {
+		(45_245_000 as Weight)
+			.saturating_add((240_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn remove_proxy(p: u32, ) -> Weight {
+		(40_742_000 as Weight)
+			.saturating_add((272_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn remove_proxies(p: u32, ) -> Weight {
+		(39_070_000 as Weight)
+			.saturating_add((214_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn anonymous(p: u32, ) -> Weight {
+		(64_851_000 as Weight)
+			.saturating_add((37_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn kill_anonymous(p: u32, ) -> Weight {
+		(41_831_000 as Weight)
+			.saturating_add((207_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+	fn proxy(p: u32, ) -> Weight {
+		(32_194_000 as Weight)
+			.saturating_add((215_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			
+	}
+	fn proxy_announced(a: u32, p: u32, ) -> Weight {
+		(67_490_000 as Weight)
+			.saturating_add((859_000 as Weight).saturating_mul(a as Weight))
+			.saturating_add((215_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			
+	}
+	fn remove_announcement(a: u32, p: u32, ) -> Weight {
+		(40_768_000 as Weight)
+			.saturating_add((882_000 as Weight).saturating_mul(a as Weight))
+			.saturating_add((122_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			
+	}
+	fn reject_announcement(a: u32, p: u32, ) -> Weight {
+		(42_742_000 as Weight)
+			.saturating_add((852_000 as Weight).saturating_mul(a as Weight))
+			.saturating_add((22_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			
+	}
+	fn announce(a: u32, p: u32, ) -> Weight {
+		(67_967_000 as Weight)
+			.saturating_add((737_000 as Weight).saturating_mul(a as Weight))
+			.saturating_add((213_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			
+	}
+	fn add_proxy(p: u32, ) -> Weight {
+		(45_245_000 as Weight)
+			.saturating_add((240_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn remove_proxy(p: u32, ) -> Weight {
+		(40_742_000 as Weight)
+			.saturating_add((272_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn remove_proxies(p: u32, ) -> Weight {
+		(39_070_000 as Weight)
+			.saturating_add((214_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn anonymous(p: u32, ) -> Weight {
+		(64_851_000 as Weight)
+			.saturating_add((37_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn kill_anonymous(p: u32, ) -> Weight {
+		(41_831_000 as Weight)
+			.saturating_add((207_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	
+}
diff --git a/frame/scheduler/src/default_weights.rs b/frame/scheduler/src/default_weights.rs
deleted file mode 100644
index 920de1d37a07..000000000000
--- a/frame/scheduler/src/default_weights.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
-
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
-
-impl crate::WeightInfo for () {
-	fn schedule(s: u32, ) -> Weight {
-		(37_835_000 as Weight)
-			.saturating_add((81_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn cancel(s: u32, ) -> Weight {
-		(34_707_000 as Weight)
-			.saturating_add((3_125_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn schedule_named(s: u32, ) -> Weight {
-		(48_065_000 as Weight)
-			.saturating_add((110_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn cancel_named(s: u32, ) -> Weight {
-		(38_776_000 as Weight)
-			.saturating_add((3_138_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-}
diff --git a/frame/scheduler/src/lib.rs b/frame/scheduler/src/lib.rs
index 6bc2d7292963..c467678a466d 100644
--- a/frame/scheduler/src/lib.rs
+++ b/frame/scheduler/src/lib.rs
@@ -52,7 +52,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 mod benchmarking;
-mod default_weights;
+pub mod weights;
 
 use sp_std::{prelude::*, marker::PhantomData, borrow::Borrow};
 use codec::{Encode, Decode, Codec};
@@ -64,13 +64,7 @@ use frame_support::{
 	weights::{GetDispatchInfo, Weight},
 };
 use frame_system::{self as system, ensure_signed};
-
-pub trait WeightInfo {
-	fn schedule(s: u32, ) -> Weight;
-	fn cancel(s: u32, ) -> Weight;
-	fn schedule_named(s: u32, ) -> Weight;
-	fn cancel_named(s: u32, ) -> Weight;
-}
+pub use weights::WeightInfo;
 
 /// Our pallet's configuration trait. All our types and constants go in here. If the
 /// pallet is dependent on specific other pallets, then their configuration traits
diff --git a/frame/scheduler/src/weights.rs b/frame/scheduler/src/weights.rs
new file mode 100644
index 000000000000..3699e6f85b23
--- /dev/null
+++ b/frame/scheduler/src/weights.rs
@@ -0,0 +1,118 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Weights for pallet_scheduler
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
+//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
+
+// Executed Command:
+// target/release/substrate
+// benchmark
+// --chain=dev
+// --steps=50
+// --repeat=20
+// --pallet=pallet_scheduler
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./frame/scheduler/src/weights.rs
+// --template=./.maintain/frame-weight-template.hbs
+
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for pallet_scheduler.
+pub trait WeightInfo {
+	fn schedule(s: u32, ) -> Weight;
+	fn cancel(s: u32, ) -> Weight;
+	fn schedule_named(s: u32, ) -> Weight;
+	fn cancel_named(s: u32, ) -> Weight;
+	
+}
+
+/// Weights for pallet_scheduler using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+	fn schedule(s: u32, ) -> Weight {
+		(35_029_000 as Weight)
+			.saturating_add((77_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn cancel(s: u32, ) -> Weight {
+		(31_419_000 as Weight)
+			.saturating_add((4_015_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			
+	}
+	fn schedule_named(s: u32, ) -> Weight {
+		(44_752_000 as Weight)
+			.saturating_add((123_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			
+	}
+	fn cancel_named(s: u32, ) -> Weight {
+		(35_712_000 as Weight)
+			.saturating_add((4_008_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			
+	}
+	
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+	fn schedule(s: u32, ) -> Weight {
+		(35_029_000 as Weight)
+			.saturating_add((77_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn cancel(s: u32, ) -> Weight {
+		(31_419_000 as Weight)
+			.saturating_add((4_015_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			
+	}
+	fn schedule_named(s: u32, ) -> Weight {
+		(44_752_000 as Weight)
+			.saturating_add((123_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			
+	}
+	fn cancel_named(s: u32, ) -> Weight {
+		(35_712_000 as Weight)
+			.saturating_add((4_008_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			
+	}
+	
+}
diff --git a/frame/session/src/default_weights.rs b/frame/session/src/default_weights.rs
deleted file mode 100644
index f3082981c78b..000000000000
--- a/frame/session/src/default_weights.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
-
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
-
-impl crate::WeightInfo for () {
-	fn set_keys() -> Weight {
-		(88_411_000 as Weight)
-			.saturating_add(DbWeight::get().reads(6 as Weight))
-			.saturating_add(DbWeight::get().writes(5 as Weight))
-	}
-	fn purge_keys() -> Weight {
-		(51_843_000 as Weight)
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(5 as Weight))
-	}
-}
diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs
index 1d81f38bdf87..c0a8fc29165b 100644
--- a/frame/session/src/lib.rs
+++ b/frame/session/src/lib.rs
@@ -100,6 +100,14 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
+#[cfg(test)]
+mod mock;
+#[cfg(test)]
+mod tests;
+#[cfg(feature = "historical")]
+pub mod historical;
+pub mod weights;
+
 use sp_std::{prelude::*, marker::PhantomData, ops::{Sub, Rem}};
 use codec::Decode;
 use sp_runtime::{KeyTypeId, Perbill, RuntimeAppPublic, BoundToRuntimeAppPublic};
@@ -114,16 +122,7 @@ use frame_support::{
 	weights::Weight,
 };
 use frame_system::ensure_signed;
-
-#[cfg(test)]
-mod mock;
-#[cfg(test)]
-mod tests;
-
-#[cfg(feature = "historical")]
-pub mod historical;
-
-mod default_weights;
+pub use weights::WeightInfo;
 
 /// Decides whether the session should be ended.
 pub trait ShouldEndSession<BlockNumber> {
@@ -353,11 +352,6 @@ impl<T: Trait> ValidatorRegistration<T::ValidatorId> for Module<T> {
 	}
 }
 
-pub trait WeightInfo {
-	fn set_keys() -> Weight;
-	fn purge_keys() -> Weight;
-}
-
 pub trait Trait: frame_system::Trait {
 	/// The overarching event type.
 	type Event: From<Event> + Into<<Self as frame_system::Trait>::Event>;
diff --git a/frame/session/src/weights.rs b/frame/session/src/weights.rs
new file mode 100644
index 000000000000..f1fc18b0ef99
--- /dev/null
+++ b/frame/session/src/weights.rs
@@ -0,0 +1,84 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Weights for pallet_session
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
+//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
+
+// Executed Command:
+// target/release/substrate
+// benchmark
+// --chain=dev
+// --steps=50
+// --repeat=20
+// --pallet=pallet_session
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./frame/session/src/weights.rs
+// --template=./.maintain/frame-weight-template.hbs
+
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for pallet_session.
+pub trait WeightInfo {
+	fn set_keys() -> Weight;
+	fn purge_keys() -> Weight;
+	
+}
+
+/// Weights for pallet_session using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+	fn set_keys() -> Weight {
+		(86_033_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(6 as Weight))
+			.saturating_add(T::DbWeight::get().writes(5 as Weight))
+			
+	}
+	fn purge_keys() -> Weight {
+		(54_334_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(5 as Weight))
+			
+	}
+	
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+	fn set_keys() -> Weight {
+		(86_033_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
+			
+	}
+	fn purge_keys() -> Weight {
+		(54_334_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
+			
+	}
+	
+}
diff --git a/frame/staking/src/default_weights.rs b/frame/staking/src/default_weights.rs
deleted file mode 100644
index fa5a05f63824..000000000000
--- a/frame/staking/src/default_weights.rs
+++ /dev/null
@@ -1,169 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Default weights of pallet-staking.
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
-
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
-
-impl crate::WeightInfo for () {
-	fn bond() -> Weight {
-		(144278000 as Weight)
-			.saturating_add(DbWeight::get().reads(5 as Weight))
-			.saturating_add(DbWeight::get().writes(4 as Weight))
-	}
-	fn bond_extra() -> Weight {
-		(110715000 as Weight)
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn unbond() -> Weight {
-		(99840000 as Weight)
-			.saturating_add(DbWeight::get().reads(5 as Weight))
-			.saturating_add(DbWeight::get().writes(3 as Weight))
-	}
-	fn withdraw_unbonded_update(s: u32, ) -> Weight {
-		(100728000 as Weight)
-			.saturating_add((63000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(DbWeight::get().reads(5 as Weight))
-			.saturating_add(DbWeight::get().writes(3 as Weight))
-	}
-	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
-		(168879000 as Weight)
-			.saturating_add((6666000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(DbWeight::get().reads(7 as Weight))
-			.saturating_add(DbWeight::get().writes(8 as Weight))
-			.saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
-	}
-	fn validate() -> Weight {
-		(35539000 as Weight)
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn nominate(n: u32, ) -> Weight {
-		(48596000 as Weight)
-			.saturating_add((308000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(DbWeight::get().reads(3 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn chill() -> Weight {
-		(35144000 as Weight)
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn set_payee() -> Weight {
-		(24255000 as Weight)
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn set_controller() -> Weight {
-		(52294000 as Weight)
-			.saturating_add(DbWeight::get().reads(3 as Weight))
-			.saturating_add(DbWeight::get().writes(3 as Weight))
-	}
-	fn set_validator_count() -> Weight {
-		(5185000 as Weight)
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn force_no_eras() -> Weight {
-		(5907000 as Weight)
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn force_new_era() -> Weight {
-		(5917000 as Weight)
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn force_new_era_always() -> Weight {
-		(5952000 as Weight)
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn set_invulnerables(v: u32, ) -> Weight {
-		(6324000 as Weight)
-			.saturating_add((9000 as Weight).saturating_mul(v as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn force_unstake(s: u32, ) -> Weight {
-		(119691000 as Weight)
-			.saturating_add((6681000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-			.saturating_add(DbWeight::get().writes(8 as Weight))
-			.saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
-	}
-	fn cancel_deferred_slash(s: u32, ) -> Weight {
-		(5820201000 as Weight)
-			.saturating_add((34672000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn payout_stakers_dead_controller(n: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((92486000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-			.saturating_add(DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
-			.saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(n as Weight)))
-	}
-	fn payout_stakers_alive_staked(n: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((117324000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(DbWeight::get().reads((5 as Weight).saturating_mul(n as Weight)))
-			.saturating_add(DbWeight::get().writes((3 as Weight).saturating_mul(n as Weight)))
-	}
-	fn rebond(l: u32, ) -> Weight {
-		(71316000 as Weight)
-			.saturating_add((142000 as Weight).saturating_mul(l as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-			.saturating_add(DbWeight::get().writes(3 as Weight))
-	}
-	fn set_history_depth(e: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((51901000 as Weight).saturating_mul(e as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(4 as Weight))
-			.saturating_add(DbWeight::get().writes((7 as Weight).saturating_mul(e as Weight)))
-	}
-	fn reap_stash(s: u32, ) -> Weight {
-		(147166000 as Weight)
-			.saturating_add((6661000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-			.saturating_add(DbWeight::get().writes(8 as Weight))
-			.saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
-	}
-	fn new_era(v: u32, n: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((1440459000 as Weight).saturating_mul(v as Weight))
-			.saturating_add((182580000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(DbWeight::get().reads(10 as Weight))
-			.saturating_add(DbWeight::get().reads((4 as Weight).saturating_mul(v as Weight)))
-			.saturating_add(DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
-			.saturating_add(DbWeight::get().writes(8 as Weight))
-			.saturating_add(DbWeight::get().writes((3 as Weight).saturating_mul(v as Weight)))
-	}
-	fn submit_solution_better(v: u32, n: u32, a: u32, w: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((964000 as Weight).saturating_mul(v as Weight))
-			.saturating_add((432000 as Weight).saturating_mul(n as Weight))
-			.saturating_add((204294000 as Weight).saturating_mul(a as Weight))
-			.saturating_add((9546000 as Weight).saturating_mul(w as Weight))
-			.saturating_add(DbWeight::get().reads(6 as Weight))
-			.saturating_add(DbWeight::get().reads((4 as Weight).saturating_mul(a as Weight)))
-			.saturating_add(DbWeight::get().reads((1 as Weight).saturating_mul(w as Weight)))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-}
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index cd3a71ffabc8..fdea1c18e768 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -279,7 +279,7 @@ pub mod benchmarking;
 pub mod slashing;
 pub mod offchain_election;
 pub mod inflation;
-pub mod default_weights;
+pub mod weights;
 
 use sp_std::{
 	result,
@@ -330,6 +330,7 @@ use sp_npos_elections::{
 	build_support_map, evaluate_support, seq_phragmen, generate_solution_type,
 	is_score_better, VotingLimit, SupportMap, VoteWeight,
 };
+pub use weights::WeightInfo;
 
 const STAKING_ID: LockIdentifier = *b"staking ";
 pub const MAX_UNLOCKING_CHUNKS: usize = 32;
@@ -769,33 +770,6 @@ impl<T: Trait> SessionInterface<<T as frame_system::Trait>::AccountId> for T whe
 	}
 }
 
-pub trait WeightInfo {
-	fn bond() -> Weight;
-	fn bond_extra() -> Weight;
-	fn unbond() -> Weight;
-	fn withdraw_unbonded_update(s: u32, ) -> Weight;
-	fn withdraw_unbonded_kill(s: u32, ) -> Weight;
-	fn validate() -> Weight;
-	fn nominate(n: u32, ) -> Weight;
-	fn chill() -> Weight;
-	fn set_payee() -> Weight;
-	fn set_controller() -> Weight;
-	fn set_validator_count() -> Weight;
-	fn force_no_eras() -> Weight;
-	fn force_new_era() -> Weight;
-	fn force_new_era_always() -> Weight;
-	fn set_invulnerables(v: u32, ) -> Weight;
-	fn force_unstake(s: u32, ) -> Weight;
-	fn cancel_deferred_slash(s: u32, ) -> Weight;
-	fn payout_stakers_alive_staked(n: u32, ) -> Weight;
-	fn payout_stakers_dead_controller(n: u32, ) -> Weight;
-	fn rebond(l: u32, ) -> Weight;
-	fn set_history_depth(e: u32, ) -> Weight;
-	fn reap_stash(s: u32, ) -> Weight;
-	fn new_era(v: u32, n: u32, ) -> Weight;
-	fn submit_solution_better(v: u32, n: u32, a: u32, w: u32, ) -> Weight;
-}
-
 pub trait Trait: frame_system::Trait + SendTransactionTypes<Call<Self>> {
 	/// The staking balance.
 	type Currency: LockableCurrency<Self::AccountId, Moment=Self::BlockNumber>;
diff --git a/frame/staking/src/weights.rs b/frame/staking/src/weights.rs
new file mode 100644
index 000000000000..cb301276e0f0
--- /dev/null
+++ b/frame/staking/src/weights.rs
@@ -0,0 +1,406 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Weights for pallet_staking
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
+//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
+
+// Executed Command:
+// target/release/substrate
+// benchmark
+// --chain=dev
+// --steps=50
+// --repeat=20
+// --pallet=pallet_staking
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./frame/staking/src/weights.rs
+// --template=./.maintain/frame-weight-template.hbs
+
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for pallet_staking.
+pub trait WeightInfo {
+	fn bond() -> Weight;
+	fn bond_extra() -> Weight;
+	fn unbond() -> Weight;
+	fn withdraw_unbonded_update(_s: u32, ) -> Weight;
+	fn withdraw_unbonded_kill(_s: u32, ) -> Weight;
+	fn validate() -> Weight;
+	fn nominate(_n: u32, ) -> Weight;
+	fn chill() -> Weight;
+	fn set_payee() -> Weight;
+	fn set_controller() -> Weight;
+	fn set_validator_count() -> Weight;
+	fn force_no_eras() -> Weight;
+	fn force_new_era() -> Weight;
+	fn force_new_era_always() -> Weight;
+	fn set_invulnerables(_v: u32, ) -> Weight;
+	fn force_unstake(_s: u32, ) -> Weight;
+	fn cancel_deferred_slash(_s: u32, ) -> Weight;
+	fn payout_stakers_dead_controller(_n: u32, ) -> Weight;
+	fn payout_stakers_alive_staked(_n: u32, ) -> Weight;
+	fn rebond(_l: u32, ) -> Weight;
+	fn set_history_depth(_e: u32, ) -> Weight;
+	fn reap_stash(_s: u32, ) -> Weight;
+	fn new_era(_v: u32, _n: u32, ) -> Weight;
+	fn submit_solution_better(_v: u32, _n: u32, _a: u32, _w: u32, ) -> Weight;
+
+}
+
+/// Weights for pallet_staking using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+	fn bond() -> Weight {
+		(99_659_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(4 as Weight))
+
+	}
+	fn bond_extra() -> Weight {
+		(79_045_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+
+	}
+	fn unbond() -> Weight {
+		(71_716_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+
+	}
+	fn withdraw_unbonded_update(s: u32, ) -> Weight {
+		(72_835_000 as Weight)
+			.saturating_add((63_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+
+	}
+	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
+		(118_239_000 as Weight)
+			.saturating_add((3_910_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(7 as Weight))
+			.saturating_add(T::DbWeight::get().writes(8 as Weight))
+			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+	}
+	fn validate() -> Weight {
+		(25_691_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+
+	}
+	fn nominate(n: u32, ) -> Weight {
+		(35_374_000 as Weight)
+			.saturating_add((203_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+
+	}
+	fn chill() -> Weight {
+		(25_227_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+
+	}
+	fn set_payee() -> Weight {
+		(17_601_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+
+	}
+	fn set_controller() -> Weight {
+		(37_514_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+
+	}
+	fn set_validator_count() -> Weight {
+		(3_338_000 as Weight)
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+
+	}
+	fn force_no_eras() -> Weight {
+		(3_869_000 as Weight)
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+
+	}
+	fn force_new_era() -> Weight {
+		(3_795_000 as Weight)
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+
+	}
+	fn force_new_era_always() -> Weight {
+		(3_829_000 as Weight)
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+
+	}
+	fn set_invulnerables(v: u32, ) -> Weight {
+		(4_087_000 as Weight)
+			.saturating_add((9_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+
+	}
+	fn force_unstake(s: u32, ) -> Weight {
+		(81_063_000 as Weight)
+			.saturating_add((3_872_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().writes(8 as Weight))
+			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+	}
+	fn cancel_deferred_slash(s: u32, ) -> Weight {
+		(5_840_640_000 as Weight)
+			.saturating_add((34_806_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+
+	}
+	fn payout_stakers_dead_controller(n: u32, ) -> Weight {
+		(153_024_000 as Weight)
+			.saturating_add((59_909_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(11 as Weight))
+			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(n as Weight)))
+	}
+	fn payout_stakers_alive_staked(n: u32, ) -> Weight {
+		(196_058_000 as Weight)
+			.saturating_add((78_955_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(12 as Weight))
+			.saturating_add(T::DbWeight::get().reads((5 as Weight).saturating_mul(n as Weight)))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(n as Weight)))
+	}
+	fn rebond(l: u32, ) -> Weight {
+		(49_966_000 as Weight)
+			.saturating_add((92_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+
+	}
+	fn set_history_depth(e: u32, ) -> Weight {
+		(0 as Weight)
+			.saturating_add((38_529_000 as Weight).saturating_mul(e as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(4 as Weight))
+			.saturating_add(T::DbWeight::get().writes((7 as Weight).saturating_mul(e as Weight)))
+	}
+	fn reap_stash(s: u32, ) -> Weight {
+		(101_457_000 as Weight)
+			.saturating_add((3_914_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().writes(8 as Weight))
+			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+	}
+	fn new_era(v: u32, n: u32, ) -> Weight {
+		(0 as Weight)
+			.saturating_add((948_467_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((117_579_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(10 as Weight))
+			.saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(v as Weight)))
+			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
+			.saturating_add(T::DbWeight::get().writes(8 as Weight))
+			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(v as Weight)))
+	}
+	fn submit_solution_better(v: u32, n: u32, a: u32, w: u32, ) -> Weight {
+		(0 as Weight)
+			.saturating_add((1_728_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((907_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((99_762_000 as Weight).saturating_mul(a as Weight))
+			.saturating_add((9_017_000 as Weight).saturating_mul(w as Weight))
+			.saturating_add(T::DbWeight::get().reads(6 as Weight))
+			.saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(a as Weight)))
+			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(w as Weight)))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+
+	}
+
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+	fn bond() -> Weight {
+		(99_659_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
+
+	}
+	fn bond_extra() -> Weight {
+		(79_045_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+
+	}
+	fn unbond() -> Weight {
+		(71_716_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+
+	}
+	fn withdraw_unbonded_update(s: u32, ) -> Weight {
+		(72_835_000 as Weight)
+			.saturating_add((63_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+
+	}
+	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
+		(118_239_000 as Weight)
+			.saturating_add((3_910_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+	}
+	fn validate() -> Weight {
+		(25_691_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+
+	}
+	fn nominate(n: u32, ) -> Weight {
+		(35_374_000 as Weight)
+			.saturating_add((203_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+
+	}
+	fn chill() -> Weight {
+		(25_227_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+
+	}
+	fn set_payee() -> Weight {
+		(17_601_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+
+	}
+	fn set_controller() -> Weight {
+		(37_514_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+
+	}
+	fn set_validator_count() -> Weight {
+		(3_338_000 as Weight)
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+
+	}
+	fn force_no_eras() -> Weight {
+		(3_869_000 as Weight)
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+
+	}
+	fn force_new_era() -> Weight {
+		(3_795_000 as Weight)
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+
+	}
+	fn force_new_era_always() -> Weight {
+		(3_829_000 as Weight)
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+
+	}
+	fn set_invulnerables(v: u32, ) -> Weight {
+		(4_087_000 as Weight)
+			.saturating_add((9_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+
+	}
+	fn force_unstake(s: u32, ) -> Weight {
+		(81_063_000 as Weight)
+			.saturating_add((3_872_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+	}
+	fn cancel_deferred_slash(s: u32, ) -> Weight {
+		(5_840_640_000 as Weight)
+			.saturating_add((34_806_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+
+	}
+	fn payout_stakers_dead_controller(n: u32, ) -> Weight {
+		(153_024_000 as Weight)
+			.saturating_add((59_909_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(11 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(n as Weight)))
+	}
+	fn payout_stakers_alive_staked(n: u32, ) -> Weight {
+		(196_058_000 as Weight)
+			.saturating_add((78_955_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(12 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((5 as Weight).saturating_mul(n as Weight)))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(n as Weight)))
+	}
+	fn rebond(l: u32, ) -> Weight {
+		(49_966_000 as Weight)
+			.saturating_add((92_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+
+	}
+	fn set_history_depth(e: u32, ) -> Weight {
+		(0 as Weight)
+			.saturating_add((38_529_000 as Weight).saturating_mul(e as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((7 as Weight).saturating_mul(e as Weight)))
+	}
+	fn reap_stash(s: u32, ) -> Weight {
+		(101_457_000 as Weight)
+			.saturating_add((3_914_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+	}
+	fn new_era(v: u32, n: u32, ) -> Weight {
+		(0 as Weight)
+			.saturating_add((948_467_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((117_579_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((4 as Weight).saturating_mul(v as Weight)))
+			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
+			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(v as Weight)))
+	}
+	fn submit_solution_better(v: u32, n: u32, a: u32, w: u32, ) -> Weight {
+		(0 as Weight)
+			.saturating_add((1_728_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((907_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((99_762_000 as Weight).saturating_mul(a as Weight))
+			.saturating_add((9_017_000 as Weight).saturating_mul(w as Weight))
+			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((4 as Weight).saturating_mul(a as Weight)))
+			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(w as Weight)))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+
+	}
+
+}
diff --git a/frame/system/src/default_weights.rs b/frame/system/src/default_weights.rs
deleted file mode 100644
index 8b0c17a28515..000000000000
--- a/frame/system/src/default_weights.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc5
-
-#![allow(unused_parens)]
-
-use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
-
-impl crate::WeightInfo for () {
-	fn remark(_b: u32) -> Weight {
-		(1305000 as Weight)
-	}
-	fn set_heap_pages() -> Weight {
-		(2023000 as Weight)
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn set_changes_trie_config() -> Weight {
-		(10026000 as Weight)
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn set_storage(i: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((656000 as Weight).saturating_mul(i as Weight))
-			.saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
-	}
-	fn kill_storage(i: u32, ) -> Weight {
-		(4327000 as Weight)
-			.saturating_add((478000 as Weight).saturating_mul(i as Weight))
-			.saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
-	}
-	fn kill_prefix(p: u32, ) -> Weight {
-		(8349000 as Weight)
-			.saturating_add((838000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
-	}
-	fn suicide() -> Weight {
-		(29247000 as Weight)
-	}
-}
diff --git a/frame/system/src/extensions/check_weight.rs b/frame/system/src/extensions/check_weight.rs
index 30052468fe25..39439a3e2d8c 100644
--- a/frame/system/src/extensions/check_weight.rs
+++ b/frame/system/src/extensions/check_weight.rs
@@ -90,7 +90,7 @@ impl<T: Trait + Send + Sync> CheckWeight<T> where
 	/// Upon successes, it returns the new block weight as a `Result`.
 	fn check_block_weight(
 		info: &DispatchInfoOf<T::Call>,
-	) -> Result<crate::weights::ExtrinsicsWeight, TransactionValidityError> {
+	) -> Result<crate::weight::ExtrinsicsWeight, TransactionValidityError> {
 		let maximum_weight = T::MaximumBlockWeight::get();
 		let mut all_weight = Module::<T>::block_weight();
 		match info.class {
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index e9b7a6d9f710..595b001ea6b0 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -136,10 +136,10 @@ pub mod offchain;
 pub(crate) mod mock;
 
 mod extensions;
-mod weights;
+mod weight;
+pub mod weights;
 #[cfg(test)]
 mod tests;
-mod default_weights;
 
 pub use extensions::{
 	check_mortality::CheckMortality, check_genesis::CheckGenesis, check_nonce::CheckNonce,
@@ -148,6 +148,7 @@ pub use extensions::{
 };
 // Backward compatible re-export.
 pub use extensions::check_mortality::CheckMortality as CheckEra;
+pub use weights::WeightInfo;
 
 /// Compute the trie root of a list of extrinsics.
 pub fn extrinsics_root<H: Hash, E: codec::Encode>(extrinsics: &[E]) -> H::Output {
@@ -159,16 +160,6 @@ pub fn extrinsics_data_root<H: Hash>(xts: Vec<Vec<u8>>) -> H::Output {
 	H::ordered_trie_root(xts)
 }
 
-pub trait WeightInfo {
-	fn remark(b: u32) -> Weight;
-	fn set_heap_pages() -> Weight;
-	fn set_changes_trie_config() -> Weight;
-	fn set_storage(i: u32, ) -> Weight;
-	fn kill_storage(i: u32, ) -> Weight;
-	fn kill_prefix(p: u32, ) -> Weight;
-	fn suicide() -> Weight;
-}
-
 pub trait Trait: 'static + Eq + Clone {
 	/// The basic call filter to use in Origin. All origins are built with this filter as base,
 	/// except Root.
@@ -408,7 +399,7 @@ decl_storage! {
 		ExtrinsicCount: Option<u32>;
 
 		/// The current weight for the block.
-		BlockWeight get(fn block_weight): weights::ExtrinsicsWeight;
+		BlockWeight get(fn block_weight): weight::ExtrinsicsWeight;
 
 		/// Total length (in bytes) for all extrinsics put together, for the current block.
 		AllExtrinsicsLen: Option<u32>;
diff --git a/frame/system/src/weight.rs b/frame/system/src/weight.rs
new file mode 100644
index 000000000000..93295093c4fb
--- /dev/null
+++ b/frame/system/src/weight.rs
@@ -0,0 +1,76 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use codec::{Encode, Decode};
+use frame_support::weights::{Weight, DispatchClass};
+use sp_runtime::RuntimeDebug;
+
+/// An object to track the currently used extrinsic weight in a block.
+#[derive(Clone, Eq, PartialEq, Default, RuntimeDebug, Encode, Decode)]
+pub struct ExtrinsicsWeight {
+	normal: Weight,
+	operational: Weight,
+}
+
+impl ExtrinsicsWeight {
+	/// Returns the total weight consumed by all extrinsics in the block.
+	pub fn total(&self) -> Weight {
+		self.normal.saturating_add(self.operational)
+	}
+
+	/// Add some weight of a specific dispatch class, saturating at the numeric bounds of `Weight`.
+	pub fn add(&mut self, weight: Weight, class: DispatchClass) {
+		let value = self.get_mut(class);
+		*value = value.saturating_add(weight);
+	}
+
+	/// Try to add some weight of a specific dispatch class, returning Err(()) if overflow would
+	/// occur.
+	pub fn checked_add(&mut self, weight: Weight, class: DispatchClass) -> Result<(), ()> {
+		let value = self.get_mut(class);
+		*value = value.checked_add(weight).ok_or(())?;
+		Ok(())
+	}
+
+	/// Subtract some weight of a specific dispatch class, saturating at the numeric bounds of
+	/// `Weight`.
+	pub fn sub(&mut self, weight: Weight, class: DispatchClass) {
+		let value = self.get_mut(class);
+		*value = value.saturating_sub(weight);
+	}
+
+	/// Get the current weight of a specific dispatch class.
+	pub fn get(&self, class: DispatchClass) -> Weight {
+		match class {
+			DispatchClass::Operational => self.operational,
+			DispatchClass::Normal | DispatchClass::Mandatory => self.normal,
+		}
+	}
+
+	/// Get a mutable reference to the current weight of a specific dispatch class.
+	fn get_mut(&mut self, class: DispatchClass) -> &mut Weight {
+		match class {
+			DispatchClass::Operational => &mut self.operational,
+			DispatchClass::Normal | DispatchClass::Mandatory => &mut self.normal,
+		}
+	}
+
+	/// Set the weight of a specific dispatch class.
+	pub fn put(&mut self, new: Weight, class: DispatchClass) {
+		*self.get_mut(class) = new;
+	}
+}
diff --git a/frame/system/src/weights.rs b/frame/system/src/weights.rs
index 93295093c4fb..fb07e125071e 100644
--- a/frame/system/src/weights.rs
+++ b/frame/system/src/weights.rs
@@ -1,13 +1,13 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-// 	http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,62 +15,119 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use codec::{Encode, Decode};
-use frame_support::weights::{Weight, DispatchClass};
-use sp_runtime::RuntimeDebug;
+//! Weights for frame_system
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
+//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
+
+// Executed Command:
+// target/release/substrate
+// benchmark
+// --chain=dev
+// --steps=50
+// --repeat=20
+// --pallet=frame_system
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./frame/system/src/weights.rs
+// --template=./.maintain/frame-weight-template.hbs
+
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for frame_system.
+pub trait WeightInfo {
+	fn remark(_b: u32, ) -> Weight;
+	fn set_heap_pages() -> Weight;
+	fn set_changes_trie_config() -> Weight;
+	fn set_storage(_i: u32, ) -> Weight;
+	fn kill_storage(_i: u32, ) -> Weight;
+	fn kill_prefix(_p: u32, ) -> Weight;
+	fn suicide() -> Weight;
 
-/// An object to track the currently used extrinsic weight in a block.
-#[derive(Clone, Eq, PartialEq, Default, RuntimeDebug, Encode, Decode)]
-pub struct ExtrinsicsWeight {
-	normal: Weight,
-	operational: Weight,
 }
 
-impl ExtrinsicsWeight {
-	/// Returns the total weight consumed by all extrinsics in the block.
-	pub fn total(&self) -> Weight {
-		self.normal.saturating_add(self.operational)
+/// Weights for frame_system using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: crate::Trait> WeightInfo for SubstrateWeight<T> {
+	fn remark(_b: u32, ) -> Weight {
+		(1_906_000 as Weight)
+
+	}
+	fn set_heap_pages() -> Weight {
+		(2_792_000 as Weight)
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+
 	}
+	fn set_changes_trie_config() -> Weight {
+		(12_029_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 
-	/// Add some weight of a specific dispatch class, saturating at the numeric bounds of `Weight`.
-	pub fn add(&mut self, weight: Weight, class: DispatchClass) {
-		let value = self.get_mut(class);
-		*value = value.saturating_add(weight);
 	}
+	fn set_storage(i: u32, ) -> Weight {
+		(0 as Weight)
+			.saturating_add((842_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
+	}
+	fn kill_storage(i: u32, ) -> Weight {
+		(1_120_000 as Weight)
+			.saturating_add((599_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
+	}
+	fn kill_prefix(p: u32, ) -> Weight {
+		(9_470_000 as Weight)
+			.saturating_add((861_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
+	}
+	fn suicide() -> Weight {
+		(38_469_000 as Weight)
 
-	/// Try to add some weight of a specific dispatch class, returning Err(()) if overflow would
-	/// occur.
-	pub fn checked_add(&mut self, weight: Weight, class: DispatchClass) -> Result<(), ()> {
-		let value = self.get_mut(class);
-		*value = value.checked_add(weight).ok_or(())?;
-		Ok(())
 	}
 
-	/// Subtract some weight of a specific dispatch class, saturating at the numeric bounds of
-	/// `Weight`.
-	pub fn sub(&mut self, weight: Weight, class: DispatchClass) {
-		let value = self.get_mut(class);
-		*value = value.saturating_sub(weight);
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+	fn remark(_b: u32, ) -> Weight {
+		(1_906_000 as Weight)
+
 	}
+	fn set_heap_pages() -> Weight {
+		(2_792_000 as Weight)
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 
-	/// Get the current weight of a specific dispatch class.
-	pub fn get(&self, class: DispatchClass) -> Weight {
-		match class {
-			DispatchClass::Operational => self.operational,
-			DispatchClass::Normal | DispatchClass::Mandatory => self.normal,
-		}
 	}
+	fn set_changes_trie_config() -> Weight {
+		(12_029_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 
-	/// Get a mutable reference to the current weight of a specific dispatch class.
-	fn get_mut(&mut self, class: DispatchClass) -> &mut Weight {
-		match class {
-			DispatchClass::Operational => &mut self.operational,
-			DispatchClass::Normal | DispatchClass::Mandatory => &mut self.normal,
-		}
 	}
+	fn set_storage(i: u32, ) -> Weight {
+		(0 as Weight)
+			.saturating_add((842_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
+	}
+	fn kill_storage(i: u32, ) -> Weight {
+		(1_120_000 as Weight)
+			.saturating_add((599_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
+	}
+	fn kill_prefix(p: u32, ) -> Weight {
+		(9_470_000 as Weight)
+			.saturating_add((861_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
+	}
+	fn suicide() -> Weight {
+		(38_469_000 as Weight)
 
-	/// Set the weight of a specific dispatch class.
-	pub fn put(&mut self, new: Weight, class: DispatchClass) {
-		*self.get_mut(class) = new;
 	}
+
 }
diff --git a/frame/timestamp/src/default_weights.rs b/frame/timestamp/src/default_weights.rs
deleted file mode 100644
index d8db0182282b..000000000000
--- a/frame/timestamp/src/default_weights.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc5
-
-#![allow(unused_parens)]
-
-use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
-
-impl crate::WeightInfo for () {
-	fn set() -> Weight {
-		(9133000 as Weight)
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn on_finalize() -> Weight {
-		(5915000 as Weight)
-	}
-}
diff --git a/frame/timestamp/src/lib.rs b/frame/timestamp/src/lib.rs
index e03037f2e8e1..d546a34017d0 100644
--- a/frame/timestamp/src/lib.rs
+++ b/frame/timestamp/src/lib.rs
@@ -93,7 +93,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 mod benchmarking;
-mod default_weights;
+pub mod weights;
 
 use sp_std::{result, cmp};
 use sp_inherents::{ProvideInherent, InherentData, InherentIdentifier};
@@ -115,11 +115,7 @@ use sp_timestamp::{
 	InherentError, INHERENT_IDENTIFIER, InherentType,
 	OnTimestampSet,
 };
-
-pub trait WeightInfo {
-	fn set() -> Weight;
-	fn on_finalize() -> Weight;
-}
+pub use weights::WeightInfo;
 
 /// The module configuration trait
 pub trait Trait: frame_system::Trait {
diff --git a/frame/timestamp/src/weights.rs b/frame/timestamp/src/weights.rs
new file mode 100644
index 000000000000..67ce28ba9111
--- /dev/null
+++ b/frame/timestamp/src/weights.rs
@@ -0,0 +1,80 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Weights for pallet_timestamp
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
+//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
+
+// Executed Command:
+// target/release/substrate
+// benchmark
+// --chain=dev
+// --steps=50
+// --repeat=20
+// --pallet=pallet_timestamp
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./frame/timestamp/src/weights.rs
+// --template=./.maintain/frame-weight-template.hbs
+
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for pallet_timestamp.
+pub trait WeightInfo {
+	fn set() -> Weight;
+	fn on_finalize() -> Weight;
+	
+}
+
+/// Weights for pallet_timestamp using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+	fn set() -> Weight {
+		(11_650_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn on_finalize() -> Weight {
+		(6_681_000 as Weight)
+			
+	}
+	
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+	fn set() -> Weight {
+		(11_650_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn on_finalize() -> Weight {
+		(6_681_000 as Weight)
+			
+	}
+	
+}
diff --git a/frame/treasury/src/default_weights.rs b/frame/treasury/src/default_weights.rs
deleted file mode 100644
index bf4f5fb789a5..000000000000
--- a/frame/treasury/src/default_weights.rs
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
-
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
-
-impl crate::WeightInfo for () {
-	fn propose_spend() -> Weight {
-		(79604000 as Weight)
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn reject_proposal() -> Weight {
-		(61001000 as Weight)
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn approve_proposal() -> Weight {
-		(17835000 as Weight)
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn report_awesome(r: u32, ) -> Weight {
-		(101602000 as Weight)
-			.saturating_add((2000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn retract_tip() -> Weight {
-		(82970000 as Weight)
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn tip_new(r: u32, t: u32, ) -> Weight {
-		(63995000 as Weight)
-			.saturating_add((2000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((153000 as Weight).saturating_mul(t as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn tip(t: u32, ) -> Weight {
-		(46765000 as Weight)
-			.saturating_add((711000 as Weight).saturating_mul(t as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn close_tip(t: u32, ) -> Weight {
-		(160874000 as Weight)
-			.saturating_add((379000 as Weight).saturating_mul(t as Weight))
-			.saturating_add(DbWeight::get().reads(3 as Weight))
-			.saturating_add(DbWeight::get().writes(3 as Weight))
-	}
-	fn propose_bounty(d: u32, ) -> Weight {
-		(86198000 as Weight)
-			.saturating_add((1000 as Weight).saturating_mul(d as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(4 as Weight))
-	}
-	fn approve_bounty() -> Weight {
-		(23063000 as Weight)
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn propose_curator() -> Weight {
-		(18890000 as Weight)
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn unassign_curator() -> Weight {
-		(66768000 as Weight)
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn accept_curator() -> Weight {
-		(69131000 as Weight)
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn award_bounty() -> Weight {
-		(48184000 as Weight)
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn claim_bounty() -> Weight {
-		(243104000 as Weight)
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-			.saturating_add(DbWeight::get().writes(5 as Weight))
-	}
-	fn close_bounty_proposed() -> Weight {
-		(65917000 as Weight)
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(3 as Weight))
-	}
-	fn close_bounty_active() -> Weight {
-		(157232000 as Weight)
-			.saturating_add(DbWeight::get().reads(3 as Weight))
-			.saturating_add(DbWeight::get().writes(4 as Weight))
-	}
-	fn extend_bounty_expiry() -> Weight {
-		(46216000 as Weight)
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn on_initialize_proposals(p: u32, ) -> Weight {
-		(119765000 as Weight)
-			.saturating_add((108368000 as Weight).saturating_mul(p as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().reads((3 as Weight).saturating_mul(p as Weight)))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-			.saturating_add(DbWeight::get().writes((3 as Weight).saturating_mul(p as Weight)))
-	}
-	fn on_initialize_bounties(b: u32, ) -> Weight {
-		(112536000 as Weight)
-			.saturating_add((107132000 as Weight).saturating_mul(b as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().reads((3 as Weight).saturating_mul(b as Weight)))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-			.saturating_add(DbWeight::get().writes((3 as Weight).saturating_mul(b as Weight)))
-	}
-}
diff --git a/frame/treasury/src/lib.rs b/frame/treasury/src/lib.rs
index a61f64e907d8..43f9515f0a19 100644
--- a/frame/treasury/src/lib.rs
+++ b/frame/treasury/src/lib.rs
@@ -134,6 +134,10 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
+mod tests;
+mod benchmarking;
+pub mod weights;
+
 #[cfg(feature = "std")]
 use serde::{Serialize, Deserialize};
 use sp_std::prelude::*;
@@ -150,10 +154,7 @@ use frame_support::weights::{Weight, DispatchClass};
 use frame_support::traits::{Contains, ContainsLengthBound, EnsureOrigin};
 use codec::{Encode, Decode};
 use frame_system::{self as system, ensure_signed};
-
-mod tests;
-mod benchmarking;
-mod default_weights;
+pub use weights::WeightInfo;
 
 type BalanceOf<T, I> =
 	<<T as Trait<I>>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
@@ -162,29 +163,6 @@ type PositiveImbalanceOf<T, I> =
 type NegativeImbalanceOf<T, I> =
 	<<T as Trait<I>>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::NegativeImbalance;
 
-pub trait WeightInfo {
-	fn propose_spend() -> Weight;
-	fn reject_proposal() -> Weight;
-	fn approve_proposal() -> Weight;
-	fn report_awesome(r: u32, ) -> Weight;
-	fn retract_tip() -> Weight;
-	fn tip_new(r: u32, t: u32, ) -> Weight;
-	fn tip(t: u32, ) -> Weight;
-	fn close_tip(t: u32, ) -> Weight;
-	fn propose_bounty(r: u32, ) -> Weight;
-	fn approve_bounty() -> Weight;
-	fn propose_curator() -> Weight;
-	fn unassign_curator() -> Weight;
-	fn accept_curator() -> Weight;
-	fn award_bounty() -> Weight;
-	fn claim_bounty() -> Weight;
-	fn close_bounty_proposed() -> Weight;
-	fn close_bounty_active() -> Weight;
-	fn extend_bounty_expiry() -> Weight;
-	fn on_initialize_proposals(p: u32, ) -> Weight;
-	fn on_initialize_bounties(b: u32, ) -> Weight;
-}
-
 pub trait Trait<I=DefaultInstance>: frame_system::Trait {
 	/// The treasury's module id, used for deriving its sovereign account ID.
 	type ModuleId: Get<ModuleId>;
diff --git a/frame/treasury/src/weights.rs b/frame/treasury/src/weights.rs
new file mode 100644
index 000000000000..646b9869f47e
--- /dev/null
+++ b/frame/treasury/src/weights.rs
@@ -0,0 +1,338 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Weights for pallet_treasury
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
+//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
+
+// Executed Command:
+// target/release/substrate
+// benchmark
+// --chain=dev
+// --steps=50
+// --repeat=20
+// --pallet=pallet_treasury
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./frame/treasury/src/weights.rs
+// --template=./.maintain/frame-weight-template.hbs
+
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for pallet_treasury.
+pub trait WeightInfo {
+	fn propose_spend() -> Weight;
+	fn reject_proposal() -> Weight;
+	fn approve_proposal() -> Weight;
+	fn report_awesome(r: u32, ) -> Weight;
+	fn retract_tip() -> Weight;
+	fn tip_new(r: u32, t: u32, ) -> Weight;
+	fn tip(t: u32, ) -> Weight;
+	fn close_tip(t: u32, ) -> Weight;
+	fn propose_bounty(d: u32, ) -> Weight;
+	fn approve_bounty() -> Weight;
+	fn propose_curator() -> Weight;
+	fn unassign_curator() -> Weight;
+	fn accept_curator() -> Weight;
+	fn award_bounty() -> Weight;
+	fn claim_bounty() -> Weight;
+	fn close_bounty_proposed() -> Weight;
+	fn close_bounty_active() -> Weight;
+	fn extend_bounty_expiry() -> Weight;
+	fn on_initialize_proposals(p: u32, ) -> Weight;
+	fn on_initialize_bounties(b: u32, ) -> Weight;
+	
+}
+
+/// Weights for pallet_treasury using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+	fn propose_spend() -> Weight {
+		(56_844_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			
+	}
+	fn reject_proposal() -> Weight {
+		(46_098_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			
+	}
+	fn approve_proposal() -> Weight {
+		(13_622_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn report_awesome(r: u32, ) -> Weight {
+		(71_823_000 as Weight)
+			.saturating_add((2_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			
+	}
+	fn retract_tip() -> Weight {
+		(60_150_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			
+	}
+	fn tip_new(r: u32, t: u32, ) -> Weight {
+		(46_522_000 as Weight)
+			.saturating_add((2_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((145_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			
+	}
+	fn tip(t: u32, ) -> Weight {
+		(33_790_000 as Weight)
+			.saturating_add((713_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn close_tip(t: u32, ) -> Weight {
+		(113_040_000 as Weight)
+			.saturating_add((375_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+			
+	}
+	fn propose_bounty(d: u32, ) -> Weight {
+		(60_887_000 as Weight)
+			.saturating_add((1_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(4 as Weight))
+			
+	}
+	fn approve_bounty() -> Weight {
+		(17_337_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			
+	}
+	fn propose_curator() -> Weight {
+		(14_068_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn unassign_curator() -> Weight {
+		(49_717_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			
+	}
+	fn accept_curator() -> Weight {
+		(50_596_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			
+	}
+	fn award_bounty() -> Weight {
+		(36_030_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn claim_bounty() -> Weight {
+		(167_088_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().writes(5 as Weight))
+			
+	}
+	fn close_bounty_proposed() -> Weight {
+		(48_977_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+			
+	}
+	fn close_bounty_active() -> Weight {
+		(110_959_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(4 as Weight))
+			
+	}
+	fn extend_bounty_expiry() -> Weight {
+		(34_987_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn on_initialize_proposals(p: u32, ) -> Weight {
+		(76_596_000 as Weight)
+			.saturating_add((73_988_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(p as Weight)))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(p as Weight)))
+	}
+	fn on_initialize_bounties(b: u32, ) -> Weight {
+		(75_165_000 as Weight)
+			.saturating_add((73_634_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(b as Weight)))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(b as Weight)))
+	}
+	
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+	fn propose_spend() -> Weight {
+		(56_844_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			
+	}
+	fn reject_proposal() -> Weight {
+		(46_098_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			
+	}
+	fn approve_proposal() -> Weight {
+		(13_622_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn report_awesome(r: u32, ) -> Weight {
+		(71_823_000 as Weight)
+			.saturating_add((2_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			
+	}
+	fn retract_tip() -> Weight {
+		(60_150_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			
+	}
+	fn tip_new(r: u32, t: u32, ) -> Weight {
+		(46_522_000 as Weight)
+			.saturating_add((2_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((145_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			
+	}
+	fn tip(t: u32, ) -> Weight {
+		(33_790_000 as Weight)
+			.saturating_add((713_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn close_tip(t: u32, ) -> Weight {
+		(113_040_000 as Weight)
+			.saturating_add((375_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+			
+	}
+	fn propose_bounty(d: u32, ) -> Weight {
+		(60_887_000 as Weight)
+			.saturating_add((1_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
+			
+	}
+	fn approve_bounty() -> Weight {
+		(17_337_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			
+	}
+	fn propose_curator() -> Weight {
+		(14_068_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn unassign_curator() -> Weight {
+		(49_717_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			
+	}
+	fn accept_curator() -> Weight {
+		(50_596_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			
+	}
+	fn award_bounty() -> Weight {
+		(36_030_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn claim_bounty() -> Weight {
+		(167_088_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
+			
+	}
+	fn close_bounty_proposed() -> Weight {
+		(48_977_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+			
+	}
+	fn close_bounty_active() -> Weight {
+		(110_959_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
+			
+	}
+	fn extend_bounty_expiry() -> Weight {
+		(34_987_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn on_initialize_proposals(p: u32, ) -> Weight {
+		(76_596_000 as Weight)
+			.saturating_add((73_988_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(p as Weight)))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(p as Weight)))
+	}
+	fn on_initialize_bounties(b: u32, ) -> Weight {
+		(75_165_000 as Weight)
+			.saturating_add((73_634_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(b as Weight)))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(b as Weight)))
+	}
+	
+}
diff --git a/frame/utility/src/default_weights.rs b/frame/utility/src/default_weights.rs
deleted file mode 100644
index 8dc9b6fb8c4b..000000000000
--- a/frame/utility/src/default_weights.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Weights for pallet_utility
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-02, STEPS: [50], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
-
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
-
-impl crate::WeightInfo for () {
-	fn batch(c: u32, ) -> Weight {
-		(20_803_000 as Weight)
-			.saturating_add((1_984_000 as Weight).saturating_mul(c as Weight))
-	}
-	fn as_derivative() -> Weight {
-		(5_853_000 as Weight)
-	}
-	fn batch_all(c: u32, ) -> Weight {
-		(21_104_000 as Weight)
-			.saturating_add((1_509_000 as Weight).saturating_mul(c as Weight))
-	}
-}
diff --git a/frame/utility/src/lib.rs b/frame/utility/src/lib.rs
index 3aa310c8acb7..e7ff09c8f0db 100644
--- a/frame/utility/src/lib.rs
+++ b/frame/utility/src/lib.rs
@@ -55,6 +55,10 @@
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
 
+mod tests;
+mod benchmarking;
+pub mod weights;
+
 use sp_std::prelude::*;
 use codec::{Encode, Decode};
 use sp_core::TypeId;
@@ -67,16 +71,7 @@ use frame_support::{
 };
 use frame_system::{ensure_signed, ensure_root};
 use sp_runtime::{DispatchError, traits::Dispatchable};
-
-mod tests;
-mod benchmarking;
-mod default_weights;
-
-pub trait WeightInfo {
-	fn batch(c: u32, ) -> Weight;
-	fn as_derivative() -> Weight;
-	fn batch_all(c: u32, ) -> Weight;
-}
+pub use weights::WeightInfo;
 
 /// Configuration trait.
 pub trait Trait: frame_system::Trait {
diff --git a/frame/utility/src/weights.rs b/frame/utility/src/weights.rs
new file mode 100644
index 000000000000..73e4e3b1d93b
--- /dev/null
+++ b/frame/utility/src/weights.rs
@@ -0,0 +1,89 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Weights for pallet_utility
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
+//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
+
+// Executed Command:
+// target/release/substrate
+// benchmark
+// --chain=dev
+// --steps=50
+// --repeat=20
+// --pallet=pallet_utility
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./frame/utility/src/weights.rs
+// --template=./.maintain/frame-weight-template.hbs
+
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for pallet_utility.
+pub trait WeightInfo {
+	fn batch(c: u32, ) -> Weight;
+	fn as_derivative() -> Weight;
+	fn batch_all(c: u32, ) -> Weight;
+	
+}
+
+/// Weights for pallet_utility using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+	fn batch(c: u32, ) -> Weight {
+		(20_071_000 as Weight)
+			.saturating_add((2_739_000 as Weight).saturating_mul(c as Weight))
+			
+	}
+	fn as_derivative() -> Weight {
+		(5_721_000 as Weight)
+			
+	}
+	fn batch_all(c: u32, ) -> Weight {
+		(21_440_000 as Weight)
+			.saturating_add((2_738_000 as Weight).saturating_mul(c as Weight))
+			
+	}
+	
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+	fn batch(c: u32, ) -> Weight {
+		(20_071_000 as Weight)
+			.saturating_add((2_739_000 as Weight).saturating_mul(c as Weight))
+			
+	}
+	fn as_derivative() -> Weight {
+		(5_721_000 as Weight)
+			
+	}
+	fn batch_all(c: u32, ) -> Weight {
+		(21_440_000 as Weight)
+			.saturating_add((2_738_000 as Weight).saturating_mul(c as Weight))
+			
+	}
+	
+}
diff --git a/frame/vesting/src/default_weights.rs b/frame/vesting/src/default_weights.rs
deleted file mode 100644
index dac9224d69ab..000000000000
--- a/frame/vesting/src/default_weights.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
-
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
-
-impl crate::WeightInfo for () {
-	fn vest_locked(l: u32, ) -> Weight {
-		(82109000 as Weight)
-			.saturating_add((332000 as Weight).saturating_mul(l as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn vest_unlocked(l: u32, ) -> Weight {
-		(88419000 as Weight)
-			.saturating_add((3000 as Weight).saturating_mul(l as Weight))
-			.saturating_add(DbWeight::get().reads(2 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn vest_other_locked(l: u32, ) -> Weight {
-		(81277000 as Weight)
-			.saturating_add((321000 as Weight).saturating_mul(l as Weight))
-			.saturating_add(DbWeight::get().reads(3 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn vest_other_unlocked(l: u32, ) -> Weight {
-		(87584000 as Weight)
-			.saturating_add((19000 as Weight).saturating_mul(l as Weight))
-			.saturating_add(DbWeight::get().reads(3 as Weight))
-			.saturating_add(DbWeight::get().writes(3 as Weight))
-	}
-	fn vested_transfer(l: u32, ) -> Weight {
-		(185916000 as Weight)
-			.saturating_add((625000 as Weight).saturating_mul(l as Weight))
-			.saturating_add(DbWeight::get().reads(3 as Weight))
-			.saturating_add(DbWeight::get().writes(3 as Weight))
-	}
-	fn force_vested_transfer(l: u32, ) -> Weight {
-		(185916000 as Weight)
-			.saturating_add((625000 as Weight).saturating_mul(l as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-			.saturating_add(DbWeight::get().writes(4 as Weight))
-	}
-}
diff --git a/frame/vesting/src/lib.rs b/frame/vesting/src/lib.rs
index 1583b06d69f8..959df1fb1b36 100644
--- a/frame/vesting/src/lib.rs
+++ b/frame/vesting/src/lib.rs
@@ -47,34 +47,26 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
+mod benchmarking;
+pub mod weights;
+
 use sp_std::prelude::*;
 use sp_std::fmt::Debug;
 use codec::{Encode, Decode};
 use sp_runtime::{DispatchResult, RuntimeDebug, traits::{
 	StaticLookup, Zero, AtLeast32BitUnsigned, MaybeSerializeDeserialize, Convert
 }};
-use frame_support::{decl_module, decl_event, decl_storage, decl_error, ensure, weights::Weight};
+use frame_support::{decl_module, decl_event, decl_storage, decl_error, ensure};
 use frame_support::traits::{
 	Currency, LockableCurrency, VestingSchedule, WithdrawReason, LockIdentifier,
 	ExistenceRequirement, Get,
 };
 use frame_system::{ensure_signed, ensure_root};
-
-mod benchmarking;
-mod default_weights;
+pub use weights::WeightInfo;
 
 type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
 type MaxLocksOf<T> = <<T as Trait>::Currency as LockableCurrency<<T as frame_system::Trait>::AccountId>>::MaxLocks;
 
-pub trait WeightInfo {
-	fn vest_locked(l: u32, ) -> Weight;
-	fn vest_unlocked(l: u32, ) -> Weight;
-	fn vest_other_locked(l: u32, ) -> Weight;
-	fn vest_other_unlocked(l: u32, ) -> Weight;
-	fn vested_transfer(l: u32, ) -> Weight;
-	fn force_vested_transfer(l: u32, ) -> Weight;
-}
-
 pub trait Trait: frame_system::Trait {
 	/// The overarching event type.
 	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
diff --git a/frame/vesting/src/weights.rs b/frame/vesting/src/weights.rs
new file mode 100644
index 000000000000..23a46ec763d8
--- /dev/null
+++ b/frame/vesting/src/weights.rs
@@ -0,0 +1,148 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Weights for pallet_vesting
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
+//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
+
+// Executed Command:
+// target/release/substrate
+// benchmark
+// --chain=dev
+// --steps=50
+// --repeat=20
+// --pallet=pallet_vesting
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./frame/vesting/src/weights.rs
+// --template=./.maintain/frame-weight-template.hbs
+
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for pallet_vesting.
+pub trait WeightInfo {
+	fn vest_locked(l: u32, ) -> Weight;
+	fn vest_unlocked(l: u32, ) -> Weight;
+	fn vest_other_locked(l: u32, ) -> Weight;
+	fn vest_other_unlocked(l: u32, ) -> Weight;
+	fn vested_transfer(l: u32, ) -> Weight;
+	fn force_vested_transfer(l: u32, ) -> Weight;
+
+}
+
+/// Weights for pallet_vesting using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+	fn vest_locked(l: u32, ) -> Weight {
+		(57_472_000 as Weight)
+			.saturating_add((155_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+
+	}
+	fn vest_unlocked(l: u32, ) -> Weight {
+		(61_681_000 as Weight)
+			.saturating_add((138_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+
+	}
+	fn vest_other_locked(l: u32, ) -> Weight {
+		(56_910_000 as Weight)
+			.saturating_add((160_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+
+	}
+	fn vest_other_unlocked(l: u32, ) -> Weight {
+		(61_319_000 as Weight)
+			.saturating_add((144_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+
+	}
+	fn vested_transfer(l: u32, ) -> Weight {
+		(124_996_000 as Weight)
+			.saturating_add((209_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+
+	}
+	fn force_vested_transfer(l: u32, ) -> Weight {
+		(123_911_000 as Weight)
+			.saturating_add((213_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().writes(4 as Weight))
+
+	}
+
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+	fn vest_locked(l: u32, ) -> Weight {
+		(57_472_000 as Weight)
+			.saturating_add((155_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+
+	}
+	fn vest_unlocked(l: u32, ) -> Weight {
+		(61_681_000 as Weight)
+			.saturating_add((138_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+
+	}
+	fn vest_other_locked(l: u32, ) -> Weight {
+		(56_910_000 as Weight)
+			.saturating_add((160_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+
+	}
+	fn vest_other_unlocked(l: u32, ) -> Weight {
+		(61_319_000 as Weight)
+			.saturating_add((144_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+
+	}
+	fn vested_transfer(l: u32, ) -> Weight {
+		(124_996_000 as Weight)
+			.saturating_add((209_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+
+	}
+	fn force_vested_transfer(l: u32, ) -> Weight {
+		(123_911_000 as Weight)
+			.saturating_add((213_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
+
+	}
+
+}
diff --git a/utils/frame/benchmarking-cli/src/template.hbs b/utils/frame/benchmarking-cli/src/template.hbs
index 3a7e57c95425..7280b7b9cd85 100644
--- a/utils/frame/benchmarking-cli/src/template.hbs
+++ b/utils/frame/benchmarking-cli/src/template.hbs
@@ -1,10 +1,14 @@
 {{header}}
 //! Weights for {{pallet}}
-//! {{join args}}
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION {{version}}
 //! DATE: {{date}}, STEPS: {{cmd.steps}}, REPEAT: {{cmd.repeat}}, LOW RANGE: {{cmd.lowest_range_values}}, HIGH RANGE: {{cmd.highest_range_values}}
 //! EXECUTION: {{cmd.execution}}, WASM-EXECUTION: {{cmd.wasm_execution}}, CHAIN: {{cmd.chain}}, DB CACHE: {{cmd.db_cache}}
 
+// Executed Command:
+{{#each args as |arg|~}}
+// {{arg}}
+{{/each}}
+
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 

From c55797bb538ab479cb9677909c2af784bb89c91f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Wed, 28 Oct 2020 00:01:06 +0100
Subject: [PATCH 0024/1194] Make consensus `SlotWorker` don't assume a slot is
 time / duration (#7441)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Make consensus `SlotWorker` don't assume a slot is time / duration

This removes the last bit of assumption that a slot is always `time /
duration`. This will be required by parachains where a slot will be the
relay chain block number. Besides this there are also some other drive
by changes. One more notable is that `on_slot` now returns a
`SlotResult` that holds the block and a potential storage proof.

To simplify the implementation and usage of the `SimpleSlotWorker` the
`SlotWorker` trait is now implemented for each type that implements
`SimpleSlotWorker`.

* Update client/consensus/slots/src/lib.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Update client/consensus/slots/src/lib.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
---
 Cargo.lock                             |   1 +
 client/consensus/aura/src/lib.rs       |  36 +------
 client/consensus/babe/src/lib.rs       |  22 +---
 client/consensus/slots/Cargo.toml      |   1 +
 client/consensus/slots/src/lib.rs      | 144 ++++++++++++++-----------
 client/consensus/slots/src/slots.rs    |  31 +-----
 primitives/consensus/common/src/lib.rs |   7 ++
 7 files changed, 99 insertions(+), 143 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ae15dab886e3..c026060ec13b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6832,6 +6832,7 @@ dependencies = [
  "sp-inherents",
  "sp-runtime",
  "sp-state-machine",
+ "sp-trie",
  "substrate-test-runtime-client",
 ]
 
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index 426a0e873f2e..5013c1813b68 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -72,7 +72,7 @@ use sp_timestamp::{
 use sc_telemetry::{telemetry, CONSENSUS_TRACE, CONSENSUS_DEBUG, CONSENSUS_INFO};
 
 use sc_consensus_slots::{
-	CheckedHeader, SlotWorker, SlotInfo, SlotCompatible, StorageChanges, check_equivocation,
+	CheckedHeader, SlotInfo, SlotCompatible, StorageChanges, check_equivocation,
 };
 
 use sp_api::ApiExt;
@@ -127,7 +127,7 @@ struct AuraSlotCompatible;
 impl SlotCompatible for AuraSlotCompatible {
 	fn extract_timestamp_and_slot(
 		&self,
-		data: &InherentData
+		data: &InherentData,
 	) -> Result<(TimestampInherent, AuraInherent, std::time::Duration), sp_consensus::Error> {
 		data.timestamp_inherent_data()
 			.and_then(|t| data.aura_inherent_data().map(|a| (t, a)))
@@ -198,7 +198,8 @@ struct AuraWorker<C, E, I, P, SO> {
 	_key_type: PhantomData<P>,
 }
 
-impl<B, C, E, I, P, Error, SO> sc_consensus_slots::SimpleSlotWorker<B> for AuraWorker<C, E, I, P, SO> where
+impl<B, C, E, I, P, Error, SO> sc_consensus_slots::SimpleSlotWorker<B> for AuraWorker<C, E, I, P, SO>
+where
 	B: BlockT,
 	C: ProvideRuntimeApi<B> + BlockOf + ProvideCache<B> + Sync,
 	C::Api: AuraApi<B, AuthorityId<P>>,
@@ -353,26 +354,6 @@ impl<B, C, E, I, P, Error, SO> sc_consensus_slots::SimpleSlotWorker<B> for AuraW
 	}
 }
 
-impl<B: BlockT, C, E, I, P, Error, SO> SlotWorker<B> for AuraWorker<C, E, I, P, SO> where
-	B: BlockT,
-	C: ProvideRuntimeApi<B> + BlockOf + ProvideCache<B> + Sync + Send,
-	C::Api: AuraApi<B, AuthorityId<P>>,
-	E: Environment<B, Error = Error> + Send + Sync,
-	E::Proposer: Proposer<B, Error = Error, Transaction = sp_api::TransactionFor<C, B>>,
-	I: BlockImport<B, Transaction = sp_api::TransactionFor<C, B>> + Send + Sync + 'static,
-	P: Pair + Send + Sync,
-	P::Public: AppPublic + Member + Encode + Decode + Hash,
-	P::Signature: TryFrom<Vec<u8>> + Member + Encode + Decode + Hash + Debug,
-	SO: SyncOracle + Send + Sync + Clone,
-	Error: std::error::Error + Send + From<sp_consensus::Error> + 'static,
-{
-	type OnSlot = Pin<Box<dyn Future<Output = Result<(), sp_consensus::Error>> + Send>>;
-
-	fn on_slot(&mut self, chain_head: B::Header, slot_info: SlotInfo) -> Self::OnSlot {
-		<Self as sc_consensus_slots::SimpleSlotWorker<B>>::on_slot(self, chain_head, slot_info)
-	}
-}
-
 fn aura_err<B: BlockT>(error: Error<B>) -> Error<B> {
 	debug!(target: "aura", "{}", error);
 	error
@@ -886,19 +867,12 @@ mod tests {
 	use std::task::Poll;
 	use sc_block_builder::BlockBuilderProvider;
 	use sp_runtime::traits::Header as _;
-	use substrate_test_runtime_client::runtime::{Header, H256};
+	use substrate_test_runtime_client::{TestClient, runtime::{Header, H256}};
 	use sc_keystore::LocalKeystore;
 	use sp_application_crypto::key_types::AURA;
 
 	type Error = sp_blockchain::Error;
 
-	type TestClient = substrate_test_runtime_client::client::Client<
-		substrate_test_runtime_client::Backend,
-		substrate_test_runtime_client::Executor,
-		TestBlock,
-		substrate_test_runtime_client::runtime::RuntimeApi
-	>;
-
 	struct DummyFactory(Arc<TestClient>);
 	struct DummyProposer(u64, Arc<TestClient>);
 
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index 6105e9876bb5..4705381c2b91 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -113,7 +113,7 @@ use futures::prelude::*;
 use log::{debug, info, log, trace, warn};
 use prometheus_endpoint::Registry;
 use sc_consensus_slots::{
-	SlotWorker, SlotInfo, SlotCompatible, StorageChanges, CheckedHeader, check_equivocation,
+	SlotInfo, SlotCompatible, StorageChanges, CheckedHeader, check_equivocation,
 };
 use sc_consensus_epochs::{
 	descendent_query, SharedEpochChanges, EpochChangesFor, Epoch as EpochT, ViableEpochDescriptor,
@@ -667,26 +667,6 @@ impl<B, C, E, I, Error, SO> sc_consensus_slots::SimpleSlotWorker<B> for BabeSlot
 	}
 }
 
-impl<B, C, E, I, Error, SO> SlotWorker<B> for BabeSlotWorker<B, C, E, I, SO> where
-	B: BlockT,
-	C: ProvideRuntimeApi<B> +
-		ProvideCache<B> +
-		HeaderBackend<B> +
-		HeaderMetadata<B, Error = ClientError> + Send + Sync,
-	C::Api: BabeApi<B>,
-	E: Environment<B, Error = Error> + Send + Sync,
-	E::Proposer: Proposer<B, Error = Error, Transaction = sp_api::TransactionFor<C, B>>,
-	I: BlockImport<B, Transaction = sp_api::TransactionFor<C, B>> + Send + Sync + 'static,
-	SO: SyncOracle + Send + Sync + Clone,
-	Error: std::error::Error + Send + From<sp_consensus::Error> + From<I::Error> + 'static,
-{
-	type OnSlot = Pin<Box<dyn Future<Output = Result<(), sp_consensus::Error>> + Send>>;
-
-	fn on_slot(&mut self, chain_head: B::Header, slot_info: SlotInfo) -> Self::OnSlot {
-		<Self as sc_consensus_slots::SimpleSlotWorker<B>>::on_slot(self, chain_head, slot_info)
-	}
-}
-
 /// Extract the BABE pre digest from the given header. Pre-runtime digests are
 /// mandatory, the function will return `Err` if none is found.
 fn find_pre_digest<B: BlockT>(header: &B::Header) -> Result<PreDigest, Error<B>>
diff --git a/client/consensus/slots/Cargo.toml b/client/consensus/slots/Cargo.toml
index 3a636360e795..a13a712fe76b 100644
--- a/client/consensus/slots/Cargo.toml
+++ b/client/consensus/slots/Cargo.toml
@@ -17,6 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "1.3.4" }
 sc-client-api = { version = "2.0.0", path = "../../api" }
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
+sp-trie = { version = "2.0.0", path = "../../../primitives/trie" }
 sp-application-crypto = { version = "2.0.0", path = "../../../primitives/application-crypto" }
 sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
 sp-consensus-slots = { version = "0.8.0", path = "../../../primitives/consensus/slots" }
diff --git a/client/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs
index 7d346ffe3954..681d4a6273ed 100644
--- a/client/consensus/slots/src/lib.rs
+++ b/client/consensus/slots/src/lib.rs
@@ -25,7 +25,7 @@
 mod slots;
 mod aux_schema;
 
-pub use slots::{SignedDuration, SlotInfo};
+pub use slots::SlotInfo;
 use slots::Slots;
 pub use aux_schema::{check_equivocation, MAX_SLOT_CAPACITY, PRUNING_BOUND};
 
@@ -48,13 +48,29 @@ use parking_lot::Mutex;
 pub type StorageChanges<Transaction, Block> =
 	sp_state_machine::StorageChanges<Transaction, HashFor<Block>, NumberFor<Block>>;
 
+/// The result of [`SlotWorker::on_slot`].
+#[derive(Debug, Clone)]
+pub struct SlotResult<Block: BlockT> {
+	/// The block that was built.
+	pub block: Block,
+	/// The optional storage proof that was calculated while building the block.
+	///
+	/// This needs to be enabled for the proposer to get this storage proof.
+	pub storage_proof: Option<sp_trie::StorageProof>,
+}
+
 /// A worker that should be invoked at every new slot.
+///
+/// The implementation should not make any assumptions of the slot being bound to the time or
+/// similar. The only valid assumption is that the slot number is always increasing.
 pub trait SlotWorker<B: BlockT> {
-	/// The type of the future that will be returned when a new slot is
-	/// triggered.
-	type OnSlot: Future<Output = Result<(), sp_consensus::Error>>;
+	/// The type of the future that will be returned when a new slot is triggered.
+	type OnSlot: Future<Output = Option<SlotResult<B>>>;
 
 	/// Called when a new slot is triggered.
+	///
+	/// Returns a future that resolves to a [`SlotResult`] iff a block was successfully built in
+	/// the slot. Otherwise `None` is returned.
 	fn on_slot(&mut self, chain_head: B::Header, slot_info: SlotInfo) -> Self::OnSlot;
 }
 
@@ -90,7 +106,11 @@ pub trait SimpleSlotWorker<B: BlockT> {
 
 	/// Returns the epoch data necessary for authoring. For time-dependent epochs,
 	/// use the provided slot number as a canonical source of time.
-	fn epoch_data(&self, header: &B::Header, slot_number: u64) -> Result<Self::EpochData, sp_consensus::Error>;
+	fn epoch_data(
+		&self,
+		header: &B::Header,
+		slot_number: u64,
+	) -> Result<Self::EpochData, sp_consensus::Error>;
 
 	/// Returns the number of authorities given the epoch data.
 	/// None indicate that the authorities information is incomplete.
@@ -111,7 +131,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 		_header: &B::Header,
 		_slot_number: u64,
 		_epoch_data: &Self::EpochData,
-	) { }
+	) {}
 
 	/// Return the pre digest data to include in a block authored with the given claim.
 	fn pre_digest_data(
@@ -158,32 +178,38 @@ pub trait SimpleSlotWorker<B: BlockT> {
 	fn proposing_remaining_duration(
 		&self,
 		_head: &B::Header,
-		slot_info: &SlotInfo
+		slot_info: &SlotInfo,
 	) -> Option<Duration> {
 		Some(self.slot_remaining_duration(slot_info))
 	}
 
-	/// Implements the `on_slot` functionality from `SlotWorker`.
-	fn on_slot(&mut self, chain_head: B::Header, slot_info: SlotInfo)
-		-> Pin<Box<dyn Future<Output = Result<(), sp_consensus::Error>> + Send>> where
-		Self: Send + Sync,
+	/// Implements [`SlotWorker::on_slot`].
+	fn on_slot(
+		&mut self,
+		chain_head: B::Header,
+		slot_info: SlotInfo,
+	) -> Pin<Box<dyn Future<Output = Option<SlotResult<B>>> + Send>>
+	where
 		<Self::Proposer as Proposer<B>>::Proposal: Unpin + Send + 'static,
 	{
-		let (timestamp, slot_number, slot_duration) =
-			(slot_info.timestamp, slot_info.number, slot_info.duration);
+		let (timestamp, slot_number) = (slot_info.timestamp, slot_info.number);
 
-		{
-			let slot_now = SignedDuration::default().slot_now(slot_duration);
-			if slot_now > slot_number {
-				// if this is behind, return.
-				debug!(target: self.logging_target(),
-					"Skipping proposal slot {} since our current view is {}",
-					slot_number, slot_now,
+		let slot_remaining_duration = self.slot_remaining_duration(&slot_info);
+		let proposing_remaining_duration = self.proposing_remaining_duration(&chain_head, &slot_info);
+
+		let proposing_remaining = match proposing_remaining_duration {
+			Some(r) if r.as_secs() == 0 && r.as_nanos() == 0 => {
+				debug!(
+					target: self.logging_target(),
+					"Skipping proposal slot {} since there's no time left to propose",
+					slot_number,
 				);
 
-				return Box::pin(future::ready(Ok(())));
-			}
-		}
+				return Box::pin(future::ready(None));
+			},
+			Some(r) => Box::new(Delay::new(r)) as Box<dyn Future<Output = ()> + Unpin + Send>,
+			None => Box::new(future::pending()) as Box<_>,
+		};
 
 		let epoch_data = match self.epoch_data(&chain_head, slot_number) {
 			Ok(epoch_data) => epoch_data,
@@ -196,7 +222,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 					"err" => ?err,
 				);
 
-				return Box::pin(future::ready(Ok(())));
+				return Box::pin(future::ready(None));
 			}
 		};
 
@@ -215,16 +241,17 @@ pub trait SimpleSlotWorker<B: BlockT> {
 				"authorities_len" => authorities_len,
 			);
 
-			return Box::pin(future::ready(Ok(())));
+			return Box::pin(future::ready(None));
 		}
 
 		let claim = match self.claim_slot(&chain_head, slot_number, &epoch_data) {
-			None => return Box::pin(future::ready(Ok(()))),
+			None => return Box::pin(future::ready(None)),
 			Some(claim) => claim,
 		};
 
 		debug!(
-			target: self.logging_target(), "Starting authorship at slot {}; timestamp = {}",
+			target: self.logging_target(),
+			"Starting authorship at slot {}; timestamp = {}",
 			slot_number,
 			timestamp,
 		);
@@ -244,8 +271,6 @@ pub trait SimpleSlotWorker<B: BlockT> {
 			err
 		});
 
-		let slot_remaining_duration = self.slot_remaining_duration(&slot_info);
-		let proposing_remaining_duration = self.proposing_remaining_duration(&chain_head, &slot_info);
 		let logs = self.pre_digest_data(slot_number, &claim);
 
 		// deadline our production to approx. the end of the slot
@@ -258,15 +283,10 @@ pub trait SimpleSlotWorker<B: BlockT> {
 			RecordProof::No,
 		).map_err(|e| sp_consensus::Error::ClientImport(format!("{:?}", e))));
 
-		let delay: Box<dyn Future<Output=()> + Unpin + Send> = match proposing_remaining_duration {
-			Some(r) => Box::new(Delay::new(r)),
-			None => Box::new(future::pending()),
-		};
-
 		let proposal_work =
-			Box::new(futures::future::select(proposing, delay).map(move |v| match v {
-				futures::future::Either::Left((b, _)) => b.map(|b| (b, claim)),
-				futures::future::Either::Right(_) => {
+			futures::future::select(proposing, proposing_remaining).map(move |v| match v {
+				Either::Left((b, _)) => b.map(|b| (b, claim)),
+				Either::Right(_) => {
 					info!("⌛️ Discarding proposal for slot {}; block production took too long", slot_number);
 					// If the node was compiled with debug, tell the user to use release optimizations.
 					#[cfg(build_type="debug")]
@@ -274,16 +294,18 @@ pub trait SimpleSlotWorker<B: BlockT> {
 					telemetry!(CONSENSUS_INFO; "slots.discarding_proposal_took_too_long";
 						"slot" => slot_number,
 					);
+
 					Err(sp_consensus::Error::ClientImport("Timeout in the Slots proposer".into()))
 				},
-			}));
+			});
 
 		let block_import_params_maker = self.block_import_params();
 		let block_import = self.block_import();
 		let logging_target = self.logging_target();
 
-		Box::pin(proposal_work.and_then(move |(proposal, claim)| {
-			let (header, body) = proposal.block.deconstruct();
+		proposal_work.and_then(move |(proposal, claim)| async move {
+			let (block, storage_proof) = (proposal.block, proposal.proof);
+			let (header, body) = block.clone().deconstruct();
 			let header_num = *header.number();
 			let header_hash = header.hash();
 			let parent_hash = *header.parent_hash();
@@ -295,12 +317,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 				proposal.storage_changes,
 				claim,
 				epoch_data,
-			);
-
-			let block_import_params = match block_import_params {
-				Ok(params) => params,
-				Err(e) => return future::err(e),
-			};
+			)?;
 
 			info!(
 				"🔖 Pre-sealed block for proposal at {}. Hash now {:?}, previously {:?}.",
@@ -316,18 +333,32 @@ pub trait SimpleSlotWorker<B: BlockT> {
 			);
 
 			if let Err(err) = block_import.lock().import_block(block_import_params, Default::default()) {
-				warn!(target: logging_target,
+				warn!(
+					target: logging_target,
 					"Error with block built on {:?}: {:?}",
 					parent_hash,
 					err,
 				);
 
-				telemetry!(CONSENSUS_WARN; "slots.err_with_block_built_on";
-					"hash" => ?parent_hash, "err" => ?err,
+				telemetry!(
+					CONSENSUS_WARN; "slots.err_with_block_built_on";
+					"hash" => ?parent_hash,
+					"err" => ?err,
 				);
 			}
-			future::ready(Ok(()))
-		}))
+
+			Ok(SlotResult { block, storage_proof })
+		}).then(|r| async move {
+			r.map_err(|e| warn!(target: "slots", "Encountered consensus error: {:?}", e)).ok()
+		}).boxed()
+	}
+}
+
+impl<B: BlockT, T: SimpleSlotWorker<B>> SlotWorker<B> for T {
+	type OnSlot = Pin<Box<dyn Future<Output = Option<SlotResult<B>>> + Send>>;
+
+	fn on_slot(&mut self, chain_head: B::Header, slot_info: SlotInfo) -> Self::OnSlot {
+		SimpleSlotWorker::on_slot(self, chain_head, slot_info)
 	}
 }
 
@@ -338,10 +369,6 @@ pub trait SlotCompatible {
 		&self,
 		inherent: &InherentData,
 	) -> Result<(u64, u64, std::time::Duration), sp_consensus::Error>;
-
-	/// Get the difference between chain time and local time.  Defaults to
-	/// always returning zero.
-	fn time_offset() -> SignedDuration { Default::default() }
 }
 
 /// Start a new slot worker.
@@ -403,11 +430,7 @@ where
 				Either::Right(future::ready(Ok(())))
 			} else {
 				Either::Left(
-					worker.on_slot(chain_head, slot_info)
-						.map_err(|e| {
-							warn!(target: "slots", "Encountered consensus error: {:?}", e);
-						})
-						.or_else(|_| future::ready(Ok(())))
+					worker.on_slot(chain_head, slot_info).then(|_| future::ready(Ok(())))
 				)
 			}
 		}).then(|res| {
@@ -569,7 +592,6 @@ mod test {
 	fn slot(n: u64) -> super::slots::SlotInfo {
 		super::slots::SlotInfo {
 			number: n,
-			last_number: n - 1,
 			duration: SLOT_DURATION.as_millis() as u64,
 			timestamp: Default::default(),
 			inherent_data: Default::default(),
diff --git a/client/consensus/slots/src/slots.rs b/client/consensus/slots/src/slots.rs
index 32316c56c9f5..e7c84a2c1fd2 100644
--- a/client/consensus/slots/src/slots.rs
+++ b/client/consensus/slots/src/slots.rs
@@ -37,30 +37,6 @@ pub fn duration_now() -> Duration {
 	))
 }
 
-
-/// A `Duration` with a sign (before or after).  Immutable.
-#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
-pub struct SignedDuration {
-	offset: Duration,
-	is_positive: bool,
-}
-
-impl SignedDuration {
-	/// Construct a `SignedDuration`
-	pub fn new(offset: Duration, is_positive: bool) -> Self {
-		Self { offset, is_positive }
-	}
-
-	/// Get the slot for now.  Panics if `slot_duration` is 0.
-	pub fn slot_now(&self, slot_duration: u64) -> u64 {
-		(if self.is_positive {
-			duration_now() + self.offset
-		} else {
-			duration_now() - self.offset
-		}.as_millis() as u64) / slot_duration
-	}
-}
-
 /// Returns the duration until the next slot, based on current duration since
 pub fn time_until_next(now: Duration, slot_duration: u64) -> Duration {
 	let remaining_full_millis = slot_duration - (now.as_millis() as u64 % slot_duration) - 1;
@@ -71,8 +47,6 @@ pub fn time_until_next(now: Duration, slot_duration: u64) -> Duration {
 pub struct SlotInfo {
 	/// The slot number.
 	pub number: u64,
-	/// The last slot number produced.
-	pub last_number: u64,
 	/// Current timestamp.
 	pub timestamp: u64,
 	/// The instant at which the slot ends.
@@ -150,13 +124,11 @@ impl<SC: SlotCompatible> Stream for Slots<SC> {
 
 			// never yield the same slot twice.
 			if slot_num > self.last_slot {
-				let last_slot = self.last_slot;
 				self.last_slot = slot_num;
 
 				break Poll::Ready(Some(Ok(SlotInfo {
 					number: slot_num,
 					duration: self.slot_duration,
-					last_number: last_slot,
 					timestamp,
 					ends_at,
 					inherent_data,
@@ -166,5 +138,4 @@ impl<SC: SlotCompatible> Stream for Slots<SC> {
 	}
 }
 
-impl<SC> Unpin for Slots<SC> {
-}
+impl<SC> Unpin for Slots<SC> {}
diff --git a/primitives/consensus/common/src/lib.rs b/primitives/consensus/common/src/lib.rs
index fa4f233c680f..47de0674115c 100644
--- a/primitives/consensus/common/src/lib.rs
+++ b/primitives/consensus/common/src/lib.rs
@@ -123,6 +123,13 @@ impl RecordProof {
 	}
 }
 
+/// Will return [`RecordProof::No`] as default value.
+impl Default for RecordProof {
+	fn default() -> Self {
+		Self::No
+	}
+}
+
 impl From<bool> for RecordProof {
 	fn from(val: bool) -> Self {
 		if val {

From ab36e527eedf15a1fd74d257f5efca72d33e923c Mon Sep 17 00:00:00 2001
From: Wei Tang <wei@that.world>
Date: Wed, 28 Oct 2020 09:28:36 +0100
Subject: [PATCH 0025/1194] pallet-treasury: remove non-existing dispatchables
 in docs (#7443)

---
 frame/treasury/src/lib.rs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frame/treasury/src/lib.rs b/frame/treasury/src/lib.rs
index 43f9515f0a19..1d9b312755cd 100644
--- a/frame/treasury/src/lib.rs
+++ b/frame/treasury/src/lib.rs
@@ -103,8 +103,6 @@
 //!
 //! General spending/proposal protocol:
 //! - `propose_spend` - Make a spending proposal and stake the required deposit.
-//! - `set_pot` - Set the spendable balance of funds.
-//! - `configure` - Configure the module's proposal requirements.
 //! - `reject_proposal` - Reject a proposal, slashing the deposit.
 //! - `approve_proposal` - Accept the proposal, returning the deposit.
 //!

From 1f5b7c9e73e97d429f50722c999341dd8faa479a Mon Sep 17 00:00:00 2001
From: Chris D'Costa <chris.dcosta@totemaccounting.com>
Date: Wed, 28 Oct 2020 13:22:16 +0100
Subject: [PATCH 0026/1194] Related to #7439 Add Totem ss58 address (#7442)

---
 primitives/core/src/crypto.rs | 2 ++
 ss58-registry.json            | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index b685c28c67fd..c1490f882bd1 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -470,6 +470,8 @@ ss58_address_format!(
 		(12, "polymath", "Polymath network, standard account (*25519).")
 	SubstraTeeAccount =>
 		(13, "substratee", "Any SubstraTEE off-chain network private account (*25519).")
+	TotemAccount =>
+		(14, "totem", "Any Totem Live Accounting network standard account (*25519).")
 	KulupuAccount =>
 		(16, "kulupu", "Kulupu mainnet, standard account (*25519).")
 	DarkAccount =>
diff --git a/ss58-registry.json b/ss58-registry.json
index 2485137076cd..d4286145a1fb 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -136,6 +136,15 @@
 			"standardAccount": "*25519",
 			"website": "https://www.substratee.com"
 		},
+		{
+			"prefix": 14,
+			"network": "totem",
+			"displayName": "Totem",
+			"symbols": ["XTX"],
+			"decimals": [0],
+			"standardAccount": "*25519",
+			"website": "https://totemaccounting.com"
+		},
 		{
 			"prefix": 16,
 			"network": "kulupu",

From b8b810659b6823c896c3ef50ca7f802c66b66e73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomusdrw@users.noreply.github.com>
Date: Wed, 28 Oct 2020 13:48:15 +0100
Subject: [PATCH 0027/1194] Make sure to use the optimized method instead of
 reading the storage. (#7445)

---
 frame/support/src/storage/unhashed.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frame/support/src/storage/unhashed.rs b/frame/support/src/storage/unhashed.rs
index 34b146b86f6b..42f21cab4993 100644
--- a/frame/support/src/storage/unhashed.rs
+++ b/frame/support/src/storage/unhashed.rs
@@ -83,7 +83,7 @@ pub fn take_or_else<T: Decode + Sized, F: FnOnce() -> T>(key: &[u8], default_val
 
 /// Check to see if `key` has an explicit entry in storage.
 pub fn exists(key: &[u8]) -> bool {
-	sp_io::storage::read(key, &mut [0;0][..], 0).is_some()
+	sp_io::storage::exists(key)
 }
 
 /// Ensure `key` has no explicit entry in storage.

From 68869cb878cd88521f8105895435f8e7e61f8509 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Wed, 28 Oct 2020 14:34:03 +0100
Subject: [PATCH 0028/1194] Fix benchmarks template whitespaces (#7447)

* fix

* actual fix

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_democracy --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/democracy/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=frame_system --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/system/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Update frame/system/src/weights.rs

Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 .maintain/frame-weight-template.hbs           |  48 ++--
 frame/democracy/src/weights.rs                | 247 +++++++-----------
 frame/system/src/weights.rs                   |  57 ++--
 utils/frame/benchmarking-cli/src/template.hbs |  22 +-
 4 files changed, 157 insertions(+), 217 deletions(-)

diff --git a/.maintain/frame-weight-template.hbs b/.maintain/frame-weight-template.hbs
index 595c2a7d3139..146cc4cfcbdb 100644
--- a/.maintain/frame-weight-template.hbs
+++ b/.maintain/frame-weight-template.hbs
@@ -33,68 +33,68 @@ use sp_std::marker::PhantomData;
 
 /// Weight functions needed for {{pallet}}.
 pub trait WeightInfo {
-	{{#each benchmarks as |benchmark| ~}}
+	{{~#each benchmarks as |benchmark|}}
 	fn {{benchmark.name~}}
 	(
 		{{~#each benchmark.components as |c| ~}}
 		{{c.name}}: u32, {{/each~}}
 	) -> Weight;
-	{{/each}}
+	{{~/each}}
 }
 
 /// Weights for {{pallet}} using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
-	{{#each benchmarks as |benchmark| ~}}
+	{{~#each benchmarks as |benchmark|}}
 	fn {{benchmark.name~}}
 	(
 		{{~#each benchmark.components as |c| ~}}
 		{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
 	) -> Weight {
 		({{underscore benchmark.base_weight}} as Weight)
-			{{#each benchmark.component_weight as |cw| ~}}
+			{{~#each benchmark.component_weight as |cw|}}
 			.saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
-			{{/each}}
-			{{~#if (ne benchmark.base_reads "0") ~}}
+			{{~/each}}
+			{{~#if (ne benchmark.base_reads "0")}}
 			.saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}} as Weight))
-			{{/if}}
-			{{~#each benchmark.component_reads as |cr| ~}}
+			{{~/if}}
+			{{~#each benchmark.component_reads as |cr|}}
 			.saturating_add(T::DbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight)))
-			{{/each}}
-			{{~#if (ne benchmark.base_writes "0") ~}}
+			{{~/each}}
+			{{~#if (ne benchmark.base_writes "0")}}
 			.saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}} as Weight))
-			{{/if}}
-			{{~#each benchmark.component_writes as |cw| ~}}
+			{{~/if}}
+			{{~#each benchmark.component_writes as |cw|}}
 			.saturating_add(T::DbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
 			{{~/each}}
 	}
-	{{/each}}
+	{{~/each}}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
-	{{#each benchmarks as |benchmark| ~}}
+	{{~#each benchmarks as |benchmark|}}
 	fn {{benchmark.name~}}
 	(
 		{{~#each benchmark.components as |c| ~}}
 		{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
 	) -> Weight {
 		({{underscore benchmark.base_weight}} as Weight)
-			{{#each benchmark.component_weight as |cw| ~}}
+			{{~#each benchmark.component_weight as |cw|}}
 			.saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
-			{{/each}}
-			{{~#if (ne benchmark.base_reads "0") ~}}
+			{{~/each}}
+			{{~#if (ne benchmark.base_reads "0")}}
 			.saturating_add(RocksDbWeight::get().reads({{benchmark.base_reads}} as Weight))
-			{{/if}}
-			{{~#each benchmark.component_reads as |cr| ~}}
+			{{~/if}}
+			{{~#each benchmark.component_reads as |cr|}}
 			.saturating_add(RocksDbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight)))
-			{{/each}}
-			{{~#if (ne benchmark.base_writes "0") ~}}
+			{{~/each}}
+			{{~#if (ne benchmark.base_writes "0")}}
 			.saturating_add(RocksDbWeight::get().writes({{benchmark.base_writes}} as Weight))
-			{{/if}}
-			{{~#each benchmark.component_writes as |cw| ~}}
+			{{~/if}}
+			{{~#each benchmark.component_writes as |cw|}}
 			.saturating_add(RocksDbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
 			{{~/each}}
 	}
-	{{/each}}
+	{{~/each}}
 }
diff --git a/frame/democracy/src/weights.rs b/frame/democracy/src/weights.rs
index 9d17d3a76808..e386e5fb5531 100644
--- a/frame/democracy/src/weights.rs
+++ b/frame/democracy/src/weights.rs
@@ -17,7 +17,7 @@
 
 //! Weights for pallet_democracy
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2020-10-28, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -44,372 +44,323 @@ use sp_std::marker::PhantomData;
 /// Weight functions needed for pallet_democracy.
 pub trait WeightInfo {
 	fn propose() -> Weight;
-	fn second(_s: u32, ) -> Weight;
-	fn vote_new(_r: u32, ) -> Weight;
-	fn vote_existing(_r: u32, ) -> Weight;
+	fn second(s: u32, ) -> Weight;
+	fn vote_new(r: u32, ) -> Weight;
+	fn vote_existing(r: u32, ) -> Weight;
 	fn emergency_cancel() -> Weight;
-	fn blacklist(_p: u32, ) -> Weight;
-	fn external_propose(_v: u32, ) -> Weight;
+	fn blacklist(p: u32, ) -> Weight;
+	fn external_propose(v: u32, ) -> Weight;
 	fn external_propose_majority() -> Weight;
 	fn external_propose_default() -> Weight;
 	fn fast_track() -> Weight;
-	fn veto_external(_v: u32, ) -> Weight;
-	fn cancel_proposal(_p: u32, ) -> Weight;
+	fn veto_external(v: u32, ) -> Weight;
+	fn cancel_proposal(p: u32, ) -> Weight;
 	fn cancel_referendum() -> Weight;
-	fn cancel_queued(_r: u32, ) -> Weight;
-	fn on_initialize_base(_r: u32, ) -> Weight;
-	fn delegate(_r: u32, ) -> Weight;
-	fn undelegate(_r: u32, ) -> Weight;
+	fn cancel_queued(r: u32, ) -> Weight;
+	fn on_initialize_base(r: u32, ) -> Weight;
+	fn delegate(r: u32, ) -> Weight;
+	fn undelegate(r: u32, ) -> Weight;
 	fn clear_public_proposals() -> Weight;
-	fn note_preimage(_b: u32, ) -> Weight;
-	fn note_imminent_preimage(_b: u32, ) -> Weight;
-	fn reap_preimage(_b: u32, ) -> Weight;
-	fn unlock_remove(_r: u32, ) -> Weight;
-	fn unlock_set(_r: u32, ) -> Weight;
-	fn remove_vote(_r: u32, ) -> Weight;
-	fn remove_other_vote(_r: u32, ) -> Weight;
-
+	fn note_preimage(b: u32, ) -> Weight;
+	fn note_imminent_preimage(b: u32, ) -> Weight;
+	fn reap_preimage(b: u32, ) -> Weight;
+	fn unlock_remove(r: u32, ) -> Weight;
+	fn unlock_set(r: u32, ) -> Weight;
+	fn remove_vote(r: u32, ) -> Weight;
+	fn remove_other_vote(r: u32, ) -> Weight;
 }
 
 /// Weights for pallet_democracy using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
 	fn propose() -> Weight {
-		(86_479_000 as Weight)
+		(87_883_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-
 	}
 	fn second(s: u32, ) -> Weight {
-		(52_126_000 as Weight)
-			.saturating_add((211_000 as Weight).saturating_mul(s as Weight))
+		(52_998_000 as Weight)
+			.saturating_add((251_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-
 	}
 	fn vote_new(r: u32, ) -> Weight {
-		(62_010_000 as Weight)
-			.saturating_add((288_000 as Weight).saturating_mul(r as Weight))
+		(63_300_000 as Weight)
+			.saturating_add((284_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-
 	}
 	fn vote_existing(r: u32, ) -> Weight {
-		(61_870_000 as Weight)
-			.saturating_add((294_000 as Weight).saturating_mul(r as Weight))
+		(63_127_000 as Weight)
+			.saturating_add((289_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-
 	}
 	fn emergency_cancel() -> Weight {
-		(37_329_000 as Weight)
+		(38_877_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-
 	}
 	fn blacklist(p: u32, ) -> Weight {
-		(105_595_000 as Weight)
-			.saturating_add((812_000 as Weight).saturating_mul(p as Weight))
+		(108_060_000 as Weight)
+			.saturating_add((795_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(6 as Weight))
-
 	}
 	fn external_propose(v: u32, ) -> Weight {
-		(18_670_000 as Weight)
-			.saturating_add((110_000 as Weight).saturating_mul(v as Weight))
+		(19_052_000 as Weight)
+			.saturating_add((111_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-
 	}
 	fn external_propose_majority() -> Weight {
-		(4_413_000 as Weight)
+		(4_544_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-
 	}
 	fn external_propose_default() -> Weight {
-		(4_365_000 as Weight)
+		(4_608_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-
 	}
 	fn fast_track() -> Weight {
-		(37_914_000 as Weight)
+		(38_876_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-
 	}
 	fn veto_external(v: u32, ) -> Weight {
-		(38_965_000 as Weight)
-			.saturating_add((188_000 as Weight).saturating_mul(v as Weight))
+		(40_283_000 as Weight)
+			.saturating_add((187_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-
 	}
 	fn cancel_proposal(p: u32, ) -> Weight {
-		(66_560_000 as Weight)
-			.saturating_add((898_000 as Weight).saturating_mul(p as Weight))
+		(68_449_000 as Weight)
+			.saturating_add((876_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-
 	}
 	fn cancel_referendum() -> Weight {
-		(22_971_000 as Weight)
+		(23_670_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-
 	}
 	fn cancel_queued(r: u32, ) -> Weight {
-		(41_431_000 as Weight)
-			.saturating_add((4_598_000 as Weight).saturating_mul(r as Weight))
+		(43_247_000 as Weight)
+			.saturating_add((4_578_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-
 	}
 	fn on_initialize_base(r: u32, ) -> Weight {
-		(14_908_000 as Weight)
-			.saturating_add((6_638_000 as Weight).saturating_mul(r as Weight))
+		(15_278_000 as Weight)
+			.saturating_add((6_696_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
-
 	}
 	fn delegate(r: u32, ) -> Weight {
-		(82_620_000 as Weight)
-			.saturating_add((9_780_000 as Weight).saturating_mul(r as Weight))
+		(83_002_000 as Weight)
+			.saturating_add((9_889_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight)))
 	}
 	fn undelegate(r: u32, ) -> Weight {
-		(40_817_000 as Weight)
-			.saturating_add((9_870_000 as Weight).saturating_mul(r as Weight))
+		(43_552_000 as Weight)
+			.saturating_add((9_887_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight)))
 	}
 	fn clear_public_proposals() -> Weight {
-		(4_071_000 as Weight)
+		(4_404_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-
 	}
 	fn note_preimage(b: u32, ) -> Weight {
-		(58_361_000 as Weight)
+		(60_073_000 as Weight)
 			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-
 	}
 	fn note_imminent_preimage(b: u32, ) -> Weight {
-		(39_294_000 as Weight)
-			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
+		(38_896_000 as Weight)
+			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-
 	}
 	fn reap_preimage(b: u32, ) -> Weight {
-		(52_829_000 as Weight)
+		(54_861_000 as Weight)
 			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-
 	}
 	fn unlock_remove(r: u32, ) -> Weight {
-		(52_058_000 as Weight)
-			.saturating_add((131_000 as Weight).saturating_mul(r as Weight))
+		(52_956_000 as Weight)
+			.saturating_add((126_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-
 	}
 	fn unlock_set(r: u32, ) -> Weight {
-		(47_488_000 as Weight)
-			.saturating_add((317_000 as Weight).saturating_mul(r as Weight))
+		(49_789_000 as Weight)
+			.saturating_add((274_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-
 	}
 	fn remove_vote(r: u32, ) -> Weight {
-		(28_231_000 as Weight)
-			.saturating_add((311_000 as Weight).saturating_mul(r as Weight))
+		(29_790_000 as Weight)
+			.saturating_add((283_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-
 	}
 	fn remove_other_vote(r: u32, ) -> Weight {
-		(27_743_000 as Weight)
+		(28_497_000 as Weight)
 			.saturating_add((217_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-
 	}
-
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn propose() -> Weight {
-		(86_479_000 as Weight)
+		(87_883_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
-
 	}
 	fn second(s: u32, ) -> Weight {
-		(52_126_000 as Weight)
-			.saturating_add((211_000 as Weight).saturating_mul(s as Weight))
+		(52_998_000 as Weight)
+			.saturating_add((251_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-
 	}
 	fn vote_new(r: u32, ) -> Weight {
-		(62_010_000 as Weight)
-			.saturating_add((288_000 as Weight).saturating_mul(r as Weight))
+		(63_300_000 as Weight)
+			.saturating_add((284_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
-
 	}
 	fn vote_existing(r: u32, ) -> Weight {
-		(61_870_000 as Weight)
-			.saturating_add((294_000 as Weight).saturating_mul(r as Weight))
+		(63_127_000 as Weight)
+			.saturating_add((289_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
-
 	}
 	fn emergency_cancel() -> Weight {
-		(37_329_000 as Weight)
+		(38_877_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-
 	}
 	fn blacklist(p: u32, ) -> Weight {
-		(105_595_000 as Weight)
-			.saturating_add((812_000 as Weight).saturating_mul(p as Weight))
+		(108_060_000 as Weight)
+			.saturating_add((795_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(6 as Weight))
-
 	}
 	fn external_propose(v: u32, ) -> Weight {
-		(18_670_000 as Weight)
-			.saturating_add((110_000 as Weight).saturating_mul(v as Weight))
+		(19_052_000 as Weight)
+			.saturating_add((111_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-
 	}
 	fn external_propose_majority() -> Weight {
-		(4_413_000 as Weight)
+		(4_544_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-
 	}
 	fn external_propose_default() -> Weight {
-		(4_365_000 as Weight)
+		(4_608_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-
 	}
 	fn fast_track() -> Weight {
-		(37_914_000 as Weight)
+		(38_876_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
-
 	}
 	fn veto_external(v: u32, ) -> Weight {
-		(38_965_000 as Weight)
-			.saturating_add((188_000 as Weight).saturating_mul(v as Weight))
+		(40_283_000 as Weight)
+			.saturating_add((187_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-
 	}
 	fn cancel_proposal(p: u32, ) -> Weight {
-		(66_560_000 as Weight)
-			.saturating_add((898_000 as Weight).saturating_mul(p as Weight))
+		(68_449_000 as Weight)
+			.saturating_add((876_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
-
 	}
 	fn cancel_referendum() -> Weight {
-		(22_971_000 as Weight)
+		(23_670_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-
 	}
 	fn cancel_queued(r: u32, ) -> Weight {
-		(41_431_000 as Weight)
-			.saturating_add((4_598_000 as Weight).saturating_mul(r as Weight))
+		(43_247_000 as Weight)
+			.saturating_add((4_578_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-
 	}
 	fn on_initialize_base(r: u32, ) -> Weight {
-		(14_908_000 as Weight)
-			.saturating_add((6_638_000 as Weight).saturating_mul(r as Weight))
+		(15_278_000 as Weight)
+			.saturating_add((6_696_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
-
 	}
 	fn delegate(r: u32, ) -> Weight {
-		(82_620_000 as Weight)
-			.saturating_add((9_780_000 as Weight).saturating_mul(r as Weight))
+		(83_002_000 as Weight)
+			.saturating_add((9_889_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(r as Weight)))
 	}
 	fn undelegate(r: u32, ) -> Weight {
-		(40_817_000 as Weight)
-			.saturating_add((9_870_000 as Weight).saturating_mul(r as Weight))
+		(43_552_000 as Weight)
+			.saturating_add((9_887_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(r as Weight)))
 	}
 	fn clear_public_proposals() -> Weight {
-		(4_071_000 as Weight)
+		(4_404_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-
 	}
 	fn note_preimage(b: u32, ) -> Weight {
-		(58_361_000 as Weight)
+		(60_073_000 as Weight)
 			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-
 	}
 	fn note_imminent_preimage(b: u32, ) -> Weight {
-		(39_294_000 as Weight)
-			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
+		(38_896_000 as Weight)
+			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-
 	}
 	fn reap_preimage(b: u32, ) -> Weight {
-		(52_829_000 as Weight)
+		(54_861_000 as Weight)
 			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-
 	}
 	fn unlock_remove(r: u32, ) -> Weight {
-		(52_058_000 as Weight)
-			.saturating_add((131_000 as Weight).saturating_mul(r as Weight))
+		(52_956_000 as Weight)
+			.saturating_add((126_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
-
 	}
 	fn unlock_set(r: u32, ) -> Weight {
-		(47_488_000 as Weight)
-			.saturating_add((317_000 as Weight).saturating_mul(r as Weight))
+		(49_789_000 as Weight)
+			.saturating_add((274_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
-
 	}
 	fn remove_vote(r: u32, ) -> Weight {
-		(28_231_000 as Weight)
-			.saturating_add((311_000 as Weight).saturating_mul(r as Weight))
+		(29_790_000 as Weight)
+			.saturating_add((283_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-
 	}
 	fn remove_other_vote(r: u32, ) -> Weight {
-		(27_743_000 as Weight)
+		(28_497_000 as Weight)
 			.saturating_add((217_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-
 	}
-
 }
diff --git a/frame/system/src/weights.rs b/frame/system/src/weights.rs
index fb07e125071e..5f3c84deb41c 100644
--- a/frame/system/src/weights.rs
+++ b/frame/system/src/weights.rs
@@ -17,7 +17,7 @@
 
 //! Weights for frame_system
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2020-10-28, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -43,91 +43,80 @@ use sp_std::marker::PhantomData;
 
 /// Weight functions needed for frame_system.
 pub trait WeightInfo {
-	fn remark(_b: u32, ) -> Weight;
+	fn remark(b: u32, ) -> Weight;
 	fn set_heap_pages() -> Weight;
 	fn set_changes_trie_config() -> Weight;
-	fn set_storage(_i: u32, ) -> Weight;
-	fn kill_storage(_i: u32, ) -> Weight;
-	fn kill_prefix(_p: u32, ) -> Weight;
+	fn set_storage(i: u32, ) -> Weight;
+	fn kill_storage(i: u32, ) -> Weight;
+	fn kill_prefix(p: u32, ) -> Weight;
 	fn suicide() -> Weight;
-
 }
 
 /// Weights for frame_system using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: crate::Trait> WeightInfo for SubstrateWeight<T> {
 	fn remark(_b: u32, ) -> Weight {
-		(1_906_000 as Weight)
-
+		(1_973_000 as Weight)
 	}
 	fn set_heap_pages() -> Weight {
-		(2_792_000 as Weight)
+		(2_816_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-
 	}
 	fn set_changes_trie_config() -> Weight {
-		(12_029_000 as Weight)
+		(11_539_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-
 	}
 	fn set_storage(i: u32, ) -> Weight {
 		(0 as Weight)
-			.saturating_add((842_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((833_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	fn kill_storage(i: u32, ) -> Weight {
-		(1_120_000 as Weight)
-			.saturating_add((599_000 as Weight).saturating_mul(i as Weight))
+		(2_131_000 as Weight)
+			.saturating_add((597_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	fn kill_prefix(p: u32, ) -> Weight {
-		(9_470_000 as Weight)
-			.saturating_add((861_000 as Weight).saturating_mul(p as Weight))
+		(11_844_000 as Weight)
+			.saturating_add((857_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
 	}
 	fn suicide() -> Weight {
-		(38_469_000 as Weight)
-
+		(37_209_000 as Weight)
 	}
-
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn remark(_b: u32, ) -> Weight {
-		(1_906_000 as Weight)
-
+		(1_973_000 as Weight)
 	}
 	fn set_heap_pages() -> Weight {
-		(2_792_000 as Weight)
+		(2_816_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-
 	}
 	fn set_changes_trie_config() -> Weight {
-		(12_029_000 as Weight)
+		(11_539_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-
 	}
 	fn set_storage(i: u32, ) -> Weight {
 		(0 as Weight)
-			.saturating_add((842_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((833_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	fn kill_storage(i: u32, ) -> Weight {
-		(1_120_000 as Weight)
-			.saturating_add((599_000 as Weight).saturating_mul(i as Weight))
+		(2_131_000 as Weight)
+			.saturating_add((597_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	fn kill_prefix(p: u32, ) -> Weight {
-		(9_470_000 as Weight)
-			.saturating_add((861_000 as Weight).saturating_mul(p as Weight))
+		(11_844_000 as Weight)
+			.saturating_add((857_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
 	}
 	fn suicide() -> Weight {
-		(38_469_000 as Weight)
-
+		(37_209_000 as Weight)
 	}
-
 }
diff --git a/utils/frame/benchmarking-cli/src/template.hbs b/utils/frame/benchmarking-cli/src/template.hbs
index 7280b7b9cd85..7f7e2d6dcb99 100644
--- a/utils/frame/benchmarking-cli/src/template.hbs
+++ b/utils/frame/benchmarking-cli/src/template.hbs
@@ -18,28 +18,28 @@ use sp_std::marker::PhantomData;
 /// Weight functions for {{pallet}}.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Trait> {{pallet}}::WeightInfo for WeightInfo<T> {
-	{{#each benchmarks as |benchmark| ~}}
+	{{~#each benchmarks as |benchmark|}}
 	fn {{benchmark.name~}}
 	(
 		{{~#each benchmark.components as |c| ~}}
 		{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
 	) -> Weight {
 		({{underscore benchmark.base_weight}} as Weight)
-			{{#each benchmark.component_weight as |cw| ~}}
+			{{~#each benchmark.component_weight as |cw|}}
 			.saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
-			{{/each}}
-			{{~#if (ne benchmark.base_reads "0") ~}}
+			{{~/each}}
+			{{~#if (ne benchmark.base_reads "0")}}
 			.saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}} as Weight))
-			{{/if}}
-			{{~#each benchmark.component_reads as |cr| ~}}
+			{{~/if}}
+			{{~#each benchmark.component_reads as |cr|}}
 			.saturating_add(T::DbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight)))
-			{{/each}}
-			{{~#if (ne benchmark.base_writes "0") ~}}
+			{{~/each}}
+			{{~#if (ne benchmark.base_writes "0")}}
 			.saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}} as Weight))
-			{{/if}}
-			{{~#each benchmark.component_writes as |cw| ~}}
+			{{~/if}}
+			{{~#each benchmark.component_writes as |cw|}}
 			.saturating_add(T::DbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
 			{{~/each}}
 	}
-	{{/each}}
+	{{~/each}}
 }

From 0395acb897cc7c954ff8015c4e3338882439a635 Mon Sep 17 00:00:00 2001
From: Bernhard Schuster <bernhard@ahoi.io>
Date: Wed, 28 Oct 2020 15:04:56 +0100
Subject: [PATCH 0029/1194] error rework, for polkadot convenience (#7446)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bernhard Schuster <bernhard@parity.io>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 Cargo.lock                                    |   8 +-
 client/api/src/call_executor.rs               |   3 +-
 client/api/src/cht.rs                         |   6 +-
 primitives/blockchain/Cargo.toml              |   4 +-
 primitives/blockchain/src/error.rs            | 114 +++++++++---------
 primitives/consensus/common/Cargo.toml        |   2 +-
 primitives/consensus/common/src/error.rs      |  64 +++++-----
 primitives/consensus/common/src/evaluation.rs |  18 ++-
 primitives/core/Cargo.toml                    |   4 +-
 primitives/core/src/ed25519.rs                |   6 +-
 primitives/core/src/traits.rs                 |   2 +-
 primitives/database/src/error.rs              |   2 +-
 primitives/inherents/Cargo.toml               |   4 +-
 primitives/inherents/src/lib.rs               |   3 +-
 .../runtime/src/transaction_validity.rs       |  15 +++
 primitives/state-machine/Cargo.toml           |  12 +-
 primitives/state-machine/src/error.rs         |  13 +-
 17 files changed, 152 insertions(+), 128 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c026060ec13b..1841c01faf84 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8086,7 +8086,6 @@ dependencies = [
 name = "sp-blockchain"
 version = "2.0.0"
 dependencies = [
- "derive_more",
  "log",
  "lru 0.4.3",
  "parity-scale-codec",
@@ -8096,6 +8095,7 @@ dependencies = [
  "sp-database",
  "sp-runtime",
  "sp-state-machine",
+ "thiserror",
 ]
 
 [[package]]
@@ -8110,7 +8110,6 @@ dependencies = [
 name = "sp-consensus"
 version = "0.8.0"
 dependencies = [
- "derive_more",
  "futures 0.3.5",
  "futures-timer 3.0.2",
  "libp2p",
@@ -8129,6 +8128,7 @@ dependencies = [
  "sp-utils",
  "sp-version",
  "substrate-prometheus-endpoint",
+ "thiserror",
  "wasm-timer",
 ]
 
@@ -8235,6 +8235,7 @@ dependencies = [
  "sp-std",
  "sp-storage",
  "substrate-bip39",
+ "thiserror",
  "tiny-bip39",
  "tiny-keccak",
  "twox-hash",
@@ -8289,11 +8290,11 @@ dependencies = [
 name = "sp-inherents"
 version = "2.0.0"
 dependencies = [
- "derive_more",
  "parity-scale-codec",
  "parking_lot 0.10.2",
  "sp-core",
  "sp-std",
+ "thiserror",
 ]
 
 [[package]]
@@ -8564,6 +8565,7 @@ dependencies = [
  "sp-runtime",
  "sp-std",
  "sp-trie",
+ "thiserror",
  "trie-db",
  "trie-root",
 ]
diff --git a/client/api/src/call_executor.rs b/client/api/src/call_executor.rs
index d9d43900dfc9..86e3440f19c9 100644
--- a/client/api/src/call_executor.rs
+++ b/client/api/src/call_executor.rs
@@ -114,8 +114,7 @@ pub trait CallExecutor<B: BlockT> {
 	) -> Result<(Vec<u8>, StorageProof), sp_blockchain::Error> {
 		let trie_state = state.as_trie_backend()
 			.ok_or_else(||
-				Box::new(sp_state_machine::ExecutionError::UnableToGenerateProof)
-					as Box<dyn sp_state_machine::Error>
+				sp_blockchain::Error::from_state(Box::new(sp_state_machine::ExecutionError::UnableToGenerateProof) as Box<_>)
 			)?;
 		self.prove_at_trie_state(trie_state, overlay, method, call_data)
 	}
diff --git a/client/api/src/cht.rs b/client/api/src/cht.rs
index 30cfd3a1b671..7fd7aa0dbcb7 100644
--- a/client/api/src/cht.rs
+++ b/client/api/src/cht.rs
@@ -122,7 +122,7 @@ pub fn build_proof<Header, Hasher, BlocksI, HashesI>(
 	prove_read_on_trie_backend(
 		trie_storage,
 		blocks.into_iter().map(|number| encode_cht_key(number)),
-	).map_err(ClientError::Execution)
+	).map_err(ClientError::from_state)
 }
 
 /// Check CHT-based header proof.
@@ -150,7 +150,7 @@ pub fn check_proof<Header, Hasher>(
 			.map(|mut map| map
 				.remove(local_cht_key)
 				.expect("checked proof of local_cht_key; qed"))
-			.map_err(|e| ClientError::from(e)),
+			.map_err(ClientError::from_state),
 	)
 }
 
@@ -174,7 +174,7 @@ pub fn check_proof_on_proving_backend<Header, Hasher>(
 			read_proof_check_on_proving_backend::<Hasher>(
 				proving_backend,
 				local_cht_key,
-			).map_err(|e| ClientError::from(e)),
+			).map_err(ClientError::from_state),
 	)
 }
 
diff --git a/primitives/blockchain/Cargo.toml b/primitives/blockchain/Cargo.toml
index 79c0b56616fa..f714aaaa1dae 100644
--- a/primitives/blockchain/Cargo.toml
+++ b/primitives/blockchain/Cargo.toml
@@ -14,10 +14,10 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-log = "0.4.8"
+log = "0.4.11"
 lru = "0.4.0"
 parking_lot = "0.10.0"
-derive_more = "0.99.2"
+thiserror = "1.0.21"
 codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
 sp-consensus = { version = "0.8.0", path = "../consensus/common" }
 sp-runtime = { version = "2.0.0", path = "../runtime" }
diff --git a/primitives/blockchain/src/error.rs b/primitives/blockchain/src/error.rs
index bc412e8358c8..6c9ab88fd1b0 100644
--- a/primitives/blockchain/src/error.rs
+++ b/primitives/blockchain/src/error.rs
@@ -17,142 +17,142 @@
 
 //! Substrate client possible errors.
 
-use std::{self, error, result};
+use std::{self, result};
 use sp_state_machine;
 use sp_runtime::transaction_validity::TransactionValidityError;
 use sp_consensus;
-use derive_more::{Display, From};
 use codec::Error as CodecError;
 
 /// Client Result type alias
 pub type Result<T> = result::Result<T, Error>;
 
 /// Error when the runtime failed to apply an extrinsic.
-#[derive(Debug, Display)]
+#[derive(Debug, thiserror::Error)]
 pub enum ApplyExtrinsicFailed {
 	/// The transaction cannot be included into the current block.
 	///
 	/// This doesn't necessary mean that the transaction itself is invalid, but it might be just
 	/// unappliable onto the current block.
-	#[display(fmt = "Extrinsic is not valid: {:?}", _0)]
-	Validity(TransactionValidityError),
+	#[error("Extrinsic is not valid: {0:?}")]
+	Validity(#[from] TransactionValidityError),
 	/// This is used for miscellaneous errors that can be represented by string and not handleable.
 	///
 	/// This will become obsolete with complete migration to v4 APIs.
-	#[display(fmt = "Extrinsic failed: {:?}", _0)]
+	#[error("Extrinsic failed: {0}")]
 	Msg(String),
 }
 
 /// Substrate Client error
-#[derive(Debug, Display, From)]
+#[derive(Debug, thiserror::Error)]
 pub enum Error {
 	/// Consensus Error
-	#[display(fmt = "Consensus: {}", _0)]
-	Consensus(sp_consensus::Error),
+	#[error(transparent)]
+	Consensus(#[from] sp_consensus::Error),
 	/// Backend error.
-	#[display(fmt = "Backend error: {}", _0)]
-	#[from(ignore)]
+	#[error("Backend error: {0}")]
 	Backend(String),
 	/// Unknown block.
-	#[display(fmt = "UnknownBlock: {}", _0)]
-	#[from(ignore)]
+	#[error("UnknownBlock: {0}")]
 	UnknownBlock(String),
 	/// The `apply_extrinsic` is not valid due to the given `TransactionValidityError`.
-	#[display(fmt = "{:?}", _0)]
-	ApplyExtrinsicFailed(ApplyExtrinsicFailed),
+	#[error(transparent)]
+	ApplyExtrinsicFailed(#[from] ApplyExtrinsicFailed),
 	/// Execution error.
-	#[display(fmt = "Execution: {}", _0)]
+	#[error("Execution failed: {0:?}")]
 	Execution(Box<dyn sp_state_machine::Error>),
 	/// Blockchain error.
-	#[display(fmt = "Blockchain: {}", _0)]
-	Blockchain(Box<Error>),
+	#[error("Blockchain")]
+	Blockchain(#[source] Box<Error>),
 	/// Invalid authorities set received from the runtime.
-	#[display(fmt = "Current state of blockchain has invalid authorities set")]
+	#[error("Current state of blockchain has invalid authorities set")]
 	InvalidAuthoritiesSet,
 	/// Could not get runtime version.
-	#[display(fmt = "Failed to get runtime version: {}", _0)]
-	#[from(ignore)]
+	#[error("Failed to get runtime version: {0}")]
 	VersionInvalid(String),
 	/// Genesis config is invalid.
-	#[display(fmt = "Genesis config provided is invalid")]
+	#[error("Genesis config provided is invalid")]
 	GenesisInvalid,
 	/// Error decoding header justification.
-	#[display(fmt = "error decoding justification for header")]
+	#[error("error decoding justification for header")]
 	JustificationDecode,
 	/// Justification for header is correctly encoded, but invalid.
-	#[display(fmt = "bad justification for header: {}", _0)]
-	#[from(ignore)]
+	#[error("bad justification for header: {0}")]
 	BadJustification(String),
 	/// Not available on light client.
-	#[display(fmt = "This method is not currently available when running in light client mode")]
+	#[error("This method is not currently available when running in light client mode")]
 	NotAvailableOnLightClient,
 	/// Invalid remote CHT-based proof.
-	#[display(fmt = "Remote node has responded with invalid header proof")]
+	#[error("Remote node has responded with invalid header proof")]
 	InvalidCHTProof,
 	/// Remote fetch has been cancelled.
-	#[display(fmt = "Remote data fetch has been cancelled")]
+	#[error("Remote data fetch has been cancelled")]
 	RemoteFetchCancelled,
 	/// Remote fetch has been failed.
-	#[display(fmt = "Remote data fetch has been failed")]
+	#[error("Remote data fetch has been failed")]
 	RemoteFetchFailed,
 	/// Error decoding call result.
-	#[display(fmt = "Error decoding call result of {}: {}", _0, _1)]
-	CallResultDecode(&'static str, CodecError),
+	#[error("Error decoding call result of {0}")]
+	CallResultDecode(&'static str, #[source] CodecError),
 	/// Error converting a parameter between runtime and node.
-	#[display(fmt = "Error converting `{}` between runtime and node", _0)]
-	#[from(ignore)]
+	#[error("Error converting `{0}` between runtime and node")]
 	RuntimeParamConversion(String),
 	/// Changes tries are not supported.
-	#[display(fmt = "Changes tries are not supported by the runtime")]
+	#[error("Changes tries are not supported by the runtime")]
 	ChangesTriesNotSupported,
 	/// Error reading changes tries configuration.
-	#[display(fmt = "Error reading changes tries configuration")]
+	#[error("Error reading changes tries configuration")]
 	ErrorReadingChangesTriesConfig,
 	/// Key changes query has failed.
-	#[display(fmt = "Failed to check changes proof: {}", _0)]
-	#[from(ignore)]
+	#[error("Failed to check changes proof: {0}")]
 	ChangesTrieAccessFailed(String),
 	/// Last finalized block not parent of current.
-	#[display(fmt = "Did not finalize blocks in sequential order.")]
-	#[from(ignore)]
+	#[error("Did not finalize blocks in sequential order.")]
 	NonSequentialFinalization(String),
 	/// Safety violation: new best block not descendent of last finalized.
-	#[display(fmt = "Potential long-range attack: block not in finalized chain.")]
+	#[error("Potential long-range attack: block not in finalized chain.")]
 	NotInFinalizedChain,
 	/// Hash that is required for building CHT is missing.
-	#[display(fmt = "Failed to get hash of block for building CHT")]
+	#[error("Failed to get hash of block for building CHT")]
 	MissingHashRequiredForCHT,
 	/// Invalid calculated state root on block import.
-	#[display(fmt = "Calculated state root does not match.")]
+	#[error("Calculated state root does not match.")]
 	InvalidStateRoot,
 	/// Incomplete block import pipeline.
-	#[display(fmt = "Incomplete block import pipeline.")]
+	#[error("Incomplete block import pipeline.")]
 	IncompletePipeline,
-	#[display(fmt = "Transaction pool not ready for block production.")]
+	#[error("Transaction pool not ready for block production.")]
 	TransactionPoolNotReady,
-	#[display(fmt = "Database: {}", _0)]
-	DatabaseError(sp_database::error::DatabaseError),
+	#[error("Database")]
+	DatabaseError(#[from] sp_database::error::DatabaseError),
 	/// A convenience variant for String
-	#[display(fmt = "{}", _0)]
+	#[error("{0}")]
 	Msg(String),
 }
 
-impl error::Error for Error {
-	fn source(&self) -> Option<&(dyn error::Error + 'static)> {
-		match self {
-			Error::Consensus(e) => Some(e),
-			Error::Blockchain(e) => Some(e),
-			_ => None,
-		}
-	}
-}
-
 impl<'a> From<&'a str> for Error {
 	fn from(s: &'a str) -> Self {
 		Error::Msg(s.into())
 	}
 }
 
+impl From<String> for Error {
+	fn from(s: String) -> Self {
+		Error::Msg(s)
+	}
+}
+
+impl From<Box<dyn sp_state_machine::Error + Send + Sync>> for Error {
+	fn from(e: Box<dyn sp_state_machine::Error + Send + Sync>) -> Self {
+		Self::from_state(e)
+	}
+}
+
+impl From<Box<dyn sp_state_machine::Error>> for Error {
+	fn from(e: Box<dyn sp_state_machine::Error>) -> Self {
+		Self::from_state(e)
+	}
+}
+
 impl Error {
 	/// Chain a blockchain error.
 	pub fn from_blockchain(e: Box<Error>) -> Self {
diff --git a/primitives/consensus/common/Cargo.toml b/primitives/consensus/common/Cargo.toml
index e8eaa06ee005..9ce5460d8d8d 100644
--- a/primitives/consensus/common/Cargo.toml
+++ b/primitives/consensus/common/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 
 [dependencies]
-derive_more = "0.99.2"
+thiserror = "1.0.21"
 libp2p = { version = "0.28.1", default-features = false }
 log = "0.4.8"
 sp-core = { path= "../../core", version = "2.0.0"}
diff --git a/primitives/consensus/common/src/error.rs b/primitives/consensus/common/src/error.rs
index 0da749589013..a21bcf6cca9b 100644
--- a/primitives/consensus/common/src/error.rs
+++ b/primitives/consensus/common/src/error.rs
@@ -24,73 +24,73 @@ use std::error;
 pub type Result<T> = std::result::Result<T, Error>;
 
 /// Error type.
-#[derive(Debug, derive_more::Display, derive_more::From)]
+#[derive(Debug, thiserror::Error)]
 pub enum Error {
 	/// Missing state at block with given descriptor.
-	#[display(fmt="State unavailable at block {}", _0)]
+	#[error("State unavailable at block {0}")]
 	StateUnavailable(String),
 	/// I/O terminated unexpectedly
-	#[display(fmt="I/O terminated unexpectedly.")]
+	#[error("I/O terminated unexpectedly.")]
 	IoTerminated,
 	/// Intermediate missing.
-	#[display(fmt="Missing intermediate.")]
+	#[error("Missing intermediate.")]
 	NoIntermediate,
 	/// Intermediate is of wrong type.
-	#[display(fmt="Invalid intermediate.")]
+	#[error("Invalid intermediate.")]
 	InvalidIntermediate,
 	/// Unable to schedule wake-up.
-	#[display(fmt="Timer error: {}", _0)]
-	FaultyTimer(std::io::Error),
+	#[error("Timer error: {0}")]
+	FaultyTimer(#[from] std::io::Error),
 	/// Error while working with inherent data.
-	#[display(fmt="InherentData error: {}", _0)]
-	InherentData(sp_inherents::Error),
+	#[error("InherentData error: {0}")]
+	InherentData(#[from] sp_inherents::Error),
 	/// Unable to propose a block.
-	#[display(fmt="Unable to create block proposal.")]
+	#[error("Unable to create block proposal.")]
 	CannotPropose,
 	/// Error checking signature
-	#[display(fmt="Message signature {:?} by {:?} is invalid.", _0, _1)]
+	#[error("Message signature {0:?} by {1:?} is invalid.")]
 	InvalidSignature(Vec<u8>, Vec<u8>),
 	/// Invalid authorities set received from the runtime.
-	#[display(fmt="Current state of blockchain has invalid authorities set")]
+	#[error("Current state of blockchain has invalid authorities set")]
 	InvalidAuthoritiesSet,
 	/// Account is not an authority.
-	#[display(fmt="Message sender {:?} is not a valid authority.", _0)]
+	#[error("Message sender {0:?} is not a valid authority")]
 	InvalidAuthority(Public),
 	/// Authoring interface does not match the runtime.
-	#[display(fmt="Authoring for current \
-				runtime is not supported. Native ({}) cannot author for on-chain ({}).", native, on_chain)]
+	#[error("Authoring for current \
+				runtime is not supported. Native ({native}) cannot author for on-chain ({on_chain}).")]
 	IncompatibleAuthoringRuntime { native: RuntimeVersion, on_chain: RuntimeVersion },
 	/// Authoring interface does not match the runtime.
-	#[display(fmt="Authoring for current runtime is not supported since it has no version.")]
+	#[error("Authoring for current runtime is not supported since it has no version.")]
 	RuntimeVersionMissing,
 	/// Authoring interface does not match the runtime.
-	#[display(fmt="Authoring in current build is not supported since it has no runtime.")]
+	#[error("Authoring in current build is not supported since it has no runtime.")]
 	NativeRuntimeMissing,
 	/// Justification requirements not met.
-	#[display(fmt="Invalid justification.")]
+	#[error("Invalid justification.")]
 	InvalidJustification,
 	/// Some other error.
-	#[display(fmt="Other error: {}", _0)]
-	Other(Box<dyn error::Error + Send>),
+	#[error(transparent)]
+	Other(#[from] Box<dyn error::Error + Sync + Send + 'static>),
 	/// Error from the client while importing
-	#[display(fmt="Import failed: {}", _0)]
-	#[from(ignore)]
+	#[error("Import failed: {0}")]
 	ClientImport(String),
 	/// Error from the client while importing
-	#[display(fmt="Chain lookup failed: {}", _0)]
-	#[from(ignore)]
+	#[error("Chain lookup failed: {0}")]
 	ChainLookup(String),
 	/// Signing failed
-	#[display(fmt="Failed to sign using key: {:?}. Reason: {}", _0, _1)]
+	#[error("Failed to sign using key: {0:?}. Reason: {1}")]
 	CannotSign(Vec<u8>, String)
 }
 
-impl error::Error for Error {
-	fn source(&self) -> Option<&(dyn error::Error + 'static)> {
-		match self {
-			Error::FaultyTimer(ref err) => Some(err),
-			Error::Other(ref err) => Some(&**err),
-			_ => None,
-		}
+impl core::convert::From<Public> for Error {
+	fn from(p: Public) -> Self {
+		Self::InvalidAuthority(p)
+	}
+}
+
+impl core::convert::From<String> for Error {
+	fn from(s: String) -> Self {
+		Self::StateUnavailable(s)
 	}
 }
diff --git a/primitives/consensus/common/src/evaluation.rs b/primitives/consensus/common/src/evaluation.rs
index 76fcd5310b06..edb148cdaa99 100644
--- a/primitives/consensus/common/src/evaluation.rs
+++ b/primitives/consensus/common/src/evaluation.rs
@@ -30,27 +30,25 @@ type BlockNumber = Option<u128>;
 pub type Result<T> = std::result::Result<T, Error>;
 
 /// Error type.
-#[derive(Debug, derive_more::Display)]
+#[derive(Debug, thiserror::Error)]
 pub enum Error {
 	/// Proposal provided not a block.
-	#[display(fmt="Proposal provided not a block: decoding error: {}", _0)]
-	BadProposalFormat(codec::Error),
+	#[error("Proposal provided not a block: decoding error: {0}")]
+	BadProposalFormat(#[from] codec::Error),
 	/// Proposal had wrong parent hash.
-	#[display(fmt="Proposal had wrong parent hash. Expected {:?}, got {:?}", expected, got)]
+	#[error("Proposal had wrong parent hash. Expected {expected:?}, got {got:?}")]
 	WrongParentHash { expected: String, got: String },
 	/// Proposal had wrong number.
-	#[display(fmt="Proposal had wrong number. Expected {:?}, got {:?}", expected, got)]
+	#[error("Proposal had wrong number. Expected {expected:?}, got {got:?}")]
 	WrongNumber { expected: BlockNumber, got: BlockNumber },
 	/// Proposal exceeded the maximum size.
-	#[display(
-		fmt="Proposal exceeded the maximum size of {} by {} bytes.",
-		"MAX_BLOCK_SIZE", "_0.saturating_sub(MAX_BLOCK_SIZE)"
+	#[error(
+		"Proposal exceeded the maximum size of {} by {} bytes.",
+		MAX_BLOCK_SIZE, .0.saturating_sub(MAX_BLOCK_SIZE)
 	)]
 	ProposalTooLarge(usize),
 }
 
-impl std::error::Error for Error {}
-
 /// Attempt to evaluate a substrate block as a node block, returning error
 /// upon any initial validity checks failing.
 pub fn evaluate_initial<Block: BlockT>(
diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml
index 8b71bd7bbb0d..a97b8af15640 100644
--- a/primitives/core/Cargo.toml
+++ b/primitives/core/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
-log = { version = "0.4.8", default-features = false }
+log = { version = "0.4.11", default-features = false }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 byteorder = { version = "1.3.2", default-features = false }
 primitive-types = { version = "0.7.0", default-features = false, features = ["codec"] }
@@ -39,6 +39,7 @@ sp-storage = { version = "2.0.0", default-features = false, path = "../storage"
 parity-util-mem = { version = "0.7.0", default-features = false, features = ["primitive-types"] }
 futures = { version = "0.3.1", optional = true }
 dyn-clonable = { version = "0.9.0", optional = true }
+thiserror = { version = "1.0.21", optional = true }
 
 # full crypto
 ed25519-dalek = { version = "1.0.0-pre.4", default-features = false, features = ["u64_backend", "alloc"], optional = true }
@@ -74,6 +75,7 @@ default = ["std"]
 std = [
 	"full_crypto",
 	"log/std",
+	"thiserror",
 	"wasmi",
 	"lazy_static",
 	"parking_lot",
diff --git a/primitives/core/src/ed25519.rs b/primitives/core/src/ed25519.rs
index fcc84c5c2edc..ad08f9ab8bae 100644
--- a/primitives/core/src/ed25519.rs
+++ b/primitives/core/src/ed25519.rs
@@ -335,15 +335,19 @@ pub struct LocalizedSignature {
 
 /// An error type for SS58 decoding.
 #[cfg(feature = "std")]
-#[derive(Clone, Copy, Eq, PartialEq, Debug)]
+#[derive(Clone, Copy, Eq, PartialEq, Debug, thiserror::Error)]
 pub enum PublicError {
 	/// Bad alphabet.
+	#[error("Base 58 requirement is violated")]
 	BadBase58,
 	/// Bad length.
+	#[error("Length is bad")]
 	BadLength,
 	/// Unknown version.
+	#[error("Unknown version")]
 	UnknownVersion,
 	/// Invalid checksum.
+	#[error("Invalid checksum")]
 	InvalidChecksum,
 }
 
diff --git a/primitives/core/src/traits.rs b/primitives/core/src/traits.rs
index 406dba533899..97100ea58f8c 100644
--- a/primitives/core/src/traits.rs
+++ b/primitives/core/src/traits.rs
@@ -28,7 +28,7 @@ pub use sp_externalities::{Externalities, ExternalitiesExt};
 /// Code execution engine.
 pub trait CodeExecutor: Sized + Send + Sync + CallInWasm + Clone + 'static {
 	/// Externalities error type.
-	type Error: Display + Debug + Send + 'static;
+	type Error: Display + Debug + Send + Sync + 'static;
 
 	/// Call a given method in the runtime. Returns a tuple of the result (either the output data
 	/// or an execution error) together with a `bool`, which is true if native execution was used.
diff --git a/primitives/database/src/error.rs b/primitives/database/src/error.rs
index 2e5d4557a979..3253839bbeff 100644
--- a/primitives/database/src/error.rs
+++ b/primitives/database/src/error.rs
@@ -17,7 +17,7 @@
 
 /// The error type for database operations.
 #[derive(Debug)]
-pub struct DatabaseError(pub Box<dyn std::error::Error + Send>);
+pub struct DatabaseError(pub Box<dyn std::error::Error + Send + Sync + 'static>);
 
 impl std::fmt::Display for DatabaseError {
 	fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
diff --git a/primitives/inherents/Cargo.toml b/primitives/inherents/Cargo.toml
index 10c66b73aec1..fdece1f9d3d3 100644
--- a/primitives/inherents/Cargo.toml
+++ b/primitives/inherents/Cargo.toml
@@ -19,7 +19,7 @@ parking_lot = { version = "0.10.0", optional = true }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 sp-core = { version = "2.0.0", default-features = false, path = "../core" }
 codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
-derive_more = { version = "0.99.2", optional = true }
+thiserror = { version = "1.0.21", optional = true }
 
 [features]
 default = [ "std" ]
@@ -28,5 +28,5 @@ std = [
 	"sp-std/std",
 	"codec/std",
 	"sp-core/std",
-	"derive_more",
+	"thiserror",
 ]
diff --git a/primitives/inherents/src/lib.rs b/primitives/inherents/src/lib.rs
index 989429695352..e91fb06e3f34 100644
--- a/primitives/inherents/src/lib.rs
+++ b/primitives/inherents/src/lib.rs
@@ -46,7 +46,8 @@ use std::{sync::Arc, format};
 
 /// An error that can occur within the inherent data system.
 #[cfg(feature = "std")]
-#[derive(Debug, Encode, Decode, derive_more::Display)]
+#[derive(Debug, Encode, Decode, thiserror::Error)]
+#[error("Inherents: {0}")]
 pub struct Error(String);
 
 #[cfg(feature = "std")]
diff --git a/primitives/runtime/src/transaction_validity.rs b/primitives/runtime/src/transaction_validity.rs
index e9e2f2b3d3c2..2191e59b9bb2 100644
--- a/primitives/runtime/src/transaction_validity.rs
+++ b/primitives/runtime/src/transaction_validity.rs
@@ -184,6 +184,21 @@ impl From<UnknownTransaction> for TransactionValidityError {
 	}
 }
 
+#[cfg(feature = "std")]
+impl std::error::Error for TransactionValidityError {
+	fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+		None
+	}
+}
+
+#[cfg(feature = "std")]
+impl std::fmt::Display for TransactionValidityError {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		let s: &'static str = (*self).into();
+		write!(f, "{}", s)
+	}
+}
+
 /// Information on a transaction's validity and, if valid, on how it relates to other transactions.
 pub type TransactionValidity = Result<ValidTransaction, TransactionValidityError>;
 
diff --git a/primitives/state-machine/Cargo.toml b/primitives/state-machine/Cargo.toml
index 894048831993..95751bd4cb1d 100644
--- a/primitives/state-machine/Cargo.toml
+++ b/primitives/state-machine/Cargo.toml
@@ -14,7 +14,8 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-log = { version = "0.4.8", optional = true }
+log = { version = "0.4.11", optional = true }
+thiserror = { version = "1.0.21", optional = true }
 parking_lot = { version = "0.10.0", optional = true }
 hash-db = { version = "0.15.2", default-features = false }
 trie-db = { version = "0.22.0", default-features = false }
@@ -40,14 +41,15 @@ std = [
 	"codec/std",
 	"hash-db/std",
 	"num-traits/std",
-  "sp-core/std",
-  "sp-externalities/std",
-  "sp-std/std",
+	"sp-core/std",
+	"sp-externalities/std",
+	"sp-std/std",
 	"sp-trie/std",
 	"trie-db/std",
 	"trie-root/std",
 	"log",
+	"thiserror",
 	"parking_lot",
 	"rand",
-  "sp-panic-handler",
+	"sp-panic-handler",
 ]
diff --git a/primitives/state-machine/src/error.rs b/primitives/state-machine/src/error.rs
index 489f6e666600..0b02c68f79f5 100644
--- a/primitives/state-machine/src/error.rs
+++ b/primitives/state-machine/src/error.rs
@@ -22,9 +22,9 @@ use sp_std::fmt;
 /// State Machine Error bound.
 ///
 /// This should reflect Wasm error type bound for future compatibility.
-pub trait Error: 'static + fmt::Debug + fmt::Display + Send {}
+pub trait Error: 'static + fmt::Debug + fmt::Display + Send + Sync {}
 
-impl<T: 'static + fmt::Debug + fmt::Display + Send> Error for T {}
+impl<T: 'static + fmt::Debug + fmt::Display + Send + Sync> Error for T {}
 
 /// Externalities Error.
 ///
@@ -32,17 +32,18 @@ impl<T: 'static + fmt::Debug + fmt::Display + Send> Error for T {}
 /// would not be executed unless externalities were available. This is included for completeness,
 /// and as a transition away from the pre-existing framework.
 #[derive(Debug, Eq, PartialEq)]
+#[cfg_attr(feature = "std", derive(thiserror::Error))]
 pub enum ExecutionError {
 	/// Backend error.
+	#[cfg_attr(feature = "std", error("Backend error {0:?}"))]
 	Backend(crate::DefaultError),
 	/// The entry `:code` doesn't exist in storage so there's no way we can execute anything.
+	#[cfg_attr(feature = "std", error("`:code` entry does not exist in storage"))]
 	CodeEntryDoesNotExist,
 	/// Backend is incompatible with execution proof generation process.
+	#[cfg_attr(feature = "std", error("Unable to generate proof"))]
 	UnableToGenerateProof,
 	/// Invalid execution proof.
+	#[cfg_attr(feature = "std", error("Invalid execution proof"))]
 	InvalidProof,
 }
-
-impl fmt::Display for ExecutionError {
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { write!(f, "Externalities Error") }
-}

From 8e28be8fc4cbf37d9a944cc35a0a58bf66f4020d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Wed, 28 Oct 2020 15:46:08 +0100
Subject: [PATCH 0030/1194] Allow multiple bounds to be specified at
 decl_error! (#7448)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Allow multiple bounds to be specified at decl_error!

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Test if decl_error! accepts multiple bounds

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 frame/support/src/error.rs           | 14 +++++++-------
 frame/support/test/tests/instance.rs |  7 ++++++-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/frame/support/src/error.rs b/frame/support/src/error.rs
index 79ffde539cf6..c0a886907d0b 100644
--- a/frame/support/src/error.rs
+++ b/frame/support/src/error.rs
@@ -77,7 +77,7 @@ macro_rules! decl_error {
 				$generic:ident: $trait:path
 				$(, $inst_generic:ident: $instance:path)?
 			>
-			$( where $( $where_ty:ty: $where_bound:path )* $(,)? )?
+			$( where $( $where_ty:ty: $where_bound:path ),* $(,)? )?
 		{
 			$(
 				$( #[doc = $doc_attr:tt] )*
@@ -88,7 +88,7 @@ macro_rules! decl_error {
 	) => {
 		$(#[$attr])*
 		pub enum $error<$generic: $trait $(, $inst_generic: $instance)?>
-		$( where $( $where_ty: $where_bound )* )?
+		$( where $( $where_ty: $where_bound ),* )?
 		{
 			#[doc(hidden)]
 			__Ignore(
@@ -103,7 +103,7 @@ macro_rules! decl_error {
 
 		impl<$generic: $trait $(, $inst_generic: $instance)?> $crate::sp_std::fmt::Debug
 			for $error<$generic $(, $inst_generic)?>
-		$( where $( $where_ty: $where_bound )* )?
+		$( where $( $where_ty: $where_bound ),* )?
 		{
 			fn fmt(&self, f: &mut $crate::sp_std::fmt::Formatter<'_>) -> $crate::sp_std::fmt::Result {
 				f.write_str(self.as_str())
@@ -111,7 +111,7 @@ macro_rules! decl_error {
 		}
 
 		impl<$generic: $trait $(, $inst_generic: $instance)?> $error<$generic $(, $inst_generic)?>
-		$( where $( $where_ty: $where_bound )* )?
+		$( where $( $where_ty: $where_bound ),* )?
 		{
 			fn as_u8(&self) -> u8 {
 				$crate::decl_error! {
@@ -136,7 +136,7 @@ macro_rules! decl_error {
 
 		impl<$generic: $trait $(, $inst_generic: $instance)?> From<$error<$generic $(, $inst_generic)?>>
 			for &'static str
-		$( where $( $where_ty: $where_bound )* )?
+		$( where $( $where_ty: $where_bound ),* )?
 		{
 			fn from(err: $error<$generic $(, $inst_generic)?>) -> &'static str {
 				err.as_str()
@@ -145,7 +145,7 @@ macro_rules! decl_error {
 
 		impl<$generic: $trait $(, $inst_generic: $instance)?> From<$error<$generic $(, $inst_generic)?>>
 			for $crate::sp_runtime::DispatchError
-		$( where $( $where_ty: $where_bound )* )?
+		$( where $( $where_ty: $where_bound ),* )?
 		{
 			fn from(err: $error<$generic $(, $inst_generic)?>) -> Self {
 				let index = <$generic::PalletInfo as $crate::traits::PalletInfo>
@@ -162,7 +162,7 @@ macro_rules! decl_error {
 
 		impl<$generic: $trait $(, $inst_generic: $instance)?> $crate::error::ModuleErrorMetadata
 			for $error<$generic $(, $inst_generic)?>
-		$( where $( $where_ty: $where_bound )* )?
+		$( where $( $where_ty: $where_bound ),* )?
 		{
 			fn metadata() -> &'static [$crate::error::ErrorMetadata] {
 				&[
diff --git a/frame/support/test/tests/instance.rs b/frame/support/test/tests/instance.rs
index 61df5d4eb818..6c90767f92e5 100644
--- a/frame/support/test/tests/instance.rs
+++ b/frame/support/test/tests/instance.rs
@@ -39,6 +39,7 @@ pub trait Currency {}
 // * Origin, Inherent, Event
 mod module1 {
 	use super::*;
+	use sp_std::ops::Add;
 
 	pub trait Trait<I>: system::Trait where <Self as system::Trait>::BlockNumber: From<u32> {
 		type Event: From<Event<Self, I>> + Into<<Self as system::Trait>::Event>;
@@ -82,7 +83,11 @@ mod module1 {
 	}
 
 	frame_support::decl_error! {
-		pub enum Error for Module<T: Trait<I>, I: Instance> where T::BlockNumber: From<u32> {
+		pub enum Error for Module<T: Trait<I>, I: Instance> where
+			T::BlockNumber: From<u32>,
+			T::BlockNumber: Add,
+			T::AccountId: AsRef<[u8]>,
+		{
 			/// Test
 			Test,
 		}

From d7c2b12181496ef13faa4393fc13139f8f7e0403 Mon Sep 17 00:00:00 2001
From: Bernhard Schuster <bernhard@ahoi.io>
Date: Wed, 28 Oct 2020 17:20:39 +0100
Subject: [PATCH 0031/1194] add Sync + Send + 'static to Box<dyn Error> bound
 (#7450)

Co-authored-by: Bernhard Schuster <bernhard@parity.io>
---
 client/cli/src/error.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cli/src/error.rs b/client/cli/src/error.rs
index 48c2ac7ef1c6..36c963f3e8c9 100644
--- a/client/cli/src/error.rs
+++ b/client/cli/src/error.rs
@@ -49,7 +49,7 @@ pub enum Error {
 	InvalidListenMultiaddress,
 	/// Application specific error chain sequence forwarder.
 	#[error(transparent)]
-	Application(#[from] Box<dyn std::error::Error>),
+	Application(#[from] Box<dyn std::error::Error + Send + Sync + 'static>),
 	/// URI error.
 	#[error("Invalid URI; expecting either a secret URI or a public URI.")]
 	InvalidUri(crypto::PublicError),

From 3654d1ac2aa075cca1faa9f00580e1b9e3556041 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Thu, 29 Oct 2020 11:47:58 +0100
Subject: [PATCH 0032/1194] Print an error if an unregistered notifications
 protocol is used (#7457)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Print an error if an nregistered notifications protocol is used

* Print an error if an nregistered notifications protocol is used

* Update client/network/src/service.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 client/network/src/service.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 9cb37e7700f3..93abbbad0249 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -661,6 +661,11 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 		if let Some(protocol_name) = protocol_name {
 			sink.send_sync_notification(protocol_name, message);
 		} else {
+			log::error!(
+				target: "sub-libp2p",
+				"Attempted to send notification on unknown protocol: {:?}",
+				engine_id,
+			);
 			return;
 		}
 

From 995111abac702bc74d1edee347e23ce588c555d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Thu, 29 Oct 2020 13:02:49 +0100
Subject: [PATCH 0033/1194] Transfer code ownership of /frame/contracts/
 (#7459)

---
 docs/CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/CODEOWNERS b/docs/CODEOWNERS
index d9342de39950..b195d5c65706 100644
--- a/docs/CODEOWNERS
+++ b/docs/CODEOWNERS
@@ -43,7 +43,7 @@
 /primitives/consensus/pow/ @sorpaas
 
 # Contracts
-/frame/contracts/ @pepyakin
+/frame/contracts/ @athei
 
 # EVM
 /frame/evm/ @sorpaas

From 179e02b7595559c3c093edf09bebd5d62fc2e0f7 Mon Sep 17 00:00:00 2001
From: Qinxuan Chen <koushiro.cqx@gmail.com>
Date: Thu, 29 Oct 2020 20:19:59 +0800
Subject: [PATCH 0034/1194] Replace bitmask with bitflags (#7159)

Signed-off-by: koushiro <koushiro.cqx@gmail.com>
---
 Cargo.lock                           |  8 +---
 frame/balances/src/lib.rs            | 16 ++++----
 frame/balances/src/tests.rs          | 14 +++----
 frame/contracts/src/rent.rs          |  6 +--
 frame/democracy/src/lib.rs           |  8 ++--
 frame/elections-phragmen/src/lib.rs  |  4 +-
 frame/elections/src/lib.rs           |  4 +-
 frame/executive/src/lib.rs           |  6 +--
 frame/support/Cargo.toml             |  3 +-
 frame/support/src/lib.rs             |  3 --
 frame/support/src/traits.rs          | 57 +++++++++++++---------------
 frame/transaction-payment/src/lib.rs |  6 +--
 frame/treasury/src/lib.rs            |  4 +-
 frame/vesting/src/benchmarking.rs    |  2 +-
 frame/vesting/src/lib.rs             |  6 +--
 15 files changed, 67 insertions(+), 80 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1841c01faf84..a7e81732ccb8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -465,12 +465,6 @@ version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
 
-[[package]]
-name = "bitmask"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5da9b3d9f6f585199287a473f4f8dfab6566cf827d15c00c219f53c645687ead"
-
 [[package]]
 name = "bitvec"
 version = "0.17.4"
@@ -1648,7 +1642,7 @@ dependencies = [
 name = "frame-support"
 version = "2.0.0"
 dependencies = [
- "bitmask",
+ "bitflags",
  "frame-metadata",
  "frame-support-procedural",
  "frame-system",
diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index fcf41bcf2627..6c9d3adfedaa 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -163,7 +163,7 @@ use frame_support::{
 	StorageValue, Parameter, decl_event, decl_storage, decl_module, decl_error, ensure,
 	traits::{
 		Currency, OnKilledAccount, OnUnbalanced, TryDrop, StoredMap,
-		WithdrawReason, WithdrawReasons, LockIdentifier, LockableCurrency, ExistenceRequirement,
+		WithdrawReasons, LockIdentifier, LockableCurrency, ExistenceRequirement,
 		Imbalance, SignedImbalance, ReservableCurrency, Get, ExistenceRequirement::KeepAlive,
 		ExistenceRequirement::AllowDeath, IsDeadAccount, BalanceStatus as Status,
 	}
@@ -292,9 +292,9 @@ pub enum Reasons {
 
 impl From<WithdrawReasons> for Reasons {
 	fn from(r: WithdrawReasons) -> Reasons {
-		if r == WithdrawReasons::from(WithdrawReason::TransactionPayment) {
+		if r == WithdrawReasons::from(WithdrawReasons::TRANSACTION_PAYMENT) {
 			Reasons::Fee
-		} else if r.contains(WithdrawReason::TransactionPayment) {
+		} else if r.contains(WithdrawReasons::TRANSACTION_PAYMENT) {
 			Reasons::All
 		} else {
 			Reasons::Misc
@@ -1011,7 +1011,7 @@ impl<T: Trait<I>, I: Instance> Currency<T::AccountId> for Module<T, I> where
 				Self::ensure_can_withdraw(
 					transactor,
 					value,
-					WithdrawReason::Transfer.into(),
+					WithdrawReasons::TRANSFER,
 					from_account.free,
 				)?;
 
@@ -1170,7 +1170,7 @@ impl<T: Trait<I>, I: Instance> ReservableCurrency<T::AccountId> for Module<T, I>
 		Self::account(who).free
 			.checked_sub(&value)
 			.map_or(false, |new_balance|
-				Self::ensure_can_withdraw(who, value, WithdrawReason::Reserve.into(), new_balance).is_ok()
+				Self::ensure_can_withdraw(who, value, WithdrawReasons::RESERVE, new_balance).is_ok()
 			)
 	}
 
@@ -1187,7 +1187,7 @@ impl<T: Trait<I>, I: Instance> ReservableCurrency<T::AccountId> for Module<T, I>
 		Self::try_mutate_account(who, |account, _| -> DispatchResult {
 			account.free = account.free.checked_sub(&value).ok_or(Error::<T, I>::InsufficientBalance)?;
 			account.reserved = account.reserved.checked_add(&value).ok_or(Error::<T, I>::Overflow)?;
-			Self::ensure_can_withdraw(&who, value.clone(), WithdrawReason::Reserve.into(), account.free)
+			Self::ensure_can_withdraw(&who, value.clone(), WithdrawReasons::RESERVE, account.free)
 		})?;
 
 		Self::deposit_event(RawEvent::Reserved(who.clone(), value));
@@ -1303,7 +1303,7 @@ where
 		amount: T::Balance,
 		reasons: WithdrawReasons,
 	) {
-		if amount.is_zero() || reasons.is_none() { return }
+		if amount.is_zero() || reasons.is_empty() { return }
 		let mut new_lock = Some(BalanceLock { id, amount, reasons: reasons.into() });
 		let mut locks = Self::locks(who).into_iter()
 			.filter_map(|l| if l.id == id { new_lock.take() } else { Some(l) })
@@ -1322,7 +1322,7 @@ where
 		amount: T::Balance,
 		reasons: WithdrawReasons,
 	) {
-		if amount.is_zero() || reasons.is_none() { return }
+		if amount.is_zero() || reasons.is_empty() { return }
 		let mut new_lock = Some(BalanceLock { id, amount, reasons: reasons.into() });
 		let mut locks = Self::locks(who).into_iter().filter_map(|l|
 			if l.id == id {
diff --git a/frame/balances/src/tests.rs b/frame/balances/src/tests.rs
index 210c75631da6..b8cf90dad922 100644
--- a/frame/balances/src/tests.rs
+++ b/frame/balances/src/tests.rs
@@ -42,7 +42,7 @@ macro_rules! decl_tests {
 		use frame_support::{
 			assert_noop, assert_ok, assert_err,
 			traits::{
-				LockableCurrency, LockIdentifier, WithdrawReason, WithdrawReasons,
+				LockableCurrency, LockIdentifier, WithdrawReasons,
 				Currency, ReservableCurrency, ExistenceRequirement::AllowDeath, StoredMap
 			}
 		};
@@ -133,7 +133,7 @@ macro_rules! decl_tests {
 		#[test]
 		fn combination_locking_should_work() {
 			<$ext_builder>::default().existential_deposit(1).monied(true).build().execute_with(|| {
-				Balances::set_lock(ID_1, &1, u64::max_value(), WithdrawReasons::none());
+				Balances::set_lock(ID_1, &1, u64::max_value(), WithdrawReasons::empty());
 				Balances::set_lock(ID_2, &1, 0, WithdrawReasons::all());
 				assert_ok!(<Balances as Currency<_>>::transfer(&1, &2, 1, AllowDeath));
 			});
@@ -168,7 +168,7 @@ macro_rules! decl_tests {
 				.build()
 				.execute_with(|| {
 					pallet_transaction_payment::NextFeeMultiplier::put(Multiplier::saturating_from_integer(1));
-					Balances::set_lock(ID_1, &1, 10, WithdrawReason::Reserve.into());
+					Balances::set_lock(ID_1, &1, 10, WithdrawReasons::RESERVE);
 					assert_noop!(
 						<Balances as Currency<_>>::transfer(&1, &2, 1, AllowDeath),
 						Error::<$test, _>::LiquidityRestrictions
@@ -192,7 +192,7 @@ macro_rules! decl_tests {
 						1,
 					).is_ok());
 
-					Balances::set_lock(ID_1, &1, 10, WithdrawReason::TransactionPayment.into());
+					Balances::set_lock(ID_1, &1, 10, WithdrawReasons::TRANSACTION_PAYMENT);
 					assert_ok!(<Balances as Currency<_>>::transfer(&1, &2, 1, AllowDeath));
 					assert_ok!(<Balances as ReservableCurrency<_>>::reserve(&1, 1));
 					assert!(<ChargeTransactionPayment<$test> as SignedExtension>::pre_dispatch(
@@ -237,17 +237,17 @@ macro_rules! decl_tests {
 		#[test]
 		fn lock_reasons_extension_should_work() {
 			<$ext_builder>::default().existential_deposit(1).monied(true).build().execute_with(|| {
-				Balances::set_lock(ID_1, &1, 10, WithdrawReason::Transfer.into());
+				Balances::set_lock(ID_1, &1, 10, WithdrawReasons::TRANSFER);
 				assert_noop!(
 					<Balances as Currency<_>>::transfer(&1, &2, 6, AllowDeath),
 					Error::<$test, _>::LiquidityRestrictions
 				);
-				Balances::extend_lock(ID_1, &1, 10, WithdrawReasons::none());
+				Balances::extend_lock(ID_1, &1, 10, WithdrawReasons::empty());
 				assert_noop!(
 					<Balances as Currency<_>>::transfer(&1, &2, 6, AllowDeath),
 					Error::<$test, _>::LiquidityRestrictions
 				);
-				Balances::extend_lock(ID_1, &1, 10, WithdrawReason::Reserve.into());
+				Balances::extend_lock(ID_1, &1, 10, WithdrawReasons::RESERVE);
 				assert_noop!(
 					<Balances as Currency<_>>::transfer(&1, &2, 6, AllowDeath),
 					Error::<$test, _>::LiquidityRestrictions
diff --git a/frame/contracts/src/rent.rs b/frame/contracts/src/rent.rs
index 908faca9a6c0..3dc473363190 100644
--- a/frame/contracts/src/rent.rs
+++ b/frame/contracts/src/rent.rs
@@ -23,7 +23,7 @@ use crate::{
 use sp_std::prelude::*;
 use sp_io::hashing::blake2_256;
 use frame_support::storage::child;
-use frame_support::traits::{Currency, ExistenceRequirement, Get, OnUnbalanced, WithdrawReason};
+use frame_support::traits::{Currency, ExistenceRequirement, Get, OnUnbalanced, WithdrawReasons};
 use frame_support::StorageMap;
 use pallet_contracts_primitives::{ContractAccessError, RentProjection, RentProjectionResult};
 use sp_runtime::traits::{Bounded, CheckedDiv, CheckedMul, SaturatedConversion, Saturating, Zero};
@@ -54,7 +54,7 @@ impl<T: Trait> OutstandingAmount<T> {
 		if let Ok(imbalance) = T::Currency::withdraw(
 			account,
 			self.amount,
-			WithdrawReason::Fee.into(),
+			WithdrawReasons::FEE,
 			ExistenceRequirement::KeepAlive,
 		) {
 			// This should never fail. However, let's err on the safe side.
@@ -192,7 +192,7 @@ fn consider_case<T: Trait>(
 	let can_withdraw_rent = T::Currency::ensure_can_withdraw(
 		account,
 		dues_limited,
-		WithdrawReason::Fee.into(),
+		WithdrawReasons::FEE,
 		free_balance.saturating_sub(dues_limited),
 	)
 	.is_ok();
diff --git a/frame/democracy/src/lib.rs b/frame/democracy/src/lib.rs
index 2eb0f89f3aed..fa8d07fd78db 100644
--- a/frame/democracy/src/lib.rs
+++ b/frame/democracy/src/lib.rs
@@ -162,7 +162,7 @@ use frame_support::{
 	decl_module, decl_storage, decl_event, decl_error, ensure, Parameter,
 	weights::{Weight, DispatchClass, Pays},
 	traits::{
-		Currency, ReservableCurrency, LockableCurrency, WithdrawReason, LockIdentifier, Get,
+		Currency, ReservableCurrency, LockableCurrency, WithdrawReasons, LockIdentifier, Get,
 		OnUnbalanced, BalanceStatus, schedule::{Named as ScheduleNamed, DispatchTime}, EnsureOrigin
 	},
 	dispatch::DispatchResultWithPostInfo,
@@ -1278,7 +1278,7 @@ impl<T: Trait> Module<T> {
 			DEMOCRACY_ID,
 			who,
 			vote.balance(),
-			WithdrawReason::Transfer.into()
+			WithdrawReasons::TRANSFER
 		);
 		ReferendumInfoOf::<T>::insert(ref_index, ReferendumInfo::Ongoing(status));
 		Ok(())
@@ -1410,7 +1410,7 @@ impl<T: Trait> Module<T> {
 				DEMOCRACY_ID,
 				&who,
 				balance,
-				WithdrawReason::Transfer.into()
+				WithdrawReasons::TRANSFER
 			);
 			Ok(votes)
 		})?;
@@ -1461,7 +1461,7 @@ impl<T: Trait> Module<T> {
 		if lock_needed.is_zero() {
 			T::Currency::remove_lock(DEMOCRACY_ID, who);
 		} else {
-			T::Currency::set_lock(DEMOCRACY_ID, who, lock_needed, WithdrawReason::Transfer.into());
+			T::Currency::set_lock(DEMOCRACY_ID, who, lock_needed, WithdrawReasons::TRANSFER);
 		}
 	}
 
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index ba4606b9858c..cf3864f2e3f9 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -92,7 +92,7 @@ use frame_support::{
 	traits::{
 		BalanceStatus, ChangeMembers, Contains, ContainsLengthBound, Currency, CurrencyToVote, Get,
 		InitializeMembers, LockIdentifier, LockableCurrency, OnUnbalanced, ReservableCurrency,
-		WithdrawReason, WithdrawReasons,
+		WithdrawReasons,
 	},
 	weights::Weight,
 };
@@ -365,7 +365,7 @@ decl_module! {
 				T::ModuleId::get(),
 				&who,
 				locked_balance,
-				WithdrawReasons::except(WithdrawReason::TransactionPayment),
+				WithdrawReasons::except(WithdrawReasons::TRANSACTION_PAYMENT),
 			);
 
 			Voting::<T>::insert(&who, (locked_balance, votes));
diff --git a/frame/elections/src/lib.rs b/frame/elections/src/lib.rs
index 9b61a9b3509a..dccc42f24417 100644
--- a/frame/elections/src/lib.rs
+++ b/frame/elections/src/lib.rs
@@ -41,7 +41,7 @@ use frame_support::{
 	weights::{Weight, DispatchClass},
 	traits::{
 		Currency, ExistenceRequirement, Get, LockableCurrency, LockIdentifier, BalanceStatus,
-		OnUnbalanced, ReservableCurrency, WithdrawReason, WithdrawReasons, ChangeMembers,
+		OnUnbalanced, ReservableCurrency, WithdrawReasons, ChangeMembers,
 	}
 };
 use codec::{Encode, Decode};
@@ -871,7 +871,7 @@ impl<T: Trait> Module<T> {
 						let imbalance = T::Currency::withdraw(
 							&who,
 							T::VotingFee::get(),
-							WithdrawReason::Fee.into(),
+							WithdrawReasons::FEE,
 							ExistenceRequirement::KeepAlive,
 						)?;
 						T::BadVoterIndex::on_unbalanced(imbalance);
diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index 43500bef90bb..9738c09178a7 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -488,7 +488,7 @@ mod tests {
 	use frame_support::{
 		parameter_types,
 		weights::{Weight, RuntimeDbWeight, IdentityFee, WeightToFeePolynomial},
-		traits::{Currency, LockIdentifier, LockableCurrency, WithdrawReasons, WithdrawReason},
+		traits::{Currency, LockIdentifier, LockableCurrency, WithdrawReasons},
 	};
 	use frame_system::{Call as SystemCall, ChainContext, LastRuntimeUpgradeInfo};
 	use pallet_balances::Call as BalancesCall;
@@ -950,7 +950,7 @@ mod tests {
 					Digest::default(),
 				));
 
-				if lock == WithdrawReasons::except(WithdrawReason::TransactionPayment) {
+				if lock == WithdrawReasons::except(WithdrawReasons::TRANSACTION_PAYMENT) {
 					assert!(Executive::apply_extrinsic(xt).unwrap().is_ok());
 					// tx fee has been deducted.
 					assert_eq!(<pallet_balances::Module<Runtime>>::total_balance(&1), 111 - fee);
@@ -965,7 +965,7 @@ mod tests {
 		};
 
 		execute_with_lock(WithdrawReasons::all());
-		execute_with_lock(WithdrawReasons::except(WithdrawReason::TransactionPayment));
+		execute_with_lock(WithdrawReasons::except(WithdrawReasons::TRANSACTION_PAYMENT));
 	}
 
 	#[test]
diff --git a/frame/support/Cargo.toml b/frame/support/Cargo.toml
index 3d40b6563726..1f7fe9a20253 100644
--- a/frame/support/Cargo.toml
+++ b/frame/support/Cargo.toml
@@ -28,7 +28,7 @@ frame-support-procedural = { version = "2.0.0", default-features = false, path =
 paste = "0.1.6"
 once_cell = { version = "1", default-features = false, optional = true }
 sp-state-machine = { version = "0.8.0", optional = true, path = "../../primitives/state-machine" }
-bitmask = { version = "0.5.0", default-features = false }
+bitflags = "1.2"
 impl-trait-for-tuples = "0.1.3"
 smallvec = "1.4.1"
 
@@ -43,7 +43,6 @@ sp-api = { version = "2.0.0", default-features = false, path = "../../primitives
 default = ["std"]
 std = [
 	"once_cell",
-	"bitmask/std",
 	"serde",
 	"sp-io/std",
 	"codec/std",
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 2380c8127d7a..99cfcb66b393 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -22,9 +22,6 @@
 /// Export ourself as `frame_support` to make tests happy.
 extern crate self as frame_support;
 
-#[macro_use]
-extern crate bitmask;
-
 #[doc(hidden)]
 pub use sp_tracing;
 
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index bea768bf119d..96d7244efe8d 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -33,6 +33,7 @@ use sp_runtime::{
 use crate::dispatch::Parameter;
 use crate::storage::StorageMap;
 use crate::weights::Weight;
+use bitflags::bitflags;
 use impl_trait_for_tuples::impl_for_tuples;
 
 /// Re-expected for the macro.
@@ -1184,58 +1185,54 @@ pub trait VestingSchedule<AccountId> {
 	fn remove_vesting_schedule(who: &AccountId);
 }
 
-bitmask! {
+bitflags! {
 	/// Reasons for moving funds out of an account.
 	#[derive(Encode, Decode)]
-	pub mask WithdrawReasons: i8 where
-
-	/// Reason for moving funds out of an account.
-	#[derive(Encode, Decode)]
-	flags WithdrawReason {
+	pub struct WithdrawReasons: i8 {
 		/// In order to pay for (system) transaction costs.
-		TransactionPayment = 0b00000001,
+		const TRANSACTION_PAYMENT = 0b00000001;
 		/// In order to transfer ownership.
-		Transfer = 0b00000010,
+		const TRANSFER = 0b00000010;
 		/// In order to reserve some funds for a later return or repatriation.
-		Reserve = 0b00000100,
+		const RESERVE = 0b00000100;
 		/// In order to pay some other (higher-level) fees.
-		Fee = 0b00001000,
+		const FEE = 0b00001000;
 		/// In order to tip a validator for transaction inclusion.
-		Tip = 0b00010000,
+		const TIP = 0b00010000;
 	}
 }
 
-pub trait Time {
-	type Moment: AtLeast32Bit + Parameter + Default + Copy;
-
-	fn now() -> Self::Moment;
-}
-
-/// Trait to deal with unix time.
-pub trait UnixTime {
-	/// Return duration since `SystemTime::UNIX_EPOCH`.
-	fn now() -> core::time::Duration;
-}
-
 impl WithdrawReasons {
 	/// Choose all variants except for `one`.
 	///
 	/// ```rust
-	/// # use frame_support::traits::{WithdrawReason, WithdrawReasons};
+	/// # use frame_support::traits::WithdrawReasons;
 	/// # fn main() {
 	/// assert_eq!(
-	/// 	WithdrawReason::Fee | WithdrawReason::Transfer | WithdrawReason::Reserve | WithdrawReason::Tip,
-	/// 	WithdrawReasons::except(WithdrawReason::TransactionPayment),
+	/// 	WithdrawReasons::FEE | WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE | WithdrawReasons::TIP,
+	/// 	WithdrawReasons::except(WithdrawReasons::TRANSACTION_PAYMENT),
 	///	);
 	/// # }
 	/// ```
-	pub fn except(one: WithdrawReason) -> WithdrawReasons {
-		let mut mask = Self::all();
-		mask.toggle(one);
-		mask
+	pub fn except(one: WithdrawReasons) -> WithdrawReasons {
+		let mut flags = Self::all();
+		flags.toggle(one);
+		flags
 	}
 }
 
+pub trait Time {
+	type Moment: AtLeast32Bit + Parameter + Default + Copy;
+
+	fn now() -> Self::Moment;
+}
+
+/// Trait to deal with unix time.
+pub trait UnixTime {
+	/// Return duration since `SystemTime::UNIX_EPOCH`.
+	fn now() -> core::time::Duration;
+}
+
 /// Trait for type that can handle incremental changes to a set of account IDs.
 pub trait ChangeMembers<AccountId: Clone + Ord> {
 	/// A number of members `incoming` just joined the set and replaced some `outgoing` ones. The
diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
index 09caae54cf34..48e5ca08dfbc 100644
--- a/frame/transaction-payment/src/lib.rs
+++ b/frame/transaction-payment/src/lib.rs
@@ -36,7 +36,7 @@ use sp_std::prelude::*;
 use codec::{Encode, Decode};
 use frame_support::{
 	decl_storage, decl_module,
-	traits::{Currency, Get, OnUnbalanced, ExistenceRequirement, WithdrawReason, Imbalance},
+	traits::{Currency, Get, OnUnbalanced, ExistenceRequirement, WithdrawReasons, Imbalance},
 	weights::{
 		Weight, DispatchInfo, PostDispatchInfo, GetDispatchInfo, Pays, WeightToFeePolynomial,
 		WeightToFeeCoefficient,
@@ -457,9 +457,9 @@ impl<T: Trait + Send + Sync> ChargeTransactionPayment<T> where
 			who,
 			fee,
 			if tip.is_zero() {
-				WithdrawReason::TransactionPayment.into()
+				WithdrawReasons::TRANSACTION_PAYMENT
 			} else {
-				WithdrawReason::TransactionPayment | WithdrawReason::Tip
+				WithdrawReasons::TRANSACTION_PAYMENT | WithdrawReasons::TIP
 			},
 			ExistenceRequirement::KeepAlive,
 		) {
diff --git a/frame/treasury/src/lib.rs b/frame/treasury/src/lib.rs
index 1d9b312755cd..2ada0660f9ec 100644
--- a/frame/treasury/src/lib.rs
+++ b/frame/treasury/src/lib.rs
@@ -142,7 +142,7 @@ use sp_std::prelude::*;
 use frame_support::{decl_module, decl_storage, decl_event, ensure, print, decl_error, Parameter};
 use frame_support::traits::{
 	Currency, Get, Imbalance, OnUnbalanced, ExistenceRequirement::{KeepAlive, AllowDeath},
-	ReservableCurrency, WithdrawReason
+	ReservableCurrency, WithdrawReasons
 };
 use sp_runtime::{Permill, ModuleId, Percent, RuntimeDebug, DispatchResult, traits::{
 	Zero, StaticLookup, AccountIdConversion, Saturating, Hash, BadOrigin
@@ -1346,7 +1346,7 @@ impl<T: Trait<I>, I: Instance> Module<T, I> {
 		if let Err(problem) = T::Currency::settle(
 			&account_id,
 			imbalance,
-			WithdrawReason::Transfer.into(),
+			WithdrawReasons::TRANSFER,
 			KeepAlive
 		) {
 			print("Inconsistent state - couldn't settle imbalance for funds spent by treasury");
diff --git a/frame/vesting/src/benchmarking.rs b/frame/vesting/src/benchmarking.rs
index 69dc7abaa703..652d10aab3ae 100644
--- a/frame/vesting/src/benchmarking.rs
+++ b/frame/vesting/src/benchmarking.rs
@@ -35,7 +35,7 @@ fn add_locks<T: Trait>(who: &T::AccountId, n: u8) {
 	for id in 0..n {
 		let lock_id = [id; 8];
 		let locked = 100u32;
-		let reasons = WithdrawReason::Transfer | WithdrawReason::Reserve;
+		let reasons = WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE;
 		T::Currency::set_lock(lock_id, who, locked.into(), reasons);
 	}
 }
diff --git a/frame/vesting/src/lib.rs b/frame/vesting/src/lib.rs
index 959df1fb1b36..8b78eac4fedf 100644
--- a/frame/vesting/src/lib.rs
+++ b/frame/vesting/src/lib.rs
@@ -58,7 +58,7 @@ use sp_runtime::{DispatchResult, RuntimeDebug, traits::{
 }};
 use frame_support::{decl_module, decl_event, decl_storage, decl_error, ensure};
 use frame_support::traits::{
-	Currency, LockableCurrency, VestingSchedule, WithdrawReason, LockIdentifier,
+	Currency, LockableCurrency, VestingSchedule, WithdrawReasons, LockIdentifier,
 	ExistenceRequirement, Get,
 };
 use frame_system::{ensure_signed, ensure_root};
@@ -148,7 +148,7 @@ decl_storage! {
 					per_block: per_block,
 					starting_block: begin
 				});
-				let reasons = WithdrawReason::Transfer | WithdrawReason::Reserve;
+				let reasons = WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE;
 				T::Currency::set_lock(VESTING_ID, who, locked, reasons);
 			}
 		})
@@ -322,7 +322,7 @@ impl<T: Trait> Module<T> {
 			Vesting::<T>::remove(&who);
 			Self::deposit_event(RawEvent::VestingCompleted(who));
 		} else {
-			let reasons = WithdrawReason::Transfer | WithdrawReason::Reserve;
+			let reasons = WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE;
 			T::Currency::set_lock(VESTING_ID, &who, locked_now, reasons);
 			Self::deposit_event(RawEvent::VestingUpdated(who, locked_now));
 		}

From 30ecb9b259140a860b20c662fda01b5b2c33e5fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Thu, 29 Oct 2020 15:57:56 +0100
Subject: [PATCH 0035/1194] contracts: Refactor the runtime API in order to
 simplify node integration (#7409)

* contracts: Make use of existing type aliases for runtime API types

* contracts: Refactor the contracts call runtime API

* review: Fix comment typo

Co-authored-by: Andrew Jones <ascjones@gmail.com>

* Update frame/contracts/common/src/lib.rs

Co-authored-by: Nikolay Volf <nikvolf@gmail.com>

* Update frame/contracts/common/src/lib.rs

Co-authored-by: Nikolay Volf <nikvolf@gmail.com>

* Update frame/contracts/common/src/lib.rs

Co-authored-by: Nikolay Volf <nikvolf@gmail.com>

* Update frame/contracts/common/src/lib.rs

Co-authored-by: Nikolay Volf <nikvolf@gmail.com>

* Update frame/contracts/common/src/lib.rs

Co-authored-by: Nikolay Volf <nikvolf@gmail.com>

* Update lib.rs

* review: Group crate imports

Co-authored-by: Andrew Jones <ascjones@gmail.com>
Co-authored-by: Addie Wagenknecht <addie@nortd.com>
Co-authored-by: Nikolay Volf <nikvolf@gmail.com>
---
 Cargo.lock                                 |  2 +-
 bin/node/runtime/src/lib.rs                | 14 +---
 frame/contracts/Cargo.toml                 |  1 -
 frame/contracts/common/Cargo.toml          |  1 +
 frame/contracts/common/src/lib.rs          | 91 ++++++++++++++++++++--
 frame/contracts/rpc/runtime-api/src/lib.rs | 26 +------
 frame/contracts/rpc/src/lib.rs             | 28 +++----
 frame/contracts/src/benchmarking/mod.rs    |  1 +
 frame/contracts/src/exec.rs                | 60 +-------------
 frame/contracts/src/gas.rs                 |  3 +-
 frame/contracts/src/lib.rs                 | 30 ++++---
 frame/contracts/src/tests.rs               | 26 +++----
 frame/contracts/src/wasm/mod.rs            |  8 +-
 frame/contracts/src/wasm/runtime.rs        | 13 ++--
 14 files changed, 143 insertions(+), 161 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a7e81732ccb8..450ea9f3852f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4438,7 +4438,6 @@ name = "pallet-contracts"
 version = "2.0.0"
 dependencies = [
  "assert_matches",
- "bitflags",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -4466,6 +4465,7 @@ dependencies = [
 name = "pallet-contracts-primitives"
 version = "2.0.0"
 dependencies = [
+ "bitflags",
  "parity-scale-codec",
  "sp-runtime",
  "sp-std",
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 0718a1557e4d..ef95daec716c 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -65,7 +65,6 @@ use pallet_im_online::sr25519::AuthorityId as ImOnlineId;
 use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId;
 use pallet_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo;
 pub use pallet_transaction_payment::{Multiplier, TargetedFeeAdjustment};
-use pallet_contracts_rpc_runtime_api::ContractExecResult;
 use pallet_session::{historical as pallet_session_historical};
 use sp_inherents::{InherentData, CheckInherentsResult};
 use static_assertions::const_assert;
@@ -1124,17 +1123,8 @@ impl_runtime_apis! {
 			value: Balance,
 			gas_limit: u64,
 			input_data: Vec<u8>,
-		) -> ContractExecResult {
-			let (exec_result, gas_consumed) =
-				Contracts::bare_call(origin, dest.into(), value, gas_limit, input_data);
-			match exec_result {
-				Ok(v) => ContractExecResult::Success {
-					flags: v.flags.bits(),
-					data: v.data,
-					gas_consumed: gas_consumed,
-				},
-				Err(_) => ContractExecResult::Error,
-			}
+		) -> pallet_contracts_primitives::ContractExecResult {
+			Contracts::bare_call(origin, dest, value, gas_limit, input_data)
 		}
 
 		fn get_storage(
diff --git a/frame/contracts/Cargo.toml b/frame/contracts/Cargo.toml
index 41c4e893f8ca..ffcb37385849 100644
--- a/frame/contracts/Cargo.toml
+++ b/frame/contracts/Cargo.toml
@@ -13,7 +13,6 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-bitflags = "1.0"
 codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
 frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
diff --git a/frame/contracts/common/Cargo.toml b/frame/contracts/common/Cargo.toml
index 753ef9c08122..e87cad055aff 100644
--- a/frame/contracts/common/Cargo.toml
+++ b/frame/contracts/common/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 # This crate should not rely on any of the frame primitives.
+bitflags = "1.0"
 codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../../../primitives/std" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../../primitives/runtime" }
diff --git a/frame/contracts/common/src/lib.rs b/frame/contracts/common/src/lib.rs
index 6a74a417fa0f..9da105cf2d80 100644
--- a/frame/contracts/common/src/lib.rs
+++ b/frame/contracts/common/src/lib.rs
@@ -18,13 +18,29 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
+use bitflags::bitflags;
+use codec::{Decode, Encode};
+use sp_runtime::{DispatchError, RuntimeDebug};
 use sp_std::prelude::*;
 
-/// A result type of a get storage call.
+/// Result type of a `bare_call` call.
+///
+/// The result of a contract execution along with a gas consumed.
+#[derive(Eq, PartialEq, Encode, Decode, RuntimeDebug)]
+pub struct ContractExecResult {
+	pub exec_result: ExecResult,
+	pub gas_consumed: u64,
+}
+
+/// Result type of a `get_storage` call.
 pub type GetStorageResult = Result<Option<Vec<u8>>, ContractAccessError>;
 
+/// Result type of a `rent_projection` call.
+pub type RentProjectionResult<BlockNumber> =
+	Result<RentProjection<BlockNumber>, ContractAccessError>;
+
 /// The possible errors that can happen querying the storage of a contract.
-#[derive(Eq, PartialEq, codec::Encode, codec::Decode, sp_runtime::RuntimeDebug)]
+#[derive(Eq, PartialEq, Encode, Decode, RuntimeDebug)]
 pub enum ContractAccessError {
 	/// The given address doesn't point to a contract.
 	DoesntExist,
@@ -32,16 +48,75 @@ pub enum ContractAccessError {
 	IsTombstone,
 }
 
-/// A result type of a `rent_projection` call.
-pub type RentProjectionResult<BlockNumber> =
-	Result<RentProjection<BlockNumber>, ContractAccessError>;
-
-#[derive(Eq, PartialEq, codec::Encode, codec::Decode, sp_runtime::RuntimeDebug)]
+#[derive(Eq, PartialEq, Encode, Decode, RuntimeDebug)]
 pub enum RentProjection<BlockNumber> {
 	/// Eviction is projected to happen at the specified block number.
 	EvictionAt(BlockNumber),
 	/// No eviction is scheduled.
 	///
-	/// E.g. because the contract accumulated enough funds to offset the rent storage costs.
+	/// E.g. Contract accumulated enough funds to offset the rent storage costs.
 	NoEviction,
 }
+
+bitflags! {
+	/// Flags used by a contract to customize exit behaviour.
+	#[derive(Encode, Decode)]
+	pub struct ReturnFlags: u32 {
+		/// If this bit is set all changes made by the contract execution are rolled back.
+		const REVERT = 0x0000_0001;
+	}
+}
+
+/// Output of a contract call or instantiation which ran to completion.
+#[derive(PartialEq, Eq, Encode, Decode, RuntimeDebug)]
+pub struct ExecReturnValue {
+	/// Flags passed along by `seal_return`. Empty when `seal_return` was never called.
+	pub flags: ReturnFlags,
+	/// Buffer passed along by `seal_return`. Empty when `seal_return` was never called.
+	pub data: Vec<u8>,
+}
+
+impl ExecReturnValue {
+	/// We understand the absense of a revert flag as success.
+	pub fn is_success(&self) -> bool {
+		!self.flags.contains(ReturnFlags::REVERT)
+	}
+}
+
+/// Origin of the error.
+///
+/// Call or instantiate both called into other contracts and pass through errors happening
+/// in those to the caller. This enum is for the caller to distinguish whether the error
+/// happened during the execution of the callee or in the current execution context.
+#[derive(PartialEq, Eq, Encode, Decode, RuntimeDebug)]
+pub enum ErrorOrigin {
+	/// Caller error origin.
+	///
+	/// The error happened in the current exeuction context rather than in the one
+	/// of the contract that is called into.
+	Caller,
+	/// The error happened during execution of the called contract.
+	Callee,
+}
+
+/// Error returned by contract exection.
+#[derive(PartialEq, Eq, Encode, Decode, RuntimeDebug)]
+pub struct ExecError {
+	/// The reason why the execution failed.
+	pub error: DispatchError,
+	/// Origin of the error.
+	pub origin: ErrorOrigin,
+}
+
+impl<T: Into<DispatchError>> From<T> for ExecError {
+	fn from(error: T) -> Self {
+		Self {
+			error: error.into(),
+			origin: ErrorOrigin::Caller,
+		}
+	}
+}
+
+/// The result that is returned from contract execution. It either contains the output
+/// buffer or an error describing the reason for failure.
+pub type ExecResult = Result<ExecReturnValue, ExecError>;
diff --git a/frame/contracts/rpc/runtime-api/src/lib.rs b/frame/contracts/rpc/runtime-api/src/lib.rs
index 7d208cf7763e..94b9fe7967c0 100644
--- a/frame/contracts/rpc/runtime-api/src/lib.rs
+++ b/frame/contracts/rpc/runtime-api/src/lib.rs
@@ -23,31 +23,9 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use codec::{Codec, Decode, Encode};
-use pallet_contracts_primitives::{GetStorageResult, RentProjectionResult};
-use sp_runtime::RuntimeDebug;
+use codec::Codec;
 use sp_std::vec::Vec;
-
-/// A result of execution of a contract.
-#[derive(Eq, PartialEq, Encode, Decode, RuntimeDebug)]
-pub enum ContractExecResult {
-	/// The contract returned successfully.
-	///
-	/// There is a status code and, optionally, some data returned by the contract.
-	Success {
-		/// Flags that the contract passed along on returning to alter its exit behaviour.
-		/// Described in `pallet_contracts::exec::ReturnFlags`.
-		flags: u32,
-		/// Output data returned by the contract.
-		///
-		/// Can be empty.
-		data: Vec<u8>,
-		/// How much gas was consumed by the call.
-		gas_consumed: u64,
-	},
-	/// The contract execution either trapped or returned an error.
-	Error,
-}
+use pallet_contracts_primitives::{ContractExecResult, GetStorageResult, RentProjectionResult};
 
 sp_api::decl_runtime_apis! {
 	/// The API to interact with contracts without using executive.
diff --git a/frame/contracts/rpc/src/lib.rs b/frame/contracts/rpc/src/lib.rs
index d99ed1e78a65..84df1e25a3b3 100644
--- a/frame/contracts/rpc/src/lib.rs
+++ b/frame/contracts/rpc/src/lib.rs
@@ -33,11 +33,9 @@ use sp_runtime::{
 	traits::{Block as BlockT, Header as HeaderT},
 };
 use std::convert::TryInto;
+use pallet_contracts_primitives::ContractExecResult;
 
-pub use self::gen_client::Client as ContractsClient;
-pub use pallet_contracts_rpc_runtime_api::{
-	self as runtime_api, ContractExecResult, ContractsApi as ContractsRuntimeApi,
-};
+pub use pallet_contracts_rpc_runtime_api::ContractsApi as ContractsRuntimeApi;
 
 const RUNTIME_ERROR: i64 = 1;
 const CONTRACT_DOESNT_EXIST: i64 = 2;
@@ -105,17 +103,13 @@ pub enum RpcContractExecResult {
 
 impl From<ContractExecResult> for RpcContractExecResult {
 	fn from(r: ContractExecResult) -> Self {
-		match r {
-			ContractExecResult::Success {
-				flags,
-				data,
-				gas_consumed
-			} => RpcContractExecResult::Success {
-				flags,
-				data: data.into(),
-				gas_consumed,
+		match r.exec_result {
+			Ok(val) => RpcContractExecResult::Success {
+				flags: val.flags.bits(),
+				data: val.data.into(),
+				gas_consumed: r.gas_consumed,
 			},
-			ContractExecResult::Error => RpcContractExecResult::Error(()),
+			_ => RpcContractExecResult::Error(()),
 		}
 	}
 }
@@ -233,7 +227,7 @@ where
 
 		let exec_result = api
 			.call(&at, origin, dest, value, gas_limit, input_data.to_vec())
-			.map_err(|e| runtime_error_into_rpc_err(e))?;
+			.map_err(runtime_error_into_rpc_err)?;
 
 		Ok(exec_result.into())
 	}
@@ -251,7 +245,7 @@ where
 
 		let result = api
 			.get_storage(&at, address, key.into())
-			.map_err(|e| runtime_error_into_rpc_err(e))?
+			.map_err(runtime_error_into_rpc_err)?
 			.map_err(ContractAccessError)?
 			.map(Bytes);
 
@@ -270,7 +264,7 @@ where
 
 		let result = api
 			.rent_projection(&at, address)
-			.map_err(|e| runtime_error_into_rpc_err(e))?
+			.map_err(runtime_error_into_rpc_err)?
 			.map_err(ContractAccessError)?;
 
 		Ok(match result {
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index 7c084a222a64..79863afc4419 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -34,6 +34,7 @@ use frame_system::{Module as System, RawOrigin};
 use parity_wasm::elements::{Instruction, ValueType, BlockType};
 use sp_runtime::traits::{Hash, Bounded};
 use sp_std::{default::Default, convert::{TryInto}};
+use pallet_contracts_primitives::RentProjection;
 
 /// How many batches we do per API benchmark.
 const API_BENCHMARK_BATCHES: u32 = 20;
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index bc99431c85e6..f93f262d821e 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -19,7 +19,6 @@ use crate::{
 	TrieId, BalanceOf, ContractInfo, TrieIdGenerator,
 	gas::GasMeter, rent, storage, Error, ContractInfoOf
 };
-use bitflags::bitflags;
 use sp_std::prelude::*;
 use sp_runtime::traits::{Bounded, Zero, Convert, Saturating};
 use frame_support::{
@@ -28,6 +27,7 @@ use frame_support::{
 	weights::Weight,
 	ensure, StorageMap,
 };
+use pallet_contracts_primitives::{ErrorOrigin, ExecError, ExecReturnValue, ExecResult, ReturnFlags};
 
 pub type AccountIdOf<T> = <T as frame_system::Trait>::AccountId;
 pub type MomentOf<T> = <<T as Trait>::Time as Time>::Moment;
@@ -38,14 +38,6 @@ pub type StorageKey = [u8; 32];
 /// A type that represents a topic of an event. At the moment a hash is used.
 pub type TopicOf<T> = <T as frame_system::Trait>::Hash;
 
-bitflags! {
-	/// Flags used by a contract to customize exit behaviour.
-	pub struct ReturnFlags: u32 {
-		/// If this bit is set all changes made by the contract exection are rolled back.
-		const REVERT = 0x0000_0001;
-	}
-}
-
 /// Describes whether we deal with a contract or a plain account.
 pub enum TransactorKind {
 	/// Transaction was initiated from a plain account. That can be either be through a
@@ -55,56 +47,6 @@ pub enum TransactorKind {
 	Contract,
 }
 
-/// Output of a contract call or instantiation which ran to completion.
-#[cfg_attr(test, derive(PartialEq, Eq, Debug))]
-pub struct ExecReturnValue {
-	/// Flags passed along by `seal_return`. Empty when `seal_return` was never called.
-	pub flags: ReturnFlags,
-	/// Buffer passed along by `seal_return`. Empty when `seal_return` was never called.
-	pub data: Vec<u8>,
-}
-
-impl ExecReturnValue {
-	/// We understand the absense of a revert flag as success.
-	pub fn is_success(&self) -> bool {
-		!self.flags.contains(ReturnFlags::REVERT)
-	}
-}
-
-/// Call or instantiate both call into other contracts and pass through errors happening
-/// in those to the caller. This enum is for  the caller to distinguish whether the error
-/// happened during the execution of the callee or in the current execution context.
-#[cfg_attr(test, derive(PartialEq, Eq, Debug))]
-pub enum ErrorOrigin {
-	/// The error happened in the current exeuction context rather than in the one
-	/// of the contract that is called into.
-	Caller,
-	/// The error happened during execution of the called contract.
-	Callee,
-}
-
-/// Error returned by contract exection.
-#[cfg_attr(test, derive(PartialEq, Eq, Debug))]
-pub struct ExecError {
-	/// The reason why the execution failed.
-	pub error: DispatchError,
-	/// Origin of the error.
-	pub origin: ErrorOrigin,
-}
-
-impl<T: Into<DispatchError>> From<T> for ExecError {
-	fn from(error: T) -> Self {
-		Self {
-			error: error.into(),
-			origin: ErrorOrigin::Caller,
-		}
-	}
-}
-
-/// The result that is returned from contract execution. It either contains the output
-/// buffer or an error describing the reason for failure.
-pub type ExecResult = Result<ExecReturnValue, ExecError>;
-
 /// An interface that provides access to the external environment in which the
 /// smart-contract is executed.
 ///
diff --git a/frame/contracts/src/gas.rs b/frame/contracts/src/gas.rs
index decaf11b796f..0828a220c040 100644
--- a/frame/contracts/src/gas.rs
+++ b/frame/contracts/src/gas.rs
@@ -14,12 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate. If not, see <http://www.gnu.org/licenses/>.
 
-use crate::{Trait, exec::ExecError};
+use crate::Trait;
 use sp_std::marker::PhantomData;
 use sp_runtime::traits::Zero;
 use frame_support::dispatch::{
 	DispatchResultWithPostInfo, PostDispatchInfo, DispatchErrorWithPostInfo,
 };
+use pallet_contracts_primitives::ExecError;
 
 #[cfg(test)]
 use std::{any::Any, fmt::Debug};
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index cd5cbe5d32a4..9f1656f35f6e 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -97,7 +97,6 @@ use crate::exec::ExecutionContext;
 use crate::wasm::{WasmLoader, WasmVm};
 
 pub use crate::gas::{Gas, GasMeter};
-pub use crate::exec::{ExecResult, ExecReturnValue};
 pub use crate::wasm::ReturnCode as RuntimeReturnCode;
 pub use crate::weight_info::WeightInfo;
 pub use crate::schedule::{Schedule, HostFnWeights, InstructionWeights};
@@ -118,7 +117,9 @@ use frame_support::{
 	traits::{OnUnbalanced, Currency, Get, Time, Randomness},
 };
 use frame_system::{ensure_signed, ensure_root};
-use pallet_contracts_primitives::{RentProjection, ContractAccessError};
+use pallet_contracts_primitives::{
+	RentProjectionResult, GetStorageResult, ContractAccessError, ContractExecResult, ExecResult,
+};
 use frame_support::weights::Weight;
 
 pub type CodeHash<T> = <T as frame_system::Trait>::Hash;
@@ -639,21 +640,20 @@ impl<T: Trait> Module<T> {
 		value: BalanceOf<T>,
 		gas_limit: Gas,
 		input_data: Vec<u8>,
-	) -> (ExecResult, Gas) {
+	) -> ContractExecResult {
 		let mut gas_meter = GasMeter::new(gas_limit);
-		(
-			Self::execute_wasm(origin, &mut gas_meter, |ctx, gas_meter| {
-				ctx.call(dest, value, gas_meter, input_data)
-			}),
-			gas_meter.gas_spent(),
-		)
+		let exec_result = Self::execute_wasm(origin, &mut gas_meter, |ctx, gas_meter| {
+			ctx.call(dest, value, gas_meter, input_data)
+		});
+		let gas_consumed = gas_meter.gas_spent();
+		ContractExecResult {
+			exec_result,
+			gas_consumed,
+		}
 	}
 
 	/// Query storage of a specified contract under a specified key.
-	pub fn get_storage(
-		address: T::AccountId,
-		key: [u8; 32],
-	) -> sp_std::result::Result<Option<Vec<u8>>, ContractAccessError> {
+	pub fn get_storage(address: T::AccountId, key: [u8; 32]) -> GetStorageResult {
 		let contract_info = ContractInfoOf::<T>::get(&address)
 			.ok_or(ContractAccessError::DoesntExist)?
 			.get_alive()
@@ -663,9 +663,7 @@ impl<T: Trait> Module<T> {
 		Ok(maybe_value)
 	}
 
-	pub fn rent_projection(
-		address: T::AccountId,
-	) -> sp_std::result::Result<RentProjection<T::BlockNumber>, ContractAccessError> {
+	pub fn rent_projection(address: T::AccountId) -> RentProjectionResult<T::BlockNumber> {
 		rent::compute_rent_projection::<T>(&address)
 	}
 
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index 1c14e3e35f24..c2d9ed664255 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -1655,7 +1655,7 @@ fn crypto_hashes() {
 					0,
 					GAS_LIMIT,
 					params,
-				).0.unwrap();
+				).exec_result.unwrap();
 				assert!(result.is_success());
 				let expected = hash_fn(input.as_ref());
 				assert_eq!(&result.data[..*expected_size], &*expected);
@@ -1688,7 +1688,7 @@ fn transfer_return_code() {
 			0,
 			GAS_LIMIT,
 			vec![],
-		).0.unwrap();
+		).exec_result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::BelowSubsistenceThreshold);
 
 		// Contract has enough total balance in order to not go below the subsistence
@@ -1702,7 +1702,7 @@ fn transfer_return_code() {
 			0,
 			GAS_LIMIT,
 			vec![],
-		).0.unwrap();
+		).exec_result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::TransferFailed);
 	});
 }
@@ -1735,7 +1735,7 @@ fn call_return_code() {
 			0,
 			GAS_LIMIT,
 			vec![0],
-		).0.unwrap();
+		).exec_result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::NotCallable);
 
 		assert_ok!(
@@ -1755,7 +1755,7 @@ fn call_return_code() {
 			0,
 			GAS_LIMIT,
 			vec![0],
-		).0.unwrap();
+		).exec_result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::BelowSubsistenceThreshold);
 
 		// Contract has enough total balance in order to not go below the subsistence
@@ -1769,7 +1769,7 @@ fn call_return_code() {
 			0,
 			GAS_LIMIT,
 			vec![0],
-		).0.unwrap();
+		).exec_result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::TransferFailed);
 
 		// Contract has enough balance but callee reverts because "1" is passed.
@@ -1780,7 +1780,7 @@ fn call_return_code() {
 			0,
 			GAS_LIMIT,
 			vec![1],
-		).0.unwrap();
+		).exec_result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::CalleeReverted);
 
 		// Contract has enough balance but callee traps because "2" is passed.
@@ -1790,7 +1790,7 @@ fn call_return_code() {
 			0,
 			GAS_LIMIT,
 			vec![2],
-		).0.unwrap();
+		).exec_result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::CalleeTrapped);
 
 	});
@@ -1825,7 +1825,7 @@ fn instantiate_return_code() {
 			0,
 			GAS_LIMIT,
 			vec![0; 33],
-		).0.unwrap();
+		).exec_result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::BelowSubsistenceThreshold);
 
 		// Contract has enough total balance in order to not go below the subsistence
@@ -1839,7 +1839,7 @@ fn instantiate_return_code() {
 			0,
 			GAS_LIMIT,
 			vec![0; 33],
-		).0.unwrap();
+		).exec_result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::TransferFailed);
 
 		// Contract has enough balance but the passed code hash is invalid
@@ -1850,7 +1850,7 @@ fn instantiate_return_code() {
 			0,
 			GAS_LIMIT,
 			vec![0; 33],
-		).0.unwrap();
+		).exec_result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::CodeNotFound);
 
 		// Contract has enough balance but callee reverts because "1" is passed.
@@ -1860,7 +1860,7 @@ fn instantiate_return_code() {
 			0,
 			GAS_LIMIT,
 			callee_hash.iter().cloned().chain(sp_std::iter::once(1)).collect(),
-		).0.unwrap();
+		).exec_result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::CalleeReverted);
 
 		// Contract has enough balance but callee traps because "2" is passed.
@@ -1870,7 +1870,7 @@ fn instantiate_return_code() {
 			0,
 			GAS_LIMIT,
 			callee_hash.iter().cloned().chain(sp_std::iter::once(2)).collect(),
-		).0.unwrap();
+		).exec_result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::CalleeTrapped);
 
 	});
diff --git a/frame/contracts/src/wasm/mod.rs b/frame/contracts/src/wasm/mod.rs
index 100148b18dcd..2440abed8ec4 100644
--- a/frame/contracts/src/wasm/mod.rs
+++ b/frame/contracts/src/wasm/mod.rs
@@ -19,7 +19,7 @@
 
 use crate::{CodeHash, Schedule, Trait};
 use crate::wasm::env_def::FunctionImplProvider;
-use crate::exec::{Ext, ExecResult};
+use crate::exec::Ext;
 use crate::gas::GasMeter;
 
 use sp_std::prelude::*;
@@ -34,6 +34,7 @@ mod runtime;
 
 use self::runtime::{to_execution_result, Runtime};
 use self::code_cache::load as load_code;
+use pallet_contracts_primitives::ExecResult;
 
 pub use self::code_cache::save as save_code;
 #[cfg(feature = "runtime-benchmarks")]
@@ -155,7 +156,7 @@ mod tests {
 	use super::*;
 	use std::collections::HashMap;
 	use sp_core::H256;
-	use crate::exec::{Ext, StorageKey, ExecReturnValue, ReturnFlags, ExecError, ErrorOrigin};
+	use crate::exec::{Ext, StorageKey};
 	use crate::gas::{Gas, GasMeter};
 	use crate::tests::{Test, Call};
 	use crate::wasm::prepare::prepare_contract;
@@ -163,6 +164,7 @@ mod tests {
 	use hex_literal::hex;
 	use sp_runtime::DispatchError;
 	use frame_support::weights::Weight;
+	use pallet_contracts_primitives::{ExecReturnValue, ReturnFlags, ExecError, ErrorOrigin};
 
 	const GAS_LIMIT: Gas = 10_000_000_000;
 
@@ -1361,7 +1363,7 @@ mod tests {
 
 	;; size of our buffer is 128 bytes
 	(data (i32.const 160) "\80")
-	
+
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index 7d8ce26678c0..ffc816aa4c82 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -16,12 +16,12 @@
 
 //! Environment definition of the wasm smart-contract runtime.
 
-use crate::{HostFnWeights, Schedule, Trait, CodeHash, BalanceOf, Error};
-use crate::exec::{
-	Ext, ExecResult, ExecReturnValue, StorageKey, TopicOf, ReturnFlags, ExecError
+use crate::{
+	HostFnWeights, Schedule, Trait, CodeHash, BalanceOf, Error,
+	exec::{Ext, StorageKey, TopicOf},
+	gas::{Gas, GasMeter, Token, GasMeterResult},
+	wasm::env_def::ConvertibleToWasm,
 };
-use crate::gas::{Gas, GasMeter, Token, GasMeterResult};
-use crate::wasm::env_def::ConvertibleToWasm;
 use sp_sandbox;
 use parity_wasm::elements::ValueType;
 use frame_system;
@@ -35,6 +35,7 @@ use sp_io::hashing::{
 	blake2_128,
 	sha2_256,
 };
+use pallet_contracts_primitives::{ExecResult, ExecReturnValue, ReturnFlags, ExecError};
 
 /// Every error that can be returned to a contract when it calls any of the host functions.
 #[repr(u32)]
@@ -499,7 +500,7 @@ fn err_into_return_code<T: Trait>(from: DispatchError) -> Result<ReturnCode, Dis
 
 /// Fallible conversion of a `ExecResult` to `ReturnCode`.
 fn exec_into_return_code<T: Trait>(from: ExecResult) -> Result<ReturnCode, DispatchError> {
-	use crate::exec::ErrorOrigin::Callee;
+	use pallet_contracts_primitives::ErrorOrigin::Callee;
 
 	let ExecError { error, origin } = match from {
 		Ok(retval) => return Ok(retval.into()),

From d5464dd654cade80dc00cc723e2dcbb6d56d86d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Thu, 29 Oct 2020 20:20:08 +0100
Subject: [PATCH 0036/1194] Make sure pallet versions are set at genesis
 (#7451)

* Make sure pallet versions are set at genesis

This pr ensures that pallet versions are also set at genesis. It does
this by hooking into the runtime `GenesisConfig` which means that it
will only work when the storage is setup using this genesis config. So,
the version will not be set in pallet local tests. However, I think this
isn't such a problem. The genesis config will call `on_genesis` on all
pallets. This function comes from the new trait `OnGenesis`. Currently
the user is not able to provide any custom implementation of this trait.

Besides that it also implements `Clone` and `Copy` for the pallet
version struct.

This pr also moves the macro for generating the runtime genesis config
to `frame-support` as most of the other FRAME related macros.

* Reduce line width

* Update frame/support/src/traits.rs

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>
---
 .../procedural/src/construct_runtime/mod.rs   |   8 +-
 frame/support/src/dispatch.rs                 |  24 +--
 frame/support/src/genesis_config.rs           | 141 ++++++++++++++++++
 frame/support/src/lib.rs                      |   2 +
 frame/support/src/traits.rs                   |  43 +++++-
 frame/support/test/tests/pallet_version.rs    |  19 ++-
 primitives/runtime/src/lib.rs                 | 110 --------------
 7 files changed, 218 insertions(+), 129 deletions(-)
 create mode 100644 frame/support/src/genesis_config.rs

diff --git a/frame/support/procedural/src/construct_runtime/mod.rs b/frame/support/procedural/src/construct_runtime/mod.rs
index f355593defbe..15f0935f3823 100644
--- a/frame/support/procedural/src/construct_runtime/mod.rs
+++ b/frame/support/procedural/src/construct_runtime/mod.rs
@@ -280,8 +280,8 @@ fn decl_outer_config<'a>(
 			)
 		});
 	quote!(
-		#scrate::sp_runtime::impl_outer_config! {
-			pub struct GenesisConfig for #runtime {
+		#scrate::impl_outer_config! {
+			pub struct GenesisConfig for #runtime where AllModulesWithSystem = AllModulesWithSystem {
 				#(#modules_tokens)*
 			}
 		}
@@ -462,9 +462,13 @@ fn decl_all_modules<'a>(
 		.filter(|n| **n != SYSTEM_MODULE_NAME)
 		.fold(TokenStream2::default(), |combined, name| quote!((#name, #combined)));
 
+	let all_modules_with_system = names.iter()
+		.fold(TokenStream2::default(), |combined, name| quote!((#name, #combined)));
+
 	quote!(
 		#types
 		type AllModules = ( #all_modules );
+		type AllModulesWithSystem = ( #all_modules_with_system );
 	)
 }
 
diff --git a/frame/support/src/dispatch.rs b/frame/support/src/dispatch.rs
index b96d6194ebff..d55faa28d115 100644
--- a/frame/support/src/dispatch.rs
+++ b/frame/support/src/dispatch.rs
@@ -1325,11 +1325,8 @@ macro_rules! decl_module {
 				$crate::sp_tracing::enter_span!($crate::sp_tracing::trace_span!("on_runtime_upgrade"));
 				let result: $return = (|| { $( $impl )* })();
 
-				let key = $crate::traits::PalletVersion::storage_key::<
-						<$trait_instance as $system::Trait>::PalletInfo, Self
-					>().expect("Every active pallet has a name in the runtime; qed");
-				let version = $crate::crate_to_pallet_version!();
-				$crate::storage::unhashed::put(&key, &version);
+				$crate::crate_to_pallet_version!()
+					.put_into_storage::<<$trait_instance as $system::Trait>::PalletInfo, Self>();
 
 				let additional_write = <
 					<$trait_instance as $system::Trait>::DbWeight as $crate::traits::Get<_>
@@ -1352,11 +1349,8 @@ macro_rules! decl_module {
 			fn on_runtime_upgrade() -> $crate::dispatch::Weight {
 				$crate::sp_tracing::enter_span!($crate::sp_tracing::trace_span!("on_runtime_upgrade"));
 
-				let key = $crate::traits::PalletVersion::storage_key::<
-						<$trait_instance as $system::Trait>::PalletInfo, Self
-					>().expect("Every active pallet has a name in the runtime; qed");
-				let version = $crate::crate_to_pallet_version!();
-				$crate::storage::unhashed::put(&key, &version);
+				$crate::crate_to_pallet_version!()
+					.put_into_storage::<<$trait_instance as $system::Trait>::PalletInfo, Self>();
 
 				<
 					<$trait_instance as $system::Trait>::DbWeight as $crate::traits::Get<_>
@@ -1837,6 +1831,16 @@ macro_rules! decl_module {
 			}
 		}
 
+		// Implement `OnGenesis` for `Module`
+		impl<$trait_instance: $trait_name $(<I>, $instance: $instantiable)?> $crate::traits::OnGenesis
+			for $mod_type<$trait_instance $(, $instance)?> where $( $other_where_bounds )*
+		{
+			fn on_genesis() {
+				$crate::crate_to_pallet_version!()
+					.put_into_storage::<<$trait_instance as $system::Trait>::PalletInfo, Self>();
+			}
+		}
+
 		// manual implementation of clone/eq/partialeq because using derive erroneously requires
 		// clone/eq/partialeq from T.
 		impl<$trait_instance: $trait_name $(<I>, $instance: $instantiable)?> $crate::dispatch::Clone
diff --git a/frame/support/src/genesis_config.rs b/frame/support/src/genesis_config.rs
new file mode 100644
index 000000000000..99f8ad886dd2
--- /dev/null
+++ b/frame/support/src/genesis_config.rs
@@ -0,0 +1,141 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Macros for generating the runtime genesis config.
+
+/// Helper macro for `impl_outer_config`
+#[macro_export]
+macro_rules! __impl_outer_config_types {
+	// Generic + Instance
+	(
+		$concrete:ident $config:ident $snake:ident { $instance:ident } < $ignore:ident >;
+		$( $rest:tt )*
+	) => {
+		#[cfg(any(feature = "std", test))]
+		pub type $config = $snake::GenesisConfig<$concrete, $snake::$instance>;
+		$crate::__impl_outer_config_types! { $concrete $( $rest )* }
+	};
+	// Generic
+	(
+		$concrete:ident $config:ident $snake:ident < $ignore:ident >;
+		$( $rest:tt )*
+	) => {
+		#[cfg(any(feature = "std", test))]
+		pub type $config = $snake::GenesisConfig<$concrete>;
+		$crate::__impl_outer_config_types! { $concrete $( $rest )* }
+	};
+	// No Generic and maybe Instance
+	(
+		$concrete:ident $config:ident $snake:ident $( { $instance:ident } )?;
+		$( $rest:tt )*
+	) => {
+		#[cfg(any(feature = "std", test))]
+		pub type $config = $snake::GenesisConfig;
+		$crate::__impl_outer_config_types! { $concrete $( $rest )* }
+	};
+	($concrete:ident) => ()
+}
+
+/// Implement the runtime genesis configuration.
+///
+/// This combines all pallet genesis configurations into one runtime
+/// specific genesis configuration.
+///
+/// ```ignore
+/// pub struct GenesisConfig for Runtime where AllModulesWithSystem = AllModulesWithSystem {
+/// 	rust_module_one: Option<ModuleOneConfig>,
+/// 	...
+/// }
+/// ```
+#[macro_export]
+macro_rules! impl_outer_config {
+	(
+		pub struct $main:ident for $concrete:ident where
+			AllModulesWithSystem = $all_modules_with_system:ident
+		{
+			$( $config:ident =>
+				$snake:ident $( $instance:ident )? $( <$generic:ident> )*, )*
+		}
+	) => {
+		$crate::__impl_outer_config_types! {
+			$concrete $( $config $snake $( { $instance } )? $( <$generic> )*; )*
+		}
+
+		$crate::paste::item! {
+			#[cfg(any(feature = "std", test))]
+			#[derive($crate::serde::Serialize, $crate::serde::Deserialize, Default)]
+			#[serde(rename_all = "camelCase")]
+			#[serde(deny_unknown_fields)]
+			pub struct $main {
+				$(
+					pub [< $snake $(_ $instance )? >]: Option<$config>,
+				)*
+			}
+			#[cfg(any(feature = "std", test))]
+			impl $crate::sp_runtime::BuildStorage for $main {
+				fn assimilate_storage(
+					&self,
+					storage: &mut $crate::sp_runtime::Storage,
+				) -> std::result::Result<(), String> {
+					$(
+						if let Some(ref extra) = self.[< $snake $(_ $instance )? >] {
+							$crate::impl_outer_config! {
+								@CALL_FN
+								$concrete;
+								$snake;
+								$( $instance )?;
+								extra;
+								storage;
+							}
+						}
+					)*
+
+					$crate::BasicExternalities::execute_with_storage(storage, || {
+						<$all_modules_with_system as $crate::traits::OnGenesis>::on_genesis();
+					});
+
+					Ok(())
+				}
+			}
+		}
+	};
+	(@CALL_FN
+		$runtime:ident;
+		$module:ident;
+		$instance:ident;
+		$extra:ident;
+		$storage:ident;
+	) => {
+		$crate::sp_runtime::BuildModuleGenesisStorage::<$runtime, $module::$instance>::build_module_genesis_storage(
+			$extra,
+			$storage,
+		)?;
+	};
+	(@CALL_FN
+		$runtime:ident;
+		$module:ident;
+		;
+		$extra:ident;
+		$storage:ident;
+	) => {
+		$crate::sp_runtime::BuildModuleGenesisStorage::
+			<$runtime, $module::__InherentHiddenInstance>::build_module_genesis_storage(
+				$extra,
+				$storage,
+			)?;
+	}
+}
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 99cfcb66b393..a132b787fd9b 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -58,6 +58,8 @@ pub mod event;
 #[macro_use]
 pub mod metadata;
 #[macro_use]
+pub mod genesis_config;
+#[macro_use]
 pub mod inherent;
 #[macro_use]
 pub mod unsigned;
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index 96d7244efe8d..1fadb079e5a5 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -1421,16 +1421,19 @@ pub trait GetCallMetadata {
 	fn get_call_metadata(&self) -> CallMetadata;
 }
 
-/// The block finalization trait. Implementing this lets you express what should happen
-/// for your module when the block is ending.
+/// The block finalization trait.
+///
+/// Implementing this lets you express what should happen for your pallet when the block is ending.
 #[impl_for_tuples(30)]
 pub trait OnFinalize<BlockNumber> {
 	/// The block is being finalized. Implement to have something happen.
 	fn on_finalize(_n: BlockNumber) {}
 }
 
-/// The block initialization trait. Implementing this lets you express what should happen
-/// for your module when the block is beginning (right before the first extrinsic is executed).
+/// The block initialization trait.
+///
+/// Implementing this lets you express what should happen for your pallet when the block is
+/// beginning (right before the first extrinsic is executed).
 pub trait OnInitialize<BlockNumber> {
 	/// The block is being initialized. Implement to have something happen.
 	///
@@ -1447,6 +1450,17 @@ impl<BlockNumber: Clone> OnInitialize<BlockNumber> for Tuple {
 	}
 }
 
+/// A trait that will be called at genesis.
+///
+/// Implementing this trait for a pallet let's you express operations that should
+/// happen at genesis. It will be called in an externalities provided environment and
+/// will see the genesis state after all pallets have written their genesis state.
+#[impl_for_tuples(30)]
+pub trait OnGenesis {
+	/// Something that should happen at genesis.
+	fn on_genesis() {}
+}
+
 /// The runtime upgrade trait.
 ///
 /// Implementing this lets you express what should happen when the runtime upgrades,
@@ -1834,7 +1848,7 @@ pub const PALLET_VERSION_STORAGE_KEY_POSTFIX: &[u8] = b":__PALLET_VERSION__:";
 ///
 /// Each pallet version is stored in the state under a fixed key. See
 /// [`PALLET_VERSION_STORAGE_KEY_POSTFIX`] for how this key is built.
-#[derive(RuntimeDebug, Eq, PartialEq, Encode, Decode, Ord)]
+#[derive(RuntimeDebug, Eq, PartialEq, Encode, Decode, Ord, Clone, Copy)]
 pub struct PalletVersion {
 	/// The major version of the pallet.
 	pub major: u16,
@@ -1872,6 +1886,25 @@ impl PalletVersion {
 
 		Some(final_key)
 	}
+
+	/// Put this pallet version into the storage.
+	///
+	/// It will use the storage key that is associated with the given `Pallet`.
+	///
+	/// # Panics
+	///
+	/// This function will panic iff `Pallet` can not be found by `PalletInfo`.
+	/// In a runtime that is put together using
+	/// [`construct_runtime!`](crate::construct_runtime) this should never happen.
+	///
+	/// It will also panic if this function isn't executed in an externalities
+	/// provided environment.
+	pub fn put_into_storage<PI: PalletInfo, Pallet: 'static>(&self) {
+		let key = Self::storage_key::<PI, Pallet>()
+			.expect("Every active pallet has a name in the runtime; qed");
+
+		crate::storage::unhashed::put(&key, self);
+	}
 }
 
 impl sp_std::cmp::PartialOrd for PalletVersion {
diff --git a/frame/support/test/tests/pallet_version.rs b/frame/support/test/tests/pallet_version.rs
index f3f4029b0da5..d6293ac6a308 100644
--- a/frame/support/test/tests/pallet_version.rs
+++ b/frame/support/test/tests/pallet_version.rs
@@ -20,9 +20,9 @@
 #![recursion_limit="128"]
 
 use codec::{Decode, Encode};
-use sp_runtime::{generic, traits::{BlakeTwo256, Block as _, Verify}};
+use sp_runtime::{generic, traits::{BlakeTwo256, Block as _, Verify}, BuildStorage};
 use frame_support::{
-	traits::{PALLET_VERSION_STORAGE_KEY_POSTFIX, PalletVersion, OnRuntimeUpgrade},
+	traits::{PALLET_VERSION_STORAGE_KEY_POSTFIX, PalletVersion, OnRuntimeUpgrade, GetPalletVersion},
 	crate_to_pallet_version, weights::Weight,
 };
 use sp_core::{H256, sr25519};
@@ -173,3 +173,18 @@ fn on_runtime_upgrade_overwrites_old_version() {
 		check_pallet_version("Module2_2");
 	});
 }
+
+#[test]
+fn genesis_init_puts_pallet_version_into_storage() {
+	let storage = GenesisConfig::default().build_storage().expect("Builds genesis storage");
+
+	sp_io::TestExternalities::new(storage).execute_with(|| {
+		check_pallet_version("Module1");
+		check_pallet_version("Module2");
+		check_pallet_version("Module2_1");
+		check_pallet_version("Module2_2");
+
+		let system_version = System::storage_version().expect("System version should be set");
+		assert_eq!(System::current_version(), system_version);
+	});
+}
diff --git a/primitives/runtime/src/lib.rs b/primitives/runtime/src/lib.rs
index 47081e9115c3..eb20418203a9 100644
--- a/primitives/runtime/src/lib.rs
+++ b/primitives/runtime/src/lib.rs
@@ -571,116 +571,6 @@ pub fn verify_encoded_lazy<V: Verify, T: codec::Encode>(
 	)
 }
 
-/// Helper macro for `impl_outer_config`
-#[macro_export]
-macro_rules! __impl_outer_config_types {
-	// Generic + Instance
-	(
-		$concrete:ident $config:ident $snake:ident { $instance:ident } < $ignore:ident >;
-		$( $rest:tt )*
-	) => {
-		#[cfg(any(feature = "std", test))]
-		pub type $config = $snake::GenesisConfig<$concrete, $snake::$instance>;
-		$crate::__impl_outer_config_types! { $concrete $( $rest )* }
-	};
-	// Generic
-	(
-		$concrete:ident $config:ident $snake:ident < $ignore:ident >;
-		$( $rest:tt )*
-	) => {
-		#[cfg(any(feature = "std", test))]
-		pub type $config = $snake::GenesisConfig<$concrete>;
-		$crate::__impl_outer_config_types! { $concrete $( $rest )* }
-	};
-	// No Generic and maybe Instance
-	(
-		$concrete:ident $config:ident $snake:ident $( { $instance:ident } )?;
-		$( $rest:tt )*
-	) => {
-		#[cfg(any(feature = "std", test))]
-		pub type $config = $snake::GenesisConfig;
-		$crate::__impl_outer_config_types! { $concrete $( $rest )* }
-	};
-	($concrete:ident) => ()
-}
-
-/// Implement the output "meta" module configuration struct,
-/// which is basically:
-/// pub struct GenesisConfig {
-/// 	rust_module_one: Option<ModuleOneConfig>,
-/// 	...
-/// }
-#[macro_export]
-macro_rules! impl_outer_config {
-	(
-		pub struct $main:ident for $concrete:ident {
-			$( $config:ident =>
-				$snake:ident $( $instance:ident )? $( <$generic:ident> )*, )*
-		}
-	) => {
-		$crate::__impl_outer_config_types! {
-			$concrete $( $config $snake $( { $instance } )? $( <$generic> )*; )*
-		}
-
-		$crate::paste::item! {
-			#[cfg(any(feature = "std", test))]
-			#[derive($crate::serde::Serialize, $crate::serde::Deserialize)]
-			#[serde(rename_all = "camelCase")]
-			#[serde(deny_unknown_fields)]
-			pub struct $main {
-				$(
-					pub [< $snake $(_ $instance )? >]: Option<$config>,
-				)*
-			}
-			#[cfg(any(feature = "std", test))]
-			impl $crate::BuildStorage for $main {
-				fn assimilate_storage(
-					&self,
-					storage: &mut $crate::Storage,
-				) -> std::result::Result<(), String> {
-					$(
-						if let Some(ref extra) = self.[< $snake $(_ $instance )? >] {
-							$crate::impl_outer_config! {
-								@CALL_FN
-								$concrete;
-								$snake;
-								$( $instance )?;
-								extra;
-								storage;
-							}
-						}
-					)*
-					Ok(())
-				}
-			}
-		}
-	};
-	(@CALL_FN
-		$runtime:ident;
-		$module:ident;
-		$instance:ident;
-		$extra:ident;
-		$storage:ident;
-	) => {
-		$crate::BuildModuleGenesisStorage::<$runtime, $module::$instance>::build_module_genesis_storage(
-			$extra,
-			$storage,
-		)?;
-	};
-	(@CALL_FN
-		$runtime:ident;
-		$module:ident;
-		;
-		$extra:ident;
-		$storage:ident;
-	) => {
-		$crate::BuildModuleGenesisStorage::<$runtime, $module::__InherentHiddenInstance>::build_module_genesis_storage(
-			$extra,
-			$storage,
-		)?;
-	}
-}
-
 /// Checks that `$x` is equal to `$y` with an error rate of `$error`.
 ///
 /// # Example

From 5d307871e98319874a8898e4138d6d42fe214719 Mon Sep 17 00:00:00 2001
From: Albrecht <14820950+weichweich@users.noreply.github.com>
Date: Fri, 30 Oct 2020 13:27:04 +0100
Subject: [PATCH 0037/1194] decouple transaction payment and currency (#6912)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* wip: setup types

* fix types

* make tx payment pallet independent from balances

* fix dependent tests

* comments

* restructure a bit and  include more info

* clean up ugly phantom

* reduce complexity

* minor doc improvements

* use shorthand

* doc

* fix line lenght and style

* readd BalanceOf

* some clarifications and readability improvements

* move balance type to OnChargeTransaction

* remove noise

* fix style

* Apply suggestions from code review

improved documentation

Co-authored-by: Alexander Theißen <alex.theissen@me.com>

* Improve naming and documentation

Apply suggestions from code review

Co-authored-by: Alexander Theißen <alex.theissen@me.com>

* Apply suggestions from code review

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* always call withdraw_fee

* move NegativeImbalanceOf to payment module

* fix unused import

Co-authored-by: Alexander Theißen <alex.theissen@me.com>
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
---
 bin/node-template/runtime/src/lib.rs     |   4 +-
 bin/node/runtime/src/lib.rs              |   5 +-
 frame/balances/src/tests_composite.rs    |   4 +-
 frame/balances/src/tests_local.rs        |   4 +-
 frame/executive/src/lib.rs               |   4 +-
 frame/transaction-payment/src/lib.rs     | 115 +++++++++-----------
 frame/transaction-payment/src/payment.rs | 127 +++++++++++++++++++++++
 7 files changed, 185 insertions(+), 78 deletions(-)
 create mode 100644 frame/transaction-payment/src/payment.rs

diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index e414631d97e3..5028301978cd 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -37,6 +37,7 @@ pub use frame_support::{
 		constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
 	},
 };
+use pallet_transaction_payment::CurrencyAdapter;
 
 /// Import the template pallet.
 pub use template;
@@ -249,8 +250,7 @@ parameter_types! {
 }
 
 impl pallet_transaction_payment::Trait for Runtime {
-	type Currency = Balances;
-	type OnTransactionPayment = ();
+	type OnChargeTransaction = CurrencyAdapter<Balances, ()>;
 	type TransactionByteFee = TransactionByteFee;
 	type WeightToFee = IdentityFee<Balance>;
 	type FeeMultiplierUpdate = ();
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index ef95daec716c..dddef0b46a88 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -64,7 +64,7 @@ use pallet_grandpa::fg_primitives;
 use pallet_im_online::sr25519::AuthorityId as ImOnlineId;
 use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId;
 use pallet_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo;
-pub use pallet_transaction_payment::{Multiplier, TargetedFeeAdjustment};
+pub use pallet_transaction_payment::{Multiplier, TargetedFeeAdjustment, CurrencyAdapter};
 use pallet_session::{historical as pallet_session_historical};
 use sp_inherents::{InherentData, CheckInherentsResult};
 use static_assertions::const_assert;
@@ -360,8 +360,7 @@ parameter_types! {
 }
 
 impl pallet_transaction_payment::Trait for Runtime {
-	type Currency = Balances;
-	type OnTransactionPayment = DealWithFees;
+	type OnChargeTransaction = CurrencyAdapter<Balances, DealWithFees>;
 	type TransactionByteFee = TransactionByteFee;
 	type WeightToFee = IdentityFee<Balance>;
 	type FeeMultiplierUpdate =
diff --git a/frame/balances/src/tests_composite.rs b/frame/balances/src/tests_composite.rs
index 0ee488d09729..88b73b47273e 100644
--- a/frame/balances/src/tests_composite.rs
+++ b/frame/balances/src/tests_composite.rs
@@ -29,6 +29,7 @@ use sp_io;
 use frame_support::{impl_outer_origin, impl_outer_event, parameter_types};
 use frame_support::traits::Get;
 use frame_support::weights::{Weight, DispatchInfo, IdentityFee};
+use pallet_transaction_payment::CurrencyAdapter;
 use std::cell::RefCell;
 use crate::{GenesisConfig, Module, Trait, decl_tests, tests::CallWithDispatchInfo};
 
@@ -97,8 +98,7 @@ parameter_types! {
 	pub const TransactionByteFee: u64 = 1;
 }
 impl pallet_transaction_payment::Trait for Test {
-	type Currency = Module<Test>;
-	type OnTransactionPayment = ();
+	type OnChargeTransaction = CurrencyAdapter<Module<Test>, ()>;
 	type TransactionByteFee = TransactionByteFee;
 	type WeightToFee = IdentityFee<u64>;
 	type FeeMultiplierUpdate = ();
diff --git a/frame/balances/src/tests_local.rs b/frame/balances/src/tests_local.rs
index 4efcdad8ca33..319fb3640b4c 100644
--- a/frame/balances/src/tests_local.rs
+++ b/frame/balances/src/tests_local.rs
@@ -31,6 +31,7 @@ use frame_support::traits::{Get, StorageMapShim};
 use frame_support::weights::{Weight, DispatchInfo, IdentityFee};
 use std::cell::RefCell;
 use crate::{GenesisConfig, Module, Trait, decl_tests, tests::CallWithDispatchInfo};
+use pallet_transaction_payment::CurrencyAdapter;
 
 use frame_system as system;
 impl_outer_origin!{
@@ -97,8 +98,7 @@ parameter_types! {
 	pub const TransactionByteFee: u64 = 1;
 }
 impl pallet_transaction_payment::Trait for Test {
-	type Currency = Module<Test>;
-	type OnTransactionPayment = ();
+	type OnChargeTransaction = CurrencyAdapter<Module<Test>, ()>;
 	type TransactionByteFee = TransactionByteFee;
 	type WeightToFee = IdentityFee<u64>;
 	type FeeMultiplierUpdate = ();
diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index 9738c09178a7..96e7a6c04094 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -491,6 +491,7 @@ mod tests {
 		traits::{Currency, LockIdentifier, LockableCurrency, WithdrawReasons},
 	};
 	use frame_system::{Call as SystemCall, ChainContext, LastRuntimeUpgradeInfo};
+	use pallet_transaction_payment::CurrencyAdapter;
 	use pallet_balances::Call as BalancesCall;
 	use hex_literal::hex;
 	const TEST_KEY: &[u8] = &*b":test:key:";
@@ -632,8 +633,7 @@ mod tests {
 		pub const TransactionByteFee: Balance = 0;
 	}
 	impl pallet_transaction_payment::Trait for Runtime {
-		type Currency = Balances;
-		type OnTransactionPayment = ();
+		type OnChargeTransaction = CurrencyAdapter<Balances, ()>;
 		type TransactionByteFee = TransactionByteFee;
 		type WeightToFee = IdentityFee<Balance>;
 		type FeeMultiplierUpdate = ();
diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
index 48e5ca08dfbc..dd310c263984 100644
--- a/frame/transaction-payment/src/lib.rs
+++ b/frame/transaction-payment/src/lib.rs
@@ -29,6 +29,7 @@
 //!   - A means of updating the fee for the next block, via defining a multiplier, based on the
 //!     final state of the chain at the end of the previous block. This can be configured via
 //!     [`Trait::FeeMultiplierUpdate`]
+//!   - How the fees are paid via [`Trait::OnChargeTransaction`].
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
@@ -36,7 +37,7 @@ use sp_std::prelude::*;
 use codec::{Encode, Decode};
 use frame_support::{
 	decl_storage, decl_module,
-	traits::{Currency, Get, OnUnbalanced, ExistenceRequirement, WithdrawReasons, Imbalance},
+	traits::Get,
 	weights::{
 		Weight, DispatchInfo, PostDispatchInfo, GetDispatchInfo, Pays, WeightToFeePolynomial,
 		WeightToFeeCoefficient,
@@ -46,23 +47,23 @@ use frame_support::{
 use sp_runtime::{
 	FixedU128, FixedPointNumber, FixedPointOperand, Perquintill, RuntimeDebug,
 	transaction_validity::{
-		TransactionPriority, ValidTransaction, InvalidTransaction, TransactionValidityError,
-		TransactionValidity,
+		TransactionPriority, ValidTransaction, TransactionValidityError, TransactionValidity,
 	},
 	traits::{
-		Zero, Saturating, SignedExtension, SaturatedConversion, Convert, Dispatchable,
+		Saturating, SignedExtension, SaturatedConversion, Convert, Dispatchable,
 		DispatchInfoOf, PostDispatchInfoOf,
 	},
 };
 use pallet_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo;
 
+mod payment;
+pub use payment::*;
+
 /// Fee multiplier.
 pub type Multiplier = FixedU128;
 
 type BalanceOf<T> =
-	<<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
-type NegativeImbalanceOf<T> =
-	<<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::NegativeImbalance;
+	<<T as Trait>::OnChargeTransaction as OnChargeTransaction<T>>::Balance;
 
 /// A struct to update the weight multiplier per block. It implements `Convert<Multiplier,
 /// Multiplier>`, meaning that it can convert the previous multiplier to the next one. This should
@@ -213,13 +214,13 @@ impl Default for Releases {
 }
 
 pub trait Trait: frame_system::Trait {
-	/// The currency type in which fees will be paid.
-	type Currency: Currency<Self::AccountId> + Send + Sync;
-
-	/// Handler for the unbalanced reduction when taking transaction fees. This is either one or
-	/// two separate imbalances, the first is the transaction fee paid, the second is the tip paid,
-	/// if any.
-	type OnTransactionPayment: OnUnbalanced<NegativeImbalanceOf<Self>>;
+	/// Handler for withdrawing, refunding and depositing the transaction fee.
+	/// Transaction fees are withdrawn before the transaction is executed.
+	/// After the transaction was executed the transaction weight can be
+	/// adjusted, depending on the used resources by the transaction. If the
+	/// transaction weight is lower than expected, parts of the transaction fee
+	/// might be refunded. In the end the fees can be deposited.
+	type OnChargeTransaction: OnChargeTransaction<Self>;
 
 	/// The fee to be paid for making a transaction; the per-byte portion.
 	type TransactionByteFee: Get<BalanceOf<Self>>;
@@ -442,30 +443,21 @@ impl<T: Trait + Send + Sync> ChargeTransactionPayment<T> where
 	fn withdraw_fee(
 		&self,
 		who: &T::AccountId,
+		call: &T::Call,
 		info: &DispatchInfoOf<T::Call>,
 		len: usize,
-	) -> Result<(BalanceOf<T>, Option<NegativeImbalanceOf<T>>), TransactionValidityError> {
+	) -> Result<
+		(
+			BalanceOf<T>,
+			<<T as Trait>::OnChargeTransaction as OnChargeTransaction<T>>::LiquidityInfo,
+		),
+		TransactionValidityError,
+	> {
 		let tip = self.0;
 		let fee = Module::<T>::compute_fee(len as u32, info, tip);
 
-		// Only mess with balances if fee is not zero.
-		if fee.is_zero() {
-			return Ok((fee, None));
-		}
-
-		match T::Currency::withdraw(
-			who,
-			fee,
-			if tip.is_zero() {
-				WithdrawReasons::TRANSACTION_PAYMENT
-			} else {
-				WithdrawReasons::TRANSACTION_PAYMENT | WithdrawReasons::TIP
-			},
-			ExistenceRequirement::KeepAlive,
-		) {
-			Ok(imbalance) => Ok((fee, Some(imbalance))),
-			Err(_) => Err(InvalidTransaction::Payment.into()),
-		}
+		<<T as Trait>::OnChargeTransaction as OnChargeTransaction<T>>::withdraw_fee(who, call, info, fee, tip)
+			.map(|i| (fee, i))
 	}
 
 	/// Get an appropriate priority for a transaction with the given length and info.
@@ -505,17 +497,24 @@ impl<T: Trait + Send + Sync> SignedExtension for ChargeTransactionPayment<T> whe
 	type AccountId = T::AccountId;
 	type Call = T::Call;
 	type AdditionalSigned = ();
-	type Pre = (BalanceOf<T>, Self::AccountId, Option<NegativeImbalanceOf<T>>, BalanceOf<T>);
+	type Pre = (
+		// tip
+		BalanceOf<T>,
+		// who paid the fee
+		Self::AccountId,
+		// imbalance resulting from withdrawing the fee
+		<<T as Trait>::OnChargeTransaction as OnChargeTransaction<T>>::LiquidityInfo,
+	);
 	fn additional_signed(&self) -> sp_std::result::Result<(), TransactionValidityError> { Ok(()) }
 
 	fn validate(
 		&self,
 		who: &Self::AccountId,
-		_call: &Self::Call,
+		call: &Self::Call,
 		info: &DispatchInfoOf<Self::Call>,
 		len: usize,
 	) -> TransactionValidity {
-		let (fee, _) = self.withdraw_fee(who, info, len)?;
+		let (fee, _) = self.withdraw_fee(who, call, info, len)?;
 		Ok(ValidTransaction {
 			priority: Self::get_priority(len, info, fee),
 			..Default::default()
@@ -525,12 +524,12 @@ impl<T: Trait + Send + Sync> SignedExtension for ChargeTransactionPayment<T> whe
 	fn pre_dispatch(
 		self,
 		who: &Self::AccountId,
-		_call: &Self::Call,
+		call: &Self::Call,
 		info: &DispatchInfoOf<Self::Call>,
 		len: usize
 	) -> Result<Self::Pre, TransactionValidityError> {
-		let (fee, imbalance) = self.withdraw_fee(who, info, len)?;
-		Ok((self.0, who.clone(), imbalance, fee))
+		let (_fee, imbalance) = self.withdraw_fee(who, call, info, len)?;
+		Ok((self.0, who.clone(), imbalance))
 	}
 
 	fn post_dispatch(
@@ -540,32 +539,14 @@ impl<T: Trait + Send + Sync> SignedExtension for ChargeTransactionPayment<T> whe
 		len: usize,
 		_result: &DispatchResult,
 	) -> Result<(), TransactionValidityError> {
-		let (tip, who, imbalance, fee) = pre;
-		if let Some(payed) = imbalance {
-			let actual_fee = Module::<T>::compute_actual_fee(
-				len as u32,
-				info,
-				post_info,
-				tip,
-			);
-			let refund = fee.saturating_sub(actual_fee);
-			let actual_payment = match T::Currency::deposit_into_existing(&who, refund) {
-				Ok(refund_imbalance) => {
-					// The refund cannot be larger than the up front payed max weight.
-					// `PostDispatchInfo::calc_unspent` guards against such a case.
-					match payed.offset(refund_imbalance) {
-						Ok(actual_payment) => actual_payment,
-						Err(_) => return Err(InvalidTransaction::Payment.into()),
-					}
-				}
-				// We do not recreate the account using the refund. The up front payment
-				// is gone in that case.
-				Err(_) => payed,
-			};
-			let imbalances = actual_payment.split(tip);
-			T::OnTransactionPayment::on_unbalanceds(Some(imbalances.0).into_iter()
-				.chain(Some(imbalances.1)));
-		}
+		let (tip, who, imbalance) = pre;
+		let actual_fee = Module::<T>::compute_actual_fee(
+			len as u32,
+			info,
+			post_info,
+			tip,
+		);
+		T::OnChargeTransaction::correct_and_deposit_fee(&who, info, post_info, actual_fee, tip, imbalance)?;
 		Ok(())
 	}
 }
@@ -580,6 +561,7 @@ mod tests {
 			DispatchClass, DispatchInfo, PostDispatchInfo, GetDispatchInfo, Weight,
 			WeightToFeePolynomial, WeightToFeeCoefficients, WeightToFeeCoefficient,
 		},
+		traits::Currency,
 	};
 	use pallet_balances::Call as BalancesCall;
 	use pallet_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo;
@@ -699,8 +681,7 @@ mod tests {
 	}
 
 	impl Trait for Runtime {
-		type Currency = pallet_balances::Module<Runtime>;
-		type OnTransactionPayment = ();
+		type OnChargeTransaction = CurrencyAdapter<Balances, ()>;
 		type TransactionByteFee = TransactionByteFee;
 		type WeightToFee = WeightToFee;
 		type FeeMultiplierUpdate = ();
diff --git a/frame/transaction-payment/src/payment.rs b/frame/transaction-payment/src/payment.rs
new file mode 100644
index 000000000000..de39215b575b
--- /dev/null
+++ b/frame/transaction-payment/src/payment.rs
@@ -0,0 +1,127 @@
+///! Traits and default implementation for paying transaction fees.
+use crate::Trait;
+use codec::FullCodec;
+use frame_support::{
+	traits::{Currency, ExistenceRequirement, Get, Imbalance, OnUnbalanced, WithdrawReasons},
+	unsigned::TransactionValidityError,
+};
+use sp_runtime::{
+	traits::{AtLeast32BitUnsigned, DispatchInfoOf, MaybeSerializeDeserialize, PostDispatchInfoOf, Saturating, Zero},
+	transaction_validity::InvalidTransaction,
+};
+use sp_std::{fmt::Debug, marker::PhantomData};
+
+type NegativeImbalanceOf<C, T> =
+	<C as Currency<<T as frame_system::Trait>::AccountId>>::NegativeImbalance;
+
+/// Handle withdrawing, refunding and depositing of transaction fees.
+pub trait OnChargeTransaction<T: Trait> {
+	/// The underlying integer type in which fees are calculated.
+	type Balance: AtLeast32BitUnsigned + FullCodec + Copy + MaybeSerializeDeserialize + Debug + Default;
+	type LiquidityInfo: Default;
+
+	/// Before the transaction is executed the payment of the transaction fees
+	/// need to be secured.
+	///
+	/// Note: The `fee` already includes the `tip`.
+	fn withdraw_fee(
+		who: &T::AccountId,
+		call: &T::Call,
+		dispatch_info: &DispatchInfoOf<T::Call>,
+		fee: Self::Balance,
+		tip: Self::Balance,
+	) -> Result<Self::LiquidityInfo, TransactionValidityError>;
+
+	/// After the transaction was executed the actual fee can be calculated.
+	/// This function should refund any overpaid fees and optionally deposit
+	/// the corrected amount.
+	///
+	/// Note: The `fee` already includes the `tip`.
+	fn correct_and_deposit_fee(
+		who: &T::AccountId,
+		dispatch_info: &DispatchInfoOf<T::Call>,
+		post_info: &PostDispatchInfoOf<T::Call>,
+		corrected_fee: Self::Balance,
+		tip: Self::Balance,
+		already_withdrawn: Self::LiquidityInfo,
+	) -> Result<(), TransactionValidityError>;
+}
+
+/// Implements the transaction payment for a module implementing the `Currency`
+/// trait (eg. the pallet_balances) using an unbalance handler (implementing
+/// `OnUnbalanced`).
+pub struct CurrencyAdapter<C, OU>(PhantomData<(C, OU)>);
+
+/// Default implementation for a Currency and an OnUnbalanced handler.
+impl<T, C, OU> OnChargeTransaction<T> for CurrencyAdapter<C, OU>
+where
+	T: Trait,
+	T::TransactionByteFee: Get<<C as Currency<<T as frame_system::Trait>::AccountId>>::Balance>,
+	C: Currency<<T as frame_system::Trait>::AccountId>,
+	C::PositiveImbalance:
+		Imbalance<<C as Currency<<T as frame_system::Trait>::AccountId>>::Balance, Opposite = C::NegativeImbalance>,
+	C::NegativeImbalance:
+		Imbalance<<C as Currency<<T as frame_system::Trait>::AccountId>>::Balance, Opposite = C::PositiveImbalance>,
+	OU: OnUnbalanced<NegativeImbalanceOf<C, T>>,
+{
+	type LiquidityInfo = Option<NegativeImbalanceOf<C, T>>;
+	type Balance = <C as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
+
+	/// Withdraw the predicted fee from the transaction origin.
+	///
+	/// Note: The `fee` already includes the `tip`.
+	fn withdraw_fee(
+		who: &T::AccountId,
+		_call: &T::Call,
+		_info: &DispatchInfoOf<T::Call>,
+		fee: Self::Balance,
+		tip: Self::Balance,
+	) -> Result<Self::LiquidityInfo, TransactionValidityError> {
+		if fee.is_zero() {
+			return Ok(None);
+		}
+
+		let withdraw_reason = if tip.is_zero() {
+			WithdrawReasons::TRANSACTION_PAYMENT
+		} else {
+			WithdrawReasons::TRANSACTION_PAYMENT | WithdrawReasons::TIP
+		};
+
+		match C::withdraw(who, fee, withdraw_reason, ExistenceRequirement::KeepAlive) {
+			Ok(imbalance) => Ok(Some(imbalance)),
+			Err(_) => Err(InvalidTransaction::Payment.into()),
+		}
+	}
+
+	/// Hand the fee and the tip over to the `[OnUnbalanced]` implementation.
+	/// Since the predicted fee might have been too high, parts of the fee may
+	/// be refunded.
+	///
+	/// Note: The `fee` already includes the `tip`.
+	fn correct_and_deposit_fee(
+		who: &T::AccountId,
+		_dispatch_info: &DispatchInfoOf<T::Call>,
+		_post_info: &PostDispatchInfoOf<T::Call>,
+		corrected_fee: Self::Balance,
+		tip: Self::Balance,
+		already_withdrawn: Self::LiquidityInfo,
+	) -> Result<(), TransactionValidityError> {
+		if let Some(paid) = already_withdrawn {
+			// Calculate how much refund we should return
+			let refund_amount = paid.peek().saturating_sub(corrected_fee);
+			// refund to the the account that paid the fees. If this fails, the
+			// account might have dropped below the existential balance. In
+			// that case we don't refund anything.
+			let refund_imbalance =
+				C::deposit_into_existing(&who, refund_amount).unwrap_or_else(|_| C::PositiveImbalance::zero());
+			// merge the imbalance caused by paying the fees and refunding parts of it again.
+			let adjusted_paid = paid
+				.offset(refund_imbalance)
+				.map_err(|_| TransactionValidityError::Invalid(InvalidTransaction::Payment))?;
+			// Call someone else to handle the imbalance (fee and tip separately)
+			let imbalances = adjusted_paid.split(tip);
+			OU::on_unbalanceds(Some(imbalances.0).into_iter().chain(Some(imbalances.1)));
+		}
+		Ok(())
+	}
+}

From 68a058cdc315217d87b381b539d38d3cf24e9896 Mon Sep 17 00:00:00 2001
From: HarryHong <hong091114@gmail.com>
Date: Fri, 30 Oct 2020 21:03:37 +0800
Subject: [PATCH 0038/1194] update old chaos-tag to simnet (#7469)

---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 527ce7f425a9..cbb56fcf7267 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -531,7 +531,7 @@ build-chaos-docker:
     DOCKERFILE:                    $PRODUCT.Dockerfile
     CONTAINER_IMAGE:               paritypr/$PRODUCT
   environment:
-    name:                          parity-chaosnet
+    name:                          parity-simnet
   services:
     - docker:dind
   before_script:
@@ -568,7 +568,7 @@ chaos-test-singlenodeheight:
   needs:
     - job:                         build-chaos-docker
   tags:
-    - parity-chaos
+    - parity-simnet
   variables:
     <<:                            *default-vars
     PRODUCT:                       substrate
@@ -579,7 +579,7 @@ chaos-test-singlenodeheight:
     VERSION:                       "ci-${CI_COMMIT_SHORT_SHA}"
   interruptible: true
   environment:
-    name:                          parity-chaosnet
+    name:                          parity-simnet
   script:
     - simnet spawn dev -i $CONTAINER_IMAGE:$VERSION
     - simnet singlenodeheight -h 30

From a1f52fcd849482028b3e18e38ad77dabca9b4bd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Fri, 30 Oct 2020 14:59:45 +0100
Subject: [PATCH 0039/1194] Make authority discovery configurable (#7465)

* Make authority discovery configurable

This pr makes the authority discovery configurable. So, instead of
having default values for the query interval, publish interval etc this
pr adds a configuration to make these values changeable. This will be
useful for tests where authority discovery is required.

* Update client/authority-discovery/src/worker.rs

Co-authored-by: Max Inden <mail@max-inden.de>

* Update client/authority-discovery/src/lib.rs

Co-authored-by: Max Inden <mail@max-inden.de>

* Update client/authority-discovery/src/lib.rs

Co-authored-by: Max Inden <mail@max-inden.de>

* Update client/authority-discovery/src/lib.rs

Co-authored-by: Max Inden <mail@max-inden.de>

* Fix compilation

* line width

Co-authored-by: Max Inden <mail@max-inden.de>
---
 client/authority-discovery/src/lib.rs         | 81 ++++++++++++++++++-
 client/authority-discovery/src/worker.rs      | 22 ++---
 .../authority-discovery/src/worker/tests.rs   | 11 +++
 3 files changed, 101 insertions(+), 13 deletions(-)

diff --git a/client/authority-discovery/src/lib.rs b/client/authority-discovery/src/lib.rs
index 2d789d1e6a08..4ee57f31e04a 100644
--- a/client/authority-discovery/src/lib.rs
+++ b/client/authority-discovery/src/lib.rs
@@ -26,7 +26,7 @@
 
 pub use crate::{service::Service, worker::{NetworkProvider, Worker, Role}};
 
-use std::sync::Arc;
+use std::{sync::Arc, time::Duration};
 
 use futures::channel::{mpsc, oneshot};
 use futures::Stream;
@@ -43,6 +43,49 @@ mod service;
 mod tests;
 mod worker;
 
+/// Configuration of [`Worker`].
+pub struct WorkerConfig {
+	/// The interval in which the node will publish its own address on the DHT.
+	///
+	/// By default this is set to 12 hours.
+	pub publish_interval: Duration,
+	/// The interval in which the node will query the DHT for new entries.
+	///
+	/// By default this is set to 10 minutes.
+	pub query_interval: Duration,
+	/// The time the node will wait before triggering the first DHT query or publish.
+	///
+	/// By default this is set to 30 seconds.
+	///
+	/// This default is based on the rough boostrap time required by libp2p Kademlia.
+	pub query_start_delay: Duration,
+	/// The interval in which the worker will instruct the peerset to connect to a random subset
+	/// of discovered validators.
+	///
+	/// By default this is set to 10 minutes.
+	pub priority_group_set_interval: Duration,
+	/// The time the worker will wait after each query interval tick to pass a subset of
+	/// the cached authority addresses down to the peerset.
+	///
+	/// Be aware that the actual delay will be computed by [`Self::query_start_delay`] +
+	/// [`Self::priority_group_set_start_delay`]
+	///
+	/// By default this is set to 5 minutes.
+	pub priority_group_set_offset: Duration,
+}
+
+impl Default for WorkerConfig {
+	fn default() -> Self {
+		Self {
+			publish_interval: Duration::from_secs(12 * 60 * 60),
+			query_interval: Duration::from_secs(10 * 60),
+			query_start_delay: Duration::from_secs(30),
+			priority_group_set_interval: Duration::from_secs(10 * 60),
+			priority_group_set_offset: Duration::from_secs(5 * 60),
+		}
+	}
+}
+
 /// Create a new authority discovery [`Worker`] and [`Service`].
 ///
 /// See the struct documentation of each for more details.
@@ -53,6 +96,34 @@ pub fn new_worker_and_service<Client, Network, Block, DhtEventStream>(
 	role: Role,
 	prometheus_registry: Option<prometheus_endpoint::Registry>,
 ) -> (Worker<Client, Network, Block, DhtEventStream>, Service)
+where
+	Block: BlockT + Unpin + 'static,
+	Network: NetworkProvider,
+	Client: ProvideRuntimeApi<Block> + Send + Sync + 'static + HeaderBackend<Block>,
+	<Client as ProvideRuntimeApi<Block>>::Api: AuthorityDiscoveryApi<Block, Error = sp_blockchain::Error>,
+	DhtEventStream: Stream<Item = DhtEvent> + Unpin,
+{
+	new_worker_and_service_with_config(
+		Default::default(),
+		client,
+		network,
+		dht_event_rx,
+		role,
+		prometheus_registry,
+	)
+}
+
+/// Same as [`new_worker_and_service`] but with support for providing the `config`.
+///
+/// When in doubt use [`new_worker_and_service`] as it will use the default configuration.
+pub fn new_worker_and_service_with_config<Client, Network, Block, DhtEventStream>(
+	config: WorkerConfig,
+	client: Arc<Client>,
+	network: Arc<Network>,
+	dht_event_rx: DhtEventStream,
+	role: Role,
+	prometheus_registry: Option<prometheus_endpoint::Registry>,
+) -> (Worker<Client, Network, Block, DhtEventStream>, Service)
 where
 	Block: BlockT + Unpin + 'static,
 	Network: NetworkProvider,
@@ -63,7 +134,13 @@ where
 	let (to_worker, from_service) = mpsc::channel(0);
 
 	let worker = Worker::new(
-		from_service, client, network, dht_event_rx, role, prometheus_registry,
+		from_service,
+		client,
+		network,
+		dht_event_rx,
+		role,
+		prometheus_registry,
+		config,
 	);
 	let service = Service::new(to_worker);
 
diff --git a/client/authority-discovery/src/worker.rs b/client/authority-discovery/src/worker.rs
index 1a0a59f8c49f..42ae3a5213f0 100644
--- a/client/authority-discovery/src/worker.rs
+++ b/client/authority-discovery/src/worker.rs
@@ -58,9 +58,6 @@ type Interval = Box<dyn Stream<Item = ()> + Unpin + Send + Sync>;
 
 const LOG_TARGET: &'static str = "sub-authority-discovery";
 
-/// Upper bound estimation on how long one should wait before accessing the Kademlia DHT.
-const LIBP2P_KADEMLIA_BOOTSTRAP_TIME: Duration = Duration::from_secs(30);
-
 /// Name of the Substrate peerset priority group for authorities discovered through the authority
 /// discovery module.
 const AUTHORITIES_PRIORITY_GROUP_NAME: &'static str = "authorities";
@@ -154,30 +151,33 @@ where
 		dht_event_rx: DhtEventStream,
 		role: Role,
 		prometheus_registry: Option<prometheus_endpoint::Registry>,
+		config: crate::WorkerConfig,
 	) -> Self {
-		// Kademlia's default time-to-live for Dht records is 36h, republishing records every 24h.
+		// Kademlia's default time-to-live for Dht records is 36h, republishing
+		// records every 24h through libp2p-kad.
 		// Given that a node could restart at any point in time, one can not depend on the
 		// republishing process, thus publishing own external addresses should happen on an interval
 		// < 36h.
 		let publish_interval = interval_at(
-			Instant::now() + LIBP2P_KADEMLIA_BOOTSTRAP_TIME,
-			Duration::from_secs(12 * 60 * 60),
+			Instant::now() + config.query_start_delay,
+			config.publish_interval,
 		);
 
 		// External addresses of remote authorities can change at any given point in time. The
 		// interval on which to trigger new queries for the current authorities is a trade off
 		// between efficiency and performance.
-		let query_interval_start = Instant::now() + LIBP2P_KADEMLIA_BOOTSTRAP_TIME;
-		let query_interval_duration = Duration::from_secs(10 * 60);
+		let query_interval_start = Instant::now() + config.query_start_delay;
+		let query_interval_duration = config.query_interval;
 		let query_interval = interval_at(query_interval_start, query_interval_duration);
 
 		// Querying 500 [`AuthorityId`]s takes ~1m on the Kusama DHT (10th of August 2020) when
 		// comparing `authority_discovery_authority_addresses_requested_total` and
 		// `authority_discovery_dht_event_received`. With that in mind set the peerset priority
-		// group on the same interval as the [`query_interval`] above, just delayed by 5 minutes.
+		// group on the same interval as the [`query_interval`] above,
+		// just delayed by 5 minutes by default.
 		let priority_group_set_interval = interval_at(
-			query_interval_start + Duration::from_secs(5 * 60),
-			query_interval_duration,
+			query_interval_start + config.priority_group_set_offset,
+			config.priority_group_set_interval,
 		);
 
 		let addr_cache = AddrCache::new();
diff --git a/client/authority-discovery/src/worker/tests.rs b/client/authority-discovery/src/worker/tests.rs
index ef78735a9b12..12adb8f23251 100644
--- a/client/authority-discovery/src/worker/tests.rs
+++ b/client/authority-discovery/src/worker/tests.rs
@@ -306,6 +306,7 @@ fn new_registers_metrics() {
 		Box::pin(dht_event_rx),
 		Role::PublishAndDiscover(key_store.into()),
 		Some(registry.clone()),
+		Default::default(),
 	);
 
 	assert!(registry.gather().len() > 0);
@@ -334,6 +335,7 @@ fn triggers_dht_get_query() {
 		Box::pin(dht_event_rx),
 		Role::PublishAndDiscover(key_store.into()),
 		None,
+		Default::default(),
 	);
 
 	futures::executor::block_on(async {
@@ -382,6 +384,7 @@ fn publish_discover_cycle() {
 			Box::pin(dht_event_rx),
 			Role::PublishAndDiscover(key_store.into()),
 			None,
+			Default::default(),
 		);
 
 		worker.publish_ext_addresses().await.unwrap();
@@ -412,6 +415,7 @@ fn publish_discover_cycle() {
 			Box::pin(dht_event_rx),
 			Role::PublishAndDiscover(key_store.into()),
 			None,
+			Default::default(),
 		);
 
 		dht_event_tx.try_send(dht_event.clone()).unwrap();
@@ -458,6 +462,7 @@ fn terminate_when_event_stream_terminates() {
 		Box::pin(dht_event_rx),
 		Role::PublishAndDiscover(key_store.into()),
 		None,
+		Default::default(),
 	).run();
 	futures::pin_mut!(worker);
 
@@ -520,6 +525,7 @@ fn dont_stop_polling_dht_event_stream_after_bogus_event() {
 		Box::pin(dht_event_rx),
 		Role::PublishAndDiscover(Arc::new(key_store)),
 		None,
+		Default::default(),
 	);
 
 	// Spawn the authority discovery to make sure it is polled independently.
@@ -596,6 +602,7 @@ fn limit_number_of_addresses_added_to_cache_per_authority() {
 		Box::pin(dht_event_rx),
 		Role::Discover,
 		None,
+		Default::default(),
 	);
 
 	block_on(worker.refill_pending_lookups_queue()).unwrap();
@@ -648,6 +655,7 @@ fn do_not_cache_addresses_without_peer_id() {
 		Box::pin(dht_event_rx),
 		Role::PublishAndDiscover(Arc::new(local_key_store)),
 		None,
+		Default::default(),
 	);
 
 	block_on(local_worker.refill_pending_lookups_queue()).unwrap();
@@ -682,6 +690,7 @@ fn addresses_to_publish_adds_p2p() {
 		Box::pin(dht_event_rx),
 		Role::PublishAndDiscover(Arc::new(KeyStore::new())),
 		Some(prometheus_endpoint::Registry::new()),
+		Default::default(),
 	);
 
 	assert!(
@@ -716,6 +725,7 @@ fn addresses_to_publish_respects_existing_p2p_protocol() {
 		Box::pin(dht_event_rx),
 		Role::PublishAndDiscover(Arc::new(KeyStore::new())),
 		Some(prometheus_endpoint::Registry::new()),
+		Default::default(),
 	);
 
 	assert_eq!(
@@ -757,6 +767,7 @@ fn lookup_throttling() {
 		dht_event_rx.boxed(),
 		Role::Discover,
 		Some(default_registry().clone()),
+		Default::default(),
 	);
 
 	let mut pool = LocalPool::new();

From b4cdef239d1de7a9b93b906b6c860f6246b0d887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Fri, 30 Oct 2020 15:29:42 +0100
Subject: [PATCH 0040/1194] Add constant constructor to AccountId32 (#7471)

---
 primitives/core/src/crypto.rs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index c1490f882bd1..6606b8888769 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -617,6 +617,16 @@ pub trait Public:
 #[cfg_attr(feature = "std", derive(Hash))]
 pub struct AccountId32([u8; 32]);
 
+impl AccountId32 {
+	/// Create a new instance from its raw inner byte value.
+	///
+	/// Equivalent to this types `From<[u8; 32]>` implementation. For the lack of const
+	/// support in traits we have this constructor.
+	pub const fn new(inner: [u8; 32]) -> Self {
+		Self(inner)
+	}
+}
+
 impl UncheckedFrom<crate::hash::H256> for AccountId32 {
 	fn unchecked_from(h: crate::hash::H256) -> Self {
 		AccountId32(h.into())
@@ -651,8 +661,8 @@ impl AsMut<[u8; 32]> for AccountId32 {
 }
 
 impl From<[u8; 32]> for AccountId32 {
-	fn from(x: [u8; 32]) -> AccountId32 {
-		AccountId32(x)
+	fn from(x: [u8; 32]) -> Self {
+		Self::new(x)
 	}
 }
 

From 3a0c6f25eb38d767cf26c3df627375255ee26357 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Fri, 30 Oct 2020 15:39:40 +0100
Subject: [PATCH 0041/1194] contracts: Rework contracts_call RPC (#7468)

* Implement serde::Deserialize for DispatchError if std

This is needed to use this type in the contracts RPC.

* contracts: Change contract_call RPC to return more information
---
 frame/contracts/rpc/src/lib.rs | 51 ++++++++++++++++++++++------------
 primitives/runtime/src/lib.rs  |  5 ++--
 2 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/frame/contracts/rpc/src/lib.rs b/frame/contracts/rpc/src/lib.rs
index 84df1e25a3b3..6d43ea75c035 100644
--- a/frame/contracts/rpc/src/lib.rs
+++ b/frame/contracts/rpc/src/lib.rs
@@ -31,6 +31,7 @@ use sp_rpc::number;
 use sp_runtime::{
 	generic::BlockId,
 	traits::{Block as BlockT, Header as HeaderT},
+	DispatchError,
 };
 use std::convert::TryInto;
 use pallet_contracts_primitives::ContractExecResult;
@@ -83,33 +84,47 @@ pub struct CallRequest<AccountId, Balance> {
 	input_data: Bytes,
 }
 
+#[derive(Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
+#[serde(rename_all = "camelCase")]
+struct RpcContractExecSuccess {
+	/// The return flags. See `pallet_contracts_primitives::ReturnFlags`.
+	flags: u32,
+	/// Data as returned by the contract.
+	data: Bytes,
+}
+
 /// An RPC serializable result of contract execution
 #[derive(Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
 #[serde(rename_all = "camelCase")]
-pub enum RpcContractExecResult {
-	/// Successful execution
-	Success {
-		/// The return flags
-		flags: u32,
-		/// Output data
-		data: Bytes,
-		/// How much gas was consumed by the call.
-		gas_consumed: u64,
-	},
-	/// Error execution
-	Error(()),
+pub struct RpcContractExecResult {
+	/// How much gas was consumed by the call. In case of an error this is the amount
+	/// that was used up until the error occurred.
+	gas_consumed: u64,
+	/// Additional dynamic human readable error information for debugging. An empty string
+	/// indicates that no additional information is available.
+	debug_message: String,
+	/// Indicates whether the contract execution was successful or not.
+	result: std::result::Result<RpcContractExecSuccess, DispatchError>,
 }
 
 impl From<ContractExecResult> for RpcContractExecResult {
 	fn from(r: ContractExecResult) -> Self {
 		match r.exec_result {
-			Ok(val) => RpcContractExecResult::Success {
-				flags: val.flags.bits(),
-				data: val.data.into(),
+			Ok(val) => RpcContractExecResult {
+				gas_consumed: r.gas_consumed,
+				debug_message: String::new(),
+				result: Ok(RpcContractExecSuccess {
+					flags: val.flags.bits(),
+					data: val.data.into(),
+				}),
+			},
+			Err(err) => RpcContractExecResult {
 				gas_consumed: r.gas_consumed,
+				debug_message: String::new(),
+				result: Err(err.error),
 			},
-			_ => RpcContractExecResult::Error(()),
 		}
 	}
 }
@@ -310,7 +325,7 @@ mod tests {
 			let actual = serde_json::to_string(&res).unwrap();
 			assert_eq!(actual, expected);
 		}
-		test(r#"{"success":{"flags":5,"data":"0x1234","gas_consumed":5000}}"#);
-		test(r#"{"error":null}"#);
+		test(r#"{"gasConsumed":5000,"debugMessage":"helpOk","result":{"Ok":{"flags":5,"data":"0x1234"}}}"#);
+		test(r#"{"gasConsumed":3400,"debugMessage":"helpErr","result":{"Err":"BadOrigin"}}"#);
 	}
 }
diff --git a/primitives/runtime/src/lib.rs b/primitives/runtime/src/lib.rs
index eb20418203a9..e6c707e906ed 100644
--- a/primitives/runtime/src/lib.rs
+++ b/primitives/runtime/src/lib.rs
@@ -388,10 +388,10 @@ pub type DispatchResultWithInfo<T> = sp_std::result::Result<T, DispatchErrorWith
 
 /// Reason why a dispatch call failed.
 #[derive(Eq, PartialEq, Clone, Copy, Encode, Decode, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Serialize))]
+#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 pub enum DispatchError {
 	/// Some error occurred.
-	Other(#[codec(skip)] &'static str),
+	Other(#[codec(skip)] #[cfg_attr(feature = "std", serde(skip_deserializing))] &'static str),
 	/// Failed to lookup some data.
 	CannotLookup,
 	/// A bad origin.
@@ -404,6 +404,7 @@ pub enum DispatchError {
 		error: u8,
 		/// Optional error message.
 		#[codec(skip)]
+		#[cfg_attr(feature = "std", serde(skip_deserializing))]
 		message: Option<&'static str>,
 	},
 }

From 3664cdbc92b13d7197fbf2a7fa2b0cd6201eba09 Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Fri, 30 Oct 2020 16:01:01 +0100
Subject: [PATCH 0042/1194] docs/CONTRIBUTING: Update Polkadot pull request
 process documentation (#7393)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* docs/CONTRIBUTING: Update Polkadot pull request process

* Update docs/CONTRIBUTING.adoc

Co-authored-by: David <dvdplm@gmail.com>

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: David <dvdplm@gmail.com>
---
 docs/CONTRIBUTING.adoc | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/docs/CONTRIBUTING.adoc b/docs/CONTRIBUTING.adoc
index 491e24aeaec8..3e1ca7f5a326 100644
--- a/docs/CONTRIBUTING.adoc
+++ b/docs/CONTRIBUTING.adoc
@@ -71,8 +71,15 @@ To create a Polkadot companion PR:
 . Make the changes required and build polkadot locally.
 . Submit all this as a PR against the Polkadot Repo. Link to your Polkadot PR in the _description_ of your Substrate PR as "polkadot companion: [URL]"
 . Now you should see that the `check_polkadot` CI job will build your Substrate PR agains the mentioned Polkadot branch in your PR description.
-. Wait for reviews on both
-. Once both PRs have been green lit, they can both be merged 🍻.
+. Wait for reviews on both the Substrate and the Polkadot pull request.
+. Once the Substrate pull request runs green, a member of the `parity` github group can comment on the Substrate pull request with `bot merge` which will:
+    - Merge the Substrate pull request.
+    - In case the pull request origins from https://github.com/paritytech/polkadot directly and not from a fork:
+        - The bot will push a commit to the Polkadot pull request updating its Substrate reference.
+        - The bot will merge the Polkadot pull request once all its CI checks are green.
+    - In case the pull request origins from a fork (relevant for pull requests by external contributors):
+        - You need to push a commit to the Polkadot pull request updating the Substrate reference.
+        - You need to merge by commenting `bot merge` on the Polkadot pull request once all CI checks on the pull request are green.
 
 If your PR is reviewed well, but a Polkadot PR is missing, signal it with https://github.com/paritytech/substrate/labels/A7-needspolkadotpr[`A7-needspolkadotpr`] to prevent it from getting automatically merged.
 

From cab986549f964a081343336797bb6cf6b3526335 Mon Sep 17 00:00:00 2001
From: Roman Borschel <romanb@users.noreply.github.com>
Date: Fri, 30 Oct 2020 16:43:28 +0100
Subject: [PATCH 0043/1194] Update to libp2p-0.29. (#7341)

* Update to libp2p-0.29.

* Update dependencies.

* Update Cargo.toml

Co-authored-by: Max Inden <mail@max-inden.de>

* Fix tests.

* Fix tests.

* Fix more tests.

* Update to 0.29.1

* Update ed25519-dalek dependency of sp-core.

* Update Cargo.lock.

Co-authored-by: Max Inden <mail@max-inden.de>
Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
---
 Cargo.lock                                    | 465 ++++++++++--------
 bin/node/browser-testing/Cargo.toml           |   2 +-
 client/authority-discovery/Cargo.toml         |   2 +-
 client/cli/Cargo.toml                         |   2 +-
 client/network-gossip/Cargo.toml              |   2 +-
 client/network/Cargo.toml                     |   4 +-
 client/network/src/discovery.rs               |   3 +-
 client/network/src/light_client_handler.rs    |   4 +-
 .../src/protocol/generic_proto/tests.rs       |   3 -
 client/network/src/request_responses.rs       |   6 +-
 client/network/src/transport.rs               |  15 +-
 client/network/test/Cargo.toml                |   2 +-
 client/peerset/Cargo.toml                     |   2 +-
 client/telemetry/Cargo.toml                   |   2 +-
 client/telemetry/src/worker.rs                |  23 +-
 primitives/consensus/common/Cargo.toml        |   2 +-
 primitives/core/Cargo.toml                    |   2 +-
 utils/browser/Cargo.toml                      |   2 +-
 18 files changed, 298 insertions(+), 245 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 450ea9f3852f..0f3e68a844e3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -42,7 +42,7 @@ checksum = "f7001367fde4c768a19d1029f0a8be5abd9308e1119846d5bd9ad26297b8faf5"
 dependencies = [
  "aes-soft",
  "aesni",
- "block-cipher",
+ "block-cipher 0.7.1",
 ]
 
 [[package]]
@@ -53,7 +53,7 @@ checksum = "86f5007801316299f922a6198d1d09a0bae95786815d066d5880d13f7c45ead1"
 dependencies = [
  "aead",
  "aes",
- "block-cipher",
+ "block-cipher 0.7.1",
  "ghash",
  "subtle 2.2.3",
 ]
@@ -64,8 +64,8 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4925647ee64e5056cf231608957ce7c81e12d6d6e316b9ce1404778cc1d35fa7"
 dependencies = [
- "block-cipher",
- "byteorder 1.3.4",
+ "block-cipher 0.7.1",
+ "byteorder",
  "opaque-debug 0.2.3",
 ]
 
@@ -75,7 +75,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d050d39b0b7688b3a3254394c3e30a9d66c41dcf9b05b0e2dbdc623f6505d264"
 dependencies = [
- "block-cipher",
+ "block-cipher 0.7.1",
  "opaque-debug 0.2.3",
 ]
 
@@ -322,14 +322,15 @@ checksum = "8ab27c1aa62945039e44edaeee1dc23c74cc0c303dd5fe0fb462a184f1c3a518"
 
 [[package]]
 name = "async-tls"
-version = "0.8.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df097e3f506bec0e1a24f06bb3c962c228f36671de841ff579cb99f371772634"
+checksum = "d85a97c4a0ecce878efd3f945f119c78a646d8975340bca0398f9bb05c30cc52"
 dependencies = [
- "futures 0.3.5",
+ "futures-core",
+ "futures-io",
  "rustls",
  "webpki",
- "webpki-roots 0.19.0",
+ "webpki-roots",
 ]
 
 [[package]]
@@ -345,9 +346,12 @@ dependencies = [
 
 [[package]]
 name = "atomic"
-version = "0.4.6"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64f46ca51dca4837f1520754d1c8c36636356b81553d928dc9c177025369a06e"
+checksum = "c3410529e8288c463bedb5930f82833bc0c90e5d2fe639a56582a4d09220b281"
+dependencies = [
+ "autocfg 1.0.0",
+]
 
 [[package]]
 name = "atomic-waker"
@@ -410,13 +414,19 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
 
+[[package]]
+name = "base64"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
+
 [[package]]
 name = "bincode"
 version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f30d3a39baa26f9651f17b375061f3233dde33424a8b72b0dbe93a68a0bc896d"
 dependencies = [
- "byteorder 1.3.4",
+ "byteorder",
  "serde",
 ]
 
@@ -482,7 +492,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84ce5b6108f8e154604bd4eb76a2f726066c3464d5a552a4229262a18c9bb471"
 dependencies = [
  "byte-tools",
- "byteorder 1.3.4",
+ "byteorder",
  "crypto-mac 0.8.0",
  "digest 0.9.0",
  "opaque-debug 0.2.3",
@@ -526,9 +536,9 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
 dependencies = [
- "block-padding",
+ "block-padding 0.1.5",
  "byte-tools",
- "byteorder 1.3.4",
+ "byteorder",
  "generic-array 0.12.3",
 ]
 
@@ -538,6 +548,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
 dependencies = [
+ "block-padding 0.2.1",
  "generic-array 0.14.3",
 ]
 
@@ -550,6 +561,15 @@ dependencies = [
  "generic-array 0.14.3",
 ]
 
+[[package]]
+name = "block-cipher"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f337a3e6da609650eb74e02bc9fac7b735049f7623ab12f2e4c719316fcc7e80"
+dependencies = [
+ "generic-array 0.14.3",
+]
+
 [[package]]
 name = "block-padding"
 version = "0.1.5"
@@ -559,6 +579,12 @@ dependencies = [
  "byte-tools",
 ]
 
+[[package]]
+name = "block-padding"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
+
 [[package]]
 name = "blocking"
 version = "1.0.2"
@@ -618,12 +644,6 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
 
-[[package]]
-name = "byteorder"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855"
-
 [[package]]
 name = "byteorder"
 version = "1.3.4"
@@ -636,7 +656,7 @@ version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
 dependencies = [
- "byteorder 1.3.4",
+ "byteorder",
  "either",
  "iovec",
 ]
@@ -647,12 +667,6 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
 
-[[package]]
-name = "c_linked_list"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4964518bd3b4a8190e832886cdc0da9794f12e8e6c1613a9e90ff331c4c8724b"
-
 [[package]]
 name = "cache-padded"
 version = "1.1.1"
@@ -890,7 +904,7 @@ version = "0.66.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d9badfe36176cb653506091693bc2bb1970c9bddfcd6ec7fac404f7eaec6f38"
 dependencies = [
- "byteorder 1.3.4",
+ "byteorder",
  "cranelift-bforest",
  "cranelift-codegen-meta",
  "cranelift-codegen-shared",
@@ -1129,12 +1143,13 @@ dependencies = [
 
 [[package]]
 name = "cuckoofilter"
-version = "0.3.2"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dd43f7cfaffe0a386636a10baea2ee05cc50df3b77bea4a456c9572a939bf1f"
+checksum = "b810a8449931679f64cd7eef1bbd0fa315801b6d5d9cdc1ace2804d6529eee18"
 dependencies = [
- "byteorder 0.5.3",
- "rand 0.3.23",
+ "byteorder",
+ "fnv",
+ "rand 0.7.3",
 ]
 
 [[package]]
@@ -1143,13 +1158,26 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d85653f070353a16313d0046f173f70d1aadd5b42600a14de626f0dfb3473a5"
 dependencies = [
- "byteorder 1.3.4",
+ "byteorder",
  "digest 0.8.1",
  "rand_core 0.5.1",
  "subtle 2.2.3",
  "zeroize",
 ]
 
+[[package]]
+name = "curve25519-dalek"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8492de420e9e60bc9a1d66e2dbb91825390b738a388606600663fc529b4b307"
+dependencies = [
+ "byteorder",
+ "digest 0.9.0",
+ "rand_core 0.5.1",
+ "subtle 2.2.3",
+ "zeroize",
+]
+
 [[package]]
 name = "data-encoding"
 version = "2.2.1"
@@ -1224,7 +1252,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4d33be9473d06f75f58220f71f7a9317aca647dc061dbd3c361b0bef505fbea"
 dependencies = [
- "byteorder 1.3.4",
+ "byteorder",
  "quick-error 1.2.3",
 ]
 
@@ -1272,15 +1300,15 @@ dependencies = [
 
 [[package]]
 name = "ed25519-dalek"
-version = "1.0.0-pre.4"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21a8a37f4e8b35af971e6db5e3897e7a6344caa3f92f6544f88125a1f5f0035a"
+checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
 dependencies = [
- "curve25519-dalek",
+ "curve25519-dalek 3.0.0",
  "ed25519",
  "rand 0.7.3",
  "serde",
- "sha2 0.8.2",
+ "sha2 0.9.1",
  "zeroize",
 ]
 
@@ -1404,7 +1432,7 @@ dependencies = [
  "primitive-types",
  "rlp",
  "serde",
- "sha3",
+ "sha3 0.8.2",
 ]
 
 [[package]]
@@ -1435,7 +1463,7 @@ checksum = "7410f5677a52203d3fca02b0eb8f96f9799f3a45cff82946a8ed28379e6b1b04"
 dependencies = [
  "evm-core",
  "primitive-types",
- "sha3",
+ "sha3 0.8.2",
 ]
 
 [[package]]
@@ -1531,7 +1559,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "11498d382790b7a8f2fd211780bec78619bba81cdad3a283997c0c41f836759c"
 dependencies = [
- "byteorder 1.3.4",
+ "byteorder",
  "rand 0.7.3",
  "rustc-hex",
  "static_assertions",
@@ -1880,7 +1908,7 @@ dependencies = [
  "lazy_static",
  "log",
  "parking_lot 0.9.0",
- "pin-project",
+ "pin-project 0.4.22",
  "serde",
  "serde_json",
 ]
@@ -1975,7 +2003,7 @@ dependencies = [
  "futures-sink",
  "futures-task",
  "memchr",
- "pin-project",
+ "pin-project 0.4.22",
  "pin-utils",
  "proc-macro-hack",
  "proc-macro-nested",
@@ -2003,7 +2031,7 @@ dependencies = [
  "bytes 0.5.6",
  "futures 0.3.5",
  "memchr",
- "pin-project",
+ "pin-project 0.4.22",
 ]
 
 [[package]]
@@ -2031,28 +2059,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "get_if_addrs"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abddb55a898d32925f3148bd281174a68eeb68bbfd9a5938a57b18f506ee4ef7"
-dependencies = [
- "c_linked_list",
- "get_if_addrs-sys",
- "libc",
- "winapi 0.2.8",
-]
-
-[[package]]
-name = "get_if_addrs-sys"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d04f9fb746cf36b191c00f3ede8bde9c8e64f9f4b05ae2694a9ccf5e3f5ab48"
-dependencies = [
- "gcc",
- "libc",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.1.14"
@@ -2140,7 +2146,7 @@ version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462"
 dependencies = [
- "byteorder 1.3.4",
+ "byteorder",
  "bytes 0.4.12",
  "fnv",
  "futures 0.1.29",
@@ -2212,7 +2218,7 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da"
 dependencies = [
- "byteorder 1.3.4",
+ "byteorder",
  "scopeguard 0.3.3",
 ]
 
@@ -2408,7 +2414,7 @@ dependencies = [
  "http-body 0.3.1",
  "httparse",
  "itoa",
- "pin-project",
+ "pin-project 0.4.22",
  "socket2",
  "time",
  "tokio 0.2.22",
@@ -2457,6 +2463,27 @@ dependencies = [
  "unicode-normalization",
 ]
 
+[[package]]
+name = "if-addrs"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f12906406f12abf5569643c46b29aec78313dc1537b17dd5c5250169790c4db9"
+dependencies = [
+ "if-addrs-sys",
+ "libc",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "if-addrs-sys"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e2556f16544202bcfe0aa5d20a01a6b815f736b136b3ad76dc547ee6b5bb1df"
+dependencies = [
+ "cc",
+ "libc",
+]
+
 [[package]]
 name = "impl-codec"
 version = "0.4.2"
@@ -2848,9 +2875,9 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
 
 [[package]]
 name = "libp2p"
-version = "0.28.1"
+version = "0.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "571f5a4604c1a40d75651da141dfde29ad15329f537a779528803297d2220274"
+checksum = "021f703bfef6e3da78ef9828c8a244d639b8d57eedf58360922aca5ff69dfdcd"
 dependencies = [
  "atomic",
  "bytes 0.5.6",
@@ -2879,17 +2906,17 @@ dependencies = [
  "libp2p-yamux",
  "multihash",
  "parity-multiaddr",
- "parking_lot 0.10.2",
- "pin-project",
+ "parking_lot 0.11.0",
+ "pin-project 1.0.1",
  "smallvec 1.4.1",
  "wasm-timer",
 ]
 
 [[package]]
 name = "libp2p-core"
-version = "0.22.1"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52f13ba8c7df0768af2eb391696d562c7de88cc3a35122531aaa6a7d77754d25"
+checksum = "3960524389409633550567e8a9e0684d25a33f4f8408887ff897dd9fdfbdb771"
 dependencies = [
  "asn1_der",
  "bs58",
@@ -2904,17 +2931,17 @@ dependencies = [
  "multihash",
  "multistream-select",
  "parity-multiaddr",
- "parking_lot 0.10.2",
- "pin-project",
+ "parking_lot 0.11.0",
+ "pin-project 1.0.1",
  "prost",
  "prost-build",
  "rand 0.7.3",
  "ring",
  "rw-stream-sink",
- "sha2 0.8.2",
+ "sha2 0.9.1",
  "smallvec 1.4.1",
  "thiserror",
- "unsigned-varint 0.4.0",
+ "unsigned-varint 0.5.1",
  "void",
  "zeroize",
 ]
@@ -2931,9 +2958,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-deflate"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74029ae187f35f4b8ddf26b9779a68b340045d708528a103917cdca49a296db5"
+checksum = "567962c5c5f8a1282979441300e1739ba939024010757c3dbfab4d462189df77"
 dependencies = [
  "flate2",
  "futures 0.3.5",
@@ -2942,9 +2969,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-dns"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cf319822e08dd65c8e060d2354e9f952895bbc433f5706c75ed010c152aee5e"
+checksum = "436280f5fe21a58fcaff82c2606945579241f32bc0eaf2d39321aa4624a66e7f"
 dependencies = [
  "futures 0.3.5",
  "libp2p-core",
@@ -2953,15 +2980,16 @@ dependencies = [
 
 [[package]]
 name = "libp2p-floodsub"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8a9acb43a3e4a4e413e0c4abe0fa49308df7c6335c88534757b647199cb8a51"
+checksum = "ecc175613c5915332fd6458895407ec242ea055ae3b107a586626d5e3349350a"
 dependencies = [
  "cuckoofilter",
  "fnv",
  "futures 0.3.5",
  "libp2p-core",
  "libp2p-swarm",
+ "log",
  "prost",
  "prost-build",
  "rand 0.7.3",
@@ -2970,12 +2998,12 @@ dependencies = [
 
 [[package]]
 name = "libp2p-gossipsub"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab20fcb60edebe3173bbb708c6ac3444afdf1e3152dc2866b10c4f5497f17467"
+checksum = "d500ad89ba14de4d18bebdff61a0ce3e769f1c5c5a95026c5da90187e5fff5c9"
 dependencies = [
- "base64 0.11.0",
- "byteorder 1.3.4",
+ "base64 0.13.0",
+ "byteorder",
  "bytes 0.5.6",
  "fnv",
  "futures 0.3.5",
@@ -2988,17 +3016,17 @@ dependencies = [
  "prost",
  "prost-build",
  "rand 0.7.3",
- "sha2 0.8.2",
+ "sha2 0.9.1",
  "smallvec 1.4.1",
- "unsigned-varint 0.4.0",
+ "unsigned-varint 0.5.1",
  "wasm-timer",
 ]
 
 [[package]]
 name = "libp2p-identify"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56396ee63aa9164eacf40c2c5d2bda8c4133c2f57e1b0425d51d3a4e362583b1"
+checksum = "03b90b350e37f398b73d778bd94422f4e6a3afa2c1582742ce2446b8a0dba787"
 dependencies = [
  "futures 0.3.5",
  "libp2p-core",
@@ -3012,9 +3040,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-kad"
-version = "0.23.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc7fa9047f8b8f544278a35c2d9d45d3b2c1785f2d86d4e1629d6edf97be3955"
+checksum = "fb78341f114bf686d5fe50b33ff1a804d88fb326c0d39ee1c22db4346b21fc27"
 dependencies = [
  "arrayvec 0.5.1",
  "bytes 0.5.6",
@@ -3029,19 +3057,19 @@ dependencies = [
  "prost",
  "prost-build",
  "rand 0.7.3",
- "sha2 0.8.2",
+ "sha2 0.9.1",
  "smallvec 1.4.1",
  "uint",
- "unsigned-varint 0.4.0",
+ "unsigned-varint 0.5.1",
  "void",
  "wasm-timer",
 ]
 
 [[package]]
 name = "libp2p-mdns"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3173b5a6b2f690c29ae07798d85b9441a131ac76ddae9015ef22905b623d0c69"
+checksum = "b575514fce0a3ccbd065d6aa377bd4d5102001b05c1a22a5eee49c450254ef0f"
 dependencies = [
  "async-std",
  "data-encoding",
@@ -3061,28 +3089,30 @@ dependencies = [
 
 [[package]]
 name = "libp2p-mplex"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a73a799cc8410b36e40b8f4c4b6babbcb9efd3727111bf517876e4acfa612d3"
+checksum = "696c8ee8b42496690b88b0de84a96387caf6e09880bcc8e794bb88afa054e995"
 dependencies = [
  "bytes 0.5.6",
- "fnv",
  "futures 0.3.5",
  "futures_codec",
  "libp2p-core",
  "log",
- "parking_lot 0.10.2",
- "unsigned-varint 0.4.0",
+ "nohash-hasher",
+ "parking_lot 0.11.0",
+ "rand 0.7.3",
+ "smallvec 1.4.1",
+ "unsigned-varint 0.5.1",
 ]
 
 [[package]]
 name = "libp2p-noise"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ef6c490042f549fb1025f2892dfe6083d97a77558f450c1feebe748ca9eb15a"
+checksum = "93c77142e3e5b18fefa7d267305c777c9cbe9b2232ec489979390100bebcc1e6"
 dependencies = [
  "bytes 0.5.6",
- "curve25519-dalek",
+ "curve25519-dalek 3.0.0",
  "futures 0.3.5",
  "lazy_static",
  "libp2p-core",
@@ -3090,18 +3120,18 @@ dependencies = [
  "prost",
  "prost-build",
  "rand 0.7.3",
- "sha2 0.8.2",
+ "sha2 0.9.1",
  "snow",
  "static_assertions",
- "x25519-dalek",
+ "x25519-dalek 1.1.0",
  "zeroize",
 ]
 
 [[package]]
 name = "libp2p-ping"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad063c21dfcea4518ac9e8bd4119d33a5b26c41e674f602f41f05617a368a5c8"
+checksum = "7257135609e8877f4d286935cbe1e572b2018946881c3e7f63054577074a7ee7"
 dependencies = [
  "futures 0.3.5",
  "libp2p-core",
@@ -3114,9 +3144,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-plaintext"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "903a12e99c72dbebefea258de887982adeacc7025baa1ceb10b7fa9928f54791"
+checksum = "c88d59ba3e710a8c8e0535cb4a52e9e46534924cbbea4691f8c3aaad17b58c61"
 dependencies = [
  "bytes 0.5.6",
  "futures 0.3.5",
@@ -3125,30 +3155,29 @@ dependencies = [
  "log",
  "prost",
  "prost-build",
- "rw-stream-sink",
- "unsigned-varint 0.4.0",
+ "unsigned-varint 0.5.1",
  "void",
 ]
 
 [[package]]
 name = "libp2p-pnet"
-version = "0.19.1"
+version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37d0db10e139d22d7af0b23ed7949449ec86262798aa0fd01595abdbcb02dc87"
+checksum = "96b3c2d5d26a9500e959a0e19743897239a6c4be78dadf99b70414301a70c006"
 dependencies = [
  "futures 0.3.5",
  "log",
- "pin-project",
+ "pin-project 0.4.22",
  "rand 0.7.3",
  "salsa20",
- "sha3",
+ "sha3 0.9.1",
 ]
 
 [[package]]
 name = "libp2p-request-response"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c0c9e8a4cd69d97e9646c54313d007512f411aba8c5226cfcda16df6a6e84a3"
+checksum = "02ba1aa5727ccc118c09ba5111480873f2fe5608cb304e258fd12c173ecf27c9"
 dependencies = [
  "async-trait",
  "bytes 0.5.6",
@@ -3166,9 +3195,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-swarm"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7193e444210132237b81b755ec7fe53f1c4bd2f53cf719729b94c0c72eb6eaa1"
+checksum = "ffa6fa33b16956b8a58afbfebe1406866011a1ab8960765bd36868952d7be6a1"
 dependencies = [
  "either",
  "futures 0.3.5",
@@ -3182,14 +3211,14 @@ dependencies = [
 
 [[package]]
 name = "libp2p-tcp"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44f42ec130d7a37a7e47bf4398026b7ad9185c08ed26972e2720f8b94112796f"
+checksum = "9d0b6f4ef48d9493607fae069deecce0579320a1f3de6cb056770b151018a9a5"
 dependencies = [
  "async-std",
  "futures 0.3.5",
  "futures-timer 3.0.2",
- "get_if_addrs",
+ "if-addrs",
  "ipnet",
  "libp2p-core",
  "log",
@@ -3198,9 +3227,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-uds"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dea7acb0a034f70d7db94c300eba3f65c0f6298820105624088a9609c9974d77"
+checksum = "945bed3c989a1b290b5a0d4e8fa6e44e01840efb9a5ab3f0d3d174f0e451ac0e"
 dependencies = [
  "async-std",
  "futures 0.3.5",
@@ -3210,9 +3239,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-wasm-ext"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34c1faac6f92c21fbe155417957863ea822fba9e9fd5eb24c0912336a100e63f"
+checksum = "66518a4455e15c283637b4d7b579aef928b75a3fc6c50a41e7e6b9fa86672ca0"
 dependencies = [
  "futures 0.3.5",
  "js-sys",
@@ -3224,9 +3253,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-websocket"
-version = "0.23.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d650534ebd99f48f6fa292ed5db10d30df2444943afde4407ceeddab8e513fca"
+checksum = "edc561870477523245efaaea1b6b743c70115f10c670e62bcbbe4d3153be5f0c"
 dependencies = [
  "async-tls",
  "either",
@@ -3239,14 +3268,14 @@ dependencies = [
  "soketto",
  "url 2.1.1",
  "webpki",
- "webpki-roots 0.18.0",
+ "webpki-roots",
 ]
 
 [[package]]
 name = "libp2p-yamux"
-version = "0.25.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "781d9b9f043dcdabc40640807125368596b849fd4d96cdca2dcf052fdf6f33fd"
+checksum = "07c0c9b6ef7a168c2ae854170b0b6b77550599afe06cc3ac390eb45c5d9c7110"
 dependencies = [
  "futures 0.3.5",
  "libp2p-core",
@@ -3404,9 +3433,9 @@ dependencies = [
 
 [[package]]
 name = "lru_time_cache"
-version = "0.10.0"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adb241df5c4caeb888755363fc95f8a896618dc0d435e9e775f7930cb099beab"
+checksum = "ebac060fafad3adedd0c66a80741a92ff4bc8e94a273df2ba3770ab206f2e29a"
 
 [[package]]
 name = "mach"
@@ -3501,7 +3530,7 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c6feca46f4fa3443a01769d768727f10c10a20fdb65e52dc16a81f0c8269bb78"
 dependencies = [
- "byteorder 1.3.4",
+ "byteorder",
  "keccak",
  "rand_core 0.5.1",
  "zeroize",
@@ -3509,18 +3538,18 @@ dependencies = [
 
 [[package]]
 name = "minicbor"
-version = "0.5.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fc03ad6f8f548db7194a5ff5a6f96342ecae4e3ef67d2bf18bacc0e245cd041"
+checksum = "9a2ef6aa869726518c5d8206fa5d1337bda8a0442807611be617891c018fa781"
 dependencies = [
  "minicbor-derive",
 ]
 
 [[package]]
 name = "minicbor-derive"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c214bf3d90099b52f3e4b328ae0fe34837fd0fab683ad1e10fceb4629106df48"
+checksum = "2b3569c0dbfff1b8d5f1434c642b67f5bf81c0f354a3f5f8f180b549dba3c07c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3629,7 +3658,7 @@ dependencies = [
  "digest 0.8.1",
  "sha-1",
  "sha2 0.8.2",
- "sha3",
+ "sha3 0.8.2",
  "unsigned-varint 0.3.3",
 ]
 
@@ -3641,16 +3670,16 @@ checksum = "d8883adfde9756c1d30b0f519c9b8c502a94b41ac62f696453c37c7fc0a958ce"
 
 [[package]]
 name = "multistream-select"
-version = "0.8.2"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9157e87afbc2ef0d84cc0345423d715f445edde00141c93721c162de35a05e5"
+checksum = "36a6aa6e32fbaf16795142335967214b8564a7a4661eb6dc846ef343a6e00ac1"
 dependencies = [
  "bytes 0.5.6",
  "futures 0.3.5",
  "log",
- "pin-project",
+ "pin-project 1.0.1",
  "smallvec 1.4.1",
- "unsigned-varint 0.4.0",
+ "unsigned-varint 0.5.1",
 ]
 
 [[package]]
@@ -4571,7 +4600,7 @@ dependencies = [
  "ripemd160",
  "rlp",
  "serde",
- "sha3",
+ "sha3 0.8.2",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5164,19 +5193,19 @@ dependencies = [
 
 [[package]]
 name = "parity-multiaddr"
-version = "0.9.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2165a93382a93de55868dcbfa11e4a8f99676a9164eee6a2b4a9479ad319c257"
+checksum = "4c7ad66970bbab360c97179b60906e2dc4aef1f7fca8ab4e5c5db8c97b16814a"
 dependencies = [
  "arrayref",
  "bs58",
- "byteorder 1.3.4",
+ "byteorder",
  "data-encoding",
  "multihash",
  "percent-encoding 2.1.0",
  "serde",
  "static_assertions",
- "unsigned-varint 0.4.0",
+ "unsigned-varint 0.5.1",
  "url 2.1.1",
 ]
 
@@ -5265,7 +5294,7 @@ version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16ad52817c4d343339b3bc2e26861bd21478eda0b7509acf83505727000512ac"
 dependencies = [
- "byteorder 1.3.4",
+ "byteorder",
 ]
 
 [[package]]
@@ -5280,7 +5309,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e02a625dd75084c2a7024f07c575b61b782f729d18702dabb3cdbf31911dc61"
 dependencies = [
- "byteorder 1.3.4",
+ "byteorder",
  "bytes 0.4.12",
  "httparse",
  "log",
@@ -5428,7 +5457,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "006c038a43a45995a9670da19e67600114740e8511d4333bf97a56e66a7542d9"
 dependencies = [
- "byteorder 1.3.4",
+ "byteorder",
  "crypto-mac 0.7.0",
  "rayon",
 ]
@@ -5516,7 +5545,16 @@ version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "12e3a6cdbfe94a5e4572812a0201f8c0ed98c1c452c7b8563ce2276988ef9c17"
 dependencies = [
- "pin-project-internal",
+ "pin-project-internal 0.4.22",
+]
+
+[[package]]
+name = "pin-project"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee41d838744f60d959d7074e3afb6b35c7456d0f61cad38a24e35e6553f73841"
+dependencies = [
+ "pin-project-internal 1.0.1",
 ]
 
 [[package]]
@@ -5530,6 +5568,17 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "pin-project-internal"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81a4ffa594b66bff340084d4081df649a7dc049ac8d7fc458d8e628bfbbb2f86"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "pin-project-lite"
 version = "0.1.7"
@@ -5704,9 +5753,9 @@ checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.19"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12"
+checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
 dependencies = [
  "unicode-xid",
 ]
@@ -5782,7 +5831,7 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f53bc2558e8376358ebdc28301546471d67336584f6438ed4b7c7457a055fd7"
 dependencies = [
- "byteorder 1.3.4",
+ "byteorder",
  "log",
  "parity-wasm 0.41.0",
 ]
@@ -6148,7 +6197,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4"
 dependencies = [
- "byteorder 1.3.4",
+ "byteorder",
  "regex-syntax",
 ]
 
@@ -6322,7 +6371,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020"
 dependencies = [
  "futures 0.3.5",
- "pin-project",
+ "pin-project 0.4.22",
  "static_assertions",
 ]
 
@@ -6343,22 +6392,11 @@ dependencies = [
 
 [[package]]
 name = "salsa20"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2324b0e8c3bb9a586a571fdb3136f70e7e2c748de00a78043f86e0cff91f91fe"
-dependencies = [
- "byteorder 1.3.4",
- "salsa20-core",
- "stream-cipher 0.3.2",
-]
-
-[[package]]
-name = "salsa20-core"
-version = "0.2.3"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fe6cc1b9f5a5867853ade63099de70f042f7679e408d1ffe52821c9248e6e69"
+checksum = "c7f47b10fa80f6969bbbd9c8e7cc998f082979d402a9e10579e2303a87955395"
 dependencies = [
- "stream-cipher 0.3.2",
+ "stream-cipher 0.7.1",
 ]
 
 [[package]]
@@ -6944,7 +6982,7 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "parking_lot 0.10.2",
- "pin-project",
+ "pin-project 0.4.22",
  "rand 0.7.3",
  "sc-block-builder",
  "sc-client-api",
@@ -7089,7 +7127,7 @@ dependencies = [
  "nohash-hasher",
  "parity-scale-codec",
  "parking_lot 0.10.2",
- "pin-project",
+ "pin-project 0.4.22",
  "prost",
  "prost-build",
  "quickcheck",
@@ -7333,7 +7371,7 @@ dependencies = [
  "parity-scale-codec",
  "parity-util-mem",
  "parking_lot 0.10.2",
- "pin-project",
+ "pin-project 0.4.22",
  "rand 0.7.3",
  "sc-block-builder",
  "sc-chain-spec",
@@ -7460,7 +7498,7 @@ dependencies = [
  "libp2p",
  "log",
  "parking_lot 0.10.2",
- "pin-project",
+ "pin-project 0.4.22",
  "rand 0.7.3",
  "serde",
  "slog",
@@ -7563,7 +7601,7 @@ checksum = "021b403afe70d81eea68f6ea12f6b3c9588e5d536a94c3bf80f15e7faa267862"
 dependencies = [
  "arrayref",
  "arrayvec 0.5.1",
- "curve25519-dalek",
+ "curve25519-dalek 2.1.0",
  "getrandom 0.1.14",
  "merlin",
  "rand 0.7.3",
@@ -7796,6 +7834,18 @@ dependencies = [
  "opaque-debug 0.2.3",
 ]
 
+[[package]]
+name = "sha3"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809"
+dependencies = [
+ "block-buffer 0.9.0",
+ "digest 0.9.0",
+ "keccak",
+ "opaque-debug 0.3.0",
+]
+
 [[package]]
 name = "sharded-slab"
 version = "0.0.9"
@@ -7907,7 +7957,7 @@ dependencies = [
  "rustc_version",
  "sha2 0.9.1",
  "subtle 2.2.3",
- "x25519-dalek",
+ "x25519-dalek 0.6.0",
 ]
 
 [[package]]
@@ -8194,7 +8244,7 @@ version = "2.0.0"
 dependencies = [
  "base58",
  "blake2-rfc",
- "byteorder 1.3.4",
+ "byteorder",
  "criterion",
  "dyn-clonable",
  "ed25519-dalek",
@@ -8723,19 +8773,20 @@ dependencies = [
 
 [[package]]
 name = "stream-cipher"
-version = "0.3.2"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8131256a5896cabcf5eb04f4d6dacbe1aefda854b0d9896e09cb58829ec5638c"
+checksum = "09f8ed9974042b8c3672ff3030a69fcc03b74c47c3d1ecb7755e8a3626011e88"
 dependencies = [
- "generic-array 0.12.3",
+ "generic-array 0.14.3",
 ]
 
 [[package]]
 name = "stream-cipher"
-version = "0.4.1"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09f8ed9974042b8c3672ff3030a69fcc03b74c47c3d1ecb7755e8a3626011e88"
+checksum = "c80e15f898d8d8f25db24c253ea615cc14acf418ff307822995814e7d42cfa89"
 dependencies = [
+ "block-cipher 0.8.0",
  "generic-array 0.14.3",
 ]
 
@@ -9090,9 +9141,9 @@ checksum = "502d53007c02d7605a05df1c1a73ee436952781653da5d0bf57ad608f66932c1"
 
 [[package]]
 name = "syn"
-version = "1.0.35"
+version = "1.0.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb7f4c519df8c117855e19dd8cc851e89eb746fe7a73f0157e0d95fdec5369b0"
+checksum = "e03e57e4fcbfe7749842d53e24ccb9aa12b7252dbe5e91d2acad31834c8b8fdd"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9619,7 +9670,7 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c"
 dependencies = [
- "pin-project",
+ "pin-project 0.4.22",
  "tracing",
 ]
 
@@ -9747,7 +9798,7 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3bfd5b7557925ce778ff9b9ef90e3ade34c524b5ff10e239c69a42d546d2af56"
 dependencies = [
- "rand 0.7.3",
+ "rand 0.3.23",
 ]
 
 [[package]]
@@ -9768,7 +9819,7 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "173cd16430c206dc1a430af8a89a0e9c076cf15cb42b4aedb10e8cc8fee73681"
 dependencies = [
- "byteorder 1.3.4",
+ "byteorder",
  "crunchy",
  "rustc-hex",
  "static_assertions",
@@ -9853,8 +9904,10 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7fdeedbf205afadfe39ae559b75c3240f24e257d0ca27e85f85cb82aa19ac35"
 dependencies = [
+ "bytes 0.5.6",
  "futures-io",
  "futures-util",
+ "futures_codec",
 ]
 
 [[package]]
@@ -10318,18 +10371,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91cd5736df7f12a964a5067a12c62fa38e1bd8080aff1f80bc29be7c80d19ab4"
-dependencies = [
- "webpki",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8eff4b7516a57307f9349c64bf34caa34b940b66fed4b2fb3136cb7386e5739"
+checksum = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f"
 dependencies = [
  "webpki",
 ]
@@ -10411,7 +10455,18 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "637ff90c9540fa3073bb577e65033069e4bae7c79d49d74aa3ffdf5342a53217"
 dependencies = [
- "curve25519-dalek",
+ "curve25519-dalek 2.1.0",
+ "rand_core 0.5.1",
+ "zeroize",
+]
+
+[[package]]
+name = "x25519-dalek"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc614d95359fd7afc321b66d2107ede58b246b844cf5d8a0adcca413e439f088"
+dependencies = [
+ "curve25519-dalek 3.0.0",
  "rand_core 0.5.1",
  "zeroize",
 ]
diff --git a/bin/node/browser-testing/Cargo.toml b/bin/node/browser-testing/Cargo.toml
index 13d6e057a1e1..c90c4a293f49 100644
--- a/bin/node/browser-testing/Cargo.toml
+++ b/bin/node/browser-testing/Cargo.toml
@@ -8,7 +8,7 @@ license = "Apache-2.0"
 
 [dependencies]
 futures-timer = "3.0.2"
-libp2p = { version = "0.28.1", default-features = false }
+libp2p = { version = "0.29.1", default-features = false }
 jsonrpc-core = "15.0.0"
 serde = "1.0.106"
 serde_json = "1.0.48"
diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml
index 3b60136eacda..ff6c26bbee53 100644
--- a/client/authority-discovery/Cargo.toml
+++ b/client/authority-discovery/Cargo.toml
@@ -24,7 +24,7 @@ derive_more = "0.99.2"
 either = "1.5.3"
 futures = "0.3.4"
 futures-timer = "3.0.1"
-libp2p = { version = "0.28.1", default-features = false, features = ["kad"] }
+libp2p = { version = "0.29.1", default-features = false, features = ["kad"] }
 log = "0.4.8"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.8.0"}
 prost = "0.6.1"
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index 33fc39f8217e..b7e798a3ba1c 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -20,7 +20,7 @@ ansi_term = "0.12.1"
 tokio = { version = "0.2.21", features = [ "signal", "rt-core", "rt-threaded", "blocking" ] }
 futures = "0.3.4"
 fdlimit = "0.2.1"
-libp2p = "0.28.1"
+libp2p = "0.29.1"
 parity-scale-codec = "1.3.0"
 hex = "0.4.2"
 rand = "0.7.3"
diff --git a/client/network-gossip/Cargo.toml b/client/network-gossip/Cargo.toml
index 36f877da9adf..94d9272f4bbd 100644
--- a/client/network-gossip/Cargo.toml
+++ b/client/network-gossip/Cargo.toml
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 futures = "0.3.4"
 futures-timer = "3.0.1"
-libp2p = { version = "0.28.1", default-features = false }
+libp2p = { version = "0.29.1", default-features = false }
 log = "0.4.8"
 lru = "0.4.3"
 sc-network = { version = "0.8.0", path = "../network" }
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index af0e2a2dc10f..f5ebee39db56 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -64,13 +64,13 @@ wasm-timer = "0.2"
 zeroize = "1.0.0"
 
 [dependencies.libp2p]
-version = "0.28.1"
+version = "0.29.1"
 default-features = false
 features = ["identify", "kad", "mdns-async-std", "mplex", "noise", "ping", "request-response", "tcp-async-std", "websocket", "yamux"]
 
 [dev-dependencies]
 assert_matches = "1.3"
-libp2p = { version = "0.28.1", default-features = false }
+libp2p = { version = "0.29.1", default-features = false }
 quickcheck = "0.9.0"
 rand = "0.7.2"
 sp-keyring = { version = "2.0.0", path = "../../primitives/keyring" }
diff --git a/client/network/src/discovery.rs b/client/network/src/discovery.rs
index ab9ee2d4dba0..f9bda6aabf5f 100644
--- a/client/network/src/discovery.rs
+++ b/client/network/src/discovery.rs
@@ -816,7 +816,8 @@ mod tests {
 			let transport = MemoryTransport
 				.upgrade(upgrade::Version::V1)
 				.authenticate(noise::NoiseConfig::xx(noise_keys).into_authenticated())
-				.multiplex(yamux::Config::default());
+				.multiplex(yamux::Config::default())
+				.boxed();
 
 			let behaviour = {
 				let mut config = DiscoveryConfig::new(keypair.public());
diff --git a/client/network/src/light_client_handler.rs b/client/network/src/light_client_handler.rs
index d1c407c99695..e7c5e9c1c9b9 100644
--- a/client/network/src/light_client_handler.rs
+++ b/client/network/src/light_client_handler.rs
@@ -1316,7 +1316,7 @@ mod tests {
 			connection::ConnectionId,
 			identity,
 			muxing::{StreamMuxerBox, SubstreamRef},
-			transport::{Transport, boxed::Boxed, memory::MemoryTransport},
+			transport::{Transport, Boxed, memory::MemoryTransport},
 			upgrade
 		},
 		noise::{self, Keypair, X25519, NoiseConfig},
@@ -1356,8 +1356,6 @@ mod tests {
 			.upgrade(upgrade::Version::V1)
 			.authenticate(NoiseConfig::xx(dh_key).into_authenticated())
 			.multiplex(yamux::Config::default())
-			.map(|(peer, muxer), _| (peer, StreamMuxerBox::new(muxer)))
-			.map_err(|e| io::Error::new(io::ErrorKind::Other, e))
 			.boxed();
 		Swarm::new(transport, LightClientHandler::new(cf, client, checker, ps), local_peer)
 	}
diff --git a/client/network/src/protocol/generic_proto/tests.rs b/client/network/src/protocol/generic_proto/tests.rs
index d604645d4ac8..7a040a403af7 100644
--- a/client/network/src/protocol/generic_proto/tests.rs
+++ b/client/network/src/protocol/generic_proto/tests.rs
@@ -23,7 +23,6 @@ use libp2p::{PeerId, Multiaddr, Transport};
 use libp2p::core::{
 	connection::{ConnectionId, ListenerId},
 	ConnectedPoint,
-	muxing,
 	transport::MemoryTransport,
 	upgrade
 };
@@ -56,9 +55,7 @@ fn build_nodes() -> (Swarm<CustomProtoWithAddr>, Swarm<CustomProtoWithAddr>) {
 			.upgrade(upgrade::Version::V1)
 			.authenticate(noise::NoiseConfig::xx(noise_keys).into_authenticated())
 			.multiplex(yamux::Config::default())
-			.map(|(peer, muxer), _| (peer, muxing::StreamMuxerBox::new(muxer)))
 			.timeout(Duration::from_secs(20))
-			.map_err(|err| io::Error::new(io::ErrorKind::Other, err))
 			.boxed();
 
 		let (peerset, _) = sc_peerset::Peerset::from_config(sc_peerset::PeersetConfig {
diff --git a/client/network/src/request_responses.rs b/client/network/src/request_responses.rs
index 5141e6db7014..5e414248674f 100644
--- a/client/network/src/request_responses.rs
+++ b/client/network/src/request_responses.rs
@@ -680,7 +680,8 @@ mod tests {
 				let transport = MemoryTransport
 					.upgrade(upgrade::Version::V1)
 					.authenticate(noise::NoiseConfig::xx(noise_keys).into_authenticated())
-					.multiplex(libp2p::yamux::Config::default());
+					.multiplex(libp2p::yamux::Config::default())
+					.boxed();
 
 				let behaviour = {
 					let (tx, mut rx) = mpsc::channel(64);
@@ -782,7 +783,8 @@ mod tests {
 				let transport = MemoryTransport
 					.upgrade(upgrade::Version::V1)
 					.authenticate(noise::NoiseConfig::xx(noise_keys).into_authenticated())
-					.multiplex(libp2p::yamux::Config::default());
+					.multiplex(libp2p::yamux::Config::default())
+					.boxed();
 
 				let behaviour = {
 					let (tx, mut rx) = mpsc::channel(64);
diff --git a/client/network/src/transport.rs b/client/network/src/transport.rs
index 10b374a4f256..80d897633fd7 100644
--- a/client/network/src/transport.rs
+++ b/client/network/src/transport.rs
@@ -19,14 +19,14 @@
 use libp2p::{
 	InboundUpgradeExt, OutboundUpgradeExt, PeerId, Transport,
 	core::{
-		self, either::EitherOutput, muxing::StreamMuxerBox,
-		transport::{boxed::Boxed, OptionalTransport}, upgrade
+		self, either::{EitherOutput, EitherTransport}, muxing::StreamMuxerBox,
+		transport::{Boxed, OptionalTransport}, upgrade
 	},
 	mplex, identity, bandwidth, wasm_ext, noise
 };
 #[cfg(not(target_os = "unknown"))]
 use libp2p::{tcp, dns, websocket};
-use std::{io, sync::Arc, time::Duration};
+use std::{sync::Arc, time::Duration};
 
 pub use self::bandwidth::BandwidthSinks;
 
@@ -41,7 +41,7 @@ pub fn build_transport(
 	keypair: identity::Keypair,
 	memory_only: bool,
 	wasm_external_transport: Option<wasm_ext::ExtTransport>,
-) -> (Boxed<(PeerId, StreamMuxerBox), io::Error>, Arc<BandwidthSinks>) {
+) -> (Boxed<(PeerId, StreamMuxerBox)>, Arc<BandwidthSinks>) {
 	// Build the base layer of the transport.
 	let transport = if let Some(t) = wasm_external_transport {
 		OptionalTransport::some(t)
@@ -54,9 +54,9 @@ pub fn build_transport(
 		let desktop_trans = websocket::WsConfig::new(desktop_trans.clone())
 			.or_transport(desktop_trans);
 		OptionalTransport::some(if let Ok(dns) = dns::DnsConfig::new(desktop_trans.clone()) {
-			dns.boxed()
+			EitherTransport::Left(dns)
 		} else {
-			desktop_trans.map_err(dns::DnsErr::Underlying).boxed()
+			EitherTransport::Right(desktop_trans.map_err(dns::DnsErr::Underlying))
 		})
 	} else {
 		OptionalTransport::none()
@@ -113,15 +113,12 @@ pub fn build_transport(
 		yamux_config.set_window_update_mode(libp2p::yamux::WindowUpdateMode::OnRead);
 
 		core::upgrade::SelectUpgrade::new(yamux_config, mplex_config)
-			.map_inbound(move |muxer| core::muxing::StreamMuxerBox::new(muxer))
-			.map_outbound(move |muxer| core::muxing::StreamMuxerBox::new(muxer))
 	};
 
 	let transport = transport.upgrade(upgrade::Version::V1)
 		.authenticate(authentication_config)
 		.multiplex(multiplexing_config)
 		.timeout(Duration::from_secs(20))
-		.map_err(|err| io::Error::new(io::ErrorKind::Other, err))
 		.boxed();
 
 	(transport, bandwidth)
diff --git a/client/network/test/Cargo.toml b/client/network/test/Cargo.toml
index 26e1631d9f1a..a8bf98a75ed6 100644
--- a/client/network/test/Cargo.toml
+++ b/client/network/test/Cargo.toml
@@ -19,7 +19,7 @@ parking_lot = "0.10.0"
 futures = "0.3.4"
 futures-timer = "3.0.1"
 rand = "0.7.2"
-libp2p = { version = "0.28.1", default-features = false }
+libp2p = { version = "0.29.1", default-features = false }
 sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
 sc-consensus = { version = "0.8.0", path = "../../../client/consensus/common" }
 sc-client-api = { version = "2.0.0", path = "../../api" }
diff --git a/client/peerset/Cargo.toml b/client/peerset/Cargo.toml
index 40062db8f9b9..459f4a930204 100644
--- a/client/peerset/Cargo.toml
+++ b/client/peerset/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 futures = "0.3.4"
-libp2p = { version = "0.28.1", default-features = false }
+libp2p = { version = "0.29.1", default-features = false }
 sp-utils = { version = "2.0.0", path = "../../primitives/utils"}
 log = "0.4.8"
 serde_json = "1.0.41"
diff --git a/client/telemetry/Cargo.toml b/client/telemetry/Cargo.toml
index be7c88f68ae7..18812a8c71e4 100644
--- a/client/telemetry/Cargo.toml
+++ b/client/telemetry/Cargo.toml
@@ -19,7 +19,7 @@ parking_lot = "0.10.0"
 futures = "0.3.4"
 futures-timer = "3.0.1"
 wasm-timer = "0.2.0"
-libp2p = { version = "0.28.1", default-features = false, features = ["dns", "tcp-async-std", "wasm-ext", "websocket"] }
+libp2p = { version = "0.29.1", default-features = false, features = ["dns", "tcp-async-std", "wasm-ext", "websocket"] }
 log = "0.4.8"
 pin-project = "0.4.6"
 rand = "0.7.2"
diff --git a/client/telemetry/src/worker.rs b/client/telemetry/src/worker.rs
index e01ac62d12dc..a01ab89e7dde 100644
--- a/client/telemetry/src/worker.rs
+++ b/client/telemetry/src/worker.rs
@@ -29,7 +29,12 @@
 //!
 
 use futures::{prelude::*, ready};
-use libp2p::{core::transport::OptionalTransport, Multiaddr, Transport, wasm_ext};
+use libp2p::{
+	core::transport::{OptionalTransport, timeout::TransportTimeout},
+	Multiaddr,
+	Transport,
+	wasm_ext
+};
 use log::{trace, warn, error};
 use slog::Drain;
 use std::{io, pin::Pin, task::Context, task::Poll, time};
@@ -58,13 +63,12 @@ pub struct TelemetryWorker {
 trait StreamAndSink<I>: Stream + Sink<I> {}
 impl<T: ?Sized + Stream + Sink<I>, I> StreamAndSink<I> for T {}
 
-type WsTrans = libp2p::core::transport::boxed::Boxed<
+type WsTrans = libp2p::core::transport::Boxed<
 	Pin<Box<dyn StreamAndSink<
 		Vec<u8>,
 		Item = Result<Vec<u8>, io::Error>,
 		Error = io::Error
-	> + Send>>,
-	io::Error
+	> + Send>>
 >;
 
 impl TelemetryWorker {
@@ -101,16 +105,15 @@ impl TelemetryWorker {
 				})
 		});
 
-		let transport = transport
-			.timeout(CONNECT_TIMEOUT)
-			.map_err(|err| io::Error::new(io::ErrorKind::Other, err))
-			.map(|out, _| {
+		let transport = TransportTimeout::new(
+			transport.map(|out, _| {
 				let out = out
 					.map_err(|err| io::Error::new(io::ErrorKind::Other, err))
 					.sink_map_err(|err| io::Error::new(io::ErrorKind::Other, err));
 				Box::pin(out) as Pin<Box<_>>
-			})
-			.boxed();
+			}),
+			CONNECT_TIMEOUT
+		).boxed();
 
 		Ok(TelemetryWorker {
 			nodes: endpoints.into_iter().map(|(addr, verbosity)| {
diff --git a/primitives/consensus/common/Cargo.toml b/primitives/consensus/common/Cargo.toml
index 9ce5460d8d8d..db85244dcfa8 100644
--- a/primitives/consensus/common/Cargo.toml
+++ b/primitives/consensus/common/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 thiserror = "1.0.21"
-libp2p = { version = "0.28.1", default-features = false }
+libp2p = { version = "0.29.1", default-features = false }
 log = "0.4.8"
 sp-core = { path= "../../core", version = "2.0.0"}
 sp-inherents = { version = "2.0.0", path = "../../inherents" }
diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml
index a97b8af15640..1757bb4e0d52 100644
--- a/primitives/core/Cargo.toml
+++ b/primitives/core/Cargo.toml
@@ -42,7 +42,7 @@ dyn-clonable = { version = "0.9.0", optional = true }
 thiserror = { version = "1.0.21", optional = true }
 
 # full crypto
-ed25519-dalek = { version = "1.0.0-pre.4", default-features = false, features = ["u64_backend", "alloc"], optional = true }
+ed25519-dalek = { version = "1.0.1", default-features = false, features = ["u64_backend", "alloc"], optional = true }
 blake2-rfc = { version = "0.2.18", default-features = false, optional = true }
 tiny-keccak = { version = "2.0.1", features = ["keccak"], optional = true }
 schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated", "u64_backend"], default-features = false, optional = true }
diff --git a/utils/browser/Cargo.toml b/utils/browser/Cargo.toml
index 06e626ef65ff..90668f4e51fe 100644
--- a/utils/browser/Cargo.toml
+++ b/utils/browser/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 futures = { version = "0.3", features = ["compat"] }
 futures01 = { package = "futures", version = "0.1.29" }
 log = "0.4.8"
-libp2p-wasm-ext = { version = "0.22", features = ["websocket"] }
+libp2p-wasm-ext = { version = "0.23", features = ["websocket"] }
 console_error_panic_hook = "0.1.6"
 console_log = "0.1.2"
 js-sys = "0.3.34"

From ba8e8122ab86bb1a8677b004ff4f14626fcc7884 Mon Sep 17 00:00:00 2001
From: Tore19 <289649077@qq.com>
Date: Sun, 1 Nov 2020 20:01:26 +0800
Subject: [PATCH 0044/1194] Add ss58 registration details (#7123)

---
 ss58-registry.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ss58-registry.json b/ss58-registry.json
index d4286145a1fb..4c18e72e9053 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -185,10 +185,10 @@
 			"prefix": 20,
 			"network": "stafi",
 			"displayName": "Stafi",
-			"symbols": null,
-			"decimals": null,
+			"symbols": ["FIS"],
+			"decimals": [12],
 			"standardAccount": "*25519",
-			"website": null
+			"website": "https://stafi.io"
 		},
 		{
 			"prefix": 21,

From c79fbeb67ea81307ba335d16392c7e1e3d2c09f4 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Tue, 3 Nov 2020 10:48:44 +0100
Subject: [PATCH 0045/1194] Fix Session Benchmarks (#7476)

* Always remove validator bfore creating new ones

* remove comment

* update tests and docs
---
 frame/staking/src/benchmarking.rs  | 21 ++++++++++-----------
 frame/staking/src/testing_utils.rs | 11 +++++++++++
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/frame/staking/src/benchmarking.rs b/frame/staking/src/benchmarking.rs
index d2f769b06943..94a97debe4ff 100644
--- a/frame/staking/src/benchmarking.rs
+++ b/frame/staking/src/benchmarking.rs
@@ -45,14 +45,17 @@ fn add_slashing_spans<T: Trait>(who: &T::AccountId, spans: u32) {
 	SlashingSpans::<T>::insert(who, slashing_spans);
 }
 
-// This function generates one validator being nominated by n nominators, and returns the validator
-// stash account and the nominators' stash and controller. It also starts an era and creates pending payouts.
+// This function clears all existing validators and nominators from the set, and generates one new
+// validator being nominated by n nominators, and returns the validator stash account and the
+// nominators' stash and controller. It also starts an era and creates pending payouts.
 pub fn create_validator_with_nominators<T: Trait>(
 	n: u32,
 	upper_bound: u32,
 	dead: bool,
 	destination: RewardDestination<T::AccountId>
 ) -> Result<(T::AccountId, Vec<(T::AccountId, T::AccountId)>), &'static str> {
+	// Clean up any existing state.
+	clear_validators_and_nominators::<T>();
 	let mut points_total = 0;
 	let mut points_individual = Vec::new();
 
@@ -286,8 +289,6 @@ benchmarks! {
 
 	payout_stakers_dead_controller {
 		let n in 1 .. T::MaxNominatorRewardedPerValidator::get() as u32;
-		// Clean up existing validators
-		Validators::<T>::remove_all();
 		let (validator, nominators) = create_validator_with_nominators::<T>(
 			n,
 			T::MaxNominatorRewardedPerValidator::get() as u32,
@@ -321,8 +322,6 @@ benchmarks! {
 
 	payout_stakers_alive_staked {
 		let n in 1 .. T::MaxNominatorRewardedPerValidator::get() as u32;
-		// Clean up existing validators
-		Validators::<T>::remove_all();
 		let (validator, nominators) = create_validator_with_nominators::<T>(
 			n,
 			T::MaxNominatorRewardedPerValidator::get() as u32,
@@ -708,7 +707,7 @@ mod tests {
 
 	#[test]
 	fn create_validators_with_nominators_for_era_works() {
-		ExtBuilder::default().has_stakers(false).build().execute_with(|| {
+		ExtBuilder::default().has_stakers(true).build().execute_with(|| {
 			let v = 10;
 			let n = 100;
 
@@ -725,7 +724,7 @@ mod tests {
 
 	#[test]
 	fn create_validator_with_nominators_works() {
-		ExtBuilder::default().has_stakers(false).build().execute_with(|| {
+		ExtBuilder::default().has_stakers(true).build().execute_with(|| {
 			let n = 10;
 
 			let (validator_stash, nominators) = create_validator_with_nominators::<Test>(
@@ -749,7 +748,7 @@ mod tests {
 
 	#[test]
 	fn add_slashing_spans_works() {
-		ExtBuilder::default().has_stakers(false).build().execute_with(|| {
+		ExtBuilder::default().has_stakers(true).build().execute_with(|| {
 			let n = 10;
 
 			let (validator_stash, _nominators) = create_validator_with_nominators::<Test>(
@@ -780,7 +779,7 @@ mod tests {
 
 	#[test]
 	fn test_payout_all() {
-		ExtBuilder::default().has_stakers(false).build().execute_with(|| {
+		ExtBuilder::default().has_stakers(true).build().execute_with(|| {
 			let v = 10;
 			let n = 100;
 
@@ -799,7 +798,7 @@ mod tests {
 
 	#[test]
 	fn test_benchmarks() {
-		ExtBuilder::default().has_stakers(false).build().execute_with(|| {
+		ExtBuilder::default().has_stakers(true).build().execute_with(|| {
 			assert_ok!(test_benchmark_bond::<Test>());
 			assert_ok!(test_benchmark_bond_extra::<Test>());
 			assert_ok!(test_benchmark_unbond::<Test>());
diff --git a/frame/staking/src/testing_utils.rs b/frame/staking/src/testing_utils.rs
index 57ad95bcf586..25cfffeac2c1 100644
--- a/frame/staking/src/testing_utils.rs
+++ b/frame/staking/src/testing_utils.rs
@@ -28,6 +28,12 @@ use sp_npos_elections::*;
 
 const SEED: u32 = 0;
 
+/// This function removes all validators and nominators from storage.
+pub fn clear_validators_and_nominators<T: Trait>() {
+	Validators::<T>::remove_all();
+	Nominators::<T>::remove_all();
+}
+
 /// Grab a funded user.
 pub fn create_funded_user<T: Trait>(
 	string: &'static str,
@@ -97,6 +103,9 @@ pub fn create_validators<T: Trait>(
 /// This function generates validators and nominators who are randomly nominating
 /// `edge_per_nominator` random validators (until `to_nominate` if provided).
 ///
+/// NOTE: This function will remove any existing validators or nominators to ensure
+/// we are working with a clean state.
+///
 /// Parameters:
 /// - `validators`: number of bonded validators
 /// - `nominators`: number of bonded nominators.
@@ -113,6 +122,8 @@ pub fn create_validators_with_nominators_for_era<T: Trait>(
 	randomize_stake: bool,
 	to_nominate: Option<u32>,
 ) -> Result<Vec<<T::Lookup as StaticLookup>::Source>, &'static str> {
+	clear_validators_and_nominators::<T>();
+
 	let mut validators_stash: Vec<<T::Lookup as StaticLookup>::Source>
 		= Vec::with_capacity(validators as usize);
 	let mut rng = ChaChaRng::from_seed(SEED.using_encoded(blake2_256));

From 9d2b91f202ecba23fea3272e0d632ec626f5c682 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Tue, 3 Nov 2020 11:08:36 +0100
Subject: [PATCH 0046/1194] Introduce storage types, to builds abstraction on
 storage (to be used in pallet attribute macro) (#7278)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* introduce storage types

* fix line width

* improve doc

* typo

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* remove redundant function

* some more doc improvment

* disallow: some value on empty with option query

tests are update to still test default value is used when it is supposed
to be used.

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 frame/support/src/hash.rs                     |   8 +
 frame/support/src/storage/mod.rs              |   1 +
 frame/support/src/storage/types/double_map.rs | 603 ++++++++++++++++++
 frame/support/src/storage/types/map.rs        | 481 ++++++++++++++
 frame/support/src/storage/types/mod.rs        | 108 ++++
 frame/support/src/storage/types/value.rs      | 282 ++++++++
 frame/support/src/traits.rs                   |  18 +
 7 files changed, 1501 insertions(+)
 create mode 100644 frame/support/src/storage/types/double_map.rs
 create mode 100644 frame/support/src/storage/types/map.rs
 create mode 100644 frame/support/src/storage/types/mod.rs
 create mode 100644 frame/support/src/storage/types/value.rs

diff --git a/frame/support/src/hash.rs b/frame/support/src/hash.rs
index a5de205863d5..147a63013806 100644
--- a/frame/support/src/hash.rs
+++ b/frame/support/src/hash.rs
@@ -56,6 +56,7 @@ impl<T: Codec> Hashable for T {
 
 /// Hasher to use to hash keys to insert to storage.
 pub trait StorageHasher: 'static {
+	const METADATA: frame_metadata::StorageHasher;
 	type Output: AsRef<[u8]>;
 	fn hash(x: &[u8]) -> Self::Output;
 }
@@ -73,6 +74,7 @@ pub trait ReversibleStorageHasher: StorageHasher {
 /// Store the key directly.
 pub struct Identity;
 impl StorageHasher for Identity {
+	const METADATA: frame_metadata::StorageHasher = frame_metadata::StorageHasher::Identity;
 	type Output = Vec<u8>;
 	fn hash(x: &[u8]) -> Vec<u8> {
 		x.to_vec()
@@ -87,6 +89,7 @@ impl ReversibleStorageHasher for Identity {
 /// Hash storage keys with `concat(twox64(key), key)`
 pub struct Twox64Concat;
 impl StorageHasher for Twox64Concat {
+	const METADATA: frame_metadata::StorageHasher = frame_metadata::StorageHasher::Twox64Concat;
 	type Output = Vec<u8>;
 	fn hash(x: &[u8]) -> Vec<u8> {
 		twox_64(x)
@@ -109,6 +112,7 @@ impl ReversibleStorageHasher for Twox64Concat {
 /// Hash storage keys with `concat(blake2_128(key), key)`
 pub struct Blake2_128Concat;
 impl StorageHasher for Blake2_128Concat {
+	const METADATA: frame_metadata::StorageHasher = frame_metadata::StorageHasher::Blake2_128Concat;
 	type Output = Vec<u8>;
 	fn hash(x: &[u8]) -> Vec<u8> {
 		blake2_128(x)
@@ -131,6 +135,7 @@ impl ReversibleStorageHasher for Blake2_128Concat {
 /// Hash storage keys with blake2 128
 pub struct Blake2_128;
 impl StorageHasher for Blake2_128 {
+	const METADATA: frame_metadata::StorageHasher = frame_metadata::StorageHasher::Blake2_128;
 	type Output = [u8; 16];
 	fn hash(x: &[u8]) -> [u8; 16] {
 		blake2_128(x)
@@ -140,6 +145,7 @@ impl StorageHasher for Blake2_128 {
 /// Hash storage keys with blake2 256
 pub struct Blake2_256;
 impl StorageHasher for Blake2_256 {
+	const METADATA: frame_metadata::StorageHasher = frame_metadata::StorageHasher::Blake2_256;
 	type Output = [u8; 32];
 	fn hash(x: &[u8]) -> [u8; 32] {
 		blake2_256(x)
@@ -149,6 +155,7 @@ impl StorageHasher for Blake2_256 {
 /// Hash storage keys with twox 128
 pub struct Twox128;
 impl StorageHasher for Twox128 {
+	const METADATA: frame_metadata::StorageHasher = frame_metadata::StorageHasher::Twox128;
 	type Output = [u8; 16];
 	fn hash(x: &[u8]) -> [u8; 16] {
 		twox_128(x)
@@ -158,6 +165,7 @@ impl StorageHasher for Twox128 {
 /// Hash storage keys with twox 256
 pub struct Twox256;
 impl StorageHasher for Twox256 {
+	const METADATA: frame_metadata::StorageHasher = frame_metadata::StorageHasher::Twox256;
 	type Output = [u8; 32];
 	fn hash(x: &[u8]) -> [u8; 32] {
 		twox_256(x)
diff --git a/frame/support/src/storage/mod.rs b/frame/support/src/storage/mod.rs
index 97c1eabe6d39..302f176ef4a8 100644
--- a/frame/support/src/storage/mod.rs
+++ b/frame/support/src/storage/mod.rs
@@ -29,6 +29,7 @@ pub mod child;
 #[doc(hidden)]
 pub mod generator;
 pub mod migration;
+pub mod types;
 
 #[cfg(all(feature = "std", any(test, debug_assertions)))]
 mod debug_helper {
diff --git a/frame/support/src/storage/types/double_map.rs b/frame/support/src/storage/types/double_map.rs
new file mode 100644
index 000000000000..8e315cef85cb
--- /dev/null
+++ b/frame/support/src/storage/types/double_map.rs
@@ -0,0 +1,603 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Storage map type. Implements StorageDoubleMap, StorageIterableDoubleMap,
+//! StoragePrefixedDoubleMap traits and their methods directly.
+
+use codec::{FullCodec, Decode, EncodeLike, Encode};
+use crate::{
+	storage::{
+		StorageAppend, StorageDecodeLength,
+		types::{OptionQuery, QueryKindTrait, OnEmptyGetter},
+	},
+	traits::{GetDefault, StorageInstance},
+};
+use frame_metadata::{DefaultByteGetter, StorageEntryModifier};
+use sp_std::vec::Vec;
+
+/// A type that allow to store values for `(key1, key2)` couple. Similar to `StorageMap` but allow
+/// to iterate and remove value associated to first key.
+///
+/// Each value is stored at:
+/// ```nocompile
+/// Twox128(<Prefix::Pallet as PalletInfo>::name())
+///		++ Twox128(Prefix::STORAGE_PREFIX)
+///		++ Hasher1(encode(key1))
+///		++ Hasher2(encode(key2))
+/// ```
+///
+/// # Warning
+///
+/// If the key1s (or key2s) are not trusted (e.g. can be set by a user), a cryptographic `hasher`
+/// such as `blake2_128_concat` must be used for Hasher1 (resp. Hasher2). Otherwise, other values
+/// in storage can be compromised.
+pub struct StorageDoubleMap<
+	Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind=OptionQuery, OnEmpty=GetDefault
+>(
+	core::marker::PhantomData<(Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty)>
+);
+
+impl<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty>
+	crate::storage::generator::StorageDoubleMap<Key1, Key2, Value> for
+	StorageDoubleMap<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty>
+where
+	Prefix: StorageInstance,
+	Hasher1: crate::hash::StorageHasher,
+	Hasher2: crate::hash::StorageHasher,
+	Key1: FullCodec,
+	Key2: FullCodec,
+	Value: FullCodec,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static
+{
+	type Query = QueryKind::Query;
+	type Hasher1 = Hasher1;
+	type Hasher2 = Hasher2;
+	fn module_prefix() -> &'static [u8] {
+		<Prefix::PalletInfo as crate::traits::PalletInfo>::name::<Prefix::Pallet>()
+			.expect("Every active pallet has a name in the runtime; qed").as_bytes()
+	}
+	fn storage_prefix() -> &'static [u8] {
+		Prefix::STORAGE_PREFIX.as_bytes()
+	}
+	fn from_optional_value_to_query(v: Option<Value>) -> Self::Query {
+		QueryKind::from_optional_value_to_query(v)
+	}
+	fn from_query_to_optional_value(v: Self::Query) -> Option<Value> {
+		QueryKind::from_query_to_optional_value(v)
+	}
+}
+
+impl<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty>
+	crate::storage::StoragePrefixedMap<Value> for
+	StorageDoubleMap<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty>
+where
+	Prefix: StorageInstance,
+	Hasher1: crate::hash::StorageHasher,
+	Hasher2: crate::hash::StorageHasher,
+	Key1: FullCodec,
+	Key2: FullCodec,
+	Value: FullCodec,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static
+{
+	fn module_prefix() -> &'static [u8] {
+		<Self as crate::storage::generator::StorageDoubleMap<Key1, Key2, Value>>::module_prefix()
+	}
+	fn storage_prefix() -> &'static [u8] {
+		<Self as crate::storage::generator::StorageDoubleMap<Key1, Key2, Value>>::storage_prefix()
+	}
+}
+
+impl<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty>
+	StorageDoubleMap<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty>
+where
+	Prefix: StorageInstance,
+	Hasher1: crate::hash::StorageHasher,
+	Hasher2: crate::hash::StorageHasher,
+	Key1: FullCodec,
+	Key2: FullCodec,
+	Value: FullCodec,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static
+{
+	/// Get the storage key used to fetch a value corresponding to a specific key.
+	pub fn hashed_key_for<KArg1, KArg2>(k1: KArg1, k2: KArg2) -> Vec<u8>
+	where
+		KArg1: EncodeLike<Key1>,
+		KArg2: EncodeLike<Key2>,
+	{
+		<Self as crate::storage::StorageDoubleMap<Key1, Key2, Value>>::hashed_key_for(k1, k2)
+	}
+
+	/// Does the value (explicitly) exist in storage?
+	pub fn contains_key<KArg1, KArg2>(k1: KArg1, k2: KArg2) -> bool
+	where
+		KArg1: EncodeLike<Key1>,
+		KArg2: EncodeLike<Key2>,
+	{
+		<Self as crate::storage::StorageDoubleMap<Key1, Key2, Value>>::contains_key(k1, k2)
+	}
+
+	/// Load the value associated with the given key from the double map.
+	pub fn get<KArg1, KArg2>(k1: KArg1, k2: KArg2) -> QueryKind::Query
+	where
+		KArg1: EncodeLike<Key1>,
+		KArg2: EncodeLike<Key2>,
+	{
+		<Self as crate::storage::StorageDoubleMap<Key1, Key2, Value>>::get(k1, k2)
+	}
+
+	/// Take a value from storage, removing it afterwards.
+	pub fn take<KArg1, KArg2>(k1: KArg1, k2: KArg2) -> QueryKind::Query
+	where
+		KArg1: EncodeLike<Key1>,
+		KArg2: EncodeLike<Key2>,
+	{
+		<Self as crate::storage::StorageDoubleMap<Key1, Key2, Value>>::take(k1, k2)
+	}
+
+	/// Swap the values of two key-pairs.
+	pub fn swap<XKArg1, XKArg2, YKArg1, YKArg2>(x_k1: XKArg1, x_k2: XKArg2, y_k1: YKArg1, y_k2: YKArg2)
+	where
+		XKArg1: EncodeLike<Key1>,
+		XKArg2: EncodeLike<Key2>,
+		YKArg1: EncodeLike<Key1>,
+		YKArg2: EncodeLike<Key2>,
+	{
+		<Self as crate::storage::StorageDoubleMap<Key1, Key2, Value>>::swap(x_k1, x_k2, y_k1, y_k2)
+	}
+
+	/// Store a value to be associated with the given keys from the double map.
+	pub fn insert<KArg1, KArg2, VArg>(k1: KArg1, k2: KArg2, val: VArg)
+	where
+		KArg1: EncodeLike<Key1>,
+		KArg2: EncodeLike<Key2>,
+		VArg: EncodeLike<Value>,
+	{
+		<Self as crate::storage::StorageDoubleMap<Key1, Key2, Value>>::insert(k1, k2, val)
+	}
+
+	/// Remove the value under the given keys.
+	pub fn remove<KArg1, KArg2>(k1: KArg1, k2: KArg2)
+	where
+		KArg1: EncodeLike<Key1>,
+		KArg2: EncodeLike<Key2>,
+	{
+		<Self as crate::storage::StorageDoubleMap<Key1, Key2, Value>>::remove(k1, k2)
+	}
+
+	/// Remove all values under the first key.
+	pub fn remove_prefix<KArg1>(k1: KArg1) where KArg1: ?Sized + EncodeLike<Key1> {
+		<Self as crate::storage::StorageDoubleMap<Key1, Key2, Value>>::remove_prefix(k1)
+	}
+
+	/// Iterate over values that share the first key.
+	pub fn iter_prefix_values<KArg1>(k1: KArg1) -> crate::storage::PrefixIterator<Value>
+	where KArg1: ?Sized + EncodeLike<Key1>
+	{
+		<Self as crate::storage::StorageDoubleMap<Key1, Key2, Value>>::iter_prefix_values(k1)
+	}
+
+	/// Mutate the value under the given keys.
+	pub fn mutate<KArg1, KArg2, R, F>(k1: KArg1, k2: KArg2, f: F) -> R
+	where
+		KArg1: EncodeLike<Key1>,
+		KArg2: EncodeLike<Key2>,
+		F: FnOnce(&mut QueryKind::Query) -> R,
+	{
+		<Self as crate::storage::StorageDoubleMap<Key1, Key2, Value>>::mutate(k1, k2, f)
+	}
+
+	/// Mutate the value under the given keys when the closure returns `Ok`.
+	pub fn try_mutate<KArg1, KArg2, R, E, F>(k1: KArg1, k2: KArg2, f: F) -> Result<R, E>
+	where
+		KArg1: EncodeLike<Key1>,
+		KArg2: EncodeLike<Key2>,
+		F: FnOnce(&mut QueryKind::Query) -> Result<R, E>,
+	{
+		<Self as crate::storage::StorageDoubleMap<Key1, Key2, Value>>::try_mutate(k1, k2, f)
+	}
+
+	/// Mutate the value under the given keys. Deletes the item if mutated to a `None`.
+	pub fn mutate_exists<KArg1, KArg2, R, F>(k1: KArg1, k2: KArg2, f: F) -> R
+	where
+		KArg1: EncodeLike<Key1>,
+		KArg2: EncodeLike<Key2>,
+		F: FnOnce(&mut Option<Value>) -> R,
+	{
+		<Self as crate::storage::StorageDoubleMap<Key1, Key2, Value>>::mutate_exists(k1, k2, f)
+	}
+
+	/// Mutate the item, only if an `Ok` value is returned. Deletes the item if mutated to a `None`.
+	pub fn try_mutate_exists<KArg1, KArg2, R, E, F>(k1: KArg1, k2: KArg2, f: F) -> Result<R, E>
+	where
+		KArg1: EncodeLike<Key1>,
+		KArg2: EncodeLike<Key2>,
+		F: FnOnce(&mut Option<Value>) -> Result<R, E>,
+	{
+		<Self as crate::storage::StorageDoubleMap<Key1, Key2, Value>>::try_mutate_exists(k1, k2, f)
+	}
+
+	/// Append the given item to the value in the storage.
+	///
+	/// `Value` is required to implement [`StorageAppend`].
+	///
+	/// # Warning
+	///
+	/// If the storage item is not encoded properly, the storage will be overwritten
+	/// and set to `[item]`. Any default value set for the storage item will be ignored
+	/// on overwrite.
+	pub fn append<Item, EncodeLikeItem, KArg1, KArg2>(
+		k1: KArg1,
+		k2: KArg2,
+		item: EncodeLikeItem,
+	) where
+		KArg1: EncodeLike<Key1>,
+		KArg2: EncodeLike<Key2>,
+		Item: Encode,
+		EncodeLikeItem: EncodeLike<Item>,
+		Value: StorageAppend<Item>,
+	{
+		<Self as crate::storage::StorageDoubleMap<Key1, Key2, Value>>::append(k1, k2, item)
+	}
+
+	/// Read the length of the storage value without decoding the entire value under the
+	/// given `key1` and `key2`.
+	///
+	/// `Value` is required to implement [`StorageDecodeLength`].
+	///
+	/// If the value does not exists or it fails to decode the length, `None` is returned.
+	/// Otherwise `Some(len)` is returned.
+	///
+	/// # Warning
+	///
+	/// `None` does not mean that `get()` does not return a value. The default value is completly
+	/// ignored by this function.
+	pub fn decode_len<KArg1, KArg2>(key1: KArg1, key2: KArg2) -> Option<usize>
+	where
+		KArg1: EncodeLike<Key1>,
+		KArg2: EncodeLike<Key2>,
+		Value: StorageDecodeLength,
+	{
+		<Self as crate::storage::StorageDoubleMap<Key1, Key2, Value>>::decode_len(key1, key2)
+	}
+
+	/// Migrate an item with the given `key1` and `key2` from defunct `OldHasher1` and
+	/// `OldHasher2` to the current hashers.
+	///
+	/// If the key doesn't exist, then it's a no-op. If it does, then it returns its value.
+	pub fn migrate_keys<
+		OldHasher1: crate::StorageHasher,
+		OldHasher2: crate::StorageHasher,
+		KeyArg1: EncodeLike<Key1>,
+		KeyArg2: EncodeLike<Key2>,
+	>(key1: KeyArg1, key2: KeyArg2) -> Option<Value> {
+		<
+			Self as crate::storage::StorageDoubleMap<Key1, Key2, Value>
+		>::migrate_keys::<OldHasher1, OldHasher2, _, _>(key1, key2)
+	}
+
+	/// Remove all value of the storage.
+	pub fn remove_all() {
+		<Self as crate::storage::StoragePrefixedMap<Value>>::remove_all()
+	}
+
+	/// Iter over all value of the storage.
+	///
+	/// NOTE: If a value failed to decode becaues storage is corrupted then it is skipped.
+	pub fn iter_values() -> crate::storage::PrefixIterator<Value> {
+		<Self as crate::storage::StoragePrefixedMap<Value>>::iter_values()
+	}
+
+	/// Translate the values of all elements by a function `f`, in the map in no particular order.
+	/// By returning `None` from `f` for an element, you'll remove it from the map.
+	///
+	/// NOTE: If a value fail to decode because storage is corrupted then it is skipped.
+	///
+	/// # Warning
+	///
+	/// This function must be used with care, before being updated the storage still contains the
+	/// old type, thus other calls (such as `get`) will fail at decoding it.
+	///
+	/// # Usage
+	///
+	/// This would typically be called inside the module implementation of on_runtime_upgrade.
+	pub fn translate_values<OldValue: Decode, F: Fn(OldValue) -> Option<Value>>(f: F) {
+		<Self as crate::storage::StoragePrefixedMap<Value>>::translate_values(f)
+	}
+}
+
+impl<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty>
+	StorageDoubleMap<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty>
+where
+	Prefix: StorageInstance,
+	Hasher1: crate::hash::StorageHasher + crate::ReversibleStorageHasher,
+	Hasher2: crate::hash::StorageHasher + crate::ReversibleStorageHasher,
+	Key1: FullCodec,
+	Key2: FullCodec,
+	Value: FullCodec,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static
+{
+	/// Enumerate all elements in the map with first key `k1` in no particular order.
+	///
+	/// If you add or remove values whose first key is `k1` to the map while doing this, you'll get
+	/// undefined results.
+	pub fn iter_prefix(k1: impl EncodeLike<Key1>) -> crate::storage::PrefixIterator<(Key2, Value)> {
+		<Self as crate::storage::IterableStorageDoubleMap<Key1, Key2, Value>>::iter_prefix(k1)
+	}
+
+	/// Remove all elements from the map with first key `k1` and iterate through them in no
+	/// particular order.
+	///
+	/// If you add elements with first key `k1` to the map while doing this, you'll get undefined
+	/// results.
+	pub fn drain_prefix(k1: impl EncodeLike<Key1>) -> crate::storage::PrefixIterator<(Key2, Value)> {
+		<Self as crate::storage::IterableStorageDoubleMap<Key1, Key2, Value>>::drain_prefix(k1)
+	}
+
+	/// Enumerate all elements in the map in no particular order.
+	///
+	/// If you add or remove values to the map while doing this, you'll get undefined results.
+	pub fn iter() -> crate::storage::PrefixIterator<(Key1, Key2, Value)> {
+		<Self as crate::storage::IterableStorageDoubleMap<Key1, Key2, Value>>::iter()
+	}
+
+	/// Remove all elements from the map and iterate through them in no particular order.
+	///
+	/// If you add elements to the map while doing this, you'll get undefined results.
+	pub fn drain() -> crate::storage::PrefixIterator<(Key1, Key2, Value)> {
+		<Self as crate::storage::IterableStorageDoubleMap<Key1, Key2, Value>>::drain()
+	}
+
+	/// Translate the values of all elements by a function `f`, in the map in no particular order.
+	///
+	/// By returning `None` from `f` for an element, you'll remove it from the map.
+	///
+	/// NOTE: If a value fail to decode because storage is corrupted then it is skipped.
+	pub fn translate<O: Decode, F: Fn(Key1, Key2, O) -> Option<Value>>(f: F) {
+		<Self as crate::storage::IterableStorageDoubleMap<Key1, Key2, Value>>::translate(f)
+	}
+}
+
+/// Part of storage metadata for a storage double map.
+///
+/// NOTE: Generic hashers is supported.
+pub trait StorageDoubleMapMetadata {
+	const MODIFIER: StorageEntryModifier;
+	const NAME: &'static str;
+	const DEFAULT: DefaultByteGetter;
+	const HASHER1: frame_metadata::StorageHasher;
+	const HASHER2: frame_metadata::StorageHasher;
+}
+
+impl<Prefix, Hasher1, Hasher2, Key1, Key2, Value, QueryKind, OnEmpty> StorageDoubleMapMetadata
+	for StorageDoubleMap<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty> where
+	Prefix: StorageInstance,
+	Hasher1: crate::hash::StorageHasher,
+	Hasher2: crate::hash::StorageHasher,
+	Key1: FullCodec,
+	Key2: FullCodec,
+	Value: FullCodec,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static
+{
+	const MODIFIER: StorageEntryModifier = QueryKind::METADATA;
+	const HASHER1: frame_metadata::StorageHasher = Hasher1::METADATA;
+	const HASHER2: frame_metadata::StorageHasher = Hasher2::METADATA;
+	const NAME: &'static str = Prefix::STORAGE_PREFIX;
+	const DEFAULT: DefaultByteGetter =
+		DefaultByteGetter(&OnEmptyGetter::<QueryKind::Query, OnEmpty>(core::marker::PhantomData));
+}
+
+#[cfg(test)]
+mod test {
+	use super::*;
+	use sp_io::{TestExternalities, hashing::twox_128};
+	use crate::hash::*;
+	use crate::storage::types::ValueQuery;
+	use frame_metadata::StorageEntryModifier;
+
+	struct Prefix;
+	impl StorageInstance for Prefix {
+		type Pallet = ();
+		type PalletInfo = ();
+		const STORAGE_PREFIX: &'static str = "foo";
+	}
+
+	struct ADefault;
+	impl crate::traits::Get<u32> for ADefault {
+		fn get() -> u32 {
+			97
+		}
+	}
+
+	#[test]
+	fn test() {
+		type A = StorageDoubleMap<
+			Prefix, Blake2_128Concat, u16, Twox64Concat, u8, u32, OptionQuery
+		>;
+		type AValueQueryWithAnOnEmpty = StorageDoubleMap<
+			Prefix, Blake2_128Concat, u16, Twox64Concat, u8, u32, ValueQuery, ADefault
+		>;
+		type B = StorageDoubleMap<Prefix, Blake2_256, u16, Twox128, u8, u32, ValueQuery>;
+		type C = StorageDoubleMap<Prefix, Blake2_128Concat, u16, Twox64Concat, u8, u8, ValueQuery>;
+		type WithLen = StorageDoubleMap<Prefix, Blake2_128Concat, u16, Twox64Concat, u8, Vec<u32>>;
+
+		TestExternalities::default().execute_with(|| {
+			let mut k: Vec<u8> = vec![];
+			k.extend(&twox_128(b"test"));
+			k.extend(&twox_128(b"foo"));
+			k.extend(&3u16.blake2_128_concat());
+			k.extend(&30u8.twox_64_concat());
+			assert_eq!(A::hashed_key_for(3, 30).to_vec(), k);
+
+			assert_eq!(A::contains_key(3, 30), false);
+			assert_eq!(A::get(3, 30), None);
+			assert_eq!(AValueQueryWithAnOnEmpty::get(3, 30), 97);
+
+			A::insert(3, 30, 10);
+			assert_eq!(A::contains_key(3, 30), true);
+			assert_eq!(A::get(3, 30), Some(10));
+			assert_eq!(AValueQueryWithAnOnEmpty::get(3, 30), 10);
+
+			A::swap(3, 30, 2, 20);
+			assert_eq!(A::contains_key(3, 30), false);
+			assert_eq!(A::contains_key(2, 20), true);
+			assert_eq!(A::get(3, 30), None);
+			assert_eq!(AValueQueryWithAnOnEmpty::get(3, 30), 97);
+			assert_eq!(A::get(2, 20), Some(10));
+			assert_eq!(AValueQueryWithAnOnEmpty::get(2, 20), 10);
+
+			A::remove(2, 20);
+			assert_eq!(A::contains_key(2, 20), false);
+			assert_eq!(A::get(2, 20), None);
+
+			AValueQueryWithAnOnEmpty::mutate(2, 20, |v| *v = *v * 2);
+			AValueQueryWithAnOnEmpty::mutate(2, 20, |v| *v = *v * 2);
+			assert_eq!(A::contains_key(2, 20), true);
+			assert_eq!(A::get(2, 20), Some(97 * 4));
+
+			A::remove(2, 20);
+			let _: Result<(), ()> = AValueQueryWithAnOnEmpty::try_mutate(2, 20, |v| {
+				*v = *v * 2; Ok(())
+			});
+			let _: Result<(), ()> = AValueQueryWithAnOnEmpty::try_mutate(2, 20, |v| {
+				*v = *v * 2; Ok(())
+			});
+			assert_eq!(A::contains_key(2, 20), true);
+			assert_eq!(A::get(2, 20), Some(97 * 4));
+
+			A::remove(2, 20);
+			let _: Result<(), ()> = AValueQueryWithAnOnEmpty::try_mutate(2, 20, |v| {
+				*v = *v * 2; Err(())
+			});
+			assert_eq!(A::contains_key(2, 20), false);
+
+			A::remove(2, 20);
+			AValueQueryWithAnOnEmpty::mutate_exists(2, 20, |v| {
+				assert!(v.is_none());
+				*v = Some(10);
+			});
+			assert_eq!(A::contains_key(2, 20), true);
+			assert_eq!(A::get(2, 20), Some(10));
+			AValueQueryWithAnOnEmpty::mutate_exists(2, 20, |v| {
+				*v = Some(v.unwrap() * 10);
+			});
+			assert_eq!(A::contains_key(2, 20), true);
+			assert_eq!(A::get(2, 20), Some(100));
+
+			A::remove(2, 20);
+			let _: Result<(), ()> = AValueQueryWithAnOnEmpty::try_mutate_exists(2, 20, |v| {
+				assert!(v.is_none());
+				*v = Some(10);
+				Ok(())
+			});
+			assert_eq!(A::contains_key(2, 20), true);
+			assert_eq!(A::get(2, 20), Some(10));
+			let _: Result<(), ()> = AValueQueryWithAnOnEmpty::try_mutate_exists(2, 20, |v| {
+				*v = Some(v.unwrap() * 10);
+				Ok(())
+			});
+			assert_eq!(A::contains_key(2, 20), true);
+			assert_eq!(A::get(2, 20), Some(100));
+			let _: Result<(), ()> = AValueQueryWithAnOnEmpty::try_mutate_exists(2, 20, |v| {
+				*v = Some(v.unwrap() * 10);
+				Err(())
+			});
+			assert_eq!(A::contains_key(2, 20), true);
+			assert_eq!(A::get(2, 20), Some(100));
+
+
+			A::insert(2, 20, 10);
+			assert_eq!(A::take(2, 20), Some(10));
+			assert_eq!(A::contains_key(2, 20), false);
+			assert_eq!(AValueQueryWithAnOnEmpty::take(2, 20), 97);
+			assert_eq!(A::contains_key(2, 20), false);
+
+			B::insert(2, 20, 10);
+			assert_eq!(A::migrate_keys::<Blake2_256, Twox128, _, _>(2, 20), Some(10));
+			assert_eq!(A::contains_key(2, 20), true);
+			assert_eq!(A::get(2, 20), Some(10));
+
+			A::insert(3, 30, 10);
+			A::insert(4, 40, 10);
+			A::remove_all();
+			assert_eq!(A::contains_key(3, 30), false);
+			assert_eq!(A::contains_key(4, 40), false);
+
+			A::insert(3, 30, 10);
+			A::insert(4, 40, 10);
+			assert_eq!(A::iter_values().collect::<Vec<_>>(), vec![10, 10]);
+
+			C::insert(3, 30, 10);
+			C::insert(4, 40, 10);
+			A::translate_values::<u8,_>(|v| Some((v * 2).into()));
+			assert_eq!(A::iter().collect::<Vec<_>>(), vec![(4, 40, 20), (3, 30, 20)]);
+
+			A::insert(3, 30, 10);
+			A::insert(4, 40, 10);
+			assert_eq!(A::iter().collect::<Vec<_>>(), vec![(4, 40, 10), (3, 30, 10)]);
+			assert_eq!(A::drain().collect::<Vec<_>>(), vec![(4, 40, 10), (3, 30, 10)]);
+			assert_eq!(A::iter().collect::<Vec<_>>(), vec![]);
+
+			C::insert(3, 30, 10);
+			C::insert(4, 40, 10);
+			A::translate::<u8,_>(|k1, k2, v| Some((k1 * k2 as u16 * v as u16).into()));
+			assert_eq!(A::iter().collect::<Vec<_>>(), vec![(4, 40, 1600), (3, 30, 900)]);
+
+			assert_eq!(A::MODIFIER, StorageEntryModifier::Optional);
+			assert_eq!(AValueQueryWithAnOnEmpty::MODIFIER, StorageEntryModifier::Default);
+			assert_eq!(A::HASHER1, frame_metadata::StorageHasher::Blake2_128Concat);
+			assert_eq!(A::HASHER2, frame_metadata::StorageHasher::Twox64Concat);
+			assert_eq!(
+				AValueQueryWithAnOnEmpty::HASHER1,
+				frame_metadata::StorageHasher::Blake2_128Concat
+			);
+			assert_eq!(
+				AValueQueryWithAnOnEmpty::HASHER2,
+				frame_metadata::StorageHasher::Twox64Concat
+			);
+			assert_eq!(A::NAME, "foo");
+			assert_eq!(AValueQueryWithAnOnEmpty::DEFAULT.0.default_byte(), 97u32.encode());
+			assert_eq!(A::DEFAULT.0.default_byte(), Option::<u32>::None.encode());
+
+			WithLen::remove_all();
+			assert_eq!(WithLen::decode_len(3, 30), None);
+			WithLen::append(0, 100, 10);
+			assert_eq!(WithLen::decode_len(0, 100), Some(1));
+
+			A::insert(3, 30, 11);
+			A::insert(3, 31, 12);
+			A::insert(4, 40, 13);
+			A::insert(4, 41, 14);
+			assert_eq!(A::iter_prefix_values(3).collect::<Vec<_>>(), vec![12, 11]);
+			assert_eq!(A::iter_prefix(3).collect::<Vec<_>>(), vec![(31, 12), (30, 11)]);
+			assert_eq!(A::iter_prefix_values(4).collect::<Vec<_>>(), vec![13, 14]);
+			assert_eq!(A::iter_prefix(4).collect::<Vec<_>>(), vec![(40, 13), (41, 14)]);
+
+			A::remove_prefix(3);
+			assert_eq!(A::iter_prefix(3).collect::<Vec<_>>(), vec![]);
+			assert_eq!(A::iter_prefix(4).collect::<Vec<_>>(), vec![(40, 13), (41, 14)]);
+
+			assert_eq!(A::drain_prefix(4).collect::<Vec<_>>(), vec![(40, 13), (41, 14)]);
+			assert_eq!(A::iter_prefix(4).collect::<Vec<_>>(), vec![]);
+			assert_eq!(A::drain_prefix(4).collect::<Vec<_>>(), vec![]);
+		})
+	}
+}
diff --git a/frame/support/src/storage/types/map.rs b/frame/support/src/storage/types/map.rs
new file mode 100644
index 000000000000..d28b7dbaa7e2
--- /dev/null
+++ b/frame/support/src/storage/types/map.rs
@@ -0,0 +1,481 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Storage map type. Implements StorageMap, StorageIterableMap, StoragePrefixedMap traits and their
+//! methods directly.
+
+use codec::{FullCodec, Decode, EncodeLike, Encode};
+use crate::{
+	storage::{
+		StorageAppend, StorageDecodeLength,
+		types::{OptionQuery, QueryKindTrait, OnEmptyGetter},
+	},
+	traits::{GetDefault, StorageInstance},
+};
+use frame_metadata::{DefaultByteGetter, StorageEntryModifier};
+use sp_std::prelude::*;
+
+/// A type that allow to store value for given key. Allowing to insert/remove/iterate on values.
+///
+/// Each value is stored at:
+/// ```nocompile
+/// Twox128(<Prefix::Pallet as PalletInfo>::name())
+///		++ Twox128(Prefix::STORAGE_PREFIX)
+///		++ Hasher1(encode(key))
+/// ```
+///
+/// # Warning
+///
+/// If the keys are not trusted (e.g. can be set by a user), a cryptographic `hasher` such as
+/// `blake2_128_concat` must be used.  Otherwise, other values in storage can be compromised.
+pub struct StorageMap<Prefix, Hasher, Key, Value, QueryKind=OptionQuery, OnEmpty=GetDefault>(
+	core::marker::PhantomData<(Prefix, Hasher, Key, Value, QueryKind, OnEmpty)>
+);
+
+impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty>
+	crate::storage::generator::StorageMap<Key, Value>
+	for StorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty>
+where
+	Prefix: StorageInstance,
+	Hasher: crate::hash::StorageHasher,
+	Key: FullCodec,
+	Value: FullCodec,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
+{
+	type Query = QueryKind::Query;
+	type Hasher = Hasher;
+	fn module_prefix() -> &'static [u8] {
+		<Prefix::PalletInfo as crate::traits::PalletInfo>::name::<Prefix::Pallet>()
+			.expect("Every active pallet has a name in the runtime; qed").as_bytes()
+	}
+	fn storage_prefix() -> &'static [u8] {
+		Prefix::STORAGE_PREFIX.as_bytes()
+	}
+	fn from_optional_value_to_query(v: Option<Value>) -> Self::Query {
+		QueryKind::from_optional_value_to_query(v)
+	}
+	fn from_query_to_optional_value(v: Self::Query) -> Option<Value> {
+		QueryKind::from_query_to_optional_value(v)
+	}
+}
+
+impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty> crate::storage::StoragePrefixedMap<Value> for
+	StorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty>
+where
+	Prefix: StorageInstance,
+	Hasher: crate::hash::StorageHasher,
+	Key: FullCodec,
+	Value: FullCodec,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
+{
+	fn module_prefix() -> &'static [u8] {
+		<Self as crate::storage::generator::StorageMap<Key, Value>>::module_prefix()
+	}
+	fn storage_prefix() -> &'static [u8] {
+		<Self as crate::storage::generator::StorageMap<Key, Value>>::storage_prefix()
+	}
+}
+
+impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty>
+	StorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty>
+where
+	Prefix: StorageInstance,
+	Hasher: crate::hash::StorageHasher,
+	Key: FullCodec,
+	Value: FullCodec,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
+{
+	/// Get the storage key used to fetch a value corresponding to a specific key.
+	pub fn hashed_key_for<KeyArg: EncodeLike<Key>>(key: KeyArg) -> Vec<u8> {
+		<Self as crate::storage::StorageMap<Key, Value>>::hashed_key_for(key)
+	}
+
+	/// Does the value (explicitly) exist in storage?
+	pub fn contains_key<KeyArg: EncodeLike<Key>>(key: KeyArg) -> bool {
+		<Self as crate::storage::StorageMap<Key, Value>>::contains_key(key)
+	}
+
+	/// Load the value associated with the given key from the map.
+	pub fn get<KeyArg: EncodeLike<Key>>(key: KeyArg) -> QueryKind::Query {
+		<Self as crate::storage::StorageMap<Key, Value>>::get(key)
+	}
+
+	/// Swap the values of two keys.
+	pub fn swap<KeyArg1: EncodeLike<Key>, KeyArg2: EncodeLike<Key>>(key1: KeyArg1, key2: KeyArg2) {
+		<Self as crate::storage::StorageMap<Key, Value>>::swap(key1, key2)
+	}
+
+	/// Store a value to be associated with the given key from the map.
+	pub fn insert<KeyArg: EncodeLike<Key>, ValArg: EncodeLike<Value>>(key: KeyArg, val: ValArg) {
+		<Self as crate::storage::StorageMap<Key, Value>>::insert(key, val)
+	}
+
+	/// Remove the value under a key.
+	pub fn remove<KeyArg: EncodeLike<Key>>(key: KeyArg) {
+		<Self as crate::storage::StorageMap<Key, Value>>::remove(key)
+	}
+
+	/// Mutate the value under a key.
+	pub fn mutate<KeyArg: EncodeLike<Key>, R, F: FnOnce(&mut QueryKind::Query) -> R>(
+		key: KeyArg,
+		f: F
+	) -> R {
+		<Self as crate::storage::StorageMap<Key, Value>>::mutate(key, f)
+	}
+
+	/// Mutate the item, only if an `Ok` value is returned.
+	pub fn try_mutate<KeyArg, R, E, F>(key: KeyArg, f: F) -> Result<R, E>
+	where
+		KeyArg: EncodeLike<Key>,
+		F: FnOnce(&mut QueryKind::Query) -> Result<R, E>,
+	{
+		<Self as crate::storage::StorageMap<Key, Value>>::try_mutate(key, f)
+	}
+
+	/// Mutate the value under a key. Deletes the item if mutated to a `None`.
+	pub fn mutate_exists<KeyArg: EncodeLike<Key>, R, F: FnOnce(&mut Option<Value>) -> R>(
+		key: KeyArg,
+		f: F
+	) -> R {
+		<Self as crate::storage::StorageMap<Key, Value>>::mutate_exists(key, f)
+	}
+
+	/// Mutate the item, only if an `Ok` value is returned. Deletes the item if mutated to a `None`.
+	pub fn try_mutate_exists<KeyArg, R, E, F>(key: KeyArg, f: F) -> Result<R, E>
+	where
+		KeyArg: EncodeLike<Key>,
+		F: FnOnce(&mut Option<Value>) -> Result<R, E>,
+	{
+		<Self as crate::storage::StorageMap<Key, Value>>::try_mutate_exists(key, f)
+	}
+
+	/// Take the value under a key.
+	pub fn take<KeyArg: EncodeLike<Key>>(key: KeyArg) -> QueryKind::Query {
+		<Self as crate::storage::StorageMap<Key, Value>>::take(key)
+	}
+
+	/// Append the given items to the value in the storage.
+	///
+	/// `Value` is required to implement `codec::EncodeAppend`.
+	///
+	/// # Warning
+	///
+	/// If the storage item is not encoded properly, the storage will be overwritten
+	/// and set to `[item]`. Any default value set for the storage item will be ignored
+	/// on overwrite.
+	pub fn append<Item, EncodeLikeItem, EncodeLikeKey>(key: EncodeLikeKey, item: EncodeLikeItem)
+	where
+		EncodeLikeKey: EncodeLike<Key>,
+		Item: Encode,
+		EncodeLikeItem: EncodeLike<Item>,
+		Value: StorageAppend<Item>
+	{
+		<Self as crate::storage::StorageMap<Key, Value>>::append(key, item)
+	}
+
+	/// Read the length of the storage value without decoding the entire value under the
+	/// given `key`.
+	///
+	/// `Value` is required to implement [`StorageDecodeLength`].
+	///
+	/// If the value does not exists or it fails to decode the length, `None` is returned.
+	/// Otherwise `Some(len)` is returned.
+	///
+	/// # Warning
+	///
+	/// `None` does not mean that `get()` does not return a value. The default value is completly
+	/// ignored by this function.
+	pub fn decode_len<KeyArg: EncodeLike<Key>>(key: KeyArg) -> Option<usize>
+		where Value: StorageDecodeLength,
+	{
+		<Self as crate::storage::StorageMap<Key, Value>>::decode_len(key)
+	}
+
+	/// Migrate an item with the given `key` from a defunct `OldHasher` to the current hasher.
+	///
+	/// If the key doesn't exist, then it's a no-op. If it does, then it returns its value.
+	pub fn migrate_key<OldHasher: crate::hash::StorageHasher, KeyArg: EncodeLike<Key>>(
+		key: KeyArg
+	) -> Option<Value> {
+		<Self as crate::storage::StorageMap<Key, Value>>::migrate_key::<OldHasher, _>(key)
+	}
+
+	/// Remove all value of the storage.
+	pub fn remove_all() {
+		<Self as crate::storage::StoragePrefixedMap<Value>>::remove_all()
+	}
+
+	/// Iter over all value of the storage.
+	///
+	/// NOTE: If a value failed to decode becaues storage is corrupted then it is skipped.
+	pub fn iter_values() -> crate::storage::PrefixIterator<Value> {
+		<Self as crate::storage::StoragePrefixedMap<Value>>::iter_values()
+	}
+
+	/// Translate the values of all elements by a function `f`, in the map in no particular order.
+	///
+	/// By returning `None` from `f` for an element, you'll remove it from the map.
+	///
+	/// NOTE: If a value fail to decode because storage is corrupted then it is skipped.
+	///
+	/// # Warning
+	///
+	/// This function must be used with care, before being updated the storage still contains the
+	/// old type, thus other calls (such as `get`) will fail at decoding it.
+	///
+	/// # Usage
+	///
+	/// This would typically be called inside the module implementation of on_runtime_upgrade.
+	pub fn translate_values<OldValue: Decode, F: Fn(OldValue) -> Option<Value>>(f: F) {
+		<Self as crate::storage::StoragePrefixedMap<Value>>::translate_values(f)
+	}
+}
+
+impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty>
+	StorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty>
+where
+	Prefix: StorageInstance,
+	Hasher: crate::hash::StorageHasher + crate::ReversibleStorageHasher,
+	Key: FullCodec,
+	Value: FullCodec,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
+{
+	/// Enumerate all elements in the map in no particular order.
+	///
+	/// If you alter the map while doing this, you'll get undefined results.
+	pub fn iter() -> crate::storage::PrefixIterator<(Key, Value)> {
+		<Self as crate::storage::IterableStorageMap<Key, Value>>::iter()
+	}
+
+	/// Remove all elements from the map and iterate through them in no particular order.
+	///
+	/// If you add elements to the map while doing this, you'll get undefined results.
+	pub fn drain() -> crate::storage::PrefixIterator<(Key, Value)> {
+		<Self as crate::storage::IterableStorageMap<Key, Value>>::drain()
+	}
+
+	/// Translate the values of all elements by a function `f`, in the map in no particular order.
+	///
+	/// By returning `None` from `f` for an element, you'll remove it from the map.
+	///
+	/// NOTE: If a value fail to decode because storage is corrupted then it is skipped.
+	pub fn translate<O: Decode, F: Fn(Key, O) -> Option<Value>>(f: F) {
+		<Self as crate::storage::IterableStorageMap<Key, Value>>::translate(f)
+	}
+}
+
+/// Part of storage metadata for a storage map.
+///
+/// NOTE: Generic hasher is supported.
+pub trait StorageMapMetadata {
+	const MODIFIER: StorageEntryModifier;
+	const NAME: &'static str;
+	const DEFAULT: DefaultByteGetter;
+	const HASHER: frame_metadata::StorageHasher;
+}
+
+impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty> StorageMapMetadata
+	for StorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty> where
+	Prefix: StorageInstance,
+	Hasher: crate::hash::StorageHasher,
+	Key: FullCodec,
+	Value: FullCodec,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
+{
+	const MODIFIER: StorageEntryModifier = QueryKind::METADATA;
+	const HASHER: frame_metadata::StorageHasher = Hasher::METADATA;
+	const NAME: &'static str = Prefix::STORAGE_PREFIX;
+	const DEFAULT: DefaultByteGetter =
+		DefaultByteGetter(&OnEmptyGetter::<QueryKind::Query, OnEmpty>(core::marker::PhantomData));
+}
+
+#[cfg(test)]
+mod test {
+	use super::*;
+	use sp_io::{TestExternalities, hashing::twox_128};
+	use crate::hash::*;
+	use crate::storage::types::ValueQuery;
+	use frame_metadata::StorageEntryModifier;
+
+	struct Prefix;
+	impl StorageInstance for Prefix {
+		type Pallet = ();
+		type PalletInfo = ();
+		const STORAGE_PREFIX: &'static str = "foo";
+	}
+
+	struct ADefault;
+	impl crate::traits::Get<u32> for ADefault {
+		fn get() -> u32 {
+			97
+		}
+	}
+
+	#[test]
+	fn test() {
+		type A = StorageMap<Prefix, Blake2_128Concat, u16, u32, OptionQuery>;
+		type AValueQueryWithAnOnEmpty = StorageMap<
+			Prefix, Blake2_128Concat, u16, u32, ValueQuery, ADefault
+		>;
+		type B = StorageMap<Prefix, Blake2_256, u16, u32, ValueQuery>;
+		type C = StorageMap<Prefix, Blake2_128Concat, u16, u8, ValueQuery>;
+		type WithLen = StorageMap<Prefix, Blake2_128Concat, u16, Vec<u32>>;
+
+		TestExternalities::default().execute_with(|| {
+			let mut k: Vec<u8> = vec![];
+			k.extend(&twox_128(b"test"));
+			k.extend(&twox_128(b"foo"));
+			k.extend(&3u16.blake2_128_concat());
+			assert_eq!(A::hashed_key_for(3).to_vec(), k);
+
+			assert_eq!(A::contains_key(3), false);
+			assert_eq!(A::get(3), None);
+			assert_eq!(AValueQueryWithAnOnEmpty::get(3), 97);
+
+			A::insert(3, 10);
+			assert_eq!(A::contains_key(3), true);
+			assert_eq!(A::get(3), Some(10));
+			assert_eq!(AValueQueryWithAnOnEmpty::get(3), 10);
+
+			A::swap(3, 2);
+			assert_eq!(A::contains_key(3), false);
+			assert_eq!(A::contains_key(2), true);
+			assert_eq!(A::get(3), None);
+			assert_eq!(AValueQueryWithAnOnEmpty::get(3), 97);
+			assert_eq!(A::get(2), Some(10));
+			assert_eq!(AValueQueryWithAnOnEmpty::get(2), 10);
+
+			A::remove(2);
+			assert_eq!(A::contains_key(2), false);
+			assert_eq!(A::get(2), None);
+
+			AValueQueryWithAnOnEmpty::mutate(2, |v| *v = *v * 2);
+			AValueQueryWithAnOnEmpty::mutate(2, |v| *v = *v * 2);
+			assert_eq!(AValueQueryWithAnOnEmpty::contains_key(2), true);
+			assert_eq!(AValueQueryWithAnOnEmpty::get(2), 97 * 4);
+
+			A::remove(2);
+			let _: Result<(), ()> = AValueQueryWithAnOnEmpty::try_mutate(2, |v| {
+				*v = *v * 2; Ok(())
+			});
+			let _: Result<(), ()> = AValueQueryWithAnOnEmpty::try_mutate(2, |v| {
+				*v = *v * 2; Ok(())
+			});
+			assert_eq!(A::contains_key(2), true);
+			assert_eq!(A::get(2), Some(97 * 4));
+
+			A::remove(2);
+			let _: Result<(), ()> = AValueQueryWithAnOnEmpty::try_mutate(2, |v| {
+				*v = *v * 2; Err(())
+			});
+			assert_eq!(A::contains_key(2), false);
+
+			A::remove(2);
+			AValueQueryWithAnOnEmpty::mutate_exists(2, |v| {
+				assert!(v.is_none());
+				*v = Some(10);
+			});
+			assert_eq!(A::contains_key(2), true);
+			assert_eq!(A::get(2), Some(10));
+			AValueQueryWithAnOnEmpty::mutate_exists(2, |v| {
+				*v = Some(v.unwrap() * 10);
+			});
+			assert_eq!(A::contains_key(2), true);
+			assert_eq!(A::get(2), Some(100));
+
+			A::remove(2);
+			let _: Result<(), ()> = AValueQueryWithAnOnEmpty::try_mutate_exists(2, |v| {
+				assert!(v.is_none());
+				*v = Some(10);
+				Ok(())
+			});
+			assert_eq!(A::contains_key(2), true);
+			assert_eq!(A::get(2), Some(10));
+			let _: Result<(), ()> = AValueQueryWithAnOnEmpty::try_mutate_exists(2, |v| {
+				*v = Some(v.unwrap() * 10);
+				Ok(())
+			});
+			assert_eq!(A::contains_key(2), true);
+			assert_eq!(A::get(2), Some(100));
+			let _: Result<(), ()> = AValueQueryWithAnOnEmpty::try_mutate_exists(2, |v| {
+				*v = Some(v.unwrap() * 10);
+				Err(())
+			});
+			assert_eq!(A::contains_key(2), true);
+			assert_eq!(A::get(2), Some(100));
+
+
+			A::insert(2, 10);
+			assert_eq!(A::take(2), Some(10));
+			assert_eq!(A::contains_key(2), false);
+			assert_eq!(AValueQueryWithAnOnEmpty::take(2), 97);
+			assert_eq!(A::contains_key(2), false);
+
+			B::insert(2, 10);
+			assert_eq!(A::migrate_key::<Blake2_256, _>(2), Some(10));
+			assert_eq!(A::contains_key(2), true);
+			assert_eq!(A::get(2), Some(10));
+
+			A::insert(3, 10);
+			A::insert(4, 10);
+			A::remove_all();
+			assert_eq!(A::contains_key(3), false);
+			assert_eq!(A::contains_key(4), false);
+
+			A::insert(3, 10);
+			A::insert(4, 10);
+			assert_eq!(A::iter_values().collect::<Vec<_>>(), vec![10, 10]);
+
+			C::insert(3, 10);
+			C::insert(4, 10);
+			A::translate_values::<u8,_>(|v| Some((v * 2).into()));
+			assert_eq!(A::iter().collect::<Vec<_>>(), vec![(4, 20), (3, 20)]);
+
+			A::insert(3, 10);
+			A::insert(4, 10);
+			assert_eq!(A::iter().collect::<Vec<_>>(), vec![(4, 10), (3, 10)]);
+			assert_eq!(A::drain().collect::<Vec<_>>(), vec![(4, 10), (3, 10)]);
+			assert_eq!(A::iter().collect::<Vec<_>>(), vec![]);
+
+			C::insert(3, 10);
+			C::insert(4, 10);
+			A::translate::<u8,_>(|k, v| Some((k * v as u16).into()));
+			assert_eq!(A::iter().collect::<Vec<_>>(), vec![(4, 40), (3, 30)]);
+
+			assert_eq!(A::MODIFIER, StorageEntryModifier::Optional);
+			assert_eq!(AValueQueryWithAnOnEmpty::MODIFIER, StorageEntryModifier::Default);
+			assert_eq!(A::HASHER, frame_metadata::StorageHasher::Blake2_128Concat);
+			assert_eq!(
+				AValueQueryWithAnOnEmpty::HASHER,
+				frame_metadata::StorageHasher::Blake2_128Concat
+			);
+			assert_eq!(A::NAME, "foo");
+			assert_eq!(AValueQueryWithAnOnEmpty::DEFAULT.0.default_byte(), 97u32.encode());
+			assert_eq!(A::DEFAULT.0.default_byte(), Option::<u32>::None.encode());
+
+			WithLen::remove_all();
+			assert_eq!(WithLen::decode_len(3), None);
+			WithLen::append(0, 10);
+			assert_eq!(WithLen::decode_len(0), Some(1));
+		})
+	}
+}
diff --git a/frame/support/src/storage/types/mod.rs b/frame/support/src/storage/types/mod.rs
new file mode 100644
index 000000000000..73b032b39e7b
--- /dev/null
+++ b/frame/support/src/storage/types/mod.rs
@@ -0,0 +1,108 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Storage types to build abstraction on storage, they implements storage traits such as
+//! StorageMap and others.
+
+use codec::FullCodec;
+use frame_metadata::{DefaultByte, StorageEntryModifier};
+
+mod value;
+mod map;
+mod double_map;
+
+pub use value::{StorageValue, StorageValueMetadata};
+pub use map::{StorageMap, StorageMapMetadata};
+pub use double_map::{StorageDoubleMap, StorageDoubleMapMetadata};
+
+/// Trait implementing how the storage optional value is converted into the queried type.
+///
+/// It is implemented by:
+/// * `OptionQuery` which convert an optional value to an optional value, user when querying
+///   storage will get an optional value.
+/// * `ValueQuery` which convert an optional value to a value, user when querying storage will get
+///   a value.
+pub trait QueryKindTrait<Value, OnEmpty> {
+	/// Metadata for the storage kind.
+	const METADATA: StorageEntryModifier;
+
+	/// Type returned on query
+	type Query: FullCodec + 'static;
+
+	/// Convert an optional value (i.e. some if trie contains the value or none otherwise) to the
+	/// query.
+	fn from_optional_value_to_query(v: Option<Value>) -> Self::Query;
+
+	/// Convert a query to an optional value.
+	fn from_query_to_optional_value(v: Self::Query) -> Option<Value>;
+}
+
+/// Implement QueryKindTrait with query being `Option<Value>`
+///
+/// NOTE: it doesn't support a generic `OnEmpty`. This means only `None` can be
+/// returned when no value is found. To use another `OnEmpty` implementation, `ValueQuery` can be
+/// used instead.
+pub struct OptionQuery;
+impl<Value> QueryKindTrait<Value, crate::traits::GetDefault> for OptionQuery
+where
+	Value: FullCodec + 'static,
+{
+	const METADATA: StorageEntryModifier = StorageEntryModifier::Optional;
+
+	type Query = Option<Value>;
+
+	fn from_optional_value_to_query(v: Option<Value>) -> Self::Query {
+		// NOTE: OnEmpty is fixed to GetDefault, thus it returns `None` on no value.
+		v
+	}
+
+	fn from_query_to_optional_value(v: Self::Query) -> Option<Value> {
+		v
+	}
+}
+
+/// Implement QueryKindTrait with query being `Value`
+pub struct ValueQuery;
+impl<Value, OnEmpty> QueryKindTrait<Value, OnEmpty> for ValueQuery
+where
+	Value: FullCodec + 'static,
+	OnEmpty: crate::traits::Get<Value>,
+{
+	const METADATA: StorageEntryModifier = StorageEntryModifier::Default;
+
+	type Query = Value;
+
+	fn from_optional_value_to_query(v: Option<Value>) -> Self::Query {
+		v.unwrap_or_else(|| OnEmpty::get())
+	}
+
+	fn from_query_to_optional_value(v: Self::Query) -> Option<Value> {
+		Some(v)
+	}
+}
+
+/// A helper struct which implements DefaultByte using `Get<Value>` and encode it.
+struct OnEmptyGetter<Value, OnEmpty>(core::marker::PhantomData<(Value, OnEmpty)>);
+impl<Value: FullCodec, OnEmpty: crate::traits::Get<Value>> DefaultByte
+	for OnEmptyGetter<Value, OnEmpty>
+{
+	fn default_byte(&self) -> sp_std::vec::Vec<u8> {
+		OnEmpty::get().encode()
+	}
+}
+unsafe impl <Value, OnEmpty: crate::traits::Get<Value>> Send for OnEmptyGetter<Value, OnEmpty> {}
+unsafe impl <Value, OnEmpty: crate::traits::Get<Value>> Sync for OnEmptyGetter<Value, OnEmpty> {}
diff --git a/frame/support/src/storage/types/value.rs b/frame/support/src/storage/types/value.rs
new file mode 100644
index 000000000000..da80963b28f3
--- /dev/null
+++ b/frame/support/src/storage/types/value.rs
@@ -0,0 +1,282 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Storage value type. Implements StorageValue trait and its method directly.
+
+use codec::{FullCodec, Decode, EncodeLike, Encode};
+use crate::{
+	storage::{
+		StorageAppend, StorageDecodeLength,
+		types::{OptionQuery, QueryKindTrait, OnEmptyGetter},
+	},
+	traits::{GetDefault, StorageInstance},
+};
+use frame_metadata::{DefaultByteGetter, StorageEntryModifier};
+
+/// A type that allow to store a value.
+///
+/// Each value is stored at:
+/// ```nocompile
+/// Twox128(<Prefix::Pallet as PalletInfo>::name()) ++ Twox128(Prefix::STORAGE_PREFIX)
+/// ```
+pub struct StorageValue<Prefix, Value, QueryKind=OptionQuery, OnEmpty=GetDefault>(
+	core::marker::PhantomData<(Prefix, Value, QueryKind, OnEmpty)>
+);
+
+impl<Prefix, Value, QueryKind, OnEmpty> crate::storage::generator::StorageValue<Value> for
+	StorageValue<Prefix, Value, QueryKind, OnEmpty>
+where
+	Prefix: StorageInstance,
+	Value: FullCodec,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
+{
+	type Query = QueryKind::Query;
+	fn module_prefix() -> &'static [u8] {
+		<Prefix::PalletInfo as crate::traits::PalletInfo>::name::<Prefix::Pallet>()
+			.expect("Every active pallet has a name in the runtime; qed").as_bytes()
+	}
+	fn storage_prefix() -> &'static [u8] {
+		Prefix::STORAGE_PREFIX.as_bytes()
+	}
+	fn from_optional_value_to_query(v: Option<Value>) -> Self::Query {
+		QueryKind::from_optional_value_to_query(v)
+	}
+	fn from_query_to_optional_value(v: Self::Query) -> Option<Value> {
+		QueryKind::from_query_to_optional_value(v)
+	}
+}
+
+impl<Prefix, Value, QueryKind, OnEmpty> StorageValue<Prefix, Value, QueryKind, OnEmpty>
+where
+	Prefix: StorageInstance,
+	Value: FullCodec,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
+{
+	/// Get the storage key.
+	pub fn hashed_key() -> [u8; 32] { <Self as crate::storage::StorageValue<Value>>::hashed_key() }
+
+	/// Does the value (explicitly) exist in storage?
+	pub fn exists() -> bool { <Self as crate::storage::StorageValue<Value>>::exists() }
+
+	/// Load the value from the provided storage instance.
+	pub fn get() -> QueryKind::Query { <Self as crate::storage::StorageValue<Value>>::get() }
+
+	/// Try to get the underlying value from the provided storage instance; `Ok` if it exists,
+	/// `Err` if not.
+	pub fn try_get() -> Result<Value, ()> {
+		<Self as crate::storage::StorageValue<Value>>::try_get()
+	}
+
+	/// Translate a value from some previous type (`O`) to the current type.
+	///
+	/// `f: F` is the translation function.
+	///
+	/// Returns `Err` if the storage item could not be interpreted as the old type, and Ok, along
+	/// with the new value if it could.
+	///
+	/// NOTE: This operates from and to `Option<_>` types; no effort is made to respect the default
+	/// value of the original type.
+	///
+	/// # Warning
+	///
+	/// This function must be used with care, before being updated the storage still contains the
+	/// old type, thus other calls (such as `get`) will fail at decoding it.
+	///
+	/// # Usage
+	///
+	/// This would typically be called inside the module implementation of on_runtime_upgrade,
+	/// while ensuring **no usage of this storage are made before the call to
+	/// `on_runtime_upgrade`**. (More precisely prior initialized modules doesn't make use of this
+	/// storage).
+	pub fn translate<O: Decode, F: FnOnce(Option<O>) -> Option<Value>>(
+		f: F,
+	) -> Result<Option<Value>, ()> {
+		<Self as crate::storage::StorageValue<Value>>::translate(f)
+	}
+
+	/// Store a value under this key into the provided storage instance.
+	pub fn put<Arg: EncodeLike<Value>>(val: Arg) {
+		<Self as crate::storage::StorageValue<Value>>::put(val)
+	}
+
+	/// Store a value under this key into the provided storage instance.
+	///
+	/// this uses the query type rather than the underlying value.
+	pub fn set(val: QueryKind::Query) { <Self as crate::storage::StorageValue<Value>>::set(val) }
+
+	/// Mutate the value
+	pub fn mutate<R, F: FnOnce(&mut QueryKind::Query) -> R>(f: F) -> R {
+		<Self as crate::storage::StorageValue<Value>>::mutate(f)
+	}
+
+	/// Mutate the value if closure returns `Ok`
+	pub fn try_mutate<R, E, F: FnOnce(&mut QueryKind::Query) -> Result<R, E>>(
+		f: F,
+	) -> Result<R, E> {
+		<Self as crate::storage::StorageValue<Value>>::try_mutate(f)
+	}
+
+	/// Clear the storage value.
+	pub fn kill() { <Self as crate::storage::StorageValue<Value>>::kill() }
+
+	/// Take a value from storage, removing it afterwards.
+	pub fn take() -> QueryKind::Query { <Self as crate::storage::StorageValue<Value>>::take() }
+
+	/// Append the given item to the value in the storage.
+	///
+	/// `Value` is required to implement [`StorageAppend`].
+	///
+	/// # Warning
+	///
+	/// If the storage item is not encoded properly, the storage item will be overwritten
+	/// and set to `[item]`. Any default value set for the storage item will be ignored
+	/// on overwrite.
+	pub fn append<Item, EncodeLikeItem>(item: EncodeLikeItem)
+	where
+		Item: Encode,
+		EncodeLikeItem: EncodeLike<Item>,
+		Value: StorageAppend<Item>
+	{
+		<Self as crate::storage::StorageValue<Value>>::append(item)
+	}
+
+	/// Read the length of the storage value without decoding the entire value.
+	///
+	/// `Value` is required to implement [`StorageDecodeLength`].
+	///
+	/// If the value does not exists or it fails to decode the length, `None` is returned.
+	/// Otherwise `Some(len)` is returned.
+	///
+	/// # Warning
+	///
+	/// `None` does not mean that `get()` does not return a value. The default value is completly
+	/// ignored by this function.
+	pub fn decode_len() -> Option<usize> where Value: StorageDecodeLength {
+		<Self as crate::storage::StorageValue<Value>>::decode_len()
+	}
+}
+
+/// Part of storage metadata for storage value.
+pub trait StorageValueMetadata {
+	const MODIFIER: StorageEntryModifier;
+	const NAME: &'static str;
+	const DEFAULT: DefaultByteGetter;
+}
+
+impl<Prefix, Value, QueryKind, OnEmpty> StorageValueMetadata
+	for StorageValue<Prefix, Value, QueryKind, OnEmpty> where
+	Prefix: StorageInstance,
+	Value: FullCodec,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
+{
+	const MODIFIER: StorageEntryModifier = QueryKind::METADATA;
+	const NAME: &'static str = Prefix::STORAGE_PREFIX;
+	const DEFAULT: DefaultByteGetter =
+		DefaultByteGetter(&OnEmptyGetter::<QueryKind::Query, OnEmpty>(core::marker::PhantomData));
+}
+
+#[cfg(test)]
+mod test {
+	use super::*;
+	use sp_io::{TestExternalities, hashing::twox_128};
+	use crate::storage::types::ValueQuery;
+	use frame_metadata::StorageEntryModifier;
+
+	struct Prefix;
+	impl StorageInstance for Prefix {
+		type Pallet = ();
+		type PalletInfo = ();
+		const STORAGE_PREFIX: &'static str = "foo";
+	}
+
+	struct ADefault;
+	impl crate::traits::Get<u32> for ADefault {
+		fn get() -> u32 {
+			97
+		}
+	}
+
+	#[test]
+	fn test() {
+		type A = StorageValue<Prefix, u32, OptionQuery>;
+		type AValueQueryWithAnOnEmpty = StorageValue<Prefix, u32, ValueQuery, ADefault>;
+		type B = StorageValue<Prefix, u16, ValueQuery>;
+		type WithLen = StorageValue<Prefix, Vec<u32>>;
+
+		TestExternalities::default().execute_with(|| {
+			assert_eq!(A::hashed_key().to_vec(), [twox_128(b"test"), twox_128(b"foo")].concat());
+			assert_eq!(A::exists(), false);
+			assert_eq!(A::get(), None);
+			assert_eq!(AValueQueryWithAnOnEmpty::get(), 97);
+			assert_eq!(A::try_get(), Err(()));
+
+			A::put(2);
+			assert_eq!(A::exists(), true);
+			assert_eq!(A::get(), Some(2));
+			assert_eq!(AValueQueryWithAnOnEmpty::get(), 2);
+			assert_eq!(A::try_get(), Ok(2));
+			assert_eq!(A::try_get(), Ok(2));
+
+			B::put(4);
+			A::translate::<u16, _>(|v| v.map(Into::into)).unwrap();
+			assert_eq!(A::try_get(), Ok(4));
+
+			A::set(None);
+			assert_eq!(A::try_get(), Err(()));
+
+			A::set(Some(2));
+			assert_eq!(A::try_get(), Ok(2));
+
+			A::mutate(|v| *v = Some(v.unwrap() * 2));
+			assert_eq!(A::try_get(), Ok(4));
+
+			A::set(Some(4));
+			let _: Result<(), ()> = A::try_mutate(|v| { *v = Some(v.unwrap() * 2); Ok(()) });
+			assert_eq!(A::try_get(), Ok(8));
+
+			let _: Result<(), ()> = A::try_mutate(|v| { *v = Some(v.unwrap() * 2); Err(()) });
+			assert_eq!(A::try_get(), Ok(8));
+
+			A::kill();
+			AValueQueryWithAnOnEmpty::mutate(|v| *v = *v * 2);
+			assert_eq!(AValueQueryWithAnOnEmpty::try_get(), Ok(97 * 2));
+
+			AValueQueryWithAnOnEmpty::kill();
+			let _: Result<(), ()> = AValueQueryWithAnOnEmpty::try_mutate(|v| {
+				*v = *v * 2; Ok(())
+			});
+			assert_eq!(AValueQueryWithAnOnEmpty::try_get(), Ok(97 * 2));
+
+			A::kill();
+			assert_eq!(A::try_get(), Err(()));
+
+			assert_eq!(A::MODIFIER, StorageEntryModifier::Optional);
+			assert_eq!(AValueQueryWithAnOnEmpty::MODIFIER, StorageEntryModifier::Default);
+			assert_eq!(A::NAME, "foo");
+			assert_eq!(A::DEFAULT.0.default_byte(), Option::<u32>::None.encode());
+			assert_eq!(AValueQueryWithAnOnEmpty::DEFAULT.0.default_byte(), 97u32.encode());
+
+			WithLen::kill();
+			assert_eq!(WithLen::decode_len(), None);
+			WithLen::append(3);
+			assert_eq!(WithLen::decode_len(), Some(1));
+		});
+	}
+}
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index 1fadb079e5a5..bc1700a43c3e 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -1724,6 +1724,24 @@ pub trait Instance: 'static {
 	const PREFIX: &'static str;
 }
 
+/// An instance of a storage.
+///
+/// It is required the the couple `(PalletInfo::name<Pallet>(), STORAGE_PREFIX)` is unique.
+/// Any storage with same couple will collide.
+pub trait StorageInstance {
+	type Pallet: 'static;
+	type PalletInfo: PalletInfo;
+	const STORAGE_PREFIX: &'static str;
+}
+
+/// Implement Get by returning Default for any type that implements Default.
+pub struct GetDefault;
+impl<T: Default> crate::traits::Get<T> for GetDefault {
+	fn get() -> T {
+		T::default()
+	}
+}
+
 /// A trait similar to `Convert` to convert values from `B` an abstract balance type
 /// into u64 and back from u128. (This conversion is used in election and other places where complex
 /// calculation over balance type is needed)

From e33f3c23cdf4d369bd0d2dbec7b78382ee17a117 Mon Sep 17 00:00:00 2001
From: Alexander Popiak <alexander.popiak@parity.io>
Date: Tue, 3 Nov 2020 14:01:18 +0100
Subject: [PATCH 0047/1194] Update MILLISECS_PER_BLOCK comments (#7483)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* add doc comment to node template MILLISECS_PER_BLOCK

* add broken link comment

* update Babe block time link

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
---
 bin/node-template/runtime/src/lib.rs | 6 ++++++
 bin/node/runtime/src/constants.rs    | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index 5028301978cd..d67a5bde9645 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -102,6 +102,12 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	transaction_version: 1,
 };
 
+/// This determines the average expected block time that we are targetting.
+/// Blocks will be produced at a minimum duration defined by `SLOT_DURATION`.
+/// `SLOT_DURATION` is picked up by `pallet_timestamp` which is in turn picked
+/// up by `pallet_aura` to implement `fn slot_duration()`.
+///
+/// Change this to adjust the block time.
 pub const MILLISECS_PER_BLOCK: u64 = 6000;
 
 pub const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK;
diff --git a/bin/node/runtime/src/constants.rs b/bin/node/runtime/src/constants.rs
index 8e87d61c1e6b..0301c30d5b63 100644
--- a/bin/node/runtime/src/constants.rs
+++ b/bin/node/runtime/src/constants.rs
@@ -50,7 +50,7 @@ pub mod time {
 	/// always be assigned, in which case `MILLISECS_PER_BLOCK` and
 	/// `SLOT_DURATION` should have the same value.
 	///
-	/// <https://research.web3.foundation/en/latest/polkadot/BABE/Babe/#6-practical-results>
+	/// <https://research.web3.foundation/en/latest/polkadot/block-production/Babe.html#-6.-practical-results>
 	pub const MILLISECS_PER_BLOCK: Moment = 3000;
 	pub const SECS_PER_BLOCK: Moment = MILLISECS_PER_BLOCK / 1000;
 

From b7712fed2c58a898f7706e16861d7109c8f585a5 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Tue, 3 Nov 2020 14:11:17 +0100
Subject: [PATCH 0048/1194] Fix `on_runtime_upgrade` weight recording (#7480)

* Fix on_runtime_upgrade weight recording

* fix naming

* Update lib.rs

* fix line width

* fix line width again
---
 frame/executive/src/lib.rs | 56 +++++++++++++++++++++++++++++++++-----
 1 file changed, 49 insertions(+), 7 deletions(-)

diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index 96e7a6c04094..961dbc4376a5 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -234,12 +234,12 @@ where
 		extrinsics_root: &System::Hash,
 		digest: &Digest<System::Hash>,
 	) {
+		let mut weight = 0;
 		if Self::runtime_upgraded() {
 			// System is not part of `AllModules`, so we need to call this manually.
-			let mut weight = <frame_system::Module::<System> as OnRuntimeUpgrade>::on_runtime_upgrade();
+			weight = weight.saturating_add(<frame_system::Module::<System> as OnRuntimeUpgrade>::on_runtime_upgrade());
 			weight = weight.saturating_add(COnRuntimeUpgrade::on_runtime_upgrade());
 			weight = weight.saturating_add(<AllModules as OnRuntimeUpgrade>::on_runtime_upgrade());
-			<frame_system::Module<System>>::register_extra_weight_unchecked(weight, DispatchClass::Mandatory);
 		}
 		<frame_system::Module<System>>::initialize(
 			block_number,
@@ -248,8 +248,10 @@ where
 			digest,
 			frame_system::InitKind::Full,
 		);
-		<frame_system::Module<System> as OnInitialize<System::BlockNumber>>::on_initialize(*block_number);
-		let weight = <AllModules as OnInitialize<System::BlockNumber>>::on_initialize(*block_number)
+		weight = weight.saturating_add(
+			<frame_system::Module<System> as OnInitialize<System::BlockNumber>>::on_initialize(*block_number)
+		);
+		weight = weight.saturating_add(<AllModules as OnInitialize<System::BlockNumber>>::on_initialize(*block_number))
 			.saturating_add(<System::BlockExecutionWeight as frame_support::traits::Get<_>>::get());
 		<frame_system::Module::<System>>::register_extra_weight_unchecked(weight, DispatchClass::Mandatory);
 
@@ -543,7 +545,7 @@ mod tests {
 
 				fn on_runtime_upgrade() -> Weight {
 					sp_io::storage::set(super::TEST_KEY, "module".as_bytes());
-					0
+					200
 				}
 			}
 		}
@@ -675,7 +677,7 @@ mod tests {
 		fn on_runtime_upgrade() -> Weight {
 			sp_io::storage::set(TEST_KEY, "custom_upgrade".as_bytes());
 			sp_io::storage::set(CUSTOM_ON_RUNTIME_KEY, &true.encode());
-			0
+			100
 		}
 	}
 
@@ -810,7 +812,7 @@ mod tests {
 		let xt = TestXt::new(Call::Balances(BalancesCall::transfer(33, 0)), sign_extra(1, 0, 0));
 		let encoded = xt.encode();
 		let encoded_len = encoded.len() as Weight;
-		// Block execution weight + on_initialize weight
+		// on_initialize weight + block execution weight
 		let base_block_weight = 175 + <Runtime as frame_system::Trait>::BlockExecutionWeight::get();
 		let limit = AvailableBlockRatio::get() * MaximumBlockWeight::get() - base_block_weight;
 		let num_to_exhaust_block = limit / (encoded_len + 5);
@@ -1073,4 +1075,44 @@ mod tests {
 			assert_eq!(sp_io::storage::get(CUSTOM_ON_RUNTIME_KEY).unwrap(), true.encode());
 		});
 	}
+
+	#[test]
+	fn all_weights_are_recorded_correctly() {
+		new_test_ext(1).execute_with(|| {
+			// Make sure `on_runtime_upgrade` is called for maximum complexity
+			RUNTIME_VERSION.with(|v| *v.borrow_mut() = sp_version::RuntimeVersion {
+				spec_version: 1,
+				..Default::default()
+			});
+
+			let block_number = 1;
+
+			Executive::initialize_block(&Header::new(
+				block_number,
+				H256::default(),
+				H256::default(),
+				[69u8; 32].into(),
+				Digest::default(),
+			));
+
+			// All weights that show up in the `initialize_block_impl`
+			let frame_system_upgrade_weight = frame_system::Module::<Runtime>::on_runtime_upgrade();
+			let custom_runtime_upgrade_weight = CustomOnRuntimeUpgrade::on_runtime_upgrade();
+			let runtime_upgrade_weight = <AllModules as OnRuntimeUpgrade>::on_runtime_upgrade();
+			let frame_system_on_initialize_weight = frame_system::Module::<Runtime>::on_initialize(block_number);
+			let on_initialize_weight = <AllModules as OnInitialize<u64>>::on_initialize(block_number);
+			let base_block_weight = <Runtime as frame_system::Trait>::BlockExecutionWeight::get();
+
+			// Weights are recorded correctly
+			assert_eq!(
+				frame_system::Module::<Runtime>::block_weight().total(),
+				frame_system_upgrade_weight +
+				custom_runtime_upgrade_weight +
+				runtime_upgrade_weight +
+				frame_system_on_initialize_weight +
+				on_initialize_weight +
+				base_block_weight,
+			);
+		});
+	}
 }

From 7611677c5a95fbf4b609d924d4615045111b7de8 Mon Sep 17 00:00:00 2001
From: Ayush Mishra <ayushmishra2005@gmail.com>
Date: Tue, 3 Nov 2020 19:48:02 +0530
Subject: [PATCH 0049/1194] Made correction in sp-tracing macros to use level
 parameter #7348 (#7388)

Co-authored-by: Ayush Kumar Mishra <ayush.k.mishra@xcelenergy.com>
---
 primitives/tracing/src/lib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/primitives/tracing/src/lib.rs b/primitives/tracing/src/lib.rs
index cb67d8a0c5a2..9130c08744d9 100644
--- a/primitives/tracing/src/lib.rs
+++ b/primitives/tracing/src/lib.rs
@@ -164,7 +164,7 @@ macro_rules! within_span {
 		$( $code:tt )*
 	) => {
 		{
-			$crate::within_span!($crate::span!($crate::Level::TRACE, $name); $( $code )*)
+			$crate::within_span!($crate::span!($lvl, $name); $( $code )*)
 		}
 	};
 }
@@ -233,6 +233,6 @@ macro_rules! enter_span {
 		let __tracing_guard__ = __within_span__.enter();
 	};
 	( $lvl:expr, $name:expr ) => {
-		$crate::enter_span!($crate::span!($crate::Level::TRACE, $name))
+		$crate::enter_span!($crate::span!($lvl, $name))
 	};
 }

From c656440bf29c6f2387d97f0b7dd0676c5e44389e Mon Sep 17 00:00:00 2001
From: Caio <c410.f3r@gmail.com>
Date: Tue, 3 Nov 2020 16:54:07 -0300
Subject: [PATCH 0050/1194] Remove development TODO from public doc comment
 (#7485)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Remove development TODO from public doc comment

* Update frame/system/src/offchain.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 frame/system/src/offchain.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/frame/system/src/offchain.rs b/frame/system/src/offchain.rs
index ba5cfb8536f2..edb4e5775722 100644
--- a/frame/system/src/offchain.rs
+++ b/frame/system/src/offchain.rs
@@ -376,9 +376,6 @@ impl<T: SigningTypes> Clone for Account<T> where
 /// The point of this trait is to be able to easily convert between `RuntimeAppPublic`, the wrapped
 /// (generic = non application-specific) crypto types and the `Public` type required by the runtime.
 ///
-/// TODO [#5662] Potentially use `IsWrappedBy` types, or find some other way to make it easy to
-/// obtain unwrapped crypto (and wrap it back).
-///
 ///	Example (pseudo-)implementation:
 /// ```ignore
 ///	// im-online specific crypto
@@ -392,6 +389,8 @@ impl<T: SigningTypes> Clone for Account<T> where
 /// type Public = MultiSigner: From<sr25519::Public>;
 /// type Signature = MulitSignature: From<sr25519::Signature>;
 /// ```
+// TODO [#5662] Potentially use `IsWrappedBy` types, or find some other way to make it easy to
+// obtain unwrapped crypto (and wrap it back).
 pub trait AppCrypto<Public, Signature> {
 	/// A application-specific crypto.
 	type RuntimeAppPublic: RuntimeAppPublic;

From 78fa1b8062218f1ee5a61c499f433a26ca1783aa Mon Sep 17 00:00:00 2001
From: Marko <markobaricevic3778@gmail.com>
Date: Tue, 3 Nov 2020 22:25:05 +0100
Subject: [PATCH 0051/1194] add synesthesia network (#7486)

---
 primitives/core/src/crypto.rs | 2 ++
 ss58-registry.json            | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index 6606b8888769..2f34347a2d5e 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -472,6 +472,8 @@ ss58_address_format!(
 		(13, "substratee", "Any SubstraTEE off-chain network private account (*25519).")
 	TotemAccount =>
 		(14, "totem", "Any Totem Live Accounting network standard account (*25519).")
+	SynesthesiaAccount =>
+		(15, "synesthesia", "Synesthesia mainnet, standard account (*25519).")
 	KulupuAccount =>
 		(16, "kulupu", "Kulupu mainnet, standard account (*25519).")
 	DarkAccount =>
diff --git a/ss58-registry.json b/ss58-registry.json
index 4c18e72e9053..80d600ed593b 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -145,6 +145,15 @@
 			"standardAccount": "*25519",
 			"website": "https://totemaccounting.com"
 		},
+		{
+			"prefix": 15,
+			"network": "synesthesia",
+			"displayName": "Synesthesia",
+			"symbols": ["SYN"],
+			"decimals": [12],
+			"standardAccount": "*25519",
+			"website": "https://synesthesia.network/"
+		},
 		{
 			"prefix": 16,
 			"network": "kulupu",

From cae2d656482ec2933459f8659cf02bb302b76a13 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Wed, 4 Nov 2020 14:01:37 +0100
Subject: [PATCH 0052/1194] Exclude basic-authorship-proposer from the
 continuous tasks alert (#7484)

---
 .maintain/monitoring/alerting-rules/alerting-rules.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.maintain/monitoring/alerting-rules/alerting-rules.yaml b/.maintain/monitoring/alerting-rules/alerting-rules.yaml
index 16a27c06d3e0..6bca918735e7 100644
--- a/.maintain/monitoring/alerting-rules/alerting-rules.yaml
+++ b/.maintain/monitoring/alerting-rules/alerting-rules.yaml
@@ -127,8 +127,8 @@ groups:
   ##############################################################################
 
   - alert: ContinuousTaskEnded
-    expr: '(polkadot_tasks_spawned_total == 1) - on(instance, task_name)
-    (polkadot_tasks_ended_total == 1)'
+    expr: '(polkadot_tasks_spawned_total{task_name != "basic-authorship-proposer"} == 1)
+        - on(instance, task_name) (polkadot_tasks_ended_total == 1)'
     for: 5m
     labels:
       severity: warning

From f7a8b1001d1819b7a887ae36d6beae84617499d8 Mon Sep 17 00:00:00 2001
From: Seun Lanlege <seunlanlege@gmail.com>
Date: Wed, 4 Nov 2020 14:16:08 +0100
Subject: [PATCH 0053/1194] Allow BabeConsensusDataProvider fork existing chain
 (#7078)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* parent ba8e8122ab86bb1a8677b004ff4f14626fcc7884
author Seun Lanlege <seunlanlege@gmail.com> 1599568164 +0100
committer Seun Lanlege <seunlanlege@gmail.com> 1604321289 +0100
gpgsig -----BEGIN PGP SIGNATURE-----

 iQGzBAABCgAdFiEECvQ02MnjnssnSbjr3HzzEhjN254FAl+gAAkACgkQ3HzzEhjN
 254soAv+KO5JA0HXSe0R0XS5TnwA3IxYsW+UvdF5dXFeC3jFdGTMvor818uoBePD
 dxzYEsUK6gjsNcM9+hpFhoy5JnUrUPInd2BZ7pmZiDuXmYJrHi0s7K5qL0EYDoe0
 m1egPNNyRR125ozJ24M+09c3OQsi3bvTx1TJaV9Aov8hK4So8UmlJTHWpkLw97ku
 HuTre2IPSFbV4GwJE40V+KNuDVHxaKL7zrInYScqbr6/hOTqBCvFn4ib3CjpF5HG
 zDAA5S2PrcbL9NQOothVcVB/TZr3IkhglCFqEjVyCX80IL0JkNZkw8jAh0B8uqXx
 Ug/c1/Mssa8F1jLZMmW45Cway60txqVbcWntPJAymGJbrRErOO/++oUrV0u1C65u
 LW7gXAaIJWQTX9KnX0SEyejNod7ubZktBz7n5WfkJAPIzdw5wtJalhLa673YTgQ9
 zyTPKiWjJj2myCq1AYrJvlK8hSsIBqbBFcUf1zX4SzZWKS+5mtp51o4gfVzcCRPd
 z/6/iPbB
 =g5tx
 -----END PGP SIGNATURE-----

BabeConsensusDataProvider works with existing chains

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 Cargo.lock                                    |  41 ++--
 bin/node-template/node/Cargo.toml             |   2 +-
 bin/node/rpc-client/Cargo.toml                |   2 +-
 bin/node/rpc/Cargo.toml                       |   2 +-
 bin/node/runtime/Cargo.toml                   |   1 -
 client/api/src/execution_extensions.rs        |  56 +++---
 client/consensus/babe/rpc/Cargo.toml          |   6 +-
 client/consensus/babe/src/lib.rs              |  32 +++-
 client/consensus/manual-seal/Cargo.toml       |   8 +-
 .../manual-seal/src/consensus/babe.rs         | 176 ++++++++++++++----
 client/executor/src/native_executor.rs        |   4 +-
 client/finality-grandpa/rpc/Cargo.toml        |   8 +-
 client/rpc-api/Cargo.toml                     |   8 +-
 client/rpc-servers/Cargo.toml                 |  10 +-
 client/rpc/Cargo.toml                         |   6 +-
 client/service/Cargo.toml                     |   4 +-
 frame/contracts/rpc/Cargo.toml                |   6 +-
 frame/transaction-payment/rpc/Cargo.toml      |   6 +-
 utils/frame/rpc/support/Cargo.toml            |   4 +-
 utils/frame/rpc/system/Cargo.toml             |   6 +-
 20 files changed, 263 insertions(+), 125 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0f3e68a844e3..0da8f25b2242 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2620,9 +2620,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpc-client-transports"
-version = "15.0.0"
+version = "15.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6f7b1cdf66312002e15682a24430728bd13036c641163c016bc53fb686a7c2d"
+checksum = "489b9c612e60c766f751ab40fcb43cbb55a1e10bb44a9b4307ed510ca598cbd7"
 dependencies = [
  "failure",
  "futures 0.1.29",
@@ -2637,9 +2637,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpc-core"
-version = "15.0.0"
+version = "15.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30b12567a31d48588a65b6cf870081e6ba1d7b2ae353977cb9820d512e69c70"
+checksum = "0745a6379e3edc893c84ec203589790774e4247420033e71a76d3ab4687991fa"
 dependencies = [
  "futures 0.1.29",
  "log",
@@ -2650,18 +2650,18 @@ dependencies = [
 
 [[package]]
 name = "jsonrpc-core-client"
-version = "15.0.0"
+version = "15.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d175ca0cf77439b5495612bf216c650807d252d665b4b70ab2eebd895a88fac1"
+checksum = "6f764902d7b891344a0acb65625f32f6f7c6db006952143bd650209fbe7d94db"
 dependencies = [
  "jsonrpc-client-transports",
 ]
 
 [[package]]
 name = "jsonrpc-derive"
-version = "15.0.0"
+version = "15.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2cc6ea7f785232d9ca8786a44e9fa698f92149dcdc1acc4aa1fc69c4993d79e"
+checksum = "99a847f9ec7bb52149b2786a17c9cb260d6effc6b8eeb8c16b343a487a7563a3"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -2671,9 +2671,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpc-http-server"
-version = "15.0.0"
+version = "15.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9996b26c0c7a59626d0ed6c5ec8bf06218e62ce1474bd2849f9b9fd38a0158c0"
+checksum = "4fb5c4513b7b542f42da107942b7b759f27120b5cc894729f88254b28dff44b7"
 dependencies = [
  "hyper 0.12.35",
  "jsonrpc-core",
@@ -2686,9 +2686,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpc-ipc-server"
-version = "15.0.0"
+version = "15.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8e8f2278fb2b277175b6e21b23e7ecf30e78daff5ee301d0a2a411d9a821a0a"
+checksum = "cf50e53e4eea8f421a7316c5f63e395f7bc7c4e786a6dc54d76fab6ff7aa7ce7"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-server-utils",
@@ -2700,9 +2700,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpc-pubsub"
-version = "15.0.0"
+version = "15.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f389c5cd1f3db258a99296892c21047e21ae73ff4c0e2d39650ea86fe994b4c7"
+checksum = "639558e0604013be9787ae52f798506ae42bf4220fe587bdc5625871cc8b9c77"
 dependencies = [
  "jsonrpc-core",
  "log",
@@ -2713,9 +2713,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpc-server-utils"
-version = "15.0.0"
+version = "15.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c623e1895d0d9110cb0ea7736cfff13191ff52335ad33b21bd5c775ea98b27af"
+checksum = "72f1f3990650c033bd8f6bd46deac76d990f9bbfb5f8dc8c4767bf0a00392176"
 dependencies = [
  "bytes 0.4.12",
  "globset",
@@ -2729,9 +2729,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpc-ws-server"
-version = "15.0.0"
+version = "15.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436a92034d0137ab3e3c64a7a6350b428f31cb4d7d1a89f284bcdbcd98a7bc56"
+checksum = "6596fe75209b73a2a75ebe1dce4e60e03b88a2b25e8807b667597f6315150d22"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-server-utils",
@@ -3981,7 +3981,6 @@ dependencies = [
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
  "hex-literal",
- "integer-sqrt",
  "node-primitives",
  "pallet-authority-discovery",
  "pallet-authorship",
@@ -6797,6 +6796,7 @@ dependencies = [
  "jsonrpc-core-client",
  "jsonrpc-derive",
  "log",
+ "parity-scale-codec",
  "parking_lot 0.10.2",
  "sc-basic-authorship",
  "sc-client-api",
@@ -6810,6 +6810,7 @@ dependencies = [
  "sp-consensus-babe",
  "sp-core",
  "sp-inherents",
+ "sp-keyring",
  "sp-keystore",
  "sp-runtime",
  "sp-timestamp",
@@ -9798,7 +9799,7 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3bfd5b7557925ce778ff9b9ef90e3ade34c524b5ff10e239c69a42d546d2af56"
 dependencies = [
- "rand 0.3.23",
+ "rand 0.7.3",
 ]
 
 [[package]]
diff --git a/bin/node-template/node/Cargo.toml b/bin/node-template/node/Cargo.toml
index 8b1a47fd2bf1..d2b5a35b352b 100644
--- a/bin/node-template/node/Cargo.toml
+++ b/bin/node-template/node/Cargo.toml
@@ -35,7 +35,7 @@ sc-client-api = { version = "2.0.0", path = "../../../client/api" }
 sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
 
 # These dependencies are used for the node template's RPCs
-jsonrpc-core = "15.0.0"
+jsonrpc-core = "15.1.0"
 sc-rpc = { version = "2.0.0", path = "../../../client/rpc" }
 sp-api = { version = "2.0.0", path = "../../../primitives/api" }
 sc-rpc-api = { version = "0.8.0", path = "../../../client/rpc-api" }
diff --git a/bin/node/rpc-client/Cargo.toml b/bin/node/rpc-client/Cargo.toml
index 9f358e901daf..26d9de133c68 100644
--- a/bin/node/rpc-client/Cargo.toml
+++ b/bin/node/rpc-client/Cargo.toml
@@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 futures = "0.1.29"
 hyper = "0.12.35"
-jsonrpc-core-client = { version = "15.0.0", default-features = false, features = ["http"] }
+jsonrpc-core-client = { version = "15.1.0", default-features = false, features = ["http"] }
 log = "0.4.8"
 node-primitives = { version = "2.0.0", path = "../primitives" }
 sp-tracing = { version = "2.0.0", path = "../../../primitives/tracing" }
diff --git a/bin/node/rpc/Cargo.toml b/bin/node/rpc/Cargo.toml
index aef4a82db776..10d7fe80d7ce 100644
--- a/bin/node/rpc/Cargo.toml
+++ b/bin/node/rpc/Cargo.toml
@@ -11,7 +11,7 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-jsonrpc-core = "15.0.0"
+jsonrpc-core = "15.1.0"
 node-primitives = { version = "2.0.0", path = "../primitives" }
 node-runtime = { version = "2.0.0", path = "../runtime" }
 pallet-contracts-rpc = { version = "0.8.0", path = "../../../frame/contracts/rpc/" }
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index 80c914ff5758..2bad2db510be 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -15,7 +15,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 # third-party dependencies
 codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
-integer-sqrt = { version = "0.1.2" }
 serde = { version = "1.0.102", optional = true }
 static_assertions = "1.1.0"
 hex-literal = { version = "0.3.1", optional = true }
diff --git a/client/api/src/execution_extensions.rs b/client/api/src/execution_extensions.rs
index 4fdd897b2157..c187e7580023 100644
--- a/client/api/src/execution_extensions.rs
+++ b/client/api/src/execution_extensions.rs
@@ -136,31 +136,9 @@ impl<Block: traits::Block> ExecutionExtensions<Block> {
 		*self.transaction_pool.write() = Some(Arc::downgrade(&pool) as _);
 	}
 
-	/// Create `ExecutionManager` and `Extensions` for given offchain call.
-	///
 	/// Based on the execution context and capabilities it produces
-	/// the right manager and extensions object to support desired set of APIs.
-	pub fn manager_and_extensions<E: std::fmt::Debug, R: codec::Codec>(
-		&self,
-		at: &BlockId<Block>,
-		context: ExecutionContext,
-	) -> (
-		ExecutionManager<DefaultHandler<R, E>>,
-		Extensions,
-	) {
-		let manager = match context {
-			ExecutionContext::BlockConstruction =>
-				self.strategies.block_construction.get_manager(),
-			ExecutionContext::Syncing =>
-				self.strategies.syncing.get_manager(),
-			ExecutionContext::Importing =>
-				self.strategies.importing.get_manager(),
-			ExecutionContext::OffchainCall(Some((_, capabilities))) if capabilities.has_all() =>
-				self.strategies.offchain_worker.get_manager(),
-			ExecutionContext::OffchainCall(_) =>
-				self.strategies.other.get_manager(),
-		};
-
+	/// the extensions object to support desired set of APIs.
+	pub fn extensions(&self, at: &BlockId<Block>, context: ExecutionContext) -> Extensions {
 		let capabilities = context.capabilities();
 
 		let mut extensions = self.extensions_factory.read().extensions_for(capabilities);
@@ -190,7 +168,35 @@ impl<Block: traits::Block> ExecutionExtensions<Block> {
 			);
 		}
 
-		(manager, extensions)
+		extensions
+	}
+
+	/// Create `ExecutionManager` and `Extensions` for given offchain call.
+	///
+	/// Based on the execution context and capabilities it produces
+	/// the right manager and extensions object to support desired set of APIs.
+	pub fn manager_and_extensions<E: std::fmt::Debug, R: codec::Codec>(
+		&self,
+		at: &BlockId<Block>,
+		context: ExecutionContext,
+	) -> (
+		ExecutionManager<DefaultHandler<R, E>>,
+		Extensions,
+	) {
+		let manager = match context {
+			ExecutionContext::BlockConstruction =>
+				self.strategies.block_construction.get_manager(),
+			ExecutionContext::Syncing =>
+				self.strategies.syncing.get_manager(),
+			ExecutionContext::Importing =>
+				self.strategies.importing.get_manager(),
+			ExecutionContext::OffchainCall(Some((_, capabilities))) if capabilities.has_all() =>
+				self.strategies.offchain_worker.get_manager(),
+			ExecutionContext::OffchainCall(_) =>
+				self.strategies.other.get_manager(),
+		};
+
+		(manager, self.extensions(at, context))
 	}
 }
 
diff --git a/client/consensus/babe/rpc/Cargo.toml b/client/consensus/babe/rpc/Cargo.toml
index 5b3169e600a9..8a376e6c95b9 100644
--- a/client/consensus/babe/rpc/Cargo.toml
+++ b/client/consensus/babe/rpc/Cargo.toml
@@ -15,9 +15,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 sc-consensus-babe = { version = "0.8.0", path = "../" }
 sc-rpc-api = { version = "0.8.0", path = "../../../rpc-api" }
-jsonrpc-core = "15.0.0"
-jsonrpc-core-client = "15.0.0"
-jsonrpc-derive = "15.0.0"
+jsonrpc-core = "15.1.0"
+jsonrpc-core-client = "15.1.0"
+jsonrpc-derive = "15.1.0"
 sp-consensus-babe = { version = "0.8.0", path = "../../../../primitives/consensus/babe" }
 serde = { version = "1.0.104", features=["derive"] }
 sp-blockchain = { version = "2.0.0", path = "../../../../primitives/blockchain" }
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index 4705381c2b91..e980e358b848 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -199,58 +199,86 @@ impl Epoch {
 	}
 }
 
+/// Errors encountered by the babe authorship task.
 #[derive(derive_more::Display, Debug)]
-enum Error<B: BlockT> {
+pub enum Error<B: BlockT> {
+	/// Multiple BABE pre-runtime digests
 	#[display(fmt = "Multiple BABE pre-runtime digests, rejecting!")]
 	MultiplePreRuntimeDigests,
+	/// No BABE pre-runtime digest found
 	#[display(fmt = "No BABE pre-runtime digest found")]
 	NoPreRuntimeDigest,
+	/// Multiple BABE epoch change digests
 	#[display(fmt = "Multiple BABE epoch change digests, rejecting!")]
 	MultipleEpochChangeDigests,
+	/// Multiple BABE config change digests
 	#[display(fmt = "Multiple BABE config change digests, rejecting!")]
 	MultipleConfigChangeDigests,
+	/// Could not extract timestamp and slot
 	#[display(fmt = "Could not extract timestamp and slot: {:?}", _0)]
 	Extraction(sp_consensus::Error),
+	/// Could not fetch epoch
 	#[display(fmt = "Could not fetch epoch at {:?}", _0)]
 	FetchEpoch(B::Hash),
+	/// Header rejected: too far in the future
 	#[display(fmt = "Header {:?} rejected: too far in the future", _0)]
 	TooFarInFuture(B::Hash),
+	/// Parent unavailable. Cannot import
 	#[display(fmt = "Parent ({}) of {} unavailable. Cannot import", _0, _1)]
 	ParentUnavailable(B::Hash, B::Hash),
+	/// Slot number must increase
 	#[display(fmt = "Slot number must increase: parent slot: {}, this slot: {}", _0, _1)]
 	SlotNumberMustIncrease(u64, u64),
+	/// Header has a bad seal
 	#[display(fmt = "Header {:?} has a bad seal", _0)]
 	HeaderBadSeal(B::Hash),
+	/// Header is unsealed
 	#[display(fmt = "Header {:?} is unsealed", _0)]
 	HeaderUnsealed(B::Hash),
+	/// Slot author not found
 	#[display(fmt = "Slot author not found")]
 	SlotAuthorNotFound,
+	/// Secondary slot assignments are disabled for the current epoch.
 	#[display(fmt = "Secondary slot assignments are disabled for the current epoch.")]
 	SecondarySlotAssignmentsDisabled,
+	/// Bad signature
 	#[display(fmt = "Bad signature on {:?}", _0)]
 	BadSignature(B::Hash),
+	/// Invalid author: Expected secondary author
 	#[display(fmt = "Invalid author: Expected secondary author: {:?}, got: {:?}.", _0, _1)]
 	InvalidAuthor(AuthorityId, AuthorityId),
+	/// No secondary author expected.
 	#[display(fmt = "No secondary author expected.")]
 	NoSecondaryAuthorExpected,
+	/// VRF verification of block by author failed
 	#[display(fmt = "VRF verification of block by author {:?} failed: threshold {} exceeded", _0, _1)]
 	VRFVerificationOfBlockFailed(AuthorityId, u128),
+	/// VRF verification failed
 	#[display(fmt = "VRF verification failed: {:?}", _0)]
 	VRFVerificationFailed(SignatureError),
+	/// Could not fetch parent header
 	#[display(fmt = "Could not fetch parent header: {:?}", _0)]
 	FetchParentHeader(sp_blockchain::Error),
+	/// Expected epoch change to happen.
 	#[display(fmt = "Expected epoch change to happen at {:?}, s{}", _0, _1)]
 	ExpectedEpochChange(B::Hash, u64),
+	/// Unexpected config change.
 	#[display(fmt = "Unexpected config change")]
 	UnexpectedConfigChange,
+	/// Unexpected epoch change
 	#[display(fmt = "Unexpected epoch change")]
 	UnexpectedEpochChange,
+	/// Parent block has no associated weight
 	#[display(fmt = "Parent block of {} has no associated weight", _0)]
 	ParentBlockNoAssociatedWeight(B::Hash),
 	#[display(fmt = "Checking inherents failed: {}", _0)]
+	/// Check Inherents error
 	CheckInherents(String),
+	/// Client error
 	Client(sp_blockchain::Error),
+	/// Runtime error
 	Runtime(sp_inherents::Error),
+	/// Fork tree error
 	ForkTree(Box<fork_tree::Error<sp_blockchain::Error>>),
 }
 
@@ -669,7 +697,7 @@ impl<B, C, E, I, Error, SO> sc_consensus_slots::SimpleSlotWorker<B> for BabeSlot
 
 /// Extract the BABE pre digest from the given header. Pre-runtime digests are
 /// mandatory, the function will return `Err` if none is found.
-fn find_pre_digest<B: BlockT>(header: &B::Header) -> Result<PreDigest, Error<B>>
+pub fn find_pre_digest<B: BlockT>(header: &B::Header) -> Result<PreDigest, Error<B>>
 {
 	// genesis block doesn't contain a pre digest so let's generate a
 	// dummy one to not break any invariants in the rest of the code
diff --git a/client/consensus/manual-seal/Cargo.toml b/client/consensus/manual-seal/Cargo.toml
index dba8121264f4..d50cb5936526 100644
--- a/client/consensus/manual-seal/Cargo.toml
+++ b/client/consensus/manual-seal/Cargo.toml
@@ -15,11 +15,12 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 derive_more = "0.99.2"
 futures = "0.3.4"
-jsonrpc-core = "15.0.0"
-jsonrpc-core-client = "15.0.0"
-jsonrpc-derive = "15.0.0"
+jsonrpc-core = "15.1.0"
+jsonrpc-core-client = "15.1.0"
+jsonrpc-derive = "15.1.0"
 log = "0.4.8"
 parking_lot = "0.10.0"
+codec = { package = "parity-scale-codec", version = "1.3.1" }
 serde = { version = "1.0", features=["derive"] }
 assert_matches = "1.3.0"
 
@@ -35,6 +36,7 @@ sp-inherents = { path = "../../../primitives/inherents", version = "2.0.0" }
 sp-runtime = {  path = "../../../primitives/runtime", version = "2.0.0" }
 sp-core = {  path = "../../../primitives/core", version = "2.0.0" }
 sp-keystore = {  path = "../../../primitives/keystore", version = "0.8.0" }
+sp-keyring = {  path = "../../../primitives/keyring", version = "2.0.0" }
 sp-api = {  path = "../../../primitives/api", version = "2.0.0" }
 sp-transaction-pool = { path = "../../../primitives/transaction-pool", version = "2.0.0" }
 sp-timestamp = { path = "../../../primitives/timestamp", version = "2.0.0" }
diff --git a/client/consensus/manual-seal/src/consensus/babe.rs b/client/consensus/manual-seal/src/consensus/babe.rs
index e51eb42e49e1..c2fdf6243c30 100644
--- a/client/consensus/manual-seal/src/consensus/babe.rs
+++ b/client/consensus/manual-seal/src/consensus/babe.rs
@@ -20,7 +20,7 @@
 
 use super::ConsensusDataProvider;
 use crate::Error;
-
+use codec::Encode;
 use std::{
 	any::Any,
 	borrow::Cow,
@@ -30,21 +30,24 @@ use std::{
 use sc_client_api::AuxStore;
 use sc_consensus_babe::{
 	Config, Epoch, authorship, CompatibleDigestItem, BabeIntermediate,
-	register_babe_inherent_data_provider, INTERMEDIATE_KEY,
+	register_babe_inherent_data_provider, INTERMEDIATE_KEY, find_pre_digest,
 };
-use sc_consensus_epochs::{SharedEpochChanges, descendent_query};
+use sc_consensus_epochs::{SharedEpochChanges, descendent_query, ViableEpochDescriptor, EpochHeader};
+use sp_keystore::SyncCryptoStorePtr;
 
 use sp_api::{ProvideRuntimeApi, TransactionFor};
 use sp_blockchain::{HeaderBackend, HeaderMetadata};
 use sp_consensus::BlockImportParams;
-use sp_consensus_babe::{BabeApi, inherents::BabeInherentData};
-use sp_keystore::SyncCryptoStorePtr;
+use sp_consensus_babe::{
+	BabeApi, inherents::BabeInherentData, ConsensusLog, BABE_ENGINE_ID, AuthorityId,
+	digests::{PreDigest, SecondaryPlainPreDigest, NextEpochDescriptor}, BabeAuthorityWeight,
+};
 use sp_inherents::{InherentDataProviders, InherentData, ProvideInherentData, InherentIdentifier};
 use sp_runtime::{
-	traits::{DigestItemFor, DigestFor, Block as BlockT, Header as _},
-	generic::Digest,
+	traits::{DigestItemFor, DigestFor, Block as BlockT, Zero, Header},
+	generic::{Digest, BlockId},
 };
-use sp_timestamp::{InherentType, InherentError, INHERENT_IDENTIFIER};
+use sp_timestamp::{InherentType, InherentError, INHERENT_IDENTIFIER, TimestampInherentData};
 
 /// Provides BABE-compatible predigests and BlockImportParams.
 /// Intended for use with BABE runtimes.
@@ -60,12 +63,15 @@ pub struct BabeConsensusDataProvider<B: BlockT, C> {
 
 	/// BABE config, gotten from the runtime.
 	config: Config,
+
+	/// Authorities to be used for this babe chain.
+	authorities: Vec<(AuthorityId, BabeAuthorityWeight)>,
 }
 
 impl<B, C> BabeConsensusDataProvider<B, C>
 	where
 		B: BlockT,
-		C: AuxStore + ProvideRuntimeApi<B>,
+		C: AuxStore + HeaderBackend<B> + ProvideRuntimeApi<B> + HeaderMetadata<B, Error = sp_blockchain::Error>,
 		C::Api: BabeApi<B, Error = sp_blockchain::Error>,
 {
 	pub fn new(
@@ -73,9 +79,14 @@ impl<B, C> BabeConsensusDataProvider<B, C>
 		keystore: SyncCryptoStorePtr,
 		provider: &InherentDataProviders,
 		epoch_changes: SharedEpochChanges<B, Epoch>,
+		authorities: Vec<(AuthorityId, BabeAuthorityWeight)>,
 	) -> Result<Self, Error> {
+		if authorities.is_empty() {
+			return Err(Error::StringError("Cannot supply empty authority set!".into()))
+		}
+
 		let config = Config::get_or_compute(&*client)?;
-		let timestamp_provider = SlotTimestampProvider::new(config.slot_duration)?;
+		let timestamp_provider = SlotTimestampProvider::new(client.clone())?;
 
 		provider.register_provider(timestamp_provider)?;
 		register_babe_inherent_data_provider(provider, config.slot_duration)?;
@@ -85,21 +96,11 @@ impl<B, C> BabeConsensusDataProvider<B, C>
 			client,
 			keystore,
 			epoch_changes,
+			authorities,
 		})
 	}
-}
-
-impl<B, C> ConsensusDataProvider<B> for BabeConsensusDataProvider<B, C>
-	where
-		B: BlockT,
-		C: AuxStore + HeaderBackend<B> + HeaderMetadata<B, Error = sp_blockchain::Error> + ProvideRuntimeApi<B>,
-		C::Api: BabeApi<B, Error = sp_blockchain::Error>,
-{
-	type Transaction = TransactionFor<C, B>;
-
-	fn create_digest(&self, parent: &B::Header, inherents: &InherentData) -> Result<DigestFor<B>, Error> {
-		let slot_number = inherents.babe_inherent_data()?;
 
+	fn epoch(&self, parent: &B::Header, slot_number: u64) -> Result<Epoch, Error> {
 		let epoch_changes = self.epoch_changes.lock();
 		let epoch_descriptor = epoch_changes
 			.epoch_descriptor_for_child_of(
@@ -121,15 +122,70 @@ impl<B, C> ConsensusDataProvider<B> for BabeConsensusDataProvider<B, C>
 				sp_consensus::Error::InvalidAuthoritiesSet
 			})?;
 
-		// this is a dev node environment, we should always be able to claim a slot.
-		let (predigest, _) = authorship::claim_slot(slot_number, epoch.as_ref(), &self.keystore)
-			.ok_or_else(|| Error::StringError("failed to claim slot for authorship".into()))?;
+		Ok(epoch.as_ref().clone())
+	}
+}
 
-		Ok(Digest {
-			logs: vec![
+impl<B, C> ConsensusDataProvider<B> for BabeConsensusDataProvider<B, C>
+	where
+		B: BlockT,
+		C: AuxStore + HeaderBackend<B> + HeaderMetadata<B, Error = sp_blockchain::Error> + ProvideRuntimeApi<B>,
+		C::Api: BabeApi<B, Error = sp_blockchain::Error>,
+{
+	type Transaction = TransactionFor<C, B>;
+
+	fn create_digest(&self, parent: &B::Header, inherents: &InherentData) -> Result<DigestFor<B>, Error> {
+		let slot_number = inherents.babe_inherent_data()?;
+		let epoch = self.epoch(parent, slot_number)?;
+
+		// this is a dev node environment, we should always be able to claim a slot.
+		let logs =  if let Some((predigest, _)) = authorship::claim_slot(slot_number, &epoch, &self.keystore) {
+			vec![
 				<DigestItemFor<B> as CompatibleDigestItem>::babe_pre_digest(predigest),
-			],
-		})
+			]
+		} else {
+			// well we couldn't claim a slot because this is an existing chain and we're not in the authorities.
+			// we need to tell BabeBlockImport that the epoch has changed, and we put ourselves in the authorities.
+			let predigest = PreDigest::SecondaryPlain(SecondaryPlainPreDigest {
+				slot_number,
+				authority_index: 0_u32,
+			});
+
+			let mut epoch_changes = self.epoch_changes.lock();
+			let epoch_descriptor = epoch_changes
+				.epoch_descriptor_for_child_of(
+					descendent_query(&*self.client),
+					&parent.hash(),
+					parent.number().clone(),
+					slot_number,
+				)
+				.map_err(|e| Error::StringError(format!("failed to fetch epoch_descriptor: {}", e)))?
+				.ok_or_else(|| sp_consensus::Error::InvalidAuthoritiesSet)?;
+
+			let epoch_mut = match epoch_descriptor {
+				ViableEpochDescriptor::Signaled(identifier, _epoch_header) => {
+					epoch_changes.epoch_mut(&identifier)
+						.ok_or_else(|| sp_consensus::Error::InvalidAuthoritiesSet)?
+				},
+				_ => unreachable!("we couldn't claim a slot, so this isn't the genesis epoch; qed")
+			};
+
+			// mutate the current epoch
+			epoch_mut.authorities = self.authorities.clone();
+
+			let next_epoch = ConsensusLog::NextEpochData(NextEpochDescriptor {
+				authorities: self.authorities.clone(),
+				// copy the old randomness
+				randomness: epoch_mut.randomness.clone(),
+			});
+
+			vec![
+				DigestItemFor::<B>::PreRuntime(BABE_ENGINE_ID, predigest.encode()),
+				DigestItemFor::<B>::Consensus(BABE_ENGINE_ID, next_epoch.encode())
+			]
+		};
+
+		Ok(Digest { logs })
 	}
 
 	fn append_block_import(
@@ -139,16 +195,42 @@ impl<B, C> ConsensusDataProvider<B> for BabeConsensusDataProvider<B, C>
 		inherents: &InherentData
 	) -> Result<(), Error> {
 		let slot_number = inherents.babe_inherent_data()?;
-
-		let epoch_descriptor = self.epoch_changes.lock()
+		let epoch_changes = self.epoch_changes.lock();
+		let mut epoch_descriptor = epoch_changes
 			.epoch_descriptor_for_child_of(
 				descendent_query(&*self.client),
 				&parent.hash(),
 				parent.number().clone(),
 				slot_number,
 			)
-			.map_err(|e| Error::StringError(format!("failed to fetch epoch data: {}", e)))?
+			.map_err(|e| Error::StringError(format!("failed to fetch epoch_descriptor: {}", e)))?
 			.ok_or_else(|| sp_consensus::Error::InvalidAuthoritiesSet)?;
+		// drop the lock
+		drop(epoch_changes);
+		// a quick check to see if we're in the authorities
+		let epoch = self.epoch(parent, slot_number)?;
+		let (authority, _) = self.authorities.first().expect("authorities is non-emptyp; qed");
+		let has_authority = epoch.authorities.iter()
+			.find(|(id, _)| *id == *authority)
+			.is_some();
+
+		if !has_authority {
+			log::info!(target: "manual-seal", "authority not found");
+			let slot_number = inherents.timestamp_inherent_data()? / self.config.slot_duration;
+			// manually hard code epoch descriptor
+			epoch_descriptor = match epoch_descriptor {
+				ViableEpochDescriptor::Signaled(identifier, _header) => {
+					ViableEpochDescriptor::Signaled(
+						identifier,
+						EpochHeader {
+							start_slot: slot_number,
+							end_slot: slot_number * self.config.epoch_length,
+						},
+					)
+				},
+				_ => unreachable!("we're not in the authorities, so this isn't the genesis epoch; qed")
+			};
+		}
 
 		params.intermediates.insert(
 			Cow::from(INTERMEDIATE_KEY),
@@ -168,12 +250,32 @@ struct SlotTimestampProvider {
 
 impl SlotTimestampProvider {
 	/// create a new mocked time stamp provider.
-	fn new(slot_duration: u64) -> Result<Self, Error> {
-		let now = SystemTime::now();
-		let duration = now.duration_since(SystemTime::UNIX_EPOCH)
-			.map_err(|err| Error::StringError(format!("{}", err)))?;
+	fn new<B, C>(client: Arc<C>) -> Result<Self, Error>
+		where
+			B: BlockT,
+			C: AuxStore + HeaderBackend<B> + ProvideRuntimeApi<B>,
+			C::Api: BabeApi<B, Error = sp_blockchain::Error>,
+	{
+		let slot_duration = Config::get_or_compute(&*client)?.slot_duration;
+		let info = client.info();
+
+		// looks like this isn't the first block, rehydrate the fake time.
+		// otherwise we'd be producing blocks for older slots.
+		let duration = if info.best_number != Zero::zero() {
+			let header = client.header(BlockId::Hash(info.best_hash))?.unwrap();
+			let slot_number = find_pre_digest::<B>(&header).unwrap().slot_number();
+			// add the slot duration so there's no collision of slots
+			(slot_number * slot_duration) + slot_duration
+		} else {
+			// this is the first block, use the correct time.
+			let now = SystemTime::now();
+			now.duration_since(SystemTime::UNIX_EPOCH)
+				.map_err(|err| Error::StringError(format!("{}", err)))?
+				.as_millis() as u64
+		};
+
 		Ok(Self {
-			time: atomic::AtomicU64::new(duration.as_millis() as u64),
+			time: atomic::AtomicU64::new(duration),
 			slot_duration,
 		})
 	}
diff --git a/client/executor/src/native_executor.rs b/client/executor/src/native_executor.rs
index 1da82313a2df..b5d67b9e73f4 100644
--- a/client/executor/src/native_executor.rs
+++ b/client/executor/src/native_executor.rs
@@ -258,10 +258,10 @@ impl<D: NativeExecutionDispatch> NativeExecutor<D> {
 		default_heap_pages: Option<u64>,
 		max_runtime_instances: usize,
 	) -> Self {
-		let mut host_functions = sp_io::SubstrateHostFunctions::host_functions();
+		let mut host_functions = D::ExtendHostFunctions::host_functions();
 
 		// Add the custom host functions provided by the user.
-		host_functions.extend(D::ExtendHostFunctions::host_functions());
+		host_functions.extend(sp_io::SubstrateHostFunctions::host_functions());
 		let wasm_executor = WasmExecutor::new(
 			fallback_method,
 			default_heap_pages,
diff --git a/client/finality-grandpa/rpc/Cargo.toml b/client/finality-grandpa/rpc/Cargo.toml
index c0c2ea8b27d8..d1be93a19a72 100644
--- a/client/finality-grandpa/rpc/Cargo.toml
+++ b/client/finality-grandpa/rpc/Cargo.toml
@@ -15,10 +15,10 @@ sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
 sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
 finality-grandpa = { version = "0.12.3", features = ["derive-codec"] }
-jsonrpc-core = "15.0.0"
-jsonrpc-core-client = "15.0.0"
-jsonrpc-derive = "15.0.0"
-jsonrpc-pubsub = "15.0.0"
+jsonrpc-core = "15.1.0"
+jsonrpc-core-client = "15.1.0"
+jsonrpc-derive = "15.1.0"
+jsonrpc-pubsub = "15.1.0"
 futures = { version = "0.3.4", features = ["compat"] }
 serde = { version = "1.0.105", features = ["derive"] }
 serde_json = "1.0.50"
diff --git a/client/rpc-api/Cargo.toml b/client/rpc-api/Cargo.toml
index 55eb51d261cd..0947dc47819c 100644
--- a/client/rpc-api/Cargo.toml
+++ b/client/rpc-api/Cargo.toml
@@ -16,10 +16,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "1.3.4" }
 derive_more = "0.99.2"
 futures = { version = "0.3.1", features = ["compat"] }
-jsonrpc-core = "15.0.0"
-jsonrpc-core-client = "15.0.0"
-jsonrpc-derive = "15.0.0"
-jsonrpc-pubsub = "15.0.0"
+jsonrpc-core = "15.1.0"
+jsonrpc-core-client = "15.1.0"
+jsonrpc-derive = "15.1.0"
+jsonrpc-pubsub = "15.1.0"
 log = "0.4.8"
 parking_lot = "0.10.0"
 sp-core = { version = "2.0.0", path = "../../primitives/core" }
diff --git a/client/rpc-servers/Cargo.toml b/client/rpc-servers/Cargo.toml
index 4fdf0298a530..d414fbf259d3 100644
--- a/client/rpc-servers/Cargo.toml
+++ b/client/rpc-servers/Cargo.toml
@@ -14,8 +14,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 futures = "0.1.6"
-jsonrpc-core = "15.0.0"
-pubsub = { package = "jsonrpc-pubsub", version = "15.0.0" }
+jsonrpc-core = "15.1.0"
+pubsub = { package = "jsonrpc-pubsub", version = "15.1.0" }
 log = "0.4.8"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.8.0"}
 serde = "1.0.101"
@@ -23,6 +23,6 @@ serde_json = "1.0.41"
 sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
-http = { package = "jsonrpc-http-server", version = "15.0.0" }
-ipc = { package = "jsonrpc-ipc-server", version = "15.0.0" }
-ws = { package = "jsonrpc-ws-server", version = "15.0.0" }
+http = { package = "jsonrpc-http-server", version = "15.1.0" }
+ipc = { package = "jsonrpc-ipc-server", version = "15.1.0" }
+ws = { package = "jsonrpc-ws-server", version = "15.1.0" }
diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml
index 021c795fe5b9..0af880f4330b 100644
--- a/client/rpc/Cargo.toml
+++ b/client/rpc/Cargo.toml
@@ -18,11 +18,10 @@ sc-client-api = { version = "2.0.0", path = "../api" }
 sp-api = { version = "2.0.0", path = "../../primitives/api" }
 codec = { package = "parity-scale-codec", version = "1.3.4" }
 futures = { version = "0.3.1", features = ["compat"] }
-jsonrpc-pubsub = "15.0.0"
+jsonrpc-pubsub = "15.1.0"
 log = "0.4.8"
 sp-core = { version = "2.0.0", path = "../../primitives/core" }
-sp-keystore = { version = "0.8.0", path = "../../primitives/keystore" }
-rpc = { package = "jsonrpc-core", version = "15.0.0" }
+rpc = { package = "jsonrpc-core", version = "15.1.0" }
 sp-version = { version = "2.0.0", path = "../../primitives/version" }
 serde_json = "1.0.41"
 sp-session = { version = "2.0.0", path = "../../primitives/session" }
@@ -30,6 +29,7 @@ sp-offchain = { version = "2.0.0", path = "../../primitives/offchain" }
 sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
 sp-utils = { version = "2.0.0", path = "../../primitives/utils" }
 sp-rpc = { version = "2.0.0", path = "../../primitives/rpc" }
+sp-keystore = { version = "0.8.0", path = "../../primitives/keystore" }
 sp-state-machine = { version = "0.8.0", path = "../../primitives/state-machine" }
 sp-chain-spec = { version = "2.0.0", path = "../../primitives/chain-spec" }
 sc-executor = { version = "0.8.0", path = "../executor" }
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index 3569b2e7e585..b85ebde3c1d2 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -27,8 +27,8 @@ test-helpers = []
 derive_more = "0.99.2"
 futures01 = { package = "futures", version = "0.1.29" }
 futures = { version = "0.3.4", features = ["compat"] }
-jsonrpc-pubsub = "15.0"
-jsonrpc-core = "15.0"
+jsonrpc-pubsub = "15.1"
+jsonrpc-core = "15.1"
 rand = "0.7.3"
 parking_lot = "0.10.0"
 lazy_static = "1.4.0"
diff --git a/frame/contracts/rpc/Cargo.toml b/frame/contracts/rpc/Cargo.toml
index 587abcbcddae..362e298102a0 100644
--- a/frame/contracts/rpc/Cargo.toml
+++ b/frame/contracts/rpc/Cargo.toml
@@ -14,9 +14,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "1.3.4" }
-jsonrpc-core = "15.0.0"
-jsonrpc-core-client = "15.0.0"
-jsonrpc-derive = "15.0.0"
+jsonrpc-core = "15.1.0"
+jsonrpc-core-client = "15.1.0"
+jsonrpc-derive = "15.1.0"
 sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
 sp-rpc = { version = "2.0.0", path = "../../../primitives/rpc" }
diff --git a/frame/transaction-payment/rpc/Cargo.toml b/frame/transaction-payment/rpc/Cargo.toml
index 26f073e60237..77ebc0fb80e9 100644
--- a/frame/transaction-payment/rpc/Cargo.toml
+++ b/frame/transaction-payment/rpc/Cargo.toml
@@ -14,9 +14,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "1.3.1" }
-jsonrpc-core = "15.0.0"
-jsonrpc-core-client = "15.0.0"
-jsonrpc-derive = "15.0.0"
+jsonrpc-core = "15.1.0"
+jsonrpc-core-client = "15.1.0"
+jsonrpc-derive = "15.1.0"
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
 sp-rpc = { version = "2.0.0", path = "../../../primitives/rpc" }
 serde = { version = "1.0.101", features = ["derive"] }
diff --git a/utils/frame/rpc/support/Cargo.toml b/utils/frame/rpc/support/Cargo.toml
index 2541ed0cf655..3b310b3a91c4 100644
--- a/utils/frame/rpc/support/Cargo.toml
+++ b/utils/frame/rpc/support/Cargo.toml
@@ -13,8 +13,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 futures = { version = "0.3.0", features = ["compat"] }
-jsonrpc-client-transports = { version = "15.0.0", default-features = false, features = ["http"] }
-jsonrpc-core = "15.0.0"
+jsonrpc-client-transports = { version = "15.1.0", default-features = false, features = ["http"] }
+jsonrpc-core = "15.1.0"
 codec = { package = "parity-scale-codec", version = "1.3.1" }
 serde = "1"
 frame-support = { version = "2.0.0", path = "../../../../frame/support" }
diff --git a/utils/frame/rpc/system/Cargo.toml b/utils/frame/rpc/system/Cargo.toml
index 515ff9325152..19b6a6e8302b 100644
--- a/utils/frame/rpc/system/Cargo.toml
+++ b/utils/frame/rpc/system/Cargo.toml
@@ -16,9 +16,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 sc-client-api = { version = "2.0.0", path = "../../../../client/api" }
 codec = { package = "parity-scale-codec", version = "1.3.1" }
 futures = { version = "0.3.4", features = ["compat"] }
-jsonrpc-core = "15.0.0"
-jsonrpc-core-client = "15.0.0"
-jsonrpc-derive = "15.0.0"
+jsonrpc-core = "15.1.0"
+jsonrpc-core-client = "15.1.0"
+jsonrpc-derive = "15.1.0"
 log = "0.4.8"
 serde = { version = "1.0.101", features = ["derive"] }
 sp-runtime = { version = "2.0.0", path = "../../../../primitives/runtime" }

From 83fc915b6f4d7ff53ccdb18b544b831972d5df1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Thu, 5 Nov 2020 14:36:35 +0000
Subject: [PATCH 0054/1194] grandpa: store the authority id that is used for
 voting per round (#7454)

* grandpa: store the authority id that is used for voting per round

* grandpa: fix tests
---
 client/finality-grandpa/src/environment.rs | 68 +++++++++++++++++-----
 client/finality-grandpa/src/tests.rs       | 10 ++++
 primitives/finality-grandpa/src/lib.rs     |  8 +++
 3 files changed, 70 insertions(+), 16 deletions(-)

diff --git a/client/finality-grandpa/src/environment.rs b/client/finality-grandpa/src/environment.rs
index 7f9e966c9acc..9b3a656d0cd8 100644
--- a/client/finality-grandpa/src/environment.rs
+++ b/client/finality-grandpa/src/environment.rs
@@ -16,18 +16,18 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use std::collections::BTreeMap;
+use std::collections::{BTreeMap, HashMap};
 use std::iter::FromIterator;
+use std::marker::PhantomData;
 use std::pin::Pin;
 use std::sync::Arc;
 use std::time::Duration;
 
-use log::{debug, warn};
-use parity_scale_codec::{Decode, Encode};
 use futures::prelude::*;
 use futures_timer::Delay;
+use log::{debug, warn};
+use parity_scale_codec::{Decode, Encode};
 use parking_lot::RwLock;
-use std::marker::PhantomData;
 
 use sc_client_api::{backend::{Backend, apply_aux}, utils::is_descendent_of};
 use finality_grandpa::{
@@ -331,7 +331,11 @@ impl<Block: BlockT> HasVoted<Block> {
 /// A voter set state meant to be shared safely across multiple owners.
 #[derive(Clone)]
 pub struct SharedVoterSetState<Block: BlockT> {
+	/// The inner shared `VoterSetState`.
 	inner: Arc<RwLock<VoterSetState<Block>>>,
+	/// A tracker for the rounds that we are actively participating on (i.e. voting)
+	/// and the authority id under which we are doing it.
+	voting: Arc<RwLock<HashMap<RoundNumber, AuthorityId>>>,
 }
 
 impl<Block: BlockT> From<VoterSetState<Block>> for SharedVoterSetState<Block> {
@@ -343,7 +347,10 @@ impl<Block: BlockT> From<VoterSetState<Block>> for SharedVoterSetState<Block> {
 impl<Block: BlockT> SharedVoterSetState<Block> {
 	/// Create a new shared voter set tracker with the given state.
 	pub(crate) fn new(state: VoterSetState<Block>) -> Self {
-		SharedVoterSetState { inner: Arc::new(RwLock::new(state)) }
+		SharedVoterSetState {
+			inner: Arc::new(RwLock::new(state)),
+			voting: Arc::new(RwLock::new(HashMap::new())),
+		}
 	}
 
 	/// Read the inner voter set state.
@@ -351,6 +358,23 @@ impl<Block: BlockT> SharedVoterSetState<Block> {
 		self.inner.read()
 	}
 
+	/// Get the authority id that we are using to vote on the given round, if any.
+	pub(crate) fn voting_on(&self, round: RoundNumber) -> Option<AuthorityId> {
+		self.voting.read().get(&round).cloned()
+	}
+
+	/// Note that we started voting on the give round with the given authority id.
+	pub(crate) fn started_voting_on(&self, round: RoundNumber, local_id: AuthorityId) {
+		self.voting.write().insert(round, local_id);
+	}
+
+	/// Note that we have finished voting on the given round. If we were voting on
+	/// the given round, the authority id that we were using to do it will be
+	/// cleared.
+	pub(crate) fn finished_voting_on(&self, round: RoundNumber) {
+		self.voting.write().remove(&round);
+	}
+
 	/// Return vote status information for the current round.
 	pub(crate) fn has_voted(&self, round: RoundNumber) -> HasVoted<Block> {
 		match &*self.inner.read() {
@@ -471,7 +495,7 @@ where
 		&self,
 		equivocation: Equivocation<Block::Hash, NumberFor<Block>>,
 	) -> Result<(), Error> {
-		if let Some(local_id) = local_authority_id(&self.voters, self.config.keystore.as_ref()) {
+		if let Some(local_id) = self.voter_set_state.voting_on(equivocation.round_number()) {
 			if *equivocation.offender() == local_id {
 				return Err(Error::Safety(
 					"Refraining from sending equivocation report for our own equivocation.".into(),
@@ -745,6 +769,17 @@ where
 			HasVoted::No => HasVoted::No,
 		};
 
+		// NOTE: we cache the local authority id that we'll be using to vote on the
+		// given round. this is done to make sure we only check for available keys
+		// from the keystore in this method when beginning the round, otherwise if
+		// the keystore state changed during the round (e.g. a key was removed) it
+		// could lead to internal state inconsistencies in the voter environment
+		// (e.g. we wouldn't update the voter set state after prevoting since there's
+		// no local authority id).
+		if let Some(id) = local_id.as_ref() {
+			self.voter_set_state.started_voting_on(round, id.clone());
+		}
+
 		// we can only sign when we have a local key in the authority set
 		// and we have a reference to the keystore.
 		let keystore = match (local_id.as_ref(), self.config.keystore.as_ref()) {
@@ -783,10 +818,12 @@ where
 		}
 	}
 
-	fn proposed(&self, round: RoundNumber, propose: PrimaryPropose<Block>) -> Result<(), Self::Error> {
-		let local_id = local_authority_id(&self.voters, self.config.keystore.as_ref());
-
-		let local_id = match local_id {
+	fn proposed(
+		&self,
+		round: RoundNumber,
+		propose: PrimaryPropose<Block>,
+	) -> Result<(), Self::Error> {
+		let local_id = match self.voter_set_state.voting_on(round) {
 			Some(id) => id,
 			None => return Ok(()),
 		};
@@ -823,9 +860,7 @@ where
 	}
 
 	fn prevoted(&self, round: RoundNumber, prevote: Prevote<Block>) -> Result<(), Self::Error> {
-		let local_id = local_authority_id(&self.voters, self.config.keystore.as_ref());
-
-		let local_id = match local_id {
+		let local_id = match self.voter_set_state.voting_on(round) {
 			Some(id) => id,
 			None => return Ok(()),
 		};
@@ -884,9 +919,7 @@ where
 		round: RoundNumber,
 		precommit: Precommit<Block>,
 	) -> Result<(), Self::Error> {
-		let local_id = local_authority_id(&self.voters, self.config.keystore.as_ref());
-
-		let local_id = match local_id {
+		let local_id = match self.voter_set_state.voting_on(round) {
 			Some(id) => id,
 			None => return Ok(()),
 		};
@@ -1010,6 +1043,9 @@ where
 			Ok(Some(set_state))
 		})?;
 
+		// clear any cached local authority id associated with this round
+		self.voter_set_state.finished_voting_on(round);
+
 		Ok(())
 	}
 
diff --git a/client/finality-grandpa/src/tests.rs b/client/finality-grandpa/src/tests.rs
index cf1b2ef98627..175c5360b2c1 100644
--- a/client/finality-grandpa/src/tests.rs
+++ b/client/finality-grandpa/src/tests.rs
@@ -1713,6 +1713,10 @@ fn grandpa_environment_never_overwrites_round_voter_state() {
 
 	assert_eq!(get_current_round(2).unwrap(), HasVoted::No);
 
+	// we need to call `round_data` for the next round to pick up
+	// from the keystore which authority id we'll be using to vote
+	environment.round_data(2);
+
 	let info = peer.client().info();
 
 	let prevote = finality_grandpa::Prevote {
@@ -1816,6 +1820,8 @@ fn imports_justification_for_regular_blocks_on_import() {
 
 #[test]
 fn grandpa_environment_doesnt_send_equivocation_reports_for_itself() {
+	use finality_grandpa::voter::Environment;
+
 	let alice = Ed25519Keyring::Alice;
 	let voters = make_ids(&[alice]);
 
@@ -1845,6 +1851,10 @@ fn grandpa_environment_doesnt_send_equivocation_reports_for_itself() {
 		second: signed_prevote.clone(),
 	};
 
+	// we need to call `round_data` to pick up from the keystore which
+	// authority id we'll be using to vote
+	environment.round_data(1);
+
 	// reporting the equivocation should fail since the offender is a local
 	// authority (i.e. we have keys in our keystore for the given id)
 	let equivocation_proof = sp_finality_grandpa::Equivocation::Prevote(equivocation.clone());
diff --git a/primitives/finality-grandpa/src/lib.rs b/primitives/finality-grandpa/src/lib.rs
index 2c569fafda4c..0426dad94682 100644
--- a/primitives/finality-grandpa/src/lib.rs
+++ b/primitives/finality-grandpa/src/lib.rs
@@ -252,6 +252,14 @@ impl<H, N> Equivocation<H, N> {
 			Equivocation::Precommit(ref equivocation) => &equivocation.identity,
 		}
 	}
+
+	/// Returns the round number when the equivocation happened.
+	pub fn round_number(&self) -> RoundNumber {
+		match self {
+			Equivocation::Prevote(ref equivocation) => equivocation.round_number,
+			Equivocation::Precommit(ref equivocation) => equivocation.round_number,
+		}
+	}
 }
 
 /// Verifies the equivocation proof by making sure that both votes target

From b61d3b3db01645da51cf0f312b73b92c957d61c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Thu, 5 Nov 2020 16:50:49 +0100
Subject: [PATCH 0055/1194] Prevent publishing of pallet_contracts for now
 (#7496)

---
 frame/contracts/Cargo.toml                 | 3 +++
 frame/contracts/common/Cargo.toml          | 1 +
 frame/contracts/rpc/Cargo.toml             | 1 +
 frame/contracts/rpc/runtime-api/Cargo.toml | 1 +
 4 files changed, 6 insertions(+)

diff --git a/frame/contracts/Cargo.toml b/frame/contracts/Cargo.toml
index ffcb37385849..3c8ac89f5d06 100644
--- a/frame/contracts/Cargo.toml
+++ b/frame/contracts/Cargo.toml
@@ -9,6 +9,9 @@ repository = "https://github.com/paritytech/substrate/"
 description = "FRAME pallet for WASM contracts"
 readme = "README.md"
 
+# Prevent publish until we are ready to release 3.0.0
+publish = false
+
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
 
diff --git a/frame/contracts/common/Cargo.toml b/frame/contracts/common/Cargo.toml
index e87cad055aff..45195fc8c45f 100644
--- a/frame/contracts/common/Cargo.toml
+++ b/frame/contracts/common/Cargo.toml
@@ -8,6 +8,7 @@ homepage = "https://substrate.dev"
 repository = "https://github.com/paritytech/substrate/"
 description = "A crate that hosts a common definitions that are relevant for the pallet-contracts."
 readme = "README.md"
+publish = false
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/frame/contracts/rpc/Cargo.toml b/frame/contracts/rpc/Cargo.toml
index 362e298102a0..5136af5450dd 100644
--- a/frame/contracts/rpc/Cargo.toml
+++ b/frame/contracts/rpc/Cargo.toml
@@ -8,6 +8,7 @@ homepage = "https://substrate.dev"
 repository = "https://github.com/paritytech/substrate/"
 description = "Node-specific RPC methods for interaction with contracts."
 readme = "README.md"
+publish = false
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/frame/contracts/rpc/runtime-api/Cargo.toml b/frame/contracts/rpc/runtime-api/Cargo.toml
index 04becf2b45f4..ec390ee4b166 100644
--- a/frame/contracts/rpc/runtime-api/Cargo.toml
+++ b/frame/contracts/rpc/runtime-api/Cargo.toml
@@ -8,6 +8,7 @@ homepage = "https://substrate.dev"
 repository = "https://github.com/paritytech/substrate/"
 description = "Runtime API definition required by Contracts RPC extensions."
 readme = "README.md"
+publish = false
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

From a2857011637a1f1e79fe069d5a2ca786c94d39cd Mon Sep 17 00:00:00 2001
From: Denis Pisarev <denis.pisarev@parity.io>
Date: Thu, 5 Nov 2020 19:18:55 +0100
Subject: [PATCH 0056/1194] CI: markdown link checker (#7145)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* change (CI): markdown link checker

* Fix some invalid doc links (re-run of cargo-unleash gen-readme w/ fixes).

* Fix some invalid doc links

* Fix some invalid doc links

* Fix some links

* Fix some links

* Apply @bkchr suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Fix more links

* Fix more links

* typo

* Fix more links

* Fix more links

* Ignore valid link .. check wrongly sees it as invalid

* Fix style issue

* Fix style issue

* change (CI): update style guide link

* change (lib): suggestions

Co-authored-by: Dan Forbes <dan@danforbes.dev>
Co-authored-by: Steve Degosserie <steve@parity.io>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 .github/workflows/md-link-check.yml      | 19 +++++++++
 .github/workflows/mlc_config.json        |  7 ++++
 .maintain/chaostest/README.md            |  7 ++--
 .maintain/gitlab/check_line_width.sh     |  4 +-
 README.md                                |  2 +-
 bin/node-template/README.md              |  2 +-
 client/block-builder/README.md           |  2 +-
 client/block-builder/src/lib.rs          |  2 +-
 client/chain-spec/README.md              |  2 +-
 client/chain-spec/src/lib.rs             |  2 +-
 client/consensus/babe/README.md          |  2 +-
 client/consensus/babe/src/lib.rs         |  2 +-
 docs/PULL_REQUEST_TEMPLATE.md            |  2 +-
 docs/SECURITY.md                         |  1 +
 frame/balances/README.md                 |  2 +-
 frame/balances/src/lib.rs                |  2 +-
 frame/benchmarking/README.md             |  2 +-
 frame/example-offchain-worker/README.md  |  7 ++--
 frame/example-offchain-worker/src/lib.rs |  1 +
 frame/example/README.md                  |  1 +
 frame/example/src/lib.rs                 |  1 +
 frame/society/README.md                  |  2 +-
 frame/staking/README.md                  | 20 ++++-----
 frame/staking/src/lib.rs                 |  2 +-
 frame/timestamp/README.md                |  8 ++--
 primitives/allocator/README.md           |  2 +-
 primitives/api/README.md                 |  4 +-
 primitives/npos-elections/README.md      | 53 ++++++++++++++++++++++--
 primitives/runtime-interface/README.md   | 29 ++++++-------
 primitives/runtime-interface/src/lib.rs  | 23 +++++-----
 30 files changed, 148 insertions(+), 67 deletions(-)
 create mode 100644 .github/workflows/md-link-check.yml
 create mode 100644 .github/workflows/mlc_config.json

diff --git a/.github/workflows/md-link-check.yml b/.github/workflows/md-link-check.yml
new file mode 100644
index 000000000000..75948534b3c1
--- /dev/null
+++ b/.github/workflows/md-link-check.yml
@@ -0,0 +1,19 @@
+name: Check Links
+
+on:
+  pull_request:
+    branches:
+    - master
+  push:
+    branches:
+    - master
+
+jobs:
+  markdown-link-check:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: gaurav-nelson/github-action-markdown-link-check@v1
+      with:
+        use-quiet-mode: 'yes'
+        config-file: '.github/workflows/mlc_config.json'
diff --git a/.github/workflows/mlc_config.json b/.github/workflows/mlc_config.json
new file mode 100644
index 000000000000..f741e987b1b2
--- /dev/null
+++ b/.github/workflows/mlc_config.json
@@ -0,0 +1,7 @@
+{
+    "ignorePatterns": [
+        {
+            "pattern": "^https://crates.io"
+        }
+    ]
+}
diff --git a/.maintain/chaostest/README.md b/.maintain/chaostest/README.md
index dc3d07b57905..60342e15b7d5 100644
--- a/.maintain/chaostest/README.md
+++ b/.maintain/chaostest/README.md
@@ -1,3 +1,4 @@
+<!-- markdown-link-check-disable -->
 chaostest
 =========
 
@@ -56,7 +57,7 @@ DESCRIPTION
   Extra documentation goes here
 ```
 
-_See code: [src/commands/spawn/index.js](https://github.com/paritytech/substrate/blob/harry/chaostest-init/.maintain/chaostest/src/commands/spawn/index.js)_
+_See code: [src/commands/spawn/index.js](https://github.com/paritytech/substrate/blob/master/.maintain/chaostest/src/commands/spawn/index.js)_
 
 ## `chaostest singlenodeheight`
 
@@ -71,7 +72,7 @@ FLAGS
   -t, the wait time out before it halts the polling
 ```
 
-_See code: [src/commands/singlenodeheight/index.js](https://github.com/paritytech/substrate/blob/harry/chaostest-init/.maintain/chaostest/src/commands/singlenodeheight/index.js)_
+_See code: [src/commands/singlenodeheight/index.js](https://github.com/paritytech/substrate/blob/master/.maintain/chaostest/src/commands/singlenodeheight/index.js)_
 
 ## `chaostest clean`
 
@@ -85,5 +86,5 @@ FLAGS
   -n , the desired namespace to delete on your k8s cluster
 ```
 
-_See code: [src/commands/clean/index.js](https://github.com/paritytech/substrate/blob/harry/chaostest-init/.maintain/chaostest/src/commands/clean/index.js)_
+_See code: [src/commands/clean/index.js](https://github.com/paritytech/substrate/blob/master/.maintain/chaostest/src/commands/clean/index.js)_
 <!-- commandsstop -->
diff --git a/.maintain/gitlab/check_line_width.sh b/.maintain/gitlab/check_line_width.sh
index 611d3ae2681e..ebab3013e4b4 100755
--- a/.maintain/gitlab/check_line_width.sh
+++ b/.maintain/gitlab/check_line_width.sh
@@ -25,7 +25,7 @@ do
       echo "| error!"
       echo "| Lines must not be longer than ${LINE_WIDTH} characters."
       echo "| "
-      echo "| see more https://wiki.parity.io/Substrate-Style-Guide"
+      echo "| see more https://github.com/paritytech/substrate/blob/master/docs/STYLE_GUIDE.md"
       echo "|"
       FAIL="true"
     fi
@@ -41,7 +41,7 @@ do
         echo "| warning!"
         echo "| Lines should be longer than ${GOOD_LINE_WIDTH} characters only in exceptional circumstances!"
         echo "| "
-        echo "| see more https://wiki.parity.io/Substrate-Style-Guide"
+        echo "| see more https://github.com/paritytech/substrate/blob/master/docs/STYLE_GUIDE.md"
         echo "|"
       fi
       echo "| file: ${file}"
diff --git a/README.md b/README.md
index c586919a1ddc..94de8533be26 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Substrate &middot; [![GitHub license](https://img.shields.io/badge/license-GPL3%2FApache2-blue)](LICENSE) [![GitLab Status](https://gitlab.parity.io/parity/substrate/badges/master/pipeline.svg)](https://gitlab.parity.io/parity/substrate/pipelines) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](docs/CONTRIBUTING.adoc)
+# Substrate &middot; [![GitHub license](https://img.shields.io/badge/license-GPL3%2FApache2-blue)](#LICENSE) [![GitLab Status](https://gitlab.parity.io/parity/substrate/badges/master/pipeline.svg)](https://gitlab.parity.io/parity/substrate/pipelines) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](docs/CONTRIBUTING.adoc)
 
 <p align="center">
   <img src="/docs/media/sub.gif">
diff --git a/bin/node-template/README.md b/bin/node-template/README.md
index 5623fedb5342..c1aeefe89509 100644
--- a/bin/node-template/README.md
+++ b/bin/node-template/README.md
@@ -55,7 +55,7 @@ RUST_LOG=debug RUST_BACKTRACE=1 ./target/release/node-template -lruntime=debug -
 ### Multi-Node Local Testnet
 
 To see the multi-node consensus algorithm in action, run a local testnet with two validator nodes,
-Alice and Bob, that have been [configured](/bin/node-template/node/src/chain_spec.rs) as the initial
+Alice and Bob, that have been [configured](./node/src/chain_spec.rs) as the initial
 authorities of the `local` testnet chain and endowed with testnet units.
 
 Note: this will require two terminal sessions (one for each node).
diff --git a/client/block-builder/README.md b/client/block-builder/README.md
index c691f6692abf..b105d4203362 100644
--- a/client/block-builder/README.md
+++ b/client/block-builder/README.md
@@ -1,7 +1,7 @@
 Substrate block builder
 
 This crate provides the [`BlockBuilder`] utility and the corresponding runtime api
-[`BlockBuilder`](sp_block_builder::BlockBuilder).Error
+[`BlockBuilder`](https://docs.rs/sc-block-builder/latest/sc_block_builder/struct.BlockBuilder.html).Error
 
 The block builder utility is used in the node as an abstraction over the runtime api to
 initialize a block, to push extrinsics and to finalize a block.
diff --git a/client/block-builder/src/lib.rs b/client/block-builder/src/lib.rs
index 904667b1afc6..8a38bb847800 100644
--- a/client/block-builder/src/lib.rs
+++ b/client/block-builder/src/lib.rs
@@ -19,7 +19,7 @@
 //! Substrate block builder
 //!
 //! This crate provides the [`BlockBuilder`] utility and the corresponding runtime api
-//! [`BlockBuilder`](sp_block_builder::BlockBuilder).Error
+//! [`BlockBuilder`](sp_block_builder::BlockBuilder).
 //!
 //! The block builder utility is used in the node as an abstraction over the runtime api to
 //! initialize a block, to push extrinsics and to finalize a block.
diff --git a/client/chain-spec/README.md b/client/chain-spec/README.md
index 59a66aa5ace7..5525affbed81 100644
--- a/client/chain-spec/README.md
+++ b/client/chain-spec/README.md
@@ -4,7 +4,7 @@ This crate contains structs and utilities to declare
 a runtime-specific configuration file (a.k.a chain spec).
 
 Basic chain spec type containing all required parameters is
-[`ChainSpec`](https://docs.rs/sc-chain-spec/latest/sc_chain_spec/struct.ChainSpec.html). It can be extended with
+[`ChainSpec`](https://docs.rs/sc-chain-spec/latest/sc_chain_spec/struct.GenericChainSpec.html). It can be extended with
 additional options that contain configuration specific to your chain.
 Usually the extension is going to be an amalgamate of types exposed
 by Substrate core modules. To allow the core modules to retrieve
diff --git a/client/chain-spec/src/lib.rs b/client/chain-spec/src/lib.rs
index 94ed93758bb2..27657ccb7f86 100644
--- a/client/chain-spec/src/lib.rs
+++ b/client/chain-spec/src/lib.rs
@@ -20,7 +20,7 @@
 //! a runtime-specific configuration file (a.k.a chain spec).
 //!
 //! Basic chain spec type containing all required parameters is
-//! [`ChainSpec`](./struct.ChainSpec.html). It can be extended with
+//! [`GenericChainSpec`]. It can be extended with
 //! additional options that contain configuration specific to your chain.
 //! Usually the extension is going to be an amalgamate of types exposed
 //! by Substrate core modules. To allow the core modules to retrieve
diff --git a/client/consensus/babe/README.md b/client/consensus/babe/README.md
index faba3948ed71..a404d2ea4470 100644
--- a/client/consensus/babe/README.md
+++ b/client/consensus/babe/README.md
@@ -43,6 +43,6 @@ primary blocks in the chain. We will pick the heaviest chain (more primary
 blocks) and will go with the longest one in case of a tie.
 
 An in-depth description and analysis of the protocol can be found here:
-<https://research.web3.foundation/en/latest/polkadot/BABE/Babe.html>
+<https://research.web3.foundation/en/latest/polkadot/block-production/Babe.html>
 
 License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index e980e358b848..948959e96495 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -59,7 +59,7 @@
 //! blocks) and will go with the longest one in case of a tie.
 //!
 //! An in-depth description and analysis of the protocol can be found here:
-//! <https://research.web3.foundation/en/latest/polkadot/BABE/Babe.html>
+//! <https://research.web3.foundation/en/latest/polkadot/block-production/Babe.html>
 
 #![forbid(unsafe_code)]
 #![warn(missing_docs)]
diff --git a/docs/PULL_REQUEST_TEMPLATE.md b/docs/PULL_REQUEST_TEMPLATE.md
index 8ca6ba9b01fe..77f5f79f60d4 100644
--- a/docs/PULL_REQUEST_TEMPLATE.md
+++ b/docs/PULL_REQUEST_TEMPLATE.md
@@ -14,7 +14,7 @@ Before you submitting, please check that:
   - [ ] Github's project assignment
 - [ ] You mentioned a related issue if this PR related to it, e.g. `Fixes #228` or `Related #1337`.
 - [ ] You asked any particular reviewers to review. If you aren't sure, start with GH suggestions.
-- [ ] Your PR adheres to [the style guide](https://wiki.parity.io/Substrate-Style-Guide)
+- [ ] Your PR adheres to [the style guide](https://github.com/paritytech/substrate/blob/master/docs/STYLE_GUIDE.md)
   - In particular, mind the maximal line length of 100 (120 in exceptional circumstances).
   - There is no commented code checked in unless necessary.
   - Any panickers have a proof or removed.
diff --git a/docs/SECURITY.md b/docs/SECURITY.md
index 7240218fa872..19f5b145feb5 100644
--- a/docs/SECURITY.md
+++ b/docs/SECURITY.md
@@ -1,3 +1,4 @@
+<!-- markdown-link-check-disable -->
 # Security Policy
 
 Parity Technologies is committed to resolving security vulnerabilities in our software quickly and carefully. We take the necessary steps to minimize risk, provide timely information, and deliver vulnerability fixes and mitigations required to address security issues.
diff --git a/frame/balances/README.md b/frame/balances/README.md
index 4104fdc64197..a93ed5f306e0 100644
--- a/frame/balances/README.md
+++ b/frame/balances/README.md
@@ -62,7 +62,7 @@ dealing with accounts that allow liquidity restrictions.
 - [`Imbalance`](https://docs.rs/frame-support/latest/frame_support/traits/trait.Imbalance.html): Functions for handling
 imbalances between total issuance in the system and account balances. Must be used when a function
 creates new funds (e.g. a reward) or destroys some funds (e.g. a system fee).
-- [`IsDeadAccount`](https://docs.rs/frame-system/latest/frame_system/trait.IsDeadAccount.html): Determiner to say whether a
+- [`IsDeadAccount`](https://docs.rs/frame-support/latest/frame_support/traits/trait.IsDeadAccount.html): Determiner to say whether a
 given account is unused.
 
 ## Interface
diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index 6c9d3adfedaa..7ca6fd1e7809 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -79,7 +79,7 @@
 //! - [`Imbalance`](../frame_support/traits/trait.Imbalance.html): Functions for handling
 //! imbalances between total issuance in the system and account balances. Must be used when a function
 //! creates new funds (e.g. a reward) or destroys some funds (e.g. a system fee).
-//! - [`IsDeadAccount`](../frame_system/trait.IsDeadAccount.html): Determiner to say whether a
+//! - [`IsDeadAccount`](../frame_support/traits/trait.IsDeadAccount.html): Determiner to say whether a
 //! given account is unused.
 //!
 //! ## Interface
diff --git a/frame/benchmarking/README.md b/frame/benchmarking/README.md
index 1727072709b2..38c683cb8db5 100644
--- a/frame/benchmarking/README.md
+++ b/frame/benchmarking/README.md
@@ -43,7 +43,7 @@ The benchmarking framework comes with the following tools:
 * [A set of macros](./src/lib.rs) (`benchmarks!`, `add_benchmark!`, etc...) to make it easy to
   write, test, and add runtime benchmarks.
 * [A set of linear regression analysis functions](./src/analysis.rs) for processing benchmark data.
-* [A CLI extension](../../utils/benchmarking-cli/) to make it easy to execute benchmarks on your
+* [A CLI extension](../../utils/frame/benchmarking-cli/) to make it easy to execute benchmarks on your
   node.
 
 The end-to-end benchmarking pipeline is disabled by default when compiling a node. If you want to
diff --git a/frame/example-offchain-worker/README.md b/frame/example-offchain-worker/README.md
index 4da1a4c15f81..a2a95a8cfb97 100644
--- a/frame/example-offchain-worker/README.md
+++ b/frame/example-offchain-worker/README.md
@@ -1,3 +1,4 @@
+<!-- markdown-link-check-disable -->
 # Offchain Worker Example Module
 
 The Offchain Worker Example: A simple pallet demonstrating
@@ -6,9 +7,9 @@ concepts, APIs and structures common to most offchain workers.
 Run `cargo doc --package pallet-example-offchain-worker --open` to view this module's
 documentation.
 
-- [`pallet_example_offchain_worker::Trait`](https://docs.rs/pallet-example-offchain-worker/latest/pallet_example_offchain_worker/trait.Trait.html)
-- [`Call`](https://docs.rs/pallet-example-offchain-worker/latest/pallet_example_offchain_worker/enum.Call.html)
-- [`Module`](https://docs.rs/pallet-example-offchain-worker/latest/pallet_example_offchain_worker/struct.Module.html)
+- [`pallet_example_offchain_worker::Trait`](./trait.Trait.html)
+- [`Call`](./enum.Call.html)
+- [`Module`](./struct.Module.html)
 
 
 ## Overview
diff --git a/frame/example-offchain-worker/src/lib.rs b/frame/example-offchain-worker/src/lib.rs
index 5fd5eff19bd7..b64e3f8dd83f 100644
--- a/frame/example-offchain-worker/src/lib.rs
+++ b/frame/example-offchain-worker/src/lib.rs
@@ -15,6 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//! <!-- markdown-link-check-disable -->
 //! # Offchain Worker Example Module
 //!
 //! The Offchain Worker Example: A simple pallet demonstrating
diff --git a/frame/example/README.md b/frame/example/README.md
index 05ef4cd4351c..f1435a297b09 100644
--- a/frame/example/README.md
+++ b/frame/example/README.md
@@ -1,3 +1,4 @@
+<!-- markdown-link-check-disable -->
 # Example Pallet
 
 <!-- Original author of paragraph: @gavofyork -->
diff --git a/frame/example/src/lib.rs b/frame/example/src/lib.rs
index 4b10804fb10f..103bcfe69686 100644
--- a/frame/example/src/lib.rs
+++ b/frame/example/src/lib.rs
@@ -15,6 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//! <!-- markdown-link-check-disable -->
 //! # Example Pallet
 //!
 //! <!-- Original author of paragraph: @gavofyork -->
diff --git a/frame/society/README.md b/frame/society/README.md
index b4e1fbaf22cb..372dfe1f048e 100644
--- a/frame/society/README.md
+++ b/frame/society/README.md
@@ -24,7 +24,7 @@ Of the non-suspended members, there is always a:
 
 Of the non-suspended members of the society, a random set of them are chosen as
 "skeptics". The mechanics of skeptics is explained in the
-[member phase](#member-phase) below.
+[member phase](https://docs.rs/pallet-society/latest/pallet_society/#member-phase) below.
 
 ### Mechanics
 
diff --git a/frame/staking/README.md b/frame/staking/README.md
index b7b2141e58a5..78474ee84221 100644
--- a/frame/staking/README.md
+++ b/frame/staking/README.md
@@ -57,7 +57,7 @@ There are three possible roles that any staked account pair can be in: `Validato
 and `Idle` (defined in [`StakerStatus`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.StakerStatus.html)). There are three
 corresponding instructions to change between roles, namely:
 [`validate`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.validate),
-[`nominate`](./enum.Call.html#variant.nominate), and [`chill`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.chill).
+[`nominate`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.nominate), and [`chill`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.chill).
 
 #### Validating
 
@@ -81,7 +81,7 @@ between the validator and its nominators. This rule incentivizes the nominators
 the misbehaving/offline validators as much as possible, simply because the nominators will also
 lose funds if they vote poorly.
 
-An account can become a nominator via the [`nominate`](enum.Call.html#variant.nominate) call.
+An account can become a nominator via the [`nominate`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.nominate) call.
 
 #### Rewards and Slash
 
@@ -102,7 +102,7 @@ Slashing logic is further described in the documentation of the `slashing` modul
 
 Similar to slashing, rewards are also shared among a validator and its associated nominators.
 Yet, the reward funds are not always transferred to the stash account and can be configured. See
-[Reward Calculation](#reward-calculation) for more details.
+[Reward Calculation](https://docs.rs/pallet-staking/latest/pallet_staking/#reward-calculation) for more details.
 
 #### Chilling
 
@@ -110,7 +110,7 @@ Finally, any of the roles above can choose to step back temporarily and just chi
 This means that if they are a nominator, they will not be considered as voters anymore and if
 they are validators, they will no longer be a candidate for the next election.
 
-An account can step back via the [`chill`](enum.Call.html#variant.chill) call.
+An account can step back via the [`chill`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.chill) call.
 
 ### Session managing
 
@@ -183,7 +183,7 @@ they received during the era. Points are added to a validator using
 [`reward_by_ids`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.reward_by_ids) or
 [`reward_by_indices`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.reward_by_indices).
 
-[`Module`](./struct.Module.html) implements
+[`Module`](https://docs.rs/pallet-staking/latest/pallet_staking/struct.Module.html) implements
 [`pallet_authorship::EventHandler`](https://docs.rs/pallet-authorship/latest/pallet_authorship/trait.EventHandler.html) to add reward
 points to block producer and block producer of referenced uncles.
 
@@ -198,11 +198,11 @@ validator and all of the nominators that nominated the validator, proportional t
 staked behind this validator (_i.e._ dividing the
 [`own`](https://docs.rs/pallet-staking/latest/pallet_staking/struct.Exposure.html#structfield.own) or
 [`others`](https://docs.rs/pallet-staking/latest/pallet_staking/struct.Exposure.html#structfield.others) by
-[`total`](./struct.Exposure.html#structfield.total) in [`Exposure`](https://docs.rs/pallet-staking/latest/pallet_staking/struct.Exposure.html)).
+[`total`](https://docs.rs/pallet-staking/latest/pallet_staking/struct.Exposure.html#structfield.total) in [`Exposure`](https://docs.rs/pallet-staking/latest/pallet_staking/struct.Exposure.html)).
 
 All entities who receive a reward have the option to choose their reward destination through the
 [`Payee`](https://docs.rs/pallet-staking/latest/pallet_staking/struct.Payee.html) storage item (see
-[`set_payee`](enum.Call.html#variant.set_payee)), to be one of the following:
+[`set_payee`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.set_payee)), to be one of the following:
 
 - Controller account, (obviously) not increasing the staked value.
 - Stash account, not increasing the staked value.
@@ -213,14 +213,14 @@ All entities who receive a reward have the option to choose their reward destina
 Any funds already placed into stash can be the target of the following operations:
 
 The controller account can free a portion (or all) of the funds using the
-[`unbond`](enum.Call.html#variant.unbond) call. Note that the funds are not immediately
-accessible. Instead, a duration denoted by [`BondingDuration`](https://docs.rs/pallet-staking/latest/pallet_staking/struct.BondingDuration.html)
+[`unbond`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.unbond) call. Note that the funds are not immediately
+accessible. Instead, a duration denoted by [`BondingDuration`](https://docs.rs/pallet-staking/latest/pallet_staking/trait.Trait.html#associatedtype.BondingDuration)
 (in number of eras) must pass until the funds can actually be removed. Once the
 `BondingDuration` is over, the [`withdraw_unbonded`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.withdraw_unbonded)
 call can be used to actually withdraw the funds.
 
 Note that there is a limitation to the number of fund-chunks that can be scheduled to be
-unlocked in the future via [`unbond`](enum.Call.html#variant.unbond). In case this maximum
+unlocked in the future via [`unbond`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.unbond). In case this maximum
 (`MAX_UNLOCKING_CHUNKS`) is reached, the bonded account _must_ first wait until a successful
 call to `withdraw_unbonded` to remove some of the chunks.
 
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index fdea1c18e768..e5aaae6bbb8f 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -232,7 +232,7 @@
 //!
 //! The controller account can free a portion (or all) of the funds using the
 //! [`unbond`](enum.Call.html#variant.unbond) call. Note that the funds are not immediately
-//! accessible. Instead, a duration denoted by [`BondingDuration`](./struct.BondingDuration.html)
+//! accessible. Instead, a duration denoted by [`BondingDuration`](./trait.Trait.html#associatedtype.BondingDuration)
 //! (in number of eras) must pass until the funds can actually be removed. Once the
 //! `BondingDuration` is over, the [`withdraw_unbonded`](./enum.Call.html#variant.withdraw_unbonded)
 //! call can be used to actually withdraw the funds.
diff --git a/frame/timestamp/README.md b/frame/timestamp/README.md
index 5610caca4da5..54ef7fa43b4f 100644
--- a/frame/timestamp/README.md
+++ b/frame/timestamp/README.md
@@ -2,9 +2,9 @@
 
 The Timestamp module provides functionality to get and set the on-chain time.
 
-- [`timestamp::Trait`](https://docs.rs/pallet-timestamppallet-timestamp/latest/pallet_timestamp/trait.Trait.html)
-- [`Call`](https://docs.rs/pallet-timestamppallet-timestamp/latest/pallet_timestamp/enum.Call.html)
-- [`Module`](https://docs.rs/pallet-timestamppallet-timestamp/latest/pallet_timestamp/struct.Module.html)
+- [`timestamp::Trait`](https://docs.rs/pallet-timestamp/latest/pallet_timestamp/trait.Trait.html)
+- [`Call`](https://docs.rs/pallet-timestamp/latest/pallet_timestamp/enum.Call.html)
+- [`Module`](https://docs.rs/pallet-timestamp/latest/pallet_timestamp/struct.Module.html)
 
 ## Overview
 
@@ -69,6 +69,6 @@ the Timestamp module for session management.
 
 ## Related Modules
 
-* [Session](https://docs.rs/pallet-timestamppallet-session/latest/pallet_session/)
+* [Session](https://docs.rs/pallet-session/latest/pallet_session/)
 
 License: Apache-2.0
\ No newline at end of file
diff --git a/primitives/allocator/README.md b/primitives/allocator/README.md
index 361feaae591f..cd845e2b028e 100644
--- a/primitives/allocator/README.md
+++ b/primitives/allocator/README.md
@@ -1,6 +1,6 @@
 Collection of allocator implementations.
 
 This crate provides the following allocator implementations:
-- A freeing-bump allocator: [`FreeingBumpHeapAllocator`](freeing_bump::FreeingBumpHeapAllocator)
+- A freeing-bump allocator: [`FreeingBumpHeapAllocator`](https://docs.rs/sp-allocator/latest/sp_allocator/struct.FreeingBumpHeapAllocator.html)
 
 License: Apache-2.0
\ No newline at end of file
diff --git a/primitives/api/README.md b/primitives/api/README.md
index 551de2f82e36..1cf9437373c7 100644
--- a/primitives/api/README.md
+++ b/primitives/api/README.md
@@ -3,8 +3,8 @@ Substrate runtime api
 The Substrate runtime api is the crucial interface between the node and the runtime.
 Every call that goes into the runtime is done with a runtime api. The runtime apis are not fixed.
 Every Substrate user can define its own apis with
-[`decl_runtime_apis`](macro.decl_runtime_apis.html) and implement them in
-the runtime with [`impl_runtime_apis`](macro.impl_runtime_apis.html).
+[`decl_runtime_apis`](https://docs.rs/sp-api/latest/sp_api/macro.decl_runtime_apis.html) and implement them in
+the runtime with [`impl_runtime_apis`](https://docs.rs/sp-api/latest/sp_api/macro.impl_runtime_apis.html).
 
 Every Substrate runtime needs to implement the [`Core`] runtime api. This api provides the basic
 functionality that every runtime needs to export.
diff --git a/primitives/npos-elections/README.md b/primitives/npos-elections/README.md
index a98351a6d89a..b518e63615fa 100644
--- a/primitives/npos-elections/README.md
+++ b/primitives/npos-elections/README.md
@@ -1,11 +1,58 @@
 A set of election algorithms to be used with a substrate runtime, typically within the staking
-sub-system. Notable implementation include
+sub-system. Notable implementation include:
 
 - [`seq_phragmen`]: Implements the Phragmén Sequential Method. An un-ranked, relatively fast
   election method that ensures PJR, but does not provide a constant factor approximation of the
   maximin problem.
-- [`balance_solution`]: Implements the star balancing algorithm. This iterative process can
-  increase a solutions score, as described in [`evaluate_support`].
+- [`phragmms`]: Implements a hybrid approach inspired by Phragmén which is executed faster but
+  it can achieve a constant factor approximation of the maximin problem, similar to that of the
+  MMS algorithm.
+- [`balance_solution`]: Implements the star balancing algorithm. This iterative process can push
+  a solution toward being more `balances`, which in turn can increase its score.
+
+### Terminology
+
+This crate uses context-independent words, not to be confused with staking. This is because the
+election algorithms of this crate, while designed for staking, can be used in other contexts as
+well.
+
+`Voter`: The entity casting some votes to a number of `Targets`. This is the same as `Nominator`
+in the context of staking. `Target`: The entities eligible to be voted upon. This is the same as
+`Validator` in the context of staking. `Edge`: A mapping from a `Voter` to a `Target`.
+
+The goal of an election algorithm is to provide an `ElectionResult`. A data composed of:
+- `winners`: A flat list of identifiers belonging to those who have won the election, usually
+  ordered in some meaningful way. They are zipped with their total backing stake.
+- `assignment`: A mapping from each voter to their winner-only targets, zipped with a ration
+  denoting the amount of support given to that particular target.
+
+```rust
+// the winners.
+let winners = vec![(1, 100), (2, 50)];
+let assignments = vec![
+    // A voter, giving equal backing to both 1 and 2.
+    Assignment {
+		who: 10,
+		distribution: vec![(1, Perbill::from_percent(50)), (2, Perbill::from_percent(50))],
+	},
+    // A voter, Only backing 1.
+    Assignment { who: 20, distribution: vec![(1, Perbill::from_percent(100))] },
+];
+
+// the combination of the two makes the election result.
+let election_result = ElectionResult { winners, assignments };
+
+```
+
+The `Assignment` field of the election result is voter-major, i.e. it is from the perspective of
+the voter. The struct that represents the opposite is called a `Support`. This struct is usually
+accessed in a map-like manner, i.e. keyed vy voters, therefor it is stored as a mapping called
+`SupportMap`.
+
+Moreover, the support is built from absolute backing values, not ratios like the example above.
+A struct similar to `Assignment` that has stake value instead of ratios is called an
+`StakedAssignment`.
+
 
 More information can be found at: https://arxiv.org/abs/2004.12990
 
diff --git a/primitives/runtime-interface/README.md b/primitives/runtime-interface/README.md
index 666bfe4d5a86..49e13f1b2e74 100644
--- a/primitives/runtime-interface/README.md
+++ b/primitives/runtime-interface/README.md
@@ -7,18 +7,19 @@ maps to an external function call. These external functions are exported by the
 and they map to the same implementation as the native calls.
 
 # Using a type in a runtime interface
-
+<!-- markdown-link-check-disable -->
 Any type that should be used in a runtime interface as argument or return value needs to
-implement [`RIType`]. The associated type [`FFIType`](RIType::FFIType) is the type that is used
-in the FFI function to represent the actual type. For example `[T]` is represented by an `u64`.
-The slice pointer and the length will be mapped to an `u64` value. For more information see
-this [table](#ffi-type-and-conversion). The FFI function definition is used when calling from
-the wasm runtime into the node.
-
-Traits are used to convert from a type to the corresponding [`RIType::FFIType`].
+implement [`RIType`]. The associated type [`FFIType`](https:/docs.rs/sp-runtime-interface/latest/sp_runtime_interface/trait.RIType.html#associatedtype.FFIType)
+is the type that is used in the FFI function to represent the actual type. For example `[T]` is
+represented by an `u64`. The slice pointer and the length will be mapped to an `u64` value.
+For more information see this [table](https:/docs.rs/sp-runtime-interface/latest/sp_runtime_interface/#ffi-type-and-conversion).
+The FFI function definition is used when calling from the wasm runtime into the node.
+
+Traits are used to convert from a type to the corresponding
+[`RIType::FFIType`](https:/docs.rs/sp-runtime-interface/latest/sp_runtime_interface/trait.RIType.html#associatedtype.FFIType).
 Depending on where and how a type should be used in a function signature, a combination of the
 following traits need to be implemented:
-
+<!-- markdown-link-check-enable -->
 1. Pass as function argument: [`wasm::IntoFFIValue`] and [`host::FromFFIValue`]
 2. As function return value: [`wasm::FromFFIValue`] and [`host::IntoFFIValue`]
 3. Pass as mutable function argument: [`host::IntoPreallocatedFFIValue`]
@@ -26,7 +27,7 @@ following traits need to be implemented:
 The traits are implemented for most of the common types like `[T]`, `Vec<T>`, arrays and
 primitive types.
 
-For custom types, we provide the [`PassBy`](pass_by::PassBy) trait and strategies that define
+For custom types, we provide the [`PassBy`](https://docs.rs/sp-runtime-interface/latest/sp_runtime_interface/pass_by#PassBy) trait and strategies that define
 how a type is passed between the wasm runtime and the node. Each strategy also provides a derive
 macro to simplify the implementation.
 
@@ -52,7 +53,7 @@ trait RuntimeInterface {
 ```
 
 For more information on declaring a runtime interface, see
-[`#[runtime_interface]`](attr.runtime_interface.html).
+[`#[runtime_interface]`](https://docs.rs/sp-runtime-interface/latest/sp_runtime_interface/attr.runtime_interface.html).
 
 # FFI type and conversion
 
@@ -80,9 +81,9 @@ the host side and how they are converted into the corresponding type.
 | `[u8; N]` | `u32` | `v.as_ptr()` |
 | `*const T` | `u32` | `Identity` |
 | `Option<T>` | `u64` | `let e = v.encode();`<br><br><code>e.len() 32bit << 32 &#124; e.as_ptr() 32bit</code> |
-| [`T where T: PassBy<PassBy=Inner>`](pass_by::Inner) | Depends on inner | Depends on inner |
-| [`T where T: PassBy<PassBy=Codec>`](pass_by::Codec) | `u64`| <code>v.len() 32bit << 32 &#124; v.as_ptr() 32bit</code> |
+| [`T where T: PassBy<PassBy=Inner>`](https://docs.rs/sp-runtime-interface/latest/sp_runtime_interface/pass_by#Inner) | Depends on inner | Depends on inner |
+| [`T where T: PassBy<PassBy=Codec>`](https://docs.rs/sp-runtime-interface/latest/sp_runtime_interface/pass_by#Codec) | `u64`| <code>v.len() 32bit << 32 &#124; v.as_ptr() 32bit</code> |
 
 `Identity` means that the value is converted directly into the corresponding FFI type.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/primitives/runtime-interface/src/lib.rs b/primitives/runtime-interface/src/lib.rs
index 7ff5f0d7a042..dd625a4a2534 100644
--- a/primitives/runtime-interface/src/lib.rs
+++ b/primitives/runtime-interface/src/lib.rs
@@ -26,16 +26,17 @@
 //! # Using a type in a runtime interface
 //!
 //! Any type that should be used in a runtime interface as argument or return value needs to
-//! implement [`RIType`]. The associated type [`FFIType`](RIType::FFIType) is the type that is used
-//! in the FFI function to represent the actual type. For example `[T]` is represented by an `u64`.
-//! The slice pointer and the length will be mapped to an `u64` value. For more information see
-//! this [table](#ffi-type-and-conversion). The FFI function definition is used when calling from
-//! the wasm runtime into the node.
+//! implement [`RIType`]. The associated type [`FFIType`](./trait.RIType.html#associatedtype.FFIType)
+//! is the type that is used in the FFI function to represent the actual type. For example `[T]` is
+//! represented by an `u64`. The slice pointer and the length will be mapped to an `u64` value.
+//! For more information see this [table](#ffi-type-and-conversion).
+//! The FFI function definition is used when calling from the wasm runtime into the node.
 //!
-//! Traits are used to convert from a type to the corresponding [`RIType::FFIType`].
+//! Traits are used to convert from a type to the corresponding
+//! [`RIType::FFIType`](./trait.RIType.html#associatedtype.FFIType).
 //! Depending on where and how a type should be used in a function signature, a combination of the
 //! following traits need to be implemented:
-//!
+//! <!-- markdown-link-check-enable -->
 //! 1. Pass as function argument: [`wasm::IntoFFIValue`] and [`host::FromFFIValue`]
 //! 2. As function return value: [`wasm::FromFFIValue`] and [`host::IntoFFIValue`]
 //! 3. Pass as mutable function argument: [`host::IntoPreallocatedFFIValue`]
@@ -43,7 +44,7 @@
 //! The traits are implemented for most of the common types like `[T]`, `Vec<T>`, arrays and
 //! primitive types.
 //!
-//! For custom types, we provide the [`PassBy`](pass_by::PassBy) trait and strategies that define
+//! For custom types, we provide the [`PassBy`](./pass_by#PassBy) trait and strategies that define
 //! how a type is passed between the wasm runtime and the node. Each strategy also provides a derive
 //! macro to simplify the implementation.
 //!
@@ -69,7 +70,7 @@
 //! ```
 //!
 //! For more information on declaring a runtime interface, see
-//! [`#[runtime_interface]`](attr.runtime_interface.html).
+//! [`#[runtime_interface]`](./attr.runtime_interface.html).
 //!
 //! # FFI type and conversion
 //!
@@ -97,8 +98,8 @@
 //! | `[u8; N]` | `u32` | `v.as_ptr()` |
 //! | `*const T` | `u32` | `Identity` |
 //! | `Option<T>` | `u64` | `let e = v.encode();`<br><br><code>e.len() 32bit << 32 &#124; e.as_ptr() 32bit</code> |
-//! | [`T where T: PassBy<PassBy=Inner>`](pass_by::Inner) | Depends on inner | Depends on inner |
-//! | [`T where T: PassBy<PassBy=Codec>`](pass_by::Codec) | `u64`| <code>v.len() 32bit << 32 &#124; v.as_ptr() 32bit</code> |
+//! | [`T where T: PassBy<PassBy=Inner>`](./pass_by#Inner) | Depends on inner | Depends on inner |
+//! | [`T where T:PassBy<PassBy=Codec>`](./pass_by#Codec)|`u64`|<code>v.len() 32bit << 32 &#124;v.as_ptr() 32bit</code>|
 //!
 //! `Identity` means that the value is converted directly into the corresponding FFI type.
 

From 2e7292cd84121db8bcd2317c1ad70e348ee52f7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Thu, 5 Nov 2020 20:47:40 +0100
Subject: [PATCH 0057/1194] Make the maximum block size configurable (#7499)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Make the maximum block size configurable

This pr makes the maximum block size configurable. The maximum block
size is used after proposing a new block to check if the new block is
not exceeding the maximum.

* Update primitives/consensus/common/src/evaluation.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Added comment

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
---
 .../basic-authorship/src/basic_authorship.rs  | 28 ++++++++++++++++++-
 primitives/consensus/common/src/evaluation.rs | 18 +++++-------
 primitives/consensus/common/src/lib.rs        |  3 --
 3 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/client/basic-authorship/src/basic_authorship.rs b/client/basic-authorship/src/basic_authorship.rs
index 89edfac0d4e9..2fe7ba72ec7b 100644
--- a/client/basic-authorship/src/basic_authorship.rs
+++ b/client/basic-authorship/src/basic_authorship.rs
@@ -42,6 +42,15 @@ use std::marker::PhantomData;
 use prometheus_endpoint::Registry as PrometheusRegistry;
 use sc_proposer_metrics::MetricsLink as PrometheusMetrics;
 
+/// Default maximum block size in bytes used by [`Proposer`].
+///
+/// Can be overwritten by [`ProposerFactory::set_maxium_block_size`].
+///
+/// Be aware that there is also an upper packet size on what the networking code
+/// will accept. If the block doesn't fit in such a package, it can not be
+/// transferred to other nodes.
+pub const DEFAULT_MAX_BLOCK_SIZE: usize = 4 * 1024 * 1024 + 512;
+
 /// Proposer factory.
 pub struct ProposerFactory<A, B, C> {
 	spawn_handle: Box<dyn SpawnNamed>,
@@ -53,6 +62,7 @@ pub struct ProposerFactory<A, B, C> {
 	metrics: PrometheusMetrics,
 	/// phantom member to pin the `Backend` type.
 	_phantom: PhantomData<B>,
+	max_block_size: usize,
 }
 
 impl<A, B, C> ProposerFactory<A, B, C> {
@@ -68,8 +78,17 @@ impl<A, B, C> ProposerFactory<A, B, C> {
 			transaction_pool,
 			metrics: PrometheusMetrics::new(prometheus),
 			_phantom: PhantomData,
+			max_block_size: DEFAULT_MAX_BLOCK_SIZE,
 		}
 	}
+
+	/// Set the maximum block size in bytes.
+	///
+	/// The default value for the maximum block size is:
+	/// [`DEFAULT_MAX_BLOCK_SIZE`].
+	pub fn set_maximum_block_size(&mut self, size: usize) {
+		self.max_block_size = size;
+	}
 }
 
 impl<B, Block, C, A> ProposerFactory<A, B, C>
@@ -103,6 +122,7 @@ impl<B, Block, C, A> ProposerFactory<A, B, C>
 			now,
 			metrics: self.metrics.clone(),
 			_phantom: PhantomData,
+			max_block_size: self.max_block_size,
 		};
 
 		proposer
@@ -143,6 +163,7 @@ pub struct Proposer<B, Block: BlockT, C, A: TransactionPool> {
 	now: Box<dyn Fn() -> time::Instant + Send + Sync>,
 	metrics: PrometheusMetrics,
 	_phantom: PhantomData<B>,
+	max_block_size: usize,
 }
 
 impl<A, B, Block, C> sp_consensus::Proposer<Block> for
@@ -334,7 +355,12 @@ impl<A, B, Block, C> Proposer<B, Block, C, A>
 			error!("Failed to verify block encoding/decoding");
 		}
 
-		if let Err(err) = evaluation::evaluate_initial(&block, &self.parent_hash, self.parent_number) {
+		if let Err(err) = evaluation::evaluate_initial(
+			&block,
+			&self.parent_hash,
+			self.parent_number,
+			self.max_block_size,
+		) {
 			error!("Failed to evaluate authored block: {:?}", err);
 		}
 
diff --git a/primitives/consensus/common/src/evaluation.rs b/primitives/consensus/common/src/evaluation.rs
index edb148cdaa99..fc9ab24d15db 100644
--- a/primitives/consensus/common/src/evaluation.rs
+++ b/primitives/consensus/common/src/evaluation.rs
@@ -17,8 +17,6 @@
 
 //! Block evaluation and evaluation errors.
 
-use super::MAX_BLOCK_SIZE;
-
 use codec::Encode;
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT, One, CheckedConversion};
 
@@ -42,11 +40,8 @@ pub enum Error {
 	#[error("Proposal had wrong number. Expected {expected:?}, got {got:?}")]
 	WrongNumber { expected: BlockNumber, got: BlockNumber },
 	/// Proposal exceeded the maximum size.
-	#[error(
-		"Proposal exceeded the maximum size of {} by {} bytes.",
-		MAX_BLOCK_SIZE, .0.saturating_sub(MAX_BLOCK_SIZE)
-	)]
-	ProposalTooLarge(usize),
+	#[error("Proposal size {block_size} exceeds maximum allowed size of {max_block_size}.")]
+	ProposalTooLarge { block_size: usize, max_block_size: usize },
 }
 
 /// Attempt to evaluate a substrate block as a node block, returning error
@@ -55,28 +50,29 @@ pub fn evaluate_initial<Block: BlockT>(
 	proposal: &Block,
 	parent_hash: &<Block as BlockT>::Hash,
 	parent_number: <<Block as BlockT>::Header as HeaderT>::Number,
+	max_block_size: usize,
 ) -> Result<()> {
 
 	let encoded = Encode::encode(proposal);
 	let proposal = Block::decode(&mut &encoded[..])
 		.map_err(|e| Error::BadProposalFormat(e))?;
 
-	if encoded.len() > MAX_BLOCK_SIZE {
-		return Err(Error::ProposalTooLarge(encoded.len()))
+	if encoded.len() > max_block_size {
+		return Err(Error::ProposalTooLarge { max_block_size, block_size: encoded.len() })
 	}
 
 	if *parent_hash != *proposal.header().parent_hash() {
 		return Err(Error::WrongParentHash {
 			expected: format!("{:?}", *parent_hash),
 			got: format!("{:?}", proposal.header().parent_hash())
-		});
+		})
 	}
 
 	if parent_number + One::one() != *proposal.header().number() {
 		return Err(Error::WrongNumber {
 			expected: parent_number.checked_into::<u128>().map(|x| x + 1),
 			got: (*proposal.header().number()).checked_into::<u128>(),
-		});
+		})
 	}
 
 	Ok(())
diff --git a/primitives/consensus/common/src/lib.rs b/primitives/consensus/common/src/lib.rs
index 47de0674115c..988aa7a816c4 100644
--- a/primitives/consensus/common/src/lib.rs
+++ b/primitives/consensus/common/src/lib.rs
@@ -46,9 +46,6 @@ pub mod import_queue;
 pub mod evaluation;
 mod metrics;
 
-// block size limit.
-const MAX_BLOCK_SIZE: usize = 4 * 1024 * 1024 + 512;
-
 pub use self::error::Error;
 pub use block_import::{
 	BlockImport, BlockOrigin, ForkChoiceStrategy, ImportedAux, BlockImportParams, BlockCheckParams,

From 9ec43d880823e9ad082de7e3038ac9777613fa15 Mon Sep 17 00:00:00 2001
From: Shinsaku Ashizawa <39494661+NoCtrlZ@users.noreply.github.com>
Date: Mon, 9 Nov 2020 02:18:34 +0900
Subject: [PATCH 0058/1194] Write pallet_evm README (#7487)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* describe pallet evm

* add license

* write readme into lib.rs

* change some sentence

Co-authored-by: Wei Tang <accounts@that.world>

* update implementation status

Co-authored-by: Wei Tang <accounts@that.world>

* update readme according to review

* Update frame/evm/src/lib.rs

* fix line length

Co-authored-by: Wei Tang <accounts@that.world>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 frame/evm/README.md  | 28 +++++++++++++++++++++++++++-
 frame/evm/src/lib.rs | 35 ++++++++++++++++++++++++++++++++++-
 2 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/frame/evm/README.md b/frame/evm/README.md
index f8feadbf58eb..499a0761cfa9 100644
--- a/frame/evm/README.md
+++ b/frame/evm/README.md
@@ -1,3 +1,29 @@
-EVM execution module for Substrate
+# EVM Module
+
+The EVM module allows unmodified EVM code to be executed in a Substrate-based blockchain.
+- [`evm::Trait`](https://docs.rs/pallet-evm/2.0.0/pallet_evm/trait.Trait.html)
+
+## EVM Engine
+
+The EVM module uses [`SputnikVM`](https://github.com/rust-blockchain/evm) as the underlying EVM engine. The engine is overhauled so that it's [`modular`](https://github.com/corepaper/evm).
+
+## Execution Lifecycle
+
+There are a separate set of accounts managed by the EVM module. Substrate based accounts can call the EVM Module to deposit or withdraw balance from the Substrate base-currency into a different balance managed and used by the EVM module. Once a user has populated their balance, they can create and call smart contracts using this module.
+
+There's one-to-one mapping from Substrate accounts and EVM external accounts that is defined by a conversion function.
+
+## EVM Module vs Ethereum Network
+
+The EVM module should be able to produce nearly identical results compared to the Ethereum mainnet, including gas cost and balance changes.
+
+Observable differences include:
+
+- The available length of block hashes may not be 256 depending on the configuration of the System module in the Substrate runtime.
+- Difficulty and coinbase, which do not make sense in this module and is currently hard coded to zero.
+
+We currently do not aim to make unobservable behaviors, such as state root, to be the same. We also don't aim to follow the exact same transaction / receipt format. However, given one Ethereum transaction and one Substrate account's private key, one should be able to convert any Ethereum transaction into a transaction compatible with this module.
+
+The gas configurations are configurable. Right now, a pre-defined Istanbul hard fork configuration option is provided.
 
 License: Apache-2.0
\ No newline at end of file
diff --git a/frame/evm/src/lib.rs b/frame/evm/src/lib.rs
index dddb71fc02a7..e7812a55482f 100644
--- a/frame/evm/src/lib.rs
+++ b/frame/evm/src/lib.rs
@@ -15,7 +15,40 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! EVM execution module for Substrate
+//! # EVM Module
+//!
+//! The EVM module allows unmodified EVM code to be executed in a Substrate-based blockchain.
+//! - [`evm::Trait`]
+//!
+//! ## EVM Engine
+//!
+//! The EVM module uses [`SputnikVM`](https://github.com/rust-blockchain/evm) as the underlying EVM engine.
+//! The engine is overhauled so that it's [`modular`](https://github.com/corepaper/evm).
+//!
+//! ## Execution Lifecycle
+//!
+//! There are a separate set of accounts managed by the EVM module. Substrate based accounts can call the EVM Module
+//! to deposit or withdraw balance from the Substrate base-currency into a different balance managed and used by
+//! the EVM module. Once a user has populated their balance, they can create and call smart contracts using this module.
+//!
+//! There's one-to-one mapping from Substrate accounts and EVM external accounts that is defined by a conversion function.
+//!
+//! ## EVM Module vs Ethereum Network
+//!
+//! The EVM module should be able to produce nearly identical results compared to the Ethereum mainnet,
+//! including gas cost and balance changes.
+//!
+//! Observable differences include:
+//!
+//! - The available length of block hashes may not be 256 depending on the configuration of the System module
+//! in the Substrate runtime.
+//! - Difficulty and coinbase, which do not make sense in this module and is currently hard coded to zero.
+//!
+//! We currently do not aim to make unobservable behaviors, such as state root, to be the same. We also don't aim to follow
+//! the exact same transaction / receipt format. However, given one Ethereum transaction and one Substrate account's
+//! private key, one should be able to convert any Ethereum transaction into a transaction compatible with this module.
+//!
+//! The gas configurations are configurable. Right now, a pre-defined Istanbul hard fork configuration option is provided.
 
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]

From 3a279b9a7a14b6439d174179ed9a6d3f48e40a51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Mon, 9 Nov 2020 14:33:45 +0100
Subject: [PATCH 0059/1194] Run polkadot companion tests with correct feature
 enabled (#7507)

---
 .maintain/gitlab/check_polkadot_companion_build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.maintain/gitlab/check_polkadot_companion_build.sh b/.maintain/gitlab/check_polkadot_companion_build.sh
index 219af5001b05..73a5a36ff8af 100755
--- a/.maintain/gitlab/check_polkadot_companion_build.sh
+++ b/.maintain/gitlab/check_polkadot_companion_build.sh
@@ -91,4 +91,4 @@ cd polkadot
 
 # Test Polkadot pr or master branch with this Substrate commit.
 cargo update -p sp-io
-time cargo test --all --release --verbose
+time cargo test --all --release --verbose --features=real-overseer

From e756e8339c3d1b532351ba893cd3ba9e763d87e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Mon, 9 Nov 2020 15:32:14 +0100
Subject: [PATCH 0060/1194] contracts: Add automated weights for wasm
 instructions (#7361)

* pallet_contracts: Inline benchmark helper that is only used once

* Move all max_* Schedule items into a new struct

* Limit the number of globals a module can declare

* The current limits are too high for wasmi to even execute

* Limit the amount of parameters any wasm function is allowed to have

* Limit the size the BrTable's immediate value

* Add instruction benchmarks

* Add new benchmarks to the schedule and make use of it

* Add Benchmark Results generated by the bench bot

* Add proc macro that implements `Debug` for `Schedule`

* Add missing imports necessary for no_std build

* Make the WeightDebug macro available for no_std

In this case a dummy implementation is derived in order to not
blow up the code size akin to the RuntimeDebug macro.

* Rework instr_memory_grow benchmark to use only the maximum amount of pages allowed

* Add maximum amount of memory when benching (seal_)call/instantiate

* cargo run --release --features runtime-benchmarks --manifest-path bin/node/cli/Cargo.toml -- benchmark --chain dev --steps 50 --repeat 20 --extrinsic * --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output ./bin/node/runtime/src/weights --header ./HEADER --pallet pallet_contracts

* Added utility benchmark that allows pretty printing of the real schedule

* review: Add missing header to the proc-macro lib.rs

* review: Clarify why #[allow(dead_code)] attribute is there

* review: Fix pwasm-utils line

* review: Fixup rand usage

* review: Fix typo

* review: Imported -> Exported

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_contracts --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/contracts/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* contracts: Adapt to new weight structure

* contracts: Fixup runtime WeightInfo

* contracts: Remove unneeded fullpath of WeightInfo type

* Apply suggestions from code review

Co-authored-by: Andrew Jones <ascjones@gmail.com>

* Fix typo in schedule.rs

Co-authored-by: Andrew Jones <ascjones@gmail.com>

* Fix docs in schedule.rs

* Apply suggestions from code review

Co-authored-by: Nikolay Volf <nikvolf@gmail.com>

* Don't publish proc-macro crate until 3.0.0 is ready

* Optimize imports for less repetition

* Break overlong line

Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
Co-authored-by: Andrew Jones <ascjones@gmail.com>
Co-authored-by: Nikolay Volf <nikvolf@gmail.com>
---
 Cargo.lock                                    |   27 +-
 bin/node/runtime/src/lib.rs                   |    5 +-
 bin/node/runtime/src/weights/mod.rs           |   18 -
 .../runtime/src/weights/pallet_contracts.rs   |  294 ----
 frame/contracts/Cargo.toml                    |   10 +-
 frame/contracts/proc-macro/Cargo.toml         |   27 +
 frame/contracts/proc-macro/src/lib.rs         |  142 ++
 frame/contracts/src/benchmarking/code.rs      |  259 +++-
 frame/contracts/src/benchmarking/mod.rs       |  901 +++++++++++-
 frame/contracts/src/benchmarking/sandbox.rs   |   52 +
 frame/contracts/src/lib.rs                    |    8 +-
 frame/contracts/src/schedule.rs               |  418 +++++-
 frame/contracts/src/wasm/mod.rs               |   17 +-
 frame/contracts/src/wasm/prepare.rs           |  192 ++-
 frame/contracts/src/wasm/runtime.rs           |   13 +-
 frame/contracts/src/weight_info.rs            |  341 -----
 frame/contracts/src/weights.rs                | 1267 +++++++++++++++++
 17 files changed, 3150 insertions(+), 841 deletions(-)
 delete mode 100644 bin/node/runtime/src/weights/mod.rs
 delete mode 100644 bin/node/runtime/src/weights/pallet_contracts.rs
 create mode 100644 frame/contracts/proc-macro/Cargo.toml
 create mode 100644 frame/contracts/proc-macro/src/lib.rs
 create mode 100644 frame/contracts/src/benchmarking/sandbox.rs
 delete mode 100644 frame/contracts/src/weight_info.rs
 create mode 100644 frame/contracts/src/weights.rs

diff --git a/Cargo.lock b/Cargo.lock
index 0da8f25b2242..aff2c9991766 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4472,13 +4472,16 @@ dependencies = [
  "hex-literal",
  "pallet-balances",
  "pallet-contracts-primitives",
+ "pallet-contracts-proc-macro",
  "pallet-randomness-collective-flip",
  "pallet-timestamp",
  "parity-scale-codec",
  "parity-wasm 0.41.0",
  "paste 1.0.0",
  "pretty_assertions",
- "pwasm-utils",
+ "pwasm-utils 0.16.0",
+ "rand 0.7.3",
+ "rand_pcg 0.2.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -4499,6 +4502,15 @@ dependencies = [
  "sp-std",
 ]
 
+[[package]]
+name = "pallet-contracts-proc-macro"
+version = "0.1.0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "pallet-contracts-rpc"
 version = "0.8.0"
@@ -5835,6 +5847,17 @@ dependencies = [
  "parity-wasm 0.41.0",
 ]
 
+[[package]]
+name = "pwasm-utils"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c8ac87af529432d3a4f0e2b3bbf08af49f28f09cc73ed7e551161bdaef5f78d"
+dependencies = [
+ "byteorder",
+ "log",
+ "parity-wasm 0.41.0",
+]
+
 [[package]]
 name = "quick-error"
 version = "1.2.3"
@@ -6960,7 +6983,7 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "parity-wasm 0.41.0",
- "pwasm-utils",
+ "pwasm-utils 0.14.0",
  "sc-executor-common",
  "scoped-tls",
  "sp-allocator",
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index dddef0b46a88..bfa412e88203 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -87,9 +87,6 @@ pub mod constants;
 use constants::{time::*, currency::*};
 use sp_runtime::generic::Era;
 
-/// Weights for pallets used in the runtime.
-mod weights;
-
 // Make the WASM binary available.
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
@@ -697,7 +694,7 @@ impl pallet_contracts::Trait for Runtime {
 	type MaxDepth = pallet_contracts::DefaultMaxDepth;
 	type MaxValueSize = pallet_contracts::DefaultMaxValueSize;
 	type WeightPrice = pallet_transaction_payment::Module<Self>;
-	type WeightInfo = weights::pallet_contracts::WeightInfo<Self>;
+	type WeightInfo = pallet_contracts::weights::SubstrateWeight<Self>;
 }
 
 impl pallet_sudo::Trait for Runtime {
diff --git a/bin/node/runtime/src/weights/mod.rs b/bin/node/runtime/src/weights/mod.rs
deleted file mode 100644
index 5de6286da9b7..000000000000
--- a/bin/node/runtime/src/weights/mod.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! A list of the different weight modules for our runtime.
-
-pub mod pallet_contracts;
diff --git a/bin/node/runtime/src/weights/pallet_contracts.rs b/bin/node/runtime/src/weights/pallet_contracts.rs
deleted file mode 100644
index 8cd97b4a7219..000000000000
--- a/bin/node/runtime/src/weights/pallet_contracts.rs
+++ /dev/null
@@ -1,294 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Weights for pallet_contracts
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-06, STEPS: [50], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
-
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Trait> pallet_contracts::WeightInfo for WeightInfo<T> {
-	fn update_schedule() -> Weight {
-		(33_207_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn put_code(n: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((144_833_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn instantiate(n: u32, ) -> Weight {
-		(223_974_000 as Weight)
-			.saturating_add((1_007_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(6 as Weight))
-			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-	}
-	fn call() -> Weight {
-		(210_638_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn claim_surcharge() -> Weight {
-		(508_079_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn seal_caller(r: u32, ) -> Weight {
-		(143_336_000 as Weight)
-			.saturating_add((397_788_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_address(r: u32, ) -> Weight {
-		(147_296_000 as Weight)
-			.saturating_add((396_962_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_gas_left(r: u32, ) -> Weight {
-		(141_677_000 as Weight)
-			.saturating_add((393_308_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_balance(r: u32, ) -> Weight {
-		(157_556_000 as Weight)
-			.saturating_add((879_861_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
-	}
-	fn seal_value_transferred(r: u32, ) -> Weight {
-		(148_867_000 as Weight)
-			.saturating_add((391_678_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(147_252_000 as Weight)
-			.saturating_add((393_977_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(144_208_000 as Weight)
-			.saturating_add((394_625_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(135_320_000 as Weight)
-			.saturating_add((925_541_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_block_number(r: u32, ) -> Weight {
-		(145_849_000 as Weight)
-			.saturating_add((390_065_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_now(r: u32, ) -> Weight {
-		(146_363_000 as Weight)
-			.saturating_add((391_772_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(129_872_000 as Weight)
-			.saturating_add((670_744_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
-	}
-	fn seal_gas(r: u32, ) -> Weight {
-		(130_985_000 as Weight)
-			.saturating_add((198_427_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_input(r: u32, ) -> Weight {
-		(138_647_000 as Weight)
-			.saturating_add((8_363_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(149_418_000 as Weight)
-			.saturating_add((272_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_return(r: u32, ) -> Weight {
-		(129_116_000 as Weight)
-			.saturating_add((5_745_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(139_601_000 as Weight)
-			.saturating_add((680_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_terminate(r: u32, ) -> Weight {
-		(138_548_000 as Weight)
-			.saturating_add((355_473_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
-			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(r as Weight)))
-	}
-	fn seal_restore_to(r: u32, ) -> Weight {
-		(239_880_000 as Weight)
-			.saturating_add((138_305_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
-			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(r as Weight)))
-			.saturating_add(T::DbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
-	}
-	fn seal_restore_to_per_delta(d: u32, ) -> Weight {
-		(40_572_000 as Weight)
-			.saturating_add((3_748_632_000 as Weight).saturating_mul(d as Weight))
-			.saturating_add(T::DbWeight::get().reads(7 as Weight))
-			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
-			.saturating_add(T::DbWeight::get().writes(5 as Weight))
-			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
-	}
-	fn seal_random(r: u32, ) -> Weight {
-		(148_156_000 as Weight)
-			.saturating_add((1_036_452_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
-	}
-	fn seal_deposit_event(r: u32, ) -> Weight {
-		(176_039_000 as Weight)
-			.saturating_add((1_497_705_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_923_547_000 as Weight)
-			.saturating_add((783_354_000 as Weight).saturating_mul(t as Weight))
-			.saturating_add((240_600_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
-			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
-	}
-	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(151_095_000 as Weight)
-			.saturating_add((1_104_696_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn seal_set_storage(r: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((14_975_467_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
-	}
-	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(2_465_724_000 as Weight)
-			.saturating_add((203_125_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
-	fn seal_clear_storage(r: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((5_254_595_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
-	}
-	fn seal_get_storage(r: u32, ) -> Weight {
-		(60_303_000 as Weight)
-			.saturating_add((1_135_486_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
-	}
-	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(931_900_000 as Weight)
-			.saturating_add((144_572_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
-	}
-	fn seal_transfer(r: u32, ) -> Weight {
-		(50_722_000 as Weight)
-			.saturating_add((6_701_164_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
-			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
-	}
-	fn seal_call(r: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((10_589_747_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
-			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
-	}
-	fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight {
-		(11_223_388_000 as Weight)
-			.saturating_add((4_965_182_000 as Weight).saturating_mul(t as Weight))
-			.saturating_add((50_603_000 as Weight).saturating_mul(i as Weight))
-			.saturating_add((72_972_000 as Weight).saturating_mul(o as Weight))
-			.saturating_add(T::DbWeight::get().reads(105 as Weight))
-			.saturating_add(T::DbWeight::get().reads((101 as Weight).saturating_mul(t as Weight)))
-			.saturating_add(T::DbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
-	}
-	fn seal_instantiate(r: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((22_933_938_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(6 as Weight))
-			.saturating_add(T::DbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes((200 as Weight).saturating_mul(r as Weight)))
-	}
-	fn seal_instantiate_per_input_output_kb(i: u32, o: u32, ) -> Weight {
-		(20_986_307_000 as Weight)
-			.saturating_add((152_611_000 as Weight).saturating_mul(i as Weight))
-			.saturating_add((73_457_000 as Weight).saturating_mul(o as Weight))
-			.saturating_add(T::DbWeight::get().reads(207 as Weight))
-			.saturating_add(T::DbWeight::get().writes(202 as Weight))
-	}
-	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(145_988_000 as Weight)
-			.saturating_add((343_540_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(719_758_000 as Weight)
-			.saturating_add((420_306_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(116_261_000 as Weight)
-			.saturating_add((360_601_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(583_726_000 as Weight)
-			.saturating_add((333_091_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(144_609_000 as Weight)
-			.saturating_add((332_388_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(612_987_000 as Weight)
-			.saturating_add((150_030_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(142_085_000 as Weight)
-			.saturating_add((329_426_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(632_517_000 as Weight)
-			.saturating_add((149_974_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-	}
-}
diff --git a/frame/contracts/Cargo.toml b/frame/contracts/Cargo.toml
index 3c8ac89f5d06..67d9ae8101fe 100644
--- a/frame/contracts/Cargo.toml
+++ b/frame/contracts/Cargo.toml
@@ -21,8 +21,9 @@ frame-benchmarking = { version = "2.0.0", default-features = false, path = "../b
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
 pallet-contracts-primitives = { version = "2.0.0", default-features = false, path = "common" }
+pallet-contracts-proc-macro = { version = "0.1.0", path = "proc-macro" }
 parity-wasm = { version = "0.41.0", default-features = false }
-pwasm-utils = { version = "0.14.0", default-features = false }
+pwasm-utils = { version = "0.16", default-features = false }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
@@ -31,6 +32,10 @@ sp-std = { version = "2.0.0", default-features = false, path = "../../primitives
 sp-sandbox = { version = "0.8.0", default-features = false, path = "../../primitives/sandbox" }
 wasmi-validation = { version = "0.3.0", default-features = false }
 
+# Only used in benchmarking to generate random contract code
+rand = { version = "0.7.0", optional = true, default-features = false }
+rand_pcg = { version = "0.2.1", optional = true }
+
 [dev-dependencies]
 assert_matches = "1.3.0"
 hex-literal = "0.3.1"
@@ -57,7 +62,10 @@ std = [
 	"pwasm-utils/std",
 	"wasmi-validation/std",
 	"pallet-contracts-primitives/std",
+	"pallet-contracts-proc-macro/full",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
+	"rand",
+	"rand_pcg",
 ]
diff --git a/frame/contracts/proc-macro/Cargo.toml b/frame/contracts/proc-macro/Cargo.toml
new file mode 100644
index 000000000000..56ef85533557
--- /dev/null
+++ b/frame/contracts/proc-macro/Cargo.toml
@@ -0,0 +1,27 @@
+[package]
+name = "pallet-contracts-proc-macro"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
+license = "Apache-2.0"
+homepage = "https://substrate.dev"
+repository = "https://github.com/paritytech/substrate/"
+description = "Procedural macros used in pallet_contracts"
+publish = false
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+proc-macro = true
+
+[dependencies]
+proc-macro2 = "1"
+quote = "1"
+syn = "1"
+
+[dev-dependencies]
+
+[features]
+# If set the full output is generated. Do NOT set when generating for wasm runtime.
+full = []
diff --git a/frame/contracts/proc-macro/src/lib.rs b/frame/contracts/proc-macro/src/lib.rs
new file mode 100644
index 000000000000..4e38508297d2
--- /dev/null
+++ b/frame/contracts/proc-macro/src/lib.rs
@@ -0,0 +1,142 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Proc macros used in the contracts module.
+
+#![no_std]
+
+extern crate alloc;
+
+use proc_macro2::TokenStream;
+use quote::{quote, quote_spanned};
+use syn::spanned::Spanned;
+use syn::{parse_macro_input, Data, DataStruct, DeriveInput, Fields, Ident};
+use alloc::string::ToString;
+
+/// This derives `Debug` for a struct where each field must be of some numeric type.
+/// It interprets each field as its represents some weight and formats it as times so that
+/// it is readable by humans.
+#[proc_macro_derive(WeightDebug)]
+pub fn derive_weight_debug(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+	derive_debug(input, format_weight)
+}
+
+/// This is basically identical to the std libs Debug derive but without adding any
+/// bounds to existing generics.
+#[proc_macro_derive(ScheduleDebug)]
+pub fn derive_schedule_debug(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+	derive_debug(input, format_default)
+}
+
+fn derive_debug(
+	input: proc_macro::TokenStream,
+	fmt: impl Fn(&Ident) -> TokenStream
+) -> proc_macro::TokenStream {
+	let input = parse_macro_input!(input as DeriveInput);
+	let name = &input.ident;
+	let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();
+	let data = if let Data::Struct(data) = &input.data {
+		data
+	} else {
+		return quote_spanned! {
+			name.span() =>
+			compile_error!("WeightDebug is only supported for structs.");
+		}.into();
+	};
+
+	#[cfg(feature = "full")]
+	let fields = iterate_fields(data, fmt);
+
+	#[cfg(not(feature = "full"))]
+	let fields = {
+		drop(fmt);
+		drop(data);
+		TokenStream::new()
+	};
+
+	let tokens = quote! {
+		impl #impl_generics core::fmt::Debug for #name #ty_generics #where_clause {
+			fn fmt(&self, formatter: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+				use ::sp_runtime::{FixedPointNumber, FixedU128 as Fixed};
+				let mut formatter = formatter.debug_struct(stringify!(#name));
+				#fields
+				formatter.finish()
+			}
+		}
+	};
+
+	tokens.into()
+}
+
+/// This is only used then the `full` feature is activated.
+#[cfg(feature = "full")]
+fn iterate_fields(data: &DataStruct, fmt: impl Fn(&Ident) -> TokenStream) -> TokenStream {
+	match &data.fields {
+		Fields::Named(fields) => {
+			let recurse = fields.named
+			.iter()
+			.filter_map(|f| {
+				let name = f.ident.as_ref()?;
+				if name.to_string().starts_with('_') {
+					return None;
+				}
+				let value = fmt(name);
+				let ret = quote_spanned!{ f.span() =>
+					formatter.field(stringify!(#name), #value);
+				};
+				Some(ret)
+			});
+			quote!{
+				#( #recurse )*
+			}
+		}
+		Fields::Unnamed(fields) => quote_spanned!{
+			fields.span() =>
+			compile_error!("Unnamed fields are not supported")
+		},
+		Fields::Unit => quote!(),
+	}
+}
+
+fn format_weight(field: &Ident) -> TokenStream {
+	quote_spanned! { field.span() =>
+		&if self.#field > 1_000_000_000 {
+			format!(
+				"{:.1?} ms",
+				Fixed::saturating_from_rational(self.#field, 1_000_000_000).to_fraction()
+			)
+		} else if self.#field > 1_000_000 {
+			format!(
+				"{:.1?} µs",
+				Fixed::saturating_from_rational(self.#field, 1_000_000).to_fraction()
+			)
+		} else if self.#field > 1_000 {
+			format!(
+				"{:.1?} ns",
+				Fixed::saturating_from_rational(self.#field, 1_000).to_fraction()
+			)
+		} else {
+			format!("{} ps", self.#field)
+		}
+	}
+}
+
+fn format_default(field: &Ident) -> TokenStream {
+	quote_spanned! { field.span() =>
+		&self.#field
+	}
+}
diff --git a/frame/contracts/src/benchmarking/code.rs b/frame/contracts/src/benchmarking/code.rs
index dc3730e95ca1..cb5052042aab 100644
--- a/frame/contracts/src/benchmarking/code.rs
+++ b/frame/contracts/src/benchmarking/code.rs
@@ -28,28 +28,50 @@ use crate::Trait;
 use crate::Module as Contracts;
 
 use parity_wasm::elements::{Instruction, Instructions, FuncBody, ValueType, BlockType};
+use pwasm_utils::stack_height::inject_limiter;
 use sp_runtime::traits::Hash;
+use sp_sandbox::{EnvironmentDefinitionBuilder, Memory};
 use sp_std::{prelude::*, convert::TryFrom};
 
 /// Pass to `create_code` in order to create a compiled `WasmModule`.
+///
+/// This exists to have a more declarative way to describe a wasm module than to use
+/// parity-wasm directly. It is tailored to fit the structure of contracts that are
+/// needed for benchmarking.
+#[derive(Default)]
 pub struct ModuleDefinition {
-	pub data_segments: Vec<DataSegment>,
+	/// Imported memory attached to the module. No memory is imported if `None`.
 	pub memory: Option<ImportedMemory>,
+	/// Initializers for the imported memory.
+	pub data_segments: Vec<DataSegment>,
+	/// Creates the supplied amount of i64 mutable globals initialized with random values.
+	pub num_globals: u32,
+	/// List of functions that the module should import. They start with index 0.
 	pub imported_functions: Vec<ImportedFunction>,
+	/// Function body of the exported `deploy` function. Body is empty if `None`.
+	/// Its index is `imported_functions.len()`.
 	pub deploy_body: Option<FuncBody>,
+	/// Function body of the exported `call` function. Body is empty if `None`.
+	/// Its index is `imported_functions.len() + 1`.
 	pub call_body: Option<FuncBody>,
+	/// Function body of a non-exported function with index `imported_functions.len() + 2`.
+	pub aux_body: Option<FuncBody>,
+	/// The amount of I64 arguments the aux function should have.
+	pub aux_arg_num: u32,
+	/// If set to true the stack height limiter is injected into the the module. This is
+	/// needed for instruction debugging because the cost of executing the stack height
+	/// instrumentation should be included in the costs for the individual instructions
+	/// that cause more metering code (only call).
+	pub inject_stack_metering: bool,
+	/// Create a table containing function pointers.
+	pub table: Option<TableSegment>,
 }
 
-impl Default for ModuleDefinition {
-	fn default() -> Self {
-		Self {
-			data_segments: vec![],
-			memory: None,
-			imported_functions: vec![],
-			deploy_body: None,
-			call_body: None,
-		}
-	}
+pub struct TableSegment {
+	/// How many elements should be created inside the table.
+	pub num_elements: u32,
+	/// The function index with which all table elements should be initialized.
+	pub function_index: u32,
 }
 
 pub struct DataSegment {
@@ -57,6 +79,7 @@ pub struct DataSegment {
 	pub value: Vec<u8>,
 }
 
+#[derive(Clone)]
 pub struct ImportedMemory {
 	pub min_pages: u32,
 	pub max_pages: u32,
@@ -80,6 +103,7 @@ pub struct ImportedFunction {
 pub struct WasmModule<T:Trait> {
 	pub code: Vec<u8>,
 	pub hash: <T::Hashing as Hash>::Output,
+	memory: Option<ImportedMemory>,
 }
 
 impl<T: Trait> From<ModuleDefinition> for WasmModule<T> {
@@ -91,14 +115,14 @@ impl<T: Trait> From<ModuleDefinition> for WasmModule<T> {
 		let mut contract = parity_wasm::builder::module()
 			// deploy function (first internal function)
 			.function()
-				.signature().with_params(vec![]).with_return_type(None).build()
+				.signature().with_return_type(None).build()
 				.with_body(def.deploy_body.unwrap_or_else(||
 					FuncBody::new(Vec::new(), Instructions::empty())
 				))
 				.build()
 			// call function (second internal function)
 			.function()
-				.signature().with_params(vec![]).with_return_type(None).build()
+				.signature().with_return_type(None).build()
 				.with_body(def.call_body.unwrap_or_else(||
 					FuncBody::new(Vec::new(), Instructions::empty())
 				))
@@ -106,8 +130,19 @@ impl<T: Trait> From<ModuleDefinition> for WasmModule<T> {
 			.export().field("deploy").internal().func(func_offset).build()
 			.export().field("call").internal().func(func_offset + 1).build();
 
+		// If specified we add an additional internal function
+		if let Some(body) = def.aux_body {
+			let mut signature = contract
+				.function()
+				.signature().with_return_type(None);
+			for _ in 0 .. def.aux_arg_num {
+				signature = signature.with_param(ValueType::I64);
+			}
+			contract = signature.build().with_body(body).build();
+		}
+
 		// Grant access to linear memory.
-		if let Some(memory) = def.memory {
+		if let Some(memory) = &def.memory {
 			contract = contract.import()
 				.module("env").field("memory")
 				.external().memory(memory.min_pages, Some(memory.max_pages))
@@ -136,20 +171,69 @@ impl<T: Trait> From<ModuleDefinition> for WasmModule<T> {
 				.build()
 		}
 
-		let code = contract.build().to_bytes().unwrap();
+		// Add global variables
+		if def.num_globals > 0 {
+			use rand::{prelude::*, distributions::Standard};
+			let rng = rand_pcg::Pcg32::seed_from_u64(3112244599778833558);
+			for val in rng.sample_iter(Standard).take(def.num_globals as usize) {
+				contract = contract
+					.global()
+					.value_type().i64()
+					.mutable()
+					.init_expr(Instruction::I64Const(val))
+					.build()
+			}
+		}
+
+		// Add function pointer table
+		if let Some(table) = def.table {
+			contract = contract
+				.table()
+				.with_min(table.num_elements)
+				.with_max(Some(table.num_elements))
+				.with_element(0, vec![table.function_index; table.num_elements as usize])
+				.build();
+		}
+
+		let mut code = contract.build();
+
+		// Inject stack height metering
+		if def.inject_stack_metering {
+			code = inject_limiter(
+				code,
+				Contracts::<T>::current_schedule().limits.stack_height
+			)
+			.unwrap();
+		}
+
+		let code = code.to_bytes().unwrap();
 		let hash = T::Hashing::hash(&code);
 		Self {
 			code,
-			hash
+			hash,
+			memory: def.memory,
 		}
 	}
 }
 
 impl<T: Trait> WasmModule<T> {
+	/// Creates a wasm module with an empty `call` and `deploy` function and nothing else.
 	pub fn dummy() -> Self {
 		ModuleDefinition::default().into()
 	}
 
+	/// Same as `dummy` but with maximum sized linear memory.
+	pub fn dummy_with_mem() -> Self {
+		ModuleDefinition {
+			memory: Some(ImportedMemory::max::<T>()),
+			.. Default::default()
+		}
+		.into()
+	}
+
+	/// Creates a wasm module of `target_bytes` size. Used to benchmark the performance of
+	/// `put_code` for different sizes of wasm modules. The generated module maximizes
+	/// instrumentation runtime by nesting blocks as deeply as possible given the byte budget.
 	pub fn sized(target_bytes: u32) -> Self {
 		use parity_wasm::elements::Instruction::{If, I32Const, Return, End};
 		// Base size of a contract is 47 bytes and each expansion adds 6 bytes.
@@ -171,6 +255,9 @@ impl<T: Trait> WasmModule<T> {
 		.into()
 	}
 
+	/// Creates a wasm module that calls the imported function named `getter_name` `repeat`
+	/// times. The imported function is expected to have the "getter signature" of
+	/// (out_ptr: u32, len_ptr: u32) -> ().
 	pub fn getter(getter_name: &'static str, repeat: u32) -> Self {
 		let pages = max_pages::<T>();
 		ModuleDefinition {
@@ -198,11 +285,14 @@ impl<T: Trait> WasmModule<T> {
 		.into()
 	}
 
+	/// Creates a wasm module that calls the imported hash function named `name` `repeat` times
+	/// with an input of size `data_size`. Hash functions have the signature
+	/// (input_ptr: u32, input_len: u32, output_ptr: u32) -> ()
 	pub fn hasher(name: &'static str, repeat: u32, data_size: u32) -> Self {
 		ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
-				name: name,
+				name,
 				params: vec![ValueType::I32, ValueType::I32, ValueType::I32],
 				return_type: None,
 			}],
@@ -216,16 +306,84 @@ impl<T: Trait> WasmModule<T> {
 		}
 		.into()
 	}
+
+	/// Creates a memory instance for use in a sandbox with dimensions declared in this module
+	/// and adds it to `env`. A reference to that memory is returned so that it can be used to
+	/// access the memory contents from the supervisor.
+	pub fn add_memory<S>(&self, env: &mut EnvironmentDefinitionBuilder<S>) -> Option<Memory> {
+		let memory = if let Some(memory) = &self.memory {
+			memory
+		} else {
+			return None;
+		};
+		let memory = Memory::new(memory.min_pages, Some(memory.max_pages)).unwrap();
+		env.add_memory("env", "memory", memory.clone());
+		Some(memory)
+	}
+
+	pub fn unary_instr(instr: Instruction, repeat: u32) -> Self {
+		use body::DynInstr::{RandomI64Repeated, Regular};
+		ModuleDefinition {
+			call_body: Some(body::repeated_dyn(repeat, vec![
+				RandomI64Repeated(1),
+				Regular(instr),
+				Regular(Instruction::Drop),
+			])),
+			.. Default::default()
+		}.into()
+	}
+
+	pub fn binary_instr(instr: Instruction, repeat: u32) -> Self {
+		use body::DynInstr::{RandomI64Repeated, Regular};
+		ModuleDefinition {
+			call_body: Some(body::repeated_dyn(repeat, vec![
+				RandomI64Repeated(2),
+				Regular(instr),
+				Regular(Instruction::Drop),
+			])),
+			.. Default::default()
+		}.into()
+	}
 }
 
-/// Mechanisms to create a function body that can be used inside a `ModuleDefinition`.
+/// Mechanisms to generate a function body that can be used inside a `ModuleDefinition`.
 pub mod body {
 	use super::*;
 
-	pub enum CountedInstruction {
-		// (offset, increment_by)
-		Counter(u32, u32),
+	/// When generating contract code by repeating a wasm sequence, it's sometimes necessary
+	/// to change those instructions on each repetition. The variants of this enum describe
+	/// various ways in which this can happen.
+	pub enum DynInstr {
+		/// Insert the associated instruction.
 		Regular(Instruction),
+		/// Insert a I32Const with incrementing value for each insertion.
+		/// (start_at, increment_by)
+		Counter(u32, u32),
+		/// Insert a I32Const with a random value in [low, high) not divisible by two.
+		/// (low, high)
+		RandomUnaligned(u32, u32),
+		/// Insert a I32Const with a random value in [low, high).
+		/// (low, high)
+		RandomI32(i32, i32),
+		/// Insert the specified amount of I32Const with a random value.
+		RandomI32Repeated(usize),
+		/// Insert the specified amount of I64Const with a random value.
+		RandomI64Repeated(usize),
+		/// Insert a GetLocal with a random offset in [low, high).
+		/// (low, high)
+		RandomGetLocal(u32, u32),
+		/// Insert a SetLocal with a random offset in [low, high).
+		/// (low, high)
+		RandomSetLocal(u32, u32),
+		/// Insert a TeeLocal with a random offset in [low, high).
+		/// (low, high)
+		RandomTeeLocal(u32, u32),
+		/// Insert a GetGlobal with a random offset in [low, high).
+		/// (low, high)
+		RandomGetGlobal(u32, u32),
+		/// Insert a SetGlobal with a random offset in [low, high).
+		/// (low, high)
+		RandomSetGlobal(u32, u32)
 	}
 
 	pub fn plain(instructions: Vec<Instruction>) -> FuncBody {
@@ -245,28 +403,73 @@ pub mod body {
 		FuncBody::new(Vec::new(), instructions)
 	}
 
-	pub fn counted(repetitions: u32, mut instructions: Vec<CountedInstruction>) -> FuncBody {
+	pub fn repeated_dyn(repetitions: u32, mut instructions: Vec<DynInstr>) -> FuncBody {
+		use rand::{prelude::*, distributions::Standard};
+
+		// We do not need to be secure here.
+		let mut rng = rand_pcg::Pcg32::seed_from_u64(8446744073709551615);
+
 		// We need to iterate over indices because we cannot cycle over mutable references
 		let body = (0..instructions.len())
 			.cycle()
 			.take(instructions.len() * usize::try_from(repetitions).unwrap())
-			.map(|idx| {
+			.flat_map(|idx|
 				match &mut instructions[idx] {
-					CountedInstruction::Counter(offset, increment_by) => {
+					DynInstr::Regular(instruction) => vec![instruction.clone()],
+					DynInstr::Counter(offset, increment_by) => {
 						let current = *offset;
 						*offset += *increment_by;
-						Instruction::I32Const(current as i32)
+						vec![Instruction::I32Const(current as i32)]
+					},
+					DynInstr::RandomUnaligned(low, high) => {
+						let unaligned = rng.gen_range(*low, *high) | 1;
+						vec![Instruction::I32Const(unaligned as i32)]
+					},
+					DynInstr::RandomI32(low, high) => {
+						vec![Instruction::I32Const(rng.gen_range(*low, *high))]
+					},
+					DynInstr::RandomI32Repeated(num) => {
+						(&mut rng).sample_iter(Standard).take(*num).map(|val|
+							Instruction::I32Const(val)
+						)
+						.collect()
+					},
+					DynInstr::RandomI64Repeated(num) => {
+						(&mut rng).sample_iter(Standard).take(*num).map(|val|
+							Instruction::I64Const(val)
+						)
+						.collect()
+					},
+					DynInstr::RandomGetLocal(low, high) => {
+						vec![Instruction::GetLocal(rng.gen_range(*low, *high))]
+					},
+					DynInstr::RandomSetLocal(low, high) => {
+						vec![Instruction::SetLocal(rng.gen_range(*low, *high))]
+					},
+					DynInstr::RandomTeeLocal(low, high) => {
+						vec![Instruction::TeeLocal(rng.gen_range(*low, *high))]
+					},
+					DynInstr::RandomGetGlobal(low, high) => {
+						vec![Instruction::GetGlobal(rng.gen_range(*low, *high))]
+					},
+					DynInstr::RandomSetGlobal(low, high) => {
+						vec![Instruction::SetGlobal(rng.gen_range(*low, *high))]
 					},
-					CountedInstruction::Regular(instruction) => instruction.clone(),
 				}
-			})
+			)
 			.chain(sp_std::iter::once(Instruction::End))
 			.collect();
 		FuncBody::new(Vec::new(), Instructions::new(body))
 	}
+
+	/// Replace the locals of the supplied `body` with `num` i64 locals.
+	pub fn inject_locals(body: &mut FuncBody, num: u32) {
+		use parity_wasm::elements::Local;
+		*body.locals_mut() = (0..num).map(|i| Local::new(i, ValueType::I64)).collect()
+	}
 }
 
 /// The maximum amount of pages any contract is allowed to have according to the current `Schedule`.
 pub fn max_pages<T: Trait>() -> u32 {
-	Contracts::<T>::current_schedule().max_memory_pages
+	Contracts::<T>::current_schedule().limits.memory_pages
 }
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index 79863afc4419..dd9e89d6f35a 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -20,25 +20,33 @@
 #![cfg(feature = "runtime-benchmarks")]
 
 mod code;
+mod sandbox;
 
-use crate::*;
-use crate::Module as Contracts;
-use crate::exec::StorageKey;
-use crate::schedule::API_BENCHMARK_BATCH_SIZE;
-use self::code::{
-	body, ModuleDefinition, DataSegment, ImportedMemory, ImportedFunction, WasmModule,
+use crate::{
+	*, Module as Contracts,
+	exec::StorageKey,
+	schedule::{API_BENCHMARK_BATCH_SIZE, INSTR_BENCHMARK_BATCH_SIZE},
+};
+use self::{
+	code::{
+		body::{self, DynInstr::*},
+		ModuleDefinition, DataSegment, ImportedMemory, ImportedFunction, WasmModule,
+	},
+	sandbox::Sandbox,
 };
-
 use frame_benchmarking::{benchmarks, account, whitelisted_caller};
 use frame_system::{Module as System, RawOrigin};
 use parity_wasm::elements::{Instruction, ValueType, BlockType};
 use sp_runtime::traits::{Hash, Bounded};
-use sp_std::{default::Default, convert::{TryInto}};
+use sp_std::{default::Default, convert::{TryInto}, vec::Vec, vec};
 use pallet_contracts_primitives::RentProjection;
 
 /// How many batches we do per API benchmark.
 const API_BENCHMARK_BATCHES: u32 = 20;
 
+/// How many batches we do per Instruction benchmark.
+const INSTR_BENCHMARK_BATCHES: u32 = 1;
+
 /// An instantiated and deployed contract.
 struct Contract<T: Trait> {
 	caller: T::AccountId,
@@ -116,7 +124,14 @@ impl<T: Trait> Contract<T> {
 		};
 		T::Currency::make_free_balance_be(&caller, caller_funding::<T>());
 		let addr = T::DetermineContractAddress::contract_address_for(&module.hash, &data, &caller);
-		init_block_number::<T>();
+
+		// The default block number is zero. The benchmarking system bumps the block number
+		// to one for the benchmarking closure when it is set to zero. In order to prevent this
+		// undesired implicit bump (which messes with rent collection), we do the bump ourselves
+		// in the setup closure so that both the instantiate and subsequent call are run with the
+		// same block number.
+		System::<T>::set_block_number(1u32.into());
+
 		Contracts::<T>::put_code_raw(module.code)?;
 		Contracts::<T>::instantiate(
 			RawOrigin::Signed(caller.clone()).into(),
@@ -234,17 +249,6 @@ fn caller_funding<T: Trait>() -> BalanceOf<T> {
 	BalanceOf::<T>::max_value() / 2u32.into()
 }
 
-/// Set the block number to one.
-///
-/// The default block number is zero. The benchmarking system bumps the block number
-/// to one for the benchmarking closure when it is set to zero. In order to prevent this
-/// undesired implicit bump (which messes with rent collection), wo do the bump ourselfs
-/// in the setup closure so that both the instantiate and subsequent call are run with the
-/// same block number.
-fn init_block_number<T: Trait>() {
-	System::<T>::set_block_number(1u32.into());
-}
-
 benchmarks! {
 	_ {
 	}
@@ -261,7 +265,7 @@ benchmarks! {
 	// It creates a maximum number of metering blocks per byte.
 	// `n`: Size of the code in kilobytes.
 	put_code {
-		let n in 0 .. Contracts::<T>::current_schedule().max_code_size / 1024;
+		let n in 0 .. Contracts::<T>::current_schedule().limits.code_size / 1024;
 		let caller = whitelisted_caller();
 		T::Currency::make_free_balance_be(&caller, caller_funding::<T>());
 		let module = WasmModule::<T>::sized(n * 1024);
@@ -278,7 +282,7 @@ benchmarks! {
 		let endowment = Config::<T>::subsistence_threshold_uncached();
 		let caller = whitelisted_caller();
 		T::Currency::make_free_balance_be(&caller, caller_funding::<T>());
-		let WasmModule { code, hash } = WasmModule::<T>::dummy();
+		let WasmModule { code, hash, .. } = WasmModule::<T>::dummy_with_mem();
 		let origin = RawOrigin::Signed(caller.clone());
 		let addr = T::DetermineContractAddress::contract_address_for(&hash, &data, &caller);
 		Contracts::<T>::put_code_raw(code)?;
@@ -300,7 +304,7 @@ benchmarks! {
 	call {
 		let data = vec![42u8; 1024];
 		let instance = Contract::<T>::with_caller(
-			whitelisted_caller(), WasmModule::dummy(), vec![], Endow::CollectRent
+			whitelisted_caller(), WasmModule::dummy_with_mem(), vec![], Endow::CollectRent
 		)?;
 		let value = T::Currency::minimum_balance() * 100u32.into();
 		let origin = RawOrigin::Signed(instance.caller.clone());
@@ -783,7 +787,7 @@ benchmarks! {
 	seal_random {
 		let r in 0 .. API_BENCHMARK_BATCHES;
 		let pages = code::max_pages::<T>();
-		let subject_len = Contracts::<T>::current_schedule().max_subject_len;
+		let subject_len = Contracts::<T>::current_schedule().limits.subject_len;
 		assert!(subject_len < 1024);
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
@@ -839,14 +843,13 @@ benchmarks! {
 	// `t`: Number of topics
 	// `n`: Size of event payload in kb
 	seal_deposit_event_per_topic_and_kb {
-		let t in 0 .. Contracts::<T>::current_schedule().max_event_topics;
+		let t in 0 .. Contracts::<T>::current_schedule().limits.event_topics;
 		let n in 0 .. T::MaxValueSize::get() / 1024;
 		let mut topics = (0..API_BENCHMARK_BATCH_SIZE)
 			.map(|n| (n * t..n * t + t).map(|i| T::Hashing::hash_of(&i)).collect::<Vec<_>>().encode())
 			.peekable();
 		let topics_len = topics.peek().map(|i| i.len()).unwrap_or(0);
 		let topics = topics.flatten().collect();
-		use body::CountedInstruction::{Counter, Regular};
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
@@ -860,7 +863,7 @@ benchmarks! {
 					value: topics,
 				},
 			],
-			call_body: Some(body::counted(API_BENCHMARK_BATCH_SIZE, vec![
+			call_body: Some(body::repeated_dyn(API_BENCHMARK_BATCH_SIZE, vec![
 				Counter(0, topics_len as u32), // topics_ptr
 				Regular(Instruction::I32Const(topics_len as i32)), // topics_len
 				Regular(Instruction::I32Const(0)), // data_ptr
@@ -911,7 +914,6 @@ benchmarks! {
 			.flat_map(|n| T::Hashing::hash_of(&n).as_ref().to_vec())
 			.collect::<Vec<_>>();
 		let key_len = sp_std::mem::size_of::<<T::Hashing as sp_runtime::traits::Hash>::Output>();
-		use body::CountedInstruction::{Counter, Regular};
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
@@ -925,7 +927,7 @@ benchmarks! {
 					value: keys,
 				},
 			],
-			call_body: Some(body::counted(r * API_BENCHMARK_BATCH_SIZE, vec![
+			call_body: Some(body::repeated_dyn(r * API_BENCHMARK_BATCH_SIZE, vec![
 				Counter(0, key_len as u32), // key_ptr
 				Regular(Instruction::I32Const(0)), // value_ptr
 				Regular(Instruction::I32Const(0)), // value_len
@@ -976,7 +978,6 @@ benchmarks! {
 			.collect::<Vec<_>>();
 		let key_bytes = keys.iter().flatten().cloned().collect::<Vec<_>>();
 		let key_len = sp_std::mem::size_of::<<T::Hashing as sp_runtime::traits::Hash>::Output>();
-		use body::CountedInstruction::{Counter, Regular};
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
@@ -990,7 +991,7 @@ benchmarks! {
 					value: key_bytes,
 				},
 			],
-			call_body: Some(body::counted(r * API_BENCHMARK_BATCH_SIZE, vec![
+			call_body: Some(body::repeated_dyn(r * API_BENCHMARK_BATCH_SIZE, vec![
 				Counter(0, key_len as u32),
 				Regular(Instruction::Call(0)),
 			])),
@@ -1019,7 +1020,6 @@ benchmarks! {
 		let key_len = sp_std::mem::size_of::<<T::Hashing as sp_runtime::traits::Hash>::Output>();
 		let key_bytes = keys.iter().flatten().cloned().collect::<Vec<_>>();
 		let key_bytes_len = key_bytes.len();
-		use body::CountedInstruction::{Counter, Regular};
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
@@ -1033,7 +1033,7 @@ benchmarks! {
 					value: key_bytes,
 				},
 			],
-			call_body: Some(body::counted(r * API_BENCHMARK_BATCH_SIZE, vec![
+			call_body: Some(body::repeated_dyn(r * API_BENCHMARK_BATCH_SIZE, vec![
 				Counter(0, key_len as u32), // key_ptr
 				Regular(Instruction::I32Const((key_bytes_len + 4) as i32)), // out_ptr
 				Regular(Instruction::I32Const(key_bytes_len as i32)), // out_len_ptr
@@ -1111,7 +1111,6 @@ benchmarks! {
 		assert!(value > 0u32.into());
 		let value_bytes = value.encode();
 		let value_len = value_bytes.len();
-		use body::CountedInstruction::{Counter, Regular};
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
@@ -1129,7 +1128,7 @@ benchmarks! {
 					value: account_bytes,
 				},
 			],
-			call_body: Some(body::counted(r * API_BENCHMARK_BATCH_SIZE, vec![
+			call_body: Some(body::repeated_dyn(r * API_BENCHMARK_BATCH_SIZE, vec![
 				Counter(value_len as u32, account_len as u32), // account_ptr
 				Regular(Instruction::I32Const(account_len as i32)), // account_len
 				Regular(Instruction::I32Const(0)), // value_ptr
@@ -1154,7 +1153,7 @@ benchmarks! {
 	// We call unique accounts.
 	seal_call {
 		let r in 0 .. API_BENCHMARK_BATCHES;
-		let dummy_code = WasmModule::<T>::dummy();
+		let dummy_code = WasmModule::<T>::dummy_with_mem();
 		let callees = (0..r * API_BENCHMARK_BATCH_SIZE)
 			.map(|i| Contract::with_index(i + 1, dummy_code.clone(), vec![], Endow::Max))
 			.collect::<Result<Vec<_>, _>>()?;
@@ -1163,7 +1162,6 @@ benchmarks! {
 		let value: BalanceOf<T> = 0u32.into();
 		let value_bytes = value.encode();
 		let value_len = value_bytes.len();
-		use body::CountedInstruction::{Counter, Regular};
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
@@ -1191,7 +1189,7 @@ benchmarks! {
 					value: callee_bytes,
 				},
 			],
-			call_body: Some(body::counted(r * API_BENCHMARK_BATCH_SIZE, vec![
+			call_body: Some(body::repeated_dyn(r * API_BENCHMARK_BATCH_SIZE, vec![
 				Counter(value_len as u32, callee_len as u32), // callee_ptr
 				Regular(Instruction::I32Const(callee_len as i32)), // callee_len
 				Regular(Instruction::I64Const(0)), // gas
@@ -1243,7 +1241,6 @@ benchmarks! {
 		let value: BalanceOf<T> = t.into();
 		let value_bytes = value.encode();
 		let value_len = value_bytes.len();
-		use body::CountedInstruction::{Counter, Regular};
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
@@ -1275,7 +1272,7 @@ benchmarks! {
 					value: (o * 1024).to_le_bytes().into(),
 				},
 			],
-			call_body: Some(body::counted(API_BENCHMARK_BATCH_SIZE, vec![
+			call_body: Some(body::repeated_dyn(API_BENCHMARK_BATCH_SIZE, vec![
 				Counter(value_len as u32, callee_len as u32), // callee_ptr
 				Regular(Instruction::I32Const(callee_len as i32)), // callee_len
 				Regular(Instruction::I64Const(0)), // gas
@@ -1300,7 +1297,10 @@ benchmarks! {
 		let hashes = (0..r * API_BENCHMARK_BATCH_SIZE)
 			.map(|i| {
 				let code = WasmModule::<T>::from(ModuleDefinition {
+					memory: Some(ImportedMemory::max::<T>()),
 					call_body: Some(body::plain(vec![
+						// we need to add this in order to make contracts unique
+						// so that they can be deployed from the same sender
 						Instruction::I32Const(i as i32),
 						Instruction::Drop,
 						Instruction::End,
@@ -1326,7 +1326,6 @@ benchmarks! {
 		let addr_len_offset = hashes_offset + hashes_len;
 		let addr_offset = addr_len_offset + addr_len;
 
-		use body::CountedInstruction::{Counter, Regular};
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
@@ -1360,7 +1359,7 @@ benchmarks! {
 					value: addr_len.to_le_bytes().into(),
 				},
 			],
-			call_body: Some(body::counted(r * API_BENCHMARK_BATCH_SIZE, vec![
+			call_body: Some(body::repeated_dyn(r * API_BENCHMARK_BATCH_SIZE, vec![
 				Counter(hashes_offset as u32, hash_len as u32), // code_hash_ptr
 				Regular(Instruction::I32Const(hash_len as i32)), // code_hash_len
 				Regular(Instruction::I64Const(0)), // gas
@@ -1444,7 +1443,6 @@ benchmarks! {
 		let output_len_offset = addr_len_offset + 4;
 		let output_offset = output_len_offset + 4;
 
-		use body::CountedInstruction::{Counter, Regular};
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
@@ -1486,7 +1484,7 @@ benchmarks! {
 					value: (o * 1024).to_le_bytes().into(),
 				},
 			],
-			call_body: Some(body::counted(API_BENCHMARK_BATCH_SIZE, vec![
+			call_body: Some(body::repeated_dyn(API_BENCHMARK_BATCH_SIZE, vec![
 				Regular(Instruction::I32Const(hash_offset as i32)), // code_hash_ptr
 				Regular(Instruction::I32Const(hash_len as i32)), // code_hash_len
 				Regular(Instruction::I64Const(0)), // gas
@@ -1583,6 +1581,768 @@ benchmarks! {
 		), vec![], Endow::Max)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
+
+	// We make the assumption that pushing a constant and dropping a value takes roughly
+	// the same amount of time. We follow that `t.load` and `drop` both have the weight
+	// of this benchmark / 2. We need to make this assumption because there is no way
+	// to measure them on their own using a valid wasm module. We need their individual
+	// values to derive the weight of individual instructions (by substraction) from
+	// benchmarks that include those for parameter pushing and return type dropping.
+	// We call the weight of `t.load` and `drop`: `w_param`.
+	// The weight that would result from the respective benchmark we call: `w_bench`.
+	//
+	// w_i{32,64}const = w_drop = w_bench / 2
+	instr_i64const {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::from(ModuleDefinition {
+			call_body: Some(body::repeated_dyn(r * INSTR_BENCHMARK_BATCH_SIZE, vec![
+				RandomI64Repeated(1),
+				Regular(Instruction::Drop),
+			])),
+			.. Default::default()
+		}));
+	}: {
+		sbox.invoke();
+	}
+
+	// w_i{32,64}load = w_bench - 2 * w_param
+	instr_i64load {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::from(ModuleDefinition {
+			memory: Some(ImportedMemory::max::<T>()),
+			call_body: Some(body::repeated_dyn(r * INSTR_BENCHMARK_BATCH_SIZE, vec![
+				RandomUnaligned(0, code::max_pages::<T>() * 64 * 1024 - 8),
+				Regular(Instruction::I64Load(3, 0)),
+				Regular(Instruction::Drop),
+			])),
+			.. Default::default()
+		}));
+	}: {
+		sbox.invoke();
+	}
+
+	// w_i{32,64}store{...} = w_bench - 2 * w_param
+	instr_i64store {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::from(ModuleDefinition {
+			memory: Some(ImportedMemory::max::<T>()),
+			call_body: Some(body::repeated_dyn(r * INSTR_BENCHMARK_BATCH_SIZE, vec![
+				RandomUnaligned(0, code::max_pages::<T>() * 64 * 1024 - 8),
+				RandomI64Repeated(1),
+				Regular(Instruction::I64Store(3, 0)),
+			])),
+			.. Default::default()
+		}));
+	}: {
+		sbox.invoke();
+	}
+
+	// w_select = w_bench - 4 * w_param
+	instr_select {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::from(ModuleDefinition {
+			call_body: Some(body::repeated_dyn(r * INSTR_BENCHMARK_BATCH_SIZE, vec![
+				RandomI64Repeated(1),
+				RandomI64Repeated(1),
+				RandomI32(0, 2),
+				Regular(Instruction::Select),
+				Regular(Instruction::Drop),
+			])),
+			.. Default::default()
+		}));
+	}: {
+		sbox.invoke();
+	}
+
+	// w_if = w_bench - 3 * w_param
+	instr_if {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::from(ModuleDefinition {
+			call_body: Some(body::repeated_dyn(r * INSTR_BENCHMARK_BATCH_SIZE, vec![
+				RandomI32(0, 2),
+				Regular(Instruction::If(BlockType::Value(ValueType::I64))),
+				RandomI64Repeated(1),
+				Regular(Instruction::Else),
+				RandomI64Repeated(1),
+				Regular(Instruction::End),
+				Regular(Instruction::Drop),
+			])),
+			.. Default::default()
+		}));
+	}: {
+		sbox.invoke();
+	}
+
+	// w_br = w_bench - 2 * w_param
+	instr_br {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::from(ModuleDefinition {
+			call_body: Some(body::repeated_dyn(r * INSTR_BENCHMARK_BATCH_SIZE, vec![
+				Regular(Instruction::Block(BlockType::NoResult)),
+				Regular(Instruction::Block(BlockType::NoResult)),
+				Regular(Instruction::Block(BlockType::NoResult)),
+				Regular(Instruction::Br(1)),
+				RandomI64Repeated(1),
+				Regular(Instruction::Drop),
+				Regular(Instruction::End),
+				RandomI64Repeated(1),
+				Regular(Instruction::Drop),
+				Regular(Instruction::End),
+				RandomI64Repeated(1),
+				Regular(Instruction::Drop),
+				Regular(Instruction::End),
+			])),
+			.. Default::default()
+		}));
+	}: {
+		sbox.invoke();
+	}
+
+	// w_br_if = w_bench - 5 * w_param
+	// The two additional pushes + drop are only executed 50% of the time.
+	// Making it: 3 * w_param + (50% * 4 * w_param)
+	instr_br_if {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::from(ModuleDefinition {
+			call_body: Some(body::repeated_dyn(r * INSTR_BENCHMARK_BATCH_SIZE, vec![
+				Regular(Instruction::Block(BlockType::NoResult)),
+				Regular(Instruction::Block(BlockType::NoResult)),
+				Regular(Instruction::Block(BlockType::NoResult)),
+				RandomI32(0, 2),
+				Regular(Instruction::BrIf(1)),
+				RandomI64Repeated(1),
+				Regular(Instruction::Drop),
+				Regular(Instruction::End),
+				RandomI64Repeated(1),
+				Regular(Instruction::Drop),
+				Regular(Instruction::End),
+				RandomI64Repeated(1),
+				Regular(Instruction::Drop),
+				Regular(Instruction::End),
+			])),
+			.. Default::default()
+		}));
+	}: {
+		sbox.invoke();
+	}
+
+	// w_br_table = w_bench - 3 * w_param
+	// 1 * w_param + 0.5 * 2 * w_param + 0.25 * 4 * w_param
+	instr_br_table {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let table = Box::new(parity_wasm::elements::BrTableData {
+			table: Box::new([0, 1, 2]),
+			default: 1,
+		});
+		let mut sbox = Sandbox::from(&WasmModule::<T>::from(ModuleDefinition {
+			call_body: Some(body::repeated_dyn(r * INSTR_BENCHMARK_BATCH_SIZE, vec![
+				Regular(Instruction::Block(BlockType::NoResult)),
+				Regular(Instruction::Block(BlockType::NoResult)),
+				Regular(Instruction::Block(BlockType::NoResult)),
+				RandomI32(0, 4),
+				Regular(Instruction::BrTable(table)),
+				RandomI64Repeated(1),
+				Regular(Instruction::Drop),
+				Regular(Instruction::End),
+				RandomI64Repeated(1),
+				Regular(Instruction::Drop),
+				Regular(Instruction::End),
+				RandomI64Repeated(1),
+				Regular(Instruction::Drop),
+				Regular(Instruction::End),
+			])),
+			.. Default::default()
+		}));
+	}: {
+		sbox.invoke();
+	}
+
+	// w_br_table_per_entry = w_bench
+	instr_br_table_per_entry {
+		let e in 1 .. Contracts::<T>::current_schedule().limits.br_table_size;
+		let entry: Vec<u32> = [0, 1].iter()
+			.cloned()
+			.cycle()
+			.take((e / 2) as usize).collect();
+		let table = Box::new(parity_wasm::elements::BrTableData {
+			table: entry.into_boxed_slice(),
+			default: 0,
+		});
+		let mut sbox = Sandbox::from(&WasmModule::<T>::from(ModuleDefinition {
+			call_body: Some(body::repeated_dyn(INSTR_BENCHMARK_BATCH_SIZE, vec![
+				Regular(Instruction::Block(BlockType::NoResult)),
+				Regular(Instruction::Block(BlockType::NoResult)),
+				Regular(Instruction::Block(BlockType::NoResult)),
+				RandomI32(0, (e + 1) as i32), // Make sure the default entry is also used
+				Regular(Instruction::BrTable(table)),
+				RandomI64Repeated(1),
+				Regular(Instruction::Drop),
+				Regular(Instruction::End),
+				RandomI64Repeated(1),
+				Regular(Instruction::Drop),
+				Regular(Instruction::End),
+				RandomI64Repeated(1),
+				Regular(Instruction::Drop),
+				Regular(Instruction::End),
+			])),
+			.. Default::default()
+		}));
+	}: {
+		sbox.invoke();
+	}
+
+	// w_call = w_bench - 2 * w_param
+	instr_call {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::from(ModuleDefinition {
+			// We need to make use of the stack here in order to trigger stack height
+			// instrumentation.
+			aux_body: Some(body::plain(vec![
+				Instruction::I64Const(42),
+				Instruction::Drop,
+				Instruction::End,
+			])),
+			call_body: Some(body::repeated(r * INSTR_BENCHMARK_BATCH_SIZE, &[
+				Instruction::Call(2), // call aux
+			])),
+			inject_stack_metering: true,
+			.. Default::default()
+		}));
+	}: {
+		sbox.invoke();
+	}
+
+	// w_call_indrect = w_bench - 3 * w_param
+	instr_call_indirect {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let num_elements = Contracts::<T>::current_schedule().limits.table_size;
+		use self::code::TableSegment;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::from(ModuleDefinition {
+			// We need to make use of the stack here in order to trigger stack height
+			// instrumentation.
+			aux_body: Some(body::plain(vec![
+				Instruction::I64Const(42),
+				Instruction::Drop,
+				Instruction::End,
+			])),
+			call_body: Some(body::repeated_dyn(r * INSTR_BENCHMARK_BATCH_SIZE, vec![
+				RandomI32(0, num_elements as i32),
+				Regular(Instruction::CallIndirect(0, 0)), // we only have one sig: 0
+			])),
+			inject_stack_metering: true,
+			table: Some(TableSegment {
+				num_elements,
+				function_index: 2, // aux
+			}),
+			.. Default::default()
+		}));
+	}: {
+		sbox.invoke();
+	}
+
+	// w_instr_call_indirect_per_param = w_bench - 1 * w_param
+	// Calling a function indirectly causes it to go through a thunk function whose runtime
+	// linearly depend on the amount of parameters to this function.
+	// Please note that this is not necessary with a direct call.
+	instr_call_indirect_per_param {
+		let p in 0 .. Contracts::<T>::current_schedule().limits.parameters;
+		let num_elements = Contracts::<T>::current_schedule().limits.table_size;
+		use self::code::TableSegment;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::from(ModuleDefinition {
+			// We need to make use of the stack here in order to trigger stack height
+			// instrumentation.
+			aux_body: Some(body::plain(vec![
+				Instruction::I64Const(42),
+				Instruction::Drop,
+				Instruction::End,
+			])),
+			aux_arg_num: p,
+			call_body: Some(body::repeated_dyn(INSTR_BENCHMARK_BATCH_SIZE, vec![
+				RandomI64Repeated(p as usize),
+				RandomI32(0, num_elements as i32),
+				Regular(Instruction::CallIndirect(p.min(1), 0)), // aux signature: 1 or 0
+			])),
+			inject_stack_metering: true,
+			table: Some(TableSegment {
+				num_elements,
+				function_index: 2, // aux
+			}),
+			.. Default::default()
+		}));
+	}: {
+		sbox.invoke();
+	}
+
+	// w_local_get = w_bench - 1 * w_param
+	instr_local_get {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let max_locals = Contracts::<T>::current_schedule().limits.stack_height;
+		let mut call_body = body::repeated_dyn(r * INSTR_BENCHMARK_BATCH_SIZE, vec![
+			RandomGetLocal(0, max_locals),
+			Regular(Instruction::Drop),
+		]);
+		body::inject_locals(&mut call_body, max_locals);
+		let mut sbox = Sandbox::from(&WasmModule::<T>::from(ModuleDefinition {
+			call_body: Some(call_body),
+			.. Default::default()
+		}));
+	}: {
+		sbox.invoke();
+	}
+
+	// w_local_set = w_bench - 1 * w_param
+	instr_local_set {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let max_locals = Contracts::<T>::current_schedule().limits.stack_height;
+		let mut call_body = body::repeated_dyn(r * INSTR_BENCHMARK_BATCH_SIZE, vec![
+			RandomI64Repeated(1),
+			RandomSetLocal(0, max_locals),
+		]);
+		body::inject_locals(&mut call_body, max_locals);
+		let mut sbox = Sandbox::from(&WasmModule::<T>::from(ModuleDefinition {
+			call_body: Some(call_body),
+			.. Default::default()
+		}));
+	}: {
+		sbox.invoke();
+	}
+
+	// w_local_tee = w_bench - 2 * w_param
+	instr_local_tee {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let max_locals = Contracts::<T>::current_schedule().limits.stack_height;
+		let mut call_body = body::repeated_dyn(r * INSTR_BENCHMARK_BATCH_SIZE, vec![
+			RandomI64Repeated(1),
+			RandomTeeLocal(0, max_locals),
+			Regular(Instruction::Drop),
+		]);
+		body::inject_locals(&mut call_body, max_locals);
+		let mut sbox = Sandbox::from(&WasmModule::<T>::from(ModuleDefinition {
+			call_body: Some(call_body),
+			.. Default::default()
+		}));
+	}: {
+		sbox.invoke();
+	}
+
+	// w_global_get = w_bench - 1 * w_param
+	instr_global_get {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let max_globals = Contracts::<T>::current_schedule().limits.globals;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::from(ModuleDefinition {
+			call_body: Some(body::repeated_dyn(r * INSTR_BENCHMARK_BATCH_SIZE, vec![
+				RandomGetGlobal(0, max_globals),
+				Regular(Instruction::Drop),
+			])),
+			num_globals: max_globals,
+			.. Default::default()
+		}));
+	}: {
+		sbox.invoke();
+	}
+
+	// w_global_set = w_bench - 1 * w_param
+	instr_global_set {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let max_globals = Contracts::<T>::current_schedule().limits.globals;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::from(ModuleDefinition {
+			call_body: Some(body::repeated_dyn(r * INSTR_BENCHMARK_BATCH_SIZE, vec![
+				RandomI64Repeated(1),
+				RandomSetGlobal(0, max_globals),
+			])),
+			num_globals: max_globals,
+			.. Default::default()
+		}));
+	}: {
+		sbox.invoke();
+	}
+
+	// w_memory_get = w_bench - 1 * w_param
+	instr_memory_current {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::from(ModuleDefinition {
+			memory: Some(ImportedMemory::max::<T>()),
+			call_body: Some(body::repeated(r * INSTR_BENCHMARK_BATCH_SIZE, &[
+				Instruction::CurrentMemory(0),
+				Instruction::Drop
+			])),
+			.. Default::default()
+		}));
+	}: {
+		sbox.invoke();
+	}
+
+	// w_memory_grow = w_bench - 2 * w_param
+	// We can only allow allocate as much memory as it is allowed in a a contract.
+	// Therefore the repeat count is limited by the maximum memory any contract can have.
+	// Using a contract with more memory will skew the benchmark because the runtime of grow
+	// depends on how much memory is already allocated.
+	instr_memory_grow {
+		let r in 0 .. 1;
+		let max_pages = ImportedMemory::max::<T>().max_pages;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::from(ModuleDefinition {
+			memory: Some(ImportedMemory {
+				min_pages: 0,
+				max_pages,
+			}),
+			call_body: Some(body::repeated(r * max_pages, &[
+				Instruction::I32Const(1),
+				Instruction::GrowMemory(0),
+				Instruction::Drop,
+			])),
+			.. Default::default()
+		}));
+	}: {
+		sbox.invoke();
+	}
+
+	// Unary numeric instructions.
+	// All use w = w_bench - 2 * w_param.
+
+	instr_i64clz {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::unary_instr(
+			Instruction::I64Clz,
+			r * INSTR_BENCHMARK_BATCH_SIZE,
+		));
+	}: {
+		sbox.invoke();
+	}
+
+	instr_i64ctz {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::unary_instr(
+			Instruction::I64Ctz,
+			r * INSTR_BENCHMARK_BATCH_SIZE,
+		));
+	}: {
+		sbox.invoke();
+	}
+
+	instr_i64popcnt {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::unary_instr(
+			Instruction::I64Popcnt,
+			r * INSTR_BENCHMARK_BATCH_SIZE,
+		));
+	}: {
+		sbox.invoke();
+	}
+
+	instr_i64eqz {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::unary_instr(
+			Instruction::I64Eqz,
+			r * INSTR_BENCHMARK_BATCH_SIZE,
+		));
+	}: {
+		sbox.invoke();
+	}
+
+	instr_i64extendsi32 {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::from(ModuleDefinition {
+			call_body: Some(body::repeated_dyn(r * INSTR_BENCHMARK_BATCH_SIZE, vec![
+				RandomI32Repeated(1),
+				Regular(Instruction::I64ExtendSI32),
+				Regular(Instruction::Drop),
+			])),
+			.. Default::default()
+		}));
+	}: {
+		sbox.invoke();
+	}
+
+	instr_i64extendui32 {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::from(ModuleDefinition {
+			call_body: Some(body::repeated_dyn(r * INSTR_BENCHMARK_BATCH_SIZE, vec![
+				RandomI32Repeated(1),
+				Regular(Instruction::I64ExtendUI32),
+				Regular(Instruction::Drop),
+			])),
+			.. Default::default()
+		}));
+	}: {
+		sbox.invoke();
+	}
+
+	instr_i32wrapi64 {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::unary_instr(
+			Instruction::I32WrapI64,
+			r * INSTR_BENCHMARK_BATCH_SIZE,
+		));
+	}: {
+		sbox.invoke();
+	}
+
+	// Binary numeric instructions.
+	// All use w = w_bench - 3 * w_param.
+
+	instr_i64eq {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::binary_instr(
+			Instruction::I64Eq,
+			r * INSTR_BENCHMARK_BATCH_SIZE,
+		));
+	}: {
+		sbox.invoke();
+	}
+
+	instr_i64ne {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::binary_instr(
+			Instruction::I64Ne,
+			r * INSTR_BENCHMARK_BATCH_SIZE,
+		));
+	}: {
+		sbox.invoke();
+	}
+
+	instr_i64lts {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::binary_instr(
+			Instruction::I64LtS,
+			r * INSTR_BENCHMARK_BATCH_SIZE,
+		));
+	}: {
+		sbox.invoke();
+	}
+
+	instr_i64ltu {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::binary_instr(
+			Instruction::I64LtU,
+			r * INSTR_BENCHMARK_BATCH_SIZE,
+		));
+	}: {
+		sbox.invoke();
+	}
+
+	instr_i64gts {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::binary_instr(
+			Instruction::I64GtS,
+			r * INSTR_BENCHMARK_BATCH_SIZE,
+		));
+	}: {
+		sbox.invoke();
+	}
+
+	instr_i64gtu {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::binary_instr(
+			Instruction::I64GtU,
+			r * INSTR_BENCHMARK_BATCH_SIZE,
+		));
+	}: {
+		sbox.invoke();
+	}
+
+	instr_i64les {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::binary_instr(
+			Instruction::I64LeS,
+			r * INSTR_BENCHMARK_BATCH_SIZE,
+		));
+	}: {
+		sbox.invoke();
+	}
+
+	instr_i64leu {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::binary_instr(
+			Instruction::I64LeU,
+			r * INSTR_BENCHMARK_BATCH_SIZE,
+		));
+	}: {
+		sbox.invoke();
+	}
+
+	instr_i64ges {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::binary_instr(
+			Instruction::I64GeS,
+			r * INSTR_BENCHMARK_BATCH_SIZE,
+		));
+	}: {
+		sbox.invoke();
+	}
+
+	instr_i64geu {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::binary_instr(
+			Instruction::I64GeU,
+			r * INSTR_BENCHMARK_BATCH_SIZE,
+		));
+	}: {
+		sbox.invoke();
+	}
+
+	instr_i64add {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::binary_instr(
+			Instruction::I64Add,
+			r * INSTR_BENCHMARK_BATCH_SIZE,
+		));
+	}: {
+		sbox.invoke();
+	}
+
+	instr_i64sub {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::binary_instr(
+			Instruction::I64Sub,
+			r * INSTR_BENCHMARK_BATCH_SIZE,
+		));
+	}: {
+		sbox.invoke();
+	}
+
+	instr_i64mul {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::binary_instr(
+			Instruction::I64Mul,
+			r * INSTR_BENCHMARK_BATCH_SIZE,
+		));
+	}: {
+		sbox.invoke();
+	}
+
+	instr_i64divs {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::binary_instr(
+			Instruction::I64DivS,
+			r * INSTR_BENCHMARK_BATCH_SIZE,
+		));
+	}: {
+		sbox.invoke();
+	}
+
+	instr_i64divu {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::binary_instr(
+			Instruction::I64DivU,
+			r * INSTR_BENCHMARK_BATCH_SIZE,
+		));
+	}: {
+		sbox.invoke();
+	}
+
+	instr_i64rems {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::binary_instr(
+			Instruction::I64RemS,
+			r * INSTR_BENCHMARK_BATCH_SIZE,
+		));
+	}: {
+		sbox.invoke();
+	}
+
+	instr_i64remu {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::binary_instr(
+			Instruction::I64RemU,
+			r * INSTR_BENCHMARK_BATCH_SIZE,
+		));
+	}: {
+		sbox.invoke();
+	}
+
+	instr_i64and {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::binary_instr(
+			Instruction::I64And,
+			r * INSTR_BENCHMARK_BATCH_SIZE,
+		));
+	}: {
+		sbox.invoke();
+	}
+
+	instr_i64or {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::binary_instr(
+			Instruction::I64Or,
+			r * INSTR_BENCHMARK_BATCH_SIZE,
+		));
+	}: {
+		sbox.invoke();
+	}
+
+	instr_i64xor {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::binary_instr(
+			Instruction::I64Xor,
+			r * INSTR_BENCHMARK_BATCH_SIZE,
+		));
+	}: {
+		sbox.invoke();
+	}
+
+	instr_i64shl {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::binary_instr(
+			Instruction::I64Shl,
+			r * INSTR_BENCHMARK_BATCH_SIZE,
+		));
+	}: {
+		sbox.invoke();
+	}
+
+	instr_i64shrs {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::binary_instr(
+			Instruction::I64ShrS,
+			r * INSTR_BENCHMARK_BATCH_SIZE,
+		));
+	}: {
+		sbox.invoke();
+	}
+
+	instr_i64shru {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::binary_instr(
+			Instruction::I64ShrU,
+			r * INSTR_BENCHMARK_BATCH_SIZE,
+		));
+	}: {
+		sbox.invoke();
+	}
+
+	instr_i64rotl {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::binary_instr(
+			Instruction::I64Rotl,
+			r * INSTR_BENCHMARK_BATCH_SIZE,
+		));
+	}: {
+		sbox.invoke();
+	}
+
+	instr_i64rotr {
+		let r in 0 .. INSTR_BENCHMARK_BATCHES;
+		let mut sbox = Sandbox::from(&WasmModule::<T>::binary_instr(
+			Instruction::I64Rotr,
+			r * INSTR_BENCHMARK_BATCH_SIZE,
+		));
+	}: {
+		sbox.invoke();
+	}
+
+	// This is no benchmark. It merely exist to have an easy way to pretty print the curently
+	// configured `Schedule` during benchmark development.
+	// It can be outputed using the following command:
+	// cargo run --manifest-path=bin/node/cli/Cargo.toml --release \
+	//     --features runtime-benchmarks -- benchmark --dev --execution=native \
+	//     -p pallet_contracts -e print_schedule --no-median-slopes --no-min-squares
+	#[extra]
+	print_schedule {
+		#[cfg(feature = "std")]
+		println!("{:#?}", Schedule::<T>::default());
+		#[cfg(not(feature = "std"))]
+		return Err("Run this bench with a native runtime in order to see the schedule.");
+	}: {}
 }
 
 #[cfg(test)]
@@ -1610,6 +2370,7 @@ mod tests {
 	create_test!(instantiate);
 	create_test!(call);
 	create_test!(claim_surcharge);
+
 	create_test!(seal_caller);
 	create_test!(seal_address);
 	create_test!(seal_gas_left);
@@ -1649,4 +2410,56 @@ mod tests {
 	create_test!(seal_hash_blake2_256_per_kb);
 	create_test!(seal_hash_blake2_128);
 	create_test!(seal_hash_blake2_128_per_kb);
+
+	create_test!(instr_i64const);
+	create_test!(instr_i64load);
+	create_test!(instr_i64store);
+	create_test!(instr_select);
+	create_test!(instr_if);
+	create_test!(instr_br);
+	create_test!(instr_br_if);
+	create_test!(instr_br_table);
+	create_test!(instr_br_table_per_entry);
+	create_test!(instr_call);
+	create_test!(instr_call_indirect);
+	create_test!(instr_call_indirect_per_param);
+	create_test!(instr_local_get);
+	create_test!(instr_local_set);
+	create_test!(instr_local_tee);
+	create_test!(instr_global_get);
+	create_test!(instr_global_set);
+	create_test!(instr_memory_current);
+	create_test!(instr_memory_grow);
+	create_test!(instr_i64clz);
+	create_test!(instr_i64ctz);
+	create_test!(instr_i64popcnt);
+	create_test!(instr_i64eqz);
+	create_test!(instr_i64extendsi32);
+	create_test!(instr_i64extendui32);
+	create_test!(instr_i32wrapi64);
+	create_test!(instr_i64eq);
+	create_test!(instr_i64ne);
+	create_test!(instr_i64lts);
+	create_test!(instr_i64ltu);
+	create_test!(instr_i64gts);
+	create_test!(instr_i64gtu);
+	create_test!(instr_i64les);
+	create_test!(instr_i64leu);
+	create_test!(instr_i64ges);
+	create_test!(instr_i64geu);
+	create_test!(instr_i64add);
+	create_test!(instr_i64sub);
+	create_test!(instr_i64mul);
+	create_test!(instr_i64divs);
+	create_test!(instr_i64divu);
+	create_test!(instr_i64rems);
+	create_test!(instr_i64remu);
+	create_test!(instr_i64and);
+	create_test!(instr_i64or);
+	create_test!(instr_i64xor);
+	create_test!(instr_i64shl);
+	create_test!(instr_i64shrs);
+	create_test!(instr_i64shru);
+	create_test!(instr_i64rotl);
+	create_test!(instr_i64rotr);
 }
diff --git a/frame/contracts/src/benchmarking/sandbox.rs b/frame/contracts/src/benchmarking/sandbox.rs
new file mode 100644
index 000000000000..1d93db19ee59
--- /dev/null
+++ b/frame/contracts/src/benchmarking/sandbox.rs
@@ -0,0 +1,52 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+///! For instruction benchmarking we do no instantiate a full contract but merely the
+///! sandbox to execute the wasm code. This is because we do not need the full
+///! environment that provides the seal interface as imported functions.
+
+use super::code::WasmModule;
+use super::Trait;
+use sp_sandbox::{EnvironmentDefinitionBuilder, Instance, Memory};
+
+/// Minimal execution environment without any exported functions.
+pub struct Sandbox {
+	instance: Instance<()>,
+	_memory: Option<Memory>,
+}
+
+impl Sandbox {
+	/// Invoke the `call` function of a contract code and panic on any execution error.
+	pub fn invoke(&mut self) {
+		self.instance.invoke("call", &[], &mut ()).unwrap();
+	}
+}
+
+impl<T: Trait> From<&WasmModule<T>> for Sandbox {
+	/// Creates an instance from the supplied module and supplies as much memory
+	/// to the instance as the module declares as imported.
+	fn from(module: &WasmModule<T>) -> Self {
+		let mut env_builder = EnvironmentDefinitionBuilder::new();
+		let memory = module.add_memory(&mut env_builder);
+		let instance = Instance::new(&module.code, &env_builder, &mut ())
+			.expect("Failed to create benchmarking Sandbox instance");
+		Self {
+			instance,
+			_memory: memory,
+		}
+	}
+}
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index 9f1656f35f6e..f43bfd0ebdb6 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -88,18 +88,18 @@ mod wasm;
 mod rent;
 mod benchmarking;
 mod schedule;
-mod weight_info;
+pub mod weights;
 
 #[cfg(test)]
 mod tests;
 
 use crate::exec::ExecutionContext;
 use crate::wasm::{WasmLoader, WasmVm};
+use crate::weights::WeightInfo;
 
 pub use crate::gas::{Gas, GasMeter};
 pub use crate::wasm::ReturnCode as RuntimeReturnCode;
-pub use crate::weight_info::WeightInfo;
-pub use crate::schedule::{Schedule, HostFnWeights, InstructionWeights};
+pub use crate::schedule::{Schedule, HostFnWeights, InstructionWeights, Limits};
 
 use sp_core::crypto::UncheckedFrom;
 use sp_std::{prelude::*, marker::PhantomData, fmt::Debug};
@@ -530,7 +530,7 @@ decl_module! {
 		) -> DispatchResult {
 			ensure_signed(origin)?;
 			let schedule = <Module<T>>::current_schedule();
-			ensure!(code.len() as u32 <= schedule.max_code_size, Error::<T>::CodeTooLarge);
+			ensure!(code.len() as u32 <= schedule.limits.code_size, Error::<T>::CodeTooLarge);
 			let result = wasm::save_code::<T>(code, &schedule);
 			if let Ok(code_hash) = result {
 				Self::deposit_event(RawEvent::CodeStored(code_hash));
diff --git a/frame/contracts/src/schedule.rs b/frame/contracts/src/schedule.rs
index fb38b1b895d1..24f8bb0a02c3 100644
--- a/frame/contracts/src/schedule.rs
+++ b/frame/contracts/src/schedule.rs
@@ -17,77 +17,180 @@
 //! This module contains the cost schedule and supporting code that constructs a
 //! sane default schedule from a `WeightInfo` implementation.
 
-use crate::{Trait, WeightInfo};
+use crate::{Trait, weights::WeightInfo};
 
 #[cfg(feature = "std")]
 use serde::{Serialize, Deserialize};
+use pallet_contracts_proc_macro::{ScheduleDebug, WeightDebug};
 use frame_support::weights::Weight;
-use sp_std::{marker::PhantomData, fmt};
+use sp_std::{marker::PhantomData, vec::Vec};
 use codec::{Encode, Decode};
+use parity_wasm::elements;
+use pwasm_utils::rules;
+use sp_runtime::RuntimeDebug;
 
 /// How many API calls are executed in a single batch. The reason for increasing the amount
 /// of API calls in batches (per benchmark component increase) is so that the linear regression
 /// has an easier time determining the contribution of that component.
 pub const API_BENCHMARK_BATCH_SIZE: u32 = 100;
 
+/// How many instructions are executed in a single batch. The reasoning is the same
+/// as for `API_BENCHMARK_BATCH_SIZE`.
+pub const INSTR_BENCHMARK_BATCH_SIZE: u32 = 1_000;
+
 /// Definition of the cost schedule and other parameterizations for wasm vm.
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-#[derive(Clone, Encode, Decode, PartialEq, Eq)]
+#[cfg_attr(feature = "std", serde(bound(serialize = "", deserialize = "")))]
+#[derive(Clone, Encode, Decode, PartialEq, Eq, ScheduleDebug)]
 pub struct Schedule<T: Trait> {
 	/// Version of the schedule.
 	pub version: u32,
 
-	/// The weights for individual wasm instructions.
-	pub instruction_weights: InstructionWeights,
-
-	/// The weights for each imported function a contract is allowed to call.
-	pub host_fn_weights: HostFnWeights,
-
 	/// Whether the `seal_println` function is allowed to be used contracts.
 	/// MUST only be enabled for `dev` chains, NOT for production chains
 	pub enable_println: bool,
 
+	/// Describes the upper limits on various metrics.
+	pub limits: Limits,
+
+	/// The weights for individual wasm instructions.
+	pub instruction_weights: InstructionWeights<T>,
+
+	/// The weights for each imported function a contract is allowed to call.
+	pub host_fn_weights: HostFnWeights<T>,
+}
+
+/// Describes the upper limits on various metrics.
+#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Clone, Encode, Decode, PartialEq, Eq, RuntimeDebug)]
+pub struct Limits {
 	/// The maximum number of topics supported by an event.
-	pub max_event_topics: u32,
+	pub event_topics: u32,
 
-	/// Maximum allowed stack height.
+	/// Maximum allowed stack height in number of elements.
 	///
 	/// See https://wiki.parity.io/WebAssembly-StackHeight to find out
-	/// how the stack frame cost is calculated.
-	pub max_stack_height: u32,
+	/// how the stack frame cost is calculated. Each element can be of one of the
+	/// wasm value types. This means the maximum size per element is 64bit.
+	pub stack_height: u32,
+
+	/// Maximum number of globals a module is allowed to declare.
+	///
+	/// Globals are not limited through the `stack_height` as locals are. Neither does
+	/// the linear memory limit `memory_pages` applies to them.
+	pub globals: u32,
+
+	/// Maximum numbers of parameters a function can have.
+	///
+	/// Those need to be limited to prevent a potentially exploitable interaction with
+	/// the stack height instrumentation: The costs of executing the stack height
+	/// instrumentation for an indirectly called function scales linearly with the amount
+	/// of parameters of this function. Because the stack height instrumentation itself is
+	/// is not weight metered its costs must be static (via this limit) and included in
+	/// the costs of the instructions that cause them (call, call_indirect).
+	pub parameters: u32,
 
 	/// Maximum number of memory pages allowed for a contract.
-	pub max_memory_pages: u32,
+	pub memory_pages: u32,
+
+	/// Maximum number of elements allowed in a table.
+	///
+	/// Currently, the only type of element that is allowed in a table is funcref.
+	pub table_size: u32,
 
-	/// Maximum allowed size of a declared table.
-	pub max_table_size: u32,
+	/// Maximum number of elements that can appear as immediate value to the br_table instruction.
+	pub br_table_size: u32,
 
-	/// The maximum length of a subject used for PRNG generation.
-	pub max_subject_len: u32,
+	/// The maximum length of a subject in bytes used for PRNG generation.
+	pub subject_len: u32,
 
 	/// The maximum length of a contract code in bytes. This limit applies to the uninstrumented
 	/// and pristine form of the code as supplied to `put_code`.
-	pub max_code_size: u32,
-
-	/// The type parameter is used in the default implementation.
-	pub _phantom: PhantomData<T>,
+	pub code_size: u32,
 }
 
 /// Describes the weight for all categories of supported wasm instructions.
+///
+/// There there is one field for each wasm instruction that describes the weight to
+/// execute one instruction of that name. There are a few execptions:
+///
+/// 1. If there is a i64 and a i32 variant of an instruction we use the weight
+///    of the former for both.
+/// 2. The following instructions are free of charge because they merely structure the
+///    wasm module and cannot be spammed without making the module invalid (and rejected):
+///    End, Unreachable, Return, Else
+/// 3. The following instructions cannot be benchmarked because they are removed by any
+///    real world execution engine as a preprocessing step and therefore don't yield a
+///    meaningful benchmark result. However, in contrast to the instructions mentioned
+///    in 2. they can be spammed. We price them with the same weight as the "default"
+///    instruction (i64.const): Block, Loop, Nop
+/// 4. We price both i64.const and drop as InstructionWeights.i64const / 2. The reason
+///    for that is that we cannot benchmark either of them on its own but we need their
+///    individual values to derive (by subtraction) the weight of all other instructions
+///    that use them as supporting instructions. Supporting means mainly pushing arguments
+///    and dropping return values in order to maintain a valid module.
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-#[derive(Clone, Encode, Decode, PartialEq, Eq)]
-pub struct InstructionWeights {
-	/// Weight of a growing memory by single page.
-	pub grow_mem: Weight,
-
-	/// Weight of a regular operation.
-	pub regular: Weight,
+#[derive(Clone, Encode, Decode, PartialEq, Eq, WeightDebug)]
+pub struct InstructionWeights<T: Trait> {
+	pub i64const: u32,
+	pub i64load: u32,
+	pub i64store: u32,
+	pub select: u32,
+	pub r#if: u32,
+	pub br: u32,
+	pub br_if: u32,
+	pub br_table: u32,
+	pub br_table_per_entry: u32,
+	pub call: u32,
+	pub call_indirect: u32,
+	pub call_indirect_per_param: u32,
+	pub local_get: u32,
+	pub local_set: u32,
+	pub local_tee: u32,
+	pub global_get: u32,
+	pub global_set: u32,
+	pub memory_current: u32,
+	pub memory_grow: u32,
+	pub i64clz: u32,
+	pub i64ctz: u32,
+	pub i64popcnt: u32,
+	pub i64eqz: u32,
+	pub i64extendsi32: u32,
+	pub i64extendui32: u32,
+	pub i32wrapi64: u32,
+	pub i64eq: u32,
+	pub i64ne: u32,
+	pub i64lts: u32,
+	pub i64ltu: u32,
+	pub i64gts: u32,
+	pub i64gtu: u32,
+	pub i64les: u32,
+	pub i64leu: u32,
+	pub i64ges: u32,
+	pub i64geu: u32,
+	pub i64add: u32,
+	pub i64sub: u32,
+	pub i64mul: u32,
+	pub i64divs: u32,
+	pub i64divu: u32,
+	pub i64rems: u32,
+	pub i64remu: u32,
+	pub i64and: u32,
+	pub i64or: u32,
+	pub i64xor: u32,
+	pub i64shl: u32,
+	pub i64shrs: u32,
+	pub i64shru: u32,
+	pub i64rotl: u32,
+	pub i64rotr: u32,
+	/// The type parameter is used in the default implementation.
+	pub _phantom: PhantomData<T>,
 }
 
 /// Describes the weight for each imported function that a contract is allowed to call.
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-#[derive(Clone, Encode, Decode, PartialEq, Eq)]
-pub struct HostFnWeights {
+#[derive(Clone, Encode, Decode, PartialEq, Eq, WeightDebug)]
+pub struct HostFnWeights<T: Trait> {
 	/// Weight of calling `seal_caller`.
 	pub caller: Weight,
 
@@ -222,21 +325,11 @@ pub struct HostFnWeights {
 
 	/// Weight per byte hashed by `seal_hash_blake2_128`.
 	pub hash_blake2_128_per_byte: Weight,
-}
 
-/// We need to implement Debug manually because the automatic derive enforces T
-/// to also implement Debug.
-impl<T: Trait> fmt::Debug for Schedule<T> {
-	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-		f.debug_struct("Schedule").finish()
-	}
+	/// The type parameter is used in the default implementation.
+	pub _phantom: PhantomData<T>
 }
 
-/// 500 (2 instructions per nano second on 2GHZ) * 1000x slowdown through wasmi
-/// This is a wild guess and should be viewed as a rough estimation.
-/// Proper benchmarks are needed before this value and its derivatives can be used in production.
-const WASM_INSTRUCTION_COST: Weight = 500_000;
-
 macro_rules! replace_token {
 	($_in:tt $replacement:tt) => { $replacement };
 }
@@ -259,6 +352,25 @@ macro_rules! cost_batched_args {
 	}
 }
 
+macro_rules! cost_instr_no_params_with_batch_size {
+	($name:ident, $batch_size:expr) => {
+		(cost_args!($name, 1) / Weight::from($batch_size)) as u32
+	}
+}
+
+macro_rules! cost_instr_with_batch_size {
+	($name:ident, $num_params:expr, $batch_size:expr) => {
+		cost_instr_no_params_with_batch_size!($name, $batch_size)
+			.saturating_sub((cost_instr_no_params_with_batch_size!(instr_i64const, $batch_size) / 2).saturating_mul($num_params))
+	}
+}
+
+macro_rules! cost_instr {
+	($name:ident, $num_params:expr) => {
+		cost_instr_with_batch_size!($name, $num_params, INSTR_BENCHMARK_BATCH_SIZE)
+	}
+}
+
 macro_rules! cost_byte_args {
 	($name:ident, $( $arg: expr ),+) => {
 		cost_args!($name, $( $arg ),+) / 1024
@@ -297,12 +409,97 @@ macro_rules! cost_byte_batched {
 
 impl<T: Trait> Default for Schedule<T> {
 	fn default() -> Self {
-		let instruction_weights = InstructionWeights {
-			grow_mem: WASM_INSTRUCTION_COST,
-			regular: WASM_INSTRUCTION_COST,
-		};
+		Self {
+			version: 0,
+			enable_println: false,
+			limits: Default::default(),
+			instruction_weights: Default::default(),
+			host_fn_weights: Default::default(),
+		}
+	}
+}
+
+impl Default for Limits {
+	fn default() -> Self {
+		Self {
+			event_topics: 4,
+			// 512 * sizeof(i64) will give us a 4k stack.
+			stack_height: 512,
+			globals: 256,
+			parameters: 128,
+			memory_pages: 16,
+			// 4k function pointers (This is in count not bytes).
+			table_size: 4096,
+			br_table_size: 256,
+			subject_len: 32,
+			code_size: 512 * 1024,
+		}
+	}
+}
 
-		let host_fn_weights = HostFnWeights {
+impl<T: Trait> Default for InstructionWeights<T> {
+	fn default() -> Self {
+		let max_pages = Limits::default().memory_pages;
+		Self {
+			i64const: cost_instr!(instr_i64const, 1),
+			i64load: cost_instr!(instr_i64load, 2),
+			i64store: cost_instr!(instr_i64store, 2),
+			select: cost_instr!(instr_select, 4),
+			r#if: cost_instr!(instr_if, 3),
+			br: cost_instr!(instr_br, 2),
+			br_if: cost_instr!(instr_br_if, 5),
+			br_table: cost_instr!(instr_br_table, 3),
+			br_table_per_entry: cost_instr!(instr_br_table_per_entry, 0),
+			call: cost_instr!(instr_call, 2),
+			call_indirect: cost_instr!(instr_call_indirect, 3),
+			call_indirect_per_param: cost_instr!(instr_call_indirect_per_param, 1),
+			local_get: cost_instr!(instr_local_get, 1),
+			local_set: cost_instr!(instr_local_set, 1),
+			local_tee: cost_instr!(instr_local_tee, 2),
+			global_get: cost_instr!(instr_global_get, 1),
+			global_set: cost_instr!(instr_global_set, 1),
+			memory_current: cost_instr!(instr_memory_current, 1),
+			memory_grow: cost_instr_with_batch_size!(instr_memory_grow, 1, max_pages),
+			i64clz: cost_instr!(instr_i64clz, 2),
+			i64ctz: cost_instr!(instr_i64ctz, 2),
+			i64popcnt: cost_instr!(instr_i64popcnt, 2),
+			i64eqz: cost_instr!(instr_i64eqz, 2),
+			i64extendsi32: cost_instr!(instr_i64extendsi32, 2),
+			i64extendui32: cost_instr!(instr_i64extendui32, 2),
+			i32wrapi64: cost_instr!(instr_i32wrapi64, 2),
+			i64eq: cost_instr!(instr_i64eq, 3),
+			i64ne: cost_instr!(instr_i64ne, 3),
+			i64lts: cost_instr!(instr_i64lts, 3),
+			i64ltu: cost_instr!(instr_i64ltu, 3),
+			i64gts: cost_instr!(instr_i64gts, 3),
+			i64gtu: cost_instr!(instr_i64gtu, 3),
+			i64les: cost_instr!(instr_i64les, 3),
+			i64leu: cost_instr!(instr_i64leu, 3),
+			i64ges: cost_instr!(instr_i64ges, 3),
+			i64geu: cost_instr!(instr_i64geu, 3),
+			i64add: cost_instr!(instr_i64add, 3),
+			i64sub: cost_instr!(instr_i64sub, 3),
+			i64mul: cost_instr!(instr_i64mul, 3),
+			i64divs: cost_instr!(instr_i64divs, 3),
+			i64divu: cost_instr!(instr_i64divu, 3),
+			i64rems: cost_instr!(instr_i64rems, 3),
+			i64remu: cost_instr!(instr_i64remu, 3),
+			i64and: cost_instr!(instr_i64and, 3),
+			i64or: cost_instr!(instr_i64or, 3),
+			i64xor: cost_instr!(instr_i64xor, 3),
+			i64shl: cost_instr!(instr_i64shl, 3),
+			i64shrs: cost_instr!(instr_i64shrs, 3),
+			i64shru: cost_instr!(instr_i64shru, 3),
+			i64rotl: cost_instr!(instr_i64rotl, 3),
+			i64rotr: cost_instr!(instr_i64rotr, 3),
+			_phantom: PhantomData,
+		}
+	}
+}
+
+impl<T: Trait> Default for HostFnWeights<T> {
+	fn default() -> Self {
+		Self {
 			caller: cost_batched!(seal_caller),
 			address: cost_batched!(seal_address),
 			gas_left: cost_batched!(seal_gas_left),
@@ -348,20 +545,119 @@ impl<T: Trait> Default for Schedule<T> {
 			hash_blake2_256_per_byte: cost_byte_batched!(seal_hash_blake2_256_per_kb),
 			hash_blake2_128: cost_batched!(seal_hash_blake2_128),
 			hash_blake2_128_per_byte: cost_byte_batched!(seal_hash_blake2_128_per_kb),
-		};
-
-		Self {
-			version: 0,
-			instruction_weights,
-			host_fn_weights,
-			enable_println: false,
-			max_event_topics: 4,
-			max_stack_height: 64 * 1024,
-			max_memory_pages: 16,
-			max_table_size: 16 * 1024,
-			max_subject_len: 32,
-			max_code_size: 512 * 1024,
 			_phantom: PhantomData,
 		}
 	}
 }
+
+struct ScheduleRules<'a, T: Trait> {
+	schedule: &'a Schedule<T>,
+	params: Vec<u32>,
+}
+
+impl<T: Trait> Schedule<T> {
+	pub fn rules(&self, module: &elements::Module) -> impl rules::Rules + '_ {
+		ScheduleRules {
+			schedule: &self,
+			params: module
+				.type_section()
+				.iter()
+				.flat_map(|section| section.types())
+				.map(|func| {
+					let elements::Type::Function(func) = func;
+					func.params().len() as u32
+				})
+				.collect()
+		}
+	}
+}
+
+impl<'a, T: Trait> rules::Rules for ScheduleRules<'a, T> {
+	fn instruction_cost(&self, instruction: &elements::Instruction) -> Option<u32> {
+		use parity_wasm::elements::Instruction::*;
+		let w = &self.schedule.instruction_weights;
+		let max_params = self.schedule.limits.parameters;
+
+		let weight = match *instruction {
+			End | Unreachable | Return | Else => 0,
+			I32Const(_) | I64Const(_) | Block(_) | Loop(_) | Nop | Drop => w.i64const,
+			I32Load(_, _) | I32Load8S(_, _) | I32Load8U(_, _) | I32Load16S(_, _) |
+			I32Load16U(_, _) | I64Load(_, _) | I64Load8S(_, _) | I64Load8U(_, _) |
+			I64Load16S(_, _) | I64Load16U(_, _) | I64Load32S(_, _) | I64Load32U(_, _)
+				=> w.i64load,
+			I32Store(_, _) | I32Store8(_, _) | I32Store16(_, _) | I64Store(_, _) |
+			I64Store8(_, _) | I64Store16(_, _) | I64Store32(_, _) => w.i64store,
+			Select => w.select,
+			If(_) => w.r#if,
+			Br(_) => w.br,
+			BrIf(_) => w.br_if,
+			Call(_) => w.call,
+			GetLocal(_) => w.local_get,
+			SetLocal(_) => w.local_set,
+			TeeLocal(_) => w.local_tee,
+			GetGlobal(_) => w.global_get,
+			SetGlobal(_) => w.global_set,
+			CurrentMemory(_) => w.memory_current,
+			GrowMemory(_) => w.memory_grow,
+			CallIndirect(idx, _) => *self.params.get(idx as usize).unwrap_or(&max_params),
+			BrTable(ref data) =>
+				w.br_table.saturating_add(
+					w.br_table_per_entry.saturating_mul(data.table.len() as u32)
+				),
+			I32Clz | I64Clz => w.i64clz,
+			I32Ctz | I64Ctz => w.i64ctz,
+			I32Popcnt | I64Popcnt => w.i64popcnt,
+			I64ExtendSI32 => w.i64extendsi32,
+			I64ExtendUI32 => w.i64extendui32,
+			I32WrapI64 => w.i32wrapi64,
+			I32Eq | I64Eq => w.i64eq,
+			I32Ne | I64Ne => w.i64ne,
+			I32LtS | I64LtS => w.i64lts,
+			I32LtU | I64LtU => w.i64ltu,
+			I32GtS | I64GtS => w.i64gts,
+			I32GtU | I64GtU => w.i64gtu,
+			I32LeS | I64LeS => w.i64les,
+			I32LeU | I64LeU => w.i64leu,
+			I32GeS | I64GeS => w.i64ges,
+			I32GeU | I64GeU => w.i64geu,
+			I32Add | I64Add => w.i64add,
+			I32Sub | I64Sub => w.i64sub,
+			I32Mul | I64Mul => w.i64mul,
+			I32DivS | I64DivS => w.i64divs,
+			I32DivU | I64DivU => w.i64divu,
+			I32RemS | I64RemS => w.i64rems,
+			I32RemU | I64RemU => w.i64remu,
+			I32And | I64And => w.i64and,
+			I32Or | I64Or => w.i64or,
+			I32Xor | I64Xor => w.i64xor,
+			I32Shl | I64Shl => w.i64shl,
+			I32ShrS | I64ShrS => w.i64shrs,
+			I32ShrU | I64ShrU => w.i64shru,
+			I32Rotl | I64Rotl => w.i64rotl,
+			I32Rotr | I64Rotr => w.i64rotr,
+
+			// Returning None makes the gas instrumentation fail which we intend for
+			// unsupported or unknown instructions.
+			_ => return None,
+		};
+		Some(weight)
+	}
+
+	fn memory_grow_cost(&self) -> Option<rules::MemoryGrowCost> {
+		// We benchmarked the memory.grow instruction with the maximum allowed pages.
+		// The cost for growing is therefore already included in the instruction cost.
+		None
+	}
+}
+
+#[cfg(test)]
+mod test {
+	use crate::tests::Test;
+	use super::*;
+
+	#[test]
+	fn print_test_schedule() {
+		let schedule = Schedule::<Test>::default();
+		println!("{:#?}", schedule);
+	}
+}
diff --git a/frame/contracts/src/wasm/mod.rs b/frame/contracts/src/wasm/mod.rs
index 2440abed8ec4..f90f3af688d9 100644
--- a/frame/contracts/src/wasm/mod.rs
+++ b/frame/contracts/src/wasm/mod.rs
@@ -164,6 +164,7 @@ mod tests {
 	use hex_literal::hex;
 	use sp_runtime::DispatchError;
 	use frame_support::weights::Weight;
+	use assert_matches::assert_matches;
 	use pallet_contracts_primitives::{ExecReturnValue, ReturnFlags, ExecError, ErrorOrigin};
 
 	const GAS_LIMIT: Gas = 10_000_000_000;
@@ -645,14 +646,14 @@ mod tests {
 			&mut GasMeter::new(GAS_LIMIT),
 		).unwrap();
 
-		assert_eq!(
-			&mock_ext.instantiates,
-			&[InstantiateEntry {
-				code_hash: [0x11; 32].into(),
+		assert_matches!(
+			&mock_ext.instantiates[..],
+			[InstantiateEntry {
+				code_hash,
 				endowment: 3,
-				data: vec![1, 2, 3, 4],
-				gas_left: 9392302058,
-			}]
+				data,
+				gas_left: _,
+			}] if code_hash == &[0x11; 32].into() && data == &vec![1, 2, 3, 4]
 		);
 	}
 
@@ -1461,7 +1462,7 @@ mod tests {
 			vec![0x00, 0x01, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe5, 0x14, 0x00])
 		]);
 
-		assert_eq!(gas_meter.gas_left(), 9834099446);
+		assert!(gas_meter.gas_left() > 0);
 	}
 
 	const CODE_DEPOSIT_EVENT_MAX_TOPICS: &str = r#"
diff --git a/frame/contracts/src/wasm/prepare.rs b/frame/contracts/src/wasm/prepare.rs
index 171fca6339fd..73c149d025d7 100644
--- a/frame/contracts/src/wasm/prepare.rs
+++ b/frame/contracts/src/wasm/prepare.rs
@@ -24,9 +24,7 @@ use crate::{Schedule, Trait};
 
 use parity_wasm::elements::{self, Internal, External, MemoryType, Type, ValueType};
 use pwasm_utils;
-use pwasm_utils::rules;
 use sp_std::prelude::*;
-use sp_runtime::traits::{SaturatedConversion};
 
 /// Currently, all imported functions must be located inside this module. We might support
 /// additional modules for versioning later.
@@ -101,6 +99,33 @@ impl<'a, T: Trait> ContractModule<'a, T> {
 		Ok(())
 	}
 
+	/// Ensure that any `br_table` instruction adheres to its immediate value limit.
+	fn ensure_br_table_size_limit(&self, limit: u32) -> Result<(), &'static str> {
+		let code_section = if let Some(type_section) = self.module.code_section() {
+			type_section
+		} else {
+			return Ok(());
+		};
+		for instr in code_section.bodies().iter().flat_map(|body| body.code().elements()) {
+			use parity_wasm::elements::Instruction::BrTable;
+			if let BrTable(table) = instr {
+				if table.table.len() > limit as usize {
+					return Err("BrTable's immediate value is too big.")
+				}
+			}
+		}
+		Ok(())
+	}
+
+	fn ensure_global_variable_limit(&self, limit: u32) -> Result<(), &'static str> {
+		if let Some(global_section) = self.module.global_section() {
+			if global_section.entries().len() > limit as usize {
+				return Err("module declares too many globals")
+			}
+		}
+		Ok(())
+	}
+
 	/// Ensures that no floating point types are in use.
 	fn ensure_no_floating_types(&self) -> Result<(), &'static str> {
 		if let Some(global_section) = self.module.global_section() {
@@ -145,15 +170,25 @@ impl<'a, T: Trait> ContractModule<'a, T> {
 		Ok(())
 	}
 
-	fn inject_gas_metering(self) -> Result<Self, &'static str> {
-		let gas_rules =
-			rules::Set::new(
-				self.schedule.instruction_weights.regular.clone().saturated_into(),
-				Default::default(),
-			)
-			.with_grow_cost(self.schedule.instruction_weights.grow_mem.clone().saturated_into())
-			.with_forbidden_floats();
+	/// Ensure that no function exists that has more parameters than allowed.
+	fn ensure_parameter_limit(&self, limit: u32) -> Result<(), &'static str> {
+		let type_section = if let Some(type_section) = self.module.type_section() {
+			type_section
+		} else {
+			return Ok(());
+		};
+
+		for Type::Function(func) in type_section.types() {
+			if func.params().len() > limit as usize {
+				return Err("Use of a function type with too many parameters.");
+			}
+		}
 
+		Ok(())
+	}
+
+	fn inject_gas_metering(self) -> Result<Self, &'static str> {
+		let gas_rules = self.schedule.rules(&self.module);
 		let contract_module = pwasm_utils::inject_gas_counter(
 			self.module,
 			&gas_rules,
@@ -167,7 +202,8 @@ impl<'a, T: Trait> ContractModule<'a, T> {
 
 	fn inject_stack_height_metering(self) -> Result<Self, &'static str> {
 		let contract_module =
-			pwasm_utils::stack_height::inject_limiter(self.module, self.schedule.max_stack_height)
+			pwasm_utils::stack_height
+				::inject_limiter(self.module, self.schedule.limits.stack_height)
 				.map_err(|_| "stack height instrumentation failed")?;
 		Ok(ContractModule {
 			module: contract_module,
@@ -345,7 +381,7 @@ fn get_memory_limits<T: Trait>(module: Option<&MemoryType>, schedule: &Schedule<
 					"Requested initial number of pages should not exceed the requested maximum",
 				);
 			}
-			(_, Some(maximum)) if maximum > schedule.max_memory_pages => {
+			(_, Some(maximum)) if maximum > schedule.limits.memory_pages => {
 				return Err("Maximum number of pages should not exceed the configured maximum.");
 			}
 			(initial, Some(maximum)) => Ok((initial, maximum)),
@@ -381,8 +417,11 @@ pub fn prepare_contract<C: ImportSatisfyCheck, T: Trait>(
 	let mut contract_module = ContractModule::new(original_code, schedule)?;
 	contract_module.scan_exports()?;
 	contract_module.ensure_no_internal_memory()?;
-	contract_module.ensure_table_size_limit(schedule.max_table_size)?;
+	contract_module.ensure_table_size_limit(schedule.limits.table_size)?;
+	contract_module.ensure_global_variable_limit(schedule.limits.globals)?;
 	contract_module.ensure_no_floating_types()?;
+	contract_module.ensure_parameter_limit(schedule.limits.parameters)?;
+	contract_module.ensure_br_table_size_limit(schedule.limits.br_table_size)?;
 
 	// We disallow importing `gas` function here since it is treated as implementation detail.
 	let disallowed_imports = [b"gas".as_ref()];
@@ -442,7 +481,7 @@ pub mod benchmarking {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use crate::exec::Ext;
+	use crate::{exec::Ext, Limits};
 	use std::fmt;
 	use assert_matches::assert_matches;
 
@@ -470,7 +509,17 @@ mod tests {
 			#[test]
 			fn $name() {
 				let wasm = wat::parse_str($wat).unwrap();
-				let schedule = Schedule::default();
+				let schedule = Schedule {
+					limits: Limits {
+						globals: 3,
+						parameters: 3,
+						memory_pages: 16,
+						table_size: 3,
+						br_table_size: 3,
+						.. Default::default()
+					},
+					.. Default::default()
+				};
 				let r = prepare_contract::<TestEnv, crate::tests::Test>(wasm.as_ref(), &schedule);
 				assert_matches!(r, $($expected)*);
 			}
@@ -493,14 +542,66 @@ mod tests {
 		Err("gas instrumentation failed")
 	);
 
-	mod memories {
+	mod functions {
 		use super::*;
 
-		// Tests below assumes that maximum page number is configured to a certain number.
-		#[test]
-		fn assume_memory_size() {
-			assert_eq!(<Schedule<crate::tests::Test>>::default().max_memory_pages, 16);
-		}
+		prepare_test!(param_number_valid,
+			r#"
+			(module
+				(func (export "call"))
+				(func (export "deploy"))
+				(func (param i32 i32 i32))
+			)
+			"#,
+			Ok(_)
+		);
+
+		prepare_test!(param_number_invalid,
+			r#"
+			(module
+				(func (export "call"))
+				(func (export "deploy"))
+				(func (param i32 i32 i32 i32))
+				(func (param i32))
+			)
+			"#,
+			Err("Use of a function type with too many parameters.")
+		);
+	}
+
+	mod globals {
+		use super::*;
+
+		prepare_test!(global_number_valid,
+			r#"
+			(module
+				(global i64 (i64.const 0))
+				(global i64 (i64.const 0))
+				(global i64 (i64.const 0))
+				(func (export "call"))
+				(func (export "deploy"))
+			)
+			"#,
+			Ok(_)
+		);
+
+		prepare_test!(global_number_too_high,
+			r#"
+			(module
+				(global i64 (i64.const 0))
+				(global i64 (i64.const 0))
+				(global i64 (i64.const 0))
+				(global i64 (i64.const 0))
+				(func (export "call"))
+				(func (export "deploy"))
+			)
+			"#,
+			Err("module declares too many globals")
+		);
+	}
+
+	mod memories {
+		use super::*;
 
 		prepare_test!(memory_with_one_page,
 			r#"
@@ -561,6 +662,18 @@ mod tests {
 			Err("Maximum number of pages should be always declared.")
 		);
 
+		prepare_test!(requested_maximum_valid,
+			r#"
+			(module
+				(import "env" "memory" (memory 1 16))
+
+				(func (export "call"))
+				(func (export "deploy"))
+			)
+			"#,
+			Ok(_)
+		);
+
 		prepare_test!(requested_maximum_exceeds_configured_maximum,
 			r#"
 			(module
@@ -625,12 +738,6 @@ mod tests {
 	mod tables {
 		use super::*;
 
-		// Tests below assumes that maximum table size is configured to a certain number.
-		#[test]
-		fn assume_table_size() {
-			assert_eq!(<Schedule<crate::tests::Test>>::default().max_table_size, 16384);
-		}
-
 		prepare_test!(no_tables,
 			r#"
 			(module
@@ -644,7 +751,7 @@ mod tests {
 		prepare_test!(table_valid_size,
 			r#"
 			(module
-				(table 10000 funcref)
+				(table 3 funcref)
 
 				(func (export "call"))
 				(func (export "deploy"))
@@ -656,13 +763,40 @@ mod tests {
 		prepare_test!(table_too_big,
 			r#"
 			(module
-				(table 20000 funcref)
+				(table 4 funcref)
 
 				(func (export "call"))
 				(func (export "deploy"))
 			)"#,
 			Err("table exceeds maximum size allowed")
 		);
+
+		prepare_test!(br_table_valid_size,
+			r#"
+			(module
+				(func (export "call"))
+				(func (export "deploy"))
+				(func
+					i32.const 0
+					br_table 0 0 0 0
+				)
+			)
+			"#,
+			Ok(_)
+		);
+
+		prepare_test!(br_table_too_big,
+			r#"
+			(module
+				(func (export "call"))
+				(func (export "deploy"))
+				(func
+					i32.const 0
+					br_table 0 0 0 0 0
+				)
+			)"#,
+			Err("BrTable's immediate value is too big.")
+		);
 	}
 
 	mod imports {
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index ffc816aa4c82..c7de93ece70f 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -279,7 +279,7 @@ pub enum RuntimeToken {
 }
 
 impl<T: Trait> Token<T> for RuntimeToken {
-	type Metadata = HostFnWeights;
+	type Metadata = HostFnWeights<T>;
 
 	fn calculate_amount(&self, s: &Self::Metadata) -> Gas {
 		use self::RuntimeToken::*;
@@ -340,7 +340,7 @@ impl<T: Trait> Token<T> for RuntimeToken {
 fn charge_gas<E, Tok>(ctx: &mut Runtime<E>, token: Tok) -> Result<(), sp_sandbox::HostError>
 where
 	E: Ext,
-	Tok: Token<E::T, Metadata=HostFnWeights>,
+	Tok: Token<E::T, Metadata=HostFnWeights<E::T>>,
 {
 	match ctx.gas_meter.charge(&ctx.schedule.host_fn_weights, token) {
 		GasMeterResult::Proceed => Ok(()),
@@ -1024,8 +1024,7 @@ define_env!(Env, <E: Ext>,
 	// The data is encoded as T::Hash.
 	seal_random(ctx, subject_ptr: u32, subject_len: u32, out_ptr: u32, out_len_ptr: u32) => {
 		charge_gas(ctx, RuntimeToken::Random)?;
-		// The length of a subject can't exceed `max_subject_len`.
-		if subject_len > ctx.schedule.max_subject_len {
+		if subject_len > ctx.schedule.limits.subject_len {
 			return Err(sp_sandbox::HostError);
 		}
 		let subject_buf = read_sandbox_memory(ctx, subject_ptr, subject_len)?;
@@ -1157,7 +1156,7 @@ define_env!(Env, <E: Ext>,
 	},
 
 	// Deposit a contract event with the data buffer and optional list of topics. There is a limit
-	// on the maximum number of topics specified by `max_event_topics`.
+	// on the maximum number of topics specified by `event_topics`.
 	//
 	// - topics_ptr - a pointer to the buffer of topics encoded as `Vec<T::Hash>`. The value of this
 	//   is ignored if `topics_len` is set to 0. The topics list can't contain duplicates.
@@ -1181,8 +1180,8 @@ define_env!(Env, <E: Ext>,
 			_ => read_sandbox_memory_as(ctx, topics_ptr, topics_len)?,
 		};
 
-		// If there are more than `max_event_topics`, then trap.
-		if topics.len() > ctx.schedule.max_event_topics as usize {
+		// If there are more than `event_topics`, then trap.
+		if topics.len() > ctx.schedule.limits.event_topics as usize {
 			return Err(sp_sandbox::HostError);
 		}
 
diff --git a/frame/contracts/src/weight_info.rs b/frame/contracts/src/weight_info.rs
deleted file mode 100644
index 3a0881ed78d9..000000000000
--- a/frame/contracts/src/weight_info.rs
+++ /dev/null
@@ -1,341 +0,0 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
-// This file is part of Substrate.
-
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
-
-//! This module contains the `WeightInfo` trait and its unsafe implementation on `()`.
-
-use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
-
-/// Should be implemented by automatically generated code of the benchmarking system for
-/// every runtime that makes use of this pallet.
-/// This trait is also implemented on `()`. The implemention on `()` is **unsafe** and must
-/// only be used during development. Proper weights can be generated by running the
-/// pallet_contracts benchmark suite for the runtime in question.
-pub trait WeightInfo {
-	fn update_schedule() -> Weight;
-	fn put_code(n: u32, ) -> Weight;
-	fn instantiate(n: u32, ) -> Weight;
-	fn call() -> Weight;
-	fn claim_surcharge() -> Weight;
-	fn seal_caller(r: u32, ) -> Weight;
-	fn seal_address(r: u32, ) -> Weight;
-	fn seal_gas_left(r: u32, ) -> Weight;
-	fn seal_balance(r: u32, ) -> Weight;
-	fn seal_value_transferred(r: u32, ) -> Weight;
-	fn seal_minimum_balance(r: u32, ) -> Weight;
-	fn seal_tombstone_deposit(r: u32, ) -> Weight;
-	fn seal_rent_allowance(r: u32, ) -> Weight;
-	fn seal_block_number(r: u32, ) -> Weight;
-	fn seal_now(r: u32, ) -> Weight;
-	fn seal_weight_to_fee(r: u32, ) -> Weight;
-	fn seal_gas(r: u32, ) -> Weight;
-	fn seal_input(r: u32, ) -> Weight;
-	fn seal_input_per_kb(n: u32, ) -> Weight;
-	fn seal_return(r: u32, ) -> Weight;
-	fn seal_return_per_kb(n: u32, ) -> Weight;
-	fn seal_terminate(r: u32, ) -> Weight;
-	fn seal_restore_to(r: u32, ) -> Weight;
-	fn seal_restore_to_per_delta(d: u32, ) -> Weight;
-	fn seal_random(r: u32, ) -> Weight;
-	fn seal_deposit_event(r: u32, ) -> Weight;
-	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight;
-	fn seal_set_rent_allowance(r: u32, ) -> Weight;
-	fn seal_set_storage(r: u32, ) -> Weight;
-	fn seal_set_storage_per_kb(n: u32, ) -> Weight;
-	fn seal_clear_storage(r: u32, ) -> Weight;
-	fn seal_get_storage(r: u32, ) -> Weight;
-	fn seal_get_storage_per_kb(n: u32, ) -> Weight;
-	fn seal_transfer(r: u32, ) -> Weight;
-	fn seal_call(r: u32, ) -> Weight;
-	fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight;
-	fn seal_instantiate(r: u32, ) -> Weight;
-	fn seal_instantiate_per_input_output_kb(i: u32, o: u32, ) -> Weight;
-	fn seal_hash_sha2_256(r: u32, ) -> Weight;
-	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight;
-	fn seal_hash_keccak_256(r: u32, ) -> Weight;
-	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight;
-	fn seal_hash_blake2_256(r: u32, ) -> Weight;
-	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight;
-	fn seal_hash_blake2_128(r: u32, ) -> Weight;
-	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight;
-}
-
-/// Unsafe implementation that must only be used for development.
-impl WeightInfo for () {
-	fn update_schedule() -> Weight {
-		(45000000 as Weight)
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn put_code(n: u32, ) -> Weight {
-		(263409000 as Weight)
-			.saturating_add((169269000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(DbWeight::get().reads(1 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn instantiate(n: u32, ) -> Weight {
-		(309311000 as Weight)
-			.saturating_add((1018000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(DbWeight::get().reads(7 as Weight))
-			.saturating_add(DbWeight::get().writes(4 as Weight))
-	}
-	fn call() -> Weight {
-		(291000000 as Weight)
-			.saturating_add(DbWeight::get().reads(6 as Weight))
-			.saturating_add(DbWeight::get().writes(3 as Weight))
-	}
-	fn claim_surcharge() -> Weight {
-		(766000000 as Weight)
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-			.saturating_add(DbWeight::get().writes(3 as Weight))
-	}
-	fn seal_caller(r: u32, ) -> Weight {
-		(182241000 as Weight)
-			.saturating_add((697428000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_address(r: u32, ) -> Weight {
-		(193846000 as Weight)
-			.saturating_add((695989000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_gas_left(r: u32, ) -> Weight {
-		(166031000 as Weight)
-			.saturating_add((702533000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_balance(r: u32, ) -> Weight {
-		(251892000 as Weight)
-			.saturating_add((1392900000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(5 as Weight))
-	}
-	fn seal_value_transferred(r: u32, ) -> Weight {
-		(178472000 as Weight)
-			.saturating_add((694921000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(191301000 as Weight)
-			.saturating_add((697871000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(241315000 as Weight)
-			.saturating_add((686403000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(104958000 as Weight)
-			.saturating_add((1459573000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_block_number(r: u32, ) -> Weight {
-		(174140000 as Weight)
-			.saturating_add((698152000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_now(r: u32, ) -> Weight {
-		(203157000 as Weight)
-			.saturating_add((713595000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(178413000 as Weight)
-			.saturating_add((1071275000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(5 as Weight))
-	}
-	fn seal_gas(r: u32, ) -> Weight {
-		(171395000 as Weight)
-			.saturating_add((371653000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_input(r: u32, ) -> Weight {
-		(184462000 as Weight)
-			.saturating_add((10538000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(194668000 as Weight)
-			.saturating_add((301000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_return(r: u32, ) -> Weight {
-		(175538000 as Weight)
-			.saturating_add((7462000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(189759000 as Weight)
-			.saturating_add((754000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_terminate(r: u32, ) -> Weight {
-		(184385000 as Weight)
-			.saturating_add((542615000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-			.saturating_add(DbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
-			.saturating_add(DbWeight::get().writes((3 as Weight).saturating_mul(r as Weight)))
-	}
-	fn seal_restore_to(r: u32, ) -> Weight {
-		(380385000 as Weight)
-			.saturating_add((160308000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(5 as Weight))
-			.saturating_add(DbWeight::get().reads((3 as Weight).saturating_mul(r as Weight)))
-			.saturating_add(DbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
-	}
-	fn seal_restore_to_per_delta(d: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((4786197000 as Weight).saturating_mul(d as Weight))
-			.saturating_add(DbWeight::get().reads(7 as Weight))
-			.saturating_add(DbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
-			.saturating_add(DbWeight::get().writes(5 as Weight))
-			.saturating_add(DbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
-	}
-	fn seal_random(r: u32, ) -> Weight {
-		(187944000 as Weight)
-			.saturating_add((1592530000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(5 as Weight))
-	}
-	fn seal_deposit_event(r: u32, ) -> Weight {
-		(126517000 as Weight)
-			.saturating_add((2346945000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(2953428000 as Weight)
-			.saturating_add((1117651000 as Weight).saturating_mul(t as Weight))
-			.saturating_add((299890000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-			.saturating_add(DbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
-			.saturating_add(DbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
-	}
-	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(142094000 as Weight)
-			.saturating_add((1726665000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-	}
-	fn seal_set_storage(r: u32, ) -> Weight {
-		(4091409000 as Weight)
-			.saturating_add((26440116000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-			.saturating_add(DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-			.saturating_add(DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
-	}
-	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(3683270000 as Weight)
-			.saturating_add((233826000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(DbWeight::get().reads(5 as Weight))
-			.saturating_add(DbWeight::get().writes(2 as Weight))
-	}
-	fn seal_clear_storage(r: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((7152747000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-			.saturating_add(DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-			.saturating_add(DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
-	}
-	fn seal_get_storage(r: u32, ) -> Weight {
-		(19007000 as Weight)
-			.saturating_add((1774675000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-			.saturating_add(DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
-	}
-	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(1477332000 as Weight)
-			.saturating_add((176601000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(DbWeight::get().reads(5 as Weight))
-	}
-	fn seal_transfer(r: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((10274385000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(5 as Weight))
-			.saturating_add(DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-			.saturating_add(DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
-	}
-	fn seal_call(r: u32, ) -> Weight {
-		(241916000 as Weight)
-			.saturating_add((14633108000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(5 as Weight))
-			.saturating_add(DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
-	}
-	fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight {
-		(15664107000 as Weight)
-			.saturating_add((8529984000 as Weight).saturating_mul(t as Weight))
-			.saturating_add((52860000 as Weight).saturating_mul(i as Weight))
-			.saturating_add((81175000 as Weight).saturating_mul(o as Weight))
-			.saturating_add(DbWeight::get().reads(105 as Weight))
-			.saturating_add(DbWeight::get().reads((101 as Weight).saturating_mul(t as Weight)))
-			.saturating_add(DbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
-	}
-	fn seal_instantiate(r: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((32247550000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(5 as Weight))
-			.saturating_add(DbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
-			.saturating_add(DbWeight::get().writes(1 as Weight))
-			.saturating_add(DbWeight::get().writes((200 as Weight).saturating_mul(r as Weight)))
-	}
-	fn seal_instantiate_per_input_output_kb(i: u32, o: u32, ) -> Weight {
-		(34376003000 as Weight)
-			.saturating_add((151350000 as Weight).saturating_mul(i as Weight))
-			.saturating_add((82364000 as Weight).saturating_mul(o as Weight))
-			.saturating_add(DbWeight::get().reads(207 as Weight))
-			.saturating_add(DbWeight::get().writes(202 as Weight))
-	}
-	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(164203000 as Weight)
-			.saturating_add((565206000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((330063000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(219038000 as Weight)
-			.saturating_add((567992000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(434654000 as Weight)
-			.saturating_add((271134000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(116374000 as Weight)
-			.saturating_add((566612000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(756028000 as Weight)
-			.saturating_add((150363000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(150126000 as Weight)
-			.saturating_add((564827000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-	}
-	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(1021689000 as Weight)
-			.saturating_add((149452000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(DbWeight::get().reads(4 as Weight))
-	}
-}
diff --git a/frame/contracts/src/weights.rs b/frame/contracts/src/weights.rs
new file mode 100644
index 000000000000..a84acbfd79ac
--- /dev/null
+++ b/frame/contracts/src/weights.rs
@@ -0,0 +1,1267 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Weights for pallet_contracts
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
+//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
+
+// Executed Command:
+// target/release/substrate
+// benchmark
+// --chain=dev
+// --steps=50
+// --repeat=20
+// --pallet=pallet_contracts
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./frame/contracts/src/weights.rs
+// --template=./.maintain/frame-weight-template.hbs
+
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for pallet_contracts.
+pub trait WeightInfo {
+	fn update_schedule() -> Weight;
+	fn put_code(n: u32, ) -> Weight;
+	fn instantiate(n: u32, ) -> Weight;
+	fn call() -> Weight;
+	fn claim_surcharge() -> Weight;
+	fn seal_caller(r: u32, ) -> Weight;
+	fn seal_address(r: u32, ) -> Weight;
+	fn seal_gas_left(r: u32, ) -> Weight;
+	fn seal_balance(r: u32, ) -> Weight;
+	fn seal_value_transferred(r: u32, ) -> Weight;
+	fn seal_minimum_balance(r: u32, ) -> Weight;
+	fn seal_tombstone_deposit(r: u32, ) -> Weight;
+	fn seal_rent_allowance(r: u32, ) -> Weight;
+	fn seal_block_number(r: u32, ) -> Weight;
+	fn seal_now(r: u32, ) -> Weight;
+	fn seal_weight_to_fee(r: u32, ) -> Weight;
+	fn seal_gas(r: u32, ) -> Weight;
+	fn seal_input(r: u32, ) -> Weight;
+	fn seal_input_per_kb(n: u32, ) -> Weight;
+	fn seal_return(r: u32, ) -> Weight;
+	fn seal_return_per_kb(n: u32, ) -> Weight;
+	fn seal_terminate(r: u32, ) -> Weight;
+	fn seal_restore_to(r: u32, ) -> Weight;
+	fn seal_restore_to_per_delta(d: u32, ) -> Weight;
+	fn seal_random(r: u32, ) -> Weight;
+	fn seal_deposit_event(r: u32, ) -> Weight;
+	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight;
+	fn seal_set_rent_allowance(r: u32, ) -> Weight;
+	fn seal_set_storage(r: u32, ) -> Weight;
+	fn seal_set_storage_per_kb(n: u32, ) -> Weight;
+	fn seal_clear_storage(r: u32, ) -> Weight;
+	fn seal_get_storage(r: u32, ) -> Weight;
+	fn seal_get_storage_per_kb(n: u32, ) -> Weight;
+	fn seal_transfer(r: u32, ) -> Weight;
+	fn seal_call(r: u32, ) -> Weight;
+	fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight;
+	fn seal_instantiate(r: u32, ) -> Weight;
+	fn seal_instantiate_per_input_output_kb(i: u32, o: u32, ) -> Weight;
+	fn seal_hash_sha2_256(r: u32, ) -> Weight;
+	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight;
+	fn seal_hash_keccak_256(r: u32, ) -> Weight;
+	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight;
+	fn seal_hash_blake2_256(r: u32, ) -> Weight;
+	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight;
+	fn seal_hash_blake2_128(r: u32, ) -> Weight;
+	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight;
+	fn instr_i64const(r: u32, ) -> Weight;
+	fn instr_i64load(r: u32, ) -> Weight;
+	fn instr_i64store(r: u32, ) -> Weight;
+	fn instr_select(r: u32, ) -> Weight;
+	fn instr_if(r: u32, ) -> Weight;
+	fn instr_br(r: u32, ) -> Weight;
+	fn instr_br_if(r: u32, ) -> Weight;
+	fn instr_br_table(r: u32, ) -> Weight;
+	fn instr_br_table_per_entry(e: u32, ) -> Weight;
+	fn instr_call(r: u32, ) -> Weight;
+	fn instr_call_indirect(r: u32, ) -> Weight;
+	fn instr_call_indirect_per_param(p: u32, ) -> Weight;
+	fn instr_local_get(r: u32, ) -> Weight;
+	fn instr_local_set(r: u32, ) -> Weight;
+	fn instr_local_tee(r: u32, ) -> Weight;
+	fn instr_global_get(r: u32, ) -> Weight;
+	fn instr_global_set(r: u32, ) -> Weight;
+	fn instr_memory_current(r: u32, ) -> Weight;
+	fn instr_memory_grow(r: u32, ) -> Weight;
+	fn instr_i64clz(r: u32, ) -> Weight;
+	fn instr_i64ctz(r: u32, ) -> Weight;
+	fn instr_i64popcnt(r: u32, ) -> Weight;
+	fn instr_i64eqz(r: u32, ) -> Weight;
+	fn instr_i64extendsi32(r: u32, ) -> Weight;
+	fn instr_i64extendui32(r: u32, ) -> Weight;
+	fn instr_i32wrapi64(r: u32, ) -> Weight;
+	fn instr_i64eq(r: u32, ) -> Weight;
+	fn instr_i64ne(r: u32, ) -> Weight;
+	fn instr_i64lts(r: u32, ) -> Weight;
+	fn instr_i64ltu(r: u32, ) -> Weight;
+	fn instr_i64gts(r: u32, ) -> Weight;
+	fn instr_i64gtu(r: u32, ) -> Weight;
+	fn instr_i64les(r: u32, ) -> Weight;
+	fn instr_i64leu(r: u32, ) -> Weight;
+	fn instr_i64ges(r: u32, ) -> Weight;
+	fn instr_i64geu(r: u32, ) -> Weight;
+	fn instr_i64add(r: u32, ) -> Weight;
+	fn instr_i64sub(r: u32, ) -> Weight;
+	fn instr_i64mul(r: u32, ) -> Weight;
+	fn instr_i64divs(r: u32, ) -> Weight;
+	fn instr_i64divu(r: u32, ) -> Weight;
+	fn instr_i64rems(r: u32, ) -> Weight;
+	fn instr_i64remu(r: u32, ) -> Weight;
+	fn instr_i64and(r: u32, ) -> Weight;
+	fn instr_i64or(r: u32, ) -> Weight;
+	fn instr_i64xor(r: u32, ) -> Weight;
+	fn instr_i64shl(r: u32, ) -> Weight;
+	fn instr_i64shrs(r: u32, ) -> Weight;
+	fn instr_i64shru(r: u32, ) -> Weight;
+	fn instr_i64rotl(r: u32, ) -> Weight;
+	fn instr_i64rotr(r: u32, ) -> Weight;
+	
+}
+
+/// Weights for pallet_contracts using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+	fn update_schedule() -> Weight {
+		(33_160_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn put_code(n: u32, ) -> Weight {
+		(5_975_000 as Weight)
+			.saturating_add((108_953_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			
+	}
+	fn instantiate(n: u32, ) -> Weight {
+		(218_223_000 as Weight)
+			.saturating_add((1_007_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(6 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+			
+	}
+	fn call() -> Weight {
+		(201_492_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			
+	}
+	fn claim_surcharge() -> Weight {
+		(449_203_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			
+	}
+	fn seal_caller(r: u32, ) -> Weight {
+		(136_650_000 as Weight)
+			.saturating_add((364_640_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_address(r: u32, ) -> Weight {
+		(144_167_000 as Weight)
+			.saturating_add((365_328_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_gas_left(r: u32, ) -> Weight {
+		(138_458_000 as Weight)
+			.saturating_add((361_076_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_balance(r: u32, ) -> Weight {
+		(147_909_000 as Weight)
+			.saturating_add((792_169_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			
+	}
+	fn seal_value_transferred(r: u32, ) -> Weight {
+		(148_524_000 as Weight)
+			.saturating_add((361_842_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_minimum_balance(r: u32, ) -> Weight {
+		(139_795_000 as Weight)
+			.saturating_add((366_013_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_tombstone_deposit(r: u32, ) -> Weight {
+		(140_557_000 as Weight)
+			.saturating_add((362_687_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_rent_allowance(r: u32, ) -> Weight {
+		(152_989_000 as Weight)
+			.saturating_add((836_876_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_block_number(r: u32, ) -> Weight {
+		(140_228_000 as Weight)
+			.saturating_add((360_561_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_now(r: u32, ) -> Weight {
+		(148_776_000 as Weight)
+			.saturating_add((361_712_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_weight_to_fee(r: u32, ) -> Weight {
+		(126_903_000 as Weight)
+			.saturating_add((603_100_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			
+	}
+	fn seal_gas(r: u32, ) -> Weight {
+		(125_712_000 as Weight)
+			.saturating_add((184_450_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_input(r: u32, ) -> Weight {
+		(136_175_000 as Weight)
+			.saturating_add((7_489_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_input_per_kb(n: u32, ) -> Weight {
+		(145_434_000 as Weight)
+			.saturating_add((276_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_return(r: u32, ) -> Weight {
+		(124_788_000 as Weight)
+			.saturating_add((5_696_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_return_per_kb(n: u32, ) -> Weight {
+		(133_483_000 as Weight)
+			.saturating_add((675_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_terminate(r: u32, ) -> Weight {
+		(135_387_000 as Weight)
+			.saturating_add((338_395_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(r as Weight)))
+	}
+	fn seal_restore_to(r: u32, ) -> Weight {
+		(227_617_000 as Weight)
+			.saturating_add((132_493_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(T::DbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
+	}
+	fn seal_restore_to_per_delta(d: u32, ) -> Weight {
+		(15_263_000 as Weight)
+			.saturating_add((3_732_219_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add(T::DbWeight::get().reads(7 as Weight))
+			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
+			.saturating_add(T::DbWeight::get().writes(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
+	}
+	fn seal_random(r: u32, ) -> Weight {
+		(236_391_000 as Weight)
+			.saturating_add((913_452_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			
+	}
+	fn seal_deposit_event(r: u32, ) -> Weight {
+		(140_845_000 as Weight)
+			.saturating_add((1_322_796_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
+		(1_651_556_000 as Weight)
+			.saturating_add((737_421_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((244_183_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
+			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
+	}
+	fn seal_set_rent_allowance(r: u32, ) -> Weight {
+		(151_091_000 as Weight)
+			.saturating_add((983_375_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			
+	}
+	fn seal_set_storage(r: u32, ) -> Weight {
+		(460_478_000 as Weight)
+			.saturating_add((14_824_033_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
+	}
+	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
+		(2_255_458_000 as Weight)
+			.saturating_add((204_470_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			
+	}
+	fn seal_clear_storage(r: u32, ) -> Weight {
+		(0 as Weight)
+			.saturating_add((5_052_125_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
+	}
+	fn seal_get_storage(r: u32, ) -> Weight {
+		(95_473_000 as Weight)
+			.saturating_add((1_044_784_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
+			
+	}
+	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
+		(860_080_000 as Weight)
+			.saturating_add((146_913_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			
+	}
+	fn seal_transfer(r: u32, ) -> Weight {
+		(107_119_000 as Weight)
+			.saturating_add((5_993_434_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
+	}
+	fn seal_call(r: u32, ) -> Weight {
+		(0 as Weight)
+			.saturating_add((10_533_320_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
+			
+	}
+	fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight {
+		(9_839_633_000 as Weight)
+			.saturating_add((5_580_035_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((53_716_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((73_668_000 as Weight).saturating_mul(o as Weight))
+			.saturating_add(T::DbWeight::get().reads(105 as Weight))
+			.saturating_add(T::DbWeight::get().reads((101 as Weight).saturating_mul(t as Weight)))
+			.saturating_add(T::DbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
+	}
+	fn seal_instantiate(r: u32, ) -> Weight {
+		(0 as Weight)
+			.saturating_add((21_856_497_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(6 as Weight))
+			.saturating_add(T::DbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes((200 as Weight).saturating_mul(r as Weight)))
+	}
+	fn seal_instantiate_per_input_output_kb(i: u32, o: u32, ) -> Weight {
+		(18_796_671_000 as Weight)
+			.saturating_add((156_269_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((74_645_000 as Weight).saturating_mul(o as Weight))
+			.saturating_add(T::DbWeight::get().reads(207 as Weight))
+			.saturating_add(T::DbWeight::get().writes(202 as Weight))
+			
+	}
+	fn seal_hash_sha2_256(r: u32, ) -> Weight {
+		(132_190_000 as Weight)
+			.saturating_add((319_943_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
+		(747_208_000 as Weight)
+			.saturating_add((421_808_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_hash_keccak_256(r: u32, ) -> Weight {
+		(139_235_000 as Weight)
+			.saturating_add((333_792_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
+		(543_256_000 as Weight)
+			.saturating_add((334_383_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_hash_blake2_256(r: u32, ) -> Weight {
+		(142_704_000 as Weight)
+			.saturating_add((305_513_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
+		(592_813_000 as Weight)
+			.saturating_add((151_270_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_hash_blake2_128(r: u32, ) -> Weight {
+		(139_921_000 as Weight)
+			.saturating_add((304_746_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
+		(544_524_000 as Weight)
+			.saturating_add((151_549_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			
+	}
+	fn instr_i64const(r: u32, ) -> Weight {
+		(24_652_000 as Weight)
+			.saturating_add((3_306_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64load(r: u32, ) -> Weight {
+		(27_131_000 as Weight)
+			.saturating_add((162_220_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64store(r: u32, ) -> Weight {
+		(27_086_000 as Weight)
+			.saturating_add((230_977_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_select(r: u32, ) -> Weight {
+		(24_656_000 as Weight)
+			.saturating_add((12_570_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_if(r: u32, ) -> Weight {
+		(24_643_000 as Weight)
+			.saturating_add((12_442_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_br(r: u32, ) -> Weight {
+		(24_589_000 as Weight)
+			.saturating_add((6_237_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_br_if(r: u32, ) -> Weight {
+		(24_650_000 as Weight)
+			.saturating_add((14_393_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_br_table(r: u32, ) -> Weight {
+		(24_689_000 as Weight)
+			.saturating_add((15_706_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_br_table_per_entry(e: u32, ) -> Weight {
+		(40_129_000 as Weight)
+			.saturating_add((83_000 as Weight).saturating_mul(e as Weight))
+			
+	}
+	fn instr_call(r: u32, ) -> Weight {
+		(24_904_000 as Weight)
+			.saturating_add((96_429_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_call_indirect(r: u32, ) -> Weight {
+		(32_540_000 as Weight)
+			.saturating_add((201_773_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
+		(248_700_000 as Weight)
+			.saturating_add((3_705_000 as Weight).saturating_mul(p as Weight))
+			
+	}
+	fn instr_local_get(r: u32, ) -> Weight {
+		(42_081_000 as Weight)
+			.saturating_add((3_548_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_local_set(r: u32, ) -> Weight {
+		(42_128_000 as Weight)
+			.saturating_add((3_678_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_local_tee(r: u32, ) -> Weight {
+		(42_073_000 as Weight)
+			.saturating_add((5_212_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_global_get(r: u32, ) -> Weight {
+		(28_182_000 as Weight)
+			.saturating_add((8_180_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_global_set(r: u32, ) -> Weight {
+		(28_060_000 as Weight)
+			.saturating_add((12_081_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_memory_current(r: u32, ) -> Weight {
+		(27_113_000 as Weight)
+			.saturating_add((3_802_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_memory_grow(r: u32, ) -> Weight {
+		(25_521_000 as Weight)
+			.saturating_add((2_288_295_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64clz(r: u32, ) -> Weight {
+		(24_662_000 as Weight)
+			.saturating_add((5_497_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64ctz(r: u32, ) -> Weight {
+		(24_647_000 as Weight)
+			.saturating_add((5_556_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64popcnt(r: u32, ) -> Weight {
+		(24_646_000 as Weight)
+			.saturating_add((6_138_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64eqz(r: u32, ) -> Weight {
+		(24_649_000 as Weight)
+			.saturating_add((5_477_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64extendsi32(r: u32, ) -> Weight {
+		(24_655_000 as Weight)
+			.saturating_add((5_414_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64extendui32(r: u32, ) -> Weight {
+		(24_619_000 as Weight)
+			.saturating_add((5_434_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i32wrapi64(r: u32, ) -> Weight {
+		(24_654_000 as Weight)
+			.saturating_add((5_483_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64eq(r: u32, ) -> Weight {
+		(24_690_000 as Weight)
+			.saturating_add((7_485_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64ne(r: u32, ) -> Weight {
+		(24_652_000 as Weight)
+			.saturating_add((7_468_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64lts(r: u32, ) -> Weight {
+		(24_667_000 as Weight)
+			.saturating_add((7_426_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64ltu(r: u32, ) -> Weight {
+		(24_693_000 as Weight)
+			.saturating_add((7_393_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64gts(r: u32, ) -> Weight {
+		(24_675_000 as Weight)
+			.saturating_add((7_407_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64gtu(r: u32, ) -> Weight {
+		(24_697_000 as Weight)
+			.saturating_add((7_392_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64les(r: u32, ) -> Weight {
+		(24_646_000 as Weight)
+			.saturating_add((7_420_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64leu(r: u32, ) -> Weight {
+		(24_683_000 as Weight)
+			.saturating_add((7_404_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64ges(r: u32, ) -> Weight {
+		(24_685_000 as Weight)
+			.saturating_add((7_461_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64geu(r: u32, ) -> Weight {
+		(25_147_000 as Weight)
+			.saturating_add((7_003_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64add(r: u32, ) -> Weight {
+		(24_705_000 as Weight)
+			.saturating_add((7_483_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64sub(r: u32, ) -> Weight {
+		(24_675_000 as Weight)
+			.saturating_add((7_377_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64mul(r: u32, ) -> Weight {
+		(24_680_000 as Weight)
+			.saturating_add((7_376_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64divs(r: u32, ) -> Weight {
+		(24_660_000 as Weight)
+			.saturating_add((13_091_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64divu(r: u32, ) -> Weight {
+		(24_643_000 as Weight)
+			.saturating_add((12_109_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64rems(r: u32, ) -> Weight {
+		(24_615_000 as Weight)
+			.saturating_add((13_049_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64remu(r: u32, ) -> Weight {
+		(24_696_000 as Weight)
+			.saturating_add((12_039_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64and(r: u32, ) -> Weight {
+		(24_683_000 as Weight)
+			.saturating_add((7_314_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64or(r: u32, ) -> Weight {
+		(24_657_000 as Weight)
+			.saturating_add((7_401_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64xor(r: u32, ) -> Weight {
+		(24_661_000 as Weight)
+			.saturating_add((7_347_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64shl(r: u32, ) -> Weight {
+		(24_644_000 as Weight)
+			.saturating_add((7_389_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64shrs(r: u32, ) -> Weight {
+		(24_643_000 as Weight)
+			.saturating_add((7_416_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64shru(r: u32, ) -> Weight {
+		(24_634_000 as Weight)
+			.saturating_add((7_392_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64rotl(r: u32, ) -> Weight {
+		(24_618_000 as Weight)
+			.saturating_add((7_452_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64rotr(r: u32, ) -> Weight {
+		(24_618_000 as Weight)
+			.saturating_add((7_447_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+	fn update_schedule() -> Weight {
+		(33_160_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn put_code(n: u32, ) -> Weight {
+		(5_975_000 as Weight)
+			.saturating_add((108_953_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			
+	}
+	fn instantiate(n: u32, ) -> Weight {
+		(218_223_000 as Weight)
+			.saturating_add((1_007_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+			
+	}
+	fn call() -> Weight {
+		(201_492_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			
+	}
+	fn claim_surcharge() -> Weight {
+		(449_203_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			
+	}
+	fn seal_caller(r: u32, ) -> Weight {
+		(136_650_000 as Weight)
+			.saturating_add((364_640_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_address(r: u32, ) -> Weight {
+		(144_167_000 as Weight)
+			.saturating_add((365_328_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_gas_left(r: u32, ) -> Weight {
+		(138_458_000 as Weight)
+			.saturating_add((361_076_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_balance(r: u32, ) -> Weight {
+		(147_909_000 as Weight)
+			.saturating_add((792_169_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			
+	}
+	fn seal_value_transferred(r: u32, ) -> Weight {
+		(148_524_000 as Weight)
+			.saturating_add((361_842_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_minimum_balance(r: u32, ) -> Weight {
+		(139_795_000 as Weight)
+			.saturating_add((366_013_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_tombstone_deposit(r: u32, ) -> Weight {
+		(140_557_000 as Weight)
+			.saturating_add((362_687_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_rent_allowance(r: u32, ) -> Weight {
+		(152_989_000 as Weight)
+			.saturating_add((836_876_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_block_number(r: u32, ) -> Weight {
+		(140_228_000 as Weight)
+			.saturating_add((360_561_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_now(r: u32, ) -> Weight {
+		(148_776_000 as Weight)
+			.saturating_add((361_712_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_weight_to_fee(r: u32, ) -> Weight {
+		(126_903_000 as Weight)
+			.saturating_add((603_100_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			
+	}
+	fn seal_gas(r: u32, ) -> Weight {
+		(125_712_000 as Weight)
+			.saturating_add((184_450_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_input(r: u32, ) -> Weight {
+		(136_175_000 as Weight)
+			.saturating_add((7_489_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_input_per_kb(n: u32, ) -> Weight {
+		(145_434_000 as Weight)
+			.saturating_add((276_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_return(r: u32, ) -> Weight {
+		(124_788_000 as Weight)
+			.saturating_add((5_696_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_return_per_kb(n: u32, ) -> Weight {
+		(133_483_000 as Weight)
+			.saturating_add((675_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_terminate(r: u32, ) -> Weight {
+		(135_387_000 as Weight)
+			.saturating_add((338_395_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(r as Weight)))
+	}
+	fn seal_restore_to(r: u32, ) -> Weight {
+		(227_617_000 as Weight)
+			.saturating_add((132_493_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(RocksDbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
+	}
+	fn seal_restore_to_per_delta(d: u32, ) -> Weight {
+		(15_263_000 as Weight)
+			.saturating_add((3_732_219_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
+			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
+	}
+	fn seal_random(r: u32, ) -> Weight {
+		(236_391_000 as Weight)
+			.saturating_add((913_452_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			
+	}
+	fn seal_deposit_event(r: u32, ) -> Weight {
+		(140_845_000 as Weight)
+			.saturating_add((1_322_796_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
+		(1_651_556_000 as Weight)
+			.saturating_add((737_421_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((244_183_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
+			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
+	}
+	fn seal_set_rent_allowance(r: u32, ) -> Weight {
+		(151_091_000 as Weight)
+			.saturating_add((983_375_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			
+	}
+	fn seal_set_storage(r: u32, ) -> Weight {
+		(460_478_000 as Weight)
+			.saturating_add((14_824_033_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
+	}
+	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
+		(2_255_458_000 as Weight)
+			.saturating_add((204_470_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			
+	}
+	fn seal_clear_storage(r: u32, ) -> Weight {
+		(0 as Weight)
+			.saturating_add((5_052_125_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
+	}
+	fn seal_get_storage(r: u32, ) -> Weight {
+		(95_473_000 as Weight)
+			.saturating_add((1_044_784_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
+			
+	}
+	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
+		(860_080_000 as Weight)
+			.saturating_add((146_913_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			
+	}
+	fn seal_transfer(r: u32, ) -> Weight {
+		(107_119_000 as Weight)
+			.saturating_add((5_993_434_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
+	}
+	fn seal_call(r: u32, ) -> Weight {
+		(0 as Weight)
+			.saturating_add((10_533_320_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
+			
+	}
+	fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight {
+		(9_839_633_000 as Weight)
+			.saturating_add((5_580_035_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((53_716_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((73_668_000 as Weight).saturating_mul(o as Weight))
+			.saturating_add(RocksDbWeight::get().reads(105 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((101 as Weight).saturating_mul(t as Weight)))
+			.saturating_add(RocksDbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
+	}
+	fn seal_instantiate(r: u32, ) -> Weight {
+		(0 as Weight)
+			.saturating_add((21_856_497_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((200 as Weight).saturating_mul(r as Weight)))
+	}
+	fn seal_instantiate_per_input_output_kb(i: u32, o: u32, ) -> Weight {
+		(18_796_671_000 as Weight)
+			.saturating_add((156_269_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((74_645_000 as Weight).saturating_mul(o as Weight))
+			.saturating_add(RocksDbWeight::get().reads(207 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(202 as Weight))
+			
+	}
+	fn seal_hash_sha2_256(r: u32, ) -> Weight {
+		(132_190_000 as Weight)
+			.saturating_add((319_943_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
+		(747_208_000 as Weight)
+			.saturating_add((421_808_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_hash_keccak_256(r: u32, ) -> Weight {
+		(139_235_000 as Weight)
+			.saturating_add((333_792_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
+		(543_256_000 as Weight)
+			.saturating_add((334_383_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_hash_blake2_256(r: u32, ) -> Weight {
+		(142_704_000 as Weight)
+			.saturating_add((305_513_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
+		(592_813_000 as Weight)
+			.saturating_add((151_270_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_hash_blake2_128(r: u32, ) -> Weight {
+		(139_921_000 as Weight)
+			.saturating_add((304_746_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			
+	}
+	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
+		(544_524_000 as Weight)
+			.saturating_add((151_549_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			
+	}
+	fn instr_i64const(r: u32, ) -> Weight {
+		(24_652_000 as Weight)
+			.saturating_add((3_306_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64load(r: u32, ) -> Weight {
+		(27_131_000 as Weight)
+			.saturating_add((162_220_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64store(r: u32, ) -> Weight {
+		(27_086_000 as Weight)
+			.saturating_add((230_977_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_select(r: u32, ) -> Weight {
+		(24_656_000 as Weight)
+			.saturating_add((12_570_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_if(r: u32, ) -> Weight {
+		(24_643_000 as Weight)
+			.saturating_add((12_442_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_br(r: u32, ) -> Weight {
+		(24_589_000 as Weight)
+			.saturating_add((6_237_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_br_if(r: u32, ) -> Weight {
+		(24_650_000 as Weight)
+			.saturating_add((14_393_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_br_table(r: u32, ) -> Weight {
+		(24_689_000 as Weight)
+			.saturating_add((15_706_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_br_table_per_entry(e: u32, ) -> Weight {
+		(40_129_000 as Weight)
+			.saturating_add((83_000 as Weight).saturating_mul(e as Weight))
+			
+	}
+	fn instr_call(r: u32, ) -> Weight {
+		(24_904_000 as Weight)
+			.saturating_add((96_429_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_call_indirect(r: u32, ) -> Weight {
+		(32_540_000 as Weight)
+			.saturating_add((201_773_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
+		(248_700_000 as Weight)
+			.saturating_add((3_705_000 as Weight).saturating_mul(p as Weight))
+			
+	}
+	fn instr_local_get(r: u32, ) -> Weight {
+		(42_081_000 as Weight)
+			.saturating_add((3_548_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_local_set(r: u32, ) -> Weight {
+		(42_128_000 as Weight)
+			.saturating_add((3_678_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_local_tee(r: u32, ) -> Weight {
+		(42_073_000 as Weight)
+			.saturating_add((5_212_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_global_get(r: u32, ) -> Weight {
+		(28_182_000 as Weight)
+			.saturating_add((8_180_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_global_set(r: u32, ) -> Weight {
+		(28_060_000 as Weight)
+			.saturating_add((12_081_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_memory_current(r: u32, ) -> Weight {
+		(27_113_000 as Weight)
+			.saturating_add((3_802_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_memory_grow(r: u32, ) -> Weight {
+		(25_521_000 as Weight)
+			.saturating_add((2_288_295_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64clz(r: u32, ) -> Weight {
+		(24_662_000 as Weight)
+			.saturating_add((5_497_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64ctz(r: u32, ) -> Weight {
+		(24_647_000 as Weight)
+			.saturating_add((5_556_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64popcnt(r: u32, ) -> Weight {
+		(24_646_000 as Weight)
+			.saturating_add((6_138_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64eqz(r: u32, ) -> Weight {
+		(24_649_000 as Weight)
+			.saturating_add((5_477_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64extendsi32(r: u32, ) -> Weight {
+		(24_655_000 as Weight)
+			.saturating_add((5_414_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64extendui32(r: u32, ) -> Weight {
+		(24_619_000 as Weight)
+			.saturating_add((5_434_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i32wrapi64(r: u32, ) -> Weight {
+		(24_654_000 as Weight)
+			.saturating_add((5_483_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64eq(r: u32, ) -> Weight {
+		(24_690_000 as Weight)
+			.saturating_add((7_485_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64ne(r: u32, ) -> Weight {
+		(24_652_000 as Weight)
+			.saturating_add((7_468_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64lts(r: u32, ) -> Weight {
+		(24_667_000 as Weight)
+			.saturating_add((7_426_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64ltu(r: u32, ) -> Weight {
+		(24_693_000 as Weight)
+			.saturating_add((7_393_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64gts(r: u32, ) -> Weight {
+		(24_675_000 as Weight)
+			.saturating_add((7_407_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64gtu(r: u32, ) -> Weight {
+		(24_697_000 as Weight)
+			.saturating_add((7_392_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64les(r: u32, ) -> Weight {
+		(24_646_000 as Weight)
+			.saturating_add((7_420_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64leu(r: u32, ) -> Weight {
+		(24_683_000 as Weight)
+			.saturating_add((7_404_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64ges(r: u32, ) -> Weight {
+		(24_685_000 as Weight)
+			.saturating_add((7_461_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64geu(r: u32, ) -> Weight {
+		(25_147_000 as Weight)
+			.saturating_add((7_003_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64add(r: u32, ) -> Weight {
+		(24_705_000 as Weight)
+			.saturating_add((7_483_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64sub(r: u32, ) -> Weight {
+		(24_675_000 as Weight)
+			.saturating_add((7_377_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64mul(r: u32, ) -> Weight {
+		(24_680_000 as Weight)
+			.saturating_add((7_376_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64divs(r: u32, ) -> Weight {
+		(24_660_000 as Weight)
+			.saturating_add((13_091_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64divu(r: u32, ) -> Weight {
+		(24_643_000 as Weight)
+			.saturating_add((12_109_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64rems(r: u32, ) -> Weight {
+		(24_615_000 as Weight)
+			.saturating_add((13_049_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64remu(r: u32, ) -> Weight {
+		(24_696_000 as Weight)
+			.saturating_add((12_039_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64and(r: u32, ) -> Weight {
+		(24_683_000 as Weight)
+			.saturating_add((7_314_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64or(r: u32, ) -> Weight {
+		(24_657_000 as Weight)
+			.saturating_add((7_401_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64xor(r: u32, ) -> Weight {
+		(24_661_000 as Weight)
+			.saturating_add((7_347_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64shl(r: u32, ) -> Weight {
+		(24_644_000 as Weight)
+			.saturating_add((7_389_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64shrs(r: u32, ) -> Weight {
+		(24_643_000 as Weight)
+			.saturating_add((7_416_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64shru(r: u32, ) -> Weight {
+		(24_634_000 as Weight)
+			.saturating_add((7_392_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64rotl(r: u32, ) -> Weight {
+		(24_618_000 as Weight)
+			.saturating_add((7_452_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	fn instr_i64rotr(r: u32, ) -> Weight {
+		(24_618_000 as Weight)
+			.saturating_add((7_447_000 as Weight).saturating_mul(r as Weight))
+			
+	}
+	
+}

From dde09ab71c7c6c0c71a3b653e26c9df7ba377925 Mon Sep 17 00:00:00 2001
From: Caio <c410.f3r@gmail.com>
Date: Mon, 9 Nov 2020 14:00:33 -0300
Subject: [PATCH 0061/1194] Remove development TODO from public doc comment
 (#7500)

---
 frame/system/src/offchain.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frame/system/src/offchain.rs b/frame/system/src/offchain.rs
index edb4e5775722..25d18ac6bf25 100644
--- a/frame/system/src/offchain.rs
+++ b/frame/system/src/offchain.rs
@@ -445,8 +445,8 @@ pub trait AppCrypto<Public, Signature> {
 /// This trait adds extra bounds to `Public` and `Signature` types of the runtime
 /// that are necessary to use these types for signing.
 ///
-///	TODO [#5663] Could this be just `T::Signature as traits::Verify>::Signer`?
-/// Seems that this may cause issues with bounds resolution.
+// TODO [#5663] Could this be just `T::Signature as traits::Verify>::Signer`?
+// Seems that this may cause issues with bounds resolution.
 pub trait SigningTypes: crate::Trait {
 	/// A public key that is capable of identifing `AccountId`s.
 	///

From bf78c1655b7e49503a11cb070235089ea1e2455e Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Mon, 9 Nov 2020 20:26:24 +0100
Subject: [PATCH 0062/1194] refactor subtrait/elevated trait as not needed
 (#7497)

---
 frame/balances/src/lib.rs | 74 +++++----------------------------------
 1 file changed, 9 insertions(+), 65 deletions(-)

diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index 7ca6fd1e7809..141a360f7e18 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -704,7 +704,7 @@ impl<T: Trait<I>, I: Instance> Module<T, I> {
 // of the inner member.
 mod imbalances {
 	use super::{
-		result, Subtrait, DefaultInstance, Imbalance, Trait, Zero, Instance, Saturating,
+		result, DefaultInstance, Imbalance, Trait, Zero, Instance, Saturating,
 		StorageValue, TryDrop,
 	};
 	use sp_std::mem;
@@ -712,9 +712,9 @@ mod imbalances {
 	/// Opaque, move-only struct with private fields that serves as a token denoting that
 	/// funds have been created without any equal and opposite accounting.
 	#[must_use]
-	pub struct PositiveImbalance<T: Subtrait<I>, I: Instance=DefaultInstance>(T::Balance);
+	pub struct PositiveImbalance<T: Trait<I>, I: Instance=DefaultInstance>(T::Balance);
 
-	impl<T: Subtrait<I>, I: Instance> PositiveImbalance<T, I> {
+	impl<T: Trait<I>, I: Instance> PositiveImbalance<T, I> {
 		/// Create a new positive imbalance from a balance.
 		pub fn new(amount: T::Balance) -> Self {
 			PositiveImbalance(amount)
@@ -724,9 +724,9 @@ mod imbalances {
 	/// Opaque, move-only struct with private fields that serves as a token denoting that
 	/// funds have been destroyed without any equal and opposite accounting.
 	#[must_use]
-	pub struct NegativeImbalance<T: Subtrait<I>, I: Instance=DefaultInstance>(T::Balance);
+	pub struct NegativeImbalance<T: Trait<I>, I: Instance=DefaultInstance>(T::Balance);
 
-	impl<T: Subtrait<I>, I: Instance> NegativeImbalance<T, I> {
+	impl<T: Trait<I>, I: Instance> NegativeImbalance<T, I> {
 		/// Create a new negative imbalance from a balance.
 		pub fn new(amount: T::Balance) -> Self {
 			NegativeImbalance(amount)
@@ -835,81 +835,25 @@ mod imbalances {
 		}
 	}
 
-	impl<T: Subtrait<I>, I: Instance> Drop for PositiveImbalance<T, I> {
+	impl<T: Trait<I>, I: Instance> Drop for PositiveImbalance<T, I> {
 		/// Basic drop handler will just square up the total issuance.
 		fn drop(&mut self) {
-			<super::TotalIssuance<super::ElevatedTrait<T, I>, I>>::mutate(
+			<super::TotalIssuance<T, I>>::mutate(
 				|v| *v = v.saturating_add(self.0)
 			);
 		}
 	}
 
-	impl<T: Subtrait<I>, I: Instance> Drop for NegativeImbalance<T, I> {
+	impl<T: Trait<I>, I: Instance> Drop for NegativeImbalance<T, I> {
 		/// Basic drop handler will just square up the total issuance.
 		fn drop(&mut self) {
-			<super::TotalIssuance<super::ElevatedTrait<T, I>, I>>::mutate(
+			<super::TotalIssuance<T, I>>::mutate(
 				|v| *v = v.saturating_sub(self.0)
 			);
 		}
 	}
 }
 
-// TODO: #2052
-// Somewhat ugly hack in order to gain access to module's `increase_total_issuance_by`
-// using only the Subtrait (which defines only the types that are not dependent
-// on Positive/NegativeImbalance). Subtrait must be used otherwise we end up with a
-// circular dependency with Trait having some types be dependent on PositiveImbalance<Trait>
-// and PositiveImbalance itself depending back on Trait for its Drop impl (and thus
-// its type declaration).
-// This works as long as `increase_total_issuance_by` doesn't use the Imbalance
-// types (basically for charging fees).
-// This should eventually be refactored so that the type item that
-// depends on the Imbalance type (DustRemoval) is placed in its own pallet.
-struct ElevatedTrait<T: Subtrait<I>, I: Instance>(T, I);
-impl<T: Subtrait<I>, I: Instance> Clone for ElevatedTrait<T, I> {
-	fn clone(&self) -> Self { unimplemented!() }
-}
-impl<T: Subtrait<I>, I: Instance> PartialEq for ElevatedTrait<T, I> {
-	fn eq(&self, _: &Self) -> bool { unimplemented!() }
-}
-impl<T: Subtrait<I>, I: Instance> Eq for ElevatedTrait<T, I> {}
-impl<T: Subtrait<I>, I: Instance> frame_system::Trait for ElevatedTrait<T, I> {
-	type BaseCallFilter = T::BaseCallFilter;
-	type Origin = T::Origin;
-	type Call = T::Call;
-	type Index = T::Index;
-	type BlockNumber = T::BlockNumber;
-	type Hash = T::Hash;
-	type Hashing = T::Hashing;
-	type AccountId = T::AccountId;
-	type Lookup = T::Lookup;
-	type Header = T::Header;
-	type Event = ();
-	type BlockHashCount = T::BlockHashCount;
-	type MaximumBlockWeight = T::MaximumBlockWeight;
-	type DbWeight = T::DbWeight;
-	type BlockExecutionWeight = T::BlockExecutionWeight;
-	type ExtrinsicBaseWeight = T::ExtrinsicBaseWeight;
-	type MaximumExtrinsicWeight = T::MaximumBlockWeight;
-	type MaximumBlockLength = T::MaximumBlockLength;
-	type AvailableBlockRatio = T::AvailableBlockRatio;
-	type Version = T::Version;
-	type PalletInfo = T::PalletInfo;
-	type OnNewAccount = T::OnNewAccount;
-	type OnKilledAccount = T::OnKilledAccount;
-	type AccountData = T::AccountData;
-	type SystemWeightInfo = T::SystemWeightInfo;
-}
-impl<T: Subtrait<I>, I: Instance> Trait<I> for ElevatedTrait<T, I> {
-	type Balance = T::Balance;
-	type Event = ();
-	type DustRemoval = ();
-	type ExistentialDeposit = T::ExistentialDeposit;
-	type AccountStore = T::AccountStore;
-	type WeightInfo = <T as Subtrait<I>>::WeightInfo;
-	type MaxLocks = T::MaxLocks;
-}
-
 impl<T: Trait<I>, I: Instance> Currency<T::AccountId> for Module<T, I> where
 	T::Balance: MaybeSerializeDeserialize + Debug
 {

From c9bde3d908a1995c99d7c241c72223bf6fe56ad7 Mon Sep 17 00:00:00 2001
From: Antoine Le Calvez <alecalve@users.noreply.github.com>
Date: Tue, 10 Nov 2020 14:17:30 +0100
Subject: [PATCH 0063/1194] Fix comments of indices pallet events (#7511)

Arguments for IndexAssigned and IndexFrozen were inverted in comments.
---
 frame/indices/src/lib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frame/indices/src/lib.rs b/frame/indices/src/lib.rs
index aa645d0cb9eb..fd2eb956f923 100644
--- a/frame/indices/src/lib.rs
+++ b/frame/indices/src/lib.rs
@@ -80,11 +80,11 @@ decl_event!(
 		<T as frame_system::Trait>::AccountId,
 		<T as Trait>::AccountIndex
 	{
-		/// A account index was assigned. \[who, index\]
+		/// A account index was assigned. \[index, who\]
 		IndexAssigned(AccountId, AccountIndex),
 		/// A account index has been freed up (unassigned). \[index\]
 		IndexFreed(AccountIndex),
-		/// A account index has been frozen to its current account ID. \[who, index\]
+		/// A account index has been frozen to its current account ID. \[index, who\]
 		IndexFrozen(AccountIndex, AccountId),
 	}
 );

From f8bfe224b0a0143455f706bd96da3104141d0c43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Wed, 11 Nov 2020 09:57:14 +0100
Subject: [PATCH 0064/1194] Skip slot lenience on first block in BABE (#7515)

The genesis header doesn't have the BABE pre-digest and we insert `0` as
slot number. The slot lenience calculation will return the maximum in
this situation. Besides returning the maximum which is not bad at all,
it also prints some a debug message that can be confusing in the first
moment. To prevent printing this debug message, we now just return early
when we see that the parent block is the genesis block.
---
 client/consensus/babe/src/lib.rs | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index 948959e96495..dce252920140 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -669,12 +669,17 @@ impl<B, C, E, I, Error, SO> sc_consensus_slots::SimpleSlotWorker<B> for BabeSlot
 
 	fn proposing_remaining_duration(
 		&self,
-		head: &B::Header,
+		parent_head: &B::Header,
 		slot_info: &SlotInfo,
 	) -> Option<std::time::Duration> {
 		let slot_remaining = self.slot_remaining_duration(slot_info);
 
-		let parent_slot = match find_pre_digest::<B>(head) {
+		// If parent is genesis block, we don't require any lenience factor.
+		if parent_head.number().is_zero() {
+			return Some(slot_remaining)
+		}
+
+		let parent_slot = match find_pre_digest::<B>(parent_head) {
 			Err(_) => return Some(slot_remaining),
 			Ok(d) => d.slot_number(),
 		};
@@ -682,7 +687,8 @@ impl<B, C, E, I, Error, SO> sc_consensus_slots::SimpleSlotWorker<B> for BabeSlot
 		if let Some(slot_lenience) =
 			sc_consensus_slots::slot_lenience_exponential(parent_slot, slot_info)
 		{
-			debug!(target: "babe",
+			debug!(
+				target: "babe",
 				"No block for {} slots. Applying exponential lenience of {}s",
 				slot_info.number.saturating_sub(parent_slot + 1),
 				slot_lenience.as_secs(),
@@ -697,8 +703,7 @@ impl<B, C, E, I, Error, SO> sc_consensus_slots::SimpleSlotWorker<B> for BabeSlot
 
 /// Extract the BABE pre digest from the given header. Pre-runtime digests are
 /// mandatory, the function will return `Err` if none is found.
-pub fn find_pre_digest<B: BlockT>(header: &B::Header) -> Result<PreDigest, Error<B>>
-{
+pub fn find_pre_digest<B: BlockT>(header: &B::Header) -> Result<PreDigest, Error<B>> {
 	// genesis block doesn't contain a pre digest so let's generate a
 	// dummy one to not break any invariants in the rest of the code
 	if header.number().is_zero() {

From 095d0f06a42b66a92f28d097499a69e3f170d59d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= <jon.haggblad@gmail.com>
Date: Wed, 11 Nov 2020 14:29:19 +0100
Subject: [PATCH 0065/1194] slots: incrementally backoff claiming slots if
 finality lags behind (#7186)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* babe: backoff authoring blocks when finality lags

* babe: move backoff authoring params to default constructor

* babe: deduplicate the test a bit

* babe: set backoff constants in service

* babe: use better names for backoff authoring block parameters

* babe: remove last unwrap

* babe: slight style tweak

* babe: fix comment

* slots: move backoff block authorship logic to SimpleSlotWorker

* aura: append SlotInfo in on_slot

* slots: use the correct types for parameters

* slots: fix review comments

* aura: add missing backoff authoring blocks parameters

* slots: add comments for default values

* slots: add additional checks in test

* slots: update implementation for new master

* slots: revert the change to SlotInfo

* Fix review comments

* slots: rework unit tests for backing off claiming slots

* slots: add test for asymptotic behaviour for slot claims

* slots: address review comments

* slots: add test for max_interval

* slots: add assertion for intervals between between claimed slots

* slots: remove rustfmt directive

* slots: another attempt at explaining authoring_rate

* slots: up unfinalized_slack to 50 by default

* slots: add tests for time to reach max_interval

* slots: fix typo in comments

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* slots: additional tweaks to comments and info calls

* slots: rename to BackoffAuthoringOnFinalizedHeadLagging

* slots: make the backing off strategy generic

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* slots: implement backoff trait for () for simplicity

* slots: move logging inside backing off function to make it more specific

* aura: add missing function parameter

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 Cargo.lock                            |   2 +
 bin/node-template/node/src/service.rs |   4 +-
 bin/node/cli/Cargo.toml               |   1 +
 bin/node/cli/src/service.rs           |   3 +
 client/consensus/aura/src/lib.rs      |  40 ++-
 client/consensus/babe/src/lib.rs      |  38 ++-
 client/consensus/babe/src/tests.rs    |   2 +
 client/consensus/slots/Cargo.toml     |   1 +
 client/consensus/slots/src/lib.rs     | 469 +++++++++++++++++++++++++-
 9 files changed, 540 insertions(+), 20 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index aff2c9991766..62cb03dedafa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3827,6 +3827,7 @@ dependencies = [
  "sc-consensus",
  "sc-consensus-babe",
  "sc-consensus-epochs",
+ "sc-consensus-slots",
  "sc-finality-grandpa",
  "sc-keystore",
  "sc-network",
@@ -6881,6 +6882,7 @@ dependencies = [
  "sc-telemetry",
  "sp-api",
  "sp-application-crypto",
+ "sp-arithmetic",
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-slots",
diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
index 90187061c9cf..d85de7c840df 100644
--- a/bin/node-template/node/src/service.rs
+++ b/bin/node-template/node/src/service.rs
@@ -111,6 +111,7 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
 
 	let role = config.role.clone();
 	let force_authoring = config.force_authoring;
+	let backoff_authoring_blocks: Option<()> = None;
 	let name = config.network.node_name.clone();
 	let enable_grandpa = !config.disable_grandpa;
 	let prometheus_registry = config.prometheus_registry().cloned();
@@ -155,7 +156,7 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
 		let can_author_with =
 			sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone());
 
-		let aura = sc_consensus_aura::start_aura::<_, _, _, _, _, AuraPair, _, _, _>(
+		let aura = sc_consensus_aura::start_aura::<_, _, _, _, _, AuraPair, _, _, _,_>(
 			sc_consensus_aura::slot_duration(&*client)?,
 			client.clone(),
 			select_chain,
@@ -164,6 +165,7 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
 			network.clone(),
 			inherent_data_providers.clone(),
 			force_authoring,
+			backoff_authoring_blocks,
 			keystore_container.sync_keystore(),
 			can_author_with,
 		)?;
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index e396b2dcefff..26a23ce36ecc 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -64,6 +64,7 @@ sc-chain-spec = { version = "2.0.0", path = "../../../client/chain-spec" }
 sc-consensus = { version = "0.8.0", path = "../../../client/consensus/common" }
 sc-transaction-pool = { version = "2.0.0", path = "../../../client/transaction-pool" }
 sc-network = { version = "0.8.0", path = "../../../client/network" }
+sc-consensus-slots = { version = "0.8.0", path = "../../../client/consensus/slots" }
 sc-consensus-babe = { version = "0.8.0", path = "../../../client/consensus/babe" }
 grandpa = { version = "0.8.0", package = "sc-finality-grandpa", path = "../../../client/finality-grandpa" }
 sc-client-db = { version = "0.8.0", default-features = false, path = "../../../client/db" }
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index ecf50dc14634..3bc406b84fc6 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -204,6 +204,8 @@ pub fn new_full_base(
 
 	let role = config.role.clone();
 	let force_authoring = config.force_authoring;
+	let backoff_authoring_blocks =
+		Some(sc_consensus_slots::BackoffAuthoringOnFinalizedHeadLagging::default());
 	let name = config.network.node_name.clone();
 	let enable_grandpa = !config.disable_grandpa;
 	let prometheus_registry = config.prometheus_registry().cloned();
@@ -249,6 +251,7 @@ pub fn new_full_base(
 			sync_oracle: network.clone(),
 			inherent_data_providers: inherent_data_providers.clone(),
 			force_authoring,
+			backoff_authoring_blocks,
 			babe_link,
 			can_author_with,
 		};
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index 5013c1813b68..97bfb217b939 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -59,7 +59,7 @@ use sp_core::crypto::Public;
 use sp_application_crypto::{AppKey, AppPublic};
 use sp_runtime::{
 	generic::{BlockId, OpaqueDigestItemId},
-	Justification,
+	traits::NumberFor, Justification,
 };
 use sp_runtime::traits::{Block as BlockT, Header, DigestItemFor, Zero, Member};
 use sp_api::ProvideRuntimeApi;
@@ -73,6 +73,7 @@ use sc_telemetry::{telemetry, CONSENSUS_TRACE, CONSENSUS_DEBUG, CONSENSUS_INFO};
 
 use sc_consensus_slots::{
 	CheckedHeader, SlotInfo, SlotCompatible, StorageChanges, check_equivocation,
+	BackoffAuthoringBlocksStrategy,
 };
 
 use sp_api::ApiExt;
@@ -138,7 +139,7 @@ impl SlotCompatible for AuraSlotCompatible {
 }
 
 /// Start the aura worker. The returned future should be run in a futures executor.
-pub fn start_aura<B, C, SC, E, I, P, SO, CAW, Error>(
+pub fn start_aura<B, C, SC, E, I, P, SO, CAW, BS, Error>(
 	slot_duration: SlotDuration,
 	client: Arc<C>,
 	select_chain: SC,
@@ -147,11 +148,12 @@ pub fn start_aura<B, C, SC, E, I, P, SO, CAW, Error>(
 	sync_oracle: SO,
 	inherent_data_providers: InherentDataProviders,
 	force_authoring: bool,
+	backoff_authoring_blocks: Option<BS>,
 	keystore: SyncCryptoStorePtr,
 	can_author_with: CAW,
 ) -> Result<impl Future<Output = ()>, sp_consensus::Error> where
 	B: BlockT,
-	C: ProvideRuntimeApi<B> + BlockOf + ProvideCache<B> + AuxStore + Send + Sync,
+	C: ProvideRuntimeApi<B> + BlockOf + ProvideCache<B> + AuxStore + HeaderBackend<B> + Send + Sync,
 	C::Api: AuraApi<B, AuthorityId<P>>,
 	SC: SelectChain<B>,
 	E: Environment<B, Error = Error> + Send + Sync + 'static,
@@ -163,6 +165,7 @@ pub fn start_aura<B, C, SC, E, I, P, SO, CAW, Error>(
 	Error: std::error::Error + Send + From<sp_consensus::Error> + 'static,
 	SO: SyncOracle + Send + Sync + Clone,
 	CAW: CanAuthorWith<B> + Send,
+	BS: BackoffAuthoringBlocksStrategy<NumberFor<B>> + Send + 'static,
 {
 	let worker = AuraWorker {
 		client,
@@ -171,6 +174,7 @@ pub fn start_aura<B, C, SC, E, I, P, SO, CAW, Error>(
 		keystore,
 		sync_oracle: sync_oracle.clone(),
 		force_authoring,
+		backoff_authoring_blocks,
 		_key_type: PhantomData::<P>,
 	};
 	register_aura_inherent_data_provider(
@@ -188,20 +192,22 @@ pub fn start_aura<B, C, SC, E, I, P, SO, CAW, Error>(
 	))
 }
 
-struct AuraWorker<C, E, I, P, SO> {
+struct AuraWorker<C, E, I, P, SO, BS> {
 	client: Arc<C>,
 	block_import: Arc<Mutex<I>>,
 	env: E,
 	keystore: SyncCryptoStorePtr,
 	sync_oracle: SO,
 	force_authoring: bool,
+	backoff_authoring_blocks: Option<BS>,
 	_key_type: PhantomData<P>,
 }
 
-impl<B, C, E, I, P, Error, SO> sc_consensus_slots::SimpleSlotWorker<B> for AuraWorker<C, E, I, P, SO>
+impl<B, C, E, I, P, Error, SO, BS> sc_consensus_slots::SimpleSlotWorker<B>
+	for AuraWorker<C, E, I, P, SO, BS>
 where
 	B: BlockT,
-	C: ProvideRuntimeApi<B> + BlockOf + ProvideCache<B> + Sync,
+	C: ProvideRuntimeApi<B> + BlockOf + ProvideCache<B> + HeaderBackend<B> + Sync,
 	C::Api: AuraApi<B, AuthorityId<P>>,
 	E: Environment<B, Error = Error>,
 	E::Proposer: Proposer<B, Error = Error, Transaction = sp_api::TransactionFor<C, B>>,
@@ -210,6 +216,7 @@ where
 	P::Public: AppPublic + Public + Member + Encode + Decode + Hash,
 	P::Signature: TryFrom<Vec<u8>> + Member + Encode + Decode + Hash + Debug,
 	SO: SyncOracle + Send + Clone,
+	BS: BackoffAuthoringBlocksStrategy<NumberFor<B>> + Send + 'static,
 	Error: std::error::Error + Send + From<sp_consensus::Error> + 'static,
 {
 	type BlockImport = I;
@@ -316,6 +323,21 @@ where
 		self.force_authoring
 	}
 
+	fn should_backoff(&self, slot_number: u64, chain_head: &B::Header) -> bool {
+		if let Some(ref strategy) = self.backoff_authoring_blocks {
+			if let Ok(chain_head_slot) = find_pre_digest::<B, P>(chain_head) {
+				return strategy.should_backoff(
+					*chain_head.number(),
+					chain_head_slot,
+					self.client.info().finalized_number,
+					slot_number,
+					self.logging_target(),
+				);
+			}
+		}
+		false
+	}
+
 	fn sync_oracle(&mut self) -> &mut Self::SyncOracle {
 		&mut self.sync_oracle
 	}
@@ -863,7 +885,7 @@ mod tests {
 	use sp_keyring::sr25519::Keyring;
 	use sc_client_api::BlockchainEvents;
 	use sp_consensus_aura::sr25519::AuthorityPair;
-	use sc_consensus_slots::SimpleSlotWorker;
+	use sc_consensus_slots::{SimpleSlotWorker, BackoffAuthoringOnFinalizedHeadLagging};
 	use std::task::Poll;
 	use sc_block_builder::BlockBuilderProvider;
 	use sp_runtime::traits::Header as _;
@@ -1012,7 +1034,7 @@ mod tests {
 				&inherent_data_providers, slot_duration.get()
 			).expect("Registers aura inherent data provider");
 
-			aura_futures.push(start_aura::<_, _, _, _, _, AuthorityPair, _, _, _>(
+			aura_futures.push(start_aura::<_, _, _, _, _, AuthorityPair, _, _, _, _>(
 				slot_duration,
 				client.clone(),
 				select_chain,
@@ -1021,6 +1043,7 @@ mod tests {
 				DummyOracle,
 				inherent_data_providers,
 				false,
+				Some(BackoffAuthoringOnFinalizedHeadLagging::default()),
 				keystore,
 				sp_consensus::AlwaysCanAuthor,
 			).expect("Starts aura"));
@@ -1081,6 +1104,7 @@ mod tests {
 			keystore: keystore.into(),
 			sync_oracle: DummyOracle.clone(),
 			force_authoring: false,
+			backoff_authoring_blocks: Some(BackoffAuthoringOnFinalizedHeadLagging::default()),
 			_key_type: PhantomData::<AuthorityPair>,
 		};
 
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index dce252920140..c672440d114b 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -114,6 +114,7 @@ use log::{debug, info, log, trace, warn};
 use prometheus_endpoint::Registry;
 use sc_consensus_slots::{
 	SlotInfo, SlotCompatible, StorageChanges, CheckedHeader, check_equivocation,
+	BackoffAuthoringBlocksStrategy,
 };
 use sc_consensus_epochs::{
 	descendent_query, SharedEpochChanges, EpochChangesFor, Epoch as EpochT, ViableEpochDescriptor,
@@ -354,7 +355,7 @@ impl std::ops::Deref for Config {
 }
 
 /// Parameters for BABE.
-pub struct BabeParams<B: BlockT, C, E, I, SO, SC, CAW> {
+pub struct BabeParams<B: BlockT, C, E, I, SO, SC, CAW, BS> {
 	/// The keystore that manages the keys of the node.
 	pub keystore: SyncCryptoStorePtr,
 
@@ -381,6 +382,9 @@ pub struct BabeParams<B: BlockT, C, E, I, SO, SC, CAW> {
 	/// Force authoring of blocks even if we are offline
 	pub force_authoring: bool,
 
+	/// Strategy and parameters for backing off block production.
+	pub backoff_authoring_blocks: Option<BS>,
+
 	/// The source of timestamps for relative slots
 	pub babe_link: BabeLink<B>,
 
@@ -389,7 +393,7 @@ pub struct BabeParams<B: BlockT, C, E, I, SO, SC, CAW> {
 }
 
 /// Start the babe worker.
-pub fn start_babe<B, C, SC, E, I, SO, CAW, Error>(BabeParams {
+pub fn start_babe<B, C, SC, E, I, SO, CAW, BS, Error>(BabeParams {
 	keystore,
 	client,
 	select_chain,
@@ -398,9 +402,10 @@ pub fn start_babe<B, C, SC, E, I, SO, CAW, Error>(BabeParams {
 	sync_oracle,
 	inherent_data_providers,
 	force_authoring,
+	backoff_authoring_blocks,
 	babe_link,
 	can_author_with,
-}: BabeParams<B, C, E, I, SO, SC, CAW>) -> Result<
+}: BabeParams<B, C, E, I, SO, SC, CAW, BS>) -> Result<
 	BabeWorker<B>,
 	sp_consensus::Error,
 > where
@@ -416,6 +421,7 @@ pub fn start_babe<B, C, SC, E, I, SO, CAW, Error>(BabeParams {
 	Error: std::error::Error + Send + From<ConsensusError> + From<I::Error> + 'static,
 	SO: SyncOracle + Send + Sync + Clone + 'static,
 	CAW: CanAuthorWith<B> + Send + 'static,
+	BS: BackoffAuthoringBlocksStrategy<NumberFor<B>> + Send + 'static,
 {
 	let config = babe_link.config;
 	let slot_notification_sinks = Arc::new(Mutex::new(Vec::new()));
@@ -426,6 +432,7 @@ pub fn start_babe<B, C, SC, E, I, SO, CAW, Error>(BabeParams {
 		env,
 		sync_oracle: sync_oracle.clone(),
 		force_authoring,
+		backoff_authoring_blocks,
 		keystore,
 		epoch_changes: babe_link.epoch_changes.clone(),
 		slot_notification_sinks: slot_notification_sinks.clone(),
@@ -490,19 +497,22 @@ impl<B: BlockT> futures::Future for BabeWorker<B> {
 /// Slot notification sinks.
 type SlotNotificationSinks<B> = Arc<Mutex<Vec<Sender<(u64, ViableEpochDescriptor<<B as BlockT>::Hash, NumberFor<B>, Epoch>)>>>>;
 
-struct BabeSlotWorker<B: BlockT, C, E, I, SO> {
+struct BabeSlotWorker<B: BlockT, C, E, I, SO, BS> {
 	client: Arc<C>,
 	block_import: Arc<Mutex<I>>,
 	env: E,
 	sync_oracle: SO,
 	force_authoring: bool,
+	backoff_authoring_blocks: Option<BS>,
 	keystore: SyncCryptoStorePtr,
 	epoch_changes: SharedEpochChanges<B, Epoch>,
 	slot_notification_sinks: SlotNotificationSinks<B>,
 	config: Config,
 }
 
-impl<B, C, E, I, Error, SO> sc_consensus_slots::SimpleSlotWorker<B> for BabeSlotWorker<B, C, E, I, SO> where
+impl<B, C, E, I, Error, SO, BS> sc_consensus_slots::SimpleSlotWorker<B>
+	for BabeSlotWorker<B, C, E, I, SO, BS>
+where
 	B: BlockT,
 	C: ProvideRuntimeApi<B> +
 		ProvideCache<B> +
@@ -513,6 +523,7 @@ impl<B, C, E, I, Error, SO> sc_consensus_slots::SimpleSlotWorker<B> for BabeSlot
 	E::Proposer: Proposer<B, Error = Error, Transaction = sp_api::TransactionFor<C, B>>,
 	I: BlockImport<B, Transaction = sp_api::TransactionFor<C, B>> + Send + Sync + 'static,
 	SO: SyncOracle + Send + Clone,
+	BS: BackoffAuthoringBlocksStrategy<NumberFor<B>>,
 	Error: std::error::Error + Send + From<ConsensusError> + From<I::Error> + 'static,
 {
 	type EpochData = ViableEpochDescriptor<B::Hash, NumberFor<B>, Epoch>;
@@ -657,6 +668,23 @@ impl<B, C, E, I, Error, SO> sc_consensus_slots::SimpleSlotWorker<B> for BabeSlot
 		self.force_authoring
 	}
 
+	fn should_backoff(&self, slot_number: u64, chain_head: &B::Header) -> bool {
+		if let Some(ref strategy) = self.backoff_authoring_blocks {
+			if let Ok(chain_head_slot) = find_pre_digest::<B>(chain_head)
+				.map(|digest| digest.slot_number())
+			{
+				return strategy.should_backoff(
+					*chain_head.number(),
+					chain_head_slot,
+					self.client.info().finalized_number,
+					slot_number,
+					self.logging_target(),
+				);
+			}
+		}
+		false
+	}
+
 	fn sync_oracle(&mut self) -> &mut Self::SyncOracle {
 		&mut self.sync_oracle
 	}
diff --git a/client/consensus/babe/src/tests.rs b/client/consensus/babe/src/tests.rs
index 6b0f5870ba53..b31699d13e0c 100644
--- a/client/consensus/babe/src/tests.rs
+++ b/client/consensus/babe/src/tests.rs
@@ -33,6 +33,7 @@ use sp_consensus_babe::{
 	make_transcript,
 	make_transcript_data,
 };
+use sc_consensus_slots::BackoffAuthoringOnFinalizedHeadLagging;
 use sc_block_builder::{BlockBuilder, BlockBuilderProvider};
 use sp_consensus::{
 	NoNetwork as DummyOracle, Proposal, RecordProof, AlwaysCanAuthor,
@@ -434,6 +435,7 @@ fn run_one_test(
 			sync_oracle: DummyOracle,
 			inherent_data_providers: data.inherent_data_providers.clone(),
 			force_authoring: false,
+			backoff_authoring_blocks: Some(BackoffAuthoringOnFinalizedHeadLagging::default()),
 			babe_link: data.link.clone(),
 			keystore,
 			can_author_with: sp_consensus::AlwaysCanAuthor,
diff --git a/client/consensus/slots/Cargo.toml b/client/consensus/slots/Cargo.toml
index a13a712fe76b..d07ef49835b2 100644
--- a/client/consensus/slots/Cargo.toml
+++ b/client/consensus/slots/Cargo.toml
@@ -19,6 +19,7 @@ sc-client-api = { version = "2.0.0", path = "../../api" }
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
 sp-trie = { version = "2.0.0", path = "../../../primitives/trie" }
 sp-application-crypto = { version = "2.0.0", path = "../../../primitives/application-crypto" }
+sp-arithmetic = { version = "2.0.0", path = "../../../primitives/arithmetic" }
 sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
 sp-consensus-slots = { version = "0.8.0", path = "../../../primitives/consensus/slots" }
 sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
diff --git a/client/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs
index 681d4a6273ed..d8601a7c12c6 100644
--- a/client/consensus/slots/src/lib.rs
+++ b/client/consensus/slots/src/lib.rs
@@ -29,18 +29,21 @@ pub use slots::SlotInfo;
 use slots::Slots;
 pub use aux_schema::{check_equivocation, MAX_SLOT_CAPACITY, PRUNING_BOUND};
 
+use std::{fmt::Debug, ops::Deref, pin::Pin, sync::Arc, time::{Instant, Duration}};
 use codec::{Decode, Encode};
-use sp_consensus::{BlockImport, Proposer, SyncOracle, SelectChain, CanAuthorWith, SlotData, RecordProof};
 use futures::{prelude::*, future::{self, Either}};
 use futures_timer::Delay;
-use sp_inherents::{InherentData, InherentDataProviders};
 use log::{debug, error, info, warn};
-use sp_runtime::generic::BlockId;
-use sp_runtime::traits::{Block as BlockT, Header, HashFor, NumberFor};
+use parking_lot::Mutex;
 use sp_api::{ProvideRuntimeApi, ApiRef};
-use std::{fmt::Debug, ops::Deref, pin::Pin, sync::Arc, time::{Instant, Duration}};
+use sp_arithmetic::traits::BaseArithmetic;
+use sp_consensus::{BlockImport, Proposer, SyncOracle, SelectChain, CanAuthorWith, SlotData, RecordProof};
+use sp_inherents::{InherentData, InherentDataProviders};
+use sp_runtime::{
+	generic::BlockId,
+	traits::{Block as BlockT, Header, HashFor, NumberFor}
+};
 use sc_telemetry::{telemetry, CONSENSUS_DEBUG, CONSENSUS_WARN, CONSENSUS_INFO};
-use parking_lot::Mutex;
 
 /// The changes that need to applied to the storage to create the state for a block.
 ///
@@ -158,6 +161,16 @@ pub trait SimpleSlotWorker<B: BlockT> {
 	/// Whether to force authoring if offline.
 	fn force_authoring(&self) -> bool;
 
+	/// Returns whether the block production should back off.
+	///
+	/// By default this function always returns `false`.
+	///
+	/// An example strategy that back offs if the finalized head is lagging too much behind the tip
+	/// is implemented by [`BackoffAuthoringOnFinalizedHeadLagging`].
+	fn should_backoff(&self, _slot_number: u64, _chain_head: &B::Header) -> bool {
+		false
+	}
+
 	/// Returns a handle to a `SyncOracle`.
 	fn sync_oracle(&mut self) -> &mut Self::SyncOracle;
 
@@ -249,6 +262,10 @@ pub trait SimpleSlotWorker<B: BlockT> {
 			Some(claim) => claim,
 		};
 
+		if self.should_backoff(slot_number, &chain_head) {
+			return Box::pin(future::ready(None));
+		}
+
 		debug!(
 			target: self.logging_target(),
 			"Starting authorship at slot {}; timestamp = {}",
@@ -583,9 +600,110 @@ pub fn slot_lenience_linear(parent_slot: u64, slot_info: &SlotInfo) -> Option<Du
 	}
 }
 
+/// Trait for providing the strategy for when to backoff block authoring.
+pub trait BackoffAuthoringBlocksStrategy<N> {
+	/// Returns true if we should backoff authoring new blocks.
+	fn should_backoff(
+		&self,
+		chain_head_number: N,
+		chain_head_slot: u64,
+		finalized_number: N,
+		slow_now: u64,
+		logging_target: &str,
+	) -> bool;
+}
+
+/// A simple default strategy for how to decide backing off authoring blocks if the number of
+/// unfinalized blocks grows too large.
+#[derive(Clone)]
+pub struct BackoffAuthoringOnFinalizedHeadLagging<N> {
+	/// The max interval to backoff when authoring blocks, regardless of delay in finality.
+	pub max_interval: N,
+	/// The number of unfinalized blocks allowed before starting to consider to backoff authoring
+	/// blocks. Note that depending on the value for `authoring_bias`, there might still be an
+	/// additional wait until block authorship starts getting declined.
+	pub unfinalized_slack: N,
+	/// Scales the backoff rate. A higher value effectively means we backoff slower, taking longer
+	/// time to reach the maximum backoff as the unfinalized head of chain grows.
+	pub authoring_bias: N,
+}
+
+/// These parameters is supposed to be some form of sensible defaults.
+impl<N: BaseArithmetic> Default for BackoffAuthoringOnFinalizedHeadLagging<N> {
+	fn default() -> Self {
+		Self {
+			// Never wait more than 100 slots before authoring blocks, regardless of delay in
+			// finality.
+			max_interval: 100.into(),
+			// Start to consider backing off block authorship once we have 50 or more unfinalized
+			// blocks at the head of the chain.
+			unfinalized_slack: 50.into(),
+			// A reasonable default for the authoring bias, or reciprocal interval scaling, is 2.
+			// Effectively meaning that consider the unfinalized head suffix length to grow half as
+			// fast as in actuality.
+			authoring_bias: 2.into(),
+		}
+	}
+}
+
+impl<N> BackoffAuthoringBlocksStrategy<N> for BackoffAuthoringOnFinalizedHeadLagging<N>
+where
+	N: BaseArithmetic + Copy
+{
+	fn should_backoff(
+		&self,
+		chain_head_number: N,
+		chain_head_slot: u64,
+		finalized_number: N,
+		slot_now: u64,
+		logging_target: &str,
+	) -> bool {
+		// This should not happen, but we want to keep the previous behaviour if it does.
+		if slot_now <= chain_head_slot {
+			return false;
+		}
+
+		let unfinalized_block_length = chain_head_number - finalized_number;
+		let interval = unfinalized_block_length.saturating_sub(self.unfinalized_slack)
+			/ self.authoring_bias;
+		let interval = interval.min(self.max_interval);
+
+		// We're doing arithmetic between block and slot numbers.
+		let interval: u64 = interval.unique_saturated_into();
+
+		// If interval is nonzero we backoff if the current slot isn't far enough ahead of the chain
+		// head.
+		if slot_now <= chain_head_slot + interval {
+			info!(
+				target: logging_target,
+				"Backing off claiming new slot for block authorship: finality is lagging.",
+			);
+			true
+		} else {
+			false
+		}
+	}
+}
+
+impl<N> BackoffAuthoringBlocksStrategy<N> for () {
+	fn should_backoff(
+		&self,
+		_chain_head_number: N,
+		_chain_head_slot: u64,
+		_finalized_number: N,
+		_slot_now: u64,
+		_logging_target: &str,
+	) -> bool {
+		false
+	}
+}
+
 #[cfg(test)]
 mod test {
 	use std::time::{Duration, Instant};
+	use crate::{BackoffAuthoringOnFinalizedHeadLagging, BackoffAuthoringBlocksStrategy};
+	use substrate_test_runtime_client::runtime::Block;
+	use sp_api::NumberFor;
 
 	const SLOT_DURATION: Duration = Duration::from_millis(6000);
 
@@ -644,4 +762,343 @@ mod test {
 			Some(SLOT_DURATION * 2u32.pow(7)),
 		);
 	}
+
+	#[derive(PartialEq, Debug)]
+	struct HeadState {
+		head_number: NumberFor<Block>,
+		head_slot: u64,
+		slot_now: NumberFor<Block>,
+	}
+
+	impl HeadState {
+		fn author_block(&mut self) {
+			// Add a block to the head, and set latest slot to the current
+			self.head_number += 1;
+			self.head_slot = self.slot_now;
+			// Advance slot to next
+			self.slot_now += 1;
+		}
+
+		fn dont_author_block(&mut self) {
+			self.slot_now += 1;
+		}
+	}
+
+	#[test]
+	fn should_never_backoff_when_head_not_advancing() {
+		let strategy = BackoffAuthoringOnFinalizedHeadLagging::<NumberFor<Block>> {
+			max_interval: 100,
+			unfinalized_slack: 5,
+			authoring_bias: 2,
+		};
+
+		let head_number = 1;
+		let head_slot = 1;
+		let finalized_number = 1;
+		let slot_now = 2;
+
+		let should_backoff: Vec<bool> = (slot_now..1000)
+			.map(|s| strategy.should_backoff(head_number, head_slot, finalized_number, s, "slots"))
+			.collect();
+
+		// Should always be false, since the head isn't advancing
+		let expected: Vec<bool> = (slot_now..1000).map(|_| false).collect();
+		assert_eq!(should_backoff, expected);
+	}
+
+	#[test]
+	fn should_stop_authoring_if_blocks_are_still_produced_when_finality_stalled() {
+		let strategy = BackoffAuthoringOnFinalizedHeadLagging::<NumberFor<Block>> {
+			max_interval: 100,
+			unfinalized_slack: 5,
+			authoring_bias: 2,
+		};
+
+		let mut head_number = 1;
+		let mut head_slot = 1;
+		let finalized_number = 1;
+		let slot_now = 2;
+
+		let should_backoff: Vec<bool> = (slot_now..300)
+			.map(move |s| {
+				let b = strategy.should_backoff(
+					head_number,
+					head_slot,
+					finalized_number,
+					s,
+					"slots",
+				);
+				// Chain is still advancing (by someone else)
+				head_number += 1;
+				head_slot = s;
+				b
+			})
+			.collect();
+
+		// Should always be true after a short while, since the chain is advancing but finality is stalled
+		let expected: Vec<bool> = (slot_now..300).map(|s| s > 8).collect();
+		assert_eq!(should_backoff, expected);
+	}
+
+	#[test]
+	fn should_never_backoff_if_max_interval_is_reached() {
+		let strategy = BackoffAuthoringOnFinalizedHeadLagging::<NumberFor<Block>> {
+			max_interval: 100,
+			unfinalized_slack: 5,
+			authoring_bias: 2,
+		};
+
+		// The limit `max_interval` is used when the unfinalized chain grows to
+		// 	`max_interval * authoring_bias + unfinalized_slack`,
+		// which for the above parameters becomes
+		// 	100 * 2 + 5 = 205.
+		// Hence we trigger this with head_number > finalized_number + 205.
+		let head_number = 207;
+		let finalized_number = 1;
+
+		// The limit is then used once the current slot is `max_interval` ahead of slot of the head.
+		let head_slot = 1;
+		let slot_now = 2;
+		let max_interval = strategy.max_interval;
+
+		let should_backoff: Vec<bool> = (slot_now..200)
+			.map(|s| strategy.should_backoff(head_number, head_slot, finalized_number, s, "slots"))
+			.collect();
+
+		// Should backoff (true) until we are `max_interval` number of slots ahead of the chain
+		// head slot, then we never backoff (false).
+		let expected: Vec<bool> = (slot_now..200).map(|s| s <= max_interval + head_slot).collect();
+		assert_eq!(should_backoff, expected);
+	}
+
+	#[test]
+	fn should_backoff_authoring_when_finality_stalled() {
+		let param = BackoffAuthoringOnFinalizedHeadLagging {
+			max_interval: 100,
+			unfinalized_slack: 5,
+			authoring_bias: 2,
+		};
+
+		let finalized_number = 2;
+		let mut head_state = HeadState {
+			head_number: 4,
+			head_slot: 10,
+			slot_now: 11,
+		};
+
+		let should_backoff = |head_state: &HeadState| -> bool {
+			<dyn BackoffAuthoringBlocksStrategy<NumberFor<Block>>>::should_backoff(
+				&param,
+				head_state.head_number,
+				head_state.head_slot,
+				finalized_number,
+				head_state.slot_now,
+				"slots",
+			)
+		};
+
+		let backoff: Vec<bool> = (head_state.slot_now..200)
+			.map(|_| {
+				if should_backoff(&head_state) {
+					head_state.dont_author_block();
+					true
+				} else {
+					head_state.author_block();
+					false
+				}
+			})
+			.collect();
+
+		// Gradually start to backoff more and more frequently
+		let expected = [
+			false, false, false, false, false, // no effect
+			true, false,
+			true, false, // 1:1
+			true, true, false,
+			true, true, false, // 2:1
+			true, true, true, false,
+			true, true, true, false, // 3:1
+			true, true, true, true, false,
+			true, true, true, true, false, // 4:1
+			true, true, true, true, true, false,
+			true, true, true, true, true, false, // 5:1
+			true, true, true, true, true, true, false,
+			true, true, true, true, true, true, false, // 6:1
+			true, true, true, true, true, true, true, false,
+			true, true, true, true, true, true, true, false, // 7:1
+			true, true, true, true, true, true, true, true, false,
+			true, true, true, true, true, true, true, true, false, // 8:1
+			true, true, true, true, true, true, true, true, true, false,
+			true, true, true, true, true, true, true, true, true, false, // 9:1
+			true, true, true, true, true, true, true, true, true, true, false,
+			true, true, true, true, true, true, true, true, true, true, false, // 10:1
+			true, true, true, true, true, true, true, true, true, true, true, false,
+			true, true, true, true, true, true, true, true, true, true, true, false, // 11:1
+			true, true, true, true, true, true, true, true, true, true, true, true, false,
+			true, true, true, true, true, true, true, true, true, true, true, true, false, // 12:1
+			true, true, true, true,
+	];
+
+		assert_eq!(backoff, expected);
+	}
+
+	#[test]
+	fn should_never_wait_more_than_max_interval() {
+		let param = BackoffAuthoringOnFinalizedHeadLagging {
+			max_interval: 100,
+			unfinalized_slack: 5,
+			authoring_bias: 2,
+		};
+
+		let finalized_number = 2;
+		let starting_slot = 11;
+		let mut head_state = HeadState {
+			head_number: 4,
+			head_slot: 10,
+			slot_now: starting_slot,
+		};
+
+		let should_backoff = |head_state: &HeadState| -> bool {
+			<dyn BackoffAuthoringBlocksStrategy<NumberFor<Block>>>::should_backoff(
+				&param,
+				head_state.head_number,
+				head_state.head_slot,
+				finalized_number,
+				head_state.slot_now,
+				"slots",
+			)
+		};
+
+		let backoff: Vec<bool> = (head_state.slot_now..40000)
+			.map(|_| {
+				if should_backoff(&head_state) {
+					head_state.dont_author_block();
+					true
+				} else {
+					head_state.author_block();
+					false
+				}
+			})
+			.collect();
+
+		let slots_claimed: Vec<usize> = backoff
+			.iter()
+			.enumerate()
+			.filter(|&(_i, x)| x == &false)
+			.map(|(i, _x)| i + starting_slot as usize)
+			.collect();
+
+		let last_slot = backoff.len() + starting_slot as usize;
+		let mut last_two_claimed = slots_claimed.iter().rev().take(2);
+
+		// Check that we claimed all the way to the end. Check two slots for when we have an uneven
+		// number of slots_claimed.
+		let expected_distance = param.max_interval as usize + 1;
+		assert_eq!(last_slot - last_two_claimed.next().unwrap(), 92);
+		assert_eq!(last_slot - last_two_claimed.next().unwrap(), 92 + expected_distance);
+
+		let intervals: Vec<_> = slots_claimed
+			.windows(2)
+			.map(|x| x[1] - x[0])
+			.collect();
+
+		// The key thing is that the distance between claimed slots is capped to `max_interval + 1`
+		// assert_eq!(max_observed_interval, Some(&expected_distance));
+		assert_eq!(intervals.iter().max(), Some(&expected_distance));
+
+		// But lets assert all distances, which we expect to grow linearly until `max_interval + 1`
+		let expected_intervals: Vec<_> = (0..497)
+			.map(|i| (i/2).max(1).min(expected_distance) )
+			.collect();
+
+		assert_eq!(intervals, expected_intervals);
+	}
+
+	fn run_until_max_interval(param: BackoffAuthoringOnFinalizedHeadLagging<u64>) -> (u64, u64) {
+		let finalized_number = 0;
+		let mut head_state = HeadState {
+			head_number: 0,
+			head_slot: 0,
+			slot_now: 1,
+		};
+
+		let should_backoff = |head_state: &HeadState| -> bool {
+			<dyn BackoffAuthoringBlocksStrategy<NumberFor<Block>>>::should_backoff(
+				&param,
+				head_state.head_number,
+				head_state.head_slot,
+				finalized_number,
+				head_state.slot_now,
+				"slots",
+			)
+		};
+
+		// Number of blocks until we reach the max interval
+		let block_for_max_interval
+			= param.max_interval * param.authoring_bias + param.unfinalized_slack;
+
+		while head_state.head_number < block_for_max_interval {
+			if should_backoff(&head_state) {
+				head_state.dont_author_block();
+			} else {
+				head_state.author_block();
+			}
+		}
+
+		let slot_time = 6;
+		let time_to_reach_limit = slot_time * head_state.slot_now;
+		(block_for_max_interval, time_to_reach_limit)
+	}
+
+	// Denoting
+	//	C: unfinalized_slack
+	//	M: authoring_bias
+	//	X: max_interval
+	// then the number of slots to reach the max interval can be computed from
+	//	(start_slot + C) + M * sum(n, 1, X)
+	// or
+	//	(start_slot + C) + M * X*(X+1)/2
+	fn expected_time_to_reach_max_interval(
+		param: &BackoffAuthoringOnFinalizedHeadLagging<u64>
+	) -> (u64, u64) {
+		let c = param.unfinalized_slack;
+		let m = param.authoring_bias;
+		let x = param.max_interval;
+		let slot_time = 6;
+
+		let block_for_max_interval = x * m + c;
+
+		// The 1 is because we start at slot_now = 1.
+		let expected_number_of_slots = (1 + c) + m * x * (x + 1) / 2;
+		let time_to_reach = expected_number_of_slots * slot_time;
+
+		(block_for_max_interval, time_to_reach)
+	}
+
+	#[test]
+	fn time_to_reach_upper_bound_for_smaller_slack() {
+		let param = BackoffAuthoringOnFinalizedHeadLagging {
+			max_interval: 100,
+			unfinalized_slack: 5,
+			authoring_bias: 2,
+		};
+		let expected = expected_time_to_reach_max_interval(&param);
+		let (block_for_max_interval, time_to_reach_limit) = run_until_max_interval(param);
+		assert_eq!((block_for_max_interval, time_to_reach_limit), expected);
+		// Note: 16 hours is 57600 sec
+		assert_eq!((block_for_max_interval, time_to_reach_limit), (205, 60636));
+	}
+
+	#[test]
+	fn time_to_reach_upper_bound_for_larger_slack() {
+		let param = BackoffAuthoringOnFinalizedHeadLagging {
+			max_interval: 100,
+			unfinalized_slack: 50,
+			authoring_bias: 2,
+		};
+		let expected = expected_time_to_reach_max_interval(&param);
+		let (block_for_max_interval, time_to_reach_limit) = run_until_max_interval(param);
+		assert_eq!((block_for_max_interval, time_to_reach_limit), expected);
+		assert_eq!((block_for_max_interval, time_to_reach_limit), (250, 60906));
+	}
 }

From 71d027841a57a6bfa0549218923e78477cf96a0a Mon Sep 17 00:00:00 2001
From: Wei Tang <wei@that.world>
Date: Wed, 11 Nov 2020 18:19:27 +0100
Subject: [PATCH 0066/1194] Export app-crypto specific keystore functions
 (#7489)

* Export app-crypto specific keystore functions

* Also add back the insert function

* Switch KeystoreContainer to an enum

* Only export the bare minimal for LocalKeystore and fix service compile

* fix: should return Arc

* Add docs stating that functions only available in local keystore

* Remove insert and generate functions

* fix: generate function should be available in test

* Add keypair function to trait

* Revert "Add keypair function to trait"

This reverts commit ad921b09ca73d3c09298e3a51b562ef8e0067781.

* Add note for local_keystore function in service
---
 client/keystore/src/local.rs  | 94 +++++++++++++++++------------------
 client/service/src/builder.rs | 37 ++++++++++----
 2 files changed, 71 insertions(+), 60 deletions(-)

diff --git a/client/keystore/src/local.rs b/client/keystore/src/local.rs
index 856327d46f6e..e0b95a08d5ca 100644
--- a/client/keystore/src/local.rs
+++ b/client/keystore/src/local.rs
@@ -38,7 +38,7 @@ use sp_keystore::{
 	SyncCryptoStore,
 	vrf::{VRFTranscriptData, VRFSignature, make_transcript},
 };
-use sp_application_crypto::{ed25519, sr25519, ecdsa};
+use sp_application_crypto::{ed25519, sr25519, ecdsa, AppPair, AppKey, IsWrappedBy};
 
 use crate::{Result, Error};
 
@@ -57,6 +57,14 @@ impl LocalKeystore {
 		let inner = KeystoreInner::new_in_memory();
 		Self(RwLock::new(inner))
 	}
+
+	/// Get a key pair for the given public key.
+	///
+	/// This function is only available for a local keystore. If your application plans to work with
+	/// remote keystores, you do not want to depend on it.
+	pub fn key_pair<Pair: AppPair>(&self, public: &<Pair as AppKey>::Public) -> Result<Pair> {
+		self.0.read().key_pair::<Pair>(public)
+	}
 }
 
 #[async_trait]
@@ -470,6 +478,11 @@ impl KeystoreInner {
 
 		Ok(public_keys)
 	}
+
+	/// Get a key pair for the given public key.
+	pub fn key_pair<Pair: AppPair>(&self, public: &<Pair as AppKey>::Public) -> Result<Pair> {
+		self.key_pair_by_type::<Pair::Generic>(IsWrappedBy::from_ref(public), Pair::ID).map(Into::into)
+	}
 }
 
 
@@ -479,47 +492,32 @@ mod tests {
 	use tempfile::TempDir;
 	use sp_core::{
 		Pair,
-		crypto::{IsWrappedBy, Ss58Codec},
+		crypto::Ss58Codec,
 		testing::SR25519,
 	};
-	use sp_application_crypto::{ed25519, sr25519, AppPublic, AppKey, AppPair};
+	use sp_application_crypto::{ed25519, sr25519, AppPublic};
 	use std::{
 		fs,
 		str::FromStr,
 	};
 
-	/// Generate a new key.
-	///
-	/// Places it into the file system store.
-	fn generate<Pair: AppPair>(store: &KeystoreInner) -> Result<Pair> {
-		store.generate_by_type::<Pair::Generic>(Pair::ID).map(Into::into)
-	}
-
-	/// Create a new key from seed.
-	///
-	/// Does not place it into the file system store.
-	fn insert_ephemeral_from_seed<Pair: AppPair>(store: &mut KeystoreInner, seed: &str) -> Result<Pair> {
-		store.insert_ephemeral_from_seed_by_type::<Pair::Generic>(seed, Pair::ID).map(Into::into)
-	}
+	impl KeystoreInner {
+		fn insert_ephemeral_from_seed<Pair: AppPair>(&mut self, seed: &str) -> Result<Pair> {
+			self.insert_ephemeral_from_seed_by_type::<Pair::Generic>(seed, Pair::ID).map(Into::into)
+		}
 
-	/// Get public keys of all stored keys that match the key type.
-	///
-	/// This will just use the type of the public key (a list of which to be returned) in order
-	/// to determine the key type. Unless you use a specialized application-type public key, then
-	/// this only give you keys registered under generic cryptography, and will not return keys
-	/// registered under the application type.
-	fn public_keys<Public: AppPublic>(store: &KeystoreInner) -> Result<Vec<Public>> {
-		store.raw_public_keys(Public::ID)
-			.map(|v| {
-				v.into_iter()
-				 .map(|k| Public::from_slice(k.as_slice()))
-				 .collect()
-			})
-	}
+		fn public_keys<Public: AppPublic>(&self) -> Result<Vec<Public>> {
+			self.raw_public_keys(Public::ID)
+				.map(|v| {
+					v.into_iter()
+						.map(|k| Public::from_slice(k.as_slice()))
+						.collect()
+				})
+		}
 
-	/// Get a key pair for the given public key.
-	fn key_pair<Pair: AppPair>(store: &KeystoreInner, public: &<Pair as AppKey>::Public) -> Result<Pair> {
-		store.key_pair_by_type::<Pair::Generic>(IsWrappedBy::from_ref(public), Pair::ID).map(Into::into)
+		fn generate<Pair: AppPair>(&self) -> Result<Pair> {
+			self.generate_by_type::<Pair::Generic>(Pair::ID).map(Into::into)
+		}
 	}
 
 	#[test]
@@ -527,14 +525,14 @@ mod tests {
 		let temp_dir = TempDir::new().unwrap();
 		let store = KeystoreInner::open(temp_dir.path(), None).unwrap();
 
-		assert!(public_keys::<ed25519::AppPublic>(&store).unwrap().is_empty());
+		assert!(store.public_keys::<ed25519::AppPublic>().unwrap().is_empty());
 
-		let key: ed25519::AppPair = generate(&store).unwrap();
-		let key2: ed25519::AppPair = key_pair(&store, &key.public()).unwrap();
+		let key: ed25519::AppPair = store.generate().unwrap();
+		let key2: ed25519::AppPair = store.key_pair(&key.public()).unwrap();
 
 		assert_eq!(key.public(), key2.public());
 
-		assert_eq!(public_keys::<ed25519::AppPublic>(&store).unwrap()[0], key.public());
+		assert_eq!(store.public_keys::<ed25519::AppPublic>().unwrap()[0], key.public());
 	}
 
 	#[test]
@@ -542,8 +540,7 @@ mod tests {
 		let temp_dir = TempDir::new().unwrap();
 		let mut store = KeystoreInner::open(temp_dir.path(), None).unwrap();
 
-		let pair: ed25519::AppPair = insert_ephemeral_from_seed(
-			&mut store,
+		let pair: ed25519::AppPair = store.insert_ephemeral_from_seed(
 			"0x3d97c819d68f9bafa7d6e79cb991eebcd77d966c5334c0b94d9e1fa7ad0869dc"
 		).unwrap();
 		assert_eq!(
@@ -554,7 +551,7 @@ mod tests {
 		drop(store);
 		let store = KeystoreInner::open(temp_dir.path(), None).unwrap();
 		// Keys generated from seed should not be persisted!
-		assert!(key_pair::<ed25519::AppPair>(&store, &pair.public()).is_err());
+		assert!(store.key_pair::<ed25519::AppPair>(&pair.public()).is_err());
 	}
 
 	#[test]
@@ -566,15 +563,15 @@ mod tests {
 			Some(FromStr::from_str(password.as_str()).unwrap()),
 		).unwrap();
 
-		let pair: ed25519::AppPair = generate(&store).unwrap();
+		let pair: ed25519::AppPair = store.generate().unwrap();
 		assert_eq!(
 			pair.public(),
-			key_pair::<ed25519::AppPair>(&store, &pair.public()).unwrap().public(),
+			store.key_pair::<ed25519::AppPair>(&pair.public()).unwrap().public(),
 		);
 
 		// Without the password the key should not be retrievable
 		let store = KeystoreInner::open(temp_dir.path(), None).unwrap();
-		assert!(key_pair::<ed25519::AppPair>(&store, &pair.public()).is_err());
+		assert!(store.key_pair::<ed25519::AppPair>(&pair.public()).is_err());
 
 		let store = KeystoreInner::open(
 			temp_dir.path(),
@@ -582,7 +579,7 @@ mod tests {
 		).unwrap();
 		assert_eq!(
 			pair.public(),
-			key_pair::<ed25519::AppPair>(&store, &pair.public()).unwrap().public(),
+			store.key_pair::<ed25519::AppPair>(&pair.public()).unwrap().public(),
 		);
 	}
 
@@ -593,18 +590,17 @@ mod tests {
 
 		let mut keys = Vec::new();
 		for i in 0..10 {
-			keys.push(generate::<ed25519::AppPair>(&store).unwrap().public());
-			keys.push(insert_ephemeral_from_seed::<ed25519::AppPair>(
-				&mut store,
+			keys.push(store.generate::<ed25519::AppPair>().unwrap().public());
+			keys.push(store.insert_ephemeral_from_seed::<ed25519::AppPair>(
 				&format!("0x3d97c819d68f9bafa7d6e79cb991eebcd7{}d966c5334c0b94d9e1fa7ad0869dc", i),
 			).unwrap().public());
 		}
 
 		// Generate a key of a different type
-		generate::<sr25519::AppPair>(&store).unwrap();
+		store.generate::<sr25519::AppPair>().unwrap();
 
 		keys.sort();
-		let mut store_pubs = public_keys::<ed25519::AppPublic>(&store).unwrap();
+		let mut store_pubs = store.public_keys::<ed25519::AppPublic>().unwrap();
 		store_pubs.sort();
 
 		assert_eq!(keys, store_pubs);
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index 2a4dda477ab7..7d613f2bc629 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -205,12 +205,13 @@ pub type TLightClientWithBackend<TBl, TRtApi, TExecDisp, TBackend> = Client<
 	TRtApi,
 >;
 
-/// Construct and hold different layers of Keystore wrappers
-pub struct KeystoreContainer {
-	keystore: Arc<dyn CryptoStore>,
-	sync_keystore: SyncCryptoStorePtr,
+enum KeystoreContainerInner {
+	Local(Arc<LocalKeystore>)
 }
 
+/// Construct and hold different layers of Keystore wrappers
+pub struct KeystoreContainer(KeystoreContainerInner);
+
 impl KeystoreContainer {
 	/// Construct KeystoreContainer
 	pub fn new(config: &KeystoreConfig) -> Result<Self, Error> {
@@ -221,22 +222,36 @@ impl KeystoreContainer {
 			)?,
 			KeystoreConfig::InMemory => LocalKeystore::in_memory(),
 		});
-		let sync_keystore = keystore.clone() as SyncCryptoStorePtr;
 
-		Ok(Self {
-			keystore,
-			sync_keystore,
-		})
+		Ok(Self(KeystoreContainerInner::Local(keystore)))
 	}
 
 	/// Returns an adapter to the asynchronous keystore that implements `CryptoStore`
 	pub fn keystore(&self) -> Arc<dyn CryptoStore> {
-		self.keystore.clone()
+		match self.0 {
+			KeystoreContainerInner::Local(ref keystore) => keystore.clone(),
+		}
 	}
 
 	/// Returns the synchrnous keystore wrapper
 	pub fn sync_keystore(&self) -> SyncCryptoStorePtr {
-		self.sync_keystore.clone()
+		match self.0 {
+			KeystoreContainerInner::Local(ref keystore) => keystore.clone() as SyncCryptoStorePtr,
+		}
+	}
+
+	/// Returns the local keystore if available
+	///
+	/// The function will return None if the available keystore is not a local keystore.
+	///
+	/// # Note
+	///
+	/// Using the [`LocalKeystore`] will result in loosing the ability to use any other keystore implementation, like
+	/// a remote keystore for example. Only use this if you a certain that you require it!
+	pub fn local_keystore(&self) -> Option<Arc<LocalKeystore>> {
+		match self.0 {
+			KeystoreContainerInner::Local(ref keystore) => Some(keystore.clone()),
+		}
 	}
 }
 

From 210300dc38713461a5537cb1752c87736670d3ee Mon Sep 17 00:00:00 2001
From: Sergei Shulepov <sergei@parity.io>
Date: Thu, 12 Nov 2020 02:08:22 +0100
Subject: [PATCH 0067/1194] Update doc for the --chain flag (#7520)

---
 client/cli/src/params/shared_params.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/cli/src/params/shared_params.rs b/client/cli/src/params/shared_params.rs
index ad9ab0407056..3276e5b7c4ba 100644
--- a/client/cli/src/params/shared_params.rs
+++ b/client/cli/src/params/shared_params.rs
@@ -23,7 +23,10 @@ use structopt::StructOpt;
 /// Shared parameters used by all `CoreParams`.
 #[derive(Debug, StructOpt)]
 pub struct SharedParams {
-	/// Specify the chain specification (one of dev, local, or staging).
+	/// Specify the chain specification.
+	///
+	/// It can be one of the predefined ones (dev, local, or staging) or it can be a path to a file with
+	/// the chainspec (such as one exported by the `build-spec` subcommand).
 	#[structopt(long, value_name = "CHAIN_SPEC")]
 	pub chain: Option<String>,
 

From e26a46a805d68ce55457d67552ba71b76421f708 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Thu, 12 Nov 2020 16:45:51 +0100
Subject: [PATCH 0068/1194] contracts: Add missing instruction to the
 `Schedule` (#7527)

---
 frame/contracts/src/schedule.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frame/contracts/src/schedule.rs b/frame/contracts/src/schedule.rs
index 24f8bb0a02c3..ff2cde229711 100644
--- a/frame/contracts/src/schedule.rs
+++ b/frame/contracts/src/schedule.rs
@@ -607,6 +607,7 @@ impl<'a, T: Trait> rules::Rules for ScheduleRules<'a, T> {
 			I32Clz | I64Clz => w.i64clz,
 			I32Ctz | I64Ctz => w.i64ctz,
 			I32Popcnt | I64Popcnt => w.i64popcnt,
+			I32Eqz | I64Eqz => w.i64eqz,
 			I64ExtendSI32 => w.i64extendsi32,
 			I64ExtendUI32 => w.i64extendui32,
 			I32WrapI64 => w.i32wrapi64,

From 02771e146f126a9759a62948ec8a2edd6ad47ee9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Thu, 12 Nov 2020 20:01:58 +0100
Subject: [PATCH 0069/1194] Don't log with colors when we are writing to a tty
 (#7525)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Don't log with colors when we are writing to a tty

This fixes a regression that was introduced by the switch to tracing.
Before we killed all colors before writing to a tty, this pr brings the
behaviour back.

* Remove accidentally added crate

* Review feedback

* More feedback

* Update client/cli/src/logging.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Update client/cli/src/logging.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
---
 Cargo.lock                  |  9 +++---
 client/cli/Cargo.toml       |  3 +-
 client/cli/src/lib.rs       | 46 ++++++++++++++++++++++++-----
 client/cli/src/logging.rs   | 59 +++++++++++++++++++++++++++++++++----
 client/informant/src/lib.rs |  4 ++-
 5 files changed, 102 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 62cb03dedafa..7c9bdc4305d1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6204,9 +6204,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.3.9"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
+checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -6226,9 +6226,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.18"
+version = "0.6.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
+checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
 
 [[package]]
 name = "region"
@@ -6549,6 +6549,7 @@ dependencies = [
  "fdlimit",
  "futures 0.3.5",
  "hex",
+ "lazy_static",
  "libp2p",
  "log",
  "names",
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index b7e798a3ba1c..51c499828ac2 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -15,7 +15,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 log = "0.4.11"
 atty = "0.2.13"
-regex = "1.3.4"
+regex = "1.4.2"
+lazy_static = "1.4.0"
 ansi_term = "0.12.1"
 tokio = { version = "0.2.21", features = [ "signal", "rt-core", "rt-threaded", "blocking" ] }
 futures = "0.3.4"
diff --git a/client/cli/src/lib.rs b/client/cli/src/lib.rs
index c25693dc418b..b543f80a9d3b 100644
--- a/client/cli/src/lib.rs
+++ b/client/cli/src/lib.rs
@@ -47,13 +47,13 @@ use structopt::{
 	clap::{self, AppSettings},
 	StructOpt,
 };
-#[doc(hidden)]
-pub use tracing;
 use tracing_subscriber::{
 	filter::Directive, fmt::time::ChronoLocal, layer::SubscriberExt, FmtSubscriber, Layer,
 };
 
 pub use logging::PREFIX_LOG_SPAN;
+#[doc(hidden)]
+pub use tracing;
 
 /// Substrate client CLI
 ///
@@ -308,8 +308,7 @@ pub fn init_logger(
 		}
 	}
 
-	let isatty = atty::is(atty::Stream::Stderr);
-	let enable_color = isatty;
+	let enable_color = atty::is(atty::Stream::Stderr);
 	let timer = ChronoLocal::with_format(if simple {
 		"%Y-%m-%d %H:%M:%S".to_string()
 	} else {
@@ -321,12 +320,13 @@ pub fn init_logger(
 		.with_writer(std::io::stderr)
 		.event_format(logging::EventFormat {
 			timer,
-			ansi: enable_color,
 			display_target: !simple,
 			display_level: !simple,
 			display_thread_name: !simple,
+			enable_color,
 		})
-		.finish().with(logging::NodeNameLayer);
+		.finish()
+		.with(logging::NodeNameLayer);
 
 	if let Some(profiling_targets) = profiling_targets {
 		let profiling = sc_tracing::ProfilingLayer::new(tracing_receiver, &profiling_targets);
@@ -450,8 +450,7 @@ mod tests {
 	#[test]
 	fn prefix_in_log_lines_entrypoint() {
 		if env::var("ENABLE_LOGGING").is_ok() {
-			let test_pattern = "test-target=info";
-			init_logger(&test_pattern, Default::default(), Default::default()).unwrap();
+			init_logger("", Default::default(), Default::default()).unwrap();
 			prefix_in_log_lines_process();
 		}
 	}
@@ -460,4 +459,35 @@ mod tests {
 	fn prefix_in_log_lines_process() {
 		log::info!("{}", EXPECTED_LOG_MESSAGE);
 	}
+
+	/// This is no actual test, it will be used by the `do_not_write_with_colors_on_tty` test.
+	/// The given test will call the test executable to only execute this test that
+	/// will only print a log line with some colors in it.
+	#[test]
+	fn do_not_write_with_colors_on_tty_entrypoint() {
+		if env::var("ENABLE_LOGGING").is_ok() {
+			init_logger("", Default::default(), Default::default()).unwrap();
+			log::info!("{}", ansi_term::Colour::Yellow.paint(EXPECTED_LOG_MESSAGE));
+		}
+	}
+
+	#[test]
+	fn do_not_write_with_colors_on_tty() {
+		let re = regex::Regex::new(&format!(
+			r"^\d{{4}}-\d{{2}}-\d{{2}} \d{{2}}:\d{{2}}:\d{{2}}  {}$",
+			EXPECTED_LOG_MESSAGE,
+		)).unwrap();
+		let executable = env::current_exe().unwrap();
+		let output = Command::new(executable)
+			.env("ENABLE_LOGGING", "1")
+			.args(&["--nocapture", "do_not_write_with_colors_on_tty_entrypoint"])
+			.output()
+			.unwrap();
+
+		let output = String::from_utf8(output.stderr).unwrap();
+		assert!(
+			re.is_match(output.trim()),
+			format!("Expected:\n{}\nGot:\n{}", re, output),
+		);
+	}
 }
diff --git a/client/cli/src/logging.rs b/client/cli/src/logging.rs
index e1fc90505b45..ffb4c3dfaafa 100644
--- a/client/cli/src/logging.rs
+++ b/client/cli/src/logging.rs
@@ -16,8 +16,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+use std::fmt::{self, Write};
 use ansi_term::Colour;
-use std::fmt;
 use tracing::{span::Attributes, Event, Id, Level, Subscriber};
 use tracing_log::NormalizeEvent;
 use tracing_subscriber::{
@@ -29,16 +29,62 @@ use tracing_subscriber::{
 	registry::LookupSpan,
 	Layer,
 };
+use regex::Regex;
 
 /// Span name used for the logging prefix. See macro `sc_cli::prefix_logs_with!`
 pub const PREFIX_LOG_SPAN: &str = "substrate-log-prefix";
 
+/// A writer that may write to `inner_writer` with colors.
+///
+/// This is used by [`EventFormat`] to kill colors when `enable_color` is `false`.
+///
+/// It is required to call [`MaybeColorWriter::write`] after all writes are done,
+/// because the content of these writes is buffered and will only be written to the
+/// `inner_writer` at that point.
+struct MaybeColorWriter<'a> {
+	enable_color: bool,
+	buffer: String,
+	inner_writer: &'a mut dyn fmt::Write,
+}
+
+impl<'a> fmt::Write for MaybeColorWriter<'a> {
+	fn write_str(&mut self, buf: &str) -> fmt::Result {
+		self.buffer.push_str(buf);
+		Ok(())
+	}
+}
+
+impl<'a> MaybeColorWriter<'a> {
+	/// Creates a new instance.
+	fn new(enable_color: bool, inner_writer: &'a mut dyn fmt::Write) -> Self {
+		Self {
+			enable_color,
+			inner_writer,
+			buffer: String::new(),
+		}
+	}
+
+	/// Write the buffered content to the `inner_writer`.
+	fn write(&mut self) -> fmt::Result {
+		lazy_static::lazy_static! {
+			static ref RE: Regex = Regex::new("\x1b\\[[^m]+m").expect("Error initializing color regex");
+		}
+
+		if !self.enable_color {
+			let replaced = RE.replace_all(&self.buffer, "");
+			self.inner_writer.write_str(&replaced)
+		} else {
+			self.inner_writer.write_str(&self.buffer)
+		}
+	}
+}
+
 pub(crate) struct EventFormat<T = SystemTime> {
 	pub(crate) timer: T,
-	pub(crate) ansi: bool,
 	pub(crate) display_target: bool,
 	pub(crate) display_level: bool,
 	pub(crate) display_thread_name: bool,
+	pub(crate) enable_color: bool,
 }
 
 // NOTE: the following code took inspiration from tracing-subscriber
@@ -56,12 +102,13 @@ where
 		writer: &mut dyn fmt::Write,
 		event: &Event,
 	) -> fmt::Result {
+		let writer = &mut MaybeColorWriter::new(self.enable_color, writer);
 		let normalized_meta = event.normalized_metadata();
 		let meta = normalized_meta.as_ref().unwrap_or_else(|| event.metadata());
-		time::write(&self.timer, writer, self.ansi)?;
+		time::write(&self.timer, writer, self.enable_color)?;
 
 		if self.display_level {
-			let fmt_level = { FmtLevel::new(meta.level(), self.ansi) };
+			let fmt_level = { FmtLevel::new(meta.level(), self.enable_color) };
 			write!(writer, "{} ", fmt_level)?;
 		}
 
@@ -94,7 +141,9 @@ where
 			write!(writer, "{}:", meta.target())?;
 		}
 		ctx.format_fields(writer, event)?;
-		writeln!(writer)
+		writeln!(writer)?;
+
+		writer.write()
 	}
 }
 
diff --git a/client/informant/src/lib.rs b/client/informant/src/lib.rs
index c60eda76f63f..d4f34cb488a9 100644
--- a/client/informant/src/lib.rs
+++ b/client/informant/src/lib.rs
@@ -35,7 +35,9 @@ mod display;
 /// The format to print telemetry output in.
 #[derive(Clone, Debug)]
 pub struct OutputFormat {
-	/// Enable color output in logs. True by default.
+	/// Enable color output in logs.
+	///
+	/// Is enabled by default.
 	pub enable_color: bool,
 }
 

From 1c0f76b168345d1a42bb6a106d74d22d10ae2310 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Fri, 13 Nov 2020 14:48:23 +0100
Subject: [PATCH 0070/1194] MemoryId -> u32 (#7534)

---
 client/executor/wasmtime/src/host.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/executor/wasmtime/src/host.rs b/client/executor/wasmtime/src/host.rs
index eeb7cb927167..8d20c9a566dc 100644
--- a/client/executor/wasmtime/src/host.rs
+++ b/client/executor/wasmtime/src/host.rs
@@ -232,7 +232,7 @@ impl<'a> Sandbox for HostContext<'a> {
 			.map_err(|e| e.to_string())
 	}
 
-	fn memory_new(&mut self, initial: u32, maximum: MemoryId) -> sp_wasm_interface::Result<u32> {
+	fn memory_new(&mut self, initial: u32, maximum: u32) -> sp_wasm_interface::Result<u32> {
 		self.sandbox_store
 			.borrow_mut()
 			.new_memory(initial, maximum)

From 5222a8f4a71134e3a95f268d1bcd9c8c5715b048 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Fri, 13 Nov 2020 22:38:55 +0100
Subject: [PATCH 0071/1194] Enable local addresses in DHT when chain type ==
 `Local` | `Development` (#7538)

* Enable local addresses in DHT when chain type == `Local` | `Development`

This pr changes when to add local addresses to DHT. Instead of only
checking if `--discover-local` and `--dev` are present, we now also
check if the chain type is `Local` or `Development`.

* Update the docs!
---
 client/cli/src/params/network_params.rs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/client/cli/src/params/network_params.rs b/client/cli/src/params/network_params.rs
index 209742f54e9b..a973d61272ce 100644
--- a/client/cli/src/params/network_params.rs
+++ b/client/cli/src/params/network_params.rs
@@ -21,7 +21,7 @@ use sc_network::{
 	config::{NetworkConfiguration, NodeKeyConfig, NonReservedPeerMode, TransportConfig},
 	multiaddr::Protocol,
 };
-use sc_service::{ChainSpec, config::{Multiaddr, MultiaddrWithPeerId}};
+use sc_service::{ChainSpec, ChainType, config::{Multiaddr, MultiaddrWithPeerId}};
 use std::path::PathBuf;
 use structopt::StructOpt;
 
@@ -94,7 +94,8 @@ pub struct NetworkParams {
 
 	/// Enable peer discovery on local networks.
 	///
-	/// By default this option is true for `--dev` and false otherwise.
+	/// By default this option is `true` for `--dev` or when the chain type is `Local`/`Development`
+	/// and false otherwise.
 	#[structopt(long)]
 	pub discover_local: bool,
 
@@ -139,6 +140,13 @@ impl NetworkParams {
 		let mut boot_nodes = chain_spec.boot_nodes().to_vec();
 		boot_nodes.extend(self.bootnodes.clone());
 
+		let chain_type = chain_spec.chain_type();
+		// Activate if the user explicitly requested local discovery, `--dev` is given or the
+		// chain type is `Local`/`Development`
+		let allow_non_globals_in_dht = self.discover_local
+			|| is_dev
+			|| matches!(chain_type, ChainType::Local | ChainType::Development);
+
 		NetworkConfiguration {
 			boot_nodes,
 			net_config_path,
@@ -163,7 +171,7 @@ impl NetworkParams {
 				wasm_external_transport: None,
 			},
 			max_parallel_downloads: self.max_parallel_downloads,
-			allow_non_globals_in_dht: self.discover_local || is_dev,
+			allow_non_globals_in_dht,
 			kademlia_disjoint_query_paths: self.kademlia_disjoint_query_paths,
 		}
 	}

From 77007ed87727a761169d4c57cbeae0151d9efb81 Mon Sep 17 00:00:00 2001
From: Kirill Pimenov <kirill@parity.io>
Date: Sat, 14 Nov 2020 07:19:26 +0100
Subject: [PATCH 0072/1194] Update tiny-bip39 to v0.8 (#7539)

It would improve secret zeroization due to
https://github.com/maciejhirsz/tiny-bip39/pull/22, and would also remove
one of the points where we depend on `failure` crate, which is
deprecated (see https://github.com/rust-lang-nursery/failure/pull/347)
---
 Cargo.lock                 | 63 +++++++++++++++++++++++++-------------
 primitives/core/Cargo.toml |  2 +-
 2 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7c9bdc4305d1..fca7a32c96d9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -134,9 +134,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.31"
+version = "1.0.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85bb70cc08ec97ca5450e6eba421deeea5f172c0fc61f78b5357b2a8e8be195f"
+checksum = "bf8dcb5b4bbaa28653b647d8c77bd4ed40183b48882e130c1f1ffb73de069fd7"
 
 [[package]]
 name = "approx"
@@ -462,9 +462,9 @@ checksum = "7059804e226b3ac116519a252d7f5fb985a5ccc0e93255e036a5f7e7283323f4"
 dependencies = [
  "failure",
  "hashbrown 0.1.8",
- "hmac",
+ "hmac 0.7.1",
  "once_cell 0.1.8",
- "pbkdf2",
+ "pbkdf2 0.3.0",
  "rand 0.6.5",
  "sha2 0.8.2",
 ]
@@ -2288,6 +2288,16 @@ dependencies = [
  "digest 0.8.1",
 ]
 
+[[package]]
+name = "hmac"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840"
+dependencies = [
+ "crypto-mac 0.8.0",
+ "digest 0.9.0",
+]
+
 [[package]]
 name = "hmac-drbg"
 version = "0.2.0"
@@ -2296,7 +2306,7 @@ checksum = "c6e570451493f10f6581b48cdd530413b63ea9e780f544bfd3bdcaa0d89d1a7b"
 dependencies = [
  "digest 0.8.1",
  "generic-array 0.12.3",
- "hmac",
+ "hmac 0.7.1",
 ]
 
 [[package]]
@@ -5474,6 +5484,15 @@ dependencies = [
  "rayon",
 ]
 
+[[package]]
+name = "pbkdf2"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd"
+dependencies = [
+ "crypto-mac 0.8.0",
+]
+
 [[package]]
 name = "pdqselect"
 version = "0.1.0"
@@ -8896,8 +8915,8 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bed6646a0159b9935b5d045611560eeef842b78d7adc3ba36f5ca325a13a0236"
 dependencies = [
- "hmac",
- "pbkdf2",
+ "hmac 0.7.1",
+ "pbkdf2 0.3.0",
  "schnorrkel",
  "sha2 0.8.2",
  "zeroize",
@@ -9168,9 +9187,9 @@ checksum = "502d53007c02d7605a05df1c1a73ee436952781653da5d0bf57ad608f66932c1"
 
 [[package]]
 name = "syn"
-version = "1.0.44"
+version = "1.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e03e57e4fcbfe7749842d53e24ccb9aa12b7252dbe5e91d2acad31834c8b8fdd"
+checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9259,18 +9278,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.21"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "318234ffa22e0920fe9a40d7b8369b5f649d490980cf7aadcf1eb91594869b42"
+checksum = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.21"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cae2447b6282786c3493999f40a9be2a6ad20cb8bd268b0a0dbf5a065535c0ab"
+checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9307,18 +9326,20 @@ dependencies = [
 
 [[package]]
 name = "tiny-bip39"
-version = "0.7.3"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0165e045cc2ae1660270ca65e1676dbaab60feb0f91b10f7d0665e9b47e31f2"
+checksum = "d9e44c4759bae7f1032e286a7ef990bd9ed23fe831b7eeba0beb97484c2e59b8"
 dependencies = [
- "failure",
- "hmac",
+ "anyhow",
+ "hmac 0.8.1",
  "once_cell 1.4.1",
- "pbkdf2",
+ "pbkdf2 0.4.0",
  "rand 0.7.3",
  "rustc-hash",
- "sha2 0.8.2",
+ "sha2 0.9.1",
+ "thiserror",
  "unicode-normalization",
+ "zeroize",
 ]
 
 [[package]]
@@ -10514,9 +10535,9 @@ dependencies = [
 
 [[package]]
 name = "zeroize"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cbac2ed2ba24cc90f5e06485ac8c7c1e5449fe8911aef4d8877218af021a5b8"
+checksum = "05f33972566adbd2d3588b0491eb94b98b43695c4ef897903470ede4f3f5a28a"
 dependencies = [
  "zeroize_derive",
 ]
diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml
index 1757bb4e0d52..f6989a0df4f0 100644
--- a/primitives/core/Cargo.toml
+++ b/primitives/core/Cargo.toml
@@ -26,7 +26,7 @@ hash256-std-hasher = { version = "0.15.2", default-features = false }
 base58 = { version = "0.1.0", optional = true }
 rand = { version = "0.7.3", optional = true, features = ["small_rng"] }
 substrate-bip39 = { version = "0.4.2", optional = true }
-tiny-bip39 = { version = "0.7", optional = true }
+tiny-bip39 = { version = "0.8", optional = true }
 regex = { version = "1.3.1", optional = true }
 num-traits = { version = "0.2.8", default-features = false }
 zeroize = { version = "1.0.0", default-features = false }

From f31e7784e8b7c1c14535274c7b6c0be7b8310b4b Mon Sep 17 00:00:00 2001
From: Andrew Plaza <aplaza@liquidthink.net>
Date: Mon, 16 Nov 2020 12:40:35 +0100
Subject: [PATCH 0073/1194] make LocalCallExecutor public (#7528)

---
 client/service/src/lib.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index cb741c2920b0..8e6b0037bdf9 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -80,6 +80,7 @@ pub use sc_tracing::TracingReceiver;
 pub use task_manager::SpawnTaskHandle;
 pub use task_manager::TaskManager;
 pub use sp_consensus::import_queue::ImportQueue;
+pub use self::client::LocalCallExecutor;
 use sc_client_api::{blockchain::HeaderBackend, BlockchainEvents};
 
 const DEFAULT_PROTOCOL_ID: &str = "sup";

From 74e01c84ca73b22cb9053e6e641a61ed87c31f7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Mon, 16 Nov 2020 14:15:05 +0100
Subject: [PATCH 0074/1194] Fix some weirdness in `offchain_worker` (#7541)

We call `offchain_worker` with the state of the imported block and pass
the header of this block. However in the runtime we call all
`offchain_worker` functions with the number of the parent block. Besides
that we also pass all digests and not only the pre runtime digests. In
the context where the offchain worker is executed we have all digests, so
there is no real reason to only pass pre runtime digests. Another fix is
that we also insert the hash of the current header into the block hash map.
---
 frame/executive/src/lib.rs | 44 +++++++++++++++++++++++++++++++-------
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index 961dbc4376a5..ccb5c2d26287 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -117,7 +117,7 @@
 
 use sp_std::{prelude::*, marker::PhantomData};
 use frame_support::{
-	storage::StorageValue, weights::{GetDispatchInfo, DispatchInfo, DispatchClass},
+	StorageValue, StorageMap, weights::{GetDispatchInfo, DispatchInfo, DispatchClass},
 	traits::{OnInitialize, OnFinalize, OnRuntimeUpgrade, OffchainWorker},
 	dispatch::PostDispatchInfo,
 };
@@ -453,7 +453,7 @@ where
 		// We need to keep events available for offchain workers,
 		// hence we initialize the block manually.
 		// OffchainWorker RuntimeApi should skip initialization.
-		let digests = Self::extract_pre_digest(header);
+		let digests = header.digest().clone();
 
 		<frame_system::Module<System>>::initialize(
 			header.number(),
@@ -463,15 +463,16 @@ where
 			frame_system::InitKind::Inspection,
 		);
 
+		// Frame system only inserts the parent hash into the block hashes as normally we don't know
+		// the hash for the header before. However, here we are aware of the hash and we can add it
+		// as well.
+		frame_system::BlockHash::<System>::insert(header.number(), header.hash());
+
 		// Initialize logger, so the log messages are visible
 		// also when running WASM.
 		frame_support::debug::RuntimeLogger::init();
 
-		<AllModules as OffchainWorker<System::BlockNumber>>::offchain_worker(
-			// to maintain backward compatibility we call module offchain workers
-			// with parent block number.
-			header.number().saturating_sub(1u32.into())
-		)
+		<AllModules as OffchainWorker<System::BlockNumber>>::offchain_worker(*header.number())
 	}
 }
 
@@ -481,7 +482,7 @@ mod tests {
 	use super::*;
 	use sp_core::H256;
 	use sp_runtime::{
-		generic::Era, Perbill, DispatchError, testing::{Digest, Header, Block},
+		generic::{Era, DigestItem}, Perbill, DispatchError, testing::{Digest, Header, Block},
 		traits::{Header as HeaderT, BlakeTwo256, IdentityLookup},
 		transaction_validity::{
 			InvalidTransaction, ValidTransaction, TransactionValidityError, UnknownTransaction
@@ -547,6 +548,10 @@ mod tests {
 					sp_io::storage::set(super::TEST_KEY, "module".as_bytes());
 					200
 				}
+
+				fn offchain_worker(n: T::BlockNumber) {
+					assert_eq!(T::BlockNumber::from(1u32), n);
+				}
 			}
 		}
 
@@ -1115,4 +1120,27 @@ mod tests {
 			);
 		});
 	}
+
+	#[test]
+	fn offchain_worker_works_as_expected() {
+		new_test_ext(1).execute_with(|| {
+			let parent_hash = sp_core::H256::from([69u8; 32]);
+			let mut digest = Digest::default();
+			digest.push(DigestItem::Seal([1, 2, 3, 4], vec![5, 6, 7, 8]));
+
+			let header = Header::new(
+				1,
+				H256::default(),
+				H256::default(),
+				parent_hash,
+				digest.clone(),
+			);
+
+			Executive::offchain_worker(&header);
+
+			assert_eq!(digest, System::digest());
+			assert_eq!(parent_hash, System::block_hash(0));
+			assert_eq!(header.hash(), System::block_hash(1));
+		});
+	}
 }

From 99602cda4e1c06d66a40aa933789308d4ca9a7ce Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Mon, 16 Nov 2020 16:46:36 +0100
Subject: [PATCH 0075/1194] Use inbound peerslot slots when a substream is
 received, rather than a connection (#7464)

* Use inbound peerslot slots when a substream is received, rather than a connection

* Refactor PeerState

* Some bugfixes

* Fix warnings so that CI runs, gmlrlblbl

* Bugfixes

* Update docs

* Apply suggestions from code review

Co-authored-by: Roman Borschel <romanb@users.noreply.github.com>

* Clean up Banned state

* Refactor connections state

* Fix possibility of Enabled with no Opening or Open connection

* Line width

* Add some debug_asserts! and fix TODO

* Refactor legacy handler

* Rewrite group.rs entirely [part 1]

* Rewrite group.rs entirely [part 2]

* Remove faulty assertion

Because of the asynchronous nature of the behaviour <-> handler communications, it is possible to receive notifications while in the Closing state

* Don't poll the legacy substream is not Open

* Tolerate when not all substreams are accepted

* Remove TODOs

* Dummy commit to make CI log interesting things

* Try race condition fix

* Revert "Try race condition fix"

This reverts commit 0675c659d06195c30f8c5bc13e2d88141d57a3ba.

* Correctly rebuild pending_opening

* Minor tweaks

* Printlns for CI debugging

* Revert "Printlns for CI debugging"

This reverts commit e7852a231f4fc418898767aaa27c9a4358e12e8b.

* Revert "Dummy commit to make CI log interesting things"

This reverts commit 259ddd74088e53e7c6a9b0a62a8d1573a0063ce3.

* mv group.rs ../handler.rs

* Apply suggestions from code review

Co-authored-by: Max Inden <mail@max-inden.de>

* Banned => Backoff

* Mention the actual PeerStates

* OpenDesired -> OpenDesiredByRemote

* OpeningThenClosing

* Add doc links to PeerState

* Simplify increment logic

* One more debug_assert

* debug_assert!

* OpenDesiredByRemote

* Update client/network/src/protocol/generic_proto/behaviour.rs

Co-authored-by: Max Inden <mail@max-inden.de>

Co-authored-by: Roman Borschel <romanb@users.noreply.github.com>
Co-authored-by: Max Inden <mail@max-inden.de>
---
 client/network/src/protocol.rs                |    4 +-
 client/network/src/protocol/generic_proto.rs  |    2 +-
 .../src/protocol/generic_proto/behaviour.rs   | 1672 +++++++++++------
 .../src/protocol/generic_proto/handler.rs     | 1055 ++++++++++-
 .../protocol/generic_proto/handler/group.rs   |  737 --------
 .../protocol/generic_proto/handler/legacy.rs  |  559 ------
 .../generic_proto/handler/notif_in.rs         |  293 ---
 .../generic_proto/handler/notif_out.rs        |  444 -----
 .../protocol/generic_proto/upgrade/legacy.rs  |   26 +-
 client/network/src/service.rs                 |    5 +-
 10 files changed, 2197 insertions(+), 2600 deletions(-)
 delete mode 100644 client/network/src/protocol/generic_proto/handler/group.rs
 delete mode 100644 client/network/src/protocol/generic_proto/handler/legacy.rs
 delete mode 100644 client/network/src/protocol/generic_proto/handler/notif_in.rs
 delete mode 100644 client/network/src/protocol/generic_proto/handler/notif_out.rs

diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index ac74af0f5ca9..9403e471b0f2 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -63,7 +63,7 @@ pub mod message;
 pub mod event;
 pub mod sync;
 
-pub use generic_proto::{NotificationsSink, Ready, NotifsHandlerError, LegacyConnectionKillError};
+pub use generic_proto::{NotificationsSink, Ready, NotifsHandlerError};
 
 const REQUEST_TIMEOUT_SEC: u64 = 40;
 /// Interval at which we perform time based maintenance
@@ -1668,7 +1668,7 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 					notifications_sink,
 				}
 			},
-			GenericProtoOut::CustomProtocolClosed { peer_id, .. } => {
+			GenericProtoOut::CustomProtocolClosed { peer_id } => {
 				self.on_peer_disconnected(peer_id)
 			},
 			GenericProtoOut::LegacyMessage { peer_id, message } =>
diff --git a/client/network/src/protocol/generic_proto.rs b/client/network/src/protocol/generic_proto.rs
index 3133471b0d24..4d6e607a146e 100644
--- a/client/network/src/protocol/generic_proto.rs
+++ b/client/network/src/protocol/generic_proto.rs
@@ -21,7 +21,7 @@
 //! network, then performs the Substrate protocol handling on top.
 
 pub use self::behaviour::{GenericProto, GenericProtoOut};
-pub use self::handler::{NotifsHandlerError, NotificationsSink, Ready, LegacyConnectionKillError};
+pub use self::handler::{NotifsHandlerError, NotificationsSink, Ready};
 
 mod behaviour;
 mod handler;
diff --git a/client/network/src/protocol/generic_proto/behaviour.rs b/client/network/src/protocol/generic_proto/behaviour.rs
index 7b62b154016c..f84aead47283 100644
--- a/client/network/src/protocol/generic_proto/behaviour.rs
+++ b/client/network/src/protocol/generic_proto/behaviour.rs
@@ -42,45 +42,35 @@ use wasm_timer::Instant;
 
 /// Network behaviour that handles opening substreams for custom protocols with other peers.
 ///
-/// ## Legacy vs new protocol
-///
-/// The `GenericProto` behaves as following:
-///
-/// - Whenever a connection is established, we open a single substream (called "legacy protocol" in
-/// the source code) on that connection. This substream name depends on the `protocol_id` and
-/// `versions` passed at initialization. If the remote refuses this substream, we close the
-/// connection.
-///
-/// - For each registered protocol, we also open an additional substream for this protocol. If the
-/// remote refuses this substream, then it's fine.
-///
-/// - Whenever we want to send a message, we can call either `send_packet` to force the legacy
-/// substream, or `write_notification` to indicate a registered protocol. If the registered
-/// protocol was refused or isn't supported by the remote, we always use the legacy instead.
-///
-/// ## How it works
+/// # How it works
 ///
 /// The role of the `GenericProto` is to synchronize the following components:
 ///
 /// - The libp2p swarm that opens new connections and reports disconnects.
-/// - The connection handler (see `handler.rs`) that handles individual connections.
+/// - The connection handler (see `group.rs`) that handles individual connections.
 /// - The peerset manager (PSM) that requests links to peers to be established or broken.
 /// - The external API, that requires knowledge of the links that have been established.
 ///
-/// Each connection handler can be in four different states: Enabled+Open, Enabled+Closed,
-/// Disabled+Open, or Disabled+Closed. The Enabled/Disabled component must be in sync with the
-/// peerset manager. For example, if the peerset manager requires a disconnection, we disable the
-/// connection handlers of that peer. The Open/Closed component must be in sync with the external
-/// API.
+/// In the state machine below, each `PeerId` is attributed one of these states:
+///
+/// - [`PeerState::Requested`]: No open connection, but requested by the peerset. Currently dialing.
+/// - [`PeerState::Disabled`]: Has open TCP connection(s) unbeknownst to the peerset. No substream
+///   is open.
+/// - [`PeerState::Enabled`]: Has open TCP connection(s), acknowledged by the peerset.
+///   - Notifications substreams are open on at least one connection, and external
+///     API has been notified.
+///   - Notifications substreams aren't open.
+/// - [`PeerState::Incoming`]: Has open TCP connection(s) and remote would like to open substreams.
+///   Peerset has been asked to attribute an inbound slot.
 ///
-/// However, a connection handler for a peer only exists if we are actually connected to that peer.
-/// What this means is that there are six possible states for each peer: Disconnected, Dialing
-/// (trying to connect), Enabled+Open, Enabled+Closed, Disabled+Open, Disabled+Closed.
-/// Most notably, the Dialing state must correspond to a "link established" state in the peerset
-/// manager. In other words, the peerset manager doesn't differentiate whether we are dialing a
-/// peer or connected to it.
+/// In addition to these states, there also exists a "banning" system. If we fail to dial a peer,
+/// we back-off for a few seconds. If the PSM requests connecting to a peer that is currently
+/// backed-off, the next dialing attempt is delayed until after the ban expires. However, the PSM
+/// will still consider the peer to be connected. This "ban" is thus not a ban in a strict sense:
+/// if a backed-off peer tries to connect, the connection is accepted. A ban only delays dialing
+/// attempts.
 ///
-/// There may be multiple connections to a peer. However, the status of a peer on
+/// There may be multiple connections to a peer. The status of a peer on
 /// the API of this behaviour and towards the peerset manager is aggregated in
 /// the following way:
 ///
@@ -94,9 +84,9 @@ use wasm_timer::Instant;
 ///      in terms of potential reordering and dropped messages. Messages can
 ///      be received on any connection.
 ///   3. The behaviour reports `GenericProtoOut::CustomProtocolOpen` when the
-///      first connection reports `NotifsHandlerOut::Open`.
+///      first connection reports `NotifsHandlerOut::OpenResultOk`.
 ///   4. The behaviour reports `GenericProtoOut::CustomProtocolClosed` when the
-///      last connection reports `NotifsHandlerOut::Closed`.
+///      last connection reports `NotifsHandlerOut::ClosedResult`.
 ///
 /// In this way, the number of actual established connections to the peer is
 /// an implementation detail of this behaviour. Note that, in practice and at
@@ -104,12 +94,6 @@ use wasm_timer::Instant;
 /// and only as a result of simultaneous dialing. However, the implementation
 /// accommodates for any number of connections.
 ///
-/// Additionally, there also exists a "banning" system. If we fail to dial a peer, we "ban" it for
-/// a few seconds. If the PSM requests connecting to a peer that is currently "banned", the next
-/// dialing attempt is delayed until after the ban expires. However, the PSM will still consider
-/// the peer to be connected. This "ban" is thus not a ban in a strict sense: If a "banned" peer
-/// tries to connect, the connection is accepted. A ban only delays dialing attempts.
-///
 pub struct GenericProto {
 	/// `PeerId` of the local node.
 	local_peer_id: PeerId,
@@ -157,6 +141,8 @@ pub struct GenericProto {
 struct DelayId(u64);
 
 /// State of a peer we're connected to.
+///
+/// The variants correspond to the state of the peer w.r.t. the peerset.
 #[derive(Debug)]
 enum PeerState {
 	/// State is poisoned. This is a temporary state for a peer and we should always switch back
@@ -166,9 +152,11 @@ enum PeerState {
 
 	/// The peer misbehaved. If the PSM wants us to connect to this peer, we will add an artificial
 	/// delay to the connection.
-	Banned {
-		/// Until when the peer is banned.
-		until: Instant,
+	Backoff {
+		/// When the ban expires. For clean-up purposes. References an entry in `delays`.
+		timer: DelayId,
+		/// Until when the peer is backed-off.
+		timer_deadline: Instant,
 	},
 
 	/// The peerset requested that we connect to this peer. We are currently not connected.
@@ -182,40 +170,54 @@ enum PeerState {
 	/// The peerset requested that we connect to this peer. We are currently dialing this peer.
 	Requested,
 
-	/// We are connected to this peer but the peerset refused it.
+	/// We are connected to this peer but the peerset hasn't requested it or has denied it.
 	///
-	/// We may still have ongoing traffic with that peer, but it should cease shortly.
+	/// The handler is either in the closed state, or a `Close` message has been sent to it and
+	/// hasn't been answered yet.
 	Disabled {
-		/// The connections that are currently open for custom protocol traffic.
-		open: SmallVec<[(ConnectionId, NotificationsSink); crate::MAX_CONNECTIONS_PER_PEER]>,
-		/// If `Some`, any dial attempts to this peer are delayed until the given `Instant`.
-		banned_until: Option<Instant>,
+		/// If `Some`, any connection request from the peerset to this peer is delayed until the
+		/// given `Instant`.
+		backoff_until: Option<Instant>,
+
+		/// List of connections with this peer, and their state.
+		connections: SmallVec<[(ConnectionId, ConnectionState); crate::MAX_CONNECTIONS_PER_PEER]>,
 	},
 
-	/// We are connected to this peer but we are not opening any Substrate substream. The handler
-	/// will be enabled when `timer` fires. This peer can still perform Kademlia queries and such,
-	/// but should get disconnected in a few seconds.
+	/// We are connected to this peer. The peerset has requested a connection to this peer, but
+	/// it is currently in a "backed-off" phase. The state will switch to `Enabled` once the timer
+	/// expires.
+	///
+	/// The handler is either in the closed state, or a `Close` message has been sent to it and
+	/// hasn't been answered yet.
+	///
+	/// The handler will be opened when `timer` fires.
 	DisabledPendingEnable {
-		/// The connections that are currently open for custom protocol traffic.
-		open: SmallVec<[(ConnectionId, NotificationsSink); crate::MAX_CONNECTIONS_PER_PEER]>,
 		/// When to enable this remote. References an entry in `delays`.
 		timer: DelayId,
 		/// When the `timer` will trigger.
 		timer_deadline: Instant,
+
+		/// List of connections with this peer, and their state.
+		connections: SmallVec<[(ConnectionId, ConnectionState); crate::MAX_CONNECTIONS_PER_PEER]>,
 	},
 
-	/// We are connected to this peer and the peerset has accepted it. The handler is in the
-	/// enabled state.
+	/// We are connected to this peer and the peerset has accepted it.
 	Enabled {
-		/// The connections that are currently open for custom protocol traffic.
-		open: SmallVec<[(ConnectionId, NotificationsSink); crate::MAX_CONNECTIONS_PER_PEER]>,
+		/// List of connections with this peer, and their state.
+		connections: SmallVec<[(ConnectionId, ConnectionState); crate::MAX_CONNECTIONS_PER_PEER]>,
 	},
 
-	/// We received an incoming connection from this peer and forwarded that
-	/// connection request to the peerset. The connection handlers are waiting
-	/// for initialisation, i.e. to be enabled or disabled based on whether
-	/// the peerset accepts or rejects the peer.
-	Incoming,
+	/// We are connected to this peer. We have received an `OpenDesiredByRemote` from one of the
+	/// handlers and forwarded that request to the peerset. The connection handlers are waiting for
+	/// a response, i.e. to be opened or closed based on whether the peerset accepts or rejects
+	/// the peer.
+	Incoming {
+		/// If `Some`, any dial attempts to this peer are delayed until the given `Instant`.
+		backoff_until: Option<Instant>,
+
+		/// List of connections with this peer, and their state.
+		connections: SmallVec<[(ConnectionId, ConnectionState); crate::MAX_CONNECTIONS_PER_PEER]>,
+	},
 }
 
 impl PeerState {
@@ -229,18 +231,19 @@ impl PeerState {
 	/// that is open for custom protocol traffic.
 	fn get_open(&self) -> Option<&NotificationsSink> {
 		match self {
-			PeerState::Disabled { open, .. } |
-			PeerState::DisabledPendingEnable { open, .. } |
-			PeerState::Enabled { open, .. } =>
-				if !open.is_empty() {
-					Some(&open[0].1)
-				} else {
-					None
-				}
+			PeerState::Enabled { connections, .. } => connections
+				.iter()
+				.filter_map(|(_, s)| match s {
+					ConnectionState::Open(s) => Some(s),
+					_ => None,
+				})
+				.next(),
 			PeerState::Poisoned => None,
-			PeerState::Banned { .. } => None,
+			PeerState::Backoff { .. } => None,
 			PeerState::PendingRequest { .. } => None,
 			PeerState::Requested => None,
+			PeerState::Disabled { .. } => None,
+			PeerState::DisabledPendingEnable { .. } => None,
 			PeerState::Incoming { .. } => None,
 		}
 	}
@@ -249,7 +252,7 @@ impl PeerState {
 	fn is_requested(&self) -> bool {
 		match self {
 			PeerState::Poisoned => false,
-			PeerState::Banned { .. } => false,
+			PeerState::Backoff { .. } => false,
 			PeerState::PendingRequest { .. } => true,
 			PeerState::Requested => true,
 			PeerState::Disabled { .. } => false,
@@ -260,6 +263,37 @@ impl PeerState {
 	}
 }
 
+/// State of the handler of a single connection visible from this state machine.
+#[derive(Debug)]
+enum ConnectionState {
+	/// Connection is in the `Closed` state, meaning that the remote hasn't requested anything.
+	Closed,
+
+	/// Connection is either in the `Open` or the `Closed` state, but a
+	/// [`NotifsHandlerIn::Close`] message has been sent. Waiting for this message to be
+	/// acknowledged through a [`NotifsHandlerOut::CloseResult`].
+	Closing,
+
+	/// Connection is in the `Closed` state but a [`NotifsHandlerIn::Open`] message has been sent.
+	/// An `OpenResultOk`/`OpenResultErr` message is expected.
+	Opening,
+
+	/// Connection is in the `Closed` state but a [`NotifsHandlerIn::Open`] message then a
+	/// [`NotifsHandlerIn::Close`] message has been sent. An `OpenResultOk`/`OpenResultErr` message
+	/// followed with a `CloseResult` message are expected.
+	OpeningThenClosing,
+
+	/// Connection is in the `Closed` state, but a [`NotifsHandlerOut::OpenDesiredByRemote`]
+	/// message has been received, meaning that the remote wants to open a substream.
+	OpenDesiredByRemote,
+
+	/// Connection is in the `Open` state.
+	///
+	/// The external API is notified of a channel with this peer if any of its connection is in
+	/// this state.
+	Open(NotificationsSink),
+}
+
 /// State of an "incoming" message sent to the peer set manager.
 #[derive(Debug)]
 struct IncomingPeer {
@@ -303,8 +337,6 @@ pub enum GenericProtoOut {
 	CustomProtocolClosed {
 		/// Id of the peer we were connected to.
 		peer_id: PeerId,
-		/// Reason why the substream closed, for debugging purposes.
-		reason: Cow<'static, str>,
 	},
 
 	/// Receives a message on the legacy substream.
@@ -438,46 +470,79 @@ impl GenericProto {
 			st @ PeerState::Disabled { .. } => *entry.into_mut() = st,
 			st @ PeerState::Requested => *entry.into_mut() = st,
 			st @ PeerState::PendingRequest { .. } => *entry.into_mut() = st,
-			st @ PeerState::Banned { .. } => *entry.into_mut() = st,
+			st @ PeerState::Backoff { .. } => *entry.into_mut() = st,
 
 			// DisabledPendingEnable => Disabled.
 			PeerState::DisabledPendingEnable {
-				open,
+				connections,
 				timer_deadline,
 				timer: _
 			} => {
 				debug!(target: "sub-libp2p", "PSM <= Dropped({:?})", peer_id);
 				self.peerset.dropped(peer_id.clone());
-				let banned_until = Some(if let Some(ban) = ban {
+				let backoff_until = Some(if let Some(ban) = ban {
 					cmp::max(timer_deadline, Instant::now() + ban)
 				} else {
 					timer_deadline
 				});
 				*entry.into_mut() = PeerState::Disabled {
-					open,
-					banned_until
+					connections,
+					backoff_until
 				}
 			},
 
 			// Enabled => Disabled.
-			PeerState::Enabled { open } => {
+			// All open or opening connections are sent a `Close` message.
+			// If relevant, the external API is instantly notified.
+			PeerState::Enabled { mut connections } => {
 				debug!(target: "sub-libp2p", "PSM <= Dropped({:?})", peer_id);
 				self.peerset.dropped(peer_id.clone());
-				debug!(target: "sub-libp2p", "Handler({:?}) <= Disable", peer_id);
-				self.events.push_back(NetworkBehaviourAction::NotifyHandler {
-					peer_id: peer_id.clone(),
-					handler: NotifyHandler::All,
-					event: NotifsHandlerIn::Disable,
-				});
-				let banned_until = ban.map(|dur| Instant::now() + dur);
+
+				if connections.iter().any(|(_, s)| matches!(s, ConnectionState::Open(_))) {
+					debug!(target: "sub-libp2p", "External API <= Closed({})", peer_id);
+					let event = GenericProtoOut::CustomProtocolClosed {
+						peer_id: peer_id.clone(),
+					};
+					self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
+				}
+
+				for (connec_id, connec_state) in connections.iter_mut()
+					.filter(|(_, s)| matches!(s, ConnectionState::Open(_)))
+				{
+					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close", peer_id, *connec_id);
+					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
+						peer_id: peer_id.clone(),
+						handler: NotifyHandler::One(*connec_id),
+						event: NotifsHandlerIn::Close,
+					});
+					*connec_state = ConnectionState::Closing;
+				}
+
+				for (connec_id, connec_state) in connections.iter_mut()
+					.filter(|(_, s)| matches!(s, ConnectionState::Opening))
+				{
+					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close", peer_id, *connec_id);
+					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
+						peer_id: peer_id.clone(),
+						handler: NotifyHandler::One(*connec_id),
+						event: NotifsHandlerIn::Close,
+					});
+					*connec_state = ConnectionState::OpeningThenClosing;
+				}
+
+				debug_assert!(!connections.iter().any(|(_, s)| matches!(s, ConnectionState::Open(_))));
+				debug_assert!(!connections.iter().any(|(_, s)| matches!(s, ConnectionState::Opening)));
+
+				let backoff_until = ban.map(|dur| Instant::now() + dur);
 				*entry.into_mut() = PeerState::Disabled {
-					open,
-					banned_until
+					connections,
+					backoff_until
 				}
 			},
 
 			// Incoming => Disabled.
-			PeerState::Incoming => {
+			// Ongoing opening requests from the remote are rejected.
+			PeerState::Incoming { mut connections, backoff_until } => {
 				let inc = if let Some(inc) = self.incoming.iter_mut()
 					.find(|i| i.peer_id == *entry.key() && i.alive) {
 					inc
@@ -488,16 +553,30 @@ impl GenericProto {
 				};
 
 				inc.alive = false;
-				debug!(target: "sub-libp2p", "Handler({:?}) <= Disable", peer_id);
-				self.events.push_back(NetworkBehaviourAction::NotifyHandler {
-					peer_id: peer_id.clone(),
-					handler: NotifyHandler::All,
-					event: NotifsHandlerIn::Disable,
-				});
-				let banned_until = ban.map(|dur| Instant::now() + dur);
+
+				for (connec_id, connec_state) in connections.iter_mut()
+					.filter(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote))
+				{
+					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close", peer_id, *connec_id);
+					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
+						peer_id: peer_id.clone(),
+						handler: NotifyHandler::One(*connec_id),
+						event: NotifsHandlerIn::Close,
+					});
+					*connec_state = ConnectionState::Closing;
+				}
+
+				let backoff_until = match (backoff_until, ban) {
+					(Some(a), Some(b)) => Some(cmp::max(a, Instant::now() + b)),
+					(Some(a), None) => Some(a),
+					(None, Some(b)) => Some(Instant::now() + b),
+					(None, None) => None,
+				};
+
+				debug_assert!(!connections.iter().any(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote)));
 				*entry.into_mut() = PeerState::Disabled {
-					open: SmallVec::new(),
-					banned_until
+					connections,
+					backoff_until
 				}
 			},
 
@@ -521,7 +600,7 @@ impl GenericProto {
 			Some(PeerState::Incoming { .. }) => false,
 			Some(PeerState::Requested) => false,
 			Some(PeerState::PendingRequest { .. }) => false,
-			Some(PeerState::Banned { .. }) => false,
+			Some(PeerState::Backoff { .. }) => false,
 			Some(PeerState::Poisoned) => false,
 		}
 	}
@@ -591,7 +670,8 @@ impl GenericProto {
 
 	/// Function that is called when the peerset wants us to connect to a peer.
 	fn peerset_report_connect(&mut self, peer_id: PeerId) {
-		let mut occ_entry = match self.peers.entry(peer_id) {
+		// If `PeerId` is unknown to us, insert an entry, start dialing, and return early.
+		let mut occ_entry = match self.peers.entry(peer_id.clone()) {
 			Entry::Occupied(entry) => entry,
 			Entry::Vacant(entry) => {
 				// If there's no entry in `self.peers`, start dialing.
@@ -609,26 +689,19 @@ impl GenericProto {
 		let now = Instant::now();
 
 		match mem::replace(occ_entry.get_mut(), PeerState::Poisoned) {
-			PeerState::Banned { ref until } if *until > now => {
+			// Backoff (not expired) => PendingRequest
+			PeerState::Backoff { ref timer, ref timer_deadline } if *timer_deadline > now => {
 				let peer_id = occ_entry.key().clone();
 				debug!(target: "sub-libp2p", "PSM => Connect({:?}): Will start to connect at \
-					until {:?}", peer_id, until);
-
-				let delay_id = self.next_delay_id;
-				self.next_delay_id.0 += 1;
-				let delay = futures_timer::Delay::new(*until - now);
-				self.delays.push(async move {
-					delay.await;
-					(delay_id, peer_id)
-				}.boxed());
-
+					until {:?}", peer_id, timer_deadline);
 				*occ_entry.into_mut() = PeerState::PendingRequest {
-					timer: delay_id,
-					timer_deadline: *until,
+					timer: *timer,
+					timer_deadline: *timer_deadline,
 				};
 			},
 
-			PeerState::Banned { .. } => {
+			// Backoff (expired) => Requested
+			PeerState::Backoff { .. } => {
 				debug!(target: "sub-libp2p", "PSM => Connect({:?}): Starting to connect", occ_entry.key());
 				debug!(target: "sub-libp2p", "Libp2p <= Dial {:?}", occ_entry.key());
 				self.events.push_back(NetworkBehaviourAction::DialPeer {
@@ -638,42 +711,90 @@ impl GenericProto {
 				*occ_entry.into_mut() = PeerState::Requested;
 			},
 
+			// Disabled (with non-expired ban) => DisabledPendingEnable
 			PeerState::Disabled {
-				open,
-				banned_until: Some(ref banned)
-			} if *banned > now => {
+				connections,
+				backoff_until: Some(ref backoff)
+			} if *backoff > now => {
 				let peer_id = occ_entry.key().clone();
-				debug!(target: "sub-libp2p", "PSM => Connect({:?}): But peer is banned until {:?}",
-					peer_id, banned);
+				debug!(target: "sub-libp2p", "PSM => Connect({:?}): But peer is backed-off until {:?}",
+					peer_id, backoff);
 
 				let delay_id = self.next_delay_id;
 				self.next_delay_id.0 += 1;
-				let delay = futures_timer::Delay::new(*banned - now);
+				let delay = futures_timer::Delay::new(*backoff - now);
 				self.delays.push(async move {
 					delay.await;
 					(delay_id, peer_id)
 				}.boxed());
 
 				*occ_entry.into_mut() = PeerState::DisabledPendingEnable {
-					open,
+					connections,
 					timer: delay_id,
-					timer_deadline: *banned,
+					timer_deadline: *backoff,
 				};
 			},
 
-			PeerState::Disabled { open, banned_until: _ } => {
-				debug!(target: "sub-libp2p", "PSM => Connect({:?}): Enabling connections.",
-					occ_entry.key());
-				debug!(target: "sub-libp2p", "Handler({:?}) <= Enable", occ_entry.key());
-				self.events.push_back(NetworkBehaviourAction::NotifyHandler {
-					peer_id: occ_entry.key().clone(),
-					handler: NotifyHandler::All,
-					event: NotifsHandlerIn::Enable,
-				});
-				*occ_entry.into_mut() = PeerState::Enabled { open };
+			// Disabled => Enabled
+			PeerState::Disabled { mut connections, backoff_until } => {
+				debug_assert!(!connections.iter().any(|(_, s)| {
+					matches!(s, ConnectionState::Open(_))
+				}));
+
+				// The first element of `closed` is chosen to open the notifications substream.
+				if let Some((connec_id, connec_state)) = connections.iter_mut()
+					.find(|(_, s)| matches!(s, ConnectionState::Closed))
+				{
+					debug!(target: "sub-libp2p", "PSM => Connect({:?}): Enabling connections.",
+						occ_entry.key());
+					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open", peer_id, *connec_id);
+					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
+						peer_id: peer_id.clone(),
+						handler: NotifyHandler::One(*connec_id),
+						event: NotifsHandlerIn::Open,
+					});
+					*connec_state = ConnectionState::Opening;
+					*occ_entry.into_mut() = PeerState::Enabled { connections };
+				} else {
+					// If no connection is available, switch to `DisabledPendingEnable` in order
+					// to try again later.
+					debug_assert!(connections.iter().any(|(_, s)| {
+						matches!(s, ConnectionState::OpeningThenClosing | ConnectionState::Closing)
+					}));
+					debug!(
+						target: "sub-libp2p",
+						"PSM => Connect({:?}): No connection in proper state. Delaying.",
+						occ_entry.key()
+					);
+
+					let timer_deadline = {
+						let base = now + Duration::from_secs(5);
+						if let Some(backoff_until) = backoff_until {
+							cmp::max(base, backoff_until)
+						} else {
+							base
+						}
+					};
+
+					let delay_id = self.next_delay_id;
+					self.next_delay_id.0 += 1;
+					debug_assert!(timer_deadline > now);
+					let delay = futures_timer::Delay::new(timer_deadline - now);
+					self.delays.push(async move {
+						delay.await;
+						(delay_id, peer_id)
+					}.boxed());
+
+					*occ_entry.into_mut() = PeerState::DisabledPendingEnable {
+						connections,
+						timer: delay_id,
+						timer_deadline,
+					};
+				}
 			},
 
-			PeerState::Incoming => {
+			// Incoming => Enabled
+			PeerState::Incoming { mut connections, .. } => {
 				debug!(target: "sub-libp2p", "PSM => Connect({:?}): Enabling connections.",
 					occ_entry.key());
 				if let Some(inc) = self.incoming.iter_mut()
@@ -683,36 +804,50 @@ impl GenericProto {
 					error!(target: "sub-libp2p", "State mismatch in libp2p: no entry in \
 						incoming for incoming peer")
 				}
-				debug!(target: "sub-libp2p", "Handler({:?}) <= Enable", occ_entry.key());
-				self.events.push_back(NetworkBehaviourAction::NotifyHandler {
-					peer_id: occ_entry.key().clone(),
-					handler: NotifyHandler::All,
-					event: NotifsHandlerIn::Enable,
-				});
-				*occ_entry.into_mut() = PeerState::Enabled { open: SmallVec::new() };
+
+				debug_assert!(connections.iter().any(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote)));
+				for (connec_id, connec_state) in connections.iter_mut()
+					.filter(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote))
+				{
+					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open", occ_entry.key(), *connec_id);
+					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
+						peer_id: occ_entry.key().clone(),
+						handler: NotifyHandler::One(*connec_id),
+						event: NotifsHandlerIn::Open,
+					});
+					*connec_state = ConnectionState::Opening;
+				}
+
+				*occ_entry.into_mut() = PeerState::Enabled { connections };
 			},
 
+			// Other states are kept as-is.
 			st @ PeerState::Enabled { .. } => {
 				warn!(target: "sub-libp2p",
 					"PSM => Connect({:?}): Already connected.",
 					occ_entry.key());
 				*occ_entry.into_mut() = st;
+				debug_assert!(false);
 			},
 			st @ PeerState::DisabledPendingEnable { .. } => {
 				warn!(target: "sub-libp2p",
 					"PSM => Connect({:?}): Already pending enabling.",
 					occ_entry.key());
 				*occ_entry.into_mut() = st;
+				debug_assert!(false);
 			},
 			st @ PeerState::Requested { .. } | st @ PeerState::PendingRequest { .. } => {
 				warn!(target: "sub-libp2p",
 					"PSM => Connect({:?}): Duplicate request.",
 					occ_entry.key());
 				*occ_entry.into_mut() = st;
+				debug_assert!(false);
 			},
 
-			PeerState::Poisoned =>
-				error!(target: "sub-libp2p", "State of {:?} is poisoned", occ_entry.key()),
+			PeerState::Poisoned => {
+				error!(target: "sub-libp2p", "State of {:?} is poisoned", occ_entry.key());
+				debug_assert!(false);
+			},
 		}
 	}
 
@@ -727,43 +862,66 @@ impl GenericProto {
 		};
 
 		match mem::replace(entry.get_mut(), PeerState::Poisoned) {
-			st @ PeerState::Disabled { .. } | st @ PeerState::Banned { .. } => {
+			st @ PeerState::Disabled { .. } | st @ PeerState::Backoff { .. } => {
 				debug!(target: "sub-libp2p", "PSM => Drop({:?}): Already disabled.", entry.key());
 				*entry.into_mut() = st;
 			},
 
-			PeerState::DisabledPendingEnable {
-				open,
-				timer_deadline,
-				timer: _
-			} => {
+			// DisabledPendingEnable => Disabled
+			PeerState::DisabledPendingEnable { connections, timer_deadline, timer: _ } => {
+				debug_assert!(!connections.is_empty());
 				debug!(target: "sub-libp2p",
 					"PSM => Drop({:?}): Interrupting pending enabling.",
 					entry.key());
 				*entry.into_mut() = PeerState::Disabled {
-					open,
-					banned_until: Some(timer_deadline),
+					connections,
+					backoff_until: Some(timer_deadline),
 				};
 			},
 
-			PeerState::Enabled { open } => {
+			// Enabled => Disabled
+			PeerState::Enabled { mut connections } => {
 				debug!(target: "sub-libp2p", "PSM => Drop({:?}): Disabling connections.", entry.key());
-				debug!(target: "sub-libp2p", "Handler({:?}) <= Disable", entry.key());
-				self.events.push_back(NetworkBehaviourAction::NotifyHandler {
-					peer_id: entry.key().clone(),
-					handler: NotifyHandler::All,
-					event: NotifsHandlerIn::Disable,
-				});
-				*entry.into_mut() = PeerState::Disabled {
-					open,
-					banned_until: None
+
+				debug_assert!(connections.iter().any(|(_, s)|
+					matches!(s, ConnectionState::Opening | ConnectionState::Open(_))));
+
+				if connections.iter().any(|(_, s)| matches!(s, ConnectionState::Open(_))) {
+					debug!(target: "sub-libp2p", "External API <= Closed({})", entry.key());
+					let event = GenericProtoOut::CustomProtocolClosed {
+						peer_id: entry.key().clone(),
+					};
+					self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
 				}
+
+				for (connec_id, connec_state) in connections.iter_mut()
+					.filter(|(_, s)| matches!(s, ConnectionState::Opening))
+				{
+					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close", entry.key(), *connec_id);
+					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
+						peer_id: entry.key().clone(),
+						handler: NotifyHandler::One(*connec_id),
+						event: NotifsHandlerIn::Close,
+					});
+					*connec_state = ConnectionState::OpeningThenClosing;
+				}
+
+				for (connec_id, connec_state) in connections.iter_mut()
+					.filter(|(_, s)| matches!(s, ConnectionState::Open(_)))
+				{
+					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close", entry.key(), *connec_id);
+					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
+						peer_id: entry.key().clone(),
+						handler: NotifyHandler::One(*connec_id),
+						event: NotifsHandlerIn::Close,
+					});
+					*connec_state = ConnectionState::Closing;
+				}
+
+				*entry.into_mut() = PeerState::Disabled { connections, backoff_until: None }
 			},
-			st @ PeerState::Incoming => {
-				error!(target: "sub-libp2p", "PSM => Drop({:?}): Not enabled (Incoming).",
-					entry.key());
-				*entry.into_mut() = st;
-			},
+
+			// Requested => Ø
 			PeerState::Requested => {
 				// We don't cancel dialing. Libp2p doesn't expose that on purpose, as other
 				// sub-systems (such as the discovery mechanism) may require dialing this peer as
@@ -771,13 +929,24 @@ impl GenericProto {
 				debug!(target: "sub-libp2p", "PSM => Drop({:?}): Not yet connected.", entry.key());
 				entry.remove();
 			},
-			PeerState::PendingRequest { timer_deadline, .. } => {
+
+			// PendingRequest => Backoff
+			PeerState::PendingRequest { timer, timer_deadline } => {
 				debug!(target: "sub-libp2p", "PSM => Drop({:?}): Not yet connected", entry.key());
-				*entry.into_mut() = PeerState::Banned { until: timer_deadline }
+				*entry.into_mut() = PeerState::Backoff { timer, timer_deadline }
 			},
 
-			PeerState::Poisoned =>
-				error!(target: "sub-libp2p", "State of {:?} is poisoned", entry.key()),
+			// Invalid state transitions.
+			st @ PeerState::Incoming { .. } => {
+				error!(target: "sub-libp2p", "PSM => Drop({:?}): Not enabled (Incoming).",
+					entry.key());
+				*entry.into_mut() = st;
+				debug_assert!(!false);
+			},
+			PeerState::Poisoned => {
+				error!(target: "sub-libp2p", "State of {:?} is poisoned", entry.key());
+				debug_assert!(!false);
+			},
 		}
 	}
 
@@ -792,28 +961,56 @@ impl GenericProto {
 		};
 
 		if !incoming.alive {
-			debug!(target: "sub-libp2p", "PSM => Accept({:?}, {:?}): Obsolete incoming,
-				sending back dropped", index, incoming.peer_id);
-			debug!(target: "sub-libp2p", "PSM <= Dropped({:?})", incoming.peer_id);
-			self.peerset.dropped(incoming.peer_id);
+			debug!(target: "sub-libp2p", "PSM => Accept({:?}, {:?}): Obsolete incoming",
+				index, incoming.peer_id);
+			match self.peers.get_mut(&incoming.peer_id) {
+				Some(PeerState::DisabledPendingEnable { .. }) |
+				Some(PeerState::Enabled { .. }) => {}
+				_ => {
+					debug!(target: "sub-libp2p", "PSM <= Dropped({:?})", incoming.peer_id);
+					self.peerset.dropped(incoming.peer_id);
+				},
+			}
 			return
 		}
 
-		match self.peers.get_mut(&incoming.peer_id) {
-			Some(state @ PeerState::Incoming) => {
+		let state = match self.peers.get_mut(&incoming.peer_id) {
+			Some(s) => s,
+			None => {
+				debug_assert!(false);
+				return;
+			}
+		};
+
+		match mem::replace(state, PeerState::Poisoned) {
+			// Incoming => Enabled
+			PeerState::Incoming { mut connections, .. } => {
 				debug!(target: "sub-libp2p", "PSM => Accept({:?}, {:?}): Enabling connections.",
 					index, incoming.peer_id);
-				debug!(target: "sub-libp2p", "Handler({:?}) <= Enable", incoming.peer_id);
-				self.events.push_back(NetworkBehaviourAction::NotifyHandler {
-					peer_id: incoming.peer_id,
-					handler: NotifyHandler::All,
-					event: NotifsHandlerIn::Enable,
-				});
-				*state = PeerState::Enabled { open: SmallVec::new() };
+
+				debug_assert!(connections.iter().any(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote)));
+				for (connec_id, connec_state) in connections.iter_mut()
+					.filter(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote))
+				{
+					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open", incoming.peer_id, *connec_id);
+					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
+						peer_id: incoming.peer_id.clone(),
+						handler: NotifyHandler::One(*connec_id),
+						event: NotifsHandlerIn::Open,
+					});
+					*connec_state = ConnectionState::Opening;
+				}
+
+				*state = PeerState::Enabled { connections };
+			}
+
+			// Any state other than `Incoming` is invalid.
+			peer => {
+				error!(target: "sub-libp2p",
+					"State mismatch in libp2p: Expected alive incoming. Got {:?}.",
+					peer);
+				debug_assert!(false);
 			}
-			peer => error!(target: "sub-libp2p",
-				"State mismatch in libp2p: Expected alive incoming. Got {:?}.",
-				peer)
 		}
 	}
 
@@ -832,20 +1029,34 @@ impl GenericProto {
 			return
 		}
 
-		match self.peers.get_mut(&incoming.peer_id) {
-			Some(state @ PeerState::Incoming) => {
+		let state = match self.peers.get_mut(&incoming.peer_id) {
+			Some(s) => s,
+			None => {
+				debug_assert!(false);
+				return;
+			}
+		};
+
+		match mem::replace(state, PeerState::Poisoned) {
+			// Incoming => Disabled
+			PeerState::Incoming { mut connections, backoff_until } => {
 				debug!(target: "sub-libp2p", "PSM => Reject({:?}, {:?}): Rejecting connections.",
 					index, incoming.peer_id);
-				debug!(target: "sub-libp2p", "Handler({:?}) <= Disable", incoming.peer_id);
-				self.events.push_back(NetworkBehaviourAction::NotifyHandler {
-					peer_id: incoming.peer_id,
-					handler: NotifyHandler::All,
-					event: NotifsHandlerIn::Disable,
-				});
-				*state = PeerState::Disabled {
-					open: SmallVec::new(),
-					banned_until: None
-				};
+
+				debug_assert!(connections.iter().any(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote)));
+				for (connec_id, connec_state) in connections.iter_mut()
+					.filter(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote))
+				{
+					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close", incoming.peer_id, connec_id);
+					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
+						peer_id: incoming.peer_id.clone(),
+						handler: NotifyHandler::One(*connec_id),
+						event: NotifsHandlerIn::Close,
+					});
+					*connec_state = ConnectionState::Closing;
+				}
+
+				*state = PeerState::Disabled { connections, backoff_until };
 			}
 			peer => error!(target: "sub-libp2p",
 				"State mismatch in libp2p: Expected alive incoming. Got {:?}.",
@@ -873,212 +1084,309 @@ impl NetworkBehaviour for GenericProto {
 	}
 
 	fn inject_connection_established(&mut self, peer_id: &PeerId, conn: &ConnectionId, endpoint: &ConnectedPoint) {
-		debug!(target: "sub-libp2p", "Libp2p => Connection ({:?},{:?}) to {} established.",
-			conn, endpoint, peer_id);
-		match (self.peers.entry(peer_id.clone()).or_insert(PeerState::Poisoned), endpoint) {
-			(st @ &mut PeerState::Requested, endpoint) |
-			(st @ &mut PeerState::PendingRequest { .. }, endpoint) => {
+		match self.peers.entry(peer_id.clone()).or_insert(PeerState::Poisoned) {
+			// Requested | PendingRequest => Enabled
+			st @ &mut PeerState::Requested |
+			st @ &mut PeerState::PendingRequest { .. } => {
 				debug!(target: "sub-libp2p",
 					"Libp2p => Connected({}, {:?}): Connection was requested by PSM.",
 					peer_id, endpoint
 				);
-				*st = PeerState::Enabled { open: SmallVec::new() };
+				debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open", peer_id, *conn);
 				self.events.push_back(NetworkBehaviourAction::NotifyHandler {
 					peer_id: peer_id.clone(),
 					handler: NotifyHandler::One(*conn),
-					event: NotifsHandlerIn::Enable
+					event: NotifsHandlerIn::Open
 				});
-			}
 
-			// Note: it may seem weird that "Banned" peers get treated as if they were absent.
-			// This is because the word "Banned" means "temporarily prevent outgoing connections to
-			// this peer", and not "banned" in the sense that we would refuse the peer altogether.
-			(st @ &mut PeerState::Poisoned, endpoint @ ConnectedPoint::Listener { .. }) |
-			(st @ &mut PeerState::Banned { .. }, endpoint @ ConnectedPoint::Listener { .. }) => {
-				let incoming_id = self.next_incoming_index;
-				self.next_incoming_index.0 = match self.next_incoming_index.0.checked_add(1) {
-					Some(v) => v,
-					None => {
-						error!(target: "sub-libp2p", "Overflow in next_incoming_index");
-						return
-					}
-				};
-				debug!(target: "sub-libp2p", "Libp2p => Connected({}, {:?}): Incoming connection",
-					peer_id, endpoint);
-				debug!(target: "sub-libp2p", "PSM <= Incoming({}, {:?}).",
-					peer_id, incoming_id);
-				self.peerset.incoming(peer_id.clone(), incoming_id);
-				self.incoming.push(IncomingPeer {
-					peer_id: peer_id.clone(),
-					alive: true,
-					incoming_id,
-				});
-				*st = PeerState::Incoming { };
+				let mut connections = SmallVec::new();
+				connections.push((*conn, ConnectionState::Opening));
+				*st = PeerState::Enabled { connections };
 			}
 
-			(st @ &mut PeerState::Poisoned, endpoint) |
-			(st @ &mut PeerState::Banned { .. }, endpoint) => {
-				let banned_until = if let PeerState::Banned { until } = st {
-					Some(*until)
+			// Poisoned gets inserted above if the entry was missing.
+			// Ø | Backoff => Disabled
+			st @ &mut PeerState::Poisoned |
+			st @ &mut PeerState::Backoff { .. } => {
+				let backoff_until = if let PeerState::Backoff { timer_deadline, .. } = st {
+					Some(*timer_deadline)
 				} else {
 					None
 				};
 				debug!(target: "sub-libp2p",
-					"Libp2p => Connected({},{:?}): Not requested by PSM, disabling.",
-					peer_id, endpoint);
-				*st = PeerState::Disabled { open: SmallVec::new(), banned_until };
-				self.events.push_back(NetworkBehaviourAction::NotifyHandler {
-					peer_id: peer_id.clone(),
-					handler: NotifyHandler::One(*conn),
-					event: NotifsHandlerIn::Disable
-				});
-			}
+					"Libp2p => Connected({}, {:?}, {:?}): Not requested by PSM, disabling.",
+					peer_id, endpoint, *conn);
 
-			(PeerState::Incoming { .. }, _) => {
-				debug!(target: "sub-libp2p",
-					"Secondary connection {:?} to {} waiting for PSM decision.",
-					conn, peer_id);
-			},
-
-			(PeerState::Enabled { .. }, _) => {
-				debug!(target: "sub-libp2p", "Handler({},{:?}) <= Enable secondary connection",
-					peer_id, conn);
-				self.events.push_back(NetworkBehaviourAction::NotifyHandler {
-					peer_id: peer_id.clone(),
-					handler: NotifyHandler::One(*conn),
-					event: NotifsHandlerIn::Enable
-				});
+				let mut connections = SmallVec::new();
+				connections.push((*conn, ConnectionState::Closed));
+				*st = PeerState::Disabled { connections, backoff_until };
 			}
 
-			(PeerState::Disabled { .. }, _) | (PeerState::DisabledPendingEnable { .. }, _) => {
-				debug!(target: "sub-libp2p", "Handler({},{:?}) <= Disable secondary connection",
-					peer_id, conn);
-				self.events.push_back(NetworkBehaviourAction::NotifyHandler {
-					peer_id: peer_id.clone(),
-					handler: NotifyHandler::One(*conn),
-					event: NotifsHandlerIn::Disable
-				});
+			// In all other states, add this new connection to the list of closed inactive
+			// connections.
+			PeerState::Incoming { connections, .. } |
+			PeerState::Disabled { connections, .. } |
+			PeerState::DisabledPendingEnable { connections, .. } |
+			PeerState::Enabled { connections, .. } => {
+				debug!(target: "sub-libp2p",
+					"Libp2p => Connected({}, {:?}, {:?}): Secondary connection. Leaving closed.",
+					peer_id, endpoint, *conn);
+				connections.push((*conn, ConnectionState::Closed));
 			}
 		}
 	}
 
-	fn inject_connection_closed(&mut self, peer_id: &PeerId, conn: &ConnectionId, endpoint: &ConnectedPoint) {
-		debug!(target: "sub-libp2p", "Libp2p => Connection ({:?},{:?}) to {} closed.",
-			conn, endpoint, peer_id);
-		match self.peers.get_mut(peer_id) {
-			Some(PeerState::Disabled { open, .. }) |
-			Some(PeerState::DisabledPendingEnable { open, .. }) |
-			Some(PeerState::Enabled { open, .. }) => {
-				// Check if the "link" to the peer is already considered closed,
-				// i.e. there is no connection that is open for custom protocols,
-				// in which case `CustomProtocolClosed` was already emitted.
-				let closed = open.is_empty();
-				let sink_closed = open.get(0).map_or(false, |(c, _)| c == conn);
-				open.retain(|(c, _)| c != conn);
-				if !closed {
-					if let Some((_, sink)) = open.get(0) {
-						if sink_closed {
-							let event = GenericProtoOut::CustomProtocolReplaced {
-								peer_id: peer_id.clone(),
-								notifications_sink: sink.clone(),
+	fn inject_connection_closed(&mut self, peer_id: &PeerId, conn: &ConnectionId, _endpoint: &ConnectedPoint) {
+		let mut entry = if let Entry::Occupied(entry) = self.peers.entry(peer_id.clone()) {
+			entry
+		} else {
+			error!(target: "sub-libp2p", "inject_connection_closed: State mismatch in the custom protos handler");
+			debug_assert!(false);
+			return
+		};
+
+		match mem::replace(entry.get_mut(), PeerState::Poisoned) {
+			// Disabled => Disabled | Backoff | Ø
+			PeerState::Disabled { mut connections, backoff_until } => {
+				debug!(target: "sub-libp2p", "Libp2p => Disconnected({}, {:?}): Disabled.", peer_id, *conn);
+
+				if let Some(pos) = connections.iter().position(|(c, _)| *c == *conn) {
+					connections.remove(pos);
+				} else {
+					debug_assert!(false);
+					error!(target: "sub-libp2p",
+						"inject_connection_closed: State mismatch in the custom protos handler");
+				}
+
+				if connections.is_empty() {
+					if let Some(until) = backoff_until {
+						let now = Instant::now();
+						if until > now {
+							let delay_id = self.next_delay_id;
+							self.next_delay_id.0 += 1;
+							let delay = futures_timer::Delay::new(until - now);
+							let peer_id = peer_id.clone();
+							self.delays.push(async move {
+								delay.await;
+								(delay_id, peer_id)
+							}.boxed());
+
+							*entry.get_mut() = PeerState::Backoff {
+								timer: delay_id,
+								timer_deadline: until,
 							};
-							self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
+						} else {
+							entry.remove();
 						}
 					} else {
-						debug!(target: "sub-libp2p", "External API <= Closed({})", peer_id);
-						let event = GenericProtoOut::CustomProtocolClosed {
-							peer_id: peer_id.clone(),
-							reason: "Disconnected by libp2p".into(),
-						};
-
-						self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
+						entry.remove();
 					}
+				} else {
+					*entry.get_mut() = PeerState::Disabled { connections, backoff_until };
 				}
-			}
-			_ => {}
-		}
-	}
+			},
 
-	fn inject_disconnected(&mut self, peer_id: &PeerId) {
-		match self.peers.remove(peer_id) {
-			None | Some(PeerState::Requested) | Some(PeerState::PendingRequest { .. }) |
-			Some(PeerState::Banned { .. }) =>
-				// This is a serious bug either in this state machine or in libp2p.
-				error!(target: "sub-libp2p",
-					"`inject_disconnected` called for unknown peer {}",
-					peer_id),
+			// DisabledPendingEnable => DisabledPendingEnable | Backoff
+			PeerState::DisabledPendingEnable { mut connections, timer_deadline, timer } => {
+				debug!(
+					target: "sub-libp2p",
+					"Libp2p => Disconnected({}, {:?}): Disabled but pending enable.",
+					peer_id, *conn
+				);
 
-			Some(PeerState::Disabled { open, banned_until, .. }) => {
-				if !open.is_empty() {
+				if let Some(pos) = connections.iter().position(|(c, _)| *c == *conn) {
+					connections.remove(pos);
+				} else {
 					debug_assert!(false);
-					error!(
-						target: "sub-libp2p",
-						"State mismatch: disconnected from {} with non-empty list of connections",
-						peer_id
-					);
+					error!(target: "sub-libp2p",
+						"inject_connection_closed: State mismatch in the custom protos handler");
 				}
-				debug!(target: "sub-libp2p", "Libp2p => Disconnected({}): Was disabled.", peer_id);
-				if let Some(until) = banned_until {
-					self.peers.insert(peer_id.clone(), PeerState::Banned { until });
+
+				if connections.is_empty() {
+					debug!(target: "sub-libp2p", "PSM <= Dropped({})", peer_id);
+					self.peerset.dropped(peer_id.clone());
+					*entry.get_mut() = PeerState::Backoff { timer, timer_deadline };
+
+				} else {
+					*entry.get_mut() = PeerState::DisabledPendingEnable {
+						connections, timer_deadline, timer
+					};
 				}
-			}
+			},
 
-			Some(PeerState::DisabledPendingEnable { open, timer_deadline, .. }) => {
-				if !open.is_empty() {
+			// Incoming => Incoming | Disabled | Backoff | Ø
+			PeerState::Incoming { mut connections, backoff_until } => {
+				debug!(
+					target: "sub-libp2p",
+					"Libp2p => Disconnected({}, {:?}): OpenDesiredByRemote.",
+					peer_id, *conn
+				);
+
+				debug_assert!(connections.iter().any(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote)));
+
+				if let Some(pos) = connections.iter().position(|(c, _)| *c == *conn) {
+					connections.remove(pos);
+				} else {
 					debug_assert!(false);
-					error!(
-						target: "sub-libp2p",
-						"State mismatch: disconnected from {} with non-empty list of connections",
-						peer_id
-					);
+					error!(target: "sub-libp2p",
+						"inject_connection_closed: State mismatch in the custom protos handler");
+				}
+
+				let no_desired_left = !connections.iter().any(|(_, s)| {
+					matches!(s, ConnectionState::OpenDesiredByRemote)
+				});
+
+				// If no connection is `OpenDesiredByRemote` anymore, clean up the peerset incoming
+				// request.
+				if no_desired_left {
+					// In the incoming state, we don't report "Dropped". Instead we will just
+					// ignore the corresponding Accept/Reject.
+					if let Some(state) = self.incoming.iter_mut()
+						.find(|i| i.alive && i.peer_id == *peer_id)
+					{
+						state.alive = false;
+					} else {
+						error!(target: "sub-libp2p", "State mismatch in libp2p: no entry in \
+							incoming corresponding to an incoming state in peers");
+						debug_assert!(false);
+					}
+				}
+
+				if connections.is_empty() {
+					if let Some(until) = backoff_until {
+						let now = Instant::now();
+						if until > now {
+							let delay_id = self.next_delay_id;
+							self.next_delay_id.0 += 1;
+							let delay = futures_timer::Delay::new(until - now);
+							let peer_id = peer_id.clone();
+							self.delays.push(async move {
+								delay.await;
+								(delay_id, peer_id)
+							}.boxed());
+
+							*entry.get_mut() = PeerState::Backoff {
+								timer: delay_id,
+								timer_deadline: until,
+							};
+						} else {
+							entry.remove();
+						}
+					} else {
+						entry.remove();
+					}
+
+				} else if no_desired_left {
+					// If no connection is `OpenDesiredByRemote` anymore, switch to `Disabled`.
+					*entry.get_mut() = PeerState::Disabled { connections, backoff_until };
+				} else {
+					*entry.get_mut() = PeerState::Incoming { connections, backoff_until };
 				}
-				debug!(target: "sub-libp2p",
-					"Libp2p => Disconnected({}): Was disabled but pending enable.",
-					peer_id);
-				debug!(target: "sub-libp2p", "PSM <= Dropped({})", peer_id);
-				self.peerset.dropped(peer_id.clone());
-				self.peers.insert(peer_id.clone(), PeerState::Banned { until: timer_deadline });
 			}
 
-			Some(PeerState::Enabled { open, .. }) => {
-				if !open.is_empty() {
+			// Enabled => Enabled | Backoff
+			// Peers are always backed-off when disconnecting while Enabled.
+			PeerState::Enabled { mut connections } => {
+				debug!(
+					target: "sub-libp2p",
+					"Libp2p => Disconnected({}, {:?}): Enabled.",
+					peer_id, *conn
+				);
+
+				debug_assert!(connections.iter().any(|(_, s)|
+					matches!(s, ConnectionState::Opening | ConnectionState::Open(_))));
+
+				if let Some(pos) = connections.iter().position(|(c, _)| *c == *conn) {
+					let (_, state) = connections.remove(pos);
+					if let ConnectionState::Open(_) = state {
+						if let Some((replacement_pos, replacement_sink)) = connections
+							.iter()
+							.enumerate()
+							.filter_map(|(num, (_, s))| {
+								match s {
+									ConnectionState::Open(s) => Some((num, s.clone())),
+									_ => None
+								}
+							})
+							.next()
+						{
+							if pos <= replacement_pos {
+								debug!(target: "sub-libp2p", "External API <= Sink replaced({})", peer_id);
+								let event = GenericProtoOut::CustomProtocolReplaced {
+									peer_id: peer_id.clone(),
+									notifications_sink: replacement_sink,
+								};
+								self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
+							}
+						} else {
+							debug!(target: "sub-libp2p", "External API <= Closed({})", peer_id);
+							let event = GenericProtoOut::CustomProtocolClosed {
+								peer_id: peer_id.clone(),
+							};
+							self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
+						}
+					}
+
+				} else {
+					error!(target: "sub-libp2p",
+						"inject_connection_closed: State mismatch in the custom protos handler");
 					debug_assert!(false);
-					error!(
-						target: "sub-libp2p",
-						"State mismatch: disconnected from {} with non-empty list of connections",
-						peer_id
-					);
 				}
-				debug!(target: "sub-libp2p", "Libp2p => Disconnected({}): Was enabled.", peer_id);
-				debug!(target: "sub-libp2p", "PSM <= Dropped({})", peer_id);
-				self.peerset.dropped(peer_id.clone());
-				let ban_dur = Uniform::new(5, 10).sample(&mut rand::thread_rng());
-				self.peers.insert(peer_id.clone(), PeerState::Banned {
-					until: Instant::now() + Duration::from_secs(ban_dur)
-				});
-			}
 
-			// In the incoming state, we don't report "Dropped". Instead we will just ignore the
-			// corresponding Accept/Reject.
-			Some(PeerState::Incoming { }) => {
-				if let Some(state) = self.incoming.iter_mut()
-					.find(|i| i.alive && i.peer_id == *peer_id)
+				if connections.is_empty() {
+					debug!(target: "sub-libp2p", "PSM <= Dropped({})", peer_id);
+					self.peerset.dropped(peer_id.clone());
+					let ban_dur = Uniform::new(5, 10).sample(&mut rand::thread_rng());
+
+					let delay_id = self.next_delay_id;
+					self.next_delay_id.0 += 1;
+					let delay = futures_timer::Delay::new(Duration::from_secs(ban_dur));
+					let peer_id = peer_id.clone();
+					self.delays.push(async move {
+						delay.await;
+						(delay_id, peer_id)
+					}.boxed());
+
+					*entry.get_mut() = PeerState::Backoff {
+						timer: delay_id,
+						timer_deadline: Instant::now() + Duration::from_secs(ban_dur),
+					};
+
+				} else if !connections.iter().any(|(_, s)|
+					matches!(s, ConnectionState::Opening | ConnectionState::Open(_)))
 				{
-					debug!(target: "sub-libp2p",
-						"Libp2p => Disconnected({}): Was in incoming mode with id {:?}.",
-						peer_id, state.incoming_id);
-					state.alive = false;
+					debug!(target: "sub-libp2p", "PSM <= Dropped({:?})", peer_id);
+					self.peerset.dropped(peer_id.clone());
+
+					*entry.get_mut() = PeerState::Disabled {
+						connections,
+						backoff_until: None
+					};
+
 				} else {
-					error!(target: "sub-libp2p", "State mismatch in libp2p: no entry in incoming \
-						corresponding to an incoming state in peers")
+					*entry.get_mut() = PeerState::Enabled { connections };
 				}
 			}
 
-			Some(PeerState::Poisoned) =>
-				error!(target: "sub-libp2p", "State of peer {} is poisoned", peer_id),
+			PeerState::Requested |
+			PeerState::PendingRequest { .. } |
+			PeerState::Backoff { .. } => {
+				// This is a serious bug either in this state machine or in libp2p.
+				error!(target: "sub-libp2p",
+					"`inject_connection_closed` called for unknown peer {}",
+					peer_id);
+				debug_assert!(false);
+			},
+			PeerState::Poisoned => {
+				error!(target: "sub-libp2p", "State of peer {} is poisoned", peer_id);
+				debug_assert!(false);
+			},
 		}
 	}
 
+	fn inject_disconnected(&mut self, _peer_id: &PeerId) {
+	}
+
 	fn inject_addr_reach_failure(&mut self, peer_id: Option<&PeerId>, addr: &Multiaddr, error: &dyn error::Error) {
 		trace!(target: "sub-libp2p", "Libp2p => Reach failure for {:?} through {:?}: {:?}", peer_id, addr, error);
 	}
@@ -1087,19 +1395,39 @@ impl NetworkBehaviour for GenericProto {
 		if let Entry::Occupied(mut entry) = self.peers.entry(peer_id.clone()) {
 			match mem::replace(entry.get_mut(), PeerState::Poisoned) {
 				// The peer is not in our list.
-				st @ PeerState::Banned { .. } => {
+				st @ PeerState::Backoff { .. } => {
 					trace!(target: "sub-libp2p", "Libp2p => Dial failure for {:?}", peer_id);
 					*entry.into_mut() = st;
 				},
 
 				// "Basic" situation: we failed to reach a peer that the peerset requested.
-				PeerState::Requested | PeerState::PendingRequest { .. } => {
+				st @ PeerState::Requested |
+				st @ PeerState::PendingRequest { .. } => {
 					debug!(target: "sub-libp2p", "Libp2p => Dial failure for {:?}", peer_id);
-					*entry.into_mut() = PeerState::Banned {
-						until: Instant::now() + Duration::from_secs(5)
-					};
+
 					debug!(target: "sub-libp2p", "PSM <= Dropped({:?})", peer_id);
-					self.peerset.dropped(peer_id.clone())
+					self.peerset.dropped(peer_id.clone());
+
+					let now = Instant::now();
+					let ban_duration = match st {
+						PeerState::PendingRequest { timer_deadline, .. } if timer_deadline > now =>
+							cmp::max(timer_deadline - now, Duration::from_secs(5)),
+						_ => Duration::from_secs(5)
+					};
+
+					let delay_id = self.next_delay_id;
+					self.next_delay_id.0 += 1;
+					let delay = futures_timer::Delay::new(ban_duration);
+					let peer_id = peer_id.clone();
+					self.delays.push(async move {
+						delay.await;
+						(delay_id, peer_id)
+					}.boxed());
+
+					*entry.into_mut() = PeerState::Backoff {
+						timer: delay_id,
+						timer_deadline: now + ban_duration,
+					};
 				},
 
 				// We can still get dial failures even if we are already connected to the peer,
@@ -1110,8 +1438,10 @@ impl NetworkBehaviour for GenericProto {
 					*entry.into_mut() = st;
 				},
 
-				PeerState::Poisoned =>
-					error!(target: "sub-libp2p", "State of {:?} is poisoned", peer_id),
+				PeerState::Poisoned => {
+					error!(target: "sub-libp2p", "State of {:?} is poisoned", peer_id);
+					debug_assert!(false);
+				},
 			}
 
 		} else {
@@ -1127,123 +1457,271 @@ impl NetworkBehaviour for GenericProto {
 		event: NotifsHandlerOut,
 	) {
 		match event {
-			NotifsHandlerOut::Closed { endpoint, reason } => {
+			NotifsHandlerOut::OpenDesiredByRemote => {
 				debug!(target: "sub-libp2p",
-					"Handler({:?}) => Endpoint {:?} closed for custom protocols: {}",
-					source, endpoint, reason);
+					"Handler({:?}, {:?}]) => OpenDesiredByRemote",
+					source, connection);
 
 				let mut entry = if let Entry::Occupied(entry) = self.peers.entry(source.clone()) {
 					entry
 				} else {
-					error!(target: "sub-libp2p", "Closed: State mismatch in the custom protos handler");
+					error!(target: "sub-libp2p", "OpenDesiredByRemote: State mismatch in the custom protos handler");
+					debug_assert!(false);
 					return
 				};
 
-				let (last, new_notifications_sink) = match mem::replace(entry.get_mut(), PeerState::Poisoned) {
-					PeerState::Enabled { mut open } => {
-						let pos = open.iter().position(|(c, _)| c == &connection);
-						let sink_closed = pos == Some(0);
-						if let Some(pos) = pos {
-							open.remove(pos);
+				match mem::replace(entry.get_mut(), PeerState::Poisoned) {
+					// Incoming => Incoming
+					PeerState::Incoming { mut connections, backoff_until } => {
+						debug_assert!(connections.iter().any(|(_, s)|
+							matches!(s, ConnectionState::OpenDesiredByRemote)));
+						if let Some((_, connec_state)) = connections.iter_mut().find(|(c, _)| *c == connection) {
+							if let ConnectionState::Closed = *connec_state {
+								*connec_state = ConnectionState::OpenDesiredByRemote;
+							} else {
+								// Connections in `OpeningThenClosing` state are in a Closed phase,
+								// and as such can emit `OpenDesiredByRemote` messages.
+								// Since an `Open` and a `Close` messages have already been sent,
+								// there is nothing much that can be done about this anyway.
+								debug_assert!(matches!(
+									connec_state,
+									ConnectionState::OpeningThenClosing
+								));
+							}
 						} else {
-							debug_assert!(false);
 							error!(
 								target: "sub-libp2p",
-								"State mismatch with {}: unknown closed connection",
-								source
+								"OpenDesiredByRemote: State mismatch in the custom protos handler"
 							);
+							debug_assert!(false);
 						}
 
-						// TODO: We switch the entire peer state to "disabled" because of possible
-						// race conditions involving the legacy substream.
-						// Once https://github.com/paritytech/substrate/issues/5670 is done, this
-						// should be changed to stay in the `Enabled` state.
-						debug!(target: "sub-libp2p", "Handler({:?}) <= Disable", source);
-						debug!(target: "sub-libp2p", "PSM <= Dropped({:?})", source);
-						self.peerset.dropped(source.clone());
-						self.events.push_back(NetworkBehaviourAction::NotifyHandler {
-							peer_id: source.clone(),
-							handler: NotifyHandler::All,
-							event: NotifsHandlerIn::Disable,
-						});
+						*entry.into_mut() = PeerState::Incoming { connections, backoff_until };
+					},
 
-						let last = open.is_empty();
-						let new_notifications_sink = open.iter().next().and_then(|(_, sink)|
-							if sink_closed {
-								Some(sink.clone())
+					PeerState::Enabled { mut connections } => {
+						debug_assert!(connections.iter().any(|(_, s)|
+							matches!(s, ConnectionState::Opening | ConnectionState::Open(_))));
+
+						if let Some((_, connec_state)) = connections.iter_mut().find(|(c, _)| *c == connection) {
+							if let ConnectionState::Closed = *connec_state {
+								debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open", source, connection);
+								self.events.push_back(NetworkBehaviourAction::NotifyHandler {
+									peer_id: source,
+									handler: NotifyHandler::One(connection),
+									event: NotifsHandlerIn::Open,
+								});
+								*connec_state = ConnectionState::Opening;
 							} else {
-								None
-							});
-
-						*entry.into_mut() = PeerState::Disabled {
-							open,
-							banned_until: None
-						};
-
-						(last, new_notifications_sink)
-					},
-					PeerState::Disabled { mut open, banned_until } => {
-						let pos = open.iter().position(|(c, _)| c == &connection);
-						let sink_closed = pos == Some(0);
-						if let Some(pos) = pos {
-							open.remove(pos);
+								// Connections in `OpeningThenClosing` and `Opening` are in a Closed
+								// phase, and as such can emit `OpenDesiredByRemote` messages.
+								// Since an `Open` message haS already been sent, there is nothing
+								// more to do.
+								debug_assert!(matches!(
+									connec_state,
+									ConnectionState::OpenDesiredByRemote | ConnectionState::Opening
+								));
+							}
 						} else {
-							debug_assert!(false);
 							error!(
 								target: "sub-libp2p",
-								"State mismatch with {}: unknown closed connection",
-								source
+								"OpenDesiredByRemote: State mismatch in the custom protos handler"
 							);
+							debug_assert!(false);
 						}
 
-						let last = open.is_empty();
-						let new_notifications_sink = open.iter().next().and_then(|(_, sink)|
-							if sink_closed {
-								Some(sink.clone())
-							} else {
-								None
-							});
+						*entry.into_mut() = PeerState::Enabled { connections };
+					},
 
-						*entry.into_mut() = PeerState::Disabled {
-							open,
-							banned_until
-						};
+					// Disabled => Disabled | Incoming
+					PeerState::Disabled { mut connections, backoff_until } => {
+						if let Some((_, connec_state)) = connections.iter_mut().find(|(c, _)| *c == connection) {
+							if let ConnectionState::Closed = *connec_state {
+								*connec_state = ConnectionState::OpenDesiredByRemote;
 
-						(last, new_notifications_sink)
-					},
-					PeerState::DisabledPendingEnable {
-						mut open,
-						timer,
-						timer_deadline
-					} => {
-						let pos = open.iter().position(|(c, _)| c == &connection);
-						let sink_closed = pos == Some(0);
-						if let Some(pos) = pos {
-							open.remove(pos);
+								let incoming_id = self.next_incoming_index;
+								self.next_incoming_index.0 += 1;
+
+								debug!(target: "sub-libp2p", "PSM <= Incoming({}, {:?}).",
+									source, incoming_id);
+								self.peerset.incoming(source.clone(), incoming_id);
+								self.incoming.push(IncomingPeer {
+									peer_id: source.clone(),
+									alive: true,
+									incoming_id,
+								});
+
+								*entry.into_mut() = PeerState::Incoming { connections, backoff_until };
+
+							} else {
+								// Connections in `OpeningThenClosing` are in a Closed phase, and
+								// as such can emit `OpenDesiredByRemote` messages.
+								// We ignore them.
+								debug_assert!(matches!(
+									connec_state,
+									ConnectionState::OpeningThenClosing
+								));
+							}
 						} else {
-							debug_assert!(false);
 							error!(
 								target: "sub-libp2p",
-								"State mismatch with {}: unknown closed connection",
-								source
+								"OpenDesiredByRemote: State mismatch in the custom protos handler"
 							);
+							debug_assert!(false);
 						}
+					}
+
+					// DisabledPendingEnable => DisabledPendingEnable | Incoming
+					PeerState::DisabledPendingEnable { mut connections, timer, timer_deadline } => {
+						if let Some((_, connec_state)) = connections.iter_mut().find(|(c, _)| *c == connection) {
+							if let ConnectionState::Closed = *connec_state {
+								*connec_state = ConnectionState::OpenDesiredByRemote;
+
+								let incoming_id = self.next_incoming_index;
+								self.next_incoming_index.0 = match self.next_incoming_index.0.checked_add(1) {
+									Some(v) => v,
+									None => {
+										error!(target: "sub-libp2p", "Overflow in next_incoming_index");
+										return
+									}
+								};
+
+								debug!(target: "sub-libp2p", "PSM <= Incoming({}, {:?}).",
+									source, incoming_id);
+								self.peerset.incoming(source.clone(), incoming_id);
+								self.incoming.push(IncomingPeer {
+									peer_id: source.clone(),
+									alive: true,
+									incoming_id,
+								});
+
+								*entry.into_mut() = PeerState::Incoming {
+									connections,
+									backoff_until: Some(timer_deadline),
+								};
 
-						let last = open.is_empty();
-						let new_notifications_sink = open.iter().next().and_then(|(_, sink)|
-							if sink_closed {
-								Some(sink.clone())
 							} else {
-								None
-							});
+								// Connections in `OpeningThenClosing` are in a Closed phase, and
+								// as such can emit `OpenDesiredByRemote` messages.
+								// We ignore them.
+								debug_assert!(matches!(
+									connec_state,
+									ConnectionState::OpeningThenClosing
+								));
+								*entry.into_mut() = PeerState::DisabledPendingEnable {
+									connections,
+									timer,
+									timer_deadline,
+								};
+							}
+						} else {
+							error!(
+								target: "sub-libp2p",
+								"OpenDesiredByRemote: State mismatch in the custom protos handler"
+							);
+							debug_assert!(false);
+						}
+					}
 
-						*entry.into_mut() = PeerState::DisabledPendingEnable {
-							open,
-							timer,
-							timer_deadline
+					state => {
+						error!(target: "sub-libp2p",
+							   "OpenDesiredByRemote: Unexpected state in the custom protos handler: {:?}",
+							   state);
+						debug_assert!(false);
+						return
+					}
+				};
+			}
+
+			NotifsHandlerOut::CloseDesired => {
+				debug!(target: "sub-libp2p",
+					"Handler({}, {:?}) => CloseDesired",
+					source, connection);
+
+				let mut entry = if let Entry::Occupied(entry) = self.peers.entry(source.clone()) {
+					entry
+				} else {
+					error!(target: "sub-libp2p", "CloseDesired: State mismatch in the custom protos handler");
+					debug_assert!(false);
+					return
+				};
+
+				match mem::replace(entry.get_mut(), PeerState::Poisoned) {
+					// Enabled => Enabled | Disabled
+					PeerState::Enabled { mut connections } => {
+						debug_assert!(connections.iter().any(|(_, s)|
+							matches!(s, ConnectionState::Opening | ConnectionState::Open(_))));
+
+						let pos = if let Some(pos) = connections.iter().position(|(c, _)| *c == connection) {
+							pos
+						} else {
+							error!(target: "sub-libp2p",
+								"CloseDesired: State mismatch in the custom protos handler");
+							debug_assert!(false);
+							return;
 						};
 
-						(last, new_notifications_sink)
+						if matches!(connections[pos].1, ConnectionState::Closing) {
+							return;
+						}
+
+						debug_assert!(matches!(connections[pos].1, ConnectionState::Open(_)));
+						connections[pos].1 = ConnectionState::Closing;
+
+						debug!(target: "sub-libp2p", "Handler({}, {:?}) <= Close", source, connection);
+						self.events.push_back(NetworkBehaviourAction::NotifyHandler {
+							peer_id: source.clone(),
+							handler: NotifyHandler::One(connection),
+							event: NotifsHandlerIn::Close,
+						});
+
+						if let Some((replacement_pos, replacement_sink)) = connections
+							.iter()
+							.enumerate()
+							.filter_map(|(num, (_, s))| {
+								match s {
+									ConnectionState::Open(s) => Some((num, s.clone())),
+									_ => None
+								}
+							})
+							.next()
+						{
+							if pos <= replacement_pos {
+								debug!(target: "sub-libp2p", "External API <= Sink replaced({:?})", source);
+								let event = GenericProtoOut::CustomProtocolReplaced {
+									peer_id: source,
+									notifications_sink: replacement_sink,
+								};
+								self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
+								*entry.into_mut() = PeerState::Enabled { connections, };
+							}
+
+						} else {
+							// List of open connections wasn't empty before but now it is.
+							if !connections.iter().any(|(_, s)| matches!(s, ConnectionState::Opening)) {
+								debug!(target: "sub-libp2p", "PSM <= Dropped({:?})", source);
+								self.peerset.dropped(source.clone());
+								*entry.into_mut() = PeerState::Disabled {
+									connections, backoff_until: None
+								};
+							} else {
+								*entry.into_mut() = PeerState::Enabled { connections };
+							}
+
+							debug!(target: "sub-libp2p", "External API <= Closed({:?})", source);
+							let event = GenericProtoOut::CustomProtocolClosed {
+								peer_id: source,
+							};
+							self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
+						}
+					},
+
+					// All connections in `Disabled` and `DisabledPendingEnable` have been sent a
+					// `Close` message already, and as such ignore any `CloseDesired` message.
+					state @ PeerState::Disabled { .. } |
+					state @ PeerState::DisabledPendingEnable { .. } => {
+						*entry.into_mut() = state;
+						return;
 					},
 					state => {
 						error!(target: "sub-libp2p",
@@ -1251,103 +1729,227 @@ impl NetworkBehaviour for GenericProto {
 							state);
 						return
 					}
-				};
+				}
+			}
 
-				if last {
-					debug!(target: "sub-libp2p", "External API <= Closed({:?})", source);
-					let event = GenericProtoOut::CustomProtocolClosed {
-						reason,
-						peer_id: source,
-					};
-					self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
+			NotifsHandlerOut::CloseResult => {
+				debug!(target: "sub-libp2p",
+					"Handler({}, {:?}) => CloseResult",
+					source, connection);
+
+				match self.peers.get_mut(&source) {
+					// Move the connection from `Closing` to `Closed`.
+					Some(PeerState::DisabledPendingEnable { connections, .. }) |
+					Some(PeerState::Disabled { connections, .. }) |
+					Some(PeerState::Enabled { connections, .. }) => {
+						if let Some((_, connec_state)) = connections
+							.iter_mut()
+							.find(|(c, s)| *c == connection && matches!(s, ConnectionState::Closing))
+						{
+							*connec_state = ConnectionState::Closed;
+						} else {
+							error!(target: "sub-libp2p",
+								"CloseResult: State mismatch in the custom protos handler");
+							debug_assert!(false);
+						}
+					},
 
-				} else {
-					if let Some(new_notifications_sink) = new_notifications_sink {
-						let event = GenericProtoOut::CustomProtocolReplaced {
-							peer_id: source,
-							notifications_sink: new_notifications_sink,
-						};
-						self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
+					state => {
+						error!(target: "sub-libp2p",
+							   "CloseResult: Unexpected state in the custom protos handler: {:?}",
+							   state);
+						debug_assert!(false);
 					}
-					debug!(target: "sub-libp2p", "Secondary connection closed custom protocol.");
 				}
 			}
 
-			NotifsHandlerOut::Open { endpoint, received_handshake, notifications_sink } => {
+			NotifsHandlerOut::OpenResultOk { received_handshake, notifications_sink, .. } => {
 				debug!(target: "sub-libp2p",
-					"Handler({:?}) => Endpoint {:?} open for custom protocols.",
-					source, endpoint);
-
-				let first = match self.peers.get_mut(&source) {
-					Some(PeerState::Enabled { ref mut open, .. }) |
-					Some(PeerState::DisabledPendingEnable { ref mut open, .. }) |
-					Some(PeerState::Disabled { ref mut open, .. }) => {
-						let first = open.is_empty();
-						if !open.iter().any(|(c, _)| *c == connection) {
-							open.push((connection, notifications_sink.clone()));
+					"Handler({}, {:?}) => OpenResultOk",
+					source, connection);
+
+				match self.peers.get_mut(&source) {
+					Some(PeerState::Enabled { connections, .. }) => {
+						debug_assert!(connections.iter().any(|(_, s)|
+							matches!(s, ConnectionState::Opening | ConnectionState::Open(_))));
+						let any_open = connections.iter().any(|(_, s)| matches!(s, ConnectionState::Open(_)));
+
+						if let Some((_, connec_state)) = connections.iter_mut().find(|(c, s)|
+							*c == connection && matches!(s, ConnectionState::Opening))
+						{
+							if !any_open {
+								debug!(target: "sub-libp2p", "External API <= Open({:?})", source);
+								let event = GenericProtoOut::CustomProtocolOpen {
+									peer_id: source,
+									received_handshake,
+									notifications_sink: notifications_sink.clone(),
+								};
+								self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
+							}
+							*connec_state = ConnectionState::Open(notifications_sink);
+						} else if let Some((_, connec_state)) = connections.iter_mut().find(|(c, s)|
+							*c == connection && matches!(s, ConnectionState::OpeningThenClosing))
+						{
+							*connec_state = ConnectionState::Closing;
 						} else {
-							error!(
-								target: "sub-libp2p",
-								"State mismatch: connection with {} opened a second time",
-								source
-							);
+							debug_assert!(false);
+							error!(target: "sub-libp2p",
+								"OpenResultOk State mismatch in the custom protos handler");
+						}
+					},
+
+					Some(PeerState::DisabledPendingEnable { connections, .. }) |
+					Some(PeerState::Disabled { connections, .. }) => {
+						if let Some((_, connec_state)) = connections.iter_mut().find(|(c, s)|
+							*c == connection && matches!(s, ConnectionState::OpeningThenClosing))
+						{
+							*connec_state = ConnectionState::Closing;
+						} else {
+							error!(target: "sub-libp2p",
+								"OpenResultOk State mismatch in the custom protos handler");
+							debug_assert!(false);
 						}
-						first
 					}
+
 					state => {
 						error!(target: "sub-libp2p",
-							   "Open: Unexpected state in the custom protos handler: {:?}",
+							   "OpenResultOk: Unexpected state in the custom protos handler: {:?}",
 							   state);
+						debug_assert!(false);
 						return
 					}
+				}
+			}
+
+			NotifsHandlerOut::OpenResultErr => {
+				debug!(target: "sub-libp2p",
+					"Handler({:?}, {:?}) => OpenResultErr",
+					source, connection);
+
+				let mut entry = if let Entry::Occupied(entry) = self.peers.entry(source.clone()) {
+					entry
+				} else {
+					error!(target: "sub-libp2p", "OpenResultErr: State mismatch in the custom protos handler");
+					debug_assert!(false);
+					debug_assert!(false);
+					return
+				};
+
+				match mem::replace(entry.get_mut(), PeerState::Poisoned) {
+					PeerState::Enabled { mut connections } => {
+						debug_assert!(connections.iter().any(|(_, s)|
+							matches!(s, ConnectionState::Opening | ConnectionState::Open(_))));
+
+						if let Some((_, connec_state)) = connections.iter_mut().find(|(c, s)|
+							*c == connection && matches!(s, ConnectionState::Opening))
+						{
+							*connec_state = ConnectionState::Closed;
+						} else if let Some((_, connec_state)) = connections.iter_mut().find(|(c, s)|
+							*c == connection && matches!(s, ConnectionState::OpeningThenClosing))
+						{
+							*connec_state = ConnectionState::Closing;
+						} else {
+							error!(target: "sub-libp2p",
+								"OpenResultErr: State mismatch in the custom protos handler");
+							debug_assert!(false);
+						}
+
+						if !connections.iter().any(|(_, s)|
+							matches!(s, ConnectionState::Opening | ConnectionState::Open(_)))
+						{
+							debug!(target: "sub-libp2p", "PSM <= Dropped({:?})", source);
+							self.peerset.dropped(source.clone());
+
+							*entry.into_mut() = PeerState::Disabled {
+								connections,
+								backoff_until: None
+							};
+						} else {
+							*entry.into_mut() = PeerState::Enabled { connections };
+						}
+					},
+					PeerState::Disabled { mut connections, backoff_until } => {
+						if let Some((_, connec_state)) = connections.iter_mut().find(|(c, s)|
+							*c == connection && matches!(s, ConnectionState::OpeningThenClosing))
+						{
+							*connec_state = ConnectionState::Closing;
+						} else {
+							error!(target: "sub-libp2p",
+								"OpenResultErr: State mismatch in the custom protos handler");
+							debug_assert!(false);
+						}
+
+						*entry.into_mut() = PeerState::Disabled { connections, backoff_until };
+					},
+					PeerState::DisabledPendingEnable { mut connections, timer, timer_deadline } => {
+						if let Some((_, connec_state)) = connections.iter_mut().find(|(c, s)|
+							*c == connection && matches!(s, ConnectionState::OpeningThenClosing))
+						{
+							*connec_state = ConnectionState::Closing;
+						} else {
+							error!(target: "sub-libp2p",
+								"OpenResultErr: State mismatch in the custom protos handler");
+							debug_assert!(false);
+						}
+
+						*entry.into_mut() = PeerState::DisabledPendingEnable {
+							connections,
+							timer,
+							timer_deadline,
+						};
+					},
+					state => {
+						error!(target: "sub-libp2p",
+							"Unexpected state in the custom protos handler: {:?}",
+							state);
+						debug_assert!(false);
+					}
 				};
+			}
 
-				if first {
-					debug!(target: "sub-libp2p", "External API <= Open({:?})", source);
-					let event = GenericProtoOut::CustomProtocolOpen {
+			NotifsHandlerOut::CustomMessage { message } => {
+				if self.is_open(&source) {
+					trace!(target: "sub-libp2p", "Handler({:?}) => Message", source);
+					trace!(target: "sub-libp2p", "External API <= Message({:?})", source);
+					let event = GenericProtoOut::LegacyMessage {
 						peer_id: source,
-						received_handshake,
-						notifications_sink
+						message,
 					};
-					self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
 
+					self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
 				} else {
-					debug!(
+					trace!(
 						target: "sub-libp2p",
-						"Handler({:?}) => Secondary connection opened custom protocol",
-						source
+						"Handler({:?}) => Post-close message. Dropping message.",
+						source,
 					);
 				}
 			}
 
-			NotifsHandlerOut::CustomMessage { message } => {
-				debug_assert!(self.is_open(&source));
-				trace!(target: "sub-libp2p", "Handler({:?}) => Message", source);
-				trace!(target: "sub-libp2p", "External API <= Message({:?})", source);
-				let event = GenericProtoOut::LegacyMessage {
-					peer_id: source,
-					message,
-				};
-
-				self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
-			}
-
 			NotifsHandlerOut::Notification { protocol_name, message } => {
-				debug_assert!(self.is_open(&source));
-				trace!(
-					target: "sub-libp2p",
-					"Handler({:?}) => Notification({:?})",
-					source,
-					protocol_name,
-				);
-				trace!(target: "sub-libp2p", "External API <= Message({:?}, {:?})", protocol_name, source);
-				let event = GenericProtoOut::Notification {
-					peer_id: source,
-					protocol_name,
-					message,
-				};
+				if self.is_open(&source) {
+					trace!(
+						target: "sub-libp2p",
+						"Handler({:?}) => Notification({:?})",
+						source,
+						protocol_name,
+					);
+					trace!(target: "sub-libp2p", "External API <= Message({:?}, {:?})", protocol_name, source);
+					let event = GenericProtoOut::Notification {
+						peer_id: source,
+						protocol_name,
+						message,
+					};
 
-				self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
+					self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
+				} else {
+					trace!(
+						target: "sub-libp2p",
+						"Handler({:?}) => Post-close notification({:?})",
+						source,
+						protocol_name,
+					);
+				}
 			}
 		}
 	}
@@ -1400,6 +2002,11 @@ impl NetworkBehaviour for GenericProto {
 			};
 
 			match peer_state {
+				PeerState::Backoff { timer, .. } if *timer == delay_id => {
+					debug!(target: "sub-libp2p", "Libp2p <= Clean up ban of {:?} from the state", peer_id);
+					self.peers.remove(&peer_id);
+				}
+
 				PeerState::PendingRequest { timer, .. } if *timer == delay_id => {
 					debug!(target: "sub-libp2p", "Libp2p <= Dial {:?} now that ban has expired", peer_id);
 					self.events.push_back(NetworkBehaviourAction::DialPeer {
@@ -1409,14 +2016,33 @@ impl NetworkBehaviour for GenericProto {
 					*peer_state = PeerState::Requested;
 				}
 
-				PeerState::DisabledPendingEnable { timer, open, .. } if *timer == delay_id => {
-					debug!(target: "sub-libp2p", "Handler({:?}) <= Enable (ban expired)", peer_id);
-					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
-						peer_id,
-						handler: NotifyHandler::All,
-						event: NotifsHandlerIn::Enable,
-					});
-					*peer_state = PeerState::Enabled { open: mem::replace(open, Default::default()) };
+				PeerState::DisabledPendingEnable { connections, timer, timer_deadline }
+					if *timer == delay_id =>
+				{
+					// The first element of `closed` is chosen to open the notifications substream.
+					if let Some((connec_id, connec_state)) = connections.iter_mut()
+						.find(|(_, s)| matches!(s, ConnectionState::Closed))
+					{
+						debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open (ban expired)",
+							peer_id, *connec_id);
+						self.events.push_back(NetworkBehaviourAction::NotifyHandler {
+							peer_id: peer_id.clone(),
+							handler: NotifyHandler::One(*connec_id),
+							event: NotifsHandlerIn::Open,
+						});
+						*connec_state = ConnectionState::Opening;
+						*peer_state = PeerState::Enabled {
+							connections: mem::replace(connections, Default::default()),
+						};
+					} else {
+						*timer_deadline = Instant::now() + Duration::from_secs(5);
+						let delay = futures_timer::Delay::new(Duration::from_secs(5));
+						let timer = *timer;
+						self.delays.push(async move {
+							delay.await;
+							(timer, peer_id)
+						}.boxed());
+					}
 				}
 
 				// We intentionally never remove elements from `delays`, and it may
diff --git a/client/network/src/protocol/generic_proto/handler.rs b/client/network/src/protocol/generic_proto/handler.rs
index 5845130a7db8..0272261f67d5 100644
--- a/client/network/src/protocol/generic_proto/handler.rs
+++ b/client/network/src/protocol/generic_proto/handler.rs
@@ -1,27 +1,1054 @@
+// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program is free software: you can redistribute it and/or modify
+// Substrate is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// This program is distributed in the hope that it will be useful,
+// Substrate is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
+// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Implementations of the `IntoProtocolsHandler` and `ProtocolsHandler` traits for both incoming
+//! and outgoing substreams for all gossiping protocols together.
+//!
+//! This is the main implementation of `ProtocolsHandler` in this crate, that handles all the
+//! protocols that are Substrate-related and outside of the scope of libp2p.
+//!
+//! # Usage
+//!
+//! From an API perspective, the [`NotifsHandler`] is always in one of the following state (see [`State`]):
+//!
+//! - Closed substreams. This is the initial state.
+//! - Closed substreams, but remote desires them to be open.
+//! - Open substreams.
+//! - Open substreams, but remote desires them to be closed.
+//!
+//! The [`NotifsHandler`] can spontaneously switch between these states:
+//!
+//! - "Closed substreams" to "Closed substreams but open desired". When that happens, a
+//! [`NotifsHandlerOut::OpenDesiredByRemote`] is emitted.
+//! - "Closed substreams but open desired" to "Closed substreams" (i.e. the remote has cancelled
+//! their request). When that happens, a [`NotifsHandlerOut::CloseDesired`] is emitted.
+//! - "Open substreams" to "Open substreams but close desired". When that happens, a
+//! [`NotifsHandlerOut::CloseDesired`] is emitted.
+//!
+//! The user can instruct the `NotifsHandler` to switch from "closed" to "open" or vice-versa by
+//! sending either a [`NotifsHandlerIn::Open`] or a [`NotifsHandlerIn::Close`]. The `NotifsHandler`
+//! must answer with [`NotifsHandlerOut::OpenResultOk`] or [`NotifsHandlerOut::OpenResultErr`], or
+//! with [`NotifsHandlerOut::CloseResult`].
+//!
+//! When a [`NotifsHandlerOut::OpenResultOk`] is emitted, the `NotifsHandler` is now in the open
+//! state. When a [`NotifsHandlerOut::OpenResultErr`] or [`NotifsHandlerOut::CloseResult`] is
+//! emitted, the `NotifsHandler` is now (or remains) in the closed state.
+//!
+//! When a [`NotifsHandlerOut::OpenDesiredByRemote`] is emitted, the user should always send back either a
+//! [`NotifsHandlerIn::Open`] or a [`NotifsHandlerIn::Close`].If this isn't done, the remote will
+//! be left in a pending state.
+//!
+//! It is illegal to send a [`NotifsHandlerIn::Open`] before a previously-emitted
+//! [`NotifsHandlerIn::Open`] has gotten an answer.
+
+use crate::protocol::generic_proto::{
+	upgrade::{
+		NotificationsIn, NotificationsOut, NotificationsInSubstream, NotificationsOutSubstream,
+		NotificationsHandshakeError, RegisteredProtocol, RegisteredProtocolSubstream,
+		RegisteredProtocolEvent, UpgradeCollec
+	},
+};
 
-pub use self::group::{
-	NotificationsSink, NotifsHandlerError, Ready, NotifsHandlerProto, NotifsHandler, NotifsHandlerIn, NotifsHandlerOut
+use bytes::BytesMut;
+use libp2p::core::{either::EitherOutput, ConnectedPoint, PeerId};
+use libp2p::core::upgrade::{SelectUpgrade, InboundUpgrade, OutboundUpgrade};
+use libp2p::swarm::{
+	ProtocolsHandler, ProtocolsHandlerEvent,
+	IntoProtocolsHandler,
+	KeepAlive,
+	ProtocolsHandlerUpgrErr,
+	SubstreamProtocol,
+	NegotiatedSubstream,
 };
-pub use self::legacy::ConnectionKillError as LegacyConnectionKillError;
+use futures::{
+	channel::mpsc,
+	lock::{Mutex as FuturesMutex, MutexGuard as FuturesMutexGuard},
+	prelude::*
+};
+use log::error;
+use parking_lot::{Mutex, RwLock};
+use smallvec::SmallVec;
+use std::{borrow::Cow, collections::VecDeque, mem, pin::Pin, str, sync::Arc, task::{Context, Poll}, time::Duration};
+use wasm_timer::Instant;
+
+/// Number of pending notifications in asynchronous contexts.
+/// See [`NotificationsSink::reserve_notification`] for context.
+const ASYNC_NOTIFICATIONS_BUFFER_SIZE: usize = 8;
+
+/// Number of pending notifications in synchronous contexts.
+const SYNC_NOTIFICATIONS_BUFFER_SIZE: usize = 2048;
+
+/// Maximum duration to open a substream and receive the handshake message. After that, we
+/// consider that we failed to open the substream.
+const OPEN_TIMEOUT: Duration = Duration::from_secs(10);
+
+/// After successfully establishing a connection with the remote, we keep the connection open for
+/// at least this amount of time in order to give the rest of the code the chance to notify us to
+/// open substreams.
+const INITIAL_KEEPALIVE_TIME: Duration = Duration::from_secs(5);
+
+/// Implements the `IntoProtocolsHandler` trait of libp2p.
+///
+/// Every time a connection with a remote starts, an instance of this struct is created and
+/// sent to a background task dedicated to this connection. Once the connection is established,
+/// it is turned into a [`NotifsHandler`].
+///
+/// See the documentation at the module level for more information.
+pub struct NotifsHandlerProto {
+	/// Prototypes for upgrades for inbound substreams, and the message we respond with in the
+	/// handshake.
+	in_protocols: Vec<(NotificationsIn, Arc<RwLock<Vec<u8>>>)>,
+
+	/// Name of protocols available for outbound substreams, and the initial handshake message we
+	/// send.
+	out_protocols: Vec<(Cow<'static, str>, Arc<RwLock<Vec<u8>>>)>,
+
+	/// Configuration for the legacy protocol upgrade.
+	legacy_protocol: RegisteredProtocol,
+}
+
+/// The actual handler once the connection has been established.
+///
+/// See the documentation at the module level for more information.
+pub struct NotifsHandler {
+	/// Prototypes for upgrades for inbound substreams, and the message we respond with in the
+	/// handshake.
+	in_protocols: Vec<(NotificationsIn, Arc<RwLock<Vec<u8>>>)>,
+
+	/// Name of protocols available for outbound substreams, and the initial handshake message we
+	/// send.
+	out_protocols: Vec<(Cow<'static, str>, Arc<RwLock<Vec<u8>>>)>,
+
+	/// When the connection with the remote has been successfully established.
+	when_connection_open: Instant,
+
+	/// Whether we are the connection dialer or listener.
+	endpoint: ConnectedPoint,
+
+	/// State of this handler.
+	state: State,
+
+	/// Configuration for the legacy protocol upgrade.
+	legacy_protocol: RegisteredProtocol,
+
+	/// The substreams where bidirectional communications happen.
+	legacy_substreams: SmallVec<[RegisteredProtocolSubstream<NegotiatedSubstream>; 4]>,
+
+	/// Contains substreams which are being shut down.
+	legacy_shutdown: SmallVec<[RegisteredProtocolSubstream<NegotiatedSubstream>; 4]>,
+
+	/// Events to return in priority from `poll`.
+	events_queue: VecDeque<
+		ProtocolsHandlerEvent<NotificationsOut, usize, NotifsHandlerOut, NotifsHandlerError>
+	>,
+}
+
+/// See the module-level documentation to learn about the meaning of these variants.
+enum State {
+	/// Handler is in the "Closed" state.
+	Closed {
+		/// Vec of the same length as [`NotifsHandler::out_protocols`]. For each protocol, contains
+		/// a boolean indicating whether an outgoing substream is still in the process of being
+		/// opened.
+		pending_opening: Vec<bool>,
+	},
+
+	/// Handler is in the "Closed" state. A [`NotifsHandlerOut::OpenDesiredByRemote`] has been emitted.
+	OpenDesiredByRemote {
+		/// Vec of the same length as [`NotifsHandler::in_protocols`]. For each protocol, contains
+		/// a substream opened by the remote and that hasn't been accepted/rejected yet.
+		///
+		/// Must always contain at least one `Some`.
+		in_substreams: Vec<Option<NotificationsInSubstream<NegotiatedSubstream>>>,
+
+		/// See [`State::Closed::pending_opening`].
+		pending_opening: Vec<bool>,
+	},
+
+	/// Handler is in the "Closed" state, but has received a [`NotifsHandlerIn::Open`] and is
+	/// consequently trying to open the various notifications substreams.
+	///
+	/// A [`NotifsHandlerOut::OpenResultOk`] or a [`NotifsHandlerOut::OpenResultErr`] event must
+	/// be emitted when transitionning to respectively [`State::Open`] or [`State::Closed`].
+	Opening {
+		/// In the situation where either the legacy substream has been opened or the
+		/// handshake-bearing notifications protocol is open, but we haven't sent out any
+		/// [`NotifsHandlerOut::Open`] event yet, this contains the received handshake waiting to
+		/// be reported through the external API.
+		pending_handshake: Option<Vec<u8>>,
+
+		/// Vec of the same length as [`NotifsHandler::in_protocols`]. For each protocol, contains
+		/// a substream opened by the remote and that has been accepted.
+		///
+		/// Contrary to [`State::OpenDesiredByRemote::in_substreams`], it is possible for this to
+		/// contain only `None`s.
+		in_substreams: Vec<Option<NotificationsInSubstream<NegotiatedSubstream>>>,
+
+		/// Vec of the same length as [`NotifsHandler::out_protocols`]. For each protocol, contains
+		/// an outbound substream that has been accepted by the remote.
+		///
+		/// Items that contain `None` mean that a substream is still being opened or has been
+		/// rejected by the remote. In other words, this `Vec` is kind of a mirror version of
+		/// [`State::Closed::pending_opening`].
+		///
+		/// Items that contain `Some(None)` have been rejected by the remote, most likely because
+		/// they don't support this protocol. At the time of writing, the external API doesn't
+		/// distinguish between the different protocols. From the external API's point of view,
+		/// either all protocols are open or none are open. In reality, light clients in particular
+		/// don't support for example the GrandPa protocol, and as such will refuse our outgoing
+		/// attempts. This is problematic in theory, but in practice this is handled properly at a
+		/// higher level. This flaw will fixed once the outer layers know to differentiate the
+		/// multiple protocols.
+		out_substreams: Vec<Option<Option<NotificationsOutSubstream<NegotiatedSubstream>>>>,
+	},
+
+	/// Handler is in the "Open" state.
+	Open {
+		/// Contains the two `Receiver`s connected to the [`NotificationsSink`] that has been
+		/// sent out. The notifications to send out can be pulled from this receivers.
+		/// We use two different channels in order to have two different channel sizes, but from
+		/// the receiving point of view, the two channels are the same.
+		/// The receivers are fused in case the user drops the [`NotificationsSink`] entirely.
+		notifications_sink_rx: stream::Select<
+			stream::Fuse<mpsc::Receiver<NotificationsSinkMessage>>,
+			stream::Fuse<mpsc::Receiver<NotificationsSinkMessage>>
+		>,
+
+		/// Vec of the same length as [`NotifsHandler::out_protocols`]. For each protocol, contains
+		/// an outbound substream that has been accepted by the remote.
+		///
+		/// On transition to [`State::Open`], all the elements must be `Some`. Elements are
+		/// switched to `None` only if the remote closes substreams, in which case `want_closed`
+		/// must be true.
+		out_substreams: Vec<Option<NotificationsOutSubstream<NegotiatedSubstream>>>,
+
+		/// Vec of the same length as [`NotifsHandler::in_protocols`]. For each protocol, contains
+		/// a substream opened by the remote and that has been accepted.
+		///
+		/// Contrary to [`State::OpenDesiredByRemote::in_substreams`], it is possible for this to
+		/// contain only `None`s.
+		in_substreams: Vec<Option<NotificationsInSubstream<NegotiatedSubstream>>>,
+
+		/// If true, at least one substream in [`State::Open::out_substreams`] has been closed or
+		/// reset by the remote and a [`NotifsHandlerOut::CloseDesired`] message has been sent
+		/// out.
+		want_closed: bool,
+	},
+}
+
+impl IntoProtocolsHandler for NotifsHandlerProto {
+	type Handler = NotifsHandler;
+
+	fn inbound_protocol(&self) -> SelectUpgrade<UpgradeCollec<NotificationsIn>, RegisteredProtocol> {
+		let in_protocols = self.in_protocols.iter()
+			.map(|(h, _)| h.clone())
+			.collect::<UpgradeCollec<_>>();
+
+		SelectUpgrade::new(in_protocols, self.legacy_protocol.clone())
+	}
+
+	fn into_handler(self, _: &PeerId, connected_point: &ConnectedPoint) -> Self::Handler {
+		let num_out_proto = self.out_protocols.len();
+
+		NotifsHandler {
+			in_protocols: self.in_protocols,
+			out_protocols: self.out_protocols,
+			endpoint: connected_point.clone(),
+			when_connection_open: Instant::now(),
+			state: State::Closed {
+				pending_opening: (0..num_out_proto).map(|_| false).collect(),
+			},
+			legacy_protocol: self.legacy_protocol,
+			legacy_substreams: SmallVec::new(),
+			legacy_shutdown: SmallVec::new(),
+			events_queue: VecDeque::with_capacity(16),
+		}
+	}
+}
+
+/// Event that can be received by a `NotifsHandler`.
+#[derive(Debug, Clone)]
+pub enum NotifsHandlerIn {
+	/// Instruct the handler to open the notification substreams.
+	///
+	/// Must always be answered by a [`NotifsHandlerOut::OpenResultOk`] or a
+	/// [`NotifsHandlerOut::OpenResultErr`] event.
+	///
+	/// Importantly, it is forbidden to send a [`NotifsHandlerIn::Open`] while a previous one is
+	/// already in the fly. It is however possible if a `Close` is still in the fly.
+	Open,
+
+	/// Instruct the handler to close the notification substreams, or reject any pending incoming
+	/// substream request.
+	///
+	/// Must always be answered by a [`NotifsHandlerOut::CloseResult`] event.
+	Close,
+}
+
+/// Event that can be emitted by a `NotifsHandler`.
+#[derive(Debug)]
+pub enum NotifsHandlerOut {
+	/// Acknowledges a [`NotifsHandlerIn::Open`].
+	OpenResultOk {
+		/// The endpoint of the connection that is open for custom protocols.
+		endpoint: ConnectedPoint,
+		/// Handshake that was sent to us.
+		/// This is normally a "Status" message, but this out of the concern of this code.
+		received_handshake: Vec<u8>,
+		/// How notifications can be sent to this node.
+		notifications_sink: NotificationsSink,
+	},
+
+	/// Acknowledges a [`NotifsHandlerIn::Open`]. The remote has refused the attempt to open
+	/// notification substreams.
+	OpenResultErr,
+
+	/// Acknowledges a [`NotifsHandlerIn::Close`].
+	CloseResult,
+
+	/// The remote would like the substreams to be open. Send a [`NotifsHandlerIn::Open`] or a
+	/// [`NotifsHandlerIn::Close`] in order to either accept or deny this request. If a
+	/// [`NotifsHandlerIn::Open`] or [`NotifsHandlerIn::Close`] has been sent before and has not
+	/// yet been acknowledged by a matching [`NotifsHandlerOut`], then you don't need to a send
+	/// another [`NotifsHandlerIn`].
+	OpenDesiredByRemote,
+
+	/// The remote would like the substreams to be closed. Send a [`NotifsHandlerIn::Close`] in
+	/// order to close them. If a [`NotifsHandlerIn::Close`] has been sent before and has not yet
+	/// been acknowledged by a [`NotifsHandlerOut::CloseResult`], then you don't need to a send
+	/// another one.
+	CloseDesired,
+
+	/// Received a non-gossiping message on the legacy substream.
+	///
+	/// Can only happen when the handler is in the open state.
+	CustomMessage {
+		/// Message that has been received.
+		///
+		/// Keep in mind that this can be a `ConsensusMessage` message, which then contains a
+		/// notification.
+		message: BytesMut,
+	},
+
+	/// Received a message on a custom protocol substream.
+	///
+	/// Can only happen when the handler is in the open state.
+	Notification {
+		/// Name of the protocol of the message.
+		protocol_name: Cow<'static, str>,
+
+		/// Message that has been received.
+		message: BytesMut,
+	},
+}
+
+/// Sink connected directly to the node background task. Allows sending notifications to the peer.
+///
+/// Can be cloned in order to obtain multiple references to the same peer.
+#[derive(Debug, Clone)]
+pub struct NotificationsSink {
+	inner: Arc<NotificationsSinkInner>,
+}
+
+#[derive(Debug)]
+struct NotificationsSinkInner {
+	/// Sender to use in asynchronous contexts. Uses an asynchronous mutex.
+	async_channel: FuturesMutex<mpsc::Sender<NotificationsSinkMessage>>,
+	/// Sender to use in synchronous contexts. Uses a synchronous mutex.
+	/// This channel has a large capacity and is meant to be used in contexts where
+	/// back-pressure cannot be properly exerted.
+	/// It will be removed in a future version.
+	sync_channel: Mutex<mpsc::Sender<NotificationsSinkMessage>>,
+}
+
+/// Message emitted through the [`NotificationsSink`] and processed by the background task
+/// dedicated to the peer.
+#[derive(Debug)]
+enum NotificationsSinkMessage {
+	/// Message emitted by [`NotificationsSink::reserve_notification`] and
+	/// [`NotificationsSink::write_notification_now`].
+	Notification {
+		protocol_name: Cow<'static, str>,
+		message: Vec<u8>,
+	},
+
+	/// Must close the connection.
+	ForceClose,
+}
+
+impl NotificationsSink {
+	/// Sends a notification to the peer.
+	///
+	/// If too many messages are already buffered, the notification is silently discarded and the
+	/// connection to the peer will be closed shortly after.
+	///
+	/// The protocol name is expected to be checked ahead of calling this method. It is a logic
+	/// error to send a notification using an unknown protocol.
+	///
+	/// This method will be removed in a future version.
+	pub fn send_sync_notification<'a>(
+		&'a self,
+		protocol_name: Cow<'static, str>,
+		message: impl Into<Vec<u8>>
+	) {
+		let mut lock = self.inner.sync_channel.lock();
+		let result = lock.try_send(NotificationsSinkMessage::Notification {
+			protocol_name,
+			message: message.into()
+		});
+
+		if result.is_err() {
+			// Cloning the `mpsc::Sender` guarantees the allocation of an extra spot in the
+			// buffer, and therefore `try_send` will succeed.
+			let _result2 = lock.clone().try_send(NotificationsSinkMessage::ForceClose);
+			debug_assert!(_result2.map(|()| true).unwrap_or_else(|err| err.is_disconnected()));
+		}
+	}
+
+	/// Wait until the remote is ready to accept a notification.
+	///
+	/// Returns an error in the case where the connection is closed.
+	///
+	/// The protocol name is expected to be checked ahead of calling this method. It is a logic
+	/// error to send a notification using an unknown protocol.
+	pub async fn reserve_notification<'a>(&'a self, protocol_name: Cow<'static, str>) -> Result<Ready<'a>, ()> {
+		let mut lock = self.inner.async_channel.lock().await;
+
+		let poll_ready = future::poll_fn(|cx| lock.poll_ready(cx)).await;
+		if poll_ready.is_ok() {
+			Ok(Ready { protocol_name: protocol_name, lock })
+		} else {
+			Err(())
+		}
+	}
+}
+
+/// Notification slot is reserved and the notification can actually be sent.
+#[must_use]
+#[derive(Debug)]
+pub struct Ready<'a> {
+	/// Guarded channel. The channel inside is guaranteed to not be full.
+	lock: FuturesMutexGuard<'a, mpsc::Sender<NotificationsSinkMessage>>,
+	/// Name of the protocol. Should match one of the protocols passed at initialization.
+	protocol_name: Cow<'static, str>,
+}
+
+impl<'a> Ready<'a> {
+	/// Consumes this slots reservation and actually queues the notification.
+	///
+	/// Returns an error if the substream has been closed.
+	pub fn send(
+		mut self,
+		notification: impl Into<Vec<u8>>
+	) -> Result<(), ()> {
+		self.lock.start_send(NotificationsSinkMessage::Notification {
+			protocol_name: self.protocol_name,
+			message: notification.into(),
+		}).map_err(|_| ())
+	}
+}
+
+/// Error specific to the collection of protocols.
+#[derive(Debug, derive_more::Display, derive_more::Error)]
+pub enum NotifsHandlerError {
+	/// Channel of synchronous notifications is full.
+	SyncNotificationsClogged,
+}
+
+impl NotifsHandlerProto {
+	/// Builds a new handler.
+	///
+	/// `list` is a list of notification protocols names, and the message to send as part of the
+	/// handshake. At the moment, the message is always the same whether we open a substream
+	/// ourselves or respond to handshake from the remote.
+	///
+	/// The first protocol in `list` is special-cased as the protocol that contains the handshake
+	/// to report through the [`NotifsHandlerOut::Open`] event.
+	///
+	/// # Panic
+	///
+	/// - Panics if `list` is empty.
+	///
+	pub fn new(
+		legacy_protocol: RegisteredProtocol,
+		list: impl Into<Vec<(Cow<'static, str>, Arc<RwLock<Vec<u8>>>)>>,
+	) -> Self {
+		let list = list.into();
+		assert!(!list.is_empty());
+
+		let out_protocols = list
+			.clone()
+			.into_iter()
+			.collect();
+
+		let in_protocols = list.clone()
+			.into_iter()
+			.map(|(proto_name, msg)| (NotificationsIn::new(proto_name), msg))
+			.collect();
+
+		NotifsHandlerProto {
+			in_protocols,
+			out_protocols,
+			legacy_protocol,
+		}
+	}
+}
+
+impl ProtocolsHandler for NotifsHandler {
+	type InEvent = NotifsHandlerIn;
+	type OutEvent = NotifsHandlerOut;
+	type Error = NotifsHandlerError;
+	type InboundProtocol = SelectUpgrade<UpgradeCollec<NotificationsIn>, RegisteredProtocol>;
+	type OutboundProtocol = NotificationsOut;
+	// Index within the `out_protocols`.
+	type OutboundOpenInfo = usize;
+	type InboundOpenInfo = ();
+
+	fn listen_protocol(&self) -> SubstreamProtocol<Self::InboundProtocol, ()> {
+		let in_protocols = self.in_protocols.iter()
+			.map(|(h, _)| h.clone())
+			.collect::<UpgradeCollec<_>>();
+
+		let proto = SelectUpgrade::new(in_protocols, self.legacy_protocol.clone());
+		SubstreamProtocol::new(proto, ())
+	}
+
+	fn inject_fully_negotiated_inbound(
+		&mut self,
+		out: <Self::InboundProtocol as InboundUpgrade<NegotiatedSubstream>>::Output,
+		(): ()
+	) {
+		match out {
+			// Received notifications substream.
+			EitherOutput::First(((_remote_handshake, mut proto), num)) => {
+				match &mut self.state {
+					State::Closed { pending_opening } => {
+						self.events_queue.push_back(ProtocolsHandlerEvent::Custom(
+							NotifsHandlerOut::OpenDesiredByRemote
+						));
+
+						let mut in_substreams = (0..self.in_protocols.len())
+							.map(|_| None)
+							.collect::<Vec<_>>();
+						in_substreams[num] = Some(proto);
+						self.state = State::OpenDesiredByRemote {
+							in_substreams,
+							pending_opening: mem::replace(pending_opening, Vec::new()),
+						};
+					},
+					State::OpenDesiredByRemote { in_substreams, .. } => {
+						if in_substreams[num].is_some() {
+							// If a substream already exists, silently drop the new one.
+							// Note that we drop the substream, which will send an equivalent to a
+							// TCP "RST" to the remote and force-close the substream. It might
+							// seem like an unclean way to get rid of a substream. However, keep
+							// in mind that it is invalid for the remote to open multiple such
+							// substreams, and therefore sending a "RST" is the most correct thing
+							// to do.
+							return;
+						}
+						in_substreams[num] = Some(proto);
+					},
+					State::Opening { in_substreams, .. } |
+					State::Open { in_substreams, .. } => {
+						if in_substreams[num].is_some() {
+							// Same remark as above.
+							return;
+						}
+
+						// We create `handshake_message` on a separate line to be sure
+						// that the lock is released as soon as possible.
+						let handshake_message = self.in_protocols[num].1.read().clone();
+						proto.send_handshake(handshake_message);
+						in_substreams[num] = Some(proto);
+					},
+				};
+			}
+
+			// Received legacy substream.
+			EitherOutput::Second((substream, _handshake)) => {
+				// Note: while we awknowledge legacy substreams and handle incoming messages,
+				// it doesn't trigger any `OpenDesiredByRemote` event as a way to simplify the
+				// logic of this code.
+				// Since mid-2019, legacy substreams are supposed to be used at the same time as
+				// notifications substreams, and not in isolation. Nodes that open legacy
+				// substreams in isolation are considered deprecated.
+				if self.legacy_substreams.len() <= 4 {
+					self.legacy_substreams.push(substream);
+				}
+			},
+		}
+	}
+
+	fn inject_fully_negotiated_outbound(
+		&mut self,
+		(handshake, substream): <Self::OutboundProtocol as OutboundUpgrade<NegotiatedSubstream>>::Output,
+		num: Self::OutboundOpenInfo
+	) {
+		match &mut self.state {
+			State::Closed { pending_opening } |
+			State::OpenDesiredByRemote { pending_opening, .. } => {
+				debug_assert!(pending_opening[num]);
+				pending_opening[num] = false;
+			}
+			State::Open { .. } => {
+				error!(target: "sub-libp2p", "☎️ State mismatch in notifications handler");
+				debug_assert!(false);
+			}
+			State::Opening { pending_handshake, in_substreams, out_substreams } => {
+				debug_assert!(out_substreams[num].is_none());
+				out_substreams[num] = Some(Some(substream));
+
+				if num == 0 {
+					debug_assert!(pending_handshake.is_none());
+					*pending_handshake = Some(handshake);
+				}
+
+				if !out_substreams.iter().any(|s| s.is_none()) {
+					let (async_tx, async_rx) = mpsc::channel(ASYNC_NOTIFICATIONS_BUFFER_SIZE);
+					let (sync_tx, sync_rx) = mpsc::channel(SYNC_NOTIFICATIONS_BUFFER_SIZE);
+					let notifications_sink = NotificationsSink {
+						inner: Arc::new(NotificationsSinkInner {
+							async_channel: FuturesMutex::new(async_tx),
+							sync_channel: Mutex::new(sync_tx),
+						}),
+					};
+
+					debug_assert!(pending_handshake.is_some());
+					let pending_handshake = pending_handshake.take().unwrap_or_default();
+
+					let out_substreams = out_substreams
+						.drain(..)
+						.map(|s| s.expect("checked by the if above; qed"))
+						.collect();
+
+					self.state = State::Open {
+						notifications_sink_rx: stream::select(async_rx.fuse(), sync_rx.fuse()),
+						out_substreams,
+						in_substreams: mem::replace(in_substreams, Vec::new()),
+						want_closed: false,
+					};
+
+					self.events_queue.push_back(ProtocolsHandlerEvent::Custom(
+						NotifsHandlerOut::OpenResultOk {
+							endpoint: self.endpoint.clone(),
+							received_handshake: pending_handshake,
+							notifications_sink
+						}
+					));
+				}
+			}
+		}
+	}
+
+	fn inject_event(&mut self, message: NotifsHandlerIn) {
+		match message {
+			NotifsHandlerIn::Open => {
+				match &mut self.state {
+					State::Closed { .. } | State::OpenDesiredByRemote { .. } => {
+						let (pending_opening, mut in_substreams) = match &mut self.state {
+							State::Closed { pending_opening } => (pending_opening, None),
+							State::OpenDesiredByRemote { pending_opening, in_substreams } =>
+								(pending_opening, Some(mem::replace(in_substreams, Vec::new()))),
+							_ => unreachable!()
+						};
+
+						for (n, is_pending) in pending_opening.iter().enumerate() {
+							if *is_pending {
+								continue;
+							}
+
+							let proto = NotificationsOut::new(
+								self.out_protocols[n].0.clone(),
+								self.out_protocols[n].1.read().clone()
+							);
+
+							self.events_queue.push_back(ProtocolsHandlerEvent::OutboundSubstreamRequest {
+								protocol: SubstreamProtocol::new(proto, n)
+									.with_timeout(OPEN_TIMEOUT),
+							});
+						}
+
+						if let Some(in_substreams) = in_substreams.as_mut() {
+							for (num, substream) in in_substreams.iter_mut().enumerate() {
+								let substream = match substream.as_mut() {
+									Some(s) => s,
+									None => continue,
+								};
+
+								let handshake_message = self.in_protocols[num].1.read().clone();
+								substream.send_handshake(handshake_message);
+							}
+						}
+
+						self.state = State::Opening {
+							pending_handshake: None,
+							in_substreams: if let Some(in_substreams) = in_substreams {
+								in_substreams
+							} else {
+								(0..self.in_protocols.len()).map(|_| None).collect()
+							},
+							out_substreams: (0..self.out_protocols.len()).map(|_| None).collect(),
+						};
+					},
+					State::Opening { .. } |
+					State::Open { .. } => {
+						// As documented, it is forbidden to send an `Open` while there is already
+						// one in the fly.
+						error!(target: "sub-libp2p", "opening already-opened handler");
+						debug_assert!(false);
+					},
+				}
+			},
+
+			NotifsHandlerIn::Close => {
+				for mut substream in self.legacy_substreams.drain() {
+					substream.shutdown();
+					self.legacy_shutdown.push(substream);
+				}
+
+				match &mut self.state {
+					State::Open { .. } => {
+						self.state = State::Closed {
+							pending_opening: Vec::new(),
+						};
+					},
+					State::Opening { out_substreams, .. } => {
+						let pending_opening = out_substreams.iter().map(|s| s.is_none()).collect();
+						self.state = State::Closed {
+							pending_opening,
+						};
+
+						self.events_queue.push_back(ProtocolsHandlerEvent::Custom(
+							NotifsHandlerOut::OpenResultErr
+						));
+					},
+					State::OpenDesiredByRemote { pending_opening, .. } => {
+						self.state = State::Closed {
+							pending_opening: mem::replace(pending_opening, Vec::new()),
+						};
+					}
+					State::Closed { .. } => {},
+				}
+
+				self.events_queue.push_back(
+					ProtocolsHandlerEvent::Custom(NotifsHandlerOut::CloseResult)
+				);
+			},
+		}
+	}
+
+	fn inject_dial_upgrade_error(
+		&mut self,
+		num: usize,
+		_: ProtocolsHandlerUpgrErr<NotificationsHandshakeError>
+	) {
+		match &mut self.state {
+			State::Closed { pending_opening } | State::OpenDesiredByRemote { pending_opening, .. } => {
+				debug_assert!(pending_opening[num]);
+				pending_opening[num] = false;
+			}
+
+			State::Opening { in_substreams, pending_handshake, out_substreams } => {
+				// Failing to open a substream isn't considered a failure. Instead, it is marked
+				// as `Some(None)` and the opening continues.
+
+				out_substreams[num] = Some(None);
+
+				// Some substreams are still being opened. Nothing more to do.
+				if out_substreams.iter().any(|s| s.is_none()) {
+					return;
+				}
+
+				// All substreams have finished being open.
+				// If the handshake has been received, proceed and report the opening.
+
+				if let Some(pending_handshake) = pending_handshake.take() {
+					// Open!
+					let (async_tx, async_rx) = mpsc::channel(ASYNC_NOTIFICATIONS_BUFFER_SIZE);
+					let (sync_tx, sync_rx) = mpsc::channel(SYNC_NOTIFICATIONS_BUFFER_SIZE);
+					let notifications_sink = NotificationsSink {
+						inner: Arc::new(NotificationsSinkInner {
+							async_channel: FuturesMutex::new(async_tx),
+							sync_channel: Mutex::new(sync_tx),
+						}),
+					};
+
+					let out_substreams = out_substreams
+						.drain(..)
+						.map(|s| s.expect("checked by the if above; qed"))
+						.collect();
+
+					self.state = State::Open {
+						notifications_sink_rx: stream::select(async_rx.fuse(), sync_rx.fuse()),
+						out_substreams,
+						in_substreams: mem::replace(in_substreams, Vec::new()),
+						want_closed: false,
+					};
+
+					self.events_queue.push_back(ProtocolsHandlerEvent::Custom(
+						NotifsHandlerOut::OpenResultOk {
+							endpoint: self.endpoint.clone(),
+							received_handshake: pending_handshake,
+							notifications_sink
+						}
+					));
+
+				} else {
+					// Open failure!
+					self.state = State::Closed {
+						pending_opening: (0..self.out_protocols.len()).map(|_| false).collect(),
+					};
+
+					self.events_queue.push_back(ProtocolsHandlerEvent::Custom(
+						NotifsHandlerOut::OpenResultErr
+					));
+				}
+			}
+
+			// No substream is being open when already `Open`.
+			State::Open { .. } => debug_assert!(false),
+		}
+	}
+
+	fn connection_keep_alive(&self) -> KeepAlive {
+		if !self.legacy_substreams.is_empty() {
+			return KeepAlive::Yes;
+		}
+
+		match self.state {
+			State::Closed { .. } => KeepAlive::Until(self.when_connection_open + INITIAL_KEEPALIVE_TIME),
+			State::OpenDesiredByRemote { .. } | State::Opening { .. } | State::Open { .. } =>
+				KeepAlive::Yes,
+		}
+	}
+
+	fn poll(
+		&mut self,
+		cx: &mut Context,
+	) -> Poll<
+		ProtocolsHandlerEvent<Self::OutboundProtocol, Self::OutboundOpenInfo, Self::OutEvent, Self::Error>
+	> {
+		if let Some(ev) = self.events_queue.pop_front() {
+			return Poll::Ready(ev);
+		}
+
+		// Poll inbound substreams.
+		// Inbound substreams being closed is always tolerated, except for the
+		// `OpenDesiredByRemote` state which might need to be switched back to `Closed`.
+		match &mut self.state {
+			State::Closed { .. } => {}
+			State::Open { in_substreams, .. } => {
+				for (num, substream) in in_substreams.iter_mut().enumerate() {
+					match substream.as_mut().map(|s| Stream::poll_next(Pin::new(s), cx)) {
+						None | Some(Poll::Pending) => continue,
+						Some(Poll::Ready(Some(Ok(message)))) => {
+							let event = NotifsHandlerOut::Notification {
+								message,
+								protocol_name: self.in_protocols[num].0.protocol_name().clone(),
+							};
+							return Poll::Ready(ProtocolsHandlerEvent::Custom(event))
+						},
+						Some(Poll::Ready(None)) | Some(Poll::Ready(Some(Err(_)))) =>
+							*substream = None,
+					}
+				}
+			}
+
+			State::OpenDesiredByRemote { in_substreams, .. } |
+			State::Opening { in_substreams, .. } => {
+				for substream in in_substreams {
+					match substream.as_mut().map(|s| NotificationsInSubstream::poll_process(Pin::new(s), cx)) {
+						None | Some(Poll::Pending) => continue,
+						Some(Poll::Ready(Ok(void))) => match void {},
+						Some(Poll::Ready(Err(_))) => *substream = None,
+					}
+				}
+			}
+		}
+
+		// Since the previous block might have closed inbound substreams, make sure that we can
+		// stay in `OpenDesiredByRemote` state.
+		if let State::OpenDesiredByRemote { in_substreams, pending_opening } = &mut self.state {
+			if !in_substreams.iter().any(|s| s.is_some()) {
+				self.state = State::Closed {
+					pending_opening: mem::replace(pending_opening, Vec::new()),
+				};
+				return Poll::Ready(ProtocolsHandlerEvent::Custom(
+					NotifsHandlerOut::CloseDesired
+				))
+			}
+		}
+
+		// Poll outbound substreams.
+		match &mut self.state {
+			State::Open { out_substreams, want_closed, .. } => {
+				let mut any_closed = false;
+
+				for substream in out_substreams.iter_mut() {
+					match substream.as_mut().map(|s| Sink::poll_flush(Pin::new(s), cx)) {
+						None | Some(Poll::Pending) | Some(Poll::Ready(Ok(()))) => continue,
+						Some(Poll::Ready(Err(_))) => {}
+					};
+
+					// Reached if the substream has been closed.
+					*substream = None;
+					any_closed = true;
+				}
+
+				if any_closed {
+					if !*want_closed {
+						*want_closed = true;
+						return Poll::Ready(ProtocolsHandlerEvent::Custom(NotifsHandlerOut::CloseDesired));
+					}
+				}
+			}
+
+			State::Opening { out_substreams, pending_handshake, .. } => {
+				debug_assert!(out_substreams.iter().any(|s| s.is_none()));
+
+				for (num, substream) in out_substreams.iter_mut().enumerate() {
+					match substream {
+						None | Some(None) => continue,
+						Some(Some(substream)) => match Sink::poll_flush(Pin::new(substream), cx) {
+							Poll::Pending | Poll::Ready(Ok(())) => continue,
+							Poll::Ready(Err(_)) => {}
+						}
+					}
+
+					// Reached if the substream has been closed.
+					*substream = Some(None);
+					if num == 0 {
+						// Cancel the handshake.
+						*pending_handshake = None;
+					}
+				}
+			}
+
+			State::Closed { .. } |
+			State::OpenDesiredByRemote { .. } => {}
+		}
+
+		if let State::Open { notifications_sink_rx, out_substreams, .. } = &mut self.state {
+			'poll_notifs_sink: loop {
+				// Before we poll the notifications sink receiver, check that all the notification
+				// channels are ready to send a message.
+				// TODO: it is planned that in the future we switch to one `NotificationsSink` per
+				// protocol, in which case each sink should wait only for its corresponding handler
+				// to be ready, and not all handlers
+				// see https://github.com/paritytech/substrate/issues/5670
+				for substream in out_substreams.iter_mut() {
+					match substream.as_mut().map(|s| s.poll_ready_unpin(cx)) {
+						None | Some(Poll::Ready(_)) => {},
+						Some(Poll::Pending) => break 'poll_notifs_sink
+					}
+				}
+
+				// Now that all substreams are ready for a message, grab what to send.
+				let message = match notifications_sink_rx.poll_next_unpin(cx) {
+					Poll::Ready(Some(msg)) => msg,
+					Poll::Ready(None) | Poll::Pending => break,
+				};
+
+				match message {
+					NotificationsSinkMessage::Notification {
+						protocol_name,
+						message
+					} => {
+						if let Some(pos) = self.out_protocols.iter().position(|(n, _)| *n == protocol_name) {
+							if let Some(substream) = out_substreams[pos].as_mut() {
+								let _ = substream.start_send_unpin(message);
+								continue 'poll_notifs_sink;
+							}
+
+						} else {
+							log::warn!(
+								target: "sub-libp2p",
+								"Tried to send a notification on non-registered protocol: {:?}",
+								protocol_name
+							);
+						}
+					}
+					NotificationsSinkMessage::ForceClose => {
+						return Poll::Ready(
+							ProtocolsHandlerEvent::Close(NotifsHandlerError::SyncNotificationsClogged)
+						);
+					}
+				}
+			}
+		}
+
+		// The legacy substreams are polled only if the state is `Open`. Otherwise, it would be
+		// possible to receive notifications that would need to get silently discarded.
+		if matches!(self.state, State::Open { .. }) {
+			for n in (0..self.legacy_substreams.len()).rev() {
+				let mut substream = self.legacy_substreams.swap_remove(n);
+				let poll_outcome = Pin::new(&mut substream).poll_next(cx);
+				match poll_outcome {
+					Poll::Pending => self.legacy_substreams.push(substream),
+					Poll::Ready(Some(Ok(RegisteredProtocolEvent::Message(message)))) => {
+						self.legacy_substreams.push(substream);
+						return Poll::Ready(ProtocolsHandlerEvent::Custom(
+							NotifsHandlerOut::CustomMessage { message }
+						))
+					},
+					Poll::Ready(Some(Ok(RegisteredProtocolEvent::Clogged))) => {
+						return Poll::Ready(ProtocolsHandlerEvent::Close(
+							NotifsHandlerError::SyncNotificationsClogged
+						))
+					}
+					Poll::Ready(None) | Poll::Ready(Some(Err(_))) => {
+						if matches!(poll_outcome, Poll::Ready(None)) {
+							self.legacy_shutdown.push(substream);
+						}
+
+						if let State::Open { want_closed, .. } = &mut self.state {
+							if !*want_closed {
+								*want_closed = true;
+								return Poll::Ready(ProtocolsHandlerEvent::Custom(
+									NotifsHandlerOut::CloseDesired
+								))
+							}
+						}
+					}
+				}
+			}
+		}
+
+		shutdown_list(&mut self.legacy_shutdown, cx);
+
+		Poll::Pending
+	}
+}
 
-mod group;
-mod legacy;
-mod notif_in;
-mod notif_out;
+/// Given a list of substreams, tries to shut them down. The substreams that have been successfully
+/// shut down are removed from the list.
+fn shutdown_list
+	(list: &mut SmallVec<impl smallvec::Array<Item = RegisteredProtocolSubstream<NegotiatedSubstream>>>,
+	cx: &mut Context)
+{
+	'outer: for n in (0..list.len()).rev() {
+		let mut substream = list.swap_remove(n);
+		loop {
+			match substream.poll_next_unpin(cx) {
+				Poll::Ready(Some(Ok(_))) => {}
+				Poll::Pending => break,
+				Poll::Ready(Some(Err(_))) | Poll::Ready(None) => continue 'outer,
+			}
+		}
+		list.push(substream);
+	}
+}
diff --git a/client/network/src/protocol/generic_proto/handler/group.rs b/client/network/src/protocol/generic_proto/handler/group.rs
deleted file mode 100644
index fbfdb1cb6ab0..000000000000
--- a/client/network/src/protocol/generic_proto/handler/group.rs
+++ /dev/null
@@ -1,737 +0,0 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
-// This file is part of Substrate.
-
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Implementations of the `IntoProtocolsHandler` and `ProtocolsHandler` traits for both incoming
-//! and outgoing substreams for all gossiping protocols together.
-//!
-//! This is the main implementation of `ProtocolsHandler` in this crate, that handles all the
-//! protocols that are Substrate-related and outside of the scope of libp2p.
-//!
-//! # Usage
-//!
-//! The handler can be in one of the following states: `Initial`, `Enabled`, `Disabled`.
-//!
-//! The `Initial` state is the state that the handler initially is in. It is a temporary state
-//! during which the user must either enable or disable the handler. After that, the handler stays
-//! either enabled or disabled.
-//!
-//! On the wire, we try to open the following substreams:
-//!
-//! - One substream for each notification protocol passed as parameter to the
-//!   `NotifsHandlerProto::new` function.
-//! - One "legacy" substream used for anything non-related to gossiping, and used as a fallback
-//!   in case the notification protocol can't be opened.
-//!
-//! When the handler is in the `Enabled` state, we immediately open and try to maintain all the
-//! aforementioned substreams. When the handler is in the `Disabled` state, we immediately close
-//! (or abort opening) all these substreams. It is intended that in the future we allow states in
-//! which some protocols are open and not others. Symmetrically, we allow incoming
-//! Substrate-related substreams if and only if we are in the `Enabled` state.
-//!
-//! The user has the choice between sending a message with `SendNotification`, to send a
-//! notification, and `SendLegacy`, to send any other kind of message.
-//!
-
-use crate::protocol::generic_proto::{
-	handler::legacy::{LegacyProtoHandler, LegacyProtoHandlerProto, LegacyProtoHandlerIn, LegacyProtoHandlerOut},
-	handler::notif_in::{NotifsInHandlerProto, NotifsInHandler, NotifsInHandlerIn, NotifsInHandlerOut},
-	handler::notif_out::{NotifsOutHandlerProto, NotifsOutHandler, NotifsOutHandlerIn, NotifsOutHandlerOut},
-	upgrade::{NotificationsIn, NotificationsOut, NotificationsHandshakeError, RegisteredProtocol, UpgradeCollec},
-};
-
-use bytes::BytesMut;
-use libp2p::core::{either::EitherOutput, ConnectedPoint, PeerId};
-use libp2p::core::upgrade::{UpgradeError, SelectUpgrade, InboundUpgrade, OutboundUpgrade};
-use libp2p::swarm::{
-	ProtocolsHandler, ProtocolsHandlerEvent,
-	IntoProtocolsHandler,
-	KeepAlive,
-	ProtocolsHandlerUpgrErr,
-	SubstreamProtocol,
-	NegotiatedSubstream,
-};
-use futures::{
-	channel::mpsc,
-	lock::{Mutex as FuturesMutex, MutexGuard as FuturesMutexGuard},
-	prelude::*
-};
-use log::{debug, error};
-use parking_lot::{Mutex, RwLock};
-use std::{borrow::Cow, str, sync::Arc, task::{Context, Poll}};
-
-/// Number of pending notifications in asynchronous contexts.
-/// See [`NotificationsSink::reserve_notification`] for context.
-const ASYNC_NOTIFICATIONS_BUFFER_SIZE: usize = 8;
-/// Number of pending notifications in synchronous contexts.
-const SYNC_NOTIFICATIONS_BUFFER_SIZE: usize = 2048;
-
-/// Implements the `IntoProtocolsHandler` trait of libp2p.
-///
-/// Every time a connection with a remote starts, an instance of this struct is created and
-/// sent to a background task dedicated to this connection. Once the connection is established,
-/// it is turned into a [`NotifsHandler`].
-///
-/// See the documentation at the module level for more information.
-pub struct NotifsHandlerProto {
-	/// Prototypes for handlers for inbound substreams, and the message we respond with in the
-	/// handshake.
-	in_handlers: Vec<(NotifsInHandlerProto, Arc<RwLock<Vec<u8>>>)>,
-
-	/// Prototypes for handlers for outbound substreams, and the initial handshake message we send.
-	out_handlers: Vec<(NotifsOutHandlerProto, Arc<RwLock<Vec<u8>>>)>,
-
-	/// Prototype for handler for backwards-compatibility.
-	legacy: LegacyProtoHandlerProto,
-}
-
-/// The actual handler once the connection has been established.
-///
-/// See the documentation at the module level for more information.
-pub struct NotifsHandler {
-	/// Handlers for inbound substreams, and the message we respond with in the handshake.
-	in_handlers: Vec<(NotifsInHandler, Arc<RwLock<Vec<u8>>>)>,
-
-	/// Handlers for outbound substreams, and the initial handshake message we send.
-	out_handlers: Vec<(NotifsOutHandler, Arc<RwLock<Vec<u8>>>)>,
-
-	/// Whether we are the connection dialer or listener.
-	endpoint: ConnectedPoint,
-
-	/// Handler for backwards-compatibility.
-	legacy: LegacyProtoHandler,
-
-	/// In the situation where either the legacy substream has been opened or the handshake-bearing
-	/// notifications protocol is open, but we haven't sent out any [`NotifsHandlerOut::Open`]
-	/// event yet, this contains the received handshake waiting to be reported through the
-	/// external API.
-	pending_handshake: Option<Vec<u8>>,
-
-	/// State of this handler.
-	enabled: EnabledState,
-
-	/// If we receive inbound substream requests while in initialization mode,
-	/// we push the corresponding index here and process them when the handler
-	/// gets enabled/disabled.
-	pending_in: Vec<usize>,
-
-	/// If `Some`, contains the two `Receiver`s connected to the [`NotificationsSink`] that has
-	/// been sent out. The notifications to send out can be pulled from this receivers.
-	/// We use two different channels in order to have two different channel sizes, but from the
-	/// receiving point of view, the two channels are the same.
-	/// The receivers are fused in case the user drops the [`NotificationsSink`] entirely.
-	///
-	/// Contains `Some` if and only if it has been reported to the user that the substreams are
-	/// open.
-	notifications_sink_rx: Option<
-		stream::Select<
-			stream::Fuse<mpsc::Receiver<NotificationsSinkMessage>>,
-			stream::Fuse<mpsc::Receiver<NotificationsSinkMessage>>
-		>
-	>,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-enum EnabledState {
-	Initial,
-	Enabled,
-	Disabled,
-}
-
-impl IntoProtocolsHandler for NotifsHandlerProto {
-	type Handler = NotifsHandler;
-
-	fn inbound_protocol(&self) -> SelectUpgrade<UpgradeCollec<NotificationsIn>, RegisteredProtocol> {
-		let in_handlers = self.in_handlers.iter()
-			.map(|(h, _)| h.inbound_protocol())
-			.collect::<UpgradeCollec<_>>();
-
-		SelectUpgrade::new(in_handlers, self.legacy.inbound_protocol())
-	}
-
-	fn into_handler(self, remote_peer_id: &PeerId, connected_point: &ConnectedPoint) -> Self::Handler {
-		NotifsHandler {
-			in_handlers: self.in_handlers
-				.into_iter()
-				.map(|(proto, msg)| (proto.into_handler(remote_peer_id, connected_point), msg))
-				.collect(),
-			out_handlers: self.out_handlers
-				.into_iter()
-				.map(|(proto, msg)| (proto.into_handler(remote_peer_id, connected_point), msg))
-				.collect(),
-			endpoint: connected_point.clone(),
-			legacy: self.legacy.into_handler(remote_peer_id, connected_point),
-			pending_handshake: None,
-			enabled: EnabledState::Initial,
-			pending_in: Vec::new(),
-			notifications_sink_rx: None,
-		}
-	}
-}
-
-/// Event that can be received by a `NotifsHandler`.
-#[derive(Debug, Clone)]
-pub enum NotifsHandlerIn {
-	/// The node should start using custom protocols.
-	Enable,
-
-	/// The node should stop using custom protocols.
-	Disable,
-}
-
-/// Event that can be emitted by a `NotifsHandler`.
-#[derive(Debug)]
-pub enum NotifsHandlerOut {
-	/// The connection is open for custom protocols.
-	Open {
-		/// The endpoint of the connection that is open for custom protocols.
-		endpoint: ConnectedPoint,
-		/// Handshake that was sent to us.
-		/// This is normally a "Status" message, but this out of the concern of this code.
-		received_handshake: Vec<u8>,
-		/// How notifications can be sent to this node.
-		notifications_sink: NotificationsSink,
-	},
-
-	/// The connection is closed for custom protocols.
-	Closed {
-		/// The reason for closing, for diagnostic purposes.
-		reason: Cow<'static, str>,
-		/// The endpoint of the connection that closed for custom protocols.
-		endpoint: ConnectedPoint,
-	},
-
-	/// Received a non-gossiping message on the legacy substream.
-	CustomMessage {
-		/// Message that has been received.
-		///
-		/// Keep in mind that this can be a `ConsensusMessage` message, which then contains a
-		/// notification.
-		message: BytesMut,
-	},
-
-	/// Received a message on a custom protocol substream.
-	Notification {
-		/// Name of the protocol of the message.
-		protocol_name: Cow<'static, str>,
-
-		/// Message that has been received.
-		message: BytesMut,
-	},
-}
-
-/// Sink connected directly to the node background task. Allows sending notifications to the peer.
-///
-/// Can be cloned in order to obtain multiple references to the same peer.
-#[derive(Debug, Clone)]
-pub struct NotificationsSink {
-	inner: Arc<NotificationsSinkInner>,
-}
-
-#[derive(Debug)]
-struct NotificationsSinkInner {
-	/// Sender to use in asynchronous contexts. Uses an asynchronous mutex.
-	async_channel: FuturesMutex<mpsc::Sender<NotificationsSinkMessage>>,
-	/// Sender to use in synchronous contexts. Uses a synchronous mutex.
-	/// This channel has a large capacity and is meant to be used in contexts where
-	/// back-pressure cannot be properly exerted.
-	/// It will be removed in a future version.
-	sync_channel: Mutex<mpsc::Sender<NotificationsSinkMessage>>,
-}
-
-/// Message emitted through the [`NotificationsSink`] and processed by the background task
-/// dedicated to the peer.
-#[derive(Debug)]
-enum NotificationsSinkMessage {
-	/// Message emitted by [`NotificationsSink::reserve_notification`] and
-	/// [`NotificationsSink::write_notification_now`].
-	Notification {
-		protocol_name: Cow<'static, str>,
-		message: Vec<u8>,
-	},
-
-	/// Must close the connection.
-	ForceClose,
-}
-
-impl NotificationsSink {
-	/// Sends a notification to the peer.
-	///
-	/// If too many messages are already buffered, the notification is silently discarded and the
-	/// connection to the peer will be closed shortly after.
-	///
-	/// The protocol name is expected to be checked ahead of calling this method. It is a logic
-	/// error to send a notification using an unknown protocol.
-	///
-	/// This method will be removed in a future version.
-	pub fn send_sync_notification<'a>(
-		&'a self,
-		protocol_name: Cow<'static, str>,
-		message: impl Into<Vec<u8>>
-	) {
-		let mut lock = self.inner.sync_channel.lock();
-		let result = lock.try_send(NotificationsSinkMessage::Notification {
-			protocol_name,
-			message: message.into()
-		});
-
-		if result.is_err() {
-			// Cloning the `mpsc::Sender` guarantees the allocation of an extra spot in the
-			// buffer, and therefore that `try_send` will succeed.
-			let _result2 = lock.clone().try_send(NotificationsSinkMessage::ForceClose);
-			debug_assert!(_result2.map(|()| true).unwrap_or_else(|err| err.is_disconnected()));
-		}
-	}
-
-	/// Wait until the remote is ready to accept a notification.
-	///
-	/// Returns an error in the case where the connection is closed.
-	///
-	/// The protocol name is expected to be checked ahead of calling this method. It is a logic
-	/// error to send a notification using an unknown protocol.
-	pub async fn reserve_notification<'a>(&'a self, protocol_name: Cow<'static, str>) -> Result<Ready<'a>, ()> {
-		let mut lock = self.inner.async_channel.lock().await;
-
-		let poll_ready = future::poll_fn(|cx| lock.poll_ready(cx)).await;
-		if poll_ready.is_ok() {
-			Ok(Ready { protocol_name: protocol_name, lock })
-		} else {
-			Err(())
-		}
-	}
-}
-
-/// Notification slot is reserved and the notification can actually be sent.
-#[must_use]
-#[derive(Debug)]
-pub struct Ready<'a> {
-	/// Guarded channel. The channel inside is guaranteed to not be full.
-	lock: FuturesMutexGuard<'a, mpsc::Sender<NotificationsSinkMessage>>,
-	/// Name of the protocol. Should match one of the protocols passed at initialization.
-	protocol_name: Cow<'static, str>,
-}
-
-impl<'a> Ready<'a> {
-	/// Consumes this slots reservation and actually queues the notification.
-	///
-	/// Returns an error if the substream has been closed.
-	pub fn send(
-		mut self,
-		notification: impl Into<Vec<u8>>
-	) -> Result<(), ()> {
-		self.lock.start_send(NotificationsSinkMessage::Notification {
-			protocol_name: self.protocol_name,
-			message: notification.into(),
-		}).map_err(|_| ())
-	}
-}
-
-/// Error specific to the collection of protocols.
-#[derive(Debug, derive_more::Display, derive_more::Error)]
-pub enum NotifsHandlerError {
-	/// Channel of synchronous notifications is full.
-	SyncNotificationsClogged,
-	/// Error in legacy protocol.
-	Legacy(<LegacyProtoHandler as ProtocolsHandler>::Error),
-}
-
-impl NotifsHandlerProto {
-	/// Builds a new handler.
-	///
-	/// `list` is a list of notification protocols names, and the message to send as part of the
-	/// handshake. At the moment, the message is always the same whether we open a substream
-	/// ourselves or respond to handshake from the remote.
-	///
-	/// The first protocol in `list` is special-cased as the protocol that contains the handshake
-	/// to report through the [`NotifsHandlerOut::Open`] event.
-	///
-	/// # Panic
-	///
-	/// - Panics if `list` is empty.
-	///
-	pub fn new(
-		legacy: RegisteredProtocol,
-		list: impl Into<Vec<(Cow<'static, str>, Arc<RwLock<Vec<u8>>>)>>,
-	) -> Self {
-		let list = list.into();
-		assert!(!list.is_empty());
-
-		let out_handlers = list
-			.clone()
-			.into_iter()
-			.map(|(proto_name, initial_message)| {
-				(NotifsOutHandlerProto::new(proto_name), initial_message)
-			}).collect();
-
-		let in_handlers = list.clone()
-			.into_iter()
-			.map(|(proto_name, msg)| (NotifsInHandlerProto::new(proto_name), msg))
-			.collect();
-
-		NotifsHandlerProto {
-			in_handlers,
-			out_handlers,
-			legacy: LegacyProtoHandlerProto::new(legacy),
-		}
-	}
-}
-
-impl ProtocolsHandler for NotifsHandler {
-	type InEvent = NotifsHandlerIn;
-	type OutEvent = NotifsHandlerOut;
-	type Error = NotifsHandlerError;
-	type InboundProtocol = SelectUpgrade<UpgradeCollec<NotificationsIn>, RegisteredProtocol>;
-	type OutboundProtocol = NotificationsOut;
-	// Index within the `out_handlers`
-	type OutboundOpenInfo = usize;
-	type InboundOpenInfo = ();
-
-	fn listen_protocol(&self) -> SubstreamProtocol<Self::InboundProtocol, ()> {
-		let in_handlers = self.in_handlers.iter()
-			.map(|(h, _)| h.listen_protocol().into_upgrade().1)
-			.collect::<UpgradeCollec<_>>();
-
-		let proto = SelectUpgrade::new(in_handlers, self.legacy.listen_protocol().into_upgrade().1);
-		SubstreamProtocol::new(proto, ())
-	}
-
-	fn inject_fully_negotiated_inbound(
-		&mut self,
-		out: <Self::InboundProtocol as InboundUpgrade<NegotiatedSubstream>>::Output,
-		(): ()
-	) {
-		match out {
-			EitherOutput::First((out, num)) =>
-				self.in_handlers[num].0.inject_fully_negotiated_inbound(out, ()),
-			EitherOutput::Second(out) =>
-				self.legacy.inject_fully_negotiated_inbound(out, ()),
-		}
-	}
-
-	fn inject_fully_negotiated_outbound(
-		&mut self,
-		out: <Self::OutboundProtocol as OutboundUpgrade<NegotiatedSubstream>>::Output,
-		num: Self::OutboundOpenInfo
-	) {
-		self.out_handlers[num].0.inject_fully_negotiated_outbound(out, ())
-	}
-
-	fn inject_event(&mut self, message: NotifsHandlerIn) {
-		match message {
-			NotifsHandlerIn::Enable => {
-				if let EnabledState::Enabled = self.enabled {
-					debug!("enabling already-enabled handler");
-				}
-				self.enabled = EnabledState::Enabled;
-				self.legacy.inject_event(LegacyProtoHandlerIn::Enable);
-				for (handler, initial_message) in &mut self.out_handlers {
-					// We create `initial_message` on a separate line to be sure that the lock
-					// is released as soon as possible.
-					let initial_message = initial_message.read().clone();
-					handler.inject_event(NotifsOutHandlerIn::Enable {
-						initial_message,
-					});
-				}
-				for num in self.pending_in.drain(..) {
-					// We create `handshake_message` on a separate line to be sure
-					// that the lock is released as soon as possible.
-					let handshake_message = self.in_handlers[num].1.read().clone();
-					self.in_handlers[num].0
-						.inject_event(NotifsInHandlerIn::Accept(handshake_message));
-				}
-			},
-			NotifsHandlerIn::Disable => {
-				if let EnabledState::Disabled = self.enabled {
-					debug!("disabling already-disabled handler");
-				}
-				self.legacy.inject_event(LegacyProtoHandlerIn::Disable);
-				// The notifications protocols start in the disabled state. If we were in the
-				// "Initial" state, then we shouldn't disable the notifications protocols again.
-				if self.enabled != EnabledState::Initial {
-					for (handler, _) in &mut self.out_handlers {
-						handler.inject_event(NotifsOutHandlerIn::Disable);
-					}
-				}
-				self.enabled = EnabledState::Disabled;
-				for num in self.pending_in.drain(..) {
-					self.in_handlers[num].0.inject_event(NotifsInHandlerIn::Refuse);
-				}
-			},
-		}
-	}
-
-	fn inject_dial_upgrade_error(
-		&mut self,
-		num: usize,
-		err: ProtocolsHandlerUpgrErr<NotificationsHandshakeError>
-	) {
-		match err {
-			ProtocolsHandlerUpgrErr::Timeout =>
-				self.out_handlers[num].0.inject_dial_upgrade_error(
-					(),
-					ProtocolsHandlerUpgrErr::Timeout
-				),
-			ProtocolsHandlerUpgrErr::Timer =>
-				self.out_handlers[num].0.inject_dial_upgrade_error(
-					(),
-					ProtocolsHandlerUpgrErr::Timer
-				),
-			ProtocolsHandlerUpgrErr::Upgrade(UpgradeError::Select(err)) =>
-				self.out_handlers[num].0.inject_dial_upgrade_error(
-					(),
-					ProtocolsHandlerUpgrErr::Upgrade(UpgradeError::Select(err))
-				),
-			ProtocolsHandlerUpgrErr::Upgrade(UpgradeError::Apply(err)) =>
-				self.out_handlers[num].0.inject_dial_upgrade_error(
-					(),
-					ProtocolsHandlerUpgrErr::Upgrade(UpgradeError::Apply(err))
-				),
-		}
-	}
-
-	fn connection_keep_alive(&self) -> KeepAlive {
-		// Iterate over each handler and return the maximum value.
-
-		let mut ret = self.legacy.connection_keep_alive();
-		if ret.is_yes() {
-			return KeepAlive::Yes;
-		}
-
-		for (handler, _) in &self.in_handlers {
-			let val = handler.connection_keep_alive();
-			if val.is_yes() {
-				return KeepAlive::Yes;
-			}
-			if ret < val { ret = val; }
-		}
-
-		for (handler, _) in &self.out_handlers {
-			let val = handler.connection_keep_alive();
-			if val.is_yes() {
-				return KeepAlive::Yes;
-			}
-			if ret < val { ret = val; }
-		}
-
-		ret
-	}
-
-	fn poll(
-		&mut self,
-		cx: &mut Context,
-	) -> Poll<
-		ProtocolsHandlerEvent<Self::OutboundProtocol, Self::OutboundOpenInfo, Self::OutEvent, Self::Error>
-	> {
-		if let Some(notifications_sink_rx) = &mut self.notifications_sink_rx {
-			'poll_notifs_sink: loop {
-				// Before we poll the notifications sink receiver, check that all the notification
-				// channels are ready to send a message.
-				// TODO: it is planned that in the future we switch to one `NotificationsSink` per
-				// protocol, in which case each sink should wait only for its corresponding handler
-				// to be ready, and not all handlers
-				// see https://github.com/paritytech/substrate/issues/5670
-				for (out_handler, _) in &mut self.out_handlers {
-					match out_handler.poll_ready(cx) {
-						Poll::Ready(_) => {},
-						Poll::Pending => break 'poll_notifs_sink,
-					}
-				}
-
-				let message = match notifications_sink_rx.poll_next_unpin(cx) {
-					Poll::Ready(Some(msg)) => msg,
-					Poll::Ready(None) | Poll::Pending => break,
-				};
-
-				match message {
-					NotificationsSinkMessage::Notification {
-						protocol_name,
-						message
-					} => {
-						let mut found_any_with_name = false;
-
-						for (handler, _) in &mut self.out_handlers {
-							if *handler.protocol_name() == protocol_name {
-								found_any_with_name = true;
-								if handler.is_open() {
-									handler.send_or_discard(message);
-									continue 'poll_notifs_sink;
-								}
-							}
-						}
-
-						// This code can be reached via the following scenarios:
-						//
-						// - User tried to send a notification on a non-existing protocol. This
-						// most likely relates to https://github.com/paritytech/substrate/issues/6827
-						// - User tried to send a notification to a peer we're not or no longer
-						// connected to. This happens in a normal scenario due to the racy nature
-						// of connections and disconnections, and is benign.
-						//
-						// We print a warning in the former condition.
-						if !found_any_with_name {
-							log::warn!(
-								target: "sub-libp2p",
-								"Tried to send a notification on non-registered protocol: {:?}",
-								protocol_name
-							);
-						}
-					}
-					NotificationsSinkMessage::ForceClose => {
-						return Poll::Ready(ProtocolsHandlerEvent::Close(NotifsHandlerError::SyncNotificationsClogged));
-					}
-				}
-			}
-		}
-
-		// If `self.pending_handshake` is `Some`, we are in a state where the handshake-bearing
-		// substream (either the legacy substream or the one special-cased as providing the
-		// handshake) is open but the user isn't aware yet of the substreams being open.
-		// When that is the case, neither the legacy substream nor the incoming notifications
-		// substreams should be polled, otherwise there is a risk of receiving messages from them.
-		if self.pending_handshake.is_none() {
-			while let Poll::Ready(ev) = self.legacy.poll(cx) {
-				match ev {
-					ProtocolsHandlerEvent::OutboundSubstreamRequest { protocol, .. } =>
-						match *protocol.info() {},
-					ProtocolsHandlerEvent::Custom(LegacyProtoHandlerOut::CustomProtocolOpen {
-						received_handshake,
-						..
-					}) => {
-						if self.notifications_sink_rx.is_none() {
-							debug_assert!(self.pending_handshake.is_none());
-							self.pending_handshake = Some(received_handshake);
-						}
-						cx.waker().wake_by_ref();
-						return Poll::Pending;
-					},
-					ProtocolsHandlerEvent::Custom(LegacyProtoHandlerOut::CustomProtocolClosed { reason, .. }) => {
-						// We consciously drop the receivers despite notifications being potentially
-						// still buffered up.
-						self.notifications_sink_rx = None;
-
-						return Poll::Ready(ProtocolsHandlerEvent::Custom(
-							NotifsHandlerOut::Closed { endpoint: self.endpoint.clone(), reason }
-						))
-					},
-					ProtocolsHandlerEvent::Custom(LegacyProtoHandlerOut::CustomMessage { message }) => {
-						return Poll::Ready(ProtocolsHandlerEvent::Custom(
-							NotifsHandlerOut::CustomMessage { message }
-						))
-					},
-					ProtocolsHandlerEvent::Close(err) =>
-						return Poll::Ready(ProtocolsHandlerEvent::Close(NotifsHandlerError::Legacy(err))),
-				}
-			}
-		}
-
-		for (handler_num, (handler, handshake_message)) in self.in_handlers.iter_mut().enumerate() {
-			loop {
-				let poll = if self.notifications_sink_rx.is_some() {
-					handler.poll(cx)
-				} else {
-					handler.poll_process(cx)
-				};
-
-				let ev = match poll {
-					Poll::Ready(e) => e,
-					Poll::Pending => break,
-				};
-
-				match ev {
-					ProtocolsHandlerEvent::OutboundSubstreamRequest { .. } =>
-						error!("Incoming substream handler tried to open a substream"),
-					ProtocolsHandlerEvent::Close(err) => void::unreachable(err),
-					ProtocolsHandlerEvent::Custom(NotifsInHandlerOut::OpenRequest(_)) =>
-						match self.enabled {
-							EnabledState::Initial => self.pending_in.push(handler_num),
-							EnabledState::Enabled => {
-								// We create `handshake_message` on a separate line to be sure
-								// that the lock is released as soon as possible.
-								let handshake_message = handshake_message.read().clone();
-								handler.inject_event(NotifsInHandlerIn::Accept(handshake_message))
-							},
-							EnabledState::Disabled =>
-								handler.inject_event(NotifsInHandlerIn::Refuse),
-						},
-					ProtocolsHandlerEvent::Custom(NotifsInHandlerOut::Closed) => {},
-					ProtocolsHandlerEvent::Custom(NotifsInHandlerOut::Notif(message)) => {
-						debug_assert!(self.pending_handshake.is_none());
-						if self.notifications_sink_rx.is_some() {
-							let msg = NotifsHandlerOut::Notification {
-								message,
-								protocol_name: handler.protocol_name().clone(),
-							};
-							return Poll::Ready(ProtocolsHandlerEvent::Custom(msg));
-						}
-					},
-				}
-			}
-		}
-
-		for (handler_num, (handler, _)) in self.out_handlers.iter_mut().enumerate() {
-			while let Poll::Ready(ev) = handler.poll(cx) {
-				match ev {
-					ProtocolsHandlerEvent::OutboundSubstreamRequest { protocol } =>
-						return Poll::Ready(ProtocolsHandlerEvent::OutboundSubstreamRequest {
-							protocol: protocol
-								.map_info(|()| handler_num),
-						}),
-					ProtocolsHandlerEvent::Close(err) => void::unreachable(err),
-
-					// Opened substream on the handshake-bearing notification protocol.
-					ProtocolsHandlerEvent::Custom(NotifsOutHandlerOut::Open { handshake })
-						if handler_num == 0 =>
-					{
-						if self.notifications_sink_rx.is_none() && self.pending_handshake.is_none() {
-							self.pending_handshake = Some(handshake);
-						}
-					},
-
-					// Nothing to do in response to other notification substreams being opened
-					// or closed.
-					ProtocolsHandlerEvent::Custom(NotifsOutHandlerOut::Open { .. }) => {},
-					ProtocolsHandlerEvent::Custom(NotifsOutHandlerOut::Closed) => {},
-					ProtocolsHandlerEvent::Custom(NotifsOutHandlerOut::Refused) => {},
-				}
-			}
-		}
-
-		if self.out_handlers.iter().all(|(h, _)| h.is_open() || h.is_refused()) {
-			if let Some(handshake) = self.pending_handshake.take() {
-				let (async_tx, async_rx) = mpsc::channel(ASYNC_NOTIFICATIONS_BUFFER_SIZE);
-				let (sync_tx, sync_rx) = mpsc::channel(SYNC_NOTIFICATIONS_BUFFER_SIZE);
-				let notifications_sink = NotificationsSink {
-					inner: Arc::new(NotificationsSinkInner {
-						async_channel: FuturesMutex::new(async_tx),
-						sync_channel: Mutex::new(sync_tx),
-					}),
-				};
-
-				debug_assert!(self.notifications_sink_rx.is_none());
-				self.notifications_sink_rx = Some(stream::select(async_rx.fuse(), sync_rx.fuse()));
-
-				return Poll::Ready(ProtocolsHandlerEvent::Custom(
-					NotifsHandlerOut::Open {
-						endpoint: self.endpoint.clone(),
-						received_handshake: handshake,
-						notifications_sink
-					}
-				))
-			}
-		}
-
-		Poll::Pending
-	}
-}
diff --git a/client/network/src/protocol/generic_proto/handler/legacy.rs b/client/network/src/protocol/generic_proto/handler/legacy.rs
deleted file mode 100644
index 404093553785..000000000000
--- a/client/network/src/protocol/generic_proto/handler/legacy.rs
+++ /dev/null
@@ -1,559 +0,0 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
-// This file is part of Substrate.
-
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
-
-use crate::protocol::generic_proto::upgrade::{RegisteredProtocol, RegisteredProtocolEvent, RegisteredProtocolSubstream};
-use bytes::BytesMut;
-use futures::prelude::*;
-use futures_timer::Delay;
-use libp2p::core::{ConnectedPoint, PeerId, Endpoint};
-use libp2p::core::upgrade::{InboundUpgrade, OutboundUpgrade};
-use libp2p::swarm::{
-	ProtocolsHandler, ProtocolsHandlerEvent,
-	IntoProtocolsHandler,
-	KeepAlive,
-	ProtocolsHandlerUpgrErr,
-	SubstreamProtocol,
-	NegotiatedSubstream,
-};
-use log::{debug, error};
-use smallvec::{smallvec, SmallVec};
-use std::{borrow::Cow, collections::VecDeque, convert::Infallible, error, fmt, io, mem};
-use std::{pin::Pin, task::{Context, Poll}, time::Duration};
-
-/// Implements the `IntoProtocolsHandler` trait of libp2p.
-///
-/// Every time a connection with a remote starts, an instance of this struct is created and
-/// sent to a background task dedicated to this connection. Once the connection is established,
-/// it is turned into a `LegacyProtoHandler`. It then handles all communications that are specific
-/// to Substrate on that single connection.
-///
-/// Note that there can be multiple instance of this struct simultaneously for same peer,
-/// if there are multiple established connections to the peer.
-///
-/// ## State of the handler
-///
-/// There are six possible states for the handler:
-///
-/// - Enabled and open, which is a normal operation.
-/// - Enabled and closed, in which case it will try to open substreams.
-/// - Disabled and open, in which case it will try to close substreams.
-/// - Disabled and closed, in which case the handler is idle. The connection will be
-///   garbage-collected after a few seconds if nothing more happens.
-/// - Initializing and open.
-/// - Initializing and closed, which is the state the handler starts in.
-///
-/// The Init/Enabled/Disabled state is entirely controlled by the user by sending `Enable` or
-/// `Disable` messages to the handler. The handler itself never transitions automatically between
-/// these states. For example, if the handler reports a network misbehaviour, it will close the
-/// substreams but it is the role of the user to send a `Disabled` event if it wants the connection
-/// to close. Otherwise, the handler will try to reopen substreams.
-///
-/// The handler starts in the "Initializing" state and must be transitionned to Enabled or Disabled
-/// as soon as possible.
-///
-/// The Open/Closed state is decided by the handler and is reported with the `CustomProtocolOpen`
-/// and `CustomProtocolClosed` events. The `CustomMessage` event can only be generated if the
-/// handler is open.
-///
-/// ## How it works
-///
-/// When the handler is created, it is initially in the `Init` state and waits for either a
-/// `Disable` or an `Enable` message from the outer layer. At any time, the outer layer is free to
-/// toggle the handler between the disabled and enabled states.
-///
-/// When the handler switches to "enabled", it opens a substream and negotiates the protocol named
-/// `/substrate/xxx`, where `xxx` is chosen by the user and depends on the chain.
-///
-/// For backwards compatibility reasons, when we switch to "enabled" for the first time (while we
-/// are still in "init" mode) and we are the connection listener, we don't open a substream.
-///
-/// In order the handle the situation where both the remote and us get enabled at the same time,
-/// we tolerate multiple substreams open at the same time. Messages are transmitted on an arbitrary
-/// substream. The endpoints don't try to agree on a single substream.
-///
-/// We consider that we are now "closed" if the remote closes all the existing substreams.
-/// Re-opening it can then be performed by closing all active substream and re-opening one.
-///
-pub struct LegacyProtoHandlerProto {
-	/// Configuration for the protocol upgrade to negotiate.
-	protocol: RegisteredProtocol,
-}
-
-impl LegacyProtoHandlerProto {
-	/// Builds a new `LegacyProtoHandlerProto`.
-	pub fn new(protocol: RegisteredProtocol) -> Self {
-		LegacyProtoHandlerProto {
-			protocol,
-		}
-	}
-}
-
-impl IntoProtocolsHandler for LegacyProtoHandlerProto {
-	type Handler = LegacyProtoHandler;
-
-	fn inbound_protocol(&self) -> RegisteredProtocol {
-		self.protocol.clone()
-	}
-
-	fn into_handler(self, remote_peer_id: &PeerId, _: &ConnectedPoint) -> Self::Handler {
-		LegacyProtoHandler {
-			protocol: self.protocol,
-			remote_peer_id: remote_peer_id.clone(),
-			state: ProtocolState::Init {
-				substreams: SmallVec::new(),
-				init_deadline: Delay::new(Duration::from_secs(20))
-			},
-			events_queue: VecDeque::new(),
-		}
-	}
-}
-
-/// The actual handler once the connection has been established.
-pub struct LegacyProtoHandler {
-	/// Configuration for the protocol upgrade to negotiate.
-	protocol: RegisteredProtocol,
-
-	/// State of the communications with the remote.
-	state: ProtocolState,
-
-	/// Identifier of the node we're talking to. Used only for logging purposes and shouldn't have
-	/// any influence on the behaviour.
-	remote_peer_id: PeerId,
-
-	/// Queue of events to send to the outside.
-	///
-	/// This queue must only ever be modified to insert elements at the back, or remove the first
-	/// element.
-	events_queue: VecDeque<
-		ProtocolsHandlerEvent<RegisteredProtocol, Infallible, LegacyProtoHandlerOut, ConnectionKillError>
-	>,
-}
-
-/// State of the handler.
-enum ProtocolState {
-	/// Waiting for the behaviour to tell the handler whether it is enabled or disabled.
-	Init {
-		/// List of substreams opened by the remote but that haven't been processed yet.
-		/// For each substream, also includes the handshake message that we have received.
-		substreams: SmallVec<[(RegisteredProtocolSubstream<NegotiatedSubstream>, Vec<u8>); 6]>,
-		/// Deadline after which the initialization is abnormally long.
-		init_deadline: Delay,
-	},
-
-	/// Handler is ready to accept incoming substreams.
-	/// If we are in this state, we haven't sent any `CustomProtocolOpen` yet.
-	Opening,
-
-	/// Normal operating mode. Contains the substreams that are open.
-	/// If we are in this state, we have sent a `CustomProtocolOpen` message to the outside.
-	Normal {
-		/// The substreams where bidirectional communications happen.
-		substreams: SmallVec<[RegisteredProtocolSubstream<NegotiatedSubstream>; 4]>,
-		/// Contains substreams which are being shut down.
-		shutdown: SmallVec<[RegisteredProtocolSubstream<NegotiatedSubstream>; 4]>,
-	},
-
-	/// We are disabled. Contains substreams that are being closed.
-	/// If we are in this state, either we have sent a `CustomProtocolClosed` message to the
-	/// outside or we have never sent any `CustomProtocolOpen` in the first place.
-	Disabled {
-		/// List of substreams to shut down.
-		shutdown: SmallVec<[RegisteredProtocolSubstream<NegotiatedSubstream>; 6]>,
-
-		/// If true, we should reactivate the handler after all the substreams in `shutdown` have
-		/// been closed.
-		///
-		/// Since we don't want to mix old and new substreams, we wait for all old substreams to
-		/// be closed before opening any new one.
-		reenable: bool,
-	},
-
-	/// In this state, we don't care about anything anymore and need to kill the connection as soon
-	/// as possible.
-	KillAsap,
-
-	/// We sometimes temporarily switch to this state during processing. If we are in this state
-	/// at the beginning of a method, that means something bad happened in the source code.
-	Poisoned,
-}
-
-/// Event that can be received by a `LegacyProtoHandler`.
-#[derive(Debug)]
-pub enum LegacyProtoHandlerIn {
-	/// The node should start using custom protocols.
-	Enable,
-
-	/// The node should stop using custom protocols.
-	Disable,
-}
-
-/// Event that can be emitted by a `LegacyProtoHandler`.
-#[derive(Debug)]
-pub enum LegacyProtoHandlerOut {
-	/// Opened a custom protocol with the remote.
-	CustomProtocolOpen {
-		/// Version of the protocol that has been opened.
-		version: u8,
-		/// Handshake message that has been sent to us.
-		/// This is normally a "Status" message, but this out of the concern of this code.
-		received_handshake: Vec<u8>,
-	},
-
-	/// Closed a custom protocol with the remote.
-	CustomProtocolClosed {
-		/// Reason why the substream closed, for diagnostic purposes.
-		reason: Cow<'static, str>,
-	},
-
-	/// Receives a message on a custom protocol substream.
-	CustomMessage {
-		/// Message that has been received.
-		message: BytesMut,
-	},
-}
-
-impl LegacyProtoHandler {
-	/// Enables the handler.
-	fn enable(&mut self) {
-		self.state = match mem::replace(&mut self.state, ProtocolState::Poisoned) {
-			ProtocolState::Poisoned => {
-				error!(target: "sub-libp2p", "Handler with {:?} is in poisoned state",
-					self.remote_peer_id);
-				ProtocolState::Poisoned
-			}
-
-			ProtocolState::Init { substreams: mut incoming, .. } => {
-				if incoming.is_empty() {
-					ProtocolState::Opening
-				} else {
-					let event = LegacyProtoHandlerOut::CustomProtocolOpen {
-						version: incoming[0].0.protocol_version(),
-						received_handshake: mem::replace(&mut incoming[0].1, Vec::new()),
-					};
-					self.events_queue.push_back(ProtocolsHandlerEvent::Custom(event));
-					ProtocolState::Normal {
-						substreams: incoming.into_iter().map(|(s, _)| s).collect(),
-						shutdown: SmallVec::new()
-					}
-				}
-			}
-
-			st @ ProtocolState::KillAsap => st,
-			st @ ProtocolState::Opening { .. } => st,
-			st @ ProtocolState::Normal { .. } => st,
-			ProtocolState::Disabled { shutdown, .. } => {
-				ProtocolState::Disabled { shutdown, reenable: true }
-			}
-		}
-	}
-
-	/// Disables the handler.
-	fn disable(&mut self) {
-		self.state = match mem::replace(&mut self.state, ProtocolState::Poisoned) {
-			ProtocolState::Poisoned => {
-				error!(target: "sub-libp2p", "Handler with {:?} is in poisoned state",
-					self.remote_peer_id);
-				ProtocolState::Poisoned
-			}
-
-			ProtocolState::Init { substreams: shutdown, .. } => {
-				let mut shutdown = shutdown.into_iter().map(|(s, _)| s).collect::<SmallVec<[_; 6]>>();
-				for s in &mut shutdown {
-					s.shutdown();
-				}
-				ProtocolState::Disabled { shutdown, reenable: false }
-			}
-
-			ProtocolState::Opening { .. } | ProtocolState::Normal { .. } =>
-				// At the moment, if we get disabled while things were working, we kill the entire
-				// connection in order to force a reset of the state.
-				// This is obviously an extremely shameful way to do things, but at the time of
-				// the writing of this comment, the networking works very poorly and a solution
-				// needs to be found.
-				ProtocolState::KillAsap,
-
-			ProtocolState::Disabled { shutdown, .. } =>
-				ProtocolState::Disabled { shutdown, reenable: false },
-
-			ProtocolState::KillAsap => ProtocolState::KillAsap,
-		};
-	}
-
-	/// Polls the state for events. Optionally returns an event to produce.
-	#[must_use]
-	fn poll_state(&mut self, cx: &mut Context)
-		-> Option<ProtocolsHandlerEvent<RegisteredProtocol, Infallible, LegacyProtoHandlerOut, ConnectionKillError>> {
-		match mem::replace(&mut self.state, ProtocolState::Poisoned) {
-			ProtocolState::Poisoned => {
-				error!(target: "sub-libp2p", "Handler with {:?} is in poisoned state",
-					self.remote_peer_id);
-				self.state = ProtocolState::Poisoned;
-				None
-			}
-
-			ProtocolState::Init { substreams, mut init_deadline } => {
-				match Pin::new(&mut init_deadline).poll(cx) {
-					Poll::Ready(()) => {
-						error!(target: "sub-libp2p", "Handler initialization process is too long \
-							with {:?}", self.remote_peer_id);
-						self.state = ProtocolState::KillAsap;
-					},
-					Poll::Pending => {
-						self.state = ProtocolState::Init { substreams, init_deadline };
-					}
-				}
-
-				None
-			}
-
-			ProtocolState::Opening => {
-				self.state = ProtocolState::Opening;
-				None
-			}
-
-			ProtocolState::Normal { mut substreams, mut shutdown } => {
-				for n in (0..substreams.len()).rev() {
-					let mut substream = substreams.swap_remove(n);
-					match Pin::new(&mut substream).poll_next(cx) {
-						Poll::Pending => substreams.push(substream),
-						Poll::Ready(Some(Ok(RegisteredProtocolEvent::Message(message)))) => {
-							let event = LegacyProtoHandlerOut::CustomMessage {
-								message
-							};
-							substreams.push(substream);
-							self.state = ProtocolState::Normal { substreams, shutdown };
-							return Some(ProtocolsHandlerEvent::Custom(event));
-						},
-						Poll::Ready(Some(Ok(RegisteredProtocolEvent::Clogged))) => {
-							shutdown.push(substream);
-							if substreams.is_empty() {
-								let event = LegacyProtoHandlerOut::CustomProtocolClosed {
-									reason: "Legacy substream clogged".into(),
-								};
-								self.state = ProtocolState::Disabled {
-									shutdown: shutdown.into_iter().collect(),
-									reenable: true
-								};
-								return Some(ProtocolsHandlerEvent::Custom(event));
-							}
-						}
-						Poll::Ready(None) => {
-							shutdown.push(substream);
-							if substreams.is_empty() {
-								let event = LegacyProtoHandlerOut::CustomProtocolClosed {
-									reason: "All substreams have been closed by the remote".into(),
-								};
-								self.state = ProtocolState::Disabled {
-									shutdown: shutdown.into_iter().collect(),
-									reenable: true
-								};
-								return Some(ProtocolsHandlerEvent::Custom(event));
-							}
-						}
-						Poll::Ready(Some(Err(err))) => {
-							if substreams.is_empty() {
-								let event = LegacyProtoHandlerOut::CustomProtocolClosed {
-									reason: format!("Error on the last substream: {:?}", err).into(),
-								};
-								self.state = ProtocolState::Disabled {
-									shutdown: shutdown.into_iter().collect(),
-									reenable: true
-								};
-								return Some(ProtocolsHandlerEvent::Custom(event));
-							} else {
-								debug!(target: "sub-libp2p", "Error on extra substream: {:?}", err);
-							}
-						}
-					}
-				}
-
-				// This code is reached is none if and only if none of the substreams are in a ready state.
-				self.state = ProtocolState::Normal { substreams, shutdown };
-				None
-			}
-
-			ProtocolState::Disabled { mut shutdown, reenable } => {
-				shutdown_list(&mut shutdown, cx);
-				// If `reenable` is `true`, that means we should open the substreams system again
-				// after all the substreams are closed.
-				if reenable && shutdown.is_empty() {
-					self.state = ProtocolState::Opening;
-				} else {
-					self.state = ProtocolState::Disabled { shutdown, reenable };
-				}
-				None
-			}
-
-			ProtocolState::KillAsap => None,
-		}
-	}
-}
-
-impl ProtocolsHandler for LegacyProtoHandler {
-	type InEvent = LegacyProtoHandlerIn;
-	type OutEvent = LegacyProtoHandlerOut;
-	type Error = ConnectionKillError;
-	type InboundProtocol = RegisteredProtocol;
-	type OutboundProtocol = RegisteredProtocol;
-	type OutboundOpenInfo = Infallible;
-	type InboundOpenInfo = ();
-
-	fn listen_protocol(&self) -> SubstreamProtocol<Self::InboundProtocol, ()> {
-		SubstreamProtocol::new(self.protocol.clone(), ())
-	}
-
-	fn inject_fully_negotiated_inbound(
-		&mut self,
-		(mut substream, received_handshake): <Self::InboundProtocol as InboundUpgrade<NegotiatedSubstream>>::Output,
-		(): ()
-	) {
-		self.state = match mem::replace(&mut self.state, ProtocolState::Poisoned) {
-			ProtocolState::Poisoned => {
-				error!(target: "sub-libp2p", "Handler with {:?} is in poisoned state",
-					self.remote_peer_id);
-				ProtocolState::Poisoned
-			}
-
-			ProtocolState::Init { mut substreams, init_deadline } => {
-				if substream.endpoint() == Endpoint::Dialer {
-					error!(target: "sub-libp2p", "Opened dialing substream with {:?} before \
-						initialization", self.remote_peer_id);
-				}
-				substreams.push((substream, received_handshake));
-				ProtocolState::Init { substreams, init_deadline }
-			}
-
-			ProtocolState::Opening { .. } => {
-				let event = LegacyProtoHandlerOut::CustomProtocolOpen {
-					version: substream.protocol_version(),
-					received_handshake,
-				};
-				self.events_queue.push_back(ProtocolsHandlerEvent::Custom(event));
-				ProtocolState::Normal {
-					substreams: smallvec![substream],
-					shutdown: SmallVec::new()
-				}
-			}
-
-			ProtocolState::Normal { substreams: mut existing, shutdown } => {
-				existing.push(substream);
-				ProtocolState::Normal { substreams: existing, shutdown }
-			}
-
-			ProtocolState::Disabled { mut shutdown, .. } => {
-				substream.shutdown();
-				shutdown.push(substream);
-				ProtocolState::Disabled { shutdown, reenable: false }
-			}
-
-			ProtocolState::KillAsap => ProtocolState::KillAsap,
-		};
-	}
-
-	fn inject_fully_negotiated_outbound(
-		&mut self,
-		_: <Self::OutboundProtocol as OutboundUpgrade<NegotiatedSubstream>>::Output,
-		unreachable: Self::OutboundOpenInfo
-	) {
-		match unreachable {}
-	}
-
-	fn inject_event(&mut self, message: LegacyProtoHandlerIn) {
-		match message {
-			LegacyProtoHandlerIn::Disable => self.disable(),
-			LegacyProtoHandlerIn::Enable => self.enable(),
-		}
-	}
-
-	fn inject_dial_upgrade_error(
-		&mut self,
-		unreachable: Self::OutboundOpenInfo,
-		_: ProtocolsHandlerUpgrErr<io::Error>
-	) {
-		match unreachable {}
-	}
-
-	fn connection_keep_alive(&self) -> KeepAlive {
-		match self.state {
-			ProtocolState::Init { .. } | ProtocolState::Normal { .. } => KeepAlive::Yes,
-			ProtocolState::Opening { .. } | ProtocolState::Disabled { .. } |
-			ProtocolState::Poisoned | ProtocolState::KillAsap => KeepAlive::No,
-		}
-	}
-
-	fn poll(
-		&mut self,
-		cx: &mut Context,
-	) -> Poll<
-		ProtocolsHandlerEvent<Self::OutboundProtocol, Self::OutboundOpenInfo, Self::OutEvent, Self::Error>
-	> {
-		// Flush the events queue if necessary.
-		if let Some(event) = self.events_queue.pop_front() {
-			return Poll::Ready(event)
-		}
-
-		// Kill the connection if needed.
-		if let ProtocolState::KillAsap = self.state {
-			return Poll::Ready(ProtocolsHandlerEvent::Close(ConnectionKillError));
-		}
-
-		// Process all the substreams.
-		if let Some(event) = self.poll_state(cx) {
-			return Poll::Ready(event)
-		}
-
-		Poll::Pending
-	}
-}
-
-impl fmt::Debug for LegacyProtoHandler {
-	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-		f.debug_struct("LegacyProtoHandler")
-			.finish()
-	}
-}
-
-/// Given a list of substreams, tries to shut them down. The substreams that have been successfully
-/// shut down are removed from the list.
-fn shutdown_list
-	(list: &mut SmallVec<impl smallvec::Array<Item = RegisteredProtocolSubstream<NegotiatedSubstream>>>,
-	cx: &mut Context)
-{
-	'outer: for n in (0..list.len()).rev() {
-		let mut substream = list.swap_remove(n);
-		loop {
-			match substream.poll_next_unpin(cx) {
-				Poll::Ready(Some(Ok(_))) => {}
-				Poll::Pending => break,
-				Poll::Ready(Some(Err(_))) | Poll::Ready(None) => continue 'outer,
-			}
-		}
-		list.push(substream);
-	}
-}
-
-/// Error returned when switching from normal to disabled.
-#[derive(Debug)]
-pub struct ConnectionKillError;
-
-impl error::Error for ConnectionKillError {
-}
-
-impl fmt::Display for ConnectionKillError {
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		write!(f, "Connection kill when switching from normal to disabled")
-	}
-}
diff --git a/client/network/src/protocol/generic_proto/handler/notif_in.rs b/client/network/src/protocol/generic_proto/handler/notif_in.rs
deleted file mode 100644
index d3b505e0de3e..000000000000
--- a/client/network/src/protocol/generic_proto/handler/notif_in.rs
+++ /dev/null
@@ -1,293 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-//! Implementations of the `IntoProtocolsHandler` and `ProtocolsHandler` traits for ingoing
-//! substreams for a single gossiping protocol.
-//!
-//! > **Note**: Each instance corresponds to a single protocol. In order to support multiple
-//! >			protocols, you need to create multiple instances and group them.
-//!
-
-use crate::protocol::generic_proto::upgrade::{NotificationsIn, NotificationsInSubstream};
-use bytes::BytesMut;
-use futures::prelude::*;
-use libp2p::core::{ConnectedPoint, PeerId};
-use libp2p::core::upgrade::{DeniedUpgrade, InboundUpgrade, OutboundUpgrade};
-use libp2p::swarm::{
-	ProtocolsHandler, ProtocolsHandlerEvent,
-	IntoProtocolsHandler,
-	KeepAlive,
-	ProtocolsHandlerUpgrErr,
-	SubstreamProtocol,
-	NegotiatedSubstream,
-};
-use log::{error, warn};
-use std::{borrow::Cow, collections::VecDeque, fmt, pin::Pin, task::{Context, Poll}};
-
-/// Implements the `IntoProtocolsHandler` trait of libp2p.
-///
-/// Every time a connection with a remote starts, an instance of this struct is created and
-/// sent to a background task dedicated to this connection. Once the connection is established,
-/// it is turned into a [`NotifsInHandler`].
-pub struct NotifsInHandlerProto {
-	/// Configuration for the protocol upgrade to negotiate.
-	in_protocol: NotificationsIn,
-}
-
-/// The actual handler once the connection has been established.
-pub struct NotifsInHandler {
-	/// Configuration for the protocol upgrade to negotiate for inbound substreams.
-	in_protocol: NotificationsIn,
-
-	/// Substream that is open with the remote.
-	substream: Option<NotificationsInSubstream<NegotiatedSubstream>>,
-
-	/// If the substream is opened and closed rapidly, we can emit several `OpenRequest` and
-	/// `Closed` messages in a row without the handler having time to respond with `Accept` or
-	/// `Refuse`.
-	///
-	/// In order to keep the state consistent, we increment this variable every time an
-	/// `OpenRequest` is emitted and decrement it every time an `Accept` or `Refuse` is received.
-	pending_accept_refuses: usize,
-
-	/// Queue of events to send to the outside.
-	///
-	/// This queue is only ever modified to insert elements at the back, or remove the first
-	/// element.
-	events_queue: VecDeque<ProtocolsHandlerEvent<DeniedUpgrade, (), NotifsInHandlerOut, void::Void>>,
-}
-
-/// Event that can be received by a `NotifsInHandler`.
-#[derive(Debug, Clone)]
-pub enum NotifsInHandlerIn {
-	/// Can be sent back as a response to an `OpenRequest`. Contains the status message to send
-	/// to the remote.
-	///
-	/// After sending this to the handler, the substream is now considered open and `Notif` events
-	/// can be received.
-	Accept(Vec<u8>),
-
-	/// Can be sent back as a response to an `OpenRequest`.
-	Refuse,
-}
-
-/// Event that can be emitted by a `NotifsInHandler`.
-#[derive(Debug)]
-pub enum NotifsInHandlerOut {
-	/// The remote wants to open a substream. Contains the initial message sent by the remote
-	/// when the substream has been opened.
-	///
-	/// Every time this event is emitted, a corresponding `Accepted` or `Refused` **must** be sent
-	/// back even if a `Closed` is received.
-	OpenRequest(Vec<u8>),
-
-	/// The notifications substream has been closed by the remote. In order to avoid race
-	/// conditions, this does **not** cancel any previously-sent `OpenRequest`.
-	Closed,
-
-	/// Received a message on the notifications substream.
-	///
-	/// Can only happen after an `Accept` and before a `Closed`.
-	Notif(BytesMut),
-}
-
-impl NotifsInHandlerProto {
-	/// Builds a new `NotifsInHandlerProto`.
-	pub fn new(
-		protocol_name: impl Into<Cow<'static, str>>
-	) -> Self {
-		NotifsInHandlerProto {
-			in_protocol: NotificationsIn::new(protocol_name),
-		}
-	}
-}
-
-impl IntoProtocolsHandler for NotifsInHandlerProto {
-	type Handler = NotifsInHandler;
-
-	fn inbound_protocol(&self) -> NotificationsIn {
-		self.in_protocol.clone()
-	}
-
-	fn into_handler(self, _: &PeerId, _: &ConnectedPoint) -> Self::Handler {
-		NotifsInHandler {
-			in_protocol: self.in_protocol,
-			substream: None,
-			pending_accept_refuses: 0,
-			events_queue: VecDeque::new(),
-		}
-	}
-}
-
-impl NotifsInHandler {
-	/// Returns the name of the protocol that we accept.
-	pub fn protocol_name(&self) -> &Cow<'static, str> {
-		self.in_protocol.protocol_name()
-	}
-
-	/// Equivalent to the `poll` method of `ProtocolsHandler`, except that it is guaranteed to
-	/// never generate [`NotifsInHandlerOut::Notif`].
-	///
-	/// Use this method in situations where it is not desirable to receive events but still
-	/// necessary to drive any potential incoming handshake or request.
-	pub fn poll_process(
-		&mut self,
-		cx: &mut Context
-	) -> Poll<
-		ProtocolsHandlerEvent<DeniedUpgrade, (), NotifsInHandlerOut, void::Void>
-	> {
-		if let Some(event) = self.events_queue.pop_front() {
-			return Poll::Ready(event)
-		}
-
-		match self.substream.as_mut().map(|s| NotificationsInSubstream::poll_process(Pin::new(s), cx)) {
-			None | Some(Poll::Pending) => {},
-			Some(Poll::Ready(Ok(v))) => match v {},
-			Some(Poll::Ready(Err(_))) => {
-				self.substream = None;
-				return Poll::Ready(ProtocolsHandlerEvent::Custom(NotifsInHandlerOut::Closed));
-			},
-		}
-
-		Poll::Pending
-	}
-}
-
-impl ProtocolsHandler for NotifsInHandler {
-	type InEvent = NotifsInHandlerIn;
-	type OutEvent = NotifsInHandlerOut;
-	type Error = void::Void;
-	type InboundProtocol = NotificationsIn;
-	type OutboundProtocol = DeniedUpgrade;
-	type OutboundOpenInfo = ();
-	type InboundOpenInfo = ();
-
-	fn listen_protocol(&self) -> SubstreamProtocol<Self::InboundProtocol, ()> {
-		SubstreamProtocol::new(self.in_protocol.clone(), ())
-	}
-
-	fn inject_fully_negotiated_inbound(
-		&mut self,
-		(msg, proto): <Self::InboundProtocol as InboundUpgrade<NegotiatedSubstream>>::Output,
-		(): ()
-	) {
-		// If a substream already exists, we drop it and replace it with the new incoming one.
-		if self.substream.is_some() {
-			self.events_queue.push_back(ProtocolsHandlerEvent::Custom(NotifsInHandlerOut::Closed));
-		}
-
-		// Note that we drop the existing substream, which will send an equivalent to a TCP "RST"
-		// to the remote and force-close the substream. It might seem like an unclean way to get
-		// rid of a substream. However, keep in mind that it is invalid for the remote to open
-		// multiple such substreams, and therefore sending a "RST" is not an incorrect thing to do.
-		self.substream = Some(proto);
-
-		self.events_queue.push_back(ProtocolsHandlerEvent::Custom(NotifsInHandlerOut::OpenRequest(msg)));
-		self.pending_accept_refuses = self.pending_accept_refuses
-			.checked_add(1)
-			.unwrap_or_else(|| {
-				error!(target: "sub-libp2p", "Overflow in pending_accept_refuses");
-				usize::max_value()
-			});
-	}
-
-	fn inject_fully_negotiated_outbound(
-		&mut self,
-		out: <Self::OutboundProtocol as OutboundUpgrade<NegotiatedSubstream>>::Output,
-		_: Self::OutboundOpenInfo
-	) {
-		// We never emit any outgoing substream.
-		void::unreachable(out)
-	}
-
-	fn inject_event(&mut self, message: NotifsInHandlerIn) {
-		self.pending_accept_refuses = match self.pending_accept_refuses.checked_sub(1) {
-			Some(v) => v,
-			None => {
-				error!(
-					target: "sub-libp2p",
-					"Inconsistent state: received Accept/Refuse when no pending request exists"
-				);
-				return;
-			}
-		};
-
-		// If we send multiple `OpenRequest`s in a row, we will receive back multiple
-		// `Accept`/`Refuse` messages. All of them are obsolete except the last one.
-		if self.pending_accept_refuses != 0 {
-			return;
-		}
-
-		match (message, self.substream.as_mut()) {
-			(NotifsInHandlerIn::Accept(message), Some(sub)) => sub.send_handshake(message),
-			(NotifsInHandlerIn::Accept(_), None) => {},
-			(NotifsInHandlerIn::Refuse, _) => self.substream = None,
-		}
-	}
-
-	fn inject_dial_upgrade_error(&mut self, _: (), _: ProtocolsHandlerUpgrErr<void::Void>) {
-		error!(target: "sub-libp2p", "Received dial upgrade error in inbound-only handler");
-	}
-
-	fn connection_keep_alive(&self) -> KeepAlive {
-		if self.substream.is_some() {
-			KeepAlive::Yes
-		} else {
-			KeepAlive::No
-		}
-	}
-
-	fn poll(
-		&mut self,
-		cx: &mut Context,
-	) -> Poll<
-		ProtocolsHandlerEvent<Self::OutboundProtocol, Self::OutboundOpenInfo, Self::OutEvent, Self::Error>
-	> {
-		// Flush the events queue if necessary.
-		if let Some(event) = self.events_queue.pop_front() {
-			return Poll::Ready(event)
-		}
-
-		match self.substream.as_mut().map(|s| Stream::poll_next(Pin::new(s), cx)) {
-			None | Some(Poll::Pending) => {},
-			Some(Poll::Ready(Some(Ok(msg)))) => {
-				if self.pending_accept_refuses != 0 {
-					warn!(
-						target: "sub-libp2p",
-						"Bad state in inbound-only handler: notif before accepting substream"
-					);
-				}
-				return Poll::Ready(ProtocolsHandlerEvent::Custom(NotifsInHandlerOut::Notif(msg)))
-			},
-			Some(Poll::Ready(None)) | Some(Poll::Ready(Some(Err(_)))) => {
-				self.substream = None;
-				return Poll::Ready(ProtocolsHandlerEvent::Custom(NotifsInHandlerOut::Closed));
-			},
-		}
-
-		Poll::Pending
-	}
-}
-
-impl fmt::Debug for NotifsInHandler {
-	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-		f.debug_struct("NotifsInHandler")
-			.field("substream_open", &self.substream.is_some())
-			.finish()
-	}
-}
diff --git a/client/network/src/protocol/generic_proto/handler/notif_out.rs b/client/network/src/protocol/generic_proto/handler/notif_out.rs
deleted file mode 100644
index 414e62c0d135..000000000000
--- a/client/network/src/protocol/generic_proto/handler/notif_out.rs
+++ /dev/null
@@ -1,444 +0,0 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
-// This file is part of Substrate.
-
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Implementations of the `IntoProtocolsHandler` and `ProtocolsHandler` traits for outgoing
-//! substreams of a single gossiping protocol.
-//!
-//! > **Note**: Each instance corresponds to a single protocol. In order to support multiple
-//! >			protocols, you need to create multiple instances and group them.
-//!
-
-use crate::protocol::generic_proto::upgrade::{NotificationsOut, NotificationsOutSubstream, NotificationsHandshakeError};
-use futures::prelude::*;
-use libp2p::core::{ConnectedPoint, PeerId};
-use libp2p::core::upgrade::{DeniedUpgrade, InboundUpgrade, OutboundUpgrade};
-use libp2p::swarm::{
-	ProtocolsHandler, ProtocolsHandlerEvent,
-	IntoProtocolsHandler,
-	KeepAlive,
-	ProtocolsHandlerUpgrErr,
-	SubstreamProtocol,
-	NegotiatedSubstream,
-};
-use log::{debug, warn, error};
-use std::{
-	borrow::Cow, collections::VecDeque, fmt, mem, pin::Pin, task::{Context, Poll, Waker},
-	time::Duration
-};
-use wasm_timer::Instant;
-
-/// Maximum duration to open a substream and receive the handshake message. After that, we
-/// consider that we failed to open the substream.
-const OPEN_TIMEOUT: Duration = Duration::from_secs(10);
-/// After successfully establishing a connection with the remote, we keep the connection open for
-/// at least this amount of time in order to give the rest of the code the chance to notify us to
-/// open substreams.
-const INITIAL_KEEPALIVE_TIME: Duration = Duration::from_secs(5);
-
-/// Implements the `IntoProtocolsHandler` trait of libp2p.
-///
-/// Every time a connection with a remote starts, an instance of this struct is created and
-/// sent to a background task dedicated to this connection. Once the connection is established,
-/// it is turned into a [`NotifsOutHandler`].
-///
-/// See the documentation of [`NotifsOutHandler`] for more information.
-pub struct NotifsOutHandlerProto {
-	/// Name of the protocol to negotiate.
-	protocol_name: Cow<'static, str>,
-}
-
-impl NotifsOutHandlerProto {
-	/// Builds a new [`NotifsOutHandlerProto`]. Will use the given protocol name for the
-	/// notifications substream.
-	pub fn new(protocol_name: impl Into<Cow<'static, str>>) -> Self {
-		NotifsOutHandlerProto {
-			protocol_name: protocol_name.into(),
-		}
-	}
-}
-
-impl IntoProtocolsHandler for NotifsOutHandlerProto {
-	type Handler = NotifsOutHandler;
-
-	fn inbound_protocol(&self) -> DeniedUpgrade {
-		DeniedUpgrade
-	}
-
-	fn into_handler(self, _: &PeerId, _: &ConnectedPoint) -> Self::Handler {
-		NotifsOutHandler {
-			protocol_name: self.protocol_name,
-			when_connection_open: Instant::now(),
-			state: State::Disabled,
-			events_queue: VecDeque::new(),
-		}
-	}
-}
-
-/// Handler for an outbound notification substream.
-///
-/// When a connection is established, this handler starts in the "disabled" state, meaning that
-/// no substream will be open.
-///
-/// One can try open a substream by sending an [`NotifsOutHandlerIn::Enable`] message to the
-/// handler. Once done, the handler will try to establish then maintain an outbound substream with
-/// the remote for the purpose of sending notifications to it.
-pub struct NotifsOutHandler {
-	/// Name of the protocol to negotiate.
-	protocol_name: Cow<'static, str>,
-
-	/// Relationship with the node we're connected to.
-	state: State,
-
-	/// When the connection with the remote has been successfully established.
-	when_connection_open: Instant,
-
-	/// Queue of events to send to the outside.
-	///
-	/// This queue must only ever be modified to insert elements at the back, or remove the first
-	/// element.
-	events_queue: VecDeque<ProtocolsHandlerEvent<NotificationsOut, (), NotifsOutHandlerOut, void::Void>>,
-}
-
-/// Our relationship with the node we're connected to.
-enum State {
-	/// The handler is disabled and idle. No substream is open.
-	Disabled,
-
-	/// The handler is disabled. A substream is still open and needs to be closed.
-	///
-	/// > **Important**: Having this state means that `poll_close` has been called at least once,
-	/// >				 but the `Sink` API is unclear about whether or not the stream can then
-	/// >				 be recovered. Because of that, we must never switch from the
-	/// >				 `DisabledOpen` state to the `Open` state while keeping the same substream.
-	DisabledOpen(NotificationsOutSubstream<NegotiatedSubstream>),
-
-	/// The handler is disabled but we are still trying to open a substream with the remote.
-	///
-	/// If the handler gets enabled again, we can immediately switch to `Opening`.
-	DisabledOpening,
-
-	/// The handler is enabled and we are trying to open a substream with the remote.
-	Opening {
-		/// The initial message that we sent. Necessary if we need to re-open a substream.
-		initial_message: Vec<u8>,
-	},
-
-	/// The handler is enabled. We have tried opening a substream in the past but the remote
-	/// refused it.
-	Refused,
-
-	/// The handler is enabled and substream is open.
-	Open {
-		/// Substream that is currently open.
-		substream: NotificationsOutSubstream<NegotiatedSubstream>,
-		/// Waker for the last task that got `Poll::Pending` from `poll_ready`, to notify
-		/// when the open substream closes due to being disabled or encountering an
-		/// error, i.e. to notify the task as soon as the substream becomes unavailable,
-		/// without waiting for an underlying I/O task wakeup.
-		close_waker: Option<Waker>,
-		/// The initial message that we sent. Necessary if we need to re-open a substream.
-		initial_message: Vec<u8>,
-	},
-
-	/// Poisoned state. Shouldn't be found in the wild.
-	Poisoned,
-}
-
-/// Event that can be received by a `NotifsOutHandler`.
-#[derive(Debug)]
-pub enum NotifsOutHandlerIn {
-	/// Enables the notifications substream for this node. The handler will try to maintain a
-	/// substream with the remote.
-	Enable {
-		/// Initial message to send to remote nodes when we open substreams.
-		initial_message: Vec<u8>,
-	},
-
-	/// Disables the notifications substream for this node. This is the default state.
-	Disable,
-}
-
-/// Event that can be emitted by a `NotifsOutHandler`.
-#[derive(Debug)]
-pub enum NotifsOutHandlerOut {
-	/// The notifications substream has been accepted by the remote.
-	Open {
-		/// Handshake message sent by the remote after we opened the substream.
-		handshake: Vec<u8>,
-	},
-
-	/// The notifications substream has been closed by the remote.
-	Closed,
-
-	/// We tried to open a notifications substream, but the remote refused it.
-	///
-	/// Can only happen if we're in a closed state.
-	Refused,
-}
-
-impl NotifsOutHandler {
-	/// Returns true if the substream is currently open.
-	pub fn is_open(&self) -> bool {
-		match &self.state {
-			State::Disabled => false,
-			State::DisabledOpening => false,
-			State::DisabledOpen(_) => true,
-			State::Opening { .. } => false,
-			State::Refused => false,
-			State::Open { .. } => true,
-			State::Poisoned => false,
-		}
-	}
-
-	/// Returns `true` if there has been an attempt to open the substream, but the remote refused
-	/// the substream.
-	///
-	/// Always returns `false` if the handler is in a disabled state.
-	pub fn is_refused(&self) -> bool {
-		match &self.state {
-			State::Disabled => false,
-			State::DisabledOpening => false,
-			State::DisabledOpen(_) => false,
-			State::Opening { .. } => false,
-			State::Refused => true,
-			State::Open { .. } => false,
-			State::Poisoned => false,
-		}
-	}
-
-	/// Returns the name of the protocol that we negotiate.
-	pub fn protocol_name(&self) -> &Cow<'static, str> {
-		&self.protocol_name
-	}
-
-	/// Polls whether the outbound substream is ready to send a notification.
-	///
-	/// - Returns `Poll::Pending` if the substream is open but not ready to send a notification.
-	/// - Returns `Poll::Ready(true)` if the substream is ready to send a notification.
-	/// - Returns `Poll::Ready(false)` if the substream is closed.
-	///
-	pub fn poll_ready(&mut self, cx: &mut Context) -> Poll<bool> {
-		if let State::Open { substream, close_waker, .. } = &mut self.state {
-			match substream.poll_ready_unpin(cx) {
-				Poll::Ready(Ok(())) => Poll::Ready(true),
-				Poll::Ready(Err(_)) => Poll::Ready(false),
-				Poll::Pending => {
-					*close_waker = Some(cx.waker().clone());
-					Poll::Pending
-				}
-			}
-		} else {
-			Poll::Ready(false)
-		}
-	}
-
-	/// Sends out a notification.
-	///
-	/// If the substream is closed, or not ready to send out a notification yet, then the
-	/// notification is silently discarded.
-	///
-	/// You are encouraged to call [`NotifsOutHandler::poll_ready`] beforehand to determine
-	/// whether this will succeed. If `Poll::Ready(true)` is returned, then this method will send
-	/// out a notification.
-	pub fn send_or_discard(&mut self, notification: Vec<u8>) {
-		if let State::Open { substream, .. } = &mut self.state {
-			let _ = substream.start_send_unpin(notification);
-		}
-	}
-}
-
-impl ProtocolsHandler for NotifsOutHandler {
-	type InEvent = NotifsOutHandlerIn;
-	type OutEvent = NotifsOutHandlerOut;
-	type Error = void::Void;
-	type InboundProtocol = DeniedUpgrade;
-	type OutboundProtocol = NotificationsOut;
-	type OutboundOpenInfo = ();
-	type InboundOpenInfo = ();
-
-	fn listen_protocol(&self) -> SubstreamProtocol<Self::InboundProtocol, ()> {
-		SubstreamProtocol::new(DeniedUpgrade, ())
-	}
-
-	fn inject_fully_negotiated_inbound(
-		&mut self,
-		proto: <Self::InboundProtocol as InboundUpgrade<NegotiatedSubstream>>::Output,
-		(): ()
-	) {
-		// We should never reach here. `proto` is a `Void`.
-		void::unreachable(proto)
-	}
-
-	fn inject_fully_negotiated_outbound(
-		&mut self,
-		(handshake_msg, substream): <Self::OutboundProtocol as OutboundUpgrade<NegotiatedSubstream>>::Output,
-		_: ()
-	) {
-		match mem::replace(&mut self.state, State::Poisoned) {
-			State::Opening { initial_message } => {
-				let ev = NotifsOutHandlerOut::Open { handshake: handshake_msg };
-				self.events_queue.push_back(ProtocolsHandlerEvent::Custom(ev));
-				self.state = State::Open { substream, initial_message, close_waker: None };
-			},
-			// If the handler was disabled while we were negotiating the protocol, immediately
-			// close it.
-			State::DisabledOpening => self.state = State::DisabledOpen(substream),
-
-			// Any other situation should never happen.
-			State::Disabled | State::Refused | State::Open { .. } | State::DisabledOpen(_) =>
-				error!("☎️ State mismatch in notifications handler: substream already open"),
-			State::Poisoned => error!("☎️ Notifications handler in a poisoned state"),
-		}
-	}
-
-	fn inject_event(&mut self, message: NotifsOutHandlerIn) {
-		match message {
-			NotifsOutHandlerIn::Enable { initial_message } => {
-				match mem::replace(&mut self.state, State::Poisoned) {
-					State::Disabled => {
-						let proto = NotificationsOut::new(self.protocol_name.clone(), initial_message.clone());
-						self.events_queue.push_back(ProtocolsHandlerEvent::OutboundSubstreamRequest {
-							protocol: SubstreamProtocol::new(proto, ()).with_timeout(OPEN_TIMEOUT),
-						});
-						self.state = State::Opening { initial_message };
-					},
-					State::DisabledOpening => self.state = State::Opening { initial_message },
-					State::DisabledOpen(mut sub) => {
-						// As documented above, in this state we have already called `poll_close`
-						// once on the substream, and it is unclear whether the substream can then
-						// be recovered. When in doubt, let's drop the existing substream and
-						// open a new one.
-						if sub.close().now_or_never().is_none() {
-							warn!(
-								target: "sub-libp2p",
-								"📞 Improperly closed outbound notifications substream"
-							);
-						}
-
-						let proto = NotificationsOut::new(self.protocol_name.clone(), initial_message.clone());
-						self.events_queue.push_back(ProtocolsHandlerEvent::OutboundSubstreamRequest {
-							protocol: SubstreamProtocol::new(proto, ()).with_timeout(OPEN_TIMEOUT),
-						});
-						self.state = State::Opening { initial_message };
-					},
-					st @ State::Opening { .. } | st @ State::Refused | st @ State::Open { .. } => {
-						debug!(target: "sub-libp2p",
-							"Tried to enable notifications handler that was already enabled");
-						self.state = st;
-					}
-					State::Poisoned => error!("Notifications handler in a poisoned state"),
-				}
-			}
-
-			NotifsOutHandlerIn::Disable => {
-				match mem::replace(&mut self.state, State::Poisoned) {
-					st @ State::Disabled | st @ State::DisabledOpen(_) | st @ State::DisabledOpening => {
-						debug!(target: "sub-libp2p",
-							"Tried to disable notifications handler that was already disabled");
-						self.state = st;
-					}
-					State::Opening { .. } => self.state = State::DisabledOpening,
-					State::Refused => self.state = State::Disabled,
-					State::Open { substream, close_waker, .. } => {
-						if let Some(close_waker) = close_waker {
-							close_waker.wake();
-						}
-						self.state = State::DisabledOpen(substream)
-					},
-					State::Poisoned => error!("☎️ Notifications handler in a poisoned state"),
-				}
-			}
-		}
-	}
-
-	fn inject_dial_upgrade_error(&mut self, _: (), _: ProtocolsHandlerUpgrErr<NotificationsHandshakeError>) {
-		match mem::replace(&mut self.state, State::Poisoned) {
-			State::Disabled => {},
-			State::DisabledOpen(_) | State::Refused | State::Open { .. } =>
-				error!("☎️ State mismatch in NotificationsOut"),
-			State::Opening { .. } => {
-				self.state = State::Refused;
-				let ev = NotifsOutHandlerOut::Refused;
-				self.events_queue.push_back(ProtocolsHandlerEvent::Custom(ev));
-			},
-			State::DisabledOpening => self.state = State::Disabled,
-			State::Poisoned => error!("☎️ Notifications handler in a poisoned state"),
-		}
-	}
-
-	fn connection_keep_alive(&self) -> KeepAlive {
-		match self.state {
-			// We have a small grace period of `INITIAL_KEEPALIVE_TIME` during which we keep the
-			// connection open no matter what, in order to avoid closing and reopening
-			// connections all the time.
-			State::Disabled | State::DisabledOpen(_) | State::DisabledOpening =>
-				KeepAlive::Until(self.when_connection_open + INITIAL_KEEPALIVE_TIME),
-			State::Opening { .. } | State::Open { .. } => KeepAlive::Yes,
-			State::Refused | State::Poisoned => KeepAlive::No,
-		}
-	}
-
-	fn poll(
-		&mut self,
-		cx: &mut Context,
-	) -> Poll<ProtocolsHandlerEvent<Self::OutboundProtocol, Self::OutboundOpenInfo, Self::OutEvent, Self::Error>> {
-		// Flush the events queue if necessary.
-		if let Some(event) = self.events_queue.pop_front() {
-			return Poll::Ready(event)
-		}
-
-		match &mut self.state {
-			State::Open { substream, initial_message, close_waker } =>
-				match Sink::poll_flush(Pin::new(substream), cx) {
-					Poll::Pending | Poll::Ready(Ok(())) => {},
-					Poll::Ready(Err(_)) => {
-						if let Some(close_waker) = close_waker.take() {
-							close_waker.wake();
-						}
-
-						// We try to re-open a substream.
-						let initial_message = mem::replace(initial_message, Vec::new());
-						self.state = State::Opening { initial_message: initial_message.clone() };
-						let proto = NotificationsOut::new(self.protocol_name.clone(), initial_message);
-						self.events_queue.push_back(ProtocolsHandlerEvent::OutboundSubstreamRequest {
-							protocol: SubstreamProtocol::new(proto, ()).with_timeout(OPEN_TIMEOUT),
-						});
-						return Poll::Ready(ProtocolsHandlerEvent::Custom(NotifsOutHandlerOut::Closed));
-					}
-				},
-
-			State::DisabledOpen(sub) => match Sink::poll_close(Pin::new(sub), cx) {
-				Poll::Pending => {},
-				Poll::Ready(Ok(())) | Poll::Ready(Err(_)) => {
-					self.state = State::Disabled;
-					return Poll::Ready(ProtocolsHandlerEvent::Custom(NotifsOutHandlerOut::Closed));
-				},
-			},
-
-			_ => {}
-		}
-
-		Poll::Pending
-	}
-}
-
-impl fmt::Debug for NotifsOutHandler {
-	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-		f.debug_struct("NotifsOutHandler")
-			.field("open", &self.is_open())
-			.finish()
-	}
-}
diff --git a/client/network/src/protocol/generic_proto/upgrade/legacy.rs b/client/network/src/protocol/generic_proto/upgrade/legacy.rs
index 1b2b97253d1a..91282d0cf57d 100644
--- a/client/network/src/protocol/generic_proto/upgrade/legacy.rs
+++ b/client/network/src/protocol/generic_proto/upgrade/legacy.rs
@@ -20,7 +20,7 @@ use crate::config::ProtocolId;
 use bytes::BytesMut;
 use futures::prelude::*;
 use futures_codec::Framed;
-use libp2p::core::{Endpoint, UpgradeInfo, InboundUpgrade, OutboundUpgrade, upgrade::ProtocolName};
+use libp2p::core::{UpgradeInfo, InboundUpgrade, OutboundUpgrade, upgrade::ProtocolName};
 use parking_lot::RwLock;
 use std::{collections::VecDeque, io, pin::Pin, sync::Arc, vec::IntoIter as VecIntoIter};
 use std::task::{Context, Poll};
@@ -85,34 +85,18 @@ impl Clone for RegisteredProtocol {
 pub struct RegisteredProtocolSubstream<TSubstream> {
 	/// If true, we are in the process of closing the sink.
 	is_closing: bool,
-	/// Whether the local node opened this substream (dialer), or we received this substream from
-	/// the remote (listener).
-	endpoint: Endpoint,
 	/// Buffer of packets to send.
 	send_queue: VecDeque<BytesMut>,
 	/// If true, we should call `poll_complete` on the inner sink.
 	requires_poll_flush: bool,
 	/// The underlying substream.
 	inner: stream::Fuse<Framed<TSubstream, UviBytes<BytesMut>>>,
-	/// Version of the protocol that was negotiated.
-	protocol_version: u8,
 	/// If true, we have sent a "remote is clogged" event recently and shouldn't send another one
 	/// unless the buffer empties then fills itself again.
 	clogged_fuse: bool,
 }
 
 impl<TSubstream> RegisteredProtocolSubstream<TSubstream> {
-	/// Returns the version of the protocol that was negotiated.
-	pub fn protocol_version(&self) -> u8 {
-		self.protocol_version
-	}
-
-	/// Returns whether the local node opened this substream (dialer), or we received this
-	/// substream from the remote (listener).
-	pub fn endpoint(&self) -> Endpoint {
-		self.endpoint
-	}
-
 	/// Starts a graceful shutdown process on this substream.
 	///
 	/// Note that "graceful" means that we sent a closing message. We don't wait for any
@@ -246,7 +230,7 @@ where TSubstream: AsyncRead + AsyncWrite + Unpin + Send + 'static,
 	fn upgrade_inbound(
 		self,
 		socket: TSubstream,
-		info: Self::Info,
+		_: Self::Info,
 	) -> Self::Future {
 		Box::pin(async move {
 			let mut framed = {
@@ -262,11 +246,9 @@ where TSubstream: AsyncRead + AsyncWrite + Unpin + Send + 'static,
 
 			Ok((RegisteredProtocolSubstream {
 				is_closing: false,
-				endpoint: Endpoint::Listener,
 				send_queue: VecDeque::new(),
 				requires_poll_flush: false,
 				inner: framed.fuse(),
-				protocol_version: info.version,
 				clogged_fuse: false,
 			}, received_handshake.to_vec()))
 		})
@@ -283,7 +265,7 @@ where TSubstream: AsyncRead + AsyncWrite + Unpin + Send + 'static,
 	fn upgrade_outbound(
 		self,
 		socket: TSubstream,
-		info: Self::Info,
+		_: Self::Info,
 	) -> Self::Future {
 		Box::pin(async move {
 			let mut framed = {
@@ -301,11 +283,9 @@ where TSubstream: AsyncRead + AsyncWrite + Unpin + Send + 'static,
 
 			Ok((RegisteredProtocolSubstream {
 				is_closing: false,
-				endpoint: Endpoint::Dialer,
 				send_queue: VecDeque::new(),
 				requires_poll_flush: false,
 				inner: framed.fuse(),
-				protocol_version: info.version,
 				clogged_fuse: false,
 			}, received_handshake.to_vec()))
 		})
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 93abbbad0249..5fc8485947ff 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -39,7 +39,7 @@ use crate::{
 	},
 	on_demand_layer::AlwaysBadChecker,
 	light_client_handler, block_requests, finality_requests,
-	protocol::{self, event::Event, NotifsHandlerError, LegacyConnectionKillError, NotificationsSink, Ready, sync::SyncState, PeerInfo, Protocol},
+	protocol::{self, event::Event, NotifsHandlerError, NotificationsSink, Ready, sync::SyncState, PeerInfo, Protocol},
 	transport, ReputationChange,
 };
 use futures::{channel::oneshot, prelude::*};
@@ -1589,9 +1589,6 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 							Some(ConnectionError::Handler(NodeHandlerWrapperError::Handler(EitherError::A(EitherError::A(
 								EitherError::A(EitherError::A(EitherError::A(EitherError::B(
 								EitherError::A(PingFailure::Timeout)))))))))) => "ping-timeout",
-							Some(ConnectionError::Handler(NodeHandlerWrapperError::Handler(EitherError::A(EitherError::A(
-								EitherError::A(EitherError::A(EitherError::A(EitherError::A(
-								NotifsHandlerError::Legacy(LegacyConnectionKillError)))))))))) => "force-closed",
 							Some(ConnectionError::Handler(NodeHandlerWrapperError::Handler(EitherError::A(EitherError::A(
 								EitherError::A(EitherError::A(EitherError::A(EitherError::A(
 								NotifsHandlerError::SyncNotificationsClogged))))))))) => "sync-notifications-clogged",

From 08b217a0650635f8430655979c581f0cebe4bed3 Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Mon, 16 Nov 2020 19:49:50 +0100
Subject: [PATCH 0076/1194] *: Update to libp2p v0.30.0 (#7508)

* *: Update to libp2p v0.30.0

* Cargo.lock: Update

* *: Update to libp2p v0.30.1
---
 Cargo.lock                                    | 223 ++++++++++--------
 bin/node/browser-testing/Cargo.toml           |   2 +-
 client/authority-discovery/Cargo.toml         |   2 +-
 client/cli/Cargo.toml                         |   2 +-
 client/network-gossip/Cargo.toml              |   2 +-
 client/network/Cargo.toml                     |   4 +-
 client/network/src/discovery.rs               |  16 +-
 client/network/src/light_client_handler.rs    |   2 +-
 .../src/protocol/generic_proto/tests.rs       |   2 +-
 client/network/src/request_responses.rs       |   4 +-
 client/network/src/transport.rs               |   8 +-
 client/network/test/Cargo.toml                |   2 +-
 client/peerset/Cargo.toml                     |   2 +-
 client/telemetry/Cargo.toml                   |   2 +-
 primitives/consensus/common/Cargo.toml        |   2 +-
 utils/browser/Cargo.toml                      |   2 +-
 16 files changed, 148 insertions(+), 129 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fca7a32c96d9..1b8b13c2e2a4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -262,7 +262,7 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38628c78a34f111c5a6b98fc87dfc056cd1590b61afe748b145be4623c56d194"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "concurrent-queue",
  "fastrand",
  "futures-lite",
@@ -389,7 +389,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46254cf2fdcdf1badb5934448c1bcbe046a56537b3987d96c51a7afc5d03f293"
 dependencies = [
  "addr2line",
- "cfg-if",
+ "cfg-if 0.1.10",
  "libc",
  "miniz_oxide",
  "object 0.20.0",
@@ -438,7 +438,7 @@ checksum = "66c0bb6167449588ff70803f4127f0684f9063097eca5016f37eb52b92c2cf36"
 dependencies = [
  "bitflags",
  "cexpr",
- "cfg-if",
+ "cfg-if 0.1.10",
  "clang-sys",
  "clap",
  "env_logger",
@@ -605,6 +605,12 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "476e9cd489f9e121e02ffa6014a8ef220ecb15c05ed23fc34cca13925dc283fb"
 
+[[package]]
+name = "bs58"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
+
 [[package]]
 name = "bstr"
 version = "0.2.13"
@@ -718,6 +724,12 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
 [[package]]
 name = "chacha20"
 version = "0.4.3"
@@ -827,7 +839,7 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "wasm-bindgen",
 ]
 
@@ -987,7 +999,7 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
 ]
 
 [[package]]
@@ -1044,7 +1056,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
 dependencies = [
  "autocfg 1.0.0",
- "cfg-if",
+ "cfg-if 0.1.10",
  "crossbeam-utils",
  "lazy_static",
  "maybe-uninit",
@@ -1058,7 +1070,7 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "crossbeam-utils",
  "maybe-uninit",
 ]
@@ -1070,7 +1082,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
 dependencies = [
  "autocfg 1.0.0",
- "cfg-if",
+ "cfg-if 0.1.10",
  "lazy_static",
 ]
 
@@ -1225,7 +1237,7 @@ version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "dirs-sys",
 ]
 
@@ -1577,7 +1589,7 @@ version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68c90b0fc46cf89d227cc78b40e494ff81287a92dd07631e5af0d06fe3cf885e"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "crc32fast",
  "libc",
  "libz-sys",
@@ -2065,7 +2077,7 @@ version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "libc",
  "wasi",
  "wasm-bindgen",
@@ -2077,7 +2089,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee8025cf36f917e6a52cce185b7c7177689b838b7ec138364e50cc2277a56cf4"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "libc",
  "wasi",
 ]
@@ -2885,9 +2897,9 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
 
 [[package]]
 name = "libp2p"
-version = "0.29.1"
+version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "021f703bfef6e3da78ef9828c8a244d639b8d57eedf58360922aca5ff69dfdcd"
+checksum = "e3c2b4c99f8798be90746fc226acf95d3e6cff0655883634cc30dab1f64f438b"
 dependencies = [
  "atomic",
  "bytes 0.5.6",
@@ -2924,12 +2936,12 @@ dependencies = [
 
 [[package]]
 name = "libp2p-core"
-version = "0.23.1"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3960524389409633550567e8a9e0684d25a33f4f8408887ff897dd9fdfbdb771"
+checksum = "1b8186060d6bd415e4e928e6cb44c4fe7e7a7dd53437bd936ce7e5f421e45a51"
 dependencies = [
  "asn1_der",
- "bs58",
+ "bs58 0.4.0",
  "ed25519-dalek",
  "either",
  "fnv",
@@ -2968,9 +2980,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-deflate"
-version = "0.23.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567962c5c5f8a1282979441300e1739ba939024010757c3dbfab4d462189df77"
+checksum = "34aea69349e70a58ef9ecd21ac12c5eaa36255ac6986828079d26393f9e618cb"
 dependencies = [
  "flate2",
  "futures 0.3.5",
@@ -2979,9 +2991,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-dns"
-version = "0.23.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436280f5fe21a58fcaff82c2606945579241f32bc0eaf2d39321aa4624a66e7f"
+checksum = "0baeff71fb5cb1fe1604f74a712a44b66a8c5900f4022411a1d550f09d6bb776"
 dependencies = [
  "futures 0.3.5",
  "libp2p-core",
@@ -2990,9 +3002,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-floodsub"
-version = "0.23.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc175613c5915332fd6458895407ec242ea055ae3b107a586626d5e3349350a"
+checksum = "db0f925a45f310b678e70faf71a10023b829d02eb9cc2628a63de928936f3ade"
 dependencies = [
  "cuckoofilter",
  "fnv",
@@ -3008,9 +3020,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-gossipsub"
-version = "0.23.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d500ad89ba14de4d18bebdff61a0ce3e769f1c5c5a95026c5da90187e5fff5c9"
+checksum = "efeb65567174974f551a91f9f5719445b6695cad56f6a7a47a27111f37efb6b8"
 dependencies = [
  "base64 0.13.0",
  "byteorder",
@@ -3034,9 +3046,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-identify"
-version = "0.23.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03b90b350e37f398b73d778bd94422f4e6a3afa2c1582742ce2446b8a0dba787"
+checksum = "e074124669840484de564901d47f2d0892e73f6d8ee7c37e9c2644af1b217bf4"
 dependencies = [
  "futures 0.3.5",
  "libp2p-core",
@@ -3050,9 +3062,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-kad"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb78341f114bf686d5fe50b33ff1a804d88fb326c0d39ee1c22db4346b21fc27"
+checksum = "78a2653b2e3254a3bbeb66bfc3f0dca7d6cba6aa2a96791db114003dec1b5394"
 dependencies = [
  "arrayvec 0.5.1",
  "bytes 0.5.6",
@@ -3077,9 +3089,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-mdns"
-version = "0.23.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b575514fce0a3ccbd065d6aa377bd4d5102001b05c1a22a5eee49c450254ef0f"
+checksum = "786b068098794322239f8f04df88a52daeb7863b2e77501c4d85d32e0a8f2d26"
 dependencies = [
  "async-std",
  "data-encoding",
@@ -3099,9 +3111,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-mplex"
-version = "0.23.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "696c8ee8b42496690b88b0de84a96387caf6e09880bcc8e794bb88afa054e995"
+checksum = "ed764eab613a8fb6b7dcf6c796f55a06fef2270e528329903e25cd3311b99663"
 dependencies = [
  "bytes 0.5.6",
  "futures 0.3.5",
@@ -3117,9 +3129,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-noise"
-version = "0.25.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93c77142e3e5b18fefa7d267305c777c9cbe9b2232ec489979390100bebcc1e6"
+checksum = "fb441fb015ec16690099c5d910fcba271d357763b3dcb784db7b27bbb0b68372"
 dependencies = [
  "bytes 0.5.6",
  "curve25519-dalek 3.0.0",
@@ -3139,9 +3151,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-ping"
-version = "0.23.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7257135609e8877f4d286935cbe1e572b2018946881c3e7f63054577074a7ee7"
+checksum = "82e5c50936cfdbe96a514e8992f304fa44cd3a681b6f779505f1ae62b3474705"
 dependencies = [
  "futures 0.3.5",
  "libp2p-core",
@@ -3154,9 +3166,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-plaintext"
-version = "0.23.0"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c88d59ba3e710a8c8e0535cb4a52e9e46534924cbbea4691f8c3aaad17b58c61"
+checksum = "21026557c335d3639591f247b19b7536195772034ec7e9c463137227f95eaaa1"
 dependencies = [
  "bytes 0.5.6",
  "futures 0.3.5",
@@ -3185,9 +3197,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-request-response"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02ba1aa5727ccc118c09ba5111480873f2fe5608cb304e258fd12c173ecf27c9"
+checksum = "2dd9a1e0e6563dec1c9e702f7e68bdaa43da62a84536aa06372d3fed3e25d4ca"
 dependencies = [
  "async-trait",
  "bytes 0.5.6",
@@ -3205,9 +3217,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-swarm"
-version = "0.23.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffa6fa33b16956b8a58afbfebe1406866011a1ab8960765bd36868952d7be6a1"
+checksum = "565f0e06674b4033c978471e4083d5aaa8e03cef0719a0ec0905aaeaad39a919"
 dependencies = [
  "either",
  "futures 0.3.5",
@@ -3221,9 +3233,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-tcp"
-version = "0.23.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d0b6f4ef48d9493607fae069deecce0579320a1f3de6cb056770b151018a9a5"
+checksum = "33f3dce259c0d3127af5167f45c275b6c047320efdd0e40fde947482487af0a3"
 dependencies = [
  "async-std",
  "futures 0.3.5",
@@ -3237,9 +3249,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-uds"
-version = "0.23.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "945bed3c989a1b290b5a0d4e8fa6e44e01840efb9a5ab3f0d3d174f0e451ac0e"
+checksum = "5e0aba04370a00d8d0236e350bc862926c1b42542a169aa6a481e660e5b990fe"
 dependencies = [
  "async-std",
  "futures 0.3.5",
@@ -3249,9 +3261,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-wasm-ext"
-version = "0.23.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66518a4455e15c283637b4d7b579aef928b75a3fc6c50a41e7e6b9fa86672ca0"
+checksum = "6c703816f4170477a375b49c56d349e535ce68388f81ba1d9a3c8e2517effa82"
 dependencies = [
  "futures 0.3.5",
  "js-sys",
@@ -3263,9 +3275,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-websocket"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edc561870477523245efaaea1b6b743c70115f10c670e62bcbbe4d3153be5f0c"
+checksum = "8d5e7268a959748040a0cf7456ad655be55b87f0ceda03bdb5b53674726b28f7"
 dependencies = [
  "async-tls",
  "either",
@@ -3283,9 +3295,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-yamux"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07c0c9b6ef7a168c2ae854170b0b6b77550599afe06cc3ac390eb45c5d9c7110"
+checksum = "1a0798cbb58535162c40858493d09af06eac42a26e4966e58de0df701f559348"
 dependencies = [
  "futures 0.3.5",
  "libp2p-core",
@@ -3411,7 +3423,7 @@ version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
 ]
 
 [[package]]
@@ -3548,18 +3560,18 @@ dependencies = [
 
 [[package]]
 name = "minicbor"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2ef6aa869726518c5d8206fa5d1337bda8a0442807611be617891c018fa781"
+checksum = "0164190d1771b1458c3742075b057ed55d25cd9dfb930aade99315a1eb1fe12d"
 dependencies = [
  "minicbor-derive",
 ]
 
 [[package]]
 name = "minicbor-derive"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b3569c0dbfff1b8d5f1434c642b67f5bf81c0f354a3f5f8f180b549dba3c07c"
+checksum = "2e071b3159835ee91df62dbdbfdd7ec366b7ea77c838f43aff4acda6b61bcfb9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3581,7 +3593,7 @@ version = "0.6.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "fuchsia-zircon",
  "fuchsia-zircon-sys",
  "iovec",
@@ -3659,17 +3671,17 @@ checksum = "0debeb9fcf88823ea64d64e4a815ab1643f33127d995978e099942ce38f25238"
 
 [[package]]
 name = "multihash"
-version = "0.11.2"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f75db05d738947aa5389863aadafbcf2e509d7ba099dc2ddcdf4fc66bf7a9e03"
+checksum = "567122ab6492f49b59def14ecc36e13e64dca4188196dd0cd41f9f3f979f3df6"
 dependencies = [
  "blake2b_simd",
  "blake2s_simd",
- "digest 0.8.1",
- "sha-1",
- "sha2 0.8.2",
- "sha3 0.8.2",
- "unsigned-varint 0.3.3",
+ "digest 0.9.0",
+ "sha-1 0.9.2",
+ "sha2 0.9.1",
+ "sha3 0.9.1",
+ "unsigned-varint 0.5.1",
 ]
 
 [[package]]
@@ -3680,9 +3692,9 @@ checksum = "d8883adfde9756c1d30b0f519c9b8c502a94b41ac62f696453c37c7fc0a958ce"
 
 [[package]]
 name = "multistream-select"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36a6aa6e32fbaf16795142335967214b8564a7a4661eb6dc846ef343a6e00ac1"
+checksum = "93faf2e41f9ee62fb01680ed48f3cc26652352327aa2e59869070358f6b7dd75"
 dependencies = [
  "bytes 0.5.6",
  "futures 0.3.5",
@@ -3724,7 +3736,7 @@ version = "0.2.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "libc",
  "winapi 0.3.9",
 ]
@@ -3737,7 +3749,7 @@ checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363"
 dependencies = [
  "bitflags",
  "cc",
- "cfg-if",
+ "cfg-if 0.1.10",
  "libc",
  "void",
 ]
@@ -5215,12 +5227,12 @@ dependencies = [
 
 [[package]]
 name = "parity-multiaddr"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c7ad66970bbab360c97179b60906e2dc4aef1f7fca8ab4e5c5db8c97b16814a"
+checksum = "22fe99b938abd57507e37f8d4ef30cd74b33c71face2809b37b8beb71bab15ab"
 dependencies = [
  "arrayref",
- "bs58",
+ "bs58 0.4.0",
  "byteorder",
  "data-encoding",
  "multihash",
@@ -5287,7 +5299,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "297ff91fa36aec49ce183484b102f6b75b46776822bd81525bfc4cc9b0dd0f5c"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "ethereum-types",
  "hashbrown 0.8.1",
  "impl-trait-for-tuples",
@@ -5338,7 +5350,7 @@ dependencies = [
  "mio",
  "mio-extras",
  "rand 0.7.3",
- "sha-1",
+ "sha-1 0.8.2",
  "slab",
  "url 2.1.1",
 ]
@@ -5410,7 +5422,7 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "cloudabi 0.0.3",
  "libc",
  "redox_syscall",
@@ -5425,7 +5437,7 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "cloudabi 0.0.3",
  "libc",
  "redox_syscall",
@@ -5439,7 +5451,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "cloudabi 0.1.0",
  "instant",
  "libc",
@@ -5557,7 +5569,7 @@ checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d"
 dependencies = [
  "maplit",
  "pest",
- "sha-1",
+ "sha-1 0.8.2",
 ]
 
 [[package]]
@@ -5652,7 +5664,7 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e0720e0b9ea9d52451cf29d3413ba8a9303f8815d9d9653ef70e03ff73e65566"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "libc",
  "log",
  "wepoll-sys-stjepang",
@@ -5674,7 +5686,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9a50142b55ab3ed0e9f68dfb3709f1d90d29da24e91033f28b96330643107dc"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "universal-hash",
 ]
 
@@ -5797,7 +5809,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "30d70cf4412832bcac9cffe27906f4a66e450d323525e977168c70d1b36120ae"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "fnv",
  "lazy_static",
  "parking_lot 0.11.0",
@@ -7153,7 +7165,7 @@ dependencies = [
  "async-std",
  "async-trait",
  "bitflags",
- "bs58",
+ "bs58 0.3.1",
  "bytes 0.5.6",
  "derive_more",
  "either",
@@ -7842,6 +7854,19 @@ dependencies = [
  "opaque-debug 0.2.3",
 ]
 
+[[package]]
+name = "sha-1"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce3cdf1b5e620a498ee6f2a171885ac7e22f0e12089ec4b3d22b84921792507c"
+dependencies = [
+ "block-buffer 0.9.0",
+ "cfg-if 1.0.0",
+ "cpuid-bool",
+ "digest 0.9.0",
+ "opaque-debug 0.3.0",
+]
+
 [[package]]
 name = "sha2"
 version = "0.8.2"
@@ -7861,7 +7886,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2933378ddfeda7ea26f48c555bdad8bb446bf8a3d17832dc83e380d444cfb8c1"
 dependencies = [
  "block-buffer 0.9.0",
- "cfg-if",
+ "cfg-if 0.1.10",
  "cpuid-bool",
  "digest 0.9.0",
  "opaque-debug 0.3.0",
@@ -8012,7 +8037,7 @@ version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "libc",
  "redox_syscall",
  "winapi 0.3.9",
@@ -8031,7 +8056,7 @@ dependencies = [
  "httparse",
  "log",
  "rand 0.7.3",
- "sha-1",
+ "sha-1 0.8.2",
 ]
 
 [[package]]
@@ -9049,7 +9074,7 @@ dependencies = [
 name = "substrate-test-runtime"
 version = "2.0.0"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "frame-executive",
  "frame-support",
  "frame-system",
@@ -9237,7 +9262,7 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "libc",
  "rand 0.7.3",
  "redox_syscall",
@@ -9685,7 +9710,7 @@ version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b0987850db3733619253fe60e17cb59b82d37c7e6c0236bb81e4d6b87c879f27"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "log",
  "pin-project-lite",
  "tracing-attributes",
@@ -9928,12 +9953,6 @@ dependencies = [
  "subtle 2.2.3",
 ]
 
-[[package]]
-name = "unsigned-varint"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f67332660eb59a6f1eb24ff1220c9e8d01738a8503c6002e30bcfe4bd9f2b4a9"
-
 [[package]]
 name = "unsigned-varint"
 version = "0.4.0"
@@ -10075,7 +10094,7 @@ version = "0.2.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0563a9a4b071746dd5aedbc3a28c6fe9be4586fb3fbadb67c400d4f53c6b16c"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "serde",
  "serde_json",
  "wasm-bindgen-macro",
@@ -10102,7 +10121,7 @@ version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a369c5e1dfb7569e14d62af4da642a3cbc2f9a3652fe586e26ac22222aa4b04"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "js-sys",
  "wasm-bindgen",
  "web-sys",
@@ -10232,7 +10251,7 @@ checksum = "1cd3c4f449382779ef6e0a7c3ec6752ae614e20a42e4100000c3efdc973100e2"
 dependencies = [
  "anyhow",
  "backtrace",
- "cfg-if",
+ "cfg-if 0.1.10",
  "lazy_static",
  "libc",
  "log",
@@ -10274,7 +10293,7 @@ dependencies = [
  "anyhow",
  "base64 0.12.3",
  "bincode",
- "cfg-if",
+ "cfg-if 0.1.10",
  "cranelift-codegen",
  "cranelift-entity",
  "cranelift-frontend",
@@ -10303,7 +10322,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e914c013c7a9f15f4e429d5431f2830fb8adb56e40567661b69c5ec1d645be23"
 dependencies = [
  "anyhow",
- "cfg-if",
+ "cfg-if 0.1.10",
  "cranelift-codegen",
  "cranelift-entity",
  "cranelift-frontend",
@@ -10346,7 +10365,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e8d4d1af8dd5f7096cfcc89dd668d358e52980c38cce199643372ffd6590e27"
 dependencies = [
  "anyhow",
- "cfg-if",
+ "cfg-if 0.1.10",
  "gimli 0.21.0",
  "lazy_static",
  "libc",
@@ -10366,7 +10385,7 @@ checksum = "3a25f140bbbaadb07c531cba99ce1a966dba216138dc1b2a0ddecec851a01a93"
 dependencies = [
  "backtrace",
  "cc",
- "cfg-if",
+ "cfg-if 0.1.10",
  "indexmap",
  "lazy_static",
  "libc",
diff --git a/bin/node/browser-testing/Cargo.toml b/bin/node/browser-testing/Cargo.toml
index c90c4a293f49..fade57d8124f 100644
--- a/bin/node/browser-testing/Cargo.toml
+++ b/bin/node/browser-testing/Cargo.toml
@@ -8,7 +8,7 @@ license = "Apache-2.0"
 
 [dependencies]
 futures-timer = "3.0.2"
-libp2p = { version = "0.29.1", default-features = false }
+libp2p = { version = "0.30.1", default-features = false }
 jsonrpc-core = "15.0.0"
 serde = "1.0.106"
 serde_json = "1.0.48"
diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml
index ff6c26bbee53..40b929fc8a0f 100644
--- a/client/authority-discovery/Cargo.toml
+++ b/client/authority-discovery/Cargo.toml
@@ -24,7 +24,7 @@ derive_more = "0.99.2"
 either = "1.5.3"
 futures = "0.3.4"
 futures-timer = "3.0.1"
-libp2p = { version = "0.29.1", default-features = false, features = ["kad"] }
+libp2p = { version = "0.30.1", default-features = false, features = ["kad"] }
 log = "0.4.8"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.8.0"}
 prost = "0.6.1"
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index 51c499828ac2..942d30e90db5 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -21,7 +21,7 @@ ansi_term = "0.12.1"
 tokio = { version = "0.2.21", features = [ "signal", "rt-core", "rt-threaded", "blocking" ] }
 futures = "0.3.4"
 fdlimit = "0.2.1"
-libp2p = "0.29.1"
+libp2p = "0.30.1"
 parity-scale-codec = "1.3.0"
 hex = "0.4.2"
 rand = "0.7.3"
diff --git a/client/network-gossip/Cargo.toml b/client/network-gossip/Cargo.toml
index 94d9272f4bbd..c120ff515c7a 100644
--- a/client/network-gossip/Cargo.toml
+++ b/client/network-gossip/Cargo.toml
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 futures = "0.3.4"
 futures-timer = "3.0.1"
-libp2p = { version = "0.29.1", default-features = false }
+libp2p = { version = "0.30.1", default-features = false }
 log = "0.4.8"
 lru = "0.4.3"
 sc-network = { version = "0.8.0", path = "../network" }
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index f5ebee39db56..6b66fd0cdee6 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -64,13 +64,13 @@ wasm-timer = "0.2"
 zeroize = "1.0.0"
 
 [dependencies.libp2p]
-version = "0.29.1"
+version = "0.30.1"
 default-features = false
 features = ["identify", "kad", "mdns-async-std", "mplex", "noise", "ping", "request-response", "tcp-async-std", "websocket", "yamux"]
 
 [dev-dependencies]
 assert_matches = "1.3"
-libp2p = { version = "0.29.1", default-features = false }
+libp2p = { version = "0.30.1", default-features = false }
 quickcheck = "0.9.0"
 rand = "0.7.2"
 sp-keyring = { version = "2.0.0", path = "../../primitives/keyring" }
diff --git a/client/network/src/discovery.rs b/client/network/src/discovery.rs
index f9bda6aabf5f..60d35dbdf1ae 100644
--- a/client/network/src/discovery.rs
+++ b/client/network/src/discovery.rs
@@ -51,11 +51,11 @@ use futures::prelude::*;
 use futures_timer::Delay;
 use ip_network::IpNetwork;
 use libp2p::core::{connection::{ConnectionId, ListenerId}, ConnectedPoint, Multiaddr, PeerId, PublicKey};
-use libp2p::swarm::{NetworkBehaviour, NetworkBehaviourAction, PollParameters, ProtocolsHandler};
-use libp2p::swarm::protocols_handler::multi::MultiHandler;
+use libp2p::swarm::{NetworkBehaviour, NetworkBehaviourAction, PollParameters, ProtocolsHandler, IntoProtocolsHandler};
+use libp2p::swarm::protocols_handler::multi::IntoMultiHandler;
 use libp2p::kad::{Kademlia, KademliaBucketInserts, KademliaConfig, KademliaEvent, QueryResult, Quorum, Record};
 use libp2p::kad::GetClosestPeersError;
-use libp2p::kad::handler::KademliaHandler;
+use libp2p::kad::handler::KademliaHandlerProto;
 use libp2p::kad::QueryId;
 use libp2p::kad::record::{self, store::{MemoryStore, RecordStore}};
 #[cfg(not(target_os = "unknown"))]
@@ -444,14 +444,14 @@ pub enum DiscoveryOut {
 }
 
 impl NetworkBehaviour for DiscoveryBehaviour {
-	type ProtocolsHandler = MultiHandler<ProtocolId, KademliaHandler<QueryId>>;
+	type ProtocolsHandler = IntoMultiHandler<ProtocolId, KademliaHandlerProto<QueryId>>;
 	type OutEvent = DiscoveryOut;
 
 	fn new_handler(&mut self) -> Self::ProtocolsHandler {
 		let iter = self.kademlias.iter_mut()
 			.map(|(p, k)| (p.clone(), NetworkBehaviour::new_handler(k)));
 
-		MultiHandler::try_from_iter(iter)
+		IntoMultiHandler::try_from_iter(iter)
 			.expect("There can be at most one handler per `ProtocolId` and \
 				protocol names contain the `ProtocolId` so no two protocol \
 				names in `self.kademlias` can be equal which is the only error \
@@ -534,7 +534,7 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 		&mut self,
 		peer_id: PeerId,
 		connection: ConnectionId,
-		(pid, event): <Self::ProtocolsHandler as ProtocolsHandler>::OutEvent,
+		(pid, event): <<Self::ProtocolsHandler as IntoProtocolsHandler>::Handler as ProtocolsHandler>::OutEvent,
 	) {
 		if let Some(kad) = self.kademlias.get_mut(&pid) {
 			return kad.inject_event(peer_id, connection, event)
@@ -598,7 +598,7 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 		params: &mut impl PollParameters,
 	) -> Poll<
 		NetworkBehaviourAction<
-			<Self::ProtocolsHandler as ProtocolsHandler>::InEvent,
+			<<Self::ProtocolsHandler as IntoProtocolsHandler>::Handler as ProtocolsHandler>::InEvent,
 			Self::OutEvent,
 		>,
 	> {
@@ -816,7 +816,7 @@ mod tests {
 			let transport = MemoryTransport
 				.upgrade(upgrade::Version::V1)
 				.authenticate(noise::NoiseConfig::xx(noise_keys).into_authenticated())
-				.multiplex(yamux::Config::default())
+				.multiplex(yamux::YamuxConfig::default())
 				.boxed();
 
 			let behaviour = {
diff --git a/client/network/src/light_client_handler.rs b/client/network/src/light_client_handler.rs
index e7c5e9c1c9b9..b72362fdfc36 100644
--- a/client/network/src/light_client_handler.rs
+++ b/client/network/src/light_client_handler.rs
@@ -1355,7 +1355,7 @@ mod tests {
 		let transport = MemoryTransport::default()
 			.upgrade(upgrade::Version::V1)
 			.authenticate(NoiseConfig::xx(dh_key).into_authenticated())
-			.multiplex(yamux::Config::default())
+			.multiplex(yamux::YamuxConfig::default())
 			.boxed();
 		Swarm::new(transport, LightClientHandler::new(cf, client, checker, ps), local_peer)
 	}
diff --git a/client/network/src/protocol/generic_proto/tests.rs b/client/network/src/protocol/generic_proto/tests.rs
index 7a040a403af7..9c45c62f8bb4 100644
--- a/client/network/src/protocol/generic_proto/tests.rs
+++ b/client/network/src/protocol/generic_proto/tests.rs
@@ -54,7 +54,7 @@ fn build_nodes() -> (Swarm<CustomProtoWithAddr>, Swarm<CustomProtoWithAddr>) {
 		let transport = MemoryTransport
 			.upgrade(upgrade::Version::V1)
 			.authenticate(noise::NoiseConfig::xx(noise_keys).into_authenticated())
-			.multiplex(yamux::Config::default())
+			.multiplex(yamux::YamuxConfig::default())
 			.timeout(Duration::from_secs(20))
 			.boxed();
 
diff --git a/client/network/src/request_responses.rs b/client/network/src/request_responses.rs
index 5e414248674f..a3a68f719d6b 100644
--- a/client/network/src/request_responses.rs
+++ b/client/network/src/request_responses.rs
@@ -680,7 +680,7 @@ mod tests {
 				let transport = MemoryTransport
 					.upgrade(upgrade::Version::V1)
 					.authenticate(noise::NoiseConfig::xx(noise_keys).into_authenticated())
-					.multiplex(libp2p::yamux::Config::default())
+					.multiplex(libp2p::yamux::YamuxConfig::default())
 					.boxed();
 
 				let behaviour = {
@@ -783,7 +783,7 @@ mod tests {
 				let transport = MemoryTransport
 					.upgrade(upgrade::Version::V1)
 					.authenticate(noise::NoiseConfig::xx(noise_keys).into_authenticated())
-					.multiplex(libp2p::yamux::Config::default())
+					.multiplex(libp2p::yamux::YamuxConfig::default())
 					.boxed();
 
 				let behaviour = {
diff --git a/client/network/src/transport.rs b/client/network/src/transport.rs
index 80d897633fd7..035b3a9716a0 100644
--- a/client/network/src/transport.rs
+++ b/client/network/src/transport.rs
@@ -104,13 +104,13 @@ pub fn build_transport(
 
 	let multiplexing_config = {
 		let mut mplex_config = mplex::MplexConfig::new();
-		mplex_config.max_buffer_len_behaviour(mplex::MaxBufferBehaviour::Block);
-		mplex_config.max_buffer_len(usize::MAX);
+		mplex_config.set_max_buffer_behaviour(mplex::MaxBufferBehaviour::Block);
+		mplex_config.set_max_buffer_size(usize::MAX);
 
-		let mut yamux_config = libp2p::yamux::Config::default();
+		let mut yamux_config = libp2p::yamux::YamuxConfig::default();
 		// Enable proper flow-control: window updates are only sent when
 		// buffered data has been consumed.
-		yamux_config.set_window_update_mode(libp2p::yamux::WindowUpdateMode::OnRead);
+		yamux_config.set_window_update_mode(libp2p::yamux::WindowUpdateMode::on_read());
 
 		core::upgrade::SelectUpgrade::new(yamux_config, mplex_config)
 	};
diff --git a/client/network/test/Cargo.toml b/client/network/test/Cargo.toml
index a8bf98a75ed6..a74aa90d4f4c 100644
--- a/client/network/test/Cargo.toml
+++ b/client/network/test/Cargo.toml
@@ -19,7 +19,7 @@ parking_lot = "0.10.0"
 futures = "0.3.4"
 futures-timer = "3.0.1"
 rand = "0.7.2"
-libp2p = { version = "0.29.1", default-features = false }
+libp2p = { version = "0.30.1", default-features = false }
 sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
 sc-consensus = { version = "0.8.0", path = "../../../client/consensus/common" }
 sc-client-api = { version = "2.0.0", path = "../../api" }
diff --git a/client/peerset/Cargo.toml b/client/peerset/Cargo.toml
index 459f4a930204..efca00a24deb 100644
--- a/client/peerset/Cargo.toml
+++ b/client/peerset/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 futures = "0.3.4"
-libp2p = { version = "0.29.1", default-features = false }
+libp2p = { version = "0.30.1", default-features = false }
 sp-utils = { version = "2.0.0", path = "../../primitives/utils"}
 log = "0.4.8"
 serde_json = "1.0.41"
diff --git a/client/telemetry/Cargo.toml b/client/telemetry/Cargo.toml
index 18812a8c71e4..bff7842bec4f 100644
--- a/client/telemetry/Cargo.toml
+++ b/client/telemetry/Cargo.toml
@@ -19,7 +19,7 @@ parking_lot = "0.10.0"
 futures = "0.3.4"
 futures-timer = "3.0.1"
 wasm-timer = "0.2.0"
-libp2p = { version = "0.29.1", default-features = false, features = ["dns", "tcp-async-std", "wasm-ext", "websocket"] }
+libp2p = { version = "0.30.1", default-features = false, features = ["dns", "tcp-async-std", "wasm-ext", "websocket"] }
 log = "0.4.8"
 pin-project = "0.4.6"
 rand = "0.7.2"
diff --git a/primitives/consensus/common/Cargo.toml b/primitives/consensus/common/Cargo.toml
index db85244dcfa8..001f0e367945 100644
--- a/primitives/consensus/common/Cargo.toml
+++ b/primitives/consensus/common/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 thiserror = "1.0.21"
-libp2p = { version = "0.29.1", default-features = false }
+libp2p = { version = "0.30.1", default-features = false }
 log = "0.4.8"
 sp-core = { path= "../../core", version = "2.0.0"}
 sp-inherents = { version = "2.0.0", path = "../../inherents" }
diff --git a/utils/browser/Cargo.toml b/utils/browser/Cargo.toml
index 90668f4e51fe..9efc8c396680 100644
--- a/utils/browser/Cargo.toml
+++ b/utils/browser/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 futures = { version = "0.3", features = ["compat"] }
 futures01 = { package = "futures", version = "0.1.29" }
 log = "0.4.8"
-libp2p-wasm-ext = { version = "0.23", features = ["websocket"] }
+libp2p-wasm-ext = { version = "0.24", features = ["websocket"] }
 console_error_panic_hook = "0.1.6"
 console_log = "0.1.2"
 js-sys = "0.3.34"

From 11ace4ef8b2ad176293ad6db2b3dd795befd2c79 Mon Sep 17 00:00:00 2001
From: Andrew Plaza <aplaza@liquidthink.net>
Date: Mon, 16 Nov 2020 22:50:44 +0100
Subject: [PATCH 0077/1194] make ClientConfig public (#7544)

---
 client/service/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index 8e6b0037bdf9..a23ebf3d553d 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -80,7 +80,7 @@ pub use sc_tracing::TracingReceiver;
 pub use task_manager::SpawnTaskHandle;
 pub use task_manager::TaskManager;
 pub use sp_consensus::import_queue::ImportQueue;
-pub use self::client::LocalCallExecutor;
+pub use self::client::{LocalCallExecutor, ClientConfig};
 use sc_client_api::{blockchain::HeaderBackend, BlockchainEvents};
 
 const DEFAULT_PROTOCOL_ID: &str = "sup";

From 407cd3af06b03201a506b645c9ee587e5d4748bb Mon Sep 17 00:00:00 2001
From: Qinxuan Chen <koushiro.cqx@gmail.com>
Date: Wed, 18 Nov 2020 13:56:16 +0800
Subject: [PATCH 0078/1194] sc-basic-authorship: remove useless dependencies
 (#7550)

Signed-off-by: koushiro <koushiro.cqx@gmail.com>
---
 Cargo.lock                         | 66 ++++--------------------------
 client/basic-authorship/Cargo.toml |  1 -
 2 files changed, 8 insertions(+), 59 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1b8b13c2e2a4..3a87dfec6640 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1878,27 +1878,12 @@ dependencies = [
  "futures-sink",
 ]
 
-[[package]]
-name = "futures-channel-preview"
-version = "0.3.0-alpha.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5e5f4df964fa9c1c2f8bddeb5c3611631cacd93baf810fc8bb2fb4b495c263a"
-dependencies = [
- "futures-core-preview",
-]
-
 [[package]]
 name = "futures-core"
 version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399"
 
-[[package]]
-name = "futures-core-preview"
-version = "0.3.0-alpha.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b35b6263fb1ef523c3056565fa67b1d16f0a8604ff12b11b08c25f28a734c60a"
-
 [[package]]
 name = "futures-cpupool"
 version = "0.1.8"
@@ -2022,18 +2007,6 @@ dependencies = [
  "slab",
 ]
 
-[[package]]
-name = "futures-util-preview"
-version = "0.3.0-alpha.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ce968633c17e5f97936bd2797b6e38fb56cf16a7422319f7ec2e30d3c470e8d"
-dependencies = [
- "futures-channel-preview",
- "futures-core-preview",
- "pin-utils",
- "slab",
-]
-
 [[package]]
 name = "futures_codec"
 version = "0.4.1"
@@ -2412,7 +2385,7 @@ dependencies = [
  "time",
  "tokio 0.1.22",
  "tokio-buf",
- "tokio-executor 0.1.10",
+ "tokio-executor",
  "tokio-io",
  "tokio-reactor",
  "tokio-tcp",
@@ -6518,7 +6491,6 @@ dependencies = [
  "sp-transaction-pool",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
- "tokio-executor 0.2.0-alpha.6",
 ]
 
 [[package]]
@@ -9404,11 +9376,11 @@ dependencies = [
  "num_cpus",
  "tokio-codec",
  "tokio-current-thread",
- "tokio-executor 0.1.10",
+ "tokio-executor",
  "tokio-fs",
  "tokio-io",
  "tokio-reactor",
- "tokio-sync 0.1.8",
+ "tokio-sync",
  "tokio-tcp",
  "tokio-threadpool",
  "tokio-timer",
@@ -9468,7 +9440,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e"
 dependencies = [
  "futures 0.1.29",
- "tokio-executor 0.1.10",
+ "tokio-executor",
 ]
 
 [[package]]
@@ -9481,17 +9453,6 @@ dependencies = [
  "futures 0.1.29",
 ]
 
-[[package]]
-name = "tokio-executor"
-version = "0.2.0-alpha.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ee9ceecf69145923834ea73f32ba40c790fd877b74a7817dd0b089f1eb9c7c8"
-dependencies = [
- "futures-util-preview",
- "lazy_static",
- "tokio-sync 0.2.0-alpha.6",
-]
-
 [[package]]
 name = "tokio-fs"
 version = "0.1.7"
@@ -9552,9 +9513,9 @@ dependencies = [
  "num_cpus",
  "parking_lot 0.9.0",
  "slab",
- "tokio-executor 0.1.10",
+ "tokio-executor",
  "tokio-io",
- "tokio-sync 0.1.8",
+ "tokio-sync",
 ]
 
 [[package]]
@@ -9588,17 +9549,6 @@ dependencies = [
  "futures 0.1.29",
 ]
 
-[[package]]
-name = "tokio-sync"
-version = "0.2.0-alpha.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f1aaeb685540f7407ea0e27f1c9757d258c7c6bf4e3eb19da6fc59b747239d2"
-dependencies = [
- "fnv",
- "futures-core-preview",
- "futures-util-preview",
-]
-
 [[package]]
 name = "tokio-tcp"
 version = "0.1.4"
@@ -9627,7 +9577,7 @@ dependencies = [
  "log",
  "num_cpus",
  "slab",
- "tokio-executor 0.1.10",
+ "tokio-executor",
 ]
 
 [[package]]
@@ -9639,7 +9589,7 @@ dependencies = [
  "crossbeam-utils",
  "futures 0.1.29",
  "slab",
- "tokio-executor 0.1.10",
+ "tokio-executor",
 ]
 
 [[package]]
diff --git a/client/basic-authorship/Cargo.toml b/client/basic-authorship/Cargo.toml
index 1b1d8921bcfb..f097d8044f61 100644
--- a/client/basic-authorship/Cargo.toml
+++ b/client/basic-authorship/Cargo.toml
@@ -29,7 +29,6 @@ sc-telemetry = { version = "2.0.0", path = "../telemetry" }
 sp-transaction-pool = { version = "2.0.0", path = "../../primitives/transaction-pool" }
 sc-block-builder = { version = "0.8.0", path = "../block-builder" }
 sc-proposer-metrics = { version = "0.8.0", path = "../proposer-metrics" }
-tokio-executor = { version = "0.2.0-alpha.6", features = ["blocking"] }
 
 [dev-dependencies]
 sc-transaction-pool = { version = "2.0.0", path = "../../client/transaction-pool" }

From 2d97a12fb7070a5fbc3dcc9d2918247df69d6245 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Wed, 18 Nov 2020 12:19:22 +0100
Subject: [PATCH 0079/1194] Add slashing events to elections-phragmen. (#7543)

* Add slashing events to elections-phragmen.

* Fix build

* Apply suggestions from code review

* Update frame/elections-phragmen/src/lib.rs

* Update frame/elections-phragmen/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
---
 frame/elections-phragmen/src/lib.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index cf3864f2e3f9..be47b5adcce5 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -682,6 +682,10 @@ decl_event!(
 		/// A \[member\] has been removed. This should always be followed by either `NewTerm` or
 		/// `EmptyTerm`.
 		MemberKicked(AccountId),
+		/// A candidate was slashed due to failing to obtain a seat as member or runner-up
+		CandidateSlashed(AccountId, Balance),
+		/// A seat holder (member or runner-up) was slashed due to failing to retaining their position.
+		SeatHolderSlashed(AccountId, Balance),
 		/// A \[member\] has renounced their candidacy.
 		MemberRenounced(AccountId),
 		/// A voter was reported with the the report being successful or not.
@@ -995,6 +999,7 @@ impl<T: Trait> Module<T> {
 					new_runners_up_ids_sorted.binary_search(&c).is_err()
 				{
 					let (imbalance, _) = T::Currency::slash_reserved(&c, T::CandidacyBond::get());
+					Self::deposit_event(RawEvent::CandidateSlashed(c, T::CandidacyBond::get()));
 					T::LoserCandidate::on_unbalanced(imbalance);
 				}
 			});
@@ -1002,6 +1007,7 @@ impl<T: Trait> Module<T> {
 			// Burn outgoing bonds
 			to_burn_bond.into_iter().for_each(|x| {
 				let (imbalance, _) = T::Currency::slash_reserved(&x, T::CandidacyBond::get());
+				Self::deposit_event(RawEvent::SeatHolderSlashed(x, T::CandidacyBond::get()));
 				T::LoserCandidate::on_unbalanced(imbalance);
 			});
 

From c180950de63dbdfaa11053a8a56f35e694ed9e36 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Wed, 18 Nov 2020 16:05:35 +0100
Subject: [PATCH 0080/1194] Remove necessity to pass ConsensusEngineId when
 registering notifications protocol (#7549)

* Remove necessity to pass ConsensusEngineId when registering notifications protocol

* Line width

* Fix tests protocol name

* Other renames

* Doc update

* Change issue in TODO
---
 .../finality-grandpa/src/communication/mod.rs |   2 -
 .../src/communication/tests.rs                |  23 ++--
 client/finality-grandpa/src/lib.rs            |   1 -
 client/finality-grandpa/src/tests.rs          |   4 +-
 client/network-gossip/src/bridge.rs           |  51 ++++---
 client/network-gossip/src/lib.rs              |  18 ++-
 client/network-gossip/src/state_machine.rs    |  54 +++++---
 client/network/src/behaviour.rs               |  31 ++---
 client/network/src/config.rs                  |   7 +-
 client/network/src/gossip.rs                  |   9 +-
 client/network/src/gossip/tests.rs            |  14 +-
 client/network/src/protocol.rs                |  82 ++++-------
 client/network/src/protocol/event.rs          |   8 +-
 client/network/src/protocol/message.rs        |   2 +-
 client/network/src/service.rs                 | 127 +++++++-----------
 client/network/src/service/out_events.rs      |  29 ++--
 client/network/src/service/tests.rs           |  46 +++----
 client/network/test/src/lib.rs                |   4 +-
 18 files changed, 228 insertions(+), 284 deletions(-)

diff --git a/client/finality-grandpa/src/communication/mod.rs b/client/finality-grandpa/src/communication/mod.rs
index 3daffcb9f252..038d82a8cdc3 100644
--- a/client/finality-grandpa/src/communication/mod.rs
+++ b/client/finality-grandpa/src/communication/mod.rs
@@ -68,7 +68,6 @@ mod periodic;
 #[cfg(test)]
 pub(crate) mod tests;
 
-pub use sp_finality_grandpa::GRANDPA_ENGINE_ID;
 pub const GRANDPA_PROTOCOL_NAME: &'static str = "/paritytech/grandpa/1";
 
 // cost scalars for reporting peers.
@@ -215,7 +214,6 @@ impl<B: BlockT, N: Network<B>> NetworkBridge<B, N> {
 		let validator = Arc::new(validator);
 		let gossip_engine = Arc::new(Mutex::new(GossipEngine::new(
 			service.clone(),
-			GRANDPA_ENGINE_ID,
 			GRANDPA_PROTOCOL_NAME,
 			validator.clone()
 		)));
diff --git a/client/finality-grandpa/src/communication/tests.rs b/client/finality-grandpa/src/communication/tests.rs
index 1a773acd6d0f..e1685256f7b8 100644
--- a/client/finality-grandpa/src/communication/tests.rs
+++ b/client/finality-grandpa/src/communication/tests.rs
@@ -24,10 +24,11 @@ use sc_network_gossip::Validator;
 use std::sync::Arc;
 use sp_keyring::Ed25519Keyring;
 use parity_scale_codec::Encode;
-use sp_runtime::{ConsensusEngineId, traits::NumberFor};
+use sp_runtime::traits::NumberFor;
 use std::{borrow::Cow, pin::Pin, task::{Context, Poll}};
+use crate::communication::GRANDPA_PROTOCOL_NAME;
 use crate::environment::SharedVoterSetState;
-use sp_finality_grandpa::{AuthorityList, GRANDPA_ENGINE_ID};
+use sp_finality_grandpa::AuthorityList;
 use super::gossip::{self, GossipValidator};
 use super::{VoterSet, Round, SetId};
 
@@ -57,11 +58,11 @@ impl sc_network_gossip::Network<Block> for TestNetwork {
 
 	fn disconnect_peer(&self, _: PeerId) {}
 
-	fn write_notification(&self, who: PeerId, _: ConsensusEngineId, message: Vec<u8>) {
+	fn write_notification(&self, who: PeerId, _: Cow<'static, str>, message: Vec<u8>) {
 		let _ = self.sender.unbounded_send(Event::WriteNotification(who, message));
 	}
 
-	fn register_notifications_protocol(&self, _: ConsensusEngineId, _: Cow<'static, str>) {}
+	fn register_notifications_protocol(&self, _: Cow<'static, str>) {}
 
 	fn announce(&self, block: Hash, _associated_data: Vec<u8>) {
 		let _ = self.sender.unbounded_send(Event::Announce(block));
@@ -86,7 +87,7 @@ impl sc_network_gossip::ValidatorContext<Block> for TestNetwork {
 		<Self as sc_network_gossip::Network<Block>>::write_notification(
 			self,
 			who.clone(),
-			GRANDPA_ENGINE_ID,
+			GRANDPA_PROTOCOL_NAME.into(),
 			data,
 		);
 	}
@@ -287,20 +288,20 @@ fn good_commit_leads_to_relay() {
 					// Add the sending peer and send the commit
 					let _ = sender.unbounded_send(NetworkEvent::NotificationStreamOpened {
 						remote: sender_id.clone(),
-						engine_id: GRANDPA_ENGINE_ID,
+						protocol: GRANDPA_PROTOCOL_NAME.into(),
 						role: ObservedRole::Full,
 					});
 
 					let _ = sender.unbounded_send(NetworkEvent::NotificationsReceived {
 						remote: sender_id.clone(),
-						messages: vec![(GRANDPA_ENGINE_ID, commit_to_send.clone().into())],
+						messages: vec![(GRANDPA_PROTOCOL_NAME.into(), commit_to_send.clone().into())],
 					});
 
 					// Add a random peer which will be the recipient of this message
 					let receiver_id = sc_network::PeerId::random();
 					let _ = sender.unbounded_send(NetworkEvent::NotificationStreamOpened {
 						remote: receiver_id.clone(),
-						engine_id: GRANDPA_ENGINE_ID,
+						protocol: GRANDPA_PROTOCOL_NAME.into(),
 						role: ObservedRole::Full,
 					});
 
@@ -319,7 +320,7 @@ fn good_commit_leads_to_relay() {
 
 						sender.unbounded_send(NetworkEvent::NotificationsReceived {
 							remote: receiver_id,
-							messages: vec![(GRANDPA_ENGINE_ID, msg.encode().into())],
+							messages: vec![(GRANDPA_PROTOCOL_NAME.into(), msg.encode().into())],
 						})
 					};
 
@@ -434,12 +435,12 @@ fn bad_commit_leads_to_report() {
 				Event::EventStream(sender) => {
 					let _ = sender.unbounded_send(NetworkEvent::NotificationStreamOpened {
 						remote: sender_id.clone(),
-						engine_id: GRANDPA_ENGINE_ID,
+						protocol: GRANDPA_PROTOCOL_NAME.into(),
 						role: ObservedRole::Full,
 					});
 					let _ = sender.unbounded_send(NetworkEvent::NotificationsReceived {
 						remote: sender_id.clone(),
-						messages: vec![(GRANDPA_ENGINE_ID, commit_to_send.clone().into())],
+						messages: vec![(GRANDPA_PROTOCOL_NAME.into(), commit_to_send.clone().into())],
 					});
 
 					true
diff --git a/client/finality-grandpa/src/lib.rs b/client/finality-grandpa/src/lib.rs
index 6ab95d7eac97..18b439abf5e6 100644
--- a/client/finality-grandpa/src/lib.rs
+++ b/client/finality-grandpa/src/lib.rs
@@ -1085,7 +1085,6 @@ where
 	// to receive GRANDPA messages on the network. We don't process the
 	// messages.
 	network.register_notifications_protocol(
-		communication::GRANDPA_ENGINE_ID,
 		From::from(communication::GRANDPA_PROTOCOL_NAME),
 	);
 
diff --git a/client/finality-grandpa/src/tests.rs b/client/finality-grandpa/src/tests.rs
index 175c5360b2c1..44503d3c85d4 100644
--- a/client/finality-grandpa/src/tests.rs
+++ b/client/finality-grandpa/src/tests.rs
@@ -99,9 +99,7 @@ impl TestNetFactory for GrandpaTestNet {
 
 	fn add_full_peer(&mut self) {
 		self.add_full_peer_with_config(FullPeerConfig {
-			notifications_protocols: vec![
-				(communication::GRANDPA_ENGINE_ID, communication::GRANDPA_PROTOCOL_NAME.into())
-			],
+			notifications_protocols: vec![communication::GRANDPA_PROTOCOL_NAME.into()],
 			..Default::default()
 		})
 	}
diff --git a/client/network-gossip/src/bridge.rs b/client/network-gossip/src/bridge.rs
index 70c2942597aa..98ada69590f1 100644
--- a/client/network-gossip/src/bridge.rs
+++ b/client/network-gossip/src/bridge.rs
@@ -23,7 +23,7 @@ use futures::prelude::*;
 use futures::channel::mpsc::{channel, Sender, Receiver};
 use libp2p::PeerId;
 use log::trace;
-use sp_runtime::{traits::Block as BlockT, ConsensusEngineId};
+use sp_runtime::traits::Block as BlockT;
 use std::{
 	borrow::Cow,
 	collections::{HashMap, VecDeque},
@@ -38,7 +38,7 @@ pub struct GossipEngine<B: BlockT> {
 	state_machine: ConsensusGossip<B>,
 	network: Box<dyn Network<B> + Send>,
 	periodic_maintenance_interval: futures_timer::Delay,
-	engine_id: ConsensusEngineId,
+	protocol: Cow<'static, str>,
 
 	/// Incoming events from the network.
 	network_event_stream: Pin<Box<dyn Stream<Item = Event> + Send>>,
@@ -68,20 +68,21 @@ impl<B: BlockT> GossipEngine<B> {
 	/// Create a new instance.
 	pub fn new<N: Network<B> + Send + Clone + 'static>(
 		network: N,
-		engine_id: ConsensusEngineId,
-		protocol_name: impl Into<Cow<'static, str>>,
+		protocol: impl Into<Cow<'static, str>>,
 		validator: Arc<dyn Validator<B>>,
 	) -> Self where B: 'static {
+		let protocol = protocol.into();
+
 		// We grab the event stream before registering the notifications protocol, otherwise we
 		// might miss events.
 		let network_event_stream = network.event_stream();
-		network.register_notifications_protocol(engine_id, protocol_name.into());
+		network.register_notifications_protocol(protocol.clone());
 
 		GossipEngine {
-			state_machine: ConsensusGossip::new(validator, engine_id),
+			state_machine: ConsensusGossip::new(validator, protocol.clone()),
 			network: Box::new(network),
 			periodic_maintenance_interval: futures_timer::Delay::new(PERIODIC_MAINTENANCE_INTERVAL),
-			engine_id,
+			protocol,
 
 			network_event_stream,
 			message_sinks: HashMap::new(),
@@ -181,21 +182,21 @@ impl<B: BlockT> Future for GossipEngine<B> {
 				ForwardingState::Idle => {
 					match this.network_event_stream.poll_next_unpin(cx) {
 						Poll::Ready(Some(event)) => match event {
-							Event::NotificationStreamOpened { remote, engine_id, role } => {
-								if engine_id != this.engine_id {
+							Event::NotificationStreamOpened { remote, protocol, role } => {
+								if protocol != this.protocol {
 									continue;
 								}
 								this.state_machine.new_peer(&mut *this.network, remote, role);
 							}
-							Event::NotificationStreamClosed { remote, engine_id } => {
-								if engine_id != this.engine_id {
+							Event::NotificationStreamClosed { remote, protocol } => {
+								if protocol != this.protocol {
 									continue;
 								}
 								this.state_machine.peer_disconnected(&mut *this.network, remote);
 							},
 							Event::NotificationsReceived { remote, messages } => {
 								let messages = messages.into_iter().filter_map(|(engine, data)| {
-									if engine == this.engine_id {
+									if engine == this.protocol {
 										Some(data.to_vec())
 									} else {
 										None
@@ -299,6 +300,7 @@ mod tests {
 	use rand::Rng;
 	use sc_network::ObservedRole;
 	use sp_runtime::{testing::H256, traits::{Block as BlockT}};
+	use std::borrow::Cow;
 	use std::convert::TryInto;
 	use std::sync::{Arc, Mutex};
 	use substrate_test_runtime_client::runtime::Block;
@@ -329,11 +331,11 @@ mod tests {
 			unimplemented!();
 		}
 
-		fn write_notification(&self, _: PeerId, _: ConsensusEngineId, _: Vec<u8>) {
+		fn write_notification(&self, _: PeerId, _: Cow<'static, str>, _: Vec<u8>) {
 			unimplemented!();
 		}
 
-		fn register_notifications_protocol(&self, _: ConsensusEngineId, _: Cow<'static, str>) {}
+		fn register_notifications_protocol(&self, _: Cow<'static, str>) {}
 
 		fn announce(&self, _: B::Hash, _: Vec<u8>) {
 			unimplemented!();
@@ -361,8 +363,7 @@ mod tests {
 		let network = TestNetwork::default();
 		let mut gossip_engine = GossipEngine::<Block>::new(
 			network.clone(),
-			[1, 2, 3, 4],
-			"my_protocol",
+			"/my_protocol",
 			Arc::new(AllowAll{}),
 		);
 
@@ -383,14 +384,13 @@ mod tests {
 	#[test]
 	fn keeps_multiple_subscribers_per_topic_updated_with_both_old_and_new_messages() {
 		let topic = H256::default();
-		let engine_id = [1, 2, 3, 4];
+		let protocol = Cow::Borrowed("/my_protocol");
 		let remote_peer = PeerId::random();
 		let network = TestNetwork::default();
 
 		let mut gossip_engine = GossipEngine::<Block>::new(
 			network.clone(),
-			engine_id.clone(),
-			"my_protocol",
+			protocol.clone(),
 			Arc::new(AllowAll{}),
 		);
 
@@ -404,7 +404,7 @@ mod tests {
 		event_sender.start_send(
 			Event::NotificationStreamOpened {
 				remote: remote_peer.clone(),
-				engine_id: engine_id.clone(),
+				protocol: protocol.clone(),
 				role: ObservedRole::Authority,
 			}
 		).expect("Event stream is unbounded; qed.");
@@ -413,7 +413,7 @@ mod tests {
 		let events = messages.iter().cloned().map(|m| {
 			Event::NotificationsReceived {
 				remote: remote_peer.clone(),
-				messages: vec![(engine_id, m.into())]
+				messages: vec![(protocol.clone(), m.into())]
 			}
 		}).collect::<Vec<_>>();
 
@@ -498,7 +498,7 @@ mod tests {
 		}
 
 		fn prop(channels: Vec<ChannelLengthAndTopic>, notifications: Vec<Vec<Message>>) {
-			let engine_id = [1, 2, 3, 4];
+			let protocol = Cow::Borrowed("/my_protocol");
 			let remote_peer = PeerId::random();
 			let network = TestNetwork::default();
 
@@ -524,8 +524,7 @@ mod tests {
 
 			let mut gossip_engine = GossipEngine::<Block>::new(
 				network.clone(),
-				engine_id.clone(),
-				"my_protocol",
+				protocol.clone(),
 				Arc::new(TestValidator{}),
 			);
 
@@ -558,7 +557,7 @@ mod tests {
 			event_sender.start_send(
 				Event::NotificationStreamOpened {
 					remote: remote_peer.clone(),
-					engine_id: engine_id.clone(),
+					protocol: protocol.clone(),
 					role: ObservedRole::Authority,
 				}
 			).expect("Event stream is unbounded; qed.");
@@ -576,7 +575,7 @@ mod tests {
 						message.push(i_notification.try_into().unwrap());
 						message.push(i_message.try_into().unwrap());
 
-						(engine_id, message.into())
+						(protocol.clone(), message.into())
 					}).collect();
 
 				event_sender.start_send(Event::NotificationsReceived {
diff --git a/client/network-gossip/src/lib.rs b/client/network-gossip/src/lib.rs
index 1d566ed3cbba..09e946d1a1ea 100644
--- a/client/network-gossip/src/lib.rs
+++ b/client/network-gossip/src/lib.rs
@@ -33,7 +33,7 @@
 //! - Implement the `Network` trait, representing the low-level networking primitives. It is
 //!   already implemented on `sc_network::NetworkService`.
 //! - Implement the `Validator` trait. See the section below.
-//! - Decide on a `ConsensusEngineId`. Each gossiping protocol should have a different one.
+//! - Decide on a protocol name. Each gossiping protocol should have a different one.
 //! - Build a `GossipEngine` using these three elements.
 //! - Use the methods of the `GossipEngine` in order to send out messages and receive incoming
 //!   messages.
@@ -60,7 +60,7 @@ pub use self::validator::{DiscardAll, MessageIntent, Validator, ValidatorContext
 
 use futures::prelude::*;
 use sc_network::{Event, ExHashT, NetworkService, PeerId, ReputationChange};
-use sp_runtime::{traits::Block as BlockT, ConsensusEngineId};
+use sp_runtime::{traits::Block as BlockT};
 use std::{borrow::Cow, pin::Pin, sync::Arc};
 
 mod bridge;
@@ -79,15 +79,14 @@ pub trait Network<B: BlockT> {
 	fn disconnect_peer(&self, who: PeerId);
 
 	/// Send a notification to a peer.
-	fn write_notification(&self, who: PeerId, engine_id: ConsensusEngineId, message: Vec<u8>);
+	fn write_notification(&self, who: PeerId, protocol: Cow<'static, str>, message: Vec<u8>);
 
 	/// Registers a notifications protocol.
 	///
 	/// See the documentation of [`NetworkService:register_notifications_protocol`] for more information.
 	fn register_notifications_protocol(
 		&self,
-		engine_id: ConsensusEngineId,
-		protocol_name: Cow<'static, str>,
+		protocol: Cow<'static, str>,
 	);
 
 	/// Notify everyone we're connected to that we have the given block.
@@ -110,16 +109,15 @@ impl<B: BlockT, H: ExHashT> Network<B> for Arc<NetworkService<B, H>> {
 		NetworkService::disconnect_peer(self, who)
 	}
 
-	fn write_notification(&self, who: PeerId, engine_id: ConsensusEngineId, message: Vec<u8>) {
-		NetworkService::write_notification(self, who, engine_id, message)
+	fn write_notification(&self, who: PeerId, protocol: Cow<'static, str>, message: Vec<u8>) {
+		NetworkService::write_notification(self, who, protocol, message)
 	}
 
 	fn register_notifications_protocol(
 		&self,
-		engine_id: ConsensusEngineId,
-		protocol_name: Cow<'static, str>,
+		protocol: Cow<'static, str>,
 	) {
-		NetworkService::register_notifications_protocol(self, engine_id, protocol_name)
+		NetworkService::register_notifications_protocol(self, protocol)
 	}
 
 	fn announce(&self, block: B::Hash, associated_data: Vec<u8>) {
diff --git a/client/network-gossip/src/state_machine.rs b/client/network-gossip/src/state_machine.rs
index 60c669ecb668..8bd6d9df0191 100644
--- a/client/network-gossip/src/state_machine.rs
+++ b/client/network-gossip/src/state_machine.rs
@@ -18,6 +18,7 @@
 
 use crate::{Network, MessageIntent, Validator, ValidatorContext, ValidationResult};
 
+use std::borrow::Cow;
 use std::collections::{HashMap, HashSet};
 use std::sync::Arc;
 use std::iter;
@@ -26,7 +27,6 @@ use log::{error, trace};
 use lru::LruCache;
 use libp2p::PeerId;
 use sp_runtime::traits::{Block as BlockT, Hash, HashFor};
-use sp_runtime::ConsensusEngineId;
 use sc_network::ObservedRole;
 use wasm_timer::Instant;
 
@@ -89,7 +89,7 @@ impl<'g, 'p, B: BlockT> ValidatorContext<B> for NetworkContext<'g, 'p, B> {
 
 	/// Send addressed message to a peer.
 	fn send_message(&mut self, who: &PeerId, message: Vec<u8>) {
-		self.network.write_notification(who.clone(), self.gossip.engine_id, message);
+		self.network.write_notification(who.clone(), self.gossip.protocol.clone(), message);
 	}
 
 	/// Send all messages with given topic to a peer.
@@ -100,7 +100,7 @@ impl<'g, 'p, B: BlockT> ValidatorContext<B> for NetworkContext<'g, 'p, B> {
 
 fn propagate<'a, B: BlockT, I>(
 	network: &mut dyn Network<B>,
-	engine_id: ConsensusEngineId,
+	protocol: Cow<'static, str>,
 	messages: I,
 	intent: MessageIntent,
 	peers: &mut HashMap<PeerId, PeerConsensus<B::Hash>>,
@@ -138,7 +138,7 @@ fn propagate<'a, B: BlockT, I>(
 			peer.known_messages.insert(message_hash.clone());
 
 			trace!(target: "gossip", "Propagating to {}: {:?}", id, message);
-			network.write_notification(id.clone(), engine_id, message.clone());
+			network.write_notification(id.clone(), protocol.clone(), message.clone());
 		}
 	}
 }
@@ -148,19 +148,19 @@ pub struct ConsensusGossip<B: BlockT> {
 	peers: HashMap<PeerId, PeerConsensus<B::Hash>>,
 	messages: Vec<MessageEntry<B>>,
 	known_messages: LruCache<B::Hash, ()>,
-	engine_id: ConsensusEngineId,
+	protocol: Cow<'static, str>,
 	validator: Arc<dyn Validator<B>>,
 	next_broadcast: Instant,
 }
 
 impl<B: BlockT> ConsensusGossip<B> {
 	/// Create a new instance using the given validator.
-	pub fn new(validator: Arc<dyn Validator<B>>, engine_id: ConsensusEngineId) -> Self {
+	pub fn new(validator: Arc<dyn Validator<B>>, protocol: Cow<'static, str>) -> Self {
 		ConsensusGossip {
 			peers: HashMap::new(),
 			messages: Default::default(),
 			known_messages: LruCache::new(KNOWN_MESSAGES_CACHE_SIZE),
-			engine_id,
+			protocol,
 			validator,
 			next_broadcast: Instant::now() + REBROADCAST_INTERVAL,
 		}
@@ -235,7 +235,14 @@ impl<B: BlockT> ConsensusGossip<B> {
 	fn rebroadcast(&mut self, network: &mut dyn Network<B>) {
 		let messages = self.messages.iter()
 			.map(|entry| (&entry.message_hash, &entry.topic, &entry.message));
-		propagate(network, self.engine_id, messages, MessageIntent::PeriodicRebroadcast, &mut self.peers, &self.validator);
+		propagate(
+			network,
+			self.protocol.clone(),
+			messages,
+			MessageIntent::PeriodicRebroadcast,
+			&mut self.peers,
+			&self.validator
+		);
 	}
 
 	/// Broadcast all messages with given topic.
@@ -247,7 +254,7 @@ impl<B: BlockT> ConsensusGossip<B> {
 				} else { None }
 			);
 		let intent = if force { MessageIntent::ForcedBroadcast } else { MessageIntent::Broadcast };
-		propagate(network, self.engine_id, messages, intent, &mut self.peers, &self.validator);
+		propagate(network, self.protocol.clone(), messages, intent, &mut self.peers, &self.validator);
 	}
 
 	/// Prune old or no longer relevant consensus messages. Provide a predicate
@@ -374,7 +381,7 @@ impl<B: BlockT> ConsensusGossip<B> {
 				peer.known_messages.insert(entry.message_hash.clone());
 
 				trace!(target: "gossip", "Sending topic message to {}: {:?}", who, entry.message);
-				network.write_notification(who.clone(), self.engine_id, entry.message.clone());
+				network.write_notification(who.clone(), self.protocol.clone(), entry.message.clone());
 			}
 		}
 	}
@@ -390,7 +397,14 @@ impl<B: BlockT> ConsensusGossip<B> {
 		let message_hash = HashFor::<B>::hash(&message);
 		self.register_message_hashed(message_hash, topic, message.clone(), None);
 		let intent = if force { MessageIntent::ForcedBroadcast } else { MessageIntent::Broadcast };
-		propagate(network, self.engine_id, iter::once((&message_hash, &topic, &message)), intent, &mut self.peers, &self.validator);
+		propagate(
+			network,
+			self.protocol.clone(),
+			iter::once((&message_hash, &topic, &message)),
+			intent,
+			&mut self.peers,
+			&self.validator
+		);
 	}
 
 	/// Send addressed message to a peer. The message is not kept or multicast
@@ -411,7 +425,7 @@ impl<B: BlockT> ConsensusGossip<B> {
 		trace!(target: "gossip", "Sending direct to {}: {:?}", who, message);
 
 		peer.known_messages.insert(message_hash);
-		network.write_notification(who.clone(), self.engine_id, message);
+		network.write_notification(who.clone(), self.protocol.clone(), message);
 	}
 }
 
@@ -485,11 +499,11 @@ mod tests {
 			unimplemented!();
 		}
 
-		fn write_notification(&self, _: PeerId, _: ConsensusEngineId, _: Vec<u8>) {
+		fn write_notification(&self, _: PeerId, _: Cow<'static, str>, _: Vec<u8>) {
 			unimplemented!();
 		}
 
-		fn register_notifications_protocol(&self, _: ConsensusEngineId, _: Cow<'static, str>) {}
+		fn register_notifications_protocol(&self, _: Cow<'static, str>) {}
 
 		fn announce(&self, _: B::Hash, _: Vec<u8>) {
 			unimplemented!();
@@ -520,7 +534,7 @@ mod tests {
 
 		let prev_hash = H256::random();
 		let best_hash = H256::random();
-		let mut consensus = ConsensusGossip::<Block>::new(Arc::new(AllowAll), [0, 0, 0, 0]);
+		let mut consensus = ConsensusGossip::<Block>::new(Arc::new(AllowAll), "/foo".into());
 		let m1_hash = H256::random();
 		let m2_hash = H256::random();
 		let m1 = vec![1, 2, 3];
@@ -547,7 +561,7 @@ mod tests {
 
 	#[test]
 	fn message_stream_include_those_sent_before_asking() {
-		let mut consensus = ConsensusGossip::<Block>::new(Arc::new(AllowAll), [0, 0, 0, 0]);
+		let mut consensus = ConsensusGossip::<Block>::new(Arc::new(AllowAll), "/foo".into());
 
 		// Register message.
 		let message = vec![4, 5, 6];
@@ -562,7 +576,7 @@ mod tests {
 
 	#[test]
 	fn can_keep_multiple_messages_per_topic() {
-		let mut consensus = ConsensusGossip::<Block>::new(Arc::new(AllowAll), [0, 0, 0, 0]);
+		let mut consensus = ConsensusGossip::<Block>::new(Arc::new(AllowAll), "/foo".into());
 
 		let topic = [1; 32].into();
 		let msg_a = vec![1, 2, 3];
@@ -576,7 +590,7 @@ mod tests {
 
 	#[test]
 	fn peer_is_removed_on_disconnect() {
-		let mut consensus = ConsensusGossip::<Block>::new(Arc::new(AllowAll), [0, 0, 0, 0]);
+		let mut consensus = ConsensusGossip::<Block>::new(Arc::new(AllowAll), "/foo".into());
 
 		let mut network = NoOpNetwork::default();
 
@@ -592,7 +606,7 @@ mod tests {
 	fn on_incoming_ignores_discarded_messages() {
 		let to_forward = ConsensusGossip::<Block>::new(
 			Arc::new(DiscardAll),
-			[0, 0, 0, 0],
+			"/foo".into(),
 		).on_incoming(
 			&mut NoOpNetwork::default(),
 			PeerId::random(),
@@ -612,7 +626,7 @@ mod tests {
 
 		let to_forward = ConsensusGossip::<Block>::new(
 			Arc::new(AllowAll),
-			[0, 0, 0, 0],
+			"/foo".into(),
 		).on_incoming(
 			&mut network,
 			// Unregistered peer.
diff --git a/client/network/src/behaviour.rs b/client/network/src/behaviour.rs
index c8684eba625c..41723d9068c2 100644
--- a/client/network/src/behaviour.rs
+++ b/client/network/src/behaviour.rs
@@ -30,7 +30,7 @@ use libp2p::kad::record;
 use libp2p::swarm::{NetworkBehaviourAction, NetworkBehaviourEventProcess, PollParameters};
 use log::debug;
 use sp_consensus::{BlockOrigin, import_queue::{IncomingBlock, Origin}};
-use sp_runtime::{traits::{Block as BlockT, NumberFor}, ConsensusEngineId, Justification};
+use sp_runtime::{traits::{Block as BlockT, NumberFor}, Justification};
 use std::{
 	borrow::Cow,
 	collections::{HashSet, VecDeque},
@@ -131,7 +131,7 @@ pub enum BehaviourOut<B: BlockT> {
 		/// Node we opened the substream with.
 		remote: PeerId,
 		/// The concerned protocol. Each protocol uses a different substream.
-		engine_id: ConsensusEngineId,
+		protocol: Cow<'static, str>,
 		/// Object that permits sending notifications to the peer.
 		notifications_sink: NotificationsSink,
 		/// Role of the remote.
@@ -147,7 +147,7 @@ pub enum BehaviourOut<B: BlockT> {
 		/// Id of the peer we are connected to.
 		remote: PeerId,
 		/// The concerned protocol. Each protocol uses a different substream.
-		engine_id: ConsensusEngineId,
+		protocol: Cow<'static, str>,
 		/// Replacement for the previous [`NotificationsSink`].
 		notifications_sink: NotificationsSink,
 	},
@@ -158,7 +158,7 @@ pub enum BehaviourOut<B: BlockT> {
 		/// Node we closed the substream with.
 		remote: PeerId,
 		/// The concerned protocol. Each protocol uses a different substream.
-		engine_id: ConsensusEngineId,
+		protocol: Cow<'static, str>,
 	},
 
 	/// Received one or more messages from the given node using the given protocol.
@@ -166,7 +166,7 @@ pub enum BehaviourOut<B: BlockT> {
 		/// Node we received the message from.
 		remote: PeerId,
 		/// Concerned protocol and associated message.
-		messages: Vec<(ConsensusEngineId, Bytes)>,
+		messages: Vec<(Cow<'static, str>, Bytes)>,
 	},
 
 	/// Events generated by a DHT as a response to get_value or put_value requests as well as the
@@ -257,19 +257,20 @@ impl<B: BlockT, H: ExHashT> Behaviour<B, H> {
 	/// will retain the protocols that were registered then, and not any new one.
 	pub fn register_notifications_protocol(
 		&mut self,
-		engine_id: ConsensusEngineId,
-		protocol_name: impl Into<Cow<'static, str>>,
+		protocol: impl Into<Cow<'static, str>>,
 	) {
+		let protocol = protocol.into();
+
 		// This is the message that we will send to the remote as part of the initial handshake.
 		// At the moment, we force this to be an encoded `Roles`.
 		let handshake_message = Roles::from(&self.role).encode();
 
-		let list = self.substrate.register_notifications_protocol(engine_id, protocol_name, handshake_message);
+		let list = self.substrate.register_notifications_protocol(protocol.clone(), handshake_message);
 		for (remote, roles, notifications_sink) in list {
 			let role = reported_roles_to_observed_role(&self.role, remote, roles);
 			self.events.push_back(BehaviourOut::NotificationStreamOpened {
 				remote: remote.clone(),
-				engine_id,
+				protocol: protocol.clone(),
 				role,
 				notifications_sink: notifications_sink.clone(),
 			});
@@ -363,28 +364,28 @@ Behaviour<B, H> {
 			},
 			CustomMessageOutcome::NotificationStreamOpened { remote, protocols, roles, notifications_sink } => {
 				let role = reported_roles_to_observed_role(&self.role, &remote, roles);
-				for engine_id in protocols {
+				for protocol in protocols {
 					self.events.push_back(BehaviourOut::NotificationStreamOpened {
 						remote: remote.clone(),
-						engine_id,
+						protocol,
 						role: role.clone(),
 						notifications_sink: notifications_sink.clone(),
 					});
 				}
 			},
 			CustomMessageOutcome::NotificationStreamReplaced { remote, protocols, notifications_sink } =>
-				for engine_id in protocols {
+				for protocol in protocols {
 					self.events.push_back(BehaviourOut::NotificationStreamReplaced {
 						remote: remote.clone(),
-						engine_id,
+						protocol,
 						notifications_sink: notifications_sink.clone(),
 					});
 				},
 			CustomMessageOutcome::NotificationStreamClosed { remote, protocols } =>
-				for engine_id in protocols {
+				for protocol in protocols {
 					self.events.push_back(BehaviourOut::NotificationStreamClosed {
 						remote: remote.clone(),
-						engine_id,
+						protocol,
 					});
 				},
 			CustomMessageOutcome::NotificationsReceived { remote, messages } => {
diff --git a/client/network/src/config.rs b/client/network/src/config.rs
index 86450dc6e79b..db33623a2e33 100644
--- a/client/network/src/config.rs
+++ b/client/network/src/config.rs
@@ -41,7 +41,7 @@ use libp2p::{
 };
 use prometheus_endpoint::Registry;
 use sp_consensus::{block_validation::BlockAnnounceValidator, import_queue::ImportQueue};
-use sp_runtime::{traits::Block as BlockT, ConsensusEngineId};
+use sp_runtime::traits::Block as BlockT;
 use std::{borrow::Cow, convert::TryFrom, future::Future, pin::Pin, str::FromStr};
 use std::{
 	collections::HashMap,
@@ -400,9 +400,8 @@ pub struct NetworkConfiguration {
 	pub boot_nodes: Vec<MultiaddrWithPeerId>,
 	/// The node key configuration, which determines the node's network identity keypair.
 	pub node_key: NodeKeyConfig,
-	/// List of notifications protocols that the node supports. Must also include a
-	/// `ConsensusEngineId` for backwards-compatibility.
-	pub notifications_protocols: Vec<(ConsensusEngineId, Cow<'static, str>)>,
+	/// List of names of notifications protocols that the node supports.
+	pub notifications_protocols: Vec<Cow<'static, str>>,
 	/// List of request-response protocols that the node supports.
 	pub request_response_protocols: Vec<RequestResponseConfig>,
 	/// Maximum allowed number of incoming connections.
diff --git a/client/network/src/gossip.rs b/client/network/src/gossip.rs
index 9d20229288a4..ac3f92e9d37a 100644
--- a/client/network/src/gossip.rs
+++ b/client/network/src/gossip.rs
@@ -53,8 +53,9 @@ use async_std::sync::{Mutex, MutexGuard};
 use futures::prelude::*;
 use futures::channel::mpsc::{channel, Receiver, Sender};
 use libp2p::PeerId;
-use sp_runtime::{traits::Block as BlockT, ConsensusEngineId};
+use sp_runtime::traits::Block as BlockT;
 use std::{
+	borrow::Cow,
 	collections::VecDeque,
 	fmt,
 	sync::Arc,
@@ -82,7 +83,7 @@ impl<M> QueuedSender<M> {
 	pub fn new<B, H, F>(
 		service: Arc<NetworkService<B, H>>,
 		peer_id: PeerId,
-		protocol: ConsensusEngineId,
+		protocol: Cow<'static, str>,
 		queue_size_limit: usize,
 		messages_encode: F
 	) -> (Self, impl Future<Output = ()> + Send + 'static)
@@ -193,7 +194,7 @@ async fn create_background_future<B: BlockT, H: ExHashT, M, F: Fn(M) -> Vec<u8>>
 	mut wait_for_sender: Receiver<()>,
 	service: Arc<NetworkService<B, H>>,
 	peer_id: PeerId,
-	protocol: ConsensusEngineId,
+	protocol: Cow<'static, str>,
 	shared_message_queue: SharedMessageQueue<M>,
 	messages_encode: F,
 ) {
@@ -212,7 +213,7 @@ async fn create_background_future<B: BlockT, H: ExHashT, M, F: Fn(M) -> Vec<u8>>
 
 			// Starting from below, we try to send the message. If an error happens when sending,
 			// the only sane option we have is to silently discard the message.
-			let sender = match service.notification_sender(peer_id.clone(), protocol) {
+			let sender = match service.notification_sender(peer_id.clone(), protocol.clone()) {
 				Ok(s) => s,
 				Err(_) => continue,
 			};
diff --git a/client/network/src/gossip/tests.rs b/client/network/src/gossip/tests.rs
index 0f01ed81bffc..e94052c0e4d2 100644
--- a/client/network/src/gossip/tests.rs
+++ b/client/network/src/gossip/tests.rs
@@ -20,7 +20,7 @@ use crate::{config, gossip::QueuedSender, Event, NetworkService, NetworkWorker};
 
 use futures::prelude::*;
 use sp_runtime::traits::{Block as BlockT, Header as _};
-use std::{sync::Arc, time::Duration};
+use std::{borrow::Cow, sync::Arc, time::Duration};
 use substrate_test_runtime_client::{TestClientBuilder, TestClientBuilderExt as _};
 
 type TestNetworkService = NetworkService<
@@ -120,24 +120,24 @@ fn build_test_full_node(config: config::NetworkConfiguration)
 	(service, event_stream)
 }
 
-const ENGINE_ID: sp_runtime::ConsensusEngineId = *b"foo\0";
+const PROTOCOL_NAME: Cow<'static, str> = Cow::Borrowed("/foo");
 
 /// Builds two nodes and their associated events stream.
-/// The nodes are connected together and have the `ENGINE_ID` protocol registered.
+/// The nodes are connected together and have the `PROTOCOL_NAME` protocol registered.
 fn build_nodes_one_proto()
 	-> (Arc<TestNetworkService>, impl Stream<Item = Event>, Arc<TestNetworkService>, impl Stream<Item = Event>)
 {
 	let listen_addr = config::build_multiaddr![Memory(rand::random::<u64>())];
 
 	let (node1, events_stream1) = build_test_full_node(config::NetworkConfiguration {
-		notifications_protocols: vec![(ENGINE_ID, From::from("/foo"))],
+		notifications_protocols: vec![PROTOCOL_NAME],
 		listen_addresses: vec![listen_addr.clone()],
 		transport: config::TransportConfig::MemoryOnly,
 		.. config::NetworkConfiguration::new_local()
 	});
 
 	let (node2, events_stream2) = build_test_full_node(config::NetworkConfiguration {
-		notifications_protocols: vec![(ENGINE_ID, From::from("/foo"))],
+		notifications_protocols: vec![PROTOCOL_NAME],
 		listen_addresses: vec![],
 		reserved_nodes: vec![config::MultiaddrWithPeerId {
 			multiaddr: listen_addr,
@@ -165,7 +165,7 @@ fn basic_works() {
 				Event::NotificationStreamClosed { .. } => panic!(),
 				Event::NotificationsReceived { messages, .. } => {
 					for message in messages {
-						assert_eq!(message.0, ENGINE_ID);
+						assert_eq!(message.0, PROTOCOL_NAME);
 						assert_eq!(message.1, &b"message"[..]);
 						received_notifications += 1;
 					}
@@ -181,7 +181,7 @@ fn basic_works() {
 
 	async_std::task::block_on(async move {
 		let (mut sender, bg_future) =
-			QueuedSender::new(node1, node2_id, ENGINE_ID, NUM_NOTIFS, |msg| msg);
+			QueuedSender::new(node1, node2_id, PROTOCOL_NAME, NUM_NOTIFS, |msg| msg);
 		async_std::task::spawn(bg_future);
 
 		// Wait for the `NotificationStreamOpened`.
diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index 9403e471b0f2..d0b6b2823a2c 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -37,7 +37,7 @@ use sp_consensus::{
 	import_queue::{BlockImportResult, BlockImportError, IncomingBlock, Origin}
 };
 use codec::{Decode, DecodeAll, Encode};
-use sp_runtime::{generic::BlockId, ConsensusEngineId, Justification};
+use sp_runtime::{generic::BlockId, Justification};
 use sp_runtime::traits::{
 	Block as BlockT, Header as HeaderT, NumberFor, Zero, CheckedSub
 };
@@ -231,8 +231,8 @@ pub struct Protocol<B: BlockT, H: ExHashT> {
 	transaction_pool: Arc<dyn TransactionPool<H, B>>,
 	/// Handles opening the unique substream and sending and receiving raw messages.
 	behaviour: GenericProto,
-	/// For each legacy gossiping engine ID, the corresponding new protocol name.
-	protocol_name_by_engine: HashMap<ConsensusEngineId, Cow<'static, str>>,
+	/// List of notifications protocols that have been registered.
+	notification_protocols: Vec<Cow<'static, str>>,
 	/// For each protocol name, the legacy equivalent.
 	legacy_equiv_by_name: HashMap<Cow<'static, str>, Fallback>,
 	/// Name of the protocol used for transactions.
@@ -252,6 +252,7 @@ struct PacketStats {
 	count_in: u64,
 	count_out: u64,
 }
+
 /// Peer information
 #[derive(Debug, Clone)]
 struct Peer<B: BlockT, H: ExHashT> {
@@ -349,8 +350,8 @@ fn build_status_message<B: BlockT>(protocol_config: &ProtocolConfig, chain: &Arc
 /// Fallback mechanism to use to send a notification if no substream is open.
 #[derive(Debug, Clone, PartialEq, Eq)]
 enum Fallback {
-	/// Use a `Message::Consensus` with the given engine ID.
-	Consensus(ConsensusEngineId),
+	/// Formerly-known as `Consensus` messages. Now regular notifications.
+	Consensus,
 	/// The message is the bytes encoding of a `Transactions<E>` (which is itself defined as a `Vec<E>`).
 	Transactions,
 	/// The message is the bytes encoding of a `BlockAnnounce<H>`.
@@ -446,7 +447,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 			transaction_pool,
 			peerset_handle: peerset_handle.clone(),
 			behaviour,
-			protocol_name_by_engine: HashMap::new(),
+			notification_protocols: Vec::new(),
 			legacy_equiv_by_name,
 			transactions_protocol,
 			block_announces_protocol,
@@ -621,7 +622,9 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 			GenericMessage::RemoteCallRequest(_) |
 			GenericMessage::RemoteReadRequest(_) |
 			GenericMessage::RemoteHeaderRequest(_) |
-			GenericMessage::RemoteChangesRequest(_) => {
+			GenericMessage::RemoteChangesRequest(_) |
+			GenericMessage::Consensus(_) |
+			GenericMessage::ConsensusBatch(_) => {
 				debug!(
 					target: "sub-libp2p",
 					"Received no longer supported legacy request from {:?}",
@@ -630,38 +633,6 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 				self.disconnect_peer(&who);
 				self.peerset_handle.report_peer(who, rep::BAD_PROTOCOL);
 			},
-			GenericMessage::Consensus(msg) =>
-				return if self.protocol_name_by_engine.contains_key(&msg.engine_id) {
-					CustomMessageOutcome::NotificationsReceived {
-						remote: who,
-						messages: vec![(msg.engine_id, From::from(msg.data))],
-					}
-				} else {
-					debug!(target: "sync", "Received message on non-registered protocol: {:?}", msg.engine_id);
-					CustomMessageOutcome::None
-				},
-			GenericMessage::ConsensusBatch(messages) => {
-				let messages = messages
-					.into_iter()
-					.filter_map(|msg| {
-						if self.protocol_name_by_engine.contains_key(&msg.engine_id) {
-							Some((msg.engine_id, From::from(msg.data)))
-						} else {
-							debug!(target: "sync", "Received message on non-registered protocol: {:?}", msg.engine_id);
-							None
-						}
-					})
-					.collect::<Vec<_>>();
-
-				return if !messages.is_empty() {
-					CustomMessageOutcome::NotificationsReceived {
-						remote: who,
-						messages,
-					}
-				} else {
-					CustomMessageOutcome::None
-				};
-			},
 		}
 
 		CustomMessageOutcome::None
@@ -685,7 +656,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 			// Notify all the notification protocols as closed.
 			CustomMessageOutcome::NotificationStreamClosed {
 				remote: peer,
-				protocols: self.protocol_name_by_engine.keys().cloned().collect(),
+				protocols: self.notification_protocols.clone(),
 			}
 		} else {
 			CustomMessageOutcome::None
@@ -939,7 +910,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 		// Notify all the notification protocols as open.
 		CustomMessageOutcome::NotificationStreamOpened {
 			remote: who,
-			protocols: self.protocol_name_by_engine.keys().cloned().collect(),
+			protocols: self.notification_protocols.clone(),
 			roles: info.roles,
 			notifications_sink,
 		}
@@ -952,16 +923,17 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 	/// returns a list of substreams to open as a result.
 	pub fn register_notifications_protocol<'a>(
 		&'a mut self,
-		engine_id: ConsensusEngineId,
-		protocol_name: impl Into<Cow<'static, str>>,
+		protocol: impl Into<Cow<'static, str>>,
 		handshake_message: Vec<u8>,
 	) -> impl Iterator<Item = (&'a PeerId, Roles, &'a NotificationsSink)> + 'a {
-		let protocol_name = protocol_name.into();
-		if self.protocol_name_by_engine.insert(engine_id, protocol_name.clone()).is_some() {
-			error!(target: "sub-libp2p", "Notifications protocol already registered: {:?}", protocol_name);
+		let protocol = protocol.into();
+
+		if self.notification_protocols.iter().any(|p| *p == protocol) {
+			error!(target: "sub-libp2p", "Notifications protocol already registered: {:?}", protocol);
 		} else {
-			self.behaviour.register_notif_protocol(protocol_name.clone(), handshake_message);
-			self.legacy_equiv_by_name.insert(protocol_name, Fallback::Consensus(engine_id));
+			self.notification_protocols.push(protocol.clone());
+			self.behaviour.register_notif_protocol(protocol.clone(), handshake_message);
+			self.legacy_equiv_by_name.insert(protocol, Fallback::Consensus);
 		}
 
 		let behaviour = &self.behaviour;
@@ -1450,20 +1422,20 @@ pub enum CustomMessageOutcome<B: BlockT> {
 	/// Notification protocols have been opened with a remote.
 	NotificationStreamOpened {
 		remote: PeerId,
-		protocols: Vec<ConsensusEngineId>,
+		protocols: Vec<Cow<'static, str>>,
 		roles: Roles,
 		notifications_sink: NotificationsSink
 	},
 	/// The [`NotificationsSink`] of some notification protocols need an update.
 	NotificationStreamReplaced {
 		remote: PeerId,
-		protocols: Vec<ConsensusEngineId>,
+		protocols: Vec<Cow<'static, str>>,
 		notifications_sink: NotificationsSink,
 	},
 	/// Notification protocols have been closed with a remote.
-	NotificationStreamClosed { remote: PeerId, protocols: Vec<ConsensusEngineId> },
+	NotificationStreamClosed { remote: PeerId, protocols: Vec<Cow<'static, str>> },
 	/// Messages have been received on one or more notifications protocols.
-	NotificationsReceived { remote: PeerId, messages: Vec<(ConsensusEngineId, Bytes)> },
+	NotificationsReceived { remote: PeerId, messages: Vec<(Cow<'static, str>, Bytes)> },
 	/// A new block request must be emitted.
 	/// You must later call either [`Protocol::on_block_response`] or
 	/// [`Protocol::on_block_request_failed`].
@@ -1664,7 +1636,7 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 			GenericProtoOut::CustomProtocolReplaced { peer_id, notifications_sink, .. } => {
 				CustomMessageOutcome::NotificationStreamReplaced {
 					remote: peer_id,
-					protocols: self.protocol_name_by_engine.keys().cloned().collect(),
+					protocols: self.notification_protocols.clone(),
 					notifications_sink,
 				}
 			},
@@ -1675,10 +1647,10 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 				self.on_custom_message(peer_id, message),
 			GenericProtoOut::Notification { peer_id, protocol_name, message } =>
 				match self.legacy_equiv_by_name.get(&protocol_name) {
-					Some(Fallback::Consensus(engine_id)) => {
+					Some(Fallback::Consensus) => {
 						CustomMessageOutcome::NotificationsReceived {
 							remote: peer_id,
-							messages: vec![(*engine_id, message.freeze())],
+							messages: vec![(protocol_name, message.freeze())],
 						}
 					}
 					Some(Fallback::Transactions) => {
diff --git a/client/network/src/protocol/event.rs b/client/network/src/protocol/event.rs
index 637bf805b502..86cb93bef26d 100644
--- a/client/network/src/protocol/event.rs
+++ b/client/network/src/protocol/event.rs
@@ -20,7 +20,7 @@
 use bytes::Bytes;
 use libp2p::core::PeerId;
 use libp2p::kad::record::Key;
-use sp_runtime::ConsensusEngineId;
+use std::borrow::Cow;
 
 /// Events generated by DHT as a response to get_value and put_value requests.
 #[derive(Debug, Clone)]
@@ -53,7 +53,7 @@ pub enum Event {
 		/// Node we opened the substream with.
 		remote: PeerId,
 		/// The concerned protocol. Each protocol uses a different substream.
-		engine_id: ConsensusEngineId,
+		protocol: Cow<'static, str>,
 		/// Role of the remote.
 		role: ObservedRole,
 	},
@@ -64,7 +64,7 @@ pub enum Event {
 		/// Node we closed the substream with.
 		remote: PeerId,
 		/// The concerned protocol. Each protocol uses a different substream.
-		engine_id: ConsensusEngineId,
+		protocol: Cow<'static, str>,
 	},
 
 	/// Received one or more messages from the given node using the given protocol.
@@ -72,7 +72,7 @@ pub enum Event {
 		/// Node we received the message from.
 		remote: PeerId,
 		/// Concerned protocol and associated message.
-		messages: Vec<(ConsensusEngineId, Bytes)>,
+		messages: Vec<(Cow<'static, str>, Bytes)>,
 	},
 }
 
diff --git a/client/network/src/protocol/message.rs b/client/network/src/protocol/message.rs
index 1cd78c0ed1dd..dae7b86db877 100644
--- a/client/network/src/protocol/message.rs
+++ b/client/network/src/protocol/message.rs
@@ -216,7 +216,7 @@ pub mod generic {
 	#[derive(Debug, PartialEq, Eq, Clone, Encode, Decode)]
 	pub struct ConsensusMessage {
 		/// Identifies consensus engine.
-		pub engine_id: ConsensusEngineId,
+		pub protocol: ConsensusEngineId,
 		/// Message payload.
 		pub data: Vec<u8>,
 	}
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 5fc8485947ff..3296a97d71bb 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -53,10 +53,7 @@ use metrics::{Metrics, MetricSources, Histogram, HistogramVec};
 use parking_lot::Mutex;
 use sc_peerset::PeersetHandle;
 use sp_consensus::import_queue::{BlockImportError, BlockImportResult, ImportQueue, Link};
-use sp_runtime::{
-	traits::{Block as BlockT, NumberFor},
-	ConsensusEngineId,
-};
+use sp_runtime::traits::{Block as BlockT, NumberFor};
 use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use std::{
 	borrow::Cow,
@@ -100,9 +97,7 @@ pub struct NetworkService<B: BlockT + 'static, H: ExHashT> {
 	to_worker: TracingUnboundedSender<ServiceToWorkerMsg<B, H>>,
 	/// For each peer and protocol combination, an object that allows sending notifications to
 	/// that peer. Updated by the [`NetworkWorker`].
-	peers_notifications_sinks: Arc<Mutex<HashMap<(PeerId, ConsensusEngineId), NotificationsSink>>>,
-	/// For each legacy gossiping engine ID, the corresponding new protocol name.
-	protocol_name_by_engine: Mutex<HashMap<ConsensusEngineId, Cow<'static, str>>>,
+	peers_notifications_sinks: Arc<Mutex<HashMap<(PeerId, Cow<'static, str>), NotificationsSink>>>,
 	/// Field extracted from the [`Metrics`] struct and necessary to report the
 	/// notifications-related metrics.
 	notifications_sizes_metric: Option<HistogramVec>,
@@ -331,8 +326,8 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 				}
 			};
 
-			for (engine_id, protocol_name) in &params.network_config.notifications_protocols {
-				behaviour.register_notifications_protocol(*engine_id, protocol_name.clone());
+			for protocol in &params.network_config.notifications_protocols {
+				behaviour.register_notifications_protocol(protocol.clone());
 			}
 			let (transport, bandwidth) = {
 				let (config_mem, config_wasm) = match params.network_config.transport {
@@ -384,9 +379,6 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 
 		let external_addresses = Arc::new(Mutex::new(Vec::new()));
 		let peers_notifications_sinks = Arc::new(Mutex::new(HashMap::new()));
-		let protocol_name_by_engine = Mutex::new({
-			params.network_config.notifications_protocols.iter().cloned().collect()
-		});
 
 		let service = Arc::new(NetworkService {
 			bandwidth,
@@ -397,7 +389,6 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 			local_peer_id,
 			to_worker,
 			peers_notifications_sinks: peers_notifications_sinks.clone(),
-			protocol_name_by_engine,
 			notifications_sizes_metric:
 				metrics.as_ref().map(|metrics| metrics.notifications_sizes.clone()),
 			_marker: PhantomData,
@@ -640,40 +631,32 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	/// The protocol must have been registered with `register_notifications_protocol` or
 	/// [`NetworkConfiguration::notifications_protocols`](crate::config::NetworkConfiguration::notifications_protocols).
 	///
-	pub fn write_notification(&self, target: PeerId, engine_id: ConsensusEngineId, message: Vec<u8>) {
+	pub fn write_notification(&self, target: PeerId, protocol: Cow<'static, str>, message: Vec<u8>) {
 		// We clone the `NotificationsSink` in order to be able to unlock the network-wide
 		// `peers_notifications_sinks` mutex as soon as possible.
 		let sink = {
 			let peers_notifications_sinks = self.peers_notifications_sinks.lock();
-			if let Some(sink) = peers_notifications_sinks.get(&(target, engine_id)) {
+			if let Some(sink) = peers_notifications_sinks.get(&(target, protocol.clone())) {
 				sink.clone()
 			} else {
 				// Notification silently discarded, as documented.
+				log::error!(
+					target: "sub-libp2p",
+					"Attempted to send notification on unknown protocol: {:?}",
+					protocol,
+				);
 				return;
 			}
 		};
 
-		// Used later for the metrics report.
-		let message_len = message.len();
-
-		// Determine the wire protocol name corresponding to this `engine_id`.
-		let protocol_name = self.protocol_name_by_engine.lock().get(&engine_id).cloned();
-		if let Some(protocol_name) = protocol_name {
-			sink.send_sync_notification(protocol_name, message);
-		} else {
-			log::error!(
-				target: "sub-libp2p",
-				"Attempted to send notification on unknown protocol: {:?}",
-				engine_id,
-			);
-			return;
-		}
-
 		if let Some(notifications_sizes_metric) = self.notifications_sizes_metric.as_ref() {
 			notifications_sizes_metric
-				.with_label_values(&["out", &maybe_utf8_bytes_to_string(&engine_id)])
-				.observe(message_len as f64);
+				.with_label_values(&["out", &protocol])
+				.observe(message.len() as f64);
 		}
+
+		// Sending is communicated to the `NotificationsSink`.
+		sink.send_sync_notification(protocol, message);
 	}
 
 	/// Obtains a [`NotificationSender`] for a connected peer, if it exists.
@@ -746,31 +729,27 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	pub fn notification_sender(
 		&self,
 		target: PeerId,
-		engine_id: ConsensusEngineId,
+		protocol: Cow<'static, str>,
 	) -> Result<NotificationSender, NotificationSenderError> {
 		// We clone the `NotificationsSink` in order to be able to unlock the network-wide
 		// `peers_notifications_sinks` mutex as soon as possible.
 		let sink = {
 			let peers_notifications_sinks = self.peers_notifications_sinks.lock();
-			if let Some(sink) = peers_notifications_sinks.get(&(target, engine_id)) {
+			if let Some(sink) = peers_notifications_sinks.get(&(target, protocol.clone())) {
 				sink.clone()
 			} else {
 				return Err(NotificationSenderError::Closed);
 			}
 		};
 
-		// Determine the wire protocol name corresponding to this `engine_id`.
-		let protocol_name = match self.protocol_name_by_engine.lock().get(&engine_id).cloned() {
-			Some(p) => p,
-			None => return Err(NotificationSenderError::BadProtocol),
-		};
+		let notification_size_metric = self.notifications_sizes_metric.as_ref().map(|histogram| {
+			histogram.with_label_values(&["out", &protocol])
+		});
 
 		Ok(NotificationSender {
 			sink,
-			protocol_name,
-			notification_size_metric: self.notifications_sizes_metric.as_ref().map(|histogram| {
-				histogram.with_label_values(&["out", &maybe_utf8_bytes_to_string(&engine_id)])
-			}),
+			protocol_name: protocol,
+			notification_size_metric,
 		})
 	}
 
@@ -841,17 +820,13 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	///
 	/// Please call `event_stream` before registering a protocol, otherwise you may miss events
 	/// about the protocol that you have registered.
-	// TODO: remove this method after https://github.com/paritytech/substrate/issues/4587
+	// TODO: remove this method after https://github.com/paritytech/substrate/issues/6827
 	pub fn register_notifications_protocol(
 		&self,
-		engine_id: ConsensusEngineId,
 		protocol_name: impl Into<Cow<'static, str>>,
 	) {
-		let protocol_name = protocol_name.into();
-		self.protocol_name_by_engine.lock().insert(engine_id, protocol_name.clone());
 		let _ = self.to_worker.unbounded_send(ServiceToWorkerMsg::RegisterNotifProtocol {
-			engine_id,
-			protocol_name,
+			protocol_name: protocol_name.into(),
 		});
 	}
 
@@ -1209,7 +1184,6 @@ enum ServiceToWorkerMsg<B: BlockT, H: ExHashT> {
 		pending_response: oneshot::Sender<Result<Vec<u8>, RequestFailure>>,
 	},
 	RegisterNotifProtocol {
-		engine_id: ConsensusEngineId,
 		protocol_name: Cow<'static, str>,
 	},
 	DisconnectPeer(PeerId),
@@ -1253,7 +1227,7 @@ pub struct NetworkWorker<B: BlockT + 'static, H: ExHashT> {
 	>,
 	/// For each peer and protocol combination, an object that allows sending notifications to
 	/// that peer. Shared with the [`NetworkService`].
-	peers_notifications_sinks: Arc<Mutex<HashMap<(PeerId, ConsensusEngineId), NotificationsSink>>>,
+	peers_notifications_sinks: Arc<Mutex<HashMap<(PeerId, Cow<'static, str>), NotificationsSink>>>,
 }
 
 impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
@@ -1347,10 +1321,8 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 						},
 					}
 				},
-				ServiceToWorkerMsg::RegisterNotifProtocol { engine_id, protocol_name } => {
-					this.network_service
-						.register_notifications_protocol(engine_id, protocol_name);
-				},
+				ServiceToWorkerMsg::RegisterNotifProtocol { protocol_name } =>
+					this.network_service.register_notifications_protocol(protocol_name),
 				ServiceToWorkerMsg::DisconnectPeer(who) =>
 					this.network_service.user_protocol_mut().disconnect_peer(&who),
 				ServiceToWorkerMsg::UpdateChain =>
@@ -1474,24 +1446,28 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 							.inc();
 					}
 				},
-				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::NotificationStreamOpened { remote, engine_id, notifications_sink, role })) => {
+				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::NotificationStreamOpened {
+					remote, protocol, notifications_sink, role
+				})) => {
 					if let Some(metrics) = this.metrics.as_ref() {
 						metrics.notifications_streams_opened_total
-							.with_label_values(&[&maybe_utf8_bytes_to_string(&engine_id)]).inc();
+							.with_label_values(&[&protocol]).inc();
 					}
 					{
 						let mut peers_notifications_sinks = this.peers_notifications_sinks.lock();
-						peers_notifications_sinks.insert((remote.clone(), engine_id), notifications_sink);
+						peers_notifications_sinks.insert((remote.clone(), protocol.clone()), notifications_sink);
 					}
 					this.event_streams.send(Event::NotificationStreamOpened {
 						remote,
-						engine_id,
+						protocol,
 						role,
 					});
 				},
-				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::NotificationStreamReplaced { remote, engine_id, notifications_sink })) => {
+				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::NotificationStreamReplaced {
+					remote, protocol, notifications_sink
+				})) => {
 					let mut peers_notifications_sinks = this.peers_notifications_sinks.lock();
-					if let Some(s) = peers_notifications_sinks.get_mut(&(remote, engine_id)) {
+					if let Some(s) = peers_notifications_sinks.get_mut(&(remote, protocol)) {
 						*s = notifications_sink;
 					} else {
 						log::error!(
@@ -1513,33 +1489,33 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 					// https://github.com/paritytech/substrate/issues/6403.
 					/*this.event_streams.send(Event::NotificationStreamClosed {
 						remote,
-						engine_id,
+						protocol,
 					});
 					this.event_streams.send(Event::NotificationStreamOpened {
 						remote,
-						engine_id,
+						protocol,
 						role,
 					});*/
 				},
-				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::NotificationStreamClosed { remote, engine_id })) => {
+				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::NotificationStreamClosed { remote, protocol })) => {
 					if let Some(metrics) = this.metrics.as_ref() {
 						metrics.notifications_streams_closed_total
-							.with_label_values(&[&maybe_utf8_bytes_to_string(&engine_id[..])]).inc();
+							.with_label_values(&[&protocol[..]]).inc();
 					}
 					this.event_streams.send(Event::NotificationStreamClosed {
 						remote: remote.clone(),
-						engine_id,
+						protocol: protocol.clone(),
 					});
 					{
 						let mut peers_notifications_sinks = this.peers_notifications_sinks.lock();
-						peers_notifications_sinks.remove(&(remote.clone(), engine_id));
+						peers_notifications_sinks.remove(&(remote.clone(), protocol));
 					}
 				},
 				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::NotificationsReceived { remote, messages })) => {
 					if let Some(metrics) = this.metrics.as_ref() {
-						for (engine_id, message) in &messages {
+						for (protocol, message) in &messages {
 							metrics.notifications_sizes
-								.with_label_values(&["in", &maybe_utf8_bytes_to_string(engine_id)])
+								.with_label_values(&["in", protocol])
 								.observe(message.len() as f64);
 						}
 					}
@@ -1748,17 +1724,6 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 impl<B: BlockT + 'static, H: ExHashT> Unpin for NetworkWorker<B, H> {
 }
 
-/// Turns bytes that are potentially UTF-8 into a reasonable representable string.
-///
-/// Meant to be used only for debugging or metrics-reporting purposes.
-pub(crate) fn maybe_utf8_bytes_to_string(id: &[u8]) -> Cow<str> {
-	if let Ok(s) = std::str::from_utf8(&id[..]) {
-		Cow::Borrowed(s)
-	} else {
-		Cow::Owned(format!("{:?}", id))
-	}
-}
-
 /// The libp2p swarm, customized for our needs.
 type Swarm<B, H> = libp2p::swarm::Swarm<Behaviour<B, H>>;
 
diff --git a/client/network/src/service/out_events.rs b/client/network/src/service/out_events.rs
index 1b86a5fa4317..976548f6ed44 100644
--- a/client/network/src/service/out_events.rs
+++ b/client/network/src/service/out_events.rs
@@ -33,7 +33,6 @@
 //!
 
 use crate::Event;
-use super::maybe_utf8_bytes_to_string;
 
 use futures::{prelude::*, channel::mpsc, ready, stream::FusedStream};
 use parking_lot::Mutex;
@@ -228,23 +227,23 @@ impl Metrics {
 					.with_label_values(&["dht", "sent", name])
 					.inc_by(num);
 			}
-			Event::NotificationStreamOpened { engine_id, .. } => {
+			Event::NotificationStreamOpened { protocol, .. } => {
 				self.events_total
-					.with_label_values(&[&format!("notif-open-{:?}", engine_id), "sent", name])
+					.with_label_values(&[&format!("notif-open-{:?}", protocol), "sent", name])
 					.inc_by(num);
 			},
-			Event::NotificationStreamClosed { engine_id, .. } => {
+			Event::NotificationStreamClosed { protocol, .. } => {
 				self.events_total
-					.with_label_values(&[&format!("notif-closed-{:?}", engine_id), "sent", name])
+					.with_label_values(&[&format!("notif-closed-{:?}", protocol), "sent", name])
 					.inc_by(num);
 			},
 			Event::NotificationsReceived { messages, .. } => {
-				for (engine_id, message) in messages {
+				for (protocol, message) in messages {
 					self.events_total
-						.with_label_values(&[&format!("notif-{:?}", engine_id), "sent", name])
+						.with_label_values(&[&format!("notif-{:?}", protocol), "sent", name])
 						.inc_by(num);
 					self.notifications_sizes
-						.with_label_values(&[&maybe_utf8_bytes_to_string(engine_id), "sent", name])
+						.with_label_values(&[protocol, "sent", name])
 						.inc_by(num.saturating_mul(u64::try_from(message.len()).unwrap_or(u64::max_value())));
 				}
 			},
@@ -258,23 +257,23 @@ impl Metrics {
 					.with_label_values(&["dht", "received", name])
 					.inc();
 			}
-			Event::NotificationStreamOpened { engine_id, .. } => {
+			Event::NotificationStreamOpened { protocol, .. } => {
 				self.events_total
-					.with_label_values(&[&format!("notif-open-{:?}", engine_id), "received", name])
+					.with_label_values(&[&format!("notif-open-{:?}", protocol), "received", name])
 					.inc();
 			},
-			Event::NotificationStreamClosed { engine_id, .. } => {
+			Event::NotificationStreamClosed { protocol, .. } => {
 				self.events_total
-					.with_label_values(&[&format!("notif-closed-{:?}", engine_id), "received", name])
+					.with_label_values(&[&format!("notif-closed-{:?}", protocol), "received", name])
 					.inc();
 			},
 			Event::NotificationsReceived { messages, .. } => {
-				for (engine_id, message) in messages {
+				for (protocol, message) in messages {
 					self.events_total
-						.with_label_values(&[&format!("notif-{:?}", engine_id), "received", name])
+						.with_label_values(&[&format!("notif-{:?}", protocol), "received", name])
 						.inc();
 					self.notifications_sizes
-						.with_label_values(&[&maybe_utf8_bytes_to_string(engine_id), "received", name])
+						.with_label_values(&[&protocol, "received", name])
 						.inc_by(u64::try_from(message.len()).unwrap_or(u64::max_value()));
 				}
 			},
diff --git a/client/network/src/service/tests.rs b/client/network/src/service/tests.rs
index 4b6f9dd15648..76a924748ad2 100644
--- a/client/network/src/service/tests.rs
+++ b/client/network/src/service/tests.rs
@@ -21,7 +21,7 @@ use crate::{config, Event, NetworkService, NetworkWorker};
 use libp2p::PeerId;
 use futures::prelude::*;
 use sp_runtime::traits::{Block as BlockT, Header as _};
-use std::{sync::Arc, time::Duration};
+use std::{borrow::Cow, sync::Arc, time::Duration};
 use substrate_test_runtime_client::{TestClientBuilder, TestClientBuilderExt as _};
 
 type TestNetworkService = NetworkService<
@@ -121,24 +121,24 @@ fn build_test_full_node(config: config::NetworkConfiguration)
 	(service, event_stream)
 }
 
-const ENGINE_ID: sp_runtime::ConsensusEngineId = *b"foo\0";
+const PROTOCOL_NAME: Cow<'static, str> = Cow::Borrowed("/foo");
 
 /// Builds two nodes and their associated events stream.
-/// The nodes are connected together and have the `ENGINE_ID` protocol registered.
+/// The nodes are connected together and have the `PROTOCOL_NAME` protocol registered.
 fn build_nodes_one_proto()
 	-> (Arc<TestNetworkService>, impl Stream<Item = Event>, Arc<TestNetworkService>, impl Stream<Item = Event>)
 {
 	let listen_addr = config::build_multiaddr![Memory(rand::random::<u64>())];
 
 	let (node1, events_stream1) = build_test_full_node(config::NetworkConfiguration {
-		notifications_protocols: vec![(ENGINE_ID, From::from("/foo"))],
+		notifications_protocols: vec![PROTOCOL_NAME],
 		listen_addresses: vec![listen_addr.clone()],
 		transport: config::TransportConfig::MemoryOnly,
 		.. config::NetworkConfiguration::new_local()
 	});
 
 	let (node2, events_stream2) = build_test_full_node(config::NetworkConfiguration {
-		notifications_protocols: vec![(ENGINE_ID, From::from("/foo"))],
+		notifications_protocols: vec![PROTOCOL_NAME],
 		listen_addresses: vec![],
 		reserved_nodes: vec![config::MultiaddrWithPeerId {
 			multiaddr: listen_addr,
@@ -161,10 +161,10 @@ fn notifications_state_consistent() {
 
 	// Write some initial notifications that shouldn't get through.
 	for _ in 0..(rand::random::<u8>() % 5) {
-		node1.write_notification(node2.local_peer_id().clone(), ENGINE_ID, b"hello world".to_vec());
+		node1.write_notification(node2.local_peer_id().clone(), PROTOCOL_NAME, b"hello world".to_vec());
 	}
 	for _ in 0..(rand::random::<u8>() % 5) {
-		node2.write_notification(node1.local_peer_id().clone(), ENGINE_ID, b"hello world".to_vec());
+		node2.write_notification(node1.local_peer_id().clone(), PROTOCOL_NAME, b"hello world".to_vec());
 	}
 
 	async_std::task::block_on(async move {
@@ -187,10 +187,10 @@ fn notifications_state_consistent() {
 			// Start by sending a notification from node1 to node2 and vice-versa. Part of the
 			// test consists in ensuring that notifications get ignored if the stream isn't open.
 			if rand::random::<u8>() % 5 >= 3 {
-				node1.write_notification(node2.local_peer_id().clone(), ENGINE_ID, b"hello world".to_vec());
+				node1.write_notification(node2.local_peer_id().clone(), PROTOCOL_NAME, b"hello world".to_vec());
 			}
 			if rand::random::<u8>() % 5 >= 3 {
-				node2.write_notification(node1.local_peer_id().clone(), ENGINE_ID, b"hello world".to_vec());
+				node2.write_notification(node1.local_peer_id().clone(), PROTOCOL_NAME, b"hello world".to_vec());
 			}
 
 			// Also randomly disconnect the two nodes from time to time.
@@ -219,31 +219,31 @@ fn notifications_state_consistent() {
 			};
 
 			match next_event {
-				future::Either::Left(Event::NotificationStreamOpened { remote, engine_id, .. }) => {
+				future::Either::Left(Event::NotificationStreamOpened { remote, protocol, .. }) => {
 					something_happened = true;
 					assert!(!node1_to_node2_open);
 					node1_to_node2_open = true;
 					assert_eq!(remote, *node2.local_peer_id());
-					assert_eq!(engine_id, ENGINE_ID);
+					assert_eq!(protocol, PROTOCOL_NAME);
 				}
-				future::Either::Right(Event::NotificationStreamOpened { remote, engine_id, .. }) => {
+				future::Either::Right(Event::NotificationStreamOpened { remote, protocol, .. }) => {
 					something_happened = true;
 					assert!(!node2_to_node1_open);
 					node2_to_node1_open = true;
 					assert_eq!(remote, *node1.local_peer_id());
-					assert_eq!(engine_id, ENGINE_ID);
+					assert_eq!(protocol, PROTOCOL_NAME);
 				}
-				future::Either::Left(Event::NotificationStreamClosed { remote, engine_id, .. }) => {
+				future::Either::Left(Event::NotificationStreamClosed { remote, protocol, .. }) => {
 					assert!(node1_to_node2_open);
 					node1_to_node2_open = false;
 					assert_eq!(remote, *node2.local_peer_id());
-					assert_eq!(engine_id, ENGINE_ID);
+					assert_eq!(protocol, PROTOCOL_NAME);
 				}
-				future::Either::Right(Event::NotificationStreamClosed { remote, engine_id, .. }) => {
+				future::Either::Right(Event::NotificationStreamClosed { remote, protocol, .. }) => {
 					assert!(node2_to_node1_open);
 					node2_to_node1_open = false;
 					assert_eq!(remote, *node1.local_peer_id());
-					assert_eq!(engine_id, ENGINE_ID);
+					assert_eq!(protocol, PROTOCOL_NAME);
 				}
 				future::Either::Left(Event::NotificationsReceived { remote, .. }) => {
 					assert!(node1_to_node2_open);
@@ -251,7 +251,7 @@ fn notifications_state_consistent() {
 					if rand::random::<u8>() % 5 >= 4 {
 						node1.write_notification(
 							node2.local_peer_id().clone(),
-							ENGINE_ID,
+							PROTOCOL_NAME,
 							b"hello world".to_vec()
 						);
 					}
@@ -262,7 +262,7 @@ fn notifications_state_consistent() {
 					if rand::random::<u8>() % 5 >= 4 {
 						node2.write_notification(
 							node1.local_peer_id().clone(),
-							ENGINE_ID,
+							PROTOCOL_NAME,
 							b"hello world".to_vec()
 						);
 					}
@@ -281,7 +281,7 @@ fn lots_of_incoming_peers_works() {
 	let listen_addr = config::build_multiaddr![Memory(rand::random::<u64>())];
 
 	let (main_node, _) = build_test_full_node(config::NetworkConfiguration {
-		notifications_protocols: vec![(ENGINE_ID, From::from("/foo"))],
+		notifications_protocols: vec![PROTOCOL_NAME],
 		listen_addresses: vec![listen_addr.clone()],
 		in_peers: u32::max_value(),
 		transport: config::TransportConfig::MemoryOnly,
@@ -298,7 +298,7 @@ fn lots_of_incoming_peers_works() {
 		let main_node_peer_id = main_node_peer_id.clone();
 
 		let (_dialing_node, event_stream) = build_test_full_node(config::NetworkConfiguration {
-			notifications_protocols: vec![(ENGINE_ID, From::from("/foo"))],
+			notifications_protocols: vec![PROTOCOL_NAME],
 			listen_addresses: vec![],
 			reserved_nodes: vec![config::MultiaddrWithPeerId {
 				multiaddr: listen_addr.clone(),
@@ -364,7 +364,7 @@ fn notifications_back_pressure() {
 				Event::NotificationStreamClosed { .. } => panic!(),
 				Event::NotificationsReceived { messages, .. } => {
 					for message in messages {
-						assert_eq!(message.0, ENGINE_ID);
+						assert_eq!(message.0, PROTOCOL_NAME);
 						assert_eq!(message.1, format!("hello #{}", received_notifications));
 						received_notifications += 1;
 					}
@@ -389,7 +389,7 @@ fn notifications_back_pressure() {
 
 		// Sending!
 		for num in 0..TOTAL_NOTIFS {
-			let notif = node1.notification_sender(node2_id.clone(), ENGINE_ID).unwrap();
+			let notif = node1.notification_sender(node2_id.clone(), PROTOCOL_NAME).unwrap();
 			notif.ready().await.unwrap().send(format!("hello #{}", num)).unwrap();
 		}
 
diff --git a/client/network/test/src/lib.rs b/client/network/test/src/lib.rs
index 587feebe55c1..1aec3dae22b9 100644
--- a/client/network/test/src/lib.rs
+++ b/client/network/test/src/lib.rs
@@ -58,7 +58,7 @@ use sp_core::H256;
 use sc_network::config::ProtocolConfig;
 use sp_runtime::generic::{BlockId, OpaqueDigestItemId};
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor};
-use sp_runtime::{ConsensusEngineId, Justification};
+use sp_runtime::Justification;
 use substrate_test_runtime_client::{self, AccountKeyring};
 use sc_service::client::Client;
 pub use sc_network::config::EmptyTransactionPool;
@@ -557,7 +557,7 @@ pub struct FullPeerConfig {
 	/// Block announce validator.
 	pub block_announce_validator: Option<Box<dyn BlockAnnounceValidator<Block> + Send + Sync>>,
 	/// List of notification protocols that the network must support.
-	pub notifications_protocols: Vec<(ConsensusEngineId, Cow<'static, str>)>,
+	pub notifications_protocols: Vec<Cow<'static, str>>,
 }
 
 pub trait TestNetFactory: Sized {

From 9d65d983a08c59f4239965f4fb65bd7d0099c788 Mon Sep 17 00:00:00 2001
From: Qinxuan Chen <koushiro.cqx@gmail.com>
Date: Thu, 19 Nov 2020 03:43:41 +0800
Subject: [PATCH 0081/1194] sc-cli: replace bip39 with tiny-bip39 (#7551)

Signed-off-by: koushiro <koushiro.cqx@gmail.com>
---
 Cargo.lock            | 99 ++++++-------------------------------------
 client/cli/Cargo.toml |  2 +-
 2 files changed, 14 insertions(+), 87 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3a87dfec6640..43af7d1a3167 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -239,7 +239,7 @@ dependencies = [
  "concurrent-queue",
  "fastrand",
  "futures-lite",
- "once_cell 1.4.1",
+ "once_cell",
  "vec-arena",
 ]
 
@@ -253,7 +253,7 @@ dependencies = [
  "async-io",
  "futures-lite",
  "num_cpus",
- "once_cell 1.4.1",
+ "once_cell",
 ]
 
 [[package]]
@@ -268,7 +268,7 @@ dependencies = [
  "futures-lite",
  "libc",
  "log",
- "once_cell 1.4.1",
+ "once_cell",
  "parking",
  "polling",
  "socket2",
@@ -307,7 +307,7 @@ dependencies = [
  "log",
  "memchr",
  "num_cpus",
- "once_cell 1.4.1",
+ "once_cell",
  "pin-project-lite",
  "pin-utils",
  "slab",
@@ -454,21 +454,6 @@ dependencies = [
  "which",
 ]
 
-[[package]]
-name = "bip39"
-version = "0.6.0-beta.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7059804e226b3ac116519a252d7f5fb985a5ccc0e93255e036a5f7e7283323f4"
-dependencies = [
- "failure",
- "hashbrown 0.1.8",
- "hmac 0.7.1",
- "once_cell 0.1.8",
- "pbkdf2 0.3.0",
- "rand 0.6.5",
- "sha2 0.8.2",
-]
-
 [[package]]
 name = "bitflags"
 version = "1.2.1"
@@ -596,7 +581,7 @@ dependencies = [
  "atomic-waker",
  "fastrand",
  "futures-lite",
- "once_cell 1.4.1",
+ "once_cell",
 ]
 
 [[package]]
@@ -1061,7 +1046,7 @@ dependencies = [
  "lazy_static",
  "maybe-uninit",
  "memoffset",
- "scopeguard 1.1.0",
+ "scopeguard",
 ]
 
 [[package]]
@@ -1688,7 +1673,7 @@ dependencies = [
  "frame-system",
  "impl-trait-for-tuples",
  "log",
- "once_cell 1.4.1",
+ "once_cell",
  "parity-scale-codec",
  "parity-util-mem",
  "paste 0.1.18",
@@ -1967,7 +1952,7 @@ version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626"
 dependencies = [
- "once_cell 1.4.1",
+ "once_cell",
 ]
 
 [[package]]
@@ -2197,16 +2182,6 @@ dependencies = [
  "crunchy",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da"
-dependencies = [
- "byteorder",
- "scopeguard 0.3.3",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.6.3"
@@ -3363,22 +3338,13 @@ dependencies = [
  "paste 0.1.18",
 ]
 
-[[package]]
-name = "lock_api"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
-dependencies = [
- "scopeguard 0.3.3",
-]
-
 [[package]]
 name = "lock_api"
 version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75"
 dependencies = [
- "scopeguard 1.1.0",
+ "scopeguard",
 ]
 
 [[package]]
@@ -3387,7 +3353,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28247cc5a5be2f05fbcd76dd0cf2c7d3b5400cb978a28042abcd4fa0b3f8261c"
 dependencies = [
- "scopeguard 1.1.0",
+ "scopeguard",
 ]
 
 [[package]]
@@ -4250,15 +4216,6 @@ dependencies = [
  "wasmparser 0.57.0",
 ]
 
-[[package]]
-name = "once_cell"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "532c29a261168a45ce28948f9537ddd7a5dd272cc513b3017b1e82a88f962c37"
-dependencies = [
- "parking_lot 0.7.1",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.4.1"
@@ -5334,16 +5291,6 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
 
-[[package]]
-name = "parking_lot"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
-dependencies = [
- "lock_api 0.1.5",
- "parking_lot_core 0.4.0",
-]
-
 [[package]]
 name = "parking_lot"
 version = "0.9.0"
@@ -5376,19 +5323,6 @@ dependencies = [
  "parking_lot_core 0.8.0",
 ]
 
-[[package]]
-name = "parking_lot_core"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9"
-dependencies = [
- "libc",
- "rand 0.6.5",
- "rustc_version",
- "smallvec 0.6.13",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "parking_lot_core"
 version = "0.6.2"
@@ -5466,7 +5400,6 @@ checksum = "006c038a43a45995a9670da19e67600114740e8511d4333bf97a56e66a7542d9"
 dependencies = [
  "byteorder",
  "crypto-mac 0.7.0",
- "rayon",
 ]
 
 [[package]]
@@ -6269,7 +6202,7 @@ checksum = "952cd6b98c85bbc30efa1ba5783b8abf12fec8b3287ffa52605b9432313e34e4"
 dependencies = [
  "cc",
  "libc",
- "once_cell 1.4.1",
+ "once_cell",
  "spin",
  "untrusted",
  "web-sys",
@@ -6547,7 +6480,6 @@ version = "0.8.0"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
- "bip39",
  "chrono",
  "fdlimit",
  "futures 0.3.5",
@@ -6580,6 +6512,7 @@ dependencies = [
  "structopt",
  "tempfile",
  "thiserror",
+ "tiny-bip39",
  "tokio 0.2.22",
  "tracing",
  "tracing-log",
@@ -7647,12 +7580,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
 
-[[package]]
-name = "scopeguard"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
-
 [[package]]
 name = "scopeguard"
 version = "1.1.0"
@@ -9329,7 +9256,7 @@ checksum = "d9e44c4759bae7f1032e286a7ef990bd9ed23fe831b7eeba0beb97484c2e59b8"
 dependencies = [
  "anyhow",
  "hmac 0.8.1",
- "once_cell 1.4.1",
+ "once_cell",
  "pbkdf2 0.4.0",
  "rand 0.7.3",
  "rustc-hash",
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index 942d30e90db5..b0662c5eddf7 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -25,7 +25,7 @@ libp2p = "0.30.1"
 parity-scale-codec = "1.3.0"
 hex = "0.4.2"
 rand = "0.7.3"
-bip39 = "0.6.0-beta.1"
+tiny-bip39 = "0.8.0"
 serde_json = "1.0.41"
 sc-keystore = { version = "2.0.0", path = "../keystore" }
 sp-panic-handler = { version = "2.0.0", path = "../../primitives/panic-handler" }

From 69198d1e5735798c8baa1921c6e2091c93260752 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomusdrw@users.noreply.github.com>
Date: Wed, 18 Nov 2020 21:10:00 +0100
Subject: [PATCH 0082/1194] Add extra docs to on_initialize (#7552)

* Add some extra on_initialize docs.

* Address review comments.
---
 frame/support/src/traits.rs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index bc1700a43c3e..b40ebe3dba67 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -1265,7 +1265,7 @@ pub trait ChangeMembers<AccountId: Clone + Ord> {
 		Self::change_members_sorted(&incoming[..], &outgoing[..], &new_members);
 	}
 
-	/// Compute diff between new and old members; they **must already be sorted**. 
+	/// Compute diff between new and old members; they **must already be sorted**.
 	///
 	/// Returns incoming and outgoing members.
 	fn compute_members_diff(
@@ -1427,6 +1427,9 @@ pub trait GetCallMetadata {
 #[impl_for_tuples(30)]
 pub trait OnFinalize<BlockNumber> {
 	/// The block is being finalized. Implement to have something happen.
+	///
+	/// NOTE: This function is called AFTER ALL extrinsics in a block are applied,
+	/// including inherent extrinsics.
 	fn on_finalize(_n: BlockNumber) {}
 }
 
@@ -1438,6 +1441,10 @@ pub trait OnInitialize<BlockNumber> {
 	/// The block is being initialized. Implement to have something happen.
 	///
 	/// Return the non-negotiable weight consumed in the block.
+	///
+	/// NOTE: This function is called BEFORE ANY extrinsic in a block is applied,
+	/// including inherent extrinsics. Hence for instance, if you runtime includes
+	/// `pallet_timestamp`, the `timestamp` is not yet up to date at this point.
 	fn on_initialize(_n: BlockNumber) -> crate::weights::Weight { 0 }
 }
 
@@ -1569,7 +1576,7 @@ pub mod schedule {
 		/// Reschedule a task. For one-off tasks, this dispatch is guaranteed to succeed
 		/// only if it is executed *before* the currently scheduled block. For periodic tasks,
 		/// this dispatch is guaranteed to succeed only before the *initial* execution; for
-		/// others, use `reschedule_named`. 
+		/// others, use `reschedule_named`.
 		///
 		/// Will return an error if the `address` is invalid.
 		fn reschedule(

From f74de63d23214b530ac24ac3ea4ead1180e22e83 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Thu, 19 Nov 2020 12:40:12 +0100
Subject: [PATCH 0083/1194] More Extensible Multiaddress Format (#7380)

* More extensible multiaddress format

* update name

* Don't depend on indices to define multiaddress type

* Use MultiAddress in Node Template too!

* reduce traits, fix build

* support multiple `StaticLookup`

* bump tx version

* feedback
---
 bin/node-template/runtime/src/lib.rs   |   6 +-
 bin/node/executor/tests/basic.rs       |   2 +-
 bin/node/runtime/src/lib.rs            |   4 +-
 bin/node/testing/src/bench.rs          |   6 +-
 bin/node/testing/src/keyring.rs        |   2 +-
 frame/indices/src/address.rs           | 159 -------------------------
 frame/indices/src/lib.rs               |  15 ++-
 primitives/runtime/src/lib.rs          |   4 +
 primitives/runtime/src/multiaddress.rs |  66 ++++++++++
 primitives/runtime/src/traits.rs       |  38 ++++++
 10 files changed, 125 insertions(+), 177 deletions(-)
 delete mode 100644 frame/indices/src/address.rs
 create mode 100644 primitives/runtime/src/multiaddress.rs

diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index d67a5bde9645..aadfd931cdb5 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -13,7 +13,7 @@ use sp_runtime::{
 	transaction_validity::{TransactionValidity, TransactionSource},
 };
 use sp_runtime::traits::{
-	BlakeTwo256, Block as BlockT, IdentityLookup, Verify, IdentifyAccount, NumberFor, Saturating,
+	BlakeTwo256, Block as BlockT, AccountIdLookup, Verify, IdentifyAccount, NumberFor, Saturating,
 };
 use sp_api::impl_runtime_apis;
 use sp_consensus_aura::sr25519::AuthorityId as AuraId;
@@ -148,7 +148,7 @@ impl frame_system::Trait for Runtime {
 	/// The aggregated dispatch type that is available for extrinsics.
 	type Call = Call;
 	/// The lookup mechanism to get account ID from whatever is passed in dispatchers.
-	type Lookup = IdentityLookup<AccountId>;
+	type Lookup = AccountIdLookup<AccountId, ()>;
 	/// The index type for storing how many extrinsics an account has signed.
 	type Index = Index;
 	/// The index type for blocks.
@@ -293,7 +293,7 @@ construct_runtime!(
 );
 
 /// The address format for describing accounts.
-pub type Address = AccountId;
+pub type Address = sp_runtime::MultiAddress<AccountId, ()>;
 /// Block header type as expected by this runtime.
 pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
 /// Block type as expected by this runtime.
diff --git a/bin/node/executor/tests/basic.rs b/bin/node/executor/tests/basic.rs
index 723e3a7e4ba6..a48efaea2d69 100644
--- a/bin/node/executor/tests/basic.rs
+++ b/bin/node/executor/tests/basic.rs
@@ -621,7 +621,7 @@ fn deploying_wasm_contract_should_work() {
 				signed: Some((charlie(), signed_extra(2, 0))),
 				function: Call::Contracts(
 					pallet_contracts::Call::call::<Runtime>(
-						pallet_indices::address::Address::Id(addr.clone()),
+						sp_runtime::MultiAddress::Id(addr.clone()),
 						10,
 						500_000_000,
 						vec![0x00, 0x01, 0x02, 0x03]
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index bfa412e88203..3e08b2cf8a6f 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -111,7 +111,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_version: 260,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
-	transaction_version: 1,
+	transaction_version: 2,
 };
 
 /// Native version.
@@ -931,7 +931,7 @@ construct_runtime!(
 );
 
 /// The address format for describing accounts.
-pub type Address = <Indices as StaticLookup>::Source;
+pub type Address = sp_runtime::MultiAddress<AccountId, AccountIndex>;
 /// Block header type as expected by this runtime.
 pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
 /// Block type as expected by this runtime.
diff --git a/bin/node/testing/src/bench.rs b/bin/node/testing/src/bench.rs
index 153a52375c2a..32e4bab9773a 100644
--- a/bin/node/testing/src/bench.rs
+++ b/bin/node/testing/src/bench.rs
@@ -317,7 +317,7 @@ impl<'a> Iterator for BlockContentIterator<'a> {
 					BlockType::RandomTransfersKeepAlive => {
 						Call::Balances(
 							BalancesCall::transfer_keep_alive(
-								pallet_indices::address::Address::Id(receiver),
+								sp_runtime::MultiAddress::Id(receiver),
 								node_runtime::ExistentialDeposit::get() + 1,
 							)
 						)
@@ -325,7 +325,7 @@ impl<'a> Iterator for BlockContentIterator<'a> {
 					BlockType::RandomTransfersReaping => {
 						Call::Balances(
 							BalancesCall::transfer(
-								pallet_indices::address::Address::Id(receiver),
+								sp_runtime::MultiAddress::Id(receiver),
 								// Transfer so that ending balance would be 1 less than existential deposit
 								// so that we kill the sender account.
 								100*DOLLARS - (node_runtime::ExistentialDeposit::get() - 1),
@@ -591,7 +591,7 @@ impl BenchKeyring {
 					}
 				}).into();
 				UncheckedExtrinsic {
-					signature: Some((pallet_indices::address::Address::Id(signed), signature, extra)),
+					signature: Some((sp_runtime::MultiAddress::Id(signed), signature, extra)),
 					function: payload.0,
 				}
 			}
diff --git a/bin/node/testing/src/keyring.rs b/bin/node/testing/src/keyring.rs
index 341374856363..f0b8ff707294 100644
--- a/bin/node/testing/src/keyring.rs
+++ b/bin/node/testing/src/keyring.rs
@@ -94,7 +94,7 @@ pub fn sign(xt: CheckedExtrinsic, spec_version: u32, tx_version: u32, genesis_ha
 				}
 			}).into();
 			UncheckedExtrinsic {
-				signature: Some((pallet_indices::address::Address::Id(signed), signature, extra)),
+				signature: Some((sp_runtime::MultiAddress::Id(signed), signature, extra)),
 				function: payload.0,
 			}
 		}
diff --git a/frame/indices/src/address.rs b/frame/indices/src/address.rs
deleted file mode 100644
index 0fd893338132..000000000000
--- a/frame/indices/src/address.rs
+++ /dev/null
@@ -1,159 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Address type that is union of index and id for an account.
-
-#[cfg(feature = "std")]
-use std::fmt;
-use sp_std::convert::TryInto;
-use crate::Member;
-use codec::{Encode, Decode, Input, Output, Error};
-
-/// An indices-aware address, which can be either a direct `AccountId` or
-/// an index.
-#[derive(PartialEq, Eq, Clone, sp_runtime::RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Hash))]
-pub enum Address<AccountId, AccountIndex> where
-	AccountId: Member,
-	AccountIndex: Member,
-{
-	/// It's an account ID (pubkey).
-	Id(AccountId),
-	/// It's an account index.
-	Index(AccountIndex),
-}
-
-#[cfg(feature = "std")]
-impl<AccountId, AccountIndex> fmt::Display for Address<AccountId, AccountIndex> where
-	AccountId: Member,
-	AccountIndex: Member,
-{
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		write!(f, "{:?}", self)
-	}
-}
-
-impl<AccountId, AccountIndex> From<AccountId> for Address<AccountId, AccountIndex> where
-	AccountId: Member,
-	AccountIndex: Member,
-{
-	fn from(a: AccountId) -> Self {
-		Address::Id(a)
-	}
-}
-
-fn need_more_than<T: PartialOrd>(a: T, b: T) -> Result<T, Error> {
-	if a < b { Ok(b) } else { Err("Invalid range".into()) }
-}
-
-impl<AccountId, AccountIndex> Decode for Address<AccountId, AccountIndex> where
-	AccountId: Member + Decode,
-	AccountIndex: Member + Decode + PartialOrd<AccountIndex> + Ord + From<u32> + Copy,
-{
-	fn decode<I: Input>(input: &mut I) -> Result<Self, Error> {
-		Ok(match input.read_byte()? {
-			x @ 0x00..=0xef => Address::Index(AccountIndex::from(x as u32)),
-			0xfc => Address::Index(AccountIndex::from(
-				need_more_than(0xef, u16::decode(input)?)? as u32
-			)),
-			0xfd => Address::Index(AccountIndex::from(
-				need_more_than(0xffff, u32::decode(input)?)?
-			)),
-			0xfe => Address::Index(
-				need_more_than(0xffffffffu32.into(), Decode::decode(input)?)?
-			),
-			0xff => Address::Id(Decode::decode(input)?),
-			_ => return Err("Invalid address variant".into()),
-		})
-	}
-}
-
-impl<AccountId, AccountIndex> Encode for Address<AccountId, AccountIndex> where
-	AccountId: Member + Encode,
-	AccountIndex: Member + Encode + PartialOrd<AccountIndex> + Ord + Copy + From<u32> + TryInto<u32>,
-{
-	fn encode_to<T: Output>(&self, dest: &mut T) {
-		match *self {
-			Address::Id(ref i) => {
-				dest.push_byte(255);
-				dest.push(i);
-			}
-			Address::Index(i) => {
-				let maybe_u32: Result<u32, _> = i.try_into();
-				if let Ok(x) = maybe_u32 {
-					if x > 0xffff {
-						dest.push_byte(253);
-						dest.push(&x);
-					}
-					else if x >= 0xf0 {
-						dest.push_byte(252);
-						dest.push(&(x as u16));
-					}
-					else {
-						dest.push_byte(x as u8);
-					}
-
-				} else {
-					dest.push_byte(254);
-					dest.push(&i);
-				}
-			},
-		}
-	}
-}
-
-impl<AccountId, AccountIndex> codec::EncodeLike for Address<AccountId, AccountIndex> where
-	AccountId: Member + Encode,
-	AccountIndex: Member + Encode + PartialOrd<AccountIndex> + Ord + Copy + From<u32> + TryInto<u32>,
-{}
-
-impl<AccountId, AccountIndex> Default for Address<AccountId, AccountIndex> where
-	AccountId: Member + Default,
-	AccountIndex: Member,
-{
-	fn default() -> Self {
-		Address::Id(Default::default())
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use codec::{Encode, Decode};
-
-	type Address = super::Address<[u8; 8], u32>;
-	fn index(i: u32) -> Address { super::Address::Index(i) }
-	fn id(i: [u8; 8]) -> Address { super::Address::Id(i) }
-
-	fn compare(a: Option<Address>, d: &[u8]) {
-		if let Some(ref a) = a {
-			assert_eq!(d, &a.encode()[..]);
-		}
-		assert_eq!(Address::decode(&mut &d[..]).ok(), a);
-	}
-
-	#[test]
-	fn it_should_work() {
-		compare(Some(index(2)), &[2][..]);
-		compare(None, &[240][..]);
-		compare(None, &[252, 239, 0][..]);
-		compare(Some(index(240)), &[252, 240, 0][..]);
-		compare(Some(index(304)), &[252, 48, 1][..]);
-		compare(None, &[253, 255, 255, 0, 0][..]);
-		compare(Some(index(0x10000)), &[253, 0, 0, 1, 0][..]);
-		compare(Some(id([42, 69, 42, 69, 42, 69, 42, 69])), &[255, 42, 69, 42, 69, 42, 69, 42, 69][..]);
-	}
-}
diff --git a/frame/indices/src/lib.rs b/frame/indices/src/lib.rs
index fd2eb956f923..6d467aa67344 100644
--- a/frame/indices/src/lib.rs
+++ b/frame/indices/src/lib.rs
@@ -21,13 +21,13 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 mod mock;
-pub mod address;
 mod tests;
 mod benchmarking;
 pub mod weights;
 
 use sp_std::prelude::*;
 use codec::Codec;
+use sp_runtime::MultiAddress;
 use sp_runtime::traits::{
 	StaticLookup, Member, LookupError, Zero, Saturating, AtLeast32Bit
 };
@@ -35,10 +35,8 @@ use frame_support::{Parameter, decl_module, decl_error, decl_event, decl_storage
 use frame_support::dispatch::DispatchResult;
 use frame_support::traits::{Currency, ReservableCurrency, Get, BalanceStatus::Reserved};
 use frame_system::{ensure_signed, ensure_root};
-use self::address::Address as RawAddress;
 pub use weights::WeightInfo;
 
-pub type Address<T> = RawAddress<<T as frame_system::Trait>::AccountId, <T as Trait>::AccountIndex>;
 type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
 
 /// The module's config trait.
@@ -287,17 +285,18 @@ impl<T: Trait> Module<T> {
 
 	/// Lookup an address to get an Id, if there's one there.
 	pub fn lookup_address(
-		a: address::Address<T::AccountId, T::AccountIndex>
+		a: MultiAddress<T::AccountId, T::AccountIndex>
 	) -> Option<T::AccountId> {
 		match a {
-			address::Address::Id(i) => Some(i),
-			address::Address::Index(i) => Self::lookup_index(i),
+			MultiAddress::Id(i) => Some(i),
+			MultiAddress::Index(i) => Self::lookup_index(i),
+			_ => None,
 		}
 	}
 }
 
 impl<T: Trait> StaticLookup for Module<T> {
-	type Source = address::Address<T::AccountId, T::AccountIndex>;
+	type Source = MultiAddress<T::AccountId, T::AccountIndex>;
 	type Target = T::AccountId;
 
 	fn lookup(a: Self::Source) -> Result<Self::Target, LookupError> {
@@ -305,6 +304,6 @@ impl<T: Trait> StaticLookup for Module<T> {
 	}
 
 	fn unlookup(a: Self::Target) -> Self::Source {
-		address::Address::Id(a)
+		MultiAddress::Id(a)
 	}
 }
diff --git a/primitives/runtime/src/lib.rs b/primitives/runtime/src/lib.rs
index e6c707e906ed..ccd50334af66 100644
--- a/primitives/runtime/src/lib.rs
+++ b/primitives/runtime/src/lib.rs
@@ -56,9 +56,13 @@ pub mod traits;
 pub mod transaction_validity;
 pub mod random_number_generator;
 mod runtime_string;
+mod multiaddress;
 
 pub use crate::runtime_string::*;
 
+// Re-export Multiaddress
+pub use multiaddress::MultiAddress;
+
 /// Re-export these since they're only "kind of" generic.
 pub use generic::{DigestItem, Digest};
 
diff --git a/primitives/runtime/src/multiaddress.rs b/primitives/runtime/src/multiaddress.rs
new file mode 100644
index 000000000000..bb352f7eb5f8
--- /dev/null
+++ b/primitives/runtime/src/multiaddress.rs
@@ -0,0 +1,66 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! MultiAddress type is a wrapper for multiple downstream account formats.
+
+use codec::{Encode, Decode};
+use sp_std::vec::Vec;
+
+/// A multi-format address wrapper for on-chain accounts.
+#[derive(Encode, Decode, PartialEq, Eq, Clone, crate::RuntimeDebug)]
+#[cfg_attr(feature = "std", derive(Hash))]
+pub enum MultiAddress<AccountId, AccountIndex> {
+	/// It's an account ID (pubkey).
+	Id(AccountId),
+	/// It's an account index.
+	Index(#[codec(compact)] AccountIndex),
+	/// It's some arbitrary raw bytes.
+	Raw(Vec<u8>),
+	/// It's a 32 byte representation.
+	Address32([u8; 32]),
+	/// Its a 20 byte representation.
+	Address20([u8; 20]),
+}
+
+#[cfg(feature = "std")]
+impl<AccountId, AccountIndex> std::fmt::Display for MultiAddress<AccountId, AccountIndex>
+where
+	AccountId: std::fmt::Debug,
+	AccountIndex: std::fmt::Debug,
+{
+	fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+		use sp_core::hexdisplay::HexDisplay;
+		match self {
+			MultiAddress::Raw(inner) => write!(f, "MultiAddress::Raw({})", HexDisplay::from(inner)),
+			MultiAddress::Address32(inner) => write!(f, "MultiAddress::Address32({})", HexDisplay::from(inner)),
+			MultiAddress::Address20(inner) => write!(f, "MultiAddress::Address20({})", HexDisplay::from(inner)),
+			_ => write!(f, "{:?}", self),
+		}
+	}
+}
+
+impl<AccountId, AccountIndex> From<AccountId> for MultiAddress<AccountId, AccountIndex> {
+	fn from(a: AccountId) -> Self {
+		MultiAddress::Id(a)
+	}
+}
+
+impl<AccountId: Default, AccountIndex> Default for MultiAddress<AccountId, AccountIndex> {
+	fn default() -> Self {
+		MultiAddress::Id(Default::default())
+	}
+}
diff --git a/primitives/runtime/src/traits.rs b/primitives/runtime/src/traits.rs
index 4d2b1f062f71..4ce9ac0afa9a 100644
--- a/primitives/runtime/src/traits.rs
+++ b/primitives/runtime/src/traits.rs
@@ -209,6 +209,44 @@ impl<T> Lookup for IdentityLookup<T> {
 	fn lookup(&self, x: T) -> Result<T, LookupError> { Ok(x) }
 }
 
+/// A lookup implementation returning the `AccountId` from a `MultiAddress`.
+pub struct AccountIdLookup<AccountId, AccountIndex>(PhantomData<(AccountId, AccountIndex)>);
+impl<AccountId, AccountIndex> StaticLookup for AccountIdLookup<AccountId, AccountIndex>
+where
+	AccountId: Codec + Clone + PartialEq + Debug,
+	AccountIndex: Codec + Clone + PartialEq + Debug,
+	crate::MultiAddress<AccountId, AccountIndex>: Codec,
+{
+	type Source = crate::MultiAddress<AccountId, AccountIndex>;
+	type Target = AccountId;
+	fn lookup(x: Self::Source) -> Result<Self::Target, LookupError> {
+		match x {
+			crate::MultiAddress::Id(i) => Ok(i),
+			_ => Err(LookupError),
+		}
+	}
+	fn unlookup(x: Self::Target) -> Self::Source {
+		crate::MultiAddress::Id(x)
+	}
+}
+
+/// Perform a StaticLookup where there are multiple lookup sources of the same type.
+impl<A, B> StaticLookup for (A, B)
+where
+	A: StaticLookup,
+	B: StaticLookup<Source = A::Source, Target = A::Target>,
+{
+	type Source = A::Source;
+	type Target = A::Target;
+
+	fn lookup(x: Self::Source) -> Result<Self::Target, LookupError> {
+		A::lookup(x.clone()).or_else(|_| B::lookup(x))
+	}
+	fn unlookup(x: Self::Target) -> Self::Source {
+		A::unlookup(x)
+	}
+}
+
 /// Extensible conversion trait. Generic over both source and destination types.
 pub trait Convert<A, B> {
 	/// Make conversion.

From 1c122c6d138f7f58f1ed7ce1414cf3dd283cd4ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Fri, 20 Nov 2020 13:24:02 +0100
Subject: [PATCH 0084/1194] Fix weight template to remove ugliness in rust doc
 (#7565)

fixed weight template
---
 .maintain/frame-weight-template.hbs           | 3 ++-
 utils/frame/benchmarking-cli/src/template.hbs | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.maintain/frame-weight-template.hbs b/.maintain/frame-weight-template.hbs
index 146cc4cfcbdb..aac37f0833c7 100644
--- a/.maintain/frame-weight-template.hbs
+++ b/.maintain/frame-weight-template.hbs
@@ -15,7 +15,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Weights for {{pallet}}
+//! Autogenerated weights for {{pallet}}
+//!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION {{version}}
 //! DATE: {{date}}, STEPS: {{cmd.steps}}, REPEAT: {{cmd.repeat}}, LOW RANGE: {{cmd.lowest_range_values}}, HIGH RANGE: {{cmd.highest_range_values}}
 //! EXECUTION: {{cmd.execution}}, WASM-EXECUTION: {{cmd.wasm_execution}}, CHAIN: {{cmd.chain}}, DB CACHE: {{cmd.db_cache}}
diff --git a/utils/frame/benchmarking-cli/src/template.hbs b/utils/frame/benchmarking-cli/src/template.hbs
index 7f7e2d6dcb99..fd066b1a3a8a 100644
--- a/utils/frame/benchmarking-cli/src/template.hbs
+++ b/utils/frame/benchmarking-cli/src/template.hbs
@@ -1,5 +1,6 @@
 {{header}}
-//! Weights for {{pallet}}
+//! Autogenerated weights for {{pallet}}
+//!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION {{version}}
 //! DATE: {{date}}, STEPS: {{cmd.steps}}, REPEAT: {{cmd.repeat}}, LOW RANGE: {{cmd.lowest_range_values}}, HIGH RANGE: {{cmd.highest_range_values}}
 //! EXECUTION: {{cmd.execution}}, WASM-EXECUTION: {{cmd.wasm_execution}}, CHAIN: {{cmd.chain}}, DB CACHE: {{cmd.db_cache}}

From a0e8b7ecd1d1d44bfdad1e67ef4028121f7d9d82 Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Fri, 20 Nov 2020 13:59:02 +0100
Subject: [PATCH 0085/1194] Cargo.lock: Run cargo update (#7553)

* Cargo.lock: Run cargo update

* Cargo.lock: Downgrade cc to v1.0.62

* Cargo.lock: Revert wasm-* updates
---
 Cargo.lock                    | 1420 ++++++++++++++++++---------------
 bin/node/bench/src/tempdb.rs  |    4 +-
 bin/node/testing/src/bench.rs |    2 +-
 3 files changed, 778 insertions(+), 648 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 43af7d1a3167..c2e9cda8f31c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -12,11 +12,11 @@ dependencies = [
 
 [[package]]
 name = "addr2line"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b6a2d3371669ab3ca9797670853d61402b03d0b4b9ebf33d677dfa720203072"
+checksum = "7c0929d69e78dd9bf5408269919fcbcaeb2e35e5d43e5815517cdc6a8e11a423"
 dependencies = [
- "gimli 0.22.0",
+ "gimli 0.23.0",
 ]
 
 [[package]]
@@ -31,52 +31,52 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331"
 dependencies = [
- "generic-array 0.14.3",
+ "generic-array 0.14.4",
 ]
 
 [[package]]
 name = "aes"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7001367fde4c768a19d1029f0a8be5abd9308e1119846d5bd9ad26297b8faf5"
+checksum = "dd2bc6d3f370b5666245ff421e231cba4353df936e26986d2918e61a8fd6aef6"
 dependencies = [
  "aes-soft",
  "aesni",
- "block-cipher 0.7.1",
+ "block-cipher",
 ]
 
 [[package]]
 name = "aes-gcm"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86f5007801316299f922a6198d1d09a0bae95786815d066d5880d13f7c45ead1"
+checksum = "0301c9e9c443494d970a07885e8cf3e587bae8356a1d5abd0999068413f7205f"
 dependencies = [
  "aead",
  "aes",
- "block-cipher 0.7.1",
+ "block-cipher",
  "ghash",
- "subtle 2.2.3",
+ "subtle 2.3.0",
 ]
 
 [[package]]
 name = "aes-soft"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4925647ee64e5056cf231608957ce7c81e12d6d6e316b9ce1404778cc1d35fa7"
+checksum = "63dd91889c49327ad7ef3b500fd1109dbd3c509a03db0d4a9ce413b79f575cb6"
 dependencies = [
- "block-cipher 0.7.1",
+ "block-cipher",
  "byteorder",
- "opaque-debug 0.2.3",
+ "opaque-debug 0.3.0",
 ]
 
 [[package]]
 name = "aesni"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d050d39b0b7688b3a3254394c3e30a9d66c41dcf9b05b0e2dbdc623f6505d264"
+checksum = "0a6fe808308bb07d393e2ea47780043ec47683fcf19cf5efc8ca51c50cc8c68a"
 dependencies = [
- "block-cipher 0.7.1",
- "opaque-debug 0.2.3",
+ "block-cipher",
+ "opaque-debug 0.3.0",
 ]
 
 [[package]]
@@ -94,11 +94,17 @@ version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217"
 
+[[package]]
+name = "ahash"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6789e291be47ace86a60303502173d84af8327e3627ecf334356ee0f87a164c"
+
 [[package]]
 name = "aho-corasick"
-version = "0.7.13"
+version = "0.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86"
+checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
 dependencies = [
  "memchr",
 ]
@@ -149,9 +155,9 @@ dependencies = [
 
 [[package]]
 name = "arbitrary"
-version = "0.4.5"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cb544f1057eaaff4b34f8c4dcf56fc3cd04debd291998405d135017a7c3c0f4"
+checksum = "db55d72333851e17d572bec876e390cd3b11eb1ef53ae821dd9f3b653d2b4569"
 
 [[package]]
 name = "arc-swap"
@@ -176,9 +182,9 @@ dependencies = [
 
 [[package]]
 name = "arrayvec"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
 
 [[package]]
 name = "asn1_der"
@@ -214,9 +220,9 @@ dependencies = [
 
 [[package]]
 name = "assert_matches"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7deb0a829ca7bcfaf5da70b073a8d128619259a7be8216a355e23f00763059e5"
+checksum = "695579f0f2520f3774bb40461e5adb066459d4e0af4d59d20175484fb8e9edf1"
 
 [[package]]
 name = "async-channel"
@@ -231,9 +237,9 @@ dependencies = [
 
 [[package]]
 name = "async-executor"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d373d78ded7d0b3fa8039375718cde0aace493f2e34fb60f51cbf567562ca801"
+checksum = "eb877970c7b440ead138f6321a3b5395d6061183af779340b65e20c0fede9146"
 dependencies = [
  "async-task",
  "concurrent-queue",
@@ -245,9 +251,9 @@ dependencies = [
 
 [[package]]
 name = "async-global-executor"
-version = "1.3.0"
+version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fefeb39da249f4c33af940b779a56723ce45809ef5c54dad84bb538d4ffb6d9e"
+checksum = "73079b49cd26b8fd5a15f68fc7707fc78698dc2a3d61430f2a7a9430230dfa04"
 dependencies = [
  "async-executor",
  "async-io",
@@ -258,23 +264,21 @@ dependencies = [
 
 [[package]]
 name = "async-io"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38628c78a34f111c5a6b98fc87dfc056cd1590b61afe748b145be4623c56d194"
+checksum = "40a0b2bb8ae20fede194e779150fe283f65a4a08461b496de546ec366b174ad9"
 dependencies = [
- "cfg-if 0.1.10",
  "concurrent-queue",
  "fastrand",
  "futures-lite",
  "libc",
  "log",
+ "nb-connect",
  "once_cell",
  "parking",
  "polling",
- "socket2",
  "vec-arena",
  "waker-fn",
- "wepoll-sys-stjepang",
  "winapi 0.3.9",
 ]
 
@@ -289,15 +293,15 @@ dependencies = [
 
 [[package]]
 name = "async-std"
-version = "1.6.5"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9fa76751505e8df1c7a77762f60486f60c71bbd9b8557f4da6ad47d083732ed"
+checksum = "a7e82538bc65a25dbdff70e4c5439d52f068048ab97cdea0acd73f131594caa1"
 dependencies = [
  "async-global-executor",
  "async-io",
  "async-mutex",
  "blocking",
- "crossbeam-utils",
+ "crossbeam-utils 0.8.0",
  "futures-channel",
  "futures-core",
  "futures-io",
@@ -316,9 +320,9 @@ dependencies = [
 
 [[package]]
 name = "async-task"
-version = "4.0.2"
+version = "4.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ab27c1aa62945039e44edaeee1dc23c74cc0c303dd5fe0fb462a184f1c3a518"
+checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0"
 
 [[package]]
 name = "async-tls"
@@ -335,9 +339,9 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.37"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caae68055714ff28740f310927e04f2eba76ff580b16fb18ed90073ee71646f7"
+checksum = "b246867b8b3b6ae56035f1eb1ed557c1d8eae97f0d53696138a50fa0e3a3b8c0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -350,7 +354,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3410529e8288c463bedb5930f82833bc0c90e5d2fe639a56582a4d09220b281"
 dependencies = [
- "autocfg 1.0.0",
+ "autocfg 1.0.1",
 ]
 
 [[package]]
@@ -378,21 +382,21 @@ checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
 
 [[package]]
 name = "autocfg"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
 name = "backtrace"
-version = "0.3.50"
+version = "0.3.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46254cf2fdcdf1badb5934448c1bcbe046a56537b3987d96c51a7afc5d03f293"
+checksum = "2baad346b2d4e94a24347adeee9c7a93f412ee94b9cc26e5b59dea23848e9f28"
 dependencies = [
  "addr2line",
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "libc",
  "miniz_oxide",
- "object 0.20.0",
+ "object 0.22.0",
  "rustc-demangle",
 ]
 
@@ -402,12 +406,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5024ee8015f02155eee35c711107ddd9a9bf3cb689cf2a9089c97e79b6e1ae83"
 
-[[package]]
-name = "base64"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
-
 [[package]]
 name = "base64"
 version = "0.12.3"
@@ -472,15 +470,13 @@ dependencies = [
 
 [[package]]
 name = "blake2"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84ce5b6108f8e154604bd4eb76a2f726066c3464d5a552a4229262a18c9bb471"
+checksum = "10a5720225ef5daecf08657f23791354e1685a8c91a4c60c7f3d3b2892f978f4"
 dependencies = [
- "byte-tools",
- "byteorder",
  "crypto-mac 0.8.0",
  "digest 0.9.0",
- "opaque-debug 0.2.3",
+ "opaque-debug 0.3.0",
 ]
 
 [[package]]
@@ -495,23 +491,23 @@ dependencies = [
 
 [[package]]
 name = "blake2b_simd"
-version = "0.5.10"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a"
+checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"
 dependencies = [
  "arrayref",
- "arrayvec 0.5.1",
+ "arrayvec 0.5.2",
  "constant_time_eq",
 ]
 
 [[package]]
 name = "blake2s_simd"
-version = "0.5.10"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab9e07352b829279624ceb7c64adb4f585dacdb81d35cafae81139ccd617cf44"
+checksum = "9e461a7034e85b211a4acb57ee2e6730b32912b06c08cc242243c39fc21ae6a2"
 dependencies = [
  "arrayref",
- "arrayvec 0.5.1",
+ "arrayvec 0.5.2",
  "constant_time_eq",
 ]
 
@@ -534,16 +530,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
 dependencies = [
  "block-padding 0.2.1",
- "generic-array 0.14.3",
-]
-
-[[package]]
-name = "block-cipher"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa136449e765dc7faa244561ccae839c394048667929af599b5d931ebe7b7f10"
-dependencies = [
- "generic-array 0.14.3",
+ "generic-array 0.14.4",
 ]
 
 [[package]]
@@ -552,7 +539,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f337a3e6da609650eb74e02bc9fac7b735049f7623ab12f2e4c719316fcc7e80"
 dependencies = [
- "generic-array 0.14.3",
+ "generic-array 0.14.4",
 ]
 
 [[package]]
@@ -598,9 +585,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
 
 [[package]]
 name = "bstr"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31accafdb70df7871592c058eca3985b71104e15ac32f64706022c58867da931"
+checksum = "473fc6b38233f9af7baa94fb5852dca389e3d95b8e21c8e3719301462c5d9faf"
 dependencies = [
  "lazy_static",
  "memchr",
@@ -666,11 +653,11 @@ checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"
 
 [[package]]
 name = "cargo_metadata"
-version = "0.10.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "052dbdd9db69a339d5fa9ac87bfe2e1319f709119f0345988a597af82bb1011c"
+checksum = "b8de60b887edf6d74370fc8eb177040da4847d971d6234c7b13a6da324ef0caf"
 dependencies = [
- "semver 0.10.0",
+ "semver 0.9.0",
  "serde",
  "serde_derive",
  "serde_json",
@@ -687,9 +674,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.58"
+version = "1.0.62"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518"
+checksum = "f1770ced377336a88a67c473594ccc14eca6f4559217c34f64aac8f83d641b40"
 dependencies = [
  "jobserver",
 ]
@@ -717,24 +704,24 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chacha20"
-version = "0.4.3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "086c0f07ac275808b7bf9a39f2fd013aae1498be83632814c8c4e0bd53f2dc58"
+checksum = "244fbce0d47e97e8ef2f63b81d5e05882cb518c68531eb33194990d7b7e85845"
 dependencies = [
- "stream-cipher 0.4.1",
+ "stream-cipher",
  "zeroize",
 ]
 
 [[package]]
 name = "chacha20poly1305"
-version = "0.5.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18b0c90556d8e3fec7cf18d84a2f53d27b21288f2fe481b830fadcf809e48205"
+checksum = "9bf18d374d66df0c05cdddd528a7db98f78c28e2519b120855c4f84c5027b1f5"
 dependencies = [
  "aead",
  "chacha20",
  "poly1305",
- "stream-cipher 0.4.1",
+ "stream-cipher",
  "zeroize",
 ]
 
@@ -754,15 +741,17 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.13"
+version = "0.4.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c74d84029116787153e02106bf53e66828452a4b325cc8652b788b5967c0a0b6"
+checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
 dependencies = [
  "js-sys",
+ "libc",
  "num-integer",
  "num-traits",
  "time",
  "wasm-bindgen",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -778,9 +767,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "2.33.1"
+version = "2.33.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129"
+checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
 dependencies = [
  "ansi_term 0.11.0",
  "atty",
@@ -858,6 +847,12 @@ dependencies = [
  "proc-macro-hack",
 ]
 
+[[package]]
+name = "const_fn"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c478836e029dcef17fb47c89023448c64f781a046e0300e257ad8225ae59afab"
+
 [[package]]
 name = "constant_time_eq"
 version = "0.1.5"
@@ -910,7 +905,7 @@ dependencies = [
  "log",
  "regalloc",
  "serde",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
  "target-lexicon",
  "thiserror",
 ]
@@ -948,7 +943,7 @@ checksum = "2ef419efb4f94ecc02e5d9fbcc910d2bb7f0040e2de570e63a454f883bc891d6"
 dependencies = [
  "cranelift-codegen",
  "log",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
  "target-lexicon",
 ]
 
@@ -980,11 +975,11 @@ dependencies = [
 
 [[package]]
 name = "crc32fast"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
+checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
 ]
 
 [[package]]
@@ -1023,32 +1018,67 @@ dependencies = [
  "itertools 0.9.0",
 ]
 
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
+dependencies = [
+ "cfg-if 1.0.0",
+ "crossbeam-utils 0.8.0",
+]
+
 [[package]]
 name = "crossbeam-deque"
 version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
 dependencies = [
- "crossbeam-epoch",
- "crossbeam-utils",
+ "crossbeam-epoch 0.8.2",
+ "crossbeam-utils 0.7.2",
  "maybe-uninit",
 ]
 
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
+dependencies = [
+ "cfg-if 1.0.0",
+ "crossbeam-epoch 0.9.0",
+ "crossbeam-utils 0.8.0",
+]
+
 [[package]]
 name = "crossbeam-epoch"
 version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
 dependencies = [
- "autocfg 1.0.0",
+ "autocfg 1.0.1",
  "cfg-if 0.1.10",
- "crossbeam-utils",
+ "crossbeam-utils 0.7.2",
  "lazy_static",
  "maybe-uninit",
  "memoffset",
  "scopeguard",
 ]
 
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0f606a85340376eef0d6d8fec399e6d4a544d648386c6645eb6d0653b27d9f"
+dependencies = [
+ "cfg-if 1.0.0",
+ "const_fn",
+ "crossbeam-utils 0.8.0",
+ "lazy_static",
+ "memoffset",
+ "scopeguard",
+]
+
 [[package]]
 name = "crossbeam-queue"
 version = "0.2.3"
@@ -1056,7 +1086,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570"
 dependencies = [
  "cfg-if 0.1.10",
- "crossbeam-utils",
+ "crossbeam-utils 0.7.2",
  "maybe-uninit",
 ]
 
@@ -1066,11 +1096,23 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
 dependencies = [
- "autocfg 1.0.0",
+ "autocfg 1.0.1",
  "cfg-if 0.1.10",
  "lazy_static",
 ]
 
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec91540d98355f690a86367e566ecad2e9e579f230230eb7c21398372be73ea5"
+dependencies = [
+ "autocfg 1.0.1",
+ "cfg-if 1.0.0",
+ "const_fn",
+ "lazy_static",
+]
+
 [[package]]
 name = "crunchy"
 version = "0.2.2"
@@ -1093,15 +1135,15 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
 dependencies = [
- "generic-array 0.14.3",
- "subtle 2.2.3",
+ "generic-array 0.14.4",
+ "subtle 2.3.0",
 ]
 
 [[package]]
 name = "csv"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00affe7f6ab566df61b4be3ce8cf16bc2576bca0963ceb0955e45d514bf9a279"
+checksum = "fc4666154fd004af3fd6f1da2e81a96fd5a81927fe8ddb6ecc79e2aa6e138b54"
 dependencies = [
  "bstr",
  "csv-core",
@@ -1130,9 +1172,9 @@ dependencies = [
 
 [[package]]
 name = "ctor"
-version = "0.1.15"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39858aa5bac06462d4dd4b9164848eb81ffc4aa5c479746393598fd193afa227"
+checksum = "7fbaabec2c953050352311293be5c6aba8e141ba19d6811862b232d6fd020484"
 dependencies = [
  "quote",
  "syn",
@@ -1158,7 +1200,7 @@ dependencies = [
  "byteorder",
  "digest 0.8.1",
  "rand_core 0.5.1",
- "subtle 2.2.3",
+ "subtle 2.3.0",
  "zeroize",
 ]
 
@@ -1171,21 +1213,21 @@ dependencies = [
  "byteorder",
  "digest 0.9.0",
  "rand_core 0.5.1",
- "subtle 2.2.3",
+ "subtle 2.3.0",
  "zeroize",
 ]
 
 [[package]]
 name = "data-encoding"
-version = "2.2.1"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72aa14c04dfae8dd7d8a2b1cb7ca2152618cd01336dbfe704b8dcbf8d41dbd69"
+checksum = "993a608597367c6377b258c25d7120740f00ed23a2252b729b1932dd7866f908"
 
 [[package]]
 name = "derive_more"
-version = "0.99.9"
+version = "0.99.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "298998b1cf6b5b2c8a7b023dfd45821825ce3ba8a8af55c921a0e734e4653f76"
+checksum = "41cb0e6161ad61ed084a36ba71fbba9e3ac5aee3606fb607fe08da6acbcf3d8c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1213,7 +1255,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
 dependencies = [
- "generic-array 0.14.3",
+ "generic-array 0.14.4",
 ]
 
 [[package]]
@@ -1282,15 +1324,15 @@ dependencies = [
 
 [[package]]
 name = "dyn-clone"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c53dc3a653e0f64081026e4bf048d48fec9fce90c66e8326ca7292df0ff2d82"
+checksum = "d55796afa1b20c2945ca8eabfc421839f2b766619209f1ede813cf2484f31804"
 
 [[package]]
 name = "ed25519"
-version = "1.0.1"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf038a7b6fd7ef78ad3348b63f3a17550877b0e28f8d68bcc94894d1412158bc"
+checksum = "37c66a534cbb46ab4ea03477eae19d5c22c01da8258030280b7bd9d8433fb6ef"
 dependencies = [
  "signature",
 ]
@@ -1305,15 +1347,15 @@ dependencies = [
  "ed25519",
  "rand 0.7.3",
  "serde",
- "sha2 0.9.1",
+ "sha2 0.9.2",
  "zeroize",
 ]
 
 [[package]]
 name = "either"
-version = "1.6.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56b59865bce947ac5958779cfa508f6c3b9497cc762b7e24a12d11ccde2c4f"
+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
 
 [[package]]
 name = "enumflags2"
@@ -1365,9 +1407,9 @@ dependencies = [
 
 [[package]]
 name = "errno"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6eab5ee3df98a279d9b316b1af6ac95422127b1290317e6d18c1743c99418b01"
+checksum = "fa68f2fb9cae9d37c9b2b3584aba698a2e97f72d7aef7b9f7aa71d8b54ce46fe"
 dependencies = [
  "errno-dragonfly",
  "libc",
@@ -1397,6 +1439,23 @@ dependencies = [
  "tiny-keccak",
 ]
 
+[[package]]
+name = "ethereum"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df706418ff7d3874b9506424b04ea0bef569a2b39412b43a27ea86e679be108e"
+dependencies = [
+ "ethereum-types",
+ "hash-db",
+ "hash256-std-hasher",
+ "parity-scale-codec",
+ "rlp",
+ "rlp-derive",
+ "serde",
+ "sha3 0.9.1",
+ "triehash",
+]
+
 [[package]]
 name = "ethereum-types"
 version = "0.9.2"
@@ -1419,13 +1478,16 @@ checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59"
 
 [[package]]
 name = "evm"
-version = "0.17.0"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68224b0aa788720ef0c8a23030a4412a021ed73df069a922bee8f0db9ed617e2"
+checksum = "16c8deca0ec3efa361b03d9cae6fe94321a1d2d0a523437edd720b3d140e3c08"
 dependencies = [
+ "ethereum",
  "evm-core",
  "evm-gasometer",
  "evm-runtime",
+ "log",
+ "parity-scale-codec",
  "primitive-types",
  "rlp",
  "serde",
@@ -1434,18 +1496,19 @@ dependencies = [
 
 [[package]]
 name = "evm-core"
-version = "0.17.0"
+version = "0.17.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a040378759577447945c89da1b07d6e33fda32a97a104afe0ec3fa1c382949d"
+checksum = "cf2d732b3c36df36833761cf67df8f65866be1d368d20508bc3e13e6f256c8c5"
 dependencies = [
+ "log",
  "primitive-types",
 ]
 
 [[package]]
 name = "evm-gasometer"
-version = "0.17.0"
+version = "0.17.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bb5bc051afad6bb0735c82b46656bbdfac41917861307a608b1404a546fec42"
+checksum = "46de1b91ccd744627484183729f1b5af484b3bf15505007fc28cc54264cb9ea1"
 dependencies = [
  "evm-core",
  "evm-runtime",
@@ -1454,9 +1517,9 @@ dependencies = [
 
 [[package]]
 name = "evm-runtime"
-version = "0.17.0"
+version = "0.17.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7410f5677a52203d3fca02b0eb8f96f9799f3a45cff82946a8ed28379e6b1b04"
+checksum = "f2c1d1ffe96f833788512c890d702457d790dba4917ac6f64f8f60fbd9bc40b8"
 dependencies = [
  "evm-core",
  "primitive-types",
@@ -1469,7 +1532,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5"
 dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
 ]
 
 [[package]]
@@ -1526,9 +1589,9 @@ dependencies = [
 
 [[package]]
 name = "file-per-thread-logger"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b3937f028664bd0e13df401ba49a4567ccda587420365823242977f06609ed1"
+checksum = "4fdbe0d94371f9ce939b555dd342d0686cc4c0cadbcd4b61d70af5ff97eb4126"
 dependencies = [
  "env_logger",
  "log",
@@ -1541,7 +1604,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8feb87a63249689640ac9c011742c33139204e3c134293d3054022276869133b"
 dependencies = [
  "either",
- "futures 0.3.5",
+ "futures 0.3.8",
  "futures-timer 2.0.2",
  "log",
  "num-traits",
@@ -1570,11 +1633,11 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
 
 [[package]]
 name = "flate2"
-version = "1.0.16"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68c90b0fc46cf89d227cc78b40e494ff81287a92dd07631e5af0d06fe3cf885e"
+checksum = "7411863d55df97a419aa64cb4d2f167103ea9d767e2c54a1868b7ac3f6b47129"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "crc32fast",
  "libc",
  "libz-sys",
@@ -1594,6 +1657,16 @@ dependencies = [
  "parity-scale-codec",
 ]
 
+[[package]]
+name = "form_urlencoded"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00"
+dependencies = [
+ "matches",
+ "percent-encoding 2.1.0",
+]
+
 [[package]]
 name = "frame-benchmarking"
 version = "2.0.0"
@@ -1679,7 +1752,7 @@ dependencies = [
  "paste 0.1.18",
  "pretty_assertions",
  "serde",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
  "sp-api",
  "sp-arithmetic",
  "sp-core",
@@ -1806,9 +1879,9 @@ dependencies = [
 
 [[package]]
 name = "fs_extra"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674"
+checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394"
 
 [[package]]
 name = "fuchsia-cprng"
@@ -1834,15 +1907,15 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
 
 [[package]]
 name = "futures"
-version = "0.1.29"
+version = "0.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef"
+checksum = "4c7e4c2612746b0df8fed4ce0c69156021b704c9aefa360311c04e6e9e002eed"
 
 [[package]]
 name = "futures"
-version = "0.3.5"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e05b85ec287aac0dc34db7d4a569323df697f9c55b99b15d6b4ef8cde49f613"
+checksum = "9b3b0c040a1fe6529d30b3c5944b280c7f0dcb2930d2c3062bca967b602583d0"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1855,9 +1928,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.5"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5"
+checksum = "4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1865,9 +1938,9 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.5"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399"
+checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748"
 
 [[package]]
 name = "futures-cpupool"
@@ -1875,7 +1948,7 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
 dependencies = [
- "futures 0.1.29",
+ "futures 0.1.30",
  "num_cpus",
 ]
 
@@ -1885,21 +1958,21 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdcef58a173af8148b182684c9f2d5250875adbcaff7b5794073894f9d8634a9"
 dependencies = [
- "futures 0.1.29",
- "futures 0.3.5",
+ "futures 0.1.30",
+ "futures 0.3.8",
  "lazy_static",
  "log",
  "parking_lot 0.9.0",
- "pin-project 0.4.22",
+ "pin-project 0.4.27",
  "serde",
  "serde_json",
 ]
 
 [[package]]
 name = "futures-executor"
-version = "0.3.5"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10d6bb888be1153d3abeb9006b11b02cf5e9b209fda28693c31ae1e4e012e314"
+checksum = "4caa2b2b68b880003057c1dd49f1ed937e38f22fcf6c212188a121f08cf40a65"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1909,15 +1982,15 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.5"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789"
+checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb"
 
 [[package]]
 name = "futures-lite"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "381a7ad57b1bad34693f63f6f377e1abded7a9c85c9d3eb6771e11c60aaadab9"
+checksum = "5e6c079abfac3ab269e2927ec048dabc89d009ebfdda6b8ee86624f30c689658"
 dependencies = [
  "fastrand",
  "futures-core",
@@ -1930,9 +2003,9 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.5"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39"
+checksum = "77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556"
 dependencies = [
  "proc-macro-hack",
  "proc-macro2",
@@ -1942,15 +2015,15 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.5"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc"
+checksum = "f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d"
 
 [[package]]
 name = "futures-task"
-version = "0.3.5"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626"
+checksum = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d"
 dependencies = [
  "once_cell",
 ]
@@ -1973,11 +2046,11 @@ dependencies = [
 
 [[package]]
 name = "futures-util"
-version = "0.3.5"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6"
+checksum = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2"
 dependencies = [
- "futures 0.1.29",
+ "futures 0.1.30",
  "futures-channel",
  "futures-core",
  "futures-io",
@@ -1985,7 +2058,7 @@ dependencies = [
  "futures-sink",
  "futures-task",
  "memchr",
- "pin-project 0.4.22",
+ "pin-project 1.0.2",
  "pin-utils",
  "proc-macro-hack",
  "proc-macro-nested",
@@ -1999,9 +2072,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce54d63f8b0c75023ed920d46fd71d0cbbb830b0ee012726b5b4f506fb6dea5b"
 dependencies = [
  "bytes 0.5.6",
- "futures 0.3.5",
+ "futures 0.3.8",
  "memchr",
- "pin-project 0.4.22",
+ "pin-project 0.4.27",
 ]
 
 [[package]]
@@ -2010,6 +2083,19 @@ version = "0.3.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
 
+[[package]]
+name = "generator"
+version = "0.6.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8cdc09201b2e8ca1b19290cf7e65de2246b8e91fb6874279722189c4de7b94dc"
+dependencies = [
+ "cc",
+ "libc",
+ "log",
+ "rustc_version",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "generic-array"
 version = "0.12.3"
@@ -2021,9 +2107,9 @@ dependencies = [
 
 [[package]]
 name = "generic-array"
-version = "0.14.3"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60fb4bb6bba52f78a471264d9a3b7d026cc0af47b22cd2cffbc0b787ca003e63"
+checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
 dependencies = [
  "typenum",
  "version_check",
@@ -2031,13 +2117,13 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.1.14"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
+checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
 dependencies = [
  "cfg-if 0.1.10",
  "libc",
- "wasi",
+ "wasi 0.9.0+wasi-snapshot-preview1",
  "wasm-bindgen",
 ]
 
@@ -2049,7 +2135,7 @@ checksum = "ee8025cf36f917e6a52cce185b7c7177689b838b7ec138364e50cc2277a56cf4"
 dependencies = [
  "cfg-if 0.1.10",
  "libc",
- "wasi",
+ "wasi 0.9.0+wasi-snapshot-preview1",
 ]
 
 [[package]]
@@ -2074,9 +2160,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724"
+checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
 
 [[package]]
 name = "glob"
@@ -2086,9 +2172,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
 
 [[package]]
 name = "globset"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ad1da430bd7281dde2576f44c84cc3f0f7b475e7202cd503042dff01a8c8120"
+checksum = "c152169ef1e421390738366d2f796655fec62621dabbd0fd476f905934061e4a"
 dependencies = [
  "aho-corasick",
  "bstr",
@@ -2119,7 +2205,7 @@ dependencies = [
  "byteorder",
  "bytes 0.4.12",
  "fnv",
- "futures 0.1.29",
+ "futures 0.1.30",
  "http 0.1.21",
  "indexmap",
  "log",
@@ -2130,9 +2216,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "993f9e0baeed60001cf565546b0d3dbe6a6ad23f2bd31644a133c641eccf6d53"
+checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
@@ -2142,9 +2228,10 @@ dependencies = [
  "http 0.2.1",
  "indexmap",
  "slab",
- "tokio 0.2.22",
+ "tokio 0.2.23",
  "tokio-util",
  "tracing",
+ "tracing-futures",
 ]
 
 [[package]]
@@ -2155,9 +2242,9 @@ checksum = "d36fab90f82edc3c747f9d438e06cf0a491055896f2a279638bb5beed6c40177"
 
 [[package]]
 name = "handlebars"
-version = "3.5.0"
+version = "3.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcd1b5399b9884f9ae18b5d4105d180720c8f602aeb73d3ceae9d6b1d13a5fa7"
+checksum = "2764f9796c0ddca4b82c07f25dd2cb3db30b9a8f47940e78e1c883d9e95c3db9"
 dependencies = [
  "log",
  "pest",
@@ -2194,12 +2281,21 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34f595585f103464d8d2f6e9864682d74c1601fed5e07d62b1c9058dba8246fb"
+checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25"
 dependencies = [
  "ahash 0.3.8",
- "autocfg 1.0.0",
+ "autocfg 1.0.1",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
+dependencies = [
+ "ahash 0.4.6",
 ]
 
 [[package]]
@@ -2213,9 +2309,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.1.15"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9"
+checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
 dependencies = [
  "libc",
 ]
@@ -2271,9 +2367,9 @@ dependencies = [
 
 [[package]]
 name = "honggfuzz"
-version = "0.5.49"
+version = "0.5.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "832bac18a82ec7d6c21887daa8616b238fe90d5d5e762d0d4b9372cdaa9e097f"
+checksum = "6f085725a5828d7e959f014f624773094dfe20acc91be310ef106923c30594bc"
 dependencies = [
  "arbitrary",
  "lazy_static",
@@ -2309,7 +2405,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d"
 dependencies = [
  "bytes 0.4.12",
- "futures 0.1.29",
+ "futures 0.1.30",
  "http 0.1.21",
  "tokio-buf",
 ]
@@ -2330,6 +2426,12 @@ version = "1.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
 
+[[package]]
+name = "httpdate"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47"
+
 [[package]]
 name = "humantime"
 version = "1.3.0"
@@ -2346,7 +2448,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9dbe6ed1438e1f8ad955a4701e9a944938e9519f6888d12d8558b645e247d5f6"
 dependencies = [
  "bytes 0.4.12",
- "futures 0.1.29",
+ "futures 0.1.30",
  "futures-cpupool",
  "h2 0.1.26",
  "http 0.1.21",
@@ -2371,23 +2473,23 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "0.13.7"
+version = "0.13.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e68a8dd9716185d9e64ea473ea6ef63529252e3e27623295a0378a19665d5eb"
+checksum = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf"
 dependencies = [
  "bytes 0.5.6",
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2 0.2.6",
+ "h2 0.2.7",
  "http 0.2.1",
  "http-body 0.3.1",
  "httparse",
+ "httpdate",
  "itoa",
- "pin-project 0.4.22",
+ "pin-project 1.0.2",
  "socket2",
- "time",
- "tokio 0.2.22",
+ "tokio 0.2.23",
  "tower-service",
  "tracing",
  "want 0.3.0",
@@ -2402,11 +2504,11 @@ dependencies = [
  "bytes 0.5.6",
  "ct-logs",
  "futures-util",
- "hyper 0.13.7",
+ "hyper 0.13.9",
  "log",
  "rustls",
  "rustls-native-certs",
- "tokio 0.2.22",
+ "tokio 0.2.23",
  "tokio-rustls",
  "webpki",
 ]
@@ -2435,9 +2537,9 @@ dependencies = [
 
 [[package]]
 name = "if-addrs"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f12906406f12abf5569643c46b29aec78313dc1537b17dd5c5250169790c4db9"
+checksum = "28538916eb3f3976311f5dfbe67b5362d0add1293d0a9cad17debf86f8e3aa48"
 dependencies = [
  "if-addrs-sys",
  "libc",
@@ -2446,9 +2548,9 @@ dependencies = [
 
 [[package]]
 name = "if-addrs-sys"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e2556f16544202bcfe0aa5d20a01a6b815f736b136b3ad76dc547ee6b5bb1df"
+checksum = "de74b9dd780476e837e5eb5ab7c88b49ed304126e412030a0adba99c8efe79ea"
 dependencies = [
  "cc",
  "libc",
@@ -2494,26 +2596,32 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "1.5.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b88cd59ee5f71fea89a62248fc8f387d44400cefe05ef548466d61ced9029a7"
+checksum = "55e2e4c765aa53a0424761bf9f41aa7a6ac1efa87238f59560640e27fca028f2"
 dependencies = [
- "autocfg 1.0.0",
- "hashbrown 0.8.1",
+ "autocfg 1.0.1",
+ "hashbrown 0.9.1",
  "serde",
 ]
 
 [[package]]
 name = "instant"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b141fdc7836c525d4d594027d318c84161ca17aaf8113ab1f81ab93ae897485"
+checksum = "cb1fc4429a33e1f80d41dc9fea4d108a88bec1de8053878898ae448a0b52f613"
+dependencies = [
+ "cfg-if 1.0.0",
+]
 
 [[package]]
 name = "integer-sqrt"
-version = "0.1.3"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f65877bf7d44897a473350b1046277941cee20b263397e90869c50b6e766088b"
+checksum = "276ec31bcb4a9ee45f58bec6f9ec700ae4cf4f4f8f2fa7e06cb406bd5ffdd770"
+dependencies = [
+ "num-traits",
+]
 
 [[package]]
 name = "intervalier"
@@ -2521,7 +2629,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64fa110ec7b8f493f416eed552740d10e7030ad5f63b2308f82c9608ec2df275"
 dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
  "futures-timer 2.0.2",
 ]
 
@@ -2581,9 +2689,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.39"
+version = "0.3.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa5a448de267e7358beaf4a5d849518fe9a0c13fce7afd44b06e68550e5562a7"
+checksum = "85a7e2c92a4804dd459b86c339278d0fe87cf93757fae222c3fa3ae75458bc73"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2595,7 +2703,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "489b9c612e60c766f751ab40fcb43cbb55a1e10bb44a9b4307ed510ca598cbd7"
 dependencies = [
  "failure",
- "futures 0.1.29",
+ "futures 0.1.30",
  "hyper 0.12.35",
  "jsonrpc-core",
  "jsonrpc-pubsub",
@@ -2611,7 +2719,7 @@ version = "15.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0745a6379e3edc893c84ec203589790774e4247420033e71a76d3ab4687991fa"
 dependencies = [
- "futures 0.1.29",
+ "futures 0.1.30",
  "log",
  "serde",
  "serde_derive",
@@ -2754,7 +2862,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0315ef2f688e33844400b31f11c263f2b3dc21d8b9355c6891c5f185fae43f9a"
 dependencies = [
  "parity-util-mem",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
 ]
 
 [[package]]
@@ -2783,7 +2891,7 @@ dependencies = [
  "parking_lot 0.10.2",
  "regex",
  "rocksdb",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
 ]
 
 [[package]]
@@ -2792,7 +2900,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2701a1369d6ea4f1b9f606db46e5e2a4a8e47f22530a07823d653f85ab1f6c34"
 dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
  "js-sys",
  "kvdb",
  "kvdb-memorydb",
@@ -2811,9 +2919,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "lazycell"
-version = "1.2.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "leb128"
@@ -2823,9 +2931,9 @@ checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a"
 
 [[package]]
 name = "libc"
-version = "0.2.79"
+version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2448f6066e80e3bfc792e9c98bf705b4b0fc6e8ef5b43e5889aff0eaa9c58743"
+checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614"
 
 [[package]]
 name = "libloading"
@@ -2851,7 +2959,7 @@ checksum = "e3c2b4c99f8798be90746fc226acf95d3e6cff0655883634cc30dab1f64f438b"
 dependencies = [
  "atomic",
  "bytes 0.5.6",
- "futures 0.3.5",
+ "futures 0.3.8",
  "lazy_static",
  "libp2p-core",
  "libp2p-core-derive",
@@ -2876,9 +2984,9 @@ dependencies = [
  "libp2p-yamux",
  "multihash",
  "parity-multiaddr",
- "parking_lot 0.11.0",
- "pin-project 1.0.1",
- "smallvec 1.4.1",
+ "parking_lot 0.11.1",
+ "pin-project 1.0.2",
+ "smallvec 1.5.0",
  "wasm-timer",
 ]
 
@@ -2893,7 +3001,7 @@ dependencies = [
  "ed25519-dalek",
  "either",
  "fnv",
- "futures 0.3.5",
+ "futures 0.3.8",
  "futures-timer 3.0.2",
  "lazy_static",
  "libsecp256k1",
@@ -2901,15 +3009,15 @@ dependencies = [
  "multihash",
  "multistream-select",
  "parity-multiaddr",
- "parking_lot 0.11.0",
- "pin-project 1.0.1",
+ "parking_lot 0.11.1",
+ "pin-project 1.0.2",
  "prost",
  "prost-build",
  "rand 0.7.3",
  "ring",
  "rw-stream-sink",
- "sha2 0.9.1",
- "smallvec 1.4.1",
+ "sha2 0.9.2",
+ "smallvec 1.5.0",
  "thiserror",
  "unsigned-varint 0.5.1",
  "void",
@@ -2933,7 +3041,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34aea69349e70a58ef9ecd21ac12c5eaa36255ac6986828079d26393f9e618cb"
 dependencies = [
  "flate2",
- "futures 0.3.5",
+ "futures 0.3.8",
  "libp2p-core",
 ]
 
@@ -2943,7 +3051,7 @@ version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0baeff71fb5cb1fe1604f74a712a44b66a8c5900f4022411a1d550f09d6bb776"
 dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
  "libp2p-core",
  "log",
 ]
@@ -2956,14 +3064,14 @@ checksum = "db0f925a45f310b678e70faf71a10023b829d02eb9cc2628a63de928936f3ade"
 dependencies = [
  "cuckoofilter",
  "fnv",
- "futures 0.3.5",
+ "futures 0.3.8",
  "libp2p-core",
  "libp2p-swarm",
  "log",
  "prost",
  "prost-build",
  "rand 0.7.3",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
 ]
 
 [[package]]
@@ -2976,7 +3084,7 @@ dependencies = [
  "byteorder",
  "bytes 0.5.6",
  "fnv",
- "futures 0.3.5",
+ "futures 0.3.8",
  "futures_codec",
  "hex_fmt",
  "libp2p-core",
@@ -2986,8 +3094,8 @@ dependencies = [
  "prost",
  "prost-build",
  "rand 0.7.3",
- "sha2 0.9.1",
- "smallvec 1.4.1",
+ "sha2 0.9.2",
+ "smallvec 1.5.0",
  "unsigned-varint 0.5.1",
  "wasm-timer",
 ]
@@ -2998,13 +3106,13 @@ version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e074124669840484de564901d47f2d0892e73f6d8ee7c37e9c2644af1b217bf4"
 dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
  "libp2p-core",
  "libp2p-swarm",
  "log",
  "prost",
  "prost-build",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
  "wasm-timer",
 ]
 
@@ -3014,11 +3122,11 @@ version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78a2653b2e3254a3bbeb66bfc3f0dca7d6cba6aa2a96791db114003dec1b5394"
 dependencies = [
- "arrayvec 0.5.1",
+ "arrayvec 0.5.2",
  "bytes 0.5.6",
  "either",
  "fnv",
- "futures 0.3.5",
+ "futures 0.3.8",
  "futures_codec",
  "libp2p-core",
  "libp2p-swarm",
@@ -3027,8 +3135,8 @@ dependencies = [
  "prost",
  "prost-build",
  "rand 0.7.3",
- "sha2 0.9.1",
- "smallvec 1.4.1",
+ "sha2 0.9.2",
+ "smallvec 1.5.0",
  "uint",
  "unsigned-varint 0.5.1",
  "void",
@@ -3045,14 +3153,14 @@ dependencies = [
  "data-encoding",
  "dns-parser",
  "either",
- "futures 0.3.5",
+ "futures 0.3.8",
  "lazy_static",
  "libp2p-core",
  "libp2p-swarm",
  "log",
  "net2",
  "rand 0.7.3",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
  "void",
  "wasm-timer",
 ]
@@ -3064,14 +3172,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed764eab613a8fb6b7dcf6c796f55a06fef2270e528329903e25cd3311b99663"
 dependencies = [
  "bytes 0.5.6",
- "futures 0.3.5",
+ "futures 0.3.8",
  "futures_codec",
  "libp2p-core",
  "log",
  "nohash-hasher",
- "parking_lot 0.11.0",
+ "parking_lot 0.11.1",
  "rand 0.7.3",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
  "unsigned-varint 0.5.1",
 ]
 
@@ -3083,17 +3191,17 @@ checksum = "fb441fb015ec16690099c5d910fcba271d357763b3dcb784db7b27bbb0b68372"
 dependencies = [
  "bytes 0.5.6",
  "curve25519-dalek 3.0.0",
- "futures 0.3.5",
+ "futures 0.3.8",
  "lazy_static",
  "libp2p-core",
  "log",
  "prost",
  "prost-build",
  "rand 0.7.3",
- "sha2 0.9.1",
+ "sha2 0.9.2",
  "snow",
  "static_assertions",
- "x25519-dalek 1.1.0",
+ "x25519-dalek",
  "zeroize",
 ]
 
@@ -3103,7 +3211,7 @@ version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "82e5c50936cfdbe96a514e8992f304fa44cd3a681b6f779505f1ae62b3474705"
 dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3119,7 +3227,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21026557c335d3639591f247b19b7536195772034ec7e9c463137227f95eaaa1"
 dependencies = [
  "bytes 0.5.6",
- "futures 0.3.5",
+ "futures 0.3.8",
  "futures_codec",
  "libp2p-core",
  "log",
@@ -3135,9 +3243,9 @@ version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96b3c2d5d26a9500e959a0e19743897239a6c4be78dadf99b70414301a70c006"
 dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
  "log",
- "pin-project 0.4.22",
+ "pin-project 0.4.27",
  "rand 0.7.3",
  "salsa20",
  "sha3 0.9.1",
@@ -3151,14 +3259,14 @@ checksum = "2dd9a1e0e6563dec1c9e702f7e68bdaa43da62a84536aa06372d3fed3e25d4ca"
 dependencies = [
  "async-trait",
  "bytes 0.5.6",
- "futures 0.3.5",
+ "futures 0.3.8",
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "lru 0.6.0",
+ "lru 0.6.1",
  "minicbor",
  "rand 0.7.3",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
  "unsigned-varint 0.5.1",
  "wasm-timer",
 ]
@@ -3170,11 +3278,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "565f0e06674b4033c978471e4083d5aaa8e03cef0719a0ec0905aaeaad39a919"
 dependencies = [
  "either",
- "futures 0.3.5",
+ "futures 0.3.8",
  "libp2p-core",
  "log",
  "rand 0.7.3",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
  "void",
  "wasm-timer",
 ]
@@ -3186,7 +3294,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33f3dce259c0d3127af5167f45c275b6c047320efdd0e40fde947482487af0a3"
 dependencies = [
  "async-std",
- "futures 0.3.5",
+ "futures 0.3.8",
  "futures-timer 3.0.2",
  "if-addrs",
  "ipnet",
@@ -3202,7 +3310,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e0aba04370a00d8d0236e350bc862926c1b42542a169aa6a481e660e5b990fe"
 dependencies = [
  "async-std",
- "futures 0.3.5",
+ "futures 0.3.8",
  "libp2p-core",
  "log",
 ]
@@ -3213,7 +3321,7 @@ version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c703816f4170477a375b49c56d349e535ce68388f81ba1d9a3c8e2517effa82"
 dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
  "js-sys",
  "libp2p-core",
  "parity-send-wrapper",
@@ -3229,14 +3337,14 @@ checksum = "8d5e7268a959748040a0cf7456ad655be55b87f0ceda03bdb5b53674726b28f7"
 dependencies = [
  "async-tls",
  "either",
- "futures 0.3.5",
+ "futures 0.3.8",
  "libp2p-core",
  "log",
  "quicksink",
  "rustls",
  "rw-stream-sink",
  "soketto",
- "url 2.1.1",
+ "url 2.2.0",
  "webpki",
  "webpki-roots",
 ]
@@ -3247,9 +3355,9 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a0798cbb58535162c40858493d09af06eac42a26e4966e58de0df701f559348"
 dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
  "libp2p-core",
- "parking_lot 0.11.0",
+ "parking_lot 0.11.1",
  "thiserror",
  "yamux",
 ]
@@ -3278,18 +3386,17 @@ dependencies = [
  "hmac-drbg",
  "rand 0.7.3",
  "sha2 0.8.2",
- "subtle 2.2.3",
+ "subtle 2.3.0",
  "typenum",
 ]
 
 [[package]]
 name = "libz-sys"
-version = "1.0.25"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"
+checksum = "602113192b08db8f38796c4e85c39e960c145965140e918018bcde1952429655"
 dependencies = [
  "cc",
- "libc",
  "pkg-config",
  "vcpkg",
 ]
@@ -3322,9 +3429,9 @@ dependencies = [
 
 [[package]]
 name = "lite-json"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c73e713a23ac6e12074c9e96ef2dfb770921e0cb9244c093bd38424209e0e523"
+checksum = "0460d985423a026b4d9b828a7c6eed1bcf606f476322f3f9b507529686a61715"
 dependencies = [
  "lite-parser",
 ]
@@ -3349,9 +3456,9 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28247cc5a5be2f05fbcd76dd0cf2c7d3b5400cb978a28042abcd4fa0b3f8261c"
+checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312"
 dependencies = [
  "scopeguard",
 ]
@@ -3365,6 +3472,19 @@ dependencies = [
  "cfg-if 0.1.10",
 ]
 
+[[package]]
+name = "loom"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0e8460f2f2121162705187214720353c517b97bdfb3494c0b1e33d83ebe4bed"
+dependencies = [
+ "cfg-if 0.1.10",
+ "generator",
+ "scoped-tls",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "lru"
 version = "0.4.3"
@@ -3385,11 +3505,11 @@ dependencies = [
 
 [[package]]
 name = "lru"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "111b945ac72ec09eb7bc62a0fbdc3cc6e80555a7245f52a69d3921a75b53b153"
+checksum = "be716eb6878ca2263eb5d00a781aa13264a794f519fe6af4fbb2668b2d5441c0"
 dependencies = [
- "hashbrown 0.8.1",
+ "hashbrown 0.9.1",
 ]
 
 [[package]]
@@ -3445,9 +3565,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
 
 [[package]]
 name = "memchr"
-version = "2.3.3"
+version = "2.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
 
 [[package]]
 name = "memmap"
@@ -3461,11 +3581,11 @@ dependencies = [
 
 [[package]]
 name = "memoffset"
-version = "0.5.5"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f"
+checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa"
 dependencies = [
- "autocfg 1.0.0",
+ "autocfg 1.0.1",
 ]
 
 [[package]]
@@ -3475,7 +3595,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "36f36ddb0b2cdc25d38babba472108798e3477f02be5165f038c5e393e50c57a"
 dependencies = [
  "hash-db",
- "hashbrown 0.8.1",
+ "hashbrown 0.8.2",
  "parity-util-mem",
 ]
 
@@ -3519,11 +3639,12 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.4.0"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be0f75932c1f6cfae3c04000e40114adf955636e19040f9c0a2c380702aa1c7f"
+checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d"
 dependencies = [
  "adler",
+ "autocfg 1.0.1",
 ]
 
 [[package]]
@@ -3565,7 +3686,7 @@ checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656"
 dependencies = [
  "log",
  "mio",
- "miow 0.3.5",
+ "miow 0.3.6",
  "winapi 0.3.9",
 ]
 
@@ -3594,9 +3715,9 @@ dependencies = [
 
 [[package]]
 name = "miow"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07b88fb9795d4d36d62a012dfbf49a8f5cf12751f36d31a9dbe66d528e58979e"
+checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897"
 dependencies = [
  "socket2",
  "winapi 0.3.9",
@@ -3618,16 +3739,16 @@ dependencies = [
  "blake2s_simd",
  "digest 0.9.0",
  "sha-1 0.9.2",
- "sha2 0.9.1",
+ "sha2 0.9.2",
  "sha3 0.9.1",
  "unsigned-varint 0.5.1",
 ]
 
 [[package]]
 name = "multimap"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8883adfde9756c1d30b0f519c9b8c502a94b41ac62f696453c37c7fc0a958ce"
+checksum = "1255076139a83bb467426e7f8d0134968a8118844faa755985e077cf31850333"
 
 [[package]]
 name = "multistream-select"
@@ -3636,10 +3757,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "93faf2e41f9ee62fb01680ed48f3cc26652352327aa2e59869070358f6b7dd75"
 dependencies = [
  "bytes 0.5.6",
- "futures 0.3.5",
+ "futures 0.3.8",
  "log",
- "pin-project 1.0.1",
- "smallvec 1.4.1",
+ "pin-project 1.0.2",
+ "smallvec 1.5.0",
  "unsigned-varint 0.5.1",
 ]
 
@@ -3669,11 +3790,21 @@ dependencies = [
  "rand 0.3.23",
 ]
 
+[[package]]
+name = "nb-connect"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8123a81538e457d44b933a02faf885d3fe8408806b23fa700e8f01c6c3a98998"
+dependencies = [
+ "libc",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "net2"
-version = "0.2.34"
+version = "0.2.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7"
+checksum = "3ebc3ec692ed7c9a255596c67808dee269f64655d8baf7b4f0638e51ba1d6853"
 dependencies = [
  "cfg-if 0.1.10",
  "libc",
@@ -3699,7 +3830,7 @@ version = "0.8.0"
 dependencies = [
  "derive_more",
  "fs_extra",
- "futures 0.3.5",
+ "futures 0.3.8",
  "hash-db",
  "hex",
  "kvdb",
@@ -3735,7 +3866,7 @@ dependencies = [
 name = "node-browser-testing"
 version = "2.0.0"
 dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
  "futures-timer 3.0.2",
  "jsonrpc-core",
  "libp2p",
@@ -3756,7 +3887,7 @@ dependencies = [
  "frame-benchmarking-cli",
  "frame-support",
  "frame-system",
- "futures 0.3.5",
+ "futures 0.3.8",
  "hex-literal",
  "log",
  "nix",
@@ -3923,7 +4054,7 @@ dependencies = [
 name = "node-rpc-client"
 version = "2.0.0"
 dependencies = [
- "futures 0.1.29",
+ "futures 0.1.30",
  "hyper 0.12.35",
  "jsonrpc-core-client",
  "log",
@@ -4078,7 +4209,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "fs_extra",
- "futures 0.3.5",
+ "futures 0.3.8",
  "log",
  "node-executor",
  "node-primitives",
@@ -4142,7 +4273,7 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304"
 dependencies = [
- "autocfg 1.0.0",
+ "autocfg 1.0.1",
  "num-integer",
  "num-traits",
 ]
@@ -4153,17 +4284,17 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95"
 dependencies = [
- "autocfg 1.0.0",
+ "autocfg 1.0.1",
  "num-traits",
 ]
 
 [[package]]
 name = "num-integer"
-version = "0.1.43"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b"
+checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
 dependencies = [
- "autocfg 1.0.0",
+ "autocfg 1.0.1",
  "num-traits",
 ]
 
@@ -4173,7 +4304,7 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
 dependencies = [
- "autocfg 1.0.0",
+ "autocfg 1.0.1",
  "num-bigint",
  "num-integer",
  "num-traits",
@@ -4181,11 +4312,11 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.12"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611"
+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
 dependencies = [
- "autocfg 1.0.0",
+ "autocfg 1.0.1",
  "libm",
 ]
 
@@ -4216,13 +4347,19 @@ dependencies = [
  "wasmparser 0.57.0",
 ]
 
+[[package]]
+name = "object"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397"
+
 [[package]]
 name = "once_cell"
-version = "1.4.1"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad"
+checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
 dependencies = [
- "parking_lot 0.11.0",
+ "parking_lot 0.11.1",
 ]
 
 [[package]]
@@ -4430,7 +4567,7 @@ dependencies = [
  "pallet-timestamp",
  "parity-scale-codec",
  "parity-wasm 0.41.0",
- "paste 1.0.0",
+ "paste 1.0.3",
  "pretty_assertions",
  "pwasm-utils 0.16.0",
  "rand 0.7.3",
@@ -5051,7 +5188,7 @@ dependencies = [
  "pallet-transaction-payment-rpc-runtime-api",
  "parity-scale-codec",
  "serde",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5157,9 +5294,9 @@ dependencies = [
 
 [[package]]
 name = "parity-multiaddr"
-version = "0.9.4"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22fe99b938abd57507e37f8d4ef30cd74b33c71face2809b37b8beb71bab15ab"
+checksum = "43244a26dc1ddd3097216bb12eaa6cf8a07b060c72718d9ebd60fd297d6401df"
 dependencies = [
  "arrayref",
  "bs58 0.4.0",
@@ -5170,16 +5307,16 @@ dependencies = [
  "serde",
  "static_assertions",
  "unsigned-varint 0.5.1",
- "url 2.1.1",
+ "url 2.2.0",
 ]
 
 [[package]]
 name = "parity-scale-codec"
-version = "1.3.4"
+version = "1.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34d38aeaffc032ec69faa476b3caaca8d4dd7f3f798137ff30359e5c7869ceb6"
+checksum = "7c740e5fbcb6847058b40ac7e5574766c6388f585e184d769910fe0d3a2ca861"
 dependencies = [
- "arrayvec 0.5.1",
+ "arrayvec 0.5.2",
  "bitvec",
  "byte-slice-cast",
  "parity-scale-codec-derive",
@@ -5188,9 +5325,9 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec-derive"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd20ff7e0399b274a5f5bb37b712fccb5b3a64b9128200d1c3cc40fe709cb073"
+checksum = "198db82bb1c18fc00176004462dd809b2a6d851669550aa17af6dacd21ae0c14"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -5211,11 +5348,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e57fea504fea33f9fbb5f49f378359030e7e026a6ab849bb9e8f0787376f1bf"
 dependencies = [
  "bytes 0.4.12",
- "futures 0.1.29",
+ "futures 0.1.30",
  "libc",
  "log",
  "mio-named-pipes",
- "miow 0.3.5",
+ "miow 0.3.6",
  "rand 0.7.3",
  "tokio 0.1.22",
  "tokio-named-pipes",
@@ -5231,13 +5368,13 @@ checksum = "297ff91fa36aec49ce183484b102f6b75b46776822bd81525bfc4cc9b0dd0f5c"
 dependencies = [
  "cfg-if 0.1.10",
  "ethereum-types",
- "hashbrown 0.8.1",
+ "hashbrown 0.8.2",
  "impl-trait-for-tuples",
  "lru 0.5.3",
  "parity-util-mem-derive",
  "parking_lot 0.10.2",
  "primitive-types",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
  "winapi 0.3.9",
 ]
 
@@ -5282,7 +5419,7 @@ dependencies = [
  "rand 0.7.3",
  "sha-1 0.8.2",
  "slab",
- "url 2.1.1",
+ "url 2.2.0",
 ]
 
 [[package]]
@@ -5314,12 +5451,12 @@ dependencies = [
 
 [[package]]
 name = "parking_lot"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4893845fa2ca272e647da5d0e46660a314ead9c2fdd9a883aabc32e481a8733"
+checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
 dependencies = [
  "instant",
- "lock_api 0.4.1",
+ "lock_api 0.4.2",
  "parking_lot_core 0.8.0",
 ]
 
@@ -5348,7 +5485,7 @@ dependencies = [
  "cloudabi 0.0.3",
  "libc",
  "redox_syscall",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
  "winapi 0.3.9",
 ]
 
@@ -5363,7 +5500,7 @@ dependencies = [
  "instant",
  "libc",
  "redox_syscall",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
  "winapi 0.3.9",
 ]
 
@@ -5379,9 +5516,9 @@ dependencies = [
 
 [[package]]
 name = "paste"
-version = "1.0.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ddc8e145de01d9180ac7b78b9676f95a9c2447f6a88b2c2a04702211bc5d71"
+checksum = "7151b083b0664ed58ed669fcdd92f01c3d2fdbf10af4931a301474950b52bfa9"
 
 [[package]]
 name = "paste-impl"
@@ -5490,27 +5627,27 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "0.4.22"
+version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12e3a6cdbfe94a5e4572812a0201f8c0ed98c1c452c7b8563ce2276988ef9c17"
+checksum = "2ffbc8e94b38ea3d2d8ba92aea2983b503cd75d0888d75b86bb37970b5698e15"
 dependencies = [
- "pin-project-internal 0.4.22",
+ "pin-project-internal 0.4.27",
 ]
 
 [[package]]
 name = "pin-project"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee41d838744f60d959d7074e3afb6b35c7456d0f61cad38a24e35e6553f73841"
+checksum = "9ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7"
 dependencies = [
- "pin-project-internal 1.0.1",
+ "pin-project-internal 1.0.2",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "0.4.22"
+version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a0ffd45cf79d88737d7cc85bfd5d2894bee1139b356e616fe85dc389c61aaf7"
+checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5519,9 +5656,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-internal"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81a4ffa594b66bff340084d4081df649a7dc049ac8d7fc458d8e628bfbbb2f86"
+checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5530,9 +5667,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.1.7"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282adbf10f2698a7a77f8e983a74b2d18176c19a7fd32a45446139ae7b02b715"
+checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b"
 
 [[package]]
 name = "pin-utils"
@@ -5542,9 +5679,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33"
+checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
 
 [[package]]
 name = "platforms"
@@ -5566,31 +5703,31 @@ dependencies = [
 
 [[package]]
 name = "polling"
-version = "1.1.0"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0720e0b9ea9d52451cf29d3413ba8a9303f8815d9d9653ef70e03ff73e65566"
+checksum = "a2a7bc6b2a29e632e45451c941832803a18cce6781db04de8a04696cdca8bde4"
 dependencies = [
  "cfg-if 0.1.10",
  "libc",
  "log",
- "wepoll-sys-stjepang",
+ "wepoll-sys",
  "winapi 0.3.9",
 ]
 
 [[package]]
 name = "poly1305"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b42192ab143ed7619bf888a7f9c6733a9a2153b218e2cd557cfdb52fbf9bb1"
+checksum = "22ce46de8e53ee414ca4d02bfefac75d8c12fba948b76622a40b4be34dfce980"
 dependencies = [
  "universal-hash",
 ]
 
 [[package]]
 name = "polyval"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9a50142b55ab3ed0e9f68dfb3709f1d90d29da24e91033f28b96330643107dc"
+checksum = "a5884790f1ce3553ad55fec37b5aaac5882e0e845a2612df744d6c85c9bf046c"
 dependencies = [
  "cfg-if 0.1.10",
  "universal-hash",
@@ -5598,9 +5735,9 @@ dependencies = [
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.8"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea"
+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
 
 [[package]]
 name = "predicates"
@@ -5642,9 +5779,9 @@ dependencies = [
 
 [[package]]
 name = "primitive-types"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c55c21c64d0eaa4d7ed885d959ef2d62d9e488c27c0e02d9aa5ce6c877b7d5f8"
+checksum = "7dd39dcacf71411ba488570da7bbc89b717225e46478b30ba99b92db6b149809"
 dependencies = [
  "fixed-hash",
  "impl-codec",
@@ -5664,9 +5801,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-error"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc175e9777c3116627248584e8f8b3e2987405cabe1c0adf7d1dd28f09dc7880"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
  "proc-macro-error-attr",
  "proc-macro2",
@@ -5677,22 +5814,20 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-error-attr"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cc9795ca17eb581285ec44936da7fc2335a3f34f2ddd13118b6f4d515435c50"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
- "syn-mid",
  "version_check",
 ]
 
 [[package]]
 name = "proc-macro-hack"
-version = "0.5.16"
+version = "0.5.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4"
+checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
 
 [[package]]
 name = "proc-macro-nested"
@@ -5718,7 +5853,7 @@ dependencies = [
  "cfg-if 0.1.10",
  "fnv",
  "lazy_static",
- "parking_lot 0.11.0",
+ "parking_lot 0.11.1",
  "regex",
  "thiserror",
 ]
@@ -5907,7 +6042,7 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
 dependencies = [
- "getrandom 0.1.14",
+ "getrandom 0.1.15",
  "libc",
  "rand_chacha 0.2.2",
  "rand_core 0.5.1",
@@ -5956,7 +6091,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
 dependencies = [
- "getrandom 0.1.14",
+ "getrandom 0.1.15",
 ]
 
 [[package]]
@@ -6059,25 +6194,25 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
 
 [[package]]
 name = "rayon"
-version = "1.3.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f02856753d04e03e26929f820d0a0a337ebe71f849801eea335d464b349080"
+checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
 dependencies = [
- "autocfg 1.0.0",
- "crossbeam-deque",
+ "autocfg 1.0.1",
+ "crossbeam-deque 0.8.0",
  "either",
  "rayon-core",
 ]
 
 [[package]]
 name = "rayon-core"
-version = "1.7.1"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e92e15d89083484e11353891f1af602cc661426deb9564c298b270c726973280"
+checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
 dependencies = [
- "crossbeam-deque",
- "crossbeam-queue",
- "crossbeam-utils",
+ "crossbeam-channel",
+ "crossbeam-deque 0.8.0",
+ "crossbeam-utils 0.8.0",
  "lazy_static",
  "num_cpus",
 ]
@@ -6099,29 +6234,29 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
 
 [[package]]
 name = "redox_users"
-version = "0.3.4"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431"
+checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
 dependencies = [
- "getrandom 0.1.14",
+ "getrandom 0.1.15",
  "redox_syscall",
  "rust-argon2",
 ]
 
 [[package]]
 name = "ref-cast"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "745c1787167ddae5569661d5ffb8b25ae5fedbf46717eaa92d652221cec72623"
+checksum = "e17626b2f4bcf35b84bf379072a66e28cfe5c3c6ae58b38e4914bb8891dabece"
 dependencies = [
  "ref-cast-impl",
 ]
 
 [[package]]
 name = "ref-cast-impl"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d21b475ab879ef0e315ad99067fa25778c3b0377f57f1b00207448dac1a3144"
+checksum = "0c523ccaed8ac4b0288948849a350b37d3035827413c458b6a40ddb614bb4f72"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6136,7 +6271,7 @@ checksum = "b9ba8aaf5fe7cf307c6dbdaeed85478961d29e25e3bee5169e11b92fa9f027a8"
 dependencies = [
  "log",
  "rustc-hash",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
 ]
 
 [[package]]
@@ -6196,9 +6331,9 @@ checksum = "e005d658ad26eacc2b6c506dfde519f4e277e328d0eb3379ca61647d70a8f531"
 
 [[package]]
 name = "ring"
-version = "0.16.15"
+version = "0.16.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "952cd6b98c85bbc30efa1ba5783b8abf12fec8b3287ffa52605b9432313e34e4"
+checksum = "b72b84d47e8ec5a4f2872e8262b8f8256c5be1c938a7d6d3a867a3ba8f722f74"
 dependencies = [
  "cc",
  "libc",
@@ -6222,13 +6357,24 @@ dependencies = [
 
 [[package]]
 name = "rlp"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a7d3f9bed94764eac15b8f14af59fac420c236adaff743b7bcc88e265cb4345"
+checksum = "1190dcc8c3a512f1eef5d09bb8c84c7f39e1054e174d1795482e18f5272f2e73"
 dependencies = [
  "rustc-hex",
 ]
 
+[[package]]
+name = "rlp-derive"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e33d7b2abe0c340d8797fe2907d3f20d3b5ea5908683618bfe80df7f621f672a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "rocksdb"
 version = "0.15.0"
@@ -6251,21 +6397,21 @@ dependencies = [
 
 [[package]]
 name = "rust-argon2"
-version = "0.7.0"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017"
+checksum = "9dab61250775933275e84053ac235621dfb739556d5c54a2f2e9313b7cf43a19"
 dependencies = [
- "base64 0.11.0",
+ "base64 0.12.3",
  "blake2b_simd",
  "constant_time_eq",
- "crossbeam-utils",
+ "crossbeam-utils 0.7.2",
 ]
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.16"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
+checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232"
 
 [[package]]
 name = "rustc-hash"
@@ -6290,9 +6436,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.18.0"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cac94b333ee2aac3284c5b8a1b7fb4dd11cba88c244e3fe33cdbd047af0eb693"
+checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81"
 dependencies = [
  "base64 0.12.3",
  "log",
@@ -6315,14 +6461,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9bdc5e856e51e685846fb6c13a1f5e5432946c2c90501bdc76a1319f19e29da"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
+checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd"
 
 [[package]]
 name = "rw-stream-sink"
@@ -6330,8 +6471,8 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020"
 dependencies = [
- "futures 0.3.5",
- "pin-project 0.4.22",
+ "futures 0.3.8",
+ "pin-project 0.4.27",
  "static_assertions",
 ]
 
@@ -6356,7 +6497,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7f47b10fa80f6969bbbd9c8e7cc998f082979d402a9e10579e2303a87955395"
 dependencies = [
- "stream-cipher 0.7.1",
+ "stream-cipher",
 ]
 
 [[package]]
@@ -6376,7 +6517,7 @@ dependencies = [
  "bytes 0.5.6",
  "derive_more",
  "either",
- "futures 0.3.5",
+ "futures 0.3.8",
  "futures-timer 3.0.2",
  "libp2p",
  "log",
@@ -6405,7 +6546,7 @@ dependencies = [
 name = "sc-basic-authorship"
 version = "0.8.0"
 dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
  "futures-timer 3.0.2",
  "log",
  "parity-scale-codec",
@@ -6482,7 +6623,7 @@ dependencies = [
  "atty",
  "chrono",
  "fdlimit",
- "futures 0.3.5",
+ "futures 0.3.8",
  "hex",
  "lazy_static",
  "libp2p",
@@ -6513,7 +6654,7 @@ dependencies = [
  "tempfile",
  "thiserror",
  "tiny-bip39",
- "tokio 0.2.22",
+ "tokio 0.2.23",
  "tracing",
  "tracing-log",
  "tracing-subscriber",
@@ -6535,7 +6676,7 @@ version = "2.0.0"
 dependencies = [
  "derive_more",
  "fnv",
- "futures 0.3.5",
+ "futures 0.3.8",
  "hash-db",
  "hex-literal",
  "kvdb",
@@ -6617,7 +6758,7 @@ name = "sc-consensus-aura"
 version = "0.8.0"
 dependencies = [
  "derive_more",
- "futures 0.3.5",
+ "futures 0.3.8",
  "futures-timer 3.0.2",
  "log",
  "parity-scale-codec",
@@ -6657,7 +6798,7 @@ version = "0.8.0"
 dependencies = [
  "derive_more",
  "fork-tree",
- "futures 0.3.5",
+ "futures 0.3.8",
  "futures-timer 3.0.2",
  "log",
  "merlin",
@@ -6710,7 +6851,7 @@ name = "sc-consensus-babe-rpc"
 version = "0.8.0"
 dependencies = [
  "derive_more",
- "futures 0.3.5",
+ "futures 0.3.8",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -6752,7 +6893,7 @@ version = "0.8.0"
 dependencies = [
  "assert_matches",
  "derive_more",
- "futures 0.3.5",
+ "futures 0.3.8",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -6780,7 +6921,7 @@ dependencies = [
  "substrate-test-runtime-client",
  "substrate-test-runtime-transaction-pool",
  "tempfile",
- "tokio 0.2.22",
+ "tokio 0.2.23",
 ]
 
 [[package]]
@@ -6788,7 +6929,7 @@ name = "sc-consensus-pow"
 version = "0.8.0"
 dependencies = [
  "derive_more",
- "futures 0.3.5",
+ "futures 0.3.8",
  "futures-timer 3.0.2",
  "log",
  "parity-scale-codec",
@@ -6810,7 +6951,7 @@ dependencies = [
 name = "sc-consensus-slots"
 version = "0.8.0"
 dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
  "futures-timer 3.0.2",
  "log",
  "parity-scale-codec",
@@ -6940,12 +7081,12 @@ dependencies = [
  "derive_more",
  "finality-grandpa",
  "fork-tree",
- "futures 0.3.5",
+ "futures 0.3.8",
  "futures-timer 3.0.2",
  "log",
  "parity-scale-codec",
  "parking_lot 0.10.2",
- "pin-project 0.4.22",
+ "pin-project 0.4.27",
  "rand 0.7.3",
  "sc-block-builder",
  "sc-client-api",
@@ -6974,7 +7115,7 @@ dependencies = [
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
  "tempfile",
- "tokio 0.2.22",
+ "tokio 0.2.23",
 ]
 
 [[package]]
@@ -6983,7 +7124,7 @@ version = "0.8.0"
 dependencies = [
  "derive_more",
  "finality-grandpa",
- "futures 0.3.5",
+ "futures 0.3.8",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -7012,7 +7153,7 @@ name = "sc-informant"
 version = "0.8.0"
 dependencies = [
  "ansi_term 0.12.1",
- "futures 0.3.5",
+ "futures 0.3.8",
  "log",
  "parity-util-mem",
  "sc-client-api",
@@ -7030,7 +7171,7 @@ version = "2.0.0"
 dependencies = [
  "async-trait",
  "derive_more",
- "futures 0.3.5",
+ "futures 0.3.8",
  "futures-util",
  "hex",
  "merlin",
@@ -7040,7 +7181,7 @@ dependencies = [
  "sp-application-crypto",
  "sp-core",
  "sp-keystore",
- "subtle 2.2.3",
+ "subtle 2.3.0",
  "tempfile",
 ]
 
@@ -7077,7 +7218,7 @@ dependencies = [
  "erased-serde",
  "fnv",
  "fork-tree",
- "futures 0.3.5",
+ "futures 0.3.8",
  "futures-timer 3.0.2",
  "futures_codec",
  "hex",
@@ -7090,7 +7231,7 @@ dependencies = [
  "nohash-hasher",
  "parity-scale-codec",
  "parking_lot 0.10.2",
- "pin-project 0.4.22",
+ "pin-project 0.4.27",
  "prost",
  "prost-build",
  "quickcheck",
@@ -7128,7 +7269,7 @@ name = "sc-network-gossip"
 version = "0.8.0"
 dependencies = [
  "async-std",
- "futures 0.3.5",
+ "futures 0.3.8",
  "futures-timer 3.0.2",
  "libp2p",
  "log",
@@ -7145,7 +7286,7 @@ dependencies = [
 name = "sc-network-test"
 version = "0.8.0"
 dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
  "futures-timer 3.0.2",
  "libp2p",
  "log",
@@ -7173,9 +7314,9 @@ version = "2.0.0"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
- "futures 0.3.5",
+ "futures 0.3.8",
  "futures-timer 3.0.2",
- "hyper 0.13.7",
+ "hyper 0.13.9",
  "hyper-rustls",
  "lazy_static",
  "log",
@@ -7197,14 +7338,14 @@ dependencies = [
  "sp-utils",
  "substrate-test-runtime-client",
  "threadpool",
- "tokio 0.2.22",
+ "tokio 0.2.23",
 ]
 
 [[package]]
 name = "sc-peerset"
 version = "2.0.0"
 dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
  "libp2p",
  "log",
  "rand 0.7.3",
@@ -7226,8 +7367,8 @@ name = "sc-rpc"
 version = "2.0.0"
 dependencies = [
  "assert_matches",
- "futures 0.1.29",
- "futures 0.3.5",
+ "futures 0.1.30",
+ "futures 0.3.8",
  "hash-db",
  "jsonrpc-core",
  "jsonrpc-pubsub",
@@ -7266,7 +7407,7 @@ name = "sc-rpc-api"
 version = "0.8.0"
 dependencies = [
  "derive_more",
- "futures 0.3.5",
+ "futures 0.3.8",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -7288,7 +7429,7 @@ dependencies = [
 name = "sc-rpc-server"
 version = "2.0.0"
 dependencies = [
- "futures 0.1.29",
+ "futures 0.1.30",
  "jsonrpc-core",
  "jsonrpc-http-server",
  "jsonrpc-ipc-server",
@@ -7323,8 +7464,8 @@ dependencies = [
  "derive_more",
  "directories",
  "exit-future",
- "futures 0.1.29",
- "futures 0.3.5",
+ "futures 0.1.30",
+ "futures 0.3.8",
  "futures-timer 3.0.2",
  "hash-db",
  "jsonrpc-core",
@@ -7334,7 +7475,7 @@ dependencies = [
  "parity-scale-codec",
  "parity-util-mem",
  "parking_lot 0.10.2",
- "pin-project 0.4.22",
+ "pin-project 0.4.27",
  "rand 0.7.3",
  "sc-block-builder",
  "sc-chain-spec",
@@ -7379,7 +7520,7 @@ dependencies = [
  "substrate-test-runtime",
  "substrate-test-runtime-client",
  "tempfile",
- "tokio 0.2.22",
+ "tokio 0.2.23",
  "tracing",
  "tracing-futures",
  "wasm-timer",
@@ -7390,8 +7531,8 @@ name = "sc-service-test"
 version = "2.0.0"
 dependencies = [
  "fdlimit",
- "futures 0.1.29",
- "futures 0.3.5",
+ "futures 0.1.30",
+ "futures 0.3.8",
  "hex-literal",
  "log",
  "parity-scale-codec",
@@ -7456,12 +7597,12 @@ dependencies = [
 name = "sc-telemetry"
 version = "2.0.0"
 dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
  "futures-timer 3.0.2",
  "libp2p",
  "log",
  "parking_lot 0.10.2",
- "pin-project 0.4.22",
+ "pin-project 0.4.27",
  "rand 0.7.3",
  "serde",
  "slog",
@@ -7497,7 +7638,7 @@ dependencies = [
  "assert_matches",
  "criterion",
  "derive_more",
- "futures 0.3.5",
+ "futures 0.3.8",
  "linked-hash-map",
  "log",
  "parity-scale-codec",
@@ -7520,7 +7661,7 @@ version = "2.0.0"
 dependencies = [
  "assert_matches",
  "derive_more",
- "futures 0.3.5",
+ "futures 0.3.8",
  "futures-diagnose",
  "hex",
  "intervalier",
@@ -7563,14 +7704,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "021b403afe70d81eea68f6ea12f6b3c9588e5d536a94c3bf80f15e7faa267862"
 dependencies = [
  "arrayref",
- "arrayvec 0.5.1",
+ "arrayvec 0.5.2",
  "curve25519-dalek 2.1.0",
- "getrandom 0.1.14",
+ "getrandom 0.1.15",
  "merlin",
  "rand 0.7.3",
  "rand_core 0.5.1",
  "sha2 0.8.2",
- "subtle 2.2.3",
+ "subtle 2.3.0",
  "zeroize",
 ]
 
@@ -7588,18 +7729,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "scroll"
-version = "0.10.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb2332cb595d33f7edd5700f4cbf94892e680c7f0ae56adab58a35190b66cb1"
+checksum = "fda28d4b4830b807a8b43f7b0e6b5df875311b3e7621d84577188c175b6ec1ec"
 dependencies = [
  "scroll_derive",
 ]
 
 [[package]]
 name = "scroll_derive"
-version = "0.10.2"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e367622f934864ffa1c704ba2b82280aab856e3d8213c84c5720257eb34b15b9"
+checksum = "b12bd20b94c7cdfda8c7ba9b92ad0d9a56e3fa018c25fca83b51aa664c9b4c0d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7662,15 +7803,6 @@ name = "semver"
 version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "394cec28fa623e00903caf7ba4fa6fb9a0e260280bb8cdbbba029611108a0190"
 dependencies = [
  "semver-parser",
  "serde",
@@ -7702,9 +7834,9 @@ checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0"
 
 [[package]]
 name = "serde"
-version = "1.0.116"
+version = "1.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96fe57af81d28386a513cbc6858332abc6117cfdb5999647c6444b8f43a370a5"
+checksum = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a"
 dependencies = [
  "serde_derive",
 ]
@@ -7721,9 +7853,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.116"
+version = "1.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f630a6370fd8e457873b4bd2ffdae75408bc291ba72be773772a4c2a065d9ae8"
+checksum = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7732,9 +7864,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.58"
+version = "1.0.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a230ea9107ca2220eea9d46de97eddcb04cd00e92d13dda78e478dd33fa82bd4"
+checksum = "dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95"
 dependencies = [
  "itoa",
  "ryu",
@@ -7780,12 +7912,12 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.9.1"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2933378ddfeda7ea26f48c555bdad8bb446bf8a3d17832dc83e380d444cfb8c1"
+checksum = "6e7aab86fe2149bad8c507606bdb3f4ef5e7b2380eb92350f56122cca72a42a8"
 dependencies = [
  "block-buffer 0.9.0",
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "cpuid-bool",
  "digest 0.9.0",
  "opaque-debug 0.3.0",
@@ -7818,11 +7950,12 @@ dependencies = [
 
 [[package]]
 name = "sharded-slab"
-version = "0.0.9"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06d5a3f5166fb5b42a5439f2eee8b9de149e235961e3eb21c5808fc3ea17ff3e"
+checksum = "7b4921be914e16899a80adefb821f8ddb7974e3f1250223575a44ed994882127"
 dependencies = [
  "lazy_static",
+ "loom",
 ]
 
 [[package]]
@@ -7833,19 +7966,18 @@ checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.2.0"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94f478ede9f64724c5d173d7bb56099ec3e2d9fc2774aac65d34b8b890405f41"
+checksum = "ce32ea0c6c56d5eacaeb814fbed9960547021d3edd010ded1425f180536b20ab"
 dependencies = [
- "arc-swap",
  "libc",
 ]
 
 [[package]]
 name = "signature"
-version = "1.1.0"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65211b7b6fc3f14ff9fc7a2011a434e3e6880585bd2e9e9396315ae24cbf7852"
+checksum = "29f060a7d147e33490ec10da418795238fd7545bba241504d6b31a409f2e6210"
 
 [[package]]
 name = "slab"
@@ -7908,15 +8040,15 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.4.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3757cb9d89161a2f24e1cf78efa0c1fcff485d18e3f55e0aa3480824ddaa0f3f"
+checksum = "7acad6f34eb9e8a259d3283d1e8c1d34d7415943d4895f65cc73813c7396fc85"
 
 [[package]]
 name = "snow"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32bf8474159a95551661246cda4976e89356999e3cbfef36f493dacc3fae1e8e"
+checksum = "795dd7aeeee24468e5a32661f6d27f7b5cbed802031b2d7640c7b10f8fb2dd50"
 dependencies = [
  "aes-gcm",
  "blake2",
@@ -7925,16 +8057,16 @@ dependencies = [
  "rand_core 0.5.1",
  "ring",
  "rustc_version",
- "sha2 0.9.1",
- "subtle 2.2.3",
- "x25519-dalek 0.6.0",
+ "sha2 0.9.2",
+ "subtle 2.3.0",
+ "x25519-dalek",
 ]
 
 [[package]]
 name = "socket2"
-version = "0.3.12"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918"
+checksum = "7fd8b795c389288baa5f355489c65e71fd48a02104600d15c4cfbc561e9e429d"
 dependencies = [
  "cfg-if 0.1.10",
  "libc",
@@ -7944,18 +8076,18 @@ dependencies = [
 
 [[package]]
 name = "soketto"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85457366ae0c6ce56bf05a958aef14cd38513c236568618edbcd9a8c52cb80b0"
+checksum = "b5c71ed3d54db0a699f4948e1bb3e45b450fa31fe602621dee6680361d569c88"
 dependencies = [
  "base64 0.12.3",
  "bytes 0.5.6",
  "flate2",
- "futures 0.3.5",
+ "futures 0.3.8",
  "httparse",
  "log",
  "rand 0.7.3",
- "sha-1 0.8.2",
+ "sha-1 0.9.2",
 ]
 
 [[package]]
@@ -8124,7 +8256,7 @@ dependencies = [
 name = "sp-consensus"
 version = "0.8.0"
 dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
  "futures-timer 3.0.2",
  "libp2p",
  "log",
@@ -8218,7 +8350,7 @@ dependencies = [
  "criterion",
  "dyn-clonable",
  "ed25519-dalek",
- "futures 0.3.5",
+ "futures 0.3.8",
  "hash-db",
  "hash256-std-hasher",
  "hex",
@@ -8315,7 +8447,7 @@ dependencies = [
 name = "sp-io"
 version = "2.0.0"
 dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
  "hash-db",
  "libsecp256k1",
  "log",
@@ -8350,7 +8482,7 @@ version = "0.8.0"
 dependencies = [
  "async-trait",
  "derive_more",
- "futures 0.3.5",
+ "futures 0.3.8",
  "merlin",
  "parity-scale-codec",
  "parking_lot 0.10.2",
@@ -8572,7 +8704,7 @@ dependencies = [
  "parking_lot 0.10.2",
  "pretty_assertions",
  "rand 0.7.3",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
  "sp-core",
  "sp-externalities",
  "sp-panic-handler",
@@ -8655,7 +8787,7 @@ name = "sp-transaction-pool"
 version = "2.0.0"
 dependencies = [
  "derive_more",
- "futures 0.3.5",
+ "futures 0.3.8",
  "log",
  "parity-scale-codec",
  "serde",
@@ -8686,7 +8818,7 @@ dependencies = [
 name = "sp-utils"
 version = "2.0.0"
 dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
  "futures-core",
  "futures-timer 3.0.2",
  "lazy_static",
@@ -8741,23 +8873,14 @@ dependencies = [
  "rand 0.5.6",
 ]
 
-[[package]]
-name = "stream-cipher"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09f8ed9974042b8c3672ff3030a69fcc03b74c47c3d1ecb7755e8a3626011e88"
-dependencies = [
- "generic-array 0.14.3",
-]
-
 [[package]]
 name = "stream-cipher"
 version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c80e15f898d8d8f25db24c253ea615cc14acf418ff307822995814e7d42cfa89"
 dependencies = [
- "block-cipher 0.8.0",
- "generic-array 0.14.3",
+ "block-cipher",
+ "generic-array 0.14.4",
 ]
 
 [[package]]
@@ -8777,9 +8900,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 
 [[package]]
 name = "structopt"
-version = "0.3.15"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de2f5e239ee807089b62adce73e48c625e0ed80df02c7ab3f068f5db5281065c"
+checksum = "126d630294ec449fae0b16f964e35bf3c74f940da9dca17ee9b905f7b3112eb8"
 dependencies = [
  "clap",
  "lazy_static",
@@ -8788,9 +8911,9 @@ dependencies = [
 
 [[package]]
 name = "structopt-derive"
-version = "0.4.8"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "510413f9de616762a4fbeab62509bf15c729603b72d7cd71280fbca431b1c118"
+checksum = "65e51c492f9e23a220534971ff5afc14037289de430e3c83f9daf6a1b6ae91e8"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -8853,8 +8976,8 @@ dependencies = [
  "chrono",
  "console_error_panic_hook",
  "console_log",
- "futures 0.1.29",
- "futures 0.3.5",
+ "futures 0.1.30",
+ "futures 0.3.8",
  "futures-timer 3.0.2",
  "js-sys",
  "kvdb-web",
@@ -8895,14 +9018,14 @@ version = "2.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
- "futures 0.3.5",
+ "futures 0.3.8",
  "jsonrpc-client-transports",
  "jsonrpc-core",
  "parity-scale-codec",
  "sc-rpc-api",
  "serde",
  "sp-storage",
- "tokio 0.2.22",
+ "tokio 0.2.23",
 ]
 
 [[package]]
@@ -8910,7 +9033,7 @@ name = "substrate-frame-rpc-system"
 version = "2.0.0"
 dependencies = [
  "frame-system-rpc-runtime-api",
- "futures 0.3.5",
+ "futures 0.3.8",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -8937,18 +9060,18 @@ dependencies = [
  "async-std",
  "derive_more",
  "futures-util",
- "hyper 0.13.7",
+ "hyper 0.13.9",
  "log",
  "prometheus",
- "tokio 0.2.22",
+ "tokio 0.2.23",
 ]
 
 [[package]]
 name = "substrate-test-client"
 version = "2.0.0"
 dependencies = [
- "futures 0.1.29",
- "futures 0.3.5",
+ "futures 0.1.30",
+ "futures 0.3.8",
  "hash-db",
  "hex",
  "parity-scale-codec",
@@ -9017,7 +9140,7 @@ dependencies = [
 name = "substrate-test-runtime-client"
 version = "2.0.0"
 dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
  "parity-scale-codec",
  "sc-block-builder",
  "sc-client-api",
@@ -9038,7 +9161,7 @@ name = "substrate-test-runtime-transaction-pool"
 version = "2.0.0"
 dependencies = [
  "derive_more",
- "futures 0.3.5",
+ "futures 0.3.8",
  "parity-scale-codec",
  "parking_lot 0.10.2",
  "sc-transaction-graph",
@@ -9052,10 +9175,10 @@ dependencies = [
 name = "substrate-test-utils"
 version = "2.0.0"
 dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
  "sc-service",
  "substrate-test-utils-derive",
- "tokio 0.2.22",
+ "tokio 0.2.23",
  "trybuild",
 ]
 
@@ -9074,7 +9197,7 @@ version = "0.1.0"
 dependencies = [
  "sc-service",
  "substrate-test-utils",
- "tokio 0.2.22",
+ "tokio 0.2.23",
 ]
 
 [[package]]
@@ -9105,9 +9228,9 @@ checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
 
 [[package]]
 name = "subtle"
-version = "2.2.3"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "502d53007c02d7605a05df1c1a73ee436952781653da5d0bf57ad608f66932c1"
+checksum = "343f3f510c2915908f155e94f17220b19ccfacf2a64a2a5d8004f2c3e311e7fd"
 
 [[package]]
 name = "syn"
@@ -9120,17 +9243,6 @@ dependencies = [
  "unicode-xid",
 ]
 
-[[package]]
-name = "syn-mid"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "synstructure"
 version = "0.12.4"
@@ -9171,9 +9283,9 @@ dependencies = [
 
 [[package]]
 name = "termcolor"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
+checksum = "bf11676eb135389f21fcda654382c4859bbfc1d2f36e4425a2f829bb41b1e20e"
 dependencies = [
  "winapi-util",
 ]
@@ -9240,11 +9352,12 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.1.43"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
+checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
 dependencies = [
  "libc",
+ "wasi 0.10.0+wasi-snapshot-preview1",
  "winapi 0.3.9",
 ]
 
@@ -9260,7 +9373,7 @@ dependencies = [
  "pbkdf2 0.4.0",
  "rand 0.7.3",
  "rustc-hash",
- "sha2 0.9.1",
+ "sha2 0.9.2",
  "thiserror",
  "unicode-normalization",
  "zeroize",
@@ -9287,9 +9400,18 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "0.3.3"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed"
+checksum = "b78a366903f506d2ad52ca8dc552102ffdd3e937ba8a227f024dc1d1eae28575"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
@@ -9298,7 +9420,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6"
 dependencies = [
  "bytes 0.4.12",
- "futures 0.1.29",
+ "futures 0.1.30",
  "mio",
  "num_cpus",
  "tokio-codec",
@@ -9317,9 +9439,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "0.2.22"
+version = "0.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d34ca54d84bf2b5b4d7d31e901a8464f7b60ac145a284fba25ceb801f2ddccd"
+checksum = "a6d7ad61edd59bfcc7e80dababf0f4aed2e6d5e0ba1659356ae889752dfc12ff"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
@@ -9346,7 +9468,7 @@ checksum = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46"
 dependencies = [
  "bytes 0.4.12",
  "either",
- "futures 0.1.29",
+ "futures 0.1.30",
 ]
 
 [[package]]
@@ -9356,7 +9478,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25b2998660ba0e70d18684de5d06b70b70a3a747469af9dea7618cc59e75976b"
 dependencies = [
  "bytes 0.4.12",
- "futures 0.1.29",
+ "futures 0.1.30",
  "tokio-io",
 ]
 
@@ -9366,7 +9488,7 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e"
 dependencies = [
- "futures 0.1.29",
+ "futures 0.1.30",
  "tokio-executor",
 ]
 
@@ -9376,8 +9498,8 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671"
 dependencies = [
- "crossbeam-utils",
- "futures 0.1.29",
+ "crossbeam-utils 0.7.2",
+ "futures 0.1.30",
 ]
 
 [[package]]
@@ -9386,7 +9508,7 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "297a1206e0ca6302a0eed35b700d292b275256f596e2f3fea7729d5e629b6ff4"
 dependencies = [
- "futures 0.1.29",
+ "futures 0.1.30",
  "tokio-io",
  "tokio-threadpool",
 ]
@@ -9398,15 +9520,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674"
 dependencies = [
  "bytes 0.4.12",
- "futures 0.1.29",
+ "futures 0.1.30",
  "log",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389"
+checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9420,7 +9542,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d282d483052288b2308ba5ee795f5673b159c9bdf63c385a05609da782a5eae"
 dependencies = [
  "bytes 0.4.12",
- "futures 0.1.29",
+ "futures 0.1.30",
  "mio",
  "mio-named-pipes",
  "tokio 0.1.22",
@@ -9432,8 +9554,8 @@ version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351"
 dependencies = [
- "crossbeam-utils",
- "futures 0.1.29",
+ "crossbeam-utils 0.7.2",
+ "futures 0.1.30",
  "lazy_static",
  "log",
  "mio",
@@ -9447,13 +9569,13 @@ dependencies = [
 
 [[package]]
 name = "tokio-rustls"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "228139ddd4fea3fa345a29233009635235833e52807af7ea6448ead03890d6a9"
+checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a"
 dependencies = [
  "futures-core",
  "rustls",
- "tokio 0.2.22",
+ "tokio 0.2.23",
  "webpki",
 ]
 
@@ -9463,7 +9585,7 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24da22d077e0f15f55162bdbdc661228c1581892f52074fb242678d015b45162"
 dependencies = [
- "futures 0.1.29",
+ "futures 0.1.30",
 ]
 
 [[package]]
@@ -9473,7 +9595,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee"
 dependencies = [
  "fnv",
- "futures 0.1.29",
+ "futures 0.1.30",
 ]
 
 [[package]]
@@ -9483,7 +9605,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72"
 dependencies = [
  "bytes 0.4.12",
- "futures 0.1.29",
+ "futures 0.1.30",
  "iovec",
  "mio",
  "tokio-io",
@@ -9496,10 +9618,10 @@ version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89"
 dependencies = [
- "crossbeam-deque",
+ "crossbeam-deque 0.7.3",
  "crossbeam-queue",
- "crossbeam-utils",
- "futures 0.1.29",
+ "crossbeam-utils 0.7.2",
+ "futures 0.1.30",
  "lazy_static",
  "log",
  "num_cpus",
@@ -9513,8 +9635,8 @@ version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296"
 dependencies = [
- "crossbeam-utils",
- "futures 0.1.29",
+ "crossbeam-utils 0.7.2",
+ "futures 0.1.30",
  "slab",
  "tokio-executor",
 ]
@@ -9526,7 +9648,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82"
 dependencies = [
  "bytes 0.4.12",
- "futures 0.1.29",
+ "futures 0.1.30",
  "log",
  "mio",
  "tokio-codec",
@@ -9541,7 +9663,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab57a4ac4111c8c9dbcf70779f6fc8bc35ae4b2454809febac840ad19bd7e4e0"
 dependencies = [
  "bytes 0.4.12",
- "futures 0.1.29",
+ "futures 0.1.30",
  "iovec",
  "libc",
  "log",
@@ -9563,14 +9685,14 @@ dependencies = [
  "futures-sink",
  "log",
  "pin-project-lite",
- "tokio 0.2.22",
+ "tokio 0.2.23",
 ]
 
 [[package]]
 name = "toml"
-version = "0.5.6"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a"
+checksum = "75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645"
 dependencies = [
  "serde",
 ]
@@ -9620,7 +9742,7 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c"
 dependencies = [
- "pin-project 0.4.22",
+ "pin-project 0.4.27",
  "tracing",
 ]
 
@@ -9647,9 +9769,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.2.13"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ef0a5e15477aa303afbfac3a44cba9b6430fdaad52423b1e6c0dbbe28c3eedd"
+checksum = "a1fa8f0c8f4c594e4fc9debc1990deab13238077271ba84dd853d54902ee3401"
 dependencies = [
  "ansi_term 0.12.1",
  "chrono",
@@ -9659,7 +9781,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sharded-slab",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
  "thread_local",
  "tracing",
  "tracing-core",
@@ -9691,15 +9813,15 @@ dependencies = [
 
 [[package]]
 name = "trie-db"
-version = "0.22.0"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39f1a9a9252d38c5337cf0c5392988821a5cf1b2103245016968f2ab41de9e38"
+checksum = "9e55f7ace33d6237e14137e386f4e1672e2a5c6bbc97fef9f438581a143971f0"
 dependencies = [
  "hash-db",
- "hashbrown 0.8.1",
+ "hashbrown 0.8.2",
  "log",
  "rustc-hex",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
 ]
 
 [[package]]
@@ -9721,6 +9843,16 @@ dependencies = [
  "keccak-hasher",
 ]
 
+[[package]]
+name = "triehash"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f490aa7aa4e4d07edeba442c007e42e3e7f43aafb5112c5b047fff0b1aa5449c"
+dependencies = [
+ "hash-db",
+ "rlp",
+]
+
 [[package]]
 name = "try-lock"
 version = "0.2.3"
@@ -9744,11 +9876,13 @@ dependencies = [
 
 [[package]]
 name = "twox-hash"
-version = "1.5.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bfd5b7557925ce778ff9b9ef90e3ade34c524b5ff10e239c69a42d546d2af56"
+checksum = "04f8ab788026715fa63b31960869617cba39117e520eb415b0139543e325ab59"
 dependencies = [
+ "cfg-if 0.1.10",
  "rand 0.7.3",
+ "static_assertions",
 ]
 
 [[package]]
@@ -9765,9 +9899,9 @@ checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
 
 [[package]]
 name = "uint"
-version = "0.8.3"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "173cd16430c206dc1a430af8a89a0e9c076cf15cb42b4aedb10e8cc8fee73681"
+checksum = "9db035e67dfaf7edd9aebfe8676afcd63eed53c8a4044fed514c8cccf1835177"
 dependencies = [
  "byteorder",
  "crunchy",
@@ -9795,18 +9929,18 @@ dependencies = [
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.13"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977"
+checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606"
 dependencies = [
  "tinyvec",
 ]
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
+checksum = "db8716a166f290ff49dabc18b44aa407cb7c6dbe1aa0971b44b8a24b0ca35aae"
 
 [[package]]
 name = "unicode-width"
@@ -9826,8 +9960,8 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8326b2c654932e3e4f9196e69d08fdf7cfd718e1dc6f66b347e6024a0c961402"
 dependencies = [
- "generic-array 0.14.3",
- "subtle 2.2.3",
+ "generic-array 0.14.4",
+ "subtle 2.3.0",
 ]
 
 [[package]]
@@ -9873,10 +10007,11 @@ dependencies = [
 
 [[package]]
 name = "url"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb"
+checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e"
 dependencies = [
+ "form_urlencoded",
  "idna 0.2.0",
  "matches",
  "percent-encoding 2.1.0",
@@ -9923,9 +10058,9 @@ dependencies = [
 
 [[package]]
 name = "waker-fn"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9571542c2ce85ce642e6b58b3364da2fb53526360dfb7c211add4f5c23105ff7"
+checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
 
 [[package]]
 name = "walkdir"
@@ -9944,7 +10079,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230"
 dependencies = [
- "futures 0.1.29",
+ "futures 0.1.30",
  "log",
  "try-lock",
 ]
@@ -9965,6 +10100,12 @@ version = "0.9.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
 
+[[package]]
+name = "wasi"
+version = "0.10.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+
 [[package]]
 name = "wasm-bindgen"
 version = "0.2.67"
@@ -10074,7 +10215,7 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "324c5e65a08699c9c4334ba136597ab22b85dccd4b65dd1e36ccf8f723a95b54"
 dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
  "js-sys",
  "parking_lot 0.9.0",
  "pin-utils",
@@ -10134,7 +10275,7 @@ dependencies = [
  "log",
  "region",
  "rustc-demangle",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
  "target-lexicon",
  "wasmparser 0.59.0",
  "wasmtime-environ",
@@ -10277,27 +10418,27 @@ dependencies = [
 
 [[package]]
 name = "wast"
-version = "21.0.0"
+version = "27.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b1844f66a2bc8526d71690104c0e78a8e59ffa1597b7245769d174ebb91deb5"
+checksum = "c2c3ef5f6a72dffa44c24d5811123f704e18a1dbc83637d347b1852b41d3835c"
 dependencies = [
  "leb128",
 ]
 
 [[package]]
 name = "wat"
-version = "1.0.22"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce85d72b74242c340e9e3492cfb602652d7bb324c3172dd441b5577e39a2e18c"
+checksum = "835cf59c907f67e2bbc20f50157e08f35006fe2a8444d8ec9f5683e22f937045"
 dependencies = [
  "wast",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.39"
+version = "0.3.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bc359e5dd3b46cb9687a051d50a2fdd228e4ba7cf6fcf861a5365c3d671a642"
+checksum = "dda38f4e5ca63eda02c059d243aa25b5f35ab98451e518c51612cd0f1bd19a47"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -10323,10 +10464,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "wepoll-sys-stjepang"
-version = "1.0.6"
+name = "wepoll-sys"
+version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fd319e971980166b53e17b1026812ad66c6b54063be879eb182342b55284694"
+checksum = "0fcb14dea929042224824779fbc82d9fab8d2e6d3cbc0ac404de8edf489e77ff"
 dependencies = [
  "cc",
 ]
@@ -10393,17 +10534,6 @@ dependencies = [
  "winapi-build",
 ]
 
-[[package]]
-name = "x25519-dalek"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "637ff90c9540fa3073bb577e65033069e4bae7c79d49d74aa3ffdf5342a53217"
-dependencies = [
- "curve25519-dalek 2.1.0",
- "rand_core 0.5.1",
- "zeroize",
-]
-
 [[package]]
 name = "x25519-dalek"
 version = "1.1.0"
@@ -10421,10 +10551,10 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9aeb8c4043cac71c3c299dff107171c220d179492350ea198e109a414981b83c"
 dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
  "log",
  "nohash-hasher",
- "parking_lot 0.11.0",
+ "parking_lot 0.11.1",
  "rand 0.7.3",
  "static_assertions",
 ]
@@ -10440,9 +10570,9 @@ dependencies = [
 
 [[package]]
 name = "zeroize_derive"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de251eec69fc7c1bc3923403d18ececb929380e016afe103da75f396704f8ca2"
+checksum = "c3f369ddb18862aba61aa49bf31e74d29f0f162dec753063200e1dc084345d16"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/bin/node/bench/src/tempdb.rs b/bin/node/bench/src/tempdb.rs
index 4020fd102936..abce7daa518b 100644
--- a/bin/node/bench/src/tempdb.rs
+++ b/bin/node/bench/src/tempdb.rs
@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use std::{io, sync::Arc};
+use std::{io, path::PathBuf, sync::Arc};
 use kvdb::{KeyValueDB, DBTransaction};
 use kvdb_rocksdb::{DatabaseConfig, Database};
 
@@ -124,7 +124,7 @@ impl Clone for TempDatabase {
 			.map(|f_result|
 				f_result.expect("failed to read file in seed db")
 					.path()
-			).collect();
+			).collect::<Vec<PathBuf>>();
 		fs_extra::copy_items(
 			&self_db_files,
 			new_dir.path(),
diff --git a/bin/node/testing/src/bench.rs b/bin/node/testing/src/bench.rs
index 32e4bab9773a..a123da25301d 100644
--- a/bin/node/testing/src/bench.rs
+++ b/bin/node/testing/src/bench.rs
@@ -172,7 +172,7 @@ impl Clone for BenchDb {
 			.map(|f_result|
 				f_result.expect("failed to read file in seed db")
 					.path()
-			).collect();
+			).collect::<Vec<PathBuf>>();
 		fs_extra::copy_items(
 			&seed_db_files,
 			dir.path(),

From 5f17393cdd9748993b8370d7f166d9538ccdb29c Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Fri, 20 Nov 2020 14:34:19 +0100
Subject: [PATCH 0086/1194] .github: Add dependabot config and thus enable
 dependabot (#7509)

* .github: Add dependabot config and thus enable dependabot

* Update .github/dependabot.yml

Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>

Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
---
 .github/dependabot.yml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000000..d782bb80f753
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+  - package-ecosystem: "cargo"
+    directory: "/"
+    labels: ["A2-insubstantial", "B0-silent", "C1-low"]
+    schedule:
+      interval: "daily"

From faad534b30d78a7e3ff8979cb839635a34680c5b Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Fri, 20 Nov 2020 18:54:19 +0100
Subject: [PATCH 0087/1194] Thread-local parameter_types for testing. (#7542)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Thread-local parameter_types for testing.

* Better docs.

* Some minors

* Merge'em

* Update frame/support/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Align more to basti's trick

* Update frame/support/src/lib.rs

* Update frame/support/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: Bastian Köcher <git@kchr.de>
---
 frame/balances/src/tests_composite.rs | 12 +---
 frame/balances/src/tests_local.rs     | 13 +---
 frame/contracts/src/tests.rs          | 13 +---
 frame/democracy/src/tests.rs          | 16 +----
 frame/elections-phragmen/src/lib.rs   | 38 ++---------
 frame/elections/src/mock.rs           | 46 ++++----------
 frame/elections/src/tests.rs          | 12 ++--
 frame/membership/src/lib.rs           |  8 +--
 frame/staking/src/mock.rs             | 62 +++---------------
 frame/support/src/lib.rs              | 92 ++++++++++++++++++++++++---
 frame/transaction-payment/src/lib.rs  | 23 +------
 frame/vesting/src/lib.rs              | 10 +--
 12 files changed, 128 insertions(+), 217 deletions(-)

diff --git a/frame/balances/src/tests_composite.rs b/frame/balances/src/tests_composite.rs
index 88b73b47273e..fd4ba1fd3c30 100644
--- a/frame/balances/src/tests_composite.rs
+++ b/frame/balances/src/tests_composite.rs
@@ -27,10 +27,8 @@ use sp_runtime::{
 use sp_core::H256;
 use sp_io;
 use frame_support::{impl_outer_origin, impl_outer_event, parameter_types};
-use frame_support::traits::Get;
 use frame_support::weights::{Weight, DispatchInfo, IdentityFee};
 use pallet_transaction_payment::CurrencyAdapter;
-use std::cell::RefCell;
 use crate::{GenesisConfig, Module, Trait, decl_tests, tests::CallWithDispatchInfo};
 
 use frame_system as system;
@@ -49,15 +47,6 @@ impl_outer_event! {
 	}
 }
 
-thread_local! {
-	static EXISTENTIAL_DEPOSIT: RefCell<u64> = RefCell::new(0);
-}
-
-pub struct ExistentialDeposit;
-impl Get<u64> for ExistentialDeposit {
-	fn get() -> u64 { EXISTENTIAL_DEPOSIT.with(|v| *v.borrow()) }
-}
-
 // Workaround for https://github.com/rust-lang/rust/issues/26925 . Remove when sorted.
 #[derive(Clone, PartialEq, Eq, Debug)]
 pub struct Test;
@@ -66,6 +55,7 @@ parameter_types! {
 	pub const MaximumBlockWeight: Weight = 1024;
 	pub const MaximumBlockLength: u32 = 2 * 1024;
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
+	pub static ExistentialDeposit: u64 = 0;
 }
 impl frame_system::Trait for Test {
 	type BaseCallFilter = ();
diff --git a/frame/balances/src/tests_local.rs b/frame/balances/src/tests_local.rs
index 319fb3640b4c..c0a5d23ff1a4 100644
--- a/frame/balances/src/tests_local.rs
+++ b/frame/balances/src/tests_local.rs
@@ -27,9 +27,8 @@ use sp_runtime::{
 use sp_core::H256;
 use sp_io;
 use frame_support::{impl_outer_origin, impl_outer_event, parameter_types};
-use frame_support::traits::{Get, StorageMapShim};
+use frame_support::traits::StorageMapShim;
 use frame_support::weights::{Weight, DispatchInfo, IdentityFee};
-use std::cell::RefCell;
 use crate::{GenesisConfig, Module, Trait, decl_tests, tests::CallWithDispatchInfo};
 use pallet_transaction_payment::CurrencyAdapter;
 
@@ -49,15 +48,6 @@ impl_outer_event! {
 	}
 }
 
-thread_local! {
-	static EXISTENTIAL_DEPOSIT: RefCell<u64> = RefCell::new(0);
-}
-
-pub struct ExistentialDeposit;
-impl Get<u64> for ExistentialDeposit {
-	fn get() -> u64 { EXISTENTIAL_DEPOSIT.with(|v| *v.borrow()) }
-}
-
 // Workaround for https://github.com/rust-lang/rust/issues/26925 . Remove when sorted.
 #[derive(Clone, PartialEq, Eq, Debug)]
 pub struct Test;
@@ -66,6 +56,7 @@ parameter_types! {
 	pub const MaximumBlockWeight: Weight = 1024;
 	pub const MaximumBlockLength: u32 = 2 * 1024;
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
+	pub static ExistentialDeposit: u64 = 0;
 }
 impl frame_system::Trait for Test {
 	type BaseCallFilter = ();
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index c2d9ed664255..05e46a3ab158 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -30,11 +30,10 @@ use sp_runtime::{
 use frame_support::{
 	assert_ok, assert_err_ignore_postinfo, impl_outer_dispatch, impl_outer_event,
 	impl_outer_origin, parameter_types, StorageMap, StorageValue,
-	traits::{Currency, Get, ReservableCurrency},
+	traits::{Currency, ReservableCurrency},
 	weights::{Weight, PostDispatchInfo},
 	dispatch::DispatchErrorWithPostInfo,
 };
-use std::cell::RefCell;
 use frame_system::{self as system, EventRecord, Phase};
 
 mod contracts {
@@ -99,15 +98,6 @@ pub mod test_utils {
 	}
 }
 
-thread_local! {
-	static EXISTENTIAL_DEPOSIT: RefCell<u64> = RefCell::new(0);
-}
-
-pub struct ExistentialDeposit;
-impl Get<u64> for ExistentialDeposit {
-	fn get() -> u64 { EXISTENTIAL_DEPOSIT.with(|v| *v.borrow()) }
-}
-
 #[derive(Clone, Eq, PartialEq, Debug)]
 pub struct Test;
 parameter_types! {
@@ -115,6 +105,7 @@ parameter_types! {
 	pub const MaximumBlockWeight: Weight = 1024;
 	pub const MaximumBlockLength: u32 = 2 * 1024;
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
+	pub static ExistentialDeposit: u64 = 0;
 }
 impl frame_system::Trait for Test {
 	type BaseCallFilter = ();
diff --git a/frame/democracy/src/tests.rs b/frame/democracy/src/tests.rs
index bcc7099bb34a..25209901109f 100644
--- a/frame/democracy/src/tests.rs
+++ b/frame/democracy/src/tests.rs
@@ -18,7 +18,6 @@
 //! The crate's tests.
 
 use super::*;
-use std::cell::RefCell;
 use codec::Encode;
 use frame_support::{
 	impl_outer_origin, impl_outer_dispatch, assert_noop, assert_ok, parameter_types,
@@ -154,6 +153,8 @@ parameter_types! {
 	pub const CooloffPeriod: u64 = 2;
 	pub const MaxVotes: u32 = 100;
 	pub const MaxProposals: u32 = MAX_PROPOSALS;
+	pub static PreimageByteDeposit: u64 = 0;
+	pub static InstantAllowed: bool = false;
 }
 ord_parameter_types! {
 	pub const One: u64 = 1;
@@ -171,18 +172,7 @@ impl Contains<u64> for OneToFive {
 	#[cfg(feature = "runtime-benchmarks")]
 	fn add(_m: &u64) {}
 }
-thread_local! {
-	static PREIMAGE_BYTE_DEPOSIT: RefCell<u64> = RefCell::new(0);
-	static INSTANT_ALLOWED: RefCell<bool> = RefCell::new(false);
-}
-pub struct PreimageByteDeposit;
-impl Get<u64> for PreimageByteDeposit {
-	fn get() -> u64 { PREIMAGE_BYTE_DEPOSIT.with(|v| *v.borrow()) }
-}
-pub struct InstantAllowed;
-impl Get<bool> for InstantAllowed {
-	fn get() -> bool { INSTANT_ALLOWED.with(|v| *v.borrow()) }
-}
+
 impl super::Trait for Test {
 	type Proposal = Call;
 	type Event = Event;
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index be47b5adcce5..8279f9cf11f1 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -1058,7 +1058,6 @@ impl<T: Trait> ContainsLengthBound for Module<T> {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use std::cell::RefCell;
 	use frame_support::{assert_ok, assert_noop, assert_err_with_weight, parameter_types,
 		weights::Weight,
 	};
@@ -1123,36 +1122,13 @@ mod tests {
 		pub const CandidacyBond: u64 = 3;
 	}
 
-	thread_local! {
-		static VOTING_BOND: RefCell<u64> = RefCell::new(2);
-		static DESIRED_MEMBERS: RefCell<u32> = RefCell::new(2);
-		static DESIRED_RUNNERS_UP: RefCell<u32> = RefCell::new(2);
-		static TERM_DURATION: RefCell<u64> = RefCell::new(5);
-	}
-
-	pub struct VotingBond;
-	impl Get<u64> for VotingBond {
-		fn get() -> u64 { VOTING_BOND.with(|v| *v.borrow()) }
-	}
-
-	pub struct DesiredMembers;
-	impl Get<u32> for DesiredMembers {
-		fn get() -> u32 { DESIRED_MEMBERS.with(|v| *v.borrow()) }
-	}
-
-	pub struct DesiredRunnersUp;
-	impl Get<u32> for DesiredRunnersUp {
-		fn get() -> u32 { DESIRED_RUNNERS_UP.with(|v| *v.borrow()) }
-	}
-
-	pub struct TermDuration;
-	impl Get<u64> for TermDuration {
-		fn get() -> u64 { TERM_DURATION.with(|v| *v.borrow()) }
-	}
-
-	thread_local! {
-		pub static MEMBERS: RefCell<Vec<u64>> = RefCell::new(vec![]);
-		pub static PRIME: RefCell<Option<u64>> = RefCell::new(None);
+	frame_support::parameter_types! {
+		pub static VotingBond: u64 = 2;
+		pub static DesiredMembers: u32 = 2;
+		pub static DesiredRunnersUp: u32 = 2;
+		pub static TermDuration: u64 = 5;
+		pub static Members: Vec<u64> = vec![];
+		pub static Prime: Option<u64> = None;
 	}
 
 	pub struct TestChangeMembers;
diff --git a/frame/elections/src/mock.rs b/frame/elections/src/mock.rs
index deec77da7b83..0d57089af5ef 100644
--- a/frame/elections/src/mock.rs
+++ b/frame/elections/src/mock.rs
@@ -19,10 +19,9 @@
 
 #![cfg(test)]
 
-use std::cell::RefCell;
 use frame_support::{
 	StorageValue, StorageMap, parameter_types, assert_ok,
-	traits::{Get, ChangeMembers, Currency, LockIdentifier},
+	traits::{ChangeMembers, Currency, LockIdentifier},
 	weights::Weight,
 };
 use sp_core::H256;
@@ -85,34 +84,11 @@ parameter_types! {
 	pub const InactiveGracePeriod: u32 = 1;
 	pub const VotingPeriod: u64 = 4;
 	pub const MinimumVotingLock: u64 = 5;
-}
-
-thread_local! {
-	static VOTER_BOND: RefCell<u64> = RefCell::new(0);
-	static VOTING_FEE: RefCell<u64> = RefCell::new(0);
-	static PRESENT_SLASH_PER_VOTER: RefCell<u64> = RefCell::new(0);
-	static DECAY_RATIO: RefCell<u32> = RefCell::new(0);
-	static MEMBERS: RefCell<Vec<u64>> = RefCell::new(vec![]);
-}
-
-pub struct VotingBond;
-impl Get<u64> for VotingBond {
-	fn get() -> u64 { VOTER_BOND.with(|v| *v.borrow()) }
-}
-
-pub struct VotingFee;
-impl Get<u64> for VotingFee {
-	fn get() -> u64 { VOTING_FEE.with(|v| *v.borrow()) }
-}
-
-pub struct PresentSlashPerVoter;
-impl Get<u64> for PresentSlashPerVoter {
-	fn get() -> u64 { PRESENT_SLASH_PER_VOTER.with(|v| *v.borrow()) }
-}
-
-pub struct DecayRatio;
-impl Get<u32> for DecayRatio {
-	fn get() -> u32 { DECAY_RATIO.with(|v| *v.borrow()) }
+	pub static VotingBond: u64 = 0;
+	pub static VotingFee: u64 = 0;
+	pub static PresentSlashPerVoter: u64 = 0;
+	pub static DecayRatio: u32 = 0;
+	pub static Members: Vec<u64> = vec![];
 }
 
 pub struct TestChangeMembers;
@@ -175,7 +151,7 @@ pub struct ExtBuilder {
 	decay_ratio: u32,
 	desired_seats: u32,
 	voting_fee: u64,
-	voter_bond: u64,
+	voting_bond: u64,
 	bad_presentation_punishment: u64,
 }
 
@@ -186,7 +162,7 @@ impl Default for ExtBuilder {
 			decay_ratio: 24,
 			desired_seats: 2,
 			voting_fee: 0,
-			voter_bond: 0,
+			voting_bond: 0,
 			bad_presentation_punishment: 1,
 		}
 	}
@@ -209,8 +185,8 @@ impl ExtBuilder {
 		self.bad_presentation_punishment = fee;
 		self
 	}
-	pub fn voter_bond(mut self, fee: u64) -> Self {
-		self.voter_bond = fee;
+	pub fn voting_bond(mut self, fee: u64) -> Self {
+		self.voting_bond = fee;
 		self
 	}
 	pub fn desired_seats(mut self, seats: u32) -> Self {
@@ -218,7 +194,7 @@ impl ExtBuilder {
 		self
 	}
 	pub fn build(self) -> sp_io::TestExternalities {
-		VOTER_BOND.with(|v| *v.borrow_mut() = self.voter_bond);
+		VOTING_BOND.with(|v| *v.borrow_mut() = self.voting_bond);
 		VOTING_FEE.with(|v| *v.borrow_mut() = self.voting_fee);
 		PRESENT_SLASH_PER_VOTER.with(|v| *v.borrow_mut() = self.bad_presentation_punishment);
 		DECAY_RATIO.with(|v| *v.borrow_mut() = self.decay_ratio);
diff --git a/frame/elections/src/tests.rs b/frame/elections/src/tests.rs
index 92f6e11252b0..d3579ca33743 100644
--- a/frame/elections/src/tests.rs
+++ b/frame/elections/src/tests.rs
@@ -298,7 +298,7 @@ fn voting_initial_set_approvals_ignores_voter_index() {
 }
 #[test]
 fn voting_bad_approval_index_slashes_voters_and_bond_reduces_stake() {
-	ExtBuilder::default().voting_fee(5).voter_bond(2).build().execute_with(|| {
+	ExtBuilder::default().voting_fee(5).voting_bond(2).build().execute_with(|| {
 		assert_ok!(Elections::submit_candidacy(Origin::signed(2), 0));
 
 		(1..=63).for_each(|i| vote(i, 0));
@@ -365,7 +365,7 @@ fn voting_cannot_lock_less_than_limit() {
 
 #[test]
 fn voting_locking_more_than_total_balance_is_moot() {
-	ExtBuilder::default().voter_bond(2).build().execute_with(|| {
+	ExtBuilder::default().voting_bond(2).build().execute_with(|| {
 		assert_ok!(Elections::submit_candidacy(Origin::signed(2), 0));
 
 		assert_eq!(balances(&3), (30, 0));
@@ -381,7 +381,7 @@ fn voting_locking_more_than_total_balance_is_moot() {
 
 #[test]
 fn voting_locking_stake_and_reserving_bond_works() {
-	ExtBuilder::default().voter_bond(2).build().execute_with(|| {
+	ExtBuilder::default().voting_bond(2).build().execute_with(|| {
 		assert_ok!(Elections::submit_candidacy(Origin::signed(5), 0));
 
 		assert_eq!(balances(&2), (20, 0));
@@ -558,7 +558,7 @@ fn retracting_inactive_voter_should_work() {
 
 #[test]
 fn retracting_inactive_voter_with_other_candidates_in_slots_should_work() {
-	ExtBuilder::default().voter_bond(2).build().execute_with(|| {
+	ExtBuilder::default().voting_bond(2).build().execute_with(|| {
 		System::set_block_number(4);
 		assert_ok!(Elections::submit_candidacy(Origin::signed(2), 0));
 		assert_ok!(Elections::set_approvals(Origin::signed(2), vec![true], 0, 0, 20));
@@ -1107,7 +1107,7 @@ fn election_present_when_presenter_is_poor_should_not_work() {
 	let test_present = |p| {
 		ExtBuilder::default()
 			.voting_fee(5)
-			.voter_bond(2)
+			.voting_bond(2)
 			.bad_presentation_punishment(p)
 			.build()
 			.execute_with(|| {
@@ -1507,7 +1507,7 @@ fn pot_winning_resets_accumulated_pot() {
 #[test]
 fn pot_resubmitting_approvals_stores_pot() {
 	ExtBuilder::default()
-		.voter_bond(0)
+		.voting_bond(0)
 		.voting_fee(0)
 		.balance_factor(10)
 		.build()
diff --git a/frame/membership/src/lib.rs b/frame/membership/src/lib.rs
index 492fda88dd17..06188c42b21b 100644
--- a/frame/membership/src/lib.rs
+++ b/frame/membership/src/lib.rs
@@ -278,7 +278,6 @@ impl<T: Trait<I>, I: Instance> Contains<T::AccountId> for Module<T, I> {
 mod tests {
 	use super::*;
 
-	use std::cell::RefCell;
 	use frame_support::{
 		assert_ok, assert_noop, impl_outer_origin, parameter_types, weights::Weight,
 		ord_parameter_types
@@ -298,6 +297,8 @@ mod tests {
 		pub const MaximumBlockWeight: Weight = 1024;
 		pub const MaximumBlockLength: u32 = 2 * 1024;
 		pub const AvailableBlockRatio: Perbill = Perbill::one();
+		pub static Members: Vec<u64> = vec![];
+		pub static Prime: Option<u64> = None;
 	}
 	impl frame_system::Trait for Test {
 		type BaseCallFilter = ();
@@ -334,11 +335,6 @@ mod tests {
 		pub const Five: u64 = 5;
 	}
 
-	thread_local! {
-		static MEMBERS: RefCell<Vec<u64>> = RefCell::new(vec![]);
-		static PRIME: RefCell<Option<u64>> = RefCell::new(None);
-	}
-
 	pub struct TestChangeMembers;
 	impl ChangeMembers<u64> for TestChangeMembers {
 		fn change_members_sorted(incoming: &[u64], outgoing: &[u64], new: &[u64]) {
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index 055ebb973080..3aa3e9ae03d7 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -47,12 +47,6 @@ pub(crate) type Balance = u128;
 
 thread_local! {
 	static SESSION: RefCell<(Vec<AccountId>, HashSet<AccountId>)> = RefCell::new(Default::default());
-	static SESSION_PER_ERA: RefCell<SessionIndex> = RefCell::new(3);
-	static EXISTENTIAL_DEPOSIT: RefCell<Balance> = RefCell::new(0);
-	static SLASH_DEFER_DURATION: RefCell<EraIndex> = RefCell::new(0);
-	static ELECTION_LOOKAHEAD: RefCell<BlockNumber> = RefCell::new(0);
-	static PERIOD: RefCell<BlockNumber> = RefCell::new(1);
-	static MAX_ITERATIONS: RefCell<u32> = RefCell::new(0);
 }
 
 /// Another session handler struct to test on_disabled.
@@ -92,53 +86,6 @@ pub fn is_disabled(controller: AccountId) -> bool {
 	SESSION.with(|d| d.borrow().1.contains(&stash))
 }
 
-pub struct ExistentialDeposit;
-impl Get<Balance> for ExistentialDeposit {
-	fn get() -> Balance {
-		EXISTENTIAL_DEPOSIT.with(|v| *v.borrow())
-	}
-}
-
-pub struct SessionsPerEra;
-impl Get<SessionIndex> for SessionsPerEra {
-	fn get() -> SessionIndex {
-		SESSION_PER_ERA.with(|v| *v.borrow())
-	}
-}
-impl Get<BlockNumber> for SessionsPerEra {
-	fn get() -> BlockNumber {
-		SESSION_PER_ERA.with(|v| *v.borrow() as BlockNumber)
-	}
-}
-
-pub struct ElectionLookahead;
-impl Get<BlockNumber> for ElectionLookahead {
-	fn get() -> BlockNumber {
-		ELECTION_LOOKAHEAD.with(|v| *v.borrow())
-	}
-}
-
-pub struct Period;
-impl Get<BlockNumber> for Period {
-	fn get() -> BlockNumber {
-		PERIOD.with(|v| *v.borrow())
-	}
-}
-
-pub struct SlashDeferDuration;
-impl Get<EraIndex> for SlashDeferDuration {
-	fn get() -> EraIndex {
-		SLASH_DEFER_DURATION.with(|v| *v.borrow())
-	}
-}
-
-pub struct MaxIterations;
-impl Get<u32> for MaxIterations {
-	fn get() -> u32 {
-		MAX_ITERATIONS.with(|v| *v.borrow())
-	}
-}
-
 impl_outer_origin! {
 	pub enum Origin for Test where system = frame_system {}
 }
@@ -186,7 +133,14 @@ parameter_types! {
 	pub const MaximumBlockLength: u32 = 2 * 1024;
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 	pub const MaxLocks: u32 = 1024;
+	pub static SessionsPerEra: SessionIndex = 3;
+	pub static ExistentialDeposit: Balance = 0;
+	pub static SlashDeferDuration: EraIndex = 0;
+	pub static ElectionLookahead: BlockNumber = 0;
+	pub static Period: BlockNumber = 1;
+	pub static MaxIterations: u32 = 0;
 }
+
 impl frame_system::Trait for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
@@ -437,7 +391,7 @@ impl ExtBuilder {
 	pub fn set_associated_constants(&self) {
 		EXISTENTIAL_DEPOSIT.with(|v| *v.borrow_mut() = self.existential_deposit);
 		SLASH_DEFER_DURATION.with(|v| *v.borrow_mut() = self.slash_defer_duration);
-		SESSION_PER_ERA.with(|v| *v.borrow_mut() = self.session_per_era);
+		SESSIONS_PER_ERA.with(|v| *v.borrow_mut() = self.session_per_era);
 		ELECTION_LOOKAHEAD.with(|v| *v.borrow_mut() = self.election_lookahead);
 		PERIOD.with(|v| *v.borrow_mut() = self.session_length);
 		MAX_ITERATIONS.with(|v| *v.borrow_mut() = self.max_offchain_iterations);
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index a132b787fd9b..5dd452dbbe7b 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -85,21 +85,27 @@ pub enum Never {}
 
 /// Create new implementations of the [`Get`](crate::traits::Get) trait.
 ///
-/// The so-called parameter type can be created in three different ways:
+/// The so-called parameter type can be created in four different ways:
 ///
-/// - Using `const` to create a parameter type that provides a `const` getter.
-///   It is required that the `value` is const.
+/// - Using `const` to create a parameter type that provides a `const` getter. It is required that
+///   the `value` is const.
 ///
 /// - Declare the parameter type without `const` to have more freedom when creating the value.
 ///
-/// - Using `storage` to create a storage parameter type. This type is special as it tries to
-///   load the value from the storage under a fixed key. If the value could not be found in the
-///   storage, the given default value will be returned. It is required that the value implements
-///   [`Encode`](codec::Encode) and [`Decode`](codec::Decode). The key for looking up the value
-///   in the storage is built using the following formular:
+/// - Using `storage` to create a storage parameter type. This type is special as it tries to load
+///   the value from the storage under a fixed key. If the value could not be found in the storage,
+///   the given default value will be returned. It is required that the value implements
+///   [`Encode`](codec::Encode) and [`Decode`](codec::Decode). The key for looking up the value in
+///   the storage is built using the following formula:
 ///
 ///   `twox_128(":" ++ NAME ++ ":")` where `NAME` is the name that is passed as type name.
 ///
+/// - Using `static` to create a static parameter type. Its value is
+///   being provided by a static variable with the equivalent name in `UPPER_SNAKE_CASE`. An
+///   additional `set` function is provided in this case to alter the static variable. 
+///
+/// **This is intended for testing ONLY and is ONLY available when `std` is enabled**
+///
 /// # Examples
 ///
 /// ```
@@ -114,12 +120,14 @@ pub enum Never {}
 ///    /// Visibility of the type is optional
 ///    OtherArgument: u64 = non_const_expression();
 ///    pub storage StorageArgument: u64 = 5;
+///    pub static StaticArgument: u32 = 7;
 /// }
 ///
 /// trait Config {
 ///    type Parameter: Get<u64>;
 ///    type OtherParameter: Get<u64>;
 ///    type StorageParameter: Get<u64>;
+///    type StaticParameter: Get<u32>;
 /// }
 ///
 /// struct Runtime;
@@ -127,7 +135,10 @@ pub enum Never {}
 ///    type Parameter = Argument;
 ///    type OtherParameter = OtherArgument;
 ///    type StorageParameter = StorageArgument;
+///    type StaticParameter = StaticArgument;
 /// }
+///
+/// // In testing, `StaticArgument` can be altered later: `StaticArgument::set(8)`.
 /// ```
 ///
 /// # Invalid example:
@@ -142,7 +153,6 @@ pub enum Never {}
 ///    pub const Argument: u64 = non_const_expression();
 /// }
 /// ```
-
 #[macro_export]
 macro_rules! parameter_types {
 	(
@@ -235,7 +245,69 @@ macro_rules! parameter_types {
 				I::from(Self::get())
 			}
 		}
-	}
+	};
+	(
+		$(
+			$( #[ $attr:meta ] )*
+			$vis:vis static $name:ident: $type:ty = $value:expr;
+		)*
+	) => (
+		$crate::parameter_types_impl_thread_local!(
+			$(
+				$( #[ $attr ] )*
+				$vis static $name: $type = $value;
+			)*
+		);
+	);
+}
+
+#[cfg(not(feature = "std"))]
+#[macro_export]
+macro_rules! parameter_types_impl_thread_local {
+	( $( $any:tt )* ) => {
+		compile_error!("static parameter types is only available in std and for testing.");
+	};
+}
+
+#[cfg(feature = "std")]
+#[macro_export]
+macro_rules! parameter_types_impl_thread_local {
+	(
+		$(
+			$( #[ $attr:meta ] )*
+			$vis:vis static $name:ident: $type:ty = $value:expr;
+		)*
+	) => {
+		$crate::parameter_types_impl_thread_local!(
+			IMPL_THREAD_LOCAL $( $vis, $name, $type, $value, )*
+		);
+		$crate::paste::item! {
+			$crate::parameter_types!(
+				$(
+					$( #[ $attr ] )*
+					$vis $name: $type = [<$name:snake:upper>].with(|v| v.borrow().clone());
+				)*
+			);
+			$(
+				impl $name {
+					/// Set the internal value.
+					pub fn set(t: $type) {
+						[<$name:snake:upper>].with(|v| *v.borrow_mut() = t);
+					}
+				}
+			)*
+		}
+	};
+	(IMPL_THREAD_LOCAL $( $vis:vis, $name:ident, $type:ty, $value:expr, )* ) => {
+		$crate::paste::item! {
+			thread_local! {
+				$(
+					pub static [<$name:snake:upper>]: std::cell::RefCell<$type> =
+						std::cell::RefCell::new($value);
+				)*
+			}
+		}
+	};
 }
 
 /// Macro for easily creating a new implementation of both the `Get` and `Contains` traits. Use
diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
index dd310c263984..751aa57da0f8 100644
--- a/frame/transaction-payment/src/lib.rs
+++ b/frame/transaction-payment/src/lib.rs
@@ -571,7 +571,6 @@ mod tests {
 		traits::{BlakeTwo256, IdentityLookup},
 		Perbill,
 	};
-	use std::cell::RefCell;
 	use smallvec::smallvec;
 
 	const CALL: &<Runtime as frame_system::Trait>::Call =
@@ -599,20 +598,14 @@ mod tests {
 		pub enum Origin for Runtime {}
 	}
 
-	thread_local! {
-		static EXTRINSIC_BASE_WEIGHT: RefCell<u64> = RefCell::new(0);
-	}
-
-	pub struct ExtrinsicBaseWeight;
-	impl Get<u64> for ExtrinsicBaseWeight {
-		fn get() -> u64 { EXTRINSIC_BASE_WEIGHT.with(|v| *v.borrow()) }
-	}
-
 	parameter_types! {
 		pub const BlockHashCount: u64 = 250;
 		pub const MaximumBlockWeight: Weight = 1024;
 		pub const MaximumBlockLength: u32 = 2 * 1024;
 		pub const AvailableBlockRatio: Perbill = Perbill::one();
+		pub static ExtrinsicBaseWeight: u64 = 0;
+		pub static TransactionByteFee: u64 = 1;
+		pub static WeightToFee: u64 = 1;
 	}
 
 	impl frame_system::Trait for Runtime {
@@ -656,17 +649,7 @@ mod tests {
 		type MaxLocks = ();
 		type WeightInfo = ();
 	}
-	thread_local! {
-		static TRANSACTION_BYTE_FEE: RefCell<u64> = RefCell::new(1);
-		static WEIGHT_TO_FEE: RefCell<u64> = RefCell::new(1);
-	}
-
-	pub struct TransactionByteFee;
-	impl Get<u64> for TransactionByteFee {
-		fn get() -> u64 { TRANSACTION_BYTE_FEE.with(|v| *v.borrow()) }
-	}
 
-	pub struct WeightToFee;
 	impl WeightToFeePolynomial for WeightToFee {
 		type Balance = u64;
 
diff --git a/frame/vesting/src/lib.rs b/frame/vesting/src/lib.rs
index 8b78eac4fedf..c09516c2cc27 100644
--- a/frame/vesting/src/lib.rs
+++ b/frame/vesting/src/lib.rs
@@ -390,10 +390,8 @@ impl<T: Trait> VestingSchedule<T::AccountId> for Module<T> where
 mod tests {
 	use super::*;
 
-	use std::cell::RefCell;
 	use frame_support::{
 		assert_ok, assert_noop, impl_outer_origin, parameter_types, weights::Weight,
-		traits::Get
 	};
 	use sp_core::H256;
 	use sp_runtime::{
@@ -456,6 +454,7 @@ mod tests {
 	}
 	parameter_types! {
 		pub const MinVestedTransfer: u64 = 256 * 2;
+		pub static ExistentialDeposit: u64 = 0;
 	}
 	impl Trait for Test {
 		type Event = ();
@@ -468,13 +467,6 @@ mod tests {
 	type Balances = pallet_balances::Module<Test>;
 	type Vesting = Module<Test>;
 
-	thread_local! {
-		static EXISTENTIAL_DEPOSIT: RefCell<u64> = RefCell::new(0);
-	}
-	pub struct ExistentialDeposit;
-	impl Get<u64> for ExistentialDeposit {
-		fn get() -> u64 { EXISTENTIAL_DEPOSIT.with(|v| *v.borrow()) }
-	}
 
 	pub struct ExtBuilder {
 		existential_deposit: u64,

From a208da1608712c1bec40fb4a3878187b0a5ea404 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 20 Nov 2020 21:45:51 +0100
Subject: [PATCH 0088/1194] Bump wasm-bindgen-test from 0.3.12 to 0.3.17
 (#7567)

* Bump wasm-bindgen-test from 0.3.12 to 0.3.17

Bumps [wasm-bindgen-test](https://github.com/rustwasm/wasm-bindgen) from 0.3.12 to 0.3.17.
- [Release notes](https://github.com/rustwasm/wasm-bindgen/releases)
- [Changelog](https://github.com/rustwasm/wasm-bindgen/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rustwasm/wasm-bindgen/commits)

Signed-off-by: dependabot[bot] <support@github.com>

* Update wasm-bindgen pin to 0.2.68

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
---
 Cargo.lock                          | 32 ++++++++++++++---------------
 bin/node/browser-testing/Cargo.toml |  4 ++--
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c2e9cda8f31c..3b905e4bd87e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10108,9 +10108,9 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.67"
+version = "0.2.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0563a9a4b071746dd5aedbc3a28c6fe9be4586fb3fbadb67c400d4f53c6b16c"
+checksum = "1ac64ead5ea5f05873d7c12b545865ca2b8d28adfc50a49b84770a3a97265d42"
 dependencies = [
  "cfg-if 0.1.10",
  "serde",
@@ -10120,9 +10120,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.67"
+version = "0.2.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc71e4c5efa60fb9e74160e89b93353bc24059999c0ae0fb03affc39770310b0"
+checksum = "f22b422e2a757c35a73774860af8e112bff612ce6cb604224e8e47641a9e4f68"
 dependencies = [
  "bumpalo",
  "lazy_static",
@@ -10135,9 +10135,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.12"
+version = "0.4.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a369c5e1dfb7569e14d62af4da642a3cbc2f9a3652fe586e26ac22222aa4b04"
+checksum = "95f8d235a77f880bcef268d379810ea6c0af2eacfa90b1ad5af731776e0c4699"
 dependencies = [
  "cfg-if 0.1.10",
  "js-sys",
@@ -10147,9 +10147,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.67"
+version = "0.2.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97c57cefa5fa80e2ba15641578b44d36e7a64279bc5ed43c6dbaf329457a2ed2"
+checksum = "6b13312a745c08c469f0b292dd2fcd6411dba5f7160f593da6ef69b64e407038"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -10157,9 +10157,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.67"
+version = "0.2.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841a6d1c35c6f596ccea1f82504a192a60378f64b3bb0261904ad8f2f5657556"
+checksum = "f249f06ef7ee334cc3b8ff031bfc11ec99d00f34d86da7498396dc1e3b1498fe"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10170,15 +10170,15 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.67"
+version = "0.2.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93b162580e34310e5931c4b792560108b10fd14d64915d7fff8ff00180e70092"
+checksum = "1d649a3145108d7d3fbcde896a468d1bd636791823c9921135218ad89be08307"
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.12"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd8e9dad8040e378f0696b017570c6bc929aac373180e06b3d67ac5059c52da3"
+checksum = "7d92df9d5715606f9e48f85df3b78cb77ae44a2ea9a5f2a785a97bd0066b9300"
 dependencies = [
  "console_error_panic_hook",
  "js-sys",
@@ -10190,9 +10190,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.12"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c358c8d2507c1bae25efa069e62ea907aa28700b25c8c33dafb0b15ba4603627"
+checksum = "51611ce8e84cba89379d91fc5074bacc5530f69da1c09a2853d906129d12b3b8"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/bin/node/browser-testing/Cargo.toml b/bin/node/browser-testing/Cargo.toml
index fade57d8124f..3ca5a3feaee9 100644
--- a/bin/node/browser-testing/Cargo.toml
+++ b/bin/node/browser-testing/Cargo.toml
@@ -12,9 +12,9 @@ libp2p = { version = "0.30.1", default-features = false }
 jsonrpc-core = "15.0.0"
 serde = "1.0.106"
 serde_json = "1.0.48"
-wasm-bindgen = { version = "=0.2.67", features = ["serde-serialize"] }
+wasm-bindgen = { version = "=0.2.68", features = ["serde-serialize"] }
 wasm-bindgen-futures = "0.4.10"
-wasm-bindgen-test = "0.3.10"
+wasm-bindgen-test = "0.3.17"
 futures = "0.3.4"
 
 node-cli = { path = "../cli", default-features = false, features = ["browser"] , version = "2.0.0"}

From 23473cad4f7cf2d7dfc40fb40c98508ae72c612e Mon Sep 17 00:00:00 2001
From: Wei Tang <wei@that.world>
Date: Sun, 22 Nov 2020 10:01:05 +0100
Subject: [PATCH 0089/1194] pallet-evm: move to Frontier (Part IV) (#7573)

---
 Cargo.lock                   | 138 +------
 Cargo.toml                   |   1 -
 docs/CODEOWNERS              |   3 -
 frame/evm/Cargo.toml         |  51 ---
 frame/evm/README.md          |  29 --
 frame/evm/src/backend.rs     | 216 -----------
 frame/evm/src/lib.rs         | 678 -----------------------------------
 frame/evm/src/precompiles.rs | 167 ---------
 frame/evm/src/tests.rs       | 189 ----------
 9 files changed, 2 insertions(+), 1470 deletions(-)
 delete mode 100644 frame/evm/Cargo.toml
 delete mode 100644 frame/evm/README.md
 delete mode 100644 frame/evm/src/backend.rs
 delete mode 100644 frame/evm/src/lib.rs
 delete mode 100644 frame/evm/src/precompiles.rs
 delete mode 100644 frame/evm/src/tests.rs

diff --git a/Cargo.lock b/Cargo.lock
index 3b905e4bd87e..b36d4721b929 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1439,23 +1439,6 @@ dependencies = [
  "tiny-keccak",
 ]
 
-[[package]]
-name = "ethereum"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df706418ff7d3874b9506424b04ea0bef569a2b39412b43a27ea86e679be108e"
-dependencies = [
- "ethereum-types",
- "hash-db",
- "hash256-std-hasher",
- "parity-scale-codec",
- "rlp",
- "rlp-derive",
- "serde",
- "sha3 0.9.1",
- "triehash",
-]
-
 [[package]]
 name = "ethereum-types"
 version = "0.9.2"
@@ -1476,56 +1459,6 @@ version = "2.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59"
 
-[[package]]
-name = "evm"
-version = "0.17.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16c8deca0ec3efa361b03d9cae6fe94321a1d2d0a523437edd720b3d140e3c08"
-dependencies = [
- "ethereum",
- "evm-core",
- "evm-gasometer",
- "evm-runtime",
- "log",
- "parity-scale-codec",
- "primitive-types",
- "rlp",
- "serde",
- "sha3 0.8.2",
-]
-
-[[package]]
-name = "evm-core"
-version = "0.17.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf2d732b3c36df36833761cf67df8f65866be1d368d20508bc3e13e6f256c8c5"
-dependencies = [
- "log",
- "primitive-types",
-]
-
-[[package]]
-name = "evm-gasometer"
-version = "0.17.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46de1b91ccd744627484183729f1b5af484b3bf15505007fc28cc54264cb9ea1"
-dependencies = [
- "evm-core",
- "evm-runtime",
- "primitive-types",
-]
-
-[[package]]
-name = "evm-runtime"
-version = "0.17.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2c1d1ffe96f833788512c890d702457d790dba4917ac6f64f8f60fbd9bc40b8"
-dependencies = [
- "evm-core",
- "primitive-types",
- "sha3 0.8.2",
-]
-
 [[package]]
 name = "exit-future"
 version = "0.2.0"
@@ -3248,7 +3181,7 @@ dependencies = [
  "pin-project 0.4.27",
  "rand 0.7.3",
  "salsa20",
- "sha3 0.9.1",
+ "sha3",
 ]
 
 [[package]]
@@ -3740,7 +3673,7 @@ dependencies = [
  "digest 0.9.0",
  "sha-1 0.9.2",
  "sha2 0.9.2",
- "sha3 0.9.1",
+ "sha3",
  "unsigned-varint 0.5.1",
 ]
 
@@ -4686,28 +4619,6 @@ dependencies = [
  "substrate-test-utils",
 ]
 
-[[package]]
-name = "pallet-evm"
-version = "2.0.0"
-dependencies = [
- "evm",
- "frame-support",
- "frame-system",
- "impl-trait-for-tuples",
- "pallet-balances",
- "pallet-timestamp",
- "parity-scale-codec",
- "primitive-types",
- "ripemd160",
- "rlp",
- "serde",
- "sha3 0.8.2",
- "sp-core",
- "sp-io",
- "sp-runtime",
- "sp-std",
-]
-
 [[package]]
 name = "pallet-example"
 version = "2.0.0"
@@ -6344,17 +6255,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "ripemd160"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eca4ecc81b7f313189bf73ce724400a07da2a6dac19588b03c8bd76a2dcc251"
-dependencies = [
- "block-buffer 0.9.0",
- "digest 0.9.0",
- "opaque-debug 0.3.0",
-]
-
 [[package]]
 name = "rlp"
 version = "0.4.6"
@@ -6364,17 +6264,6 @@ dependencies = [
  "rustc-hex",
 ]
 
-[[package]]
-name = "rlp-derive"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e33d7b2abe0c340d8797fe2907d3f20d3b5ea5908683618bfe80df7f621f672a"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "rocksdb"
 version = "0.15.0"
@@ -7923,19 +7812,6 @@ dependencies = [
  "opaque-debug 0.3.0",
 ]
 
-[[package]]
-name = "sha3"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd26bc0e7a2e3a7c959bc494caf58b72ee0c71d67704e9520f736ca7e4853ecf"
-dependencies = [
- "block-buffer 0.7.3",
- "byte-tools",
- "digest 0.8.1",
- "keccak",
- "opaque-debug 0.2.3",
-]
-
 [[package]]
 name = "sha3"
 version = "0.9.1"
@@ -9843,16 +9719,6 @@ dependencies = [
  "keccak-hasher",
 ]
 
-[[package]]
-name = "triehash"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f490aa7aa4e4d07edeba442c007e42e3e7f43aafb5112c5b047fff0b1aa5449c"
-dependencies = [
- "hash-db",
- "rlp",
-]
-
 [[package]]
 name = "try-lock"
 version = "0.2.3"
diff --git a/Cargo.toml b/Cargo.toml
index b78c4da05580..71bf56f9b0fb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -75,7 +75,6 @@ members = [
 	"frame/democracy",
 	"frame/elections-phragmen",
 	"frame/elections",
-	"frame/evm",
 	"frame/example",
 	"frame/example-offchain-worker",
 	"frame/example-parallel",
diff --git a/docs/CODEOWNERS b/docs/CODEOWNERS
index b195d5c65706..a3837e167786 100644
--- a/docs/CODEOWNERS
+++ b/docs/CODEOWNERS
@@ -45,9 +45,6 @@
 # Contracts
 /frame/contracts/ @athei
 
-# EVM
-/frame/evm/ @sorpaas
-
 # NPoS and election
 /frame/staking/ @kianenigma
 /frame/elections/ @kianenigma
diff --git a/frame/evm/Cargo.toml b/frame/evm/Cargo.toml
deleted file mode 100644
index a228dfb566be..000000000000
--- a/frame/evm/Cargo.toml
+++ /dev/null
@@ -1,51 +0,0 @@
-[package]
-name = "pallet-evm"
-version = "2.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-license = "Apache-2.0"
-homepage = "https://substrate.dev"
-repository = "https://github.com/paritytech/substrate/"
-description = "FRAME EVM contracts pallet"
-readme = "README.md"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[dependencies]
-serde = { version = "1.0.101", optional = true, features = ["derive"] }
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
-pallet-timestamp = { version = "2.0.0", default-features = false, path = "../timestamp" }
-pallet-balances = { version = "2.0.0", default-features = false, path = "../balances" }
-sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
-primitive-types = { version = "0.7.0", default-features = false, features = ["rlp", "byteorder"] }
-rlp = { version = "0.4", default-features = false }
-evm = { version = "0.17", default-features = false }
-sha3 = { version = "0.8", default-features = false }
-impl-trait-for-tuples = "0.1"
-ripemd160 = { version = "0.9", default-features = false }
-
-[features]
-default = ["std"]
-std = [
-	"serde",
-	"codec/std",
-	"sp-core/std",
-	"sp-runtime/std",
-	"frame-support/std",
-	"frame-system/std",
-	"pallet-balances/std",
-	"sp-io/std",
-	"sp-std/std",
-	"sha3/std",
-	"rlp/std",
-	"primitive-types/std",
-	"evm/std",
-	"pallet-timestamp/std",
-	"ripemd160/std",
-]
diff --git a/frame/evm/README.md b/frame/evm/README.md
deleted file mode 100644
index 499a0761cfa9..000000000000
--- a/frame/evm/README.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# EVM Module
-
-The EVM module allows unmodified EVM code to be executed in a Substrate-based blockchain.
-- [`evm::Trait`](https://docs.rs/pallet-evm/2.0.0/pallet_evm/trait.Trait.html)
-
-## EVM Engine
-
-The EVM module uses [`SputnikVM`](https://github.com/rust-blockchain/evm) as the underlying EVM engine. The engine is overhauled so that it's [`modular`](https://github.com/corepaper/evm).
-
-## Execution Lifecycle
-
-There are a separate set of accounts managed by the EVM module. Substrate based accounts can call the EVM Module to deposit or withdraw balance from the Substrate base-currency into a different balance managed and used by the EVM module. Once a user has populated their balance, they can create and call smart contracts using this module.
-
-There's one-to-one mapping from Substrate accounts and EVM external accounts that is defined by a conversion function.
-
-## EVM Module vs Ethereum Network
-
-The EVM module should be able to produce nearly identical results compared to the Ethereum mainnet, including gas cost and balance changes.
-
-Observable differences include:
-
-- The available length of block hashes may not be 256 depending on the configuration of the System module in the Substrate runtime.
-- Difficulty and coinbase, which do not make sense in this module and is currently hard coded to zero.
-
-We currently do not aim to make unobservable behaviors, such as state root, to be the same. We also don't aim to follow the exact same transaction / receipt format. However, given one Ethereum transaction and one Substrate account's private key, one should be able to convert any Ethereum transaction into a transaction compatible with this module.
-
-The gas configurations are configurable. Right now, a pre-defined Istanbul hard fork configuration option is provided.
-
-License: Apache-2.0
\ No newline at end of file
diff --git a/frame/evm/src/backend.rs b/frame/evm/src/backend.rs
deleted file mode 100644
index b625c0c54802..000000000000
--- a/frame/evm/src/backend.rs
+++ /dev/null
@@ -1,216 +0,0 @@
-use sp_std::marker::PhantomData;
-use sp_std::vec::Vec;
-#[cfg(feature = "std")]
-use serde::{Serialize, Deserialize};
-use codec::{Encode, Decode};
-use sp_core::{U256, H256, H160};
-use sp_runtime::traits::UniqueSaturatedInto;
-use frame_support::traits::Get;
-use frame_support::{debug, storage::{StorageMap, StorageDoubleMap}};
-use sha3::{Keccak256, Digest};
-use evm::backend::{Backend as BackendT, ApplyBackend, Apply};
-use crate::{Trait, AccountStorages, AccountCodes, Module, Event};
-
-#[derive(Clone, Eq, PartialEq, Encode, Decode, Default)]
-#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
-/// Ethereum account nonce, balance and code. Used by storage.
-pub struct Account {
-	/// Account nonce.
-	pub nonce: U256,
-	/// Account balance.
-	pub balance: U256,
-}
-
-#[derive(Clone, Eq, PartialEq, Encode, Decode)]
-#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
-/// Ethereum log. Used for `deposit_event`.
-pub struct Log {
-	/// Source address of the log.
-	pub address: H160,
-	/// Topics of the log.
-	pub topics: Vec<H256>,
-	/// Byte array data of the log.
-	pub data: Vec<u8>,
-}
-
-#[derive(Clone, Eq, PartialEq, Encode, Decode, Default)]
-#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
-/// External input from the transaction.
-pub struct Vicinity {
-	/// Current transaction gas price.
-	pub gas_price: U256,
-	/// Origin of the transaction.
-	pub origin: H160,
-}
-
-/// Substrate backend for EVM.
-pub struct Backend<'vicinity, T> {
-	vicinity: &'vicinity Vicinity,
-	_marker: PhantomData<T>,
-}
-
-impl<'vicinity, T> Backend<'vicinity, T> {
-	/// Create a new backend with given vicinity.
-	pub fn new(vicinity: &'vicinity Vicinity) -> Self {
-		Self { vicinity, _marker: PhantomData }
-	}
-}
-
-impl<'vicinity, T: Trait> BackendT for Backend<'vicinity, T> {
-	fn gas_price(&self) -> U256 { self.vicinity.gas_price }
-	fn origin(&self) -> H160 { self.vicinity.origin }
-
-	fn block_hash(&self, number: U256) -> H256 {
-		if number > U256::from(u32::max_value()) {
-			H256::default()
-		} else {
-			let number = T::BlockNumber::from(number.as_u32());
-			H256::from_slice(frame_system::Module::<T>::block_hash(number).as_ref())
-		}
-	}
-
-	fn block_number(&self) -> U256 {
-		let number: u128 = frame_system::Module::<T>::block_number().unique_saturated_into();
-		U256::from(number)
-	}
-
-	fn block_coinbase(&self) -> H160 {
-		H160::default()
-	}
-
-	fn block_timestamp(&self) -> U256 {
-		let now: u128 = pallet_timestamp::Module::<T>::get().unique_saturated_into();
-		U256::from(now / 1000)
-	}
-
-	fn block_difficulty(&self) -> U256 {
-		U256::zero()
-	}
-
-	fn block_gas_limit(&self) -> U256 {
-		U256::zero()
-	}
-
-	fn chain_id(&self) -> U256 {
-		U256::from(T::ChainId::get())
-	}
-
-	fn exists(&self, _address: H160) -> bool {
-		true
-	}
-
-	fn basic(&self, address: H160) -> evm::backend::Basic {
-		let account = Module::<T>::account_basic(&address);
-
-		evm::backend::Basic {
-			balance: account.balance,
-			nonce: account.nonce,
-		}
-	}
-
-	fn code_size(&self, address: H160) -> usize {
-		AccountCodes::decode_len(&address).unwrap_or(0)
-	}
-
-	fn code_hash(&self, address: H160) -> H256 {
-		H256::from_slice(Keccak256::digest(&AccountCodes::get(&address)).as_slice())
-	}
-
-	fn code(&self, address: H160) -> Vec<u8> {
-		AccountCodes::get(&address)
-	}
-
-	fn storage(&self, address: H160, index: H256) -> H256 {
-		AccountStorages::get(address, index)
-	}
-}
-
-impl<'vicinity, T: Trait> ApplyBackend for Backend<'vicinity, T> {
-	fn apply<A, I, L>(
-		&mut self,
-		values: A,
-		logs: L,
-		delete_empty: bool,
-	) where
-		A: IntoIterator<Item=Apply<I>>,
-		I: IntoIterator<Item=(H256, H256)>,
-		L: IntoIterator<Item=evm::backend::Log>,
-	{
-		for apply in values {
-			match apply {
-				Apply::Modify {
-					address, basic, code, storage, reset_storage,
-				} => {
-					Module::<T>::mutate_account_basic(&address, Account {
-						nonce: basic.nonce,
-						balance: basic.balance,
-					});
-
-					if let Some(code) = code {
-						debug::debug!(
-							target: "evm",
-							"Inserting code ({} bytes) at {:?}",
-							code.len(),
-							address
-						);
-						AccountCodes::insert(address, code);
-					}
-
-					if reset_storage {
-						AccountStorages::remove_prefix(address);
-					}
-
-					for (index, value) in storage {
-						if value == H256::default() {
-							debug::debug!(
-								target: "evm",
-								"Removing storage for {:?} [index: {:?}]",
-								address,
-								index
-							);
-							AccountStorages::remove(address, index);
-						} else {
-							debug::debug!(
-								target: "evm",
-								"Updating storage for {:?} [index: {:?}, value: {:?}]",
-								address,
-								index,
-								value
-							);
-							AccountStorages::insert(address, index, value);
-						}
-					}
-
-					if delete_empty {
-						Module::<T>::remove_account_if_empty(&address);
-					}
-				},
-				Apply::Delete { address } => {
-					debug::debug!(
-						target: "evm",
-						"Deleting account at {:?}",
-						address
-					);
-					Module::<T>::remove_account(&address)
-				},
-			}
-		}
-
-		for log in logs {
-			debug::trace!(
-				target: "evm",
-				"Inserting log for {:?}, topics ({}) {:?}, data ({}): {:?}]",
-				log.address,
-				log.topics.len(),
-				log.topics,
-				log.data.len(),
-				log.data
-			);
-			Module::<T>::deposit_event(Event::<T>::Log(Log {
-				address: log.address,
-				topics: log.topics,
-				data: log.data,
-			}));
-		}
-	}
-}
diff --git a/frame/evm/src/lib.rs b/frame/evm/src/lib.rs
deleted file mode 100644
index e7812a55482f..000000000000
--- a/frame/evm/src/lib.rs
+++ /dev/null
@@ -1,678 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! # EVM Module
-//!
-//! The EVM module allows unmodified EVM code to be executed in a Substrate-based blockchain.
-//! - [`evm::Trait`]
-//!
-//! ## EVM Engine
-//!
-//! The EVM module uses [`SputnikVM`](https://github.com/rust-blockchain/evm) as the underlying EVM engine.
-//! The engine is overhauled so that it's [`modular`](https://github.com/corepaper/evm).
-//!
-//! ## Execution Lifecycle
-//!
-//! There are a separate set of accounts managed by the EVM module. Substrate based accounts can call the EVM Module
-//! to deposit or withdraw balance from the Substrate base-currency into a different balance managed and used by
-//! the EVM module. Once a user has populated their balance, they can create and call smart contracts using this module.
-//!
-//! There's one-to-one mapping from Substrate accounts and EVM external accounts that is defined by a conversion function.
-//!
-//! ## EVM Module vs Ethereum Network
-//!
-//! The EVM module should be able to produce nearly identical results compared to the Ethereum mainnet,
-//! including gas cost and balance changes.
-//!
-//! Observable differences include:
-//!
-//! - The available length of block hashes may not be 256 depending on the configuration of the System module
-//! in the Substrate runtime.
-//! - Difficulty and coinbase, which do not make sense in this module and is currently hard coded to zero.
-//!
-//! We currently do not aim to make unobservable behaviors, such as state root, to be the same. We also don't aim to follow
-//! the exact same transaction / receipt format. However, given one Ethereum transaction and one Substrate account's
-//! private key, one should be able to convert any Ethereum transaction into a transaction compatible with this module.
-//!
-//! The gas configurations are configurable. Right now, a pre-defined Istanbul hard fork configuration option is provided.
-
-// Ensure we're `no_std` when compiling for Wasm.
-#![cfg_attr(not(feature = "std"), no_std)]
-
-mod backend;
-mod tests;
-pub mod precompiles;
-
-pub use crate::precompiles::{Precompile, Precompiles};
-pub use crate::backend::{Account, Log, Vicinity, Backend};
-
-use sp_std::vec::Vec;
-#[cfg(feature = "std")]
-use codec::{Encode, Decode};
-#[cfg(feature = "std")]
-use serde::{Serialize, Deserialize};
-use frame_support::{debug, ensure, decl_module, decl_storage, decl_event, decl_error};
-use frame_support::weights::{Weight, Pays};
-use frame_support::traits::{Currency, ExistenceRequirement, Get};
-use frame_support::dispatch::DispatchResultWithPostInfo;
-use frame_system::RawOrigin;
-use sp_core::{U256, H256, H160, Hasher};
-use sp_runtime::{AccountId32, traits::{UniqueSaturatedInto, SaturatedConversion, BadOrigin}};
-use sha3::{Digest, Keccak256};
-pub use evm::{ExitReason, ExitSucceed, ExitError, ExitRevert, ExitFatal};
-use evm::Config;
-use evm::executor::StackExecutor;
-use evm::backend::ApplyBackend;
-
-/// Type alias for currency balance.
-pub type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
-
-/// Trait that outputs the current transaction gas price.
-pub trait FeeCalculator {
-	/// Return the minimal required gas price.
-	fn min_gas_price() -> U256;
-}
-
-impl FeeCalculator for () {
-	fn min_gas_price() -> U256 { U256::zero() }
-}
-
-pub trait EnsureAddressOrigin<OuterOrigin> {
-	/// Success return type.
-	type Success;
-
-	/// Perform the origin check.
-	fn ensure_address_origin(
-		address: &H160,
-		origin: OuterOrigin,
-	) -> Result<Self::Success, BadOrigin> {
-		Self::try_address_origin(address, origin).map_err(|_| BadOrigin)
-	}
-
-	/// Try with origin.
-	fn try_address_origin(
-		address: &H160,
-		origin: OuterOrigin,
-	) -> Result<Self::Success, OuterOrigin>;
-}
-
-/// Ensure that the EVM address is the same as the Substrate address. This only works if the account
-/// ID is `H160`.
-pub struct EnsureAddressSame;
-
-impl<OuterOrigin> EnsureAddressOrigin<OuterOrigin> for EnsureAddressSame where
-	OuterOrigin: Into<Result<RawOrigin<H160>, OuterOrigin>> + From<RawOrigin<H160>>,
-{
-	type Success = H160;
-
-	fn try_address_origin(
-		address: &H160,
-		origin: OuterOrigin,
-	) -> Result<H160, OuterOrigin> {
-		origin.into().and_then(|o| match o {
-			RawOrigin::Signed(who) if &who == address => Ok(who),
-			r => Err(OuterOrigin::from(r))
-		})
-	}
-}
-
-/// Ensure that the origin is root.
-pub struct EnsureAddressRoot<AccountId>(sp_std::marker::PhantomData<AccountId>);
-
-impl<OuterOrigin, AccountId> EnsureAddressOrigin<OuterOrigin> for EnsureAddressRoot<AccountId> where
-	OuterOrigin: Into<Result<RawOrigin<AccountId>, OuterOrigin>> + From<RawOrigin<AccountId>>,
-{
-	type Success = ();
-
-	fn try_address_origin(
-		_address: &H160,
-		origin: OuterOrigin,
-	) -> Result<(), OuterOrigin> {
-		origin.into().and_then(|o| match o {
-			RawOrigin::Root => Ok(()),
-			r => Err(OuterOrigin::from(r)),
-		})
-	}
-}
-
-/// Ensure that the origin never happens.
-pub struct EnsureAddressNever<AccountId>(sp_std::marker::PhantomData<AccountId>);
-
-impl<OuterOrigin, AccountId> EnsureAddressOrigin<OuterOrigin> for EnsureAddressNever<AccountId> {
-	type Success = AccountId;
-
-	fn try_address_origin(
-		_address: &H160,
-		origin: OuterOrigin,
-	) -> Result<AccountId, OuterOrigin> {
-		Err(origin)
-	}
-}
-
-/// Ensure that the address is truncated hash of the origin. Only works if the account id is
-/// `AccountId32`.
-pub struct EnsureAddressTruncated;
-
-impl<OuterOrigin> EnsureAddressOrigin<OuterOrigin> for EnsureAddressTruncated where
-	OuterOrigin: Into<Result<RawOrigin<AccountId32>, OuterOrigin>> + From<RawOrigin<AccountId32>>,
-{
-	type Success = AccountId32;
-
-	fn try_address_origin(
-		address: &H160,
-		origin: OuterOrigin,
-	) -> Result<AccountId32, OuterOrigin> {
-		origin.into().and_then(|o| match o {
-			RawOrigin::Signed(who)
-				if AsRef::<[u8; 32]>::as_ref(&who)[0..20] == address[0..20] => Ok(who),
-			r => Err(OuterOrigin::from(r))
-		})
-	}
-}
-
-pub trait AddressMapping<A> {
-	fn into_account_id(address: H160) -> A;
-}
-
-/// Identity address mapping.
-pub struct IdentityAddressMapping;
-
-impl AddressMapping<H160> for IdentityAddressMapping {
-	fn into_account_id(address: H160) -> H160 { address }
-}
-
-/// Hashed address mapping.
-pub struct HashedAddressMapping<H>(sp_std::marker::PhantomData<H>);
-
-impl<H: Hasher<Out=H256>> AddressMapping<AccountId32> for HashedAddressMapping<H> {
-	fn into_account_id(address: H160) -> AccountId32 {
-		let mut data = [0u8; 24];
-		data[0..4].copy_from_slice(b"evm:");
-		data[4..24].copy_from_slice(&address[..]);
-		let hash = H::hash(&data);
-
-		AccountId32::from(Into::<[u8; 32]>::into(hash))
-	}
-}
-
-/// Substrate system chain ID.
-pub struct SystemChainId;
-
-impl Get<u64> for SystemChainId {
-	fn get() -> u64 {
-		sp_io::misc::chain_id()
-	}
-}
-
-static ISTANBUL_CONFIG: Config = Config::istanbul();
-
-/// EVM module trait
-pub trait Trait: frame_system::Trait + pallet_timestamp::Trait {
-	/// Calculator for current gas price.
-	type FeeCalculator: FeeCalculator;
-
-	/// Allow the origin to call on behalf of given address.
-	type CallOrigin: EnsureAddressOrigin<Self::Origin>;
-	/// Allow the origin to withdraw on behalf of given address.
-	type WithdrawOrigin: EnsureAddressOrigin<Self::Origin, Success=Self::AccountId>;
-
-	/// Mapping from address to account id.
-	type AddressMapping: AddressMapping<Self::AccountId>;
-	/// Currency type for withdraw and balance storage.
-	type Currency: Currency<Self::AccountId>;
-
-	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
-	/// Precompiles associated with this EVM engine.
-	type Precompiles: Precompiles;
-	/// Chain ID of EVM.
-	type ChainId: Get<u64>;
-
-	/// EVM config used in the module.
-	fn config() -> &'static Config {
-		&ISTANBUL_CONFIG
-	}
-}
-
-#[cfg(feature = "std")]
-#[derive(Clone, Eq, PartialEq, Encode, Decode, Debug, Serialize, Deserialize)]
-/// Account definition used for genesis block construction.
-pub struct GenesisAccount {
-	/// Account nonce.
-	pub nonce: U256,
-	/// Account balance.
-	pub balance: U256,
-	/// Full account storage.
-	pub storage: std::collections::BTreeMap<H256, H256>,
-	/// Account code.
-	pub code: Vec<u8>,
-}
-
-decl_storage! {
-	trait Store for Module<T: Trait> as EVM {
-		AccountCodes get(fn account_codes): map hasher(blake2_128_concat) H160 => Vec<u8>;
-		AccountStorages get(fn account_storages):
-			double_map hasher(blake2_128_concat) H160, hasher(blake2_128_concat) H256 => H256;
-	}
-
-	add_extra_genesis {
-		config(accounts): std::collections::BTreeMap<H160, GenesisAccount>;
-		build(|config: &GenesisConfig| {
-			for (address, account) in &config.accounts {
-				Module::<T>::mutate_account_basic(&address, Account {
-					balance: account.balance,
-					nonce: account.nonce,
-				});
-				AccountCodes::insert(address, &account.code);
-
-				for (index, value) in &account.storage {
-					AccountStorages::insert(address, index, value);
-				}
-			}
-		});
-	}
-}
-
-decl_event! {
-	/// EVM events
-	pub enum Event<T> where
-		<T as frame_system::Trait>::AccountId,
-	{
-		/// Ethereum events from contracts.
-		Log(Log),
-		/// A contract has been created at given \[address\].
-		Created(H160),
-		/// A \[contract\] was attempted to be created, but the execution failed.
-		CreatedFailed(H160),
-		/// A \[contract\] has been executed successfully with states applied.
-		Executed(H160),
-		/// A \[contract\] has been executed with errors. States are reverted with only gas fees applied.
-		ExecutedFailed(H160),
-		/// A deposit has been made at a given address. \[sender, address, value\]
-		BalanceDeposit(AccountId, H160, U256),
-		/// A withdrawal has been made from a given address. \[sender, address, value\]
-		BalanceWithdraw(AccountId, H160, U256),
-	}
-}
-
-decl_error! {
-	pub enum Error for Module<T: Trait> {
-		/// Not enough balance to perform action
-		BalanceLow,
-		/// Calculating total fee overflowed
-		FeeOverflow,
-		/// Calculating total payment overflowed
-		PaymentOverflow,
-		/// Withdraw fee failed
-		WithdrawFailed,
-		/// Gas price is too low.
-		GasPriceTooLow,
-		/// Nonce is invalid
-		InvalidNonce,
-	}
-}
-
-decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
-		type Error = Error<T>;
-
-		fn deposit_event() = default;
-
-		/// Withdraw balance from EVM into currency/balances module.
-		#[weight = 0]
-		fn withdraw(origin, address: H160, value: BalanceOf<T>) {
-			let destination = T::WithdrawOrigin::ensure_address_origin(&address, origin)?;
-			let address_account_id = T::AddressMapping::into_account_id(address);
-
-			T::Currency::transfer(
-				&address_account_id,
-				&destination,
-				value,
-				ExistenceRequirement::AllowDeath
-			)?;
-		}
-
-		/// Issue an EVM call operation. This is similar to a message call transaction in Ethereum.
-		#[weight = (*gas_price).saturated_into::<Weight>().saturating_mul(*gas_limit as Weight)]
-		fn call(
-			origin,
-			source: H160,
-			target: H160,
-			input: Vec<u8>,
-			value: U256,
-			gas_limit: u32,
-			gas_price: U256,
-			nonce: Option<U256>,
-		) -> DispatchResultWithPostInfo {
-			T::CallOrigin::ensure_address_origin(&source, origin)?;
-
-			match Self::execute_call(
-				source,
-				target,
-				input,
-				value,
-				gas_limit,
-				gas_price,
-				nonce,
-				true,
-			)? {
-				(ExitReason::Succeed(_), _, _, _) => {
-					Module::<T>::deposit_event(Event::<T>::Executed(target));
-				},
-				(_, _, _, _) => {
-					Module::<T>::deposit_event(Event::<T>::ExecutedFailed(target));
-				},
-			}
-
-			Ok(Pays::No.into())
-		}
-
-		/// Issue an EVM create operation. This is similar to a contract creation transaction in
-		/// Ethereum.
-		#[weight = (*gas_price).saturated_into::<Weight>().saturating_mul(*gas_limit as Weight)]
-		fn create(
-			origin,
-			source: H160,
-			init: Vec<u8>,
-			value: U256,
-			gas_limit: u32,
-			gas_price: U256,
-			nonce: Option<U256>,
-		) -> DispatchResultWithPostInfo {
-			T::CallOrigin::ensure_address_origin(&source, origin)?;
-
-			match Self::execute_create(
-				source,
-				init,
-				value,
-				gas_limit,
-				gas_price,
-				nonce,
-				true,
-			)? {
-				(ExitReason::Succeed(_), create_address, _, _) => {
-					Module::<T>::deposit_event(Event::<T>::Created(create_address));
-				},
-				(_, create_address, _, _) => {
-					Module::<T>::deposit_event(Event::<T>::CreatedFailed(create_address));
-				},
-			}
-
-			Ok(Pays::No.into())
-		}
-
-		/// Issue an EVM create2 operation.
-		#[weight = (*gas_price).saturated_into::<Weight>().saturating_mul(*gas_limit as Weight)]
-		fn create2(
-			origin,
-			source: H160,
-			init: Vec<u8>,
-			salt: H256,
-			value: U256,
-			gas_limit: u32,
-			gas_price: U256,
-			nonce: Option<U256>,
-		) -> DispatchResultWithPostInfo {
-			T::CallOrigin::ensure_address_origin(&source, origin)?;
-
-			match Self::execute_create2(
-				source,
-				init,
-				salt,
-				value,
-				gas_limit,
-				gas_price,
-				nonce,
-				true,
-			)? {
-				(ExitReason::Succeed(_), create_address, _, _) => {
-					Module::<T>::deposit_event(Event::<T>::Created(create_address));
-				},
-				(_, create_address, _, _) => {
-					Module::<T>::deposit_event(Event::<T>::CreatedFailed(create_address));
-				},
-			}
-
-			Ok(Pays::No.into())
-		}
-	}
-}
-
-impl<T: Trait> Module<T> {
-	fn remove_account(address: &H160) {
-		AccountCodes::remove(address);
-		AccountStorages::remove_prefix(address);
-	}
-
-	fn mutate_account_basic(address: &H160, new: Account) {
-		let account_id = T::AddressMapping::into_account_id(*address);
-		let current = Self::account_basic(address);
-
-		if current.nonce < new.nonce {
-			// ASSUME: in one single EVM transaction, the nonce will not increase more than
-			// `u128::max_value()`.
-			for _ in 0..(new.nonce - current.nonce).low_u128() {
-				frame_system::Module::<T>::inc_account_nonce(&account_id);
-			}
-		}
-
-		if current.balance > new.balance {
-			let diff = current.balance - new.balance;
-			T::Currency::slash(&account_id, diff.low_u128().unique_saturated_into());
-		} else if current.balance < new.balance {
-			let diff = new.balance - current.balance;
-			T::Currency::deposit_creating(&account_id, diff.low_u128().unique_saturated_into());
-		}
-	}
-
-	/// Check whether an account is empty.
-	pub fn is_account_empty(address: &H160) -> bool {
-		let account = Self::account_basic(address);
-		let code_len = AccountCodes::decode_len(address).unwrap_or(0);
-
-		account.nonce == U256::zero() &&
-			account.balance == U256::zero() &&
-			code_len == 0
-	}
-
-	/// Remove an account if its empty.
-	pub fn remove_account_if_empty(address: &H160) {
-		if Self::is_account_empty(address) {
-			Self::remove_account(address);
-		}
-	}
-
-	/// Get the account basic in EVM format.
-	pub fn account_basic(address: &H160) -> Account {
-		let account_id = T::AddressMapping::into_account_id(*address);
-
-		let nonce = frame_system::Module::<T>::account_nonce(&account_id);
-		let balance = T::Currency::free_balance(&account_id);
-
-		Account {
-			nonce: U256::from(UniqueSaturatedInto::<u128>::unique_saturated_into(nonce)),
-			balance: U256::from(UniqueSaturatedInto::<u128>::unique_saturated_into(balance)),
-		}
-	}
-
-	/// Execute a create transaction on behalf of given sender.
-	pub fn execute_create(
-		source: H160,
-		init: Vec<u8>,
-		value: U256,
-		gas_limit: u32,
-		gas_price: U256,
-		nonce: Option<U256>,
-		apply_state: bool,
-	) -> Result<(ExitReason, H160, U256, Vec<Log>), Error<T>> {
-		Self::execute_evm(
-			source,
-			value,
-			gas_limit,
-			gas_price,
-			nonce,
-			apply_state,
-			|executor| {
-				let address = executor.create_address(
-					evm::CreateScheme::Legacy { caller: source },
-				);
-				(executor.transact_create(
-					source,
-					value,
-					init,
-					gas_limit as usize,
-				), address)
-			},
-		)
-	}
-
-	/// Execute a create2 transaction on behalf of a given sender.
-	pub fn execute_create2(
-		source: H160,
-		init: Vec<u8>,
-		salt: H256,
-		value: U256,
-		gas_limit: u32,
-		gas_price: U256,
-		nonce: Option<U256>,
-		apply_state: bool,
-	) -> Result<(ExitReason, H160, U256, Vec<Log>), Error<T>> {
-		let code_hash = H256::from_slice(Keccak256::digest(&init).as_slice());
-		Self::execute_evm(
-			source,
-			value,
-			gas_limit,
-			gas_price,
-			nonce,
-			apply_state,
-			|executor| {
-				let address = executor.create_address(
-					evm::CreateScheme::Create2 { caller: source, code_hash, salt },
-				);
-				(executor.transact_create2(
-					source,
-					value,
-					init,
-					salt,
-					gas_limit as usize,
-				), address)
-			},
-		)
-	}
-
-	/// Execute a call transaction on behalf of a given sender.
-	pub fn execute_call(
-		source: H160,
-		target: H160,
-		input: Vec<u8>,
-		value: U256,
-		gas_limit: u32,
-		gas_price: U256,
-		nonce: Option<U256>,
-		apply_state: bool,
-	) -> Result<(ExitReason, Vec<u8>, U256, Vec<Log>), Error<T>> {
-		Self::execute_evm(
-			source,
-			value,
-			gas_limit,
-			gas_price,
-			nonce,
-			apply_state,
-			|executor| executor.transact_call(
-				source,
-				target,
-				value,
-				input,
-				gas_limit as usize,
-			),
-		)
-	}
-
-	/// Execute an EVM operation.
-	fn execute_evm<F, R>(
-		source: H160,
-		value: U256,
-		gas_limit: u32,
-		gas_price: U256,
-		nonce: Option<U256>,
-		apply_state: bool,
-		f: F,
-	) -> Result<(ExitReason, R, U256, Vec<Log>), Error<T>> where
-		F: FnOnce(&mut StackExecutor<Backend<T>>) -> (ExitReason, R),
-	{
-
-		// Gas price check is skipped when performing a gas estimation.
-		if apply_state {
-			ensure!(gas_price >= T::FeeCalculator::min_gas_price(), Error::<T>::GasPriceTooLow);
-		}
-
-		let vicinity = Vicinity {
-			gas_price,
-			origin: source,
-		};
-
-		let mut backend = Backend::<T>::new(&vicinity);
-		let mut executor = StackExecutor::new_with_precompile(
-			&backend,
-			gas_limit as usize,
-			T::config(),
-			T::Precompiles::execute,
-		);
-
-		let total_fee = gas_price.checked_mul(U256::from(gas_limit))
-			.ok_or(Error::<T>::FeeOverflow)?;
-		let total_payment = value.checked_add(total_fee).ok_or(Error::<T>::PaymentOverflow)?;
-		let source_account = Self::account_basic(&source);
-		ensure!(source_account.balance >= total_payment, Error::<T>::BalanceLow);
-		executor.withdraw(source, total_fee).map_err(|_| Error::<T>::WithdrawFailed)?;
-
-		if let Some(nonce) = nonce {
-			ensure!(source_account.nonce == nonce, Error::<T>::InvalidNonce);
-		}
-
-		let (retv, reason) = f(&mut executor);
-
-		let used_gas = U256::from(executor.used_gas());
-		let actual_fee = executor.fee(gas_price);
-		debug::debug!(
-			target: "evm",
-			"Execution {:?} [source: {:?}, value: {}, gas_limit: {}, used_gas: {}, actual_fee: {}]",
-			retv,
-			source,
-			value,
-			gas_limit,
-			used_gas,
-			actual_fee
-		);
-		executor.deposit(source, total_fee.saturating_sub(actual_fee));
-
-		let (values, logs) = executor.deconstruct();
-		let logs_data = logs.into_iter().map(|x| x ).collect::<Vec<_>>();
-		let logs_result = logs_data.clone().into_iter().map(|it| {
-			Log {
-				address: it.address,
-				topics: it.topics,
-				data: it.data
-			}
-		}).collect();
-		if apply_state {
-			backend.apply(values, logs_data, true);
-		}
-
-		Ok((retv, reason, used_gas, logs_result))
-	}
-}
diff --git a/frame/evm/src/precompiles.rs b/frame/evm/src/precompiles.rs
deleted file mode 100644
index 440d9bf1c68c..000000000000
--- a/frame/evm/src/precompiles.rs
+++ /dev/null
@@ -1,167 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Builtin precompiles.
-
-use sp_std::{cmp::min, vec::Vec};
-use sp_core::H160;
-use evm::{ExitError, ExitSucceed};
-use ripemd160::Digest;
-use impl_trait_for_tuples::impl_for_tuples;
-
-/// Custom precompiles to be used by EVM engine.
-pub trait Precompiles {
-	/// Try to execute the code address as precompile. If the code address is not
-	/// a precompile or the precompile is not yet available, return `None`.
-	/// Otherwise, calculate the amount of gas needed with given `input` and
-	/// `target_gas`. Return `Some(Ok(status, output, gas_used))` if the execution
-	/// is successful. Otherwise return `Some(Err(_))`.
-	fn execute(
-		address: H160,
-		input: &[u8],
-		target_gas: Option<usize>,
-	) -> Option<core::result::Result<(ExitSucceed, Vec<u8>, usize), ExitError>>;
-}
-
-/// One single precompile used by EVM engine.
-pub trait Precompile {
-	/// Try to execute the precompile. Calculate the amount of gas needed with given `input` and
-	/// `target_gas`. Return `Ok(status, output, gas_used)` if the execution is
-	/// successful. Otherwise return `Err(_)`.
-	fn execute(
-		input: &[u8],
-		target_gas: Option<usize>,
-	) -> core::result::Result<(ExitSucceed, Vec<u8>, usize), ExitError>;
-}
-
-#[impl_for_tuples(16)]
-#[tuple_types_no_default_trait_bound]
-impl Precompiles for Tuple {
-	for_tuples!( where #( Tuple: Precompile )* );
-
-	fn execute(
-		address: H160,
-		input: &[u8],
-		target_gas: Option<usize>,
-	) -> Option<core::result::Result<(ExitSucceed, Vec<u8>, usize), ExitError>> {
-		let mut index = 0;
-
-		for_tuples!( #(
-			index += 1;
-			if address == H160::from_low_u64_be(index) {
-				return Some(Tuple::execute(input, target_gas))
-			}
-		)* );
-
-		None
-	}
-}
-
-/// Linear gas cost
-fn ensure_linear_cost(
-	target_gas: Option<usize>,
-	len: usize,
-	base: usize,
-	word: usize
-) -> Result<usize, ExitError> {
-	let cost = base.checked_add(
-		word.checked_mul(len.saturating_add(31) / 32).ok_or(ExitError::OutOfGas)?
-	).ok_or(ExitError::OutOfGas)?;
-
-	if let Some(target_gas) = target_gas {
-		if cost > target_gas {
-			return Err(ExitError::OutOfGas)
-		}
-	}
-
-	Ok(cost)
-}
-
-/// The identity precompile.
-pub struct Identity;
-
-impl Precompile for Identity {
-	fn execute(
-		input: &[u8],
-		target_gas: Option<usize>,
-	) -> core::result::Result<(ExitSucceed, Vec<u8>, usize), ExitError> {
-		let cost = ensure_linear_cost(target_gas, input.len(), 15, 3)?;
-
-		Ok((ExitSucceed::Returned, input.to_vec(), cost))
-	}
-}
-
-/// The ecrecover precompile.
-pub struct ECRecover;
-
-impl Precompile for ECRecover {
-	fn execute(
-		i: &[u8],
-		target_gas: Option<usize>,
-	) -> core::result::Result<(ExitSucceed, Vec<u8>, usize), ExitError> {
-		let cost = ensure_linear_cost(target_gas, i.len(), 3000, 0)?;
-
-		let mut input = [0u8; 128];
-		input[..min(i.len(), 128)].copy_from_slice(&i[..min(i.len(), 128)]);
-
-		let mut msg = [0u8; 32];
-		let mut sig = [0u8; 65];
-
-		msg[0..32].copy_from_slice(&input[0..32]);
-		sig[0..32].copy_from_slice(&input[64..96]);
-		sig[32..64].copy_from_slice(&input[96..128]);
-		sig[64] = input[63];
-
-		let pubkey = sp_io::crypto::secp256k1_ecdsa_recover(&sig, &msg)
-			.map_err(|_| ExitError::Other("Public key recover failed"))?;
-		let mut address = sp_io::hashing::keccak_256(&pubkey);
-		address[0..12].copy_from_slice(&[0u8; 12]);
-
-		Ok((ExitSucceed::Returned, address.to_vec(), cost))
-	}
-}
-
-/// The ripemd precompile.
-pub struct Ripemd160;
-
-impl Precompile for Ripemd160 {
-	fn execute(
-		input: &[u8],
-		target_gas: Option<usize>,
-	) -> core::result::Result<(ExitSucceed, Vec<u8>, usize), ExitError> {
-		let cost = ensure_linear_cost(target_gas, input.len(), 600, 120)?;
-
-		let mut ret = [0u8; 32];
-		ret[12..32].copy_from_slice(&ripemd160::Ripemd160::digest(input));
-		Ok((ExitSucceed::Returned, ret.to_vec(), cost))
-	}
-}
-
-/// The sha256 precompile.
-pub struct Sha256;
-
-impl Precompile for Sha256 {
-	fn execute(
-		input: &[u8],
-		target_gas: Option<usize>,
-	) -> core::result::Result<(ExitSucceed, Vec<u8>, usize), ExitError> {
-		let cost = ensure_linear_cost(target_gas, input.len(), 60, 12)?;
-
-		let ret = sp_io::hashing::sha2_256(input);
-		Ok((ExitSucceed::Returned, ret.to_vec(), cost))
-	}
-}
diff --git a/frame/evm/src/tests.rs b/frame/evm/src/tests.rs
deleted file mode 100644
index d05fdca1407e..000000000000
--- a/frame/evm/src/tests.rs
+++ /dev/null
@@ -1,189 +0,0 @@
-#![cfg(test)]
-
-use super::*;
-
-use std::{str::FromStr, collections::BTreeMap};
-use frame_support::{
-	assert_ok, impl_outer_origin, parameter_types, impl_outer_dispatch,
-};
-use sp_core::{Blake2Hasher, H256};
-use sp_runtime::{
-	Perbill,
-	testing::Header,
-	traits::{BlakeTwo256, IdentityLookup},
-};
-
-impl_outer_origin! {
-	pub enum Origin for Test where system = frame_system {}
-}
-
-impl_outer_dispatch! {
-	pub enum OuterCall for Test where origin: Origin {
-		self::EVM,
-	}
-}
-
-#[derive(Clone, Eq, PartialEq)]
-pub struct Test;
-parameter_types! {
-	pub const BlockHashCount: u64 = 250;
-	pub const MaximumBlockWeight: Weight = 1024;
-	pub const MaximumBlockLength: u32 = 2 * 1024;
-	pub const AvailableBlockRatio: Perbill = Perbill::one();
-}
-impl frame_system::Trait for Test {
-	type BaseCallFilter = ();
-	type Origin = Origin;
-	type Index = u64;
-	type BlockNumber = u64;
-	type Hash = H256;
-	type Call = OuterCall;
-	type Hashing = BlakeTwo256;
-	type AccountId = AccountId32;
-	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
-	type Event = ();
-	type BlockHashCount = BlockHashCount;
-	type MaximumBlockWeight = MaximumBlockWeight;
-	type DbWeight = ();
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = MaximumBlockWeight;
-	type MaximumBlockLength = MaximumBlockLength;
-	type AvailableBlockRatio = AvailableBlockRatio;
-	type Version = ();
-	type PalletInfo = ();
-	type AccountData = pallet_balances::AccountData<u64>;
-	type OnNewAccount = ();
-	type OnKilledAccount = ();
-	type SystemWeightInfo = ();
-}
-
-parameter_types! {
-	pub const ExistentialDeposit: u64 = 1;
-}
-impl pallet_balances::Trait for Test {
-	type MaxLocks = ();
-	type Balance = u64;
-	type DustRemoval = ();
-	type Event = ();
-	type ExistentialDeposit = ExistentialDeposit;
-	type AccountStore = System;
-	type WeightInfo = ();
-}
-
-parameter_types! {
-	pub const MinimumPeriod: u64 = 1000;
-}
-impl pallet_timestamp::Trait for Test {
-	type Moment = u64;
-	type OnTimestampSet = ();
-	type MinimumPeriod = MinimumPeriod;
-	type WeightInfo = ();
-}
-
-/// Fixed gas price of `0`.
-pub struct FixedGasPrice;
-impl FeeCalculator for FixedGasPrice {
-	fn min_gas_price() -> U256 {
-		// Gas price is always one token per gas.
-		0.into()
-	}
-}
-
-impl Trait for Test {
-	type FeeCalculator = FixedGasPrice;
-
-	type CallOrigin = EnsureAddressRoot<Self::AccountId>;
-	type WithdrawOrigin = EnsureAddressNever<Self::AccountId>;
-
-	type AddressMapping = HashedAddressMapping<Blake2Hasher>;
-	type Currency = Balances;
-
-	type Event = Event<Test>;
-	type Precompiles = ();
-	type ChainId = SystemChainId;
-}
-
-type System = frame_system::Module<Test>;
-type Balances = pallet_balances::Module<Test>;
-type EVM = Module<Test>;
-
-pub fn new_test_ext() -> sp_io::TestExternalities {
-	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-
-	let mut accounts = BTreeMap::new();
-	accounts.insert(
-		H160::from_str("1000000000000000000000000000000000000001").unwrap(),
-		GenesisAccount {
-			nonce: U256::from(1),
-			balance: U256::from(1000000),
-			storage: Default::default(),
-			code: vec![
-				0x00, // STOP
-			],
-		}
-	);
-	accounts.insert(
-		H160::from_str("1000000000000000000000000000000000000002").unwrap(),
-		GenesisAccount {
-			nonce: U256::from(1),
-			balance: U256::from(1000000),
-			storage: Default::default(),
-			code: vec![
-				0xff, // INVALID
-			],
-		}
-	);
-
-	pallet_balances::GenesisConfig::<Test>::default().assimilate_storage(&mut t).unwrap();
-	GenesisConfig { accounts }.assimilate_storage::<Test>(&mut t).unwrap();
-	t.into()
-}
-
-#[test]
-fn fail_call_return_ok() {
-	new_test_ext().execute_with(|| {
-		assert_ok!(EVM::call(
-			Origin::root(),
-			H160::default(),
-			H160::from_str("1000000000000000000000000000000000000001").unwrap(),
-			Vec::new(),
-			U256::default(),
-			1000000,
-			U256::default(),
-			None,
-		));
-
-		assert_ok!(EVM::call(
-			Origin::root(),
-			H160::default(),
-			H160::from_str("1000000000000000000000000000000000000002").unwrap(),
-			Vec::new(),
-			U256::default(),
-			1000000,
-			U256::default(),
-			None,
-		));
-	});
-}
-
-#[test]
-fn mutate_account_works() {
-	new_test_ext().execute_with(|| {
-		EVM::mutate_account_basic(
-			&H160::from_str("1000000000000000000000000000000000000001").unwrap(),
-			Account {
-				nonce: U256::from(10),
-				balance: U256::from(1000),
-			},
-		);
-
-		assert_eq!(EVM::account_basic(
-			&H160::from_str("1000000000000000000000000000000000000001").unwrap()
-		), Account {
-			nonce: U256::from(10),
-			balance: U256::from(1000),
-		});
-	});
-}

From 24eec92e3f5a7a13440ad3ac5ba9829e6ba53fcb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 22 Nov 2020 12:57:21 +0100
Subject: [PATCH 0090/1194] Bump secrecy from 0.6.0 to 0.7.0 (#7568)

* Bump secrecy from 0.6.0 to 0.7.0

Bumps [secrecy](https://github.com/iqlusioninc/crates) from 0.6.0 to 0.7.0.
- [Release notes](https://github.com/iqlusioninc/crates/releases)
- [Commits](https://github.com/iqlusioninc/crates/compare/secrecy/v0.6.0...secrecy/v0.7.0)

Signed-off-by: dependabot[bot] <support@github.com>

* Fix compilation errors

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
---
 Cargo.lock                               |  4 ++--
 client/cli/src/params/keystore_params.rs | 23 +++++++----------------
 primitives/core/Cargo.toml               |  2 +-
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b36d4721b929..4741b67c6dea 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7648,9 +7648,9 @@ dependencies = [
 
 [[package]]
 name = "secrecy"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9182278ed645df3477a9c27bfee0621c621aa16f6972635f7f795dae3d81070f"
+checksum = "0673d6a6449f5e7d12a1caf424fd9363e2af3a4953023ed455e3c4beef4597c0"
 dependencies = [
  "zeroize",
 ]
diff --git a/client/cli/src/params/keystore_params.rs b/client/cli/src/params/keystore_params.rs
index 3c04d6314459..2ecd21cb3dd0 100644
--- a/client/cli/src/params/keystore_params.rs
+++ b/client/cli/src/params/keystore_params.rs
@@ -22,8 +22,7 @@ use std::fs;
 use std::path::PathBuf;
 use structopt::StructOpt;
 use crate::error;
-use sp_core::crypto::{SecretString, Zeroize};
-use std::str::FromStr;
+use sp_core::crypto::SecretString;
 
 /// default sub directory for the key store
 const DEFAULT_KEYSTORE_CONFIG_PATH: &'static str = "keystore";
@@ -72,21 +71,15 @@ impl KeystoreParams {
 		let password = if self.password_interactive {
 			#[cfg(not(target_os = "unknown"))]
 			{
-				let mut password = input_keystore_password()?;
-				let secret = std::str::FromStr::from_str(password.as_str())
-					.map_err(|()| "Error reading password")?;
-				password.zeroize();
-				Some(secret)
+				let password = input_keystore_password()?;
+				Some(SecretString::new(password))
 			}
 			#[cfg(target_os = "unknown")]
 			None
 		} else if let Some(ref file) = self.password_filename {
-			let mut password = fs::read_to_string(file)
+			let password = fs::read_to_string(file)
 				.map_err(|e| format!("{}", e))?;
-			let secret = std::str::FromStr::from_str(password.as_str())
-				.map_err(|()| "Error reading password")?;
-			password.zeroize();
-			Some(secret)
+			Some(SecretString::new(password))
 		} else {
 			self.password.clone()
 		};
@@ -104,10 +97,8 @@ impl KeystoreParams {
 		let (password_interactive, password) = (self.password_interactive, self.password.clone());
 
 		let pass = if password_interactive {
-			let mut password = rpassword::read_password_from_tty(Some("Key password: "))?;
-			let pass = Some(FromStr::from_str(&password).map_err(|()| "Error reading password")?);
-			password.zeroize();
-			pass
+			let password = rpassword::read_password_from_tty(Some("Key password: "))?;
+			Some(SecretString::new(password))
 		} else {
 			password
 		};
diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml
index f6989a0df4f0..5044a1d66913 100644
--- a/primitives/core/Cargo.toml
+++ b/primitives/core/Cargo.toml
@@ -30,7 +30,7 @@ tiny-bip39 = { version = "0.8", optional = true }
 regex = { version = "1.3.1", optional = true }
 num-traits = { version = "0.2.8", default-features = false }
 zeroize = { version = "1.0.0", default-features = false }
-secrecy = { version = "0.6.0", default-features = false }
+secrecy = { version = "0.7.0", default-features = false }
 lazy_static = { version = "1.4.0", default-features = false, optional = true }
 parking_lot = { version = "0.10.0", optional = true }
 sp-debug-derive = { version = "2.0.0", path = "../debug-derive" }

From 756212f36693491b232d98942f437ad054a0510e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 22 Nov 2020 21:04:39 +0100
Subject: [PATCH 0091/1194] Bump wasm-bindgen-futures from 0.4.17 to 0.4.18
 (#7572)

Bumps [wasm-bindgen-futures](https://github.com/rustwasm/wasm-bindgen) from 0.4.17 to 0.4.18.
- [Release notes](https://github.com/rustwasm/wasm-bindgen/releases)
- [Changelog](https://github.com/rustwasm/wasm-bindgen/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rustwasm/wasm-bindgen/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                          | 8 ++++----
 bin/node/browser-testing/Cargo.toml | 2 +-
 bin/node/cli/Cargo.toml             | 2 +-
 utils/browser/Cargo.toml            | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4741b67c6dea..52a1283fa061 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2622,9 +2622,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.44"
+version = "0.3.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85a7e2c92a4804dd459b86c339278d0fe87cf93757fae222c3fa3ae75458bc73"
+checksum = "ca059e81d9486668f12d455a4ea6daa600bd408134cd17e3d3fb5a32d1f016f8"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -10001,9 +10001,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.17"
+version = "0.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95f8d235a77f880bcef268d379810ea6c0af2eacfa90b1ad5af731776e0c4699"
+checksum = "b7866cab0aa01de1edf8b5d7936938a7e397ee50ce24119aef3e1eaa3b6171da"
 dependencies = [
  "cfg-if 0.1.10",
  "js-sys",
diff --git a/bin/node/browser-testing/Cargo.toml b/bin/node/browser-testing/Cargo.toml
index 3ca5a3feaee9..3b656a03225c 100644
--- a/bin/node/browser-testing/Cargo.toml
+++ b/bin/node/browser-testing/Cargo.toml
@@ -13,7 +13,7 @@ jsonrpc-core = "15.0.0"
 serde = "1.0.106"
 serde_json = "1.0.48"
 wasm-bindgen = { version = "=0.2.68", features = ["serde-serialize"] }
-wasm-bindgen-futures = "0.4.10"
+wasm-bindgen-futures = "0.4.18"
 wasm-bindgen-test = "0.3.17"
 futures = "0.3.4"
 
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index 26a23ce36ecc..604f4132ee1f 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -102,7 +102,7 @@ node-inspect = { version = "0.8.0", optional = true, path = "../inspect" }
 
 # WASM-specific dependencies
 wasm-bindgen = { version = "0.2.57", optional = true }
-wasm-bindgen-futures = { version = "0.4.7", optional = true }
+wasm-bindgen-futures = { version = "0.4.18", optional = true }
 browser-utils = { package = "substrate-browser-utils", path = "../../../utils/browser", optional = true, version = "0.8.0"}
 
 [target.'cfg(target_arch="x86_64")'.dependencies]
diff --git a/utils/browser/Cargo.toml b/utils/browser/Cargo.toml
index 9efc8c396680..4f35cd988039 100644
--- a/utils/browser/Cargo.toml
+++ b/utils/browser/Cargo.toml
@@ -21,7 +21,7 @@ console_error_panic_hook = "0.1.6"
 console_log = "0.1.2"
 js-sys = "0.3.34"
 wasm-bindgen = "0.2.57"
-wasm-bindgen-futures = "0.4.7"
+wasm-bindgen-futures = "0.4.18"
 kvdb-web = "0.7"
 sp-database = { version = "2.0.0", path = "../../primitives/database" }
 sc-informant = { version = "0.8.0", path = "../../client/informant" }

From 6c83f394219ec4460f13d6acf1799842edcc79ac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Nov 2020 12:05:14 +0100
Subject: [PATCH 0092/1194] Bump lru from 0.4.3 to 0.6.1 (#7577)

Bumps [lru](https://github.com/jeromefroe/lru-rs) from 0.4.3 to 0.6.1.
- [Release notes](https://github.com/jeromefroe/lru-rs/releases)
- [Changelog](https://github.com/jeromefroe/lru-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jeromefroe/lru-rs/compare/0.4.3...0.6.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                       | 15 +++------------
 client/network-gossip/Cargo.toml |  2 +-
 client/network/Cargo.toml        |  2 +-
 primitives/blockchain/Cargo.toml |  2 +-
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 52a1283fa061..de67db412fc0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3418,15 +3418,6 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "lru"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0609345ddee5badacf857d4f547e0e5a2e987db77085c24cd887f73573a04237"
-dependencies = [
- "hashbrown 0.6.3",
-]
-
 [[package]]
 name = "lru"
 version = "0.5.3"
@@ -7116,7 +7107,7 @@ dependencies = [
  "linked-hash-map",
  "linked_hash_set",
  "log",
- "lru 0.4.3",
+ "lru 0.6.1",
  "nohash-hasher",
  "parity-scale-codec",
  "parking_lot 0.10.2",
@@ -7162,7 +7153,7 @@ dependencies = [
  "futures-timer 3.0.2",
  "libp2p",
  "log",
- "lru 0.4.3",
+ "lru 0.6.1",
  "quickcheck",
  "rand 0.7.3",
  "sc-network",
@@ -8109,7 +8100,7 @@ name = "sp-blockchain"
 version = "2.0.0"
 dependencies = [
  "log",
- "lru 0.4.3",
+ "lru 0.6.1",
  "parity-scale-codec",
  "parking_lot 0.10.2",
  "sp-block-builder",
diff --git a/client/network-gossip/Cargo.toml b/client/network-gossip/Cargo.toml
index c120ff515c7a..02d934532396 100644
--- a/client/network-gossip/Cargo.toml
+++ b/client/network-gossip/Cargo.toml
@@ -19,7 +19,7 @@ futures = "0.3.4"
 futures-timer = "3.0.1"
 libp2p = { version = "0.30.1", default-features = false }
 log = "0.4.8"
-lru = "0.4.3"
+lru = "0.6.1"
 sc-network = { version = "0.8.0", path = "../network" }
 sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
 wasm-timer = "0.2"
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index 6b66fd0cdee6..80353183ec9f 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -36,7 +36,7 @@ ip_network = "0.3.4"
 linked-hash-map = "0.5.2"
 linked_hash_set = "0.1.3"
 log = "0.4.8"
-lru = "0.4.0"
+lru = "0.6.1"
 nohash-hasher = "0.2.0"
 parking_lot = "0.10.0"
 pin-project = "0.4.6"
diff --git a/primitives/blockchain/Cargo.toml b/primitives/blockchain/Cargo.toml
index f714aaaa1dae..7b7c0f3446ea 100644
--- a/primitives/blockchain/Cargo.toml
+++ b/primitives/blockchain/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 log = "0.4.11"
-lru = "0.4.0"
+lru = "0.6.1"
 parking_lot = "0.10.0"
 thiserror = "1.0.21"
 codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }

From 40e08ee4c03a93b343781a3d667203fd87e8a105 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Nov 2020 12:06:56 +0100
Subject: [PATCH 0093/1194] Bump wasm-bindgen-test from 0.3.17 to 0.3.18
 (#7579)

Bumps [wasm-bindgen-test](https://github.com/rustwasm/wasm-bindgen) from 0.3.17 to 0.3.18.
- [Release notes](https://github.com/rustwasm/wasm-bindgen/releases)
- [Changelog](https://github.com/rustwasm/wasm-bindgen/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rustwasm/wasm-bindgen/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                          | 8 ++++----
 bin/node/browser-testing/Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index de67db412fc0..a66618d92b3b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10033,9 +10033,9 @@ checksum = "1d649a3145108d7d3fbcde896a468d1bd636791823c9921135218ad89be08307"
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d92df9d5715606f9e48f85df3b78cb77ae44a2ea9a5f2a785a97bd0066b9300"
+checksum = "34d1cdc8b98a557f24733d50a1199c4b0635e465eecba9c45b214544da197f64"
 dependencies = [
  "console_error_panic_hook",
  "js-sys",
@@ -10047,9 +10047,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51611ce8e84cba89379d91fc5074bacc5530f69da1c09a2853d906129d12b3b8"
+checksum = "e8fb9c67be7439ee8ab1b7db502a49c05e51e2835b66796c705134d9b8e1a585"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/bin/node/browser-testing/Cargo.toml b/bin/node/browser-testing/Cargo.toml
index 3b656a03225c..e072607a7b65 100644
--- a/bin/node/browser-testing/Cargo.toml
+++ b/bin/node/browser-testing/Cargo.toml
@@ -14,7 +14,7 @@ serde = "1.0.106"
 serde_json = "1.0.48"
 wasm-bindgen = { version = "=0.2.68", features = ["serde-serialize"] }
 wasm-bindgen-futures = "0.4.18"
-wasm-bindgen-test = "0.3.17"
+wasm-bindgen-test = "0.3.18"
 futures = "0.3.4"
 
 node-cli = { path = "../cli", default-features = false, features = ["browser"] , version = "2.0.0"}

From 0fcbef2e12abe14d9502e4273b335a7a245a8193 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Nov 2020 13:16:43 +0100
Subject: [PATCH 0094/1194] Bump wasm-timer from 0.2.4 to 0.2.5 (#7578)

Bumps [wasm-timer](https://github.com/tomaka/wasm-timer) from 0.2.4 to 0.2.5.
- [Release notes](https://github.com/tomaka/wasm-timer/releases)
- [Commits](https://github.com/tomaka/wasm-timer/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                             | 13 +++----------
 client/telemetry/Cargo.toml            |  2 +-
 primitives/consensus/common/Cargo.toml |  2 +-
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a66618d92b3b..70d60f0d9f30 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7694,12 +7694,6 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
-[[package]]
-name = "send_wrapper"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0eddf2e8f50ced781f288c19f18621fa72a3779e3cb58dbf23b07469b0abeb4"
-
 [[package]]
 name = "send_wrapper"
 version = "0.3.0"
@@ -10068,15 +10062,14 @@ dependencies = [
 
 [[package]]
 name = "wasm-timer"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "324c5e65a08699c9c4334ba136597ab22b85dccd4b65dd1e36ccf8f723a95b54"
+checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f"
 dependencies = [
  "futures 0.3.8",
  "js-sys",
- "parking_lot 0.9.0",
+ "parking_lot 0.11.1",
  "pin-utils",
- "send_wrapper 0.2.0",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
diff --git a/client/telemetry/Cargo.toml b/client/telemetry/Cargo.toml
index bff7842bec4f..fab0fe00869c 100644
--- a/client/telemetry/Cargo.toml
+++ b/client/telemetry/Cargo.toml
@@ -18,7 +18,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 parking_lot = "0.10.0"
 futures = "0.3.4"
 futures-timer = "3.0.1"
-wasm-timer = "0.2.0"
+wasm-timer = "0.2.5"
 libp2p = { version = "0.30.1", default-features = false, features = ["dns", "tcp-async-std", "wasm-ext", "websocket"] }
 log = "0.4.8"
 pin-project = "0.4.6"
diff --git a/primitives/consensus/common/Cargo.toml b/primitives/consensus/common/Cargo.toml
index 001f0e367945..938745048c1b 100644
--- a/primitives/consensus/common/Cargo.toml
+++ b/primitives/consensus/common/Cargo.toml
@@ -33,7 +33,7 @@ codec = { package = "parity-scale-codec", version = "1.3.1", features = ["derive
 parking_lot = "0.10.0"
 serde = { version = "1.0", features = ["derive"] }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.8.0"}
-wasm-timer = "0.2.4"
+wasm-timer = "0.2.5"
 
 [dev-dependencies]
 futures = "0.3.4"

From f16acffe37285a93b793672c63146f8ecdab7a5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Mon, 23 Nov 2020 14:28:55 +0000
Subject: [PATCH 0095/1194] grandpa: remove light-client specific block import
 pipeline (#7546)

* grandpa: remove light-client specific block import

* consensus, network: remove finality proofs
---
 .../substrate-dashboard.json                  | 102 --
 bin/node-template/node/src/service.rs         |  30 +-
 bin/node/cli/src/service.rs                   |  37 +-
 bin/node/testing/src/bench.rs                 |   1 -
 client/consensus/aura/src/lib.rs              |   4 +-
 client/consensus/babe/src/lib.rs              |   6 +-
 client/consensus/babe/src/tests.rs            |   8 +-
 client/consensus/manual-seal/src/lib.rs       |   4 -
 client/consensus/pow/src/lib.rs               |   4 +-
 client/finality-grandpa/src/aux_schema.rs     |  22 -
 .../finality-grandpa/src/consensus_changes.rs |  78 --
 client/finality-grandpa/src/environment.rs    |  91 +-
 client/finality-grandpa/src/finality_proof.rs |  41 +-
 client/finality-grandpa/src/import.rs         |  15 +-
 client/finality-grandpa/src/lib.rs            |   6 -
 client/finality-grandpa/src/light_import.rs   | 880 ------------------
 client/finality-grandpa/src/observer.rs       |   5 -
 client/finality-grandpa/src/tests.rs          | 186 +---
 client/network/build.rs                       |   1 -
 client/network/src/behaviour.rs               |  34 +-
 client/network/src/chain.rs                   |  12 -
 client/network/src/config.rs                  |  32 +-
 client/network/src/finality_requests.rs       | 403 --------
 client/network/src/gossip/tests.rs            |   3 -
 client/network/src/lib.rs                     |   1 -
 client/network/src/protocol.rs                |  77 +-
 client/network/src/protocol/message.rs        |  32 +-
 client/network/src/protocol/sync.rs           | 158 +---
 .../src/protocol/sync/extra_requests.rs       |   5 +-
 client/network/src/schema.rs                  |   3 -
 client/network/src/schema/finality.v1.proto   |  19 -
 client/network/src/service.rs                 |  39 +-
 client/network/src/service/metrics.rs         |   5 -
 client/network/src/service/tests.rs           |   3 -
 client/network/test/src/block_import.rs       |   1 -
 client/network/test/src/lib.rs                |  35 +-
 client/service/src/builder.rs                 |  10 +-
 client/service/src/lib.rs                     |   2 +-
 .../consensus/common/src/block_import.rs      |  24 +-
 .../consensus/common/src/import_queue.rs      |  29 +-
 .../common/src/import_queue/basic_queue.rs    | 128 +--
 .../common/src/import_queue/buffered_link.rs  |  20 -
 primitives/consensus/common/src/lib.rs        |   2 +-
 primitives/consensus/common/src/metrics.rs    |  10 -
 44 files changed, 96 insertions(+), 2512 deletions(-)
 delete mode 100644 client/finality-grandpa/src/consensus_changes.rs
 delete mode 100644 client/finality-grandpa/src/light_import.rs
 delete mode 100644 client/network/src/finality_requests.rs
 delete mode 100644 client/network/src/schema/finality.v1.proto

diff --git a/.maintain/monitoring/grafana-dashboards/substrate-dashboard.json b/.maintain/monitoring/grafana-dashboards/substrate-dashboard.json
index 629b22617b22..a61e8a49bade 100644
--- a/.maintain/monitoring/grafana-dashboards/substrate-dashboard.json
+++ b/.maintain/monitoring/grafana-dashboards/substrate-dashboard.json
@@ -756,108 +756,6 @@
         "alignLevel": null
       }
     },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 0,
-        "y": 12
-      },
-      "hiddenSeries": false,
-      "id": 23,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "[[metric_namespace]]_sync_extra_finality_proofs_active{instance=\"[[instance]]\",network=\"[[network]]\"}",
-          "legendFormat": "{{instance}} active",
-          "refId": "A"
-        },
-        {
-          "expr": "[[metric_namespace]]_sync_extra_finality_proofs_failed{instance=\"[[instance]]\",network=\"[[network]]\"}",
-          "legendFormat": "{{instance}} failed",
-          "refId": "B"
-        },
-        {
-          "expr": "[[metric_namespace]]_sync_extra_finality_proofs_importing{instance=\"[[instance]]\",network=\"[[network]]\"}",
-          "legendFormat": "{{instance}} importing",
-          "refId": "C"
-        },
-        {
-          "expr": "[[metric_namespace]]_sync_extra_finality_proofs_pending{instance=\"[[instance]]\",network=\"[[network]]\"}",
-          "legendFormat": "{{instance}} pending",
-          "refId": "D"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Sync Proof",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
     {
       "aliasColors": {},
       "bars": false,
diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
index d85de7c840df..83481f8c1521 100644
--- a/bin/node-template/node/src/service.rs
+++ b/bin/node-template/node/src/service.rs
@@ -9,7 +9,7 @@ use sp_inherents::InherentDataProviders;
 use sc_executor::native_executor_instance;
 pub use sc_executor::NativeExecutor;
 use sp_consensus_aura::sr25519::{AuthorityPair as AuraPair};
-use sc_finality_grandpa::{FinalityProofProvider as GrandpaFinalityProofProvider, SharedVoterState};
+use sc_finality_grandpa::SharedVoterState;
 
 // Our native executor instance.
 native_executor_instance!(
@@ -64,7 +64,6 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 		sc_consensus_aura::slot_duration(&*client)?,
 		aura_block_import.clone(),
 		Some(Box::new(grandpa_block_import.clone())),
-		None,
 		client.clone(),
 		inherent_data_providers.clone(),
 		&task_manager.spawn_handle(),
@@ -87,9 +86,6 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
 		other: (block_import, grandpa_link),
 	} = new_partial(&config)?;
 
-	let finality_proof_provider =
-		GrandpaFinalityProofProvider::new_for_service(backend.clone(), client.clone());
-
 	let (network, network_status_sinks, system_rpc_tx, network_starter) =
 		sc_service::build_network(sc_service::BuildNetworkParams {
 			config: &config,
@@ -99,8 +95,6 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
 			import_queue,
 			on_demand: None,
 			block_announce_validator_builder: None,
-			finality_proof_request_builder: None,
-			finality_proof_provider: Some(finality_proof_provider.clone()),
 		})?;
 
 	if config.offchain_worker.enabled {
@@ -229,6 +223,8 @@ pub fn new_light(config: Configuration) -> Result<TaskManager, ServiceError> {
 	let (client, backend, keystore_container, mut task_manager, on_demand) =
 		sc_service::new_light_parts::<Block, RuntimeApi, Executor>(&config)?;
 
+	let select_chain = sc_consensus::LongestChain::new(backend.clone());
+
 	let transaction_pool = Arc::new(sc_transaction_pool::BasicPool::new_light(
 		config.transaction_pool.clone(),
 		config.prometheus_registry(),
@@ -237,19 +233,16 @@ pub fn new_light(config: Configuration) -> Result<TaskManager, ServiceError> {
 		on_demand.clone(),
 	));
 
-	let grandpa_block_import = sc_finality_grandpa::light_block_import(
-		client.clone(), backend.clone(), &(client.clone() as Arc<_>),
-		Arc::new(on_demand.checker().clone()) as Arc<_>,
+	let (grandpa_block_import, _) = sc_finality_grandpa::block_import(
+		client.clone(),
+		&(client.clone() as Arc<_>),
+		select_chain.clone(),
 	)?;
-	let finality_proof_import = grandpa_block_import.clone();
-	let finality_proof_request_builder =
-		finality_proof_import.create_finality_proof_request_builder();
 
 	let import_queue = sc_consensus_aura::import_queue::<_, _, _, AuraPair, _, _>(
 		sc_consensus_aura::slot_duration(&*client)?,
-		grandpa_block_import,
-		None,
-		Some(Box::new(finality_proof_import)),
+		grandpa_block_import.clone(),
+		Some(Box::new(grandpa_block_import)),
 		client.clone(),
 		InherentDataProviders::new(),
 		&task_manager.spawn_handle(),
@@ -257,9 +250,6 @@ pub fn new_light(config: Configuration) -> Result<TaskManager, ServiceError> {
 		sp_consensus::NeverCanAuthor,
 	)?;
 
-	let finality_proof_provider =
-		GrandpaFinalityProofProvider::new_for_service(backend.clone(), client.clone());
-
 	let (network, network_status_sinks, system_rpc_tx, network_starter) =
 		sc_service::build_network(sc_service::BuildNetworkParams {
 			config: &config,
@@ -269,8 +259,6 @@ pub fn new_light(config: Configuration) -> Result<TaskManager, ServiceError> {
 			import_queue,
 			on_demand: Some(on_demand.clone()),
 			block_announce_validator_builder: None,
-			finality_proof_request_builder: Some(finality_proof_request_builder),
-			finality_proof_provider: Some(finality_proof_provider),
 		})?;
 
 	if config.offchain_worker.enabled {
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index 3bc406b84fc6..9d7c9bb1b7a6 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -22,7 +22,6 @@
 
 use std::sync::Arc;
 use sc_consensus_babe;
-use grandpa::{self, FinalityProofProvider as GrandpaFinalityProofProvider};
 use node_primitives::Block;
 use node_runtime::RuntimeApi;
 use sc_service::{
@@ -57,10 +56,7 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 			grandpa::LinkHalf<Block, FullClient, FullSelectChain>,
 			sc_consensus_babe::BabeLink<Block>,
 		),
-		(
-			grandpa::SharedVoterState,
-			Arc<GrandpaFinalityProofProvider<FullBackend, Block>>,
-		),
+		grandpa::SharedVoterState,
 	)
 >, ServiceError> {
 	let (client, backend, keystore_container, task_manager) =
@@ -93,7 +89,6 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 		babe_link.clone(),
 		block_import.clone(),
 		Some(Box::new(justification_import)),
-		None,
 		client.clone(),
 		select_chain.clone(),
 		inherent_data_providers.clone(),
@@ -110,10 +105,10 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 		let justification_stream = grandpa_link.justification_stream();
 		let shared_authority_set = grandpa_link.shared_authority_set().clone();
 		let shared_voter_state = grandpa::SharedVoterState::empty();
-		let finality_proof_provider =
-			GrandpaFinalityProofProvider::new_for_service(backend.clone(), client.clone());
+		let rpc_setup = shared_voter_state.clone();
 
-		let rpc_setup = (shared_voter_state.clone(), finality_proof_provider.clone());
+		let finality_proof_provider =
+			grandpa::FinalityProofProvider::new_for_service(backend.clone(), client.clone());
 
 		let babe_config = babe_link.config().clone();
 		let shared_epoch_changes = babe_link.epoch_changes().clone();
@@ -181,7 +176,7 @@ pub fn new_full_base(
 		other: (rpc_extensions_builder, import_setup, rpc_setup),
 	} = new_partial(&config)?;
 
-	let (shared_voter_state, finality_proof_provider) = rpc_setup;
+	let shared_voter_state = rpc_setup;
 
 	let (network, network_status_sinks, system_rpc_tx, network_starter) =
 		sc_service::build_network(sc_service::BuildNetworkParams {
@@ -192,8 +187,6 @@ pub fn new_full_base(
 			import_queue,
 			on_demand: None,
 			block_announce_validator_builder: None,
-			finality_proof_request_builder: None,
-			finality_proof_provider: Some(finality_proof_provider.clone()),
 		})?;
 
 	if config.offchain_worker.enabled {
@@ -363,14 +356,12 @@ pub fn new_light_base(config: Configuration) -> Result<(
 		on_demand.clone(),
 	));
 
-	let grandpa_block_import = grandpa::light_block_import(
-		client.clone(), backend.clone(), &(client.clone() as Arc<_>),
-		Arc::new(on_demand.checker().clone()),
+	let (grandpa_block_import, _) = grandpa::block_import(
+		client.clone(),
+		&(client.clone() as Arc<_>),
+		select_chain.clone(),
 	)?;
-
-	let finality_proof_import = grandpa_block_import.clone();
-	let finality_proof_request_builder =
-		finality_proof_import.create_finality_proof_request_builder();
+	let justification_import = grandpa_block_import.clone();
 
 	let (babe_block_import, babe_link) = sc_consensus_babe::block_import(
 		sc_consensus_babe::Config::get_or_compute(&*client)?,
@@ -383,8 +374,7 @@ pub fn new_light_base(config: Configuration) -> Result<(
 	let import_queue = sc_consensus_babe::import_queue(
 		babe_link,
 		babe_block_import,
-		None,
-		Some(Box::new(finality_proof_import)),
+		Some(Box::new(justification_import)),
 		client.clone(),
 		select_chain.clone(),
 		inherent_data_providers.clone(),
@@ -393,9 +383,6 @@ pub fn new_light_base(config: Configuration) -> Result<(
 		sp_consensus::NeverCanAuthor,
 	)?;
 
-	let finality_proof_provider =
-		GrandpaFinalityProofProvider::new_for_service(backend.clone(), client.clone());
-
 	let (network, network_status_sinks, system_rpc_tx, network_starter) =
 		sc_service::build_network(sc_service::BuildNetworkParams {
 			config: &config,
@@ -405,8 +392,6 @@ pub fn new_light_base(config: Configuration) -> Result<(
 			import_queue,
 			on_demand: Some(on_demand.clone()),
 			block_announce_validator_builder: None,
-			finality_proof_request_builder: Some(finality_proof_request_builder),
-			finality_proof_provider: Some(finality_proof_provider),
 		})?;
 	network_starter.start_network();
 
diff --git a/bin/node/testing/src/bench.rs b/bin/node/testing/src/bench.rs
index a123da25301d..35af52a2f36c 100644
--- a/bin/node/testing/src/bench.rs
+++ b/bin/node/testing/src/bench.rs
@@ -695,7 +695,6 @@ impl BenchContext {
 					clear_justification_requests: false,
 					needs_justification: false,
 					bad_justification: false,
-					needs_finality_proof: false,
 					is_new_best: true,
 				}
 			)
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index 97bfb217b939..246b39771277 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -47,7 +47,7 @@ use sp_consensus::{
 	BlockOrigin, Error as ConsensusError, SelectChain, SlotData, BlockCheckParams, ImportResult
 };
 use sp_consensus::import_queue::{
-	Verifier, BasicQueue, DefaultImportQueue, BoxJustificationImport, BoxFinalityProofImport,
+	Verifier, BasicQueue, DefaultImportQueue, BoxJustificationImport,
 };
 use sc_client_api::{backend::AuxStore, BlockOf};
 use sp_blockchain::{
@@ -836,7 +836,6 @@ pub fn import_queue<B, I, C, P, S, CAW>(
 	slot_duration: SlotDuration,
 	block_import: I,
 	justification_import: Option<BoxJustificationImport<B>>,
-	finality_proof_import: Option<BoxFinalityProofImport<B>>,
 	client: Arc<C>,
 	inherent_data_providers: InherentDataProviders,
 	spawner: &S,
@@ -868,7 +867,6 @@ pub fn import_queue<B, I, C, P, S, CAW>(
 		verifier,
 		Box::new(block_import),
 		justification_import,
-		finality_proof_import,
 		spawner,
 		registry,
 	))
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index c672440d114b..3f2a583482af 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -79,9 +79,7 @@ use std::{
 	any::Any, borrow::Cow, convert::TryInto,
 };
 use sp_consensus::{ImportResult, CanAuthorWith};
-use sp_consensus::import_queue::{
-	BoxJustificationImport, BoxFinalityProofImport,
-};
+use sp_consensus::import_queue::BoxJustificationImport;
 use sp_core::crypto::Public;
 use sp_application_crypto::AppKey;
 use sp_keystore::{SyncCryptoStorePtr, SyncCryptoStore};
@@ -1484,7 +1482,6 @@ pub fn import_queue<Block: BlockT, Client, SelectChain, Inner, CAW>(
 	babe_link: BabeLink<Block>,
 	block_import: Inner,
 	justification_import: Option<BoxJustificationImport<Block>>,
-	finality_proof_import: Option<BoxFinalityProofImport<Block>>,
 	client: Arc<Client>,
 	select_chain: SelectChain,
 	inherent_data_providers: InherentDataProviders,
@@ -1516,7 +1513,6 @@ pub fn import_queue<Block: BlockT, Client, SelectChain, Inner, CAW>(
 		verifier,
 		Box::new(block_import),
 		justification_import,
-		finality_proof_import,
 		spawner,
 		registry,
 	))
diff --git a/client/consensus/babe/src/tests.rs b/client/consensus/babe/src/tests.rs
index b31699d13e0c..6e0536c85ced 100644
--- a/client/consensus/babe/src/tests.rs
+++ b/client/consensus/babe/src/tests.rs
@@ -37,11 +37,11 @@ use sc_consensus_slots::BackoffAuthoringOnFinalizedHeadLagging;
 use sc_block_builder::{BlockBuilder, BlockBuilderProvider};
 use sp_consensus::{
 	NoNetwork as DummyOracle, Proposal, RecordProof, AlwaysCanAuthor,
-	import_queue::{BoxBlockImport, BoxJustificationImport, BoxFinalityProofImport},
+	import_queue::{BoxBlockImport, BoxJustificationImport},
 };
 use sc_network_test::*;
 use sc_network_test::{Block as TestBlock, PeersClient};
-use sc_network::config::{BoxFinalityProofRequestBuilder, ProtocolConfig};
+use sc_network::config::ProtocolConfig;
 use sp_runtime::{generic::DigestItem, traits::{Block as BlockT, DigestFor}};
 use sc_client_api::{BlockchainEvents, backend::TransactionFor};
 use log::debug;
@@ -272,8 +272,6 @@ impl TestNetFactory for BabeTestNet {
 		-> (
 			BlockImportAdapter<Transaction>,
 			Option<BoxJustificationImport<Block>>,
-			Option<BoxFinalityProofImport<Block>>,
-			Option<BoxFinalityProofRequestBuilder<Block>>,
 			Option<PeerData>,
 		)
 	{
@@ -295,8 +293,6 @@ impl TestNetFactory for BabeTestNet {
 		(
 			BlockImportAdapter::new_full(block_import),
 			None,
-			None,
-			None,
 			Some(PeerData { link, inherent_data_providers, block_import: data_block_import }),
 		)
 	}
diff --git a/client/consensus/manual-seal/src/lib.rs b/client/consensus/manual-seal/src/lib.rs
index d025d6aaf689..5a1cd0f79b47 100644
--- a/client/consensus/manual-seal/src/lib.rs
+++ b/client/consensus/manual-seal/src/lib.rs
@@ -84,7 +84,6 @@ pub fn import_queue<Block, Transaction>(
 		ManualSealVerifier,
 		block_import,
 		None,
-		None,
 		spawner,
 		registry,
 	)
@@ -349,7 +348,6 @@ mod tests {
 					clear_justification_requests: false,
 					needs_justification: false,
 					bad_justification: false,
-					needs_finality_proof: false,
 					is_new_best: true,
 				}
 			}
@@ -416,7 +414,6 @@ mod tests {
 					clear_justification_requests: false,
 					needs_justification: false,
 					bad_justification: false,
-					needs_finality_proof: false,
 					is_new_best: true,
 				}
 			}
@@ -494,7 +491,6 @@ mod tests {
 					clear_justification_requests: false,
 					needs_justification: false,
 					bad_justification: false,
-					needs_finality_proof: false,
 					is_new_best: true
 				}
 			}
diff --git a/client/consensus/pow/src/lib.rs b/client/consensus/pow/src/lib.rs
index b73b9aa91f80..e353ed6358a0 100644
--- a/client/consensus/pow/src/lib.rs
+++ b/client/consensus/pow/src/lib.rs
@@ -56,7 +56,7 @@ use sp_consensus::{
 	BlockCheckParams, ImportResult,
 };
 use sp_consensus::import_queue::{
-	BoxBlockImport, BasicQueue, Verifier, BoxJustificationImport, BoxFinalityProofImport,
+	BoxBlockImport, BasicQueue, Verifier, BoxJustificationImport,
 };
 use codec::{Encode, Decode};
 use prometheus_endpoint::Registry;
@@ -503,7 +503,6 @@ pub type PowImportQueue<B, Transaction> = BasicQueue<B, Transaction>;
 pub fn import_queue<B, Transaction, Algorithm>(
 	block_import: BoxBlockImport<B, Transaction>,
 	justification_import: Option<BoxJustificationImport<B>>,
-	finality_proof_import: Option<BoxFinalityProofImport<B>>,
 	algorithm: Algorithm,
 	inherent_data_providers: InherentDataProviders,
 	spawner: &impl sp_core::traits::SpawnNamed,
@@ -524,7 +523,6 @@ pub fn import_queue<B, Transaction, Algorithm>(
 		verifier,
 		block_import,
 		justification_import,
-		finality_proof_import,
 		spawner,
 		registry,
 	))
diff --git a/client/finality-grandpa/src/aux_schema.rs b/client/finality-grandpa/src/aux_schema.rs
index 4ed96d058ac6..97041f4081a7 100644
--- a/client/finality-grandpa/src/aux_schema.rs
+++ b/client/finality-grandpa/src/aux_schema.rs
@@ -17,7 +17,6 @@
 //! Schema for stuff in the aux-db.
 
 use std::fmt::Debug;
-use std::sync::Arc;
 use parity_scale_codec::{Encode, Decode};
 use sc_client_api::backend::AuxStore;
 use sp_blockchain::{Result as ClientResult, Error as ClientError};
@@ -28,7 +27,6 @@ use log::{info, warn};
 use sp_finality_grandpa::{AuthorityList, SetId, RoundNumber};
 
 use crate::authorities::{AuthoritySet, SharedAuthoritySet, PendingChange, DelayKind};
-use crate::consensus_changes::{SharedConsensusChanges, ConsensusChanges};
 use crate::environment::{
 	CompletedRound, CompletedRounds, CurrentRounds, HasVoted, SharedVoterSetState, VoterSetState,
 };
@@ -38,7 +36,6 @@ const VERSION_KEY: &[u8] = b"grandpa_schema_version";
 const SET_STATE_KEY: &[u8] = b"grandpa_completed_round";
 const CONCLUDED_ROUNDS: &[u8] = b"grandpa_concluded_rounds";
 const AUTHORITY_SET_KEY: &[u8] = b"grandpa_voters";
-const CONSENSUS_CHANGES_KEY: &[u8] = b"grandpa_consensus_changes";
 
 const CURRENT_VERSION: u32 = 2;
 
@@ -122,7 +119,6 @@ pub(crate) fn load_decode<B: AuxStore, T: Decode>(backend: &B, key: &[u8]) -> Cl
 /// Persistent data kept between runs.
 pub(crate) struct PersistentData<Block: BlockT> {
 	pub(crate) authority_set: SharedAuthoritySet<Block::Hash, NumberFor<Block>>,
-	pub(crate) consensus_changes: SharedConsensusChanges<Block::Hash, NumberFor<Block>>,
 	pub(crate) set_state: SharedVoterSetState<Block>,
 }
 
@@ -272,8 +268,6 @@ pub(crate) fn load_persistent<Block: BlockT, B, G>(
 		G: FnOnce() -> ClientResult<AuthorityList>,
 {
 	let version: Option<u32> = load_decode(backend, VERSION_KEY)?;
-	let consensus_changes = load_decode(backend, CONSENSUS_CHANGES_KEY)?
-		.unwrap_or_else(ConsensusChanges::<Block::Hash, NumberFor<Block>>::empty);
 
 	let make_genesis_round = move || RoundState::genesis((genesis_hash, genesis_number));
 
@@ -282,7 +276,6 @@ pub(crate) fn load_persistent<Block: BlockT, B, G>(
 			if let Some((new_set, set_state)) = migrate_from_version0::<Block, _, _>(backend, &make_genesis_round)? {
 				return Ok(PersistentData {
 					authority_set: new_set.into(),
-					consensus_changes: Arc::new(consensus_changes.into()),
 					set_state: set_state.into(),
 				});
 			}
@@ -291,7 +284,6 @@ pub(crate) fn load_persistent<Block: BlockT, B, G>(
 			if let Some((new_set, set_state)) = migrate_from_version1::<Block, _, _>(backend, &make_genesis_round)? {
 				return Ok(PersistentData {
 					authority_set: new_set.into(),
-					consensus_changes: Arc::new(consensus_changes.into()),
 					set_state: set_state.into(),
 				});
 			}
@@ -321,7 +313,6 @@ pub(crate) fn load_persistent<Block: BlockT, B, G>(
 
 				return Ok(PersistentData {
 					authority_set: set.into(),
-					consensus_changes: Arc::new(consensus_changes.into()),
 					set_state: set_state.into(),
 				});
 			}
@@ -359,7 +350,6 @@ pub(crate) fn load_persistent<Block: BlockT, B, G>(
 	Ok(PersistentData {
 		authority_set: genesis_set.into(),
 		set_state: genesis_state.into(),
-		consensus_changes: Arc::new(consensus_changes.into()),
 	})
 }
 
@@ -421,18 +411,6 @@ pub(crate) fn write_concluded_round<Block: BlockT, B: AuxStore>(
 	backend.insert_aux(&[(&key[..], round_data.encode().as_slice())], &[])
 }
 
-/// Update the consensus changes.
-pub(crate) fn update_consensus_changes<H, N, F, R>(
-	set: &ConsensusChanges<H, N>,
-	write_aux: F
-) -> R where
-	H: Encode + Clone,
-	N: Encode + Clone,
-	F: FnOnce(&[(&'static [u8], &[u8])]) -> R,
-{
-	write_aux(&[(CONSENSUS_CHANGES_KEY, set.encode().as_slice())])
-}
-
 #[cfg(test)]
 pub(crate) fn load_authorities<B: AuxStore, H: Decode, N: Decode>(backend: &B)
 	-> Option<AuthoritySet<H, N>> {
diff --git a/client/finality-grandpa/src/consensus_changes.rs b/client/finality-grandpa/src/consensus_changes.rs
deleted file mode 100644
index 1ce7b551d0d7..000000000000
--- a/client/finality-grandpa/src/consensus_changes.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2018-2020 Parity Technologies (UK) Ltd.
-// This file is part of Substrate.
-
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::sync::Arc;
-use parity_scale_codec::{Encode, Decode};
-
-/// Consensus-related data changes tracker.
-#[derive(Clone, Debug, Encode, Decode)]
-pub(crate) struct ConsensusChanges<H, N> {
-	pending_changes: Vec<(N, H)>,
-}
-
-impl<H, N> ConsensusChanges<H, N> {
-	/// Create empty consensus changes.
-	pub(crate) fn empty() -> Self {
-		ConsensusChanges { pending_changes: Vec::new(), }
-	}
-}
-
-impl<H: Copy + PartialEq, N: Copy + Ord> ConsensusChanges<H, N> {
-
-	/// Returns reference to all pending changes.
-	pub fn pending_changes(&self) -> &[(N, H)] {
-		&self.pending_changes
-	}
-
-	/// Note unfinalized change of consensus-related data.
-	pub(crate) fn note_change(&mut self, at: (N, H)) {
-		let idx = self.pending_changes
-			.binary_search_by_key(&at.0, |change| change.0)
-			.unwrap_or_else(|i| i);
-		self.pending_changes.insert(idx, at);
-	}
-
-	/// Finalize all pending consensus changes that are finalized by given block.
-	/// Returns true if there any changes were finalized.
-	pub(crate) fn finalize<F: Fn(N) -> ::sp_blockchain::Result<Option<H>>>(
-		&mut self,
-		block: (N, H),
-		canonical_at_height: F,
-	) -> ::sp_blockchain::Result<(bool, bool)> {
-		let (split_idx, has_finalized_changes) = self.pending_changes.iter()
-			.enumerate()
-			.take_while(|(_, &(at_height, _))| at_height <= block.0)
-			.fold((None, Ok(false)), |(_, has_finalized_changes), (idx, ref at)|
-				(
-					Some(idx),
-					has_finalized_changes
-						.and_then(|has_finalized_changes| if has_finalized_changes {
-							Ok(has_finalized_changes)
-						} else {
-							canonical_at_height(at.0).map(|can_hash| Some(at.1) == can_hash)
-						}),
-				));
-
-		let altered_changes = split_idx.is_some();
-		if let Some(split_idx) = split_idx {
-			self.pending_changes = self.pending_changes.split_off(split_idx + 1);
-		}
-		has_finalized_changes.map(|has_finalized_changes| (altered_changes, has_finalized_changes))
-	}
-}
-
-/// Thread-safe consensus changes tracker reference.
-pub(crate) type SharedConsensusChanges<H, N> = Arc<parking_lot::Mutex<ConsensusChanges<H, N>>>;
diff --git a/client/finality-grandpa/src/environment.rs b/client/finality-grandpa/src/environment.rs
index 9b3a656d0cd8..790be2a22178 100644
--- a/client/finality-grandpa/src/environment.rs
+++ b/client/finality-grandpa/src/environment.rs
@@ -34,10 +34,10 @@ use finality_grandpa::{
 	BlockNumberOps, Error as GrandpaError, round::State as RoundState,
 	voter, voter_set::VoterSet,
 };
-use sp_blockchain::{HeaderBackend, HeaderMetadata, Error as ClientError};
+use sp_blockchain::HeaderMetadata;
 use sp_runtime::generic::BlockId;
 use sp_runtime::traits::{
-	Block as BlockT, Header as HeaderT, NumberFor, One, Zero,
+	Block as BlockT, Header as HeaderT, NumberFor, Zero,
 };
 use sc_telemetry::{telemetry, CONSENSUS_DEBUG, CONSENSUS_INFO};
 
@@ -50,7 +50,6 @@ use sp_consensus::SelectChain;
 
 use crate::authorities::{AuthoritySet, SharedAuthoritySet};
 use crate::communication::Network as NetworkT;
-use crate::consensus_changes::SharedConsensusChanges;
 use crate::notification::GrandpaJustificationSender;
 use crate::justification::GrandpaJustification;
 use crate::until_imported::UntilVoteTargetImported;
@@ -440,7 +439,6 @@ pub(crate) struct Environment<Backend, Block: BlockT, C, N: NetworkT<Block>, SC,
 	pub(crate) voters: Arc<VoterSet<AuthorityId>>,
 	pub(crate) config: Config,
 	pub(crate) authority_set: SharedAuthoritySet<Block::Hash, NumberFor<Block>>,
-	pub(crate) consensus_changes: SharedConsensusChanges<Block::Hash, NumberFor<Block>>,
 	pub(crate) network: crate::communication::NetworkBridge<Block, N>,
 	pub(crate) set_id: SetId,
 	pub(crate) voter_set_state: SharedVoterSetState<Block>,
@@ -1115,7 +1113,6 @@ where
 		finalize_block(
 			self.client.clone(),
 			&self.authority_set,
-			&self.consensus_changes,
 			Some(self.config.justification_period.into()),
 			hash,
 			number,
@@ -1180,7 +1177,6 @@ impl<Block: BlockT> From<GrandpaJustification<Block>> for JustificationOrCommit<
 pub(crate) fn finalize_block<BE, Block, Client>(
 	client: Arc<Client>,
 	authority_set: &SharedAuthoritySet<Block::Hash, NumberFor<Block>>,
-	consensus_changes: &SharedConsensusChanges<Block::Hash, NumberFor<Block>>,
 	justification_period: Option<NumberFor<Block>>,
 	hash: Block::Hash,
 	number: NumberFor<Block>,
@@ -1215,15 +1211,6 @@ where
 
 	// FIXME #1483: clone only when changed
 	let old_authority_set = authority_set.clone();
-	// holds the old consensus changes in case it is changed below, needed for
-	// reverting in case of failure
-	let mut old_consensus_changes = None;
-
-	let mut consensus_changes = consensus_changes.lock();
-	let canon_at_height = |canon_number| {
-		// "true" because the block is finalized
-		canonical_at_height(&*client, (hash, number), true, canon_number)
-	};
 
 	let update_res: Result<_, Error> = client.lock_import_and_run(|import_op| {
 		let status = authority_set.apply_standard_changes(
@@ -1233,26 +1220,6 @@ where
 			initial_sync,
 		).map_err(|e| Error::Safety(e.to_string()))?;
 
-		// check if this is this is the first finalization of some consensus changes
-		let (alters_consensus_changes, finalizes_consensus_changes) = consensus_changes
-			.finalize((number, hash), &canon_at_height)?;
-
-		if alters_consensus_changes {
-			old_consensus_changes = Some(consensus_changes.clone());
-
-			let write_result = crate::aux_schema::update_consensus_changes(
-				&*consensus_changes,
-				|insert| apply_aux(import_op, insert, &[]),
-			);
-
-			if let Err(e) = write_result {
-				warn!(target: "afg", "Failed to write updated consensus changes to disk. Bailing.");
-				warn!(target: "afg", "Node is in a potentially inconsistent state.");
-
-				return Err(e.into());
-			}
-		}
-
 		// send a justification notification if a sender exists and in case of error log it.
 		fn notify_justification<Block: BlockT>(
 			justification_sender: Option<&GrandpaJustificationSender<Block>>,
@@ -1280,9 +1247,7 @@ where
 				let mut justification_required =
 					// justification is always required when block that enacts new authorities
 					// set is finalized
-					status.new_set_block.is_some() ||
-					// justification is required when consensus changes are finalized
-					finalizes_consensus_changes;
+					status.new_set_block.is_some();
 
 				// justification is required every N blocks to be able to prove blocks
 				// finalization to remote nodes
@@ -1387,57 +1352,7 @@ where
 		Err(e) => {
 			*authority_set = old_authority_set;
 
-			if let Some(old_consensus_changes) = old_consensus_changes {
-				*consensus_changes = old_consensus_changes;
-			}
-
 			Err(CommandOrError::Error(e))
 		}
 	}
 }
-
-/// Using the given base get the block at the given height on this chain. The
-/// target block must be an ancestor of base, therefore `height <= base.height`.
-pub(crate) fn canonical_at_height<Block: BlockT, C: HeaderBackend<Block>>(
-	provider: &C,
-	base: (Block::Hash, NumberFor<Block>),
-	base_is_canonical: bool,
-	height: NumberFor<Block>,
-) -> Result<Option<Block::Hash>, ClientError> {
-	if height > base.1 {
-		return Ok(None);
-	}
-
-	if height == base.1 {
-		if base_is_canonical {
-			return Ok(Some(base.0));
-		} else {
-			return Ok(provider.hash(height).unwrap_or(None));
-		}
-	} else if base_is_canonical {
-		return Ok(provider.hash(height).unwrap_or(None));
-	}
-
-	let one = NumberFor::<Block>::one();
-
-	// start by getting _canonical_ block with number at parent position and then iterating
-	// backwards by hash.
-	let mut current = match provider.header(BlockId::Number(base.1 - one))? {
-		Some(header) => header,
-		_ => return Ok(None),
-	};
-
-	// we've already checked that base > height above.
-	let mut steps = base.1 - height - one;
-
-	while steps > NumberFor::<Block>::zero() {
-		current = match provider.header(BlockId::Hash(*current.parent_hash()))? {
-			Some(header) => header,
-			_ => return Ok(None),
-		};
-
-		steps -= one;
-	}
-
-	Ok(Some(current.hash()))
-}
diff --git a/client/finality-grandpa/src/finality_proof.rs b/client/finality-grandpa/src/finality_proof.rs
index 33dd69cc11d6..bf367ab3f4a5 100644
--- a/client/finality-grandpa/src/finality_proof.rs
+++ b/client/finality-grandpa/src/finality_proof.rs
@@ -16,6 +16,9 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+// NOTE: should be removed with: https://github.com/paritytech/substrate/pull/7339
+#![allow(dead_code)]
+
 //! GRANDPA block finality proof generation and check.
 //!
 //! Finality of block B is proved by providing:
@@ -37,7 +40,7 @@
 //! of the U) could be returned.
 
 use std::sync::Arc;
-use log::{trace, warn};
+use log::trace;
 
 use sp_blockchain::{Backend as BlockchainBackend, Error as ClientError, Result as ClientResult};
 use sc_client_api::{
@@ -206,34 +209,6 @@ impl<B, Block> FinalityProofProvider<B, Block>
 	}
 }
 
-impl<B, Block> sc_network::config::FinalityProofProvider<Block> for FinalityProofProvider<B, Block>
-	where
-		Block: BlockT,
-		NumberFor<Block>: BlockNumberOps,
-		B: Backend<Block> + Send + Sync + 'static,
-{
-	fn prove_finality(
-		&self,
-		for_block: Block::Hash,
-		request: &[u8],
-	) -> Result<Option<Vec<u8>>, ClientError> {
-		let request: FinalityProofRequest<Block::Hash> = Decode::decode(&mut &request[..])
-			.map_err(|e| {
-				warn!(target: "afg", "Unable to decode finality proof request: {}", e.what());
-				ClientError::Backend("Invalid finality proof request".to_string())
-			})?;
-		match request {
-			FinalityProofRequest::Original(request) => prove_finality::<_, _, GrandpaJustification<Block>>(
-				&*self.backend.blockchain(),
-				&*self.authority_provider,
-				request.authorities_set_id,
-				request.last_finalized,
-				for_block,
-			),
-		}
-	}
-}
-
 /// The effects of block finality.
 #[derive(Debug, PartialEq)]
 pub struct FinalityEffects<Header: HeaderT> {
@@ -290,14 +265,6 @@ struct OriginalFinalityProofRequest<H: Encode + Decode> {
 	pub last_finalized: H,
 }
 
-/// Prepare data blob associated with finality proof request.
-pub(crate) fn make_finality_proof_request<H: Encode + Decode>(last_finalized: H, authorities_set_id: u64) -> Vec<u8> {
-	FinalityProofRequest::Original(OriginalFinalityProofRequest {
-		authorities_set_id,
-		last_finalized,
-	}).encode()
-}
-
 /// Prepare proof-of-finality for the best possible block in the range: (begin; end].
 ///
 /// It is assumed that the caller already have a proof-of-finality for the block 'begin'.
diff --git a/client/finality-grandpa/src/import.rs b/client/finality-grandpa/src/import.rs
index 04df95a3187e..89f9d0c16ad7 100644
--- a/client/finality-grandpa/src/import.rs
+++ b/client/finality-grandpa/src/import.rs
@@ -41,7 +41,6 @@ use sp_runtime::traits::{
 
 use crate::{Error, CommandOrError, NewAuthoritySet, VoterCommand};
 use crate::authorities::{AuthoritySet, SharedAuthoritySet, DelayKind, PendingChange};
-use crate::consensus_changes::SharedConsensusChanges;
 use crate::environment::finalize_block;
 use crate::justification::GrandpaJustification;
 use crate::notification::GrandpaJustificationSender;
@@ -61,7 +60,6 @@ pub struct GrandpaBlockImport<Backend, Block: BlockT, Client, SC> {
 	select_chain: SC,
 	authority_set: SharedAuthoritySet<Block::Hash, NumberFor<Block>>,
 	send_voter_commands: TracingUnboundedSender<VoterCommand<Block::Hash, NumberFor<Block>>>,
-	consensus_changes: SharedConsensusChanges<Block::Hash, NumberFor<Block>>,
 	authority_set_hard_forks: HashMap<Block::Hash, PendingChange<Block::Hash, NumberFor<Block>>>,
 	justification_sender: GrandpaJustificationSender<Block>,
 	_phantom: PhantomData<Backend>,
@@ -76,7 +74,6 @@ impl<Backend, Block: BlockT, Client, SC: Clone> Clone for
 			select_chain: self.select_chain.clone(),
 			authority_set: self.authority_set.clone(),
 			send_voter_commands: self.send_voter_commands.clone(),
-			consensus_changes: self.consensus_changes.clone(),
 			authority_set_hard_forks: self.authority_set_hard_forks.clone(),
 			justification_sender: self.justification_sender.clone(),
 			_phantom: PhantomData,
@@ -439,7 +436,6 @@ impl<BE, Block: BlockT, Client, SC> BlockImport<Block>
 
 		// we don't want to finalize on `inner.import_block`
 		let mut justification = block.justification.take();
-		let enacts_consensus_change = !new_cache.is_empty();
 		let import_result = (&*self.inner).import_block(block, new_cache);
 
 		let mut imported_aux = {
@@ -517,7 +513,7 @@ impl<BE, Block: BlockT, Client, SC> BlockImport<Block>
 				);
 
 				import_res.unwrap_or_else(|err| {
-					if needs_justification || enacts_consensus_change {
+					if needs_justification {
 						debug!(target: "afg", "Imported block #{} that enacts authority set change with \
 							invalid justification: {:?}, requesting justification from peers.", number, err);
 						imported_aux.bad_justification = true;
@@ -535,12 +531,6 @@ impl<BE, Block: BlockT, Client, SC> BlockImport<Block>
 
 					imported_aux.needs_justification = true;
 				}
-
-				// we have imported block with consensus data changes, but without justification
-				// => remember to create justification when next block will be finalized
-				if enacts_consensus_change {
-					self.consensus_changes.lock().note_change((number, hash));
-				}
 			}
 		}
 
@@ -561,7 +551,6 @@ impl<Backend, Block: BlockT, Client, SC> GrandpaBlockImport<Backend, Block, Clie
 		select_chain: SC,
 		authority_set: SharedAuthoritySet<Block::Hash, NumberFor<Block>>,
 		send_voter_commands: TracingUnboundedSender<VoterCommand<Block::Hash, NumberFor<Block>>>,
-		consensus_changes: SharedConsensusChanges<Block::Hash, NumberFor<Block>>,
 		authority_set_hard_forks: Vec<(SetId, PendingChange<Block::Hash, NumberFor<Block>>)>,
 		justification_sender: GrandpaJustificationSender<Block>,
 	) -> GrandpaBlockImport<Backend, Block, Client, SC> {
@@ -605,7 +594,6 @@ impl<Backend, Block: BlockT, Client, SC> GrandpaBlockImport<Backend, Block, Clie
 			select_chain,
 			authority_set,
 			send_voter_commands,
-			consensus_changes,
 			authority_set_hard_forks,
 			justification_sender,
 			_phantom: PhantomData,
@@ -646,7 +634,6 @@ where
 		let result = finalize_block(
 			self.inner.clone(),
 			&self.authority_set,
-			&self.consensus_changes,
 			None,
 			hash,
 			number,
diff --git a/client/finality-grandpa/src/lib.rs b/client/finality-grandpa/src/lib.rs
index 18b439abf5e6..c5f89717a64d 100644
--- a/client/finality-grandpa/src/lib.rs
+++ b/client/finality-grandpa/src/lib.rs
@@ -112,12 +112,10 @@ macro_rules! afg_log {
 mod authorities;
 mod aux_schema;
 mod communication;
-mod consensus_changes;
 mod environment;
 mod finality_proof;
 mod import;
 mod justification;
-mod light_import;
 mod notification;
 mod observer;
 mod until_imported;
@@ -128,7 +126,6 @@ pub use finality_proof::{FinalityProofFragment, FinalityProofProvider, StorageAn
 pub use notification::{GrandpaJustificationSender, GrandpaJustificationStream};
 pub use import::GrandpaBlockImport;
 pub use justification::GrandpaJustification;
-pub use light_import::{light_block_import, GrandpaLightBlockImport};
 pub use voting_rule::{
 	BeforeBestBlockBy, ThreeQuartersOfTheUnfinalizedChain, VotingRule, VotingRulesBuilder
 };
@@ -588,7 +585,6 @@ where
 			select_chain.clone(),
 			persistent_data.authority_set.clone(),
 			voter_commands_tx,
-			persistent_data.consensus_changes.clone(),
 			authority_set_hard_forks,
 			justification_sender.clone(),
 		),
@@ -844,7 +840,6 @@ where
 			network: network.clone(),
 			set_id: persistent_data.authority_set.set_id(),
 			authority_set: persistent_data.authority_set.clone(),
-			consensus_changes: persistent_data.consensus_changes.clone(),
 			voter_set_state: persistent_data.set_state,
 			metrics: metrics.as_ref().map(|m| m.environment.clone()),
 			justification_sender: Some(justification_sender),
@@ -989,7 +984,6 @@ where
 					select_chain: self.env.select_chain.clone(),
 					config: self.env.config.clone(),
 					authority_set: self.env.authority_set.clone(),
-					consensus_changes: self.env.consensus_changes.clone(),
 					network: self.env.network.clone(),
 					voting_rule: self.env.voting_rule.clone(),
 					metrics: self.env.metrics.clone(),
diff --git a/client/finality-grandpa/src/light_import.rs b/client/finality-grandpa/src/light_import.rs
deleted file mode 100644
index a7c9a655467c..000000000000
--- a/client/finality-grandpa/src/light_import.rs
+++ /dev/null
@@ -1,880 +0,0 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
-// This file is part of Substrate.
-
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::collections::HashMap;
-use std::sync::Arc;
-use log::{info, trace, warn};
-use parking_lot::RwLock;
-use sc_client_api::backend::{AuxStore, Backend, Finalizer, TransactionFor};
-use sp_blockchain::{HeaderBackend, Error as ClientError, well_known_cache_keys};
-use parity_scale_codec::{Encode, Decode};
-use sp_consensus::{
-	import_queue::Verifier,
-	BlockOrigin, BlockImport, FinalityProofImport, BlockImportParams, ImportResult, ImportedAux,
-	BlockCheckParams, Error as ConsensusError,
-};
-use sc_network::config::{BoxFinalityProofRequestBuilder, FinalityProofRequestBuilder};
-use sp_runtime::Justification;
-use sp_runtime::traits::{NumberFor, Block as BlockT, Header as HeaderT, DigestFor};
-use sp_finality_grandpa::{self, AuthorityList};
-use sp_runtime::generic::BlockId;
-
-use crate::GenesisAuthoritySetProvider;
-use crate::aux_schema::load_decode;
-use crate::consensus_changes::ConsensusChanges;
-use crate::environment::canonical_at_height;
-use crate::finality_proof::{
-	AuthoritySetForFinalityChecker, ProvableJustification, make_finality_proof_request,
-};
-use crate::justification::GrandpaJustification;
-
-/// LightAuthoritySet is saved under this key in aux storage.
-const LIGHT_AUTHORITY_SET_KEY: &[u8] = b"grandpa_voters";
-/// ConsensusChanges is saver under this key in aux storage.
-const LIGHT_CONSENSUS_CHANGES_KEY: &[u8] = b"grandpa_consensus_changes";
-
-/// Create light block importer.
-pub fn light_block_import<BE, Block: BlockT, Client>(
-	client: Arc<Client>,
-	backend: Arc<BE>,
-	genesis_authorities_provider: &dyn GenesisAuthoritySetProvider<Block>,
-	authority_set_provider: Arc<dyn AuthoritySetForFinalityChecker<Block>>,
-) -> Result<GrandpaLightBlockImport<BE, Block, Client>, ClientError>
-	where
-		BE: Backend<Block>,
-		Client: crate::ClientForGrandpa<Block, BE>,
-{
-	let info = client.info();
-	let import_data = load_aux_import_data(
-		info.finalized_hash,
-		&*client,
-		genesis_authorities_provider,
-	)?;
-	Ok(GrandpaLightBlockImport {
-		client,
-		backend,
-		authority_set_provider,
-		data: Arc::new(RwLock::new(import_data)),
-	})
-}
-
-/// A light block-import handler for GRANDPA.
-///
-/// It is responsible for:
-/// - checking GRANDPA justifications;
-/// - fetching finality proofs for blocks that are enacting consensus changes.
-pub struct GrandpaLightBlockImport<BE, Block: BlockT, Client> {
-	client: Arc<Client>,
-	backend: Arc<BE>,
-	authority_set_provider: Arc<dyn AuthoritySetForFinalityChecker<Block>>,
-	data: Arc<RwLock<LightImportData<Block>>>,
-}
-
-impl<BE, Block: BlockT, Client> Clone for GrandpaLightBlockImport<BE, Block, Client> {
-	fn clone(&self) -> Self {
-		GrandpaLightBlockImport {
-			client: self.client.clone(),
-			backend: self.backend.clone(),
-			authority_set_provider: self.authority_set_provider.clone(),
-			data: self.data.clone(),
-		}
-	}
-}
-
-/// Mutable data of light block importer.
-struct LightImportData<Block: BlockT> {
-	last_finalized: Block::Hash,
-	authority_set: LightAuthoritySet,
-	consensus_changes: ConsensusChanges<Block::Hash, NumberFor<Block>>,
-}
-
-/// Latest authority set tracker.
-#[derive(Debug, Encode, Decode)]
-struct LightAuthoritySet {
-	set_id: u64,
-	authorities: AuthorityList,
-}
-
-impl<BE, Block: BlockT, Client> GrandpaLightBlockImport<BE, Block, Client> {
-	/// Create finality proof request builder.
-	pub fn create_finality_proof_request_builder(&self) -> BoxFinalityProofRequestBuilder<Block> {
-		Box::new(GrandpaFinalityProofRequestBuilder(self.data.clone())) as _
-	}
-}
-
-impl<BE, Block: BlockT, Client> BlockImport<Block>
-	for GrandpaLightBlockImport<BE, Block, Client> where
-		NumberFor<Block>: finality_grandpa::BlockNumberOps,
-		DigestFor<Block>: Encode,
-		BE: Backend<Block> + 'static,
-		for<'a> &'a Client:
-			HeaderBackend<Block>
-			+ BlockImport<Block, Error = ConsensusError, Transaction = TransactionFor<BE, Block>>
-			+ Finalizer<Block, BE>
-			+ AuxStore,
-{
-	type Error = ConsensusError;
-	type Transaction = TransactionFor<BE, Block>;
-
-	fn import_block(
-		&mut self,
-		block: BlockImportParams<Block, Self::Transaction>,
-		new_cache: HashMap<well_known_cache_keys::Id, Vec<u8>>,
-	) -> Result<ImportResult, Self::Error> {
-		do_import_block::<_, _, _, GrandpaJustification<Block>>(
-			&*self.client, &mut *self.data.write(), block, new_cache
-		)
-	}
-
-	fn check_block(
-		&mut self,
-		block: BlockCheckParams<Block>,
-	) -> Result<ImportResult, Self::Error> {
-		self.client.check_block(block)
-	}
-}
-
-impl<BE, Block: BlockT, Client> FinalityProofImport<Block>
-	for GrandpaLightBlockImport<BE, Block, Client> where
-		NumberFor<Block>: finality_grandpa::BlockNumberOps,
-		DigestFor<Block>: Encode,
-		BE: Backend<Block> + 'static,
-		for<'a> &'a Client:
-			HeaderBackend<Block>
-			+ BlockImport<Block, Error = ConsensusError, Transaction = TransactionFor<BE, Block>>
-			+ Finalizer<Block, BE>
-			+ AuxStore,
-{
-	type Error = ConsensusError;
-
-	fn on_start(&mut self) -> Vec<(Block::Hash, NumberFor<Block>)> {
-		let mut out = Vec::new();
-		let chain_info = (&*self.client).info();
-
-		let data = self.data.read();
-		for (pending_number, pending_hash) in data.consensus_changes.pending_changes() {
-			if *pending_number > chain_info.finalized_number
-				&& *pending_number <= chain_info.best_number
-			{
-				out.push((*pending_hash, *pending_number));
-			}
-		}
-
-		out
-	}
-
-	fn import_finality_proof(
-		&mut self,
-		hash: Block::Hash,
-		number: NumberFor<Block>,
-		finality_proof: Vec<u8>,
-		verifier: &mut dyn Verifier<Block>,
-	) -> Result<(Block::Hash, NumberFor<Block>), Self::Error> {
-		do_import_finality_proof::<_, _, _, GrandpaJustification<Block>>(
-			&*self.client,
-			self.backend.clone(),
-			&*self.authority_set_provider,
-			&mut *self.data.write(),
-			hash,
-			number,
-			finality_proof,
-			verifier,
-		)
-	}
-}
-
-impl LightAuthoritySet {
-	/// Get a genesis set with given authorities.
-	pub fn genesis(initial: AuthorityList) -> Self {
-		LightAuthoritySet {
-			set_id: sp_finality_grandpa::SetId::default(),
-			authorities: initial,
-		}
-	}
-
-	/// Get latest set id.
-	pub fn set_id(&self) -> u64 {
-		self.set_id
-	}
-
-	/// Get latest authorities set.
-	pub fn authorities(&self) -> AuthorityList {
-		self.authorities.clone()
-	}
-
-	/// Set new authorities set.
-	pub fn update(&mut self, set_id: u64, authorities: AuthorityList) {
-		self.set_id = set_id;
-		self.authorities = authorities;
-	}
-}
-
-struct GrandpaFinalityProofRequestBuilder<B: BlockT>(Arc<RwLock<LightImportData<B>>>);
-
-impl<B: BlockT> FinalityProofRequestBuilder<B> for GrandpaFinalityProofRequestBuilder<B> {
-	fn build_request_data(&mut self, _hash: &B::Hash) -> Vec<u8> {
-		let data = self.0.read();
-		make_finality_proof_request(
-			data.last_finalized,
-			data.authority_set.set_id(),
-		)
-	}
-}
-
-/// Try to import new block.
-fn do_import_block<B, C, Block: BlockT, J>(
-	mut client: C,
-	data: &mut LightImportData<Block>,
-	mut block: BlockImportParams<Block, TransactionFor<B, Block>>,
-	new_cache: HashMap<well_known_cache_keys::Id, Vec<u8>>,
-) -> Result<ImportResult, ConsensusError>
-	where
-		C: HeaderBackend<Block>
-			+ AuxStore
-			+ Finalizer<Block, B>
-			+ BlockImport<Block, Transaction = TransactionFor<B, Block>>
-			+ Clone,
-		B: Backend<Block> + 'static,
-		NumberFor<Block>: finality_grandpa::BlockNumberOps,
-		DigestFor<Block>: Encode,
-		J: ProvableJustification<Block::Header>,
-{
-	let hash = block.post_hash();
-	let number = *block.header.number();
-
-	// we don't want to finalize on `inner.import_block`
-	let justification = block.justification.take();
-	let enacts_consensus_change = !new_cache.is_empty();
-	let import_result = client.import_block(block, new_cache);
-
-	let mut imported_aux = match import_result {
-		Ok(ImportResult::Imported(aux)) => aux,
-		Ok(r) => return Ok(r),
-		Err(e) => return Err(ConsensusError::ClientImport(e.to_string())),
-	};
-
-	match justification {
-		Some(justification) => {
-			trace!(
-				target: "afg",
-				"Imported block {}{}. Importing justification.",
-				if enacts_consensus_change { " which enacts consensus changes" } else { "" },
-				hash,
-			);
-
-			do_import_justification::<_, _, _, J>(client, data, hash, number, justification)
-		},
-		None if enacts_consensus_change => {
-			trace!(
-				target: "afg",
-				"Imported block {} which enacts consensus changes. Requesting finality proof.",
-				hash,
-			);
-
-			// remember that we need finality proof for this block
-			imported_aux.needs_finality_proof = true;
-			data.consensus_changes.note_change((number, hash));
-			Ok(ImportResult::Imported(imported_aux))
-		},
-		None => Ok(ImportResult::Imported(imported_aux)),
-	}
-}
-
-/// Try to import finality proof.
-fn do_import_finality_proof<B, C, Block: BlockT, J>(
-	client: C,
-	backend: Arc<B>,
-	authority_set_provider: &dyn AuthoritySetForFinalityChecker<Block>,
-	data: &mut LightImportData<Block>,
-	_hash: Block::Hash,
-	_number: NumberFor<Block>,
-	finality_proof: Vec<u8>,
-	verifier: &mut dyn Verifier<Block>,
-) -> Result<(Block::Hash, NumberFor<Block>), ConsensusError>
-	where
-		C: HeaderBackend<Block>
-			+ AuxStore
-			+ Finalizer<Block, B>
-			+ BlockImport<Block, Transaction = TransactionFor<B, Block>>
-			+ Clone,
-		B: Backend<Block> + 'static,
-		DigestFor<Block>: Encode,
-		NumberFor<Block>: finality_grandpa::BlockNumberOps,
-		J: ProvableJustification<Block::Header>,
-{
-	let authority_set_id = data.authority_set.set_id();
-	let authorities = data.authority_set.authorities();
-	let finality_effects = crate::finality_proof::check_finality_proof::<_, _, J>(
-		backend.blockchain(),
-		authority_set_id,
-		authorities,
-		authority_set_provider,
-		finality_proof,
-	).map_err(|e| ConsensusError::ClientImport(e.to_string()))?;
-
-	// try to import all new headers
-	let block_origin = BlockOrigin::NetworkBroadcast;
-	for header_to_import in finality_effects.headers_to_import {
-		let (block_to_import, new_authorities) = verifier.verify(
-			block_origin,
-			header_to_import,
-			None,
-			None,
-		).map_err(|e| ConsensusError::ClientImport(e))?;
-		assert!(
-			block_to_import.justification.is_none(),
-			"We have passed None as justification to verifier.verify",
-		);
-
-		let mut cache = HashMap::new();
-		if let Some(authorities) = new_authorities {
-			cache.insert(well_known_cache_keys::AUTHORITIES, authorities.encode());
-		}
-		do_import_block::<_, _, _, J>(
-			client.clone(),
-			data,
-			block_to_import.convert_transaction(),
-			cache,
-		)?;
-	}
-
-	// try to import latest justification
-	let finalized_block_hash = finality_effects.block;
-	let finalized_block_number = backend.blockchain()
-		.expect_block_number_from_id(&BlockId::Hash(finality_effects.block))
-		.map_err(|e| ConsensusError::ClientImport(e.to_string()))?;
-	do_finalize_block(
-		client.clone(),
-		data,
-		finalized_block_hash,
-		finalized_block_number,
-		finality_effects.justification.encode(),
-	)?;
-
-	// apply new authorities set
-	data.authority_set.update(
-		finality_effects.new_set_id,
-		finality_effects.new_authorities,
-	);
-
-	// store new authorities set
-	require_insert_aux(
-		&client,
-		LIGHT_AUTHORITY_SET_KEY,
-		&data.authority_set,
-		"authority set",
-	)?;
-
-	Ok((finalized_block_hash, finalized_block_number))
-}
-
-/// Try to import justification.
-fn do_import_justification<B, C, Block: BlockT, J>(
-	client: C,
-	data: &mut LightImportData<Block>,
-	hash: Block::Hash,
-	number: NumberFor<Block>,
-	justification: Justification,
-) -> Result<ImportResult, ConsensusError>
-	where
-		C: HeaderBackend<Block>
-			+ AuxStore
-			+ Finalizer<Block, B>
-			+ Clone,
-		B: Backend<Block> + 'static,
-		NumberFor<Block>: finality_grandpa::BlockNumberOps,
-		J: ProvableJustification<Block::Header>,
-{
-	// with justification, we have two cases
-	//
-	// optimistic: the same GRANDPA authorities set has generated intermediate justification
-	// => justification is verified using current authorities set + we could proceed further
-	//
-	// pessimistic scenario: the GRANDPA authorities set has changed
-	// => we need to fetch new authorities set (i.e. finality proof) from remote node
-
-	// first, try to behave optimistically
-	let authority_set_id = data.authority_set.set_id();
-	let justification = J::decode_and_verify(
-		&justification,
-		authority_set_id,
-		&data.authority_set.authorities(),
-	);
-
-	// BadJustification error means that justification has been successfully decoded, but
-	// it isn't valid within current authority set
-	let justification = match justification {
-		Err(ClientError::BadJustification(_)) => {
-			trace!(
-				target: "afg",
-				"Justification for {} is not valid within current authorities set. Requesting finality proof.",
-				hash,
-			);
-
-			let mut imported_aux = ImportedAux::default();
-			imported_aux.needs_finality_proof = true;
-			return Ok(ImportResult::Imported(imported_aux));
-		},
-		Err(e) => {
-			trace!(
-				target: "afg",
-				"Justification for {} is not valid. Bailing.",
-				hash,
-			);
-
-			return Err(ConsensusError::ClientImport(e.to_string()));
-		},
-		Ok(justification) => {
-			trace!(
-				target: "afg",
-				"Justification for {} is valid. Finalizing the block.",
-				hash,
-			);
-
-			justification
-		},
-	};
-
-	// finalize the block
-	do_finalize_block(client, data, hash, number, justification.encode())
-}
-
-/// Finalize the block.
-fn do_finalize_block<B, C, Block: BlockT>(
-	client: C,
-	data: &mut LightImportData<Block>,
-	hash: Block::Hash,
-	number: NumberFor<Block>,
-	justification: Justification,
-) -> Result<ImportResult, ConsensusError>
-	where
-		C: HeaderBackend<Block>
-			+ AuxStore
-			+ Finalizer<Block, B>
-			+ Clone,
-		B: Backend<Block> + 'static,
-		NumberFor<Block>: finality_grandpa::BlockNumberOps,
-{
-	// finalize the block
-	client.finalize_block(BlockId::Hash(hash), Some(justification), true).map_err(|e| {
-		warn!(target: "afg", "Error applying finality to block {:?}: {:?}", (hash, number), e);
-		ConsensusError::ClientImport(e.to_string())
-	})?;
-
-	// forget obsoleted consensus changes
-	let consensus_finalization_res = data.consensus_changes
-		.finalize(
-			(number, hash),
-			|at_height| canonical_at_height(&client, (hash, number), true, at_height)
-		);
-	match consensus_finalization_res {
-		Ok((true, _)) => require_insert_aux(
-			&client,
-			LIGHT_CONSENSUS_CHANGES_KEY,
-			&data.consensus_changes,
-			"consensus changes",
-		)?,
-		Ok(_) => (),
-		Err(error) => return Err(on_post_finalization_error(error, "consensus changes")),
-	}
-
-	// update last finalized block reference
-	data.last_finalized = hash;
-
-	// we just finalized this block, so if we were importing it, it is now the new best
-	Ok(ImportResult::imported(true))
-}
-
-/// Load light import aux data from the store.
-fn load_aux_import_data<B, Block>(
-	last_finalized: Block::Hash,
-	aux_store: &B,
-	genesis_authorities_provider: &dyn GenesisAuthoritySetProvider<Block>,
-) -> Result<LightImportData<Block>, ClientError>
-	where
-		B: AuxStore,
-		Block: BlockT,
-{
-	let authority_set = match load_decode(aux_store, LIGHT_AUTHORITY_SET_KEY)? {
-		Some(authority_set) => authority_set,
-		None => {
-			info!(target: "afg", "Loading GRANDPA authorities \
-				from genesis on what appears to be first startup.");
-
-			// no authority set on disk: fetch authorities from genesis state
-			let genesis_authorities = genesis_authorities_provider.get()?;
-
-			let authority_set = LightAuthoritySet::genesis(genesis_authorities);
-			let encoded = authority_set.encode();
-			aux_store.insert_aux(&[(LIGHT_AUTHORITY_SET_KEY, &encoded[..])], &[])?;
-
-			authority_set
-		},
-	};
-
-	let consensus_changes = match load_decode(aux_store, LIGHT_CONSENSUS_CHANGES_KEY)? {
-		Some(consensus_changes) => consensus_changes,
-		None => {
-			let consensus_changes = ConsensusChanges::<Block::Hash, NumberFor<Block>>::empty();
-
-			let encoded = authority_set.encode();
-			aux_store.insert_aux(&[(LIGHT_CONSENSUS_CHANGES_KEY, &encoded[..])], &[])?;
-
-			consensus_changes
-		},
-	};
-
-	Ok(LightImportData {
-		last_finalized,
-		authority_set,
-		consensus_changes,
-	})
-}
-
-/// Insert into aux store. If failed, return error && show inconsistency warning.
-fn require_insert_aux<T: Encode, A: AuxStore>(
-	store: &A,
-	key: &[u8],
-	value: &T,
-	value_type: &str,
-) -> Result<(), ConsensusError> {
-	let encoded = value.encode();
-	let update_res = store.insert_aux(&[(key, &encoded[..])], &[]);
-	if let Err(error) = update_res {
-		return Err(on_post_finalization_error(error, value_type));
-	}
-
-	Ok(())
-}
-
-/// Display inconsistency warning.
-fn on_post_finalization_error(error: ClientError, value_type: &str) -> ConsensusError {
-	warn!(target: "afg", "Failed to write updated {} to disk. Bailing.", value_type);
-	warn!(target: "afg", "Node is in a potentially inconsistent state.");
-	ConsensusError::ClientImport(error.to_string())
-}
-
-#[cfg(test)]
-pub mod tests {
-	use super::*;
-	use sp_consensus::{import_queue::CacheKeyId, ForkChoiceStrategy, BlockImport};
-	use sp_finality_grandpa::AuthorityId;
-	use sp_core::{H256, crypto::Public};
-	use sc_client_api::{in_mem::Blockchain as InMemoryAuxStore, StorageProof, BlockBackend};
-	use substrate_test_runtime_client::runtime::{Block, Header};
-	use crate::tests::TestApi;
-	use crate::finality_proof::{
-		FinalityProofFragment,
-		tests::{TestJustification, ClosureAuthoritySetForFinalityChecker},
-	};
-
-	struct OkVerifier;
-
-	impl Verifier<Block> for OkVerifier {
-		fn verify(
-			&mut self,
-			origin: BlockOrigin,
-			header: Header,
-			_justification: Option<Justification>,
-			_body: Option<Vec<<Block as BlockT>::Extrinsic>>,
-		) -> Result<(BlockImportParams<Block, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String> {
-			Ok((BlockImportParams::new(origin, header), None))
-		}
-	}
-
-	pub struct NoJustificationsImport<BE, Block: BlockT, Client>(
-		pub GrandpaLightBlockImport<BE, Block, Client>
-	);
-
-	impl<BE, Block: BlockT, Client> Clone
-		for NoJustificationsImport<BE, Block, Client> where
-			NumberFor<Block>: finality_grandpa::BlockNumberOps,
-			DigestFor<Block>: Encode,
-			BE: Backend<Block> + 'static,
-	{
-		fn clone(&self) -> Self {
-			NoJustificationsImport(self.0.clone())
-		}
-	}
-
-	impl<BE, Block: BlockT, Client> BlockImport<Block>
-		for NoJustificationsImport<BE, Block, Client> where
-			NumberFor<Block>: finality_grandpa::BlockNumberOps,
-			DigestFor<Block>: Encode,
-			BE: Backend<Block> + 'static,
-			for <'a > &'a Client:
-				HeaderBackend<Block>
-				+ BlockImport<Block, Error = ConsensusError, Transaction = TransactionFor<BE, Block>>
-				+ Finalizer<Block, BE>
-				+ AuxStore,
-			GrandpaLightBlockImport<BE, Block, Client>:
-				BlockImport<Block, Transaction = TransactionFor<BE, Block>, Error = ConsensusError>
-	{
-		type Error = ConsensusError;
-		type Transaction = TransactionFor<BE, Block>;
-
-		fn import_block(
-			&mut self,
-			mut block: BlockImportParams<Block, Self::Transaction>,
-			new_cache: HashMap<well_known_cache_keys::Id, Vec<u8>>,
-		) -> Result<ImportResult, Self::Error> {
-			block.justification.take();
-			self.0.import_block(block, new_cache)
-		}
-
-		fn check_block(
-			&mut self,
-			block: BlockCheckParams<Block>,
-		) -> Result<ImportResult, Self::Error> {
-			self.0.check_block(block)
-		}
-	}
-
-	impl<BE, Block: BlockT, Client> FinalityProofImport<Block>
-		for NoJustificationsImport<BE, Block, Client> where
-			NumberFor<Block>: finality_grandpa::BlockNumberOps,
-			BE: Backend<Block> + 'static,
-			DigestFor<Block>: Encode,
-			for <'a > &'a Client:
-				HeaderBackend<Block>
-				+ BlockImport<Block, Error = ConsensusError, Transaction = TransactionFor<BE, Block>>
-				+ Finalizer<Block, BE>
-				+ AuxStore,
-	{
-		type Error = ConsensusError;
-
-		fn on_start(&mut self) -> Vec<(Block::Hash, NumberFor<Block>)> {
-			self.0.on_start()
-		}
-
-		fn import_finality_proof(
-			&mut self,
-			hash: Block::Hash,
-			number: NumberFor<Block>,
-			finality_proof: Vec<u8>,
-			verifier: &mut dyn Verifier<Block>,
-		) -> Result<(Block::Hash, NumberFor<Block>), Self::Error> {
-			self.0.import_finality_proof(hash, number, finality_proof, verifier)
-		}
-	}
-
-	/// Creates light block import that ignores justifications that came outside of finality proofs.
-	pub fn light_block_import_without_justifications<BE, Block: BlockT, Client>(
-		client: Arc<Client>,
-		backend: Arc<BE>,
-		genesis_authorities_provider: &dyn GenesisAuthoritySetProvider<Block>,
-		authority_set_provider: Arc<dyn AuthoritySetForFinalityChecker<Block>>,
-	) -> Result<NoJustificationsImport<BE, Block, Client>, ClientError>
-		where
-			BE: Backend<Block> + 'static,
-			Client: crate::ClientForGrandpa<Block, BE>,
-	{
-		light_block_import(client, backend, genesis_authorities_provider, authority_set_provider)
-			.map(NoJustificationsImport)
-	}
-
-	fn import_block(
-		new_cache: HashMap<well_known_cache_keys::Id, Vec<u8>>,
-		justification: Option<Justification>,
-	) -> (
-		ImportResult,
-		substrate_test_runtime_client::client::Client<substrate_test_runtime_client::LightBackend, substrate_test_runtime_client::LightExecutor, Block, substrate_test_runtime_client::runtime::RuntimeApi>,
-		Arc<substrate_test_runtime_client::LightBackend>,
-	) {
-		let (client, backend) = substrate_test_runtime_client::new_light();
-		let mut import_data = LightImportData {
-			last_finalized: Default::default(),
-			authority_set: LightAuthoritySet::genesis(vec![(AuthorityId::from_slice(&[1; 32]), 1)]),
-			consensus_changes: ConsensusChanges::empty(),
-		};
-		let mut block = BlockImportParams::new(
-			BlockOrigin::Own,
-			Header {
-				number: 1,
-				parent_hash: client.chain_info().best_hash,
-				state_root: Default::default(),
-				digest: Default::default(),
-				extrinsics_root: Default::default(),
-			},
-		);
-		block.justification = justification;
-		block.fork_choice = Some(ForkChoiceStrategy::LongestChain);
-
-		(
-			do_import_block::<_, _, _, TestJustification>(
-				&client,
-				&mut import_data,
-				block,
-				new_cache,
-			).unwrap(),
-			client,
-			backend,
-		)
-	}
-
-	#[test]
-	fn finality_proof_not_required_when_consensus_data_does_not_changes_and_no_justification_provided() {
-		assert_eq!(import_block(HashMap::new(), None).0, ImportResult::Imported(ImportedAux {
-			clear_justification_requests: false,
-			needs_justification: false,
-			bad_justification: false,
-			needs_finality_proof: false,
-			is_new_best: true,
-			header_only: false,
-		}));
-	}
-
-	#[test]
-	fn finality_proof_not_required_when_consensus_data_does_not_changes_and_correct_justification_provided() {
-		let justification = TestJustification((0, vec![(AuthorityId::from_slice(&[1; 32]), 1)]), Vec::new()).encode();
-		assert_eq!(import_block(HashMap::new(), Some(justification)).0, ImportResult::Imported(ImportedAux {
-			clear_justification_requests: false,
-			needs_justification: false,
-			bad_justification: false,
-			needs_finality_proof: false,
-			is_new_best: true,
-			header_only: false,
-		}));
-	}
-
-	#[test]
-	fn finality_proof_required_when_consensus_data_changes_and_no_justification_provided() {
-		let mut cache = HashMap::new();
-		cache.insert(well_known_cache_keys::AUTHORITIES, vec![AuthorityId::from_slice(&[2; 32])].encode());
-		assert_eq!(import_block(cache, None).0, ImportResult::Imported(ImportedAux {
-			clear_justification_requests: false,
-			needs_justification: false,
-			bad_justification: false,
-			needs_finality_proof: true,
-			is_new_best: true,
-			header_only: false,
-		}));
-	}
-
-	#[test]
-	fn finality_proof_required_when_consensus_data_changes_and_incorrect_justification_provided() {
-		let justification = TestJustification((0, vec![]), Vec::new()).encode();
-		let mut cache = HashMap::new();
-		cache.insert(well_known_cache_keys::AUTHORITIES, vec![AuthorityId::from_slice(&[2; 32])].encode());
-		assert_eq!(
-			import_block(cache, Some(justification)).0,
-			ImportResult::Imported(ImportedAux {
-				clear_justification_requests: false,
-				needs_justification: false,
-				bad_justification: false,
-				needs_finality_proof: true,
-				is_new_best: false,
-				header_only: false,
-			},
-		));
-	}
-
-
-	#[test]
-	fn aux_data_updated_on_start() {
-		let aux_store = InMemoryAuxStore::<Block>::new();
-		let api = TestApi::new(vec![(AuthorityId::from_slice(&[1; 32]), 1)]);
-
-		// when aux store is empty initially
-		assert!(aux_store.get_aux(LIGHT_AUTHORITY_SET_KEY).unwrap().is_none());
-		assert!(aux_store.get_aux(LIGHT_CONSENSUS_CHANGES_KEY).unwrap().is_none());
-
-		// it is updated on importer start
-		load_aux_import_data(Default::default(), &aux_store, &api).unwrap();
-		assert!(aux_store.get_aux(LIGHT_AUTHORITY_SET_KEY).unwrap().is_some());
-		assert!(aux_store.get_aux(LIGHT_CONSENSUS_CHANGES_KEY).unwrap().is_some());
-	}
-
-	#[test]
-	fn aux_data_loaded_on_restart() {
-		let aux_store = InMemoryAuxStore::<Block>::new();
-		let api = TestApi::new(vec![(AuthorityId::from_slice(&[1; 32]), 1)]);
-
-		// when aux store is non-empty initially
-		let mut consensus_changes = ConsensusChanges::<H256, u64>::empty();
-		consensus_changes.note_change((42, Default::default()));
-		aux_store.insert_aux(
-			&[
-				(
-					LIGHT_AUTHORITY_SET_KEY,
-					LightAuthoritySet::genesis(
-						vec![(AuthorityId::from_slice(&[42; 32]), 2)]
-					).encode().as_slice(),
-				),
-				(
-					LIGHT_CONSENSUS_CHANGES_KEY,
-					consensus_changes.encode().as_slice(),
-				),
-			],
-			&[],
-		).unwrap();
-
-		// importer uses it on start
-		let data = load_aux_import_data(Default::default(), &aux_store, &api).unwrap();
-		assert_eq!(data.authority_set.authorities(), vec![(AuthorityId::from_slice(&[42; 32]), 2)]);
-		assert_eq!(data.consensus_changes.pending_changes(), &[(42, Default::default())]);
-	}
-
-	#[test]
-	fn authority_set_is_updated_on_finality_proof_import() {
-		let initial_set_id = 0;
-		let initial_set = vec![(AuthorityId::from_slice(&[1; 32]), 1)];
-		let updated_set = vec![(AuthorityId::from_slice(&[2; 32]), 2)];
-		let babe_set_signal = vec![AuthorityId::from_slice(&[42; 32])].encode();
-		
-		// import block #1 without justification
-		let mut cache = HashMap::new();
-		cache.insert(well_known_cache_keys::AUTHORITIES, babe_set_signal);
-		let (_, client, backend) = import_block(cache, None);
-
-		// import finality proof for block #1
-		let hash = client.block_hash(1).unwrap().unwrap();
-		let mut verifier = OkVerifier;
-		let mut import_data = LightImportData {
-			last_finalized: Default::default(),
-			authority_set: LightAuthoritySet::genesis(initial_set.clone()),
-			consensus_changes: ConsensusChanges::empty(),
-		};
-
-		// import finality proof
-		do_import_finality_proof::<_, _, _, TestJustification>(
-			&client,
-			backend,
-			&ClosureAuthoritySetForFinalityChecker(
-				|_, _, _| Ok(updated_set.clone())
-			),
-			&mut import_data,
-			Default::default(),
-			Default::default(),
-			vec![
-				FinalityProofFragment::<Header> {
-					block: hash,
-					justification: TestJustification(
-						(initial_set_id, initial_set.clone()),
-						Vec::new(),
-					).encode(),
-					unknown_headers: Vec::new(),
-					authorities_proof: Some(StorageProof::new(vec![])),
-				},
-			].encode(),
-			&mut verifier,
-		).unwrap();
-
-		// verify that new authorities set has been saved to the aux storage
-		let data = load_aux_import_data(Default::default(), &client, &TestApi::new(initial_set)).unwrap();
-		assert_eq!(data.authority_set.authorities(), updated_set);
-	}
-}
diff --git a/client/finality-grandpa/src/observer.rs b/client/finality-grandpa/src/observer.rs
index fd00b35c40a7..c61998225e32 100644
--- a/client/finality-grandpa/src/observer.rs
+++ b/client/finality-grandpa/src/observer.rs
@@ -39,7 +39,6 @@ use crate::{
 };
 use crate::authorities::SharedAuthoritySet;
 use crate::communication::{Network as NetworkT, NetworkBridge};
-use crate::consensus_changes::SharedConsensusChanges;
 use crate::notification::GrandpaJustificationSender;
 use sp_finality_grandpa::AuthorityId;
 use std::marker::{PhantomData, Unpin};
@@ -68,7 +67,6 @@ impl<'a, Block, Client> finality_grandpa::Chain<Block::Hash, NumberFor<Block>>
 fn grandpa_observer<BE, Block: BlockT, Client, S, F>(
 	client: &Arc<Client>,
 	authority_set: &SharedAuthoritySet<Block::Hash, NumberFor<Block>>,
-	consensus_changes: &SharedConsensusChanges<Block::Hash, NumberFor<Block>>,
 	voters: &Arc<VoterSet<AuthorityId>>,
 	justification_sender: &Option<GrandpaJustificationSender<Block>>,
 	last_finalized_number: NumberFor<Block>,
@@ -83,7 +81,6 @@ where
 	Client: crate::ClientForGrandpa<Block, BE>,
 {
 	let authority_set = authority_set.clone();
-	let consensus_changes = consensus_changes.clone();
 	let client = client.clone();
 	let voters = voters.clone();
 	let justification_sender = justification_sender.clone();
@@ -123,7 +120,6 @@ where
 			match environment::finalize_block(
 				client.clone(),
 				&authority_set,
-				&consensus_changes,
 				None,
 				finalized_hash,
 				finalized_number,
@@ -293,7 +289,6 @@ where
 		let observer = grandpa_observer(
 			&self.client,
 			&self.persistent_data.authority_set,
-			&self.persistent_data.consensus_changes,
 			&voters,
 			&self.justification_sender,
 			last_finalized_number,
diff --git a/client/finality-grandpa/src/tests.rs b/client/finality-grandpa/src/tests.rs
index 44503d3c85d4..ef8168e84f66 100644
--- a/client/finality-grandpa/src/tests.rs
+++ b/client/finality-grandpa/src/tests.rs
@@ -25,7 +25,7 @@ use sc_network_test::{
 	Block, BlockImportAdapter, Hash, PassThroughVerifier, Peer, PeersClient, PeersFullClient,
 	TestClient, TestNetFactory, FullPeerConfig,
 };
-use sc_network::config::{ProtocolConfig, BoxFinalityProofRequestBuilder};
+use sc_network::config::ProtocolConfig;
 use parking_lot::{RwLock, Mutex};
 use futures_timer::Delay;
 use tokio::runtime::{Runtime, Handle};
@@ -36,22 +36,21 @@ use sp_api::{ApiRef, StorageProof, ProvideRuntimeApi};
 use substrate_test_runtime_client::runtime::BlockNumber;
 use sp_consensus::{
 	BlockOrigin, ForkChoiceStrategy, ImportedAux, BlockImportParams, ImportResult, BlockImport,
-	import_queue::{BoxJustificationImport, BoxFinalityProofImport},
+	import_queue::BoxJustificationImport,
 };
 use std::{collections::{HashMap, HashSet}, pin::Pin};
 use parity_scale_codec::Decode;
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT, HashFor};
 use sp_runtime::generic::{BlockId, DigestItem};
-use sp_core::{H256, crypto::Public};
+use sp_core::H256;
 use sp_keystore::{SyncCryptoStorePtr, SyncCryptoStore};
 use sp_finality_grandpa::{GRANDPA_ENGINE_ID, AuthorityList, EquivocationProof, GrandpaApi, OpaqueKeyOwnershipProof};
 use sp_state_machine::{InMemoryBackend, prove_read, read_proof_check};
 
 use authorities::AuthoritySet;
 use finality_proof::{
-	FinalityProofProvider, AuthoritySetForFinalityProver, AuthoritySetForFinalityChecker,
+	AuthoritySetForFinalityProver, AuthoritySetForFinalityChecker,
 };
-use consensus_changes::ConsensusChanges;
 use sc_block_builder::BlockBuilderProvider;
 use sc_consensus::LongestChain;
 use sc_keystore::LocalKeystore;
@@ -117,8 +116,6 @@ impl TestNetFactory for GrandpaTestNet {
 		-> (
 			BlockImportAdapter<Transaction>,
 			Option<BoxJustificationImport<Block>>,
-			Option<BoxFinalityProofImport<Block>>,
-			Option<BoxFinalityProofRequestBuilder<Block>>,
 			PeerData,
 		)
 	{
@@ -133,45 +130,12 @@ impl TestNetFactory for GrandpaTestNet {
 				(
 					BlockImportAdapter::new_full(import),
 					Some(justification_import),
-					None,
-					None,
 					Mutex::new(Some(link)),
 				)
 			},
-			PeersClient::Light(ref client, ref backend) => {
-				use crate::light_import::tests::light_block_import_without_justifications;
-
-				let authorities_provider = Arc::new(self.test_config.clone());
-				// forbid direct finalization using justification that came with the block
-				// => light clients will try to fetch finality proofs
-				let import = light_block_import_without_justifications(
-					client.clone(),
-					backend.clone(),
-					&self.test_config,
-					authorities_provider,
-				).expect("Could not create block import for fresh peer.");
-				let finality_proof_req_builder = import.0.create_finality_proof_request_builder();
-				let proof_import = Box::new(import.clone());
-				(
-					BlockImportAdapter::new_light(import),
-					None,
-					Some(proof_import),
-					Some(finality_proof_req_builder),
-					Mutex::new(None),
-				)
-			},
-		}
-	}
-
-	fn make_finality_proof_provider(
-		&self,
-		client: PeersClient
-	) -> Option<Arc<dyn sc_network::config::FinalityProofProvider<Block>>> {
-		match client {
-			PeersClient::Full(_, ref backend)  => {
-				Some(Arc::new(FinalityProofProvider::new(backend.clone(), self.test_config.clone())))
+			PeersClient::Light(..) => {
+				panic!("Light client is not used in tests.");
 			},
-			PeersClient::Light(_, _) => None,
 		}
 	}
 
@@ -679,24 +643,6 @@ fn transition_3_voters_twice_1_full_observer() {
 	block_until_complete(wait_for, &net, &mut runtime);
 }
 
-#[test]
-fn justification_is_emitted_when_consensus_data_changes() {
-	let mut runtime = Runtime::new().unwrap();
-	let peers = &[Ed25519Keyring::Alice, Ed25519Keyring::Bob, Ed25519Keyring::Charlie];
-	let mut net = GrandpaTestNet::new(TestApi::new(make_ids(peers)), 3);
-
-	// import block#1 WITH consensus data change
-	let new_authorities = vec![sp_consensus_babe::AuthorityId::from_slice(&[42; 32])];
-	net.peer(0).push_authorities_change_block(new_authorities);
-	net.block_until_sync();
-	let net = Arc::new(Mutex::new(net));
-	run_to_completion(&mut runtime, 1, net.clone(), peers);
-
-	// ... and check that there's justification for block#1
-	assert!(net.lock().peer(0).client().justification(&BlockId::Number(1)).unwrap().is_some(),
-		"Missing justification for block#1");
-}
-
 #[test]
 fn justification_is_generated_periodically() {
 	let mut runtime = Runtime::new().unwrap();
@@ -717,25 +663,6 @@ fn justification_is_generated_periodically() {
 	}
 }
 
-#[test]
-fn consensus_changes_works() {
-	let mut changes = ConsensusChanges::<H256, u64>::empty();
-
-	// pending changes are not finalized
-	changes.note_change((10, H256::from_low_u64_be(1)));
-	assert_eq!(changes.finalize((5, H256::from_low_u64_be(5)), |_| Ok(None)).unwrap(), (false, false));
-
-	// no change is selected from competing pending changes
-	changes.note_change((1, H256::from_low_u64_be(1)));
-	changes.note_change((1, H256::from_low_u64_be(101)));
-	assert_eq!(changes.finalize((10, H256::from_low_u64_be(10)), |_| Ok(Some(H256::from_low_u64_be(1001)))).unwrap(), (true, false));
-
-	// change is selected from competing pending changes
-	changes.note_change((1, H256::from_low_u64_be(1)));
-	changes.note_change((1, H256::from_low_u64_be(101)));
-	assert_eq!(changes.finalize((10, H256::from_low_u64_be(10)), |_| Ok(Some(H256::from_low_u64_be(1)))).unwrap(), (true, true));
-}
-
 #[test]
 fn sync_justifications_on_change_blocks() {
 	let mut runtime = Runtime::new().unwrap();
@@ -944,7 +871,6 @@ fn allows_reimporting_change_blocks() {
 			needs_justification: true,
 			clear_justification_requests: false,
 			bad_justification: false,
-			needs_finality_proof: false,
 			is_new_best: true,
 			header_only: false,
 		}),
@@ -1069,7 +995,7 @@ fn voter_persists_its_votes() {
 					Poll::Pending => return Poll::Pending,
 					Poll::Ready(None) => return Poll::Ready(()),
 					Poll::Ready(Some(())) => {
-						let (_block_import, _, _, _, link) =
+						let (_block_import, _, link) =
 							this.net.lock()
 									.make_block_import::<
 										TransactionFor<substrate_test_runtime_client::Backend, Block>
@@ -1144,7 +1070,7 @@ fn voter_persists_its_votes() {
 		};
 
 		let set_state = {
-			let (_, _, _, _, link) = net.lock()
+			let (_, _, link) = net.lock()
 				.make_block_import::<
 					TransactionFor<substrate_test_runtime_client::Backend, Block>
 				>(client);
@@ -1311,100 +1237,6 @@ fn finalize_3_voters_1_light_observer() {
 	});
 }
 
-#[test]
-fn finality_proof_is_fetched_by_light_client_when_consensus_data_changes() {
-	sp_tracing::try_init_simple();
-	let mut runtime = Runtime::new().unwrap();
-
-	let peers = &[Ed25519Keyring::Alice];
-	let mut net = GrandpaTestNet::new(TestApi::new(make_ids(peers)), 1);
-	net.add_light_peer();
-
-	// import block#1 WITH consensus data change. Light client ignores justification
-	// && instead fetches finality proof for block #1
-	net.peer(0).push_authorities_change_block(vec![sp_consensus_babe::AuthorityId::from_slice(&[42; 32])]);
-	let net = Arc::new(Mutex::new(net));
-	run_to_completion(&mut runtime, 1, net.clone(), peers);
-	net.lock().block_until_sync();
-
-	// check that the block#1 is finalized on light client
-	runtime.block_on(futures::future::poll_fn(move |cx| {
-		if net.lock().peer(1).client().info().finalized_number == 1 {
-			Poll::Ready(())
-		} else {
-			net.lock().poll(cx);
-			Poll::Pending
-		}
-	}));
-}
-
-#[test]
-fn empty_finality_proof_is_returned_to_light_client_when_authority_set_is_different() {
-	// for debug: to ensure that without forced change light client will sync finality proof
-	const FORCE_CHANGE: bool = true;
-
-	sp_tracing::try_init_simple();
-	let mut runtime = Runtime::new().unwrap();
-
-	// two of these guys are offline.
-	let genesis_authorities = if FORCE_CHANGE {
-		vec![
-			Ed25519Keyring::Alice,
-			Ed25519Keyring::Bob,
-			Ed25519Keyring::Charlie,
-			Ed25519Keyring::One,
-			Ed25519Keyring::Two,
-		]
-	} else {
-		vec![
-			Ed25519Keyring::Alice,
-			Ed25519Keyring::Bob,
-			Ed25519Keyring::Charlie,
-		]
-	};
-	let peers_a = &[Ed25519Keyring::Alice, Ed25519Keyring::Bob, Ed25519Keyring::Charlie];
-	let api = TestApi::new(make_ids(&genesis_authorities));
-
-	let voters = make_ids(peers_a);
-	let net = GrandpaTestNet::new(api, 3);
-	let net = Arc::new(Mutex::new(net));
-
-	// best is #1
-	net.lock().peer(0).generate_blocks(1, BlockOrigin::File, |builder| {
-		// add a forced transition at block 5.
-		let mut block = builder.build().unwrap().block;
-		if FORCE_CHANGE {
-			add_forced_change(&mut block, 0, ScheduledChange {
-				next_authorities: voters.clone(),
-				delay: 3,
-			});
-		}
-		block
-	});
-
-	// ensure block#10 enacts authorities set change => justification is generated
-	// normally it will reach light client, but because of the forced change, it will not
-	net.lock().peer(0).push_blocks(8, false); // best is #9
-	net.lock().peer(0).push_authorities_change_block(
-		vec![sp_consensus_babe::AuthorityId::from_slice(&[42; 32])]
-	); // #10
-	net.lock().peer(0).push_blocks(1, false); // best is #11
-	net.lock().block_until_sync();
-
-	// finalize block #11 on full clients
-	run_to_completion(&mut runtime, 11, net.clone(), peers_a);
-
-	// request finalization by light client
-	net.lock().add_light_peer();
-	net.lock().block_until_sync();
-
-	// check block, finalized on light client
-	assert_eq!(
-		net.lock().peer(3).client().info().finalized_number,
-		if FORCE_CHANGE { 0 } else { 10 },
-	);
-}
-
 #[test]
 fn voter_catches_up_to_latest_round_when_behind() {
 	sp_tracing::try_init_simple();
@@ -1540,7 +1372,6 @@ where
 {
 	let PersistentData {
 		ref authority_set,
-		ref consensus_changes,
 		ref set_state,
 		..
 	} = link.persistent_data;
@@ -1564,7 +1395,6 @@ where
 	Environment {
 		authority_set: authority_set.clone(),
 		config: config.clone(),
-		consensus_changes: consensus_changes.clone(),
 		client: link.client.clone(),
 		select_chain: link.select_chain.clone(),
 		set_id: authority_set.set_id(),
diff --git a/client/network/build.rs b/client/network/build.rs
index 8ed460f163eb..2ccc72d99df9 100644
--- a/client/network/build.rs
+++ b/client/network/build.rs
@@ -1,6 +1,5 @@
 const PROTOS: &[&str] = &[
 	"src/schema/api.v1.proto",
-	"src/schema/finality.v1.proto",
 	"src/schema/light.v1.proto"
 ];
 
diff --git a/client/network/src/behaviour.rs b/client/network/src/behaviour.rs
index 41723d9068c2..b2914a5e0a72 100644
--- a/client/network/src/behaviour.rs
+++ b/client/network/src/behaviour.rs
@@ -15,9 +15,9 @@
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
 use crate::{
-	config::{ProtocolId, Role}, block_requests, light_client_handler, finality_requests,
+	config::{ProtocolId, Role}, block_requests, light_client_handler,
 	peer_info, request_responses, discovery::{DiscoveryBehaviour, DiscoveryConfig, DiscoveryOut},
-	protocol::{message::{self, Roles}, CustomMessageOutcome, NotificationsSink, Protocol},
+	protocol::{message::Roles, CustomMessageOutcome, NotificationsSink, Protocol},
 	ObservedRole, DhtEvent, ExHashT,
 };
 
@@ -58,8 +58,6 @@ pub struct Behaviour<B: BlockT, H: ExHashT> {
 	request_responses: request_responses::RequestResponsesBehaviour,
 	/// Block request handling.
 	block_requests: block_requests::BlockRequests<B>,
-	/// Finality proof request handling.
-	finality_proof_requests: finality_requests::FinalityProofRequests<B>,
 	/// Light client request handling.
 	light_client_handler: light_client_handler::LightClientHandler<B>,
 
@@ -76,7 +74,6 @@ pub struct Behaviour<B: BlockT, H: ExHashT> {
 pub enum BehaviourOut<B: BlockT> {
 	BlockImport(BlockOrigin, Vec<IncomingBlock<B>>),
 	JustificationImport(Origin, B::Hash, NumberFor<B>, Justification),
-	FinalityProofImport(Origin, B::Hash, NumberFor<B>, Vec<u8>),
 
 	/// Started a random iterative Kademlia discovery query.
 	RandomKademliaStarted(ProtocolId),
@@ -182,7 +179,6 @@ impl<B: BlockT, H: ExHashT> Behaviour<B, H> {
 		user_agent: String,
 		local_public_key: PublicKey,
 		block_requests: block_requests::BlockRequests<B>,
-		finality_proof_requests: finality_requests::FinalityProofRequests<B>,
 		light_client_handler: light_client_handler::LightClientHandler<B>,
 		disco_config: DiscoveryConfig,
 		request_response_protocols: Vec<request_responses::ProtocolConfig>,
@@ -194,7 +190,6 @@ impl<B: BlockT, H: ExHashT> Behaviour<B, H> {
 			request_responses:
 				request_responses::RequestResponsesBehaviour::new(request_response_protocols.into_iter())?,
 			block_requests,
-			finality_proof_requests,
 			light_client_handler,
 			events: VecDeque::new(),
 			role,
@@ -334,8 +329,6 @@ Behaviour<B, H> {
 				self.events.push_back(BehaviourOut::BlockImport(origin, blocks)),
 			CustomMessageOutcome::JustificationImport(origin, hash, nb, justification) =>
 				self.events.push_back(BehaviourOut::JustificationImport(origin, hash, nb, justification)),
-			CustomMessageOutcome::FinalityProofImport(origin, hash, nb, proof) =>
-				self.events.push_back(BehaviourOut::FinalityProofImport(origin, hash, nb, proof)),
 			CustomMessageOutcome::BlockRequest { target, request } => {
 				match self.block_requests.send_request(&target, request) {
 					block_requests::SendRequestOutcome::Ok => {
@@ -359,9 +352,6 @@ Behaviour<B, H> {
 					block_requests::SendRequestOutcome::EncodeError(_) => {},
 				}
 			},
-			CustomMessageOutcome::FinalityProofRequest { target, block_hash, request } => {
-				self.finality_proof_requests.send_request(&target, block_hash, request);
-			},
 			CustomMessageOutcome::NotificationStreamOpened { remote, protocols, roles, notifications_sink } => {
 				let role = reported_roles_to_observed_role(&self.role, &remote, roles);
 				for protocol in protocols {
@@ -454,26 +444,6 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviourEventProcess<block_requests::Event<B
 	}
 }
 
-impl<B: BlockT, H: ExHashT> NetworkBehaviourEventProcess<finality_requests::Event<B>> for Behaviour<B, H> {
-	fn inject_event(&mut self, event: finality_requests::Event<B>) {
-		match event {
-			finality_requests::Event::Response { peer, block_hash, proof } => {
-				let response = message::FinalityProofResponse {
-					id: 0,
-					block: block_hash,
-					proof: if !proof.is_empty() {
-						Some(proof)
-					} else {
-						None
-					},
-				};
-				let ev = self.substrate.on_finality_proof_response(peer, response);
-				self.inject_event(ev);
-			}
-		}
-	}
-}
-
 impl<B: BlockT, H: ExHashT> NetworkBehaviourEventProcess<peer_info::PeerInfoEvent>
 	for Behaviour<B, H> {
 	fn inject_event(&mut self, event: peer_info::PeerInfoEvent) {
diff --git a/client/network/src/chain.rs b/client/network/src/chain.rs
index 20fbe0284397..61d19c10dae5 100644
--- a/client/network/src/chain.rs
+++ b/client/network/src/chain.rs
@@ -32,15 +32,3 @@ impl<Block: BlockT, T> Client<Block> for T
 		T: HeaderBackend<Block> + ProofProvider<Block> + BlockIdTo<Block, Error = Error>
 			+ BlockBackend<Block> + HeaderMetadata<Block, Error = Error> + Send + Sync
 {}
-
-/// Finality proof provider.
-pub trait FinalityProofProvider<Block: BlockT>: Send + Sync {
-	/// Prove finality of the block.
-	fn prove_finality(&self, for_block: Block::Hash, request: &[u8]) -> Result<Option<Vec<u8>>, Error>;
-}
-
-impl<Block: BlockT> FinalityProofProvider<Block> for () {
-	fn prove_finality(&self, _for_block: Block::Hash, _request: &[u8]) -> Result<Option<Vec<u8>>, Error> {
-		Ok(None)
-	}
-}
diff --git a/client/network/src/config.rs b/client/network/src/config.rs
index db33623a2e33..b7b113dc1469 100644
--- a/client/network/src/config.rs
+++ b/client/network/src/config.rs
@@ -21,7 +21,7 @@
 //! The [`Params`] struct is the struct that must be passed in order to initialize the networking.
 //! See the documentation of [`Params`].
 
-pub use crate::chain::{Client, FinalityProofProvider};
+pub use crate::chain::Client;
 pub use crate::on_demand_layer::{AlwaysBadChecker, OnDemand};
 pub use crate::request_responses::{IncomingRequest, ProtocolConfig as RequestResponseConfig};
 pub use libp2p::{identity, core::PublicKey, wasm_ext::ExtTransport, build_multiaddr};
@@ -70,17 +70,6 @@ pub struct Params<B: BlockT, H: ExHashT> {
 	/// Client that contains the blockchain.
 	pub chain: Arc<dyn Client<B>>,
 
-	/// Finality proof provider.
-	///
-	/// This object, if `Some`, is used when a node on the network requests a proof of finality
-	/// from us.
-	pub finality_proof_provider: Option<Arc<dyn FinalityProofProvider<B>>>,
-
-	/// How to build requests for proofs of finality.
-	///
-	/// This object, if `Some`, is used when we need a proof of finality from another node.
-	pub finality_proof_request_builder: Option<BoxFinalityProofRequestBuilder<B>>,
-
 	/// The `OnDemand` object acts as a "receiver" for block data requests from the client.
 	/// If `Some`, the network worker will process these requests and answer them.
 	/// Normally used only for light clients.
@@ -153,25 +142,6 @@ impl fmt::Display for Role {
 	}
 }
 
-/// Finality proof request builder.
-pub trait FinalityProofRequestBuilder<B: BlockT>: Send {
-	/// Build data blob, associated with the request.
-	fn build_request_data(&mut self, hash: &B::Hash) -> Vec<u8>;
-}
-
-/// Implementation of `FinalityProofRequestBuilder` that builds a dummy empty request.
-#[derive(Debug, Default)]
-pub struct DummyFinalityProofRequestBuilder;
-
-impl<B: BlockT> FinalityProofRequestBuilder<B> for DummyFinalityProofRequestBuilder {
-	fn build_request_data(&mut self, _: &B::Hash) -> Vec<u8> {
-		Vec::new()
-	}
-}
-
-/// Shared finality proof request builder struct used by the queue.
-pub type BoxFinalityProofRequestBuilder<B> = Box<dyn FinalityProofRequestBuilder<B> + Send + Sync>;
-
 /// Result of the transaction import.
 #[derive(Clone, Copy, Debug)]
 pub enum TransactionImport {
diff --git a/client/network/src/finality_requests.rs b/client/network/src/finality_requests.rs
deleted file mode 100644
index 55f56b9a0cc2..000000000000
--- a/client/network/src/finality_requests.rs
+++ /dev/null
@@ -1,403 +0,0 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
-// This file is part of Substrate.
-//
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
-
-//! `NetworkBehaviour` implementation which handles incoming finality proof requests.
-//!
-//! Every request is coming in on a separate connection substream which gets
-//! closed after we have sent the response back. Incoming requests are encoded
-//! as protocol buffers (cf. `finality.v1.proto`).
-
-#![allow(unused)]
-
-use bytes::Bytes;
-use codec::{Encode, Decode};
-use crate::{
-	chain::FinalityProofProvider,
-	config::ProtocolId,
-	protocol::message,
-	schema,
-};
-use futures::{future::BoxFuture, prelude::*, stream::FuturesUnordered};
-use libp2p::{
-	core::{
-		ConnectedPoint,
-		Multiaddr,
-		PeerId,
-		connection::ConnectionId,
-		upgrade::{InboundUpgrade, OutboundUpgrade, ReadOneError, UpgradeInfo, Negotiated},
-		upgrade::{DeniedUpgrade, read_one, write_one}
-	},
-	swarm::{
-		NegotiatedSubstream,
-		NetworkBehaviour,
-		NetworkBehaviourAction,
-		NotifyHandler,
-		OneShotHandler,
-		OneShotHandlerConfig,
-		PollParameters,
-		SubstreamProtocol
-	}
-};
-use prost::Message;
-use sp_runtime::{generic::BlockId, traits::{Block, Header, One, Zero}};
-use std::{
-	cmp::min,
-	collections::VecDeque,
-	io,
-	iter,
-	marker::PhantomData,
-	sync::Arc,
-	time::Duration,
-	task::{Context, Poll}
-};
-use void::{Void, unreachable};
-
-// Type alias for convenience.
-pub type Error = Box<dyn std::error::Error + 'static>;
-
-/// Event generated by the finality proof requests behaviour.
-#[derive(Debug)]
-pub enum Event<B: Block> {
-	/// A response to a finality proof request has arrived.
-	Response {
-		peer: PeerId,
-		/// Block hash originally passed to `send_request`.
-		block_hash: B::Hash,
-		/// Finality proof returned by the remote.
-		proof: Vec<u8>,
-	},
-}
-
-/// Configuration options for `FinalityProofRequests`.
-#[derive(Debug, Clone)]
-pub struct Config {
-	max_request_len: usize,
-	max_response_len: usize,
-	inactivity_timeout: Duration,
-	protocol: Bytes,
-}
-
-impl Config {
-	/// Create a fresh configuration with the following options:
-	///
-	/// - max. request size = 1 MiB
-	/// - max. response size = 1 MiB
-	/// - inactivity timeout = 15s
-	pub fn new(id: &ProtocolId) -> Self {
-		let mut c = Config {
-			max_request_len: 1024 * 1024,
-			max_response_len: 1024 * 1024,
-			inactivity_timeout: Duration::from_secs(15),
-			protocol: Bytes::new(),
-		};
-		c.set_protocol(id);
-		c
-	}
-
-	/// Limit the max. length of incoming finality proof request bytes.
-	pub fn set_max_request_len(&mut self, v: usize) -> &mut Self {
-		self.max_request_len = v;
-		self
-	}
-
-	/// Limit the max. length of incoming finality proof response bytes.
-	pub fn set_max_response_len(&mut self, v: usize) -> &mut Self {
-		self.max_response_len = v;
-		self
-	}
-
-	/// Limit the max. duration the substream may remain inactive before closing it.
-	pub fn set_inactivity_timeout(&mut self, v: Duration) -> &mut Self {
-		self.inactivity_timeout = v;
-		self
-	}
-
-	/// Set protocol to use for upgrade negotiation.
-	pub fn set_protocol(&mut self, id: &ProtocolId) -> &mut Self {
-		let mut v = Vec::new();
-		v.extend_from_slice(b"/");
-		v.extend_from_slice(id.as_ref().as_bytes());
-		v.extend_from_slice(b"/finality-proof/1");
-		self.protocol = v.into();
-		self
-	}
-}
-
-/// The finality proof request handling behaviour.
-pub struct FinalityProofRequests<B: Block> {
-	/// This behaviour's configuration.
-	config: Config,
-	/// How to construct finality proofs.
-	finality_proof_provider: Option<Arc<dyn FinalityProofProvider<B>>>,
-	/// Futures sending back the finality proof request responses.
-	outgoing: FuturesUnordered<BoxFuture<'static, ()>>,
-	/// Events to return as soon as possible from `poll`.
-	pending_events: VecDeque<NetworkBehaviourAction<OutboundProtocol<B>, Event<B>>>,
-}
-
-impl<B> FinalityProofRequests<B>
-where
-	B: Block,
-{
-	/// Initializes the behaviour.
-	///
-	/// If the proof provider is `None`, then the behaviour will not support the finality proof
-	/// requests protocol.
-	pub fn new(cfg: Config, finality_proof_provider: Option<Arc<dyn FinalityProofProvider<B>>>) -> Self {
-		FinalityProofRequests {
-			config: cfg,
-			finality_proof_provider,
-			outgoing: FuturesUnordered::new(),
-			pending_events: VecDeque::new(),
-		}
-	}
-
-	/// Issue a new finality proof request.
-	///
-	/// If the response doesn't arrive in time, or if the remote answers improperly, the target
-	/// will be disconnected.
-	pub fn send_request(&mut self, target: &PeerId, block_hash: B::Hash, request: Vec<u8>) {
-		let protobuf_rq = schema::v1::finality::FinalityProofRequest {
-			block_hash: block_hash.encode(),
-			request,
-		};
-
-		let mut buf = Vec::with_capacity(protobuf_rq.encoded_len());
-		if let Err(err) = protobuf_rq.encode(&mut buf) {
-			log::warn!("failed to encode finality proof request {:?}: {:?}", protobuf_rq, err);
-			return;
-		}
-
-		log::trace!("enqueueing finality proof request to {:?}: {:?}", target, protobuf_rq);
-		self.pending_events.push_back(NetworkBehaviourAction::NotifyHandler {
-			peer_id: target.clone(),
-			handler: NotifyHandler::Any,
-			event: OutboundProtocol {
-				request: buf,
-				block_hash,
-				max_response_size: self.config.max_response_len,
-				protocol: self.config.protocol.clone(),
-			},
-		});
-	}
-
-	/// Callback, invoked when a new finality request has been received from remote.
-	fn on_finality_request(&mut self, peer: &PeerId, request: &schema::v1::finality::FinalityProofRequest)
-		-> Result<schema::v1::finality::FinalityProofResponse, Error>
-	{
-		let block_hash = Decode::decode(&mut request.block_hash.as_ref())?;
-
-		log::trace!(target: "sync", "Finality proof request from {} for {}", peer, block_hash);
-
-		// Note that an empty Vec is sent if no proof is available.
-		let finality_proof = if let Some(provider) = &self.finality_proof_provider {
-			provider
-				.prove_finality(block_hash, &request.request)?
-				.unwrap_or_default()
-		} else {
-			log::error!("Answering a finality proof request while finality provider is empty");
-			return Err(From::from("Empty finality proof provider".to_string()))
-		};
-
-		Ok(schema::v1::finality::FinalityProofResponse { proof: finality_proof })
-	}
-}
-
-impl<B> NetworkBehaviour for FinalityProofRequests<B>
-where
-	B: Block
-{
-	type ProtocolsHandler = OneShotHandler<InboundProtocol<B>, OutboundProtocol<B>, NodeEvent<B, NegotiatedSubstream>>;
-	type OutEvent = Event<B>;
-
-	fn new_handler(&mut self) -> Self::ProtocolsHandler {
-		let p = InboundProtocol {
-			max_request_len: self.config.max_request_len,
-			protocol: if self.finality_proof_provider.is_some() {
-				Some(self.config.protocol.clone())
-			} else {
-				None
-			},
-			marker: PhantomData,
-		};
-		let mut cfg = OneShotHandlerConfig::default();
-		cfg.keep_alive_timeout = self.config.inactivity_timeout;
-		OneShotHandler::new(SubstreamProtocol::new(p, ()), cfg)
-	}
-
-	fn addresses_of_peer(&mut self, _: &PeerId) -> Vec<Multiaddr> {
-		Vec::new()
-	}
-
-	fn inject_connected(&mut self, _peer: &PeerId) {
-	}
-
-	fn inject_disconnected(&mut self, _peer: &PeerId) {
-	}
-
-	fn inject_event(
-		&mut self,
-		peer: PeerId,
-		connection: ConnectionId,
-		event: NodeEvent<B, NegotiatedSubstream>
-	) {
-		match event {
-			NodeEvent::Request(request, mut stream) => {
-				match self.on_finality_request(&peer, &request) {
-					Ok(res) => {
-						log::trace!("enqueueing finality response for peer {}", peer);
-						let mut data = Vec::with_capacity(res.encoded_len());
-						if let Err(e) = res.encode(&mut data) {
-							log::debug!("error encoding finality response for peer {}: {}", peer, e)
-						} else {
-							let future = async move {
-								if let Err(e) = write_one(&mut stream, data).await {
-									log::debug!("error writing finality response: {}", e)
-								}
-							};
-							self.outgoing.push(future.boxed())
-						}
-					}
-					Err(e) => log::debug!("error handling finality request from peer {}: {}", peer, e)
-				}
-			}
-			NodeEvent::Response(response, block_hash) => {
-				let ev = Event::Response {
-					peer,
-					block_hash,
-					proof: response.proof,
-				};
-				self.pending_events.push_back(NetworkBehaviourAction::GenerateEvent(ev));
-			}
-		}
-	}
-
-	fn poll(&mut self, cx: &mut Context, _: &mut impl PollParameters)
-		-> Poll<NetworkBehaviourAction<OutboundProtocol<B>, Event<B>>>
-	{
-		if let Some(ev) = self.pending_events.pop_front() {
-			return Poll::Ready(ev);
-		}
-
-		while let Poll::Ready(Some(_)) = self.outgoing.poll_next_unpin(cx) {}
-		Poll::Pending
-	}
-}
-
-/// Output type of inbound and outbound substream upgrades.
-#[derive(Debug)]
-pub enum NodeEvent<B: Block, T> {
-	/// Incoming request from remote and substream to use for the response.
-	Request(schema::v1::finality::FinalityProofRequest, T),
-	/// Incoming response from remote.
-	Response(schema::v1::finality::FinalityProofResponse, B::Hash),
-}
-
-/// Substream upgrade protocol.
-///
-/// We attempt to parse an incoming protobuf encoded request (cf. `Request`)
-/// which will be handled by the `FinalityProofRequests` behaviour, i.e. the request
-/// will become visible via `inject_node_event` which then dispatches to the
-/// relevant callback to process the message and prepare a response.
-#[derive(Debug, Clone)]
-pub struct InboundProtocol<B> {
-	/// The max. request length in bytes.
-	max_request_len: usize,
-	/// The protocol to use during upgrade negotiation. If `None`, then the incoming protocol
-	/// is simply disabled.
-	protocol: Option<Bytes>,
-	/// Marker to pin the block type.
-	marker: PhantomData<B>,
-}
-
-impl<B: Block> UpgradeInfo for InboundProtocol<B> {
-	type Info = Bytes;
-	// This iterator will return either 0 elements if `self.protocol` is `None`, or 1 element if
-	// it is `Some`.
-	type InfoIter = std::option::IntoIter<Self::Info>;
-
-	fn protocol_info(&self) -> Self::InfoIter {
-		self.protocol.clone().into_iter()
-	}
-}
-
-impl<B, T> InboundUpgrade<T> for InboundProtocol<B>
-where
-	B: Block,
-	T: AsyncRead + AsyncWrite + Unpin + Send + 'static
-{
-	type Output = NodeEvent<B, T>;
-	type Error = ReadOneError;
-	type Future = BoxFuture<'static, Result<Self::Output, Self::Error>>;
-
-	fn upgrade_inbound(self, mut s: T, _: Self::Info) -> Self::Future {
-		async move {
-			let len = self.max_request_len;
-			let vec = read_one(&mut s, len).await?;
-			match schema::v1::finality::FinalityProofRequest::decode(&vec[..]) {
-				Ok(r) => Ok(NodeEvent::Request(r, s)),
-				Err(e) => Err(ReadOneError::Io(io::Error::new(io::ErrorKind::Other, e)))
-			}
-		}.boxed()
-	}
-}
-
-/// Substream upgrade protocol.
-///
-/// Sends a request to remote and awaits the response.
-#[derive(Debug, Clone)]
-pub struct OutboundProtocol<B: Block> {
-	/// The serialized protobuf request.
-	request: Vec<u8>,
-	/// Block hash that has been requested.
-	block_hash: B::Hash,
-	/// The max. response length in bytes.
-	max_response_size: usize,
-	/// The protocol to use for upgrade negotiation.
-	protocol: Bytes,
-}
-
-impl<B: Block> UpgradeInfo for OutboundProtocol<B> {
-	type Info = Bytes;
-	type InfoIter = iter::Once<Self::Info>;
-
-	fn protocol_info(&self) -> Self::InfoIter {
-		iter::once(self.protocol.clone())
-	}
-}
-
-impl<B, T> OutboundUpgrade<T> for OutboundProtocol<B>
-where
-	B: Block,
-	T: AsyncRead + AsyncWrite + Unpin + Send + 'static
-{
-	type Output = NodeEvent<B, T>;
-	type Error = ReadOneError;
-	type Future = BoxFuture<'static, Result<Self::Output, Self::Error>>;
-
-	fn upgrade_outbound(self, mut s: T, _: Self::Info) -> Self::Future {
-		async move {
-			write_one(&mut s, &self.request).await?;
-			let vec = read_one(&mut s, self.max_response_size).await?;
-
-			schema::v1::finality::FinalityProofResponse::decode(&vec[..])
-				.map(|r| NodeEvent::Response(r, self.block_hash))
-				.map_err(|e| {
-					ReadOneError::Io(io::Error::new(io::ErrorKind::Other, e))
-				})
-		}.boxed()
-	}
-}
diff --git a/client/network/src/gossip/tests.rs b/client/network/src/gossip/tests.rs
index e94052c0e4d2..93b69f7b64c8 100644
--- a/client/network/src/gossip/tests.rs
+++ b/client/network/src/gossip/tests.rs
@@ -86,7 +86,6 @@ fn build_test_full_node(config: config::NetworkConfiguration)
 		PassThroughVerifier(false),
 		Box::new(client.clone()),
 		None,
-		None,
 		&sp_core::testing::TaskExecutor::new(),
 		None,
 	));
@@ -96,8 +95,6 @@ fn build_test_full_node(config: config::NetworkConfiguration)
 		executor: None,
 		network_config: config,
 		chain: client.clone(),
-		finality_proof_provider: None,
-		finality_proof_request_builder: None,
 		on_demand: None,
 		transaction_pool: Arc::new(crate::config::EmptyTransactionPool),
 		protocol_id: config::ProtocolId::from("/test-protocol-name"),
diff --git a/client/network/src/lib.rs b/client/network/src/lib.rs
index 3fd01c33dcf5..b050db8785ac 100644
--- a/client/network/src/lib.rs
+++ b/client/network/src/lib.rs
@@ -249,7 +249,6 @@ mod block_requests;
 mod chain;
 mod peer_info;
 mod discovery;
-mod finality_requests;
 mod light_client_handler;
 mod on_demand_layer;
 mod protocol;
diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index d0b6b2823a2c..597031b90182 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -19,7 +19,7 @@
 use crate::{
 	ExHashT,
 	chain::Client,
-	config::{BoxFinalityProofRequestBuilder, ProtocolId, TransactionPool, TransactionImportFuture, TransactionImport},
+	config::{ProtocolId, TransactionPool, TransactionImportFuture, TransactionImport},
 	error,
 	utils::{interval, LruHashSet},
 };
@@ -131,7 +131,6 @@ struct Metrics {
 	peers: Gauge<U64>,
 	queued_blocks: Gauge<U64>,
 	fork_targets: Gauge<U64>,
-	finality_proofs: GaugeVec<U64>,
 	justifications: GaugeVec<U64>,
 	propagated_transactions: Counter<U64>,
 }
@@ -165,16 +164,6 @@ impl Metrics {
 				)?;
 				register(g, r)?
 			},
-			finality_proofs: {
-				let g = GaugeVec::new(
-					Opts::new(
-						"sync_extra_finality_proofs",
-						"Number of extra finality proof requests",
-					),
-					&["status"],
-				)?;
-				register(g, r)?
-			},
 			propagated_transactions: register(Counter::new(
 				"sync_propagated_transactions",
 				"Number of transactions propagated to at least one peer",
@@ -365,7 +354,6 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 		local_peer_id: PeerId,
 		chain: Arc<dyn Client<B>>,
 		transaction_pool: Arc<dyn TransactionPool<H, B>>,
-		finality_proof_request_builder: Option<BoxFinalityProofRequestBuilder<B>>,
 		protocol_id: ProtocolId,
 		peerset_config: sc_peerset::PeersetConfig,
 		block_announce_validator: Box<dyn BlockAnnounceValidator<B> + Send>,
@@ -377,7 +365,6 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 			config.roles,
 			chain.clone(),
 			&info,
-			finality_proof_request_builder,
 			block_announce_validator,
 			config.max_parallel_downloads,
 		);
@@ -614,10 +601,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 				warn!(target: "sub-libp2p", "Received unexpected RemoteHeaderResponse"),
 			GenericMessage::RemoteChangesResponse(_) =>
 				warn!(target: "sub-libp2p", "Received unexpected RemoteChangesResponse"),
-			GenericMessage::FinalityProofResponse(_) =>
-				warn!(target: "sub-libp2p", "Received unexpected FinalityProofResponse"),
 			GenericMessage::BlockRequest(_) |
-			GenericMessage::FinalityProofRequest(_) |
 			GenericMessage::RemoteReadChildRequest(_) |
 			GenericMessage::RemoteCallRequest(_) |
 			GenericMessage::RemoteReadRequest(_) |
@@ -1314,13 +1298,6 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 		self.sync.on_justification_import(hash, number, success)
 	}
 
-	/// Request a finality proof for the given block.
-	///
-	/// Queues a new finality proof request and tries to dispatch all pending requests.
-	pub fn request_finality_proof(&mut self, hash: &B::Hash, number: NumberFor<B>) {
-		self.sync.request_finality_proof(&hash, number)
-	}
-
 	/// Notify the protocol that we have learned about the existence of nodes.
 	///
 	/// Can be called multiple times with the same `PeerId`s.
@@ -1328,34 +1305,6 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 		self.behaviour.add_discovered_nodes(peer_ids)
 	}
 
-	pub fn finality_proof_import_result(
-		&mut self,
-		request_block: (B::Hash, NumberFor<B>),
-		finalization_result: Result<(B::Hash, NumberFor<B>), ()>,
-	) {
-		self.sync.on_finality_proof_import(request_block, finalization_result)
-	}
-
-	/// Must be called after a [`CustomMessageOutcome::FinalityProofRequest`] has been emitted,
-	/// to notify of the response having arrived.
-	pub fn on_finality_proof_response(
-		&mut self,
-		who: PeerId,
-		response: message::FinalityProofResponse<B::Hash>,
-	) -> CustomMessageOutcome<B> {
-		trace!(target: "sync", "Finality proof response from {} for {}", who, response.block);
-		match self.sync.on_block_finality_proof(who, response) {
-			Ok(sync::OnBlockFinalityProof::Nothing) => CustomMessageOutcome::None,
-			Ok(sync::OnBlockFinalityProof::Import { peer, hash, number, proof }) =>
-				CustomMessageOutcome::FinalityProofImport(peer, hash, number, proof),
-			Err(sync::BadPeer(id, repu)) => {
-				self.behaviour.disconnect_peer(&id);
-				self.peerset_handle.report_peer(id, repu);
-				CustomMessageOutcome::None
-			}
-		}
-	}
-
 	fn format_stats(&self) -> String {
 		let mut out = String::new();
 		for (id, stats) in &self.context_data.stats {
@@ -1399,15 +1348,6 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 				.set(m.justifications.failed_requests.into());
 			metrics.justifications.with_label_values(&["importing"])
 				.set(m.justifications.importing_requests.into());
-
-			metrics.finality_proofs.with_label_values(&["pending"])
-				.set(m.finality_proofs.pending_requests.into());
-			metrics.finality_proofs.with_label_values(&["active"])
-				.set(m.finality_proofs.active_requests.into());
-			metrics.finality_proofs.with_label_values(&["failed"])
-				.set(m.finality_proofs.failed_requests.into());
-			metrics.finality_proofs.with_label_values(&["importing"])
-				.set(m.finality_proofs.importing_requests.into());
 		}
 	}
 }
@@ -1418,7 +1358,6 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 pub enum CustomMessageOutcome<B: BlockT> {
 	BlockImport(BlockOrigin, Vec<IncomingBlock<B>>),
 	JustificationImport(Origin, B::Hash, NumberFor<B>, Justification),
-	FinalityProofImport(Origin, B::Hash, NumberFor<B>, Vec<u8>),
 	/// Notification protocols have been opened with a remote.
 	NotificationStreamOpened {
 		remote: PeerId,
@@ -1443,12 +1382,6 @@ pub enum CustomMessageOutcome<B: BlockT> {
 	/// must be silently discarded.
 	/// It is the responsibility of the handler to ensure that a timeout exists.
 	BlockRequest { target: PeerId, request: message::BlockRequest<B> },
-	/// A new finality proof request must be emitted.
-	/// Once you have the response, you must call `Protocol::on_finality_proof_response`.
-	/// It is the responsibility of the handler to ensure that a timeout exists.
-	/// If the request times out, or the peer responds in an invalid way, the peer has to be
-	/// disconnect. This will inform the state machine that the request it has emitted is stale.
-	FinalityProofRequest { target: PeerId, block_hash: B::Hash, request: Vec<u8> },
 	/// Peer has a reported a new head of chain.
 	PeerNewBest(PeerId, NumberFor<B>),
 	None,
@@ -1545,14 +1478,6 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 			};
 			self.pending_messages.push_back(event);
 		}
-		for (id, r) in self.sync.finality_proof_requests() {
-			let event = CustomMessageOutcome::FinalityProofRequest {
-				target: id,
-				block_hash: r.block,
-				request: r.request,
-			};
-			self.pending_messages.push_back(event);
-		}
 		if let Poll::Ready(Some((tx_hash, result))) = self.pending_transactions.poll_next_unpin(cx) {
 			if let Some(peers) = self.pending_transactions_peers.remove(&tx_hash) {
 				peers.into_iter().for_each(|p| self.on_handle_transaction_import(p, result));
diff --git a/client/network/src/protocol/message.rs b/client/network/src/protocol/message.rs
index dae7b86db877..4213d56bbf02 100644
--- a/client/network/src/protocol/message.rs
+++ b/client/network/src/protocol/message.rs
@@ -25,7 +25,6 @@ pub use self::generic::{
 	BlockAnnounce, RemoteCallRequest, RemoteReadRequest,
 	RemoteHeaderRequest, RemoteHeaderResponse,
 	RemoteChangesRequest, RemoteChangesResponse,
-	FinalityProofRequest, FinalityProofResponse,
 	FromBlock, RemoteReadChildRequest, Roles,
 };
 use sc_client_api::StorageProof;
@@ -280,11 +279,10 @@ pub mod generic {
 		RemoteChangesResponse(RemoteChangesResponse<Number, Hash>),
 		/// Remote child storage read request.
 		RemoteReadChildRequest(RemoteReadChildRequest<Hash>),
-		/// Finality proof request.
-		FinalityProofRequest(FinalityProofRequest<Hash>),
-		/// Finality proof response.
-		FinalityProofResponse(FinalityProofResponse<Hash>),
 		/// Batch of consensus protocol messages.
+		// NOTE: index is incremented by 2 due to finality proof related
+		// messages that were removed.
+		#[codec(index = "17")]
 		ConsensusBatch(Vec<ConsensusMessage>),
 	}
 
@@ -307,8 +305,6 @@ pub mod generic {
 				Message::RemoteChangesRequest(_) => "RemoteChangesRequest",
 				Message::RemoteChangesResponse(_) => "RemoteChangesResponse",
 				Message::RemoteReadChildRequest(_) => "RemoteReadChildRequest",
-				Message::FinalityProofRequest(_) => "FinalityProofRequest",
-				Message::FinalityProofResponse(_) => "FinalityProofResponse",
 				Message::ConsensusBatch(_) => "ConsensusBatch",
 			}
 		}
@@ -546,26 +542,4 @@ pub mod generic {
 		/// Missing changes tries roots proof.
 		pub roots_proof: StorageProof,
 	}
-
-	#[derive(Debug, PartialEq, Eq, Clone, Encode, Decode)]
-	/// Finality proof request.
-	pub struct FinalityProofRequest<H> {
-		/// Unique request id.
-		pub id: RequestId,
-		/// Hash of the block to request proof for.
-		pub block: H,
-		/// Additional data blob (that both requester and provider understood) required for proving finality.
-		pub request: Vec<u8>,
-	}
-
-	#[derive(Debug, PartialEq, Eq, Clone, Encode, Decode)]
-	/// Finality proof response.
-	pub struct FinalityProofResponse<H> {
-		/// Id of a request this response was made for.
-		pub id: RequestId,
-		/// Hash of the block (the same as in the FinalityProofRequest).
-		pub block: H,
-		/// Finality proof (if available).
-		pub proof: Option<Vec<u8>>,
-	}
 }
diff --git a/client/network/src/protocol/sync.rs b/client/network/src/protocol/sync.rs
index 03714b05ace0..ced789446da6 100644
--- a/client/network/src/protocol/sync.rs
+++ b/client/network/src/protocol/sync.rs
@@ -35,9 +35,7 @@ use sp_consensus::{BlockOrigin, BlockStatus,
 	import_queue::{IncomingBlock, BlockImportResult, BlockImportError}
 };
 use crate::{
-	config::BoxFinalityProofRequestBuilder,
-	protocol::message::{self, generic::FinalityProofRequest, BlockAnnounce, BlockAttributes, BlockRequest, BlockResponse,
-	FinalityProofResponse, Roles},
+	protocol::message::{self, BlockAnnounce, BlockAttributes, BlockRequest, BlockResponse, Roles},
 };
 use either::Either;
 use extra_requests::ExtraRequests;
@@ -116,9 +114,6 @@ mod rep {
 	/// Reputation change for peers which send us a block with bad justifications.
 	pub const BAD_JUSTIFICATION: Rep = Rep::new(-(1 << 16), "Bad justification");
 
-	/// Reputation change for peers which send us a block with bad finality proof.
-	pub const BAD_FINALITY_PROOF: Rep = Rep::new(-(1 << 16), "Bad finality proof");
-
 	/// Reputation change when a peer sent us invlid ancestry result.
 	pub const UNKNOWN_ANCESTOR:Rep = Rep::new(-(1 << 16), "DB Error");
 }
@@ -185,8 +180,6 @@ pub struct ChainSync<B: BlockT> {
 	/// What block attributes we require for this node, usually derived from
 	/// what role we are, but could be customized
 	required_block_attributes: message::BlockAttributes,
-	/// Any extra finality proof requests.
-	extra_finality_proofs: ExtraRequests<B>,
 	/// Any extra justification requests.
 	extra_justifications: ExtraRequests<B>,
 	/// A set of hashes of blocks that are being downloaded or have been
@@ -195,8 +188,6 @@ pub struct ChainSync<B: BlockT> {
 	/// The best block number that was successfully imported into the chain.
 	/// This can not decrease.
 	best_imported_number: NumberFor<B>,
-	/// Finality proof handler.
-	request_builder: Option<BoxFinalityProofRequestBuilder<B>>,
 	/// Fork sync targets.
 	fork_targets: HashMap<B::Hash, ForkTarget<B>>,
 	/// A set of peers for which there might be potential block requests
@@ -270,8 +261,6 @@ pub enum PeerSyncState<B: BlockT> {
 	DownloadingStale(B::Hash),
 	/// Downloading justification for given block hash.
 	DownloadingJustification(B::Hash),
-	/// Downloading finality proof for given block hash.
-	DownloadingFinalityProof(B::Hash)
 }
 
 impl<B: BlockT> PeerSyncState<B> {
@@ -402,20 +391,6 @@ pub enum OnBlockJustification<B: BlockT> {
 	}
 }
 
-/// Result of [`ChainSync::on_block_finality_proof`].
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum OnBlockFinalityProof<B: BlockT> {
-	/// The proof needs no further handling.
-	Nothing,
-	/// The proof should be imported.
-	Import {
-		peer: PeerId,
-		hash: B::Hash,
-		number: NumberFor<B>,
-		proof: Vec<u8>
-	}
-}
-
 /// Result of [`ChainSync::has_slot_for_block_announce_validation`].
 enum HasSlotForBlockAnnounceValidation {
 	/// Yes, there is a slot for the block announce validation.
@@ -432,7 +407,6 @@ impl<B: BlockT> ChainSync<B> {
 		role: Roles,
 		client: Arc<dyn crate::chain::Client<B>>,
 		info: &BlockchainInfo<B>,
-		request_builder: Option<BoxFinalityProofRequestBuilder<B>>,
 		block_announce_validator: Box<dyn BlockAnnounceValidator<B> + Send>,
 		max_parallel_downloads: u32,
 	) -> Self {
@@ -449,12 +423,10 @@ impl<B: BlockT> ChainSync<B> {
 			best_queued_hash: info.best_hash,
 			best_queued_number: info.best_number,
 			best_imported_number: info.best_number,
-			extra_finality_proofs: ExtraRequests::new("finality proof"),
 			extra_justifications: ExtraRequests::new("justification"),
 			role,
 			required_block_attributes,
 			queue_blocks: Default::default(),
-			request_builder,
 			fork_targets: Default::default(),
 			pending_requests: Default::default(),
 			block_announce_validator,
@@ -613,14 +585,6 @@ impl<B: BlockT> ChainSync<B> {
 		})
 	}
 
-	/// Schedule a finality proof request for the given block.
-	pub fn request_finality_proof(&mut self, hash: &B::Hash, number: NumberFor<B>) {
-		let client = &self.client;
-		self.extra_finality_proofs.schedule((*hash, number), |base, block| {
-			is_descendent_of(&**client, base, block)
-		})
-	}
-
 	/// Request syncing for the given block from given set of peers.
 	// The implementation is similar to on_block_announce with unknown parent hash.
 	pub fn set_sync_fork_request(
@@ -700,30 +664,6 @@ impl<B: BlockT> ChainSync<B> {
 		})
 	}
 
-	/// Get an iterator over all scheduled finality proof requests.
-	pub fn finality_proof_requests(&mut self) -> impl Iterator<Item = (PeerId, FinalityProofRequest<B::Hash>)> + '_ {
-		let peers = &mut self.peers;
-		let request_builder = &mut self.request_builder;
-		let mut matcher = self.extra_finality_proofs.matcher();
-		std::iter::from_fn(move || {
-			if let Some((peer, request)) = matcher.next(&peers) {
-				peers.get_mut(&peer)
-					.expect("`Matcher::next` guarantees the `PeerId` comes from the given peers; qed")
-					.state = PeerSyncState::DownloadingFinalityProof(request.0);
-				let req = message::generic::FinalityProofRequest {
-					id: 0,
-					block: request.0,
-					request: request_builder.as_mut()
-						.map(|builder| builder.build_request_data(&request.0))
-						.unwrap_or_default()
-				};
-				Some((peer, req))
-			} else {
-				None
-			}
-		})
-	}
-
 	/// Get an iterator over all block requests of all peers.
 	pub fn block_requests(&mut self) -> impl Iterator<Item = (&PeerId, BlockRequest<B>)> + '_ {
 		if self.pending_requests.is_empty() {
@@ -920,8 +860,7 @@ impl<B: BlockT> ChainSync<B> {
 						}
 
 						| PeerSyncState::Available
-						| PeerSyncState::DownloadingJustification(..)
-						| PeerSyncState::DownloadingFinalityProof(..) => Vec::new()
+						| PeerSyncState::DownloadingJustification(..) => Vec::new()
 					}
 				} else {
 					// When request.is_none() this is a block announcement. Just accept blocks.
@@ -1033,41 +972,6 @@ impl<B: BlockT> ChainSync<B> {
 		Ok(OnBlockJustification::Nothing)
 	}
 
-	/// Handle new finality proof data.
-	pub fn on_block_finality_proof
-		(&mut self, who: PeerId, resp: FinalityProofResponse<B::Hash>) -> Result<OnBlockFinalityProof<B>, BadPeer>
-	{
-		let peer =
-			if let Some(peer) = self.peers.get_mut(&who) {
-				peer
-			} else {
-				error!(target: "sync", "💔 Called on_block_finality_proof_data with a bad peer ID");
-				return Ok(OnBlockFinalityProof::Nothing)
-			};
-
-		self.pending_requests.add(&who);
-		if let PeerSyncState::DownloadingFinalityProof(hash) = peer.state {
-			peer.state = PeerSyncState::Available;
-
-			// We only request one finality proof at a time.
-			if hash != resp.block {
-				info!(
-					target: "sync",
-					"💔 Invalid block finality proof provided: requested: {:?} got: {:?}",
-					hash,
-					resp.block
-				);
-				return Err(BadPeer(who, rep::BAD_FINALITY_PROOF));
-			}
-
-			if let Some((peer, hash, number, p)) = self.extra_finality_proofs.on_response(who, resp.proof) {
-				return Ok(OnBlockFinalityProof::Import { peer, hash, number, proof: p })
-			}
-		}
-
-		Ok(OnBlockFinalityProof::Nothing)
-	}
-
 	/// A batch of blocks have been processed, with or without errors.
 	///
 	/// Call this when a batch of blocks have been processed by the import
@@ -1122,11 +1026,6 @@ impl<B: BlockT> ChainSync<B> {
 						}
 					}
 
-					if aux.needs_finality_proof {
-						trace!(target: "sync", "Block imported but requires finality proof {}: {:?}", number, hash);
-						self.request_finality_proof(&hash, number);
-					}
-
 					if number > self.best_imported_number {
 						self.best_imported_number = number;
 					}
@@ -1178,22 +1077,8 @@ impl<B: BlockT> ChainSync<B> {
 		self.pending_requests.set_all();
 	}
 
-	pub fn on_finality_proof_import(&mut self, req: (B::Hash, NumberFor<B>), res: Result<(B::Hash, NumberFor<B>), ()>) {
-		self.extra_finality_proofs.try_finalize_root(req, res, true);
-		self.pending_requests.set_all();
-	}
-
 	/// Notify about finalization of the given block.
 	pub fn on_block_finalized(&mut self, hash: &B::Hash, number: NumberFor<B>) {
-		let client = &self.client;
-		let r = self.extra_finality_proofs.on_block_finalized(hash, number, |base, block| {
-			is_descendent_of(&**client, base, block)
-		});
-
-		if let Err(err) = r {
-			warn!(target: "sync", "💔 Error cleaning up pending extra finality proof data requests: {:?}", err)
-		}
-
 		let client = &self.client;
 		let r = self.extra_justifications.on_block_finalized(hash, number, |base, block| {
 			is_descendent_of(&**client, base, block)
@@ -1506,14 +1391,12 @@ impl<B: BlockT> ChainSync<B> {
 		self.blocks.clear_peer_download(who);
 		self.peers.remove(who);
 		self.extra_justifications.peer_disconnected(who);
-		self.extra_finality_proofs.peer_disconnected(who);
 		self.pending_requests.set_all();
 	}
 
 	/// Restart the sync process. This will reset all pending block requests and return an iterator
 	/// of new block requests to make to peers. Peers that were downloading finality data (i.e.
-	/// their state was `DownloadingJustification` or `DownloadingFinalityProof`) are unaffected and
-	/// will stay in the same state.
+	/// their state was `DownloadingJustification`) are unaffected and will stay in the same state.
 	fn restart<'a>(
 		&'a mut self,
 	) -> impl Iterator<Item = Result<(PeerId, BlockRequest<B>), BadPeer>> + 'a {
@@ -1526,11 +1409,10 @@ impl<B: BlockT> ChainSync<B> {
 		let old_peers = std::mem::take(&mut self.peers);
 
 		old_peers.into_iter().filter_map(move |(id, p)| {
-			// peers that were downloading justifications or finality proofs
+			// peers that were downloading justifications
 			// should be kept in that state.
 			match p.state {
-				PeerSyncState::DownloadingJustification(_)
-				| PeerSyncState::DownloadingFinalityProof(_) => {
+				PeerSyncState::DownloadingJustification(_) => {
 					self.peers.insert(id, p);
 					return None;
 				}
@@ -1570,7 +1452,6 @@ impl<B: BlockT> ChainSync<B> {
 		Metrics {
 			queued_blocks: self.queue_blocks.len().try_into().unwrap_or(std::u32::MAX),
 			fork_targets: self.fork_targets.len().try_into().unwrap_or(std::u32::MAX),
-			finality_proofs: self.extra_finality_proofs.metrics(),
 			justifications: self.extra_justifications.metrics(),
 			_priv: ()
 		}
@@ -1581,7 +1462,6 @@ impl<B: BlockT> ChainSync<B> {
 pub(crate) struct Metrics {
 	pub(crate) queued_blocks: u32,
 	pub(crate) fork_targets: u32,
-	pub(crate) finality_proofs: extra_requests::Metrics,
 	pub(crate) justifications: extra_requests::Metrics,
 	_priv: ()
 }
@@ -1835,7 +1715,6 @@ mod test {
 			Roles::AUTHORITY,
 			client.clone(),
 			&info,
-			None,
 			block_announce_validator,
 			1,
 		);
@@ -1907,7 +1786,6 @@ mod test {
 			Roles::AUTHORITY,
 			client.clone(),
 			&info,
-			None,
 			Box::new(DefaultBlockAnnounceValidator),
 			1,
 		);
@@ -1915,7 +1793,6 @@ mod test {
 		let peer_id1 = PeerId::random();
 		let peer_id2 = PeerId::random();
 		let peer_id3 = PeerId::random();
-		let peer_id4 = PeerId::random();
 
 		let mut new_blocks = |n| {
 			for _ in 0..n {
@@ -1928,7 +1805,6 @@ mod test {
 		};
 
 		let (b1_hash, b1_number) = new_blocks(50);
-		let (b2_hash, b2_number) = new_blocks(10);
 
 		// add 2 peers at blocks that we don't have locally
 		sync.new_peer(peer_id1.clone(), Hash::random(), 42).unwrap();
@@ -1958,38 +1834,16 @@ mod test {
 			PeerSyncState::DownloadingJustification(b1_hash),
 		);
 
-		// add another peer at a known later block
-		sync.new_peer(peer_id4.clone(), b2_hash, b2_number).unwrap();
-
-		// we request a finality proof for a block we have locally
-		sync.request_finality_proof(&b2_hash, b2_number);
-
-		// the finality proof request should be scheduled to peer 4
-		// which is at that block
-		assert!(
-			sync.finality_proof_requests().any(|(p, r)| { p == peer_id4 && r.block == b2_hash })
-		);
-
-		assert_eq!(
-			sync.peers.get(&peer_id4).unwrap().state,
-			PeerSyncState::DownloadingFinalityProof(b2_hash),
-		);
-
 		// we restart the sync state
 		let block_requests = sync.restart();
 
 		// which should make us send out block requests to the first two peers
 		assert!(block_requests.map(|r| r.unwrap()).all(|(p, _)| { p == peer_id1 || p == peer_id2 }));
 
-		// peer 3 and 4 should be unaffected as they were downloading finality data
+		// peer 3 should be unaffected it was downloading finality data
 		assert_eq!(
 			sync.peers.get(&peer_id3).unwrap().state,
 			PeerSyncState::DownloadingJustification(b1_hash),
 		);
-
-		assert_eq!(
-			sync.peers.get(&peer_id4).unwrap().state,
-			PeerSyncState::DownloadingFinalityProof(b2_hash),
-		);
 	}
 }
diff --git a/client/network/src/protocol/sync/extra_requests.rs b/client/network/src/protocol/sync/extra_requests.rs
index df336c25339f..79f10c4a3bf8 100644
--- a/client/network/src/protocol/sync/extra_requests.rs
+++ b/client/network/src/protocol/sync/extra_requests.rs
@@ -528,13 +528,12 @@ mod tests {
 
 	impl Arbitrary for ArbitraryPeerSyncState {
 		fn arbitrary<G: Gen>(g: &mut G) -> Self {
-			let s = match g.gen::<u8>() % 5 {
+			let s = match g.gen::<u8>() % 4 {
 				0 => PeerSyncState::Available,
 				// TODO: 1 => PeerSyncState::AncestorSearch(g.gen(), AncestorSearchState<B>),
 				1 => PeerSyncState::DownloadingNew(g.gen::<BlockNumber>()),
 				2 => PeerSyncState::DownloadingStale(Hash::random()),
-				3 => PeerSyncState::DownloadingJustification(Hash::random()),
-				_ => PeerSyncState::DownloadingFinalityProof(Hash::random())
+				_ => PeerSyncState::DownloadingJustification(Hash::random()),
 			};
 			ArbitraryPeerSyncState(s)
 		}
diff --git a/client/network/src/schema.rs b/client/network/src/schema.rs
index 44fbbffd2540..423d3ef5b41e 100644
--- a/client/network/src/schema.rs
+++ b/client/network/src/schema.rs
@@ -20,9 +20,6 @@
 
 pub mod v1 {
 	include!(concat!(env!("OUT_DIR"), "/api.v1.rs"));
-	pub mod finality {
-		include!(concat!(env!("OUT_DIR"), "/api.v1.finality.rs"));
-	}
 	pub mod light {
 		include!(concat!(env!("OUT_DIR"), "/api.v1.light.rs"));
 	}
diff --git a/client/network/src/schema/finality.v1.proto b/client/network/src/schema/finality.v1.proto
deleted file mode 100644
index 843bc4eca099..000000000000
--- a/client/network/src/schema/finality.v1.proto
+++ /dev/null
@@ -1,19 +0,0 @@
-// Schema definition for finality proof request/responses.
-
-syntax = "proto3";
-
-package api.v1.finality;
-
-// Request a finality proof from a peer.
-message FinalityProofRequest {
-	// SCALE-encoded hash of the block to request.
-	bytes block_hash = 1;
-	// Opaque chain-specific additional request data.
-	bytes request = 2;
-}
-
-// Response to a finality proof request.
-message FinalityProofResponse {
-	// Opaque chain-specific finality proof. Empty if no such proof exists.
-	bytes proof = 1; // optional
-}
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 3296a97d71bb..8ef76d485069 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -38,7 +38,7 @@ use crate::{
 		NetworkState, NotConnectedPeer as NetworkStateNotConnectedPeer, Peer as NetworkStatePeer,
 	},
 	on_demand_layer::AlwaysBadChecker,
-	light_client_handler, block_requests, finality_requests,
+	light_client_handler, block_requests,
 	protocol::{self, event::Event, NotifsHandlerError, NotificationsSink, Ready, sync::SyncState, PeerInfo, Protocol},
 	transport, ReputationChange,
 };
@@ -248,7 +248,6 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 			local_peer_id.clone(),
 			params.chain.clone(),
 			params.transaction_pool,
-			params.finality_proof_request_builder,
 			params.protocol_id.clone(),
 			peerset_config,
 			params.block_announce_validator,
@@ -267,10 +266,6 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 				let config = block_requests::Config::new(&params.protocol_id);
 				block_requests::BlockRequests::new(config, params.chain.clone())
 			};
-			let finality_proof_requests = {
-				let config = finality_requests::Config::new(&params.protocol_id);
-				finality_requests::FinalityProofRequests::new(config, params.finality_proof_provider.clone())
-			};
 			let light_client_handler = {
 				let config = light_client_handler::Config::new(&params.protocol_id);
 				light_client_handler::LightClientHandler::new(
@@ -310,7 +305,6 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 					user_agent,
 					local_public,
 					block_requests,
-					finality_proof_requests,
 					light_client_handler,
 					discovery_config,
 					params.network_config.request_response_protocols,
@@ -1361,12 +1355,6 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 					}
 					this.import_queue.import_justification(origin, hash, nb, justification);
 				},
-				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::FinalityProofImport(origin, hash, nb, proof))) => {
-					if let Some(metrics) = this.metrics.as_ref() {
-						metrics.import_queue_finality_proofs_submitted.inc();
-					}
-					this.import_queue.import_finality_proof(origin, hash, nb, proof);
-				},
 				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::InboundRequest { protocol, result, .. })) => {
 					if let Some(metrics) = this.metrics.as_ref() {
 						match result {
@@ -1563,11 +1551,11 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 						let reason = match cause {
 							Some(ConnectionError::IO(_)) => "transport-error",
 							Some(ConnectionError::Handler(NodeHandlerWrapperError::Handler(EitherError::A(EitherError::A(
-								EitherError::A(EitherError::A(EitherError::A(EitherError::B(
-								EitherError::A(PingFailure::Timeout)))))))))) => "ping-timeout",
+								EitherError::A(EitherError::A(EitherError::B(
+								EitherError::A(PingFailure::Timeout))))))))) => "ping-timeout",
 							Some(ConnectionError::Handler(NodeHandlerWrapperError::Handler(EitherError::A(EitherError::A(
-								EitherError::A(EitherError::A(EitherError::A(EitherError::A(
-								NotifsHandlerError::SyncNotificationsClogged))))))))) => "sync-notifications-clogged",
+								EitherError::A(EitherError::A(EitherError::A(
+								NotifsHandlerError::SyncNotificationsClogged)))))))) => "sync-notifications-clogged",
 							Some(ConnectionError::Handler(NodeHandlerWrapperError::Handler(_))) => "protocol-error",
 							Some(ConnectionError::Handler(NodeHandlerWrapperError::KeepAliveTimeout)) => "keep-alive-timeout",
 							None => "actively-closed",
@@ -1752,23 +1740,6 @@ impl<'a, B: BlockT, H: ExHashT> Link<B> for NetworkLink<'a, B, H> {
 	fn request_justification(&mut self, hash: &B::Hash, number: NumberFor<B>) {
 		self.protocol.user_protocol_mut().request_justification(hash, number)
 	}
-	fn request_finality_proof(&mut self, hash: &B::Hash, number: NumberFor<B>) {
-		self.protocol.user_protocol_mut().request_finality_proof(hash, number)
-	}
-	fn finality_proof_imported(
-		&mut self,
-		who: PeerId,
-		request_block: (B::Hash, NumberFor<B>),
-		finalization_result: Result<(B::Hash, NumberFor<B>), ()>,
-	) {
-		let success = finalization_result.is_ok();
-		self.protocol.user_protocol_mut().finality_proof_import_result(request_block, finalization_result);
-		if !success {
-			info!("💔 Invalid finality proof provided by {} for #{}", who, request_block.0);
-			self.protocol.user_protocol_mut().disconnect_peer(&who);
-			self.protocol.user_protocol_mut().report_peer(who, ReputationChange::new_fatal("Invalid finality proof"));
-		}
-	}
 }
 
 fn ensure_addresses_consistent_with_transport<'a>(
diff --git a/client/network/src/service/metrics.rs b/client/network/src/service/metrics.rs
index a63ce7a18a51..614c24b522de 100644
--- a/client/network/src/service/metrics.rs
+++ b/client/network/src/service/metrics.rs
@@ -56,7 +56,6 @@ pub struct Metrics {
 	pub distinct_peers_connections_closed_total: Counter<U64>,
 	pub distinct_peers_connections_opened_total: Counter<U64>,
 	pub import_queue_blocks_submitted: Counter<U64>,
-	pub import_queue_finality_proofs_submitted: Counter<U64>,
 	pub import_queue_justifications_submitted: Counter<U64>,
 	pub incoming_connections_errors_total: CounterVec<U64>,
 	pub incoming_connections_total: Counter<U64>,
@@ -112,10 +111,6 @@ impl Metrics {
 				"import_queue_blocks_submitted",
 				"Number of blocks submitted to the import queue.",
 			)?, registry)?,
-			import_queue_finality_proofs_submitted: prometheus::register(Counter::new(
-				"import_queue_finality_proofs_submitted",
-				"Number of finality proofs submitted to the import queue.",
-			)?, registry)?,
 			import_queue_justifications_submitted: prometheus::register(Counter::new(
 				"import_queue_justifications_submitted",
 				"Number of justifications submitted to the import queue.",
diff --git a/client/network/src/service/tests.rs b/client/network/src/service/tests.rs
index 76a924748ad2..225a3ae98ab5 100644
--- a/client/network/src/service/tests.rs
+++ b/client/network/src/service/tests.rs
@@ -87,7 +87,6 @@ fn build_test_full_node(config: config::NetworkConfiguration)
 		PassThroughVerifier(false),
 		Box::new(client.clone()),
 		None,
-		None,
 		&sp_core::testing::TaskExecutor::new(),
 		None,
 	));
@@ -97,8 +96,6 @@ fn build_test_full_node(config: config::NetworkConfiguration)
 		executor: None,
 		network_config: config,
 		chain: client.clone(),
-		finality_proof_provider: None,
-		finality_proof_request_builder: None,
 		on_demand: None,
 		transaction_pool: Arc::new(crate::config::EmptyTransactionPool),
 		protocol_id: config::ProtocolId::from("/test-protocol-name"),
diff --git a/client/network/test/src/block_import.rs b/client/network/test/src/block_import.rs
index 1d2cd3d687de..a5d0600abefe 100644
--- a/client/network/test/src/block_import.rs
+++ b/client/network/test/src/block_import.rs
@@ -107,7 +107,6 @@ fn async_import_queue_drops() {
 			verifier,
 			Box::new(substrate_test_runtime_client::new()),
 			None,
-			None,
 			&executor,
 			None,
 		);
diff --git a/client/network/test/src/lib.rs b/client/network/test/src/lib.rs
index 1aec3dae22b9..6950ada4f845 100644
--- a/client/network/test/src/lib.rs
+++ b/client/network/test/src/lib.rs
@@ -29,7 +29,6 @@ use std::{
 
 use libp2p::build_multiaddr;
 use log::trace;
-use sc_network::config::FinalityProofProvider;
 use sp_blockchain::{
 	HeaderBackend, Result as ClientResult,
 	well_known_cache_keys::{self, Id as CacheKeyId},
@@ -44,14 +43,14 @@ use sc_block_builder::{BlockBuilder, BlockBuilderProvider};
 use sc_network::config::Role;
 use sp_consensus::block_validation::{DefaultBlockAnnounceValidator, BlockAnnounceValidator};
 use sp_consensus::import_queue::{
-	BasicQueue, BoxJustificationImport, Verifier, BoxFinalityProofImport,
+	BasicQueue, BoxJustificationImport, Verifier,
 };
 use sp_consensus::block_import::{BlockImport, ImportResult};
 use sp_consensus::Error as ConsensusError;
 use sp_consensus::{BlockOrigin, ForkChoiceStrategy, BlockImportParams, BlockCheckParams, JustificationImport};
 use futures::prelude::*;
 use sc_network::{NetworkWorker, NetworkService, config::ProtocolId};
-use sc_network::config::{NetworkConfiguration, TransportConfig, BoxFinalityProofRequestBuilder};
+use sc_network::config::{NetworkConfiguration, TransportConfig};
 use libp2p::PeerId;
 use parking_lot::Mutex;
 use sp_core::H256;
@@ -586,20 +585,10 @@ pub trait TestNetFactory: Sized {
 		-> (
 			BlockImportAdapter<Transaction>,
 			Option<BoxJustificationImport<Block>>,
-			Option<BoxFinalityProofImport<Block>>,
-			Option<BoxFinalityProofRequestBuilder<Block>>,
 			Self::PeerData,
 		)
 	{
-		(client.as_block_import(), None, None, None, Default::default())
-	}
-
-	/// Get finality proof provider (if supported).
-	fn make_finality_proof_provider(
-		&self,
-		_client: PeersClient,
-	) -> Option<Arc<dyn FinalityProofProvider<Block>>> {
-		None
+		(client.as_block_import(), None, Default::default())
 	}
 
 	fn default_config() -> ProtocolConfig {
@@ -636,8 +625,6 @@ pub trait TestNetFactory: Sized {
 		let (
 			block_import,
 			justification_import,
-			finality_proof_import,
-			finality_proof_request_builder,
 			data,
 		) = self.make_block_import(PeersClient::Full(client.clone(), backend.clone()));
 
@@ -652,7 +639,6 @@ pub trait TestNetFactory: Sized {
 			verifier.clone(),
 			Box::new(block_import.clone()),
 			justification_import,
-			finality_proof_import,
 			&sp_core::testing::TaskExecutor::new(),
 			None,
 		));
@@ -675,10 +661,6 @@ pub trait TestNetFactory: Sized {
 			executor: None,
 			network_config,
 			chain: client.clone(),
-			finality_proof_provider: self.make_finality_proof_provider(
-				PeersClient::Full(client.clone(), backend.clone()),
-			),
-			finality_proof_request_builder,
 			on_demand: None,
 			transaction_pool: Arc::new(EmptyTransactionPool),
 			protocol_id: ProtocolId::from("test-protocol-name"),
@@ -717,8 +699,6 @@ pub trait TestNetFactory: Sized {
 		let (
 			block_import,
 			justification_import,
-			finality_proof_import,
-			finality_proof_request_builder,
 			data,
 		) = self.make_block_import(PeersClient::Light(client.clone(), backend.clone()));
 
@@ -733,7 +713,6 @@ pub trait TestNetFactory: Sized {
 			verifier.clone(),
 			Box::new(block_import.clone()),
 			justification_import,
-			finality_proof_import,
 			&sp_core::testing::TaskExecutor::new(),
 			None,
 		));
@@ -755,10 +734,6 @@ pub trait TestNetFactory: Sized {
 			executor: None,
 			network_config,
 			chain: client.clone(),
-			finality_proof_provider: self.make_finality_proof_provider(
-				PeersClient::Light(client.clone(), backend.clone())
-			),
-			finality_proof_request_builder,
 			on_demand: None,
 			transaction_pool: Arc::new(EmptyTransactionPool),
 			protocol_id: ProtocolId::from("test-protocol-name"),
@@ -989,16 +964,12 @@ impl TestNetFactory for JustificationTestNet {
 		-> (
 			BlockImportAdapter<Transaction>,
 			Option<BoxJustificationImport<Block>>,
-			Option<BoxFinalityProofImport<Block>>,
-			Option<BoxFinalityProofRequestBuilder<Block>>,
 			Self::PeerData,
 		)
 	{
 		(
 			client.as_block_import(),
 			Some(Box::new(ForceFinalized(client))),
-			None,
-			None,
 			Default::default(),
 		)
 	}
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index 7d613f2bc629..d9dc0d1c6ba0 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -41,7 +41,7 @@ use futures::{
 };
 use sc_keystore::LocalKeystore;
 use log::{info, warn};
-use sc_network::config::{Role, FinalityProofProvider, OnDemand, BoxFinalityProofRequestBuilder};
+use sc_network::config::{Role, OnDemand};
 use sc_network::NetworkService;
 use sp_runtime::generic::BlockId;
 use sp_runtime::traits::{
@@ -830,10 +830,6 @@ pub struct BuildNetworkParams<'a, TBl: BlockT, TExPool, TImpQu, TCl> {
 	pub block_announce_validator_builder: Option<Box<
 		dyn FnOnce(Arc<TCl>) -> Box<dyn BlockAnnounceValidator<TBl> + Send> + Send
 	>>,
-	/// An optional finality proof request builder.
-	pub finality_proof_request_builder: Option<BoxFinalityProofRequestBuilder<TBl>>,
-	/// An optional, shared finality proof request provider.
-	pub finality_proof_provider: Option<Arc<dyn FinalityProofProvider<TBl>>>,
 }
 
 /// Build the network service, the network status sinks and an RPC sender.
@@ -858,7 +854,7 @@ pub fn build_network<TBl, TExPool, TImpQu, TCl>(
 {
 	let BuildNetworkParams {
 		config, client, transaction_pool, spawn_handle, import_queue, on_demand,
-		block_announce_validator_builder, finality_proof_request_builder, finality_proof_provider,
+		block_announce_validator_builder,
 	} = params;
 
 	let transaction_pool_adapter = Arc::new(TransactionPoolAdapter {
@@ -896,8 +892,6 @@ pub fn build_network<TBl, TExPool, TImpQu, TCl>(
 		},
 		network_config: config.network.clone(),
 		chain: client.clone(),
-		finality_proof_provider,
-		finality_proof_request_builder,
 		on_demand: on_demand,
 		transaction_pool: transaction_pool_adapter as _,
 		import_queue: Box::new(import_queue),
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index a23ebf3d553d..fd5ad9ebac91 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -73,7 +73,7 @@ pub use sc_executor::NativeExecutionDispatch;
 pub use std::{ops::Deref, result::Result, sync::Arc};
 #[doc(hidden)]
 pub use sc_network::config::{
-	FinalityProofProvider, OnDemand, BoxFinalityProofRequestBuilder, TransactionImport,
+	OnDemand, TransactionImport,
 	TransactionImportFuture,
 };
 pub use sc_tracing::TracingReceiver;
diff --git a/primitives/consensus/common/src/block_import.rs b/primitives/consensus/common/src/block_import.rs
index 5e593da1163d..0100041fc0a0 100644
--- a/primitives/consensus/common/src/block_import.rs
+++ b/primitives/consensus/common/src/block_import.rs
@@ -26,7 +26,7 @@ use std::sync::Arc;
 use std::any::Any;
 
 use crate::Error;
-use crate::import_queue::{Verifier, CacheKeyId};
+use crate::import_queue::CacheKeyId;
 
 /// Block import result.
 #[derive(Debug, PartialEq, Eq)]
@@ -54,8 +54,6 @@ pub struct ImportedAux {
 	pub needs_justification: bool,
 	/// Received a bad justification.
 	pub bad_justification: bool,
-	/// Request a finality proof for the given block.
-	pub needs_finality_proof: bool,
 	/// Whether the block that was imported is the new best block.
 	pub is_new_best: bool,
 }
@@ -63,7 +61,7 @@ pub struct ImportedAux {
 impl ImportResult {
 	/// Returns default value for `ImportResult::Imported` with
 	/// `clear_justification_requests`, `needs_justification`,
-	/// `bad_justification` and `needs_finality_proof` set to false.
+	/// `bad_justification` set to false.
 	pub fn imported(is_new_best: bool) -> ImportResult {
 		let mut aux = ImportedAux::default();
 		aux.is_new_best = is_new_best;
@@ -345,21 +343,3 @@ pub trait JustificationImport<B: BlockT> {
 		justification: Justification,
 	) -> Result<(), Self::Error>;
 }
-
-/// Finality proof import trait.
-pub trait FinalityProofImport<B: BlockT> {
-	type Error: std::error::Error + Send + 'static;
-
-	/// Called by the import queue when it is started. Returns a list of finality proofs to request
-	/// from the network.
-	fn on_start(&mut self) -> Vec<(B::Hash, NumberFor<B>)> { Vec::new() }
-
-	/// Import a Block justification and finalize the given block. Returns finalized block or error.
-	fn import_finality_proof(
-		&mut self,
-		hash: B::Hash,
-		number: NumberFor<B>,
-		finality_proof: Vec<u8>,
-		verifier: &mut dyn Verifier<B>,
-	) -> Result<(B::Hash, NumberFor<B>), Self::Error>;
-}
diff --git a/primitives/consensus/common/src/import_queue.rs b/primitives/consensus/common/src/import_queue.rs
index 92bd9966d75e..3ad8c7c92e07 100644
--- a/primitives/consensus/common/src/import_queue.rs
+++ b/primitives/consensus/common/src/import_queue.rs
@@ -34,7 +34,7 @@ use crate::{
 	error::Error as ConsensusError,
 	block_import::{
 		BlockImport, BlockOrigin, BlockImportParams, ImportedAux, JustificationImport, ImportResult,
-		BlockCheckParams, FinalityProofImport,
+		BlockCheckParams,
 	},
 	metrics::Metrics,
 };
@@ -56,11 +56,6 @@ pub type BoxBlockImport<B, Transaction> = Box<
 /// Shared justification import struct used by the queue.
 pub type BoxJustificationImport<B> = Box<dyn JustificationImport<B, Error=ConsensusError> + Send + Sync>;
 
-/// Shared finality proof import struct used by the queue.
-pub type BoxFinalityProofImport<B> = Box<
-	dyn FinalityProofImport<B, Error = ConsensusError> + Send + Sync
->;
-
 /// Maps to the Origin used by the network.
 pub type Origin = libp2p::PeerId;
 
@@ -115,15 +110,6 @@ pub trait ImportQueue<B: BlockT>: Send {
 		number: NumberFor<B>,
 		justification: Justification
 	);
-	/// Import block finality proof.
-	fn import_finality_proof(
-		&mut self,
-		who: Origin,
-		hash: B::Hash,
-		number: NumberFor<B>,
-		finality_proof: Vec<u8>
-	);
-
 	/// Polls for actions to perform on the network.
 	///
 	/// This method should behave in a way similar to `Future::poll`. It can register the current
@@ -146,19 +132,6 @@ pub trait Link<B: BlockT>: Send {
 	fn justification_imported(&mut self, _who: Origin, _hash: &B::Hash, _number: NumberFor<B>, _success: bool) {}
 	/// Request a justification for the given block.
 	fn request_justification(&mut self, _hash: &B::Hash, _number: NumberFor<B>) {}
-	/// Finality proof import result.
-	///
-	/// Even though we have asked for finality proof of block A, provider could return proof of
-	/// some earlier block B, if the proof for A was too large. The sync module should continue
-	/// asking for proof of A in this case.
-	fn finality_proof_imported(
-		&mut self,
-		_who: Origin,
-		_request_block: (B::Hash, NumberFor<B>),
-		_finalization_result: Result<(B::Hash, NumberFor<B>), ()>,
-	) {}
-	/// Request a finality proof for the given block.
-	fn request_finality_proof(&mut self, _hash: &B::Hash, _number: NumberFor<B>) {}
 }
 
 /// Block import successful result.
diff --git a/primitives/consensus/common/src/import_queue/basic_queue.rs b/primitives/consensus/common/src/import_queue/basic_queue.rs
index ea0ca2cf3ee8..b426c39100e6 100644
--- a/primitives/consensus/common/src/import_queue/basic_queue.rs
+++ b/primitives/consensus/common/src/import_queue/basic_queue.rs
@@ -25,7 +25,7 @@ use prometheus_endpoint::Registry;
 use crate::{
 	block_import::BlockOrigin,
 	import_queue::{
-		BlockImportResult, BlockImportError, Verifier, BoxBlockImport, BoxFinalityProofImport,
+		BlockImportResult, BlockImportError, Verifier, BoxBlockImport,
 		BoxJustificationImport, ImportQueue, Link, Origin,
 		IncomingBlock, import_single_block_metered,
 		buffered_link::{self, BufferedLinkSender, BufferedLinkReceiver},
@@ -36,8 +36,8 @@ use crate::{
 /// Interface to a basic block import queue that is importing blocks sequentially in a separate
 /// task, with plugable verification.
 pub struct BasicQueue<B: BlockT, Transaction> {
-	/// Channel to send finality work messages to the background task.
-	finality_sender: TracingUnboundedSender<worker_messages::Finality<B>>,
+	/// Channel to send justifcation import messages to the background task.
+	justification_sender: TracingUnboundedSender<worker_messages::ImportJustification<B>>,
 	/// Channel to send block import messages to the background task.
 	block_import_sender: TracingUnboundedSender<worker_messages::ImportBlocks<B>>,
 	/// Results coming from the worker task.
@@ -48,7 +48,7 @@ pub struct BasicQueue<B: BlockT, Transaction> {
 impl<B: BlockT, Transaction> Drop for BasicQueue<B, Transaction> {
 	fn drop(&mut self) {
 		// Flush the queue and close the receiver to terminate the future.
-		self.finality_sender.close_channel();
+		self.justification_sender.close_channel();
 		self.block_import_sender.close_channel();
 		self.result_port.close();
 	}
@@ -57,13 +57,11 @@ impl<B: BlockT, Transaction> Drop for BasicQueue<B, Transaction> {
 impl<B: BlockT, Transaction: Send + 'static> BasicQueue<B, Transaction> {
 	/// Instantiate a new basic queue, with given verifier.
 	///
-	/// This creates a background task, and calls `on_start` on the justification importer and
-	/// finality proof importer.
+	/// This creates a background task, and calls `on_start` on the justification importer.
 	pub fn new<V: 'static + Verifier<B>>(
 		verifier: V,
 		block_import: BoxBlockImport<B, Transaction>,
 		justification_import: Option<BoxJustificationImport<B>>,
-		finality_proof_import: Option<BoxFinalityProofImport<B>>,
 		spawner: &impl sp_core::traits::SpawnNamed,
 		prometheus_registry: Option<&Registry>,
 	) -> Self {
@@ -77,19 +75,18 @@ impl<B: BlockT, Transaction: Send + 'static> BasicQueue<B, Transaction> {
 				.ok()
 		});
 
-		let (future, finality_sender, block_import_sender) = BlockImportWorker::new(
+		let (future, justification_sender, block_import_sender) = BlockImportWorker::new(
 			result_sender,
 			verifier,
 			block_import,
 			justification_import,
-			finality_proof_import,
 			metrics,
 		);
 
 		spawner.spawn_blocking("basic-block-import-worker", future.boxed());
 
 		Self {
-			finality_sender,
+			justification_sender,
 			block_import_sender,
 			result_port,
 			_phantom: PhantomData,
@@ -122,8 +119,8 @@ impl<B: BlockT, Transaction: Send> ImportQueue<B> for BasicQueue<B, Transaction>
 		number: NumberFor<B>,
 		justification: Justification,
 	) {
-		let res = self.finality_sender.unbounded_send(
-			worker_messages::Finality::ImportJustification(who, hash, number, justification),
+		let res = self.justification_sender.unbounded_send(
+			worker_messages::ImportJustification(who, hash, number, justification),
 		);
 
 		if res.is_err() {
@@ -134,26 +131,6 @@ impl<B: BlockT, Transaction: Send> ImportQueue<B> for BasicQueue<B, Transaction>
 		}
 	}
 
-	fn import_finality_proof(
-		&mut self,
-		who: Origin,
-		hash: B::Hash,
-		number: NumberFor<B>,
-		finality_proof: Vec<u8>,
-	) {
-		trace!(target: "sync", "Scheduling finality proof of {}/{} for import", number, hash);
-		let res = self.finality_sender.unbounded_send(
-			worker_messages::Finality::ImportFinalityProof(who, hash, number, finality_proof),
-		);
-
-		if res.is_err() {
-			log::error!(
-				target: "sync",
-				"import_finality_proof: Background import task is no longer alive"
-			);
-		}
-	}
-
 	fn poll_actions(&mut self, cx: &mut Context, link: &mut dyn Link<B>) {
 		if self.result_port.poll_actions(cx, link).is_err() {
 			log::error!(target: "sync", "poll_actions: Background import task is no longer alive");
@@ -166,17 +143,12 @@ mod worker_messages {
 	use super::*;
 
 	pub struct ImportBlocks<B: BlockT>(pub BlockOrigin, pub Vec<IncomingBlock<B>>);
-
-	pub enum Finality<B: BlockT> {
-		ImportJustification(Origin, B::Hash, NumberFor<B>, Justification),
-		ImportFinalityProof(Origin, B::Hash, NumberFor<B>, Vec<u8>),
-	}
+	pub struct ImportJustification<B: BlockT>(pub Origin, pub B::Hash, pub NumberFor<B>, pub Justification);
 }
 
 struct BlockImportWorker<B: BlockT, Transaction> {
 	result_sender: BufferedLinkSender<B>,
 	justification_import: Option<BoxJustificationImport<B>>,
-	finality_proof_import: Option<BoxFinalityProofImport<B>>,
 	delay_between_blocks: Duration,
 	metrics: Option<Metrics>,
 	_phantom: PhantomData<Transaction>,
@@ -188,17 +160,16 @@ impl<B: BlockT, Transaction: Send> BlockImportWorker<B, Transaction> {
 		verifier: V,
 		block_import: BoxBlockImport<B, Transaction>,
 		justification_import: Option<BoxJustificationImport<B>>,
-		finality_proof_import: Option<BoxFinalityProofImport<B>>,
 		metrics: Option<Metrics>,
 	) -> (
 		impl Future<Output = ()> + Send,
-		TracingUnboundedSender<worker_messages::Finality<B>>,
+		TracingUnboundedSender<worker_messages::ImportJustification<B>>,
 		TracingUnboundedSender<worker_messages::ImportBlocks<B>>,
 	) {
 		use worker_messages::*;
 
-		let (finality_sender, mut finality_port) =
-			tracing_unbounded("mpsc_import_queue_worker_finality");
+		let (justification_sender, mut justification_port) =
+			tracing_unbounded("mpsc_import_queue_worker_justification");
 
 		let (block_import_sender, mut block_import_port) =
 			tracing_unbounded("mpsc_import_queue_worker_blocks");
@@ -206,23 +177,17 @@ impl<B: BlockT, Transaction: Send> BlockImportWorker<B, Transaction> {
 		let mut worker = BlockImportWorker {
 			result_sender,
 			justification_import,
-			finality_proof_import,
 			delay_between_blocks: Duration::new(0, 0),
 			metrics,
 			_phantom: PhantomData,
 		};
 
-		// Let's initialize `justification_import` and `finality_proof_import`.
+		// Let's initialize `justification_import`
 		if let Some(justification_import) = worker.justification_import.as_mut() {
 			for (hash, number) in justification_import.on_start() {
 				worker.result_sender.request_justification(&hash, number);
 			}
 		}
-		if let Some(finality_proof_import) = worker.finality_proof_import.as_mut() {
-			for (hash, number) in finality_proof_import.on_start() {
-				worker.result_sender.request_finality_proof(&hash, number);
-			}
-		}
 
 		// The future below has two possible states:
 		//
@@ -230,7 +195,7 @@ impl<B: BlockT, Transaction: Send> BlockImportWorker<B, Transaction> {
 		//   `Future`, and `block_import` is `None`.
 		// - Something else, in which case `block_import` is `Some` and `importing` is None.
 		//
-		// Additionally, the task will prioritize processing of finality work messages over
+		// Additionally, the task will prioritize processing of justification import messages over
 		// block import messages, hence why two distinct channels are used.
 		let mut block_import_verifier = Some((block_import, verifier));
 		let mut importing = None;
@@ -243,28 +208,15 @@ impl<B: BlockT, Transaction: Send> BlockImportWorker<B, Transaction> {
 					return Poll::Ready(())
 				}
 
-				// Grab the next finality action request sent to the import queue.
-				let finality_work = match Stream::poll_next(Pin::new(&mut finality_port), cx) {
-					Poll::Ready(Some(msg)) => Some(msg),
-					Poll::Ready(None) => return Poll::Ready(()),
-					Poll::Pending => None,
-				};
-
-				match finality_work {
-					Some(Finality::ImportFinalityProof(who, hash, number, proof)) => {
-						let (_, verif) = block_import_verifier
-							.as_mut()
-							.expect("block_import_verifier is always Some; qed");
-
-						worker.import_finality_proof(verif, who, hash, number, proof);
-						continue;
-					}
-					Some(Finality::ImportJustification(who, hash, number, justification)) => {
+				// Grab the next justification import request sent to the import queue.
+				match Stream::poll_next(Pin::new(&mut justification_port), cx) {
+					Poll::Ready(Some(ImportJustification(who, hash, number, justification))) => {
 						worker.import_justification(who, hash, number, justification);
 						continue;
-					}
-					None => {}
-				}
+					},
+					Poll::Ready(None) => return Poll::Ready(()),
+					Poll::Pending => {},
+				};
 
 				// If we are in the process of importing a bunch of blocks, let's resume this
 				// process before doing anything more.
@@ -299,7 +251,7 @@ impl<B: BlockT, Transaction: Send> BlockImportWorker<B, Transaction> {
 			}
 		});
 
-		(future, finality_sender, block_import_sender)
+		(future, justification_sender, block_import_sender)
 	}
 
 	/// Returns a `Future` that imports the given blocks and sends the results on
@@ -324,36 +276,6 @@ impl<B: BlockT, Transaction: Send> BlockImportWorker<B, Transaction> {
 			})
 	}
 
-	fn import_finality_proof<V: 'static + Verifier<B>>(
-		&mut self,
-		verifier: &mut V,
-		who: Origin,
-		hash: B::Hash,
-		number: NumberFor<B>,
-		finality_proof: Vec<u8>
-	) {
-		let started = wasm_timer::Instant::now();
-		let result = self.finality_proof_import.as_mut().map(|finality_proof_import| {
-			finality_proof_import.import_finality_proof(hash, number, finality_proof, verifier)
-				.map_err(|e| {
-					debug!(
-						"Finality proof import failed with {:?} for hash: {:?} number: {:?} coming from node: {:?}",
-						e,
-						hash,
-						number,
-						who,
-					);
-				})
-		}).unwrap_or(Err(()));
-
-		if let Some(metrics) = self.metrics.as_ref() {
-			metrics.finality_proof_import_time.observe(started.elapsed().as_secs_f64());
-		}
-
-		trace!(target: "sync", "Imported finality proof for {}/{}", number, hash);
-		self.result_sender.finality_proof_imported(who, (hash, number), result);
-	}
-
 	fn import_justification(
 		&mut self,
 		who: Origin,
@@ -596,7 +518,7 @@ mod tests {
 		let (result_sender, mut result_port) = buffered_link::buffered_link();
 
 		let (mut worker, mut finality_sender, mut block_import_sender) =
-			BlockImportWorker::new(result_sender, (), Box::new(()), Some(Box::new(())), None, None);
+			BlockImportWorker::new(result_sender, (), Box::new(()), Some(Box::new(())), None);
 
 		let mut import_block = |n| {
 			let header = Header {
@@ -629,7 +551,7 @@ mod tests {
 		let mut import_justification = || {
 			let hash = Hash::random();
 
-			block_on(finality_sender.send(worker_messages::Finality::ImportJustification(
+			block_on(finality_sender.send(worker_messages::ImportJustification(
 				libp2p::PeerId::random(),
 				hash,
 				1,
diff --git a/primitives/consensus/common/src/import_queue/buffered_link.rs b/primitives/consensus/common/src/import_queue/buffered_link.rs
index a37d4c53c260..db9bcc8f0ad6 100644
--- a/primitives/consensus/common/src/import_queue/buffered_link.rs
+++ b/primitives/consensus/common/src/import_queue/buffered_link.rs
@@ -81,8 +81,6 @@ enum BlockImportWorkerMsg<B: BlockT> {
 	BlocksProcessed(usize, usize, Vec<(Result<BlockImportResult<NumberFor<B>>, BlockImportError>, B::Hash)>),
 	JustificationImported(Origin, B::Hash, NumberFor<B>, bool),
 	RequestJustification(B::Hash, NumberFor<B>),
-	FinalityProofImported(Origin, (B::Hash, NumberFor<B>), Result<(B::Hash, NumberFor<B>), ()>),
-	RequestFinalityProof(B::Hash, NumberFor<B>),
 }
 
 impl<B: BlockT> Link<B> for BufferedLinkSender<B> {
@@ -109,20 +107,6 @@ impl<B: BlockT> Link<B> for BufferedLinkSender<B> {
 	fn request_justification(&mut self, hash: &B::Hash, number: NumberFor<B>) {
 		let _ = self.tx.unbounded_send(BlockImportWorkerMsg::RequestJustification(hash.clone(), number));
 	}
-
-	fn finality_proof_imported(
-		&mut self,
-		who: Origin,
-		request_block: (B::Hash, NumberFor<B>),
-		finalization_result: Result<(B::Hash, NumberFor<B>), ()>,
-	) {
-		let msg = BlockImportWorkerMsg::FinalityProofImported(who, request_block, finalization_result);
-		let _ = self.tx.unbounded_send(msg);
-	}
-
-	fn request_finality_proof(&mut self, hash: &B::Hash, number: NumberFor<B>) {
-		let _ = self.tx.unbounded_send(BlockImportWorkerMsg::RequestFinalityProof(hash.clone(), number));
-	}
 }
 
 /// See [`buffered_link`].
@@ -154,10 +138,6 @@ impl<B: BlockT> BufferedLinkReceiver<B> {
 					link.justification_imported(who, &hash, number, success),
 				BlockImportWorkerMsg::RequestJustification(hash, number) =>
 					link.request_justification(&hash, number),
-				BlockImportWorkerMsg::FinalityProofImported(who, block, result) =>
-					link.finality_proof_imported(who, block, result),
-				BlockImportWorkerMsg::RequestFinalityProof(hash, number) =>
-					link.request_finality_proof(&hash, number),
 			}
 		}
 	}
diff --git a/primitives/consensus/common/src/lib.rs b/primitives/consensus/common/src/lib.rs
index 988aa7a816c4..10fe8a2b3158 100644
--- a/primitives/consensus/common/src/lib.rs
+++ b/primitives/consensus/common/src/lib.rs
@@ -49,7 +49,7 @@ mod metrics;
 pub use self::error::Error;
 pub use block_import::{
 	BlockImport, BlockOrigin, ForkChoiceStrategy, ImportedAux, BlockImportParams, BlockCheckParams,
-	ImportResult, JustificationImport, FinalityProofImport,
+	ImportResult, JustificationImport,
 };
 pub use select_chain::SelectChain;
 pub use sp_state_machine::Backend as StateBackend;
diff --git a/primitives/consensus/common/src/metrics.rs b/primitives/consensus/common/src/metrics.rs
index a35b7c4968f7..6e6b582e1259 100644
--- a/primitives/consensus/common/src/metrics.rs
+++ b/primitives/consensus/common/src/metrics.rs
@@ -30,7 +30,6 @@ pub(crate) struct Metrics {
 	pub import_queue_processed: CounterVec<U64>,
 	pub block_verification_time: HistogramVec,
 	pub block_verification_and_import_time: Histogram,
-	pub finality_proof_import_time: Histogram,
 	pub justification_import_time: Histogram,
 }
 
@@ -63,15 +62,6 @@ impl Metrics {
 				)?,
 				registry,
 			)?,
-			finality_proof_import_time: register(
-				Histogram::with_opts(
-					HistogramOpts::new(
-						"finality_proof_import_time",
-						"Time taken to import finality proofs",
-					),
-				)?,
-				registry,
-			)?,
 			justification_import_time: register(
 				Histogram::with_opts(
 					HistogramOpts::new(

From 0840c58849bc84e7fd72627745bda243741adcd8 Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Mon, 23 Nov 2020 17:34:37 +0100
Subject: [PATCH 0096/1194] client/authority-discovery: Publish and query on
 exponential interval (#7545)

* client/authority-discovery: Publish and query on exponential interval

When a node starts up publishing and querying might fail due to various
reasons, for example due to being not yet fully bootstrapped on the DHT.
Thus one should retry rather sooner than later. On the other hand, a
long running node is likely well connected and thus timely retries are
not needed. For this reasoning use an exponentially increasing interval
for `publish_interval`, `query_interval` and
`priority_group_set_interval` instead of a constant interval.

* client/authority-discovery/src/interval.rs: Add license header

* .maintain/gitlab: Ensure adder collator tests are run on CI
---
 .../gitlab/check_polkadot_companion_build.sh  |  3 +
 client/authority-discovery/src/interval.rs    | 62 ++++++++++++++++
 client/authority-discovery/src/lib.rs         | 51 ++++++-------
 client/authority-discovery/src/worker.rs      | 73 ++++++++-----------
 .../authority-discovery/src/worker/tests.rs   | 60 ---------------
 client/network/src/discovery.rs               |  6 +-
 6 files changed, 119 insertions(+), 136 deletions(-)
 create mode 100644 client/authority-discovery/src/interval.rs

diff --git a/.maintain/gitlab/check_polkadot_companion_build.sh b/.maintain/gitlab/check_polkadot_companion_build.sh
index 73a5a36ff8af..4b6e45c267ef 100755
--- a/.maintain/gitlab/check_polkadot_companion_build.sh
+++ b/.maintain/gitlab/check_polkadot_companion_build.sh
@@ -92,3 +92,6 @@ cd polkadot
 # Test Polkadot pr or master branch with this Substrate commit.
 cargo update -p sp-io
 time cargo test --all --release --verbose --features=real-overseer
+
+cd parachain/test-parachains/adder/collator/
+time cargo test --release --verbose --locked --features=real-overseer
diff --git a/client/authority-discovery/src/interval.rs b/client/authority-discovery/src/interval.rs
new file mode 100644
index 000000000000..b3aa5b1c0f67
--- /dev/null
+++ b/client/authority-discovery/src/interval.rs
@@ -0,0 +1,62 @@
+// Copyright 2020 Parity Technologies (UK) Ltd.
+// This file is part of Substrate.
+
+// Substrate is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Substrate is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+
+use futures::stream::Stream;
+use futures::future::FutureExt;
+use futures::ready;
+use futures_timer::Delay;
+use std::pin::Pin;
+use std::task::{Context, Poll};
+use std::time::Duration;
+
+/// Exponentially increasing interval
+///
+/// Doubles interval duration on each tick until the configured maximum is reached.
+pub struct ExpIncInterval {
+	max: Duration,
+	next: Duration,
+	delay: Delay,
+}
+
+impl ExpIncInterval {
+	/// Create a new [`ExpIncInterval`].
+	pub fn new(start: Duration, max: Duration) -> Self {
+		let delay = Delay::new(start);
+		Self {
+			max,
+			next: start * 2,
+			delay,
+		}
+	}
+
+	/// Fast forward the exponentially increasing interval to the configured maximum.
+	pub fn set_to_max(&mut self) {
+		self.next = self.max;
+		self.delay = Delay::new(self.next);
+	}
+}
+
+impl Stream for ExpIncInterval {
+	type Item = ();
+
+	fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Option<Self::Item>> {
+		ready!(self.delay.poll_unpin(cx));
+		self.delay = Delay::new(self.next);
+		self.next = std::cmp::min(self.max, self.next * 2);
+
+		Poll::Ready(Some(()))
+	}
+}
diff --git a/client/authority-discovery/src/lib.rs b/client/authority-discovery/src/lib.rs
index 4ee57f31e04a..41aa01e56bde 100644
--- a/client/authority-discovery/src/lib.rs
+++ b/client/authority-discovery/src/lib.rs
@@ -38,50 +38,41 @@ use sp_runtime::traits::Block as BlockT;
 use sp_api::ProvideRuntimeApi;
 
 mod error;
+mod interval;
 mod service;
+mod worker;
+
 #[cfg(test)]
 mod tests;
-mod worker;
 
 /// Configuration of [`Worker`].
 pub struct WorkerConfig {
-	/// The interval in which the node will publish its own address on the DHT.
+	/// The maximum interval in which the node will publish its own address on the DHT.
 	///
-	/// By default this is set to 12 hours.
-	pub publish_interval: Duration,
-	/// The interval in which the node will query the DHT for new entries.
+	/// By default this is set to 1 hour.
+	pub max_publish_interval: Duration,
+	/// The maximum interval in which the node will query the DHT for new entries.
 	///
 	/// By default this is set to 10 minutes.
-	pub query_interval: Duration,
-	/// The time the node will wait before triggering the first DHT query or publish.
-	///
-	/// By default this is set to 30 seconds.
-	///
-	/// This default is based on the rough boostrap time required by libp2p Kademlia.
-	pub query_start_delay: Duration,
-	/// The interval in which the worker will instruct the peerset to connect to a random subset
-	/// of discovered validators.
-	///
-	/// By default this is set to 10 minutes.
-	pub priority_group_set_interval: Duration,
-	/// The time the worker will wait after each query interval tick to pass a subset of
-	/// the cached authority addresses down to the peerset.
-	///
-	/// Be aware that the actual delay will be computed by [`Self::query_start_delay`] +
-	/// [`Self::priority_group_set_start_delay`]
-	///
-	/// By default this is set to 5 minutes.
-	pub priority_group_set_offset: Duration,
+	pub max_query_interval: Duration,
 }
 
 impl Default for WorkerConfig {
 	fn default() -> Self {
 		Self {
-			publish_interval: Duration::from_secs(12 * 60 * 60),
-			query_interval: Duration::from_secs(10 * 60),
-			query_start_delay: Duration::from_secs(30),
-			priority_group_set_interval: Duration::from_secs(10 * 60),
-			priority_group_set_offset: Duration::from_secs(5 * 60),
+			// Kademlia's default time-to-live for Dht records is 36h, republishing records every
+			// 24h through libp2p-kad. Given that a node could restart at any point in time, one can
+			// not depend on the republishing process, thus publishing own external addresses should
+			// happen on an interval < 36h.
+			max_publish_interval: Duration::from_secs(1 * 60 * 60),
+			// External addresses of remote authorities can change at any given point in time. The
+			// interval on which to trigger new queries for the current and next authorities is a trade
+			// off between efficiency and performance.
+			//
+			// Querying 700 [`AuthorityId`]s takes ~8m on the Kusama DHT (16th Nov 2020) when
+			// comparing `authority_discovery_authority_addresses_requested_total` and
+			// `authority_discovery_dht_event_received`.
+			max_query_interval: Duration::from_secs(10 * 60),
 		}
 	}
 }
diff --git a/client/authority-discovery/src/worker.rs b/client/authority-discovery/src/worker.rs
index 42ae3a5213f0..c8e7a9f7aee3 100644
--- a/client/authority-discovery/src/worker.rs
+++ b/client/authority-discovery/src/worker.rs
@@ -14,17 +14,16 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::{error::{Error, Result}, ServicetoWorkerMsg};
+use crate::{error::{Error, Result}, interval::ExpIncInterval, ServicetoWorkerMsg};
 
 use std::collections::{HashMap, HashSet};
 use std::convert::TryInto;
 use std::marker::PhantomData;
 use std::sync::Arc;
-use std::time::{Duration, Instant};
+use std::time::Duration;
 
 use futures::channel::mpsc;
 use futures::{FutureExt, Stream, StreamExt, stream::Fuse};
-use futures_timer::Delay;
 
 use addr_cache::AddrCache;
 use async_trait::async_trait;
@@ -54,8 +53,6 @@ mod schema { include!(concat!(env!("OUT_DIR"), "/authority_discovery.rs")); }
 #[cfg(test)]
 pub mod tests;
 
-type Interval = Box<dyn Stream<Item = ()> + Unpin + Send + Sync>;
-
 const LOG_TARGET: &'static str = "sub-authority-discovery";
 
 /// Name of the Substrate peerset priority group for authorities discovered through the authority
@@ -113,12 +110,12 @@ pub struct Worker<Client, Network, Block, DhtEventStream> {
 	dht_event_rx: DhtEventStream,
 
 	/// Interval to be proactive, publishing own addresses.
-	publish_interval: Interval,
+	publish_interval: ExpIncInterval,
 	/// Interval at which to request addresses of authorities, refilling the pending lookups queue.
-	query_interval: Interval,
+	query_interval: ExpIncInterval,
 	/// Interval on which to set the peerset priority group to a new random
 	/// set of addresses.
-	priority_group_set_interval: Interval,
+	priority_group_set_interval: ExpIncInterval,
 
 	/// Queue of throttled lookups pending to be passed to the network.
 	pending_lookups: Vec<AuthorityId>,
@@ -153,31 +150,26 @@ where
 		prometheus_registry: Option<prometheus_endpoint::Registry>,
 		config: crate::WorkerConfig,
 	) -> Self {
-		// Kademlia's default time-to-live for Dht records is 36h, republishing
-		// records every 24h through libp2p-kad.
-		// Given that a node could restart at any point in time, one can not depend on the
-		// republishing process, thus publishing own external addresses should happen on an interval
-		// < 36h.
-		let publish_interval = interval_at(
-			Instant::now() + config.query_start_delay,
-			config.publish_interval,
+		// When a node starts up publishing and querying might fail due to various reasons, for
+		// example due to being not yet fully bootstrapped on the DHT. Thus one should retry rather
+		// sooner than later. On the other hand, a long running node is likely well connected and
+		// thus timely retries are not needed. For this reasoning use an exponentially increasing
+		// interval for `publish_interval`, `query_interval` and `priority_group_set_interval`
+		// instead of a constant interval.
+		let publish_interval = ExpIncInterval::new(
+			Duration::from_secs(2),
+			config.max_publish_interval,
 		);
-
-		// External addresses of remote authorities can change at any given point in time. The
-		// interval on which to trigger new queries for the current authorities is a trade off
-		// between efficiency and performance.
-		let query_interval_start = Instant::now() + config.query_start_delay;
-		let query_interval_duration = config.query_interval;
-		let query_interval = interval_at(query_interval_start, query_interval_duration);
-
-		// Querying 500 [`AuthorityId`]s takes ~1m on the Kusama DHT (10th of August 2020) when
-		// comparing `authority_discovery_authority_addresses_requested_total` and
-		// `authority_discovery_dht_event_received`. With that in mind set the peerset priority
-		// group on the same interval as the [`query_interval`] above,
-		// just delayed by 5 minutes by default.
-		let priority_group_set_interval = interval_at(
-			query_interval_start + config.priority_group_set_offset,
-			config.priority_group_set_interval,
+		let query_interval = ExpIncInterval::new(
+			Duration::from_secs(2),
+			config.max_query_interval,
+		);
+		let priority_group_set_interval = ExpIncInterval::new(
+			Duration::from_secs(2),
+			// Trade-off between node connection churn and connectivity. Using half of
+			// [`crate::WorkerConfig::max_query_interval`] to update priority group once at the
+			// beginning and once in the middle of each query interval.
+			config.max_query_interval / 2,
 		);
 
 		let addr_cache = AddrCache::new();
@@ -413,7 +405,7 @@ where
 				}
 
 				if log_enabled!(log::Level::Debug) {
-					let hashes = v.iter().map(|(hash, _value)| hash.clone());
+					let hashes: Vec<_> = v.iter().map(|(hash, _value)| hash.clone()).collect();
 					debug!(
 						target: LOG_TARGET,
 						"Value for hash '{:?}' found on Dht.", hashes,
@@ -449,6 +441,11 @@ where
 				}
 			},
 			DhtEvent::ValuePut(hash) => {
+				// Fast forward the exponentially increasing interval to the configured maximum. In
+				// case this was the first successful address publishing there is no need for a
+				// timely retry.
+				self.publish_interval.set_to_max();
+
 				if let Some(metrics) = &self.metrics {
 					metrics.dht_event_received.with_label_values(&["value_put"]).inc();
 				}
@@ -661,16 +658,6 @@ fn hash_authority_id(id: &[u8]) -> libp2p::kad::record::Key {
 	libp2p::kad::record::Key::new(&libp2p::multihash::Sha2_256::digest(id))
 }
 
-fn interval_at(start: Instant, duration: Duration) -> Interval {
-	let stream = futures::stream::unfold(start, move |next| {
-		let time_until_next =  next.saturating_duration_since(Instant::now());
-
-		Delay::new(time_until_next).map(move |_| Some(((), next + duration)))
-	});
-
-	Box::new(stream)
-}
-
 /// Prometheus metrics for a [`Worker`].
 #[derive(Clone)]
 pub(crate) struct Metrics {
diff --git a/client/authority-discovery/src/worker/tests.rs b/client/authority-discovery/src/worker/tests.rs
index 12adb8f23251..fee861dfeb0c 100644
--- a/client/authority-discovery/src/worker/tests.rs
+++ b/client/authority-discovery/src/worker/tests.rs
@@ -37,66 +37,6 @@ use substrate_test_runtime_client::runtime::Block;
 
 use super::*;
 
-#[test]
-fn interval_at_with_start_now() {
-	let start = Instant::now();
-
-	let mut interval = interval_at(
-		std::time::Instant::now(),
-		std::time::Duration::from_secs(10),
-	);
-
-	futures::executor::block_on(async {
-		interval.next().await;
-	});
-
-	assert!(
-		Instant::now().saturating_duration_since(start) < Duration::from_secs(1),
-		"Expected low resolution instant interval to fire within less than a second.",
-	);
-}
-
-#[test]
-fn interval_at_is_queuing_ticks() {
-	let start = Instant::now();
-
-	let interval = interval_at(start, std::time::Duration::from_millis(100));
-
-	// Let's wait for 200ms, thus 3 elements should be queued up (1st at 0ms, 2nd at 100ms, 3rd
-	// at 200ms).
-	std::thread::sleep(Duration::from_millis(200));
-
-	futures::executor::block_on(async {
-		interval.take(3).collect::<Vec<()>>().await;
-	});
-
-	// Make sure we did not wait for more than 300 ms, which would imply that `at_interval` is
-	// not queuing ticks.
-	assert!(
-		Instant::now().saturating_duration_since(start) < Duration::from_millis(300),
-		"Expect interval to /queue/ events when not polled for a while.",
-	);
-}
-
-#[test]
-fn interval_at_with_initial_delay() {
-	let start = Instant::now();
-
-	let mut interval = interval_at(
-		std::time::Instant::now() + Duration::from_millis(100),
-		std::time::Duration::from_secs(10),
-	);
-
-	futures::executor::block_on(async {
-		interval.next().await;
-	});
-
-	assert!(
-		Instant::now().saturating_duration_since(start) > Duration::from_millis(100),
-		"Expected interval with initial delay not to fire right away.",
-	);
-}
-
 #[derive(Clone)]
 pub(crate) struct TestApi {
 	pub(crate) authorities: Vec<AuthorityId>,
diff --git a/client/network/src/discovery.rs b/client/network/src/discovery.rs
index 60d35dbdf1ae..717aec01f754 100644
--- a/client/network/src/discovery.rs
+++ b/client/network/src/discovery.rs
@@ -693,7 +693,7 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 									DiscoveryOut::ValueNotFound(e.into_key(), stats.duration().unwrap_or_else(Default::default))
 								}
 								Err(e) => {
-									warn!(target: "sub-libp2p",
+									debug!(target: "sub-libp2p",
 										"Libp2p => Failed to get record: {:?}", e);
 									DiscoveryOut::ValueNotFound(e.into_key(), stats.duration().unwrap_or_else(Default::default))
 								}
@@ -704,7 +704,7 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 							let ev = match res {
 								Ok(ok) => DiscoveryOut::ValuePut(ok.key, stats.duration().unwrap_or_else(Default::default)),
 								Err(e) => {
-									warn!(target: "sub-libp2p",
+									debug!(target: "sub-libp2p",
 										"Libp2p => Failed to put record: {:?}", e);
 									DiscoveryOut::ValuePutFailed(e.into_key(), stats.duration().unwrap_or_else(Default::default))
 								}
@@ -716,7 +716,7 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 								Ok(ok) => debug!(target: "sub-libp2p",
 									"Libp2p => Record republished: {:?}",
 									ok.key),
-								Err(e) => warn!(target: "sub-libp2p",
+								Err(e) => debug!(target: "sub-libp2p",
 									"Libp2p => Republishing of record {:?} failed with: {:?}",
 									e.key(), e)
 							}

From d021078200021b1fcae1aa8434282edd9e6a8f4b Mon Sep 17 00:00:00 2001
From: Qinxuan Chen <koushiro.cqx@gmail.com>
Date: Tue, 24 Nov 2020 02:29:41 +0800
Subject: [PATCH 0097/1194] sc-network: update some dependencies (#7582)

Signed-off-by: koushiro <koushiro.cqx@gmail.com>
---
 Cargo.lock                                    | 48 ++++++-------------
 client/network/Cargo.toml                     |  8 ++--
 .../src/protocol/generic_proto/handler.rs     |  2 +-
 3 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 70d60f0d9f30..2925ad64d3c5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -571,12 +571,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "bs58"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "476e9cd489f9e121e02ffa6014a8ef220ecb15c05ed23fc34cca13925dc283fb"
-
 [[package]]
 name = "bs58"
 version = "0.4.0"
@@ -2930,7 +2924,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b8186060d6bd415e4e928e6cb44c4fe7e7a7dd53437bd936ce7e5f421e45a51"
 dependencies = [
  "asn1_der",
- "bs58 0.4.0",
+ "bs58",
  "ed25519-dalek",
  "either",
  "fnv",
@@ -2952,7 +2946,7 @@ dependencies = [
  "sha2 0.9.2",
  "smallvec 1.5.0",
  "thiserror",
- "unsigned-varint 0.5.1",
+ "unsigned-varint",
  "void",
  "zeroize",
 ]
@@ -3029,7 +3023,7 @@ dependencies = [
  "rand 0.7.3",
  "sha2 0.9.2",
  "smallvec 1.5.0",
- "unsigned-varint 0.5.1",
+ "unsigned-varint",
  "wasm-timer",
 ]
 
@@ -3071,7 +3065,7 @@ dependencies = [
  "sha2 0.9.2",
  "smallvec 1.5.0",
  "uint",
- "unsigned-varint 0.5.1",
+ "unsigned-varint",
  "void",
  "wasm-timer",
 ]
@@ -3113,7 +3107,7 @@ dependencies = [
  "parking_lot 0.11.1",
  "rand 0.7.3",
  "smallvec 1.5.0",
- "unsigned-varint 0.5.1",
+ "unsigned-varint",
 ]
 
 [[package]]
@@ -3166,7 +3160,7 @@ dependencies = [
  "log",
  "prost",
  "prost-build",
- "unsigned-varint 0.5.1",
+ "unsigned-varint",
  "void",
 ]
 
@@ -3200,7 +3194,7 @@ dependencies = [
  "minicbor",
  "rand 0.7.3",
  "smallvec 1.5.0",
- "unsigned-varint 0.5.1",
+ "unsigned-varint",
  "wasm-timer",
 ]
 
@@ -3665,7 +3659,7 @@ dependencies = [
  "sha-1 0.9.2",
  "sha2 0.9.2",
  "sha3",
- "unsigned-varint 0.5.1",
+ "unsigned-varint",
 ]
 
 [[package]]
@@ -3685,7 +3679,7 @@ dependencies = [
  "log",
  "pin-project 1.0.2",
  "smallvec 1.5.0",
- "unsigned-varint 0.5.1",
+ "unsigned-varint",
 ]
 
 [[package]]
@@ -5201,14 +5195,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43244a26dc1ddd3097216bb12eaa6cf8a07b060c72718d9ebd60fd297d6401df"
 dependencies = [
  "arrayref",
- "bs58 0.4.0",
+ "bs58",
  "byteorder",
  "data-encoding",
  "multihash",
  "percent-encoding 2.1.0",
  "serde",
  "static_assertions",
- "unsigned-varint 0.5.1",
+ "unsigned-varint",
  "url 2.2.0",
 ]
 
@@ -7091,7 +7085,7 @@ dependencies = [
  "async-std",
  "async-trait",
  "bitflags",
- "bs58 0.3.1",
+ "bs58",
  "bytes 0.5.6",
  "derive_more",
  "either",
@@ -7110,7 +7104,7 @@ dependencies = [
  "lru 0.6.1",
  "nohash-hasher",
  "parity-scale-codec",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "pin-project 0.4.27",
  "prost",
  "prost-build",
@@ -7123,7 +7117,7 @@ dependencies = [
  "serde_json",
  "slog",
  "slog_derive",
- "smallvec 0.6.13",
+ "smallvec 1.5.0",
  "sp-arithmetic",
  "sp-blockchain",
  "sp-consensus",
@@ -7138,7 +7132,7 @@ dependencies = [
  "substrate-test-runtime-client",
  "tempfile",
  "thiserror",
- "unsigned-varint 0.4.0",
+ "unsigned-varint",
  "void",
  "wasm-timer",
  "zeroize",
@@ -9815,18 +9809,6 @@ dependencies = [
  "subtle 2.3.0",
 ]
 
-[[package]]
-name = "unsigned-varint"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "669d776983b692a906c881fcd0cfb34271a48e197e4d6cb8df32b05bfc3d3fa5"
-dependencies = [
- "bytes 0.5.6",
- "futures-io",
- "futures-util",
- "futures_codec",
-]
-
 [[package]]
 name = "unsigned-varint"
 version = "0.5.1"
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index 80353183ec9f..dac2cb22c4f3 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -20,7 +20,7 @@ prost-build = "0.6.1"
 async-trait = "0.1"
 async-std = "1.6.5"
 bitflags = "1.2.0"
-bs58 = "0.3.1"
+bs58 = "0.4.0"
 bytes = "0.5.0"
 codec = { package = "parity-scale-codec", version = "1.3.4", features = ["derive"] }
 derive_more = "0.99.2"
@@ -38,7 +38,7 @@ linked_hash_set = "0.1.3"
 log = "0.4.8"
 lru = "0.6.1"
 nohash-hasher = "0.2.0"
-parking_lot = "0.10.0"
+parking_lot = "0.11.1"
 pin-project = "0.4.6"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.8.0", path = "../../utils/prometheus" }
 prost = "0.6.1"
@@ -50,7 +50,7 @@ serde = { version = "1.0.101", features = ["derive"] }
 serde_json = "1.0.41"
 slog = { version = "2.5.2", features = ["nested-values"] }
 slog_derive = "0.2.0"
-smallvec = "0.6.10"
+smallvec = "1.5.0"
 sp-arithmetic = { version = "2.0.0", path = "../../primitives/arithmetic" }
 sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
 sp-consensus = { version = "0.8.0", path = "../../primitives/consensus/common" }
@@ -58,7 +58,7 @@ sp-core = { version = "2.0.0", path = "../../primitives/core" }
 sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
 sp-utils = { version = "2.0.0", path = "../../primitives/utils" }
 thiserror = "1"
-unsigned-varint = { version = "0.4.0", features = ["futures", "futures-codec"] }
+unsigned-varint = { version = "0.5.0", features = ["futures", "futures-codec"] }
 void = "1.0.2"
 wasm-timer = "0.2"
 zeroize = "1.0.0"
diff --git a/client/network/src/protocol/generic_proto/handler.rs b/client/network/src/protocol/generic_proto/handler.rs
index 0272261f67d5..c8a76c1cc9a4 100644
--- a/client/network/src/protocol/generic_proto/handler.rs
+++ b/client/network/src/protocol/generic_proto/handler.rs
@@ -715,7 +715,7 @@ impl ProtocolsHandler for NotifsHandler {
 			},
 
 			NotifsHandlerIn::Close => {
-				for mut substream in self.legacy_substreams.drain() {
+				for mut substream in self.legacy_substreams.drain(..) {
 					substream.shutdown();
 					self.legacy_shutdown.push(substream);
 				}

From 3558103e2e80259ab0e8c136ec23687647cb32f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Mon, 23 Nov 2020 19:43:54 +0100
Subject: [PATCH 0098/1194] Bump linregress and do some other cleanups (#7580)

---
 Cargo.lock                    | 76 +++++++++++++++++++----------------
 Cargo.toml                    |  2 -
 frame/benchmarking/Cargo.toml |  3 +-
 3 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2925ad64d3c5..42a26e504121 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -109,17 +109,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "alga"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f823d037a7ec6ea2197046bafd4ae150e6bc36f9ca347404f46a46823fa84f2"
-dependencies = [
- "approx",
- "num-complex",
- "num-traits",
-]
-
 [[package]]
 name = "ansi_term"
 version = "0.11.0"
@@ -2032,6 +2021,15 @@ dependencies = [
  "typenum",
 ]
 
+[[package]]
+name = "generic-array"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ed1e761351b56f54eb9dcd0cfaca9fd0daecf93918e1cfc01c8a3d26ee7adcd"
+dependencies = [
+ "typenum",
+]
+
 [[package]]
 name = "generic-array"
 version = "0.14.4"
@@ -3345,11 +3343,10 @@ dependencies = [
 
 [[package]]
 name = "linregress"
-version = "0.1.7"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9290cf6f928576eeb9c096c6fad9d8d452a0a1a70a2bbffa6e36064eedc0aac9"
+checksum = "0d0ad4b5cc8385a881c561fac3501353d63d2a2b7a357b5064d71815c9a92724"
 dependencies = [
- "failure",
  "nalgebra",
  "statrs",
 ]
@@ -3684,18 +3681,19 @@ dependencies = [
 
 [[package]]
 name = "nalgebra"
-version = "0.18.1"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaa9fddbc34c8c35dd2108515587b8ce0cab396f17977b8c738568e4edb521a2"
+checksum = "d6b6147c3d50b4f3cdabfe2ecc94a0191fd3d6ad58aefd9664cf396285883486"
 dependencies = [
- "alga",
  "approx",
- "generic-array 0.12.3",
+ "generic-array 0.13.2",
  "matrixmultiply",
  "num-complex",
  "num-rational",
  "num-traits",
- "rand 0.6.5",
+ "rand 0.7.3",
+ "rand_distr",
+ "simba",
  "typenum",
 ]
 
@@ -5900,19 +5898,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "rand"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
-dependencies = [
- "cloudabi 0.0.3",
- "fuchsia-cprng",
- "libc",
- "rand_core 0.3.1",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "rand"
 version = "0.6.5"
@@ -5990,6 +5975,15 @@ dependencies = [
  "getrandom 0.1.15",
 ]
 
+[[package]]
+name = "rand_distr"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96977acbdd3a6576fb1d27391900035bf3863d4a16422973a409b488cf29ffb2"
+dependencies = [
+ "rand 0.7.3",
+]
+
 [[package]]
 name = "rand_hc"
 version = "0.1.0"
@@ -7834,6 +7828,18 @@ version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "29f060a7d147e33490ec10da418795238fd7545bba241504d6b31a409f2e6210"
 
+[[package]]
+name = "simba"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb931b1367faadea6b1ab1c306a860ec17aaa5fa39f367d0c744e69d971a1fb2"
+dependencies = [
+ "approx",
+ "num-complex",
+ "num-traits",
+ "paste 0.1.18",
+]
+
 [[package]]
 name = "slab"
 version = "0.4.2"
@@ -8721,11 +8727,11 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "statrs"
-version = "0.10.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10102ac8d55e35db2b3fafc26f81ba8647da2e15879ab686a67e6d19af2685e8"
+checksum = "cce16f6de653e88beca7bd13780d08e09d4489dbca1f9210e041bc4852481382"
 dependencies = [
- "rand 0.5.6",
+ "rand 0.7.3",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 71bf56f9b0fb..df66cab5414b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -218,8 +218,6 @@ crossbeam-queue = { opt-level = 3 }
 crypto-mac = { opt-level = 3 }
 curve25519-dalek = { opt-level = 3 }
 ed25519-dalek = { opt-level = 3 }
-evm-core = { opt-level = 3 }
-evm-runtime = { opt-level = 3 }
 flate2 = { opt-level = 3 }
 futures-channel = { opt-level = 3 }
 hashbrown = { opt-level = 3 }
diff --git a/frame/benchmarking/Cargo.toml b/frame/benchmarking/Cargo.toml
index 924ffc8627ab..acd29e468243 100644
--- a/frame/benchmarking/Cargo.toml
+++ b/frame/benchmarking/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-linregress = "0.1"
+linregress = { version = "0.4.0", optional = true }
 paste = "0.1"
 codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false }
 sp-api = { version = "2.0.0", path = "../../primitives/api", default-features = false }
@@ -38,4 +38,5 @@ std = [
 	"sp-std/std",
 	"frame-support/std",
 	"frame-system/std",
+	"linregress",
 ]

From 7e94f01af67c498605eb0206b7fca261f12a278c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 24 Nov 2020 10:18:36 +0100
Subject: [PATCH 0099/1194] Wasm-builder 3.0 (#7532)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Build every wasm crate in its own project with wasm-builder

Building all wasm crates in one workspace was a nice idea, however it
just introduced problems:

1. We needed to prune old members, but this didn't worked for old git
deps.
2. We locked the whole wasm workspace while building one crate. This
could lead to infinitely locking the workspace on a crash.

Now we just build every crate in its own project, this means we will
build the dependencies multiple times. While building the dependencies
multiple times, we still decrease the build time by around 30 seconds
for Polkadot and Substrate because of the new parallelism ;)

* Remove the requirement on wasm-builder-runner

This removes the requirement on wasm-builder-runner by using the new
`build_dep` feature of cargo. We use nightly anyway and that enables us
to use this feature. This solves the problem of not mixing
build/proc-macro deps with normal deps. By doing this we get rid off
this complicated project structure and can depend directly on
`wasm-builder`. This also removes all the code from wasm-builder-runner
and mentions that it is deprecated.

* Copy the `Cargo.lock` to the correct folder

* Remove wasm-builder-runner

* Update docs

* Fix deterministic check

Modified-by: Bastian Köcher <git@kchr.de>

* Try to make the ui test happy

* Switch to `SKIP_WASM_BUILD`

* Rename `SKIP_WASM_BINARY` to the correct name...

* Update utils/wasm-builder/src/builder.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Update utils/wasm-builder/src/builder.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
---
 .gitlab-ci.yml                                |  12 +-
 Cargo.lock                                    |  59 ++-
 Cargo.toml                                    |   1 -
 bin/node-template/runtime/Cargo.toml          |   2 +-
 bin/node-template/runtime/build.rs            |   3 +-
 bin/node/runtime/Cargo.toml                   |   2 +-
 bin/node/runtime/build.rs                     |   3 +-
 bin/node/runtime/src/lib.rs                   |   4 +-
 client/executor/runtime-test/Cargo.toml       |   2 +-
 client/executor/runtime-test/build.rs         |   6 +-
 client/executor/runtime-test/src/lib.rs       |   2 +-
 docs/README.adoc                              |  22 -
 .../test/tests/construct_runtime_ui.rs        |   2 +-
 frame/support/test/tests/decl_module_ui.rs    |   2 +-
 frame/support/test/tests/decl_storage_ui.rs   |   2 +-
 .../support/test/tests/derive_no_bound_ui.rs  |   2 +-
 frame/support/test/tests/reserved_keyword.rs  |   2 +-
 primitives/api/test/tests/trybuild.rs         |   2 +-
 .../test-wasm-deprecated/Cargo.toml           |   2 +-
 .../test-wasm-deprecated/build.rs             |   3 +-
 .../test-wasm-deprecated/src/lib.rs           |   2 +-
 .../runtime-interface/test-wasm/Cargo.toml    |   2 +-
 .../runtime-interface/test-wasm/build.rs      |   3 +-
 .../runtime-interface/test-wasm/src/lib.rs    |   2 +-
 primitives/runtime-interface/tests/ui.rs      |   2 +-
 test-utils/runtime/Cargo.toml                 |   2 +-
 test-utils/runtime/build.rs                   |   3 +-
 test-utils/runtime/src/lib.rs                 |   2 +-
 utils/wasm-builder-runner/Cargo.toml          |  15 -
 utils/wasm-builder-runner/README.md           |  12 -
 utils/wasm-builder-runner/src/lib.rs          | 498 ------------------
 utils/wasm-builder/Cargo.toml                 |   6 +-
 utils/wasm-builder/README.md                  |  40 +-
 utils/wasm-builder/src/builder.rs             | 245 +++++++++
 utils/wasm-builder/src/lib.rs                 | 132 ++---
 utils/wasm-builder/src/wasm_project.rs        | 228 +++-----
 36 files changed, 443 insertions(+), 886 deletions(-)
 delete mode 100644 utils/wasm-builder-runner/Cargo.toml
 delete mode 100644 utils/wasm-builder-runner/README.md
 delete mode 100644 utils/wasm-builder-runner/src/lib.rs
 create mode 100644 utils/wasm-builder/src/builder.rs

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cbb56fcf7267..b37d60a941d4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -197,7 +197,7 @@ cargo-check-benches:
   <<:                              *docker-env
   <<:                              *test-refs
   script:
-    - BUILD_DUMMY_WASM_BINARY=1 time cargo +nightly check --benches --all
+    - SKIP_WASM_BUILD=1 time cargo +nightly check --benches --all
     - cargo run --release -p node-bench -- ::node::import::native::sr25519::transfer_keep_alive::paritydb::small
     - cargo run --release -p node-bench -- ::trie::read::small
     - sccache -s
@@ -208,7 +208,7 @@ cargo-check-subkey:
   <<:                              *test-refs
   script:
     - cd ./bin/utils/subkey
-    - BUILD_DUMMY_WASM_BINARY=1 time cargo check --release
+    - SKIP_WASM_BUILD=1 time cargo check --release
     - sccache -s
 
 test-deterministic-wasm:
@@ -222,7 +222,7 @@ test-deterministic-wasm:
     # build runtime
     - cargo build --verbose --release -p node-runtime
     # make checksum
-    - sha256sum target/release/wbuild/target/wasm32-unknown-unknown/release/node_runtime.wasm > checksum.sha256
+    - sha256sum target/release/wbuild/node-runtime/target/wasm32-unknown-unknown/release/node_runtime.wasm > checksum.sha256
     # clean up – FIXME: can we reuse some of the artifacts?
     - cargo clean
     # build again
@@ -343,7 +343,7 @@ cargo-check-macos:
   <<:                              *docker-env
   <<:                              *test-refs
   script:
-    - BUILD_DUMMY_WASM_BINARY=1 time cargo check --release
+    - SKIP_WASM_BUILD=1 time cargo check --release
     - sccache -s
   tags:
     - osx
@@ -451,7 +451,7 @@ build-linux-subkey:                &build-subkey
     - mkdir -p ./artifacts/subkey
   script:
     - cd ./bin/utils/subkey
-    - BUILD_DUMMY_WASM_BINARY=1 time cargo build --release --verbose
+    - SKIP_WASM_BUILD=1 time cargo build --release --verbose
     - cd -
     - mv ./target/release/subkey ./artifacts/subkey/.
     - echo -n "Subkey version = "
@@ -483,7 +483,7 @@ build-rust-doc:
     - ./crate-docs/
   script:
     - rm -f ./crate-docs/index.html # use it as an indicator if the job succeeds
-    - BUILD_DUMMY_WASM_BINARY=1 RUSTDOCFLAGS="--html-in-header $(pwd)/.maintain/rustdoc-header.html"
+    - SKIP_WASM_BUILD=1 RUSTDOCFLAGS="--html-in-header $(pwd)/.maintain/rustdoc-header.html"
         time cargo +nightly doc --no-deps --workspace --all-features --verbose
     - mv ./target/doc ./crate-docs
     - echo "<meta http-equiv=refresh content=0;url=sc_service/index.html>" > ./crate-docs/index.html
diff --git a/Cargo.lock b/Cargo.lock
index 42a26e504121..57ab273804c0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -636,13 +636,12 @@ checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"
 
 [[package]]
 name = "cargo_metadata"
-version = "0.10.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8de60b887edf6d74370fc8eb177040da4847d971d6234c7b13a6da324ef0caf"
+checksum = "d5a5f7b42f606b7f23674f6f4d877628350682bc40687d3fae65679a58d55345"
 dependencies = [
- "semver 0.9.0",
+ "semver 0.11.0",
  "serde",
- "serde_derive",
  "serde_json",
 ]
 
@@ -1783,16 +1782,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "fs2"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
-dependencies = [
- "libc",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "fs_extra"
 version = "1.2.0"
@@ -4043,7 +4032,7 @@ dependencies = [
  "sp-transaction-pool",
  "sp-version",
  "static_assertions",
- "substrate-wasm-builder-runner",
+ "substrate-wasm-builder",
 ]
 
 [[package]]
@@ -4114,7 +4103,7 @@ dependencies = [
  "sp-std",
  "sp-transaction-pool",
  "sp-version",
- "substrate-wasm-builder-runner",
+ "substrate-wasm-builder",
 ]
 
 [[package]]
@@ -7321,7 +7310,7 @@ dependencies = [
  "sp-sandbox",
  "sp-std",
  "sp-tasks",
- "substrate-wasm-builder-runner",
+ "substrate-wasm-builder",
 ]
 
 [[package]]
@@ -7663,7 +7652,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a3186ec9e65071a2095434b1f5bb24838d4e8e130f584c790f6033c79943537"
 dependencies = [
- "semver-parser",
+ "semver-parser 0.7.0",
 ]
 
 [[package]]
@@ -7672,7 +7661,16 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
 dependencies = [
- "semver-parser",
+ "semver-parser 0.7.0",
+]
+
+[[package]]
+name = "semver"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
+dependencies = [
+ "semver-parser 0.10.1",
  "serde",
 ]
 
@@ -7682,6 +7680,15 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
+[[package]]
+name = "semver-parser"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42ef146c2ad5e5f4b037cd6ce2ebb775401729b19a82040c1beac9d36c7d1428"
+dependencies = [
+ "pest",
+]
+
 [[package]]
 name = "send_wrapper"
 version = "0.3.0"
@@ -8496,7 +8503,7 @@ dependencies = [
  "sp-io",
  "sp-runtime-interface",
  "sp-std",
- "substrate-wasm-builder-runner",
+ "substrate-wasm-builder",
 ]
 
 [[package]]
@@ -8507,7 +8514,7 @@ dependencies = [
  "sp-io",
  "sp-runtime-interface",
  "sp-std",
- "substrate-wasm-builder-runner",
+ "substrate-wasm-builder",
 ]
 
 [[package]]
@@ -8993,7 +9000,7 @@ dependencies = [
  "sp-trie",
  "sp-version",
  "substrate-test-runtime-client",
- "substrate-wasm-builder-runner",
+ "substrate-wasm-builder",
  "trie-db",
 ]
 
@@ -9063,24 +9070,18 @@ dependencies = [
 
 [[package]]
 name = "substrate-wasm-builder"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
  "build-helper",
  "cargo_metadata",
- "fs2",
- "itertools 0.8.2",
  "tempfile",
  "toml",
  "walkdir",
  "wasm-gc-api",
 ]
 
-[[package]]
-name = "substrate-wasm-builder-runner"
-version = "2.0.0"
-
 [[package]]
 name = "subtle"
 version = "1.0.0"
diff --git a/Cargo.toml b/Cargo.toml
index df66cab5414b..2e3cff821e02 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -59,7 +59,6 @@ members = [
 	"client/transaction-pool",
 	"client/transaction-pool/graph",
 	"utils/prometheus",
-	"utils/wasm-builder-runner",
 	"frame/assets",
 	"frame/aura",
 	"frame/atomic-swap",
diff --git a/bin/node-template/runtime/Cargo.toml b/bin/node-template/runtime/Cargo.toml
index ed5a114b813f..f1b15070ddde 100644
--- a/bin/node-template/runtime/Cargo.toml
+++ b/bin/node-template/runtime/Cargo.toml
@@ -48,7 +48,7 @@ hex-literal = { version = "0.3.1", optional = true }
 template = { version = "2.0.0", default-features = false, path = "../pallets/template", package = "pallet-template" }
 
 [build-dependencies]
-wasm-builder-runner = { version = "2.0.0", package = "substrate-wasm-builder-runner", path = "../../../utils/wasm-builder-runner" }
+substrate-wasm-builder = { version = "3.0.0", path = "../../../utils/wasm-builder" }
 
 [features]
 default = ["std"]
diff --git a/bin/node-template/runtime/build.rs b/bin/node-template/runtime/build.rs
index 9654139121f6..9b53d2457dff 100644
--- a/bin/node-template/runtime/build.rs
+++ b/bin/node-template/runtime/build.rs
@@ -1,9 +1,8 @@
-use wasm_builder_runner::WasmBuilder;
+use substrate_wasm_builder::WasmBuilder;
 
 fn main() {
 	WasmBuilder::new()
 		.with_current_project()
-		.with_wasm_builder_from_crates("2.0.1")
 		.export_heap_base()
 		.import_memory()
 		.build()
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index 2bad2db510be..eabc9f61c62e 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -79,7 +79,7 @@ pallet-transaction-payment-rpc-runtime-api = { version = "2.0.0", default-featur
 pallet-vesting = { version = "2.0.0", default-features = false, path = "../../../frame/vesting" }
 
 [build-dependencies]
-wasm-builder-runner = { version = "2.0.0", package = "substrate-wasm-builder-runner", path = "../../../utils/wasm-builder-runner" }
+substrate-wasm-builder = { version = "3.0.0", path = "../../../utils/wasm-builder" }
 
 [dev-dependencies]
 sp-io = { version = "2.0.0", path = "../../../primitives/io" }
diff --git a/bin/node/runtime/build.rs b/bin/node/runtime/build.rs
index 4f111bc99300..8a0b4d7a0c15 100644
--- a/bin/node/runtime/build.rs
+++ b/bin/node/runtime/build.rs
@@ -15,12 +15,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use wasm_builder_runner::WasmBuilder;
+use substrate_wasm_builder::WasmBuilder;
 
 fn main() {
 	WasmBuilder::new()
 		.with_current_project()
-		.with_wasm_builder_from_crates_or_path("2.0.1", "../../../utils/wasm-builder")
 		.export_heap_base()
 		.import_memory()
 		.build()
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 3e08b2cf8a6f..958d2fe19e03 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -91,11 +91,11 @@ use sp_runtime::generic::Era;
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
+/// Wasm binary unwrapped. If built with `SKIP_WASM_BUILD`, the function panics.
 #[cfg(feature = "std")]
-/// Wasm binary unwrapped. If built with `BUILD_DUMMY_WASM_BINARY`, the function panics.
 pub fn wasm_binary_unwrap() -> &'static [u8] {
 	WASM_BINARY.expect("Development wasm binary is not available. This means the client is \
-						built with `BUILD_DUMMY_WASM_BINARY` flag and it is only usable for \
+						built with `SKIP_WASM_BUILD` flag and it is only usable for \
 						production chains. Please rebuild with the flag disabled.")
 }
 
diff --git a/client/executor/runtime-test/Cargo.toml b/client/executor/runtime-test/Cargo.toml
index ba23e31febee..1a898b92ca9a 100644
--- a/client/executor/runtime-test/Cargo.toml
+++ b/client/executor/runtime-test/Cargo.toml
@@ -22,7 +22,7 @@ sp-std = { version = "2.0.0", default-features = false, path = "../../../primiti
 sp-tasks = { version = "2.0.0", default-features = false, path = "../../../primitives/tasks" }
 
 [build-dependencies]
-wasm-builder-runner = { version = "2.0.0", package = "substrate-wasm-builder-runner", path = "../../../utils/wasm-builder-runner" }
+substrate-wasm-builder = { version = "3.0.0", path = "../../../utils/wasm-builder" }
 
 [features]
 default = [ "std" ]
diff --git a/client/executor/runtime-test/build.rs b/client/executor/runtime-test/build.rs
index bc07db900c31..a83de21db7f0 100644
--- a/client/executor/runtime-test/build.rs
+++ b/client/executor/runtime-test/build.rs
@@ -14,13 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
-use wasm_builder_runner::WasmBuilder;
+use substrate_wasm_builder::WasmBuilder;
 
 fn main() {
 	// regular build
 	WasmBuilder::new()
 		.with_current_project()
-		.with_wasm_builder_from_crates_or_path("2.0.1", "../../../utils/wasm-builder")
 		.export_heap_base()
 		.import_memory()
 		.build();
@@ -28,10 +27,9 @@ fn main() {
 	// and building with tracing activated
 	WasmBuilder::new()
 		.with_current_project()
-		.with_wasm_builder_from_crates_or_path("2.0.1", "../../../utils/wasm-builder")
 		.export_heap_base()
 		.import_memory()
 		.set_file_name("wasm_binary_with_tracing.rs")
-		.append_to_rust_flags("--cfg feature=\\\"with-tracing\\\"")
+		.append_to_rust_flags(r#"--cfg feature="with-tracing""#)
 		.build();
 }
diff --git a/client/executor/runtime-test/src/lib.rs b/client/executor/runtime-test/src/lib.rs
index 404530c1c3eb..f4cef65b629a 100644
--- a/client/executor/runtime-test/src/lib.rs
+++ b/client/executor/runtime-test/src/lib.rs
@@ -4,8 +4,8 @@
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
+/// Wasm binary unwrapped. If built with `SKIP_WASM_BUILD`, the function panics.
 #[cfg(feature = "std")]
-/// Wasm binary unwrapped. If built with `BUILD_DUMMY_WASM_BINARY`, the function panics.
 pub fn wasm_binary_unwrap() -> &'static [u8] {
 	WASM_BINARY.expect("Development wasm binary is not available. Testing is only \
 						supported with the flag disabled.")
diff --git a/docs/README.adoc b/docs/README.adoc
index 7f3d50faac7d..71052420b1aa 100644
--- a/docs/README.adoc
+++ b/docs/README.adoc
@@ -308,28 +308,6 @@ cargo run --release \-- \
 
 Additional Substrate CLI usage options are available and may be shown by running `cargo run \-- --help`.
 
-=== WASM binaries
-
-The WASM binaries are built during the normal `cargo build` process. To control the WASM binary building,
-we support multiple environment variables:
-
-* `SKIP_WASM_BUILD` - Skips building any WASM binary. This is useful when only native should be recompiled.
-* `BUILD_DUMMY_WASM_BINARY` - Builds dummy WASM binaries. These dummy binaries are empty and useful
-                              for `cargo check` runs.
-* `WASM_BUILD_TYPE` - Sets the build type for building WASM binaries. Supported values are `release` or `debug`.
-                      By default the build type is equal to the build type used by the main build.
-* `FORCE_WASM_BUILD` - Can be set to force a WASM build. On subsequent calls the value of the variable
-                       needs to change. As WASM builder instructs `cargo` to watch for file changes
-                       this environment variable should only be required in certain circumstances.
-* `WASM_TARGET_DIRECTORY` - Will copy release build WASM binary to the given directory. The path needs
-                            to be absolute.
-* `WASM_BUILD_RUSTFLAGS` - Extend `RUSTFLAGS` given to `cargo build` while building the wasm binary.
-* `WASM_BUILD_NO_COLOR` - Disable color output of the wasm build.
-
-Each project can be skipped individually by using the environment variable `SKIP_PROJECT_NAME_WASM_BUILD`.
-Where `PROJECT_NAME` needs to be replaced by the name of the cargo project, e.g. `node-runtime` will
-be `NODE_RUNTIME`.
-
 [[flaming-fir]]
 === Joining the Flaming Fir Testnet
 
diff --git a/frame/support/test/tests/construct_runtime_ui.rs b/frame/support/test/tests/construct_runtime_ui.rs
index e1624c76830a..83a90c96dd62 100644
--- a/frame/support/test/tests/construct_runtime_ui.rs
+++ b/frame/support/test/tests/construct_runtime_ui.rs
@@ -21,7 +21,7 @@ use std::env;
 #[test]
 fn ui() {
 	// As trybuild is using `cargo check`, we don't need the real WASM binaries.
-	env::set_var("BUILD_DUMMY_WASM_BINARY", "1");
+	env::set_var("SKIP_WASM_BUILD", "1");
 
 	let t = trybuild::TestCases::new();
 	t.compile_fail("tests/construct_runtime_ui/*.rs");
diff --git a/frame/support/test/tests/decl_module_ui.rs b/frame/support/test/tests/decl_module_ui.rs
index 7df64bc52f41..22237d904aea 100644
--- a/frame/support/test/tests/decl_module_ui.rs
+++ b/frame/support/test/tests/decl_module_ui.rs
@@ -19,7 +19,7 @@
 #[test]
 fn decl_module_ui() {
 	// As trybuild is using `cargo check`, we don't need the real WASM binaries.
-	std::env::set_var("BUILD_DUMMY_WASM_BINARY", "1");
+	std::env::set_var("SKIP_WASM_BUILD", "1");
 
 	let t = trybuild::TestCases::new();
 	t.compile_fail("tests/decl_module_ui/*.rs");
diff --git a/frame/support/test/tests/decl_storage_ui.rs b/frame/support/test/tests/decl_storage_ui.rs
index 56529d62c28f..4b082cb8172a 100644
--- a/frame/support/test/tests/decl_storage_ui.rs
+++ b/frame/support/test/tests/decl_storage_ui.rs
@@ -19,7 +19,7 @@
 #[test]
 fn decl_storage_ui() {
 	// As trybuild is using `cargo check`, we don't need the real WASM binaries.
-	std::env::set_var("BUILD_DUMMY_WASM_BINARY", "1");
+	std::env::set_var("SKIP_WASM_BUILD", "1");
 
 	let t = trybuild::TestCases::new();
 	t.compile_fail("tests/decl_storage_ui/*.rs");
diff --git a/frame/support/test/tests/derive_no_bound_ui.rs b/frame/support/test/tests/derive_no_bound_ui.rs
index da276018f7f8..ba8fff1f3a5c 100644
--- a/frame/support/test/tests/derive_no_bound_ui.rs
+++ b/frame/support/test/tests/derive_no_bound_ui.rs
@@ -19,7 +19,7 @@
 #[test]
 fn derive_no_bound_ui() {
 	// As trybuild is using `cargo check`, we don't need the real WASM binaries.
-	std::env::set_var("BUILD_DUMMY_WASM_BINARY", "1");
+	std::env::set_var("SKIP_WASM_BUILD", "1");
 
 	let t = trybuild::TestCases::new();
 	t.compile_fail("tests/derive_no_bound_ui/*.rs");
diff --git a/frame/support/test/tests/reserved_keyword.rs b/frame/support/test/tests/reserved_keyword.rs
index 382b2e498741..8136d11824ac 100644
--- a/frame/support/test/tests/reserved_keyword.rs
+++ b/frame/support/test/tests/reserved_keyword.rs
@@ -19,7 +19,7 @@
 #[test]
 fn reserved_keyword() {
 	// As trybuild is using `cargo check`, we don't need the real WASM binaries.
-	std::env::set_var("BUILD_DUMMY_WASM_BINARY", "1");
+	std::env::set_var("SKIP_WASM_BUILD", "1");
 
 	let t = trybuild::TestCases::new();
 	t.compile_fail("tests/reserved_keyword/*.rs");
diff --git a/primitives/api/test/tests/trybuild.rs b/primitives/api/test/tests/trybuild.rs
index 2f7fd6d06bcd..f23c7291e8ef 100644
--- a/primitives/api/test/tests/trybuild.rs
+++ b/primitives/api/test/tests/trybuild.rs
@@ -21,7 +21,7 @@ use std::env;
 #[test]
 fn ui() {
 	// As trybuild is using `cargo check`, we don't need the real WASM binaries.
-	env::set_var("BUILD_DUMMY_WASM_BINARY", "1");
+	env::set_var("SKIP_WASM_BUILD", "1");
 
 	let t = trybuild::TestCases::new();
 	t.compile_fail("tests/ui/*.rs");
diff --git a/primitives/runtime-interface/test-wasm-deprecated/Cargo.toml b/primitives/runtime-interface/test-wasm-deprecated/Cargo.toml
index 59790eb172eb..eba557de5dba 100644
--- a/primitives/runtime-interface/test-wasm-deprecated/Cargo.toml
+++ b/primitives/runtime-interface/test-wasm-deprecated/Cargo.toml
@@ -19,7 +19,7 @@ sp-io = { version = "2.0.0", default-features = false, path = "../../io" }
 sp-core = { version = "2.0.0", default-features = false, path = "../../core" }
 
 [build-dependencies]
-wasm-builder-runner = { version = "2.0.0", package = "substrate-wasm-builder-runner", path = "../../../utils/wasm-builder-runner" }
+substrate-wasm-builder = { version = "3.0.0", path = "../../../utils/wasm-builder" }
 
 [features]
 default = [ "std" ]
diff --git a/primitives/runtime-interface/test-wasm-deprecated/build.rs b/primitives/runtime-interface/test-wasm-deprecated/build.rs
index 4f111bc99300..8a0b4d7a0c15 100644
--- a/primitives/runtime-interface/test-wasm-deprecated/build.rs
+++ b/primitives/runtime-interface/test-wasm-deprecated/build.rs
@@ -15,12 +15,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use wasm_builder_runner::WasmBuilder;
+use substrate_wasm_builder::WasmBuilder;
 
 fn main() {
 	WasmBuilder::new()
 		.with_current_project()
-		.with_wasm_builder_from_crates_or_path("2.0.1", "../../../utils/wasm-builder")
 		.export_heap_base()
 		.import_memory()
 		.build()
diff --git a/primitives/runtime-interface/test-wasm-deprecated/src/lib.rs b/primitives/runtime-interface/test-wasm-deprecated/src/lib.rs
index 174cdb8cdf85..ae0697b2938f 100644
--- a/primitives/runtime-interface/test-wasm-deprecated/src/lib.rs
+++ b/primitives/runtime-interface/test-wasm-deprecated/src/lib.rs
@@ -26,8 +26,8 @@ use sp_runtime_interface::runtime_interface;
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
+/// Wasm binary unwrapped. If built with `SKIP_WASM_BUILD`, the function panics.
 #[cfg(feature = "std")]
-/// Wasm binary unwrapped. If built with `BUILD_DUMMY_WASM_BINARY`, the function panics.
 pub fn wasm_binary_unwrap() -> &'static [u8] {
 	WASM_BINARY.expect("Development wasm binary is not available. Testing is only \
 						supported with the flag disabled.")
diff --git a/primitives/runtime-interface/test-wasm/Cargo.toml b/primitives/runtime-interface/test-wasm/Cargo.toml
index 39c8df976a5b..3cf36f95145e 100644
--- a/primitives/runtime-interface/test-wasm/Cargo.toml
+++ b/primitives/runtime-interface/test-wasm/Cargo.toml
@@ -19,7 +19,7 @@ sp-io = { version = "2.0.0", default-features = false, path = "../../io" }
 sp-core = { version = "2.0.0", default-features = false, path = "../../core" }
 
 [build-dependencies]
-wasm-builder-runner = { version = "2.0.0", package = "substrate-wasm-builder-runner", path = "../../../utils/wasm-builder-runner" }
+substrate-wasm-builder = { version = "3.0.0", path = "../../../utils/wasm-builder" }
 
 [features]
 default = [ "std" ]
diff --git a/primitives/runtime-interface/test-wasm/build.rs b/primitives/runtime-interface/test-wasm/build.rs
index 4f111bc99300..8a0b4d7a0c15 100644
--- a/primitives/runtime-interface/test-wasm/build.rs
+++ b/primitives/runtime-interface/test-wasm/build.rs
@@ -15,12 +15,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use wasm_builder_runner::WasmBuilder;
+use substrate_wasm_builder::WasmBuilder;
 
 fn main() {
 	WasmBuilder::new()
 		.with_current_project()
-		.with_wasm_builder_from_crates_or_path("2.0.1", "../../../utils/wasm-builder")
 		.export_heap_base()
 		.import_memory()
 		.build()
diff --git a/primitives/runtime-interface/test-wasm/src/lib.rs b/primitives/runtime-interface/test-wasm/src/lib.rs
index 28895df2214d..6cd37a6c1d14 100644
--- a/primitives/runtime-interface/test-wasm/src/lib.rs
+++ b/primitives/runtime-interface/test-wasm/src/lib.rs
@@ -30,8 +30,8 @@ use sp_core::{sr25519::Public, wasm_export_functions};
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
+/// Wasm binary unwrapped. If built with `SKIP_WASM_BUILD`, the function panics.
 #[cfg(feature = "std")]
-/// Wasm binary unwrapped. If built with `BUILD_DUMMY_WASM_BINARY`, the function panics.
 pub fn wasm_binary_unwrap() -> &'static [u8] {
 	WASM_BINARY.expect("Development wasm binary is not available. Testing is only \
 						supported with the flag disabled.")
diff --git a/primitives/runtime-interface/tests/ui.rs b/primitives/runtime-interface/tests/ui.rs
index 2f7fd6d06bcd..f23c7291e8ef 100644
--- a/primitives/runtime-interface/tests/ui.rs
+++ b/primitives/runtime-interface/tests/ui.rs
@@ -21,7 +21,7 @@ use std::env;
 #[test]
 fn ui() {
 	// As trybuild is using `cargo check`, we don't need the real WASM binaries.
-	env::set_var("BUILD_DUMMY_WASM_BINARY", "1");
+	env::set_var("SKIP_WASM_BUILD", "1");
 
 	let t = trybuild::TestCases::new();
 	t.compile_fail("tests/ui/*.rs");
diff --git a/test-utils/runtime/Cargo.toml b/test-utils/runtime/Cargo.toml
index cb6147adf25c..cf1a4bcddd5b 100644
--- a/test-utils/runtime/Cargo.toml
+++ b/test-utils/runtime/Cargo.toml
@@ -56,7 +56,7 @@ sc-executor = { version = "0.8.0", path = "../../client/executor" }
 substrate-test-runtime-client = { version = "2.0.0", path = "./client" }
 
 [build-dependencies]
-wasm-builder-runner = { version = "2.0.0", package = "substrate-wasm-builder-runner", path = "../../utils/wasm-builder-runner" }
+substrate-wasm-builder = { version = "3.0.0", path = "../../utils/wasm-builder" }
 
 [features]
 default = [
diff --git a/test-utils/runtime/build.rs b/test-utils/runtime/build.rs
index 834551a7ba12..5c9af20528a0 100644
--- a/test-utils/runtime/build.rs
+++ b/test-utils/runtime/build.rs
@@ -15,12 +15,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use wasm_builder_runner::WasmBuilder;
+use substrate_wasm_builder::WasmBuilder;
 
 fn main() {
 	WasmBuilder::new()
 		.with_current_project()
-		.with_wasm_builder_from_crates_or_path("2.0.1", "../../utils/wasm-builder")
 		.export_heap_base()
 		// Note that we set the stack-size to 1MB explicitly even though it is set
 		// to this value by default. This is because some of our tests (`restoration_of_globals`)
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index e772a28ee33a..202446777105 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -66,8 +66,8 @@ pub type AuraId = sp_consensus_aura::sr25519::AuthorityId;
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
+/// Wasm binary unwrapped. If built with `SKIP_WASM_BUILD`, the function panics.
 #[cfg(feature = "std")]
-/// Wasm binary unwrapped. If built with `BUILD_DUMMY_WASM_BINARY`, the function panics.
 pub fn wasm_binary_unwrap() -> &'static [u8] {
 	WASM_BINARY.expect("Development wasm binary is not available. Testing is only \
 						supported with the flag disabled.")
diff --git a/utils/wasm-builder-runner/Cargo.toml b/utils/wasm-builder-runner/Cargo.toml
deleted file mode 100644
index 2c54a5ec3a4d..000000000000
--- a/utils/wasm-builder-runner/Cargo.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-[package]
-name = "substrate-wasm-builder-runner"
-version = "2.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-description = "Runner for substrate-wasm-builder"
-edition = "2018"
-readme = "README.md"
-repository = "https://github.com/paritytech/substrate/"
-license = "Apache-2.0"
-homepage = "https://substrate.dev"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[dependencies]
diff --git a/utils/wasm-builder-runner/README.md b/utils/wasm-builder-runner/README.md
deleted file mode 100644
index 1b9e2b08ca44..000000000000
--- a/utils/wasm-builder-runner/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-## WASM builder runner
-
-Since cargo contains many bugs when it comes to correct dependency and feature
-resolution, we need this little tool. See <https://github.com/rust-lang/cargo/issues/5730> for
-more information.
-
-It will create a project that will call `substrate-wasm-builder` to prevent any dependencies
-from `substrate-wasm-builder` influencing the main project's dependencies.
-
-For more information see <https://crates.io/substrate-wasm-builder>
-
-License: GPL-3.0
diff --git a/utils/wasm-builder-runner/src/lib.rs b/utils/wasm-builder-runner/src/lib.rs
deleted file mode 100644
index 04e06495c69b..000000000000
--- a/utils/wasm-builder-runner/src/lib.rs
+++ /dev/null
@@ -1,498 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! # WASM builder runner
-//!
-//! Since cargo contains many bugs when it comes to correct dependency and feature
-//! resolution, we need this little tool. See <https://github.com/rust-lang/cargo/issues/5730> for
-//! more information.
-//!
-//! It will create a project that will call `substrate-wasm-builder` to prevent any dependencies
-//! from `substrate-wasm-builder` influencing the main project's dependencies.
-//!
-//! For more information see <https://crates.io/substrate-wasm-builder>
-
-use std::{
-	env, process::{Command, self}, fs, path::{PathBuf, Path}, hash::{Hash, Hasher},
-	collections::hash_map::DefaultHasher,
-};
-
-/// Environment variable that tells us to skip building the WASM binary.
-const SKIP_BUILD_ENV: &str = "SKIP_WASM_BUILD";
-
-/// Environment variable that tells us to create a dummy WASM binary.
-///
-/// This is useful for `cargo check` to speed-up the compilation.
-///
-/// # Caution
-///
-/// Enabling this option will just provide `&[]` as WASM binary.
-const DUMMY_WASM_BINARY_ENV: &str = "BUILD_DUMMY_WASM_BINARY";
-
-/// Environment variable that makes sure the WASM build is triggered.
-const FORCE_WASM_BUILD_ENV: &str = "FORCE_WASM_BUILD";
-
-/// Replace all backslashes with slashes.
-fn replace_back_slashes<T: ToString>(path: T) -> String {
-	path.to_string().replace("\\", "/")
-}
-
-/// Returns the manifest dir from the `CARGO_MANIFEST_DIR` env.
-fn get_manifest_dir() -> PathBuf {
-	env::var("CARGO_MANIFEST_DIR")
-		.expect("`CARGO_MANIFEST_DIR` is always set for `build.rs` files; qed")
-		.into()
-}
-
-/// First step of the [`WasmBuilder`] to select the project to build.
-pub struct WasmBuilderSelectProject {
-	/// This parameter just exists to make it impossible to construct
-	/// this type outside of this crate.
-	_ignore: (),
-}
-
-impl WasmBuilderSelectProject {
-	/// Use the current project as project for building the WASM binary.
-	///
-	/// # Panics
-	///
-	/// Panics if the `CARGO_MANIFEST_DIR` variable is not set. This variable
-	/// is always set by `Cargo` in `build.rs` files.
-	pub fn with_current_project(self) -> WasmBuilderSelectSource {
-		WasmBuilderSelectSource(get_manifest_dir().join("Cargo.toml"))
-	}
-
-	/// Use the given `path` as project for building the WASM binary.
-	///
-	/// Returns an error if the given `path` does not points to a `Cargo.toml`.
-	pub fn with_project(
-		self,
-		path: impl Into<PathBuf>,
-	) -> Result<WasmBuilderSelectSource, &'static str> {
-		let path = path.into();
-
-		if path.ends_with("Cargo.toml") {
-			Ok(WasmBuilderSelectSource(path))
-		} else {
-			Err("Project path must point to the `Cargo.toml` of the project")
-		}
-	}
-}
-
-/// Second step of the [`WasmBuilder`] to set the source of the `wasm-builder`.
-pub struct WasmBuilderSelectSource(PathBuf);
-
-impl WasmBuilderSelectSource {
-	/// Use the given `path` as source for `wasm-builder`.
-	///
-	/// The `path` must be relative and point to the directory that contains the `Cargo.toml` for
-	/// `wasm-builder`.
-	pub fn with_wasm_builder_from_path(self, path: &'static str) -> WasmBuilder {
-		WasmBuilder {
-			source: WasmBuilderSource::Path(path),
-			rust_flags: Vec::new(),
-			file_name: None,
-			project_cargo_toml: self.0,
-		}
-	}
-
-	/// Use the given `repo` and `rev` as source for `wasm-builder`.
-	pub fn with_wasm_builder_from_git(self, repo: &'static str, rev: &'static str) -> WasmBuilder {
-		WasmBuilder {
-			source: WasmBuilderSource::Git { repo, rev },
-			rust_flags: Vec::new(),
-			file_name: None,
-			project_cargo_toml: self.0,
-		}
-	}
-
-	/// Use the given `version` to fetch `wasm-builder` source from crates.io.
-	pub fn with_wasm_builder_from_crates(self, version: &'static str) -> WasmBuilder {
-		WasmBuilder {
-			source: WasmBuilderSource::Crates(version),
-			rust_flags: Vec::new(),
-			file_name: None,
-			project_cargo_toml: self.0,
-		}
-	}
-
-	/// Use the given `version` to fetch `wasm-builder` source from crates.io or use
-	/// the given `path` as source.
-	///
-	/// The `path` must be relative and point to the directory that contains the `Cargo.toml` for
-	/// `wasm-builder`.
-	pub fn with_wasm_builder_from_crates_or_path(
-		self,
-		version: &'static str,
-		path: &'static str,
-	) -> WasmBuilder {
-		WasmBuilder {
-			source: WasmBuilderSource::CratesOrPath { version, path },
-			rust_flags: Vec::new(),
-			file_name: None,
-			project_cargo_toml: self.0,
-		}
-	}
-
-	/// Use the given `source` as source for `wasm-builder`.
-	pub fn with_wasm_builder_source(self, source: WasmBuilderSource) -> WasmBuilder {
-		WasmBuilder {
-			source,
-			rust_flags: Vec::new(),
-			file_name: None,
-			project_cargo_toml: self.0,
-		}
-	}
-}
-
-/// The builder for building a wasm binary.
-///
-/// The builder itself is seperated into multiple structs to make the setup type safe.
-///
-/// Building a wasm binary:
-///
-/// 1. Call [`WasmBuilder::new`] to create a new builder.
-/// 2. Select the project to build using the methods of [`WasmBuilderSelectProject`].
-/// 3. Select the source of the `wasm-builder` crate using the methods of
-///    [`WasmBuilderSelectSource`].
-/// 4. Set additional `RUST_FLAGS` or a different name for the file containing the WASM code
-///    using methods of [`WasmBuilder`].
-/// 5. Build the WASM binary using [`Self::build`].
-pub struct WasmBuilder {
-	/// Where should we pull the `wasm-builder` crate from.
-	source: WasmBuilderSource,
-	/// Flags that should be appended to `RUST_FLAGS` env variable.
-	rust_flags: Vec<String>,
-	/// The name of the file that is being generated in `OUT_DIR`.
-	///
-	/// Defaults to `wasm_binary.rs`.
-	file_name: Option<String>,
-	/// The path to the `Cargo.toml` of the project that should be build
-	/// for wasm.
-	project_cargo_toml: PathBuf,
-}
-
-impl WasmBuilder {
-	/// Create a new instance of the builder.
-	pub fn new() -> WasmBuilderSelectProject {
-		WasmBuilderSelectProject {
-			_ignore: (),
-		}
-	}
-
-	/// Enable exporting `__heap_base` as global variable in the WASM binary.
-	///
-	/// This adds `-Clink-arg=--export=__heap_base` to `RUST_FLAGS`.
-	pub fn export_heap_base(mut self) -> Self {
-		self.rust_flags.push("-Clink-arg=--export=__heap_base".into());
-		self
-	}
-
-	/// Set the name of the file that will be generated in `OUT_DIR`.
-	///
-	/// This file needs to be included to get access to the build WASM binary.
-	///
-	/// If this function is not called, `file_name` defaults to `wasm_binary.rs`
-	pub fn set_file_name(mut self, file_name: impl Into<String>) -> Self {
-		self.file_name = Some(file_name.into());
-		self
-	}
-
-	/// Instruct the linker to import the memory into the WASM binary.
-	///
-	/// This adds `-C link-arg=--import-memory` to `RUST_FLAGS`.
-	pub fn import_memory(mut self) -> Self {
-		self.rust_flags.push("-C link-arg=--import-memory".into());
-		self
-	}
-
-	/// Append the given `flag` to `RUST_FLAGS`.
-	///
-	/// `flag` is appended as is, so it needs to be a valid flag.
-	pub fn append_to_rust_flags(mut self, flag: impl Into<String>) -> Self {
-		self.rust_flags.push(flag.into());
-		self
-	}
-
-	/// Build the WASM binary.
-	pub fn build(self) {
-		let out_dir = PathBuf::from(env::var("OUT_DIR").expect("`OUT_DIR` is set by cargo!"));
-		let file_path = out_dir.join(self.file_name.unwrap_or_else(|| "wasm_binary.rs".into()));
-
-		if check_skip_build() {
-			// If we skip the build, we still want to make sure to be called when an env variable
-			// changes
-			generate_rerun_if_changed_instructions();
-
-			provide_dummy_wasm_binary(&file_path, true);
-
-			return;
-		}
-
-		// Hash the path to the project cargo toml.
-		let mut hasher = DefaultHasher::new();
-		self.project_cargo_toml.hash(&mut hasher);
-
-		let project_name = env::var("CARGO_PKG_NAME").expect("`CARGO_PKG_NAME` is set by cargo!");
-		// Make sure the `wasm-builder-runner` path is unique by concatenating the name of the
-		// project that is compiling the WASM binary with the hash of the path to the project that
-		// should be compiled as WASM binary.
-		let project_folder = get_workspace_root()
-			.join(format!("{}{}", project_name, hasher.finish()));
-
-		if check_provide_dummy_wasm_binary() {
-			provide_dummy_wasm_binary(&file_path, false);
-		} else {
-			create_project(
-				&project_folder,
-				&file_path,
-				self.source,
-				&self.project_cargo_toml,
-				&self.rust_flags.into_iter().map(|f| format!("{} ", f)).collect::<String>(),
-			);
-			run_project(&project_folder);
-		}
-
-		// As last step we need to generate our `rerun-if-changed` stuff. If a build fails, we don't
-		// want to spam the output!
-		generate_rerun_if_changed_instructions();
-	}
-}
-
-/// The `wasm-builder` dependency source.
-pub enum WasmBuilderSource {
-	/// The relative path to the source code from the current manifest dir.
-	Path(&'static str),
-	/// The git repository that contains the source code.
-	Git {
-		repo: &'static str,
-		rev: &'static str,
-	},
-	/// Use the given version released on crates.io.
-	Crates(&'static str),
-	/// Use the given version released on crates.io or from the given path.
-	CratesOrPath {
-		version: &'static str,
-		path: &'static str,
-	}
-}
-
-impl WasmBuilderSource {
-	/// Convert to a valid cargo source declaration.
-	///
-	/// `absolute_path` - The manifest dir.
-	fn to_cargo_source(&self, manifest_dir: &Path) -> String {
-		match self {
-			WasmBuilderSource::Path(path) => {
-				replace_back_slashes(format!("path = \"{}\"", manifest_dir.join(path).display()))
-			}
-			WasmBuilderSource::Git { repo, rev } => {
-				format!("git = \"{}\", rev=\"{}\"", repo, rev)
-			}
-			WasmBuilderSource::Crates(version) => {
-				format!("version = \"{}\"", version)
-			}
-			WasmBuilderSource::CratesOrPath { version, path } => {
-				replace_back_slashes(
-					format!(
-						"path = \"{}\", version = \"{}\"",
-						manifest_dir.join(path).display(),
-						version
-					)
-				)
-			}
-		}
-	}
-}
-
-/// Build the currently built project as WASM binary and extend `RUSTFLAGS` with the given rustflags.
-///
-/// For more information, see [`build_current_project`].
-#[deprecated(
-	since = "1.0.5",
-	note = "Please switch to [`WasmBuilder`]",
-)]
-pub fn build_current_project_with_rustflags(
-	file_name: &str,
-	wasm_builder_source: WasmBuilderSource,
-	default_rust_flags: &str,
-) {
-	WasmBuilder::new()
-		.with_current_project()
-		.with_wasm_builder_source(wasm_builder_source)
-		.append_to_rust_flags(default_rust_flags)
-		.set_file_name(file_name)
-		.build()
-}
-
-/// Build the currently built project as WASM binary.
-///
-/// The current project is determined using the `CARGO_MANIFEST_DIR` environment variable.
-///
-/// `file_name` - The name of the file being generated in the `OUT_DIR`. The file contains the
-///               constant `WASM_BINARY` which contains the build wasm binary.
-/// `wasm_builder_path` - Path to the wasm-builder project, relative to `CARGO_MANIFEST_DIR`.
-#[deprecated(
-	since = "1.0.5",
-	note = "Please switch to [`WasmBuilder`]",
-)]
-pub fn build_current_project(file_name: &str, wasm_builder_source: WasmBuilderSource) {
-	#[allow(deprecated)]
-	build_current_project_with_rustflags(file_name, wasm_builder_source, "");
-}
-
-/// Returns the root path of the wasm-builder workspace.
-///
-/// The wasm-builder workspace contains all wasm-builder's projects.
-fn get_workspace_root() -> PathBuf {
-	let out_dir_env = env::var("OUT_DIR").expect("`OUT_DIR` is set by cargo!");
-	let mut out_dir = PathBuf::from(&out_dir_env);
-
-	loop {
-		match out_dir.parent() {
-			Some(parent) if out_dir.ends_with("build") => return parent.join("wbuild-runner"),
-			_ => if !out_dir.pop() {
-				break;
-			}
-		}
-	}
-
-	panic!("Could not find target dir in: {}", out_dir_env)
-}
-
-fn create_project(
-	project_folder: &Path,
-	file_path: &Path,
-	wasm_builder_source: WasmBuilderSource,
-	cargo_toml_path: &Path,
-	default_rustflags: &str,
-) {
-	fs::create_dir_all(project_folder.join("src"))
-		.expect("WASM build runner dir create can not fail; qed");
-
-	write_file_if_changed(
-		project_folder.join("Cargo.toml"),
-		format!(
-			r#"
-				[package]
-				name = "wasm-build-runner-impl"
-				version = "1.0.0"
-				edition = "2018"
-
-				[dependencies]
-				substrate-wasm-builder = {{ {wasm_builder_source} }}
-
-				[workspace]
-			"#,
-			wasm_builder_source = wasm_builder_source.to_cargo_source(&get_manifest_dir()),
-		),
-	);
-
-	write_file_if_changed(
-		project_folder.join("src/main.rs"),
-		format!(
-			r#"
-				//! This is automatically generated code by `substrate-wasm-builder`.
-
-				use substrate_wasm_builder::build_project_with_default_rustflags;
-
-				fn main() {{
-					build_project_with_default_rustflags(
-						"{file_path}",
-						"{cargo_toml_path}",
-						"{default_rustflags}",
-					)
-				}}
-			"#,
-			file_path = replace_back_slashes(file_path.display()),
-			cargo_toml_path = replace_back_slashes(cargo_toml_path.display()),
-			default_rustflags = default_rustflags,
-		),
-	);
-}
-
-fn run_project(project_folder: &Path) {
-	let cargo = env::var("CARGO").expect("`CARGO` env variable is always set when executing `build.rs`.");
-	let mut cmd = Command::new(cargo);
-	cmd.arg("run").arg(format!("--manifest-path={}", project_folder.join("Cargo.toml").display()));
-
-	if env::var("DEBUG") != Ok(String::from("true")) {
-		cmd.arg("--release");
-	}
-
-	// Make sure we always run the `wasm-builder` project for the `HOST` architecture.
-	let host_triple = env::var("HOST").expect("`HOST` is always set when executing `build.rs`.");
-	cmd.arg(&format!("--target={}", host_triple));
-
-	// Unset the `CARGO_TARGET_DIR` to prevent a cargo deadlock (cargo locks a target dir exclusive).
-	// The runner project is created in `CARGO_TARGET_DIR` and executing it will create a sub target
-	// directory inside of `CARGO_TARGET_DIR`.
-	cmd.env_remove("CARGO_TARGET_DIR");
-
-	if !cmd.status().map(|s| s.success()).unwrap_or(false) {
-		// Don't spam the output with backtraces when a build failed!
-		process::exit(1);
-	}
-}
-
-/// Generate the name of the skip build environment variable for the current crate.
-fn generate_crate_skip_build_env_name() -> String {
-	format!(
-		"SKIP_{}_WASM_BUILD",
-		env::var("CARGO_PKG_NAME").expect("Package name is set").to_uppercase().replace('-', "_"),
-	)
-}
-
-/// Checks if the build of the WASM binary should be skipped.
-fn check_skip_build() -> bool {
-	env::var(SKIP_BUILD_ENV).is_ok() || env::var(generate_crate_skip_build_env_name()).is_ok()
-}
-
-/// Check if we should provide a dummy WASM binary.
-fn check_provide_dummy_wasm_binary() -> bool {
-	env::var(DUMMY_WASM_BINARY_ENV).is_ok()
-}
-
-/// Provide the dummy WASM binary
-///
-/// If `skip_build` is `true`, it will only generate the wasm binary if it doesn't exist.
-fn provide_dummy_wasm_binary(file_path: &Path, skip_build: bool) {
-	if !skip_build || !file_path.exists() {
-		write_file_if_changed(
-			file_path.into(),
-			"pub const WASM_BINARY: Option<&[u8]> = None;\
-			 pub const WASM_BINARY_BLOATY: Option<&[u8]> = None;".into(),
-		);
-	}
-}
-
-/// Generate the `rerun-if-changed` instructions for cargo to make sure that the WASM binary is
-/// rebuilt when needed.
-fn generate_rerun_if_changed_instructions() {
-	// Make sure that the `build.rs` is called again if one of the following env variables changes.
-	println!("cargo:rerun-if-env-changed={}", SKIP_BUILD_ENV);
-	println!("cargo:rerun-if-env-changed={}", DUMMY_WASM_BINARY_ENV);
-	println!("cargo:rerun-if-env-changed={}", FORCE_WASM_BUILD_ENV);
-	println!("cargo:rerun-if-env-changed={}", generate_crate_skip_build_env_name());
-}
-
-/// Write to the given `file` if the `content` is different.
-fn write_file_if_changed(file: PathBuf, content: String) {
-	if fs::read_to_string(&file).ok().as_ref() != Some(&content) {
-		fs::write(&file, content).unwrap_or_else(|_| panic!("Writing `{}` can not fail!", file.display()));
-	}
-}
diff --git a/utils/wasm-builder/Cargo.toml b/utils/wasm-builder/Cargo.toml
index e9dd1a97b89e..199e26b509e2 100644
--- a/utils/wasm-builder/Cargo.toml
+++ b/utils/wasm-builder/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-wasm-builder"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Utility for building WASM binaries"
 edition = "2018"
@@ -14,12 +14,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 build-helper = "0.1.1"
-cargo_metadata = "0.10.0"
+cargo_metadata = "0.12.0"
 tempfile = "3.1.0"
 toml = "0.5.4"
 walkdir = "2.3.1"
-fs2 = "0.4.3"
 wasm-gc-api = "0.1.11"
 atty = "0.2.13"
-itertools = "0.8.2"
 ansi_term = "0.12.1"
diff --git a/utils/wasm-builder/README.md b/utils/wasm-builder/README.md
index 1e24d2cebab3..3868faf1acab 100644
--- a/utils/wasm-builder/README.md
+++ b/utils/wasm-builder/README.md
@@ -8,20 +8,23 @@ The Wasm builder is a tool that integrates the process of building the WASM bina
 A project that should be compiled as a Wasm binary needs to:
 
 1. Add a `build.rs` file.
-2. Add `substrate-wasm-builder` as dependency into `build-dependencies`.
+2. Add `wasm-builder` as dependency into `build-dependencies`.
 
 The `build.rs` file needs to contain the following code:
 
 ```rust
-use wasm_builder_runner::{build_current_project, WasmBuilderSource};
+use substrate_wasm_builder::WasmBuilder;
 
 fn main() {
-	build_current_project(
-		// The name of the file being generated in out-dir.
-		"wasm_binary.rs",
-		// How to include wasm-builder, in this case from crates.io.
-		WasmBuilderSource::Crates("1.0.0"),
-	);
+    WasmBuilder::new()
+        // Tell the builder to build the project (crate) this `build.rs` is part of.
+        .with_current_project()
+        // Make sure to export the `heap_base` global, this is required by Substrate
+        .export_heap_base()
+        // Build the Wasm file so that it imports the memory (need to be provided by at instantiation)
+        .import_memory()
+        // Build it.
+        .build()
 }
 ```
 
@@ -32,9 +35,10 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 ```
 
 This will include the generated Wasm binary as two constants `WASM_BINARY` and `WASM_BINARY_BLOATY`.
-The former is a compact Wasm binary and the latter is not compacted.
+The former is a compact Wasm binary and the latter is the Wasm binary as being generated by the compiler.
+Both variables have `Option<&'static [u8]>` as type.
 
-### Feature
+### Features
 
 Wasm builder supports to enable cargo features while building the Wasm binary. By default it will
 enable all features in the wasm build that are enabled for the native build except the
@@ -46,19 +50,19 @@ Wasm binary. If this feature is not present, it will not be enabled.
 
 By using environment variables, you can configure which Wasm binaries are built and how:
 
-- `SKIP_WASM_BUILD` - Skips building any wasm binary. This is useful when only native should be recompiled.
-- `BUILD_DUMMY_WASM_BINARY` - Builds dummy wasm binaries. These dummy binaries are empty and useful
-                             for `cargo check` runs.
-- `WASM_BUILD_TYPE` - Sets the build type for building wasm binaries. Supported values are `release` or `debug`.
+- `SKIP_WASM_BUILD` - Skips building any Wasm binary. This is useful when only native should be recompiled.
+                      If this is the first run and there doesn't exist a Wasm binary, this will set both
+                      variables to `None`.
+- `WASM_BUILD_TYPE` - Sets the build type for building Wasm binaries. Supported values are `release` or `debug`.
                       By default the build type is equal to the build type used by the main build.
-- `FORCE_WASM_BUILD` - Can be set to force a wasm build. On subsequent calls the value of the variable
-                       needs to change. As wasm builder instructs `cargo` to watch for file changes
+- `FORCE_WASM_BUILD` - Can be set to force a Wasm build. On subsequent calls the value of the variable
+                       needs to change. As wasm-builder instructs `cargo` to watch for file changes
                        this environment variable should only be required in certain circumstances.
 - `WASM_BUILD_RUSTFLAGS` - Extend `RUSTFLAGS` given to `cargo build` while building the wasm binary.
 - `WASM_BUILD_NO_COLOR` - Disable color output of the wasm build.
-- `WASM_TARGET_DIRECTORY` - Will copy any build wasm binary to the given directory. The path needs
+- `WASM_TARGET_DIRECTORY` - Will copy any build Wasm binary to the given directory. The path needs
                            to be absolute.
-- `WASM_BUILD_TOOLCHAIN` - The toolchain that should be used to build the wasm binaries. The
+- `WASM_BUILD_TOOLCHAIN` - The toolchain that should be used to build the Wasm binaries. The
                            format needs to be the same as used by cargo, e.g. `nightly-2020-02-20`.
 
 Each project can be skipped individually by using the environment variable `SKIP_PROJECT_NAME_WASM_BUILD`.
diff --git a/utils/wasm-builder/src/builder.rs b/utils/wasm-builder/src/builder.rs
new file mode 100644
index 000000000000..75e1d8057201
--- /dev/null
+++ b/utils/wasm-builder/src/builder.rs
@@ -0,0 +1,245 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::{env, path::{PathBuf, Path}, process};
+
+/// Returns the manifest dir from the `CARGO_MANIFEST_DIR` env.
+fn get_manifest_dir() -> PathBuf {
+	env::var("CARGO_MANIFEST_DIR")
+		.expect("`CARGO_MANIFEST_DIR` is always set for `build.rs` files; qed")
+		.into()
+}
+
+/// First step of the [`WasmBuilder`] to select the project to build.
+pub struct WasmBuilderSelectProject {
+	/// This parameter just exists to make it impossible to construct
+	/// this type outside of this crate.
+	_ignore: (),
+}
+
+impl WasmBuilderSelectProject {
+	/// Use the current project as project for building the WASM binary.
+	///
+	/// # Panics
+	///
+	/// Panics if the `CARGO_MANIFEST_DIR` variable is not set. This variable
+	/// is always set by `Cargo` in `build.rs` files.
+	pub fn with_current_project(self) -> WasmBuilder {
+		WasmBuilder {
+			rust_flags: Vec::new(),
+			file_name: None,
+			project_cargo_toml: get_manifest_dir().join("Cargo.toml"),
+		}
+	}
+
+	/// Use the given `path` as project for building the WASM binary.
+	///
+	/// Returns an error if the given `path` does not points to a `Cargo.toml`.
+	pub fn with_project(
+		self,
+		path: impl Into<PathBuf>,
+	) -> Result<WasmBuilder, &'static str> {
+		let path = path.into();
+
+		if path.ends_with("Cargo.toml") && path.exists() {
+			Ok(WasmBuilder {
+				rust_flags: Vec::new(),
+				file_name: None,
+				project_cargo_toml: path,
+			})
+		} else {
+			Err("Project path must point to the `Cargo.toml` of the project")
+		}
+	}
+}
+
+/// The builder for building a wasm binary.
+///
+/// The builder itself is separated into multiple structs to make the setup type safe.
+///
+/// Building a wasm binary:
+///
+/// 1. Call [`WasmBuilder::new`] to create a new builder.
+/// 2. Select the project to build using the methods of [`WasmBuilderSelectProject`].
+/// 3. Set additional `RUST_FLAGS` or a different name for the file containing the WASM code
+///    using methods of [`WasmBuilder`].
+/// 4. Build the WASM binary using [`Self::build`].
+pub struct WasmBuilder {
+	/// Flags that should be appended to `RUST_FLAGS` env variable.
+	rust_flags: Vec<String>,
+	/// The name of the file that is being generated in `OUT_DIR`.
+	///
+	/// Defaults to `wasm_binary.rs`.
+	file_name: Option<String>,
+	/// The path to the `Cargo.toml` of the project that should be built
+	/// for wasm.
+	project_cargo_toml: PathBuf,
+}
+
+impl WasmBuilder {
+	/// Create a new instance of the builder.
+	pub fn new() -> WasmBuilderSelectProject {
+		WasmBuilderSelectProject {
+			_ignore: (),
+		}
+	}
+
+	/// Enable exporting `__heap_base` as global variable in the WASM binary.
+	///
+	/// This adds `-Clink-arg=--export=__heap_base` to `RUST_FLAGS`.
+	pub fn export_heap_base(mut self) -> Self {
+		self.rust_flags.push("-Clink-arg=--export=__heap_base".into());
+		self
+	}
+
+	/// Set the name of the file that will be generated in `OUT_DIR`.
+	///
+	/// This file needs to be included to get access to the build WASM binary.
+	///
+	/// If this function is not called, `file_name` defaults to `wasm_binary.rs`
+	pub fn set_file_name(mut self, file_name: impl Into<String>) -> Self {
+		self.file_name = Some(file_name.into());
+		self
+	}
+
+	/// Instruct the linker to import the memory into the WASM binary.
+	///
+	/// This adds `-C link-arg=--import-memory` to `RUST_FLAGS`.
+	pub fn import_memory(mut self) -> Self {
+		self.rust_flags.push("-C link-arg=--import-memory".into());
+		self
+	}
+
+	/// Append the given `flag` to `RUST_FLAGS`.
+	///
+	/// `flag` is appended as is, so it needs to be a valid flag.
+	pub fn append_to_rust_flags(mut self, flag: impl Into<String>) -> Self {
+		self.rust_flags.push(flag.into());
+		self
+	}
+
+	/// Build the WASM binary.
+	pub fn build(self) {
+		let out_dir = PathBuf::from(env::var("OUT_DIR").expect("`OUT_DIR` is set by cargo!"));
+		let file_path = out_dir.join(self.file_name.unwrap_or_else(|| "wasm_binary.rs".into()));
+
+		if check_skip_build() {
+			// If we skip the build, we still want to make sure to be called when an env variable
+			// changes
+			generate_rerun_if_changed_instructions();
+
+			provide_dummy_wasm_binary_if_not_exist(&file_path);
+
+			return;
+		}
+
+		build_project(
+			file_path,
+			self.project_cargo_toml,
+			self.rust_flags.into_iter().map(|f| format!("{} ", f)).collect(),
+		);
+
+		// As last step we need to generate our `rerun-if-changed` stuff. If a build fails, we don't
+		// want to spam the output!
+		generate_rerun_if_changed_instructions();
+	}
+}
+
+/// Generate the name of the skip build environment variable for the current crate.
+fn generate_crate_skip_build_env_name() -> String {
+	format!(
+		"SKIP_{}_WASM_BUILD",
+		env::var("CARGO_PKG_NAME").expect("Package name is set").to_uppercase().replace('-', "_"),
+	)
+}
+
+/// Checks if the build of the WASM binary should be skipped.
+fn check_skip_build() -> bool {
+	env::var(crate::SKIP_BUILD_ENV).is_ok() || env::var(generate_crate_skip_build_env_name()).is_ok()
+}
+
+/// Provide a dummy WASM binary if there doesn't exist one.
+fn provide_dummy_wasm_binary_if_not_exist(file_path: &Path) {
+	if !file_path.exists() {
+		crate::write_file_if_changed(
+			file_path,
+			"pub const WASM_BINARY: Option<&[u8]> = None;\
+			 pub const WASM_BINARY_BLOATY: Option<&[u8]> = None;",
+		);
+	}
+}
+
+/// Generate the `rerun-if-changed` instructions for cargo to make sure that the WASM binary is
+/// rebuilt when needed.
+fn generate_rerun_if_changed_instructions() {
+	// Make sure that the `build.rs` is called again if one of the following env variables changes.
+	println!("cargo:rerun-if-env-changed={}", crate::SKIP_BUILD_ENV);
+	println!("cargo:rerun-if-env-changed={}", crate::FORCE_WASM_BUILD_ENV);
+	println!("cargo:rerun-if-env-changed={}", generate_crate_skip_build_env_name());
+}
+
+/// Build the currently built project as wasm binary.
+///
+/// The current project is determined by using the `CARGO_MANIFEST_DIR` environment variable.
+///
+/// `file_name` - The name + path of the file being generated. The file contains the
+///               constant `WASM_BINARY`, which contains the built WASM binary.
+/// `project_cargo_toml` - The path to the `Cargo.toml` of the project that should be built.
+/// `default_rustflags` - Default `RUSTFLAGS` that will always be set for the build.
+fn build_project(
+	file_name: PathBuf,
+	project_cargo_toml: PathBuf,
+	default_rustflags: String,
+) {
+	let cargo_cmd = match crate::prerequisites::check() {
+		Ok(cmd) => cmd,
+		Err(err_msg) => {
+			eprintln!("{}", err_msg);
+			process::exit(1);
+		},
+	};
+
+	let (wasm_binary, bloaty) = crate::wasm_project::create_and_compile(
+		&project_cargo_toml,
+		&default_rustflags,
+		cargo_cmd,
+	);
+
+	let (wasm_binary, wasm_binary_bloaty) = if let Some(wasm_binary) = wasm_binary {
+		(
+			wasm_binary.wasm_binary_path_escaped(),
+			bloaty.wasm_binary_bloaty_path_escaped(),
+		)
+	} else {
+		(
+			bloaty.wasm_binary_bloaty_path_escaped(),
+			bloaty.wasm_binary_bloaty_path_escaped(),
+		)
+	};
+
+	crate::write_file_if_changed(
+		file_name,
+		format!(
+			r#"
+				pub const WASM_BINARY: Option<&[u8]> = Some(include_bytes!("{wasm_binary}"));
+				pub const WASM_BINARY_BLOATY: Option<&[u8]> = Some(include_bytes!("{wasm_binary_bloaty}"));
+			"#,
+			wasm_binary = wasm_binary,
+			wasm_binary_bloaty = wasm_binary_bloaty,
+		),
+	);
+}
diff --git a/utils/wasm-builder/src/lib.rs b/utils/wasm-builder/src/lib.rs
index aa63e9596e19..573afbfcb6dc 100644
--- a/utils/wasm-builder/src/lib.rs
+++ b/utils/wasm-builder/src/lib.rs
@@ -25,20 +25,23 @@
 //! A project that should be compiled as a Wasm binary needs to:
 //!
 //! 1. Add a `build.rs` file.
-//! 2. Add `substrate-wasm-builder` as dependency into `build-dependencies`.
+//! 2. Add `wasm-builder` as dependency into `build-dependencies`.
 //!
 //! The `build.rs` file needs to contain the following code:
 //!
-//! ```ignore
-//! use wasm_builder_runner::{build_current_project, WasmBuilderSource};
+//! ```no_run
+//! use substrate_wasm_builder::WasmBuilder;
 //!
 //! fn main() {
-//! 	build_current_project(
-//! 		// The name of the file being generated in out-dir.
-//! 		"wasm_binary.rs",
-//! 		// How to include wasm-builder, in this case from crates.io.
-//! 		WasmBuilderSource::Crates("1.0.0"),
-//! 	);
+//!     WasmBuilder::new()
+//!         // Tell the builder to build the project (crate) this `build.rs` is part of.
+//!         .with_current_project()
+//!         // Make sure to export the `heap_base` global, this is required by Substrate
+//!         .export_heap_base()
+//!         // Build the Wasm file so that it imports the memory (need to be provided by at instantiation)
+//!         .import_memory()
+//!         // Build it.
+//!         .build()
 //! }
 //! ```
 //!
@@ -49,7 +52,8 @@
 //! ```
 //!
 //! This will include the generated Wasm binary as two constants `WASM_BINARY` and `WASM_BINARY_BLOATY`.
-//! The former is a compact Wasm binary and the latter is not compacted.
+//! The former is a compact Wasm binary and the latter is the Wasm binary as being generated by the compiler.
+//! Both variables have `Option<&'static [u8]>` as type.
 //!
 //! ### Feature
 //!
@@ -63,19 +67,19 @@
 //!
 //! By using environment variables, you can configure which Wasm binaries are built and how:
 //!
-//! - `SKIP_WASM_BUILD` - Skips building any wasm binary. This is useful when only native should be recompiled.
-//! - `BUILD_DUMMY_WASM_BINARY` - Builds dummy wasm binaries. These dummy binaries are empty and useful
-//!                              for `cargo check` runs.
-//! - `WASM_BUILD_TYPE` - Sets the build type for building wasm binaries. Supported values are `release` or `debug`.
+//! - `SKIP_WASM_BUILD` - Skips building any Wasm binary. This is useful when only native should be recompiled.
+//!                       If this is the first run and there doesn't exist a Wasm binary, this will set both
+//!                       variables to `None`.
+//! - `WASM_BUILD_TYPE` - Sets the build type for building Wasm binaries. Supported values are `release` or `debug`.
 //!                       By default the build type is equal to the build type used by the main build.
-//! - `FORCE_WASM_BUILD` - Can be set to force a wasm build. On subsequent calls the value of the variable
-//!                        needs to change. As wasm builder instructs `cargo` to watch for file changes
+//! - `FORCE_WASM_BUILD` - Can be set to force a Wasm build. On subsequent calls the value of the variable
+//!                        needs to change. As wasm-builder instructs `cargo` to watch for file changes
 //!                        this environment variable should only be required in certain circumstances.
 //! - `WASM_BUILD_RUSTFLAGS` - Extend `RUSTFLAGS` given to `cargo build` while building the wasm binary.
 //! - `WASM_BUILD_NO_COLOR` - Disable color output of the wasm build.
-//! - `WASM_TARGET_DIRECTORY` - Will copy any build wasm binary to the given directory. The path needs
+//! - `WASM_TARGET_DIRECTORY` - Will copy any build Wasm binary to the given directory. The path needs
 //!                            to be absolute.
-//! - `WASM_BUILD_TOOLCHAIN` - The toolchain that should be used to build the wasm binaries. The
+//! - `WASM_BUILD_TOOLCHAIN` - The toolchain that should be used to build the Wasm binaries. The
 //!                            format needs to be the same as used by cargo, e.g. `nightly-2020-02-20`.
 //!
 //! Each project can be skipped individually by using the environment variable `SKIP_PROJECT_NAME_WASM_BUILD`.
@@ -92,11 +96,14 @@
 //! as well. For example if installing the rust nightly from 20.02.2020 using `rustup install nightly-2020-02-20`,
 //! the wasm target needs to be installed as well `rustup target add wasm32-unknown-unknown --toolchain nightly-2020-02-20`.
 
-use std::{env, fs, path::{PathBuf, Path}, process::{Command, self}, io::BufRead};
+use std::{env, fs, path::{PathBuf, Path}, process::Command, io::BufRead};
 
+mod builder;
 mod prerequisites;
 mod wasm_project;
 
+pub use builder::{WasmBuilder, WasmBuilderSelectProject};
+
 /// Environment variable that tells us to skip building the wasm binary.
 const SKIP_BUILD_ENV: &str = "SKIP_WASM_BUILD";
 
@@ -120,87 +127,8 @@ const WASM_BUILD_NO_COLOR: &str = "WASM_BUILD_NO_COLOR";
 /// Environment variable to set the toolchain used to compile the wasm binary.
 const WASM_BUILD_TOOLCHAIN: &str = "WASM_BUILD_TOOLCHAIN";
 
-/// Build the currently built project as wasm binary.
-///
-/// The current project is determined by using the `CARGO_MANIFEST_DIR` environment variable.
-///
-/// `file_name` - The name + path of the file being generated. The file contains the
-///               constant `WASM_BINARY`, which contains the built WASM binary.
-/// `cargo_manifest` - The path to the `Cargo.toml` of the project that should be built.
-pub fn build_project(file_name: &str, cargo_manifest: &str) {
-	build_project_with_default_rustflags(file_name, cargo_manifest, "");
-}
-
-/// Build the currently built project as wasm binary.
-///
-/// The current project is determined by using the `CARGO_MANIFEST_DIR` environment variable.
-///
-/// `file_name` - The name + path of the file being generated. The file contains the
-///               constant `WASM_BINARY`, which contains the built WASM binary.
-/// `cargo_manifest` - The path to the `Cargo.toml` of the project that should be built.
-/// `default_rustflags` - Default `RUSTFLAGS` that will always be set for the build.
-pub fn build_project_with_default_rustflags(
-	file_name: &str,
-	cargo_manifest: &str,
-	default_rustflags: &str,
-) {
-	if check_skip_build() {
-		return;
-	}
-
-	let cargo_manifest = PathBuf::from(cargo_manifest);
-
-	if !cargo_manifest.exists() {
-		panic!("'{}' does not exist!", cargo_manifest.display());
-	}
-
-	if !cargo_manifest.ends_with("Cargo.toml") {
-		panic!("'{}' no valid path to a `Cargo.toml`!", cargo_manifest.display());
-	}
-
-	let cargo_cmd = match prerequisites::check() {
-		Ok(cmd) => cmd,
-		Err(err_msg) => {
-			eprintln!("{}", err_msg);
-			process::exit(1);
-		},
-	};
-
-	let (wasm_binary, bloaty) = wasm_project::create_and_compile(
-		&cargo_manifest,
-		default_rustflags,
-		cargo_cmd,
-	);
-
-	let (wasm_binary, wasm_binary_bloaty) = if let Some(wasm_binary) = wasm_binary {
-		(
-			wasm_binary.wasm_binary_path_escaped(),
-			bloaty.wasm_binary_bloaty_path_escaped(),
-		)
-	} else {
-		(
-			bloaty.wasm_binary_bloaty_path_escaped(),
-			bloaty.wasm_binary_bloaty_path_escaped(),
-		)
-	};
-
-	write_file_if_changed(
-		file_name,
-		format!(
-			r#"
-				pub const WASM_BINARY: Option<&[u8]> = Some(include_bytes!("{wasm_binary}"));
-				pub const WASM_BINARY_BLOATY: Option<&[u8]> = Some(include_bytes!("{wasm_binary_bloaty}"));
-			"#,
-			wasm_binary = wasm_binary,
-			wasm_binary_bloaty = wasm_binary_bloaty,
-		),
-	);
-}
-
-/// Checks if the build of the WASM binary should be skipped.
-fn check_skip_build() -> bool {
-	env::var(SKIP_BUILD_ENV).is_ok()
-}
+/// Environment variable that makes sure the WASM build is triggered.
+const FORCE_WASM_BUILD_ENV: &str = "FORCE_WASM_BUILD";
 
 /// Write to the given `file` if the `content` is different.
 fn write_file_if_changed(file: impl AsRef<Path>, content: impl AsRef<str>) {
@@ -217,7 +145,9 @@ fn copy_file_if_changed(src: PathBuf, dst: PathBuf) {
 
 	if src_file != dst_file {
 		fs::copy(&src, &dst)
-			.unwrap_or_else(|_| panic!("Copying `{}` to `{}` can not fail; qed", src.display(), dst.display()));
+			.unwrap_or_else(
+				|_| panic!("Copying `{}` to `{}` can not fail; qed", src.display(), dst.display())
+			);
 	}
 }
 
diff --git a/utils/wasm-builder/src/wasm_project.rs b/utils/wasm-builder/src/wasm_project.rs
index c27af71988b0..4c4c80e5a866 100644
--- a/utils/wasm-builder/src/wasm_project.rs
+++ b/utils/wasm-builder/src/wasm_project.rs
@@ -30,10 +30,6 @@ use cargo_metadata::{MetadataCommand, Metadata};
 
 use walkdir::WalkDir;
 
-use fs2::FileExt;
-
-use itertools::Itertools;
-
 /// Colorize an info message.
 ///
 /// Returns the colorized message.
@@ -70,31 +66,6 @@ impl WasmBinary {
 	}
 }
 
-/// A lock for the WASM workspace.
-struct WorkspaceLock(fs::File);
-
-impl WorkspaceLock {
-	/// Create a new lock
-	fn new(wasm_workspace_root: &Path) -> Self {
-		let lock = fs::OpenOptions::new()
-			.read(true)
-			.write(true)
-			.create(true)
-			.open(wasm_workspace_root.join("wasm_workspace.lock"))
-			.expect("Opening the lock file does not fail");
-
-		lock.lock_exclusive().expect("Locking `wasm_workspace.lock` failed");
-
-		WorkspaceLock(lock)
-	}
-}
-
-impl Drop for WorkspaceLock {
-	fn drop(&mut self) {
-		let _ = self.0.unlock();
-	}
-}
-
 fn crate_metadata(cargo_manifest: &Path) -> Metadata {
 	let mut cargo_lock = cargo_manifest.to_path_buf();
 	cargo_lock.set_file_name("Cargo.lock");
@@ -120,35 +91,36 @@ fn crate_metadata(cargo_manifest: &Path) -> Metadata {
 /// Creates the WASM project, compiles the WASM binary and compacts the WASM binary.
 ///
 /// # Returns
+///
 /// The path to the compact WASM binary and the bloaty WASM binary.
 pub(crate) fn create_and_compile(
-	cargo_manifest: &Path,
+	project_cargo_toml: &Path,
 	default_rustflags: &str,
 	cargo_cmd: CargoCommandVersioned,
 ) -> (Option<WasmBinary>, WasmBinaryBloaty) {
 	let wasm_workspace_root = get_wasm_workspace_root();
 	let wasm_workspace = wasm_workspace_root.join("wbuild");
 
-	// Lock the workspace exclusively for us
-	let _lock = WorkspaceLock::new(&wasm_workspace_root);
+	let crate_metadata = crate_metadata(project_cargo_toml);
 
-	let crate_metadata = crate_metadata(cargo_manifest);
-
-	let project = create_project(cargo_manifest, &wasm_workspace, &crate_metadata);
-	create_wasm_workspace_project(&wasm_workspace, &crate_metadata.workspace_root);
+	let project = create_project(
+		project_cargo_toml,
+		&wasm_workspace,
+		&crate_metadata,
+		&crate_metadata.workspace_root,
+	);
 
 	build_project(&project, default_rustflags, cargo_cmd);
 	let (wasm_binary, bloaty) = compact_wasm_file(
 		&project,
-		cargo_manifest,
-		&wasm_workspace,
+		project_cargo_toml,
 	);
 
 	wasm_binary.as_ref().map(|wasm_binary|
-		copy_wasm_to_target_directory(cargo_manifest, wasm_binary)
+		copy_wasm_to_target_directory(project_cargo_toml, wasm_binary)
 	);
 
-	generate_rerun_if_changed_instructions(cargo_manifest, &project, &wasm_workspace);
+	generate_rerun_if_changed_instructions(project_cargo_toml, &project, &wasm_workspace);
 
 	(wasm_binary, bloaty)
 }
@@ -221,69 +193,14 @@ fn get_wasm_workspace_root() -> PathBuf {
 	panic!("Could not find target dir in: {}", build_helper::out_dir().display())
 }
 
-/// Find all workspace members.
-///
-/// Each folder in `wasm_workspace` is seen as a member of the workspace. Exceptions are
-/// folders starting with "." and the "target" folder.
-///
-/// Every workspace member that is not valid anymore is deleted (the folder of it). A
-/// member is not valid anymore when the `wasm-project` dependency points to an non-existing
-/// folder or the package name is not valid.
-fn find_and_clear_workspace_members(wasm_workspace: &Path) -> Vec<String> {
-	let mut members = WalkDir::new(wasm_workspace)
-		.min_depth(1)
-		.max_depth(1)
-		.into_iter()
-		.filter_map(|p| p.ok())
-		.map(|d| d.into_path())
-		.filter(|p| p.is_dir())
-		.filter_map(|p| p.file_name().map(|f| f.to_owned()).and_then(|s| s.into_string().ok()))
-		.filter(|f| !f.starts_with('.') && f != "target")
-		.collect::<Vec<_>>();
-
-	let mut i = 0;
-	while i != members.len() {
-		let path = wasm_workspace.join(&members[i]).join("Cargo.toml");
-
-		// Extract the `wasm-project` dependency.
-		// If the path can be extracted and is valid and the package name matches,
-		// the member is valid.
-		if let Some(mut wasm_project) = fs::read_to_string(path)
-			.ok()
-			.and_then(|s| toml::from_str::<Table>(&s).ok())
-			.and_then(|mut t| t.remove("dependencies"))
-			.and_then(|p| p.try_into::<Table>().ok())
-			.and_then(|mut t| t.remove("wasm_project"))
-			.and_then(|p| p.try_into::<Table>().ok())
-		{
-			if let Some(path) = wasm_project.remove("path")
-				.and_then(|p| p.try_into::<String>().ok())
-			{
-				if let Some(name) = wasm_project.remove("package")
-					.and_then(|p| p.try_into::<String>().ok())
-				{
-					let path = PathBuf::from(path);
-					if path.exists() {
-						if name == get_crate_name(&path.join("Cargo.toml")) {
-							i += 1;
-							continue
-						}
-					}
-				}
-			}
-		}
-
-		fs::remove_dir_all(wasm_workspace.join(&members[i]))
-			.expect("Removing invalid workspace member can not fail; qed");
-		members.remove(i);
-	}
-
-	members
-}
-
-fn create_wasm_workspace_project(wasm_workspace: &Path, workspace_root_path: &Path) {
-	let members = find_and_clear_workspace_members(wasm_workspace);
-
+fn create_project_cargo_toml(
+	wasm_workspace: &Path,
+	workspace_root_path: &Path,
+	crate_name: &str,
+	crate_path: &Path,
+	wasm_binary: &str,
+	enabled_features: &[String],
+) {
 	let mut workspace_toml: Table = toml::from_str(
 		&fs::read_to_string(
 			workspace_root_path.join("Cargo.toml"),
@@ -306,12 +223,6 @@ fn create_wasm_workspace_project(wasm_workspace: &Path, workspace_root_path: &Pa
 
 	wasm_workspace_toml.insert("profile".into(), profile.into());
 
-	// Add `workspace` with members
-	let mut workspace = Table::new();
-	workspace.insert("members".into(), members.into());
-
-	wasm_workspace_toml.insert("workspace".into(), workspace.into());
-
 	// Add patch section from the project root `Cargo.toml`
 	if let Some(mut patch) = workspace_toml.remove("patch").and_then(|p| p.try_into::<Table>().ok()) {
 		// Iterate over all patches and make the patch path absolute from the workspace root path.
@@ -335,6 +246,33 @@ fn create_wasm_workspace_project(wasm_workspace: &Path, workspace_root_path: &Pa
 		wasm_workspace_toml.insert("patch".into(), patch.into());
 	}
 
+	let mut package = Table::new();
+	package.insert("name".into(), format!("{}-wasm", crate_name).into());
+	package.insert("version".into(), "1.0.0".into());
+	package.insert("edition".into(), "2018".into());
+
+	wasm_workspace_toml.insert("package".into(), package.into());
+
+	let mut lib = Table::new();
+	lib.insert("name".into(), wasm_binary.into());
+	lib.insert("crate-type".into(), vec!["cdylib".to_string()].into());
+
+	wasm_workspace_toml.insert("lib".into(), lib.into());
+
+	let mut dependencies = Table::new();
+
+	let mut wasm_project = Table::new();
+	wasm_project.insert("package".into(), crate_name.into());
+	wasm_project.insert("path".into(), crate_path.display().to_string().into());
+	wasm_project.insert("default-features".into(), false.into());
+	wasm_project.insert("features".into(), enabled_features.to_vec().into());
+
+	dependencies.insert("wasm-project".into(), wasm_project.into());
+
+	wasm_workspace_toml.insert("dependencies".into(), dependencies.into());
+
+	wasm_workspace_toml.insert("workspace".into(), Table::new().into());
+
 	write_file_if_changed(
 		wasm_workspace.join("Cargo.toml"),
 		toml::to_string_pretty(&wasm_workspace_toml).expect("Wasm workspace toml is valid; qed"),
@@ -394,56 +332,48 @@ fn has_runtime_wasm_feature_declared(
 /// Create the project used to build the wasm binary.
 ///
 /// # Returns
-/// The path to the created project.
-fn create_project(cargo_manifest: &Path, wasm_workspace: &Path, crate_metadata: &Metadata) -> PathBuf {
-	let crate_name = get_crate_name(cargo_manifest);
-	let crate_path = cargo_manifest.parent().expect("Parent path exists; qed");
-	let wasm_binary = get_wasm_binary_name(cargo_manifest);
-	let project_folder = wasm_workspace.join(&crate_name);
-
-	fs::create_dir_all(project_folder.join("src"))
+///
+/// The path to the created wasm project.
+fn create_project(
+	project_cargo_toml: &Path,
+	wasm_workspace: &Path,
+	crate_metadata: &Metadata,
+	workspace_root_path: &Path,
+) -> PathBuf {
+	let crate_name = get_crate_name(project_cargo_toml);
+	let crate_path = project_cargo_toml.parent().expect("Parent path exists; qed");
+	let wasm_binary = get_wasm_binary_name(project_cargo_toml);
+	let wasm_project_folder = wasm_workspace.join(&crate_name);
+
+	fs::create_dir_all(wasm_project_folder.join("src"))
 		.expect("Wasm project dir create can not fail; qed");
 
-	let mut enabled_features = project_enabled_features(&cargo_manifest, &crate_metadata);
+	let mut enabled_features = project_enabled_features(&project_cargo_toml, &crate_metadata);
 
-	if has_runtime_wasm_feature_declared(cargo_manifest, crate_metadata) {
+	if has_runtime_wasm_feature_declared(project_cargo_toml, crate_metadata) {
 		enabled_features.push("runtime-wasm".into());
 	}
 
-	write_file_if_changed(
-		project_folder.join("Cargo.toml"),
-		format!(
-			r#"
-				[package]
-				name = "{crate_name}-wasm"
-				version = "1.0.0"
-				edition = "2018"
-
-				[lib]
-				name = "{wasm_binary}"
-				crate-type = ["cdylib"]
-
-				[dependencies]
-				wasm_project = {{ package = "{crate_name}", path = "{crate_path}", default-features = false, features = [ {features} ] }}
-			"#,
-			crate_name = crate_name,
-			crate_path = crate_path.display(),
-			wasm_binary = wasm_binary,
-			features = enabled_features.into_iter().map(|f| format!("\"{}\"", f)).join(","),
-		)
+	create_project_cargo_toml(
+		&wasm_project_folder,
+		workspace_root_path,
+		&crate_name,
+		&crate_path,
+		&wasm_binary,
+		&enabled_features,
 	);
 
 	write_file_if_changed(
-		project_folder.join("src/lib.rs"),
+		wasm_project_folder.join("src/lib.rs"),
 		"#![no_std] pub use wasm_project::*;",
 	);
 
-	if let Some(crate_lock_file) = find_cargo_lock(cargo_manifest) {
+	if let Some(crate_lock_file) = find_cargo_lock(project_cargo_toml) {
 		// Use the `Cargo.lock` of the main project.
-		crate::copy_file_if_changed(crate_lock_file, wasm_workspace.join("Cargo.lock"));
+		crate::copy_file_if_changed(crate_lock_file, wasm_project_folder.join("Cargo.lock"));
 	}
 
-	project_folder
+	wasm_project_folder
 }
 
 /// Returns if the project should be built as a release.
@@ -474,9 +404,13 @@ fn build_project(project: &Path, default_rustflags: &str, cargo_cmd: CargoComman
 		env::var(crate::WASM_BUILD_RUSTFLAGS_ENV).unwrap_or_default(),
 	);
 
-	build_cmd.args(&["rustc", "--target=wasm32-unknown-unknown"])
+	build_cmd.args(&["-Zfeatures=build_dep", "rustc", "--target=wasm32-unknown-unknown"])
 		.arg(format!("--manifest-path={}", manifest_path.display()))
 		.env("RUSTFLAGS", rustflags)
+		// Unset the `CARGO_TARGET_DIR` to prevent a cargo deadlock (cargo locks a target dir exclusive).
+		// The runner project is created in `CARGO_TARGET_DIR` and executing it will create a sub target
+		// directory inside of `CARGO_TARGET_DIR`.
+		.env_remove("CARGO_TARGET_DIR")
 		// We don't want to call ourselves recursively
 		.env(crate::SKIP_BUILD_ENV, "");
 
@@ -503,14 +437,14 @@ fn build_project(project: &Path, default_rustflags: &str, cargo_cmd: CargoComman
 fn compact_wasm_file(
 	project: &Path,
 	cargo_manifest: &Path,
-	wasm_workspace: &Path,
 ) -> (Option<WasmBinary>, WasmBinaryBloaty) {
 	let is_release_build = is_release_build();
 	let target = if is_release_build { "release" } else { "debug" };
 	let wasm_binary = get_wasm_binary_name(cargo_manifest);
-	let wasm_file = wasm_workspace.join("target/wasm32-unknown-unknown")
+	let wasm_file = project.join("target/wasm32-unknown-unknown")
 		.join(target)
 		.join(format!("{}.wasm", wasm_binary));
+
 	let wasm_compact_file = if is_release_build {
 		let wasm_compact_file = project.join(format!("{}.compact.wasm", wasm_binary));
 		wasm_gc::garbage_collect_file(&wasm_file, &wasm_compact_file)

From 31733d5075bdba62df00975df0463a56fadbcaa1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Nov 2020 09:44:01 +0000
Subject: [PATCH 0100/1194] Bump tracing from 0.1.21 to 0.1.22 (#7589)

Bumps [tracing](https://github.com/tokio-rs/tracing) from 0.1.21 to 0.1.22.
- [Release notes](https://github.com/tokio-rs/tracing/releases)
- [Commits](https://github.com/tokio-rs/tracing/compare/tracing-0.1.21...tracing-0.1.22)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                                   | 24 ++++++++++++--------
 bin/node/cli/Cargo.toml                      |  2 +-
 client/cli/Cargo.toml                        |  2 +-
 client/executor/Cargo.toml                   |  2 +-
 client/service/Cargo.toml                    |  2 +-
 client/tracing/Cargo.toml                    |  2 +-
 primitives/io/Cargo.toml                     |  2 +-
 primitives/runtime-interface/test/Cargo.toml |  2 +-
 primitives/tracing/Cargo.toml                |  2 +-
 9 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 57ab273804c0..710e3519d955 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -301,7 +301,7 @@ dependencies = [
  "memchr",
  "num_cpus",
  "once_cell",
- "pin-project-lite",
+ "pin-project-lite 0.1.11",
  "pin-utils",
  "slab",
  "wasm-bindgen-futures",
@@ -1902,7 +1902,7 @@ dependencies = [
  "futures-io",
  "memchr",
  "parking",
- "pin-project-lite",
+ "pin-project-lite 0.1.11",
  "waker-fn",
 ]
 
@@ -5554,6 +5554,12 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b"
 
+[[package]]
+name = "pin-project-lite"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b063f57ec186e6140e2b8b6921e5f1bd89c7356dda5b33acc5401203ca6131c"
+
 [[package]]
 name = "pin-utils"
 version = "0.1.0"
@@ -5846,7 +5852,7 @@ checksum = "77de3c815e5a160b1539c6592796801df2043ae35e123b46d73380cfa57af858"
 dependencies = [
  "futures-core",
  "futures-sink",
- "pin-project-lite",
+ "pin-project-lite 0.1.11",
 ]
 
 [[package]]
@@ -9315,7 +9321,7 @@ dependencies = [
  "mio",
  "mio-uds",
  "num_cpus",
- "pin-project-lite",
+ "pin-project-lite 0.1.11",
  "signal-hook-registry",
  "slab",
  "tokio-macros",
@@ -9546,7 +9552,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "log",
- "pin-project-lite",
+ "pin-project-lite 0.1.11",
  "tokio 0.2.23",
 ]
 
@@ -9567,13 +9573,13 @@ checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
 
 [[package]]
 name = "tracing"
-version = "0.1.21"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0987850db3733619253fe60e17cb59b82d37c7e6c0236bb81e4d6b87c879f27"
+checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "log",
- "pin-project-lite",
+ "pin-project-lite 0.2.0",
  "tracing-attributes",
  "tracing-core",
 ]
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index 604f4132ee1f..6574ccb733b5 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -41,7 +41,7 @@ hex-literal = "0.3.1"
 log = "0.4.8"
 rand = "0.7.2"
 structopt = { version = "0.3.8", optional = true }
-tracing = "0.1.19"
+tracing = "0.1.22"
 parking_lot = "0.10.0"
 
 # primitives
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index b0662c5eddf7..900dddf87018 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -45,7 +45,7 @@ structopt = "0.3.8"
 sc-tracing = { version = "2.0.0", path = "../tracing" }
 chrono = "0.4.10"
 serde = "1.0.111"
-tracing = "0.1.10"
+tracing = "0.1.22"
 tracing-log = "0.1.1"
 tracing-subscriber = "0.2.10"
 sc-cli-proc-macro = { version = "2.0.0", path = "./proc-macro" }
diff --git a/client/executor/Cargo.toml b/client/executor/Cargo.toml
index b88e8926be14..803a49d1deaa 100644
--- a/client/executor/Cargo.toml
+++ b/client/executor/Cargo.toml
@@ -48,7 +48,7 @@ test-case = "0.3.3"
 sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
 sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
 sc-tracing = { version = "2.0.0", path = "../tracing" }
-tracing = "0.1.19"
+tracing = "0.1.22"
 tracing-subscriber = "0.2.10"
 
 [features]
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index b85ebde3c1d2..3d0b00820fe6 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -76,7 +76,7 @@ sc-offchain = { version = "2.0.0", path = "../offchain" }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.8.0"}
 sc-tracing = { version = "2.0.0", path = "../tracing" }
 sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
-tracing = "0.1.19"
+tracing = "0.1.22"
 tracing-futures = { version = "0.2.4" }
 parity-util-mem = { version = "0.7.0", default-features = false, features = ["primitive-types"] }
 
diff --git a/client/tracing/Cargo.toml b/client/tracing/Cargo.toml
index 35db326c9492..4964adafe649 100644
--- a/client/tracing/Cargo.toml
+++ b/client/tracing/Cargo.toml
@@ -20,7 +20,7 @@ rustc-hash = "1.1.0"
 serde = "1.0.101"
 serde_json = "1.0.41"
 slog = { version = "2.5.2", features = ["nested-values"] }
-tracing = "0.1.21"
+tracing = "0.1.22"
 tracing-core = "0.1.17"
 tracing-subscriber = "0.2.13"
 sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
diff --git a/primitives/io/Cargo.toml b/primitives/io/Cargo.toml
index e8483b2ef68c..e470461d60b8 100644
--- a/primitives/io/Cargo.toml
+++ b/primitives/io/Cargo.toml
@@ -30,7 +30,7 @@ sp-tracing = { version = "2.0.0", default-features = false, path = "../tracing"
 log = { version = "0.4.8", optional = true }
 futures = { version = "0.3.1", features = ["thread-pool"], optional = true }
 parking_lot = { version = "0.10.0", optional = true }
-tracing = { version = "0.1.19", default-features = false }
+tracing = { version = "0.1.22", default-features = false }
 tracing-core = { version = "0.1.17", default-features = false}
 
 [features]
diff --git a/primitives/runtime-interface/test/Cargo.toml b/primitives/runtime-interface/test/Cargo.toml
index d802f9cb6b39..d6da3db4b69b 100644
--- a/primitives/runtime-interface/test/Cargo.toml
+++ b/primitives/runtime-interface/test/Cargo.toml
@@ -20,5 +20,5 @@ sp-state-machine = { version = "0.8.0", path = "../../../primitives/state-machin
 sp-runtime = { version = "2.0.0", path = "../../runtime" }
 sp-core = { version = "2.0.0", path = "../../core" }
 sp-io = { version = "2.0.0", path = "../../io" }
-tracing = "0.1.19"
+tracing = "0.1.22"
 tracing-core = "0.1.17"
diff --git a/primitives/tracing/Cargo.toml b/primitives/tracing/Cargo.toml
index 1000952b39fd..ba370f46b9b6 100644
--- a/primitives/tracing/Cargo.toml
+++ b/primitives/tracing/Cargo.toml
@@ -20,7 +20,7 @@ targets = ["x86_64-unknown-linux-gnu", "wasm32-unknown-unknown"]
 [dependencies]
 sp-std = { version = "2.0.0", path = "../std", default-features = false}
 codec = { version = "1.3.1", package = "parity-scale-codec", default-features = false, features = ["derive"]}
-tracing = { version = "0.1.21", default-features = false }
+tracing = { version = "0.1.22", default-features = false }
 tracing-core = { version = "0.1.17", default-features = false }
 log = { version = "0.4.8", optional = true }
 tracing-subscriber = { version = "0.2.10", optional = true, features = ["tracing-log"] }

From 9a29852e4e4005a3050c4104a25ffe734ace3bc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Tue, 24 Nov 2020 11:42:20 +0100
Subject: [PATCH 0101/1194] contracts: Add `salt` argument to contract
 instantiation (#7482)

* pallet-contracts: Fix seal_restore_to to output proper module errors

Those errors where part of the decl_error for some time but where
never actually returned. This allows proper debugging of failed
restorations. Previously, any error did return the misleading
`ContractTrapped`.

* Bind UncheckedFrom<T::Hash> + AsRef<[u8]> everywhere

This allows us to make assumptions about the AccoutId
that are necessary for testing and in order to benchmark
the module properly.

This also groups free standing functions into inherent functions
in order to minimize the places where the new bounds need to
be specified.

* Rework contract address determination

* Do not allow override by runtime author
* Instantiate gained a new parameter "salt"

This change is done now in expecation of the upcoming code rent
which needs to change the instantiation dispatchable and
host function anyways.

The situation in where we have only something that is like CREATE2
makes it impossible for UIs to help the user to create an arbitrary
amount of instantiations from the same code.

With this change we have the same functionality as ethereum with
a CREATE and CREATE2 instantation semantic.

* Remove TrieIdGenerator

The new trait bounds allows us to remove this workaround
from the configuration trait.

* Remove default parameters for config trait

It should be solely the responsiblity to determine proper values for
these parameter. As a matter of fact most runtime weren't using these
values anyways.

* Fix tests for new account id type

Because of the new bounds on the trait tests can't get away by using
u64 as accound id. Replacing the 8 byte value by a 32 byte value
creates out quite a bit of code churn.

* Fix benchmarks

The benchmarks need adaption to the new instantiate semantics.

* Fix compile errors caused by adding new trait bounds
* Fix compile errors caused by renaming storage and rent functions
* Adapt host functions and dispatchables to the new salt
* Add tests for instantiate host functions (was not possible before)

* Add benchmark results

* Adapt to the new WeightInfo

The new benchmarks add a new parameter for salt "s" to the instantiate weights
that needs to be applied.

* Fix deploying_wasm_contract_should_work integration test

This test is adapted to use the new instantiate signature.

* Break overlong line

* Break more long lines

Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
---
 bin/node/executor/tests/basic.rs              |   8 +-
 bin/node/runtime/src/lib.rs                   |  14 +-
 frame/contracts/fixtures/call_return_code.wat |  36 +-
 frame/contracts/fixtures/caller_contract.wat  |  21 +-
 .../fixtures/destroy_and_transfer.wat         |  42 +-
 frame/contracts/fixtures/drain.wat            |   2 +-
 .../fixtures/instantiate_return_code.wat      |  38 +-
 frame/contracts/fixtures/restoration.wat      |  23 +-
 frame/contracts/fixtures/self_destruct.wat    |  39 +-
 .../fixtures/self_destructing_constructor.wat |   2 +-
 frame/contracts/fixtures/set_rent.wat         |  28 +-
 .../fixtures/transfer_return_code.wat         |  21 +-
 frame/contracts/src/benchmarking/code.rs      |  25 +-
 frame/contracts/src/benchmarking/mod.rs       |  63 +-
 frame/contracts/src/benchmarking/sandbox.rs   |  13 +-
 frame/contracts/src/exec.rs                   | 111 +-
 frame/contracts/src/lib.rs                    | 195 ++--
 frame/contracts/src/rent.rs                   | 749 +++++++-------
 frame/contracts/src/schedule.rs               |   8 +-
 frame/contracts/src/storage.rs                | 342 ++++---
 frame/contracts/src/tests.rs                  | 505 +++++----
 frame/contracts/src/wasm/code_cache.rs        |   7 +-
 frame/contracts/src/wasm/env_def/macros.rs    |  14 +-
 frame/contracts/src/wasm/mod.rs               | 194 ++--
 frame/contracts/src/wasm/runtime.rs           | 850 ++++++++-------
 frame/contracts/src/weights.rs                | 965 +++++++-----------
 26 files changed, 2170 insertions(+), 2145 deletions(-)

diff --git a/bin/node/executor/tests/basic.rs b/bin/node/executor/tests/basic.rs
index a48efaea2d69..236e0a823ac3 100644
--- a/bin/node/executor/tests/basic.rs
+++ b/bin/node/executor/tests/basic.rs
@@ -27,7 +27,6 @@ use sp_runtime::{
 	traits::Hash as HashT,
 	transaction_validity::InvalidTransaction,
 };
-use pallet_contracts::ContractAddressFor;
 use frame_system::{self, EventRecord, Phase};
 
 use node_runtime::{
@@ -583,10 +582,10 @@ fn deploying_wasm_contract_should_work() {
 	let transfer_code = wat::parse_str(CODE_TRANSFER).unwrap();
 	let transfer_ch = <Runtime as frame_system::Trait>::Hashing::hash(&transfer_code);
 
-	let addr = <Runtime as pallet_contracts::Trait>::DetermineContractAddress::contract_address_for(
+	let addr = pallet_contracts::Module::<Runtime>::contract_address(
+		&charlie(),
 		&transfer_ch,
 		&[],
-		&charlie(),
 	);
 
 	let subsistence = pallet_contracts::Config::<Runtime>::subsistence_threshold_uncached();
@@ -613,7 +612,8 @@ fn deploying_wasm_contract_should_work() {
 						1 * DOLLARS + subsistence,
 						500_000_000,
 						transfer_ch,
-						Vec::new()
+						Vec::new(),
+						Vec::new(),
 					)
 				),
 			},
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 958d2fe19e03..4feff5d051ab 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -675,6 +675,10 @@ parameter_types! {
 	pub const RentByteFee: Balance = 4 * MILLICENTS;
 	pub const RentDepositOffset: Balance = 1000 * MILLICENTS;
 	pub const SurchargeReward: Balance = 150 * MILLICENTS;
+	pub const SignedClaimHandicap: u32 = 2;
+	pub const MaxDepth: u32 = 32;
+	pub const StorageSizeOffset: u32 = 8;
+	pub const MaxValueSize: u32 = 16 * 1024;
 }
 
 impl pallet_contracts::Trait for Runtime {
@@ -682,17 +686,15 @@ impl pallet_contracts::Trait for Runtime {
 	type Randomness = RandomnessCollectiveFlip;
 	type Currency = Balances;
 	type Event = Event;
-	type DetermineContractAddress = pallet_contracts::SimpleAddressDeterminer<Runtime>;
-	type TrieIdGenerator = pallet_contracts::TrieIdFromParentCounter<Runtime>;
 	type RentPayment = ();
-	type SignedClaimHandicap = pallet_contracts::DefaultSignedClaimHandicap;
+	type SignedClaimHandicap = SignedClaimHandicap;
 	type TombstoneDeposit = TombstoneDeposit;
-	type StorageSizeOffset = pallet_contracts::DefaultStorageSizeOffset;
+	type StorageSizeOffset = StorageSizeOffset;
 	type RentByteFee = RentByteFee;
 	type RentDepositOffset = RentDepositOffset;
 	type SurchargeReward = SurchargeReward;
-	type MaxDepth = pallet_contracts::DefaultMaxDepth;
-	type MaxValueSize = pallet_contracts::DefaultMaxValueSize;
+	type MaxDepth = MaxDepth;
+	type MaxValueSize = MaxValueSize;
 	type WeightPrice = pallet_transaction_payment::Module<Self>;
 	type WeightInfo = pallet_contracts::weights::SubstrateWeight<Self>;
 }
diff --git a/frame/contracts/fixtures/call_return_code.wat b/frame/contracts/fixtures/call_return_code.wat
index f7a7ff20a49e..4e9ab4dd77ce 100644
--- a/frame/contracts/fixtures/call_return_code.wat
+++ b/frame/contracts/fixtures/call_return_code.wat
@@ -1,5 +1,5 @@
-;; This calls Django (4) and transfers 100 balance during this call and copies the return code
-;; of this call to the output buffer.
+;; This calls the supplied dest and transfers 100 balance during this call and copies
+;; the return code of this call to the output buffer.
 ;; It also forwards its input to the callee.
 (module
 	(import "seal0" "seal_input" (func $seal_input (param i32 i32)))
@@ -7,38 +7,36 @@
 	(import "seal0" "seal_return" (func $seal_return (param i32 i32 i32)))
 	(import "env" "memory" (memory 1 1))
 
-	;; [0, 8) address of django
-	(data (i32.const 0) "\04\00\00\00\00\00\00\00")
+	;; [0, 8) 100 balance
+	(data (i32.const 0) "\64\00\00\00\00\00\00\00")
 
-	;; [8, 16) 100 balance
-	(data (i32.const 8) "\64\00\00\00\00\00\00\00")
+	;; [8, 12) here we store the return code of the transfer
 
-	;; [16, 20) here we store the return code of the transfer
+	;; [12, 16) size of the input data
+	(data (i32.const 12) "\24")
 
-	;; [20, 24) here we store the input data
-
-	;; [24, 28) size of the input data
-	(data (i32.const 24) "\04")
+	;; [16, inf) here we store the input data
+	;; 32 byte dest + 4 byte forward
 
 	(func (export "deploy"))
 
 	(func (export "call")
-		(call $seal_input (i32.const 20) (i32.const 24))
+		(call $seal_input (i32.const 16) (i32.const 12))
 		(i32.store
-			(i32.const 16)
+			(i32.const 8)
 			(call $seal_call
-				(i32.const 0) ;; Pointer to "callee" address.
-				(i32.const 8) ;; Length of "callee" address.
+				(i32.const 16) ;; Pointer to "callee" address.
+				(i32.const 32) ;; Length of "callee" address.
 				(i64.const 0) ;; How much gas to devote for the execution. 0 = all.
-				(i32.const 8) ;; Pointer to the buffer with value to transfer
+				(i32.const 0) ;; Pointer to the buffer with value to transfer
 				(i32.const 8) ;; Length of the buffer with value to transfer.
-				(i32.const 20) ;; Pointer to input data buffer address
-				(i32.load (i32.const 24)) ;; Length of input data buffer
+				(i32.const 48) ;; Pointer to input data buffer address
+				(i32.const 4) ;; Length of input data buffer
 				(i32.const 0xffffffff) ;; u32 max sentinel value: do not copy output
 				(i32.const 0) ;; Ptr to output buffer len
 			)
 		)
 		;; exit with success and take transfer return code to the output buffer
-		(call $seal_return (i32.const 0) (i32.const 16) (i32.const 4))
+		(call $seal_return (i32.const 0) (i32.const 8) (i32.const 4))
 	)
 )
diff --git a/frame/contracts/fixtures/caller_contract.wat b/frame/contracts/fixtures/caller_contract.wat
index 408af92e1829..d6564117b721 100644
--- a/frame/contracts/fixtures/caller_contract.wat
+++ b/frame/contracts/fixtures/caller_contract.wat
@@ -2,7 +2,9 @@
 	(import "seal0" "seal_input" (func $seal_input (param i32 i32)))
 	(import "seal0" "seal_balance" (func $seal_balance (param i32 i32)))
 	(import "seal0" "seal_call" (func $seal_call (param i32 i32 i64 i32 i32 i32 i32 i32 i32) (result i32)))
-	(import "seal0" "seal_instantiate" (func $seal_instantiate (param i32 i32 i64 i32 i32 i32 i32 i32 i32 i32 i32) (result i32)))
+	(import "seal0" "seal_instantiate" (func $seal_instantiate
+		(param i32 i32 i64 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32) (result i32)
+	))
 	(import "seal0" "seal_println" (func $seal_println (param i32 i32)))
 	(import "env" "memory" (memory 1 1))
 
@@ -71,6 +73,8 @@
 				(i32.const 0) ;; Length is ignored in this case
 				(i32.const 4294967295) ;; u32 max sentinel value: do not copy output
 				(i32.const 0) ;; Length is ignored in this case
+				(i32.const 0) ;; salt_ptr
+				(i32.const 0) ;; salt_le
 			)
 		)
 
@@ -98,6 +102,9 @@
 				(i32.const 0) ;; Length is ignored in this case
 				(i32.const 4294967295) ;; u32 max sentinel value: do not copy output
 				(i32.const 0) ;; Length is ignored in this case
+				(i32.const 0) ;; salt_ptr
+				(i32.const 0) ;; salt_le
+
 			)
 		)
 
@@ -114,7 +121,7 @@
 		;; Length of the output buffer
 		(i32.store
 			(i32.sub (get_local $sp) (i32.const 4))
-			(i32.const 8)
+			(i32.const 256)
 		)
 
 		;; Deploy the contract successfully.
@@ -131,6 +138,8 @@
 				(i32.sub (get_local $sp) (i32.const 4)) ;; Pointer to the address buffer length
 				(i32.const 4294967295) ;; u32 max sentinel value: do not copy output
 				(i32.const 0) ;; Length is ignored in this case
+				(i32.const 0) ;; salt_ptr
+				(i32.const 0) ;; salt_le
 
 			)
 		)
@@ -142,7 +151,7 @@
 
 		;; Check that address has the expected length
 		(call $assert
-			(i32.eq (i32.load (i32.sub (get_local $sp) (i32.const 4))) (i32.const 8))
+			(i32.eq (i32.load (i32.sub (get_local $sp) (i32.const 4))) (i32.const 32))
 		)
 
 		;; Check that balance has been deducted.
@@ -169,7 +178,7 @@
 		(set_local $exit_code
 			(call $seal_call
 				(i32.const 16)	;; Pointer to "callee" address.
-				(i32.const 8)	;; Length of "callee" address.
+				(i32.const 32)	;; Length of "callee" address.
 				(i64.const 0)	;; How much gas to devote for the execution. 0 = all.
 				(i32.const 0)	;; Pointer to the buffer with value to transfer
 				(i32.const 8)	;; Length of the buffer with value to transfer.
@@ -205,7 +214,7 @@
 		(set_local $exit_code
 			(call $seal_call
 				(i32.const 16)	;; Pointer to "callee" address.
-				(i32.const 8)	;; Length of "callee" address.
+				(i32.const 32)	;; Length of "callee" address.
 				(i64.const 1) ;; Supply too little gas
 				(i32.const 0)	;; Pointer to the buffer with value to transfer
 				(i32.const 8)	;; Length of the buffer with value to transfer.
@@ -242,7 +251,7 @@
 		(set_local $exit_code
 			(call $seal_call
 				(i32.const 16)	;; Pointer to "callee" address.
-				(i32.const 8)	;; Length of "callee" address.
+				(i32.const 32)	;; Length of "callee" address.
 				(i64.const 0)	;; How much gas to devote for the execution. 0 = all.
 				(i32.const 0)	;; Pointer to the buffer with value to transfer
 				(i32.const 8)	;; Length of the buffer with value to transfer.
diff --git a/frame/contracts/fixtures/destroy_and_transfer.wat b/frame/contracts/fixtures/destroy_and_transfer.wat
index 3220f4e612d7..7e1d84f3cf98 100644
--- a/frame/contracts/fixtures/destroy_and_transfer.wat
+++ b/frame/contracts/fixtures/destroy_and_transfer.wat
@@ -4,7 +4,9 @@
 	(import "seal0" "seal_set_storage" (func $seal_set_storage (param i32 i32 i32)))
 	(import "seal0" "seal_call" (func $seal_call (param i32 i32 i64 i32 i32 i32 i32 i32 i32) (result i32)))
 	(import "seal0" "seal_transfer" (func $seal_transfer (param i32 i32 i32 i32) (result i32)))
-	(import "seal0" "seal_instantiate" (func $seal_instantiate (param i32 i32 i64 i32 i32 i32 i32 i32 i32 i32 i32) (result i32)))
+	(import "seal0" "seal_instantiate"  (func $seal_instantiate
+		(param i32 i32 i64 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32) (result i32)
+	))
 	(import "env" "memory" (memory 1 1))
 
 	;; [0, 8) Endowment to send when creating contract.
@@ -16,14 +18,18 @@
 
 	;; [48, 80) Buffer where to store the input to the contract
 
-	;; [80, 88) Buffer where to store the address of the instantiated contract
-
 	;; [88, 96) Size of the buffer
-	(data (i32.const 88) "\08")
+	(data (i32.const 88) "\FF")
 
 	;; [96, 100) Size of the input buffer
 	(data (i32.const 96) "\20")
 
+	;; [100, 132) Buffer where to store the address of the instantiated contract
+
+	;; [132, 134) Salt
+	(data (i32.const 132) "\47\11")
+
+
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
@@ -54,10 +60,12 @@
 					(i32.const 8)	;; Length of the buffer with value to transfer.
 					(i32.const 0)	;; Pointer to input data buffer address
 					(i32.const 0)	;; Length of input data buffer
-					(i32.const 80)	;; Buffer where to store address of new contract
+					(i32.const 100)	;; Buffer where to store address of new contract
 					(i32.const 88)	;; Pointer to the length of the buffer
 					(i32.const 4294967295) ;; u32 max sentinel value: do not copy output
-					(i32.const 0) ;; Length is ignored in this cas
+					(i32.const 0) ;; Length is ignored in this case
+					(i32.const 132) ;; salt_ptr
+					(i32.const 2) ;; salt_len
 				)
 				(i32.const 0)
 			)
@@ -67,15 +75,15 @@
 		(call $assert
 			(i32.eq
 				(i32.load (i32.const 88))
-				(i32.const 8)
+				(i32.const 32)
 			)
 		)
 
 		;; Store the return address.
 		(call $seal_set_storage
 			(i32.const 16)	;; Pointer to the key
-			(i32.const 80)	;; Pointer to the value
-			(i32.const 8)	;; Length of the value
+			(i32.const 100)	;; Pointer to the value
+			(i32.const 32)	;; Length of the value
 		)
 	)
 
@@ -85,7 +93,7 @@
 			(i32.eq
 				(call $seal_get_storage
 					(i32.const 16)	;; Pointer to the key
-					(i32.const 80)	;; Pointer to the value
+					(i32.const 100)	;; Pointer to the value
 					(i32.const 88)	;; Pointer to the len of the value
 				)
 				(i32.const 0)
@@ -94,7 +102,7 @@
 		(call $assert
 			(i32.eq
 				(i32.load (i32.const 88))
-				(i32.const 8)
+				(i32.const 32)
 			)
 		)
 
@@ -102,8 +110,8 @@
 		(call $assert
 			(i32.eq
 				(call $seal_call
-					(i32.const 80)	;; Pointer to destination address
-					(i32.const 8)	;; Length of destination address
+					(i32.const 100)	;; Pointer to destination address
+					(i32.const 32)	;; Length of destination address
 					(i64.const 0)	;; How much gas to devote for the execution. 0 = all.
 					(i32.const 0)	;; Pointer to the buffer with value to transfer
 					(i32.const 8)	;; Length of the buffer with value to transfer
@@ -121,8 +129,8 @@
 		(call $assert
 			(i32.eq
 				(call $seal_call
-					(i32.const 80)	;; Pointer to destination address
-					(i32.const 8)	;; Length of destination address
+					(i32.const 100)	;; Pointer to destination address
+					(i32.const 32)	;; Length of destination address
 					(i64.const 0)	;; How much gas to devote for the execution. 0 = all.
 					(i32.const 8)	;; Pointer to the buffer with value to transfer
 					(i32.const 8)	;; Length of the buffer with value to transfer
@@ -141,8 +149,8 @@
 		(call $assert
 			(i32.eq
 				(call $seal_transfer
-					(i32.const 80)	;; Pointer to destination address
-					(i32.const 8)	;; Length of destination address
+					(i32.const 100)	;; Pointer to destination address
+					(i32.const 32)	;; Length of destination address
 					(i32.const 0)	;; Pointer to the buffer with value to transfer
 					(i32.const 8)	;; Length of the buffer with value to transfer
 				)
diff --git a/frame/contracts/fixtures/drain.wat b/frame/contracts/fixtures/drain.wat
index 9180047f5d01..546026ac9598 100644
--- a/frame/contracts/fixtures/drain.wat
+++ b/frame/contracts/fixtures/drain.wat
@@ -38,7 +38,7 @@
 			(i32.eq
 				(call $seal_transfer
 					(i32.const 16)	;; Pointer to destination address
-					(i32.const 8)	;; Length of destination address
+					(i32.const 32)	;; Length of destination address
 					(i32.const 0)	;; Pointer to the buffer with value to transfer
 					(i32.const 8)	;; Length of the buffer with value to transfer
 				)
diff --git a/frame/contracts/fixtures/instantiate_return_code.wat b/frame/contracts/fixtures/instantiate_return_code.wat
index 20ab96d88ad2..cead1f1c9fa4 100644
--- a/frame/contracts/fixtures/instantiate_return_code.wat
+++ b/frame/contracts/fixtures/instantiate_return_code.wat
@@ -1,47 +1,49 @@
-;; This instantiats Charlie (3) and transfers 100 balance during this call and copies the return code
+;; This instantiats a contract and transfers 100 balance during this call and copies the return code
 ;; of this call to the output buffer.
 ;; The first 32 byte of input is the code hash to instantiate
 ;; The rest of the input is forwarded to the constructor of the callee
 (module
 	(import "seal0" "seal_input" (func $seal_input (param i32 i32)))
-	(import "seal0" "seal_instantiate" (func $seal_instantiate (param i32 i32 i64 i32 i32 i32 i32 i32 i32 i32 i32) (result i32)))
+	(import "seal0" "seal_instantiate" (func $seal_instantiate
+		(param i32 i32 i64 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32) (result i32)
+	))
 	(import "seal0" "seal_return" (func $seal_return (param i32 i32 i32)))
 	(import "env" "memory" (memory 1 1))
 
-	;; [0, 8) address of django
-	(data (i32.const 0) "\04\00\00\00\00\00\00\00")
+	;; [0, 8) 100 balance
+	(data (i32.const 0) "\64\00\00\00\00\00\00\00")
 
-	;; [8, 16) 100 balance
-	(data (i32.const 8) "\64\00\00\00\00\00\00\00")
+	;; [8, 12) here we store the return code of the transfer
 
-	;; [16, 20) here we store the return code of the transfer
+	;; [12, 16) size of the input buffer
+	(data (i32.const 12) "\24")
 
-	;; [20, 24) size of the input buffer
-	(data (i32.const 20) "\FF")
-
-	;; [24, inf) input buffer
+	;; [16, inf) input buffer
+	;; 32 bye code hash + 4 byte forward
 
 	(func (export "deploy"))
 
 	(func (export "call")
-		(call $seal_input (i32.const 24) (i32.const 20))
+		(call $seal_input (i32.const 16) (i32.const 12))
 		(i32.store
-			(i32.const 16)
+			(i32.const 8)
 			(call $seal_instantiate
-				(i32.const 24) ;; Pointer to the code hash.
+				(i32.const 16) ;; Pointer to the code hash.
 				(i32.const 32) ;; Length of the code hash.
 				(i64.const 0) ;; How much gas to devote for the execution. 0 = all.
-				(i32.const 8) ;; Pointer to the buffer with value to transfer
+				(i32.const 0) ;; Pointer to the buffer with value to transfer
 				(i32.const 8) ;; Length of the buffer with value to transfer.
-				(i32.const 56) ;; Pointer to input data buffer address
-				(i32.sub (i32.load (i32.const 20)) (i32.const 32)) ;; Length of input data buffer
+				(i32.const 48) ;; Pointer to input data buffer address
+				(i32.const 4) ;; Length of input data buffer
 				(i32.const 0xffffffff) ;; u32 max sentinel value: do not copy address
 				(i32.const 0) ;; Length is ignored in this case
 				(i32.const 0xffffffff) ;; u32 max sentinel value: do not copy output
 				(i32.const 0) ;; Length is ignored in this case
+				(i32.const 0) ;; salt_ptr
+				(i32.const 0) ;; salt_len
 			)
 		)
 		;; exit with success and take transfer return code to the output buffer
-		(call $seal_return (i32.const 0) (i32.const 16) (i32.const 4))
+		(call $seal_return (i32.const 0) (i32.const 8) (i32.const 4))
 	)
 )
diff --git a/frame/contracts/fixtures/restoration.wat b/frame/contracts/fixtures/restoration.wat
index 3c15f7ae0881..3462af287081 100644
--- a/frame/contracts/fixtures/restoration.wat
+++ b/frame/contracts/fixtures/restoration.wat
@@ -19,20 +19,19 @@
 
 	(func (export "call")
 		;; copy code hash to contract memory
-		(call $seal_input (i32.const 264) (i32.const 304))
+		(call $seal_input (i32.const 308) (i32.const 304))
 		(call $assert
 			(i32.eq
 				(i32.load (i32.const 304))
-				(i32.const 32)
+				(i32.const 64)
 			)
 		)
-
 		(call $seal_restore_to
 			;; Pointer and length of the encoded dest buffer.
-			(i32.const 256)
-			(i32.const 8)
+			(i32.const 340)
+			(i32.const 32)
 			;; Pointer and length of the encoded code hash buffer
-			(i32.const 264)
+			(i32.const 308)
 			(i32.const 32)
 			;; Pointer and length of the encoded rent_allowance buffer
 			(i32.const 296)
@@ -65,14 +64,12 @@
 	;; Buffer that has ACL storage keys.
 	(data (i32.const 100) "\01")
 
-	;; Address of bob
-	(data (i32.const 256) "\02\00\00\00\00\00\00\00")
-
-	;; [264, 296) Code hash of SET_RENT (copied here by seal_input)
-
 	;; [296, 304) Rent allowance
 	(data (i32.const 296) "\32\00\00\00\00\00\00\00")
 
-	;; [304, 308) Size of SET_RENT buffer
-	(data (i32.const 304) "\20")
+	;; [304, 308) Size of the buffer that holds code_hash + addr
+	(data (i32.const 304) "\40")
+
+	;; [308, 340) code hash of bob (copied by seal_input)
+	;; [340, 372) addr of bob (copied by seal_input)
 )
diff --git a/frame/contracts/fixtures/self_destruct.wat b/frame/contracts/fixtures/self_destruct.wat
index 6898e746b083..b8a37306e201 100644
--- a/frame/contracts/fixtures/self_destruct.wat
+++ b/frame/contracts/fixtures/self_destruct.wat
@@ -5,20 +5,23 @@
 	(import "seal0" "seal_terminate" (func $seal_terminate (param i32 i32)))
 	(import "env" "memory" (memory 1 1))
 
-	;; [0, 8) reserved for $seal_address output
+	;; [0, 32) reserved for $seal_address output
 
-	;; [8, 16) length of the buffer
-	(data (i32.const 8) "\08")
+	;; [32, 36) length of the buffer
+	(data (i32.const 32) "\20")
 
-	;; [16, 24) Address of django
-	(data (i32.const 16) "\04\00\00\00\00\00\00\00")
+	;; [36, 68) Address of django
+	(data (i32.const 36)
+		"\04\04\04\04\04\04\04\04\04\04\04\04\04\04\04\04"
+		"\04\04\04\04\04\04\04\04\04\04\04\04\04\04\04\04"
+	)
 
-	;; [24, 32) reserved for output of $seal_input
+	;; [68, 72) reserved for output of $seal_input
 
-	;; [32, 36) length of the buffer
-	(data (i32.const 32) "\04")
+	;; [72, 76) length of the buffer
+	(data (i32.const 72) "\04")
 
-	;; [36, inf) zero initialized
+	;; [76, inf) zero initialized
 
 	(func $assert (param i32)
 		(block $ok
@@ -36,16 +39,16 @@
 		;; This should trap instead of self-destructing since a contract cannot be removed live in
 		;; the execution stack cannot be removed. If the recursive call traps, then trap here as
 		;; well.
-		(call $seal_input (i32.const 24) (i32.const 32))
-		(if (i32.load (i32.const 32))
+		(call $seal_input (i32.const 68) (i32.const 72))
+		(if (i32.load (i32.const 72))
 			(then
-				(call $seal_address (i32.const 0) (i32.const 8))
+				(call $seal_address (i32.const 0) (i32.const 32))
 
 				;; Expect address to be 8 bytes.
 				(call $assert
 					(i32.eq
-						(i32.load (i32.const 8))
-						(i32.const 8)
+						(i32.load (i32.const 32))
+						(i32.const 32)
 					)
 				)
 
@@ -54,9 +57,9 @@
 					(i32.eq
 						(call $seal_call
 							(i32.const 0)	;; Pointer to own address
-							(i32.const 8)	;; Length of own address
+							(i32.const 32)	;; Length of own address
 							(i64.const 0)	;; How much gas to devote for the execution. 0 = all.
-							(i32.const 36)	;; Pointer to the buffer with value to transfer
+							(i32.const 76)	;; Pointer to the buffer with value to transfer
 							(i32.const 8)	;; Length of the buffer with value to transfer
 							(i32.const 0)	;; Pointer to input data buffer address
 							(i32.const 0)	;; Length of input data buffer
@@ -70,8 +73,8 @@
 			(else
 				;; Try to terminate and give balance to django.
 				(call $seal_terminate
-					(i32.const 16)	;; Pointer to beneficiary address
-					(i32.const 8)	;; Length of beneficiary address
+					(i32.const 36)	;; Pointer to beneficiary address
+					(i32.const 32)	;; Length of beneficiary address
 				)
 				(unreachable) ;; seal_terminate never returns
 			)
diff --git a/frame/contracts/fixtures/self_destructing_constructor.wat b/frame/contracts/fixtures/self_destructing_constructor.wat
index ab8c289f1b56..85fce511e21b 100644
--- a/frame/contracts/fixtures/self_destructing_constructor.wat
+++ b/frame/contracts/fixtures/self_destructing_constructor.wat
@@ -15,7 +15,7 @@
 		;; Self-destruct by sending full balance to the 0 address.
 		(call $seal_terminate
 			(i32.const 0)	;; Pointer to destination address
-			(i32.const 8)	;; Length of destination address
+			(i32.const 32)	;; Length of destination address
 		)
 	)
 
diff --git a/frame/contracts/fixtures/set_rent.wat b/frame/contracts/fixtures/set_rent.wat
index a09d3dc4bd47..1c6b512cc77a 100644
--- a/frame/contracts/fixtures/set_rent.wat
+++ b/frame/contracts/fixtures/set_rent.wat
@@ -26,7 +26,7 @@
 	(func $call_2
 		(call $assert
 			(i32.eq
-				(call $seal_transfer (i32.const 68) (i32.const 8) (i32.const 76) (i32.const 8))
+				(call $seal_transfer (i32.const 136) (i32.const 32) (i32.const 100) (i32.const 8))
 				(i32.const 0)
 			)
 		)
@@ -47,10 +47,11 @@
 	;; Dispatch the call according to input size
 	(func (export "call")
 		(local $input_size i32)
-		(i32.store (i32.const 64) (i32.const 64))
-		(call $seal_input (i32.const 1024) (i32.const 64))
+		;; 4 byte i32 for br_table followed by 32 byte destination for transfer
+		(i32.store (i32.const 128) (i32.const 36))
+		(call $seal_input (i32.const 132) (i32.const 128))
 		(set_local $input_size
-			(i32.load (i32.const 64))
+			(i32.load (i32.const 132))
 		)
 		(block $IF_ELSE
 			(block $IF_2
@@ -81,25 +82,24 @@
 			(i32.const 0)
 			(i32.const 4)
 		)
+		(i32.store (i32.const 128) (i32.const 64))
 		(call $seal_input
-			(i32.const 0)
-			(i32.const 64)
+			(i32.const 104)
+			(i32.const 100)
 		)
 		(call $seal_set_rent_allowance
-			(i32.const 0)
-			(i32.load (i32.const 64))
+			(i32.const 104)
+			(i32.load (i32.const 128))
 		)
 	)
 
 	;; Encoding of 10 in balance
 	(data (i32.const 0) "\28")
 
-	;; Size of the buffer at address 0
-	(data (i32.const 64) "\40")
+	;; encoding of 50 balance
+	(data (i32.const 100) "\32")
 
-	;; encoding of Charlies's account id
-	(data (i32.const 68) "\03")
+	;; [128, 132) size of seal input buffer
 
-	;; encoding of 50 balance
-	(data (i32.const 76) "\32")
+	;; [132, inf) output buffer for seal input
 )
diff --git a/frame/contracts/fixtures/transfer_return_code.wat b/frame/contracts/fixtures/transfer_return_code.wat
index 7a1bec9adf38..50098851dcf8 100644
--- a/frame/contracts/fixtures/transfer_return_code.wat
+++ b/frame/contracts/fixtures/transfer_return_code.wat
@@ -5,27 +5,30 @@
 	(import "seal0" "seal_return" (func $seal_return (param i32 i32 i32)))
 	(import "env" "memory" (memory 1 1))
 
-	;; [0, 8) zero-adress
-	(data (i32.const 0) "\00\00\00\00\00\00\00\00")
+	;; [0, 32) zero-adress
+	(data (i32.const 0)
+		"\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00"
+		"\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00"
+	)
 
-	;; [8, 16) 100 balance
-	(data (i32.const 8) "\64\00\00\00\00\00\00\00")
+	;; [32, 40) 100 balance
+	(data (i32.const 32) "\64\00\00\00\00\00\00\00")
 
-	;; [16, 20) here we store the return code of the transfer
+	;; [40, 44) here we store the return code of the transfer
 
 	(func (export "deploy"))
 
 	(func (export "call")
 		(i32.store
-			(i32.const 16)
+			(i32.const 40)
 			(call $seal_transfer
 				(i32.const 0) ;; ptr to destination address
-				(i32.const 8) ;; length of destination address
-				(i32.const 8) ;; ptr to value to transfer
+				(i32.const 32) ;; length of destination address
+				(i32.const 32) ;; ptr to value to transfer
 				(i32.const 8) ;; length of value to transfer
 			)
 		)
 		;; exit with success and take transfer return code to the output buffer
-		(call $seal_return (i32.const 0) (i32.const 16) (i32.const 4))
+		(call $seal_return (i32.const 0) (i32.const 40) (i32.const 4))
 	)
 )
diff --git a/frame/contracts/src/benchmarking/code.rs b/frame/contracts/src/benchmarking/code.rs
index cb5052042aab..f879d2eed554 100644
--- a/frame/contracts/src/benchmarking/code.rs
+++ b/frame/contracts/src/benchmarking/code.rs
@@ -29,6 +29,7 @@ use crate::Module as Contracts;
 
 use parity_wasm::elements::{Instruction, Instructions, FuncBody, ValueType, BlockType};
 use pwasm_utils::stack_height::inject_limiter;
+use sp_core::crypto::UncheckedFrom;
 use sp_runtime::traits::Hash;
 use sp_sandbox::{EnvironmentDefinitionBuilder, Memory};
 use sp_std::{prelude::*, convert::TryFrom};
@@ -86,7 +87,11 @@ pub struct ImportedMemory {
 }
 
 impl ImportedMemory {
-	pub fn max<T: Trait>() -> Self {
+	pub fn max<T: Trait>() -> Self
+	where
+		T: Trait,
+		T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
+	{
 		let pages = max_pages::<T>();
 		Self { min_pages: pages, max_pages: pages }
 	}
@@ -106,7 +111,11 @@ pub struct WasmModule<T:Trait> {
 	memory: Option<ImportedMemory>,
 }
 
-impl<T: Trait> From<ModuleDefinition> for WasmModule<T> {
+impl<T: Trait> From<ModuleDefinition> for WasmModule<T>
+where
+	T: Trait,
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
+{
 	fn from(def: ModuleDefinition) -> Self {
 		// internal functions start at that offset.
 		let func_offset = u32::try_from(def.imported_functions.len()).unwrap();
@@ -216,7 +225,11 @@ impl<T: Trait> From<ModuleDefinition> for WasmModule<T> {
 	}
 }
 
-impl<T: Trait> WasmModule<T> {
+impl<T: Trait> WasmModule<T>
+where
+	T: Trait,
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
+{
 	/// Creates a wasm module with an empty `call` and `deploy` function and nothing else.
 	pub fn dummy() -> Self {
 		ModuleDefinition::default().into()
@@ -470,6 +483,10 @@ pub mod body {
 }
 
 /// The maximum amount of pages any contract is allowed to have according to the current `Schedule`.
-pub fn max_pages<T: Trait>() -> u32 {
+pub fn max_pages<T: Trait>() -> u32
+where
+	T: Trait,
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
+{
 	Contracts::<T>::current_schedule().limits.memory_pages
 }
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index dd9e89d6f35a..2e15542368a5 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -25,7 +25,9 @@ mod sandbox;
 use crate::{
 	*, Module as Contracts,
 	exec::StorageKey,
+	rent::Rent,
 	schedule::{API_BENCHMARK_BATCH_SIZE, INSTR_BENCHMARK_BATCH_SIZE},
+	storage::Storage,
 };
 use self::{
 	code::{
@@ -75,7 +77,11 @@ impl Endow {
 	}
 }
 
-impl<T: Trait> Contract<T> {
+impl<T: Trait> Contract<T>
+where
+	T: Trait,
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
+{
 	/// Create new contract and use a default account id as instantiator.
 	fn new(
 		module: WasmModule<T>,
@@ -123,7 +129,8 @@ impl<T: Trait> Contract<T> {
 			Endow::Max => (0u32.into(), Endow::max::<T>()),
 		};
 		T::Currency::make_free_balance_be(&caller, caller_funding::<T>());
-		let addr = T::DetermineContractAddress::contract_address_for(&module.hash, &data, &caller);
+		let salt = vec![0xff];
+		let addr = Contracts::<T>::contract_address(&caller, &module.hash, &salt);
 
 		// The default block number is zero. The benchmarking system bumps the block number
 		// to one for the benchmarking closure when it is set to zero. In order to prevent this
@@ -139,6 +146,7 @@ impl<T: Trait> Contract<T> {
 			Weight::max_value(),
 			module.hash,
 			data,
+			salt,
 		)?;
 
 		let result = Contract {
@@ -160,7 +168,7 @@ impl<T: Trait> Contract<T> {
 	fn store(&self, items: &Vec<(StorageKey, Vec<u8>)>) -> Result<(), &'static str> {
 		let info = self.alive_info()?;
 		for item in items {
-			crate::storage::write_contract_storage::<T>(
+			Storage::<T>::write(
 				&self.account_id,
 				&info.trie_id,
 				&item.0,
@@ -192,7 +200,7 @@ impl<T: Trait> Contract<T> {
 	/// Get the block number when this contract will be evicted. Returns an error when
 	/// the rent collection won't happen because the contract has to much endowment.
 	fn eviction_at(&self) -> Result<T::BlockNumber, &'static str> {
-		let projection = crate::rent::compute_rent_projection::<T>(&self.account_id)
+		let projection = Rent::<T>::compute_projection(&self.account_id)
 			.map_err(|_| "Invalid acc for rent")?;
 		match projection {
 			RentProjection::EvictionAt(at) => Ok(at),
@@ -211,7 +219,11 @@ struct Tombstone<T: Trait> {
 	storage: Vec<(StorageKey, Vec<u8>)>,
 }
 
-impl<T: Trait> Tombstone<T> {
+impl<T: Trait> Tombstone<T>
+where
+	T: Trait,
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
+{
 	/// Create and evict a new contract with the supplied storage item count and size each.
 	fn new(stor_num: u32, stor_size: u32) -> Result<Self, &'static str> {
 		let contract = Contract::<T>::new(WasmModule::dummy(), vec![], Endow::CollectRent)?;
@@ -220,7 +232,7 @@ impl<T: Trait> Tombstone<T> {
 		System::<T>::set_block_number(
 			contract.eviction_at()? + T::SignedClaimHandicap::get() + 5u32.into()
 		);
-		crate::rent::collect_rent::<T>(&contract.account_id);
+		Rent::<T>::collect(&contract.account_id);
 		contract.ensure_tombstone()?;
 
 		Ok(Tombstone {
@@ -250,6 +262,11 @@ fn caller_funding<T: Trait>() -> BalanceOf<T> {
 }
 
 benchmarks! {
+	where_clause { where
+		T::AccountId: UncheckedFrom<T::Hash>,
+		T::AccountId: AsRef<[u8]>,
+	}
+
 	_ {
 	}
 
@@ -276,17 +293,20 @@ benchmarks! {
 	// The size of the input data influences the runtime because it is hashed in order to determine
 	// the contract address.
 	// `n`: Size of the data passed to constructor in kilobytes.
+	// `s`: Size of the salt in kilobytes.
 	instantiate {
 		let n in 0 .. code::max_pages::<T>() * 64;
+		let s in 0 .. code::max_pages::<T>() * 64;
 		let data = vec![42u8; (n * 1024) as usize];
+		let salt = vec![42u8; (s * 1024) as usize];
 		let endowment = Config::<T>::subsistence_threshold_uncached();
 		let caller = whitelisted_caller();
 		T::Currency::make_free_balance_be(&caller, caller_funding::<T>());
 		let WasmModule { code, hash, .. } = WasmModule::<T>::dummy_with_mem();
 		let origin = RawOrigin::Signed(caller.clone());
-		let addr = T::DetermineContractAddress::contract_address_for(&hash, &data, &caller);
+		let addr = Contracts::<T>::contract_address(&caller, &hash, &salt);
 		Contracts::<T>::put_code_raw(code)?;
-	}: _(origin, endowment, Weight::max_value(), hash, data)
+	}: _(origin, endowment, Weight::max_value(), hash, data, salt)
 	verify {
 		// endowment was removed from the caller
 		assert_eq!(T::Currency::free_balance(&caller), caller_funding::<T>() - endowment);
@@ -1000,7 +1020,7 @@ benchmarks! {
 		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
 		let trie_id = instance.alive_info()?.trie_id;
 		for key in keys {
-			crate::storage::write_contract_storage::<T>(
+			Storage::<T>::write(
 				&instance.account_id,
 				&trie_id,
 				key.as_slice().try_into().map_err(|e| "Key has wrong length")?,
@@ -1045,7 +1065,7 @@ benchmarks! {
 		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
 		let trie_id = instance.alive_info()?.trie_id;
 		for key in keys {
-			crate::storage::write_contract_storage::<T>(
+			Storage::<T>::write(
 				&instance.account_id,
 				&trie_id,
 				key.as_slice().try_into().map_err(|e| "Key has wrong length")?,
@@ -1089,7 +1109,7 @@ benchmarks! {
 		});
 		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
 		let trie_id = instance.alive_info()?.trie_id;
-		crate::storage::write_contract_storage::<T>(
+		Storage::<T>::write(
 			&instance.account_id,
 			&trie_id,
 			key.as_slice().try_into().map_err(|e| "Key has wrong length")?,
@@ -1341,7 +1361,9 @@ benchmarks! {
 					ValueType::I32,
 					ValueType::I32,
 					ValueType::I32,
-					ValueType::I32
+					ValueType::I32,
+					ValueType::I32,
+					ValueType::I32,
 				],
 				return_type: Some(ValueType::I32),
 			}],
@@ -1371,6 +1393,8 @@ benchmarks! {
 				Regular(Instruction::I32Const(addr_len_offset as i32)), // address_len_ptr
 				Regular(Instruction::I32Const(u32::max_value() as i32)), // output_ptr
 				Regular(Instruction::I32Const(0)), // output_len_ptr
+				Regular(Instruction::I32Const(0)), // salt_ptr
+				Regular(Instruction::I32Const(0)), // salt_ptr_len
 				Regular(Instruction::Call(0)),
 				Regular(Instruction::Drop),
 			])),
@@ -1381,8 +1405,8 @@ benchmarks! {
 		let callee = instance.addr.clone();
 		let addresses = hashes
 			.iter()
-			.map(|hash| T::DetermineContractAddress::contract_address_for(
-				hash, &[], &instance.account_id
+			.map(|hash| Contracts::<T>::contract_address(
+				&instance.account_id, hash, &[],
 			))
 			.collect::<Vec<_>>();
 
@@ -1398,9 +1422,10 @@ benchmarks! {
 		}
 	}
 
-	seal_instantiate_per_input_output_kb {
+	seal_instantiate_per_input_output_salt_kb {
 		let i in 0 .. (code::max_pages::<T>() - 1) * 64;
 		let o in 0 .. (code::max_pages::<T>() - 1) * 64;
+		let s in 0 .. (code::max_pages::<T>() - 1) * 64;
 		let callee_code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
@@ -1458,7 +1483,9 @@ benchmarks! {
 					ValueType::I32,
 					ValueType::I32,
 					ValueType::I32,
-					ValueType::I32
+					ValueType::I32,
+					ValueType::I32,
+					ValueType::I32,
 				],
 				return_type: Some(ValueType::I32),
 			}],
@@ -1496,6 +1523,8 @@ benchmarks! {
 				Regular(Instruction::I32Const(addr_len_offset as i32)), // address_len_ptr
 				Regular(Instruction::I32Const(output_offset as i32)), // output_ptr
 				Regular(Instruction::I32Const(output_len_offset as i32)), // output_len_ptr
+				Counter(input_offset as u32, input_len as u32), // salt_ptr
+				Regular(Instruction::I32Const((s * 1024).max(input_len as u32) as i32)), // salt_len
 				Regular(Instruction::Call(0)),
 				Regular(Instruction::I32Eqz),
 				Regular(Instruction::If(BlockType::NoResult)),
@@ -2401,6 +2430,8 @@ mod tests {
 	create_test!(seal_transfer);
 	create_test!(seal_call);
 	create_test!(seal_call_per_transfer_input_output_kb);
+	create_test!(seal_instantiate);
+	create_test!(seal_instantiate_per_input_output_salt_kb);
 	create_test!(seal_clear_storage);
 	create_test!(seal_hash_sha2_256);
 	create_test!(seal_hash_sha2_256_per_kb);
diff --git a/frame/contracts/src/benchmarking/sandbox.rs b/frame/contracts/src/benchmarking/sandbox.rs
index 1d93db19ee59..76cebfaf1ed6 100644
--- a/frame/contracts/src/benchmarking/sandbox.rs
+++ b/frame/contracts/src/benchmarking/sandbox.rs
@@ -19,8 +19,11 @@
 ///! sandbox to execute the wasm code. This is because we do not need the full
 ///! environment that provides the seal interface as imported functions.
 
-use super::code::WasmModule;
-use super::Trait;
+use super::{
+	Trait,
+	code::WasmModule,
+};
+use sp_core::crypto::UncheckedFrom;
 use sp_sandbox::{EnvironmentDefinitionBuilder, Instance, Memory};
 
 /// Minimal execution environment without any exported functions.
@@ -36,7 +39,11 @@ impl Sandbox {
 	}
 }
 
-impl<T: Trait> From<&WasmModule<T>> for Sandbox {
+impl<T: Trait> From<&WasmModule<T>> for Sandbox
+where
+	T: Trait,
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
+{
 	/// Creates an instance from the supplied module and supplies as much memory
 	/// to the instance as the module declares as imported.
 	fn from(module: &WasmModule<T>) -> Self {
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index f93f262d821e..73e1f564498d 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -15,10 +15,11 @@
 // along with Substrate. If not, see <http://www.gnu.org/licenses/>.
 
 use crate::{
-	CodeHash, Config, ContractAddressFor, Event, RawEvent, Trait,
-	TrieId, BalanceOf, ContractInfo, TrieIdGenerator,
-	gas::GasMeter, rent, storage, Error, ContractInfoOf
+	CodeHash, Config, Event, RawEvent, Trait, Module as Contracts,
+	TrieId, BalanceOf, ContractInfo, gas::GasMeter, rent::Rent, storage::{self, Storage},
+	Error, ContractInfoOf
 };
+use sp_core::crypto::UncheckedFrom;
 use sp_std::prelude::*;
 use sp_runtime::traits::{Bounded, Zero, Convert, Saturating};
 use frame_support::{
@@ -75,6 +76,7 @@ pub trait Ext {
 		value: BalanceOf<Self::T>,
 		gas_meter: &mut GasMeter<Self::T>,
 		input_data: Vec<u8>,
+		salt: &[u8],
 	) -> Result<(AccountIdOf<Self::T>, ExecReturnValue), ExecError>;
 
 	/// Transfer some amount of funds into the specified account.
@@ -118,7 +120,7 @@ pub trait Ext {
 		code_hash: CodeHash<Self::T>,
 		rent_allowance: BalanceOf<Self::T>,
 		delta: Vec<StorageKey>,
-	) -> Result<(), &'static str>;
+	) -> Result<(), DispatchError>;
 
 	/// Returns a reference to the account id of the caller.
 	fn caller(&self) -> &AccountIdOf<Self::T>;
@@ -215,6 +217,7 @@ pub struct ExecutionContext<'a, T: Trait + 'a, V, L> {
 impl<'a, T, E, V, L> ExecutionContext<'a, T, V, L>
 where
 	T: Trait,
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 	L: Loader<T, Executable = E>,
 	V: Vm<T, Executable = E>,
 {
@@ -264,12 +267,12 @@ where
 			Err(Error::<T>::MaxCallDepthReached)?
 		}
 
-		// Assumption: `collect_rent` doesn't collide with overlay because
-		// `collect_rent` will be done on first call and destination contract and balance
+		// Assumption: `collect` doesn't collide with overlay because
+		// `collect` will be done on first call and destination contract and balance
 		// cannot be changed before the first call
 		// We do not allow 'calling' plain accounts. For transfering value
 		// `seal_transfer` must be used.
-		let contract = if let Some(ContractInfo::Alive(info)) = rent::collect_rent::<T>(&dest) {
+		let contract = if let Some(ContractInfo::Alive(info)) = Rent::<T>::collect(&dest) {
 			info
 		} else {
 			Err(Error::<T>::NotCallable)?
@@ -308,6 +311,7 @@ where
 		gas_meter: &mut GasMeter<T>,
 		code_hash: &CodeHash<T>,
 		input_data: Vec<u8>,
+		salt: &[u8],
 	) -> Result<(T::AccountId, ExecReturnValue), ExecError> {
 		if self.depth == self.config.max_depth as usize {
 			Err(Error::<T>::MaxCallDepthReached)?
@@ -315,19 +319,15 @@ where
 
 		let transactor_kind = self.transactor_kind();
 		let caller = self.self_account.clone();
-		let dest = T::DetermineContractAddress::contract_address_for(
-			code_hash,
-			&input_data,
-			&caller,
-		);
+		let dest = Contracts::<T>::contract_address(&caller, code_hash, salt);
 
 		// TrieId has not been generated yet and storage is empty since contract is new.
 		//
 		// Generate it now.
-		let dest_trie_id = <T as Trait>::TrieIdGenerator::trie_id(&dest);
+		let dest_trie_id = Storage::<T>::generate_trie_id(&dest);
 
 		let output = self.with_nested_context(dest.clone(), dest_trie_id, |nested| {
-			storage::place_contract::<T>(
+			Storage::<T>::place_contract(
 				&dest,
 				nested
 					.self_trie_id
@@ -444,7 +444,10 @@ fn transfer<'a, T: Trait, V: Vm<T>, L: Loader<T>>(
 	dest: &T::AccountId,
 	value: BalanceOf<T>,
 	ctx: &mut ExecutionContext<'a, T, V, L>,
-) -> Result<(), DispatchError> {
+) -> Result<(), DispatchError>
+where
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
+{
 	use self::TransferCause::*;
 	use self::TransactorKind::*;
 
@@ -491,6 +494,7 @@ struct CallContext<'a, 'b: 'a, T: Trait + 'b, V: Vm<T> + 'b, L: Loader<T>> {
 impl<'a, 'b: 'a, T, E, V, L> Ext for CallContext<'a, 'b, T, V, L>
 where
 	T: Trait + 'b,
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 	V: Vm<T, Executable = E>,
 	L: Loader<T, Executable = E>,
 {
@@ -503,7 +507,7 @@ where
 				expect can't fail;\
 				qed",
 		);
-		storage::read_contract_storage(trie_id, key)
+		Storage::<T>::read(trie_id, key)
 	}
 
 	fn set_storage(&mut self, key: StorageKey, value: Option<Vec<u8>>) {
@@ -514,12 +518,12 @@ where
 				qed",
 		);
 		if let Err(storage::ContractAbsentError) =
-			storage::write_contract_storage::<T>(&self.ctx.self_account, trie_id, &key, value)
+			Storage::<T>::write(&self.ctx.self_account, trie_id, &key, value)
 		{
 			panic!(
 				"the contract must be in the alive state within the `CallContext`;\
 				the contract cannot be absent in storage;
-				write_contract_storage cannot return `None`;
+				write cannot return `None`;
 				qed"
 			);
 		}
@@ -531,8 +535,9 @@ where
 		endowment: BalanceOf<T>,
 		gas_meter: &mut GasMeter<T>,
 		input_data: Vec<u8>,
+		salt: &[u8],
 	) -> Result<(AccountIdOf<T>, ExecReturnValue), ExecError> {
-		self.ctx.instantiate(endowment, gas_meter, code_hash, input_data)
+		self.ctx.instantiate(endowment, gas_meter, code_hash, input_data, salt)
 	}
 
 	fn transfer(
@@ -558,9 +563,7 @@ where
 		let value = T::Currency::free_balance(&self_id);
 		if let Some(caller_ctx) = self.ctx.caller {
 			if caller_ctx.is_live(&self_id) {
-				return Err(DispatchError::Other(
-					"Cannot terminate a contract that is present on the call stack",
-				));
+				return Err(Error::<T>::ReentranceDenied.into());
 			}
 		}
 		transfer(
@@ -576,7 +579,7 @@ where
 				a contract has a trie id;\
 				this can't be None; qed",
 		);
-		storage::destroy_contract::<T>(&self_id, self_trie_id);
+		Storage::<T>::destroy_contract(&self_id, self_trie_id);
 		Ok(())
 	}
 
@@ -596,16 +599,14 @@ where
 		code_hash: CodeHash<Self::T>,
 		rent_allowance: BalanceOf<Self::T>,
 		delta: Vec<StorageKey>,
-	) -> Result<(), &'static str> {
+	) -> Result<(), DispatchError> {
 		if let Some(caller_ctx) = self.ctx.caller {
 			if caller_ctx.is_live(&self.ctx.self_account) {
-				return Err(
-					"Cannot perform restoration of a contract that is present on the call stack",
-				);
+				return Err(Error::<T>::ReentranceDenied.into());
 			}
 		}
 
-		let result = crate::rent::restore_to::<T>(
+		let result = Rent::<T>::restore_to(
 			self.ctx.self_account.clone(),
 			dest.clone(),
 			code_hash.clone(),
@@ -667,7 +668,7 @@ where
 
 	fn set_rent_allowance(&mut self, rent_allowance: BalanceOf<T>) {
 		if let Err(storage::ContractAbsentError) =
-			storage::set_rent_allowance::<T>(&self.ctx.self_account, rent_allowance)
+			Storage::<T>::set_rent_allowance(&self.ctx.self_account, rent_allowance)
 		{
 			panic!(
 				"`self_account` points to an alive contract within the `CallContext`;
@@ -677,7 +678,7 @@ where
 	}
 
 	fn rent_allowance(&self) -> BalanceOf<T> {
-		storage::rent_allowance::<T>(&self.ctx.self_account)
+		Storage::<T>::rent_allowance(&self.ctx.self_account)
 			.unwrap_or_else(|_| <BalanceOf<T>>::max_value()) // Must never be triggered actually
 	}
 
@@ -711,23 +712,21 @@ fn deposit_event<T: Trait>(
 mod tests {
 	use super::{
 		BalanceOf, Event, ExecResult, ExecutionContext, Ext, Loader,
-		RawEvent, Vm, ReturnFlags, ExecError, ErrorOrigin
+		RawEvent, Vm, ReturnFlags, ExecError, ErrorOrigin, AccountIdOf,
 	};
 	use crate::{
 		gas::GasMeter, tests::{ExtBuilder, Test, MetaEvent},
 		exec::ExecReturnValue, CodeHash, Config,
 		gas::Gas,
-		storage, Error
+		storage::Storage,
+		tests::{ALICE, BOB, CHARLIE},
+		Error,
 	};
 	use crate::tests::test_utils::{place_contract, set_balance, get_balance};
 	use sp_runtime::DispatchError;
 	use assert_matches::assert_matches;
 	use std::{cell::RefCell, collections::HashMap, marker::PhantomData, rc::Rc};
 
-	const ALICE: u64 = 1;
-	const BOB: u64 = 2;
-	const CHARLIE: u64 = 3;
-
 	const GAS_LIMIT: Gas = 10_000_000_000;
 
 	fn events() -> Vec<Event<Test>> {
@@ -869,7 +868,7 @@ mod tests {
 
 		ExtBuilder::default().build().execute_with(|| {
 			let cfg = Config::preload();
-			let mut ctx = ExecutionContext::top_level(origin, &cfg, &vm, &loader);
+			let mut ctx = ExecutionContext::top_level(origin.clone(), &cfg, &vm, &loader);
 			set_balance(&origin, 100);
 			set_balance(&dest, 0);
 
@@ -902,13 +901,13 @@ mod tests {
 
 		ExtBuilder::default().build().execute_with(|| {
 			let cfg = Config::preload();
-			let mut ctx = ExecutionContext::top_level(origin, &cfg, &vm, &loader);
+			let mut ctx = ExecutionContext::top_level(origin.clone(), &cfg, &vm, &loader);
 			place_contract(&BOB, return_ch);
 			set_balance(&origin, 100);
 			set_balance(&dest, 0);
 
 			let output = ctx.call(
-				dest,
+				dest.clone(),
 				55,
 				&mut GasMeter::<Test>::new(GAS_LIMIT),
 				vec![],
@@ -932,7 +931,7 @@ mod tests {
 
 		ExtBuilder::default().build().execute_with(|| {
 			let cfg = Config::preload();
-			let mut ctx = ExecutionContext::top_level(origin, &cfg, &vm, &loader);
+			let mut ctx = ExecutionContext::top_level(origin.clone(), &cfg, &vm, &loader);
 			set_balance(&origin, 0);
 
 			let result = super::transfer(
@@ -1061,6 +1060,7 @@ mod tests {
 				&mut GasMeter::<Test>::new(GAS_LIMIT),
 				&input_data_ch,
 				vec![1, 2, 3, 4],
+				&[],
 			);
 			assert_matches!(result, Ok(_));
 		});
@@ -1120,13 +1120,13 @@ mod tests {
 
 		let vm = MockVm::new();
 
-		let witnessed_caller_bob = RefCell::new(None::<u64>);
-		let witnessed_caller_charlie = RefCell::new(None::<u64>);
+		let witnessed_caller_bob = RefCell::new(None::<AccountIdOf<Test>>);
+		let witnessed_caller_charlie = RefCell::new(None::<AccountIdOf<Test>>);
 
 		let mut loader = MockLoader::empty();
 		let bob_ch = loader.insert(|ctx| {
 			// Record the caller for bob.
-			*witnessed_caller_bob.borrow_mut() = Some(*ctx.ext.caller());
+			*witnessed_caller_bob.borrow_mut() = Some(ctx.ext.caller().clone());
 
 			// Call into CHARLIE contract.
 			assert_matches!(
@@ -1137,19 +1137,19 @@ mod tests {
 		});
 		let charlie_ch = loader.insert(|ctx| {
 			// Record the caller for charlie.
-			*witnessed_caller_charlie.borrow_mut() = Some(*ctx.ext.caller());
+			*witnessed_caller_charlie.borrow_mut() = Some(ctx.ext.caller().clone());
 			exec_success()
 		});
 
 		ExtBuilder::default().build().execute_with(|| {
 			let cfg = Config::preload();
 
-			let mut ctx = ExecutionContext::top_level(origin, &cfg, &vm, &loader);
+			let mut ctx = ExecutionContext::top_level(origin.clone(), &cfg, &vm, &loader);
 			place_contract(&dest, bob_ch);
 			place_contract(&CHARLIE, charlie_ch);
 
 			let result = ctx.call(
-				dest,
+				dest.clone(),
 				0,
 				&mut GasMeter::<Test>::new(GAS_LIMIT),
 				vec![],
@@ -1217,6 +1217,7 @@ mod tests {
 					&mut GasMeter::<Test>::new(GAS_LIMIT),
 					&dummy_ch,
 					vec![],
+					&[],
 				),
 				Err(_)
 			);
@@ -1243,13 +1244,14 @@ mod tests {
 					&mut GasMeter::<Test>::new(GAS_LIMIT),
 					&dummy_ch,
 					vec![],
+					&[],
 				),
 				Ok((address, ref output)) if output.data == vec![80, 65, 83, 83] => address
 			);
 
 			// Check that the newly created account has the expected code hash and
 			// there are instantiation event.
-			assert_eq!(storage::code_hash::<Test>(&instantiated_contract_address).unwrap(), dummy_ch);
+			assert_eq!(Storage::<Test>::code_hash(&instantiated_contract_address).unwrap(), dummy_ch);
 			assert_eq!(&events(), &[
 				RawEvent::Instantiated(ALICE, instantiated_contract_address)
 			]);
@@ -1276,12 +1278,13 @@ mod tests {
 					&mut GasMeter::<Test>::new(GAS_LIMIT),
 					&dummy_ch,
 					vec![],
+					&[],
 				),
 				Ok((address, ref output)) if output.data == vec![70, 65, 73, 76] => address
 			);
 
 			// Check that the account has not been created.
-			assert!(storage::code_hash::<Test>(&instantiated_contract_address).is_err());
+			assert!(Storage::<Test>::code_hash(&instantiated_contract_address).is_err());
 			assert!(events().is_empty());
 		});
 	}
@@ -1292,7 +1295,7 @@ mod tests {
 
 		let mut loader = MockLoader::empty();
 		let dummy_ch = loader.insert(|_| exec_success());
-		let instantiated_contract_address = Rc::new(RefCell::new(None::<u64>));
+		let instantiated_contract_address = Rc::new(RefCell::new(None::<AccountIdOf<Test>>));
 		let instantiator_ch = loader.insert({
 			let dummy_ch = dummy_ch.clone();
 			let instantiated_contract_address = Rc::clone(&instantiated_contract_address);
@@ -1302,7 +1305,8 @@ mod tests {
 					&dummy_ch,
 					Config::<Test>::subsistence_threshold_uncached(),
 					ctx.gas_meter,
-					vec![]
+					vec![],
+					&[48, 49, 50],
 				).unwrap();
 
 				*instantiated_contract_address.borrow_mut() = address.into();
@@ -1326,7 +1330,7 @@ mod tests {
 
 			// Check that the newly created account has the expected code hash and
 			// there are instantiation event.
-			assert_eq!(storage::code_hash::<Test>(&instantiated_contract_address).unwrap(), dummy_ch);
+			assert_eq!(Storage::<Test>::code_hash(&instantiated_contract_address).unwrap(), dummy_ch);
 			assert_eq!(&events(), &[
 				RawEvent::Instantiated(BOB, instantiated_contract_address)
 			]);
@@ -1350,7 +1354,8 @@ mod tests {
 						&dummy_ch,
 						15u64,
 						ctx.gas_meter,
-						vec![]
+						vec![],
+						&[],
 					),
 					Err(ExecError {
 						error: DispatchError::Other("It's a trap!"),
@@ -1405,6 +1410,7 @@ mod tests {
 						&mut GasMeter::<Test>::new(GAS_LIMIT),
 						&terminate_ch,
 						vec![],
+						&[],
 					),
 					Err(Error::<Test>::NewContractNotFunded.into())
 				);
@@ -1437,6 +1443,7 @@ mod tests {
 				&mut GasMeter::<Test>::new(GAS_LIMIT),
 				&rent_allowance_ch,
 				vec![],
+				&[],
 			);
 			assert_matches!(result, Ok(_));
 		});
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index f43bfd0ebdb6..65995afb73d6 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -93,14 +93,18 @@ pub mod weights;
 #[cfg(test)]
 mod tests;
 
-use crate::exec::ExecutionContext;
-use crate::wasm::{WasmLoader, WasmVm};
-use crate::weights::WeightInfo;
-
-pub use crate::gas::{Gas, GasMeter};
-pub use crate::wasm::ReturnCode as RuntimeReturnCode;
-pub use crate::schedule::{Schedule, HostFnWeights, InstructionWeights, Limits};
-
+pub use crate::{
+	gas::{Gas, GasMeter},
+	wasm::ReturnCode as RuntimeReturnCode,
+	weights::WeightInfo,
+	schedule::{Schedule, HostFnWeights, InstructionWeights, Limits},
+};
+use crate::{
+	exec::ExecutionContext,
+	wasm::{WasmLoader, WasmVm},
+	rent::Rent,
+	storage::Storage,
+};
 use sp_core::crypto::UncheckedFrom;
 use sp_std::{prelude::*, marker::PhantomData, fmt::Debug};
 use codec::{Codec, Encode, Decode};
@@ -112,7 +116,7 @@ use sp_runtime::{
 };
 use frame_support::{
 	decl_module, decl_event, decl_storage, decl_error, ensure,
-	parameter_types, storage::child::ChildInfo,
+	storage::child::ChildInfo,
 	dispatch::{DispatchResult, DispatchResultWithPostInfo},
 	traits::{OnUnbalanced, Currency, Get, Time, Randomness},
 };
@@ -125,11 +129,6 @@ use frame_support::weights::Weight;
 pub type CodeHash<T> = <T as frame_system::Trait>::Hash;
 pub type TrieId = Vec<u8>;
 
-/// A function that generates an `AccountId` for a contract upon instantiation.
-pub trait ContractAddressFor<CodeHash, AccountId> {
-	fn contract_address_for(code_hash: &CodeHash, data: &[u8], origin: &AccountId) -> AccountId;
-}
-
 /// Information for managing an account and its sub trie abstraction.
 /// This is the required info to cache for an account
 #[derive(Encode, Decode, RuntimeDebug)]
@@ -257,66 +256,11 @@ impl<T: Trait> From<AliveContractInfo<T>> for ContractInfo<T> {
 	}
 }
 
-/// Get a trie id (trie id must be unique and collision resistant depending upon its context).
-/// Note that it is different than encode because trie id should be collision resistant
-/// (being a proper unique identifier).
-pub trait TrieIdGenerator<AccountId> {
-	/// Get a trie id for an account, using reference to parent account trie id to ensure
-	/// uniqueness of trie id.
-	///
-	/// The implementation must ensure every new trie id is unique: two consecutive calls with the
-	/// same parameter needs to return different trie id values.
-	fn trie_id(account_id: &AccountId) -> TrieId;
-}
-
-/// Get trie id from `account_id`.
-pub struct TrieIdFromParentCounter<T: Trait>(PhantomData<T>);
-
-/// This generator uses inner counter for account id and applies the hash over `AccountId +
-/// accountid_counter`.
-impl<T: Trait> TrieIdGenerator<T::AccountId> for TrieIdFromParentCounter<T>
-where
-	T::AccountId: AsRef<[u8]>
-{
-	fn trie_id(account_id: &T::AccountId) -> TrieId {
-		// Note that skipping a value due to error is not an issue here.
-		// We only need uniqueness, not sequence.
-		let new_seed = AccountCounter::mutate(|v| {
-			*v = v.wrapping_add(1);
-			*v
-		});
-
-		let mut buf = Vec::new();
-		buf.extend_from_slice(account_id.as_ref());
-		buf.extend_from_slice(&new_seed.to_le_bytes()[..]);
-		T::Hashing::hash(&buf[..]).as_ref().into()
-	}
-}
-
 pub type BalanceOf<T> =
 	<<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
 pub type NegativeImbalanceOf<T> =
 	<<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::NegativeImbalance;
 
-parameter_types! {
-	/// A reasonable default value for [`Trait::SignedClaimedHandicap`].
-	pub const DefaultSignedClaimHandicap: u32 = 2;
-	/// A reasonable default value for [`Trait::TombstoneDeposit`].
-	pub const DefaultTombstoneDeposit: u32 = 16;
-	/// A reasonable default value for [`Trait::StorageSizeOffset`].
-	pub const DefaultStorageSizeOffset: u32 = 8;
-	/// A reasonable default value for [`Trait::RentByteFee`].
-	pub const DefaultRentByteFee: u32 = 4;
-	/// A reasonable default value for [`Trait::RentDepositOffset`].
-	pub const DefaultRentDepositOffset: u32 = 1000;
-	/// A reasonable default value for [`Trait::SurchargeReward`].
-	pub const DefaultSurchargeReward: u32 = 150;
-	/// A reasonable default value for [`Trait::MaxDepth`].
-	pub const DefaultMaxDepth: u32 = 32;
-	/// A reasonable default value for [`Trait::MaxValueSize`].
-	pub const DefaultMaxValueSize: u32 = 16_384;
-}
-
 pub trait Trait: frame_system::Trait {
 	type Time: Time;
 	type Randomness: Randomness<Self::Hash>;
@@ -327,12 +271,6 @@ pub trait Trait: frame_system::Trait {
 	/// The overarching event type.
 	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
 
-	/// A function type to get the contract address given the instantiator.
-	type DetermineContractAddress: ContractAddressFor<CodeHash<Self>, Self::AccountId>;
-
-	/// trie id generator
-	type TrieIdGenerator: TrieIdGenerator<Self::AccountId>;
-
 	/// Handler for rent payments.
 	type RentPayment: OnUnbalanced<NegativeImbalanceOf<Self>>;
 
@@ -383,32 +321,13 @@ pub trait Trait: frame_system::Trait {
 	type WeightInfo: WeightInfo;
 }
 
-/// Simple contract address determiner.
-///
-/// Address calculated from the code (of the constructor), input data to the constructor,
-/// and the account id that requested the account creation.
-///
-/// Formula: `blake2_256(blake2_256(code) + blake2_256(data) + origin)`
-pub struct SimpleAddressDeterminer<T: Trait>(PhantomData<T>);
-impl<T: Trait> ContractAddressFor<CodeHash<T>, T::AccountId> for SimpleAddressDeterminer<T>
-where
-	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
-{
-	fn contract_address_for(code_hash: &CodeHash<T>, data: &[u8], origin: &T::AccountId) -> T::AccountId {
-		let data_hash = T::Hashing::hash(data);
-
-		let mut buf = Vec::new();
-		buf.extend_from_slice(code_hash.as_ref());
-		buf.extend_from_slice(data_hash.as_ref());
-		buf.extend_from_slice(origin.as_ref());
-
-		UncheckedFrom::unchecked_from(T::Hashing::hash(&buf[..]))
-	}
-}
-
 decl_error! {
 	/// Error for the contracts module.
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Trait>
+	where
+		T::AccountId: UncheckedFrom<T::Hash>,
+		T::AccountId: AsRef<[u8]>,
+	{
 		/// A new schedule must have a greater version than the current one.
 		InvalidScheduleVersion,
 		/// An origin must be signed or inherent and auxiliary sender only provided on inherent.
@@ -455,12 +374,21 @@ decl_error! {
 		ContractTrapped,
 		/// The size defined in `T::MaxValueSize` was exceeded.
 		ValueTooLarge,
+		/// The action performed is not allowed while the contract performing it is already
+		/// on the call stack. Those actions are contract self destruction and restoration
+		/// of a tombstone.
+		ReentranceDenied,
 	}
 }
 
 decl_module! {
 	/// Contracts module.
-	pub struct Module<T: Trait> for enum Call where origin: <T as frame_system::Trait>::Origin {
+	pub struct Module<T: Trait> for enum Call
+	where
+		origin: T::Origin,
+		T::AccountId: UncheckedFrom<T::Hash>,
+		T::AccountId: AsRef<[u8]>,
+	{
 		type Error = Error<T>;
 
 		/// Number of block delay an extrinsic claim surcharge has.
@@ -563,29 +491,38 @@ decl_module! {
 			gas_meter.into_dispatch_result(result)
 		}
 
-		/// Instantiates a new contract from the `codehash` generated by `put_code`, optionally transferring some balance.
+		/// Instantiates a new contract from the `code_hash` generated by `put_code`,
+		/// optionally transferring some balance.
+		///
+		/// The supplied `salt` is used for contract address deriviation. See `fn contract_address`.
 		///
 		/// Instantiation is executed as follows:
 		///
-		/// - The destination address is computed based on the sender and hash of the code.
+		/// - The destination address is computed based on the sender, code_hash and the salt.
 		/// - The smart-contract account is created at the computed address.
 		/// - The `ctor_code` is executed in the context of the newly-created account. Buffer returned
 		///   after the execution is saved as the `code` of the account. That code will be invoked
 		///   upon any call received by this account.
 		/// - The contract is initialized.
-		#[weight = T::WeightInfo::instantiate(data.len() as u32 / 1024).saturating_add(*gas_limit)]
+		#[weight =
+			T::WeightInfo::instantiate(
+				data.len() as u32 / 1024,
+				salt.len() as u32 / 1024,
+			).saturating_add(*gas_limit)
+		]
 		pub fn instantiate(
 			origin,
 			#[compact] endowment: BalanceOf<T>,
 			#[compact] gas_limit: Gas,
 			code_hash: CodeHash<T>,
-			data: Vec<u8>
+			data: Vec<u8>,
+			salt: Vec<u8>,
 		) -> DispatchResultWithPostInfo {
 			let origin = ensure_signed(origin)?;
 			let mut gas_meter = GasMeter::new(gas_limit);
 
 			let result = Self::execute_wasm(origin, &mut gas_meter, |ctx, gas_meter| {
-				ctx.instantiate(endowment, gas_meter, &code_hash, data)
+				ctx.instantiate(endowment, gas_meter, &code_hash, data, &salt)
 					.map(|(_address, output)| output)
 			});
 			gas_meter.into_dispatch_result(result)
@@ -619,7 +556,7 @@ decl_module! {
 			};
 
 			// If poking the contract has lead to eviction of the contract, give out the rewards.
-			if rent::snitch_contract_should_be_evicted::<T>(&dest, handicap) {
+			if Rent::<T>::snitch_contract_should_be_evicted(&dest, handicap) {
 				T::Currency::deposit_into_existing(&rewarded, T::SurchargeReward::get())?;
 			}
 		}
@@ -627,7 +564,10 @@ decl_module! {
 }
 
 /// Public APIs provided by the contracts module.
-impl<T: Trait> Module<T> {
+impl<T: Trait> Module<T>
+where
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
+{
 	/// Perform a call to a specified contract.
 	///
 	/// This function is similar to `Self::call`, but doesn't perform any address lookups and better
@@ -659,12 +599,12 @@ impl<T: Trait> Module<T> {
 			.get_alive()
 			.ok_or(ContractAccessError::IsTombstone)?;
 
-		let maybe_value = storage::read_contract_storage(&contract_info.trie_id, &key);
+		let maybe_value = Storage::<T>::read(&contract_info.trie_id, &key);
 		Ok(maybe_value)
 	}
 
 	pub fn rent_projection(address: T::AccountId) -> RentProjectionResult<T::BlockNumber> {
-		rent::compute_rent_projection::<T>(&address)
+		Rent::<T>::compute_projection(&address)
 	}
 
 	/// Put code for benchmarks which does not check or instrument the code.
@@ -674,9 +614,34 @@ impl<T: Trait> Module<T> {
 		let result = wasm::save_code_raw::<T>(code, &schedule);
 		result.map(|_| ()).map_err(Into::into)
 	}
+
+	/// Determine the address of a contract,
+	///
+	/// This is the address generation function used by contract instantation. Its result
+	/// is only dependend on its inputs. It can therefore be used to reliably predict the
+	/// address of a contract. This is akin to the formular of eth's CRATE2 opcode. There
+	/// is no CREATE equivalent because CREATE2 is strictly more powerful.
+	///
+	/// Formula: `hash(deploying_address ++ code_hash ++ salt)`
+	pub fn contract_address(
+		deploying_address: &T::AccountId,
+		code_hash: &CodeHash<T>,
+		salt: &[u8],
+	) -> T::AccountId
+	{
+		let buf: Vec<_> = deploying_address.as_ref().iter()
+			.chain(code_hash.as_ref())
+			.chain(salt)
+			.cloned()
+			.collect();
+		UncheckedFrom::unchecked_from(T::Hashing::hash(&buf))
+	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Trait> Module<T>
+where
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
+{
 	fn execute_wasm(
 		origin: T::AccountId,
 		gas_meter: &mut GasMeter<T>,
@@ -734,7 +699,10 @@ decl_event! {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Contracts {
+	trait Store for Module<T: Trait> as Contracts
+	where
+		T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
+	{
 		/// Current cost schedule for contracts.
 		CurrentSchedule get(fn current_schedule) config(): Schedule<T> = Default::default();
 		/// A mapping from an original code hash to the original code, untouched by instrumentation.
@@ -762,7 +730,10 @@ pub struct Config<T: Trait> {
 	pub max_value_size: u32,
 }
 
-impl<T: Trait> Config<T> {
+impl<T: Trait> Config<T>
+where
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
+{
 	fn preload() -> Config<T> {
 		Config {
 			schedule: <Module<T>>::current_schedule(),
diff --git a/frame/contracts/src/rent.rs b/frame/contracts/src/rent.rs
index 3dc473363190..a8886b990a95 100644
--- a/frame/contracts/src/rent.rs
+++ b/frame/contracts/src/rent.rs
@@ -18,15 +18,19 @@
 
 use crate::{
 	AliveContractInfo, BalanceOf, ContractInfo, ContractInfoOf, Module, RawEvent,
-	TombstoneContractInfo, Trait, CodeHash, Config
+	TombstoneContractInfo, Trait, CodeHash, Config, Error,
 };
 use sp_std::prelude::*;
 use sp_io::hashing::blake2_256;
+use sp_core::crypto::UncheckedFrom;
 use frame_support::storage::child;
 use frame_support::traits::{Currency, ExistenceRequirement, Get, OnUnbalanced, WithdrawReasons};
 use frame_support::StorageMap;
 use pallet_contracts_primitives::{ContractAccessError, RentProjection, RentProjectionResult};
-use sp_runtime::traits::{Bounded, CheckedDiv, CheckedMul, SaturatedConversion, Saturating, Zero};
+use sp_runtime::{
+	DispatchError,
+	traits::{Bounded, CheckedDiv, CheckedMul, SaturatedConversion, Saturating, Zero},
+};
 
 /// The amount to charge.
 ///
@@ -82,405 +86,412 @@ enum Verdict<T: Trait> {
 	Charge { amount: OutstandingAmount<T> },
 }
 
-/// Returns a fee charged per block from the contract.
-///
-/// This function accounts for the storage rent deposit. I.e. if the contract possesses enough funds
-/// then the fee can drop to zero.
-fn compute_fee_per_block<T: Trait>(
-	free_balance: &BalanceOf<T>,
-	contract: &AliveContractInfo<T>,
-) -> BalanceOf<T> {
-	let free_storage = free_balance
-		.checked_div(&T::RentDepositOffset::get())
-		.unwrap_or_else(Zero::zero);
-
-	// For now, we treat every empty KV pair as if it was one byte long.
-	let empty_pairs_equivalent = contract.empty_pair_count;
-
-	let effective_storage_size = <BalanceOf<T>>::from(
-		contract.storage_size + T::StorageSizeOffset::get() + empty_pairs_equivalent,
-	)
-	.saturating_sub(free_storage);
-
-	effective_storage_size
-		.checked_mul(&T::RentByteFee::get())
-		.unwrap_or_else(|| <BalanceOf<T>>::max_value())
-}
+pub struct Rent<T>(sp_std::marker::PhantomData<T>);
 
-/// Returns amount of funds available to consume by rent mechanism.
-///
-/// Rent mechanism cannot consume more than `rent_allowance` set by the contract and it cannot make
-/// the balance lower than [`subsistence_threshold`].
-///
-/// In case the toal_balance is below the subsistence threshold, this function returns `None`.
-fn rent_budget<T: Trait>(
-	total_balance: &BalanceOf<T>,
-	free_balance: &BalanceOf<T>,
-	contract: &AliveContractInfo<T>,
-) -> Option<BalanceOf<T>> {
-	let subsistence_threshold = Config::<T>::subsistence_threshold_uncached();
-	// Reserved balance contributes towards the subsistence threshold to stay consistent
-	// with the existential deposit where the reserved balance is also counted.
-	if *total_balance < subsistence_threshold {
-		return None;
+impl<T> Rent<T>
+where
+	T: Trait,
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
+{
+	/// Returns a fee charged per block from the contract.
+	///
+	/// This function accounts for the storage rent deposit. I.e. if the contract possesses enough funds
+	/// then the fee can drop to zero.
+	fn compute_fee_per_block(
+		free_balance: &BalanceOf<T>,
+		contract: &AliveContractInfo<T>
+	) -> BalanceOf<T> {
+		let free_storage = free_balance
+			.checked_div(&T::RentDepositOffset::get())
+			.unwrap_or_else(Zero::zero);
+
+		// For now, we treat every empty KV pair as if it was one byte long.
+		let empty_pairs_equivalent = contract.empty_pair_count;
+
+		let effective_storage_size = <BalanceOf<T>>::from(
+			contract.storage_size + T::StorageSizeOffset::get() + empty_pairs_equivalent,
+		)
+		.saturating_sub(free_storage);
+
+		effective_storage_size
+			.checked_mul(&T::RentByteFee::get())
+			.unwrap_or_else(|| <BalanceOf<T>>::max_value())
 	}
 
-	// However, reserved balance cannot be charged so we need to use the free balance
-	// to calculate the actual budget (which can be 0).
-	let rent_allowed_to_charge = free_balance.saturating_sub(subsistence_threshold);
-	Some(<BalanceOf<T>>::min(
-		contract.rent_allowance,
-		rent_allowed_to_charge,
-	))
-}
+	/// Returns amount of funds available to consume by rent mechanism.
+	///
+	/// Rent mechanism cannot consume more than `rent_allowance` set by the contract and it cannot make
+	/// the balance lower than [`subsistence_threshold`].
+	///
+	/// In case the toal_balance is below the subsistence threshold, this function returns `None`.
+	fn rent_budget(
+		total_balance: &BalanceOf<T>,
+		free_balance: &BalanceOf<T>,
+		contract: &AliveContractInfo<T>,
+	) -> Option<BalanceOf<T>> {
+		let subsistence_threshold = Config::<T>::subsistence_threshold_uncached();
+		// Reserved balance contributes towards the subsistence threshold to stay consistent
+		// with the existential deposit where the reserved balance is also counted.
+		if *total_balance < subsistence_threshold {
+			return None;
+		}
 
-/// Consider the case for rent payment of the given account and returns a `Verdict`.
-///
-/// Use `handicap` in case you want to change the reference block number. (To get more details see
-/// `snitch_contract_should_be_evicted` ).
-fn consider_case<T: Trait>(
-	account: &T::AccountId,
-	current_block_number: T::BlockNumber,
-	handicap: T::BlockNumber,
-	contract: &AliveContractInfo<T>,
-) -> Verdict<T> {
-	// How much block has passed since the last deduction for the contract.
-	let blocks_passed = {
-		// Calculate an effective block number, i.e. after adjusting for handicap.
-		let effective_block_number = current_block_number.saturating_sub(handicap);
-		effective_block_number.saturating_sub(contract.deduct_block)
-	};
-	if blocks_passed.is_zero() {
-		// Rent has already been paid
-		return Verdict::Exempt;
+		// However, reserved balance cannot be charged so we need to use the free balance
+		// to calculate the actual budget (which can be 0).
+		let rent_allowed_to_charge = free_balance.saturating_sub(subsistence_threshold);
+		Some(<BalanceOf<T>>::min(
+			contract.rent_allowance,
+			rent_allowed_to_charge,
+		))
 	}
 
-	let total_balance = T::Currency::total_balance(account);
-	let free_balance = T::Currency::free_balance(account);
+	/// Consider the case for rent payment of the given account and returns a `Verdict`.
+	///
+	/// Use `handicap` in case you want to change the reference block number. (To get more details see
+	/// `snitch_contract_should_be_evicted` ).
+	fn consider_case(
+		account: &T::AccountId,
+		current_block_number: T::BlockNumber,
+		handicap: T::BlockNumber,
+		contract: &AliveContractInfo<T>,
+	) -> Verdict<T> {
+		// How much block has passed since the last deduction for the contract.
+		let blocks_passed = {
+			// Calculate an effective block number, i.e. after adjusting for handicap.
+			let effective_block_number = current_block_number.saturating_sub(handicap);
+			effective_block_number.saturating_sub(contract.deduct_block)
+		};
+		if blocks_passed.is_zero() {
+			// Rent has already been paid
+			return Verdict::Exempt;
+		}
 
-	// An amount of funds to charge per block for storage taken up by the contract.
-	let fee_per_block = compute_fee_per_block::<T>(&free_balance, contract);
-	if fee_per_block.is_zero() {
-		// The rent deposit offset reduced the fee to 0. This means that the contract
-		// gets the rent for free.
-		return Verdict::Exempt;
-	}
+		let total_balance = T::Currency::total_balance(account);
+		let free_balance = T::Currency::free_balance(account);
 
-	let rent_budget = match rent_budget::<T>(&total_balance, &free_balance, contract) {
-		Some(rent_budget) => rent_budget,
-		None => {
-			// The contract's total balance is already below subsistence threshold. That
-			// indicates that the contract cannot afford to leave a tombstone.
-			//
-			// So cleanly wipe the contract.
-			return Verdict::Kill;
+		// An amount of funds to charge per block for storage taken up by the contract.
+		let fee_per_block = Self::compute_fee_per_block(&free_balance, contract);
+		if fee_per_block.is_zero() {
+			// The rent deposit offset reduced the fee to 0. This means that the contract
+			// gets the rent for free.
+			return Verdict::Exempt;
 		}
-	};
-
-	let dues = fee_per_block
-		.checked_mul(&blocks_passed.saturated_into::<u32>().into())
-		.unwrap_or_else(|| <BalanceOf<T>>::max_value());
-	let insufficient_rent = rent_budget < dues;
-
-	// If the rent payment cannot be withdrawn due to locks on the account balance, then evict the
-	// account.
-	//
-	// NOTE: This seems problematic because it provides a way to tombstone an account while
-	// avoiding the last rent payment. In effect, someone could retroactively set rent_allowance
-	// for their contract to 0.
-	let dues_limited = dues.min(rent_budget);
-	let can_withdraw_rent = T::Currency::ensure_can_withdraw(
-		account,
-		dues_limited,
-		WithdrawReasons::FEE,
-		free_balance.saturating_sub(dues_limited),
-	)
-	.is_ok();
-
-	if insufficient_rent || !can_withdraw_rent {
-		// The contract cannot afford the rent payment and has a balance above the subsistence
-		// threshold, so it leaves a tombstone.
-		let amount = if can_withdraw_rent {
-			Some(OutstandingAmount::new(dues_limited))
-		} else {
-			None
+
+		let rent_budget = match Self::rent_budget(&total_balance, &free_balance, contract) {
+			Some(rent_budget) => rent_budget,
+			None => {
+				// The contract's total balance is already below subsistence threshold. That
+				// indicates that the contract cannot afford to leave a tombstone.
+				//
+				// So cleanly wipe the contract.
+				return Verdict::Kill;
+			}
+		};
+
+		let dues = fee_per_block
+			.checked_mul(&blocks_passed.saturated_into::<u32>().into())
+			.unwrap_or_else(|| <BalanceOf<T>>::max_value());
+		let insufficient_rent = rent_budget < dues;
+
+		// If the rent payment cannot be withdrawn due to locks on the account balance, then evict the
+		// account.
+		//
+		// NOTE: This seems problematic because it provides a way to tombstone an account while
+		// avoiding the last rent payment. In effect, someone could retroactively set rent_allowance
+		// for their contract to 0.
+		let dues_limited = dues.min(rent_budget);
+		let can_withdraw_rent = T::Currency::ensure_can_withdraw(
+			account,
+			dues_limited,
+			WithdrawReasons::FEE,
+			free_balance.saturating_sub(dues_limited),
+		)
+		.is_ok();
+
+		if insufficient_rent || !can_withdraw_rent {
+			// The contract cannot afford the rent payment and has a balance above the subsistence
+			// threshold, so it leaves a tombstone.
+			let amount = if can_withdraw_rent {
+				Some(OutstandingAmount::new(dues_limited))
+			} else {
+				None
+			};
+			return Verdict::Evict { amount };
+		}
+
+		return Verdict::Charge {
+			// We choose to use `dues_limited` here instead of `dues` just to err on the safer side.
+			amount: OutstandingAmount::new(dues_limited),
 		};
-		return Verdict::Evict { amount };
 	}
 
-	return Verdict::Charge {
-		// We choose to use `dues_limited` here instead of `dues` just to err on the safer side.
-		amount: OutstandingAmount::new(dues_limited),
-	};
-}
+	/// Enacts the given verdict and returns the updated `ContractInfo`.
+	///
+	/// `alive_contract_info` should be from the same address as `account`.
+	fn enact_verdict(
+		account: &T::AccountId,
+		alive_contract_info: AliveContractInfo<T>,
+		current_block_number: T::BlockNumber,
+		verdict: Verdict<T>,
+	) -> Option<ContractInfo<T>> {
+		match verdict {
+			Verdict::Exempt => return Some(ContractInfo::Alive(alive_contract_info)),
+			Verdict::Kill => {
+				<ContractInfoOf<T>>::remove(account);
+				child::kill_storage(
+					&alive_contract_info.child_trie_info(),
+				);
+				<Module<T>>::deposit_event(RawEvent::Evicted(account.clone(), false));
+				None
+			}
+			Verdict::Evict { amount } => {
+				if let Some(amount) = amount {
+					amount.withdraw(account);
+				}
+
+				// Note: this operation is heavy.
+				let child_storage_root = child::root(
+					&alive_contract_info.child_trie_info(),
+				);
+
+				let tombstone = <TombstoneContractInfo<T>>::new(
+					&child_storage_root[..],
+					alive_contract_info.code_hash,
+				);
+				let tombstone_info = ContractInfo::Tombstone(tombstone);
+				<ContractInfoOf<T>>::insert(account, &tombstone_info);
+
+				child::kill_storage(
+					&alive_contract_info.child_trie_info(),
+				);
+
+				<Module<T>>::deposit_event(RawEvent::Evicted(account.clone(), true));
+				Some(tombstone_info)
+			}
+			Verdict::Charge { amount } => {
+				let contract_info = ContractInfo::Alive(AliveContractInfo::<T> {
+					rent_allowance: alive_contract_info.rent_allowance - amount.peek(),
+					deduct_block: current_block_number,
+					..alive_contract_info
+				});
+				<ContractInfoOf<T>>::insert(account, &contract_info);
 
-/// Enacts the given verdict and returns the updated `ContractInfo`.
-///
-/// `alive_contract_info` should be from the same address as `account`.
-fn enact_verdict<T: Trait>(
-	account: &T::AccountId,
-	alive_contract_info: AliveContractInfo<T>,
-	current_block_number: T::BlockNumber,
-	verdict: Verdict<T>,
-) -> Option<ContractInfo<T>> {
-	match verdict {
-		Verdict::Exempt => return Some(ContractInfo::Alive(alive_contract_info)),
-		Verdict::Kill => {
-			<ContractInfoOf<T>>::remove(account);
-			child::kill_storage(
-				&alive_contract_info.child_trie_info(),
-			);
-			<Module<T>>::deposit_event(RawEvent::Evicted(account.clone(), false));
-			None
-		}
-		Verdict::Evict { amount } => {
-			if let Some(amount) = amount {
 				amount.withdraw(account);
+				Some(contract_info)
 			}
+		}
+	}
 
-			// Note: this operation is heavy.
-			let child_storage_root = child::root(
-				&alive_contract_info.child_trie_info(),
-			);
-
-			let tombstone = <TombstoneContractInfo<T>>::new(
-				&child_storage_root[..],
-				alive_contract_info.code_hash,
-			);
-			let tombstone_info = ContractInfo::Tombstone(tombstone);
-			<ContractInfoOf<T>>::insert(account, &tombstone_info);
+	/// Make account paying the rent for the current block number
+	///
+	/// NOTE this function performs eviction eagerly. All changes are read and written directly to
+	/// storage.
+	pub fn collect(account: &T::AccountId) -> Option<ContractInfo<T>> {
+		let contract_info = <ContractInfoOf<T>>::get(account);
+		let alive_contract_info = match contract_info {
+			None | Some(ContractInfo::Tombstone(_)) => return contract_info,
+			Some(ContractInfo::Alive(contract)) => contract,
+		};
 
-			child::kill_storage(
-				&alive_contract_info.child_trie_info(),
-			);
+		let current_block_number = <frame_system::Module<T>>::block_number();
+		let verdict = Self::consider_case(
+			account,
+			current_block_number,
+			Zero::zero(),
+			&alive_contract_info,
+		);
+		Self::enact_verdict(account, alive_contract_info, current_block_number, verdict)
+	}
 
-			<Module<T>>::deposit_event(RawEvent::Evicted(account.clone(), true));
-			Some(tombstone_info)
-		}
-		Verdict::Charge { amount } => {
-			let contract_info = ContractInfo::Alive(AliveContractInfo::<T> {
-				rent_allowance: alive_contract_info.rent_allowance - amount.peek(),
-				deduct_block: current_block_number,
-				..alive_contract_info
-			});
-			<ContractInfoOf<T>>::insert(account, &contract_info);
-
-			amount.withdraw(account);
-			Some(contract_info)
+	/// Process a report that a contract under the given address should be evicted.
+	///
+	/// Enact the eviction right away if the contract should be evicted and return true.
+	/// Otherwise, **do nothing** and return false.
+	///
+	/// The `handicap` parameter gives a way to check the rent to a moment in the past instead
+	/// of current block. E.g. if the contract is going to be evicted at the current block,
+	/// `handicap = 1` can defer the eviction for 1 block. This is useful to handicap certain snitchers
+	/// relative to others.
+	///
+	/// NOTE this function performs eviction eagerly. All changes are read and written directly to
+	/// storage.
+	pub fn snitch_contract_should_be_evicted(
+		account: &T::AccountId,
+		handicap: T::BlockNumber,
+	) -> bool {
+		let contract_info = <ContractInfoOf<T>>::get(account);
+		let alive_contract_info = match contract_info {
+			None | Some(ContractInfo::Tombstone(_)) => return false,
+			Some(ContractInfo::Alive(contract)) => contract,
+		};
+		let current_block_number = <frame_system::Module<T>>::block_number();
+		let verdict = Self::consider_case(
+			account,
+			current_block_number,
+			handicap,
+			&alive_contract_info,
+		);
+
+		// Enact the verdict only if the contract gets removed.
+		match verdict {
+			Verdict::Kill | Verdict::Evict { .. } => {
+				Self::enact_verdict(account, alive_contract_info, current_block_number, verdict);
+				true
+			}
+			_ => false,
 		}
 	}
-}
 
-/// Make account paying the rent for the current block number
-///
-/// NOTE this function performs eviction eagerly. All changes are read and written directly to
-/// storage.
-pub fn collect_rent<T: Trait>(account: &T::AccountId) -> Option<ContractInfo<T>> {
-	let contract_info = <ContractInfoOf<T>>::get(account);
-	let alive_contract_info = match contract_info {
-		None | Some(ContractInfo::Tombstone(_)) => return contract_info,
-		Some(ContractInfo::Alive(contract)) => contract,
-	};
-
-	let current_block_number = <frame_system::Module<T>>::block_number();
-	let verdict = consider_case::<T>(
-		account,
-		current_block_number,
-		Zero::zero(),
-		&alive_contract_info,
-	);
-	enact_verdict(account, alive_contract_info, current_block_number, verdict)
-}
+	/// Returns the projected time a given contract will be able to sustain paying its rent. The
+	/// returned projection is relevant for the current block, i.e. it is as if the contract was
+	/// accessed at the beginning of the current block. Returns `None` in case if the contract was
+	/// evicted before or as a result of the rent collection.
+	///
+	/// The returned value is only an estimation. It doesn't take into account any top ups, changing the
+	/// rent allowance, or any problems coming from withdrawing the dues.
+	///
+	/// NOTE that this is not a side-effect free function! It will actually collect rent and then
+	/// compute the projection. This function is only used for implementation of an RPC method through
+	/// `RuntimeApi` meaning that the changes will be discarded anyway.
+	pub fn compute_projection(
+		account: &T::AccountId,
+	) -> RentProjectionResult<T::BlockNumber> {
+		let contract_info = <ContractInfoOf<T>>::get(account);
+		let alive_contract_info = match contract_info {
+			None | Some(ContractInfo::Tombstone(_)) => return Err(ContractAccessError::IsTombstone),
+			Some(ContractInfo::Alive(contract)) => contract,
+		};
+		let current_block_number = <frame_system::Module<T>>::block_number();
+		let verdict = Self::consider_case(
+			account,
+			current_block_number,
+			Zero::zero(),
+			&alive_contract_info,
+		);
+		let new_contract_info =
+			Self::enact_verdict(account, alive_contract_info, current_block_number, verdict);
+
+		// Check what happened after enaction of the verdict.
+		let alive_contract_info = match new_contract_info {
+			None | Some(ContractInfo::Tombstone(_)) => return Err(ContractAccessError::IsTombstone),
+			Some(ContractInfo::Alive(contract)) => contract,
+		};
 
-/// Process a report that a contract under the given address should be evicted.
-///
-/// Enact the eviction right away if the contract should be evicted and return true.
-/// Otherwise, **do nothing** and return false.
-///
-/// The `handicap` parameter gives a way to check the rent to a moment in the past instead
-/// of current block. E.g. if the contract is going to be evicted at the current block,
-/// `handicap = 1` can defer the eviction for 1 block. This is useful to handicap certain snitchers
-/// relative to others.
-///
-/// NOTE this function performs eviction eagerly. All changes are read and written directly to
-/// storage.
-pub fn snitch_contract_should_be_evicted<T: Trait>(
-	account: &T::AccountId,
-	handicap: T::BlockNumber,
-) -> bool {
-	let contract_info = <ContractInfoOf<T>>::get(account);
-	let alive_contract_info = match contract_info {
-		None | Some(ContractInfo::Tombstone(_)) => return false,
-		Some(ContractInfo::Alive(contract)) => contract,
-	};
-	let current_block_number = <frame_system::Module<T>>::block_number();
-	let verdict = consider_case::<T>(
-		account,
-		current_block_number,
-		handicap,
-		&alive_contract_info,
-	);
-
-	// Enact the verdict only if the contract gets removed.
-	match verdict {
-		Verdict::Kill | Verdict::Evict { .. } => {
-			enact_verdict(account, alive_contract_info, current_block_number, verdict);
-			true
+		// Compute how much would the fee per block be with the *updated* balance.
+		let total_balance = T::Currency::total_balance(account);
+		let free_balance = T::Currency::free_balance(account);
+		let fee_per_block = Self::compute_fee_per_block(&free_balance, &alive_contract_info);
+		if fee_per_block.is_zero() {
+			return Ok(RentProjection::NoEviction);
 		}
-		_ => false,
-	}
-}
 
-/// Returns the projected time a given contract will be able to sustain paying its rent. The
-/// returned projection is relevant for the current block, i.e. it is as if the contract was
-/// accessed at the beginning of the current block. Returns `None` in case if the contract was
-/// evicted before or as a result of the rent collection.
-///
-/// The returned value is only an estimation. It doesn't take into account any top ups, changing the
-/// rent allowance, or any problems coming from withdrawing the dues.
-///
-/// NOTE that this is not a side-effect free function! It will actually collect rent and then
-/// compute the projection. This function is only used for implementation of an RPC method through
-/// `RuntimeApi` meaning that the changes will be discarded anyway.
-pub fn compute_rent_projection<T: Trait>(
-	account: &T::AccountId,
-) -> RentProjectionResult<T::BlockNumber> {
-	let contract_info = <ContractInfoOf<T>>::get(account);
-	let alive_contract_info = match contract_info {
-		None | Some(ContractInfo::Tombstone(_)) => return Err(ContractAccessError::IsTombstone),
-		Some(ContractInfo::Alive(contract)) => contract,
-	};
-	let current_block_number = <frame_system::Module<T>>::block_number();
-	let verdict = consider_case::<T>(
-		account,
-		current_block_number,
-		Zero::zero(),
-		&alive_contract_info,
-	);
-	let new_contract_info =
-		enact_verdict(account, alive_contract_info, current_block_number, verdict);
-
-	// Check what happened after enaction of the verdict.
-	let alive_contract_info = match new_contract_info {
-		None | Some(ContractInfo::Tombstone(_)) => return Err(ContractAccessError::IsTombstone),
-		Some(ContractInfo::Alive(contract)) => contract,
-	};
-
-	// Compute how much would the fee per block be with the *updated* balance.
-	let total_balance = T::Currency::total_balance(account);
-	let free_balance = T::Currency::free_balance(account);
-	let fee_per_block = compute_fee_per_block::<T>(&free_balance, &alive_contract_info);
-	if fee_per_block.is_zero() {
-		return Ok(RentProjection::NoEviction);
+		// Then compute how much the contract will sustain under these circumstances.
+		let rent_budget = Self::rent_budget(&total_balance, &free_balance, &alive_contract_info).expect(
+			"the contract exists and in the alive state;
+			the updated balance must be greater than subsistence deposit;
+			this function doesn't return `None`;
+			qed
+			",
+		);
+		let blocks_left = match rent_budget.checked_div(&fee_per_block) {
+			Some(blocks_left) => blocks_left,
+			None => {
+				// `fee_per_block` is not zero here, so `checked_div` can return `None` if
+				// there is an overflow. This cannot happen with integers though. Return
+				// `NoEviction` here just in case.
+				return Ok(RentProjection::NoEviction);
+			}
+		};
+
+		let blocks_left = blocks_left.saturated_into::<u32>().into();
+		Ok(RentProjection::EvictionAt(
+			current_block_number + blocks_left,
+		))
 	}
 
-	// Then compute how much the contract will sustain under these circumstances.
-	let rent_budget = rent_budget::<T>(&total_balance, &free_balance, &alive_contract_info).expect(
-		"the contract exists and in the alive state;
-		the updated balance must be greater than subsistence deposit;
-		this function doesn't return `None`;
-		qed
-		",
-	);
-	let blocks_left = match rent_budget.checked_div(&fee_per_block) {
-		Some(blocks_left) => blocks_left,
-		None => {
-			// `fee_per_block` is not zero here, so `checked_div` can return `None` if
-			// there is an overflow. This cannot happen with integers though. Return
-			// `NoEviction` here just in case.
-			return Ok(RentProjection::NoEviction);
+	/// Restores the destination account using the origin as prototype.
+	///
+	/// The restoration will be performed iff:
+	/// - origin exists and is alive,
+	/// - the origin's storage is not written in the current block
+	/// - the restored account has tombstone
+	/// - the tombstone matches the hash of the origin storage root, and code hash.
+	///
+	/// Upon succesful restoration, `origin` will be destroyed, all its funds are transferred to
+	/// the restored account. The restored account will inherit the last write block and its last
+	/// deduct block will be set to the current block.
+	pub fn restore_to(
+		origin: T::AccountId,
+		dest: T::AccountId,
+		code_hash: CodeHash<T>,
+		rent_allowance: BalanceOf<T>,
+		delta: Vec<crate::exec::StorageKey>,
+	) -> Result<(), DispatchError> {
+		let mut origin_contract = <ContractInfoOf<T>>::get(&origin)
+			.and_then(|c| c.get_alive())
+			.ok_or(Error::<T>::InvalidSourceContract)?;
+
+		let child_trie_info = origin_contract.child_trie_info();
+
+		let current_block = <frame_system::Module<T>>::block_number();
+
+		if origin_contract.last_write == Some(current_block) {
+			return Err(Error::<T>::InvalidContractOrigin.into());
 		}
-	};
 
-	let blocks_left = blocks_left.saturated_into::<u32>().into();
-	Ok(RentProjection::EvictionAt(
-		current_block_number + blocks_left,
-	))
-}
+		let dest_tombstone = <ContractInfoOf<T>>::get(&dest)
+			.and_then(|c| c.get_tombstone())
+			.ok_or(Error::<T>::InvalidDestinationContract)?;
 
-/// Restores the destination account using the origin as prototype.
-///
-/// The restoration will be performed iff:
-/// - origin exists and is alive,
-/// - the origin's storage is not written in the current block
-/// - the restored account has tombstone
-/// - the tombstone matches the hash of the origin storage root, and code hash.
-///
-/// Upon succesful restoration, `origin` will be destroyed, all its funds are transferred to
-/// the restored account. The restored account will inherit the last write block and its last
-/// deduct block will be set to the current block.
-pub fn restore_to<T: Trait>(
-	origin: T::AccountId,
-	dest: T::AccountId,
-	code_hash: CodeHash<T>,
-	rent_allowance: BalanceOf<T>,
-	delta: Vec<crate::exec::StorageKey>,
-) -> Result<(), &'static str> {
-	let mut origin_contract = <ContractInfoOf<T>>::get(&origin)
-		.and_then(|c| c.get_alive())
-		.ok_or("Cannot restore from inexisting or tombstone contract")?;
-
-	let child_trie_info = origin_contract.child_trie_info();
-
-	let current_block = <frame_system::Module<T>>::block_number();
-
-	if origin_contract.last_write == Some(current_block) {
-		return Err("Origin TrieId written in the current block");
-	}
+		let last_write = if !delta.is_empty() {
+			Some(current_block)
+		} else {
+			origin_contract.last_write
+		};
 
-	let dest_tombstone = <ContractInfoOf<T>>::get(&dest)
-		.and_then(|c| c.get_tombstone())
-		.ok_or("Cannot restore to inexisting or alive contract")?;
-
-	let last_write = if !delta.is_empty() {
-		Some(current_block)
-	} else {
-		origin_contract.last_write
-	};
-
-	let key_values_taken = delta.iter()
-		.filter_map(|key| {
-			child::get_raw(&child_trie_info, &blake2_256(key)).map(|value| {
-				child::kill(&child_trie_info, &blake2_256(key));
-				(key, value)
+		let key_values_taken = delta.iter()
+			.filter_map(|key| {
+				child::get_raw(&child_trie_info, &blake2_256(key)).map(|value| {
+					child::kill(&child_trie_info, &blake2_256(key));
+					(key, value)
+				})
 			})
-		})
-		.collect::<Vec<_>>();
-
-	let tombstone = <TombstoneContractInfo<T>>::new(
-		// This operation is cheap enough because last_write (delta not included)
-		// is not this block as it has been checked earlier.
-		&child::root(&child_trie_info)[..],
-		code_hash,
-	);
-
-	if tombstone != dest_tombstone {
-		for (key, value) in key_values_taken {
-			child::put_raw(&child_trie_info, &blake2_256(key), &value);
+			.collect::<Vec<_>>();
+
+		let tombstone = <TombstoneContractInfo<T>>::new(
+			// This operation is cheap enough because last_write (delta not included)
+			// is not this block as it has been checked earlier.
+			&child::root(&child_trie_info)[..],
+			code_hash,
+		);
+
+		if tombstone != dest_tombstone {
+			for (key, value) in key_values_taken {
+				child::put_raw(&child_trie_info, &blake2_256(key), &value);
+			}
+			return Err(Error::<T>::InvalidTombstone.into());
 		}
 
-		return Err("Tombstones don't match");
+		origin_contract.storage_size -= key_values_taken.iter()
+			.map(|(_, value)| value.len() as u32)
+			.sum::<u32>();
+
+		<ContractInfoOf<T>>::remove(&origin);
+		<ContractInfoOf<T>>::insert(&dest, ContractInfo::Alive(AliveContractInfo::<T> {
+			trie_id: origin_contract.trie_id,
+			storage_size: origin_contract.storage_size,
+			empty_pair_count: origin_contract.empty_pair_count,
+			total_pair_count: origin_contract.total_pair_count,
+			code_hash,
+			rent_allowance,
+			deduct_block: current_block,
+			last_write,
+		}));
+
+		let origin_free_balance = T::Currency::free_balance(&origin);
+		T::Currency::make_free_balance_be(&origin, <BalanceOf<T>>::zero());
+		T::Currency::deposit_creating(&dest, origin_free_balance);
+
+		Ok(())
 	}
-
-	origin_contract.storage_size -= key_values_taken.iter()
-		.map(|(_, value)| value.len() as u32)
-		.sum::<u32>();
-
-	<ContractInfoOf<T>>::remove(&origin);
-	<ContractInfoOf<T>>::insert(&dest, ContractInfo::Alive(AliveContractInfo::<T> {
-		trie_id: origin_contract.trie_id,
-		storage_size: origin_contract.storage_size,
-		empty_pair_count: origin_contract.empty_pair_count,
-		total_pair_count: origin_contract.total_pair_count,
-		code_hash,
-		rent_allowance,
-		deduct_block: current_block,
-		last_write,
-	}));
-
-	let origin_free_balance = T::Currency::free_balance(&origin);
-	T::Currency::make_free_balance_be(&origin, <BalanceOf<T>>::zero());
-	T::Currency::deposit_creating(&dest, origin_free_balance);
-
-	Ok(())
 }
diff --git a/frame/contracts/src/schedule.rs b/frame/contracts/src/schedule.rs
index ff2cde229711..197cc654c59b 100644
--- a/frame/contracts/src/schedule.rs
+++ b/frame/contracts/src/schedule.rs
@@ -302,6 +302,9 @@ pub struct HostFnWeights<T: Trait> {
 	/// Weight per output byte received through `seal_instantiate`.
 	pub instantiate_per_output_byte: Weight,
 
+	/// Weight per salt byte supplied to `seal_instantiate`.
+	pub instantiate_per_salt_byte: Weight,
+
 	/// Weight of calling `seal_hash_sha_256`.
 	pub hash_sha2_256: Weight,
 
@@ -535,8 +538,9 @@ impl<T: Trait> Default for HostFnWeights<T> {
 			call_per_input_byte: cost_byte_batched_args!(seal_call_per_transfer_input_output_kb, 0, 1, 0),
 			call_per_output_byte: cost_byte_batched_args!(seal_call_per_transfer_input_output_kb, 0, 0, 1),
 			instantiate: cost_batched!(seal_instantiate),
-			instantiate_per_input_byte: cost_byte_batched_args!(seal_instantiate_per_input_output_kb, 1, 0),
-			instantiate_per_output_byte: cost_byte_batched_args!(seal_instantiate_per_input_output_kb, 0, 1),
+			instantiate_per_input_byte: cost_byte_batched_args!(seal_instantiate_per_input_output_salt_kb, 1, 0, 0),
+			instantiate_per_output_byte: cost_byte_batched_args!(seal_instantiate_per_input_output_salt_kb, 0, 1, 0),
+			instantiate_per_salt_byte: cost_byte_batched_args!(seal_instantiate_per_input_output_salt_kb, 0, 0, 1),
 			hash_sha2_256: cost_batched!(seal_hash_sha2_256),
 			hash_sha2_256_per_byte: cost_byte_batched!(seal_hash_sha2_256_per_kb),
 			hash_keccak_256: cost_batched!(seal_hash_keccak_256),
diff --git a/frame/contracts/src/storage.rs b/frame/contracts/src/storage.rs
index 3740952778fd..acd788796150 100644
--- a/frame/contracts/src/storage.rs
+++ b/frame/contracts/src/storage.rs
@@ -19,10 +19,13 @@
 use crate::{
 	exec::{AccountIdOf, StorageKey},
 	AliveContractInfo, BalanceOf, CodeHash, ContractInfo, ContractInfoOf, Trait, TrieId,
+	AccountCounter,
 };
 use sp_std::prelude::*;
+use sp_std::marker::PhantomData;
 use sp_io::hashing::blake2_256;
 use sp_runtime::traits::Bounded;
+use sp_core::crypto::UncheckedFrom;
 use frame_support::{storage::child, StorageMap};
 
 /// An error that means that the account requested either doesn't exist or represents a tombstone
@@ -30,167 +33,196 @@ use frame_support::{storage::child, StorageMap};
 #[cfg_attr(test, derive(PartialEq, Eq, Debug))]
 pub struct ContractAbsentError;
 
-/// Reads a storage kv pair of a contract.
-///
-/// The read is performed from the `trie_id` only. The `address` is not necessary. If the contract
-/// doesn't store under the given `key` `None` is returned.
-pub fn read_contract_storage(trie_id: &TrieId, key: &StorageKey) -> Option<Vec<u8>> {
-	child::get_raw(&crate::child_trie_info(&trie_id), &blake2_256(key))
-}
-
-/// Update a storage entry into a contract's kv storage.
-///
-/// If the `opt_new_value` is `None` then the kv pair is removed.
-///
-/// This function also updates the bookkeeping info such as: number of total non-empty pairs a
-/// contract owns, the last block the storage was written to, etc. That's why, in contrast to
-/// `read_contract_storage`, this function also requires the `account` ID.
-///
-/// If the contract specified by the id `account` doesn't exist `Err` is returned.`
-pub fn write_contract_storage<T: Trait>(
-	account: &AccountIdOf<T>,
-	trie_id: &TrieId,
-	key: &StorageKey,
-	opt_new_value: Option<Vec<u8>>,
-) -> Result<(), ContractAbsentError> {
-	let mut new_info = match <ContractInfoOf<T>>::get(account) {
-		Some(ContractInfo::Alive(alive)) => alive,
-		None | Some(ContractInfo::Tombstone(_)) => return Err(ContractAbsentError),
-	};
-
-	let hashed_key = blake2_256(key);
-	let child_trie_info = &crate::child_trie_info(&trie_id);
-
-	// In order to correctly update the book keeping we need to fetch the previous
-	// value of the key-value pair.
-	//
-	// It might be a bit more clean if we had an API that supported getting the size
-	// of the value without going through the loading of it. But at the moment of
-	// writing, there is no such API.
-	//
-	// That's not a show stopper in any case, since the performance cost is
-	// dominated by the trie traversal anyway.
-	let opt_prev_value = child::get_raw(&child_trie_info, &hashed_key);
-
-	// Update the total number of KV pairs and the number of empty pairs.
-	match (&opt_prev_value, &opt_new_value) {
-		(Some(prev_value), None) => {
-			new_info.total_pair_count -= 1;
-			if prev_value.is_empty() {
-				new_info.empty_pair_count -= 1;
-			}
-		},
-		(None, Some(new_value)) => {
-			new_info.total_pair_count += 1;
-			if new_value.is_empty() {
-				new_info.empty_pair_count += 1;
-			}
-		},
-		(Some(prev_value), Some(new_value)) => {
-			if prev_value.is_empty() {
-				new_info.empty_pair_count -= 1;
-			}
-			if new_value.is_empty() {
-				new_info.empty_pair_count += 1;
+pub struct Storage<T>(PhantomData<T>);
+
+impl<T> Storage<T>
+where
+	T: Trait,
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
+{
+	/// Reads a storage kv pair of a contract.
+	///
+	/// The read is performed from the `trie_id` only. The `address` is not necessary. If the contract
+	/// doesn't store under the given `key` `None` is returned.
+	pub fn read(trie_id: &TrieId, key: &StorageKey) -> Option<Vec<u8>> {
+		child::get_raw(&crate::child_trie_info(&trie_id), &blake2_256(key))
+	}
+
+	/// Update a storage entry into a contract's kv storage.
+	///
+	/// If the `opt_new_value` is `None` then the kv pair is removed.
+	///
+	/// This function also updates the bookkeeping info such as: number of total non-empty pairs a
+	/// contract owns, the last block the storage was written to, etc. That's why, in contrast to
+	/// `read`, this function also requires the `account` ID.
+	///
+	/// If the contract specified by the id `account` doesn't exist `Err` is returned.`
+	pub fn write(
+		account: &AccountIdOf<T>,
+		trie_id: &TrieId,
+		key: &StorageKey,
+		opt_new_value: Option<Vec<u8>>,
+	) -> Result<(), ContractAbsentError> {
+		let mut new_info = match <ContractInfoOf<T>>::get(account) {
+			Some(ContractInfo::Alive(alive)) => alive,
+			None | Some(ContractInfo::Tombstone(_)) => return Err(ContractAbsentError),
+		};
+
+		let hashed_key = blake2_256(key);
+		let child_trie_info = &crate::child_trie_info(&trie_id);
+
+		// In order to correctly update the book keeping we need to fetch the previous
+		// value of the key-value pair.
+		//
+		// It might be a bit more clean if we had an API that supported getting the size
+		// of the value without going through the loading of it. But at the moment of
+		// writing, there is no such API.
+		//
+		// That's not a show stopper in any case, since the performance cost is
+		// dominated by the trie traversal anyway.
+		let opt_prev_value = child::get_raw(&child_trie_info, &hashed_key);
+
+		// Update the total number of KV pairs and the number of empty pairs.
+		match (&opt_prev_value, &opt_new_value) {
+			(Some(prev_value), None) => {
+				new_info.total_pair_count -= 1;
+				if prev_value.is_empty() {
+					new_info.empty_pair_count -= 1;
+				}
+			},
+			(None, Some(new_value)) => {
+				new_info.total_pair_count += 1;
+				if new_value.is_empty() {
+					new_info.empty_pair_count += 1;
+				}
+			},
+			(Some(prev_value), Some(new_value)) => {
+				if prev_value.is_empty() {
+					new_info.empty_pair_count -= 1;
+				}
+				if new_value.is_empty() {
+					new_info.empty_pair_count += 1;
+				}
 			}
+			(None, None) => {}
+		}
+
+		// Update the total storage size.
+		let prev_value_len = opt_prev_value
+			.as_ref()
+			.map(|old_value| old_value.len() as u32)
+			.unwrap_or(0);
+		let new_value_len = opt_new_value
+			.as_ref()
+			.map(|new_value| new_value.len() as u32)
+			.unwrap_or(0);
+		new_info.storage_size = new_info
+			.storage_size
+			.saturating_add(new_value_len)
+			.saturating_sub(prev_value_len);
+
+		new_info.last_write = Some(<frame_system::Module<T>>::block_number());
+		<ContractInfoOf<T>>::insert(&account, ContractInfo::Alive(new_info));
+
+		// Finally, perform the change on the storage.
+		match opt_new_value {
+			Some(new_value) => child::put_raw(&child_trie_info, &hashed_key, &new_value[..]),
+			None => child::kill(&child_trie_info, &hashed_key),
 		}
-		(None, None) => {}
+
+		Ok(())
 	}
 
-	// Update the total storage size.
-	let prev_value_len = opt_prev_value
-		.as_ref()
-		.map(|old_value| old_value.len() as u32)
-		.unwrap_or(0);
-	let new_value_len = opt_new_value
-		.as_ref()
-		.map(|new_value| new_value.len() as u32)
-		.unwrap_or(0);
-	new_info.storage_size = new_info
-		.storage_size
-		.saturating_add(new_value_len)
-		.saturating_sub(prev_value_len);
-
-	new_info.last_write = Some(<frame_system::Module<T>>::block_number());
-	<ContractInfoOf<T>>::insert(&account, ContractInfo::Alive(new_info));
-
-	// Finally, perform the change on the storage.
-	match opt_new_value {
-		Some(new_value) => child::put_raw(&child_trie_info, &hashed_key, &new_value[..]),
-		None => child::kill(&child_trie_info, &hashed_key),
+	/// Returns the rent allowance set for the contract give by the account id.
+	pub fn rent_allowance(
+		account: &AccountIdOf<T>,
+	) -> Result<BalanceOf<T>, ContractAbsentError>
+	{
+		<ContractInfoOf<T>>::get(account)
+			.and_then(|i| i.as_alive().map(|i| i.rent_allowance))
+			.ok_or(ContractAbsentError)
 	}
 
-	Ok(())
-}
-
-/// Returns the rent allowance set for the contract give by the account id.
-pub fn rent_allowance<T: Trait>(
-	account: &AccountIdOf<T>,
-) -> Result<BalanceOf<T>, ContractAbsentError> {
-	<ContractInfoOf<T>>::get(account)
-		.and_then(|i| i.as_alive().map(|i| i.rent_allowance))
-		.ok_or(ContractAbsentError)
-}
-
-/// Set the rent allowance for the contract given by the account id.
-///
-/// Returns `Err` if the contract doesn't exist or is a tombstone.
-pub fn set_rent_allowance<T: Trait>(
-	account: &AccountIdOf<T>,
-	rent_allowance: BalanceOf<T>,
-) -> Result<(), ContractAbsentError> {
-	<ContractInfoOf<T>>::mutate(account, |maybe_contract_info| match maybe_contract_info {
-		Some(ContractInfo::Alive(ref mut alive_info)) => {
-			alive_info.rent_allowance = rent_allowance;
-			Ok(())
-		}
-		_ => Err(ContractAbsentError),
-	})
-}
-
-/// Returns the code hash of the contract specified by `account` ID.
-#[cfg(test)]
-pub fn code_hash<T: Trait>(account: &AccountIdOf<T>) -> Result<CodeHash<T>, ContractAbsentError> {
-	<ContractInfoOf<T>>::get(account)
-		.and_then(|i| i.as_alive().map(|i| i.code_hash))
-		.ok_or(ContractAbsentError)
-}
-
-/// Creates a new contract descriptor in the storage with the given code hash at the given address.
-///
-/// Returns `Err` if there is already a contract (or a tombstone) exists at the given address.
-pub fn place_contract<T: Trait>(
-	account: &AccountIdOf<T>,
-	trie_id: TrieId,
-	ch: CodeHash<T>,
-) -> Result<(), &'static str> {
-	<ContractInfoOf<T>>::mutate(account, |maybe_contract_info| {
-		if maybe_contract_info.is_some() {
-			return Err("Alive contract or tombstone already exists");
-		}
+	/// Set the rent allowance for the contract given by the account id.
+	///
+	/// Returns `Err` if the contract doesn't exist or is a tombstone.
+	pub fn set_rent_allowance(
+		account: &AccountIdOf<T>,
+		rent_allowance: BalanceOf<T>,
+	) -> Result<(), ContractAbsentError> {
+		<ContractInfoOf<T>>::mutate(account, |maybe_contract_info| match maybe_contract_info {
+			Some(ContractInfo::Alive(ref mut alive_info)) => {
+				alive_info.rent_allowance = rent_allowance;
+				Ok(())
+			}
+			_ => Err(ContractAbsentError),
+		})
+	}
 
-		*maybe_contract_info = Some(
-			AliveContractInfo::<T> {
-				code_hash: ch,
-				storage_size: 0,
-				trie_id,
-				deduct_block: <frame_system::Module<T>>::block_number(),
-				rent_allowance: <BalanceOf<T>>::max_value(),
-				empty_pair_count: 0,
-				total_pair_count: 0,
-				last_write: None,
+	/// Creates a new contract descriptor in the storage with the given code hash at the given address.
+	///
+	/// Returns `Err` if there is already a contract (or a tombstone) exists at the given address.
+	pub fn place_contract(
+		account: &AccountIdOf<T>,
+		trie_id: TrieId,
+		ch: CodeHash<T>,
+	) -> Result<(), &'static str> {
+		<ContractInfoOf<T>>::mutate(account, |maybe_contract_info| {
+			if maybe_contract_info.is_some() {
+				return Err("Alive contract or tombstone already exists");
 			}
-			.into(),
-		);
 
-		Ok(())
-	})
-}
-
-/// Removes the contract and all the storage associated with it.
-///
-/// This function doesn't affect the account.
-pub fn destroy_contract<T: Trait>(address: &AccountIdOf<T>, trie_id: &TrieId) {
-	<ContractInfoOf<T>>::remove(address);
-	child::kill_storage(&crate::child_trie_info(&trie_id));
-}
+			*maybe_contract_info = Some(
+				AliveContractInfo::<T> {
+					code_hash: ch,
+					storage_size: 0,
+					trie_id,
+					deduct_block: <frame_system::Module<T>>::block_number(),
+					rent_allowance: <BalanceOf<T>>::max_value(),
+					empty_pair_count: 0,
+					total_pair_count: 0,
+					last_write: None,
+				}
+				.into(),
+			);
+
+			Ok(())
+		})
+	}
+
+	/// Removes the contract and all the storage associated with it.
+	///
+	/// This function doesn't affect the account.
+	pub fn destroy_contract(address: &AccountIdOf<T>, trie_id: &TrieId) {
+		<ContractInfoOf<T>>::remove(address);
+		child::kill_storage(&crate::child_trie_info(&trie_id));
+	}
+
+	/// This generator uses inner counter for account id and applies the hash over `AccountId +
+	/// accountid_counter`.
+	pub fn generate_trie_id(account_id: &AccountIdOf<T>) -> TrieId {
+		use frame_support::StorageValue;
+		use sp_runtime::traits::Hash;
+		// Note that skipping a value due to error is not an issue here.
+		// We only need uniqueness, not sequence.
+		let new_seed = AccountCounter::mutate(|v| {
+			*v = v.wrapping_add(1);
+			*v
+		});
+
+		let buf: Vec<_> = account_id.as_ref().iter()
+			.chain(&new_seed.to_le_bytes())
+			.cloned()
+			.collect();
+		T::Hashing::hash(&buf).as_ref().into()
+	}
+
+	/// Returns the code hash of the contract specified by `account` ID.
+	#[cfg(test)]
+	pub fn code_hash(account: &AccountIdOf<T>) -> Result<CodeHash<T>, ContractAbsentError>
+	{
+		<ContractInfoOf<T>>::get(account)
+			.and_then(|i| i.as_alive().map(|i| i.code_hash))
+			.ok_or(ContractAbsentError)
+	}
+}
\ No newline at end of file
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index 05e46a3ab158..6a0476096c8c 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -15,21 +15,22 @@
 // along with Substrate. If not, see <http://www.gnu.org/licenses/>.
 
 use crate::{
-	BalanceOf, ContractAddressFor, ContractInfo, ContractInfoOf, GenesisConfig, Module,
-	RawAliveContractInfo, RawEvent, Trait, TrieId, Schedule, TrieIdGenerator, gas::Gas,
-	Error, Config, RuntimeReturnCode,
+	BalanceOf, ContractInfo, ContractInfoOf, GenesisConfig, Module,
+	RawAliveContractInfo, RawEvent, Trait, Schedule, gas::Gas,
+	Error, Config, RuntimeReturnCode, storage::Storage,
+	exec::AccountIdOf,
 };
 use assert_matches::assert_matches;
-use hex_literal::*;
 use codec::Encode;
 use sp_runtime::{
 	Perbill,
 	traits::{BlakeTwo256, Hash, IdentityLookup, Convert},
 	testing::{Header, H256},
+	AccountId32,
 };
 use frame_support::{
 	assert_ok, assert_err_ignore_postinfo, impl_outer_dispatch, impl_outer_event,
-	impl_outer_origin, parameter_types, StorageMap, StorageValue,
+	impl_outer_origin, parameter_types, StorageMap,
 	traits::{Currency, ReservableCurrency},
 	weights::{Weight, PostDispatchInfo},
 	dispatch::DispatchErrorWithPostInfo,
@@ -66,28 +67,30 @@ impl_outer_dispatch! {
 #[macro_use]
 pub mod test_utils {
 	use super::{Test, Balances};
-	use crate::{ContractInfoOf, TrieIdGenerator, CodeHash};
-	use crate::storage::{write_contract_storage, read_contract_storage};
-	use crate::exec::StorageKey;
+	use crate::{
+		ContractInfoOf, CodeHash,
+		storage::Storage,
+		exec::{StorageKey, AccountIdOf},
+	};
 	use frame_support::{StorageMap, traits::Currency};
 
-	pub fn set_storage(addr: &u64, key: &StorageKey, value: Option<Vec<u8>>) {
+	pub fn set_storage(addr: &AccountIdOf<Test>, key: &StorageKey, value: Option<Vec<u8>>) {
 		let contract_info = <ContractInfoOf::<Test>>::get(&addr).unwrap().get_alive().unwrap();
-		write_contract_storage::<Test>(&1, &contract_info.trie_id, key, value).unwrap();
+		Storage::<Test>::write(addr, &contract_info.trie_id, key, value).unwrap();
 	}
-	pub fn get_storage(addr: &u64, key: &StorageKey) -> Option<Vec<u8>> {
+	pub fn get_storage(addr: &AccountIdOf<Test>, key: &StorageKey) -> Option<Vec<u8>> {
 		let contract_info = <ContractInfoOf::<Test>>::get(&addr).unwrap().get_alive().unwrap();
-		read_contract_storage(&contract_info.trie_id, key)
+		Storage::<Test>::read(&contract_info.trie_id, key)
 	}
-	pub fn place_contract(address: &u64, code_hash: CodeHash<Test>) {
-		let trie_id = <Test as crate::Trait>::TrieIdGenerator::trie_id(address);
-		crate::storage::place_contract::<Test>(&address, trie_id, code_hash).unwrap()
+	pub fn place_contract(address: &AccountIdOf<Test>, code_hash: CodeHash<Test>) {
+		let trie_id = Storage::<Test>::generate_trie_id(address);
+		Storage::<Test>::place_contract(&address, trie_id, code_hash).unwrap()
 	}
-	pub fn set_balance(who: &u64, amount: u64) {
+	pub fn set_balance(who: &AccountIdOf<Test>, amount: u64) {
 		let imbalance = Balances::deposit_creating(who, amount);
 		drop(imbalance);
 	}
-	pub fn get_balance(who: &u64) -> u64 {
+	pub fn get_balance(who: &AccountIdOf<Test>) -> u64 {
 		Balances::free_balance(who)
 	}
 	macro_rules! assert_return_code {
@@ -115,7 +118,7 @@ impl frame_system::Trait for Test {
 	type Hash = H256;
 	type Call = Call;
 	type Hashing = BlakeTwo256;
-	type AccountId = u64;
+	type AccountId = AccountId32;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type Header = Header;
 	type Event = MetaEvent;
@@ -177,9 +180,7 @@ impl Trait for Test {
 	type Time = Timestamp;
 	type Randomness = Randomness;
 	type Currency = Balances;
-	type DetermineContractAddress = DummyContractAddressFor;
 	type Event = MetaEvent;
-	type TrieIdGenerator = DummyTrieIdGenerator;
 	type RentPayment = ();
 	type SignedClaimHandicap = SignedClaimHandicap;
 	type TombstoneDeposit = TombstoneDeposit;
@@ -199,32 +200,10 @@ type Contracts = Module<Test>;
 type System = frame_system::Module<Test>;
 type Randomness = pallet_randomness_collective_flip::Module<Test>;
 
-pub struct DummyContractAddressFor;
-impl ContractAddressFor<H256, u64> for DummyContractAddressFor {
-	fn contract_address_for(_code_hash: &H256, _data: &[u8], origin: &u64) -> u64 {
-		*origin + 1
-	}
-}
-
-pub struct DummyTrieIdGenerator;
-impl TrieIdGenerator<u64> for DummyTrieIdGenerator {
-	fn trie_id(account_id: &u64) -> TrieId {
-		let new_seed = super::AccountCounter::mutate(|v| {
-			*v = v.wrapping_add(1);
-			*v
-		});
-
-		let mut res = vec![];
-		res.extend_from_slice(&new_seed.to_le_bytes());
-		res.extend_from_slice(&account_id.to_le_bytes());
-		res
-	}
-}
-
-const ALICE: u64 = 1;
-const BOB: u64 = 2;
-const CHARLIE: u64 = 3;
-const DJANGO: u64 = 4;
+pub const ALICE: AccountId32 = AccountId32::new([1u8; 32]);
+pub const BOB: AccountId32 = AccountId32::new([2u8; 32]);
+pub const CHARLIE: AccountId32 = AccountId32::new([3u8; 32]);
+pub const DJANGO: AccountId32 = AccountId32::new([4u8; 32]);
 
 const GAS_LIMIT: Gas = 10_000_000_000;
 
@@ -309,8 +288,8 @@ fn account_removal_does_not_remove_storage() {
 	use self::test_utils::{set_storage, get_storage};
 
 	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let trie_id1 = <Test as Trait>::TrieIdGenerator::trie_id(&1);
-		let trie_id2 = <Test as Trait>::TrieIdGenerator::trie_id(&2);
+		let trie_id1 = Storage::<Test>::generate_trie_id(&ALICE);
+		let trie_id2 = Storage::<Test>::generate_trie_id(&BOB);
 		let key1 = &[1; 32];
 		let key2 = &[2; 32];
 
@@ -399,17 +378,21 @@ fn instantiate_and_call_and_deposit_event() {
 				GAS_LIMIT,
 				code_hash.into(),
 				vec![],
+				vec![],
 			);
+			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
 			pretty_assertions::assert_eq!(System::events(), vec![
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::system(frame_system::RawEvent::NewAccount(1)),
+					event: MetaEvent::system(frame_system::RawEvent::NewAccount(ALICE.clone())),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::balances(pallet_balances::RawEvent::Endowed(1, 1_000_000)),
+					event: MetaEvent::balances(
+						pallet_balances::RawEvent::Endowed(ALICE, 1_000_000)
+					),
 					topics: vec![],
 				},
 				EventRecord {
@@ -419,37 +402,39 @@ fn instantiate_and_call_and_deposit_event() {
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::system(frame_system::RawEvent::NewAccount(BOB)),
+					event: MetaEvent::system(frame_system::RawEvent::NewAccount(addr.clone())),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
 					event: MetaEvent::balances(
-						pallet_balances::RawEvent::Endowed(BOB, subsistence)
+						pallet_balances::RawEvent::Endowed(addr.clone(), subsistence)
 					),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
 					event: MetaEvent::balances(
-						pallet_balances::RawEvent::Transfer(ALICE, BOB, subsistence)
+						pallet_balances::RawEvent::Transfer(ALICE, addr.clone(), subsistence)
 					),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::contracts(RawEvent::ContractExecution(BOB, vec![1, 2, 3, 4])),
+					event: MetaEvent::contracts(
+						RawEvent::ContractExecution(addr.clone(), vec![1, 2, 3, 4])
+					),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::contracts(RawEvent::Instantiated(ALICE, BOB)),
+					event: MetaEvent::contracts(RawEvent::Instantiated(ALICE, addr.clone())),
 					topics: vec![],
 				}
 			]);
 
 			assert_ok!(creation);
-			assert!(ContractInfoOf::<Test>::contains_key(BOB));
+			assert!(ContractInfoOf::<Test>::contains_key(&addr));
 		});
 }
 
@@ -470,16 +455,21 @@ fn deposit_event_max_value_limit() {
 				GAS_LIMIT,
 				code_hash.into(),
 				vec![],
+				vec![],
 			));
+			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
 			// Check creation
-			let bob_contract = ContractInfoOf::<Test>::get(BOB).unwrap().get_alive().unwrap();
+			let bob_contract = ContractInfoOf::<Test>::get(addr.clone())
+				.unwrap()
+				.get_alive()
+				.unwrap();
 			assert_eq!(bob_contract.rent_allowance, <BalanceOf<Test>>::max_value());
 
 			// Call contract with allowed storage value.
 			assert_ok!(Contracts::call(
 				Origin::signed(ALICE),
-				BOB,
+				addr.clone(),
 				0,
 				GAS_LIMIT * 2, // we are copying a huge buffer,
 				<Test as Trait>::MaxValueSize::get().encode(),
@@ -489,7 +479,7 @@ fn deposit_event_max_value_limit() {
 			assert_err_ignore_postinfo!(
 				Contracts::call(
 					Origin::signed(ALICE),
-					BOB,
+					addr,
 					0,
 					GAS_LIMIT,
 					(<Test as Trait>::MaxValueSize::get() + 1).encode(),
@@ -517,14 +507,16 @@ fn run_out_of_gas() {
 				GAS_LIMIT,
 				code_hash.into(),
 				vec![],
+				vec![],
 			));
+			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
 			// Call the contract with a fixed gas limit. It must run out of gas because it just
 			// loops forever.
 			assert_err_ignore_postinfo!(
 				Contracts::call(
 					Origin::signed(ALICE),
-					BOB, // newly created account
+					addr, // newly created account
 					0,
 					67_500_000,
 					vec![],
@@ -536,21 +528,19 @@ fn run_out_of_gas() {
 
 /// Input data for each call in set_rent code
 mod call {
-	pub fn set_storage_4_byte() -> Vec<u8> { vec![] }
-	pub fn remove_storage_4_byte() -> Vec<u8> { vec![0] }
-	pub fn transfer() -> Vec<u8> { vec![0, 0] }
-	pub fn null() -> Vec<u8> { vec![0, 0, 0] }
+	use super::{AccountIdOf, Test};
+	pub fn set_storage_4_byte() -> Vec<u8> { 0u32.to_le_bytes().to_vec() }
+	pub fn remove_storage_4_byte() -> Vec<u8> { 1u32.to_le_bytes().to_vec() }
+	pub fn transfer(to: &AccountIdOf<Test>) -> Vec<u8> {
+		2u32.to_le_bytes().iter().chain(AsRef::<[u8]>::as_ref(to)).cloned().collect()
+	}
+	pub fn null() -> Vec<u8> { 3u32.to_le_bytes().to_vec() }
 }
 
 /// Test correspondence of set_rent code and its hash.
 /// Also test that encoded extrinsic in code correspond to the correct transfer
 #[test]
 fn test_set_rent_code_and_hash() {
-	// This test can fail due to the encoding changes. In case it becomes too annoying
-	// let's rewrite so as we use this module controlled call or we serialize it in runtime.
-	let encoded = Encode::encode(&Call::Balances(pallet_balances::Call::transfer(CHARLIE, 50)));
-	assert_eq!(&encoded[..], &hex!("00000300000000000000C8")[..]);
-
 	let (wasm, code_hash) = compile_module::<Test>("set_rent").unwrap();
 
 	ExtBuilder::default()
@@ -565,12 +555,14 @@ fn test_set_rent_code_and_hash() {
 			assert_eq!(System::events(), vec![
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::system(frame_system::RawEvent::NewAccount(1)),
+					event: MetaEvent::system(frame_system::RawEvent::NewAccount(ALICE)),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::balances(pallet_balances::RawEvent::Endowed(1, 1_000_000)),
+					event: MetaEvent::balances(pallet_balances::RawEvent::Endowed(
+						ALICE, 1_000_000
+					)),
 					topics: vec![],
 				},
 				EventRecord {
@@ -599,9 +591,11 @@ fn storage_size() {
 				30_000,
 				GAS_LIMIT,
 				code_hash.into(),
-				<Test as pallet_balances::Trait>::Balance::from(1_000u32).encode() // rent allowance
+				<Test as pallet_balances::Trait>::Balance::from(1_000u32).encode(), // rent allowance
+				vec![],
 			));
-			let bob_contract = ContractInfoOf::<Test>::get(BOB)
+			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+			let bob_contract = ContractInfoOf::<Test>::get(&addr)
 				.unwrap()
 				.get_alive()
 				.unwrap();
@@ -620,12 +614,12 @@ fn storage_size() {
 
 			assert_ok!(Contracts::call(
 				Origin::signed(ALICE),
-				BOB,
+				addr.clone(),
 				0,
 				GAS_LIMIT,
 				call::set_storage_4_byte()
 			));
-			let bob_contract = ContractInfoOf::<Test>::get(BOB)
+			let bob_contract = ContractInfoOf::<Test>::get(&addr)
 				.unwrap()
 				.get_alive()
 				.unwrap();
@@ -644,12 +638,12 @@ fn storage_size() {
 
 			assert_ok!(Contracts::call(
 				Origin::signed(ALICE),
-				BOB,
+				addr.clone(),
 				0,
 				GAS_LIMIT,
 				call::remove_storage_4_byte()
 			));
-			let bob_contract = ContractInfoOf::<Test>::get(BOB)
+			let bob_contract = ContractInfoOf::<Test>::get(&addr)
 				.unwrap()
 				.get_alive()
 				.unwrap();
@@ -683,8 +677,10 @@ fn empty_kv_pairs() {
 				GAS_LIMIT,
 				code_hash.into(),
 				vec![],
+				vec![],
 			));
-			let bob_contract = ContractInfoOf::<Test>::get(BOB)
+			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+			let bob_contract = ContractInfoOf::<Test>::get(&addr)
 				.unwrap()
 				.get_alive()
 				.unwrap();
@@ -729,90 +725,98 @@ fn deduct_blocks() {
 				Origin::signed(ALICE),
 				30_000,
 				GAS_LIMIT, code_hash.into(),
-				<Test as pallet_balances::Trait>::Balance::from(1_000u32).encode() // rent allowance
+				<Test as pallet_balances::Trait>::Balance::from(1_000u32).encode(), // rent allowance
+				vec![],
 			));
+			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
 			// Check creation
-			let bob_contract = ContractInfoOf::<Test>::get(BOB).unwrap().get_alive().unwrap();
+			let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
 			assert_eq!(bob_contract.rent_allowance, 1_000);
 
 			// Advance 4 blocks
 			initialize_block(5);
 
 			// Trigger rent through call
-			assert_ok!(Contracts::call(Origin::signed(ALICE), BOB, 0, GAS_LIMIT, call::null()));
+			assert_ok!(
+				Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, call::null())
+			);
 
 			// Check result
 			let rent = (8 + 4 - 3) // storage size = size_offset + deploy_set_storage - deposit_offset
 				* 4 // rent byte price
 				* 4; // blocks to rent
-			let bob_contract = ContractInfoOf::<Test>::get(BOB).unwrap().get_alive().unwrap();
+			let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
 			assert_eq!(bob_contract.rent_allowance, 1_000 - rent);
 			assert_eq!(bob_contract.deduct_block, 5);
-			assert_eq!(Balances::free_balance(BOB), 30_000 - rent);
+			assert_eq!(Balances::free_balance(&addr), 30_000 - rent);
 
 			// Advance 7 blocks more
 			initialize_block(12);
 
 			// Trigger rent through call
-			assert_ok!(Contracts::call(Origin::signed(ALICE), BOB, 0, GAS_LIMIT, call::null()));
+			assert_ok!(
+				Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, call::null())
+			);
 
 			// Check result
 			let rent_2 = (8 + 4 - 2) // storage size = size_offset + deploy_set_storage - deposit_offset
 				* 4 // rent byte price
 				* 7; // blocks to rent
-			let bob_contract = ContractInfoOf::<Test>::get(BOB).unwrap().get_alive().unwrap();
+			let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
 			assert_eq!(bob_contract.rent_allowance, 1_000 - rent - rent_2);
 			assert_eq!(bob_contract.deduct_block, 12);
-			assert_eq!(Balances::free_balance(BOB), 30_000 - rent - rent_2);
+			assert_eq!(Balances::free_balance(&addr), 30_000 - rent - rent_2);
 
 			// Second call on same block should have no effect on rent
-			assert_ok!(Contracts::call(Origin::signed(ALICE), BOB, 0, GAS_LIMIT, call::null()));
+			assert_ok!(
+				Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, call::null())
+			);
 
-			let bob_contract = ContractInfoOf::<Test>::get(BOB).unwrap().get_alive().unwrap();
+			let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
 			assert_eq!(bob_contract.rent_allowance, 1_000 - rent - rent_2);
 			assert_eq!(bob_contract.deduct_block, 12);
-			assert_eq!(Balances::free_balance(BOB), 30_000 - rent - rent_2);
+			assert_eq!(Balances::free_balance(&addr), 30_000 - rent - rent_2);
 		});
 }
 
 #[test]
 fn call_contract_removals() {
-	removals(|| {
+	removals(|addr| {
 		// Call on already-removed account might fail, and this is fine.
-		let _ = Contracts::call(Origin::signed(ALICE), BOB, 0, GAS_LIMIT, call::null());
+		let _ = Contracts::call(Origin::signed(ALICE), addr, 0, GAS_LIMIT, call::null());
 		true
 	});
 }
 
 #[test]
 fn inherent_claim_surcharge_contract_removals() {
-	removals(|| Contracts::claim_surcharge(Origin::none(), BOB, Some(ALICE)).is_ok());
+	removals(|addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok());
 }
 
 #[test]
 fn signed_claim_surcharge_contract_removals() {
-	removals(|| Contracts::claim_surcharge(Origin::signed(ALICE), BOB, None).is_ok());
+	removals(|addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok());
 }
 
 #[test]
 fn claim_surcharge_malus() {
 	// Test surcharge malus for inherent
-	claim_surcharge(4, || Contracts::claim_surcharge(Origin::none(), BOB, Some(ALICE)).is_ok(), true);
-	claim_surcharge(3, || Contracts::claim_surcharge(Origin::none(), BOB, Some(ALICE)).is_ok(), true);
-	claim_surcharge(2, || Contracts::claim_surcharge(Origin::none(), BOB, Some(ALICE)).is_ok(), true);
-	claim_surcharge(1, || Contracts::claim_surcharge(Origin::none(), BOB, Some(ALICE)).is_ok(), false);
+	claim_surcharge(4, |addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(), true);
+	claim_surcharge(3, |addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(), true);
+	claim_surcharge(2, |addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(), true);
+	claim_surcharge(1, |addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(), false);
 
 	// Test surcharge malus for signed
-	claim_surcharge(4, || Contracts::claim_surcharge(Origin::signed(ALICE), BOB, None).is_ok(), true);
-	claim_surcharge(3, || Contracts::claim_surcharge(Origin::signed(ALICE), BOB, None).is_ok(), false);
-	claim_surcharge(2, || Contracts::claim_surcharge(Origin::signed(ALICE), BOB, None).is_ok(), false);
-	claim_surcharge(1, || Contracts::claim_surcharge(Origin::signed(ALICE), BOB, None).is_ok(), false);
+	claim_surcharge(4, |addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(), true);
+	claim_surcharge(3, |addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(), false);
+	claim_surcharge(2, |addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(), false);
+	claim_surcharge(1, |addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(), false);
 }
 
 /// Claim surcharge with the given trigger_call at the given blocks.
 /// If `removes` is true then assert that the contract is a tombstone.
-fn claim_surcharge(blocks: u64, trigger_call: impl Fn() -> bool, removes: bool) {
+fn claim_surcharge(blocks: u64, trigger_call: impl Fn(AccountIdOf<Test>) -> bool, removes: bool) {
 	let (wasm, code_hash) = compile_module::<Test>("set_rent").unwrap();
 
 	ExtBuilder::default()
@@ -826,19 +830,21 @@ fn claim_surcharge(blocks: u64, trigger_call: impl Fn() -> bool, removes: bool)
 				Origin::signed(ALICE),
 				100,
 				GAS_LIMIT, code_hash.into(),
-				<Test as pallet_balances::Trait>::Balance::from(1_000u32).encode() // rent allowance
+				<Test as pallet_balances::Trait>::Balance::from(1_000u32).encode(), // rent allowance
+				vec![],
 			));
+			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
 			// Advance blocks
 			initialize_block(blocks);
 
 			// Trigger rent through call
-			assert!(trigger_call());
+			assert!(trigger_call(addr.clone()));
 
 			if removes {
-				assert!(ContractInfoOf::<Test>::get(BOB).unwrap().get_tombstone().is_some());
+				assert!(ContractInfoOf::<Test>::get(&addr).unwrap().get_tombstone().is_some());
 			} else {
-				assert!(ContractInfoOf::<Test>::get(BOB).unwrap().get_alive().is_some());
+				assert!(ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().is_some());
 			}
 		});
 }
@@ -848,7 +854,7 @@ fn claim_surcharge(blocks: u64, trigger_call: impl Fn() -> bool, removes: bool)
 /// * if allowance is exceeded
 /// * if balance is reached and balance < subsistence threshold
 ///	    * this case cannot be triggered by a contract: we check whether a tombstone is left
-fn removals(trigger_call: impl Fn() -> bool) {
+fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
 	let (wasm, code_hash) = compile_module::<Test>("set_rent").unwrap();
 
 	// Balance reached and superior to subsistence threshold
@@ -863,31 +869,33 @@ fn removals(trigger_call: impl Fn() -> bool) {
 				Origin::signed(ALICE),
 				100,
 				GAS_LIMIT, code_hash.into(),
-				<Test as pallet_balances::Trait>::Balance::from(1_000u32).encode() // rent allowance
+				<Test as pallet_balances::Trait>::Balance::from(1_000u32).encode(), // rent allowance
+				vec![],
 			));
+			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
 			let subsistence_threshold = 50 /*existential_deposit*/ + 16 /*tombstone_deposit*/;
 
 			// Trigger rent must have no effect
-			assert!(trigger_call());
-			assert_eq!(ContractInfoOf::<Test>::get(BOB).unwrap().get_alive().unwrap().rent_allowance, 1_000);
-			assert_eq!(Balances::free_balance(BOB), 100);
+			assert!(trigger_call(addr.clone()));
+			assert_eq!(ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap().rent_allowance, 1_000);
+			assert_eq!(Balances::free_balance(&addr), 100);
 
 			// Advance blocks
 			initialize_block(10);
 
 			// Trigger rent through call
-			assert!(trigger_call());
-			assert!(ContractInfoOf::<Test>::get(BOB).unwrap().get_tombstone().is_some());
-			assert_eq!(Balances::free_balance(BOB), subsistence_threshold);
+			assert!(trigger_call(addr.clone()));
+			assert!(ContractInfoOf::<Test>::get(&addr).unwrap().get_tombstone().is_some());
+			assert_eq!(Balances::free_balance(&addr), subsistence_threshold);
 
 			// Advance blocks
 			initialize_block(20);
 
 			// Trigger rent must have no effect
-			assert!(trigger_call());
-			assert!(ContractInfoOf::<Test>::get(BOB).unwrap().get_tombstone().is_some());
-			assert_eq!(Balances::free_balance(BOB), subsistence_threshold);
+			assert!(trigger_call(addr.clone()));
+			assert!(ContractInfoOf::<Test>::get(&addr).unwrap().get_tombstone().is_some());
+			assert_eq!(Balances::free_balance(&addr), subsistence_threshold);
 		});
 
 	// Allowance exceeded
@@ -903,43 +911,45 @@ fn removals(trigger_call: impl Fn() -> bool) {
 				1_000,
 				GAS_LIMIT,
 				code_hash.into(),
-				<Test as pallet_balances::Trait>::Balance::from(100u32).encode() // rent allowance
+				<Test as pallet_balances::Trait>::Balance::from(100u32).encode(), // rent allowance
+				vec![],
 			));
+			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
 			// Trigger rent must have no effect
-			assert!(trigger_call());
+			assert!(trigger_call(addr.clone()));
 			assert_eq!(
-				ContractInfoOf::<Test>::get(BOB)
+				ContractInfoOf::<Test>::get(&addr)
 					.unwrap()
 					.get_alive()
 					.unwrap()
 					.rent_allowance,
 				100
 			);
-			assert_eq!(Balances::free_balance(BOB), 1_000);
+			assert_eq!(Balances::free_balance(&addr), 1_000);
 
 			// Advance blocks
 			initialize_block(10);
 
 			// Trigger rent through call
-			assert!(trigger_call());
-			assert!(ContractInfoOf::<Test>::get(BOB)
+			assert!(trigger_call(addr.clone()));
+			assert!(ContractInfoOf::<Test>::get(&addr)
 				.unwrap()
 				.get_tombstone()
 				.is_some());
 			// Balance should be initial balance - initial rent_allowance
-			assert_eq!(Balances::free_balance(BOB), 900);
+			assert_eq!(Balances::free_balance(&addr), 900);
 
 			// Advance blocks
 			initialize_block(20);
 
 			// Trigger rent must have no effect
-			assert!(trigger_call());
-			assert!(ContractInfoOf::<Test>::get(BOB)
+			assert!(trigger_call(addr.clone()));
+			assert!(ContractInfoOf::<Test>::get(&addr)
 				.unwrap()
 				.get_tombstone()
 				.is_some());
-			assert_eq!(Balances::free_balance(BOB), 900);
+			assert_eq!(Balances::free_balance(&addr), 900);
 		});
 
 	// Balance reached and inferior to subsistence threshold
@@ -957,13 +967,15 @@ fn removals(trigger_call: impl Fn() -> bool) {
 				50 + subsistence_threshold,
 				GAS_LIMIT,
 				code_hash.into(),
-				<Test as pallet_balances::Trait>::Balance::from(1_000u32).encode() // rent allowance
+				<Test as pallet_balances::Trait>::Balance::from(1_000u32).encode(), // rent allowance
+				vec![],
 			));
+			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
 			// Trigger rent must have no effect
-			assert!(trigger_call());
+			assert!(trigger_call(addr.clone()));
 			assert_eq!(
-				ContractInfoOf::<Test>::get(BOB)
+				ContractInfoOf::<Test>::get(&addr)
 					.unwrap()
 					.get_alive()
 					.unwrap()
@@ -971,43 +983,43 @@ fn removals(trigger_call: impl Fn() -> bool) {
 				1_000
 			);
 			assert_eq!(
-				Balances::free_balance(BOB),
+				Balances::free_balance(&addr),
 				50 + subsistence_threshold,
 			);
 
 			// Transfer funds
 			assert_ok!(Contracts::call(
 				Origin::signed(ALICE),
-				BOB,
+				addr.clone(),
 				0,
 				GAS_LIMIT,
-				call::transfer()
+				call::transfer(&BOB),
 			));
 			assert_eq!(
-				ContractInfoOf::<Test>::get(BOB)
+				ContractInfoOf::<Test>::get(&addr)
 					.unwrap()
 					.get_alive()
 					.unwrap()
 					.rent_allowance,
 				1_000
 			);
-			assert_eq!(Balances::free_balance(BOB), subsistence_threshold);
+			assert_eq!(Balances::free_balance(&addr), subsistence_threshold);
 
 			// Advance blocks
 			initialize_block(10);
 
 			// Trigger rent through call
-			assert!(trigger_call());
-			assert_matches!(ContractInfoOf::<Test>::get(BOB), Some(ContractInfo::Tombstone(_)));
-			assert_eq!(Balances::free_balance(BOB), subsistence_threshold);
+			assert!(trigger_call(addr.clone()));
+			assert_matches!(ContractInfoOf::<Test>::get(&addr), Some(ContractInfo::Tombstone(_)));
+			assert_eq!(Balances::free_balance(&addr), subsistence_threshold);
 
 			// Advance blocks
 			initialize_block(20);
 
 			// Trigger rent must have no effect
-			assert!(trigger_call());
-			assert_matches!(ContractInfoOf::<Test>::get(BOB), Some(ContractInfo::Tombstone(_)));
-			assert_eq!(Balances::free_balance(BOB), subsistence_threshold);
+			assert!(trigger_call(addr.clone()));
+			assert_matches!(ContractInfoOf::<Test>::get(&addr), Some(ContractInfo::Tombstone(_)));
+			assert_eq!(Balances::free_balance(&addr), subsistence_threshold);
 		});
 }
 
@@ -1027,32 +1039,36 @@ fn call_removed_contract() {
 				Origin::signed(ALICE),
 				100,
 				GAS_LIMIT, code_hash.into(),
-				<Test as pallet_balances::Trait>::Balance::from(1_000u32).encode() // rent allowance
+				<Test as pallet_balances::Trait>::Balance::from(1_000u32).encode(), // rent allowance
+				vec![],
 			));
+			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
 			// Calling contract should succeed.
-			assert_ok!(Contracts::call(Origin::signed(ALICE), BOB, 0, GAS_LIMIT, call::null()));
+			assert_ok!(
+				Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, call::null())
+			);
 
 			// Advance blocks
 			initialize_block(10);
 
 			// Calling contract should remove contract and fail.
 			assert_err_ignore_postinfo!(
-				Contracts::call(Origin::signed(ALICE), BOB, 0, GAS_LIMIT, call::null()),
+				Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, call::null()),
 				Error::<Test>::NotCallable
 			);
 			// Calling a contract that is about to evict shall emit an event.
 			assert_eq!(System::events(), vec![
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::contracts(RawEvent::Evicted(BOB, true)),
+					event: MetaEvent::contracts(RawEvent::Evicted(addr.clone(), true)),
 					topics: vec![],
 				},
 			]);
 
 			// Subsequent contract calls should also fail.
 			assert_err_ignore_postinfo!(
-				Contracts::call(Origin::signed(ALICE), BOB, 0, GAS_LIMIT, call::null()),
+				Contracts::call(Origin::signed(ALICE), addr, 0, GAS_LIMIT, call::null()),
 				Error::<Test>::NotCallable
 			);
 		})
@@ -1075,20 +1091,24 @@ fn default_rent_allowance_on_instantiate() {
 				GAS_LIMIT,
 				code_hash.into(),
 				vec![],
+				vec![],
 			));
+			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
 			// Check creation
-			let bob_contract = ContractInfoOf::<Test>::get(BOB).unwrap().get_alive().unwrap();
+			let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
 			assert_eq!(bob_contract.rent_allowance, <BalanceOf<Test>>::max_value());
 
 			// Advance blocks
 			initialize_block(5);
 
 			// Trigger rent through call
-			assert_ok!(Contracts::call(Origin::signed(ALICE), BOB, 0, GAS_LIMIT, call::null()));
+			assert_ok!(
+				Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, call::null())
+			);
 
 			// Check contract is still alive
-			let bob_contract = ContractInfoOf::<Test>::get(BOB).unwrap().get_alive();
+			let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive();
 			assert!(bob_contract.is_some())
 		});
 }
@@ -1130,12 +1150,12 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 			assert_eq!(System::events(), vec![
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::system(frame_system::RawEvent::NewAccount(1)),
+					event: MetaEvent::system(frame_system::RawEvent::NewAccount(ALICE)),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::balances(pallet_balances::RawEvent::Endowed(1, 1_000_000)),
+					event: MetaEvent::balances(pallet_balances::RawEvent::Endowed(ALICE, 1_000_000)),
 					topics: vec![],
 				},
 				EventRecord {
@@ -1157,18 +1177,20 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 				30_000,
 				GAS_LIMIT,
 				set_rent_code_hash.into(),
-				<Test as pallet_balances::Trait>::Balance::from(0u32).encode()
+				<Test as pallet_balances::Trait>::Balance::from(0u32).encode(),
+				vec![],
 			));
+			let addr_bob = Contracts::contract_address(&ALICE, &set_rent_code_hash, &[]);
 
 			// Check if `BOB` was created successfully and that the rent allowance is
 			// set to 0.
-			let bob_contract = ContractInfoOf::<Test>::get(BOB).unwrap().get_alive().unwrap();
+			let bob_contract = ContractInfoOf::<Test>::get(&addr_bob).unwrap().get_alive().unwrap();
 			assert_eq!(bob_contract.rent_allowance, 0);
 
 			if test_different_storage {
 				assert_ok!(Contracts::call(
 					Origin::signed(ALICE),
-					BOB, 0, GAS_LIMIT,
+					addr_bob.clone(), 0, GAS_LIMIT,
 					call::set_storage_4_byte())
 				);
 			}
@@ -1179,15 +1201,17 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 			// Call `BOB`, which makes it pay rent. Since the rent allowance is set to 0
 			// we expect that it will get removed leaving tombstone.
 			assert_err_ignore_postinfo!(
-				Contracts::call(Origin::signed(ALICE), BOB, 0, GAS_LIMIT, call::null()),
+				Contracts::call(
+					Origin::signed(ALICE), addr_bob.clone(), 0, GAS_LIMIT, call::null()
+				),
 				Error::<Test>::NotCallable
 			);
-			assert!(ContractInfoOf::<Test>::get(BOB).unwrap().get_tombstone().is_some());
+			assert!(ContractInfoOf::<Test>::get(&addr_bob).unwrap().get_tombstone().is_some());
 			assert_eq!(System::events(), vec![
 				EventRecord {
 					phase: Phase::Initialization,
 					event: MetaEvent::contracts(
-						RawEvent::Evicted(BOB.clone(), true)
+						RawEvent::Evicted(addr_bob.clone(), true)
 					),
 					topics: vec![],
 				},
@@ -1203,13 +1227,16 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 				30_000,
 				GAS_LIMIT,
 				restoration_code_hash.into(),
-				<Test as pallet_balances::Trait>::Balance::from(0u32).encode()
+				<Test as pallet_balances::Trait>::Balance::from(0u32).encode(),
+				vec![],
 			));
+			let addr_django = Contracts::contract_address(&CHARLIE, &restoration_code_hash, &[]);
 
 			// Before performing a call to `DJANGO` save its original trie id.
-			let django_trie_id = ContractInfoOf::<Test>::get(DJANGO).unwrap()
+			let django_trie_id = ContractInfoOf::<Test>::get(&addr_django).unwrap()
 				.get_alive().unwrap().trie_id;
 
+			// The trie is regarded as 'dirty' when it was written to in the current block.
 			if !test_restore_to_with_dirty_storage {
 				// Advance 1 block, to the 6th.
 				initialize_block(6);
@@ -1220,37 +1247,43 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 			let perform_the_restoration = || {
 				Contracts::call(
 					Origin::signed(ALICE),
-					DJANGO,
+					addr_django.clone(),
 					0,
 					GAS_LIMIT,
-					set_rent_code_hash.as_ref().to_vec(),
+					set_rent_code_hash
+						.as_ref()
+						.iter()
+						.chain(AsRef::<[u8]>::as_ref(&addr_bob))
+						.cloned()
+						.collect(),
 				)
 			};
 
 			if test_different_storage || test_restore_to_with_dirty_storage {
 				// Parametrization of the test imply restoration failure. Check that `DJANGO` aka
 				// restoration contract is still in place and also that `BOB` doesn't exist.
-
-				assert_err_ignore_postinfo!(
-					perform_the_restoration(),
-					Error::<Test>::ContractTrapped,
-				);
-
-				assert!(ContractInfoOf::<Test>::get(BOB).unwrap().get_tombstone().is_some());
-				let django_contract = ContractInfoOf::<Test>::get(DJANGO).unwrap()
+				let result = perform_the_restoration();
+				assert!(ContractInfoOf::<Test>::get(&addr_bob).unwrap().get_tombstone().is_some());
+				let django_contract = ContractInfoOf::<Test>::get(&addr_django).unwrap()
 					.get_alive().unwrap();
 				assert_eq!(django_contract.storage_size, 8);
 				assert_eq!(django_contract.trie_id, django_trie_id);
 				assert_eq!(django_contract.deduct_block, System::block_number());
 				match (test_different_storage, test_restore_to_with_dirty_storage) {
 					(true, false) => {
+						assert_err_ignore_postinfo!(
+							result, Error::<Test>::InvalidTombstone,
+						);
 						assert_eq!(System::events(), vec![]);
 					}
 					(_, true) => {
+						assert_err_ignore_postinfo!(
+							result, Error::<Test>::InvalidContractOrigin,
+						);
 						pretty_assertions::assert_eq!(System::events(), vec![
 							EventRecord {
 								phase: Phase::Initialization,
-								event: MetaEvent::contracts(RawEvent::Evicted(BOB, true)),
+								event: MetaEvent::contracts(RawEvent::Evicted(addr_bob, true)),
 								topics: vec![],
 							},
 							EventRecord {
@@ -1265,24 +1298,24 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 							},
 							EventRecord {
 								phase: Phase::Initialization,
-								event: MetaEvent::system(frame_system::RawEvent::NewAccount(DJANGO)),
+								event: MetaEvent::system(frame_system::RawEvent::NewAccount(addr_django.clone())),
 								topics: vec![],
 							},
 							EventRecord {
 								phase: Phase::Initialization,
-								event: MetaEvent::balances(pallet_balances::RawEvent::Endowed(DJANGO, 30_000)),
+								event: MetaEvent::balances(pallet_balances::RawEvent::Endowed(addr_django.clone(), 30_000)),
 								topics: vec![],
 							},
 							EventRecord {
 								phase: Phase::Initialization,
 								event: MetaEvent::balances(
-									pallet_balances::RawEvent::Transfer(CHARLIE, DJANGO, 30_000)
+									pallet_balances::RawEvent::Transfer(CHARLIE, addr_django.clone(), 30_000)
 								),
 								topics: vec![],
 							},
 							EventRecord {
 								phase: Phase::Initialization,
-								event: MetaEvent::contracts(RawEvent::Instantiated(CHARLIE, DJANGO)),
+								event: MetaEvent::contracts(RawEvent::Instantiated(CHARLIE, addr_django.clone())),
 								topics: vec![],
 							},
 						]);
@@ -1294,24 +1327,24 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 
 				// Here we expect that the restoration is succeeded. Check that the restoration
 				// contract `DJANGO` ceased to exist and that `BOB` returned back.
-				println!("{:?}", ContractInfoOf::<Test>::get(BOB));
-				let bob_contract = ContractInfoOf::<Test>::get(BOB).unwrap()
+				println!("{:?}", ContractInfoOf::<Test>::get(&addr_bob));
+				let bob_contract = ContractInfoOf::<Test>::get(&addr_bob).unwrap()
 					.get_alive().unwrap();
 				assert_eq!(bob_contract.rent_allowance, 50);
 				assert_eq!(bob_contract.storage_size, 4);
 				assert_eq!(bob_contract.trie_id, django_trie_id);
 				assert_eq!(bob_contract.deduct_block, System::block_number());
-				assert!(ContractInfoOf::<Test>::get(DJANGO).is_none());
+				assert!(ContractInfoOf::<Test>::get(&addr_django).is_none());
 				assert_eq!(System::events(), vec![
 					EventRecord {
 						phase: Phase::Initialization,
-						event: MetaEvent::system(system::RawEvent::KilledAccount(DJANGO)),
+						event: MetaEvent::system(system::RawEvent::KilledAccount(addr_django.clone())),
 						topics: vec![],
 					},
 					EventRecord {
 						phase: Phase::Initialization,
 						event: MetaEvent::contracts(
-							RawEvent::Restored(DJANGO, BOB, bob_contract.code_hash, 50)
+							RawEvent::Restored(addr_django, addr_bob, bob_contract.code_hash, 50)
 						),
 						topics: vec![],
 					},
@@ -1337,16 +1370,18 @@ fn storage_max_value_limit() {
 				GAS_LIMIT,
 				code_hash.into(),
 				vec![],
+				vec![],
 			));
+			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
 			// Check creation
-			let bob_contract = ContractInfoOf::<Test>::get(BOB).unwrap().get_alive().unwrap();
+			let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
 			assert_eq!(bob_contract.rent_allowance, <BalanceOf<Test>>::max_value());
 
 			// Call contract with allowed storage value.
 			assert_ok!(Contracts::call(
 				Origin::signed(ALICE),
-				BOB,
+				addr.clone(),
 				0,
 				GAS_LIMIT * 2, // we are copying a huge buffer
 				<Test as Trait>::MaxValueSize::get().encode(),
@@ -1356,7 +1391,7 @@ fn storage_max_value_limit() {
 			assert_err_ignore_postinfo!(
 				Contracts::call(
 					Origin::signed(ALICE),
-					BOB,
+					addr,
 					0,
 					GAS_LIMIT,
 					(<Test as Trait>::MaxValueSize::get() + 1).encode(),
@@ -1386,13 +1421,15 @@ fn deploy_and_call_other_contract() {
 				GAS_LIMIT,
 				caller_code_hash.into(),
 				vec![],
+				vec![],
 			));
+			let addr = Contracts::contract_address(&ALICE, &caller_code_hash, &[]);
 
 			// Call BOB contract, which attempts to instantiate and call the callee contract and
 			// makes various assertions on the results from those calls.
 			assert_ok!(Contracts::call(
 				Origin::signed(ALICE),
-				BOB,
+				addr,
 				0,
 				GAS_LIMIT,
 				callee_code_hash.as_ref().to_vec(),
@@ -1417,11 +1454,13 @@ fn cannot_self_destruct_through_draning() {
 				GAS_LIMIT,
 				code_hash.into(),
 				vec![],
+				vec![],
 			));
+			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
 			// Check that the BOB contract has been instantiated.
 			assert_matches!(
-				ContractInfoOf::<Test>::get(BOB),
+				ContractInfoOf::<Test>::get(&addr),
 				Some(ContractInfo::Alive(_))
 			);
 
@@ -1430,7 +1469,7 @@ fn cannot_self_destruct_through_draning() {
 			assert_ok!(
 				Contracts::call(
 					Origin::signed(ALICE),
-					BOB,
+					addr,
 					0,
 					GAS_LIMIT,
 					vec![],
@@ -1456,11 +1495,13 @@ fn cannot_self_destruct_while_live() {
 				GAS_LIMIT,
 				code_hash.into(),
 				vec![],
+				vec![],
 			));
+			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
 			// Check that the BOB contract has been instantiated.
 			assert_matches!(
-				ContractInfoOf::<Test>::get(BOB),
+				ContractInfoOf::<Test>::get(&addr),
 				Some(ContractInfo::Alive(_))
 			);
 
@@ -1469,7 +1510,7 @@ fn cannot_self_destruct_while_live() {
 			assert_err_ignore_postinfo!(
 				Contracts::call(
 					Origin::signed(ALICE),
-					BOB,
+					addr.clone(),
 					0,
 					GAS_LIMIT,
 					vec![0],
@@ -1479,7 +1520,7 @@ fn cannot_self_destruct_while_live() {
 
 			// Check that BOB is still alive.
 			assert_matches!(
-				ContractInfoOf::<Test>::get(BOB),
+				ContractInfoOf::<Test>::get(&addr),
 				Some(ContractInfo::Alive(_))
 			);
 		});
@@ -1502,11 +1543,13 @@ fn self_destruct_works() {
 				GAS_LIMIT,
 				code_hash.into(),
 				vec![],
+				vec![],
 			));
+			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
 			// Check that the BOB contract has been instantiated.
 			assert_matches!(
-				ContractInfoOf::<Test>::get(BOB),
+				ContractInfoOf::<Test>::get(&addr),
 				Some(ContractInfo::Alive(_))
 			);
 
@@ -1514,7 +1557,7 @@ fn self_destruct_works() {
 			assert_matches!(
 				Contracts::call(
 					Origin::signed(ALICE),
-					BOB,
+					addr.clone(),
 					0,
 					GAS_LIMIT,
 					vec![],
@@ -1523,7 +1566,7 @@ fn self_destruct_works() {
 			);
 
 			// Check that account is gone
-			assert!(ContractInfoOf::<Test>::get(BOB).is_none());
+			assert!(ContractInfoOf::<Test>::get(&addr).is_none());
 
 			// check that the beneficiary (django) got remaining balance
 			assert_eq!(Balances::free_balance(DJANGO), 100_000);
@@ -1554,25 +1597,30 @@ fn destroy_contract_and_transfer_funds() {
 				GAS_LIMIT,
 				caller_code_hash.into(),
 				callee_code_hash.as_ref().to_vec(),
+				vec![],
 			));
+			let addr_bob = Contracts::contract_address(&ALICE, &caller_code_hash, &[]);
+			let addr_charlie = Contracts::contract_address(
+				&addr_bob, &callee_code_hash, &[0x47, 0x11]
+			);
 
 			// Check that the CHARLIE contract has been instantiated.
 			assert_matches!(
-				ContractInfoOf::<Test>::get(CHARLIE),
+				ContractInfoOf::<Test>::get(&addr_charlie),
 				Some(ContractInfo::Alive(_))
 			);
 
 			// Call BOB, which calls CHARLIE, forcing CHARLIE to self-destruct.
 			assert_ok!(Contracts::call(
 				Origin::signed(ALICE),
-				BOB,
+				addr_bob,
 				0,
 				GAS_LIMIT,
-				CHARLIE.encode(),
+				addr_charlie.encode(),
 			));
 
 			// Check that CHARLIE has moved on to the great beyond (ie. died).
-			assert!(ContractInfoOf::<Test>::get(CHARLIE).is_none());
+			assert!(ContractInfoOf::<Test>::get(&addr_charlie).is_none());
 		});
 }
 
@@ -1594,6 +1642,7 @@ fn cannot_self_destruct_in_constructor() {
 					GAS_LIMIT,
 					code_hash.into(),
 					vec![],
+					vec![],
 				),
 				Error::<Test>::NewContractNotFunded,
 			);
@@ -1618,7 +1667,9 @@ fn crypto_hashes() {
 				GAS_LIMIT,
 				code_hash.into(),
 				vec![],
+				vec![],
 			));
+			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 			// Perform the call.
 			let input = b"_DEAD_BEEF";
 			use sp_io::hashing::*;
@@ -1642,7 +1693,7 @@ fn crypto_hashes() {
 				params.extend_from_slice(input);
 				let result = <Module<Test>>::bare_call(
 					ALICE,
-					BOB,
+					addr.clone(),
 					0,
 					GAS_LIMIT,
 					params,
@@ -1669,13 +1720,15 @@ fn transfer_return_code() {
 				GAS_LIMIT,
 				code_hash.into(),
 				vec![],
+				vec![],
 			),
 		);
+		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
 		// Contract has only the minimal balance so any transfer will return BelowSubsistence.
 		let result = Contracts::bare_call(
 			ALICE,
-			BOB,
+			addr.clone(),
 			0,
 			GAS_LIMIT,
 			vec![],
@@ -1685,11 +1738,11 @@ fn transfer_return_code() {
 		// Contract has enough total balance in order to not go below the subsistence
 		// threshold when transfering 100 balance but this balance is reserved so
 		// the transfer still fails but with another return code.
-		Balances::make_free_balance_be(&BOB, subsistence + 100);
-		Balances::reserve(&BOB, subsistence + 100).unwrap();
+		Balances::make_free_balance_be(&addr, subsistence + 100);
+		Balances::reserve(&addr, subsistence + 100).unwrap();
 		let result = Contracts::bare_call(
 			ALICE,
-			BOB,
+			addr,
 			0,
 			GAS_LIMIT,
 			vec![],
@@ -1716,16 +1769,18 @@ fn call_return_code() {
 				GAS_LIMIT,
 				caller_hash.into(),
 				vec![0],
+				vec![],
 			),
 		);
+		let addr_bob = Contracts::contract_address(&ALICE, &caller_hash, &[]);
 
 		// Contract calls into Django which is no valid contract
 		let result = Contracts::bare_call(
 			ALICE,
-			BOB,
+			addr_bob.clone(),
 			0,
 			GAS_LIMIT,
-			vec![0],
+			AsRef::<[u8]>::as_ref(&DJANGO).to_vec(),
 		).exec_result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::NotCallable);
 
@@ -1736,51 +1791,53 @@ fn call_return_code() {
 				GAS_LIMIT,
 				callee_hash.into(),
 				vec![0],
+				vec![],
 			),
 		);
+		let addr_django = Contracts::contract_address(&CHARLIE, &callee_hash, &[]);
 
 		// Contract has only the minimal balance so any transfer will return BelowSubsistence.
 		let result = Contracts::bare_call(
 			ALICE,
-			BOB,
+			addr_bob.clone(),
 			0,
 			GAS_LIMIT,
-			vec![0],
+			AsRef::<[u8]>::as_ref(&addr_django).iter().chain(&0u32.to_le_bytes()).cloned().collect(),
 		).exec_result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::BelowSubsistenceThreshold);
 
 		// Contract has enough total balance in order to not go below the subsistence
 		// threshold when transfering 100 balance but this balance is reserved so
 		// the transfer still fails but with another return code.
-		Balances::make_free_balance_be(&BOB, subsistence + 100);
-		Balances::reserve(&BOB, subsistence + 100).unwrap();
+		Balances::make_free_balance_be(&addr_bob, subsistence + 100);
+		Balances::reserve(&addr_bob, subsistence + 100).unwrap();
 		let result = Contracts::bare_call(
 			ALICE,
-			BOB,
+			addr_bob.clone(),
 			0,
 			GAS_LIMIT,
-			vec![0],
+			AsRef::<[u8]>::as_ref(&addr_django).iter().chain(&0u32.to_le_bytes()).cloned().collect(),
 		).exec_result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::TransferFailed);
 
 		// Contract has enough balance but callee reverts because "1" is passed.
-		Balances::make_free_balance_be(&BOB, subsistence + 1000);
+		Balances::make_free_balance_be(&addr_bob, subsistence + 1000);
 		let result = Contracts::bare_call(
 			ALICE,
-			BOB,
+			addr_bob.clone(),
 			0,
 			GAS_LIMIT,
-			vec![1],
+			AsRef::<[u8]>::as_ref(&addr_django).iter().chain(&1u32.to_le_bytes()).cloned().collect(),
 		).exec_result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::CalleeReverted);
 
 		// Contract has enough balance but callee traps because "2" is passed.
 		let result = Contracts::bare_call(
 			ALICE,
-			BOB,
+			addr_bob,
 			0,
 			GAS_LIMIT,
-			vec![2],
+			AsRef::<[u8]>::as_ref(&addr_django).iter().chain(&2u32.to_le_bytes()).cloned().collect(),
 		).exec_result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::CalleeTrapped);
 
@@ -1806,13 +1863,15 @@ fn instantiate_return_code() {
 				GAS_LIMIT,
 				caller_hash.into(),
 				vec![],
+				vec![],
 			),
 		);
+		let addr = Contracts::contract_address(&ALICE, &caller_hash, &[]);
 
 		// Contract has only the minimal balance so any transfer will return BelowSubsistence.
 		let result = Contracts::bare_call(
 			ALICE,
-			BOB,
+			addr.clone(),
 			0,
 			GAS_LIMIT,
 			vec![0; 33],
@@ -1822,11 +1881,11 @@ fn instantiate_return_code() {
 		// Contract has enough total balance in order to not go below the subsistence
 		// threshold when transfering 100 balance but this balance is reserved so
 		// the transfer still fails but with another return code.
-		Balances::make_free_balance_be(&BOB, subsistence + 100);
-		Balances::reserve(&BOB, subsistence + 100).unwrap();
+		Balances::make_free_balance_be(&addr, subsistence + 100);
+		Balances::reserve(&addr, subsistence + 100).unwrap();
 		let result = Contracts::bare_call(
 			ALICE,
-			BOB,
+			addr.clone(),
 			0,
 			GAS_LIMIT,
 			vec![0; 33],
@@ -1834,10 +1893,10 @@ fn instantiate_return_code() {
 		assert_return_code!(result, RuntimeReturnCode::TransferFailed);
 
 		// Contract has enough balance but the passed code hash is invalid
-		Balances::make_free_balance_be(&BOB, subsistence + 1000);
+		Balances::make_free_balance_be(&addr, subsistence + 1000);
 		let result = Contracts::bare_call(
 			ALICE,
-			BOB,
+			addr.clone(),
 			0,
 			GAS_LIMIT,
 			vec![0; 33],
@@ -1847,20 +1906,20 @@ fn instantiate_return_code() {
 		// Contract has enough balance but callee reverts because "1" is passed.
 		let result = Contracts::bare_call(
 			ALICE,
-			BOB,
+			addr.clone(),
 			0,
 			GAS_LIMIT,
-			callee_hash.iter().cloned().chain(sp_std::iter::once(1)).collect(),
+			callee_hash.iter().chain(&1u32.to_le_bytes()).cloned().collect(),
 		).exec_result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::CalleeReverted);
 
 		// Contract has enough balance but callee traps because "2" is passed.
 		let result = Contracts::bare_call(
 			ALICE,
-			BOB,
+			addr,
 			0,
 			GAS_LIMIT,
-			callee_hash.iter().cloned().chain(sp_std::iter::once(2)).collect(),
+			callee_hash.iter().chain(&2u32.to_le_bytes()).cloned().collect(),
 		).exec_result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::CalleeTrapped);
 
diff --git a/frame/contracts/src/wasm/code_cache.rs b/frame/contracts/src/wasm/code_cache.rs
index 34b8ea744353..a64f387097ed 100644
--- a/frame/contracts/src/wasm/code_cache.rs
+++ b/frame/contracts/src/wasm/code_cache.rs
@@ -30,6 +30,7 @@ use crate::wasm::{prepare, runtime::Env, PrefabWasmModule};
 use crate::{CodeHash, CodeStorage, PristineCode, Schedule, Trait};
 use sp_std::prelude::*;
 use sp_runtime::traits::Hash;
+use sp_core::crypto::UncheckedFrom;
 use frame_support::StorageMap;
 
 /// Put code in the storage. The hash of code is used as a key and is returned
@@ -39,7 +40,7 @@ use frame_support::StorageMap;
 pub fn save<T: Trait>(
 	original_code: Vec<u8>,
 	schedule: &Schedule<T>,
-) -> Result<CodeHash<T>, &'static str> {
+) -> Result<CodeHash<T>, &'static str> where T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]> {
 	let prefab_module = prepare::prepare_contract::<Env, T>(&original_code, schedule)?;
 	let code_hash = T::Hashing::hash(&original_code);
 
@@ -57,7 +58,7 @@ pub fn save<T: Trait>(
 pub fn save_raw<T: Trait>(
 	original_code: Vec<u8>,
 	schedule: &Schedule<T>,
-) -> Result<CodeHash<T>, &'static str> {
+) -> Result<CodeHash<T>, &'static str> where T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]> {
 	let prefab_module = prepare::benchmarking::prepare_contract::<T>(&original_code, schedule)?;
 	let code_hash = T::Hashing::hash(&original_code);
 
@@ -75,7 +76,7 @@ pub fn save_raw<T: Trait>(
 pub fn load<T: Trait>(
 	code_hash: &CodeHash<T>,
 	schedule: &Schedule<T>,
-) -> Result<PrefabWasmModule, &'static str> {
+) -> Result<PrefabWasmModule, &'static str> where T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]> {
 	let mut prefab_module =
 		<CodeStorage<T>>::get(code_hash).ok_or_else(|| "code is not found")?;
 
diff --git a/frame/contracts/src/wasm/env_def/macros.rs b/frame/contracts/src/wasm/env_def/macros.rs
index 2538f85fb738..6741896102d4 100644
--- a/frame/contracts/src/wasm/env_def/macros.rs
+++ b/frame/contracts/src/wasm/env_def/macros.rs
@@ -127,7 +127,12 @@ macro_rules! define_func {
 		fn $name< E: $seal_ty >(
 			$ctx: &mut $crate::wasm::Runtime<E>,
 			args: &[sp_sandbox::Value],
-		) -> Result<sp_sandbox::ReturnValue, sp_sandbox::HostError> {
+		) -> Result<sp_sandbox::ReturnValue, sp_sandbox::HostError>
+			where
+				<E::T as frame_system::Trait>::AccountId:
+					sp_core::crypto::UncheckedFrom<<E::T as frame_system::Trait>::Hash> +
+						AsRef<[u8]>
+		{
 			#[allow(unused)]
 			let mut args = args.iter();
 
@@ -183,7 +188,12 @@ macro_rules! define_env {
 			}
 		}
 
-		impl<E: Ext> $crate::wasm::env_def::FunctionImplProvider<E> for $init_name {
+		impl<E: Ext> $crate::wasm::env_def::FunctionImplProvider<E> for $init_name
+		where
+			<E::T as frame_system::Trait>::AccountId:
+				sp_core::crypto::UncheckedFrom<<E::T as frame_system::Trait>::Hash> +
+					AsRef<[u8]>
+		{
 			fn impls<F: FnMut(&[u8], $crate::wasm::env_def::HostFunc<E>)>(f: &mut F) {
 				register_func!(f, < E: $seal_ty > ; $( $name ( $ctx $( , $names : $params )* ) $( -> $returns)* => $body )* );
 			}
diff --git a/frame/contracts/src/wasm/mod.rs b/frame/contracts/src/wasm/mod.rs
index f90f3af688d9..baa75ad49720 100644
--- a/frame/contracts/src/wasm/mod.rs
+++ b/frame/contracts/src/wasm/mod.rs
@@ -23,6 +23,7 @@ use crate::exec::Ext;
 use crate::gas::GasMeter;
 
 use sp_std::prelude::*;
+use sp_core::crypto::UncheckedFrom;
 use codec::{Encode, Decode};
 use sp_sandbox;
 
@@ -32,7 +33,7 @@ mod code_cache;
 mod prepare;
 mod runtime;
 
-use self::runtime::{to_execution_result, Runtime};
+use self::runtime::Runtime;
 use self::code_cache::load as load_code;
 use pallet_contracts_primitives::ExecResult;
 
@@ -71,13 +72,16 @@ pub struct WasmLoader<'a, T: Trait> {
 	schedule: &'a Schedule<T>,
 }
 
-impl<'a, T: Trait> WasmLoader<'a, T> {
+impl<'a, T: Trait> WasmLoader<'a, T> where T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]> {
 	pub fn new(schedule: &'a Schedule<T>) -> Self {
 		WasmLoader { schedule }
 	}
 }
 
-impl<'a, T: Trait> crate::exec::Loader<T> for WasmLoader<'a, T> {
+impl<'a, T: Trait> crate::exec::Loader<T> for WasmLoader<'a, T>
+where
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
+{
 	type Executable = WasmExecutable;
 
 	fn load_init(&self, code_hash: &CodeHash<T>) -> Result<WasmExecutable, &'static str> {
@@ -97,17 +101,20 @@ impl<'a, T: Trait> crate::exec::Loader<T> for WasmLoader<'a, T> {
 }
 
 /// Implementation of `Vm` that takes `WasmExecutable` and executes it.
-pub struct WasmVm<'a, T: Trait> {
+pub struct WasmVm<'a, T: Trait> where T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]> {
 	schedule: &'a Schedule<T>,
 }
 
-impl<'a, T: Trait> WasmVm<'a, T> {
+impl<'a, T: Trait> WasmVm<'a, T> where T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]> {
 	pub fn new(schedule: &'a Schedule<T>) -> Self {
 		WasmVm { schedule }
 	}
 }
 
-impl<'a, T: Trait> crate::exec::Vm<T> for WasmVm<'a, T> {
+impl<'a, T: Trait> crate::exec::Vm<T> for WasmVm<'a, T>
+where
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
+{
 	type Executable = WasmExecutable;
 
 	fn execute<E: Ext<T = T>>(
@@ -147,20 +154,22 @@ impl<'a, T: Trait> crate::exec::Vm<T> for WasmVm<'a, T> {
 		// entrypoint.
 		let result = sp_sandbox::Instance::new(&exec.prefab_module.code, &imports, &mut runtime)
 			.and_then(|mut instance| instance.invoke(exec.entrypoint_name, &[], &mut runtime));
-		to_execution_result(runtime, result)
+		runtime.to_execution_result(result)
 	}
 }
 
 #[cfg(test)]
 mod tests {
 	use super::*;
+	use crate::{
+		CodeHash, BalanceOf, Error, Module as Contracts,
+		exec::{Ext, StorageKey, AccountIdOf},
+		gas::{Gas, GasMeter},
+		tests::{Test, Call, ALICE, BOB},
+		wasm::prepare::prepare_contract,
+	};
 	use std::collections::HashMap;
 	use sp_core::H256;
-	use crate::exec::{Ext, StorageKey};
-	use crate::gas::{Gas, GasMeter};
-	use crate::tests::{Test, Call};
-	use crate::wasm::prepare::prepare_contract;
-	use crate::{CodeHash, BalanceOf, Error};
 	use hex_literal::hex;
 	use sp_runtime::DispatchError;
 	use frame_support::weights::Weight;
@@ -174,7 +183,7 @@ mod tests {
 
 	#[derive(Debug, PartialEq, Eq)]
 	struct RestoreEntry {
-		dest: u64,
+		dest: AccountIdOf<Test>,
 		code_hash: H256,
 		rent_allowance: u64,
 		delta: Vec<StorageKey>,
@@ -186,16 +195,17 @@ mod tests {
 		endowment: u64,
 		data: Vec<u8>,
 		gas_left: u64,
+		salt: Vec<u8>,
 	}
 
 	#[derive(Debug, PartialEq, Eq)]
 	struct TerminationEntry {
-		beneficiary: u64,
+		beneficiary: AccountIdOf<Test>,
 	}
 
 	#[derive(Debug, PartialEq, Eq)]
 	struct TransferEntry {
-		to: u64,
+		to: AccountIdOf<Test>,
 		value: u64,
 		data: Vec<u8>,
 	}
@@ -210,7 +220,6 @@ mod tests {
 		restores: Vec<RestoreEntry>,
 		// (topics, data)
 		events: Vec<(Vec<H256>, Vec<u8>)>,
-		next_account_id: u64,
 	}
 
 	impl Ext for MockExt {
@@ -228,18 +237,17 @@ mod tests {
 			endowment: u64,
 			gas_meter: &mut GasMeter<Test>,
 			data: Vec<u8>,
-		) -> Result<(u64, ExecReturnValue), ExecError> {
+			salt: &[u8],
+		) -> Result<(AccountIdOf<Self::T>, ExecReturnValue), ExecError> {
 			self.instantiates.push(InstantiateEntry {
 				code_hash: code_hash.clone(),
 				endowment,
 				data: data.to_vec(),
 				gas_left: gas_meter.gas_left(),
+				salt: salt.to_vec(),
 			});
-			let address = self.next_account_id;
-			self.next_account_id += 1;
-
 			Ok((
-				address,
+				Contracts::<Test>::contract_address(&ALICE, code_hash, salt),
 				ExecReturnValue {
 					flags: ReturnFlags::empty(),
 					data: Vec::new(),
@@ -248,11 +256,11 @@ mod tests {
 		}
 		fn transfer(
 			&mut self,
-			to: &u64,
+			to: &AccountIdOf<Self::T>,
 			value: u64,
 		) -> Result<(), DispatchError> {
 			self.transfers.push(TransferEntry {
-				to: *to,
+				to: to.clone(),
 				value,
 				data: Vec::new(),
 			});
@@ -260,13 +268,13 @@ mod tests {
 		}
 		fn call(
 			&mut self,
-			to: &u64,
+			to: &AccountIdOf<Self::T>,
 			value: u64,
 			_gas_meter: &mut GasMeter<Test>,
 			data: Vec<u8>,
 		) -> ExecResult {
 			self.transfers.push(TransferEntry {
-				to: *to,
+				to: to.clone(),
 				value,
 				data: data,
 			});
@@ -276,20 +284,20 @@ mod tests {
 		}
 		fn terminate(
 			&mut self,
-			beneficiary: &u64,
+			beneficiary: &AccountIdOf<Self::T>,
 		) -> Result<(), DispatchError> {
 			self.terminations.push(TerminationEntry {
-				beneficiary: *beneficiary,
+				beneficiary: beneficiary.clone(),
 			});
 			Ok(())
 		}
 		fn restore_to(
 			&mut self,
-			dest: u64,
+			dest: AccountIdOf<Self::T>,
 			code_hash: H256,
 			rent_allowance: u64,
 			delta: Vec<StorageKey>,
-		) -> Result<(), &'static str> {
+		) -> Result<(), DispatchError> {
 			self.restores.push(RestoreEntry {
 				dest,
 				code_hash,
@@ -298,11 +306,11 @@ mod tests {
 			});
 			Ok(())
 		}
-		fn caller(&self) -> &u64 {
-			&42
+		fn caller(&self) -> &AccountIdOf<Self::T> {
+			&ALICE
 		}
-		fn address(&self) -> &u64 {
-			&69
+		fn address(&self) -> &AccountIdOf<Self::T> {
+			&BOB
 		}
 		fn balance(&self) -> u64 {
 			228
@@ -363,25 +371,26 @@ mod tests {
 			value: u64,
 			gas_meter: &mut GasMeter<Test>,
 			input_data: Vec<u8>,
-		) -> Result<(u64, ExecReturnValue), ExecError> {
-			(**self).instantiate(code, value, gas_meter, input_data)
+			salt: &[u8],
+		) -> Result<(AccountIdOf<Self::T>, ExecReturnValue), ExecError> {
+			(**self).instantiate(code, value, gas_meter, input_data, salt)
 		}
 		fn transfer(
 			&mut self,
-			to: &u64,
+			to: &AccountIdOf<Self::T>,
 			value: u64,
 		) -> Result<(), DispatchError> {
 			(**self).transfer(to, value)
 		}
 		fn terminate(
 			&mut self,
-			beneficiary: &u64,
+			beneficiary: &AccountIdOf<Self::T>,
 		) -> Result<(), DispatchError> {
 			(**self).terminate(beneficiary)
 		}
 		fn call(
 			&mut self,
-			to: &u64,
+			to: &AccountIdOf<Self::T>,
 			value: u64,
 			gas_meter: &mut GasMeter<Test>,
 			input_data: Vec<u8>,
@@ -390,11 +399,11 @@ mod tests {
 		}
 		fn restore_to(
 			&mut self,
-			dest: u64,
+			dest: AccountIdOf<Self::T>,
 			code_hash: H256,
 			rent_allowance: u64,
 			delta: Vec<StorageKey>,
-		) -> Result<(), &'static str> {
+		) -> Result<(), DispatchError> {
 			(**self).restore_to(
 				dest,
 				code_hash,
@@ -402,10 +411,10 @@ mod tests {
 				delta,
 			)
 		}
-		fn caller(&self) -> &u64 {
+		fn caller(&self) -> &AccountIdOf<Self::T> {
 			(**self).caller()
 		}
-		fn address(&self) -> &u64 {
+		fn address(&self) -> &AccountIdOf<Self::T> {
 			(**self).address()
 		}
 		fn balance(&self) -> u64 {
@@ -451,7 +460,11 @@ mod tests {
 		input_data: Vec<u8>,
 		ext: E,
 		gas_meter: &mut GasMeter<E::T>,
-	) -> ExecResult {
+	) -> ExecResult
+	where
+		<E::T as frame_system::Trait>::AccountId:
+			UncheckedFrom<<E::T as frame_system::Trait>::Hash> + AsRef<[u8]>
+	{
 		use crate::exec::Vm;
 
 		let wasm = wat::parse_str(wat).unwrap();
@@ -485,21 +498,23 @@ mod tests {
 		(drop
 			(call $seal_transfer
 				(i32.const 4)  ;; Pointer to "account" address.
-				(i32.const 8)  ;; Length of "account" address.
-				(i32.const 12) ;; Pointer to the buffer with value to transfer
+				(i32.const 32)  ;; Length of "account" address.
+				(i32.const 36) ;; Pointer to the buffer with value to transfer
 				(i32.const 8)  ;; Length of the buffer with value to transfer.
 			)
 		)
 	)
 	(func (export "deploy"))
 
-	;; Destination AccountId to transfer the funds.
-	;; Represented by u64 (8 bytes long) in little endian.
-	(data (i32.const 4) "\07\00\00\00\00\00\00\00")
+	;; Destination AccountId (ALICE)
+	(data (i32.const 4)
+		"\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01"
+		"\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01"
+	)
 
 	;; Amount of value to transfer.
 	;; Represented by u64 (8 bytes long) in little endian.
-	(data (i32.const 12) "\99\00\00\00\00\00\00\00")
+	(data (i32.const 36) "\99\00\00\00\00\00\00\00")
 )
 "#;
 
@@ -516,7 +531,7 @@ mod tests {
 		assert_eq!(
 			&mock_ext.transfers,
 			&[TransferEntry {
-				to: 7,
+				to: ALICE,
 				value: 153,
 				data: Vec::new(),
 			}]
@@ -542,11 +557,11 @@ mod tests {
 		(drop
 			(call $seal_call
 				(i32.const 4)  ;; Pointer to "callee" address.
-				(i32.const 8)  ;; Length of "callee" address.
+				(i32.const 32)  ;; Length of "callee" address.
 				(i64.const 0)  ;; How much gas to devote for the execution. 0 = all.
-				(i32.const 12) ;; Pointer to the buffer with value to transfer
+				(i32.const 36) ;; Pointer to the buffer with value to transfer
 				(i32.const 8)  ;; Length of the buffer with value to transfer.
-				(i32.const 20) ;; Pointer to input data buffer address
+				(i32.const 44) ;; Pointer to input data buffer address
 				(i32.const 4)  ;; Length of input data buffer
 				(i32.const 4294967295) ;; u32 max value is the sentinel value: do not copy output
 				(i32.const 0) ;; Length is ignored in this case
@@ -555,14 +570,17 @@ mod tests {
 	)
 	(func (export "deploy"))
 
-	;; Destination AccountId to transfer the funds.
-	;; Represented by u64 (8 bytes long) in little endian.
-	(data (i32.const 4) "\09\00\00\00\00\00\00\00")
+	;; Destination AccountId (ALICE)
+	(data (i32.const 4)
+		"\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01"
+		"\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01"
+	)
+
 	;; Amount of value to transfer.
 	;; Represented by u64 (8 bytes long) in little endian.
-	(data (i32.const 12) "\06\00\00\00\00\00\00\00")
+	(data (i32.const 36) "\06\00\00\00\00\00\00\00")
 
-	(data (i32.const 20) "\01\02\03\04")
+	(data (i32.const 44) "\01\02\03\04")
 )
 "#;
 
@@ -579,7 +597,7 @@ mod tests {
 		assert_eq!(
 			&mock_ext.transfers,
 			&[TransferEntry {
-				to: 9,
+				to: ALICE,
 				value: 6,
 				data: vec![1, 2, 3, 4],
 			}]
@@ -602,7 +620,9 @@ mod tests {
 	;;     output_ptr: u32,
 	;;     output_len_ptr: u32
 	;; ) -> u32
-	(import "seal0" "seal_instantiate" (func $seal_instantiate (param i32 i32 i64 i32 i32 i32 i32 i32 i32 i32 i32) (result i32)))
+	(import "seal0" "seal_instantiate" (func $seal_instantiate
+		(param i32 i32 i64 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32) (result i32)
+	))
 	(import "env" "memory" (memory 1 1))
 	(func (export "call")
 		(drop
@@ -618,11 +638,15 @@ mod tests {
 				(i32.const 0) ;; Length is ignored in this case
 				(i32.const 4294967295) ;; u32 max value is the sentinel value: do not copy output
 				(i32.const 0) ;; Length is ignored in this case
+				(i32.const 0) ;; salt_ptr
+				(i32.const 4) ;; salt_len
 			)
 		)
 	)
 	(func (export "deploy"))
 
+	;; Salt
+	(data (i32.const 0) "\42\43\44\45")
 	;; Amount of value to transfer.
 	;; Represented by u64 (8 bytes long) in little endian.
 	(data (i32.const 4) "\03\00\00\00\00\00\00\00")
@@ -653,7 +677,11 @@ mod tests {
 				endowment: 3,
 				data,
 				gas_left: _,
-			}] if code_hash == &[0x11; 32].into() && data == &vec![1, 2, 3, 4]
+				salt,
+			}] if
+				code_hash == &[0x11; 32].into() &&
+				data == &vec![1, 2, 3, 4] &&
+				salt == &vec![0x42, 0x43, 0x44, 0x45]
 		);
 	}
 
@@ -668,14 +696,16 @@ mod tests {
 	(func (export "call")
 		(call $seal_terminate
 			(i32.const 4)  ;; Pointer to "beneficiary" address.
-			(i32.const 8)  ;; Length of "beneficiary" address.
+			(i32.const 32)  ;; Length of "beneficiary" address.
 		)
 	)
 	(func (export "deploy"))
 
 	;; Beneficiary AccountId to transfer the funds.
-	;; Represented by u64 (8 bytes long) in little endian.
-	(data (i32.const 4) "\09\00\00\00\00\00\00\00")
+	(data (i32.const 4)
+		"\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01"
+		"\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01"
+	)
 )
 "#;
 
@@ -692,7 +722,7 @@ mod tests {
 		assert_eq!(
 			&mock_ext.terminations,
 			&[TerminationEntry {
-				beneficiary: 0x09,
+				beneficiary: ALICE,
 			}]
 		);
 	}
@@ -716,11 +746,11 @@ mod tests {
 		(drop
 			(call $seal_call
 				(i32.const 4)  ;; Pointer to "callee" address.
-				(i32.const 8)  ;; Length of "callee" address.
+				(i32.const 32)  ;; Length of "callee" address.
 				(i64.const 228)  ;; How much gas to devote for the execution.
-				(i32.const 12)  ;; Pointer to the buffer with value to transfer
+				(i32.const 36)  ;; Pointer to the buffer with value to transfer
 				(i32.const 8)   ;; Length of the buffer with value to transfer.
-				(i32.const 20)   ;; Pointer to input data buffer address
+				(i32.const 44)   ;; Pointer to input data buffer address
 				(i32.const 4)   ;; Length of input data buffer
 				(i32.const 4294967295) ;; u32 max value is the sentinel value: do not copy output
 				(i32.const 0) ;; Length is ignored in this cas
@@ -730,13 +760,15 @@ mod tests {
 	(func (export "deploy"))
 
 	;; Destination AccountId to transfer the funds.
-	;; Represented by u64 (8 bytes long) in little endian.
-	(data (i32.const 4) "\09\00\00\00\00\00\00\00")
+	(data (i32.const 4)
+		"\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01"
+		"\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01"
+	)
 	;; Amount of value to transfer.
 	;; Represented by u64 (8 bytes long) in little endian.
-	(data (i32.const 12) "\06\00\00\00\00\00\00\00")
+	(data (i32.const 36) "\06\00\00\00\00\00\00\00")
 
-	(data (i32.const 20) "\01\02\03\04")
+	(data (i32.const 44) "\01\02\03\04")
 )
 "#;
 
@@ -753,7 +785,7 @@ mod tests {
 		assert_eq!(
 			&mock_ext.transfers,
 			&[TransferEntry {
-				to: 9,
+				to: ALICE,
 				value: 6,
 				data: vec![1, 2, 3, 4],
 			}]
@@ -863,19 +895,19 @@ mod tests {
 		;; fill the buffer with the caller.
 		(call $seal_caller (i32.const 0) (i32.const 32))
 
-		;; assert len == 8
+		;; assert len == 32
 		(call $assert
 			(i32.eq
 				(i32.load (i32.const 32))
-				(i32.const 8)
+				(i32.const 32)
 			)
 		)
 
-		;; assert that contents of the buffer is equal to the i64 value of 42.
+		;; assert that the first 64 byte are the beginning of "ALICE"
 		(call $assert
 			(i64.eq
 				(i64.load (i32.const 0))
-				(i64.const 42)
+				(i64.const 0x0101010101010101)
 			)
 		)
 	)
@@ -916,19 +948,19 @@ mod tests {
 		;; fill the buffer with the self address.
 		(call $seal_address (i32.const 0) (i32.const 32))
 
-		;; assert size == 8
+		;; assert size == 32
 		(call $assert
 			(i32.eq
 				(i32.load (i32.const 32))
-				(i32.const 8)
+				(i32.const 32)
 			)
 		)
 
-		;; assert that contents of the buffer is equal to the i64 value of 69.
+		;; assert that the first 64 byte are the beginning of "BOB"
 		(call $assert
 			(i64.eq
 				(i64.load (i32.const 0))
-				(i64.const 69)
+				(i64.const 0x0202020202020202)
 			)
 		)
 	)
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index c7de93ece70f..90ea86f9cec3 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -29,6 +29,7 @@ use frame_support::dispatch::DispatchError;
 use sp_std::prelude::*;
 use codec::{Decode, Encode};
 use sp_runtime::traits::SaturatedConversion;
+use sp_core::crypto::UncheckedFrom;
 use sp_io::hashing::{
 	keccak_256,
 	blake2_256,
@@ -116,92 +117,6 @@ enum TrapReason {
 	Restoration,
 }
 
-/// Can only be used for one call.
-pub(crate) struct Runtime<'a, E: Ext + 'a> {
-	ext: &'a mut E,
-	input_data: Option<Vec<u8>>,
-	schedule: &'a Schedule<E::T>,
-	memory: sp_sandbox::Memory,
-	gas_meter: &'a mut GasMeter<E::T>,
-	trap_reason: Option<TrapReason>,
-}
-impl<'a, E: Ext + 'a> Runtime<'a, E> {
-	pub(crate) fn new(
-		ext: &'a mut E,
-		input_data: Vec<u8>,
-		schedule: &'a Schedule<E::T>,
-		memory: sp_sandbox::Memory,
-		gas_meter: &'a mut GasMeter<E::T>,
-	) -> Self {
-		Runtime {
-			ext,
-			input_data: Some(input_data),
-			schedule,
-			memory,
-			gas_meter,
-			trap_reason: None,
-		}
-	}
-}
-
-/// Converts the sandbox result and the runtime state into the execution outcome.
-///
-/// It evaluates information stored in the `trap_reason` variable of the runtime and
-/// bases the outcome on the value if this variable. Only if `trap_reason` is `None`
-/// the result of the sandbox is evaluated.
-pub(crate) fn to_execution_result<E: Ext>(
-	runtime: Runtime<E>,
-	sandbox_result: Result<sp_sandbox::ReturnValue, sp_sandbox::Error>,
-) -> ExecResult {
-	// If a trap reason is set we base our decision solely on that.
-	if let Some(trap_reason) = runtime.trap_reason {
-		return match trap_reason {
-			// The trap was the result of the execution `return` host function.
-			TrapReason::Return(ReturnData{ flags, data }) => {
-				let flags = ReturnFlags::from_bits(flags).ok_or_else(||
-					"used reserved bit in return flags"
-				)?;
-				Ok(ExecReturnValue {
-					flags,
-					data,
-				})
-			},
-			TrapReason::Termination => {
-				Ok(ExecReturnValue {
-					flags: ReturnFlags::empty(),
-					data: Vec::new(),
-				})
-			},
-			TrapReason::Restoration => {
-				Ok(ExecReturnValue {
-					flags: ReturnFlags::empty(),
-					data: Vec::new(),
-				})
-			},
-			TrapReason::SupervisorError(error) => Err(error)?,
-		}
-	}
-
-	// Check the exact type of the error.
-	match sandbox_result {
-		// No traps were generated. Proceed normally.
-		Ok(_) => {
-			Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: Vec::new() })
-		}
-		// `Error::Module` is returned only if instantiation or linking failed (i.e.
-		// wasm binary tried to import a function that is not provided by the host).
-		// This shouldn't happen because validation process ought to reject such binaries.
-		//
-		// Because panics are really undesirable in the runtime code, we treat this as
-		// a trap for now. Eventually, we might want to revisit this.
-		Err(sp_sandbox::Error::Module) =>
-			Err("validation error")?,
-		// Any other kind of a trap should result in a failure.
-		Err(sp_sandbox::Error::Execution) | Err(sp_sandbox::Error::OutOfBounds) =>
-			Err(Error::<E::T>::ContractTrapped)?
-	}
-}
-
 #[cfg_attr(test, derive(Debug, PartialEq, Eq))]
 #[derive(Copy, Clone)]
 pub enum RuntimeToken {
@@ -262,10 +177,10 @@ pub enum RuntimeToken {
 	CallSurchargeTransfer,
 	/// Weight of output received through `seal_call` for the given size.
 	CallCopyOut(u32),
-	/// Weight of calling `seal_instantiate` for the given input size without output weight.
+	/// Weight of calling `seal_instantiate` for the given input and salt without output weight.
 	/// This includes the transfer as an instantiate without a value will always be below
 	/// the existential deposit and is disregarded as corner case.
-	InstantiateBase(u32),
+	InstantiateBase{input_data_len: u32, salt_len: u32},
 	/// Weight of output received through `seal_instantiate` for the given size.
 	InstantiateCopyOut(u32),
 	/// Weight of calling `seal_hash_sha_256` for the given input size.
@@ -278,7 +193,10 @@ pub enum RuntimeToken {
 	HashBlake128(u32),
 }
 
-impl<T: Trait> Token<T> for RuntimeToken {
+impl<T: Trait> Token<T> for RuntimeToken
+where
+	T::AccountId: UncheckedFrom<T::Hash>, T::AccountId: AsRef<[u8]>
+{
 	type Metadata = HostFnWeights<T>;
 
 	fn calculate_amount(&self, s: &Self::Metadata) -> Gas {
@@ -318,8 +236,9 @@ impl<T: Trait> Token<T> for RuntimeToken {
 				.saturating_add(s.call_per_input_byte.saturating_mul(len.into())),
 			CallSurchargeTransfer => s.call_transfer_surcharge,
 			CallCopyOut(len) => s.call_per_output_byte.saturating_mul(len.into()),
-			InstantiateBase(len) => s.instantiate
-				.saturating_add(s.instantiate_per_input_byte.saturating_mul(len.into())),
+			InstantiateBase{input_data_len, salt_len} => s.instantiate
+				.saturating_add(s.instantiate_per_input_byte.saturating_mul(input_data_len.into()))
+				.saturating_add(s.instantiate_per_salt_byte.saturating_mul(salt_len.into())),
 			InstantiateCopyOut(len) => s.instantiate_per_output_byte
 				.saturating_mul(len.into()),
 			HashSha256(len) => s.hash_sha2_256
@@ -334,215 +253,345 @@ impl<T: Trait> Token<T> for RuntimeToken {
 	}
 }
 
-/// Charge the gas meter with the specified token.
-///
-/// Returns `Err(HostError)` if there is not enough gas.
-fn charge_gas<E, Tok>(ctx: &mut Runtime<E>, token: Tok) -> Result<(), sp_sandbox::HostError>
-where
-	E: Ext,
-	Tok: Token<E::T, Metadata=HostFnWeights<E::T>>,
-{
-	match ctx.gas_meter.charge(&ctx.schedule.host_fn_weights, token) {
-		GasMeterResult::Proceed => Ok(()),
-		GasMeterResult::OutOfGas =>  {
-			ctx.trap_reason = Some(TrapReason::SupervisorError(Error::<E::T>::OutOfGas.into()));
-			Err(sp_sandbox::HostError)
-		},
-	}
+/// This is only appropriate when writing out data of constant size that does not depend on user
+/// input. In this case the costs for this copy was already charged as part of the token at
+/// the beginning of the API entry point.
+fn already_charged(_: u32) -> Option<RuntimeToken> {
+	None
 }
 
-/// Read designated chunk from the sandbox memory.
-///
-/// Returns `Err` if one of the following conditions occurs:
+/// Finds duplicates in a given vector.
 ///
-/// - requested buffer is not within the bounds of the sandbox memory.
-fn read_sandbox_memory<E: Ext>(
-	ctx: &mut Runtime<E>,
-	ptr: u32,
-	len: u32,
-) -> Result<Vec<u8>, sp_sandbox::HostError> {
-	let mut buf = vec![0u8; len as usize];
-	ctx.memory.get(ptr, buf.as_mut_slice())
-		.map_err(|_| store_err(ctx, Error::<E::T>::OutOfBounds))?;
-	Ok(buf)
+/// This function has complexity of O(n log n) and no additional memory is required, although
+/// the order of items is not preserved.
+fn has_duplicates<T: PartialEq + AsRef<[u8]>>(items: &mut Vec<T>) -> bool {
+	// Sort the vector
+	items.sort_by(|a, b| {
+		Ord::cmp(a.as_ref(), b.as_ref())
+	});
+	// And then find any two consecutive equal elements.
+	items.windows(2).any(|w| {
+		match w {
+			&[ref a, ref b] => a == b,
+			_ => false,
+		}
+	})
 }
 
-/// Read designated chunk from the sandbox memory into the supplied buffer.
-///
-/// Returns `Err` if one of the following conditions occurs:
-///
-/// - requested buffer is not within the bounds of the sandbox memory.
-fn read_sandbox_memory_into_buf<E: Ext>(
-	ctx: &mut Runtime<E>,
-	ptr: u32,
-	buf: &mut [u8],
-) -> Result<(), sp_sandbox::HostError> {
-	ctx.memory.get(ptr, buf).map_err(|_| store_err(ctx, Error::<E::T>::OutOfBounds))
+/// Can only be used for one call.
+pub struct Runtime<'a, E: Ext + 'a> {
+	ext: &'a mut E,
+	input_data: Option<Vec<u8>>,
+	schedule: &'a Schedule<E::T>,
+	memory: sp_sandbox::Memory,
+	gas_meter: &'a mut GasMeter<E::T>,
+	trap_reason: Option<TrapReason>,
 }
 
-/// Read designated chunk from the sandbox memory and attempt to decode into the specified type.
-///
-/// Returns `Err` if one of the following conditions occurs:
-///
-/// - requested buffer is not within the bounds of the sandbox memory.
-/// - the buffer contents cannot be decoded as the required type.
-fn read_sandbox_memory_as<E: Ext, D: Decode>(
-	ctx: &mut Runtime<E>,
-	ptr: u32,
-	len: u32,
-) -> Result<D, sp_sandbox::HostError> {
-	let buf = read_sandbox_memory(ctx, ptr, len)?;
-	D::decode(&mut &buf[..]).map_err(|_| store_err(ctx, Error::<E::T>::DecodingFailed))
-}
+impl<'a, E> Runtime<'a, E>
+where
+	E: Ext + 'a,
+	<E::T as frame_system::Trait>::AccountId:
+		UncheckedFrom<<E::T as frame_system::Trait>::Hash> + AsRef<[u8]>
+{
+	pub fn new(
+		ext: &'a mut E,
+		input_data: Vec<u8>,
+		schedule: &'a Schedule<E::T>,
+		memory: sp_sandbox::Memory,
+		gas_meter: &'a mut GasMeter<E::T>,
+	) -> Self {
+		Runtime {
+			ext,
+			input_data: Some(input_data),
+			schedule,
+			memory,
+			gas_meter,
+			trap_reason: None,
+		}
+	}
 
-/// Write the given buffer to the designated location in the sandbox memory.
-///
-/// Returns `Err` if one of the following conditions occurs:
-///
-/// - designated area is not within the bounds of the sandbox memory.
-fn write_sandbox_memory<E: Ext>(
-	ctx: &mut Runtime<E>,
-	ptr: u32,
-	buf: &[u8],
-) -> Result<(), sp_sandbox::HostError> {
-	ctx.memory.set(ptr, buf).map_err(|_| store_err(ctx, Error::<E::T>::OutOfBounds))
-}
+	/// Converts the sandbox result and the runtime state into the execution outcome.
+	///
+	/// It evaluates information stored in the `trap_reason` variable of the runtime and
+	/// bases the outcome on the value if this variable. Only if `trap_reason` is `None`
+	/// the result of the sandbox is evaluated.
+	pub fn to_execution_result(
+		self,
+		sandbox_result: Result<sp_sandbox::ReturnValue, sp_sandbox::Error>,
+	) -> ExecResult {
+		// If a trap reason is set we base our decision solely on that.
+		if let Some(trap_reason) = self.trap_reason {
+			return match trap_reason {
+				// The trap was the result of the execution `return` host function.
+				TrapReason::Return(ReturnData{ flags, data }) => {
+					let flags = ReturnFlags::from_bits(flags).ok_or_else(||
+						"used reserved bit in return flags"
+					)?;
+					Ok(ExecReturnValue {
+						flags,
+						data,
+					})
+				},
+				TrapReason::Termination => {
+					Ok(ExecReturnValue {
+						flags: ReturnFlags::empty(),
+						data: Vec::new(),
+					})
+				},
+				TrapReason::Restoration => {
+					Ok(ExecReturnValue {
+						flags: ReturnFlags::empty(),
+						data: Vec::new(),
+					})
+				},
+				TrapReason::SupervisorError(error) => Err(error)?,
+			}
+		}
 
-/// Write the given buffer and its length to the designated locations in sandbox memory and
-/// charge gas according to the token returned by `create_token`.
-//
-/// `out_ptr` is the location in sandbox memory where `buf` should be written to.
-/// `out_len_ptr` is an in-out location in sandbox memory. It is read to determine the
-/// length of the buffer located at `out_ptr`. If that buffer is large enough the actual
-/// `buf.len()` is written to this location.
-///
-/// If `out_ptr` is set to the sentinel value of `u32::max_value()` and `allow_skip` is true the
-/// operation is skipped and `Ok` is returned. This is supposed to help callers to make copying
-/// output optional. For example to skip copying back the output buffer of an `seal_call`
-/// when the caller is not interested in the result.
-///
-/// `create_token` can optionally instruct this function to charge the gas meter with the token
-/// it returns. `create_token` receives the variable amount of bytes that are about to be copied by
-/// this function.
-///
-/// In addition to the error conditions of `write_sandbox_memory` this functions returns
-/// `Err` if the size of the buffer located at `out_ptr` is too small to fit `buf`.
-fn write_sandbox_output<E: Ext>(
-	ctx: &mut Runtime<E>,
-	out_ptr: u32,
-	out_len_ptr: u32,
-	buf: &[u8],
-	allow_skip: bool,
-	create_token: impl FnOnce(u32) -> Option<RuntimeToken>,
-) -> Result<(), sp_sandbox::HostError> {
-	if allow_skip && out_ptr == u32::max_value() {
-		return Ok(());
+		// Check the exact type of the error.
+		match sandbox_result {
+			// No traps were generated. Proceed normally.
+			Ok(_) => {
+				Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: Vec::new() })
+			}
+			// `Error::Module` is returned only if instantiation or linking failed (i.e.
+			// wasm binary tried to import a function that is not provided by the host).
+			// This shouldn't happen because validation process ought to reject such binaries.
+			//
+			// Because panics are really undesirable in the runtime code, we treat this as
+			// a trap for now. Eventually, we might want to revisit this.
+			Err(sp_sandbox::Error::Module) =>
+				Err("validation error")?,
+			// Any other kind of a trap should result in a failure.
+			Err(sp_sandbox::Error::Execution) | Err(sp_sandbox::Error::OutOfBounds) =>
+				Err(Error::<E::T>::ContractTrapped)?
+		}
 	}
 
-	let buf_len = buf.len() as u32;
-	let len: u32 = read_sandbox_memory_as(ctx, out_len_ptr, 4)?;
+	/// Charge the gas meter with the specified token.
+	///
+	/// Returns `Err(HostError)` if there is not enough gas.
+	fn charge_gas<Tok>(&mut self, token: Tok) -> Result<(), sp_sandbox::HostError>
+	where
+		Tok: Token<E::T, Metadata=HostFnWeights<E::T>>,
+	{
+		match self.gas_meter.charge(&self.schedule.host_fn_weights, token) {
+			GasMeterResult::Proceed => Ok(()),
+			GasMeterResult::OutOfGas =>  {
+				self.trap_reason = Some(
+					TrapReason::SupervisorError(Error::<E::T>::OutOfGas.into())
+				);
+				Err(sp_sandbox::HostError)
+			},
+		}
+	}
 
-	if len < buf_len {
-		Err(store_err(ctx, Error::<E::T>::OutputBufferTooSmall))?
+	/// Read designated chunk from the sandbox memory.
+	///
+	/// Returns `Err` if one of the following conditions occurs:
+	///
+	/// - requested buffer is not within the bounds of the sandbox memory.
+	fn read_sandbox_memory(&mut self, ptr: u32, len: u32)
+	-> Result<Vec<u8>, sp_sandbox::HostError>
+	{
+		let mut buf = vec![0u8; len as usize];
+		self.memory.get(ptr, buf.as_mut_slice())
+			.map_err(|_| self.store_err(Error::<E::T>::OutOfBounds))?;
+		Ok(buf)
 	}
 
-	if let Some(token) = create_token(buf_len) {
-		charge_gas(ctx, token)?;
+	/// Read designated chunk from the sandbox memory into the supplied buffer.
+	///
+	/// Returns `Err` if one of the following conditions occurs:
+	///
+	/// - requested buffer is not within the bounds of the sandbox memory.
+	fn read_sandbox_memory_into_buf(&mut self, ptr: u32, buf: &mut [u8])
+	-> Result<(), sp_sandbox::HostError>
+	{
+		self.memory.get(ptr, buf).map_err(|_| self.store_err(Error::<E::T>::OutOfBounds))
 	}
 
-	ctx.memory.set(out_ptr, buf).and_then(|_| {
-		ctx.memory.set(out_len_ptr, &buf_len.encode())
-	})
-	.map_err(|_| store_err(ctx, Error::<E::T>::OutOfBounds))?;
+	/// Read designated chunk from the sandbox memory and attempt to decode into the specified type.
+	///
+	/// Returns `Err` if one of the following conditions occurs:
+	///
+	/// - requested buffer is not within the bounds of the sandbox memory.
+	/// - the buffer contents cannot be decoded as the required type.
+	fn read_sandbox_memory_as<D: Decode>(&mut self, ptr: u32, len: u32)
+	-> Result<D, sp_sandbox::HostError>
+	{
+		let buf = self.read_sandbox_memory(ptr, len)?;
+		D::decode(&mut &buf[..]).map_err(|_| self.store_err(Error::<E::T>::DecodingFailed))
+	}
 
-	Ok(())
-}
+	/// Write the given buffer to the designated location in the sandbox memory.
+	///
+	/// Returns `Err` if one of the following conditions occurs:
+	///
+	/// - designated area is not within the bounds of the sandbox memory.
+	fn write_sandbox_memory(&mut self, ptr: u32, buf: &[u8]) -> Result<(), sp_sandbox::HostError> {
+		self.memory.set(ptr, buf).map_err(|_| self.store_err(Error::<E::T>::OutOfBounds))
+	}
 
-/// Supply to `write_sandbox_output` to indicate that the gas meter should not be charged.
-///
-/// This is only appropriate when writing out data of constant size that does not depend on user
-/// input. In this case the costs for this copy was already charged as part of the token at
-/// the beginning of the API entry point.
-fn already_charged(_: u32) -> Option<RuntimeToken> {
-	None
-}
+	/// Write the given buffer and its length to the designated locations in sandbox memory and
+	/// charge gas according to the token returned by `create_token`.
+	//
+	/// `out_ptr` is the location in sandbox memory where `buf` should be written to.
+	/// `out_len_ptr` is an in-out location in sandbox memory. It is read to determine the
+	/// length of the buffer located at `out_ptr`. If that buffer is large enough the actual
+	/// `buf.len()` is written to this location.
+	///
+	/// If `out_ptr` is set to the sentinel value of `u32::max_value()` and `allow_skip` is true the
+	/// operation is skipped and `Ok` is returned. This is supposed to help callers to make copying
+	/// output optional. For example to skip copying back the output buffer of an `seal_call`
+	/// when the caller is not interested in the result.
+	///
+	/// `create_token` can optionally instruct this function to charge the gas meter with the token
+	/// it returns. `create_token` receives the variable amount of bytes that are about to be copied by
+	/// this function.
+	///
+	/// In addition to the error conditions of `write_sandbox_memory` this functions returns
+	/// `Err` if the size of the buffer located at `out_ptr` is too small to fit `buf`.
+	fn write_sandbox_output(
+		&mut self,
+		out_ptr: u32,
+		out_len_ptr: u32,
+		buf: &[u8],
+		allow_skip: bool,
+		create_token: impl FnOnce(u32) -> Option<RuntimeToken>,
+	) -> Result<(), sp_sandbox::HostError>
+	{
+		if allow_skip && out_ptr == u32::max_value() {
+			return Ok(());
+		}
 
-/// Stores a DispatchError returned from an Ext function into the trap_reason.
-///
-/// This allows through supervisor generated errors to the caller.
-fn store_err<E, Error>(ctx: &mut Runtime<E>, err: Error) -> sp_sandbox::HostError where
-	E: Ext,
-	Error: Into<DispatchError>,
-{
-	ctx.trap_reason = Some(TrapReason::SupervisorError(err.into()));
-	sp_sandbox::HostError
-}
+		let buf_len = buf.len() as u32;
+		let len: u32 = self.read_sandbox_memory_as(out_len_ptr, 4)?;
 
-/// Fallible conversion of `DispatchError` to `ReturnCode`.
-fn err_into_return_code<T: Trait>(from: DispatchError) -> Result<ReturnCode, DispatchError> {
-	use ReturnCode::*;
-
-	let below_sub = Error::<T>::BelowSubsistenceThreshold.into();
-	let transfer_failed = Error::<T>::TransferFailed.into();
-	let not_funded = Error::<T>::NewContractNotFunded.into();
-	let no_code = Error::<T>::CodeNotFound.into();
-	let invalid_contract = Error::<T>::NotCallable.into();
-
-	match from {
-		x if x == below_sub => Ok(BelowSubsistenceThreshold),
-		x if x == transfer_failed => Ok(TransferFailed),
-		x if x == not_funded => Ok(NewContractNotFunded),
-		x if x == no_code => Ok(CodeNotFound),
-		x if x == invalid_contract => Ok(NotCallable),
-		err => Err(err)
+		if len < buf_len {
+			Err(self.store_err(Error::<E::T>::OutputBufferTooSmall))?
+		}
+
+		if let Some(token) = create_token(buf_len) {
+			self.charge_gas(token)?;
+		}
+
+		self.memory.set(out_ptr, buf).and_then(|_| {
+			self.memory.set(out_len_ptr, &buf_len.encode())
+		})
+		.map_err(|_| self.store_err(Error::<E::T>::OutOfBounds))?;
+
+		Ok(())
 	}
-}
 
-/// Fallible conversion of a `ExecResult` to `ReturnCode`.
-fn exec_into_return_code<T: Trait>(from: ExecResult) -> Result<ReturnCode, DispatchError> {
-	use pallet_contracts_primitives::ErrorOrigin::Callee;
+	/// Computes the given hash function on the supplied input.
+	///
+	/// Reads from the sandboxed input buffer into an intermediate buffer.
+	/// Returns the result directly to the output buffer of the sandboxed memory.
+	///
+	/// It is the callers responsibility to provide an output buffer that
+	/// is large enough to hold the expected amount of bytes returned by the
+	/// chosen hash function.
+	///
+	/// # Note
+	///
+	/// The `input` and `output` buffers may overlap.
+	fn compute_hash_on_intermediate_buffer<F, R>(
+		&mut self,
+		hash_fn: F,
+		input_ptr: u32,
+		input_len: u32,
+		output_ptr: u32,
+	) -> Result<(), sp_sandbox::HostError>
+	where
+		F: FnOnce(&[u8]) -> R,
+		R: AsRef<[u8]>,
+	{
+		// Copy input into supervisor memory.
+		let input = self.read_sandbox_memory(input_ptr, input_len)?;
+		// Compute the hash on the input buffer using the given hash function.
+		let hash = hash_fn(&input);
+		// Write the resulting hash back into the sandboxed output buffer.
+		self.write_sandbox_memory(output_ptr, hash.as_ref())?;
+		Ok(())
+	}
 
-	let ExecError { error, origin } = match from {
-		Ok(retval) => return Ok(retval.into()),
-		Err(err) => err,
-	};
+	/// Stores a DispatchError returned from an Ext function into the trap_reason.
+	///
+	/// This allows through supervisor generated errors to the caller.
+	fn store_err<Error>(&mut self, err: Error) -> sp_sandbox::HostError
+	where
+		Error: Into<DispatchError>,
+	{
+		self.trap_reason = Some(TrapReason::SupervisorError(err.into()));
+		sp_sandbox::HostError
+	}
 
-	match (error, origin) {
-		(_, Callee) => Ok(ReturnCode::CalleeTrapped),
-		(err, _) => err_into_return_code::<T>(err)
+	/// Used by Runtime API that calls into other contracts.
+	///
+	/// Those need to transform the the `ExecResult` returned from the execution into
+	/// a `ReturnCode`. If this conversion fails because the `ExecResult` constitutes a
+	/// a fatal error then this error is stored in the `ExecutionContext` so it can be
+	/// extracted for display in the UI.
+	fn map_exec_result(&mut self, result: ExecResult) -> Result<ReturnCode, sp_sandbox::HostError> {
+		match Self::exec_into_return_code(result) {
+			Ok(code) => Ok(code),
+			Err(err) => Err(self.store_err(err)),
+		}
 	}
-}
 
-/// Used by Runtime API that calls into other contracts.
-///
-/// Those need to transform the the `ExecResult` returned from the execution into
-/// a `ReturnCode`. If this conversion fails because the `ExecResult` constitutes a
-/// a fatal error then this error is stored in the `ExecutionContext` so it can be
-/// extracted for display in the UI.
-fn map_exec_result<E: Ext>(ctx: &mut Runtime<E>, result: ExecResult)
+	/// Try to convert an error into a `ReturnCode`.
+	///
+	/// Used to decide between fatal and non-fatal errors.
+	fn map_dispatch_result<T>(&mut self, result: Result<T, DispatchError>)
 	-> Result<ReturnCode, sp_sandbox::HostError>
-{
-	match exec_into_return_code::<E::T>(result) {
-		Ok(code) => Ok(code),
-		Err(err) => Err(store_err(ctx, err)),
+	{
+		let err = if let Err(err) = result {
+			err
+		} else {
+			return Ok(ReturnCode::Success)
+		};
+
+		match Self::err_into_return_code(err) {
+			Ok(code) => Ok(code),
+			Err(err) => Err(self.store_err(err)),
+		}
 	}
-}
 
-/// Try to convert an error into a `ReturnCode`.
-///
-/// Used to decide between fatal and non-fatal errors.
-fn map_dispatch_result<T, E: Ext>(ctx: &mut Runtime<E>, result: Result<T, DispatchError>)
-	-> Result<ReturnCode, sp_sandbox::HostError>
-{
-	let err = if let Err(err) = result {
-		err
-	} else {
-		return Ok(ReturnCode::Success)
-	};
-
-	match err_into_return_code::<E::T>(err) {
-		Ok(code) => Ok(code),
-		Err(err) => Err(store_err(ctx, err)),
+	/// Fallible conversion of `DispatchError` to `ReturnCode`.
+	fn err_into_return_code(from: DispatchError) -> Result<ReturnCode, DispatchError> {
+		use ReturnCode::*;
+
+		let below_sub = Error::<E::T>::BelowSubsistenceThreshold.into();
+		let transfer_failed = Error::<E::T>::TransferFailed.into();
+		let not_funded = Error::<E::T>::NewContractNotFunded.into();
+		let no_code = Error::<E::T>::CodeNotFound.into();
+		let invalid_contract = Error::<E::T>::NotCallable.into();
+
+		match from {
+			x if x == below_sub => Ok(BelowSubsistenceThreshold),
+			x if x == transfer_failed => Ok(TransferFailed),
+			x if x == not_funded => Ok(NewContractNotFunded),
+			x if x == no_code => Ok(CodeNotFound),
+			x if x == invalid_contract => Ok(NotCallable),
+			err => Err(err)
+		}
+	}
+
+	/// Fallible conversion of a `ExecResult` to `ReturnCode`.
+	fn exec_into_return_code(from: ExecResult) -> Result<ReturnCode, DispatchError> {
+		use pallet_contracts_primitives::ErrorOrigin::Callee;
+
+		let ExecError { error, origin } = match from {
+			Ok(retval) => return Ok(retval.into()),
+			Err(err) => err,
+		};
+
+		match (error, origin) {
+			(_, Callee) => Ok(ReturnCode::CalleeTrapped),
+			(err, _) => Self::err_into_return_code(err)
+		}
 	}
 }
 
@@ -567,7 +616,7 @@ define_env!(Env, <E: Ext>,
 	//
 	// - amount: How much gas is used.
 	gas(ctx, amount: u32) => {
-		charge_gas(ctx, RuntimeToken::MeteringBlock(amount))?;
+		ctx.charge_gas(RuntimeToken::MeteringBlock(amount))?;
 		Ok(())
 	},
 
@@ -587,13 +636,13 @@ define_env!(Env, <E: Ext>,
 	// - If value length exceeds the configured maximum value length of a storage entry.
 	// - Upon trying to set an empty storage entry (value length is 0).
 	seal_set_storage(ctx, key_ptr: u32, value_ptr: u32, value_len: u32) => {
-		charge_gas(ctx, RuntimeToken::SetStorage(value_len))?;
+		ctx.charge_gas(RuntimeToken::SetStorage(value_len))?;
 		if value_len > ctx.ext.max_value_size() {
-			Err(store_err(ctx, Error::<E::T>::ValueTooLarge))?;
+			Err(ctx.store_err(Error::<E::T>::ValueTooLarge))?;
 		}
 		let mut key: StorageKey = [0; 32];
-		read_sandbox_memory_into_buf(ctx, key_ptr, &mut key)?;
-		let value = Some(read_sandbox_memory(ctx, value_ptr, value_len)?);
+		ctx.read_sandbox_memory_into_buf(key_ptr, &mut key)?;
+		let value = Some(ctx.read_sandbox_memory(value_ptr, value_len)?);
 		ctx.ext.set_storage(key, value);
 		Ok(())
 	},
@@ -604,9 +653,9 @@ define_env!(Env, <E: Ext>,
 	//
 	// - `key_ptr`: pointer into the linear memory where the location to clear the value is placed.
 	seal_clear_storage(ctx, key_ptr: u32) => {
-		charge_gas(ctx, RuntimeToken::ClearStorage)?;
+		ctx.charge_gas(RuntimeToken::ClearStorage)?;
 		let mut key: StorageKey = [0; 32];
-		read_sandbox_memory_into_buf(ctx, key_ptr, &mut key)?;
+		ctx.read_sandbox_memory_into_buf(key_ptr, &mut key)?;
 		ctx.ext.set_storage(key, None);
 		Ok(())
 	},
@@ -624,11 +673,11 @@ define_env!(Env, <E: Ext>,
 	//
 	// `ReturnCode::KeyNotFound`
 	seal_get_storage(ctx, key_ptr: u32, out_ptr: u32, out_len_ptr: u32) -> ReturnCode => {
-		charge_gas(ctx, RuntimeToken::GetStorageBase)?;
+		ctx.charge_gas(RuntimeToken::GetStorageBase)?;
 		let mut key: StorageKey = [0; 32];
-		read_sandbox_memory_into_buf(ctx, key_ptr, &mut key)?;
+		ctx.read_sandbox_memory_into_buf(key_ptr, &mut key)?;
 		if let Some(value) = ctx.ext.get_storage(&key) {
-			write_sandbox_output(ctx, out_ptr, out_len_ptr, &value, false, |len| {
+			ctx.write_sandbox_output(out_ptr, out_len_ptr, &value, false, |len| {
 				Some(RuntimeToken::GetStorageCopyOut(len))
 			})?;
 			Ok(ReturnCode::Success)
@@ -659,14 +708,14 @@ define_env!(Env, <E: Ext>,
 		value_ptr: u32,
 		value_len: u32
 	) -> ReturnCode => {
-		charge_gas(ctx, RuntimeToken::Transfer)?;
+		ctx.charge_gas(RuntimeToken::Transfer)?;
 		let callee: <<E as Ext>::T as frame_system::Trait>::AccountId =
-			read_sandbox_memory_as(ctx, account_ptr, account_len)?;
+			ctx.read_sandbox_memory_as(account_ptr, account_len)?;
 		let value: BalanceOf<<E as Ext>::T> =
-			read_sandbox_memory_as(ctx, value_ptr, value_len)?;
+			ctx.read_sandbox_memory_as(value_ptr, value_len)?;
 
 		let result = ctx.ext.transfer(&callee, value);
-		map_dispatch_result(ctx, result)
+		ctx.map_dispatch_result(result)
 	},
 
 	// Make a call to another contract.
@@ -712,14 +761,14 @@ define_env!(Env, <E: Ext>,
 		output_ptr: u32,
 		output_len_ptr: u32
 	) -> ReturnCode => {
-		charge_gas(ctx, RuntimeToken::CallBase(input_data_len))?;
+		ctx.charge_gas(RuntimeToken::CallBase(input_data_len))?;
 		let callee: <<E as Ext>::T as frame_system::Trait>::AccountId =
-			read_sandbox_memory_as(ctx, callee_ptr, callee_len)?;
-		let value: BalanceOf<<E as Ext>::T> = read_sandbox_memory_as(ctx, value_ptr, value_len)?;
-		let input_data = read_sandbox_memory(ctx, input_data_ptr, input_data_len)?;
+			ctx.read_sandbox_memory_as(callee_ptr, callee_len)?;
+		let value: BalanceOf<<E as Ext>::T> = ctx.read_sandbox_memory_as(value_ptr, value_len)?;
+		let input_data = ctx.read_sandbox_memory(input_data_ptr, input_data_len)?;
 
 		if value > 0u32.into() {
-			charge_gas(ctx, RuntimeToken::CallSurchargeTransfer)?;
+			ctx.charge_gas(RuntimeToken::CallSurchargeTransfer)?;
 		}
 
 		let nested_gas_limit = if gas == 0 {
@@ -744,11 +793,11 @@ define_env!(Env, <E: Ext>,
 		});
 
 		if let Ok(output) = &call_outcome {
-			write_sandbox_output(ctx, output_ptr, output_len_ptr, &output.data, true, |len| {
+			ctx.write_sandbox_output(output_ptr, output_len_ptr, &output.data, true, |len| {
 				Some(RuntimeToken::CallCopyOut(len))
 			})?;
 		}
-		map_exec_result(ctx, call_outcome)
+		ctx.map_exec_result(call_outcome)
 	},
 
 	// Instantiate a contract with the specified code hash.
@@ -779,6 +828,8 @@ define_env!(Env, <E: Ext>,
 	// - output_ptr: a pointer where the output buffer is copied to.
 	// - output_len_ptr: in-out pointer to where the length of the buffer is read from
 	//   and the actual length is written to.
+	// - salt_ptr: Pointer to raw bytes used for address deriviation. See `fn contract_address`.
+	// - salt_len: length in bytes of the supplied salt.
 	//
 	// # Errors
 	//
@@ -806,13 +857,16 @@ define_env!(Env, <E: Ext>,
 		address_ptr: u32,
 		address_len_ptr: u32,
 		output_ptr: u32,
-		output_len_ptr: u32
+		output_len_ptr: u32,
+		salt_ptr: u32,
+		salt_len: u32
 	) -> ReturnCode => {
-		charge_gas(ctx, RuntimeToken::InstantiateBase(input_data_len))?;
+		ctx.charge_gas(RuntimeToken::InstantiateBase {input_data_len, salt_len})?;
 		let code_hash: CodeHash<<E as Ext>::T> =
-			read_sandbox_memory_as(ctx, code_hash_ptr, code_hash_len)?;
-		let value: BalanceOf<<E as Ext>::T> = read_sandbox_memory_as(ctx, value_ptr, value_len)?;
-		let input_data = read_sandbox_memory(ctx, input_data_ptr, input_data_len)?;
+			ctx.read_sandbox_memory_as(code_hash_ptr, code_hash_len)?;
+		let value: BalanceOf<<E as Ext>::T> = ctx.read_sandbox_memory_as(value_ptr, value_len)?;
+		let input_data = ctx.read_sandbox_memory(input_data_ptr, input_data_len)?;
+		let salt = ctx.read_sandbox_memory(salt_ptr, salt_len)?;
 
 		let nested_gas_limit = if gas == 0 {
 			ctx.gas_meter.gas_left()
@@ -827,7 +881,8 @@ define_env!(Env, <E: Ext>,
 						&code_hash,
 						value,
 						nested_meter,
-						input_data
+						input_data,
+						&salt,
 					)
 				}
 				// there is not enough gas to allocate for the nested call.
@@ -836,15 +891,15 @@ define_env!(Env, <E: Ext>,
 		});
 		if let Ok((address, output)) = &instantiate_outcome {
 			if !output.flags.contains(ReturnFlags::REVERT) {
-				write_sandbox_output(
-					ctx, address_ptr, address_len_ptr, &address.encode(), true, already_charged,
+				ctx.write_sandbox_output(
+					address_ptr, address_len_ptr, &address.encode(), true, already_charged,
 				)?;
 			}
-			write_sandbox_output(ctx, output_ptr, output_len_ptr, &output.data, true, |len| {
+			ctx.write_sandbox_output(output_ptr, output_len_ptr, &output.data, true, |len| {
 				Some(RuntimeToken::InstantiateCopyOut(len))
 			})?;
 		}
-		map_exec_result(ctx, instantiate_outcome.map(|(_id, retval)| retval))
+		ctx.map_exec_result(instantiate_outcome.map(|(_id, retval)| retval))
 	},
 
 	// Remove the calling account and transfer remaining balance.
@@ -866,20 +921,20 @@ define_env!(Env, <E: Ext>,
 		beneficiary_ptr: u32,
 		beneficiary_len: u32
 	) => {
-		charge_gas(ctx, RuntimeToken::Terminate)?;
+		ctx.charge_gas(RuntimeToken::Terminate)?;
 		let beneficiary: <<E as Ext>::T as frame_system::Trait>::AccountId =
-			read_sandbox_memory_as(ctx, beneficiary_ptr, beneficiary_len)?;
+			ctx.read_sandbox_memory_as(beneficiary_ptr, beneficiary_len)?;
 
-		if let Ok(_) = ctx.ext.terminate(&beneficiary) {
+		if let Ok(_) = ctx.ext.terminate(&beneficiary).map_err(|e| ctx.store_err(e)) {
 			ctx.trap_reason = Some(TrapReason::Termination);
 		}
 		Err(sp_sandbox::HostError)
 	},
 
 	seal_input(ctx, buf_ptr: u32, buf_len_ptr: u32) => {
-		charge_gas(ctx, RuntimeToken::InputBase)?;
+		ctx.charge_gas(RuntimeToken::InputBase)?;
 		if let Some(input) = ctx.input_data.take() {
-			write_sandbox_output(ctx, buf_ptr, buf_len_ptr, &input, false, |len| {
+			ctx.write_sandbox_output(buf_ptr, buf_len_ptr, &input, false, |len| {
 				Some(RuntimeToken::InputCopyOut(len))
 			})
 		} else {
@@ -905,10 +960,10 @@ define_env!(Env, <E: Ext>,
 	//
 	// Using a reserved bit triggers a trap.
 	seal_return(ctx, flags: u32, data_ptr: u32, data_len: u32) => {
-		charge_gas(ctx, RuntimeToken::Return(data_len))?;
+		ctx.charge_gas(RuntimeToken::Return(data_len))?;
 		ctx.trap_reason = Some(TrapReason::Return(ReturnData {
 			flags,
-			data: read_sandbox_memory(ctx, data_ptr, data_len)?,
+			data: ctx.read_sandbox_memory(data_ptr, data_len)?,
 		}));
 
 		// The trap mechanism is used to immediately terminate the execution.
@@ -928,9 +983,9 @@ define_env!(Env, <E: Ext>,
 	// extrinsic will be returned. Otherwise, if this call is initiated by another contract then the
 	// address of the contract will be returned. The value is encoded as T::AccountId.
 	seal_caller(ctx, out_ptr: u32, out_len_ptr: u32) => {
-		charge_gas(ctx, RuntimeToken::Caller)?;
-		write_sandbox_output(
-			ctx, out_ptr, out_len_ptr, &ctx.ext.caller().encode(), false, already_charged
+		ctx.charge_gas(RuntimeToken::Caller)?;
+		ctx.write_sandbox_output(
+			out_ptr, out_len_ptr, &ctx.ext.caller().encode(), false, already_charged
 		)
 	},
 
@@ -941,9 +996,9 @@ define_env!(Env, <E: Ext>,
 	// `out_ptr`. This call overwrites it with the size of the value. If the available
 	// space at `out_ptr` is less than the size of the value a trap is triggered.
 	seal_address(ctx, out_ptr: u32, out_len_ptr: u32) => {
-		charge_gas(ctx, RuntimeToken::Address)?;
-		write_sandbox_output(
-			ctx, out_ptr, out_len_ptr, &ctx.ext.address().encode(), false, already_charged
+		ctx.charge_gas(RuntimeToken::Address)?;
+		ctx.write_sandbox_output(
+			out_ptr, out_len_ptr, &ctx.ext.address().encode(), false, already_charged
 		)
 	},
 
@@ -961,10 +1016,9 @@ define_env!(Env, <E: Ext>,
 	// It is recommended to avoid specifying very small values for `gas` as the prices for a single
 	// gas can be smaller than one.
 	seal_weight_to_fee(ctx, gas: u64, out_ptr: u32, out_len_ptr: u32) => {
-		charge_gas(ctx, RuntimeToken::WeightToFee)?;
-		write_sandbox_output(
-			ctx, out_ptr, out_len_ptr, &ctx.ext.get_weight_price(gas).encode(), false,
-			already_charged
+		ctx.charge_gas(RuntimeToken::WeightToFee)?;
+		ctx.write_sandbox_output(
+			out_ptr, out_len_ptr, &ctx.ext.get_weight_price(gas).encode(), false, already_charged
 		)
 	},
 
@@ -977,9 +1031,9 @@ define_env!(Env, <E: Ext>,
 	//
 	// The data is encoded as Gas.
 	seal_gas_left(ctx, out_ptr: u32, out_len_ptr: u32) => {
-		charge_gas(ctx, RuntimeToken::GasLeft)?;
-		write_sandbox_output(
-			ctx, out_ptr, out_len_ptr, &ctx.gas_meter.gas_left().encode(), false, already_charged
+		ctx.charge_gas(RuntimeToken::GasLeft)?;
+		ctx.write_sandbox_output(
+			out_ptr, out_len_ptr, &ctx.gas_meter.gas_left().encode(), false, already_charged
 		)
 	},
 
@@ -992,9 +1046,9 @@ define_env!(Env, <E: Ext>,
 	//
 	// The data is encoded as T::Balance.
 	seal_balance(ctx, out_ptr: u32, out_len_ptr: u32) => {
-		charge_gas(ctx, RuntimeToken::Balance)?;
-		write_sandbox_output(
-			ctx, out_ptr, out_len_ptr, &ctx.ext.balance().encode(), false, already_charged
+		ctx.charge_gas(RuntimeToken::Balance)?;
+		ctx.write_sandbox_output(
+			out_ptr, out_len_ptr, &ctx.ext.balance().encode(), false, already_charged
 		)
 	},
 
@@ -1007,10 +1061,9 @@ define_env!(Env, <E: Ext>,
 	//
 	// The data is encoded as T::Balance.
 	seal_value_transferred(ctx, out_ptr: u32, out_len_ptr: u32) => {
-		charge_gas(ctx, RuntimeToken::ValueTransferred)?;
-		write_sandbox_output(
-			ctx, out_ptr, out_len_ptr, &ctx.ext.value_transferred().encode(), false,
-			already_charged
+		ctx.charge_gas(RuntimeToken::ValueTransferred)?;
+		ctx.write_sandbox_output(
+			out_ptr, out_len_ptr, &ctx.ext.value_transferred().encode(), false, already_charged
 		)
 	},
 
@@ -1023,14 +1076,13 @@ define_env!(Env, <E: Ext>,
 	//
 	// The data is encoded as T::Hash.
 	seal_random(ctx, subject_ptr: u32, subject_len: u32, out_ptr: u32, out_len_ptr: u32) => {
-		charge_gas(ctx, RuntimeToken::Random)?;
+		ctx.charge_gas(RuntimeToken::Random)?;
 		if subject_len > ctx.schedule.limits.subject_len {
 			return Err(sp_sandbox::HostError);
 		}
-		let subject_buf = read_sandbox_memory(ctx, subject_ptr, subject_len)?;
-		write_sandbox_output(
-			ctx, out_ptr, out_len_ptr, &ctx.ext.random(&subject_buf).encode(), false,
-			already_charged
+		let subject_buf = ctx.read_sandbox_memory(subject_ptr, subject_len)?;
+		ctx.write_sandbox_output(
+			out_ptr, out_len_ptr, &ctx.ext.random(&subject_buf).encode(), false, already_charged
 		)
 	},
 
@@ -1041,9 +1093,9 @@ define_env!(Env, <E: Ext>,
 	// `out_ptr`. This call overwrites it with the size of the value. If the available
 	// space at `out_ptr` is less than the size of the value a trap is triggered.
 	seal_now(ctx, out_ptr: u32, out_len_ptr: u32) => {
-		charge_gas(ctx, RuntimeToken::Now)?;
-		write_sandbox_output(
-			ctx, out_ptr, out_len_ptr, &ctx.ext.now().encode(), false, already_charged
+		ctx.charge_gas(RuntimeToken::Now)?;
+		ctx.write_sandbox_output(
+			out_ptr, out_len_ptr, &ctx.ext.now().encode(), false, already_charged
 		)
 	},
 
@@ -1051,9 +1103,9 @@ define_env!(Env, <E: Ext>,
 	//
 	// The data is encoded as T::Balance.
 	seal_minimum_balance(ctx, out_ptr: u32, out_len_ptr: u32) => {
-		charge_gas(ctx, RuntimeToken::MinimumBalance)?;
-		write_sandbox_output(
-			ctx, out_ptr, out_len_ptr, &ctx.ext.minimum_balance().encode(), false, already_charged
+		ctx.charge_gas(RuntimeToken::MinimumBalance)?;
+		ctx.write_sandbox_output(
+			out_ptr, out_len_ptr, &ctx.ext.minimum_balance().encode(), false, already_charged
 		)
 	},
 
@@ -1073,10 +1125,9 @@ define_env!(Env, <E: Ext>,
 	// below the sum of existential deposit and the tombstone deposit. The sum
 	// is commonly referred as subsistence threshold in code.
 	seal_tombstone_deposit(ctx, out_ptr: u32, out_len_ptr: u32) => {
-		charge_gas(ctx, RuntimeToken::TombstoneDeposit)?;
-		write_sandbox_output(
-			ctx, out_ptr, out_len_ptr, &ctx.ext.tombstone_deposit().encode(), false,
-			already_charged
+		ctx.charge_gas(RuntimeToken::TombstoneDeposit)?;
+		ctx.write_sandbox_output(
+			out_ptr, out_len_ptr, &ctx.ext.tombstone_deposit().encode(), false, already_charged
 		)
 	},
 
@@ -1117,13 +1168,13 @@ define_env!(Env, <E: Ext>,
 		delta_ptr: u32,
 		delta_count: u32
 	) => {
-		charge_gas(ctx, RuntimeToken::RestoreTo(delta_count))?;
+		ctx.charge_gas(RuntimeToken::RestoreTo(delta_count))?;
 		let dest: <<E as Ext>::T as frame_system::Trait>::AccountId =
-			read_sandbox_memory_as(ctx, dest_ptr, dest_len)?;
+			ctx.read_sandbox_memory_as(dest_ptr, dest_len)?;
 		let code_hash: CodeHash<<E as Ext>::T> =
-			read_sandbox_memory_as(ctx, code_hash_ptr, code_hash_len)?;
+			ctx.read_sandbox_memory_as(code_hash_ptr, code_hash_len)?;
 		let rent_allowance: BalanceOf<<E as Ext>::T> =
-			read_sandbox_memory_as(ctx, rent_allowance_ptr, rent_allowance_len)?;
+			ctx.read_sandbox_memory_as(rent_allowance_ptr, rent_allowance_len)?;
 		let delta = {
 			// We can eagerly allocate because we charged for the complete delta count already
 			let mut delta = Vec::with_capacity(delta_count as usize);
@@ -1134,7 +1185,7 @@ define_env!(Env, <E: Ext>,
 
 				// Read the delta into the provided buffer and collect it into the buffer.
 				let mut delta_key: StorageKey = [0; KEY_SIZE];
-				read_sandbox_memory_into_buf(ctx, key_ptr, &mut delta_key)?;
+				ctx.read_sandbox_memory_into_buf(key_ptr, &mut delta_key)?;
 				delta.push(delta_key);
 
 				// Offset key_ptr to the next element.
@@ -1149,7 +1200,7 @@ define_env!(Env, <E: Ext>,
 			code_hash,
 			rent_allowance,
 			delta,
-		) {
+		).map_err(|e| ctx.store_err(e)) {
 			ctx.trap_reason = Some(TrapReason::Restoration);
 		}
 		Err(sp_sandbox::HostError)
@@ -1166,18 +1217,18 @@ define_env!(Env, <E: Ext>,
 	seal_deposit_event(ctx, topics_ptr: u32, topics_len: u32, data_ptr: u32, data_len: u32) => {
 		let num_topic = topics_len
 			.checked_div(sp_std::mem::size_of::<TopicOf<E::T>>() as u32)
-			.ok_or_else(|| store_err(ctx, "Zero sized topics are not allowed"))?;
-		charge_gas(ctx, RuntimeToken::DepositEvent {
+			.ok_or_else(|| ctx.store_err("Zero sized topics are not allowed"))?;
+		ctx.charge_gas(RuntimeToken::DepositEvent {
 			num_topic,
 			len: data_len,
 		})?;
 		if data_len > ctx.ext.max_value_size() {
-			Err(store_err(ctx, Error::<E::T>::ValueTooLarge))?;
+			Err(ctx.store_err(Error::<E::T>::ValueTooLarge))?;
 		}
 
 		let mut topics: Vec::<TopicOf<<E as Ext>::T>> = match topics_len {
 			0 => Vec::new(),
-			_ => read_sandbox_memory_as(ctx, topics_ptr, topics_len)?,
+			_ => ctx.read_sandbox_memory_as(topics_ptr, topics_len)?,
 		};
 
 		// If there are more than `event_topics`, then trap.
@@ -1190,7 +1241,7 @@ define_env!(Env, <E: Ext>,
 			return Err(sp_sandbox::HostError);
 		}
 
-		let event_data = read_sandbox_memory(ctx, data_ptr, data_len)?;
+		let event_data = ctx.read_sandbox_memory(data_ptr, data_len)?;
 
 		ctx.ext.deposit_event(topics, event_data);
 
@@ -1203,9 +1254,9 @@ define_env!(Env, <E: Ext>,
 	//   Should be decodable as a `T::Balance`. Traps otherwise.
 	// - value_len: length of the value buffer.
 	seal_set_rent_allowance(ctx, value_ptr: u32, value_len: u32) => {
-		charge_gas(ctx, RuntimeToken::SetRentAllowance)?;
+		ctx.charge_gas(RuntimeToken::SetRentAllowance)?;
 		let value: BalanceOf<<E as Ext>::T> =
-			read_sandbox_memory_as(ctx, value_ptr, value_len)?;
+			ctx.read_sandbox_memory_as(value_ptr, value_len)?;
 		ctx.ext.set_rent_allowance(value);
 
 		Ok(())
@@ -1220,9 +1271,9 @@ define_env!(Env, <E: Ext>,
 	//
 	// The data is encoded as T::Balance.
 	seal_rent_allowance(ctx, out_ptr: u32, out_len_ptr: u32) => {
-		charge_gas(ctx, RuntimeToken::RentAllowance)?;
-		write_sandbox_output(
-			ctx, out_ptr, out_len_ptr, &ctx.ext.rent_allowance().encode(), false, already_charged
+		ctx.charge_gas(RuntimeToken::RentAllowance)?;
+		ctx.write_sandbox_output(
+			out_ptr, out_len_ptr, &ctx.ext.rent_allowance().encode(), false, already_charged
 		)
 	},
 
@@ -1230,7 +1281,7 @@ define_env!(Env, <E: Ext>,
 	// Only available on `--dev` chains.
 	// This function may be removed at any time, superseded by a more general contract debugging feature.
 	seal_println(ctx, str_ptr: u32, str_len: u32) => {
-		let data = read_sandbox_memory(ctx, str_ptr, str_len)?;
+		let data = ctx.read_sandbox_memory(str_ptr, str_len)?;
 		if let Ok(utf8) = core::str::from_utf8(&data) {
 			sp_runtime::print(utf8);
 		}
@@ -1244,9 +1295,9 @@ define_env!(Env, <E: Ext>,
 	// `out_ptr`. This call overwrites it with the size of the value. If the available
 	// space at `out_ptr` is less than the size of the value a trap is triggered.
 	seal_block_number(ctx, out_ptr: u32, out_len_ptr: u32) => {
-		charge_gas(ctx, RuntimeToken::BlockNumber)?;
-		write_sandbox_output(
-			ctx, out_ptr, out_len_ptr, &ctx.ext.block_number().encode(), false, already_charged
+		ctx.charge_gas(RuntimeToken::BlockNumber)?;
+		ctx.write_sandbox_output(
+			out_ptr, out_len_ptr, &ctx.ext.block_number().encode(), false, already_charged
 		)
 	},
 
@@ -1271,8 +1322,8 @@ define_env!(Env, <E: Ext>,
 	//                 data is placed. The function will write the result
 	//                 directly into this buffer.
 	seal_hash_sha2_256(ctx, input_ptr: u32, input_len: u32, output_ptr: u32) => {
-		charge_gas(ctx, RuntimeToken::HashSha256(input_len))?;
-		compute_hash_on_intermediate_buffer(ctx, sha2_256, input_ptr, input_len, output_ptr)
+		ctx.charge_gas(RuntimeToken::HashSha256(input_len))?;
+		ctx.compute_hash_on_intermediate_buffer(sha2_256, input_ptr, input_len, output_ptr)
 	},
 
 	// Computes the KECCAK 256-bit hash on the given input buffer.
@@ -1296,8 +1347,8 @@ define_env!(Env, <E: Ext>,
 	//                 data is placed. The function will write the result
 	//                 directly into this buffer.
 	seal_hash_keccak_256(ctx, input_ptr: u32, input_len: u32, output_ptr: u32) => {
-		charge_gas(ctx, RuntimeToken::HashKeccak256(input_len))?;
-		compute_hash_on_intermediate_buffer(ctx, keccak_256, input_ptr, input_len, output_ptr)
+		ctx.charge_gas(RuntimeToken::HashKeccak256(input_len))?;
+		ctx.compute_hash_on_intermediate_buffer(keccak_256, input_ptr, input_len, output_ptr)
 	},
 
 	// Computes the BLAKE2 256-bit hash on the given input buffer.
@@ -1321,8 +1372,8 @@ define_env!(Env, <E: Ext>,
 	//                 data is placed. The function will write the result
 	//                 directly into this buffer.
 	seal_hash_blake2_256(ctx, input_ptr: u32, input_len: u32, output_ptr: u32) => {
-		charge_gas(ctx, RuntimeToken::HashBlake256(input_len))?;
-		compute_hash_on_intermediate_buffer(ctx, blake2_256, input_ptr, input_len, output_ptr)
+		ctx.charge_gas(RuntimeToken::HashBlake256(input_len))?;
+		ctx.compute_hash_on_intermediate_buffer(blake2_256, input_ptr, input_len, output_ptr)
 	},
 
 	// Computes the BLAKE2 128-bit hash on the given input buffer.
@@ -1346,62 +1397,7 @@ define_env!(Env, <E: Ext>,
 	//                 data is placed. The function will write the result
 	//                 directly into this buffer.
 	seal_hash_blake2_128(ctx, input_ptr: u32, input_len: u32, output_ptr: u32) => {
-		charge_gas(ctx, RuntimeToken::HashBlake128(input_len))?;
-		compute_hash_on_intermediate_buffer(ctx, blake2_128, input_ptr, input_len, output_ptr)
+		ctx.charge_gas(RuntimeToken::HashBlake128(input_len))?;
+		ctx.compute_hash_on_intermediate_buffer(blake2_128, input_ptr, input_len, output_ptr)
 	},
 );
-
-/// Computes the given hash function on the supplied input.
-///
-/// Reads from the sandboxed input buffer into an intermediate buffer.
-/// Returns the result directly to the output buffer of the sandboxed memory.
-///
-/// It is the callers responsibility to provide an output buffer that
-/// is large enough to hold the expected amount of bytes returned by the
-/// chosen hash function.
-///
-/// # Note
-///
-/// The `input` and `output` buffers may overlap.
-fn compute_hash_on_intermediate_buffer<E, F, R>(
-	ctx: &mut Runtime<E>,
-	hash_fn: F,
-	input_ptr: u32,
-	input_len: u32,
-	output_ptr: u32,
-) -> Result<(), sp_sandbox::HostError>
-where
-	E: Ext,
-	F: FnOnce(&[u8]) -> R,
-	R: AsRef<[u8]>,
-{
-	// Copy input into supervisor memory.
-	let input = read_sandbox_memory(ctx, input_ptr, input_len)?;
-	// Compute the hash on the input buffer using the given hash function.
-	let hash = hash_fn(&input);
-	// Write the resulting hash back into the sandboxed output buffer.
-	write_sandbox_memory(
-		ctx,
-		output_ptr,
-		hash.as_ref(),
-	)?;
-	Ok(())
-}
-
-/// Finds duplicates in a given vector.
-///
-/// This function has complexity of O(n log n) and no additional memory is required, although
-/// the order of items is not preserved.
-fn has_duplicates<T: PartialEq + AsRef<[u8]>>(items: &mut Vec<T>) -> bool {
-	// Sort the vector
-	items.sort_by(|a, b| {
-		Ord::cmp(a.as_ref(), b.as_ref())
-	});
-	// And then find any two consecutive equal elements.
-	items.windows(2).any(|w| {
-		match w {
-			&[ref a, ref b] => a == b,
-			_ => false,
-		}
-	})
-}
diff --git a/frame/contracts/src/weights.rs b/frame/contracts/src/weights.rs
index a84acbfd79ac..77bb83cf4d42 100644
--- a/frame/contracts/src/weights.rs
+++ b/frame/contracts/src/weights.rs
@@ -17,7 +17,7 @@
 
 //! Weights for pallet_contracts
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2020-11-10, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -45,7 +45,7 @@ use sp_std::marker::PhantomData;
 pub trait WeightInfo {
 	fn update_schedule() -> Weight;
 	fn put_code(n: u32, ) -> Weight;
-	fn instantiate(n: u32, ) -> Weight;
+	fn instantiate(n: u32, s: u32, ) -> Weight;
 	fn call() -> Weight;
 	fn claim_surcharge() -> Weight;
 	fn seal_caller(r: u32, ) -> Weight;
@@ -80,7 +80,7 @@ pub trait WeightInfo {
 	fn seal_call(r: u32, ) -> Weight;
 	fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight;
 	fn seal_instantiate(r: u32, ) -> Weight;
-	fn seal_instantiate_per_input_output_kb(i: u32, o: u32, ) -> Weight;
+	fn seal_instantiate_per_input_output_salt_kb(i: u32, o: u32, s: u32, ) -> Weight;
 	fn seal_hash_sha2_256(r: u32, ) -> Weight;
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight;
 	fn seal_hash_keccak_256(r: u32, ) -> Weight;
@@ -140,228 +140,201 @@ pub trait WeightInfo {
 	fn instr_i64shru(r: u32, ) -> Weight;
 	fn instr_i64rotl(r: u32, ) -> Weight;
 	fn instr_i64rotr(r: u32, ) -> Weight;
-	
 }
 
 /// Weights for pallet_contracts using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
 	fn update_schedule() -> Weight {
-		(33_160_000 as Weight)
+		(35_214_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn put_code(n: u32, ) -> Weight {
-		(5_975_000 as Weight)
-			.saturating_add((108_953_000 as Weight).saturating_mul(n as Weight))
+		(0 as Weight)
+			.saturating_add((109_242_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
-	fn instantiate(n: u32, ) -> Weight {
-		(218_223_000 as Weight)
-			.saturating_add((1_007_000 as Weight).saturating_mul(n as Weight))
+	fn instantiate(n: u32, s: u32, ) -> Weight {
+		(195_276_000 as Weight)
+			.saturating_add((35_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((2_244_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-			
 	}
 	fn call() -> Weight {
-		(201_492_000 as Weight)
+		(207_142_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
 	fn claim_surcharge() -> Weight {
-		(449_203_000 as Weight)
+		(489_633_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
 	fn seal_caller(r: u32, ) -> Weight {
-		(136_650_000 as Weight)
-			.saturating_add((364_640_000 as Weight).saturating_mul(r as Weight))
+		(136_550_000 as Weight)
+			.saturating_add((373_182_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_address(r: u32, ) -> Weight {
-		(144_167_000 as Weight)
-			.saturating_add((365_328_000 as Weight).saturating_mul(r as Weight))
+		(136_329_000 as Weight)
+			.saturating_add((373_392_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(138_458_000 as Weight)
-			.saturating_add((361_076_000 as Weight).saturating_mul(r as Weight))
+		(111_577_000 as Weight)
+			.saturating_add((373_536_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_balance(r: u32, ) -> Weight {
-		(147_909_000 as Weight)
-			.saturating_add((792_169_000 as Weight).saturating_mul(r as Weight))
+		(157_531_000 as Weight)
+			.saturating_add((810_382_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
-			
 	}
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(148_524_000 as Weight)
-			.saturating_add((361_842_000 as Weight).saturating_mul(r as Weight))
+		(143_801_000 as Weight)
+			.saturating_add((369_769_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(139_795_000 as Weight)
-			.saturating_add((366_013_000 as Weight).saturating_mul(r as Weight))
+		(133_546_000 as Weight)
+			.saturating_add((370_036_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(140_557_000 as Weight)
-			.saturating_add((362_687_000 as Weight).saturating_mul(r as Weight))
+		(138_568_000 as Weight)
+			.saturating_add((370_322_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(152_989_000 as Weight)
-			.saturating_add((836_876_000 as Weight).saturating_mul(r as Weight))
+		(144_431_000 as Weight)
+			.saturating_add((851_810_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_block_number(r: u32, ) -> Weight {
-		(140_228_000 as Weight)
-			.saturating_add((360_561_000 as Weight).saturating_mul(r as Weight))
+		(133_237_000 as Weight)
+			.saturating_add((369_156_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_now(r: u32, ) -> Weight {
-		(148_776_000 as Weight)
-			.saturating_add((361_712_000 as Weight).saturating_mul(r as Weight))
+		(139_700_000 as Weight)
+			.saturating_add((368_961_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(126_903_000 as Weight)
-			.saturating_add((603_100_000 as Weight).saturating_mul(r as Weight))
+		(149_395_000 as Weight)
+			.saturating_add((625_812_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
-			
 	}
 	fn seal_gas(r: u32, ) -> Weight {
-		(125_712_000 as Weight)
-			.saturating_add((184_450_000 as Weight).saturating_mul(r as Weight))
+		(125_777_000 as Weight)
+			.saturating_add((187_585_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_input(r: u32, ) -> Weight {
-		(136_175_000 as Weight)
-			.saturating_add((7_489_000 as Weight).saturating_mul(r as Weight))
+		(132_584_000 as Weight)
+			.saturating_add((7_661_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(145_434_000 as Weight)
-			.saturating_add((276_000 as Weight).saturating_mul(n as Weight))
+		(143_408_000 as Weight)
+			.saturating_add((274_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_return(r: u32, ) -> Weight {
-		(124_788_000 as Weight)
-			.saturating_add((5_696_000 as Weight).saturating_mul(r as Weight))
+		(126_257_000 as Weight)
+			.saturating_add((5_455_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(133_483_000 as Weight)
-			.saturating_add((675_000 as Weight).saturating_mul(n as Weight))
+		(133_286_000 as Weight)
+			.saturating_add((698_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_terminate(r: u32, ) -> Weight {
-		(135_387_000 as Weight)
-			.saturating_add((338_395_000 as Weight).saturating_mul(r as Weight))
+		(130_607_000 as Weight)
+			.saturating_add((358_370_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_restore_to(r: u32, ) -> Weight {
-		(227_617_000 as Weight)
-			.saturating_add((132_493_000 as Weight).saturating_mul(r as Weight))
+		(233_645_000 as Weight)
+			.saturating_add((135_355_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_restore_to_per_delta(d: u32, ) -> Weight {
-		(15_263_000 as Weight)
-			.saturating_add((3_732_219_000 as Weight).saturating_mul(d as Weight))
+		(74_573_000 as Weight)
+			.saturating_add((3_768_682_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
 	}
 	fn seal_random(r: u32, ) -> Weight {
-		(236_391_000 as Weight)
-			.saturating_add((913_452_000 as Weight).saturating_mul(r as Weight))
+		(140_286_000 as Weight)
+			.saturating_add((950_890_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
-			
 	}
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(140_845_000 as Weight)
-			.saturating_add((1_322_796_000 as Weight).saturating_mul(r as Weight))
+		(167_735_000 as Weight)
+			.saturating_add((1_375_429_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_651_556_000 as Weight)
-			.saturating_add((737_421_000 as Weight).saturating_mul(t as Weight))
-			.saturating_add((244_183_000 as Weight).saturating_mul(n as Weight))
+		(1_715_857_000 as Weight)
+			.saturating_add((760_777_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((241_853_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(151_091_000 as Weight)
-			.saturating_add((983_375_000 as Weight).saturating_mul(r as Weight))
+		(156_911_000 as Weight)
+			.saturating_add((1_006_139_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(460_478_000 as Weight)
-			.saturating_add((14_824_033_000 as Weight).saturating_mul(r as Weight))
+		(0 as Weight)
+			.saturating_add((14_938_793_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(2_255_458_000 as Weight)
-			.saturating_add((204_470_000 as Weight).saturating_mul(n as Weight))
+		(2_300_169_000 as Weight)
+			.saturating_add((204_543_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
 	fn seal_clear_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			.saturating_add((5_052_125_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((5_140_241_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_get_storage(r: u32, ) -> Weight {
-		(95_473_000 as Weight)
-			.saturating_add((1_044_784_000 as Weight).saturating_mul(r as Weight))
+		(45_212_000 as Weight)
+			.saturating_add((1_131_504_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
-			
 	}
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(860_080_000 as Weight)
-			.saturating_add((146_913_000 as Weight).saturating_mul(n as Weight))
+		(885_531_000 as Weight)
+			.saturating_add((148_986_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
-			
 	}
 	fn seal_transfer(r: u32, ) -> Weight {
-		(107_119_000 as Weight)
-			.saturating_add((5_993_434_000 as Weight).saturating_mul(r as Weight))
+		(92_276_000 as Weight)
+			.saturating_add((6_216_852_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -369,560 +342,473 @@ impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
 	}
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			.saturating_add((10_533_320_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((10_734_719_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
-			
 	}
 	fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight {
-		(9_839_633_000 as Weight)
-			.saturating_add((5_580_035_000 as Weight).saturating_mul(t as Weight))
-			.saturating_add((53_716_000 as Weight).saturating_mul(i as Weight))
-			.saturating_add((73_668_000 as Weight).saturating_mul(o as Weight))
+		(12_735_614_000 as Weight)
+			.saturating_add((2_870_730_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((52_569_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((73_956_000 as Weight).saturating_mul(o as Weight))
 			.saturating_add(T::DbWeight::get().reads(105 as Weight))
 			.saturating_add(T::DbWeight::get().reads((101 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(T::DbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			.saturating_add((21_856_497_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((22_365_908_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes((200 as Weight).saturating_mul(r as Weight)))
 	}
-	fn seal_instantiate_per_input_output_kb(i: u32, o: u32, ) -> Weight {
-		(18_796_671_000 as Weight)
-			.saturating_add((156_269_000 as Weight).saturating_mul(i as Weight))
-			.saturating_add((74_645_000 as Weight).saturating_mul(o as Weight))
+	fn seal_instantiate_per_input_output_salt_kb(i: u32, o: u32, s: u32, ) -> Weight {
+		(18_899_296_000 as Weight)
+			.saturating_add((53_289_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((76_026_000 as Weight).saturating_mul(o as Weight))
+			.saturating_add((281_097_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(207 as Weight))
 			.saturating_add(T::DbWeight::get().writes(202 as Weight))
-			
 	}
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(132_190_000 as Weight)
-			.saturating_add((319_943_000 as Weight).saturating_mul(r as Weight))
+		(136_601_000 as Weight)
+			.saturating_add((323_373_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(747_208_000 as Weight)
-			.saturating_add((421_808_000 as Weight).saturating_mul(n as Weight))
+		(777_563_000 as Weight)
+			.saturating_add((423_353_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(139_235_000 as Weight)
-			.saturating_add((333_792_000 as Weight).saturating_mul(r as Weight))
+		(136_771_000 as Weight)
+			.saturating_add((337_881_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(543_256_000 as Weight)
-			.saturating_add((334_383_000 as Weight).saturating_mul(n as Weight))
+		(337_906_000 as Weight)
+			.saturating_add((336_778_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(142_704_000 as Weight)
-			.saturating_add((305_513_000 as Weight).saturating_mul(r as Weight))
+		(131_040_000 as Weight)
+			.saturating_add((312_992_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(592_813_000 as Weight)
-			.saturating_add((151_270_000 as Weight).saturating_mul(n as Weight))
+		(693_415_000 as Weight)
+			.saturating_add((152_745_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(139_921_000 as Weight)
-			.saturating_add((304_746_000 as Weight).saturating_mul(r as Weight))
+		(135_654_000 as Weight)
+			.saturating_add((311_271_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(544_524_000 as Weight)
-			.saturating_add((151_549_000 as Weight).saturating_mul(n as Weight))
+		(839_521_000 as Weight)
+			.saturating_add((153_146_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(24_652_000 as Weight)
-			.saturating_add((3_306_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_679_000 as Weight)
+			.saturating_add((3_155_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(27_131_000 as Weight)
-			.saturating_add((162_220_000 as Weight).saturating_mul(r as Weight))
-			
+		(28_920_000 as Weight)
+			.saturating_add((159_343_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(27_086_000 as Weight)
-			.saturating_add((230_977_000 as Weight).saturating_mul(r as Weight))
-			
+		(28_928_000 as Weight)
+			.saturating_add((227_286_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(24_656_000 as Weight)
-			.saturating_add((12_570_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_591_000 as Weight)
+			.saturating_add((12_591_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(24_643_000 as Weight)
-			.saturating_add((12_442_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_597_000 as Weight)
+			.saturating_add((12_258_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(24_589_000 as Weight)
-			.saturating_add((6_237_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_586_000 as Weight)
+			.saturating_add((5_811_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(24_650_000 as Weight)
-			.saturating_add((14_393_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_581_000 as Weight)
+			.saturating_add((14_058_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(24_689_000 as Weight)
-			.saturating_add((15_706_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_615_000 as Weight)
+			.saturating_add((15_687_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(40_129_000 as Weight)
-			.saturating_add((83_000 as Weight).saturating_mul(e as Weight))
-			
+		(40_963_000 as Weight)
+			.saturating_add((92_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(24_904_000 as Weight)
-			.saturating_add((96_429_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_880_000 as Weight)
+			.saturating_add((97_523_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(32_540_000 as Weight)
-			.saturating_add((201_773_000 as Weight).saturating_mul(r as Weight))
-			
+		(34_628_000 as Weight)
+			.saturating_add((201_913_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(248_700_000 as Weight)
-			.saturating_add((3_705_000 as Weight).saturating_mul(p as Weight))
-			
+		(255_763_000 as Weight)
+			.saturating_add((3_612_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(42_081_000 as Weight)
-			.saturating_add((3_548_000 as Weight).saturating_mul(r as Weight))
-			
+		(45_954_000 as Weight)
+			.saturating_add((3_439_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(42_128_000 as Weight)
-			.saturating_add((3_678_000 as Weight).saturating_mul(r as Weight))
-			
+		(45_952_000 as Weight)
+			.saturating_add((3_601_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(42_073_000 as Weight)
-			.saturating_add((5_212_000 as Weight).saturating_mul(r as Weight))
-			
+		(45_883_000 as Weight)
+			.saturating_add((5_203_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(28_182_000 as Weight)
-			.saturating_add((8_180_000 as Weight).saturating_mul(r as Weight))
-			
+		(29_895_000 as Weight)
+			.saturating_add((8_221_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(28_060_000 as Weight)
-			.saturating_add((12_081_000 as Weight).saturating_mul(r as Weight))
-			
+		(29_916_000 as Weight)
+			.saturating_add((12_036_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(27_113_000 as Weight)
-			.saturating_add((3_802_000 as Weight).saturating_mul(r as Weight))
-			
+		(28_878_000 as Weight)
+			.saturating_add((3_794_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(25_521_000 as Weight)
-			.saturating_add((2_288_295_000 as Weight).saturating_mul(r as Weight))
-			
+		(27_351_000 as Weight)
+			.saturating_add((2_302_301_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(24_662_000 as Weight)
-			.saturating_add((5_497_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_535_000 as Weight)
+			.saturating_add((5_450_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(24_647_000 as Weight)
-			.saturating_add((5_556_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_489_000 as Weight)
+			.saturating_add((5_410_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(24_646_000 as Weight)
-			.saturating_add((6_138_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_576_000 as Weight)
+			.saturating_add((5_976_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(24_649_000 as Weight)
-			.saturating_add((5_477_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_521_000 as Weight)
+			.saturating_add((5_465_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(24_655_000 as Weight)
-			.saturating_add((5_414_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_534_000 as Weight)
+			.saturating_add((5_375_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(24_619_000 as Weight)
-			.saturating_add((5_434_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_560_000 as Weight)
+			.saturating_add((5_284_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(24_654_000 as Weight)
-			.saturating_add((5_483_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_554_000 as Weight)
+			.saturating_add((5_358_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(24_690_000 as Weight)
-			.saturating_add((7_485_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_549_000 as Weight)
+			.saturating_add((7_402_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(24_652_000 as Weight)
-			.saturating_add((7_468_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_582_000 as Weight)
+			.saturating_add((7_266_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(24_667_000 as Weight)
-			.saturating_add((7_426_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_558_000 as Weight)
+			.saturating_add((7_293_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(24_693_000 as Weight)
-			.saturating_add((7_393_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_569_000 as Weight)
+			.saturating_add((7_278_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(24_675_000 as Weight)
-			.saturating_add((7_407_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_516_000 as Weight)
+			.saturating_add((7_334_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(24_697_000 as Weight)
-			.saturating_add((7_392_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_561_000 as Weight)
+			.saturating_add((7_283_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(24_646_000 as Weight)
-			.saturating_add((7_420_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_589_000 as Weight)
+			.saturating_add((7_244_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(24_683_000 as Weight)
-			.saturating_add((7_404_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_593_000 as Weight)
+			.saturating_add((7_318_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(24_685_000 as Weight)
-			.saturating_add((7_461_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_626_000 as Weight)
+			.saturating_add((7_348_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(25_147_000 as Weight)
-			.saturating_add((7_003_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_595_000 as Weight)
+			.saturating_add((7_330_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(24_705_000 as Weight)
-			.saturating_add((7_483_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_568_000 as Weight)
+			.saturating_add((8_657_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(24_675_000 as Weight)
-			.saturating_add((7_377_000 as Weight).saturating_mul(r as Weight))
-			
+		(27_393_000 as Weight)
+			.saturating_add((6_743_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(24_680_000 as Weight)
-			.saturating_add((7_376_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_571_000 as Weight)
+			.saturating_add((7_329_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(24_660_000 as Weight)
-			.saturating_add((13_091_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_585_000 as Weight)
+			.saturating_add((12_977_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(24_643_000 as Weight)
-			.saturating_add((12_109_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_554_000 as Weight)
+			.saturating_add((11_955_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(24_615_000 as Weight)
-			.saturating_add((13_049_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_570_000 as Weight)
+			.saturating_add((12_903_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(24_696_000 as Weight)
-			.saturating_add((12_039_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_561_000 as Weight)
+			.saturating_add((12_112_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(24_683_000 as Weight)
-			.saturating_add((7_314_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_587_000 as Weight)
+			.saturating_add((7_411_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(24_657_000 as Weight)
-			.saturating_add((7_401_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_588_000 as Weight)
+			.saturating_add((7_479_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(24_661_000 as Weight)
-			.saturating_add((7_347_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_541_000 as Weight)
+			.saturating_add((7_386_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(24_644_000 as Weight)
-			.saturating_add((7_389_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_562_000 as Weight)
+			.saturating_add((7_263_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(24_643_000 as Weight)
-			.saturating_add((7_416_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_569_000 as Weight)
+			.saturating_add((7_353_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(24_634_000 as Weight)
-			.saturating_add((7_392_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_533_000 as Weight)
+			.saturating_add((7_342_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(24_618_000 as Weight)
-			.saturating_add((7_452_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_545_000 as Weight)
+			.saturating_add((7_362_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(24_618_000 as Weight)
-			.saturating_add((7_447_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_535_000 as Weight)
+			.saturating_add((7_330_000 as Weight).saturating_mul(r as Weight))
 	}
-	
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn update_schedule() -> Weight {
-		(33_160_000 as Weight)
+		(35_214_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn put_code(n: u32, ) -> Weight {
-		(5_975_000 as Weight)
-			.saturating_add((108_953_000 as Weight).saturating_mul(n as Weight))
+		(0 as Weight)
+			.saturating_add((109_242_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
-	fn instantiate(n: u32, ) -> Weight {
-		(218_223_000 as Weight)
-			.saturating_add((1_007_000 as Weight).saturating_mul(n as Weight))
+	fn instantiate(n: u32, s: u32, ) -> Weight {
+		(195_276_000 as Weight)
+			.saturating_add((35_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((2_244_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
-			
 	}
 	fn call() -> Weight {
-		(201_492_000 as Weight)
+		(207_142_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
 	fn claim_surcharge() -> Weight {
-		(449_203_000 as Weight)
+		(489_633_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
 	fn seal_caller(r: u32, ) -> Weight {
-		(136_650_000 as Weight)
-			.saturating_add((364_640_000 as Weight).saturating_mul(r as Weight))
+		(136_550_000 as Weight)
+			.saturating_add((373_182_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_address(r: u32, ) -> Weight {
-		(144_167_000 as Weight)
-			.saturating_add((365_328_000 as Weight).saturating_mul(r as Weight))
+		(136_329_000 as Weight)
+			.saturating_add((373_392_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(138_458_000 as Weight)
-			.saturating_add((361_076_000 as Weight).saturating_mul(r as Weight))
+		(111_577_000 as Weight)
+			.saturating_add((373_536_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_balance(r: u32, ) -> Weight {
-		(147_909_000 as Weight)
-			.saturating_add((792_169_000 as Weight).saturating_mul(r as Weight))
+		(157_531_000 as Weight)
+			.saturating_add((810_382_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
-			
 	}
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(148_524_000 as Weight)
-			.saturating_add((361_842_000 as Weight).saturating_mul(r as Weight))
+		(143_801_000 as Weight)
+			.saturating_add((369_769_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(139_795_000 as Weight)
-			.saturating_add((366_013_000 as Weight).saturating_mul(r as Weight))
+		(133_546_000 as Weight)
+			.saturating_add((370_036_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(140_557_000 as Weight)
-			.saturating_add((362_687_000 as Weight).saturating_mul(r as Weight))
+		(138_568_000 as Weight)
+			.saturating_add((370_322_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(152_989_000 as Weight)
-			.saturating_add((836_876_000 as Weight).saturating_mul(r as Weight))
+		(144_431_000 as Weight)
+			.saturating_add((851_810_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_block_number(r: u32, ) -> Weight {
-		(140_228_000 as Weight)
-			.saturating_add((360_561_000 as Weight).saturating_mul(r as Weight))
+		(133_237_000 as Weight)
+			.saturating_add((369_156_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_now(r: u32, ) -> Weight {
-		(148_776_000 as Weight)
-			.saturating_add((361_712_000 as Weight).saturating_mul(r as Weight))
+		(139_700_000 as Weight)
+			.saturating_add((368_961_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(126_903_000 as Weight)
-			.saturating_add((603_100_000 as Weight).saturating_mul(r as Weight))
+		(149_395_000 as Weight)
+			.saturating_add((625_812_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
-			
 	}
 	fn seal_gas(r: u32, ) -> Weight {
-		(125_712_000 as Weight)
-			.saturating_add((184_450_000 as Weight).saturating_mul(r as Weight))
+		(125_777_000 as Weight)
+			.saturating_add((187_585_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_input(r: u32, ) -> Weight {
-		(136_175_000 as Weight)
-			.saturating_add((7_489_000 as Weight).saturating_mul(r as Weight))
+		(132_584_000 as Weight)
+			.saturating_add((7_661_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(145_434_000 as Weight)
-			.saturating_add((276_000 as Weight).saturating_mul(n as Weight))
+		(143_408_000 as Weight)
+			.saturating_add((274_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_return(r: u32, ) -> Weight {
-		(124_788_000 as Weight)
-			.saturating_add((5_696_000 as Weight).saturating_mul(r as Weight))
+		(126_257_000 as Weight)
+			.saturating_add((5_455_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(133_483_000 as Weight)
-			.saturating_add((675_000 as Weight).saturating_mul(n as Weight))
+		(133_286_000 as Weight)
+			.saturating_add((698_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_terminate(r: u32, ) -> Weight {
-		(135_387_000 as Weight)
-			.saturating_add((338_395_000 as Weight).saturating_mul(r as Weight))
+		(130_607_000 as Weight)
+			.saturating_add((358_370_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_restore_to(r: u32, ) -> Weight {
-		(227_617_000 as Weight)
-			.saturating_add((132_493_000 as Weight).saturating_mul(r as Weight))
+		(233_645_000 as Weight)
+			.saturating_add((135_355_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_restore_to_per_delta(d: u32, ) -> Weight {
-		(15_263_000 as Weight)
-			.saturating_add((3_732_219_000 as Weight).saturating_mul(d as Weight))
+		(74_573_000 as Weight)
+			.saturating_add((3_768_682_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
 	}
 	fn seal_random(r: u32, ) -> Weight {
-		(236_391_000 as Weight)
-			.saturating_add((913_452_000 as Weight).saturating_mul(r as Weight))
+		(140_286_000 as Weight)
+			.saturating_add((950_890_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
-			
 	}
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(140_845_000 as Weight)
-			.saturating_add((1_322_796_000 as Weight).saturating_mul(r as Weight))
+		(167_735_000 as Weight)
+			.saturating_add((1_375_429_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_651_556_000 as Weight)
-			.saturating_add((737_421_000 as Weight).saturating_mul(t as Weight))
-			.saturating_add((244_183_000 as Weight).saturating_mul(n as Weight))
+		(1_715_857_000 as Weight)
+			.saturating_add((760_777_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((241_853_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(151_091_000 as Weight)
-			.saturating_add((983_375_000 as Weight).saturating_mul(r as Weight))
+		(156_911_000 as Weight)
+			.saturating_add((1_006_139_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(460_478_000 as Weight)
-			.saturating_add((14_824_033_000 as Weight).saturating_mul(r as Weight))
+		(0 as Weight)
+			.saturating_add((14_938_793_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(2_255_458_000 as Weight)
-			.saturating_add((204_470_000 as Weight).saturating_mul(n as Weight))
+		(2_300_169_000 as Weight)
+			.saturating_add((204_543_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
 	fn seal_clear_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			.saturating_add((5_052_125_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((5_140_241_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_get_storage(r: u32, ) -> Weight {
-		(95_473_000 as Weight)
-			.saturating_add((1_044_784_000 as Weight).saturating_mul(r as Weight))
+		(45_212_000 as Weight)
+			.saturating_add((1_131_504_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
-			
 	}
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(860_080_000 as Weight)
-			.saturating_add((146_913_000 as Weight).saturating_mul(n as Weight))
+		(885_531_000 as Weight)
+			.saturating_add((148_986_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
-			
 	}
 	fn seal_transfer(r: u32, ) -> Weight {
-		(107_119_000 as Weight)
-			.saturating_add((5_993_434_000 as Weight).saturating_mul(r as Weight))
+		(92_276_000 as Weight)
+			.saturating_add((6_216_852_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
@@ -930,338 +816,277 @@ impl WeightInfo for () {
 	}
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			.saturating_add((10_533_320_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((10_734_719_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
-			
 	}
 	fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight {
-		(9_839_633_000 as Weight)
-			.saturating_add((5_580_035_000 as Weight).saturating_mul(t as Weight))
-			.saturating_add((53_716_000 as Weight).saturating_mul(i as Weight))
-			.saturating_add((73_668_000 as Weight).saturating_mul(o as Weight))
+		(12_735_614_000 as Weight)
+			.saturating_add((2_870_730_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((52_569_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((73_956_000 as Weight).saturating_mul(o as Weight))
 			.saturating_add(RocksDbWeight::get().reads(105 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((101 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			.saturating_add((21_856_497_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((22_365_908_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((200 as Weight).saturating_mul(r as Weight)))
 	}
-	fn seal_instantiate_per_input_output_kb(i: u32, o: u32, ) -> Weight {
-		(18_796_671_000 as Weight)
-			.saturating_add((156_269_000 as Weight).saturating_mul(i as Weight))
-			.saturating_add((74_645_000 as Weight).saturating_mul(o as Weight))
+	fn seal_instantiate_per_input_output_salt_kb(i: u32, o: u32, s: u32, ) -> Weight {
+		(18_899_296_000 as Weight)
+			.saturating_add((53_289_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((76_026_000 as Weight).saturating_mul(o as Weight))
+			.saturating_add((281_097_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(207 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(202 as Weight))
-			
 	}
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(132_190_000 as Weight)
-			.saturating_add((319_943_000 as Weight).saturating_mul(r as Weight))
+		(136_601_000 as Weight)
+			.saturating_add((323_373_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(747_208_000 as Weight)
-			.saturating_add((421_808_000 as Weight).saturating_mul(n as Weight))
+		(777_563_000 as Weight)
+			.saturating_add((423_353_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(139_235_000 as Weight)
-			.saturating_add((333_792_000 as Weight).saturating_mul(r as Weight))
+		(136_771_000 as Weight)
+			.saturating_add((337_881_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(543_256_000 as Weight)
-			.saturating_add((334_383_000 as Weight).saturating_mul(n as Weight))
+		(337_906_000 as Weight)
+			.saturating_add((336_778_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(142_704_000 as Weight)
-			.saturating_add((305_513_000 as Weight).saturating_mul(r as Weight))
+		(131_040_000 as Weight)
+			.saturating_add((312_992_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(592_813_000 as Weight)
-			.saturating_add((151_270_000 as Weight).saturating_mul(n as Weight))
+		(693_415_000 as Weight)
+			.saturating_add((152_745_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(139_921_000 as Weight)
-			.saturating_add((304_746_000 as Weight).saturating_mul(r as Weight))
+		(135_654_000 as Weight)
+			.saturating_add((311_271_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			
 	}
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(544_524_000 as Weight)
-			.saturating_add((151_549_000 as Weight).saturating_mul(n as Weight))
+		(839_521_000 as Weight)
+			.saturating_add((153_146_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(24_652_000 as Weight)
-			.saturating_add((3_306_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_679_000 as Weight)
+			.saturating_add((3_155_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(27_131_000 as Weight)
-			.saturating_add((162_220_000 as Weight).saturating_mul(r as Weight))
-			
+		(28_920_000 as Weight)
+			.saturating_add((159_343_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(27_086_000 as Weight)
-			.saturating_add((230_977_000 as Weight).saturating_mul(r as Weight))
-			
+		(28_928_000 as Weight)
+			.saturating_add((227_286_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(24_656_000 as Weight)
-			.saturating_add((12_570_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_591_000 as Weight)
+			.saturating_add((12_591_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(24_643_000 as Weight)
-			.saturating_add((12_442_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_597_000 as Weight)
+			.saturating_add((12_258_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(24_589_000 as Weight)
-			.saturating_add((6_237_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_586_000 as Weight)
+			.saturating_add((5_811_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(24_650_000 as Weight)
-			.saturating_add((14_393_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_581_000 as Weight)
+			.saturating_add((14_058_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(24_689_000 as Weight)
-			.saturating_add((15_706_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_615_000 as Weight)
+			.saturating_add((15_687_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(40_129_000 as Weight)
-			.saturating_add((83_000 as Weight).saturating_mul(e as Weight))
-			
+		(40_963_000 as Weight)
+			.saturating_add((92_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(24_904_000 as Weight)
-			.saturating_add((96_429_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_880_000 as Weight)
+			.saturating_add((97_523_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(32_540_000 as Weight)
-			.saturating_add((201_773_000 as Weight).saturating_mul(r as Weight))
-			
+		(34_628_000 as Weight)
+			.saturating_add((201_913_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(248_700_000 as Weight)
-			.saturating_add((3_705_000 as Weight).saturating_mul(p as Weight))
-			
+		(255_763_000 as Weight)
+			.saturating_add((3_612_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(42_081_000 as Weight)
-			.saturating_add((3_548_000 as Weight).saturating_mul(r as Weight))
-			
+		(45_954_000 as Weight)
+			.saturating_add((3_439_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(42_128_000 as Weight)
-			.saturating_add((3_678_000 as Weight).saturating_mul(r as Weight))
-			
+		(45_952_000 as Weight)
+			.saturating_add((3_601_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(42_073_000 as Weight)
-			.saturating_add((5_212_000 as Weight).saturating_mul(r as Weight))
-			
+		(45_883_000 as Weight)
+			.saturating_add((5_203_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(28_182_000 as Weight)
-			.saturating_add((8_180_000 as Weight).saturating_mul(r as Weight))
-			
+		(29_895_000 as Weight)
+			.saturating_add((8_221_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(28_060_000 as Weight)
-			.saturating_add((12_081_000 as Weight).saturating_mul(r as Weight))
-			
+		(29_916_000 as Weight)
+			.saturating_add((12_036_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(27_113_000 as Weight)
-			.saturating_add((3_802_000 as Weight).saturating_mul(r as Weight))
-			
+		(28_878_000 as Weight)
+			.saturating_add((3_794_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(25_521_000 as Weight)
-			.saturating_add((2_288_295_000 as Weight).saturating_mul(r as Weight))
-			
+		(27_351_000 as Weight)
+			.saturating_add((2_302_301_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(24_662_000 as Weight)
-			.saturating_add((5_497_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_535_000 as Weight)
+			.saturating_add((5_450_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(24_647_000 as Weight)
-			.saturating_add((5_556_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_489_000 as Weight)
+			.saturating_add((5_410_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(24_646_000 as Weight)
-			.saturating_add((6_138_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_576_000 as Weight)
+			.saturating_add((5_976_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(24_649_000 as Weight)
-			.saturating_add((5_477_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_521_000 as Weight)
+			.saturating_add((5_465_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(24_655_000 as Weight)
-			.saturating_add((5_414_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_534_000 as Weight)
+			.saturating_add((5_375_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(24_619_000 as Weight)
-			.saturating_add((5_434_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_560_000 as Weight)
+			.saturating_add((5_284_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(24_654_000 as Weight)
-			.saturating_add((5_483_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_554_000 as Weight)
+			.saturating_add((5_358_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(24_690_000 as Weight)
-			.saturating_add((7_485_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_549_000 as Weight)
+			.saturating_add((7_402_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(24_652_000 as Weight)
-			.saturating_add((7_468_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_582_000 as Weight)
+			.saturating_add((7_266_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(24_667_000 as Weight)
-			.saturating_add((7_426_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_558_000 as Weight)
+			.saturating_add((7_293_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(24_693_000 as Weight)
-			.saturating_add((7_393_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_569_000 as Weight)
+			.saturating_add((7_278_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(24_675_000 as Weight)
-			.saturating_add((7_407_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_516_000 as Weight)
+			.saturating_add((7_334_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(24_697_000 as Weight)
-			.saturating_add((7_392_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_561_000 as Weight)
+			.saturating_add((7_283_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(24_646_000 as Weight)
-			.saturating_add((7_420_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_589_000 as Weight)
+			.saturating_add((7_244_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(24_683_000 as Weight)
-			.saturating_add((7_404_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_593_000 as Weight)
+			.saturating_add((7_318_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(24_685_000 as Weight)
-			.saturating_add((7_461_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_626_000 as Weight)
+			.saturating_add((7_348_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(25_147_000 as Weight)
-			.saturating_add((7_003_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_595_000 as Weight)
+			.saturating_add((7_330_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(24_705_000 as Weight)
-			.saturating_add((7_483_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_568_000 as Weight)
+			.saturating_add((8_657_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(24_675_000 as Weight)
-			.saturating_add((7_377_000 as Weight).saturating_mul(r as Weight))
-			
+		(27_393_000 as Weight)
+			.saturating_add((6_743_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(24_680_000 as Weight)
-			.saturating_add((7_376_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_571_000 as Weight)
+			.saturating_add((7_329_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(24_660_000 as Weight)
-			.saturating_add((13_091_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_585_000 as Weight)
+			.saturating_add((12_977_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(24_643_000 as Weight)
-			.saturating_add((12_109_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_554_000 as Weight)
+			.saturating_add((11_955_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(24_615_000 as Weight)
-			.saturating_add((13_049_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_570_000 as Weight)
+			.saturating_add((12_903_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(24_696_000 as Weight)
-			.saturating_add((12_039_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_561_000 as Weight)
+			.saturating_add((12_112_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(24_683_000 as Weight)
-			.saturating_add((7_314_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_587_000 as Weight)
+			.saturating_add((7_411_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(24_657_000 as Weight)
-			.saturating_add((7_401_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_588_000 as Weight)
+			.saturating_add((7_479_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(24_661_000 as Weight)
-			.saturating_add((7_347_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_541_000 as Weight)
+			.saturating_add((7_386_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(24_644_000 as Weight)
-			.saturating_add((7_389_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_562_000 as Weight)
+			.saturating_add((7_263_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(24_643_000 as Weight)
-			.saturating_add((7_416_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_569_000 as Weight)
+			.saturating_add((7_353_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(24_634_000 as Weight)
-			.saturating_add((7_392_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_533_000 as Weight)
+			.saturating_add((7_342_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(24_618_000 as Weight)
-			.saturating_add((7_452_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_545_000 as Weight)
+			.saturating_add((7_362_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(24_618_000 as Weight)
-			.saturating_add((7_447_000 as Weight).saturating_mul(r as Weight))
-			
+		(26_535_000 as Weight)
+			.saturating_add((7_330_000 as Weight).saturating_mul(r as Weight))
 	}
-	
 }

From 24809aad065365506fd6e279c926c0497034576d Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Tue, 24 Nov 2020 19:56:21 +0100
Subject: [PATCH 0102/1194] */Cargo.toml: Remove unused dependencies (#7590)

* */Cargo.toml: Remove unused dependencies

Using cargo-udeps to detect unused dependencies.

* client/network/Cargo: Revert dependency removal

* Cargo.lock: Update
---
 Cargo.lock                            | 8 --------
 client/api/Cargo.toml                 | 3 ---
 client/authority-discovery/Cargo.toml | 2 --
 primitives/blockchain/Cargo.toml      | 1 -
 primitives/panic-handler/Cargo.toml   | 1 -
 primitives/runtime/Cargo.toml         | 2 --
 6 files changed, 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 710e3519d955..827bf3b99850 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6377,7 +6377,6 @@ name = "sc-authority-discovery"
 version = "0.8.0"
 dependencies = [
  "async-trait",
- "bytes 0.5.6",
  "derive_more",
  "either",
  "futures 0.3.8",
@@ -6390,7 +6389,6 @@ dependencies = [
  "quickcheck",
  "rand 0.7.3",
  "sc-client-api",
- "sc-keystore",
  "sc-network",
  "sc-peerset",
  "serde_json",
@@ -6541,7 +6539,6 @@ dependencies = [
  "fnv",
  "futures 0.3.8",
  "hash-db",
- "hex-literal",
  "kvdb",
  "kvdb-memorydb",
  "lazy_static",
@@ -6549,7 +6546,6 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.10.2",
  "sc-executor",
- "sc-telemetry",
  "sp-api",
  "sp-blockchain",
  "sp-consensus",
@@ -6557,7 +6553,6 @@ dependencies = [
  "sp-database",
  "sp-externalities",
  "sp-inherents",
- "sp-keyring",
  "sp-keystore",
  "sp-runtime",
  "sp-state-machine",
@@ -8110,7 +8105,6 @@ dependencies = [
  "lru 0.6.1",
  "parity-scale-codec",
  "parking_lot 0.10.2",
- "sp-block-builder",
  "sp-consensus",
  "sp-database",
  "sp-runtime",
@@ -8418,7 +8412,6 @@ name = "sp-panic-handler"
 version = "2.0.0"
 dependencies = [
  "backtrace",
- "log",
 ]
 
 [[package]]
@@ -8447,7 +8440,6 @@ dependencies = [
  "sp-application-crypto",
  "sp-arithmetic",
  "sp-core",
- "sp-inherents",
  "sp-io",
  "sp-state-machine",
  "sp-std",
diff --git a/client/api/Cargo.toml b/client/api/Cargo.toml
index d0fb5fc3ee0e..7d770912f271 100644
--- a/client/api/Cargo.toml
+++ b/client/api/Cargo.toml
@@ -23,9 +23,7 @@ fnv = "1.0.6"
 futures = "0.3.1"
 hash-db = { version = "0.15.2", default-features = false }
 sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
-hex-literal = "0.3.1"
 sp-inherents = { version = "2.0.0", default-features = false, path = "../../primitives/inherents" }
-sp-keyring = { version = "2.0.0", path = "../../primitives/keyring" }
 kvdb = "0.7.0"
 log = "0.4.8"
 parking_lot = "0.10.0"
@@ -39,7 +37,6 @@ sp-api = { version = "2.0.0", path = "../../primitives/api" }
 sp-utils = { version = "2.0.0", path = "../../primitives/utils" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
 sp-state-machine = { version = "0.8.0", path = "../../primitives/state-machine" }
-sc-telemetry = { version = "2.0.0", path = "../telemetry" }
 sp-trie = { version = "2.0.0", path = "../../primitives/trie" }
 sp-storage = { version = "2.0.0", path = "../../primitives/storage" }
 sp-transaction-pool = { version = "2.0.0", path = "../../primitives/transaction-pool" }
diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml
index 40b929fc8a0f..fc948de53eb3 100644
--- a/client/authority-discovery/Cargo.toml
+++ b/client/authority-discovery/Cargo.toml
@@ -18,7 +18,6 @@ prost-build = "0.6.1"
 
 [dependencies]
 async-trait = "0.1"
-bytes = "0.5.0"
 codec = { package = "parity-scale-codec", default-features = false, version = "1.3.4" }
 derive_more = "0.99.2"
 either = "1.5.3"
@@ -30,7 +29,6 @@ prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../..
 prost = "0.6.1"
 rand = "0.7.2"
 sc-client-api = { version = "2.0.0", path = "../api" }
-sc-keystore = { version = "2.0.0", path = "../keystore" }
 sc-network = { version = "0.8.0", path = "../network" }
 serde_json = "1.0.41"
 sp-authority-discovery = { version = "2.0.0", path = "../../primitives/authority-discovery" }
diff --git a/primitives/blockchain/Cargo.toml b/primitives/blockchain/Cargo.toml
index 7b7c0f3446ea..eac1e032e3e9 100644
--- a/primitives/blockchain/Cargo.toml
+++ b/primitives/blockchain/Cargo.toml
@@ -21,6 +21,5 @@ thiserror = "1.0.21"
 codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
 sp-consensus = { version = "0.8.0", path = "../consensus/common" }
 sp-runtime = { version = "2.0.0", path = "../runtime" }
-sp-block-builder = { version = "2.0.0", path = "../block-builder" }
 sp-state-machine = { version = "0.8.0", path = "../state-machine" }
 sp-database = { version = "2.0.0", path = "../database" }
diff --git a/primitives/panic-handler/Cargo.toml b/primitives/panic-handler/Cargo.toml
index acf454b960a7..0baba8ee7aba 100644
--- a/primitives/panic-handler/Cargo.toml
+++ b/primitives/panic-handler/Cargo.toml
@@ -15,4 +15,3 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 backtrace = "0.3.38"
-log = "0.4.8"
diff --git a/primitives/runtime/Cargo.toml b/primitives/runtime/Cargo.toml
index 6579a17c77fe..9c3286cd4750 100644
--- a/primitives/runtime/Cargo.toml
+++ b/primitives/runtime/Cargo.toml
@@ -26,7 +26,6 @@ log = { version = "0.4.8", optional = true }
 paste = "0.1.6"
 rand = { version = "0.7.2", optional = true }
 impl-trait-for-tuples = "0.1.3"
-sp-inherents = { version = "2.0.0", default-features = false, path = "../inherents" }
 parity-util-mem = { version = "0.7.0", default-features = false, features = ["primitive-types"] }
 hash256-std-hasher = { version = "0.15.2", default-features = false }
 either = { version = "1.5", default-features = false }
@@ -50,7 +49,6 @@ std = [
 	"sp-std/std",
 	"sp-io/std",
 	"serde",
-	"sp-inherents/std",
 	"parity-util-mem/std",
 	"hash256-std-hasher/std",
 	"either/use_std",

From 94d27efce02b454f0ee22f33f1204f39439a021b Mon Sep 17 00:00:00 2001
From: Denis Pisarev <denis.pisarev@parity.io>
Date: Wed, 25 Nov 2020 09:48:10 +0100
Subject: [PATCH 0103/1194] CI: build docs after test; publish docs after build
 (#7591)

docs time test/build success on master pub
---
 .gitlab-ci.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b37d60a941d4..215157061bb0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -471,7 +471,9 @@ build-rust-doc:
   stage:                           build
   <<:                              *docker-env
   <<:                              *test-refs
-  allow_failure:                   true
+  needs:
+    - job:                         test-linux-stable
+      artifacts:                   false
   variables:
     <<:                            *default-vars
     RUSTFLAGS:                     -Dwarnings
@@ -677,6 +679,8 @@ publish-s3-doc:
   needs:
     - job:                         build-rust-doc
       artifacts:                   true
+    - job:                         build-linux-substrate
+      artifacts:                   false
   <<:                              *build-refs
   <<:                              *kubernetes-build
   variables:

From 45a0ea7e7b7c374642e3249324de11c56dbf2c1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Wed, 25 Nov 2020 08:50:13 +0000
Subject: [PATCH 0104/1194] node-template: add aura to light block import
 pipeline (#7595)

added aura to block import pipeline
---
 bin/node-template/node/src/service.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
index 83481f8c1521..e32ba740504b 100644
--- a/bin/node-template/node/src/service.rs
+++ b/bin/node-template/node/src/service.rs
@@ -239,9 +239,14 @@ pub fn new_light(config: Configuration) -> Result<TaskManager, ServiceError> {
 		select_chain.clone(),
 	)?;
 
+	let aura_block_import = sc_consensus_aura::AuraBlockImport::<_, _, _, AuraPair>::new(
+		grandpa_block_import.clone(),
+		client.clone(),
+	);
+
 	let import_queue = sc_consensus_aura::import_queue::<_, _, _, AuraPair, _, _>(
 		sc_consensus_aura::slot_duration(&*client)?,
-		grandpa_block_import.clone(),
+		aura_block_import,
 		Some(Box::new(grandpa_block_import)),
 		client.clone(),
 		InherentDataProviders::new(),

From bce646d0ed5e177a7c5862e061395d7bc1666384 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Wed, 25 Nov 2020 10:15:37 +0100
Subject: [PATCH 0105/1194] Fix notifications sometimes not being sent (#7594)

* Fix notifications sometimes not being sent

* Add comment
---
 client/network/src/protocol/generic_proto/handler.rs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/client/network/src/protocol/generic_proto/handler.rs b/client/network/src/protocol/generic_proto/handler.rs
index c8a76c1cc9a4..42cf02f1b77d 100644
--- a/client/network/src/protocol/generic_proto/handler.rs
+++ b/client/network/src/protocol/generic_proto/handler.rs
@@ -971,6 +971,16 @@ impl ProtocolsHandler for NotifsHandler {
 						if let Some(pos) = self.out_protocols.iter().position(|(n, _)| *n == protocol_name) {
 							if let Some(substream) = out_substreams[pos].as_mut() {
 								let _ = substream.start_send_unpin(message);
+								// Calling `start_send_unpin` only queues the message. Actually
+								// emitting the message is done with `poll_flush`. In order to
+								// not introduce too much complexity, this flushing is done earlier
+								// in the body of this `poll()` method. As such, we schedule a task
+								// wake-up now in order to guarantee that `poll()` will be called
+								// again and the flush happening.
+								// At the time of the writing of this comment, a rewrite of this
+								// code is being planned. If you find this comment in the wild and
+								// the rewrite didn't happen, please consider a refactor.
+								cx.waker().wake_by_ref();
 								continue 'poll_notifs_sink;
 							}
 

From 1ec8a7f57ba5faac74c09296eab9977fb331c386 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 25 Nov 2020 10:59:13 +0100
Subject: [PATCH 0106/1194] Bump rpassword from 4.0.5 to 5.0.0 (#7597)

Bumps [rpassword](https://github.com/conradkleinespel/rpassword) from 4.0.5 to 5.0.0.
- [Release notes](https://github.com/conradkleinespel/rpassword/releases)
- [Commits](https://github.com/conradkleinespel/rpassword/compare/v4.0.5...v5.0.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock            | 4 ++--
 client/cli/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 827bf3b99850..8d44eec2623d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6250,9 +6250,9 @@ dependencies = [
 
 [[package]]
 name = "rpassword"
-version = "4.0.5"
+version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99371657d3c8e4d816fb6221db98fa408242b0b53bac08f8676a41f8554fe99f"
+checksum = "d755237fc0f99d98641540e66abac8bc46a0652f19148ac9e21de2da06b326c9"
 dependencies = [
  "libc",
  "winapi 0.3.9",
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index 900dddf87018..651b0a7286b6 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -52,7 +52,7 @@ sc-cli-proc-macro = { version = "2.0.0", path = "./proc-macro" }
 thiserror = "1.0.21"
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
-rpassword = "4.0.1"
+rpassword = "5.0.0"
 
 [dev-dependencies]
 tempfile = "3.1.0"

From fee109326e092879b981232fac5eba0b6fdb7287 Mon Sep 17 00:00:00 2001
From: Alexander Popiak <alexander.popiak@parity.io>
Date: Wed, 25 Nov 2020 23:48:47 +0100
Subject: [PATCH 0107/1194] remove std feature flags for assert macros (#7600)

* remove std feature flags for assert macros

* re-add note about availability in no_std envs
---
 frame/support/src/lib.rs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 5dd452dbbe7b..3c191ed6ae45 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -102,9 +102,8 @@ pub enum Never {}
 ///
 /// - Using `static` to create a static parameter type. Its value is
 ///   being provided by a static variable with the equivalent name in `UPPER_SNAKE_CASE`. An
-///   additional `set` function is provided in this case to alter the static variable. 
-///
-/// **This is intended for testing ONLY and is ONLY available when `std` is enabled**
+///   additional `set` function is provided in this case to alter the static variable.
+///   **This is intended for testing ONLY and is ONLY available when `std` is enabled.**
 ///
 /// # Examples
 ///
@@ -488,7 +487,6 @@ macro_rules! ensure {
 ///
 /// Used as `assert_noop(expression_to_assert, expected_error_expression)`.
 #[macro_export]
-#[cfg(feature = "std")]
 macro_rules! assert_noop {
 	(
 		$x:expr,
@@ -504,7 +502,6 @@ macro_rules! assert_noop {
 ///
 /// Used as `assert_err!(expression_to_assert, expected_error_expression)`
 #[macro_export]
-#[cfg(feature = "std")]
 macro_rules! assert_err {
 	( $x:expr , $y:expr $(,)? ) => {
 		assert_eq!($x, Err($y.into()));
@@ -516,7 +513,6 @@ macro_rules! assert_err {
 /// This can be used on`DispatchResultWithPostInfo` when the post info should
 /// be ignored.
 #[macro_export]
-#[cfg(feature = "std")]
 macro_rules! assert_err_ignore_postinfo {
 	( $x:expr , $y:expr $(,)? ) => {
 		$crate::assert_err!($x.map(|_| ()).map_err(|e| e.error), $y);
@@ -525,7 +521,6 @@ macro_rules! assert_err_ignore_postinfo {
 
 /// Assert an expression returns error with the given weight.
 #[macro_export]
-#[cfg(feature = "std")]
 macro_rules! assert_err_with_weight {
 	($call:expr, $err:expr, $weight:expr $(,)? ) => {
 		if let Err(dispatch_err_with_post) = $call {
@@ -542,7 +537,6 @@ macro_rules! assert_err_with_weight {
 /// Used as `assert_ok!(expression_to_assert, expected_ok_expression)`,
 /// or `assert_ok!(expression_to_assert)` which would assert against `Ok(())`.
 #[macro_export]
-#[cfg(feature = "std")]
 macro_rules! assert_ok {
 	( $x:expr $(,)? ) => {
 		let is = $x;

From cff25fbc37c9fc564f8816eefdcd8dce15e1606b Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Thu, 26 Nov 2020 00:07:51 +0100
Subject: [PATCH 0108/1194] Add small header cache (#7516)

* Remove header query

* Header cache

* Fix potential race issue

* Simplify status query
---
 client/db/src/lib.rs                 | 59 ++++++++++++++++++++--------
 client/service/src/client/client.rs  |  4 +-
 primitives/blockchain/src/backend.rs |  2 +-
 3 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index 8196a750557a..983459cfebe3 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -49,6 +49,9 @@ use std::sync::Arc;
 use std::path::{Path, PathBuf};
 use std::io;
 use std::collections::{HashMap, HashSet};
+use parking_lot::{Mutex, RwLock};
+use linked_hash_map::LinkedHashMap;
+use log::{trace, debug, warn};
 
 use sc_client_api::{
 	UsageInfo, MemoryInfo, IoInfo, MemorySize,
@@ -63,7 +66,6 @@ use codec::{Decode, Encode};
 use hash_db::Prefix;
 use sp_trie::{MemoryDB, PrefixedMemoryDB, prefixed_key};
 use sp_database::Transaction;
-use parking_lot::RwLock;
 use sp_core::ChangesTrieConfiguration;
 use sp_core::offchain::storage::{OffchainOverlayedChange, OffchainOverlayedChanges};
 use sp_core::storage::{well_known_keys, ChildInfo};
@@ -83,7 +85,6 @@ use sc_state_db::StateDb;
 use sp_blockchain::{CachedHeaderMetadata, HeaderMetadata, HeaderMetadataCache};
 use crate::storage_cache::{CachingState, SyncingCachingState, SharedCache, new_shared_cache};
 use crate::stats::StateUsageStats;
-use log::{trace, debug, warn};
 
 // Re-export the Database trait so that one can pass an implementation of it.
 pub use sp_database::Database;
@@ -93,6 +94,7 @@ pub use sc_state_db::PruningMode;
 pub use bench::BenchmarkingState;
 
 const MIN_BLOCKS_TO_KEEP_CHANGES_TRIES_FOR: u32 = 32768;
+const CACHE_HEADERS: usize = 8;
 
 /// Default value for storage cache child ratio.
 const DEFAULT_CHILD_RATIO: (usize, usize) = (1, 10);
@@ -352,12 +354,24 @@ impl<'a> sc_state_db::MetaDb for StateMetaDb<'a> {
 	}
 }
 
+fn cache_header<Hash: std::cmp::Eq + std::hash::Hash, Header>(
+	cache: &mut LinkedHashMap<Hash, Option<Header>>,
+	hash: Hash,
+	header: Option<Header>,
+) {
+	cache.insert(hash, header);
+	while cache.len() > CACHE_HEADERS {
+		cache.pop_front();
+	}
+}
+
 /// Block database
 pub struct BlockchainDb<Block: BlockT> {
 	db: Arc<dyn Database<DbHash>>,
 	meta: Arc<RwLock<Meta<NumberFor<Block>, Block::Hash>>>,
 	leaves: RwLock<LeafSet<Block::Hash, NumberFor<Block>>>,
 	header_metadata_cache: Arc<HeaderMetadataCache<Block>>,
+	header_cache: Mutex<LinkedHashMap<Block::Hash, Option<Block::Header>>>,
 }
 
 impl<Block: BlockT> BlockchainDb<Block> {
@@ -369,6 +383,7 @@ impl<Block: BlockT> BlockchainDb<Block> {
 			leaves: RwLock::new(leaves),
 			meta: Arc::new(RwLock::new(meta)),
 			header_metadata_cache: Arc::new(HeaderMetadataCache::default()),
+			header_cache: Default::default(),
 		})
 	}
 
@@ -407,7 +422,20 @@ impl<Block: BlockT> BlockchainDb<Block> {
 
 impl<Block: BlockT> sc_client_api::blockchain::HeaderBackend<Block> for BlockchainDb<Block> {
 	fn header(&self, id: BlockId<Block>) -> ClientResult<Option<Block::Header>> {
-		utils::read_header(&*self.db, columns::KEY_LOOKUP, columns::HEADER, id)
+		match &id {
+			BlockId::Hash(h) => {
+				let mut cache = self.header_cache.lock();
+				if let Some(result) = cache.get_refresh(h) {
+					return Ok(result.clone());
+				}
+				let header = utils::read_header(&*self.db, columns::KEY_LOOKUP, columns::HEADER, id)?;
+				cache_header(&mut cache, h.clone(), header.clone());
+				Ok(header)
+			}
+			BlockId::Number(_) => {
+				utils::read_header(&*self.db, columns::KEY_LOOKUP, columns::HEADER, id)
+			}
+		}
 	}
 
 	fn info(&self) -> sc_client_api::blockchain::Info<Block> {
@@ -424,12 +452,7 @@ impl<Block: BlockT> sc_client_api::blockchain::HeaderBackend<Block> for Blockcha
 
 	fn status(&self, id: BlockId<Block>) -> ClientResult<sc_client_api::blockchain::BlockStatus> {
 		let exists = match id {
-			BlockId::Hash(_) => read_db(
-				&*self.db,
-				columns::KEY_LOOKUP,
-				columns::HEADER,
-				id
-			)?.is_some(),
+			BlockId::Hash(_) => self.header(id)?.is_some(),
 			BlockId::Number(n) => n <= self.meta.read().best_number,
 		};
 		match exists {
@@ -1117,12 +1140,6 @@ impl<Block: BlockT> Backend<Block> {
 				hash,
 			)?;
 
-			let header_metadata = CachedHeaderMetadata::from(&pending_block.header);
-			self.blockchain.insert_header_metadata(
-				header_metadata.hash,
-				header_metadata,
-			);
-
 			transaction.set_from_vec(columns::HEADER, &lookup_key, pending_block.header.encode());
 			if let Some(body) = &pending_block.body {
 				transaction.set_from_vec(columns::BODY, &lookup_key, body.encode());
@@ -1271,7 +1288,7 @@ impl<Block: BlockT> Backend<Block> {
 
 			meta_updates.push((hash, number, pending_block.leaf_state.is_best(), finalized));
 
-			Some((number, hash, enacted, retracted, displaced_leaf, is_best, cache))
+			Some((pending_block.header, number, hash, enacted, retracted, displaced_leaf, is_best, cache))
 		} else {
 			None
 		};
@@ -1297,7 +1314,11 @@ impl<Block: BlockT> Backend<Block> {
 
 		self.storage.db.commit(transaction)?;
 
+		// Apply all in-memory state shanges.
+		// Code beyond this point can't fail.
+
 		if let Some((
+			header,
 			number,
 			hash,
 			enacted,
@@ -1306,6 +1327,12 @@ impl<Block: BlockT> Backend<Block> {
 			is_best,
 			mut cache,
 		)) = imported {
+			let header_metadata = CachedHeaderMetadata::from(&header);
+			self.blockchain.insert_header_metadata(
+				header_metadata.hash,
+				header_metadata,
+			);
+			cache_header(&mut self.blockchain.header_cache.lock(), hash, Some(header));
 			cache.sync_cache(
 				&enacted,
 				&retracted,
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index d423fdee39b6..e8d748011bc1 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -1159,12 +1159,12 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 
 	/// Prepare in-memory header that is used in execution environment.
 	fn prepare_environment_block(&self, parent: &BlockId<Block>) -> sp_blockchain::Result<Block::Header> {
-		let parent_header = self.backend.blockchain().expect_header(*parent)?;
+		let parent_hash = self.backend.blockchain().expect_block_hash_from_id(parent)?;
 		Ok(<<Block as BlockT>::Header as HeaderT>::new(
 			self.backend.blockchain().expect_block_number_from_id(parent)? + One::one(),
 			Default::default(),
 			Default::default(),
-			parent_header.hash(),
+			parent_hash,
 			Default::default(),
 		))
 	}
diff --git a/primitives/blockchain/src/backend.rs b/primitives/blockchain/src/backend.rs
index 1328dfb5752f..326acd6b9bd4 100644
--- a/primitives/blockchain/src/backend.rs
+++ b/primitives/blockchain/src/backend.rs
@@ -53,7 +53,7 @@ pub trait HeaderBackend<Block: BlockT>: Send + Sync {
 	/// Convert an arbitrary block ID into a block hash.
 	fn block_number_from_id(&self, id: &BlockId<Block>) -> Result<Option<NumberFor<Block>>> {
 		match *id {
-			BlockId::Hash(_) => Ok(self.header(*id)?.map(|h| h.number().clone())),
+			BlockId::Hash(h) => self.number(h),
 			BlockId::Number(n) => Ok(Some(n)),
 		}
 	}

From ac4366bcf9b6f6063d0edfdb6ac0625093142238 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Thu, 26 Nov 2020 17:33:17 +0100
Subject: [PATCH 0109/1194] Inform sync explicitly about new best block (#7604)

* Inform sync explicitly about new best block

Instead of "fishing" the new best block out of the processed blocks, we
now tell sync directly that there is a new best block. It also makes
sure that we update the corresponding sync handshake to the new best
block. This is required for parachains as they first import blocks and
declare the new best block after being made aware of it by the relay chain.

* Adds test

* Make sure async stuff had time to run
---
 client/network/src/protocol.rs                | 24 ++----------
 client/network/src/service.rs                 | 33 +++++-----------
 client/network/test/src/lib.rs                | 38 ++++++++++++++++---
 client/network/test/src/sync.rs               | 35 +++++++++++++++++
 client/service/src/lib.rs                     |  4 +-
 client/service/test/src/lib.rs                |  3 +-
 .../consensus/common/src/import_queue.rs      |  2 +-
 7 files changed, 84 insertions(+), 55 deletions(-)

diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index 597031b90182..f794b106da24 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -528,10 +528,9 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 		self.sync.num_sync_requests()
 	}
 
-	/// Sync local state with the blockchain state.
-	pub fn update_chain(&mut self) {
-		let info = self.context_data.chain.info();
-		self.sync.update_chain_info(&info.best_hash, info.best_number);
+	/// Inform sync about new best imported block.
+	pub fn new_best_block_imported(&mut self, hash: B::Hash, number: NumberFor<B>) {
+		self.sync.update_chain_info(&hash, number);
 		self.behaviour.set_legacy_handshake_message(
 			build_status_message(&self.config, &self.context_data.chain),
 		);
@@ -541,11 +540,6 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 		);
 	}
 
-	/// Inform sync about an own imported block.
-	pub fn own_block_imported(&mut self, hash: B::Hash, number: NumberFor<B>) {
-		self.sync.update_chain_info(&hash, number);
-	}
-
 	fn update_peer_info(&mut self, who: &PeerId) {
 		if let Some(info) = self.sync.peer_info(who) {
 			if let Some(ref mut peer) = self.context_data.peers.get_mut(who) {
@@ -1258,18 +1252,6 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 		count: usize,
 		results: Vec<(Result<BlockImportResult<NumberFor<B>>, BlockImportError>, B::Hash)>
 	) {
-		let new_best = results.iter().rev().find_map(|r| match r {
-			(Ok(BlockImportResult::ImportedUnknown(n, aux, _)), hash) if aux.is_new_best => Some((*n, hash.clone())),
-			_ => None,
-		});
-		if let Some((best_num, best_hash)) = new_best {
-			self.sync.update_chain_info(&best_hash, best_num);
-			self.behaviour.set_legacy_handshake_message(build_status_message(&self.config, &self.context_data.chain));
-			self.behaviour.set_notif_protocol_handshake(
-				&self.block_announces_protocol,
-				BlockAnnouncesHandshake::build(&self.config, &self.context_data.chain).encode()
-			);
-		}
 		let results = self.sync.on_blocks_processed(
 			imported,
 			count,
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 8ef76d485069..0a87c37703d8 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -484,11 +484,9 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 		self.network_service.user_protocol_mut().on_block_finalized(hash, &header);
 	}
 
-	/// This should be called when blocks are added to the
-	/// chain by something other than the import queue.
-	/// Currently this is only useful for tests.
-	pub fn update_chain(&mut self) {
-		self.network_service.user_protocol_mut().update_chain();
+	/// Inform the network service about new best imported block.
+	pub fn new_best_block_imported(&mut self, hash: B::Hash, number: NumberFor<B>) {
+		self.network_service.user_protocol_mut().new_best_block_imported(hash, number);
 	}
 
 	/// Returns the local `PeerId`.
@@ -1012,21 +1010,11 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 		self.num_connected.load(Ordering::Relaxed)
 	}
 
-	/// This function should be called when blocks are added to the chain by something other
-	/// than the import queue.
-	///
-	/// > **Important**: This function is a hack and can be removed at any time. Do **not** use it.
-	pub fn update_chain(&self) {
-		let _ = self
-			.to_worker
-			.unbounded_send(ServiceToWorkerMsg::UpdateChain);
-	}
-
-	/// Inform the network service about an own imported block.
-	pub fn own_block_imported(&self, hash: B::Hash, number: NumberFor<B>) {
+	/// Inform the network service about new best imported block.
+	pub fn new_best_block_imported(&self, hash: B::Hash, number: NumberFor<B>) {
 		let _ = self
 			.to_worker
-			.unbounded_send(ServiceToWorkerMsg::OwnBlockImported(hash, number));
+			.unbounded_send(ServiceToWorkerMsg::NewBestBlockImported(hash, number));
 	}
 
 	/// Utility function to extract `PeerId` from each `Multiaddr` for priority group updates.
@@ -1181,8 +1169,7 @@ enum ServiceToWorkerMsg<B: BlockT, H: ExHashT> {
 		protocol_name: Cow<'static, str>,
 	},
 	DisconnectPeer(PeerId),
-	UpdateChain,
-	OwnBlockImported(B::Hash, NumberFor<B>),
+	NewBestBlockImported(B::Hash, NumberFor<B>),
 }
 
 /// Main network worker. Must be polled in order for the network to advance.
@@ -1319,10 +1306,8 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 					this.network_service.register_notifications_protocol(protocol_name),
 				ServiceToWorkerMsg::DisconnectPeer(who) =>
 					this.network_service.user_protocol_mut().disconnect_peer(&who),
-				ServiceToWorkerMsg::UpdateChain =>
-					this.network_service.user_protocol_mut().update_chain(),
-				ServiceToWorkerMsg::OwnBlockImported(hash, number) =>
-					this.network_service.user_protocol_mut().own_block_imported(hash, number),
+				ServiceToWorkerMsg::NewBestBlockImported(hash, number) =>
+					this.network_service.user_protocol_mut().new_best_block_imported(hash, number),
 			}
 		}
 
diff --git a/client/network/test/src/lib.rs b/client/network/test/src/lib.rs
index 6950ada4f845..a70ecb4fb048 100644
--- a/client/network/test/src/lib.rs
+++ b/client/network/test/src/lib.rs
@@ -279,7 +279,7 @@ impl<D> Peer<D> {
 		where F: FnMut(BlockBuilder<Block, PeersFullClient, substrate_test_runtime_client::Backend>) -> Block
 	{
 		let best_hash = self.client.info().best_hash;
-		self.generate_blocks_at(BlockId::Hash(best_hash), count, origin, edit_block, false)
+		self.generate_blocks_at(BlockId::Hash(best_hash), count, origin, edit_block, false, true)
 	}
 
 	/// Add blocks to the peer -- edit the block before adding. The chain will
@@ -291,6 +291,7 @@ impl<D> Peer<D> {
 		origin: BlockOrigin,
 		mut edit_block: F,
 		headers_only: bool,
+		inform_sync_about_new_best_block: bool,
 	) -> H256 where F: FnMut(BlockBuilder<Block, PeersFullClient, substrate_test_runtime_client::Backend>) -> Block {
 		let full_client = self.client.as_full()
 			.expect("blocks could only be generated by full clients");
@@ -328,7 +329,12 @@ impl<D> Peer<D> {
 			at = hash;
 		}
 
-		self.network.update_chain();
+		if inform_sync_about_new_best_block {
+			self.network.new_best_block_imported(
+				at,
+				full_client.header(&BlockId::Hash(at)).ok().flatten().unwrap().number().clone(),
+			);
+		}
 		self.network.service().announce_block(at.clone(), Vec::new());
 		at
 	}
@@ -342,18 +348,36 @@ impl<D> Peer<D> {
 	/// Push blocks to the peer (simplified: with or without a TX)
 	pub fn push_headers(&mut self, count: usize) -> H256 {
 		let best_hash = self.client.info().best_hash;
-		self.generate_tx_blocks_at(BlockId::Hash(best_hash), count, false, true)
+		self.generate_tx_blocks_at(BlockId::Hash(best_hash), count, false, true, true)
 	}
 
 	/// Push blocks to the peer (simplified: with or without a TX) starting from
 	/// given hash.
 	pub fn push_blocks_at(&mut self, at: BlockId<Block>, count: usize, with_tx: bool) -> H256 {
-		self.generate_tx_blocks_at(at, count, with_tx, false)
+		self.generate_tx_blocks_at(at, count, with_tx, false, true)
+	}
+
+	/// Push blocks to the peer (simplified: with or without a TX) starting from
+	/// given hash without informing the sync protocol about the new best block.
+	pub fn push_blocks_at_without_informing_sync(
+		&mut self,
+		at: BlockId<Block>,
+		count: usize,
+		with_tx: bool,
+	) -> H256 {
+		self.generate_tx_blocks_at(at, count, with_tx, false, false)
 	}
 
 	/// Push blocks/headers to the peer (simplified: with or without a TX) starting from
 	/// given hash.
-	fn generate_tx_blocks_at(&mut self, at: BlockId<Block>, count: usize, with_tx: bool, headers_only:bool) -> H256 {
+	fn generate_tx_blocks_at(
+		&mut self,
+		at: BlockId<Block>,
+		count: usize,
+		with_tx: bool,
+		headers_only: bool,
+		inform_sync_about_new_best_block: bool,
+	) -> H256 {
 		let mut nonce = 0;
 		if with_tx {
 			self.generate_blocks_at(
@@ -370,7 +394,8 @@ impl<D> Peer<D> {
 					nonce = nonce + 1;
 					builder.build().unwrap().block
 				},
-				headers_only
+				headers_only,
+				inform_sync_about_new_best_block,
 			)
 		} else {
 			self.generate_blocks_at(
@@ -379,6 +404,7 @@ impl<D> Peer<D> {
 				BlockOrigin::File,
 				|builder| builder.build().unwrap().block,
 				headers_only,
+				inform_sync_about_new_best_block,
 			)
 		}
 	}
diff --git a/client/network/test/src/sync.rs b/client/network/test/src/sync.rs
index 64985871d85e..9a488ae4fa49 100644
--- a/client/network/test/src/sync.rs
+++ b/client/network/test/src/sync.rs
@@ -779,3 +779,38 @@ fn wait_until_deferred_block_announce_validation_is_ready() {
 		net.block_until_idle();
 	}
 }
+
+/// When we don't inform the sync protocol about the best block, a node will not sync from us as the
+/// handshake is not does not contain our best block.
+#[test]
+fn sync_to_tip_requires_that_sync_protocol_is_informed_about_best_block() {
+	sp_tracing::try_init_simple();
+	log::trace!(target: "sync", "Test");
+	let mut net = TestNet::new(1);
+
+	// Produce some blocks
+	let block_hash = net.peer(0).push_blocks_at_without_informing_sync(BlockId::Number(0), 3, true);
+
+	// Add a node and wait until they are connected
+	net.add_full_peer_with_config(Default::default());
+	net.block_until_connected();
+	net.block_until_idle();
+
+	// The peer should not have synced the block.
+	assert!(!net.peer(1).has_block(&block_hash));
+
+	// Make sync protocol aware of the best block
+	net.peer(0).network_service().new_best_block_imported(block_hash, 3);
+	net.block_until_idle();
+
+	// Connect another node that should now sync to the tip
+	net.add_full_peer_with_config(Default::default());
+	net.block_until_connected();
+
+	while !net.peer(2).has_block(&block_hash) {
+		net.block_until_idle();
+	}
+
+	// However peer 1 should still not have the block.
+	assert!(!net.peer(1).has_block(&block_hash));
+}
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index fd5ad9ebac91..fdccbde6a020 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -250,8 +250,8 @@ async fn build_network_future<
 					network.service().announce_block(notification.hash, Vec::new());
 				}
 
-				if let sp_consensus::BlockOrigin::Own = notification.origin {
-					network.service().own_block_imported(
+				if notification.is_new_best {
+					network.service().new_best_block_imported(
 						notification.hash,
 						notification.header.number().clone(),
 					);
diff --git a/client/service/test/src/lib.rs b/client/service/test/src/lib.rs
index 8a9f0ace171d..28930473f0a0 100644
--- a/client/service/test/src/lib.rs
+++ b/client/service/test/src/lib.rs
@@ -542,7 +542,8 @@ pub fn sync<G, E, Fb, F, Lb, L, B, ExF, U>(
 
 			make_block_and_import(&first_service, first_user_data);
 		}
-		network.full_nodes[0].1.network().update_chain();
+		let info = network.full_nodes[0].1.client().info();
+		network.full_nodes[0].1.network().new_best_block_imported(info.best_hash, info.best_number);
 		network.full_nodes[0].3.clone()
 	};
 
diff --git a/primitives/consensus/common/src/import_queue.rs b/primitives/consensus/common/src/import_queue.rs
index 3ad8c7c92e07..b32ca0133d99 100644
--- a/primitives/consensus/common/src/import_queue.rs
+++ b/primitives/consensus/common/src/import_queue.rs
@@ -136,7 +136,7 @@ pub trait Link<B: BlockT>: Send {
 
 /// Block import successful result.
 #[derive(Debug, PartialEq)]
-pub enum BlockImportResult<N: ::std::fmt::Debug + PartialEq> {
+pub enum BlockImportResult<N: std::fmt::Debug + PartialEq> {
 	/// Imported known block.
 	ImportedKnown(N),
 	/// Imported unknown block.

From 021da1f333bae97967365ec4ca5c24209e0cbb70 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 27 Nov 2020 09:40:11 +0100
Subject: [PATCH 0110/1194] Bump directories from 2.0.2 to 3.0.1 (#7609)

Bumps [directories](https://github.com/soc/directories-rs) from 2.0.2 to 3.0.1.
- [Release notes](https://github.com/soc/directories-rs/releases)
- [Commits](https://github.com/soc/directories-rs/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                | 13 +++++++++++--
 client/service/Cargo.toml |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8d44eec2623d..b4443dd43849 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1250,6 +1250,15 @@ dependencies = [
  "dirs-sys",
 ]
 
+[[package]]
+name = "directories"
+version = "3.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8fed639d60b58d0f53498ab13d26f621fd77569cc6edb031f4cc36a2ad9da0f"
+dependencies = [
+ "dirs-sys",
+]
+
 [[package]]
 name = "dirs-sys"
 version = "0.3.5"
@@ -7320,7 +7329,7 @@ version = "0.8.0"
 dependencies = [
  "async-std",
  "derive_more",
- "directories",
+ "directories 3.0.1",
  "exit-future",
  "futures 0.1.30",
  "futures 0.3.8",
@@ -10153,7 +10162,7 @@ dependencies = [
  "cranelift-entity",
  "cranelift-frontend",
  "cranelift-wasm",
- "directories",
+ "directories 2.0.2",
  "errno",
  "file-per-thread-logger",
  "indexmap",
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index 3d0b00820fe6..23af49d38b12 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -82,7 +82,7 @@ parity-util-mem = { version = "0.7.0", default-features = false, features = ["pr
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
 tempfile = "3.1.0"
-directories = "2.0.2"
+directories = "3.0.1"
 
 [dev-dependencies]
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }

From 07a87405e04ae7ccfc4e5d3c22230fd9efa5529e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Fri, 27 Nov 2020 10:24:34 +0100
Subject: [PATCH 0111/1194] Remove `RpcMetrics` weirdness (#7608)

* Remove `RpcMetrics` weirdness

The metrics was returning an error when prometheus was not given. This
was a really weird setup, especially when compared to all other metrics
that just do nothing if there is no registry.

* Fix browser build
---
 client/rpc-servers/src/middleware.rs | 41 ++++++++++++++++------------
 client/service/src/builder.rs        |  6 ++--
 client/service/src/lib.rs            | 10 +++----
 3 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/client/rpc-servers/src/middleware.rs b/client/rpc-servers/src/middleware.rs
index 74139714c8cb..233ceab3cf8a 100644
--- a/client/rpc-servers/src/middleware.rs
+++ b/client/rpc-servers/src/middleware.rs
@@ -32,36 +32,41 @@ use futures::{future::Either, Future};
 /// Metrics for RPC middleware
 #[derive(Debug, Clone)]
 pub struct RpcMetrics {
-	rpc_calls: CounterVec<U64>,
+	rpc_calls: Option<CounterVec<U64>>,
 }
 
 impl RpcMetrics {
 	/// Create an instance of metrics
 	pub fn new(metrics_registry: Option<&Registry>) -> Result<Self, PrometheusError> {
-		metrics_registry.and_then(|r| {
-			Some(RpcMetrics {
-				rpc_calls: register(CounterVec::new(
-					Opts::new(
-						"rpc_calls_total",
-						"Number of rpc calls received",
-					),
-					&["protocol"]
-				).ok()?, r).ok()?,
-			})
-		}).ok_or(PrometheusError::Msg("Cannot register metric".to_string()))
+		Ok(Self {
+			rpc_calls: metrics_registry.map(|r|
+				register(
+					CounterVec::new(
+						Opts::new(
+							"rpc_calls_total",
+							"Number of rpc calls received",
+						),
+						&["protocol"]
+					)?,
+					r,
+				)
+			).transpose()?,
+		})
 	}
 }
 
 /// Middleware for RPC calls
 pub struct RpcMiddleware {
-	metrics: Option<RpcMetrics>,
+	metrics: RpcMetrics,
 	transport_label: String,
 }
 
 impl RpcMiddleware {
-	/// Create an instance of middleware with provided metrics
-	/// transport_label is used as a label for Prometheus collector
-	pub fn new(metrics: Option<RpcMetrics>, transport_label: &str) -> Self {
+	/// Create an instance of middleware.
+	///
+	/// - `metrics`: Will be used to report statistics.
+	/// - `transport_label`: The label that is used when reporting the statistics.
+	pub fn new(metrics: RpcMetrics, transport_label: &str) -> Self {
 		RpcMiddleware {
 			metrics,
 			transport_label: String::from(transport_label),
@@ -78,8 +83,8 @@ impl<M: Metadata> RequestMiddleware<M> for RpcMiddleware {
 		F: Fn(Request, M) -> X + Send + Sync,
 		X: Future<Item = Option<Response>, Error = ()> + Send + 'static,
 	{
-		if let Some(ref metrics) = self.metrics {
-			metrics.rpc_calls.with_label_values(&[self.transport_label.as_str()]).inc();
+		if let Some(ref rpc_calls) = self.metrics.rpc_calls {
+			rpc_calls.with_label_values(&[self.transport_label.as_str()]).inc();
 		}
 
 		Either::B(next(request, meta))
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index d9dc0d1c6ba0..52c1121d504d 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -603,12 +603,12 @@ pub fn spawn_tasks<TBl, TBackend, TExPool, TRpc, TCl>(
 		on_demand.clone(), remote_blockchain.clone(), &*rpc_extensions_builder,
 		backend.offchain_storage(), system_rpc_tx.clone()
 	);
-	let rpc_metrics = sc_rpc_server::RpcMetrics::new(config.prometheus_registry()).ok();
-	let rpc = start_rpc_servers(&config, gen_handler, rpc_metrics.as_ref())?;
+	let rpc_metrics = sc_rpc_server::RpcMetrics::new(config.prometheus_registry())?;
+	let rpc = start_rpc_servers(&config, gen_handler, rpc_metrics.clone())?;
 	// This is used internally, so don't restrict access to unsafe RPC
 	let rpc_handlers = RpcHandlers(Arc::new(gen_handler(
 		sc_rpc::DenyUnsafe::No,
-		sc_rpc_server::RpcMiddleware::new(rpc_metrics.as_ref().cloned(), "inbrowser")
+		sc_rpc_server::RpcMiddleware::new(rpc_metrics, "inbrowser")
 	).into()));
 
 	// Telemetry
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index fdccbde6a020..cd129de32607 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -401,7 +401,7 @@ fn start_rpc_servers<
 >(
 	config: &Configuration,
 	mut gen_handler: H,
-	rpc_metrics: Option<&sc_rpc_server::RpcMetrics>
+	rpc_metrics: sc_rpc_server::RpcMetrics,
 ) -> Result<Box<dyn std::any::Any + Send + Sync>, error::Error> {
 	fn maybe_start_server<T, F>(address: Option<SocketAddr>, mut start: F) -> Result<Option<T>, io::Error>
 		where F: FnMut(&SocketAddr) -> Result<T, io::Error>,
@@ -434,7 +434,7 @@ fn start_rpc_servers<
 		config.rpc_ipc.as_ref().map(|path| sc_rpc_server::start_ipc(
 			&*path, gen_handler(
 				sc_rpc::DenyUnsafe::No,
-				sc_rpc_server::RpcMiddleware::new(rpc_metrics.cloned(), "ipc")
+				sc_rpc_server::RpcMiddleware::new(rpc_metrics.clone(), "ipc")
 			)
 		)),
 		maybe_start_server(
@@ -444,7 +444,7 @@ fn start_rpc_servers<
 				config.rpc_cors.as_ref(),
 				gen_handler(
 					deny_unsafe(&address, &config.rpc_methods),
-					sc_rpc_server::RpcMiddleware::new(rpc_metrics.cloned(), "http")
+					sc_rpc_server::RpcMiddleware::new(rpc_metrics.clone(), "http")
 				),
 			),
 		)?.map(|s| waiting::HttpServer(Some(s))),
@@ -456,7 +456,7 @@ fn start_rpc_servers<
 				config.rpc_cors.as_ref(),
 				gen_handler(
 					deny_unsafe(&address, &config.rpc_methods),
-					sc_rpc_server::RpcMiddleware::new(rpc_metrics.cloned(), "ws")
+					sc_rpc_server::RpcMiddleware::new(rpc_metrics.clone(), "ws")
 				),
 			),
 		)?.map(|s| waiting::WsServer(Some(s))),
@@ -471,7 +471,7 @@ fn start_rpc_servers<
 >(
 	_: &Configuration,
 	_: H,
-	_: Option<&sc_rpc_server::RpcMetrics>
+	_: sc_rpc_server::RpcMetrics,
 ) -> Result<Box<dyn std::any::Any + Send + Sync>, error::Error> {
 	Ok(Box::new(()))
 }

From 6c0cd2a35b86957cf5fbe01d7f7b94f58d191781 Mon Sep 17 00:00:00 2001
From: Roman Borschel <romanb@users.noreply.github.com>
Date: Fri, 27 Nov 2020 15:29:18 +0100
Subject: [PATCH 0112/1194] Upgrade to libp2p-0.31. (#7606)

* Upgrade to libp2p-0.31.

* Address line width.

* Add generous incoming connection limit.

* Remove old noise configuration.
---
 Cargo.lock                                    | 145 ++++++++++--------
 bin/node/browser-testing/Cargo.toml           |   2 +-
 client/authority-discovery/Cargo.toml         |   2 +-
 client/authority-discovery/src/error.rs       |   2 +-
 client/authority-discovery/src/worker.rs      |   2 +-
 .../src/worker/addr_cache.rs                  |   4 +-
 client/cli/Cargo.toml                         |   2 +-
 client/network-gossip/Cargo.toml              |   2 +-
 client/network/Cargo.toml                     |   4 +-
 client/network/src/discovery.rs               |   8 +-
 client/network/src/lib.rs                     |   3 +
 client/network/src/light_client_handler.rs    |   3 +-
 client/network/src/peer_info.rs               |   8 +-
 client/network/src/protocol.rs                |   4 +-
 client/network/src/request_responses.rs       |   4 +-
 client/network/src/service.rs                 |  61 ++++++--
 client/network/src/transport.rs               |  26 +---
 client/network/test/Cargo.toml                |   2 +-
 client/peerset/Cargo.toml                     |   2 +-
 client/telemetry/Cargo.toml                   |   2 +-
 frame/support/procedural/tools/Cargo.toml     |   2 +-
 primitives/consensus/common/Cargo.toml        |   2 +-
 utils/browser/Cargo.toml                      |   2 +-
 23 files changed, 167 insertions(+), 127 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b4443dd43849..7444178d73b4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -323,7 +323,7 @@ dependencies = [
  "futures-io",
  "rustls",
  "webpki",
- "webpki-roots",
+ "webpki-roots 0.20.0",
 ]
 
 [[package]]
@@ -489,17 +489,6 @@ dependencies = [
  "constant_time_eq",
 ]
 
-[[package]]
-name = "blake2s_simd"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e461a7034e85b211a4acb57ee2e6730b32912b06c08cc242243c39fc21ae6a2"
-dependencies = [
- "arrayref",
- "arrayvec 0.5.2",
- "constant_time_eq",
-]
-
 [[package]]
 name = "block-buffer"
 version = "0.7.3"
@@ -2876,9 +2865,9 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
 
 [[package]]
 name = "libp2p"
-version = "0.30.1"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3c2b4c99f8798be90746fc226acf95d3e6cff0655883634cc30dab1f64f438b"
+checksum = "24966e73cc5624a6cf14b025365f67cb6da436b4d6337ed84d198063ba74451d"
 dependencies = [
  "atomic",
  "bytes 0.5.6",
@@ -2905,7 +2894,6 @@ dependencies = [
  "libp2p-wasm-ext",
  "libp2p-websocket",
  "libp2p-yamux",
- "multihash",
  "parity-multiaddr",
  "parking_lot 0.11.1",
  "pin-project 1.0.2",
@@ -2915,12 +2903,13 @@ dependencies = [
 
 [[package]]
 name = "libp2p-core"
-version = "0.24.0"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b8186060d6bd415e4e928e6cb44c4fe7e7a7dd53437bd936ce7e5f421e45a51"
+checksum = "28d92fab5df60c9705e05750d9ecee6a5af15aed1e3fa86e09fd3dd07ec5dc8e"
 dependencies = [
  "asn1_der",
  "bs58",
+ "bytes 0.5.6",
  "ed25519-dalek",
  "either",
  "fnv",
@@ -2949,9 +2938,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-core-derive"
-version = "0.20.2"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f753d9324cd3ec14bf04b8a8cd0d269c87f294153d6bf2a84497a63a5ad22213"
+checksum = "f4bc40943156e42138d22ed3c57ff0e1a147237742715937622a99b10fbe0156"
 dependencies = [
  "quote",
  "syn",
@@ -2959,9 +2948,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-deflate"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34aea69349e70a58ef9ecd21ac12c5eaa36255ac6986828079d26393f9e618cb"
+checksum = "5a579d7dd506d0620ba88ccc1754436b7de35ed6c884234f9a226bbfce382640"
 dependencies = [
  "flate2",
  "futures 0.3.8",
@@ -2970,9 +2959,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-dns"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0baeff71fb5cb1fe1604f74a712a44b66a8c5900f4022411a1d550f09d6bb776"
+checksum = "15dea5933f570844d7b5222b12b58f7bd52e9ca38cd65a1bd4f35341f053f012"
 dependencies = [
  "futures 0.3.8",
  "libp2p-core",
@@ -2981,9 +2970,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-floodsub"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db0f925a45f310b678e70faf71a10023b829d02eb9cc2628a63de928936f3ade"
+checksum = "23070a0838bd9a8adb27e6eba477eeb650c498f9d139383dd0135d20a8170253"
 dependencies = [
  "cuckoofilter",
  "fnv",
@@ -2999,9 +2988,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-gossipsub"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efeb65567174974f551a91f9f5719445b6695cad56f6a7a47a27111f37efb6b8"
+checksum = "65e8f3aa0906fbad435dac23c177eef3cdfaaf62609791bd7f54f8553edcfdf9"
 dependencies = [
  "base64 0.13.0",
  "byteorder",
@@ -3025,9 +3014,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-identify"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e074124669840484de564901d47f2d0892e73f6d8ee7c37e9c2644af1b217bf4"
+checksum = "802fb973a7e0dde3fb9a2113a62bad90338ebe01983b706e1d576d0c2af93cda"
 dependencies = [
  "futures 0.3.8",
  "libp2p-core",
@@ -3041,9 +3030,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-kad"
-version = "0.25.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78a2653b2e3254a3bbeb66bfc3f0dca7d6cba6aa2a96791db114003dec1b5394"
+checksum = "6506b7b7982f7626fc96a91bc61be4b1fe7ae9ac23824f0ecefcce21cb39238c"
 dependencies = [
  "arrayvec 0.5.2",
  "bytes 0.5.6",
@@ -3054,7 +3043,6 @@ dependencies = [
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "multihash",
  "prost",
  "prost-build",
  "rand 0.7.3",
@@ -3068,9 +3056,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-mdns"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "786b068098794322239f8f04df88a52daeb7863b2e77501c4d85d32e0a8f2d26"
+checksum = "4458ec36b5ab2662fb4d5c8bb9b6e1591da0ab6efe8881c7a7670ef033bc8937"
 dependencies = [
  "async-std",
  "data-encoding",
@@ -3090,9 +3078,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-mplex"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed764eab613a8fb6b7dcf6c796f55a06fef2270e528329903e25cd3311b99663"
+checksum = "ae2132b14045009b0f8e577a06e1459592ef0a89dedc58f3d4baf4eac956837b"
 dependencies = [
  "bytes 0.5.6",
  "futures 0.3.8",
@@ -3108,9 +3096,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-noise"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb441fb015ec16690099c5d910fcba271d357763b3dcb784db7b27bbb0b68372"
+checksum = "b9610a524bef4db383cd96b4ec3ec4722eafa72c7242fa89990b74166760583d"
 dependencies = [
  "bytes 0.5.6",
  "curve25519-dalek 3.0.0",
@@ -3130,9 +3118,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-ping"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e5c50936cfdbe96a514e8992f304fa44cd3a681b6f779505f1ae62b3474705"
+checksum = "659adf89356e04f65398bb74ee791b269e63da9e41b37f8dc19eaacd12487bfe"
 dependencies = [
  "futures 0.3.8",
  "libp2p-core",
@@ -3145,9 +3133,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-plaintext"
-version = "0.24.1"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21026557c335d3639591f247b19b7536195772034ec7e9c463137227f95eaaa1"
+checksum = "96dfe26270c91d4ff095030d1fcadd602f3fd84968ebd592829916d0715798a6"
 dependencies = [
  "bytes 0.5.6",
  "futures 0.3.8",
@@ -3176,9 +3164,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-request-response"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dd9a1e0e6563dec1c9e702f7e68bdaa43da62a84536aa06372d3fed3e25d4ca"
+checksum = "1e952dcc9d2d7e7e45ae8bfcff255723091bd43e3e9a7741a0af8a17fe55b3ed"
 dependencies = [
  "async-trait",
  "bytes 0.5.6",
@@ -3196,9 +3184,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-swarm"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "565f0e06674b4033c978471e4083d5aaa8e03cef0719a0ec0905aaeaad39a919"
+checksum = "de333c483f27d02ecf7b6cef814a36f5e1876f15139eefb00225c405350e1c22"
 dependencies = [
  "either",
  "futures 0.3.8",
@@ -3212,9 +3200,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-tcp"
-version = "0.24.0"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33f3dce259c0d3127af5167f45c275b6c047320efdd0e40fde947482487af0a3"
+checksum = "bc28c9ad6dc43f4c3950411cf808639d90307a076330e7996e5e94e70279bde0"
 dependencies = [
  "async-std",
  "futures 0.3.8",
@@ -3228,9 +3216,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-uds"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e0aba04370a00d8d0236e350bc862926c1b42542a169aa6a481e660e5b990fe"
+checksum = "9d821208d4b9af4b293a56dde470edd9f9fac8bb94a51f4f5327cc29a471b3f3"
 dependencies = [
  "async-std",
  "futures 0.3.8",
@@ -3240,9 +3228,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-wasm-ext"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c703816f4170477a375b49c56d349e535ce68388f81ba1d9a3c8e2517effa82"
+checksum = "1e6ef400b231ba78e866b860445480ca21ee447e03034138c6d57cf2969d6bf4"
 dependencies = [
  "futures 0.3.8",
  "js-sys",
@@ -3254,9 +3242,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-websocket"
-version = "0.25.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d5e7268a959748040a0cf7456ad655be55b87f0ceda03bdb5b53674726b28f7"
+checksum = "a5736e2fccdcea6e728bbaf903bddc113be223313ce2c756ad9fe43b5a2b0f06"
 dependencies = [
  "async-tls",
  "either",
@@ -3269,14 +3257,14 @@ dependencies = [
  "soketto",
  "url 2.2.0",
  "webpki",
- "webpki-roots",
+ "webpki-roots 0.21.0",
 ]
 
 [[package]]
 name = "libp2p-yamux"
-version = "0.27.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a0798cbb58535162c40858493d09af06eac42a26e4966e58de0df701f559348"
+checksum = "3be7ac000fa3e42ac09a6e658e48de34ac8ef9fff64a4e6e6b08dcc8f4b0e5f6"
 dependencies = [
  "futures 0.3.8",
  "libp2p-core",
@@ -3644,19 +3632,31 @@ checksum = "0debeb9fcf88823ea64d64e4a815ab1643f33127d995978e099942ce38f25238"
 
 [[package]]
 name = "multihash"
-version = "0.11.4"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567122ab6492f49b59def14ecc36e13e64dca4188196dd0cd41f9f3f979f3df6"
+checksum = "fb63389ee5fcd4df3f8727600f4a0c3df53c541f0ed4e8b50a9ae51a80fc1efe"
 dependencies = [
- "blake2b_simd",
- "blake2s_simd",
  "digest 0.9.0",
- "sha-1 0.9.2",
+ "generic-array 0.14.4",
+ "multihash-derive",
  "sha2 0.9.2",
- "sha3",
  "unsigned-varint",
 ]
 
+[[package]]
+name = "multihash-derive"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f5653449cd45d502a53480ee08d7a599e8f4893d2bacb33c63d65bc20af6c1a"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
 [[package]]
 name = "multimap"
 version = "0.8.2"
@@ -3665,9 +3665,9 @@ checksum = "1255076139a83bb467426e7f8d0134968a8118844faa755985e077cf31850333"
 
 [[package]]
 name = "multistream-select"
-version = "0.8.5"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93faf2e41f9ee62fb01680ed48f3cc26652352327aa2e59869070358f6b7dd75"
+checksum = "46e19fd46149acdd3600780ebaa09f6ae4e7f2ddbafec64aab54cf75aafd1746"
 dependencies = [
  "bytes 0.5.6",
  "futures 0.3.8",
@@ -5186,9 +5186,9 @@ dependencies = [
 
 [[package]]
 name = "parity-multiaddr"
-version = "0.9.6"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43244a26dc1ddd3097216bb12eaa6cf8a07b060c72718d9ebd60fd297d6401df"
+checksum = "2f51a30667591b14f96068b2d12f1306d07a41ebd98239d194356d4d9707ac16"
 dependencies = [
  "arrayref",
  "bs58",
@@ -9740,7 +9740,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04f8ab788026715fa63b31960869617cba39117e520eb415b0139543e325ab59"
 dependencies = [
  "cfg-if 0.1.10",
- "rand 0.7.3",
+ "rand 0.3.23",
  "static_assertions",
 ]
 
@@ -10309,6 +10309,15 @@ dependencies = [
  "webpki",
 ]
 
+[[package]]
+name = "webpki-roots"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82015b7e0b8bad8185994674a13a93306bea76cf5a16c5a181382fd3a5ec2376"
+dependencies = [
+ "webpki",
+]
+
 [[package]]
 name = "wepoll-sys"
 version = "3.0.1"
diff --git a/bin/node/browser-testing/Cargo.toml b/bin/node/browser-testing/Cargo.toml
index e072607a7b65..f1cad30aede1 100644
--- a/bin/node/browser-testing/Cargo.toml
+++ b/bin/node/browser-testing/Cargo.toml
@@ -8,7 +8,7 @@ license = "Apache-2.0"
 
 [dependencies]
 futures-timer = "3.0.2"
-libp2p = { version = "0.30.1", default-features = false }
+libp2p = { version = "0.31.1", default-features = false }
 jsonrpc-core = "15.0.0"
 serde = "1.0.106"
 serde_json = "1.0.48"
diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml
index fc948de53eb3..0d2a254c6b16 100644
--- a/client/authority-discovery/Cargo.toml
+++ b/client/authority-discovery/Cargo.toml
@@ -23,7 +23,7 @@ derive_more = "0.99.2"
 either = "1.5.3"
 futures = "0.3.4"
 futures-timer = "3.0.1"
-libp2p = { version = "0.30.1", default-features = false, features = ["kad"] }
+libp2p = { version = "0.31.1", default-features = false, features = ["kad"] }
 log = "0.4.8"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.8.0"}
 prost = "0.6.1"
diff --git a/client/authority-discovery/src/error.rs b/client/authority-discovery/src/error.rs
index 48bcdf33114b..82e4a6dd6f3f 100644
--- a/client/authority-discovery/src/error.rs
+++ b/client/authority-discovery/src/error.rs
@@ -31,7 +31,7 @@ pub enum Error {
 	/// Failed to verify a dht payload with the given signature.
 	VerifyingDhtPayload,
 	/// Failed to hash the authority id to be used as a dht key.
-	HashingAuthorityId(libp2p::core::multiaddr::multihash::EncodeError),
+	HashingAuthorityId(libp2p::core::multiaddr::multihash::Error),
 	/// Failed calling into the Substrate runtime.
 	CallingRuntime(sp_blockchain::Error),
 	/// Received a dht record with a key that does not match any in-flight awaited keys.
diff --git a/client/authority-discovery/src/worker.rs b/client/authority-discovery/src/worker.rs
index c8e7a9f7aee3..45b55f76673c 100644
--- a/client/authority-discovery/src/worker.rs
+++ b/client/authority-discovery/src/worker.rs
@@ -28,7 +28,7 @@ use futures::{FutureExt, Stream, StreamExt, stream::Fuse};
 use addr_cache::AddrCache;
 use async_trait::async_trait;
 use codec::Decode;
-use libp2p::{core::multiaddr, multihash::Multihash};
+use libp2p::{core::multiaddr, multihash::{Multihash, Hasher}};
 use log::{debug, error, log_enabled};
 use prometheus_endpoint::{Counter, CounterVec, Gauge, Opts, U64, register};
 use prost::Message;
diff --git a/client/authority-discovery/src/worker/addr_cache.rs b/client/authority-discovery/src/worker/addr_cache.rs
index a2cd3f33e921..75fcaa840176 100644
--- a/client/authority-discovery/src/worker/addr_cache.rs
+++ b/client/authority-discovery/src/worker/addr_cache.rs
@@ -139,7 +139,7 @@ fn peer_id_from_multiaddr(addr: &Multiaddr) -> Option<PeerId> {
 mod tests {
 	use super::*;
 
-	use libp2p::multihash;
+	use libp2p::multihash::{self, Multihash};
 	use quickcheck::{Arbitrary, Gen, QuickCheck, TestResult};
 	use rand::Rng;
 
@@ -163,7 +163,7 @@ mod tests {
 		fn arbitrary<G: Gen>(g: &mut G) -> Self {
 			let seed: [u8; 32] = g.gen();
 			let peer_id = PeerId::from_multihash(
-				multihash::wrap(multihash::Code::Sha2_256, &seed)
+				Multihash::wrap(multihash::Code::Sha2_256.into(), &seed).unwrap()
 			).unwrap();
 			let multiaddr = "/ip6/2001:db8:0:0:0:0:0:2/tcp/30333".parse::<Multiaddr>()
 				.unwrap()
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index 651b0a7286b6..45312202e861 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -21,7 +21,7 @@ ansi_term = "0.12.1"
 tokio = { version = "0.2.21", features = [ "signal", "rt-core", "rt-threaded", "blocking" ] }
 futures = "0.3.4"
 fdlimit = "0.2.1"
-libp2p = "0.30.1"
+libp2p = "0.31.1"
 parity-scale-codec = "1.3.0"
 hex = "0.4.2"
 rand = "0.7.3"
diff --git a/client/network-gossip/Cargo.toml b/client/network-gossip/Cargo.toml
index 02d934532396..edd993ce505d 100644
--- a/client/network-gossip/Cargo.toml
+++ b/client/network-gossip/Cargo.toml
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 futures = "0.3.4"
 futures-timer = "3.0.1"
-libp2p = { version = "0.30.1", default-features = false }
+libp2p = { version = "0.31.1", default-features = false }
 log = "0.4.8"
 lru = "0.6.1"
 sc-network = { version = "0.8.0", path = "../network" }
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index dac2cb22c4f3..123ef6ddbc7b 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -64,13 +64,13 @@ wasm-timer = "0.2"
 zeroize = "1.0.0"
 
 [dependencies.libp2p]
-version = "0.30.1"
+version = "0.31.1"
 default-features = false
 features = ["identify", "kad", "mdns-async-std", "mplex", "noise", "ping", "request-response", "tcp-async-std", "websocket", "yamux"]
 
 [dev-dependencies]
 assert_matches = "1.3"
-libp2p = { version = "0.30.1", default-features = false }
+libp2p = { version = "0.31.1", default-features = false }
 quickcheck = "0.9.0"
 rand = "0.7.2"
 sp-keyring = { version = "2.0.0", path = "../../primitives/keyring" }
diff --git a/client/network/src/discovery.rs b/client/network/src/discovery.rs
index 717aec01f754..e65d557a7bdb 100644
--- a/client/network/src/discovery.rs
+++ b/client/network/src/discovery.rs
@@ -736,8 +736,8 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 							handler,
 							event: (pid.clone(), event)
 						}),
-					NetworkBehaviourAction::ReportObservedAddr { address } =>
-						return Poll::Ready(NetworkBehaviourAction::ReportObservedAddr { address }),
+					NetworkBehaviourAction::ReportObservedAddr { address, score } =>
+						return Poll::Ready(NetworkBehaviourAction::ReportObservedAddr { address, score }),
 				}
 			}
 		}
@@ -767,8 +767,8 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 					return Poll::Ready(NetworkBehaviourAction::DialPeer { peer_id, condition }),
 				NetworkBehaviourAction::NotifyHandler { event, .. } =>
 					match event {},		// `event` is an enum with no variant
-				NetworkBehaviourAction::ReportObservedAddr { address } =>
-					return Poll::Ready(NetworkBehaviourAction::ReportObservedAddr { address }),
+				NetworkBehaviourAction::ReportObservedAddr { address, score } =>
+					return Poll::Ready(NetworkBehaviourAction::ReportObservedAddr { address, score }),
 			}
 		}
 
diff --git a/client/network/src/lib.rs b/client/network/src/lib.rs
index b050db8785ac..91ea49bce76c 100644
--- a/client/network/src/lib.rs
+++ b/client/network/src/lib.rs
@@ -283,6 +283,9 @@ use sp_runtime::traits::{Block as BlockT, NumberFor};
 /// two peers, the per-peer connection limit is not set to 1 but 2.
 const MAX_CONNECTIONS_PER_PEER: usize = 2;
 
+/// The maximum number of concurrent established connections that were incoming.
+const MAX_CONNECTIONS_ESTABLISHED_INCOMING: u32 = 10_000;
+
 /// Minimum Requirements for a Hash within Networking
 pub trait ExHashT: std::hash::Hash + Eq + std::fmt::Debug + Clone + Send + Sync + 'static {}
 
diff --git a/client/network/src/light_client_handler.rs b/client/network/src/light_client_handler.rs
index b72362fdfc36..27f1a9deea49 100644
--- a/client/network/src/light_client_handler.rs
+++ b/client/network/src/light_client_handler.rs
@@ -44,6 +44,7 @@ use libp2p::{
 		upgrade::{OutboundUpgrade, read_one, write_one}
 	},
 	swarm::{
+		AddressRecord,
 		NegotiatedSubstream,
 		NetworkBehaviour,
 		NetworkBehaviourAction,
@@ -1463,7 +1464,7 @@ mod tests {
 	impl PollParameters for EmptyPollParams {
 		type SupportedProtocolsIter = iter::Empty<Vec<u8>>;
 		type ListenedAddressesIter = iter::Empty<Multiaddr>;
-		type ExternalAddressesIter = iter::Empty<Multiaddr>;
+		type ExternalAddressesIter = iter::Empty<AddressRecord>;
 
 		fn supported_protocols(&self) -> Self::SupportedProtocolsIter {
 			iter::empty()
diff --git a/client/network/src/peer_info.rs b/client/network/src/peer_info.rs
index e69ad2b17e59..0bf2fe59fa21 100644
--- a/client/network/src/peer_info.rs
+++ b/client/network/src/peer_info.rs
@@ -304,8 +304,8 @@ impl NetworkBehaviour for PeerInfoBehaviour {
 						handler,
 						event: EitherOutput::First(event)
 					}),
-				Poll::Ready(NetworkBehaviourAction::ReportObservedAddr { address }) =>
-					return Poll::Ready(NetworkBehaviourAction::ReportObservedAddr { address }),
+				Poll::Ready(NetworkBehaviourAction::ReportObservedAddr { address, score }) =>
+					return Poll::Ready(NetworkBehaviourAction::ReportObservedAddr { address, score }),
 			}
 		}
 
@@ -334,8 +334,8 @@ impl NetworkBehaviour for PeerInfoBehaviour {
 						handler,
 						event: EitherOutput::Second(event)
 					}),
-				Poll::Ready(NetworkBehaviourAction::ReportObservedAddr { address }) =>
-					return Poll::Ready(NetworkBehaviourAction::ReportObservedAddr { address }),
+				Poll::Ready(NetworkBehaviourAction::ReportObservedAddr { address, score }) =>
+					return Poll::Ready(NetworkBehaviourAction::ReportObservedAddr { address, score }),
 			}
 		}
 
diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index f794b106da24..9a8cfe7e1ffb 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -1489,8 +1489,8 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 				return Poll::Ready(NetworkBehaviourAction::DialPeer { peer_id, condition }),
 			Poll::Ready(NetworkBehaviourAction::NotifyHandler { peer_id, handler, event }) =>
 				return Poll::Ready(NetworkBehaviourAction::NotifyHandler { peer_id, handler, event }),
-			Poll::Ready(NetworkBehaviourAction::ReportObservedAddr { address }) =>
-				return Poll::Ready(NetworkBehaviourAction::ReportObservedAddr { address }),
+			Poll::Ready(NetworkBehaviourAction::ReportObservedAddr { address, score }) =>
+				return Poll::Ready(NetworkBehaviourAction::ReportObservedAddr { address, score }),
 		};
 
 		let outcome = match event {
diff --git a/client/network/src/request_responses.rs b/client/network/src/request_responses.rs
index a3a68f719d6b..69a2ffda1c89 100644
--- a/client/network/src/request_responses.rs
+++ b/client/network/src/request_responses.rs
@@ -398,9 +398,9 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 								event: ((*protocol).to_string(), event),
 							})
 						}
-						NetworkBehaviourAction::ReportObservedAddr { address } => {
+						NetworkBehaviourAction::ReportObservedAddr { address, score } => {
 							return Poll::Ready(NetworkBehaviourAction::ReportObservedAddr {
-								address,
+								address, score,
 							})
 						}
 					};
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 0a87c37703d8..c722c3e32d70 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -39,15 +39,40 @@ use crate::{
 	},
 	on_demand_layer::AlwaysBadChecker,
 	light_client_handler, block_requests,
-	protocol::{self, event::Event, NotifsHandlerError, NotificationsSink, Ready, sync::SyncState, PeerInfo, Protocol},
+	protocol::{
+		self,
+		NotifsHandlerError,
+		NotificationsSink,
+		PeerInfo,
+		Protocol,
+		Ready,
+		event::Event,
+		sync::SyncState,
+	},
 	transport, ReputationChange,
 };
 use futures::{channel::oneshot, prelude::*};
 use libp2p::{PeerId, multiaddr, Multiaddr};
-use libp2p::core::{ConnectedPoint, Executor, connection::{ConnectionError, PendingConnectionError}, either::EitherError};
+use libp2p::core::{
+	ConnectedPoint,
+	Executor,
+	connection::{
+		ConnectionLimits,
+		ConnectionError,
+		PendingConnectionError
+	},
+	either::EitherError,
+	upgrade
+};
 use libp2p::kad::record;
 use libp2p::ping::handler::PingFailure;
-use libp2p::swarm::{NetworkBehaviour, SwarmBuilder, SwarmEvent, protocols_handler::NodeHandlerWrapperError};
+use libp2p::swarm::{
+	AddressScore,
+	NetworkBehaviour,
+	SwarmBuilder,
+	SwarmEvent,
+	protocols_handler::NodeHandlerWrapperError
+};
 use log::{error, info, trace, warn};
 use metrics::{Metrics, MetricSources, Histogram, HistogramVec};
 use parking_lot::Mutex;
@@ -332,7 +357,11 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 				transport::build_transport(local_identity, config_mem, config_wasm)
 			};
 			let mut builder = SwarmBuilder::new(transport, behaviour, local_peer_id.clone())
-				.peer_connection_limit(crate::MAX_CONNECTIONS_PER_PEER)
+				.connection_limits(ConnectionLimits::default()
+					.with_max_established_per_peer(Some(crate::MAX_CONNECTIONS_PER_PEER as u32))
+					.with_max_established_incoming(Some(crate::MAX_CONNECTIONS_ESTABLISHED_INCOMING))
+				)
+				.substream_upgrade_protocol_override(upgrade::Version::V1Lazy)
 				.notify_handler_buffer_size(NonZeroUsize::new(32).expect("32 != 0; qed"))
 				.connection_event_buffer_size(1024);
 			if let Some(spawner) = params.executor {
@@ -368,7 +397,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 
 		// Add external addresses.
 		for addr in &params.network_config.public_addresses {
-			Swarm::<B, H>::add_external_address(&mut swarm, addr.clone());
+			Swarm::<B, H>::add_external_address(&mut swarm, addr.clone(), AddressScore::Infinite);
 		}
 
 		let external_addresses = Arc::new(Mutex::new(Vec::new()));
@@ -551,10 +580,17 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 				.collect()
 		};
 
+		let peer_id = Swarm::<B, H>::local_peer_id(&swarm).to_base58();
+		let listened_addresses = Swarm::<B, H>::listeners(&swarm).cloned().collect();
+		let external_addresses = Swarm::<B, H>::external_addresses(&swarm)
+			.map(|r| &r.addr)
+			.cloned()
+			.collect();
+
 		NetworkState {
-			peer_id: Swarm::<B, H>::local_peer_id(&swarm).to_base58(),
-			listened_addresses: Swarm::<B, H>::listeners(&swarm).cloned().collect(),
-			external_addresses: Swarm::<B, H>::external_addresses(&swarm).cloned().collect(),
+			peer_id,
+			listened_addresses,
+			external_addresses,
 			connected_peers,
 			not_connected_peers,
 			peerset: swarm.user_protocol_mut().peerset_debug_info(),
@@ -1660,7 +1696,10 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 		// Update the variables shared with the `NetworkService`.
 		this.num_connected.store(num_connected_peers, Ordering::Relaxed);
 		{
-			let external_addresses = Swarm::<B, H>::external_addresses(&this.network_service).cloned().collect();
+			let external_addresses = Swarm::<B, H>::external_addresses(&this.network_service)
+				.map(|r| &r.addr)
+				.cloned()
+				.collect();
 			*this.external_addresses.lock() = external_addresses;
 		}
 
@@ -1687,7 +1726,9 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 			}
 			metrics.peerset_num_discovered.set(this.network_service.user_protocol().num_discovered_peers() as u64);
 			metrics.peerset_num_requested.set(this.network_service.user_protocol().requested_peers().count() as u64);
-			metrics.pending_connections.set(Swarm::network_info(&this.network_service).num_connections_pending as u64);
+			metrics.pending_connections.set(
+				Swarm::network_info(&this.network_service).connection_counters().num_pending() as u64
+			);
 		}
 
 		Poll::Pending
diff --git a/client/network/src/transport.rs b/client/network/src/transport.rs
index 035b3a9716a0..4bf252d57978 100644
--- a/client/network/src/transport.rs
+++ b/client/network/src/transport.rs
@@ -17,9 +17,9 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use libp2p::{
-	InboundUpgradeExt, OutboundUpgradeExt, PeerId, Transport,
+	PeerId, Transport,
 	core::{
-		self, either::{EitherOutput, EitherTransport}, muxing::StreamMuxerBox,
+		self, either::EitherTransport, muxing::StreamMuxerBox,
 		transport::{Boxed, OptionalTransport}, upgrade
 	},
 	mplex, identity, bandwidth, wasm_ext, noise
@@ -74,11 +74,7 @@ pub fn build_transport(
 		// For more information about these two panics, see in "On the Importance of
 		// Checking Cryptographic Protocols for Faults" by Dan Boneh, Richard A. DeMillo,
 		// and Richard J. Lipton.
-		let noise_keypair_legacy = noise::Keypair::<noise::X25519>::new().into_authentic(&keypair)
-			.expect("can only fail in case of a hardware bug; since this signing is performed only \
-				once and at initialization, we're taking the bet that the inconvenience of a very \
-				rare panic here is basically zero");
-		let noise_keypair_spec = noise::Keypair::<noise::X25519Spec>::new().into_authentic(&keypair)
+		let noise_keypair = noise::Keypair::<noise::X25519Spec>::new().into_authentic(&keypair)
 			.expect("can only fail in case of a hardware bug; since this signing is performed only \
 				once and at initialization, we're taking the bet that the inconvenience of a very \
 				rare panic here is basically zero");
@@ -87,19 +83,9 @@ pub fn build_transport(
 		let mut noise_legacy = noise::LegacyConfig::default();
 		noise_legacy.recv_legacy_handshake = true;
 
-		let mut xx_config = noise::NoiseConfig::xx(noise_keypair_spec);
+		let mut xx_config = noise::NoiseConfig::xx(noise_keypair);
 		xx_config.set_legacy_config(noise_legacy.clone());
-		let mut ix_config = noise::NoiseConfig::ix(noise_keypair_legacy);
-		ix_config.set_legacy_config(noise_legacy);
-
-		let extract_peer_id = |result| match result {
-			EitherOutput::First((peer_id, o)) => (peer_id, EitherOutput::First(o)),
-			EitherOutput::Second((peer_id, o)) => (peer_id, EitherOutput::Second(o)),
-		};
-
-		core::upgrade::SelectUpgrade::new(xx_config.into_authenticated(), ix_config.into_authenticated())
-			.map_inbound(extract_peer_id)
-			.map_outbound(extract_peer_id)
+		xx_config.into_authenticated()
 	};
 
 	let multiplexing_config = {
@@ -115,7 +101,7 @@ pub fn build_transport(
 		core::upgrade::SelectUpgrade::new(yamux_config, mplex_config)
 	};
 
-	let transport = transport.upgrade(upgrade::Version::V1)
+	let transport = transport.upgrade(upgrade::Version::V1Lazy)
 		.authenticate(authentication_config)
 		.multiplex(multiplexing_config)
 		.timeout(Duration::from_secs(20))
diff --git a/client/network/test/Cargo.toml b/client/network/test/Cargo.toml
index a74aa90d4f4c..84fc5e2ef78a 100644
--- a/client/network/test/Cargo.toml
+++ b/client/network/test/Cargo.toml
@@ -19,7 +19,7 @@ parking_lot = "0.10.0"
 futures = "0.3.4"
 futures-timer = "3.0.1"
 rand = "0.7.2"
-libp2p = { version = "0.30.1", default-features = false }
+libp2p = { version = "0.31.1", default-features = false }
 sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
 sc-consensus = { version = "0.8.0", path = "../../../client/consensus/common" }
 sc-client-api = { version = "2.0.0", path = "../../api" }
diff --git a/client/peerset/Cargo.toml b/client/peerset/Cargo.toml
index efca00a24deb..8ec83b6fd64b 100644
--- a/client/peerset/Cargo.toml
+++ b/client/peerset/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 futures = "0.3.4"
-libp2p = { version = "0.30.1", default-features = false }
+libp2p = { version = "0.31.1", default-features = false }
 sp-utils = { version = "2.0.0", path = "../../primitives/utils"}
 log = "0.4.8"
 serde_json = "1.0.41"
diff --git a/client/telemetry/Cargo.toml b/client/telemetry/Cargo.toml
index fab0fe00869c..a91d55e0c063 100644
--- a/client/telemetry/Cargo.toml
+++ b/client/telemetry/Cargo.toml
@@ -19,7 +19,7 @@ parking_lot = "0.10.0"
 futures = "0.3.4"
 futures-timer = "3.0.1"
 wasm-timer = "0.2.5"
-libp2p = { version = "0.30.1", default-features = false, features = ["dns", "tcp-async-std", "wasm-ext", "websocket"] }
+libp2p = { version = "0.31.1", default-features = false, features = ["dns", "tcp-async-std", "wasm-ext", "websocket"] }
 log = "0.4.8"
 pin-project = "0.4.6"
 rand = "0.7.2"
diff --git a/frame/support/procedural/tools/Cargo.toml b/frame/support/procedural/tools/Cargo.toml
index 2cff2473b85d..b9a9cc7adb0d 100644
--- a/frame/support/procedural/tools/Cargo.toml
+++ b/frame/support/procedural/tools/Cargo.toml
@@ -16,4 +16,4 @@ frame-support-procedural-tools-derive = { version = "2.0.0", path = "./derive" }
 proc-macro2 = "1.0.6"
 quote = "1.0.3"
 syn = { version = "1.0.7", features = ["full", "visit"] }
-proc-macro-crate = "0.1.4"
+proc-macro-crate = "0.1.5"
diff --git a/primitives/consensus/common/Cargo.toml b/primitives/consensus/common/Cargo.toml
index 938745048c1b..a76abfcea360 100644
--- a/primitives/consensus/common/Cargo.toml
+++ b/primitives/consensus/common/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 thiserror = "1.0.21"
-libp2p = { version = "0.30.1", default-features = false }
+libp2p = { version = "0.31.1", default-features = false }
 log = "0.4.8"
 sp-core = { path= "../../core", version = "2.0.0"}
 sp-inherents = { version = "2.0.0", path = "../../inherents" }
diff --git a/utils/browser/Cargo.toml b/utils/browser/Cargo.toml
index 4f35cd988039..e56fea11a384 100644
--- a/utils/browser/Cargo.toml
+++ b/utils/browser/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 futures = { version = "0.3", features = ["compat"] }
 futures01 = { package = "futures", version = "0.1.29" }
 log = "0.4.8"
-libp2p-wasm-ext = { version = "0.24", features = ["websocket"] }
+libp2p-wasm-ext = { version = "0.25", features = ["websocket"] }
 console_error_panic_hook = "0.1.6"
 console_log = "0.1.2"
 js-sys = "0.3.34"

From c116342f207d9e59f6489b7f55218c650f978200 Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann <ben@gnunicorn.org>
Date: Fri, 27 Nov 2020 16:54:45 +0100
Subject: [PATCH 0113/1194] Add Key Subcommand to node-template (#7615)

---
 bin/node-template/node/src/cli.rs     | 2 ++
 bin/node-template/node/src/command.rs | 1 +
 2 files changed, 3 insertions(+)

diff --git a/bin/node-template/node/src/cli.rs b/bin/node-template/node/src/cli.rs
index f2faf17e4ddf..947123a6bbf5 100644
--- a/bin/node-template/node/src/cli.rs
+++ b/bin/node-template/node/src/cli.rs
@@ -12,6 +12,8 @@ pub struct Cli {
 
 #[derive(Debug, StructOpt)]
 pub enum Subcommand {
+	/// Key management cli utilities
+	Key(sc_cli::KeySubcommand),
 	/// Build a chain specification.
 	BuildSpec(sc_cli::BuildSpecCmd),
 
diff --git a/bin/node-template/node/src/command.rs b/bin/node-template/node/src/command.rs
index ac950b50483a..5c41643a2932 100644
--- a/bin/node-template/node/src/command.rs
+++ b/bin/node-template/node/src/command.rs
@@ -66,6 +66,7 @@ pub fn run() -> sc_cli::Result<()> {
 	let cli = Cli::from_args();
 
 	match &cli.subcommand {
+		Some(Subcommand::Key(cmd)) => cmd.run(),
 		Some(Subcommand::BuildSpec(cmd)) => {
 			let runner = cli.create_runner(cmd)?;
 			runner.sync_run(|config| cmd.run(config.chain_spec, config.network))

From de44c00109ea19de13ef9219f8888f968d484b55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Fri, 27 Nov 2020 17:36:58 +0100
Subject: [PATCH 0114/1194] Forward storage changes in manual seal (#7614)

This prevents nodes from executing the same block 2 times.
---
 client/consensus/manual-seal/src/lib.rs        | 10 +++++-----
 client/consensus/manual-seal/src/seal_block.rs |  9 +++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/client/consensus/manual-seal/src/lib.rs b/client/consensus/manual-seal/src/lib.rs
index 5a1cd0f79b47..9c4465f82fda 100644
--- a/client/consensus/manual-seal/src/lib.rs
+++ b/client/consensus/manual-seal/src/lib.rs
@@ -163,10 +163,10 @@ pub async fn run_manual_seal<B, BI, CB, E, C, A, SC, CS>(
 		C: HeaderBackend<B> + Finalizer<B, CB> + ProvideRuntimeApi<B> + 'static,
 		CB: ClientBackend<B> + 'static,
 		E: Environment<B> + 'static,
-		E::Error: std::fmt::Display,
-		<E::Proposer as Proposer<B>>::Error: std::fmt::Display,
+		E::Proposer: Proposer<B, Transaction = TransactionFor<C, B>>,
 		CS: Stream<Item=EngineCommand<<B as BlockT>::Hash>> + Unpin + 'static,
 		SC: SelectChain<B> + 'static,
+		TransactionFor<C, B>: 'static,
 {
 	while let Some(command) = commands_stream.next().await {
 		match command {
@@ -230,9 +230,9 @@ pub async fn run_instant_seal<B, BI, CB, E, C, A, SC>(
 		C: HeaderBackend<B> + Finalizer<B, CB> + ProvideRuntimeApi<B> + 'static,
 		CB: ClientBackend<B> + 'static,
 		E: Environment<B> + 'static,
-		E::Error: std::fmt::Display,
-		<E::Proposer as Proposer<B>>::Error: std::fmt::Display,
-		SC: SelectChain<B> + 'static
+		E::Proposer: Proposer<B, Transaction = TransactionFor<C, B>>,
+		SC: SelectChain<B> + 'static,
+		TransactionFor<C, B>: 'static,
 {
 	// instant-seal creates blocks as soon as transactions are imported
 	// into the transaction pool.
diff --git a/client/consensus/manual-seal/src/seal_block.rs b/client/consensus/manual-seal/src/seal_block.rs
index 58f017f2d41a..a4afaa343e90 100644
--- a/client/consensus/manual-seal/src/seal_block.rs
+++ b/client/consensus/manual-seal/src/seal_block.rs
@@ -87,10 +87,10 @@ pub async fn seal_block<B, BI, SC, C, E, P>(
 			+ Send + Sync + 'static,
 		C: HeaderBackend<B> + ProvideRuntimeApi<B>,
 		E: Environment<B>,
-		<E as Environment<B>>::Error: std::fmt::Display,
-		<E::Proposer as Proposer<B>>::Error: std::fmt::Display,
+		E::Proposer: Proposer<B, Transaction = TransactionFor<C, B>>,
 		P: txpool::ChainApi<Block=B>,
 		SC: SelectChain<B>,
+		TransactionFor<C, B>: 'static,
 {
 	let future = async {
 		if pool.validated_pool().status().ready == 0 && !create_empty {
@@ -111,7 +111,7 @@ pub async fn seal_block<B, BI, SC, C, E, P>(
 		};
 
 		let proposer = env.init(&parent)
-			.map_err(|err| Error::StringError(format!("{}", err))).await?;
+			.map_err(|err| Error::StringError(format!("{:?}", err))).await?;
 		let id = inherent_data_provider.create_inherent_data()?;
 		let inherents_len = id.len();
 
@@ -122,7 +122,7 @@ pub async fn seal_block<B, BI, SC, C, E, P>(
 		};
 
 		let proposal = proposer.propose(id.clone(), digest, Duration::from_secs(MAX_PROPOSAL_DURATION), false.into())
-			.map_err(|err| Error::StringError(format!("{}", err))).await?;
+			.map_err(|err| Error::StringError(format!("{:?}", err))).await?;
 
 		if proposal.block.extrinsics().len() == inherents_len && !create_empty {
 			return Err(Error::EmptyTransactionPool)
@@ -133,6 +133,7 @@ pub async fn seal_block<B, BI, SC, C, E, P>(
 		params.body = Some(body);
 		params.finalized = finalize;
 		params.fork_choice = Some(ForkChoiceStrategy::LongestChain);
+		params.storage_changes = Some(proposal.storage_changes);
 
 		if let Some(digest_provider) = digest_provider {
 			digest_provider.append_block_import(&parent, &mut params, &id)?;

From d428fc79a52fce1255442ed84ec42415aea487bf Mon Sep 17 00:00:00 2001
From: Bernhard Schuster <bernhard@ahoi.io>
Date: Fri, 27 Nov 2020 19:37:53 +0100
Subject: [PATCH 0115/1194] =?UTF-8?q?chore/error:=20remove=20from=20str=20?=
 =?UTF-8?q?conversion=20and=20add=20deprecation=20notificat=E2=80=A6=20(#7?=
 =?UTF-8?q?472)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore/error: remove from str conversion and add deprecation notifications

* fixup changes

* fix test looking for gone ::Msg variant

* another test fix

* one is duplicate, the other is not, so duplicates reported are n-1

* darn spaces

Co-authored-by: Andronik Ordian <write@reusable.software>

* remove pointless doc comments of error variants without any value

* low hanging fruits (for a tall person)

* moar error type variants

* avoid the storage modules for now

They are in need of a refactor, and the pain is rather large
removing all String error and DefaultError occurences.

* chore remove pointless error generic

* fix test for mocks, add a bunch of non_exhaustive

* max line width

* test fixes due to error changes

* fin

* error outputs... again

* undo stderr adjustments

* Update client/consensus/slots/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* remove closure clutter

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* more error types

* introduce ApiError

* extract Mock error

* ApiError refactor

* even more error types

* the last for now

* chore unused deps

* another extraction

* reduce should panic, due to extended error messages

* error test happiness

* shift error lines by one

* doc tests

* white space

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Into -> From

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* remove pointless codec

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* avoid pointless self import

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Co-authored-by: Bernhard Schuster <bernhard@parity.io>
Co-authored-by: Andronik Ordian <write@reusable.software>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 Cargo.lock                                    |  16 ++-
 client/api/Cargo.toml                         |   1 +
 client/api/src/light.rs                       |  16 ++-
 .../basic-authorship/src/basic_authorship.rs  |   5 +-
 client/block-builder/src/lib.rs               |   2 +-
 client/cli/src/error.rs                       |  45 +++---
 client/consensus/slots/Cargo.toml             |   3 +-
 client/consensus/slots/src/lib.rs             |  22 ++-
 client/db/src/lib.rs                          |  12 +-
 client/executor/common/Cargo.toml             |   3 +-
 client/executor/common/src/error.rs           |  89 ++++++------
 client/executor/common/src/lib.rs             |   1 +
 client/executor/common/src/util.rs            |  16 +--
 client/executor/src/integration_tests/mod.rs  |   2 +-
 client/light/src/call_executor.rs             |   3 +-
 client/light/src/fetcher.rs                   |  14 +-
 client/network/src/light_client_handler.rs    |   2 +-
 client/network/src/on_demand_layer.rs         |  23 ++-
 client/rpc/src/state/state_full.rs            |   6 +-
 client/service/Cargo.toml                     |   4 +-
 client/service/src/client/call_executor.rs    |  22 ++-
 client/service/src/client/client.rs           |   5 +-
 client/service/src/client/wasm_override.rs    |  53 ++++---
 client/service/src/error.rs                   |  64 ++++-----
 client/state-db/Cargo.toml                    |   3 +-
 client/sync-state-rpc/Cargo.toml              |   1 +
 client/sync-state-rpc/src/lib.rs              |  52 ++++---
 client/transaction-pool/Cargo.toml            |   2 +-
 client/transaction-pool/graph/Cargo.toml      |   1 +
 client/transaction-pool/graph/src/error.rs    |  24 ++--
 client/transaction-pool/src/error.rs          |  30 ++--
 primitives/api/Cargo.toml                     |   2 +
 .../api/proc-macro/src/decl_runtime_apis.rs   |   8 +-
 .../proc-macro/src/mock_impl_runtime_apis.rs  |   4 +-
 primitives/api/src/lib.rs                     |  44 +++++-
 primitives/api/test/tests/decl_and_impl.rs    |  22 ++-
 .../ui/mock_advanced_block_id_by_value.rs     |   3 +-
 .../ui/mock_advanced_block_id_by_value.stderr |  14 +-
 .../tests/ui/mock_advanced_missing_blockid.rs |   3 +-
 .../ui/mock_advanced_missing_blockid.stderr   |   4 +-
 .../tests/ui/mock_only_one_error_type.stderr  |   8 +-
 primitives/blockchain/Cargo.toml              |   2 +
 primitives/blockchain/src/backend.rs          |   4 +-
 primitives/blockchain/src/error.rs            | 131 +++++++++++-------
 primitives/consensus/common/src/error.rs      |   1 +
 primitives/state-machine/src/error.rs         |   8 +-
 primitives/transaction-pool/Cargo.toml        |   4 +-
 primitives/transaction-pool/src/error.rs      |  42 +++---
 48 files changed, 498 insertions(+), 348 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7444178d73b4..b34d5f76c225 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6574,6 +6574,7 @@ dependencies = [
  "sp-version",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime",
+ "thiserror",
 ]
 
 [[package]]
@@ -6837,6 +6838,7 @@ dependencies = [
  "sp-state-machine",
  "sp-trie",
  "substrate-test-runtime-client",
+ "thiserror",
 ]
 
 [[package]]
@@ -6897,14 +6899,13 @@ name = "sc-executor-common"
 version = "0.8.0"
 dependencies = [
  "derive_more",
- "log",
  "parity-scale-codec",
  "parity-wasm 0.41.0",
  "sp-allocator",
  "sp-core",
- "sp-runtime-interface",
  "sp-serializer",
  "sp-wasm-interface",
+ "thiserror",
  "wasmi",
 ]
 
@@ -7328,7 +7329,6 @@ name = "sc-service"
 version = "0.8.0"
 dependencies = [
  "async-std",
- "derive_more",
  "directories 3.0.1",
  "exit-future",
  "futures 0.1.30",
@@ -7387,6 +7387,7 @@ dependencies = [
  "substrate-test-runtime",
  "substrate-test-runtime-client",
  "tempfile",
+ "thiserror",
  "tokio 0.2.23",
  "tracing",
  "tracing-futures",
@@ -7440,6 +7441,7 @@ dependencies = [
  "parking_lot 0.10.2",
  "sc-client-api",
  "sp-core",
+ "thiserror",
 ]
 
 [[package]]
@@ -7458,6 +7460,7 @@ dependencies = [
  "serde_json",
  "sp-blockchain",
  "sp-runtime",
+ "thiserror",
 ]
 
 [[package]]
@@ -7519,6 +7522,7 @@ dependencies = [
  "sp-transaction-pool",
  "sp-utils",
  "substrate-test-runtime",
+ "thiserror",
  "wasm-timer",
 ]
 
@@ -7527,7 +7531,6 @@ name = "sc-transaction-pool"
 version = "2.0.0"
 dependencies = [
  "assert_matches",
- "derive_more",
  "futures 0.3.8",
  "futures-diagnose",
  "hex",
@@ -7551,6 +7554,7 @@ dependencies = [
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
  "substrate-test-runtime-transaction-pool",
+ "thiserror",
  "wasm-timer",
 ]
 
@@ -7992,6 +7996,7 @@ dependencies = [
  "sp-std",
  "sp-test-primitives",
  "sp-version",
+ "thiserror",
 ]
 
 [[package]]
@@ -8110,10 +8115,12 @@ dependencies = [
 name = "sp-blockchain"
 version = "2.0.0"
 dependencies = [
+ "futures 0.3.8",
  "log",
  "lru 0.6.1",
  "parity-scale-codec",
  "parking_lot 0.10.2",
+ "sp-api",
  "sp-consensus",
  "sp-database",
  "sp-runtime",
@@ -8669,6 +8676,7 @@ dependencies = [
  "sp-api",
  "sp-blockchain",
  "sp-runtime",
+ "thiserror",
 ]
 
 [[package]]
diff --git a/client/api/Cargo.toml b/client/api/Cargo.toml
index 7d770912f271..07036bfb414a 100644
--- a/client/api/Cargo.toml
+++ b/client/api/Cargo.toml
@@ -46,3 +46,4 @@ prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.
 kvdb-memorydb = "0.7.0"
 sp-test-primitives = { version = "2.0.0", path = "../../primitives/test-primitives" }
 substrate-test-runtime = { version = "2.0.0", path = "../../test-utils/runtime"  }
+thiserror = "1.0.21"
diff --git a/client/api/src/light.rs b/client/api/src/light.rs
index 144851dac007..f9ba64544a8c 100644
--- a/client/api/src/light.rs
+++ b/client/api/src/light.rs
@@ -312,13 +312,21 @@ pub mod tests {
 	use sp_test_primitives::{Block, Header, Extrinsic};
 	use super::*;
 
+	#[derive(Debug, thiserror::Error)]
+	#[error("Not implemented on test node")]
+	struct MockError;
+
+	impl Into<ClientError> for MockError {
+		fn into(self) -> ClientError {
+			ClientError::Application(Box::new(self))
+		}
+	}	
+	
 	pub type OkCallFetcher = Mutex<Vec<u8>>;
 
-	fn not_implemented_in_tests<T, E>() -> Ready<Result<T, E>>
-	where
-		E: std::convert::From<&'static str>,
+	fn not_implemented_in_tests<T>() -> Ready<Result<T, ClientError>>
 	{
-		futures::future::ready(Err("Not implemented on test node".into()))
+		futures::future::ready(Err(MockError.into()))
 	}
 
 	impl Fetcher<Block> for OkCallFetcher {
diff --git a/client/basic-authorship/src/basic_authorship.rs b/client/basic-authorship/src/basic_authorship.rs
index 2fe7ba72ec7b..8c022ef3a974 100644
--- a/client/basic-authorship/src/basic_authorship.rs
+++ b/client/basic-authorship/src/basic_authorship.rs
@@ -208,10 +208,7 @@ impl<A, B, Block, C> sp_consensus::Proposer<Block> for
 		}));
 
 		async move {
-			match rx.await {
-				Ok(x) => x,
-				Err(err) => Err(sp_blockchain::Error::Msg(err.to_string()))
-			}
+			rx.await?
 		}.boxed()
 	}
 }
diff --git a/client/block-builder/src/lib.rs b/client/block-builder/src/lib.rs
index 8a38bb847800..cc1431ea349b 100644
--- a/client/block-builder/src/lib.rs
+++ b/client/block-builder/src/lib.rs
@@ -212,7 +212,7 @@ where
 			&state,
 			changes_trie_state.as_ref(),
 			parent_hash,
-		)?;
+		).map_err(|e| sp_blockchain::Error::StorageChanges(e))?;
 
 		Ok(BuiltBlock {
 			block: <Block as BlockT>::new(header, self.extrinsics),
diff --git a/client/cli/src/error.rs b/client/cli/src/error.rs
index 36c963f3e8c9..5190cae2c2ff 100644
--- a/client/cli/src/error.rs
+++ b/client/cli/src/error.rs
@@ -25,35 +25,32 @@ pub type Result<T> = std::result::Result<T, Error>;
 
 /// Error type for the CLI.
 #[derive(Debug, thiserror::Error)]
+#[allow(missing_docs)]
 pub enum Error {
-	/// Io error
 	#[error(transparent)]
 	Io(#[from] std::io::Error),
-	/// Cli error
+
 	#[error(transparent)]
 	Cli(#[from] structopt::clap::Error),
-	/// Service error
+
 	#[error(transparent)]
 	Service(#[from] sc_service::Error),
-	/// Client error
+
 	#[error(transparent)]
 	Client(#[from] sp_blockchain::Error),
-	/// scale codec error
+
 	#[error(transparent)]
 	Codec(#[from] parity_scale_codec::Error),
-	/// Input error
+
 	#[error("Invalid input: {0}")]
 	Input(String),
-	/// Invalid listen multiaddress
+
 	#[error("Invalid listen multiaddress")]
 	InvalidListenMultiaddress,
-	/// Application specific error chain sequence forwarder.
-	#[error(transparent)]
-	Application(#[from] Box<dyn std::error::Error + Send + Sync + 'static>),
-	/// URI error.
+
 	#[error("Invalid URI; expecting either a secret URI or a public URI.")]
 	InvalidUri(crypto::PublicError),
-	/// Signature length mismatch.
+
 	#[error("Signature has an invalid length. Read {read} bytes, expected {expected} bytes")]
 	SignatureInvalidLength {
 		/// Amount of signature bytes read.
@@ -61,28 +58,28 @@ pub enum Error {
 		/// Expected number of signature bytes.
 		expected: usize,
 	},
-	/// Missing base path argument.
+
 	#[error("The base path is missing, please provide one")]
 	MissingBasePath,
-	/// Unknown key type specifier or missing key type specifier.
+
 	#[error("Unknown key type, must be a known 4-character sequence")]
 	KeyTypeInvalid,
-	/// Signature verification failed.
+
 	#[error("Signature verification failed")]
 	SignatureInvalid,
-	/// Storing a given key failed.
+
 	#[error("Key store operation failed")]
 	KeyStoreOperation,
-	/// An issue with the underlying key storage was encountered.
+
 	#[error("Key storage issue encountered")]
 	KeyStorage(#[from] sc_keystore::Error),
-	/// Bytes are not decodable when interpreted as hexadecimal string.
-	#[error("Invalid hex base data")]
+
+	#[error("Invalid hexadecimal string data")]
 	HexDataConversion(#[from] hex::FromHexError),
-	/// Shortcut type to specify types on the fly, discouraged.
-	#[deprecated = "Use `Forwarded` with an error type instead."]
-	#[error("Other: {0}")]
-	Other(String),
+
+	/// Application specific error chain sequence forwarder.
+	#[error(transparent)]
+	Application(#[from] Box<dyn std::error::Error + Send + Sync + 'static>),
 }
 
 impl std::convert::From<&str> for Error {
@@ -93,7 +90,7 @@ impl std::convert::From<&str> for Error {
 
 impl std::convert::From<String> for Error {
 	fn from(s: String) -> Error {
-		Error::Input(s.to_string())
+		Error::Input(s)
 	}
 }
 
diff --git a/client/consensus/slots/Cargo.toml b/client/consensus/slots/Cargo.toml
index d07ef49835b2..e8bd1f33631e 100644
--- a/client/consensus/slots/Cargo.toml
+++ b/client/consensus/slots/Cargo.toml
@@ -31,7 +31,8 @@ sp-inherents = { version = "2.0.0", path = "../../../primitives/inherents" }
 futures = "0.3.4"
 futures-timer = "3.0.1"
 parking_lot = "0.10.0"
-log = "0.4.8"
+log = "0.4.11"
+thiserror = "1.0.21"
 
 [dev-dependencies]
 substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
diff --git a/client/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs
index d8601a7c12c6..ab8fc16007ce 100644
--- a/client/consensus/slots/src/lib.rs
+++ b/client/consensus/slots/src/lib.rs
@@ -20,7 +20,8 @@
 //! time during which certain events can and/or must occur.  This crate
 //! provides generic functionality for slots.
 
-#![forbid(unsafe_code, missing_docs)]
+#![forbid(unsafe_code)]
+#![deny(missing_docs)]
 
 mod slots;
 mod aux_schema;
@@ -470,6 +471,15 @@ pub enum CheckedHeader<H, S> {
 	Checked(H, S),
 }
 
+
+
+#[derive(Debug, thiserror::Error)]
+#[allow(missing_docs)]
+pub enum Error<T> where T: SlotData + Clone + Debug + Send + Sync + 'static {
+	#[error("Slot duration is invalid: {0:?}")]
+	SlotDurationInvalid(SlotDuration<T>),
+}
+
 /// A slot duration. Create with `get_or_compute`.
 // The internal member should stay private here to maintain invariants of
 // `get_or_compute`.
@@ -494,7 +504,7 @@ impl<T: SlotData + Clone> SlotData for SlotDuration<T> {
 	const SLOT_KEY: &'static [u8] = T::SLOT_KEY;
 }
 
-impl<T: Clone> SlotDuration<T> {
+impl<T: Clone + Send + Sync + 'static> SlotDuration<T> {
 	/// Either fetch the slot duration from disk or compute it from the
 	/// genesis state.
 	///
@@ -532,10 +542,8 @@ impl<T: Clone> SlotDuration<T> {
 			}
 		}?;
 
-		if slot_duration.slot_duration() == 0 {
-			return Err(sp_blockchain::Error::Msg(
-				"Invalid value for slot_duration: the value must be greater than 0.".into(),
-			))
+		if slot_duration.slot_duration() == 0u64 {
+			return Err(sp_blockchain::Error::Application(Box::new(Error::SlotDurationInvalid(slot_duration))))
 		}
 
 		Ok(slot_duration)
@@ -939,7 +947,7 @@ mod test {
 			true, true, true, true,
 	];
 
-		assert_eq!(backoff, expected);
+		assert_eq!(backoff.as_slice(), &expected[..]);
 	}
 
 	#[test]
diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index 983459cfebe3..8254e652f68b 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -891,9 +891,7 @@ impl<Block: BlockT> Backend<Block> {
 		let is_archive_pruning = config.pruning.is_archive();
 		let blockchain = BlockchainDb::new(db.clone())?;
 		let meta = blockchain.meta.clone();
-		let map_e = |e: sc_state_db::Error<io::Error>| sp_blockchain::Error::from(
-			format!("State database error: {:?}", e)
-		);
+		let map_e = |e: sc_state_db::Error<io::Error>| sp_blockchain::Error::from_state_db(e);
 		let state_db: StateDb<_, _> = StateDb::new(
 			config.pruning.clone(),
 			!config.source.supports_ref_counting(),
@@ -1082,7 +1080,7 @@ impl<Block: BlockT> Backend<Block> {
 
 			trace!(target: "db", "Canonicalize block #{} ({:?})", new_canonical, hash);
 			let commit = self.storage.state_db.canonicalize_block(&hash)
-				.map_err(|e: sc_state_db::Error<io::Error>| sp_blockchain::Error::from(format!("State database error: {:?}", e)))?;
+				.map_err(|e: sc_state_db::Error<io::Error>| sp_blockchain::Error::from_state_db(e))?;
 			apply_state_commit(transaction, commit);
 		};
 
@@ -1212,9 +1210,7 @@ impl<Block: BlockT> Backend<Block> {
 					number_u64,
 					&pending_block.header.parent_hash(),
 					changeset,
-				).map_err(|e: sc_state_db::Error<io::Error>|
-					sp_blockchain::Error::from(format!("State database error: {:?}", e))
-				)?;
+				).map_err(|e: sc_state_db::Error<io::Error>| sp_blockchain::Error::from_state_db(e))?;
 				apply_state_commit(&mut transaction, commit);
 
 				// Check if need to finalize. Genesis is always finalized instantly.
@@ -1379,7 +1375,7 @@ impl<Block: BlockT> Backend<Block> {
 			transaction.set_from_vec(columns::META, meta_keys::FINALIZED_BLOCK, lookup_key);
 
 			let commit = self.storage.state_db.canonicalize_block(&f_hash)
-				.map_err(|e: sc_state_db::Error<io::Error>| sp_blockchain::Error::from(format!("State database error: {:?}", e)))?;
+				.map_err(|e: sc_state_db::Error<io::Error>| sp_blockchain::Error::from_state_db(e))?;
 			apply_state_commit(transaction, commit);
 
 			if !f_num.is_zero() {
diff --git a/client/executor/common/Cargo.toml b/client/executor/common/Cargo.toml
index 64ed23598f47..8501144a9a98 100644
--- a/client/executor/common/Cargo.toml
+++ b/client/executor/common/Cargo.toml
@@ -14,7 +14,6 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-log = "0.4.8"
 derive_more = "0.99.2"
 parity-wasm = "0.41.0"
 codec = { package = "parity-scale-codec", version = "1.3.4" }
@@ -22,8 +21,8 @@ wasmi = "0.6.2"
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
 sp-allocator = { version = "2.0.0", path = "../../../primitives/allocator" }
 sp-wasm-interface = { version = "2.0.0", path = "../../../primitives/wasm-interface" }
-sp-runtime-interface = { version = "2.0.0", path = "../../../primitives/runtime-interface" }
 sp-serializer = { version = "2.0.0", path = "../../../primitives/serializer" }
+thiserror = "1.0.21"
 
 [features]
 default = []
diff --git a/client/executor/common/src/error.rs b/client/executor/common/src/error.rs
index caed63c183e6..caf6159da072 100644
--- a/client/executor/common/src/error.rs
+++ b/client/executor/common/src/error.rs
@@ -25,92 +25,95 @@ use wasmi;
 pub type Result<T> = std::result::Result<T, Error>;
 
 /// Error type.
-#[derive(Debug, derive_more::Display, derive_more::From)]
+#[derive(Debug, thiserror::Error)]
+#[allow(missing_docs)]
 pub enum Error {
 	/// Unserializable Data
-	InvalidData(sp_serializer::Error),
+	#[error("Unserializable data encountered")]
+	InvalidData(#[from] sp_serializer::Error),
 	/// Trap occurred during execution
-	Trap(wasmi::Trap),
+	#[error(transparent)]
+	Trap(#[from] wasmi::Trap),
 	/// Wasmi loading/instantiating error
-	Wasmi(wasmi::Error),
+	#[error(transparent)]
+	Wasmi(#[from] wasmi::Error),
 	/// Error in the API. Parameter is an error message.
-	#[from(ignore)]
+	#[error("API Error: {0}")]
 	ApiError(String),
 	/// Method is not found
-	#[display(fmt="Method not found: '{}'", _0)]
-	#[from(ignore)]
+	#[error("Method not found: '{0}'")]
 	MethodNotFound(String),
 	/// Code is invalid (expected single byte)
-	#[display(fmt="Invalid Code: {}", _0)]
-	#[from(ignore)]
+	#[error("Invalid Code: '{0}'")]
 	InvalidCode(String),
 	/// Could not get runtime version.
-	#[display(fmt="On-chain runtime does not specify version")]
+	#[error("On-chain runtime does not specify version")]
 	VersionInvalid,
 	/// Externalities have failed.
-	#[display(fmt="Externalities error")]
+	#[error("Externalities error")]
 	Externalities,
 	/// Invalid index.
-	#[display(fmt="Invalid index provided")]
+	#[error("Invalid index provided")]
 	InvalidIndex,
 	/// Invalid return type.
-	#[display(fmt="Invalid type returned (should be u64)")]
+	#[error("Invalid type returned (should be u64)")]
 	InvalidReturn,
 	/// Runtime failed.
-	#[display(fmt="Runtime error")]
+	#[error("Runtime error")]
 	Runtime,
 	/// Runtime panicked.
-	#[display(fmt="Runtime panicked: {}", _0)]
-	#[from(ignore)]
+	#[error("Runtime panicked: {0}")]
 	RuntimePanicked(String),
 	/// Invalid memory reference.
-	#[display(fmt="Invalid memory reference")]
+	#[error("Invalid memory reference")]
 	InvalidMemoryReference,
 	/// The runtime must provide a global named `__heap_base` of type i32 for specifying where the
 	/// allocator is allowed to place its data.
-	#[display(fmt="The runtime doesn't provide a global named `__heap_base`")]
+	#[error("The runtime doesn't provide a global named `__heap_base`")]
 	HeapBaseNotFoundOrInvalid,
 	/// The runtime WebAssembly module is not allowed to have the `start` function.
-	#[display(fmt="The runtime has the `start` function")]
+	#[error("The runtime has the `start` function")]
 	RuntimeHasStartFn,
 	/// Some other error occurred
+	#[error("Other: {0}")]
 	Other(String),
 	/// Some error occurred in the allocator
-	#[display(fmt="Error in allocator: {}", _0)]
-	Allocator(sp_allocator::Error),
+	#[error("Allocation Error")]
+	Allocator(#[from] sp_allocator::Error),
 	/// Execution of a host function failed.
-	#[display(fmt="Host function {} execution failed with: {}", _0, _1)]
+	#[error("Host function {0} execution failed with: {1}")]
 	FunctionExecution(String, String),
 	/// No table is present.
 	///
 	/// Call was requested that requires table but none was present in the instance.
-	#[display(fmt="No table exported by wasm blob")]
+	#[error("No table exported by wasm blob")]
 	NoTable,
 	/// No table entry is present.
 	///
 	/// Call was requested that requires specific entry in the table to be present.
-	#[display(fmt="No table entry with index {} in wasm blob exported table", _0)]
-	#[from(ignore)]
+	#[error("No table entry with index {0} in wasm blob exported table")]
 	NoTableEntryWithIndex(u32),
 	/// Table entry is not a function.
-	#[display(fmt="Table element with index {} is not a function in wasm blob exported table", _0)]
-	#[from(ignore)]
+	#[error("Table element with index {0} is not a function in wasm blob exported table")]
 	TableElementIsNotAFunction(u32),
 	/// Function in table is null and thus cannot be called.
-	#[display(fmt="Table entry with index {} in wasm blob is null", _0)]
-	#[from(ignore)]
+	#[error("Table entry with index {0} in wasm blob is null")]
 	FunctionRefIsNull(u32),
-}
 
-impl std::error::Error for Error {
-	fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
-		match self {
-			Error::InvalidData(ref err) => Some(err),
-			Error::Trap(ref err) => Some(err),
-			Error::Wasmi(ref err) => Some(err),
-			_ => None,
-		}
-	}
+	#[error(transparent)]
+	RuntimeConstruction(#[from] WasmError),
+	
+	#[error("Shared memory is not supported")]
+	SharedMemUnsupported,
+	
+	#[error("Imported globals are not supported yet")]
+	ImportedGlobalsUnsupported,
+	
+	#[error("initializer expression can have only up to 2 expressions in wasm 1.0")]
+	InitializerHasTooManyExpressions,
+	
+	#[error("Invalid initializer expression provided {0}")]
+	InvalidInitializerExpression(String),
 }
 
 impl wasmi::HostError for Error {}
@@ -121,9 +124,9 @@ impl From<&'static str> for Error {
 	}
 }
 
-impl From<WasmError> for Error {
-	fn from(err: WasmError) -> Error {
-		Error::Other(err.to_string())
+impl From<String> for Error {
+	fn from(err: String) -> Error {
+		Error::Other(err)
 	}
 }
 
@@ -151,3 +154,5 @@ pub enum WasmError {
 	/// Other error happenend.
 	Other(String),
 }
+
+impl std::error::Error for WasmError {}
diff --git a/client/executor/common/src/lib.rs b/client/executor/common/src/lib.rs
index 7f3864e6152f..df839d4ab652 100644
--- a/client/executor/common/src/lib.rs
+++ b/client/executor/common/src/lib.rs
@@ -17,6 +17,7 @@
 //! A set of common definitions that are needed for defining execution engines.
 
 #![warn(missing_docs)]
+#![deny(unused_crate_dependencies)]
 
 pub mod error;
 pub mod sandbox;
diff --git a/client/executor/common/src/util.rs b/client/executor/common/src/util.rs
index 92a48e140181..564f9dadcbec 100644
--- a/client/executor/common/src/util.rs
+++ b/client/executor/common/src/util.rs
@@ -87,15 +87,12 @@ impl DataSegmentsSnapshot {
 				let init_expr = match segment.offset() {
 					Some(offset) => offset.code(),
 					// Return if the segment is passive
-					None => return Err(Error::from("Shared memory is not supported".to_string())),
+					None => return Err(Error::SharedMemUnsupported),
 				};
 
 				// [op, End]
 				if init_expr.len() != 2 {
-					return Err(Error::from(
-						"initializer expression can have only up to 2 expressions in wasm 1.0"
-							.to_string(),
-					));
+					return Err(Error::InitializerHasTooManyExpressions);
 				}
 				let offset = match &init_expr[0] {
 					Instruction::I32Const(v) => *v as u32,
@@ -106,15 +103,10 @@ impl DataSegmentsSnapshot {
 						// At the moment of writing the Substrate Runtime Interface does not provide
 						// any globals. There is nothing that prevents us from supporting this
 						// if/when we gain those.
-						return Err(Error::from(
-							"Imported globals are not supported yet".to_string(),
-						));
+						return Err(Error::ImportedGlobalsUnsupported);
 					}
 					insn => {
-						return Err(Error::from(format!(
-							"{:?} is not supported as initializer expression in wasm 1.0",
-							insn
-						)))
+						return Err(Error::InvalidInitializerExpression(format!("{:?}", insn)))
 					}
 				};
 
diff --git a/client/executor/src/integration_tests/mod.rs b/client/executor/src/integration_tests/mod.rs
index c8b763a6b193..08771847c25f 100644
--- a/client/executor/src/integration_tests/mod.rs
+++ b/client/executor/src/integration_tests/mod.rs
@@ -523,7 +523,7 @@ fn offchain_http_should_work(wasm_method: WasmExecutionMethod) {
 
 #[test_case(WasmExecutionMethod::Interpreted)]
 #[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
-#[should_panic(expected = "Allocator ran out of space")]
+#[should_panic]
 fn should_trap_when_heap_exhausted(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 
diff --git a/client/light/src/call_executor.rs b/client/light/src/call_executor.rs
index fa0f02cd5aed..458ea2bd6b84 100644
--- a/client/light/src/call_executor.rs
+++ b/client/light/src/call_executor.rs
@@ -276,7 +276,8 @@ pub fn check_execution_proof_with_make_header<Header, E, H, MakeNextHeader>(
 
 	// TODO: Remove when solved: https://github.com/paritytech/substrate/issues/5047
 	let backend_runtime_code = sp_state_machine::backend::BackendRuntimeCode::new(&trie_backend);
-	let runtime_code = backend_runtime_code.runtime_code()?;
+	let runtime_code = backend_runtime_code.runtime_code()
+		.map_err(|_e| ClientError::RuntimeCodeMissing)?;
 
 	execution_proof_check_on_trie_backend::<H, Header::Number, _, _>(
 		&trie_backend,
diff --git a/client/light/src/fetcher.rs b/client/light/src/fetcher.rs
index 33113c2fc7df..60fce87b8d0c 100644
--- a/client/light/src/fetcher.rs
+++ b/client/light/src/fetcher.rs
@@ -239,7 +239,7 @@ impl<E, Block, H, S> FetchChecker<Block> for LightDataChecker<E, H, Block, S>
 			convert_hash(request.header.state_root()),
 			remote_proof,
 			request.keys.iter(),
-		).map_err(Into::into)
+		).map_err(|e| ClientError::from(e))
 	}
 
 	fn check_read_child_proof(
@@ -249,14 +249,14 @@ impl<E, Block, H, S> FetchChecker<Block> for LightDataChecker<E, H, Block, S>
 	) -> ClientResult<HashMap<Vec<u8>, Option<Vec<u8>>>> {
 		let child_info = match ChildType::from_prefixed_key(&request.storage_key) {
 			Some((ChildType::ParentKeyId, storage_key)) => ChildInfo::new_default(storage_key),
-			None => return Err("Invalid child type".into()),
+			None => return Err(ClientError::InvalidChildType),
 		};
 		read_child_proof_check::<H, _>(
 			convert_hash(request.header.state_root()),
 			remote_proof,
 			&child_info,
 			request.keys.iter(),
-		).map_err(Into::into)
+		).map_err(|e| ClientError::from(e))
 	}
 
 	fn check_execution_proof(
@@ -292,10 +292,10 @@ impl<E, Block, H, S> FetchChecker<Block> for LightDataChecker<E, H, Block, S>
 		if *request.header.extrinsics_root() == extrinsics_root {
 			Ok(body)
 		} else {
-			Err(format!("RemoteBodyRequest: invalid extrinsics root expected: {} but got {}",
-				*request.header.extrinsics_root(),
-				extrinsics_root,
-			).into())
+			Err(ClientError::ExtrinsicRootInvalid {
+				received: request.header.extrinsics_root().to_string(),
+				expected: extrinsics_root.to_string(),
+			})
 		}
 
 	}
diff --git a/client/network/src/light_client_handler.rs b/client/network/src/light_client_handler.rs
index 27f1a9deea49..007cdcbf7a60 100644
--- a/client/network/src/light_client_handler.rs
+++ b/client/network/src/light_client_handler.rs
@@ -628,7 +628,7 @@ where
 		let prefixed_key = PrefixedStorageKey::new_ref(&request.storage_key);
 		let child_info = match ChildType::from_prefixed_key(prefixed_key) {
 			Some((ChildType::ParentKeyId, storage_key)) => Ok(ChildInfo::new_default(storage_key)),
-			None => Err("Invalid child storage key".into()),
+			None => Err(sp_blockchain::Error::InvalidChildStorageKey),
 		};
 		let proof = match child_info.and_then(|child_info| self.chain.read_child_proof(
 			&BlockId::Hash(block),
diff --git a/client/network/src/on_demand_layer.rs b/client/network/src/on_demand_layer.rs
index 084172ee57c4..6e0add18adb0 100644
--- a/client/network/src/on_demand_layer.rs
+++ b/client/network/src/on_demand_layer.rs
@@ -51,6 +51,17 @@ pub struct OnDemand<B: BlockT> {
 	requests_send: TracingUnboundedSender<light_client_handler::Request<B>>,
 }
 
+
+#[derive(Debug, thiserror::Error)]
+#[error("AlwaysBadChecker")]
+struct ErrorAlwaysBadChecker;
+
+impl Into<ClientError> for ErrorAlwaysBadChecker {
+	fn into(self) -> ClientError {
+		ClientError::Application(Box::new(self))
+	}
+}
+
 /// Dummy implementation of `FetchChecker` that always assumes that responses are bad.
 ///
 /// Considering that it is the responsibility of the client to build the fetcher, it can use this
@@ -65,7 +76,7 @@ impl<Block: BlockT> FetchChecker<Block> for AlwaysBadChecker {
 		_remote_header: Option<Block::Header>,
 		_remote_proof: StorageProof,
 	) -> Result<Block::Header, ClientError> {
-		Err(ClientError::Msg("AlwaysBadChecker".into()))
+		Err(ErrorAlwaysBadChecker.into())
 	}
 
 	fn check_read_proof(
@@ -73,7 +84,7 @@ impl<Block: BlockT> FetchChecker<Block> for AlwaysBadChecker {
 		_request: &RemoteReadRequest<Block::Header>,
 		_remote_proof: StorageProof,
 	) -> Result<HashMap<Vec<u8>,Option<Vec<u8>>>, ClientError> {
-		Err(ClientError::Msg("AlwaysBadChecker".into()))
+		Err(ErrorAlwaysBadChecker.into())
 	}
 
 	fn check_read_child_proof(
@@ -81,7 +92,7 @@ impl<Block: BlockT> FetchChecker<Block> for AlwaysBadChecker {
 		_request: &RemoteReadChildRequest<Block::Header>,
 		_remote_proof: StorageProof,
 	) -> Result<HashMap<Vec<u8>, Option<Vec<u8>>>, ClientError> {
-		Err(ClientError::Msg("AlwaysBadChecker".into()))
+		Err(ErrorAlwaysBadChecker.into())
 	}
 
 	fn check_execution_proof(
@@ -89,7 +100,7 @@ impl<Block: BlockT> FetchChecker<Block> for AlwaysBadChecker {
 		_request: &RemoteCallRequest<Block::Header>,
 		_remote_proof: StorageProof,
 	) -> Result<Vec<u8>, ClientError> {
-		Err(ClientError::Msg("AlwaysBadChecker".into()))
+		Err(ErrorAlwaysBadChecker.into())
 	}
 
 	fn check_changes_proof(
@@ -97,7 +108,7 @@ impl<Block: BlockT> FetchChecker<Block> for AlwaysBadChecker {
 		_request: &RemoteChangesRequest<Block::Header>,
 		_remote_proof: ChangesProof<Block::Header>
 	) -> Result<Vec<(NumberFor<Block>, u32)>, ClientError> {
-		Err(ClientError::Msg("AlwaysBadChecker".into()))
+		Err(ErrorAlwaysBadChecker.into())
 	}
 
 	fn check_body_proof(
@@ -105,7 +116,7 @@ impl<Block: BlockT> FetchChecker<Block> for AlwaysBadChecker {
 		_request: &RemoteBodyRequest<Block::Header>,
 		_body: Vec<Block::Extrinsic>
 	) -> Result<Vec<Block::Extrinsic>, ClientError> {
-		Err(ClientError::Msg("AlwaysBadChecker".into()))
+		Err(ErrorAlwaysBadChecker.into())
 	}
 }
 
diff --git a/client/rpc/src/state/state_full.rs b/client/rpc/src/state/state_full.rs
index fda73cea2711..a1b9fbc4eebc 100644
--- a/client/rpc/src/state/state_full.rs
+++ b/client/rpc/src/state/state_full.rs
@@ -541,7 +541,7 @@ impl<BE, Block, Client> ChildStateBackend<Block, Client> for FullState<BE, Block
 				.and_then(|block| {
 					let child_info = match ChildType::from_prefixed_key(&storage_key) {
 						Some((ChildType::ParentKeyId, storage_key)) => ChildInfo::new_default(storage_key),
-						None => return Err("Invalid child storage key".into()),
+						None => return Err(sp_blockchain::Error::InvalidChildStorageKey),
 					};
 					self.client.child_storage_keys(
 						&BlockId::Hash(block),
@@ -563,7 +563,7 @@ impl<BE, Block, Client> ChildStateBackend<Block, Client> for FullState<BE, Block
 				.and_then(|block| {
 					let child_info = match ChildType::from_prefixed_key(&storage_key) {
 						Some((ChildType::ParentKeyId, storage_key)) => ChildInfo::new_default(storage_key),
-						None => return Err("Invalid child storage key".into()),
+						None => return Err(sp_blockchain::Error::InvalidChildStorageKey),
 					};
 					self.client.child_storage(
 						&BlockId::Hash(block),
@@ -585,7 +585,7 @@ impl<BE, Block, Client> ChildStateBackend<Block, Client> for FullState<BE, Block
 				.and_then(|block| {
 					let child_info = match ChildType::from_prefixed_key(&storage_key) {
 						Some((ChildType::ParentKeyId, storage_key)) => ChildInfo::new_default(storage_key),
-						None => return Err("Invalid child storage key".into()),
+						None => return Err(sp_blockchain::Error::InvalidChildStorageKey),
 					};
 					self.client.child_storage_hash(
 						&BlockId::Hash(block),
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index 23af49d38b12..4350e1a2bf2a 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -24,7 +24,7 @@ wasmtime = [
 test-helpers = []
 
 [dependencies]
-derive_more = "0.99.2"
+thiserror = "1.0.21"
 futures01 = { package = "futures", version = "0.1.29" }
 futures = { version = "0.3.4", features = ["compat"] }
 jsonrpc-pubsub = "15.1"
@@ -32,7 +32,7 @@ jsonrpc-core = "15.1"
 rand = "0.7.3"
 parking_lot = "0.10.0"
 lazy_static = "1.4.0"
-log = "0.4.8"
+log = "0.4.11"
 slog = { version = "2.5.2", features = ["nested-values"] }
 futures-timer = "3.0.1"
 wasm-timer = "0.2"
diff --git a/client/service/src/client/call_executor.rs b/client/service/src/client/call_executor.rs
index 164976ecfe87..cd01a5877758 100644
--- a/client/service/src/client/call_executor.rs
+++ b/client/service/src/client/call_executor.rs
@@ -137,7 +137,9 @@ where
 		)?;
 		let state = self.backend.state_at(*id)?;
 		let state_runtime_code = sp_state_machine::backend::BackendRuntimeCode::new(&state);
-		let runtime_code = self.check_override(state_runtime_code.runtime_code()?, id)?;
+		let runtime_code = state_runtime_code.runtime_code()
+			.map_err(sp_blockchain::Error::RuntimeCode)?;
+		let runtime_code = self.check_override(runtime_code, id)?;
 
 		let return_data = StateMachine::new(
 			&state,
@@ -211,7 +213,10 @@ where
 				let state_runtime_code = sp_state_machine::backend::BackendRuntimeCode::new(&trie_state);
 				// It is important to extract the runtime code here before we create the proof
 				// recorder.
-				let runtime_code = self.check_override(state_runtime_code.runtime_code()?, at)?;
+				
+				let runtime_code = state_runtime_code.runtime_code()
+					.map_err(sp_blockchain::Error::RuntimeCode)?;
+				let runtime_code = self.check_override(runtime_code, at)?;
 
 				let backend = sp_state_machine::ProvingBackend::new_with_recorder(
 					trie_state,
@@ -236,7 +241,9 @@ where
 			},
 			None => {
 				let state_runtime_code = sp_state_machine::backend::BackendRuntimeCode::new(&state);
-				let runtime_code = self.check_override(state_runtime_code.runtime_code()?, at)?;
+				let runtime_code = state_runtime_code.runtime_code()
+					.map_err(sp_blockchain::Error::RuntimeCode)?;
+				let runtime_code = self.check_override(runtime_code, at)?;
 
 				let mut state_machine = StateMachine::new(
 					&state,
@@ -273,7 +280,9 @@ where
 			None,
 		);
 		let state_runtime_code = sp_state_machine::backend::BackendRuntimeCode::new(&state);
-		self.executor.runtime_version(&mut ext, &state_runtime_code.runtime_code()?)
+		let runtime_code = state_runtime_code.runtime_code()
+			.map_err(sp_blockchain::Error::RuntimeCode)?;
+		self.executor.runtime_version(&mut ext, &runtime_code)
 			.map_err(|e| sp_blockchain::Error::VersionInvalid(format!("{:?}", e)).into())
 	}
 
@@ -284,6 +293,9 @@ where
 		method: &str,
 		call_data: &[u8]
 	) -> Result<(Vec<u8>, StorageProof), sp_blockchain::Error> {
+		let state_runtime_code = sp_state_machine::backend::BackendRuntimeCode::new(trie_state);
+		let runtime_code = state_runtime_code.runtime_code()
+			.map_err(sp_blockchain::Error::RuntimeCode)?;
 		sp_state_machine::prove_execution_on_trie_backend::<_, _, NumberFor<Block>, _, _>(
 			trie_state,
 			overlay,
@@ -291,7 +303,7 @@ where
 			self.spawn_handle.clone(),
 			method,
 			call_data,
-			&sp_state_machine::backend::BackendRuntimeCode::new(trie_state).runtime_code()?,
+			&runtime_code,
 		)
 		.map_err(Into::into)
 	}
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index e8d748011bc1..f72fcb810769 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -297,7 +297,8 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		config: ClientConfig,
 	) -> sp_blockchain::Result<Self> {
 		if backend.blockchain().header(BlockId::Number(Zero::zero()))?.is_none() {
-			let genesis_storage = build_genesis_storage.build_storage()?;
+			let genesis_storage = build_genesis_storage.build_storage()
+				.map_err(sp_blockchain::Error::Storage)?;
 			let mut op = backend.begin_operation()?;
 			backend.begin_state_operation(&mut op, BlockId::Hash(Default::default()))?;
 			let state_root = op.reset_storage(genesis_storage)?;
@@ -880,7 +881,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 					&state,
 					changes_trie_state.as_ref(),
 					*parent_hash,
-				)?;
+				).map_err(sp_blockchain::Error::Storage)?;
 
 				if import_block.header.state_root()
 					!= &gen_storage_changes.transaction_storage_root
diff --git a/client/service/src/client/wasm_override.rs b/client/service/src/client/wasm_override.rs
index 1025b9633887..ba76f7a0fcf2 100644
--- a/client/service/src/client/wasm_override.rs
+++ b/client/service/src/client/wasm_override.rs
@@ -37,7 +37,8 @@
 //! needed must be provided in the given directory.
 //!
 use std::{
-	fs, collections::{HashMap, hash_map::DefaultHasher}, path::Path,
+	fs, collections::{HashMap, hash_map::DefaultHasher},
+	path::{Path, PathBuf},
 	hash::Hasher as _,
 };
 use sp_core::traits::FetchRuntimeCode;
@@ -82,6 +83,29 @@ impl FetchRuntimeCode for WasmBlob {
 	}
 }
 
+#[derive(Debug, thiserror::Error)]
+#[allow(missing_docs)]
+pub enum WasmOverrideError {
+	#[error("Failed to get runtime version: {0}")]
+	VersionInvalid(String),
+
+	#[error("WASM override IO error")]
+	Io(PathBuf, #[source] std::io::Error),
+
+	#[error("Overwriting WASM requires a directory where local \
+	WASM is stored. {} is not a directory", .0.display())]
+	NotADirectory(PathBuf),
+
+	#[error("Duplicate WASM Runtimes found: \n{}\n", .0.join("\n") )]
+	DuplicateRuntime(Vec<String>),
+}
+
+impl From<WasmOverrideError> for sp_blockchain::Error {
+	fn from(err: WasmOverrideError) -> Self {
+		Self::Application(Box::new(err))
+	}
+}
+
 /// Scrapes WASM from a folder and returns WASM from that folder
 /// if the runtime spec version matches.
 #[derive(Clone, Debug)]
@@ -119,16 +143,13 @@ where
 	/// Scrapes a folder for WASM runtimes.
 	/// Returns a hashmap of the runtime version and wasm runtime code.
 	fn scrape_overrides(dir: &Path, executor: &E) -> Result<HashMap<u32, WasmBlob>> {
+
 		let handle_err = |e: std::io::Error | -> sp_blockchain::Error {
-			sp_blockchain::Error::Msg(format!("{}", e.to_string()))
+			WasmOverrideError::Io(dir.to_owned(), e).into()
 		};
 
 		if !dir.is_dir() {
-			return Err(sp_blockchain::Error::Msg(format!(
-				"Overwriting WASM requires a directory where \
-				 local WASM is stored. {:?} is not a directory",
-				 dir,
-			)));
+			return Err(WasmOverrideError::NotADirectory(dir.to_owned()).into());
 		}
 
 		let mut overrides = HashMap::new();
@@ -149,9 +170,7 @@ where
 		}
 
 		if !duplicates.is_empty() {
-			let duplicate_file_list = duplicates.join("\n");
-			let msg = format!("Duplicate WASM Runtimes found: \n{}\n", duplicate_file_list);
-			return Err(sp_blockchain::Error::Msg(msg));
+			return Err(WasmOverrideError::DuplicateRuntime(duplicates).into());
 		}
 
 		Ok(overrides)
@@ -164,7 +183,7 @@ where
 	) -> Result<RuntimeVersion> {
 		let mut ext = BasicExternalities::default();
 		executor.runtime_version(&mut ext, &code.runtime_code(heap_pages))
-			.map_err(|e| sp_blockchain::Error::VersionInvalid(format!("{:?}", e)).into())
+			.map_err(|e| WasmOverrideError::VersionInvalid(format!("{:?}", e)).into())
 	}
 }
 
@@ -236,14 +255,10 @@ mod tests {
 			let scraped = WasmOverride::scrape_overrides(dir, exec);
 
 			match scraped {
-				Err(e) => {
-					match e {
-						sp_blockchain::Error::Msg(msg) => {
-							let is_match = msg
-								.matches("Duplicate WASM Runtimes found")
-								.map(ToString::to_string)
-								.collect::<Vec<String>>();
-							assert!(is_match.len() >= 1)
+				Err(sp_blockchain::Error::Application(e)) => {
+					match e.downcast_ref::<WasmOverrideError>() {
+						Some(WasmOverrideError::DuplicateRuntime(duplicates)) => {
+							assert_eq!(duplicates.len(), 1);
 						},
 						_ => panic!("Test should end with Msg Error Variant")
 					}
diff --git a/client/service/src/error.rs b/client/service/src/error.rs
index ffe1b3940550..3515df78be87 100644
--- a/client/service/src/error.rs
+++ b/client/service/src/error.rs
@@ -27,25 +27,38 @@ use sp_blockchain;
 pub type Result<T> = std::result::Result<T, Error>;
 
 /// Service errors.
-#[derive(Debug, derive_more::Display, derive_more::From)]
+#[derive(Debug, thiserror::Error)]
+#[allow(missing_docs)]
+#[non_exhaustive]
 pub enum Error {
-	/// Client error.
-	Client(sp_blockchain::Error),
-	/// IO error.
-	Io(std::io::Error),
-	/// Consensus error.
-	Consensus(sp_consensus::Error),
-	/// Network error.
-	Network(sc_network::error::Error),
-	/// Keystore error.
-	Keystore(sc_keystore::Error),
-	/// Best chain selection strategy is missing.
-	#[display(fmt="Best chain selection strategy (SelectChain) is not provided.")]
+	#[error(transparent)]
+	Client(#[from] sp_blockchain::Error),
+	
+	#[error(transparent)]
+	Io(#[from] std::io::Error),
+	
+	#[error(transparent)]
+	Consensus(#[from] sp_consensus::Error),
+	
+	#[error(transparent)]
+	Network(#[from] sc_network::error::Error),
+
+	#[error(transparent)]
+	Keystore(#[from] sc_keystore::Error),
+
+	#[error("Best chain selection strategy (SelectChain) is not provided.")]
 	SelectChainRequired,
-	/// Tasks executor is missing.
-	#[display(fmt="Tasks executor hasn't been provided.")]
+
+	#[error("Tasks executor hasn't been provided.")]
 	TaskExecutorRequired,
-	/// Other error.
+
+	#[error("Prometheus metrics error")]
+	Prometheus(#[from] prometheus_endpoint::PrometheusError),
+
+	#[error("Application")]
+	Application(#[from] Box<dyn std::error::Error + Send + Sync + 'static>),
+
+	#[error("Other: {0}")]
 	Other(String),
 }
 
@@ -55,21 +68,8 @@ impl<'a> From<&'a str> for Error {
 	}
 }
 
-impl From<prometheus_endpoint::PrometheusError> for Error {
-	fn from(e: prometheus_endpoint::PrometheusError) -> Self {
-		Error::Other(format!("Prometheus error: {}", e))
-	}
-}
-
-impl std::error::Error for Error {
-	fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
-		match self {
-			Error::Client(ref err) => Some(err),
-			Error::Io(ref err) => Some(err),
-			Error::Consensus(ref err) => Some(err),
-			Error::Network(ref err) => Some(err),
-			Error::Keystore(ref err) => Some(err),
-			_ => None,
-		}
+impl<'a> From<String> for Error {
+	fn from(s: String) -> Self {
+		Error::Other(s)
 	}
 }
diff --git a/client/state-db/Cargo.toml b/client/state-db/Cargo.toml
index 4d3e736d9539..18facd720db2 100644
--- a/client/state-db/Cargo.toml
+++ b/client/state-db/Cargo.toml
@@ -13,8 +13,9 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+thiserror = "1.0.21"
 parking_lot = "0.10.0"
-log = "0.4.8"
+log = "0.4.11"
 sc-client-api = { version = "2.0.0", path = "../api" }
 sp-core = { version = "2.0.0", path = "../../primitives/core" }
 codec = { package = "parity-scale-codec", version = "1.3.4", features = ["derive"] }
diff --git a/client/sync-state-rpc/Cargo.toml b/client/sync-state-rpc/Cargo.toml
index 8da372db94ff..81204365d082 100644
--- a/client/sync-state-rpc/Cargo.toml
+++ b/client/sync-state-rpc/Cargo.toml
@@ -13,6 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+thiserror = "1.0.21"
 jsonrpc-core = "15.0"
 jsonrpc-core-client = "15.0"
 jsonrpc-derive = "15.0"
diff --git a/client/sync-state-rpc/src/lib.rs b/client/sync-state-rpc/src/lib.rs
index fa433e5e31d2..573610fb2f61 100644
--- a/client/sync-state-rpc/src/lib.rs
+++ b/client/sync-state-rpc/src/lib.rs
@@ -17,6 +17,8 @@
 //! A RPC handler to create sync states for light clients.
 //! Currently only usable with BABE + GRANDPA.
 
+#![deny(unused_crate_dependencies)]
+
 use sp_runtime::traits::{Block as BlockT, NumberFor};
 use sp_blockchain::HeaderBackend;
 use std::sync::Arc;
@@ -28,12 +30,27 @@ type SharedAuthoritySet<TBl> =
 	sc_finality_grandpa::SharedAuthoritySet<<TBl as BlockT>::Hash, NumberFor<TBl>>;
 type SharedEpochChanges<TBl> = sc_consensus_epochs::SharedEpochChanges<TBl, sc_consensus_babe::Epoch>;
 
-struct Error(sp_blockchain::Error);
+#[derive(Debug, thiserror::Error)]
+#[allow(missing_docs)]
+enum Error<Block: BlockT> {
+	#[error(transparent)]
+	Blockchain(#[from] sp_blockchain::Error),
+	
+	#[error("Failed to load the block weight for block {0:?}")]
+	LoadingBlockWeightFailed(<Block as BlockT>::Hash),
+
+	#[error("JsonRpc error: {0}")]
+	JsonRpc(String),
+}
 
-impl From<Error> for jsonrpc_core::Error {
-	fn from(error: Error) -> Self {
+impl<Block: BlockT> From<Error<Block>> for jsonrpc_core::Error {
+	fn from(error: Error<Block>) -> Self {
+		let message = match error {
+			Error::JsonRpc(s) => s,
+			_ => error.to_string(),
+		};
 		jsonrpc_core::Error {
-			message: error.0.to_string(),
+			message,
 			code:  jsonrpc_core::ErrorCode::ServerError(1),
 			data: None,
 		}
@@ -76,20 +93,16 @@ impl<TBl, TCl> SyncStateRpcHandler<TBl, TCl>
 		}
 	}
 	
-	fn build_sync_state(&self) -> Result<sc_chain_spec::LightSyncState<TBl>, sp_blockchain::Error> {
+	fn build_sync_state(&self) -> Result<sc_chain_spec::LightSyncState<TBl>, Error<TBl>> {
 		let finalized_hash = self.client.info().finalized_hash;
 		let finalized_header = self.client.header(BlockId::Hash(finalized_hash))?
-			.ok_or_else(|| sp_blockchain::Error::Msg(
-				format!("Failed to get the header for block {:?}", finalized_hash)
-			))?;
+			.ok_or_else(|| sp_blockchain::Error::MissingHeader(finalized_hash.to_string()))?;
 
 		let finalized_block_weight = sc_consensus_babe::aux_schema::load_block_weight(
-			&*self.client,
-			finalized_hash,
-		)?
-			.ok_or_else(|| sp_blockchain::Error::Msg(
-				format!("Failed to load the block weight for block {:?}", finalized_hash)
-			))?;
+				&*self.client,
+				finalized_hash,
+			)?
+			.ok_or_else(|| Error::LoadingBlockWeightFailed(finalized_hash))?;
 
 		Ok(sc_chain_spec::LightSyncState {
 			finalized_block_header: finalized_header,
@@ -114,15 +127,16 @@ impl<TBl, TCl> SyncStateRpcApi for SyncStateRpcHandler<TBl, TCl>
 
 		let mut chain_spec = self.chain_spec.cloned_box();
 
-		let sync_state = self.build_sync_state().map_err(Error)?;
+		let sync_state = self.build_sync_state()
+			.map_err(map_error::<TBl,Error<TBl>>)?;
 
 		chain_spec.set_light_sync_state(sync_state.to_serializable());
-		let string = chain_spec.as_json(raw).map_err(map_error)?;
+		let string = chain_spec.as_json(raw).map_err(map_error::<TBl,_>)?;
 
-		serde_json::from_str(&string).map_err(|err| map_error(err.to_string()))
+		serde_json::from_str(&string).map_err(|err| map_error::<TBl,_>(err))
 	}
 }
 
-fn map_error(error: String) -> jsonrpc_core::Error {
-	Error(sp_blockchain::Error::Msg(error)).into()
+fn map_error<Block: BlockT, S: ToString>(error: S) -> jsonrpc_core::Error {
+	Error::<Block>::JsonRpc(error.to_string()).into()
 }
diff --git a/client/transaction-pool/Cargo.toml b/client/transaction-pool/Cargo.toml
index 5db37f536838..a4d7bc685c99 100644
--- a/client/transaction-pool/Cargo.toml
+++ b/client/transaction-pool/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "1.3.4" }
-derive_more = "0.99.2"
+thiserror = "1.0.21"
 futures = { version = "0.3.1", features = ["compat"] }
 futures-diagnose = "1.0"
 intervalier = "0.4.0"
diff --git a/client/transaction-pool/graph/Cargo.toml b/client/transaction-pool/graph/Cargo.toml
index c5850e765fcf..94c80c6f298a 100644
--- a/client/transaction-pool/graph/Cargo.toml
+++ b/client/transaction-pool/graph/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 derive_more = "0.99.2"
+thiserror = "1.0.21"
 futures = "0.3.4"
 log = "0.4.8"
 parking_lot = "0.10.0"
diff --git a/client/transaction-pool/graph/src/error.rs b/client/transaction-pool/graph/src/error.rs
index 392ddaa39be6..b599715920be 100644
--- a/client/transaction-pool/graph/src/error.rs
+++ b/client/transaction-pool/graph/src/error.rs
@@ -26,28 +26,29 @@ use sp_runtime::transaction_validity::{
 pub type Result<T> = std::result::Result<T, Error>;
 
 /// Transaction pool error type.
-#[derive(Debug, derive_more::Display, derive_more::From)]
+#[derive(Debug, thiserror::Error, derive_more::From)]
+#[allow(missing_docs)]
 pub enum Error {
 	/// Transaction is not verifiable yet, but might be in the future.
-	#[display(fmt="Unknown transaction validity: {:?}", _0)]
+	#[error("Unknown transaction validity: {0:?}")]
 	UnknownTransaction(UnknownTransaction),
 	/// Transaction is invalid.
-	#[display(fmt="Invalid transaction validity: {:?}", _0)]
+	#[error("Invalid transaction validity: {0:?}")]
 	InvalidTransaction(InvalidTransaction),
 	/// The transaction validity returned no "provides" tag.
 	///
 	/// Such transactions are not accepted to the pool, since we use those tags
 	/// to define identity of transactions (occupance of the same "slot").
-	#[display(fmt="The transaction does not provide any tags, so the pool can't identify it.")]
+	#[error("The transaction does not provide any tags, so the pool can't identify it.")]
 	NoTagsProvided,
-	/// The transaction is temporarily banned.
-	#[display(fmt="Temporarily Banned")]
+
+	#[error("Temporarily Banned")]
 	TemporarilyBanned,
 	/// The transaction is already in the pool.
-	#[display(fmt="[{:?}] Already imported", _0)]
+	#[error("[{0:?}] Already imported")]
 	AlreadyImported(Box<dyn std::any::Any + Send>),
 	/// The transaction cannot be imported cause it's a replacement and has too low priority.
-	#[display(fmt="Too low priority ({} > {})", old, new)]
+	#[error("Too low priority ({0} > {1})", old, new)]
 	TooLowPriority {
 		/// Transaction already in the pool.
 		old: Priority,
@@ -55,17 +56,16 @@ pub enum Error {
 		new: Priority
 	},
 	/// Deps cycle detected and we couldn't import transaction.
-	#[display(fmt="Cycle Detected")]
+	#[error("Cycle Detected")]
 	CycleDetected,
 	/// Transaction was dropped immediately after it got inserted.
-	#[display(fmt="Transaction couldn't enter the pool because of the limit.")]
+	#[error("Transaction couldn't enter the pool because of the limit.")]
 	ImmediatelyDropped,
 	/// Invalid block id.
+	#[error("Invlaid block id: {0}")]
 	InvalidBlockId(String),
 }
 
-impl std::error::Error for Error {}
-
 /// Transaction pool error conversion.
 pub trait IntoPoolError: ::std::error::Error + Send + Sized {
 	/// Try to extract original `Error`
diff --git a/client/transaction-pool/src/error.rs b/client/transaction-pool/src/error.rs
index c0f795df1801..49fc433e320c 100644
--- a/client/transaction-pool/src/error.rs
+++ b/client/transaction-pool/src/error.rs
@@ -24,30 +24,22 @@ use sp_transaction_pool::error::Error as TxPoolError;
 pub type Result<T> = std::result::Result<T, Error>;
 
 /// Transaction pool error type.
-#[derive(Debug, derive_more::Display, derive_more::From)]
+#[derive(Debug, thiserror::Error)]
+#[allow(missing_docs)]
 pub enum Error {
-	/// Pool error.
-	Pool(TxPoolError),
-	/// Blockchain error.
-	Blockchain(sp_blockchain::Error),
-	/// Error while converting a `BlockId`.
-	#[from(ignore)]
+	#[error("Transaction pool error")]
+	Pool(#[from] TxPoolError),
+
+	#[error("Blockchain error")]
+	Blockchain(#[from] sp_blockchain::Error),
+
+	#[error("Block conversion error: {0}")]
 	BlockIdConversion(String),
-	/// Error while calling the runtime api.
-	#[from(ignore)]
+
+	#[error("Runtime error: {0}")]
 	RuntimeApi(String),
 }
 
-impl std::error::Error for Error {
-	fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
-		match self {
-			Error::Pool(ref err) => Some(err),
-			Error::Blockchain(ref err) => Some(err),
-			Error::BlockIdConversion(_) => None,
-			Error::RuntimeApi(_) => None,
-		}
-	}
-}
 
 impl sp_transaction_pool::error::IntoPoolError for Error {
 	fn into_pool_error(self) -> std::result::Result<TxPoolError, Self> {
diff --git a/primitives/api/Cargo.toml b/primitives/api/Cargo.toml
index a3c480e92135..92bf9bea2bdc 100644
--- a/primitives/api/Cargo.toml
+++ b/primitives/api/Cargo.toml
@@ -21,6 +21,7 @@ sp-runtime = { version = "2.0.0", default-features = false, path = "../runtime"
 sp-version = { version = "2.0.0", default-features = false, path = "../version" }
 sp-state-machine = { version = "0.8.0", optional = true, path = "../../primitives/state-machine" }
 hash-db = { version = "0.15.2", optional = true }
+thiserror = { version = "1.0.21", optional = true }
 
 [dev-dependencies]
 sp-test-primitives = { version = "2.0.0", path = "../test-primitives" }
@@ -35,4 +36,5 @@ std = [
 	"sp-state-machine",
 	"sp-version/std",
 	"hash-db",
+	"thiserror",
 ]
diff --git a/primitives/api/proc-macro/src/decl_runtime_apis.rs b/primitives/api/proc-macro/src/decl_runtime_apis.rs
index a628ade6f9b4..aebefe7ea03a 100644
--- a/primitives/api/proc-macro/src/decl_runtime_apis.rs
+++ b/primitives/api/proc-macro/src/decl_runtime_apis.rs
@@ -708,13 +708,7 @@ impl<'a> ToClientSideDecl<'a> {
 							},
 							#crate_::NativeOrEncoded::Encoded(r) => {
 								<#ret_type as #crate_::Decode>::decode(&mut &r[..])
-									.map_err(|err|
-										format!(
-											"Failed to decode result of `{}`: {}",
-											#function_name,
-											err.what(),
-										).into()
-									)
+									.map_err(|err| { #crate_::ApiError::new(#function_name, err).into() })
 							}
 						}
 					)
diff --git a/primitives/api/proc-macro/src/mock_impl_runtime_apis.rs b/primitives/api/proc-macro/src/mock_impl_runtime_apis.rs
index 3e2fd42951b3..14cf47fc64b2 100644
--- a/primitives/api/proc-macro/src/mock_impl_runtime_apis.rs
+++ b/primitives/api/proc-macro/src/mock_impl_runtime_apis.rs
@@ -69,7 +69,9 @@ fn implement_common_api_traits(
 ) -> Result<TokenStream> {
 	let crate_ = generate_crate_access(HIDDEN_INCLUDES_ID);
 
-	let error_type = error_type.map(|e| quote!(#e)).unwrap_or_else(|| quote!(String));
+	let error_type = error_type
+		.map(|e| quote!(#e))
+		.unwrap_or_else(|| quote!( #crate_::ApiError ) );
 
 	// Quote using the span from `error_type` to generate nice error messages when the type is
 	// not implementing a trait or similar.
diff --git a/primitives/api/src/lib.rs b/primitives/api/src/lib.rs
index 9dadce3b5545..96da63cf2e25 100644
--- a/primitives/api/src/lib.rs
+++ b/primitives/api/src/lib.rs
@@ -74,6 +74,7 @@ use sp_core::OpaqueMetadata;
 #[cfg(feature = "std")]
 use std::{panic::UnwindSafe, cell::RefCell};
 
+
 /// Maximum nesting level for extrinsics.
 pub const MAX_EXTRINSIC_DEPTH: u32 = 256;
 
@@ -288,7 +289,7 @@ pub use sp_api_proc_macro::impl_runtime_apis;
 ///         /// Sets the error type that is being used by the mock implementation.
 ///         /// The error type is used by all runtime apis. It is only required to
 ///         /// be specified in one trait implementation.
-///         type Error = String;
+///         type Error = sp_api::ApiError;
 ///
 ///         fn build_block() -> Block {
 ///              unimplemented!("Not Required in tests")
@@ -315,6 +316,7 @@ pub use sp_api_proc_macro::impl_runtime_apis;
 /// # use sp_runtime::{traits::Block as BlockT, generic::BlockId};
 /// # use sp_test_primitives::Block;
 /// # use sp_core::NativeOrEncoded;
+/// # use codec;
 /// #
 /// # sp_api::decl_runtime_apis! {
 /// #     /// Declare the api trait.
@@ -331,15 +333,15 @@ pub use sp_api_proc_macro::impl_runtime_apis;
 ///
 /// sp_api::mock_impl_runtime_apis! {
 ///     impl Balance<Block> for MockApi {
-///         type Error = String;
+///         type Error = sp_api::ApiError;
 ///         #[advanced]
-///         fn get_balance(&self, at: &BlockId<Block>) -> Result<NativeOrEncoded<u64>, String> {
+///         fn get_balance(&self, at: &BlockId<Block>) -> Result<NativeOrEncoded<u64>, Self::Error> {
 ///             println!("Being called at: {}", at);
 ///
 ///             Ok(self.balance.into())
 ///         }
 ///         #[advanced]
-///         fn set_balance(at: &BlockId<Block>, val: u64) -> Result<NativeOrEncoded<()>, String> {
+///         fn set_balance(at: &BlockId<Block>, val: u64) -> Result<NativeOrEncoded<()>, Self::Error> {
 ///             if let BlockId::Number(1) = at {
 ///                 println!("Being called to set balance to: {}", val);
 ///             }
@@ -392,12 +394,42 @@ pub trait ConstructRuntimeApi<Block: BlockT, C: CallApiAt<Block>> {
 	fn construct_runtime_api<'a>(call: &'a C) -> ApiRef<'a, Self::RuntimeApi>;
 }
 
+/// An error describing which API call failed.
+#[cfg_attr(feature = "std", derive(Debug, thiserror::Error, Eq, PartialEq))]
+#[cfg_attr(feature = "std", error("Failed to execute API call {tag}"))]
+#[cfg(feature = "std")]
+pub struct ApiError {
+    tag: &'static str,
+    #[source]
+    error: codec::Error,
+}
+
+#[cfg(feature = "std")]
+impl From<(&'static str, codec::Error)> for ApiError {
+    fn from((tag, error): (&'static str, codec::Error)) -> Self {
+        Self {
+            tag,
+            error,
+        }
+    }
+}
+
+#[cfg(feature = "std")]
+impl ApiError {
+	pub fn new(tag: &'static str, error: codec::Error) -> Self {
+		Self {
+			tag,
+			error,
+		}
+	}
+}
+
 /// Extends the runtime api traits with an associated error type. This trait is given as super
 /// trait to every runtime api trait.
 #[cfg(feature = "std")]
 pub trait ApiErrorExt {
 	/// Error type used by the runtime apis.
-	type Error: std::fmt::Debug + From<String>;
+	type Error: std::fmt::Debug + From<ApiError>;
 }
 
 /// Extends the runtime api implementation with some common functionality.
@@ -506,7 +538,7 @@ pub struct CallApiAtParams<'a, Block: BlockT, C, NC, Backend: StateBackend<HashF
 #[cfg(feature = "std")]
 pub trait CallApiAt<Block: BlockT> {
 	/// Error type used by the implementation.
-	type Error: std::fmt::Debug + From<String>;
+	type Error: std::fmt::Debug + From<ApiError>;
 
 	/// The state backend that is used to store the block states.
 	type StateBackend: StateBackend<HashFor<Block>>;
diff --git a/primitives/api/test/tests/decl_and_impl.rs b/primitives/api/test/tests/decl_and_impl.rs
index 594882baf1e3..be549d7b7f4c 100644
--- a/primitives/api/test/tests/decl_and_impl.rs
+++ b/primitives/api/test/tests/decl_and_impl.rs
@@ -17,6 +17,7 @@
 
 use sp_api::{
 	RuntimeApiInfo, decl_runtime_apis, impl_runtime_apis, mock_impl_runtime_apis,
+	ApiError,
 	ApiExt,
 };
 use sp_runtime::{traits::{GetNodeBlockType, Block as BlockT}, generic::BlockId};
@@ -103,17 +104,27 @@ mock_impl_runtime_apis! {
 		}
 
 		#[advanced]
-		fn same_name(_: &BlockId<Block>) -> std::result::Result<NativeOrEncoded<()>, String> {
+		fn same_name(_: &BlockId<Block>) ->
+			std::result::Result<
+				NativeOrEncoded<()>,
+				ApiError
+			>
+		{
 			Ok(().into())
 		}
 
 		#[advanced]
-		fn wild_card(at: &BlockId<Block>, _: u32) -> std::result::Result<NativeOrEncoded<()>, String> {
+		fn wild_card(at: &BlockId<Block>, _: u32) ->
+			std::result::Result<
+				NativeOrEncoded<()>,
+				ApiError
+			>
+		{
 			if let BlockId::Number(1337) = at {
 				// yeah
 				Ok(().into())
 			} else {
-				Err("Ohh noooo".into())
+				Err(ApiError::new("MockApi", codec::Error::from("Ohh noooo")))
 			}
 		}
 	}
@@ -197,5 +208,8 @@ fn mock_runtime_api_works_with_advanced() {
 
 	Api::<Block>::same_name(&mock, &BlockId::Number(0)).unwrap();
 	mock.wild_card(&BlockId::Number(1337), 1).unwrap();
-	assert_eq!(String::from("Ohh noooo"), mock.wild_card(&BlockId::Number(1336), 1).unwrap_err());
+	assert_eq!(
+		ApiError::new("MockApi", ::codec::Error::from("Ohh noooo")),
+		mock.wild_card(&BlockId::Number(1336), 1).unwrap_err()
+	);
 }
diff --git a/primitives/api/test/tests/ui/mock_advanced_block_id_by_value.rs b/primitives/api/test/tests/ui/mock_advanced_block_id_by_value.rs
index 1e71730cd0a1..fd654ffdc63d 100644
--- a/primitives/api/test/tests/ui/mock_advanced_block_id_by_value.rs
+++ b/primitives/api/test/tests/ui/mock_advanced_block_id_by_value.rs
@@ -1,4 +1,5 @@
 use substrate_test_runtime_client::runtime::Block;
+use sp_api::ApiError;
 
 sp_api::decl_runtime_apis! {
 	pub trait Api {
@@ -11,7 +12,7 @@ struct MockApi;
 sp_api::mock_impl_runtime_apis! {
 	impl Api<Block> for MockApi {
 		#[advanced]
-		fn test(&self, _: BlockId<Block>) -> Result<sp_core::NativeOrEncoded<()>, String> {
+		fn test(&self, _: BlockId<Block>) -> Result<sp_core::NativeOrEncoded<()>, ApiError> {
 			Ok(().into())
 		}
 	}
diff --git a/primitives/api/test/tests/ui/mock_advanced_block_id_by_value.stderr b/primitives/api/test/tests/ui/mock_advanced_block_id_by_value.stderr
index efddce05f51b..47cd9e01d910 100644
--- a/primitives/api/test/tests/ui/mock_advanced_block_id_by_value.stderr
+++ b/primitives/api/test/tests/ui/mock_advanced_block_id_by_value.stderr
@@ -1,13 +1,13 @@
 error: `BlockId` needs to be taken by reference and not by value!
-  --> $DIR/mock_advanced_block_id_by_value.rs:11:1
+  --> $DIR/mock_advanced_block_id_by_value.rs:12:1
    |
-11 | / sp_api::mock_impl_runtime_apis! {
-12 | |     impl Api<Block> for MockApi {
-13 | |         #[advanced]
-14 | |         fn test(&self, _: BlockId<Block>) -> Result<sp_core::NativeOrEncoded<()>, String> {
+12 | / sp_api::mock_impl_runtime_apis! {
+13 | |     impl Api<Block> for MockApi {
+14 | |         #[advanced]
+15 | |         fn test(&self, _: BlockId<Block>) -> Result<sp_core::NativeOrEncoded<()>, ApiError> {
 ...  |
-17 | |     }
-18 | | }
+18 | |     }
+19 | | }
    | |_^
    |
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/primitives/api/test/tests/ui/mock_advanced_missing_blockid.rs b/primitives/api/test/tests/ui/mock_advanced_missing_blockid.rs
index 407ea90ee882..a15ef133fa6c 100644
--- a/primitives/api/test/tests/ui/mock_advanced_missing_blockid.rs
+++ b/primitives/api/test/tests/ui/mock_advanced_missing_blockid.rs
@@ -1,4 +1,5 @@
 use substrate_test_runtime_client::runtime::Block;
+use sp_api::ApiError;
 
 sp_api::decl_runtime_apis! {
 	pub trait Api {
@@ -11,7 +12,7 @@ struct MockApi;
 sp_api::mock_impl_runtime_apis! {
 	impl Api<Block> for MockApi {
 		#[advanced]
-		fn test(&self) -> Result<sp_core::NativeOrEncoded<()>, String> {
+		fn test(&self) -> Result<sp_core::NativeOrEncoded<()>, ApiError> {
 			Ok(().into())
 		}
 	}
diff --git a/primitives/api/test/tests/ui/mock_advanced_missing_blockid.stderr b/primitives/api/test/tests/ui/mock_advanced_missing_blockid.stderr
index e7a66ebc5dba..87d3660316b1 100644
--- a/primitives/api/test/tests/ui/mock_advanced_missing_blockid.stderr
+++ b/primitives/api/test/tests/ui/mock_advanced_missing_blockid.stderr
@@ -1,5 +1,5 @@
 error: If using the `advanced` attribute, it is required that the function takes at least one argument, the `BlockId`.
-  --> $DIR/mock_advanced_missing_blockid.rs:14:3
+  --> $DIR/mock_advanced_missing_blockid.rs:15:3
    |
-14 |         fn test(&self) -> Result<sp_core::NativeOrEncoded<()>, String> {
+15 |         fn test(&self) -> Result<sp_core::NativeOrEncoded<()>, ApiError> {
    |         ^^
diff --git a/primitives/api/test/tests/ui/mock_only_one_error_type.stderr b/primitives/api/test/tests/ui/mock_only_one_error_type.stderr
index daac5674d6ff..82fd04e8c5e0 100644
--- a/primitives/api/test/tests/ui/mock_only_one_error_type.stderr
+++ b/primitives/api/test/tests/ui/mock_only_one_error_type.stderr
@@ -10,16 +10,16 @@ error: First error type was declared here.
 17 |         type Error = u32;
    |                      ^^^
 
-error[E0277]: the trait bound `u32: std::convert::From<std::string::String>` is not satisfied
+error[E0277]: the trait bound `u32: std::convert::From<sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ApiError>` is not satisfied
    --> $DIR/mock_only_one_error_type.rs:17:16
     |
 17  |         type Error = u32;
-    |                      ^^^ the trait `std::convert::From<std::string::String>` is not implemented for `u32`
+    |                      ^^^ the trait `std::convert::From<sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ApiError>` is not implemented for `u32`
     |
    ::: $WORKSPACE/primitives/api/src/lib.rs
     |
-    |     type Error: std::fmt::Debug + From<String>;
-    |                                   ------------ required by this bound in `sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ApiErrorExt`
+    |     type Error: std::fmt::Debug + From<ApiError>;
+    |                                   -------------- required by this bound in `sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ApiErrorExt`
     |
     = help: the following implementations were found:
               <u32 as std::convert::From<bool>>
diff --git a/primitives/blockchain/Cargo.toml b/primitives/blockchain/Cargo.toml
index eac1e032e3e9..3458b8c0846b 100644
--- a/primitives/blockchain/Cargo.toml
+++ b/primitives/blockchain/Cargo.toml
@@ -18,8 +18,10 @@ log = "0.4.11"
 lru = "0.6.1"
 parking_lot = "0.10.0"
 thiserror = "1.0.21"
+futures = "0.3"
 codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
 sp-consensus = { version = "0.8.0", path = "../consensus/common" }
 sp-runtime = { version = "2.0.0", path = "../runtime" }
 sp-state-machine = { version = "0.8.0", path = "../state-machine" }
 sp-database = { version = "2.0.0", path = "../database" }
+sp-api = { version = "2.0.0", path = "../api" }
diff --git a/primitives/blockchain/src/backend.rs b/primitives/blockchain/src/backend.rs
index 326acd6b9bd4..01a7a59d6f94 100644
--- a/primitives/blockchain/src/backend.rs
+++ b/primitives/blockchain/src/backend.rs
@@ -172,7 +172,7 @@ pub trait Backend<Block: BlockT>: HeaderBackend<Block> + HeaderMetadata<Block, E
 			if let Some(max_number) = maybe_max_number {
 				loop {
 					let current_header = self.header(BlockId::Hash(current_hash.clone()))?
-						.ok_or_else(|| Error::from(format!("failed to get header for hash {}", current_hash)))?;
+						.ok_or_else(|| Error::MissingHeader(current_hash.to_string()))?;
 
 					if current_header.number() <= &max_number {
 						best_hash = current_header.hash();
@@ -191,7 +191,7 @@ pub trait Backend<Block: BlockT>: HeaderBackend<Block> + HeaderMetadata<Block, E
 				}
 
 				let current_header = self.header(BlockId::Hash(current_hash.clone()))?
-					.ok_or_else(|| Error::from(format!("failed to get header for hash {}", current_hash)))?;
+					.ok_or_else(|| Error::MissingHeader(current_hash.to_string()))?;
 
 				// stop search in this chain once we go below the target's block number
 				if current_header.number() < target_header.number() {
diff --git a/primitives/blockchain/src/error.rs b/primitives/blockchain/src/error.rs
index 6c9ab88fd1b0..c7180a61b00c 100644
--- a/primitives/blockchain/src/error.rs
+++ b/primitives/blockchain/src/error.rs
@@ -22,12 +22,14 @@ use sp_state_machine;
 use sp_runtime::transaction_validity::TransactionValidityError;
 use sp_consensus;
 use codec::Error as CodecError;
+use sp_api::ApiError;
 
 /// Client Result type alias
 pub type Result<T> = result::Result<T, Error>;
 
 /// Error when the runtime failed to apply an extrinsic.
 #[derive(Debug, thiserror::Error)]
+#[allow(missing_docs)]
 pub enum ApplyExtrinsicFailed {
 	/// The transaction cannot be included into the current block.
 	///
@@ -35,114 +37,142 @@ pub enum ApplyExtrinsicFailed {
 	/// unappliable onto the current block.
 	#[error("Extrinsic is not valid: {0:?}")]
 	Validity(#[from] TransactionValidityError),
-	/// This is used for miscellaneous errors that can be represented by string and not handleable.
-	///
-	/// This will become obsolete with complete migration to v4 APIs.
-	#[error("Extrinsic failed: {0}")]
-	Msg(String),
+
+	#[error("Application specific error")]
+	Application(#[source] Box<dyn 'static + std::error::Error + Send + Sync>),
 }
 
 /// Substrate Client error
 #[derive(Debug, thiserror::Error)]
+#[allow(missing_docs)]
+#[non_exhaustive]
 pub enum Error {
-	/// Consensus Error
+	#[error("Cancelled oneshot channel {0}")]
+	OneShotCancelled(#[from] futures::channel::oneshot::Canceled),
+
 	#[error(transparent)]
 	Consensus(#[from] sp_consensus::Error),
-	/// Backend error.
+
 	#[error("Backend error: {0}")]
 	Backend(String),
-	/// Unknown block.
+
 	#[error("UnknownBlock: {0}")]
 	UnknownBlock(String),
-	/// The `apply_extrinsic` is not valid due to the given `TransactionValidityError`.
+
 	#[error(transparent)]
 	ApplyExtrinsicFailed(#[from] ApplyExtrinsicFailed),
-	/// Execution error.
+
+	#[error("Child type is invalid")]
+	InvalidChildType,
+
+	#[error("RemoteBodyRequest: invalid extrinsics root expected: {expected} but got {received}")]
+	ExtrinsicRootInvalid { received: String, expected: String },
+
+	// `inner` cannot be made member, since it lacks `std::error::Error` trait bounds.
 	#[error("Execution failed: {0:?}")]
 	Execution(Box<dyn sp_state_machine::Error>),
-	/// Blockchain error.
+
 	#[error("Blockchain")]
 	Blockchain(#[source] Box<Error>),
-	/// Invalid authorities set received from the runtime.
+
+	/// A error used by various storage subsystems.
+	///
+	/// Eventually this will be replaced.
+	#[error("{0}")]
+	StorageChanges(sp_state_machine::DefaultError),
+
+	#[error("Invalid child storage key")]
+	InvalidChildStorageKey,
+
 	#[error("Current state of blockchain has invalid authorities set")]
 	InvalidAuthoritiesSet,
-	/// Could not get runtime version.
+
 	#[error("Failed to get runtime version: {0}")]
 	VersionInvalid(String),
-	/// Genesis config is invalid.
+
 	#[error("Genesis config provided is invalid")]
 	GenesisInvalid,
-	/// Error decoding header justification.
+
 	#[error("error decoding justification for header")]
 	JustificationDecode,
-	/// Justification for header is correctly encoded, but invalid.
+
 	#[error("bad justification for header: {0}")]
 	BadJustification(String),
-	/// Not available on light client.
+
 	#[error("This method is not currently available when running in light client mode")]
 	NotAvailableOnLightClient,
-	/// Invalid remote CHT-based proof.
+
 	#[error("Remote node has responded with invalid header proof")]
 	InvalidCHTProof,
-	/// Remote fetch has been cancelled.
+
 	#[error("Remote data fetch has been cancelled")]
 	RemoteFetchCancelled,
-	/// Remote fetch has been failed.
+
 	#[error("Remote data fetch has been failed")]
 	RemoteFetchFailed,
-	/// Error decoding call result.
+
 	#[error("Error decoding call result of {0}")]
 	CallResultDecode(&'static str, #[source] CodecError),
-	/// Error converting a parameter between runtime and node.
-	#[error("Error converting `{0}` between runtime and node")]
-	RuntimeParamConversion(String),
-	/// Changes tries are not supported.
+
+	#[error(transparent)]
+	RuntimeApiCodecError(#[from] ApiError),
+
+	#[error("Runtime :code missing in storage")]
+	RuntimeCodeMissing,
+
 	#[error("Changes tries are not supported by the runtime")]
 	ChangesTriesNotSupported,
-	/// Error reading changes tries configuration.
+
 	#[error("Error reading changes tries configuration")]
 	ErrorReadingChangesTriesConfig,
-	/// Key changes query has failed.
+
 	#[error("Failed to check changes proof: {0}")]
 	ChangesTrieAccessFailed(String),
-	/// Last finalized block not parent of current.
+
 	#[error("Did not finalize blocks in sequential order.")]
 	NonSequentialFinalization(String),
-	/// Safety violation: new best block not descendent of last finalized.
+
 	#[error("Potential long-range attack: block not in finalized chain.")]
 	NotInFinalizedChain,
-	/// Hash that is required for building CHT is missing.
+
 	#[error("Failed to get hash of block for building CHT")]
 	MissingHashRequiredForCHT,
-	/// Invalid calculated state root on block import.
+
 	#[error("Calculated state root does not match.")]
 	InvalidStateRoot,
-	/// Incomplete block import pipeline.
+
 	#[error("Incomplete block import pipeline.")]
 	IncompletePipeline,
+
 	#[error("Transaction pool not ready for block production.")]
 	TransactionPoolNotReady,
+
 	#[error("Database")]
 	DatabaseError(#[from] sp_database::error::DatabaseError),
-	/// A convenience variant for String
-	#[error("{0}")]
-	Msg(String),
-}
 
-impl<'a> From<&'a str> for Error {
-	fn from(s: &'a str) -> Self {
-		Error::Msg(s.into())
-	}
-}
+	#[error("Failed to get header for hash {0}")]
+	MissingHeader(String),
 
-impl From<String> for Error {
-	fn from(s: String) -> Self {
-		Error::Msg(s)
-	}
+
+	#[error("State Database error: {0}")]
+	StateDatabase(String),
+
+	#[error(transparent)]
+	Application(#[from] Box<dyn std::error::Error + Send + Sync + 'static>),
+
+	// Should be removed/improved once
+	// the storage `fn`s returns typed errors.
+	#[error("Runtime code error: {0}")]
+	RuntimeCode(&'static str),
+
+	// Should be removed/improved once
+	// the storage `fn`s returns typed errors.
+	#[error("Storage error: {0}")]
+	Storage(String),
 }
 
-impl From<Box<dyn sp_state_machine::Error + Send + Sync>> for Error {
-	fn from(e: Box<dyn sp_state_machine::Error + Send + Sync>) -> Self {
+impl From<Box<dyn sp_state_machine::Error + Send + Sync + 'static>> for Error {
+	fn from(e: Box<dyn sp_state_machine::Error + Send + Sync + 'static>) -> Self {
 		Self::from_state(e)
 	}
 }
@@ -163,4 +193,11 @@ impl Error {
 	pub fn from_state(e: Box<dyn sp_state_machine::Error>) -> Self {
 		Error::Execution(e)
 	}
+
+	/// Construct from a state db error.
+	// Can not be done directly, since that would make cargo run out of stack if
+	// `sc-state-db` is lib is added as dependency.
+	pub fn from_state_db<E>(e: E) -> Self where E: std::fmt::Debug {
+		Error::StateDatabase(format!("{:?}", e))
+	}
 }
diff --git a/primitives/consensus/common/src/error.rs b/primitives/consensus/common/src/error.rs
index a21bcf6cca9b..11b24d273d5e 100644
--- a/primitives/consensus/common/src/error.rs
+++ b/primitives/consensus/common/src/error.rs
@@ -25,6 +25,7 @@ pub type Result<T> = std::result::Result<T, Error>;
 
 /// Error type.
 #[derive(Debug, thiserror::Error)]
+#[non_exhaustive]
 pub enum Error {
 	/// Missing state at block with given descriptor.
 	#[error("State unavailable at block {0}")]
diff --git a/primitives/state-machine/src/error.rs b/primitives/state-machine/src/error.rs
index 0b02c68f79f5..f20f9e530dc7 100644
--- a/primitives/state-machine/src/error.rs
+++ b/primitives/state-machine/src/error.rs
@@ -32,18 +32,18 @@ impl<T: 'static + fmt::Debug + fmt::Display + Send + Sync> Error for T {}
 /// would not be executed unless externalities were available. This is included for completeness,
 /// and as a transition away from the pre-existing framework.
 #[derive(Debug, Eq, PartialEq)]
+#[allow(missing_docs)]
 #[cfg_attr(feature = "std", derive(thiserror::Error))]
 pub enum ExecutionError {
-	/// Backend error.
 	#[cfg_attr(feature = "std", error("Backend error {0:?}"))]
 	Backend(crate::DefaultError),
-	/// The entry `:code` doesn't exist in storage so there's no way we can execute anything.
+
 	#[cfg_attr(feature = "std", error("`:code` entry does not exist in storage"))]
 	CodeEntryDoesNotExist,
-	/// Backend is incompatible with execution proof generation process.
+
 	#[cfg_attr(feature = "std", error("Unable to generate proof"))]
 	UnableToGenerateProof,
-	/// Invalid execution proof.
+
 	#[cfg_attr(feature = "std", error("Invalid execution proof"))]
 	InvalidProof,
 }
diff --git a/primitives/transaction-pool/Cargo.toml b/primitives/transaction-pool/Cargo.toml
index 57ba3a28ac3c..4247e1a50c9b 100644
--- a/primitives/transaction-pool/Cargo.toml
+++ b/primitives/transaction-pool/Cargo.toml
@@ -14,8 +14,9 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+thiserror = { version = "1.0.21", optional = true }
 codec = { package = "parity-scale-codec", version = "1.3.1", optional = true }
-derive_more = { version = "0.99.2", optional = true }
+derive_more = { version = "0.99.11", optional = true }
 futures = { version = "0.3.1", optional = true }
 log = { version = "0.4.8", optional = true }
 serde = { version = "1.0.101", features = ["derive"], optional = true}
@@ -31,6 +32,7 @@ std = [
 	"futures",
 	"log",
 	"serde",
+	"thiserror",
 	"sp-api/std",
 	"sp-blockchain",
 	"sp-runtime/std",
diff --git a/primitives/transaction-pool/src/error.rs b/primitives/transaction-pool/src/error.rs
index 531b397cb946..e356df75908a 100644
--- a/primitives/transaction-pool/src/error.rs
+++ b/primitives/transaction-pool/src/error.rs
@@ -25,49 +25,49 @@ use sp_runtime::transaction_validity::{
 pub type Result<T> = std::result::Result<T, Error>;
 
 /// Transaction pool error type.
-#[derive(Debug, derive_more::Display, derive_more::From)]
+#[derive(Debug, thiserror::Error, derive_more::From)]
+#[allow(missing_docs)]
 pub enum Error {
-	/// Transaction is not verifiable yet, but might be in the future.
-	#[display(fmt="Unknown transaction validity: {:?}", _0)]
+	#[error("Unknown transaction validity: {0:?}")]
 	UnknownTransaction(UnknownTransaction),
-	/// Transaction is invalid.
-	#[display(fmt="Invalid transaction validity: {:?}", _0)]
+
+	#[error("Invalid transaction validity: {0:?}")]
 	InvalidTransaction(InvalidTransaction),
+
 	/// The transaction validity returned no "provides" tag.
 	///
 	/// Such transactions are not accepted to the pool, since we use those tags
 	/// to define identity of transactions (occupance of the same "slot").
-	#[display(fmt="The transaction does not provide any tags, so the pool can't identify it.")]
+	#[error("Transaction does not provide any tags, so the pool can't identify it")]
 	NoTagsProvided,
-	/// The transaction is temporarily banned.
-	#[display(fmt="Temporarily Banned")]
+
+	#[error("Transaction temporarily Banned")]
 	TemporarilyBanned,
-	/// The transaction is already in the pool.
-	#[display(fmt="[{:?}] Already imported", _0)]
+
+	#[error("[{0:?}] Already imported")]
 	AlreadyImported(Box<dyn std::any::Any + Send>),
-	/// The transaction cannot be imported cause it's a replacement and has too low priority.
-	#[display(fmt="Too low priority ({} > {})", old, new)]
+
+	#[error("Too low priority ({} > {})", old, new)]
 	TooLowPriority {
 		/// Transaction already in the pool.
 		old: Priority,
 		/// Transaction entering the pool.
 		new: Priority
 	},
-	/// Deps cycle detected and we couldn't import transaction.
-	#[display(fmt="Cycle Detected")]
+	#[error("Transaction with cyclic dependency")]
 	CycleDetected,
-	/// Transaction was dropped immediately after it got inserted.
-	#[display(fmt="Transaction couldn't enter the pool because of the limit.")]
+
+	#[error("Transaction couldn't enter the pool because of the limit")]
 	ImmediatelyDropped,
-	/// Invalid block id.
+
+	#[from(ignore)]
+	#[error("{0}")]
 	InvalidBlockId(String),
-	/// The pool is not accepting future transactions.
-	#[display(fmt="The pool is not accepting future transactions")]
+
+	#[error("The pool is not accepting future transactions")]
 	RejectedFutureTransaction,
 }
 
-impl std::error::Error for Error {}
-
 /// Transaction pool error conversion.
 pub trait IntoPoolError: std::error::Error + Send + Sized {
 	/// Try to extract original `Error`

From ca62de00422f2a7eeeb39fbabc025ff79b768b4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Fri, 27 Nov 2020 22:37:38 +0000
Subject: [PATCH 0116/1194] network: don't force send block announcements
 (#7601)

---
 client/network/src/protocol.rs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index 9a8cfe7e1ffb..9e589330b7fb 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -1083,16 +1083,11 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 
 		let is_best = self.context_data.chain.info().best_hash == hash;
 		debug!(target: "sync", "Reannouncing block {:?} is_best: {}", hash, is_best);
-		self.send_announcement(&header, data, is_best, true)
-	}
-
-	fn send_announcement(&mut self, header: &B::Header, data: Vec<u8>, is_best: bool, force: bool) {
-		let hash = header.hash();
 
 		for (who, ref mut peer) in self.context_data.peers.iter_mut() {
-			trace!(target: "sync", "Announcing block {:?} to {}", hash, who);
 			let inserted = peer.known_blocks.insert(hash);
-			if inserted || force {
+			if inserted {
+				trace!(target: "sync", "Announcing block {:?} to {}", hash, who);
 				let message = message::BlockAnnounce {
 					header: header.clone(),
 					state: if is_best {

From b2d9affd7135bdc08daba0ae460219740822980f Mon Sep 17 00:00:00 2001
From: Andrew Plaza <aplaza@liquidthink.net>
Date: Sat, 28 Nov 2020 09:40:24 +0100
Subject: [PATCH 0117/1194] Change TRACING_SET to static (#7607)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* change TRACING_SET to static

* Update primitives/io/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* modify test with nested spans

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 client/executor/runtime-test/src/lib.rs      | 11 +++++++++++
 client/executor/src/integration_tests/mod.rs |  9 +++++++++
 primitives/io/src/lib.rs                     |  2 +-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/client/executor/runtime-test/src/lib.rs b/client/executor/runtime-test/src/lib.rs
index f4cef65b629a..bfba4ef03939 100644
--- a/client/executor/runtime-test/src/lib.rs
+++ b/client/executor/runtime-test/src/lib.rs
@@ -261,6 +261,17 @@ sp_core::wasm_export_functions! {
 		wasm_tracing::exit(span_id)
 	}
 
+	fn test_nested_spans() {
+		sp_io::init_tracing();
+		let span_id = wasm_tracing::enter_span(Default::default());
+		{
+			sp_io::init_tracing();
+			let span_id = wasm_tracing::enter_span(Default::default());
+			wasm_tracing::exit(span_id);
+		}
+		wasm_tracing::exit(span_id);
+	}
+
 	fn returns_mutable_static() -> u64 {
 		unsafe {
 			MUTABLE_STATIC += 1;
diff --git a/client/executor/src/integration_tests/mod.rs b/client/executor/src/integration_tests/mod.rs
index 08771847c25f..62368441f586 100644
--- a/client/executor/src/integration_tests/mod.rs
+++ b/client/executor/src/integration_tests/mod.rs
@@ -719,6 +719,15 @@ fn wasm_tracing_should_work(wasm_method: WasmExecutionMethod) {
 	assert_eq!(span_datum.target, "default");
 	assert_eq!(span_datum.name, "");
 	assert_eq!(values.bool_values.get("wasm").unwrap(), &true);
+
+	call_in_wasm(
+		"test_nested_spans",
+		Default::default(),
+		wasm_method,
+		&mut ext,
+	).unwrap();
+	let len = traces.lock().unwrap().len();
+	assert_eq!(len, 2);
 }
 
 #[test_case(WasmExecutionMethod::Interpreted)]
diff --git a/primitives/io/src/lib.rs b/primitives/io/src/lib.rs
index 382a0c4b3bd6..d812baefb57e 100644
--- a/primitives/io/src/lib.rs
+++ b/primitives/io/src/lib.rs
@@ -1093,7 +1093,7 @@ mod tracing_setup {
 	};
 	use super::{wasm_tracing, Crossing};
 
-	const TRACING_SET : AtomicBool = AtomicBool::new(false);
+	static TRACING_SET: AtomicBool = AtomicBool::new(false);
 
 
 	/// The PassingTracingSubscriber implements `tracing_core::Subscriber`

From 72cfd777812d1c374265d17524bec63ee5f07d69 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Mon, 30 Nov 2020 11:52:08 +0100
Subject: [PATCH 0118/1194] sc-network: Log outgoing notifications too (#7624)

* Log outgoing notifications too

* Update client/network/src/protocol/generic_proto/handler.rs

Co-authored-by: Max Inden <mail@max-inden.de>

Co-authored-by: Addie Wagenknecht <addie@nortd.com>
Co-authored-by: Max Inden <mail@max-inden.de>
---
 .../src/protocol/generic_proto/behaviour.rs   | 14 +++++++----
 .../src/protocol/generic_proto/handler.rs     | 21 ++++++++++++++++-
 client/network/src/service.rs                 | 23 ++++++++++++++++++-
 3 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/client/network/src/protocol/generic_proto/behaviour.rs b/client/network/src/protocol/generic_proto/behaviour.rs
index f84aead47283..f76b3cc71602 100644
--- a/client/network/src/protocol/generic_proto/behaviour.rs
+++ b/client/network/src/protocol/generic_proto/behaviour.rs
@@ -650,13 +650,17 @@ impl GenericProto {
 			Some(sink) => sink
 		};
 
+		let message = message.into();
+
 		trace!(
 			target: "sub-libp2p",
-			"External API => Notification({:?}, {:?})",
+			"External API => Notification({:?}, {:?}, {} bytes)",
 			target,
 			protocol_name,
+			message.len(),
 		);
-		trace!(target: "sub-libp2p", "Handler({:?}) <= Packet", target);
+		trace!(target: "sub-libp2p", "Handler({:?}) <= Sync notification", target);
+
 		notifs_sink.send_sync_notification(
 			protocol_name,
 			message
@@ -1930,9 +1934,10 @@ impl NetworkBehaviour for GenericProto {
 				if self.is_open(&source) {
 					trace!(
 						target: "sub-libp2p",
-						"Handler({:?}) => Notification({:?})",
+						"Handler({:?}) => Notification({:?}, {} bytes)",
 						source,
 						protocol_name,
+						message.len()
 					);
 					trace!(target: "sub-libp2p", "External API <= Message({:?}, {:?})", protocol_name, source);
 					let event = GenericProtoOut::Notification {
@@ -1945,9 +1950,10 @@ impl NetworkBehaviour for GenericProto {
 				} else {
 					trace!(
 						target: "sub-libp2p",
-						"Handler({:?}) => Post-close notification({:?})",
+						"Handler({:?}) => Post-close notification({:?}, {} bytes)",
 						source,
 						protocol_name,
+						message.len()
 					);
 				}
 			}
diff --git a/client/network/src/protocol/generic_proto/handler.rs b/client/network/src/protocol/generic_proto/handler.rs
index 42cf02f1b77d..13d44cd1a09a 100644
--- a/client/network/src/protocol/generic_proto/handler.rs
+++ b/client/network/src/protocol/generic_proto/handler.rs
@@ -138,6 +138,9 @@ pub struct NotifsHandler {
 	/// Whether we are the connection dialer or listener.
 	endpoint: ConnectedPoint,
 
+	/// Remote we are connected to.
+	peer_id: PeerId,
+
 	/// State of this handler.
 	state: State,
 
@@ -260,12 +263,13 @@ impl IntoProtocolsHandler for NotifsHandlerProto {
 		SelectUpgrade::new(in_protocols, self.legacy_protocol.clone())
 	}
 
-	fn into_handler(self, _: &PeerId, connected_point: &ConnectedPoint) -> Self::Handler {
+	fn into_handler(self, peer_id: &PeerId, connected_point: &ConnectedPoint) -> Self::Handler {
 		let num_out_proto = self.out_protocols.len();
 
 		NotifsHandler {
 			in_protocols: self.in_protocols,
 			out_protocols: self.out_protocols,
+			peer_id: peer_id.clone(),
 			endpoint: connected_point.clone(),
 			when_connection_open: Instant::now(),
 			state: State::Closed {
@@ -365,6 +369,8 @@ pub struct NotificationsSink {
 
 #[derive(Debug)]
 struct NotificationsSinkInner {
+	/// Target of the sink.
+	peer_id: PeerId,
 	/// Sender to use in asynchronous contexts. Uses an asynchronous mutex.
 	async_channel: FuturesMutex<mpsc::Sender<NotificationsSinkMessage>>,
 	/// Sender to use in synchronous contexts. Uses a synchronous mutex.
@@ -390,6 +396,11 @@ enum NotificationsSinkMessage {
 }
 
 impl NotificationsSink {
+	/// Returns the [`PeerId`] the sink is connected to.
+	pub fn peer_id(&self) -> &PeerId {
+		&self.inner.peer_id
+	}
+
 	/// Sends a notification to the peer.
 	///
 	/// If too many messages are already buffered, the notification is silently discarded and the
@@ -447,6 +458,12 @@ pub struct Ready<'a> {
 }
 
 impl<'a> Ready<'a> {
+	/// Returns the name of the protocol. Matches the one passed to
+	/// [`NotificationsSink::reserve_notification`].
+	pub fn protocol_name(&self) -> &Cow<'static, str> {
+		&self.protocol_name
+	}
+
 	/// Consumes this slots reservation and actually queues the notification.
 	///
 	/// Returns an error if the substream has been closed.
@@ -622,6 +639,7 @@ impl ProtocolsHandler for NotifsHandler {
 					let (sync_tx, sync_rx) = mpsc::channel(SYNC_NOTIFICATIONS_BUFFER_SIZE);
 					let notifications_sink = NotificationsSink {
 						inner: Arc::new(NotificationsSinkInner {
+							peer_id: self.peer_id.clone(),
 							async_channel: FuturesMutex::new(async_tx),
 							sync_channel: Mutex::new(sync_tx),
 						}),
@@ -782,6 +800,7 @@ impl ProtocolsHandler for NotifsHandler {
 					let (sync_tx, sync_rx) = mpsc::channel(SYNC_NOTIFICATIONS_BUFFER_SIZE);
 					let notifications_sink = NotificationsSink {
 						inner: Arc::new(NotificationsSinkInner {
+							peer_id: self.peer_id.clone(),
 							async_channel: FuturesMutex::new(async_tx),
 							sync_channel: Mutex::new(sync_tx),
 						}),
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index c722c3e32d70..8c0dbd7eec6a 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -664,7 +664,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 		// `peers_notifications_sinks` mutex as soon as possible.
 		let sink = {
 			let peers_notifications_sinks = self.peers_notifications_sinks.lock();
-			if let Some(sink) = peers_notifications_sinks.get(&(target, protocol.clone())) {
+			if let Some(sink) = peers_notifications_sinks.get(&(target.clone(), protocol.clone())) {
 				sink.clone()
 			} else {
 				// Notification silently discarded, as documented.
@@ -684,6 +684,14 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 		}
 
 		// Sending is communicated to the `NotificationsSink`.
+		trace!(
+			target: "sub-libp2p",
+			"External API => Notification({:?}, {:?}, {} bytes)",
+			target,
+			protocol,
+			message.len()
+		);
+		trace!(target: "sub-libp2p", "Handler({:?}) <= Sync notification", target);
 		sink.send_sync_notification(protocol, message);
 	}
 
@@ -1139,6 +1147,7 @@ impl NotificationSender {
 				Ok(r) => r,
 				Err(()) => return Err(NotificationSenderError::Closed),
 			},
+			peer_id: self.sink.peer_id(),
 			notification_size_metric: self.notification_size_metric.clone(),
 		})
 	}
@@ -1149,6 +1158,9 @@ impl NotificationSender {
 pub struct NotificationSenderReady<'a> {
 	ready: Ready<'a>,
 
+	/// Target of the notification.
+	peer_id: &'a PeerId,
+
 	/// Field extracted from the [`Metrics`] struct and necessary to report the
 	/// notifications-related metrics.
 	notification_size_metric: Option<Histogram>,
@@ -1163,6 +1175,15 @@ impl<'a> NotificationSenderReady<'a> {
 			notification_size_metric.observe(notification.len() as f64);
 		}
 
+		trace!(
+			target: "sub-libp2p",
+			"External API => Notification({:?}, {:?}, {} bytes)",
+			self.peer_id,
+			self.ready.protocol_name(),
+			notification.len()
+		);
+		trace!(target: "sub-libp2p", "Handler({:?}) <= Async notification", self.peer_id);
+
 		self.ready
 			.send(notification)
 			.map_err(|()| NotificationSenderError::Closed)

From 9450a9d29156a80f48947fdf650396f488ca1c32 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Nov 2020 13:51:54 +0100
Subject: [PATCH 0119/1194] Bump console_log from 0.1.2 to 0.2.0 (#7623)

Bumps [console_log](https://github.com/iamcodemaker/console_log) from 0.1.2 to 0.2.0.
- [Release notes](https://github.com/iamcodemaker/console_log/releases)
- [Commits](https://github.com/iamcodemaker/console_log/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock               | 6 +++---
 utils/browser/Cargo.toml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b34d5f76c225..8dff54073ac1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -790,9 +790,9 @@ dependencies = [
 
 [[package]]
 name = "console_log"
-version = "0.1.2"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e7871d2947441b0fdd8e2bd1ce2a2f75304f896582c0d572162d48290683c48"
+checksum = "501a375961cef1a0d44767200e66e4a559283097e91d0730b1d75dfb2f8a1494"
 dependencies = [
  "log",
  "web-sys",
@@ -9748,7 +9748,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04f8ab788026715fa63b31960869617cba39117e520eb415b0139543e325ab59"
 dependencies = [
  "cfg-if 0.1.10",
- "rand 0.3.23",
+ "rand 0.7.3",
  "static_assertions",
 ]
 
diff --git a/utils/browser/Cargo.toml b/utils/browser/Cargo.toml
index e56fea11a384..31fc1e37f3d4 100644
--- a/utils/browser/Cargo.toml
+++ b/utils/browser/Cargo.toml
@@ -18,7 +18,7 @@ futures01 = { package = "futures", version = "0.1.29" }
 log = "0.4.8"
 libp2p-wasm-ext = { version = "0.25", features = ["websocket"] }
 console_error_panic_hook = "0.1.6"
-console_log = "0.1.2"
+console_log = "0.2.0"
 js-sys = "0.3.34"
 wasm-bindgen = "0.2.57"
 wasm-bindgen-futures = "0.4.18"

From 2fbab7609adc044f6504e2b861c59125aaccdb7b Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Mon, 30 Nov 2020 04:57:15 -0800
Subject: [PATCH 0120/1194] `sudo_as` should return a result (#7620)

---
 frame/sudo/src/lib.rs   | 12 +++---------
 frame/sudo/src/tests.rs |  2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/frame/sudo/src/lib.rs b/frame/sudo/src/lib.rs
index 0d21e4432666..7629355d98d1 100644
--- a/frame/sudo/src/lib.rs
+++ b/frame/sudo/src/lib.rs
@@ -214,15 +214,9 @@ decl_module! {
 
 			let who = T::Lookup::lookup(who)?;
 
-			let res = match call.dispatch_bypass_filter(frame_system::RawOrigin::Signed(who).into()) {
-				Ok(_) => true,
-				Err(e) => {
-					sp_runtime::print(e);
-					false
-				}
-			};
+			let res = call.dispatch_bypass_filter(frame_system::RawOrigin::Signed(who).into());
 
-			Self::deposit_event(RawEvent::SudoAsDone(res));
+			Self::deposit_event(RawEvent::SudoAsDone(res.map(|_| ()).map_err(|e| e.error)));
 			// Sudo user does not pay a fee.
 			Ok(Pays::No.into())
 		}
@@ -236,7 +230,7 @@ decl_event!(
 		/// The \[sudoer\] just switched identity; the old key is supplied.
 		KeyChanged(AccountId),
 		/// A sudo just took place. \[result\]
-		SudoAsDone(bool),
+		SudoAsDone(DispatchResult),
 	}
 );
 
diff --git a/frame/sudo/src/tests.rs b/frame/sudo/src/tests.rs
index cba1e1cf6054..03ce100c3a40 100644
--- a/frame/sudo/src/tests.rs
+++ b/frame/sudo/src/tests.rs
@@ -163,7 +163,7 @@ fn sudo_as_emits_events_correctly() {
 		// A non-privileged function will work when passed to `sudo_as` with the root `key`.
 		let call = Box::new(Call::Logger(LoggerCall::non_privileged_log(42, 1)));
 		assert_ok!(Sudo::sudo_as(Origin::signed(1), 2, call));
-		let expected_event = TestEvent::sudo(RawEvent::SudoAsDone(true));
+		let expected_event = TestEvent::sudo(RawEvent::SudoAsDone(Ok(())));
 		assert!(System::events().iter().any(|a| a.event == expected_event));
 	});
 }

From 779c801d31ff31a9dba9d11326c01c4780b4d589 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Mon, 30 Nov 2020 15:05:01 +0100
Subject: [PATCH 0121/1194] Fix wrong value put for pending_opening (#7633)

* Fix wrong value put for pending_opening

* Oops, didn't even try compiling it
---
 client/network/src/protocol/generic_proto/handler.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/network/src/protocol/generic_proto/handler.rs b/client/network/src/protocol/generic_proto/handler.rs
index 13d44cd1a09a..e479a34d14f3 100644
--- a/client/network/src/protocol/generic_proto/handler.rs
+++ b/client/network/src/protocol/generic_proto/handler.rs
@@ -684,6 +684,7 @@ impl ProtocolsHandler for NotifsHandler {
 							_ => unreachable!()
 						};
 
+						debug_assert_eq!(pending_opening.len(), self.out_protocols.len());
 						for (n, is_pending) in pending_opening.iter().enumerate() {
 							if *is_pending {
 								continue;
@@ -740,8 +741,9 @@ impl ProtocolsHandler for NotifsHandler {
 
 				match &mut self.state {
 					State::Open { .. } => {
+						let pending_opening = self.out_protocols.iter().map(|_| false).collect();
 						self.state = State::Closed {
-							pending_opening: Vec::new(),
+							pending_opening,
 						};
 					},
 					State::Opening { out_substreams, .. } => {

From 237874bb15bbac174b6cb8d594053b5512f32ca2 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Mon, 30 Nov 2020 15:34:54 +0100
Subject: [PATCH 0122/1194] Rename pallet trait `Trait` to `Config` (#7599)

* rename Trait to Config

* add test asserting using Trait is still valid.

* fix ui tests
---
 Cargo.lock                                    |   1 +
 bin/node-template/pallets/template/src/lib.rs |  12 +-
 .../pallets/template/src/mock.rs              |   6 +-
 bin/node-template/runtime/src/lib.rs          |  18 +-
 bin/node/executor/tests/basic.rs              |   4 +-
 bin/node/runtime/src/impls.rs                 |   2 +-
 bin/node/runtime/src/lib.rs                   |  68 ++++----
 bin/utils/subkey/src/lib.rs                   |   2 +-
 frame/assets/src/lib.rs                       |  30 ++--
 frame/atomic-swap/src/lib.rs                  |  20 +--
 frame/atomic-swap/src/tests.rs                |   6 +-
 frame/aura/src/lib.rs                         |  28 ++--
 frame/aura/src/mock.rs                        |   8 +-
 frame/authority-discovery/src/lib.rs          |  20 +--
 frame/authorship/src/lib.rs                   |  16 +-
 frame/babe/src/equivocation.rs                |  10 +-
 frame/babe/src/lib.rs                         |  44 ++---
 frame/babe/src/mock.rs                        |  22 +--
 frame/babe/src/tests.rs                       |   8 +-
 frame/balances/src/lib.rs                     |  76 ++++-----
 frame/balances/src/tests.rs                   |   6 +-
 frame/balances/src/tests_composite.rs         |   8 +-
 frame/balances/src/tests_local.rs             |   8 +-
 frame/balances/src/weights.rs                 |   2 +-
 frame/benchmarking/src/lib.rs                 |  14 +-
 frame/benchmarking/src/tests.rs               |  18 +-
 frame/collective/src/benchmarking.rs          |   4 +-
 frame/collective/src/lib.rs                   |  42 ++---
 frame/collective/src/weights.rs               |   2 +-
 frame/contracts/src/benchmarking/code.rs      |  20 +--
 frame/contracts/src/benchmarking/mod.rs       |  30 ++--
 frame/contracts/src/benchmarking/sandbox.rs   |   6 +-
 frame/contracts/src/exec.rs                   |  78 ++++-----
 frame/contracts/src/gas.rs                    |   8 +-
 frame/contracts/src/lib.rs                    |  46 ++---
 frame/contracts/src/rent.rs                   |  12 +-
 frame/contracts/src/schedule.rs               |  20 +--
 frame/contracts/src/storage.rs                |   4 +-
 frame/contracts/src/tests.rs                  |  50 +++---
 frame/contracts/src/wasm/code_cache.rs        |   8 +-
 frame/contracts/src/wasm/env_def/macros.rs    |   8 +-
 frame/contracts/src/wasm/mod.rs               |  18 +-
 frame/contracts/src/wasm/prepare.rs           |  14 +-
 frame/contracts/src/wasm/runtime.rs           |  16 +-
 frame/contracts/src/weights.rs                |   2 +-
 frame/democracy/src/benchmarking.rs           |  12 +-
 frame/democracy/src/lib.rs                    |  24 +--
 frame/democracy/src/tests.rs                  |  10 +-
 frame/democracy/src/weights.rs                |   2 +-
 frame/elections-phragmen/src/benchmarking.rs  |  26 +--
 frame/elections-phragmen/src/lib.rs           |  30 ++--
 frame/elections-phragmen/src/weights.rs       |   2 +-
 frame/elections/src/lib.rs                    |  18 +-
 frame/elections/src/mock.rs                   |   6 +-
 frame/elections/src/tests.rs                  |   4 +-
 frame/example-offchain-worker/src/lib.rs      |  16 +-
 frame/example-offchain-worker/src/tests.rs    |   8 +-
 frame/example-parallel/src/lib.rs             |   8 +-
 frame/example-parallel/src/tests.rs           |   4 +-
 frame/example/src/lib.rs                      |  46 ++---
 frame/executive/src/lib.rs                    |  40 ++---
 frame/grandpa/src/equivocation.rs             |  10 +-
 frame/grandpa/src/lib.rs                      |  18 +-
 frame/grandpa/src/mock.rs                     |  20 +--
 frame/grandpa/src/tests.rs                    |   4 +-
 frame/identity/src/benchmarking.rs            |  24 +--
 frame/identity/src/lib.rs                     |  22 +--
 frame/identity/src/tests.rs                   |   6 +-
 frame/identity/src/weights.rs                 |   2 +-
 frame/im-online/src/benchmarking.rs           |   2 +-
 frame/im-online/src/lib.rs                    |  32 ++--
 frame/im-online/src/mock.rs                   |  12 +-
 frame/im-online/src/weights.rs                |   2 +-
 frame/indices/src/lib.rs                      |  20 +--
 frame/indices/src/mock.rs                     |   8 +-
 frame/indices/src/weights.rs                  |   2 +-
 frame/membership/src/lib.rs                   |  22 +--
 frame/multisig/src/benchmarking.rs            |   6 +-
 frame/multisig/src/lib.rs                     |  26 +--
 frame/multisig/src/tests.rs                   |   6 +-
 frame/multisig/src/weights.rs                 |   2 +-
 frame/nicks/src/lib.rs                        |  26 +--
 frame/node-authorization/src/lib.rs           |  18 +-
 frame/offences/benchmarking/src/lib.rs        |  28 ++--
 frame/offences/benchmarking/src/mock.rs       |  18 +-
 frame/offences/src/lib.rs                     |  22 +--
 frame/offences/src/mock.rs                    |   6 +-
 frame/offences/src/tests.rs                   |   2 +-
 frame/proxy/src/benchmarking.rs               |  18 +-
 frame/proxy/src/lib.rs                        |  40 ++---
 frame/proxy/src/tests.rs                      |   8 +-
 frame/proxy/src/weights.rs                    |   2 +-
 frame/randomness-collective-flip/src/lib.rs   |  16 +-
 frame/recovery/src/lib.rs                     |  20 +--
 frame/recovery/src/mock.rs                    |   6 +-
 frame/scheduler/src/benchmarking.rs           |   2 +-
 frame/scheduler/src/lib.rs                    | 100 +++++------
 frame/scheduler/src/weights.rs                |   2 +-
 frame/scored-pool/src/lib.rs                  |  26 +--
 frame/scored-pool/src/mock.rs                 |   6 +-
 frame/session/benchmarking/src/lib.rs         |   8 +-
 frame/session/benchmarking/src/mock.rs        |  14 +-
 frame/session/src/historical/mod.rs           |  20 +--
 frame/session/src/historical/offchain.rs      |  18 +-
 frame/session/src/historical/onchain.rs       |   4 +-
 frame/session/src/lib.rs                      |  22 +--
 frame/session/src/mock.rs                     |   8 +-
 frame/session/src/tests.rs                    |   2 +-
 frame/session/src/weights.rs                  |   2 +-
 frame/society/src/lib.rs                      |  24 +--
 frame/society/src/mock.rs                     |   6 +-
 frame/staking/fuzzer/src/mock.rs              |  14 +-
 frame/staking/src/benchmarking.rs             |   8 +-
 frame/staking/src/lib.rs                      |  86 +++++-----
 frame/staking/src/mock.rs                     |  18 +-
 frame/staking/src/offchain_election.rs        |  12 +-
 frame/staking/src/slashing.rs                 |  28 ++--
 frame/staking/src/testing_utils.rs            |  22 +--
 frame/staking/src/tests.rs                    |  30 ++--
 frame/staking/src/weights.rs                  |   2 +-
 frame/sudo/src/lib.rs                         |  26 +--
 frame/sudo/src/mock.rs                        |  20 +--
 frame/support/procedural/src/lib.rs           |  10 +-
 .../genesis_config/genesis_config_def.rs      |   4 +-
 frame/support/procedural/src/storage/mod.rs   |   8 +-
 frame/support/src/dispatch.rs                 |  98 +++++------
 frame/support/src/error.rs                    |   6 +-
 frame/support/src/event.rs                    |  70 ++++----
 frame/support/src/lib.rs                      |  26 +--
 frame/support/src/metadata.rs                 |  38 ++---
 frame/support/src/origin.rs                   |  40 ++---
 .../src/storage/generator/double_map.rs       |   6 +-
 frame/support/src/storage/generator/map.rs    |   6 +-
 frame/support/src/storage/generator/mod.rs    |   8 +-
 frame/support/src/traits.rs                   |  12 +-
 frame/support/src/weights.rs                  |  26 +--
 frame/support/test/Cargo.toml                 |   2 +
 frame/support/test/src/lib.rs                 |   4 +-
 frame/support/test/tests/construct_runtime.rs |  28 ++--
 ...served_keyword_two_times_integrity_test.rs |   2 +-
 ...ed_keyword_two_times_integrity_test.stderr |   4 +-
 ...eserved_keyword_two_times_on_initialize.rs |   2 +-
 ...ved_keyword_two_times_on_initialize.stderr |   4 +-
 frame/support/test/tests/decl_storage.rs      |  40 ++---
 .../tests/decl_storage_ui/config_duplicate.rs |   6 +-
 .../decl_storage_ui/config_get_duplicate.rs   |   6 +-
 .../tests/decl_storage_ui/get_duplicate.rs    |   6 +-
 frame/support/test/tests/derive_no_bound.rs   |  10 +-
 .../test/tests/derive_no_bound_ui/clone.rs    |   4 +-
 .../tests/derive_no_bound_ui/clone.stderr     |   4 +-
 .../test/tests/derive_no_bound_ui/debug.rs    |   4 +-
 .../tests/derive_no_bound_ui/debug.stderr     |   6 +-
 .../test/tests/derive_no_bound_ui/eq.rs       |   4 +-
 .../test/tests/derive_no_bound_ui/eq.stderr   |   2 +-
 .../tests/derive_no_bound_ui/partial_eq.rs    |   4 +-
 .../derive_no_bound_ui/partial_eq.stderr      |   4 +-
 frame/support/test/tests/final_keys.rs        |  12 +-
 frame/support/test/tests/genesisconfig.rs     |  10 +-
 frame/support/test/tests/instance.rs          |  54 +++---
 frame/support/test/tests/issue2219.rs         |  22 +--
 frame/support/test/tests/pallet_version.rs    |  24 +--
 .../tests/pallet_with_name_trait_is_valid.rs  | 157 ++++++++++++++++++
 .../tests/reserved_keyword/on_initialize.rs   |   4 +-
 .../support/test/tests/storage_transaction.rs |  10 +-
 frame/support/test/tests/system.rs            |  12 +-
 frame/system/benches/bench.rs                 |  10 +-
 frame/system/benchmarking/src/lib.rs          |   4 +-
 frame/system/benchmarking/src/mock.rs         |   6 +-
 frame/system/src/extensions/check_genesis.rs  |  12 +-
 .../system/src/extensions/check_mortality.rs  |  10 +-
 frame/system/src/extensions/check_nonce.rs    |  10 +-
 .../src/extensions/check_spec_version.rs      |  12 +-
 .../system/src/extensions/check_tx_version.rs |  12 +-
 frame/system/src/extensions/check_weight.rs   |  48 +++---
 frame/system/src/lib.rs                       |  38 ++---
 frame/system/src/mock.rs                      |  10 +-
 frame/system/src/offchain.rs                  |   2 +-
 frame/system/src/weights.rs                   |   2 +-
 frame/timestamp/src/lib.rs                    |  26 +--
 frame/timestamp/src/weights.rs                |   2 +-
 frame/transaction-payment/src/lib.rs          |  54 +++---
 frame/transaction-payment/src/payment.rs      |  18 +-
 frame/treasury/src/benchmarking.rs            |  18 +-
 frame/treasury/src/lib.rs                     |  28 ++--
 frame/treasury/src/tests.rs                   |   6 +-
 frame/treasury/src/weights.rs                 |   2 +-
 frame/utility/src/benchmarking.rs             |   8 +-
 frame/utility/src/lib.rs                      |  24 +--
 frame/utility/src/tests.rs                    |  18 +-
 frame/utility/src/weights.rs                  |   2 +-
 frame/vesting/src/benchmarking.rs             |   6 +-
 frame/vesting/src/lib.rs                      |  30 ++--
 frame/vesting/src/weights.rs                  |   2 +-
 .../api/proc-macro/src/impl_runtime_apis.rs   |   2 +-
 .../runtime/src/offchain/storage_lock.rs      |   4 +-
 primitives/runtime/src/traits.rs              |   4 +-
 test-utils/runtime/src/lib.rs                 |   8 +-
 test-utils/runtime/src/system.rs              |   6 +-
 .../frame-utilities-cli/src/module_id.rs      |   2 +-
 utils/frame/rpc/support/src/lib.rs            |  12 +-
 200 files changed, 1767 insertions(+), 1607 deletions(-)
 create mode 100644 frame/support/test/tests/pallet_with_name_trait_is_valid.rs

diff --git a/Cargo.lock b/Cargo.lock
index 8dff54073ac1..446b4442cd0e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1714,6 +1714,7 @@ version = "2.0.0"
 dependencies = [
  "frame-metadata",
  "frame-support",
+ "frame-system",
  "parity-scale-codec",
  "pretty_assertions",
  "rustversion",
diff --git a/bin/node-template/pallets/template/src/lib.rs b/bin/node-template/pallets/template/src/lib.rs
index 729a71278aa9..24de4f2f50dd 100644
--- a/bin/node-template/pallets/template/src/lib.rs
+++ b/bin/node-template/pallets/template/src/lib.rs
@@ -14,9 +14,9 @@ mod mock;
 mod tests;
 
 /// Configure the pallet by specifying the parameters and types on which it depends.
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// Because this pallet emits events, it depends on the runtime's definition of an event.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 }
 
 // The pallet's runtime storage items.
@@ -25,7 +25,7 @@ decl_storage! {
 	// A unique name is used to ensure that the pallet's storage items are isolated.
 	// This name may be updated, but each pallet in the runtime must use a unique name.
 	// ---------------------------------vvvvvvvvvvvvvv
-	trait Store for Module<T: Trait> as TemplateModule {
+	trait Store for Module<T: Config> as TemplateModule {
 		// Learn more about declaring storage items:
 		// https://substrate.dev/docs/en/knowledgebase/runtime/storage#declaring-storage-items
 		Something get(fn something): Option<u32>;
@@ -35,7 +35,7 @@ decl_storage! {
 // Pallets use events to inform users when important changes are made.
 // https://substrate.dev/docs/en/knowledgebase/runtime/events
 decl_event!(
-	pub enum Event<T> where AccountId = <T as frame_system::Trait>::AccountId {
+	pub enum Event<T> where AccountId = <T as frame_system::Config>::AccountId {
 		/// Event documentation should end with an array that provides descriptive names for event
 		/// parameters. [something, who]
 		SomethingStored(u32, AccountId),
@@ -44,7 +44,7 @@ decl_event!(
 
 // Errors inform users that something went wrong.
 decl_error! {
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Error names should be descriptive.
 		NoneValue,
 		/// Errors should have helpful documentation associated with them.
@@ -56,7 +56,7 @@ decl_error! {
 // These functions materialize as "extrinsics", which are often compared to transactions.
 // Dispatchable functions must be annotated with a weight and must return a DispatchResult.
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		// Errors must be initialized if they are used by the pallet.
 		type Error = Error<T>;
 
diff --git a/bin/node-template/pallets/template/src/mock.rs b/bin/node-template/pallets/template/src/mock.rs
index a3dff240e484..4c7c16e7f557 100644
--- a/bin/node-template/pallets/template/src/mock.rs
+++ b/bin/node-template/pallets/template/src/mock.rs
@@ -1,4 +1,4 @@
-use crate::{Module, Trait};
+use crate::{Module, Config};
 use sp_core::H256;
 use frame_support::{impl_outer_origin, parameter_types, weights::Weight};
 use sp_runtime::{
@@ -21,7 +21,7 @@ parameter_types! {
 	pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);
 }
 
-impl system::Trait for Test {
+impl system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Call = ();
@@ -49,7 +49,7 @@ impl system::Trait for Test {
 	type SystemWeightInfo = ();
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type Event = ();
 }
 
diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index aadfd931cdb5..a899afe9ad12 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -140,7 +140,7 @@ parameter_types! {
 
 // Configure FRAME pallets to include in runtime.
 
-impl frame_system::Trait for Runtime {
+impl frame_system::Config for Runtime {
 	/// The basic call filter to use in dispatchable.
 	type BaseCallFilter = ();
 	/// The identifier used to distinguish between accounts.
@@ -199,11 +199,11 @@ impl frame_system::Trait for Runtime {
 	type SystemWeightInfo = ();
 }
 
-impl pallet_aura::Trait for Runtime {
+impl pallet_aura::Config for Runtime {
 	type AuthorityId = AuraId;
 }
 
-impl pallet_grandpa::Trait for Runtime {
+impl pallet_grandpa::Config for Runtime {
 	type Event = Event;
 	type Call = Call;
 
@@ -226,7 +226,7 @@ parameter_types! {
 	pub const MinimumPeriod: u64 = SLOT_DURATION / 2;
 }
 
-impl pallet_timestamp::Trait for Runtime {
+impl pallet_timestamp::Config for Runtime {
 	/// A timestamp: milliseconds since the unix epoch.
 	type Moment = u64;
 	type OnTimestampSet = Aura;
@@ -239,7 +239,7 @@ parameter_types! {
 	pub const MaxLocks: u32 = 50;
 }
 
-impl pallet_balances::Trait for Runtime {
+impl pallet_balances::Config for Runtime {
 	type MaxLocks = MaxLocks;
 	/// The type for recording an account's balance.
 	type Balance = Balance;
@@ -255,20 +255,20 @@ parameter_types! {
 	pub const TransactionByteFee: Balance = 1;
 }
 
-impl pallet_transaction_payment::Trait for Runtime {
+impl pallet_transaction_payment::Config for Runtime {
 	type OnChargeTransaction = CurrencyAdapter<Balances, ()>;
 	type TransactionByteFee = TransactionByteFee;
 	type WeightToFee = IdentityFee<Balance>;
 	type FeeMultiplierUpdate = ();
 }
 
-impl pallet_sudo::Trait for Runtime {
+impl pallet_sudo::Config for Runtime {
 	type Event = Event;
 	type Call = Call;
 }
 
 /// Configure the pallet template in pallets/template.
-impl template::Trait for Runtime {
+impl template::Config for Runtime {
 	type Event = Event;
 }
 
@@ -457,7 +457,7 @@ impl_runtime_apis! {
 			use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey};
 
 			use frame_system_benchmarking::Module as SystemBench;
-			impl frame_system_benchmarking::Trait for Runtime {}
+			impl frame_system_benchmarking::Config for Runtime {}
 
 			let whitelist: Vec<TrackedStorageKey> = vec![
 				// Block Number
diff --git a/bin/node/executor/tests/basic.rs b/bin/node/executor/tests/basic.rs
index 236e0a823ac3..09438bfacd45 100644
--- a/bin/node/executor/tests/basic.rs
+++ b/bin/node/executor/tests/basic.rs
@@ -580,7 +580,7 @@ const CODE_TRANSFER: &str = r#"
 #[test]
 fn deploying_wasm_contract_should_work() {
 	let transfer_code = wat::parse_str(CODE_TRANSFER).unwrap();
-	let transfer_ch = <Runtime as frame_system::Trait>::Hashing::hash(&transfer_code);
+	let transfer_ch = <Runtime as frame_system::Config>::Hashing::hash(&transfer_code);
 
 	let addr = pallet_contracts::Module::<Runtime>::contract_address(
 		&charlie(),
@@ -588,7 +588,7 @@ fn deploying_wasm_contract_should_work() {
 		&[],
 	);
 
-	let subsistence = pallet_contracts::Config::<Runtime>::subsistence_threshold_uncached();
+	let subsistence = pallet_contracts::ConfigCache::<Runtime>::subsistence_threshold_uncached();
 
 	let b = construct_block(
 		&mut new_test_ext(compact_code_unwrap(), false),
diff --git a/bin/node/runtime/src/impls.rs b/bin/node/runtime/src/impls.rs
index 16666997b3a5..acd8def68353 100644
--- a/bin/node/runtime/src/impls.rs
+++ b/bin/node/runtime/src/impls.rs
@@ -200,7 +200,7 @@ mod multiplier_tests {
 				fm = next;
 				iterations += 1;
 				let fee =
-					<Runtime as pallet_transaction_payment::Trait>::WeightToFee::calc(&tx_weight);
+					<Runtime as pallet_transaction_payment::Config>::WeightToFee::calc(&tx_weight);
 				let adjusted_fee = fm.saturating_mul_acc_int(fee);
 				println!(
 					"iteration {}, new fm = {:?}. Fee at this point is: {} units / {} millicents, \
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 4feff5d051ab..be3783cd7ca5 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -156,7 +156,7 @@ parameter_types! {
 
 const_assert!(AvailableBlockRatio::get().deconstruct() >= AVERAGE_ON_INITIALIZE_WEIGHT.deconstruct());
 
-impl frame_system::Trait for Runtime {
+impl frame_system::Config for Runtime {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Call = Call;
@@ -184,7 +184,7 @@ impl frame_system::Trait for Runtime {
 	type SystemWeightInfo = frame_system::weights::SubstrateWeight<Runtime>;
 }
 
-impl pallet_utility::Trait for Runtime {
+impl pallet_utility::Config for Runtime {
 	type Event = Event;
 	type Call = Call;
 	type WeightInfo = pallet_utility::weights::SubstrateWeight<Runtime>;
@@ -198,7 +198,7 @@ parameter_types! {
 	pub const MaxSignatories: u16 = 100;
 }
 
-impl pallet_multisig::Trait for Runtime {
+impl pallet_multisig::Config for Runtime {
 	type Event = Event;
 	type Call = Call;
 	type Currency = Balances;
@@ -261,7 +261,7 @@ impl InstanceFilter<Call> for ProxyType {
 	}
 }
 
-impl pallet_proxy::Trait for Runtime {
+impl pallet_proxy::Config for Runtime {
 	type Event = Event;
 	type Call = Call;
 	type Currency = Balances;
@@ -281,7 +281,7 @@ parameter_types! {
 	pub const MaxScheduledPerBlock: u32 = 50;
 }
 
-impl pallet_scheduler::Trait for Runtime {
+impl pallet_scheduler::Config for Runtime {
 	type Event = Event;
 	type Origin = Origin;
 	type PalletsOrigin = OriginCaller;
@@ -297,7 +297,7 @@ parameter_types! {
 	pub const ExpectedBlockTime: Moment = MILLISECS_PER_BLOCK;
 }
 
-impl pallet_babe::Trait for Runtime {
+impl pallet_babe::Config for Runtime {
 	type EpochDuration = EpochDuration;
 	type ExpectedBlockTime = ExpectedBlockTime;
 	type EpochChangeTrigger = pallet_babe::ExternalTrigger;
@@ -324,7 +324,7 @@ parameter_types! {
 	pub const IndexDeposit: Balance = 1 * DOLLARS;
 }
 
-impl pallet_indices::Trait for Runtime {
+impl pallet_indices::Config for Runtime {
 	type AccountIndex = AccountIndex;
 	type Currency = Balances;
 	type Deposit = IndexDeposit;
@@ -339,7 +339,7 @@ parameter_types! {
 	pub const MaxLocks: u32 = 50;
 }
 
-impl pallet_balances::Trait for Runtime {
+impl pallet_balances::Config for Runtime {
 	type MaxLocks = MaxLocks;
 	type Balance = Balance;
 	type DustRemoval = ();
@@ -356,7 +356,7 @@ parameter_types! {
 	pub MinimumMultiplier: Multiplier = Multiplier::saturating_from_rational(1, 1_000_000_000u128);
 }
 
-impl pallet_transaction_payment::Trait for Runtime {
+impl pallet_transaction_payment::Config for Runtime {
 	type OnChargeTransaction = CurrencyAdapter<Balances, DealWithFees>;
 	type TransactionByteFee = TransactionByteFee;
 	type WeightToFee = IdentityFee<Balance>;
@@ -368,7 +368,7 @@ parameter_types! {
 	pub const MinimumPeriod: Moment = SLOT_DURATION / 2;
 }
 
-impl pallet_timestamp::Trait for Runtime {
+impl pallet_timestamp::Config for Runtime {
 	type Moment = Moment;
 	type OnTimestampSet = Babe;
 	type MinimumPeriod = MinimumPeriod;
@@ -379,7 +379,7 @@ parameter_types! {
 	pub const UncleGenerations: BlockNumber = 5;
 }
 
-impl pallet_authorship::Trait for Runtime {
+impl pallet_authorship::Config for Runtime {
 	type FindAuthor = pallet_session::FindAccountFromAuthorIndex<Self, Babe>;
 	type UncleGenerations = UncleGenerations;
 	type FilterUncle = ();
@@ -399,9 +399,9 @@ parameter_types! {
 	pub const DisabledValidatorsThreshold: Perbill = Perbill::from_percent(17);
 }
 
-impl pallet_session::Trait for Runtime {
+impl pallet_session::Config for Runtime {
 	type Event = Event;
-	type ValidatorId = <Self as frame_system::Trait>::AccountId;
+	type ValidatorId = <Self as frame_system::Config>::AccountId;
 	type ValidatorIdOf = pallet_staking::StashOf<Self>;
 	type ShouldEndSession = Babe;
 	type NextSessionRotation = Babe;
@@ -412,7 +412,7 @@ impl pallet_session::Trait for Runtime {
 	type WeightInfo = pallet_session::weights::SubstrateWeight<Runtime>;
 }
 
-impl pallet_session::historical::Trait for Runtime {
+impl pallet_session::historical::Config for Runtime {
 	type FullIdentification = pallet_staking::Exposure<AccountId, Balance>;
 	type FullIdentificationOf = pallet_staking::ExposureOf<Runtime>;
 }
@@ -443,7 +443,7 @@ parameter_types! {
 		.saturating_sub(ExtrinsicBaseWeight::get());
 }
 
-impl pallet_staking::Trait for Runtime {
+impl pallet_staking::Config for Runtime {
 	type Currency = Balances;
 	type UnixTime = Timestamp;
 	type CurrencyToVote = U128CurrencyToVote;
@@ -489,7 +489,7 @@ parameter_types! {
 	pub const MaxProposals: u32 = 100;
 }
 
-impl pallet_democracy::Trait for Runtime {
+impl pallet_democracy::Config for Runtime {
 	type Proposal = Call;
 	type Event = Event;
 	type Currency = Balances;
@@ -541,7 +541,7 @@ parameter_types! {
 }
 
 type CouncilCollective = pallet_collective::Instance1;
-impl pallet_collective::Trait<CouncilCollective> for Runtime {
+impl pallet_collective::Config<CouncilCollective> for Runtime {
 	type Origin = Origin;
 	type Proposal = Call;
 	type Event = Event;
@@ -564,7 +564,7 @@ parameter_types! {
 // Make sure that there are no more than `MaxMembers` members elected via elections-phragmen.
 const_assert!(DesiredMembers::get() <= CouncilMaxMembers::get());
 
-impl pallet_elections_phragmen::Trait for Runtime {
+impl pallet_elections_phragmen::Config for Runtime {
 	type Event = Event;
 	type ModuleId = ElectionsPhragmenModuleId;
 	type Currency = Balances;
@@ -591,7 +591,7 @@ parameter_types! {
 }
 
 type TechnicalCollective = pallet_collective::Instance2;
-impl pallet_collective::Trait<TechnicalCollective> for Runtime {
+impl pallet_collective::Config<TechnicalCollective> for Runtime {
 	type Origin = Origin;
 	type Proposal = Call;
 	type Event = Event;
@@ -607,7 +607,7 @@ type EnsureRootOrHalfCouncil = EnsureOneOf<
 	EnsureRoot<AccountId>,
 	pallet_collective::EnsureProportionMoreThan<_1, _2, AccountId, CouncilCollective>
 >;
-impl pallet_membership::Trait<pallet_membership::Instance1> for Runtime {
+impl pallet_membership::Config<pallet_membership::Instance1> for Runtime {
 	type Event = Event;
 	type AddOrigin = EnsureRootOrHalfCouncil;
 	type RemoveOrigin = EnsureRootOrHalfCouncil;
@@ -636,7 +636,7 @@ parameter_types! {
 	pub const BountyValueMinimum: Balance = 5 * DOLLARS;
 }
 
-impl pallet_treasury::Trait for Runtime {
+impl pallet_treasury::Config for Runtime {
 	type ModuleId = TreasuryModuleId;
 	type Currency = Balances;
 	type ApproveOrigin = EnsureOneOf<
@@ -681,7 +681,7 @@ parameter_types! {
 	pub const MaxValueSize: u32 = 16 * 1024;
 }
 
-impl pallet_contracts::Trait for Runtime {
+impl pallet_contracts::Config for Runtime {
 	type Time = Timestamp;
 	type Randomness = RandomnessCollectiveFlip;
 	type Currency = Balances;
@@ -699,7 +699,7 @@ impl pallet_contracts::Trait for Runtime {
 	type WeightInfo = pallet_contracts::weights::SubstrateWeight<Self>;
 }
 
-impl pallet_sudo::Trait for Runtime {
+impl pallet_sudo::Config for Runtime {
 	type Event = Event;
 	type Call = Call;
 }
@@ -769,7 +769,7 @@ impl<C> frame_system::offchain::SendTransactionTypes<C> for Runtime where
 	type OverarchingCall = Call;
 }
 
-impl pallet_im_online::Trait for Runtime {
+impl pallet_im_online::Config for Runtime {
 	type AuthorityId = ImOnlineId;
 	type Event = Event;
 	type SessionDuration = SessionDuration;
@@ -782,16 +782,16 @@ parameter_types! {
 	pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * MaximumBlockWeight::get();
 }
 
-impl pallet_offences::Trait for Runtime {
+impl pallet_offences::Config for Runtime {
 	type Event = Event;
 	type IdentificationTuple = pallet_session::historical::IdentificationTuple<Self>;
 	type OnOffenceHandler = Staking;
 	type WeightSoftLimit = OffencesWeightSoftLimit;
 }
 
-impl pallet_authority_discovery::Trait for Runtime {}
+impl pallet_authority_discovery::Config for Runtime {}
 
-impl pallet_grandpa::Trait for Runtime {
+impl pallet_grandpa::Config for Runtime {
 	type Event = Event;
 	type Call = Call;
 
@@ -820,7 +820,7 @@ parameter_types! {
 	pub const MaxRegistrars: u32 = 20;
 }
 
-impl pallet_identity::Trait for Runtime {
+impl pallet_identity::Config for Runtime {
 	type Event = Event;
 	type Currency = Balances;
 	type BasicDeposit = BasicDeposit;
@@ -842,7 +842,7 @@ parameter_types! {
 	pub const RecoveryDeposit: Balance = 5 * DOLLARS;
 }
 
-impl pallet_recovery::Trait for Runtime {
+impl pallet_recovery::Config for Runtime {
 	type Event = Event;
 	type Call = Call;
 	type Currency = Balances;
@@ -863,7 +863,7 @@ parameter_types! {
 	pub const SocietyModuleId: ModuleId = ModuleId(*b"py/socie");
 }
 
-impl pallet_society::Trait for Runtime {
+impl pallet_society::Config for Runtime {
 	type Event = Event;
 	type ModuleId = SocietyModuleId;
 	type Currency = Balances;
@@ -884,7 +884,7 @@ parameter_types! {
 	pub const MinVestedTransfer: Balance = 100 * DOLLARS;
 }
 
-impl pallet_vesting::Trait for Runtime {
+impl pallet_vesting::Config for Runtime {
 	type Event = Event;
 	type Currency = Balances;
 	type BlockNumberToBalance = ConvertInto;
@@ -1173,9 +1173,9 @@ impl_runtime_apis! {
 			use pallet_offences_benchmarking::Module as OffencesBench;
 			use frame_system_benchmarking::Module as SystemBench;
 
-			impl pallet_session_benchmarking::Trait for Runtime {}
-			impl pallet_offences_benchmarking::Trait for Runtime {}
-			impl frame_system_benchmarking::Trait for Runtime {}
+			impl pallet_session_benchmarking::Config for Runtime {}
+			impl pallet_offences_benchmarking::Config for Runtime {}
+			impl frame_system_benchmarking::Config for Runtime {}
 
 			let whitelist: Vec<TrackedStorageKey> = vec![
 				// Block Number
diff --git a/bin/utils/subkey/src/lib.rs b/bin/utils/subkey/src/lib.rs
index 051628e84a19..c38a48576524 100644
--- a/bin/utils/subkey/src/lib.rs
+++ b/bin/utils/subkey/src/lib.rs
@@ -63,7 +63,7 @@ pub enum Subkey {
 /// Run the subkey command, given the apropriate runtime.
 pub fn run<R>() -> Result<(), Error>
 	where
-		R: frame_system::Trait,
+		R: frame_system::Config,
 		R::AccountId: Ss58Codec
 {
 	match Subkey::from_args() {
diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index e5ad2ae352eb..9ed442aada3a 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -28,7 +28,7 @@
 //! * Asset Transfer
 //! * Asset Destruction
 //!
-//! To use it in your runtime, you need to implement the assets [`Trait`](./trait.Trait.html).
+//! To use it in your runtime, you need to implement the assets [`Config`](./trait.Config.html).
 //!
 //! The supported dispatchable functions are documented in the [`Call`](./enum.Call.html) enum.
 //!
@@ -89,10 +89,10 @@
 //! use frame_support::{decl_module, dispatch, ensure};
 //! use frame_system::ensure_signed;
 //!
-//! pub trait Trait: assets::Trait { }
+//! pub trait Config: assets::Config { }
 //!
 //! decl_module! {
-//! 	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+//! 	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 //! 		pub fn issue_token_airdrop(origin) -> dispatch::DispatchResult {
 //! 			let sender = ensure_signed(origin).map_err(|e| e.as_str())?;
 //!
@@ -123,7 +123,7 @@
 //! them are violated, the behavior of this module is undefined.
 //!
 //! * The total count of assets should be less than
-//!   `Trait::AssetId::max_value()`.
+//!   `Config::AssetId::max_value()`.
 //!
 //! ## Related Modules
 //!
@@ -139,9 +139,9 @@ use frame_system::ensure_signed;
 use sp_runtime::traits::One;
 
 /// The module configuration trait.
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// The units in which we record balances.
 	type Balance: Member + Parameter + AtLeast32BitUnsigned + Default + Copy;
@@ -151,7 +151,7 @@ pub trait Trait: frame_system::Trait {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		type Error = Error<T>;
 
 		fn deposit_event() = default;
@@ -226,9 +226,9 @@ decl_module! {
 
 decl_event! {
 	pub enum Event<T> where
-		<T as frame_system::Trait>::AccountId,
-		<T as Trait>::Balance,
-		<T as Trait>::AssetId,
+		<T as frame_system::Config>::AccountId,
+		<T as Config>::Balance,
+		<T as Config>::AssetId,
 	{
 		/// Some assets were issued. \[asset_id, owner, total_supply\]
 		Issued(AssetId, AccountId, Balance),
@@ -240,7 +240,7 @@ decl_event! {
 }
 
 decl_error! {
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Transfer amount should be non-zero
 		AmountZero,
 		/// Account balance must be greater than or equal to the transfer amount
@@ -251,7 +251,7 @@ decl_error! {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Assets {
+	trait Store for Module<T: Config> as Assets {
 		/// The number of units of assets held by any given account.
 		Balances: map hasher(blake2_128_concat) (T::AssetId, T::AccountId) => T::Balance;
 		/// The next asset identifier up for grabs.
@@ -264,7 +264,7 @@ decl_storage! {
 }
 
 // The main implementation block for the module.
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	// Public immutables
 
 	/// Get the asset `id` balance of `who`.
@@ -298,7 +298,7 @@ mod tests {
 		pub const MaximumBlockLength: u32 = 2 * 1024;
 		pub const AvailableBlockRatio: Perbill = Perbill::one();
 	}
-	impl frame_system::Trait for Test {
+	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
 		type Origin = Origin;
 		type Index = u64;
@@ -325,7 +325,7 @@ mod tests {
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
 	}
-	impl Trait for Test {
+	impl Config for Test {
 		type Event = ();
 		type Balance = u64;
 		type AssetId = u32;
diff --git a/frame/atomic-swap/src/lib.rs b/frame/atomic-swap/src/lib.rs
index 31f0c0f42652..ac9b82b0df06 100644
--- a/frame/atomic-swap/src/lib.rs
+++ b/frame/atomic-swap/src/lib.rs
@@ -19,7 +19,7 @@
 //!
 //! A module for atomically sending funds.
 //!
-//! - [`atomic_swap::Trait`](./trait.Trait.html)
+//! - [`atomic_swap::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //! - [`Module`](./struct.Module.html)
 //!
@@ -56,7 +56,7 @@ use sp_runtime::RuntimeDebug;
 
 /// Pending atomic swap operation.
 #[derive(Clone, Eq, PartialEq, RuntimeDebug, Encode, Decode)]
-pub struct PendingSwap<T: Trait> {
+pub struct PendingSwap<T: Config> {
 	/// Source of the swap.
 	pub source: T::AccountId,
 	/// Action of this swap.
@@ -74,7 +74,7 @@ pub type HashedProof = [u8; 32];
 /// succeeds with best efforts.
 /// - **Claim**: claim any resources reserved in the first phrase.
 /// - **Cancel**: cancel any resources reserved in the first phrase.
-pub trait SwapAction<AccountId, T: Trait> {
+pub trait SwapAction<AccountId, T: Config> {
 	/// Reserve the resources needed for the swap, from the given `source`. The reservation is
 	/// allowed to fail. If that is the case, the the full swap creation operation is cancelled.
 	fn reserve(&self, source: &AccountId) -> DispatchResult;
@@ -115,7 +115,7 @@ impl<AccountId, C> DerefMut for BalanceSwapAction<AccountId, C> where C: Reserva
 	}
 }
 
-impl<T: Trait, AccountId, C> SwapAction<AccountId, T> for BalanceSwapAction<AccountId, C>
+impl<T: Config, AccountId, C> SwapAction<AccountId, T> for BalanceSwapAction<AccountId, C>
 	where C: ReservableCurrency<AccountId>
 {
 	fn reserve(&self, source: &AccountId) -> DispatchResult {
@@ -136,9 +136,9 @@ impl<T: Trait, AccountId, C> SwapAction<AccountId, T> for BalanceSwapAction<Acco
 }
 
 /// Atomic swap's pallet configuration trait.
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 	/// Swap action.
 	type SwapAction: SwapAction<Self::AccountId, Self> + Parameter;
 	/// Limit of proof size.
@@ -155,7 +155,7 @@ pub trait Trait: frame_system::Trait {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as AtomicSwap {
+	trait Store for Module<T: Config> as AtomicSwap {
 		pub PendingSwaps: double_map
 			hasher(twox_64_concat) T::AccountId, hasher(blake2_128_concat) HashedProof
 			=> Option<PendingSwap<T>>;
@@ -163,7 +163,7 @@ decl_storage! {
 }
 
 decl_error! {
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Swap already exists.
 		AlreadyExist,
 		/// Swap proof is invalid.
@@ -186,7 +186,7 @@ decl_error! {
 decl_event!(
 	/// Event of atomic swap pallet.
 	pub enum Event<T> where
-		AccountId = <T as system::Trait>::AccountId,
+		AccountId = <T as system::Config>::AccountId,
 		PendingSwap = PendingSwap<T>,
 	{
 		/// Swap created. \[account, proof, swap\]
@@ -201,7 +201,7 @@ decl_event!(
 
 decl_module! {
 	/// Module definition of atomic swap pallet.
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		type Error = Error<T>;
 
 		fn deposit_event() = default;
diff --git a/frame/atomic-swap/src/tests.rs b/frame/atomic-swap/src/tests.rs
index 060411c8815d..7254ceba4f63 100644
--- a/frame/atomic-swap/src/tests.rs
+++ b/frame/atomic-swap/src/tests.rs
@@ -24,7 +24,7 @@ parameter_types! {
 	pub const MaximumBlockLength: u32 = 2 * 1024;
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = u64;
@@ -54,7 +54,7 @@ impl frame_system::Trait for Test {
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
 }
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u64;
 	type DustRemoval = ();
@@ -67,7 +67,7 @@ parameter_types! {
 	pub const ProofLimit: u32 = 1024;
 	pub const ExpireDuration: u64 = 100;
 }
-impl Trait for Test {
+impl Config for Test {
 	type Event = ();
 	type SwapAction = BalanceSwapAction<u64, Balances>;
 	type ProofLimit = ProofLimit;
diff --git a/frame/aura/src/lib.rs b/frame/aura/src/lib.rs
index e8e0e616bc0d..34f216850c67 100644
--- a/frame/aura/src/lib.rs
+++ b/frame/aura/src/lib.rs
@@ -17,7 +17,7 @@
 
 //! # Aura Module
 //!
-//! - [`aura::Trait`](./trait.Trait.html)
+//! - [`aura::Config`](./trait.Config.html)
 //! - [`Module`](./struct.Module.html)
 //!
 //! ## Overview
@@ -66,13 +66,13 @@ use sp_consensus_aura::{
 mod mock;
 mod tests;
 
-pub trait Trait: pallet_timestamp::Trait {
+pub trait Config: pallet_timestamp::Config {
 	/// The identifier type for an authority.
 	type AuthorityId: Member + Parameter + RuntimeAppPublic + Default;
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Aura {
+	trait Store for Module<T: Config> as Aura {
 		/// The last timestamp.
 		LastTimestamp get(fn last): T::Moment;
 
@@ -86,10 +86,10 @@ decl_storage! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin { }
+	pub struct Module<T: Config> for enum Call where origin: T::Origin { }
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	fn change_authorities(new: Vec<T::AuthorityId>) {
 		<Authorities<T>>::put(&new);
 
@@ -108,11 +108,11 @@ impl<T: Trait> Module<T> {
 	}
 }
 
-impl<T: Trait> sp_runtime::BoundToRuntimeAppPublic for Module<T> {
+impl<T: Config> sp_runtime::BoundToRuntimeAppPublic for Module<T> {
 	type Public = T::AuthorityId;
 }
 
-impl<T: Trait> pallet_session::OneSessionHandler<T::AccountId> for Module<T> {
+impl<T: Config> pallet_session::OneSessionHandler<T::AccountId> for Module<T> {
 	type Key = T::AuthorityId;
 
 	fn on_genesis_session<'a, I: 'a>(validators: I)
@@ -145,7 +145,7 @@ impl<T: Trait> pallet_session::OneSessionHandler<T::AccountId> for Module<T> {
 	}
 }
 
-impl<T: Trait> FindAuthor<u32> for Module<T> {
+impl<T: Config> FindAuthor<u32> for Module<T> {
 	fn find_author<'a, I>(digests: I) -> Option<u32> where
 		I: 'a + IntoIterator<Item=(ConsensusEngineId, &'a [u8])>
 	{
@@ -167,7 +167,7 @@ impl<T: Trait> FindAuthor<u32> for Module<T> {
 #[doc(hidden)]
 pub struct FindAccountFromAuthorIndex<T, Inner>(sp_std::marker::PhantomData<(T, Inner)>);
 
-impl<T: Trait, Inner: FindAuthor<u32>> FindAuthor<T::AuthorityId>
+impl<T: Config, Inner: FindAuthor<u32>> FindAuthor<T::AuthorityId>
 	for FindAccountFromAuthorIndex<T, Inner>
 {
 	fn find_author<'a, I>(digests: I) -> Option<T::AuthorityId>
@@ -183,7 +183,7 @@ impl<T: Trait, Inner: FindAuthor<u32>> FindAuthor<T::AuthorityId>
 /// Find the authority ID of the Aura authority who authored the current block.
 pub type AuraAuthorId<T> = FindAccountFromAuthorIndex<T, Module<T>>;
 
-impl<T: Trait> IsMember<T::AuthorityId> for Module<T> {
+impl<T: Config> IsMember<T::AuthorityId> for Module<T> {
 	fn is_member(authority_id: &T::AuthorityId) -> bool {
 		Self::authorities()
 			.iter()
@@ -191,12 +191,12 @@ impl<T: Trait> IsMember<T::AuthorityId> for Module<T> {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Determine the Aura slot-duration based on the Timestamp module configuration.
 	pub fn slot_duration() -> T::Moment {
 		// we double the minimum block-period so each author can always propose within
 		// the majority of its slot.
-		<T as pallet_timestamp::Trait>::MinimumPeriod::get().saturating_mul(2u32.into())
+		<T as pallet_timestamp::Config>::MinimumPeriod::get().saturating_mul(2u32.into())
 	}
 
 	fn on_timestamp_set(now: T::Moment, slot_duration: T::Moment) {
@@ -218,13 +218,13 @@ impl<T: Trait> Module<T> {
 	}
 }
 
-impl<T: Trait> OnTimestampSet<T::Moment> for Module<T> {
+impl<T: Config> OnTimestampSet<T::Moment> for Module<T> {
 	fn on_timestamp_set(moment: T::Moment) {
 		Self::on_timestamp_set(moment, Self::slot_duration())
 	}
 }
 
-impl<T: Trait> ProvideInherent for Module<T> {
+impl<T: Config> ProvideInherent for Module<T> {
 	type Call = pallet_timestamp::Call<T>;
 	type Error = MakeFatalError<sp_inherents::Error>;
 	const INHERENT_IDENTIFIER: InherentIdentifier = INHERENT_IDENTIFIER;
diff --git a/frame/aura/src/mock.rs b/frame/aura/src/mock.rs
index a3875727e47c..b06a0f427f1b 100644
--- a/frame/aura/src/mock.rs
+++ b/frame/aura/src/mock.rs
@@ -19,7 +19,7 @@
 
 #![cfg(test)]
 
-use crate::{Trait, Module, GenesisConfig};
+use crate::{Config, Module, GenesisConfig};
 use sp_consensus_aura::ed25519::AuthorityId;
 use sp_runtime::{
 	traits::IdentityLookup, Perbill,
@@ -45,7 +45,7 @@ parameter_types! {
 	pub const MinimumPeriod: u64 = 1;
 }
 
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = u64;
@@ -73,14 +73,14 @@ impl frame_system::Trait for Test {
 	type SystemWeightInfo = ();
 }
 
-impl pallet_timestamp::Trait for Test {
+impl pallet_timestamp::Config for Test {
 	type Moment = u64;
 	type OnTimestampSet = Aura;
 	type MinimumPeriod = MinimumPeriod;
 	type WeightInfo = ();
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type AuthorityId = AuthorityId;
 }
 
diff --git a/frame/authority-discovery/src/lib.rs b/frame/authority-discovery/src/lib.rs
index 09be533474fc..4db7ba753cb6 100644
--- a/frame/authority-discovery/src/lib.rs
+++ b/frame/authority-discovery/src/lib.rs
@@ -28,10 +28,10 @@ use frame_support::{decl_module, decl_storage};
 use sp_authority_discovery::AuthorityId;
 
 /// The module's config trait.
-pub trait Trait: frame_system::Trait + pallet_session::Trait {}
+pub trait Config: frame_system::Config + pallet_session::Config {}
 
 decl_storage! {
-	trait Store for Module<T: Trait> as AuthorityDiscovery {
+	trait Store for Module<T: Config> as AuthorityDiscovery {
 		/// Keys of the current and next authority set.
 		Keys get(fn keys): Vec<AuthorityId>;
 	}
@@ -42,11 +42,11 @@ decl_storage! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Retrieve authority identifiers of the current and next authority set.
 	pub fn authorities() -> Vec<AuthorityId> {
 		Keys::get()
@@ -60,11 +60,11 @@ impl<T: Trait> Module<T> {
 	}
 }
 
-impl<T: Trait> sp_runtime::BoundToRuntimeAppPublic for Module<T> {
+impl<T: Config> sp_runtime::BoundToRuntimeAppPublic for Module<T> {
 	type Public = AuthorityId;
 }
 
-impl<T: Trait> pallet_session::OneSessionHandler<T::AccountId> for Module<T> {
+impl<T: Config> pallet_session::OneSessionHandler<T::AccountId> for Module<T> {
 	type Key = AuthorityId;
 
 	fn on_genesis_session<'a, I: 'a>(authorities: I)
@@ -107,13 +107,13 @@ mod tests {
 
 	#[derive(Clone, Eq, PartialEq)]
 	pub struct Test;
-	impl Trait for Test {}
+	impl Config for Test {}
 
 	parameter_types! {
 		pub const DisabledValidatorsThreshold: Perbill = Perbill::from_percent(33);
 	}
 
-	impl pallet_session::Trait for Test {
+	impl pallet_session::Config for Test {
 		type SessionManager = ();
 		type Keys = UintAuthorityId;
 		type ShouldEndSession = pallet_session::PeriodicSessions<Period, Offset>;
@@ -126,7 +126,7 @@ mod tests {
 		type WeightInfo = ();
 	}
 
-	impl pallet_session::historical::Trait for Test {
+	impl pallet_session::historical::Config for Test {
 		type FullIdentification = ();
 		type FullIdentificationOf = ();
 	}
@@ -143,7 +143,7 @@ mod tests {
 		pub const AvailableBlockRatio: Perbill = Perbill::one();
 	}
 
-	impl frame_system::Trait for Test {
+	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
 		type Origin = Origin;
 		type Index = u64;
diff --git a/frame/authorship/src/lib.rs b/frame/authorship/src/lib.rs
index 0a10c8849571..4809462db6e2 100644
--- a/frame/authorship/src/lib.rs
+++ b/frame/authorship/src/lib.rs
@@ -34,7 +34,7 @@ use sp_authorship::{INHERENT_IDENTIFIER, UnclesInherentData, InherentError};
 
 const MAX_UNCLES: usize = 10;
 
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// Find the author of a block.
 	type FindAuthor: FindAuthor<Self::AccountId>;
 	/// The number of blocks back we should accept uncles.
@@ -152,7 +152,7 @@ enum UncleEntryItem<BlockNumber, Hash, Author> {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Authorship {
+	trait Store for Module<T: Config> as Authorship {
 		/// Uncles
 		Uncles: Vec<UncleEntryItem<T::BlockNumber, T::Hash, T::AccountId>>;
 		/// Author of current block.
@@ -164,7 +164,7 @@ decl_storage! {
 
 decl_error! {
 	/// Error for the authorship module.
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// The uncle parent not in the chain.
 		InvalidUncleParent,
 		/// Uncles already set in the block.
@@ -183,7 +183,7 @@ decl_error! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		type Error = Error<T>;
 
 		fn on_initialize(now: T::BlockNumber) -> Weight {
@@ -223,7 +223,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Fetch the author of the block.
 	///
 	/// This is safe to invoke in `on_initialize` implementations, as well
@@ -337,7 +337,7 @@ impl<T: Trait> Module<T> {
 	}
 }
 
-impl<T: Trait> ProvideInherent for Module<T> {
+impl<T: Config> ProvideInherent for Module<T> {
 	type Call = Call<T>;
 	type Error = InherentError;
 	const INHERENT_IDENTIFIER: InherentIdentifier = INHERENT_IDENTIFIER;
@@ -417,7 +417,7 @@ mod tests {
 		pub const AvailableBlockRatio: Perbill = Perbill::one();
 	}
 
-	impl frame_system::Trait for Test {
+	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
 		type Origin = Origin;
 		type Index = u64;
@@ -449,7 +449,7 @@ mod tests {
 		pub const UncleGenerations: u64 = 5;
 	}
 
-	impl Trait for Test {
+	impl Config for Test {
 		type FindAuthor = AuthorGiven;
 		type UncleGenerations = UncleGenerations;
 		type FilterUncle = SealVerify<VerifyBlock>;
diff --git a/frame/babe/src/equivocation.rs b/frame/babe/src/equivocation.rs
index 322dff92f239..55aaedfe082f 100644
--- a/frame/babe/src/equivocation.rs
+++ b/frame/babe/src/equivocation.rs
@@ -48,14 +48,14 @@ use sp_staking::{
 };
 use sp_std::prelude::*;
 
-use crate::{Call, Module, Trait};
+use crate::{Call, Module, Config};
 
 /// A trait with utility methods for handling equivocation reports in BABE.
 /// The trait provides methods for reporting an offence triggered by a valid
 /// equivocation report, checking the current block author (to declare as the
 /// reporter), and also for creating and submitting equivocation report
 /// extrinsics (useful only in offchain context).
-pub trait HandleEquivocation<T: Trait> {
+pub trait HandleEquivocation<T: Config> {
 	/// Report an offence proved by the given reporters.
 	fn report_offence(
 		reporters: Vec<T::AccountId>,
@@ -75,7 +75,7 @@ pub trait HandleEquivocation<T: Trait> {
 	fn block_author() -> Option<T::AccountId>;
 }
 
-impl<T: Trait> HandleEquivocation<T> for () {
+impl<T: Config> HandleEquivocation<T> for () {
 	fn report_offence(
 		_reporters: Vec<T::AccountId>,
 		_offence: BabeEquivocationOffence<T::KeyOwnerIdentification>,
@@ -120,7 +120,7 @@ where
 	// We use the authorship pallet to fetch the current block author and use
 	// `offchain::SendTransactionTypes` for unsigned extrinsic creation and
 	// submission.
-	T: Trait + pallet_authorship::Trait + frame_system::offchain::SendTransactionTypes<Call<T>>,
+	T: Config + pallet_authorship::Config + frame_system::offchain::SendTransactionTypes<Call<T>>,
 	// A system for reporting offences after valid equivocation reports are
 	// processed.
 	R: ReportOffence<
@@ -164,7 +164,7 @@ where
 /// A `ValidateUnsigned` implementation that restricts calls to `report_equivocation_unsigned`
 /// to local calls (i.e. extrinsics generated on this node) or that already in a block. This
 /// guarantees that only block authors can include unsigned equivocation reports.
-impl<T: Trait> frame_support::unsigned::ValidateUnsigned for Module<T> {
+impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
 	type Call = Call<T>;
 	fn validate_unsigned(source: TransactionSource, call: &Self::Call) -> TransactionValidity {
 		if let Call::report_equivocation_unsigned(equivocation_proof, _) = call {
diff --git a/frame/babe/src/lib.rs b/frame/babe/src/lib.rs
index 8cab698fda09..a61f1244cbeb 100644
--- a/frame/babe/src/lib.rs
+++ b/frame/babe/src/lib.rs
@@ -62,7 +62,7 @@ mod tests;
 
 pub use equivocation::{BabeEquivocationOffence, EquivocationHandler, HandleEquivocation};
 
-pub trait Trait: pallet_timestamp::Trait {
+pub trait Config: pallet_timestamp::Config {
 	/// The amount of time, in slots, that each epoch should last.
 	type EpochDuration: Get<SlotNumber>;
 
@@ -115,7 +115,7 @@ pub trait WeightInfo {
 pub trait EpochChangeTrigger {
 	/// Trigger an epoch change, if any should take place. This should be called
 	/// during every block, after initialization is done.
-	fn trigger<T: Trait>(now: T::BlockNumber);
+	fn trigger<T: Config>(now: T::BlockNumber);
 }
 
 /// A type signifying to BABE that an external trigger
@@ -123,7 +123,7 @@ pub trait EpochChangeTrigger {
 pub struct ExternalTrigger;
 
 impl EpochChangeTrigger for ExternalTrigger {
-	fn trigger<T: Trait>(_: T::BlockNumber) { } // nothing - trigger is external.
+	fn trigger<T: Config>(_: T::BlockNumber) { } // nothing - trigger is external.
 }
 
 /// A type signifying to BABE that it should perform epoch changes
@@ -131,7 +131,7 @@ impl EpochChangeTrigger for ExternalTrigger {
 pub struct SameAuthoritiesForever;
 
 impl EpochChangeTrigger for SameAuthoritiesForever {
-	fn trigger<T: Trait>(now: T::BlockNumber) {
+	fn trigger<T: Config>(now: T::BlockNumber) {
 		if <Module<T>>::should_epoch_change(now) {
 			let authorities = <Module<T>>::authorities();
 			let next_authorities = authorities.clone();
@@ -146,7 +146,7 @@ const UNDER_CONSTRUCTION_SEGMENT_LENGTH: usize = 256;
 type MaybeRandomness = Option<schnorrkel::Randomness>;
 
 decl_error! {
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// An equivocation proof provided as part of an equivocation report is invalid.
 		InvalidEquivocationProof,
 		/// A key ownership proof provided as part of an equivocation report is invalid.
@@ -157,7 +157,7 @@ decl_error! {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Babe {
+	trait Store for Module<T: Config> as Babe {
 		/// Current epoch index.
 		pub EpochIndex get(fn epoch_index): u64;
 
@@ -230,7 +230,7 @@ decl_storage! {
 
 decl_module! {
 	/// The BABE Pallet
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		/// The number of **slots** that an epoch takes. We couple sessions to
 		/// epochs, i.e. we start a new session once the new epoch begins.
 		const EpochDuration: u64 = T::EpochDuration::get();
@@ -271,7 +271,7 @@ decl_module! {
 		/// the equivocation proof and validate the given key ownership proof
 		/// against the extracted offender. If both are valid, the offence will
 		/// be reported.
-		#[weight = <T as Trait>::WeightInfo::report_equivocation(key_owner_proof.validator_count())]
+		#[weight = <T as Config>::WeightInfo::report_equivocation(key_owner_proof.validator_count())]
 		fn report_equivocation(
 			origin,
 			equivocation_proof: EquivocationProof<T::Header>,
@@ -294,7 +294,7 @@ decl_module! {
 		/// block authors will call it (validated in `ValidateUnsigned`), as such
 		/// if the block author is defined it will be defined as the equivocation
 		/// reporter.
-		#[weight = <T as Trait>::WeightInfo::report_equivocation(key_owner_proof.validator_count())]
+		#[weight = <T as Config>::WeightInfo::report_equivocation(key_owner_proof.validator_count())]
 		fn report_equivocation_unsigned(
 			origin,
 			equivocation_proof: EquivocationProof<T::Header>,
@@ -311,7 +311,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> RandomnessT<<T as frame_system::Trait>::Hash> for Module<T> {
+impl<T: Config> RandomnessT<<T as frame_system::Config>::Hash> for Module<T> {
 	/// Some BABE blocks have VRF outputs where the block producer has exactly one bit of influence,
 	/// either they make the block or they do not make the block and thus someone else makes the
 	/// next block. Yet, this randomness is not fresh in all BABE blocks.
@@ -332,14 +332,14 @@ impl<T: Trait> RandomnessT<<T as frame_system::Trait>::Hash> for Module<T> {
 		subject.reserve(VRF_OUTPUT_LENGTH);
 		subject.extend_from_slice(&Self::randomness()[..]);
 
-		<T as frame_system::Trait>::Hashing::hash(&subject[..])
+		<T as frame_system::Config>::Hashing::hash(&subject[..])
 	}
 }
 
 /// A BABE public key
 pub type BabeKey = [u8; PUBLIC_KEY_LENGTH];
 
-impl<T: Trait> FindAuthor<u32> for Module<T> {
+impl<T: Config> FindAuthor<u32> for Module<T> {
 	fn find_author<'a, I>(digests: I) -> Option<u32> where
 		I: 'a + IntoIterator<Item=(ConsensusEngineId, &'a [u8])>
 	{
@@ -354,7 +354,7 @@ impl<T: Trait> FindAuthor<u32> for Module<T> {
 	}
 }
 
-impl<T: Trait> IsMember<AuthorityId> for Module<T> {
+impl<T: Config> IsMember<AuthorityId> for Module<T> {
 	fn is_member(authority_id: &AuthorityId) -> bool {
 		<Module<T>>::authorities()
 			.iter()
@@ -362,7 +362,7 @@ impl<T: Trait> IsMember<AuthorityId> for Module<T> {
 	}
 }
 
-impl<T: Trait> pallet_session::ShouldEndSession<T::BlockNumber> for Module<T> {
+impl<T: Config> pallet_session::ShouldEndSession<T::BlockNumber> for Module<T> {
 	fn should_end_session(now: T::BlockNumber) -> bool {
 		// it might be (and it is in current implementation) that session module is calling
 		// should_end_session() from it's own on_initialize() handler
@@ -374,12 +374,12 @@ impl<T: Trait> pallet_session::ShouldEndSession<T::BlockNumber> for Module<T> {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Determine the BABE slot duration based on the Timestamp module configuration.
 	pub fn slot_duration() -> T::Moment {
 		// we double the minimum block-period so each author can always propose within
 		// the majority of their slot.
-		<T as pallet_timestamp::Trait>::MinimumPeriod::get().saturating_mul(2u32.into())
+		<T as pallet_timestamp::Config>::MinimumPeriod::get().saturating_mul(2u32.into())
 	}
 
 	/// Determine whether an epoch change should take place at this block.
@@ -690,11 +690,11 @@ impl<T: Trait> Module<T> {
 	}
 }
 
-impl<T: Trait> OnTimestampSet<T::Moment> for Module<T> {
+impl<T: Config> OnTimestampSet<T::Moment> for Module<T> {
 	fn on_timestamp_set(_moment: T::Moment) { }
 }
 
-impl<T: Trait> frame_support::traits::EstimateNextSessionRotation<T::BlockNumber> for Module<T> {
+impl<T: Config> frame_support::traits::EstimateNextSessionRotation<T::BlockNumber> for Module<T> {
 	fn estimate_next_session_rotation(now: T::BlockNumber) -> Option<T::BlockNumber> {
 		Self::next_expected_epoch_change(now)
 	}
@@ -706,17 +706,17 @@ impl<T: Trait> frame_support::traits::EstimateNextSessionRotation<T::BlockNumber
 	}
 }
 
-impl<T: Trait> frame_support::traits::Lateness<T::BlockNumber> for Module<T> {
+impl<T: Config> frame_support::traits::Lateness<T::BlockNumber> for Module<T> {
 	fn lateness(&self) -> T::BlockNumber {
 		Self::lateness()
 	}
 }
 
-impl<T: Trait> sp_runtime::BoundToRuntimeAppPublic for Module<T> {
+impl<T: Config> sp_runtime::BoundToRuntimeAppPublic for Module<T> {
 	type Public = AuthorityId;
 }
 
-impl<T: Trait> pallet_session::OneSessionHandler<T::AccountId> for Module<T> {
+impl<T: Config> pallet_session::OneSessionHandler<T::AccountId> for Module<T> {
 	type Key = AuthorityId;
 
 	fn on_genesis_session<'a, I: 'a>(validators: I)
@@ -766,7 +766,7 @@ fn compute_randomness(
 	sp_io::hashing::blake2_256(&s)
 }
 
-impl<T: Trait> ProvideInherent for Module<T> {
+impl<T: Config> ProvideInherent for Module<T> {
 	type Call = pallet_timestamp::Call<T>;
 	type Error = MakeFatalError<sp_inherents::Error>;
 	const INHERENT_IDENTIFIER: InherentIdentifier = INHERENT_IDENTIFIER;
diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index 9f00a4ddfc3c..f3d5bc092bca 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -18,7 +18,7 @@
 //! Test utilities
 
 use codec::Encode;
-use super::{Trait, Module, CurrentSlot};
+use super::{Config, Module, CurrentSlot};
 use sp_runtime::{
 	Perbill, impl_opaque_keys,
 	curve::PiecewiseLinear,
@@ -65,7 +65,7 @@ parameter_types! {
 	pub const DisabledValidatorsThreshold: Perbill = Perbill::from_percent(16);
 }
 
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = u64;
@@ -107,9 +107,9 @@ impl_opaque_keys! {
 	}
 }
 
-impl pallet_session::Trait for Test {
+impl pallet_session::Config for Test {
 	type Event = ();
-	type ValidatorId = <Self as frame_system::Trait>::AccountId;
+	type ValidatorId = <Self as frame_system::Config>::AccountId;
 	type ValidatorIdOf = pallet_staking::StashOf<Self>;
 	type ShouldEndSession = Babe;
 	type NextSessionRotation = Babe;
@@ -120,7 +120,7 @@ impl pallet_session::Trait for Test {
 	type WeightInfo = ();
 }
 
-impl pallet_session::historical::Trait for Test {
+impl pallet_session::historical::Config for Test {
 	type FullIdentification = pallet_staking::Exposure<u64, u128>;
 	type FullIdentificationOf = pallet_staking::ExposureOf<Self>;
 }
@@ -129,7 +129,7 @@ parameter_types! {
 	pub const UncleGenerations: u64 = 0;
 }
 
-impl pallet_authorship::Trait for Test {
+impl pallet_authorship::Config for Test {
 	type FindAuthor = pallet_session::FindAccountFromAuthorIndex<Self, Babe>;
 	type UncleGenerations = UncleGenerations;
 	type FilterUncle = ();
@@ -140,7 +140,7 @@ parameter_types! {
 	pub const MinimumPeriod: u64 = 1;
 }
 
-impl pallet_timestamp::Trait for Test {
+impl pallet_timestamp::Config for Test {
 	type Moment = u64;
 	type OnTimestampSet = Babe;
 	type MinimumPeriod = MinimumPeriod;
@@ -151,7 +151,7 @@ parameter_types! {
 	pub const ExistentialDeposit: u128 = 1;
 }
 
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u128;
 	type DustRemoval = ();
@@ -183,7 +183,7 @@ parameter_types! {
 	pub const StakingUnsignedPriority: u64 = u64::max_value() / 2;
 }
 
-impl pallet_staking::Trait for Test {
+impl pallet_staking::Config for Test {
 	type RewardRemainder = ();
 	type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote;
 	type Event = ();
@@ -212,14 +212,14 @@ parameter_types! {
 	pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * MaximumBlockWeight::get();
 }
 
-impl pallet_offences::Trait for Test {
+impl pallet_offences::Config for Test {
 	type Event = ();
 	type IdentificationTuple = pallet_session::historical::IdentificationTuple<Self>;
 	type OnOffenceHandler = Staking;
 	type WeightSoftLimit = OffencesWeightSoftLimit;
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type EpochDuration = EpochDuration;
 	type ExpectedBlockTime = ExpectedBlockTime;
 	type EpochChangeTrigger = crate::ExternalTrigger;
diff --git a/frame/babe/src/tests.rs b/frame/babe/src/tests.rs
index 06bf84614ca6..29b080493f46 100644
--- a/frame/babe/src/tests.rs
+++ b/frame/babe/src/tests.rs
@@ -206,7 +206,7 @@ fn authority_index() {
 #[test]
 fn can_predict_next_epoch_change() {
 	new_test_ext(1).execute_with(|| {
-		assert_eq!(<Test as Trait>::EpochDuration::get(), 3);
+		assert_eq!(<Test as Config>::EpochDuration::get(), 3);
 		// this sets the genesis slot to 6;
 		go_to_block(1, 6);
 		assert_eq!(Babe::genesis_slot(), 6);
@@ -227,7 +227,7 @@ fn can_predict_next_epoch_change() {
 #[test]
 fn can_enact_next_config() {
 	new_test_ext(1).execute_with(|| {
-		assert_eq!(<Test as Trait>::EpochDuration::get(), 3);
+		assert_eq!(<Test as Config>::EpochDuration::get(), 3);
 		// this sets the genesis slot to 6;
 		go_to_block(1, 6);
 		assert_eq!(Babe::genesis_slot(), 6);
@@ -661,7 +661,7 @@ fn report_equivocation_has_valid_weight() {
 	// but there's a lower bound of 100 validators.
 	assert!(
 		(1..=100)
-			.map(<Test as Trait>::WeightInfo::report_equivocation)
+			.map(<Test as Config>::WeightInfo::report_equivocation)
 			.collect::<Vec<_>>()
 			.windows(2)
 			.all(|w| w[0] == w[1])
@@ -671,7 +671,7 @@ fn report_equivocation_has_valid_weight() {
 	// with every extra validator.
 	assert!(
 		(100..=1000)
-			.map(<Test as Trait>::WeightInfo::report_equivocation)
+			.map(<Test as Config>::WeightInfo::report_equivocation)
 			.collect::<Vec<_>>()
 			.windows(2)
 			.all(|w| w[0] < w[1])
diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index 141a360f7e18..1f119dad76f3 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -19,7 +19,7 @@
 //!
 //! The Balances module provides functionality for handling accounts and balances.
 //!
-//! - [`balances::Trait`](./trait.Trait.html)
+//! - [`balances::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //! - [`Module`](./struct.Module.html)
 //!
@@ -99,12 +99,12 @@
 //!
 //! ```
 //! use frame_support::traits::Currency;
-//! # pub trait Trait: frame_system::Trait {
+//! # pub trait Config: frame_system::Config {
 //! # 	type Currency: Currency<Self::AccountId>;
 //! # }
 //!
-//! pub type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
-//! pub type NegativeImbalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::NegativeImbalance;
+//! pub type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+//! pub type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
 //!
 //! # fn main() {}
 //! ```
@@ -114,17 +114,17 @@
 //! ```
 //! use frame_support::traits::{WithdrawReasons, LockableCurrency};
 //! use sp_runtime::traits::Bounded;
-//! pub trait Trait: frame_system::Trait {
+//! pub trait Config: frame_system::Config {
 //! 	type Currency: LockableCurrency<Self::AccountId, Moment=Self::BlockNumber>;
 //! }
-//! # struct StakingLedger<T: Trait> {
-//! # 	stash: <T as frame_system::Trait>::AccountId,
-//! # 	total: <<T as Trait>::Currency as frame_support::traits::Currency<<T as frame_system::Trait>::AccountId>>::Balance,
+//! # struct StakingLedger<T: Config> {
+//! # 	stash: <T as frame_system::Config>::AccountId,
+//! # 	total: <<T as Config>::Currency as frame_support::traits::Currency<<T as frame_system::Config>::AccountId>>::Balance,
 //! # 	phantom: std::marker::PhantomData<T>,
 //! # }
 //! # const STAKING_ID: [u8; 8] = *b"staking ";
 //!
-//! fn update_ledger<T: Trait>(
+//! fn update_ledger<T: Config>(
 //! 	controller: &T::AccountId,
 //! 	ledger: &StakingLedger<T>
 //! ) {
@@ -145,7 +145,7 @@
 //!
 //! ## Assumptions
 //!
-//! * Total issued balanced of all accounts should be less than `Trait::Balance::max_value()`.
+//! * Total issued balanced of all accounts should be less than `Config::Balance::max_value()`.
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
@@ -179,7 +179,7 @@ use frame_system::{self as system, ensure_signed, ensure_root};
 pub use self::imbalances::{PositiveImbalance, NegativeImbalance};
 pub use weights::WeightInfo;
 
-pub trait Subtrait<I: Instance = DefaultInstance>: frame_system::Trait {
+pub trait Subtrait<I: Instance = DefaultInstance>: frame_system::Config {
 	/// The balance of an account.
 	type Balance: Parameter + Member + AtLeast32BitUnsigned + Codec + Default + Copy +
 		MaybeSerializeDeserialize + Debug;
@@ -198,7 +198,7 @@ pub trait Subtrait<I: Instance = DefaultInstance>: frame_system::Trait {
 	type MaxLocks: Get<u32>;
 }
 
-pub trait Trait<I: Instance = DefaultInstance>: frame_system::Trait {
+pub trait Config<I: Instance = DefaultInstance>: frame_system::Config {
 	/// The balance of an account.
 	type Balance: Parameter + Member + AtLeast32BitUnsigned + Codec + Default + Copy +
 		MaybeSerializeDeserialize + Debug;
@@ -207,7 +207,7 @@ pub trait Trait<I: Instance = DefaultInstance>: frame_system::Trait {
 	type DustRemoval: OnUnbalanced<NegativeImbalance<Self, I>>;
 
 	/// The overarching event type.
-	type Event: From<Event<Self, I>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self, I>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// The minimum amount required to keep an account open.
 	type ExistentialDeposit: Get<Self::Balance>;
@@ -223,18 +223,18 @@ pub trait Trait<I: Instance = DefaultInstance>: frame_system::Trait {
 	type MaxLocks: Get<u32>;
 }
 
-impl<T: Trait<I>, I: Instance> Subtrait<I> for T {
+impl<T: Config<I>, I: Instance> Subtrait<I> for T {
 	type Balance = T::Balance;
 	type ExistentialDeposit = T::ExistentialDeposit;
 	type AccountStore = T::AccountStore;
-	type WeightInfo = <T as Trait<I>>::WeightInfo;
+	type WeightInfo = <T as Config<I>>::WeightInfo;
 	type MaxLocks = T::MaxLocks;
 }
 
 decl_event!(
 	pub enum Event<T, I: Instance = DefaultInstance> where
-		<T as frame_system::Trait>::AccountId,
-		<T as Trait<I>>::Balance
+		<T as frame_system::Config>::AccountId,
+		<T as Config<I>>::Balance
 	{
 		/// An account was created with some free balance. \[account, free_balance\]
 		Endowed(AccountId, Balance),
@@ -259,7 +259,7 @@ decl_event!(
 );
 
 decl_error! {
-	pub enum Error for Module<T: Trait<I>, I: Instance> {
+	pub enum Error for Module<T: Config<I>, I: Instance> {
 		/// Vesting balance too high to send value
 		VestingBalance,
 		/// Account liquidity restrictions prevent withdrawal
@@ -382,7 +382,7 @@ impl Default for Releases {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait<I>, I: Instance=DefaultInstance> as Balances {
+	trait Store for Module<T: Config<I>, I: Instance=DefaultInstance> as Balances {
 		/// The total units issued in the system.
 		pub TotalIssuance get(fn total_issuance) build(|config: &GenesisConfig<T, I>| {
 			config.balances.iter().fold(Zero::zero(), |acc: T::Balance, &(_, n)| acc + n)
@@ -408,7 +408,7 @@ decl_storage! {
 		build(|config: &GenesisConfig<T, I>| {
 			for (_, balance) in &config.balances {
 				assert!(
-					*balance >= <T as Trait<I>>::ExistentialDeposit::get(),
+					*balance >= <T as Config<I>>::ExistentialDeposit::get(),
 					"the balance of any account should always be more than existential deposit.",
 				)
 			}
@@ -420,7 +420,7 @@ decl_storage! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait<I>, I: Instance = DefaultInstance> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config<I>, I: Instance = DefaultInstance> for enum Call where origin: T::Origin {
 		type Error = Error<T, I>;
 
 		/// The minimum amount required to keep an account open.
@@ -565,7 +565,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait<I>, I: Instance> Module<T, I> {
+impl<T: Config<I>, I: Instance> Module<T, I> {
 	// PRIVATE MUTABLES
 
 	/// Get the free balance of an account.
@@ -704,7 +704,7 @@ impl<T: Trait<I>, I: Instance> Module<T, I> {
 // of the inner member.
 mod imbalances {
 	use super::{
-		result, DefaultInstance, Imbalance, Trait, Zero, Instance, Saturating,
+		result, DefaultInstance, Imbalance, Config, Zero, Instance, Saturating,
 		StorageValue, TryDrop,
 	};
 	use sp_std::mem;
@@ -712,9 +712,9 @@ mod imbalances {
 	/// Opaque, move-only struct with private fields that serves as a token denoting that
 	/// funds have been created without any equal and opposite accounting.
 	#[must_use]
-	pub struct PositiveImbalance<T: Trait<I>, I: Instance=DefaultInstance>(T::Balance);
+	pub struct PositiveImbalance<T: Config<I>, I: Instance=DefaultInstance>(T::Balance);
 
-	impl<T: Trait<I>, I: Instance> PositiveImbalance<T, I> {
+	impl<T: Config<I>, I: Instance> PositiveImbalance<T, I> {
 		/// Create a new positive imbalance from a balance.
 		pub fn new(amount: T::Balance) -> Self {
 			PositiveImbalance(amount)
@@ -724,22 +724,22 @@ mod imbalances {
 	/// Opaque, move-only struct with private fields that serves as a token denoting that
 	/// funds have been destroyed without any equal and opposite accounting.
 	#[must_use]
-	pub struct NegativeImbalance<T: Trait<I>, I: Instance=DefaultInstance>(T::Balance);
+	pub struct NegativeImbalance<T: Config<I>, I: Instance=DefaultInstance>(T::Balance);
 
-	impl<T: Trait<I>, I: Instance> NegativeImbalance<T, I> {
+	impl<T: Config<I>, I: Instance> NegativeImbalance<T, I> {
 		/// Create a new negative imbalance from a balance.
 		pub fn new(amount: T::Balance) -> Self {
 			NegativeImbalance(amount)
 		}
 	}
 
-	impl<T: Trait<I>, I: Instance> TryDrop for PositiveImbalance<T, I> {
+	impl<T: Config<I>, I: Instance> TryDrop for PositiveImbalance<T, I> {
 		fn try_drop(self) -> result::Result<(), Self> {
 			self.drop_zero()
 		}
 	}
 
-	impl<T: Trait<I>, I: Instance> Imbalance<T::Balance> for PositiveImbalance<T, I> {
+	impl<T: Config<I>, I: Instance> Imbalance<T::Balance> for PositiveImbalance<T, I> {
 		type Opposite = NegativeImbalance<T, I>;
 
 		fn zero() -> Self {
@@ -784,13 +784,13 @@ mod imbalances {
 		}
 	}
 
-	impl<T: Trait<I>, I: Instance> TryDrop for NegativeImbalance<T, I> {
+	impl<T: Config<I>, I: Instance> TryDrop for NegativeImbalance<T, I> {
 		fn try_drop(self) -> result::Result<(), Self> {
 			self.drop_zero()
 		}
 	}
 
-	impl<T: Trait<I>, I: Instance> Imbalance<T::Balance> for NegativeImbalance<T, I> {
+	impl<T: Config<I>, I: Instance> Imbalance<T::Balance> for NegativeImbalance<T, I> {
 		type Opposite = PositiveImbalance<T, I>;
 
 		fn zero() -> Self {
@@ -835,7 +835,7 @@ mod imbalances {
 		}
 	}
 
-	impl<T: Trait<I>, I: Instance> Drop for PositiveImbalance<T, I> {
+	impl<T: Config<I>, I: Instance> Drop for PositiveImbalance<T, I> {
 		/// Basic drop handler will just square up the total issuance.
 		fn drop(&mut self) {
 			<super::TotalIssuance<T, I>>::mutate(
@@ -844,7 +844,7 @@ mod imbalances {
 		}
 	}
 
-	impl<T: Trait<I>, I: Instance> Drop for NegativeImbalance<T, I> {
+	impl<T: Config<I>, I: Instance> Drop for NegativeImbalance<T, I> {
 		/// Basic drop handler will just square up the total issuance.
 		fn drop(&mut self) {
 			<super::TotalIssuance<T, I>>::mutate(
@@ -854,7 +854,7 @@ mod imbalances {
 	}
 }
 
-impl<T: Trait<I>, I: Instance> Currency<T::AccountId> for Module<T, I> where
+impl<T: Config<I>, I: Instance> Currency<T::AccountId> for Module<T, I> where
 	T::Balance: MaybeSerializeDeserialize + Debug
 {
 	type Balance = T::Balance;
@@ -1103,7 +1103,7 @@ impl<T: Trait<I>, I: Instance> Currency<T::AccountId> for Module<T, I> where
 	}
 }
 
-impl<T: Trait<I>, I: Instance> ReservableCurrency<T::AccountId> for Module<T, I>  where
+impl<T: Config<I>, I: Instance> ReservableCurrency<T::AccountId> for Module<T, I>  where
 	T::Balance: MaybeSerializeDeserialize + Debug
 {
 	/// Check if `who` can reserve `value` from their free balance.
@@ -1218,7 +1218,7 @@ impl<T: Trait<I>, I: Instance> ReservableCurrency<T::AccountId> for Module<T, I>
 /// NOTE: You probably won't need to use this! This only needs to be "wired in" to System module
 /// if you're using the local balance storage. **If you're using the composite system account
 /// storage (which is the default in most examples and tests) then there's no need.**
-impl<T: Trait<I>, I: Instance> OnKilledAccount<T::AccountId> for Module<T, I> {
+impl<T: Config<I>, I: Instance> OnKilledAccount<T::AccountId> for Module<T, I> {
 	fn on_killed_account(who: &T::AccountId) {
 		Account::<T, I>::mutate_exists(who, |account| {
 			let total = account.as_ref().map(|acc| acc.total()).unwrap_or_default();
@@ -1231,7 +1231,7 @@ impl<T: Trait<I>, I: Instance> OnKilledAccount<T::AccountId> for Module<T, I> {
 	}
 }
 
-impl<T: Trait<I>, I: Instance> LockableCurrency<T::AccountId> for Module<T, I>
+impl<T: Config<I>, I: Instance> LockableCurrency<T::AccountId> for Module<T, I>
 where
 	T::Balance: MaybeSerializeDeserialize + Debug
 {
@@ -1296,7 +1296,7 @@ where
 	}
 }
 
-impl<T: Trait<I>, I: Instance> IsDeadAccount<T::AccountId> for Module<T, I> where
+impl<T: Config<I>, I: Instance> IsDeadAccount<T::AccountId> for Module<T, I> where
 	T::Balance: MaybeSerializeDeserialize + Debug
 {
 	fn is_dead_account(who: &T::AccountId) -> bool {
diff --git a/frame/balances/src/tests.rs b/frame/balances/src/tests.rs
index b8cf90dad922..beaf2e2c223b 100644
--- a/frame/balances/src/tests.rs
+++ b/frame/balances/src/tests.rs
@@ -23,7 +23,7 @@
 pub struct CallWithDispatchInfo;
 impl sp_runtime::traits::Dispatchable for CallWithDispatchInfo {
 	type Origin = ();
-	type Trait = ();
+	type Config = ();
 	type Info = frame_support::weights::DispatchInfo;
 	type PostInfo = frame_support::weights::PostDispatchInfo;
 
@@ -55,7 +55,7 @@ macro_rules! decl_tests {
 		pub type System = frame_system::Module<$test>;
 		pub type Balances = Module<$test>;
 
-		pub const CALL: &<$test as frame_system::Trait>::Call = &$crate::tests::CallWithDispatchInfo;
+		pub const CALL: &<$test as frame_system::Config>::Call = &$crate::tests::CallWithDispatchInfo;
 
 		/// create a transaction info struct from weight. Handy to avoid building the whole struct.
 		pub fn info_from_weight(w: Weight) -> DispatchInfo {
@@ -91,7 +91,7 @@ macro_rules! decl_tests {
 			<$ext_builder>::default().existential_deposit(1).monied(true).build().execute_with(|| {
 				assert_eq!(Balances::free_balance(1), 10);
 				assert_ok!(<Balances as Currency<_>>::transfer(&1, &2, 10, AllowDeath));
-				assert!(!<<Test as Trait>::AccountStore as StoredMap<u64, AccountData<u64>>>::is_explicit(&1));
+				assert!(!<<Test as Config>::AccountStore as StoredMap<u64, AccountData<u64>>>::is_explicit(&1));
 			});
 		}
 
diff --git a/frame/balances/src/tests_composite.rs b/frame/balances/src/tests_composite.rs
index fd4ba1fd3c30..5f0cea7c9635 100644
--- a/frame/balances/src/tests_composite.rs
+++ b/frame/balances/src/tests_composite.rs
@@ -29,7 +29,7 @@ use sp_io;
 use frame_support::{impl_outer_origin, impl_outer_event, parameter_types};
 use frame_support::weights::{Weight, DispatchInfo, IdentityFee};
 use pallet_transaction_payment::CurrencyAdapter;
-use crate::{GenesisConfig, Module, Trait, decl_tests, tests::CallWithDispatchInfo};
+use crate::{GenesisConfig, Module, Config, decl_tests, tests::CallWithDispatchInfo};
 
 use frame_system as system;
 impl_outer_origin!{
@@ -57,7 +57,7 @@ parameter_types! {
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 	pub static ExistentialDeposit: u64 = 0;
 }
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = u64;
@@ -87,14 +87,14 @@ impl frame_system::Trait for Test {
 parameter_types! {
 	pub const TransactionByteFee: u64 = 1;
 }
-impl pallet_transaction_payment::Trait for Test {
+impl pallet_transaction_payment::Config for Test {
 	type OnChargeTransaction = CurrencyAdapter<Module<Test>, ()>;
 	type TransactionByteFee = TransactionByteFee;
 	type WeightToFee = IdentityFee<u64>;
 	type FeeMultiplierUpdate = ();
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type Balance = u64;
 	type DustRemoval = ();
 	type Event = Event;
diff --git a/frame/balances/src/tests_local.rs b/frame/balances/src/tests_local.rs
index c0a5d23ff1a4..888b8c7d62b8 100644
--- a/frame/balances/src/tests_local.rs
+++ b/frame/balances/src/tests_local.rs
@@ -29,7 +29,7 @@ use sp_io;
 use frame_support::{impl_outer_origin, impl_outer_event, parameter_types};
 use frame_support::traits::StorageMapShim;
 use frame_support::weights::{Weight, DispatchInfo, IdentityFee};
-use crate::{GenesisConfig, Module, Trait, decl_tests, tests::CallWithDispatchInfo};
+use crate::{GenesisConfig, Module, Config, decl_tests, tests::CallWithDispatchInfo};
 use pallet_transaction_payment::CurrencyAdapter;
 
 use frame_system as system;
@@ -58,7 +58,7 @@ parameter_types! {
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 	pub static ExistentialDeposit: u64 = 0;
 }
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = u64;
@@ -88,7 +88,7 @@ impl frame_system::Trait for Test {
 parameter_types! {
 	pub const TransactionByteFee: u64 = 1;
 }
-impl pallet_transaction_payment::Trait for Test {
+impl pallet_transaction_payment::Config for Test {
 	type OnChargeTransaction = CurrencyAdapter<Module<Test>, ()>;
 	type TransactionByteFee = TransactionByteFee;
 	type WeightToFee = IdentityFee<u64>;
@@ -97,7 +97,7 @@ impl pallet_transaction_payment::Trait for Test {
 parameter_types! {
 	pub const MaxLocks: u32 = 50;
 }
-impl Trait for Test {
+impl Config for Test {
 	type Balance = u64;
 	type DustRemoval = ();
 	type Event = Event;
diff --git a/frame/balances/src/weights.rs b/frame/balances/src/weights.rs
index 45e4195f962d..189947003b13 100644
--- a/frame/balances/src/weights.rs
+++ b/frame/balances/src/weights.rs
@@ -53,7 +53,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_balances using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn transfer() -> Weight {
 		(94_088_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
index 284b0545d03a..fdfe857e4be3 100644
--- a/frame/benchmarking/src/lib.rs
+++ b/frame/benchmarking/src/lib.rs
@@ -137,7 +137,7 @@ pub use sp_storage::TrackedStorageKey;
 ///
 /// Test functions are automatically generated for each benchmark and are accessible to you when you
 /// run `cargo test`. All tests are named `test_benchmark_<benchmark_name>`, expect you to pass them
-/// the Runtime Trait, and run them in a test externalities environment. The test function runs your
+/// the Runtime Config, and run them in a test externalities environment. The test function runs your
 /// benchmark just like a regular benchmark, but only testing at the lowest and highest values for
 /// each component. The function will return `Ok(())` if the benchmarks return no errors.
 ///
@@ -636,7 +636,7 @@ macro_rules! benchmark_backend {
 		#[allow(non_camel_case_types)]
 		struct $name;
 		#[allow(unused_variables)]
-		impl<T: Trait $( <$instance>, I: Instance)? >
+		impl<T: Config $( <$instance>, I: Instance)? >
 			$crate::BenchmarkingSetup<T $(, $instance)? > for $name
 			where $( $where_clause )*
 		{
@@ -710,7 +710,7 @@ macro_rules! selected_benchmark {
 		}
 
 		// Allow us to select a benchmark from the list of available benchmarks.
-		impl<T: Trait $( <$instance>, I: Instance )? >
+		impl<T: Config $( <$instance>, I: Instance )? >
 			$crate::BenchmarkingSetup<T $(, $instance )? > for SelectedBenchmark
 			where $( $where_clause )*
 		{
@@ -750,9 +750,9 @@ macro_rules! impl_benchmark {
 		( $( { $( $name_inst:ident )? } $name:ident )* )
 		( $( $name_extra:ident ),* )
 	) => {
-		impl<T: Trait $(<$instance>, I: Instance)? >
+		impl<T: Config $(<$instance>, I: Instance)? >
 			$crate::Benchmarking<$crate::BenchmarkResults> for Module<T $(, $instance)? >
-			where T: frame_system::Trait, $( $where_clause )*
+			where T: frame_system::Config, $( $where_clause )*
 		{
 			fn benchmarks(extra: bool) -> Vec<&'static [u8]> {
 				let mut all = vec![ $( stringify!($name).as_ref() ),* ];
@@ -948,8 +948,8 @@ macro_rules! impl_benchmark_test {
 		$name:ident
 	) => {
 		$crate::paste::item! {
-			fn [<test_benchmark_ $name>] <T: Trait > () -> Result<(), &'static str>
-				where T: frame_system::Trait, $( $where_clause )*
+			fn [<test_benchmark_ $name>] <T: Config > () -> Result<(), &'static str>
+				where T: frame_system::Config, $( $where_clause )*
 			{
 				let selected_benchmark = SelectedBenchmark::$name;
 				let components = <
diff --git a/frame/benchmarking/src/tests.rs b/frame/benchmarking/src/tests.rs
index 0429d98e1861..05a61ee83fbb 100644
--- a/frame/benchmarking/src/tests.rs
+++ b/frame/benchmarking/src/tests.rs
@@ -29,16 +29,16 @@ use frame_support::{
 use frame_system::{RawOrigin, ensure_signed, ensure_none};
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Test where
-		<T as OtherTrait>::OtherEvent: Into<<T as Trait>::Event>
+	trait Store for Module<T: Config> as Test where
+		<T as OtherTrait>::OtherEvent: Into<<T as Config>::Event>
 	{
 		Value get(fn value): Option<u32>;
 	}
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where
-		origin: T::Origin, <T as OtherTrait>::OtherEvent: Into<<T as Trait>::Event>
+	pub struct Module<T: Config> for enum Call where
+		origin: T::Origin, <T as OtherTrait>::OtherEvent: Into<<T as Config>::Event>
 	{
 		#[weight = 0]
 		fn set_value(origin, n: u32) -> DispatchResult {
@@ -63,8 +63,8 @@ pub trait OtherTrait {
 	type OtherEvent;
 }
 
-pub trait Trait: frame_system::Trait + OtherTrait
-	where Self::OtherEvent: Into<<Self as Trait>::Event>
+pub trait Config: frame_system::Config + OtherTrait
+	where Self::OtherEvent: Into<<Self as Config>::Event>
 {
 	type Event;
 }
@@ -72,7 +72,7 @@ pub trait Trait: frame_system::Trait + OtherTrait
 #[derive(Clone, Eq, PartialEq)]
 pub struct Test;
 
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = u64;
@@ -100,7 +100,7 @@ impl frame_system::Trait for Test {
 	type SystemWeightInfo = ();
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type Event = ();
 }
 
@@ -113,7 +113,7 @@ fn new_test_ext() -> sp_io::TestExternalities {
 }
 
 benchmarks!{
-	where_clause { where <T as OtherTrait>::OtherEvent: Into<<T as Trait>::Event> }
+	where_clause { where <T as OtherTrait>::OtherEvent: Into<<T as Config>::Event> }
 
 	_ {
 		// Define a common range for `b`.
diff --git a/frame/collective/src/benchmarking.rs b/frame/collective/src/benchmarking.rs
index d4e80d515941..551d6c7856cd 100644
--- a/frame/collective/src/benchmarking.rs
+++ b/frame/collective/src/benchmarking.rs
@@ -33,9 +33,9 @@ const SEED: u32 = 0;
 
 const MAX_BYTES: u32 = 1_024;
 
-fn assert_last_event<T: Trait<I>, I: Instance>(generic_event: <T as Trait<I>>::Event) {
+fn assert_last_event<T: Config<I>, I: Instance>(generic_event: <T as Config<I>>::Event) {
 	let events = System::<T>::events();
-	let system_event: <T as frame_system::Trait>::Event = generic_event.into();
+	let system_event: <T as frame_system::Config>::Event = generic_event.into();
 	// compare to the last event record
 	let EventRecord { event, .. } = &events[events.len() - 1];
 	assert_eq!(event, &system_event);
diff --git a/frame/collective/src/lib.rs b/frame/collective/src/lib.rs
index b7d561672b82..11ec42f25ae5 100644
--- a/frame/collective/src/lib.rs
+++ b/frame/collective/src/lib.rs
@@ -121,18 +121,18 @@ impl DefaultVote for MoreThanMajorityThenPrimeDefaultVote {
 	}
 }
 
-pub trait Trait<I: Instance=DefaultInstance>: frame_system::Trait {
+pub trait Config<I: Instance=DefaultInstance>: frame_system::Config {
 	/// The outer origin type.
 	type Origin: From<RawOrigin<Self::AccountId, I>>;
 
 	/// The outer call dispatch type.
 	type Proposal: Parameter
-		+ Dispatchable<Origin=<Self as Trait<I>>::Origin, PostInfo=PostDispatchInfo>
+		+ Dispatchable<Origin=<Self as Config<I>>::Origin, PostInfo=PostDispatchInfo>
 		+ From<frame_system::Call<Self>>
 		+ GetDispatchInfo;
 
 	/// The outer event type.
-	type Event: From<Event<Self, I>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self, I>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// The time-out for council motions.
 	type MotionDuration: Get<Self::BlockNumber>;
@@ -166,7 +166,7 @@ pub enum RawOrigin<AccountId, I> {
 }
 
 /// Origin for the collective module.
-pub type Origin<T, I=DefaultInstance> = RawOrigin<<T as frame_system::Trait>::AccountId, I>;
+pub type Origin<T, I=DefaultInstance> = RawOrigin<<T as frame_system::Config>::AccountId, I>;
 
 #[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug)]
 /// Info for keeping track of a motion being voted on.
@@ -184,12 +184,12 @@ pub struct Votes<AccountId, BlockNumber> {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait<I>, I: Instance=DefaultInstance> as Collective {
+	trait Store for Module<T: Config<I>, I: Instance=DefaultInstance> as Collective {
 		/// The hashes of the active proposals.
 		pub Proposals get(fn proposals): Vec<T::Hash>;
 		/// Actual proposal for a given hash, if it's current.
 		pub ProposalOf get(fn proposal_of):
-			map hasher(identity) T::Hash => Option<<T as Trait<I>>::Proposal>;
+			map hasher(identity) T::Hash => Option<<T as Config<I>>::Proposal>;
 		/// Votes on a given proposal, if it is ongoing.
 		pub Voting get(fn voting):
 			map hasher(identity) T::Hash => Option<Votes<T::AccountId, T::BlockNumber>>;
@@ -209,8 +209,8 @@ decl_storage! {
 
 decl_event! {
 	pub enum Event<T, I=DefaultInstance> where
-		<T as frame_system::Trait>::Hash,
-		<T as frame_system::Trait>::AccountId,
+		<T as frame_system::Config>::Hash,
+		<T as frame_system::Config>::AccountId,
 	{
 		/// A motion (given hash) has been proposed (by given account) with a threshold (given
 		/// `MemberCount`).
@@ -239,7 +239,7 @@ decl_event! {
 }
 
 decl_error! {
-	pub enum Error for Module<T: Trait<I>, I: Instance> {
+	pub enum Error for Module<T: Config<I>, I: Instance> {
 		/// Account is not a member
 		NotMember,
 		/// Duplicate proposals not allowed
@@ -276,7 +276,7 @@ fn get_result_weight(result: DispatchResultWithPostInfo) -> Option<Weight> {
 
 // Note that councillor operations are assigned to the operational class.
 decl_module! {
-	pub struct Module<T: Trait<I>, I: Instance=DefaultInstance> for enum Call where origin: <T as frame_system::Trait>::Origin {
+	pub struct Module<T: Config<I>, I: Instance=DefaultInstance> for enum Call where origin: <T as frame_system::Config>::Origin {
 		type Error = Error<T, I>;
 
 		fn deposit_event() = default;
@@ -365,7 +365,7 @@ decl_module! {
 			DispatchClass::Operational
 		)]
 		fn execute(origin,
-			proposal: Box<<T as Trait<I>>::Proposal>,
+			proposal: Box<<T as Config<I>>::Proposal>,
 			#[compact] length_bound: u32,
 		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
@@ -432,7 +432,7 @@ decl_module! {
 		)]
 		fn propose(origin,
 			#[compact] threshold: MemberCount,
-			proposal: Box<<T as Trait<I>>::Proposal>,
+			proposal: Box<<T as Config<I>>::Proposal>,
 			#[compact] length_bound: u32
 		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
@@ -682,7 +682,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait<I>, I: Instance> Module<T, I> {
+impl<T: Config<I>, I: Instance> Module<T, I> {
 	/// Check whether `who` is a member of the collective.
 	pub fn is_member(who: &T::AccountId) -> bool {
 		// Note: The dispatchables *do not* use this to check membership so make sure
@@ -698,7 +698,7 @@ impl<T: Trait<I>, I: Instance> Module<T, I> {
 		hash: &T::Hash,
 		length_bound: u32,
 		weight_bound: Weight
-	) -> Result<(<T as Trait<I>>::Proposal, usize), DispatchError> {
+	) -> Result<(<T as Config<I>>::Proposal, usize), DispatchError> {
 		let key = ProposalOf::<T, I>::hashed_key_for(hash);
 		// read the length of the proposal storage entry directly
 		let proposal_len = storage::read(&key, &mut [0; 0], 0)
@@ -728,7 +728,7 @@ impl<T: Trait<I>, I: Instance> Module<T, I> {
 		seats: MemberCount,
 		voting: Votes<T::AccountId, T::BlockNumber>,
 		proposal_hash: T::Hash,
-		proposal: <T as Trait<I>>::Proposal,
+		proposal: <T as Config<I>>::Proposal,
 	) -> (Weight, u32) {
 		Self::deposit_event(RawEvent::Approved(proposal_hash));
 
@@ -764,7 +764,7 @@ impl<T: Trait<I>, I: Instance> Module<T, I> {
 	}
 }
 
-impl<T: Trait<I>, I: Instance> ChangeMembers<T::AccountId> for Module<T, I> {
+impl<T: Config<I>, I: Instance> ChangeMembers<T::AccountId> for Module<T, I> {
 	/// Update the members of the collective. Votes are updated and the prime is reset.
 	///
 	/// NOTE: Does not enforce the expected `MaxMembers` limit on the amount of members, but
@@ -819,7 +819,7 @@ impl<T: Trait<I>, I: Instance> ChangeMembers<T::AccountId> for Module<T, I> {
 	}
 }
 
-impl<T: Trait<I>, I: Instance> InitializeMembers<T::AccountId> for Module<T, I> {
+impl<T: Config<I>, I: Instance> InitializeMembers<T::AccountId> for Module<T, I> {
 	fn initialize_members(members: &[T::AccountId]) {
 		if !members.is_empty() {
 			assert!(<Members<T, I>>::get().is_empty(), "Members are already initialized!");
@@ -952,7 +952,7 @@ mod tests {
 		pub const MaxProposals: u32 = 100;
 		pub const MaxMembers: u32 = 100;
 	}
-	impl frame_system::Trait for Test {
+	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
 		type Origin = Origin;
 		type Index = u64;
@@ -979,7 +979,7 @@ mod tests {
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
 	}
-	impl Trait<Instance1> for Test {
+	impl Config<Instance1> for Test {
 		type Origin = Origin;
 		type Proposal = Call;
 		type Event = Event;
@@ -989,7 +989,7 @@ mod tests {
 		type DefaultVote = PrimeDefaultVote;
 		type WeightInfo = ();
 	}
-	impl Trait<Instance2> for Test {
+	impl Config<Instance2> for Test {
 		type Origin = Origin;
 		type Proposal = Call;
 		type Event = Event;
@@ -999,7 +999,7 @@ mod tests {
 		type DefaultVote = MoreThanMajorityThenPrimeDefaultVote;
 		type WeightInfo = ();
 	}
-	impl Trait for Test {
+	impl Config for Test {
 		type Origin = Origin;
 		type Proposal = Call;
 		type Event = Event;
diff --git a/frame/collective/src/weights.rs b/frame/collective/src/weights.rs
index 4e4ec5196d0a..8a76ff516ca3 100644
--- a/frame/collective/src/weights.rs
+++ b/frame/collective/src/weights.rs
@@ -58,7 +58,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_collective using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn set_members(m: u32, n: u32, p: u32, ) -> Weight {
 		(0 as Weight)
 			.saturating_add((20_933_000 as Weight).saturating_mul(m as Weight))
diff --git a/frame/contracts/src/benchmarking/code.rs b/frame/contracts/src/benchmarking/code.rs
index f879d2eed554..847be9b434cb 100644
--- a/frame/contracts/src/benchmarking/code.rs
+++ b/frame/contracts/src/benchmarking/code.rs
@@ -24,7 +24,7 @@
 //! we define this simple definition of a contract that can be passed to `create_code` that
 //! compiles it down into a `WasmModule` that can be used as a contract's code.
 
-use crate::Trait;
+use crate::Config;
 use crate::Module as Contracts;
 
 use parity_wasm::elements::{Instruction, Instructions, FuncBody, ValueType, BlockType};
@@ -87,9 +87,9 @@ pub struct ImportedMemory {
 }
 
 impl ImportedMemory {
-	pub fn max<T: Trait>() -> Self
+	pub fn max<T: Config>() -> Self
 	where
-		T: Trait,
+		T: Config,
 		T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 	{
 		let pages = max_pages::<T>();
@@ -105,15 +105,15 @@ pub struct ImportedFunction {
 
 /// A wasm module ready to be put on chain with `put_code`.
 #[derive(Clone)]
-pub struct WasmModule<T:Trait> {
+pub struct WasmModule<T:Config> {
 	pub code: Vec<u8>,
 	pub hash: <T::Hashing as Hash>::Output,
 	memory: Option<ImportedMemory>,
 }
 
-impl<T: Trait> From<ModuleDefinition> for WasmModule<T>
+impl<T: Config> From<ModuleDefinition> for WasmModule<T>
 where
-	T: Trait,
+	T: Config,
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
 	fn from(def: ModuleDefinition) -> Self {
@@ -225,9 +225,9 @@ where
 	}
 }
 
-impl<T: Trait> WasmModule<T>
+impl<T: Config> WasmModule<T>
 where
-	T: Trait,
+	T: Config,
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
 	/// Creates a wasm module with an empty `call` and `deploy` function and nothing else.
@@ -483,9 +483,9 @@ pub mod body {
 }
 
 /// The maximum amount of pages any contract is allowed to have according to the current `Schedule`.
-pub fn max_pages<T: Trait>() -> u32
+pub fn max_pages<T: Config>() -> u32
 where
-	T: Trait,
+	T: Config,
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
 	Contracts::<T>::current_schedule().limits.memory_pages
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index 2e15542368a5..4bdd279eb8b2 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -50,7 +50,7 @@ const API_BENCHMARK_BATCHES: u32 = 20;
 const INSTR_BENCHMARK_BATCHES: u32 = 1;
 
 /// An instantiated and deployed contract.
-struct Contract<T: Trait> {
+struct Contract<T: Config> {
 	caller: T::AccountId,
 	account_id: T::AccountId,
 	addr: <T::Lookup as StaticLookup>::Source,
@@ -72,14 +72,14 @@ impl Endow {
 	/// The maximum amount of balance a caller can transfer without being brought below
 	/// the existential deposit. This assumes that every caller is funded with the amount
 	/// returned by `caller_funding`.
-	fn max<T:Trait>() -> BalanceOf<T> {
+	fn max<T:Config>() -> BalanceOf<T> {
 		caller_funding::<T>().saturating_sub(T::Currency::minimum_balance())
 	}
 }
 
-impl<T: Trait> Contract<T>
+impl<T: Config> Contract<T>
 where
-	T: Trait,
+	T: Config,
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
 	/// Create new contract and use a default account id as instantiator.
@@ -115,7 +115,7 @@ where
 				// storage_size cannot be zero because otherwise a contract that is just above
 				// the subsistence threshold does not pay rent given a large enough subsistence
 				// threshold. But we need rent payments to occur in order to benchmark for worst cases.
-				let storage_size = Config::<T>::subsistence_threshold_uncached()
+				let storage_size = ConfigCache::<T>::subsistence_threshold_uncached()
 					.checked_div(&T::RentDepositOffset::get())
 					.unwrap_or_else(Zero::zero);
 
@@ -212,16 +212,16 @@ where
 /// A `Contract` that was evicted after accumulating some storage.
 ///
 /// This is used to benchmark contract resurrection.
-struct Tombstone<T: Trait> {
+struct Tombstone<T: Config> {
 	/// The contract that was evicted.
 	contract: Contract<T>,
 	/// The storage the contract held when it was avicted.
 	storage: Vec<(StorageKey, Vec<u8>)>,
 }
 
-impl<T: Trait> Tombstone<T>
+impl<T: Config> Tombstone<T>
 where
-	T: Trait,
+	T: Config,
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
 	/// Create and evict a new contract with the supplied storage item count and size each.
@@ -243,7 +243,7 @@ where
 }
 
 /// Generate `stor_num` storage items. Each has the size `stor_size`.
-fn create_storage<T: Trait>(
+fn create_storage<T: Config>(
 	stor_num: u32,
 	stor_size: u32
 ) -> Result<Vec<(StorageKey, Vec<u8>)>, &'static str> {
@@ -257,7 +257,7 @@ fn create_storage<T: Trait>(
 }
 
 /// The funding that each account that either calls or instantiates contracts is funded with.
-fn caller_funding<T: Trait>() -> BalanceOf<T> {
+fn caller_funding<T: Config>() -> BalanceOf<T> {
 	BalanceOf::<T>::max_value() / 2u32.into()
 }
 
@@ -299,7 +299,7 @@ benchmarks! {
 		let s in 0 .. code::max_pages::<T>() * 64;
 		let data = vec![42u8; (n * 1024) as usize];
 		let salt = vec![42u8; (s * 1024) as usize];
-		let endowment = Config::<T>::subsistence_threshold_uncached();
+		let endowment = ConfigCache::<T>::subsistence_threshold_uncached();
 		let caller = whitelisted_caller();
 		T::Currency::make_free_balance_be(&caller, caller_funding::<T>());
 		let WasmModule { code, hash, .. } = WasmModule::<T>::dummy_with_mem();
@@ -374,7 +374,7 @@ benchmarks! {
 		// the caller should get the reward for being a good snitch
 		assert_eq!(
 			T::Currency::free_balance(&instance.caller),
-			caller_funding::<T>() - instance.endowment + <T as Trait>::SurchargeReward::get(),
+			caller_funding::<T>() - instance.endowment + <T as Config>::SurchargeReward::get(),
 		);
 	}
 
@@ -1127,7 +1127,7 @@ benchmarks! {
 			.collect::<Vec<_>>();
 		let account_len = accounts.get(0).map(|i| i.encode().len()).unwrap_or(0);
 		let account_bytes = accounts.iter().flat_map(|x| x.encode()).collect();
-		let value = Config::<T>::subsistence_threshold_uncached();
+		let value = ConfigCache::<T>::subsistence_threshold_uncached();
 		assert!(value > 0u32.into());
 		let value_bytes = value.encode();
 		let value_len = value_bytes.len();
@@ -1334,7 +1334,7 @@ benchmarks! {
 		let hash_len = hashes.get(0).map(|x| x.encode().len()).unwrap_or(0);
 		let hashes_bytes = hashes.iter().flat_map(|x| x.encode()).collect::<Vec<_>>();
 		let hashes_len = hashes_bytes.len();
-		let value = Config::<T>::subsistence_threshold_uncached();
+		let value = ConfigCache::<T>::subsistence_threshold_uncached();
 		assert!(value > 0u32.into());
 		let value_bytes = value.encode();
 		let value_len = value_bytes.len();
@@ -1454,7 +1454,7 @@ benchmarks! {
 		let input_len = inputs.get(0).map(|x| x.len()).unwrap_or(0);
 		let input_bytes = inputs.iter().cloned().flatten().collect::<Vec<_>>();
 		let inputs_len = input_bytes.len();
-		let value = Config::<T>::subsistence_threshold_uncached();
+		let value = ConfigCache::<T>::subsistence_threshold_uncached();
 		assert!(value > 0u32.into());
 		let value_bytes = value.encode();
 		let value_len = value_bytes.len();
diff --git a/frame/contracts/src/benchmarking/sandbox.rs b/frame/contracts/src/benchmarking/sandbox.rs
index 76cebfaf1ed6..61277ebce678 100644
--- a/frame/contracts/src/benchmarking/sandbox.rs
+++ b/frame/contracts/src/benchmarking/sandbox.rs
@@ -20,7 +20,7 @@
 ///! environment that provides the seal interface as imported functions.
 
 use super::{
-	Trait,
+	Config,
 	code::WasmModule,
 };
 use sp_core::crypto::UncheckedFrom;
@@ -39,9 +39,9 @@ impl Sandbox {
 	}
 }
 
-impl<T: Trait> From<&WasmModule<T>> for Sandbox
+impl<T: Config> From<&WasmModule<T>> for Sandbox
 where
-	T: Trait,
+	T: Config,
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
 	/// Creates an instance from the supplied module and supplies as much memory
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index 73e1f564498d..8577d04452fa 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -15,7 +15,7 @@
 // along with Substrate. If not, see <http://www.gnu.org/licenses/>.
 
 use crate::{
-	CodeHash, Config, Event, RawEvent, Trait, Module as Contracts,
+	CodeHash, ConfigCache, Event, RawEvent, Config, Module as Contracts,
 	TrieId, BalanceOf, ContractInfo, gas::GasMeter, rent::Rent, storage::{self, Storage},
 	Error, ContractInfoOf
 };
@@ -30,14 +30,14 @@ use frame_support::{
 };
 use pallet_contracts_primitives::{ErrorOrigin, ExecError, ExecReturnValue, ExecResult, ReturnFlags};
 
-pub type AccountIdOf<T> = <T as frame_system::Trait>::AccountId;
-pub type MomentOf<T> = <<T as Trait>::Time as Time>::Moment;
-pub type SeedOf<T> = <T as frame_system::Trait>::Hash;
-pub type BlockNumberOf<T> = <T as frame_system::Trait>::BlockNumber;
+pub type AccountIdOf<T> = <T as frame_system::Config>::AccountId;
+pub type MomentOf<T> = <<T as Config>::Time as Time>::Moment;
+pub type SeedOf<T> = <T as frame_system::Config>::Hash;
+pub type BlockNumberOf<T> = <T as frame_system::Config>::BlockNumber;
 pub type StorageKey = [u8; 32];
 
 /// A type that represents a topic of an event. At the moment a hash is used.
-pub type TopicOf<T> = <T as frame_system::Trait>::Hash;
+pub type TopicOf<T> = <T as frame_system::Config>::Hash;
 
 /// Describes whether we deal with a contract or a plain account.
 pub enum TransactorKind {
@@ -54,7 +54,7 @@ pub enum TransactorKind {
 /// This interface is specialized to an account of the executing code, so all
 /// operations are implicitly performed on that account.
 pub trait Ext {
-	type T: Trait;
+	type T: Config;
 
 	/// Returns the storage entry of the executing account by the given `key`.
 	///
@@ -171,7 +171,7 @@ pub trait Ext {
 
 /// Loader is a companion of the `Vm` trait. It loads an appropriate abstract
 /// executable to be executed by an accompanying `Vm` implementation.
-pub trait Loader<T: Trait> {
+pub trait Loader<T: Config> {
 	type Executable;
 
 	/// Load the initializer portion of the code specified by the `code_hash`. This
@@ -190,7 +190,7 @@ pub trait Loader<T: Trait> {
 ///
 /// Execution of code can end by either implicit termination (that is, reached the end of
 /// executable), explicit termination via returning a buffer or termination due to a trap.
-pub trait Vm<T: Trait> {
+pub trait Vm<T: Config> {
 	type Executable;
 
 	fn execute<E: Ext<T = T>>(
@@ -202,12 +202,12 @@ pub trait Vm<T: Trait> {
 	) -> ExecResult;
 }
 
-pub struct ExecutionContext<'a, T: Trait + 'a, V, L> {
+pub struct ExecutionContext<'a, T: Config + 'a, V, L> {
 	pub caller: Option<&'a ExecutionContext<'a, T, V, L>>,
 	pub self_account: T::AccountId,
 	pub self_trie_id: Option<TrieId>,
 	pub depth: usize,
-	pub config: &'a Config<T>,
+	pub config: &'a ConfigCache<T>,
 	pub vm: &'a V,
 	pub loader: &'a L,
 	pub timestamp: MomentOf<T>,
@@ -216,7 +216,7 @@ pub struct ExecutionContext<'a, T: Trait + 'a, V, L> {
 
 impl<'a, T, E, V, L> ExecutionContext<'a, T, V, L>
 where
-	T: Trait,
+	T: Config,
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 	L: Loader<T, Executable = E>,
 	V: Vm<T, Executable = E>,
@@ -225,7 +225,7 @@ where
 	///
 	/// The specified `origin` address will be used as `sender` for. The `origin` must be a regular
 	/// account (not a contract).
-	pub fn top_level(origin: T::AccountId, cfg: &'a Config<T>, vm: &'a V, loader: &'a L) -> Self {
+	pub fn top_level(origin: T::AccountId, cfg: &'a ConfigCache<T>, vm: &'a V, loader: &'a L) -> Self {
 		ExecutionContext {
 			caller: None,
 			self_trie_id: None,
@@ -437,7 +437,7 @@ enum TransferCause {
 /// is specified as `Terminate`. Otherwise, any transfer that would bring the sender below the
 /// subsistence threshold (for contracts) or the existential deposit (for plain accounts)
 /// results in an error.
-fn transfer<'a, T: Trait, V: Vm<T>, L: Loader<T>>(
+fn transfer<'a, T: Config, V: Vm<T>, L: Loader<T>>(
 	cause: TransferCause,
 	origin: TransactorKind,
 	transactor: &T::AccountId,
@@ -483,7 +483,7 @@ where
 /// implies that the control won't be returned to the contract anymore, but there is still some code
 /// on the path of the return from that call context. Therefore, care must be taken in these
 /// situations.
-struct CallContext<'a, 'b: 'a, T: Trait + 'b, V: Vm<T> + 'b, L: Loader<T>> {
+struct CallContext<'a, 'b: 'a, T: Config + 'b, V: Vm<T> + 'b, L: Loader<T>> {
 	ctx: &'a mut ExecutionContext<'b, T, V, L>,
 	caller: T::AccountId,
 	value_transferred: BalanceOf<T>,
@@ -493,7 +493,7 @@ struct CallContext<'a, 'b: 'a, T: Trait + 'b, V: Vm<T> + 'b, L: Loader<T>> {
 
 impl<'a, 'b: 'a, T, E, V, L> Ext for CallContext<'a, 'b, T, V, L>
 where
-	T: Trait + 'b,
+	T: Config + 'b,
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 	V: Vm<T, Executable = E>,
 	L: Loader<T, Executable = E>,
@@ -693,13 +693,13 @@ where
 	}
 }
 
-fn deposit_event<T: Trait>(
+fn deposit_event<T: Config>(
 	topics: Vec<T::Hash>,
 	event: Event<T>,
 ) {
 	<frame_system::Module<T>>::deposit_event_indexed(
 		&*topics,
-		<T as Trait>::Event::from(event).into(),
+		<T as Config>::Event::from(event).into(),
 	)
 }
 
@@ -716,7 +716,7 @@ mod tests {
 	};
 	use crate::{
 		gas::GasMeter, tests::{ExtBuilder, Test, MetaEvent},
-		exec::ExecReturnValue, CodeHash, Config,
+		exec::ExecReturnValue, CodeHash, ConfigCache,
 		gas::Gas,
 		storage::Storage,
 		tests::{ALICE, BOB, CHARLIE},
@@ -769,7 +769,7 @@ mod tests {
 
 		fn insert(&mut self, f: impl Fn(MockCtx) -> ExecResult + 'a) -> CodeHash<Test> {
 			// Generate code hashes as monotonically increasing values.
-			let code_hash = <Test as frame_system::Trait>::Hash::from_low_u64_be(self.counter);
+			let code_hash = <Test as frame_system::Config>::Hash::from_low_u64_be(self.counter);
 
 			self.counter += 1;
 			self.map.insert(code_hash, MockExecutable::new(f));
@@ -843,7 +843,7 @@ mod tests {
 		});
 
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
 			place_contract(&BOB, exec_ch);
 
@@ -867,7 +867,7 @@ mod tests {
 		let loader = MockLoader::empty();
 
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(origin.clone(), &cfg, &vm, &loader);
 			set_balance(&origin, 100);
 			set_balance(&dest, 0);
@@ -900,7 +900,7 @@ mod tests {
 		);
 
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(origin.clone(), &cfg, &vm, &loader);
 			place_contract(&BOB, return_ch);
 			set_balance(&origin, 100);
@@ -930,7 +930,7 @@ mod tests {
 		let loader = MockLoader::empty();
 
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(origin.clone(), &cfg, &vm, &loader);
 			set_balance(&origin, 0);
 
@@ -966,7 +966,7 @@ mod tests {
 		);
 
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(origin, &cfg, &vm, &loader);
 			place_contract(&BOB, return_ch);
 
@@ -997,7 +997,7 @@ mod tests {
 		);
 
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(origin, &cfg, &vm, &loader);
 			place_contract(&BOB, return_ch);
 
@@ -1025,7 +1025,7 @@ mod tests {
 
 		// This one tests passing the input data into a contract via call.
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
 			place_contract(&BOB, input_data_ch);
 
@@ -1050,7 +1050,7 @@ mod tests {
 
 		// This one tests passing the input data into a contract via instantiate.
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
 
 			set_balance(&ALICE, 100);
@@ -1097,7 +1097,7 @@ mod tests {
 		});
 
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
 			set_balance(&BOB, 1);
 			place_contract(&BOB, recurse_ch);
@@ -1142,7 +1142,7 @@ mod tests {
 		});
 
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 
 			let mut ctx = ExecutionContext::top_level(origin.clone(), &cfg, &vm, &loader);
 			place_contract(&dest, bob_ch);
@@ -1184,7 +1184,7 @@ mod tests {
 		});
 
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
 			place_contract(&BOB, bob_ch);
 			place_contract(&CHARLIE, charlie_ch);
@@ -1208,7 +1208,7 @@ mod tests {
 		let dummy_ch = loader.insert(|_| exec_success());
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
 
 			assert_matches!(
@@ -1234,7 +1234,7 @@ mod tests {
 		);
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
 			set_balance(&ALICE, 1000);
 
@@ -1268,7 +1268,7 @@ mod tests {
 		);
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
 			set_balance(&ALICE, 1000);
 
@@ -1303,7 +1303,7 @@ mod tests {
 				// Instantiate a contract and save it's address in `instantiated_contract_address`.
 				let (address, output) = ctx.ext.instantiate(
 					&dummy_ch,
-					Config::<Test>::subsistence_threshold_uncached(),
+					ConfigCache::<Test>::subsistence_threshold_uncached(),
 					ctx.gas_meter,
 					vec![],
 					&[48, 49, 50],
@@ -1315,7 +1315,7 @@ mod tests {
 		});
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
 			set_balance(&ALICE, 1000);
 			set_balance(&BOB, 100);
@@ -1368,7 +1368,7 @@ mod tests {
 		});
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
 			set_balance(&ALICE, 1000);
 			set_balance(&BOB, 100);
@@ -1400,7 +1400,7 @@ mod tests {
 			.existential_deposit(15)
 			.build()
 			.execute_with(|| {
-				let cfg = Config::preload();
+				let cfg = ConfigCache::preload();
 				let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
 				set_balance(&ALICE, 1000);
 
@@ -1434,7 +1434,7 @@ mod tests {
 		});
 
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
 			set_balance(&ALICE, 100);
 
diff --git a/frame/contracts/src/gas.rs b/frame/contracts/src/gas.rs
index 0828a220c040..18a200fd312c 100644
--- a/frame/contracts/src/gas.rs
+++ b/frame/contracts/src/gas.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate. If not, see <http://www.gnu.org/licenses/>.
 
-use crate::Trait;
+use crate::Config;
 use sp_std::marker::PhantomData;
 use sp_runtime::traits::Zero;
 use frame_support::dispatch::{
@@ -60,7 +60,7 @@ impl<T: Any + Debug + PartialEq + Eq> TestAuxiliaries for T {}
 /// Implementing type is expected to be super lightweight hence `Copy` (`Clone` is added
 /// for consistency). If inlined there should be no observable difference compared
 /// to a hand-written code.
-pub trait Token<T: Trait>: Copy + Clone + TestAuxiliaries {
+pub trait Token<T: Config>: Copy + Clone + TestAuxiliaries {
 	/// Metadata type, which the token can require for calculating the amount
 	/// of gas to charge. Can be a some configuration type or
 	/// just the `()`.
@@ -84,7 +84,7 @@ pub struct ErasedToken {
 	pub token: Box<dyn Any>,
 }
 
-pub struct GasMeter<T: Trait> {
+pub struct GasMeter<T: Config> {
 	gas_limit: Gas,
 	/// Amount of gas left from initial gas limit. Can reach zero.
 	gas_left: Gas,
@@ -92,7 +92,7 @@ pub struct GasMeter<T: Trait> {
 	#[cfg(test)]
 	tokens: Vec<ErasedToken>,
 }
-impl<T: Trait> GasMeter<T> {
+impl<T: Config> GasMeter<T> {
 	pub fn new(gas_limit: Gas) -> Self {
 		GasMeter {
 			gas_limit,
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index 65995afb73d6..f0200fbd15fd 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -18,7 +18,7 @@
 //!
 //! The Contract module provides functionality for the runtime to deploy and execute WebAssembly smart-contracts.
 //!
-//! - [`contract::Trait`](./trait.Trait.html)
+//! - [`contract::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //!
 //! ## Overview
@@ -126,18 +126,18 @@ use pallet_contracts_primitives::{
 };
 use frame_support::weights::Weight;
 
-pub type CodeHash<T> = <T as frame_system::Trait>::Hash;
+pub type CodeHash<T> = <T as frame_system::Config>::Hash;
 pub type TrieId = Vec<u8>;
 
 /// Information for managing an account and its sub trie abstraction.
 /// This is the required info to cache for an account
 #[derive(Encode, Decode, RuntimeDebug)]
-pub enum ContractInfo<T: Trait> {
+pub enum ContractInfo<T: Config> {
 	Alive(AliveContractInfo<T>),
 	Tombstone(TombstoneContractInfo<T>),
 }
 
-impl<T: Trait> ContractInfo<T> {
+impl<T: Config> ContractInfo<T> {
 	/// If contract is alive then return some alive info
 	pub fn get_alive(self) -> Option<AliveContractInfo<T>> {
 		if let ContractInfo::Alive(alive) = self {
@@ -190,7 +190,7 @@ impl<T: Trait> ContractInfo<T> {
 }
 
 pub type AliveContractInfo<T> =
-	RawAliveContractInfo<CodeHash<T>, BalanceOf<T>, <T as frame_system::Trait>::BlockNumber>;
+	RawAliveContractInfo<CodeHash<T>, BalanceOf<T>, <T as frame_system::Config>::BlockNumber>;
 
 /// Information for managing an account and its sub trie abstraction.
 /// This is the required info to cache for an account.
@@ -230,7 +230,7 @@ pub(crate) fn child_trie_info(trie_id: &[u8]) -> ChildInfo {
 }
 
 pub type TombstoneContractInfo<T> =
-	RawTombstoneContractInfo<<T as frame_system::Trait>::Hash, <T as frame_system::Trait>::Hashing>;
+	RawTombstoneContractInfo<<T as frame_system::Config>::Hash, <T as frame_system::Config>::Hashing>;
 
 #[derive(Encode, Decode, PartialEq, Eq, RuntimeDebug)]
 pub struct RawTombstoneContractInfo<H, Hasher>(H, PhantomData<Hasher>);
@@ -250,18 +250,18 @@ where
 	}
 }
 
-impl<T: Trait> From<AliveContractInfo<T>> for ContractInfo<T> {
+impl<T: Config> From<AliveContractInfo<T>> for ContractInfo<T> {
 	fn from(alive_info: AliveContractInfo<T>) -> Self {
 		Self::Alive(alive_info)
 	}
 }
 
 pub type BalanceOf<T> =
-	<<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 pub type NegativeImbalanceOf<T> =
-	<<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::NegativeImbalance;
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
 
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	type Time: Time;
 	type Randomness: Randomness<Self::Hash>;
 
@@ -269,7 +269,7 @@ pub trait Trait: frame_system::Trait {
 	type Currency: Currency<Self::AccountId>;
 
 	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// Handler for rent payments.
 	type RentPayment: OnUnbalanced<NegativeImbalanceOf<Self>>;
@@ -323,7 +323,7 @@ pub trait Trait: frame_system::Trait {
 
 decl_error! {
 	/// Error for the contracts module.
-	pub enum Error for Module<T: Trait>
+	pub enum Error for Module<T: Config>
 	where
 		T::AccountId: UncheckedFrom<T::Hash>,
 		T::AccountId: AsRef<[u8]>,
@@ -383,7 +383,7 @@ decl_error! {
 
 decl_module! {
 	/// Contracts module.
-	pub struct Module<T: Trait> for enum Call
+	pub struct Module<T: Config> for enum Call
 	where
 		origin: T::Origin,
 		T::AccountId: UncheckedFrom<T::Hash>,
@@ -564,7 +564,7 @@ decl_module! {
 }
 
 /// Public APIs provided by the contracts module.
-impl<T: Trait> Module<T>
+impl<T: Config> Module<T>
 where
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
@@ -638,7 +638,7 @@ where
 	}
 }
 
-impl<T: Trait> Module<T>
+impl<T: Config> Module<T>
 where
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
@@ -647,7 +647,7 @@ where
 		gas_meter: &mut GasMeter<T>,
 		func: impl FnOnce(&mut ExecutionContext<T, WasmVm<T>, WasmLoader<T>>, &mut GasMeter<T>) -> ExecResult,
 	) -> ExecResult {
-		let cfg = Config::preload();
+		let cfg = ConfigCache::preload();
 		let vm = WasmVm::new(&cfg.schedule);
 		let loader = WasmLoader::new(&cfg.schedule);
 		let mut ctx = ExecutionContext::top_level(origin, &cfg, &vm, &loader);
@@ -659,8 +659,8 @@ decl_event! {
 	pub enum Event<T>
 	where
 		Balance = BalanceOf<T>,
-		<T as frame_system::Trait>::AccountId,
-		<T as frame_system::Trait>::Hash
+		<T as frame_system::Config>::AccountId,
+		<T as frame_system::Config>::Hash
 	{
 		/// Contract deployed by address at the specified address. \[owner, contract\]
 		Instantiated(AccountId, AccountId),
@@ -699,7 +699,7 @@ decl_event! {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Contracts
+	trait Store for Module<T: Config> as Contracts
 	where
 		T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
 	{
@@ -722,7 +722,7 @@ decl_storage! {
 ///
 /// We assume that these values can't be changed in the
 /// course of transaction execution.
-pub struct Config<T: Trait> {
+pub struct ConfigCache<T: Config> {
 	pub schedule: Schedule<T>,
 	pub existential_deposit: BalanceOf<T>,
 	pub tombstone_deposit: BalanceOf<T>,
@@ -730,12 +730,12 @@ pub struct Config<T: Trait> {
 	pub max_value_size: u32,
 }
 
-impl<T: Trait> Config<T>
+impl<T: Config> ConfigCache<T>
 where
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
 {
-	fn preload() -> Config<T> {
-		Config {
+	fn preload() -> ConfigCache<T> {
+		ConfigCache {
 			schedule: <Module<T>>::current_schedule(),
 			existential_deposit: T::Currency::minimum_balance(),
 			tombstone_deposit: T::TombstoneDeposit::get(),
diff --git a/frame/contracts/src/rent.rs b/frame/contracts/src/rent.rs
index a8886b990a95..6ee65a54bb58 100644
--- a/frame/contracts/src/rent.rs
+++ b/frame/contracts/src/rent.rs
@@ -18,7 +18,7 @@
 
 use crate::{
 	AliveContractInfo, BalanceOf, ContractInfo, ContractInfoOf, Module, RawEvent,
-	TombstoneContractInfo, Trait, CodeHash, Config, Error,
+	TombstoneContractInfo, Config, CodeHash, ConfigCache, Error,
 };
 use sp_std::prelude::*;
 use sp_io::hashing::blake2_256;
@@ -36,11 +36,11 @@ use sp_runtime::{
 ///
 /// This amount respects the contract's rent allowance and the subsistence deposit.
 /// Because of that, charging the amount cannot remove the contract.
-struct OutstandingAmount<T: Trait> {
+struct OutstandingAmount<T: Config> {
 	amount: BalanceOf<T>,
 }
 
-impl<T: Trait> OutstandingAmount<T> {
+impl<T: Config> OutstandingAmount<T> {
 	/// Create the new outstanding amount.
 	///
 	/// The amount should be always withdrawable and it should not kill the account.
@@ -67,7 +67,7 @@ impl<T: Trait> OutstandingAmount<T> {
 	}
 }
 
-enum Verdict<T: Trait> {
+enum Verdict<T: Config> {
 	/// The contract is exempted from paying rent.
 	///
 	/// For example, it already paid its rent in the current block, or it has enough deposit for not
@@ -90,7 +90,7 @@ pub struct Rent<T>(sp_std::marker::PhantomData<T>);
 
 impl<T> Rent<T>
 where
-	T: Trait,
+	T: Config,
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
 {
 	/// Returns a fee charged per block from the contract.
@@ -129,7 +129,7 @@ where
 		free_balance: &BalanceOf<T>,
 		contract: &AliveContractInfo<T>,
 	) -> Option<BalanceOf<T>> {
-		let subsistence_threshold = Config::<T>::subsistence_threshold_uncached();
+		let subsistence_threshold = ConfigCache::<T>::subsistence_threshold_uncached();
 		// Reserved balance contributes towards the subsistence threshold to stay consistent
 		// with the existential deposit where the reserved balance is also counted.
 		if *total_balance < subsistence_threshold {
diff --git a/frame/contracts/src/schedule.rs b/frame/contracts/src/schedule.rs
index 197cc654c59b..b80aceb361fe 100644
--- a/frame/contracts/src/schedule.rs
+++ b/frame/contracts/src/schedule.rs
@@ -17,7 +17,7 @@
 //! This module contains the cost schedule and supporting code that constructs a
 //! sane default schedule from a `WeightInfo` implementation.
 
-use crate::{Trait, weights::WeightInfo};
+use crate::{Config, weights::WeightInfo};
 
 #[cfg(feature = "std")]
 use serde::{Serialize, Deserialize};
@@ -42,7 +42,7 @@ pub const INSTR_BENCHMARK_BATCH_SIZE: u32 = 1_000;
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "std", serde(bound(serialize = "", deserialize = "")))]
 #[derive(Clone, Encode, Decode, PartialEq, Eq, ScheduleDebug)]
-pub struct Schedule<T: Trait> {
+pub struct Schedule<T: Config> {
 	/// Version of the schedule.
 	pub version: u32,
 
@@ -131,7 +131,7 @@ pub struct Limits {
 ///    and dropping return values in order to maintain a valid module.
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 #[derive(Clone, Encode, Decode, PartialEq, Eq, WeightDebug)]
-pub struct InstructionWeights<T: Trait> {
+pub struct InstructionWeights<T: Config> {
 	pub i64const: u32,
 	pub i64load: u32,
 	pub i64store: u32,
@@ -190,7 +190,7 @@ pub struct InstructionWeights<T: Trait> {
 /// Describes the weight for each imported function that a contract is allowed to call.
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 #[derive(Clone, Encode, Decode, PartialEq, Eq, WeightDebug)]
-pub struct HostFnWeights<T: Trait> {
+pub struct HostFnWeights<T: Config> {
 	/// Weight of calling `seal_caller`.
 	pub caller: Weight,
 
@@ -410,7 +410,7 @@ macro_rules! cost_byte_batched {
 	}
 }
 
-impl<T: Trait> Default for Schedule<T> {
+impl<T: Config> Default for Schedule<T> {
 	fn default() -> Self {
 		Self {
 			version: 0,
@@ -440,7 +440,7 @@ impl Default for Limits {
 	}
 }
 
-impl<T: Trait> Default for InstructionWeights<T> {
+impl<T: Config> Default for InstructionWeights<T> {
 	fn default() -> Self {
 		let max_pages = Limits::default().memory_pages;
 		Self {
@@ -500,7 +500,7 @@ impl<T: Trait> Default for InstructionWeights<T> {
 	}
 }
 
-impl<T: Trait> Default for HostFnWeights<T> {
+impl<T: Config> Default for HostFnWeights<T> {
 	fn default() -> Self {
 		Self {
 			caller: cost_batched!(seal_caller),
@@ -554,12 +554,12 @@ impl<T: Trait> Default for HostFnWeights<T> {
 	}
 }
 
-struct ScheduleRules<'a, T: Trait> {
+struct ScheduleRules<'a, T: Config> {
 	schedule: &'a Schedule<T>,
 	params: Vec<u32>,
 }
 
-impl<T: Trait> Schedule<T> {
+impl<T: Config> Schedule<T> {
 	pub fn rules(&self, module: &elements::Module) -> impl rules::Rules + '_ {
 		ScheduleRules {
 			schedule: &self,
@@ -576,7 +576,7 @@ impl<T: Trait> Schedule<T> {
 	}
 }
 
-impl<'a, T: Trait> rules::Rules for ScheduleRules<'a, T> {
+impl<'a, T: Config> rules::Rules for ScheduleRules<'a, T> {
 	fn instruction_cost(&self, instruction: &elements::Instruction) -> Option<u32> {
 		use parity_wasm::elements::Instruction::*;
 		let w = &self.schedule.instruction_weights;
diff --git a/frame/contracts/src/storage.rs b/frame/contracts/src/storage.rs
index acd788796150..c9eeba4633a1 100644
--- a/frame/contracts/src/storage.rs
+++ b/frame/contracts/src/storage.rs
@@ -18,7 +18,7 @@
 
 use crate::{
 	exec::{AccountIdOf, StorageKey},
-	AliveContractInfo, BalanceOf, CodeHash, ContractInfo, ContractInfoOf, Trait, TrieId,
+	AliveContractInfo, BalanceOf, CodeHash, ContractInfo, ContractInfoOf, Config, TrieId,
 	AccountCounter,
 };
 use sp_std::prelude::*;
@@ -37,7 +37,7 @@ pub struct Storage<T>(PhantomData<T>);
 
 impl<T> Storage<T>
 where
-	T: Trait,
+	T: Config,
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
 {
 	/// Reads a storage kv pair of a contract.
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index 6a0476096c8c..44ddb8c2c65c 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -16,8 +16,8 @@
 
 use crate::{
 	BalanceOf, ContractInfo, ContractInfoOf, GenesisConfig, Module,
-	RawAliveContractInfo, RawEvent, Trait, Schedule, gas::Gas,
-	Error, Config, RuntimeReturnCode, storage::Storage,
+	RawAliveContractInfo, RawEvent, Config, Schedule, gas::Gas,
+	Error, ConfigCache, RuntimeReturnCode, storage::Storage,
 	exec::AccountIdOf,
 };
 use assert_matches::assert_matches;
@@ -110,7 +110,7 @@ parameter_types! {
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 	pub static ExistentialDeposit: u64 = 0;
 }
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = u64;
@@ -137,7 +137,7 @@ impl frame_system::Trait for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 }
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u64;
 	type Event = MetaEvent;
@@ -149,7 +149,7 @@ impl pallet_balances::Trait for Test {
 parameter_types! {
 	pub const MinimumPeriod: u64 = 1;
 }
-impl pallet_timestamp::Trait for Test {
+impl pallet_timestamp::Config for Test {
 	type Moment = u64;
 	type OnTimestampSet = ();
 	type MinimumPeriod = MinimumPeriod;
@@ -176,7 +176,7 @@ impl Convert<Weight, BalanceOf<Self>> for Test {
 	}
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type Time = Timestamp;
 	type Randomness = Randomness;
 	type Currency = Balances;
@@ -251,7 +251,7 @@ fn compile_module<T>(
 	fixture_name: &str,
 ) -> wat::Result<(Vec<u8>, <T::Hashing as Hash>::Output)>
 where
-	T: frame_system::Trait,
+	T: frame_system::Config,
 {
 	let fixture_path = ["fixtures/", fixture_name, ".wat"].concat();
 	let wasm_binary = wat::parse_file(fixture_path)?;
@@ -367,7 +367,7 @@ fn instantiate_and_call_and_deposit_event() {
 		.build()
 		.execute_with(|| {
 			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			let subsistence = super::Config::<Test>::subsistence_threshold_uncached();
+			let subsistence = super::ConfigCache::<Test>::subsistence_threshold_uncached();
 
 			assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm));
 
@@ -472,7 +472,7 @@ fn deposit_event_max_value_limit() {
 				addr.clone(),
 				0,
 				GAS_LIMIT * 2, // we are copying a huge buffer,
-				<Test as Trait>::MaxValueSize::get().encode(),
+				<Test as Config>::MaxValueSize::get().encode(),
 			));
 
 			// Call contract with too large a storage value.
@@ -482,7 +482,7 @@ fn deposit_event_max_value_limit() {
 					addr,
 					0,
 					GAS_LIMIT,
-					(<Test as Trait>::MaxValueSize::get() + 1).encode(),
+					(<Test as Config>::MaxValueSize::get() + 1).encode(),
 				),
 				Error::<Test>::ValueTooLarge,
 			);
@@ -591,7 +591,7 @@ fn storage_size() {
 				30_000,
 				GAS_LIMIT,
 				code_hash.into(),
-				<Test as pallet_balances::Trait>::Balance::from(1_000u32).encode(), // rent allowance
+				<Test as pallet_balances::Config>::Balance::from(1_000u32).encode(), // rent allowance
 				vec![],
 			));
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
@@ -725,7 +725,7 @@ fn deduct_blocks() {
 				Origin::signed(ALICE),
 				30_000,
 				GAS_LIMIT, code_hash.into(),
-				<Test as pallet_balances::Trait>::Balance::from(1_000u32).encode(), // rent allowance
+				<Test as pallet_balances::Config>::Balance::from(1_000u32).encode(), // rent allowance
 				vec![],
 			));
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
@@ -830,7 +830,7 @@ fn claim_surcharge(blocks: u64, trigger_call: impl Fn(AccountIdOf<Test>) -> bool
 				Origin::signed(ALICE),
 				100,
 				GAS_LIMIT, code_hash.into(),
-				<Test as pallet_balances::Trait>::Balance::from(1_000u32).encode(), // rent allowance
+				<Test as pallet_balances::Config>::Balance::from(1_000u32).encode(), // rent allowance
 				vec![],
 			));
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
@@ -869,7 +869,7 @@ fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
 				Origin::signed(ALICE),
 				100,
 				GAS_LIMIT, code_hash.into(),
-				<Test as pallet_balances::Trait>::Balance::from(1_000u32).encode(), // rent allowance
+				<Test as pallet_balances::Config>::Balance::from(1_000u32).encode(), // rent allowance
 				vec![],
 			));
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
@@ -911,7 +911,7 @@ fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
 				1_000,
 				GAS_LIMIT,
 				code_hash.into(),
-				<Test as pallet_balances::Trait>::Balance::from(100u32).encode(), // rent allowance
+				<Test as pallet_balances::Config>::Balance::from(100u32).encode(), // rent allowance
 				vec![],
 			));
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
@@ -960,14 +960,14 @@ fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
 			// Create
 			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
 			let subsistence_threshold =
-				Balances::minimum_balance() + <Test as Trait>::TombstoneDeposit::get();
+				Balances::minimum_balance() + <Test as Config>::TombstoneDeposit::get();
 			assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm.clone()));
 			assert_ok!(Contracts::instantiate(
 				Origin::signed(ALICE),
 				50 + subsistence_threshold,
 				GAS_LIMIT,
 				code_hash.into(),
-				<Test as pallet_balances::Trait>::Balance::from(1_000u32).encode(), // rent allowance
+				<Test as pallet_balances::Config>::Balance::from(1_000u32).encode(), // rent allowance
 				vec![],
 			));
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
@@ -1039,7 +1039,7 @@ fn call_removed_contract() {
 				Origin::signed(ALICE),
 				100,
 				GAS_LIMIT, code_hash.into(),
-				<Test as pallet_balances::Trait>::Balance::from(1_000u32).encode(), // rent allowance
+				<Test as pallet_balances::Config>::Balance::from(1_000u32).encode(), // rent allowance
 				vec![],
 			));
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
@@ -1177,7 +1177,7 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 				30_000,
 				GAS_LIMIT,
 				set_rent_code_hash.into(),
-				<Test as pallet_balances::Trait>::Balance::from(0u32).encode(),
+				<Test as pallet_balances::Config>::Balance::from(0u32).encode(),
 				vec![],
 			));
 			let addr_bob = Contracts::contract_address(&ALICE, &set_rent_code_hash, &[]);
@@ -1227,7 +1227,7 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 				30_000,
 				GAS_LIMIT,
 				restoration_code_hash.into(),
-				<Test as pallet_balances::Trait>::Balance::from(0u32).encode(),
+				<Test as pallet_balances::Config>::Balance::from(0u32).encode(),
 				vec![],
 			));
 			let addr_django = Contracts::contract_address(&CHARLIE, &restoration_code_hash, &[]);
@@ -1384,7 +1384,7 @@ fn storage_max_value_limit() {
 				addr.clone(),
 				0,
 				GAS_LIMIT * 2, // we are copying a huge buffer
-				<Test as Trait>::MaxValueSize::get().encode(),
+				<Test as Config>::MaxValueSize::get().encode(),
 			));
 
 			// Call contract with too large a storage value.
@@ -1394,7 +1394,7 @@ fn storage_max_value_limit() {
 					addr,
 					0,
 					GAS_LIMIT,
-					(<Test as Trait>::MaxValueSize::get() + 1).encode(),
+					(<Test as Config>::MaxValueSize::get() + 1).encode(),
 				),
 				Error::<Test>::ValueTooLarge,
 			);
@@ -1709,7 +1709,7 @@ fn crypto_hashes() {
 fn transfer_return_code() {
 	let (wasm, code_hash) = compile_module::<Test>("transfer_return_code").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let subsistence = Config::<Test>::subsistence_threshold_uncached();
+		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
 		let _ = Balances::deposit_creating(&ALICE, 10 * subsistence);
 		assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm));
 
@@ -1756,7 +1756,7 @@ fn call_return_code() {
 	let (caller_code, caller_hash) = compile_module::<Test>("call_return_code").unwrap();
 	let (callee_code, callee_hash) = compile_module::<Test>("ok_trap_revert").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let subsistence = Config::<Test>::subsistence_threshold_uncached();
+		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
 		let _ = Balances::deposit_creating(&ALICE, 10 * subsistence);
 		let _ = Balances::deposit_creating(&CHARLIE, 10 * subsistence);
 		assert_ok!(Contracts::put_code(Origin::signed(ALICE), caller_code));
@@ -1849,7 +1849,7 @@ fn instantiate_return_code() {
 	let (caller_code, caller_hash) = compile_module::<Test>("instantiate_return_code").unwrap();
 	let (callee_code, callee_hash) = compile_module::<Test>("ok_trap_revert").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let subsistence = Config::<Test>::subsistence_threshold_uncached();
+		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
 		let _ = Balances::deposit_creating(&ALICE, 10 * subsistence);
 		let _ = Balances::deposit_creating(&CHARLIE, 10 * subsistence);
 		assert_ok!(Contracts::put_code(Origin::signed(ALICE), caller_code));
diff --git a/frame/contracts/src/wasm/code_cache.rs b/frame/contracts/src/wasm/code_cache.rs
index a64f387097ed..d90c7502b85e 100644
--- a/frame/contracts/src/wasm/code_cache.rs
+++ b/frame/contracts/src/wasm/code_cache.rs
@@ -27,7 +27,7 @@
 //! Thus, before executing a contract it should be reinstrument with new schedule.
 
 use crate::wasm::{prepare, runtime::Env, PrefabWasmModule};
-use crate::{CodeHash, CodeStorage, PristineCode, Schedule, Trait};
+use crate::{CodeHash, CodeStorage, PristineCode, Schedule, Config};
 use sp_std::prelude::*;
 use sp_runtime::traits::Hash;
 use sp_core::crypto::UncheckedFrom;
@@ -37,7 +37,7 @@ use frame_support::StorageMap;
 /// as a result of this function.
 ///
 /// This function instruments the given code and caches it in the storage.
-pub fn save<T: Trait>(
+pub fn save<T: Config>(
 	original_code: Vec<u8>,
 	schedule: &Schedule<T>,
 ) -> Result<CodeHash<T>, &'static str> where T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]> {
@@ -55,7 +55,7 @@ pub fn save<T: Trait>(
 /// This version neither checks nor instruments the passed in code. This is useful
 /// when code needs to be benchmarked without the injected instrumentation.
 #[cfg(feature = "runtime-benchmarks")]
-pub fn save_raw<T: Trait>(
+pub fn save_raw<T: Config>(
 	original_code: Vec<u8>,
 	schedule: &Schedule<T>,
 ) -> Result<CodeHash<T>, &'static str> where T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]> {
@@ -73,7 +73,7 @@ pub fn save_raw<T: Trait>(
 /// If the module was instrumented with a lower version of schedule than
 /// the current one given as an argument, then this function will perform
 /// re-instrumentation and update the cache in the storage.
-pub fn load<T: Trait>(
+pub fn load<T: Config>(
 	code_hash: &CodeHash<T>,
 	schedule: &Schedule<T>,
 ) -> Result<PrefabWasmModule, &'static str> where T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]> {
diff --git a/frame/contracts/src/wasm/env_def/macros.rs b/frame/contracts/src/wasm/env_def/macros.rs
index 6741896102d4..cc61deb074b7 100644
--- a/frame/contracts/src/wasm/env_def/macros.rs
+++ b/frame/contracts/src/wasm/env_def/macros.rs
@@ -129,8 +129,8 @@ macro_rules! define_func {
 			args: &[sp_sandbox::Value],
 		) -> Result<sp_sandbox::ReturnValue, sp_sandbox::HostError>
 			where
-				<E::T as frame_system::Trait>::AccountId:
-					sp_core::crypto::UncheckedFrom<<E::T as frame_system::Trait>::Hash> +
+				<E::T as frame_system::Config>::AccountId:
+					sp_core::crypto::UncheckedFrom<<E::T as frame_system::Config>::Hash> +
 						AsRef<[u8]>
 		{
 			#[allow(unused)]
@@ -190,8 +190,8 @@ macro_rules! define_env {
 
 		impl<E: Ext> $crate::wasm::env_def::FunctionImplProvider<E> for $init_name
 		where
-			<E::T as frame_system::Trait>::AccountId:
-				sp_core::crypto::UncheckedFrom<<E::T as frame_system::Trait>::Hash> +
+			<E::T as frame_system::Config>::AccountId:
+				sp_core::crypto::UncheckedFrom<<E::T as frame_system::Config>::Hash> +
 					AsRef<[u8]>
 		{
 			fn impls<F: FnMut(&[u8], $crate::wasm::env_def::HostFunc<E>)>(f: &mut F) {
diff --git a/frame/contracts/src/wasm/mod.rs b/frame/contracts/src/wasm/mod.rs
index baa75ad49720..7d7668d5ec6d 100644
--- a/frame/contracts/src/wasm/mod.rs
+++ b/frame/contracts/src/wasm/mod.rs
@@ -17,7 +17,7 @@
 //! This module provides a means for executing contracts
 //! represented in wasm.
 
-use crate::{CodeHash, Schedule, Trait};
+use crate::{CodeHash, Schedule, Config};
 use crate::wasm::env_def::FunctionImplProvider;
 use crate::exec::Ext;
 use crate::gas::GasMeter;
@@ -68,17 +68,17 @@ pub struct WasmExecutable {
 }
 
 /// Loader which fetches `WasmExecutable` from the code cache.
-pub struct WasmLoader<'a, T: Trait> {
+pub struct WasmLoader<'a, T: Config> {
 	schedule: &'a Schedule<T>,
 }
 
-impl<'a, T: Trait> WasmLoader<'a, T> where T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]> {
+impl<'a, T: Config> WasmLoader<'a, T> where T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]> {
 	pub fn new(schedule: &'a Schedule<T>) -> Self {
 		WasmLoader { schedule }
 	}
 }
 
-impl<'a, T: Trait> crate::exec::Loader<T> for WasmLoader<'a, T>
+impl<'a, T: Config> crate::exec::Loader<T> for WasmLoader<'a, T>
 where
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
 {
@@ -101,17 +101,17 @@ where
 }
 
 /// Implementation of `Vm` that takes `WasmExecutable` and executes it.
-pub struct WasmVm<'a, T: Trait> where T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]> {
+pub struct WasmVm<'a, T: Config> where T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]> {
 	schedule: &'a Schedule<T>,
 }
 
-impl<'a, T: Trait> WasmVm<'a, T> where T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]> {
+impl<'a, T: Config> WasmVm<'a, T> where T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]> {
 	pub fn new(schedule: &'a Schedule<T>) -> Self {
 		WasmVm { schedule }
 	}
 }
 
-impl<'a, T: Trait> crate::exec::Vm<T> for WasmVm<'a, T>
+impl<'a, T: Config> crate::exec::Vm<T> for WasmVm<'a, T>
 where
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
 {
@@ -462,8 +462,8 @@ mod tests {
 		gas_meter: &mut GasMeter<E::T>,
 	) -> ExecResult
 	where
-		<E::T as frame_system::Trait>::AccountId:
-			UncheckedFrom<<E::T as frame_system::Trait>::Hash> + AsRef<[u8]>
+		<E::T as frame_system::Config>::AccountId:
+			UncheckedFrom<<E::T as frame_system::Config>::Hash> + AsRef<[u8]>
 	{
 		use crate::exec::Vm;
 
diff --git a/frame/contracts/src/wasm/prepare.rs b/frame/contracts/src/wasm/prepare.rs
index 73c149d025d7..56e21d2ee664 100644
--- a/frame/contracts/src/wasm/prepare.rs
+++ b/frame/contracts/src/wasm/prepare.rs
@@ -20,7 +20,7 @@
 
 use crate::wasm::env_def::ImportSatisfyCheck;
 use crate::wasm::PrefabWasmModule;
-use crate::{Schedule, Trait};
+use crate::{Schedule, Config};
 
 use parity_wasm::elements::{self, Internal, External, MemoryType, Type, ValueType};
 use pwasm_utils;
@@ -34,13 +34,13 @@ pub const IMPORT_MODULE_FN: &str = "seal0";
 /// compiler toolchains might not support specifying other modules than "env" for memory imports.
 pub const IMPORT_MODULE_MEMORY: &str = "env";
 
-struct ContractModule<'a, T: Trait> {
+struct ContractModule<'a, T: Config> {
 	/// A deserialized module. The module is valid (this is Guaranteed by `new` method).
 	module: elements::Module,
 	schedule: &'a Schedule<T>,
 }
 
-impl<'a, T: Trait> ContractModule<'a, T> {
+impl<'a, T: Config> ContractModule<'a, T> {
 	/// Creates a new instance of `ContractModule`.
 	///
 	/// Returns `Err` if the `original_code` couldn't be decoded or
@@ -369,7 +369,7 @@ impl<'a, T: Trait> ContractModule<'a, T> {
 	}
 }
 
-fn get_memory_limits<T: Trait>(module: Option<&MemoryType>, schedule: &Schedule<T>)
+fn get_memory_limits<T: Config>(module: Option<&MemoryType>, schedule: &Schedule<T>)
 	-> Result<(u32, u32), &'static str>
 {
 	if let Some(memory_type) = module {
@@ -410,7 +410,7 @@ fn get_memory_limits<T: Trait>(module: Option<&MemoryType>, schedule: &Schedule<
 /// - all imported functions from the external environment matches defined by `env` module,
 ///
 /// The preprocessing includes injecting code for gas metering and metering the height of stack.
-pub fn prepare_contract<C: ImportSatisfyCheck, T: Trait>(
+pub fn prepare_contract<C: ImportSatisfyCheck, T: Config>(
 	original_code: &[u8],
 	schedule: &Schedule<T>,
 ) -> Result<PrefabWasmModule, &'static str> {
@@ -452,7 +452,7 @@ pub fn prepare_contract<C: ImportSatisfyCheck, T: Trait>(
 #[cfg(feature = "runtime-benchmarks")]
 pub mod benchmarking {
 	use super::{
-		Trait, ContractModule, PrefabWasmModule, ImportSatisfyCheck, Schedule, get_memory_limits
+		Config, ContractModule, PrefabWasmModule, ImportSatisfyCheck, Schedule, get_memory_limits
 	};
 	use parity_wasm::elements::FunctionType;
 
@@ -463,7 +463,7 @@ pub mod benchmarking {
 	}
 
 	/// Prepare function that neither checks nor instruments the passed in code.
-	pub fn prepare_contract<T: Trait>(original_code: &[u8], schedule: &Schedule<T>)
+	pub fn prepare_contract<T: Config>(original_code: &[u8], schedule: &Schedule<T>)
 		-> Result<PrefabWasmModule, &'static str>
 	{
 		let contract_module = ContractModule::new(original_code, schedule)?;
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index 90ea86f9cec3..ac1cb1f54d56 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -17,7 +17,7 @@
 //! Environment definition of the wasm smart-contract runtime.
 
 use crate::{
-	HostFnWeights, Schedule, Trait, CodeHash, BalanceOf, Error,
+	HostFnWeights, Schedule, Config, CodeHash, BalanceOf, Error,
 	exec::{Ext, StorageKey, TopicOf},
 	gas::{Gas, GasMeter, Token, GasMeterResult},
 	wasm::env_def::ConvertibleToWasm,
@@ -193,7 +193,7 @@ pub enum RuntimeToken {
 	HashBlake128(u32),
 }
 
-impl<T: Trait> Token<T> for RuntimeToken
+impl<T: Config> Token<T> for RuntimeToken
 where
 	T::AccountId: UncheckedFrom<T::Hash>, T::AccountId: AsRef<[u8]>
 {
@@ -291,8 +291,8 @@ pub struct Runtime<'a, E: Ext + 'a> {
 impl<'a, E> Runtime<'a, E>
 where
 	E: Ext + 'a,
-	<E::T as frame_system::Trait>::AccountId:
-		UncheckedFrom<<E::T as frame_system::Trait>::Hash> + AsRef<[u8]>
+	<E::T as frame_system::Config>::AccountId:
+		UncheckedFrom<<E::T as frame_system::Config>::Hash> + AsRef<[u8]>
 {
 	pub fn new(
 		ext: &'a mut E,
@@ -709,7 +709,7 @@ define_env!(Env, <E: Ext>,
 		value_len: u32
 	) -> ReturnCode => {
 		ctx.charge_gas(RuntimeToken::Transfer)?;
-		let callee: <<E as Ext>::T as frame_system::Trait>::AccountId =
+		let callee: <<E as Ext>::T as frame_system::Config>::AccountId =
 			ctx.read_sandbox_memory_as(account_ptr, account_len)?;
 		let value: BalanceOf<<E as Ext>::T> =
 			ctx.read_sandbox_memory_as(value_ptr, value_len)?;
@@ -762,7 +762,7 @@ define_env!(Env, <E: Ext>,
 		output_len_ptr: u32
 	) -> ReturnCode => {
 		ctx.charge_gas(RuntimeToken::CallBase(input_data_len))?;
-		let callee: <<E as Ext>::T as frame_system::Trait>::AccountId =
+		let callee: <<E as Ext>::T as frame_system::Config>::AccountId =
 			ctx.read_sandbox_memory_as(callee_ptr, callee_len)?;
 		let value: BalanceOf<<E as Ext>::T> = ctx.read_sandbox_memory_as(value_ptr, value_len)?;
 		let input_data = ctx.read_sandbox_memory(input_data_ptr, input_data_len)?;
@@ -922,7 +922,7 @@ define_env!(Env, <E: Ext>,
 		beneficiary_len: u32
 	) => {
 		ctx.charge_gas(RuntimeToken::Terminate)?;
-		let beneficiary: <<E as Ext>::T as frame_system::Trait>::AccountId =
+		let beneficiary: <<E as Ext>::T as frame_system::Config>::AccountId =
 			ctx.read_sandbox_memory_as(beneficiary_ptr, beneficiary_len)?;
 
 		if let Ok(_) = ctx.ext.terminate(&beneficiary).map_err(|e| ctx.store_err(e)) {
@@ -1169,7 +1169,7 @@ define_env!(Env, <E: Ext>,
 		delta_count: u32
 	) => {
 		ctx.charge_gas(RuntimeToken::RestoreTo(delta_count))?;
-		let dest: <<E as Ext>::T as frame_system::Trait>::AccountId =
+		let dest: <<E as Ext>::T as frame_system::Config>::AccountId =
 			ctx.read_sandbox_memory_as(dest_ptr, dest_len)?;
 		let code_hash: CodeHash<<E as Ext>::T> =
 			ctx.read_sandbox_memory_as(code_hash_ptr, code_hash_len)?;
diff --git a/frame/contracts/src/weights.rs b/frame/contracts/src/weights.rs
index 77bb83cf4d42..24c1273a44ff 100644
--- a/frame/contracts/src/weights.rs
+++ b/frame/contracts/src/weights.rs
@@ -144,7 +144,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_contracts using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn update_schedule() -> Weight {
 		(35_214_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
diff --git a/frame/democracy/src/benchmarking.rs b/frame/democracy/src/benchmarking.rs
index b5de1a91c17a..542bfaa79db1 100644
--- a/frame/democracy/src/benchmarking.rs
+++ b/frame/democracy/src/benchmarking.rs
@@ -34,21 +34,21 @@ const MAX_REFERENDUMS: u32 = 99;
 const MAX_SECONDERS: u32 = 100;
 const MAX_BYTES: u32 = 16_384;
 
-fn assert_last_event<T: Trait>(generic_event: <T as Trait>::Event) {
+fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
 	let events = System::<T>::events();
-	let system_event: <T as frame_system::Trait>::Event = generic_event.into();
+	let system_event: <T as frame_system::Config>::Event = generic_event.into();
 	// compare to the last event record
 	let EventRecord { event, .. } = &events[events.len() - 1];
 	assert_eq!(event, &system_event);
 }
 
-fn funded_account<T: Trait>(name: &'static str, index: u32) -> T::AccountId {
+fn funded_account<T: Config>(name: &'static str, index: u32) -> T::AccountId {
 	let caller: T::AccountId = account(name, index, SEED);
 	T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 	caller
 }
 
-fn add_proposal<T: Trait>(n: u32) -> Result<T::Hash, &'static str> {
+fn add_proposal<T: Config>(n: u32) -> Result<T::Hash, &'static str> {
 	let other = funded_account::<T>("proposer", n);
 	let value = T::MinimumDeposit::get();
 	let proposal_hash: T::Hash = T::Hashing::hash_of(&n);
@@ -62,7 +62,7 @@ fn add_proposal<T: Trait>(n: u32) -> Result<T::Hash, &'static str> {
 	Ok(proposal_hash)
 }
 
-fn add_referendum<T: Trait>(n: u32) -> Result<ReferendumIndex, &'static str> {
+fn add_referendum<T: Config>(n: u32) -> Result<ReferendumIndex, &'static str> {
 	let proposal_hash: T::Hash = T::Hashing::hash_of(&n);
 	let vote_threshold = VoteThreshold::SimpleMajority;
 
@@ -84,7 +84,7 @@ fn add_referendum<T: Trait>(n: u32) -> Result<ReferendumIndex, &'static str> {
 	Ok(referendum_index)
 }
 
-fn account_vote<T: Trait>(b: BalanceOf<T>) -> AccountVote<BalanceOf<T>> {
+fn account_vote<T: Config>(b: BalanceOf<T>) -> AccountVote<BalanceOf<T>> {
 	let v = Vote {
 		aye: true,
 		conviction: Conviction::Locked1x,
diff --git a/frame/democracy/src/lib.rs b/frame/democracy/src/lib.rs
index fa8d07fd78db..ce89259e55e8 100644
--- a/frame/democracy/src/lib.rs
+++ b/frame/democracy/src/lib.rs
@@ -17,7 +17,7 @@
 
 //! # Democracy Pallet
 //!
-//! - [`democracy::Trait`](./trait.Trait.html)
+//! - [`democracy::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //!
 //! ## Overview
@@ -199,13 +199,13 @@ pub type PropIndex = u32;
 /// A referendum index.
 pub type ReferendumIndex = u32;
 
-type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
+type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 type NegativeImbalanceOf<T> =
-	<<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::NegativeImbalance;
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
 
-pub trait Trait: frame_system::Trait + Sized {
+pub trait Config: frame_system::Config + Sized {
 	type Proposal: Parameter + Dispatchable<Origin=Self::Origin> + From<Call<Self>>;
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// Currency type for this module.
 	type Currency: ReservableCurrency<Self::AccountId>
@@ -338,7 +338,7 @@ enum Releases {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Democracy {
+	trait Store for Module<T: Config> as Democracy {
 		// TODO: Refactor public proposal queue into its own pallet.
 		// https://github.com/paritytech/substrate/issues/5322
 		/// The number of (public) proposals that have been made so far.
@@ -413,9 +413,9 @@ decl_storage! {
 decl_event! {
 	pub enum Event<T> where
 		Balance = BalanceOf<T>,
-		<T as frame_system::Trait>::AccountId,
-		<T as frame_system::Trait>::Hash,
-		<T as frame_system::Trait>::BlockNumber,
+		<T as frame_system::Config>::AccountId,
+		<T as frame_system::Config>::Hash,
+		<T as frame_system::Config>::BlockNumber,
 	{
 		/// A motion has been proposed by a public account. \[proposal_index, deposit\]
 		Proposed(PropIndex, Balance),
@@ -461,7 +461,7 @@ decl_event! {
 }
 
 decl_error! {
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Value too low
 		ValueLow,
 		/// Proposal does not exist
@@ -537,7 +537,7 @@ decl_error! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		type Error = Error<T>;
 
 		/// The minimum period of locking and the period between a proposal being approved and enacted.
@@ -1168,7 +1168,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	// exposed immutables.
 
 	/// Get the amount locked in support of `proposal`; `None` if proposal isn't a valid proposal
diff --git a/frame/democracy/src/tests.rs b/frame/democracy/src/tests.rs
index 25209901109f..6e7b7cfcc6d1 100644
--- a/frame/democracy/src/tests.rs
+++ b/frame/democracy/src/tests.rs
@@ -92,7 +92,7 @@ parameter_types! {
 	pub const MaximumBlockLength: u32 = 2 * 1024;
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = BaseFilter;
 	type Origin = Origin;
 	type Index = u64;
@@ -122,7 +122,7 @@ impl frame_system::Trait for Test {
 parameter_types! {
 	pub MaximumSchedulerWeight: Weight = Perbill::from_percent(80) * MaximumBlockWeight::get();
 }
-impl pallet_scheduler::Trait for Test {
+impl pallet_scheduler::Config for Test {
 	type Event = Event;
 	type Origin = Origin;
 	type PalletsOrigin = OriginCaller;
@@ -135,7 +135,7 @@ impl pallet_scheduler::Trait for Test {
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
 }
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u64;
 	type Event = Event;
@@ -173,7 +173,7 @@ impl Contains<u64> for OneToFive {
 	fn add(_m: &u64) {}
 }
 
-impl super::Trait for Test {
+impl super::Config for Test {
 	type Proposal = Call;
 	type Event = Event;
 	type Currency = pallet_balances::Module<Self>;
@@ -242,7 +242,7 @@ fn set_balance_proposal(value: u64) -> Vec<u8> {
 fn set_balance_proposal_is_correctly_filtered_out() {
 	for i in 0..10 {
 		let call = Call::decode(&mut &set_balance_proposal(i)[..]).unwrap();
-		assert!(!<Test as frame_system::Trait>::BaseCallFilter::filter(&call));
+		assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
 	}
 }
 
diff --git a/frame/democracy/src/weights.rs b/frame/democracy/src/weights.rs
index e386e5fb5531..06899b47dea7 100644
--- a/frame/democracy/src/weights.rs
+++ b/frame/democracy/src/weights.rs
@@ -72,7 +72,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_democracy using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn propose() -> Weight {
 		(87_883_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
diff --git a/frame/elections-phragmen/src/benchmarking.rs b/frame/elections-phragmen/src/benchmarking.rs
index e7c3719480b7..eaa5bbe9ed4f 100644
--- a/frame/elections-phragmen/src/benchmarking.rs
+++ b/frame/elections-phragmen/src/benchmarking.rs
@@ -30,7 +30,7 @@ const BALANCE_FACTOR: u32 = 250;
 const MAX_VOTERS: u32 = 500;
 const MAX_CANDIDATES: u32 = 200;
 
-type Lookup<T> = <<T as frame_system::Trait>::Lookup as StaticLookup>::Source;
+type Lookup<T> = <<T as frame_system::Config>::Lookup as StaticLookup>::Source;
 
 macro_rules! whitelist {
 	($acc:ident) => {
@@ -41,7 +41,7 @@ macro_rules! whitelist {
 }
 
 /// grab new account with infinite balance.
-fn endowed_account<T: Trait>(name: &'static str, index: u32) -> T::AccountId {
+fn endowed_account<T: Config>(name: &'static str, index: u32) -> T::AccountId {
 	let account: T::AccountId = account(name, index, 0);
 	let amount = default_stake::<T>(BALANCE_FACTOR);
 	let _ = T::Currency::make_free_balance_be(&account, amount);
@@ -53,28 +53,28 @@ fn endowed_account<T: Trait>(name: &'static str, index: u32) -> T::AccountId {
 }
 
 /// Account to lookup type of system trait.
-fn as_lookup<T: Trait>(account: T::AccountId) -> Lookup<T> {
+fn as_lookup<T: Config>(account: T::AccountId) -> Lookup<T> {
 	T::Lookup::unlookup(account)
 }
 
 /// Get a reasonable amount of stake based on the execution trait's configuration
-fn default_stake<T: Trait>(factor: u32) -> BalanceOf<T> {
+fn default_stake<T: Config>(factor: u32) -> BalanceOf<T> {
 	let factor = BalanceOf::<T>::from(factor);
 	T::Currency::minimum_balance() * factor
 }
 
 /// Get the current number of candidates.
-fn candidate_count<T: Trait>() -> u32 {
+fn candidate_count<T: Config>() -> u32 {
 	<Candidates<T>>::decode_len().unwrap_or(0usize) as u32
 }
 
 /// Get the number of votes of a voter.
-fn vote_count_of<T: Trait>(who: &T::AccountId) -> u32 {
+fn vote_count_of<T: Config>(who: &T::AccountId) -> u32 {
 	<Voting<T>>::get(who).1.len() as u32
 }
 
 /// A `DefunctVoter` struct with correct value
-fn defunct_for<T: Trait>(who: T::AccountId) -> DefunctVoter<Lookup<T>> {
+fn defunct_for<T: Config>(who: T::AccountId) -> DefunctVoter<Lookup<T>> {
 	DefunctVoter {
 		who: as_lookup::<T>(who.clone()),
 		candidate_count: candidate_count::<T>(),
@@ -83,7 +83,7 @@ fn defunct_for<T: Trait>(who: T::AccountId) -> DefunctVoter<Lookup<T>> {
 }
 
 /// Add `c` new candidates.
-fn submit_candidates<T: Trait>(c: u32, prefix: &'static str)
+fn submit_candidates<T: Config>(c: u32, prefix: &'static str)
 	-> Result<Vec<T::AccountId>, &'static str>
 {
 	(0..c).map(|i| {
@@ -97,7 +97,7 @@ fn submit_candidates<T: Trait>(c: u32, prefix: &'static str)
 }
 
 /// Add `c` new candidates with self vote.
-fn submit_candidates_with_self_vote<T: Trait>(c: u32, prefix: &'static str)
+fn submit_candidates_with_self_vote<T: Config>(c: u32, prefix: &'static str)
 	-> Result<Vec<T::AccountId>, &'static str>
 {
 	let candidates = submit_candidates::<T>(c, prefix)?;
@@ -110,7 +110,7 @@ fn submit_candidates_with_self_vote<T: Trait>(c: u32, prefix: &'static str)
 
 
 /// Submit one voter.
-fn submit_voter<T: Trait>(caller: T::AccountId, votes: Vec<T::AccountId>, stake: BalanceOf<T>)
+fn submit_voter<T: Config>(caller: T::AccountId, votes: Vec<T::AccountId>, stake: BalanceOf<T>)
 	-> Result<(), sp_runtime::DispatchError>
 {
 	<Elections<T>>::vote(RawOrigin::Signed(caller).into(), votes, stake)
@@ -118,7 +118,7 @@ fn submit_voter<T: Trait>(caller: T::AccountId, votes: Vec<T::AccountId>, stake:
 
 /// create `num_voter` voters who randomly vote for at most `votes` of `all_candidates` if
 /// available.
-fn distribute_voters<T: Trait>(mut all_candidates: Vec<T::AccountId>, num_voters: u32, votes: usize)
+fn distribute_voters<T: Config>(mut all_candidates: Vec<T::AccountId>, num_voters: u32, votes: usize)
 	-> Result<(), &'static str>
 {
 	let stake = default_stake::<T>(BALANCE_FACTOR);
@@ -138,7 +138,7 @@ fn distribute_voters<T: Trait>(mut all_candidates: Vec<T::AccountId>, num_voters
 
 /// Fill the seats of members and runners-up up until `m`. Note that this might include either only
 /// members, or members and runners-up.
-fn fill_seats_up_to<T: Trait>(m: u32) -> Result<Vec<T::AccountId>, &'static str> {
+fn fill_seats_up_to<T: Config>(m: u32) -> Result<Vec<T::AccountId>, &'static str> {
 	let _ = submit_candidates_with_self_vote::<T>(m, "fill_seats_up_to")?;
 	assert_eq!(<Elections<T>>::candidates().len() as u32, m, "wrong number of candidates.");
 	<Elections<T>>::do_phragmen();
@@ -158,7 +158,7 @@ fn fill_seats_up_to<T: Trait>(m: u32) -> Result<Vec<T::AccountId>, &'static str>
 }
 
 /// removes all the storage items to reverse any genesis state.
-fn clean<T: Trait>() {
+fn clean<T: Config>() {
 	<Members<T>>::kill();
 	<Candidates<T>>::kill();
 	<RunnersUp<T>>::kill();
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index 8279f9cf11f1..c4a71d6595f9 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -77,7 +77,7 @@
 //!
 //! ### Module Information
 //!
-//! - [`election_sp_phragmen::Trait`](./trait.Trait.html)
+//! - [`election_sp_phragmen::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //! - [`Module`](./struct.Module.html)
 
@@ -112,9 +112,9 @@ pub use weights::WeightInfo;
 pub const MAXIMUM_VOTE: usize = 16;
 
 type BalanceOf<T> =
-	<<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 type NegativeImbalanceOf<T> =
-	<<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::NegativeImbalance;
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
 
 /// An indication that the renouncing account currently has which of the below roles.
 #[derive(Encode, Decode, Clone, PartialEq, RuntimeDebug)]
@@ -140,9 +140,9 @@ pub struct DefunctVoter<AccountId> {
 	pub candidate_count: u32
 }
 
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The overarching event type.c
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// Identifier for the elections-phragmen pallet's lock
 	type ModuleId: Get<LockIdentifier>;
@@ -193,7 +193,7 @@ pub trait Trait: frame_system::Trait {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as PhragmenElection {
+	trait Store for Module<T: Config> as PhragmenElection {
 		// ---- State
 		/// The current elected membership. Sorted based on account id.
 		pub Members get(fn members): Vec<(T::AccountId, BalanceOf<T>)>;
@@ -251,7 +251,7 @@ decl_storage! {
 }
 
 decl_error! {
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Cannot vote when no candidates or members exist.
 		UnableToVote,
 		/// Must vote for at least one candidate.
@@ -290,7 +290,7 @@ decl_error! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		type Error = Error<T>;
 
 		fn deposit_event() = default;
@@ -667,7 +667,7 @@ decl_module! {
 decl_event!(
 	pub enum Event<T> where
 		Balance = BalanceOf<T>,
-		<T as frame_system::Trait>::AccountId,
+		<T as frame_system::Config>::AccountId,
 	{
 		/// A new term with \[new_members\]. This indicates that enough candidates existed to run the
 		/// election, not that enough have has been elected. The inner value must be examined for
@@ -694,7 +694,7 @@ decl_event!(
 	}
 );
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Attempts to remove a member `who`. If a runner-up exists, it is used as the replacement and
 	/// Ok(true). is returned.
 	///
@@ -1027,7 +1027,7 @@ impl<T: Trait> Module<T> {
 	}
 }
 
-impl<T: Trait> Contains<T::AccountId> for Module<T> {
+impl<T: Config> Contains<T::AccountId> for Module<T> {
 	fn contains(who: &T::AccountId) -> bool {
 		Self::is_member(who)
 	}
@@ -1046,7 +1046,7 @@ impl<T: Trait> Contains<T::AccountId> for Module<T> {
 	}
 }
 
-impl<T: Trait> ContainsLengthBound for Module<T> {
+impl<T: Config> ContainsLengthBound for Module<T> {
 	fn min_len() -> usize { 0 }
 
 	/// Implementation uses a parameter type so calling is cost-free.
@@ -1076,7 +1076,7 @@ mod tests {
 		pub const AvailableBlockRatio: Perbill = Perbill::one();
 	}
 
-	impl frame_system::Trait for Test {
+	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
 		type Origin = Origin;
 		type Index = u64;
@@ -1108,7 +1108,7 @@ mod tests {
 		pub const ExistentialDeposit: u64 = 1;
 	}
 
-	impl pallet_balances::Trait for Test {
+	impl pallet_balances::Config for Test {
 		type Balance = u64;
 		type Event = Event;
 		type DustRemoval = ();
@@ -1175,7 +1175,7 @@ mod tests {
 		pub const ElectionsPhragmenModuleId: LockIdentifier = *b"phrelect";
 	}
 
-	impl Trait for Test {
+	impl Config for Test {
 		type ModuleId = ElectionsPhragmenModuleId;
 		type Event = Event;
 		type Currency = Balances;
diff --git a/frame/elections-phragmen/src/weights.rs b/frame/elections-phragmen/src/weights.rs
index 2702aec0a01c..48fd40e782e4 100644
--- a/frame/elections-phragmen/src/weights.rs
+++ b/frame/elections-phragmen/src/weights.rs
@@ -59,7 +59,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_elections_phragmen using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn vote(v: u32, ) -> Weight {
 		(89_627_000 as Weight)
 			.saturating_add((197_000 as Weight).saturating_mul(v as Weight))
diff --git a/frame/elections/src/lib.rs b/frame/elections/src/lib.rs
index dccc42f24417..1490b6d86aeb 100644
--- a/frame/elections/src/lib.rs
+++ b/frame/elections/src/lib.rs
@@ -139,9 +139,9 @@ pub const VOTER_SET_SIZE: usize = 64;
 /// NUmber of approvals grouped in one chunk.
 pub const APPROVAL_SET_SIZE: usize = 8;
 
-type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
+type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 type NegativeImbalanceOf<T> =
-	<<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::NegativeImbalance;
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
 
 /// Index used to access chunks.
 type SetIndex = u32;
@@ -152,8 +152,8 @@ type ApprovalFlag = u32;
 /// Number of approval flags that can fit into [`ApprovalFlag`] type.
 const APPROVAL_FLAG_LEN: usize = 32;
 
-pub trait Trait: frame_system::Trait {
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+pub trait Config: frame_system::Config {
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// Identifier for the elections pallet's lock
 	type ModuleId: Get<LockIdentifier>;
@@ -218,7 +218,7 @@ pub trait Trait: frame_system::Trait {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Elections {
+	trait Store for Module<T: Config> as Elections {
 		// ---- parameters
 
 		/// How long to give each top candidate to present themselves after the vote ends.
@@ -286,7 +286,7 @@ decl_storage! {
 
 decl_error! {
 	/// Error for the elections module.
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Reporter must be a voter.
 		NotVoter,
 		/// Target for inactivity cleanup must be active.
@@ -345,7 +345,7 @@ decl_error! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		type Error = Error<T>;
 
 		/// How much should be locked up in order to submit one's candidacy. A reasonable
@@ -706,7 +706,7 @@ decl_module! {
 }
 
 decl_event!(
-	pub enum Event<T> where <T as frame_system::Trait>::AccountId {
+	pub enum Event<T> where <T as frame_system::Config>::AccountId {
 		/// Reaped \[voter, reaper\].
 		VoterReaped(AccountId, AccountId),
 		/// Slashed \[reaper\].
@@ -719,7 +719,7 @@ decl_event!(
 	}
 );
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	// exposed immutables.
 
 	/// True if we're currently in a presentation period.
diff --git a/frame/elections/src/mock.rs b/frame/elections/src/mock.rs
index 0d57089af5ef..293074469c5d 100644
--- a/frame/elections/src/mock.rs
+++ b/frame/elections/src/mock.rs
@@ -37,7 +37,7 @@ parameter_types! {
 	pub const MaximumBlockLength: u32 = 2 * 1024;
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Call = Call;
@@ -68,7 +68,7 @@ impl frame_system::Trait for Test {
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
 }
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u64;
 	type DustRemoval = ();
@@ -110,7 +110,7 @@ parameter_types!{
 	pub const ElectionModuleId: LockIdentifier = *b"py/elect";
 }
 
-impl elections::Trait for Test {
+impl elections::Config for Test {
 	type Event = Event;
 	type Currency = Balances;
 	type BadPresentation = ();
diff --git a/frame/elections/src/tests.rs b/frame/elections/src/tests.rs
index d3579ca33743..38a16953572f 100644
--- a/frame/elections/src/tests.rs
+++ b/frame/elections/src/tests.rs
@@ -680,8 +680,8 @@ fn retracting_active_voter_should_slash_reporter() {
 		assert_ok!(Elections::end_block(System::block_number()));
 
 		assert_eq!(Elections::vote_index(), 2);
-		assert_eq!(<Test as Trait>::InactiveGracePeriod::get(), 1);
-		assert_eq!(<Test as Trait>::VotingPeriod::get(), 4);
+		assert_eq!(<Test as Config>::InactiveGracePeriod::get(), 1);
+		assert_eq!(<Test as Config>::VotingPeriod::get(), 4);
 		assert_eq!(Elections::voter_info(4), Some(VoterInfo { last_win: 1, last_active: 0, stake: 40, pot: 0 }));
 
 		assert_ok!(Elections::reap_inactive_voter(Origin::signed(4),
diff --git a/frame/example-offchain-worker/src/lib.rs b/frame/example-offchain-worker/src/lib.rs
index b64e3f8dd83f..29e545ae2d97 100644
--- a/frame/example-offchain-worker/src/lib.rs
+++ b/frame/example-offchain-worker/src/lib.rs
@@ -24,7 +24,7 @@
 //! Run `cargo doc --package pallet-example-offchain-worker --open` to view this module's
 //! documentation.
 //!
-//! - [`pallet_example_offchain_worker::Trait`](./trait.Trait.html)
+//! - [`pallet_example_offchain_worker::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //! - [`Module`](./struct.Module.html)
 //!
@@ -103,12 +103,12 @@ pub mod crypto {
 }
 
 /// This pallet's configuration trait
-pub trait Trait: CreateSignedTransaction<Call<Self>> {
+pub trait Config: CreateSignedTransaction<Call<Self>> {
 	/// The identifier type for an offchain worker.
 	type AuthorityId: AppCrypto<Self::Public, Self::Signature>;
 
 	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 	/// The overarching dispatch call type.
 	type Call: From<Call<Self>>;
 
@@ -149,7 +149,7 @@ impl<T: SigningTypes> SignedPayload<T> for PricePayload<T::Public, T::BlockNumbe
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as ExampleOffchainWorker {
+	trait Store for Module<T: Config> as ExampleOffchainWorker {
 		/// A vector of recently submitted prices.
 		///
 		/// This is used to calculate average price, should have bounded size.
@@ -165,7 +165,7 @@ decl_storage! {
 
 decl_event!(
 	/// Events generated by the module.
-	pub enum Event<T> where AccountId = <T as frame_system::Trait>::AccountId {
+	pub enum Event<T> where AccountId = <T as frame_system::Config>::AccountId {
 		/// Event generated when new price is accepted to contribute to the average.
 		/// \[price, who\]
 		NewPrice(u32, AccountId),
@@ -174,7 +174,7 @@ decl_event!(
 
 decl_module! {
 	/// A public part of the pallet.
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		fn deposit_event() = default;
 
 		/// Submit new price to the list.
@@ -310,7 +310,7 @@ enum TransactionType {
 ///
 /// This greatly helps with error messages, as the ones inside the macro
 /// can sometimes be hard to debug.
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Chooses which transaction type to send.
 	///
 	/// This function serves mostly to showcase `StorageValue` helper
@@ -679,7 +679,7 @@ impl<T: Trait> Module<T> {
 }
 
 #[allow(deprecated)] // ValidateUnsigned
-impl<T: Trait> frame_support::unsigned::ValidateUnsigned for Module<T> {
+impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
 	type Call = Call<T>;
 
 	/// Validate unsigned call to this module.
diff --git a/frame/example-offchain-worker/src/tests.rs b/frame/example-offchain-worker/src/tests.rs
index 204b366964f4..809e3b7ba64a 100644
--- a/frame/example-offchain-worker/src/tests.rs
+++ b/frame/example-offchain-worker/src/tests.rs
@@ -56,7 +56,7 @@ parameter_types! {
 	pub const MaximumBlockLength: u32 = 2 * 1024;
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Call = ();
@@ -118,7 +118,7 @@ parameter_types! {
 	pub const UnsignedPriority: u64 = 1 << 20;
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type Event = ();
 	type AuthorityId = crypto::TestAuthId;
 	type Call = Call<Test>;
@@ -282,7 +282,7 @@ fn should_submit_unsigned_transaction_on_chain_for_any_account() {
 
 			let signature_valid = <PricePayload<
 				<Test as SigningTypes>::Public,
-				<Test as frame_system::Trait>::BlockNumber
+				<Test as frame_system::Config>::BlockNumber
 					> as SignedPayload<Test>>::verify::<crypto::TestAuthId>(&price_payload, signature);
 
 			assert!(signature_valid);
@@ -335,7 +335,7 @@ fn should_submit_unsigned_transaction_on_chain_for_all_accounts() {
 
 			let signature_valid = <PricePayload<
 				<Test as SigningTypes>::Public,
-				<Test as frame_system::Trait>::BlockNumber
+				<Test as frame_system::Config>::BlockNumber
 					> as SignedPayload<Test>>::verify::<crypto::TestAuthId>(&price_payload, signature);
 
 			assert!(signature_valid);
diff --git a/frame/example-parallel/src/lib.rs b/frame/example-parallel/src/lib.rs
index 4b7ce72b4d40..b616e3d49278 100644
--- a/frame/example-parallel/src/lib.rs
+++ b/frame/example-parallel/src/lib.rs
@@ -34,15 +34,15 @@ use sp_std::vec::Vec;
 #[cfg(test)]
 mod tests;
 
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The overarching event type.
-	type Event: From<Event> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event> + Into<<Self as frame_system::Config>::Event>;
 	/// The overarching dispatch call type.
 	type Call: From<Call<Self>>;
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as ExampleOffchainWorker {
+	trait Store for Module<T: Config> as ExampleOffchainWorker {
 		/// A vector of current participants
 		///
 		/// To enlist someone to participate, signed payload should be
@@ -87,7 +87,7 @@ impl EnlistedParticipant {
 
 decl_module! {
 	/// A public part of the pallet.
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		fn deposit_event() = default;
 
 		/// Get the new event running.
diff --git a/frame/example-parallel/src/tests.rs b/frame/example-parallel/src/tests.rs
index 1da8c6038826..d2c376400136 100644
--- a/frame/example-parallel/src/tests.rs
+++ b/frame/example-parallel/src/tests.rs
@@ -39,7 +39,7 @@ parameter_types! {
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
 
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Call = ();
@@ -73,7 +73,7 @@ parameter_types! {
 	pub const UnsignedPriority: u64 = 1 << 20;
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type Event = ();
 	type Call = Call<Test>;
 }
diff --git a/frame/example/src/lib.rs b/frame/example/src/lib.rs
index 103bcfe69686..fb84a48a8d2d 100644
--- a/frame/example/src/lib.rs
+++ b/frame/example/src/lib.rs
@@ -63,7 +63,7 @@
 //! // Include the following links that shows what trait needs to be implemented to use the pallet
 //! // and the supported dispatchables that are documented in the Call enum.
 //!
-//! - \[`<INSERT_CUSTOM_PALLET_NAME>::Trait`](./trait.Trait.html)
+//! - \[`<INSERT_CUSTOM_PALLET_NAME>::Config`](./trait.Config.html)
 //! - \[`Call`](./enum.Call.html)
 //! - \[`Module`](./struct.Module.html)
 //!
@@ -212,7 +212,7 @@
 //! \```rust
 //! use <INSERT_CUSTOM_PALLET_NAME>;
 //!
-//! pub trait Trait: <INSERT_CUSTOM_PALLET_NAME>::Trait { }
+//! pub trait Config: <INSERT_CUSTOM_PALLET_NAME>::Config { }
 //! \```
 //!
 //! \### Simple Code Snippet
@@ -286,9 +286,9 @@ use sp_runtime::{
 // - The final weight of each dispatch is calculated as the argument of the call multiplied by the
 //   parameter given to the `WeightForSetDummy`'s constructor.
 // - assigns a dispatch class `operational` if the argument of the call is more than 1000.
-struct WeightForSetDummy<T: pallet_balances::Trait>(BalanceOf<T>);
+struct WeightForSetDummy<T: pallet_balances::Config>(BalanceOf<T>);
 
-impl<T: pallet_balances::Trait> WeighData<(&BalanceOf<T>,)> for WeightForSetDummy<T>
+impl<T: pallet_balances::Config> WeighData<(&BalanceOf<T>,)> for WeightForSetDummy<T>
 {
 	fn weigh_data(&self, target: (&BalanceOf<T>,)) -> Weight {
 		let multiplier = self.0;
@@ -296,7 +296,7 @@ impl<T: pallet_balances::Trait> WeighData<(&BalanceOf<T>,)> for WeightForSetDumm
 	}
 }
 
-impl<T: pallet_balances::Trait> ClassifyDispatch<(&BalanceOf<T>,)> for WeightForSetDummy<T> {
+impl<T: pallet_balances::Config> ClassifyDispatch<(&BalanceOf<T>,)> for WeightForSetDummy<T> {
 	fn classify_dispatch(&self, target: (&BalanceOf<T>,)) -> DispatchClass {
 		if *target.0 > <BalanceOf<T>>::from(1000u32) {
 			DispatchClass::Operational
@@ -306,23 +306,23 @@ impl<T: pallet_balances::Trait> ClassifyDispatch<(&BalanceOf<T>,)> for WeightFor
 	}
 }
 
-impl<T: pallet_balances::Trait> PaysFee<(&BalanceOf<T>,)> for WeightForSetDummy<T> {
+impl<T: pallet_balances::Config> PaysFee<(&BalanceOf<T>,)> for WeightForSetDummy<T> {
 	fn pays_fee(&self, _target: (&BalanceOf<T>,)) -> Pays {
 		Pays::Yes
 	}
 }
 
 /// A type alias for the balance type from this pallet's point of view.
-type BalanceOf<T> = <T as pallet_balances::Trait>::Balance;
+type BalanceOf<T> = <T as pallet_balances::Config>::Balance;
 
 /// Our pallet's configuration trait. All our types and constants go in here. If the
 /// pallet is dependent on specific other pallets, then their configuration traits
 /// should be added to our implied traits list.
 ///
-/// `frame_system::Trait` should always be included in our implied traits.
-pub trait Trait: pallet_balances::Trait {
+/// `frame_system::Config` should always be included in our implied traits.
+pub trait Config: pallet_balances::Config {
 	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 }
 
 decl_storage! {
@@ -333,7 +333,7 @@ decl_storage! {
 	// It is important to update your storage name so that your pallet's
 	// storage items are isolated from other pallets.
 	// ---------------------------------vvvvvvv
-	trait Store for Module<T: Trait> as Example {
+	trait Store for Module<T: Config> as Example {
 		// Any storage declarations of the form:
 		//   `pub? Name get(fn getter_name)? [config()|config(myname)] [build(|_| {...})] : <type> (= <new_default_value>)?;`
 		// where `<type>` is either:
@@ -371,7 +371,7 @@ decl_event!(
 	/// Events are a simple means of reporting specific conditions and
 	/// circumstances that have happened that users, Dapps and/or chain explorers would find
 	/// interesting and otherwise difficult to detect.
-	pub enum Event<T> where B = <T as pallet_balances::Trait>::Balance {
+	pub enum Event<T> where B = <T as pallet_balances::Config>::Balance {
 		// Just a normal `enum`, here's a dummy event to ensure it compiles.
 		/// Dummy event, just here so there's a generic type that's used.
 		Dummy(B),
@@ -414,7 +414,7 @@ decl_event!(
 // `ensure_root` and `ensure_none`.
 decl_module! {
 	// Simple declaration of the `Module` type. Lets the macro know what its working on.
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		/// Deposit one of this pallet's events by using the default implementation.
 		/// It is also possible to provide a custom implementation.
 		/// For non-generic events, the generic parameter just needs to be dropped, so that it
@@ -548,7 +548,7 @@ decl_module! {
 // - Public interface. These are functions that are `pub` and generally fall into inspector
 // functions that do not write to storage and operation functions that do.
 // - Private functions. These are your usual private utilities unavailable to other pallets.
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	// Add public immutables and private mutables.
 	#[allow(dead_code)]
 	fn accumulate_foo(origin: T::Origin, increase_by: T::Balance) -> DispatchResult {
@@ -571,7 +571,7 @@ impl<T: Trait> Module<T> {
 // decodable type that implements `SignedExtension`. See the trait definition for the full list of
 // bounds. As a convention, you can follow this approach to create an extension for your pallet:
 //   - If the extension does not carry any data, then use a tuple struct with just a `marker`
-//     (needed for the compiler to accept `T: Trait`) will suffice.
+//     (needed for the compiler to accept `T: Config`) will suffice.
 //   - Otherwise, create a tuple struct which contains the external data. Of course, for the entire
 //     struct to be decodable, each individual item also needs to be decodable.
 //
@@ -602,21 +602,21 @@ impl<T: Trait> Module<T> {
 /// Additionally, it drops any transaction with an encoded length higher than 200 bytes. No
 /// particular reason why, just to demonstrate the power of signed extensions.
 #[derive(Encode, Decode, Clone, Eq, PartialEq)]
-pub struct WatchDummy<T: Trait + Send + Sync>(PhantomData<T>);
+pub struct WatchDummy<T: Config + Send + Sync>(PhantomData<T>);
 
-impl<T: Trait + Send + Sync> sp_std::fmt::Debug for WatchDummy<T> {
+impl<T: Config + Send + Sync> sp_std::fmt::Debug for WatchDummy<T> {
 	fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
 		write!(f, "WatchDummy")
 	}
 }
 
-impl<T: Trait + Send + Sync> SignedExtension for WatchDummy<T>
+impl<T: Config + Send + Sync> SignedExtension for WatchDummy<T>
 where
-	<T as frame_system::Trait>::Call: IsSubType<Call<T>>,
+	<T as frame_system::Config>::Call: IsSubType<Call<T>>,
 {
 	const IDENTIFIER: &'static str = "WatchDummy";
 	type AccountId = T::AccountId;
-	type Call = <T as frame_system::Trait>::Call;
+	type Call = <T as frame_system::Config>::Call;
 	type AdditionalSigned = ();
 	type Pre = ();
 
@@ -744,7 +744,7 @@ mod tests {
 		pub const MaximumBlockLength: u32 = 2 * 1024;
 		pub const AvailableBlockRatio: Perbill = Perbill::one();
 	}
-	impl frame_system::Trait for Test {
+	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
 		type Origin = Origin;
 		type Index = u64;
@@ -774,7 +774,7 @@ mod tests {
 	parameter_types! {
 		pub const ExistentialDeposit: u64 = 1;
 	}
-	impl pallet_balances::Trait for Test {
+	impl pallet_balances::Config for Test {
 		type MaxLocks = ();
 		type Balance = u64;
 		type DustRemoval = ();
@@ -783,7 +783,7 @@ mod tests {
 		type AccountStore = System;
 		type WeightInfo = ();
 	}
-	impl Trait for Test {
+	impl Config for Test {
 		type Event = ();
 	}
 	type System = frame_system::Module<Test>;
diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index ccb5c2d26287..c91287df5b90 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -145,7 +145,7 @@ pub type OriginOf<E, C> = <CallOf<E, C> as Dispatchable>::Origin;
 /// Main entry point for certain runtime actions as e.g. `execute_block`.
 ///
 /// Generic parameters:
-/// - `System`: Something that implements `frame_system::Trait`
+/// - `System`: Something that implements `frame_system::Config`
 /// - `Block`: The block type of the runtime
 /// - `Context`: The context that is used when checking an extrinsic.
 /// - `UnsignedValidator`: The unsigned transaction validator of the runtime.
@@ -158,7 +158,7 @@ pub struct Executive<System, Block, Context, UnsignedValidator, AllModules, OnRu
 );
 
 impl<
-	System: frame_system::Trait,
+	System: frame_system::Config,
 	Block: traits::Block<Header=System::Header, Hash=System::Hash>,
 	Context: Default,
 	UnsignedValidator,
@@ -185,7 +185,7 @@ where
 }
 
 impl<
-	System: frame_system::Trait,
+	System: frame_system::Config,
 	Block: traits::Block<Header=System::Header, Hash=System::Hash>,
 	Context: Default,
 	UnsignedValidator,
@@ -505,10 +505,10 @@ mod tests {
 			UnknownTransaction, TransactionSource, TransactionValidity
 		};
 
-		pub trait Trait: frame_system::Trait {}
+		pub trait Config: frame_system::Config {}
 
 		frame_support::decl_module! {
-			pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+			pub struct Module<T: Config> for enum Call where origin: T::Origin {
 				#[weight = 100]
 				fn some_function(origin) {
 					// NOTE: does not make any different.
@@ -555,7 +555,7 @@ mod tests {
 			}
 		}
 
-		impl<T: Trait> sp_runtime::traits::ValidateUnsigned for Module<T> {
+		impl<T: Config> sp_runtime::traits::ValidateUnsigned for Module<T> {
 			type Call = Call<T>;
 
 			fn validate_unsigned(
@@ -594,7 +594,7 @@ mod tests {
 			write: 100,
 		};
 	}
-	impl frame_system::Trait for Runtime {
+	impl frame_system::Config for Runtime {
 		type BaseCallFilter = ();
 		type Origin = Origin;
 		type Index = u64;
@@ -626,7 +626,7 @@ mod tests {
 	parameter_types! {
 		pub const ExistentialDeposit: Balance = 1;
 	}
-	impl pallet_balances::Trait for Runtime {
+	impl pallet_balances::Config for Runtime {
 		type Balance = Balance;
 		type Event = Event;
 		type DustRemoval = ();
@@ -639,13 +639,13 @@ mod tests {
 	parameter_types! {
 		pub const TransactionByteFee: Balance = 0;
 	}
-	impl pallet_transaction_payment::Trait for Runtime {
+	impl pallet_transaction_payment::Config for Runtime {
 		type OnChargeTransaction = CurrencyAdapter<Balances, ()>;
 		type TransactionByteFee = TransactionByteFee;
 		type WeightToFee = IdentityFee<Balance>;
 		type FeeMultiplierUpdate = ();
 	}
-	impl custom::Trait for Runtime {}
+	impl custom::Config for Runtime {}
 
 	pub struct RuntimeVersion;
 	impl frame_support::traits::Get<sp_version::RuntimeVersion> for RuntimeVersion {
@@ -668,8 +668,8 @@ mod tests {
 	type TestXt = sp_runtime::testing::TestXt<Call, SignedExtra>;
 	type TestBlock = Block<TestXt>;
 	type TestUncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<
-		<Runtime as frame_system::Trait>::AccountId,
-		<Runtime as frame_system::Trait>::Call,
+		<Runtime as frame_system::Config>::AccountId,
+		<Runtime as frame_system::Config>::Call,
 		(),
 		SignedExtra,
 	>;
@@ -715,9 +715,9 @@ mod tests {
 			balances: vec![(1, 211)],
 		}.assimilate_storage(&mut t).unwrap();
 		let xt = TestXt::new(Call::Balances(BalancesCall::transfer(2, 69)), sign_extra(1, 0, 0));
-		let weight = xt.get_dispatch_info().weight + <Runtime as frame_system::Trait>::ExtrinsicBaseWeight::get();
+		let weight = xt.get_dispatch_info().weight + <Runtime as frame_system::Config>::ExtrinsicBaseWeight::get();
 		let fee: Balance
-			= <Runtime as pallet_transaction_payment::Trait>::WeightToFee::calc(&weight);
+			= <Runtime as pallet_transaction_payment::Config>::WeightToFee::calc(&weight);
 		let mut t = sp_io::TestExternalities::new(t);
 		t.execute_with(|| {
 			Executive::initialize_block(&Header::new(
@@ -818,7 +818,7 @@ mod tests {
 		let encoded = xt.encode();
 		let encoded_len = encoded.len() as Weight;
 		// on_initialize weight + block execution weight
-		let base_block_weight = 175 + <Runtime as frame_system::Trait>::BlockExecutionWeight::get();
+		let base_block_weight = 175 + <Runtime as frame_system::Config>::BlockExecutionWeight::get();
 		let limit = AvailableBlockRatio::get() * MaximumBlockWeight::get() - base_block_weight;
 		let num_to_exhaust_block = limit / (encoded_len + 5);
 		t.execute_with(|| {
@@ -861,7 +861,7 @@ mod tests {
 		let mut t = new_test_ext(1);
 		t.execute_with(|| {
 			// Block execution weight + on_initialize weight from custom module
-			let base_block_weight = 175 + <Runtime as frame_system::Trait>::BlockExecutionWeight::get();
+			let base_block_weight = 175 + <Runtime as frame_system::Config>::BlockExecutionWeight::get();
 
 			Executive::initialize_block(&Header::new(
 				1,
@@ -879,7 +879,7 @@ mod tests {
 			assert!(Executive::apply_extrinsic(x2.clone()).unwrap().is_ok());
 
 			// default weight for `TestXt` == encoded length.
-			let extrinsic_weight = len as Weight + <Runtime as frame_system::Trait>::ExtrinsicBaseWeight::get();
+			let extrinsic_weight = len as Weight + <Runtime as frame_system::Config>::ExtrinsicBaseWeight::get();
 			assert_eq!(
 				<frame_system::Module<Runtime>>::block_weight().total(),
 				base_block_weight + 3 * extrinsic_weight,
@@ -946,9 +946,9 @@ mod tests {
 					sign_extra(1, 0, 0),
 				);
 				let weight = xt.get_dispatch_info().weight
-					+ <Runtime as frame_system::Trait>::ExtrinsicBaseWeight::get();
+					+ <Runtime as frame_system::Config>::ExtrinsicBaseWeight::get();
 				let fee: Balance =
-					<Runtime as pallet_transaction_payment::Trait>::WeightToFee::calc(&weight);
+					<Runtime as pallet_transaction_payment::Config>::WeightToFee::calc(&weight);
 				Executive::initialize_block(&Header::new(
 					1,
 					H256::default(),
@@ -1106,7 +1106,7 @@ mod tests {
 			let runtime_upgrade_weight = <AllModules as OnRuntimeUpgrade>::on_runtime_upgrade();
 			let frame_system_on_initialize_weight = frame_system::Module::<Runtime>::on_initialize(block_number);
 			let on_initialize_weight = <AllModules as OnInitialize<u64>>::on_initialize(block_number);
-			let base_block_weight = <Runtime as frame_system::Trait>::BlockExecutionWeight::get();
+			let base_block_weight = <Runtime as frame_system::Config>::BlockExecutionWeight::get();
 
 			// Weights are recorded correctly
 			assert_eq!(
diff --git a/frame/grandpa/src/equivocation.rs b/frame/grandpa/src/equivocation.rs
index e9662a726c40..72f1434b24a9 100644
--- a/frame/grandpa/src/equivocation.rs
+++ b/frame/grandpa/src/equivocation.rs
@@ -54,13 +54,13 @@ use sp_staking::{
 	SessionIndex,
 };
 
-use super::{Call, Module, Trait};
+use super::{Call, Module, Config};
 
 /// A trait with utility methods for handling equivocation reports in GRANDPA.
 /// The offence type is generic, and the trait provides , reporting an offence
 /// triggered by a valid equivocation report, and also for creating and
 /// submitting equivocation report extrinsics (useful only in offchain context).
-pub trait HandleEquivocation<T: Trait> {
+pub trait HandleEquivocation<T: Config> {
 	/// The offence type used for reporting offences on valid equivocation reports.
 	type Offence: GrandpaOffence<T::KeyOwnerIdentification>;
 
@@ -86,7 +86,7 @@ pub trait HandleEquivocation<T: Trait> {
 	fn block_author() -> Option<T::AccountId>;
 }
 
-impl<T: Trait> HandleEquivocation<T> for () {
+impl<T: Config> HandleEquivocation<T> for () {
 	type Offence = GrandpaEquivocationOffence<T::KeyOwnerIdentification>;
 
 	fn report_offence(
@@ -136,7 +136,7 @@ where
 	// We use the authorship pallet to fetch the current block author and use
 	// `offchain::SendTransactionTypes` for unsigned extrinsic creation and
 	// submission.
-	T: Trait + pallet_authorship::Trait + frame_system::offchain::SendTransactionTypes<Call<T>>,
+	T: Config + pallet_authorship::Config + frame_system::offchain::SendTransactionTypes<Call<T>>,
 	// A system for reporting offences after valid equivocation reports are
 	// processed.
 	R: ReportOffence<T::AccountId, T::KeyOwnerIdentification, O>,
@@ -187,7 +187,7 @@ pub struct GrandpaTimeSlot {
 /// A `ValidateUnsigned` implementation that restricts calls to `report_equivocation_unsigned`
 /// to local calls (i.e. extrinsics generated on this node) or that already in a block. This
 /// guarantees that only block authors can include unsigned equivocation reports.
-impl<T: Trait> frame_support::unsigned::ValidateUnsigned for Module<T> {
+impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
 	type Call = Call<T>;
 	fn validate_unsigned(source: TransactionSource, call: &Self::Call) -> TransactionValidity {
 		if let Call::report_equivocation_unsigned(equivocation_proof, _) = call {
diff --git a/frame/grandpa/src/lib.rs b/frame/grandpa/src/lib.rs
index fe836ac913cb..15099672d0d2 100644
--- a/frame/grandpa/src/lib.rs
+++ b/frame/grandpa/src/lib.rs
@@ -67,9 +67,9 @@ pub use equivocation::{
 	HandleEquivocation,
 };
 
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The event type of this module.
-	type Event: From<Event> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event> + Into<<Self as frame_system::Config>::Event>;
 
 	/// The function call.
 	type Call: From<Call<Self>>;
@@ -188,7 +188,7 @@ decl_event! {
 }
 
 decl_error! {
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Attempt to signal GRANDPA pause when the authority set isn't live
 		/// (either paused or already pending pause).
 		PauseFailed,
@@ -209,7 +209,7 @@ decl_error! {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as GrandpaFinality {
+	trait Store for Module<T: Config> as GrandpaFinality {
 		/// State of the current authority set.
 		State get(fn state): StoredState<T::BlockNumber> = StoredState::Live;
 
@@ -241,7 +241,7 @@ decl_storage! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		type Error = Error<T>;
 
 		fn deposit_event() = default;
@@ -372,7 +372,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Get the current set of authorities, along with their respective weights.
 	pub fn grandpa_authorities() -> AuthorityList {
 		storage::unhashed::get_or_default::<VersionedAuthorityList>(GRANDPA_AUTHORITIES_KEY).into()
@@ -583,12 +583,12 @@ impl<T: Trait> Module<T> {
 	}
 }
 
-impl<T: Trait> sp_runtime::BoundToRuntimeAppPublic for Module<T> {
+impl<T: Config> sp_runtime::BoundToRuntimeAppPublic for Module<T> {
 	type Public = AuthorityId;
 }
 
-impl<T: Trait> pallet_session::OneSessionHandler<T::AccountId> for Module<T>
-	where T: pallet_session::Trait
+impl<T: Config> pallet_session::OneSessionHandler<T::AccountId> for Module<T>
+	where T: pallet_session::Config
 {
 	type Key = AuthorityId;
 
diff --git a/frame/grandpa/src/mock.rs b/frame/grandpa/src/mock.rs
index d3461eec12dc..fd731c9cda3d 100644
--- a/frame/grandpa/src/mock.rs
+++ b/frame/grandpa/src/mock.rs
@@ -19,7 +19,7 @@
 
 #![cfg(test)]
 
-use crate::{AuthorityId, AuthorityList, ConsensusLog, Module, Trait};
+use crate::{AuthorityId, AuthorityList, ConsensusLog, Module, Config};
 use ::grandpa as finality_grandpa;
 use codec::Encode;
 use frame_support::{
@@ -79,7 +79,7 @@ parameter_types! {
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
 
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = u64;
@@ -122,7 +122,7 @@ parameter_types! {
 }
 
 /// Custom `SessionHandler` since we use `TestSessionKeys` as `Keys`.
-impl pallet_session::Trait for Test {
+impl pallet_session::Config for Test {
 	type Event = TestEvent;
 	type ValidatorId = u64;
 	type ValidatorIdOf = pallet_staking::StashOf<Self>;
@@ -135,7 +135,7 @@ impl pallet_session::Trait for Test {
 	type WeightInfo = ();
 }
 
-impl pallet_session::historical::Trait for Test {
+impl pallet_session::historical::Config for Test {
 	type FullIdentification = pallet_staking::Exposure<u64, u128>;
 	type FullIdentificationOf = pallet_staking::ExposureOf<Self>;
 }
@@ -144,7 +144,7 @@ parameter_types! {
 	pub const UncleGenerations: u64 = 0;
 }
 
-impl pallet_authorship::Trait for Test {
+impl pallet_authorship::Config for Test {
 	type FindAuthor = ();
 	type UncleGenerations = UncleGenerations;
 	type FilterUncle = ();
@@ -155,7 +155,7 @@ parameter_types! {
 	pub const ExistentialDeposit: u128 = 1;
 }
 
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u128;
 	type DustRemoval = ();
@@ -169,7 +169,7 @@ parameter_types! {
 	pub const MinimumPeriod: u64 = 3;
 }
 
-impl pallet_timestamp::Trait for Test {
+impl pallet_timestamp::Config for Test {
 	type Moment = u64;
 	type OnTimestampSet = ();
 	type MinimumPeriod = MinimumPeriod;
@@ -198,7 +198,7 @@ parameter_types! {
 	pub const StakingUnsignedPriority: u64 = u64::max_value() / 2;
 }
 
-impl pallet_staking::Trait for Test {
+impl pallet_staking::Config for Test {
 	type RewardRemainder = ();
 	type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote;
 	type Event = TestEvent;
@@ -227,14 +227,14 @@ parameter_types! {
 	pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * MaximumBlockWeight::get();
 }
 
-impl pallet_offences::Trait for Test {
+impl pallet_offences::Config for Test {
 	type Event = TestEvent;
 	type IdentificationTuple = pallet_session::historical::IdentificationTuple<Self>;
 	type OnOffenceHandler = Staking;
 	type WeightSoftLimit = OffencesWeightSoftLimit;
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type Event = TestEvent;
 	type Call = Call;
 
diff --git a/frame/grandpa/src/tests.rs b/frame/grandpa/src/tests.rs
index 4916808fe000..4963d7e6b6d4 100644
--- a/frame/grandpa/src/tests.rs
+++ b/frame/grandpa/src/tests.rs
@@ -850,7 +850,7 @@ fn report_equivocation_has_valid_weight() {
 	// but there's a lower bound of 100 validators.
 	assert!(
 		(1..=100)
-			.map(<Test as Trait>::WeightInfo::report_equivocation)
+			.map(<Test as Config>::WeightInfo::report_equivocation)
 			.collect::<Vec<_>>()
 			.windows(2)
 			.all(|w| w[0] == w[1])
@@ -860,7 +860,7 @@ fn report_equivocation_has_valid_weight() {
 	// with every extra validator.
 	assert!(
 		(100..=1000)
-			.map(<Test as Trait>::WeightInfo::report_equivocation)
+			.map(<Test as Config>::WeightInfo::report_equivocation)
 			.collect::<Vec<_>>()
 			.windows(2)
 			.all(|w| w[0] < w[1])
diff --git a/frame/identity/src/benchmarking.rs b/frame/identity/src/benchmarking.rs
index d7876514452e..0176986c8224 100644
--- a/frame/identity/src/benchmarking.rs
+++ b/frame/identity/src/benchmarking.rs
@@ -29,16 +29,16 @@ use crate::Module as Identity;
 
 const SEED: u32 = 0;
 
-fn assert_last_event<T: Trait>(generic_event: <T as Trait>::Event) {
+fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
 	let events = frame_system::Module::<T>::events();
-	let system_event: <T as frame_system::Trait>::Event = generic_event.into();
+	let system_event: <T as frame_system::Config>::Event = generic_event.into();
 	// compare to the last event record
 	let EventRecord { event, .. } = &events[events.len() - 1];
 	assert_eq!(event, &system_event);
 }
 
 // Adds `r` registrars to the Identity Pallet. These registrars will have set fees and fields.
-fn add_registrars<T: Trait>(r: u32) -> Result<(), &'static str> {
+fn add_registrars<T: Config>(r: u32) -> Result<(), &'static str> {
 	for i in 0..r {
 		let registrar: T::AccountId = account("registrar", i, SEED);
 		let _ = T::Currency::make_free_balance_be(&registrar, BalanceOf::<T>::max_value());
@@ -57,7 +57,7 @@ fn add_registrars<T: Trait>(r: u32) -> Result<(), &'static str> {
 
 // Create `s` sub-accounts for the identity of `who` and return them.
 // Each will have 32 bytes of raw data added to it.
-fn create_sub_accounts<T: Trait>(who: &T::AccountId, s: u32) -> Result<Vec<(T::AccountId, Data)>, &'static str> {
+fn create_sub_accounts<T: Config>(who: &T::AccountId, s: u32) -> Result<Vec<(T::AccountId, Data)>, &'static str> {
 	let mut subs = Vec::new();
 	let who_origin = RawOrigin::Signed(who.clone());
 	let data = Data::Raw(vec![0; 32]);
@@ -77,7 +77,7 @@ fn create_sub_accounts<T: Trait>(who: &T::AccountId, s: u32) -> Result<Vec<(T::A
 
 // Adds `s` sub-accounts to the identity of `who`. Each will have 32 bytes of raw data added to it.
 // This additionally returns the vector of sub-accounts so it can be modified if needed.
-fn add_sub_accounts<T: Trait>(who: &T::AccountId, s: u32) -> Result<Vec<(T::AccountId, Data)>, &'static str> {
+fn add_sub_accounts<T: Config>(who: &T::AccountId, s: u32) -> Result<Vec<(T::AccountId, Data)>, &'static str> {
 	let who_origin = RawOrigin::Signed(who.clone());
 	let subs = create_sub_accounts::<T>(who, s)?;
 
@@ -88,7 +88,7 @@ fn add_sub_accounts<T: Trait>(who: &T::AccountId, s: u32) -> Result<Vec<(T::Acco
 
 // This creates an `IdentityInfo` object with `num_fields` extra fields.
 // All data is pre-populated with some arbitrary bytes.
-fn create_identity_info<T: Trait>(num_fields: u32) -> IdentityInfo {
+fn create_identity_info<T: Config>(num_fields: u32) -> IdentityInfo {
 	let data = Data::Raw(vec![0; 32]);
 
 	let info = IdentityInfo {
@@ -121,7 +121,7 @@ benchmarks! {
 			// Create their main identity with x additional fields
 			let info = create_identity_info::<T>(x);
 			let caller: T::AccountId = whitelisted_caller();
-			let caller_origin = <T as frame_system::Trait>::Origin::from(RawOrigin::Signed(caller));
+			let caller_origin = <T as frame_system::Config>::Origin::from(RawOrigin::Signed(caller));
 			Identity::<T>::set_identity(caller_origin, info)?;
 		};
 	}
@@ -143,7 +143,7 @@ benchmarks! {
 			// The target user
 			let caller: T::AccountId = whitelisted_caller();
 			let caller_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(caller.clone());
-			let caller_origin: <T as frame_system::Trait>::Origin = RawOrigin::Signed(caller.clone()).into();
+			let caller_origin: <T as frame_system::Config>::Origin = RawOrigin::Signed(caller.clone()).into();
 			let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 
 			// Add an initial identity
@@ -200,7 +200,7 @@ benchmarks! {
 
 	clear_identity {
 		let caller: T::AccountId = whitelisted_caller();
-		let caller_origin = <T as frame_system::Trait>::Origin::from(RawOrigin::Signed(caller.clone()));
+		let caller_origin = <T as frame_system::Config>::Origin::from(RawOrigin::Signed(caller.clone()));
 		let caller_lookup = <T::Lookup as StaticLookup>::unlookup(caller.clone());
 		let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 
@@ -237,7 +237,7 @@ benchmarks! {
 
 	cancel_request {
 		let caller: T::AccountId = whitelisted_caller();
-		let caller_origin = <T as frame_system::Trait>::Origin::from(RawOrigin::Signed(caller.clone()));
+		let caller_origin = <T as frame_system::Config>::Origin::from(RawOrigin::Signed(caller.clone()));
 		let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 
 		let r in ...;
@@ -300,7 +300,7 @@ benchmarks! {
 	provide_judgement {
 		// The user
 		let user: T::AccountId = account("user", r, SEED);
-		let user_origin = <T as frame_system::Trait>::Origin::from(RawOrigin::Signed(user.clone()));
+		let user_origin = <T as frame_system::Config>::Origin::from(RawOrigin::Signed(user.clone()));
 		let user_lookup = <T::Lookup as StaticLookup>::unlookup(user.clone());
 		let _ = T::Currency::make_free_balance_be(&user, BalanceOf::<T>::max_value());
 
@@ -328,7 +328,7 @@ benchmarks! {
 		let x in _ .. _ => {};
 
 		let target: T::AccountId = account("target", 0, SEED);
-		let target_origin: <T as frame_system::Trait>::Origin = RawOrigin::Signed(target.clone()).into();
+		let target_origin: <T as frame_system::Config>::Origin = RawOrigin::Signed(target.clone()).into();
 		let target_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(target.clone());
 		let _ = T::Currency::make_free_balance_be(&target, BalanceOf::<T>::max_value());
 
diff --git a/frame/identity/src/lib.rs b/frame/identity/src/lib.rs
index 0ee6563a5611..c0afffc0524c 100644
--- a/frame/identity/src/lib.rs
+++ b/frame/identity/src/lib.rs
@@ -17,7 +17,7 @@
 
 //! # Identity Module
 //!
-//! - [`identity::Trait`](./trait.Trait.html)
+//! - [`identity::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //!
 //! ## Overview
@@ -68,7 +68,7 @@
 //! * `kill_identity` - Forcibly remove the associated identity; the deposit is lost.
 //!
 //! [`Call`]: ./enum.Call.html
-//! [`Trait`]: ./trait.Trait.html
+//! [`Config`]: ./trait.Config.html
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
@@ -91,12 +91,12 @@ use frame_support::{
 use frame_system::ensure_signed;
 pub use weights::WeightInfo;
 
-type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
-type NegativeImbalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::NegativeImbalance;
+type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
 
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// The currency trait.
 	type Currency: ReservableCurrency<Self::AccountId>;
@@ -399,7 +399,7 @@ pub struct RegistrarInfo<
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Identity {
+	trait Store for Module<T: Config> as Identity {
 		/// Information that is pertinent to identify the entity behind an account.
 		///
 		/// TWOX-NOTE: OK ― `AccountId` is a secure hash.
@@ -428,7 +428,7 @@ decl_storage! {
 }
 
 decl_event!(
-	pub enum Event<T> where AccountId = <T as frame_system::Trait>::AccountId, Balance = BalanceOf<T> {
+	pub enum Event<T> where AccountId = <T as frame_system::Config>::AccountId, Balance = BalanceOf<T> {
 		/// A name was set or reset (which will remove all judgements). \[who\]
 		IdentitySet(AccountId),
 		/// A name was cleared, and the given balance returned. \[who, deposit\]
@@ -456,7 +456,7 @@ decl_event!(
 
 decl_error! {
 	/// Error for the identity module.
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Too many subs-accounts.
 		TooManySubAccounts,
 		/// Account isn't found.
@@ -494,7 +494,7 @@ decl_error! {
 
 decl_module! {
 	/// Identity module declaration.
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		/// The amount held on deposit for a registered identity.
 		const BasicDeposit: BalanceOf<T> = T::BasicDeposit::get();
 
@@ -1125,7 +1125,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Get the subs of an account.
 	pub fn subs(who: &T::AccountId) -> Vec<(T::AccountId, Data)> {
 		SubsOf::<T>::get(who).1
diff --git a/frame/identity/src/tests.rs b/frame/identity/src/tests.rs
index 0637ac6aafc5..aefce1f8ff6f 100644
--- a/frame/identity/src/tests.rs
+++ b/frame/identity/src/tests.rs
@@ -42,7 +42,7 @@ parameter_types! {
 	pub const MaximumBlockLength: u32 = 2 * 1024;
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = u64;
@@ -72,7 +72,7 @@ impl frame_system::Trait for Test {
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
 }
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type Balance = u64;
 	type Event = ();
 	type DustRemoval = ();
@@ -103,7 +103,7 @@ type EnsureTwoOrRoot = EnsureOneOf<
 	EnsureRoot<u64>,
 	EnsureSignedBy<Two, u64>
 >;
-impl Trait for Test {
+impl Config for Test {
 	type Event = ();
 	type Currency = Balances;
 	type Slashed = ();
diff --git a/frame/identity/src/weights.rs b/frame/identity/src/weights.rs
index 44efbb31035e..431a26cc0960 100644
--- a/frame/identity/src/weights.rs
+++ b/frame/identity/src/weights.rs
@@ -64,7 +64,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_identity using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn add_registrar(r: u32, ) -> Weight {
 		(28_965_000 as Weight)
 			.saturating_add((421_000 as Weight).saturating_mul(r as Weight))
diff --git a/frame/im-online/src/benchmarking.rs b/frame/im-online/src/benchmarking.rs
index b92be023ce48..452a9f26ed7d 100644
--- a/frame/im-online/src/benchmarking.rs
+++ b/frame/im-online/src/benchmarking.rs
@@ -34,7 +34,7 @@ use crate::Module as ImOnline;
 const MAX_KEYS: u32 = 1000;
 const MAX_EXTERNAL_ADDRESSES: u32 = 100;
 
-pub fn create_heartbeat<T: Trait>(k: u32, e: u32) ->
+pub fn create_heartbeat<T: Config>(k: u32, e: u32) ->
 	Result<(crate::Heartbeat<T::BlockNumber>, <T::AuthorityId as RuntimeAppPublic>::Signature), &'static str>
 {
 	let mut keys = Vec::new();
diff --git a/frame/im-online/src/lib.rs b/frame/im-online/src/lib.rs
index 2d3693d12720..09cb2afa22be 100644
--- a/frame/im-online/src/lib.rs
+++ b/frame/im-online/src/lib.rs
@@ -30,7 +30,7 @@
 //! as the [NetworkState](../../client/offchain/struct.NetworkState.html).
 //! It is submitted as an Unsigned Transaction via off-chain workers.
 //!
-//! - [`im_online::Trait`](./trait.Trait.html)
+//! - [`im_online::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //! - [`Module`](./struct.Module.html)
 //!
@@ -47,10 +47,10 @@
 //! use frame_system::ensure_signed;
 //! use pallet_im_online::{self as im_online};
 //!
-//! pub trait Trait: im_online::Trait {}
+//! pub trait Config: im_online::Config {}
 //!
 //! decl_module! {
-//! 	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+//! 	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 //! 		#[weight = 0]
 //! 		pub fn is_online(origin, authority_index: u32) -> dispatch::DispatchResult {
 //! 			let _sender = ensure_signed(origin)?;
@@ -227,12 +227,12 @@ pub struct Heartbeat<BlockNumber>
 	pub validators_len: u32,
 }
 
-pub trait Trait: SendTransactionTypes<Call<Self>> + pallet_session::historical::Trait {
+pub trait Config: SendTransactionTypes<Call<Self>> + pallet_session::historical::Config {
 	/// The identifier type for an authority.
 	type AuthorityId: Member + Parameter + RuntimeAppPublic + Default + Ord;
 
 	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// An expected duration of the session.
 	///
@@ -262,7 +262,7 @@ pub trait Trait: SendTransactionTypes<Call<Self>> + pallet_session::historical::
 
 decl_event!(
 	pub enum Event<T> where
-		<T as Trait>::AuthorityId,
+		<T as Config>::AuthorityId,
 		IdentificationTuple = IdentificationTuple<T>,
 	{
 		/// A new heartbeat was received from `AuthorityId` \[authority_id\]
@@ -275,7 +275,7 @@ decl_event!(
 );
 
 decl_storage! {
-	trait Store for Module<T: Trait> as ImOnline {
+	trait Store for Module<T: Config> as ImOnline {
 		/// The block number after which it's ok to send heartbeats in current session.
 		///
 		/// At the beginning of each session we set this to a value that should
@@ -307,7 +307,7 @@ decl_storage! {
 
 decl_error! {
 	/// Error for the im-online module.
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Non existent public key.
 		InvalidKey,
 		/// Duplicated heartbeat.
@@ -316,7 +316,7 @@ decl_error! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		type Error = Error<T>;
 
 		fn deposit_event() = default;
@@ -332,7 +332,7 @@ decl_module! {
 		/// # </weight>
 		// NOTE: the weight includes the cost of validate_unsigned as it is part of the cost to
 		// import block with such an extrinsic.
-		#[weight = <T as Trait>::WeightInfo::validate_unsigned_and_then_heartbeat(
+		#[weight = <T as Config>::WeightInfo::validate_unsigned_and_then_heartbeat(
 			heartbeat.validators_len as u32,
 			heartbeat.network_state.external_addresses.len() as u32,
 		)]
@@ -393,11 +393,11 @@ decl_module! {
 	}
 }
 
-type OffchainResult<T, A> = Result<A, OffchainErr<<T as frame_system::Trait>::BlockNumber>>;
+type OffchainResult<T, A> = Result<A, OffchainErr<<T as frame_system::Config>::BlockNumber>>;
 
 /// Keep track of number of authored blocks per authority, uncles are counted as
 /// well since they're a valid proof of being online.
-impl<T: Trait + pallet_authorship::Trait> pallet_authorship::EventHandler<T::ValidatorId, T::BlockNumber> for Module<T> {
+impl<T: Config + pallet_authorship::Config> pallet_authorship::EventHandler<T::ValidatorId, T::BlockNumber> for Module<T> {
 	fn note_author(author: T::ValidatorId) {
 		Self::note_authorship(author);
 	}
@@ -407,7 +407,7 @@ impl<T: Trait + pallet_authorship::Trait> pallet_authorship::EventHandler<T::Val
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Returns `true` if a heartbeat has been received for the authority at
 	/// `authority_index` in the authorities series or if the authority has
 	/// authored at least one block, during the current session. Otherwise
@@ -610,11 +610,11 @@ impl<T: Trait> Module<T> {
 	}
 }
 
-impl<T: Trait> sp_runtime::BoundToRuntimeAppPublic for Module<T> {
+impl<T: Config> sp_runtime::BoundToRuntimeAppPublic for Module<T> {
 	type Public = T::AuthorityId;
 }
 
-impl<T: Trait> pallet_session::OneSessionHandler<T::AccountId> for Module<T> {
+impl<T: Config> pallet_session::OneSessionHandler<T::AccountId> for Module<T> {
 	type Key = T::AuthorityId;
 
 	fn on_genesis_session<'a, I: 'a>(validators: I)
@@ -677,7 +677,7 @@ impl<T: Trait> pallet_session::OneSessionHandler<T::AccountId> for Module<T> {
 /// Invalid transaction custom error. Returned when validators_len field in heartbeat is incorrect.
 const INVALID_VALIDATORS_LEN: u8 = 10;
 
-impl<T: Trait> frame_support::unsigned::ValidateUnsigned for Module<T> {
+impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
 	type Call = Call<T>;
 
 	fn validate_unsigned(
diff --git a/frame/im-online/src/mock.rs b/frame/im-online/src/mock.rs
index dae4bb3447e5..9a049a471881 100644
--- a/frame/im-online/src/mock.rs
+++ b/frame/im-online/src/mock.rs
@@ -21,7 +21,7 @@
 
 use std::cell::RefCell;
 
-use crate::{Module, Trait};
+use crate::{Module, Config};
 use sp_runtime::Perbill;
 use sp_staking::{SessionIndex, offence::{ReportOffence, OffenceError}};
 use sp_runtime::testing::{Header, UintAuthorityId, TestXt};
@@ -109,7 +109,7 @@ parameter_types! {
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
 
-impl frame_system::Trait for Runtime {
+impl frame_system::Config for Runtime {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = u64;
@@ -146,7 +146,7 @@ parameter_types! {
 	pub const DisabledValidatorsThreshold: Perbill = Perbill::from_percent(33);
 }
 
-impl pallet_session::Trait for Runtime {
+impl pallet_session::Config for Runtime {
 	type ShouldEndSession = pallet_session::PeriodicSessions<Period, Offset>;
 	type SessionManager = pallet_session::historical::NoteHistoricalRoot<Runtime, TestSessionManager>;
 	type SessionHandler = (ImOnline, );
@@ -159,7 +159,7 @@ impl pallet_session::Trait for Runtime {
 	type WeightInfo = ();
 }
 
-impl pallet_session::historical::Trait for Runtime {
+impl pallet_session::historical::Config for Runtime {
 	type FullIdentification = u64;
 	type FullIdentificationOf = ConvertInto;
 }
@@ -168,7 +168,7 @@ parameter_types! {
 	pub const UncleGenerations: u32 = 5;
 }
 
-impl pallet_authorship::Trait for Runtime {
+impl pallet_authorship::Config for Runtime {
 	type FindAuthor = ();
 	type UncleGenerations = UncleGenerations;
 	type FilterUncle = ();
@@ -179,7 +179,7 @@ parameter_types! {
 	pub const UnsignedPriority: u64 = 1 << 20;
 }
 
-impl Trait for Runtime {
+impl Config for Runtime {
 	type AuthorityId = UintAuthorityId;
 	type Event = ();
 	type ReportUnresponsiveness = OffenceHandler;
diff --git a/frame/im-online/src/weights.rs b/frame/im-online/src/weights.rs
index f9df679bd2be..c0f11c69c4b2 100644
--- a/frame/im-online/src/weights.rs
+++ b/frame/im-online/src/weights.rs
@@ -49,7 +49,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_im_online using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn validate_unsigned_and_then_heartbeat(k: u32, e: u32, ) -> Weight {
 		(114_379_000 as Weight)
 			.saturating_add((219_000 as Weight).saturating_mul(k as Weight))
diff --git a/frame/indices/src/lib.rs b/frame/indices/src/lib.rs
index 6d467aa67344..18eb54498481 100644
--- a/frame/indices/src/lib.rs
+++ b/frame/indices/src/lib.rs
@@ -37,10 +37,10 @@ use frame_support::traits::{Currency, ReservableCurrency, Get, BalanceStatus::Re
 use frame_system::{ensure_signed, ensure_root};
 pub use weights::WeightInfo;
 
-type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
+type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 
 /// The module's config trait.
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// Type used for storing an account's index; implies the maximum number of accounts the system
 	/// can hold.
 	type AccountIndex: Parameter + Member + Codec + Default + AtLeast32Bit + Copy;
@@ -52,14 +52,14 @@ pub trait Trait: frame_system::Trait {
 	type Deposit: Get<BalanceOf<Self>>;
 
 	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// Weight information for extrinsics in this pallet.
 	type WeightInfo: WeightInfo;
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Indices {
+	trait Store for Module<T: Config> as Indices {
 		/// The lookup from index to account.
 		pub Accounts build(|config: &GenesisConfig<T>|
 			config.indices.iter()
@@ -75,8 +75,8 @@ decl_storage! {
 
 decl_event!(
 	pub enum Event<T> where
-		<T as frame_system::Trait>::AccountId,
-		<T as Trait>::AccountIndex
+		<T as frame_system::Config>::AccountId,
+		<T as Config>::AccountIndex
 	{
 		/// A account index was assigned. \[index, who\]
 		IndexAssigned(AccountId, AccountIndex),
@@ -88,7 +88,7 @@ decl_event!(
 );
 
 decl_error! {
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// The index was not already assigned.
 		NotAssigned,
 		/// The index is assigned to another account.
@@ -103,7 +103,7 @@ decl_error! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin, system = frame_system {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin, system = frame_system {
 		/// The deposit needed for reserving an index.
 		const Deposit: BalanceOf<T> = T::Deposit::get();
 
@@ -275,7 +275,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	// PUBLIC IMMUTABLES
 
 	/// Lookup an T::AccountIndex to get an Id, if there's one there.
@@ -295,7 +295,7 @@ impl<T: Trait> Module<T> {
 	}
 }
 
-impl<T: Trait> StaticLookup for Module<T> {
+impl<T: Config> StaticLookup for Module<T> {
 	type Source = MultiAddress<T::AccountId, T::AccountIndex>;
 	type Target = T::AccountId;
 
diff --git a/frame/indices/src/mock.rs b/frame/indices/src/mock.rs
index cfbd2e38c3d3..dbbde888c166 100644
--- a/frame/indices/src/mock.rs
+++ b/frame/indices/src/mock.rs
@@ -23,7 +23,7 @@ use sp_runtime::testing::Header;
 use sp_runtime::Perbill;
 use sp_core::H256;
 use frame_support::{impl_outer_origin, impl_outer_event, parameter_types, weights::Weight};
-use crate::{self as indices, Module, Trait};
+use crate::{self as indices, Module, Config};
 use frame_system as system;
 use pallet_balances as balances;
 
@@ -49,7 +49,7 @@ parameter_types! {
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
 
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Call = ();
@@ -81,7 +81,7 @@ parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
 }
 
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u64;
 	type DustRemoval = ();
@@ -95,7 +95,7 @@ parameter_types! {
 	pub const Deposit: u64 = 1;
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type AccountIndex = u64;
 	type Currency = Balances;
 	type Deposit = Deposit;
diff --git a/frame/indices/src/weights.rs b/frame/indices/src/weights.rs
index 36d990cec52a..96470625329f 100644
--- a/frame/indices/src/weights.rs
+++ b/frame/indices/src/weights.rs
@@ -53,7 +53,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_indices using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn claim() -> Weight {
 		(53_799_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
diff --git a/frame/membership/src/lib.rs b/frame/membership/src/lib.rs
index 06188c42b21b..60cd7ae1eda2 100644
--- a/frame/membership/src/lib.rs
+++ b/frame/membership/src/lib.rs
@@ -30,9 +30,9 @@ use frame_support::{
 };
 use frame_system::ensure_signed;
 
-pub trait Trait<I=DefaultInstance>: frame_system::Trait {
+pub trait Config<I=DefaultInstance>: frame_system::Config {
 	/// The overarching event type.
-	type Event: From<Event<Self, I>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self, I>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// Required origin for adding a member (though can always be Root).
 	type AddOrigin: EnsureOrigin<Self::Origin>;
@@ -59,7 +59,7 @@ pub trait Trait<I=DefaultInstance>: frame_system::Trait {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait<I>, I: Instance=DefaultInstance> as Membership {
+	trait Store for Module<T: Config<I>, I: Instance=DefaultInstance> as Membership {
 		/// The current membership, stored as an ordered Vec.
 		Members get(fn members): Vec<T::AccountId>;
 
@@ -80,8 +80,8 @@ decl_storage! {
 
 decl_event!(
 	pub enum Event<T, I=DefaultInstance> where
-		<T as frame_system::Trait>::AccountId,
-		<T as Trait<I>>::Event,
+		<T as frame_system::Config>::AccountId,
+		<T as Config<I>>::Event,
 	{
 		/// The given member was added; see the transaction for who.
 		MemberAdded,
@@ -100,7 +100,7 @@ decl_event!(
 
 decl_error! {
 	/// Error for the nicks module.
-	pub enum Error for Module<T: Trait<I>, I: Instance> {
+	pub enum Error for Module<T: Config<I>, I: Instance> {
 		/// Already a member.
 		AlreadyMember,
 		/// Not a member.
@@ -109,7 +109,7 @@ decl_error! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait<I>, I: Instance=DefaultInstance>
+	pub struct Module<T: Config<I>, I: Instance=DefaultInstance>
 		for enum Call
 		where origin: T::Origin
 	{
@@ -253,7 +253,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait<I>, I: Instance> Module<T, I> {
+impl<T: Config<I>, I: Instance> Module<T, I> {
 	fn rejig_prime(members: &[T::AccountId]) {
 		if let Some(prime) = Prime::<T, I>::get() {
 			match members.binary_search(&prime) {
@@ -264,7 +264,7 @@ impl<T: Trait<I>, I: Instance> Module<T, I> {
 	}
 }
 
-impl<T: Trait<I>, I: Instance> Contains<T::AccountId> for Module<T, I> {
+impl<T: Config<I>, I: Instance> Contains<T::AccountId> for Module<T, I> {
 	fn sorted_members() -> Vec<T::AccountId> {
 		Self::members()
 	}
@@ -300,7 +300,7 @@ mod tests {
 		pub static Members: Vec<u64> = vec![];
 		pub static Prime: Option<u64> = None;
 	}
-	impl frame_system::Trait for Test {
+	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
 		type Origin = Origin;
 		type Index = u64;
@@ -359,7 +359,7 @@ mod tests {
 		}
 	}
 
-	impl Trait for Test {
+	impl Config for Test {
 		type Event = ();
 		type AddOrigin = EnsureSignedBy<One, u64>;
 		type RemoveOrigin = EnsureSignedBy<Two, u64>;
diff --git a/frame/multisig/src/benchmarking.rs b/frame/multisig/src/benchmarking.rs
index bf89ec8b09bd..0b549b3d9471 100644
--- a/frame/multisig/src/benchmarking.rs
+++ b/frame/multisig/src/benchmarking.rs
@@ -29,7 +29,7 @@ use crate::Module as Multisig;
 
 const SEED: u32 = 0;
 
-fn setup_multi<T: Trait>(s: u32, z: u32)
+fn setup_multi<T: Config>(s: u32, z: u32)
 	-> Result<(Vec<T::AccountId>, Vec<u8>), &'static str>
 {
 	let mut signatories: Vec<T::AccountId> = Vec::new();
@@ -42,7 +42,7 @@ fn setup_multi<T: Trait>(s: u32, z: u32)
 	}
 	signatories.sort();
 	// Must first convert to outer call type.
-	let call: <T as Trait>::Call = frame_system::Call::<T>::remark(vec![0; z as usize]).into();
+	let call: <T as Config>::Call = frame_system::Call::<T>::remark(vec![0; z as usize]).into();
 	let call_data = call.encode();
 	return Ok((signatories, call_data))
 }
@@ -55,7 +55,7 @@ benchmarks! {
 		let z in 0 .. 10_000;
 		let max_signatories = T::MaxSignatories::get().into();
 		let (mut signatories, _) = setup_multi::<T>(max_signatories, z)?;
-		let call: <T as Trait>::Call = frame_system::Call::<T>::remark(vec![0; z as usize]).into();
+		let call: <T as Config>::Call = frame_system::Call::<T>::remark(vec![0; z as usize]).into();
 		let call_hash = call.using_encoded(blake2_256);
 		let multi_account_id = Multisig::<T>::multi_account_id(&signatories, 1);
 		let caller = signatories.pop().ok_or("signatories should have len 2 or more")?;
diff --git a/frame/multisig/src/lib.rs b/frame/multisig/src/lib.rs
index 873508259a8d..b39b979f999d 100644
--- a/frame/multisig/src/lib.rs
+++ b/frame/multisig/src/lib.rs
@@ -18,7 +18,7 @@
 //! # Multisig Module
 //! A module for doing multisig dispatch.
 //!
-//! - [`multisig::Trait`](./trait.Trait.html)
+//! - [`multisig::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //!
 //! ## Overview
@@ -41,7 +41,7 @@
 //! * `cancel_as_multi` - Cancel a call from a composite origin.
 //!
 //! [`Call`]: ./enum.Call.html
-//! [`Trait`]: ./trait.Trait.html
+//! [`Config`]: ./trait.Config.html
 
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
@@ -62,14 +62,14 @@ use frame_system::{self as system, ensure_signed, RawOrigin};
 use sp_runtime::{DispatchError, DispatchResult, traits::{Dispatchable, Zero}};
 pub use weights::WeightInfo;
 
-type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
+type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 /// Just a bunch of bytes, but they should decode to a valid `Call`.
 pub type OpaqueCall = Vec<u8>;
 
 /// Configuration trait.
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// The overarching call type.
 	type Call: Parameter + Dispatchable<Origin=Self::Origin, PostInfo=PostDispatchInfo>
@@ -123,7 +123,7 @@ pub struct Multisig<BlockNumber, Balance, AccountId> {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Multisig {
+	trait Store for Module<T: Config> as Multisig {
 		/// The set of open multisig operations.
 		pub Multisigs: double_map
 			hasher(twox_64_concat) T::AccountId, hasher(blake2_128_concat) [u8; 32]
@@ -134,7 +134,7 @@ decl_storage! {
 }
 
 decl_error! {
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Threshold must be 2 or greater.
 		MinimumThreshold,
 		/// Call is already approved by this signatory.
@@ -169,8 +169,8 @@ decl_error! {
 decl_event! {
 	/// Events type.
 	pub enum Event<T> where
-		AccountId = <T as system::Trait>::AccountId,
-		BlockNumber = <T as system::Trait>::BlockNumber,
+		AccountId = <T as system::Config>::AccountId,
+		BlockNumber = <T as system::Config>::BlockNumber,
 		CallHash = [u8; 32]
 	{
 		/// A new multisig operation has begun. \[approving, multisig, call_hash\]
@@ -191,7 +191,7 @@ enum CallOrHash {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		type Error = Error<T>;
 
 		/// Deposit one of this module's events by using the default implementation.
@@ -232,7 +232,7 @@ decl_module! {
 		)]
 		fn as_multi_threshold_1(origin,
 			other_signatories: Vec<T::AccountId>,
-			call: Box<<T as Trait>::Call>,
+			call: Box<<T as Config>::Call>,
 		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
 			let max_sigs = T::MaxSignatories::get() as usize;
@@ -443,7 +443,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Derive a multi-account ID from the sorted list of accounts and the threshold that are
 	/// required.
 	///
@@ -615,7 +615,7 @@ impl<T: Trait> Module<T> {
 	}
 
 	/// Attempt to decode and return the call, provided by the user or from storage.
-	fn get_call(hash: &[u8; 32], maybe_known: Option<&[u8]>) -> Option<(<T as Trait>::Call, usize)> {
+	fn get_call(hash: &[u8; 32], maybe_known: Option<&[u8]>) -> Option<(<T as Config>::Call, usize)> {
 		maybe_known.map_or_else(|| {
 			Calls::<T>::get(hash).and_then(|(data, ..)| {
 				Decode::decode(&mut &data[..]).ok().map(|d| (d, data.len()))
diff --git a/frame/multisig/src/tests.rs b/frame/multisig/src/tests.rs
index ca15e04597ea..6e8895184348 100644
--- a/frame/multisig/src/tests.rs
+++ b/frame/multisig/src/tests.rs
@@ -59,7 +59,7 @@ parameter_types! {
 	pub const MaximumBlockLength: u32 = 2 * 1024;
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = TestBaseCallFilter;
 	type Origin = Origin;
 	type Index = u64;
@@ -89,7 +89,7 @@ impl frame_system::Trait for Test {
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
 }
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u64;
 	type Event = TestEvent;
@@ -114,7 +114,7 @@ impl Filter<Call> for TestBaseCallFilter {
 		}
 	}
 }
-impl Trait for Test {
+impl Config for Test {
 	type Event = TestEvent;
 	type Call = Call;
 	type Currency = Balances;
diff --git a/frame/multisig/src/weights.rs b/frame/multisig/src/weights.rs
index ab55b181f5a5..c0f6399e7642 100644
--- a/frame/multisig/src/weights.rs
+++ b/frame/multisig/src/weights.rs
@@ -58,7 +58,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_multisig using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn as_multi_threshold_1(z: u32, ) -> Weight {
 		(14_183_000 as Weight)
 			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
diff --git a/frame/nicks/src/lib.rs b/frame/nicks/src/lib.rs
index ddeadfb7680f..e66580250426 100644
--- a/frame/nicks/src/lib.rs
+++ b/frame/nicks/src/lib.rs
@@ -17,7 +17,7 @@
 
 //! # Nicks Module
 //!
-//! - [`nicks::Trait`](./trait.Trait.html)
+//! - [`nicks::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //!
 //! ## Overview
@@ -37,7 +37,7 @@
 //! * `kill_name` - Forcibly remove the associated name; the deposit is lost.
 //!
 //! [`Call`]: ./enum.Call.html
-//! [`Trait`]: ./trait.Trait.html
+//! [`Config`]: ./trait.Config.html
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
@@ -51,12 +51,12 @@ use frame_support::{
 };
 use frame_system::ensure_signed;
 
-type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
-type NegativeImbalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::NegativeImbalance;
+type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
 
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// The currency trait.
 	type Currency: ReservableCurrency<Self::AccountId>;
@@ -78,14 +78,14 @@ pub trait Trait: frame_system::Trait {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Nicks {
+	trait Store for Module<T: Config> as Nicks {
 		/// The lookup table for names.
 		NameOf: map hasher(twox_64_concat) T::AccountId => Option<(Vec<u8>, BalanceOf<T>)>;
 	}
 }
 
 decl_event!(
-	pub enum Event<T> where AccountId = <T as frame_system::Trait>::AccountId, Balance = BalanceOf<T> {
+	pub enum Event<T> where AccountId = <T as frame_system::Config>::AccountId, Balance = BalanceOf<T> {
 		/// A name was set. \[who\]
 		NameSet(AccountId),
 		/// A name was forcibly set. \[target\]
@@ -101,7 +101,7 @@ decl_event!(
 
 decl_error! {
 	/// Error for the nicks module.
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// A name is too short.
 		TooShort,
 		/// A name is too long.
@@ -113,7 +113,7 @@ decl_error! {
 
 decl_module! {
 	/// Nicks module declaration.
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		type Error = Error<T>;
 
 		fn deposit_event() = default;
@@ -262,7 +262,7 @@ mod tests {
 		pub const MaximumBlockLength: u32 = 2 * 1024;
 		pub const AvailableBlockRatio: Perbill = Perbill::one();
 	}
-	impl frame_system::Trait for Test {
+	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
 		type Origin = Origin;
 		type Index = u64;
@@ -292,7 +292,7 @@ mod tests {
 	parameter_types! {
 		pub const ExistentialDeposit: u64 = 1;
 	}
-	impl pallet_balances::Trait for Test {
+	impl pallet_balances::Config for Test {
 		type MaxLocks = ();
 		type Balance = u64;
 		type Event = ();
@@ -309,7 +309,7 @@ mod tests {
 	ord_parameter_types! {
 		pub const One: u64 = 1;
 	}
-	impl Trait for Test {
+	impl Config for Test {
 		type Event = ();
 		type Currency = Balances;
 		type ReservationFee = ReservationFee;
diff --git a/frame/node-authorization/src/lib.rs b/frame/node-authorization/src/lib.rs
index 91f89ad1d910..df6b391cc7a6 100644
--- a/frame/node-authorization/src/lib.rs
+++ b/frame/node-authorization/src/lib.rs
@@ -76,9 +76,9 @@ impl WeightInfo for () {
 	fn remove_connections() -> Weight { 50_000_000 }
 }
 
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The event type of this module.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// The maximum number of well known nodes that are allowed to set
 	type MaxWellKnownNodes: Get<u32>;
@@ -103,7 +103,7 @@ pub trait Trait: frame_system::Trait {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as NodeAuthorization {
+	trait Store for Module<T: Config> as NodeAuthorization {
 		/// The set of well known nodes. This is stored sorted (just by value).
 		pub WellKnownNodes get(fn well_known_nodes): BTreeSet<PeerId>;
 		/// A map that maintains the ownership of each node.
@@ -123,7 +123,7 @@ decl_storage! {
 
 decl_event! {
 	pub enum Event<T> where
-		<T as frame_system::Trait>::AccountId,
+		<T as frame_system::Config>::AccountId,
 	{
 		/// The given well known node was added.
 		NodeAdded(PeerId, AccountId),
@@ -149,7 +149,7 @@ decl_event! {
 
 decl_error! {
 	/// Error for the node authorization module.
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// The PeerId is too long.
 		PeerIdTooLong,
 		/// Too many well known nodes.
@@ -170,7 +170,7 @@ decl_error! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		/// The maximum number of authorized well known nodes
 		const MaxWellKnownNodes: u32 = T::MaxWellKnownNodes::get();
 
@@ -403,7 +403,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	fn initialize_nodes(nodes: &Vec<(PeerId, T::AccountId)>) {
 		let peer_ids = nodes.iter()
 			.map(|item| item.0.clone())
@@ -453,7 +453,7 @@ mod tests {
 		pub const MaximumBlockLength: u32 = 2 * 1024;
 		pub const AvailableBlockRatio: Perbill = Perbill::one();
 	}
-	impl frame_system::Trait for Test {
+	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
 		type Origin = Origin;
 		type Index = u64;
@@ -491,7 +491,7 @@ mod tests {
 		pub const MaxWellKnownNodes: u32 = 4;
 		pub const MaxPeerIdLength: u32 = 2;
 	}
-	impl Trait for Test {
+	impl Config for Test {
 		type Event = ();
 		type MaxWellKnownNodes = MaxWellKnownNodes;
 		type MaxPeerIdLength = MaxPeerIdLength;
diff --git a/frame/offences/benchmarking/src/lib.rs b/frame/offences/benchmarking/src/lib.rs
index 47055eab73d4..cdac46acb451 100644
--- a/frame/offences/benchmarking/src/lib.rs
+++ b/frame/offences/benchmarking/src/lib.rs
@@ -24,22 +24,22 @@ mod mock;
 use sp_std::prelude::*;
 use sp_std::vec;
 
-use frame_system::{RawOrigin, Module as System, Trait as SystemTrait};
+use frame_system::{RawOrigin, Module as System, Config as SystemTrait};
 use frame_benchmarking::{benchmarks, account};
 use frame_support::traits::{Currency, OnInitialize};
 
 use sp_runtime::{Perbill, traits::{Convert, StaticLookup, Saturating, UniqueSaturatedInto}};
 use sp_staking::offence::{ReportOffence, Offence, OffenceDetails};
 
-use pallet_balances::{Trait as BalancesTrait};
+use pallet_balances::{Config as BalancesTrait};
 use pallet_babe::BabeEquivocationOffence;
 use pallet_grandpa::{GrandpaEquivocationOffence, GrandpaTimeSlot};
-use pallet_im_online::{Trait as ImOnlineTrait, Module as ImOnline, UnresponsivenessOffence};
-use pallet_offences::{Trait as OffencesTrait, Module as Offences};
-use pallet_session::historical::{Trait as HistoricalTrait, IdentificationTuple};
-use pallet_session::{Trait as SessionTrait, SessionManager};
+use pallet_im_online::{Config as ImOnlineTrait, Module as ImOnline, UnresponsivenessOffence};
+use pallet_offences::{Config as OffencesTrait, Module as Offences};
+use pallet_session::historical::{Config as HistoricalTrait, IdentificationTuple};
+use pallet_session::{Config as SessionTrait, SessionManager};
 use pallet_staking::{
-	Module as Staking, Trait as StakingTrait, RewardDestination, ValidatorPrefs,
+	Module as Staking, Config as StakingTrait, RewardDestination, ValidatorPrefs,
 	Exposure, IndividualExposure, ElectionStatus, MAX_NOMINATIONS, Event as StakingEvent
 };
 
@@ -50,9 +50,9 @@ const MAX_OFFENDERS: u32 = 100;
 const MAX_NOMINATORS: u32 = 100;
 const MAX_DEFERRED_OFFENCES: u32 = 100;
 
-pub struct Module<T: Trait>(Offences<T>);
+pub struct Module<T: Config>(Offences<T>);
 
-pub trait Trait:
+pub trait Config:
 	SessionTrait
 	+ StakingTrait
 	+ OffencesTrait
@@ -80,17 +80,17 @@ impl<T: HistoricalTrait + OffencesTrait> IdTupleConvert<T> for T where
 type LookupSourceOf<T> = <<T as SystemTrait>::Lookup as StaticLookup>::Source;
 type BalanceOf<T> = <<T as StakingTrait>::Currency as Currency<<T as SystemTrait>::AccountId>>::Balance;
 
-struct Offender<T: Trait> {
+struct Offender<T: Config> {
 	pub controller: T::AccountId,
 	pub stash: T::AccountId,
 	pub nominator_stashes: Vec<T::AccountId>,
 }
 
-fn bond_amount<T: Trait>() -> BalanceOf<T> {
+fn bond_amount<T: Config>() -> BalanceOf<T> {
 	T::Currency::minimum_balance().saturating_mul(10_000u32.into())
 }
 
-fn create_offender<T: Trait>(n: u32, nominators: u32) -> Result<Offender<T>, &'static str> {
+fn create_offender<T: Config>(n: u32, nominators: u32) -> Result<Offender<T>, &'static str> {
 	let stash: T::AccountId = account("stash", n, SEED);
 	let controller: T::AccountId = account("controller", n, SEED);
 	let controller_lookup: LookupSourceOf<T> = T::Lookup::unlookup(controller.clone());
@@ -149,7 +149,7 @@ fn create_offender<T: Trait>(n: u32, nominators: u32) -> Result<Offender<T>, &'s
 	Ok(Offender { controller, stash, nominator_stashes })
 }
 
-fn make_offenders<T: Trait>(num_offenders: u32, num_nominators: u32) -> Result<
+fn make_offenders<T: Config>(num_offenders: u32, num_nominators: u32) -> Result<
 	(Vec<IdentificationTuple<T>>, Vec<Offender<T>>),
 	&'static str
 > {
@@ -176,7 +176,7 @@ fn make_offenders<T: Trait>(num_offenders: u32, num_nominators: u32) -> Result<
 }
 
 #[cfg(test)]
-fn check_events<T: Trait, I: Iterator<Item = <T as SystemTrait>::Event>>(expected: I) {
+fn check_events<T: Config, I: Iterator<Item = <T as SystemTrait>::Event>>(expected: I) {
 	let events = System::<T>::events() .into_iter()
 		.map(|frame_system::EventRecord { event, .. }| event).collect::<Vec<_>>();
 	let expected = expected.collect::<Vec<_>>();
diff --git a/frame/offences/benchmarking/src/mock.rs b/frame/offences/benchmarking/src/mock.rs
index 527e0ede81ab..269324033bbc 100644
--- a/frame/offences/benchmarking/src/mock.rs
+++ b/frame/offences/benchmarking/src/mock.rs
@@ -40,7 +40,7 @@ parameter_types! {
 	pub const MaximumBlockWeight: Weight = 2 * WEIGHT_PER_SECOND;
 }
 
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = AccountIndex;
@@ -70,7 +70,7 @@ impl frame_system::Trait for Test {
 parameter_types! {
 	pub const ExistentialDeposit: Balance = 10;
 }
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = Balance;
 	type Event = Event;
@@ -83,13 +83,13 @@ impl pallet_balances::Trait for Test {
 parameter_types! {
 	pub const MinimumPeriod: u64 = 5;
 }
-impl pallet_timestamp::Trait for Test {
+impl pallet_timestamp::Config for Test {
 	type Moment = u64;
 	type OnTimestampSet = ();
 	type MinimumPeriod = MinimumPeriod;
 	type WeightInfo = ();
 }
-impl pallet_session::historical::Trait for Test {
+impl pallet_session::historical::Config for Test {
 	type FullIdentification = pallet_staking::Exposure<AccountId, Balance>;
 	type FullIdentificationOf = pallet_staking::ExposureOf<Test>;
 }
@@ -120,7 +120,7 @@ parameter_types! {
 	pub const Offset: u64 = 0;
 }
 
-impl pallet_session::Trait for Test {
+impl pallet_session::Config for Test {
 	type SessionManager = pallet_session::historical::NoteHistoricalRoot<Test, Staking>;
 	type Keys = SessionKeys;
 	type ShouldEndSession = pallet_session::PeriodicSessions<Period, Offset>;
@@ -149,7 +149,7 @@ parameter_types! {
 
 pub type Extrinsic = sp_runtime::testing::TestXt<Call, ()>;
 
-impl pallet_staking::Trait for Test {
+impl pallet_staking::Config for Test {
 	type Currency = Balances;
 	type UnixTime = pallet_timestamp::Module<Self>;
 	type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote;
@@ -174,7 +174,7 @@ impl pallet_staking::Trait for Test {
 	type WeightInfo = ();
 }
 
-impl pallet_im_online::Trait for Test {
+impl pallet_im_online::Config for Test {
 	type AuthorityId = UintAuthorityId;
 	type Event = Event;
 	type SessionDuration = Period;
@@ -187,7 +187,7 @@ parameter_types! {
 	pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * MaximumBlockWeight::get();
 }
 
-impl pallet_offences::Trait for Test {
+impl pallet_offences::Config for Test {
 	type Event = Event;
 	type IdentificationTuple = pallet_session::historical::IdentificationTuple<Self>;
 	type OnOffenceHandler = Staking;
@@ -199,7 +199,7 @@ impl<T> frame_system::offchain::SendTransactionTypes<T> for Test where Call: Fro
 	type OverarchingCall = Call;
 }
 
-impl crate::Trait for Test {}
+impl crate::Config for Test {}
 
 pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;
 pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<u32, Call, u64, ()>;
diff --git a/frame/offences/src/lib.rs b/frame/offences/src/lib.rs
index e72498273cec..e3f01823c18f 100644
--- a/frame/offences/src/lib.rs
+++ b/frame/offences/src/lib.rs
@@ -42,11 +42,11 @@ use codec::{Encode, Decode};
 type OpaqueTimeSlot = Vec<u8>;
 
 /// A type alias for a report identifier.
-type ReportIdOf<T> = <T as frame_system::Trait>::Hash;
+type ReportIdOf<T> = <T as frame_system::Config>::Hash;
 
 /// Type of data stored as a deferred offence
 pub type DeferredOffenceOf<T> = (
-	Vec<OffenceDetails<<T as frame_system::Trait>::AccountId, <T as Trait>::IdentificationTuple>>,
+	Vec<OffenceDetails<<T as frame_system::Config>::AccountId, <T as Config>::IdentificationTuple>>,
 	Vec<Perbill>,
 	SessionIndex,
 );
@@ -66,9 +66,9 @@ impl WeightInfo for () {
 }
 
 /// Offences trait
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The overarching event type.
-	type Event: From<Event> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event> + Into<<Self as frame_system::Config>::Event>;
 	/// Full identification of the validator.
 	type IdentificationTuple: Parameter + Ord;
 	/// A handler called for every offence report.
@@ -80,7 +80,7 @@ pub trait Trait: frame_system::Trait {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Offences {
+	trait Store for Module<T: Config> as Offences {
 		/// The primary structure that holds all offence records keyed by report identifiers.
 		Reports get(fn reports):
 			map hasher(twox_64_concat) ReportIdOf<T>
@@ -116,7 +116,7 @@ decl_event!(
 );
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		fn deposit_event() = default;
 
 		fn on_initialize(now: T::BlockNumber) -> Weight {
@@ -158,7 +158,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait, O: Offence<T::IdentificationTuple>>
+impl<T: Config, O: Offence<T::IdentificationTuple>>
 	ReportOffence<T::AccountId, T::IdentificationTuple, O> for Module<T>
 where
 	T::IdentificationTuple: Clone,
@@ -210,7 +210,7 @@ where
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Tries (without checking) to report an offence. Stores them in [`DeferredOffences`] in case
 	/// it fails. Returns false in case it has to store the offence.
 	fn report_or_store_offence(
@@ -293,7 +293,7 @@ impl<T: Trait> Module<T> {
 	}
 }
 
-struct TriageOutcome<T: Trait> {
+struct TriageOutcome<T: Config> {
 	/// Other reports for the same report kinds.
 	concurrent_offenders: Vec<OffenceDetails<T::AccountId, T::IdentificationTuple>>,
 }
@@ -304,13 +304,13 @@ struct TriageOutcome<T: Trait> {
 /// This struct is responsible for aggregating storage writes and the underlying storage should not
 /// accessed directly meanwhile.
 #[must_use = "The changes are not saved without called `save`"]
-struct ReportIndexStorage<T: Trait, O: Offence<T::IdentificationTuple>> {
+struct ReportIndexStorage<T: Config, O: Offence<T::IdentificationTuple>> {
 	opaque_time_slot: OpaqueTimeSlot,
 	concurrent_reports: Vec<ReportIdOf<T>>,
 	same_kind_reports: Vec<(O::TimeSlot, ReportIdOf<T>)>,
 }
 
-impl<T: Trait, O: Offence<T::IdentificationTuple>> ReportIndexStorage<T, O> {
+impl<T: Config, O: Offence<T::IdentificationTuple>> ReportIndexStorage<T, O> {
 	/// Preload indexes from the storage for the specific `time_slot` and the kind of the offence.
 	fn load(time_slot: &O::TimeSlot) -> Self {
 		let opaque_time_slot = time_slot.encode();
diff --git a/frame/offences/src/mock.rs b/frame/offences/src/mock.rs
index 58ee97a9bcbb..690db58a8718 100644
--- a/frame/offences/src/mock.rs
+++ b/frame/offences/src/mock.rs
@@ -20,7 +20,7 @@
 #![cfg(test)]
 
 use std::cell::RefCell;
-use crate::{Module, Trait};
+use crate::{Module, Config};
 use codec::Encode;
 use sp_runtime::Perbill;
 use sp_staking::{
@@ -95,7 +95,7 @@ parameter_types! {
 	pub const MaximumBlockLength: u32 = 2 * 1024;
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
-impl frame_system::Trait for Runtime {
+impl frame_system::Config for Runtime {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = u64;
@@ -127,7 +127,7 @@ parameter_types! {
 	pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * MaximumBlockWeight::get();
 }
 
-impl Trait for Runtime {
+impl Config for Runtime {
 	type Event = TestEvent;
 	type IdentificationTuple = u64;
 	type OnOffenceHandler = OnOffenceHandler;
diff --git a/frame/offences/src/tests.rs b/frame/offences/src/tests.rs
index ca9f46a19882..18582ec042ca 100644
--- a/frame/offences/src/tests.rs
+++ b/frame/offences/src/tests.rs
@@ -342,7 +342,7 @@ fn weight_soft_limit_is_used() {
 	new_test_ext().execute_with(|| {
 		set_can_report(false);
 		// Only 2 can fit in one block
-		set_offence_weight(<mock::Runtime as Trait>::WeightSoftLimit::get() / 2);
+		set_offence_weight(<mock::Runtime as Config>::WeightSoftLimit::get() / 2);
 
 		// Queue 3 offences
 		// #1
diff --git a/frame/proxy/src/benchmarking.rs b/frame/proxy/src/benchmarking.rs
index 5f1d79741dd8..ac0fa52c9707 100644
--- a/frame/proxy/src/benchmarking.rs
+++ b/frame/proxy/src/benchmarking.rs
@@ -27,15 +27,15 @@ use crate::Module as Proxy;
 
 const SEED: u32 = 0;
 
-fn assert_last_event<T: Trait>(generic_event: <T as Trait>::Event) {
+fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
 	let events = frame_system::Module::<T>::events();
-	let system_event: <T as frame_system::Trait>::Event = generic_event.into();
+	let system_event: <T as frame_system::Config>::Event = generic_event.into();
 	// compare to the last event record
 	let EventRecord { event, .. } = &events[events.len() - 1];
 	assert_eq!(event, &system_event);
 }
 
-fn add_proxies<T: Trait>(n: u32, maybe_who: Option<T::AccountId>) -> Result<(), &'static str> {
+fn add_proxies<T: Config>(n: u32, maybe_who: Option<T::AccountId>) -> Result<(), &'static str> {
 	let caller = maybe_who.unwrap_or_else(|| whitelisted_caller());
 	T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 	for i in 0..n {
@@ -49,7 +49,7 @@ fn add_proxies<T: Trait>(n: u32, maybe_who: Option<T::AccountId>) -> Result<(),
 	Ok(())
 }
 
-fn add_announcements<T: Trait>(
+fn add_announcements<T: Config>(
 	n: u32,
 	maybe_who: Option<T::AccountId>,
 	maybe_real: Option<T::AccountId>
@@ -91,7 +91,7 @@ benchmarks! {
 		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 		// ... and "real" is the traditional caller. This is not a typo.
 		let real: T::AccountId = whitelisted_caller();
-		let call: <T as Trait>::Call = frame_system::Call::<T>::remark(vec![]).into();
+		let call: <T as Config>::Call = frame_system::Call::<T>::remark(vec![]).into();
 	}: _(RawOrigin::Signed(caller), real, Some(T::ProxyType::default()), Box::new(call))
 	verify {
 		assert_last_event::<T>(RawEvent::ProxyExecuted(Ok(())).into())
@@ -106,7 +106,7 @@ benchmarks! {
 		T::Currency::make_free_balance_be(&delegate, BalanceOf::<T>::max_value());
 		// ... and "real" is the traditional caller. This is not a typo.
 		let real: T::AccountId = whitelisted_caller();
-		let call: <T as Trait>::Call = frame_system::Call::<T>::remark(vec![]).into();
+		let call: <T as Config>::Call = frame_system::Call::<T>::remark(vec![]).into();
 		Proxy::<T>::announce(
 			RawOrigin::Signed(delegate.clone()).into(),
 			real.clone(),
@@ -126,7 +126,7 @@ benchmarks! {
 		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 		// ... and "real" is the traditional caller. This is not a typo.
 		let real: T::AccountId = whitelisted_caller();
-		let call: <T as Trait>::Call = frame_system::Call::<T>::remark(vec![]).into();
+		let call: <T as Config>::Call = frame_system::Call::<T>::remark(vec![]).into();
 		Proxy::<T>::announce(
 			RawOrigin::Signed(caller.clone()).into(),
 			real.clone(),
@@ -147,7 +147,7 @@ benchmarks! {
 		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 		// ... and "real" is the traditional caller. This is not a typo.
 		let real: T::AccountId = whitelisted_caller();
-		let call: <T as Trait>::Call = frame_system::Call::<T>::remark(vec![]).into();
+		let call: <T as Config>::Call = frame_system::Call::<T>::remark(vec![]).into();
 		Proxy::<T>::announce(
 			RawOrigin::Signed(caller.clone()).into(),
 			real.clone(),
@@ -169,7 +169,7 @@ benchmarks! {
 		// ... and "real" is the traditional caller. This is not a typo.
 		let real: T::AccountId = whitelisted_caller();
 		add_announcements::<T>(a, Some(caller.clone()), None)?;
-		let call: <T as Trait>::Call = frame_system::Call::<T>::remark(vec![]).into();
+		let call: <T as Config>::Call = frame_system::Call::<T>::remark(vec![]).into();
 		let call_hash = T::CallHasher::hash_of(&call);
 	}: _(RawOrigin::Signed(caller.clone()), real.clone(), call_hash)
 	verify {
diff --git a/frame/proxy/src/lib.rs b/frame/proxy/src/lib.rs
index 75ab3902dc8d..3d707d238367 100644
--- a/frame/proxy/src/lib.rs
+++ b/frame/proxy/src/lib.rs
@@ -23,7 +23,7 @@
 //! wish to execute some duration prior to execution happens. In this case, the target account may
 //! reject the announcement and in doing so, veto the execution.
 //!
-//! - [`proxy::Trait`](./trait.Trait.html)
+//! - [`proxy::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //!
 //! ## Overview
@@ -33,7 +33,7 @@
 //! ### Dispatchable Functions
 //!
 //! [`Call`]: ./enum.Call.html
-//! [`Trait`]: ./trait.Trait.html
+//! [`Config`]: ./trait.Config.html
 
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
@@ -55,17 +55,17 @@ use frame_system::{self as system, ensure_signed};
 use frame_support::dispatch::DispatchError;
 pub use weights::WeightInfo;
 
-type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
+type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 
 /// Configuration trait.
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// The overarching call type.
 	type Call: Parameter + Dispatchable<Origin=Self::Origin, PostInfo=PostDispatchInfo>
 		+ GetDispatchInfo + From<frame_system::Call<Self>> + IsSubType<Call<Self>>
-		+ IsType<<Self as frame_system::Trait>::Call>;
+		+ IsType<<Self as frame_system::Config>::Call>;
 
 	/// The currency mechanism.
 	type Currency: ReservableCurrency<Self::AccountId>;
@@ -74,7 +74,7 @@ pub trait Trait: frame_system::Trait {
 	/// The instance filter determines whether a given call may be proxied under this type.
 	///
 	/// IMPORTANT: `Default` must be provided and MUST BE the the *most permissive* value.
-	type ProxyType: Parameter + Member + Ord + PartialOrd + InstanceFilter<<Self as Trait>::Call>
+	type ProxyType: Parameter + Member + Ord + PartialOrd + InstanceFilter<<Self as Config>::Call>
 		+ Default;
 
 	/// The base amount of currency needed to reserve for creating a proxy.
@@ -137,10 +137,10 @@ pub struct Announcement<AccountId, Hash, BlockNumber> {
 	height: BlockNumber,
 }
 
-type CallHashOf<T> = <<T as Trait>::CallHasher as Hash>::Output;
+type CallHashOf<T> = <<T as Config>::CallHasher as Hash>::Output;
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Proxy {
+	trait Store for Module<T: Config> as Proxy {
 		/// The set of account proxies. Maps the account which has delegated to the accounts
 		/// which are being delegated to, together with the amount held on deposit.
 		pub Proxies get(fn proxies): map hasher(twox_64_concat) T::AccountId
@@ -153,7 +153,7 @@ decl_storage! {
 }
 
 decl_error! {
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// There are too many proxies registered or too many announcements pending.
 		TooMany,
 		/// Proxy registration not found.
@@ -174,8 +174,8 @@ decl_error! {
 decl_event! {
 	/// Events type.
 	pub enum Event<T> where
-		AccountId = <T as frame_system::Trait>::AccountId,
-		ProxyType = <T as Trait>::ProxyType,
+		AccountId = <T as frame_system::Config>::AccountId,
+		ProxyType = <T as Config>::ProxyType,
 		Hash = CallHashOf<T>,
 	{
 		/// A proxy was executed correctly, with the given \[result\].
@@ -189,7 +189,7 @@ decl_event! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		type Error = Error<T>;
 
 		/// Deposit one of this module's events by using the default implementation.
@@ -239,7 +239,7 @@ decl_module! {
 		fn proxy(origin,
 			real: T::AccountId,
 			force_proxy_type: Option<T::ProxyType>,
-			call: Box<<T as Trait>::Call>,
+			call: Box<<T as Config>::Call>,
 		) {
 			let who = ensure_signed(origin)?;
 			let def = Self::find_proxy(&real, &who, force_proxy_type)?;
@@ -509,7 +509,7 @@ decl_module! {
 			delegate: T::AccountId,
 			real: T::AccountId,
 			force_proxy_type: Option<T::ProxyType>,
-			call: Box<<T as Trait>::Call>,
+			call: Box<<T as Config>::Call>,
 		) {
 			ensure_signed(origin)?;
 			let def = Self::find_proxy(&real, &delegate, force_proxy_type)?;
@@ -525,7 +525,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 
 	/// Calculate the address of an anonymous account.
 	///
@@ -680,12 +680,12 @@ impl<T: Trait> Module<T> {
 	fn do_proxy(
 		def: ProxyDefinition<T::AccountId, T::ProxyType, T::BlockNumber>,
 		real: T::AccountId,
-		call: <T as Trait>::Call,
+		call: <T as Config>::Call,
 	) {
 		// This is a freshly authenticated new account, the origin restrictions doesn't apply.
 		let mut origin: T::Origin = frame_system::RawOrigin::Signed(real).into();
-		origin.add_filter(move |c: &<T as frame_system::Trait>::Call| {
-			let c = <T as Trait>::Call::from_ref(c);
+		origin.add_filter(move |c: &<T as frame_system::Config>::Call| {
+			let c = <T as Config>::Call::from_ref(c);
 			// We make sure the proxy call does access this pallet to change modify proxies.
 			match c.is_sub_type() {
 				// Proxy call cannot add or remove a proxy with more permissions than it already has.
@@ -714,7 +714,7 @@ pub mod migration {
 	/// `ProxyDefinition` which additionally included a `BlockNumber` delay value. This function,
 	/// simply takes any existing proxies using the old tuple format, and migrates it to the new
 	/// struct by setting the delay to zero.
-	pub fn migrate_to_time_delayed_proxies<T: Trait>() -> Weight {
+	pub fn migrate_to_time_delayed_proxies<T: Config>() -> Weight {
 		Proxies::<T>::translate::<(Vec<(T::AccountId, T::ProxyType)>, BalanceOf<T>), _>(
 			|_, (targets, deposit)| Some((
 				targets.into_iter()
diff --git a/frame/proxy/src/tests.rs b/frame/proxy/src/tests.rs
index bcf3b678ed64..0338b983595a 100644
--- a/frame/proxy/src/tests.rs
+++ b/frame/proxy/src/tests.rs
@@ -61,7 +61,7 @@ parameter_types! {
 	pub const MaximumBlockLength: u32 = 2 * 1024;
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = BaseFilter;
 	type Origin = Origin;
 	type Index = u64;
@@ -91,7 +91,7 @@ impl frame_system::Trait for Test {
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
 }
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u64;
 	type Event = TestEvent;
@@ -100,7 +100,7 @@ impl pallet_balances::Trait for Test {
 	type AccountStore = System;
 	type WeightInfo = ();
 }
-impl pallet_utility::Trait for Test {
+impl pallet_utility::Config for Test {
 	type Event = TestEvent;
 	type Call = Call;
 	type WeightInfo = ();
@@ -143,7 +143,7 @@ impl Filter<Call> for BaseFilter {
 		}
 	}
 }
-impl Trait for Test {
+impl Config for Test {
 	type Event = TestEvent;
 	type Call = Call;
 	type Currency = Balances;
diff --git a/frame/proxy/src/weights.rs b/frame/proxy/src/weights.rs
index 944fe53a149c..8f5a608aa585 100644
--- a/frame/proxy/src/weights.rs
+++ b/frame/proxy/src/weights.rs
@@ -58,7 +58,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_proxy using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn proxy(p: u32, ) -> Weight {
 		(32_194_000 as Weight)
 			.saturating_add((215_000 as Weight).saturating_mul(p as Weight))
diff --git a/frame/randomness-collective-flip/src/lib.rs b/frame/randomness-collective-flip/src/lib.rs
index c1747669dab0..ffa4da978a83 100644
--- a/frame/randomness-collective-flip/src/lib.rs
+++ b/frame/randomness-collective-flip/src/lib.rs
@@ -39,10 +39,10 @@
 //! ```
 //! use frame_support::{decl_module, dispatch, traits::Randomness};
 //!
-//! pub trait Trait: frame_system::Trait {}
+//! pub trait Config: frame_system::Config {}
 //!
 //! decl_module! {
-//! 	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+//! 	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 //! 		#[weight = 0]
 //! 		pub fn random_module_example(origin) -> dispatch::DispatchResult {
 //! 			let _random_value = <pallet_randomness_collective_flip::Module<T>>::random(&b"my context"[..]);
@@ -63,18 +63,18 @@ use frame_support::{
 };
 use safe_mix::TripletMix;
 use codec::Encode;
-use frame_system::Trait;
+use frame_system::Config;
 
 const RANDOM_MATERIAL_LEN: u32 = 81;
 
-fn block_number_to_index<T: Trait>(block_number: T::BlockNumber) -> usize {
+fn block_number_to_index<T: Config>(block_number: T::BlockNumber) -> usize {
 	// on_initialize is called on the first block after genesis
 	let index = (block_number - 1u32.into()) % RANDOM_MATERIAL_LEN.into();
 	index.try_into().ok().expect("Something % 81 is always smaller than usize; qed")
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		fn on_initialize(block_number: T::BlockNumber) -> Weight {
 			let parent_hash = <frame_system::Module<T>>::parent_hash();
 
@@ -91,7 +91,7 @@ decl_module! {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as RandomnessCollectiveFlip {
+	trait Store for Module<T: Config> as RandomnessCollectiveFlip {
 		/// Series of block headers from the last 81 blocks that acts as random seed material. This
 		/// is arranged as a ring buffer with `block_number % 81` being the index into the `Vec` of
 		/// the oldest hash.
@@ -99,7 +99,7 @@ decl_storage! {
 	}
 }
 
-impl<T: Trait> Randomness<T::Hash> for Module<T> {
+impl<T: Config> Randomness<T::Hash> for Module<T> {
 	/// This randomness uses a low-influence function, drawing upon the block hashes from the
 	/// previous 81 blocks. Its result for any given subject will be known far in advance by anyone
 	/// observing the chain. Any block producer has significant influence over their block hashes
@@ -157,7 +157,7 @@ mod tests {
 		pub const AvailableBlockRatio: Perbill = Perbill::one();
 	}
 
-	impl frame_system::Trait for Test {
+	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
 		type Origin = Origin;
 		type Index = u64;
diff --git a/frame/recovery/src/lib.rs b/frame/recovery/src/lib.rs
index c97824497fde..023a805a719b 100644
--- a/frame/recovery/src/lib.rs
+++ b/frame/recovery/src/lib.rs
@@ -17,7 +17,7 @@
 
 //! # Recovery Pallet
 //!
-//! - [`recovery::Trait`](./trait.Trait.html)
+//! - [`recovery::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //!
 //! ## Overview
@@ -172,12 +172,12 @@ mod mock;
 mod tests;
 
 type BalanceOf<T> =
-	<<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 
 /// Configuration trait.
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// The overarching call type.
 	type Call: Parameter + Dispatchable<Origin=Self::Origin, PostInfo=PostDispatchInfo> + GetDispatchInfo;
@@ -237,7 +237,7 @@ pub struct RecoveryConfig<BlockNumber, Balance, AccountId> {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Recovery {
+	trait Store for Module<T: Config> as Recovery {
 		/// The set of recoverable accounts and their recovery configuration.
 		pub Recoverable get(fn recovery_config):
 			map hasher(twox_64_concat) T::AccountId
@@ -262,7 +262,7 @@ decl_storage! {
 decl_event! {
 	/// Events type.
 	pub enum Event<T> where
-		AccountId = <T as system::Trait>::AccountId,
+		AccountId = <T as system::Config>::AccountId,
 	{
 		/// A recovery process has been set up for an \[account\].
 		RecoveryCreated(AccountId),
@@ -284,7 +284,7 @@ decl_event! {
 }
 
 decl_error! {
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// User is not allowed to make a call on behalf of this account
 		NotAllowed,
 		/// Threshold must be greater than zero
@@ -321,7 +321,7 @@ decl_error! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		type Error = Error<T>;
 
 		/// The base amount of currency needed to reserve for creating a recovery configuration.
@@ -361,7 +361,7 @@ decl_module! {
 		)]
 		fn as_recovered(origin,
 			account: T::AccountId,
-			call: Box<<T as Trait>::Call>
+			call: Box<<T as Config>::Call>
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			// Check `who` is allowed to make a call on behalf of `account`
@@ -677,7 +677,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Check that friends list is sorted and has no duplicates.
 	fn is_sorted_and_unique(friends: &Vec<T::AccountId>) -> bool {
 		friends.windows(2).all(|w| w[0] < w[1])
diff --git a/frame/recovery/src/mock.rs b/frame/recovery/src/mock.rs
index 35373562487f..9f15f31bd42f 100644
--- a/frame/recovery/src/mock.rs
+++ b/frame/recovery/src/mock.rs
@@ -58,7 +58,7 @@ parameter_types! {
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
 
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Call = Call;
@@ -90,7 +90,7 @@ parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
 }
 
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u128;
 	type DustRemoval = ();
@@ -107,7 +107,7 @@ parameter_types! {
 	pub const RecoveryDeposit: u64 = 10;
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type Event = TestEvent;
 	type Call = Call;
 	type Currency = Balances;
diff --git a/frame/scheduler/src/benchmarking.rs b/frame/scheduler/src/benchmarking.rs
index 753e9244628a..6a67efc9d2dc 100644
--- a/frame/scheduler/src/benchmarking.rs
+++ b/frame/scheduler/src/benchmarking.rs
@@ -31,7 +31,7 @@ use frame_system::Module as System;
 const BLOCK_NUMBER: u32 = 2;
 
 // Add `n` named items to the schedule
-fn fill_schedule<T: Trait> (when: T::BlockNumber, n: u32) -> Result<(), &'static str> {
+fn fill_schedule<T: Config> (when: T::BlockNumber, n: u32) -> Result<(), &'static str> {
 	// Essentially a no-op call.
 	let call = frame_system::Call::set_storage(vec![]);
 	for i in 0..n {
diff --git a/frame/scheduler/src/lib.rs b/frame/scheduler/src/lib.rs
index c467678a466d..4cdfe4ddf047 100644
--- a/frame/scheduler/src/lib.rs
+++ b/frame/scheduler/src/lib.rs
@@ -18,7 +18,7 @@
 //! # Scheduler
 //! A module for scheduling dispatches.
 //!
-//! - [`scheduler::Trait`](./trait.Trait.html)
+//! - [`scheduler::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //! - [`Module`](./struct.Module.html)
 //!
@@ -29,7 +29,7 @@
 //! may be named or anonymous and may be canceled.
 //!
 //! **NOTE:** The scheduled calls will be dispatched with the default filter
-//! for the origin: namely `frame_system::Trait::BaseCallFilter` for all origin
+//! for the origin: namely `frame_system::Config::BaseCallFilter` for all origin
 //! except root which will get no filter. And not the filter contained in origin
 //! use to call `fn schedule`.
 //!
@@ -70,27 +70,27 @@ pub use weights::WeightInfo;
 /// pallet is dependent on specific other pallets, then their configuration traits
 /// should be added to our implied traits list.
 ///
-/// `system::Trait` should always be included in our implied traits.
-pub trait Trait: system::Trait {
+/// `system::Config` should always be included in our implied traits.
+pub trait Config: system::Config {
 	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as system::Config>::Event>;
 
 	/// The aggregated origin which the dispatch will take.
 	type Origin: OriginTrait<PalletsOrigin =
-		Self::PalletsOrigin> + From<Self::PalletsOrigin> + IsType<<Self as system::Trait>::Origin>;
+		Self::PalletsOrigin> + From<Self::PalletsOrigin> + IsType<<Self as system::Config>::Origin>;
 
 	/// The caller origin, overarching type of all pallets origins.
 	type PalletsOrigin: From<system::RawOrigin<Self::AccountId>> + Codec + Clone + Eq;
 
 	/// The aggregated call type.
-	type Call: Parameter + Dispatchable<Origin=<Self as Trait>::Origin> + GetDispatchInfo + From<system::Call<Self>>;
+	type Call: Parameter + Dispatchable<Origin=<Self as Config>::Origin> + GetDispatchInfo + From<system::Call<Self>>;
 
 	/// The maximum weight that may be scheduled per block for any dispatchables of less priority
 	/// than `schedule::HARD_DEADLINE`.
 	type MaximumWeight: Get<Weight>;
 
 	/// Required origin to schedule or cancel calls.
-	type ScheduleOrigin: EnsureOrigin<<Self as system::Trait>::Origin>;
+	type ScheduleOrigin: EnsureOrigin<<Self as system::Config>::Origin>;
 
 	/// The maximum number of scheduled calls in the queue for a single block.
 	/// Not strictly enforced, but used for weight estimation.
@@ -150,10 +150,10 @@ impl Default for Releases {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Scheduler {
+	trait Store for Module<T: Config> as Scheduler {
 		/// Items to be executed, indexed by the block number that they should be executed on.
 		pub Agenda: map hasher(twox_64_concat) T::BlockNumber
-			=> Vec<Option<Scheduled<<T as Trait>::Call, T::BlockNumber, T::PalletsOrigin, T::AccountId>>>;
+			=> Vec<Option<Scheduled<<T as Config>::Call, T::BlockNumber, T::PalletsOrigin, T::AccountId>>>;
 
 		/// Lookup from identity to the block number and index of the task.
 		Lookup: map hasher(twox_64_concat) Vec<u8> => Option<TaskAddress<T::BlockNumber>>;
@@ -166,7 +166,7 @@ decl_storage! {
 }
 
 decl_event!(
-	pub enum Event<T> where <T as system::Trait>::BlockNumber {
+	pub enum Event<T> where <T as system::Config>::BlockNumber {
 		/// Scheduled some task. \[when, index\]
 		Scheduled(BlockNumber, u32),
 		/// Canceled some task. \[when, index\]
@@ -177,7 +177,7 @@ decl_event!(
 );
 
 decl_error! {
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Failed to schedule a call
 		FailedToSchedule,
 		/// Cannot find the scheduled call.
@@ -191,7 +191,7 @@ decl_error! {
 
 decl_module! {
 	/// Scheduler module declaration.
-	pub struct Module<T: Trait> for enum Call where origin: <T as system::Trait>::Origin {
+	pub struct Module<T: Config> for enum Call where origin: <T as system::Config>::Origin {
 		type Error = Error<T>;
 		fn deposit_event() = default;
 
@@ -210,10 +210,10 @@ decl_module! {
 			when: T::BlockNumber,
 			maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
 			priority: schedule::Priority,
-			call: Box<<T as Trait>::Call>,
+			call: Box<<T as Config>::Call>,
 		) {
 			T::ScheduleOrigin::ensure_origin(origin.clone())?;
-			let origin = <T as Trait>::Origin::from(origin);
+			let origin = <T as Config>::Origin::from(origin);
 			Self::do_schedule(DispatchTime::At(when), maybe_periodic, priority, origin.caller().clone(), *call)?;
 		}
 
@@ -230,7 +230,7 @@ decl_module! {
 		#[weight = T::WeightInfo::cancel(T::MaxScheduledPerBlock::get())]
 		fn cancel(origin, when: T::BlockNumber, index: u32) {
 			T::ScheduleOrigin::ensure_origin(origin.clone())?;
-			let origin = <T as Trait>::Origin::from(origin);
+			let origin = <T as Config>::Origin::from(origin);
 			Self::do_cancel(Some(origin.caller().clone()), (when, index))?;
 		}
 
@@ -250,10 +250,10 @@ decl_module! {
 			when: T::BlockNumber,
 			maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
 			priority: schedule::Priority,
-			call: Box<<T as Trait>::Call>,
+			call: Box<<T as Config>::Call>,
 		) {
 			T::ScheduleOrigin::ensure_origin(origin.clone())?;
-			let origin = <T as Trait>::Origin::from(origin);
+			let origin = <T as Config>::Origin::from(origin);
 			Self::do_schedule_named(
 				id, DispatchTime::At(when), maybe_periodic, priority, origin.caller().clone(), *call
 			)?;
@@ -272,7 +272,7 @@ decl_module! {
 		#[weight = T::WeightInfo::cancel_named(T::MaxScheduledPerBlock::get())]
 		fn cancel_named(origin, id: Vec<u8>) {
 			T::ScheduleOrigin::ensure_origin(origin.clone())?;
-			let origin = <T as Trait>::Origin::from(origin);
+			let origin = <T as Config>::Origin::from(origin);
 			Self::do_cancel_named(Some(origin.caller().clone()), id)?;
 		}
 
@@ -286,10 +286,10 @@ decl_module! {
 			after: T::BlockNumber,
 			maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
 			priority: schedule::Priority,
-			call: Box<<T as Trait>::Call>,
+			call: Box<<T as Config>::Call>,
 		) {
 			T::ScheduleOrigin::ensure_origin(origin.clone())?;
-			let origin = <T as Trait>::Origin::from(origin);
+			let origin = <T as Config>::Origin::from(origin);
 			Self::do_schedule(
 				DispatchTime::After(after), maybe_periodic, priority, origin.caller().clone(), *call
 			)?;
@@ -306,10 +306,10 @@ decl_module! {
 			after: T::BlockNumber,
 			maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
 			priority: schedule::Priority,
-			call: Box<<T as Trait>::Call>,
+			call: Box<<T as Config>::Call>,
 		) {
 			T::ScheduleOrigin::ensure_origin(origin.clone())?;
-			let origin = <T as Trait>::Origin::from(origin);
+			let origin = <T as Config>::Origin::from(origin);
 			Self::do_schedule_named(
 				id, DispatchTime::After(after), maybe_periodic, priority, origin.caller().clone(), *call
 			)?;
@@ -347,7 +347,7 @@ decl_module! {
 					*cumulative_weight = cumulative_weight
 						.saturating_add(s.call.get_dispatch_info().weight);
 
-					let origin = <<T as Trait>::Origin as From<T::PalletsOrigin>>::from(
+					let origin = <<T as Config>::Origin as From<T::PalletsOrigin>>::from(
 						s.origin.clone()
 					).into();
 
@@ -415,7 +415,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Migrate storage format from V1 to V2.
 	/// Return true if migration is performed.
 	pub fn migrate_v1_to_t2() -> bool {
@@ -423,7 +423,7 @@ impl<T: Trait> Module<T> {
 			StorageVersion::put(Releases::V2);
 
 			Agenda::<T>::translate::<
-				Vec<Option<ScheduledV1<<T as Trait>::Call, T::BlockNumber>>>, _
+				Vec<Option<ScheduledV1<<T as Config>::Call, T::BlockNumber>>>, _
 			>(|_, agenda| Some(
 				agenda
 					.into_iter()
@@ -447,7 +447,7 @@ impl<T: Trait> Module<T> {
 	/// Helper to migrate scheduler when the pallet origin type has changed.
 	pub fn migrate_origin<OldOrigin: Into<T::PalletsOrigin> + codec::Decode>() {
 		Agenda::<T>::translate::<
-			Vec<Option<Scheduled<<T as Trait>::Call, T::BlockNumber, OldOrigin, T::AccountId>>>, _
+			Vec<Option<Scheduled<<T as Config>::Call, T::BlockNumber, OldOrigin, T::AccountId>>>, _
 		>(|_, agenda| Some(
 			agenda
 				.into_iter()
@@ -485,7 +485,7 @@ impl<T: Trait> Module<T> {
 		maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
 		priority: schedule::Priority,
 		origin: T::PalletsOrigin,
-		call: <T as Trait>::Call
+		call: <T as Config>::Call
 	) -> Result<TaskAddress<T::BlockNumber>, DispatchError> {
 		let when = Self::resolve_time(when)?;
 
@@ -569,7 +569,7 @@ impl<T: Trait> Module<T> {
 		maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
 		priority: schedule::Priority,
 		origin: T::PalletsOrigin,
-		call: <T as Trait>::Call,
+		call: <T as Config>::Call,
 	) -> Result<TaskAddress<T::BlockNumber>, DispatchError> {
 		// ensure id it is unique
 		if Lookup::<T>::contains_key(&id) {
@@ -657,7 +657,7 @@ impl<T: Trait> Module<T> {
 	}
 }
 
-impl<T: Trait> schedule::Anon<T::BlockNumber, <T as Trait>::Call, T::PalletsOrigin> for Module<T> {
+impl<T: Config> schedule::Anon<T::BlockNumber, <T as Config>::Call, T::PalletsOrigin> for Module<T> {
 	type Address = TaskAddress<T::BlockNumber>;
 
 	fn schedule(
@@ -665,7 +665,7 @@ impl<T: Trait> schedule::Anon<T::BlockNumber, <T as Trait>::Call, T::PalletsOrig
 		maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
 		priority: schedule::Priority,
 		origin: T::PalletsOrigin,
-		call: <T as Trait>::Call
+		call: <T as Config>::Call
 	) -> Result<Self::Address, DispatchError> {
 		Self::do_schedule(when, maybe_periodic, priority, origin, call)
 	}
@@ -686,7 +686,7 @@ impl<T: Trait> schedule::Anon<T::BlockNumber, <T as Trait>::Call, T::PalletsOrig
 	}
 }
 
-impl<T: Trait> schedule::Named<T::BlockNumber, <T as Trait>::Call, T::PalletsOrigin> for Module<T> {
+impl<T: Config> schedule::Named<T::BlockNumber, <T as Config>::Call, T::PalletsOrigin> for Module<T> {
 	type Address = TaskAddress<T::BlockNumber>;
 
 	fn schedule_named(
@@ -695,7 +695,7 @@ impl<T: Trait> schedule::Named<T::BlockNumber, <T as Trait>::Call, T::PalletsOri
 		maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
 		priority: schedule::Priority,
 		origin: T::PalletsOrigin,
-		call: <T as Trait>::Call,
+		call: <T as Config>::Call,
 	) -> Result<Self::Address, ()> {
 		Self::do_schedule_named(id, when, maybe_periodic, priority, origin, call).map_err(|_| ())
 	}
@@ -746,8 +746,8 @@ mod tests {
 		pub fn log() -> Vec<(OriginCaller, u32)> {
 			LOG.with(|log| log.borrow().clone())
 		}
-		pub trait Trait: system::Trait {
-			type Event: From<Event> + Into<<Self as system::Trait>::Event>;
+		pub trait Config: system::Config {
+			type Event: From<Event> + Into<<Self as system::Config>::Event>;
 		}
 		decl_event! {
 			pub enum Event {
@@ -755,10 +755,10 @@ mod tests {
 			}
 		}
 		decl_module! {
-			pub struct Module<T: Trait> for enum Call
+			pub struct Module<T: Config> for enum Call
 			where
-				origin: <T as system::Trait>::Origin,
-				<T as system::Trait>::Origin: OriginTrait<PalletsOrigin = OriginCaller>
+				origin: <T as system::Config>::Origin,
+				<T as system::Config>::Origin: OriginTrait<PalletsOrigin = OriginCaller>
 			{
 				fn deposit_event() = default;
 
@@ -816,7 +816,7 @@ mod tests {
 		pub const MaximumBlockLength: u32 = 2 * 1024;
 		pub const AvailableBlockRatio: Perbill = Perbill::one();
 	}
-	impl system::Trait for Test {
+	impl system::Config for Test {
 		type BaseCallFilter = BaseFilter;
 		type Origin = Origin;
 		type Call = Call;
@@ -843,7 +843,7 @@ mod tests {
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
 	}
-	impl logger::Trait for Test {
+	impl logger::Config for Test {
 		type Event = ();
 	}
 	parameter_types! {
@@ -854,7 +854,7 @@ mod tests {
 		pub const One: u64 = 1;
 	}
 
-	impl Trait for Test {
+	impl Config for Test {
 		type Event = ();
 		type Origin = Origin;
 		type PalletsOrigin = OriginCaller;
@@ -889,7 +889,7 @@ mod tests {
 	fn basic_scheduling_works() {
 		new_test_ext().execute_with(|| {
 			let call = Call::Logger(logger::Call::log(42, 1000));
-			assert!(!<Test as frame_system::Trait>::BaseCallFilter::filter(&call));
+			assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
 			assert_ok!(Scheduler::do_schedule(DispatchTime::At(4), None, 127, root(), call));
 			run_to_block(3);
 			assert!(logger::log().is_empty());
@@ -905,7 +905,7 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			run_to_block(2);
 			let call = Call::Logger(logger::Call::log(42, 1000));
-			assert!(!<Test as frame_system::Trait>::BaseCallFilter::filter(&call));
+			assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
 			// This will schedule the call 3 blocks after the next block... so block 3 + 3 = 6
 			assert_ok!(Scheduler::do_schedule(DispatchTime::After(3), None, 127, root(), call));
 			run_to_block(5);
@@ -922,7 +922,7 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			run_to_block(2);
 			let call = Call::Logger(logger::Call::log(42, 1000));
-			assert!(!<Test as frame_system::Trait>::BaseCallFilter::filter(&call));
+			assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
 			assert_ok!(Scheduler::do_schedule(DispatchTime::After(0), None, 127, root(), call));
 			// Will trigger on the next block.
 			run_to_block(3);
@@ -960,7 +960,7 @@ mod tests {
 	fn reschedule_works() {
 		new_test_ext().execute_with(|| {
 			let call = Call::Logger(logger::Call::log(42, 1000));
-			assert!(!<Test as frame_system::Trait>::BaseCallFilter::filter(&call));
+			assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
 			assert_eq!(Scheduler::do_schedule(DispatchTime::At(4), None, 127, root(), call).unwrap(), (4, 0));
 
 			run_to_block(3);
@@ -985,7 +985,7 @@ mod tests {
 	fn reschedule_named_works() {
 		new_test_ext().execute_with(|| {
 			let call = Call::Logger(logger::Call::log(42, 1000));
-			assert!(!<Test as frame_system::Trait>::BaseCallFilter::filter(&call));
+			assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
 			assert_eq!(Scheduler::do_schedule_named(
 				1u32.encode(), DispatchTime::At(4), None, 127, root(), call
 			).unwrap(), (4, 0));
@@ -1012,7 +1012,7 @@ mod tests {
 	fn reschedule_named_perodic_works() {
 		new_test_ext().execute_with(|| {
 			let call = Call::Logger(logger::Call::log(42, 1000));
-			assert!(!<Test as frame_system::Trait>::BaseCallFilter::filter(&call));
+			assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
 			assert_eq!(Scheduler::do_schedule_named(
 				1u32.encode(), DispatchTime::At(4), Some((3, 3)), 127, root(), call
 			).unwrap(), (4, 0));
@@ -1203,10 +1203,10 @@ mod tests {
 	#[test]
 	fn on_initialize_weight_is_correct() {
 		new_test_ext().execute_with(|| {
-			let base_weight: Weight = <Test as frame_system::Trait>::DbWeight::get().reads_writes(1, 2);
+			let base_weight: Weight = <Test as frame_system::Config>::DbWeight::get().reads_writes(1, 2);
 			let base_multiplier = 0;
-			let named_multiplier = <Test as frame_system::Trait>::DbWeight::get().writes(1);
-			let periodic_multiplier = <Test as frame_system::Trait>::DbWeight::get().reads_writes(1, 1);
+			let named_multiplier = <Test as frame_system::Config>::DbWeight::get().writes(1);
+			let periodic_multiplier = <Test as frame_system::Config>::DbWeight::get().reads_writes(1, 1);
 
 			// Named
 			assert_ok!(
diff --git a/frame/scheduler/src/weights.rs b/frame/scheduler/src/weights.rs
index 3699e6f85b23..3c8be54c9ae5 100644
--- a/frame/scheduler/src/weights.rs
+++ b/frame/scheduler/src/weights.rs
@@ -52,7 +52,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_scheduler using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn schedule(s: u32, ) -> Weight {
 		(35_029_000 as Weight)
 			.saturating_add((77_000 as Weight).saturating_mul(s as Weight))
diff --git a/frame/scored-pool/src/lib.rs b/frame/scored-pool/src/lib.rs
index 90d4aca4e42a..afcac229367b 100644
--- a/frame/scored-pool/src/lib.rs
+++ b/frame/scored-pool/src/lib.rs
@@ -37,7 +37,7 @@
 //! from the `Pool` and `Members`; the entity is immediately replaced
 //! by the next highest scoring candidate in the pool, if available.
 //!
-//! - [`scored_pool::Trait`](./trait.Trait.html)
+//! - [`scored_pool::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //! - [`Module`](./struct.Module.html)
 //!
@@ -58,10 +58,10 @@
 //! use frame_system::ensure_signed;
 //! use pallet_scored_pool::{self as scored_pool};
 //!
-//! pub trait Trait: scored_pool::Trait {}
+//! pub trait Config: scored_pool::Config {}
 //!
 //! decl_module! {
-//! 	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+//! 	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 //! 		#[weight = 0]
 //! 		pub fn candidate(origin) -> dispatch::DispatchResult {
 //! 			let who = ensure_signed(origin)?;
@@ -103,8 +103,8 @@ use frame_support::{
 use frame_system::{ensure_root, ensure_signed};
 use sp_runtime::traits::{AtLeast32Bit, MaybeSerializeDeserialize, Zero, StaticLookup};
 
-type BalanceOf<T, I> = <<T as Trait<I>>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
-type PoolT<T, I> = Vec<(<T as frame_system::Trait>::AccountId, Option<<T as Trait<I>>::Score>)>;
+type BalanceOf<T, I> = <<T as Config<I>>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+type PoolT<T, I> = Vec<(<T as frame_system::Config>::AccountId, Option<<T as Config<I>>::Score>)>;
 
 /// The enum is supplied when refreshing the members set.
 /// Depending on the enum variant the corresponding associated
@@ -116,7 +116,7 @@ enum ChangeReceiver {
 	MembershipChanged,
 }
 
-pub trait Trait<I=DefaultInstance>: frame_system::Trait {
+pub trait Config<I=DefaultInstance>: frame_system::Config {
 	/// The currency used for deposits.
 	type Currency: Currency<Self::AccountId> + ReservableCurrency<Self::AccountId>;
 
@@ -125,7 +125,7 @@ pub trait Trait<I=DefaultInstance>: frame_system::Trait {
 		AtLeast32Bit + Clone + Copy + Default + FullCodec + MaybeSerializeDeserialize + Debug;
 
 	/// The overarching event type.
-	type Event: From<Event<Self, I>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self, I>> + Into<<Self as frame_system::Config>::Event>;
 
 	// The deposit which is reserved from candidates if they want to
 	// start a candidacy. The deposit gets returned when the candidacy is
@@ -156,7 +156,7 @@ pub trait Trait<I=DefaultInstance>: frame_system::Trait {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait<I>, I: Instance=DefaultInstance> as ScoredPool {
+	trait Store for Module<T: Config<I>, I: Instance=DefaultInstance> as ScoredPool {
 		/// The current pool of candidates, stored as an ordered Vec
 		/// (ordered descending by score, `None` last, highest first).
 		Pool get(fn pool) config(): PoolT<T, I>;
@@ -204,7 +204,7 @@ decl_storage! {
 
 decl_event!(
 	pub enum Event<T, I=DefaultInstance> where
-		<T as frame_system::Trait>::AccountId,
+		<T as frame_system::Config>::AccountId,
 	{
 		/// The given member was removed. See the transaction for who.
 		MemberRemoved,
@@ -225,7 +225,7 @@ decl_event!(
 
 decl_error! {
 	/// Error for the scored-pool module.
-	pub enum Error for Module<T: Trait<I>, I: Instance> {
+	pub enum Error for Module<T: Config<I>, I: Instance> {
 		/// Already a member.
 		AlreadyInPool,
 		/// Index out of bounds.
@@ -236,7 +236,7 @@ decl_error! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait<I>, I: Instance=DefaultInstance>
+	pub struct Module<T: Config<I>, I: Instance=DefaultInstance>
 		for enum Call
 		where origin: T::Origin
 	{
@@ -275,7 +275,7 @@ decl_module! {
 
 			// can be inserted as last element in pool, since entities with
 			// `None` are always sorted to the end.
-			<Pool<T, I>>::append((who.clone(), Option::<<T as Trait<I>>::Score>::None));
+			<Pool<T, I>>::append((who.clone(), Option::<<T as Config<I>>::Score>::None));
 
 			<CandidateExists<T, I>>::insert(&who, true);
 
@@ -382,7 +382,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait<I>, I: Instance> Module<T, I> {
+impl<T: Config<I>, I: Instance> Module<T, I> {
 
 	/// Fetches the `MemberCount` highest scoring members from
 	/// `Pool` and puts them into `Members`.
diff --git a/frame/scored-pool/src/mock.rs b/frame/scored-pool/src/mock.rs
index 59c0dc66cca6..537084bb3949 100644
--- a/frame/scored-pool/src/mock.rs
+++ b/frame/scored-pool/src/mock.rs
@@ -49,7 +49,7 @@ ord_parameter_types! {
 	pub const ScoreOrigin: u64 = 3;
 }
 
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = u64;
@@ -77,7 +77,7 @@ impl frame_system::Trait for Test {
 	type SystemWeightInfo = ();
 }
 
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u64;
 	type Event = ();
@@ -114,7 +114,7 @@ impl InitializeMembers<u64> for TestChangeMembers {
 	}
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type Event = ();
 	type KickOrigin = EnsureSignedBy<KickOrigin, u64>;
 	type MembershipInitialized = TestChangeMembers;
diff --git a/frame/session/benchmarking/src/lib.rs b/frame/session/benchmarking/src/lib.rs
index 277200b26956..bd85b97c0d33 100644
--- a/frame/session/benchmarking/src/lib.rs
+++ b/frame/session/benchmarking/src/lib.rs
@@ -41,10 +41,10 @@ use sp_runtime::traits::{One, StaticLookup};
 
 const MAX_VALIDATORS: u32 = 1000;
 
-pub struct Module<T: Trait>(pallet_session::Module<T>);
-pub trait Trait: pallet_session::Trait + pallet_session::historical::Trait + pallet_staking::Trait {}
+pub struct Module<T: Config>(pallet_session::Module<T>);
+pub trait Config: pallet_session::Config + pallet_session::historical::Config + pallet_staking::Config {}
 
-impl<T: Trait> OnInitialize<T::BlockNumber> for Module<T> {
+impl<T: Config> OnInitialize<T::BlockNumber> for Module<T> {
 	fn on_initialize(n: T::BlockNumber) -> frame_support::weights::Weight {
 		pallet_session::Module::<T>::on_initialize(n)
 	}
@@ -121,7 +121,7 @@ benchmarks! {
 /// Sets up the benchmark for checking a membership proof. It creates the given
 /// number of validators, sets random session keys and then creates a membership
 /// proof for the first authority and returns its key and the proof.
-fn check_membership_proof_setup<T: Trait>(
+fn check_membership_proof_setup<T: Config>(
 	n: u32,
 ) -> (
 	(sp_runtime::KeyTypeId, &'static [u8; 32]),
diff --git a/frame/session/benchmarking/src/mock.rs b/frame/session/benchmarking/src/mock.rs
index 6a9cfc5f98a1..af3112823d93 100644
--- a/frame/session/benchmarking/src/mock.rs
+++ b/frame/session/benchmarking/src/mock.rs
@@ -45,7 +45,7 @@ impl_outer_dispatch! {
 #[derive(Clone, Eq, PartialEq, Debug)]
 pub struct Test;
 
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = AccountIndex;
@@ -75,7 +75,7 @@ impl frame_system::Trait for Test {
 parameter_types! {
 	pub const ExistentialDeposit: Balance = 10;
 }
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = Balance;
 	type Event = ();
@@ -88,13 +88,13 @@ impl pallet_balances::Trait for Test {
 parameter_types! {
 	pub const MinimumPeriod: u64 = 5;
 }
-impl pallet_timestamp::Trait for Test {
+impl pallet_timestamp::Config for Test {
 	type Moment = u64;
 	type OnTimestampSet = ();
 	type MinimumPeriod = MinimumPeriod;
 	type WeightInfo = ();
 }
-impl pallet_session::historical::Trait for Test {
+impl pallet_session::historical::Config for Test {
 	type FullIdentification = pallet_staking::Exposure<AccountId, Balance>;
 	type FullIdentificationOf = pallet_staking::ExposureOf<Test>;
 }
@@ -120,7 +120,7 @@ impl pallet_session::SessionHandler<AccountId> for TestSessionHandler {
 	fn on_disabled(_: usize) {}
 }
 
-impl pallet_session::Trait for Test {
+impl pallet_session::Config for Test {
 	type SessionManager = pallet_session::historical::NoteHistoricalRoot<Test, Staking>;
 	type Keys = SessionKeys;
 	type ShouldEndSession = pallet_session::PeriodicSessions<(), ()>;
@@ -157,7 +157,7 @@ impl<C> frame_system::offchain::SendTransactionTypes<C> for Test where
 	type Extrinsic = Extrinsic;
 }
 
-impl pallet_staking::Trait for Test {
+impl pallet_staking::Config for Test {
 	type Currency = Balances;
 	type UnixTime = pallet_timestamp::Module<Self>;
 	type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote;
@@ -182,7 +182,7 @@ impl pallet_staking::Trait for Test {
 	type WeightInfo = ();
 }
 
-impl crate::Trait for Test {}
+impl crate::Config for Test {}
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
diff --git a/frame/session/src/historical/mod.rs b/frame/session/src/historical/mod.rs
index 20c3d57464c8..53f4dd7639b8 100644
--- a/frame/session/src/historical/mod.rs
+++ b/frame/session/src/historical/mod.rs
@@ -41,8 +41,8 @@ mod shared;
 pub mod offchain;
 pub mod onchain;
 
-/// Trait necessary for the historical module.
-pub trait Trait: super::Trait {
+/// Config necessary for the historical module.
+pub trait Config: super::Config {
 	/// Full identification of the validator.
 	type FullIdentification: Parameter;
 
@@ -57,7 +57,7 @@ pub trait Trait: super::Trait {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Session {
+	trait Store for Module<T: Config> as Session {
 		/// Mapping from historical session indices to session-data root hash and validator count.
 		HistoricalSessions get(fn historical_root):
 			map hasher(twox_64_concat) SessionIndex => Option<(T::Hash, ValidatorCount)>;
@@ -71,10 +71,10 @@ decl_storage! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {}
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Prune historical stored session roots up to (but not including)
 	/// `up_to`.
 	pub fn prune_up_to(up_to: SessionIndex) {
@@ -116,7 +116,7 @@ pub trait SessionManager<ValidatorId, FullIdentification>: crate::SessionManager
 /// sets the historical trie root of the ending session.
 pub struct NoteHistoricalRoot<T, I>(sp_std::marker::PhantomData<(T, I)>);
 
-impl<T: Trait, I> crate::SessionManager<T::ValidatorId> for NoteHistoricalRoot<T, I>
+impl<T: Config, I> crate::SessionManager<T::ValidatorId> for NoteHistoricalRoot<T, I>
 	where I: SessionManager<T::ValidatorId, T::FullIdentification>
 {
 	fn new_session(new_index: SessionIndex) -> Option<Vec<T::ValidatorId>> {
@@ -160,15 +160,15 @@ impl<T: Trait, I> crate::SessionManager<T::ValidatorId> for NoteHistoricalRoot<T
 }
 
 /// A tuple of the validator's ID and their full identification.
-pub type IdentificationTuple<T> = (<T as crate::Trait>::ValidatorId, <T as Trait>::FullIdentification);
+pub type IdentificationTuple<T> = (<T as crate::Config>::ValidatorId, <T as Config>::FullIdentification);
 
 /// A trie instance for checking and generating proofs.
-pub struct ProvingTrie<T: Trait> {
+pub struct ProvingTrie<T: Config> {
 	db: MemoryDB<T::Hashing>,
 	root: T::Hash,
 }
 
-impl<T: Trait> ProvingTrie<T> {
+impl<T: Config> ProvingTrie<T> {
 	fn generate_for<I>(validators: I) -> Result<Self, &'static str>
 		where I: IntoIterator<Item=(T::ValidatorId, T::FullIdentification)>
 	{
@@ -260,7 +260,7 @@ impl<T: Trait> ProvingTrie<T> {
 	}
 }
 
-impl<T: Trait, D: AsRef<[u8]>> frame_support::traits::KeyOwnerProofSystem<(KeyTypeId, D)>
+impl<T: Config, D: AsRef<[u8]>> frame_support::traits::KeyOwnerProofSystem<(KeyTypeId, D)>
 	for Module<T>
 {
 	type Proof = MembershipProof;
diff --git a/frame/session/src/historical/offchain.rs b/frame/session/src/historical/offchain.rs
index 97655d1a18b3..616cdede254e 100644
--- a/frame/session/src/historical/offchain.rs
+++ b/frame/session/src/historical/offchain.rs
@@ -29,18 +29,18 @@ use sp_runtime::{offchain::storage::StorageValueRef, KeyTypeId};
 use sp_session::MembershipProof;
 
 use super::super::{Module as SessionModule, SessionIndex};
-use super::{IdentificationTuple, ProvingTrie, Trait};
+use super::{IdentificationTuple, ProvingTrie, Config};
 
 use super::shared;
 use sp_std::prelude::*;
 
 
 /// A set of validators, which was used for a fixed session index.
-struct ValidatorSet<T: Trait> {
+struct ValidatorSet<T: Config> {
 	validator_set: Vec<IdentificationTuple<T>>,
 }
 
-impl<T: Trait> ValidatorSet<T> {
+impl<T: Config> ValidatorSet<T> {
 	/// Load the set of validators for a particular session index from the off-chain storage.
 	///
 	/// If none is found or decodable given `prefix` and `session`, it will return `None`.
@@ -61,7 +61,7 @@ impl<T: Trait> ValidatorSet<T> {
 
 /// Implement conversion into iterator for usage
 /// with [ProvingTrie](super::ProvingTrie::generate_for).
-impl<T: Trait> sp_std::iter::IntoIterator for ValidatorSet<T> {
+impl<T: Config> sp_std::iter::IntoIterator for ValidatorSet<T> {
 	type Item = (T::ValidatorId, T::FullIdentification);
 	type IntoIter = sp_std::vec::IntoIter<Self::Item>;
 	fn into_iter(self) -> Self::IntoIter {
@@ -74,7 +74,7 @@ impl<T: Trait> sp_std::iter::IntoIterator for ValidatorSet<T> {
 /// Based on the yielded `MembershipProof` the implementer may decide what
 /// to do, i.e. in case of a failed proof, enqueue a transaction back on
 /// chain reflecting that, with all its consequences such as i.e. slashing.
-pub fn prove_session_membership<T: Trait, D: AsRef<[u8]>>(
+pub fn prove_session_membership<T: Config, D: AsRef<[u8]>>(
 	session_index: SessionIndex,
 	session_key: (KeyTypeId, D),
 ) -> Option<MembershipProof> {
@@ -97,7 +97,7 @@ pub fn prove_session_membership<T: Trait, D: AsRef<[u8]>>(
 /// Due to re-organisation it could be that the `first_to_keep` might be less
 /// than the stored one, in which case the conservative choice is made to keep records
 /// up to the one that is the lesser.
-pub fn prune_older_than<T: Trait>(first_to_keep: SessionIndex) {
+pub fn prune_older_than<T: Config>(first_to_keep: SessionIndex) {
 	let derived_key = shared::LAST_PRUNE.to_vec();
 	let entry = StorageValueRef::persistent(derived_key.as_ref());
 	match entry.mutate(|current: Option<Option<SessionIndex>>| -> Result<_, ()> {
@@ -127,7 +127,7 @@ pub fn prune_older_than<T: Trait>(first_to_keep: SessionIndex) {
 }
 
 /// Keep the newest `n` items, and prune all items older than that.
-pub fn keep_newest<T: Trait>(n_to_keep: usize) {
+pub fn keep_newest<T: Config>(n_to_keep: usize) {
 	let session_index = <SessionModule<T>>::current_index();
 	let n_to_keep = n_to_keep as SessionIndex;
 	if n_to_keep < session_index {
@@ -189,8 +189,8 @@ mod tests {
 	#[test]
 	fn encode_decode_roundtrip() {
 		use codec::{Decode, Encode};
-		use super::super::super::Trait as SessionTrait;
-		use super::super::Trait as HistoricalTrait;
+		use super::super::super::Config as SessionTrait;
+		use super::super::Config as HistoricalTrait;
 
 		let sample = (
 				22u32 as <Test as SessionTrait>::ValidatorId,
diff --git a/frame/session/src/historical/onchain.rs b/frame/session/src/historical/onchain.rs
index 745603a49829..dd6c9de9b58b 100644
--- a/frame/session/src/historical/onchain.rs
+++ b/frame/session/src/historical/onchain.rs
@@ -20,9 +20,9 @@
 use codec::Encode;
 use sp_runtime::traits::Convert;
 
-use super::super::Trait as SessionTrait;
+use super::super::Config as SessionTrait;
 use super::super::{Module as SessionModule, SessionIndex};
-use super::Trait as HistoricalTrait;
+use super::Config as HistoricalTrait;
 
 use super::shared;
 use sp_std::prelude::*;
diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs
index c0a8fc29165b..40ae5bed83e4 100644
--- a/frame/session/src/lib.rs
+++ b/frame/session/src/lib.rs
@@ -20,7 +20,7 @@
 //! The Session module allows validators to manage their session keys, provides a function for changing
 //! the session length, and handles session rotation.
 //!
-//! - [`session::Trait`](./trait.Trait.html)
+//! - [`session::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //! - [`Module`](./struct.Module.html)
 //!
@@ -88,7 +88,7 @@
 //! ```
 //! use pallet_session as session;
 //!
-//! fn validators<T: pallet_session::Trait>() -> Vec<<T as pallet_session::Trait>::ValidatorId> {
+//! fn validators<T: pallet_session::Config>() -> Vec<<T as pallet_session::Config>::ValidatorId> {
 //!	<pallet_session::Module<T>>::validators()
 //! }
 //! # fn main(){}
@@ -346,15 +346,15 @@ impl<AId> SessionHandler<AId> for TestSessionHandler {
 	fn on_disabled(_: usize) {}
 }
 
-impl<T: Trait> ValidatorRegistration<T::ValidatorId> for Module<T> {
+impl<T: Config> ValidatorRegistration<T::ValidatorId> for Module<T> {
 	fn is_registered(id: &T::ValidatorId) -> bool {
 		Self::load_keys(id).is_some()
 	}
 }
 
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The overarching event type.
-	type Event: From<Event> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event> + Into<<Self as frame_system::Config>::Event>;
 
 	/// A stable ID for a validator.
 	type ValidatorId: Member + Parameter;
@@ -392,7 +392,7 @@ pub trait Trait: frame_system::Trait {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Session {
+	trait Store for Module<T: Config> as Session {
 		/// The current set of validators.
 		Validators get(fn validators): Vec<T::ValidatorId>;
 
@@ -483,7 +483,7 @@ decl_event!(
 
 decl_error! {
 	/// Error for the session module.
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Invalid ownership proof.
 		InvalidProof,
 		/// No associated validator ID for account.
@@ -496,7 +496,7 @@ decl_error! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		type Error = Error<T>;
 
 		fn deposit_event() = default;
@@ -560,7 +560,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Move on to next session. Register new validator set and session keys. Changes
 	/// to the validator set have a session of delay to take effect. This allows for
 	/// equivocation punishment after a fork.
@@ -776,7 +776,7 @@ impl<T: Trait> Module<T> {
 /// registering account-ID of that session key index.
 pub struct FindAccountFromAuthorIndex<T, Inner>(sp_std::marker::PhantomData<(T, Inner)>);
 
-impl<T: Trait, Inner: FindAuthor<u32>> FindAuthor<T::ValidatorId>
+impl<T: Config, Inner: FindAuthor<u32>> FindAuthor<T::ValidatorId>
 	for FindAccountFromAuthorIndex<T, Inner>
 {
 	fn find_author<'a, I>(digests: I) -> Option<T::ValidatorId>
@@ -789,7 +789,7 @@ impl<T: Trait, Inner: FindAuthor<u32>> FindAuthor<T::ValidatorId>
 	}
 }
 
-impl<T: Trait> EstimateNextNewSession<T::BlockNumber> for Module<T> {
+impl<T: Config> EstimateNextNewSession<T::BlockNumber> for Module<T> {
 	/// This session module always calls new_session and next_session at the same time, hence we
 	/// do a simple proxy and pass the function to next rotation.
 	fn estimate_next_new_session(now: T::BlockNumber) -> Option<T::BlockNumber> {
diff --git a/frame/session/src/mock.rs b/frame/session/src/mock.rs
index 1d787ac53b43..d485565db237 100644
--- a/frame/session/src/mock.rs
+++ b/frame/session/src/mock.rs
@@ -172,7 +172,7 @@ parameter_types! {
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
 
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = u64;
@@ -200,7 +200,7 @@ impl frame_system::Trait for Test {
 	type SystemWeightInfo = ();
 }
 
-impl pallet_timestamp::Trait for Test {
+impl pallet_timestamp::Config for Test {
 	type Moment = u64;
 	type OnTimestampSet = ();
 	type MinimumPeriod = MinimumPeriod;
@@ -211,7 +211,7 @@ parameter_types! {
 	pub const DisabledValidatorsThreshold: Perbill = Perbill::from_percent(33);
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type ShouldEndSession = TestShouldEndSession;
 	#[cfg(feature = "historical")]
 	type SessionManager = crate::historical::NoteHistoricalRoot<Test, TestSessionManager>;
@@ -228,7 +228,7 @@ impl Trait for Test {
 }
 
 #[cfg(feature = "historical")]
-impl crate::historical::Trait for Test {
+impl crate::historical::Config for Test {
 	type FullIdentification = u64;
 	type FullIdentificationOf = sp_runtime::traits::ConvertInto;
 }
diff --git a/frame/session/src/tests.rs b/frame/session/src/tests.rs
index 75def78046be..36857824de8b 100644
--- a/frame/session/src/tests.rs
+++ b/frame/session/src/tests.rs
@@ -285,7 +285,7 @@ fn session_keys_generate_output_works_as_set_keys_input() {
 		assert_ok!(
 			Session::set_keys(
 				Origin::signed(2),
-				<mock::Test as Trait>::Keys::decode(&mut &new_keys[..]).expect("Decode keys"),
+				<mock::Test as Config>::Keys::decode(&mut &new_keys[..]).expect("Decode keys"),
 				vec![],
 			)
 		);
diff --git a/frame/session/src/weights.rs b/frame/session/src/weights.rs
index f1fc18b0ef99..243ddc04b085 100644
--- a/frame/session/src/weights.rs
+++ b/frame/session/src/weights.rs
@@ -50,7 +50,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_session using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn set_keys() -> Weight {
 		(86_033_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
diff --git a/frame/society/src/lib.rs b/frame/society/src/lib.rs
index cbfe5a00de24..7859f6659cf2 100644
--- a/frame/society/src/lib.rs
+++ b/frame/society/src/lib.rs
@@ -17,7 +17,7 @@
 
 //! # Society Module
 //!
-//! - [`society::Trait`](./trait.Trait.html)
+//! - [`society::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //!
 //! ## Overview
@@ -268,13 +268,13 @@ use frame_support::traits::{
 };
 use frame_system::{self as system, ensure_signed, ensure_root};
 
-type BalanceOf<T, I> = <<T as Trait<I>>::Currency as Currency<<T as system::Trait>::AccountId>>::Balance;
-type NegativeImbalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::NegativeImbalance;
+type BalanceOf<T, I> = <<T as Config<I>>::Currency as Currency<<T as system::Config>::AccountId>>::Balance;
+type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
 
 /// The module's configuration trait.
-pub trait Trait<I=DefaultInstance>: system::Trait {
+pub trait Config<I=DefaultInstance>: system::Config {
 	/// The overarching event type.
-	type Event: From<Event<Self, I>> + Into<<Self as system::Trait>::Event>;
+	type Event: From<Event<Self, I>> + Into<<Self as system::Config>::Event>;
 
 	/// The societies's module id
 	type ModuleId: Get<ModuleId>;
@@ -403,7 +403,7 @@ impl<AccountId: PartialEq, Balance> BidKind<AccountId, Balance> {
 
 // This module's storage items.
 decl_storage! {
-	trait Store for Module<T: Trait<I>, I: Instance=DefaultInstance> as Society {
+	trait Store for Module<T: Config<I>, I: Instance=DefaultInstance> as Society {
 		/// The first member.
 		pub Founder get(fn founder) build(|config: &GenesisConfig<T, I>| config.members.first().cloned()):
 			Option<T::AccountId>;
@@ -472,7 +472,7 @@ decl_storage! {
 // The module's dispatchable functions.
 decl_module! {
 	/// The module declaration.
-	pub struct Module<T: Trait<I>, I: Instance=DefaultInstance> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config<I>, I: Instance=DefaultInstance> for enum Call where origin: T::Origin {
 		type Error = Error<T, I>;
 		/// The minimum amount of a deposit required for a bid to be made.
 		const CandidateDeposit: BalanceOf<T, I> = T::CandidateDeposit::get();
@@ -1065,7 +1065,7 @@ decl_module! {
 
 decl_error! {
 	/// Errors for this module.
-	pub enum Error for Module<T: Trait<I>, I: Instance> {
+	pub enum Error for Module<T: Config<I>, I: Instance> {
 		/// An incorrect position was provided.
 		BadPosition,
 		/// User is not a member.
@@ -1108,7 +1108,7 @@ decl_error! {
 decl_event! {
 	/// Events for this module.
 	pub enum Event<T, I=DefaultInstance> where
-		AccountId = <T as system::Trait>::AccountId,
+		AccountId = <T as system::Config>::AccountId,
 		Balance = BalanceOf<T, I>
 	{
 		/// The society is founded by the given identity. \[founder\]
@@ -1151,7 +1151,7 @@ decl_event! {
 
 /// Simple ensure origin struct to filter for the founder account.
 pub struct EnsureFounder<T>(sp_std::marker::PhantomData<T>);
-impl<T: Trait> EnsureOrigin<T::Origin> for EnsureFounder<T> {
+impl<T: Config> EnsureOrigin<T::Origin> for EnsureFounder<T> {
 	type Success = T::AccountId;
 	fn try_origin(o: T::Origin) -> Result<Self::Success, T::Origin> {
 		o.into().and_then(|o| match (o, Founder::<T>::get()) {
@@ -1182,7 +1182,7 @@ fn pick_usize<'a, R: RngCore>(rng: &mut R, max: usize) -> usize {
 	(rng.next_u32() % (max as u32 + 1)) as usize
 }
 
-impl<T: Trait<I>, I: Instance> Module<T, I> {
+impl<T: Config<I>, I: Instance> Module<T, I> {
 	/// Puts a bid into storage ordered by smallest to largest value.
 	/// Allows a maximum of 1000 bids in queue, removing largest value people first.
 	fn put_bid(
@@ -1669,7 +1669,7 @@ impl<T: Trait<I>, I: Instance> Module<T, I> {
 	}
 }
 
-impl<T: Trait> OnUnbalanced<NegativeImbalanceOf<T>> for Module<T> {
+impl<T: Config> OnUnbalanced<NegativeImbalanceOf<T>> for Module<T> {
 	fn on_nonzero_unbalanced(amount: NegativeImbalanceOf<T>) {
 		let numeric_amount = amount.peek();
 
diff --git a/frame/society/src/mock.rs b/frame/society/src/mock.rs
index 212bcfd404ff..d4fa1bcfbc74 100644
--- a/frame/society/src/mock.rs
+++ b/frame/society/src/mock.rs
@@ -60,7 +60,7 @@ ord_parameter_types! {
 	pub const SuspensionJudgementSetAccount: u128 = 2;
 }
 
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = u64;
@@ -88,7 +88,7 @@ impl frame_system::Trait for Test {
 	type SystemWeightInfo = ();
 }
 
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u64;
 	type Event = ();
@@ -98,7 +98,7 @@ impl pallet_balances::Trait for Test {
 	type WeightInfo = ();
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type Event = ();
 	type Currency = pallet_balances::Module<Self>;
 	type Randomness = TestRandomness;
diff --git a/frame/staking/fuzzer/src/mock.rs b/frame/staking/fuzzer/src/mock.rs
index 96df7674e9f4..ac9a2b235790 100644
--- a/frame/staking/fuzzer/src/mock.rs
+++ b/frame/staking/fuzzer/src/mock.rs
@@ -43,7 +43,7 @@ impl_outer_dispatch! {
 #[derive(Clone, Eq, PartialEq, Debug)]
 pub struct Test;
 
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type DbWeight = ();
@@ -73,7 +73,7 @@ impl frame_system::Trait for Test {
 parameter_types! {
 	pub const ExistentialDeposit: Balance = 10;
 }
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = Balance;
 	type Event = ();
@@ -82,7 +82,7 @@ impl pallet_balances::Trait for Test {
 	type AccountStore = System;
 	type WeightInfo = ();
 }
-impl pallet_indices::Trait for Test {
+impl pallet_indices::Config for Test {
 	type AccountIndex = AccountIndex;
 	type Event = ();
 	type Currency = Balances;
@@ -92,13 +92,13 @@ impl pallet_indices::Trait for Test {
 parameter_types! {
 	pub const MinimumPeriod: u64 = 5;
 }
-impl pallet_timestamp::Trait for Test {
+impl pallet_timestamp::Config for Test {
 	type Moment = u64;
 	type OnTimestampSet = ();
 	type MinimumPeriod = MinimumPeriod;
 	type WeightInfo = ();
 }
-impl pallet_session::historical::Trait for Test {
+impl pallet_session::historical::Config for Test {
 	type FullIdentification = pallet_staking::Exposure<AccountId, Balance>;
 	type FullIdentificationOf = pallet_staking::ExposureOf<Test>;
 }
@@ -124,7 +124,7 @@ impl pallet_session::SessionHandler<AccountId> for TestSessionHandler {
 	fn on_disabled(_: usize) {}
 }
 
-impl pallet_session::Trait for Test {
+impl pallet_session::Config for Test {
 	type SessionManager = pallet_session::historical::NoteHistoricalRoot<Test, Staking>;
 	type Keys = SessionKeys;
 	type ShouldEndSession = pallet_session::PeriodicSessions<(), ()>;
@@ -161,7 +161,7 @@ impl<C> frame_system::offchain::SendTransactionTypes<C> for Test where
 	type Extrinsic = Extrinsic;
 }
 
-impl pallet_staking::Trait for Test {
+impl pallet_staking::Config for Test {
 	type Currency = Balances;
 	type UnixTime = pallet_timestamp::Module<Self>;
 	type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote;
diff --git a/frame/staking/src/benchmarking.rs b/frame/staking/src/benchmarking.rs
index 94a97debe4ff..f6aedf760d97 100644
--- a/frame/staking/src/benchmarking.rs
+++ b/frame/staking/src/benchmarking.rs
@@ -31,7 +31,7 @@ const MAX_SLASHES: u32 = 1000;
 
 // Add slashing spans to a user account. Not relevant for actual use, only to benchmark
 // read and write operations.
-fn add_slashing_spans<T: Trait>(who: &T::AccountId, spans: u32) {
+fn add_slashing_spans<T: Config>(who: &T::AccountId, spans: u32) {
 	if spans == 0 { return }
 
 	// For the first slashing span, we initialize
@@ -48,7 +48,7 @@ fn add_slashing_spans<T: Trait>(who: &T::AccountId, spans: u32) {
 // This function clears all existing validators and nominators from the set, and generates one new
 // validator being nominated by n nominators, and returns the validator stash account and the
 // nominators' stash and controller. It also starts an era and creates pending payouts.
-pub fn create_validator_with_nominators<T: Trait>(
+pub fn create_validator_with_nominators<T: Config>(
 	n: u32,
 	upper_bound: u32,
 	dead: bool,
@@ -729,7 +729,7 @@ mod tests {
 
 			let (validator_stash, nominators) = create_validator_with_nominators::<Test>(
 				n,
-				<Test as Trait>::MaxNominatorRewardedPerValidator::get() as u32,
+				<Test as Config>::MaxNominatorRewardedPerValidator::get() as u32,
 				false,
 				RewardDestination::Staked,
 			).unwrap();
@@ -753,7 +753,7 @@ mod tests {
 
 			let (validator_stash, _nominators) = create_validator_with_nominators::<Test>(
 				n,
-				<Test as Trait>::MaxNominatorRewardedPerValidator::get() as u32,
+				<Test as Config>::MaxNominatorRewardedPerValidator::get() as u32,
 				false,
 				RewardDestination::Staked,
 			).unwrap();
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index e5aaae6bbb8f..5f5f5ff2bb6e 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -19,7 +19,7 @@
 //!
 //! The Staking module is used to manage funds at stake by network maintainers.
 //!
-//! - [`staking::Trait`](./trait.Trait.html)
+//! - [`staking::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //! - [`Module`](./struct.Module.html)
 //!
@@ -107,7 +107,7 @@
 //!
 //! Rewards must be claimed for each era before it gets too old by `$HISTORY_DEPTH` using the
 //! `payout_stakers` call. Any account can call `payout_stakers`, which pays the reward to the
-//! validator as well as its nominators. Only the [`Trait::MaxNominatorRewardedPerValidator`]
+//! validator as well as its nominators. Only the [`Config::MaxNominatorRewardedPerValidator`]
 //! biggest stakers can claim their reward. This is to limit the i/o cost to mutate storage for each
 //! nominator's account.
 //!
@@ -154,10 +154,10 @@
 //! use frame_system::ensure_signed;
 //! use pallet_staking::{self as staking};
 //!
-//! pub trait Trait: staking::Trait {}
+//! pub trait Config: staking::Config {}
 //!
 //! decl_module! {
-//!     pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+//!     pub struct Module<T: Config> for enum Call where origin: T::Origin {
 //!         /// Reward a validator.
 //!         #[weight = 0]
 //!         pub fn reward_myself(origin) -> dispatch::DispatchResult {
@@ -175,7 +175,7 @@
 //! ### Era payout
 //!
 //! The era payout is computed using yearly inflation curve defined at
-//! [`T::RewardCurve`](./trait.Trait.html#associatedtype.RewardCurve) as such:
+//! [`T::RewardCurve`](./trait.Config.html#associatedtype.RewardCurve) as such:
 //!
 //! ```nocompile
 //! staker_payout = yearly_inflation(npos_token_staked / total_tokens) * total_tokens / era_per_year
@@ -186,7 +186,7 @@
 //! remaining_payout = max_yearly_inflation * total_tokens / era_per_year - staker_payout
 //! ```
 //! The remaining reward is send to the configurable end-point
-//! [`T::RewardRemainder`](./trait.Trait.html#associatedtype.RewardRemainder).
+//! [`T::RewardRemainder`](./trait.Config.html#associatedtype.RewardRemainder).
 //!
 //! ### Reward Calculation
 //!
@@ -232,7 +232,7 @@
 //!
 //! The controller account can free a portion (or all) of the funds using the
 //! [`unbond`](enum.Call.html#variant.unbond) call. Note that the funds are not immediately
-//! accessible. Instead, a duration denoted by [`BondingDuration`](./trait.Trait.html#associatedtype.BondingDuration)
+//! accessible. Instead, a duration denoted by [`BondingDuration`](./trait.Config.html#associatedtype.BondingDuration)
 //! (in number of eras) must pass until the funds can actually be removed. Once the
 //! `BondingDuration` is over, the [`withdraw_unbonded`](./enum.Call.html#variant.withdraw_unbonded)
 //! call can be used to actually withdraw the funds.
@@ -385,12 +385,12 @@ pub type OffchainAccuracy = PerU16;
 
 /// The balance type of this module.
 pub type BalanceOf<T> =
-	<<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 
 type PositiveImbalanceOf<T> =
-	<<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::PositiveImbalance;
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::PositiveImbalance;
 type NegativeImbalanceOf<T> =
-	<<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::NegativeImbalance;
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
 
 /// Information regarding the active era (era in used in session).
 #[derive(Encode, Decode, RuntimeDebug)]
@@ -732,8 +732,8 @@ impl<BlockNumber> Default for ElectionStatus<BlockNumber> {
 
 /// Means for interacting with a specialized version of the `session` trait.
 ///
-/// This is needed because `Staking` sets the `ValidatorIdOf` of the `pallet_session::Trait`
-pub trait SessionInterface<AccountId>: frame_system::Trait {
+/// This is needed because `Staking` sets the `ValidatorIdOf` of the `pallet_session::Config`
+pub trait SessionInterface<AccountId>: frame_system::Config {
 	/// Disable a given validator by stash ID.
 	///
 	/// Returns `true` if new era should be forced at the end of this session.
@@ -746,22 +746,22 @@ pub trait SessionInterface<AccountId>: frame_system::Trait {
 	fn prune_historical_up_to(up_to: SessionIndex);
 }
 
-impl<T: Trait> SessionInterface<<T as frame_system::Trait>::AccountId> for T where
-	T: pallet_session::Trait<ValidatorId = <T as frame_system::Trait>::AccountId>,
-	T: pallet_session::historical::Trait<
-		FullIdentification = Exposure<<T as frame_system::Trait>::AccountId, BalanceOf<T>>,
+impl<T: Config> SessionInterface<<T as frame_system::Config>::AccountId> for T where
+	T: pallet_session::Config<ValidatorId = <T as frame_system::Config>::AccountId>,
+	T: pallet_session::historical::Config<
+		FullIdentification = Exposure<<T as frame_system::Config>::AccountId, BalanceOf<T>>,
 		FullIdentificationOf = ExposureOf<T>,
 	>,
-	T::SessionHandler: pallet_session::SessionHandler<<T as frame_system::Trait>::AccountId>,
-	T::SessionManager: pallet_session::SessionManager<<T as frame_system::Trait>::AccountId>,
+	T::SessionHandler: pallet_session::SessionHandler<<T as frame_system::Config>::AccountId>,
+	T::SessionManager: pallet_session::SessionManager<<T as frame_system::Config>::AccountId>,
 	T::ValidatorIdOf:
-		Convert<<T as frame_system::Trait>::AccountId, Option<<T as frame_system::Trait>::AccountId>>,
+		Convert<<T as frame_system::Config>::AccountId, Option<<T as frame_system::Config>::AccountId>>,
 {
-	fn disable_validator(validator: &<T as frame_system::Trait>::AccountId) -> Result<bool, ()> {
+	fn disable_validator(validator: &<T as frame_system::Config>::AccountId) -> Result<bool, ()> {
 		<pallet_session::Module<T>>::disable(validator)
 	}
 
-	fn validators() -> Vec<<T as frame_system::Trait>::AccountId> {
+	fn validators() -> Vec<<T as frame_system::Config>::AccountId> {
 		<pallet_session::Module<T>>::validators()
 	}
 
@@ -770,7 +770,7 @@ impl<T: Trait> SessionInterface<<T as frame_system::Trait>::AccountId> for T whe
 	}
 }
 
-pub trait Trait: frame_system::Trait + SendTransactionTypes<Call<Self>> {
+pub trait Config: frame_system::Config + SendTransactionTypes<Call<Self>> {
 	/// The staking balance.
 	type Currency: LockableCurrency<Self::AccountId, Moment=Self::BlockNumber>;
 
@@ -792,7 +792,7 @@ pub trait Trait: frame_system::Trait + SendTransactionTypes<Call<Self>> {
 	type RewardRemainder: OnUnbalanced<NegativeImbalanceOf<Self>>;
 
 	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// Handler for the unbalanced reduction when slashing a staker.
 	type Slash: OnUnbalanced<NegativeImbalanceOf<Self>>;
@@ -904,7 +904,7 @@ impl Default for Releases {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Staking {
+	trait Store for Module<T: Config> as Staking {
 		/// Number of eras to keep in history.
 		///
 		/// Information is kept for eras in `[current_era - history_depth; current_era]`.
@@ -1121,7 +1121,7 @@ decl_storage! {
 }
 
 decl_event!(
-	pub enum Event<T> where Balance = BalanceOf<T>, <T as frame_system::Trait>::AccountId {
+	pub enum Event<T> where Balance = BalanceOf<T>, <T as frame_system::Config>::AccountId {
 		/// The era payout has been set; the first balance is the validator-payout; the second is
 		/// the remainder from the maximum amount of reward.
 		/// \[era_index, validator_payout, remainder\]
@@ -1153,7 +1153,7 @@ decl_event!(
 
 decl_error! {
 	/// Error for the staking module.
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Not a controller account.
 		NotController,
 		/// Not a stash account.
@@ -1223,7 +1223,7 @@ decl_error! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		/// Number of sessions per era.
 		const SessionsPerEra: SessionIndex = T::SessionsPerEra::get();
 
@@ -2159,7 +2159,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// The total balance that can be slashed from a stash account as of right now.
 	pub fn slashable_balance_of(stash: &T::AccountId) -> BalanceOf<T> {
 		// Weight note: consider making the stake accessible through stash.
@@ -3083,7 +3083,7 @@ impl<T: Trait> Module<T> {
 ///
 /// Once the first new_session is planned, all session must start and then end in order, though
 /// some session can lag in between the newest session planned and the latest session started.
-impl<T: Trait> pallet_session::SessionManager<T::AccountId> for Module<T> {
+impl<T: Config> pallet_session::SessionManager<T::AccountId> for Module<T> {
 	fn new_session(new_index: SessionIndex) -> Option<Vec<T::AccountId>> {
 		Self::new_session(new_index)
 	}
@@ -3095,7 +3095,7 @@ impl<T: Trait> pallet_session::SessionManager<T::AccountId> for Module<T> {
 	}
 }
 
-impl<T: Trait> historical::SessionManager<T::AccountId, Exposure<T::AccountId, BalanceOf<T>>> for Module<T> {
+impl<T: Config> historical::SessionManager<T::AccountId, Exposure<T::AccountId, BalanceOf<T>>> for Module<T> {
 	fn new_session(new_index: SessionIndex)
 		-> Option<Vec<(T::AccountId, Exposure<T::AccountId, BalanceOf<T>>)>>
 	{
@@ -3124,7 +3124,7 @@ impl<T: Trait> historical::SessionManager<T::AccountId, Exposure<T::AccountId, B
 /// * 1 point to the producer of each referenced uncle block.
 impl<T> pallet_authorship::EventHandler<T::AccountId, T::BlockNumber> for Module<T>
 	where
-		T: Trait + pallet_authorship::Trait + pallet_session::Trait
+		T: Config + pallet_authorship::Config + pallet_session::Config
 {
 	fn note_author(author: T::AccountId) {
 		Self::reward_by_ids(vec![(author, 20)])
@@ -3141,7 +3141,7 @@ impl<T> pallet_authorship::EventHandler<T::AccountId, T::BlockNumber> for Module
 /// if any.
 pub struct StashOf<T>(sp_std::marker::PhantomData<T>);
 
-impl<T: Trait> Convert<T::AccountId, Option<T::AccountId>> for StashOf<T> {
+impl<T: Config> Convert<T::AccountId, Option<T::AccountId>> for StashOf<T> {
 	fn convert(controller: T::AccountId) -> Option<T::AccountId> {
 		<Module<T>>::ledger(&controller).map(|l| l.stash)
 	}
@@ -3154,7 +3154,7 @@ impl<T: Trait> Convert<T::AccountId, Option<T::AccountId>> for StashOf<T> {
 /// `active_era`. It can differ from the latest planned exposure in `current_era`.
 pub struct ExposureOf<T>(sp_std::marker::PhantomData<T>);
 
-impl<T: Trait> Convert<T::AccountId, Option<Exposure<T::AccountId, BalanceOf<T>>>>
+impl<T: Config> Convert<T::AccountId, Option<Exposure<T::AccountId, BalanceOf<T>>>>
 	for ExposureOf<T>
 {
 	fn convert(validator: T::AccountId) -> Option<Exposure<T::AccountId, BalanceOf<T>>> {
@@ -3167,19 +3167,19 @@ impl<T: Trait> Convert<T::AccountId, Option<Exposure<T::AccountId, BalanceOf<T>>
 }
 
 /// This is intended to be used with `FilterHistoricalOffences`.
-impl <T: Trait>
+impl <T: Config>
 	OnOffenceHandler<T::AccountId, pallet_session::historical::IdentificationTuple<T>, Weight>
 for Module<T> where
-	T: pallet_session::Trait<ValidatorId = <T as frame_system::Trait>::AccountId>,
-	T: pallet_session::historical::Trait<
-		FullIdentification = Exposure<<T as frame_system::Trait>::AccountId, BalanceOf<T>>,
+	T: pallet_session::Config<ValidatorId = <T as frame_system::Config>::AccountId>,
+	T: pallet_session::historical::Config<
+		FullIdentification = Exposure<<T as frame_system::Config>::AccountId, BalanceOf<T>>,
 		FullIdentificationOf = ExposureOf<T>,
 	>,
-	T::SessionHandler: pallet_session::SessionHandler<<T as frame_system::Trait>::AccountId>,
-	T::SessionManager: pallet_session::SessionManager<<T as frame_system::Trait>::AccountId>,
+	T::SessionHandler: pallet_session::SessionHandler<<T as frame_system::Config>::AccountId>,
+	T::SessionManager: pallet_session::SessionManager<<T as frame_system::Config>::AccountId>,
 	T::ValidatorIdOf: Convert<
-		<T as frame_system::Trait>::AccountId,
-		Option<<T as frame_system::Trait>::AccountId>,
+		<T as frame_system::Config>::AccountId,
+		Option<<T as frame_system::Config>::AccountId>,
 	>,
 {
 	fn on_offence(
@@ -3310,7 +3310,7 @@ pub struct FilterHistoricalOffences<T, R> {
 
 impl<T, Reporter, Offender, R, O> ReportOffence<Reporter, Offender, O>
 	for FilterHistoricalOffences<Module<T>, R> where
-	T: Trait,
+	T: Config,
 	R: ReportOffence<Reporter, Offender, O>,
 	O: Offence<Offender>,
 {
@@ -3335,7 +3335,7 @@ impl<T, Reporter, Offender, R, O> ReportOffence<Reporter, Offender, O>
 }
 
 #[allow(deprecated)]
-impl<T: Trait> frame_support::unsigned::ValidateUnsigned for Module<T> {
+impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
 	type Call = Call<T>;
 	fn validate_unsigned(source: TransactionSource, call: &Self::Call) -> TransactionValidity {
 		if let Call::submit_election_solution_unsigned(
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index 3aa3e9ae03d7..4bc1921c494d 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -141,7 +141,7 @@ parameter_types! {
 	pub static MaxIterations: u32 = 0;
 }
 
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = AccountIndex;
@@ -168,7 +168,7 @@ impl frame_system::Trait for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 }
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = MaxLocks;
 	type Balance = Balance;
 	type Event = MetaEvent;
@@ -187,7 +187,7 @@ sp_runtime::impl_opaque_keys! {
 		pub other: OtherSessionHandler,
 	}
 }
-impl pallet_session::Trait for Test {
+impl pallet_session::Config for Test {
 	type SessionManager = pallet_session::historical::NoteHistoricalRoot<Test, Staking>;
 	type Keys = SessionKeys;
 	type ShouldEndSession = pallet_session::PeriodicSessions<Period, Offset>;
@@ -200,11 +200,11 @@ impl pallet_session::Trait for Test {
 	type WeightInfo = ();
 }
 
-impl pallet_session::historical::Trait for Test {
+impl pallet_session::historical::Config for Test {
 	type FullIdentification = crate::Exposure<AccountId, Balance>;
 	type FullIdentificationOf = crate::ExposureOf<Test>;
 }
-impl pallet_authorship::Trait for Test {
+impl pallet_authorship::Config for Test {
 	type FindAuthor = Author11;
 	type UncleGenerations = UncleGenerations;
 	type FilterUncle = ();
@@ -213,7 +213,7 @@ impl pallet_authorship::Trait for Test {
 parameter_types! {
 	pub const MinimumPeriod: u64 = 5;
 }
-impl pallet_timestamp::Trait for Test {
+impl pallet_timestamp::Config for Test {
 	type Moment = u64;
 	type OnTimestampSet = ();
 	type MinimumPeriod = MinimumPeriod;
@@ -253,7 +253,7 @@ impl OnUnbalanced<NegativeImbalanceOf<Test>> for RewardRemainderMock {
 	}
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type Currency = Balances;
 	type UnixTime = Timestamp;
 	type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote;
@@ -659,7 +659,7 @@ pub(crate) fn start_era(era_index: EraIndex) {
 
 pub(crate) fn current_total_payout_for_duration(duration: u64) -> Balance {
 	inflation::compute_total_payout(
-		<Test as Trait>::RewardCurve::get(),
+		<Test as Config>::RewardCurve::get(),
 		Staking::eras_total_stake(Staking::active_era().unwrap().index),
 		Balances::total_issuance(),
 		duration,
@@ -667,7 +667,7 @@ pub(crate) fn current_total_payout_for_duration(duration: u64) -> Balance {
 }
 
 pub(crate) fn reward_all_elected() {
-	let rewards = <Test as Trait>::SessionInterface::validators()
+	let rewards = <Test as Config>::SessionInterface::validators()
 		.into_iter()
 		.map(|v| (v, 1));
 
diff --git a/frame/staking/src/offchain_election.rs b/frame/staking/src/offchain_election.rs
index cb4d460f6803..35d9fa7c1f85 100644
--- a/frame/staking/src/offchain_election.rs
+++ b/frame/staking/src/offchain_election.rs
@@ -19,7 +19,7 @@
 
 use crate::{
 	Call, CompactAssignments, ElectionSize, Module, NominatorIndex, Nominators, OffchainAccuracy,
-	Trait, ValidatorIndex, WeightInfo,
+	Config, ValidatorIndex, WeightInfo,
 };
 use codec::Decode;
 use frame_support::{traits::Get, weights::Weight, IterableStorageMap};
@@ -71,7 +71,7 @@ pub(crate) const DEFAULT_LONGEVITY: u64 = 25;
 /// don't run twice within a window of length [`OFFCHAIN_REPEAT`].
 ///
 /// Returns `Ok(())` if offchain worker should happen, `Err(reason)` otherwise.
-pub(crate) fn set_check_offchain_execution_status<T: Trait>(
+pub(crate) fn set_check_offchain_execution_status<T: Config>(
 	now: T::BlockNumber,
 ) -> Result<(), &'static str> {
 	let storage = StorageValueRef::persistent(&OFFCHAIN_HEAD_DB);
@@ -108,7 +108,7 @@ pub(crate) fn set_check_offchain_execution_status<T: Trait>(
 /// The internal logic of the offchain worker of this module. This runs the phragmen election,
 /// compacts and reduces the solution, computes the score and submits it back to the chain as an
 /// unsigned transaction, without any signature.
-pub(crate) fn compute_offchain_election<T: Trait>() -> Result<(), OffchainElectionError> {
+pub(crate) fn compute_offchain_election<T: Config>() -> Result<(), OffchainElectionError> {
 	let iters = get_balancing_iters::<T>();
 	// compute raw solution. Note that we use `OffchainAccuracy`.
 	let ElectionResult {
@@ -151,7 +151,7 @@ pub(crate) fn compute_offchain_election<T: Trait>() -> Result<(), OffchainElecti
 /// Get a random number of iterations to run the balancing.
 ///
 /// Uses the offchain seed to generate a random number.
-pub fn get_balancing_iters<T: Trait>() -> usize {
+pub fn get_balancing_iters<T: Config>() -> usize {
 	match T::MaxIterations::get() {
 		0 => 0,
 		max @ _ => {
@@ -257,7 +257,7 @@ pub fn maximum_compact_len<W: crate::WeightInfo>(
 ///
 /// Indeed, the score must be computed **after** this step. If this step reduces the score too much,
 /// then the solution will be discarded.
-pub fn trim_to_weight<T: Trait, FN>(
+pub fn trim_to_weight<T: Config, FN>(
 	maximum_allowed_voters: u32,
 	mut compact: CompactAssignments,
 	nominator_index: FN,
@@ -318,7 +318,7 @@ where
 /// Takes an election result and spits out some data that can be submitted to the chain.
 ///
 /// This does a lot of stuff; read the inline comments.
-pub fn prepare_submission<T: Trait>(
+pub fn prepare_submission<T: Config>(
 	assignments: Vec<Assignment<T::AccountId, OffchainAccuracy>>,
 	winners: Vec<(T::AccountId, ExtendedBalance)>,
 	do_reduce: bool,
diff --git a/frame/staking/src/slashing.rs b/frame/staking/src/slashing.rs
index af9a92f16a46..b1f0c9d9a442 100644
--- a/frame/staking/src/slashing.rs
+++ b/frame/staking/src/slashing.rs
@@ -50,7 +50,7 @@
 //! Based on research at https://research.web3.foundation/en/latest/polkadot/slashing/npos/
 
 use super::{
-	EraIndex, Trait, Module, Store, BalanceOf, Exposure, Perbill, SessionInterface,
+	EraIndex, Config, Module, Store, BalanceOf, Exposure, Perbill, SessionInterface,
 	NegativeImbalanceOf, UnappliedSlash, Error,
 };
 use sp_runtime::{traits::{Zero, Saturating}, RuntimeDebug, DispatchResult};
@@ -190,7 +190,7 @@ impl<Balance> SpanRecord<Balance> {
 
 /// Parameters for performing a slash.
 #[derive(Clone)]
-pub(crate) struct SlashParams<'a, T: 'a + Trait> {
+pub(crate) struct SlashParams<'a, T: 'a + Config> {
 	/// The stash account being slashed.
 	pub(crate) stash: &'a T::AccountId,
 	/// The proportion of the slash.
@@ -214,7 +214,7 @@ pub(crate) struct SlashParams<'a, T: 'a + Trait> {
 ///
 /// The pending slash record returned does not have initialized reporters. Those have
 /// to be set at a higher level, if any.
-pub(crate) fn compute_slash<T: Trait>(params: SlashParams<T>)
+pub(crate) fn compute_slash<T: Config>(params: SlashParams<T>)
 	-> Option<UnappliedSlash<T::AccountId, BalanceOf<T>>>
 {
 	let SlashParams {
@@ -309,7 +309,7 @@ pub(crate) fn compute_slash<T: Trait>(params: SlashParams<T>)
 
 // doesn't apply any slash, but kicks out the validator if the misbehavior is from
 // the most recent slashing span.
-fn kick_out_if_recent<T: Trait>(
+fn kick_out_if_recent<T: Config>(
 	params: SlashParams<T>,
 ) {
 	// these are not updated by era-span or end-span.
@@ -338,7 +338,7 @@ fn kick_out_if_recent<T: Trait>(
 /// Slash nominators. Accepts general parameters and the prior slash percentage of the validator.
 ///
 /// Returns the amount of reward to pay out.
-fn slash_nominators<T: Trait>(
+fn slash_nominators<T: Config>(
 	params: SlashParams<T>,
 	prior_slash_p: Perbill,
 	nominators_slashed: &mut Vec<(T::AccountId, BalanceOf<T>)>,
@@ -418,7 +418,7 @@ fn slash_nominators<T: Trait>(
 // dropping this struct applies any necessary slashes, which can lead to free balance
 // being 0, and the account being garbage-collected -- a dead account should get no new
 // metadata.
-struct InspectingSpans<'a, T: Trait + 'a> {
+struct InspectingSpans<'a, T: Config + 'a> {
 	dirty: bool,
 	window_start: EraIndex,
 	stash: &'a T::AccountId,
@@ -430,7 +430,7 @@ struct InspectingSpans<'a, T: Trait + 'a> {
 }
 
 // fetches the slashing spans record for a stash account, initializing it if necessary.
-fn fetch_spans<'a, T: Trait + 'a>(
+fn fetch_spans<'a, T: Config + 'a>(
 	stash: &'a T::AccountId,
 	window_start: EraIndex,
 	paid_out: &'a mut BalanceOf<T>,
@@ -455,7 +455,7 @@ fn fetch_spans<'a, T: Trait + 'a>(
 	}
 }
 
-impl<'a, T: 'a + Trait> InspectingSpans<'a, T> {
+impl<'a, T: 'a + Config> InspectingSpans<'a, T> {
 	fn span_index(&self) -> SpanIndex {
 		self.spans.span_index
 	}
@@ -526,7 +526,7 @@ impl<'a, T: 'a + Trait> InspectingSpans<'a, T> {
 	}
 }
 
-impl<'a, T: 'a + Trait> Drop for InspectingSpans<'a, T> {
+impl<'a, T: 'a + Config> Drop for InspectingSpans<'a, T> {
 	fn drop(&mut self) {
 		// only update on disk if we slashed this account.
 		if !self.dirty { return }
@@ -542,13 +542,13 @@ impl<'a, T: 'a + Trait> Drop for InspectingSpans<'a, T> {
 }
 
 /// Clear slashing metadata for an obsolete era.
-pub(crate) fn clear_era_metadata<T: Trait>(obsolete_era: EraIndex) {
+pub(crate) fn clear_era_metadata<T: Config>(obsolete_era: EraIndex) {
 	<Module<T> as Store>::ValidatorSlashInEra::remove_prefix(&obsolete_era);
 	<Module<T> as Store>::NominatorSlashInEra::remove_prefix(&obsolete_era);
 }
 
 /// Clear slashing metadata for a dead account.
-pub(crate) fn clear_stash_metadata<T: Trait>(
+pub(crate) fn clear_stash_metadata<T: Config>(
 	stash: &T::AccountId,
 	num_slashing_spans: u32,
 ) -> DispatchResult {
@@ -576,7 +576,7 @@ pub(crate) fn clear_stash_metadata<T: Trait>(
 // apply the slash to a stash account, deducting any missing funds from the reward
 // payout, saturating at 0. this is mildly unfair but also an edge-case that
 // can only occur when overlapping locked funds have been slashed.
-pub fn do_slash<T: Trait>(
+pub fn do_slash<T: Config>(
 	stash: &T::AccountId,
 	value: BalanceOf<T>,
 	reward_payout: &mut BalanceOf<T>,
@@ -613,7 +613,7 @@ pub fn do_slash<T: Trait>(
 }
 
 /// Apply a previously-unapplied slash.
-pub(crate) fn apply_slash<T: Trait>(unapplied_slash: UnappliedSlash<T::AccountId, BalanceOf<T>>) {
+pub(crate) fn apply_slash<T: Config>(unapplied_slash: UnappliedSlash<T::AccountId, BalanceOf<T>>) {
 	let mut slashed_imbalance = NegativeImbalanceOf::<T>::zero();
 	let mut reward_payout = unapplied_slash.payout;
 
@@ -638,7 +638,7 @@ pub(crate) fn apply_slash<T: Trait>(unapplied_slash: UnappliedSlash<T::AccountId
 
 
 /// Apply a reward payout to some reporters, paying the rewards out of the slashed imbalance.
-fn pay_reporters<T: Trait>(
+fn pay_reporters<T: Config>(
 	reward_payout: BalanceOf<T>,
 	slashed_imbalance: NegativeImbalanceOf<T>,
 	reporters: &[T::AccountId],
diff --git a/frame/staking/src/testing_utils.rs b/frame/staking/src/testing_utils.rs
index 25cfffeac2c1..9b6df1f2d48d 100644
--- a/frame/staking/src/testing_utils.rs
+++ b/frame/staking/src/testing_utils.rs
@@ -29,13 +29,13 @@ use sp_npos_elections::*;
 const SEED: u32 = 0;
 
 /// This function removes all validators and nominators from storage.
-pub fn clear_validators_and_nominators<T: Trait>() {
+pub fn clear_validators_and_nominators<T: Config>() {
 	Validators::<T>::remove_all();
 	Nominators::<T>::remove_all();
 }
 
 /// Grab a funded user.
-pub fn create_funded_user<T: Trait>(
+pub fn create_funded_user<T: Config>(
 	string: &'static str,
 	n: u32,
 	balance_factor: u32,
@@ -49,7 +49,7 @@ pub fn create_funded_user<T: Trait>(
 }
 
 /// Create a stash and controller pair.
-pub fn create_stash_controller<T: Trait>(
+pub fn create_stash_controller<T: Config>(
 	n: u32,
 	balance_factor: u32,
 	destination: RewardDestination<T::AccountId>,
@@ -66,7 +66,7 @@ pub fn create_stash_controller<T: Trait>(
 
 /// Create a stash and controller pair, where the controller is dead, and payouts go to controller.
 /// This is used to test worst case payout scenarios.
-pub fn create_stash_and_dead_controller<T: Trait>(
+pub fn create_stash_and_dead_controller<T: Config>(
 	n: u32,
 	balance_factor: u32,
 	destination: RewardDestination<T::AccountId>,
@@ -83,7 +83,7 @@ pub fn create_stash_and_dead_controller<T: Trait>(
 }
 
 /// create `max` validators.
-pub fn create_validators<T: Trait>(
+pub fn create_validators<T: Config>(
 	max: u32,
 	balance_factor: u32,
 ) -> Result<Vec<<T::Lookup as StaticLookup>::Source>, &'static str> {
@@ -115,7 +115,7 @@ pub fn create_validators<T: Trait>(
 ///    Else, all of them are considered and `edge_per_nominator` random validators are voted for.
 ///
 /// Return the validators choosen to be nominated.
-pub fn create_validators_with_nominators_for_era<T: Trait>(
+pub fn create_validators_with_nominators_for_era<T: Config>(
 	validators: u32,
 	nominators: u32,
 	edge_per_nominator: usize,
@@ -173,7 +173,7 @@ pub fn create_validators_with_nominators_for_era<T: Trait>(
 
 /// Build a _really bad_ but acceptable solution for election. This should always yield a solution
 /// which has a less score than the seq-phragmen.
-pub fn get_weak_solution<T: Trait>(
+pub fn get_weak_solution<T: Config>(
 	do_reduce: bool,
 ) -> (Vec<ValidatorIndex>, CompactAssignments, ElectionScore, ElectionSize) {
 	let mut backing_stake_of: BTreeMap<T::AccountId, BalanceOf<T>> = BTreeMap::new();
@@ -282,7 +282,7 @@ pub fn get_weak_solution<T: Trait>(
 
 /// Create a solution for seq-phragmen. This uses the same internal function as used by the offchain
 /// worker code.
-pub fn get_seq_phragmen_solution<T: Trait>(
+pub fn get_seq_phragmen_solution<T: Config>(
 	do_reduce: bool,
 ) -> (
 	Vec<ValidatorIndex>,
@@ -307,7 +307,7 @@ pub fn get_seq_phragmen_solution<T: Trait>(
 }
 
 /// Returns a solution in which only one winner is elected with just a self vote.
-pub fn get_single_winner_solution<T: Trait>(
+pub fn get_single_winner_solution<T: Config>(
 	winner: T::AccountId,
 ) -> Result<
 	(
@@ -352,7 +352,7 @@ pub fn get_single_winner_solution<T: Trait>(
 }
 
 /// get the active era.
-pub fn current_era<T: Trait>() -> EraIndex {
+pub fn current_era<T: Config>() -> EraIndex {
 	<Module<T>>::current_era().unwrap_or(0)
 }
 
@@ -366,7 +366,7 @@ pub fn init_active_era() {
 
 /// Create random assignments for the given list of winners. Each assignment will have
 /// MAX_NOMINATIONS edges.
-pub fn create_assignments_for_offchain<T: Trait>(
+pub fn create_assignments_for_offchain<T: Config>(
 	num_assignments: u32,
 	winners: Vec<<T::Lookup as StaticLookup>::Source>,
 ) -> Result<
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index 2a02d87aa2c5..c50964a33bb1 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -3267,7 +3267,7 @@ mod offchain_election {
 						ElectionSize::default(),
 					),
 					Error::<Test>::OffchainElectionEarlySubmission,
-					Some(<Test as frame_system::Trait>::DbWeight::get().reads(1)),
+					Some(<Test as frame_system::Config>::DbWeight::get().reads(1)),
 				);
 			})
 	}
@@ -3303,7 +3303,7 @@ mod offchain_election {
 						score,
 					),
 					Error::<Test>::OffchainElectionWeakSubmission,
-					Some(<Test as frame_system::Trait>::DbWeight::get().reads(3))
+					Some(<Test as frame_system::Config>::DbWeight::get().reads(3))
 				);
 			})
 	}
@@ -4340,7 +4340,7 @@ fn test_max_nominator_rewarded_per_validator_and_cant_steal_someone_else_reward(
 	//   then the nominator can't claim its reward
 	// * A nominator can't claim another nominator reward
 	ExtBuilder::default().build_and_execute(|| {
-		for i in 0..=<Test as Trait>::MaxNominatorRewardedPerValidator::get() {
+		for i in 0..=<Test as Config>::MaxNominatorRewardedPerValidator::get() {
 			let stash = 10_000 + i as AccountId;
 			let controller = 20_000 + i as AccountId;
 			let balance = 10_000 + i as Balance;
@@ -4366,7 +4366,7 @@ fn test_max_nominator_rewarded_per_validator_and_cant_steal_someone_else_reward(
 		mock::make_all_reward_payment(1);
 
 		// Assert only nominators from 1 to Max are rewarded
-		for i in 0..=<Test as Trait>::MaxNominatorRewardedPerValidator::get() {
+		for i in 0..=<Test as Config>::MaxNominatorRewardedPerValidator::get() {
 			let stash = 10_000 + i as AccountId;
 			let balance = 10_000 + i as Balance;
 			if stash == 10_000 {
@@ -4569,14 +4569,14 @@ fn bond_during_era_correctly_populates_claimed_rewards() {
 fn offences_weight_calculated_correctly() {
 	ExtBuilder::default().nominate(true).build_and_execute(|| {
 		// On offence with zero offenders: 4 Reads, 1 Write
-		let zero_offence_weight = <Test as frame_system::Trait>::DbWeight::get().reads_writes(4, 1);
+		let zero_offence_weight = <Test as frame_system::Config>::DbWeight::get().reads_writes(4, 1);
 		assert_eq!(Staking::on_offence(&[], &[Perbill::from_percent(50)], 0), Ok(zero_offence_weight));
 
 		// On Offence with N offenders, Unapplied: 4 Reads, 1 Write + 4 Reads, 5 Writes
-		let n_offence_unapplied_weight = <Test as frame_system::Trait>::DbWeight::get().reads_writes(4, 1)
-			+ <Test as frame_system::Trait>::DbWeight::get().reads_writes(4, 5);
+		let n_offence_unapplied_weight = <Test as frame_system::Config>::DbWeight::get().reads_writes(4, 1)
+			+ <Test as frame_system::Config>::DbWeight::get().reads_writes(4, 5);
 
-		let offenders: Vec<OffenceDetails<<Test as frame_system::Trait>::AccountId, pallet_session::historical::IdentificationTuple<Test>>>
+		let offenders: Vec<OffenceDetails<<Test as frame_system::Config>::AccountId, pallet_session::historical::IdentificationTuple<Test>>>
 			= (1..10).map(|i|
 				OffenceDetails {
 					offender: (i, Staking::eras_stakers(Staking::active_era().unwrap().index, i)),
@@ -4595,14 +4595,14 @@ fn offences_weight_calculated_correctly() {
 
 		let n = 1; // Number of offenders
 		let rw = 3 + 3 * n; // rw reads and writes
-		let one_offence_unapplied_weight = <Test as frame_system::Trait>::DbWeight::get().reads_writes(4, 1)
-			+ <Test as frame_system::Trait>::DbWeight::get().reads_writes(rw, rw)
+		let one_offence_unapplied_weight = <Test as frame_system::Config>::DbWeight::get().reads_writes(4, 1)
+			+ <Test as frame_system::Config>::DbWeight::get().reads_writes(rw, rw)
 			// One `slash_cost`
-			+ <Test as frame_system::Trait>::DbWeight::get().reads_writes(6, 5)
+			+ <Test as frame_system::Config>::DbWeight::get().reads_writes(6, 5)
 			// `slash_cost` * nominators (1)
-			+ <Test as frame_system::Trait>::DbWeight::get().reads_writes(6, 5)
+			+ <Test as frame_system::Config>::DbWeight::get().reads_writes(6, 5)
 			// `reward_cost` * reporters (1)
-			+ <Test as frame_system::Trait>::DbWeight::get().reads_writes(2, 2);
+			+ <Test as frame_system::Config>::DbWeight::get().reads_writes(2, 2);
 
 		assert_eq!(Staking::on_offence(&one_offender, &[Perbill::from_percent(50)], 0), Ok(one_offence_unapplied_weight));
 	});
@@ -4614,7 +4614,7 @@ fn on_initialize_weight_is_correct() {
 		assert_eq!(Validators::<Test>::iter().count(), 0);
 		assert_eq!(Nominators::<Test>::iter().count(), 0);
 		// When this pallet has nothing, we do 4 reads each block
-		let base_weight = <Test as frame_system::Trait>::DbWeight::get().reads(4);
+		let base_weight = <Test as frame_system::Config>::DbWeight::get().reads(4);
 		assert_eq!(base_weight, Staking::on_initialize(0));
 	});
 
@@ -4636,7 +4636,7 @@ fn on_initialize_weight_is_correct() {
 		// With 4 validators and 5 nominator, we should increase weight by:
 		// - (4 + 5) reads
 		// - 3 Writes
-		let final_weight = <Test as frame_system::Trait>::DbWeight::get().reads_writes(4 + 9, 3);
+		let final_weight = <Test as frame_system::Config>::DbWeight::get().reads_writes(4 + 9, 3);
 		assert_eq!(final_weight, Staking::on_initialize(System::block_number()));
 	});
 }
diff --git a/frame/staking/src/weights.rs b/frame/staking/src/weights.rs
index cb301276e0f0..2e715c53356f 100644
--- a/frame/staking/src/weights.rs
+++ b/frame/staking/src/weights.rs
@@ -72,7 +72,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_staking using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn bond() -> Weight {
 		(99_659_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
diff --git a/frame/sudo/src/lib.rs b/frame/sudo/src/lib.rs
index 7629355d98d1..e8a13c8b00f0 100644
--- a/frame/sudo/src/lib.rs
+++ b/frame/sudo/src/lib.rs
@@ -17,7 +17,7 @@
 
 //! # Sudo Module
 //!
-//! - [`sudo::Trait`](./trait.Trait.html)
+//! - [`sudo::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //!
 //! ## Overview
@@ -55,10 +55,10 @@
 //! use frame_support::{decl_module, dispatch};
 //! use frame_system::ensure_root;
 //!
-//! pub trait Trait: frame_system::Trait {}
+//! pub trait Config: frame_system::Config {}
 //!
 //! decl_module! {
-//!     pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+//!     pub struct Module<T: Config> for enum Call where origin: T::Origin {
 //! 		#[weight = 0]
 //!         pub fn privileged_function(origin) -> dispatch::DispatchResult {
 //!             ensure_root(origin)?;
@@ -82,7 +82,7 @@
 //! * [Democracy](../pallet_democracy/index.html)
 //!
 //! [`Call`]: ./enum.Call.html
-//! [`Trait`]: ./trait.Trait.html
+//! [`Config`]: ./trait.Config.html
 //! [`Origin`]: https://docs.substrate.dev/docs/substrate-types
 
 #![cfg_attr(not(feature = "std"), no_std)]
@@ -105,9 +105,9 @@ mod mock;
 #[cfg(test)]
 mod tests;
 
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// A sudo-able call.
 	type Call: Parameter + UnfilteredDispatchable<Origin=Self::Origin> + GetDispatchInfo;
@@ -115,7 +115,7 @@ pub trait Trait: frame_system::Trait {
 
 decl_module! {
 	/// Sudo module declaration.
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		type Error = Error<T>;
 
 		fn deposit_event() = default;
@@ -131,7 +131,7 @@ decl_module! {
 		/// - Weight of derivative `call` execution + 10,000.
 		/// # </weight>
 		#[weight = (call.get_dispatch_info().weight + 10_000, call.get_dispatch_info().class)]
-		fn sudo(origin, call: Box<<T as Trait>::Call>) -> DispatchResultWithPostInfo {
+		fn sudo(origin, call: Box<<T as Config>::Call>) -> DispatchResultWithPostInfo {
 			// This is a public call, so we ensure that the origin is some signed account.
 			let sender = ensure_signed(origin)?;
 			ensure!(sender == Self::key(), Error::<T>::RequireSudo);
@@ -153,7 +153,7 @@ decl_module! {
 		/// - The weight of this call is defined by the caller.
 		/// # </weight>
 		#[weight = (*_weight, call.get_dispatch_info().class)]
-		fn sudo_unchecked_weight(origin, call: Box<<T as Trait>::Call>, _weight: Weight) -> DispatchResultWithPostInfo {
+		fn sudo_unchecked_weight(origin, call: Box<<T as Config>::Call>, _weight: Weight) -> DispatchResultWithPostInfo {
 			// This is a public call, so we ensure that the origin is some signed account.
 			let sender = ensure_signed(origin)?;
 			ensure!(sender == Self::key(), Error::<T>::RequireSudo);
@@ -206,7 +206,7 @@ decl_module! {
 		)]
 		fn sudo_as(origin,
 			who: <T::Lookup as StaticLookup>::Source,
-			call: Box<<T as Trait>::Call>
+			call: Box<<T as Config>::Call>
 		) -> DispatchResultWithPostInfo {
 			// This is a public call, so we ensure that the origin is some signed account.
 			let sender = ensure_signed(origin)?;
@@ -224,7 +224,7 @@ decl_module! {
 }
 
 decl_event!(
-	pub enum Event<T> where AccountId = <T as frame_system::Trait>::AccountId {
+	pub enum Event<T> where AccountId = <T as frame_system::Config>::AccountId {
 		/// A sudo just took place. \[result\]
 		Sudid(DispatchResult),
 		/// The \[sudoer\] just switched identity; the old key is supplied.
@@ -235,7 +235,7 @@ decl_event!(
 );
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Sudo {
+	trait Store for Module<T: Config> as Sudo {
 		/// The `AccountId` of the sudo key.
 		Key get(fn key) config(): T::AccountId;
 	}
@@ -243,7 +243,7 @@ decl_storage! {
 
 decl_error! {
 	/// Error for the Sudo module
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Sender must be the Sudo account
 		RequireSudo,
 	}
diff --git a/frame/sudo/src/mock.rs b/frame/sudo/src/mock.rs
index 7996cd05d071..c21f7895264b 100644
--- a/frame/sudo/src/mock.rs
+++ b/frame/sudo/src/mock.rs
@@ -33,26 +33,26 @@ pub mod logger {
 	use super::*;
 	use frame_system::ensure_root;
 
-	pub trait Trait: frame_system::Trait {
-		type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	pub trait Config: frame_system::Config {
+		type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 	}
 
 	decl_storage! {
-		trait Store for Module<T: Trait> as Logger {
+		trait Store for Module<T: Config> as Logger {
 			AccountLog get(fn account_log): Vec<T::AccountId>;
 			I32Log get(fn i32_log): Vec<i32>;
 		}
 	}
 
 	decl_event! {
-		pub enum Event<T> where AccountId = <T as frame_system::Trait>::AccountId {
+		pub enum Event<T> where AccountId = <T as frame_system::Config>::AccountId {
 			AppendI32(i32, Weight),
 			AppendI32AndAccount(AccountId, i32, Weight),
 		}
 	}
 
 	decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: <T as frame_system::Trait>::Origin {
+		pub struct Module<T: Config> for enum Call where origin: <T as frame_system::Config>::Origin {
 			fn deposit_event() = default;
 
 			#[weight = *weight]
@@ -118,7 +118,7 @@ impl Filter<Call> for BlockEverything {
 	}
 }
 
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = BlockEverything;
 	type Origin = Origin;
 	type Call = Call;
@@ -146,13 +146,13 @@ impl frame_system::Trait for Test {
 	type SystemWeightInfo = ();
 }
 
-// Implement the logger module's `Trait` on the Test runtime.
-impl logger::Trait for Test {
+// Implement the logger module's `Config` on the Test runtime.
+impl logger::Config for Test {
 	type Event = TestEvent;
 }
 
-// Implement the sudo module's `Trait` on the Test runtime.
-impl Trait for Test {
+// Implement the sudo module's `Config` on the Test runtime.
+impl Config for Test {
 	type Event = TestEvent;
 	type Call = Call;
 }
diff --git a/frame/support/procedural/src/lib.rs b/frame/support/procedural/src/lib.rs
index a6fb58846cba..8d3d1ce59004 100644
--- a/frame/support/procedural/src/lib.rs
+++ b/frame/support/procedural/src/lib.rs
@@ -35,7 +35,7 @@ use proc_macro::TokenStream;
 ///
 /// ```nocompile
 /// decl_storage! {
-/// 	trait Store for Module<T: Trait> as Example {
+/// 	trait Store for Module<T: Config> as Example {
 /// 		Foo get(fn foo) config(): u32=12;
 /// 		Bar: map hasher(identity) u32 => u32;
 /// 		pub Zed build(|config| vec![(0, 0)]): map hasher(identity) u32 => u32;
@@ -43,7 +43,7 @@ use proc_macro::TokenStream;
 /// }
 /// ```
 ///
-/// Declaration is set with the header `(pub) trait Store for Module<T: Trait> as Example`,
+/// Declaration is set with the header `(pub) trait Store for Module<T: Config> as Example`,
 /// with `Store` a (pub) trait generated associating each storage item to the `Module` and
 /// `as Example` setting the prefix used for storage items of this module. `Example` must be unique:
 /// another module with the same name and the same inner storage item name will conflict.
@@ -169,7 +169,7 @@ use proc_macro::TokenStream;
 ///
 /// ```nocompile
 /// decl_storage! {
-/// 	trait Store for Module<T: Trait> as Example {
+/// 	trait Store for Module<T: Config> as Example {
 ///
 /// 		// Your storage items
 /// 	}
@@ -202,7 +202,7 @@ use proc_macro::TokenStream;
 /// (`DefaultInstance` type is optional):
 ///
 /// ```nocompile
-/// trait Store for Module<T: Trait<I>, I: Instance=DefaultInstance> as Example {}
+/// trait Store for Module<T: Config<I>, I: Instance=DefaultInstance> as Example {}
 /// ```
 ///
 /// Accessing the structure no requires the instance as generic parameter:
@@ -214,7 +214,7 @@ use proc_macro::TokenStream;
 /// This macro supports a where clause which will be replicated to all generated types.
 ///
 /// ```nocompile
-/// trait Store for Module<T: Trait> as Example where T::AccountId: std::fmt::Display {}
+/// trait Store for Module<T: Config> as Example where T::AccountId: std::fmt::Display {}
 /// ```
 ///
 /// ## Limitations
diff --git a/frame/support/procedural/src/storage/genesis_config/genesis_config_def.rs b/frame/support/procedural/src/storage/genesis_config/genesis_config_def.rs
index 6339134ea0d2..93543075a3d2 100644
--- a/frame/support/procedural/src/storage/genesis_config/genesis_config_def.rs
+++ b/frame/support/procedural/src/storage/genesis_config/genesis_config_def.rs
@@ -33,11 +33,11 @@ pub struct GenesisConfigFieldDef {
 pub struct GenesisConfigDef {
 	pub is_generic: bool,
 	pub fields: Vec<GenesisConfigFieldDef>,
-	/// For example: `<T: Trait<I>, I: Instance=DefaultInstance>`.
+	/// For example: `<T: Config<I>, I: Instance=DefaultInstance>`.
 	pub genesis_struct_decl: TokenStream,
 	/// For example: `<T, I>`.
 	pub genesis_struct: TokenStream,
-	/// For example: `<T: Trait<I>, I: Instance>`.
+	/// For example: `<T: Config<I>, I: Instance>`.
 	pub genesis_impl: TokenStream,
 	/// The where clause to use to constrain generics if genesis config is generic.
 	pub genesis_where_clause: Option<syn::WhereClause>,
diff --git a/frame/support/procedural/src/storage/mod.rs b/frame/support/procedural/src/storage/mod.rs
index 0aa0a3cad7cd..bc23dad74bcd 100644
--- a/frame/support/procedural/src/storage/mod.rs
+++ b/frame/support/procedural/src/storage/mod.rs
@@ -42,7 +42,7 @@ pub struct DeclStorageDef {
 	module_name: syn::Ident,
 	/// Usually `T`.
 	module_runtime_generic: syn::Ident,
-	/// Usually `Trait`
+	/// Usually `Config`
 	module_runtime_trait: syn::Path,
 	/// For instantiable module: usually `I: Instance=DefaultInstance`.
 	module_instance: Option<ModuleInstanceDef>,
@@ -77,7 +77,7 @@ pub struct DeclStorageDefExt {
 	module_name: syn::Ident,
 	/// Usually `T`.
 	module_runtime_generic: syn::Ident,
-	/// Usually `Trait`.
+	/// Usually `Config`.
 	module_runtime_trait: syn::Path,
 	/// For instantiable module: usually `I: Instance=DefaultInstance`.
 	module_instance: Option<ModuleInstanceDef>,
@@ -93,7 +93,7 @@ pub struct DeclStorageDefExt {
 	crate_name: syn::Ident,
 	/// Full struct expansion: `Module<T, I>`.
 	module_struct: proc_macro2::TokenStream,
-	/// Impl block for module: `<T: Trait, I: Instance>`.
+	/// Impl block for module: `<T: Config, I: Instance>`.
 	module_impl: proc_macro2::TokenStream,
 	/// For instantiable: `I`.
 	optional_instance: Option<proc_macro2::TokenStream>,
@@ -212,7 +212,7 @@ pub struct StorageLineDefExt {
 	storage_struct: proc_macro2::TokenStream,
 	/// If storage is generic over runtime then `T`.
 	optional_storage_runtime_comma: Option<proc_macro2::TokenStream>,
-	/// If storage is generic over runtime then `T: Trait`.
+	/// If storage is generic over runtime then `T: Config`.
 	optional_storage_runtime_bound_comma: Option<proc_macro2::TokenStream>,
 	/// The where clause to use to constrain generics if storage is generic over runtime.
 	optional_storage_where_clause: Option<proc_macro2::TokenStream>,
diff --git a/frame/support/src/dispatch.rs b/frame/support/src/dispatch.rs
index d55faa28d115..2477f9421ffe 100644
--- a/frame/support/src/dispatch.rs
+++ b/frame/support/src/dispatch.rs
@@ -72,9 +72,9 @@ impl<T> Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 /// # #[macro_use]
 /// # extern crate frame_support;
 /// # use frame_support::dispatch;
-/// # use frame_system::{Trait, ensure_signed};
+/// # use frame_system::{Config, ensure_signed};
 /// decl_module! {
-/// 	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+/// 	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 ///
 /// 		// Private functions are dispatchable, but not available to other
 /// 		// FRAME pallets.
@@ -98,7 +98,7 @@ impl<T> Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 ///
 /// The declaration is set with the header where:
 ///
-/// * `Module`: The struct generated by the macro, with type `Trait`.
+/// * `Module`: The struct generated by the macro, with type `Config`.
 /// * `Call`: The enum generated for every pallet, which implements [`Callable`](./dispatch/trait.Callable.html).
 /// * `origin`: Alias of `T::Origin`, declared by the [`impl_outer_origin!`](./macro.impl_outer_origin.html) macro.
 /// * `Result`: The expected return type from pallet functions.
@@ -114,9 +114,9 @@ impl<T> Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 /// # #[macro_use]
 /// # extern crate frame_support;
 /// # use frame_support::dispatch;
-/// # use frame_system::{Trait, ensure_signed};
+/// # use frame_system::{Config, ensure_signed};
 /// decl_module! {
-/// 	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+/// 	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 /// 		#[weight = 0]
 /// 		fn my_long_function(origin) -> dispatch::DispatchResult {
 ///				// Your implementation
@@ -149,9 +149,9 @@ impl<T> Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 /// # #[macro_use]
 /// # extern crate frame_support;
 /// # use frame_support::dispatch::{DispatchResultWithPostInfo, WithPostDispatchInfo};
-/// # use frame_system::{Trait, ensure_signed};
+/// # use frame_system::{Config, ensure_signed};
 /// decl_module! {
-/// 	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+/// 	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 /// 		#[weight = 1_000_000]
 /// 		fn my_long_function(origin, do_expensive_calc: bool) -> DispatchResultWithPostInfo {
 /// 			ensure_signed(origin).map_err(|e| e.with_weight(100_000))?;
@@ -178,9 +178,9 @@ impl<T> Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 /// # #[macro_use]
 /// # extern crate frame_support;
 /// # use frame_support::transactional;
-/// # use frame_system::Trait;
+/// # use frame_system::Config;
 /// decl_module! {
-/// 	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+/// 	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 /// 		#[weight = 0]
 /// 		#[transactional]
 /// 		fn my_short_function(origin) {
@@ -199,9 +199,9 @@ impl<T> Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 /// # #[macro_use]
 /// # extern crate frame_support;
 /// # use frame_support::dispatch;
-/// # use frame_system::{Trait, ensure_signed, ensure_root};
+/// # use frame_system::{Config, ensure_signed, ensure_root};
 /// decl_module! {
-/// 	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+/// 	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 /// 		#[weight = 0]
 ///			fn my_privileged_function(origin) -> dispatch::DispatchResult {
 /// 			ensure_root(origin)?;
@@ -236,10 +236,10 @@ impl<T> Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 /// # pub struct DefaultInstance;
 /// # pub trait Instance: 'static {}
 /// # impl Instance for DefaultInstance {}
-/// pub trait Trait<I: Instance=DefaultInstance>: frame_system::Trait {}
+/// pub trait Config<I: Instance=DefaultInstance>: frame_system::Config {}
 ///
 /// decl_module! {
-/// 	pub struct Module<T: Trait<I>, I: Instance = DefaultInstance> for enum Call where origin: T::Origin {
+/// 	pub struct Module<T: Config<I>, I: Instance = DefaultInstance> for enum Call where origin: T::Origin {
 /// 		// Your implementation
 /// 	}
 /// }
@@ -261,10 +261,10 @@ impl<T> Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 /// # extern crate frame_support;
 /// # use frame_support::dispatch;
 /// # use frame_system::{self as system, ensure_signed};
-/// pub trait Trait: system::Trait where Self::AccountId: From<u32> {}
+/// pub trait Config: system::Config where Self::AccountId: From<u32> {}
 ///
 /// decl_module! {
-/// 	pub struct Module<T: Trait> for enum Call where origin: T::Origin, T::AccountId: From<u32> {
+/// 	pub struct Module<T: Config> for enum Call where origin: T::Origin, T::AccountId: From<u32> {
 /// 		// Your implementation
 /// 	}
 /// }
@@ -1272,11 +1272,11 @@ macro_rules! decl_module {
 		{ $( $other_where_bounds:tt )* }
 		fn on_initialize() -> $return:ty { $( $impl:tt )* }
 	) => {
-		impl<$trait_instance: $system::Trait + $trait_name$(<I>, $instance: $instantiable)?>
-			$crate::traits::OnInitialize<<$trait_instance as $system::Trait>::BlockNumber>
+		impl<$trait_instance: $system::Config + $trait_name$(<I>, $instance: $instantiable)?>
+			$crate::traits::OnInitialize<<$trait_instance as $system::Config>::BlockNumber>
 			for $module<$trait_instance$(, $instance)?> where $( $other_where_bounds )*
 		{
-			fn on_initialize(_block_number_not_used: <$trait_instance as $system::Trait>::BlockNumber) -> $return {
+			fn on_initialize(_block_number_not_used: <$trait_instance as $system::Config>::BlockNumber) -> $return {
 				$crate::sp_tracing::enter_span!($crate::sp_tracing::trace_span!("on_initialize"));
 				{ $( $impl )* }
 			}
@@ -1289,8 +1289,8 @@ macro_rules! decl_module {
 		{ $( $other_where_bounds:tt )* }
 		fn on_initialize($param:ident : $param_ty:ty) -> $return:ty { $( $impl:tt )* }
 	) => {
-		impl<$trait_instance: $system::Trait + $trait_name$(<I>, $instance: $instantiable)?>
-			$crate::traits::OnInitialize<<$trait_instance as $system::Trait>::BlockNumber>
+		impl<$trait_instance: $system::Config + $trait_name$(<I>, $instance: $instantiable)?>
+			$crate::traits::OnInitialize<<$trait_instance as $system::Config>::BlockNumber>
 			for $module<$trait_instance$(, $instance)?> where $( $other_where_bounds )*
 		{
 			fn on_initialize($param: $param_ty) -> $return {
@@ -1305,8 +1305,8 @@ macro_rules! decl_module {
 		$module:ident<$trait_instance:ident: $trait_name:ident$(<I>, $instance:ident: $instantiable:path)?>;
 		{ $( $other_where_bounds:tt )* }
 	) => {
-		impl<$trait_instance: $system::Trait + $trait_name$(<I>, $instance: $instantiable)?>
-			$crate::traits::OnInitialize<<$trait_instance as $system::Trait>::BlockNumber>
+		impl<$trait_instance: $system::Config + $trait_name$(<I>, $instance: $instantiable)?>
+			$crate::traits::OnInitialize<<$trait_instance as $system::Config>::BlockNumber>
 			for $module<$trait_instance$(, $instance)?> where $( $other_where_bounds )*
 		{}
 	};
@@ -1326,10 +1326,10 @@ macro_rules! decl_module {
 				let result: $return = (|| { $( $impl )* })();
 
 				$crate::crate_to_pallet_version!()
-					.put_into_storage::<<$trait_instance as $system::Trait>::PalletInfo, Self>();
+					.put_into_storage::<<$trait_instance as $system::Config>::PalletInfo, Self>();
 
 				let additional_write = <
-					<$trait_instance as $system::Trait>::DbWeight as $crate::traits::Get<_>
+					<$trait_instance as $system::Config>::DbWeight as $crate::traits::Get<_>
 				>::get().writes(1);
 
 				result.saturating_add(additional_write)
@@ -1350,10 +1350,10 @@ macro_rules! decl_module {
 				$crate::sp_tracing::enter_span!($crate::sp_tracing::trace_span!("on_runtime_upgrade"));
 
 				$crate::crate_to_pallet_version!()
-					.put_into_storage::<<$trait_instance as $system::Trait>::PalletInfo, Self>();
+					.put_into_storage::<<$trait_instance as $system::Config>::PalletInfo, Self>();
 
 				<
-					<$trait_instance as $system::Trait>::DbWeight as $crate::traits::Get<_>
+					<$trait_instance as $system::Config>::DbWeight as $crate::traits::Get<_>
 				>::get().writes(1)
 			}
 		}
@@ -1394,11 +1394,11 @@ macro_rules! decl_module {
 		{ $( $other_where_bounds:tt )* }
 		fn on_finalize() { $( $impl:tt )* }
 	) => {
-		impl<$trait_instance: $system::Trait + $trait_name$(<I>, $instance: $instantiable)?>
-			$crate::traits::OnFinalize<<$trait_instance as $system::Trait>::BlockNumber>
+		impl<$trait_instance: $system::Config + $trait_name$(<I>, $instance: $instantiable)?>
+			$crate::traits::OnFinalize<<$trait_instance as $system::Config>::BlockNumber>
 			for $module<$trait_instance$(, $instance)?> where $( $other_where_bounds )*
 		{
-			fn on_finalize(_block_number_not_used: <$trait_instance as $system::Trait>::BlockNumber) {
+			fn on_finalize(_block_number_not_used: <$trait_instance as $system::Config>::BlockNumber) {
 				$crate::sp_tracing::enter_span!($crate::sp_tracing::trace_span!("on_finalize"));
 				{ $( $impl )* }
 			}
@@ -1411,8 +1411,8 @@ macro_rules! decl_module {
 		{ $( $other_where_bounds:tt )* }
 		fn on_finalize($param:ident : $param_ty:ty) { $( $impl:tt )* }
 	) => {
-		impl<$trait_instance: $system::Trait + $trait_name$(<I>, $instance: $instantiable)?>
-			$crate::traits::OnFinalize<<$trait_instance as $system::Trait>::BlockNumber>
+		impl<$trait_instance: $system::Config + $trait_name$(<I>, $instance: $instantiable)?>
+			$crate::traits::OnFinalize<<$trait_instance as $system::Config>::BlockNumber>
 			for $module<$trait_instance$(, $instance)?> where $( $other_where_bounds )*
 		{
 			fn on_finalize($param: $param_ty) {
@@ -1427,8 +1427,8 @@ macro_rules! decl_module {
 		$module:ident<$trait_instance:ident: $trait_name:ident$(<I>, $instance:ident: $instantiable:path)?>;
 		{ $( $other_where_bounds:tt )* }
 	) => {
-		impl<$trait_instance: $system::Trait + $trait_name$(<I>, $instance: $instantiable)?>
-			$crate::traits::OnFinalize<<$trait_instance as $system::Trait>::BlockNumber>
+		impl<$trait_instance: $system::Config + $trait_name$(<I>, $instance: $instantiable)?>
+			$crate::traits::OnFinalize<<$trait_instance as $system::Config>::BlockNumber>
 			for $module<$trait_instance$(, $instance)?> where $( $other_where_bounds )*
 		{
 		}
@@ -1440,11 +1440,11 @@ macro_rules! decl_module {
 		{ $( $other_where_bounds:tt )* }
 		fn offchain_worker() { $( $impl:tt )* }
 	) => {
-		impl<$trait_instance: $system::Trait + $trait_name$(<I>, $instance: $instantiable)?>
-			$crate::traits::OffchainWorker<<$trait_instance as $system::Trait>::BlockNumber>
+		impl<$trait_instance: $system::Config + $trait_name$(<I>, $instance: $instantiable)?>
+			$crate::traits::OffchainWorker<<$trait_instance as $system::Config>::BlockNumber>
 			for $module<$trait_instance$(, $instance)?> where $( $other_where_bounds )*
 		{
-			fn offchain_worker(_block_number_not_used: <$trait_instance as $system::Trait>::BlockNumber) { $( $impl )* }
+			fn offchain_worker(_block_number_not_used: <$trait_instance as $system::Config>::BlockNumber) { $( $impl )* }
 		}
 	};
 
@@ -1454,8 +1454,8 @@ macro_rules! decl_module {
 		{ $( $other_where_bounds:tt )* }
 		fn offchain_worker($param:ident : $param_ty:ty) { $( $impl:tt )* }
 	) => {
-		impl<$trait_instance: $system::Trait + $trait_name$(<I>, $instance: $instantiable)?>
-			$crate::traits::OffchainWorker<<$trait_instance as $system::Trait>::BlockNumber>
+		impl<$trait_instance: $system::Config + $trait_name$(<I>, $instance: $instantiable)?>
+			$crate::traits::OffchainWorker<<$trait_instance as $system::Config>::BlockNumber>
 			for $module<$trait_instance$(, $instance)?> where $( $other_where_bounds )*
 		{
 			fn offchain_worker($param: $param_ty) { $( $impl )* }
@@ -1467,8 +1467,8 @@ macro_rules! decl_module {
 		$module:ident<$trait_instance:ident: $trait_name:ident$(<I>, $instance:ident: $instantiable:path)?>;
 		{ $( $other_where_bounds:tt )* }
 	) => {
-		impl<$trait_instance: $system::Trait + $trait_name$(<I>, $instance: $instantiable)?>
-			$crate::traits::OffchainWorker<<$trait_instance as $system::Trait>::BlockNumber>
+		impl<$trait_instance: $system::Config + $trait_name$(<I>, $instance: $instantiable)?>
+			$crate::traits::OffchainWorker<<$trait_instance as $system::Config>::BlockNumber>
 			for $module<$trait_instance$(, $instance)?> where $( $other_where_bounds )*
 		{}
 	};
@@ -1824,7 +1824,7 @@ macro_rules! decl_module {
 
 			fn storage_version() -> Option<$crate::traits::PalletVersion> {
 				let key = $crate::traits::PalletVersion::storage_key::<
-						<$trait_instance as $system::Trait>::PalletInfo, Self
+						<$trait_instance as $system::Config>::PalletInfo, Self
 					>().expect("Every active pallet has a name in the runtime; qed");
 
 				$crate::storage::unhashed::get(&key)
@@ -1837,7 +1837,7 @@ macro_rules! decl_module {
 		{
 			fn on_genesis() {
 				$crate::crate_to_pallet_version!()
-					.put_into_storage::<<$trait_instance as $system::Trait>::PalletInfo, Self>();
+					.put_into_storage::<<$trait_instance as $system::Config>::PalletInfo, Self>();
 			}
 		}
 
@@ -2019,7 +2019,7 @@ macro_rules! impl_outer_dispatch {
 		}
 		impl $crate::dispatch::Dispatchable for $call_type {
 			type Origin = $origin;
-			type Trait = $call_type;
+			type Config = $call_type;
 			type Info = $crate::weights::DispatchInfo;
 			type PostInfo = $crate::weights::PostDispatchInfo;
 			fn dispatch(
@@ -2412,12 +2412,12 @@ mod tests {
 		IntegrityTest, Get,
 	};
 
-	pub trait Trait: system::Trait + Sized where Self::AccountId: From<u32> { }
+	pub trait Config: system::Config + Sized where Self::AccountId: From<u32> { }
 
 	pub mod system {
 		use super::*;
 
-		pub trait Trait: 'static {
+		pub trait Config: 'static {
 			type AccountId;
 			type Call;
 			type BaseCallFilter;
@@ -2443,11 +2443,11 @@ mod tests {
 			}
 		}
 
-		pub type Origin<T> = RawOrigin<<T as Trait>::AccountId>;
+		pub type Origin<T> = RawOrigin<<T as Config>::AccountId>;
 	}
 
 	decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system = system, T::AccountId: From<u32> {
+		pub struct Module<T: Config> for enum Call where origin: T::Origin, system = system, T::AccountId: From<u32> {
 			/// Hi, this is a comment.
 			#[weight = 0]
 			fn aux_0(_origin) -> DispatchResult { unreachable!() }
@@ -2548,7 +2548,7 @@ mod tests {
 	];
 
 	pub struct TraitImpl {}
-	impl Trait for TraitImpl { }
+	impl Config for TraitImpl { }
 
 	type Test = Module<TraitImpl>;
 
@@ -2562,7 +2562,7 @@ mod tests {
 		}
 	}
 
-	impl system::Trait for TraitImpl {
+	impl system::Config for TraitImpl {
 		type Origin = OuterOrigin;
 		type AccountId = u32;
 		type Call = OuterCall;
diff --git a/frame/support/src/error.rs b/frame/support/src/error.rs
index c0a886907d0b..0e3f66f9f3c9 100644
--- a/frame/support/src/error.rs
+++ b/frame/support/src/error.rs
@@ -39,7 +39,7 @@ pub use frame_metadata::{ModuleErrorMetadata, ErrorMetadata, DecodeDifferent};
 /// #
 /// decl_error! {
 ///     /// Errors that can occur in my module.
-///     pub enum MyError for Module<T: Trait> {
+///     pub enum MyError for Module<T: Config> {
 ///         /// Hey this is an error message that indicates bla.
 ///         MyCoolErrorMessage,
 ///         /// You are just not cool enough for my module!
@@ -47,13 +47,13 @@ pub use frame_metadata::{ModuleErrorMetadata, ErrorMetadata, DecodeDifferent};
 ///     }
 /// }
 ///
-/// # use frame_system::Trait;
+/// # use frame_system::Config;
 ///
 /// // You need to register the error type in `decl_module!` as well to make the error
 /// // exported in the metadata.
 ///
 /// decl_module! {
-///     pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+///     pub struct Module<T: Config> for enum Call where origin: T::Origin {
 ///         type Error = MyError<T>;
 ///
 ///         #[weight = 0]
diff --git a/frame/support/src/event.rs b/frame/support/src/event.rs
index 3538748c30fa..3cb91e4a3e31 100644
--- a/frame/support/src/event.rs
+++ b/frame/support/src/event.rs
@@ -37,7 +37,7 @@ pub use frame_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, FnE
 /// # Generic Event Example:
 ///
 /// ```rust
-/// trait Trait {
+/// trait Config {
 ///     type Balance;
 ///     type Token;
 /// }
@@ -45,7 +45,7 @@ pub use frame_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, FnE
 /// mod event1 {
 ///     // Event that specifies the generic parameter explicitly (`Balance`).
 ///     frame_support::decl_event!(
-///        pub enum Event<T> where Balance = <T as super::Trait>::Balance {
+///        pub enum Event<T> where Balance = <T as super::Config>::Balance {
 ///           Message(Balance),
 ///        }
 ///     );
@@ -56,7 +56,7 @@ pub use frame_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, FnE
 ///     // If no name for the generic parameter is specified explicitly,
 ///     // the name will be taken from the type name of the trait.
 ///     frame_support::decl_event!(
-///        pub enum Event<T> where <T as super::Trait>::Balance {
+///        pub enum Event<T> where <T as super::Config>::Balance {
 ///           Message(Balance),
 ///        }
 ///     );
@@ -65,7 +65,7 @@ pub use frame_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, FnE
 /// mod event3 {
 ///     // And we even support declaring multiple generic parameters!
 ///     frame_support::decl_event!(
-///        pub enum Event<T> where <T as super::Trait>::Balance, <T as super::Trait>::Token {
+///        pub enum Event<T> where <T as super::Config>::Balance, <T as super::Config>::Token {
 ///           Message(Balance, Token),
 ///        }
 ///     );
@@ -82,7 +82,7 @@ pub use frame_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, FnE
 ///# struct DefaultInstance;
 ///# trait Instance {}
 ///# impl Instance for DefaultInstance {}
-/// trait Trait<I: Instance=DefaultInstance> {
+/// trait Config<I: Instance=DefaultInstance> {
 ///     type Balance;
 ///     type Token;
 /// }
@@ -90,8 +90,8 @@ pub use frame_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, FnE
 /// // For module with instances, DefaultInstance is optional
 /// frame_support::decl_event!(
 ///    pub enum Event<T, I: Instance = DefaultInstance> where
-///       <T as Trait>::Balance,
-///       <T as Trait>::Token
+///       <T as Config>::Balance,
+///       <T as Config>::Token
 ///    {
 ///       Message(Balance, Token),
 ///    }
@@ -258,10 +258,10 @@ macro_rules! __decl_generic_event {
 		{ $( $events:tt )* };
 		{ ,$( $generic_param:ident = $generic_type:ty ),* };
 	) => {
-		/// [`RawEvent`] specialized for the configuration [`Trait`]
+		/// [`RawEvent`] specialized for the configuration [`Config`]
 		///
 		/// [`RawEvent`]: enum.RawEvent.html
-		/// [`Trait`]: trait.Trait.html
+		/// [`Config`]: trait.Config.html
 		pub type Event<$event_generic_param $(, $instance $( = $event_default_instance)? )?> = RawEvent<$( $generic_type ),* $(, $instance)? >;
 
 		#[derive(
@@ -551,7 +551,7 @@ mod tests {
 	use codec::{Encode, Decode};
 
 	mod system {
-		pub trait Trait: 'static {
+		pub trait Config: 'static {
 			type Origin;
 			type BlockNumber;
 			type PalletInfo: crate::traits::PalletInfo;
@@ -559,7 +559,7 @@ mod tests {
 		}
 
 		decl_module! {
-			pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {}
+			pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {}
 		}
 
 		decl_event!(
@@ -570,7 +570,7 @@ mod tests {
 	}
 
 	mod system_renamed {
-		pub trait Trait: 'static {
+		pub trait Config: 'static {
 			type Origin;
 			type BlockNumber;
 			type PalletInfo: crate::traits::PalletInfo;
@@ -578,7 +578,7 @@ mod tests {
 		}
 
 		decl_module! {
-			pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {}
+			pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {}
 		}
 
 		decl_event!(
@@ -591,17 +591,17 @@ mod tests {
 	mod event_module {
 		use super::system;
 
-		pub trait Trait: system::Trait {
+		pub trait Config: system::Config {
 			type Balance;
 		}
 
 		decl_module! {
-			pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=system {}
+			pub struct Module<T: Config> for enum Call where origin: T::Origin, system=system {}
 		}
 
 		decl_event!(
 			/// Event without renaming the generic parameter `Balance` and `Origin`.
-			pub enum Event<T> where <T as Trait>::Balance, <T as system::Trait>::Origin
+			pub enum Event<T> where <T as Config>::Balance, <T as system::Config>::Origin
 			{
 				/// Hi, I am a comment.
 				TestEvent(Balance, Origin),
@@ -614,19 +614,19 @@ mod tests {
 	mod event_module2 {
 		use super::system;
 
-		pub trait Trait: system::Trait {
+		pub trait Config: system::Config {
 			type Balance;
 		}
 
 		decl_module! {
-			pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=system {}
+			pub struct Module<T: Config> for enum Call where origin: T::Origin, system=system {}
 		}
 
 		decl_event!(
 			/// Event with renamed generic parameter
 			pub enum Event<T> where
-				BalanceRenamed = <T as Trait>::Balance,
-				OriginRenamed = <T as system::Trait>::Origin
+				BalanceRenamed = <T as Config>::Balance,
+				OriginRenamed = <T as system::Config>::Origin
 			{
 				TestEvent(BalanceRenamed),
 				TestOrigin(OriginRenamed),
@@ -645,19 +645,19 @@ mod tests {
 	mod event_module4 {
 		use super::system;
 
-		pub trait Trait: system::Trait {
+		pub trait Config: system::Config {
 			type Balance;
 		}
 
 		decl_module! {
-			pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=system {}
+			pub struct Module<T: Config> for enum Call where origin: T::Origin, system=system {}
 		}
 
 		decl_event!(
 			/// Event finish formatting on an unnamed one with trailing comma
 			pub enum Event<T> where
-				<T as Trait>::Balance,
-				<T as system::Trait>::Origin,
+				<T as Config>::Balance,
+				<T as system::Config>::Origin,
 			{
 				TestEvent(Balance, Origin),
 			}
@@ -667,19 +667,19 @@ mod tests {
 	mod event_module5 {
 		use super::system;
 
-		pub trait Trait: system::Trait {
+		pub trait Config: system::Config {
 			type Balance;
 		}
 
 		decl_module! {
-			pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=system {}
+			pub struct Module<T: Config> for enum Call where origin: T::Origin, system=system {}
 		}
 
 		decl_event!(
 			/// Event finish formatting on an named one with trailing comma
 			pub enum Event<T> where
-				BalanceRenamed = <T as Trait>::Balance,
-				OriginRenamed = <T as system::Trait>::Origin,
+				BalanceRenamed = <T as Config>::Balance,
+				OriginRenamed = <T as system::Config>::Origin,
 			{
 				TestEvent(BalanceRenamed, OriginRenamed),
 				TrailingCommaInArgs(
@@ -714,37 +714,37 @@ mod tests {
 		}
 	}
 
-	impl event_module::Trait for TestRuntime {
+	impl event_module::Config for TestRuntime {
 		type Balance = u32;
 	}
 
-	impl event_module2::Trait for TestRuntime {
+	impl event_module2::Config for TestRuntime {
 		type Balance = u32;
 	}
 
-	impl system::Trait for TestRuntime {
+	impl system::Config for TestRuntime {
 		type Origin = u32;
 		type BlockNumber = u32;
 		type PalletInfo = ();
 		type DbWeight = ();
 	}
 
-	impl event_module::Trait for TestRuntime2 {
+	impl event_module::Config for TestRuntime2 {
 		type Balance = u32;
 	}
 
-	impl event_module2::Trait for TestRuntime2 {
+	impl event_module2::Config for TestRuntime2 {
 		type Balance = u32;
 	}
 
-	impl system_renamed::Trait for TestRuntime2 {
+	impl system_renamed::Config for TestRuntime2 {
 		type Origin = u32;
 		type BlockNumber = u32;
 		type PalletInfo = ();
 		type DbWeight = ();
 	}
 
-	impl system::Trait for TestRuntime2 {
+	impl system::Config for TestRuntime2 {
 		type Origin = u32;
 		type BlockNumber = u32;
 		type PalletInfo = ();
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 3c191ed6ae45..55bca2610a18 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -346,14 +346,14 @@ pub use frame_support_procedural::{
 /// This is useful for type generic over runtime:
 /// ```
 /// # use frame_support::CloneNoBound;
-/// trait Trait {
+/// trait Config {
 ///		type C: Clone;
 /// }
 ///
 /// // Foo implements [`Clone`] because `C` bounds [`Clone`].
 /// // Otherwise compilation will fail with an output telling `c` doesn't implement [`Clone`].
 /// #[derive(CloneNoBound)]
-/// struct Foo<T: Trait> {
+/// struct Foo<T: Config> {
 ///		c: T::C,
 /// }
 /// ```
@@ -364,14 +364,14 @@ pub use frame_support_procedural::CloneNoBound;
 /// This is useful for type generic over runtime:
 /// ```
 /// # use frame_support::{EqNoBound, PartialEqNoBound};
-/// trait Trait {
+/// trait Config {
 ///		type C: Eq;
 /// }
 ///
 /// // Foo implements [`Eq`] because `C` bounds [`Eq`].
 /// // Otherwise compilation will fail with an output telling `c` doesn't implement [`Eq`].
 /// #[derive(PartialEqNoBound, EqNoBound)]
-/// struct Foo<T: Trait> {
+/// struct Foo<T: Config> {
 ///		c: T::C,
 /// }
 /// ```
@@ -382,14 +382,14 @@ pub use frame_support_procedural::EqNoBound;
 /// This is useful for type generic over runtime:
 /// ```
 /// # use frame_support::PartialEqNoBound;
-/// trait Trait {
+/// trait Config {
 ///		type C: PartialEq;
 /// }
 ///
 /// // Foo implements [`PartialEq`] because `C` bounds [`PartialEq`].
 /// // Otherwise compilation will fail with an output telling `c` doesn't implement [`PartialEq`].
 /// #[derive(PartialEqNoBound)]
-/// struct Foo<T: Trait> {
+/// struct Foo<T: Config> {
 ///		c: T::C,
 /// }
 /// ```
@@ -401,14 +401,14 @@ pub use frame_support_procedural::PartialEqNoBound;
 /// ```
 /// # use frame_support::DebugNoBound;
 /// # use core::fmt::Debug;
-/// trait Trait {
+/// trait Config {
 ///		type C: Debug;
 /// }
 ///
 /// // Foo implements [`Debug`] because `C` bounds [`Debug`].
 /// // Otherwise compilation will fail with an output telling `c` doesn't implement [`Debug`].
 /// #[derive(DebugNoBound)]
-/// struct Foo<T: Trait> {
+/// struct Foo<T: Config> {
 ///		c: T::C,
 /// }
 /// ```
@@ -565,7 +565,7 @@ mod tests {
 	use sp_std::{marker::PhantomData, result};
 	use sp_io::TestExternalities;
 
-	pub trait Trait: 'static {
+	pub trait Config: 'static {
 		type BlockNumber: Codec + EncodeLike + Default;
 		type Origin;
 		type PalletInfo: crate::traits::PalletInfo;
@@ -575,16 +575,16 @@ mod tests {
 	mod module {
 		#![allow(dead_code)]
 
-		use super::Trait;
+		use super::Config;
 
 		decl_module! {
-			pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self  {}
+			pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self  {}
 		}
 	}
 	use self::module::Module;
 
 	decl_storage! {
-		trait Store for Module<T: Trait> as Test {
+		trait Store for Module<T: Config> as Test {
 			pub Data get(fn data) build(|_| vec![(15u32, 42u64)]):
 				map hasher(twox_64_concat) u32 => u64;
 			pub OptionLinkedMap: map hasher(blake2_128_concat) u32 => Option<u32>;
@@ -606,7 +606,7 @@ mod tests {
 	}
 
 	struct Test;
-	impl Trait for Test {
+	impl Config for Test {
 		type BlockNumber = u32;
 		type Origin = u32;
 		type PalletInfo = ();
diff --git a/frame/support/src/metadata.rs b/frame/support/src/metadata.rs
index 80737e4b13d6..f72365985da0 100644
--- a/frame/support/src/metadata.rs
+++ b/frame/support/src/metadata.rs
@@ -27,23 +27,23 @@ pub use frame_metadata::{
 /// Example:
 /// ```
 ///# mod module0 {
-///#    pub trait Trait: 'static {
+///#    pub trait Config: 'static {
 ///#        type Origin;
 ///#        type BlockNumber;
 ///#        type PalletInfo: frame_support::traits::PalletInfo;
 ///#        type DbWeight: frame_support::traits::Get<frame_support::weights::RuntimeDbWeight>;
 ///#    }
 ///#    frame_support::decl_module! {
-///#        pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {}
+///#        pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {}
 ///#    }
 ///#
 ///#    frame_support::decl_storage! {
-///#        trait Store for Module<T: Trait> as TestStorage {}
+///#        trait Store for Module<T: Config> as TestStorage {}
 ///#    }
 ///# }
 ///# use module0 as module1;
 ///# use module0 as module2;
-///# impl module0::Trait for Runtime {
+///# impl module0::Config for Runtime {
 ///#     type Origin = u32;
 ///#     type BlockNumber = u32;
 ///#     type PalletInfo = ();
@@ -297,7 +297,7 @@ mod tests {
 	mod system {
 		use super::*;
 
-		pub trait Trait: 'static {
+		pub trait Config: 'static {
 			type BaseCallFilter;
 			const ASSOCIATED_CONST: u64 = 500;
 			type Origin: Into<Result<RawOrigin<Self::AccountId>, Self::Origin>>
@@ -311,7 +311,7 @@ mod tests {
 		}
 
 		decl_module! {
-			pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {
+			pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {
 				/// Hi, I am a comment.
 				const BlockNumber: T::BlockNumber = 100.into();
 				const GetType: T::AccountId = T::SomeValue::get().into();
@@ -341,19 +341,19 @@ mod tests {
 			}
 		}
 
-		pub type Origin<T> = RawOrigin<<T as Trait>::AccountId>;
+		pub type Origin<T> = RawOrigin<<T as Config>::AccountId>;
 	}
 
 	mod event_module {
 		use crate::dispatch::DispatchResult;
 		use super::system;
 
-		pub trait Trait: system::Trait {
+		pub trait Config: system::Config {
 			type Balance;
 		}
 
 		decl_event!(
-			pub enum Event<T> where <T as Trait>::Balance
+			pub enum Event<T> where <T as Config>::Balance
 			{
 				/// Hi, I am a comment.
 				TestEvent(Balance),
@@ -361,7 +361,7 @@ mod tests {
 		);
 
 		decl_module! {
-			pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=system {
+			pub struct Module<T: Config> for enum Call where origin: T::Origin, system=system {
 				type Error = Error<T>;
 
 				#[weight = 0]
@@ -370,7 +370,7 @@ mod tests {
 		}
 
 		crate::decl_error! {
-			pub enum Error for Module<T: Trait> {
+			pub enum Error for Module<T: Config> {
 				/// Some user input error
 				UserInputError,
 				/// Something bad happened
@@ -383,23 +383,23 @@ mod tests {
 	mod event_module2 {
 		use super::system;
 
-		pub trait Trait: system::Trait {
+		pub trait Config: system::Config {
 			type Balance;
 		}
 
 		decl_event!(
-			pub enum Event<T> where <T as Trait>::Balance
+			pub enum Event<T> where <T as Config>::Balance
 			{
 				TestEvent(Balance),
 			}
 		);
 
 		decl_module! {
-			pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=system {}
+			pub struct Module<T: Config> for enum Call where origin: T::Origin, system=system {}
 		}
 
 		crate::decl_storage! {
-			trait Store for Module<T: Trait> as TestStorage {
+			trait Store for Module<T: Config> as TestStorage {
 				StorageMethod : Option<u32>;
 			}
 			add_extra_genesis {
@@ -433,11 +433,11 @@ mod tests {
 		}
 	}
 
-	impl event_module::Trait for TestRuntime {
+	impl event_module::Config for TestRuntime {
 		type Balance = u32;
 	}
 
-	impl event_module2::Trait for TestRuntime {
+	impl event_module2::Config for TestRuntime {
 		type Balance = u32;
 	}
 
@@ -445,7 +445,7 @@ mod tests {
 		pub const SystemValue: u32 = 600;
 	}
 
-	impl system::Trait for TestRuntime {
+	impl system::Config for TestRuntime {
 		type BaseCallFilter = ();
 		type Origin = Origin;
 		type AccountId = u32;
@@ -480,7 +480,7 @@ mod tests {
 	struct ConstantAssociatedConstByteGetter;
 	impl DefaultByte for ConstantAssociatedConstByteGetter {
 		fn default_byte(&self) -> Vec<u8> {
-			<TestRuntime as system::Trait>::ASSOCIATED_CONST.encode()
+			<TestRuntime as system::Config>::ASSOCIATED_CONST.encode()
 		}
 	}
 
diff --git a/frame/support/src/origin.rs b/frame/support/src/origin.rs
index b96a56c8e1d8..980ab902a389 100644
--- a/frame/support/src/origin.rs
+++ b/frame/support/src/origin.rs
@@ -181,12 +181,12 @@ macro_rules! impl_outer_origin {
 			index { $( $index:tt )? },
 		)*
 	) => {
-		// WARNING: All instance must hold the filter `frame_system::Trait::BaseCallFilter`, except
+		// WARNING: All instance must hold the filter `frame_system::Config::BaseCallFilter`, except
 		// when caller is system Root. One can use `OriginTrait::reset_filter` to do so.
 		#[derive(Clone)]
 		pub struct $name {
 			caller: $caller_name,
-			filter: $crate::sp_std::rc::Rc<Box<dyn Fn(&<$runtime as $system::Trait>::Call) -> bool>>,
+			filter: $crate::sp_std::rc::Rc<Box<dyn Fn(&<$runtime as $system::Config>::Call) -> bool>>,
 		}
 
 		#[cfg(not(feature = "std"))]
@@ -213,9 +213,9 @@ macro_rules! impl_outer_origin {
 		}
 
 		impl $crate::traits::OriginTrait for $name {
-			type Call = <$runtime as $system::Trait>::Call;
+			type Call = <$runtime as $system::Config>::Call;
 			type PalletsOrigin = $caller_name;
-			type AccountId = <$runtime as $system::Trait>::AccountId;
+			type AccountId = <$runtime as $system::Config>::AccountId;
 
 			fn add_filter(&mut self, filter: impl Fn(&Self::Call) -> bool + 'static) {
 				let f = self.filter.clone();
@@ -227,8 +227,8 @@ macro_rules! impl_outer_origin {
 
 			fn reset_filter(&mut self) {
 				let filter = <
-					<$runtime as $system::Trait>::BaseCallFilter
-					as $crate::traits::Filter<<$runtime as $system::Trait>::Call>
+					<$runtime as $system::Config>::BaseCallFilter
+					as $crate::traits::Filter<<$runtime as $system::Config>::Call>
 				>::filter;
 
 				self.filter = $crate::sp_std::rc::Rc::new(Box::new(filter));
@@ -246,7 +246,7 @@ macro_rules! impl_outer_origin {
 				&self.caller
 			}
 
-			/// Create with system none origin and `frame-system::Trait::BaseCallFilter`.
+			/// Create with system none origin and `frame-system::Config::BaseCallFilter`.
 			fn none() -> Self {
 				$system::RawOrigin::None.into()
 			}
@@ -254,8 +254,8 @@ macro_rules! impl_outer_origin {
 			fn root() -> Self {
 				$system::RawOrigin::Root.into()
 			}
-			/// Create with system signed origin and `frame-system::Trait::BaseCallFilter`.
-			fn signed(by: <$runtime as $system::Trait>::AccountId) -> Self {
+			/// Create with system signed origin and `frame-system::Config::BaseCallFilter`.
+			fn signed(by: <$runtime as $system::Config>::AccountId) -> Self {
 				$system::RawOrigin::Signed(by).into()
 			}
 		}
@@ -280,7 +280,7 @@ macro_rules! impl_outer_origin {
 		// For backwards compatibility and ease of accessing these functions.
 		#[allow(dead_code)]
 		impl $name {
-			/// Create with system none origin and `frame-system::Trait::BaseCallFilter`.
+			/// Create with system none origin and `frame-system::Config::BaseCallFilter`.
 			pub fn none() -> Self {
 				<$name as $crate::traits::OriginTrait>::none()
 			}
@@ -288,8 +288,8 @@ macro_rules! impl_outer_origin {
 			pub fn root() -> Self {
 				<$name as $crate::traits::OriginTrait>::root()
 			}
-			/// Create with system signed origin and `frame-system::Trait::BaseCallFilter`.
-			pub fn signed(by: <$runtime as $system::Trait>::AccountId) -> Self {
+			/// Create with system signed origin and `frame-system::Config::BaseCallFilter`.
+			pub fn signed(by: <$runtime as $system::Config>::AccountId) -> Self {
 				<$name as $crate::traits::OriginTrait>::signed(by)
 			}
 		}
@@ -302,7 +302,7 @@ macro_rules! impl_outer_origin {
 		impl From<$system::Origin<$runtime>> for $name {
 			/// Convert to runtime origin:
 			/// * root origin is built with no filter
-			/// * others use `frame-system::Trait::BaseCallFilter`
+			/// * others use `frame-system::Config::BaseCallFilter`
 			fn from(x: $system::Origin<$runtime>) -> Self {
 				let o: $caller_name = x.into();
 				o.into()
@@ -335,10 +335,10 @@ macro_rules! impl_outer_origin {
 				}
 			}
 		}
-		impl From<Option<<$runtime as $system::Trait>::AccountId>> for $name {
+		impl From<Option<<$runtime as $system::Config>::AccountId>> for $name {
 			/// Convert to runtime origin with caller being system signed or none and use filter
-			/// `frame-system::Trait::BaseCallFilter`.
-			fn from(x: Option<<$runtime as $system::Trait>::AccountId>) -> Self {
+			/// `frame-system::Config::BaseCallFilter`.
+			fn from(x: Option<<$runtime as $system::Config>::AccountId>) -> Self {
 				<$system::Origin<$runtime>>::from(x).into()
 			}
 		}
@@ -352,7 +352,7 @@ macro_rules! impl_outer_origin {
 				}
 
 				impl From<$module::Origin < $( $generic )? $(, $module::$generic_instance )? > > for $name {
-					/// Convert to runtime origin using `frame-system::Trait::BaseCallFilter`.
+					/// Convert to runtime origin using `frame-system::Config::BaseCallFilter`.
 					fn from(x: $module::Origin < $( $generic )? $(, $module::$generic_instance )? >) -> Self {
 						let x: $caller_name = x.into();
 						x.into()
@@ -388,7 +388,7 @@ mod tests {
 	mod frame_system {
 		use super::*;
 
-		pub trait Trait {
+		pub trait Config {
 			type AccountId;
 			type Call;
 			type BaseCallFilter;
@@ -410,7 +410,7 @@ mod tests {
 			}
 		}
 
-		pub type Origin<T> = RawOrigin<<T as Trait>::AccountId>;
+		pub type Origin<T> = RawOrigin<<T as Config>::AccountId>;
 	}
 
 	mod origin_without_generic {
@@ -439,7 +439,7 @@ mod tests {
 		}
 	}
 
-	impl frame_system::Trait for TestRuntime {
+	impl frame_system::Config for TestRuntime {
 		type AccountId = u32;
 		type Call = u32;
 		type BaseCallFilter = BaseCallFilter;
diff --git a/frame/support/src/storage/generator/double_map.rs b/frame/support/src/storage/generator/double_map.rs
index cbc62c83de88..6fb3abca5ca7 100644
--- a/frame/support/src/storage/generator/double_map.rs
+++ b/frame/support/src/storage/generator/double_map.rs
@@ -425,7 +425,7 @@ mod test_iterators {
 		storage::{generator::StorageDoubleMap, IterableStorageDoubleMap, unhashed},
 	};
 
-	pub trait Trait: 'static {
+	pub trait Config: 'static {
 		type Origin;
 		type BlockNumber;
 		type PalletInfo: crate::traits::PalletInfo;
@@ -433,14 +433,14 @@ mod test_iterators {
 	}
 
 	crate::decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {}
+		pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {}
 	}
 
 	#[derive(PartialEq, Eq, Clone, Encode, Decode)]
 	struct NoDef(u32);
 
 	crate::decl_storage! {
-		trait Store for Module<T: Trait> as Test {
+		trait Store for Module<T: Config> as Test {
 			DoubleMap: double_map hasher(blake2_128_concat) u16, hasher(twox_64_concat) u32 => u64;
 		}
 	}
diff --git a/frame/support/src/storage/generator/map.rs b/frame/support/src/storage/generator/map.rs
index 601fd4c4a8dd..2c2390865d02 100644
--- a/frame/support/src/storage/generator/map.rs
+++ b/frame/support/src/storage/generator/map.rs
@@ -325,7 +325,7 @@ mod test_iterators {
 		storage::{generator::StorageMap, IterableStorageMap, unhashed},
 	};
 
-	pub trait Trait: 'static {
+	pub trait Config: 'static {
 		type Origin;
 		type BlockNumber;
 		type PalletInfo: crate::traits::PalletInfo;
@@ -333,14 +333,14 @@ mod test_iterators {
 	}
 
 	crate::decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {}
+		pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {}
 	}
 
 	#[derive(PartialEq, Eq, Clone, Encode, Decode)]
 	struct NoDef(u32);
 
 	crate::decl_storage! {
-		trait Store for Module<T: Trait> as Test {
+		trait Store for Module<T: Config> as Test {
 			Map: map hasher(blake2_128_concat) u16 => u64;
 		}
 	}
diff --git a/frame/support/src/storage/generator/mod.rs b/frame/support/src/storage/generator/mod.rs
index 9346718f6348..4b444ce074f0 100644
--- a/frame/support/src/storage/generator/mod.rs
+++ b/frame/support/src/storage/generator/mod.rs
@@ -42,14 +42,14 @@ mod tests {
 
 	struct Runtime;
 
-	pub trait Trait: 'static {
+	pub trait Config: 'static {
 		type Origin;
 		type BlockNumber;
 		type PalletInfo: crate::traits::PalletInfo;
 		type DbWeight: crate::traits::Get<crate::weights::RuntimeDbWeight>;
 	}
 
-	impl Trait for Runtime {
+	impl Config for Runtime {
 		type Origin = u32;
 		type BlockNumber = u32;
 		type PalletInfo = ();
@@ -57,11 +57,11 @@ mod tests {
 	}
 
 	decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {}
+		pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {}
 	}
 
 	crate::decl_storage! {
-		trait Store for Module<T: Trait> as Runtime {
+		trait Store for Module<T: Config> as Runtime {
 			Value get(fn value) config(): (u64, u64);
 			NumberMap: map hasher(identity) u32 => u64;
 			DoubleMap: double_map hasher(identity) u32, hasher(identity) u32 => u64;
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index b40ebe3dba67..19c23a464db0 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -1653,16 +1653,16 @@ pub trait EnsureOrigin<OuterOrigin> {
 /// Implemented for pallet dispatchable type by `decl_module` and for runtime dispatchable by
 /// `construct_runtime` and `impl_outer_dispatch`.
 pub trait UnfilteredDispatchable {
-	/// The origin type of the runtime, (i.e. `frame_system::Trait::Origin`).
+	/// The origin type of the runtime, (i.e. `frame_system::Config::Origin`).
 	type Origin;
 
 	/// Dispatch this call but do not check the filter in origin.
 	fn dispatch_bypass_filter(self, origin: Self::Origin) -> crate::dispatch::DispatchResultWithPostInfo;
 }
 
-/// Methods available on `frame_system::Trait::Origin`.
+/// Methods available on `frame_system::Config::Origin`.
 pub trait OriginTrait: Sized {
-	/// Runtime call type, as in `frame_system::Trait::Call`
+	/// Runtime call type, as in `frame_system::Config::Call`
 	type Call;
 
 	/// The caller origin, overarching type of all pallets origins.
@@ -1674,7 +1674,7 @@ pub trait OriginTrait: Sized {
 	/// Add a filter to the origin.
 	fn add_filter(&mut self, filter: impl Fn(&Self::Call) -> bool + 'static);
 
-	/// Reset origin filters to default one, i.e `frame_system::Trait::BaseCallFilter`.
+	/// Reset origin filters to default one, i.e `frame_system::Config::BaseCallFilter`.
 	fn reset_filter(&mut self);
 
 	/// Replace the caller with caller from the other origin
@@ -1686,13 +1686,13 @@ pub trait OriginTrait: Sized {
 	/// Get the caller.
 	fn caller(&self) -> &Self::PalletsOrigin;
 
-	/// Create with system none origin and `frame-system::Trait::BaseCallFilter`.
+	/// Create with system none origin and `frame-system::Config::BaseCallFilter`.
 	fn none() -> Self;
 
 	/// Create with system root origin and no filter.
 	fn root() -> Self;
 
-	/// Create with system signed origin and `frame-system::Trait::BaseCallFilter`.
+	/// Create with system signed origin and `frame-system::Config::BaseCallFilter`.
 	fn signed(by: Self::AccountId) -> Self;
 }
 
diff --git a/frame/support/src/weights.rs b/frame/support/src/weights.rs
index 74f0773aa541..6a62befd6d5c 100644
--- a/frame/support/src/weights.rs
+++ b/frame/support/src/weights.rs
@@ -39,9 +39,9 @@
 //!    `Yes`**.
 //!
 //! ```
-//! # use frame_system::Trait;
+//! # use frame_system::Config;
 //! frame_support::decl_module! {
-//!     pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+//!     pub struct Module<T: Config> for enum Call where origin: T::Origin {
 //!         #[weight = 1000]
 //!         fn dispatching(origin) { unimplemented!() }
 //!     }
@@ -52,10 +52,10 @@
 //! 2.1 Define weight and class, **in which case `PaysFee` would be `Yes`**.
 //!
 //! ```
-//! # use frame_system::Trait;
+//! # use frame_system::Config;
 //! # use frame_support::weights::DispatchClass;
 //! frame_support::decl_module! {
-//!     pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+//!     pub struct Module<T: Config> for enum Call where origin: T::Origin {
 //!         #[weight = (1000, DispatchClass::Operational)]
 //!         fn dispatching(origin) { unimplemented!() }
 //!     }
@@ -66,10 +66,10 @@
 //! 2.2 Define weight and `PaysFee`, **in which case `ClassifyDispatch` would be `Normal`**.
 //!
 //! ```
-//! # use frame_system::Trait;
+//! # use frame_system::Config;
 //! # use frame_support::weights::Pays;
 //! frame_support::decl_module! {
-//!     pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+//!     pub struct Module<T: Config> for enum Call where origin: T::Origin {
 //!         #[weight = (1000, Pays::No)]
 //!         fn dispatching(origin) { unimplemented!() }
 //!     }
@@ -80,10 +80,10 @@
 //! 3. Define all 3 parameters.
 //!
 //! ```
-//! # use frame_system::Trait;
+//! # use frame_system::Config;
 //! # use frame_support::weights::{DispatchClass, Pays};
 //! frame_support::decl_module! {
-//!     pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+//!     pub struct Module<T: Config> for enum Call where origin: T::Origin {
 //!         #[weight = (1000, DispatchClass::Operational, Pays::No)]
 //!         fn dispatching(origin) { unimplemented!() }
 //!     }
@@ -100,10 +100,10 @@
 //! all 3 are static values, providing a raw tuple is easier.
 //!
 //! ```
-//! # use frame_system::Trait;
+//! # use frame_system::Config;
 //! # use frame_support::weights::{DispatchClass, FunctionOf, Pays};
 //! frame_support::decl_module! {
-//!     pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+//!     pub struct Module<T: Config> for enum Call where origin: T::Origin {
 //!         #[weight = FunctionOf(
 //! 			// weight, function.
 //! 			|args: (&u32, &u64)| *args.0 as u64 + args.1,
@@ -701,7 +701,7 @@ mod tests {
 	use crate::{decl_module, parameter_types, traits::Get};
 	use super::*;
 
-	pub trait Trait: 'static {
+	pub trait Config: 'static {
 		type Origin;
 		type Balance;
 		type BlockNumber;
@@ -718,7 +718,7 @@ mod tests {
 		};
 	}
 
-	impl Trait for TraitImpl {
+	impl Config for TraitImpl {
 		type Origin = u32;
 		type BlockNumber = u32;
 		type Balance = u32;
@@ -727,7 +727,7 @@ mod tests {
 	}
 
 	decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {
+		pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {
 			// no arguments, fixed weight
 			#[weight = 1000]
 			fn f00(_origin) { unimplemented!(); }
diff --git a/frame/support/test/Cargo.toml b/frame/support/test/Cargo.toml
index ee8ace5c983c..6d8064102c4d 100644
--- a/frame/support/test/Cargo.toml
+++ b/frame/support/test/Cargo.toml
@@ -25,6 +25,7 @@ trybuild = "1.0.33"
 pretty_assertions = "0.6.1"
 rustversion = "1.0.0"
 frame-metadata = { version = "12.0.0", default-features = false, path = "../../metadata" }
+frame-system = { version = "2.0.0", default-features = false, path = "../../system" }
 
 [features]
 default = ["std"]
@@ -33,6 +34,7 @@ std = [
 	"codec/std",
 	"sp-io/std",
 	"frame-support/std",
+	"frame-system/std",
 	"sp-inherents/std",
 	"sp-core/std",
 	"sp-std/std",
diff --git a/frame/support/test/src/lib.rs b/frame/support/test/src/lib.rs
index a917c781c065..2baf698f1e52 100644
--- a/frame/support/test/src/lib.rs
+++ b/frame/support/test/src/lib.rs
@@ -26,7 +26,7 @@
 mod pallet_version;
 
 /// The configuration trait
-pub trait Trait: 'static {
+pub trait Config: 'static {
 	/// The runtime origin type.
 	type Origin: codec::Codec + codec::EncodeLike + Default;
 	/// The block number type.
@@ -39,5 +39,5 @@ pub trait Trait: 'static {
 
 frame_support::decl_module! {
 	/// Some test module
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {}
+	pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {}
 }
diff --git a/frame/support/test/tests/construct_runtime.rs b/frame/support/test/tests/construct_runtime.rs
index 4ff4fc682860..33bb4a9cc877 100644
--- a/frame/support/test/tests/construct_runtime.rs
+++ b/frame/support/test/tests/construct_runtime.rs
@@ -37,11 +37,11 @@ thread_local! {
 mod module1 {
 	use super::*;
 
-	pub trait Trait<I>: system::Trait {}
+	pub trait Config<I>: system::Config {}
 
 	frame_support::decl_module! {
-		pub struct Module<T: Trait<I>, I: Instance = DefaultInstance> for enum Call
-			where origin: <T as system::Trait>::Origin, system=system
+		pub struct Module<T: Config<I>, I: Instance = DefaultInstance> for enum Call
+			where origin: <T as system::Config>::Origin, system=system
 		{
 			#[weight = 0]
 			pub fn fail(_origin) -> frame_support::dispatch::DispatchResult {
@@ -55,31 +55,31 @@ mod module1 {
 
 	frame_support::decl_event! {
 		pub enum Event<T, I: Instance = DefaultInstance> where
-			<T as system::Trait>::AccountId
+			<T as system::Config>::AccountId
 		{
 			A(AccountId),
 		}
 	}
 
 	frame_support::decl_error! {
-		pub enum Error for Module<T: Trait<I>, I: Instance> {
+		pub enum Error for Module<T: Config<I>, I: Instance> {
 			Something
 		}
 	}
 
 	frame_support::decl_storage! {
-		trait Store for Module<T: Trait<I>, I: Instance=DefaultInstance> as Module {}
+		trait Store for Module<T: Config<I>, I: Instance=DefaultInstance> as Module {}
 	}
 }
 
 mod module2 {
 	use super::*;
 
-	pub trait Trait: system::Trait {}
+	pub trait Config: system::Config {}
 
 	frame_support::decl_module! {
-		pub struct Module<T: Trait> for enum Call
-			where origin: <T as system::Trait>::Origin, system=system
+		pub struct Module<T: Config> for enum Call
+			where origin: <T as system::Config>::Origin, system=system
 		{
 			#[weight = 0]
 			pub fn fail(_origin) -> frame_support::dispatch::DispatchResult {
@@ -102,25 +102,25 @@ mod module2 {
 	}
 
 	frame_support::decl_error! {
-		pub enum Error for Module<T: Trait> {
+		pub enum Error for Module<T: Config> {
 			Something
 		}
 	}
 
 	frame_support::decl_storage! {
-		trait Store for Module<T: Trait> as Module {}
+		trait Store for Module<T: Config> as Module {}
 	}
 }
 
-impl<I> module1::Trait<I> for Runtime {}
-impl module2::Trait for Runtime {}
+impl<I> module1::Config<I> for Runtime {}
+impl module2::Config for Runtime {}
 
 pub type Signature = sr25519::Signature;
 pub type AccountId = <Signature as Verify>::Signer;
 pub type BlockNumber = u64;
 pub type Index = u64;
 
-impl system::Trait for Runtime {
+impl system::Config for Runtime {
 	type BaseCallFilter = ();
 	type Hash = H256;
 	type Origin = Origin;
diff --git a/frame/support/test/tests/decl_module_ui/reserved_keyword_two_times_integrity_test.rs b/frame/support/test/tests/decl_module_ui/reserved_keyword_two_times_integrity_test.rs
index 56eff29c5dc1..cc7c1ff219d8 100644
--- a/frame/support/test/tests/decl_module_ui/reserved_keyword_two_times_integrity_test.rs
+++ b/frame/support/test/tests/decl_module_ui/reserved_keyword_two_times_integrity_test.rs
@@ -1,5 +1,5 @@
 frame_support::decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {
 		fn integrity_test() {}
 
 		fn integrity_test() {}
diff --git a/frame/support/test/tests/decl_module_ui/reserved_keyword_two_times_integrity_test.stderr b/frame/support/test/tests/decl_module_ui/reserved_keyword_two_times_integrity_test.stderr
index 25f3b891d9b4..3bf5f58b43a3 100644
--- a/frame/support/test/tests/decl_module_ui/reserved_keyword_two_times_integrity_test.stderr
+++ b/frame/support/test/tests/decl_module_ui/reserved_keyword_two_times_integrity_test.stderr
@@ -2,7 +2,7 @@ error: `integrity_test` can only be passed once as input.
  --> $DIR/reserved_keyword_two_times_integrity_test.rs:1:1
   |
 1 | / frame_support::decl_module! {
-2 | |     pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {
+2 | |     pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {
 3 | |         fn integrity_test() {}
 4 | |
 5 | |         fn integrity_test() {}
@@ -16,7 +16,7 @@ error[E0601]: `main` function not found in crate `$CRATE`
  --> $DIR/reserved_keyword_two_times_integrity_test.rs:1:1
   |
 1 | / frame_support::decl_module! {
-2 | |     pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {
+2 | |     pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {
 3 | |         fn integrity_test() {}
 4 | |
 5 | |         fn integrity_test() {}
diff --git a/frame/support/test/tests/decl_module_ui/reserved_keyword_two_times_on_initialize.rs b/frame/support/test/tests/decl_module_ui/reserved_keyword_two_times_on_initialize.rs
index 3e1bc25c8d59..ddde7c72c1cc 100644
--- a/frame/support/test/tests/decl_module_ui/reserved_keyword_two_times_on_initialize.rs
+++ b/frame/support/test/tests/decl_module_ui/reserved_keyword_two_times_on_initialize.rs
@@ -1,5 +1,5 @@
 frame_support::decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {
 		fn on_initialize() -> Weight {
 			0
 		}
diff --git a/frame/support/test/tests/decl_module_ui/reserved_keyword_two_times_on_initialize.stderr b/frame/support/test/tests/decl_module_ui/reserved_keyword_two_times_on_initialize.stderr
index 34c5ff3f941a..2911d7ded8a2 100644
--- a/frame/support/test/tests/decl_module_ui/reserved_keyword_two_times_on_initialize.stderr
+++ b/frame/support/test/tests/decl_module_ui/reserved_keyword_two_times_on_initialize.stderr
@@ -2,7 +2,7 @@ error: `on_initialize` can only be passed once as input.
   --> $DIR/reserved_keyword_two_times_on_initialize.rs:1:1
    |
 1  | / frame_support::decl_module! {
-2  | |     pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {
+2  | |     pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {
 3  | |         fn on_initialize() -> Weight {
 4  | |             0
 ...  |
@@ -16,7 +16,7 @@ error[E0601]: `main` function not found in crate `$CRATE`
   --> $DIR/reserved_keyword_two_times_on_initialize.rs:1:1
    |
 1  | / frame_support::decl_module! {
-2  | |     pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {
+2  | |     pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {
 3  | |         fn on_initialize() -> Weight {
 4  | |             0
 ...  |
diff --git a/frame/support/test/tests/decl_storage.rs b/frame/support/test/tests/decl_storage.rs
index 8d5727ce9104..97cf68c799b2 100644
--- a/frame/support/test/tests/decl_storage.rs
+++ b/frame/support/test/tests/decl_storage.rs
@@ -24,13 +24,13 @@ mod tests {
 	use std::marker::PhantomData;
 
 	frame_support::decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=frame_support_test {}
+		pub struct Module<T: Config> for enum Call where origin: T::Origin, system=frame_support_test {}
 	}
 
-	pub trait Trait: frame_support_test::Trait {}
+	pub trait Config: frame_support_test::Config {}
 
 	frame_support::decl_storage! {
-		trait Store for Module<T: Trait> as TestStorage {
+		trait Store for Module<T: Config> as TestStorage {
 			// non-getters: pub / $default
 
 			/// Hello, this is doc!
@@ -81,14 +81,14 @@ mod tests {
 
 	struct TraitImpl {}
 
-	impl frame_support_test::Trait for TraitImpl {
+	impl frame_support_test::Config for TraitImpl {
 		type Origin = u32;
 		type BlockNumber = u32;
 		type PalletInfo = ();
 		type DbWeight = ();
 	}
 
-	impl Trait for TraitImpl {}
+	impl Config for TraitImpl {}
 
 	const EXPECTED_METADATA: StorageMetadata = StorageMetadata {
 		prefix: DecodeDifferent::Encode("TestStorage"),
@@ -414,16 +414,16 @@ mod tests {
 #[cfg(test)]
 #[allow(dead_code)]
 mod test2 {
-	pub trait Trait: frame_support_test::Trait {}
+	pub trait Config: frame_support_test::Config {}
 
 	frame_support::decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=frame_support_test {}
+		pub struct Module<T: Config> for enum Call where origin: T::Origin, system=frame_support_test {}
 	}
 
 	type PairOf<T> = (T, T);
 
 	frame_support::decl_storage! {
-		trait Store for Module<T: Trait> as TestStorage {
+		trait Store for Module<T: Config> as TestStorage {
 			SingleDef : u32;
 			PairDef : PairOf<u32>;
 			Single : Option<u32>;
@@ -438,26 +438,26 @@ mod test2 {
 
 	struct TraitImpl {}
 
-	impl frame_support_test::Trait for TraitImpl {
+	impl frame_support_test::Config for TraitImpl {
 		type Origin = u32;
 		type BlockNumber = u32;
 		type PalletInfo = ();
 		type DbWeight = ();
 	}
 
-	impl Trait for TraitImpl {}
+	impl Config for TraitImpl {}
 }
 
 #[cfg(test)]
 #[allow(dead_code)]
 mod test3 {
-	pub trait Trait: frame_support_test::Trait {}
+	pub trait Config: frame_support_test::Config {}
 
 	frame_support::decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=frame_support_test {}
+		pub struct Module<T: Config> for enum Call where origin: T::Origin, system=frame_support_test {}
 	}
 	frame_support::decl_storage! {
-		trait Store for Module<T: Trait> as Test {
+		trait Store for Module<T: Config> as Test {
 			Foo get(fn foo) config(initial_foo): u32;
 		}
 	}
@@ -466,14 +466,14 @@ mod test3 {
 
 	struct TraitImpl {}
 
-	impl frame_support_test::Trait for TraitImpl {
+	impl frame_support_test::Config for TraitImpl {
 		type Origin = u32;
 		type BlockNumber = u32;
 		type PalletInfo = ();
 		type DbWeight = ();
 	}
 
-	impl Trait for TraitImpl {}
+	impl Config for TraitImpl {}
 }
 
 #[cfg(test)]
@@ -482,17 +482,17 @@ mod test_append_and_len {
 	use sp_io::TestExternalities;
 	use codec::{Encode, Decode};
 
-	pub trait Trait: frame_support_test::Trait {}
+	pub trait Config: frame_support_test::Config {}
 
 	frame_support::decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=frame_support_test {}
+		pub struct Module<T: Config> for enum Call where origin: T::Origin, system=frame_support_test {}
 	}
 
 	#[derive(PartialEq, Eq, Clone, Encode, Decode)]
 	struct NoDef(u32);
 
 	frame_support::decl_storage! {
-		trait Store for Module<T: Trait> as Test {
+		trait Store for Module<T: Config> as Test {
 			NoDefault: Option<NoDef>;
 
 			JustVec: Vec<u32>;
@@ -511,14 +511,14 @@ mod test_append_and_len {
 
 	struct Test {}
 
-	impl frame_support_test::Trait for Test {
+	impl frame_support_test::Config for Test {
 		type Origin = u32;
 		type BlockNumber = u32;
 		type PalletInfo = ();
 		type DbWeight = ();
 	}
 
-	impl Trait for Test {}
+	impl Config for Test {}
 
 	#[test]
 	fn default_for_option() {
diff --git a/frame/support/test/tests/decl_storage_ui/config_duplicate.rs b/frame/support/test/tests/decl_storage_ui/config_duplicate.rs
index 58923ed19297..c7de52dd8935 100644
--- a/frame/support/test/tests/decl_storage_ui/config_duplicate.rs
+++ b/frame/support/test/tests/decl_storage_ui/config_duplicate.rs
@@ -15,14 +15,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-pub trait Trait: frame_support_test::Trait {}
+pub trait Config: frame_support_test::Config {}
 
 frame_support::decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=frame_support_test {}
+	pub struct Module<T: Config> for enum Call where origin: T::Origin, system=frame_support_test {}
 }
 
 frame_support::decl_storage!{
-	trait Store for Module<T: Trait> as FinalKeysNone {
+	trait Store for Module<T: Config> as FinalKeysNone {
 		pub Value config(value): u32;
 		pub Value2 config(value): u32;
 	}
diff --git a/frame/support/test/tests/decl_storage_ui/config_get_duplicate.rs b/frame/support/test/tests/decl_storage_ui/config_get_duplicate.rs
index e77dcea404cc..60bfa7f89c36 100644
--- a/frame/support/test/tests/decl_storage_ui/config_get_duplicate.rs
+++ b/frame/support/test/tests/decl_storage_ui/config_get_duplicate.rs
@@ -15,14 +15,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-pub trait Trait: frame_support_test::Trait {}
+pub trait Config: frame_support_test::Config {}
 
 frame_support::decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=frame_support_test {}
+	pub struct Module<T: Config> for enum Call where origin: T::Origin, system=frame_support_test {}
 }
 
 frame_support::decl_storage!{
-	trait Store for Module<T: Trait> as FinalKeysNone {
+	trait Store for Module<T: Config> as FinalKeysNone {
 		pub Value get(fn value) config(): u32;
 		pub Value2 config(value): u32;
 	}
diff --git a/frame/support/test/tests/decl_storage_ui/get_duplicate.rs b/frame/support/test/tests/decl_storage_ui/get_duplicate.rs
index b6ccb7ebb7b7..921dfa6b774d 100644
--- a/frame/support/test/tests/decl_storage_ui/get_duplicate.rs
+++ b/frame/support/test/tests/decl_storage_ui/get_duplicate.rs
@@ -15,14 +15,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-pub trait Trait: frame_support_test::Trait {}
+pub trait Config: frame_support_test::Config {}
 
 frame_support::decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=frame_support_test {}
+	pub struct Module<T: Config> for enum Call where origin: T::Origin, system=frame_support_test {}
 }
 
 frame_support::decl_storage!{
-	trait Store for Module<T: Trait> as FinalKeysNone {
+	trait Store for Module<T: Config> as FinalKeysNone {
 		pub Value get(fn value) config(): u32;
 		pub Value2 get(fn value) config(): u32;
 	}
diff --git a/frame/support/test/tests/derive_no_bound.rs b/frame/support/test/tests/derive_no_bound.rs
index 29f813c6498b..48f2f3ec3f6b 100644
--- a/frame/support/test/tests/derive_no_bound.rs
+++ b/frame/support/test/tests/derive_no_bound.rs
@@ -28,19 +28,19 @@ fn runtime_debug_no_bound_display_correctly() {
 	assert_eq!(format!("{:?}", Unnamed(1)), "Unnamed(1)");
 }
 
-trait Trait {
+trait Config {
 	type C: std::fmt::Debug + Clone + Eq + PartialEq;
 }
 
 struct Runtime;
 struct ImplNone;
 
-impl Trait for Runtime {
+impl Config for Runtime {
 	type C = u32;
 }
 
 #[derive(DebugNoBound, CloneNoBound, EqNoBound, PartialEqNoBound)]
-struct StructNamed<T: Trait, U, V> {
+struct StructNamed<T: Config, U, V> {
 	a: u32,
 	b: u64,
 	c: T::C,
@@ -77,7 +77,7 @@ fn test_struct_named() {
 }
 
 #[derive(DebugNoBound, CloneNoBound, EqNoBound, PartialEqNoBound)]
-struct StructUnnamed<T: Trait, U, V>(u32, u64, T::C, core::marker::PhantomData<(U, V)>);
+struct StructUnnamed<T: Config, U, V>(u32, u64, T::C, core::marker::PhantomData<(U, V)>);
 
 #[test]
 fn test_struct_unnamed() {
@@ -109,7 +109,7 @@ fn test_struct_unnamed() {
 }
 
 #[derive(DebugNoBound, CloneNoBound, EqNoBound, PartialEqNoBound)]
-enum Enum<T: Trait, U, V> {
+enum Enum<T: Config, U, V> {
 	VariantUnnamed(u32, u64, T::C, core::marker::PhantomData<(U, V)>),
 	VariantNamed {
 		a: u32,
diff --git a/frame/support/test/tests/derive_no_bound_ui/clone.rs b/frame/support/test/tests/derive_no_bound_ui/clone.rs
index 6b80dcedc388..2bc1cc492d17 100644
--- a/frame/support/test/tests/derive_no_bound_ui/clone.rs
+++ b/frame/support/test/tests/derive_no_bound_ui/clone.rs
@@ -1,9 +1,9 @@
-trait Trait {
+trait Config {
 	type C;
 }
 
 #[derive(frame_support::CloneNoBound)]
-struct Foo<T: Trait> {
+struct Foo<T: Config> {
 	c: T::C,
 }
 
diff --git a/frame/support/test/tests/derive_no_bound_ui/clone.stderr b/frame/support/test/tests/derive_no_bound_ui/clone.stderr
index 4b9cccf0b0fa..af322f386aec 100644
--- a/frame/support/test/tests/derive_no_bound_ui/clone.stderr
+++ b/frame/support/test/tests/derive_no_bound_ui/clone.stderr
@@ -1,7 +1,7 @@
-error[E0277]: the trait bound `<T as Trait>::C: std::clone::Clone` is not satisfied
+error[E0277]: the trait bound `<T as Config>::C: std::clone::Clone` is not satisfied
  --> $DIR/clone.rs:7:2
   |
 7 |     c: T::C,
-  |     ^ the trait `std::clone::Clone` is not implemented for `<T as Trait>::C`
+  |     ^ the trait `std::clone::Clone` is not implemented for `<T as Config>::C`
   |
   = note: required by `std::clone::Clone::clone`
diff --git a/frame/support/test/tests/derive_no_bound_ui/debug.rs b/frame/support/test/tests/derive_no_bound_ui/debug.rs
index f2411da4b41b..6016c3e6d98b 100644
--- a/frame/support/test/tests/derive_no_bound_ui/debug.rs
+++ b/frame/support/test/tests/derive_no_bound_ui/debug.rs
@@ -1,9 +1,9 @@
-trait Trait {
+trait Config {
 	type C;
 }
 
 #[derive(frame_support::DebugNoBound)]
-struct Foo<T: Trait> {
+struct Foo<T: Config> {
 	c: T::C,
 }
 
diff --git a/frame/support/test/tests/derive_no_bound_ui/debug.stderr b/frame/support/test/tests/derive_no_bound_ui/debug.stderr
index 838bd7f68a65..7580cab2ea0b 100644
--- a/frame/support/test/tests/derive_no_bound_ui/debug.stderr
+++ b/frame/support/test/tests/derive_no_bound_ui/debug.stderr
@@ -1,8 +1,8 @@
-error[E0277]: `<T as Trait>::C` doesn't implement `std::fmt::Debug`
+error[E0277]: `<T as Config>::C` doesn't implement `std::fmt::Debug`
  --> $DIR/debug.rs:7:2
   |
 7 |     c: T::C,
-  |     ^ `<T as Trait>::C` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
+  |     ^ `<T as Config>::C` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
   |
-  = help: the trait `std::fmt::Debug` is not implemented for `<T as Trait>::C`
+  = help: the trait `std::fmt::Debug` is not implemented for `<T as Config>::C`
   = note: required for the cast to the object type `dyn std::fmt::Debug`
diff --git a/frame/support/test/tests/derive_no_bound_ui/eq.rs b/frame/support/test/tests/derive_no_bound_ui/eq.rs
index 9e4026734fbe..a48452626368 100644
--- a/frame/support/test/tests/derive_no_bound_ui/eq.rs
+++ b/frame/support/test/tests/derive_no_bound_ui/eq.rs
@@ -1,9 +1,9 @@
-trait Trait {
+trait Config {
 	type C;
 }
 
 #[derive(frame_support::EqNoBound)]
-struct Foo<T: Trait> {
+struct Foo<T: Config> {
 	c: T::C,
 }
 
diff --git a/frame/support/test/tests/derive_no_bound_ui/eq.stderr b/frame/support/test/tests/derive_no_bound_ui/eq.stderr
index 08341c4d65ab..bd5df600dc42 100644
--- a/frame/support/test/tests/derive_no_bound_ui/eq.stderr
+++ b/frame/support/test/tests/derive_no_bound_ui/eq.stderr
@@ -1,7 +1,7 @@
 error[E0277]: can't compare `Foo<T>` with `Foo<T>`
    --> $DIR/eq.rs:6:8
     |
-6   | struct Foo<T: Trait> {
+6   | struct Foo<T: Config> {
     |        ^^^ no implementation for `Foo<T> == Foo<T>`
     |
     = help: the trait `std::cmp::PartialEq` is not implemented for `Foo<T>`
diff --git a/frame/support/test/tests/derive_no_bound_ui/partial_eq.rs b/frame/support/test/tests/derive_no_bound_ui/partial_eq.rs
index 1720776a4002..7bd6b7ef6a2e 100644
--- a/frame/support/test/tests/derive_no_bound_ui/partial_eq.rs
+++ b/frame/support/test/tests/derive_no_bound_ui/partial_eq.rs
@@ -1,9 +1,9 @@
-trait Trait {
+trait Config {
 	type C;
 }
 
 #[derive(frame_support::PartialEqNoBound)]
-struct Foo<T: Trait> {
+struct Foo<T: Config> {
 	c: T::C,
 }
 
diff --git a/frame/support/test/tests/derive_no_bound_ui/partial_eq.stderr b/frame/support/test/tests/derive_no_bound_ui/partial_eq.stderr
index d85757c520aa..64f844e547be 100644
--- a/frame/support/test/tests/derive_no_bound_ui/partial_eq.stderr
+++ b/frame/support/test/tests/derive_no_bound_ui/partial_eq.stderr
@@ -1,7 +1,7 @@
-error[E0369]: binary operation `==` cannot be applied to type `<T as Trait>::C`
+error[E0369]: binary operation `==` cannot be applied to type `<T as Config>::C`
  --> $DIR/partial_eq.rs:7:2
   |
 7 |     c: T::C,
   |     ^
   |
-  = note: the trait `std::cmp::PartialEq` is not implemented for `<T as Trait>::C`
+  = note: the trait `std::cmp::PartialEq` is not implemented for `<T as Config>::C`
diff --git a/frame/support/test/tests/final_keys.rs b/frame/support/test/tests/final_keys.rs
index 6bd125282546..e7c95c6b432a 100644
--- a/frame/support/test/tests/final_keys.rs
+++ b/frame/support/test/tests/final_keys.rs
@@ -21,14 +21,14 @@ use frame_support::{StorageDoubleMap, StorageMap, StorageValue, StoragePrefixedM
 use sp_io::{TestExternalities, hashing::{twox_64, twox_128, blake2_128}};
 
 mod no_instance {
-	pub trait Trait: frame_support_test::Trait {}
+	pub trait Config: frame_support_test::Config {}
 
 	frame_support::decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=frame_support_test {}
+		pub struct Module<T: Config> for enum Call where origin: T::Origin, system=frame_support_test {}
 	}
 
 	frame_support::decl_storage!{
-		trait Store for Module<T: Trait> as FinalKeysNone {
+		trait Store for Module<T: Config> as FinalKeysNone {
 			pub Value config(value): u32;
 
 			pub Map: map hasher(blake2_128_concat) u32 => u32;
@@ -45,15 +45,15 @@ mod no_instance {
 }
 
 mod instance {
-	pub trait Trait<I = DefaultInstance>: frame_support_test::Trait {}
+	pub trait Config<I = DefaultInstance>: frame_support_test::Config {}
 
 	frame_support::decl_module! {
-		pub struct Module<T: Trait<I>, I: Instance = DefaultInstance>
+		pub struct Module<T: Config<I>, I: Instance = DefaultInstance>
 			for enum Call where origin: T::Origin, system=frame_support_test {}
 	}
 
 	frame_support::decl_storage!{
-		trait Store for Module<T: Trait<I>, I: Instance = DefaultInstance>
+		trait Store for Module<T: Config<I>, I: Instance = DefaultInstance>
 			as FinalKeysSome
 		{
 			pub Value config(value): u32;
diff --git a/frame/support/test/tests/genesisconfig.rs b/frame/support/test/tests/genesisconfig.rs
index f268f11a4dc1..4a875bb68890 100644
--- a/frame/support/test/tests/genesisconfig.rs
+++ b/frame/support/test/tests/genesisconfig.rs
@@ -15,28 +15,28 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-pub trait Trait: frame_support_test::Trait {}
+pub trait Config: frame_support_test::Config {}
 
 frame_support::decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=frame_support_test {}
+	pub struct Module<T: Config> for enum Call where origin: T::Origin, system=frame_support_test {}
 }
 
 frame_support::decl_storage! {
-	trait Store for Module<T: Trait> as Test {
+	trait Store for Module<T: Config> as Test {
 		pub AppendableDM config(t): double_map hasher(identity) u32, hasher(identity) T::BlockNumber => Vec<u32>;
 	}
 }
 
 struct Test;
 
-impl frame_support_test::Trait for Test {
+impl frame_support_test::Config for Test {
 	type BlockNumber = u32;
 	type Origin = ();
 	type PalletInfo = ();
 	type DbWeight = ();
 }
 
-impl Trait for Test {}
+impl Config for Test {}
 
 #[test]
 fn init_genesis_config() {
diff --git a/frame/support/test/tests/instance.rs b/frame/support/test/tests/instance.rs
index 6c90767f92e5..b5bb6dd671b9 100644
--- a/frame/support/test/tests/instance.rs
+++ b/frame/support/test/tests/instance.rs
@@ -41,16 +41,16 @@ mod module1 {
 	use super::*;
 	use sp_std::ops::Add;
 
-	pub trait Trait<I>: system::Trait where <Self as system::Trait>::BlockNumber: From<u32> {
-		type Event: From<Event<Self, I>> + Into<<Self as system::Trait>::Event>;
+	pub trait Config<I>: system::Config where <Self as system::Config>::BlockNumber: From<u32> {
+		type Event: From<Event<Self, I>> + Into<<Self as system::Config>::Event>;
 		type Origin: From<Origin<Self, I>>;
 		type SomeParameter: Get<u32>;
 		type GenericType: Default + Clone + Codec + EncodeLike;
 	}
 
 	frame_support::decl_module! {
-		pub struct Module<T: Trait<I>, I: Instance> for enum Call where
-			origin: <T as system::Trait>::Origin,
+		pub struct Module<T: Config<I>, I: Instance> for enum Call where
+			origin: <T as system::Config>::Origin,
 			system = system,
 			T::BlockNumber: From<u32>
 		{
@@ -67,7 +67,7 @@ mod module1 {
 	}
 
 	frame_support::decl_storage! {
-		trait Store for Module<T: Trait<I>, I: Instance> as Module1 where
+		trait Store for Module<T: Config<I>, I: Instance> as Module1 where
 			T::BlockNumber: From<u32> + std::fmt::Display
 		{
 			pub Value config(value): T::GenericType;
@@ -83,7 +83,7 @@ mod module1 {
 	}
 
 	frame_support::decl_error! {
-		pub enum Error for Module<T: Trait<I>, I: Instance> where
+		pub enum Error for Module<T: Config<I>, I: Instance> where
 			T::BlockNumber: From<u32>,
 			T::BlockNumber: Add,
 			T::AccountId: AsRef<[u8]>,
@@ -101,14 +101,14 @@ mod module1 {
 	}
 
 	#[derive(PartialEq, Eq, Clone, sp_runtime::RuntimeDebug, Encode, Decode)]
-	pub enum Origin<T: Trait<I>, I> where T::BlockNumber: From<u32> {
+	pub enum Origin<T: Config<I>, I> where T::BlockNumber: From<u32> {
 		Members(u32),
 		_Phantom(std::marker::PhantomData<(T, I)>),
 	}
 
 	pub const INHERENT_IDENTIFIER: InherentIdentifier = *b"12345678";
 
-	impl<T: Trait<I>, I: Instance> ProvideInherent for Module<T, I> where
+	impl<T: Config<I>, I: Instance> ProvideInherent for Module<T, I> where
 		T::BlockNumber: From<u32>
 	{
 		type Call = Call<T, I>;
@@ -131,17 +131,17 @@ mod module1 {
 mod module2 {
 	use super::*;
 
-	pub trait Trait<I=DefaultInstance>: system::Trait {
+	pub trait Config<I=DefaultInstance>: system::Config {
 		type Amount: Parameter + Default;
-		type Event: From<Event<Self, I>> + Into<<Self as system::Trait>::Event>;
+		type Event: From<Event<Self, I>> + Into<<Self as system::Config>::Event>;
 		type Origin: From<Origin<Self, I>>;
 	}
 
-	impl<T: Trait<I>, I: Instance> Currency for Module<T, I> {}
+	impl<T: Config<I>, I: Instance> Currency for Module<T, I> {}
 
 	frame_support::decl_module! {
-		pub struct Module<T: Trait<I>, I: Instance=DefaultInstance> for enum Call where
-			origin: <T as system::Trait>::Origin,
+		pub struct Module<T: Config<I>, I: Instance=DefaultInstance> for enum Call where
+			origin: <T as system::Config>::Origin,
 			system = system
 		{
 			fn deposit_event() = default;
@@ -149,7 +149,7 @@ mod module2 {
 	}
 
 	frame_support::decl_storage! {
-		trait Store for Module<T: Trait<I>, I: Instance=DefaultInstance> as Module2 {
+		trait Store for Module<T: Config<I>, I: Instance=DefaultInstance> as Module2 {
 			pub Value config(value): T::Amount;
 			pub Map config(map): map hasher(identity) u64 => u64;
 			pub DoubleMap config(double_map): double_map hasher(identity) u64, hasher(identity) u64 => u64;
@@ -157,20 +157,20 @@ mod module2 {
 	}
 
 	frame_support::decl_event! {
-		pub enum Event<T, I=DefaultInstance> where Amount = <T as Trait<I>>::Amount {
+		pub enum Event<T, I=DefaultInstance> where Amount = <T as Config<I>>::Amount {
 			Variant(Amount),
 		}
 	}
 
 	#[derive(PartialEq, Eq, Clone, sp_runtime::RuntimeDebug, Encode, Decode)]
-	pub enum Origin<T: Trait<I>, I=DefaultInstance> {
+	pub enum Origin<T: Config<I>, I=DefaultInstance> {
 		Members(u32),
 		_Phantom(std::marker::PhantomData<(T, I)>),
 	}
 
 	pub const INHERENT_IDENTIFIER: InherentIdentifier = *b"12345678";
 
-	impl<T: Trait<I>, I: Instance> ProvideInherent for Module<T, I> {
+	impl<T: Config<I>, I: Instance> ProvideInherent for Module<T, I> {
 		type Call = Call<T, I>;
 		type Error = MakeFatalError<sp_inherents::Error>;
 		const INHERENT_IDENTIFIER: InherentIdentifier = INHERENT_IDENTIFIER;
@@ -190,13 +190,13 @@ mod module2 {
 mod module3 {
 	use super::*;
 
-	pub trait Trait: module2::Trait + module2::Trait<module2::Instance1> + system::Trait {
+	pub trait Config: module2::Config + module2::Config<module2::Instance1> + system::Config {
 		type Currency: Currency;
 		type Currency2: Currency;
 	}
 
 	frame_support::decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: <T as system::Trait>::Origin, system=system {}
+		pub struct Module<T: Config> for enum Call where origin: <T as system::Config>::Origin, system=system {}
 	}
 }
 
@@ -204,39 +204,39 @@ parameter_types! {
 	pub const SomeValue: u32 = 100;
 }
 
-impl module1::Trait<module1::Instance1> for Runtime {
+impl module1::Config<module1::Instance1> for Runtime {
 	type Event = Event;
 	type Origin = Origin;
 	type SomeParameter = SomeValue;
 	type GenericType = u32;
 }
-impl module1::Trait<module1::Instance2> for Runtime {
+impl module1::Config<module1::Instance2> for Runtime {
 	type Event = Event;
 	type Origin = Origin;
 	type SomeParameter = SomeValue;
 	type GenericType = u32;
 }
-impl module2::Trait for Runtime {
+impl module2::Config for Runtime {
 	type Amount = u16;
 	type Event = Event;
 	type Origin = Origin;
 }
-impl module2::Trait<module2::Instance1> for Runtime {
+impl module2::Config<module2::Instance1> for Runtime {
 	type Amount = u32;
 	type Event = Event;
 	type Origin = Origin;
 }
-impl module2::Trait<module2::Instance2> for Runtime {
+impl module2::Config<module2::Instance2> for Runtime {
 	type Amount = u32;
 	type Event = Event;
 	type Origin = Origin;
 }
-impl module2::Trait<module2::Instance3> for Runtime {
+impl module2::Config<module2::Instance3> for Runtime {
 	type Amount = u64;
 	type Event = Event;
 	type Origin = Origin;
 }
-impl module3::Trait for Runtime {
+impl module3::Config for Runtime {
 	type Currency = Module2_2;
 	type Currency2 = Module2_3;
 }
@@ -246,7 +246,7 @@ pub type AccountId = <Signature as Verify>::Signer;
 pub type BlockNumber = u64;
 pub type Index = u64;
 
-impl system::Trait for Runtime {
+impl system::Config for Runtime {
 	type BaseCallFilter= ();
 	type Hash = H256;
 	type Origin = Origin;
diff --git a/frame/support/test/tests/issue2219.rs b/frame/support/test/tests/issue2219.rs
index 596a3b6ffb25..70a84dfee59d 100644
--- a/frame/support/test/tests/issue2219.rs
+++ b/frame/support/test/tests/issue2219.rs
@@ -27,9 +27,9 @@ mod module {
 	use super::*;
 
 	pub type Request<T> = (
-		<T as system::Trait>::AccountId,
+		<T as system::Config>::AccountId,
 		Role,
-		<T as system::Trait>::BlockNumber,
+		<T as system::Config>::BlockNumber,
 	);
 	pub type Requests<T> = Vec<Request<T>>;
 
@@ -39,7 +39,7 @@ mod module {
 	}
 
 	#[derive(Encode, Decode, Copy, Clone, Eq, PartialEq, Debug)]
-	pub struct RoleParameters<T: Trait> {
+	pub struct RoleParameters<T: Config> {
 		// minimum actors to maintain - if role is unstaking
 		// and remaining actors would be less that this value - prevent or punish for unstaking
 		pub min_actors: u32,
@@ -65,7 +65,7 @@ mod module {
 		pub startup_grace_period: T::BlockNumber,
 	}
 
-	impl<T: Trait> Default for RoleParameters<T> {
+	impl<T: Config> Default for RoleParameters<T> {
 		fn default() -> Self {
 			Self {
 				max_actors: 10,
@@ -81,18 +81,18 @@ mod module {
 		}
 	}
 
-	pub trait Trait: system::Trait {}
+	pub trait Config: system::Config {}
 
 	frame_support::decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=system {}
+		pub struct Module<T: Config> for enum Call where origin: T::Origin, system=system {}
 	}
 
 	#[derive(Encode, Decode, Copy, Clone, Serialize, Deserialize)]
-	pub struct Data<T: Trait> {
+	pub struct Data<T: Config> {
 		pub	data: T::BlockNumber,
 	}
 
-	impl<T: Trait> Default for Data<T> {
+	impl<T: Config> Default for Data<T> {
 		fn default() -> Self {
 			Self {
 				data: T::BlockNumber::default(),
@@ -101,7 +101,7 @@ mod module {
 	}
 
 	frame_support::decl_storage! {
-		trait Store for Module<T: Trait> as Actors {
+		trait Store for Module<T: Config> as Actors {
 			/// requirements to enter and maintain status in roles
 			pub Parameters get(fn parameters) build(|config: &GenesisConfig| {
 				if config.enable_storage_role {
@@ -157,7 +157,7 @@ pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
 pub type Block = generic::Block<Header, UncheckedExtrinsic>;
 pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, Call, Signature, ()>;
 
-impl system::Trait for Runtime {
+impl system::Config for Runtime {
 	type BaseCallFilter = ();
 	type Hash = H256;
 	type Origin = Origin;
@@ -169,7 +169,7 @@ impl system::Trait for Runtime {
 	type DbWeight = ();
 }
 
-impl module::Trait for Runtime {}
+impl module::Config for Runtime {}
 
 frame_support::construct_runtime!(
 	pub enum Runtime where
diff --git a/frame/support/test/tests/pallet_version.rs b/frame/support/test/tests/pallet_version.rs
index d6293ac6a308..00750c676721 100644
--- a/frame/support/test/tests/pallet_version.rs
+++ b/frame/support/test/tests/pallet_version.rs
@@ -37,11 +37,11 @@ const SOME_TEST_VERSION: PalletVersion = PalletVersion { major: 3000, minor: 30,
 mod module1 {
 	use super::*;
 
-	pub trait Trait: system::Trait {}
+	pub trait Config: system::Config {}
 
 	frame_support::decl_module! {
-		pub struct Module<T: Trait> for enum Call where
-			origin: <T as system::Trait>::Origin,
+		pub struct Module<T: Config> for enum Call where
+			origin: <T as system::Config>::Origin,
 			system = system,
 		{}
 	}
@@ -52,11 +52,11 @@ mod module1 {
 mod module2 {
 	use super::*;
 
-	pub trait Trait<I=DefaultInstance>: system::Trait {}
+	pub trait Config<I=DefaultInstance>: system::Config {}
 
 	frame_support::decl_module! {
-		pub struct Module<T: Trait<I>, I: Instance=DefaultInstance> for enum Call where
-			origin: <T as system::Trait>::Origin,
+		pub struct Module<T: Config<I>, I: Instance=DefaultInstance> for enum Call where
+			origin: <T as system::Config>::Origin,
 			system = system
 		{
 			fn on_runtime_upgrade() -> Weight {
@@ -78,21 +78,21 @@ mod module2 {
 	}
 
 	frame_support::decl_storage! {
-		trait Store for Module<T: Trait<I>, I: Instance=DefaultInstance> as Module2 {}
+		trait Store for Module<T: Config<I>, I: Instance=DefaultInstance> as Module2 {}
 	}
 }
 
-impl module1::Trait for Runtime {}
-impl module2::Trait for Runtime {}
-impl module2::Trait<module2::Instance1> for Runtime {}
-impl module2::Trait<module2::Instance2> for Runtime {}
+impl module1::Config for Runtime {}
+impl module2::Config for Runtime {}
+impl module2::Config<module2::Instance1> for Runtime {}
+impl module2::Config<module2::Instance2> for Runtime {}
 
 pub type Signature = sr25519::Signature;
 pub type AccountId = <Signature as Verify>::Signer;
 pub type BlockNumber = u64;
 pub type Index = u64;
 
-impl system::Trait for Runtime {
+impl system::Config for Runtime {
 	type BaseCallFilter= ();
 	type Hash = H256;
 	type Origin = Origin;
diff --git a/frame/support/test/tests/pallet_with_name_trait_is_valid.rs b/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
new file mode 100644
index 000000000000..3bb5e0ce6679
--- /dev/null
+++ b/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
@@ -0,0 +1,157 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub trait Trait: frame_system::Config {
+	type Balance: frame_support::dispatch::Parameter;
+	/// The overarching event type.
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
+}
+
+frame_support::decl_storage! {
+	trait Store for Module<T: Trait> as Example {
+		Dummy get(fn dummy) config(): Option<u32>;
+	}
+}
+
+frame_support::decl_event!(
+	pub enum Event<T> where B = <T as Trait>::Balance {
+		Dummy(B),
+	}
+);
+
+frame_support::decl_error!(
+	pub enum Error for Module<T: Trait> {
+		Dummy,
+	}
+);
+
+frame_support::decl_module! {
+	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+		fn deposit_event() = default;
+		type Error = Error<T>;
+		const Foo: u32 = u32::max_value();
+
+		#[weight = 0]
+		fn accumulate_dummy(origin, increase_by: T::Balance) {
+			unimplemented!();
+		}
+
+		fn on_initialize(_n: T::BlockNumber) -> frame_support::weights::Weight {
+			0
+		}
+	}
+}
+
+impl<T: Trait> sp_runtime::traits::ValidateUnsigned for Module<T> {
+	type Call = Call<T>;
+
+	fn validate_unsigned(
+		_source: sp_runtime::transaction_validity::TransactionSource,
+		_call: &Self::Call,
+	) -> sp_runtime::transaction_validity::TransactionValidity {
+		unimplemented!();
+	}
+}
+
+pub const INHERENT_IDENTIFIER: sp_inherents::InherentIdentifier = *b"12345678";
+
+impl<T: Trait> sp_inherents::ProvideInherent for Module<T> {
+	type Call = Call<T>;
+	type Error = sp_inherents::MakeFatalError<sp_inherents::Error>;
+	const INHERENT_IDENTIFIER: sp_inherents::InherentIdentifier = INHERENT_IDENTIFIER;
+
+	fn create_inherent(_data: &sp_inherents::InherentData) -> Option<Self::Call> {
+		unimplemented!();
+	}
+
+	fn check_inherent(_: &Self::Call, _: &sp_inherents::InherentData) -> std::result::Result<(), Self::Error> {
+		unimplemented!();
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use crate as pallet_test;
+
+	use frame_support::parameter_types;
+	use sp_runtime::traits::Block;
+
+	type SignedExtra = (
+		frame_system::CheckEra<Runtime>,
+		frame_system::CheckNonce<Runtime>,
+		frame_system::CheckWeight<Runtime>,
+	);
+	type TestBlock = sp_runtime::generic::Block<TestHeader, TestUncheckedExtrinsic>;
+	type TestHeader = sp_runtime::generic::Header<u64, sp_runtime::traits::BlakeTwo256>;
+	type TestUncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<
+		<Runtime as frame_system::Config>::AccountId,
+		<Runtime as frame_system::Config>::Call,
+		(),
+		SignedExtra,
+	>;
+
+	frame_support::construct_runtime!(
+		pub enum Runtime where
+			Block = TestBlock,
+			NodeBlock = TestBlock,
+			UncheckedExtrinsic = TestUncheckedExtrinsic
+		{
+			System: frame_system::{Module, Call, Config, Storage, Event<T>},
+			PalletTest: pallet_test::{Module, Call, Storage, Event<T>, Config, ValidateUnsigned, Inherent},
+		}
+	);
+
+	parameter_types! {
+		pub const BlockHashCount: u64 = 250;
+		pub const MaximumBlockWeight: frame_support::weights::Weight = 1024;
+		pub const MaximumBlockLength: u32 = 2 * 1024;
+		pub const AvailableBlockRatio: sp_runtime::Perbill = sp_runtime::Perbill::one();
+	}
+
+	impl frame_system::Config for Runtime {
+		type BaseCallFilter = ();
+		type Origin = Origin;
+		type Index = u64;
+		type BlockNumber = u64;
+		type Hash = sp_core::H256;
+		type Call = Call;
+		type Hashing = sp_runtime::traits::BlakeTwo256;
+		type AccountId = u64;
+		type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
+		type Header = TestHeader;
+		type Event = ();
+		type BlockHashCount = BlockHashCount;
+		type MaximumBlockWeight = MaximumBlockWeight;
+		type DbWeight = ();
+		type BlockExecutionWeight = ();
+		type ExtrinsicBaseWeight = ();
+		type MaximumExtrinsicWeight = MaximumBlockWeight;
+		type MaximumBlockLength = MaximumBlockLength;
+		type AvailableBlockRatio = AvailableBlockRatio;
+		type Version = ();
+		type PalletInfo = ();
+		type AccountData = ();
+		type OnNewAccount = ();
+		type OnKilledAccount = ();
+		type SystemWeightInfo = ();
+	}
+
+	impl pallet_test::Trait for Runtime {
+		type Balance = u32;
+		type Event = ();
+	}
+}
diff --git a/frame/support/test/tests/reserved_keyword/on_initialize.rs b/frame/support/test/tests/reserved_keyword/on_initialize.rs
index 781b72bd04e8..72d53abfb103 100644
--- a/frame/support/test/tests/reserved_keyword/on_initialize.rs
+++ b/frame/support/test/tests/reserved_keyword/on_initialize.rs
@@ -4,7 +4,7 @@ macro_rules! reserved {
 			mod $reserved {
 				pub use frame_support::dispatch;
 
-				pub trait Trait: frame_support_test::Trait {}
+				pub trait Config: frame_support_test::Config {}
 
 				pub mod system {
 					use frame_support::dispatch;
@@ -15,7 +15,7 @@ macro_rules! reserved {
 				}
 
 				frame_support::decl_module! {
-					pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=frame_support_test {
+					pub struct Module<T: Config> for enum Call where origin: T::Origin, system=frame_support_test {
 						#[weight = 0]
 						fn $reserved(_origin) -> dispatch::DispatchResult { unreachable!() }
 					}
diff --git a/frame/support/test/tests/storage_transaction.rs b/frame/support/test/tests/storage_transaction.rs
index 5c687ef05005..93b531a678d9 100644
--- a/frame/support/test/tests/storage_transaction.rs
+++ b/frame/support/test/tests/storage_transaction.rs
@@ -22,10 +22,10 @@ use frame_support::{
 use sp_io::TestExternalities;
 use sp_std::result;
 
-pub trait Trait: frame_support_test::Trait {}
+pub trait Config: frame_support_test::Config {}
 
 frame_support::decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=frame_support_test {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin, system=frame_support_test {
 		#[weight = 0]
 		#[transactional]
 		fn value_commits(_origin, v: u32) {
@@ -42,7 +42,7 @@ frame_support::decl_module! {
 }
 
 frame_support::decl_storage!{
-	trait Store for Module<T: Trait> as StorageTransactions {
+	trait Store for Module<T: Config> as StorageTransactions {
 		pub Value: u32;
 		pub Map: map hasher(twox_64_concat) String => u32;
 	}
@@ -50,14 +50,14 @@ frame_support::decl_storage!{
 
 struct Runtime;
 
-impl frame_support_test::Trait for Runtime {
+impl frame_support_test::Config for Runtime {
 	type Origin = u32;
 	type BlockNumber = u32;
 	type PalletInfo = ();
 	type DbWeight = ();
 }
 
-impl Trait for Runtime {}
+impl Config for Runtime {}
 
 #[test]
 fn storage_transaction_basic_commit() {
diff --git a/frame/support/test/tests/system.rs b/frame/support/test/tests/system.rs
index f30b6e4c2af9..2021aa43f518 100644
--- a/frame/support/test/tests/system.rs
+++ b/frame/support/test/tests/system.rs
@@ -19,7 +19,7 @@ use frame_support::{
 	codec::{Encode, Decode, EncodeLike}, traits::Get, weights::RuntimeDbWeight,
 };
 
-pub trait Trait: 'static + Eq + Clone {
+pub trait Config: 'static + Eq + Clone {
 	type Origin: Into<Result<RawOrigin<Self::AccountId>, Self::Origin>>
 		+ From<RawOrigin<Self::AccountId>>;
 
@@ -34,18 +34,18 @@ pub trait Trait: 'static + Eq + Clone {
 }
 
 frame_support::decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {
 		#[weight = 0]
 		fn noop(origin) {}
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	pub fn deposit_event(_event: impl Into<T::Event>) {}
 }
 
 frame_support::decl_event!(
-	pub enum Event<T> where BlockNumber = <T as Trait>::BlockNumber {
+	pub enum Event<T> where BlockNumber = <T as Config>::BlockNumber {
 		ExtrinsicSuccess,
 		ExtrinsicFailed,
 		Ignore(BlockNumber),
@@ -53,7 +53,7 @@ frame_support::decl_event!(
 );
 
 frame_support::decl_error! {
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Test error documentation
 		TestError,
 		/// Error documentation
@@ -79,7 +79,7 @@ impl<AccountId> From<Option<AccountId>> for RawOrigin<AccountId> {
 	}
 }
 
-pub type Origin<T> = RawOrigin<<T as Trait>::AccountId>;
+pub type Origin<T> = RawOrigin<<T as Config>::AccountId>;
 
 #[allow(dead_code)]
 pub fn ensure_root<OuterOrigin, AccountId>(o: OuterOrigin) -> Result<(), &'static str>
diff --git a/frame/system/benches/bench.rs b/frame/system/benches/bench.rs
index 00c965136c0d..bedb99b9f894 100644
--- a/frame/system/benches/bench.rs
+++ b/frame/system/benches/bench.rs
@@ -24,12 +24,12 @@ use sp_runtime::{Perbill, traits::{BlakeTwo256, IdentityLookup}, testing::Header
 mod module {
 	use super::*;
 
-	pub trait Trait: system::Trait {
-		type Event: From<Event> + Into<<Self as system::Trait>::Event>;
+	pub trait Config: system::Config {
+		type Event: From<Event> + Into<<Self as system::Config>::Event>;
 	}
 
 	decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+		pub struct Module<T: Config> for enum Call where origin: T::Origin {
 			pub fn deposit_event() = default;
 		}
 	}
@@ -60,7 +60,7 @@ frame_support::parameter_types! {
 }
 #[derive(Clone, Eq, PartialEq)]
 pub struct Runtime;
-impl system::Trait for Runtime {
+impl system::Config for Runtime {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = u64;
@@ -88,7 +88,7 @@ impl system::Trait for Runtime {
 	type SystemWeightInfo = ();
 }
 
-impl module::Trait for Runtime {
+impl module::Config for Runtime {
 	type Event = Event;
 }
 
diff --git a/frame/system/benchmarking/src/lib.rs b/frame/system/benchmarking/src/lib.rs
index b631d00e47c5..1f5437543369 100644
--- a/frame/system/benchmarking/src/lib.rs
+++ b/frame/system/benchmarking/src/lib.rs
@@ -31,8 +31,8 @@ use frame_system::{Module as System, Call, RawOrigin, DigestItemOf, AccountInfo}
 
 mod mock;
 
-pub struct Module<T: Trait>(System<T>);
-pub trait Trait: frame_system::Trait {}
+pub struct Module<T: Config>(System<T>);
+pub trait Config: frame_system::Config {}
 
 benchmarks! {
 	_ { }
diff --git a/frame/system/benchmarking/src/mock.rs b/frame/system/benchmarking/src/mock.rs
index 33255d7b50e1..b6ebecc9bb0d 100644
--- a/frame/system/benchmarking/src/mock.rs
+++ b/frame/system/benchmarking/src/mock.rs
@@ -38,7 +38,7 @@ pub struct Call;
 
 impl Dispatchable for Call {
 	type Origin = ();
-	type Trait = ();
+	type Config = ();
 	type Info = DispatchInfo;
 	type PostInfo = PostDispatchInfo;
 	fn dispatch(self, _origin: Self::Origin)
@@ -50,7 +50,7 @@ impl Dispatchable for Call {
 #[derive(Clone, Eq, PartialEq, Debug)]
 pub struct Test;
 
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = AccountIndex;
@@ -78,7 +78,7 @@ impl frame_system::Trait for Test {
 	type SystemWeightInfo = ();
 }
 
-impl crate::Trait for Test {}
+impl crate::Config for Test {}
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
diff --git a/frame/system/src/extensions/check_genesis.rs b/frame/system/src/extensions/check_genesis.rs
index d0a346519ca2..f60437887b1d 100644
--- a/frame/system/src/extensions/check_genesis.rs
+++ b/frame/system/src/extensions/check_genesis.rs
@@ -16,7 +16,7 @@
 // limitations under the License.
 
 use codec::{Encode, Decode};
-use crate::{Trait, Module};
+use crate::{Config, Module};
 use sp_runtime::{
 	traits::{SignedExtension, Zero},
 	transaction_validity::TransactionValidityError,
@@ -24,9 +24,9 @@ use sp_runtime::{
 
 /// Genesis hash check to provide replay protection between different networks.
 #[derive(Encode, Decode, Clone, Eq, PartialEq)]
-pub struct CheckGenesis<T: Trait + Send + Sync>(sp_std::marker::PhantomData<T>);
+pub struct CheckGenesis<T: Config + Send + Sync>(sp_std::marker::PhantomData<T>);
 
-impl<T: Trait + Send + Sync> sp_std::fmt::Debug for CheckGenesis<T> {
+impl<T: Config + Send + Sync> sp_std::fmt::Debug for CheckGenesis<T> {
 	#[cfg(feature = "std")]
 	fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
 		write!(f, "CheckGenesis")
@@ -38,16 +38,16 @@ impl<T: Trait + Send + Sync> sp_std::fmt::Debug for CheckGenesis<T> {
 	}
 }
 
-impl<T: Trait + Send + Sync> CheckGenesis<T> {
+impl<T: Config + Send + Sync> CheckGenesis<T> {
 	/// Creates new `SignedExtension` to check genesis hash.
 	pub fn new() -> Self {
 		Self(sp_std::marker::PhantomData)
 	}
 }
 
-impl<T: Trait + Send + Sync> SignedExtension for CheckGenesis<T> {
+impl<T: Config + Send + Sync> SignedExtension for CheckGenesis<T> {
 	type AccountId = T::AccountId;
-	type Call = <T as Trait>::Call;
+	type Call = <T as Config>::Call;
 	type AdditionalSigned = T::Hash;
 	type Pre = ();
 	const IDENTIFIER: &'static str = "CheckGenesis";
diff --git a/frame/system/src/extensions/check_mortality.rs b/frame/system/src/extensions/check_mortality.rs
index 7e3f65d0324d..fbc37f527d81 100644
--- a/frame/system/src/extensions/check_mortality.rs
+++ b/frame/system/src/extensions/check_mortality.rs
@@ -16,7 +16,7 @@
 // limitations under the License.
 
 use codec::{Encode, Decode};
-use crate::{Trait, Module, BlockHash};
+use crate::{Config, Module, BlockHash};
 use frame_support::StorageMap;
 use sp_runtime::{
 	generic::Era,
@@ -28,16 +28,16 @@ use sp_runtime::{
 
 /// Check for transaction mortality.
 #[derive(Encode, Decode, Clone, Eq, PartialEq)]
-pub struct CheckMortality<T: Trait + Send + Sync>(Era, sp_std::marker::PhantomData<T>);
+pub struct CheckMortality<T: Config + Send + Sync>(Era, sp_std::marker::PhantomData<T>);
 
-impl<T: Trait + Send + Sync> CheckMortality<T> {
+impl<T: Config + Send + Sync> CheckMortality<T> {
 	/// utility constructor. Used only in client/factory code.
 	pub fn from(era: Era) -> Self {
 		Self(era, sp_std::marker::PhantomData)
 	}
 }
 
-impl<T: Trait + Send + Sync> sp_std::fmt::Debug for CheckMortality<T> {
+impl<T: Config + Send + Sync> sp_std::fmt::Debug for CheckMortality<T> {
 	#[cfg(feature = "std")]
 	fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
 		write!(f, "CheckMortality({:?})", self.0)
@@ -49,7 +49,7 @@ impl<T: Trait + Send + Sync> sp_std::fmt::Debug for CheckMortality<T> {
 	}
 }
 
-impl<T: Trait + Send + Sync> SignedExtension for CheckMortality<T> {
+impl<T: Config + Send + Sync> SignedExtension for CheckMortality<T> {
 	type AccountId = T::AccountId;
 	type Call = T::Call;
 	type AdditionalSigned = T::Hash;
diff --git a/frame/system/src/extensions/check_nonce.rs b/frame/system/src/extensions/check_nonce.rs
index e7316457aaff..a1a310833cd3 100644
--- a/frame/system/src/extensions/check_nonce.rs
+++ b/frame/system/src/extensions/check_nonce.rs
@@ -16,7 +16,7 @@
 // limitations under the License.
 
 use codec::{Encode, Decode};
-use crate::Trait;
+use crate::Config;
 use frame_support::{
 	weights::DispatchInfo,
 	StorageMap,
@@ -35,16 +35,16 @@ use sp_std::vec;
 /// Note that this does not set any priority by default. Make sure that AT LEAST one of the signed
 /// extension sets some kind of priority upon validating transactions.
 #[derive(Encode, Decode, Clone, Eq, PartialEq)]
-pub struct CheckNonce<T: Trait>(#[codec(compact)] T::Index);
+pub struct CheckNonce<T: Config>(#[codec(compact)] T::Index);
 
-impl<T: Trait> CheckNonce<T> {
+impl<T: Config> CheckNonce<T> {
 	/// utility constructor. Used only in client/factory code.
 	pub fn from(nonce: T::Index) -> Self {
 		Self(nonce)
 	}
 }
 
-impl<T: Trait> sp_std::fmt::Debug for CheckNonce<T> {
+impl<T: Config> sp_std::fmt::Debug for CheckNonce<T> {
 	#[cfg(feature = "std")]
 	fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
 		write!(f, "CheckNonce({})", self.0)
@@ -56,7 +56,7 @@ impl<T: Trait> sp_std::fmt::Debug for CheckNonce<T> {
 	}
 }
 
-impl<T: Trait> SignedExtension for CheckNonce<T> where
+impl<T: Config> SignedExtension for CheckNonce<T> where
 	T::Call: Dispatchable<Info=DispatchInfo>
 {
 	type AccountId = T::AccountId;
diff --git a/frame/system/src/extensions/check_spec_version.rs b/frame/system/src/extensions/check_spec_version.rs
index 8dc4d8d9cedd..f4838ab35472 100644
--- a/frame/system/src/extensions/check_spec_version.rs
+++ b/frame/system/src/extensions/check_spec_version.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::{Trait, Module};
+use crate::{Config, Module};
 use codec::{Encode, Decode};
 use sp_runtime::{
 	traits::SignedExtension,
@@ -24,9 +24,9 @@ use sp_runtime::{
 
 /// Ensure the runtime version registered in the transaction is the same as at present.
 #[derive(Encode, Decode, Clone, Eq, PartialEq)]
-pub struct CheckSpecVersion<T: Trait + Send + Sync>(sp_std::marker::PhantomData<T>);
+pub struct CheckSpecVersion<T: Config + Send + Sync>(sp_std::marker::PhantomData<T>);
 
-impl<T: Trait + Send + Sync> sp_std::fmt::Debug for CheckSpecVersion<T> {
+impl<T: Config + Send + Sync> sp_std::fmt::Debug for CheckSpecVersion<T> {
 	#[cfg(feature = "std")]
 	fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
 		write!(f, "CheckSpecVersion")
@@ -38,16 +38,16 @@ impl<T: Trait + Send + Sync> sp_std::fmt::Debug for CheckSpecVersion<T> {
 	}
 }
 
-impl<T: Trait + Send + Sync> CheckSpecVersion<T> {
+impl<T: Config + Send + Sync> CheckSpecVersion<T> {
 	/// Create new `SignedExtension` to check runtime version.
 	pub fn new() -> Self {
 		Self(sp_std::marker::PhantomData)
 	}
 }
 
-impl<T: Trait + Send + Sync> SignedExtension for CheckSpecVersion<T> {
+impl<T: Config + Send + Sync> SignedExtension for CheckSpecVersion<T> {
 	type AccountId = T::AccountId;
-	type Call = <T as Trait>::Call;
+	type Call = <T as Config>::Call;
 	type AdditionalSigned = u32;
 	type Pre = ();
 	const IDENTIFIER: &'static str = "CheckSpecVersion";
diff --git a/frame/system/src/extensions/check_tx_version.rs b/frame/system/src/extensions/check_tx_version.rs
index ee6f3349365b..5a1c8cc73861 100644
--- a/frame/system/src/extensions/check_tx_version.rs
+++ b/frame/system/src/extensions/check_tx_version.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::{Trait, Module};
+use crate::{Config, Module};
 use codec::{Encode, Decode};
 use sp_runtime::{
 	traits::SignedExtension,
@@ -24,9 +24,9 @@ use sp_runtime::{
 
 /// Ensure the transaction version registered in the transaction is the same as at present.
 #[derive(Encode, Decode, Clone, Eq, PartialEq)]
-pub struct CheckTxVersion<T: Trait + Send + Sync>(sp_std::marker::PhantomData<T>);
+pub struct CheckTxVersion<T: Config + Send + Sync>(sp_std::marker::PhantomData<T>);
 
-impl<T: Trait + Send + Sync> sp_std::fmt::Debug for CheckTxVersion<T> {
+impl<T: Config + Send + Sync> sp_std::fmt::Debug for CheckTxVersion<T> {
 	#[cfg(feature = "std")]
 	fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
 		write!(f, "CheckTxVersion")
@@ -38,16 +38,16 @@ impl<T: Trait + Send + Sync> sp_std::fmt::Debug for CheckTxVersion<T> {
 	}
 }
 
-impl<T: Trait + Send + Sync> CheckTxVersion<T> {
+impl<T: Config + Send + Sync> CheckTxVersion<T> {
 	/// Create new `SignedExtension` to check transaction version.
 	pub fn new() -> Self {
 		Self(sp_std::marker::PhantomData)
 	}
 }
 
-impl<T: Trait + Send + Sync> SignedExtension for CheckTxVersion<T> {
+impl<T: Config + Send + Sync> SignedExtension for CheckTxVersion<T> {
 	type AccountId = T::AccountId;
-	type Call = <T as Trait>::Call;
+	type Call = <T as Config>::Call;
 	type AdditionalSigned = u32;
 	type Pre = ();
 	const IDENTIFIER: &'static str = "CheckTxVersion";
diff --git a/frame/system/src/extensions/check_weight.rs b/frame/system/src/extensions/check_weight.rs
index 39439a3e2d8c..6dfff865d45b 100644
--- a/frame/system/src/extensions/check_weight.rs
+++ b/frame/system/src/extensions/check_weight.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::{Trait, Module};
+use crate::{Config, Module};
 use codec::{Encode, Decode};
 use sp_runtime::{
 	traits::{SignedExtension, DispatchInfoOf, Dispatchable, PostDispatchInfoOf, Printable},
@@ -33,9 +33,9 @@ use frame_support::{
 
 /// Block resource (weight) limit check.
 #[derive(Encode, Decode, Clone, Eq, PartialEq, Default)]
-pub struct CheckWeight<T: Trait + Send + Sync>(sp_std::marker::PhantomData<T>);
+pub struct CheckWeight<T: Config + Send + Sync>(sp_std::marker::PhantomData<T>);
 
-impl<T: Trait + Send + Sync> CheckWeight<T> where
+impl<T: Config + Send + Sync> CheckWeight<T> where
 	T::Call: Dispatchable<Info=DispatchInfo, PostInfo=PostDispatchInfo>
 {
 	/// Get the quota ratio of each dispatch class type. This indicates that all operational and mandatory
@@ -213,7 +213,7 @@ impl<T: Trait + Send + Sync> CheckWeight<T> where
 	}
 }
 
-impl<T: Trait + Send + Sync> SignedExtension for CheckWeight<T> where
+impl<T: Config + Send + Sync> SignedExtension for CheckWeight<T> where
 	T::Call: Dispatchable<Info=DispatchInfo, PostInfo=PostDispatchInfo>
 {
 	type AccountId = T::AccountId;
@@ -294,7 +294,7 @@ impl<T: Trait + Send + Sync> SignedExtension for CheckWeight<T> where
 	}
 }
 
-impl<T: Trait + Send + Sync> sp_std::fmt::Debug for CheckWeight<T> {
+impl<T: Config + Send + Sync> sp_std::fmt::Debug for CheckWeight<T> {
 	#[cfg(feature = "std")]
 	fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
 		write!(f, "CheckWeight")
@@ -316,11 +316,11 @@ mod tests {
 	use frame_support::weights::{Weight, Pays};
 
 	fn normal_weight_limit() -> Weight {
-		<Test as Trait>::AvailableBlockRatio::get() * <Test as Trait>::MaximumBlockWeight::get()
+		<Test as Config>::AvailableBlockRatio::get() * <Test as Config>::MaximumBlockWeight::get()
 	}
 
 	fn normal_length_limit() -> u32 {
-		<Test as Trait>::AvailableBlockRatio::get() * <Test as Trait>::MaximumBlockLength::get()
+		<Test as Config>::AvailableBlockRatio::get() * <Test as Config>::MaximumBlockLength::get()
 	}
 
 	#[test]
@@ -341,7 +341,7 @@ mod tests {
 		check(|max, len| {
 			assert_ok!(CheckWeight::<Test>::do_pre_dispatch(max, len));
 			assert_eq!(System::block_weight().total(), Weight::max_value());
-			assert!(System::block_weight().total() > <Test as Trait>::MaximumBlockWeight::get());
+			assert!(System::block_weight().total() > <Test as Config>::MaximumBlockWeight::get());
 		});
 		check(|max, len| {
 			assert_ok!(CheckWeight::<Test>::do_validate(max, len));
@@ -352,7 +352,7 @@ mod tests {
 	fn normal_extrinsic_limited_by_maximum_extrinsic_weight() {
 		new_test_ext().execute_with(|| {
 			let max = DispatchInfo {
-				weight: <Test as Trait>::MaximumExtrinsicWeight::get() + 1,
+				weight: <Test as Config>::MaximumExtrinsicWeight::get() + 1,
 				class: DispatchClass::Normal,
 				..Default::default()
 			};
@@ -370,9 +370,9 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			let operational_limit = CheckWeight::<Test>::get_dispatch_limit_ratio(
 				DispatchClass::Operational
-			) * <Test as Trait>::MaximumBlockWeight::get();
-			let base_weight = <Test as Trait>::ExtrinsicBaseWeight::get();
-			let block_base = <Test as Trait>::BlockExecutionWeight::get();
+			) * <Test as Config>::MaximumBlockWeight::get();
+			let base_weight = <Test as Config>::ExtrinsicBaseWeight::get();
+			let block_base = <Test as Config>::BlockExecutionWeight::get();
 
 			let weight = operational_limit - base_weight - block_base;
 			let okay = DispatchInfo {
@@ -406,7 +406,7 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			System::register_extra_weight_unchecked(Weight::max_value(), DispatchClass::Normal);
 			assert_eq!(System::block_weight().total(), Weight::max_value());
-			assert!(System::block_weight().total() > <Test as Trait>::MaximumBlockWeight::get());
+			assert!(System::block_weight().total() > <Test as Config>::MaximumBlockWeight::get());
 		});
 	}
 
@@ -426,8 +426,8 @@ mod tests {
 			assert_ok!(CheckWeight::<Test>::do_pre_dispatch(&max_normal, len));
 			assert_eq!(System::block_weight().total(), 768);
 			assert_ok!(CheckWeight::<Test>::do_pre_dispatch(&rest_operational, len));
-			assert_eq!(<Test as Trait>::MaximumBlockWeight::get(), 1024);
-			assert_eq!(System::block_weight().total(), <Test as Trait>::MaximumBlockWeight::get());
+			assert_eq!(<Test as Config>::MaximumBlockWeight::get(), 1024);
+			assert_eq!(System::block_weight().total(), <Test as Config>::MaximumBlockWeight::get());
 			// Checking single extrinsic should not take current block weight into account.
 			assert_eq!(CheckWeight::<Test>::check_extrinsic_weight(&rest_operational), Ok(()));
 		});
@@ -446,8 +446,8 @@ mod tests {
 			// Extra 15 here from block execution + base extrinsic weight
 			assert_eq!(System::block_weight().total(), 266);
 			assert_ok!(CheckWeight::<Test>::do_pre_dispatch(&max_normal, len));
-			assert_eq!(<Test as Trait>::MaximumBlockWeight::get(), 1024);
-			assert_eq!(System::block_weight().total(), <Test as Trait>::MaximumBlockWeight::get());
+			assert_eq!(<Test as Config>::MaximumBlockWeight::get(), 1024);
+			assert_eq!(System::block_weight().total(), <Test as Config>::MaximumBlockWeight::get());
 		});
 	}
 
@@ -553,11 +553,11 @@ mod tests {
 			let normal_limit = normal_weight_limit();
 			let small = DispatchInfo { weight: 100, ..Default::default() };
 			let medium = DispatchInfo {
-				weight: normal_limit - <Test as Trait>::ExtrinsicBaseWeight::get(),
+				weight: normal_limit - <Test as Config>::ExtrinsicBaseWeight::get(),
 				..Default::default()
 			};
 			let big = DispatchInfo {
-				weight: normal_limit - <Test as Trait>::ExtrinsicBaseWeight::get() + 1,
+				weight: normal_limit - <Test as Config>::ExtrinsicBaseWeight::get() + 1,
 				..Default::default()
 			};
 			let len = 0_usize;
@@ -589,7 +589,7 @@ mod tests {
 
 			// We allow 75% for normal transaction, so we put 25% - extrinsic base weight
 			BlockWeight::mutate(|current_weight| {
-				current_weight.put(256 - <Test as Trait>::ExtrinsicBaseWeight::get(), DispatchClass::Normal)
+				current_weight.put(256 - <Test as Config>::ExtrinsicBaseWeight::get(), DispatchClass::Normal)
 			});
 
 			let pre = CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &info, len).unwrap();
@@ -623,7 +623,7 @@ mod tests {
 			let pre = CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &info, len).unwrap();
 			assert_eq!(
 				BlockWeight::get().total(),
-				info.weight + 128 + <Test as Trait>::ExtrinsicBaseWeight::get(),
+				info.weight + 128 + <Test as Config>::ExtrinsicBaseWeight::get(),
 			);
 
 			assert!(
@@ -632,7 +632,7 @@ mod tests {
 			);
 			assert_eq!(
 				BlockWeight::get().total(),
-				info.weight + 128 + <Test as Trait>::ExtrinsicBaseWeight::get(),
+				info.weight + 128 + <Test as Config>::ExtrinsicBaseWeight::get(),
 			);
 		})
 	}
@@ -644,12 +644,12 @@ mod tests {
 			let len = 0_usize;
 
 			// Initial weight from `BlockExecutionWeight`
-			assert_eq!(System::block_weight().total(), <Test as Trait>::BlockExecutionWeight::get());
+			assert_eq!(System::block_weight().total(), <Test as Config>::BlockExecutionWeight::get());
 			let r = CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &free, len);
 			assert!(r.is_ok());
 			assert_eq!(
 				System::block_weight().total(),
-				<Test as Trait>::ExtrinsicBaseWeight::get() + <Test as Trait>::BlockExecutionWeight::get()
+				<Test as Config>::ExtrinsicBaseWeight::get() + <Test as Config>::BlockExecutionWeight::get()
 			);
 		})
 	}
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index 595b001ea6b0..af185139fb6b 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -20,7 +20,7 @@
 //! The System module provides low-level access to core types and cross-cutting utilities.
 //! It acts as the base layer for other pallets to interact with the Substrate framework components.
 //!
-//! - [`system::Trait`](./trait.Trait.html)
+//! - [`system::Config`](./trait.Config.html)
 //!
 //! ## Overview
 //!
@@ -74,10 +74,10 @@
 //! use frame_support::{decl_module, dispatch};
 //! use frame_system::{self as system, ensure_signed};
 //!
-//! pub trait Trait: system::Trait {}
+//! pub trait Config: system::Config {}
 //!
 //! decl_module! {
-//! 	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+//! 	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 //! 		#[weight = 0]
 //! 		pub fn system_module_example(origin) -> dispatch::DispatchResult {
 //! 			let _sender = ensure_signed(origin)?;
@@ -160,7 +160,7 @@ pub fn extrinsics_data_root<H: Hash>(xts: Vec<Vec<u8>>) -> H::Output {
 	H::ordered_trie_root(xts)
 }
 
-pub trait Trait: 'static + Eq + Clone {
+pub trait Config: 'static + Eq + Clone {
 	/// The basic call filter to use in Origin. All origins are built with this filter as base,
 	/// except Root.
 	type BaseCallFilter: Filter<Self::Call>;
@@ -270,8 +270,8 @@ pub trait Trait: 'static + Eq + Clone {
 	type SystemWeightInfo: WeightInfo;
 }
 
-pub type DigestOf<T> = generic::Digest<<T as Trait>::Hash>;
-pub type DigestItemOf<T> = generic::DigestItem<<T as Trait>::Hash>;
+pub type DigestOf<T> = generic::Digest<<T as Config>::Hash>;
+pub type DigestItemOf<T> = generic::DigestItem<<T as Config>::Hash>;
 
 pub type Key = Vec<u8>;
 pub type KeyValue = (Vec<u8>, Vec<u8>);
@@ -329,7 +329,7 @@ impl<AccountId> From<Option<AccountId>> for RawOrigin<AccountId> {
 }
 
 /// Exposed trait-generic origin type.
-pub type Origin<T> = RawOrigin<<T as Trait>::AccountId>;
+pub type Origin<T> = RawOrigin<<T as Config>::AccountId>;
 
 // Create a Hash with 69 for each byte,
 // only used to build genesis config.
@@ -390,7 +390,7 @@ impl From<sp_version::RuntimeVersion> for LastRuntimeUpgradeInfo {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as System {
+	trait Store for Module<T: Config> as System {
 		/// The full account information for a particular account ID.
 		pub Account get(fn account):
 			map hasher(blake2_128_concat) T::AccountId => AccountInfo<T::Index, T::AccountData>;
@@ -478,7 +478,7 @@ decl_storage! {
 
 decl_event!(
 	/// Event for the System module.
-	pub enum Event<T> where AccountId = <T as Trait>::AccountId {
+	pub enum Event<T> where AccountId = <T as Config>::AccountId {
 		/// An extrinsic completed successfully. \[info\]
 		ExtrinsicSuccess(DispatchInfo),
 		/// An extrinsic failed. \[error, info\]
@@ -494,7 +494,7 @@ decl_event!(
 
 decl_error! {
 	/// Error for the System module
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// The name of specification does not match between the current runtime
 		/// and the new runtime.
 		InvalidSpecName,
@@ -513,7 +513,7 @@ decl_error! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {
 		type Error = Error<T>;
 
 		/// The maximum number of blocks to allow in mortal eras.
@@ -897,7 +897,7 @@ pub enum RefStatus {
 	Unreferenced,
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Deposits an event into this block's event record.
 	pub fn deposit_event(event: impl Into<T::Event>) {
 		Self::deposit_event_indexed(&[], event.into());
@@ -1252,7 +1252,7 @@ impl<T: Trait> Module<T> {
 
 /// Event handler which calls on_created_account when it happens.
 pub struct CallOnCreatedAccount<T>(PhantomData<T>);
-impl<T: Trait> Happened<T::AccountId> for CallOnCreatedAccount<T> {
+impl<T: Config> Happened<T::AccountId> for CallOnCreatedAccount<T> {
 	fn happened(who: &T::AccountId) {
 		Module::<T>::on_created_account(who.clone());
 	}
@@ -1260,15 +1260,15 @@ impl<T: Trait> Happened<T::AccountId> for CallOnCreatedAccount<T> {
 
 /// Event handler which calls kill_account when it happens.
 pub struct CallKillAccount<T>(PhantomData<T>);
-impl<T: Trait> Happened<T::AccountId> for CallKillAccount<T> {
+impl<T: Config> Happened<T::AccountId> for CallKillAccount<T> {
 	fn happened(who: &T::AccountId) {
 		Module::<T>::kill_account(who)
 	}
 }
 
-impl<T: Trait> BlockNumberProvider for Module<T>
+impl<T: Config> BlockNumberProvider for Module<T>
 {
-	type BlockNumber = <T as Trait>::BlockNumber;
+	type BlockNumber = <T as Config>::BlockNumber;
 
 	fn current_block_number() -> Self::BlockNumber {
 		Module::<T>::block_number()
@@ -1278,7 +1278,7 @@ impl<T: Trait> BlockNumberProvider for Module<T>
 // Implement StoredMap for a simple single-item, kill-account-on-remove system. This works fine for
 // storing a single item which is required to not be empty/default for the account to exist.
 // Anything more complex will need more sophisticated logic.
-impl<T: Trait> StoredMap<T::AccountId, T::AccountData> for Module<T> {
+impl<T: Config> StoredMap<T::AccountId, T::AccountData> for Module<T> {
 	fn get(k: &T::AccountId) -> T::AccountData {
 		Account::<T>::get(k).data
 	}
@@ -1345,7 +1345,7 @@ pub fn split_inner<T, R, S>(option: Option<T>, splitter: impl FnOnce(T) -> (R, S
 }
 
 
-impl<T: Trait> IsDeadAccount<T::AccountId> for Module<T> {
+impl<T: Config> IsDeadAccount<T::AccountId> for Module<T> {
 	fn is_dead_account(who: &T::AccountId) -> bool {
 		!Account::<T>::contains_key(who)
 	}
@@ -1358,7 +1358,7 @@ impl<T> Default for ChainContext<T> {
 	}
 }
 
-impl<T: Trait> Lookup for ChainContext<T> {
+impl<T: Config> Lookup for ChainContext<T> {
 	type Source = <T::Lookup as StaticLookup>::Source;
 	type Target = <T::Lookup as StaticLookup>::Target;
 
diff --git a/frame/system/src/mock.rs b/frame/system/src/mock.rs
index cd67a7411407..b6e1a4f35af0 100644
--- a/frame/system/src/mock.rs
+++ b/frame/system/src/mock.rs
@@ -71,7 +71,7 @@ pub struct Call;
 
 impl Dispatchable for Call {
 	type Origin = Origin;
-	type Trait = ();
+	type Config = ();
 	type Info = DispatchInfo;
 	type PostInfo = PostDispatchInfo;
 	fn dispatch(self, _origin: Self::Origin)
@@ -80,7 +80,7 @@ impl Dispatchable for Call {
 	}
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Call = Call;
@@ -109,16 +109,16 @@ impl Trait for Test {
 }
 
 pub type System = Module<Test>;
-pub type SysEvent = <Test as Trait>::Event;
+pub type SysEvent = <Test as Config>::Event;
 
-pub const CALL: &<Test as Trait>::Call = &Call;
+pub const CALL: &<Test as Config>::Call = &Call;
 
 /// Create new externalities for `System` module tests.
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let mut ext: sp_io::TestExternalities = GenesisConfig::default().build_storage::<Test>().unwrap().into();
 	// Add to each test the initial weight of a block
 	ext.execute_with(|| System::register_extra_weight_unchecked(
-		<Test as Trait>::BlockExecutionWeight::get(),
+		<Test as Config>::BlockExecutionWeight::get(),
 		DispatchClass::Mandatory
 	));
 	ext
diff --git a/frame/system/src/offchain.rs b/frame/system/src/offchain.rs
index 25d18ac6bf25..f5186234b602 100644
--- a/frame/system/src/offchain.rs
+++ b/frame/system/src/offchain.rs
@@ -447,7 +447,7 @@ pub trait AppCrypto<Public, Signature> {
 ///
 // TODO [#5663] Could this be just `T::Signature as traits::Verify>::Signer`?
 // Seems that this may cause issues with bounds resolution.
-pub trait SigningTypes: crate::Trait {
+pub trait SigningTypes: crate::Config {
 	/// A public key that is capable of identifing `AccountId`s.
 	///
 	/// Usually that's either a raw crypto public key (e.g. `sr25519::Public`) or
diff --git a/frame/system/src/weights.rs b/frame/system/src/weights.rs
index 5f3c84deb41c..99ea4a033ca9 100644
--- a/frame/system/src/weights.rs
+++ b/frame/system/src/weights.rs
@@ -54,7 +54,7 @@ pub trait WeightInfo {
 
 /// Weights for frame_system using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: crate::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: crate::Config> WeightInfo for SubstrateWeight<T> {
 	fn remark(_b: u32, ) -> Weight {
 		(1_973_000 as Weight)
 	}
diff --git a/frame/timestamp/src/lib.rs b/frame/timestamp/src/lib.rs
index d546a34017d0..66043cbe3aaf 100644
--- a/frame/timestamp/src/lib.rs
+++ b/frame/timestamp/src/lib.rs
@@ -19,7 +19,7 @@
 //!
 //! The Timestamp module provides functionality to get and set the on-chain time.
 //!
-//! - [`timestamp::Trait`](./trait.Trait.html)
+//! - [`timestamp::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //! - [`Module`](./struct.Module.html)
 //!
@@ -46,7 +46,7 @@
 //! * `get` - Gets the current time for the current block. If this function is called prior to
 //! setting the timestamp, it will return the timestamp of the previous block.
 //!
-//! ### Trait Getters
+//! ### Config Getters
 //!
 //! * `MinimumPeriod` - Gets the minimum (and advised) period between blocks for the chain.
 //!
@@ -66,10 +66,10 @@
 //! # use pallet_timestamp as timestamp;
 //! use frame_system::ensure_signed;
 //!
-//! pub trait Trait: timestamp::Trait {}
+//! pub trait Config: timestamp::Config {}
 //!
 //! decl_module! {
-//! 	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+//! 	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 //! 		#[weight = 0]
 //! 		pub fn get_time(origin) -> dispatch::DispatchResult {
 //! 			let _sender = ensure_signed(origin)?;
@@ -118,7 +118,7 @@ use sp_timestamp::{
 pub use weights::WeightInfo;
 
 /// The module configuration trait
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// Type used for expressing timestamp.
 	type Moment: Parameter + Default + AtLeast32Bit
 		+ Scale<Self::BlockNumber, Output = Self::Moment> + Copy;
@@ -137,7 +137,7 @@ pub trait Trait: frame_system::Trait {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		/// The minimum period between blocks. Beware that this is different to the *expected* period
 		/// that the block production apparatus provides. Your chosen consensus system will generally
 		/// work with this to determine a sensible block time. e.g. For Aura, it will be double this
@@ -194,7 +194,7 @@ decl_module! {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Timestamp {
+	trait Store for Module<T: Config> as Timestamp {
 		/// Current time for the current block.
 		pub Now get(fn now): T::Moment;
 
@@ -203,7 +203,7 @@ decl_storage! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Get the current time for the current block.
 	///
 	/// NOTE: if this function is called prior to setting the timestamp,
@@ -225,7 +225,7 @@ fn extract_inherent_data(data: &InherentData) -> Result<InherentType, RuntimeStr
 		.ok_or_else(|| "Timestamp inherent data is not provided.".into())
 }
 
-impl<T: Trait> ProvideInherent for Module<T> {
+impl<T: Config> ProvideInherent for Module<T> {
 	type Call = Call<T>;
 	type Error = InherentError;
 	const INHERENT_IDENTIFIER: InherentIdentifier = INHERENT_IDENTIFIER;
@@ -260,7 +260,7 @@ impl<T: Trait> ProvideInherent for Module<T> {
 	}
 }
 
-impl<T: Trait> Time for Module<T> {
+impl<T: Config> Time for Module<T> {
 	type Moment = T::Moment;
 
 	/// Before the first set of now with inherent the value returned is zero.
@@ -272,7 +272,7 @@ impl<T: Trait> Time for Module<T> {
 /// Before the timestamp inherent is applied, it returns the time of previous block.
 ///
 /// On genesis the time returned is not valid.
-impl<T: Trait> UnixTime for Module<T> {
+impl<T: Config> UnixTime for Module<T> {
 	fn now() -> core::time::Duration {
 		// now is duration since unix epoch in millisecond as documented in
 		// `sp_timestamp::InherentDataProvider`.
@@ -314,7 +314,7 @@ mod tests {
 		pub const MaximumBlockLength: u32 = 2 * 1024;
 		pub const AvailableBlockRatio: Perbill = Perbill::one();
 	}
-	impl frame_system::Trait for Test {
+	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
 		type Origin = Origin;
 		type Index = u64;
@@ -344,7 +344,7 @@ mod tests {
 	parameter_types! {
 		pub const MinimumPeriod: u64 = 5;
 	}
-	impl Trait for Test {
+	impl Config for Test {
 		type Moment = u64;
 		type OnTimestampSet = ();
 		type MinimumPeriod = MinimumPeriod;
diff --git a/frame/timestamp/src/weights.rs b/frame/timestamp/src/weights.rs
index 67ce28ba9111..d3f2dcc7ba6f 100644
--- a/frame/timestamp/src/weights.rs
+++ b/frame/timestamp/src/weights.rs
@@ -50,7 +50,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_timestamp using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn set() -> Weight {
 		(11_650_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
index 751aa57da0f8..554b2e801afe 100644
--- a/frame/transaction-payment/src/lib.rs
+++ b/frame/transaction-payment/src/lib.rs
@@ -25,11 +25,11 @@
 //!     chance to be included by the transaction queue.
 //!
 //! Additionally, this module allows one to configure:
-//!   - The mapping between one unit of weight to one unit of fee via [`Trait::WeightToFee`].
+//!   - The mapping between one unit of weight to one unit of fee via [`Config::WeightToFee`].
 //!   - A means of updating the fee for the next block, via defining a multiplier, based on the
 //!     final state of the chain at the end of the previous block. This can be configured via
-//!     [`Trait::FeeMultiplierUpdate`]
-//!   - How the fees are paid via [`Trait::OnChargeTransaction`].
+//!     [`Config::FeeMultiplierUpdate`]
+//!   - How the fees are paid via [`Config::OnChargeTransaction`].
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
@@ -63,7 +63,7 @@ pub use payment::*;
 pub type Multiplier = FixedU128;
 
 type BalanceOf<T> =
-	<<T as Trait>::OnChargeTransaction as OnChargeTransaction<T>>::Balance;
+	<<T as Config>::OnChargeTransaction as OnChargeTransaction<T>>::Balance;
 
 /// A struct to update the weight multiplier per block. It implements `Convert<Multiplier,
 /// Multiplier>`, meaning that it can convert the previous multiplier to the next one. This should
@@ -135,7 +135,7 @@ impl MultiplierUpdate for () {
 }
 
 impl<T, S, V, M> MultiplierUpdate for TargetedFeeAdjustment<T, S, V, M>
-	where T: frame_system::Trait, S: Get<Perquintill>, V: Get<Multiplier>, M: Get<Multiplier>,
+	where T: frame_system::Config, S: Get<Perquintill>, V: Get<Multiplier>, M: Get<Multiplier>,
 {
 	fn min() -> Multiplier {
 		M::get()
@@ -149,7 +149,7 @@ impl<T, S, V, M> MultiplierUpdate for TargetedFeeAdjustment<T, S, V, M>
 }
 
 impl<T, S, V, M> Convert<Multiplier, Multiplier> for TargetedFeeAdjustment<T, S, V, M>
-	where T: frame_system::Trait, S: Get<Perquintill>, V: Get<Multiplier>, M: Get<Multiplier>,
+	where T: frame_system::Config, S: Get<Perquintill>, V: Get<Multiplier>, M: Get<Multiplier>,
 {
 	fn convert(previous: Multiplier) -> Multiplier {
 		// Defensive only. The multiplier in storage should always be at most positive. Nonetheless
@@ -160,8 +160,8 @@ impl<T, S, V, M> Convert<Multiplier, Multiplier> for TargetedFeeAdjustment<T, S,
 
 		// the computed ratio is only among the normal class.
 		let normal_max_weight =
-			<T as frame_system::Trait>::AvailableBlockRatio::get() *
-			<T as frame_system::Trait>::MaximumBlockWeight::get();
+			<T as frame_system::Config>::AvailableBlockRatio::get() *
+			<T as frame_system::Config>::MaximumBlockWeight::get();
 		let normal_block_weight =
 			<frame_system::Module<T>>::block_weight()
 			.get(frame_support::weights::DispatchClass::Normal)
@@ -213,7 +213,7 @@ impl Default for Releases {
 	}
 }
 
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// Handler for withdrawing, refunding and depositing the transaction fee.
 	/// Transaction fees are withdrawn before the transaction is executed.
 	/// After the transaction was executed the transaction weight can be
@@ -233,7 +233,7 @@ pub trait Trait: frame_system::Trait {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as TransactionPayment {
+	trait Store for Module<T: Config> as TransactionPayment {
 		pub NextFeeMultiplier get(fn next_fee_multiplier): Multiplier = Multiplier::saturating_from_integer(1);
 
 		StorageVersion build(|_: &GenesisConfig| Releases::V2): Releases;
@@ -241,7 +241,7 @@ decl_storage! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		/// The fee to be paid for making a transaction; the per-byte portion.
 		const TransactionByteFee: BalanceOf<T> = T::TransactionByteFee::get();
 
@@ -263,7 +263,7 @@ decl_module! {
 			assert!(
 				<Multiplier as sp_runtime::traits::Bounded>::max_value() >=
 				Multiplier::checked_from_integer(
-					<T as frame_system::Trait>::MaximumBlockWeight::get().try_into().unwrap()
+					<T as frame_system::Config>::MaximumBlockWeight::get().try_into().unwrap()
 				).unwrap(),
 			);
 
@@ -296,7 +296,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> where
+impl<T: Config> Module<T> where
 	BalanceOf<T>: FixedPointOperand
 {
 	/// Query the data that we know about the fee of a given `call`.
@@ -407,13 +407,13 @@ impl<T: Trait> Module<T> where
 	fn weight_to_fee(weight: Weight) -> BalanceOf<T> {
 		// cap the weight to the maximum defined in runtime, otherwise it will be the
 		// `Bounded` maximum of its data type, which is not desired.
-		let capped_weight = weight.min(<T as frame_system::Trait>::MaximumBlockWeight::get());
+		let capped_weight = weight.min(<T as frame_system::Config>::MaximumBlockWeight::get());
 		T::WeightToFee::calc(&capped_weight)
 	}
 }
 
 impl<T> Convert<Weight, BalanceOf<T>> for Module<T> where
-	T: Trait,
+	T: Config,
 	BalanceOf<T>: FixedPointOperand,
 {
 	/// Compute the fee for the specified weight.
@@ -429,9 +429,9 @@ impl<T> Convert<Weight, BalanceOf<T>> for Module<T> where
 /// Require the transactor pay for themselves and maybe include a tip to gain additional priority
 /// in the queue.
 #[derive(Encode, Decode, Clone, Eq, PartialEq)]
-pub struct ChargeTransactionPayment<T: Trait + Send + Sync>(#[codec(compact)] BalanceOf<T>);
+pub struct ChargeTransactionPayment<T: Config + Send + Sync>(#[codec(compact)] BalanceOf<T>);
 
-impl<T: Trait + Send + Sync> ChargeTransactionPayment<T> where
+impl<T: Config + Send + Sync> ChargeTransactionPayment<T> where
 	T::Call: Dispatchable<Info=DispatchInfo, PostInfo=PostDispatchInfo>,
 	BalanceOf<T>: Send + Sync + FixedPointOperand,
 {
@@ -449,14 +449,14 @@ impl<T: Trait + Send + Sync> ChargeTransactionPayment<T> where
 	) -> Result<
 		(
 			BalanceOf<T>,
-			<<T as Trait>::OnChargeTransaction as OnChargeTransaction<T>>::LiquidityInfo,
+			<<T as Config>::OnChargeTransaction as OnChargeTransaction<T>>::LiquidityInfo,
 		),
 		TransactionValidityError,
 	> {
 		let tip = self.0;
 		let fee = Module::<T>::compute_fee(len as u32, info, tip);
 
-		<<T as Trait>::OnChargeTransaction as OnChargeTransaction<T>>::withdraw_fee(who, call, info, fee, tip)
+		<<T as Config>::OnChargeTransaction as OnChargeTransaction<T>>::withdraw_fee(who, call, info, fee, tip)
 			.map(|i| (fee, i))
 	}
 
@@ -478,7 +478,7 @@ impl<T: Trait + Send + Sync> ChargeTransactionPayment<T> where
 	}
 }
 
-impl<T: Trait + Send + Sync> sp_std::fmt::Debug for ChargeTransactionPayment<T> {
+impl<T: Config + Send + Sync> sp_std::fmt::Debug for ChargeTransactionPayment<T> {
 	#[cfg(feature = "std")]
 	fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
 		write!(f, "ChargeTransactionPayment<{:?}>", self.0)
@@ -489,7 +489,7 @@ impl<T: Trait + Send + Sync> sp_std::fmt::Debug for ChargeTransactionPayment<T>
 	}
 }
 
-impl<T: Trait + Send + Sync> SignedExtension for ChargeTransactionPayment<T> where
+impl<T: Config + Send + Sync> SignedExtension for ChargeTransactionPayment<T> where
 	BalanceOf<T>: Send + Sync + From<u64> + FixedPointOperand,
 	T::Call: Dispatchable<Info=DispatchInfo, PostInfo=PostDispatchInfo>,
 {
@@ -503,7 +503,7 @@ impl<T: Trait + Send + Sync> SignedExtension for ChargeTransactionPayment<T> whe
 		// who paid the fee
 		Self::AccountId,
 		// imbalance resulting from withdrawing the fee
-		<<T as Trait>::OnChargeTransaction as OnChargeTransaction<T>>::LiquidityInfo,
+		<<T as Config>::OnChargeTransaction as OnChargeTransaction<T>>::LiquidityInfo,
 	);
 	fn additional_signed(&self) -> sp_std::result::Result<(), TransactionValidityError> { Ok(()) }
 
@@ -573,7 +573,7 @@ mod tests {
 	};
 	use smallvec::smallvec;
 
-	const CALL: &<Runtime as frame_system::Trait>::Call =
+	const CALL: &<Runtime as frame_system::Config>::Call =
 		&Call::Balances(BalancesCall::transfer(2, 69));
 
 	impl_outer_dispatch! {
@@ -608,7 +608,7 @@ mod tests {
 		pub static WeightToFee: u64 = 1;
 	}
 
-	impl frame_system::Trait for Runtime {
+	impl frame_system::Config for Runtime {
 		type BaseCallFilter = ();
 		type Origin = Origin;
 		type Index = u64;
@@ -640,7 +640,7 @@ mod tests {
 		pub const ExistentialDeposit: u64 = 1;
 	}
 
-	impl pallet_balances::Trait for Runtime {
+	impl pallet_balances::Config for Runtime {
 		type Balance = u64;
 		type Event = Event;
 		type DustRemoval = ();
@@ -663,7 +663,7 @@ mod tests {
 		}
 	}
 
-	impl Trait for Runtime {
+	impl Config for Runtime {
 		type OnChargeTransaction = CurrencyAdapter<Balances, ()>;
 		type TransactionByteFee = TransactionByteFee;
 		type WeightToFee = WeightToFee;
@@ -841,7 +841,7 @@ mod tests {
 			// fee will be proportional to what is the actual maximum weight in the runtime.
 			assert_eq!(
 				Balances::free_balance(&1),
-				(10000 - <Runtime as frame_system::Trait>::MaximumBlockWeight::get()) as u64
+				(10000 - <Runtime as frame_system::Config>::MaximumBlockWeight::get()) as u64
 			);
 		});
 	}
diff --git a/frame/transaction-payment/src/payment.rs b/frame/transaction-payment/src/payment.rs
index de39215b575b..f84b19d78c29 100644
--- a/frame/transaction-payment/src/payment.rs
+++ b/frame/transaction-payment/src/payment.rs
@@ -1,5 +1,5 @@
 ///! Traits and default implementation for paying transaction fees.
-use crate::Trait;
+use crate::Config;
 use codec::FullCodec;
 use frame_support::{
 	traits::{Currency, ExistenceRequirement, Get, Imbalance, OnUnbalanced, WithdrawReasons},
@@ -12,10 +12,10 @@ use sp_runtime::{
 use sp_std::{fmt::Debug, marker::PhantomData};
 
 type NegativeImbalanceOf<C, T> =
-	<C as Currency<<T as frame_system::Trait>::AccountId>>::NegativeImbalance;
+	<C as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
 
 /// Handle withdrawing, refunding and depositing of transaction fees.
-pub trait OnChargeTransaction<T: Trait> {
+pub trait OnChargeTransaction<T: Config> {
 	/// The underlying integer type in which fees are calculated.
 	type Balance: AtLeast32BitUnsigned + FullCodec + Copy + MaybeSerializeDeserialize + Debug + Default;
 	type LiquidityInfo: Default;
@@ -55,17 +55,17 @@ pub struct CurrencyAdapter<C, OU>(PhantomData<(C, OU)>);
 /// Default implementation for a Currency and an OnUnbalanced handler.
 impl<T, C, OU> OnChargeTransaction<T> for CurrencyAdapter<C, OU>
 where
-	T: Trait,
-	T::TransactionByteFee: Get<<C as Currency<<T as frame_system::Trait>::AccountId>>::Balance>,
-	C: Currency<<T as frame_system::Trait>::AccountId>,
+	T: Config,
+	T::TransactionByteFee: Get<<C as Currency<<T as frame_system::Config>::AccountId>>::Balance>,
+	C: Currency<<T as frame_system::Config>::AccountId>,
 	C::PositiveImbalance:
-		Imbalance<<C as Currency<<T as frame_system::Trait>::AccountId>>::Balance, Opposite = C::NegativeImbalance>,
+		Imbalance<<C as Currency<<T as frame_system::Config>::AccountId>>::Balance, Opposite = C::NegativeImbalance>,
 	C::NegativeImbalance:
-		Imbalance<<C as Currency<<T as frame_system::Trait>::AccountId>>::Balance, Opposite = C::PositiveImbalance>,
+		Imbalance<<C as Currency<<T as frame_system::Config>::AccountId>>::Balance, Opposite = C::PositiveImbalance>,
 	OU: OnUnbalanced<NegativeImbalanceOf<C, T>>,
 {
 	type LiquidityInfo = Option<NegativeImbalanceOf<C, T>>;
-	type Balance = <C as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
+	type Balance = <C as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 
 	/// Withdraw the predicted fee from the transaction origin.
 	///
diff --git a/frame/treasury/src/benchmarking.rs b/frame/treasury/src/benchmarking.rs
index 2794e6cc4320..4606689e86d9 100644
--- a/frame/treasury/src/benchmarking.rs
+++ b/frame/treasury/src/benchmarking.rs
@@ -30,7 +30,7 @@ use crate::Module as Treasury;
 const SEED: u32 = 0;
 
 // Create the pre-requisite information needed to create a treasury `propose_spend`.
-fn setup_proposal<T: Trait<I>, I: Instance>(u: u32) -> (
+fn setup_proposal<T: Config<I>, I: Instance>(u: u32) -> (
 	T::AccountId,
 	BalanceOf<T, I>,
 	<T::Lookup as StaticLookup>::Source,
@@ -44,7 +44,7 @@ fn setup_proposal<T: Trait<I>, I: Instance>(u: u32) -> (
 }
 
 // Create the pre-requisite information needed to create a `report_awesome`.
-fn setup_awesome<T: Trait<I>, I: Instance>(length: u32) -> (T::AccountId, Vec<u8>, T::AccountId) {
+fn setup_awesome<T: Config<I>, I: Instance>(length: u32) -> (T::AccountId, Vec<u8>, T::AccountId) {
 	let caller = whitelisted_caller();
 	let value = T::TipReportDepositBase::get()
 		+ T::DataDepositPerByte::get() * length.into()
@@ -56,7 +56,7 @@ fn setup_awesome<T: Trait<I>, I: Instance>(length: u32) -> (T::AccountId, Vec<u8
 }
 
 // Create the pre-requisite information needed to call `tip_new`.
-fn setup_tip<T: Trait<I>, I: Instance>(r: u32, t: u32) ->
+fn setup_tip<T: Config<I>, I: Instance>(r: u32, t: u32) ->
 	Result<(T::AccountId, Vec<u8>, T::AccountId, BalanceOf<T, I>), &'static str>
 {
 	let tippers_count = T::Tippers::count();
@@ -77,7 +77,7 @@ fn setup_tip<T: Trait<I>, I: Instance>(r: u32, t: u32) ->
 
 // Create `t` new tips for the tip proposal with `hash`.
 // This function automatically makes the tip able to close.
-fn create_tips<T: Trait<I>, I: Instance>(t: u32, hash: T::Hash, value: BalanceOf<T, I>) ->
+fn create_tips<T: Config<I>, I: Instance>(t: u32, hash: T::Hash, value: BalanceOf<T, I>) ->
 	Result<(), &'static str>
 {
 	for i in 0 .. t {
@@ -94,7 +94,7 @@ fn create_tips<T: Trait<I>, I: Instance>(t: u32, hash: T::Hash, value: BalanceOf
 }
 
 // Create proposals that are approved for use in `on_initialize`.
-fn create_approved_proposals<T: Trait<I>, I: Instance>(n: u32) -> Result<(), &'static str> {
+fn create_approved_proposals<T: Config<I>, I: Instance>(n: u32) -> Result<(), &'static str> {
 	for i in 0 .. n {
 		let (caller, value, lookup) = setup_proposal::<T, I>(i);
 		Treasury::<T, I>::propose_spend(
@@ -110,7 +110,7 @@ fn create_approved_proposals<T: Trait<I>, I: Instance>(n: u32) -> Result<(), &'s
 }
 
 // Create bounties that are approved for use in `on_initialize`.
-fn create_approved_bounties<T: Trait<I>, I: Instance>(n: u32) -> Result<(), &'static str> {
+fn create_approved_bounties<T: Config<I>, I: Instance>(n: u32) -> Result<(), &'static str> {
 	for i in 0 .. n {
 		let (caller, _curator, _fee, value, reason) = setup_bounty::<T, I>(i, MAX_BYTES);
 		Treasury::<T, I>::propose_bounty(RawOrigin::Signed(caller).into(), value, reason)?;
@@ -122,7 +122,7 @@ fn create_approved_bounties<T: Trait<I>, I: Instance>(n: u32) -> Result<(), &'st
 }
 
 // Create the pre-requisite information needed to create a treasury `propose_bounty`.
-fn setup_bounty<T: Trait<I>, I: Instance>(u: u32, d: u32) -> (
+fn setup_bounty<T: Config<I>, I: Instance>(u: u32, d: u32) -> (
 	T::AccountId,
 	T::AccountId,
 	BalanceOf<T, I>,
@@ -140,7 +140,7 @@ fn setup_bounty<T: Trait<I>, I: Instance>(u: u32, d: u32) -> (
 	(caller, curator, fee, value, reason)
 }
 
-fn create_bounty<T: Trait<I>, I: Instance>() -> Result<(
+fn create_bounty<T: Config<I>, I: Instance>() -> Result<(
 	<T::Lookup as StaticLookup>::Source,
 	BountyIndex,
 ), &'static str> {
@@ -155,7 +155,7 @@ fn create_bounty<T: Trait<I>, I: Instance>() -> Result<(
 	Ok((curator_lookup, bounty_id))
 }
 
-fn setup_pod_account<T: Trait<I>, I: Instance>() {
+fn setup_pod_account<T: Config<I>, I: Instance>() {
 	let pot_account = Treasury::<T, I>::account_id();
 	let value = T::Currency::minimum_balance().saturating_mul(1_000_000_000u32.into());
 	let _ = T::Currency::make_free_balance_be(&pot_account, value);
diff --git a/frame/treasury/src/lib.rs b/frame/treasury/src/lib.rs
index 2ada0660f9ec..e180f64d1cbd 100644
--- a/frame/treasury/src/lib.rs
+++ b/frame/treasury/src/lib.rs
@@ -20,7 +20,7 @@
 //! The Treasury module provides a "pot" of funds that can be managed by stakeholders in the
 //! system and a structure for making spending proposals from this pot.
 //!
-//! - [`treasury::Trait`](./trait.Trait.html)
+//! - [`treasury::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //!
 //! ## Overview
@@ -38,7 +38,7 @@
 //! given without first having a pre-determined stakeholder group come to consensus on how much
 //! should be paid.
 //!
-//! A group of `Tippers` is determined through the config `Trait`. After half of these have declared
+//! A group of `Tippers` is determined through the config `Config`. After half of these have declared
 //! some amount that they believe a particular reported reason deserves, then a countdown period is
 //! entered where any remaining members can declare their tip amounts also. After the close of the
 //! countdown period, the median of all declared tips is paid to the reported beneficiary, along
@@ -155,13 +155,13 @@ use frame_system::{self as system, ensure_signed};
 pub use weights::WeightInfo;
 
 type BalanceOf<T, I> =
-	<<T as Trait<I>>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
+	<<T as Config<I>>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 type PositiveImbalanceOf<T, I> =
-	<<T as Trait<I>>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::PositiveImbalance;
+	<<T as Config<I>>::Currency as Currency<<T as frame_system::Config>::AccountId>>::PositiveImbalance;
 type NegativeImbalanceOf<T, I> =
-	<<T as Trait<I>>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::NegativeImbalance;
+	<<T as Config<I>>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
 
-pub trait Trait<I=DefaultInstance>: frame_system::Trait {
+pub trait Config<I=DefaultInstance>: frame_system::Config {
 	/// The treasury's module id, used for deriving its sovereign account ID.
 	type ModuleId: Get<ModuleId>;
 
@@ -192,7 +192,7 @@ pub trait Trait<I=DefaultInstance>: frame_system::Trait {
 	type DataDepositPerByte: Get<BalanceOf<Self, I>>;
 
 	/// The overarching event type.
-	type Event: From<Event<Self, I>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self, I>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// Handler for the unbalanced decrease when slashing for a rejected proposal or bounty.
 	type OnSlash: OnUnbalanced<NegativeImbalanceOf<Self, I>>;
@@ -332,7 +332,7 @@ pub enum BountyStatus<AccountId, BlockNumber> {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait<I>, I: Instance=DefaultInstance> as Treasury {
+	trait Store for Module<T: Config<I>, I: Instance=DefaultInstance> as Treasury {
 		/// Number of proposals that have been made.
 		ProposalCount get(fn proposal_count): ProposalIndex;
 
@@ -388,8 +388,8 @@ decl_event!(
 	pub enum Event<T, I=DefaultInstance>
 	where
 		Balance = BalanceOf<T, I>,
-		<T as frame_system::Trait>::AccountId,
-		<T as frame_system::Trait>::Hash,
+		<T as frame_system::Config>::AccountId,
+		<T as frame_system::Config>::Hash,
 	{
 		/// New proposal. \[proposal_index\]
 		Proposed(ProposalIndex),
@@ -433,7 +433,7 @@ decl_event!(
 
 decl_error! {
 	/// Error for the treasury module.
-	pub enum Error for Module<T: Trait<I>, I: Instance> {
+	pub enum Error for Module<T: Config<I>, I: Instance> {
 		/// Proposer's balance is too low.
 		InsufficientProposersBalance,
 		/// No proposal or bounty at that index.
@@ -465,7 +465,7 @@ decl_error! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait<I>, I: Instance=DefaultInstance>
+	pub struct Module<T: Config<I>, I: Instance=DefaultInstance>
 		for enum Call
 		where origin: T::Origin
 	{
@@ -1159,7 +1159,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait<I>, I: Instance> Module<T, I> {
+impl<T: Config<I>, I: Instance> Module<T, I> {
 	// Add public immutables and private mutables.
 
 	/// The account ID of the treasury pot.
@@ -1452,7 +1452,7 @@ impl<T: Trait<I>, I: Instance> Module<T, I> {
 	}
 }
 
-impl<T: Trait<I>, I: Instance> OnUnbalanced<NegativeImbalanceOf<T, I>> for Module<T, I> {
+impl<T: Config<I>, I: Instance> OnUnbalanced<NegativeImbalanceOf<T, I>> for Module<T, I> {
 	fn on_nonzero_unbalanced(amount: NegativeImbalanceOf<T, I>) {
 		let numeric_amount = amount.peek();
 
diff --git a/frame/treasury/src/tests.rs b/frame/treasury/src/tests.rs
index 88c4f23b91ae..bbc38ddc8f81 100644
--- a/frame/treasury/src/tests.rs
+++ b/frame/treasury/src/tests.rs
@@ -59,7 +59,7 @@ parameter_types! {
 	pub const MaximumBlockLength: u32 = 2 * 1024;
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = u64;
@@ -89,7 +89,7 @@ impl frame_system::Trait for Test {
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
 }
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u64;
 	type Event = Event;
@@ -140,7 +140,7 @@ parameter_types! {
 	pub const BountyCuratorDeposit: Permill = Permill::from_percent(50);
 	pub const BountyValueMinimum: u64 = 1;
 }
-impl Trait for Test {
+impl Config for Test {
 	type ModuleId = TreasuryModuleId;
 	type Currency = pallet_balances::Module<Test>;
 	type ApproveOrigin = frame_system::EnsureRoot<u128>;
diff --git a/frame/treasury/src/weights.rs b/frame/treasury/src/weights.rs
index 646b9869f47e..013a27a5cdc9 100644
--- a/frame/treasury/src/weights.rs
+++ b/frame/treasury/src/weights.rs
@@ -68,7 +68,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_treasury using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn propose_spend() -> Weight {
 		(56_844_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
diff --git a/frame/utility/src/benchmarking.rs b/frame/utility/src/benchmarking.rs
index 413ed66ac849..501e1b293bcc 100644
--- a/frame/utility/src/benchmarking.rs
+++ b/frame/utility/src/benchmarking.rs
@@ -25,9 +25,9 @@ use frame_benchmarking::{benchmarks, account, whitelisted_caller};
 
 const SEED: u32 = 0;
 
-fn assert_last_event<T: Trait>(generic_event: <T as Trait>::Event) {
+fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
 	let events = frame_system::Module::<T>::events();
-	let system_event: <T as frame_system::Trait>::Event = generic_event.into();
+	let system_event: <T as frame_system::Config>::Event = generic_event.into();
 	// compare to the last event record
 	let EventRecord { event, .. } = &events[events.len() - 1];
 	assert_eq!(event, &system_event);
@@ -38,7 +38,7 @@ benchmarks! {
 
 	batch {
 		let c in 0 .. 1000;
-		let mut calls: Vec<<T as Trait>::Call> = Vec::new();
+		let mut calls: Vec<<T as Config>::Call> = Vec::new();
 		for i in 0 .. c {
 			let call = frame_system::Call::remark(vec![]).into();
 			calls.push(call);
@@ -59,7 +59,7 @@ benchmarks! {
 
 	batch_all {
 		let c in 0 .. 1000;
-		let mut calls: Vec<<T as Trait>::Call> = Vec::new();
+		let mut calls: Vec<<T as Config>::Call> = Vec::new();
 		for i in 0 .. c {
 			let call = frame_system::Call::remark(vec![]).into();
 			calls.push(call);
diff --git a/frame/utility/src/lib.rs b/frame/utility/src/lib.rs
index e7ff09c8f0db..3aee32b250d5 100644
--- a/frame/utility/src/lib.rs
+++ b/frame/utility/src/lib.rs
@@ -18,7 +18,7 @@
 //! # Utility Module
 //! A stateless module with helpers for dispatch management which does no re-authentication.
 //!
-//! - [`utility::Trait`](./trait.Trait.html)
+//! - [`utility::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //!
 //! ## Overview
@@ -50,7 +50,7 @@
 //! * `as_derivative` - Dispatch a call from a derivative signed origin.
 //!
 //! [`Call`]: ./enum.Call.html
-//! [`Trait`]: ./trait.Trait.html
+//! [`Config`]: ./trait.Config.html
 
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
@@ -74,9 +74,9 @@ use sp_runtime::{DispatchError, traits::Dispatchable};
 pub use weights::WeightInfo;
 
 /// Configuration trait.
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The overarching event type.
-	type Event: From<Event> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event> + Into<<Self as frame_system::Config>::Event>;
 
 	/// The overarching call type.
 	type Call: Parameter + Dispatchable<Origin=Self::Origin, PostInfo=PostDispatchInfo>
@@ -88,7 +88,7 @@ pub trait Trait: frame_system::Trait {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Utility {}
+	trait Store for Module<T: Config> as Utility {}
 }
 
 decl_event! {
@@ -111,7 +111,7 @@ impl TypeId for IndexedUtilityModuleId {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		/// Deposit one of this module's events by using the default implementation.
 		fn deposit_event() = default;
 
@@ -122,7 +122,7 @@ decl_module! {
 		/// - `calls`: The calls to be dispatched from the same origin.
 		///
 		/// If origin is root then call are dispatch without checking origin filter. (This includes
-		/// bypassing `frame_system::Trait::BaseCallFilter`).
+		/// bypassing `frame_system::Config::BaseCallFilter`).
 		///
 		/// # <weight>
 		/// - Complexity: O(C) where C is the number of calls to be batched.
@@ -149,7 +149,7 @@ decl_module! {
 				}
 			},
 		)]
-		fn batch(origin, calls: Vec<<T as Trait>::Call>) -> DispatchResultWithPostInfo {
+		fn batch(origin, calls: Vec<<T as Config>::Call>) -> DispatchResultWithPostInfo {
 			let is_root = ensure_root(origin.clone()).is_ok();
 			let calls_len = calls.len();
 			// Track the actual weight of each of the batch calls.
@@ -197,7 +197,7 @@ decl_module! {
 				.saturating_add(T::DbWeight::get().reads_writes(1, 1)),
 			call.get_dispatch_info().class,
 		)]
-		fn as_derivative(origin, index: u16, call: Box<<T as Trait>::Call>) -> DispatchResultWithPostInfo {
+		fn as_derivative(origin, index: u16, call: Box<<T as Config>::Call>) -> DispatchResultWithPostInfo {
 			let mut origin = origin;
 			let who = ensure_signed(origin.clone())?;
 			let pseudonym = Self::derivative_account_id(who, index);
@@ -222,7 +222,7 @@ decl_module! {
 		/// - `calls`: The calls to be dispatched from the same origin.
 		///
 		/// If origin is root then call are dispatch without checking origin filter. (This includes
-		/// bypassing `frame_system::Trait::BaseCallFilter`).
+		/// bypassing `frame_system::Config::BaseCallFilter`).
 		///
 		/// # <weight>
 		/// - Complexity: O(C) where C is the number of calls to be batched.
@@ -244,7 +244,7 @@ decl_module! {
 			},
 		)]
 		#[transactional]
-		fn batch_all(origin, calls: Vec<<T as Trait>::Call>) -> DispatchResultWithPostInfo {
+		fn batch_all(origin, calls: Vec<<T as Config>::Call>) -> DispatchResultWithPostInfo {
 			let is_root = ensure_root(origin.clone()).is_ok();
 			let calls_len = calls.len();
 			// Track the actual weight of each of the batch calls.
@@ -274,7 +274,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Derive a derivative account ID from the owner account and the sub-account index.
 	pub fn derivative_account_id(who: T::AccountId, index: u16) -> T::AccountId {
 		let entropy = (b"modlpy/utilisuba", who, index).using_encoded(blake2_256);
diff --git a/frame/utility/src/tests.rs b/frame/utility/src/tests.rs
index a3c33bdf2081..5c1cbaf94cbf 100644
--- a/frame/utility/src/tests.rs
+++ b/frame/utility/src/tests.rs
@@ -37,10 +37,10 @@ use crate as utility;
 pub mod example {
 	use super::*;
 	use frame_support::dispatch::WithPostDispatchInfo;
-	pub trait Trait: frame_system::Trait { }
+	pub trait Config: frame_system::Config { }
 
 	decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: <T as frame_system::Trait>::Origin {
+		pub struct Module<T: Config> for enum Call where origin: <T as frame_system::Config>::Origin {
 			#[weight = *weight]
 			fn noop(_origin, weight: Weight) { }
 
@@ -97,7 +97,7 @@ parameter_types! {
 	pub const MaximumBlockLength: u32 = 2 * 1024;
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = TestBaseCallFilter;
 	type Origin = Origin;
 	type Index = u64;
@@ -127,7 +127,7 @@ impl frame_system::Trait for Test {
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
 }
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u64;
 	type DustRemoval = ();
@@ -142,7 +142,7 @@ parameter_types! {
 	pub const MaxSignatories: u16 = 3;
 }
 
-impl example::Trait for Test {}
+impl example::Config for Test {}
 
 pub struct TestBaseCallFilter;
 impl Filter<Call> for TestBaseCallFilter {
@@ -158,7 +158,7 @@ impl Filter<Call> for TestBaseCallFilter {
 		}
 	}
 }
-impl Trait for Test {
+impl Config for Test {
 	type Event = TestEvent;
 	type Call = Call;
 	type WeightInfo = ();
@@ -428,7 +428,7 @@ fn batch_handles_weight_refund() {
 		assert_eq!(
 			extract_actual_weight(&result, &info),
 			// Real weight is 2 calls at end_weight
-			<Test as Trait>::WeightInfo::batch(2) + end_weight * 2,
+			<Test as Config>::WeightInfo::batch(2) + end_weight * 2,
 		);
 	});
 }
@@ -465,7 +465,7 @@ fn batch_all_revert() {
 			]),
 			DispatchErrorWithPostInfo {
 				post_info: PostDispatchInfo {
-					actual_weight: Some(<Test as Trait>::WeightInfo::batch_all(2) + info.weight * 2),
+					actual_weight: Some(<Test as Config>::WeightInfo::batch_all(2) + info.weight * 2),
 					pays_fee: Pays::Yes
 				},
 				error: pallet_balances::Error::<Test, _>::InsufficientBalance.into()
@@ -536,7 +536,7 @@ fn batch_all_handles_weight_refund() {
 		assert_eq!(
 			extract_actual_weight(&result, &info),
 			// Real weight is 2 calls at end_weight
-			<Test as Trait>::WeightInfo::batch_all(2) + end_weight * 2,
+			<Test as Config>::WeightInfo::batch_all(2) + end_weight * 2,
 		);
 	});
 }
diff --git a/frame/utility/src/weights.rs b/frame/utility/src/weights.rs
index 73e4e3b1d93b..c03ef0d064b9 100644
--- a/frame/utility/src/weights.rs
+++ b/frame/utility/src/weights.rs
@@ -51,7 +51,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_utility using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn batch(c: u32, ) -> Weight {
 		(20_071_000 as Weight)
 			.saturating_add((2_739_000 as Weight).saturating_mul(c as Weight))
diff --git a/frame/vesting/src/benchmarking.rs b/frame/vesting/src/benchmarking.rs
index 652d10aab3ae..0cb030668d05 100644
--- a/frame/vesting/src/benchmarking.rs
+++ b/frame/vesting/src/benchmarking.rs
@@ -29,9 +29,9 @@ use crate::Module as Vesting;
 
 const SEED: u32 = 0;
 
-type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
+type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 
-fn add_locks<T: Trait>(who: &T::AccountId, n: u8) {
+fn add_locks<T: Config>(who: &T::AccountId, n: u8) {
 	for id in 0..n {
 		let lock_id = [id; 8];
 		let locked = 100u32;
@@ -40,7 +40,7 @@ fn add_locks<T: Trait>(who: &T::AccountId, n: u8) {
 	}
 }
 
-fn add_vesting_schedule<T: Trait>(who: &T::AccountId) -> Result<(), &'static str> {
+fn add_vesting_schedule<T: Config>(who: &T::AccountId) -> Result<(), &'static str> {
 	let locked = 100u32;
 	let per_block = 10u32;
 	let starting_block = 1u32;
diff --git a/frame/vesting/src/lib.rs b/frame/vesting/src/lib.rs
index c09516c2cc27..4dbe27649ce9 100644
--- a/frame/vesting/src/lib.rs
+++ b/frame/vesting/src/lib.rs
@@ -17,7 +17,7 @@
 
 //! # Vesting Module
 //!
-//! - [`vesting::Trait`](./trait.Trait.html)
+//! - [`vesting::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //!
 //! ## Overview
@@ -43,7 +43,7 @@
 //!   "vested" so far.
 //!
 //! [`Call`]: ./enum.Call.html
-//! [`Trait`]: ./trait.Trait.html
+//! [`Config`]: ./trait.Config.html
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
@@ -64,12 +64,12 @@ use frame_support::traits::{
 use frame_system::{ensure_signed, ensure_root};
 pub use weights::WeightInfo;
 
-type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
-type MaxLocksOf<T> = <<T as Trait>::Currency as LockableCurrency<<T as frame_system::Trait>::AccountId>>::MaxLocks;
+type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+type MaxLocksOf<T> = <<T as Config>::Currency as LockableCurrency<<T as frame_system::Config>::AccountId>>::MaxLocks;
 
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// The currency trait.
 	type Currency: LockableCurrency<Self::AccountId>;
@@ -120,7 +120,7 @@ impl<
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Vesting {
+	trait Store for Module<T: Config> as Vesting {
 		/// Information regarding the vesting of a given account.
 		pub Vesting get(fn vesting):
 			map hasher(blake2_128_concat) T::AccountId
@@ -156,7 +156,7 @@ decl_storage! {
 }
 
 decl_event!(
-	pub enum Event<T> where AccountId = <T as frame_system::Trait>::AccountId, Balance = BalanceOf<T> {
+	pub enum Event<T> where AccountId = <T as frame_system::Config>::AccountId, Balance = BalanceOf<T> {
 		/// The amount vested has been updated. This could indicate more funds are available. The
 		/// balance given is the amount which is left unvested (and thus locked).
 		/// \[account, unvested\]
@@ -168,7 +168,7 @@ decl_event!(
 
 decl_error! {
 	/// Error for the vesting module.
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// The account given is not vesting.
 		NotVesting,
 		/// An existing vesting schedule already exists for this account that cannot be clobbered.
@@ -180,7 +180,7 @@ decl_error! {
 
 decl_module! {
 	/// Vesting module declaration.
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		type Error = Error<T>;
 
 		/// The minimum amount to be transferred to create a new vesting schedule.
@@ -309,7 +309,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// (Re)set or remove the module's currency lock on `who`'s account in accordance with their
 	/// current unvested amount.
 	fn update_lock(who: T::AccountId) -> DispatchResult {
@@ -330,7 +330,7 @@ impl<T: Trait> Module<T> {
 	}
 }
 
-impl<T: Trait> VestingSchedule<T::AccountId> for Module<T> where
+impl<T: Config> VestingSchedule<T::AccountId> for Module<T> where
 	BalanceOf<T>: MaybeSerializeDeserialize + Debug
 {
 	type Moment = T::BlockNumber;
@@ -413,7 +413,7 @@ mod tests {
 		pub const MaximumBlockLength: u32 = 2 * 1024;
 		pub const AvailableBlockRatio: Perbill = Perbill::one();
 	}
-	impl frame_system::Trait for Test {
+	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
 		type Origin = Origin;
 		type Index = u64;
@@ -443,7 +443,7 @@ mod tests {
 	parameter_types! {
 		pub const MaxLocks: u32 = 10;
 	}
-	impl pallet_balances::Trait for Test {
+	impl pallet_balances::Config for Test {
 		type Balance = u64;
 		type DustRemoval = ();
 		type Event = ();
@@ -456,7 +456,7 @@ mod tests {
 		pub const MinVestedTransfer: u64 = 256 * 2;
 		pub static ExistentialDeposit: u64 = 0;
 	}
-	impl Trait for Test {
+	impl Config for Test {
 		type Event = ();
 		type Currency = Balances;
 		type BlockNumberToBalance = Identity;
diff --git a/frame/vesting/src/weights.rs b/frame/vesting/src/weights.rs
index 23a46ec763d8..3d2d6dd9670e 100644
--- a/frame/vesting/src/weights.rs
+++ b/frame/vesting/src/weights.rs
@@ -54,7 +54,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_vesting using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn vest_locked(l: u32, ) -> Weight {
 		(57_472_000 as Weight)
 			.saturating_add((155_000 as Weight).saturating_mul(l as Weight))
diff --git a/primitives/api/proc-macro/src/impl_runtime_apis.rs b/primitives/api/proc-macro/src/impl_runtime_apis.rs
index 85f5a1797b1e..5839618e3733 100644
--- a/primitives/api/proc-macro/src/impl_runtime_apis.rs
+++ b/primitives/api/proc-macro/src/impl_runtime_apis.rs
@@ -410,7 +410,7 @@ fn extend_with_runtime_decl_path(mut trait_: Path) -> Path {
 			.segments
 			.last()
 			.as_ref()
-			.expect("Trait path should always contain at least one item; qed")
+			.expect("Config path should always contain at least one item; qed")
 			.ident;
 
 		generate_runtime_mod_name_for_trait(trait_name)
diff --git a/primitives/runtime/src/offchain/storage_lock.rs b/primitives/runtime/src/offchain/storage_lock.rs
index a3838f21fd13..451753931ec9 100644
--- a/primitives/runtime/src/offchain/storage_lock.rs
+++ b/primitives/runtime/src/offchain/storage_lock.rs
@@ -438,11 +438,11 @@ pub trait BlockNumberProvider {
 	///
 	/// In case of using crate `sp_runtime` without the crate `frame`
 	/// system, it is already implemented for
-	/// `frame_system::Module<T: Trait>` as:
+	/// `frame_system::Module<T: Config>` as:
 	///
 	/// ```ignore
 	/// fn current_block_number() -> Self {
-	///     frame_system::Module<Trait>::block_number()
+	///     frame_system::Module<Config>::block_number()
 	/// }
 	/// ```
 	/// .
diff --git a/primitives/runtime/src/traits.rs b/primitives/runtime/src/traits.rs
index 4ce9ac0afa9a..d475be3579ba 100644
--- a/primitives/runtime/src/traits.rs
+++ b/primitives/runtime/src/traits.rs
@@ -693,7 +693,7 @@ pub trait Dispatchable {
 	/// identifier for the caller. The origin can be empty in the case of an inherent extrinsic.
 	type Origin;
 	/// ...
-	type Trait;
+	type Config;
 	/// An opaque set of information attached to the transaction. This could be constructed anywhere
 	/// down the line in a runtime. The current Substrate runtime uses a struct with the same name
 	/// to represent the dispatch class and weight.
@@ -712,7 +712,7 @@ pub type PostDispatchInfoOf<T> = <T as Dispatchable>::PostInfo;
 
 impl Dispatchable for () {
 	type Origin = ();
-	type Trait = ();
+	type Config = ();
 	type Info = ();
 	type PostInfo = ();
 	fn dispatch(self, _origin: Self::Origin) -> crate::DispatchResultWithInfo<Self::PostInfo> {
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index 202446777105..b4a69a491d58 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -197,7 +197,7 @@ impl ExtrinsicT for Extrinsic {
 
 impl sp_runtime::traits::Dispatchable for Extrinsic {
 	type Origin = Origin;
-	type Trait = ();
+	type Config = ();
 	type Info = ();
 	type PostInfo = ();
 	fn dispatch(self, _origin: Self::Origin) -> sp_runtime::DispatchResultWithInfo<Self::PostInfo> {
@@ -436,7 +436,7 @@ parameter_types! {
 	pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);
 }
 
-impl frame_system::Trait for Runtime {
+impl frame_system::Config for Runtime {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Call = Extrinsic;
@@ -464,7 +464,7 @@ impl frame_system::Trait for Runtime {
 	type SystemWeightInfo = ();
 }
 
-impl pallet_timestamp::Trait for Runtime {
+impl pallet_timestamp::Config for Runtime {
 	/// A timestamp: milliseconds since the unix epoch.
 	type Moment = u64;
 	type OnTimestampSet = ();
@@ -477,7 +477,7 @@ parameter_types! {
 	pub const ExpectedBlockTime: u64 = 10_000;
 }
 
-impl pallet_babe::Trait for Runtime {
+impl pallet_babe::Config for Runtime {
 	type EpochDuration = EpochDuration;
 	type ExpectedBlockTime = ExpectedBlockTime;
 	// there is no actual runtime in this test-runtime, so testing crates
diff --git a/test-utils/runtime/src/system.rs b/test-utils/runtime/src/system.rs
index 818487a89e51..db22a6092c71 100644
--- a/test-utils/runtime/src/system.rs
+++ b/test-utils/runtime/src/system.rs
@@ -32,7 +32,7 @@ use sp_runtime::{
 	},
 };
 use codec::{KeyedVec, Encode, Decode};
-use frame_system::Trait;
+use frame_system::Config;
 use crate::{
 	AccountId, BlockNumber, Extrinsic, Transfer, H256 as Hash, Block, Header, Digest, AuthorityId
 };
@@ -42,11 +42,11 @@ const NONCE_OF: &[u8] = b"nonce:";
 const BALANCE_OF: &[u8] = b"balance:";
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {}
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {}
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as TestRuntime {
+	trait Store for Module<T: Config> as TestRuntime {
 		ExtrinsicData: map hasher(blake2_128_concat) u32 => Vec<u8>;
 		// The current block number being processed. Set by `execute_block`.
 		Number get(fn number): Option<BlockNumber>;
diff --git a/utils/frame/frame-utilities-cli/src/module_id.rs b/utils/frame/frame-utilities-cli/src/module_id.rs
index cc76c70d0fa8..ae26f31ad24f 100644
--- a/utils/frame/frame-utilities-cli/src/module_id.rs
+++ b/utils/frame/frame-utilities-cli/src/module_id.rs
@@ -64,7 +64,7 @@ impl ModuleIdCmd {
 	/// runs the command
 	pub fn run<R>(&self) -> Result<(), Error>
 		where
-			R: frame_system::Trait,
+			R: frame_system::Config,
 			R::AccountId: Ss58Codec,
 	{
 		if self.id.len() != 8 {
diff --git a/utils/frame/rpc/support/src/lib.rs b/utils/frame/rpc/support/src/lib.rs
index dc87d6185209..85cb433cb2b3 100644
--- a/utils/frame/rpc/support/src/lib.rs
+++ b/utils/frame/rpc/support/src/lib.rs
@@ -40,11 +40,11 @@ use sc_rpc_api::state::StateClient;
 /// # use codec::Encode;
 /// # use frame_support::{decl_storage, decl_module};
 /// # use substrate_frame_rpc_support::StorageQuery;
-/// # use frame_system::Trait;
+/// # use frame_system::Config;
 /// # use sc_rpc_api::state::StateClient;
 /// #
-/// # // Hash would normally be <TestRuntime as frame_system::Trait>::Hash, but we don't have
-/// # // frame_system::Trait implemented for TestRuntime. Here we just pretend.
+/// # // Hash would normally be <TestRuntime as frame_system::Config>::Hash, but we don't have
+/// # // frame_system::Config implemented for TestRuntime. Here we just pretend.
 /// # type Hash = ();
 /// #
 /// # fn main() -> Result<(), RpcError> {
@@ -54,7 +54,7 @@ use sc_rpc_api::state::StateClient;
 /// # struct TestRuntime;
 /// #
 /// # decl_module! {
-///	#     pub struct Module<T: Trait> for enum Call where origin: T::Origin {}
+///	#     pub struct Module<T: Config> for enum Call where origin: T::Origin {}
 /// # }
 /// #
 /// pub type Loc = (i64, i64, i64);
@@ -62,7 +62,7 @@ use sc_rpc_api::state::StateClient;
 ///
 /// // Note that all fields are marked pub.
 /// decl_storage! {
-///     trait Store for Module<T: Trait> as TestRuntime {
+///     trait Store for Module<T: Config> as TestRuntime {
 ///         pub LastActionId: u64;
 ///         pub Voxels: map hasher(blake2_128_concat) Loc => Block;
 ///         pub Actions: map hasher(blake2_128_concat) u64 => Loc;
@@ -125,7 +125,7 @@ impl<V: FullCodec> StorageQuery<V> {
 
 	/// Send this query over RPC, await the typed result.
 	///
-	/// Hash should be <YourRuntime as frame::Trait>::Hash.
+	/// Hash should be <YourRuntime as frame::Config>::Hash.
 	///
 	/// # Arguments
 	///

From 21fe14af6e830023bdd2781bd89bf8012585a8a1 Mon Sep 17 00:00:00 2001
From: Bernhard Schuster <bernhard@ahoi.io>
Date: Mon, 30 Nov 2020 16:53:33 +0100
Subject: [PATCH 0123/1194] resolve unresolved error nits of #7617 (#7631)

* handle executor should_panic test better

* Revert "reduce should panic, due to extended error messages"

This reverts commit c0805940184a62cd9302603ad911c3591e70a60c.

* remove excessive constraints

* remove duplicate documentation messages for error variants

* reduce T: constraints to the abs minimum

* whoops

* fewer bounds again

Co-authored-by: Bernhard Schuster <bernhard@parity.io>
---
 Cargo.lock                                   |  2 +-
 client/consensus/slots/src/lib.rs            |  4 +-
 client/executor/common/src/error.rs          | 56 +++++++++-----------
 client/executor/src/integration_tests/mod.rs |  2 +-
 client/transaction-pool/graph/src/error.rs   | 20 +++----
 primitives/allocator/Cargo.toml              |  6 +--
 primitives/allocator/src/error.rs            | 16 ++----
 7 files changed, 46 insertions(+), 60 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 446b4442cd0e..190dbaf71794 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7977,11 +7977,11 @@ dependencies = [
 name = "sp-allocator"
 version = "2.0.0"
 dependencies = [
- "derive_more",
  "log",
  "sp-core",
  "sp-std",
  "sp-wasm-interface",
+ "thiserror",
 ]
 
 [[package]]
diff --git a/client/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs
index ab8fc16007ce..571766bc44b1 100644
--- a/client/consensus/slots/src/lib.rs
+++ b/client/consensus/slots/src/lib.rs
@@ -475,7 +475,7 @@ pub enum CheckedHeader<H, S> {
 
 #[derive(Debug, thiserror::Error)]
 #[allow(missing_docs)]
-pub enum Error<T> where T: SlotData + Clone + Debug + Send + Sync + 'static {
+pub enum Error<T> where T: Debug {
 	#[error("Slot duration is invalid: {0:?}")]
 	SlotDurationInvalid(SlotDuration<T>),
 }
@@ -493,7 +493,7 @@ impl<T> Deref for SlotDuration<T> {
 	}
 }
 
-impl<T: SlotData + Clone> SlotData for SlotDuration<T> {
+impl<T: SlotData> SlotData for SlotDuration<T> {
 	/// Get the slot duration in milliseconds.
 	fn slot_duration(&self) -> u64
 		where T: SlotData,
diff --git a/client/executor/common/src/error.rs b/client/executor/common/src/error.rs
index caf6159da072..df0eaf8cc261 100644
--- a/client/executor/common/src/error.rs
+++ b/client/executor/common/src/error.rs
@@ -28,75 +28,69 @@ pub type Result<T> = std::result::Result<T, Error>;
 #[derive(Debug, thiserror::Error)]
 #[allow(missing_docs)]
 pub enum Error {
-	/// Unserializable Data
 	#[error("Unserializable data encountered")]
 	InvalidData(#[from] sp_serializer::Error),
-	/// Trap occurred during execution
+
 	#[error(transparent)]
 	Trap(#[from] wasmi::Trap),
-	/// Wasmi loading/instantiating error
+
 	#[error(transparent)]
 	Wasmi(#[from] wasmi::Error),
-	/// Error in the API. Parameter is an error message.
+
 	#[error("API Error: {0}")]
 	ApiError(String),
-	/// Method is not found
+
 	#[error("Method not found: '{0}'")]
 	MethodNotFound(String),
-	/// Code is invalid (expected single byte)
-	#[error("Invalid Code: '{0}'")]
+
+	#[error("Invalid Code (expected single byte): '{0}'")]
 	InvalidCode(String),
-	/// Could not get runtime version.
+
 	#[error("On-chain runtime does not specify version")]
 	VersionInvalid,
-	/// Externalities have failed.
+
 	#[error("Externalities error")]
 	Externalities,
-	/// Invalid index.
+
 	#[error("Invalid index provided")]
 	InvalidIndex,
-	/// Invalid return type.
+
 	#[error("Invalid type returned (should be u64)")]
 	InvalidReturn,
-	/// Runtime failed.
+
 	#[error("Runtime error")]
 	Runtime,
-	/// Runtime panicked.
+
 	#[error("Runtime panicked: {0}")]
 	RuntimePanicked(String),
-	/// Invalid memory reference.
+
 	#[error("Invalid memory reference")]
 	InvalidMemoryReference,
-	/// The runtime must provide a global named `__heap_base` of type i32 for specifying where the
-	/// allocator is allowed to place its data.
-	#[error("The runtime doesn't provide a global named `__heap_base`")]
+
+	#[error("The runtime doesn't provide a global named `__heap_base` of type `i32`")]
 	HeapBaseNotFoundOrInvalid,
-	/// The runtime WebAssembly module is not allowed to have the `start` function.
-	#[error("The runtime has the `start` function")]
+
+	#[error("The runtime must not have the `start` function defined")]
 	RuntimeHasStartFn,
-	/// Some other error occurred
+
 	#[error("Other: {0}")]
 	Other(String),
-	/// Some error occurred in the allocator
-	#[error("Allocation Error")]
+
+	#[error(transparent)]
 	Allocator(#[from] sp_allocator::Error),
-	/// Execution of a host function failed.
+
 	#[error("Host function {0} execution failed with: {1}")]
 	FunctionExecution(String, String),
-	/// No table is present.
-	///
-	/// Call was requested that requires table but none was present in the instance.
+
 	#[error("No table exported by wasm blob")]
 	NoTable,
-	/// No table entry is present.
-	///
-	/// Call was requested that requires specific entry in the table to be present.
+
 	#[error("No table entry with index {0} in wasm blob exported table")]
 	NoTableEntryWithIndex(u32),
-	/// Table entry is not a function.
+
 	#[error("Table element with index {0} is not a function in wasm blob exported table")]
 	TableElementIsNotAFunction(u32),
-	/// Function in table is null and thus cannot be called.
+
 	#[error("Table entry with index {0} in wasm blob is null")]
 	FunctionRefIsNull(u32),
 
diff --git a/client/executor/src/integration_tests/mod.rs b/client/executor/src/integration_tests/mod.rs
index 62368441f586..d41784f5aa06 100644
--- a/client/executor/src/integration_tests/mod.rs
+++ b/client/executor/src/integration_tests/mod.rs
@@ -523,7 +523,7 @@ fn offchain_http_should_work(wasm_method: WasmExecutionMethod) {
 
 #[test_case(WasmExecutionMethod::Interpreted)]
 #[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
-#[should_panic]
+#[should_panic(expected = "Allocator ran out of space")]
 fn should_trap_when_heap_exhausted(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 
diff --git a/client/transaction-pool/graph/src/error.rs b/client/transaction-pool/graph/src/error.rs
index b599715920be..01fcb9f8dc91 100644
--- a/client/transaction-pool/graph/src/error.rs
+++ b/client/transaction-pool/graph/src/error.rs
@@ -32,36 +32,36 @@ pub enum Error {
 	/// Transaction is not verifiable yet, but might be in the future.
 	#[error("Unknown transaction validity: {0:?}")]
 	UnknownTransaction(UnknownTransaction),
-	/// Transaction is invalid.
+
 	#[error("Invalid transaction validity: {0:?}")]
 	InvalidTransaction(InvalidTransaction),
 	/// The transaction validity returned no "provides" tag.
 	///
 	/// Such transactions are not accepted to the pool, since we use those tags
 	/// to define identity of transactions (occupance of the same "slot").
-	#[error("The transaction does not provide any tags, so the pool can't identify it.")]
+	#[error("The transaction validity returned no `provides` tags, so the pool can't identify it.")]
 	NoTagsProvided,
 
 	#[error("Temporarily Banned")]
 	TemporarilyBanned,
-	/// The transaction is already in the pool.
-	#[error("[{0:?}] Already imported")]
+
+	#[error("[{0:?}] Transaction is already in the pool")]
 	AlreadyImported(Box<dyn std::any::Any + Send>),
-	/// The transaction cannot be imported cause it's a replacement and has too low priority.
-	#[error("Too low priority ({0} > {1})", old, new)]
+
+	#[error("Transaction cannot be imported due to too low priority ({0} > {1})", old, new)]
 	TooLowPriority {
 		/// Transaction already in the pool.
 		old: Priority,
 		/// Transaction entering the pool.
 		new: Priority
 	},
-	/// Deps cycle detected and we couldn't import transaction.
-	#[error("Cycle Detected")]
+
+	#[error("Dependency cycle detected")]
 	CycleDetected,
-	/// Transaction was dropped immediately after it got inserted.
+
 	#[error("Transaction couldn't enter the pool because of the limit.")]
 	ImmediatelyDropped,
-	/// Invalid block id.
+
 	#[error("Invlaid block id: {0}")]
 	InvalidBlockId(String),
 }
diff --git a/primitives/allocator/Cargo.toml b/primitives/allocator/Cargo.toml
index 93991a4aeb2a..130723730c4e 100644
--- a/primitives/allocator/Cargo.toml
+++ b/primitives/allocator/Cargo.toml
@@ -17,8 +17,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 sp-std = { version = "2.0.0", path = "../std", default-features = false }
 sp-core = { version = "2.0.0", path = "../core", default-features = false }
 sp-wasm-interface = { version = "2.0.0", path = "../wasm-interface", default-features = false }
-log = { version = "0.4.8", optional = true }
-derive_more = { version = "0.99.2", optional = true }
+log = { version = "0.4.11", optional = true }
+thiserror = { version = "1.0.21", optional = true }
 
 [features]
 default = [ "std" ]
@@ -27,5 +27,5 @@ std = [
 	"sp-core/std",
 	"sp-wasm-interface/std",
 	"log",
-	"derive_more",
+	"thiserror",
 ]
diff --git a/primitives/allocator/src/error.rs b/primitives/allocator/src/error.rs
index 7b634af4d5b2..77c911cef9d5 100644
--- a/primitives/allocator/src/error.rs
+++ b/primitives/allocator/src/error.rs
@@ -17,23 +17,15 @@
 
 /// The error type used by the allocators.
 #[derive(sp_core::RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(derive_more::Display))]
+#[cfg_attr(feature = "std", derive(thiserror::Error))]
 pub enum Error {
 	/// Someone tried to allocate more memory than the allowed maximum per allocation.
-	#[cfg_attr(feature = "std", display(fmt="Requested allocation size is too large"))]
+	#[cfg_attr(feature = "std", error("Requested allocation size is too large"))]
 	RequestedAllocationTooLarge,
 	/// Allocator run out of space.
-	#[cfg_attr(feature = "std", display(fmt="Allocator ran out of space"))]
+	#[cfg_attr(feature = "std", error("Allocator ran out of space"))]
 	AllocatorOutOfSpace,
 	/// Some other error occurred.
+	#[cfg_attr(feature = "std", error("Other: {0}"))]
 	Other(&'static str)
 }
-
-#[cfg(feature = "std")]
-impl std::error::Error for Error {
-	fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
-		match self {
-			_ => None,
-		}
-	}
-}

From f5088c50a8361f9efc71a75754b0776b6e24ab8a Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Mon, 30 Nov 2020 18:43:47 +0100
Subject: [PATCH 0124/1194] Fix bad state transition with
 DisabledPendingEnable+OpenDesiredByRemote (#7638)

---
 .../src/protocol/generic_proto/behaviour.rs   | 30 +++++--------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/client/network/src/protocol/generic_proto/behaviour.rs b/client/network/src/protocol/generic_proto/behaviour.rs
index f76b3cc71602..51d7252d5f9b 100644
--- a/client/network/src/protocol/generic_proto/behaviour.rs
+++ b/client/network/src/protocol/generic_proto/behaviour.rs
@@ -1575,34 +1575,20 @@ impl NetworkBehaviour for GenericProto {
 						}
 					}
 
-					// DisabledPendingEnable => DisabledPendingEnable | Incoming
+					// DisabledPendingEnable => Enabled | DisabledPendingEnable
 					PeerState::DisabledPendingEnable { mut connections, timer, timer_deadline } => {
 						if let Some((_, connec_state)) = connections.iter_mut().find(|(c, _)| *c == connection) {
 							if let ConnectionState::Closed = *connec_state {
-								*connec_state = ConnectionState::OpenDesiredByRemote;
-
-								let incoming_id = self.next_incoming_index;
-								self.next_incoming_index.0 = match self.next_incoming_index.0.checked_add(1) {
-									Some(v) => v,
-									None => {
-										error!(target: "sub-libp2p", "Overflow in next_incoming_index");
-										return
-									}
-								};
-
-								debug!(target: "sub-libp2p", "PSM <= Incoming({}, {:?}).",
-									source, incoming_id);
-								self.peerset.incoming(source.clone(), incoming_id);
-								self.incoming.push(IncomingPeer {
+								debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open",
+									source, connection);
+								self.events.push_back(NetworkBehaviourAction::NotifyHandler {
 									peer_id: source.clone(),
-									alive: true,
-									incoming_id,
+									handler: NotifyHandler::One(connection),
+									event: NotifsHandlerIn::Open,
 								});
+								*connec_state = ConnectionState::Opening;
 
-								*entry.into_mut() = PeerState::Incoming {
-									connections,
-									backoff_until: Some(timer_deadline),
-								};
+								*entry.into_mut() = PeerState::Enabled { connections };
 
 							} else {
 								// Connections in `OpeningThenClosing` are in a Closed phase, and

From 125cf193f424f80fdba9efb0fb92ada9a4a96749 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Mon, 30 Nov 2020 21:33:49 +0100
Subject: [PATCH 0125/1194] Renames of `Trait` to `Config` in README.md, weight
 templates and few minor ones (#7636)

* manual rename

* renamse in README.md

* fix template
---
 .maintain/frame-weight-template.hbs           |  2 +-
 bin/node-template/README.md                   |  6 +--
 frame/assets/README.md                        |  8 +--
 frame/atomic-swap/README.md                   |  2 +-
 frame/aura/README.md                          |  2 +-
 frame/balances/README.md                      | 12 ++---
 frame/benchmarking/src/tests.rs               | 12 ++---
 frame/contracts/README.md                     |  2 +-
 frame/democracy/README.md                     |  2 +-
 frame/elections-phragmen/README.md            |  2 +-
 frame/example-offchain-worker/README.md       |  2 +-
 frame/example/README.md                       |  4 +-
 frame/identity/README.md                      |  4 +-
 frame/im-online/README.md                     |  6 +--
 frame/multisig/README.md                      |  4 +-
 frame/nicks/README.md                         |  4 +-
 frame/offences/benchmarking/src/lib.rs        | 54 +++++++++----------
 frame/proxy/README.md                         |  4 +-
 frame/randomness-collective-flip/README.md    |  4 +-
 frame/recovery/README.md                      |  2 +-
 frame/scheduler/README.md                     |  4 +-
 frame/scored-pool/README.md                   |  6 +--
 frame/session/README.md                       |  4 +-
 frame/session/src/historical/offchain.rs      |  8 +--
 frame/session/src/historical/onchain.rs       | 12 ++---
 frame/society/README.md                       |  2 +-
 frame/staking/README.md                       | 14 ++---
 frame/sudo/README.md                          |  8 +--
 frame/system/README.md                        |  6 +--
 frame/timestamp/README.md                     |  8 +--
 frame/transaction-payment/README.md           |  4 +-
 frame/treasury/README.md                      |  4 +-
 frame/utility/README.md                       |  4 +-
 frame/vesting/README.md                       |  4 +-
 .../api/proc-macro/src/impl_runtime_apis.rs   |  2 +-
 utils/frame/benchmarking-cli/src/template.hbs |  2 +-
 36 files changed, 115 insertions(+), 115 deletions(-)

diff --git a/.maintain/frame-weight-template.hbs b/.maintain/frame-weight-template.hbs
index aac37f0833c7..6e555da968d3 100644
--- a/.maintain/frame-weight-template.hbs
+++ b/.maintain/frame-weight-template.hbs
@@ -45,7 +45,7 @@ pub trait WeightInfo {
 
 /// Weights for {{pallet}} using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	{{~#each benchmarks as |benchmark|}}
 	fn {{benchmark.name~}}
 	(
diff --git a/bin/node-template/README.md b/bin/node-template/README.md
index c1aeefe89509..8c8b82a14bb8 100644
--- a/bin/node-template/README.md
+++ b/bin/node-template/README.md
@@ -157,7 +157,7 @@ Review the [FRAME runtime implementation](./runtime/src/lib.rs) included in this
 the following:
 
 -   This file configures several pallets to include in the runtime. Each pallet configuration is
-    defined by a code block that begins with `impl $PALLET_NAME::Trait for Runtime`.
+    defined by a code block that begins with `impl $PALLET_NAME::Config for Runtime`.
 -   The pallets are composed into a single runtime by way of the
     [`construct_runtime!`](https://crates.parity.io/frame_support/macro.construct_runtime.html)
     macro, which is part of the core
@@ -181,8 +181,8 @@ A FRAME pallet is compromised of a number of blockchain primitives:
 -   Events: Substrate uses [events](https://substrate.dev/docs/en/knowledgebase/runtime/events) to
     notify users of important changes in the runtime.
 -   Errors: When a dispatchable fails, it returns an error.
--   Trait: The `Trait` configuration interface is used to define the types and parameters upon which
-    a FRAME pallet depends.
+-   Config: The `Config` configuration interface is used to define the types and parameters upon
+    which a FRAME pallet depends.
 
 ## Generate a Custom Node Template
 
diff --git a/frame/assets/README.md b/frame/assets/README.md
index 6b3fe21e5277..804856f90d09 100644
--- a/frame/assets/README.md
+++ b/frame/assets/README.md
@@ -11,7 +11,7 @@ with a fixed supply, including:
 * Asset Transfer
 * Asset Destruction
 
-To use it in your runtime, you need to implement the assets [`Trait`](https://docs.rs/pallet-assets/latest/pallet_assets/trait.Trait.html).
+To use it in your runtime, you need to implement the assets [`Config`](https://docs.rs/pallet-assets/latest/pallet_assets/trait.Config.html).
 
 The supported dispatchable functions are documented in the [`Call`](https://docs.rs/pallet-assets/latest/pallet_assets/enum.Call.html) enum.
 
@@ -72,10 +72,10 @@ use pallet_assets as assets;
 use frame_support::{decl_module, dispatch, ensure};
 use frame_system::ensure_signed;
 
-pub trait Trait: assets::Trait { }
+pub trait Config: assets::Config { }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		pub fn issue_token_airdrop(origin) -> dispatch::DispatchResult {
 			let sender = ensure_signed(origin).map_err(|e| e.as_str())?;
 
@@ -106,7 +106,7 @@ Below are assumptions that must be held when using this module.  If any of
 them are violated, the behavior of this module is undefined.
 
 * The total count of assets should be less than
-  `Trait::AssetId::max_value()`.
+  `Config::AssetId::max_value()`.
 
 ## Related Modules
 
diff --git a/frame/atomic-swap/README.md b/frame/atomic-swap/README.md
index 1287e90bc0da..eeac282f1d56 100644
--- a/frame/atomic-swap/README.md
+++ b/frame/atomic-swap/README.md
@@ -2,7 +2,7 @@
 
 A module for atomically sending funds.
 
-- [`atomic_swap::Trait`](https://docs.rs/pallet-atomic-swap/latest/pallet_atomic_swap/trait.Trait.html)
+- [`atomic_swap::Config`](https://docs.rs/pallet-atomic-swap/latest/pallet_atomic_swap/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-atomic-swap/latest/pallet_atomic_swap/enum.Call.html)
 - [`Module`](https://docs.rs/pallet-atomic-swap/latest/pallet_atomic_swap/struct.Module.html)
 
diff --git a/frame/aura/README.md b/frame/aura/README.md
index 4f3eacbad8a0..253e0d3651c6 100644
--- a/frame/aura/README.md
+++ b/frame/aura/README.md
@@ -1,6 +1,6 @@
 # Aura Module
 
-- [`aura::Trait`](https://docs.rs/pallet-aura/latest/pallet_aura/trait.Trait.html)
+- [`aura::Config`](https://docs.rs/pallet-aura/latest/pallet_aura/trait.Config.html)
 - [`Module`](https://docs.rs/pallet-aura/latest/pallet_aura/struct.Module.html)
 
 ## Overview
diff --git a/frame/balances/README.md b/frame/balances/README.md
index a93ed5f306e0..9a2f3c394c94 100644
--- a/frame/balances/README.md
+++ b/frame/balances/README.md
@@ -2,7 +2,7 @@
 
 The Balances module provides functionality for handling accounts and balances.
 
-- [`balances::Trait`](https://docs.rs/pallet-balances/latest/pallet_balances/trait.Trait.html)
+- [`balances::Config`](https://docs.rs/pallet-balances/latest/pallet_balances/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-balances/latest/pallet_balances/enum.Call.html)
 - [`Module`](https://docs.rs/pallet-balances/latest/pallet_balances/struct.Module.html)
 
@@ -83,8 +83,8 @@ The Contract module uses the `Currency` trait to handle gas payment, and its typ
 ```rust
 use frame_support::traits::Currency;
 
-pub type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
-pub type NegativeImbalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::NegativeImbalance;
+pub type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+pub type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
 
 ```
 
@@ -93,11 +93,11 @@ The Staking module uses the `LockableCurrency` trait to lock a stash account's f
 ```rust
 use frame_support::traits::{WithdrawReasons, LockableCurrency};
 use sp_runtime::traits::Bounded;
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	type Currency: LockableCurrency<Self::AccountId, Moment=Self::BlockNumber>;
 }
 
-fn update_ledger<T: Trait>(
+fn update_ledger<T: Config>(
 	controller: &T::AccountId,
 	ledger: &StakingLedger<T>
 ) {
@@ -117,6 +117,6 @@ The Balances module depends on the [`GenesisConfig`](https://docs.rs/pallet-bala
 
 ## Assumptions
 
-* Total issued balanced of all accounts should be less than `Trait::Balance::max_value()`.
+* Total issued balanced of all accounts should be less than `Config::Balance::max_value()`.
 
 License: Apache-2.0
\ No newline at end of file
diff --git a/frame/benchmarking/src/tests.rs b/frame/benchmarking/src/tests.rs
index 05a61ee83fbb..70359f2065ee 100644
--- a/frame/benchmarking/src/tests.rs
+++ b/frame/benchmarking/src/tests.rs
@@ -30,7 +30,7 @@ use frame_system::{RawOrigin, ensure_signed, ensure_none};
 
 decl_storage! {
 	trait Store for Module<T: Config> as Test where
-		<T as OtherTrait>::OtherEvent: Into<<T as Config>::Event>
+		<T as OtherConfig>::OtherEvent: Into<<T as Config>::Event>
 	{
 		Value get(fn value): Option<u32>;
 	}
@@ -38,7 +38,7 @@ decl_storage! {
 
 decl_module! {
 	pub struct Module<T: Config> for enum Call where
-		origin: T::Origin, <T as OtherTrait>::OtherEvent: Into<<T as Config>::Event>
+		origin: T::Origin, <T as OtherConfig>::OtherEvent: Into<<T as Config>::Event>
 	{
 		#[weight = 0]
 		fn set_value(origin, n: u32) -> DispatchResult {
@@ -59,11 +59,11 @@ impl_outer_origin! {
 	pub enum Origin for Test where system = frame_system {}
 }
 
-pub trait OtherTrait {
+pub trait OtherConfig {
 	type OtherEvent;
 }
 
-pub trait Config: frame_system::Config + OtherTrait
+pub trait Config: frame_system::Config + OtherConfig
 	where Self::OtherEvent: Into<<Self as Config>::Event>
 {
 	type Event;
@@ -104,7 +104,7 @@ impl Config for Test {
 	type Event = ();
 }
 
-impl OtherTrait for Test {
+impl OtherConfig for Test {
 	type OtherEvent = ();
 }
 
@@ -113,7 +113,7 @@ fn new_test_ext() -> sp_io::TestExternalities {
 }
 
 benchmarks!{
-	where_clause { where <T as OtherTrait>::OtherEvent: Into<<T as Config>::Event> }
+	where_clause { where <T as OtherConfig>::OtherEvent: Into<<T as Config>::Event> }
 
 	_ {
 		// Define a common range for `b`.
diff --git a/frame/contracts/README.md b/frame/contracts/README.md
index dddcc3c8b8b8..a6317d8aa246 100644
--- a/frame/contracts/README.md
+++ b/frame/contracts/README.md
@@ -2,7 +2,7 @@
 
 The Contract module provides functionality for the runtime to deploy and execute WebAssembly smart-contracts.
 
-- [`contract::Trait`](https://docs.rs/pallet-contracts/latest/pallet_contracts/trait.Trait.html)
+- [`contract::Config`](https://docs.rs/pallet-contracts/latest/pallet_contracts/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-contracts/latest/pallet_contracts/enum.Call.html)
 
 ## Overview
diff --git a/frame/democracy/README.md b/frame/democracy/README.md
index ffbf2f36a176..f2a8e5488dfe 100644
--- a/frame/democracy/README.md
+++ b/frame/democracy/README.md
@@ -1,6 +1,6 @@
 # Democracy Pallet
 
-- [`democracy::Trait`](https://docs.rs/pallet-democracy/latest/pallet_democracy/trait.Trait.html)
+- [`democracy::Config`](https://docs.rs/pallet-democracy/latest/pallet_democracy/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-democracy/latest/pallet_democracy/enum.Call.html)
 
 ## Overview
diff --git a/frame/elections-phragmen/README.md b/frame/elections-phragmen/README.md
index 5507d5397063..38f9ec7b6f32 100644
--- a/frame/elections-phragmen/README.md
+++ b/frame/elections-phragmen/README.md
@@ -60,7 +60,7 @@ being re-elected at the end of each round.
 
 ### Module Information
 
-- [`election_sp_phragmen::Trait`](https://docs.rs/pallet-elections-phragmen/latest/pallet_elections_phragmen/trait.Trait.html)
+- [`election_sp_phragmen::Config`](https://docs.rs/pallet-elections-phragmen/latest/pallet_elections_phragmen/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-elections-phragmen/latest/pallet_elections_phragmen/enum.Call.html)
 - [`Module`](https://docs.rs/pallet-elections-phragmen/latest/pallet_elections_phragmen/struct.Module.html)
 
diff --git a/frame/example-offchain-worker/README.md b/frame/example-offchain-worker/README.md
index a2a95a8cfb97..c036ec8fb19d 100644
--- a/frame/example-offchain-worker/README.md
+++ b/frame/example-offchain-worker/README.md
@@ -7,7 +7,7 @@ concepts, APIs and structures common to most offchain workers.
 Run `cargo doc --package pallet-example-offchain-worker --open` to view this module's
 documentation.
 
-- [`pallet_example_offchain_worker::Trait`](./trait.Trait.html)
+- [`pallet_example_offchain_worker::Config`](./trait.Config.html)
 - [`Call`](./enum.Call.html)
 - [`Module`](./struct.Module.html)
 
diff --git a/frame/example/README.md b/frame/example/README.md
index f1435a297b09..5748169bc777 100644
--- a/frame/example/README.md
+++ b/frame/example/README.md
@@ -46,7 +46,7 @@ Copy and paste this template from frame/example/src/lib.rs into file
 // Include the following links that shows what trait needs to be implemented to use the pallet
 // and the supported dispatchables that are documented in the Call enum.
 
-- \[`<INSERT_CUSTOM_PALLET_NAME>::Trait`](https://docs.rs/pallet-example/latest/pallet_example/trait.Trait.html)
+- \[`<INSERT_CUSTOM_PALLET_NAME>::Config`](https://docs.rs/pallet-example/latest/pallet_example/trait.Config.html)
 - \[`Call`](https://docs.rs/pallet-example/latest/pallet_example/enum.Call.html)
 - \[`Module`](https://docs.rs/pallet-example/latest/pallet_example/struct.Module.html)
 
@@ -195,7 +195,7 @@ Copy and paste this template from frame/example/src/lib.rs into file
 \```rust
 use <INSERT_CUSTOM_PALLET_NAME>;
 
-pub trait Trait: <INSERT_CUSTOM_PALLET_NAME>::Trait { }
+pub trait Config: <INSERT_CUSTOM_PALLET_NAME>::Config { }
 \```
 
 \### Simple Code Snippet
diff --git a/frame/identity/README.md b/frame/identity/README.md
index 8927febec6bb..412d67ca2b8d 100644
--- a/frame/identity/README.md
+++ b/frame/identity/README.md
@@ -1,6 +1,6 @@
 # Identity Module
 
-- [`identity::Trait`](https://docs.rs/pallet-identity/latest/pallet_identity/trait.Trait.html)
+- [`identity::Config`](https://docs.rs/pallet-identity/latest/pallet_identity/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-identity/latest/pallet_identity/enum.Call.html)
 
 ## Overview
@@ -51,6 +51,6 @@ no state-bloat attack is viable.
 * `kill_identity` - Forcibly remove the associated identity; the deposit is lost.
 
 [`Call`]: ./enum.Call.html
-[`Trait`]: ./trait.Trait.html
+[`Config`]: ./trait.Config.html
 
 License: Apache-2.0
\ No newline at end of file
diff --git a/frame/im-online/README.md b/frame/im-online/README.md
index 9a65bb6a9808..e0043970ac86 100644
--- a/frame/im-online/README.md
+++ b/frame/im-online/README.md
@@ -13,7 +13,7 @@ and includes the recent best block number of the local validators chain as well
 as the `NetworkState`.
 It is submitted as an Unsigned Transaction via off-chain workers.
 
-- [`im_online::Trait`](https://docs.rs/pallet-im-online/latest/pallet_im_online/trait.Trait.html)
+- [`im_online::Config`](https://docs.rs/pallet-im-online/latest/pallet_im_online/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-im-online/latest/pallet_im_online/enum.Call.html)
 - [`Module`](https://docs.rs/pallet-im-online/latest/pallet_im_online/struct.Module.html)
 
@@ -30,10 +30,10 @@ use frame_support::{decl_module, dispatch};
 use frame_system::ensure_signed;
 use pallet_im_online::{self as im_online};
 
-pub trait Trait: im_online::Trait {}
+pub trait Config: im_online::Config {}
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		#[weight = 0]
 		pub fn is_online(origin, authority_index: u32) -> dispatch::DispatchResult {
 			let _sender = ensure_signed(origin)?;
diff --git a/frame/multisig/README.md b/frame/multisig/README.md
index 2209e876f844..a0851f948d1c 100644
--- a/frame/multisig/README.md
+++ b/frame/multisig/README.md
@@ -1,7 +1,7 @@
 # Multisig Module
 A module for doing multisig dispatch.
 
-- [`multisig::Trait`](https://docs.rs/pallet-multisig/latest/pallet_multisig/trait.Trait.html)
+- [`multisig::Config`](https://docs.rs/pallet-multisig/latest/pallet_multisig/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-multisig/latest/pallet_multisig/enum.Call.html)
 
 ## Overview
@@ -24,6 +24,6 @@ not available or desired.
 * `cancel_as_multi` - Cancel a call from a composite origin.
 
 [`Call`]: ./enum.Call.html
-[`Trait`]: ./trait.Trait.html
+[`Config`]: ./trait.Config.html
 
 License: Apache-2.0
\ No newline at end of file
diff --git a/frame/nicks/README.md b/frame/nicks/README.md
index b4c88eff4315..fa6a3be0e4e9 100644
--- a/frame/nicks/README.md
+++ b/frame/nicks/README.md
@@ -1,6 +1,6 @@
 # Nicks Module
 
-- [`nicks::Trait`](https://docs.rs/pallet-nicks/latest/pallet_nicks/trait.Trait.html)
+- [`nicks::Config`](https://docs.rs/pallet-nicks/latest/pallet_nicks/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-nicks/latest/pallet_nicks/enum.Call.html)
 
 ## Overview
@@ -20,6 +20,6 @@ have not been designed to be economically secure. Do not use this pallet as-is i
 * `kill_name` - Forcibly remove the associated name; the deposit is lost.
 
 [`Call`]: ./enum.Call.html
-[`Trait`]: ./trait.Trait.html
+[`Config`]: ./trait.Config.html
 
 License: Apache-2.0
\ No newline at end of file
diff --git a/frame/offences/benchmarking/src/lib.rs b/frame/offences/benchmarking/src/lib.rs
index cdac46acb451..1d133c1b613b 100644
--- a/frame/offences/benchmarking/src/lib.rs
+++ b/frame/offences/benchmarking/src/lib.rs
@@ -24,22 +24,22 @@ mod mock;
 use sp_std::prelude::*;
 use sp_std::vec;
 
-use frame_system::{RawOrigin, Module as System, Config as SystemTrait};
+use frame_system::{RawOrigin, Module as System, Config as SystemConfig};
 use frame_benchmarking::{benchmarks, account};
 use frame_support::traits::{Currency, OnInitialize};
 
 use sp_runtime::{Perbill, traits::{Convert, StaticLookup, Saturating, UniqueSaturatedInto}};
 use sp_staking::offence::{ReportOffence, Offence, OffenceDetails};
 
-use pallet_balances::{Config as BalancesTrait};
+use pallet_balances::{Config as BalancesConfig};
 use pallet_babe::BabeEquivocationOffence;
 use pallet_grandpa::{GrandpaEquivocationOffence, GrandpaTimeSlot};
-use pallet_im_online::{Config as ImOnlineTrait, Module as ImOnline, UnresponsivenessOffence};
-use pallet_offences::{Config as OffencesTrait, Module as Offences};
-use pallet_session::historical::{Config as HistoricalTrait, IdentificationTuple};
-use pallet_session::{Config as SessionTrait, SessionManager};
+use pallet_im_online::{Config as ImOnlineConfig, Module as ImOnline, UnresponsivenessOffence};
+use pallet_offences::{Config as OffencesConfig, Module as Offences};
+use pallet_session::historical::{Config as HistoricalConfig, IdentificationTuple};
+use pallet_session::{Config as SessionConfig, SessionManager};
 use pallet_staking::{
-	Module as Staking, Config as StakingTrait, RewardDestination, ValidatorPrefs,
+	Module as Staking, Config as StakingConfig, RewardDestination, ValidatorPrefs,
 	Exposure, IndividualExposure, ElectionStatus, MAX_NOMINATIONS, Event as StakingEvent
 };
 
@@ -53,32 +53,32 @@ const MAX_DEFERRED_OFFENCES: u32 = 100;
 pub struct Module<T: Config>(Offences<T>);
 
 pub trait Config:
-	SessionTrait
-	+ StakingTrait
-	+ OffencesTrait
-	+ ImOnlineTrait
-	+ HistoricalTrait
-	+ BalancesTrait
+	SessionConfig
+	+ StakingConfig
+	+ OffencesConfig
+	+ ImOnlineConfig
+	+ HistoricalConfig
+	+ BalancesConfig
 	+ IdTupleConvert<Self>
 {}
 
 /// A helper trait to make sure we can convert `IdentificationTuple` coming from historical
 /// and the one required by offences.
-pub trait IdTupleConvert<T: HistoricalTrait + OffencesTrait> {
+pub trait IdTupleConvert<T: HistoricalConfig + OffencesConfig> {
 	/// Convert identification tuple from `historical` trait to the one expected by `offences`.
-	fn convert(id: IdentificationTuple<T>) -> <T as OffencesTrait>::IdentificationTuple;
+	fn convert(id: IdentificationTuple<T>) -> <T as OffencesConfig>::IdentificationTuple;
 }
 
-impl<T: HistoricalTrait + OffencesTrait> IdTupleConvert<T> for T where
-	<T as OffencesTrait>::IdentificationTuple: From<IdentificationTuple<T>>
+impl<T: HistoricalConfig + OffencesConfig> IdTupleConvert<T> for T where
+	<T as OffencesConfig>::IdentificationTuple: From<IdentificationTuple<T>>
 {
-	fn convert(id: IdentificationTuple<T>) -> <T as OffencesTrait>::IdentificationTuple {
+	fn convert(id: IdentificationTuple<T>) -> <T as OffencesConfig>::IdentificationTuple {
 		id.into()
 	}
 }
 
-type LookupSourceOf<T> = <<T as SystemTrait>::Lookup as StaticLookup>::Source;
-type BalanceOf<T> = <<T as StakingTrait>::Currency as Currency<<T as SystemTrait>::AccountId>>::Balance;
+type LookupSourceOf<T> = <<T as SystemConfig>::Lookup as StaticLookup>::Source;
+type BalanceOf<T> = <<T as StakingConfig>::Currency as Currency<<T as SystemConfig>::AccountId>>::Balance;
 
 struct Offender<T: Config> {
 	pub controller: T::AccountId,
@@ -165,10 +165,10 @@ fn make_offenders<T: Config>(num_offenders: u32, num_nominators: u32) -> Result<
 
 	let id_tuples = offenders.iter()
 		.map(|offender|
-			<T as SessionTrait>::ValidatorIdOf::convert(offender.controller.clone())
+			<T as SessionConfig>::ValidatorIdOf::convert(offender.controller.clone())
 				.expect("failed to get validator id from account id"))
 		.map(|validator_id|
-			<T as HistoricalTrait>::FullIdentificationOf::convert(validator_id.clone())
+			<T as HistoricalConfig>::FullIdentificationOf::convert(validator_id.clone())
 			.map(|full_id| (validator_id, full_id))
 			.expect("failed to convert validator id to full identification"))
 		.collect::<Vec<IdentificationTuple<T>>>();
@@ -176,7 +176,7 @@ fn make_offenders<T: Config>(num_offenders: u32, num_nominators: u32) -> Result<
 }
 
 #[cfg(test)]
-fn check_events<T: Config, I: Iterator<Item = <T as SystemTrait>::Event>>(expected: I) {
+fn check_events<T: Config, I: Iterator<Item = <T as SystemConfig>::Event>>(expected: I) {
 	let events = System::<T>::events() .into_iter()
 		.map(|frame_system::EventRecord { event, .. }| event).collect::<Vec<_>>();
 	let expected = expected.collect::<Vec<_>>();
@@ -235,7 +235,7 @@ benchmarks! {
 		};
 		assert_eq!(System::<T>::event_count(), 0);
 	}: {
-		let _ = <T as ImOnlineTrait>::ReportUnresponsiveness::report_offence(
+		let _ = <T as ImOnlineConfig>::ReportUnresponsiveness::report_offence(
 			reporters.clone(),
 			offence
 		);
@@ -250,14 +250,14 @@ benchmarks! {
 			.flat_map(|offender| {
 				core::iter::once(offender.stash).chain(offender.nominator_stashes.into_iter())
 			})
-			.map(|stash| <T as StakingTrait>::Event::from(
+			.map(|stash| <T as StakingConfig>::Event::from(
 				StakingEvent::<T>::Slash(stash, BalanceOf::<T>::from(slash_amount))
 			))
 			.collect::<Vec<_>>();
 		let reward_events = reporters.into_iter()
 			.flat_map(|reporter| vec![
 				frame_system::Event::<T>::NewAccount(reporter.clone()).into(),
-				<T as BalancesTrait>::Event::from(
+				<T as BalancesConfig>::Event::from(
 					pallet_balances::Event::<T>::Endowed(reporter, (reward_amount / r).into())
 				).into()
 			]);
@@ -272,7 +272,7 @@ benchmarks! {
 				.chain(slash_events.into_iter().map(Into::into))
 				.chain(reward_events)
 				.chain(slash_rest.into_iter().map(Into::into))
-				.chain(std::iter::once(<T as OffencesTrait>::Event::from(
+				.chain(std::iter::once(<T as OffencesConfig>::Event::from(
 					pallet_offences::Event::Offence(
 						UnresponsivenessOffence::<T>::ID,
 						0_u32.to_le_bytes().to_vec(),
diff --git a/frame/proxy/README.md b/frame/proxy/README.md
index 26969db63828..d85cfa7d0497 100644
--- a/frame/proxy/README.md
+++ b/frame/proxy/README.md
@@ -6,7 +6,7 @@ The accounts to which permission is delegated may be requied to announce the act
 wish to execute some duration prior to execution happens. In this case, the target account may
 reject the announcement and in doing so, veto the execution.
 
-- [`proxy::Trait`](https://docs.rs/pallet-proxy/latest/pallet_proxy/trait.Trait.html)
+- [`proxy::Config`](https://docs.rs/pallet-proxy/latest/pallet_proxy/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-proxy/latest/pallet_proxy/enum.Call.html)
 
 ## Overview
@@ -16,6 +16,6 @@ reject the announcement and in doing so, veto the execution.
 ### Dispatchable Functions
 
 [`Call`]: ./enum.Call.html
-[`Trait`]: ./trait.Trait.html
+[`Config`]: ./trait.Config.html
 
 License: Apache-2.0
\ No newline at end of file
diff --git a/frame/randomness-collective-flip/README.md b/frame/randomness-collective-flip/README.md
index 2af18d3d2f7b..9885c734d9fa 100644
--- a/frame/randomness-collective-flip/README.md
+++ b/frame/randomness-collective-flip/README.md
@@ -22,10 +22,10 @@ the system trait.
 ```rust
 use frame_support::{decl_module, dispatch, traits::Randomness};
 
-pub trait Trait: frame_system::Trait {}
+pub trait Config: frame_system::Config {}
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		#[weight = 0]
 		pub fn random_module_example(origin) -> dispatch::DispatchResult {
 			let _random_value = <pallet_randomness_collective_flip::Module<T>>::random(&b"my context"[..]);
diff --git a/frame/recovery/README.md b/frame/recovery/README.md
index b6d3ae5aceeb..ff990bc97c93 100644
--- a/frame/recovery/README.md
+++ b/frame/recovery/README.md
@@ -1,6 +1,6 @@
 # Recovery Pallet
 
-- [`recovery::Trait`](https://docs.rs/pallet-recovery/latest/pallet_recovery/trait.Trait.html)
+- [`recovery::Config`](https://docs.rs/pallet-recovery/latest/pallet_recovery/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-recovery/latest/pallet_recovery/enum.Call.html)
 
 ## Overview
diff --git a/frame/scheduler/README.md b/frame/scheduler/README.md
index 47beb71e3a0d..fb08297846ce 100644
--- a/frame/scheduler/README.md
+++ b/frame/scheduler/README.md
@@ -1,7 +1,7 @@
 # Scheduler
 A module for scheduling dispatches.
 
-- [`scheduler::Trait`](https://docs.rs/pallet-scheduler/latest/pallet_scheduler/trait.Trait.html)
+- [`scheduler::Config`](https://docs.rs/pallet-scheduler/latest/pallet_scheduler/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-scheduler/latest/pallet_scheduler/enum.Call.html)
 - [`Module`](https://docs.rs/pallet-scheduler/latest/pallet_scheduler/struct.Module.html)
 
@@ -12,7 +12,7 @@ specified block number or at a specified period. These scheduled dispatches
 may be named or anonymous and may be canceled.
 
 **NOTE:** The scheduled calls will be dispatched with the default filter
-for the origin: namely `frame_system::Trait::BaseCallFilter` for all origin
+for the origin: namely `frame_system::Config::BaseCallFilter` for all origin
 except root which will get no filter. And not the filter contained in origin
 use to call `fn schedule`.
 
diff --git a/frame/scored-pool/README.md b/frame/scored-pool/README.md
index 948d5b497721..85d200035800 100644
--- a/frame/scored-pool/README.md
+++ b/frame/scored-pool/README.md
@@ -20,7 +20,7 @@ time. If an entity is currently a member, this results in removal
 from the `Pool` and `Members`; the entity is immediately replaced
 by the next highest scoring candidate in the pool, if available.
 
-- [`scored_pool::Trait`](https://docs.rs/pallet-scored-pool/latest/pallet_scored_pool/trait.Trait.html)
+- [`scored_pool::Config`](https://docs.rs/pallet-scored-pool/latest/pallet_scored_pool/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-scored-pool/latest/pallet_scored_pool/enum.Call.html)
 - [`Module`](https://docs.rs/pallet-scored-pool/latest/pallet_scored_pool/struct.Module.html)
 
@@ -41,10 +41,10 @@ use frame_support::{decl_module, dispatch};
 use frame_system::ensure_signed;
 use pallet_scored_pool::{self as scored_pool};
 
-pub trait Trait: scored_pool::Trait {}
+pub trait Config: scored_pool::Config {}
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		#[weight = 0]
 		pub fn candidate(origin) -> dispatch::DispatchResult {
 			let who = ensure_signed(origin)?;
diff --git a/frame/session/README.md b/frame/session/README.md
index 60da8958f73d..f955268c21b2 100644
--- a/frame/session/README.md
+++ b/frame/session/README.md
@@ -3,7 +3,7 @@
 The Session module allows validators to manage their session keys, provides a function for changing
 the session length, and handles session rotation.
 
-- [`session::Trait`](https://docs.rs/pallet-session/latest/pallet_session/trait.Trait.html)
+- [`session::Config`](https://docs.rs/pallet-session/latest/pallet_session/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-session/latest/pallet_session/enum.Call.html)
 - [`Module`](https://docs.rs/pallet-session/latest/pallet_session/struct.Module.html)
 
@@ -71,7 +71,7 @@ The [Staking pallet](https://docs.rs/pallet-staking/latest/pallet_staking/) uses
 ```rust
 use pallet_session as session;
 
-fn validators<T: pallet_session::Trait>() -> Vec<<T as pallet_session::Trait>::ValidatorId> {
+fn validators<T: pallet_session::Config>() -> Vec<<T as pallet_session::Config>::ValidatorId> {
 	<pallet_session::Module<T>>::validators()
 }
 ```
diff --git a/frame/session/src/historical/offchain.rs b/frame/session/src/historical/offchain.rs
index 616cdede254e..9bb20ababb3a 100644
--- a/frame/session/src/historical/offchain.rs
+++ b/frame/session/src/historical/offchain.rs
@@ -189,12 +189,12 @@ mod tests {
 	#[test]
 	fn encode_decode_roundtrip() {
 		use codec::{Decode, Encode};
-		use super::super::super::Config as SessionTrait;
-		use super::super::Config as HistoricalTrait;
+		use super::super::super::Config as SessionConfig;
+		use super::super::Config as HistoricalConfig;
 
 		let sample = (
-				22u32 as <Test as SessionTrait>::ValidatorId,
-				7_777_777 as <Test as HistoricalTrait>::FullIdentification);
+				22u32 as <Test as SessionConfig>::ValidatorId,
+				7_777_777 as <Test as HistoricalConfig>::FullIdentification);
 
 		let encoded = sample.encode();
 		let decoded = Decode::decode(&mut encoded.as_slice()).expect("Must decode");
diff --git a/frame/session/src/historical/onchain.rs b/frame/session/src/historical/onchain.rs
index dd6c9de9b58b..f4576675c118 100644
--- a/frame/session/src/historical/onchain.rs
+++ b/frame/session/src/historical/onchain.rs
@@ -20,9 +20,9 @@
 use codec::Encode;
 use sp_runtime::traits::Convert;
 
-use super::super::Config as SessionTrait;
+use super::super::Config as SessionConfig;
 use super::super::{Module as SessionModule, SessionIndex};
-use super::Config as HistoricalTrait;
+use super::Config as HistoricalConfig;
 
 use super::shared;
 use sp_std::prelude::*;
@@ -35,14 +35,14 @@ use sp_std::prelude::*;
 /// `on_initialize(..)` or `on_finalization(..)`.
 /// **Must** be called during the session, which validator-set is to be stored for further
 /// off-chain processing. Otherwise the `FullIdentification` might not be available.
-pub fn store_session_validator_set_to_offchain<T: HistoricalTrait + SessionTrait>(
+pub fn store_session_validator_set_to_offchain<T: HistoricalConfig + SessionConfig>(
 	session_index: SessionIndex,
 ) {
 	let encoded_validator_list = <SessionModule<T>>::validators()
 		.into_iter()
-		.filter_map(|validator_id: <T as SessionTrait>::ValidatorId| {
+		.filter_map(|validator_id: <T as SessionConfig>::ValidatorId| {
 			let full_identification =
-				<<T as HistoricalTrait>::FullIdentificationOf>::convert(validator_id.clone());
+				<<T as HistoricalConfig>::FullIdentificationOf>::convert(validator_id.clone());
 			full_identification.map(|full_identification| (validator_id, full_identification))
 		})
 		.collect::<Vec<_>>();
@@ -57,6 +57,6 @@ pub fn store_session_validator_set_to_offchain<T: HistoricalTrait + SessionTrait
 ///
 /// See [`fn store_session_validator_set_...(..)`](Self::store_session_validator_set_to_offchain)
 /// for further information and restrictions.
-pub fn store_current_session_validator_set_to_offchain<T: HistoricalTrait + SessionTrait>() {
+pub fn store_current_session_validator_set_to_offchain<T: HistoricalConfig + SessionConfig>() {
 	store_session_validator_set_to_offchain::<T>(<SessionModule<T>>::current_index());
 }
diff --git a/frame/society/README.md b/frame/society/README.md
index 372dfe1f048e..f68aeb73d42d 100644
--- a/frame/society/README.md
+++ b/frame/society/README.md
@@ -1,6 +1,6 @@
 # Society Module
 
-- [`society::Trait`](https://docs.rs/pallet-society/latest/pallet_society/trait.Trait.html)
+- [`society::Config`](https://docs.rs/pallet-society/latest/pallet_society/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-society/latest/pallet_society/enum.Call.html)
 
 ## Overview
diff --git a/frame/staking/README.md b/frame/staking/README.md
index 78474ee84221..d073818d6496 100644
--- a/frame/staking/README.md
+++ b/frame/staking/README.md
@@ -2,7 +2,7 @@
 
 The Staking module is used to manage funds at stake by network maintainers.
 
-- [`staking::Trait`](https://docs.rs/pallet-staking/latest/pallet_staking/trait.Trait.html)
+- [`staking::Config`](https://docs.rs/pallet-staking/latest/pallet_staking/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html)
 - [`Module`](https://docs.rs/pallet-staking/latest/pallet_staking/struct.Module.html)
 
@@ -90,7 +90,7 @@ valid behavior_ while _punishing any misbehavior or lack of availability_.
 
 Rewards must be claimed for each era before it gets too old by `$HISTORY_DEPTH` using the
 `payout_stakers` call. Any account can call `payout_stakers`, which pays the reward to the
-validator as well as its nominators. Only the [`Trait::MaxNominatorRewardedPerValidator`]
+validator as well as its nominators. Only the [`Config::MaxNominatorRewardedPerValidator`]
 biggest stakers can claim their reward. This is to limit the i/o cost to mutate storage for each
 nominator's account.
 
@@ -137,10 +137,10 @@ use frame_support::{decl_module, dispatch};
 use frame_system::ensure_signed;
 use pallet_staking::{self as staking};
 
-pub trait Trait: staking::Trait {}
+pub trait Config: staking::Config {}
 
 decl_module! {
-    pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+    pub struct Module<T: Config> for enum Call where origin: T::Origin {
         /// Reward a validator.
         #[weight = 0]
         pub fn reward_myself(origin) -> dispatch::DispatchResult {
@@ -157,7 +157,7 @@ decl_module! {
 ### Era payout
 
 The era payout is computed using yearly inflation curve defined at
-[`T::RewardCurve`](https://docs.rs/pallet-staking/latest/pallet_staking/trait.Trait.html#associatedtype.RewardCurve) as such:
+[`T::RewardCurve`](https://docs.rs/pallet-staking/latest/pallet_staking/trait.Config.html#associatedtype.RewardCurve) as such:
 
 ```nocompile
 staker_payout = yearly_inflation(npos_token_staked / total_tokens) * total_tokens / era_per_year
@@ -168,7 +168,7 @@ This payout is used to reward stakers as defined in next section
 remaining_payout = max_yearly_inflation * total_tokens / era_per_year - staker_payout
 ```
 The remaining reward is send to the configurable end-point
-[`T::RewardRemainder`](https://docs.rs/pallet-staking/latest/pallet_staking/trait.Trait.html#associatedtype.RewardRemainder).
+[`T::RewardRemainder`](https://docs.rs/pallet-staking/latest/pallet_staking/trait.Config.html#associatedtype.RewardRemainder).
 
 ### Reward Calculation
 
@@ -214,7 +214,7 @@ Any funds already placed into stash can be the target of the following operation
 
 The controller account can free a portion (or all) of the funds using the
 [`unbond`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.unbond) call. Note that the funds are not immediately
-accessible. Instead, a duration denoted by [`BondingDuration`](https://docs.rs/pallet-staking/latest/pallet_staking/trait.Trait.html#associatedtype.BondingDuration)
+accessible. Instead, a duration denoted by [`BondingDuration`](https://docs.rs/pallet-staking/latest/pallet_staking/trait.Config.html#associatedtype.BondingDuration)
 (in number of eras) must pass until the funds can actually be removed. Once the
 `BondingDuration` is over, the [`withdraw_unbonded`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.withdraw_unbonded)
 call can be used to actually withdraw the funds.
diff --git a/frame/sudo/README.md b/frame/sudo/README.md
index 233727ac1bd2..8ac0264d4583 100644
--- a/frame/sudo/README.md
+++ b/frame/sudo/README.md
@@ -1,6 +1,6 @@
 # Sudo Module
 
-- [`sudo::Trait`](https://docs.rs/pallet-sudo/latest/pallet_sudo/trait.Trait.html)
+- [`sudo::Config`](https://docs.rs/pallet-sudo/latest/pallet_sudo/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-sudo/latest/pallet_sudo/enum.Call.html)
 
 ## Overview
@@ -38,10 +38,10 @@ This is an example of a module that exposes a privileged function:
 use frame_support::{decl_module, dispatch};
 use frame_system::ensure_root;
 
-pub trait Trait: frame_system::Trait {}
+pub trait Config: frame_system::Config {}
 
 decl_module! {
-    pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+    pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		#[weight = 0]
         pub fn privileged_function(origin) -> dispatch::DispatchResult {
             ensure_root(origin)?;
@@ -64,7 +64,7 @@ You need to set an initial superuser account as the sudo `key`.
 * [Democracy](https://docs.rs/pallet-democracy/latest/pallet_democracy/)
 
 [`Call`]: ./enum.Call.html
-[`Trait`]: ./trait.Trait.html
+[`Config`]: ./trait.Config.html
 [`Origin`]: https://docs.substrate.dev/docs/substrate-types
 
 License: Apache-2.0
\ No newline at end of file
diff --git a/frame/system/README.md b/frame/system/README.md
index adfa7aa35ddd..b2ff4009dfa8 100644
--- a/frame/system/README.md
+++ b/frame/system/README.md
@@ -3,7 +3,7 @@
 The System module provides low-level access to core types and cross-cutting utilities.
 It acts as the base layer for other pallets to interact with the Substrate framework components.
 
-- [`system::Trait`](https://docs.rs/frame-system/latest/frame_system/trait.Trait.html)
+- [`system::Config`](https://docs.rs/frame-system/latest/frame_system/trait.Config.html)
 
 ## Overview
 
@@ -57,10 +57,10 @@ Import the System module and derive your module's configuration trait from the s
 use frame_support::{decl_module, dispatch};
 use frame_system::{self as system, ensure_signed};
 
-pub trait Trait: system::Trait {}
+pub trait Config: system::Config {}
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		#[weight = 0]
 		pub fn system_module_example(origin) -> dispatch::DispatchResult {
 			let _sender = ensure_signed(origin)?;
diff --git a/frame/timestamp/README.md b/frame/timestamp/README.md
index 54ef7fa43b4f..6ba033054391 100644
--- a/frame/timestamp/README.md
+++ b/frame/timestamp/README.md
@@ -2,7 +2,7 @@
 
 The Timestamp module provides functionality to get and set the on-chain time.
 
-- [`timestamp::Trait`](https://docs.rs/pallet-timestamp/latest/pallet_timestamp/trait.Trait.html)
+- [`timestamp::Config`](https://docs.rs/pallet-timestamp/latest/pallet_timestamp/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-timestamp/latest/pallet_timestamp/enum.Call.html)
 - [`Module`](https://docs.rs/pallet-timestamp/latest/pallet_timestamp/struct.Module.html)
 
@@ -29,7 +29,7 @@ because of cumulative calculation errors and hence should be avoided.
 * `get` - Gets the current time for the current block. If this function is called prior to
 setting the timestamp, it will return the timestamp of the previous block.
 
-### Trait Getters
+### Config Getters
 
 * `MinimumPeriod` - Gets the minimum (and advised) period between blocks for the chain.
 
@@ -48,10 +48,10 @@ trait from the timestamp trait.
 use frame_support::{decl_module, dispatch};
 use frame_system::ensure_signed;
 
-pub trait Trait: timestamp::Trait {}
+pub trait Config: timestamp::Config {}
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		#[weight = 0]
 		pub fn get_time(origin) -> dispatch::DispatchResult {
 			let _sender = ensure_signed(origin)?;
diff --git a/frame/transaction-payment/README.md b/frame/transaction-payment/README.md
index 10ad9579e92b..7e95677a1b27 100644
--- a/frame/transaction-payment/README.md
+++ b/frame/transaction-payment/README.md
@@ -8,9 +8,9 @@ transaction to be included. This includes:
     chance to be included by the transaction queue.
 
 Additionally, this module allows one to configure:
-  - The mapping between one unit of weight to one unit of fee via [`Trait::WeightToFee`].
+  - The mapping between one unit of weight to one unit of fee via [`Config::WeightToFee`].
   - A means of updating the fee for the next block, via defining a multiplier, based on the
     final state of the chain at the end of the previous block. This can be configured via
-    [`Trait::FeeMultiplierUpdate`]
+    [`Config::FeeMultiplierUpdate`]
 
 License: Apache-2.0
\ No newline at end of file
diff --git a/frame/treasury/README.md b/frame/treasury/README.md
index 424b8e0eedf9..b316e604f4a3 100644
--- a/frame/treasury/README.md
+++ b/frame/treasury/README.md
@@ -3,7 +3,7 @@
 The Treasury module provides a "pot" of funds that can be managed by stakeholders in the
 system and a structure for making spending proposals from this pot.
 
-- [`treasury::Trait`](https://docs.rs/pallet-treasury/latest/pallet_treasury/trait.Trait.html)
+- [`treasury::Config`](https://docs.rs/pallet-treasury/latest/pallet_treasury/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-treasury/latest/pallet_treasury/enum.Call.html)
 
 ## Overview
@@ -21,7 +21,7 @@ A separate subsystem exists to allow for an agile "tipping" process, whereby a r
 given without first having a pre-determined stakeholder group come to consensus on how much
 should be paid.
 
-A group of `Tippers` is determined through the config `Trait`. After half of these have declared
+A group of `Tippers` is determined through the config `Config`. After half of these have declared
 some amount that they believe a particular reported reason deserves, then a countdown period is
 entered where any remaining members can declare their tip amounts also. After the close of the
 countdown period, the median of all declared tips is paid to the reported beneficiary, along
diff --git a/frame/utility/README.md b/frame/utility/README.md
index 396396929118..df874ec11062 100644
--- a/frame/utility/README.md
+++ b/frame/utility/README.md
@@ -1,7 +1,7 @@
 # Utility Module
 A stateless module with helpers for dispatch management which does no re-authentication.
 
-- [`utility::Trait`](https://docs.rs/pallet-utility/latest/pallet_utility/trait.Trait.html)
+- [`utility::Config`](https://docs.rs/pallet-utility/latest/pallet_utility/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-utility/latest/pallet_utility/enum.Call.html)
 
 ## Overview
@@ -33,6 +33,6 @@ filtered by any proxy.
 * `as_derivative` - Dispatch a call from a derivative signed origin.
 
 [`Call`]: ./enum.Call.html
-[`Trait`]: ./trait.Trait.html
+[`Config`]: ./trait.Config.html
 
 License: Apache-2.0
\ No newline at end of file
diff --git a/frame/vesting/README.md b/frame/vesting/README.md
index 921fa94a1a2a..59bfdfcedd08 100644
--- a/frame/vesting/README.md
+++ b/frame/vesting/README.md
@@ -1,6 +1,6 @@
 # Vesting Module
 
-- [`vesting::Trait`](https://docs.rs/pallet-vesting/latest/pallet_vesting/trait.Trait.html)
+- [`vesting::Config`](https://docs.rs/pallet-vesting/latest/pallet_vesting/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-vesting/latest/pallet_vesting/enum.Call.html)
 
 ## Overview
@@ -26,6 +26,6 @@ This module implements the `VestingSchedule` trait.
   "vested" so far.
 
 [`Call`]: ./enum.Call.html
-[`Trait`]: ./trait.Trait.html
+[`Config`]: ./trait.Config.html
 
 License: Apache-2.0
\ No newline at end of file
diff --git a/primitives/api/proc-macro/src/impl_runtime_apis.rs b/primitives/api/proc-macro/src/impl_runtime_apis.rs
index 5839618e3733..85f5a1797b1e 100644
--- a/primitives/api/proc-macro/src/impl_runtime_apis.rs
+++ b/primitives/api/proc-macro/src/impl_runtime_apis.rs
@@ -410,7 +410,7 @@ fn extend_with_runtime_decl_path(mut trait_: Path) -> Path {
 			.segments
 			.last()
 			.as_ref()
-			.expect("Config path should always contain at least one item; qed")
+			.expect("Trait path should always contain at least one item; qed")
 			.ident;
 
 		generate_runtime_mod_name_for_trait(trait_name)
diff --git a/utils/frame/benchmarking-cli/src/template.hbs b/utils/frame/benchmarking-cli/src/template.hbs
index fd066b1a3a8a..c76eaad22c96 100644
--- a/utils/frame/benchmarking-cli/src/template.hbs
+++ b/utils/frame/benchmarking-cli/src/template.hbs
@@ -18,7 +18,7 @@ use sp_std::marker::PhantomData;
 
 /// Weight functions for {{pallet}}.
 pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Trait> {{pallet}}::WeightInfo for WeightInfo<T> {
+impl<T: frame_system::Config> {{pallet}}::WeightInfo for WeightInfo<T> {
 	{{~#each benchmarks as |benchmark|}}
 	fn {{benchmark.name~}}
 	(

From dcf6a3ae9587bdf27a58eeff4bad8628c4763b38 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Mon, 30 Nov 2020 14:01:18 -0800
Subject: [PATCH 0126/1194] Fix CI Link Check (#7639)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix trigger fingers

* more

* Update frame/example-offchain-worker/README.md

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
---
 frame/assets/README.md                  |  6 +++---
 frame/atomic-swap/README.md             |  4 ++--
 frame/aura/README.md                    |  4 ++--
 frame/balances/README.md                |  4 ++--
 frame/contracts/README.md               |  4 ++--
 frame/democracy/README.md               |  4 ++--
 frame/elections-phragmen/README.md      |  4 ++--
 frame/example-offchain-worker/README.md |  4 ++--
 frame/example/README.md                 |  4 ++--
 frame/identity/README.md                |  4 ++--
 frame/im-online/README.md               |  4 ++--
 frame/multisig/README.md                |  4 ++--
 frame/nicks/README.md                   |  4 ++--
 frame/proxy/README.md                   |  4 ++--
 frame/recovery/README.md                |  4 ++--
 frame/scheduler/README.md               |  4 ++--
 frame/scored-pool/README.md             |  4 ++--
 frame/session/README.md                 |  4 ++--
 frame/society/README.md                 |  4 ++--
 frame/staking/README.md                 | 10 +++++-----
 frame/sudo/README.md                    |  4 ++--
 frame/system/README.md                  |  4 ++--
 frame/timestamp/README.md               |  4 ++--
 frame/treasury/README.md                |  4 ++--
 frame/utility/README.md                 |  4 ++--
 frame/vesting/README.md                 |  4 ++--
 26 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/frame/assets/README.md b/frame/assets/README.md
index 804856f90d09..44c4eedc31be 100644
--- a/frame/assets/README.md
+++ b/frame/assets/README.md
@@ -11,9 +11,9 @@ with a fixed supply, including:
 * Asset Transfer
 * Asset Destruction
 
-To use it in your runtime, you need to implement the assets [`Config`](https://docs.rs/pallet-assets/latest/pallet_assets/trait.Config.html).
+To use it in your runtime, you need to implement the assets [`assets::Trait`](https://docs.rs/pallet-assets/latest/pallet_assets/trait.Trait.html).
 
-The supported dispatchable functions are documented in the [`Call`](https://docs.rs/pallet-assets/latest/pallet_assets/enum.Call.html) enum.
+The supported dispatchable functions are documented in the [`assets::Call`](https://docs.rs/pallet-assets/latest/pallet_assets/enum.Call.html) enum.
 
 ### Terminology
 
@@ -113,4 +113,4 @@ them are violated, the behavior of this module is undefined.
 * [`System`](https://docs.rs/frame-system/latest/frame_system/)
 * [`Support`](https://docs.rs/frame-support/latest/frame_support/)
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/frame/atomic-swap/README.md b/frame/atomic-swap/README.md
index eeac282f1d56..5dd502095d79 100644
--- a/frame/atomic-swap/README.md
+++ b/frame/atomic-swap/README.md
@@ -2,7 +2,7 @@
 
 A module for atomically sending funds.
 
-- [`atomic_swap::Config`](https://docs.rs/pallet-atomic-swap/latest/pallet_atomic_swap/trait.Config.html)
+- [`atomic_swap::Trait`](https://docs.rs/pallet-atomic-swap/latest/pallet_atomic_swap/trait.Trait.html)
 - [`Call`](https://docs.rs/pallet-atomic-swap/latest/pallet_atomic_swap/enum.Call.html)
 - [`Module`](https://docs.rs/pallet-atomic-swap/latest/pallet_atomic_swap/struct.Module.html)
 
@@ -20,4 +20,4 @@ claimed within a specified duration of time, the sender may cancel it.
 * `claim_swap` - called by the target to approve a swap
 * `cancel_swap` - may be called by a sender after a specified duration
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/frame/aura/README.md b/frame/aura/README.md
index 253e0d3651c6..73ed986dd734 100644
--- a/frame/aura/README.md
+++ b/frame/aura/README.md
@@ -1,6 +1,6 @@
 # Aura Module
 
-- [`aura::Config`](https://docs.rs/pallet-aura/latest/pallet_aura/trait.Config.html)
+- [`aura::Trait`](https://docs.rs/pallet-aura/latest/pallet_aura/trait.Trait.html)
 - [`Module`](https://docs.rs/pallet-aura/latest/pallet_aura/struct.Module.html)
 
 ## Overview
@@ -25,4 +25,4 @@ If you're interested in hacking on this module, it is useful to understand the i
 [`ProvideInherent`](https://docs.rs/sp-inherents/latest/sp_inherents/trait.ProvideInherent.html) and
 [`ProvideInherentData`](https://docs.rs/sp-inherents/latest/sp_inherents/trait.ProvideInherentData.html) to create and check inherents.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/frame/balances/README.md b/frame/balances/README.md
index 9a2f3c394c94..cbbfea75e684 100644
--- a/frame/balances/README.md
+++ b/frame/balances/README.md
@@ -2,7 +2,7 @@
 
 The Balances module provides functionality for handling accounts and balances.
 
-- [`balances::Config`](https://docs.rs/pallet-balances/latest/pallet_balances/trait.Config.html)
+- [`balances::Trait`](https://docs.rs/pallet-balances/latest/pallet_balances/trait.Trait.html)
 - [`Call`](https://docs.rs/pallet-balances/latest/pallet_balances/enum.Call.html)
 - [`Module`](https://docs.rs/pallet-balances/latest/pallet_balances/struct.Module.html)
 
@@ -119,4 +119,4 @@ The Balances module depends on the [`GenesisConfig`](https://docs.rs/pallet-bala
 
 * Total issued balanced of all accounts should be less than `Config::Balance::max_value()`.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/frame/contracts/README.md b/frame/contracts/README.md
index a6317d8aa246..4252bfc1d843 100644
--- a/frame/contracts/README.md
+++ b/frame/contracts/README.md
@@ -2,7 +2,7 @@
 
 The Contract module provides functionality for the runtime to deploy and execute WebAssembly smart-contracts.
 
-- [`contract::Config`](https://docs.rs/pallet-contracts/latest/pallet_contracts/trait.Config.html)
+- [`contract::Trait`](https://docs.rs/pallet-contracts/latest/pallet_contracts/trait.Trait.html)
 - [`Call`](https://docs.rs/pallet-contracts/latest/pallet_contracts/enum.Call.html)
 
 ## Overview
@@ -61,4 +61,4 @@ WebAssembly based smart contracts in the Rust programming language. This is a wo
 
 * [Balances](https://docs.rs/pallet-balances/latest/pallet_balances/)
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/frame/democracy/README.md b/frame/democracy/README.md
index f2a8e5488dfe..6a390cc048e1 100644
--- a/frame/democracy/README.md
+++ b/frame/democracy/README.md
@@ -1,6 +1,6 @@
 # Democracy Pallet
 
-- [`democracy::Config`](https://docs.rs/pallet-democracy/latest/pallet_democracy/trait.Config.html)
+- [`democracy::Trait`](https://docs.rs/pallet-democracy/latest/pallet_democracy/trait.Trait.html)
 - [`Call`](https://docs.rs/pallet-democracy/latest/pallet_democracy/enum.Call.html)
 
 ## Overview
@@ -132,4 +132,4 @@ This call can only be made by the `VetoOrigin`.
 - `cancel_queued` - Cancels a proposal that is queued for enactment.
 - `clear_public_proposal` - Removes all public proposals.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/frame/elections-phragmen/README.md b/frame/elections-phragmen/README.md
index 38f9ec7b6f32..8c5940ea2d78 100644
--- a/frame/elections-phragmen/README.md
+++ b/frame/elections-phragmen/README.md
@@ -60,8 +60,8 @@ being re-elected at the end of each round.
 
 ### Module Information
 
-- [`election_sp_phragmen::Config`](https://docs.rs/pallet-elections-phragmen/latest/pallet_elections_phragmen/trait.Config.html)
+- [`election_sp_phragmen::Trait`](https://docs.rs/pallet-elections-phragmen/latest/pallet_elections_phragmen/trait.Trait.html)
 - [`Call`](https://docs.rs/pallet-elections-phragmen/latest/pallet_elections_phragmen/enum.Call.html)
 - [`Module`](https://docs.rs/pallet-elections-phragmen/latest/pallet_elections_phragmen/struct.Module.html)
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/frame/example-offchain-worker/README.md b/frame/example-offchain-worker/README.md
index c036ec8fb19d..5299027f3925 100644
--- a/frame/example-offchain-worker/README.md
+++ b/frame/example-offchain-worker/README.md
@@ -7,7 +7,7 @@ concepts, APIs and structures common to most offchain workers.
 Run `cargo doc --package pallet-example-offchain-worker --open` to view this module's
 documentation.
 
-- [`pallet_example_offchain_worker::Config`](./trait.Config.html)
+- [`pallet_example_offchain_worker::Trait`](./trait.Trait.html)
 - [`Call`](./enum.Call.html)
 - [`Module`](./struct.Module.html)
 
@@ -24,4 +24,4 @@ Additional logic in OCW is put in place to prevent spamming the network with bot
 and unsigned transactions, and custom `UnsignedValidator` makes sure that there is only
 one unsigned transaction floating in the network.
 
-License: Unlicense
\ No newline at end of file
+License: Unlicense
diff --git a/frame/example/README.md b/frame/example/README.md
index 5748169bc777..46a0d076a969 100644
--- a/frame/example/README.md
+++ b/frame/example/README.md
@@ -46,7 +46,7 @@ Copy and paste this template from frame/example/src/lib.rs into file
 // Include the following links that shows what trait needs to be implemented to use the pallet
 // and the supported dispatchables that are documented in the Call enum.
 
-- \[`<INSERT_CUSTOM_PALLET_NAME>::Config`](https://docs.rs/pallet-example/latest/pallet_example/trait.Config.html)
+- \[`<INSERT_CUSTOM_PALLET_NAME>::Trait`](https://docs.rs/pallet-example/latest/pallet_example/trait.Trait.html)
 - \[`Call`](https://docs.rs/pallet-example/latest/pallet_example/enum.Call.html)
 - \[`Module`](https://docs.rs/pallet-example/latest/pallet_example/struct.Module.html)
 
@@ -235,4 +235,4 @@ pub trait Config: <INSERT_CUSTOM_PALLET_NAME>::Config { }
 // that the implementation is based on.
 </pre></p></details>
 
-License: Unlicense
\ No newline at end of file
+License: Unlicense
diff --git a/frame/identity/README.md b/frame/identity/README.md
index 412d67ca2b8d..38e16d4dd490 100644
--- a/frame/identity/README.md
+++ b/frame/identity/README.md
@@ -1,6 +1,6 @@
 # Identity Module
 
-- [`identity::Config`](https://docs.rs/pallet-identity/latest/pallet_identity/trait.Config.html)
+- [`identity::Trait`](https://docs.rs/pallet-identity/latest/pallet_identity/trait.Trait.html)
 - [`Call`](https://docs.rs/pallet-identity/latest/pallet_identity/enum.Call.html)
 
 ## Overview
@@ -53,4 +53,4 @@ no state-bloat attack is viable.
 [`Call`]: ./enum.Call.html
 [`Config`]: ./trait.Config.html
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/frame/im-online/README.md b/frame/im-online/README.md
index e0043970ac86..a2ed5edc906a 100644
--- a/frame/im-online/README.md
+++ b/frame/im-online/README.md
@@ -13,7 +13,7 @@ and includes the recent best block number of the local validators chain as well
 as the `NetworkState`.
 It is submitted as an Unsigned Transaction via off-chain workers.
 
-- [`im_online::Config`](https://docs.rs/pallet-im-online/latest/pallet_im_online/trait.Config.html)
+- [`im_online::Trait`](https://docs.rs/pallet-im-online/latest/pallet_im_online/trait.Trait.html)
 - [`Call`](https://docs.rs/pallet-im-online/latest/pallet_im_online/enum.Call.html)
 - [`Module`](https://docs.rs/pallet-im-online/latest/pallet_im_online/struct.Module.html)
 
@@ -48,4 +48,4 @@ decl_module! {
 
 This module depends on the [Session module](https://docs.rs/pallet-session/latest/pallet_session/).
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/frame/multisig/README.md b/frame/multisig/README.md
index a0851f948d1c..a18ef74163d0 100644
--- a/frame/multisig/README.md
+++ b/frame/multisig/README.md
@@ -1,7 +1,7 @@
 # Multisig Module
 A module for doing multisig dispatch.
 
-- [`multisig::Config`](https://docs.rs/pallet-multisig/latest/pallet_multisig/trait.Config.html)
+- [`multisig::Trait`](https://docs.rs/pallet-multisig/latest/pallet_multisig/trait.Trait.html)
 - [`Call`](https://docs.rs/pallet-multisig/latest/pallet_multisig/enum.Call.html)
 
 ## Overview
@@ -26,4 +26,4 @@ not available or desired.
 [`Call`]: ./enum.Call.html
 [`Config`]: ./trait.Config.html
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/frame/nicks/README.md b/frame/nicks/README.md
index fa6a3be0e4e9..766108470bed 100644
--- a/frame/nicks/README.md
+++ b/frame/nicks/README.md
@@ -1,6 +1,6 @@
 # Nicks Module
 
-- [`nicks::Config`](https://docs.rs/pallet-nicks/latest/pallet_nicks/trait.Config.html)
+- [`nicks::Trait`](https://docs.rs/pallet-nicks/latest/pallet_nicks/trait.Trait.html)
 - [`Call`](https://docs.rs/pallet-nicks/latest/pallet_nicks/enum.Call.html)
 
 ## Overview
@@ -22,4 +22,4 @@ have not been designed to be economically secure. Do not use this pallet as-is i
 [`Call`]: ./enum.Call.html
 [`Config`]: ./trait.Config.html
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/frame/proxy/README.md b/frame/proxy/README.md
index d85cfa7d0497..20c4d2bf20b8 100644
--- a/frame/proxy/README.md
+++ b/frame/proxy/README.md
@@ -6,7 +6,7 @@ The accounts to which permission is delegated may be requied to announce the act
 wish to execute some duration prior to execution happens. In this case, the target account may
 reject the announcement and in doing so, veto the execution.
 
-- [`proxy::Config`](https://docs.rs/pallet-proxy/latest/pallet_proxy/trait.Config.html)
+- [`proxy::Trait`](https://docs.rs/pallet-proxy/latest/pallet_proxy/trait.Trait.html)
 - [`Call`](https://docs.rs/pallet-proxy/latest/pallet_proxy/enum.Call.html)
 
 ## Overview
@@ -18,4 +18,4 @@ reject the announcement and in doing so, veto the execution.
 [`Call`]: ./enum.Call.html
 [`Config`]: ./trait.Config.html
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/frame/recovery/README.md b/frame/recovery/README.md
index ff990bc97c93..c45df2c666af 100644
--- a/frame/recovery/README.md
+++ b/frame/recovery/README.md
@@ -1,6 +1,6 @@
 # Recovery Pallet
 
-- [`recovery::Config`](https://docs.rs/pallet-recovery/latest/pallet_recovery/trait.Config.html)
+- [`recovery::Trait`](https://docs.rs/pallet-recovery/latest/pallet_recovery/trait.Trait.html)
 - [`Call`](https://docs.rs/pallet-recovery/latest/pallet_recovery/enum.Call.html)
 
 ## Overview
@@ -131,4 +131,4 @@ of this pallet are:
 * `set_recovered` - The ROOT origin is able to skip the recovery process and directly allow
   one account to access another.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/frame/scheduler/README.md b/frame/scheduler/README.md
index fb08297846ce..3d07818b15d5 100644
--- a/frame/scheduler/README.md
+++ b/frame/scheduler/README.md
@@ -1,7 +1,7 @@
 # Scheduler
 A module for scheduling dispatches.
 
-- [`scheduler::Config`](https://docs.rs/pallet-scheduler/latest/pallet_scheduler/trait.Config.html)
+- [`scheduler::Trait`](https://docs.rs/pallet-scheduler/latest/pallet_scheduler/trait.Trait.html)
 - [`Call`](https://docs.rs/pallet-scheduler/latest/pallet_scheduler/enum.Call.html)
 - [`Module`](https://docs.rs/pallet-scheduler/latest/pallet_scheduler/struct.Module.html)
 
@@ -31,4 +31,4 @@ then those filter will not be used when dispatching the schedule call.
   `Vec<u8>` parameter that can be used for identification.
 * `cancel_named` - the named complement to the cancel function.
 
-License: Unlicense
\ No newline at end of file
+License: Unlicense
diff --git a/frame/scored-pool/README.md b/frame/scored-pool/README.md
index 85d200035800..8f7198a5e11d 100644
--- a/frame/scored-pool/README.md
+++ b/frame/scored-pool/README.md
@@ -20,7 +20,7 @@ time. If an entity is currently a member, this results in removal
 from the `Pool` and `Members`; the entity is immediately replaced
 by the next highest scoring candidate in the pool, if available.
 
-- [`scored_pool::Config`](https://docs.rs/pallet-scored-pool/latest/pallet_scored_pool/trait.Config.html)
+- [`scored_pool::Trait`](https://docs.rs/pallet-scored-pool/latest/pallet_scored_pool/trait.Trait.html)
 - [`Call`](https://docs.rs/pallet-scored-pool/latest/pallet_scored_pool/enum.Call.html)
 - [`Module`](https://docs.rs/pallet-scored-pool/latest/pallet_scored_pool/struct.Module.html)
 
@@ -63,4 +63,4 @@ decl_module! {
 
 This module depends on the [System module](https://docs.rs/frame-system/latest/frame_system/).
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/frame/session/README.md b/frame/session/README.md
index f955268c21b2..e1f8b7f8e023 100644
--- a/frame/session/README.md
+++ b/frame/session/README.md
@@ -3,7 +3,7 @@
 The Session module allows validators to manage their session keys, provides a function for changing
 the session length, and handles session rotation.
 
-- [`session::Config`](https://docs.rs/pallet-session/latest/pallet_session/trait.Config.html)
+- [`session::Trait`](https://docs.rs/pallet-session/latest/pallet_session/trait.Trait.html)
 - [`Call`](https://docs.rs/pallet-session/latest/pallet_session/enum.Call.html)
 - [`Module`](https://docs.rs/pallet-session/latest/pallet_session/struct.Module.html)
 
@@ -80,4 +80,4 @@ fn validators<T: pallet_session::Config>() -> Vec<<T as pallet_session::Config>:
 
 - [Staking](https://docs.rs/pallet-staking/latest/pallet_staking/)
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/frame/society/README.md b/frame/society/README.md
index f68aeb73d42d..a25940f636de 100644
--- a/frame/society/README.md
+++ b/frame/society/README.md
@@ -1,6 +1,6 @@
 # Society Module
 
-- [`society::Config`](https://docs.rs/pallet-society/latest/pallet_society/trait.Config.html)
+- [`society::Trait`](https://docs.rs/pallet-society/latest/pallet_society/trait.Trait.html)
 - [`Call`](https://docs.rs/pallet-society/latest/pallet_society/enum.Call.html)
 
 ## Overview
@@ -225,4 +225,4 @@ make judgement on a suspended candidate.
 * `set_max_membership` - The ROOT origin can update the maximum member count for the society.
 The max membership count must be greater than 1.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/frame/staking/README.md b/frame/staking/README.md
index d073818d6496..1f1ba3dffa81 100644
--- a/frame/staking/README.md
+++ b/frame/staking/README.md
@@ -2,7 +2,7 @@
 
 The Staking module is used to manage funds at stake by network maintainers.
 
-- [`staking::Config`](https://docs.rs/pallet-staking/latest/pallet_staking/trait.Config.html)
+- [`staking::Trait`](https://docs.rs/pallet-staking/latest/pallet_staking/trait.Trait.html)
 - [`Call`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html)
 - [`Module`](https://docs.rs/pallet-staking/latest/pallet_staking/struct.Module.html)
 
@@ -157,7 +157,7 @@ decl_module! {
 ### Era payout
 
 The era payout is computed using yearly inflation curve defined at
-[`T::RewardCurve`](https://docs.rs/pallet-staking/latest/pallet_staking/trait.Config.html#associatedtype.RewardCurve) as such:
+[`T::RewardCurve`](https://docs.rs/pallet-staking/latest/pallet_staking/trait.Trait.html#associatedtype.RewardCurve) as such:
 
 ```nocompile
 staker_payout = yearly_inflation(npos_token_staked / total_tokens) * total_tokens / era_per_year
@@ -168,7 +168,7 @@ This payout is used to reward stakers as defined in next section
 remaining_payout = max_yearly_inflation * total_tokens / era_per_year - staker_payout
 ```
 The remaining reward is send to the configurable end-point
-[`T::RewardRemainder`](https://docs.rs/pallet-staking/latest/pallet_staking/trait.Config.html#associatedtype.RewardRemainder).
+[`T::RewardRemainder`](https://docs.rs/pallet-staking/latest/pallet_staking/trait.Trait.html#associatedtype.RewardRemainder).
 
 ### Reward Calculation
 
@@ -214,7 +214,7 @@ Any funds already placed into stash can be the target of the following operation
 
 The controller account can free a portion (or all) of the funds using the
 [`unbond`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.unbond) call. Note that the funds are not immediately
-accessible. Instead, a duration denoted by [`BondingDuration`](https://docs.rs/pallet-staking/latest/pallet_staking/trait.Config.html#associatedtype.BondingDuration)
+accessible. Instead, a duration denoted by [`BondingDuration`](https://docs.rs/pallet-staking/latest/pallet_staking/trait.Trait.html#associatedtype.BondingDuration)
 (in number of eras) must pass until the funds can actually be removed. Once the
 `BondingDuration` is over, the [`withdraw_unbonded`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.withdraw_unbonded)
 call can be used to actually withdraw the funds.
@@ -246,4 +246,4 @@ The Staking module depends on the [`GenesisConfig`](https://docs.rs/pallet-staki
 - [Session](https://docs.rs/pallet-session/latest/pallet_session/): Used to manage sessions. Also, a list of new
   validators is stored in the Session module's `Validators` at the end of each era.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/frame/sudo/README.md b/frame/sudo/README.md
index 8ac0264d4583..95ca7ce88d97 100644
--- a/frame/sudo/README.md
+++ b/frame/sudo/README.md
@@ -1,6 +1,6 @@
 # Sudo Module
 
-- [`sudo::Config`](https://docs.rs/pallet-sudo/latest/pallet_sudo/trait.Config.html)
+- [`sudo::Trait`](https://docs.rs/pallet-sudo/latest/pallet_sudo/trait.Trait.html)
 - [`Call`](https://docs.rs/pallet-sudo/latest/pallet_sudo/enum.Call.html)
 
 ## Overview
@@ -67,4 +67,4 @@ You need to set an initial superuser account as the sudo `key`.
 [`Config`]: ./trait.Config.html
 [`Origin`]: https://docs.substrate.dev/docs/substrate-types
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/frame/system/README.md b/frame/system/README.md
index b2ff4009dfa8..106a16bc209d 100644
--- a/frame/system/README.md
+++ b/frame/system/README.md
@@ -3,7 +3,7 @@
 The System module provides low-level access to core types and cross-cutting utilities.
 It acts as the base layer for other pallets to interact with the Substrate framework components.
 
-- [`system::Config`](https://docs.rs/frame-system/latest/frame_system/trait.Config.html)
+- [`system::Trait`](https://docs.rs/frame-system/latest/frame_system/trait.Trait.html)
 
 ## Overview
 
@@ -72,4 +72,4 @@ decl_module! {
 }
 ```
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/frame/timestamp/README.md b/frame/timestamp/README.md
index 6ba033054391..de1fb7439222 100644
--- a/frame/timestamp/README.md
+++ b/frame/timestamp/README.md
@@ -2,7 +2,7 @@
 
 The Timestamp module provides functionality to get and set the on-chain time.
 
-- [`timestamp::Config`](https://docs.rs/pallet-timestamp/latest/pallet_timestamp/trait.Config.html)
+- [`timestamp::Trait`](https://docs.rs/pallet-timestamp/latest/pallet_timestamp/trait.Trait.html)
 - [`Call`](https://docs.rs/pallet-timestamp/latest/pallet_timestamp/enum.Call.html)
 - [`Module`](https://docs.rs/pallet-timestamp/latest/pallet_timestamp/struct.Module.html)
 
@@ -71,4 +71,4 @@ the Timestamp module for session management.
 
 * [Session](https://docs.rs/pallet-session/latest/pallet_session/)
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/frame/treasury/README.md b/frame/treasury/README.md
index b316e604f4a3..c8e1a57350d2 100644
--- a/frame/treasury/README.md
+++ b/frame/treasury/README.md
@@ -3,7 +3,7 @@
 The Treasury module provides a "pot" of funds that can be managed by stakeholders in the
 system and a structure for making spending proposals from this pot.
 
-- [`treasury::Config`](https://docs.rs/pallet-treasury/latest/pallet_treasury/trait.Config.html)
+- [`treasury::Trait`](https://docs.rs/pallet-treasury/latest/pallet_treasury/trait.Trait.html)
 - [`Call`](https://docs.rs/pallet-treasury/latest/pallet_treasury/enum.Call.html)
 
 ## Overview
@@ -115,4 +115,4 @@ tasks and stake the required deposit.
 
 The Treasury module depends on the [`GenesisConfig`](https://docs.rs/pallet-treasury/latest/pallet_treasury/struct.GenesisConfig.html).
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/frame/utility/README.md b/frame/utility/README.md
index df874ec11062..f7c0923cd549 100644
--- a/frame/utility/README.md
+++ b/frame/utility/README.md
@@ -1,7 +1,7 @@
 # Utility Module
 A stateless module with helpers for dispatch management which does no re-authentication.
 
-- [`utility::Config`](https://docs.rs/pallet-utility/latest/pallet_utility/trait.Config.html)
+- [`utility::Trait`](https://docs.rs/pallet-utility/latest/pallet_utility/trait.Trait.html)
 - [`Call`](https://docs.rs/pallet-utility/latest/pallet_utility/enum.Call.html)
 
 ## Overview
@@ -35,4 +35,4 @@ filtered by any proxy.
 [`Call`]: ./enum.Call.html
 [`Config`]: ./trait.Config.html
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/frame/vesting/README.md b/frame/vesting/README.md
index 59bfdfcedd08..811b0dc44152 100644
--- a/frame/vesting/README.md
+++ b/frame/vesting/README.md
@@ -1,6 +1,6 @@
 # Vesting Module
 
-- [`vesting::Config`](https://docs.rs/pallet-vesting/latest/pallet_vesting/trait.Config.html)
+- [`vesting::Trait`](https://docs.rs/pallet-vesting/latest/pallet_vesting/trait.Trait.html)
 - [`Call`](https://docs.rs/pallet-vesting/latest/pallet_vesting/enum.Call.html)
 
 ## Overview
@@ -28,4 +28,4 @@ This module implements the `VestingSchedule` trait.
 [`Call`]: ./enum.Call.html
 [`Config`]: ./trait.Config.html
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0

From ace7f47735a6cb87580513d4eaa6bc7c7c398bd4 Mon Sep 17 00:00:00 2001
From: jolestar <jolestar@gmail.com>
Date: Tue, 1 Dec 2020 18:58:00 +0800
Subject: [PATCH 0127/1194] Fix cargo clippy warning in peerset. (#7641)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix cargo clippy warning in peerset.

* Update client/peerset/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
---
 client/peerset/src/lib.rs            | 48 ++++++++++++----------------
 client/peerset/src/peersstate.rs     |  8 ++---
 client/peerset/tests/fuzz.rs         |  4 +--
 primitives/utils/src/mpsc.rs         |  2 +-
 primitives/utils/src/status_sinks.rs |  6 ++++
 5 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/client/peerset/src/lib.rs b/client/peerset/src/lib.rs
index 575743afa079..b3284533a80b 100644
--- a/client/peerset/src/lib.rs
+++ b/client/peerset/src/lib.rs
@@ -36,7 +36,7 @@ const BANNED_THRESHOLD: i32 = 82 * (i32::min_value() / 100);
 /// Reputation change for a node when we get disconnected from it.
 const DISCONNECT_REPUTATION_CHANGE: i32 = -256;
 /// Reserved peers group ID
-const RESERVED_NODES: &'static str = "reserved";
+const RESERVED_NODES: &str = "reserved";
 /// Amount of time between the moment we disconnect from a node and the moment we remove it from
 /// the list.
 const FORGET_AFTER: Duration = Duration::from_secs(3600);
@@ -87,7 +87,7 @@ impl PeersetHandle {
 	/// Has no effect if the node was already a reserved peer.
 	///
 	/// > **Note**: Keep in mind that the networking has to know an address for this node,
-	/// >			otherwise it will not be able to connect to it.
+	/// >           otherwise it will not be able to connect to it.
 	pub fn add_reserved_peer(&self, peer_id: PeerId) {
 		let _ = self.tx.unbounded_send(Action::AddReservedPeer(peer_id));
 	}
@@ -169,7 +169,7 @@ pub struct PeersetConfig {
 	/// List of bootstrap nodes to initialize the peer with.
 	///
 	/// > **Note**: Keep in mind that the networking has to know an address for these nodes,
-	/// >			otherwise it will not be able to connect to them.
+	/// >           otherwise it will not be able to connect to them.
 	pub bootnodes: Vec<PeerId>,
 
 	/// If true, we only accept nodes in [`PeersetConfig::priority_groups`].
@@ -178,7 +178,7 @@ pub struct PeersetConfig {
 	/// Lists of nodes we should always be connected to.
 	///
 	/// > **Note**: Keep in mind that the networking has to know an address for these nodes,
-	/// >			otherwise it will not be able to connect to them.
+	/// >           otherwise it will not be able to connect to them.
 	pub priority_groups: Vec<(String, HashSet<PeerId>)>,
 }
 
@@ -430,10 +430,9 @@ impl Peerset {
 					.get(RESERVED_NODES)
 					.into_iter()
 					.flatten()
-					.filter(move |n| {
+					.find(move |n| {
 						data.peer(n).into_connected().is_none()
 					})
-					.next()
 					.cloned()
 			};
 
@@ -469,10 +468,9 @@ impl Peerset {
 				self.priority_groups
 					.values()
 					.flatten()
-					.filter(move |n| {
+					.find(move |n| {
 						data.peer(n).into_connected().is_none()
 					})
-					.next()
 					.cloned()
 			};
 
@@ -497,21 +495,17 @@ impl Peerset {
 		}
 
 		// Now, we try to connect to non-priority nodes.
-		loop {
-			// Try to grab the next node to attempt to connect to.
-			let next = match self.data.highest_not_connected_peer() {
-				Some(p) => p,
-				None => break,	// No known node to add.
-			};
-
+		while let Some(next) = self.data.highest_not_connected_peer() {
 			// Don't connect to nodes with an abysmal reputation.
 			if next.reputation() < BANNED_THRESHOLD {
 				break;
 			}
 
 			match next.try_outgoing() {
-				Ok(conn) => self.message_queue.push_back(Message::Connect(conn.into_peer_id())),
-				Err(_) => break,	// No more slots available.
+				Ok(conn) => self
+					.message_queue
+					.push_back(Message::Connect(conn.into_peer_id())),
+				Err(_) => break, // No more slots available.
 			}
 		}
 	}
@@ -530,11 +524,9 @@ impl Peerset {
 		trace!(target: "peerset", "Incoming {:?}", peer_id);
 		self.update_time();
 
-		if self.reserved_only {
-			if !self.priority_groups.get(RESERVED_NODES).map_or(false, |n| n.contains(&peer_id)) {
-				self.message_queue.push_back(Message::Reject(index));
-				return;
-			}
+		if self.reserved_only && !self.priority_groups.get(RESERVED_NODES).map_or(false, |n| n.contains(&peer_id)) {
+			self.message_queue.push_back(Message::Reject(index));
+			return;
 		}
 
 		let not_connected = match self.data.peer(&peer_id) {
@@ -584,7 +576,7 @@ impl Peerset {
 	/// Adds discovered peer ids to the PSM.
 	///
 	/// > **Note**: There is no equivalent "expired" message, meaning that it is the responsibility
-	/// >			of the PSM to remove `PeerId`s that fail to dial too often.
+	/// >           of the PSM to remove `PeerId`s that fail to dial too often.
 	pub fn discovered<I: IntoIterator<Item = PeerId>>(&mut self, peer_ids: I) {
 		let mut discovered_any = false;
 
@@ -747,12 +739,12 @@ mod tests {
 
 		let (mut peerset, _handle) = Peerset::from_config(config);
 		peerset.incoming(incoming.clone(), ii);
-		peerset.incoming(incoming.clone(), ii4);
-		peerset.incoming(incoming2.clone(), ii2);
-		peerset.incoming(incoming3.clone(), ii3);
+		peerset.incoming(incoming, ii4);
+		peerset.incoming(incoming2, ii2);
+		peerset.incoming(incoming3, ii3);
 
 		assert_messages(peerset, vec![
-			Message::Connect(bootnode.clone()),
+			Message::Connect(bootnode),
 			Message::Accept(ii),
 			Message::Accept(ii2),
 			Message::Reject(ii3),
@@ -772,7 +764,7 @@ mod tests {
 		};
 
 		let (mut peerset, _) = Peerset::from_config(config);
-		peerset.incoming(incoming.clone(), ii);
+		peerset.incoming(incoming, ii);
 
 		assert_messages(peerset, vec![
 			Message::Reject(ii),
diff --git a/client/peerset/src/peersstate.rs b/client/peerset/src/peersstate.rs
index 59879f629e31..19b2489eff48 100644
--- a/client/peerset/src/peersstate.rs
+++ b/client/peerset/src/peersstate.rs
@@ -42,8 +42,8 @@ pub struct PeersState {
 	/// List of nodes that we know about.
 	///
 	/// > **Note**: This list should really be ordered by decreasing reputation, so that we can
-	/// 			easily select the best node to connect to. As a first draft, however, we don't
-	/// 			sort, to make the logic easier.
+	///           easily select the best node to connect to. As a first draft, however, we don't
+	///           sort, to make the logic easier.
 	nodes: HashMap<PeerId, Node>,
 
 	/// Number of slot-occupying nodes for which the `ConnectionState` is `In`.
@@ -130,7 +130,7 @@ impl PeersState {
 	/// Returns an object that grants access to the state of a peer.
 	pub fn peer<'a>(&'a mut self, peer_id: &'a PeerId) -> Peer<'a> {
 		match self.nodes.get_mut(peer_id) {
-			None => return Peer::Unknown(UnknownPeer {
+			None => Peer::Unknown(UnknownPeer {
 				parent: self,
 				peer_id: Cow::Borrowed(peer_id),
 			}),
@@ -585,7 +585,7 @@ mod tests {
 		peers_state.peer(&id2).into_connected().unwrap().disconnect();
 		assert_eq!(peers_state.highest_not_connected_peer().map(|p| p.into_peer_id()), Some(id1.clone()));
 		peers_state.peer(&id1).into_not_connected().unwrap().set_reputation(-100);
-		assert_eq!(peers_state.highest_not_connected_peer().map(|p| p.into_peer_id()), Some(id2.clone()));
+		assert_eq!(peers_state.highest_not_connected_peer().map(|p| p.into_peer_id()), Some(id2));
 	}
 
 	#[test]
diff --git a/client/peerset/tests/fuzz.rs b/client/peerset/tests/fuzz.rs
index 6fa29e3d834c..e02742fc40ad 100644
--- a/client/peerset/tests/fuzz.rs
+++ b/client/peerset/tests/fuzz.rs
@@ -115,8 +115,8 @@ fn test_once() {
 				4 => if let Some(id) = known_nodes.iter()
 					.filter(|n| incoming_nodes.values().all(|m| m != *n) && !connected_nodes.contains(*n))
 					.choose(&mut rng) {
-					peerset.incoming(id.clone(), next_incoming_id.clone());
-					incoming_nodes.insert(next_incoming_id.clone(), id.clone());
+					peerset.incoming(id.clone(), next_incoming_id);
+					incoming_nodes.insert(next_incoming_id, id.clone());
 					next_incoming_id.0 += 1;
 				}
 
diff --git a/primitives/utils/src/mpsc.rs b/primitives/utils/src/mpsc.rs
index 70baa006bdcd..321ab72f0d27 100644
--- a/primitives/utils/src/mpsc.rs
+++ b/primitives/utils/src/mpsc.rs
@@ -63,7 +63,7 @@ mod inner {
 	/// `UNBOUNDED_CHANNELS_COUNTER`
 	pub fn tracing_unbounded<T>(key: &'static str) ->(TracingUnboundedSender<T>, TracingUnboundedReceiver<T>) {
 		let (s, r) = mpsc::unbounded();
-		(TracingUnboundedSender(key.clone(), s), TracingUnboundedReceiver(key,r))
+		(TracingUnboundedSender(key, s), TracingUnboundedReceiver(key,r))
 	}
 
 	impl<T> TracingUnboundedSender<T> {
diff --git a/primitives/utils/src/status_sinks.rs b/primitives/utils/src/status_sinks.rs
index 65a560af4eaa..6ca9452893f3 100644
--- a/primitives/utils/src/status_sinks.rs
+++ b/primitives/utils/src/status_sinks.rs
@@ -43,6 +43,12 @@ struct YieldAfter<T> {
 	sender: Option<TracingUnboundedSender<T>>,
 }
 
+impl <T> Default for StatusSinks<T> {
+	fn default() -> Self {
+		Self::new()
+	}
+}
+
 impl<T> StatusSinks<T> {
 	/// Builds a new empty collection.
 	pub fn new() -> StatusSinks<T> {

From b63b8643e00214f1cbe28b6ca4e804af656c9038 Mon Sep 17 00:00:00 2001
From: Andronik Ordian <write@reusable.software>
Date: Tue, 1 Dec 2020 13:50:27 +0100
Subject: [PATCH 0128/1194] remove unused deps pulled by parity-util-mem
 (#7635)

* remove unused deps pulled by parity-util-mem

* fix a warning about unused Cargo key
---
 Cargo.lock               | 123 +++------------------------------------
 Cargo.toml               |   1 -
 frame/support/Cargo.toml |   2 +-
 3 files changed, 9 insertions(+), 117 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 190dbaf71794..9a44096132f2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -79,15 +79,6 @@ dependencies = [
  "opaque-debug 0.3.0",
 ]
 
-[[package]]
-name = "ahash"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29661b60bec623f0586702976ff4d0c9942dcb6723161c2df0eea78455cfedfb"
-dependencies = [
- "const-random",
-]
-
 [[package]]
 name = "ahash"
 version = "0.3.8"
@@ -798,26 +789,6 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "const-random"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02dc82c12dc2ee6e1ded861cf7d582b46f66f796d1b6c93fa28b911ead95da02"
-dependencies = [
- "const-random-macro",
- "proc-macro-hack",
-]
-
-[[package]]
-name = "const-random-macro"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc757bbb9544aa296c2ae00c679e81f886b37e28e59097defe0cf524306f6685"
-dependencies = [
- "getrandom 0.2.0",
- "proc-macro-hack",
-]
-
 [[package]]
 name = "const_fn"
 version = "0.4.3"
@@ -1406,33 +1377,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "ethbloom"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71a6567e6fd35589fea0c63b94b4cf2e55573e413901bdbe60ab15cf0e25e5df"
-dependencies = [
- "crunchy",
- "fixed-hash",
- "impl-rlp",
- "impl-serde",
- "tiny-keccak",
-]
-
-[[package]]
-name = "ethereum-types"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "473aecff686bd8e7b9db0165cbbb53562376b39bf35b427f0c60446a9e1634b0"
-dependencies = [
- "ethbloom",
- "fixed-hash",
- "impl-rlp",
- "impl-serde",
- "primitive-types",
- "uint",
-]
-
 [[package]]
 name = "event-listener"
 version = "2.5.1"
@@ -2040,17 +1984,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "getrandom"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee8025cf36f917e6a52cce185b7c7177689b838b7ec138364e50cc2277a56cf4"
-dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
-]
-
 [[package]]
 name = "ghash"
 version = "0.3.0"
@@ -2182,16 +2115,6 @@ dependencies = [
  "crunchy",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e6073d0ca812575946eb5f35ff68dbe519907b25c42530389ff946dc84c6ead"
-dependencies = [
- "ahash 0.2.19",
- "autocfg 0.1.7",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.8.2"
@@ -2478,15 +2401,6 @@ dependencies = [
  "parity-scale-codec",
 ]
 
-[[package]]
-name = "impl-rlp"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f7a72f11830b52333f36e3b09a288333888bf54380fd0ac0790a3c31ab0f3c5"
-dependencies = [
- "rlp",
-]
-
 [[package]]
 name = "impl-serde"
 version = "0.3.1"
@@ -3175,7 +3089,7 @@ dependencies = [
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "lru 0.6.1",
+ "lru",
  "minicbor",
  "rand 0.7.3",
  "smallvec 1.5.0",
@@ -3396,15 +3310,6 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "lru"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35c456c123957de3a220cd03786e0d86aa542a88b46029973b542f426da6ef34"
-dependencies = [
- "hashbrown 0.6.3",
-]
-
 [[package]]
 name = "lru"
 version = "0.6.1"
@@ -5260,10 +5165,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "297ff91fa36aec49ce183484b102f6b75b46776822bd81525bfc4cc9b0dd0f5c"
 dependencies = [
  "cfg-if 0.1.10",
- "ethereum-types",
  "hashbrown 0.8.2",
  "impl-trait-for-tuples",
- "lru 0.5.3",
  "parity-util-mem-derive",
  "parking_lot 0.10.2",
  "primitive-types",
@@ -5684,7 +5587,6 @@ checksum = "7dd39dcacf71411ba488570da7bbc89b717225e46478b30ba99b92db6b149809"
 dependencies = [
  "fixed-hash",
  "impl-codec",
- "impl-rlp",
  "impl-serde",
  "uint",
 ]
@@ -5928,7 +5830,7 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
 dependencies = [
- "getrandom 0.1.15",
+ "getrandom",
  "libc",
  "rand_chacha 0.2.2",
  "rand_core 0.5.1",
@@ -5977,7 +5879,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
 dependencies = [
- "getrandom 0.1.15",
+ "getrandom",
 ]
 
 [[package]]
@@ -6133,7 +6035,7 @@ version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
 dependencies = [
- "getrandom 0.1.15",
+ "getrandom",
  "redox_syscall",
  "rust-argon2",
 ]
@@ -6239,15 +6141,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "rlp"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1190dcc8c3a512f1eef5d09bb8c84c7f39e1054e174d1795482e18f5272f2e73"
-dependencies = [
- "rustc-hex",
-]
-
 [[package]]
 name = "rocksdb"
 version = "0.15.0"
@@ -7096,7 +6989,7 @@ dependencies = [
  "linked-hash-map",
  "linked_hash_set",
  "log",
- "lru 0.6.1",
+ "lru",
  "nohash-hasher",
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -7142,7 +7035,7 @@ dependencies = [
  "futures-timer 3.0.2",
  "libp2p",
  "log",
- "lru 0.6.1",
+ "lru",
  "quickcheck",
  "rand 0.7.3",
  "sc-network",
@@ -7578,7 +7471,7 @@ dependencies = [
  "arrayref",
  "arrayvec 0.5.2",
  "curve25519-dalek 2.1.0",
- "getrandom 0.1.15",
+ "getrandom",
  "merlin",
  "rand 0.7.3",
  "rand_core 0.5.1",
@@ -8118,7 +8011,7 @@ version = "2.0.0"
 dependencies = [
  "futures 0.3.8",
  "log",
- "lru 0.6.1",
+ "lru",
  "parity-scale-codec",
  "parking_lot 0.10.2",
  "sp-api",
diff --git a/Cargo.toml b/Cargo.toml
index 2e3cff821e02..6a007a209f1f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -207,7 +207,6 @@ aesni = { opt-level = 3 }
 blake2 = { opt-level = 3 }
 blake2-rfc = { opt-level = 3 }
 blake2b_simd = { opt-level = 3 }
-blake2s_simd = { opt-level = 3 }
 chacha20poly1305 = { opt-level = 3 }
 cranelift-codegen = { opt-level = 3 }
 cranelift-wasm = { opt-level = 3 }
diff --git a/frame/support/Cargo.toml b/frame/support/Cargo.toml
index 1f7fe9a20253..0189dc172fb6 100644
--- a/frame/support/Cargo.toml
+++ b/frame/support/Cargo.toml
@@ -35,7 +35,7 @@ smallvec = "1.4.1"
 [dev-dependencies]
 pretty_assertions = "0.6.1"
 frame-system = { version = "2.0.0", path = "../system" }
-parity-util-mem = { version = "0.7.0", features = ["primitive-types"] }
+parity-util-mem = { version = "0.7.0", default-features = false, features = ["primitive-types"] }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 sp-api = { version = "2.0.0", default-features = false, path = "../../primitives/api" }
 

From cbe1cc33bc1ee12da92440b0e753b6680b5ac5ba Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann <ben@gnunicorn.org>
Date: Tue, 1 Dec 2020 15:35:06 +0100
Subject: [PATCH 0129/1194] minor fix and improvements on localkeystore (#7626)

* minor fixes and improvements on localkeystore

* fixing tests

* update docs
---
 client/keystore/src/local.rs | 50 ++++++++++++++++++++++++++++--------
 1 file changed, 39 insertions(+), 11 deletions(-)

diff --git a/client/keystore/src/local.rs b/client/keystore/src/local.rs
index e0b95a08d5ca..a31e3e1f1e40 100644
--- a/client/keystore/src/local.rs
+++ b/client/keystore/src/local.rs
@@ -329,7 +329,7 @@ impl KeystoreInner {
 	/// Open the store at the given path.
 	///
 	/// Optionally takes a password that will be used to encrypt/decrypt the keys.
-	pub fn open<T: Into<PathBuf>>(path: T, password: Option<SecretString>) -> Result<Self> {
+	fn open<T: Into<PathBuf>>(path: T, password: Option<SecretString>) -> Result<Self> {
 		let path = path.into();
 		fs::create_dir_all(&path)?;
 
@@ -345,7 +345,7 @@ impl KeystoreInner {
 	}
 
 	/// Create a new in-memory store.
-	pub fn new_in_memory() -> Self {
+	fn new_in_memory() -> Self {
 		Self {
 			path: None,
 			additional: HashMap::new(),
@@ -373,8 +373,8 @@ impl KeystoreInner {
 
 	/// Insert a new key with anonymous crypto.
 	///
-	/// Places it into the file system store.
-	pub fn insert_unknown(&self, key_type: KeyTypeId, suri: &str, public: &[u8]) -> Result<()> {
+	/// Places it into the file system store, if a path is configured.
+	fn insert_unknown(&self, key_type: KeyTypeId, suri: &str, public: &[u8]) -> Result<()> {
 		if let Some(path) = self.key_file_path(public, key_type) {
 			let mut file = File::create(path).map_err(Error::Io)?;
 			serde_json::to_writer(&file, &suri).map_err(Error::Json)?;
@@ -385,13 +385,16 @@ impl KeystoreInner {
 
 	/// Generate a new key.
 	///
-	/// Places it into the file system store.
-	pub fn generate_by_type<Pair: PairT>(&self, key_type: KeyTypeId) -> Result<Pair> {
+	/// Places it into the file system store, if a path is configured. Otherwise insert
+	/// it into the memory cache only.
+	fn generate_by_type<Pair: PairT>(&mut self, key_type: KeyTypeId) -> Result<Pair> {
 		let (pair, phrase, _) = Pair::generate_with_phrase(self.password());
 		if let Some(path) = self.key_file_path(pair.public().as_slice(), key_type) {
 			let mut file = File::create(path)?;
 			serde_json::to_writer(&file, &phrase)?;
 			file.flush()?;
+		} else {
+			self.insert_ephemeral_pair(&pair, &phrase, key_type);
 		}
 		Ok(pair)
 	}
@@ -399,7 +402,7 @@ impl KeystoreInner {
 	/// Create a new key from seed.
 	///
 	/// Does not place it into the file system store.
-	pub fn insert_ephemeral_from_seed_by_type<Pair: PairT>(
+	fn insert_ephemeral_from_seed_by_type<Pair: PairT>(
 		&mut self,
 		seed: &str,
 		key_type: KeyTypeId,
@@ -422,7 +425,7 @@ impl KeystoreInner {
 	}
 
 	/// Get a key pair for the given public key and key type.
-	pub fn key_pair_by_type<Pair: PairT>(&self,
+	fn key_pair_by_type<Pair: PairT>(&self,
 		public: &Pair::Public,
 		key_type: KeyTypeId,
 	) -> Result<Pair> {
@@ -501,6 +504,8 @@ mod tests {
 		str::FromStr,
 	};
 
+	const TEST_KEY_TYPE: KeyTypeId = KeyTypeId(*b"test");
+
 	impl KeystoreInner {
 		fn insert_ephemeral_from_seed<Pair: AppPair>(&mut self, seed: &str) -> Result<Pair> {
 			self.insert_ephemeral_from_seed_by_type::<Pair::Generic>(seed, Pair::ID).map(Into::into)
@@ -515,7 +520,7 @@ mod tests {
 				})
 		}
 
-		fn generate<Pair: AppPair>(&self) -> Result<Pair> {
+		fn generate<Pair: AppPair>(&mut self) -> Result<Pair> {
 			self.generate_by_type::<Pair::Generic>(Pair::ID).map(Into::into)
 		}
 	}
@@ -523,7 +528,7 @@ mod tests {
 	#[test]
 	fn basic_store() {
 		let temp_dir = TempDir::new().unwrap();
-		let store = KeystoreInner::open(temp_dir.path(), None).unwrap();
+		let mut store = KeystoreInner::open(temp_dir.path(), None).unwrap();
 
 		assert!(store.public_keys::<ed25519::AppPublic>().unwrap().is_empty());
 
@@ -558,7 +563,7 @@ mod tests {
 	fn password_being_used() {
 		let password = String::from("password");
 		let temp_dir = TempDir::new().unwrap();
-		let store = KeystoreInner::open(
+		let mut store = KeystoreInner::open(
 			temp_dir.path(),
 			Some(FromStr::from_str(password.as_str()).unwrap()),
 		).unwrap();
@@ -640,4 +645,27 @@ mod tests {
 			SyncCryptoStore::sr25519_public_keys(&store, SR25519).is_empty(),
 		);
 	}
+
+	#[test]
+	fn generate_with_seed_is_not_stored() {
+		let temp_dir = TempDir::new().unwrap();
+		let store = LocalKeystore::open(temp_dir.path(), None).unwrap();
+		let _alice_tmp_key = SyncCryptoStore::sr25519_generate_new(&store, TEST_KEY_TYPE, Some("//Alice")).unwrap();
+
+		assert_eq!(SyncCryptoStore::sr25519_public_keys(&store, TEST_KEY_TYPE).len(), 1);
+
+		drop(store);
+		let store = LocalKeystore::open(temp_dir.path(), None).unwrap();
+		assert_eq!(SyncCryptoStore::sr25519_public_keys(&store, TEST_KEY_TYPE).len(), 0);
+	}
+
+	#[test]
+	fn generate_can_be_fetched_in_memory() {
+		let store = LocalKeystore::in_memory();
+		SyncCryptoStore::sr25519_generate_new(&store, TEST_KEY_TYPE, Some("//Alice")).unwrap();
+
+		assert_eq!(SyncCryptoStore::sr25519_public_keys(&store, TEST_KEY_TYPE).len(), 1);
+		SyncCryptoStore::sr25519_generate_new(&store, TEST_KEY_TYPE, None).unwrap();
+		assert_eq!(SyncCryptoStore::sr25519_public_keys(&store, TEST_KEY_TYPE).len(), 2);
+	}
 }

From ba8797284effac13701b6869a42eedd3f27677c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomusdrw@users.noreply.github.com>
Date: Tue, 1 Dec 2020 19:40:53 +0100
Subject: [PATCH 0130/1194] Remove a stray file. (#7649)

---
 client/transaction-pool/graph/src/error.rs | 81 ----------------------
 1 file changed, 81 deletions(-)
 delete mode 100644 client/transaction-pool/graph/src/error.rs

diff --git a/client/transaction-pool/graph/src/error.rs b/client/transaction-pool/graph/src/error.rs
deleted file mode 100644
index 01fcb9f8dc91..000000000000
--- a/client/transaction-pool/graph/src/error.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-//! Transaction pool errors.
-
-use sp_runtime::transaction_validity::{
-	TransactionPriority as Priority, InvalidTransaction, UnknownTransaction,
-};
-
-/// Transaction pool result.
-pub type Result<T> = std::result::Result<T, Error>;
-
-/// Transaction pool error type.
-#[derive(Debug, thiserror::Error, derive_more::From)]
-#[allow(missing_docs)]
-pub enum Error {
-	/// Transaction is not verifiable yet, but might be in the future.
-	#[error("Unknown transaction validity: {0:?}")]
-	UnknownTransaction(UnknownTransaction),
-
-	#[error("Invalid transaction validity: {0:?}")]
-	InvalidTransaction(InvalidTransaction),
-	/// The transaction validity returned no "provides" tag.
-	///
-	/// Such transactions are not accepted to the pool, since we use those tags
-	/// to define identity of transactions (occupance of the same "slot").
-	#[error("The transaction validity returned no `provides` tags, so the pool can't identify it.")]
-	NoTagsProvided,
-
-	#[error("Temporarily Banned")]
-	TemporarilyBanned,
-
-	#[error("[{0:?}] Transaction is already in the pool")]
-	AlreadyImported(Box<dyn std::any::Any + Send>),
-
-	#[error("Transaction cannot be imported due to too low priority ({0} > {1})", old, new)]
-	TooLowPriority {
-		/// Transaction already in the pool.
-		old: Priority,
-		/// Transaction entering the pool.
-		new: Priority
-	},
-
-	#[error("Dependency cycle detected")]
-	CycleDetected,
-
-	#[error("Transaction couldn't enter the pool because of the limit.")]
-	ImmediatelyDropped,
-
-	#[error("Invlaid block id: {0}")]
-	InvalidBlockId(String),
-}
-
-/// Transaction pool error conversion.
-pub trait IntoPoolError: ::std::error::Error + Send + Sized {
-	/// Try to extract original `Error`
-	///
-	/// This implementation is optional and used only to
-	/// provide more descriptive error messages for end users
-	/// of RPC API.
-	fn into_pool_error(self) -> ::std::result::Result<Error, Self> { Err(self) }
-}
-
-impl IntoPoolError for Error {
-	fn into_pool_error(self) -> ::std::result::Result<Error, Self> { Ok(self) }
-}

From f884296f7436916909025f8b43c4bbf3e60e4c60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Tue, 1 Dec 2020 18:49:09 +0000
Subject: [PATCH 0131/1194] fork-tree: fix tree rebalancing (#7616)

* fork-tree: rebalance tree when inserting inner node

* fork-tree: fix tests for new rebalancing behavior

* fork-tree: fix node iterator initial state

* grandpa: fix tests
---
 client/finality-grandpa/src/authorities.rs |  5 ++-
 utils/fork-tree/src/lib.rs                 | 50 +++++++++++++++-------
 2 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/client/finality-grandpa/src/authorities.rs b/client/finality-grandpa/src/authorities.rs
index 2de169fc8285..de14c7b3ba39 100644
--- a/client/finality-grandpa/src/authorities.rs
+++ b/client/finality-grandpa/src/authorities.rs
@@ -758,9 +758,10 @@ mod tests {
 		authorities.add_pending_change(change_d.clone(), &static_is_descendent_of(false)).unwrap();
 		authorities.add_pending_change(change_e.clone(), &static_is_descendent_of(false)).unwrap();
 
+		// ordered by subtree depth
 		assert_eq!(
 			authorities.pending_changes().collect::<Vec<_>>(),
-			vec![&change_b, &change_a, &change_c, &change_e, &change_d],
+			vec![&change_a, &change_c, &change_b, &change_e, &change_d],
 		);
 	}
 
@@ -798,7 +799,7 @@ mod tests {
 
 		assert_eq!(
 			authorities.pending_changes().collect::<Vec<_>>(),
-			vec![&change_b, &change_a],
+			vec![&change_a, &change_b],
 		);
 
 		// finalizing "hash_c" won't enact the change signaled at "hash_a" but it will prune out "hash_b"
diff --git a/utils/fork-tree/src/lib.rs b/utils/fork-tree/src/lib.rs
index 1d01c5341764..f266b6422302 100644
--- a/utils/fork-tree/src/lib.rs
+++ b/utils/fork-tree/src/lib.rs
@@ -229,7 +229,10 @@ impl<H, N, V> ForkTree<H, N, V> where
 					number = n;
 					data = d;
 				},
-				None => return Ok(false),
+				None => {
+					self.rebalance();
+					return Ok(false);
+				},
 			}
 		}
 
@@ -251,7 +254,9 @@ impl<H, N, V> ForkTree<H, N, V> where
 	}
 
 	fn node_iter(&self) -> impl Iterator<Item=&Node<H, N, V>> {
-		ForkTreeIterator { stack: self.roots.iter().collect() }
+		// we need to reverse the order of roots to maintain the expected
+		// ordering since the iterator uses a stack to track state.
+		ForkTreeIterator { stack: self.roots.iter().rev().collect() }
 	}
 
 	/// Iterates the nodes in the tree in pre-order.
@@ -939,6 +944,10 @@ mod test {
 		//   — J - K
 		//
 		// (where N is not a part of fork tree)
+		//
+		// NOTE: the tree will get automatically rebalance on import and won't be laid out like the
+		// diagram above. the children will be ordered by subtree depth and the longest branches
+		// will be on the leftmost side of the tree.
 		let is_descendent_of = |base: &&str, block: &&str| -> Result<bool, TestError> {
 			let letters = vec!["B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "O"];
 			match (*base, *block) {
@@ -1132,7 +1141,7 @@ mod test {
 
 		assert_eq!(
 			tree.roots().map(|(h, n, _)| (h.clone(), n.clone())).collect::<Vec<_>>(),
-			vec![("I", 4), ("L", 4)],
+			vec![("L", 4), ("I", 4)],
 		);
 
 		// finalizing a node from another fork that isn't part of the tree clears the tree
@@ -1180,7 +1189,7 @@ mod test {
 
 		assert_eq!(
 			tree.roots().map(|(h, n, _)| (h.clone(), n.clone())).collect::<Vec<_>>(),
-			vec![("I", 4), ("L", 4)],
+			vec![("L", 4), ("I", 4)],
 		);
 
 		assert_eq!(
@@ -1354,11 +1363,11 @@ mod test {
 			vec![
 				("A", 1),
 				("B", 2), ("C", 3), ("D", 4), ("E", 5),
-				("F", 2),
+				("F", 2), ("H", 3), ("L", 4), ("M", 5),
+				("O", 5),
+				("I", 4),
 				("G", 3),
-				("H", 3), ("I", 4),
-				("L", 4), ("M", 5), ("O", 5),
-				("J", 2), ("K", 3)
+				("J", 2), ("K", 3),
 			],
 		);
 	}
@@ -1480,7 +1489,7 @@ mod test {
 
 		assert_eq!(
 			removed.map(|(hash, _, _)| hash).collect::<Vec<_>>(),
-			vec!["A", "F", "G", "H", "I", "L", "M", "O", "J", "K"]
+			vec!["A", "F", "H", "L", "M", "O", "I", "G", "J", "K"]
 		);
 
 		let removed = tree.prune(
@@ -1545,19 +1554,30 @@ mod test {
 	fn tree_rebalance() {
 		let (mut tree, _) = test_fork_tree();
 
+		// the tree is automatically rebalanced on import, therefore we should iterate in preorder
+		// exploring the longest forks first. check the ascii art above to understand the expected
+		// output below.
 		assert_eq!(
 			tree.iter().map(|(h, _, _)| *h).collect::<Vec<_>>(),
-			vec!["A", "B", "C", "D", "E", "F", "G", "H", "I", "L", "M", "O", "J", "K"],
+			vec!["A", "B", "C", "D", "E", "F", "H", "L", "M", "O", "I", "G", "J", "K"],
 		);
 
-		// after rebalancing the tree we should iterate in preorder exploring
-		// the longest forks first. check the ascii art above to understand the
-		// expected output below.
-		tree.rebalance();
+		// let's add a block "P" which is a descendent of block "O"
+		let is_descendent_of = |base: &&str, block: &&str| -> Result<bool, TestError> {
+			match (*base, *block) {
+				(b, "P") => Ok(vec!["A", "F", "L", "O"].into_iter().any(|n| n == b)),
+				_ => Ok(false),
+			}
+		};
+
+		tree.import("P", 6, (), &is_descendent_of).unwrap();
 
+		// this should re-order the tree, since the branch "A -> B -> C -> D -> E" is no longer tied
+		// with 5 blocks depth. additionally "O" should be visited before "M" now, since it has one
+		// descendent "P" which makes that branch 6 blocks long.
 		assert_eq!(
 			tree.iter().map(|(h, _, _)| *h).collect::<Vec<_>>(),
-			["A", "B", "C", "D", "E", "F", "H", "L", "M", "O", "I", "G", "J", "K"]
+			["A", "F", "H", "L", "O", "P", "M", "I", "G", "B", "C", "D", "E", "J", "K"]
 		);
 	}
 }

From e4ae38b0968f5d9eb5a896e629646d42a07277b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Wed, 2 Dec 2020 16:53:44 +0100
Subject: [PATCH 0132/1194] Use unreleased trybuild to fix CI (#7656)

---
 Cargo.lock                              | 3 +--
 frame/support/test/Cargo.toml           | 2 +-
 primitives/api/test/Cargo.toml          | 2 +-
 primitives/runtime-interface/Cargo.toml | 2 +-
 test-utils/Cargo.toml                   | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9a44096132f2..681a65fccd92 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9623,8 +9623,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 [[package]]
 name = "trybuild"
 version = "1.0.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7d30fe369fd650072b352b1a9cb9587669de6b89be3b8225544012c1c45292d"
+source = "git+https://github.com/bkchr/trybuild.git?branch=bkchr-use-workspace-cargo-lock#0eaad05ba8a32a743751ff52b57a7d9f57da4869"
 dependencies = [
  "dissimilar",
  "glob",
diff --git a/frame/support/test/Cargo.toml b/frame/support/test/Cargo.toml
index 6d8064102c4d..01484ccfb882 100644
--- a/frame/support/test/Cargo.toml
+++ b/frame/support/test/Cargo.toml
@@ -21,7 +21,7 @@ sp-inherents = { version = "2.0.0", default-features = false, path = "../../../p
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../../primitives/runtime" }
 sp-core = { version = "2.0.0", default-features = false, path = "../../../primitives/core" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../../primitives/std" }
-trybuild = "1.0.33"
+trybuild = { git = "https://github.com/bkchr/trybuild.git", branch = "bkchr-use-workspace-cargo-lock" }
 pretty_assertions = "0.6.1"
 rustversion = "1.0.0"
 frame-metadata = { version = "12.0.0", default-features = false, path = "../../metadata" }
diff --git a/primitives/api/test/Cargo.toml b/primitives/api/test/Cargo.toml
index 867cdd6e57e4..1110b02020b3 100644
--- a/primitives/api/test/Cargo.toml
+++ b/primitives/api/test/Cargo.toml
@@ -21,7 +21,7 @@ sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common
 sc-block-builder = { version = "0.8.0", path = "../../../client/block-builder" }
 codec = { package = "parity-scale-codec", version = "1.3.1" }
 sp-state-machine = { version = "0.8.0", path = "../../../primitives/state-machine" }
-trybuild = "1.0.17"
+trybuild = { git = "https://github.com/bkchr/trybuild.git", branch = "bkchr-use-workspace-cargo-lock" }
 rustversion = "1.0.0"
 
 [dev-dependencies]
diff --git a/primitives/runtime-interface/Cargo.toml b/primitives/runtime-interface/Cargo.toml
index bc36098f05a5..0138637366d1 100644
--- a/primitives/runtime-interface/Cargo.toml
+++ b/primitives/runtime-interface/Cargo.toml
@@ -30,7 +30,7 @@ sp-state-machine = { version = "0.8.0", path = "../../primitives/state-machine"
 sp-core = { version = "2.0.0", path = "../core" }
 sp-io = { version = "2.0.0", path = "../io" }
 rustversion = "1.0.0"
-trybuild = "1.0.23"
+trybuild = { git = "https://github.com/bkchr/trybuild.git", branch = "bkchr-use-workspace-cargo-lock" }
 
 [features]
 default = [ "std" ]
diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml
index ddadc2cb7177..7606b0c1c15b 100644
--- a/test-utils/Cargo.toml
+++ b/test-utils/Cargo.toml
@@ -18,4 +18,4 @@ tokio = { version = "0.2.13", features = ["macros"] }
 
 [dev-dependencies]
 sc-service = { version = "0.8.0", path = "../client/service" }
-trybuild = { version = "1.0", features = ["diff"] }
+trybuild = { git = "https://github.com/bkchr/trybuild.git", branch = "bkchr-use-workspace-cargo-lock", features = [ "diff" ] }

From 77f1089942b7f1190652887abb1246ea09dff894 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Wed, 2 Dec 2020 17:34:05 +0100
Subject: [PATCH 0133/1194] Show reputation changes when dropping peer (#7655)

* Show reputation changes when dropping peer

* Print all
---
 client/peerset/src/lib.rs | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/client/peerset/src/lib.rs b/client/peerset/src/lib.rs
index b3284533a80b..bb08bdc18e67 100644
--- a/client/peerset/src/lib.rs
+++ b/client/peerset/src/lib.rs
@@ -103,7 +103,7 @@ impl PeersetHandle {
 	pub fn set_reserved_only(&self, reserved: bool) {
 		let _ = self.tx.unbounded_send(Action::SetReservedOnly(reserved));
 	}
-	
+
 	/// Set reserved peers to the new set.
 	pub fn set_reserved_peers(&self, peer_ids: HashSet<PeerId>) {
 		let _ = self.tx.unbounded_send(Action::SetReservedPeers(peer_ids));
@@ -252,7 +252,7 @@ impl Peerset {
 	fn on_remove_reserved_peer(&mut self, peer_id: PeerId) {
 		self.on_remove_from_priority_group(RESERVED_NODES, peer_id);
 	}
-	
+
 	fn on_set_reserved_peers(&mut self, peer_ids: HashSet<PeerId>) {
 		self.on_set_priority_group(RESERVED_NODES, peer_ids);
 	}
@@ -357,8 +357,18 @@ impl Peerset {
 					);
 				}
 			},
-			peersstate::Peer::NotConnected(mut peer) => peer.add_reputation(change.value),
-			peersstate::Peer::Unknown(peer) => peer.discover().add_reputation(change.value),
+			peersstate::Peer::NotConnected(mut peer) => {
+				trace!(target: "peerset", "Report {}: {:+} to {}. Reason: {}",
+					peer_id, change.value, peer.reputation(), change.reason
+				);
+				peer.add_reputation(change.value)
+			},
+			peersstate::Peer::Unknown(peer) => {
+				trace!(target: "peerset", "Discover {}: {:+}. Reason: {}",
+					peer_id, change.value, change.reason
+				);
+				peer.discover().add_reputation(change.value)
+			},
 		}
 	}
 
@@ -555,8 +565,6 @@ impl Peerset {
 	/// Must only be called after the PSM has either generated a `Connect` message with this
 	/// `PeerId`, or accepted an incoming connection with this `PeerId`.
 	pub fn dropped(&mut self, peer_id: PeerId) {
-		trace!(target: "peerset", "Dropping {:?}", peer_id);
-
 		// We want reputations to be up-to-date before adjusting them.
 		self.update_time();
 
@@ -564,6 +572,8 @@ impl Peerset {
 			peersstate::Peer::Connected(mut entry) => {
 				// Decrease the node's reputation so that we don't try it again and again and again.
 				entry.add_reputation(DISCONNECT_REPUTATION_CHANGE);
+				trace!(target: "peerset", "Dropping {}: {:+} to {}",
+					peer_id, DISCONNECT_REPUTATION_CHANGE, entry.reputation());
 				entry.disconnect();
 			}
 			peersstate::Peer::NotConnected(_) | peersstate::Peer::Unknown(_) =>

From f4d4244ed6f09675f09c6e1afa96c2b595a689bf Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Wed, 2 Dec 2020 17:35:48 +0100
Subject: [PATCH 0134/1194] Remove
 sc_network::NetworkService::register_notifications_protocol and partially
 refactor Grandpa tests (#7646)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Remove sc_network::NetworkService::register_notifications_protocol

* Missing calls to .into()

* Wrong crate name

* [WIP] Fix Grandpa tests

* One more passing

* One more. Two to go.

* This one was actually already passing 🎉

* Last one compiles

* Progress

* grandpa: fix voter_persists_its_votes test

* Restore other tests

* Try spawn future later

Co-authored-by: André Silva <andrerfosilva@gmail.com>
---
 bin/node-template/node/src/service.rs         |  10 +-
 bin/node/cli/src/service.rs                   |  10 +-
 .../finality-grandpa/src/communication/mod.rs |   2 +
 .../src/communication/tests.rs                |   2 -
 client/finality-grandpa/src/lib.rs            |  25 +-
 client/finality-grandpa/src/tests.rs          | 543 +++++++++---------
 client/network-gossip/src/bridge.rs           |   6 -
 client/network-gossip/src/lib.rs              |  15 -
 client/network-gossip/src/state_machine.rs    |   2 -
 client/network/README.md                      |   6 +-
 client/network/src/lib.rs                     |   5 +-
 client/network/src/service.rs                 |  31 +-
 12 files changed, 293 insertions(+), 364 deletions(-)

diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
index e32ba740504b..1fa1a372a05d 100644
--- a/bin/node-template/node/src/service.rs
+++ b/bin/node-template/node/src/service.rs
@@ -79,13 +79,15 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 }
 
 /// Builds a new service for a full client.
-pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
+pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError> {
 	let sc_service::PartialComponents {
 		client, backend, mut task_manager, import_queue, keystore_container,
 		select_chain, transaction_pool, inherent_data_providers,
 		other: (block_import, grandpa_link),
 	} = new_partial(&config)?;
 
+	config.network.notifications_protocols.push(sc_finality_grandpa::GRANDPA_PROTOCOL_NAME.into());
+
 	let (network, network_status_sinks, system_rpc_tx, network_starter) =
 		sc_service::build_network(sc_service::BuildNetworkParams {
 			config: &config,
@@ -210,8 +212,6 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
 			"grandpa-voter",
 			sc_finality_grandpa::run_grandpa_voter(grandpa_config)?
 		);
-	} else {
-		sc_finality_grandpa::setup_disabled_grandpa(network)?;
 	}
 
 	network_starter.start_network();
@@ -219,10 +219,12 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
 }
 
 /// Builds a new service for a light client.
-pub fn new_light(config: Configuration) -> Result<TaskManager, ServiceError> {
+pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError> {
 	let (client, backend, keystore_container, mut task_manager, on_demand) =
 		sc_service::new_light_parts::<Block, RuntimeApi, Executor>(&config)?;
 
+	config.network.notifications_protocols.push(sc_finality_grandpa::GRANDPA_PROTOCOL_NAME.into());
+
 	let select_chain = sc_consensus::LongestChain::new(backend.clone());
 
 	let transaction_pool = Arc::new(sc_transaction_pool::BasicPool::new_light(
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index 9d7c9bb1b7a6..5eb8e35e69ec 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -164,7 +164,7 @@ pub struct NewFullBase {
 
 /// Creates a full service from the configuration.
 pub fn new_full_base(
-	config: Configuration,
+	mut config: Configuration,
 	with_startup_data: impl FnOnce(
 		&sc_consensus_babe::BabeBlockImport<Block, FullClient, FullGrandpaBlockImport>,
 		&sc_consensus_babe::BabeLink<Block>,
@@ -178,6 +178,8 @@ pub fn new_full_base(
 
 	let shared_voter_state = rpc_setup;
 
+	config.network.notifications_protocols.push(grandpa::GRANDPA_PROTOCOL_NAME.into());
+
 	let (network, network_status_sinks, system_rpc_tx, network_starter) =
 		sc_service::build_network(sc_service::BuildNetworkParams {
 			config: &config,
@@ -315,8 +317,6 @@ pub fn new_full_base(
 			"grandpa-voter",
 			grandpa::run_grandpa_voter(grandpa_config)?
 		);
-	} else {
-		grandpa::setup_disabled_grandpa(network.clone())?;
 	}
 
 	network_starter.start_network();
@@ -338,7 +338,7 @@ pub fn new_full(config: Configuration)
 	})
 }
 
-pub fn new_light_base(config: Configuration) -> Result<(
+pub fn new_light_base(mut config: Configuration) -> Result<(
 	TaskManager, RpcHandlers, Arc<LightClient>,
 	Arc<NetworkService<Block, <Block as BlockT>::Hash>>,
 	Arc<sc_transaction_pool::LightPool<Block, LightClient, sc_network::config::OnDemand<Block>>>
@@ -346,6 +346,8 @@ pub fn new_light_base(config: Configuration) -> Result<(
 	let (client, backend, keystore_container, mut task_manager, on_demand) =
 		sc_service::new_light_parts::<Block, RuntimeApi, Executor>(&config)?;
 
+	config.network.notifications_protocols.push(grandpa::GRANDPA_PROTOCOL_NAME.into());
+
 	let select_chain = sc_consensus::LongestChain::new(backend.clone());
 
 	let transaction_pool = Arc::new(sc_transaction_pool::BasicPool::new_light(
diff --git a/client/finality-grandpa/src/communication/mod.rs b/client/finality-grandpa/src/communication/mod.rs
index 038d82a8cdc3..29fe8bc7471a 100644
--- a/client/finality-grandpa/src/communication/mod.rs
+++ b/client/finality-grandpa/src/communication/mod.rs
@@ -68,6 +68,8 @@ mod periodic;
 #[cfg(test)]
 pub(crate) mod tests;
 
+/// Name of the notifications protocol used by Grandpa. Must be registered towards the networking
+/// in order for Grandpa to properly function.
 pub const GRANDPA_PROTOCOL_NAME: &'static str = "/paritytech/grandpa/1";
 
 // cost scalars for reporting peers.
diff --git a/client/finality-grandpa/src/communication/tests.rs b/client/finality-grandpa/src/communication/tests.rs
index e1685256f7b8..27a394a062bc 100644
--- a/client/finality-grandpa/src/communication/tests.rs
+++ b/client/finality-grandpa/src/communication/tests.rs
@@ -62,8 +62,6 @@ impl sc_network_gossip::Network<Block> for TestNetwork {
 		let _ = self.sender.unbounded_send(Event::WriteNotification(who, message));
 	}
 
-	fn register_notifications_protocol(&self, _: Cow<'static, str>) {}
-
 	fn announce(&self, block: Hash, _associated_data: Vec<u8>) {
 		let _ = self.sender.unbounded_send(Event::Announce(block));
 	}
diff --git a/client/finality-grandpa/src/lib.rs b/client/finality-grandpa/src/lib.rs
index c5f89717a64d..ced101b8c856 100644
--- a/client/finality-grandpa/src/lib.rs
+++ b/client/finality-grandpa/src/lib.rs
@@ -122,6 +122,7 @@ mod until_imported;
 mod voting_rule;
 
 pub use authorities::{SharedAuthoritySet, AuthoritySet};
+pub use communication::GRANDPA_PROTOCOL_NAME;
 pub use finality_proof::{FinalityProofFragment, FinalityProofProvider, StorageAndProofProvider};
 pub use notification::{GrandpaJustificationSender, GrandpaJustificationStream};
 pub use import::GrandpaBlockImport;
@@ -652,6 +653,10 @@ pub struct GrandpaParams<Block: BlockT, C, N, SC, VR> {
 	/// A link to the block import worker.
 	pub link: LinkHalf<Block, C, SC>,
 	/// The Network instance.
+	///
+	/// It is assumed that this network will feed us Grandpa notifications. When using the
+	/// `sc_network` crate, it is assumed that the Grandpa notifications protocol has been passed
+	/// to the configuration of the networking.
 	pub network: N,
 	/// If supplied, can be used to hook on telemetry connection established events.
 	pub telemetry_on_connect: Option<TracingUnboundedReceiver<()>>,
@@ -1065,26 +1070,6 @@ where
 	}
 }
 
-/// When GRANDPA is not initialized we still need to register the finality
-/// tracker inherent provider which might be expected by the runtime for block
-/// authoring. Additionally, we register a gossip message validator that
-/// discards all GRANDPA messages (otherwise, we end up banning nodes that send
-/// us a `Neighbor` message, since there is no registered gossip validator for
-/// the engine id defined in the message.)
-pub fn setup_disabled_grandpa<Block: BlockT, N>(network: N) -> Result<(), sp_consensus::Error>
-where
-	N: NetworkT<Block> + Send + Clone + 'static,
-{
-	// We register the GRANDPA protocol so that we don't consider it an anomaly
-	// to receive GRANDPA messages on the network. We don't process the
-	// messages.
-	network.register_notifications_protocol(
-		From::from(communication::GRANDPA_PROTOCOL_NAME),
-	);
-
-	Ok(())
-}
-
 /// Checks if this node has any available keys in the keystore for any authority id in the given
 /// voter set.  Returns the authority id for which keys are available, or `None` if no keys are
 /// available.
diff --git a/client/finality-grandpa/src/tests.rs b/client/finality-grandpa/src/tests.rs
index ef8168e84f66..452b30941de5 100644
--- a/client/finality-grandpa/src/tests.rs
+++ b/client/finality-grandpa/src/tests.rs
@@ -269,6 +269,52 @@ fn block_until_complete(future: impl Future + Unpin, net: &Arc<Mutex<GrandpaTest
 	);
 }
 
+// Spawns grandpa voters. Returns a future to spawn on the runtime.
+fn initialize_grandpa(
+	net: &mut GrandpaTestNet,
+	peers: &[Ed25519Keyring],
+) -> impl Future<Output = ()> {
+	let voters = stream::FuturesUnordered::new();
+
+	for (peer_id, key) in peers.iter().enumerate() {
+		let (keystore, _) = create_keystore(*key);
+
+		let (net_service, link) = {
+			// temporary needed for some reason
+			let link = net.peers[peer_id].data.lock().take().expect("link initialized at startup; qed");
+			(
+				net.peers[peer_id].network_service().clone(),
+				link,
+			)
+		};
+
+		let grandpa_params = GrandpaParams {
+			config: Config {
+				gossip_duration: TEST_GOSSIP_DURATION,
+				justification_period: 32,
+				keystore: Some(keystore),
+				name: Some(format!("peer#{}", peer_id)),
+				is_authority: true,
+				observer_enabled: true,
+			},
+			link,
+			network: net_service,
+			telemetry_on_connect: None,
+			voting_rule: (),
+			prometheus_registry: None,
+			shared_voter_state: SharedVoterState::empty(),
+		};
+		let voter = run_grandpa_voter(grandpa_params).expect("all in order with client and network");
+
+		fn assert_send<T: Send>(_: &T) { }
+		assert_send(&voter);
+
+		voters.push(voter);
+	}
+
+	voters.for_each(|_| async move {})
+}
+
 // run the voters to completion. provide a closure to be invoked after
 // the voters are spawned but before blocking on them.
 fn run_to_completion_with<F>(
@@ -288,22 +334,9 @@ fn run_to_completion_with<F>(
 		wait_for.push(f);
 	};
 
-	let mut keystore_paths = Vec::new();
-	for (peer_id, key) in peers.iter().enumerate() {
-		let (keystore, keystore_path) = create_keystore(*key);
-		keystore_paths.push(keystore_path);
-
+	for (peer_id, _) in peers.iter().enumerate() {
 		let highest_finalized = highest_finalized.clone();
-		let (client, net_service, link) = {
-			let net = net.lock();
-			// temporary needed for some reason
-			let link = net.peers[peer_id].data.lock().take().expect("link initialized at startup; qed");
-			(
-				net.peers[peer_id].client().clone(),
-				net.peers[peer_id].network_service().clone(),
-				link,
-			)
-		};
+		let client = net.lock().peers[peer_id].client().clone();
 
 		wait_for.push(
 			Box::pin(
@@ -319,30 +352,6 @@ fn run_to_completion_with<F>(
 					.map(|_| ())
 			)
 		);
-
-		fn assert_send<T: Send>(_: &T) { }
-
-		let grandpa_params = GrandpaParams {
-			config: Config {
-				gossip_duration: TEST_GOSSIP_DURATION,
-				justification_period: 32,
-				keystore: Some(keystore),
-				name: Some(format!("peer#{}", peer_id)),
-				is_authority: true,
-				observer_enabled: true,
-			},
-			link: link,
-			network: net_service,
-			telemetry_on_connect: None,
-			voting_rule: (),
-			prometheus_registry: None,
-			shared_voter_state: SharedVoterState::empty(),
-		};
-		let voter = run_grandpa_voter(grandpa_params).expect("all in order with client and network");
-
-		assert_send(&voter);
-
-		runtime.spawn(voter);
 	}
 
 	// wait for all finalized on each.
@@ -388,6 +397,7 @@ fn finalize_3_voters_no_observers() {
 	let voters = make_ids(peers);
 
 	let mut net = GrandpaTestNet::new(TestApi::new(voters), 3);
+	runtime.spawn(initialize_grandpa(&mut net, peers));
 	net.peer(0).push_blocks(20, false);
 	net.block_until_sync();
 
@@ -414,50 +424,18 @@ fn finalize_3_voters_1_full_observer() {
 	let voters = make_ids(peers);
 
 	let mut net = GrandpaTestNet::new(TestApi::new(voters), 4);
-	net.peer(0).push_blocks(20, false);
-	net.block_until_sync();
+	runtime.spawn(initialize_grandpa(&mut net, peers));
 
-	let net = Arc::new(Mutex::new(net));
-	let mut finality_notifications = Vec::new();
-
-	let all_peers = peers.iter()
-		.cloned()
-		.map(Some)
-		.chain(std::iter::once(None));
-
-	let mut keystore_paths = Vec::new();
-
-	let mut voters = Vec::new();
-
-	for (peer_id, local_key) in all_peers.enumerate() {
-		let (client, net_service, link) = {
-			let net = net.lock();
-			let link = net.peers[peer_id].data.lock().take().expect("link initialized at startup; qed");
-			(
-				net.peers[peer_id].client().clone(),
-				net.peers[peer_id].network_service().clone(),
-				link,
-			)
-		};
-		finality_notifications.push(
-			client.finality_notification_stream()
-				.take_while(|n| future::ready(n.header.number() < &20))
-				.for_each(move |_| future::ready(()))
-		);
-
-		let keystore = if let Some(local_key) = local_key {
-			let (keystore, keystore_path) = create_keystore(local_key);
-			keystore_paths.push(keystore_path);
-			Some(keystore)
-		} else {
-			None
-		};
+	runtime.spawn({
+		let peer_id = 3;
+		let net_service = net.peers[peer_id].network_service().clone();
+		let link = net.peers[peer_id].data.lock().take().expect("link initialized at startup; qed");
 
 		let grandpa_params = GrandpaParams {
 			config: Config {
 				gossip_duration: TEST_GOSSIP_DURATION,
 				justification_period: 32,
-				keystore,
+				keystore: None,
 				name: Some(format!("peer#{}", peer_id)),
 				is_authority: true,
 				observer_enabled: true,
@@ -470,11 +448,21 @@ fn finalize_3_voters_1_full_observer() {
 			shared_voter_state: SharedVoterState::empty(),
 		};
 
-		voters.push(run_grandpa_voter(grandpa_params).expect("all in order with client and network"));
-	}
+		run_grandpa_voter(grandpa_params).expect("all in order with client and network")
+	});
 
-	for voter in voters {
-		runtime.spawn(voter);
+	net.peer(0).push_blocks(20, false);
+
+	let net = Arc::new(Mutex::new(net));
+	let mut finality_notifications = Vec::new();
+
+	for peer_id in 0..4 {
+		let client = net.lock().peers[peer_id].client().clone();
+		finality_notifications.push(
+			client.finality_notification_stream()
+				.take_while(|n| future::ready(n.header.number() < &20))
+				.for_each(move |_| future::ready(()))
+		);
 	}
 
 	// wait for all finalized on each.
@@ -507,6 +495,13 @@ fn transition_3_voters_twice_1_full_observer() {
 
 	let observer = &[Ed25519Keyring::One];
 
+	let all_peers = peers_a.iter()
+		.chain(peers_b)
+		.chain(peers_c)
+		.chain(observer)
+		.cloned()
+		.collect::<HashSet<_>>(); // deduplicate
+
 	let genesis_voters = make_ids(peers_a);
 
 	let api = TestApi::new(genesis_voters);
@@ -514,6 +509,41 @@ fn transition_3_voters_twice_1_full_observer() {
 
 	let mut runtime = Runtime::new().unwrap();
 
+	let mut keystore_paths = Vec::new();
+	let mut voters = Vec::new();
+	for (peer_id, local_key) in all_peers.clone().into_iter().enumerate() {
+		let (keystore, keystore_path) = create_keystore(local_key);
+		keystore_paths.push(keystore_path);
+
+		let (net_service, link) = {
+			let net = net.lock();
+			let link = net.peers[peer_id].data.lock().take().expect("link initialized at startup; qed");
+			(
+				net.peers[peer_id].network_service().clone(),
+				link,
+			)
+		};
+
+		let grandpa_params = GrandpaParams {
+			config: Config {
+				gossip_duration: TEST_GOSSIP_DURATION,
+				justification_period: 32,
+				keystore: Some(keystore),
+				name: Some(format!("peer#{}", peer_id)),
+				is_authority: true,
+				observer_enabled: true,
+			},
+			link,
+			network: net_service,
+			telemetry_on_connect: None,
+			voting_rule: (),
+			prometheus_registry: None,
+			shared_voter_state: SharedVoterState::empty(),
+		};
+
+		voters.push(run_grandpa_voter(grandpa_params).expect("all in order with client and network"));
+	}
+
 	net.lock().peer(0).push_blocks(1, false);
 	net.lock().block_until_sync();
 
@@ -579,30 +609,13 @@ fn transition_3_voters_twice_1_full_observer() {
 	}
 
 	let mut finality_notifications = Vec::new();
-	let all_peers = peers_a.iter()
-		.chain(peers_b)
-		.chain(peers_c)
-		.chain(observer)
-		.cloned()
-		.collect::<HashSet<_>>() // deduplicate
-		.into_iter()
-		.enumerate();
-
-	let mut keystore_paths = Vec::new();
-	for (peer_id, local_key) in all_peers {
-		let (keystore, keystore_path) = create_keystore(local_key);
-		keystore_paths.push(keystore_path);
 
-		let (client, net_service, link) = {
-			let net = net.lock();
-			let link = net.peers[peer_id].data.lock().take().expect("link initialized at startup; qed");
-			(
-				net.peers[peer_id].client().clone(),
-				net.peers[peer_id].network_service().clone(),
-				link,
-			)
-		};
+	for voter in voters {
+		runtime.spawn(voter);
+	}
 
+	for (peer_id, _) in all_peers.into_iter().enumerate() {
+		let client = net.lock().peers[peer_id].client().clone();
 		finality_notifications.push(
 			client.finality_notification_stream()
 				.take_while(|n| future::ready(n.header.number() < &30))
@@ -615,26 +628,6 @@ fn transition_3_voters_twice_1_full_observer() {
 					assert_eq!(set.pending_changes().count(), 0);
 				})
 		);
-
-		let grandpa_params = GrandpaParams {
-			config: Config {
-				gossip_duration: TEST_GOSSIP_DURATION,
-				justification_period: 32,
-				keystore: Some(keystore),
-				name: Some(format!("peer#{}", peer_id)),
-				is_authority: true,
-				observer_enabled: true,
-			},
-			link: link,
-			network: net_service,
-			telemetry_on_connect: None,
-			voting_rule: (),
-			prometheus_registry: None,
-			shared_voter_state: SharedVoterState::empty(),
-		};
-		let voter = run_grandpa_voter(grandpa_params).expect("all in order with client and network");
-
-		runtime.spawn(voter);
 	}
 
 	// wait for all finalized on each.
@@ -650,6 +643,7 @@ fn justification_is_generated_periodically() {
 	let voters = make_ids(peers);
 
 	let mut net = GrandpaTestNet::new(TestApi::new(voters), 3);
+	runtime.spawn(initialize_grandpa(&mut net, peers));
 	net.peer(0).push_blocks(32, false);
 	net.block_until_sync();
 
@@ -673,6 +667,7 @@ fn sync_justifications_on_change_blocks() {
 	// 4 peers, 3 of them are authorities and participate in grandpa
 	let api = TestApi::new(voters);
 	let mut net = GrandpaTestNet::new(api, 4);
+	let voters = initialize_grandpa(&mut net, peers_a);
 
 	// add 20 blocks
 	net.peer(0).push_blocks(20, false);
@@ -697,6 +692,7 @@ fn sync_justifications_on_change_blocks() {
 	}
 
 	let net = Arc::new(Mutex::new(net));
+	runtime.spawn(voters);
 	run_to_completion(&mut runtime, 25, net.clone(), peers_a);
 
 	// the first 3 peers are grandpa voters and therefore have already finalized
@@ -734,6 +730,7 @@ fn finalizes_multiple_pending_changes_in_order() {
 	// 6 peers, 3 of them are authorities and participate in grandpa from genesis
 	let api = TestApi::new(genesis_voters);
 	let mut net = GrandpaTestNet::new(api, 6);
+	runtime.spawn(initialize_grandpa(&mut net, all_peers));
 
 	// add 20 blocks
 	net.peer(0).push_blocks(20, false);
@@ -792,7 +789,8 @@ fn force_change_to_new_set() {
 	let api = TestApi::new(make_ids(genesis_authorities));
 
 	let voters = make_ids(peers_a);
-	let net = GrandpaTestNet::new(api, 3);
+	let mut net = GrandpaTestNet::new(api, 3);
+	let voters_future = initialize_grandpa(&mut net, peers_a);
 	let net = Arc::new(Mutex::new(net));
 
 	net.lock().peer(0).generate_blocks(1, BlockOrigin::File, |builder| {
@@ -830,6 +828,7 @@ fn force_change_to_new_set() {
 	// it will only finalize if the forced transition happens.
 	// we add_blocks after the voters are spawned because otherwise
 	// the link-halves have the wrong AuthoritySet
+	runtime.spawn(voters_future);
 	run_to_completion(&mut runtime, 25, net, peers_a);
 }
 
@@ -937,10 +936,10 @@ fn test_bad_justification() {
 fn voter_persists_its_votes() {
 	use std::sync::atomic::{AtomicUsize, Ordering};
 	use futures::future;
-	use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver};
 
 	sp_tracing::try_init_simple();
 	let mut runtime = Runtime::new().unwrap();
+	let mut keystore_paths = Vec::new();
 
 	// we have two authorities but we'll only be running the voter for alice
 	// we are going to be listening for the prevotes it casts
@@ -949,152 +948,150 @@ fn voter_persists_its_votes() {
 
 	// alice has a chain with 20 blocks
 	let mut net = GrandpaTestNet::new(TestApi::new(voters.clone()), 2);
-	net.peer(0).push_blocks(20, false);
-	net.block_until_sync();
-
-	assert_eq!(net.peer(0).client().info().best_number, 20,
-			   "Peer #{} failed to sync", 0);
-
-
-	let peer = net.peer(0);
-	let client = peer.client().clone();
-	let net = Arc::new(Mutex::new(net));
-
-	// channel between the voter and the main controller.
-	// sending a message on the `voter_tx` restarts the voter.
-	let (voter_tx, voter_rx) = tracing_unbounded::<()>("");
-
-	let mut keystore_paths = Vec::new();
-
-	// startup a grandpa voter for alice but also listen for messages on a
-	// channel. whenever a message is received the voter is restarted. when the
-	// sender is dropped the voter is stopped.
-	{
-		let (keystore, keystore_path) = create_keystore(peers[0]);
-		keystore_paths.push(keystore_path);
-
-		struct ResettableVoter {
-			voter: Pin<Box<dyn Future<Output = ()> + Send + Unpin>>,
-			voter_rx: TracingUnboundedReceiver<()>,
-			net: Arc<Mutex<GrandpaTestNet>>,
-			client: PeersClient,
-			keystore: SyncCryptoStorePtr,
-		}
-
-		impl Future for ResettableVoter {
-			type Output = ();
-
-			fn poll(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> {
-				let this = Pin::into_inner(self);
-
-				if let Poll::Ready(()) = Pin::new(&mut this.voter).poll(cx) {
-					panic!("error in the voter");
-				}
-
-				match  Pin::new(&mut this.voter_rx).poll_next(cx) {
-					Poll::Pending => return Poll::Pending,
-					Poll::Ready(None) => return Poll::Ready(()),
-					Poll::Ready(Some(())) => {
-						let (_block_import, _, link) =
-							this.net.lock()
-									.make_block_import::<
-										TransactionFor<substrate_test_runtime_client::Backend, Block>
-									>(this.client.clone());
-						let link = link.lock().take().unwrap();
-
-						let grandpa_params = GrandpaParams {
-							config: Config {
-								gossip_duration: TEST_GOSSIP_DURATION,
-								justification_period: 32,
-								keystore: Some(this.keystore.clone()),
-								name: Some(format!("peer#{}", 0)),
-								is_authority: true,
-								observer_enabled: true,
-							},
-							link,
-							network: this.net.lock().peers[0].network_service().clone(),
-							telemetry_on_connect: None,
-							voting_rule: VotingRulesBuilder::default().build(),
-							prometheus_registry: None,
-							shared_voter_state: SharedVoterState::empty(),
-						};
-
-						let voter = run_grandpa_voter(grandpa_params)
-							.expect("all in order with client and network")
-							.map(move |r| {
-								// we need to keep the block_import alive since it owns the
-								// sender for the voter commands channel, if that gets dropped
-								// then the voter will stop
-								drop(_block_import);
-								r
-							});
-
-						this.voter = Box::pin(voter);
-						// notify current task in order to poll the voter
-						cx.waker().wake_by_ref();
-					}
-				};
-
-				Poll::Pending
-			}
-		}
-
-		// we create a "dummy" voter by setting it to `pending` and triggering the `tx`.
-		// this way, the `ResettableVoter` will reset its `voter` field to a value ASAP.
-		voter_tx.unbounded_send(()).unwrap();
-		runtime.spawn(ResettableVoter {
-			voter: Box::pin(futures::future::pending()),
-			voter_rx,
-			net: net.clone(),
-			client: client.clone(),
-			keystore,
-		});
-	}
-
-	let (exit_tx, exit_rx) = futures::channel::oneshot::channel::<()>();
 
 	// create the communication layer for bob, but don't start any
 	// voter. instead we'll listen for the prevote that alice casts
 	// and cast our own manually
-	{
+	let bob_keystore = {
 		let (keystore, keystore_path) = create_keystore(peers[1]);
 		keystore_paths.push(keystore_path);
-
+		keystore
+	};
+	let bob_network = {
 		let config = Config {
 			gossip_duration: TEST_GOSSIP_DURATION,
 			justification_period: 32,
-			keystore: Some(keystore.clone()),
+			keystore: Some(bob_keystore.clone()),
 			name: Some(format!("peer#{}", 1)),
 			is_authority: true,
 			observer_enabled: true,
 		};
 
 		let set_state = {
-			let (_, _, link) = net.lock()
+			let bob_client = net.peer(1).client().clone();
+			let (_, _, link) = net
 				.make_block_import::<
 					TransactionFor<substrate_test_runtime_client::Backend, Block>
-				>(client);
+				>(bob_client);
 			let LinkHalf { persistent_data, .. } = link.lock().take().unwrap();
 			let PersistentData { set_state, .. } = persistent_data;
 			set_state
 		};
 
-		let network = communication::NetworkBridge::new(
-			net.lock().peers[1].network_service().clone(),
+		communication::NetworkBridge::new(
+			net.peers[1].network_service().clone(),
 			config.clone(),
 			set_state,
 			None,
-		);
+		)
+	};
+
+	// spawn two voters for alice.
+	// half-way through the test, we stop one and start the other.
+	let (alice_voter1, abort) = future::abortable({
+		let (keystore, _) = create_keystore(peers[0]);
+
+		let (net_service, link) = {
+			// temporary needed for some reason
+			let link = net.peers[0].data.lock().take().expect("link initialized at startup; qed");
+			(
+				net.peers[0].network_service().clone(),
+				link,
+			)
+		};
+
+		let grandpa_params = GrandpaParams {
+			config: Config {
+				gossip_duration: TEST_GOSSIP_DURATION,
+				justification_period: 32,
+				keystore: Some(keystore),
+				name: Some(format!("peer#{}", 0)),
+				is_authority: true,
+				observer_enabled: true,
+			},
+			link,
+			network: net_service,
+			telemetry_on_connect: None,
+			voting_rule: VotingRulesBuilder::default().build(),
+			prometheus_registry: None,
+			shared_voter_state: SharedVoterState::empty(),
+		};
+
+		run_grandpa_voter(grandpa_params).expect("all in order with client and network")
+	});
+
+	fn alice_voter2(
+		peers: &[Ed25519Keyring],
+		net: Arc<Mutex<GrandpaTestNet>>,
+	) -> impl Future<Output = ()> + Unpin + Send + 'static {
+		let (keystore, _) = create_keystore(peers[0]);
+		let mut net = net.lock();
+
+		// we add a new peer to the test network and we'll use
+		// the network service of this new peer
+		net.add_full_peer();
+		let net_service = net.peers[2].network_service().clone();
+		// but we'll reuse the client from the first peer (alice_voter1)
+		// since we want to share the same database, so that we can
+		// read the persisted state after aborting alice_voter1.
+		let alice_client = net.peer(0).client().clone();
+
+		let (_block_import, _, link) = net
+			.make_block_import::<
+				TransactionFor<substrate_test_runtime_client::Backend, Block>
+			>(alice_client);
+		let link = link.lock().take().unwrap();
+
+		let grandpa_params = GrandpaParams {
+			config: Config {
+				gossip_duration: TEST_GOSSIP_DURATION,
+				justification_period: 32,
+				keystore: Some(keystore),
+				name: Some(format!("peer#{}", 0)),
+				is_authority: true,
+				observer_enabled: true,
+			},
+			link,
+			network: net_service,
+			telemetry_on_connect: None,
+			voting_rule: VotingRulesBuilder::default().build(),
+			prometheus_registry: None,
+			shared_voter_state: SharedVoterState::empty(),
+		};
+
+		run_grandpa_voter(grandpa_params)
+			.expect("all in order with client and network")
+			.map(move |r| {
+				// we need to keep the block_import alive since it owns the
+				// sender for the voter commands channel, if that gets dropped
+				// then the voter will stop
+				drop(_block_import);
+				r
+			})
+	};
+
+	runtime.spawn(alice_voter1);
+
+	net.peer(0).push_blocks(20, false);
+	net.block_until_sync();
+
+	assert_eq!(net.peer(0).client().info().best_number, 20,
+			   "Peer #{} failed to sync", 0);
+
+	let net = Arc::new(Mutex::new(net));
 
-		let (round_rx, round_tx) = network.round_communication(
-			Some((peers[1].public().into(), keystore).into()),
+	let (exit_tx, exit_rx) = futures::channel::oneshot::channel::<()>();
+
+	{
+		let (round_rx, round_tx) = bob_network.round_communication(
+			Some((peers[1].public().into(), bob_keystore).into()),
 			communication::Round(1),
 			communication::SetId(0),
 			Arc::new(VoterSet::new(voters).unwrap()),
 			HasVoted::No,
 		);
 
-		runtime.spawn(network);
+		runtime.spawn(bob_network);
 
 		let round_tx = Arc::new(Mutex::new(round_tx));
 		let exit_tx = Arc::new(Mutex::new(Some(exit_tx)));
@@ -1102,13 +1099,15 @@ fn voter_persists_its_votes() {
 		let net = net.clone();
 		let state = Arc::new(AtomicUsize::new(0));
 
+		let runtime_handle = runtime.handle().clone();
 		runtime.spawn(round_rx.for_each(move |signed| {
 			let net2 = net.clone();
 			let net = net.clone();
-			let voter_tx = voter_tx.clone();
+			let abort = abort.clone();
 			let round_tx = round_tx.clone();
 			let state = state.clone();
 			let exit_tx = exit_tx.clone();
+			let runtime_handle = runtime_handle.clone();
 
 			async move {
 				if state.compare_and_swap(0, 1, Ordering::SeqCst) == 0 {
@@ -1120,7 +1119,7 @@ fn voter_persists_its_votes() {
 
 					// its chain has 20 blocks and the voter targets 3/4 of the
 					// unfinalized chain, so the vote should be for block 15
-					assert!(prevote.target_number == 15);
+					assert_eq!(prevote.target_number, 15);
 
 					// we push 20 more blocks to alice's chain
 					net.lock().peer(0).push_blocks(20, false);
@@ -1143,7 +1142,8 @@ fn voter_persists_its_votes() {
 						net.lock().peer(0).client().as_full().unwrap().hash(30).unwrap().unwrap();
 
 					// we restart alice's voter
-					voter_tx.unbounded_send(()).unwrap();
+					abort.abort();
+					runtime_handle.spawn(alice_voter2(peers, net.clone()));
 
 					// and we push our own prevote for block 30
 					let prevote = finality_grandpa::Prevote {
@@ -1200,6 +1200,19 @@ fn finalize_3_voters_1_light_observer() {
 	let voters = make_ids(authorities);
 
 	let mut net = GrandpaTestNet::new(TestApi::new(voters), 4);
+	let voters = initialize_grandpa(&mut net, authorities);
+	let observer = observer::run_grandpa_observer(
+		Config {
+			gossip_duration: TEST_GOSSIP_DURATION,
+			justification_period: 32,
+			keystore: None,
+			name: Some("observer".to_string()),
+			is_authority: false,
+			observer_enabled: true,
+		},
+		net.peers[3].data.lock().take().expect("link initialized at startup; qed"),
+		net.peers[3].network_service().clone(),
+	).unwrap();
 	net.peer(0).push_blocks(20, false);
 	net.block_until_sync();
 
@@ -1209,32 +1222,10 @@ fn finalize_3_voters_1_light_observer() {
 	}
 
 	let net = Arc::new(Mutex::new(net));
-	let link = net.lock().peer(3).data.lock().take().expect("link initialized on startup; qed");
-
-	let finality_notifications = net.lock().peer(3).client().finality_notification_stream()
-		.take_while(|n| {
-			future::ready(n.header.number() < &20)
-		})
-		.collect::<Vec<_>>();
-
-	run_to_completion_with(&mut runtime, 20, net.clone(), authorities, |executor| {
-		executor.spawn(
-			observer::run_grandpa_observer(
-				Config {
-					gossip_duration: TEST_GOSSIP_DURATION,
-					justification_period: 32,
-					keystore: None,
-					name: Some("observer".to_string()),
-					is_authority: false,
-					observer_enabled: true,
-				},
-				link,
-				net.lock().peers[3].network_service().clone(),
-			).unwrap()
-		);
 
-		Some(Box::pin(finality_notifications.map(|_| ())))
-	});
+	runtime.spawn(voters);
+	runtime.spawn(observer);
+	run_to_completion(&mut runtime, 20, net.clone(), authorities);
 }
 
 #[test]
@@ -1245,9 +1236,7 @@ fn voter_catches_up_to_latest_round_when_behind() {
 	let peers = &[Ed25519Keyring::Alice, Ed25519Keyring::Bob];
 	let voters = make_ids(peers);
 
-	let mut net = GrandpaTestNet::new(TestApi::new(voters), 3);
-	net.peer(0).push_blocks(50, false);
-	net.block_until_sync();
+	let net = GrandpaTestNet::new(TestApi::new(voters), 2);
 
 	let net = Arc::new(Mutex::new(net));
 	let mut finality_notifications = Vec::new();
@@ -1300,6 +1289,9 @@ fn voter_catches_up_to_latest_round_when_behind() {
 		runtime.spawn(voter);
 	}
 
+	net.lock().peer(0).push_blocks(50, false);
+	net.lock().block_until_sync();
+
 	// wait for them to finalize block 50. since they'll vote on 3/4 of the
 	// unfinalized chain it will take at least 4 rounds to do it.
 	let wait_for_finality = ::futures::future::join_all(finality_notifications);
@@ -1311,18 +1303,15 @@ fn voter_catches_up_to_latest_round_when_behind() {
 		let runtime = runtime.handle().clone();
 
 		wait_for_finality.then(move |_| {
-			let peer_id = 2;
+			net.lock().add_full_peer();
+
 			let link = {
 				let net = net.lock();
-				let mut link = net.peers[peer_id].data.lock();
+				let mut link = net.peers[2].data.lock();
 				link.take().expect("link initialized at startup; qed")
 			};
-
 			let set_state = link.persistent_data.set_state.clone();
-
-			let voter = voter(None, peer_id, link, net);
-
-			runtime.spawn(voter);
+			runtime.spawn(voter(None, 2, link, net.clone()));
 
 			let start_time = std::time::Instant::now();
 			let timeout = Duration::from_secs(5 * 60);
diff --git a/client/network-gossip/src/bridge.rs b/client/network-gossip/src/bridge.rs
index 98ada69590f1..4deaad6d748f 100644
--- a/client/network-gossip/src/bridge.rs
+++ b/client/network-gossip/src/bridge.rs
@@ -72,11 +72,7 @@ impl<B: BlockT> GossipEngine<B> {
 		validator: Arc<dyn Validator<B>>,
 	) -> Self where B: 'static {
 		let protocol = protocol.into();
-
-		// We grab the event stream before registering the notifications protocol, otherwise we
-		// might miss events.
 		let network_event_stream = network.event_stream();
-		network.register_notifications_protocol(protocol.clone());
 
 		GossipEngine {
 			state_machine: ConsensusGossip::new(validator, protocol.clone()),
@@ -335,8 +331,6 @@ mod tests {
 			unimplemented!();
 		}
 
-		fn register_notifications_protocol(&self, _: Cow<'static, str>) {}
-
 		fn announce(&self, _: B::Hash, _: Vec<u8>) {
 			unimplemented!();
 		}
diff --git a/client/network-gossip/src/lib.rs b/client/network-gossip/src/lib.rs
index 09e946d1a1ea..2b333610223e 100644
--- a/client/network-gossip/src/lib.rs
+++ b/client/network-gossip/src/lib.rs
@@ -81,14 +81,6 @@ pub trait Network<B: BlockT> {
 	/// Send a notification to a peer.
 	fn write_notification(&self, who: PeerId, protocol: Cow<'static, str>, message: Vec<u8>);
 
-	/// Registers a notifications protocol.
-	///
-	/// See the documentation of [`NetworkService:register_notifications_protocol`] for more information.
-	fn register_notifications_protocol(
-		&self,
-		protocol: Cow<'static, str>,
-	);
-
 	/// Notify everyone we're connected to that we have the given block.
 	///
 	/// Note: this method isn't strictly related to gossiping and should eventually be moved
@@ -113,13 +105,6 @@ impl<B: BlockT, H: ExHashT> Network<B> for Arc<NetworkService<B, H>> {
 		NetworkService::write_notification(self, who, protocol, message)
 	}
 
-	fn register_notifications_protocol(
-		&self,
-		protocol: Cow<'static, str>,
-	) {
-		NetworkService::register_notifications_protocol(self, protocol)
-	}
-
 	fn announce(&self, block: B::Hash, associated_data: Vec<u8>) {
 		NetworkService::announce_block(self, block, associated_data)
 	}
diff --git a/client/network-gossip/src/state_machine.rs b/client/network-gossip/src/state_machine.rs
index 8bd6d9df0191..88f9d48375de 100644
--- a/client/network-gossip/src/state_machine.rs
+++ b/client/network-gossip/src/state_machine.rs
@@ -503,8 +503,6 @@ mod tests {
 			unimplemented!();
 		}
 
-		fn register_notifications_protocol(&self, _: Cow<'static, str>) {}
-
 		fn announce(&self, _: B::Hash, _: Vec<u8>) {
 			unimplemented!();
 		}
diff --git a/client/network/README.md b/client/network/README.md
index e0bd691043be..914720f53e2a 100644
--- a/client/network/README.md
+++ b/client/network/README.md
@@ -120,8 +120,8 @@ bytes.
 block announces are pushed to other nodes. The handshake is empty on both sides. The message
 format is a SCALE-encoded tuple containing a block header followed with an opaque list of
 bytes containing some data associated with this block announcement, e.g. a candidate message.
-- Notifications protocols that are registered using the `register_notifications_protocol`
-method. For example: `/paritytech/grandpa/1`. See below for more information.
+- Notifications protocols that are registered using `NetworkConfiguration::notifications_protocols`.
+For example: `/paritytech/grandpa/1`. See below for more information.
 
 ## The legacy Substrate substream
 
@@ -223,4 +223,4 @@ dispatching a background task with the [`NetworkWorker`].
 More precise usage details are still being worked on and will likely change in the future.
 
 
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/client/network/src/lib.rs b/client/network/src/lib.rs
index 91ea49bce76c..fb65c754d79a 100644
--- a/client/network/src/lib.rs
+++ b/client/network/src/lib.rs
@@ -141,8 +141,9 @@
 //! block announces are pushed to other nodes. The handshake is empty on both sides. The message
 //! format is a SCALE-encoded tuple containing a block header followed with an opaque list of
 //! bytes containing some data associated with this block announcement, e.g. a candidate message.
-//! - Notifications protocols that are registered using the `register_notifications_protocol`
-//! method. For example: `/paritytech/grandpa/1`. See below for more information.
+//! - Notifications protocols that are registered using
+//! `NetworkConfiguration::notifications_protocols`. For example: `/paritytech/grandpa/1`. See
+//! below for more information.
 //!
 //! ## The legacy Substrate substream
 //!
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 8c0dbd7eec6a..b6f162affd67 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -656,7 +656,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	/// >			between the remote voluntarily closing a substream or a network error
 	/// >			preventing the message from being delivered.
 	///
-	/// The protocol must have been registered with `register_notifications_protocol` or
+	/// The protocol must have been registered with
 	/// [`NetworkConfiguration::notifications_protocols`](crate::config::NetworkConfiguration::notifications_protocols).
 	///
 	pub fn write_notification(&self, target: PeerId, protocol: Cow<'static, str>, message: Vec<u8>) {
@@ -717,7 +717,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	/// return an error. It is however possible for the entire connection to be abruptly closed,
 	/// in which case enqueued notifications will be lost.
 	///
-	/// The protocol must have been registered with `register_notifications_protocol` or
+	/// The protocol must have been registered with
 	/// [`NetworkConfiguration::notifications_protocols`](crate::config::NetworkConfiguration::notifications_protocols).
 	///
 	/// # Usage
@@ -844,28 +844,6 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 		}
 	}
 
-	/// Registers a new notifications protocol.
-	///
-	/// After a protocol has been registered, you can call `write_notifications`.
-	///
-	/// **Important**: This method is a work-around, and you are instead strongly encouraged to
-	/// pass the protocol in the `NetworkConfiguration::notifications_protocols` list instead.
-	/// If you have no other choice but to use this method, you are very strongly encouraged to
-	/// call it very early on. Any connection open will retain the protocols that were registered
-	/// then, and not any new one.
-	///
-	/// Please call `event_stream` before registering a protocol, otherwise you may miss events
-	/// about the protocol that you have registered.
-	// TODO: remove this method after https://github.com/paritytech/substrate/issues/6827
-	pub fn register_notifications_protocol(
-		&self,
-		protocol_name: impl Into<Cow<'static, str>>,
-	) {
-		let _ = self.to_worker.unbounded_send(ServiceToWorkerMsg::RegisterNotifProtocol {
-			protocol_name: protocol_name.into(),
-		});
-	}
-
 	/// You may call this when new transactons are imported by the transaction pool.
 	///
 	/// All transactions will be fetched from the `TransactionPool` that was passed at
@@ -1222,9 +1200,6 @@ enum ServiceToWorkerMsg<B: BlockT, H: ExHashT> {
 		request: Vec<u8>,
 		pending_response: oneshot::Sender<Result<Vec<u8>, RequestFailure>>,
 	},
-	RegisterNotifProtocol {
-		protocol_name: Cow<'static, str>,
-	},
 	DisconnectPeer(PeerId),
 	NewBestBlockImported(B::Hash, NumberFor<B>),
 }
@@ -1359,8 +1334,6 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 						},
 					}
 				},
-				ServiceToWorkerMsg::RegisterNotifProtocol { protocol_name } =>
-					this.network_service.register_notifications_protocol(protocol_name),
 				ServiceToWorkerMsg::DisconnectPeer(who) =>
 					this.network_service.user_protocol_mut().disconnect_peer(&who),
 				ServiceToWorkerMsg::NewBestBlockImported(hash, number) =>

From a364e27d6e3971d756d28435efc468d95add52d3 Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Wed, 2 Dec 2020 18:45:49 +0100
Subject: [PATCH 0135/1194] *: Update to libp2p v0.31.2 (#7658)

---
 Cargo.lock                             | 12 ++++++------
 client/authority-discovery/Cargo.toml  |  2 +-
 client/cli/Cargo.toml                  |  2 +-
 client/network-gossip/Cargo.toml       |  2 +-
 client/network/Cargo.toml              |  4 ++--
 client/network/test/Cargo.toml         |  2 +-
 client/peerset/Cargo.toml              |  2 +-
 client/telemetry/Cargo.toml            |  2 +-
 primitives/consensus/common/Cargo.toml |  2 +-
 9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 681a65fccd92..b3ad559ff5ef 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2780,9 +2780,9 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
 
 [[package]]
 name = "libp2p"
-version = "0.31.1"
+version = "0.31.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24966e73cc5624a6cf14b025365f67cb6da436b4d6337ed84d198063ba74451d"
+checksum = "724846a3194368fefcac7ebdab12e01b8ac382e3efe399ddbd28851ab34f396f"
 dependencies = [
  "atomic",
  "bytes 0.5.6",
@@ -2818,9 +2818,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-core"
-version = "0.25.1"
+version = "0.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d92fab5df60c9705e05750d9ecee6a5af15aed1e3fa86e09fd3dd07ec5dc8e"
+checksum = "cc9c96d3a606a696a3a6c0ad3c3352c57bda2082ec9090930f1bd9daf787039f"
 dependencies = [
  "asn1_der",
  "bs58",
@@ -3571,9 +3571,9 @@ checksum = "1255076139a83bb467426e7f8d0134968a8118844faa755985e077cf31850333"
 
 [[package]]
 name = "multistream-select"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46e19fd46149acdd3600780ebaa09f6ae4e7f2ddbafec64aab54cf75aafd1746"
+checksum = "dda822043bba2d6da31c4e14041f9794f8fb130a5959289038d0b809d8888614"
 dependencies = [
  "bytes 0.5.6",
  "futures 0.3.8",
diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml
index 0d2a254c6b16..4cd2dae1388a 100644
--- a/client/authority-discovery/Cargo.toml
+++ b/client/authority-discovery/Cargo.toml
@@ -23,7 +23,7 @@ derive_more = "0.99.2"
 either = "1.5.3"
 futures = "0.3.4"
 futures-timer = "3.0.1"
-libp2p = { version = "0.31.1", default-features = false, features = ["kad"] }
+libp2p = { version = "0.31.2", default-features = false, features = ["kad"] }
 log = "0.4.8"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.8.0"}
 prost = "0.6.1"
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index 45312202e861..ef9de997162e 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -21,7 +21,7 @@ ansi_term = "0.12.1"
 tokio = { version = "0.2.21", features = [ "signal", "rt-core", "rt-threaded", "blocking" ] }
 futures = "0.3.4"
 fdlimit = "0.2.1"
-libp2p = "0.31.1"
+libp2p = "0.31.2"
 parity-scale-codec = "1.3.0"
 hex = "0.4.2"
 rand = "0.7.3"
diff --git a/client/network-gossip/Cargo.toml b/client/network-gossip/Cargo.toml
index edd993ce505d..bbbb83f20616 100644
--- a/client/network-gossip/Cargo.toml
+++ b/client/network-gossip/Cargo.toml
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 futures = "0.3.4"
 futures-timer = "3.0.1"
-libp2p = { version = "0.31.1", default-features = false }
+libp2p = { version = "0.31.2", default-features = false }
 log = "0.4.8"
 lru = "0.6.1"
 sc-network = { version = "0.8.0", path = "../network" }
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index 123ef6ddbc7b..0b8d3da928f5 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -64,13 +64,13 @@ wasm-timer = "0.2"
 zeroize = "1.0.0"
 
 [dependencies.libp2p]
-version = "0.31.1"
+version = "0.31.2"
 default-features = false
 features = ["identify", "kad", "mdns-async-std", "mplex", "noise", "ping", "request-response", "tcp-async-std", "websocket", "yamux"]
 
 [dev-dependencies]
 assert_matches = "1.3"
-libp2p = { version = "0.31.1", default-features = false }
+libp2p = { version = "0.31.2", default-features = false }
 quickcheck = "0.9.0"
 rand = "0.7.2"
 sp-keyring = { version = "2.0.0", path = "../../primitives/keyring" }
diff --git a/client/network/test/Cargo.toml b/client/network/test/Cargo.toml
index 84fc5e2ef78a..9640ca9ae8cc 100644
--- a/client/network/test/Cargo.toml
+++ b/client/network/test/Cargo.toml
@@ -19,7 +19,7 @@ parking_lot = "0.10.0"
 futures = "0.3.4"
 futures-timer = "3.0.1"
 rand = "0.7.2"
-libp2p = { version = "0.31.1", default-features = false }
+libp2p = { version = "0.31.2", default-features = false }
 sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
 sc-consensus = { version = "0.8.0", path = "../../../client/consensus/common" }
 sc-client-api = { version = "2.0.0", path = "../../api" }
diff --git a/client/peerset/Cargo.toml b/client/peerset/Cargo.toml
index 8ec83b6fd64b..d3f782bb9451 100644
--- a/client/peerset/Cargo.toml
+++ b/client/peerset/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 futures = "0.3.4"
-libp2p = { version = "0.31.1", default-features = false }
+libp2p = { version = "0.31.2", default-features = false }
 sp-utils = { version = "2.0.0", path = "../../primitives/utils"}
 log = "0.4.8"
 serde_json = "1.0.41"
diff --git a/client/telemetry/Cargo.toml b/client/telemetry/Cargo.toml
index a91d55e0c063..58f2a0662936 100644
--- a/client/telemetry/Cargo.toml
+++ b/client/telemetry/Cargo.toml
@@ -19,7 +19,7 @@ parking_lot = "0.10.0"
 futures = "0.3.4"
 futures-timer = "3.0.1"
 wasm-timer = "0.2.5"
-libp2p = { version = "0.31.1", default-features = false, features = ["dns", "tcp-async-std", "wasm-ext", "websocket"] }
+libp2p = { version = "0.31.2", default-features = false, features = ["dns", "tcp-async-std", "wasm-ext", "websocket"] }
 log = "0.4.8"
 pin-project = "0.4.6"
 rand = "0.7.2"
diff --git a/primitives/consensus/common/Cargo.toml b/primitives/consensus/common/Cargo.toml
index a76abfcea360..375e976ce5b7 100644
--- a/primitives/consensus/common/Cargo.toml
+++ b/primitives/consensus/common/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 thiserror = "1.0.21"
-libp2p = { version = "0.31.1", default-features = false }
+libp2p = { version = "0.31.2", default-features = false }
 log = "0.4.8"
 sp-core = { path= "../../core", version = "2.0.0"}
 sp-inherents = { version = "2.0.0", path = "../../inherents" }

From 9f57f27c702181bfb5d3a12a2bd80247becdd173 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Thu, 3 Dec 2020 11:51:08 +0100
Subject: [PATCH 0136/1194] Refactor `StorageInstance` trait to be usable more
 easily (#7659)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* refactor StorageInstance to be usable without macros

* better description

* update types  doc

* Update frame/support/src/traits.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 frame/support/src/storage/types/double_map.rs |  8 +++-----
 frame/support/src/storage/types/map.rs        |  8 +++-----
 frame/support/src/storage/types/value.rs      |  8 +++-----
 frame/support/src/traits.rs                   | 16 +++++++++++-----
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/frame/support/src/storage/types/double_map.rs b/frame/support/src/storage/types/double_map.rs
index 8e315cef85cb..3e37c0522e32 100644
--- a/frame/support/src/storage/types/double_map.rs
+++ b/frame/support/src/storage/types/double_map.rs
@@ -34,7 +34,7 @@ use sp_std::vec::Vec;
 ///
 /// Each value is stored at:
 /// ```nocompile
-/// Twox128(<Prefix::Pallet as PalletInfo>::name())
+/// Twox128(Prefix::pallet_prefix())
 ///		++ Twox128(Prefix::STORAGE_PREFIX)
 ///		++ Hasher1(encode(key1))
 ///		++ Hasher2(encode(key2))
@@ -68,8 +68,7 @@ where
 	type Hasher1 = Hasher1;
 	type Hasher2 = Hasher2;
 	fn module_prefix() -> &'static [u8] {
-		<Prefix::PalletInfo as crate::traits::PalletInfo>::name::<Prefix::Pallet>()
-			.expect("Every active pallet has a name in the runtime; qed").as_bytes()
+		Prefix::pallet_prefix().as_bytes()
 	}
 	fn storage_prefix() -> &'static [u8] {
 		Prefix::STORAGE_PREFIX.as_bytes()
@@ -415,8 +414,7 @@ mod test {
 
 	struct Prefix;
 	impl StorageInstance for Prefix {
-		type Pallet = ();
-		type PalletInfo = ();
+		fn pallet_prefix() -> &'static str { "test" }
 		const STORAGE_PREFIX: &'static str = "foo";
 	}
 
diff --git a/frame/support/src/storage/types/map.rs b/frame/support/src/storage/types/map.rs
index d28b7dbaa7e2..64f9ff4b052a 100644
--- a/frame/support/src/storage/types/map.rs
+++ b/frame/support/src/storage/types/map.rs
@@ -33,7 +33,7 @@ use sp_std::prelude::*;
 ///
 /// Each value is stored at:
 /// ```nocompile
-/// Twox128(<Prefix::Pallet as PalletInfo>::name())
+/// Twox128(Prefix::pallet_prefix())
 ///		++ Twox128(Prefix::STORAGE_PREFIX)
 ///		++ Hasher1(encode(key))
 /// ```
@@ -60,8 +60,7 @@ where
 	type Query = QueryKind::Query;
 	type Hasher = Hasher;
 	fn module_prefix() -> &'static [u8] {
-		<Prefix::PalletInfo as crate::traits::PalletInfo>::name::<Prefix::Pallet>()
-			.expect("Every active pallet has a name in the runtime; qed").as_bytes()
+		Prefix::pallet_prefix().as_bytes()
 	}
 	fn storage_prefix() -> &'static [u8] {
 		Prefix::STORAGE_PREFIX.as_bytes()
@@ -318,8 +317,7 @@ mod test {
 
 	struct Prefix;
 	impl StorageInstance for Prefix {
-		type Pallet = ();
-		type PalletInfo = ();
+		fn pallet_prefix() -> &'static str { "test" }
 		const STORAGE_PREFIX: &'static str = "foo";
 	}
 
diff --git a/frame/support/src/storage/types/value.rs b/frame/support/src/storage/types/value.rs
index da80963b28f3..649b7b9fd272 100644
--- a/frame/support/src/storage/types/value.rs
+++ b/frame/support/src/storage/types/value.rs
@@ -31,7 +31,7 @@ use frame_metadata::{DefaultByteGetter, StorageEntryModifier};
 ///
 /// Each value is stored at:
 /// ```nocompile
-/// Twox128(<Prefix::Pallet as PalletInfo>::name()) ++ Twox128(Prefix::STORAGE_PREFIX)
+/// Twox128(Prefix::pallet_prefix()) ++ Twox128(Prefix::STORAGE_PREFIX)
 /// ```
 pub struct StorageValue<Prefix, Value, QueryKind=OptionQuery, OnEmpty=GetDefault>(
 	core::marker::PhantomData<(Prefix, Value, QueryKind, OnEmpty)>
@@ -47,8 +47,7 @@ where
 {
 	type Query = QueryKind::Query;
 	fn module_prefix() -> &'static [u8] {
-		<Prefix::PalletInfo as crate::traits::PalletInfo>::name::<Prefix::Pallet>()
-			.expect("Every active pallet has a name in the runtime; qed").as_bytes()
+		Prefix::pallet_prefix().as_bytes()
 	}
 	fn storage_prefix() -> &'static [u8] {
 		Prefix::STORAGE_PREFIX.as_bytes()
@@ -201,8 +200,7 @@ mod test {
 
 	struct Prefix;
 	impl StorageInstance for Prefix {
-		type Pallet = ();
-		type PalletInfo = ();
+		fn pallet_prefix() -> &'static str { "test" }
 		const STORAGE_PREFIX: &'static str = "foo";
 	}
 
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index 19c23a464db0..1bbcd87cc2e3 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -1731,13 +1731,19 @@ pub trait Instance: 'static {
 	const PREFIX: &'static str;
 }
 
-/// An instance of a storage.
+/// An instance of a storage in a pallet.
 ///
-/// It is required the the couple `(PalletInfo::name<Pallet>(), STORAGE_PREFIX)` is unique.
-/// Any storage with same couple will collide.
+/// Define an instance for an individual storage inside a pallet.
+/// The pallet prefix is used to isolate the storage between pallets, and the storage prefix is
+/// used to isolate storages inside a pallet.
+///
+/// NOTE: These information can be used to define storages in pallet such as a `StorageMap` which
+/// can use keys after `twox_128(pallet_prefix())++twox_128(STORAGE_PREFIX)`
 pub trait StorageInstance {
-	type Pallet: 'static;
-	type PalletInfo: PalletInfo;
+	/// Prefix of a pallet to isolate it from other pallets.
+	fn pallet_prefix() -> &'static str;
+
+	/// Prefix given to a storage to isolate from other storages in the pallet.
 	const STORAGE_PREFIX: &'static str;
 }
 

From fbd21bdc208d33efd009964f84248c384b2f76d2 Mon Sep 17 00:00:00 2001
From: LusWar <luswar@163.com>
Date: Thu, 3 Dec 2020 19:22:03 +0800
Subject: [PATCH 0137/1194] Update ss58 registry for Phala network (#7654)

---
 ss58-registry.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ss58-registry.json b/ss58-registry.json
index 80d600ed593b..8c7110060ba5 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -257,10 +257,10 @@
 			"prefix": 30,
 			"network": "phala",
 			"displayName": "Phala Network",
-			"symbols": null,
-			"decimals": null,
+			"symbols": ["PHA"],
+			"decimals": [12],
 			"standardAccount": "*25519",
-			"website": null
+			"website": "https://phala.network"
 		},
 		{
 			"prefix": 32,

From 675cbe9ac507a4f75bd0105ce02b00b772140c6b Mon Sep 17 00:00:00 2001
From: Krishna Singh <krishna.singh9926@gmail.com>
Date: Thu, 3 Dec 2020 18:14:53 +0530
Subject: [PATCH 0138/1194] Changed map to filter map so that Phragmen ignores
 empty voters (#7378)

* Changed map to filter map so that Phragmen ignores empty voters

* Resolve flaws and added test case

* Updated test
---
 primitives/npos-elections/src/lib.rs   | 18 ++++++++----
 primitives/npos-elections/src/tests.rs | 40 ++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/primitives/npos-elections/src/lib.rs b/primitives/npos-elections/src/lib.rs
index 11951d206598..d82839f02086 100644
--- a/primitives/npos-elections/src/lib.rs
+++ b/primitives/npos-elections/src/lib.rs
@@ -629,7 +629,7 @@ pub(crate) fn setup_inputs<AccountId: IdentifierT>(
 		})
 		.collect::<Vec<CandidatePtr<AccountId>>>();
 
-	let voters = initial_voters.into_iter().map(|(who, voter_stake, votes)| {
+	let voters = initial_voters.into_iter().filter_map(|(who, voter_stake, votes)| {
 		let mut edges: Vec<Edge<AccountId>> = Vec::with_capacity(votes.len());
 		for v in votes {
 			if edges.iter().any(|e| e.who == v) {
@@ -650,12 +650,18 @@ pub(crate) fn setup_inputs<AccountId: IdentifierT>(
 				);
 			} // else {} would be wrong votes. We don't really care about it.
 		}
-		Voter {
-			who,
-			edges: edges,
-			budget: voter_stake.into(),
-			load: Rational128::zero(),
+		if edges.is_empty() {
+			None
+		}
+		else {
+			Some(Voter {
+				who,
+				edges: edges,
+				budget: voter_stake.into(),
+				load: Rational128::zero(),
+			})
 		}
+
 	}).collect::<Vec<_>>();
 
 	(candidates, voters,)
diff --git a/primitives/npos-elections/src/tests.rs b/primitives/npos-elections/src/tests.rs
index dc7a1a5fdfb9..79f95a469adf 100644
--- a/primitives/npos-elections/src/tests.rs
+++ b/primitives/npos-elections/src/tests.rs
@@ -72,6 +72,46 @@ fn float_phragmen_poc_works() {
 	);
 }
 
+#[test]
+fn phragmen_core_test_without_edges() {
+	let candidates = vec![1, 2, 3];
+	let voters = vec![
+		(10, 10, vec![]),
+		(20, 20, vec![]),
+		(30, 30, vec![]),
+	];
+
+	let (candidates, voters) = setup_inputs(candidates, voters);
+
+	assert_eq!(
+		voters
+			.iter()
+			.map(|v| (
+				v.who,
+				v.budget,
+				(v.edges.iter().map(|e| (e.who, e.weight)).collect::<Vec<_>>()),
+			))
+			.collect::<Vec<_>>(),
+		vec![]
+	);
+
+	assert_eq!(
+		candidates
+			.iter()
+			.map(|c_ptr| (
+				c_ptr.borrow().who,
+				c_ptr.borrow().elected,
+				c_ptr.borrow().round,
+				c_ptr.borrow().backed_stake,
+			)).collect::<Vec<_>>(),
+		vec![
+			(1, false, 0, 0),
+			(2, false, 0, 0),
+			(3, false, 0, 0),
+		]
+	);
+}
+
 #[test]
 fn phragmen_core_poc_works() {
 	let candidates = vec![1, 2, 3];

From 0dfdc328fa2b9514847b354e6968553a9e29d61e Mon Sep 17 00:00:00 2001
From: mattrutherford <44339188+mattrutherford@users.noreply.github.com>
Date: Thu, 3 Dec 2020 13:17:44 +0000
Subject: [PATCH 0139/1194] RPC to allow setting the log filter (#7474)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add filter reload handle

* add RPC, move logging module from cli to tracing

* remove dup fn

* working example

* Update client/rpc-api/src/system/mod.rs

Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>

* Prefer "set" to "reload"

* Re-enable the commented out features of the logger

* Remove duplicate code

* cleanup

* unneeded lvar

* Bump to latest patch release

* Add new CLI option to disable log filter reloading,

Move profiling CLI options to SharedParams

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Applied suggestions from reviews

* Fix calls to init_logger()

* Handle errors when parsing logging directives

* Deny `system_setLogFilter` RPC by default

* One more time

* Don't ignore parse errors for log directives set via CLI or RPC

* Improve docs

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/cli/src/config.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* fix merge errors

* include default directives with system_setLogFilter RPC,

implement system_rawSetLogFilter RPC to exclude defaults

* docs etc...

* update test

* refactor: rename fn

* Add a test for system_set_log_filter – NOTE: the code should likely change to return an error when bad directives are passed

* Update client/cli/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Address review grumbles

* Add doc note on panicking behaviour

* print all invalid directives before panic

* change RPCs to: addLogFilter and resetLogFilter

* make CLI log directives default

* add comments

* restore previous behaviour to panic when hard-coded directives are invalid

* change/refactor directive parsing

* fix line width

* add test for log filter reloading

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* finish up suggestions from code review

* improve test

* change expect message

* change fn name

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* add docs, remove unused fn

* propagate Err on invalid log directive

* Update tracing-subscriber version

* Improve docs for `disable_log_reloading` CLI param

Co-authored-by: Matt <mattrutherford@users.noreply.github.com>
Co-authored-by: David <dvdplm@gmail.com>
Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 Cargo.lock                             |   8 +-
 client/cli/Cargo.toml                  |   5 +-
 client/cli/src/config.rs               |  28 ++++---
 client/cli/src/lib.rs                  | 110 ++++++++++++++++---------
 client/cli/src/params/import_params.rs |  25 +-----
 client/cli/src/params/shared_params.rs |  38 +++++++++
 client/executor/Cargo.toml             |   2 +-
 client/rpc-api/src/system/mod.rs       |  14 ++++
 client/rpc/Cargo.toml                  |   2 +
 client/rpc/src/system/mod.rs           |  11 +++
 client/rpc/src/system/tests.rs         |  83 ++++++++++++++++++-
 client/service/src/config.rs           |   2 +
 client/service/test/src/lib.rs         |   1 +
 client/tracing/Cargo.toml              |   7 +-
 client/tracing/src/lib.rs              | 109 ++++++++++++++++++++++--
 client/{cli => tracing}/src/logging.rs |  14 ++--
 primitives/tracing/Cargo.toml          |   2 +-
 utils/browser/src/lib.rs               |   1 +
 18 files changed, 365 insertions(+), 97 deletions(-)
 rename client/{cli => tracing}/src/logging.rs (97%)

diff --git a/Cargo.lock b/Cargo.lock
index b3ad559ff5ef..eb98e96a8894 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6389,7 +6389,6 @@ dependencies = [
  "fdlimit",
  "futures 0.3.8",
  "hex",
- "lazy_static",
  "libp2p",
  "log",
  "names",
@@ -7139,11 +7138,13 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.10.2",
  "sc-block-builder",
+ "sc-cli",
  "sc-client-api",
  "sc-executor",
  "sc-keystore",
  "sc-network",
  "sc-rpc-api",
+ "sc-tracing",
  "sc-transaction-pool",
  "serde_json",
  "sp-api",
@@ -7381,9 +7382,13 @@ dependencies = [
 name = "sc-tracing"
 version = "2.0.0"
 dependencies = [
+ "ansi_term 0.12.1",
  "erased-serde",
+ "lazy_static",
  "log",
+ "once_cell",
  "parking_lot 0.10.2",
+ "regex",
  "rustc-hash",
  "sc-telemetry",
  "serde",
@@ -7392,6 +7397,7 @@ dependencies = [
  "sp-tracing",
  "tracing",
  "tracing-core",
+ "tracing-log",
  "tracing-subscriber",
 ]
 
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index ef9de997162e..f323f1940b18 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -16,8 +16,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 log = "0.4.11"
 atty = "0.2.13"
 regex = "1.4.2"
-lazy_static = "1.4.0"
-ansi_term = "0.12.1"
 tokio = { version = "0.2.21", features = [ "signal", "rt-core", "rt-threaded", "blocking" ] }
 futures = "0.3.4"
 fdlimit = "0.2.1"
@@ -47,7 +45,7 @@ chrono = "0.4.10"
 serde = "1.0.111"
 tracing = "0.1.22"
 tracing-log = "0.1.1"
-tracing-subscriber = "0.2.10"
+tracing-subscriber = "0.2.15"
 sc-cli-proc-macro = { version = "2.0.0", path = "./proc-macro" }
 thiserror = "1.0.21"
 
@@ -56,6 +54,7 @@ rpassword = "5.0.0"
 
 [dev-dependencies]
 tempfile = "3.1.0"
+ansi_term = "0.12.1"
 
 [features]
 wasmtime = [
diff --git a/client/cli/src/config.rs b/client/cli/src/config.rs
index ab7a335c1ce6..e4411e49408e 100644
--- a/client/cli/src/config.rs
+++ b/client/cli/src/config.rs
@@ -408,22 +408,18 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 
 	/// Get the tracing targets from the current object (if any)
 	///
-	/// By default this is retrieved from `ImportParams` if it is available. Otherwise its
+	/// By default this is retrieved from [`SharedParams`] if it is available. Otherwise its
 	/// `None`.
 	fn tracing_targets(&self) -> Result<Option<String>> {
-		Ok(self.import_params()
-			.map(|x| x.tracing_targets())
-			.unwrap_or_else(|| Default::default()))
+		Ok(self.shared_params().tracing_targets())
 	}
 
 	/// Get the TracingReceiver value from the current object
 	///
-	/// By default this is retrieved from `ImportParams` if it is available. Otherwise its
+	/// By default this is retrieved from [`SharedParams`] if it is available. Otherwise its
 	/// `TracingReceiver::default()`.
 	fn tracing_receiver(&self) -> Result<TracingReceiver> {
-		Ok(self.import_params()
-			.map(|x| x.tracing_receiver())
-			.unwrap_or_default())
+		Ok(self.shared_params().tracing_receiver())
 	}
 
 	/// Get the node key from the current object
@@ -519,6 +515,7 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 			dev_key_seed: self.dev_key_seed(is_dev)?,
 			tracing_targets: self.tracing_targets()?,
 			tracing_receiver: self.tracing_receiver()?,
+			disable_log_reloading: self.is_log_filter_reloading_disabled()?,
 			chain_spec,
 			max_runtime_instances,
 			announce_block: self.announce_block()?,
@@ -538,6 +535,11 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 		Ok(self.shared_params().log_filters().join(","))
 	}
 
+	/// Is log reloading disabled (enabled by default)
+	fn is_log_filter_reloading_disabled(&self) -> Result<bool> {
+		Ok(self.shared_params().is_log_filter_reloading_disabled())
+	}
+
 	/// Initialize substrate. This must be done only once per process.
 	///
 	/// This method:
@@ -549,12 +551,16 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 		let logger_pattern = self.log_filters()?;
 		let tracing_receiver = self.tracing_receiver()?;
 		let tracing_targets = self.tracing_targets()?;
+		let disable_log_reloading = self.is_log_filter_reloading_disabled()?;
 
 		sp_panic_handler::set(&C::support_url(), &C::impl_version());
 
-		if let Err(e) = init_logger(&logger_pattern, tracing_receiver, tracing_targets) {
-			log::warn!("💬 Problem initializing global logging framework: {:}", e)
-		}
+		init_logger(
+			&logger_pattern,
+			tracing_receiver,
+			tracing_targets,
+			disable_log_reloading,
+		)?;
 
 		if let Some(new_limit) = fdlimit::raise_fd_limit() {
 			if new_limit < RECOMMENDED_OPEN_FILE_DESCRIPTOR_LIMIT {
diff --git a/client/cli/src/lib.rs b/client/cli/src/lib.rs
index b543f80a9d3b..80882924bd3a 100644
--- a/client/cli/src/lib.rs
+++ b/client/cli/src/lib.rs
@@ -27,7 +27,6 @@ pub mod arg_enums;
 mod commands;
 mod config;
 mod error;
-mod logging;
 mod params;
 mod runner;
 
@@ -48,8 +47,13 @@ use structopt::{
 	StructOpt,
 };
 use tracing_subscriber::{
-	filter::Directive, fmt::time::ChronoLocal, layer::SubscriberExt, FmtSubscriber, Layer,
+	fmt::time::ChronoLocal,
+	EnvFilter,
+	FmtSubscriber,
+	Layer,
+	layer::SubscriberExt,
 };
+pub use sc_tracing::logging;
 
 pub use logging::PREFIX_LOG_SPAN;
 #[doc(hidden)]
@@ -243,12 +247,16 @@ pub fn init_logger(
 	pattern: &str,
 	tracing_receiver: sc_tracing::TracingReceiver,
 	profiling_targets: Option<String>,
+	disable_log_reloading: bool,
 ) -> std::result::Result<(), String> {
-	fn parse_directives(dirs: impl AsRef<str>) -> Vec<Directive> {
-		dirs.as_ref()
-			.split(',')
-			.filter_map(|s| s.parse().ok())
-			.collect()
+	use sc_tracing::parse_default_directive;
+
+	// Accept all valid directives and print invalid ones
+	fn parse_user_directives(mut env_filter: EnvFilter, dirs: &str) -> std::result::Result<EnvFilter, String> {
+		for dir in dirs.split(',') {
+			env_filter = env_filter.add_directive(parse_default_directive(&dir)?);
+		}
+		Ok(env_filter)
 	}
 
 	if let Err(e) = tracing_log::LogTracer::init() {
@@ -257,33 +265,35 @@ pub fn init_logger(
 		))
 	}
 
-	let mut env_filter = tracing_subscriber::EnvFilter::default()
+	// Initialize filter - ensure to use `parse_default_directive` for any defaults to persist
+	// after log filter reloading by RPC
+	let mut env_filter = EnvFilter::default()
+		// Enable info
+		.add_directive(parse_default_directive("info")
+			.expect("provided directive is valid"))
 		// Disable info logging by default for some modules.
-		.add_directive("ws=off".parse().expect("provided directive is valid"))
-		.add_directive("yamux=off".parse().expect("provided directive is valid"))
-		.add_directive("cranelift_codegen=off".parse().expect("provided directive is valid"))
+		.add_directive(parse_default_directive("ws=off")
+			.expect("provided directive is valid"))
+		.add_directive(parse_default_directive("yamux=off")
+			.expect("provided directive is valid"))
+		.add_directive(parse_default_directive("cranelift_codegen=off")
+			.expect("provided directive is valid"))
 		// Set warn logging by default for some modules.
-		.add_directive("cranelift_wasm=warn".parse().expect("provided directive is valid"))
-		.add_directive("hyper=warn".parse().expect("provided directive is valid"))
-		// Enable info for others.
-		.add_directive(tracing_subscriber::filter::LevelFilter::INFO.into());
+		.add_directive(parse_default_directive("cranelift_wasm=warn")
+			.expect("provided directive is valid"))
+		.add_directive(parse_default_directive("hyper=warn")
+			.expect("provided directive is valid"));
 
 	if let Ok(lvl) = std::env::var("RUST_LOG") {
 		if lvl != "" {
-			// We're not sure if log or tracing is available at this moment, so silently ignore the
-			// parse error.
-			for directive in parse_directives(lvl) {
-				env_filter = env_filter.add_directive(directive);
-			}
+			env_filter = parse_user_directives(env_filter, &lvl)?;
 		}
 	}
 
 	if pattern != "" {
 		// We're not sure if log or tracing is available at this moment, so silently ignore the
 		// parse error.
-		for directive in parse_directives(pattern) {
-			env_filter = env_filter.add_directive(directive);
-		}
+		env_filter = parse_user_directives(env_filter, pattern)?;
 	}
 
 	// If we're only logging `INFO` entries then we'll use a simplified logging format.
@@ -293,19 +303,16 @@ pub fn init_logger(
 	};
 
 	// Always log the special target `sc_tracing`, overrides global level.
+	// Required because profiling traces are emitted via `sc_tracing`
 	// NOTE: this must be done after we check the `max_level_hint` otherwise
 	// it is always raised to `TRACE`.
 	env_filter = env_filter.add_directive(
-		"sc_tracing=trace"
-			.parse()
-			.expect("provided directive is valid"),
+		parse_default_directive("sc_tracing=trace").expect("provided directive is valid")
 	);
 
 	// Make sure to include profiling targets in the filter
 	if let Some(profiling_targets) = profiling_targets.clone() {
-		for directive in parse_directives(profiling_targets) {
-			env_filter = env_filter.add_directive(directive);
-		}
+		env_filter = parse_user_directives(env_filter, &profiling_targets)?;
 	}
 
 	let enable_color = atty::is(atty::Stream::Stderr);
@@ -315,22 +322,42 @@ pub fn init_logger(
 		"%Y-%m-%d %H:%M:%S%.3f".to_string()
 	});
 
-	let subscriber = FmtSubscriber::builder()
+	let subscriber_builder = FmtSubscriber::builder()
 		.with_env_filter(env_filter)
-		.with_writer(std::io::stderr)
+		.with_writer(std::io::stderr as _)
 		.event_format(logging::EventFormat {
 			timer,
+			enable_color,
 			display_target: !simple,
 			display_level: !simple,
 			display_thread_name: !simple,
-			enable_color,
-		})
-		.finish()
-		.with(logging::NodeNameLayer);
+		});
+	if disable_log_reloading {
+		let subscriber = subscriber_builder
+			.finish()
+			.with(logging::NodeNameLayer);
+		initialize_tracing(subscriber, tracing_receiver, profiling_targets)
+	} else {
+		let subscriber_builder = subscriber_builder.with_filter_reloading();
+		let handle = subscriber_builder.reload_handle();
+		sc_tracing::set_reload_handle(handle);
+		let subscriber = subscriber_builder
+			.finish()
+			.with(logging::NodeNameLayer);
+		initialize_tracing(subscriber, tracing_receiver, profiling_targets)
+	}
+}
 
+fn initialize_tracing<S>(
+	subscriber: S,
+	tracing_receiver: sc_tracing::TracingReceiver,
+	profiling_targets: Option<String>,
+) -> std::result::Result<(), String>
+where
+	S: tracing::Subscriber + Send + Sync + 'static,
+{
 	if let Some(profiling_targets) = profiling_targets {
 		let profiling = sc_tracing::ProfilingLayer::new(tracing_receiver, &profiling_targets);
-
 		if let Err(e) = tracing::subscriber::set_global_default(subscriber.with(profiling)) {
 			return Err(format!(
 				"Registering Substrate tracing subscriber failed: {:}!", e
@@ -339,7 +366,7 @@ pub fn init_logger(
 	} else {
 		if let Err(e) = tracing::subscriber::set_global_default(subscriber) {
 			return Err(format!(
-				"Registering Substrate tracing subscriber  failed: {:}!", e
+				"Registering Substrate tracing subscriber failed: {:}!", e
 			))
 		}
 	}
@@ -356,7 +383,7 @@ mod tests {
 	#[test]
 	fn test_logger_filters() {
 		let test_pattern = "afg=debug,sync=trace,client=warn,telemetry,something-with-dash=error";
-		init_logger(&test_pattern, Default::default(), Default::default()).unwrap();
+		init_logger(&test_pattern, Default::default(), Default::default(), false).unwrap();
 
 		tracing::dispatcher::get_default(|dispatcher| {
 			let test_filter = |target, level| {
@@ -415,7 +442,7 @@ mod tests {
 	fn log_something_with_dash_target_name() {
 		if env::var("ENABLE_LOGGING").is_ok() {
 			let test_pattern = "test-target=info";
-			init_logger(&test_pattern, Default::default(), Default::default()).unwrap();
+			init_logger(&test_pattern, Default::default(), Default::default(), false).unwrap();
 
 			log::info!(target: "test-target", "{}", EXPECTED_LOG_MESSAGE);
 		}
@@ -450,7 +477,8 @@ mod tests {
 	#[test]
 	fn prefix_in_log_lines_entrypoint() {
 		if env::var("ENABLE_LOGGING").is_ok() {
-			init_logger("", Default::default(), Default::default()).unwrap();
+			let test_pattern = "test-target=info";
+			init_logger(&test_pattern, Default::default(), Default::default(), false).unwrap();
 			prefix_in_log_lines_process();
 		}
 	}
@@ -466,7 +494,7 @@ mod tests {
 	#[test]
 	fn do_not_write_with_colors_on_tty_entrypoint() {
 		if env::var("ENABLE_LOGGING").is_ok() {
-			init_logger("", Default::default(), Default::default()).unwrap();
+			init_logger("", Default::default(), Default::default(), false).unwrap();
 			log::info!("{}", ansi_term::Colour::Yellow.paint(EXPECTED_LOG_MESSAGE));
 		}
 	}
diff --git a/client/cli/src/params/import_params.rs b/client/cli/src/params/import_params.rs
index 1efd4383432f..376a72b8421f 100644
--- a/client/cli/src/params/import_params.rs
+++ b/client/cli/src/params/import_params.rs
@@ -17,7 +17,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::arg_enums::{
-	ExecutionStrategy, TracingReceiver, WasmExecutionMethod, DEFAULT_EXECUTION_BLOCK_CONSTRUCTION,
+	ExecutionStrategy, WasmExecutionMethod, DEFAULT_EXECUTION_BLOCK_CONSTRUCTION,
 	DEFAULT_EXECUTION_IMPORT_BLOCK, DEFAULT_EXECUTION_IMPORT_BLOCK_VALIDATOR,
 	DEFAULT_EXECUTION_OFFCHAIN_WORKER, DEFAULT_EXECUTION_OTHER, DEFAULT_EXECUTION_SYNCING,
 };
@@ -73,32 +73,9 @@ pub struct ImportParams {
 		default_value = "67108864"
 	)]
 	pub state_cache_size: usize,
-
-	/// Comma separated list of targets for tracing.
-	#[structopt(long = "tracing-targets", value_name = "TARGETS")]
-	pub tracing_targets: Option<String>,
-
-	/// Receiver to process tracing messages.
-	#[structopt(
-		long = "tracing-receiver",
-		value_name = "RECEIVER",
-		possible_values = &TracingReceiver::variants(),
-		case_insensitive = true,
-		default_value = "Log"
-	)]
-	pub tracing_receiver: TracingReceiver,
 }
 
 impl ImportParams {
-	/// Receiver to process tracing messages.
-	pub fn tracing_receiver(&self) -> sc_service::TracingReceiver {
-		self.tracing_receiver.clone().into()
-	}
-
-	/// Comma separated list of targets for tracing.
-	pub fn tracing_targets(&self) -> Option<String> {
-		self.tracing_targets.clone()
-	}
 
 	/// Specify the state cache size.
 	pub fn state_cache_size(&self) -> usize {
diff --git a/client/cli/src/params/shared_params.rs b/client/cli/src/params/shared_params.rs
index 3276e5b7c4ba..52b1488ea9cc 100644
--- a/client/cli/src/params/shared_params.rs
+++ b/client/cli/src/params/shared_params.rs
@@ -19,6 +19,7 @@
 use sc_service::config::BasePath;
 use std::path::PathBuf;
 use structopt::StructOpt;
+use crate::arg_enums::TracingReceiver;
 
 /// Shared parameters used by all `CoreParams`.
 #[derive(Debug, StructOpt)]
@@ -44,6 +45,28 @@ pub struct SharedParams {
 	/// By default, all targets log `info`. The global log level can be set with -l<level>.
 	#[structopt(short = "l", long, value_name = "LOG_PATTERN")]
 	pub log: Vec<String>,
+
+	/// Disable feature to dynamically update and reload the log filter.
+	///
+	/// By default this feature is enabled, however it leads to a small performance decrease.
+	/// The `system_addLogFilter` and `system_resetLogFilter` RPCs will have no effect with this
+	/// option set.
+	#[structopt(long = "disable-log-reloading")]
+	pub disable_log_reloading: bool,
+
+	/// Sets a custom profiling filter. Syntax is the same as for logging: <target>=<level>
+	#[structopt(long = "tracing-targets", value_name = "TARGETS")]
+	pub tracing_targets: Option<String>,
+
+	/// Receiver to process tracing messages.
+	#[structopt(
+		long = "tracing-receiver",
+		value_name = "RECEIVER",
+		possible_values = &TracingReceiver::variants(),
+		case_insensitive = true,
+		default_value = "Log"
+	)]
+	pub tracing_receiver: TracingReceiver,
 }
 
 impl SharedParams {
@@ -75,4 +98,19 @@ impl SharedParams {
 	pub fn log_filters(&self) -> &[String] {
 		&self.log
 	}
+
+	/// Is log reloading disabled
+	pub fn is_log_filter_reloading_disabled(&self) -> bool {
+		self.disable_log_reloading
+	}
+
+	/// Receiver to process tracing messages.
+	pub fn tracing_receiver(&self) -> sc_service::TracingReceiver {
+		self.tracing_receiver.clone().into()
+	}
+
+	/// Comma separated list of targets for tracing.
+	pub fn tracing_targets(&self) -> Option<String> {
+		self.tracing_targets.clone()
+	}
 }
diff --git a/client/executor/Cargo.toml b/client/executor/Cargo.toml
index 803a49d1deaa..c5ce4b86e12f 100644
--- a/client/executor/Cargo.toml
+++ b/client/executor/Cargo.toml
@@ -49,7 +49,7 @@ sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
 sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
 sc-tracing = { version = "2.0.0", path = "../tracing" }
 tracing = "0.1.22"
-tracing-subscriber = "0.2.10"
+tracing-subscriber = "0.2.15"
 
 [features]
 default = [ "std" ]
diff --git a/client/rpc-api/src/system/mod.rs b/client/rpc-api/src/system/mod.rs
index fbeec23ea508..f05f1fada901 100644
--- a/client/rpc-api/src/system/mod.rs
+++ b/client/rpc-api/src/system/mod.rs
@@ -108,4 +108,18 @@ pub trait SystemApi<Hash, Number> {
 	/// known block.
 	#[rpc(name = "system_syncState", returns = "SyncState<Number>")]
 	fn system_sync_state(&self) -> Receiver<SyncState<Number>>;
+
+	/// Adds the supplied directives to the current log filter
+	///
+	/// The syntax is identical to the CLI `<target>=<level>`:
+	///
+	/// `sync=debug,state=trace`
+	#[rpc(name = "system_addLogFilter", returns = "()")]
+	fn system_add_log_filter(&self, directives: String)
+		-> Result<(), jsonrpc_core::Error>;
+
+	/// Resets the log filter to Substrate defaults
+	#[rpc(name = "system_resetLogFilter", returns = "()")]
+	fn system_reset_log_filter(&self)
+		-> Result<(), jsonrpc_core::Error>;
 }
diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml
index 0af880f4330b..e68ac6e4e918 100644
--- a/client/rpc/Cargo.toml
+++ b/client/rpc/Cargo.toml
@@ -37,6 +37,7 @@ sc-block-builder = { version = "0.8.0", path = "../../client/block-builder" }
 sc-keystore = { version = "2.0.0", path = "../keystore" }
 sp-transaction-pool = { version = "2.0.0", path = "../../primitives/transaction-pool" }
 sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
+sc-tracing = { version = "2.0.0", path = "../../client/tracing" }
 hash-db = { version = "0.15.2", default-features = false }
 parking_lot = "0.10.0"
 lazy_static = { version = "1.4.0", optional = true }
@@ -50,6 +51,7 @@ sp-io = { version = "2.0.0", path = "../../primitives/io" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 tokio = "0.1.22"
 sc-transaction-pool = { version = "2.0.0", path = "../transaction-pool" }
+sc-cli = { version = "0.8.0", path = "../cli" }
 
 [features]
 test-helpers = ["lazy_static"]
diff --git a/client/rpc/src/system/mod.rs b/client/rpc/src/system/mod.rs
index 17fb6b77a571..f1ebf5f702a2 100644
--- a/client/rpc/src/system/mod.rs
+++ b/client/rpc/src/system/mod.rs
@@ -197,4 +197,15 @@ impl<B: traits::Block> SystemApi<B::Hash, <B::Header as HeaderT>::Number> for Sy
 		let _ = self.send_back.unbounded_send(Request::SyncState(tx));
 		Receiver(Compat::new(rx))
 	}
+
+	fn system_add_log_filter(&self, directives: String) -> std::result::Result<(), rpc::Error> {
+		self.deny_unsafe.check_if_safe()?;
+		sc_tracing::add_directives(&directives);
+		sc_tracing::reload_filter().map_err(|_e| rpc::Error::internal_error())
+	}
+
+	fn system_reset_log_filter(&self)-> std::result::Result<(), rpc::Error> {
+		self.deny_unsafe.check_if_safe()?;
+		sc_tracing::reset_log_filter().map_err(|_e| rpc::Error::internal_error())
+	}
 }
diff --git a/client/rpc/src/system/tests.rs b/client/rpc/src/system/tests.rs
index 61f1940dc201..fa3574e9dae0 100644
--- a/client/rpc/src/system/tests.rs
+++ b/client/rpc/src/system/tests.rs
@@ -24,7 +24,10 @@ use substrate_test_runtime_client::runtime::Block;
 use assert_matches::assert_matches;
 use futures::prelude::*;
 use sp_utils::mpsc::tracing_unbounded;
-use std::thread;
+use std::{
+	process::{Stdio, Command}, env, io::{BufReader, BufRead, Write},
+	sync::{Arc, Mutex}, thread, time::Duration
+};
 
 struct Status {
 	pub peers: usize,
@@ -333,3 +336,81 @@ fn system_network_remove_reserved() {
 	assert_eq!(runtime.block_on(good_fut), Ok(()));
 	assert!(runtime.block_on(bad_fut).is_err());
 }
+
+#[test]
+fn test_add_reset_log_filter() {
+	const EXPECTED_BEFORE_ADD: &'static str = "EXPECTED_BEFORE_ADD";
+	const EXPECTED_AFTER_ADD: &'static str = "EXPECTED_AFTER_ADD";
+
+	// Enter log generation / filter reload
+	if std::env::var("TEST_LOG_FILTER").is_ok() {
+		sc_cli::init_logger("test_before_add=debug", Default::default(), Default::default(), false).unwrap();
+		for line in std::io::stdin().lock().lines() {
+			let line = line.expect("Failed to read bytes");
+			if line.contains("add_reload") {
+				assert!(api(None).system_add_log_filter("test_after_add".to_owned()).is_ok(), "`system_add_log_filter` failed");
+			} else if line.contains("reset") {
+				assert!(api(None).system_reset_log_filter().is_ok(), "`system_reset_log_filter` failed");
+			} else if line.contains("exit") {
+				return;
+			}
+			log::debug!(target: "test_before_add", "{}", EXPECTED_BEFORE_ADD);
+			log::debug!(target: "test_after_add", "{}", EXPECTED_AFTER_ADD);
+		}
+	}
+
+	// Call this test again to enter the log generation / filter reload block
+	let test_executable = env::current_exe().expect("Unable to get current executable!");
+	let mut child_process = Command::new(test_executable)
+		.env("TEST_LOG_FILTER", "1")
+		.args(&["--nocapture", "test_add_reset_log_filter"])
+		.stdin(Stdio::piped())
+		.stderr(Stdio::piped())
+		.spawn()
+		.unwrap();
+
+	let child_stderr = child_process.stderr.take().expect("Could not get child stderr");
+	let mut child_out = BufReader::new(child_stderr);
+	let mut child_in = child_process.stdin.take().expect("Could not get child stdin");
+
+	let child_out_str = Arc::new(Mutex::new(String::new()));
+	let shared = child_out_str.clone();
+
+	let _handle = thread::spawn(move || {
+		let mut line = String::new();
+		while let Ok(_) = child_out.read_line(&mut line) {
+			shared.lock().unwrap().push_str(&line);
+			line.clear();
+		}
+	});
+
+	// Initiate logs loop in child process
+	child_in.write(b"\n").unwrap();
+	thread::sleep(Duration::from_millis(100));
+	let test1_str = child_out_str.lock().unwrap().clone();
+	// Assert that only the first target is present
+	assert!(test1_str.contains(EXPECTED_BEFORE_ADD));
+	assert!(!test1_str.contains(EXPECTED_AFTER_ADD));
+	child_out_str.lock().unwrap().clear();
+
+	// Initiate add directive & reload in child process
+	child_in.write(b"add_reload\n").unwrap();
+	thread::sleep(Duration::from_millis(100));
+	let test2_str = child_out_str.lock().unwrap().clone();
+	// Assert that both targets are now present
+	assert!(test2_str.contains(EXPECTED_BEFORE_ADD));
+	assert!(test2_str.contains(EXPECTED_AFTER_ADD));
+	child_out_str.lock().unwrap().clear();
+
+	// Initiate logs filter reset in child process
+	child_in.write(b"reset\n").unwrap();
+	thread::sleep(Duration::from_millis(100));
+	let test3_str = child_out_str.lock().unwrap().clone();
+	// Assert that only the first target is present as it was initially
+	assert!(test3_str.contains(EXPECTED_BEFORE_ADD));
+	assert!(!test3_str.contains(EXPECTED_AFTER_ADD));
+
+	// Return from child process
+	child_in.write(b"exit\n").unwrap();
+	assert!(child_process.wait().expect("Error waiting for child process").success());
+}
diff --git a/client/service/src/config.rs b/client/service/src/config.rs
index 0caf05b2485d..20a4995bbc75 100644
--- a/client/service/src/config.rs
+++ b/client/service/src/config.rs
@@ -103,6 +103,8 @@ pub struct Configuration {
 	pub dev_key_seed: Option<String>,
 	/// Tracing targets
 	pub tracing_targets: Option<String>,
+	/// Is log filter reloading disabled
+	pub disable_log_reloading: bool,
 	/// Tracing receiver
 	pub tracing_receiver: sc_tracing::TracingReceiver,
 	/// The size of the instances cache.
diff --git a/client/service/test/src/lib.rs b/client/service/test/src/lib.rs
index 28930473f0a0..cfcf7e9ab38d 100644
--- a/client/service/test/src/lib.rs
+++ b/client/service/test/src/lib.rs
@@ -274,6 +274,7 @@ fn node_config<G: RuntimeGenesis + 'static, E: ChainSpecExtension + Clone + 'sta
 		announce_block: true,
 		base_path: Some(BasePath::new(root)),
 		informant_output_format: Default::default(),
+		disable_log_reloading: false,
 	}
 }
 
diff --git a/client/tracing/Cargo.toml b/client/tracing/Cargo.toml
index 4964adafe649..28eeab0bdf71 100644
--- a/client/tracing/Cargo.toml
+++ b/client/tracing/Cargo.toml
@@ -13,15 +13,20 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+ansi_term = "0.12.1"
+tracing-log = "0.1.1"
 erased-serde = "0.3.9"
+lazy_static = "1.4.0"
 log = { version = "0.4.8" }
+once_cell = "1.4.1"
 parking_lot = "0.10.0"
+regex = "1.4.2"
 rustc-hash = "1.1.0"
 serde = "1.0.101"
 serde_json = "1.0.41"
 slog = { version = "2.5.2", features = ["nested-values"] }
 tracing = "0.1.22"
 tracing-core = "0.1.17"
-tracing-subscriber = "0.2.13"
+tracing-subscriber = "0.2.15"
 sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
 sc-telemetry = { version = "2.0.0", path = "../telemetry" }
diff --git a/client/tracing/src/lib.rs b/client/tracing/src/lib.rs
index 6690f283464e..f4017023eff1 100644
--- a/client/tracing/src/lib.rs
+++ b/client/tracing/src/lib.rs
@@ -24,6 +24,8 @@
 //!
 //! Currently we provide `Log` (default), `Telemetry` variants for `Receiver`
 
+pub mod logging;
+
 use rustc_hash::FxHashMap;
 use std::fmt;
 use std::time::{Duration, Instant};
@@ -37,12 +39,109 @@ use tracing::{
 	span::{Attributes, Id, Record},
 	subscriber::Subscriber,
 };
-use tracing_subscriber::{CurrentSpan, layer::{Layer, Context}};
+use tracing_subscriber::{
+	fmt::time::ChronoLocal,
+	CurrentSpan,
+	EnvFilter,
+	layer::{self, Layer, Context},
+	fmt as tracing_fmt,
+	Registry,
+};
 
 use sc_telemetry::{telemetry, SUBSTRATE_INFO};
 use sp_tracing::{WASM_NAME_KEY, WASM_TARGET_KEY, WASM_TRACE_IDENTIFIER};
+use tracing_subscriber::reload::Handle;
+use once_cell::sync::OnceCell;
+use tracing_subscriber::filter::Directive;
+
 const ZERO_DURATION: Duration = Duration::from_nanos(0);
 
+// The layered Subscriber as built up in `init_logger()`.
+// Used in the reload `Handle`.
+type SCSubscriber<
+	N = tracing_fmt::format::DefaultFields,
+	E = logging::EventFormat<ChronoLocal>,
+	W = fn() -> std::io::Stderr
+> = layer::Layered<tracing_fmt::Layer<Registry, N, E, W>, Registry>;
+
+// Handle to reload the tracing log filter
+static FILTER_RELOAD_HANDLE: OnceCell<Handle<EnvFilter, SCSubscriber>> = OnceCell::new();
+// Directives that are defaulted to when resetting the log filter
+static DEFAULT_DIRECTIVES: OnceCell<Mutex<Vec<String>>> = OnceCell::new();
+// Current state of log filter
+static CURRENT_DIRECTIVES: OnceCell<Mutex<Vec<String>>> = OnceCell::new();
+
+/// Initialize FILTER_RELOAD_HANDLE, only possible once
+pub fn set_reload_handle(handle: Handle<EnvFilter, SCSubscriber>) {
+	let _ = FILTER_RELOAD_HANDLE.set(handle);
+}
+
+/// Add log filter directive(s) to the defaults
+///
+/// The syntax is identical to the CLI `<target>=<level>`:
+///
+/// `sync=debug,state=trace`
+pub fn add_default_directives(directives: &str) {
+	DEFAULT_DIRECTIVES.get_or_init(|| Mutex::new(Vec::new())).lock().push(directives.to_owned());
+	add_directives(directives);
+}
+
+/// Add directives to current directives
+pub fn add_directives(directives: &str) {
+	CURRENT_DIRECTIVES.get_or_init(|| Mutex::new(Vec::new())).lock().push(directives.to_owned());
+}
+
+/// Reload the logging filter with the supplied directives added to the existing directives
+pub fn reload_filter() -> Result<(), String> {
+	let mut env_filter = EnvFilter::default();
+	if let Some(current_directives) = CURRENT_DIRECTIVES.get() {
+		// Use join and then split in case any directives added together
+		for directive in current_directives.lock().join(",").split(',').map(|d| d.parse()) {
+			match directive {
+				Ok(dir) => env_filter = env_filter.add_directive(dir),
+				Err(invalid_directive) => {
+					log::warn!(
+						target: "tracing",
+						"Unable to parse directive while setting log filter: {:?}",
+						invalid_directive,
+					);
+				}
+			}
+		}
+	}
+	env_filter = env_filter.add_directive(
+		"sc_tracing=trace"
+			.parse()
+			.expect("provided directive is valid"),
+	);
+	log::debug!(target: "tracing", "Reloading log filter with: {}", env_filter);
+	FILTER_RELOAD_HANDLE.get()
+		.ok_or("No reload handle present".to_string())?
+		.reload(env_filter)
+		.map_err(|e| format!("{}", e))
+}
+
+/// Resets the log filter back to the original state when the node was started.
+///
+/// Includes substrate defaults and CLI supplied directives.
+pub fn reset_log_filter() -> Result<(), String> {
+	*CURRENT_DIRECTIVES
+		.get_or_init(|| Mutex::new(Vec::new())).lock() =
+		DEFAULT_DIRECTIVES.get_or_init(|| Mutex::new(Vec::new())).lock().clone();
+	reload_filter()
+}
+
+/// Parse `Directive` and add to default directives if successful. 
+///
+/// Ensures the supplied directive will be restored when resetting the log filter.
+pub fn parse_default_directive(directive: &str) -> Result<Directive, String> {
+	let dir = directive
+		.parse()
+		.map_err(|_| format!("Unable to parse directive: {}", directive))?;
+	add_default_directives(directive);
+	Ok(dir)
+}
+
 /// Responsible for assigning ids to new spans, which are not re-used.
 pub struct ProfilingLayer {
 	targets: Vec<(String, Level)>,
@@ -231,15 +330,13 @@ impl ProfilingLayer {
 	/// either with a level, eg: "pallet=trace"
 	/// or without: "pallet" in which case the level defaults to `trace`.
 	/// wasm_tracing indicates whether to enable wasm traces
-	pub fn new_with_handler(trace_handler: Box<dyn TraceHandler>, targets: &str)
-		-> Self
-	{
+	pub fn new_with_handler(trace_handler: Box<dyn TraceHandler>, targets: &str) -> Self {
 		let targets: Vec<_> = targets.split(',').map(|s| parse_target(s)).collect();
 		Self {
 			targets,
 			trace_handler,
 			span_data: Mutex::new(FxHashMap::default()),
-			current_span: Default::default()
+			current_span: Default::default(),
 		}
 	}
 
@@ -461,7 +558,7 @@ mod tests {
 		};
 		let layer = ProfilingLayer::new_with_handler(
 			Box::new(handler),
-			"test_target"
+			"test_target",
 		);
 		let subscriber = tracing_subscriber::fmt().finish().with(layer);
 		(subscriber, spans, events)
diff --git a/client/cli/src/logging.rs b/client/tracing/src/logging.rs
similarity index 97%
rename from client/cli/src/logging.rs
rename to client/tracing/src/logging.rs
index ffb4c3dfaafa..370b09f781b4 100644
--- a/client/cli/src/logging.rs
+++ b/client/tracing/src/logging.rs
@@ -79,12 +79,12 @@ impl<'a> MaybeColorWriter<'a> {
 	}
 }
 
-pub(crate) struct EventFormat<T = SystemTime> {
-	pub(crate) timer: T,
-	pub(crate) display_target: bool,
-	pub(crate) display_level: bool,
-	pub(crate) display_thread_name: bool,
-	pub(crate) enable_color: bool,
+pub struct EventFormat<T = SystemTime> {
+	pub timer: T,
+	pub display_target: bool,
+	pub display_level: bool,
+	pub display_thread_name: bool,
+	pub enable_color: bool,
 }
 
 // NOTE: the following code took inspiration from tracing-subscriber
@@ -147,7 +147,7 @@ where
 	}
 }
 
-pub(crate) struct NodeNameLayer;
+pub struct NodeNameLayer;
 
 impl<S> Layer<S> for NodeNameLayer
 where
diff --git a/primitives/tracing/Cargo.toml b/primitives/tracing/Cargo.toml
index ba370f46b9b6..c6d4d7b4cacc 100644
--- a/primitives/tracing/Cargo.toml
+++ b/primitives/tracing/Cargo.toml
@@ -23,7 +23,7 @@ codec = { version = "1.3.1", package = "parity-scale-codec", default-features =
 tracing = { version = "0.1.22", default-features = false }
 tracing-core = { version = "0.1.17", default-features = false }
 log = { version = "0.4.8", optional = true }
-tracing-subscriber = { version = "0.2.10", optional = true, features = ["tracing-log"] }
+tracing-subscriber = { version = "0.2.15", optional = true, features = ["tracing-log"] }
 
 [features]
 default = [ "std" ]
diff --git a/utils/browser/src/lib.rs b/utils/browser/src/lib.rs
index 95ec7ca19c9a..bffd9fbedb28 100644
--- a/utils/browser/src/lib.rs
+++ b/utils/browser/src/lib.rs
@@ -105,6 +105,7 @@ where
 		informant_output_format: sc_informant::OutputFormat {
 			enable_color: false,
 		},
+		disable_log_reloading: false,
 	};
 
 	Ok(config)

From 864ce58c1da2ea12689967cace79760f22579adf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Thu, 3 Dec 2020 15:49:23 +0100
Subject: [PATCH 0140/1194] Use block requests to check if block responses are
 correct (#7653)

* Use block requests to check if block responses are correct

Before this pr sync relied on recently announced blocks to check if a
given peer response is correct. However this could lead to situations
where we requested a block from a peer and it gave us the requested, but
we rejected the response because this peer never send us an announcement
for the given block. See the added tests for a reproduction of the
problem.
With this pr, we now take the block request to check if a given response
matches the request. A node should not send us a block response
without a request anyway.

Essentially there is still a bug, because as you see in the test, we are
requesting block 2, while we already have this block imported. It even
happens that we request a block from the network that we have authored.
However a fix for this would require some more refactoring of the sync code.

* Revert change

* Give the test a proper name

* Add moar logging

* Move cheaper checks

* Move checks to common place
---
 client/network/src/protocol.rs                |  16 -
 client/network/src/protocol/sync.rs           | 333 +++++++++++++++---
 .../src/protocol/sync/extra_requests.rs       |   1 -
 3 files changed, 278 insertions(+), 72 deletions(-)

diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index 9e589330b7fb..52fbacd1be05 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -120,8 +120,6 @@ mod rep {
 	pub const BAD_PROTOCOL: Rep = Rep::new_fatal("Unsupported protocol");
 	/// Peer role does not match (e.g. light peer connecting to another light peer).
 	pub const BAD_ROLE: Rep = Rep::new_fatal("Unsupported role");
-	/// Peer response data does not have requested bits.
-	pub const BAD_RESPONSE: Rep = Rep::new(-(1 << 12), "Incomplete response");
 	/// Peer send us a block announcement that failed at validation.
 	pub const BAD_BLOCK_ANNOUNCEMENT: Rep = Rep::new(-(1 << 12), "Bad block announcement");
 }
@@ -706,20 +704,6 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 				}
 			}
 		} else {
-			// Validate fields against the request.
-			if request.fields.contains(message::BlockAttributes::HEADER) && response.blocks.iter().any(|b| b.header.is_none()) {
-				self.behaviour.disconnect_peer(&peer);
-				self.peerset_handle.report_peer(peer, rep::BAD_RESPONSE);
-				trace!(target: "sync", "Missing header for a block");
-				return CustomMessageOutcome::None
-			}
-			if request.fields.contains(message::BlockAttributes::BODY) && response.blocks.iter().any(|b| b.body.is_none()) {
-				self.behaviour.disconnect_peer(&peer);
-				self.peerset_handle.report_peer(peer, rep::BAD_RESPONSE);
-				trace!(target: "sync", "Missing body for a block");
-				return CustomMessageOutcome::None
-			}
-
 			match self.sync.on_block_data(&peer, Some(request), response) {
 				Ok(sync::OnBlockData::Import(origin, blocks)) =>
 					CustomMessageOutcome::BlockImport(origin, blocks),
diff --git a/client/network/src/protocol/sync.rs b/client/network/src/protocol/sync.rs
index ced789446da6..380cec244ccb 100644
--- a/client/network/src/protocol/sync.rs
+++ b/client/network/src/protocol/sync.rs
@@ -34,8 +34,8 @@ use sp_consensus::{BlockOrigin, BlockStatus,
 	block_validation::{BlockAnnounceValidator, Validation},
 	import_queue::{IncomingBlock, BlockImportResult, BlockImportError}
 };
-use crate::{
-	protocol::message::{self, BlockAnnounce, BlockAttributes, BlockRequest, BlockResponse, Roles},
+use crate::protocol::message::{
+	self, BlockAnnounce, BlockAttributes, BlockRequest, BlockResponse, Roles,
 };
 use either::Either;
 use extra_requests::ExtraRequests;
@@ -44,12 +44,14 @@ use log::{debug, trace, warn, info, error};
 use sp_runtime::{
 	Justification,
 	generic::BlockId,
-	traits::{Block as BlockT, Header, NumberFor, Zero, One, CheckedSub, SaturatedConversion, Hash, HashFor}
+	traits::{
+		Block as BlockT, Header as HeaderT, NumberFor, Zero, One, CheckedSub, SaturatedConversion,
+		Hash, HashFor,
+	},
 };
 use sp_arithmetic::traits::Saturating;
 use std::{
-	fmt, ops::Range, collections::{HashMap, hash_map::Entry, HashSet, VecDeque},
-	sync::Arc, pin::Pin,
+	fmt, ops::Range, collections::{HashMap, hash_map::Entry, HashSet}, sync::Arc, pin::Pin,
 };
 use futures::{task::Poll, Future, stream::FuturesUnordered, FutureExt, StreamExt};
 
@@ -83,9 +85,6 @@ const MAX_CONCURRENT_BLOCK_ANNOUNCE_VALIDATIONS_PER_PEER: usize = 4;
 /// so far behind.
 const MAJOR_SYNC_BLOCKS: u8 = 5;
 
-/// Number of recently announced blocks to track for each peer.
-const ANNOUNCE_HISTORY_SIZE: usize = 64;
-
 mod rep {
 	use sc_peerset::ReputationChange as Rep;
 	/// Reputation change when a peer sent us a message that led to a
@@ -108,14 +107,17 @@ mod rep {
 	/// Peer did not provide us with advertised block data.
 	pub const NO_BLOCK: Rep = Rep::new(-(1 << 29), "No requested block data");
 
-	/// Reputation change for peers which send us a known block.
-	pub const KNOWN_BLOCK: Rep = Rep::new(-(1 << 29), "Duplicate block");
+	/// Reputation change for peers which send us non-requested block data.
+	pub const NOT_REQUESTED: Rep = Rep::new(-(1 << 29), "Not requested block data");
 
 	/// Reputation change for peers which send us a block with bad justifications.
 	pub const BAD_JUSTIFICATION: Rep = Rep::new(-(1 << 16), "Bad justification");
 
 	/// Reputation change when a peer sent us invlid ancestry result.
 	pub const UNKNOWN_ANCESTOR:Rep = Rep::new(-(1 << 16), "DB Error");
+
+	/// Peer response data does not have requested bits.
+	pub const BAD_RESPONSE: Rep = Rep::new(-(1 << 12), "Incomplete response");
 }
 
 enum PendingRequests {
@@ -219,9 +221,6 @@ pub struct PeerSync<B: BlockT> {
 	/// The state of syncing this peer is in for us, generally categories
 	/// into `Available` or "busy" with something as defined by `PeerSyncState`.
 	pub state: PeerSyncState<B>,
-	/// A queue of blocks that this peer has announced to us, should only
-	/// contain `ANNOUNCE_HISTORY_SIZE` entries.
-	pub recently_announced: VecDeque<B::Hash>
 }
 
 /// The sync status of a peer we are trying to sync with
@@ -514,7 +513,6 @@ impl<B: BlockT> ChainSync<B> {
 						best_hash,
 						best_number,
 						state: PeerSyncState::Available,
-						recently_announced: Default::default()
 					});
 					return Ok(None)
 				}
@@ -527,7 +525,6 @@ impl<B: BlockT> ChainSync<B> {
 						best_hash,
 						best_number,
 						state: PeerSyncState::Available,
-						recently_announced: Default::default(),
 					});
 					self.pending_requests.add(&who);
 					return Ok(None)
@@ -551,7 +548,6 @@ impl<B: BlockT> ChainSync<B> {
 						start: self.best_queued_number,
 						state: AncestorSearchState::ExponentialBackoff(One::one()),
 					},
-					recently_announced: Default::default()
 				});
 
 				Ok(Some(ancestry_request::<B>(common_best)))
@@ -563,7 +559,6 @@ impl<B: BlockT> ChainSync<B> {
 					best_hash,
 					best_number,
 					state: PeerSyncState::Available,
-					recently_announced: Default::default(),
 				});
 				self.pending_requests.add(&who);
 				Ok(None)
@@ -751,13 +746,13 @@ impl<B: BlockT> ChainSync<B> {
 					blocks.reverse()
 				}
 				self.pending_requests.add(who);
-				if request.is_some() {
+				if let Some(request) = request {
 					match &mut peer.state {
 						PeerSyncState::DownloadingNew(start_block) => {
 							self.blocks.clear_peer_download(who);
 							let start_block = *start_block;
 							peer.state = PeerSyncState::Available;
-							validate_blocks::<B>(&blocks, who)?;
+							validate_blocks::<B>(&blocks, who, Some(request))?;
 							self.blocks.insert(start_block, blocks, who.clone());
 							self.blocks
 								.drain(self.best_queued_number + One::one())
@@ -780,7 +775,7 @@ impl<B: BlockT> ChainSync<B> {
 								debug!(target: "sync", "Empty block response from {}", who);
 								return Err(BadPeer(who.clone(), rep::NO_BLOCK));
 							}
-							validate_blocks::<B>(&blocks, who)?;
+							validate_blocks::<B>(&blocks, who, Some(request))?;
 							blocks.into_iter().map(|b| {
 								IncomingBlock {
 									hash: b.hash,
@@ -864,7 +859,7 @@ impl<B: BlockT> ChainSync<B> {
 					}
 				} else {
 					// When request.is_none() this is a block announcement. Just accept blocks.
-					validate_blocks::<B>(&blocks, who)?;
+					validate_blocks::<B>(&blocks, who, None)?;
 					blocks.into_iter().map(|b| {
 						IncomingBlock {
 							hash: b.hash,
@@ -878,40 +873,30 @@ impl<B: BlockT> ChainSync<B> {
 					}).collect()
 				}
 			} else {
-				Vec::new()
+				// We don't know of this peer, so we also did not request anything from it.
+				return Err(BadPeer(who.clone(), rep::NOT_REQUESTED));
 			};
 
-		// When doing initial sync we don't request blocks in parallel.
-		// So the only way this can happen is when peers lie about the
-		// common block.
-		let is_recent = new_blocks.first()
-			.map(|block| {
-				self.peers.iter().any(|(_, peer)| peer.recently_announced.contains(&block.hash))
-			})
-			.unwrap_or(false);
-
-		if !is_recent && new_blocks.last().map_or(false, |b| self.is_known(&b.hash)) {
-			// When doing initial sync we don't request blocks in parallel.
-			// So the only way this can happen is when peers lie about the
-			// common block.
-			debug!(target: "sync", "Ignoring known blocks from {}", who);
-			return Err(BadPeer(who.clone(), rep::KNOWN_BLOCK));
-		}
 		let orig_len = new_blocks.len();
 		new_blocks.retain(|b| !self.queue_blocks.contains(&b.hash));
 		if new_blocks.len() != orig_len {
 			debug!(target: "sync", "Ignoring {} blocks that are already queued", orig_len - new_blocks.len());
 		}
 
-		let origin =
-			if is_recent {
-				BlockOrigin::NetworkBroadcast
-			} else {
-				BlockOrigin::NetworkInitialSync
-			};
+		let origin = if self.status().state != SyncState::Downloading {
+			BlockOrigin::NetworkBroadcast
+		} else {
+			BlockOrigin::NetworkInitialSync
+		};
 
 		if let Some((h, n)) = new_blocks.last().and_then(|b| b.header.as_ref().map(|h| (&b.hash, *h.number()))) {
-			trace!(target:"sync", "Accepted {} blocks ({:?}) with origin {:?}", new_blocks.len(), h, origin);
+			trace!(
+				target:"sync",
+				"Accepted {} blocks ({:?}) with origin {:?}",
+				new_blocks.len(),
+				h,
+				origin,
+			);
 			self.on_block_queued(h, n)
 		}
 
@@ -1320,11 +1305,6 @@ impl<B: BlockT> ChainSync<B> {
 			return PollBlockAnnounceValidation::Nothing { is_best, who, header }
 		};
 
-		while peer.recently_announced.len() >= ANNOUNCE_HISTORY_SIZE {
-			peer.recently_announced.pop_front();
-		}
-		peer.recently_announced.push_back(hash.clone());
-
 		if is_best {
 			// update their best block
 			peer.best_number = number;
@@ -1600,8 +1580,7 @@ fn fork_sync_request<B: BlockT>(
 	finalized: NumberFor<B>,
 	attributes: &message::BlockAttributes,
 	check_block: impl Fn(&B::Hash) -> BlockStatus,
-) -> Option<(B::Hash, BlockRequest<B>)>
-{
+) -> Option<(B::Hash, BlockRequest<B>)> {
 	targets.retain(|hash, r| {
 		if r.number <= finalized {
 			trace!(target: "sync", "Removed expired fork sync request {:?} (#{})", hash, r.number);
@@ -1654,7 +1633,75 @@ fn is_descendent_of<Block, T>(client: &T, base: &Block::Hash, block: &Block::Has
 	Ok(ancestor.hash == *base)
 }
 
-fn validate_blocks<Block: BlockT>(blocks: &Vec<message::BlockData<Block>>, who: &PeerId) -> Result<(), BadPeer> {
+/// Validate that the given `blocks` are correct.
+///
+/// It is expected that `blocks` are in asending order.
+fn validate_blocks<Block: BlockT>(
+	blocks: &Vec<message::BlockData<Block>>,
+	who: &PeerId,
+	request: Option<BlockRequest<Block>>,
+) -> Result<(), BadPeer> {
+	if let Some(request) = request {
+		if Some(blocks.len() as _) > request.max {
+			debug!(
+				target: "sync",
+				"Received more blocks than requested from {}. Expected in maximum {:?}, got {}.",
+				who,
+				request.max,
+				blocks.len(),
+			);
+
+			return Err(BadPeer(who.clone(), rep::NOT_REQUESTED))
+		}
+
+		let block_header = if request.direction == message::Direction::Descending {
+			blocks.last()
+		} else {
+			blocks.first()
+		}.and_then(|b| b.header.as_ref());
+
+		let expected_block = block_header.as_ref()
+			.map_or(false, |h| match request.from {
+				message::FromBlock::Hash(hash) => h.hash() == hash,
+				message::FromBlock::Number(n) => h.number() == &n,
+			});
+
+		if !expected_block {
+			debug!(
+				target: "sync",
+				"Received block that was not requested. Requested {:?}, got {:?}.",
+				request.from,
+				block_header,
+			);
+
+			return Err(BadPeer(who.clone(), rep::NOT_REQUESTED))
+		}
+
+		if request.fields.contains(message::BlockAttributes::HEADER)
+			&& blocks.iter().any(|b| b.header.is_none())
+		{
+			trace!(
+				target: "sync",
+				"Missing requested header for a block in response from {}.",
+				who,
+			);
+
+			return Err(BadPeer(who.clone(), rep::BAD_RESPONSE))
+		}
+
+		if request.fields.contains(message::BlockAttributes::BODY)
+			&& blocks.iter().any(|b| b.body.is_none())
+		{
+			trace!(
+				target: "sync",
+				"Missing requested body for a block in response from {}.",
+				who,
+			);
+
+			return Err(BadPeer(who.clone(), rep::BAD_RESPONSE))
+		}
+	}
+
 	for b in blocks {
 		if let Some(header) = &b.header {
 			let hash = header.hash();
@@ -1685,20 +1732,23 @@ fn validate_blocks<Block: BlockT>(blocks: &Vec<message::BlockData<Block>>, who:
 			}
 		}
 	}
+
 	Ok(())
 }
 
 #[cfg(test)]
 mod test {
-	use super::message::FromBlock;
+	use super::message::{FromBlock, BlockState, BlockData};
 	use super::*;
 	use sc_block_builder::BlockBuilderProvider;
 	use sp_blockchain::HeaderBackend;
 	use sp_consensus::block_validation::DefaultBlockAnnounceValidator;
 	use substrate_test_runtime_client::{
-		runtime::{Block, Hash},
+		runtime::{Block, Hash, Header},
 		ClientBlockImportExt, DefaultTestClientBuilderExt, TestClientBuilder, TestClientBuilderExt,
+		BlockBuilderExt,
 	};
+	use futures::{future::poll_fn, executor::block_on};
 
 	#[test]
 	fn processes_empty_response_on_justification_request_for_unknown_block() {
@@ -1846,4 +1896,177 @@ mod test {
 			PeerSyncState::DownloadingJustification(b1_hash),
 		);
 	}
+
+	/// Send a block annoucnement for the given `header`.
+	fn send_block_announce(
+		header: Header,
+		peer_id: &PeerId,
+		sync: &mut ChainSync<Block>,
+	) {
+		let block_annnounce = BlockAnnounce {
+			header: header.clone(),
+			state: Some(BlockState::Best),
+			data: Some(Vec::new()),
+		};
+
+		sync.push_block_announce_validation(
+			peer_id.clone(),
+			header.hash(),
+			block_annnounce,
+			true,
+		);
+
+		// Poll until we have procssed the block announcement
+		block_on(poll_fn(|cx| loop {
+			if sync.poll_block_announce_validation(cx).is_pending() {
+				break Poll::Ready(())
+			}
+		}))
+	}
+
+	/// Create a block response from the given `blocks`.
+	fn create_block_response(blocks: Vec<Block>) -> BlockResponse<Block> {
+		BlockResponse::<Block> {
+			id: 0,
+			blocks: blocks.into_iter().map(|b|
+				BlockData::<Block> {
+					hash: b.hash(),
+					header: Some(b.header().clone()),
+					body: Some(b.deconstruct().1),
+					receipt: None,
+					message_queue: None,
+					justification: None,
+				}
+			).collect(),
+		}
+	}
+
+	/// Get a block request from `sync` and check that is matches the expected request.
+	fn get_block_request(
+		sync: &mut ChainSync<Block>,
+		from: message::FromBlock<Hash, u64>,
+		max: u32,
+		peer: &PeerId,
+	) -> BlockRequest<Block> {
+		let requests = sync.block_requests().collect::<Vec<_>>();
+		assert_eq!(1, requests.len());
+		assert_eq!(peer, requests[0].0);
+
+		let request = requests[0].1.clone();
+
+		assert_eq!(from, request.from);
+		assert_eq!(Some(max), request.max);
+		request
+	}
+
+	/// This test is a regression test as observed on a real network.
+	///
+	/// The node is connected to multiple peers. Both of these peers are having a best block (1) that
+	/// is below our best block (3). Now peer 2 announces a fork of block 3 that we will
+	/// request from peer 2. After imporitng the fork, peer 2 and then peer 1 will announce block 4.
+	/// But as peer 1 in our view is still at block 1, we will request block 2 (which we already have)
+	/// from it. In the meanwhile peer 2 sends us block 4 and 3 and we send another request for block
+	/// 2 to peer 2. Peer 1 answers with block 2 and then peer 2. This will need to succeed, as we
+	/// have requested block 2 from both peers.
+	#[test]
+	fn do_not_report_peer_on_block_response_for_block_request() {
+		sp_tracing::try_init_simple();
+
+		let mut client = Arc::new(TestClientBuilder::new().build());
+		let info = client.info();
+
+		let mut sync = ChainSync::new(
+			Roles::AUTHORITY,
+			client.clone(),
+			&info,
+			Box::new(DefaultBlockAnnounceValidator),
+			5,
+		);
+
+		let peer_id1 = PeerId::random();
+		let peer_id2 = PeerId::random();
+
+		let mut client2 = client.clone();
+		let mut build_block = || {
+			let block = client2.new_block(Default::default()).unwrap().build().unwrap().block;
+			client2.import(BlockOrigin::Own, block.clone()).unwrap();
+
+			block
+		};
+
+		let mut client2 = client.clone();
+		let mut build_block_at = |at, import| {
+			let mut block_builder = client2.new_block_at(&BlockId::Hash(at), Default::default(), false)
+				.unwrap();
+			// Make sure we generate a different block as fork
+			block_builder.push_storage_change(vec![1, 2, 3], Some(vec![4, 5, 6])).unwrap();
+
+			let block = block_builder.build().unwrap().block;
+
+			if import {
+				client2.import(BlockOrigin::Own, block.clone()).unwrap();
+			}
+
+			block
+		};
+
+		let block1 = build_block();
+		let block2 = build_block();
+		let block3 = build_block();
+		let block3_fork = build_block_at(block2.hash(), false);
+
+		// Add two peers which are on block 1.
+		sync.new_peer(peer_id1.clone(), block1.hash(), 1).unwrap();
+		sync.new_peer(peer_id2.clone(), block1.hash(), 1).unwrap();
+
+		// Tell sync that our best block is 3.
+		sync.update_chain_info(&block3.hash(), 3);
+
+		// There should be no requests.
+		assert!(sync.block_requests().collect::<Vec<_>>().is_empty());
+
+		// Let peer2 announce a fork of block 3
+		send_block_announce(block3_fork.header().clone(), &peer_id2, &mut sync);
+
+		// Import and tell sync that we now have the fork.
+		client.import(BlockOrigin::Own, block3_fork.clone()).unwrap();
+		sync.update_chain_info(&block3_fork.hash(), 3);
+
+		let block4 = build_block_at(block3_fork.hash(), false);
+
+		// Let peer2 announce block 4 and check that sync wants to get the block.
+		send_block_announce(block4.header().clone(), &peer_id2, &mut sync);
+
+		let request = get_block_request(&mut sync, FromBlock::Hash(block4.hash()), 2, &peer_id2);
+
+		// Peer1 announces the same block, but as the common block is still `1`, sync will request
+		// block 2 again.
+		send_block_announce(block4.header().clone(), &peer_id1, &mut sync);
+
+		let request2 = get_block_request(&mut sync, FromBlock::Number(2), 1, &peer_id1);
+
+		let response = create_block_response(vec![block4.clone(), block3_fork.clone()]);
+		let res = sync.on_block_data(&peer_id2, Some(request), response).unwrap();
+
+		// We should not yet import the blocks, because there is still an open request for fetching
+		// block `2` which blocks the import.
+		assert!(matches!(res, OnBlockData::Import(_, blocks) if blocks.is_empty()));
+
+		let request3 = get_block_request(&mut sync, FromBlock::Number(2), 1, &peer_id2);
+
+		let response = create_block_response(vec![block2.clone()]);
+		let res = sync.on_block_data(&peer_id1, Some(request2), response).unwrap();
+		assert!(
+			matches!(
+				res,
+				OnBlockData::Import(_, blocks)
+					if blocks.iter().all(|b| [2, 3, 4].contains(b.header.as_ref().unwrap().number()))
+			)
+		);
+
+		let response = create_block_response(vec![block2.clone()]);
+		let res = sync.on_block_data(&peer_id2, Some(request3), response).unwrap();
+		// Nothing to import
+		assert!(matches!(res, OnBlockData::Import(_, blocks) if blocks.is_empty()));
+	}
 }
diff --git a/client/network/src/protocol/sync/extra_requests.rs b/client/network/src/protocol/sync/extra_requests.rs
index 79f10c4a3bf8..7a7198aa7a0b 100644
--- a/client/network/src/protocol/sync/extra_requests.rs
+++ b/client/network/src/protocol/sync/extra_requests.rs
@@ -549,7 +549,6 @@ mod tests {
 				best_hash: Hash::random(),
 				best_number: g.gen(),
 				state: ArbitraryPeerSyncState::arbitrary(g).0,
-				recently_announced: Default::default()
 			};
 			ArbitraryPeerSync(ps)
 		}

From f73ac5eb0df68b72d42d25faf4da411f2d3581b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Thu, 3 Dec 2020 17:11:49 +0100
Subject: [PATCH 0141/1194] Don't panic on a sink error (#7666)

---
 client/rpc/src/author/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/rpc/src/author/mod.rs b/client/rpc/src/author/mod.rs
index 1db90e209d0d..1a2d84e4e572 100644
--- a/client/rpc/src/author/mod.rs
+++ b/client/rpc/src/author/mod.rs
@@ -215,7 +215,7 @@ impl<P, Client> AuthorApi<TxHash<P>, BlockHash<P>> for Author<P, Client>
 				Ok(watcher) => {
 					subscriptions.add(subscriber, move |sink| {
 						sink
-							.sink_map_err(|_| unimplemented!())
+							.sink_map_err(|e| log::debug!("Subscription sink failed: {:?}", e))
 							.send_all(Compat::new(watcher))
 							.map(|_| ())
 					});

From 1802283493b178d03ba3a5be697478c4978f1a17 Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Fri, 4 Dec 2020 16:57:09 +0100
Subject: [PATCH 0142/1194] Features needed for reserve-backed stablecoins
 (#7152)

* Features needed for reserve-backed stablecoins

* Builds & tests.

* Double map for an efficient destroy.

* Update frame/assets/src/lib.rs

Co-authored-by: Nikolay Volf <nikvolf@gmail.com>

* ED/zombie-count/refs

Feature: ED/minimum balance enforcement
Feature: enforce zombie count
Feature: allow system-alive accounts to exist, but add reference

* Update frame/assets/src/lib.rs

Co-authored-by: Nikolay Volf <nikvolf@gmail.com>

* Update frame/assets/Cargo.toml

Co-authored-by: Niklas Adolfsson <niklasadolfsson1@gmail.com>

* Docs

* Some tests

* More tests

* Allow for max_zombies to be adjusted

* Test for set_max_zombies

* Tests and a couple of fixes

* First few benchmarks

* Benchmarks.

* Fix error message in test

* Fixes

* Fixes

* Fixes

* cargo run --release --features runtime-benchmarks --manifest-path bin/node/cli/Cargo.toml -- benchmark --chain dev --steps 50 --repeat 20 --extrinsic * --execution=wasm --wasm-execution=compiled --output ./bin/node/runtime/src/weights --header ./HEADER --pallet pallet_assets

* Update frame/assets/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Fixes

* Fixes

* Fixes

* cargo run --release --features runtime-benchmarks --manifest-path bin/node/cli/Cargo.toml -- benchmark --chain dev --steps 50 --repeat 20 --extrinsic * --execution=wasm --wasm-execution=compiled --output ./bin/node/runtime/src/weights --header ./HEADER --pallet pallet_assets

* Fixes

* Update default weight

* Add proper verification to benchmarks

* minor improvements to tests

* Update frame/assets/src/benchmarking.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Fix

* New weights system

* fix compile

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_assets --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/assets/src/weights.rs --template=./.maintain/frame-weight-template.hbs

Co-authored-by: Nikolay Volf <nikvolf@gmail.com>
Co-authored-by: Niklas Adolfsson <niklasadolfsson1@gmail.com>
Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
---
 Cargo.lock                       |    3 +
 bin/node/runtime/Cargo.toml      |    3 +
 bin/node/runtime/src/lib.rs      |   18 +
 frame/assets/Cargo.toml          |   10 +
 frame/assets/src/benchmarking.rs |  298 +++++++
 frame/assets/src/lib.rs          | 1244 +++++++++++++++++++++++++-----
 frame/assets/src/weights.rs      |  207 +++++
 frame/balances/src/lib.rs        |    2 +-
 frame/balances/src/tests.rs      |    2 +-
 frame/system/src/lib.rs          |    4 +
 10 files changed, 1612 insertions(+), 179 deletions(-)
 create mode 100644 frame/assets/src/benchmarking.rs
 create mode 100644 frame/assets/src/weights.rs

diff --git a/Cargo.lock b/Cargo.lock
index eb98e96a8894..13bc6ca0ebcc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3895,6 +3895,7 @@ dependencies = [
  "frame-system-rpc-runtime-api",
  "hex-literal",
  "node-primitives",
+ "pallet-assets",
  "pallet-authority-discovery",
  "pallet-authorship",
  "pallet-babe",
@@ -4228,8 +4229,10 @@ dependencies = [
 name = "pallet-assets"
 version = "2.0.0"
 dependencies = [
+ "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "pallet-balances",
  "parity-scale-codec",
  "serde",
  "sp-core",
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index eabc9f61c62e..7d4cf5588e3e 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -43,6 +43,7 @@ frame-support = { version = "2.0.0", default-features = false, path = "../../../
 frame-system = { version = "2.0.0", default-features = false, path = "../../../frame/system" }
 frame-system-benchmarking = { version = "2.0.0", default-features = false, path = "../../../frame/system/benchmarking", optional = true }
 frame-system-rpc-runtime-api = { version = "2.0.0", default-features = false, path = "../../../frame/system/rpc/runtime-api/" }
+pallet-assets = { version = "2.0.0", default-features = false, path = "../../../frame/assets" }
 pallet-authority-discovery = { version = "2.0.0", default-features = false, path = "../../../frame/authority-discovery" }
 pallet-authorship = { version = "2.0.0", default-features = false, path = "../../../frame/authorship" }
 pallet-babe = { version = "2.0.0", default-features = false, path = "../../../frame/babe" }
@@ -89,6 +90,7 @@ default = ["std"]
 with-tracing = [ "frame-executive/with-tracing" ]
 std = [
 	"sp-authority-discovery/std",
+	"pallet-assets/std",
 	"pallet-authority-discovery/std",
 	"pallet-authorship/std",
 	"sp-consensus-babe/std",
@@ -147,6 +149,7 @@ runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
+	"pallet-assets/runtime-benchmarks",
 	"pallet-babe/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-collective/runtime-benchmarks",
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index be3783cd7ca5..285f37889ae9 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -892,6 +892,22 @@ impl pallet_vesting::Config for Runtime {
 	type WeightInfo = pallet_vesting::weights::SubstrateWeight<Runtime>;
 }
 
+parameter_types! {
+	pub const AssetDepositBase: Balance = 100 * DOLLARS;
+	pub const AssetDepositPerZombie: Balance = 1 * DOLLARS;
+}
+
+impl pallet_assets::Config for Runtime {
+	type Event = Event;
+	type Balance = u64;
+	type AssetId = u32;
+	type Currency = Balances;
+	type ForceOrigin = EnsureRoot<AccountId>;
+	type AssetDepositBase = AssetDepositBase;
+	type AssetDepositPerZombie = AssetDepositPerZombie;
+	type WeightInfo = pallet_assets::weights::SubstrateWeight<Runtime>;
+}
+
 construct_runtime!(
 	pub enum Runtime where
 		Block = Block,
@@ -929,6 +945,7 @@ construct_runtime!(
 		Scheduler: pallet_scheduler::{Module, Call, Storage, Event<T>},
 		Proxy: pallet_proxy::{Module, Call, Storage, Event<T>},
 		Multisig: pallet_multisig::{Module, Call, Storage, Event<T>},
+		Assets: pallet_assets::{Module, Call, Storage, Event<T>},
 	}
 );
 
@@ -1195,6 +1212,7 @@ impl_runtime_apis! {
 			let mut batches = Vec::<BenchmarkBatch>::new();
 			let params = (&config, &whitelist);
 
+			add_benchmark!(params, batches, pallet_assets, Assets);
 			add_benchmark!(params, batches, pallet_babe, Babe);
 			add_benchmark!(params, batches, pallet_balances, Balances);
 			add_benchmark!(params, batches, pallet_collective, Council);
diff --git a/frame/assets/Cargo.toml b/frame/assets/Cargo.toml
index d1742e567cfa..380b561dba40 100644
--- a/frame/assets/Cargo.toml
+++ b/frame/assets/Cargo.toml
@@ -15,24 +15,34 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false }
+sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 # Needed for various traits. In our case, `OnFinalize`.
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
 # Needed for type-safe access to storage DB.
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 # `system` module provides us with all sorts of useful stuff and macros depend on it being around.
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
+frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
 sp-core = { version = "2.0.0", path = "../../primitives/core" }
 sp-std = { version = "2.0.0", path = "../../primitives/std" }
 sp-io = { version = "2.0.0", path = "../../primitives/io" }
+pallet-balances = { version = "2.0.0", default-features = false, path = "../balances" }
 
 [features]
 default = ["std"]
 std = [
 	"serde",
 	"codec/std",
+	"sp-std/std",
 	"sp-runtime/std",
 	"frame-support/std",
 	"frame-system/std",
+	"frame-benchmarking/std",
+]
+runtime-benchmarks = [
+	"frame-benchmarking",
+	"sp-runtime/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
 ]
diff --git a/frame/assets/src/benchmarking.rs b/frame/assets/src/benchmarking.rs
new file mode 100644
index 000000000000..cecb2ccae58b
--- /dev/null
+++ b/frame/assets/src/benchmarking.rs
@@ -0,0 +1,298 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Assets pallet benchmarking.
+
+use super::*;
+use sp_std::prelude::*;
+use sp_runtime::traits::Bounded;
+use frame_system::RawOrigin as SystemOrigin;
+use frame_benchmarking::{benchmarks, account, whitelisted_caller};
+
+use crate::Module as Assets;
+
+const SEED: u32 = 0;
+
+fn create_default_asset<T: Config>(max_zombies: u32)
+	-> (T::AccountId, <T::Lookup as StaticLookup>::Source)
+{
+	let caller: T::AccountId = whitelisted_caller();
+	let caller_lookup = T::Lookup::unlookup(caller.clone());
+	let root = SystemOrigin::Root.into();
+	assert!(Assets::<T>::force_create(
+		root,
+		Default::default(),
+		caller_lookup.clone(),
+		max_zombies,
+		1u32.into(),
+	).is_ok());
+	(caller, caller_lookup)
+}
+
+fn create_default_minted_asset<T: Config>(max_zombies: u32, amount: T::Balance)
+	-> (T::AccountId, <T::Lookup as StaticLookup>::Source)
+{
+	let (caller, caller_lookup)  = create_default_asset::<T>(max_zombies);
+	assert!(Assets::<T>::mint(
+		SystemOrigin::Signed(caller.clone()).into(),
+		Default::default(),
+		caller_lookup.clone(),
+		amount,
+	).is_ok());
+	(caller, caller_lookup)
+}
+
+fn add_zombies<T: Config>(minter: T::AccountId, n: u32) {
+	let origin = SystemOrigin::Signed(minter);
+	for i in 0..n {
+		let target = account("zombie", i, SEED);
+		let target_lookup = T::Lookup::unlookup(target);
+		assert!(Assets::<T>::mint(origin.clone().into(), Default::default(), target_lookup, 100u32.into()).is_ok());
+	}
+}
+
+fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
+	let events = frame_system::Module::<T>::events();
+	let system_event: <T as frame_system::Config>::Event = generic_event.into();
+	// compare to the last event record
+	let frame_system::EventRecord { event, .. } = &events[events.len() - 1];
+	assert_eq!(event, &system_event);
+}
+
+benchmarks! {
+	_ { }
+
+	create {
+		let caller: T::AccountId = whitelisted_caller();
+		let caller_lookup = T::Lookup::unlookup(caller.clone());
+		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
+	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, 1, 1u32.into())
+	verify {
+		assert_last_event::<T>(RawEvent::Created(Default::default(), caller.clone(), caller).into());
+	}
+
+	force_create {
+		let caller: T::AccountId = whitelisted_caller();
+		let caller_lookup = T::Lookup::unlookup(caller.clone());
+	}: _(SystemOrigin::Root, Default::default(), caller_lookup, 1, 1u32.into())
+	verify {
+		assert_last_event::<T>(RawEvent::ForceCreated(Default::default(), caller).into());
+	}
+
+	destroy {
+		let z in 0 .. 10_000;
+		let (caller, _) = create_default_asset::<T>(10_000);
+		add_zombies::<T>(caller.clone(), z);
+	}: _(SystemOrigin::Signed(caller), Default::default(), 10_000)
+	verify {
+		assert_last_event::<T>(RawEvent::Destroyed(Default::default()).into());
+	}
+
+	force_destroy {
+		let z in 0 .. 10_000;
+		let (caller, _) = create_default_asset::<T>(10_000);
+		add_zombies::<T>(caller.clone(), z);
+	}: _(SystemOrigin::Root, Default::default(), 10_000)
+	verify {
+		assert_last_event::<T>(RawEvent::Destroyed(Default::default()).into());
+	}
+
+	mint {
+		let (caller, caller_lookup) = create_default_asset::<T>(10);
+		let amount = T::Balance::from(100u32);
+	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, amount)
+	verify {
+		assert_last_event::<T>(RawEvent::Issued(Default::default(), caller, amount).into());
+	}
+
+	burn {
+		let amount = T::Balance::from(100u32);
+		let (caller, caller_lookup) = create_default_minted_asset::<T>(10, amount);
+	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, amount)
+	verify {
+		assert_last_event::<T>(RawEvent::Burned(Default::default(), caller, amount).into());
+	}
+
+	transfer {
+		let amount = T::Balance::from(100u32);
+		let (caller, caller_lookup) = create_default_minted_asset::<T>(10, amount);
+		let target: T::AccountId = account("target", 0, SEED);
+		let target_lookup = T::Lookup::unlookup(target.clone());
+	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), target_lookup, amount)
+	verify {
+		assert_last_event::<T>(RawEvent::Transferred(Default::default(), caller, target, amount).into());
+	}
+
+	force_transfer {
+		let amount = T::Balance::from(100u32);
+		let (caller, caller_lookup) = create_default_minted_asset::<T>(10, amount);
+		let target: T::AccountId = account("target", 0, SEED);
+		let target_lookup = T::Lookup::unlookup(target.clone());
+	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, target_lookup, amount)
+	verify {
+		assert_last_event::<T>(RawEvent::ForceTransferred(Default::default(), caller, target, amount).into());
+	}
+
+	freeze {
+		let (caller, caller_lookup) = create_default_minted_asset::<T>(10, 100u32.into());
+	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup)
+	verify {
+		assert_last_event::<T>(RawEvent::Frozen(Default::default(), caller).into());
+	}
+
+	thaw {
+		let (caller, caller_lookup) = create_default_minted_asset::<T>(10, 100u32.into());
+		assert!(Assets::<T>::freeze(
+			SystemOrigin::Signed(caller.clone()).into(),
+			Default::default(),
+			caller_lookup.clone()
+		).is_ok());
+	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup)
+	verify {
+		assert_last_event::<T>(RawEvent::Thawed(Default::default(), caller).into());
+	}
+
+	transfer_ownership {
+		let (caller, _) = create_default_asset::<T>(10);
+		let target: T::AccountId = account("target", 0, SEED);
+		let target_lookup = T::Lookup::unlookup(target.clone());
+	}: _(SystemOrigin::Signed(caller), Default::default(), target_lookup)
+	verify {
+		assert_last_event::<T>(RawEvent::OwnerChanged(Default::default(), target).into());
+	}
+
+	set_team {
+		let (caller, _) = create_default_asset::<T>(10);
+		let target0 = T::Lookup::unlookup(account("target", 0, SEED));
+		let target1 = T::Lookup::unlookup(account("target", 1, SEED));
+		let target2 = T::Lookup::unlookup(account("target", 2, SEED));
+	}: _(SystemOrigin::Signed(caller), Default::default(), target0.clone(), target1.clone(), target2.clone())
+	verify {
+		assert_last_event::<T>(RawEvent::TeamChanged(
+			Default::default(),
+			account("target", 0, SEED),
+			account("target", 1, SEED),
+			account("target", 2, SEED),
+		).into());
+	}
+
+	set_max_zombies {
+		let (caller, _) = create_default_asset::<T>(10);
+		let max_zombies: u32 = 100;
+		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
+	}: _(SystemOrigin::Signed(caller), Default::default(), max_zombies)
+	verify {
+		assert_last_event::<T>(RawEvent::MaxZombiesChanged(Default::default(), max_zombies).into());
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use crate::tests::{new_test_ext, Test};
+
+	#[test]
+	fn create() {
+		new_test_ext().execute_with(|| {
+			assert!(test_benchmark_create::<Test>().is_ok());
+		});
+	}
+
+	#[test]
+	fn force_create() {
+		new_test_ext().execute_with(|| {
+			assert!(test_benchmark_force_create::<Test>().is_ok());
+		});
+	}
+
+	#[test]
+	fn destroy() {
+		new_test_ext().execute_with(|| {
+			assert!(test_benchmark_destroy::<Test>().is_ok());
+		});
+	}
+
+	#[test]
+	fn force_destroy() {
+		new_test_ext().execute_with(|| {
+			assert!(test_benchmark_force_destroy::<Test>().is_ok());
+		});
+	}
+
+	#[test]
+	fn mint() {
+		new_test_ext().execute_with(|| {
+			assert!(test_benchmark_mint::<Test>().is_ok());
+		});
+	}
+
+	#[test]
+	fn burn() {
+		new_test_ext().execute_with(|| {
+			assert!(test_benchmark_burn::<Test>().is_ok());
+		});
+	}
+
+	#[test]
+	fn transfer() {
+		new_test_ext().execute_with(|| {
+			assert!(test_benchmark_transfer::<Test>().is_ok());
+		});
+	}
+
+	#[test]
+	fn force_transfer() {
+		new_test_ext().execute_with(|| {
+			assert!(test_benchmark_force_transfer::<Test>().is_ok());
+		});
+	}
+
+	#[test]
+	fn freeze() {
+		new_test_ext().execute_with(|| {
+			assert!(test_benchmark_freeze::<Test>().is_ok());
+		});
+	}
+
+	#[test]
+	fn thaw() {
+		new_test_ext().execute_with(|| {
+			assert!(test_benchmark_thaw::<Test>().is_ok());
+		});
+	}
+
+	#[test]
+	fn transfer_ownership() {
+		new_test_ext().execute_with(|| {
+			assert!(test_benchmark_transfer_ownership::<Test>().is_ok());
+		});
+	}
+
+	#[test]
+	fn set_team() {
+		new_test_ext().execute_with(|| {
+			assert!(test_benchmark_set_team::<Test>().is_ok());
+		});
+	}
+
+	#[test]
+	fn set_max_zombies() {
+		new_test_ext().execute_with(|| {
+			assert!(test_benchmark_set_max_zombies::<Test>().is_ok());
+		});
+	}
+}
diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index 9ed442aada3a..630f4fcc317d 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -24,9 +24,10 @@
 //! The Assets module provides functionality for asset management of fungible asset classes
 //! with a fixed supply, including:
 //!
-//! * Asset Issuance
-//! * Asset Transfer
-//! * Asset Destruction
+//! * Asset Issuance (Minting)
+//! * Asset Transferal
+//! * Asset Freezing
+//! * Asset Destruction (Burning)
 //!
 //! To use it in your runtime, you need to implement the assets [`Config`](./trait.Config.html).
 //!
@@ -34,31 +35,61 @@
 //!
 //! ### Terminology
 //!
-//! * **Asset issuance:** The creation of a new asset, whose total supply will belong to the
-//!   account that issues the asset.
-//! * **Asset transfer:** The action of transferring assets from one account to another.
-//! * **Asset destruction:** The process of an account removing its entire holding of an asset.
-//! * **Fungible asset:** An asset whose units are interchangeable.
-//! * **Non-fungible asset:** An asset for which each unit has unique characteristics.
+//! * **Admin**: An account ID uniquely privileged to be able to unfreeze (thaw) an account and it's
+//!   assets, as well as forcibly transfer a particular class of assets between arbitrary accounts
+//!   and reduce the balance of a particular class of assets of arbitrary accounts.
+//! * **Asset issuance/minting**: The creation of a new asset, whose total supply will belong to the
+//!   account that issues the asset. This is a privileged operation.
+//! * **Asset transfer**: The reduction of the balance of an asset of one account with the
+//!   corresponding increase in the balance of another.
+//! * **Asset destruction**: The process of reduce the balance of an asset of one account. This is
+//!   a privileged operation.
+//! * **Fungible asset**: An asset whose units are interchangeable.
+//! * **Issuer**: An account ID uniquely privileged to be able to mint a particular class of assets.
+//! * **Freezer**: An account ID uniquely privileged to be able to freeze an account from
+//!   transferring a particular class of assets.
+//! * **Freezing**: Removing the possibility of an unpermissioned transfer of an asset from a
+//!   particular account.
+//! * **Non-fungible asset**: An asset for which each unit has unique characteristics.
+//! * **Owner**: An account ID uniquely privileged to be able to destroy a particular asset class,
+//!   or to set the Issuer, Freezer or Admin of that asset class.
+//! * **Zombie**: An account which has a balance of some assets in this pallet, but no other
+//!   footprint on-chain, in particular no account managed in the `frame_system` pallet.
 //!
 //! ### Goals
 //!
 //! The assets system in Substrate is designed to make the following possible:
 //!
-//! * Issue a unique asset to its creator's account.
+//! * Issue a new assets in a permissioned or permissionless way, if permissionless, then with a
+//!   deposit required.
+//! * Allow accounts to hold these assets without otherwise existing on-chain (*zombies*).
 //! * Move assets between accounts.
-//! * Remove an account's balance of an asset when requested by that account's owner and update
-//!   the asset's total supply.
+//! * Update the asset's total supply.
+//! * Allow administrative activities by specially privileged accounts including freezing account
+//!   balances and minting/burning assets.
 //!
 //! ## Interface
 //!
-//! ### Dispatchable Functions
+//! ### Permissionless Functions
 //!
-//! * `issue` - Issues the total supply of a new fungible asset to the account of the caller of the function.
-//! * `transfer` - Transfers an `amount` of units of fungible asset `id` from the balance of
-//! the function caller's account (`origin`) to a `target` account.
-//! * `destroy` - Destroys the entire holding of a fungible asset `id` associated with the account
-//! that called the function.
+//! * `create`: Creates a new asset class, taking the required deposit.
+//! * `transfer`: Transfer sender's assets to another account.
+//!
+//! ### Permissioned Functions
+//!
+//! * `force_create`: Creates a new asset class without taking any deposit.
+//! * `force_destroy`: Destroys an asset class.
+//!
+//! ### Privileged Functions
+//! * `destroy`: Destroys an entire asset class; called by the asset class's Owner.
+//! * `mint`: Increases the asset balance of an account; called by the asset class's Issuer.
+//! * `burn`: Decreases the asset balance of an account; called by the asset class's Admin.
+//! * `force_transfer`: Transfers between arbitrary accounts; called by the asset class's Admin.
+//! * `freeze`: Disallows further `transfer`s from an account; called by the asset class's Freezer.
+//! * `thaw`: Allows further `transfer`s from an account; called by the asset class's Admin.
+//! * `transfer_ownership`: Changes an asset class's Owner; called by the asset class's Owner.
+//! * `set_team`: Changes an asset class's Admin, Freezer and Issuer; called by the asset class's
+//!   Owner.
 //!
 //! Please refer to the [`Call`](./enum.Call.html) enum and its associated variants for documentation on each function.
 //!
@@ -70,61 +101,6 @@
 //!
 //! Please refer to the [`Module`](./struct.Module.html) struct for details on publicly available functions.
 //!
-//! ## Usage
-//!
-//! The following example shows how to use the Assets module in your runtime by exposing public functions to:
-//!
-//! * Issue a new fungible asset for a token distribution event (airdrop).
-//! * Query the fungible asset holding balance of an account.
-//! * Query the total supply of a fungible asset that has been issued.
-//!
-//! ### Prerequisites
-//!
-//! Import the Assets module and types and derive your runtime's configuration traits from the Assets module trait.
-//!
-//! ### Simple Code Snippet
-//!
-//! ```rust,ignore
-//! use pallet_assets as assets;
-//! use frame_support::{decl_module, dispatch, ensure};
-//! use frame_system::ensure_signed;
-//!
-//! pub trait Config: assets::Config { }
-//!
-//! decl_module! {
-//! 	pub struct Module<T: Config> for enum Call where origin: T::Origin {
-//! 		pub fn issue_token_airdrop(origin) -> dispatch::DispatchResult {
-//! 			let sender = ensure_signed(origin).map_err(|e| e.as_str())?;
-//!
-//! 			const ACCOUNT_ALICE: u64 = 1;
-//! 			const ACCOUNT_BOB: u64 = 2;
-//! 			const COUNT_AIRDROP_RECIPIENTS: u64 = 2;
-//! 			const TOKENS_FIXED_SUPPLY: u64 = 100;
-//!
-//! 			ensure!(!COUNT_AIRDROP_RECIPIENTS.is_zero(), "Divide by zero error.");
-//!
-//! 			let asset_id = Self::next_asset_id();
-//!
-//! 			<NextAssetId<T>>::mutate(|asset_id| *asset_id += 1);
-//! 			<Balances<T>>::insert((asset_id, &ACCOUNT_ALICE), TOKENS_FIXED_SUPPLY / COUNT_AIRDROP_RECIPIENTS);
-//! 			<Balances<T>>::insert((asset_id, &ACCOUNT_BOB), TOKENS_FIXED_SUPPLY / COUNT_AIRDROP_RECIPIENTS);
-//! 			<TotalSupply<T>>::insert(asset_id, TOKENS_FIXED_SUPPLY);
-//!
-//! 			Self::deposit_event(RawEvent::Issued(asset_id, sender, TOKENS_FIXED_SUPPLY));
-//! 			Ok(())
-//! 		}
-//! 	}
-//! }
-//! ```
-//!
-//! ## Assumptions
-//!
-//! Below are assumptions that must be held when using this module.  If any of
-//! them are violated, the behavior of this module is undefined.
-//!
-//! * The total count of assets should be less than
-//!   `Config::AssetId::max_value()`.
-//!
 //! ## Related Modules
 //!
 //! * [`System`](../frame_system/index.html)
@@ -133,10 +109,23 @@
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use frame_support::{Parameter, decl_module, decl_event, decl_storage, decl_error, ensure};
-use sp_runtime::traits::{Member, AtLeast32Bit, AtLeast32BitUnsigned, Zero, StaticLookup};
+#[cfg(feature = "runtime-benchmarks")]
+mod benchmarking;
+pub mod weights;
+
+use sp_std::{fmt::Debug};
+use sp_runtime::{RuntimeDebug, traits::{
+	Member, AtLeast32BitUnsigned, Zero, StaticLookup, Saturating, CheckedSub, CheckedAdd
+}};
+use codec::{Encode, Decode, HasCompact};
+use frame_support::{Parameter, decl_module, decl_event, decl_storage, decl_error, ensure,
+	traits::{Currency, ReservableCurrency, EnsureOrigin, Get, BalanceStatus::Reserved},
+	dispatch::{DispatchResult, DispatchError},
+};
 use frame_system::ensure_signed;
-use sp_runtime::traits::One;
+pub use weights::WeightInfo;
+
+type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 
 /// The module configuration trait.
 pub trait Config: frame_system::Config {
@@ -147,80 +136,82 @@ pub trait Config: frame_system::Config {
 	type Balance: Member + Parameter + AtLeast32BitUnsigned + Default + Copy;
 
 	/// The arithmetic type of asset identifier.
-	type AssetId: Parameter + AtLeast32Bit + Default + Copy;
-}
+	type AssetId: Member + Parameter + Default + Copy + HasCompact;
 
-decl_module! {
-	pub struct Module<T: Config> for enum Call where origin: T::Origin {
-		type Error = Error<T>;
+	/// The currency mechanism.
+	type Currency: ReservableCurrency<Self::AccountId>;
 
-		fn deposit_event() = default;
-		/// Issue a new class of fungible assets. There are, and will only ever be, `total`
-		/// such assets and they'll all belong to the `origin` initially. It will have an
-		/// identifier `AssetId` instance: this will be specified in the `Issued` event.
-		///
-		/// # <weight>
-		/// - `O(1)`
-		/// - 1 storage mutation (codec `O(1)`).
-		/// - 2 storage writes (condec `O(1)`).
-		/// - 1 event.
-		/// # </weight>
-		#[weight = 0]
-		fn issue(origin, #[compact] total: T::Balance) {
-			let origin = ensure_signed(origin)?;
+	/// The origin which may forcibly create or destroy an asset.
+	type ForceOrigin: EnsureOrigin<Self::Origin>;
 
-			let id = Self::next_asset_id();
-			<NextAssetId<T>>::mutate(|id| *id += One::one());
+	/// The basic amount of funds that must be reserved when creating a new asset class.
+	type AssetDepositBase: Get<BalanceOf<Self>>;
 
-			<Balances<T>>::insert((id, &origin), total);
-			<TotalSupply<T>>::insert(id, total);
+	/// The additional funds that must be reserved for every zombie account that an asset class
+	/// supports.
+	type AssetDepositPerZombie: Get<BalanceOf<Self>>;
 
-			Self::deposit_event(RawEvent::Issued(id, origin, total));
-		}
+	/// Weight information for extrinsics in this pallet.
+	type WeightInfo: WeightInfo;
+}
 
-		/// Move some assets from one holder to another.
-		///
-		/// # <weight>
-		/// - `O(1)`
-		/// - 1 static lookup
-		/// - 2 storage mutations (codec `O(1)`).
-		/// - 1 event.
-		/// # </weight>
-		#[weight = 0]
-		fn transfer(origin,
-			#[compact] id: T::AssetId,
-			target: <T::Lookup as StaticLookup>::Source,
-			#[compact] amount: T::Balance
-		) {
-			let origin = ensure_signed(origin)?;
-			let origin_account = (id, origin.clone());
-			let origin_balance = <Balances<T>>::get(&origin_account);
-			let target = T::Lookup::lookup(target)?;
-			ensure!(!amount.is_zero(), Error::<T>::AmountZero);
-			ensure!(origin_balance >= amount, Error::<T>::BalanceLow);
+#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug)]
+pub struct AssetDetails<
+	Balance: Encode + Decode + Clone + Debug + Eq + PartialEq,
+	AccountId: Encode + Decode + Clone + Debug + Eq + PartialEq,
+	DepositBalance: Encode + Decode + Clone + Debug + Eq + PartialEq,
+> {
+	/// Can change `owner`, `issuer`, `freezer` and `admin` accounts.
+	owner: AccountId,
+	/// Can mint tokens.
+	issuer: AccountId,
+	/// Can thaw tokens, force transfers and burn tokens from any account.
+	admin: AccountId,
+	/// Can freeze tokens.
+	freezer: AccountId,
+	/// The total supply across all accounts.
+	supply: Balance,
+	/// The balance deposited for this asset.
+	///
+	/// This pays for the data stored here together with any virtual accounts.
+	deposit: DepositBalance,
+	/// The number of balance-holding accounts that this asset may have, excluding those that were
+	/// created when they had a system-level ED.
+	max_zombies: u32,
+	/// The ED for virtual accounts.
+	min_balance: Balance,
+	/// The current number of zombie accounts.
+	zombies: u32,
+	/// The total number of accounts.
+	accounts: u32,
+}
 
-			Self::deposit_event(RawEvent::Transferred(id, origin, target.clone(), amount));
-			<Balances<T>>::insert(origin_account, origin_balance - amount);
-			<Balances<T>>::mutate((id, target), |balance| *balance += amount);
-		}
+#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default)]
+pub struct AssetBalance<
+	Balance: Encode + Decode + Clone + Debug + Eq + PartialEq,
+> {
+	/// The balance.
+	balance: Balance,
+	/// Whether the account is frozen.
+	is_frozen: bool,
+	/// Whether the account is a zombie. If not, then it has a reference.
+	is_zombie: bool,
+}
 
-		/// Destroy any assets of `id` owned by `origin`.
-		///
-		/// # <weight>
-		/// - `O(1)`
-		/// - 1 storage mutation (codec `O(1)`).
-		/// - 1 storage deletion (codec `O(1)`).
-		/// - 1 event.
-		/// # </weight>
-		#[weight = 0]
-		fn destroy(origin, #[compact] id: T::AssetId) {
-			let origin = ensure_signed(origin)?;
-			let balance = <Balances<T>>::take((id, &origin));
-			ensure!(!balance.is_zero(), Error::<T>::BalanceZero);
+decl_storage! {
+	trait Store for Module<T: Config> as Assets {
+		/// Details of an asset.
+		Asset: map hasher(blake2_128_concat) T::AssetId => Option<AssetDetails<
+			T::Balance,
+			T::AccountId,
+			BalanceOf<T>,
+		>>;
 
-			<TotalSupply<T>>::mutate(id, |total_supply| *total_supply -= balance);
-			Self::deposit_event(RawEvent::Destroyed(id, origin, balance));
-		}
+		/// The number of units of assets held by any given account.
+		Account: double_map
+			hasher(blake2_128_concat) T::AssetId,
+			hasher(blake2_128_concat) T::AccountId
+			=> AssetBalance<T::Balance>;
 	}
 }
 
@@ -230,36 +221,620 @@ decl_event! {
 		<T as Config>::Balance,
 		<T as Config>::AssetId,
 	{
+		/// Some asset class was created. \[asset_id, creator, owner\]
+		Created(AssetId, AccountId, AccountId),
 		/// Some assets were issued. \[asset_id, owner, total_supply\]
 		Issued(AssetId, AccountId, Balance),
 		/// Some assets were transferred. \[asset_id, from, to, amount\]
 		Transferred(AssetId, AccountId, AccountId, Balance),
 		/// Some assets were destroyed. \[asset_id, owner, balance\]
-		Destroyed(AssetId, AccountId, Balance),
+		Burned(AssetId, AccountId, Balance),
+		/// The management team changed \[asset_id, issuer, admin, freezer\]
+		TeamChanged(AssetId, AccountId, AccountId, AccountId),
+		/// The owner changed \[asset_id, owner\]
+		OwnerChanged(AssetId, AccountId),
+		/// Some assets was transferred by an admin. \[asset_id, from, to, amount\]
+		ForceTransferred(AssetId, AccountId, AccountId, Balance),
+		/// Some account `who` was frozen. \[asset_id, who\]
+		Frozen(AssetId, AccountId),
+		/// Some account `who` was thawed. \[asset_id, who\]
+		Thawed(AssetId, AccountId),
+		/// An asset class was destroyed.
+		Destroyed(AssetId),
+		/// Some asset class was force-created. \[asset_id, owner\]
+		ForceCreated(AssetId, AccountId),
+		/// The maximum amount of zombies allowed has changed. \[asset_id, max_zombies\]
+		MaxZombiesChanged(AssetId, u32),
 	}
 }
 
 decl_error! {
 	pub enum Error for Module<T: Config> {
-		/// Transfer amount should be non-zero
+		/// Transfer amount should be non-zero.
 		AmountZero,
-		/// Account balance must be greater than or equal to the transfer amount
+		/// Account balance must be greater than or equal to the transfer amount.
 		BalanceLow,
-		/// Balance should be non-zero
+		/// Balance should be non-zero.
 		BalanceZero,
+		/// The signing account has no permission to do the operation.
+		NoPermission,
+		/// The given asset ID is unknown.
+		Unknown,
+		/// The origin account is frozen.
+		Frozen,
+		/// The asset ID is already taken.
+		InUse,
+		/// Too many zombie accounts in use.
+		TooManyZombies,
+		/// Attempt to destroy an asset class when non-zombie, reference-bearing accounts exist.
+		RefsLeft,
+		/// Invalid witness data given.
+		BadWitness,
+		/// Minimum balance should be non-zero.
+		MinBalanceZero,
+		/// A mint operation lead to an overflow.
+		Overflow,
 	}
 }
 
-decl_storage! {
-	trait Store for Module<T: Config> as Assets {
-		/// The number of units of assets held by any given account.
-		Balances: map hasher(blake2_128_concat) (T::AssetId, T::AccountId) => T::Balance;
-		/// The next asset identifier up for grabs.
-		NextAssetId get(fn next_asset_id): T::AssetId;
-		/// The total unit supply of an asset.
+decl_module! {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
+		type Error = Error<T>;
+
+		fn deposit_event() = default;
+
+		/// Issue a new class of fungible assets from a public origin.
+		///
+		/// This new asset class has no assets initially.
+		///
+		/// The origin must be Signed and the sender must have sufficient funds free.
+		///
+		/// Funds of sender are reserved according to the formula:
+		/// `AssetDepositBase + AssetDepositPerZombie * max_zombies`.
+		///
+		/// Parameters:
+		/// - `id`: The identifier of the new asset. This must not be currently in use to identify
+		/// an existing asset.
+		/// - `owner`: The owner of this class of assets. The owner has full superuser permissions
+		/// over this asset, but may later change and configure the permissions using `transfer_ownership`
+		/// and `set_team`.
+		/// - `max_zombies`: The total number of accounts which may hold assets in this class yet
+		/// have no existential deposit.
+		/// - `min_balance`: The minimum balance of this new asset that any single account must
+		/// have. If an account's balance is reduced below this, then it collapses to zero.
+		///
+		/// Emits `Created` event when successful.
+		///
+		/// Weight: `O(1)`
+		#[weight = T::WeightInfo::create()]
+		fn create(origin,
+			#[compact] id: T::AssetId,
+			admin: <T::Lookup as StaticLookup>::Source,
+			max_zombies: u32,
+			min_balance: T::Balance,
+		) {
+			let owner = ensure_signed(origin)?;
+			let admin = T::Lookup::lookup(admin)?;
+
+			ensure!(!Asset::<T>::contains_key(id), Error::<T>::InUse);
+			ensure!(!min_balance.is_zero(), Error::<T>::MinBalanceZero);
+
+			let deposit = T::AssetDepositPerZombie::get()
+				.saturating_mul(max_zombies.into())
+			 	.saturating_add(T::AssetDepositBase::get());
+			T::Currency::reserve(&owner, deposit)?;
+
+			Asset::<T>::insert(id, AssetDetails {
+				owner: owner.clone(),
+				issuer: admin.clone(),
+				admin: admin.clone(),
+				freezer: admin.clone(),
+				supply: Zero::zero(),
+				deposit,
+				max_zombies,
+				min_balance,
+				zombies: Zero::zero(),
+				accounts: Zero::zero(),
+			});
+			Self::deposit_event(RawEvent::Created(id, owner, admin));
+		}
+
+		/// Issue a new class of fungible assets from a privileged origin.
+		///
+		/// This new asset class has no assets initially.
+		///
+		/// The origin must conform to `ForceOrigin`.
+		///
+		/// Unlike `create`, no funds are reserved.
+		///
+		/// - `id`: The identifier of the new asset. This must not be currently in use to identify
+		/// an existing asset.
+		/// - `owner`: The owner of this class of assets. The owner has full superuser permissions
+		/// over this asset, but may later change and configure the permissions using `transfer_ownership`
+		/// and `set_team`.
+		/// - `max_zombies`: The total number of accounts which may hold assets in this class yet
+		/// have no existential deposit.
+		/// - `min_balance`: The minimum balance of this new asset that any single account must
+		/// have. If an account's balance is reduced below this, then it collapses to zero.
+		///
+		/// Emits `ForceCreated` event when successful.
+		///
+		/// Weight: `O(1)`
+		#[weight = T::WeightInfo::force_create()]
+		fn force_create(origin,
+			#[compact] id: T::AssetId,
+			owner: <T::Lookup as StaticLookup>::Source,
+			#[compact] max_zombies: u32,
+			#[compact] min_balance: T::Balance,
+		) {
+			T::ForceOrigin::ensure_origin(origin)?;
+			let owner = T::Lookup::lookup(owner)?;
+
+			ensure!(!Asset::<T>::contains_key(id), Error::<T>::InUse);
+			ensure!(!min_balance.is_zero(), Error::<T>::MinBalanceZero);
+
+			Asset::<T>::insert(id, AssetDetails {
+				owner: owner.clone(),
+				issuer: owner.clone(),
+				admin: owner.clone(),
+				freezer: owner.clone(),
+				supply: Zero::zero(),
+				deposit: Zero::zero(),
+				max_zombies,
+				min_balance,
+				zombies: Zero::zero(),
+				accounts: Zero::zero(),
+			});
+			Self::deposit_event(RawEvent::ForceCreated(id, owner));
+		}
+
+		/// Destroy a class of fungible assets owned by the sender.
+		///
+		/// The origin must be Signed and the sender must be the owner of the asset `id`.
+		///
+		/// - `id`: The identifier of the asset to be destroyed. This must identify an existing
+		/// asset.
+		///
+		/// Emits `Destroyed` event when successful.
+		///
+		/// Weight: `O(z)` where `z` is the number of zombie accounts.
+		#[weight = T::WeightInfo::destroy(*zombies_witness)]
+		fn destroy(origin,
+			#[compact] id: T::AssetId,
+			#[compact] zombies_witness: u32,
+		) -> DispatchResult {
+			let origin = ensure_signed(origin)?;
+
+			Asset::<T>::try_mutate_exists(id, |maybe_details| {
+				let details = maybe_details.take().ok_or(Error::<T>::Unknown)?;
+				ensure!(details.owner == origin, Error::<T>::NoPermission);
+				ensure!(details.accounts == details.zombies, Error::<T>::RefsLeft);
+				ensure!(details.zombies <= zombies_witness, Error::<T>::BadWitness);
+				T::Currency::unreserve(&details.owner, details.deposit);
+
+				*maybe_details = None;
+				Account::<T>::remove_prefix(&id);
+				Self::deposit_event(RawEvent::Destroyed(id));
+				Ok(())
+			})
+		}
+
+		/// Destroy a class of fungible assets.
+		///
+		/// The origin must conform to `ForceOrigin`.
+		///
+		/// - `id`: The identifier of the asset to be destroyed. This must identify an existing
+		/// asset.
+		///
+		/// Emits `Destroyed` event when successful.
+		///
+		/// Weight: `O(1)`
+		#[weight = T::WeightInfo::force_destroy(*zombies_witness)]
+		fn force_destroy(origin,
+			#[compact] id: T::AssetId,
+			#[compact] zombies_witness: u32,
+		) -> DispatchResult {
+			T::ForceOrigin::ensure_origin(origin)?;
+
+			Asset::<T>::try_mutate_exists(id, |maybe_details| {
+				let details = maybe_details.take().ok_or(Error::<T>::Unknown)?;
+				ensure!(details.accounts == details.zombies, Error::<T>::RefsLeft);
+				ensure!(details.zombies <= zombies_witness, Error::<T>::BadWitness);
+				T::Currency::unreserve(&details.owner, details.deposit);
+
+				*maybe_details = None;
+				Account::<T>::remove_prefix(&id);
+				Self::deposit_event(RawEvent::Destroyed(id));
+				Ok(())
+			})
+		}
+
+		/// Mint assets of a particular class.
+		///
+		/// The origin must be Signed and the sender must be the Issuer of the asset `id`.
+		///
+		/// - `id`: The identifier of the asset to have some amount minted.
+		/// - `beneficiary`: The account to be credited with the minted assets.
+		/// - `amount`: The amount of the asset to be minted.
+		///
+		/// Emits `Destroyed` event when successful.
+		///
+		/// Weight: `O(1)`
+		/// Modes: Pre-existing balance of `beneficiary`; Account pre-existence of `beneficiary`.
+		#[weight = T::WeightInfo::mint()]
+		fn mint(origin,
+			#[compact] id: T::AssetId,
+			beneficiary: <T::Lookup as StaticLookup>::Source,
+			#[compact] amount: T::Balance
+		) -> DispatchResult {
+			let origin = ensure_signed(origin)?;
+			let beneficiary = T::Lookup::lookup(beneficiary)?;
+
+			Asset::<T>::try_mutate(id, |maybe_details| {
+				let details = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
+
+				ensure!(&origin == &details.issuer, Error::<T>::NoPermission);
+				details.supply = details.supply.checked_add(&amount).ok_or(Error::<T>::Overflow)?;
+
+				Account::<T>::try_mutate(id, &beneficiary, |t| -> DispatchResult {
+					let new_balance = t.balance.saturating_add(amount);
+					ensure!(new_balance >= details.min_balance, Error::<T>::BalanceLow);
+					if t.balance.is_zero() {
+						t.is_zombie = Self::new_account(&beneficiary, details)?;
+					}
+					t.balance = new_balance;
+					Ok(())
+				})?;
+				Self::deposit_event(RawEvent::Issued(id, beneficiary, amount));
+				Ok(())
+			})
+		}
+
+		/// Reduce the balance of `who` by as much as possible up to `amount` assets of `id`.
+		///
+		/// Origin must be Signed and the sender should be the Manager of the asset `id`.
+		///
+		/// Bails with `BalanceZero` if the `who` is already dead.
+		///
+		/// - `id`: The identifier of the asset to have some amount burned.
+		/// - `who`: The account to be debited from.
+		/// - `amount`: The maximum amount by which `who`'s balance should be reduced.
+		///
+		/// Emits `Burned` with the actual amount burned. If this takes the balance to below the
+		/// minimum for the asset, then the amount burned is increased to take it to zero.
+		///
+		/// Weight: `O(1)`
+		/// Modes: Post-existence of `who`; Pre & post Zombie-status of `who`.
+		#[weight = T::WeightInfo::burn()]
+		fn burn(origin,
+			#[compact] id: T::AssetId,
+			who: <T::Lookup as StaticLookup>::Source,
+			#[compact] amount: T::Balance
+		) -> DispatchResult {
+			let origin = ensure_signed(origin)?;
+			let who = T::Lookup::lookup(who)?;
+
+			Asset::<T>::try_mutate(id, |maybe_details| {
+				let d = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
+				ensure!(&origin == &d.admin, Error::<T>::NoPermission);
+
+				let burned = Account::<T>::try_mutate_exists(
+					id,
+					&who,
+					|maybe_account| -> Result<T::Balance, DispatchError> {
+						let mut account = maybe_account.take().ok_or(Error::<T>::BalanceZero)?;
+						let mut burned = amount.min(account.balance);
+						account.balance -= burned;
+						*maybe_account = if account.balance < d.min_balance {
+							burned += account.balance;
+							Self::dead_account(&who, d, account.is_zombie);
+							None
+						} else {
+							Some(account)
+						};
+						Ok(burned)
+					}
+				)?;
+
+				d.supply = d.supply.saturating_sub(burned);
+
+				Self::deposit_event(RawEvent::Burned(id, who, burned));
+				Ok(())
+			})
+		}
+
+		/// Move some assets from the sender account to another.
+		///
+		/// Origin must be Signed.
+		///
+		/// - `id`: The identifier of the asset to have some amount transferred.
+		/// - `target`: The account to be credited.
+		/// - `amount`: The amount by which the sender's balance of assets should be reduced and
+		/// `target`'s balance increased. The amount actually transferred may be slightly greater in
+		/// the case that the transfer would otherwise take the sender balance above zero but below
+		/// the minimum balance. Must be greater than zero.
+		///
+		/// Emits `Transferred` with the actual amount transferred. If this takes the source balance
+		/// to below the minimum for the asset, then the amount transferred is increased to take it
+		/// to zero.
+		///
+		/// Weight: `O(1)`
+		/// Modes: Pre-existence of `target`; Post-existence of sender; Prior & post zombie-status
+		/// of sender; Account pre-existence of `target`.
+		#[weight = T::WeightInfo::transfer()]
+		fn transfer(origin,
+			#[compact] id: T::AssetId,
+			target: <T::Lookup as StaticLookup>::Source,
+			#[compact] amount: T::Balance
+		) -> DispatchResult {
+			let origin = ensure_signed(origin)?;
+			ensure!(!amount.is_zero(), Error::<T>::AmountZero);
+
+			let mut origin_account = Account::<T>::get(id, &origin);
+			ensure!(!origin_account.is_frozen, Error::<T>::Frozen);
+			origin_account.balance = origin_account.balance.checked_sub(&amount)
+				.ok_or(Error::<T>::BalanceLow)?;
+
+			let dest = T::Lookup::lookup(target)?;
+			Asset::<T>::try_mutate(id, |maybe_details| {
+				let details = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
+
+				if dest == origin {
+					return Ok(())
+				}
+
+				let mut amount = amount;
+				if origin_account.balance < details.min_balance {
+					amount += origin_account.balance;
+					origin_account.balance = Zero::zero();
+				}
+
+				Account::<T>::try_mutate(id, &dest, |a| -> DispatchResult {
+					let new_balance = a.balance.saturating_add(amount);
+					ensure!(new_balance >= details.min_balance, Error::<T>::BalanceLow);
+					if a.balance.is_zero() {
+						a.is_zombie = Self::new_account(&dest, details)?;
+					}
+					a.balance = new_balance;
+					Ok(())
+				})?;
+
+				match origin_account.balance.is_zero() {
+					false => {
+						Self::dezombify(&origin, details, &mut origin_account.is_zombie);
+						Account::<T>::insert(id, &origin, &origin_account)
+					}
+					true => {
+						Self::dead_account(&origin, details, origin_account.is_zombie);
+						Account::<T>::remove(id, &origin);
+					}
+				}
+
+				Self::deposit_event(RawEvent::Transferred(id, origin, dest, amount));
+				Ok(())
+			})
+		}
+
+		/// Move some assets from one account to another.
+		///
+		/// Origin must be Signed and the sender should be the Admin of the asset `id`.
+		///
+		/// - `id`: The identifier of the asset to have some amount transferred.
+		/// - `source`: The account to be debited.
+		/// - `dest`: The account to be credited.
+		/// - `amount`: The amount by which the `source`'s balance of assets should be reduced and
+		/// `dest`'s balance increased. The amount actually transferred may be slightly greater in
+		/// the case that the transfer would otherwise take the `source` balance above zero but
+		/// below the minimum balance. Must be greater than zero.
+		///
+		/// Emits `Transferred` with the actual amount transferred. If this takes the source balance
+		/// to below the minimum for the asset, then the amount transferred is increased to take it
+		/// to zero.
+		///
+		/// Weight: `O(1)`
+		/// Modes: Pre-existence of `dest`; Post-existence of `source`; Prior & post zombie-status
+		/// of `source`; Account pre-existence of `dest`.
+		#[weight = T::WeightInfo::force_transfer()]
+		fn force_transfer(origin,
+			#[compact] id: T::AssetId,
+			source: <T::Lookup as StaticLookup>::Source,
+			dest: <T::Lookup as StaticLookup>::Source,
+			#[compact] amount: T::Balance,
+		) -> DispatchResult {
+			let origin = ensure_signed(origin)?;
+
+			let source = T::Lookup::lookup(source)?;
+			let mut source_account = Account::<T>::get(id, &source);
+			let mut amount = amount.min(source_account.balance);
+			ensure!(!amount.is_zero(), Error::<T>::AmountZero);
+
+			let dest = T::Lookup::lookup(dest)?;
+			if dest == source {
+				return Ok(())
+			}
+
+			Asset::<T>::try_mutate(id, |maybe_details| {
+				let details = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
+				ensure!(&origin == &details.admin, Error::<T>::NoPermission);
+
+				source_account.balance -= amount;
+				if source_account.balance < details.min_balance {
+					amount += source_account.balance;
+					source_account.balance = Zero::zero();
+				}
+
+				Account::<T>::try_mutate(id, &dest, |a| -> DispatchResult {
+					let new_balance = a.balance.saturating_add(amount);
+					ensure!(new_balance >= details.min_balance, Error::<T>::BalanceLow);
+					if a.balance.is_zero() {
+						a.is_zombie = Self::new_account(&dest, details)?;
+					}
+					a.balance = new_balance;
+					Ok(())
+				})?;
+
+				match source_account.balance.is_zero() {
+					false => {
+						Self::dezombify(&source, details, &mut source_account.is_zombie);
+						Account::<T>::insert(id, &source, &source_account)
+					}
+					true => {
+						Self::dead_account(&source, details, source_account.is_zombie);
+						Account::<T>::remove(id, &source);
+					}
+				}
+
+				Self::deposit_event(RawEvent::ForceTransferred(id, source, dest, amount));
+				Ok(())
+			})
+		}
+
+		/// Disallow further unprivileged transfers from an account.
+		///
+		/// Origin must be Signed and the sender should be the Freezer of the asset `id`.
+		///
+		/// - `id`: The identifier of the asset to be frozen.
+		/// - `who`: The account to be frozen.
+		///
+		/// Emits `Frozen`.
 		///
-		/// TWOX-NOTE: `AssetId` is trusted, so this is safe.
-		TotalSupply: map hasher(twox_64_concat) T::AssetId => T::Balance;
+		/// Weight: `O(1)`
+		#[weight = T::WeightInfo::freeze()]
+		fn freeze(origin, #[compact] id: T::AssetId, who: <T::Lookup as StaticLookup>::Source) {
+			let origin = ensure_signed(origin)?;
+
+			let d = Asset::<T>::get(id).ok_or(Error::<T>::Unknown)?;
+			ensure!(&origin == &d.freezer, Error::<T>::NoPermission);
+			let who = T::Lookup::lookup(who)?;
+			ensure!(Account::<T>::contains_key(id, &who), Error::<T>::BalanceZero);
+
+			Account::<T>::mutate(id, &who, |a| a.is_frozen = true);
+
+			Self::deposit_event(Event::<T>::Frozen(id, who));
+		}
+
+		/// Allow unprivileged transfers from an account again.
+		///
+		/// Origin must be Signed and the sender should be the Admin of the asset `id`.
+		///
+		/// - `id`: The identifier of the asset to be frozen.
+		/// - `who`: The account to be unfrozen.
+		///
+		/// Emits `Thawed`.
+		///
+		/// Weight: `O(1)`
+		#[weight = T::WeightInfo::thaw()]
+		fn thaw(origin, #[compact] id: T::AssetId, who: <T::Lookup as StaticLookup>::Source) {
+			let origin = ensure_signed(origin)?;
+
+			let details = Asset::<T>::get(id).ok_or(Error::<T>::Unknown)?;
+			ensure!(&origin == &details.admin, Error::<T>::NoPermission);
+			let who = T::Lookup::lookup(who)?;
+			ensure!(Account::<T>::contains_key(id, &who), Error::<T>::BalanceZero);
+
+			Account::<T>::mutate(id, &who, |a| a.is_frozen = false);
+
+			Self::deposit_event(Event::<T>::Thawed(id, who));
+		}
+
+		/// Change the Owner of an asset.
+		///
+		/// Origin must be Signed and the sender should be the Owner of the asset `id`.
+		///
+		/// - `id`: The identifier of the asset to be frozen.
+		/// - `owner`: The new Owner of this asset.
+		///
+		/// Emits `OwnerChanged`.
+		///
+		/// Weight: `O(1)`
+		#[weight = T::WeightInfo::transfer_ownership()]
+		fn transfer_ownership(origin,
+			#[compact] id: T::AssetId,
+			owner: <T::Lookup as StaticLookup>::Source,
+		) -> DispatchResult {
+			let origin = ensure_signed(origin)?;
+			let owner = T::Lookup::lookup(owner)?;
+
+			Asset::<T>::try_mutate(id, |maybe_details| {
+				let details = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
+				ensure!(&origin == &details.owner, Error::<T>::NoPermission);
+				if details.owner == owner { return Ok(()) }
+
+				// Move the deposit to the new owner.
+				T::Currency::repatriate_reserved(&details.owner, &owner, details.deposit, Reserved)?;
+
+				details.owner = owner.clone();
+
+				Self::deposit_event(RawEvent::OwnerChanged(id, owner));
+				Ok(())
+			})
+		}
+
+		/// Change the Issuer, Admin and Freezer of an asset.
+		///
+		/// Origin must be Signed and the sender should be the Owner of the asset `id`.
+		///
+		/// - `id`: The identifier of the asset to be frozen.
+		/// - `issuer`: The new Issuer of this asset.
+		/// - `admin`: The new Admin of this asset.
+		/// - `freezer`: The new Freezer of this asset.
+		///
+		/// Emits `TeamChanged`.
+		///
+		/// Weight: `O(1)`
+		#[weight = T::WeightInfo::set_team()]
+		fn set_team(origin,
+			#[compact] id: T::AssetId,
+			issuer: <T::Lookup as StaticLookup>::Source,
+			admin: <T::Lookup as StaticLookup>::Source,
+			freezer: <T::Lookup as StaticLookup>::Source,
+		) -> DispatchResult {
+			let origin = ensure_signed(origin)?;
+			let issuer = T::Lookup::lookup(issuer)?;
+			let admin = T::Lookup::lookup(admin)?;
+			let freezer = T::Lookup::lookup(freezer)?;
+
+			Asset::<T>::try_mutate(id, |maybe_details| {
+				let details = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
+				ensure!(&origin == &details.owner, Error::<T>::NoPermission);
+
+				details.issuer = issuer.clone();
+				details.admin = admin.clone();
+				details.freezer = freezer.clone();
+
+				Self::deposit_event(RawEvent::TeamChanged(id, issuer, admin, freezer));
+				Ok(())
+			})
+		}
+
+		#[weight = T::WeightInfo::set_max_zombies()]
+		fn set_max_zombies(origin,
+			#[compact] id: T::AssetId,
+			#[compact] max_zombies: u32,
+		) -> DispatchResult {
+			let origin = ensure_signed(origin)?;
+
+			Asset::<T>::try_mutate(id, |maybe_details| {
+				let details = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
+				ensure!(&origin == &details.owner, Error::<T>::NoPermission);
+				ensure!(max_zombies >= details.zombies, Error::<T>::TooManyZombies);
+
+				let new_deposit = T::AssetDepositPerZombie::get()
+					.saturating_mul(max_zombies.into())
+					.saturating_add(T::AssetDepositBase::get());
+
+				if new_deposit > details.deposit {
+					T::Currency::reserve(&origin, new_deposit - details.deposit)?;
+				} else {
+					T::Currency::unreserve(&origin, details.deposit - new_deposit);
+				}
+
+				details.max_zombies = max_zombies;
+
+				Self::deposit_event(RawEvent::MaxZombiesChanged(id, max_zombies));
+				Ok(())
+			})
+		}
 	}
 }
 
@@ -269,12 +844,60 @@ impl<T: Config> Module<T> {
 
 	/// Get the asset `id` balance of `who`.
 	pub fn balance(id: T::AssetId, who: T::AccountId) -> T::Balance {
-		<Balances<T>>::get((id, who))
+		Account::<T>::get(id, who).balance
 	}
 
 	/// Get the total supply of an asset `id`.
 	pub fn total_supply(id: T::AssetId) -> T::Balance {
-		<TotalSupply<T>>::get(id)
+		Asset::<T>::get(id).map(|x| x.supply).unwrap_or_else(Zero::zero)
+	}
+
+	/// Check the number of zombies allow yet for an asset.
+	pub fn zombie_allowance(id: T::AssetId) -> u32 {
+		Asset::<T>::get(id).map(|x| x.max_zombies - x.zombies).unwrap_or_else(Zero::zero)
+	}
+
+	fn new_account(
+		who: &T::AccountId,
+		d: &mut AssetDetails<T::Balance, T::AccountId, BalanceOf<T>>,
+	) -> Result<bool, DispatchError> {
+		let accounts = d.accounts.checked_add(1).ok_or(Error::<T>::Overflow)?;
+		let r = Ok(if frame_system::Module::<T>::account_exists(who) {
+			frame_system::Module::<T>::inc_ref(who);
+			false
+		} else {
+			ensure!(d.zombies < d.max_zombies, Error::<T>::TooManyZombies);
+			d.zombies += 1;
+			true
+		});
+		d.accounts = accounts;
+		r
+	}
+
+	/// If `who`` exists in system and it's a zombie, dezombify it.
+	fn dezombify(
+		who: &T::AccountId,
+		d: &mut AssetDetails<T::Balance, T::AccountId, BalanceOf<T>>,
+		is_zombie: &mut bool,
+	) {
+		if *is_zombie && frame_system::Module::<T>::account_exists(who) {
+			frame_system::Module::<T>::inc_ref(who);
+			*is_zombie = false;
+			d.zombies = d.zombies.saturating_sub(1);
+		}
+	}
+
+	fn dead_account(
+		who: &T::AccountId,
+		d: &mut AssetDetails<T::Balance, T::AccountId, BalanceOf<T>>,
+		is_zombie: bool,
+	) {
+		if is_zombie {
+			d.zombies = d.zombies.saturating_sub(1);
+		} else {
+			frame_system::Module::<T>::dec_ref(who);
+		}
+		d.accounts = d.accounts.saturating_sub(1);
 	}
 }
 
@@ -282,10 +905,25 @@ impl<T: Config> Module<T> {
 mod tests {
 	use super::*;
 
-	use frame_support::{impl_outer_origin, assert_ok, assert_noop, parameter_types, weights::Weight};
+	use frame_support::{
+		impl_outer_origin, impl_outer_event, assert_ok, assert_noop, parameter_types,
+		weights::Weight
+	};
 	use sp_core::H256;
 	use sp_runtime::{Perbill, traits::{BlakeTwo256, IdentityLookup}, testing::Header};
 
+	mod pallet_assets {
+		pub use crate::Event;
+	}
+
+	impl_outer_event! {
+		pub enum Event for Test {
+			frame_system<T>,
+			pallet_balances<T>,
+			pallet_assets<T>,
+		}
+	}
+
 	impl_outer_origin! {
 		pub enum Origin for Test where system = frame_system {}
 	}
@@ -309,7 +947,7 @@ mod tests {
 		type AccountId = u64;
 		type Lookup = IdentityLookup<Self::AccountId>;
 		type Header = Header;
-		type Event = ();
+		type Event = Event;
 		type BlockHashCount = BlockHashCount;
 		type MaximumBlockWeight = MaximumBlockWeight;
 		type DbWeight = ();
@@ -320,34 +958,199 @@ mod tests {
 		type MaximumBlockLength = MaximumBlockLength;
 		type Version = ();
 		type PalletInfo = ();
-		type AccountData = ();
+		type AccountData = pallet_balances::AccountData<u64>;
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
 	}
+
+	parameter_types! {
+		pub const ExistentialDeposit: u64 = 1;
+	}
+
+	impl pallet_balances::Config for Test {
+		type MaxLocks = ();
+		type Balance = u64;
+		type DustRemoval = ();
+		type Event = Event;
+		type ExistentialDeposit = ExistentialDeposit;
+		type AccountStore = System;
+		type WeightInfo = ();
+	}
+
+	parameter_types! {
+		pub const AssetDepositBase: u64 = 1;
+		pub const AssetDepositPerZombie: u64 = 1;
+	}
+
 	impl Config for Test {
-		type Event = ();
+		type Currency = Balances;
+		type Event = Event;
 		type Balance = u64;
 		type AssetId = u32;
+		type ForceOrigin = frame_system::EnsureRoot<u64>;
+		type AssetDepositBase = AssetDepositBase;
+		type AssetDepositPerZombie = AssetDepositPerZombie;
+		type WeightInfo = ();
 	}
+	type System = frame_system::Module<Test>;
+	type Balances = pallet_balances::Module<Test>;
 	type Assets = Module<Test>;
 
-	fn new_test_ext() -> sp_io::TestExternalities {
+	pub(crate) fn new_test_ext() -> sp_io::TestExternalities {
 		frame_system::GenesisConfig::default().build_storage::<Test>().unwrap().into()
 	}
 
 	#[test]
-	fn issuing_asset_units_to_issuer_should_work() {
+	fn basic_minting_should_work() {
 		new_test_ext().execute_with(|| {
-			assert_ok!(Assets::issue(Origin::signed(1), 100));
+			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 1));
+			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
 			assert_eq!(Assets::balance(0, 1), 100);
+			assert_ok!(Assets::mint(Origin::signed(1), 0, 2, 100));
+			assert_eq!(Assets::balance(0, 2), 100);
+		});
+	}
+
+	#[test]
+	fn lifecycle_should_work() {
+		new_test_ext().execute_with(|| {
+			Balances::make_free_balance_be(&1, 100);
+			assert_ok!(Assets::create(Origin::signed(1), 0, 1, 10, 1));
+			assert_eq!(Balances::reserved_balance(&1), 11);
+
+			assert_ok!(Assets::destroy(Origin::signed(1), 0, 100));
+			assert_eq!(Balances::reserved_balance(&1), 0);
+
+			assert_ok!(Assets::create(Origin::signed(1), 0, 1, 10, 1));
+			assert_eq!(Balances::reserved_balance(&1), 11);
+
+			assert_ok!(Assets::force_destroy(Origin::root(), 0, 100));
+			assert_eq!(Balances::reserved_balance(&1), 0);
+		});
+	}
+
+	#[test]
+	fn destroy_with_non_zombies_should_not_work() {
+		new_test_ext().execute_with(|| {
+			Balances::make_free_balance_be(&1, 100);
+			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 1));
+			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
+			assert_noop!(Assets::destroy(Origin::signed(1), 0, 100), Error::<Test>::RefsLeft);
+			assert_noop!(Assets::force_destroy(Origin::root(), 0, 100), Error::<Test>::RefsLeft);
+			assert_ok!(Assets::burn(Origin::signed(1), 0, 1, 100));
+			assert_ok!(Assets::destroy(Origin::signed(1), 0, 100));
+		});
+	}
+
+	#[test]
+	fn destroy_with_bad_witness_should_not_work() {
+		new_test_ext().execute_with(|| {
+			Balances::make_free_balance_be(&1, 100);
+			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 1));
+			assert_ok!(Assets::mint(Origin::signed(1), 0, 10, 100));
+			assert_noop!(Assets::destroy(Origin::signed(1), 0, 0), Error::<Test>::BadWitness);
+			assert_noop!(Assets::force_destroy(Origin::root(), 0, 0), Error::<Test>::BadWitness);
+		});
+	}
+
+	#[test]
+	fn max_zombies_should_work() {
+		new_test_ext().execute_with(|| {
+			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 2, 1));
+			assert_ok!(Assets::mint(Origin::signed(1), 0, 0, 100));
+			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
+
+			assert_eq!(Assets::zombie_allowance(0), 0);
+			assert_noop!(Assets::mint(Origin::signed(1), 0, 2, 100), Error::<Test>::TooManyZombies);
+			assert_noop!(Assets::transfer(Origin::signed(1), 0, 2, 50), Error::<Test>::TooManyZombies);
+			assert_noop!(Assets::force_transfer(Origin::signed(1), 0, 1, 2, 50), Error::<Test>::TooManyZombies);
+
+			Balances::make_free_balance_be(&3, 100);
+			assert_ok!(Assets::mint(Origin::signed(1), 0, 3, 100));
+
+			assert_ok!(Assets::transfer(Origin::signed(0), 0, 1, 100));
+			assert_eq!(Assets::zombie_allowance(0), 1);
+			assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 50));
+		});
+	}
+
+	#[test]
+	fn resetting_max_zombies_should_work() {
+		new_test_ext().execute_with(|| {
+			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 2, 1));
+			Balances::make_free_balance_be(&1, 100);
+			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
+			assert_ok!(Assets::mint(Origin::signed(1), 0, 2, 100));
+			assert_ok!(Assets::mint(Origin::signed(1), 0, 3, 100));
+
+			assert_eq!(Assets::zombie_allowance(0), 0);
+
+			assert_noop!(Assets::set_max_zombies(Origin::signed(1), 0, 1), Error::<Test>::TooManyZombies);
+
+			assert_ok!(Assets::set_max_zombies(Origin::signed(1), 0, 3));
+			assert_eq!(Assets::zombie_allowance(0), 1);
+		});
+	}
+
+	#[test]
+	fn dezombifying_should_work() {
+		new_test_ext().execute_with(|| {
+			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 10));
+			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
+			assert_eq!(Assets::zombie_allowance(0), 9);
+
+			// introduce a bit of balance for account 2.
+			Balances::make_free_balance_be(&2, 100);
+
+			// transfer 25 units, nothing changes.
+			assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 25));
+			assert_eq!(Assets::zombie_allowance(0), 9);
+
+			// introduce a bit of balance; this will create the account.
+			Balances::make_free_balance_be(&1, 100);
+
+			// now transferring 25 units will create it.
+			assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 25));
+			assert_eq!(Assets::zombie_allowance(0), 10);
+		});
+	}
+
+	#[test]
+	fn min_balance_should_work() {
+		new_test_ext().execute_with(|| {
+			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 10));
+			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
+			assert_eq!(Asset::<Test>::get(0).unwrap().accounts, 1);
+
+			// Cannot create a new account with a balance that is below minimum...
+			assert_noop!(Assets::mint(Origin::signed(1), 0, 2, 9), Error::<Test>::BalanceLow);
+			assert_noop!(Assets::transfer(Origin::signed(1), 0, 2, 9), Error::<Test>::BalanceLow);
+			assert_noop!(Assets::force_transfer(Origin::signed(1), 0, 1, 2, 9), Error::<Test>::BalanceLow);
+
+			// When deducting from an account to below minimum, it should be reaped.
+
+			assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 91));
+			assert!(Assets::balance(0, 1).is_zero());
+			assert_eq!(Assets::balance(0, 2), 100);
+			assert_eq!(Asset::<Test>::get(0).unwrap().accounts, 1);
+
+			assert_ok!(Assets::force_transfer(Origin::signed(1), 0, 2, 1, 91));
+			assert!(Assets::balance(0, 2).is_zero());
+			assert_eq!(Assets::balance(0, 1), 100);
+			assert_eq!(Asset::<Test>::get(0).unwrap().accounts, 1);
+
+			assert_ok!(Assets::burn(Origin::signed(1), 0, 1, 91));
+			assert!(Assets::balance(0, 1).is_zero());
+			assert_eq!(Asset::<Test>::get(0).unwrap().accounts, 0);
 		});
 	}
 
 	#[test]
 	fn querying_total_supply_should_work() {
 		new_test_ext().execute_with(|| {
-			assert_ok!(Assets::issue(Origin::signed(1), 100));
+			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 1));
+			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
 			assert_eq!(Assets::balance(0, 1), 100);
 			assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 50));
 			assert_eq!(Assets::balance(0, 1), 50);
@@ -356,15 +1159,16 @@ mod tests {
 			assert_eq!(Assets::balance(0, 1), 50);
 			assert_eq!(Assets::balance(0, 2), 19);
 			assert_eq!(Assets::balance(0, 3), 31);
-			assert_ok!(Assets::destroy(Origin::signed(3), 0));
+			assert_ok!(Assets::burn(Origin::signed(1), 0, 3, u64::max_value()));
 			assert_eq!(Assets::total_supply(0), 69);
 		});
 	}
 
 	#[test]
-	fn transferring_amount_above_available_balance_should_work() {
+	fn transferring_amount_below_available_balance_should_work() {
 		new_test_ext().execute_with(|| {
-			assert_ok!(Assets::issue(Origin::signed(1), 100));
+			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 1));
+			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
 			assert_eq!(Assets::balance(0, 1), 100);
 			assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 50));
 			assert_eq!(Assets::balance(0, 1), 50);
@@ -372,24 +1176,106 @@ mod tests {
 		});
 	}
 
+	#[test]
+	fn transferring_frozen_balance_should_not_work() {
+		new_test_ext().execute_with(|| {
+			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 1));
+			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
+			assert_eq!(Assets::balance(0, 1), 100);
+			assert_ok!(Assets::freeze(Origin::signed(1), 0, 1));
+			assert_noop!(Assets::transfer(Origin::signed(1), 0, 2, 50), Error::<Test>::Frozen);
+			assert_ok!(Assets::thaw(Origin::signed(1), 0, 1));
+			assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 50));
+		});
+	}
+
+	#[test]
+	fn origin_guards_should_work() {
+		new_test_ext().execute_with(|| {
+			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 1));
+			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
+			assert_noop!(Assets::transfer_ownership(Origin::signed(2), 0, 2), Error::<Test>::NoPermission);
+			assert_noop!(Assets::set_team(Origin::signed(2), 0, 2, 2, 2), Error::<Test>::NoPermission);
+			assert_noop!(Assets::freeze(Origin::signed(2), 0, 1), Error::<Test>::NoPermission);
+			assert_noop!(Assets::thaw(Origin::signed(2), 0, 2), Error::<Test>::NoPermission);
+			assert_noop!(Assets::mint(Origin::signed(2), 0, 2, 100), Error::<Test>::NoPermission);
+			assert_noop!(Assets::burn(Origin::signed(2), 0, 1, 100), Error::<Test>::NoPermission);
+			assert_noop!(Assets::force_transfer(Origin::signed(2), 0, 1, 2, 100), Error::<Test>::NoPermission);
+			assert_noop!(Assets::set_max_zombies(Origin::signed(2), 0, 11), Error::<Test>::NoPermission);
+			assert_noop!(Assets::destroy(Origin::signed(2), 0, 100), Error::<Test>::NoPermission);
+		});
+	}
+
+	#[test]
+	fn transfer_owner_should_work() {
+		new_test_ext().execute_with(|| {
+			Balances::make_free_balance_be(&1, 100);
+			Balances::make_free_balance_be(&2, 1);
+			assert_ok!(Assets::create(Origin::signed(1), 0, 1, 10, 1));
+
+			assert_eq!(Balances::reserved_balance(&1), 11);
+
+			assert_ok!(Assets::transfer_ownership(Origin::signed(1), 0, 2));
+			assert_eq!(Balances::reserved_balance(&2), 11);
+			assert_eq!(Balances::reserved_balance(&1), 0);
+
+			assert_noop!(Assets::transfer_ownership(Origin::signed(1), 0, 1), Error::<Test>::NoPermission);
+
+			assert_ok!(Assets::transfer_ownership(Origin::signed(2), 0, 1));
+			assert_eq!(Balances::reserved_balance(&1), 11);
+			assert_eq!(Balances::reserved_balance(&2), 0);
+		});
+	}
+
+	#[test]
+	fn set_team_should_work() {
+		new_test_ext().execute_with(|| {
+			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 1));
+			assert_ok!(Assets::set_team(Origin::signed(1), 0, 2, 3, 4));
+
+			assert_ok!(Assets::mint(Origin::signed(2), 0, 2, 100));
+			assert_ok!(Assets::freeze(Origin::signed(4), 0, 2));
+			assert_ok!(Assets::thaw(Origin::signed(3), 0, 2));
+			assert_ok!(Assets::force_transfer(Origin::signed(3), 0, 2, 3, 100));
+			assert_ok!(Assets::burn(Origin::signed(3), 0, 3, 100));
+		});
+	}
+
+	#[test]
+	fn transferring_to_frozen_account_should_work() {
+		new_test_ext().execute_with(|| {
+			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 1));
+			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
+			assert_ok!(Assets::mint(Origin::signed(1), 0, 2, 100));
+			assert_eq!(Assets::balance(0, 1), 100);
+			assert_eq!(Assets::balance(0, 2), 100);
+			assert_ok!(Assets::freeze(Origin::signed(1), 0, 2));
+			assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 50));
+			assert_eq!(Assets::balance(0, 2), 150);
+		});
+	}
+
 	#[test]
 	fn transferring_amount_more_than_available_balance_should_not_work() {
 		new_test_ext().execute_with(|| {
-			assert_ok!(Assets::issue(Origin::signed(1), 100));
+			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 1));
+			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
 			assert_eq!(Assets::balance(0, 1), 100);
 			assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 50));
 			assert_eq!(Assets::balance(0, 1), 50);
 			assert_eq!(Assets::balance(0, 2), 50);
-			assert_ok!(Assets::destroy(Origin::signed(1), 0));
+			assert_ok!(Assets::burn(Origin::signed(1), 0, 1, u64::max_value()));
 			assert_eq!(Assets::balance(0, 1), 0);
 			assert_noop!(Assets::transfer(Origin::signed(1), 0, 1, 50), Error::<Test>::BalanceLow);
+			assert_noop!(Assets::transfer(Origin::signed(2), 0, 1, 51), Error::<Test>::BalanceLow);
 		});
 	}
 
 	#[test]
 	fn transferring_less_than_one_unit_should_not_work() {
 		new_test_ext().execute_with(|| {
-			assert_ok!(Assets::issue(Origin::signed(1), 100));
+			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 1));
+			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
 			assert_eq!(Assets::balance(0, 1), 100);
 			assert_noop!(Assets::transfer(Origin::signed(1), 0, 2, 0), Error::<Test>::AmountZero);
 		});
@@ -398,27 +1284,31 @@ mod tests {
 	#[test]
 	fn transferring_more_units_than_total_supply_should_not_work() {
 		new_test_ext().execute_with(|| {
-			assert_ok!(Assets::issue(Origin::signed(1), 100));
+			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 1));
+			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
 			assert_eq!(Assets::balance(0, 1), 100);
 			assert_noop!(Assets::transfer(Origin::signed(1), 0, 2, 101), Error::<Test>::BalanceLow);
 		});
 	}
 
 	#[test]
-	fn destroying_asset_balance_with_positive_balance_should_work() {
+	fn burning_asset_balance_with_positive_balance_should_work() {
 		new_test_ext().execute_with(|| {
-			assert_ok!(Assets::issue(Origin::signed(1), 100));
+			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 1));
+			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
 			assert_eq!(Assets::balance(0, 1), 100);
-			assert_ok!(Assets::destroy(Origin::signed(1), 0));
+			assert_ok!(Assets::burn(Origin::signed(1), 0, 1, u64::max_value()));
+			assert_eq!(Assets::balance(0, 1), 0);
 		});
 	}
 
 	#[test]
-	fn destroying_asset_balance_with_zero_balance_should_not_work() {
+	fn burning_asset_balance_with_zero_balance_should_not_work() {
 		new_test_ext().execute_with(|| {
-			assert_ok!(Assets::issue(Origin::signed(1), 100));
+			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 1));
+			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
 			assert_eq!(Assets::balance(0, 2), 0);
-			assert_noop!(Assets::destroy(Origin::signed(2), 0), Error::<Test>::BalanceZero);
+			assert_noop!(Assets::burn(Origin::signed(1), 0, 2, u64::max_value()), Error::<Test>::BalanceZero);
 		});
 	}
 }
diff --git a/frame/assets/src/weights.rs b/frame/assets/src/weights.rs
new file mode 100644
index 000000000000..f6408e527f51
--- /dev/null
+++ b/frame/assets/src/weights.rs
@@ -0,0 +1,207 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Autogenerated weights for pallet_assets
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
+//! DATE: 2020-12-03, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
+
+// Executed Command:
+// target/release/substrate
+// benchmark
+// --chain=dev
+// --steps=50
+// --repeat=20
+// --pallet=pallet_assets
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./frame/assets/src/weights.rs
+// --template=./.maintain/frame-weight-template.hbs
+
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for pallet_assets.
+pub trait WeightInfo {
+	fn create() -> Weight;
+	fn force_create() -> Weight;
+	fn destroy(z: u32, ) -> Weight;
+	fn force_destroy(z: u32, ) -> Weight;
+	fn mint() -> Weight;
+	fn burn() -> Weight;
+	fn transfer() -> Weight;
+	fn force_transfer() -> Weight;
+	fn freeze() -> Weight;
+	fn thaw() -> Weight;
+	fn transfer_ownership() -> Weight;
+	fn set_team() -> Weight;
+	fn set_max_zombies() -> Weight;
+}
+
+/// Weights for pallet_assets using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	fn create() -> Weight {
+		(58_077_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn force_create() -> Weight {
+		(30_497_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn destroy(z: u32, ) -> Weight {
+		(0 as Weight)
+			.saturating_add((1_153_000 as Weight).saturating_mul(z as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(z as Weight)))
+	}
+	fn force_destroy(z: u32, ) -> Weight {
+		(0 as Weight)
+			.saturating_add((1_153_000 as Weight).saturating_mul(z as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(z as Weight)))
+	}
+	fn mint() -> Weight {
+		(45_600_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+	}
+	fn burn() -> Weight {
+		(40_143_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+	}
+	fn transfer() -> Weight {
+		(58_903_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+	}
+	fn force_transfer() -> Weight {
+		(59_025_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+	}
+	fn freeze() -> Weight {
+		(43_308_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn thaw() -> Weight {
+		(43_383_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn transfer_ownership() -> Weight {
+		(31_380_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn set_team() -> Weight {
+		(32_049_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn set_max_zombies() -> Weight {
+		(57_745_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+	fn create() -> Weight {
+		(58_077_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn force_create() -> Weight {
+		(30_497_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn destroy(z: u32, ) -> Weight {
+		(0 as Weight)
+			.saturating_add((1_153_000 as Weight).saturating_mul(z as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(z as Weight)))
+	}
+	fn force_destroy(z: u32, ) -> Weight {
+		(0 as Weight)
+			.saturating_add((1_153_000 as Weight).saturating_mul(z as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(z as Weight)))
+	}
+	fn mint() -> Weight {
+		(45_600_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+	}
+	fn burn() -> Weight {
+		(40_143_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+	}
+	fn transfer() -> Weight {
+		(58_903_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+	}
+	fn force_transfer() -> Weight {
+		(59_025_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+	}
+	fn freeze() -> Weight {
+		(43_308_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn thaw() -> Weight {
+		(43_383_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn transfer_ownership() -> Weight {
+		(31_380_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn set_team() -> Weight {
+		(32_049_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn set_max_zombies() -> Weight {
+		(57_745_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+}
diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index 1f119dad76f3..2852fbb953fd 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -409,7 +409,7 @@ decl_storage! {
 			for (_, balance) in &config.balances {
 				assert!(
 					*balance >= <T as Config<I>>::ExistentialDeposit::get(),
-					"the balance of any account should always be more than existential deposit.",
+					"the balance of any account should always be at least the existential deposit.",
 				)
 			}
 			for &(ref who, free) in config.balances.iter() {
diff --git a/frame/balances/src/tests.rs b/frame/balances/src/tests.rs
index beaf2e2c223b..9a7e7ccb2687 100644
--- a/frame/balances/src/tests.rs
+++ b/frame/balances/src/tests.rs
@@ -630,7 +630,7 @@ macro_rules! decl_tests {
 		}
 
 		#[test]
-		#[should_panic = "the balance of any account should always be more than existential deposit."]
+		#[should_panic = "the balance of any account should always be at least the existential deposit."]
 		fn cannot_set_genesis_value_below_ed() {
 			($existential_deposit).with(|v| *v.borrow_mut() = 11);
 			let mut t = frame_system::GenesisConfig::default().build_storage::<$test>().unwrap();
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index af185139fb6b..3c13ac553970 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -903,6 +903,10 @@ impl<T: Config> Module<T> {
 		Self::deposit_event_indexed(&[], event.into());
 	}
 
+	pub fn account_exists(who: &T::AccountId) -> bool {
+		Account::<T>::contains_key(who)
+	}
+
 	/// Increment the reference counter on an account.
 	pub fn inc_ref(who: &T::AccountId) {
 		Account::<T>::mutate(who, |a| a.refcount = a.refcount.saturating_add(1));

From 39278096356942a087213b0f21c976ac100cb8f8 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Fri, 4 Dec 2020 13:09:19 -0800
Subject: [PATCH 0143/1194] Add Standard Error to Weight Template (#7652)

* Add standard error to weight template

* fix test compile
---
 .maintain/frame-weight-template.hbs           |  2 +
 utils/frame/benchmarking-cli/src/template.hbs |  1 +
 utils/frame/benchmarking-cli/src/writer.rs    | 80 +++++++++++++------
 3 files changed, 59 insertions(+), 24 deletions(-)

diff --git a/.maintain/frame-weight-template.hbs b/.maintain/frame-weight-template.hbs
index 6e555da968d3..76f89eafbaee 100644
--- a/.maintain/frame-weight-template.hbs
+++ b/.maintain/frame-weight-template.hbs
@@ -54,6 +54,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	) -> Weight {
 		({{underscore benchmark.base_weight}} as Weight)
 			{{~#each benchmark.component_weight as |cw|}}
+			// Standard Error: {{underscore cw.error}}
 			.saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
 			{{~/each}}
 			{{~#if (ne benchmark.base_reads "0")}}
@@ -82,6 +83,7 @@ impl WeightInfo for () {
 	) -> Weight {
 		({{underscore benchmark.base_weight}} as Weight)
 			{{~#each benchmark.component_weight as |cw|}}
+			// Standard Error: {{underscore cw.error}}
 			.saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
 			{{~/each}}
 			{{~#if (ne benchmark.base_reads "0")}}
diff --git a/utils/frame/benchmarking-cli/src/template.hbs b/utils/frame/benchmarking-cli/src/template.hbs
index c76eaad22c96..0ff6144214d6 100644
--- a/utils/frame/benchmarking-cli/src/template.hbs
+++ b/utils/frame/benchmarking-cli/src/template.hbs
@@ -27,6 +27,7 @@ impl<T: frame_system::Config> {{pallet}}::WeightInfo for WeightInfo<T> {
 	) -> Weight {
 		({{underscore benchmark.base_weight}} as Weight)
 			{{~#each benchmark.component_weight as |cw|}}
+			// Standard Error: {{underscore cw.error}}
 			.saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
 			{{~/each}}
 			{{~#if (ne benchmark.base_reads "0")}}
diff --git a/utils/frame/benchmarking-cli/src/writer.rs b/utils/frame/benchmarking-cli/src/writer.rs
index 61423000231d..efa356a0fa06 100644
--- a/utils/frame/benchmarking-cli/src/writer.rs
+++ b/utils/frame/benchmarking-cli/src/writer.rs
@@ -84,6 +84,8 @@ struct ComponentSlope {
 	name: String,
 	#[serde(serialize_with = "string_serialize")]
 	slope: u128,
+	#[serde(serialize_with = "string_serialize")]
+	error: u128,
 }
 
 // Small helper to create an `io::Error` from a string.
@@ -145,27 +147,45 @@ fn get_benchmark_data(batch: &BenchmarkBatch) -> BenchmarkData {
 	let mut used_reads = Vec::new();
 	let mut used_writes = Vec::new();
 
-	extrinsic_time.slopes.into_iter().zip(extrinsic_time.names.iter()).for_each(|(slope, name)| {
-		if !slope.is_zero() {
-			if !used_components.contains(&name) { used_components.push(name); }
-			used_extrinsic_time.push(ComponentSlope {
-				name: name.clone(),
-				slope: slope.saturating_mul(1000),
-			});
-		}
-	});
-	reads.slopes.into_iter().zip(reads.names.iter()).for_each(|(slope, name)| {
-		if !slope.is_zero() {
-			if !used_components.contains(&name) { used_components.push(name); }
-			used_reads.push(ComponentSlope { name: name.clone(), slope });
-		}
-	});
-	writes.slopes.into_iter().zip(writes.names.iter()).for_each(|(slope, name)| {
-		if !slope.is_zero() {
-			if !used_components.contains(&name) { used_components.push(name); }
-			used_writes.push(ComponentSlope { name: name.clone(), slope });
-		}
-	});
+	extrinsic_time.slopes.into_iter()
+		.zip(extrinsic_time.names.iter())
+		.zip(extrinsic_time.model.unwrap().se.regressor_values.iter())
+		.for_each(|((slope, name), error)| {
+			if !slope.is_zero() {
+				if !used_components.contains(&name) { used_components.push(name); }
+				used_extrinsic_time.push(ComponentSlope {
+					name: name.clone(),
+					slope: slope.saturating_mul(1000),
+					error: (*error as u128).saturating_mul(1000),
+				});
+			}
+		});
+	reads.slopes.into_iter()
+		.zip(reads.names.iter())
+		.zip(reads.model.unwrap().se.regressor_values.iter())
+		.for_each(|((slope, name), error)| {
+			if !slope.is_zero() {
+				if !used_components.contains(&name) { used_components.push(name); }
+				used_reads.push(ComponentSlope {
+					name: name.clone(),
+					slope,
+					error: *error as u128,
+				});
+			}
+		});
+	writes.slopes.into_iter()
+		.zip(writes.names.iter())
+		.zip(writes.model.unwrap().se.regressor_values.iter())
+		.for_each(|((slope, name), error)| {
+			if !slope.is_zero() {
+				if !used_components.contains(&name) { used_components.push(name); }
+				used_writes.push(ComponentSlope {
+					name: name.clone(),
+					slope,
+					error: *error as u128,
+				});
+			}
+		});
 
 	// This puts a marker on any component which is entirely unused in the weight formula.
 	let components = batch.results[0].components
@@ -379,18 +399,30 @@ mod test {
 		assert_eq!(benchmark.base_weight, base * 1_000);
 		assert_eq!(
 			benchmark.component_weight,
-			vec![ComponentSlope { name: component.to_string(), slope: slope * 1_000 }]
+			vec![ComponentSlope {
+				name: component.to_string(),
+				slope: slope * 1_000,
+				error: 0,
+			}]
 		);
 		// DB Reads/Writes are untouched
 		assert_eq!(benchmark.base_reads, base);
 		assert_eq!(
 			benchmark.component_reads,
-			vec![ComponentSlope { name: component.to_string(), slope: slope }]
+			vec![ComponentSlope {
+				name: component.to_string(),
+				slope,
+				error: 0,
+			}]
 		);
 		assert_eq!(benchmark.base_writes, base);
 		assert_eq!(
 			benchmark.component_writes,
-			vec![ComponentSlope { name: component.to_string(), slope: slope }]
+			vec![ComponentSlope {
+				name: component.to_string(),
+				slope,
+				error: 0,
+			}]
 		);
 	}
 

From 60387fd76dbc6d92654eee4c4d24eebac01b75db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Sun, 6 Dec 2020 15:14:19 +0100
Subject: [PATCH 0144/1194] Adds support for tuples in runtime-interface
 (#7672)

---
 Cargo.lock                                    |  1 +
 primitives/runtime-interface/Cargo.toml       |  1 +
 primitives/runtime-interface/src/impls.rs     |  4 +++-
 primitives/runtime-interface/src/lib.rs       |  2 +-
 .../runtime-interface/test-wasm/src/lib.rs    | 24 +++++++++++++++++++
 primitives/runtime-interface/test/src/lib.rs  |  7 +++++-
 6 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 13bc6ca0ebcc..53c42e08774b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8368,6 +8368,7 @@ dependencies = [
 name = "sp-runtime-interface"
 version = "2.0.0"
 dependencies = [
+ "impl-trait-for-tuples",
  "parity-scale-codec",
  "primitive-types",
  "rustversion",
diff --git a/primitives/runtime-interface/Cargo.toml b/primitives/runtime-interface/Cargo.toml
index 0138637366d1..180914e89dd6 100644
--- a/primitives/runtime-interface/Cargo.toml
+++ b/primitives/runtime-interface/Cargo.toml
@@ -23,6 +23,7 @@ codec = { package = "parity-scale-codec", version = "1.3.1", default-features =
 static_assertions = "1.0.0"
 primitive-types = { version = "0.7.0", default-features = false }
 sp-storage = { version = "2.0.0", default-features = false, path = "../storage" }
+impl-trait-for-tuples = "0.1.3"
 
 [dev-dependencies]
 sp-runtime-interface-test-wasm = { version = "2.0.0", path = "test-wasm" }
diff --git a/primitives/runtime-interface/src/impls.rs b/primitives/runtime-interface/src/impls.rs
index da57cf086bee..7d84085a9e49 100644
--- a/primitives/runtime-interface/src/impls.rs
+++ b/primitives/runtime-interface/src/impls.rs
@@ -365,7 +365,9 @@ impl<T: codec::Codec> PassBy for Option<T> {
 	type PassBy = Codec<Self>;
 }
 
-impl PassBy for (u32, u32, u32, u32) {
+#[impl_trait_for_tuples::impl_for_tuples(30)]
+#[tuple_types_no_default_trait_bound]
+impl PassBy for Tuple where Self: codec::Codec {
 	type PassBy = Codec<Self>;
 }
 
diff --git a/primitives/runtime-interface/src/lib.rs b/primitives/runtime-interface/src/lib.rs
index dd625a4a2534..7a7b78bc45b4 100644
--- a/primitives/runtime-interface/src/lib.rs
+++ b/primitives/runtime-interface/src/lib.rs
@@ -99,7 +99,7 @@
 //! | `*const T` | `u32` | `Identity` |
 //! | `Option<T>` | `u64` | `let e = v.encode();`<br><br><code>e.len() 32bit << 32 &#124; e.as_ptr() 32bit</code> |
 //! | [`T where T: PassBy<PassBy=Inner>`](./pass_by#Inner) | Depends on inner | Depends on inner |
-//! | [`T where T:PassBy<PassBy=Codec>`](./pass_by#Codec)|`u64`|<code>v.len() 32bit << 32 &#124;v.as_ptr() 32bit</code>|
+//! | [`T where T: PassBy<PassBy=Codec>`](./pass_by#Codec)|`u64`|<code>v.len() 32bit << 32 &#124;v.as_ptr() 32bit</code>|
 //!
 //! `Identity` means that the value is converted directly into the corresponding FFI type.
 
diff --git a/primitives/runtime-interface/test-wasm/src/lib.rs b/primitives/runtime-interface/test-wasm/src/lib.rs
index 6cd37a6c1d14..852be609fef7 100644
--- a/primitives/runtime-interface/test-wasm/src/lib.rs
+++ b/primitives/runtime-interface/test-wasm/src/lib.rs
@@ -120,6 +120,16 @@ pub trait TestApi {
 	fn test_versionning(&self, data: u32) -> bool {
 		data == 42
 	}
+
+	/// Returns the input values as tuple.
+	fn return_input_as_tuple(
+		a: Vec<u8>,
+		b: u32,
+		c: Option<Vec<u32>>,
+		d: u8,
+	) -> (Vec<u8>, u32, Option<Vec<u32>>, u8) {
+		(a, b, c, d)
+	}
 }
 
 /// This function is not used, but we require it for the compiler to include `sp-io`.
@@ -258,4 +268,18 @@ wasm_export_functions! {
 		assert!(!test_api::test_versionning(50));
 		assert!(!test_api::test_versionning(102));
 	}
+
+	fn test_return_input_as_tuple() {
+		let a = vec![1, 3, 4, 5];
+		let b = 10000;
+		let c = Some(vec![2, 3]);
+		let d = 5;
+
+		let res = test_api::return_input_as_tuple(a.clone(), b, c.clone(), d);
+
+		assert_eq!(a, res.0);
+		assert_eq!(b, res.1);
+		assert_eq!(c, res.2);
+		assert_eq!(d, res.3);
+	}
 }
diff --git a/primitives/runtime-interface/test/src/lib.rs b/primitives/runtime-interface/test/src/lib.rs
index c66609daa2f2..1f079e86ff3d 100644
--- a/primitives/runtime-interface/test/src/lib.rs
+++ b/primitives/runtime-interface/test/src/lib.rs
@@ -208,4 +208,9 @@ fn test_tracing() {
 
 	let inner = subscriber.0.lock().unwrap();
 	assert!(inner.spans.contains("return_input_version_1"));
-}
\ No newline at end of file
+}
+
+#[test]
+fn test_return_input_as_tuple() {
+	call_wasm_method::<HostFunctions>(&wasm_binary_unwrap()[..], "test_return_input_as_tuple");
+}

From 9467f562ddb9c85ff78fca69d08137950b948019 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Mon, 7 Dec 2020 10:10:21 +0100
Subject: [PATCH 0145/1194] Fix two potential connection poisonings (#7677)

---
 client/network/src/protocol/generic_proto/behaviour.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/network/src/protocol/generic_proto/behaviour.rs b/client/network/src/protocol/generic_proto/behaviour.rs
index 51d7252d5f9b..b8b4cce0a72c 100644
--- a/client/network/src/protocol/generic_proto/behaviour.rs
+++ b/client/network/src/protocol/generic_proto/behaviour.rs
@@ -1565,6 +1565,7 @@ impl NetworkBehaviour for GenericProto {
 									connec_state,
 									ConnectionState::OpeningThenClosing
 								));
+								*entry.into_mut() = PeerState::Disabled { connections, backoff_until };
 							}
 						} else {
 							error!(
@@ -1652,6 +1653,7 @@ impl NetworkBehaviour for GenericProto {
 						};
 
 						if matches!(connections[pos].1, ConnectionState::Closing) {
+							*entry.into_mut() = PeerState::Enabled { connections };
 							return;
 						}
 
@@ -1683,7 +1685,7 @@ impl NetworkBehaviour for GenericProto {
 									notifications_sink: replacement_sink,
 								};
 								self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
-								*entry.into_mut() = PeerState::Enabled { connections, };
+								*entry.into_mut() = PeerState::Enabled { connections };
 							}
 
 						} else {

From eaab146094360ca02538f5287abe859b2d815c3c Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Mon, 7 Dec 2020 15:04:32 +0100
Subject: [PATCH 0146/1194] Fix #7629 (#7680)

* Fix #7629

* Update client/network/src/service.rs

Co-authored-by: Max Inden <mail@max-inden.de>

Co-authored-by: Max Inden <mail@max-inden.de>
---
 client/network/src/service.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index b6f162affd67..c59aeb412298 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -668,9 +668,9 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 				sink.clone()
 			} else {
 				// Notification silently discarded, as documented.
-				log::error!(
+				log::debug!(
 					target: "sub-libp2p",
-					"Attempted to send notification on unknown protocol: {:?}",
+					"Attempted to send notification on missing or closed substream: {:?}",
 					protocol,
 				);
 				return;

From f91998e175b320e73125bd82bda313f04e4a91dd Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Mon, 7 Dec 2020 16:32:16 +0100
Subject: [PATCH 0147/1194] Update Cargo.toml (#7627)

On behalf of dependabot, because we use 1.4.x in it clashes with this.
---
 primitives/core/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml
index 5044a1d66913..d59bbad09e50 100644
--- a/primitives/core/Cargo.toml
+++ b/primitives/core/Cargo.toml
@@ -27,7 +27,7 @@ base58 = { version = "0.1.0", optional = true }
 rand = { version = "0.7.3", optional = true, features = ["small_rng"] }
 substrate-bip39 = { version = "0.4.2", optional = true }
 tiny-bip39 = { version = "0.8", optional = true }
-regex = { version = "1.3.1", optional = true }
+regex = { version = "1.4.2", optional = true }
 num-traits = { version = "0.2.8", default-features = false }
 zeroize = { version = "1.0.0", default-features = false }
 secrecy = { version = "0.7.0", default-features = false }

From ec55d650fea0b244e5481efd11b5ea2462766196 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Mon, 7 Dec 2020 16:48:54 +0100
Subject: [PATCH 0148/1194] Make sure the companion CI test fails on any error
 (#7683)

---
 .maintain/gitlab/check_polkadot_companion_build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.maintain/gitlab/check_polkadot_companion_build.sh b/.maintain/gitlab/check_polkadot_companion_build.sh
index 4b6e45c267ef..16fb2d356720 100755
--- a/.maintain/gitlab/check_polkadot_companion_build.sh
+++ b/.maintain/gitlab/check_polkadot_companion_build.sh
@@ -9,6 +9,7 @@
 # polkadot companion: paritytech/polkadot#567
 #
 
+set -e
 
 github_api_substrate_pull_url="https://api.github.com/repos/paritytech/substrate/pulls"
 # use github api v3 in order to access the data without authentication

From 163412d6cf5a2df9eed9a5f78bac54ad7ef99982 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Tue, 8 Dec 2020 10:10:46 +0100
Subject: [PATCH 0149/1194] implement more convertion on NumberOrHex (#7682)

---
 primitives/rpc/src/number.rs | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/primitives/rpc/src/number.rs b/primitives/rpc/src/number.rs
index 3d7e74753526..0a81a34db8f7 100644
--- a/primitives/rpc/src/number.rs
+++ b/primitives/rpc/src/number.rs
@@ -18,7 +18,7 @@
 //! A number type that can be serialized both as a number or a string that encodes a number in a
 //! string.
 
-use std::{convert::TryFrom, fmt::Debug};
+use std::{convert::{TryFrom, TryInto}, fmt::Debug};
 use serde::{Serialize, Deserialize};
 use sp_core::U256;
 
@@ -67,24 +67,27 @@ pub struct TryFromIntError(pub(crate) ());
 impl TryFrom<NumberOrHex> for u32 {
 	type Error = TryFromIntError;
 	fn try_from(num_or_hex: NumberOrHex) -> Result<u32, TryFromIntError> {
-		let num_or_hex = num_or_hex.into_u256();
-		if num_or_hex > U256::from(u32::max_value()) {
-			return Err(TryFromIntError(()));
-		} else {
-			Ok(num_or_hex.as_u32())
-		}
+		num_or_hex.into_u256().try_into().map_err(|_| TryFromIntError(()))
 	}
 }
 
 impl TryFrom<NumberOrHex> for u64 {
 	type Error = TryFromIntError;
 	fn try_from(num_or_hex: NumberOrHex) -> Result<u64, TryFromIntError> {
-		let num_or_hex = num_or_hex.into_u256();
-		if num_or_hex > U256::from(u64::max_value()) {
-			return Err(TryFromIntError(()));
-		} else {
-			Ok(num_or_hex.as_u64())
-		}
+		num_or_hex.into_u256().try_into().map_err(|_| TryFromIntError(()))
+	}
+}
+
+impl TryFrom<NumberOrHex> for u128 {
+	type Error = TryFromIntError;
+	fn try_from(num_or_hex: NumberOrHex) -> Result<u128, TryFromIntError> {
+		num_or_hex.into_u256().try_into().map_err(|_| TryFromIntError(()))
+	}
+}
+
+impl From<NumberOrHex> for U256 {
+	fn from(num_or_hex: NumberOrHex) -> U256 {
+		num_or_hex.into_u256()
 	}
 }
 

From 332399d16668a6c769f1a7db154bb9ea3b50e61c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomusdrw@users.noreply.github.com>
Date: Tue, 8 Dec 2020 13:18:34 +0100
Subject: [PATCH 0150/1194] Streamline frame_system weight parametrization
 (#6629)

* Basic weights builder.

* Fixing WiP

* Make the tests work.

* Fix weights in node/runtime.

* WiP.

* Update pallets with new weights parameters.

* Validate returns a Result now.

* Count mandatory weight separately.

* DRY

* BREAKING: Updating state root, because of the left-over weight-tracking stuff

* Update tests affected by Mandatory tracking.

* Fixing tests.

* Fix defaults for simple_max

* Update frame/system/src/weights.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Rework the API a bit.

* Fix compilation & tests.

* Apply suggestions from code review

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Add extra docs & rename few things.

* Fix whitespace in ASCII art.

* Update frame/system/src/limits.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Fix max_extrinsic calculations.

* Fix conflicts.

* Fix compilation.

* Fix new code.

* re-remove generic asset

* Fix usage.

* Update state root.

* Update proxy.

* Fix tests.

* Move weights validity to integrity_test

* Remove redundant BlockWeights.

* Add all/non_mandatory comment

* Add test.

* Remove fn block_weights

* Make the macro prettier.

* Fix some docs.

* Make max_total behave more predictabily.

* Add BlockWeights to metadata.

* fix balances test

* Fix utility test.

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Benjamin Kampmann <ben@gnunicorn.org>
Co-authored-by: thiolliere <gui.thiolliere@gmail.com>
---
 .../pallets/template/src/mock.rs              |  17 +-
 bin/node-template/runtime/src/lib.rs          |  36 +-
 bin/node/runtime/src/impls.rs                 |  34 +-
 bin/node/runtime/src/lib.rs                   |  75 +--
 frame/assets/src/lib.rs                       |  20 +-
 frame/atomic-swap/src/tests.rs                |  20 +-
 frame/aura/src/mock.rs                        |  19 +-
 frame/authority-discovery/src/lib.rs          |  19 +-
 frame/authorship/src/lib.rs                   |  19 +-
 frame/babe/src/mock.rs                        |  18 +-
 frame/balances/src/tests_composite.rs         |  16 +-
 frame/balances/src/tests_local.rs             |  16 +-
 frame/benchmarking/src/tests.rs               |  10 +-
 frame/collective/src/lib.rs                   |  19 +-
 frame/contracts/src/tests.rs                  |  16 +-
 frame/democracy/src/lib.rs                    |   7 +-
 frame/democracy/src/tests.rs                  |  17 +-
 frame/elections-phragmen/src/lib.rs           |  25 +-
 frame/elections/src/mock.rs                   |  18 +-
 frame/example-offchain-worker/src/tests.rs    |  18 +-
 frame/example-parallel/src/tests.rs           |  12 +-
 frame/example/src/lib.rs                      |  16 +-
 frame/executive/src/lib.rs                    |  62 +--
 frame/grandpa/src/mock.rs                     |  17 +-
 frame/identity/src/lib.rs                     |   1 +
 frame/identity/src/tests.rs                   |  17 +-
 frame/im-online/src/mock.rs                   |  17 +-
 frame/indices/src/mock.rs                     |  18 +-
 frame/membership/src/lib.rs                   |  19 +-
 frame/multisig/src/tests.rs                   |  19 +-
 frame/nicks/src/lib.rs                        |  19 +-
 frame/node-authorization/src/lib.rs           |  21 +-
 frame/offences/benchmarking/src/mock.rs       |  15 +-
 frame/offences/src/mock.rs                    |  18 +-
 frame/proxy/src/lib.rs                        |   2 +-
 frame/proxy/src/tests.rs                      |  19 +-
 frame/randomness-collective-flip/src/lib.rs   |  21 +-
 frame/recovery/src/mock.rs                    |  18 +-
 frame/scheduler/src/lib.rs                    |  17 +-
 frame/scored-pool/src/mock.rs                 |  21 +-
 frame/session/benchmarking/src/mock.rs        |  10 +-
 frame/session/src/lib.rs                      |   2 +-
 frame/session/src/mock.rs                     |  19 +-
 frame/society/src/lib.rs                      |  29 +-
 frame/society/src/mock.rs                     |  18 +-
 frame/staking/fuzzer/src/mock.rs              |  10 +-
 frame/staking/src/benchmarking.rs             |  14 +-
 frame/staking/src/mock.rs                     |  19 +-
 frame/staking/src/testing_utils.rs            |   2 +-
 frame/sudo/src/mock.rs                        |  17 +-
 frame/support/src/weights.rs                  | 117 +++++
 .../tests/pallet_with_name_trait_is_valid.rs  |  11 +-
 frame/system/benches/bench.rs                 |  21 +-
 frame/system/benchmarking/src/lib.rs          |   8 +-
 frame/system/benchmarking/src/mock.rs         |  10 +-
 frame/system/src/extensions/check_weight.rs   | 286 +++++++-----
 frame/system/src/lib.rs                       |  70 ++-
 frame/system/src/limits.rs                    | 434 ++++++++++++++++++
 frame/system/src/mock.rs                      |  37 +-
 frame/system/src/weight.rs                    |  76 ---
 frame/timestamp/src/lib.rs                    |  19 +-
 frame/transaction-payment/src/lib.rs          |  94 ++--
 frame/treasury/src/tests.rs                   |  19 +-
 frame/utility/src/tests.rs                    |  18 +-
 frame/vesting/src/lib.rs                      |  18 +-
 test-utils/runtime/src/lib.rs                 |  22 +-
 66 files changed, 1277 insertions(+), 931 deletions(-)
 create mode 100644 frame/system/src/limits.rs
 delete mode 100644 frame/system/src/weight.rs

diff --git a/bin/node-template/pallets/template/src/mock.rs b/bin/node-template/pallets/template/src/mock.rs
index 4c7c16e7f557..84af63a1c3bb 100644
--- a/bin/node-template/pallets/template/src/mock.rs
+++ b/bin/node-template/pallets/template/src/mock.rs
@@ -1,8 +1,8 @@
 use crate::{Module, Config};
 use sp_core::H256;
-use frame_support::{impl_outer_origin, parameter_types, weights::Weight};
+use frame_support::{impl_outer_origin, parameter_types};
 use sp_runtime::{
-	traits::{BlakeTwo256, IdentityLookup}, testing::Header, Perbill,
+	traits::{BlakeTwo256, IdentityLookup}, testing::Header,
 };
 use frame_system as system;
 
@@ -16,13 +16,13 @@ impl_outer_origin! {
 pub struct Test;
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
-	pub const MaximumBlockWeight: Weight = 1024;
-	pub const MaximumBlockLength: u32 = 2 * 1024;
-	pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);
 }
 
 impl system::Config for Test {
 	type BaseCallFilter = ();
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
 	type Origin = Origin;
 	type Call = ();
 	type Index = u64;
@@ -34,13 +34,6 @@ impl system::Config for Test {
 	type Header = Header;
 	type Event = ();
 	type BlockHashCount = BlockHashCount;
-	type MaximumBlockWeight = MaximumBlockWeight;
-	type DbWeight = ();
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = MaximumBlockWeight;
-	type MaximumBlockLength = MaximumBlockLength;
-	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
 	type PalletInfo = ();
 	type AccountData = ();
diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index a899afe9ad12..51df3dd5a3e4 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -13,7 +13,7 @@ use sp_runtime::{
 	transaction_validity::{TransactionValidity, TransactionSource},
 };
 use sp_runtime::traits::{
-	BlakeTwo256, Block as BlockT, AccountIdLookup, Verify, IdentifyAccount, NumberFor, Saturating,
+	BlakeTwo256, Block as BlockT, AccountIdLookup, Verify, IdentifyAccount, NumberFor,
 };
 use sp_api::impl_runtime_apis;
 use sp_consensus_aura::sr25519::AuthorityId as AuraId;
@@ -126,16 +126,16 @@ pub fn native_version() -> NativeVersion {
 	}
 }
 
+const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);
+
 parameter_types! {
+	pub const Version: RuntimeVersion = VERSION;
 	pub const BlockHashCount: BlockNumber = 2400;
 	/// We allow for 2 seconds of compute with a 6 second average block time.
-	pub const MaximumBlockWeight: Weight = 2 * WEIGHT_PER_SECOND;
-	pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);
-	/// Assume 10% of weight for average on_initialize calls.
-	pub MaximumExtrinsicWeight: Weight = AvailableBlockRatio::get()
-		.saturating_sub(Perbill::from_percent(10)) * MaximumBlockWeight::get();
-	pub const MaximumBlockLength: u32 = 5 * 1024 * 1024;
-	pub const Version: RuntimeVersion = VERSION;
+	pub BlockWeights: frame_system::limits::BlockWeights = frame_system::limits::BlockWeights
+		::with_sensible_defaults(2 * WEIGHT_PER_SECOND, NORMAL_DISPATCH_RATIO);
+	pub BlockLength: frame_system::limits::BlockLength = frame_system::limits::BlockLength
+		::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO);
 }
 
 // Configure FRAME pallets to include in runtime.
@@ -143,6 +143,10 @@ parameter_types! {
 impl frame_system::Config for Runtime {
 	/// The basic call filter to use in dispatchable.
 	type BaseCallFilter = ();
+	/// Block & extrinsics weights: base values and limits.
+	type BlockWeights = BlockWeights;
+	/// The maximum length of a block (in bytes).
+	type BlockLength = BlockLength;
 	/// The identifier used to distinguish between accounts.
 	type AccountId = AccountId;
 	/// The aggregated dispatch type that is available for extrinsics.
@@ -165,24 +169,8 @@ impl frame_system::Config for Runtime {
 	type Origin = Origin;
 	/// Maximum number of block number to block hash mappings to keep (oldest pruned first).
 	type BlockHashCount = BlockHashCount;
-	/// Maximum weight of each block.
-	type MaximumBlockWeight = MaximumBlockWeight;
 	/// The weight of database operations that the runtime can invoke.
 	type DbWeight = RocksDbWeight;
-	/// The weight of the overhead invoked on the block import process, independent of the
-	/// extrinsics included in that block.
-	type BlockExecutionWeight = BlockExecutionWeight;
-	/// The base weight of any extrinsic processed by the runtime, independent of the
-	/// logic of that extrinsic. (Signature verification, nonce increment, fee, etc...)
-	type ExtrinsicBaseWeight = ExtrinsicBaseWeight;
-	/// The maximum weight that a single extrinsic of `Normal` dispatch class can have,
-	/// idependent of the logic of that extrinsics. (Roughly max block weight - average on
-	/// initialize cost).
-	type MaximumExtrinsicWeight = MaximumExtrinsicWeight;
-	/// Maximum size of all encoded transactions (in bytes) that are allowed in one block.
-	type MaximumBlockLength = MaximumBlockLength;
-	/// Portion of the block weight that is available to all normal transactions.
-	type AvailableBlockRatio = AvailableBlockRatio;
 	/// Version of the runtime.
 	type Version = Version;
 	/// Converts a module to the index of the module in `construct_runtime!`.
diff --git a/bin/node/runtime/src/impls.rs b/bin/node/runtime/src/impls.rs
index acd8def68353..d7910c2c63b8 100644
--- a/bin/node/runtime/src/impls.rs
+++ b/bin/node/runtime/src/impls.rs
@@ -34,13 +34,15 @@ mod multiplier_tests {
 
 	use crate::{
 		constants::{currency::*, time::*},
-		TransactionPayment, MaximumBlockWeight, AvailableBlockRatio, Runtime, TargetBlockFullness,
+		TransactionPayment, Runtime, TargetBlockFullness,
 		AdjustmentVariable, System, MinimumMultiplier,
+		RuntimeBlockWeights as BlockWeights,
 	};
-	use frame_support::weights::{Weight, WeightToFeePolynomial};
+	use frame_support::weights::{Weight, WeightToFeePolynomial, DispatchClass};
 
-	fn max() -> Weight {
-		AvailableBlockRatio::get() * MaximumBlockWeight::get()
+	fn max_normal() -> Weight {
+		BlockWeights::get().get(DispatchClass::Normal).max_total
+			.unwrap_or_else(|| BlockWeights::get().max_block)
 	}
 
 	fn min_multiplier() -> Multiplier {
@@ -48,7 +50,7 @@ mod multiplier_tests {
 	}
 
 	fn target() -> Weight {
-		TargetBlockFullness::get() * max()
+		TargetBlockFullness::get() * max_normal()
 	}
 
 	// update based on runtime impl.
@@ -69,7 +71,7 @@ mod multiplier_tests {
 		let previous_float = previous_float.max(min_multiplier().into_inner() as f64 / accuracy);
 
 		// maximum tx weight
-		let m = max() as f64;
+		let m = max_normal() as f64;
 		// block weight always truncated to max weight
 		let block_weight = (block_weight as f64).min(m);
 		let v: f64 = AdjustmentVariable::get().to_fraction();
@@ -89,7 +91,7 @@ mod multiplier_tests {
 		let mut t: sp_io::TestExternalities =
 			frame_system::GenesisConfig::default().build_storage::<Runtime>().unwrap().into();
 		t.execute_with(|| {
-			System::set_block_limits(w, 0);
+			System::set_block_consumed_resources(w, 0);
 			assertions()
 		});
 	}
@@ -102,8 +104,8 @@ mod multiplier_tests {
 			(100, fm.clone()),
 			(1000, fm.clone()),
 			(target(), fm.clone()),
-			(max() / 2, fm.clone()),
-			(max(), fm.clone()),
+			(max_normal() / 2, fm.clone()),
+			(max_normal(), fm.clone()),
 		];
 		test_set.into_iter().for_each(|(w, fm)| {
 			run_with_system_weight(w, || {
@@ -164,7 +166,7 @@ mod multiplier_tests {
 
 	#[test]
 	fn min_change_per_day() {
-		run_with_system_weight(max(), || {
+		run_with_system_weight(max_normal(), || {
 			let mut fm = Multiplier::one();
 			// See the example in the doc of `TargetedFeeAdjustment`. are at least 0.234, hence
 			// `fm > 1.234`.
@@ -182,7 +184,7 @@ mod multiplier_tests {
 		// `cargo test congested_chain_simulation -- --nocapture` to get some insight.
 
 		// almost full. The entire quota of normal transactions is taken.
-		let block_weight = AvailableBlockRatio::get() * max() - 100;
+		let block_weight = BlockWeights::get().get(DispatchClass::Normal).max_total.unwrap() - 100;
 
 		// Default substrate weight.
 		let tx_weight = frame_support::weights::constants::ExtrinsicBaseWeight::get();
@@ -320,15 +322,19 @@ mod multiplier_tests {
 			10 * mb,
 			2147483647,
 			4294967295,
-			MaximumBlockWeight::get() / 2,
-			MaximumBlockWeight::get(),
+			BlockWeights::get().max_block / 2,
+			BlockWeights::get().max_block,
 			Weight::max_value() / 2,
 			Weight::max_value(),
 		].into_iter().for_each(|i| {
 			run_with_system_weight(i, || {
 				let next = runtime_multiplier_update(Multiplier::one());
 				let truth = truth_value_update(i, Multiplier::one());
-				assert_eq_error_rate!(truth, next, Multiplier::from_inner(50_000_000));
+				assert_eq_error_rate!(
+					truth,
+					next,
+					Multiplier::from_inner(50_000_000)
+				);
 			});
 		});
 
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 285f37889ae9..ea9921beeef9 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -28,14 +28,17 @@ use frame_support::{
 	construct_runtime, parameter_types, debug, RuntimeDebug,
 	weights::{
 		Weight, IdentityFee,
-		constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
+		constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND}, DispatchClass,
 	},
 	traits::{
 		Currency, Imbalance, KeyOwnerProofSystem, OnUnbalanced, Randomness, LockIdentifier,
 		U128CurrencyToVote,
 	},
 };
-use frame_system::{EnsureRoot, EnsureOneOf};
+use frame_system::{
+	EnsureRoot, EnsureOneOf,
+	limits::{BlockWeights, BlockLength}
+};
 use frame_support::traits::InstanceFilter;
 use codec::{Encode, Decode};
 use sp_core::{
@@ -54,7 +57,7 @@ use sp_runtime::curve::PiecewiseLinear;
 use sp_runtime::transaction_validity::{TransactionValidity, TransactionSource, TransactionPriority};
 use sp_runtime::traits::{
 	self, BlakeTwo256, Block as BlockT, StaticLookup, SaturatedConversion,
-	ConvertInto, OpaqueKeys, NumberFor, Saturating,
+	ConvertInto, OpaqueKeys, NumberFor,
 };
 use sp_version::RuntimeVersion;
 #[cfg(any(feature = "std", test))]
@@ -141,23 +144,47 @@ impl OnUnbalanced<NegativeImbalance> for DealWithFees {
 	}
 }
 
-const AVERAGE_ON_INITIALIZE_WEIGHT: Perbill = Perbill::from_percent(10);
+/// We assume that ~10% of the block weight is consumed by `on_initalize` handlers.
+/// This is used to limit the maximal weight of a single extrinsic.
+const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10);
+/// We allow `Normal` extrinsics to fill up the block up to 75%, the rest can be used
+/// by  Operational  extrinsics.
+const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);
+/// We allow for 2 seconds of compute with a 6 second average block time.
+const MAXIMUM_BLOCK_WEIGHT: Weight = 2 * WEIGHT_PER_SECOND;
+
 parameter_types! {
 	pub const BlockHashCount: BlockNumber = 2400;
-	/// We allow for 2 seconds of compute with a 6 second average block time.
-	pub const MaximumBlockWeight: Weight = 2 * WEIGHT_PER_SECOND;
-	pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);
-	/// Assume 10% of weight for average on_initialize calls.
-	pub MaximumExtrinsicWeight: Weight = AvailableBlockRatio::get().saturating_sub(AVERAGE_ON_INITIALIZE_WEIGHT)
-			* MaximumBlockWeight::get();
-	pub const MaximumBlockLength: u32 = 5 * 1024 * 1024;
 	pub const Version: RuntimeVersion = VERSION;
-}
-
-const_assert!(AvailableBlockRatio::get().deconstruct() >= AVERAGE_ON_INITIALIZE_WEIGHT.deconstruct());
+	pub RuntimeBlockLength: BlockLength =
+		BlockLength::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO);
+	pub RuntimeBlockWeights: BlockWeights = BlockWeights::builder()
+		.base_block(BlockExecutionWeight::get())
+		.for_class(DispatchClass::all(), |weights| {
+			weights.base_extrinsic = ExtrinsicBaseWeight::get();
+		})
+		.for_class(DispatchClass::Normal, |weights| {
+			weights.max_total = Some(NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT);
+		})
+		.for_class(DispatchClass::Operational, |weights| {
+			weights.max_total = Some(MAXIMUM_BLOCK_WEIGHT);
+			// Operational transactions have some extra reserved space, so that they
+			// are included even if block reached `MAXIMUM_BLOCK_WEIGHT`.
+			weights.reserved = Some(
+				MAXIMUM_BLOCK_WEIGHT - NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT
+			);
+		})
+		.avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)
+		.build_or_panic();
+}
+
+const_assert!(NORMAL_DISPATCH_RATIO.deconstruct() >= AVERAGE_ON_INITIALIZE_RATIO.deconstruct());
 
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = ();
+	type BlockWeights = RuntimeBlockWeights;
+	type BlockLength = RuntimeBlockLength;
+	type DbWeight = RocksDbWeight;
 	type Origin = Origin;
 	type Call = Call;
 	type Index = Index;
@@ -169,13 +196,6 @@ impl frame_system::Config for Runtime {
 	type Header = generic::Header<BlockNumber, BlakeTwo256>;
 	type Event = Event;
 	type BlockHashCount = BlockHashCount;
-	type MaximumBlockWeight = MaximumBlockWeight;
-	type DbWeight = RocksDbWeight;
-	type BlockExecutionWeight = BlockExecutionWeight;
-	type ExtrinsicBaseWeight = ExtrinsicBaseWeight;
-	type MaximumExtrinsicWeight = MaximumExtrinsicWeight;
-	type MaximumBlockLength = MaximumBlockLength;
-	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = Version;
 	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<Balance>;
@@ -277,7 +297,8 @@ impl pallet_proxy::Config for Runtime {
 }
 
 parameter_types! {
-	pub MaximumSchedulerWeight: Weight = Perbill::from_percent(80) * MaximumBlockWeight::get();
+	pub MaximumSchedulerWeight: Weight = Perbill::from_percent(80) *
+		RuntimeBlockWeights::get().max_block;
 	pub const MaxScheduledPerBlock: u32 = 50;
 }
 
@@ -438,9 +459,10 @@ parameter_types! {
 	pub const MaxIterations: u32 = 10;
 	// 0.05%. The higher the value, the more strict solution acceptance becomes.
 	pub MinSolutionScoreBump: Perbill = Perbill::from_rational_approximation(5u32, 10_000);
-	pub OffchainSolutionWeightLimit: Weight = MaximumExtrinsicWeight::get()
-		.saturating_sub(BlockExecutionWeight::get())
-		.saturating_sub(ExtrinsicBaseWeight::get());
+	pub OffchainSolutionWeightLimit: Weight = RuntimeBlockWeights::get()
+		.get(DispatchClass::Normal)
+		.max_extrinsic.expect("Normal extrinsics have a weight limit configured; qed")
+		.saturating_sub(BlockExecutionWeight::get());
 }
 
 impl pallet_staking::Config for Runtime {
@@ -779,7 +801,8 @@ impl pallet_im_online::Config for Runtime {
 }
 
 parameter_types! {
-	pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * MaximumBlockWeight::get();
+	pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) *
+		RuntimeBlockWeights::get().max_block;
 }
 
 impl pallet_offences::Config for Runtime {
diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index 630f4fcc317d..df1cb87f75b2 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -905,12 +905,9 @@ impl<T: Config> Module<T> {
 mod tests {
 	use super::*;
 
-	use frame_support::{
-		impl_outer_origin, impl_outer_event, assert_ok, assert_noop, parameter_types,
-		weights::Weight
-	};
+	use frame_support::{impl_outer_origin, assert_ok, assert_noop, parameter_types, impl_outer_event};
 	use sp_core::H256;
-	use sp_runtime::{Perbill, traits::{BlakeTwo256, IdentityLookup}, testing::Header};
+	use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
 
 	mod pallet_assets {
 		pub use crate::Event;
@@ -932,12 +929,12 @@ mod tests {
 	pub struct Test;
 	parameter_types! {
 		pub const BlockHashCount: u64 = 250;
-		pub const MaximumBlockWeight: Weight = 1024;
-		pub const MaximumBlockLength: u32 = 2 * 1024;
-		pub const AvailableBlockRatio: Perbill = Perbill::one();
 	}
 	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
+		type BlockWeights = ();
+		type BlockLength = ();
+		type DbWeight = ();
 		type Origin = Origin;
 		type Index = u64;
 		type Call = ();
@@ -949,13 +946,6 @@ mod tests {
 		type Header = Header;
 		type Event = Event;
 		type BlockHashCount = BlockHashCount;
-		type MaximumBlockWeight = MaximumBlockWeight;
-		type DbWeight = ();
-		type BlockExecutionWeight = ();
-		type ExtrinsicBaseWeight = ();
-		type MaximumExtrinsicWeight = MaximumBlockWeight;
-		type AvailableBlockRatio = AvailableBlockRatio;
-		type MaximumBlockLength = MaximumBlockLength;
 		type Version = ();
 		type PalletInfo = ();
 		type AccountData = pallet_balances::AccountData<u64>;
diff --git a/frame/atomic-swap/src/tests.rs b/frame/atomic-swap/src/tests.rs
index 7254ceba4f63..47b5102bc568 100644
--- a/frame/atomic-swap/src/tests.rs
+++ b/frame/atomic-swap/src/tests.rs
@@ -2,12 +2,9 @@
 
 use super::*;
 
-use frame_support::{
-	impl_outer_origin, parameter_types, weights::Weight,
-};
+use frame_support::{impl_outer_origin, parameter_types};
 use sp_core::H256;
 use sp_runtime::{
-	Perbill,
 	testing::Header,
 	traits::{BlakeTwo256, IdentityLookup},
 };
@@ -20,12 +17,14 @@ impl_outer_origin! {
 pub struct Test;
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
-	pub const MaximumBlockWeight: Weight = 1024;
-	pub const MaximumBlockLength: u32 = 2 * 1024;
-	pub const AvailableBlockRatio: Perbill = Perbill::one();
+	pub BlockWeights: frame_system::limits::BlockWeights =
+		frame_system::limits::BlockWeights::simple_max(1024);
 }
 impl frame_system::Config for Test {
 	type BaseCallFilter = ();
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u64;
@@ -37,13 +36,6 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Event = ();
 	type BlockHashCount = BlockHashCount;
-	type MaximumBlockWeight = MaximumBlockWeight;
-	type DbWeight = ();
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = MaximumBlockWeight;
-	type MaximumBlockLength = MaximumBlockLength;
-	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
 	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u64>;
diff --git a/frame/aura/src/mock.rs b/frame/aura/src/mock.rs
index b06a0f427f1b..1fcb1c2340d1 100644
--- a/frame/aura/src/mock.rs
+++ b/frame/aura/src/mock.rs
@@ -22,10 +22,10 @@
 use crate::{Config, Module, GenesisConfig};
 use sp_consensus_aura::ed25519::AuthorityId;
 use sp_runtime::{
-	traits::IdentityLookup, Perbill,
+	traits::IdentityLookup,
 	testing::{Header, UintAuthorityId},
 };
-use frame_support::{impl_outer_origin, parameter_types, weights::Weight};
+use frame_support::{impl_outer_origin, parameter_types};
 use sp_io;
 use sp_core::H256;
 
@@ -39,14 +39,16 @@ pub struct Test;
 
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
-	pub const MaximumBlockWeight: Weight = 1024;
-	pub const MaximumBlockLength: u32 = 2 * 1024;
-	pub const AvailableBlockRatio: Perbill = Perbill::one();
+	pub BlockWeights: frame_system::limits::BlockWeights =
+		frame_system::limits::BlockWeights::simple_max(1024);
 	pub const MinimumPeriod: u64 = 1;
 }
 
 impl frame_system::Config for Test {
 	type BaseCallFilter = ();
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u64;
@@ -58,13 +60,6 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Event = ();
 	type BlockHashCount = BlockHashCount;
-	type MaximumBlockWeight = MaximumBlockWeight;
-	type DbWeight = ();
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = MaximumBlockWeight;
-	type AvailableBlockRatio = AvailableBlockRatio;
-	type MaximumBlockLength = MaximumBlockLength;
 	type Version = ();
 	type PalletInfo = ();
 	type AccountData = ();
diff --git a/frame/authority-discovery/src/lib.rs b/frame/authority-discovery/src/lib.rs
index 4db7ba753cb6..2d275e01bba2 100644
--- a/frame/authority-discovery/src/lib.rs
+++ b/frame/authority-discovery/src/lib.rs
@@ -93,7 +93,7 @@ impl<T: Config> pallet_session::OneSessionHandler<T::AccountId> for Module<T> {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use sp_authority_discovery::{AuthorityPair};
+	use sp_authority_discovery::AuthorityPair;
 	use sp_application_crypto::Pair;
 	use sp_core::{crypto::key_types, H256};
 	use sp_io::TestExternalities;
@@ -101,7 +101,7 @@ mod tests {
 		testing::{Header, UintAuthorityId}, traits::{ConvertInto, IdentityLookup, OpaqueKeys},
 		Perbill, KeyTypeId,
 	};
-	use frame_support::{impl_outer_origin, parameter_types, weights::Weight};
+	use frame_support::{impl_outer_origin, parameter_types};
 
 	type AuthorityDiscovery = Module<Test>;
 
@@ -138,13 +138,15 @@ mod tests {
 		pub const Offset: BlockNumber = 0;
 		pub const UncleGenerations: u64 = 0;
 		pub const BlockHashCount: u64 = 250;
-		pub const MaximumBlockWeight: Weight = 1024;
-		pub const MaximumBlockLength: u32 = 2 * 1024;
-		pub const AvailableBlockRatio: Perbill = Perbill::one();
+		pub BlockWeights: frame_system::limits::BlockWeights =
+			frame_system::limits::BlockWeights::simple_max(1024);
 	}
 
 	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
+		type BlockWeights = ();
+		type BlockLength = ();
+		type DbWeight = ();
 		type Origin = Origin;
 		type Index = u64;
 		type BlockNumber = BlockNumber;
@@ -156,13 +158,6 @@ mod tests {
 		type Header = Header;
 		type Event = ();
 		type BlockHashCount = BlockHashCount;
-		type MaximumBlockWeight = MaximumBlockWeight;
-		type DbWeight = ();
-		type BlockExecutionWeight = ();
-		type ExtrinsicBaseWeight = ();
-		type MaximumExtrinsicWeight = MaximumBlockWeight;
-		type AvailableBlockRatio = AvailableBlockRatio;
-		type MaximumBlockLength = MaximumBlockLength;
 		type Version = ();
 		type PalletInfo = ();
 		type AccountData = ();
diff --git a/frame/authorship/src/lib.rs b/frame/authorship/src/lib.rs
index 4809462db6e2..b991beaaa2b6 100644
--- a/frame/authorship/src/lib.rs
+++ b/frame/authorship/src/lib.rs
@@ -399,9 +399,9 @@ mod tests {
 	use super::*;
 	use sp_core::H256;
 	use sp_runtime::{
-		traits::{BlakeTwo256, IdentityLookup}, testing::Header, generic::DigestItem, Perbill,
+		traits::{BlakeTwo256, IdentityLookup}, testing::Header, generic::DigestItem,
 	};
-	use frame_support::{parameter_types, impl_outer_origin, ConsensusEngineId, weights::Weight};
+	use frame_support::{parameter_types, impl_outer_origin, ConsensusEngineId};
 
 	impl_outer_origin!{
 		pub enum Origin for Test where system = frame_system {}
@@ -412,13 +412,15 @@ mod tests {
 
 	parameter_types! {
 		pub const BlockHashCount: u64 = 250;
-		pub const MaximumBlockWeight: Weight = 1024;
-		pub const MaximumBlockLength: u32 = 2 * 1024;
-		pub const AvailableBlockRatio: Perbill = Perbill::one();
+		pub BlockWeights: frame_system::limits::BlockWeights =
+			frame_system::limits::BlockWeights::simple_max(1024);
 	}
 
 	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
+		type BlockWeights = ();
+		type BlockLength = ();
+		type DbWeight = ();
 		type Origin = Origin;
 		type Index = u64;
 		type BlockNumber = u64;
@@ -430,13 +432,6 @@ mod tests {
 		type Header = Header;
 		type Event = ();
 		type BlockHashCount = BlockHashCount;
-		type MaximumBlockWeight = MaximumBlockWeight;
-		type DbWeight = ();
-		type BlockExecutionWeight = ();
-		type ExtrinsicBaseWeight = ();
-		type MaximumExtrinsicWeight = MaximumBlockWeight;
-		type AvailableBlockRatio = AvailableBlockRatio;
-		type MaximumBlockLength = MaximumBlockLength;
 		type Version = ();
 		type PalletInfo = ();
 		type AccountData = ();
diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index f3d5bc092bca..8af92c79e91f 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -57,16 +57,18 @@ pub struct Test;
 
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
-	pub const MaximumBlockWeight: Weight = 1024;
-	pub const MaximumBlockLength: u32 = 2 * 1024;
-	pub const AvailableBlockRatio: Perbill = Perbill::one();
 	pub const EpochDuration: u64 = 3;
 	pub const ExpectedBlockTime: u64 = 1;
 	pub const DisabledValidatorsThreshold: Perbill = Perbill::from_percent(16);
+	pub BlockWeights: frame_system::limits::BlockWeights =
+		frame_system::limits::BlockWeights::simple_max(1024);
 }
 
 impl frame_system::Config for Test {
 	type BaseCallFilter = ();
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u64;
@@ -79,13 +81,6 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Event = ();
 	type BlockHashCount = BlockHashCount;
-	type MaximumBlockWeight = MaximumBlockWeight;
-	type DbWeight = ();
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = MaximumBlockWeight;
-	type AvailableBlockRatio = AvailableBlockRatio;
-	type MaximumBlockLength = MaximumBlockLength;
 	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u128>;
 	type OnNewAccount = ();
@@ -209,7 +204,8 @@ impl pallet_staking::Config for Test {
 }
 
 parameter_types! {
-	pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * MaximumBlockWeight::get();
+	pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60)
+		* BlockWeights::get().max_block;
 }
 
 impl pallet_offences::Config for Test {
diff --git a/frame/balances/src/tests_composite.rs b/frame/balances/src/tests_composite.rs
index 5f0cea7c9635..81c2b895273b 100644
--- a/frame/balances/src/tests_composite.rs
+++ b/frame/balances/src/tests_composite.rs
@@ -20,7 +20,6 @@
 #![cfg(test)]
 
 use sp_runtime::{
-	Perbill,
 	traits::IdentityLookup,
 	testing::Header,
 };
@@ -52,13 +51,15 @@ impl_outer_event! {
 pub struct Test;
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
-	pub const MaximumBlockWeight: Weight = 1024;
-	pub const MaximumBlockLength: u32 = 2 * 1024;
-	pub const AvailableBlockRatio: Perbill = Perbill::one();
+	pub BlockWeights: frame_system::limits::BlockWeights =
+		frame_system::limits::BlockWeights::simple_max(1024);
 	pub static ExistentialDeposit: u64 = 0;
 }
 impl frame_system::Config for Test {
 	type BaseCallFilter = ();
+	type BlockWeights = BlockWeights;
+	type BlockLength = ();
+	type DbWeight = ();
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u64;
@@ -70,13 +71,6 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Event = Event;
 	type BlockHashCount = BlockHashCount;
-	type MaximumBlockWeight = MaximumBlockWeight;
-	type DbWeight = ();
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = MaximumBlockWeight;
-	type MaximumBlockLength = MaximumBlockLength;
-	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
 	type PalletInfo = ();
 	type AccountData = super::AccountData<u64>;
diff --git a/frame/balances/src/tests_local.rs b/frame/balances/src/tests_local.rs
index 888b8c7d62b8..c168e1d8e59e 100644
--- a/frame/balances/src/tests_local.rs
+++ b/frame/balances/src/tests_local.rs
@@ -20,7 +20,6 @@
 #![cfg(test)]
 
 use sp_runtime::{
-	Perbill,
 	traits::IdentityLookup,
 	testing::Header,
 };
@@ -53,13 +52,15 @@ impl_outer_event! {
 pub struct Test;
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
-	pub const MaximumBlockWeight: Weight = 1024;
-	pub const MaximumBlockLength: u32 = 2 * 1024;
-	pub const AvailableBlockRatio: Perbill = Perbill::one();
+	pub BlockWeights: frame_system::limits::BlockWeights =
+		frame_system::limits::BlockWeights::simple_max(1024);
 	pub static ExistentialDeposit: u64 = 0;
 }
 impl frame_system::Config for Test {
 	type BaseCallFilter = ();
+	type BlockWeights = BlockWeights;
+	type BlockLength = ();
+	type DbWeight = ();
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u64;
@@ -71,13 +72,6 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Event = Event;
 	type BlockHashCount = BlockHashCount;
-	type MaximumBlockWeight = MaximumBlockWeight;
-	type DbWeight = ();
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = MaximumBlockWeight;
-	type MaximumBlockLength = MaximumBlockLength;
-	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
 	type PalletInfo = ();
 	type AccountData = super::AccountData<u64>;
diff --git a/frame/benchmarking/src/tests.rs b/frame/benchmarking/src/tests.rs
index 70359f2065ee..f86abebbb928 100644
--- a/frame/benchmarking/src/tests.rs
+++ b/frame/benchmarking/src/tests.rs
@@ -74,6 +74,9 @@ pub struct Test;
 
 impl frame_system::Config for Test {
 	type BaseCallFilter = ();
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u64;
@@ -85,13 +88,6 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Event = ();
 	type BlockHashCount = ();
-	type MaximumBlockWeight = ();
-	type DbWeight = ();
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = ();
-	type MaximumBlockLength = ();
-	type AvailableBlockRatio = ();
 	type Version = ();
 	type PalletInfo = ();
 	type AccountData = ();
diff --git a/frame/collective/src/lib.rs b/frame/collective/src/lib.rs
index 11ec42f25ae5..abaf579861e4 100644
--- a/frame/collective/src/lib.rs
+++ b/frame/collective/src/lib.rs
@@ -933,27 +933,29 @@ impl<
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use frame_support::{Hashable, assert_ok, assert_noop, parameter_types, weights::Weight};
+	use frame_support::{Hashable, assert_ok, assert_noop, parameter_types};
 	use frame_system::{self as system, EventRecord, Phase};
 	use hex_literal::hex;
 	use sp_core::H256;
 	use sp_runtime::{
-		Perbill, traits::{BlakeTwo256, IdentityLookup, Block as BlockT}, testing::Header,
+		traits::{BlakeTwo256, IdentityLookup, Block as BlockT}, testing::Header,
 		BuildStorage,
 	};
 	use crate as collective;
 
 	parameter_types! {
 		pub const BlockHashCount: u64 = 250;
-		pub const MaximumBlockWeight: Weight = 1024;
-		pub const MaximumBlockLength: u32 = 2 * 1024;
-		pub const AvailableBlockRatio: Perbill = Perbill::one();
 		pub const MotionDuration: u64 = 3;
 		pub const MaxProposals: u32 = 100;
 		pub const MaxMembers: u32 = 100;
+		pub BlockWeights: frame_system::limits::BlockWeights =
+			frame_system::limits::BlockWeights::simple_max(1024);
 	}
 	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
+		type BlockWeights = ();
+		type BlockLength = ();
+		type DbWeight = ();
 		type Origin = Origin;
 		type Index = u64;
 		type BlockNumber = u64;
@@ -965,13 +967,6 @@ mod tests {
 		type Header = Header;
 		type Event = Event;
 		type BlockHashCount = BlockHashCount;
-		type MaximumBlockWeight = MaximumBlockWeight;
-		type DbWeight = ();
-		type BlockExecutionWeight = ();
-		type ExtrinsicBaseWeight = ();
-		type MaximumExtrinsicWeight = MaximumBlockWeight;
-		type MaximumBlockLength = MaximumBlockLength;
-		type AvailableBlockRatio = AvailableBlockRatio;
 		type Version = ();
 		type PalletInfo = ();
 		type AccountData = ();
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index 44ddb8c2c65c..c0b9b671068d 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -23,7 +23,6 @@ use crate::{
 use assert_matches::assert_matches;
 use codec::Encode;
 use sp_runtime::{
-	Perbill,
 	traits::{BlakeTwo256, Hash, IdentityLookup, Convert},
 	testing::{Header, H256},
 	AccountId32,
@@ -105,13 +104,15 @@ pub mod test_utils {
 pub struct Test;
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
-	pub const MaximumBlockWeight: Weight = 1024;
-	pub const MaximumBlockLength: u32 = 2 * 1024;
-	pub const AvailableBlockRatio: Perbill = Perbill::one();
+	pub BlockWeights: frame_system::limits::BlockWeights =
+		frame_system::limits::BlockWeights::simple_max(1024);
 	pub static ExistentialDeposit: u64 = 0;
 }
 impl frame_system::Config for Test {
 	type BaseCallFilter = ();
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u64;
@@ -123,13 +124,6 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Event = MetaEvent;
 	type BlockHashCount = BlockHashCount;
-	type MaximumBlockWeight = MaximumBlockWeight;
-	type DbWeight = ();
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = MaximumBlockWeight;
-	type AvailableBlockRatio = AvailableBlockRatio;
-	type MaximumBlockLength = MaximumBlockLength;
 	type Version = ();
 	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u64>;
diff --git a/frame/democracy/src/lib.rs b/frame/democracy/src/lib.rs
index ce89259e55e8..70383beaa065 100644
--- a/frame/democracy/src/lib.rs
+++ b/frame/democracy/src/lib.rs
@@ -1086,7 +1086,7 @@ decl_module! {
 		}
 
 		/// Enact a proposal from a referendum. For now we just make the weight be the maximum.
-		#[weight = T::MaximumBlockWeight::get()]
+		#[weight = T::BlockWeights::get().max_block]
 		fn enact_proposal(origin, proposal_hash: T::Hash, index: ReferendumIndex) -> DispatchResult {
 			ensure_root(origin)?;
 			Self::do_enact_proposal(proposal_hash, index)
@@ -1609,6 +1609,7 @@ impl<T: Config> Module<T> {
 	/// - Db reads per R: `DepositOf`, `ReferendumInfoOf`
 	/// # </weight>
 	fn begin_block(now: T::BlockNumber) -> Result<Weight, DispatchError> {
+		let max_block_weight = T::BlockWeights::get().max_block;
 		let mut weight = 0;
 
 		// pick out another public referendum if it's time.
@@ -1616,7 +1617,7 @@ impl<T: Config> Module<T> {
 			// Errors come from the queue being empty. we don't really care about that, and even if
 			// we did, there is nothing we can do here.
 			let _ = Self::launch_next(now);
-			weight = T::MaximumBlockWeight::get();
+			weight = max_block_weight;
 		}
 
 		let next = Self::lowest_unbaked();
@@ -1627,7 +1628,7 @@ impl<T: Config> Module<T> {
 		for (index, info) in Self::maturing_referenda_at_inner(now, next..last).into_iter() {
 			let approved = Self::bake_referendum(now, index, info)?;
 			ReferendumInfoOf::<T>::insert(index, ReferendumInfo::Finished { end: now, approved });
-			weight = T::MaximumBlockWeight::get();
+			weight = max_block_weight;
 		}
 
 		Ok(weight)
diff --git a/frame/democracy/src/tests.rs b/frame/democracy/src/tests.rs
index 6e7b7cfcc6d1..dae3a262209e 100644
--- a/frame/democracy/src/tests.rs
+++ b/frame/democracy/src/tests.rs
@@ -88,12 +88,14 @@ impl Filter<Call> for BaseFilter {
 pub struct Test;
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
-	pub const MaximumBlockWeight: Weight = 1_000_000;
-	pub const MaximumBlockLength: u32 = 2 * 1024;
-	pub const AvailableBlockRatio: Perbill = Perbill::one();
+	pub BlockWeights: frame_system::limits::BlockWeights =
+		frame_system::limits::BlockWeights::simple_max(1_000_000);
 }
 impl frame_system::Config for Test {
 	type BaseCallFilter = BaseFilter;
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u64;
@@ -105,13 +107,6 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Event = Event;
 	type BlockHashCount = BlockHashCount;
-	type MaximumBlockWeight = MaximumBlockWeight;
-	type DbWeight = ();
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = MaximumBlockWeight;
-	type MaximumBlockLength = MaximumBlockLength;
-	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
 	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u64>;
@@ -120,7 +115,7 @@ impl frame_system::Config for Test {
 	type SystemWeightInfo = ();
 }
 parameter_types! {
-	pub MaximumSchedulerWeight: Weight = Perbill::from_percent(80) * MaximumBlockWeight::get();
+	pub MaximumSchedulerWeight: Weight = Perbill::from_percent(80) * BlockWeights::get().max_block;
 }
 impl pallet_scheduler::Config for Test {
 	type Event = Event;
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index c4a71d6595f9..db2428971cc5 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -621,7 +621,7 @@ decl_module! {
 		#[weight = if *has_replacement {
 			T::WeightInfo::remove_member_with_replacement()
 		} else {
-			T::MaximumBlockWeight::get()
+			T::BlockWeights::get().max_block
 		}]
 		fn remove_member(
 			origin,
@@ -829,7 +829,7 @@ impl<T: Config> Module<T> {
 		if !Self::term_duration().is_zero() {
 			if (block_number % Self::term_duration()).is_zero() {
 				Self::do_phragmen();
-				return T::MaximumBlockWeight::get()
+				return T::BlockWeights::get().max_block;
 			}
 		}
 		0
@@ -1058,26 +1058,26 @@ impl<T: Config> ContainsLengthBound for Module<T> {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use frame_support::{assert_ok, assert_noop, assert_err_with_weight, parameter_types,
-		weights::Weight,
-	};
+	use frame_support::{assert_ok, assert_noop, assert_err_with_weight, parameter_types};
 	use substrate_test_utils::assert_eq_uvec;
 	use sp_core::H256;
 	use sp_runtime::{
-		Perbill, testing::Header, BuildStorage, DispatchResult,
+		testing::Header, BuildStorage, DispatchResult,
 		traits::{BlakeTwo256, IdentityLookup, Block as BlockT},
 	};
 	use crate as elections_phragmen;
 
 	parameter_types! {
 		pub const BlockHashCount: u64 = 250;
-		pub const MaximumBlockWeight: Weight = 1024;
-		pub const MaximumBlockLength: u32 = 2 * 1024;
-		pub const AvailableBlockRatio: Perbill = Perbill::one();
+		pub BlockWeights: frame_system::limits::BlockWeights =
+			frame_system::limits::BlockWeights::simple_max(1024);
 	}
 
 	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
+		type BlockWeights = ();
+		type BlockLength = ();
+		type DbWeight = ();
 		type Origin = Origin;
 		type Index = u64;
 		type BlockNumber = u64;
@@ -1089,13 +1089,6 @@ mod tests {
 		type Header = Header;
 		type Event = Event;
 		type BlockHashCount = BlockHashCount;
-		type MaximumBlockWeight = MaximumBlockWeight;
-		type DbWeight = ();
-		type BlockExecutionWeight = ();
-		type ExtrinsicBaseWeight = ();
-		type MaximumExtrinsicWeight = MaximumBlockWeight;
-		type MaximumBlockLength = MaximumBlockLength;
-		type AvailableBlockRatio = AvailableBlockRatio;
 		type Version = ();
 		type PalletInfo = ();
 		type AccountData = pallet_balances::AccountData<u64>;
diff --git a/frame/elections/src/mock.rs b/frame/elections/src/mock.rs
index 293074469c5d..482c905f89c1 100644
--- a/frame/elections/src/mock.rs
+++ b/frame/elections/src/mock.rs
@@ -22,23 +22,24 @@
 use frame_support::{
 	StorageValue, StorageMap, parameter_types, assert_ok,
 	traits::{ChangeMembers, Currency, LockIdentifier},
-	weights::Weight,
 };
 use sp_core::H256;
 use sp_runtime::{
-	Perbill, BuildStorage, testing::Header, traits::{BlakeTwo256, IdentityLookup, Block as BlockT},
+	BuildStorage, testing::Header, traits::{BlakeTwo256, IdentityLookup, Block as BlockT},
 };
 use crate as elections;
 
 
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
-	pub const MaximumBlockWeight: Weight = 1024;
-	pub const MaximumBlockLength: u32 = 2 * 1024;
-	pub const AvailableBlockRatio: Perbill = Perbill::one();
+	pub BlockWeights: frame_system::limits::BlockWeights =
+		frame_system::limits::BlockWeights::simple_max(1024);
 }
 impl frame_system::Config for Test {
 	type BaseCallFilter = ();
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
 	type Origin = Origin;
 	type Call = Call;
 	type Index = u64;
@@ -50,13 +51,6 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Event = Event;
 	type BlockHashCount = BlockHashCount;
-	type MaximumBlockWeight = MaximumBlockWeight;
-	type DbWeight = ();
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = MaximumBlockWeight;
-	type MaximumBlockLength = MaximumBlockLength;
-	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
 	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u64>;
diff --git a/frame/example-offchain-worker/src/tests.rs b/frame/example-offchain-worker/src/tests.rs
index 809e3b7ba64a..196d4cac4adc 100644
--- a/frame/example-offchain-worker/src/tests.rs
+++ b/frame/example-offchain-worker/src/tests.rs
@@ -20,7 +20,6 @@ use std::sync::Arc;
 use codec::{Encode, Decode};
 use frame_support::{
 	assert_ok, impl_outer_origin, parameter_types,
-	weights::Weight,
 };
 use sp_core::{
 	H256,
@@ -33,7 +32,7 @@ use sp_keystore::{
 	testing::KeyStore,
 };
 use sp_runtime::{
-	Perbill, RuntimeAppPublic,
+	RuntimeAppPublic,
 	testing::{Header, TestXt},
 	traits::{
 		BlakeTwo256, IdentityLookup, Extrinsic as ExtrinsicT,
@@ -52,12 +51,14 @@ impl_outer_origin! {
 pub struct Test;
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
-	pub const MaximumBlockWeight: Weight = 1024;
-	pub const MaximumBlockLength: u32 = 2 * 1024;
-	pub const AvailableBlockRatio: Perbill = Perbill::one();
+	pub BlockWeights: frame_system::limits::BlockWeights =
+		frame_system::limits::BlockWeights::simple_max(1024);
 }
 impl frame_system::Config for Test {
 	type BaseCallFilter = ();
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
 	type Origin = Origin;
 	type Call = ();
 	type Index = u64;
@@ -69,13 +70,6 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Event = ();
 	type BlockHashCount = BlockHashCount;
-	type MaximumBlockWeight = MaximumBlockWeight;
-	type DbWeight = ();
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = MaximumBlockWeight;
-	type MaximumBlockLength = MaximumBlockLength;
-	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
 	type PalletInfo = ();
 	type AccountData = ();
diff --git a/frame/example-parallel/src/tests.rs b/frame/example-parallel/src/tests.rs
index d2c376400136..24e846c3de42 100644
--- a/frame/example-parallel/src/tests.rs
+++ b/frame/example-parallel/src/tests.rs
@@ -18,7 +18,7 @@
 use crate::*;
 
 use codec::{Encode, Decode};
-use frame_support::{impl_outer_origin, parameter_types, weights::Weight};
+use frame_support::{impl_outer_origin, parameter_types};
 use sp_core::H256;
 use sp_runtime::{
 	Perbill,
@@ -34,8 +34,6 @@ impl_outer_origin! {
 pub struct Test;
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
-	pub const MaximumBlockWeight: Weight = 1024;
-	pub const MaximumBlockLength: u32 = 2 * 1024;
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
 
@@ -53,13 +51,9 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Event = ();
 	type BlockHashCount = BlockHashCount;
-	type MaximumBlockWeight = MaximumBlockWeight;
 	type DbWeight = ();
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = MaximumBlockWeight;
-	type MaximumBlockLength = MaximumBlockLength;
-	type AvailableBlockRatio = AvailableBlockRatio;
+	type BlockWeights = ();
+	type BlockLength = ();
 	type Version = ();
 	type AccountData = ();
 	type OnNewAccount = ();
diff --git a/frame/example/src/lib.rs b/frame/example/src/lib.rs
index fb84a48a8d2d..b3e883781f59 100644
--- a/frame/example/src/lib.rs
+++ b/frame/example/src/lib.rs
@@ -718,7 +718,6 @@ mod tests {
 	// The testing primitives are very useful for avoiding having to work with signatures
 	// or public keys. `u64` is used as the `AccountId` and no `Signature`s are required.
 	use sp_runtime::{
-		Perbill,
 		testing::Header,
 		traits::{BlakeTwo256, IdentityLookup},
 	};
@@ -740,12 +739,14 @@ mod tests {
 	pub struct Test;
 	parameter_types! {
 		pub const BlockHashCount: u64 = 250;
-		pub const MaximumBlockWeight: Weight = 1024;
-		pub const MaximumBlockLength: u32 = 2 * 1024;
-		pub const AvailableBlockRatio: Perbill = Perbill::one();
+		pub BlockWeights: frame_system::limits::BlockWeights =
+			frame_system::limits::BlockWeights::simple_max(1024);
 	}
 	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
+		type BlockWeights = ();
+		type BlockLength = ();
+		type DbWeight = ();
 		type Origin = Origin;
 		type Index = u64;
 		type BlockNumber = u64;
@@ -757,13 +758,6 @@ mod tests {
 		type Header = Header;
 		type Event = ();
 		type BlockHashCount = BlockHashCount;
-		type MaximumBlockWeight = MaximumBlockWeight;
-		type DbWeight = ();
-		type BlockExecutionWeight = ();
-		type ExtrinsicBaseWeight = ();
-		type MaximumExtrinsicWeight = MaximumBlockWeight;
-		type MaximumBlockLength = MaximumBlockLength;
-		type AvailableBlockRatio = AvailableBlockRatio;
 		type Version = ();
 		type PalletInfo = ();
 		type AccountData = pallet_balances::AccountData<u64>;
diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index c91287df5b90..572d58d86b40 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -251,8 +251,12 @@ where
 		weight = weight.saturating_add(
 			<frame_system::Module<System> as OnInitialize<System::BlockNumber>>::on_initialize(*block_number)
 		);
-		weight = weight.saturating_add(<AllModules as OnInitialize<System::BlockNumber>>::on_initialize(*block_number))
-			.saturating_add(<System::BlockExecutionWeight as frame_support::traits::Get<_>>::get());
+		weight = weight.saturating_add(
+			<AllModules as OnInitialize<System::BlockNumber>>::on_initialize(*block_number)
+		);
+		weight = weight.saturating_add(
+			<System::BlockWeights as frame_support::traits::Get<_>>::get().base_block
+		);
 		<frame_system::Module::<System>>::register_extra_weight_unchecked(weight, DispatchClass::Mandatory);
 
 		frame_system::Module::<System>::note_finished_initialize();
@@ -482,7 +486,7 @@ mod tests {
 	use super::*;
 	use sp_core::H256;
 	use sp_runtime::{
-		generic::{Era, DigestItem}, Perbill, DispatchError, testing::{Digest, Header, Block},
+		generic::{Era, DigestItem}, DispatchError, testing::{Digest, Header, Block},
 		traits::{Header as HeaderT, BlakeTwo256, IdentityLookup},
 		transaction_validity::{
 			InvalidTransaction, ValidTransaction, TransactionValidityError, UnknownTransaction
@@ -493,7 +497,9 @@ mod tests {
 		weights::{Weight, RuntimeDbWeight, IdentityFee, WeightToFeePolynomial},
 		traits::{Currency, LockIdentifier, LockableCurrency, WithdrawReasons},
 	};
-	use frame_system::{Call as SystemCall, ChainContext, LastRuntimeUpgradeInfo};
+	use frame_system::{
+		Call as SystemCall, ChainContext, LastRuntimeUpgradeInfo,
+	};
 	use pallet_transaction_payment::CurrencyAdapter;
 	use pallet_balances::Call as BalancesCall;
 	use hex_literal::hex;
@@ -584,11 +590,12 @@ mod tests {
 
 	parameter_types! {
 		pub const BlockHashCount: u64 = 250;
-		pub const MaximumBlockWeight: Weight = 1024;
-		pub const MaximumBlockLength: u32 = 2 * 1024;
-		pub const AvailableBlockRatio: Perbill = Perbill::one();
-		pub const BlockExecutionWeight: Weight = 10;
-		pub const ExtrinsicBaseWeight: Weight = 5;
+		pub BlockWeights: frame_system::limits::BlockWeights =
+			frame_system::limits::BlockWeights::builder()
+				.base_block(10)
+				.for_class(DispatchClass::all(), |weights| weights.base_extrinsic = 5)
+				.for_class(DispatchClass::non_mandatory(), |weights| weights.max_total = 1024.into())
+				.build_or_panic();
 		pub const DbWeight: RuntimeDbWeight = RuntimeDbWeight {
 			read: 10,
 			write: 100,
@@ -596,6 +603,9 @@ mod tests {
 	}
 	impl frame_system::Config for Runtime {
 		type BaseCallFilter = ();
+		type BlockWeights = BlockWeights;
+		type BlockLength = ();
+		type DbWeight = ();
 		type Origin = Origin;
 		type Index = u64;
 		type Call = Call;
@@ -607,13 +617,6 @@ mod tests {
 		type Header = Header;
 		type Event = Event;
 		type BlockHashCount = BlockHashCount;
-		type MaximumBlockWeight = MaximumBlockWeight;
-		type DbWeight = DbWeight;
-		type BlockExecutionWeight = BlockExecutionWeight;
-		type ExtrinsicBaseWeight = ExtrinsicBaseWeight;
-		type MaximumExtrinsicWeight = MaximumBlockWeight;
-		type AvailableBlockRatio = AvailableBlockRatio;
-		type MaximumBlockLength = MaximumBlockLength;
 		type Version = RuntimeVersion;
 		type PalletInfo = PalletInfo;
 		type AccountData = pallet_balances::AccountData<Balance>;
@@ -715,7 +718,8 @@ mod tests {
 			balances: vec![(1, 211)],
 		}.assimilate_storage(&mut t).unwrap();
 		let xt = TestXt::new(Call::Balances(BalancesCall::transfer(2, 69)), sign_extra(1, 0, 0));
-		let weight = xt.get_dispatch_info().weight + <Runtime as frame_system::Config>::ExtrinsicBaseWeight::get();
+		let weight = xt.get_dispatch_info().weight +
+			<Runtime as frame_system::Config>::BlockWeights::get().get(DispatchClass::Normal).base_extrinsic;
 		let fee: Balance
 			= <Runtime as pallet_transaction_payment::Config>::WeightToFee::calc(&weight);
 		let mut t = sp_io::TestExternalities::new(t);
@@ -749,7 +753,7 @@ mod tests {
 				header: Header {
 					parent_hash: [69u8; 32].into(),
 					number: 1,
-					state_root: hex!("465a1569d309039bdf84b0479d28064ea29e6584584dc7d788904bb14489c6f6").into(),
+					state_root: hex!("6a3ad91caba5b8ac15c325a36d7568adf6a7e49321865de7527b851d870343d4").into(),
 					extrinsics_root: hex!("03170a2e7597b7b7e3d84c05391d139a62b157e78786d8c082f29dcf4c111314").into(),
 					digest: Digest { logs: vec![], },
 				},
@@ -817,9 +821,11 @@ mod tests {
 		let xt = TestXt::new(Call::Balances(BalancesCall::transfer(33, 0)), sign_extra(1, 0, 0));
 		let encoded = xt.encode();
 		let encoded_len = encoded.len() as Weight;
-		// on_initialize weight + block execution weight
-		let base_block_weight = 175 + <Runtime as frame_system::Config>::BlockExecutionWeight::get();
-		let limit = AvailableBlockRatio::get() * MaximumBlockWeight::get() - base_block_weight;
+		// on_initialize weight + base block execution weight
+		let block_weights = <Runtime as frame_system::Config>::BlockWeights::get();
+		let base_block_weight = 175 + block_weights.base_block;
+		let limit = block_weights.get(DispatchClass::Normal).max_total.unwrap()
+			- base_block_weight;
 		let num_to_exhaust_block = limit / (encoded_len + 5);
 		t.execute_with(|| {
 			Executive::initialize_block(&Header::new(
@@ -861,7 +867,7 @@ mod tests {
 		let mut t = new_test_ext(1);
 		t.execute_with(|| {
 			// Block execution weight + on_initialize weight from custom module
-			let base_block_weight = 175 + <Runtime as frame_system::Config>::BlockExecutionWeight::get();
+			let base_block_weight = 175 + <Runtime as frame_system::Config>::BlockWeights::get().base_block;
 
 			Executive::initialize_block(&Header::new(
 				1,
@@ -879,7 +885,8 @@ mod tests {
 			assert!(Executive::apply_extrinsic(x2.clone()).unwrap().is_ok());
 
 			// default weight for `TestXt` == encoded length.
-			let extrinsic_weight = len as Weight + <Runtime as frame_system::Config>::ExtrinsicBaseWeight::get();
+			let extrinsic_weight = len as Weight + <Runtime as frame_system::Config>::BlockWeights
+				::get().get(DispatchClass::Normal).base_extrinsic;
 			assert_eq!(
 				<frame_system::Module<Runtime>>::block_weight().total(),
 				base_block_weight + 3 * extrinsic_weight,
@@ -945,8 +952,11 @@ mod tests {
 					Call::System(SystemCall::remark(vec![1u8])),
 					sign_extra(1, 0, 0),
 				);
-				let weight = xt.get_dispatch_info().weight
-					+ <Runtime as frame_system::Config>::ExtrinsicBaseWeight::get();
+				let weight = xt.get_dispatch_info().weight + <Runtime as frame_system::Config>
+					::BlockWeights
+					::get()
+					.get(DispatchClass::Normal)
+					.base_extrinsic;
 				let fee: Balance =
 					<Runtime as pallet_transaction_payment::Config>::WeightToFee::calc(&weight);
 				Executive::initialize_block(&Header::new(
@@ -1106,7 +1116,7 @@ mod tests {
 			let runtime_upgrade_weight = <AllModules as OnRuntimeUpgrade>::on_runtime_upgrade();
 			let frame_system_on_initialize_weight = frame_system::Module::<Runtime>::on_initialize(block_number);
 			let on_initialize_weight = <AllModules as OnInitialize<u64>>::on_initialize(block_number);
-			let base_block_weight = <Runtime as frame_system::Config>::BlockExecutionWeight::get();
+			let base_block_weight = <Runtime as frame_system::Config>::BlockWeights::get().base_block;
 
 			// Weights are recorded correctly
 			assert_eq!(
diff --git a/frame/grandpa/src/mock.rs b/frame/grandpa/src/mock.rs
index fd731c9cda3d..4a5de63e839b 100644
--- a/frame/grandpa/src/mock.rs
+++ b/frame/grandpa/src/mock.rs
@@ -74,13 +74,15 @@ pub struct Test;
 
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
-	pub const MaximumBlockWeight: Weight = 1024;
-	pub const MaximumBlockLength: u32 = 2 * 1024;
-	pub const AvailableBlockRatio: Perbill = Perbill::one();
+	pub BlockWeights: frame_system::limits::BlockWeights =
+		frame_system::limits::BlockWeights::simple_max(1024);
 }
 
 impl frame_system::Config for Test {
 	type BaseCallFilter = ();
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u64;
@@ -92,13 +94,6 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Event = TestEvent;
 	type BlockHashCount = BlockHashCount;
-	type MaximumBlockWeight = MaximumBlockWeight;
-	type DbWeight = ();
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = MaximumBlockWeight;
-	type MaximumBlockLength = MaximumBlockLength;
-	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
 	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u128>;
@@ -224,7 +219,7 @@ impl pallet_staking::Config for Test {
 }
 
 parameter_types! {
-	pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * MaximumBlockWeight::get();
+	pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * BlockWeights::get().max_block;
 }
 
 impl pallet_offences::Config for Test {
diff --git a/frame/identity/src/lib.rs b/frame/identity/src/lib.rs
index c0afffc0524c..959107e527a2 100644
--- a/frame/identity/src/lib.rs
+++ b/frame/identity/src/lib.rs
@@ -1134,3 +1134,4 @@ impl<T: Config> Module<T> {
 			.collect()
 	}
 }
+
diff --git a/frame/identity/src/tests.rs b/frame/identity/src/tests.rs
index aefce1f8ff6f..7f3a95dcd124 100644
--- a/frame/identity/src/tests.rs
+++ b/frame/identity/src/tests.rs
@@ -21,13 +21,13 @@ use super::*;
 
 use sp_runtime::traits::BadOrigin;
 use frame_support::{
-	assert_ok, assert_noop, impl_outer_origin, parameter_types, weights::Weight,
+	assert_ok, assert_noop, impl_outer_origin, parameter_types,
 	ord_parameter_types,
 };
 use sp_core::H256;
 use frame_system::{EnsureSignedBy, EnsureOneOf, EnsureRoot};
 use sp_runtime::{
-	Perbill, testing::Header, traits::{BlakeTwo256, IdentityLookup},
+	testing::Header, traits::{BlakeTwo256, IdentityLookup},
 };
 
 impl_outer_origin! {
@@ -38,12 +38,13 @@ impl_outer_origin! {
 pub struct Test;
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
-	pub const MaximumBlockWeight: Weight = 1024;
-	pub const MaximumBlockLength: u32 = 2 * 1024;
-	pub const AvailableBlockRatio: Perbill = Perbill::one();
+	pub BlockWeights: frame_system::limits::BlockWeights =
+		frame_system::limits::BlockWeights::simple_max(1024);
 }
 impl frame_system::Config for Test {
 	type BaseCallFilter = ();
+	type BlockWeights = ();
+	type BlockLength = ();
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u64;
@@ -55,13 +56,7 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Event = ();
 	type BlockHashCount = BlockHashCount;
-	type MaximumBlockWeight = MaximumBlockWeight;
 	type DbWeight = ();
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = MaximumBlockWeight;
-	type MaximumBlockLength = MaximumBlockLength;
-	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
 	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u64>;
diff --git a/frame/im-online/src/mock.rs b/frame/im-online/src/mock.rs
index 9a049a471881..0a6dc1f79c07 100644
--- a/frame/im-online/src/mock.rs
+++ b/frame/im-online/src/mock.rs
@@ -27,7 +27,7 @@ use sp_staking::{SessionIndex, offence::{ReportOffence, OffenceError}};
 use sp_runtime::testing::{Header, UintAuthorityId, TestXt};
 use sp_runtime::traits::{IdentityLookup, BlakeTwo256, ConvertInto};
 use sp_core::H256;
-use frame_support::{impl_outer_origin, impl_outer_dispatch, parameter_types, weights::Weight};
+use frame_support::{impl_outer_origin, impl_outer_dispatch, parameter_types};
 
 impl_outer_origin!{
 	pub enum Origin for Runtime {}
@@ -104,13 +104,15 @@ pub struct Runtime;
 
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
-	pub const MaximumBlockWeight: Weight = 1024;
-	pub const MaximumBlockLength: u32 = 2 * 1024;
-	pub const AvailableBlockRatio: Perbill = Perbill::one();
+	pub BlockWeights: frame_system::limits::BlockWeights =
+		frame_system::limits::BlockWeights::simple_max(1024);
 }
 
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = ();
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u64;
@@ -122,13 +124,6 @@ impl frame_system::Config for Runtime {
 	type Header = Header;
 	type Event = ();
 	type BlockHashCount = BlockHashCount;
-	type MaximumBlockWeight = MaximumBlockWeight;
-	type DbWeight = ();
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = MaximumBlockWeight;
-	type MaximumBlockLength = MaximumBlockLength;
-	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
 	type PalletInfo = ();
 	type AccountData = ();
diff --git a/frame/indices/src/mock.rs b/frame/indices/src/mock.rs
index dbbde888c166..63f0277548f9 100644
--- a/frame/indices/src/mock.rs
+++ b/frame/indices/src/mock.rs
@@ -20,9 +20,8 @@
 #![cfg(test)]
 
 use sp_runtime::testing::Header;
-use sp_runtime::Perbill;
 use sp_core::H256;
-use frame_support::{impl_outer_origin, impl_outer_event, parameter_types, weights::Weight};
+use frame_support::{impl_outer_origin, impl_outer_event, parameter_types};
 use crate::{self as indices, Module, Config};
 use frame_system as system;
 use pallet_balances as balances;
@@ -44,13 +43,15 @@ pub struct Test;
 
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
-	pub const MaximumBlockWeight: Weight = 1024;
-	pub const MaximumBlockLength: u32 = 2 * 1024;
-	pub const AvailableBlockRatio: Perbill = Perbill::one();
+	pub BlockWeights: frame_system::limits::BlockWeights =
+		frame_system::limits::BlockWeights::simple_max(1024);
 }
 
 impl frame_system::Config for Test {
 	type BaseCallFilter = ();
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
 	type Origin = Origin;
 	type Call = ();
 	type Index = u64;
@@ -62,13 +63,6 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Event = MetaEvent;
 	type BlockHashCount = BlockHashCount;
-	type MaximumBlockWeight = MaximumBlockWeight;
-	type DbWeight = ();
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = MaximumBlockWeight;
-	type MaximumBlockLength = MaximumBlockLength;
-	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
 	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u64>;
diff --git a/frame/membership/src/lib.rs b/frame/membership/src/lib.rs
index 60cd7ae1eda2..cfdc38752b5e 100644
--- a/frame/membership/src/lib.rs
+++ b/frame/membership/src/lib.rs
@@ -279,11 +279,11 @@ mod tests {
 	use super::*;
 
 	use frame_support::{
-		assert_ok, assert_noop, impl_outer_origin, parameter_types, weights::Weight,
+		assert_ok, assert_noop, impl_outer_origin, parameter_types,
 		ord_parameter_types
 	};
 	use sp_core::H256;
-	use sp_runtime::{Perbill, traits::{BlakeTwo256, IdentityLookup, BadOrigin}, testing::Header};
+	use sp_runtime::{traits::{BlakeTwo256, IdentityLookup, BadOrigin}, testing::Header};
 	use frame_system::EnsureSignedBy;
 
 	impl_outer_origin! {
@@ -294,14 +294,16 @@ mod tests {
 	pub struct Test;
 	parameter_types! {
 		pub const BlockHashCount: u64 = 250;
-		pub const MaximumBlockWeight: Weight = 1024;
-		pub const MaximumBlockLength: u32 = 2 * 1024;
-		pub const AvailableBlockRatio: Perbill = Perbill::one();
+		pub BlockWeights: frame_system::limits::BlockWeights =
+			frame_system::limits::BlockWeights::simple_max(1024);
 		pub static Members: Vec<u64> = vec![];
 		pub static Prime: Option<u64> = None;
 	}
 	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
+		type BlockWeights = ();
+		type BlockLength = ();
+		type DbWeight = ();
 		type Origin = Origin;
 		type Index = u64;
 		type BlockNumber = u64;
@@ -313,13 +315,6 @@ mod tests {
 		type Header = Header;
 		type Event = ();
 		type BlockHashCount = BlockHashCount;
-		type MaximumBlockWeight = MaximumBlockWeight;
-		type DbWeight = ();
-		type BlockExecutionWeight = ();
-		type ExtrinsicBaseWeight = ();
-		type MaximumExtrinsicWeight = MaximumBlockWeight;
-		type MaximumBlockLength = MaximumBlockLength;
-		type AvailableBlockRatio = AvailableBlockRatio;
 		type Version = ();
 		type PalletInfo = ();
 		type AccountData = ();
diff --git a/frame/multisig/src/tests.rs b/frame/multisig/src/tests.rs
index 6e8895184348..7a959ec37f28 100644
--- a/frame/multisig/src/tests.rs
+++ b/frame/multisig/src/tests.rs
@@ -23,10 +23,10 @@ use super::*;
 
 use frame_support::{
 	assert_ok, assert_noop, impl_outer_origin, parameter_types, impl_outer_dispatch,
-	weights::Weight, impl_outer_event, traits::Filter,
+	impl_outer_event, traits::Filter,
 };
 use sp_core::H256;
-use sp_runtime::{Perbill, traits::{BlakeTwo256, IdentityLookup}, testing::Header};
+use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
 use crate as multisig;
 
 impl_outer_origin! {
@@ -55,12 +55,14 @@ impl_outer_dispatch! {
 pub struct Test;
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
-	pub const MaximumBlockWeight: Weight = 1024;
-	pub const MaximumBlockLength: u32 = 2 * 1024;
-	pub const AvailableBlockRatio: Perbill = Perbill::one();
+	pub BlockWeights: frame_system::limits::BlockWeights =
+		frame_system::limits::BlockWeights::simple_max(1024);
 }
 impl frame_system::Config for Test {
 	type BaseCallFilter = TestBaseCallFilter;
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u64;
@@ -72,13 +74,6 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Event = TestEvent;
 	type BlockHashCount = BlockHashCount;
-	type MaximumBlockWeight = MaximumBlockWeight;
-	type DbWeight = ();
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = MaximumBlockWeight;
-	type MaximumBlockLength = MaximumBlockLength;
-	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
 	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u64>;
diff --git a/frame/nicks/src/lib.rs b/frame/nicks/src/lib.rs
index e66580250426..2b74f323d872 100644
--- a/frame/nicks/src/lib.rs
+++ b/frame/nicks/src/lib.rs
@@ -241,13 +241,13 @@ mod tests {
 	use super::*;
 
 	use frame_support::{
-		assert_ok, assert_noop, impl_outer_origin, parameter_types, weights::Weight,
+		assert_ok, assert_noop, impl_outer_origin, parameter_types,
 		ord_parameter_types
 	};
 	use sp_core::H256;
 	use frame_system::EnsureSignedBy;
 	use sp_runtime::{
-		Perbill, testing::Header, traits::{BlakeTwo256, IdentityLookup, BadOrigin},
+		testing::Header, traits::{BlakeTwo256, IdentityLookup, BadOrigin},
 	};
 
 	impl_outer_origin! {
@@ -258,12 +258,14 @@ mod tests {
 	pub struct Test;
 	parameter_types! {
 		pub const BlockHashCount: u64 = 250;
-		pub const MaximumBlockWeight: Weight = 1024;
-		pub const MaximumBlockLength: u32 = 2 * 1024;
-		pub const AvailableBlockRatio: Perbill = Perbill::one();
+		pub BlockWeights: frame_system::limits::BlockWeights =
+			frame_system::limits::BlockWeights::simple_max(1024);
 	}
 	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
+		type BlockWeights = ();
+		type BlockLength = ();
+		type DbWeight = ();
 		type Origin = Origin;
 		type Index = u64;
 		type BlockNumber = u64;
@@ -275,13 +277,6 @@ mod tests {
 		type Header = Header;
 		type Event = ();
 		type BlockHashCount = BlockHashCount;
-		type MaximumBlockWeight = MaximumBlockWeight;
-		type DbWeight = ();
-		type BlockExecutionWeight = ();
-		type ExtrinsicBaseWeight = ();
-		type MaximumExtrinsicWeight = MaximumBlockWeight;
-		type MaximumBlockLength = MaximumBlockLength;
-		type AvailableBlockRatio = AvailableBlockRatio;
 		type Version = ();
 		type PalletInfo = ();
 		type AccountData = pallet_balances::AccountData<u64>;
diff --git a/frame/node-authorization/src/lib.rs b/frame/node-authorization/src/lib.rs
index df6b391cc7a6..9641bea116a0 100644
--- a/frame/node-authorization/src/lib.rs
+++ b/frame/node-authorization/src/lib.rs
@@ -267,7 +267,7 @@ decl_module! {
 		pub fn reset_well_known_nodes(origin, nodes: Vec<(PeerId, T::AccountId)>) {
 			T::ResetOrigin::ensure_origin(origin)?;
 			ensure!(nodes.len() < T::MaxWellKnownNodes::get() as usize, Error::<T>::TooManyNodes);
-	
+
 			Self::initialize_nodes(&nodes);
 
 			Self::deposit_event(RawEvent::NodesReset(nodes));
@@ -280,7 +280,7 @@ decl_module! {
 		#[weight = T::WeightInfo::claim_node()]
 		pub fn claim_node(origin, node: PeerId) {
 			let sender = ensure_signed(origin)?;
-			
+
 			ensure!(node.0.len() < T::MaxPeerIdLength::get() as usize, Error::<T>::PeerIdTooLong);
 			ensure!(!Owners::<T>::contains_key(&node),Error::<T>::AlreadyClaimed);
 
@@ -433,12 +433,12 @@ mod tests {
 	use super::*;
 
 	use frame_support::{
-		assert_ok, assert_noop, impl_outer_origin, weights::Weight,
+		assert_ok, assert_noop, impl_outer_origin,
 		parameter_types, ord_parameter_types,
 	};
 	use frame_system::EnsureSignedBy;
 	use sp_core::H256;
-	use sp_runtime::{Perbill, traits::{BlakeTwo256, IdentityLookup, BadOrigin}, testing::Header};
+	use sp_runtime::{traits::{BlakeTwo256, IdentityLookup, BadOrigin}, testing::Header};
 
 	impl_outer_origin! {
 		pub enum Origin for Test where system = frame_system {}
@@ -449,12 +449,12 @@ mod tests {
 
 	parameter_types! {
 		pub const BlockHashCount: u64 = 250;
-		pub const MaximumBlockWeight: Weight = 1024;
-		pub const MaximumBlockLength: u32 = 2 * 1024;
-		pub const AvailableBlockRatio: Perbill = Perbill::one();
 	}
 	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
+		type DbWeight = ();
+		type BlockWeights = ();
+		type BlockLength = ();
 		type Origin = Origin;
 		type Index = u64;
 		type BlockNumber = u64;
@@ -466,13 +466,6 @@ mod tests {
 		type Header = Header;
 		type Event = ();
 		type BlockHashCount = BlockHashCount;
-		type MaximumBlockWeight = MaximumBlockWeight;
-		type DbWeight = ();
-		type BlockExecutionWeight = ();
-		type ExtrinsicBaseWeight = ();
-		type MaximumExtrinsicWeight = MaximumBlockWeight;
-		type MaximumBlockLength = MaximumBlockLength;
-		type AvailableBlockRatio = AvailableBlockRatio;
 		type Version = ();
 		type PalletInfo = ();
 		type AccountData = ();
diff --git a/frame/offences/benchmarking/src/mock.rs b/frame/offences/benchmarking/src/mock.rs
index 269324033bbc..e55d7ac8e3a7 100644
--- a/frame/offences/benchmarking/src/mock.rs
+++ b/frame/offences/benchmarking/src/mock.rs
@@ -37,11 +37,15 @@ type BlockNumber = u64;
 type Balance = u64;
 
 parameter_types! {
-	pub const MaximumBlockWeight: Weight = 2 * WEIGHT_PER_SECOND;
+	pub BlockWeights: frame_system::limits::BlockWeights =
+		frame_system::limits::BlockWeights::simple_max(2 * WEIGHT_PER_SECOND);
 }
 
 impl frame_system::Config for Test {
 	type BaseCallFilter = ();
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
 	type Origin = Origin;
 	type Index = AccountIndex;
 	type BlockNumber = BlockNumber;
@@ -53,18 +57,11 @@ impl frame_system::Config for Test {
 	type Header = sp_runtime::testing::Header;
 	type Event = Event;
 	type BlockHashCount = ();
-	type MaximumBlockWeight = MaximumBlockWeight;
-	type DbWeight = ();
-	type AvailableBlockRatio = ();
-	type MaximumBlockLength = ();
 	type Version = ();
 	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = (Balances,);
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = ();
 	type SystemWeightInfo = ();
 }
 parameter_types! {
@@ -184,7 +181,7 @@ impl pallet_im_online::Config for Test {
 }
 
 parameter_types! {
-	pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * MaximumBlockWeight::get();
+	pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * BlockWeights::get().max_block;
 }
 
 impl pallet_offences::Config for Test {
diff --git a/frame/offences/src/mock.rs b/frame/offences/src/mock.rs
index 690db58a8718..124b00302940 100644
--- a/frame/offences/src/mock.rs
+++ b/frame/offences/src/mock.rs
@@ -91,12 +91,14 @@ pub fn set_offence_weight(new: Weight) {
 pub struct Runtime;
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
-	pub const MaximumBlockWeight: Weight = 2 * WEIGHT_PER_SECOND;
-	pub const MaximumBlockLength: u32 = 2 * 1024;
-	pub const AvailableBlockRatio: Perbill = Perbill::one();
+	pub BlockWeights: frame_system::limits::BlockWeights =
+		frame_system::limits::BlockWeights::simple_max(2 * WEIGHT_PER_SECOND);
 }
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = ();
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = RocksDbWeight;
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u64;
@@ -108,13 +110,6 @@ impl frame_system::Config for Runtime {
 	type Header = Header;
 	type Event = TestEvent;
 	type BlockHashCount = BlockHashCount;
-	type MaximumBlockWeight = MaximumBlockWeight;
-	type DbWeight = RocksDbWeight;
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = MaximumBlockWeight;
-	type MaximumBlockLength = MaximumBlockLength;
-	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
 	type PalletInfo = ();
 	type AccountData = ();
@@ -124,7 +119,8 @@ impl frame_system::Config for Runtime {
 }
 
 parameter_types! {
-	pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * MaximumBlockWeight::get();
+	pub OffencesWeightSoftLimit: Weight =
+		Perbill::from_percent(60) * BlockWeights::get().max_block;
 }
 
 impl Config for Runtime {
diff --git a/frame/proxy/src/lib.rs b/frame/proxy/src/lib.rs
index 3d707d238367..7a59cdc648a3 100644
--- a/frame/proxy/src/lib.rs
+++ b/frame/proxy/src/lib.rs
@@ -727,6 +727,6 @@ pub mod migration {
 				deposit,
 			))
 		);
-		T::MaximumBlockWeight::get()
+		T::BlockWeights::get().max_block
 	}
 }
diff --git a/frame/proxy/src/tests.rs b/frame/proxy/src/tests.rs
index 0338b983595a..082110523562 100644
--- a/frame/proxy/src/tests.rs
+++ b/frame/proxy/src/tests.rs
@@ -23,11 +23,11 @@ use super::*;
 
 use frame_support::{
 	assert_ok, assert_noop, impl_outer_origin, parameter_types, impl_outer_dispatch,
-	weights::Weight, impl_outer_event, RuntimeDebug, dispatch::DispatchError, traits::Filter,
+	impl_outer_event, RuntimeDebug, dispatch::DispatchError, traits::Filter,
 };
 use codec::{Encode, Decode};
 use sp_core::H256;
-use sp_runtime::{Perbill, traits::{BlakeTwo256, IdentityLookup}, testing::Header};
+use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
 use crate as proxy;
 
 impl_outer_origin! {
@@ -57,12 +57,14 @@ impl_outer_dispatch! {
 pub struct Test;
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
-	pub const MaximumBlockWeight: Weight = 1024;
-	pub const MaximumBlockLength: u32 = 2 * 1024;
-	pub const AvailableBlockRatio: Perbill = Perbill::one();
+	pub BlockWeights: frame_system::limits::BlockWeights =
+		frame_system::limits::BlockWeights::simple_max(1024);
 }
 impl frame_system::Config for Test {
 	type BaseCallFilter = BaseFilter;
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u64;
@@ -74,13 +76,6 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Event = TestEvent;
 	type BlockHashCount = BlockHashCount;
-	type MaximumBlockWeight = MaximumBlockWeight;
-	type DbWeight = ();
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = MaximumBlockWeight;
-	type MaximumBlockLength = MaximumBlockLength;
-	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
 	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u64>;
diff --git a/frame/randomness-collective-flip/src/lib.rs b/frame/randomness-collective-flip/src/lib.rs
index ffa4da978a83..7e0e64f3cc08 100644
--- a/frame/randomness-collective-flip/src/lib.rs
+++ b/frame/randomness-collective-flip/src/lib.rs
@@ -135,12 +135,12 @@ mod tests {
 	use super::*;
 	use sp_core::H256;
 	use sp_runtime::{
-		Perbill,
 		testing::Header,
 		traits::{BlakeTwo256, Header as _, IdentityLookup},
 	};
+	use frame_system::limits;
 	use frame_support::{
-		impl_outer_origin, parameter_types, weights::Weight, traits::{Randomness, OnInitialize},
+		impl_outer_origin, parameter_types, traits::{Randomness, OnInitialize},
 	};
 
 	#[derive(Clone, PartialEq, Eq)]
@@ -152,13 +152,17 @@ mod tests {
 
 	parameter_types! {
 		pub const BlockHashCount: u64 = 250;
-		pub const MaximumBlockWeight: Weight = 1024;
-		pub const MaximumBlockLength: u32 = 2 * 1024;
-		pub const AvailableBlockRatio: Perbill = Perbill::one();
+		pub BlockWeights: limits::BlockWeights = limits::BlockWeights
+			::simple_max(1024);
+		pub BlockLength: limits::BlockLength = limits::BlockLength
+			::max(2 * 1024);
 	}
 
 	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
+		type BlockWeights = ();
+		type BlockLength = BlockLength;
+		type DbWeight = ();
 		type Origin = Origin;
 		type Index = u64;
 		type BlockNumber = u64;
@@ -170,13 +174,6 @@ mod tests {
 		type Header = Header;
 		type Event = ();
 		type BlockHashCount = BlockHashCount;
-		type MaximumBlockWeight = MaximumBlockWeight;
-		type DbWeight = ();
-		type BlockExecutionWeight = ();
-		type ExtrinsicBaseWeight = ();
-		type MaximumExtrinsicWeight = MaximumBlockWeight;
-		type AvailableBlockRatio = AvailableBlockRatio;
-		type MaximumBlockLength = MaximumBlockLength;
 		type Version = ();
 		type PalletInfo = ();
 		type AccountData = ();
diff --git a/frame/recovery/src/mock.rs b/frame/recovery/src/mock.rs
index 9f15f31bd42f..9b991987ceeb 100644
--- a/frame/recovery/src/mock.rs
+++ b/frame/recovery/src/mock.rs
@@ -21,12 +21,11 @@ use super::*;
 
 use frame_support::{
 	impl_outer_origin, impl_outer_dispatch, impl_outer_event, parameter_types,
-	weights::Weight,
 	traits::{OnInitialize, OnFinalize},
 };
 use sp_core::H256;
 use sp_runtime::{
-	Perbill, traits::{BlakeTwo256, IdentityLookup}, testing::Header,
+	traits::{BlakeTwo256, IdentityLookup}, testing::Header,
 };
 use crate as recovery;
 
@@ -53,13 +52,15 @@ pub struct Test;
 
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
-	pub const MaximumBlockWeight: Weight = 1024;
-	pub const MaximumBlockLength: u32 = 2 * 1024;
-	pub const AvailableBlockRatio: Perbill = Perbill::one();
+	pub BlockWeights: frame_system::limits::BlockWeights =
+		frame_system::limits::BlockWeights::simple_max(1024);
 }
 
 impl frame_system::Config for Test {
 	type BaseCallFilter = ();
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
 	type Origin = Origin;
 	type Call = Call;
 	type Index = u64;
@@ -71,13 +72,6 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Event = TestEvent;
 	type BlockHashCount = BlockHashCount;
-	type MaximumBlockWeight = MaximumBlockWeight;
-	type DbWeight = ();
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = MaximumBlockWeight;
-	type MaximumBlockLength = MaximumBlockLength;
-	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
 	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u128>;
diff --git a/frame/scheduler/src/lib.rs b/frame/scheduler/src/lib.rs
index 4cdfe4ddf047..9f0f806233d8 100644
--- a/frame/scheduler/src/lib.rs
+++ b/frame/scheduler/src/lib.rs
@@ -812,12 +812,14 @@ mod tests {
 	pub struct Test;
 	parameter_types! {
 		pub const BlockHashCount: u64 = 250;
-		pub const MaximumBlockWeight: Weight = 2_000_000_000_000;
-		pub const MaximumBlockLength: u32 = 2 * 1024;
-		pub const AvailableBlockRatio: Perbill = Perbill::one();
+		pub BlockWeights: frame_system::limits::BlockWeights =
+			frame_system::limits::BlockWeights::simple_max(2_000_000_000_000);
 	}
 	impl system::Config for Test {
 		type BaseCallFilter = BaseFilter;
+		type BlockWeights = ();
+		type BlockLength = ();
+		type DbWeight = RocksDbWeight;
 		type Origin = Origin;
 		type Call = Call;
 		type Index = u64;
@@ -829,13 +831,6 @@ mod tests {
 		type Header = Header;
 		type Event = ();
 		type BlockHashCount = BlockHashCount;
-		type MaximumBlockWeight = MaximumBlockWeight;
-		type DbWeight = RocksDbWeight;
-		type BlockExecutionWeight = ();
-		type ExtrinsicBaseWeight = ();
-		type MaximumExtrinsicWeight = MaximumBlockWeight;
-		type MaximumBlockLength = MaximumBlockLength;
-		type AvailableBlockRatio = AvailableBlockRatio;
 		type Version = ();
 		type PalletInfo = ();
 		type AccountData = ();
@@ -847,7 +842,7 @@ mod tests {
 		type Event = ();
 	}
 	parameter_types! {
-		pub MaximumSchedulerWeight: Weight = Perbill::from_percent(80) * MaximumBlockWeight::get();
+		pub MaximumSchedulerWeight: Weight = Perbill::from_percent(80) * BlockWeights::get().max_block;
 		pub const MaxScheduledPerBlock: u32 = 10;
 	}
 	ord_parameter_types! {
diff --git a/frame/scored-pool/src/mock.rs b/frame/scored-pool/src/mock.rs
index 537084bb3949..7d49136cef4f 100644
--- a/frame/scored-pool/src/mock.rs
+++ b/frame/scored-pool/src/mock.rs
@@ -20,10 +20,10 @@
 use super::*;
 
 use std::cell::RefCell;
-use frame_support::{impl_outer_origin, parameter_types, weights::Weight, ord_parameter_types};
+use frame_support::{impl_outer_origin, parameter_types, ord_parameter_types};
 use sp_core::H256;
 use sp_runtime::{
-	Perbill, traits::{BlakeTwo256, IdentityLookup}, testing::Header,
+	traits::{BlakeTwo256, IdentityLookup}, testing::Header,
 };
 use frame_system::EnsureSignedBy;
 
@@ -36,13 +36,10 @@ pub struct Test;
 parameter_types! {
 	pub const CandidateDeposit: u64 = 25;
 	pub const Period: u64 = 4;
-
 	pub const BlockHashCount: u64 = 250;
-	pub const MaximumBlockWeight: Weight = 1024;
-	pub const MaximumBlockLength: u32 = 2 * 1024;
-	pub const AvailableBlockRatio: Perbill = Perbill::one();
-
 	pub const ExistentialDeposit: u64 = 1;
+	pub BlockWeights: frame_system::limits::BlockWeights =
+		frame_system::limits::BlockWeights::simple_max(1024);
 }
 ord_parameter_types! {
 	pub const KickOrigin: u64 = 2;
@@ -51,6 +48,9 @@ ord_parameter_types! {
 
 impl frame_system::Config for Test {
 	type BaseCallFilter = ();
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u64;
@@ -62,13 +62,6 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Event = ();
 	type BlockHashCount = BlockHashCount;
-	type MaximumBlockWeight = MaximumBlockWeight;
-	type DbWeight = ();
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = MaximumBlockWeight;
-	type MaximumBlockLength = MaximumBlockLength;
-	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
 	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u64>;
diff --git a/frame/session/benchmarking/src/mock.rs b/frame/session/benchmarking/src/mock.rs
index af3112823d93..9001dee87901 100644
--- a/frame/session/benchmarking/src/mock.rs
+++ b/frame/session/benchmarking/src/mock.rs
@@ -47,6 +47,9 @@ pub struct Test;
 
 impl frame_system::Config for Test {
 	type BaseCallFilter = ();
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
 	type Origin = Origin;
 	type Index = AccountIndex;
 	type BlockNumber = BlockNumber;
@@ -58,13 +61,6 @@ impl frame_system::Config for Test {
 	type Header = sp_runtime::testing::Header;
 	type Event = ();
 	type BlockHashCount = ();
-	type MaximumBlockWeight = ();
-	type DbWeight = ();
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = ();
-	type AvailableBlockRatio = ();
-	type MaximumBlockLength = ();
 	type Version = ();
 	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u64>;
diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs
index 40ae5bed83e4..883a0cc5ab28 100644
--- a/frame/session/src/lib.rs
+++ b/frame/session/src/lib.rs
@@ -549,7 +549,7 @@ decl_module! {
 		fn on_initialize(n: T::BlockNumber) -> Weight {
 			if T::ShouldEndSession::should_end_session(n) {
 				Self::rotate_session();
-				T::MaximumBlockWeight::get()
+				T::BlockWeights::get().max_block
 			} else {
 				// NOTE: the non-database part of the weight for `should_end_session(n)` is
 				// included as weight for empty block, the database part is expected to be in
diff --git a/frame/session/src/mock.rs b/frame/session/src/mock.rs
index d485565db237..0a7f89f5d57f 100644
--- a/frame/session/src/mock.rs
+++ b/frame/session/src/mock.rs
@@ -19,7 +19,7 @@
 
 use super::*;
 use std::cell::RefCell;
-use frame_support::{impl_outer_origin, parameter_types, weights::Weight};
+use frame_support::{impl_outer_origin, parameter_types};
 use sp_core::{crypto::key_types::DUMMY, H256};
 use sp_runtime::{
 	Perbill, impl_opaque_keys,
@@ -165,15 +165,17 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 pub struct Test;
 
 parameter_types! {
-	pub const BlockHashCount: u64 = 250;
-	pub const MaximumBlockWeight: Weight = 1024;
-	pub const MaximumBlockLength: u32 = 2 * 1024;
 	pub const MinimumPeriod: u64 = 5;
-	pub const AvailableBlockRatio: Perbill = Perbill::one();
+	pub const BlockHashCount: u64 = 250;
+	pub BlockWeights: frame_system::limits::BlockWeights =
+		frame_system::limits::BlockWeights::simple_max(1024);
 }
 
 impl frame_system::Config for Test {
 	type BaseCallFilter = ();
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u64;
@@ -185,13 +187,6 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Event = ();
 	type BlockHashCount = BlockHashCount;
-	type MaximumBlockWeight = MaximumBlockWeight;
-	type DbWeight = ();
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = MaximumBlockWeight;
-	type AvailableBlockRatio = AvailableBlockRatio;
-	type MaximumBlockLength = MaximumBlockLength;
 	type Version = ();
 	type PalletInfo = ();
 	type AccountData = ();
diff --git a/frame/society/src/lib.rs b/frame/society/src/lib.rs
index 7859f6659cf2..6fe8a2673b21 100644
--- a/frame/society/src/lib.rs
+++ b/frame/society/src/lib.rs
@@ -533,7 +533,7 @@ decl_module! {
 		///
 		/// Total Complexity: O(M + B + C + logM + logB + X)
 		/// # </weight>
-		#[weight = T::MaximumBlockWeight::get() / 10]
+		#[weight = T::BlockWeights::get().max_block / 10]
 		pub fn bid(origin, value: BalanceOf<T, I>) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			ensure!(!<SuspendedCandidates<T, I>>::contains_key(&who), Error::<T, I>::Suspended);
@@ -572,7 +572,7 @@ decl_module! {
 		///
 		/// Total Complexity: O(B + X)
 		/// # </weight>
-		#[weight = T::MaximumBlockWeight::get() / 10]
+		#[weight = T::BlockWeights::get().max_block / 10]
 		pub fn unbid(origin, pos: u32) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 
@@ -642,7 +642,7 @@ decl_module! {
 		///
 		/// Total Complexity: O(M + B + C + logM + logB + X)
 		/// # </weight>
-		#[weight = T::MaximumBlockWeight::get() / 10]
+		#[weight = T::BlockWeights::get().max_block / 10]
 		pub fn vouch(origin, who: T::AccountId, value: BalanceOf<T, I>, tip: BalanceOf<T, I>) -> DispatchResult {
 			let voucher = ensure_signed(origin)?;
 			// Check user is not suspended.
@@ -683,7 +683,7 @@ decl_module! {
 		///
 		/// Total Complexity: O(B)
 		/// # </weight>
-		#[weight = T::MaximumBlockWeight::get() / 10]
+		#[weight = T::BlockWeights::get().max_block / 10]
 		pub fn unvouch(origin, pos: u32) -> DispatchResult {
 			let voucher = ensure_signed(origin)?;
 			ensure!(Self::vouching(&voucher) == Some(VouchingStatus::Vouching), Error::<T, I>::NotVouching);
@@ -721,7 +721,7 @@ decl_module! {
 		///
 		/// Total Complexity: O(M + logM + C)
 		/// # </weight>
-		#[weight = T::MaximumBlockWeight::get() / 10]
+		#[weight = T::BlockWeights::get().max_block / 10]
 		pub fn vote(origin, candidate: <T::Lookup as StaticLookup>::Source, approve: bool) {
 			let voter = ensure_signed(origin)?;
 			let candidate = T::Lookup::lookup(candidate)?;
@@ -752,7 +752,7 @@ decl_module! {
 		///
 		/// Total Complexity: O(M + logM)
 		/// # </weight>
-		#[weight = T::MaximumBlockWeight::get() / 10]
+		#[weight = T::BlockWeights::get().max_block / 10]
 		pub fn defender_vote(origin, approve: bool) {
 			let voter = ensure_signed(origin)?;
 			let members = <Members<T, I>>::get();
@@ -784,7 +784,7 @@ decl_module! {
 		///
 		/// Total Complexity: O(M + logM + P + X)
 		/// # </weight>
-		#[weight = T::MaximumBlockWeight::get() / 10]
+		#[weight = T::BlockWeights::get().max_block / 10]
 		pub fn payout(origin) {
 			let who = ensure_signed(origin)?;
 
@@ -826,7 +826,7 @@ decl_module! {
 		///
 		/// Total Complexity: O(1)
 		/// # </weight>
-		#[weight = T::MaximumBlockWeight::get() / 10]
+		#[weight = T::BlockWeights::get().max_block / 10]
 		fn found(origin, founder: T::AccountId, max_members: u32, rules: Vec<u8>) {
 			T::FounderSetOrigin::ensure_origin(origin)?;
 			ensure!(!<Head<T, I>>::exists(), Error::<T, I>::AlreadyFounded);
@@ -853,7 +853,7 @@ decl_module! {
 		///
 		/// Total Complexity: O(1)
 		/// # </weight>
-		#[weight = T::MaximumBlockWeight::get() / 10]
+		#[weight = T::BlockWeights::get().max_block / 10]
 		fn unfound(origin) {
 			let founder = ensure_signed(origin)?;
 			ensure!(Founder::<T, I>::get() == Some(founder.clone()), Error::<T, I>::NotFounder);
@@ -895,7 +895,7 @@ decl_module! {
 		///
 		/// Total Complexity: O(M + logM + B)
 		/// # </weight>
-		#[weight = T::MaximumBlockWeight::get() / 10]
+		#[weight = T::BlockWeights::get().max_block / 10]
 		fn judge_suspended_member(origin, who: T::AccountId, forgive: bool) {
 			T::SuspensionJudgementOrigin::ensure_origin(origin)?;
 			ensure!(<SuspendedMembers<T, I>>::contains_key(&who), Error::<T, I>::NotSuspended);
@@ -966,7 +966,7 @@ decl_module! {
 		///
 		/// Total Complexity: O(M + logM + B + X)
 		/// # </weight>
-		#[weight = T::MaximumBlockWeight::get() / 10]
+		#[weight = T::BlockWeights::get().max_block / 10]
 		fn judge_suspended_candidate(origin, who: T::AccountId, judgement: Judgement) {
 			T::SuspensionJudgementOrigin::ensure_origin(origin)?;
 			if let Some((value, kind)) = <SuspendedCandidates<T, I>>::get(&who) {
@@ -1026,7 +1026,7 @@ decl_module! {
 		///
 		/// Total Complexity: O(1)
 		/// # </weight>
-		#[weight = T::MaximumBlockWeight::get() / 10]
+		#[weight = T::BlockWeights::get().max_block / 10]
 		fn set_max_members(origin, max: u32) {
 			ensure_root(origin)?;
 			ensure!(max > 1, Error::<T, I>::MaxMembers);
@@ -1038,13 +1038,14 @@ decl_module! {
 			let mut members = vec![];
 
 			let mut weight = 0;
+			let weights = T::BlockWeights::get();
 
 			// Run a candidate/membership rotation
 			if (n % T::RotationPeriod::get()).is_zero() {
 				members = <Members<T, I>>::get();
 				Self::rotate_period(&mut members);
 
-				weight += T::MaximumBlockWeight::get() / 20;
+				weight += weights.max_block / 20;
 			}
 
 			// Run a challenge rotation
@@ -1055,7 +1056,7 @@ decl_module! {
 				}
 				Self::rotate_challenge(&mut members);
 
-				weight += T::MaximumBlockWeight::get() / 20;
+				weight += weights.max_block / 20;
 			}
 
 			weight
diff --git a/frame/society/src/mock.rs b/frame/society/src/mock.rs
index d4fa1bcfbc74..6a718c218507 100644
--- a/frame/society/src/mock.rs
+++ b/frame/society/src/mock.rs
@@ -25,7 +25,6 @@ use frame_support::{
 };
 use sp_core::H256;
 use sp_runtime::{
-	Perbill,
 	testing::Header,
 	traits::{BlakeTwo256, IdentityLookup},
 };
@@ -45,14 +44,11 @@ parameter_types! {
 	pub const PeriodSpend: u64 = 1000;
 	pub const MaxLockDuration: u64 = 100;
 	pub const ChallengePeriod: u64 = 8;
-
 	pub const BlockHashCount: u64 = 250;
-	pub const MaximumBlockWeight: u32 = 1024;
-	pub const MaximumBlockLength: u32 = 2 * 1024;
-	pub const AvailableBlockRatio: Perbill = Perbill::one();
-
 	pub const ExistentialDeposit: u64 = 1;
 	pub const SocietyModuleId: ModuleId = ModuleId(*b"py/socie");
+	pub BlockWeights: frame_system::limits::BlockWeights =
+		frame_system::limits::BlockWeights::simple_max(1024);
 }
 
 ord_parameter_types! {
@@ -62,6 +58,9 @@ ord_parameter_types! {
 
 impl frame_system::Config for Test {
 	type BaseCallFilter = ();
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u64;
@@ -73,13 +72,6 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Event = ();
 	type BlockHashCount = BlockHashCount;
-	type MaximumBlockWeight = MaximumBlockWeight;
-	type DbWeight = ();
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = MaximumBlockWeight;
-	type MaximumBlockLength = MaximumBlockLength;
-	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
 	type PalletInfo = ();
 	type OnNewAccount = ();
diff --git a/frame/staking/fuzzer/src/mock.rs b/frame/staking/fuzzer/src/mock.rs
index ac9a2b235790..6f58d6a669d7 100644
--- a/frame/staking/fuzzer/src/mock.rs
+++ b/frame/staking/fuzzer/src/mock.rs
@@ -45,11 +45,10 @@ pub struct Test;
 
 impl frame_system::Config for Test {
 	type BaseCallFilter = ();
-	type Origin = Origin;
+	type BlockWeights = ();
+	type BlockLength = ();
 	type DbWeight = ();
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = ();
+	type Origin = Origin;
 	type Index = AccountIndex;
 	type BlockNumber = BlockNumber;
 	type Call = Call;
@@ -60,9 +59,6 @@ impl frame_system::Config for Test {
 	type Header = sp_runtime::testing::Header;
 	type Event = ();
 	type BlockHashCount = ();
-	type MaximumBlockWeight = ();
-	type AvailableBlockRatio = ();
-	type MaximumBlockLength = ();
 	type Version = ();
 	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u64>;
diff --git a/frame/staking/src/benchmarking.rs b/frame/staking/src/benchmarking.rs
index f6aedf760d97..d336bfd1ddda 100644
--- a/frame/staking/src/benchmarking.rs
+++ b/frame/staking/src/benchmarking.rs
@@ -521,7 +521,12 @@ benchmarks! {
 			compact,
 			score,
 			size
-		) = offchain_election::prepare_submission::<T>(assignments, winners, false, T::MaximumBlockWeight::get()).unwrap();
+		) = offchain_election::prepare_submission::<T>(
+			assignments,
+			winners,
+			false,
+			T::BlockWeights::get().max_block,
+		).unwrap();
 
 		assert_eq!(
 			winners.len(), compact.unique_targets().len(),
@@ -589,7 +594,12 @@ benchmarks! {
 			compact,
 			score,
 			size
-		) = offchain_election::prepare_submission::<T>(assignments, winners, false, T::MaximumBlockWeight::get()).unwrap();
+		) = offchain_election::prepare_submission::<T>(
+			assignments,
+			winners,
+			false,
+			T::BlockWeights::get().max_block,
+		).unwrap();
 
 		assert_eq!(
 			winners.len(), compact.unique_targets().len(),
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index 4bc1921c494d..5deae116e5c2 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -129,9 +129,10 @@ pub struct Test;
 
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
-	pub const MaximumBlockWeight: Weight = frame_support::weights::constants::WEIGHT_PER_SECOND * 2;
-	pub const MaximumBlockLength: u32 = 2 * 1024;
-	pub const AvailableBlockRatio: Perbill = Perbill::one();
+	pub BlockWeights: frame_system::limits::BlockWeights =
+		frame_system::limits::BlockWeights::simple_max(
+			frame_support::weights::constants::WEIGHT_PER_SECOND * 2
+		);
 	pub const MaxLocks: u32 = 1024;
 	pub static SessionsPerEra: SessionIndex = 3;
 	pub static ExistentialDeposit: Balance = 0;
@@ -143,6 +144,9 @@ parameter_types! {
 
 impl frame_system::Config for Test {
 	type BaseCallFilter = ();
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = RocksDbWeight;
 	type Origin = Origin;
 	type Index = AccountIndex;
 	type BlockNumber = BlockNumber;
@@ -154,13 +158,6 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Event = MetaEvent;
 	type BlockHashCount = BlockHashCount;
-	type MaximumBlockWeight = MaximumBlockWeight;
-	type DbWeight = RocksDbWeight;
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = MaximumBlockWeight;
-	type AvailableBlockRatio = AvailableBlockRatio;
-	type MaximumBlockLength = MaximumBlockLength;
 	type Version = ();
 	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<Balance>;
@@ -235,7 +232,7 @@ parameter_types! {
 	pub const MaxNominatorRewardedPerValidator: u32 = 64;
 	pub const UnsignedPriority: u64 = 1 << 20;
 	pub const MinSolutionScoreBump: Perbill = Perbill::zero();
-	pub const OffchainSolutionWeightLimit: Weight = MaximumBlockWeight::get();
+	pub OffchainSolutionWeightLimit: Weight = BlockWeights::get().max_block;
 }
 
 thread_local! {
diff --git a/frame/staking/src/testing_utils.rs b/frame/staking/src/testing_utils.rs
index 9b6df1f2d48d..2f198166d7ee 100644
--- a/frame/staking/src/testing_utils.rs
+++ b/frame/staking/src/testing_utils.rs
@@ -301,7 +301,7 @@ pub fn get_seq_phragmen_solution<T: Config>(
 		assignments,
 		winners,
 		do_reduce,
-		T::MaximumBlockWeight::get(),
+		T::BlockWeights::get().max_block,
 	)
 	.unwrap()
 }
diff --git a/frame/sudo/src/mock.rs b/frame/sudo/src/mock.rs
index c21f7895264b..12707d3e9da6 100644
--- a/frame/sudo/src/mock.rs
+++ b/frame/sudo/src/mock.rs
@@ -23,10 +23,11 @@ use frame_support::{
 	weights::Weight,
 };
 use sp_core::H256;
-use sp_runtime::{Perbill, traits::{BlakeTwo256, IdentityLookup}, testing::Header};
+use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
 use sp_io;
 use crate as sudo;
 use frame_support::traits::Filter;
+use frame_system::limits;
 
 // Logger module to track execution.
 pub mod logger {
@@ -106,9 +107,7 @@ pub struct Test;
 
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
-	pub const MaximumBlockWeight: Weight = 1024;
-	pub const MaximumBlockLength: u32 = 2 * 1024;
-	pub const AvailableBlockRatio: Perbill = Perbill::one();
+	pub BlockWeights: limits::BlockWeights = limits::BlockWeights::simple_max(1024);
 }
 
 pub struct BlockEverything;
@@ -120,6 +119,9 @@ impl Filter<Call> for BlockEverything {
 
 impl frame_system::Config for Test {
 	type BaseCallFilter = BlockEverything;
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
 	type Origin = Origin;
 	type Call = Call;
 	type Index = u64;
@@ -131,13 +133,6 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Event = TestEvent;
 	type BlockHashCount = BlockHashCount;
-	type MaximumBlockWeight = MaximumBlockWeight;
-	type DbWeight = ();
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = MaximumBlockWeight;
-	type MaximumBlockLength = MaximumBlockLength;
-	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
 	type PalletInfo = ();
 	type AccountData = ();
diff --git a/frame/support/src/weights.rs b/frame/support/src/weights.rs
index 6a62befd6d5c..d4dda427ef1c 100644
--- a/frame/support/src/weights.rs
+++ b/frame/support/src/weights.rs
@@ -213,6 +213,9 @@ impl Default for Pays {
 }
 
 /// A generalized group of dispatch types.
+///
+/// NOTE whenever upgrading the enum make sure to also update
+/// [DispatchClass::all] and [DispatchClass::non_mandatory] helper functions.
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
 #[derive(PartialEq, Eq, Clone, Copy, Encode, Decode, RuntimeDebug)]
@@ -242,6 +245,39 @@ impl Default for DispatchClass {
 	}
 }
 
+impl DispatchClass {
+	/// Returns an array containing all dispatch classes.
+	pub fn all() -> &'static [DispatchClass] {
+		&[DispatchClass::Normal, DispatchClass::Operational, DispatchClass::Mandatory]
+	}
+
+	/// Returns an array of all dispatch classes except `Mandatory`.
+	pub fn non_mandatory() -> &'static [DispatchClass] {
+		&[DispatchClass::Normal, DispatchClass::Operational]
+	}
+}
+
+/// A trait that represents one or many values of given type.
+///
+/// Useful to accept as parameter type to let the caller pass either a single value directly
+/// or an iterator.
+pub trait OneOrMany<T> {
+	/// The iterator type.
+	type Iter: Iterator<Item = T>;
+	/// Convert this item into an iterator.
+	fn into_iter(self) -> Self::Iter;
+}
+
+impl OneOrMany<DispatchClass> for DispatchClass {
+    type Iter = sp_std::iter::Once<DispatchClass>;
+    fn into_iter(self) -> Self::Iter { sp_std::iter::once(self) }
+}
+
+impl<'a> OneOrMany<DispatchClass> for &'a [DispatchClass] {
+    type Iter = sp_std::iter::Cloned<sp_std::slice::Iter<'a, DispatchClass>>;
+    fn into_iter(self) -> Self::Iter { self.iter().cloned() }
+}
+
 /// Primitives related to priority management of Frame.
 pub mod priority {
 	/// The starting point of all Operational transactions. 3/4 of u64::max_value().
@@ -695,6 +731,87 @@ impl<T> WeightToFeePolynomial for IdentityFee<T> where
 	}
 }
 
+/// A struct holding value for each `DispatchClass`.
+#[derive(Clone, Eq, PartialEq, Default, RuntimeDebug, Encode, Decode)]
+pub struct PerDispatchClass<T> {
+	/// Value for `Normal` extrinsics.
+	normal: T,
+	/// Value for `Operational` extrinsics.
+	operational: T,
+	/// Value for `Mandatory` extrinsics.
+	mandatory: T,
+}
+
+impl<T> PerDispatchClass<T> {
+	/// Create new `PerDispatchClass` with the same value for every class.
+	pub fn new(val: impl Fn(DispatchClass) -> T) -> Self {
+		Self {
+			normal: val(DispatchClass::Normal),
+			operational: val(DispatchClass::Operational),
+			mandatory: val(DispatchClass::Mandatory),
+		}
+	}
+
+	/// Get a mutable reference to current value of given class.
+	pub fn get_mut(&mut self, class: DispatchClass) -> &mut T {
+		match class {
+			DispatchClass::Operational => &mut self.operational,
+			DispatchClass::Normal => &mut self.normal,
+			DispatchClass::Mandatory => &mut self.mandatory,
+		}
+	}
+
+	/// Get current value for given class.
+	pub fn get(&self, class: DispatchClass) -> &T {
+		match class {
+			DispatchClass::Normal => &self.normal,
+			DispatchClass::Operational => &self.operational,
+			DispatchClass::Mandatory => &self.mandatory,
+		}
+	}
+}
+
+impl<T: Clone> PerDispatchClass<T> {
+	/// Set the value of given class.
+	pub fn set(&mut self, new: T, class: impl OneOrMany<DispatchClass>) {
+		for class in class.into_iter() {
+			*self.get_mut(class) = new.clone();
+		}
+	}
+}
+
+impl PerDispatchClass<Weight> {
+	/// Returns the total weight consumed by all extrinsics in the block.
+	pub fn total(&self) -> Weight {
+		let mut sum = 0;
+		for class in DispatchClass::all() {
+			sum = sum.saturating_add(*self.get(*class));
+		}
+		sum
+	}
+
+	/// Add some weight of a specific dispatch class, saturating at the numeric bounds of `Weight`.
+	pub fn add(&mut self, weight: Weight, class: DispatchClass) {
+		let value = self.get_mut(class);
+		*value = value.saturating_add(weight);
+	}
+
+	/// Try to add some weight of a specific dispatch class, returning Err(()) if overflow would
+	/// occur.
+	pub fn checked_add(&mut self, weight: Weight, class: DispatchClass) -> Result<(), ()> {
+		let value = self.get_mut(class);
+		*value = value.checked_add(weight).ok_or(())?;
+		Ok(())
+	}
+
+	/// Subtract some weight of a specific dispatch class, saturating at the numeric bounds of
+	/// `Weight`.
+	pub fn sub(&mut self, weight: Weight, class: DispatchClass) {
+		let value = self.get_mut(class);
+		*value = value.saturating_sub(weight);
+	}
+}
+
 #[cfg(test)]
 #[allow(dead_code)]
 mod tests {
diff --git a/frame/support/test/tests/pallet_with_name_trait_is_valid.rs b/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
index 3bb5e0ce6679..01b965f3b514 100644
--- a/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
+++ b/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
@@ -117,9 +117,6 @@ mod tests {
 
 	parameter_types! {
 		pub const BlockHashCount: u64 = 250;
-		pub const MaximumBlockWeight: frame_support::weights::Weight = 1024;
-		pub const MaximumBlockLength: u32 = 2 * 1024;
-		pub const AvailableBlockRatio: sp_runtime::Perbill = sp_runtime::Perbill::one();
 	}
 
 	impl frame_system::Config for Runtime {
@@ -135,13 +132,9 @@ mod tests {
 		type Header = TestHeader;
 		type Event = ();
 		type BlockHashCount = BlockHashCount;
-		type MaximumBlockWeight = MaximumBlockWeight;
 		type DbWeight = ();
-		type BlockExecutionWeight = ();
-		type ExtrinsicBaseWeight = ();
-		type MaximumExtrinsicWeight = MaximumBlockWeight;
-		type MaximumBlockLength = MaximumBlockLength;
-		type AvailableBlockRatio = AvailableBlockRatio;
+		type BlockWeights = ();
+		type BlockLength = ();
 		type Version = ();
 		type PalletInfo = ();
 		type AccountData = ();
diff --git a/frame/system/benches/bench.rs b/frame/system/benches/bench.rs
index bedb99b9f894..490931748863 100644
--- a/frame/system/benches/bench.rs
+++ b/frame/system/benches/bench.rs
@@ -54,14 +54,22 @@ impl_outer_event! {
 
 frame_support::parameter_types! {
 	pub const BlockHashCount: u64 = 250;
-	pub const MaximumBlockWeight: Weight = 4 * 1024 * 1024;
-	pub const MaximumBlockLength: u32 = 4 * 1024 * 1024;
-	pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);
+	pub BlockWeights: frame_system::limits::BlockWeights =
+		frame_system::limits::BlockWeights::with_sensible_defaults(
+			4 * 1024 * 1024, Perbill::from_percent(75),
+		);
+	pub BlockLength: frame_system::limits::BlockLength =
+		frame_system::limits::BlockLength::max_with_normal_ratio(
+			4 * 1024 * 1024, Perbill::from_percent(75),
+		);
 }
 #[derive(Clone, Eq, PartialEq)]
 pub struct Runtime;
 impl system::Config for Runtime {
 	type BaseCallFilter = ();
+	type BlockWeights = ();
+	type BlockLength = BlockLength;
+	type DbWeight = ();
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u64;
@@ -73,13 +81,6 @@ impl system::Config for Runtime {
 	type Header = Header;
 	type Event = Event;
 	type BlockHashCount = BlockHashCount;
-	type MaximumBlockWeight = MaximumBlockWeight;
-	type DbWeight = ();
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = MaximumBlockWeight;
-	type MaximumBlockLength = MaximumBlockLength;
-	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
 	type PalletInfo = ();
 	type AccountData = ();
diff --git a/frame/system/benchmarking/src/lib.rs b/frame/system/benchmarking/src/lib.rs
index 1f5437543369..ae898a6ecaa8 100644
--- a/frame/system/benchmarking/src/lib.rs
+++ b/frame/system/benchmarking/src/lib.rs
@@ -25,8 +25,10 @@ use sp_std::prelude::*;
 use sp_core::{ChangesTrieConfiguration, storage::well_known_keys};
 use sp_runtime::traits::Hash;
 use frame_benchmarking::{benchmarks, whitelisted_caller};
-use frame_support::traits::Get;
-use frame_support::storage::{self, StorageMap};
+use frame_support::{
+	storage::{self, StorageMap},
+	traits::Get,
+};
 use frame_system::{Module as System, Call, RawOrigin, DigestItemOf, AccountInfo};
 
 mod mock;
@@ -38,7 +40,7 @@ benchmarks! {
 	_ { }
 
 	remark {
-		let b in 0 .. T::MaximumBlockLength::get();
+		let b in 0 .. T::BlockWeights::get().max_block as u32;
 		let remark_message = vec![1; b as usize];
 		let caller = whitelisted_caller();
 	}: _(RawOrigin::Signed(caller), remark_message)
diff --git a/frame/system/benchmarking/src/mock.rs b/frame/system/benchmarking/src/mock.rs
index b6ebecc9bb0d..8cfd70b2f095 100644
--- a/frame/system/benchmarking/src/mock.rs
+++ b/frame/system/benchmarking/src/mock.rs
@@ -52,6 +52,9 @@ pub struct Test;
 
 impl frame_system::Config for Test {
 	type BaseCallFilter = ();
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
 	type Origin = Origin;
 	type Index = AccountIndex;
 	type BlockNumber = BlockNumber;
@@ -63,13 +66,6 @@ impl frame_system::Config for Test {
 	type Header = sp_runtime::testing::Header;
 	type Event = ();
 	type BlockHashCount = ();
-	type MaximumBlockWeight = ();
-	type DbWeight = ();
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = ();
-	type AvailableBlockRatio = ();
-	type MaximumBlockLength = ();
 	type Version = ();
 	type PalletInfo = ();
 	type AccountData = ();
diff --git a/frame/system/src/extensions/check_weight.rs b/frame/system/src/extensions/check_weight.rs
index 6dfff865d45b..fc74b03a61cc 100644
--- a/frame/system/src/extensions/check_weight.rs
+++ b/frame/system/src/extensions/check_weight.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::{Config, Module};
+use crate::{limits::BlockWeights, Config, Module};
 use codec::{Encode, Decode};
 use sp_runtime::{
 	traits::{SignedExtension, DispatchInfoOf, Dispatchable, PostDispatchInfoOf, Printable},
@@ -23,7 +23,7 @@ use sp_runtime::{
 		ValidTransaction, TransactionValidityError, InvalidTransaction, TransactionValidity,
 		TransactionPriority,
 	},
-	Perbill, DispatchResult,
+	DispatchResult,
 };
 use frame_support::{
 	traits::{Get},
@@ -36,52 +36,19 @@ use frame_support::{
 pub struct CheckWeight<T: Config + Send + Sync>(sp_std::marker::PhantomData<T>);
 
 impl<T: Config + Send + Sync> CheckWeight<T> where
-	T::Call: Dispatchable<Info=DispatchInfo, PostInfo=PostDispatchInfo>
+	T::Call: Dispatchable<Info=DispatchInfo, PostInfo=PostDispatchInfo>,
 {
-	/// Get the quota ratio of each dispatch class type. This indicates that all operational and mandatory
-	/// dispatches can use the full capacity of any resource, while user-triggered ones can consume
-	/// a portion.
-	fn get_dispatch_limit_ratio(class: DispatchClass) -> Perbill {
-		match class {
-			DispatchClass::Operational | DispatchClass::Mandatory
-				=> <Perbill as sp_runtime::PerThing>::one(),
-			DispatchClass::Normal => T::AvailableBlockRatio::get(),
-		}
-	}
-
-	/// Checks if the current extrinsic does not exceed `MaximumExtrinsicWeight` limit.
+	/// Checks if the current extrinsic does not exceed the maximum weight a single extrinsic
+	/// with given `DispatchClass` can have.
 	fn check_extrinsic_weight(
 		info: &DispatchInfoOf<T::Call>,
 	) -> Result<(), TransactionValidityError> {
-		match info.class {
-			// Mandatory transactions are included in a block unconditionally, so
-			// we don't verify weight.
-			DispatchClass::Mandatory => Ok(()),
-			// Normal transactions must not exceed `MaximumExtrinsicWeight`.
-			DispatchClass::Normal => {
-				let maximum_weight = T::MaximumExtrinsicWeight::get();
-				let extrinsic_weight = info.weight.saturating_add(T::ExtrinsicBaseWeight::get());
-				if extrinsic_weight > maximum_weight {
-					Err(InvalidTransaction::ExhaustsResources.into())
-				} else {
-					Ok(())
-				}
-			},
-			// For operational transactions we make sure it doesn't exceed
-			// the space alloted for `Operational` class.
-			DispatchClass::Operational => {
-				let maximum_weight = T::MaximumBlockWeight::get();
-				let operational_limit =
-					Self::get_dispatch_limit_ratio(DispatchClass::Operational) * maximum_weight;
-				let operational_limit =
-					operational_limit.saturating_sub(T::BlockExecutionWeight::get());
-				let extrinsic_weight = info.weight.saturating_add(T::ExtrinsicBaseWeight::get());
-				if extrinsic_weight > operational_limit {
-					Err(InvalidTransaction::ExhaustsResources.into())
-				} else {
-					Ok(())
-				}
+		let max = T::BlockWeights::get().get(info.class).max_extrinsic;
+		match max {
+			Some(max) if info.weight > max => {
+				Err(InvalidTransaction::ExhaustsResources.into())
 			},
+			_ => Ok(()),
 		}
 	}
 
@@ -90,51 +57,10 @@ impl<T: Config + Send + Sync> CheckWeight<T> where
 	/// Upon successes, it returns the new block weight as a `Result`.
 	fn check_block_weight(
 		info: &DispatchInfoOf<T::Call>,
-	) -> Result<crate::weight::ExtrinsicsWeight, TransactionValidityError> {
-		let maximum_weight = T::MaximumBlockWeight::get();
-		let mut all_weight = Module::<T>::block_weight();
-		match info.class {
-			// If we have a dispatch that must be included in the block, it ignores all the limits.
-			DispatchClass::Mandatory => {
-				let extrinsic_weight = info.weight.saturating_add(T::ExtrinsicBaseWeight::get());
-				all_weight.add(extrinsic_weight, DispatchClass::Mandatory);
-				Ok(all_weight)
-			},
-			// If we have a normal dispatch, we follow all the normal rules and limits.
-			DispatchClass::Normal => {
-				let normal_limit = Self::get_dispatch_limit_ratio(DispatchClass::Normal) * maximum_weight;
-				let extrinsic_weight = info.weight.checked_add(T::ExtrinsicBaseWeight::get())
-					.ok_or(InvalidTransaction::ExhaustsResources)?;
-				all_weight.checked_add(extrinsic_weight, DispatchClass::Normal)
-					.map_err(|_| InvalidTransaction::ExhaustsResources)?;
-				if all_weight.get(DispatchClass::Normal) > normal_limit {
-					Err(InvalidTransaction::ExhaustsResources.into())
-				} else {
-					Ok(all_weight)
-				}
-			},
-			// If we have an operational dispatch, allow it if we have not used our full
-			// "operational space" (independent of existing fullness).
-			DispatchClass::Operational => {
-				let operational_limit = Self::get_dispatch_limit_ratio(DispatchClass::Operational) * maximum_weight;
-				let normal_limit = Self::get_dispatch_limit_ratio(DispatchClass::Normal) * maximum_weight;
-				let operational_space = operational_limit.saturating_sub(normal_limit);
-
-				let extrinsic_weight = info.weight.checked_add(T::ExtrinsicBaseWeight::get())
-					.ok_or(InvalidTransaction::ExhaustsResources)?;
-				all_weight.checked_add(extrinsic_weight, DispatchClass::Operational)
-					.map_err(|_| InvalidTransaction::ExhaustsResources)?;
-
-				// If it would fit in normally, its okay
-				if all_weight.total() <= maximum_weight ||
-				// If we have not used our operational space
-				all_weight.get(DispatchClass::Operational) <= operational_space {
-					Ok(all_weight)
-				} else {
-					Err(InvalidTransaction::ExhaustsResources.into())
-				}
-			}
-		}
+	) -> Result<crate::ConsumedWeight, TransactionValidityError> {
+		let maximum_weight = T::BlockWeights::get();
+		let all_weight = Module::<T>::block_weight();
+		calculate_consumed_weight::<T::Call>(maximum_weight, all_weight, info)
 	}
 
 	/// Checks if the current extrinsic can fit into the block with respect to block length limits.
@@ -144,19 +70,18 @@ impl<T: Config + Send + Sync> CheckWeight<T> where
 		info: &DispatchInfoOf<T::Call>,
 		len: usize,
 	) -> Result<u32, TransactionValidityError> {
+		let length_limit = T::BlockLength::get();
 		let current_len = Module::<T>::all_extrinsics_len();
-		let maximum_len = T::MaximumBlockLength::get();
-		let limit = Self::get_dispatch_limit_ratio(info.class) * maximum_len;
 		let added_len = len as u32;
 		let next_len = current_len.saturating_add(added_len);
-		if next_len > limit {
+		if next_len > *length_limit.max.get(info.class) {
 			Err(InvalidTransaction::ExhaustsResources.into())
 		} else {
 			Ok(next_len)
 		}
 	}
 
-	/// get the priority of an extrinsic denoted by `info`.
+	/// Get the priority of an extrinsic denoted by `info`.
 	///
 	/// Operational transaction will be given a fixed initial amount to be fairly distinguished from
 	/// the normal ones.
@@ -213,6 +138,53 @@ impl<T: Config + Send + Sync> CheckWeight<T> where
 	}
 }
 
+pub fn calculate_consumed_weight<Call>(
+	maximum_weight: BlockWeights,
+	mut all_weight: crate::ConsumedWeight,
+	info: &DispatchInfoOf<Call>,
+) -> Result<crate::ConsumedWeight, TransactionValidityError> where
+	Call: Dispatchable<Info=DispatchInfo, PostInfo=PostDispatchInfo>,
+{
+	let extrinsic_weight = info.weight.saturating_add(maximum_weight.get(info.class).base_extrinsic);
+	let limit_per_class = maximum_weight.get(info.class);
+
+	// add the weight. If class is unlimited, use saturating add instead of checked one.
+	if limit_per_class.max_total.is_none() && limit_per_class.reserved.is_none() {
+		all_weight.add(extrinsic_weight, info.class)
+	} else {
+		all_weight.checked_add(extrinsic_weight, info.class)
+			.map_err(|_| InvalidTransaction::ExhaustsResources)?;
+	}
+
+	let per_class = *all_weight.get(info.class);
+
+	// Check if we don't exceed per-class allowance
+	match limit_per_class.max_total {
+		Some(max) if per_class > max => {
+			return Err(InvalidTransaction::ExhaustsResources.into());
+		},
+		// There is no `max_total` limit (`None`),
+		// or we are below the limit.
+		_ => {},
+	}
+
+	// In cases total block weight is exceeded, we need to fall back
+	// to `reserved` pool if there is any.
+	if all_weight.total() > maximum_weight.max_block {
+		match limit_per_class.reserved {
+			// We are over the limit in reserved pool.
+			Some(reserved) if per_class > reserved => {
+				return Err(InvalidTransaction::ExhaustsResources.into());
+			}
+			// There is either no limit in reserved pool (`None`),
+			// or we are below the limit.
+			_ => {},
+		}
+	}
+
+	Ok(all_weight)
+}
+
 impl<T: Config + Send + Sync> SignedExtension for CheckWeight<T> where
 	T::Call: Dispatchable<Info=DispatchInfo, PostInfo=PostDispatchInfo>
 {
@@ -277,7 +249,7 @@ impl<T: Config + Send + Sync> SignedExtension for CheckWeight<T> where
 		// to them actually being useful. Block producers are thus not allowed to include mandatory
 		// extrinsics that result in error.
 		if let (DispatchClass::Mandatory, Err(e)) = (info.class, result) {
-			"Bad mandantory".print();
+			"Bad mandatory".print();
 			e.print();
 
 			Err(InvalidTransaction::BadMandatory)?
@@ -315,12 +287,21 @@ mod tests {
 	use frame_support::{assert_ok, assert_noop};
 	use frame_support::weights::{Weight, Pays};
 
+	fn block_weights() -> crate::limits::BlockWeights {
+		<Test as crate::Config>::BlockWeights::get()
+	}
+
 	fn normal_weight_limit() -> Weight {
-		<Test as Config>::AvailableBlockRatio::get() * <Test as Config>::MaximumBlockWeight::get()
+		block_weights().get(DispatchClass::Normal).max_total
+			.unwrap_or_else(|| block_weights().max_block)
+	}
+
+	fn block_weight_limit() -> Weight {
+		block_weights().max_block
 	}
 
 	fn normal_length_limit() -> u32 {
-		<Test as Config>::AvailableBlockRatio::get() * <Test as Config>::MaximumBlockLength::get()
+		*<Test as Config>::BlockLength::get().max.get(DispatchClass::Normal)
 	}
 
 	#[test]
@@ -341,7 +322,7 @@ mod tests {
 		check(|max, len| {
 			assert_ok!(CheckWeight::<Test>::do_pre_dispatch(max, len));
 			assert_eq!(System::block_weight().total(), Weight::max_value());
-			assert!(System::block_weight().total() > <Test as Config>::MaximumBlockWeight::get());
+			assert!(System::block_weight().total() > block_weight_limit());
 		});
 		check(|max, len| {
 			assert_ok!(CheckWeight::<Test>::do_validate(max, len));
@@ -352,7 +333,7 @@ mod tests {
 	fn normal_extrinsic_limited_by_maximum_extrinsic_weight() {
 		new_test_ext().execute_with(|| {
 			let max = DispatchInfo {
-				weight: <Test as Config>::MaximumExtrinsicWeight::get() + 1,
+				weight: block_weights().get(DispatchClass::Normal).max_extrinsic.unwrap() + 1,
 				class: DispatchClass::Normal,
 				..Default::default()
 			};
@@ -368,13 +349,12 @@ mod tests {
 	#[test]
 	fn operational_extrinsic_limited_by_operational_space_limit() {
 		new_test_ext().execute_with(|| {
-			let operational_limit = CheckWeight::<Test>::get_dispatch_limit_ratio(
-				DispatchClass::Operational
-			) * <Test as Config>::MaximumBlockWeight::get();
-			let base_weight = <Test as Config>::ExtrinsicBaseWeight::get();
-			let block_base = <Test as Config>::BlockExecutionWeight::get();
+			let weights = block_weights();
+			let operational_limit = weights.get(DispatchClass::Operational).max_total
+				.unwrap_or_else(|| weights.max_block);
+			let base_weight = weights.get(DispatchClass::Normal).base_extrinsic;
 
-			let weight = operational_limit - base_weight - block_base;
+			let weight = operational_limit - base_weight;
 			let okay = DispatchInfo {
 				weight,
 				class: DispatchClass::Operational,
@@ -406,7 +386,7 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			System::register_extra_weight_unchecked(Weight::max_value(), DispatchClass::Normal);
 			assert_eq!(System::block_weight().total(), Weight::max_value());
-			assert!(System::block_weight().total() > <Test as Config>::MaximumBlockWeight::get());
+			assert!(System::block_weight().total() > block_weight_limit());
 		});
 	}
 
@@ -426,8 +406,8 @@ mod tests {
 			assert_ok!(CheckWeight::<Test>::do_pre_dispatch(&max_normal, len));
 			assert_eq!(System::block_weight().total(), 768);
 			assert_ok!(CheckWeight::<Test>::do_pre_dispatch(&rest_operational, len));
-			assert_eq!(<Test as Config>::MaximumBlockWeight::get(), 1024);
-			assert_eq!(System::block_weight().total(), <Test as Config>::MaximumBlockWeight::get());
+			assert_eq!(block_weight_limit(), 1024);
+			assert_eq!(System::block_weight().total(), block_weight_limit());
 			// Checking single extrinsic should not take current block weight into account.
 			assert_eq!(CheckWeight::<Test>::check_extrinsic_weight(&rest_operational), Ok(()));
 		});
@@ -446,8 +426,8 @@ mod tests {
 			// Extra 15 here from block execution + base extrinsic weight
 			assert_eq!(System::block_weight().total(), 266);
 			assert_ok!(CheckWeight::<Test>::do_pre_dispatch(&max_normal, len));
-			assert_eq!(<Test as Config>::MaximumBlockWeight::get(), 1024);
-			assert_eq!(System::block_weight().total(), <Test as Config>::MaximumBlockWeight::get());
+			assert_eq!(block_weight_limit(), 1024);
+			assert_eq!(System::block_weight().total(), block_weight_limit());
 		});
 	}
 
@@ -486,7 +466,7 @@ mod tests {
 
 			// given almost full block
 			BlockWeight::mutate(|current_weight| {
-				current_weight.put(normal_limit, DispatchClass::Normal)
+				current_weight.set(normal_limit, DispatchClass::Normal)
 			});
 			// will not fit.
 			assert!(CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &normal, len).is_err());
@@ -552,19 +532,20 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			let normal_limit = normal_weight_limit();
 			let small = DispatchInfo { weight: 100, ..Default::default() };
+			let base_extrinsic = block_weights().get(DispatchClass::Normal).base_extrinsic;
 			let medium = DispatchInfo {
-				weight: normal_limit - <Test as Config>::ExtrinsicBaseWeight::get(),
+				weight: normal_limit - base_extrinsic,
 				..Default::default()
 			};
 			let big = DispatchInfo {
-				weight: normal_limit - <Test as Config>::ExtrinsicBaseWeight::get() + 1,
+				weight: normal_limit - base_extrinsic + 1,
 				..Default::default()
 			};
 			let len = 0_usize;
 
 			let reset_check_weight = |i, f, s| {
 				BlockWeight::mutate(|current_weight| {
-					current_weight.put(s, DispatchClass::Normal)
+					current_weight.set(s, DispatchClass::Normal)
 				});
 				let r = CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, i, len);
 				if f { assert!(r.is_err()) } else { assert!(r.is_ok()) }
@@ -586,10 +567,12 @@ mod tests {
 				pays_fee: Default::default(),
 			};
 			let len = 0_usize;
+			let base_extrinsic = block_weights().get(DispatchClass::Normal).base_extrinsic;
 
 			// We allow 75% for normal transaction, so we put 25% - extrinsic base weight
 			BlockWeight::mutate(|current_weight| {
-				current_weight.put(256 - <Test as Config>::ExtrinsicBaseWeight::get(), DispatchClass::Normal)
+				current_weight.set(0, DispatchClass::Mandatory);
+				current_weight.set(256 - base_extrinsic, DispatchClass::Normal);
 			});
 
 			let pre = CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &info, len).unwrap();
@@ -617,13 +600,14 @@ mod tests {
 			let len = 0_usize;
 
 			BlockWeight::mutate(|current_weight| {
-				current_weight.put(128, DispatchClass::Normal)
+				current_weight.set(0, DispatchClass::Mandatory);
+				current_weight.set(128, DispatchClass::Normal);
 			});
 
 			let pre = CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &info, len).unwrap();
 			assert_eq!(
 				BlockWeight::get().total(),
-				info.weight + 128 + <Test as Config>::ExtrinsicBaseWeight::get(),
+				info.weight + 128 + block_weights().get(DispatchClass::Normal).base_extrinsic,
 			);
 
 			assert!(
@@ -632,7 +616,7 @@ mod tests {
 			);
 			assert_eq!(
 				BlockWeight::get().total(),
-				info.weight + 128 + <Test as Config>::ExtrinsicBaseWeight::get(),
+				info.weight + 128 + block_weights().get(DispatchClass::Normal).base_extrinsic,
 			);
 		})
 	}
@@ -640,17 +624,81 @@ mod tests {
 	#[test]
 	fn zero_weight_extrinsic_still_has_base_weight() {
 		new_test_ext().execute_with(|| {
+			let weights = block_weights();
 			let free = DispatchInfo { weight: 0, ..Default::default() };
 			let len = 0_usize;
 
-			// Initial weight from `BlockExecutionWeight`
-			assert_eq!(System::block_weight().total(), <Test as Config>::BlockExecutionWeight::get());
+			// Initial weight from `weights.base_block`
+			assert_eq!(
+				System::block_weight().total(),
+				weights.base_block
+			);
 			let r = CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &free, len);
 			assert!(r.is_ok());
 			assert_eq!(
 				System::block_weight().total(),
-				<Test as Config>::ExtrinsicBaseWeight::get() + <Test as Config>::BlockExecutionWeight::get()
+				weights.get(DispatchClass::Normal).base_extrinsic + weights.base_block
 			);
 		})
 	}
+
+	#[test]
+	fn normal_and_mandatory_tracked_separately() {
+		new_test_ext().execute_with(|| {
+			// Max block is 1024
+			// Max normal is 768 (75%)
+			// Max mandatory is unlimited
+			let max_normal = DispatchInfo { weight: 753, ..Default::default() };
+			let mandatory = DispatchInfo { weight: 1019, class: DispatchClass::Mandatory, ..Default::default() };
+
+			let len = 0_usize;
+
+			assert_ok!(CheckWeight::<Test>::do_pre_dispatch(&max_normal, len));
+			assert_eq!(System::block_weight().total(), 768);
+			assert_ok!(CheckWeight::<Test>::do_pre_dispatch(&mandatory, len));
+			assert_eq!(block_weight_limit(), 1024);
+			assert_eq!(System::block_weight().total(), 1024 + 768);
+			assert_eq!(CheckWeight::<Test>::check_extrinsic_weight(&mandatory), Ok(()));
+		});
+	}
+
+	#[test]
+	fn no_max_total_should_still_be_limited_by_max_block() {
+		// given
+		let maximum_weight = BlockWeights::builder()
+			.base_block(0)
+			.for_class(DispatchClass::non_mandatory(), |w| {
+				w.base_extrinsic = 0;
+				w.max_total = Some(20);
+			})
+			.for_class(DispatchClass::Mandatory, |w| {
+				w.base_extrinsic = 0;
+				w.reserved = Some(5);
+				w.max_total = None;
+			})
+			.build_or_panic();
+		let all_weight = crate::ConsumedWeight::new(|class| match class {
+			DispatchClass::Normal => 10,
+			DispatchClass::Operational => 10,
+			DispatchClass::Mandatory => 0,
+		});
+		assert_eq!(maximum_weight.max_block, all_weight.total());
+
+		// fits into reserved
+		let mandatory1 = DispatchInfo { weight: 5, class: DispatchClass::Mandatory, ..Default::default() };
+		// does not fit into reserved and the block is full.
+		let mandatory2 = DispatchInfo { weight: 6, class: DispatchClass::Mandatory, ..Default::default() };
+
+		// when
+		let result1 = calculate_consumed_weight::<<Test as Config>::Call>(
+			maximum_weight.clone(), all_weight.clone(), &mandatory1
+		);
+		let result2 = calculate_consumed_weight::<<Test as Config>::Call>(
+			maximum_weight, all_weight, &mandatory2
+		);
+
+		// then
+		assert!(result2.is_err());
+		assert!(result1.is_ok());
+	}
 }
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index 3c13ac553970..7273ca09aabb 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -122,7 +122,7 @@ use frame_support::{
 	},
 	weights::{
 		Weight, RuntimeDbWeight, DispatchInfo, DispatchClass,
-		extract_actual_weight,
+		extract_actual_weight, PerDispatchClass,
 	},
 	dispatch::DispatchResultWithPostInfo,
 };
@@ -132,15 +132,16 @@ use codec::{Encode, Decode, FullCodec, EncodeLike};
 use sp_io::TestExternalities;
 
 pub mod offchain;
+pub mod limits;
 #[cfg(test)]
 pub(crate) mod mock;
 
 mod extensions;
-mod weight;
 pub mod weights;
 #[cfg(test)]
 mod tests;
 
+
 pub use extensions::{
 	check_mortality::CheckMortality, check_genesis::CheckGenesis, check_nonce::CheckNonce,
 	check_spec_version::CheckSpecVersion, check_tx_version::CheckTxVersion,
@@ -160,11 +161,20 @@ pub fn extrinsics_data_root<H: Hash>(xts: Vec<Vec<u8>>) -> H::Output {
 	H::ordered_trie_root(xts)
 }
 
+/// An object to track the currently used extrinsic weight in a block.
+pub type ConsumedWeight = PerDispatchClass<Weight>;
+
 pub trait Config: 'static + Eq + Clone {
 	/// The basic call filter to use in Origin. All origins are built with this filter as base,
 	/// except Root.
 	type BaseCallFilter: Filter<Self::Call>;
 
+	/// Block & extrinsics weights: base values and limits.
+	type BlockWeights: Get<limits::BlockWeights>;
+
+	/// The maximum length of a block (in bytes).
+	type BlockLength: Get<limits::BlockLength>;
+
 	/// The `Origin` type used by dispatchable calls.
 	type Origin:
 		Into<Result<RawOrigin<Self::AccountId>, Self::Origin>>
@@ -219,31 +229,9 @@ pub trait Config: 'static + Eq + Clone {
 	/// Maximum number of block number to block hash mappings to keep (oldest pruned first).
 	type BlockHashCount: Get<Self::BlockNumber>;
 
-	/// The maximum weight of a block.
-	type MaximumBlockWeight: Get<Weight>;
-
 	/// The weight of runtime database operations the runtime can invoke.
 	type DbWeight: Get<RuntimeDbWeight>;
 
-	/// The base weight of executing a block, independent of the transactions in the block.
-	type BlockExecutionWeight: Get<Weight>;
-
-	/// The base weight of an Extrinsic in the block, independent of the of extrinsic being executed.
-	type ExtrinsicBaseWeight: Get<Weight>;
-
-	/// The maximal weight of a single Extrinsic. This should be set to at most
-	/// `MaximumBlockWeight - AverageOnInitializeWeight`. The limit only applies to extrinsics
-	/// containing `Normal` dispatch class calls.
-	type MaximumExtrinsicWeight: Get<Weight>;
-
-	/// The maximum length of a block (in bytes).
-	type MaximumBlockLength: Get<u32>;
-
-	/// The portion of the block that is available to normal transaction. The rest can only be used
-	/// by operational transactions. This can be applied to any resource limit managed by the system
-	/// module, including weight and length.
-	type AvailableBlockRatio: Get<Perbill>;
-
 	/// Get the chain's current version.
 	type Version: Get<RuntimeVersion>;
 
@@ -399,7 +387,7 @@ decl_storage! {
 		ExtrinsicCount: Option<u32>;
 
 		/// The current weight for the block.
-		BlockWeight get(fn block_weight): weight::ExtrinsicsWeight;
+		BlockWeight get(fn block_weight): ConsumedWeight;
 
 		/// Total length (in bytes) for all extrinsics put together, for the current block.
 		AllExtrinsicsLen: Option<u32>;
@@ -519,20 +507,11 @@ decl_module! {
 		/// The maximum number of blocks to allow in mortal eras.
 		const BlockHashCount: T::BlockNumber = T::BlockHashCount::get();
 
-		/// The maximum weight of a block.
-		const MaximumBlockWeight: Weight = T::MaximumBlockWeight::get();
-
 		/// The weight of runtime database operations the runtime can invoke.
 		const DbWeight: RuntimeDbWeight = T::DbWeight::get();
 
-		/// The base weight of executing a block, independent of the transactions in the block.
-		const BlockExecutionWeight: Weight = T::BlockExecutionWeight::get();
-
-		/// The base weight of an Extrinsic in the block, independent of the of extrinsic being executed.
-		const ExtrinsicBaseWeight: Weight = T::ExtrinsicBaseWeight::get();
-
-		/// The maximum length of a block (in bytes).
-		const MaximumBlockLength: u32 = T::MaximumBlockLength::get();
+		/// The weight configuration (limits & base values) for each class of extrinsics and block.
+		const BlockWeights: limits::BlockWeights = T::BlockWeights::get();
 
 		fn on_runtime_upgrade() -> frame_support::weights::Weight {
 			if !UpgradedToU32RefCount::get() {
@@ -540,16 +519,22 @@ decl_module! {
 					Some(AccountInfo { nonce, refcount: rc as RefCount, data })
 				);
 				UpgradedToU32RefCount::put(true);
-				T::MaximumBlockWeight::get()
+				T::BlockWeights::get().max_block
 			} else {
 				0
 			}
 		}
 
+		fn integrity_test() {
+			T::BlockWeights::get()
+				.validate()
+				.expect("The weights are invalid.");
+		}
+
 		/// A dispatch that will fill the block weight up to the given ratio.
 		// TODO: This should only be available for testing, rather than in general usage, but
 		// that's not possible at present (since it's within the decl_module macro).
-		#[weight = *_ratio * T::MaximumBlockWeight::get()]
+		#[weight = *_ratio * T::BlockWeights::get().max_block]
 		fn fill_block(origin, _ratio: Perbill) {
 			ensure_root(origin)?;
 		}
@@ -590,7 +575,7 @@ decl_module! {
 		/// The weight of this function is dependent on the runtime, but generally this is very expensive.
 		/// We will treat this as a full block.
 		/// # </weight>
-		#[weight = (T::MaximumBlockWeight::get(), DispatchClass::Operational)]
+		#[weight = (T::BlockWeights::get().max_block, DispatchClass::Operational)]
 		pub fn set_code(origin, code: Vec<u8>) {
 			ensure_root(origin)?;
 			Self::can_set_code(&code)?;
@@ -607,7 +592,7 @@ decl_module! {
 		/// - 1 event.
 		/// The weight of this function is dependent on the runtime. We will treat this as a full block.
 		/// # </weight>
-		#[weight = (T::MaximumBlockWeight::get(), DispatchClass::Operational)]
+		#[weight = (T::BlockWeights::get().max_block, DispatchClass::Operational)]
 		pub fn set_code_without_checks(origin, code: Vec<u8>) {
 			ensure_root(origin)?;
 			storage::unhashed::put_raw(well_known_keys::CODE, &code);
@@ -1120,9 +1105,9 @@ impl<T: Config> Module<T> {
 
 	/// Set the current block weight. This should only be used in some integration tests.
 	#[cfg(any(feature = "std", test))]
-	pub fn set_block_limits(weight: Weight, len: usize) {
+	pub fn set_block_consumed_resources(weight: Weight, len: usize) {
 		BlockWeight::mutate(|current_weight| {
-			current_weight.put(weight, DispatchClass::Normal)
+			current_weight.set(weight, DispatchClass::Normal)
 		});
 		AllExtrinsicsLen::put(len as u32);
 	}
@@ -1348,7 +1333,6 @@ pub fn split_inner<T, R, S>(option: Option<T>, splitter: impl FnOnce(T) -> (R, S
 	}
 }
 
-
 impl<T: Config> IsDeadAccount<T::AccountId> for Module<T> {
 	fn is_dead_account(who: &T::AccountId) -> bool {
 		!Account::<T>::contains_key(who)
diff --git a/frame/system/src/limits.rs b/frame/system/src/limits.rs
new file mode 100644
index 000000000000..aac347b8e658
--- /dev/null
+++ b/frame/system/src/limits.rs
@@ -0,0 +1,434 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Block resource limits configuration structures.
+//!
+//! FRAME defines two resources that are limited within a block:
+//! - Weight (execution cost/time)
+//! - Length (block size)
+//!
+//! `frame_system` tracks consumption of each of these resources separately for each
+//! `DispatchClass`. This module contains configuration object for both resources,
+//! which should be passed to `frame_system` configuration when runtime is being set up.
+
+use frame_support::weights::{Weight, DispatchClass, constants, PerDispatchClass, OneOrMany};
+use sp_runtime::{RuntimeDebug, Perbill};
+
+/// Block length limit configuration.
+#[derive(RuntimeDebug, Clone)]
+pub struct BlockLength {
+	/// Maximal total length in bytes for each extrinsic class.
+	///
+	/// In the worst case, the total block length is going to be:
+	/// `MAX(max)`
+	pub max: PerDispatchClass<u32>,
+}
+
+impl Default for BlockLength {
+	fn default() -> Self {
+		BlockLength::max_with_normal_ratio(
+			5 * 1024 * 1024,
+			DEFAULT_NORMAL_RATIO,
+		)
+	}
+}
+
+impl BlockLength {
+	/// Create new `BlockLength` with `max` for every class.
+	pub fn max(max: u32) -> Self {
+		Self {
+			max: PerDispatchClass::new(|_| max),
+		}
+	}
+
+	/// Create new `BlockLength` with `max` for `Operational` & `Mandatory`
+	/// and `normal * max` for `Normal`.
+	pub fn max_with_normal_ratio(max: u32, normal: Perbill) -> Self {
+		Self {
+			max: PerDispatchClass::new(|class| if class == DispatchClass::Normal {
+				normal * max
+			} else {
+				max
+			}),
+		}
+	}
+}
+
+#[derive(Default, RuntimeDebug)]
+pub struct ValidationErrors {
+	pub has_errors: bool,
+	#[cfg(feature = "std")]
+	pub errors: Vec<String>,
+}
+
+macro_rules! error_assert {
+	($cond : expr, $err : expr, $format : expr $(, $params: expr )*$(,)*) => {
+		if !$cond {
+			$err.has_errors = true;
+			#[cfg(feature = "std")]
+			{ $err.errors.push(format!($format $(, &$params )*)); }
+		}
+	}
+}
+
+/// A result of validating `BlockWeights` correctness.
+pub type ValidationResult = Result<BlockWeights, ValidationErrors>;
+
+/// A ratio of `Normal` dispatch class within block, used as default value for
+/// `BlockWeight` and `BlockLength`. The `Default` impls are provided mostly for convenience
+/// to use in tests.
+const DEFAULT_NORMAL_RATIO: Perbill = Perbill::from_percent(75);
+
+/// `DispatchClass`-specific weight configuration.
+#[derive(RuntimeDebug, Clone, codec::Encode, codec::Decode)]
+pub struct WeightsPerClass {
+	/// Base weight of single extrinsic of given class.
+	pub base_extrinsic: Weight,
+	/// Maximal weight of single extrinsic. Should NOT include `base_extrinsic` cost.
+	///
+	/// `None` indicates that this class of extrinsics doesn't have a limit.
+	pub max_extrinsic: Option<Weight>,
+	/// Block maximal total weight for all extrinsics of given class.
+	///
+	/// `None` indicates that weight sum of this class of extrinsics is not
+	/// restricted. Use this value carefully, since it might produce heavily oversized
+	/// blocks.
+	///
+	/// In the worst case, the total weight consumed by the class is going to be:
+	/// `MAX(max_total) + MAX(reserved)`.
+	pub max_total: Option<Weight>,
+	/// Block reserved allowance for all extrinsics of a particular class.
+	///
+	/// Setting to `None` indicates that extrinsics of that class are allowed
+	/// to go over total block weight (but at most `max_total` for that class).
+	/// Setting to `Some(x)` guarantees that at least `x` weight of particular class
+	/// is processed in every block.
+	pub reserved: Option<Weight>,
+}
+
+/// Block weight limits & base values configuration.
+///
+/// This object is responsible for defining weight limits and base weight values tracked
+/// during extrinsic execution.
+///
+/// Each block starts with `base_block` weight being consumed right away. Next up the
+/// `on_initialize` pallet callbacks are invoked and their cost is added before any extrinsic
+/// is executed. This cost is tracked as `Mandatory` dispatch class.
+///
+/// |   | `max_block`    |   |
+/// |   |                |   |
+/// |   |                |   |
+/// |   |                |   |
+/// |   |                |  #| `on_initialize`
+/// |  #| `base_block`   |  #|
+/// |NOM|                |NOM|
+///  ||\_ Mandatory
+///  |\__ Operational
+///  \___ Normal
+///
+/// The remaining capacity can be used to dispatch extrinsics. Note that each dispatch class
+/// is being tracked separately, but the sum can't exceed `max_block` (except for `reserved`).
+/// Below you can see a picture representing full block with 3 extrinsics (two `Operational` and
+/// one `Normal`). Each class has it's own limit `max_total`, but also the sum cannot exceed
+/// `max_block` value.
+///                          -- `Mandatory` limit (unlimited)
+/// | # |                 |   |
+/// | # | `Ext3`          | - - `Operational` limit
+/// |#  | `Ext2`          |-  - `Normal` limit
+/// | # | `Ext1`          | # |
+/// |  #| `on_initialize` | ##|
+/// |  #| `base_block`    |###|
+/// |NOM|                 |NOM|
+///
+/// It should be obvious now that it's possible for one class to reach it's limit (say `Normal`),
+/// while the block has still capacity to process more transactions (`max_block` not reached,
+/// `Operational` transactions can still go in). Setting `max_total` to `None` disables the
+/// per-class limit. This is generally highly recommended for `Mandatory` dispatch class, while it
+/// can be dangerous for `Normal` class and should only be done with extra care and consideration.
+///
+/// Often it's desirable for some class of transactions to be added to the block despite it being
+/// full. For instance one might want to prevent high-priority `Normal` transactions from pushing
+/// out lower-priority `Operational` transactions. In such cases you might add a `reserved` capacity
+/// for given class.
+///              _
+///   #           \
+///   #   `Ext8`   - `reserved`
+///   #          _/
+/// | # | `Ext7                 | - - `Operational` limit
+/// |#  | `Ext6`                |   |
+/// |#  | `Ext5`                |-# - `Normal` limit
+/// |#  | `Ext4`                |## |
+/// |  #| `on_initialize`       |###|
+/// |  #| `base_block`          |###|
+/// |NOM|                       |NOM|
+///
+/// In the above example, `Ext4-6` fill up the block almost up to `max_block`. `Ext7` would not fit
+/// if there wasn't the extra `reserved` space for `Operational` transactions. Note that `max_total`
+/// limit applies to `reserved` space as well (i.e. the sum of weights of `Ext7` & `Ext8` mustn't
+/// exceed it). Setting `reserved` to `None` allows the extrinsics to always get into the block up
+/// to their `max_total` limit. If `max_total` is set to `None` as well, all extrinsics witch
+/// dispatchables of given class will always end up in the block (recommended for `Mandatory`
+/// dispatch class).
+///
+/// As a consequence of `reserved` space, total consumed block weight might exceed `max_block`
+/// value, so this parameter should rather be thought of as "target block weight" than a hard limit.
+#[derive(RuntimeDebug, Clone, codec::Encode, codec::Decode)]
+pub struct BlockWeights {
+	/// Base weight of block execution.
+	pub base_block: Weight,
+	/// Maximal total weight consumed by all kinds of extrinsics (without `reserved` space).
+	pub max_block: Weight,
+	/// Weight limits for extrinsics of given dispatch class.
+	pub per_class: PerDispatchClass<WeightsPerClass>,
+}
+
+impl Default for BlockWeights {
+	fn default() -> Self {
+		Self::with_sensible_defaults(
+			1 * constants::WEIGHT_PER_SECOND,
+			DEFAULT_NORMAL_RATIO,
+		)
+	}
+}
+
+impl BlockWeights {
+	/// Get per-class weight settings.
+	pub fn get(&self, class: DispatchClass) -> &WeightsPerClass {
+		self.per_class.get(class)
+	}
+
+	/// Verifies correctness of this `BlockWeights` object.
+	pub fn validate(self) -> ValidationResult {
+		fn or_max(w: Option<Weight>) -> Weight {
+			w.unwrap_or_else(|| Weight::max_value())
+		}
+		let mut error = ValidationErrors::default();
+
+		for class in DispatchClass::all() {
+			let weights = self.per_class.get(*class);
+			let max_for_class = or_max(weights.max_total);
+			let base_for_class = weights.base_extrinsic;
+			let reserved = or_max(weights.reserved);
+			// Make sure that if total is set it's greater than base_block &&
+			// base_for_class
+			error_assert!(
+				(max_for_class > self.base_block && max_for_class > base_for_class)
+				|| max_for_class == 0,
+				&mut error,
+				"[{:?}] {:?} (total) has to be greater than {:?} (base block) & {:?} (base extrinsic)",
+				class, max_for_class, self.base_block, base_for_class,
+			);
+			// Max extrinsic can't be greater than max_for_class.
+			error_assert!(
+				weights.max_extrinsic.unwrap_or(0) <= max_for_class.saturating_sub(base_for_class),
+				&mut error,
+				"[{:?}] {:?} (max_extrinsic) can't be greater than {:?} (max for class)",
+				class, weights.max_extrinsic,
+				max_for_class.saturating_sub(base_for_class),
+			);
+			// Max extrinsic should not be 0
+			error_assert!(
+				weights.max_extrinsic.unwrap_or_else(|| Weight::max_value()) > 0,
+				&mut error,
+				"[{:?}] {:?} (max_extrinsic) must not be 0. Check base cost and average initialization cost.",
+				class, weights.max_extrinsic,
+			);
+			// Make sure that if reserved is set it's greater than base_for_class.
+			error_assert!(
+				reserved > base_for_class || reserved == 0,
+				&mut error,
+				"[{:?}] {:?} (reserved) has to be greater than {:?} (base extrinsic) if set",
+				class, reserved, base_for_class,
+			);
+			// Make sure max block is greater than max_total if it's set.
+			error_assert!(
+				self.max_block >= weights.max_total.unwrap_or(0),
+				&mut error,
+				"[{:?}] {:?} (max block) has to be greater than {:?} (max for class)",
+				class, self.max_block, weights.max_total,
+			);
+			// Make sure we can fit at least one extrinsic.
+			error_assert!(
+				self.max_block > base_for_class + self.base_block,
+				&mut error,
+				"[{:?}] {:?} (max block) must fit at least one extrinsic {:?} (base weight)",
+				class, self.max_block, base_for_class + self.base_block,
+			);
+		}
+
+		if error.has_errors {
+			Err(error)
+		} else {
+			Ok(self)
+		}
+	}
+
+	/// Create new weights definition, with both `Normal` and `Operational`
+	/// classes limited to given weight.
+	///
+	/// Note there is no reservation for `Operational` class, so this constructor
+	/// is not suitable for production deployments.
+	pub fn simple_max(block_weight: Weight) -> Self {
+		Self::builder()
+			.base_block(0)
+			.for_class(DispatchClass::all(), |weights| {
+				weights.base_extrinsic = 0;
+			})
+			.for_class(DispatchClass::non_mandatory(), |weights| {
+				weights.max_total = block_weight.into();
+			})
+			.build()
+			.expect("We only specify max_total and leave base values as defaults; qed")
+	}
+
+	/// Create a sensible default weights system given only expected maximal block weight and the
+	/// ratio that `Normal` extrinsics should occupy.
+	///
+	/// Assumptions:
+	///  - Average block initialization is assumed to be `10%`.
+	///  - `Operational` transactions have reserved allowance (`1.0 - normal_ratio`)
+	pub fn with_sensible_defaults(
+		expected_block_weight: Weight,
+		normal_ratio: Perbill,
+	) -> Self {
+		let normal_weight = normal_ratio * expected_block_weight;
+		Self::builder()
+			.for_class(DispatchClass::Normal, |weights| {
+				weights.max_total = normal_weight.into();
+			})
+			.for_class(DispatchClass::Operational, |weights| {
+				weights.max_total = expected_block_weight.into();
+				weights.reserved = (expected_block_weight - normal_weight).into();
+			})
+			.avg_block_initialization(Perbill::from_percent(10))
+			.build()
+			.expect("Sensible defaults are tested to be valid; qed")
+	}
+
+	/// Start constructing new `BlockWeights` object.
+	///
+	/// By default all kinds except of `Mandatory` extrinsics are disallowed.
+	pub fn builder() -> BlockWeightsBuilder {
+		BlockWeightsBuilder {
+			weights: BlockWeights {
+				base_block: constants::BlockExecutionWeight::get(),
+				max_block: 0,
+				per_class: PerDispatchClass::new(|class| {
+					let initial = if class == DispatchClass::Mandatory { None } else { Some(0) };
+					WeightsPerClass {
+						base_extrinsic: constants::ExtrinsicBaseWeight::get(),
+						max_extrinsic: None,
+						max_total: initial,
+						reserved: initial,
+					}
+				}),
+			},
+			init_cost: None,
+		}
+	}
+}
+
+/// An opinionated builder for `Weights` object.
+pub struct BlockWeightsBuilder {
+	weights: BlockWeights,
+	init_cost: Option<Perbill>,
+}
+
+impl BlockWeightsBuilder {
+	/// Set base block weight.
+	pub fn base_block(mut self, base_block: Weight) -> Self {
+		self.weights.base_block = base_block;
+		self
+	}
+
+	/// Average block initialization weight cost.
+	///
+	/// This value is used to derive maximal allowed extrinsic weight for each
+	/// class, based on the allowance.
+	///
+	/// This is to make sure that extrinsics don't stay forever in the pool,
+	/// because they could seamingly fit the block (since they are below `max_block`),
+	/// but the cost of calling `on_initialize` alway prevents them from being included.
+	pub fn avg_block_initialization(mut self, init_cost: Perbill) -> Self {
+		self.init_cost = Some(init_cost);
+		self
+	}
+
+	/// Set parameters for particular class.
+	///
+	/// Note: `None` values of `max_extrinsic` will be overwritten in `build` in case
+	/// `avg_block_initialization` rate is set to a non-zero value.
+	pub fn for_class(
+		mut self,
+		class: impl OneOrMany<DispatchClass>,
+		action: impl Fn(&mut WeightsPerClass),
+	) -> Self {
+		for class in class.into_iter() {
+			action(self.weights.per_class.get_mut(class));
+		}
+ 		self
+	}
+
+	/// Construct the `BlockWeights` object.
+	pub fn build(self) -> ValidationResult {
+		// compute max extrinsic size
+		let Self { mut weights, init_cost } = self;
+
+		// compute max block size.
+		for class in DispatchClass::all() {
+			weights.max_block = match weights.per_class.get(*class).max_total {
+				Some(max) if max > weights.max_block => max,
+				_ => weights.max_block,
+			};
+		}
+		// compute max size of single extrinsic
+		if let Some(init_weight) = init_cost.map(|rate| rate * weights.max_block) {
+			for class in DispatchClass::all() {
+				let per_class = weights.per_class.get_mut(*class);
+				if per_class.max_extrinsic.is_none() && init_cost.is_some() {
+					per_class.max_extrinsic = per_class.max_total
+						.map(|x| x.saturating_sub(init_weight))
+						.map(|x| x.saturating_sub(per_class.base_extrinsic));
+				}
+			}
+		}
+
+		// Validate the result
+		weights.validate()
+	}
+
+	/// Construct the `BlockWeights` object or panic if it's invalid.
+	///
+	/// This is a convenience method to be called whenever you construct a runtime.
+	pub fn build_or_panic(self) -> BlockWeights {
+		self.build().expect(
+			"Builder finished with `build_or_panic`; The panic is expected if runtime weights are not correct"
+		)
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+
+	#[test]
+	fn default_weights_are_valid() {
+		BlockWeights::default()
+			.validate()
+			.unwrap();
+	}
+}
diff --git a/frame/system/src/mock.rs b/frame/system/src/mock.rs
index b6e1a4f35af0..1558a5ed3970 100644
--- a/frame/system/src/mock.rs
+++ b/frame/system/src/mock.rs
@@ -34,12 +34,11 @@ impl_outer_origin! {
 #[derive(Clone, Eq, PartialEq, Debug, Default)]
 pub struct Test;
 
+const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);
+const MAX_BLOCK_WEIGHT: Weight = 1024;
+
 parameter_types! {
 	pub const BlockHashCount: u64 = 10;
-	pub const MaximumBlockWeight: Weight = 1024;
-	pub const MaximumExtrinsicWeight: Weight = 768;
-	pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);
-	pub const MaximumBlockLength: u32 = 1024;
 	pub Version: RuntimeVersion = RuntimeVersion {
 		spec_name: sp_version::create_runtime_str!("test"),
 		impl_name: sp_version::create_runtime_str!("system-test"),
@@ -49,12 +48,28 @@ parameter_types! {
 		apis: sp_version::create_apis_vec!([]),
 		transaction_version: 1,
 	};
-	pub const BlockExecutionWeight: Weight = 10;
-	pub const ExtrinsicBaseWeight: Weight = 5;
 	pub const DbWeight: RuntimeDbWeight = RuntimeDbWeight {
 		read: 10,
 		write: 100,
 	};
+	pub RuntimeBlockWeights: limits::BlockWeights = limits::BlockWeights::builder()
+		.base_block(10)
+		.for_class(DispatchClass::all(), |weights| {
+			weights.base_extrinsic = 5;
+		})
+		.for_class(DispatchClass::Normal, |weights| {
+			weights.max_total = Some(NORMAL_DISPATCH_RATIO * MAX_BLOCK_WEIGHT);
+		})
+		.for_class(DispatchClass::Operational, |weights| {
+			weights.max_total = Some(MAX_BLOCK_WEIGHT);
+			weights.reserved = Some(
+				MAX_BLOCK_WEIGHT - NORMAL_DISPATCH_RATIO * MAX_BLOCK_WEIGHT
+			);
+		})
+		.avg_block_initialization(Perbill::from_percent(0))
+		.build_or_panic();
+	pub RuntimeBlockLength: limits::BlockLength =
+		limits::BlockLength::max_with_normal_ratio(1024, NORMAL_DISPATCH_RATIO);
 }
 
 thread_local!{
@@ -82,6 +97,8 @@ impl Dispatchable for Call {
 
 impl Config for Test {
 	type BaseCallFilter = ();
+	type BlockWeights = RuntimeBlockWeights;
+	type BlockLength = RuntimeBlockLength;
 	type Origin = Origin;
 	type Call = Call;
 	type Index = u64;
@@ -93,13 +110,7 @@ impl Config for Test {
 	type Header = Header;
 	type Event = Event<Self>;
 	type BlockHashCount = BlockHashCount;
-	type MaximumBlockWeight = MaximumBlockWeight;
 	type DbWeight = DbWeight;
-	type BlockExecutionWeight = BlockExecutionWeight;
-	type ExtrinsicBaseWeight = ExtrinsicBaseWeight;
-	type MaximumExtrinsicWeight = MaximumExtrinsicWeight;
-	type AvailableBlockRatio = AvailableBlockRatio;
-	type MaximumBlockLength = MaximumBlockLength;
 	type Version = Version;
 	type PalletInfo = ();
 	type AccountData = u32;
@@ -118,7 +129,7 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 	let mut ext: sp_io::TestExternalities = GenesisConfig::default().build_storage::<Test>().unwrap().into();
 	// Add to each test the initial weight of a block
 	ext.execute_with(|| System::register_extra_weight_unchecked(
-		<Test as Config>::BlockExecutionWeight::get(),
+		<Test as crate::Config>::BlockWeights::get().base_block,
 		DispatchClass::Mandatory
 	));
 	ext
diff --git a/frame/system/src/weight.rs b/frame/system/src/weight.rs
deleted file mode 100644
index 93295093c4fb..000000000000
--- a/frame/system/src/weight.rs
+++ /dev/null
@@ -1,76 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use codec::{Encode, Decode};
-use frame_support::weights::{Weight, DispatchClass};
-use sp_runtime::RuntimeDebug;
-
-/// An object to track the currently used extrinsic weight in a block.
-#[derive(Clone, Eq, PartialEq, Default, RuntimeDebug, Encode, Decode)]
-pub struct ExtrinsicsWeight {
-	normal: Weight,
-	operational: Weight,
-}
-
-impl ExtrinsicsWeight {
-	/// Returns the total weight consumed by all extrinsics in the block.
-	pub fn total(&self) -> Weight {
-		self.normal.saturating_add(self.operational)
-	}
-
-	/// Add some weight of a specific dispatch class, saturating at the numeric bounds of `Weight`.
-	pub fn add(&mut self, weight: Weight, class: DispatchClass) {
-		let value = self.get_mut(class);
-		*value = value.saturating_add(weight);
-	}
-
-	/// Try to add some weight of a specific dispatch class, returning Err(()) if overflow would
-	/// occur.
-	pub fn checked_add(&mut self, weight: Weight, class: DispatchClass) -> Result<(), ()> {
-		let value = self.get_mut(class);
-		*value = value.checked_add(weight).ok_or(())?;
-		Ok(())
-	}
-
-	/// Subtract some weight of a specific dispatch class, saturating at the numeric bounds of
-	/// `Weight`.
-	pub fn sub(&mut self, weight: Weight, class: DispatchClass) {
-		let value = self.get_mut(class);
-		*value = value.saturating_sub(weight);
-	}
-
-	/// Get the current weight of a specific dispatch class.
-	pub fn get(&self, class: DispatchClass) -> Weight {
-		match class {
-			DispatchClass::Operational => self.operational,
-			DispatchClass::Normal | DispatchClass::Mandatory => self.normal,
-		}
-	}
-
-	/// Get a mutable reference to the current weight of a specific dispatch class.
-	fn get_mut(&mut self, class: DispatchClass) -> &mut Weight {
-		match class {
-			DispatchClass::Operational => &mut self.operational,
-			DispatchClass::Normal | DispatchClass::Mandatory => &mut self.normal,
-		}
-	}
-
-	/// Set the weight of a specific dispatch class.
-	pub fn put(&mut self, new: Weight, class: DispatchClass) {
-		*self.get_mut(class) = new;
-	}
-}
diff --git a/frame/timestamp/src/lib.rs b/frame/timestamp/src/lib.rs
index 66043cbe3aaf..b62777832ab7 100644
--- a/frame/timestamp/src/lib.rs
+++ b/frame/timestamp/src/lib.rs
@@ -292,10 +292,10 @@ impl<T: Config> UnixTime for Module<T> {
 mod tests {
 	use super::*;
 
-	use frame_support::{impl_outer_origin, assert_ok, parameter_types, weights::Weight};
+	use frame_support::{impl_outer_origin, assert_ok, parameter_types};
 	use sp_io::TestExternalities;
 	use sp_core::H256;
-	use sp_runtime::{Perbill, traits::{BlakeTwo256, IdentityLookup}, testing::Header};
+	use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
 
 	pub fn new_test_ext() -> TestExternalities {
 		let t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
@@ -310,12 +310,14 @@ mod tests {
 	pub struct Test;
 	parameter_types! {
 		pub const BlockHashCount: u64 = 250;
-		pub const MaximumBlockWeight: Weight = 1024;
-		pub const MaximumBlockLength: u32 = 2 * 1024;
-		pub const AvailableBlockRatio: Perbill = Perbill::one();
+		pub BlockWeights: frame_system::limits::BlockWeights =
+			frame_system::limits::BlockWeights::simple_max(1024);
 	}
 	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
+		type BlockWeights = ();
+		type BlockLength = ();
+		type DbWeight = ();
 		type Origin = Origin;
 		type Index = u64;
 		type BlockNumber = u64;
@@ -327,13 +329,6 @@ mod tests {
 		type Header = Header;
 		type Event = ();
 		type BlockHashCount = BlockHashCount;
-		type MaximumBlockWeight = MaximumBlockWeight;
-		type DbWeight = ();
-		type BlockExecutionWeight = ();
-		type ExtrinsicBaseWeight = ();
-		type MaximumExtrinsicWeight = MaximumBlockWeight;
-		type AvailableBlockRatio = AvailableBlockRatio;
-		type MaximumBlockLength = MaximumBlockLength;
 		type Version = ();
 		type PalletInfo = ();
 		type AccountData = ();
diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
index 554b2e801afe..247755aa07c9 100644
--- a/frame/transaction-payment/src/lib.rs
+++ b/frame/transaction-payment/src/lib.rs
@@ -40,7 +40,7 @@ use frame_support::{
 	traits::Get,
 	weights::{
 		Weight, DispatchInfo, PostDispatchInfo, GetDispatchInfo, Pays, WeightToFeePolynomial,
-		WeightToFeeCoefficient,
+		WeightToFeeCoefficient, DispatchClass,
 	},
 	dispatch::DispatchResult,
 };
@@ -158,14 +158,14 @@ impl<T, S, V, M> Convert<Multiplier, Multiplier> for TargetedFeeAdjustment<T, S,
 		let min_multiplier = M::get();
 		let previous = previous.max(min_multiplier);
 
+		let weights = T::BlockWeights::get();
 		// the computed ratio is only among the normal class.
-		let normal_max_weight =
-			<T as frame_system::Config>::AvailableBlockRatio::get() *
-			<T as frame_system::Config>::MaximumBlockWeight::get();
-		let normal_block_weight =
-			<frame_system::Module<T>>::block_weight()
-			.get(frame_support::weights::DispatchClass::Normal)
-			.min(normal_max_weight);
+		let normal_max_weight = weights.get(DispatchClass::Normal).max_total
+			.unwrap_or_else(|| weights.max_block);
+		let current_block_weight = <frame_system::Module<T>>::block_weight();
+		let normal_block_weight = *current_block_weight
+			.get(DispatchClass::Normal)
+			.min(&normal_max_weight);
 
 		let s = S::get();
 		let v = V::get();
@@ -257,13 +257,13 @@ decl_module! {
 
 		fn integrity_test() {
 			// given weight == u64, we build multipliers from `diff` of two weight values, which can
-			// at most be MaximumBlockWeight. Make sure that this can fit in a multiplier without
+			// at most be maximum block weight. Make sure that this can fit in a multiplier without
 			// loss.
 			use sp_std::convert::TryInto;
 			assert!(
 				<Multiplier as sp_runtime::traits::Bounded>::max_value() >=
 				Multiplier::checked_from_integer(
-					<T as frame_system::Config>::MaximumBlockWeight::get().try_into().unwrap()
+					T::BlockWeights::get().max_block.try_into().unwrap()
 				).unwrap(),
 			);
 
@@ -272,9 +272,11 @@ decl_module! {
 			// that if we collapse to minimum, the trend will be positive with a weight value
 			// which is 1% more than the target.
 			let min_value = T::FeeMultiplierUpdate::min();
-			let mut target =
-				T::FeeMultiplierUpdate::target() *
-				(T::AvailableBlockRatio::get() * T::MaximumBlockWeight::get());
+			let mut target = T::FeeMultiplierUpdate::target() *
+				T::BlockWeights::get().get(DispatchClass::Normal).max_total.expect(
+					"Setting `max_total` for `Normal` dispatch class is not compatible with \
+					`transaction-payment` pallet."
+				);
 
 			// add 1 percent;
 			let addition = target / 100;
@@ -285,7 +287,7 @@ decl_module! {
 			target += addition;
 
 			sp_io::TestExternalities::new_empty().execute_with(|| {
-				<frame_system::Module<T>>::set_block_limits(target, 0);
+				<frame_system::Module<T>>::set_block_consumed_resources(target, 0);
 				let next = T::FeeMultiplierUpdate::convert(min_value);
 				assert!(next > min_value, "The minimum bound of the multiplier is too low. When \
 					block saturation is more than target by 1% and multiplier is minimal then \
@@ -357,7 +359,13 @@ impl<T: Config> Module<T> where
 	) -> BalanceOf<T> where
 		T::Call: Dispatchable<Info=DispatchInfo>,
 	{
-		Self::compute_fee_raw(len, info.weight, tip, info.pays_fee)
+		Self::compute_fee_raw(
+			len,
+			info.weight,
+			tip,
+			info.pays_fee,
+			info.class,
+		)
 	}
 
 	/// Compute the actual post dispatch fee for a particular transaction.
@@ -372,7 +380,13 @@ impl<T: Config> Module<T> where
 	) -> BalanceOf<T> where
 		T::Call: Dispatchable<Info=DispatchInfo,PostInfo=PostDispatchInfo>,
 	{
-		Self::compute_fee_raw(len, post_info.calc_actual_weight(info), tip, post_info.pays_fee(info))
+		Self::compute_fee_raw(
+			len,
+			post_info.calc_actual_weight(info),
+			tip,
+			post_info.pays_fee(info),
+			info.class,
+		)
 	}
 
 	fn compute_fee_raw(
@@ -380,6 +394,7 @@ impl<T: Config> Module<T> where
 		weight: Weight,
 		tip: BalanceOf<T>,
 		pays_fee: Pays,
+		class: DispatchClass,
 	) -> BalanceOf<T> {
 		if pays_fee == Pays::Yes {
 			let len = <BalanceOf<T>>::from(len);
@@ -394,7 +409,7 @@ impl<T: Config> Module<T> where
 			// final adjusted weight fee.
 			let adjusted_weight_fee = multiplier.saturating_mul_int(unadjusted_weight_fee);
 
-			let base_fee = Self::weight_to_fee(T::ExtrinsicBaseWeight::get());
+			let base_fee = Self::weight_to_fee(T::BlockWeights::get().get(class).base_extrinsic);
 			base_fee
 				.saturating_add(fixed_len_fee)
 				.saturating_add(adjusted_weight_fee)
@@ -407,7 +422,7 @@ impl<T: Config> Module<T> where
 	fn weight_to_fee(weight: Weight) -> BalanceOf<T> {
 		// cap the weight to the maximum defined in runtime, otherwise it will be the
 		// `Bounded` maximum of its data type, which is not desired.
-		let capped_weight = weight.min(<T as frame_system::Config>::MaximumBlockWeight::get());
+		let capped_weight = weight.min(T::BlockWeights::get().max_block);
 		T::WeightToFee::calc(&capped_weight)
 	}
 }
@@ -471,8 +486,9 @@ impl<T: Config + Send + Sync> ChargeTransactionPayment<T> where
 	///  that the transaction which consumes more resources (either length or weight) with the same
 	/// `fee` ends up having lower priority.
 	fn get_priority(len: usize, info: &DispatchInfoOf<T::Call>, final_fee: BalanceOf<T>) -> TransactionPriority {
-		let weight_saturation = T::MaximumBlockWeight::get() / info.weight.max(1);
-		let len_saturation = T::MaximumBlockLength::get() as u64 / (len as u64).max(1);
+		let weight_saturation = T::BlockWeights::get().max_block / info.weight.max(1);
+		let max_block_length = *T::BlockLength::get().max.get(DispatchClass::Normal);
+		let len_saturation = max_block_length as u64 / (len as u64).max(1);
 		let coefficient: BalanceOf<T> = weight_saturation.min(len_saturation).saturated_into::<BalanceOf<T>>();
 		final_fee.saturating_mul(coefficient).saturated_into::<TransactionPriority>()
 	}
@@ -571,6 +587,7 @@ mod tests {
 		traits::{BlakeTwo256, IdentityLookup},
 		Perbill,
 	};
+	use std::cell::RefCell;
 	use smallvec::smallvec;
 
 	const CALL: &<Runtime as frame_system::Config>::Call =
@@ -598,18 +615,36 @@ mod tests {
 		pub enum Origin for Runtime {}
 	}
 
+	thread_local! {
+		static EXTRINSIC_BASE_WEIGHT: RefCell<u64> = RefCell::new(0);
+	}
+
+	pub struct BlockWeights;
+	impl Get<frame_system::limits::BlockWeights> for BlockWeights {
+		fn get() -> frame_system::limits::BlockWeights {
+			frame_system::limits::BlockWeights::builder()
+				.base_block(0)
+				.for_class(DispatchClass::all(), |weights| {
+					weights.base_extrinsic = EXTRINSIC_BASE_WEIGHT.with(|v| *v.borrow()).into();
+				})
+				.for_class(DispatchClass::non_mandatory(), |weights| {
+					weights.max_total = 1024.into();
+				})
+				.build_or_panic()
+		}
+	}
+
 	parameter_types! {
 		pub const BlockHashCount: u64 = 250;
-		pub const MaximumBlockWeight: Weight = 1024;
-		pub const MaximumBlockLength: u32 = 2 * 1024;
-		pub const AvailableBlockRatio: Perbill = Perbill::one();
-		pub static ExtrinsicBaseWeight: u64 = 0;
 		pub static TransactionByteFee: u64 = 1;
 		pub static WeightToFee: u64 = 1;
 	}
 
 	impl frame_system::Config for Runtime {
 		type BaseCallFilter = ();
+		type BlockWeights = BlockWeights;
+		type BlockLength = ();
+		type DbWeight = ();
 		type Origin = Origin;
 		type Index = u64;
 		type BlockNumber = u64;
@@ -621,13 +656,6 @@ mod tests {
 		type Header = Header;
 		type Event = Event;
 		type BlockHashCount = BlockHashCount;
-		type MaximumBlockWeight = MaximumBlockWeight;
-		type DbWeight = ();
-		type BlockExecutionWeight = ();
-		type ExtrinsicBaseWeight = ExtrinsicBaseWeight;
-		type MaximumExtrinsicWeight = MaximumBlockWeight;
-		type MaximumBlockLength = MaximumBlockLength;
-		type AvailableBlockRatio = AvailableBlockRatio;
 		type Version = ();
 		type PalletInfo = ();
 		type AccountData = pallet_balances::AccountData<u64>;
@@ -841,7 +869,7 @@ mod tests {
 			// fee will be proportional to what is the actual maximum weight in the runtime.
 			assert_eq!(
 				Balances::free_balance(&1),
-				(10000 - <Runtime as frame_system::Config>::MaximumBlockWeight::get()) as u64
+				(10000 - <Runtime as frame_system::Config>::BlockWeights::get().max_block) as u64
 			);
 		});
 	}
@@ -939,7 +967,7 @@ mod tests {
 					partial_fee:
 						5 * 2 /* base * weight_fee */
 						+ len as u64  /* len * 1 */
-						+ info.weight.min(MaximumBlockWeight::get()) as u64 * 2 * 3 / 2 /* weight */
+						+ info.weight.min(BlockWeights::get().max_block) as u64 * 2 * 3 / 2 /* weight */
 				},
 			);
 
diff --git a/frame/treasury/src/tests.rs b/frame/treasury/src/tests.rs
index bbc38ddc8f81..3cf1272a19ec 100644
--- a/frame/treasury/src/tests.rs
+++ b/frame/treasury/src/tests.rs
@@ -22,12 +22,12 @@
 use super::*;
 use std::cell::RefCell;
 use frame_support::{
-	assert_noop, assert_ok, impl_outer_origin, impl_outer_event, parameter_types, weights::Weight,
+	assert_noop, assert_ok, impl_outer_origin, impl_outer_event, parameter_types,
 	traits::{Contains, OnInitialize}
 };
 use sp_core::H256;
 use sp_runtime::{
-	Perbill, ModuleId,
+	ModuleId,
 	testing::Header,
 	traits::{BlakeTwo256, IdentityLookup, BadOrigin},
 };
@@ -55,12 +55,14 @@ impl_outer_event! {
 pub struct Test;
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
-	pub const MaximumBlockWeight: Weight = 1024;
-	pub const MaximumBlockLength: u32 = 2 * 1024;
-	pub const AvailableBlockRatio: Perbill = Perbill::one();
+	pub BlockWeights: frame_system::limits::BlockWeights =
+		frame_system::limits::BlockWeights::simple_max(1024);
 }
 impl frame_system::Config for Test {
 	type BaseCallFilter = ();
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u64;
@@ -72,13 +74,6 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Event = Event;
 	type BlockHashCount = BlockHashCount;
-	type MaximumBlockWeight = MaximumBlockWeight;
-	type DbWeight = ();
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = MaximumBlockWeight;
-	type AvailableBlockRatio = AvailableBlockRatio;
-	type MaximumBlockLength = MaximumBlockLength;
 	type Version = ();
 	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u64>;
diff --git a/frame/utility/src/tests.rs b/frame/utility/src/tests.rs
index 5c1cbaf94cbf..95973a8823f5 100644
--- a/frame/utility/src/tests.rs
+++ b/frame/utility/src/tests.rs
@@ -30,7 +30,7 @@ use frame_support::{
 	storage,
 };
 use sp_core::H256;
-use sp_runtime::{Perbill, traits::{BlakeTwo256, IdentityLookup}, testing::Header};
+use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
 use crate as utility;
 
 // example module to test behaviors.
@@ -93,12 +93,14 @@ impl_outer_dispatch! {
 pub struct Test;
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
-	pub const MaximumBlockWeight: Weight = Weight::max_value();
-	pub const MaximumBlockLength: u32 = 2 * 1024;
-	pub const AvailableBlockRatio: Perbill = Perbill::one();
+	pub BlockWeights: frame_system::limits::BlockWeights =
+		frame_system::limits::BlockWeights::simple_max(Weight::max_value());
 }
 impl frame_system::Config for Test {
 	type BaseCallFilter = TestBaseCallFilter;
+	type BlockWeights = BlockWeights;
+	type BlockLength = ();
+	type DbWeight = ();
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u64;
@@ -110,13 +112,6 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Event = TestEvent;
 	type BlockHashCount = BlockHashCount;
-	type MaximumBlockWeight = MaximumBlockWeight;
-	type DbWeight = ();
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = MaximumBlockWeight;
-	type MaximumBlockLength = MaximumBlockLength;
-	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
 	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u64>;
@@ -350,6 +345,7 @@ fn batch_early_exit_works() {
 
 #[test]
 fn batch_weight_calculation_doesnt_overflow() {
+	use sp_runtime::Perbill;
 	new_test_ext().execute_with(|| {
 		let big_call = Call::System(SystemCall::fill_block(Perbill::from_percent(50)));
 		assert_eq!(big_call.get_dispatch_info().weight, Weight::max_value() / 2);
diff --git a/frame/vesting/src/lib.rs b/frame/vesting/src/lib.rs
index 4dbe27649ce9..a7a8147a062f 100644
--- a/frame/vesting/src/lib.rs
+++ b/frame/vesting/src/lib.rs
@@ -391,11 +391,10 @@ mod tests {
 	use super::*;
 
 	use frame_support::{
-		assert_ok, assert_noop, impl_outer_origin, parameter_types, weights::Weight,
+		assert_ok, assert_noop, impl_outer_origin, parameter_types,
 	};
 	use sp_core::H256;
 	use sp_runtime::{
-		Perbill,
 		testing::Header,
 		traits::{BlakeTwo256, IdentityLookup, Identity, BadOrigin},
 	};
@@ -409,12 +408,14 @@ mod tests {
 	pub struct Test;
 	parameter_types! {
 		pub const BlockHashCount: u64 = 250;
-		pub const MaximumBlockWeight: Weight = 1024;
-		pub const MaximumBlockLength: u32 = 2 * 1024;
-		pub const AvailableBlockRatio: Perbill = Perbill::one();
+		pub BlockWeights: frame_system::limits::BlockWeights =
+			frame_system::limits::BlockWeights::simple_max(1024);
 	}
 	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
+		type BlockWeights = ();
+		type BlockLength = ();
+		type DbWeight = ();
 		type Origin = Origin;
 		type Index = u64;
 		type BlockNumber = u64;
@@ -426,13 +427,6 @@ mod tests {
 		type Header = Header;
 		type Event = ();
 		type BlockHashCount = BlockHashCount;
-		type MaximumBlockWeight = MaximumBlockWeight;
-		type DbWeight = ();
-		type BlockExecutionWeight = ();
-		type ExtrinsicBaseWeight = ();
-		type MaximumExtrinsicWeight = MaximumBlockWeight;
-		type MaximumBlockLength = MaximumBlockLength;
-		type AvailableBlockRatio = AvailableBlockRatio;
 		type Version = ();
 		type PalletInfo = ();
 		type AccountData = pallet_balances::AccountData<u64>;
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index b4a69a491d58..da20f196b453 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -42,9 +42,11 @@ use sp_runtime::{
 	},
 	traits::{
 		BlindCheckable, BlakeTwo256, Block as BlockT, Extrinsic as ExtrinsicT,
-		GetNodeBlockType, GetRuntimeBlockType, NumberFor, Verify, IdentityLookup,
+		GetNodeBlockType, GetRuntimeBlockType, Verify, IdentityLookup,
 	},
 };
+#[cfg(feature = "std")]
+use sp_runtime::traits::NumberFor;
 use sp_version::RuntimeVersion;
 pub use sp_core::hash::H256;
 #[cfg(any(feature = "std", test))]
@@ -52,8 +54,9 @@ use sp_version::NativeVersion;
 use frame_support::{
 	impl_outer_origin, parameter_types,
 	traits::KeyOwnerProofSystem,
-	weights::{RuntimeDbWeight, Weight},
+	weights::RuntimeDbWeight,
 };
+use frame_system::limits::{BlockWeights, BlockLength};
 use sp_inherents::{CheckInherentsResult, InherentData};
 use cfg_if::cfg_if;
 
@@ -427,17 +430,20 @@ impl From<frame_system::Event<Runtime>> for Event {
 parameter_types! {
 	pub const BlockHashCount: BlockNumber = 2400;
 	pub const MinimumPeriod: u64 = 5;
-	pub const MaximumBlockWeight: Weight = 4 * 1024 * 1024;
 	pub const DbWeight: RuntimeDbWeight = RuntimeDbWeight {
 		read: 100,
 		write: 1000,
 	};
-	pub const MaximumBlockLength: u32 = 4 * 1024 * 1024;
-	pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);
+	pub RuntimeBlockLength: BlockLength =
+		BlockLength::max(4 * 1024 * 1024);
+	pub RuntimeBlockWeights: BlockWeights =
+		BlockWeights::with_sensible_defaults(4 * 1024 * 1024, Perbill::from_percent(75));
 }
 
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = ();
+	type BlockWeights = RuntimeBlockWeights;
+	type BlockLength = RuntimeBlockLength;
 	type Origin = Origin;
 	type Call = Extrinsic;
 	type Index = u64;
@@ -449,13 +455,7 @@ impl frame_system::Config for Runtime {
 	type Header = Header;
 	type Event = Event;
 	type BlockHashCount = BlockHashCount;
-	type MaximumBlockWeight = MaximumBlockWeight;
 	type DbWeight = ();
-	type BlockExecutionWeight = ();
-	type ExtrinsicBaseWeight = ();
-	type MaximumExtrinsicWeight = MaximumBlockWeight;
-	type MaximumBlockLength = MaximumBlockLength;
-	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
 	type PalletInfo = ();
 	type AccountData = ();

From f9d938215fc2fa06114f02b587a9fae608822795 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Tue, 8 Dec 2020 13:07:24 +0000
Subject: [PATCH 0151/1194] client: remove duplicate implementation of
 block_status (#7694)

---
 client/service/src/client/client.rs | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index f72fcb810769..84174738b560 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -1901,8 +1901,7 @@ impl<B, E, Block, RA> BlockBackend<Block> for Client<B, E, Block, RA>
 		self.body(id)
 	}
 
-	fn block(&self, id: &BlockId<Block>) -> sp_blockchain::Result<Option<SignedBlock<Block>>>
-	{
+	fn block(&self, id: &BlockId<Block>) -> sp_blockchain::Result<Option<SignedBlock<Block>>> {
 		Ok(match (self.header(id)?, self.body(id)?, self.justification(id)?) {
 			(Some(header), Some(extrinsics), justification) =>
 				Some(SignedBlock { block: Block::new(header, extrinsics), justification }),
@@ -1911,26 +1910,7 @@ impl<B, E, Block, RA> BlockBackend<Block> for Client<B, E, Block, RA>
 	}
 
 	fn block_status(&self, id: &BlockId<Block>) -> sp_blockchain::Result<BlockStatus> {
-		// this can probably be implemented more efficiently
-		if let BlockId::Hash(ref h) = id {
-			if self.importing_block.read().as_ref().map_or(false, |importing| h == importing) {
-				return Ok(BlockStatus::Queued);
-			}
-		}
-		let hash_and_number = match id.clone() {
-			BlockId::Hash(hash) => self.backend.blockchain().number(hash)?.map(|n| (hash, n)),
-			BlockId::Number(n) => self.backend.blockchain().hash(n)?.map(|hash| (hash, n)),
-		};
-		match hash_and_number {
-			Some((hash, number)) => {
-				if self.backend.have_state_at(&hash, number) {
-					Ok(BlockStatus::InChainWithState)
-				} else {
-					Ok(BlockStatus::InChainPruned)
-				}
-			}
-			None => Ok(BlockStatus::Unknown),
-		}
+		Client::block_status(self, id)
 	}
 
 	fn justification(&self, id: &BlockId<Block>) -> sp_blockchain::Result<Option<Justification>> {

From 4c0779e751552419f0973ea14c455c8afce78def Mon Sep 17 00:00:00 2001
From: Denis Pisarev <denis.pisarev@parity.io>
Date: Tue, 8 Dec 2020 18:00:36 +0100
Subject: [PATCH 0152/1194] Pin md link checker's version (#7697)

* CI: pin md link checker's version to the previous release

* CI: add a whitelist for allowed GH actions pins

* CI: try master tip [skip ci]

* CI: return to a previous markdown-link-check dependency version [skip ci]

* CI: substitute %20 for a literal space [skip ci]

* CI: substitute %20 for a literal space
---
 .github/allowed-actions.js          | 7 +++++++
 .github/workflows/md-link-check.yml | 2 +-
 .github/workflows/mlc_config.json   | 6 ++++++
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 .github/allowed-actions.js

diff --git a/.github/allowed-actions.js b/.github/allowed-actions.js
new file mode 100644
index 000000000000..4a8af91328ff
--- /dev/null
+++ b/.github/allowed-actions.js
@@ -0,0 +1,7 @@
+// This is a whitelist of GitHub Actions that are approved for use in this project.
+// If a new or existing workflow file is updated to use an action or action version
+// not listed here, CI will fail.
+
+module.exports = [
+    'gaurav-nelson/github-action-markdown-link-check@e3c371c731b2f494f856dc5de7f61cea4d519907', // gaurav-nelson/github-action-markdown-link-check@v1.0.8
+]
diff --git a/.github/workflows/md-link-check.yml b/.github/workflows/md-link-check.yml
index 75948534b3c1..e15a506c567d 100644
--- a/.github/workflows/md-link-check.yml
+++ b/.github/workflows/md-link-check.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: gaurav-nelson/github-action-markdown-link-check@v1
+    - uses: gaurav-nelson/github-action-markdown-link-check@e3c371c731b2f494f856dc5de7f61cea4d519907
       with:
         use-quiet-mode: 'yes'
         config-file: '.github/workflows/mlc_config.json'
diff --git a/.github/workflows/mlc_config.json b/.github/workflows/mlc_config.json
index f741e987b1b2..ffd0a0319fe6 100644
--- a/.github/workflows/mlc_config.json
+++ b/.github/workflows/mlc_config.json
@@ -3,5 +3,11 @@
         {
             "pattern": "^https://crates.io"
         }
+    ],
+    "replacementPatterns": [
+        {
+          "pattern": "%20",
+          "replacement": " "
+        }
     ]
 }

From 609efdbd91073d7873f20048bf778f6ee9d802fe Mon Sep 17 00:00:00 2001
From: Denis Pisarev <denis.pisarev@parity.io>
Date: Tue, 8 Dec 2020 18:53:22 +0100
Subject: [PATCH 0153/1194] Remove waterfall CI trigger (#7519)

* fix (CI): fix the triggered project name

* fix (CI): debug run

* fix (CI): debug run 2

* fix (CI): revert debug2

* Revert "fix (CI): debug run"

This reverts commit 96866a953da797ef6e0689374eecc0d8cba4627d.

* CI: remove the trigger
---
 .gitlab-ci.yml | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 215157061bb0..07b0dd319cf7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,6 @@ stages:
   - check
   - test
   - build
-  - post-build-test
   - chaos-env
   - chaos
   - publish
@@ -491,24 +490,6 @@ build-rust-doc:
     - echo "<meta http-equiv=refresh content=0;url=sc_service/index.html>" > ./crate-docs/index.html
     - sccache -s
 
-#### stage:                        post-build-test
-
-trigger-contracts-ci:
-  stage:                           post-build-test
-  needs:
-    - job:                         build-linux-substrate
-      artifacts:                   false
-    - job:                         test-linux-stable
-      artifacts:                   false
-  trigger:
-    project:                       parity/srml-contracts-waterfall
-    branch:                        master
-    strategy:                      depend
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "web"
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-    - if: $CI_COMMIT_REF_NAME == "master"
-
 #### stage:                        chaos-env
 
 build-chaos-docker:

From d877123b3050d8a50e83fc310d7091f45f23a748 Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Tue, 8 Dec 2020 12:13:21 -0600
Subject: [PATCH 0154/1194] add an upgrade_keys method for pallet-session
 (#7688)

* add an upgrade_keys method for pallet-session

* test the upgrade_keys function
---
 frame/session/src/lib.rs   | 49 ++++++++++++++++++++
 frame/session/src/mock.rs  | 25 ++++++++++
 frame/session/src/tests.rs | 95 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 169 insertions(+)

diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs
index 883a0cc5ab28..dd176219aa7c 100644
--- a/frame/session/src/lib.rs
+++ b/frame/session/src/lib.rs
@@ -683,6 +683,55 @@ impl<T: Config> Module<T> {
 		Self::validators().iter().position(|i| i == c).map(Self::disable_index).ok_or(())
 	}
 
+	/// Upgrade the key type from some old type to a new type. Supports adding
+	/// and removing key types.
+	///
+	/// This function should be used with extreme care and only during an
+	/// `on_runtime_upgrade` block. Misuse of this function can put your blockchain
+	/// into an unrecoverable state.
+	///
+	/// Care should be taken that the raw versions of the
+	/// added keys are unique for every `ValidatorId, KeyTypeId` combination.
+	/// This is an invariant that the session module typically maintains internally.
+	///
+	/// As the actual values of the keys are typically not known at runtime upgrade,
+	/// it's recommended to initialize the keys to a (unique) dummy value with the expectation
+	/// that all validators should invoke `set_keys` before those keys are actually
+	/// required.
+	pub fn upgrade_keys<Old, F>(upgrade: F) where
+		Old: OpaqueKeys + Member + Decode,
+		F: Fn(T::ValidatorId, Old) -> T::Keys,
+	{
+		let old_ids = Old::key_ids();
+		let new_ids = T::Keys::key_ids();
+
+		// Translate NextKeys, and key ownership relations at the same time.
+		<NextKeys<T>>::translate::<Old, _>(|val, old_keys| {
+			// Clear all key ownership relations. Typically the overlap should
+			// stay the same, but no guarantees by the upgrade function.
+			for i in old_ids.iter() {
+				Self::clear_key_owner(*i, old_keys.get_raw(*i));
+			}
+
+			let new_keys = upgrade(val.clone(), old_keys);
+
+			// And now set the new ones.
+			for i in new_ids.iter() {
+				Self::put_key_owner(*i, new_keys.get_raw(*i), &val);
+			}
+
+			Some(new_keys)
+		});
+
+		let _ = <QueuedKeys<T>>::translate::<Vec<(T::ValidatorId, Old)>, _>(
+			|k| {
+				k.map(|k| k.into_iter()
+					.map(|(val, old_keys)| (val.clone(), upgrade(val, old_keys)))
+					.collect::<Vec<_>>())
+			}
+		);
+	}
+
 	/// Perform the set_key operation, checking for duplicates. Does not set `Changed`.
 	///
 	/// This ensures that the reference counter in system is incremented appropriately and as such
diff --git a/frame/session/src/mock.rs b/frame/session/src/mock.rs
index 0a7f89f5d57f..fa71859feb40 100644
--- a/frame/session/src/mock.rs
+++ b/frame/session/src/mock.rs
@@ -40,6 +40,31 @@ impl From<UintAuthorityId> for MockSessionKeys {
 	}
 }
 
+pub const KEY_ID_A: KeyTypeId = KeyTypeId([4; 4]);
+pub const KEY_ID_B: KeyTypeId = KeyTypeId([9; 4]);
+
+#[derive(Debug, Clone, codec::Encode, codec::Decode, PartialEq, Eq)]
+pub struct PreUpgradeMockSessionKeys {
+	pub a: [u8; 32],
+	pub b: [u8; 64],
+}
+
+impl OpaqueKeys for PreUpgradeMockSessionKeys {
+	type KeyTypeIdProviders = ();
+
+	fn key_ids() -> &'static [KeyTypeId] {
+		&[KEY_ID_A, KEY_ID_B]
+	}
+
+	fn get_raw(&self, i: KeyTypeId) -> &[u8] {
+		match i {
+			i if i == KEY_ID_A => &self.a[..],
+			i if i == KEY_ID_B => &self.b[..],
+			_ => &[],
+		}
+	}
+}
+
 impl_outer_origin! {
 	pub enum Origin for Test where system = frame_system {}
 }
diff --git a/frame/session/src/tests.rs b/frame/session/src/tests.rs
index 36857824de8b..7a33aa5296bc 100644
--- a/frame/session/src/tests.rs
+++ b/frame/session/src/tests.rs
@@ -25,6 +25,7 @@ use mock::{
 	SESSION_CHANGED, TEST_SESSION_CHANGED, authorities, force_new_session,
 	set_next_validators, set_session_length, session_changed, Origin, System, Session,
 	reset_before_session_end_called, before_session_end_called, new_test_ext,
+	PreUpgradeMockSessionKeys,
 };
 
 fn initialize_block(block: u64) {
@@ -308,3 +309,97 @@ fn return_true_if_more_than_third_is_disabled() {
 		assert_eq!(Session::disable_index(3), true);
 	});
 }
+
+#[test]
+fn upgrade_keys() {
+	use frame_support::storage;
+	use mock::Test;
+	use sp_core::crypto::key_types::DUMMY;
+
+	// This test assumes certain mocks.
+	assert_eq!(mock::NEXT_VALIDATORS.with(|l| l.borrow().clone()), vec![1, 2, 3]);
+	assert_eq!(mock::VALIDATORS.with(|l| l.borrow().clone()), vec![1, 2, 3]);
+
+	new_test_ext().execute_with(|| {
+		let pre_one = PreUpgradeMockSessionKeys {
+			a: [1u8; 32],
+			b: [1u8; 64],
+		};
+
+		let pre_two = PreUpgradeMockSessionKeys {
+			a: [2u8; 32],
+			b: [2u8; 64],
+		};
+
+		let pre_three = PreUpgradeMockSessionKeys {
+			a: [3u8; 32],
+			b: [3u8; 64],
+		};
+
+		let val_keys = vec![
+			(1u64, pre_one),
+			(2u64, pre_two),
+			(3u64, pre_three),
+		];
+
+		// Set `QueuedKeys`.
+		{
+			let storage_key = <super::QueuedKeys<Test>>::hashed_key();
+			assert!(storage::unhashed::exists(&storage_key));
+			storage::unhashed::put(&storage_key, &val_keys);
+		}
+
+		// Set `NextKeys`.
+		{
+			for &(i, ref keys) in val_keys.iter() {
+				let storage_key = <super::NextKeys<Test>>::hashed_key_for(i);
+				assert!(storage::unhashed::exists(&storage_key));
+				storage::unhashed::put(&storage_key, keys);
+			}
+		}
+
+		// Set `KeyOwner`.
+		{
+			for &(i, ref keys) in val_keys.iter() {
+				// clear key owner for `UintAuthorityId` keys set in genesis.
+				let presumed = UintAuthorityId(i);
+				let raw_prev = presumed.as_ref();
+
+				assert_eq!(Session::key_owner(DUMMY, raw_prev), Some(i));
+				Session::clear_key_owner(DUMMY, raw_prev);
+
+				Session::put_key_owner(mock::KEY_ID_A, keys.get_raw(mock::KEY_ID_A), &i);
+				Session::put_key_owner(mock::KEY_ID_B, keys.get_raw(mock::KEY_ID_B), &i);
+			}
+		}
+
+		// Do the upgrade and check sanity.
+		let mock_keys_for = |val| mock::MockSessionKeys { dummy: UintAuthorityId(val) };
+		Session::upgrade_keys::<PreUpgradeMockSessionKeys, _>(
+			|val, _old_keys| mock_keys_for(val),
+		);
+
+		// Check key ownership.
+		for (i, ref keys) in val_keys.iter() {
+			assert!(Session::key_owner(mock::KEY_ID_A, keys.get_raw(mock::KEY_ID_A)).is_none());
+			assert!(Session::key_owner(mock::KEY_ID_B, keys.get_raw(mock::KEY_ID_B)).is_none());
+
+			let migrated_key = UintAuthorityId(*i);
+			assert_eq!(Session::key_owner(DUMMY, migrated_key.as_ref()), Some(*i));
+		}
+
+		// Check queued keys.
+		assert_eq!(
+			Session::queued_keys(),
+			vec![
+				(1, mock_keys_for(1)),
+				(2, mock_keys_for(2)),
+				(3, mock_keys_for(3)),
+			],
+		);
+
+		for i in 1u64..4 {
+			assert_eq!(<super::NextKeys<Test>>::get(&i), Some(mock_keys_for(i)));
+		}
+	})
+}

From 469836fb550b48f09a42fe5498a2a5af3c8a5935 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Wed, 9 Dec 2020 02:17:28 +0100
Subject: [PATCH 0155/1194] Allow capping the amount of work performed when
 deleting a child trie (#7671)

* Allow Backend::for_keys_in_child_storage to be aborted by the closure

* Ext::kill_child_storage now takes an upper limit for backend deletion

* Add Storage::storage_kill_limited() runtime interface

* review: Use a new version of kill_storage instead of a new interface

* review: Simplify boolean expression

Co-authored-by: cheme <emericchevalier.pro@gmail.com>

* review: Rename for_keys_in_child_storage

Co-authored-by: cheme <emericchevalier.pro@gmail.com>
---
 client/db/src/bench.rs                        |  4 +-
 client/db/src/lib.rs                          |  4 +-
 client/db/src/storage_cache.rs                |  8 +-
 client/light/src/backend.rs                   |  4 +-
 frame/contracts/src/rent.rs                   |  2 +
 frame/contracts/src/storage.rs                |  2 +-
 frame/support/src/storage/child.rs            | 36 ++++++++-
 primitives/externalities/src/lib.rs           | 12 ++-
 primitives/io/src/lib.rs                      | 30 ++++++-
 primitives/state-machine/src/backend.rs       |  7 +-
 primitives/state-machine/src/basic.rs         |  6 +-
 primitives/state-machine/src/ext.rs           | 33 ++++++--
 primitives/state-machine/src/lib.rs           | 81 +++++++++++++++++++
 .../state-machine/src/proving_backend.rs      |  4 +-
 primitives/state-machine/src/read_only.rs     |  3 +-
 primitives/state-machine/src/trie_backend.rs  |  4 +-
 .../state-machine/src/trie_backend_essence.rs |  3 +-
 primitives/tasks/src/async_externalities.rs   |  3 +-
 primitives/trie/src/lib.rs                    |  7 +-
 19 files changed, 219 insertions(+), 34 deletions(-)

diff --git a/client/db/src/bench.rs b/client/db/src/bench.rs
index f3c8f1aff9e1..5696922b4fbb 100644
--- a/client/db/src/bench.rs
+++ b/client/db/src/bench.rs
@@ -350,13 +350,13 @@ impl<B: BlockT> StateBackend<HashFor<B>> for BenchmarkingState<B> {
 		}
 	}
 
-	fn for_keys_in_child_storage<F: FnMut(&[u8])>(
+	fn apply_to_child_keys_while<F: FnMut(&[u8]) -> bool>(
 		&self,
 		child_info: &ChildInfo,
 		f: F,
 	) {
 		if let Some(ref state) = *self.state.borrow() {
-			state.for_keys_in_child_storage(child_info, f)
+			state.apply_to_child_keys_while(child_info, f)
 		}
 	}
 
diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index 8254e652f68b..e32e45a2f314 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -195,12 +195,12 @@ impl<B: BlockT> StateBackend<HashFor<B>> for RefTrackingState<B> {
 		self.state.for_key_values_with_prefix(prefix, f)
 	}
 
-	fn for_keys_in_child_storage<F: FnMut(&[u8])>(
+	fn apply_to_child_keys_while<F: FnMut(&[u8]) -> bool>(
 		&self,
 		child_info: &ChildInfo,
 		f: F,
 	) {
-		self.state.for_keys_in_child_storage(child_info, f)
+		self.state.apply_to_child_keys_while(child_info, f)
 	}
 
 	fn for_child_keys_with_prefix<F: FnMut(&[u8])>(
diff --git a/client/db/src/storage_cache.rs b/client/db/src/storage_cache.rs
index 0b4b6d4f88ef..292d3c516260 100644
--- a/client/db/src/storage_cache.rs
+++ b/client/db/src/storage_cache.rs
@@ -584,12 +584,12 @@ impl<S: StateBackend<HashFor<B>>, B: BlockT> StateBackend<HashFor<B>> for Cachin
 		self.state.exists_child_storage(child_info, key)
 	}
 
-	fn for_keys_in_child_storage<F: FnMut(&[u8])>(
+	fn apply_to_child_keys_while<F: FnMut(&[u8]) -> bool>(
 		&self,
 		child_info: &ChildInfo,
 		f: F,
 	) {
-		self.state.for_keys_in_child_storage(child_info, f)
+		self.state.apply_to_child_keys_while(child_info, f)
 	}
 
 	fn next_storage_key(&self, key: &[u8]) -> Result<Option<Vec<u8>>, Self::Error> {
@@ -766,12 +766,12 @@ impl<S: StateBackend<HashFor<B>>, B: BlockT> StateBackend<HashFor<B>> for Syncin
 		self.caching_state().exists_child_storage(child_info, key)
 	}
 
-	fn for_keys_in_child_storage<F: FnMut(&[u8])>(
+	fn apply_to_child_keys_while<F: FnMut(&[u8]) -> bool>(
 		&self,
 		child_info: &ChildInfo,
 		f: F,
 	) {
-		self.caching_state().for_keys_in_child_storage(child_info, f)
+		self.caching_state().apply_to_child_keys_while(child_info, f)
 	}
 
 	fn next_storage_key(&self, key: &[u8]) -> Result<Option<Vec<u8>>, Self::Error> {
diff --git a/client/light/src/backend.rs b/client/light/src/backend.rs
index be7953e528bd..74e1d613bcf5 100644
--- a/client/light/src/backend.rs
+++ b/client/light/src/backend.rs
@@ -441,14 +441,14 @@ impl<H: Hasher> StateBackend<H> for GenesisOrUnavailableState<H>
 		}
 	}
 
-	fn for_keys_in_child_storage<A: FnMut(&[u8])>(
+	fn apply_to_child_keys_while<A: FnMut(&[u8]) -> bool>(
 		&self,
 		child_info: &ChildInfo,
 		action: A,
 	) {
 		match *self {
 			GenesisOrUnavailableState::Genesis(ref state) =>
-				state.for_keys_in_child_storage(child_info, action),
+				state.apply_to_child_keys_while(child_info, action),
 			GenesisOrUnavailableState::Unavailable => (),
 		}
 	}
diff --git a/frame/contracts/src/rent.rs b/frame/contracts/src/rent.rs
index 6ee65a54bb58..8b6f81c916be 100644
--- a/frame/contracts/src/rent.rs
+++ b/frame/contracts/src/rent.rs
@@ -240,6 +240,7 @@ where
 				<ContractInfoOf<T>>::remove(account);
 				child::kill_storage(
 					&alive_contract_info.child_trie_info(),
+					None,
 				);
 				<Module<T>>::deposit_event(RawEvent::Evicted(account.clone(), false));
 				None
@@ -263,6 +264,7 @@ where
 
 				child::kill_storage(
 					&alive_contract_info.child_trie_info(),
+					None,
 				);
 
 				<Module<T>>::deposit_event(RawEvent::Evicted(account.clone(), true));
diff --git a/frame/contracts/src/storage.rs b/frame/contracts/src/storage.rs
index c9eeba4633a1..ba09adb285b9 100644
--- a/frame/contracts/src/storage.rs
+++ b/frame/contracts/src/storage.rs
@@ -195,7 +195,7 @@ where
 	/// This function doesn't affect the account.
 	pub fn destroy_contract(address: &AccountIdOf<T>, trie_id: &TrieId) {
 		<ContractInfoOf<T>>::remove(address);
-		child::kill_storage(&crate::child_trie_info(&trie_id));
+		child::kill_storage(&crate::child_trie_info(&trie_id), None);
 	}
 
 	/// This generator uses inner counter for account id and applies the hash over `AccountId +
diff --git a/frame/support/src/storage/child.rs b/frame/support/src/storage/child.rs
index 431b5e093038..d98615544727 100644
--- a/frame/support/src/storage/child.rs
+++ b/frame/support/src/storage/child.rs
@@ -25,6 +25,14 @@ use crate::sp_std::prelude::*;
 use codec::{Codec, Encode, Decode};
 pub use sp_core::storage::{ChildInfo, ChildType};
 
+/// The outcome of calling [`kill_storage`].
+pub enum KillOutcome {
+	/// No key remains in the child trie.
+	AllRemoved,
+	/// At least one key still resides in the child trie due to the supplied limit.
+	SomeRemaining,
+}
+
 /// Return the value of the item in storage under `key`, or `None` if there is no explicit entry.
 pub fn get<T: Decode + Sized>(
 	child_info: &ChildInfo,
@@ -148,13 +156,37 @@ pub fn exists(
 }
 
 /// Remove all `storage_key` key/values
+///
+/// Deletes all keys from the overlay and up to `limit` keys from the backend if
+/// it is set to `Some`. No limit is applied when `limit` is set to `None`.
+///
+/// The limit can be used to partially delete a child trie in case it is too large
+/// to delete in one go (block).
+///
+/// # Note
+///
+/// Please note that keys that are residing in the overlay for that child trie when
+/// issuing this call are all deleted without counting towards the `limit`. Only keys
+/// written during the current block are part of the overlay. Deleting with a `limit`
+/// mostly makes sense with an empty overlay for that child trie.
+///
+/// Calling this function multiple times per block for the same `storage_key` does
+/// not make much sense because it is not cumulative when called inside the same block.
+/// Use this function to distribute the deletion of a single child trie across multiple
+/// blocks.
 pub fn kill_storage(
 	child_info: &ChildInfo,
-) {
-	match child_info.child_type() {
+	limit: Option<u32>,
+) -> KillOutcome {
+	let all_removed = match child_info.child_type() {
 		ChildType::ParentKeyId => sp_io::default_child_storage::storage_kill(
 			child_info.storage_key(),
+			limit
 		),
+	};
+	match all_removed {
+		true => KillOutcome::AllRemoved,
+		false => KillOutcome::SomeRemaining,
 	}
 }
 
diff --git a/primitives/externalities/src/lib.rs b/primitives/externalities/src/lib.rs
index 388482964f18..6869969f4ba1 100644
--- a/primitives/externalities/src/lib.rs
+++ b/primitives/externalities/src/lib.rs
@@ -137,7 +137,17 @@ pub trait Externalities: ExtensionStore {
 	) -> Option<Vec<u8>>;
 
 	/// Clear an entire child storage.
-	fn kill_child_storage(&mut self, child_info: &ChildInfo);
+	///
+	/// Deletes all keys from the overlay and up to `limit` keys from the backend. No
+	/// limit is applied if `limit` is `None`. Returns `true` if the child trie was
+	/// removed completely and `false` if there are remaining keys after the function
+	/// returns.
+	///
+	/// # Note
+	///
+	/// An implementation is free to delete more keys than the specified limit as long as
+	/// it is able to do that in constant time.
+	fn kill_child_storage(&mut self, child_info: &ChildInfo, limit: Option<u32>) -> bool;
 
 	/// Clear storage entries which keys are start with the given prefix.
 	fn clear_prefix(&mut self, prefix: &[u8]);
diff --git a/primitives/io/src/lib.rs b/primitives/io/src/lib.rs
index d812baefb57e..b6ae64e5f898 100644
--- a/primitives/io/src/lib.rs
+++ b/primitives/io/src/lib.rs
@@ -279,7 +279,35 @@ pub trait DefaultChildStorage {
 		storage_key: &[u8],
 	) {
 		let child_info = ChildInfo::new_default(storage_key);
-		self.kill_child_storage(&child_info);
+		self.kill_child_storage(&child_info, None);
+	}
+
+	/// Clear a child storage key.
+	///
+	/// Deletes all keys from the overlay and up to `limit` keys from the backend if
+	/// it is set to `Some`. No limit is applied when `limit` is set to `None`.
+	///
+	/// The limit can be used to partially delete a child trie in case it is too large
+	/// to delete in one go (block).
+	///
+	/// It returns false iff some keys are remaining in
+	/// the child trie after the functions returns.
+	///
+	/// # Note
+	///
+	/// Please note that keys that are residing in the overlay for that child trie when
+	/// issuing this call are all deleted without counting towards the `limit`. Only keys
+	/// written during the current block are part of the overlay. Deleting with a `limit`
+	/// mostly makes sense with an empty overlay for that child trie.
+	///
+	/// Calling this function multiple times per block for the same `storage_key` does
+	/// not make much sense because it is not cumulative when called inside the same block.
+	/// Use this function to distribute the deletion of a single child trie across multiple
+	/// blocks.
+	#[version(2)]
+	fn storage_kill(&mut self, storage_key: &[u8], limit: Option<u32>) -> bool {
+		let child_info = ChildInfo::new_default(storage_key);
+		self.kill_child_storage(&child_info, limit)
 	}
 
 	/// Check a child storage key.
diff --git a/primitives/state-machine/src/backend.rs b/primitives/state-machine/src/backend.rs
index 360fe9a98568..02151c2480e3 100644
--- a/primitives/state-machine/src/backend.rs
+++ b/primitives/state-machine/src/backend.rs
@@ -94,7 +94,8 @@ pub trait Backend<H: Hasher>: sp_std::fmt::Debug {
 	) -> Result<Option<StorageKey>, Self::Error>;
 
 	/// Retrieve all entries keys of child storage and call `f` for each of those keys.
-	fn for_keys_in_child_storage<F: FnMut(&[u8])>(
+	/// Aborts as soon as `f` returns false.
+	fn apply_to_child_keys_while<F: FnMut(&[u8]) -> bool>(
 		&self,
 		child_info: &ChildInfo,
 		f: F,
@@ -263,12 +264,12 @@ impl<'a, T: Backend<H>, H: Hasher> Backend<H> for &'a T {
 		(*self).child_storage(child_info, key)
 	}
 
-	fn for_keys_in_child_storage<F: FnMut(&[u8])>(
+	fn apply_to_child_keys_while<F: FnMut(&[u8]) -> bool>(
 		&self,
 		child_info: &ChildInfo,
 		f: F,
 	) {
-		(*self).for_keys_in_child_storage(child_info, f)
+		(*self).apply_to_child_keys_while(child_info, f)
 	}
 
 	fn next_storage_key(&self, key: &[u8]) -> Result<Option<StorageKey>, Self::Error> {
diff --git a/primitives/state-machine/src/basic.rs b/primitives/state-machine/src/basic.rs
index 5e3c9bed64f1..9de75785e459 100644
--- a/primitives/state-machine/src/basic.rs
+++ b/primitives/state-machine/src/basic.rs
@@ -210,8 +210,10 @@ impl Externalities for BasicExternalities {
 	fn kill_child_storage(
 		&mut self,
 		child_info: &ChildInfo,
-	) {
+		_limit: Option<u32>,
+	) -> bool {
 		self.inner.children_default.remove(child_info.storage_key());
+		true
 	}
 
 	fn clear_prefix(&mut self, prefix: &[u8]) {
@@ -407,7 +409,7 @@ mod tests {
 		ext.clear_child_storage(child_info, b"dog");
 		assert_eq!(ext.child_storage(child_info, b"dog"), None);
 
-		ext.kill_child_storage(child_info);
+		ext.kill_child_storage(child_info, None);
 		assert_eq!(ext.child_storage(child_info, b"doe"), None);
 	}
 
diff --git a/primitives/state-machine/src/ext.rs b/primitives/state-machine/src/ext.rs
index 53aab42999d5..3c4d88f3920b 100644
--- a/primitives/state-machine/src/ext.rs
+++ b/primitives/state-machine/src/ext.rs
@@ -411,18 +411,41 @@ where
 	fn kill_child_storage(
 		&mut self,
 		child_info: &ChildInfo,
-	) {
+		limit: Option<u32>,
+	) -> bool {
 		trace!(target: "state", "{:04x}: KillChild({})",
 			self.id,
 			HexDisplay::from(&child_info.storage_key()),
 		);
 		let _guard = guard();
-
 		self.mark_dirty();
 		self.overlay.clear_child_storage(child_info);
-		self.backend.for_keys_in_child_storage(child_info, |key| {
-			self.overlay.set_child_storage(child_info, key.to_vec(), None);
-		});
+
+		if let Some(limit) = limit {
+			let mut num_deleted: u32 = 0;
+			let mut all_deleted = true;
+			self.backend.apply_to_child_keys_while(child_info, |key| {
+				if num_deleted == limit {
+					all_deleted = false;
+					return false;
+				}
+				if let Some(num) = num_deleted.checked_add(1) {
+					num_deleted = num;
+				} else {
+					all_deleted = false;
+					return false;
+				}
+				self.overlay.set_child_storage(child_info, key.to_vec(), None);
+				true
+			});
+			all_deleted
+		} else {
+			self.backend.apply_to_child_keys_while(child_info, |key| {
+				self.overlay.set_child_storage(child_info, key.to_vec(), None);
+				true
+			});
+			true
+		}
 	}
 
 	fn clear_prefix(&mut self, prefix: &[u8]) {
diff --git a/primitives/state-machine/src/lib.rs b/primitives/state-machine/src/lib.rs
index 28148b6411a1..c83dce4bedf6 100644
--- a/primitives/state-machine/src/lib.rs
+++ b/primitives/state-machine/src/lib.rs
@@ -1147,6 +1147,86 @@ mod tests {
 		);
 	}
 
+	#[test]
+	fn limited_child_kill_works() {
+		let child_info = ChildInfo::new_default(b"sub1");
+		let initial: HashMap<_, BTreeMap<_, _>> = map![
+			Some(child_info.clone()) => map![
+				b"a".to_vec() => b"0".to_vec(),
+				b"b".to_vec() => b"1".to_vec(),
+				b"c".to_vec() => b"2".to_vec(),
+				b"d".to_vec() => b"3".to_vec()
+			],
+		];
+		let backend = InMemoryBackend::<BlakeTwo256>::from(initial);
+
+		let mut overlay = OverlayedChanges::default();
+		overlay.set_child_storage(&child_info, b"1".to_vec(), Some(b"1312".to_vec()));
+		overlay.set_child_storage(&child_info, b"2".to_vec(), Some(b"1312".to_vec()));
+		overlay.set_child_storage(&child_info, b"3".to_vec(), Some(b"1312".to_vec()));
+		overlay.set_child_storage(&child_info, b"4".to_vec(), Some(b"1312".to_vec()));
+
+		{
+			let mut offchain_overlay = Default::default();
+			let mut cache = StorageTransactionCache::default();
+			let mut ext = Ext::new(
+				&mut overlay,
+				&mut offchain_overlay,
+				&mut cache,
+				&backend,
+				changes_trie::disabled_state::<_, u64>(),
+				None,
+			);
+			assert_eq!(ext.kill_child_storage(&child_info, Some(2)), false);
+		}
+
+		assert_eq!(
+			overlay.children()
+				.flat_map(|(iter, _child_info)| iter)
+				.map(|(k, v)| (k.clone(), v.value().clone()))
+				.collect::<BTreeMap<_, _>>(),
+			map![
+				b"1".to_vec() => None.into(),
+				b"2".to_vec() => None.into(),
+				b"3".to_vec() => None.into(),
+				b"4".to_vec() => None.into(),
+				b"a".to_vec() => None.into(),
+				b"b".to_vec() => None.into(),
+			],
+		);
+	}
+
+	#[test]
+	fn limited_child_kill_off_by_one_works() {
+		let child_info = ChildInfo::new_default(b"sub1");
+		let initial: HashMap<_, BTreeMap<_, _>> = map![
+			Some(child_info.clone()) => map![
+				b"a".to_vec() => b"0".to_vec(),
+				b"b".to_vec() => b"1".to_vec(),
+				b"c".to_vec() => b"2".to_vec(),
+				b"d".to_vec() => b"3".to_vec()
+			],
+		];
+		let backend = InMemoryBackend::<BlakeTwo256>::from(initial);
+		let mut overlay = OverlayedChanges::default();
+		let mut offchain_overlay = Default::default();
+		let mut cache = StorageTransactionCache::default();
+		let mut ext = Ext::new(
+			&mut overlay,
+			&mut offchain_overlay,
+			&mut cache,
+			&backend,
+			changes_trie::disabled_state::<_, u64>(),
+			None,
+		);
+		assert_eq!(ext.kill_child_storage(&child_info, Some(0)), false);
+		assert_eq!(ext.kill_child_storage(&child_info, Some(1)), false);
+		assert_eq!(ext.kill_child_storage(&child_info, Some(2)), false);
+		assert_eq!(ext.kill_child_storage(&child_info, Some(3)), false);
+		assert_eq!(ext.kill_child_storage(&child_info, Some(4)), true);
+		assert_eq!(ext.kill_child_storage(&child_info, Some(5)), true);
+	}
+
 	#[test]
 	fn set_child_storage_works() {
 		let child_info = ChildInfo::new_default(b"sub1");
@@ -1179,6 +1259,7 @@ mod tests {
 		);
 		ext.kill_child_storage(
 			child_info,
+			None,
 		);
 		assert_eq!(
 			ext.child_storage(
diff --git a/primitives/state-machine/src/proving_backend.rs b/primitives/state-machine/src/proving_backend.rs
index 0888c561cae3..63a027cfba06 100644
--- a/primitives/state-machine/src/proving_backend.rs
+++ b/primitives/state-machine/src/proving_backend.rs
@@ -204,12 +204,12 @@ impl<'a, S, H> Backend<H> for ProvingBackend<'a, S, H>
 		self.0.child_storage(child_info, key)
 	}
 
-	fn for_keys_in_child_storage<F: FnMut(&[u8])>(
+	fn apply_to_child_keys_while<F: FnMut(&[u8]) -> bool>(
 		&self,
 		child_info: &ChildInfo,
 		f: F,
 	) {
-		self.0.for_keys_in_child_storage(child_info, f)
+		self.0.apply_to_child_keys_while(child_info, f)
 	}
 
 	fn next_storage_key(&self, key: &[u8]) -> Result<Option<Vec<u8>>, Self::Error> {
diff --git a/primitives/state-machine/src/read_only.rs b/primitives/state-machine/src/read_only.rs
index 1b70958145c7..2ab92f5fbb6c 100644
--- a/primitives/state-machine/src/read_only.rs
+++ b/primitives/state-machine/src/read_only.rs
@@ -131,7 +131,8 @@ impl<'a, H: Hasher, B: 'a + Backend<H>> Externalities for ReadOnlyExternalities<
 	fn kill_child_storage(
 		&mut self,
 		_child_info: &ChildInfo,
-	) {
+		_limit: Option<u32>,
+	) -> bool {
 		unimplemented!("kill_child_storage is not supported in ReadOnlyExternalities")
 	}
 
diff --git a/primitives/state-machine/src/trie_backend.rs b/primitives/state-machine/src/trie_backend.rs
index 4eaa0870baed..ffae1a02c036 100644
--- a/primitives/state-machine/src/trie_backend.rs
+++ b/primitives/state-machine/src/trie_backend.rs
@@ -113,12 +113,12 @@ impl<S: TrieBackendStorage<H>, H: Hasher> Backend<H> for TrieBackend<S, H> where
 		self.essence.for_key_values_with_prefix(prefix, f)
 	}
 
-	fn for_keys_in_child_storage<F: FnMut(&[u8])>(
+	fn apply_to_child_keys_while<F: FnMut(&[u8]) -> bool>(
 		&self,
 		child_info: &ChildInfo,
 		f: F,
 	) {
-		self.essence.for_keys_in_child_storage(child_info, f)
+		self.essence.apply_to_child_keys_while(child_info, f)
 	}
 
 	fn for_child_keys_with_prefix<F: FnMut(&[u8])>(
diff --git a/primitives/state-machine/src/trie_backend_essence.rs b/primitives/state-machine/src/trie_backend_essence.rs
index 37bbbb7cf982..8485cb27e700 100644
--- a/primitives/state-machine/src/trie_backend_essence.rs
+++ b/primitives/state-machine/src/trie_backend_essence.rs
@@ -190,7 +190,8 @@ impl<S: TrieBackendStorage<H>, H: Hasher> TrieBackendEssence<S, H> where H::Out:
 	}
 
 	/// Retrieve all entries keys of child storage and call `f` for each of those keys.
-	pub fn for_keys_in_child_storage<F: FnMut(&[u8])>(
+	/// Aborts as soon as `f` returns false.
+	pub fn apply_to_child_keys_while<F: FnMut(&[u8]) -> bool>(
 		&self,
 		child_info: &ChildInfo,
 		f: F,
diff --git a/primitives/tasks/src/async_externalities.rs b/primitives/tasks/src/async_externalities.rs
index 8994d069e4c7..efb4c498f75f 100644
--- a/primitives/tasks/src/async_externalities.rs
+++ b/primitives/tasks/src/async_externalities.rs
@@ -118,7 +118,8 @@ impl Externalities for AsyncExternalities {
 	fn kill_child_storage(
 		&mut self,
 		_child_info: &ChildInfo,
-	) {
+		_limit: Option<u32>,
+	) -> bool {
 		panic!("`kill_child_storage`: should not be used in async externalities!")
 	}
 
diff --git a/primitives/trie/src/lib.rs b/primitives/trie/src/lib.rs
index 73a4a8029b2d..2687d8e42279 100644
--- a/primitives/trie/src/lib.rs
+++ b/primitives/trie/src/lib.rs
@@ -271,7 +271,8 @@ pub fn child_delta_trie_root<L: TrieConfiguration, I, A, B, DB, RD, V>(
 }
 
 /// Call `f` for all keys in a child trie.
-pub fn for_keys_in_child_trie<L: TrieConfiguration, F: FnMut(&[u8]), DB>(
+/// Aborts as soon as `f` returns false.
+pub fn for_keys_in_child_trie<L: TrieConfiguration, F: FnMut(&[u8]) -> bool, DB>(
 	keyspace: &[u8],
 	db: &DB,
 	root_slice: &[u8],
@@ -290,7 +291,9 @@ pub fn for_keys_in_child_trie<L: TrieConfiguration, F: FnMut(&[u8]), DB>(
 
 	for x in iter {
 		let (key, _) = x?;
-		f(&key);
+		if !f(&key) {
+			break;
+		}
 	}
 
 	Ok(())

From 4b8c862ae3b0d34ecdc351888469f81704df68e2 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Tue, 8 Dec 2020 20:00:52 -0800
Subject: [PATCH 0156/1194] benchmarks: Fix panic in case of a missing model
 (#7698)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Alexander Theißen <alex.theissen@me.com>
---
 frame/benchmarking/src/analysis.rs         |  4 +++-
 frame/benchmarking/src/lib.rs              |  2 +-
 utils/frame/benchmarking-cli/src/writer.rs | 25 ++++++++++++++++------
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/frame/benchmarking/src/analysis.rs b/frame/benchmarking/src/analysis.rs
index dafb4a74b669..dafe42de92e8 100644
--- a/frame/benchmarking/src/analysis.rs
+++ b/frame/benchmarking/src/analysis.rs
@@ -18,9 +18,11 @@
 //! Tools for analyzing the benchmark results.
 
 use std::collections::BTreeMap;
-use linregress::{FormulaRegressionBuilder, RegressionDataBuilder, RegressionModel};
+use linregress::{FormulaRegressionBuilder, RegressionDataBuilder};
 use crate::BenchmarkResults;
 
+pub use linregress::RegressionModel;
+
 pub struct Analysis {
 	pub base: u128,
 	pub slopes: Vec<u128>,
diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
index fdfe857e4be3..97b58ae19ec7 100644
--- a/frame/benchmarking/src/lib.rs
+++ b/frame/benchmarking/src/lib.rs
@@ -26,7 +26,7 @@ mod analysis;
 
 pub use utils::*;
 #[cfg(feature = "std")]
-pub use analysis::{Analysis, BenchmarkSelector};
+pub use analysis::{Analysis, BenchmarkSelector, RegressionModel};
 #[doc(hidden)]
 pub use sp_io::storage::root as storage_root;
 pub use sp_runtime::traits::Zero;
diff --git a/utils/frame/benchmarking-cli/src/writer.rs b/utils/frame/benchmarking-cli/src/writer.rs
index efa356a0fa06..fd72e003b417 100644
--- a/utils/frame/benchmarking-cli/src/writer.rs
+++ b/utils/frame/benchmarking-cli/src/writer.rs
@@ -24,7 +24,7 @@ use std::path::PathBuf;
 use serde::Serialize;
 
 use crate::BenchmarkCmd;
-use frame_benchmarking::{BenchmarkBatch, BenchmarkSelector, Analysis};
+use frame_benchmarking::{BenchmarkBatch, BenchmarkSelector, Analysis, RegressionModel};
 use sp_runtime::traits::Zero;
 
 const VERSION: &'static str = env!("CARGO_PKG_VERSION");
@@ -134,6 +134,17 @@ fn map_results(batches: &[BenchmarkBatch]) -> Result<HashMap<String, Vec<Benchma
 	Ok(all_benchmarks)
 }
 
+// Get an iterator of errors from a model. If the model is `None` all errors are zero.
+fn extract_errors(model: &Option<RegressionModel>) -> impl Iterator<Item=u128> + '_ {
+	let mut errors = model.as_ref().map(|m| m.se.regressor_values.iter());
+	std::iter::from_fn(move || {
+		match &mut errors {
+			Some(model) => model.next().map(|val| *val as u128),
+			_ => Some(0),
+		}
+	})
+}
+
 // Analyze and return the relevant results for a given benchmark.
 fn get_benchmark_data(batch: &BenchmarkBatch) -> BenchmarkData {
 	// Analyze benchmarks to get the linear regression.
@@ -149,40 +160,40 @@ fn get_benchmark_data(batch: &BenchmarkBatch) -> BenchmarkData {
 
 	extrinsic_time.slopes.into_iter()
 		.zip(extrinsic_time.names.iter())
-		.zip(extrinsic_time.model.unwrap().se.regressor_values.iter())
+		.zip(extract_errors(&extrinsic_time.model))
 		.for_each(|((slope, name), error)| {
 			if !slope.is_zero() {
 				if !used_components.contains(&name) { used_components.push(name); }
 				used_extrinsic_time.push(ComponentSlope {
 					name: name.clone(),
 					slope: slope.saturating_mul(1000),
-					error: (*error as u128).saturating_mul(1000),
+					error: error.saturating_mul(1000),
 				});
 			}
 		});
 	reads.slopes.into_iter()
 		.zip(reads.names.iter())
-		.zip(reads.model.unwrap().se.regressor_values.iter())
+		.zip(extract_errors(&reads.model))
 		.for_each(|((slope, name), error)| {
 			if !slope.is_zero() {
 				if !used_components.contains(&name) { used_components.push(name); }
 				used_reads.push(ComponentSlope {
 					name: name.clone(),
 					slope,
-					error: *error as u128,
+					error,
 				});
 			}
 		});
 	writes.slopes.into_iter()
 		.zip(writes.names.iter())
-		.zip(writes.model.unwrap().se.regressor_values.iter())
+		.zip(extract_errors(&writes.model))
 		.for_each(|((slope, name), error)| {
 			if !slope.is_zero() {
 				if !used_components.contains(&name) { used_components.push(name); }
 				used_writes.push(ComponentSlope {
 					name: name.clone(),
 					slope,
-					error: *error as u128,
+					error,
 				});
 			}
 		});

From 9599f39a15007eba3bcc38d0eddb8af08de2b2b9 Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann <ben@gnunicorn.org>
Date: Wed, 9 Dec 2020 10:52:56 +0100
Subject: [PATCH 0157/1194] Expand remote keystore interface to allow for
 hybrid mode (#7628)

* update to latest master

* updates on docs, license, meta

* hide ssrs behind feature flag

* implement remaining functions on the server

* sign server line length fix

* fix tests

* fixup in-memory-keystore

* adding failsafe

* skipping ecdsa test for now

* remote keystore param

* remote sign urls made available

* integrating keystore remotes features

* don't forget the dependency

* remove old cruft

* reset local keystore

* applying suggestions

* Switch to single remote, minor grumbles

* minor grumbles, docs
---
 Cargo.lock                                    |  3 ++
 bin/node-template/node/Cargo.toml             |  1 +
 bin/node-template/node/src/service.rs         | 23 ++++++++-
 client/cli/src/commands/insert.rs             |  2 +-
 client/cli/src/config.rs                      |  8 +--
 client/cli/src/params/keystore_params.rs      |  9 +++-
 client/service/src/builder.rs                 | 50 ++++++++++++++-----
 client/service/src/config.rs                  |  2 +
 client/service/test/src/lib.rs                |  1 +
 primitives/application-crypto/test/Cargo.toml |  2 +-
 primitives/core/Cargo.toml                    |  2 +-
 primitives/core/src/crypto.rs                 |  3 ++
 primitives/keystore/Cargo.toml                | 11 +++-
 primitives/keystore/src/vrf.rs                |  3 ++
 utils/browser/src/lib.rs                      |  1 +
 15 files changed, 99 insertions(+), 22 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 53c42e08774b..e277d1d24a84 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3967,6 +3967,7 @@ dependencies = [
  "sc-consensus-aura",
  "sc-executor",
  "sc-finality-grandpa",
+ "sc-keystore",
  "sc-rpc",
  "sc-rpc-api",
  "sc-service",
@@ -7484,6 +7485,7 @@ dependencies = [
  "merlin",
  "rand 0.7.3",
  "rand_core 0.5.1",
+ "serde",
  "sha2 0.8.2",
  "subtle 2.3.0",
  "zeroize",
@@ -8276,6 +8278,7 @@ dependencies = [
  "rand 0.7.3",
  "rand_chacha 0.2.2",
  "schnorrkel",
+ "serde",
  "sp-core",
  "sp-externalities",
 ]
diff --git a/bin/node-template/node/Cargo.toml b/bin/node-template/node/Cargo.toml
index d2b5a35b352b..38cdaa1eea48 100644
--- a/bin/node-template/node/Cargo.toml
+++ b/bin/node-template/node/Cargo.toml
@@ -22,6 +22,7 @@ sc-cli = { version = "0.8.0", path = "../../../client/cli", features = ["wasmtim
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
 sc-executor = { version = "0.8.0", path = "../../../client/executor", features = ["wasmtime"] }
 sc-service = { version = "0.8.0", path = "../../../client/service", features = ["wasmtime"] }
+sc-keystore = { version = "2.0.0", path = "../../../client/keystore" }
 sp-inherents = { version = "2.0.0", path = "../../../primitives/inherents" }
 sc-transaction-pool = { version = "2.0.0", path = "../../../client/transaction-pool" }
 sp-transaction-pool = { version = "2.0.0", path = "../../../primitives/transaction-pool" }
diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
index 1fa1a372a05d..7e1939fb023a 100644
--- a/bin/node-template/node/src/service.rs
+++ b/bin/node-template/node/src/service.rs
@@ -10,6 +10,7 @@ use sc_executor::native_executor_instance;
 pub use sc_executor::NativeExecutor;
 use sp_consensus_aura::sr25519::{AuthorityPair as AuraPair};
 use sc_finality_grandpa::SharedVoterState;
+use sc_keystore::LocalKeystore;
 
 // Our native executor instance.
 native_executor_instance!(
@@ -37,6 +38,10 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 		sc_finality_grandpa::LinkHalf<Block, FullClient, FullSelectChain>
 	)
 >, ServiceError> {
+	if config.keystore_remote.is_some() {
+		return Err(ServiceError::Other(
+			format!("Remote Keystores are not supported.")))
+	}
 	let inherent_data_providers = sp_inherents::InherentDataProviders::new();
 
 	let (client, backend, keystore_container, task_manager) =
@@ -78,14 +83,30 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 	})
 }
 
+fn remote_keystore(_url: &String) -> Result<Arc<LocalKeystore>, &'static str> {
+	// FIXME: here would the concrete keystore be built,
+	//        must return a concrete type (NOT `LocalKeystore`) that
+	//        implements `CryptoStore` and `SyncCryptoStore`
+	Err("Remote Keystore not supported.")
+}
+
 /// Builds a new service for a full client.
 pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError> {
 	let sc_service::PartialComponents {
-		client, backend, mut task_manager, import_queue, keystore_container,
+		client, backend, mut task_manager, import_queue, mut keystore_container,
 		select_chain, transaction_pool, inherent_data_providers,
 		other: (block_import, grandpa_link),
 	} = new_partial(&config)?;
 
+	if let Some(url) = &config.keystore_remote {
+		match remote_keystore(url) {
+			Ok(k) => keystore_container.set_remote_keystore(k),
+			Err(e) => {
+				return Err(ServiceError::Other(
+					format!("Error hooking up remote keystore for {}: {}", url, e)))
+			}
+		};
+	}
 	config.network.notifications_protocols.push(sc_finality_grandpa::GRANDPA_PROTOCOL_NAME.into());
 
 	let (network, network_status_sinks, system_rpc_tx, network_starter) =
diff --git a/client/cli/src/commands/insert.rs b/client/cli/src/commands/insert.rs
index fc307e45e7ce..8b7fe98fc0b9 100644
--- a/client/cli/src/commands/insert.rs
+++ b/client/cli/src/commands/insert.rs
@@ -65,7 +65,7 @@ impl InsertCmd {
 			.ok_or_else(|| Error::MissingBasePath)?;
 
 		let (keystore, public) = match self.keystore_params.keystore_config(base_path)? {
-			KeystoreConfig::Path { path, password } => {
+			(_, KeystoreConfig::Path { path, password }) => {
 				let public = with_crypto_scheme!(
 					self.crypto_scheme.scheme,
 					to_vec(&suri, password.clone())
diff --git a/client/cli/src/config.rs b/client/cli/src/config.rs
index e4411e49408e..bf6b444c4d73 100644
--- a/client/cli/src/config.rs
+++ b/client/cli/src/config.rs
@@ -188,10 +188,10 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 	///
 	/// Bu default this is retrieved from `KeystoreParams` if it is available. Otherwise it uses
 	/// `KeystoreConfig::InMemory`.
-	fn keystore_config(&self, base_path: &PathBuf) -> Result<KeystoreConfig> {
+	fn keystore_config(&self, base_path: &PathBuf) -> Result<(Option<String>, KeystoreConfig)> {
 		self.keystore_params()
 			.map(|x| x.keystore_config(base_path))
-			.unwrap_or(Ok(KeystoreConfig::InMemory))
+			.unwrap_or_else(|| Ok((None, KeystoreConfig::InMemory)))
 	}
 
 	/// Get the database cache size.
@@ -471,6 +471,7 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 		let role = self.role(is_dev)?;
 		let max_runtime_instances = self.max_runtime_instances()?.unwrap_or(8);
 		let is_validator = role.is_network_authority();
+		let (keystore_remote, keystore) = self.keystore_config(&config_dir)?;
 
 		let unsafe_pruning = self
 			.import_params()
@@ -491,7 +492,8 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 				node_key,
 				DCV::p2p_listen_port(),
 			)?,
-			keystore: self.keystore_config(&config_dir)?,
+			keystore_remote,
+			keystore,
 			database: self.database_config(&config_dir, database_cache_size, database)?,
 			state_cache_size: self.state_cache_size()?,
 			state_cache_child_ratio: self.state_cache_child_ratio()?,
diff --git a/client/cli/src/params/keystore_params.rs b/client/cli/src/params/keystore_params.rs
index 2ecd21cb3dd0..f03fafeb965c 100644
--- a/client/cli/src/params/keystore_params.rs
+++ b/client/cli/src/params/keystore_params.rs
@@ -30,6 +30,9 @@ const DEFAULT_KEYSTORE_CONFIG_PATH: &'static str = "keystore";
 /// Parameters of the keystore
 #[derive(Debug, StructOpt)]
 pub struct KeystoreParams {
+	/// Specify custom URIs to connect to for keystore-services
+	#[structopt(long = "keystore-uri")]
+	pub keystore_uri: Option<String>,
 	/// Specify custom keystore path.
 	#[structopt(long = "keystore-path", value_name = "PATH", parse(from_os_str))]
 	pub keystore_path: Option<PathBuf>,
@@ -67,7 +70,9 @@ pub fn secret_string_from_str(s: &str) -> std::result::Result<SecretString, Stri
 
 impl KeystoreParams {
 	/// Get the keystore configuration for the parameters
-	pub fn keystore_config(&self, base_path: &PathBuf) -> Result<KeystoreConfig> {
+	/// returns a vector of remote-urls and the local Keystore configuration
+	pub fn keystore_config(&self, base_path: &PathBuf) -> Result<(Option<String>, KeystoreConfig)> {
+
 		let password = if self.password_interactive {
 			#[cfg(not(target_os = "unknown"))]
 			{
@@ -89,7 +94,7 @@ impl KeystoreParams {
 			.clone()
 			.unwrap_or_else(|| base_path.join(DEFAULT_KEYSTORE_CONFIG_PATH));
 
-		Ok(KeystoreConfig::Path { path, password })
+		Ok((self.keystore_uri.clone(), KeystoreConfig::Path { path, password }))
 	}
 
 	/// helper method to fetch password from `KeyParams` or read from stdin
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index 52c1121d504d..5e511d3d7c77 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -59,7 +59,7 @@ use sp_core::traits::{
 	CodeExecutor,
 	SpawnNamed,
 };
-use sp_keystore::{CryptoStore, SyncCryptoStorePtr};
+use sp_keystore::{CryptoStore, SyncCryptoStore, SyncCryptoStorePtr};
 use sp_runtime::BuildStorage;
 use sc_client_api::{
 	BlockBackend, BlockchainEvents,
@@ -205,12 +205,25 @@ pub type TLightClientWithBackend<TBl, TRtApi, TExecDisp, TBackend> = Client<
 	TRtApi,
 >;
 
-enum KeystoreContainerInner {
-	Local(Arc<LocalKeystore>)
+trait AsCryptoStoreRef {
+    fn keystore_ref(&self) -> Arc<dyn CryptoStore>;
+    fn sync_keystore_ref(&self) -> Arc<dyn SyncCryptoStore>;
+}
+
+impl<T> AsCryptoStoreRef for Arc<T> where T: CryptoStore + SyncCryptoStore + 'static {
+    fn keystore_ref(&self) -> Arc<dyn CryptoStore> {
+        self.clone()
+    }
+    fn sync_keystore_ref(&self) -> Arc<dyn SyncCryptoStore> {
+        self.clone()
+    }
 }
 
 /// Construct and hold different layers of Keystore wrappers
-pub struct KeystoreContainer(KeystoreContainerInner);
+pub struct KeystoreContainer {
+	remote: Option<Box<dyn AsCryptoStoreRef>>,
+	local: Arc<LocalKeystore>,
+}
 
 impl KeystoreContainer {
 	/// Construct KeystoreContainer
@@ -223,20 +236,35 @@ impl KeystoreContainer {
 			KeystoreConfig::InMemory => LocalKeystore::in_memory(),
 		});
 
-		Ok(Self(KeystoreContainerInner::Local(keystore)))
+		Ok(Self{remote: Default::default(), local: keystore})
+	}
+
+	/// Set the remote keystore.
+	/// Should be called right away at startup and not at runtime:
+	/// even though this overrides any previously set remote store, it
+	/// does not reset any references previously handed out - they will
+	/// stick araound.
+	pub fn set_remote_keystore<T>(&mut self, remote: Arc<T>)
+		where T: CryptoStore + SyncCryptoStore + 'static
+	{
+		self.remote = Some(Box::new(remote))
 	}
 
 	/// Returns an adapter to the asynchronous keystore that implements `CryptoStore`
 	pub fn keystore(&self) -> Arc<dyn CryptoStore> {
-		match self.0 {
-			KeystoreContainerInner::Local(ref keystore) => keystore.clone(),
+		if let Some(c) = self.remote.as_ref() {
+			c.keystore_ref()
+		} else {
+			self.local.clone()
 		}
 	}
 
 	/// Returns the synchrnous keystore wrapper
 	pub fn sync_keystore(&self) -> SyncCryptoStorePtr {
-		match self.0 {
-			KeystoreContainerInner::Local(ref keystore) => keystore.clone() as SyncCryptoStorePtr,
+		if let Some(c) = self.remote.as_ref() {
+			c.sync_keystore_ref()
+		} else {
+			self.local.clone() as SyncCryptoStorePtr
 		}
 	}
 
@@ -249,9 +277,7 @@ impl KeystoreContainer {
 	/// Using the [`LocalKeystore`] will result in loosing the ability to use any other keystore implementation, like
 	/// a remote keystore for example. Only use this if you a certain that you require it!
 	pub fn local_keystore(&self) -> Option<Arc<LocalKeystore>> {
-		match self.0 {
-			KeystoreContainerInner::Local(ref keystore) => Some(keystore.clone()),
-		}
+		Some(self.local.clone())
 	}
 }
 
diff --git a/client/service/src/config.rs b/client/service/src/config.rs
index 20a4995bbc75..e360e610d490 100644
--- a/client/service/src/config.rs
+++ b/client/service/src/config.rs
@@ -50,6 +50,8 @@ pub struct Configuration {
 	pub network: NetworkConfiguration,
 	/// Configuration for the keystore.
 	pub keystore: KeystoreConfig,
+	/// Remote URI to connect to for async keystore support
+	pub keystore_remote: Option<String>,
 	/// Configuration for the database.
 	pub database: DatabaseConfig,
 	/// Size of internal state cache in Bytes
diff --git a/client/service/test/src/lib.rs b/client/service/test/src/lib.rs
index cfcf7e9ab38d..1f200b4cbeed 100644
--- a/client/service/test/src/lib.rs
+++ b/client/service/test/src/lib.rs
@@ -239,6 +239,7 @@ fn node_config<G: RuntimeGenesis + 'static, E: ChainSpecExtension + Clone + 'sta
 		task_executor,
 		transaction_pool: Default::default(),
 		network: network_config,
+		keystore_remote: Default::default(),
 		keystore: KeystoreConfig::Path {
 			path: root.join("key"),
 			password: None
diff --git a/primitives/application-crypto/test/Cargo.toml b/primitives/application-crypto/test/Cargo.toml
index 0e7fdc7559ca..f132e04deaa0 100644
--- a/primitives/application-crypto/test/Cargo.toml
+++ b/primitives/application-crypto/test/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 sp-core = { version = "2.0.0", default-features = false, path = "../../core" }
-sp-keystore = { version = "0.8.0", path = "../../keystore" }
+sp-keystore = { version = "0.8.0", path = "../../keystore", default-features = false }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
 sp-runtime = { version = "2.0.0", path = "../../runtime" }
 sp-api = { version = "2.0.0", path = "../../api" }
diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml
index d59bbad09e50..ca385df2365b 100644
--- a/primitives/core/Cargo.toml
+++ b/primitives/core/Cargo.toml
@@ -96,11 +96,11 @@ std = [
 	"base58",
 	"substrate-bip39",
 	"tiny-bip39",
-	"serde",
 	"byteorder/std",
 	"rand",
 	"sha2/std",
 	"schnorrkel/std",
+	"schnorrkel/serde",
 	"regex",
 	"num-traits/std",
 	"tiny-keccak",
diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index 2f34347a2d5e..6a07e3ce4028 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -1029,6 +1029,7 @@ pub trait CryptoType {
 	Copy, Clone, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Encode, Decode, PassByInner,
 	crate::RuntimeDebug
 )]
+#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
 pub struct KeyTypeId(pub [u8; 4]);
 
 impl From<u32> for KeyTypeId {
@@ -1058,10 +1059,12 @@ impl<'a> TryFrom<&'a str> for KeyTypeId {
 
 /// An identifier for a specific cryptographic algorithm used by a key pair
 #[derive(Debug, Copy, Clone, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Encode, Decode)]
+#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
 pub struct CryptoTypeId(pub [u8; 4]);
 
 /// A type alias of CryptoTypeId & a public key
 #[derive(Debug, Clone, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Encode, Decode)]
+#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
 pub struct CryptoTypePublicPair(pub CryptoTypeId, pub Vec<u8>);
 
 #[cfg(feature = "std")]
diff --git a/primitives/keystore/Cargo.toml b/primitives/keystore/Cargo.toml
index d53d1ebd533c..deffc2ccf9d3 100644
--- a/primitives/keystore/Cargo.toml
+++ b/primitives/keystore/Cargo.toml
@@ -20,10 +20,19 @@ futures = { version = "0.3.1" }
 schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated", "u64_backend"], default-features = false }
 merlin = { version = "2.0", default-features = false }
 parking_lot = { version = "0.10.0", default-features = false }
-
+serde = { version = "1.0", optional = true}
 sp-core = { version = "2.0.0", path = "../core" }
 sp-externalities = { version = "0.8.0", path = "../externalities", default-features = false }
 
 [dev-dependencies]
 rand = "0.7.2"
 rand_chacha = "0.2.2"
+
+
+[features]
+default = ["std"]
+std = [
+	"serde",
+	"schnorrkel/std",
+	"schnorrkel/serde",
+]
diff --git a/primitives/keystore/src/vrf.rs b/primitives/keystore/src/vrf.rs
index 750ca0eac6be..9c1ac92738dc 100644
--- a/primitives/keystore/src/vrf.rs
+++ b/primitives/keystore/src/vrf.rs
@@ -20,9 +20,11 @@
 use codec::Encode;
 use merlin::Transcript;
 use schnorrkel::vrf::{VRFOutput, VRFProof};
+
 /// An enum whose variants represent possible
 /// accepted values to construct the VRF transcript
 #[derive(Clone, Encode)]
+#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
 pub enum VRFTranscriptValue {
 	/// Value is an array of bytes
 	Bytes(Vec<u8>),
@@ -38,6 +40,7 @@ pub struct VRFTranscriptData {
 	pub items: Vec<(&'static str, VRFTranscriptValue)>,
 }
 /// VRF signature data
+#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
 pub struct VRFSignature {
 	/// The VRFOutput serialized
 	pub output: VRFOutput,
diff --git a/utils/browser/src/lib.rs b/utils/browser/src/lib.rs
index bffd9fbedb28..071ed332fcdf 100644
--- a/utils/browser/src/lib.rs
+++ b/utils/browser/src/lib.rs
@@ -75,6 +75,7 @@ where
 
 			DatabaseConfig::Custom(sp_database::as_database(db))
 		},
+		keystore_remote: Default::default(),
 		keystore: KeystoreConfig::InMemory,
 		default_heap_pages: Default::default(),
 		dev_key_seed: Default::default(),

From be8fd0588013a3b8eab5d5c761fe1c55bdd60dbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Wed, 9 Dec 2020 11:04:57 +0000
Subject: [PATCH 0158/1194] fork-tree: expose silent failures of
 is_descendent_of (#7695)

* fork-tree: expose silent failures of is_descendent_of

* fork-tree: use mem::take instead of mem::swap
---
 utils/fork-tree/src/lib.rs | 49 ++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/utils/fork-tree/src/lib.rs b/utils/fork-tree/src/lib.rs
index f266b6422302..d2a0a4f3dd65 100644
--- a/utils/fork-tree/src/lib.rs
+++ b/utils/fork-tree/src/lib.rs
@@ -144,7 +144,7 @@ impl<H, N, V> ForkTree<H, N, V> where
 			for child in root_children {
 				if is_first &&
 					(child.number == *number && child.hash == *hash ||
-					 child.number < *number && is_descendent_of(&child.hash, hash).unwrap_or(false))
+					 child.number < *number && is_descendent_of(&child.hash, hash)?)
 				{
 					root.children.push(child);
 					// assuming that the tree is well formed only one child should pass this requirement
@@ -415,15 +415,15 @@ impl<H, N, V> ForkTree<H, N, V> where
 		// another fork not part of the tree). make sure to only keep roots that
 		// are part of the finalized branch
 		let mut changed = false;
-		self.roots.retain(|root| {
-			let retain = root.number > number && is_descendent_of(hash, &root.hash).unwrap_or(false);
+		let roots = std::mem::take(&mut self.roots);
 
-			if !retain {
+		for root in roots {
+			if root.number > number && is_descendent_of(hash, &root.hash)? {
+				self.roots.push(root);
+			} else {
 				changed = true;
 			}
-
-			retain
-		});
+		}
 
 		self.best_finalized_number = Some(number);
 
@@ -467,16 +467,19 @@ impl<H, N, V> ForkTree<H, N, V> where
 			let (is_finalized, is_descendant, is_ancestor) = {
 				let root = &self.roots[idx];
 				let is_finalized = root.hash == *hash;
-				let is_descendant = !is_finalized
-					&& root.number > number && is_descendent_of(hash, &root.hash).unwrap_or(false);
-				let is_ancestor = !is_finalized && !is_descendant
-					&& root.number < number && is_descendent_of(&root.hash, hash).unwrap_or(false);
+				let is_descendant =
+					!is_finalized && root.number > number && is_descendent_of(hash, &root.hash)?;
+				let is_ancestor = !is_finalized
+					&& !is_descendant && root.number < number
+					&& is_descendent_of(&root.hash, hash)?;
 				(is_finalized, is_descendant, is_ancestor)
 			};
 
 			// if we have met finalized root - open it and return
 			if is_finalized {
-				return Ok(FinalizationResult::Changed(Some(self.finalize_root_at(idx))));
+				return Ok(FinalizationResult::Changed(Some(
+					self.finalize_root_at(idx),
+				)));
 			}
 
 			// if node is descendant of finalized block - just leave it as is
@@ -610,18 +613,19 @@ impl<H, N, V> ForkTree<H, N, V> where
 		// descendent (in this case the node wasn't finalized earlier presumably
 		// because the predicate didn't pass).
 		let mut changed = false;
-		self.roots.retain(|root| {
-			let retain =
-				root.number > number && is_descendent_of(hash, &root.hash).unwrap_or(false) ||
-				root.number == number && root.hash == *hash ||
-				is_descendent_of(&root.hash, hash).unwrap_or(false);
+		let roots = std::mem::take(&mut self.roots);
+
+		for root in roots {
+			let retain = root.number > number && is_descendent_of(hash, &root.hash)?
+				|| root.number == number && root.hash == *hash
+				|| is_descendent_of(&root.hash, hash)?;
 
-			if !retain {
+			if retain {
+				self.roots.push(root);
+			} else {
 				changed = true;
 			}
-
-			retain
-		});
+		}
 
 		self.best_finalized_number = Some(number);
 
@@ -903,8 +907,7 @@ impl<H, N, V> Iterator for RemovedIterator<H, N, V> {
 			// child nodes are stored ordered by max branch height (decreasing),
 			// we want to keep this ordering while iterating but since we're
 			// using a stack for iterator state we need to reverse it.
-			let mut children = Vec::new();
-			std::mem::swap(&mut children, &mut node.children);
+			let children = std::mem::take(&mut node.children);
 
 			self.stack.extend(children.into_iter().rev());
 			(node.hash, node.number, node.data)

From 661bbc9a73107d144aaea80e4ed0e4b54a5b2a96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomusdrw@users.noreply.github.com>
Date: Wed, 9 Dec 2020 16:35:13 +0100
Subject: [PATCH 0159/1194] Merkle Mountain Range pallet (#7312)

* Add MMR pallet.

* WiP

* Working on testing.

* WiP - test

* Tests passing.

* Add proof generation.

* Generate and verify proofs.

* Allow verification of older proofs.

* Move stuff to a module.

* Split MMR stuff to it's own module.

* Add docs.

* Make parent hash optional.

* LeafData failed approach.

* Finally implement Compact stuff.

* Compact encoding WiP

* Implement remaining pieces.

* Fix tests

* Add docs to compact.

* Implement for tuples.

* Fix documentation.

* Fix warnings and address review suggestion.

* Update frame/merkle-mountain-range/src/primitives.rs

Co-authored-by: cheme <emericchevalier.pro@gmail.com>

* Address review grumbles.

* Removing missing crate.

* Fix test.

* Add some docs and test.

* Add multiple instances.

* Cargo.toml sync.

* Fix no_std compilation.

* More no_std stuff.

* Rename MMR struct.

* Addressing other grumbles.

* Fix test.

* Remove format for no_std compat.

* Add test for MMR pallet.

* Fix std feature.

* Update versions.

* Add to node/runtime.

* Add hook to insert digest.

* Make primitives public.

* Update lib.rs

tech spec/typos etc

* Use WeightInfo and benchmarks.

* Fix test.

* Fix benchmarks.

* Trait -> Config.

* Fix typo.

* Fix tests.

Co-authored-by: cheme <emericchevalier.pro@gmail.com>
Co-authored-by: Addie Wagenknecht <addie@nortd.com>
---
 Cargo.lock                                    |  47 +-
 Cargo.toml                                    |  64 +--
 bin/node/runtime/Cargo.toml                   |   3 +
 bin/node/runtime/src/lib.rs                   |  11 +
 client/executor/src/integration_tests/mod.rs  |   4 +-
 frame/merkle-mountain-range/Cargo.toml        |  44 ++
 .../merkle-mountain-range/src/benchmarking.rs |  56 +++
 .../src/default_weights.rs                    |  42 ++
 frame/merkle-mountain-range/src/lib.rs        | 231 ++++++++++
 frame/merkle-mountain-range/src/mmr/mmr.rs    | 186 ++++++++
 frame/merkle-mountain-range/src/mmr/mod.rs    |  45 ++
 .../merkle-mountain-range/src/mmr/storage.rs  | 112 +++++
 frame/merkle-mountain-range/src/mmr/utils.rs  | 131 ++++++
 frame/merkle-mountain-range/src/mock.rs       | 105 +++++
 frame/merkle-mountain-range/src/primitives.rs | 415 ++++++++++++++++++
 frame/merkle-mountain-range/src/tests.rs      | 275 ++++++++++++
 primitives/core/src/offchain/testing.rs       |  15 +-
 primitives/runtime/src/offchain/storage.rs    |   5 +-
 .../runtime/src/offchain/storage_lock.rs      |  10 +-
 19 files changed, 1751 insertions(+), 50 deletions(-)
 create mode 100644 frame/merkle-mountain-range/Cargo.toml
 create mode 100644 frame/merkle-mountain-range/src/benchmarking.rs
 create mode 100644 frame/merkle-mountain-range/src/default_weights.rs
 create mode 100644 frame/merkle-mountain-range/src/lib.rs
 create mode 100644 frame/merkle-mountain-range/src/mmr/mmr.rs
 create mode 100644 frame/merkle-mountain-range/src/mmr/mod.rs
 create mode 100644 frame/merkle-mountain-range/src/mmr/storage.rs
 create mode 100644 frame/merkle-mountain-range/src/mmr/utils.rs
 create mode 100644 frame/merkle-mountain-range/src/mock.rs
 create mode 100644 frame/merkle-mountain-range/src/primitives.rs
 create mode 100644 frame/merkle-mountain-range/src/tests.rs

diff --git a/Cargo.lock b/Cargo.lock
index e277d1d24a84..6a92f8e35f05 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -419,7 +419,7 @@ dependencies = [
  "cfg-if 0.1.10",
  "clang-sys",
  "clap",
- "env_logger",
+ "env_logger 0.7.1",
  "lazy_static",
  "lazycell",
  "log",
@@ -716,6 +716,15 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "ckb-merkle-mountain-range"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e486fe53bb9f2ca0f58cb60e8679a5354fd6687a839942ef0a75967250289ca6"
+dependencies = [
+ "cfg-if 0.1.10",
+]
+
 [[package]]
 name = "clang-sys"
 version = "0.29.3"
@@ -1328,6 +1337,19 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "env_logger"
+version = "0.5.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38"
+dependencies = [
+ "atty",
+ "humantime",
+ "log",
+ "regex",
+ "termcolor",
+]
+
 [[package]]
 name = "env_logger"
 version = "0.7.1"
@@ -1450,7 +1472,7 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fdbe0d94371f9ce939b555dd342d0686cc4c0cadbcd4b61d70af5ff97eb4126"
 dependencies = [
- "env_logger",
+ "env_logger 0.7.1",
  "log",
 ]
 
@@ -3911,6 +3933,7 @@ dependencies = [
  "pallet-im-online",
  "pallet-indices",
  "pallet-membership",
+ "pallet-mmr",
  "pallet-multisig",
  "pallet-offences",
  "pallet-offences-benchmarking",
@@ -4651,6 +4674,24 @@ dependencies = [
  "sp-std",
 ]
 
+[[package]]
+name = "pallet-mmr"
+version = "2.0.0"
+dependencies = [
+ "ckb-merkle-mountain-range",
+ "env_logger 0.5.13",
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "hex-literal",
+ "parity-scale-codec",
+ "serde",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
 [[package]]
 name = "pallet-multisig"
 version = "2.0.0"
@@ -5754,7 +5795,7 @@ version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a44883e74aa97ad63db83c4bf8ca490f02b2fc02f92575e720c8551e843c945f"
 dependencies = [
- "env_logger",
+ "env_logger 0.7.1",
  "log",
  "rand 0.7.3",
  "rand_core 0.5.1",
diff --git a/Cargo.toml b/Cargo.toml
index 6a007a209f1f..206673c0ef2f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,19 +1,19 @@
 [workspace]
 members = [
 	"bin/node-template/node",
-	"bin/node-template/runtime",
 	"bin/node-template/pallets/template",
+	"bin/node-template/runtime",
 	"bin/node/bench",
 	"bin/node/browser-testing",
 	"bin/node/cli",
 	"bin/node/executor",
 	"bin/node/primitives",
-	"bin/node/rpc-client",
 	"bin/node/rpc",
+	"bin/node/rpc-client",
 	"bin/node/runtime",
 	"bin/node/testing",
-	"bin/utils/subkey",
 	"bin/utils/chain-spec-builder",
+	"bin/utils/subkey",
 	"client/api",
 	"client/authority-discovery",
 	"client/basic-authorship",
@@ -26,42 +26,41 @@ members = [
 	"client/consensus/babe",
 	"client/consensus/babe/rpc",
 	"client/consensus/common",
+	"client/consensus/epochs",
 	"client/consensus/manual-seal",
 	"client/consensus/pow",
-	"client/consensus/uncles",
 	"client/consensus/slots",
-	"client/consensus/epochs",
+	"client/consensus/uncles",
 	"client/db",
 	"client/executor",
 	"client/executor/common",
+	"client/executor/runtime-test",
 	"client/executor/wasmi",
 	"client/executor/wasmtime",
-	"client/executor/runtime-test",
 	"client/finality-grandpa",
 	"client/informant",
-	"client/light",
-	"client/tracing",
 	"client/keystore",
+	"client/light",
 	"client/network",
-	"client/network/test",
 	"client/network-gossip",
+	"client/network/test",
 	"client/offchain",
 	"client/peerset",
 	"client/proposer-metrics",
-	"client/rpc-servers",
 	"client/rpc",
 	"client/rpc-api",
+	"client/rpc-servers",
 	"client/service",
 	"client/service/test",
 	"client/state-db",
 	"client/sync-state-rpc",
 	"client/telemetry",
+	"client/tracing",
 	"client/transaction-pool",
 	"client/transaction-pool/graph",
-	"utils/prometheus",
 	"frame/assets",
-	"frame/aura",
 	"frame/atomic-swap",
+	"frame/aura",
 	"frame/authority-discovery",
 	"frame/authorship",
 	"frame/babe",
@@ -72,7 +71,6 @@ members = [
 	"frame/contracts/rpc",
 	"frame/contracts/rpc/runtime-api",
 	"frame/democracy",
-	"frame/elections-phragmen",
 	"frame/elections",
 	"frame/example",
 	"frame/example-offchain-worker",
@@ -83,6 +81,7 @@ members = [
 	"frame/im-online",
 	"frame/indices",
 	"frame/membership",
+	"frame/merkle-mountain-range",
 	"frame/metadata",
 	"frame/multisig",
 	"frame/nicks",
@@ -97,8 +96,8 @@ members = [
 	"frame/session/benchmarking",
 	"frame/society",
 	"frame/staking",
-	"frame/staking/reward-curve",
 	"frame/staking/fuzzer",
+	"frame/staking/reward-curve",
 	"frame/sudo",
 	"frame/support",
 	"frame/support/procedural",
@@ -116,59 +115,59 @@ members = [
 	"frame/utility",
 	"frame/vesting",
 	"primitives/allocator",
+	"primitives/api",
+	"primitives/api/proc-macro",
+	"primitives/api/test",
 	"primitives/application-crypto",
 	"primitives/application-crypto/test",
+	"primitives/arithmetic",
+	"primitives/arithmetic/fuzzer",
 	"primitives/authority-discovery",
 	"primitives/authorship",
 	"primitives/block-builder",
 	"primitives/blockchain",
+	"primitives/chain-spec",
 	"primitives/consensus/aura",
 	"primitives/consensus/babe",
 	"primitives/consensus/common",
 	"primitives/consensus/pow",
 	"primitives/consensus/vrf",
 	"primitives/core",
-	"primitives/chain-spec",
 	"primitives/database",
 	"primitives/debug-derive",
-	"primitives/storage",
 	"primitives/externalities",
 	"primitives/finality-grandpa",
 	"primitives/inherents",
+	"primitives/io",
 	"primitives/keyring",
 	"primitives/keystore",
-	"primitives/offchain",
-	"primitives/panic-handler",
 	"primitives/npos-elections",
-	"primitives/npos-elections/fuzzer",
 	"primitives/npos-elections/compact",
+	"primitives/npos-elections/fuzzer",
+	"primitives/offchain",
+	"primitives/panic-handler",
 	"primitives/rpc",
+	"primitives/runtime",
 	"primitives/runtime-interface",
 	"primitives/runtime-interface/proc-macro",
+	"primitives/runtime-interface/test",
 	"primitives/runtime-interface/test-wasm",
 	"primitives/runtime-interface/test-wasm-deprecated",
-	"primitives/runtime-interface/test",
+	"primitives/sandbox",
 	"primitives/serializer",
 	"primitives/session",
-	"primitives/api",
-	"primitives/api/proc-macro",
-	"primitives/api/test",
-	"primitives/arithmetic",
-	"primitives/arithmetic/fuzzer",
-	"primitives/io",
-	"primitives/runtime",
-	"primitives/sandbox",
 	"primitives/staking",
-	"primitives/std",
-	"primitives/version",
 	"primitives/state-machine",
+	"primitives/std",
+	"primitives/storage",
 	"primitives/tasks",
-	"primitives/timestamp",
 	"primitives/test-primitives",
-	"primitives/transaction-pool",
+	"primitives/timestamp",
 	"primitives/tracing",
+	"primitives/transaction-pool",
 	"primitives/trie",
 	"primitives/utils",
+	"primitives/version",
 	"primitives/wasm-interface",
 	"test-utils/client",
 	"test-utils/derive",
@@ -183,6 +182,7 @@ members = [
 	"utils/frame/frame-utilities-cli",
 	"utils/frame/rpc/support",
 	"utils/frame/rpc/system",
+	"utils/prometheus",
 	"utils/wasm-builder",
 ]
 
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index 7d4cf5588e3e..ad0f6b35a25d 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -59,6 +59,7 @@ pallet-im-online = { version = "2.0.0", default-features = false, path = "../../
 pallet-indices = { version = "2.0.0", default-features = false, path = "../../../frame/indices" }
 pallet-identity = { version = "2.0.0", default-features = false, path = "../../../frame/identity" }
 pallet-membership = { version = "2.0.0", default-features = false, path = "../../../frame/membership" }
+pallet-mmr = { version = "2.0.0", default-features = false, path = "../../../frame/merkle-mountain-range" }
 pallet-multisig = { version = "2.0.0", default-features = false, path = "../../../frame/multisig" }
 pallet-offences = { version = "2.0.0", default-features = false, path = "../../../frame/offences" }
 pallet-offences-benchmarking = { version = "2.0.0", path = "../../../frame/offences/benchmarking", default-features = false, optional = true }
@@ -110,6 +111,7 @@ std = [
 	"pallet-indices/std",
 	"sp-inherents/std",
 	"pallet-membership/std",
+	"pallet-mmr/std",
 	"pallet-multisig/std",
 	"pallet-identity/std",
 	"pallet-scheduler/std",
@@ -160,6 +162,7 @@ runtime-benchmarks = [
 	"pallet-identity/runtime-benchmarks",
 	"pallet-im-online/runtime-benchmarks",
 	"pallet-indices/runtime-benchmarks",
+	"pallet-mmr/runtime-benchmarks",
 	"pallet-multisig/runtime-benchmarks",
 	"pallet-proxy/runtime-benchmarks",
 	"pallet-scheduler/runtime-benchmarks",
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index ea9921beeef9..2962ef10661b 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -915,6 +915,15 @@ impl pallet_vesting::Config for Runtime {
 	type WeightInfo = pallet_vesting::weights::SubstrateWeight<Runtime>;
 }
 
+impl pallet_mmr::Config for Runtime {
+	const INDEXING_PREFIX: &'static [u8] = b"mmr";
+	type Hashing = <Runtime as frame_system::Config>::Hashing;
+	type Hash = <Runtime as frame_system::Config>::Hash;
+	type LeafData = frame_system::Module<Self>;
+	type OnNewRoot = ();
+	type WeightInfo = ();
+}
+
 parameter_types! {
 	pub const AssetDepositBase: Balance = 100 * DOLLARS;
 	pub const AssetDepositPerZombie: Balance = 1 * DOLLARS;
@@ -969,6 +978,7 @@ construct_runtime!(
 		Proxy: pallet_proxy::{Module, Call, Storage, Event<T>},
 		Multisig: pallet_multisig::{Module, Call, Storage, Event<T>},
 		Assets: pallet_assets::{Module, Call, Storage, Event<T>},
+		Mmr: pallet_mmr::{Module, Storage},
 	}
 );
 
@@ -1246,6 +1256,7 @@ impl_runtime_apis! {
 			add_benchmark!(params, batches, pallet_identity, Identity);
 			add_benchmark!(params, batches, pallet_im_online, ImOnline);
 			add_benchmark!(params, batches, pallet_indices, Indices);
+			add_benchmark!(params, batches, pallet_mmr, Mmr);
 			add_benchmark!(params, batches, pallet_multisig, Multisig);
 			add_benchmark!(params, batches, pallet_offences, OffencesBench::<Runtime>);
 			add_benchmark!(params, batches, pallet_proxy, Proxy);
diff --git a/client/executor/src/integration_tests/mod.rs b/client/executor/src/integration_tests/mod.rs
index d41784f5aa06..0a00375145fb 100644
--- a/client/executor/src/integration_tests/mod.rs
+++ b/client/executor/src/integration_tests/mod.rs
@@ -475,8 +475,6 @@ fn offchain_index(wasm_method: WasmExecutionMethod) {
 #[test_case(WasmExecutionMethod::Interpreted)]
 #[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
 fn offchain_local_storage_should_work(wasm_method: WasmExecutionMethod) {
-	use sp_core::offchain::OffchainStorage;
-
 	let mut ext = TestExternalities::default();
 	let (offchain, state) = testing::TestOffchainExt::new();
 	ext.register_extension(OffchainExt::new(offchain));
@@ -489,7 +487,7 @@ fn offchain_local_storage_should_work(wasm_method: WasmExecutionMethod) {
 		).unwrap(),
 		true.encode(),
 	);
-	assert_eq!(state.read().persistent_storage.get(b"", b"test"), Some(vec![]));
+	assert_eq!(state.read().persistent_storage.get(b"test"), Some(vec![]));
 }
 
 #[test_case(WasmExecutionMethod::Interpreted)]
diff --git a/frame/merkle-mountain-range/Cargo.toml b/frame/merkle-mountain-range/Cargo.toml
new file mode 100644
index 000000000000..b46f42cacf65
--- /dev/null
+++ b/frame/merkle-mountain-range/Cargo.toml
@@ -0,0 +1,44 @@
+[package]
+name = "pallet-mmr"
+version = "2.0.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
+license = "Apache-2.0"
+homepage = "https://substrate.dev"
+repository = "https://github.com/paritytech/substrate/"
+description = "FRAME Merkle Mountain Range pallet."
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false }
+frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-support = { version = "2.0.0", default-features = false, path = "../support" }
+frame-system = { version = "2.0.0", default-features = false, path = "../system" }
+mmr-lib = { package = "ckb-merkle-mountain-range", default-features = false, version = "0.3.1" }
+serde = { version = "1.0.101", optional = true }
+sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
+sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
+
+[dev-dependencies]
+env_logger = "0.5"
+hex-literal = "0.3"
+
+[features]
+default = ["std"]
+std = [
+	"codec/std",
+	"frame-benchmarking/std",
+	"frame-support/std",
+	"frame-system/std",
+	"mmr-lib/std",
+	"serde",
+	"sp-core/std",
+	"sp-io/std",
+	"sp-runtime/std",
+	"sp-std/std",
+]
+runtime-benchmarks = ["frame-benchmarking"]
diff --git a/frame/merkle-mountain-range/src/benchmarking.rs b/frame/merkle-mountain-range/src/benchmarking.rs
new file mode 100644
index 000000000000..af634e18821f
--- /dev/null
+++ b/frame/merkle-mountain-range/src/benchmarking.rs
@@ -0,0 +1,56 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Benchmarks for the MMR pallet.
+
+#![cfg_attr(not(feature = "std"), no_std)]
+
+use crate::*;
+use frame_support::traits::OnInitialize;
+use frame_benchmarking::benchmarks;
+use sp_std::prelude::*;
+
+benchmarks! {
+	_ {	}
+
+	on_initialize {
+		let x in 1 .. 1_000;
+
+		let leaves = x as u64;
+	}: {
+		for b in 0..leaves {
+			Module::<T>::on_initialize((b as u32).into());
+		}
+	} verify {
+		assert_eq!(crate::NumberOfLeaves::<DefaultInstance>::get(), leaves);
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use crate::mock::*;
+	use crate::tests::new_test_ext;
+	use frame_support::assert_ok;
+
+	#[test]
+	fn test_benchmarks() {
+		new_test_ext().execute_with(|| {
+			assert_ok!(test_benchmark_on_initialize::<Test>());
+		})
+	}
+}
diff --git a/frame/merkle-mountain-range/src/default_weights.rs b/frame/merkle-mountain-range/src/default_weights.rs
new file mode 100644
index 000000000000..0b31698545ac
--- /dev/null
+++ b/frame/merkle-mountain-range/src/default_weights.rs
@@ -0,0 +1,42 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Default weights for the MMR Pallet
+//! This file was not auto-generated.
+
+use frame_support::weights::{
+	Weight, constants::{WEIGHT_PER_NANOS, RocksDbWeight as DbWeight},
+};
+
+impl crate::WeightInfo for () {
+	fn on_initialize(peaks: u64) -> Weight {
+		// Reading the parent hash.
+		let leaf_weight = DbWeight::get().reads(1);
+		// Blake2 hash cost.
+		let hash_weight = 2 * WEIGHT_PER_NANOS;
+		// No-op hook.
+		let hook_weight = 0;
+
+		leaf_weight
+			.saturating_add(hash_weight)
+			.saturating_add(hook_weight)
+			.saturating_add(DbWeight::get().reads_writes(
+				2 + peaks,
+				2 + peaks,
+			))
+	}
+}
diff --git a/frame/merkle-mountain-range/src/lib.rs b/frame/merkle-mountain-range/src/lib.rs
new file mode 100644
index 000000000000..afa6c9083c1b
--- /dev/null
+++ b/frame/merkle-mountain-range/src/lib.rs
@@ -0,0 +1,231 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! # Merkle Mountain Range
+//!
+//! ## Overview
+//!
+//! Details on Merkle Mountain Ranges (MMRs) can be found here:
+//! https://github.com/mimblewimble/grin/blob/master/doc/mmr.md
+//!
+//! The MMR pallet constructs a MMR from leaf data obtained on every block from
+//! `LeafDataProvider`. MMR nodes are stored both in:
+//! - on-chain storage - hashes only; not full leaf content)
+//! - off-chain storage - via Indexing API we push full leaf content (and all internal nodes as
+//! well) to the Off-chain DB, so that the data is available for Off-chain workers.
+//! Hashing used for MMR is configurable independently from the rest of the runtime (i.e. not using
+//! `frame_system::Hashing`) so something compatible with external chains can be used (like
+//! Keccak256 for Ethereum compatibility).
+//!
+//! Depending on the usage context (off-chain vs on-chain) the pallet is able to:
+//! - verify MMR leaf proofs (on-chain)
+//! - generate leaf proofs (off-chain)
+//!
+//! See [primitives::Compact] documentation for how you can optimize proof size for leafs that are
+//! composed from multiple elements.
+//!
+//! ## What for?
+//!
+//!	Primary use case for this pallet is to generate MMR root hashes, that can latter on be used by
+//!	BEEFY protocol (see https://github.com/paritytech/grandpa-bridge-gadget).
+//!	MMR root hashes along with BEEFY will make it possible to build Super Light Clients (SLC) of
+//!	Substrate-based chains. The SLC will be able to follow finality and can be shown proofs of more
+//!	details that happened on the source chain.
+//!	In that case the chain which contains the pallet generates the Root Hashes and Proofs, which
+//!	are then presented to another chain acting as a light client which can verify them.
+//!
+//!	Secondary use case is to archive historical data, but still be able to retrieve them on-demand
+//!	if needed. For instance if parent block hashes are stored in the MMR it's possible at any point
+//!	in time to provide a MMR proof about some past block hash, while this data can be safely pruned
+//!	from on-chain storage.
+//!
+//! NOTE This pallet is experimental and not proven to work in production.
+//!
+#![cfg_attr(not(feature = "std"), no_std)]
+
+use codec::Encode;
+use frame_support::{
+	decl_module, decl_storage,
+	weights::Weight,
+};
+use sp_runtime::traits;
+
+mod default_weights;
+mod mmr;
+#[cfg(any(feature = "runtime-benchmarks", test))]
+mod benchmarking;
+#[cfg(test)]
+mod mock;
+#[cfg(test)]
+mod tests;
+
+pub mod primitives;
+
+pub trait WeightInfo {
+	fn on_initialize(peaks: u64) -> Weight;
+}
+
+/// This pallet's configuration trait
+pub trait Config<I = DefaultInstance>: frame_system::Config {
+	/// Prefix for elements stored in the Off-chain DB via Indexing API.
+	///
+	/// Each node of the MMR is inserted both on-chain and off-chain via Indexing API.
+	/// The former does not store full leaf content, just it's compact version (hash),
+	/// and some of the inner mmr nodes might be pruned from on-chain storage.
+	/// The later will contain all the entries in their full form.
+	///
+	/// Each node is stored in the Off-chain DB under key derived from the [INDEXING_PREFIX] and
+	/// it's in-tree index (MMR position).
+	const INDEXING_PREFIX: &'static [u8];
+
+	/// A hasher type for MMR.
+	///
+	/// To construct trie nodes that result in merging (bagging) two peaks, depending on the node
+	/// kind we take either:
+	/// - The node (hash) itself if it's an inner node.
+	/// - The hash of SCALE-encoding of the leaf data if it's a leaf node.
+	///
+	/// Then we create a tuple of these two hashes, SCALE-encode it (concatenate) and
+	/// hash, to obtain a new MMR inner node - the new peak.
+	type Hashing: traits::Hash<Output = <Self as Config<I>>::Hash>;
+
+	/// The hashing output type.
+	///
+	/// This type is actually going to be stored in the MMR.
+	/// Required to be provided again, to satisfy trait bounds for storage items.
+	type Hash: traits::Member + traits::MaybeSerializeDeserialize + sp_std::fmt::Debug
+		+ sp_std::hash::Hash + AsRef<[u8]> + AsMut<[u8]> + Copy + Default + codec::Codec
+		+ codec::EncodeLike;
+
+	/// Data stored in the leaf nodes.
+	///
+	/// The [LeafData](primitives::LeafDataProvider) is responsible for returning the entire leaf
+	/// data that will be inserted to the MMR.
+	/// [LeafDataProvider](primitives::LeafDataProvider)s can be composed into tuples to put
+	/// multiple elements into the tree. In such a case it might be worth using [primitives::Compact]
+	/// to make MMR proof for one element of the tuple leaner.
+	type LeafData: primitives::LeafDataProvider;
+
+	/// A hook to act on the new MMR root.
+	///
+	/// For some applications it might be beneficial to make the MMR root available externally
+	/// apart from having it in the storage. For instance you might output it in the header digest
+	/// (see [frame_system::Module::deposit_log]) to make it available for Light Clients.
+	/// Hook complexity should be `O(1)`.
+	type OnNewRoot: primitives::OnNewRoot<<Self as Config<I>>::Hash>;
+
+	/// Weights for this pallet.
+	type WeightInfo: WeightInfo;
+}
+
+decl_storage! {
+	trait Store for Module<T: Config<I>, I: Instance = DefaultInstance> as MerkleMountainRange {
+		/// Latest MMR Root hash.
+		pub RootHash get(fn mmr_root_hash): <T as Config<I>>::Hash;
+
+		/// Current size of the MMR (number of leaves).
+		pub NumberOfLeaves get(fn mmr_leaves): u64;
+
+		/// Hashes of the nodes in the MMR.
+		///
+		/// Note this collection only contains MMR peaks, the inner nodes (and leaves)
+		/// are pruned and only stored in the Offchain DB.
+		pub Nodes get(fn mmr_peak): map hasher(identity) u64 => Option<<T as Config<I>>::Hash>;
+	}
+}
+
+decl_module! {
+	/// A public part of the pallet.
+	pub struct Module<T: Config<I>, I: Instance = DefaultInstance> for enum Call where origin: T::Origin {
+		fn on_initialize(n: T::BlockNumber) -> Weight {
+			use primitives::LeafDataProvider;
+			let leaves = Self::mmr_leaves();
+			let peaks_before = mmr::utils::NodesUtils::new(leaves).number_of_peaks();
+			let data = T::LeafData::leaf_data();
+			// append new leaf to MMR
+			let mut mmr: ModuleMmr<mmr::storage::RuntimeStorage, T, I> = mmr::Mmr::new(leaves);
+			mmr.push(data).expect("MMR push never fails.");
+
+			// update the size
+			let (leaves, root) = mmr.finalize().expect("MMR finalize never fails.");
+			<T::OnNewRoot as primitives::OnNewRoot<_>>::on_new_root(&root);
+
+			<NumberOfLeaves>::put(leaves);
+			<RootHash<T, I>>::put(root);
+
+			let peaks_after = mmr::utils::NodesUtils::new(leaves).number_of_peaks();
+			T::WeightInfo::on_initialize(peaks_before.max(peaks_after))
+		}
+	}
+}
+
+/// A MMR specific to the pallet.
+type ModuleMmr<StorageType, T, I> = mmr::Mmr<StorageType, T, I, LeafOf<T, I>>;
+
+/// Leaf data.
+type LeafOf<T, I> = <<T as Config<I>>::LeafData as primitives::LeafDataProvider>::LeafData;
+
+/// Hashing used for the pallet.
+pub(crate) type HashingOf<T, I> = <T as Config<I>>::Hashing;
+
+impl<T: Config<I>, I: Instance> Module<T, I> {
+	fn offchain_key(pos: u64) -> sp_std::prelude::Vec<u8> {
+		(T::INDEXING_PREFIX, pos).encode()
+	}
+
+	/// Generate a MMR proof for the given `leaf_index`.
+	///
+	/// Note this method can only be used from an off-chain context
+	/// (Offchain Worker or Runtime API call), since it requires
+	/// all the leaves to be present.
+	/// It may return an error or panic if used incorrectly.
+	pub fn generate_proof(leaf_index: u64) -> Result<
+		(LeafOf<T, I>, primitives::Proof<<T as Config<I>>::Hash>),
+		mmr::Error,
+	> {
+		let mmr: ModuleMmr<mmr::storage::OffchainStorage, T, I> = mmr::Mmr::new(Self::mmr_leaves());
+		mmr.generate_proof(leaf_index)
+	}
+
+	/// Verify MMR proof for given `leaf`.
+	///
+	/// This method is safe to use within the runtime code.
+	/// It will return `Ok(())` if the proof is valid
+	/// and an `Err(..)` if MMR is inconsistent (some leaves are missing)
+	/// or the proof is invalid.
+	pub fn verify_leaf(
+		leaf: LeafOf<T, I>,
+		proof: primitives::Proof<<T as Config<I>>::Hash>,
+	) -> Result<(), mmr::Error> {
+		if proof.leaf_count > Self::mmr_leaves()
+			|| proof.leaf_count == 0
+			|| proof.items.len() as u32 > mmr::utils::NodesUtils::new(proof.leaf_count).depth()
+		{
+			return Err(mmr::Error::Verify.log_debug(
+				"The proof has incorrect number of leaves or proof items."
+			));
+		}
+
+		let mmr: ModuleMmr<mmr::storage::RuntimeStorage, T, I> = mmr::Mmr::new(proof.leaf_count);
+		let is_valid = mmr.verify_leaf_proof(leaf, proof)?;
+		if is_valid {
+			Ok(())
+		} else {
+			Err(mmr::Error::Verify.log_debug("The proof is incorrect."))
+		}
+	}
+}
diff --git a/frame/merkle-mountain-range/src/mmr/mmr.rs b/frame/merkle-mountain-range/src/mmr/mmr.rs
new file mode 100644
index 000000000000..ee27163ae435
--- /dev/null
+++ b/frame/merkle-mountain-range/src/mmr/mmr.rs
@@ -0,0 +1,186 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::{
+	Config, HashingOf, Instance,
+	mmr::{
+		Node, NodeOf, Hasher,
+		storage::{Storage, OffchainStorage, RuntimeStorage},
+		utils::NodesUtils,
+	},
+	primitives,
+};
+use frame_support::{debug, RuntimeDebug};
+use sp_std::fmt;
+#[cfg(not(feature = "std"))]
+use sp_std::{vec, prelude::Vec};
+
+/// A wrapper around a MMR library to expose limited functionality.
+///
+/// Available functions depend on the storage kind ([Runtime](crate::mmr::storage::RuntimeStorage)
+/// vs [Off-chain](crate::mmr::storage::OffchainStorage)).
+pub struct Mmr<StorageType, T, I, L> where
+	T: Config<I>,
+	I: Instance,
+	L: primitives::FullLeaf,
+	Storage<StorageType, T, I, L>: mmr_lib::MMRStore<NodeOf<T, I, L>>,
+{
+	mmr: mmr_lib::MMR<
+		NodeOf<T, I, L>,
+		Hasher<HashingOf<T, I>, L>,
+		Storage<StorageType, T, I, L>
+	>,
+	leaves: u64,
+}
+
+impl<StorageType, T, I, L> Mmr<StorageType, T, I, L> where
+	T: Config<I>,
+	I: Instance,
+	L: primitives::FullLeaf,
+	Storage<StorageType, T, I, L>: mmr_lib::MMRStore<NodeOf<T, I, L>>,
+{
+	/// Create a pointer to an existing MMR with given number of leaves.
+	pub fn new(leaves: u64) -> Self {
+		let size = NodesUtils::new(leaves).size();
+		Self {
+			mmr: mmr_lib::MMR::new(size, Default::default()),
+			leaves,
+		}
+	}
+
+	/// Verify proof of a single leaf.
+	pub fn verify_leaf_proof(
+		&self,
+		leaf: L,
+		proof: primitives::Proof<<T as Config<I>>::Hash>,
+	) -> Result<bool, Error> {
+		let p = mmr_lib::MerkleProof::<
+			NodeOf<T, I, L>,
+			Hasher<HashingOf<T, I>, L>,
+		>::new(
+			self.mmr.mmr_size(),
+			proof.items.into_iter().map(Node::Hash).collect(),
+		);
+		let position = mmr_lib::leaf_index_to_pos(proof.leaf_index);
+		let root = self.mmr.get_root().map_err(|e| Error::GetRoot.log_error(e))?;
+		p.verify(
+			root,
+			vec![(position, Node::Data(leaf))],
+		).map_err(|e| Error::Verify.log_debug(e))
+	}
+
+	/// Return the internal size of the MMR (number of nodes).
+	#[cfg(test)]
+	pub fn size(&self) -> u64 {
+		self.mmr.mmr_size()
+	}
+}
+
+/// Runtime specific MMR functions.
+impl<T, I, L> Mmr<RuntimeStorage, T, I, L> where
+	T: Config<I>,
+	I: Instance,
+	L: primitives::FullLeaf,
+{
+
+	/// Push another item to the MMR.
+	///
+	/// Returns element position (index) in the MMR.
+	pub fn push(&mut self, leaf: L) -> Option<u64> {
+		let position = self.mmr.push(Node::Data(leaf))
+			.map_err(|e| Error::Push.log_error(e))
+			.ok()?;
+
+		self.leaves += 1;
+
+		Some(position)
+	}
+
+	/// Commit the changes to underlying storage, return current number of leaves and
+	/// calculate the new MMR's root hash.
+	pub fn finalize(self) -> Result<(u64, <T as Config<I>>::Hash), Error> {
+		let root = self.mmr.get_root().map_err(|e| Error::GetRoot.log_error(e))?;
+		self.mmr.commit().map_err(|e| Error::Commit.log_error(e))?;
+		Ok((self.leaves, root.hash()))
+	}
+}
+
+/// Off-chain specific MMR functions.
+impl<T, I, L> Mmr<OffchainStorage, T, I, L> where
+	T: Config<I>,
+	I: Instance,
+	L: primitives::FullLeaf,
+{
+	/// Generate a proof for given leaf index.
+	///
+	/// Proof generation requires all the nodes (or their hashes) to be available in the storage.
+	/// (i.e. you can't run the function in the pruned storage).
+	pub fn generate_proof(&self, leaf_index: u64) -> Result<
+		(L, primitives::Proof<<T as Config<I>>::Hash>),
+		Error
+	> {
+		let position = mmr_lib::leaf_index_to_pos(leaf_index);
+		let store = <Storage<OffchainStorage, T, I, L>>::default();
+		let leaf = match mmr_lib::MMRStore::get_elem(&store, position) {
+			Ok(Some(Node::Data(leaf))) => leaf,
+			e => return Err(Error::LeafNotFound.log_debug(e)),
+		};
+		let leaf_count = self.leaves;
+		self.mmr.gen_proof(vec![position])
+			.map_err(|e| Error::GenerateProof.log_error(e))
+			.map(|p| primitives::Proof {
+				leaf_index,
+				leaf_count,
+				items: p.proof_items().iter().map(|x| x.hash()).collect(),
+			})
+			.map(|p| (leaf, p))
+	}
+}
+
+/// Merkle Mountain Range operation error.
+#[derive(RuntimeDebug)]
+#[cfg_attr(test, derive(PartialEq, Eq))]
+pub enum Error {
+	/// Error while pushing new node.
+	Push,
+	/// Error getting the new root.
+	GetRoot,
+	/// Error commiting changes.
+	Commit,
+	/// Error during proof generation.
+	GenerateProof,
+	/// Proof verification error.
+	Verify,
+	/// Leaf not found in the storage.
+	LeafNotFound,
+}
+
+impl Error {
+	/// Consume given error `e` with `self` and generate a native log entry with error details.
+	pub(crate) fn log_error(self, e: impl fmt::Debug) -> Self {
+		debug::native::error!("[{:?}] MMR error: {:?}", self, e);
+		self
+	}
+
+	/// Consume given error `e` with `self` and generate a native log entry with error details.
+	pub(crate) fn log_debug(self, e: impl fmt::Debug) -> Self {
+		debug::native::debug!("[{:?}] MMR error: {:?}", self, e);
+		self
+	}
+
+}
+
diff --git a/frame/merkle-mountain-range/src/mmr/mod.rs b/frame/merkle-mountain-range/src/mmr/mod.rs
new file mode 100644
index 000000000000..7fd8f5ae1bf0
--- /dev/null
+++ b/frame/merkle-mountain-range/src/mmr/mod.rs
@@ -0,0 +1,45 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod storage;
+pub mod utils;
+mod mmr;
+
+use crate::primitives::FullLeaf;
+use sp_runtime::traits;
+
+pub use self::mmr::{Mmr, Error};
+
+/// Node type for runtime `T`.
+pub type NodeOf<T, I, L> = Node<<T as crate::Config<I>>::Hashing, L>;
+
+/// A node stored in the MMR.
+pub type Node<H, L> = crate::primitives::DataOrHash<H, L>;
+
+/// Default Merging & Hashing behavior for MMR.
+pub struct Hasher<H, L>(sp_std::marker::PhantomData<(H, L)>);
+
+impl<H: traits::Hash, L: FullLeaf> mmr_lib::Merge for Hasher<H, L> {
+	type Item = Node<H, L>;
+
+	fn merge(left: &Self::Item, right: &Self::Item) -> Self::Item {
+		let mut concat = left.hash().as_ref().to_vec();
+		concat.extend_from_slice(right.hash().as_ref());
+
+		Node::Hash(<H as traits::Hash>::hash(&concat))
+	}
+}
diff --git a/frame/merkle-mountain-range/src/mmr/storage.rs b/frame/merkle-mountain-range/src/mmr/storage.rs
new file mode 100644
index 000000000000..a1aa57087a25
--- /dev/null
+++ b/frame/merkle-mountain-range/src/mmr/storage.rs
@@ -0,0 +1,112 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! A MMR storage implementations.
+
+use codec::Encode;
+use crate::mmr::{NodeOf, Node};
+use crate::{NumberOfLeaves, Nodes, Module, Config, Instance, primitives};
+use frame_support::{StorageMap, StorageValue};
+#[cfg(not(feature = "std"))]
+use sp_std::prelude::Vec;
+
+/// A marker type for runtime-specific storage implementation.
+///
+/// Allows appending new items to the MMR and proof verification.
+/// MMR nodes are appended to two different storages:
+/// 1. We add nodes (leaves) hashes to the on-chain storge (see [crate::Nodes]).
+/// 2. We add full leaves (and all inner nodes as well) into the `IndexingAPI` during block
+///    processing, so the values end up in the Offchain DB if indexing is enabled.
+pub struct RuntimeStorage;
+
+/// A marker type for offchain-specific storage implementation.
+///
+/// Allows proof generation and verification, but does not support appending new items.
+/// MMR nodes are assumed to be stored in the Off-Chain DB. Note this storage type
+/// DOES NOT support adding new items to the MMR.
+pub struct OffchainStorage;
+
+/// A storage layer for MMR.
+///
+/// There are two different implementations depending on the use case.
+/// See docs for [RuntimeStorage] and [OffchainStorage].
+pub struct Storage<StorageType, T, I, L>(
+	sp_std::marker::PhantomData<(StorageType, T, I, L)>
+);
+
+impl<StorageType, T, I, L> Default for Storage<StorageType, T, I, L> {
+	fn default() -> Self {
+		Self(Default::default())
+	}
+}
+
+impl<T, I, L> mmr_lib::MMRStore<NodeOf<T, I, L>> for Storage<OffchainStorage, T, I, L> where
+	T: Config<I>,
+	I: Instance,
+	L: primitives::FullLeaf,
+{
+	fn get_elem(&self, pos: u64) -> mmr_lib::Result<Option<NodeOf<T, I, L>>> {
+		let key = Module::<T, I>::offchain_key(pos);
+		// Retrieve the element from Off-chain DB.
+		Ok(
+			sp_io::offchain ::local_storage_get(sp_core::offchain::StorageKind::PERSISTENT, &key)
+				.and_then(|v| codec::Decode::decode(&mut &*v).ok())
+		)
+	}
+
+	fn append(&mut self, _: u64, _: Vec<NodeOf<T, I, L>>) -> mmr_lib::Result<()> {
+		panic!("MMR must not be altered in the off-chain context.")
+ 	}
+}
+
+impl<T, I, L> mmr_lib::MMRStore<NodeOf<T, I, L>> for Storage<RuntimeStorage, T, I, L> where
+	T: Config<I>,
+	I: Instance,
+	L: primitives::FullLeaf,
+{
+	fn get_elem(&self, pos: u64) -> mmr_lib::Result<Option<NodeOf<T, I, L>>> {
+		Ok(<Nodes<T, I>>::get(pos)
+			.map(Node::Hash)
+		)
+	}
+
+	fn append(&mut self, pos: u64, elems: Vec<NodeOf<T, I, L>>) -> mmr_lib::Result<()> {
+		let mut leaves = crate::NumberOfLeaves::<I>::get();
+		let mut size = crate::mmr::utils::NodesUtils::new(leaves).size();
+		if pos != size {
+			return Err(mmr_lib::Error::InconsistentStore);
+		}
+
+		for elem in elems {
+			// on-chain we only store the hash (even if it's a leaf)
+			<Nodes<T, I>>::insert(size, elem.hash());
+			// Indexing API is used to store the full leaf content.
+			elem.using_encoded(|elem| {
+				sp_io::offchain_index::set(&Module::<T, I>::offchain_key(size), elem)
+			});
+			size += 1;
+
+			if let Node::Data(..) = elem {
+				leaves += 1;
+			}
+		}
+
+		NumberOfLeaves::<I>::put(leaves);
+
+		Ok(())
+	}
+}
diff --git a/frame/merkle-mountain-range/src/mmr/utils.rs b/frame/merkle-mountain-range/src/mmr/utils.rs
new file mode 100644
index 000000000000..7a55605a64c9
--- /dev/null
+++ b/frame/merkle-mountain-range/src/mmr/utils.rs
@@ -0,0 +1,131 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Merkle Mountain Range utilities.
+
+/// MMR nodes & size -related utilities.
+pub struct NodesUtils {
+	no_of_leaves: u64,
+}
+
+impl NodesUtils {
+	/// Create new instance of MMR nodes utilities for given number of leaves.
+	pub fn new(no_of_leaves: u64) -> Self {
+		Self { no_of_leaves }
+	}
+
+	/// Calculate number of peaks in the MMR.
+	pub fn number_of_peaks(&self) -> u64 {
+		self.number_of_leaves().count_ones() as u64
+	}
+
+	/// Return the number of leaves in the MMR.
+	pub fn number_of_leaves(&self) -> u64 {
+		self.no_of_leaves
+	}
+
+	/// Calculate the total size of MMR (number of nodes).
+	pub fn size(&self) -> u64 {
+		2 * self.no_of_leaves - self.number_of_peaks()
+	}
+
+	/// Calculate maximal depth of the MMR.
+	pub fn depth(&self) -> u32 {
+		if self.no_of_leaves == 0 {
+			return 0
+		}
+
+		64 - self.no_of_leaves
+				.next_power_of_two()
+				.leading_zeros()
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+
+	#[test]
+	fn should_calculate_number_of_leaves_correctly() {
+		assert_eq!(
+			vec![0, 1, 2, 3, 4, 9, 15, 21]
+				.into_iter()
+				.map(|n| NodesUtils::new(n).depth())
+				.collect::<Vec<_>>(),
+			vec![0, 1, 2, 3, 3, 5, 5, 6]
+		);
+	}
+
+	#[test]
+	fn should_calculate_depth_correclty() {
+		assert_eq!(
+			vec![0, 1, 2, 3, 4, 9, 15, 21]
+				.into_iter()
+				.map(|n| NodesUtils::new(n).number_of_leaves())
+				.collect::<Vec<_>>(),
+			vec![0, 1, 2, 3, 4, 9, 15, 21]
+		);
+	}
+
+	#[test]
+	fn should_calculate_number_of_peaks_correctly() {
+		assert_eq!(
+			vec![0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 21]
+				.into_iter()
+				.map(|n| NodesUtils::new(n).number_of_peaks())
+				.collect::<Vec<_>>(),
+			vec![0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4, 3]
+		);
+	}
+
+	#[test]
+	fn should_calculate_the_size_correctly() {
+		let _ = env_logger::try_init();
+
+		let leaves = vec![0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 21];
+		let sizes = vec![0, 1, 3, 4, 7, 8, 10, 11, 15, 16, 18, 19, 22, 23, 25, 26, 39];
+		assert_eq!(
+			leaves
+				.clone()
+				.into_iter()
+				.map(|n| NodesUtils::new(n).size())
+				.collect::<Vec<_>>(),
+			sizes.clone()
+		);
+
+		// size cross-check
+		let mut actual_sizes = vec![];
+		for s in &leaves[1..] {
+			crate::tests::new_test_ext().execute_with(|| {
+				let mut mmr = crate::mmr::Mmr::<
+					crate::mmr::storage::RuntimeStorage,
+					crate::mock::Test,
+					crate::DefaultInstance,
+					_,
+				>::new(0);
+				for i in 0..*s {
+					mmr.push(i);
+				}
+				actual_sizes.push(mmr.size());
+			})
+		}
+		assert_eq!(
+			sizes[1..],
+			actual_sizes[..],
+		);
+	}
+}
diff --git a/frame/merkle-mountain-range/src/mock.rs b/frame/merkle-mountain-range/src/mock.rs
new file mode 100644
index 000000000000..c311d53446bb
--- /dev/null
+++ b/frame/merkle-mountain-range/src/mock.rs
@@ -0,0 +1,105 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::*;
+use crate::primitives::{LeafDataProvider, Compact};
+
+use codec::{Encode, Decode};
+use frame_support::{
+	impl_outer_origin, parameter_types,
+};
+use sp_core::H256;
+use sp_runtime::{
+	testing::Header,
+	traits::{
+		BlakeTwo256, Keccak256, IdentityLookup,
+	},
+};
+use sp_std::cell::RefCell;
+use sp_std::prelude::*;
+
+impl_outer_origin! {
+	pub enum Origin for Test where system = frame_system {}
+}
+
+#[derive(Clone, Eq, PartialEq, Encode, Decode)]
+pub struct Test;
+parameter_types! {
+	pub const BlockHashCount: u64 = 250;
+}
+impl frame_system::Config for Test {
+	type BaseCallFilter = ();
+	type Origin = Origin;
+	type Call = ();
+	type Index = u64;
+	type BlockNumber = u64;
+	type Hash = H256;
+	type Hashing = BlakeTwo256;
+	type AccountId = sp_core::sr25519::Public;
+	type Lookup = IdentityLookup<Self::AccountId>;
+	type Header = Header;
+	type Event = ();
+	type BlockHashCount = BlockHashCount;
+	type DbWeight = ();
+	type BlockWeights = ();
+	type BlockLength = ();
+	type Version = ();
+	type PalletInfo = ();
+	type AccountData = ();
+	type OnNewAccount = ();
+	type OnKilledAccount = ();
+	type SystemWeightInfo = ();
+}
+
+impl Config for Test {
+	const INDEXING_PREFIX: &'static [u8] = b"mmr-";
+
+	type Hashing = Keccak256;
+	type Hash = H256;
+	type LeafData = Compact<Keccak256, (frame_system::Module<Test>, LeafData)>;
+	type OnNewRoot = ();
+	type WeightInfo = ();
+}
+
+#[derive(Encode, Decode, Clone, Default, Eq, PartialEq, Debug)]
+pub struct LeafData {
+	pub a: u64,
+	pub b: Vec<u8>,
+}
+
+impl LeafData {
+	pub fn new(a: u64) -> Self {
+		Self {
+			a,
+			b: Default::default(),
+		}
+	}
+}
+
+thread_local! {
+	pub static LEAF_DATA: RefCell<LeafData> = RefCell::new(Default::default());
+}
+
+impl LeafDataProvider for LeafData {
+	type LeafData = Self;
+
+	fn leaf_data() -> Self::LeafData {
+		LEAF_DATA.with(|r| r.borrow().clone())
+	}
+}
+
+pub(crate) type MMR = Module<Test>;
diff --git a/frame/merkle-mountain-range/src/primitives.rs b/frame/merkle-mountain-range/src/primitives.rs
new file mode 100644
index 000000000000..cab4b6a0dc83
--- /dev/null
+++ b/frame/merkle-mountain-range/src/primitives.rs
@@ -0,0 +1,415 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Merkle Mountain Range primitive types.
+
+use frame_support::RuntimeDebug;
+use sp_runtime::traits;
+use sp_std::fmt;
+#[cfg(not(feature = "std"))]
+use sp_std::prelude::Vec;
+
+/// A provider of the MMR's leaf data.
+pub trait LeafDataProvider {
+	/// A type that should end up in the leaf of MMR.
+	type LeafData: FullLeaf;
+
+	/// The method to return leaf data that should be placed
+	/// in the leaf node appended MMR at this block.
+	///
+	/// This is being called by the `on_initialize` method of
+	/// this pallet at the very beginning of each block.
+	fn leaf_data() -> Self::LeafData;
+}
+
+impl LeafDataProvider for () {
+	type LeafData = ();
+
+	fn leaf_data() -> Self::LeafData {
+		()
+	}
+}
+
+/// The most common use case for MMRs is to store historical block hashes,
+/// so that any point in time in the future we can receive a proof about some past
+/// blocks without using excessive on-chain storage.
+/// Hence we implement the [LeafDataProvider] for [frame_system::Module], since the
+/// current block hash is not available (since the block is not finished yet),
+/// we use the `parent_hash` here.
+impl<T: frame_system::Config> LeafDataProvider for frame_system::Module<T> {
+	type LeafData = <T as frame_system::Config>::Hash;
+
+	fn leaf_data() -> Self::LeafData {
+		Self::parent_hash()
+	}
+}
+
+/// New MMR root notification hook.
+pub trait OnNewRoot<Hash> {
+	/// Function called by the pallet in case new MMR root has been computed.
+	fn on_new_root(root: &Hash);
+}
+
+/// No-op implementation of [OnNewRoot].
+impl<Hash> OnNewRoot<Hash> for () {
+	fn on_new_root(_root: &Hash) {}
+}
+
+/// A full leaf content stored in the offchain-db.
+pub trait FullLeaf: Clone + PartialEq + fmt::Debug + codec::Decode {
+	/// Encode the leaf either in it's full or compact form.
+	///
+	/// NOTE the encoding returned here MUST be `Decode`able into `FullLeaf`.
+	fn using_encoded<R, F: FnOnce(&[u8]) -> R>(&self, f: F, compact: bool) -> R;
+}
+
+impl<T: codec::Encode + codec::Decode + Clone + PartialEq + fmt::Debug> FullLeaf for T {
+	fn using_encoded<R, F: FnOnce(&[u8]) -> R>(&self, f: F, _compact: bool) -> R {
+		codec::Encode::using_encoded(self, f)
+	}
+}
+
+/// An element representing either full data or it's hash.
+///
+/// See [Compact] to see how it may be used in practice to reduce the size
+/// of proofs in case multiple [LeafDataProvider]s are composed together.
+/// This is also used internally by the MMR to differentiate leaf nodes (data)
+/// and inner nodes (hashes).
+///
+/// [DataOrHash::hash] method calculates the hash of this element in it's compact form,
+/// so should be used instead of hashing the encoded form (which will always be non-compact).
+#[derive(RuntimeDebug, Clone, PartialEq)]
+pub enum DataOrHash<H: traits::Hash, L> {
+	/// Arbitrary data in it's full form.
+	Data(L),
+	/// A hash of some data.
+	Hash(H::Output),
+}
+
+impl<H: traits::Hash, L> From<L> for DataOrHash<H, L> {
+	fn from(l: L) -> Self {
+		Self::Data(l)
+	}
+}
+
+mod encoding {
+	use super::*;
+
+	/// A helper type to implement [codec::Codec] for [DataOrHash].
+	#[derive(codec::Encode, codec::Decode)]
+	enum Either<A, B> {
+		Left(A),
+		Right(B),
+	}
+
+	impl<H: traits::Hash, L: FullLeaf> codec::Encode for DataOrHash<H, L> {
+		fn encode_to<T: codec::Output>(&self, dest: &mut T) {
+			match self {
+				Self::Data(l) => l.using_encoded(
+					|data| Either::<&[u8], &H::Output>::Left(data).encode_to(dest), false
+				),
+				Self::Hash(h) => Either::<&[u8], &H::Output>::Right(h).encode_to(dest),
+			}
+		}
+	}
+
+	impl<H: traits::Hash, L: FullLeaf> codec::Decode for DataOrHash<H, L> {
+		fn decode<I: codec::Input>(value: &mut I) -> Result<Self, codec::Error> {
+			let decoded: Either<Vec<u8>, H::Output> = Either::decode(value)?;
+			Ok(match decoded {
+				Either::Left(l) => DataOrHash::Data(L::decode(&mut &*l)?),
+				Either::Right(r) => DataOrHash::Hash(r),
+			})
+		}
+	}
+}
+
+impl<H: traits::Hash, L: FullLeaf> DataOrHash<H, L> {
+	/// Retrieve a hash of this item.
+	///
+	/// Depending on the node type it's going to either be a contained value for [DataOrHash::Hash]
+	/// node, or a hash of SCALE-encoded [DataOrHash::Data] data.
+	pub fn hash(&self) -> H::Output {
+		match *self {
+			Self::Data(ref leaf) => leaf.using_encoded(<H as traits::Hash>::hash, true),
+			Self::Hash(ref hash) => hash.clone(),
+		}
+	}
+}
+
+/// A composition of multiple leaf elements with compact form representation.
+///
+/// When composing together multiple [LeafDataProvider]s you will end up with
+/// a tuple of `LeafData` that each element provides.
+///
+/// However this will cause the leaves to have significant size, while for some
+/// use cases it will be enough to prove only one element of the tuple.
+/// That's the rationale for [Compact] struct. We wrap each element of the tuple
+/// into [DataOrHash] and each tuple element is hashed first before constructing
+/// the final hash of the entire tuple. This allows you to replace tuple elements
+/// you don't care about with their hashes.
+#[derive(RuntimeDebug, Clone, PartialEq)]
+pub struct Compact<H, T> {
+	pub tuple: T,
+	_hash: sp_std::marker::PhantomData<H>,
+}
+
+impl<H, T> sp_std::ops::Deref for Compact<H, T> {
+	type Target = T;
+
+	fn deref(&self) -> &Self::Target {
+		&self.tuple
+	}
+}
+
+impl<H, T> Compact<H, T> {
+	pub fn new(tuple: T) -> Self {
+		Self { tuple, _hash: Default::default() }
+	}
+}
+
+impl<H, T: codec::Decode> codec::Decode for Compact<H, T> {
+	fn decode<I: codec::Input>(value: &mut I) -> Result<Self, codec::Error> {
+		T::decode(value).map(Compact::new)
+	}
+}
+
+macro_rules! impl_leaf_data_for_tuple {
+	( $( $name:ident : $id:tt ),+ ) => {
+		/// [FullLeaf] implementation for `Compact<H, (DataOrHash<H, Tuple>, ...)>`
+		impl<H, $( $name ),+> FullLeaf for Compact<H, ( $( DataOrHash<H, $name>, )+ )> where
+			H: traits::Hash,
+			$( $name: FullLeaf ),+
+		{
+			fn using_encoded<R, F: FnOnce(&[u8]) -> R>(&self, f: F, compact: bool) -> R {
+				if compact {
+					codec::Encode::using_encoded(&(
+						$( DataOrHash::<H, $name>::Hash(self.tuple.$id.hash()), )+
+					), f)
+				} else {
+					codec::Encode::using_encoded(&self.tuple, f)
+				}
+			}
+		}
+
+		/// [LeafDataProvider] implementation for `Compact<H, (DataOrHash<H, Tuple>, ...)>`
+		///
+		/// This provides a compact-form encoding for tuples wrapped in [Compact].
+		impl<H, $( $name ),+> LeafDataProvider for Compact<H, ( $( $name, )+ )> where
+			H: traits::Hash,
+			$( $name: LeafDataProvider ),+
+		{
+			type LeafData = Compact<
+				H,
+				( $( DataOrHash<H, $name::LeafData>, )+ ),
+			>;
+
+			fn leaf_data() -> Self::LeafData {
+				let tuple = (
+					$( DataOrHash::Data($name::leaf_data()), )+
+				);
+				Compact::new(tuple)
+			}
+		}
+
+		/// [LeafDataProvider] implementation for `(Tuple, ...)`
+		///
+		/// This provides regular (non-compactable) composition of [LeafDataProvider]s.
+		impl<$( $name ),+> LeafDataProvider for ( $( $name, )+ ) where
+			( $( $name::LeafData, )+ ): FullLeaf,
+			$( $name: LeafDataProvider ),+
+		{
+			type LeafData = ( $( $name::LeafData, )+ );
+
+			fn leaf_data() -> Self::LeafData {
+				(
+					$( $name::leaf_data(), )+
+				)
+			}
+		}
+	}
+}
+
+/// Test functions implementation for `Compact<H, (DataOrHash<H, Tuple>, ...)>`
+#[cfg(test)]
+impl<H, A, B> Compact<H, (DataOrHash<H, A>, DataOrHash<H, B>)> where
+	H: traits::Hash,
+	A: FullLeaf,
+	B: FullLeaf,
+{
+	/// Retrieve a hash of this item in it's compact form.
+	pub fn hash(&self) -> H::Output {
+		self.using_encoded(<H as traits::Hash>::hash, true)
+	}
+}
+
+impl_leaf_data_for_tuple!(A:0);
+impl_leaf_data_for_tuple!(A:0, B:1);
+impl_leaf_data_for_tuple!(A:0, B:1, C:2);
+impl_leaf_data_for_tuple!(A:0, B:1, C:2, D:3);
+impl_leaf_data_for_tuple!(A:0, B:1, C:2, D:3, E:4);
+
+/// A MMR proof data for one of the leaves.
+#[derive(codec::Encode, codec::Decode, RuntimeDebug, Clone, PartialEq, Eq)]
+pub struct Proof<Hash> {
+	/// The index of the leaf the proof is for.
+	pub leaf_index: u64,
+	/// Number of leaves in MMR, when the proof was generated.
+	pub leaf_count: u64,
+	/// Proof elements (hashes of siblings of inner nodes on the path to the leaf).
+	pub items: Vec<Hash>,
+}
+
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+
+	use codec::Decode;
+	use crate::tests::hex;
+	use sp_runtime::traits::Keccak256;
+
+	type Test = DataOrHash<Keccak256, String>;
+	type TestCompact = Compact<Keccak256, (Test, Test)>;
+	type TestProof = Proof<<Keccak256 as traits::Hash>::Output>;
+
+	#[test]
+	fn should_encode_decode_proof() {
+		// given
+		let proof: TestProof = Proof {
+			leaf_index: 5,
+			leaf_count: 10,
+			items: vec![
+				hex("c3e7ba6b511162fead58f2c8b5764ce869ed1118011ac37392522ed16720bbcd"),
+				hex("d3e7ba6b511162fead58f2c8b5764ce869ed1118011ac37392522ed16720bbcd"),
+				hex("e3e7ba6b511162fead58f2c8b5764ce869ed1118011ac37392522ed16720bbcd"),
+			],
+		};
+
+		// when
+		let encoded = codec::Encode::encode(&proof);
+		let decoded = TestProof::decode(&mut &*encoded);
+
+		// then
+		assert_eq!(decoded, Ok(proof));
+	}
+
+	#[test]
+	fn should_encode_decode_correctly_if_no_compact() {
+		// given
+		let cases = vec![
+			Test::Data("Hello World!".into()),
+			Test::Hash(hex("c3e7ba6b511162fead58f2c8b5764ce869ed1118011ac37392522ed16720bbcd")),
+			Test::Data("".into()),
+			Test::Data("3e48d6bcd417fb22e044747242451e2c0f3e602d1bcad2767c34808621956417".into()),
+		];
+
+		// when
+		let encoded = cases
+			.iter()
+			.map(codec::Encode::encode)
+			.collect::<Vec<_>>();
+
+		let decoded = encoded
+			.iter()
+			.map(|x| Test::decode(&mut &**x))
+			.collect::<Vec<_>>();
+
+		// then
+		assert_eq!(decoded, cases.into_iter().map(Result::<_, codec::Error>::Ok).collect::<Vec<_>>());
+		// check encoding correctness
+		assert_eq!(&encoded[0], &hex_literal::hex!("00343048656c6c6f20576f726c6421"));
+		assert_eq!(
+			encoded[1].as_slice(),
+			hex_literal::hex!(
+				"01c3e7ba6b511162fead58f2c8b5764ce869ed1118011ac37392522ed16720bbcd"
+			).as_ref()
+		);
+	}
+
+	#[test]
+	fn should_return_the_hash_correctly() {
+		// given
+		let a = Test::Data("Hello World!".into());
+		let b = Test::Hash(hex("c3e7ba6b511162fead58f2c8b5764ce869ed1118011ac37392522ed16720bbcd"));
+
+		// when
+		let a = a.hash();
+		let b = b.hash();
+
+		// then
+		assert_eq!(a, hex("a9c321be8c24ba4dc2bd73f5300bde67dc57228ab8b68b607bb4c39c5374fac9"));
+		assert_eq!(b, hex("c3e7ba6b511162fead58f2c8b5764ce869ed1118011ac37392522ed16720bbcd"));
+	}
+
+	#[test]
+	fn compact_should_work() {
+		// given
+		let a = Test::Data("Hello World!".into());
+		let b = Test::Data("".into());
+
+		// when
+		let c: TestCompact = Compact::new((a.clone(), b.clone()));
+		let d: TestCompact = Compact::new((
+			Test::Hash(a.hash()),
+			Test::Hash(b.hash()),
+		));
+
+		// then
+		assert_eq!(c.hash(), d.hash());
+	}
+
+	#[test]
+	fn compact_should_encode_decode_correctly() {
+		// given
+		let a = Test::Data("Hello World!".into());
+		let b = Test::Data("".into());
+
+		let c: TestCompact = Compact::new((a.clone(), b.clone()));
+		let d: TestCompact = Compact::new((
+			Test::Hash(a.hash()),
+			Test::Hash(b.hash()),
+		));
+		let cases = vec![c, d.clone()];
+
+		// when
+		let encoded_compact = cases
+			.iter()
+			.map(|c| c.using_encoded(|x| x.to_vec(), true))
+			.collect::<Vec<_>>();
+
+		let encoded = cases
+			.iter()
+			.map(|c| c.using_encoded(|x| x.to_vec(), false))
+			.collect::<Vec<_>>();
+
+		let decoded_compact = encoded_compact
+			.iter()
+			.map(|x| TestCompact::decode(&mut &**x))
+			.collect::<Vec<_>>();
+
+		let decoded = encoded
+			.iter()
+			.map(|x| TestCompact::decode(&mut &**x))
+			.collect::<Vec<_>>();
+
+		// then
+		assert_eq!(decoded, cases.into_iter().map(Result::<_, codec::Error>::Ok).collect::<Vec<_>>());
+
+		assert_eq!(decoded_compact, vec![Ok(d.clone()), Ok(d.clone())]);
+	}
+}
diff --git a/frame/merkle-mountain-range/src/tests.rs b/frame/merkle-mountain-range/src/tests.rs
new file mode 100644
index 000000000000..059ff6612f1b
--- /dev/null
+++ b/frame/merkle-mountain-range/src/tests.rs
@@ -0,0 +1,275 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::*;
+use crate::mock::*;
+use crate::primitives::{Proof, Compact};
+
+use frame_support::traits::OnInitialize;
+use sp_core::{
+	H256,
+	offchain::{
+		testing::TestOffchainExt,
+		OffchainExt,
+	},
+};
+
+pub(crate) fn new_test_ext() -> sp_io::TestExternalities {
+	frame_system::GenesisConfig::default().build_storage::<Test>().unwrap().into()
+}
+
+fn register_offchain_ext(ext: &mut sp_io::TestExternalities) {
+	let (offchain, _offchain_state) = TestOffchainExt::with_offchain_db(ext.offchain_db());
+	ext.register_extension(OffchainExt::new(offchain));
+}
+
+fn new_block() -> u64 {
+	let number = frame_system::Module::<Test>::block_number() + 1;
+	let hash = H256::repeat_byte(number as u8);
+	LEAF_DATA.with(|r| r.borrow_mut().a = number);
+
+	frame_system::Module::<Test>::initialize(
+		&number,
+		&hash,
+		&Default::default(),
+		&Default::default(),
+		frame_system::InitKind::Full,
+	);
+	MMR::on_initialize(number)
+}
+
+pub(crate) fn hex(s: &str) -> H256 {
+	s.parse().unwrap()
+}
+
+fn decode_node(v: Vec<u8>) -> mmr::Node<
+	<Test as Config>::Hashing,
+	(H256, LeafData),
+> {
+	use crate::primitives::DataOrHash;
+	type A = DataOrHash::<<Test as Config>::Hashing, H256>;
+	type B = DataOrHash::<<Test as Config>::Hashing, LeafData>;
+	type Node = mmr::Node<<Test as Config>::Hashing, (A, B)>;
+	let tuple: Node = codec::Decode::decode(&mut &v[..]).unwrap();
+
+	match tuple {
+		mmr::Node::Data((DataOrHash::Data(a), DataOrHash::Data(b))) => mmr::Node::Data((a, b)),
+		mmr::Node::Hash(hash) => mmr::Node::Hash(hash),
+		_ => unreachable!(),
+	}
+}
+
+fn init_chain(blocks: usize) {
+	// given
+	for _ in 0..blocks {
+		new_block();
+	}
+}
+
+#[test]
+fn should_start_empty() {
+	let _ = env_logger::try_init();
+	new_test_ext().execute_with(|| {
+		// given
+		assert_eq!(
+			crate::RootHash::<Test>::get(),
+			"0000000000000000000000000000000000000000000000000000000000000000".parse().unwrap()
+		);
+		assert_eq!(crate::NumberOfLeaves::<DefaultInstance>::get(), 0);
+		assert_eq!(crate::Nodes::<Test>::get(0), None);
+
+		// when
+		let weight = new_block();
+
+		// then
+		assert_eq!(crate::NumberOfLeaves::<DefaultInstance>::get(), 1);
+		assert_eq!(crate::Nodes::<Test>::get(0),
+			Some(hex("da5e6d0616e05c6a6348605a37ca33493fc1a15ad1e6a405ee05c17843fdafed")));
+		assert_eq!(
+			crate::RootHash::<Test>::get(),
+			hex("da5e6d0616e05c6a6348605a37ca33493fc1a15ad1e6a405ee05c17843fdafed")
+		);
+		assert!(weight != 0);
+	});
+}
+
+#[test]
+fn should_append_to_mmr_when_on_initialize_is_called() {
+	let _ = env_logger::try_init();
+	let mut ext = new_test_ext();
+	ext.execute_with(|| {
+		// when
+		new_block();
+		new_block();
+
+		// then
+		assert_eq!(crate::NumberOfLeaves::<DefaultInstance>::get(), 2);
+		assert_eq!(crate::Nodes::<Test>::get(0),
+			Some(hex("da5e6d0616e05c6a6348605a37ca33493fc1a15ad1e6a405ee05c17843fdafed")));
+		assert_eq!(crate::Nodes::<Test>::get(1),
+			Some(hex("ff5d891b28463a3440e1b650984685efdf260e482cb3807d53c49090841e755f")));
+		assert_eq!(crate::Nodes::<Test>::get(2),
+			Some(hex("bc54778fab79f586f007bd408dca2c4aa07959b27d1f2c8f4f2549d1fcfac8f8")));
+		assert_eq!(crate::Nodes::<Test>::get(3), None);
+		assert_eq!(
+			crate::RootHash::<Test>::get(),
+			hex("bc54778fab79f586f007bd408dca2c4aa07959b27d1f2c8f4f2549d1fcfac8f8")
+		);
+	});
+
+	// make sure the leaves end up in the offchain DB
+	ext.persist_offchain_overlay();
+	let offchain_db = ext.offchain_db();
+	assert_eq!(offchain_db.get(&MMR::offchain_key(0)).map(decode_node), Some(mmr::Node::Data((
+		H256::repeat_byte(1),
+		LeafData::new(1),
+	))));
+	assert_eq!(offchain_db.get(&MMR::offchain_key(1)).map(decode_node), Some(mmr::Node::Data((
+		H256::repeat_byte(2),
+		LeafData::new(2),
+	))));
+	assert_eq!(offchain_db.get(&MMR::offchain_key(2)).map(decode_node), Some(mmr::Node::Hash(
+		hex("bc54778fab79f586f007bd408dca2c4aa07959b27d1f2c8f4f2549d1fcfac8f8")
+	)));
+	assert_eq!(offchain_db.get(&MMR::offchain_key(3)), None);
+}
+
+#[test]
+fn should_construct_larger_mmr_correctly() {
+	let _ = env_logger::try_init();
+	new_test_ext().execute_with(|| {
+		// when
+		init_chain(7);
+
+		// then
+		assert_eq!(crate::NumberOfLeaves::<DefaultInstance>::get(), 7);
+		assert_eq!(crate::Nodes::<Test>::get(0),
+			Some(hex("da5e6d0616e05c6a6348605a37ca33493fc1a15ad1e6a405ee05c17843fdafed")));
+		assert_eq!(crate::Nodes::<Test>::get(10),
+			Some(hex("af3327deed0515c8d1902c9b5cd375942d42f388f3bfe3d1cd6e1b86f9cc456c")));
+		assert_eq!(
+			crate::RootHash::<Test>::get(),
+			hex("fc4f9042bd2f73feb26f3fc42db834c5f1943fa20070ddf106c486a478a0d561")
+		);
+	});
+}
+
+#[test]
+fn should_generate_proofs_correctly() {
+	let _ = env_logger::try_init();
+	let mut ext = new_test_ext();
+	// given
+	ext.execute_with(|| init_chain(7));
+	ext.persist_offchain_overlay();
+
+	// Try to generate proofs now. This requires the offchain extensions to be present
+	// to retrieve full leaf data.
+	register_offchain_ext(&mut ext);
+	ext.execute_with(|| {
+		// when generate proofs for all leaves
+		let proofs = (0_u64..crate::NumberOfLeaves::<DefaultInstance>::get())
+			.into_iter()
+			.map(|leaf_index| crate::Module::<Test>::generate_proof(leaf_index).unwrap())
+			.collect::<Vec<_>>();
+
+		// then
+		assert_eq!(proofs[0], (Compact::new((
+			H256::repeat_byte(1).into(),
+			LeafData::new(1).into(),
+		)), Proof {
+			leaf_index: 0,
+			leaf_count: 7,
+			items: vec![
+				hex("ff5d891b28463a3440e1b650984685efdf260e482cb3807d53c49090841e755f"),
+				hex("00b0046bd2d63fcb760cf50a262448bb2bbf9a264b0b0950d8744044edf00dc3"),
+				hex("16de0900b57bf359a0733674ebfbba0f494e95a8391b4bfeae850019399f3ec0"),
+			],
+		}));
+		assert_eq!(proofs[4], (Compact::new((
+			H256::repeat_byte(5).into(),
+			LeafData::new(5).into(),
+		)), Proof {
+			leaf_index: 4,
+			leaf_count: 7,
+			items: vec![
+				hex("e53ee36ba6c068b1a6cfef7862fed5005df55615e1c9fa6eeefe08329ac4b94b"),
+				hex("c09d4a008a0f1ef37860bef33ec3088ccd94268c0bfba7ff1b3c2a1075b0eb92"),
+				hex("af3327deed0515c8d1902c9b5cd375942d42f388f3bfe3d1cd6e1b86f9cc456c"),
+			],
+		}));
+		assert_eq!(proofs[6], (Compact::new((
+			H256::repeat_byte(7).into(),
+			LeafData::new(7).into(),
+		)), Proof {
+			leaf_index: 6,
+			leaf_count: 7,
+			items: vec![
+				hex("e53ee36ba6c068b1a6cfef7862fed5005df55615e1c9fa6eeefe08329ac4b94b"),
+				hex("dad09f50b41822fc5ecadc25b08c3a61531d4d60e962a5aa0b6998fad5c37c5e"),
+			],
+		}));
+	});
+}
+
+#[test]
+fn should_verify() {
+	let _ = env_logger::try_init();
+
+	// Start off with chain initialisation and storing indexing data off-chain
+	// (MMR Leafs)
+	let mut ext = new_test_ext();
+	ext.execute_with(|| init_chain(7));
+	ext.persist_offchain_overlay();
+
+	// Try to generate proof now. This requires the offchain extensions to be present
+	// to retrieve full leaf data.
+	register_offchain_ext(&mut ext);
+	let (leaf, proof5) = ext.execute_with(|| {
+		// when
+		crate::Module::<Test>::generate_proof(5).unwrap()
+	});
+
+	// Now to verify the proof, we really shouldn't require offchain storage or extension.
+	// Hence we initialize the storage once again, using different externalities and then
+	// verify.
+	let mut ext2 = new_test_ext();
+	ext2.execute_with(|| {
+		init_chain(7);
+		// then
+		assert_eq!(crate::Module::<Test>::verify_leaf(leaf, proof5), Ok(()));
+	});
+}
+
+#[test]
+fn should_verify_on_the_next_block_since_there_is_no_pruning_yet() {
+	let _ = env_logger::try_init();
+	let mut ext = new_test_ext();
+	// given
+	ext.execute_with(|| init_chain(7));
+
+	ext.persist_offchain_overlay();
+	register_offchain_ext(&mut ext);
+
+	ext.execute_with(|| {
+		// when
+		let (leaf, proof5) = crate::Module::<Test>::generate_proof(5).unwrap();
+		new_block();
+
+		// then
+		assert_eq!(crate::Module::<Test>::verify_leaf(leaf, proof5), Ok(()));
+	});
+}
diff --git a/primitives/core/src/offchain/testing.rs b/primitives/core/src/offchain/testing.rs
index 3fe34cc0cfa7..5256f417711b 100644
--- a/primitives/core/src/offchain/testing.rs
+++ b/primitives/core/src/offchain/testing.rs
@@ -70,6 +70,8 @@ pub struct TestPersistentOffchainDB {
 }
 
 impl TestPersistentOffchainDB {
+	const PREFIX: &'static [u8] = b"";
+
 	/// Create a new and empty offchain storage db for persistent items
 	pub fn new() -> Self {
 		Self {
@@ -82,11 +84,16 @@ impl TestPersistentOffchainDB {
 		let mut me = self.persistent.write();
 		for ((_prefix, key), value_operation) in changes.drain() {
 			match value_operation {
-				OffchainOverlayedChange::SetValue(val) => me.set(b"", key.as_slice(), val.as_slice()),
-				OffchainOverlayedChange::Remove => me.remove(b"", key.as_slice()),
+				OffchainOverlayedChange::SetValue(val) => me.set(Self::PREFIX, key.as_slice(), val.as_slice()),
+				OffchainOverlayedChange::Remove => me.remove(Self::PREFIX, key.as_slice()),
 			}
 		}
 	}
+
+	/// Retrieve a key from the test backend.
+	pub fn get(&self, key: &[u8]) -> Option<Vec<u8>> {
+		OffchainStorage::get(self, Self::PREFIX, key)
+	}
 }
 
 impl OffchainStorage for TestPersistentOffchainDB {
@@ -266,8 +273,8 @@ impl offchain::Externalities for TestOffchainExt {
 	fn local_storage_get(&mut self, kind: StorageKind, key: &[u8]) -> Option<Vec<u8>> {
 		let state = self.0.read();
 		match kind {
-			StorageKind::LOCAL => state.local_storage.get(b"", key),
-			StorageKind::PERSISTENT => state.persistent_storage.get(b"", key),
+			StorageKind::LOCAL => state.local_storage.get(TestPersistentOffchainDB::PREFIX, key),
+			StorageKind::PERSISTENT => state.persistent_storage.get(key),
 		}
 	}
 
diff --git a/primitives/runtime/src/offchain/storage.rs b/primitives/runtime/src/offchain/storage.rs
index 2f62d400c0b9..e39514686e17 100644
--- a/primitives/runtime/src/offchain/storage.rs
+++ b/primitives/runtime/src/offchain/storage.rs
@@ -105,7 +105,6 @@ mod tests {
 	use sp_io::TestExternalities;
 	use sp_core::offchain::{
 		OffchainExt,
-		OffchainStorage,
 		testing,
 	};
 
@@ -125,7 +124,7 @@ mod tests {
 			assert_eq!(val.get::<u32>(), Some(Some(15_u32)));
 			assert_eq!(val.get::<Vec<u8>>(), Some(None));
 			assert_eq!(
-				state.read().persistent_storage.get(b"", b"testval"),
+				state.read().persistent_storage.get(b"testval"),
 				Some(vec![15_u8, 0, 0, 0])
 			);
 		})
@@ -148,7 +147,7 @@ mod tests {
 			assert_eq!(result, Ok(Ok(16_u32)));
 			assert_eq!(val.get::<u32>(), Some(Some(16_u32)));
 			assert_eq!(
-				state.read().persistent_storage.get(b"", b"testval"),
+				state.read().persistent_storage.get(b"testval"),
 				Some(vec![16_u8, 0, 0, 0])
 			);
 
diff --git a/primitives/runtime/src/offchain/storage_lock.rs b/primitives/runtime/src/offchain/storage_lock.rs
index 451753931ec9..0d9cf835c15e 100644
--- a/primitives/runtime/src/offchain/storage_lock.rs
+++ b/primitives/runtime/src/offchain/storage_lock.rs
@@ -452,7 +452,7 @@ pub trait BlockNumberProvider {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use sp_core::offchain::{testing, OffchainExt, OffchainStorage};
+	use sp_core::offchain::{testing, OffchainExt};
 	use sp_io::TestExternalities;
 
 	const VAL_1: u32 = 0u32;
@@ -485,7 +485,7 @@ mod tests {
 			}
 		});
 		// lock must have been cleared at this point
-		assert_eq!(state.read().persistent_storage.get(b"", b"lock_1"), None);
+		assert_eq!(state.read().persistent_storage.get(b"lock_1"), None);
 	}
 
 	#[test]
@@ -508,7 +508,7 @@ mod tests {
 			guard.forget();
 		});
 		// lock must have been cleared at this point
-		let opt = state.read().persistent_storage.get(b"", b"lock_2");
+		let opt = state.read().persistent_storage.get(b"lock_2");
 		assert!(opt.is_some());
 	}
 
@@ -540,7 +540,7 @@ mod tests {
 		});
 
 		// lock must have been cleared at this point
-		let opt = state.read().persistent_storage.get(b"", b"lock_3");
+		let opt = state.read().persistent_storage.get(b"lock_3");
 		assert!(opt.is_some());
 	}
 
@@ -587,7 +587,7 @@ mod tests {
 		});
 
 		// lock must have been cleared at this point
-		let opt = state.read().persistent_storage.get(b"", b"lock_4");
+		let opt = state.read().persistent_storage.get(b"lock_4");
 		assert_eq!(opt.unwrap(), vec![132_u8, 3u8, 0, 0, 0, 0, 0, 0]); // 132 + 256 * 3 = 900
 	}
 }

From 9d843c3e1b05c0ddfa2469277f5b522f7d57f612 Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Wed, 9 Dec 2020 21:09:38 +0100
Subject: [PATCH 0160/1194] frame/staking/README: Fix broken link (#7703)

---
 frame/staking/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frame/staking/README.md b/frame/staking/README.md
index 1f1ba3dffa81..a379d0a7ad5e 100644
--- a/frame/staking/README.md
+++ b/frame/staking/README.md
@@ -176,7 +176,7 @@ Validators and nominators are rewarded at the end of each era. The total reward
 calculated using the era duration and the staking rate (the total amount of tokens staked by
 nominators and validators, divided by the total token supply). It aims to incentivize toward a
 defined staking rate. The full specification can be found
-[here](https://research.web3.foundation/en/latest/polkadot/Token%20Economics.html#inflation-model).
+[here](https://research.web3.foundation/en/latest/polkadot/economics/1-token-economics.html#inflation-model).
 
 Total reward is split among validators and their nominators depending on the number of points
 they received during the era. Points are added to a validator using

From 6b600cdeb4043e512bc5f342eb02a5a17d26797a Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Wed, 9 Dec 2020 22:58:22 +0100
Subject: [PATCH 0161/1194] *: Update to libp2p v0.32.0 (#7696)

* *: Update to libp2p v0.32.0

* Cargo.lock: Update async-tls to 0.10.2

* client/network/request_response: Adjust to new request response events

* client/network/request_response.rs: Clean up silently failing responses

* client/network/discovery: Lazily instantiate mdns

* client/network/discovery: Exclude MdnsWrapper for target_os unknown

* client/network/discovery: Fix indentation

* client/network/request-response: Use LruCache to track pending resp time

* client/network/request_responses: Fix early connection closed error

* client/network/request-response: Replace debug_assert with debug

* client/network/request-response: Fix typo

* client/network/request-response: Don't emit event on send_response fail

* client/network/request-response: Revert waker.wake_by_ref()

* client/network/request-resp: Make duration in InboundRequest optional

* client/network/req-resp: Don't emit two events for busy builder

When a response builder is busy incoming requests are dropped.
Previously this was reported both via a `ResponseFailure::Busy` and a
`ReponseFailure::Network(InboundFailure::Omisssion)` event.

With this commit the former is removed, leaving only the latter in
place.
---
 Cargo.lock                              |  93 ++++++++-----
 bin/node/browser-testing/Cargo.toml     |   2 +-
 client/authority-discovery/Cargo.toml   |   2 +-
 client/cli/Cargo.toml                   |   2 +-
 client/network-gossip/Cargo.toml        |   2 +-
 client/network/Cargo.toml               |   6 +-
 client/network/src/behaviour.rs         |   4 +-
 client/network/src/discovery.rs         |  56 ++++++--
 client/network/src/request_responses.rs | 171 +++++++++++++++---------
 client/network/src/service.rs           |  10 +-
 client/network/test/Cargo.toml          |   2 +-
 client/peerset/Cargo.toml               |   2 +-
 client/telemetry/Cargo.toml             |   2 +-
 primitives/consensus/common/Cargo.toml  |   2 +-
 14 files changed, 225 insertions(+), 131 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6a92f8e35f05..ccecc302c2ee 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -244,9 +244,9 @@ dependencies = [
 
 [[package]]
 name = "async-io"
-version = "1.2.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40a0b2bb8ae20fede194e779150fe283f65a4a08461b496de546ec366b174ad9"
+checksum = "9315f8f07556761c3e48fec2e6b276004acf426e6dc068b2c2251854d65ee0fd"
 dependencies = [
  "concurrent-queue",
  "fastrand",
@@ -306,15 +306,15 @@ checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0"
 
 [[package]]
 name = "async-tls"
-version = "0.10.0"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d85a97c4a0ecce878efd3f945f119c78a646d8975340bca0398f9bb05c30cc52"
+checksum = "dd0d8b6fc362bebff7502479fb5e9aed00c8cc3abc5af755536e73a128f0cb88"
 dependencies = [
  "futures-core",
  "futures-io",
- "rustls",
+ "rustls 0.19.0",
  "webpki",
- "webpki-roots 0.20.0",
+ "webpki-roots",
 ]
 
 [[package]]
@@ -2364,7 +2364,7 @@ dependencies = [
  "futures-util",
  "hyper 0.13.9",
  "log",
- "rustls",
+ "rustls 0.18.1",
  "rustls-native-certs",
  "tokio 0.2.23",
  "tokio-rustls",
@@ -2414,6 +2414,22 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "if-watch"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16d7c5e361e6b05c882b4847dd98992534cebc6fcde7f4bc98225bcf10fd6d0d"
+dependencies = [
+ "async-io",
+ "futures 0.3.8",
+ "futures-lite",
+ "if-addrs",
+ "ipnet",
+ "libc",
+ "log",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "impl-codec"
 version = "0.4.2"
@@ -2780,9 +2796,9 @@ checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a"
 
 [[package]]
 name = "libc"
-version = "0.2.80"
+version = "0.2.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614"
+checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
 
 [[package]]
 name = "libloading"
@@ -2802,9 +2818,9 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
 
 [[package]]
 name = "libp2p"
-version = "0.31.2"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "724846a3194368fefcac7ebdab12e01b8ac382e3efe399ddbd28851ab34f396f"
+checksum = "fac71e0cd4ba56b06464c3669bdfe893dd6c14f05f7ed1ba0965b1bc5933ee71"
 dependencies = [
  "atomic",
  "bytes 0.5.6",
@@ -2993,24 +3009,23 @@ dependencies = [
 
 [[package]]
 name = "libp2p-mdns"
-version = "0.25.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4458ec36b5ab2662fb4d5c8bb9b6e1591da0ab6efe8881c7a7670ef033bc8937"
+checksum = "7b934ee03a361f317df7d75defa4177b285534c58f49d5e6e240278e13ef3f65"
 dependencies = [
- "async-std",
+ "async-io",
  "data-encoding",
  "dns-parser",
- "either",
  "futures 0.3.8",
+ "if-watch",
  "lazy_static",
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "net2",
  "rand 0.7.3",
  "smallvec 1.5.0",
+ "socket2",
  "void",
- "wasm-timer",
 ]
 
 [[package]]
@@ -3101,9 +3116,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-request-response"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e952dcc9d2d7e7e45ae8bfcff255723091bd43e3e9a7741a0af8a17fe55b3ed"
+checksum = "bd96c3580fe59a9379ac7906c2f61c7f5ad3b7515362af0e72153a7cc9a45550"
 dependencies = [
  "async-trait",
  "bytes 0.5.6",
@@ -3179,9 +3194,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-websocket"
-version = "0.26.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5736e2fccdcea6e728bbaf903bddc113be223313ce2c756ad9fe43b5a2b0f06"
+checksum = "046031ad8ade16f2f0547350e4b2cea36c78cb10426e9c0d9eab35fa9943b969"
 dependencies = [
  "async-tls",
  "either",
@@ -3189,12 +3204,12 @@ dependencies = [
  "libp2p-core",
  "log",
  "quicksink",
- "rustls",
+ "rustls 0.19.0",
  "rw-stream-sink",
  "soketto",
  "url 2.2.0",
  "webpki",
- "webpki-roots 0.21.0",
+ "webpki-roots",
 ]
 
 [[package]]
@@ -6258,6 +6273,19 @@ dependencies = [
  "webpki",
 ]
 
+[[package]]
+name = "rustls"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "064fd21ff87c6e87ed4506e68beb42459caa4a0e2eb144932e6776768556980b"
+dependencies = [
+ "base64 0.13.0",
+ "log",
+ "ring",
+ "sct",
+ "webpki",
+]
+
 [[package]]
 name = "rustls-native-certs"
 version = "0.4.0"
@@ -6265,7 +6293,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "629d439a7672da82dd955498445e496ee2096fe2117b9f796558a43fdb9e59b8"
 dependencies = [
  "openssl-probe",
- "rustls",
+ "rustls 0.18.1",
  "schannel",
  "security-framework",
 ]
@@ -7892,11 +7920,11 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fd8b795c389288baa5f355489c65e71fd48a02104600d15c4cfbc561e9e429d"
+checksum = "2c29947abdee2a218277abeca306f25789c938e500ea5a9d4b12a5a504466902"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "libc",
  "redox_syscall",
  "winapi 0.3.9",
@@ -9399,7 +9427,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a"
 dependencies = [
  "futures-core",
- "rustls",
+ "rustls 0.18.1",
  "tokio 0.2.23",
  "webpki",
 ]
@@ -10255,15 +10283,6 @@ dependencies = [
  "untrusted",
 ]
 
-[[package]]
-name = "webpki-roots"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f"
-dependencies = [
- "webpki",
-]
-
 [[package]]
 name = "webpki-roots"
 version = "0.21.0"
diff --git a/bin/node/browser-testing/Cargo.toml b/bin/node/browser-testing/Cargo.toml
index f1cad30aede1..53f83b8fcaa7 100644
--- a/bin/node/browser-testing/Cargo.toml
+++ b/bin/node/browser-testing/Cargo.toml
@@ -8,7 +8,7 @@ license = "Apache-2.0"
 
 [dependencies]
 futures-timer = "3.0.2"
-libp2p = { version = "0.31.1", default-features = false }
+libp2p = { version = "0.32.0", default-features = false }
 jsonrpc-core = "15.0.0"
 serde = "1.0.106"
 serde_json = "1.0.48"
diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml
index 4cd2dae1388a..90f8f229b4da 100644
--- a/client/authority-discovery/Cargo.toml
+++ b/client/authority-discovery/Cargo.toml
@@ -23,7 +23,7 @@ derive_more = "0.99.2"
 either = "1.5.3"
 futures = "0.3.4"
 futures-timer = "3.0.1"
-libp2p = { version = "0.31.2", default-features = false, features = ["kad"] }
+libp2p = { version = "0.32.0", default-features = false, features = ["kad"] }
 log = "0.4.8"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.8.0"}
 prost = "0.6.1"
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index f323f1940b18..ece015cc4bc3 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -19,7 +19,7 @@ regex = "1.4.2"
 tokio = { version = "0.2.21", features = [ "signal", "rt-core", "rt-threaded", "blocking" ] }
 futures = "0.3.4"
 fdlimit = "0.2.1"
-libp2p = "0.31.2"
+libp2p = "0.32.0"
 parity-scale-codec = "1.3.0"
 hex = "0.4.2"
 rand = "0.7.3"
diff --git a/client/network-gossip/Cargo.toml b/client/network-gossip/Cargo.toml
index bbbb83f20616..b1ae4aa31c93 100644
--- a/client/network-gossip/Cargo.toml
+++ b/client/network-gossip/Cargo.toml
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 futures = "0.3.4"
 futures-timer = "3.0.1"
-libp2p = { version = "0.31.2", default-features = false }
+libp2p = { version = "0.32.0", default-features = false }
 log = "0.4.8"
 lru = "0.6.1"
 sc-network = { version = "0.8.0", path = "../network" }
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index 0b8d3da928f5..6c40b08ed848 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -64,13 +64,13 @@ wasm-timer = "0.2"
 zeroize = "1.0.0"
 
 [dependencies.libp2p]
-version = "0.31.2"
+version = "0.32.0"
 default-features = false
-features = ["identify", "kad", "mdns-async-std", "mplex", "noise", "ping", "request-response", "tcp-async-std", "websocket", "yamux"]
+features = ["identify", "kad", "mdns", "mplex", "noise", "ping", "request-response", "tcp-async-std", "websocket", "yamux"]
 
 [dev-dependencies]
 assert_matches = "1.3"
-libp2p = { version = "0.31.2", default-features = false }
+libp2p = { version = "0.32.0", default-features = false }
 quickcheck = "0.9.0"
 rand = "0.7.2"
 sp-keyring = { version = "2.0.0", path = "../../primitives/keyring" }
diff --git a/client/network/src/behaviour.rs b/client/network/src/behaviour.rs
index b2914a5e0a72..8b9e321ca599 100644
--- a/client/network/src/behaviour.rs
+++ b/client/network/src/behaviour.rs
@@ -88,7 +88,7 @@ pub enum BehaviourOut<B: BlockT> {
 		protocol: Cow<'static, str>,
 		/// If `Ok`, contains the time elapsed between when we received the request and when we
 		/// sent back the response. If `Err`, the error that happened.
-		result: Result<Duration, ResponseFailure>,
+		result: Result<Option<Duration>, ResponseFailure>,
 	},
 
 	/// A request initiated using [`Behaviour::send_request`] has succeeded or failed.
@@ -417,7 +417,7 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviourEventProcess<block_requests::Event<B
 				self.events.push_back(BehaviourOut::InboundRequest {
 					peer,
 					protocol: self.block_requests.protocol_name().to_owned().into(),
-					result: Ok(total_handling_time),
+					result: Ok(Some(total_handling_time)),
 				});
 			},
 			block_requests::Event::Response { peer, response, request_duration } => {
diff --git a/client/network/src/discovery.rs b/client/network/src/discovery.rs
index e65d557a7bdb..b2517efb6607 100644
--- a/client/network/src/discovery.rs
+++ b/client/network/src/discovery.rs
@@ -59,8 +59,6 @@ use libp2p::kad::handler::KademliaHandlerProto;
 use libp2p::kad::QueryId;
 use libp2p::kad::record::{self, store::{MemoryStore, RecordStore}};
 #[cfg(not(target_os = "unknown"))]
-use libp2p::swarm::toggle::Toggle;
-#[cfg(not(target_os = "unknown"))]
 use libp2p::mdns::{Mdns, MdnsEvent};
 use libp2p::multiaddr::Protocol;
 use log::{debug, info, trace, warn};
@@ -206,15 +204,9 @@ impl DiscoveryConfig {
 			discovery_only_if_under_num,
 			#[cfg(not(target_os = "unknown"))]
 			mdns: if enable_mdns {
-				match Mdns::new() {
-					Ok(mdns) => Some(mdns).into(),
-					Err(err) => {
-						warn!(target: "sub-libp2p", "Failed to initialize mDNS: {:?}", err);
-						None.into()
-					}
-				}
+				MdnsWrapper::Instantiating(Mdns::new().boxed())
 			} else {
-				None.into()
+				MdnsWrapper::Disabled
 			},
 			allow_non_globals_in_dht,
 			known_external_addresses: LruHashSet::new(
@@ -234,7 +226,7 @@ pub struct DiscoveryBehaviour {
 	kademlias: HashMap<ProtocolId, Kademlia<MemoryStore>>,
 	/// Discovers nodes on the local network.
 	#[cfg(not(target_os = "unknown"))]
-	mdns: Toggle<Mdns>,
+	mdns: MdnsWrapper,
 	/// Stream that fires when we need to perform the next random Kademlia query.
 	next_kad_random_query: Delay,
 	/// After `next_kad_random_query` triggers, the next one triggers after this duration.
@@ -785,6 +777,48 @@ fn protocol_name_from_protocol_id(id: &ProtocolId) -> Vec<u8> {
 	v
 }
 
+/// [`Mdns::new`] returns a future. Instead of forcing [`DiscoveryConfig::finish`] and all its
+/// callers to be async, lazily instantiate [`Mdns`].
+#[cfg(not(target_os = "unknown"))]
+enum MdnsWrapper {
+	Instantiating(futures::future::BoxFuture<'static, std::io::Result<Mdns>>),
+	Ready(Mdns),
+	Disabled,
+}
+
+#[cfg(not(target_os = "unknown"))]
+impl MdnsWrapper {
+	fn addresses_of_peer(&mut self, peer_id: &PeerId) -> Vec<Multiaddr> {
+		match self {
+			MdnsWrapper::Instantiating(_) => Vec::new(),
+			MdnsWrapper::Ready(mdns) => mdns.addresses_of_peer(peer_id),
+			MdnsWrapper::Disabled => Vec::new(),
+		}
+	}
+
+	fn poll(
+		&mut self,
+		cx: &mut Context<'_>,
+		params: &mut impl PollParameters,
+	) -> Poll<NetworkBehaviourAction<void::Void, MdnsEvent>> {
+		loop {
+			match self {
+				MdnsWrapper::Instantiating(fut) => {
+					*self = match futures::ready!(fut.as_mut().poll(cx)) {
+						Ok(mdns) => MdnsWrapper::Ready(mdns),
+						Err(err) => {
+							warn!(target: "sub-libp2p", "Failed to initialize mDNS: {:?}", err);
+							MdnsWrapper::Disabled
+						},
+					}
+				}
+				MdnsWrapper::Ready(mdns) => return mdns.poll(cx, params),
+				MdnsWrapper::Disabled => return Poll::Pending,
+			}
+		}
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use crate::config::ProtocolId;
diff --git a/client/network/src/request_responses.rs b/client/network/src/request_responses.rs
index 69a2ffda1c89..a410ae0dff55 100644
--- a/client/network/src/request_responses.rs
+++ b/client/network/src/request_responses.rs
@@ -48,9 +48,10 @@ use libp2p::{
 		PollParameters, ProtocolsHandler,
 	},
 };
+use lru::LruCache;
 use std::{
 	borrow::Cow, collections::{hash_map::Entry, HashMap}, convert::TryFrom as _, io, iter,
-	pin::Pin, task::{Context, Poll}, time::Duration,
+	pin::Pin, task::{Context, Poll}, time::{Duration, Instant},
 };
 
 pub use libp2p::request_response::{InboundFailure, OutboundFailure, RequestId};
@@ -128,7 +129,10 @@ pub enum Event {
 		protocol: Cow<'static, str>,
 		/// If `Ok`, contains the time elapsed between when we received the request and when we
 		/// sent back the response. If `Err`, the error that happened.
-		result: Result<Duration, ResponseFailure>,
+		///
+		/// Note: Given that response time is tracked on a best-effort basis only, `Ok(time)` can be
+		/// `None`.
+		result: Result<Option<Duration>, ResponseFailure>,
 	},
 
 	/// A request initiated using [`RequestResponsesBehaviour::send_request`] has succeeded or
@@ -154,21 +158,19 @@ pub struct RequestResponsesBehaviour {
 	/// Whenever an incoming request arrives, a `Future` is added to this list and will yield the
 	/// response to send back to the remote.
 	pending_responses: stream::FuturesUnordered<
-		Pin<Box<dyn Future<Output = RequestProcessingOutcome> + Send>>
+		Pin<Box<dyn Future<Output = Option<RequestProcessingOutcome>> + Send>>
 	>,
+
+	/// Whenever an incoming request arrives, the arrival [`Instant`] is recorded here.
+	pending_responses_arrival_time: LruCache<RequestId, Instant>,
 }
 
 /// Generated by the response builder and waiting to be processed.
-enum RequestProcessingOutcome {
-	Response {
-		protocol: Cow<'static, str>,
-		inner_channel: ResponseChannel<Result<Vec<u8>, ()>>,
-		response: Vec<u8>,
-	},
-	Busy {
-		peer: PeerId,
-		protocol: Cow<'static, str>,
-	},
+struct RequestProcessingOutcome {
+	request_id: RequestId,
+	protocol: Cow<'static, str>,
+	inner_channel: ResponseChannel<Result<Vec<u8>, ()>>,
+	response: Vec<u8>,
 }
 
 impl RequestResponsesBehaviour {
@@ -201,7 +203,8 @@ impl RequestResponsesBehaviour {
 
 		Ok(Self {
 			protocols,
-			pending_responses: stream::FuturesUnordered::new(),
+			pending_responses: Default::default(),
+			pending_responses_arrival_time: LruCache::new(1_000),
 		})
 	}
 
@@ -347,22 +350,31 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 	> {
 		'poll_all: loop {
 			// Poll to see if any response is ready to be sent back.
-			while let Poll::Ready(Some(result)) = self.pending_responses.poll_next_unpin(cx) {
-				match result {
-					RequestProcessingOutcome::Response {
-						protocol, inner_channel, response
-					} => {
-						if let Some((protocol, _)) = self.protocols.get_mut(&*protocol) {
-							protocol.send_response(inner_channel, Ok(response));
-						}
-					}
-					RequestProcessingOutcome::Busy { peer, protocol } => {
-						let out = Event::InboundRequest {
-							peer,
-							protocol,
-							result: Err(ResponseFailure::Busy),
-						};
-						return Poll::Ready(NetworkBehaviourAction::GenerateEvent(out));
+			while let Poll::Ready(Some(outcome)) = self.pending_responses.poll_next_unpin(cx) {
+				let RequestProcessingOutcome {
+					request_id,
+					protocol: protocol_name,
+					inner_channel,
+					response
+				} = match outcome {
+					Some(outcome) => outcome,
+					// The response builder was too busy and thus the request was dropped. This is
+					// later on reported as a `InboundFailure::Omission`.
+					None => continue,
+				};
+
+				if let Some((protocol, _)) = self.protocols.get_mut(&*protocol_name) {
+					if let Err(_) = protocol.send_response(inner_channel, Ok(response)) {
+						// Note: In case this happened due to a timeout, the corresponding
+						// `RequestResponse` behaviour will emit an `InboundFailure::Timeout` event.
+						self.pending_responses_arrival_time.pop(&request_id);
+						log::debug!(
+							target: "sub-libp2p",
+							"Failed to send response for {:?} on protocol {:?} due to a \
+							 timeout or due to the connection to the peer being closed. \
+							 Dropping response",
+							request_id, protocol_name,
+						);
 					}
 				}
 			}
@@ -409,15 +421,21 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 						// Received a request from a remote.
 						RequestResponseEvent::Message {
 							peer,
-							message: RequestResponseMessage::Request { request, channel, .. },
+							message: RequestResponseMessage::Request { request_id, request, channel, .. },
 						} => {
+							self.pending_responses_arrival_time.put(
+								request_id.clone(),
+								Instant::now(),
+							);
+
 							let (tx, rx) = oneshot::channel();
 
 							// Submit the request to the "response builder" passed by the user at
 							// initialization.
 							if let Some(resp_builder) = resp_builder {
-								// If the response builder is too busy, silently drop `tx`.
-								// This will be reported as a `Busy` error.
+								// If the response builder is too busy, silently drop `tx`. This
+								// will be reported by the corresponding `RequestResponse` through
+								// an `InboundFailure::Omission` event.
 								let _ = resp_builder.try_send(IncomingRequest {
 									peer: peer.clone(),
 									payload: request,
@@ -428,13 +446,14 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 							let protocol = protocol.clone();
 							self.pending_responses.push(Box::pin(async move {
 								// The `tx` created above can be dropped if we are not capable of
-								// processing this request, which is reflected as a "Busy" error.
+								// processing this request, which is reflected as a
+								// `InboundFailure::Omission` event.
 								if let Ok(response) = rx.await {
-									RequestProcessingOutcome::Response {
-										protocol, inner_channel: channel, response
-									}
+									Some(RequestProcessingOutcome {
+										request_id, protocol, inner_channel: channel, response
+									})
 								} else {
-									RequestProcessingOutcome::Busy { peer, protocol }
+									None
 								}
 							}));
 
@@ -445,11 +464,10 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 
 						// Received a response from a remote to one of our requests.
 						RequestResponseEvent::Message {
-							message:
-								RequestResponseMessage::Response {
-									request_id,
-									response,
-								},
+							message: RequestResponseMessage::Response {
+								request_id,
+								response,
+							},
 							..
 						} => {
 							let out = Event::RequestFinished {
@@ -472,8 +490,10 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 							return Poll::Ready(NetworkBehaviourAction::GenerateEvent(out));
 						}
 
-						// Remote has tried to send a request but failed.
-						RequestResponseEvent::InboundFailure { peer, error, .. } => {
+						// An inbound request failed, either while reading the request or due to failing
+						// to send a response.
+						RequestResponseEvent::InboundFailure { request_id, peer, error, .. } => {
+							self.pending_responses_arrival_time.pop(&request_id);
 							let out = Event::InboundRequest {
 								peer,
 								protocol: protocol.clone(),
@@ -481,6 +501,24 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 							};
 							return Poll::Ready(NetworkBehaviourAction::GenerateEvent(out));
 						}
+						RequestResponseEvent::ResponseSent { request_id, peer } => {
+							let arrival_time = self.pending_responses_arrival_time.pop(&request_id)
+								.map(|t| t.elapsed());
+							if arrival_time.is_none() {
+								log::debug!(
+									"Expected to find arrival time for sent response. Is the LRU \
+									 cache size set too small?",
+								);
+							}
+
+							let out = Event::InboundRequest {
+								peer,
+								protocol: protocol.clone(),
+								result: Ok(arrival_time),
+							};
+							return Poll::Ready(NetworkBehaviourAction::GenerateEvent(out));
+
+						}
 					};
 				}
 			}
@@ -520,8 +558,6 @@ pub enum RequestFailure {
 /// Error when processing a request sent by a remote.
 #[derive(Debug, derive_more::Display, derive_more::Error)]
 pub enum ResponseFailure {
-	/// Internal response builder is too busy to process this request.
-	Busy,
 	/// Problem on the network.
 	#[display(fmt = "Problem on the network")]
 	Network(#[error(ignore)] InboundFailure),
@@ -655,7 +691,10 @@ impl RequestResponseCodec for GenericCodec {
 
 #[cfg(test)]
 mod tests {
-	use futures::{channel::mpsc, prelude::*};
+	use futures::channel::mpsc;
+	use futures::executor::LocalPool;
+	use futures::prelude::*;
+	use futures::task::Spawn;
 	use libp2p::identity::Keypair;
 	use libp2p::Multiaddr;
 	use libp2p::core::upgrade;
@@ -666,7 +705,8 @@ mod tests {
 
 	#[test]
 	fn basic_request_response_works() {
-		let protocol_name = "/test/req-rep/1";
+		let protocol_name = "/test/req-resp/1";
+		let mut pool = LocalPool::new();
 
 		// Build swarms whose behaviour is `RequestResponsesBehaviour`.
 		let mut swarms = (0..2)
@@ -694,12 +734,12 @@ mod tests {
 						inbound_queue: Some(tx),
 					})).unwrap();
 
-					async_std::task::spawn(async move {
+					pool.spawner().spawn_obj(async move {
 						while let Some(rq) = rx.next().await {
 							assert_eq!(rq.payload, b"this is a request");
 							let _ = rq.pending_response.send(b"this is a response".to_vec());
 						}
-					});
+					}.boxed().into()).unwrap();
 
 					b
 				};
@@ -719,26 +759,24 @@ mod tests {
 			Swarm::dial_addr(&mut swarms[0].0, dial_addr).unwrap();
 		}
 
-		// Running `swarm[0]` in the background until a `InboundRequest` event happens,
-		// which is a hint about the test having ended.
-		async_std::task::spawn({
+		// Running `swarm[0]` in the background.
+		pool.spawner().spawn_obj({
 			let (mut swarm, _) = swarms.remove(0);
 			async move {
 				loop {
 					match swarm.next_event().await {
 						SwarmEvent::Behaviour(super::Event::InboundRequest { result, .. }) => {
-							assert!(result.is_ok());
-							break
+							result.unwrap();
 						},
 						_ => {}
 					}
 				}
-			}
-		});
+			}.boxed().into()
+		}).unwrap();
 
 		// Remove and run the remaining swarm.
 		let (mut swarm, _) = swarms.remove(0);
-		async_std::task::block_on(async move {
+		pool.run_until(async move {
 			let mut sent_request_id = None;
 
 			loop {
@@ -769,7 +807,8 @@ mod tests {
 
 	#[test]
 	fn max_response_size_exceeded() {
-		let protocol_name = "/test/req-rep/1";
+		let protocol_name = "/test/req-resp/1";
+		let mut pool = LocalPool::new();
 
 		// Build swarms whose behaviour is `RequestResponsesBehaviour`.
 		let mut swarms = (0..2)
@@ -797,12 +836,12 @@ mod tests {
 						inbound_queue: Some(tx),
 					})).unwrap();
 
-					async_std::task::spawn(async move {
+					pool.spawner().spawn_obj(async move {
 						while let Some(rq) = rx.next().await {
 							assert_eq!(rq.payload, b"this is a request");
 							let _ = rq.pending_response.send(b"this response exceeds the limit".to_vec());
 						}
-					});
+					}.boxed().into()).unwrap();
 
 					b
 				};
@@ -824,7 +863,7 @@ mod tests {
 
 		// Running `swarm[0]` in the background until a `InboundRequest` event happens,
 		// which is a hint about the test having ended.
-		async_std::task::spawn({
+		pool.spawner().spawn_obj({
 			let (mut swarm, _) = swarms.remove(0);
 			async move {
 				loop {
@@ -836,12 +875,12 @@ mod tests {
 						_ => {}
 					}
 				}
-			}
-		});
+			}.boxed().into()
+		}).unwrap();
 
 		// Remove and run the remaining swarm.
 		let (mut swarm, _) = swarms.remove(0);
-		async_std::task::block_on(async move {
+		pool.run_until(async move {
 			let mut sent_request_id = None;
 
 			loop {
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index c59aeb412298..3a368088e539 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -1373,19 +1373,21 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::InboundRequest { protocol, result, .. })) => {
 					if let Some(metrics) = this.metrics.as_ref() {
 						match result {
-							Ok(serve_time) => {
+							Ok(Some(serve_time)) => {
 								metrics.requests_in_success_total
 									.with_label_values(&[&protocol])
 									.observe(serve_time.as_secs_f64());
 							}
+							// Response time tracking is happening on a best-effort basis. Ignore
+							// the event in case response time could not be provided.
+							Ok(None) => {},
 							Err(err) => {
 								let reason = match err {
-									ResponseFailure::Busy => "busy",
 									ResponseFailure::Network(InboundFailure::Timeout) => "timeout",
 									ResponseFailure::Network(InboundFailure::UnsupportedProtocols) =>
 										"unsupported",
-									ResponseFailure::Network(InboundFailure::ConnectionClosed) =>
-										"connection-closed",
+									ResponseFailure::Network(InboundFailure::ResponseOmission) =>
+										"busy-omitted",
 								};
 
 								metrics.requests_in_failure_total
diff --git a/client/network/test/Cargo.toml b/client/network/test/Cargo.toml
index 9640ca9ae8cc..fea6ead4f707 100644
--- a/client/network/test/Cargo.toml
+++ b/client/network/test/Cargo.toml
@@ -19,7 +19,7 @@ parking_lot = "0.10.0"
 futures = "0.3.4"
 futures-timer = "3.0.1"
 rand = "0.7.2"
-libp2p = { version = "0.31.2", default-features = false }
+libp2p = { version = "0.32.0", default-features = false }
 sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
 sc-consensus = { version = "0.8.0", path = "../../../client/consensus/common" }
 sc-client-api = { version = "2.0.0", path = "../../api" }
diff --git a/client/peerset/Cargo.toml b/client/peerset/Cargo.toml
index d3f782bb9451..1b74a8099b69 100644
--- a/client/peerset/Cargo.toml
+++ b/client/peerset/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 futures = "0.3.4"
-libp2p = { version = "0.31.2", default-features = false }
+libp2p = { version = "0.32.0", default-features = false }
 sp-utils = { version = "2.0.0", path = "../../primitives/utils"}
 log = "0.4.8"
 serde_json = "1.0.41"
diff --git a/client/telemetry/Cargo.toml b/client/telemetry/Cargo.toml
index 58f2a0662936..aa585fb8f4d8 100644
--- a/client/telemetry/Cargo.toml
+++ b/client/telemetry/Cargo.toml
@@ -19,7 +19,7 @@ parking_lot = "0.10.0"
 futures = "0.3.4"
 futures-timer = "3.0.1"
 wasm-timer = "0.2.5"
-libp2p = { version = "0.31.2", default-features = false, features = ["dns", "tcp-async-std", "wasm-ext", "websocket"] }
+libp2p = { version = "0.32.0", default-features = false, features = ["dns", "tcp-async-std", "wasm-ext", "websocket"] }
 log = "0.4.8"
 pin-project = "0.4.6"
 rand = "0.7.2"
diff --git a/primitives/consensus/common/Cargo.toml b/primitives/consensus/common/Cargo.toml
index 375e976ce5b7..cf9804f86f26 100644
--- a/primitives/consensus/common/Cargo.toml
+++ b/primitives/consensus/common/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 thiserror = "1.0.21"
-libp2p = { version = "0.31.2", default-features = false }
+libp2p = { version = "0.32.0", default-features = false }
 log = "0.4.8"
 sp-core = { path= "../../core", version = "2.0.0"}
 sp-inherents = { version = "2.0.0", path = "../../inherents" }

From 12823277857d73e8b9e520930783996c227099a6 Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Thu, 10 Dec 2020 10:22:40 +0100
Subject: [PATCH 0162/1194] *: Update to libp2p v0.32.2 (#7708)

Version v0.32.2 pins async-tls to the semver compliant v0.11.0 instead
of the yanked async-tls v0.10.2.
---
 Cargo.lock                             | 12 ++++++------
 bin/node/browser-testing/Cargo.toml    |  2 +-
 client/authority-discovery/Cargo.toml  |  2 +-
 client/cli/Cargo.toml                  |  2 +-
 client/network-gossip/Cargo.toml       |  2 +-
 client/network/Cargo.toml              |  4 ++--
 client/network/test/Cargo.toml         |  2 +-
 client/peerset/Cargo.toml              |  2 +-
 client/telemetry/Cargo.toml            |  2 +-
 primitives/consensus/common/Cargo.toml |  2 +-
 10 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ccecc302c2ee..1555957f80e3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -306,9 +306,9 @@ checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0"
 
 [[package]]
 name = "async-tls"
-version = "0.10.2"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd0d8b6fc362bebff7502479fb5e9aed00c8cc3abc5af755536e73a128f0cb88"
+checksum = "2f23d769dbf1838d5df5156e7b1ad404f4c463d1ac2c6aeb6cd943630f8a8400"
 dependencies = [
  "futures-core",
  "futures-io",
@@ -2818,9 +2818,9 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
 
 [[package]]
 name = "libp2p"
-version = "0.32.0"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fac71e0cd4ba56b06464c3669bdfe893dd6c14f05f7ed1ba0965b1bc5933ee71"
+checksum = "022cdac4ab124be12de581e591796d4dfb7d1f1eef94669d2c1eaa0e98dd2f0e"
 dependencies = [
  "atomic",
  "bytes 0.5.6",
@@ -3194,9 +3194,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-websocket"
-version = "0.26.1"
+version = "0.26.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "046031ad8ade16f2f0547350e4b2cea36c78cb10426e9c0d9eab35fa9943b969"
+checksum = "522a877ce42ededf1f5dd011dbc40ea116f1776818f09dacb3d7a206f3ad6305"
 dependencies = [
  "async-tls",
  "either",
diff --git a/bin/node/browser-testing/Cargo.toml b/bin/node/browser-testing/Cargo.toml
index 53f83b8fcaa7..f60dc55b6f7e 100644
--- a/bin/node/browser-testing/Cargo.toml
+++ b/bin/node/browser-testing/Cargo.toml
@@ -8,7 +8,7 @@ license = "Apache-2.0"
 
 [dependencies]
 futures-timer = "3.0.2"
-libp2p = { version = "0.32.0", default-features = false }
+libp2p = { version = "0.32.2", default-features = false }
 jsonrpc-core = "15.0.0"
 serde = "1.0.106"
 serde_json = "1.0.48"
diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml
index 90f8f229b4da..8878becd7e02 100644
--- a/client/authority-discovery/Cargo.toml
+++ b/client/authority-discovery/Cargo.toml
@@ -23,7 +23,7 @@ derive_more = "0.99.2"
 either = "1.5.3"
 futures = "0.3.4"
 futures-timer = "3.0.1"
-libp2p = { version = "0.32.0", default-features = false, features = ["kad"] }
+libp2p = { version = "0.32.2", default-features = false, features = ["kad"] }
 log = "0.4.8"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.8.0"}
 prost = "0.6.1"
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index ece015cc4bc3..02d14d0d1941 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -19,7 +19,7 @@ regex = "1.4.2"
 tokio = { version = "0.2.21", features = [ "signal", "rt-core", "rt-threaded", "blocking" ] }
 futures = "0.3.4"
 fdlimit = "0.2.1"
-libp2p = "0.32.0"
+libp2p = "0.32.2"
 parity-scale-codec = "1.3.0"
 hex = "0.4.2"
 rand = "0.7.3"
diff --git a/client/network-gossip/Cargo.toml b/client/network-gossip/Cargo.toml
index b1ae4aa31c93..5b82bd679c01 100644
--- a/client/network-gossip/Cargo.toml
+++ b/client/network-gossip/Cargo.toml
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 futures = "0.3.4"
 futures-timer = "3.0.1"
-libp2p = { version = "0.32.0", default-features = false }
+libp2p = { version = "0.32.2", default-features = false }
 log = "0.4.8"
 lru = "0.6.1"
 sc-network = { version = "0.8.0", path = "../network" }
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index 6c40b08ed848..1ad54366ce42 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -64,13 +64,13 @@ wasm-timer = "0.2"
 zeroize = "1.0.0"
 
 [dependencies.libp2p]
-version = "0.32.0"
+version = "0.32.2"
 default-features = false
 features = ["identify", "kad", "mdns", "mplex", "noise", "ping", "request-response", "tcp-async-std", "websocket", "yamux"]
 
 [dev-dependencies]
 assert_matches = "1.3"
-libp2p = { version = "0.32.0", default-features = false }
+libp2p = { version = "0.32.2", default-features = false }
 quickcheck = "0.9.0"
 rand = "0.7.2"
 sp-keyring = { version = "2.0.0", path = "../../primitives/keyring" }
diff --git a/client/network/test/Cargo.toml b/client/network/test/Cargo.toml
index fea6ead4f707..880e2c1f04ed 100644
--- a/client/network/test/Cargo.toml
+++ b/client/network/test/Cargo.toml
@@ -19,7 +19,7 @@ parking_lot = "0.10.0"
 futures = "0.3.4"
 futures-timer = "3.0.1"
 rand = "0.7.2"
-libp2p = { version = "0.32.0", default-features = false }
+libp2p = { version = "0.32.2", default-features = false }
 sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
 sc-consensus = { version = "0.8.0", path = "../../../client/consensus/common" }
 sc-client-api = { version = "2.0.0", path = "../../api" }
diff --git a/client/peerset/Cargo.toml b/client/peerset/Cargo.toml
index 1b74a8099b69..41e2033bccfc 100644
--- a/client/peerset/Cargo.toml
+++ b/client/peerset/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 futures = "0.3.4"
-libp2p = { version = "0.32.0", default-features = false }
+libp2p = { version = "0.32.2", default-features = false }
 sp-utils = { version = "2.0.0", path = "../../primitives/utils"}
 log = "0.4.8"
 serde_json = "1.0.41"
diff --git a/client/telemetry/Cargo.toml b/client/telemetry/Cargo.toml
index aa585fb8f4d8..98ed63886615 100644
--- a/client/telemetry/Cargo.toml
+++ b/client/telemetry/Cargo.toml
@@ -19,7 +19,7 @@ parking_lot = "0.10.0"
 futures = "0.3.4"
 futures-timer = "3.0.1"
 wasm-timer = "0.2.5"
-libp2p = { version = "0.32.0", default-features = false, features = ["dns", "tcp-async-std", "wasm-ext", "websocket"] }
+libp2p = { version = "0.32.2", default-features = false, features = ["dns", "tcp-async-std", "wasm-ext", "websocket"] }
 log = "0.4.8"
 pin-project = "0.4.6"
 rand = "0.7.2"
diff --git a/primitives/consensus/common/Cargo.toml b/primitives/consensus/common/Cargo.toml
index cf9804f86f26..dc1550ed2953 100644
--- a/primitives/consensus/common/Cargo.toml
+++ b/primitives/consensus/common/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 thiserror = "1.0.21"
-libp2p = { version = "0.32.0", default-features = false }
+libp2p = { version = "0.32.2", default-features = false }
 log = "0.4.8"
 sp-core = { path= "../../core", version = "2.0.0"}
 sp-inherents = { version = "2.0.0", path = "../../inherents" }

From b1ef77071f9b085777b4cef08a2348b762131003 Mon Sep 17 00:00:00 2001
From: Albrecht <14820950+weichweich@users.noreply.github.com>
Date: Thu, 10 Dec 2020 14:23:47 +0100
Subject: [PATCH 0163/1194] kilt&polimec ss58 prefix (#7547)

* kilt ss58 address

* polimec ss58 prefix
---
 primitives/core/src/crypto.rs |  4 ++++
 ss58-registry.json            | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index 6a07e3ce4028..f2101a671242 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -506,6 +506,10 @@ ss58_address_format!(
 		(36, "centrifuge", "Centrifuge Chain mainnet, standard account (*25519).")
 	NodleAccount =>
 		(37, "nodle", "Nodle Chain mainnet, standard account (*25519).")
+	KiltAccount =>
+		(38, "kilt", "KILT Chain mainnet, standard account (*25519).")
+	PolimecAccount =>
+		(41, "poli", "Polimec Chain mainnet, standard account (*25519).")
 	SubstrateAccount =>
 		(42, "substrate", "Any Substrate network, standard account (*25519).")
 	Reserved43 =>
diff --git a/ss58-registry.json b/ss58-registry.json
index 8c7110060ba5..5c90856505a6 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -298,6 +298,15 @@
 			"standardAccount": "*25519",
 			"website": "https://nodle.io/"
 		},
+		{
+			"prefix": 38,
+			"network": "kilt",
+			"displayName": "KILT Chain",
+			"symbols": ["KILT"],
+			"decimals": [18],
+			"standardAccount": "*25519",
+			"website": "https://kilt.io/"
+		},
 		{
 			"prefix": 39,
 			"network": "mathchain",
@@ -316,6 +325,15 @@
 			"standardAccount": "*25519",
 			"website": "https://mathwallet.org"
 		},
+		{
+			"prefix": 41,
+			"network": "poli",
+			"displayName": "Polimec Chain",
+			"symbols": null,
+			"decimals": null,
+			"standardAccount": "*25519",
+			"website": "https://polimec.io/"
+		},
 		{
 			"prefix": 42,
 			"network": "substrate",

From 2a7a985d34fea5db68f12e9c1fbde8142de27cdc Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Thu, 10 Dec 2020 14:38:56 +0100
Subject: [PATCH 0164/1194] Fix docs (#7710)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix docs

* Update frame/merkle-mountain-range/src/lib.rs

Co-authored-by: Alexander Theißen <alex.theissen@me.com>

Co-authored-by: Alexander Theißen <alex.theissen@me.com>
---
 bin/node/browser-testing/src/lib.rs             |  2 +-
 bin/node/runtime/src/lib.rs                     |  2 +-
 client/authority-discovery/src/service.rs       |  8 ++++----
 client/authority-discovery/src/worker.rs        |  6 +++---
 client/basic-authorship/src/basic_authorship.rs |  2 +-
 client/basic-authorship/src/lib.rs              |  2 +-
 client/cli/src/commands/run_cmd.rs              |  7 ++++---
 client/cli/src/commands/utils.rs                |  2 +-
 client/cli/src/config.rs                        |  2 +-
 client/finality-grandpa/src/lib.rs              |  2 +-
 client/network/src/gossip.rs                    |  2 +-
 client/service/src/client/mod.rs                | 11 ++++++-----
 client/telemetry/src/async_record.rs            |  2 +-
 frame/contracts/src/schedule.rs                 |  2 +-
 frame/example/src/lib.rs                        |  6 +++---
 frame/merkle-mountain-range/src/lib.rs          |  6 +++---
 frame/proxy/src/lib.rs                          |  2 +-
 frame/session/src/historical/onchain.rs         |  2 +-
 frame/staking/src/lib.rs                        |  4 ++--
 frame/staking/src/slashing.rs                   |  2 +-
 frame/support/src/traits.rs                     |  2 +-
 frame/transaction-payment/src/lib.rs            |  2 +-
 frame/treasury/src/lib.rs                       |  8 ++++----
 primitives/npos-elections/compact/src/lib.rs    |  4 ++--
 primitives/npos-elections/src/balancing.rs      |  2 +-
 primitives/npos-elections/src/lib.rs            |  8 ++++----
 primitives/npos-elections/src/phragmen.rs       |  3 +--
 primitives/npos-elections/src/reduce.rs         |  2 +-
 test-utils/runtime/src/lib.rs                   |  2 +-
 utils/prometheus/src/lib.rs                     |  2 +-
 30 files changed, 55 insertions(+), 54 deletions(-)

diff --git a/bin/node/browser-testing/src/lib.rs b/bin/node/browser-testing/src/lib.rs
index 777e5ea9f132..f4dc09085678 100644
--- a/bin/node/browser-testing/src/lib.rs
+++ b/bin/node/browser-testing/src/lib.rs
@@ -26,7 +26,7 @@
 //! ```
 //! For debug infomation, such as the informant, run without the `--headless`
 //! flag and open a browser to the url that `wasm-pack test` outputs.
-//! For more infomation see https://rustwasm.github.io/docs/wasm-pack/.
+//! For more infomation see <https://rustwasm.github.io/docs/wasm-pack/>.
 
 use wasm_bindgen_test::{wasm_bindgen_test, wasm_bindgen_test_configure};
 use wasm_bindgen_futures::JsFuture;
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 2962ef10661b..fb8f720898bb 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-//! The Substrate runtime. This can be compiled with ``#[no_std]`, ready for Wasm.
+//! The Substrate runtime. This can be compiled with `#[no_std]`, ready for Wasm.
 
 #![cfg_attr(not(feature = "std"), no_std)]
 // `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.
diff --git a/client/authority-discovery/src/service.rs b/client/authority-discovery/src/service.rs
index 7eabeb3daf52..d23d2f3a480f 100644
--- a/client/authority-discovery/src/service.rs
+++ b/client/authority-discovery/src/service.rs
@@ -22,14 +22,14 @@ use futures::SinkExt;
 use sc_network::{Multiaddr, PeerId};
 use sp_authority_discovery::AuthorityId;
 
-/// Service to interact with the [`Worker`].
+/// Service to interact with the [`crate::Worker`].
 #[derive(Clone)]
 pub struct Service {
 	to_worker: mpsc::Sender<ServicetoWorkerMsg>,
 }
 
-/// A [`Service`] allows to interact with a [`Worker`], e.g. by querying the
-/// [`Worker`]'s local address cache for a given [`AuthorityId`].
+/// A [`Service`] allows to interact with a [`crate::Worker`], e.g. by querying the
+/// [`crate::Worker`]'s local address cache for a given [`AuthorityId`].
 impl Service {
 	pub(crate) fn new(to_worker: mpsc::Sender<ServicetoWorkerMsg>) -> Self {
 		Self {
@@ -44,7 +44,7 @@ impl Service {
 	/// [`crate::Worker`] failed.
 	///
 	/// Note: [`Multiaddr`]s returned always include a [`PeerId`] via a
-	/// [`libp2p::core::multiaddr:Protocol::P2p`] component. Equality of
+	/// [`libp2p::core::multiaddr::Protocol::P2p`] component. Equality of
 	/// [`PeerId`]s across [`Multiaddr`]s returned by a single call is not
 	/// enforced today, given that there are still authorities out there
 	/// publishing the addresses of their sentry nodes on the DHT. In the future
diff --git a/client/authority-discovery/src/worker.rs b/client/authority-discovery/src/worker.rs
index 45b55f76673c..d886f24542d7 100644
--- a/client/authority-discovery/src/worker.rs
+++ b/client/authority-discovery/src/worker.rs
@@ -100,7 +100,7 @@ pub enum Role {
 ///
 ///    5. Allow querying of the collected addresses via the [`crate::Service`].
 pub struct Worker<Client, Network, Block, DhtEventStream> {
-	/// Channel receiver for messages send by a [`Service`].
+	/// Channel receiver for messages send by a [`crate::Service`].
 	from_service: Fuse<mpsc::Receiver<ServicetoWorkerMsg>>,
 
 	client: Arc<Client>,
@@ -615,8 +615,8 @@ where
 }
 
 /// NetworkProvider provides [`Worker`] with all necessary hooks into the
-/// underlying Substrate networking. Using this trait abstraction instead of [`NetworkService`]
-/// directly is necessary to unit test [`Worker`].
+/// underlying Substrate networking. Using this trait abstraction instead of
+/// [`sc_network::NetworkService`] directly is necessary to unit test [`Worker`].
 #[async_trait]
 pub trait NetworkProvider: NetworkStateInfo {
 	/// Modify a peerset priority group.
diff --git a/client/basic-authorship/src/basic_authorship.rs b/client/basic-authorship/src/basic_authorship.rs
index 8c022ef3a974..065acbde2cc9 100644
--- a/client/basic-authorship/src/basic_authorship.rs
+++ b/client/basic-authorship/src/basic_authorship.rs
@@ -44,7 +44,7 @@ use sc_proposer_metrics::MetricsLink as PrometheusMetrics;
 
 /// Default maximum block size in bytes used by [`Proposer`].
 ///
-/// Can be overwritten by [`ProposerFactory::set_maxium_block_size`].
+/// Can be overwritten by [`ProposerFactory::set_maximum_block_size`].
 ///
 /// Be aware that there is also an upper packet size on what the networking code
 /// will accept. If the block doesn't fit in such a package, it can not be
diff --git a/client/basic-authorship/src/lib.rs b/client/basic-authorship/src/lib.rs
index 9b0c49150823..2cb66d4ccc40 100644
--- a/client/basic-authorship/src/lib.rs
+++ b/client/basic-authorship/src/lib.rs
@@ -71,4 +71,4 @@
 
 mod basic_authorship;
 
-pub use crate::basic_authorship::{ProposerFactory, Proposer};
+pub use crate::basic_authorship::{ProposerFactory, Proposer, DEFAULT_MAX_BLOCK_SIZE};
diff --git a/client/cli/src/commands/run_cmd.rs b/client/cli/src/commands/run_cmd.rs
index 019b760e5b4a..48bad16afb67 100644
--- a/client/cli/src/commands/run_cmd.rs
+++ b/client/cli/src/commands/run_cmd.rs
@@ -75,7 +75,8 @@ pub struct RunCmd {
 	/// Listen to all RPC interfaces.
 	///
 	/// Default is local. Note: not all RPC methods are safe to be exposed publicly. Use an RPC proxy
-	/// server to filter out dangerous methods. More details: https://github.com/paritytech/substrate/wiki/Public-RPC.
+	/// server to filter out dangerous methods. More details:
+	/// <https://github.com/paritytech/substrate/wiki/Public-RPC>.
 	/// Use `--unsafe-rpc-external` to suppress the warning if you understand the risks.
 	#[structopt(long = "rpc-external")]
 	pub rpc_external: bool,
@@ -105,7 +106,7 @@ pub struct RunCmd {
 	/// Listen to all Websocket interfaces.
 	///
 	/// Default is local. Note: not all RPC methods are safe to be exposed publicly. Use an RPC proxy
-	/// server to filter out dangerous methods. More details: https://github.com/paritytech/substrate/wiki/Public-RPC.
+	/// server to filter out dangerous methods. More details: <https://github.com/paritytech/substrate/wiki/Public-RPC>.
 	/// Use `--unsafe-ws-external` to suppress the warning if you understand the risks.
 	#[structopt(long = "ws-external")]
 	pub ws_external: bool,
@@ -142,7 +143,7 @@ pub struct RunCmd {
 	///
 	/// A comma-separated list of origins (protocol://domain or special `null`
 	/// value). Value of `all` will disable origin validation. Default is to
-	/// allow localhost and https://polkadot.js.org origins. When running in
+	/// allow localhost and <https://polkadot.js.org> origins. When running in
 	/// --dev mode the default is to allow all origins.
 	#[structopt(long = "rpc-cors", value_name = "ORIGINS", parse(try_from_str = parse_cors))]
 	pub rpc_cors: Option<Cors>,
diff --git a/client/cli/src/commands/utils.rs b/client/cli/src/commands/utils.rs
index 6e48d04e1328..25c7294fd1e0 100644
--- a/client/cli/src/commands/utils.rs
+++ b/client/cli/src/commands/utils.rs
@@ -57,7 +57,7 @@ pub fn read_uri(uri: Option<&String>) -> error::Result<String> {
 /// 2. Try to construct the `Pair` while using `uri` as input for [`sp_core::Pair::from_string_with_seed`].
 ///
 /// 3. Try to construct the `Pair::Public` while using `uri` as input for
-///    [`sp_core::Pair::Public::from_string_with_version`].
+///    [`sp_core::crypto::Ss58Codec::from_string_with_version`].
 pub fn print_from_uri<Pair>(
 	uri: &str,
 	password: Option<SecretString>,
diff --git a/client/cli/src/config.rs b/client/cli/src/config.rs
index bf6b444c4d73..4e1ad19fc46f 100644
--- a/client/cli/src/config.rs
+++ b/client/cli/src/config.rs
@@ -47,7 +47,7 @@ const RECOMMENDED_OPEN_FILE_DESCRIPTOR_LIMIT: u64 = 10_000;
 
 /// Default configuration values used by Substrate
 ///
-/// These values will be used by [`CliConfiguritation`] to set
+/// These values will be used by [`CliConfiguration`] to set
 /// default values for e.g. the listen port or the RPC port.
 pub trait DefaultConfigurationValues {
 	/// The port Substrate should listen on for p2p connections.
diff --git a/client/finality-grandpa/src/lib.rs b/client/finality-grandpa/src/lib.rs
index ced101b8c856..0757a484afb4 100644
--- a/client/finality-grandpa/src/lib.rs
+++ b/client/finality-grandpa/src/lib.rs
@@ -329,7 +329,7 @@ impl<Block: BlockT, Client> BlockStatus<Block> for Arc<Client> where
 
 /// A trait that includes all the client functionalities grandpa requires.
 /// Ideally this would be a trait alias, we're not there yet.
-/// tracking issue https://github.com/rust-lang/rust/issues/41517
+/// tracking issue <https://github.com/rust-lang/rust/issues/41517>
 pub trait ClientForGrandpa<Block, BE>:
 	LockImportRun<Block, BE> + Finalizer<Block, BE> + AuxStore
 	+ HeaderMetadata<Block, Error = sp_blockchain::Error> + HeaderBackend<Block>
diff --git a/client/network/src/gossip.rs b/client/network/src/gossip.rs
index ac3f92e9d37a..8a46d0701e93 100644
--- a/client/network/src/gossip.rs
+++ b/client/network/src/gossip.rs
@@ -41,7 +41,7 @@
 //! In normal situations, messages sent through a [`QueuedSender`] will arrive in the same
 //! order as they have been sent.
 //! It is possible, in the situation of disconnects and reconnects, that messages arrive in a
-//! different order. See also https://github.com/paritytech/substrate/issues/6756.
+//! different order. See also <https://github.com/paritytech/substrate/issues/6756>.
 //! However, if multiple instances of [`QueuedSender`] exist for the same peer and protocol, or
 //! if some other code uses the [`NetworkService`] to send notifications to this combination or
 //! peer and protocol, then the notifications will be interleaved in an unpredictable way.
diff --git a/client/service/src/client/mod.rs b/client/service/src/client/mod.rs
index b3aa2fa076af..e4d1dc8bd850 100644
--- a/client/service/src/client/mod.rs
+++ b/client/service/src/client/mod.rs
@@ -23,22 +23,23 @@
 //!
 //! - A database containing the blocks and chain state, generally referred to as
 //! the [`Backend`](sc_client_api::backend::Backend).
-//! - A runtime environment, generally referred to as the [`Executor`](CallExecutor).
+//! - A runtime environment, generally referred to as the
+//! [`Executor`](sc_client_api::call_executor::CallExecutor).
 //!
 //! # Initialization
 //!
 //! Creating a [`Client`] is done by calling the `new` method and passing to it a
-//! [`Backend`](sc_client_api::backend::Backend) and an [`Executor`](CallExecutor).
+//! [`Backend`](sc_client_api::backend::Backend) and an
+//! [`Executor`](sc_client_api::call_executor::CallExecutor).
 //!
 //! The former is typically provided by the `sc-client-db` crate.
 //!
 //! The latter typically requires passing one of:
 //!
 //! - A [`LocalCallExecutor`] running the runtime locally.
-//! - A [`RemoteCallExecutor`](light::call_executor::RemoteCallRequest) that will ask a
+//! - A [`RemoteCallExecutor`](sc_client_api::light::RemoteCallRequest) that will ask a
 //! third-party to perform the executions.
-//! - A [`RemoteOrLocalCallExecutor`](light::call_executor::RemoteOrLocalCallExecutor), combination
-//! of the two.
+//! - A [`RemoteOrLocalCallExecutor`](sc_client_api::light::LocalOrRemote), combination of the two.
 //!
 //! Additionally, the fourth generic parameter of the `Client` is a marker type representing
 //! the ways in which the runtime can interface with the outside. Any code that builds a `Client`
diff --git a/client/telemetry/src/async_record.rs b/client/telemetry/src/async_record.rs
index 34b7c1435afa..06650a54defd 100644
--- a/client/telemetry/src/async_record.rs
+++ b/client/telemetry/src/async_record.rs
@@ -1,6 +1,6 @@
 //! # Internal types to ssync drain slog
 //! FIXME: REMOVE THIS ONCE THE PR WAS MERGE
-//! https://github.com/slog-rs/async/pull/14
+//! <https://github.com/slog-rs/async/pull/14>
 
 use slog::{Record, RecordStatic, Level, SingleKV, KV, BorrowedKV};
 use slog::{Serializer, OwnedKVList, Key};
diff --git a/frame/contracts/src/schedule.rs b/frame/contracts/src/schedule.rs
index b80aceb361fe..df1ea240630c 100644
--- a/frame/contracts/src/schedule.rs
+++ b/frame/contracts/src/schedule.rs
@@ -69,7 +69,7 @@ pub struct Limits {
 
 	/// Maximum allowed stack height in number of elements.
 	///
-	/// See https://wiki.parity.io/WebAssembly-StackHeight to find out
+	/// See <https://wiki.parity.io/WebAssembly-StackHeight> to find out
 	/// how the stack frame cost is calculated. Each element can be of one of the
 	/// wasm value types. This means the maximum size per element is 64bit.
 	pub stack_height: u32,
diff --git a/frame/example/src/lib.rs b/frame/example/src/lib.rs
index b3e883781f59..3ddb2fd4c1d3 100644
--- a/frame/example/src/lib.rs
+++ b/frame/example/src/lib.rs
@@ -131,7 +131,7 @@
 //! <!-- Original author of paragraph: ??? -->
 //!
 //! // Reference documentation of aspects such as `storageItems` and `dispatchable` functions should only be
-//! // included in the https://docs.rs Rustdocs for Substrate and not repeated in the README file.
+//! // included in the <https://docs.rs> Rustdocs for Substrate and not repeated in the README file.
 //!
 //! \### Dispatchable Functions
 //!
@@ -224,8 +224,8 @@
 //! // Show a usage example in an actual runtime
 //!
 //! // See:
-//! // - Substrate TCR https://github.com/parity-samples/substrate-tcr
-//! // - Substrate Kitties https://shawntabrizi.github.io/substrate-collectables-workshop/#/
+//! // - Substrate TCR <https://github.com/parity-samples/substrate-tcr>
+//! // - Substrate Kitties <https://shawntabrizi.github.io/substrate-collectables-workshop/#/>
 //!
 //! \## Genesis Config
 //!
diff --git a/frame/merkle-mountain-range/src/lib.rs b/frame/merkle-mountain-range/src/lib.rs
index afa6c9083c1b..81833a205386 100644
--- a/frame/merkle-mountain-range/src/lib.rs
+++ b/frame/merkle-mountain-range/src/lib.rs
@@ -20,7 +20,7 @@
 //! ## Overview
 //!
 //! Details on Merkle Mountain Ranges (MMRs) can be found here:
-//! https://github.com/mimblewimble/grin/blob/master/doc/mmr.md
+//! <https://github.com/mimblewimble/grin/blob/master/doc/mmr.md>
 //!
 //! The MMR pallet constructs a MMR from leaf data obtained on every block from
 //! `LeafDataProvider`. MMR nodes are stored both in:
@@ -41,7 +41,7 @@
 //! ## What for?
 //!
 //!	Primary use case for this pallet is to generate MMR root hashes, that can latter on be used by
-//!	BEEFY protocol (see https://github.com/paritytech/grandpa-bridge-gadget).
+//!	BEEFY protocol (see <https://github.com/paritytech/grandpa-bridge-gadget>).
 //!	MMR root hashes along with BEEFY will make it possible to build Super Light Clients (SLC) of
 //!	Substrate-based chains. The SLC will be able to follow finality and can be shown proofs of more
 //!	details that happened on the source chain.
@@ -88,7 +88,7 @@ pub trait Config<I = DefaultInstance>: frame_system::Config {
 	/// and some of the inner mmr nodes might be pruned from on-chain storage.
 	/// The later will contain all the entries in their full form.
 	///
-	/// Each node is stored in the Off-chain DB under key derived from the [INDEXING_PREFIX] and
+	/// Each node is stored in the Off-chain DB under key derived from the [`Self::INDEXING_PREFIX`] and
 	/// it's in-tree index (MMR position).
 	const INDEXING_PREFIX: &'static [u8];
 
diff --git a/frame/proxy/src/lib.rs b/frame/proxy/src/lib.rs
index 7a59cdc648a3..6342f0c052b8 100644
--- a/frame/proxy/src/lib.rs
+++ b/frame/proxy/src/lib.rs
@@ -706,7 +706,7 @@ impl<T: Config> Module<T> {
 pub mod migration {
 	use super::*;
 
-	/// Migration code for https://github.com/paritytech/substrate/pull/6770
+	/// Migration code for <https://github.com/paritytech/substrate/pull/6770>
 	///
 	/// Details: This migration was introduced between Substrate 2.0-RC6 and Substrate 2.0 releases.
 	/// Before this migration, the `Proxies` storage item used a tuple of `AccountId` and
diff --git a/frame/session/src/historical/onchain.rs b/frame/session/src/historical/onchain.rs
index f4576675c118..1ee7ce4419df 100644
--- a/frame/session/src/historical/onchain.rs
+++ b/frame/session/src/historical/onchain.rs
@@ -55,7 +55,7 @@ pub fn store_session_validator_set_to_offchain<T: HistoricalConfig + SessionConf
 
 /// Store the validator set associated to the _current_ session index to the off-chain database.
 ///
-/// See [`fn store_session_validator_set_...(..)`](Self::store_session_validator_set_to_offchain)
+/// See [`store_session_validator_set_to_offchain`]
 /// for further information and restrictions.
 pub fn store_current_session_validator_set_to_offchain<T: HistoricalConfig + SessionConfig>() {
 	store_session_validator_set_to_offchain::<T>(<SessionModule<T>>::current_index());
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 5f5f5ff2bb6e..3fda8306503f 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -2166,7 +2166,7 @@ impl<T: Config> Module<T> {
 		Self::bonded(stash).and_then(Self::ledger).map(|l| l.active).unwrap_or_default()
 	}
 
-	/// Internal impl of [`slashable_balance_of`] that returns [`VoteWeight`].
+	/// Internal impl of [`Self::slashable_balance_of`] that returns [`VoteWeight`].
 	pub fn slashable_balance_of_vote_weight(stash: &T::AccountId, issuance: BalanceOf<T>) -> VoteWeight {
 		T::CurrencyToVote::to_vote(Self::slashable_balance_of(stash), issuance)
 	}
@@ -2833,7 +2833,7 @@ impl<T: Config> Module<T> {
 	/// Execute election and return the new results. The edge weights are processed into support
 	/// values.
 	///
-	/// This is basically a wrapper around [`do_phragmen`] which translates
+	/// This is basically a wrapper around [`Self::do_phragmen`] which translates
 	/// `PrimitiveElectionResult` into `ElectionResult`.
 	///
 	/// No storage item is updated.
diff --git a/frame/staking/src/slashing.rs b/frame/staking/src/slashing.rs
index b1f0c9d9a442..e59f2e84e432 100644
--- a/frame/staking/src/slashing.rs
+++ b/frame/staking/src/slashing.rs
@@ -47,7 +47,7 @@
 //! has multiple misbehaviors. However, accounting for such cases is necessary
 //! to deter a class of "rage-quit" attacks.
 //!
-//! Based on research at https://research.web3.foundation/en/latest/polkadot/slashing/npos/
+//! Based on research at <https://research.web3.foundation/en/latest/polkadot/slashing/npos/>
 
 use super::{
 	EraIndex, Config, Module, Store, BalanceOf, Exposure, Perbill, SessionInterface,
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index 1bbcd87cc2e3..718f1d6354a3 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -1901,7 +1901,7 @@ impl PalletVersion {
 
 	/// Returns the storage key for a pallet version.
 	///
-	/// See [`PALLET_VERSION_STORAGE_KEY_POSTIFX`] on how this key is built.
+	/// See [`PALLET_VERSION_STORAGE_KEY_POSTFIX`] on how this key is built.
 	///
 	/// Returns `None` if the given `PI` returned a `None` as name for the given
 	/// `Pallet`.
diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
index 247755aa07c9..e530380dfbb4 100644
--- a/frame/transaction-payment/src/lib.rs
+++ b/frame/transaction-payment/src/lib.rs
@@ -109,7 +109,7 @@ type BalanceOf<T> =
 /// Meaning that fees can change by around ~23% per day, given extreme congestion.
 ///
 /// More info can be found at:
-/// https://w3f-research.readthedocs.io/en/latest/polkadot/Token%20Economics.html
+/// <https://w3f-research.readthedocs.io/en/latest/polkadot/Token%20Economics.html>
 pub struct TargetedFeeAdjustment<T, S, V, M>(sp_std::marker::PhantomData<(T, S, V, M)>);
 
 /// Something that can convert the current multiplier to the next one.
diff --git a/frame/treasury/src/lib.rs b/frame/treasury/src/lib.rs
index e180f64d1cbd..6ccd8f03a159 100644
--- a/frame/treasury/src/lib.rs
+++ b/frame/treasury/src/lib.rs
@@ -414,19 +414,19 @@ decl_event!(
 		TipClosed(Hash, AccountId, Balance),
 		/// A tip suggestion has been retracted. \[tip_hash\]
 		TipRetracted(Hash),
-		/// New bounty proposal. [index]
+		/// New bounty proposal. \[index\]
 		BountyProposed(BountyIndex),
 		/// A bounty proposal was rejected; funds were slashed. [index, bond]
 		BountyRejected(BountyIndex, Balance),
-		/// A bounty proposal is funded and became active. [index]
+		/// A bounty proposal is funded and became active. \[index\]
 		BountyBecameActive(BountyIndex),
 		/// A bounty is awarded to a beneficiary. [index, beneficiary]
 		BountyAwarded(BountyIndex, AccountId),
 		/// A bounty is claimed by beneficiary. [index, payout, beneficiary]
 		BountyClaimed(BountyIndex, Balance, AccountId),
-		/// A bounty is cancelled. [index]
+		/// A bounty is cancelled. \[index\]
 		BountyCanceled(BountyIndex),
-		/// A bounty expiry is extended. [index]
+		/// A bounty expiry is extended. \[index\]
 		BountyExtended(BountyIndex),
 	}
 );
diff --git a/primitives/npos-elections/compact/src/lib.rs b/primitives/npos-elections/compact/src/lib.rs
index b35c407c40cd..22997e4f616c 100644
--- a/primitives/npos-elections/compact/src/lib.rs
+++ b/primitives/npos-elections/compact/src/lib.rs
@@ -58,8 +58,8 @@ pub(crate) fn syn_err(message: &'static str) -> syn::Error {
 ///
 /// The given struct provides function to convert from/to Assignment:
 ///
-/// - [`from_assignment()`].
-/// - [`fn into_assignment()`].
+/// - `fn from_assignment<..>(..)`
+/// - `fn into_assignment<..>(..)`
 ///
 /// The generated struct is by default deriving both `Encode` and `Decode`. This is okay but could
 /// lead to many 0s in the solution. If prefixed with `#[compact]`, then a custom compact encoding
diff --git a/primitives/npos-elections/src/balancing.rs b/primitives/npos-elections/src/balancing.rs
index 04083cc9b0d4..517ac5c03f12 100644
--- a/primitives/npos-elections/src/balancing.rs
+++ b/primitives/npos-elections/src/balancing.rs
@@ -36,7 +36,7 @@ use sp_std::prelude::*;
 /// change has been made (`difference = 0`).
 ///
 /// In almost all cases, a balanced solution will have a better score than an unbalanced solution,
-/// yet this is not 100% guaranteed because the first element of a [`ElectionScore`] does not
+/// yet this is not 100% guaranteed because the first element of a [`crate::ElectionScore`] does not
 /// directly related to balancing.
 ///
 /// Note that some reference implementation adopt an approach in which voters are balanced randomly
diff --git a/primitives/npos-elections/src/lib.rs b/primitives/npos-elections/src/lib.rs
index d82839f02086..2c7d133529c9 100644
--- a/primitives/npos-elections/src/lib.rs
+++ b/primitives/npos-elections/src/lib.rs
@@ -18,10 +18,10 @@
 //! - [`seq_phragmen`]: Implements the Phragmén Sequential Method. An un-ranked, relatively fast
 //!   election method that ensures PJR, but does not provide a constant factor approximation of the
 //!   maximin problem.
-//! - [`phragmms`]: Implements a hybrid approach inspired by Phragmén which is executed faster but
+//! - [`phragmms()`]: Implements a hybrid approach inspired by Phragmén which is executed faster but
 //!   it can achieve a constant factor approximation of the maximin problem, similar to that of the
 //!   MMS algorithm.
-//! - [`balance_solution`]: Implements the star balancing algorithm. This iterative process can push
+//! - [`balance`]: Implements the star balancing algorithm. This iterative process can push
 //!   a solution toward being more `balances`, which in turn can increase its score.
 //!
 //! ### Terminology
@@ -70,7 +70,7 @@
 //! `StakedAssignment`.
 //!
 //!
-//! More information can be found at: https://arxiv.org/abs/2004.12990
+//! More information can be found at: <https://arxiv.org/abs/2004.12990>
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
@@ -283,7 +283,7 @@ impl<AccountId: IdentifierT> Voter<AccountId> {
 		})
 	}
 
-	/// Same as [`try_normalize`] but the normalization is only limited between elected edges.
+	/// Same as [`Self::try_normalize`] but the normalization is only limited between elected edges.
 	pub fn try_normalize_elected(&mut self) -> Result<(), &'static str> {
 		let elected_edge_weights = self
 			.edges
diff --git a/primitives/npos-elections/src/phragmen.rs b/primitives/npos-elections/src/phragmen.rs
index cfbeed1cdd3f..135f992aba78 100644
--- a/primitives/npos-elections/src/phragmen.rs
+++ b/primitives/npos-elections/src/phragmen.rs
@@ -108,9 +108,8 @@ pub fn seq_phragmen<AccountId: IdentifierT, P: PerThing>(
 /// `seq_phragmen` for more information. This function is left public in case a crate needs to use
 /// the implementation in a custom way.
 ///
-/// To create th inputs needed for this function, see [`crate::setup_inputs`].
-///
 /// This can only fail if the normalization fails.
+// To create the inputs needed for this function, see [`crate::setup_inputs`].
 pub fn seq_phragmen_core<AccountId: IdentifierT>(
 	rounds: usize,
 	candidates: Vec<CandidatePtr<AccountId>>,
diff --git a/primitives/npos-elections/src/reduce.rs b/primitives/npos-elections/src/reduce.rs
index 17d7dd1290f7..a96a2ed8457d 100644
--- a/primitives/npos-elections/src/reduce.rs
+++ b/primitives/npos-elections/src/reduce.rs
@@ -45,7 +45,7 @@
 //!
 //! ### Resources:
 //!
-//! 1. https://hackmd.io/JOn9x98iS0e0DPWQ87zGWg?view
+//! 1. <https://hackmd.io/JOn9x98iS0e0DPWQ87zGWg?view>
 
 use crate::node::{Node, NodeId, NodeRef, NodeRole};
 use crate::{ExtendedBalance, IdentifierT, StakedAssignment};
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index da20f196b453..ea29215a4f7e 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! The Substrate runtime. This can be compiled with #[no_std], ready for Wasm.
+//! The Substrate runtime. This can be compiled with `#[no_std]`, ready for Wasm.
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
diff --git a/utils/prometheus/src/lib.rs b/utils/prometheus/src/lib.rs
index be7050a8a073..097073239c41 100644
--- a/utils/prometheus/src/lib.rs
+++ b/utils/prometheus/src/lib.rs
@@ -33,7 +33,7 @@ use std::net::SocketAddr;
 mod networking;
 mod sourced;
 
-pub use sourced::{SourcedCounter, SourcedGauge, MetricSource};
+pub use sourced::{SourcedCounter, SourcedGauge, MetricSource, SourcedMetric};
 
 #[cfg(target_os = "unknown")]
 pub use unknown_os::init_prometheus;

From d663ca53fdb0d5228747a04f95a9bab31fe87ad0 Mon Sep 17 00:00:00 2001
From: Denis Pisarev <denis.pisarev@parity.io>
Date: Fri, 11 Dec 2020 10:02:59 +0100
Subject: [PATCH 0165/1194] Update md link checker (#7709)

* CI: ignore %20 for md link checker

* CI: update to a new action release that fixes %20 issue
---
 .github/allowed-actions.js          | 2 +-
 .github/workflows/md-link-check.yml | 2 +-
 .github/workflows/mlc_config.json   | 8 +-------
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/.github/allowed-actions.js b/.github/allowed-actions.js
index 4a8af91328ff..4fb894758060 100644
--- a/.github/allowed-actions.js
+++ b/.github/allowed-actions.js
@@ -3,5 +3,5 @@
 // not listed here, CI will fail.
 
 module.exports = [
-    'gaurav-nelson/github-action-markdown-link-check@e3c371c731b2f494f856dc5de7f61cea4d519907', // gaurav-nelson/github-action-markdown-link-check@v1.0.8
+    'gaurav-nelson/github-action-markdown-link-check@7481451f70251762f149d69596e3e276ebf2b236', // gaurav-nelson/github-action-markdown-link-check@v1.0.8
 ]
diff --git a/.github/workflows/md-link-check.yml b/.github/workflows/md-link-check.yml
index e15a506c567d..868569911d47 100644
--- a/.github/workflows/md-link-check.yml
+++ b/.github/workflows/md-link-check.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: gaurav-nelson/github-action-markdown-link-check@e3c371c731b2f494f856dc5de7f61cea4d519907
+    - uses: gaurav-nelson/github-action-markdown-link-check@7481451f70251762f149d69596e3e276ebf2b236
       with:
         use-quiet-mode: 'yes'
         config-file: '.github/workflows/mlc_config.json'
diff --git a/.github/workflows/mlc_config.json b/.github/workflows/mlc_config.json
index ffd0a0319fe6..e7e620b39e0a 100644
--- a/.github/workflows/mlc_config.json
+++ b/.github/workflows/mlc_config.json
@@ -1,13 +1,7 @@
 {
     "ignorePatterns": [
         {
-            "pattern": "^https://crates.io"
-        }
-    ],
-    "replacementPatterns": [
-        {
-          "pattern": "%20",
-          "replacement": " "
+            "pattern": "^https://crates.io",
         }
     ]
 }

From 8bf9557247606ddbf22363a03fe4b628a4fba9e3 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Fri, 11 Dec 2020 09:14:28 +0000
Subject: [PATCH 0166/1194] Fix PerThing::from_percent. (#7701)

* Fix overflow in per_things::from_percent.

* Fix test

* Fix the whole thing.. :|
---
 primitives/arithmetic/src/per_things.rs | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/primitives/arithmetic/src/per_things.rs b/primitives/arithmetic/src/per_things.rs
index 035a704ba300..59d98eea2b78 100644
--- a/primitives/arithmetic/src/per_things.rs
+++ b/primitives/arithmetic/src/per_things.rs
@@ -61,13 +61,11 @@ pub trait PerThing:
 	fn is_one(&self) -> bool { self.deconstruct() == Self::ACCURACY }
 
 	/// Build this type from a percent. Equivalent to `Self::from_parts(x * Self::ACCURACY / 100)`
-	/// but more accurate.
+	/// but more accurate and can cope with potential type overflows.
 	fn from_percent(x: Self::Inner) -> Self {
-		let a = x.min(100.into());
-		let b = Self::ACCURACY;
-		// if Self::ACCURACY % 100 > 0 then we need the correction for accuracy
-		let c = rational_mul_correction::<Self::Inner, Self>(b, a, 100.into(), Rounding::Nearest);
-		Self::from_parts(a / 100.into() * b + c)
+		let a: Self::Inner = x.min(100.into());
+		let b: Self::Inner = 100.into();
+		Self::from_rational_approximation(a, b)
 	}
 
 	/// Return the product of multiplication of this value by itself.
@@ -334,7 +332,7 @@ macro_rules! implement_per_thing {
 				&self.0
 			}
 			fn decode_from(x: Self::As) -> Self {
-				// Saturates if `x` is more than `$max` internally. 
+				// Saturates if `x` is more than `$max` internally.
 				Self::from_parts(x)
 			}
 		}
@@ -707,6 +705,7 @@ macro_rules! implement_per_thing {
 
 				assert_eq!($name::from_percent(0), $name::from_parts(Zero::zero()));
 				assert_eq!($name::from_percent(10), $name::from_parts($max / 10));
+				assert_eq!($name::from_percent(50), $name::from_parts($max / 2));
 				assert_eq!($name::from_percent(100), $name::from_parts($max));
 				assert_eq!($name::from_percent(200), $name::from_parts($max));
 
@@ -717,6 +716,15 @@ macro_rules! implement_per_thing {
 				assert_eq!($name::from_fraction(-1.0), $name::from_parts(Zero::zero()));
 			}
 
+			#[test]
+			fn percent_trait_impl_works() {
+				assert_eq!(<$name as PerThing>::from_percent(0), $name::from_parts(Zero::zero()));
+				assert_eq!(<$name as PerThing>::from_percent(10), $name::from_parts($max / 10));
+				assert_eq!(<$name as PerThing>::from_percent(50), $name::from_parts($max / 2));
+				assert_eq!(<$name as PerThing>::from_percent(100), $name::from_parts($max));
+				assert_eq!(<$name as PerThing>::from_percent(200), $name::from_parts($max));
+			}
+
 			macro_rules! u256ify {
 				($val:expr) => {
 					Into::<U256>::into($val)

From ea48d6b3e7accc8d1cf8733b1e2ee38a22d7a441 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Fri, 11 Dec 2020 01:20:10 -0800
Subject: [PATCH 0167/1194] Support Multiple Instances with Benchmarks (#7669)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Support multiple instances with benchmarks

* fix tests

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* docs

* fix output

* Update lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 Cargo.lock                                 |  1 +
 frame/benchmarking/src/lib.rs              | 29 ++++++++++++---
 frame/benchmarking/src/utils.rs            |  2 ++
 utils/frame/benchmarking-cli/Cargo.toml    |  3 +-
 utils/frame/benchmarking-cli/src/writer.rs | 42 +++++++++++++++-------
 5 files changed, 60 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1555957f80e3..dbb640806c69 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1568,6 +1568,7 @@ dependencies = [
 name = "frame-benchmarking-cli"
 version = "2.0.0"
 dependencies = [
+ "Inflector",
  "chrono",
  "frame-benchmarking",
  "handlebars",
diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
index 97b58ae19ec7..6296c000e289 100644
--- a/frame/benchmarking/src/lib.rs
+++ b/frame/benchmarking/src/lib.rs
@@ -1052,10 +1052,29 @@ macro_rules! impl_benchmark_test {
 /// ```
 ///
 /// At the end of `dispatch_benchmark`, you should return this batches object.
+///
+/// In the case where you have multiple instances of a pallet that you need to separately benchmark,
+/// the name of your module struct will be used as a suffix to your outputted weight file. For
+/// example:
+///
+/// ```ignore
+/// add_benchmark!(params, batches, pallet_balances, Balances); // pallet_balances.rs
+/// add_benchmark!(params, batches, pallet_collective, Council); // pallet_collective_council.rs
+/// add_benchmark!(params, batches, pallet_collective, TechnicalCommittee); // pallet_collective_technical_committee.rs
+/// ```
+///
+/// You can manipulate this suffixed string by using a type alias if needed. For example:
+///
+/// ```ignore
+/// type Council2 = TechnicalCommittee;
+/// add_benchmark!(params, batches, pallet_collective, Council2); // pallet_collective_council_2.rs
+/// ```
+
 #[macro_export]
 macro_rules! add_benchmark {
 	( $params:ident, $batches:ident, $name:ident, $( $location:tt )* ) => (
 		let name_string = stringify!($name).as_bytes();
+		let instance_string = stringify!( $( $location )* ).as_bytes();
 		let (config, whitelist) = $params;
 		let $crate::BenchmarkConfig {
 			pallet,
@@ -1071,6 +1090,9 @@ macro_rules! add_benchmark {
 			if &pallet[..] == &b"*"[..] || &benchmark[..] == &b"*"[..] {
 				for benchmark in $( $location )*::benchmarks(*extra).into_iter() {
 					$batches.push($crate::BenchmarkBatch {
+						pallet: name_string.to_vec(),
+						instance: instance_string.to_vec(),
+						benchmark: benchmark.to_vec(),
 						results: $( $location )*::run_benchmark(
 							benchmark,
 							&lowest_range_values[..],
@@ -1080,12 +1102,13 @@ macro_rules! add_benchmark {
 							whitelist,
 							*verify,
 						)?,
-						pallet: name_string.to_vec(),
-						benchmark: benchmark.to_vec(),
 					});
 				}
 			} else {
 				$batches.push($crate::BenchmarkBatch {
+					pallet: name_string.to_vec(),
+					instance: instance_string.to_vec(),
+					benchmark: benchmark.clone(),
 					results: $( $location )*::run_benchmark(
 						&benchmark[..],
 						&lowest_range_values[..],
@@ -1095,8 +1118,6 @@ macro_rules! add_benchmark {
 						whitelist,
 						*verify,
 					)?,
-					pallet: name_string.to_vec(),
-					benchmark: benchmark.clone(),
 				});
 			}
 		}
diff --git a/frame/benchmarking/src/utils.rs b/frame/benchmarking/src/utils.rs
index 042f4b707aef..2c2aee910e36 100644
--- a/frame/benchmarking/src/utils.rs
+++ b/frame/benchmarking/src/utils.rs
@@ -43,6 +43,8 @@ impl std::fmt::Display for BenchmarkParameter {
 pub struct BenchmarkBatch {
 	/// The pallet containing this benchmark.
 	pub pallet: Vec<u8>,
+	/// The instance of this pallet being benchmarked.
+	pub instance: Vec<u8>,
 	/// The extrinsic (or benchmark name) of this benchmark.
 	pub benchmark: Vec<u8>,
 	/// The results from this benchmark.
diff --git a/utils/frame/benchmarking-cli/Cargo.toml b/utils/frame/benchmarking-cli/Cargo.toml
index 4ee2454e708e..83f93799691d 100644
--- a/utils/frame/benchmarking-cli/Cargo.toml
+++ b/utils/frame/benchmarking-cli/Cargo.toml
@@ -23,11 +23,12 @@ sp-externalities = { version = "0.8.0", path = "../../../primitives/externalitie
 sp-keystore = { version = "0.8.0", path = "../../../primitives/keystore" }
 sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
 sp-state-machine = { version = "0.8.0", path = "../../../primitives/state-machine" }
-structopt = "0.3.8"
 codec = { version = "1.3.1", package = "parity-scale-codec" }
+structopt = "0.3.8"
 chrono = "0.4"
 serde = "1.0.116"
 handlebars = "3.5.0"
+Inflector = "0.11.4"
 
 [features]
 default = ["db"]
diff --git a/utils/frame/benchmarking-cli/src/writer.rs b/utils/frame/benchmarking-cli/src/writer.rs
index fd72e003b417..4afc81073067 100644
--- a/utils/frame/benchmarking-cli/src/writer.rs
+++ b/utils/frame/benchmarking-cli/src/writer.rs
@@ -22,6 +22,7 @@ use std::fs;
 use std::path::PathBuf;
 
 use serde::Serialize;
+use inflector::Inflector;
 
 use crate::BenchmarkCmd;
 use frame_benchmarking::{BenchmarkBatch, BenchmarkSelector, Analysis, RegressionModel};
@@ -37,6 +38,7 @@ struct TemplateData {
 	date: String,
 	version: String,
 	pallet: String,
+	instance: String,
 	header: String,
 	cmd: CmdData,
 	benchmarks: Vec<BenchmarkData>,
@@ -102,7 +104,7 @@ fn io_error(s: &str) -> std::io::Error {
 // p1 -> [b1, b2, b3]
 // p2 -> [b1, b2]
 // ```
-fn map_results(batches: &[BenchmarkBatch]) -> Result<HashMap<String, Vec<BenchmarkData>>, std::io::Error> {
+fn map_results(batches: &[BenchmarkBatch]) -> Result<HashMap<(String, String), Vec<BenchmarkData>>, std::io::Error> {
 	// Skip if batches is empty.
 	if batches.is_empty() { return Err(io_error("empty batches")) }
 
@@ -115,6 +117,7 @@ fn map_results(batches: &[BenchmarkBatch]) -> Result<HashMap<String, Vec<Benchma
 		if batch.results.is_empty() { continue }
 
 		let pallet_string = String::from_utf8(batch.pallet.clone()).unwrap();
+		let instance_string = String::from_utf8(batch.instance.clone()).unwrap();
 		let benchmark_data = get_benchmark_data(batch);
 		pallet_benchmarks.push(benchmark_data);
 
@@ -122,13 +125,14 @@ fn map_results(batches: &[BenchmarkBatch]) -> Result<HashMap<String, Vec<Benchma
 		if let Some(next) = batches_iter.peek() {
 			// Next pallet is different than current pallet, save and create new data.
 			let next_pallet = String::from_utf8(next.pallet.clone()).unwrap();
-			if next_pallet != pallet_string {
-				all_benchmarks.insert(pallet_string, pallet_benchmarks.clone());
+			let next_instance = String::from_utf8(next.instance.clone()).unwrap();
+			if next_pallet != pallet_string || next_instance != instance_string {
+				all_benchmarks.insert((pallet_string, instance_string), pallet_benchmarks.clone());
 				pallet_benchmarks = Vec::new();
 			}
 		} else {
 			// This is the end of the iterator, so push the final data.
-			all_benchmarks.insert(pallet_string, pallet_benchmarks.clone());
+			all_benchmarks.insert((pallet_string, instance_string), pallet_benchmarks.clone());
 		}
 	}
 	Ok(all_benchmarks)
@@ -272,12 +276,18 @@ pub fn write_results(
 
 	// Organize results by pallet into a JSON map
 	let all_results = map_results(batches)?;
-	for (pallet, results) in all_results.into_iter() {
+	for ((pallet, instance), results) in all_results.iter() {
 		let mut file_path = path.clone();
 		// If a user only specified a directory...
 		if file_path.is_dir() {
-			// Create new file: "path/to/pallet_name.rs".
-			file_path.push(&pallet);
+			// Check if there might be multiple instances benchmarked.
+			if all_results.keys().any(|(p, i)| p == pallet && i != instance) {
+				// Create new file: "path/to/pallet_name_instance_name.rs".
+				file_path.push(pallet.clone() + "_" + &instance.to_snake_case());
+			} else {
+				// Create new file: "path/to/pallet_name.rs".
+				file_path.push(pallet.clone());
+			}
 			file_path.set_extension("rs");
 		}
 
@@ -285,10 +295,11 @@ pub fn write_results(
 			args: args.clone(),
 			date: date.clone(),
 			version: VERSION.to_string(),
-			pallet: pallet,
+			pallet: pallet.to_string(),
+			instance: instance.to_string(),
 			header: header_text.clone(),
 			cmd: cmd_data.clone(),
-			benchmarks: results,
+			benchmarks: results.clone(),
 		};
 
 		let mut output_file = fs::File::create(file_path)?;
@@ -393,6 +404,7 @@ mod test {
 
 		return BenchmarkBatch {
 			pallet: [pallet.to_vec(), b"_pallet".to_vec()].concat(),
+			instance: b"instance".to_vec(),
 			benchmark: [benchmark.to_vec(), b"_benchmark".to_vec()].concat(),
 			results,
 		}
@@ -445,15 +457,21 @@ mod test {
 			test_data(b"second", b"first", BenchmarkParameter::c, 3, 4),
 		]).unwrap();
 
-		let first_benchmark = &mapped_results.get("first_pallet").unwrap()[0];
+		let first_benchmark = &mapped_results.get(
+			&("first_pallet".to_string(), "instance".to_string())
+		).unwrap()[0];
 		assert_eq!(first_benchmark.name, "first_benchmark");
 		check_data(first_benchmark, "a", 10, 3);
 
-		let second_benchmark = &mapped_results.get("first_pallet").unwrap()[1];
+		let second_benchmark = &mapped_results.get(
+			&("first_pallet".to_string(), "instance".to_string())
+		).unwrap()[1];
 		assert_eq!(second_benchmark.name, "second_benchmark");
 		check_data(second_benchmark, "b", 9, 2);
 
-		let second_pallet_benchmark = &mapped_results.get("second_pallet").unwrap()[0];
+		let second_pallet_benchmark = &mapped_results.get(
+			&("second_pallet".to_string(), "instance".to_string())
+		).unwrap()[0];
 		assert_eq!(second_pallet_benchmark.name, "first_benchmark");
 		check_data(second_pallet_benchmark, "c", 3, 4);
 	}

From 533bbbd2315d55906a6dac5726a722e094656d52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomusdrw@users.noreply.github.com>
Date: Fri, 11 Dec 2020 16:41:18 +0100
Subject: [PATCH 0168/1194] Add keccak-512 to host functions. (#7531)

---
 primitives/core/src/hashing.rs | 5 +++++
 primitives/io/src/lib.rs       | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/primitives/core/src/hashing.rs b/primitives/core/src/hashing.rs
index 98dc0c2efc59..6807da02feb0 100644
--- a/primitives/core/src/hashing.rs
+++ b/primitives/core/src/hashing.rs
@@ -16,6 +16,11 @@
 // limitations under the License.
 
 //! Hashing functions.
+//!
+//! This module is gated by `full-crypto` feature. If you intend to use any of the functions
+//! defined here within your runtime, you should most likely rather use [sp_io::hashing] instead,
+//! unless you know what you're doing. Using `sp_io` will be more performant, since instead of
+//! computing the hash in WASM it delegates that computation to the host client.
 
 use blake2_rfc;
 use sha2::{Digest, Sha256};
diff --git a/primitives/io/src/lib.rs b/primitives/io/src/lib.rs
index b6ae64e5f898..023bf7dcb308 100644
--- a/primitives/io/src/lib.rs
+++ b/primitives/io/src/lib.rs
@@ -735,6 +735,11 @@ pub trait Hashing {
 		sp_core::hashing::keccak_256(data)
 	}
 
+	/// Conduct a 512-bit Keccak hash.
+	fn keccak_512(data: &[u8]) -> [u8; 64] {
+		sp_core::hashing::keccak_512(data)
+	}
+
 	/// Conduct a 256-bit Sha2 hash.
 	fn sha2_256(data: &[u8]) -> [u8; 32] {
 		sp_core::hashing::sha2_256(data)

From 445fa2d43b166c90c2d8e681fa4ac9db5191f457 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Sat, 12 Dec 2020 20:08:44 +0000
Subject: [PATCH 0169/1194] Update debug.rs (#7721)

---
 frame/support/src/debug.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frame/support/src/debug.rs b/frame/support/src/debug.rs
index 04f5c529f0af..54a1e9c3a037 100644
--- a/frame/support/src/debug.rs
+++ b/frame/support/src/debug.rs
@@ -134,7 +134,7 @@ macro_rules! runtime_print {
 			use core::fmt::Write;
 			let mut w = $crate::sp_std::Writer::default();
 			let _ = core::write!(&mut w, $($arg)+);
-			sp_io::misc::print_utf8(&w.inner())
+			$crate::sp_io::misc::print_utf8(&w.inner())
 		}
 	}
 }

From 557a9b84e40b217a0295dc729674adcdfbd5c9d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomusdrw@users.noreply.github.com>
Date: Mon, 14 Dec 2020 13:34:41 +0100
Subject: [PATCH 0170/1194] Avoid too high values. (#7716)

---
 frame/system/benchmarking/src/lib.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frame/system/benchmarking/src/lib.rs b/frame/system/benchmarking/src/lib.rs
index ae898a6ecaa8..080b1cd80f29 100644
--- a/frame/system/benchmarking/src/lib.rs
+++ b/frame/system/benchmarking/src/lib.rs
@@ -28,6 +28,7 @@ use frame_benchmarking::{benchmarks, whitelisted_caller};
 use frame_support::{
 	storage::{self, StorageMap},
 	traits::Get,
+	weights::DispatchClass,
 };
 use frame_system::{Module as System, Call, RawOrigin, DigestItemOf, AccountInfo};
 
@@ -40,7 +41,7 @@ benchmarks! {
 	_ { }
 
 	remark {
-		let b in 0 .. T::BlockWeights::get().max_block as u32;
+		let b in 0 .. *T::BlockLength::get().max.get(DispatchClass::Normal) as u32;
 		let remark_message = vec![1; b as usize];
 		let caller = whitelisted_caller();
 	}: _(RawOrigin::Signed(caller), remark_message)

From 956ccbc472e27a3db9cbc5e6961ed2c84774abc4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Dec 2020 16:22:49 +0100
Subject: [PATCH 0171/1194] Bump hyper from 0.12.35 to 0.13.9 (#7569)

* Bump hyper from 0.12.35 to 0.13.9

Bumps [hyper](https://github.com/hyperium/hyper) from 0.12.35 to 0.13.9.
- [Release notes](https://github.com/hyperium/hyper/releases)
- [Changelog](https://github.com/hyperium/hyper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/hyperium/hyper/compare/v0.12.35...v0.13.9)

Signed-off-by: dependabot[bot] <support@github.com>

* Update bin/node/rpc-client/Cargo.toml

* Update Cargo.lock

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
---
 bin/node/rpc-client/Cargo.toml | 2 +-
 client/offchain/Cargo.toml     | 2 +-
 utils/prometheus/Cargo.toml    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/node/rpc-client/Cargo.toml b/bin/node/rpc-client/Cargo.toml
index 26d9de133c68..e88a18032698 100644
--- a/bin/node/rpc-client/Cargo.toml
+++ b/bin/node/rpc-client/Cargo.toml
@@ -12,7 +12,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 futures = "0.1.29"
-hyper = "0.12.35"
+hyper = "~0.12.35"
 jsonrpc-core-client = { version = "15.1.0", default-features = false, features = ["http"] }
 log = "0.4.8"
 node-primitives = { version = "2.0.0", path = "../primitives" }
diff --git a/client/offchain/Cargo.toml b/client/offchain/Cargo.toml
index 5686d33da9b2..1a31d278eb53 100644
--- a/client/offchain/Cargo.toml
+++ b/client/offchain/Cargo.toml
@@ -33,7 +33,7 @@ sc-network = { version = "0.8.0", path = "../network" }
 sc-keystore = { version = "2.0.0", path = "../keystore" }
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
-hyper = "0.13.2"
+hyper = "0.13.9"
 hyper-rustls = "0.21.0"
 
 [dev-dependencies]
diff --git a/utils/prometheus/Cargo.toml b/utils/prometheus/Cargo.toml
index 9eed7a2fdcfc..335f84bf0f26 100644
--- a/utils/prometheus/Cargo.toml
+++ b/utils/prometheus/Cargo.toml
@@ -20,5 +20,5 @@ derive_more = "0.99"
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
 async-std = { version = "1.6.5", features = ["unstable"] }
-hyper = { version = "0.13.1", default-features = false, features = ["stream"] }
+hyper = { version = "0.13.9", default-features = false, features = ["stream"] }
 tokio = "0.2"

From 1f49b2a65042ea990a78d05aa1988ba0299f58fe Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Mon, 14 Dec 2020 15:45:49 +0000
Subject: [PATCH 0172/1194] Prevent dust in staking by disallowing cheap
 bond_extra (#7718)

* prevent bond_extra to cause staking actve lower than ed

* prevent bond_extra to cause staking actve lower than ed

* Check in post conditions.

* check rebond as well.

* also change withdraw_unbonded.

* Fix build

* change check format.

* Apply suggestions from code review

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 frame/staking/src/lib.rs   |  9 ++++-
 frame/staking/src/mock.rs  | 12 +++++-
 frame/staking/src/tests.rs | 82 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 100 insertions(+), 3 deletions(-)

diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 3fda8306503f..af326e27c62a 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -1474,11 +1474,13 @@ decl_module! {
 			let mut ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
 
 			let stash_balance = T::Currency::free_balance(&stash);
-
 			if let Some(extra) = stash_balance.checked_sub(&ledger.total) {
 				let extra = extra.min(max_additional);
 				ledger.total += extra;
 				ledger.active += extra;
+				// last check: the new active amount of ledger must be more than ED.
+				ensure!(ledger.active >= T::Currency::minimum_balance(), Error::<T>::InsufficientValue);
+
 				Self::deposit_event(RawEvent::Bonded(stash, extra));
 				Self::update_ledger(&controller, &ledger);
 			}
@@ -1586,7 +1588,7 @@ decl_module! {
 				ledger = ledger.consolidate_unlocked(current_era)
 			}
 
-			let post_info_weight = if ledger.unlocking.is_empty() && ledger.active.is_zero() {
+			let post_info_weight = if ledger.unlocking.is_empty() && ledger.active <= T::Currency::minimum_balance() {
 				// This account must have called `unbond()` with some value that caused the active
 				// portion to fall below existential deposit + will have no more unlocking chunks
 				// left. We can now safely remove all staking-related information.
@@ -1973,6 +1975,9 @@ decl_module! {
 			ensure!(!ledger.unlocking.is_empty(), Error::<T>::NoUnlockChunk);
 
 			let ledger = ledger.rebond(value);
+			// last check: the new active amount of ledger must be more than ED.
+			ensure!(ledger.active >= T::Currency::minimum_balance(), Error::<T>::InsufficientValue);
+
 			Self::update_ledger(&controller, &ledger);
 			Ok(Some(
 				35 * WEIGHT_PER_MICROS
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index 5deae116e5c2..76689503f65a 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -579,8 +579,18 @@ fn assert_is_stash(acc: AccountId) {
 fn assert_ledger_consistent(ctrl: AccountId) {
 	// ensures ledger.total == ledger.active + sum(ledger.unlocking).
 	let ledger = Staking::ledger(ctrl).expect("Not a controller.");
-	let real_total: Balance = ledger.unlocking.iter().fold(ledger.active, |a, c| a + c.value);
+	let real_total: Balance = ledger
+		.unlocking
+		.iter()
+		.fold(ledger.active, |a, c| a + c.value);
 	assert_eq!(real_total, ledger.total);
+	assert!(
+		ledger.active >= Balances::minimum_balance() || ledger.active == 0,
+		"{}: active ledger amount ({}) must be greater than ED {}",
+		ctrl,
+		ledger.active,
+		Balances::minimum_balance()
+	);
 }
 
 pub(crate) fn bond_validator(stash: AccountId, ctrl: AccountId, val: Balance) {
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index c50964a33bb1..79edc012cd3f 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -4696,3 +4696,85 @@ fn payout_to_any_account_works() {
 		assert!(Balances::free_balance(42) > 0);
 	})
 }
+
+#[test]
+fn cannot_bond_extra_to_lower_than_ed() {
+	ExtBuilder::default()
+		.existential_deposit(10)
+		.build_and_execute(|| {
+			// stash must have more balance than bonded for this to work.
+			assert_eq!(Balances::free_balance(&21), 512_000);
+
+			// initial stuff.
+			assert_eq!(
+				Staking::ledger(&20).unwrap(),
+				StakingLedger {
+					stash: 21,
+					total: 1000,
+					active: 1000,
+					unlocking: vec![],
+					claimed_rewards: vec![]
+				}
+			);
+
+			// unbond all of it.
+			assert_ok!(Staking::unbond(Origin::signed(20), 1000));
+			assert_eq!(
+				Staking::ledger(&20).unwrap(),
+				StakingLedger {
+					stash: 21,
+					total: 1000,
+					active: 0,
+					unlocking: vec![UnlockChunk { value: 1000, era: 3 }],
+					claimed_rewards: vec![]
+				}
+			);
+
+			// now bond a wee bit more
+			assert_noop!(
+				Staking::bond_extra(Origin::signed(21), 5),
+				Error::<Test>::InsufficientValue,
+			);
+		})
+}
+
+#[test]
+fn cannot_rebond_to_lower_than_ed() {
+	ExtBuilder::default()
+		.existential_deposit(10)
+		.build_and_execute(|| {
+			// stash must have more balance than bonded for this to work.
+			assert_eq!(Balances::free_balance(&21), 512_000);
+
+			// initial stuff.
+			assert_eq!(
+				Staking::ledger(&20).unwrap(),
+				StakingLedger {
+					stash: 21,
+					total: 1000,
+					active: 1000,
+					unlocking: vec![],
+					claimed_rewards: vec![]
+				}
+			);
+
+			// unbond all of it.
+			assert_ok!(Staking::unbond(Origin::signed(20), 1000));
+			assert_eq!(
+				Staking::ledger(&20).unwrap(),
+				StakingLedger {
+					stash: 21,
+					total: 1000,
+					active: 0,
+					unlocking: vec![UnlockChunk { value: 1000, era: 3 }],
+					claimed_rewards: vec![]
+				}
+			);
+
+			// now bond a wee bit more
+			assert_noop!(
+				Staking::rebond(Origin::signed(20), 5),
+				Error::<Test>::InsufficientValue,
+			);
+		})
+}

From d4d6844271667b4c7538d87dec7a6603df93f1d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Mon, 14 Dec 2020 18:47:08 +0100
Subject: [PATCH 0173/1194] Default block announce validation should reject
 additional data (#7726)

If we are using the default block announce validator and receive
additional data alongside the block announcement, we should disconnect
this peer.
---
 client/network/src/protocol.rs                |  6 ++++-
 client/network/src/protocol/sync.rs           | 12 ++++++----
 .../consensus/common/src/block_validation.rs  | 23 ++++++++++++++++---
 3 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index 52fbacd1be05..41326b6d82a0 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -1148,7 +1148,11 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 				self.update_peer_info(&who);
 				(header, is_best, who)
 			}
-			sync::PollBlockAnnounceValidation::Failure { who } => {
+			sync::PollBlockAnnounceValidation::Failure { who, disconnect } => {
+				if disconnect {
+					self.disconnect_peer(&who);
+				}
+
 				self.report_peer(who, rep::BAD_BLOCK_ANNOUNCEMENT);
 				return CustomMessageOutcome::None
 			}
diff --git a/client/network/src/protocol/sync.rs b/client/network/src/protocol/sync.rs
index 380cec244ccb..b7ae6371d939 100644
--- a/client/network/src/protocol/sync.rs
+++ b/client/network/src/protocol/sync.rs
@@ -324,6 +324,8 @@ pub enum PollBlockAnnounceValidation<H> {
 	Failure {
 		/// Who sent the processed block announcement?
 		who: PeerId,
+		/// Should the peer be disconnected?
+		disconnect: bool,
 	},
 	/// The announcement does not require further handling.
 	Nothing {
@@ -354,6 +356,8 @@ enum PreValidateBlockAnnounce<H> {
 	Failure {
 		/// Who sent the processed block announcement?
 		who: PeerId,
+		/// Should the peer be disconnected?
+		disconnect: bool,
 	},
 	/// The announcement does not require further handling.
 	Nothing {
@@ -1215,14 +1219,14 @@ impl<B: BlockT> ChainSync<B> {
 					announce,
 					who,
 				},
-				Ok(Validation::Failure) => {
+				Ok(Validation::Failure { disconnect }) => {
 					debug!(
 						target: "sync",
 						"Block announcement validation of block {} from {} failed",
 						hash,
 						who,
 					);
-					PreValidateBlockAnnounce::Failure { who }
+					PreValidateBlockAnnounce::Failure { who, disconnect }
 				}
 				Err(e) => {
 					error!(target: "sync", "💔 Block announcement validation errored: {}", e);
@@ -1280,9 +1284,9 @@ impl<B: BlockT> ChainSync<B> {
 				self.peer_block_announce_validation_finished(&who);
 				return PollBlockAnnounceValidation::Nothing { is_best, who, header: announce.header }
 			},
-			PreValidateBlockAnnounce::Failure { who } => {
+			PreValidateBlockAnnounce::Failure { who, disconnect } => {
 				self.peer_block_announce_validation_finished(&who);
-				return PollBlockAnnounceValidation::Failure { who }
+				return PollBlockAnnounceValidation::Failure { who, disconnect }
 			},
 			PreValidateBlockAnnounce::Process { announce, is_new_best, who } => {
 				self.peer_block_announce_validation_finished(&who);
diff --git a/primitives/consensus/common/src/block_validation.rs b/primitives/consensus/common/src/block_validation.rs
index f8255130e641..b92614415957 100644
--- a/primitives/consensus/common/src/block_validation.rs
+++ b/primitives/consensus/common/src/block_validation.rs
@@ -42,7 +42,12 @@ pub enum Validation {
 		is_new_best: bool,
 	},
 	/// Invalid block announcement.
-	Failure,
+	Failure {
+		/// Should we disconnect from this peer?
+		///
+		/// This should be used if the peer for example send junk to spam us.
+		disconnect: bool,
+	},
 }
 
 /// Type which checks incoming block announcements.
@@ -68,8 +73,20 @@ impl<B: Block> BlockAnnounceValidator<B> for DefaultBlockAnnounceValidator {
 	fn validate(
 		&mut self,
 		_: &B::Header,
-		_: &[u8],
+		data: &[u8],
 	) -> Pin<Box<dyn Future<Output = Result<Validation, Box<dyn Error + Send>>> + Send>> {
-		async { Ok(Validation::Success { is_new_best: false }) }.boxed()
+		let is_empty = data.is_empty();
+
+		async move {
+			if !is_empty {
+				log::debug!(
+					target: "sync",
+					"Received unknown data alongside the block announcement.",
+				);
+				Ok(Validation::Failure { disconnect: true })
+			} else {
+				Ok(Validation::Success { is_new_best: false })
+			}
+		}.boxed()
 	}
 }

From c88b104028b4fdda35311adb12eabf7aa5aa4316 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Mon, 14 Dec 2020 19:37:19 +0100
Subject: [PATCH 0174/1194] Fix wrong order of values in log line (#7728)

---
 client/network/src/protocol/sync.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/network/src/protocol/sync.rs b/client/network/src/protocol/sync.rs
index b7ae6371d939..1ff8d37afeca 100644
--- a/client/network/src/protocol/sync.rs
+++ b/client/network/src/protocol/sync.rs
@@ -1541,7 +1541,7 @@ fn peer_block_request<B: BlockT>(
 		trace!(
 			target: "sync",
 			"Requesting pre-finalized chain from {:?}, common={}, finalized={}, peer best={}, our best={}",
-			id, finalized, peer.common_number, peer.best_number, best_num,
+			id, peer.common_number, finalized, peer.best_number, best_num,
 		);
 	}
 	if let Some(range) = blocks.needed_blocks(

From dac7ff1544bc5a04ccc5572c48cd7ed2312a8f99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 15 Dec 2020 10:28:40 +0100
Subject: [PATCH 0175/1194] Fix polkadot companion test (#7732)

---
 .maintain/gitlab/check_polkadot_companion_build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.maintain/gitlab/check_polkadot_companion_build.sh b/.maintain/gitlab/check_polkadot_companion_build.sh
index 16fb2d356720..4a7e9869abf5 100755
--- a/.maintain/gitlab/check_polkadot_companion_build.sh
+++ b/.maintain/gitlab/check_polkadot_companion_build.sh
@@ -45,6 +45,7 @@ cargo install -f --version 0.2.0 diener
 
 # Merge master into our branch before building Polkadot to make sure we don't miss
 # any commits that are required by Polkadot.
+git fetch --depth 20 origin
 git merge origin/master
 
 # Clone the current Polkadot master branch into ./polkadot.

From 31499cd29ed30df932fb71b7459796f7160d0272 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Tue, 15 Dec 2020 10:30:44 +0000
Subject: [PATCH 0176/1194] remove duplicate accounts in chain-spec. (#7725)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* remove duplicate accounts in chain-spec.

* Fix build

* Enforce in balances modules.

* Apply suggestions from code review

* Update frame/balances/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: Bastian Köcher <git@kchr.de>
---
 bin/node/cli/src/chain_spec.rs | 15 ++++++++++-----
 frame/balances/src/lib.rs      |  6 ++++++
 frame/balances/src/tests.rs    |  9 +++++++++
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/bin/node/cli/src/chain_spec.rs b/bin/node/cli/src/chain_spec.rs
index 90824a5572f1..83dc95e3b64d 100644
--- a/bin/node/cli/src/chain_spec.rs
+++ b/bin/node/cli/src/chain_spec.rs
@@ -218,7 +218,7 @@ pub fn testnet_genesis(
 	endowed_accounts: Option<Vec<AccountId>>,
 	enable_println: bool,
 ) -> GenesisConfig {
-	let endowed_accounts: Vec<AccountId> = endowed_accounts.unwrap_or_else(|| {
+	let mut endowed_accounts: Vec<AccountId> = endowed_accounts.unwrap_or_else(|| {
 		vec![
 			get_account_id_from_seed::<sr25519::Public>("Alice"),
 			get_account_id_from_seed::<sr25519::Public>("Bob"),
@@ -234,10 +234,16 @@ pub fn testnet_genesis(
 			get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
 		]
 	});
+	initial_authorities.iter().for_each(|x|
+		if !endowed_accounts.contains(&x.0) {
+			endowed_accounts.push(x.0.clone())
+		}
+	);
+
 	let num_endowed_accounts = endowed_accounts.len();
 
 	const ENDOWMENT: Balance = 10_000_000 * DOLLARS;
-	const STASH: Balance = 100 * DOLLARS;
+	const STASH: Balance = ENDOWMENT / 1000;
 
 	GenesisConfig {
 		frame_system: Some(SystemConfig {
@@ -246,9 +252,8 @@ pub fn testnet_genesis(
 		}),
 		pallet_balances: Some(BalancesConfig {
 			balances: endowed_accounts.iter().cloned()
-				.map(|k| (k, ENDOWMENT))
-				.chain(initial_authorities.iter().map(|x| (x.0.clone(), STASH)))
-				.collect(),
+				.map(|x| (x, ENDOWMENT))
+				.collect()
 		}),
 		pallet_indices: Some(IndicesConfig {
 			indices: vec![],
diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index 2852fbb953fd..b7d2488bfdd0 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -412,6 +412,12 @@ decl_storage! {
 					"the balance of any account should always be at least the existential deposit.",
 				)
 			}
+
+			// ensure no duplicates exist.
+			let endowed_accounts = config.balances.iter().map(|(x, _)| x).cloned().collect::<std::collections::BTreeSet<_>>();
+
+			assert!(endowed_accounts.len() == config.balances.len(), "duplicate balances in genesis.");
+
 			for &(ref who, free) in config.balances.iter() {
 				T::AccountStore::insert(who, AccountData { free, .. Default::default() });
 			}
diff --git a/frame/balances/src/tests.rs b/frame/balances/src/tests.rs
index 9a7e7ccb2687..f47776e0ee6c 100644
--- a/frame/balances/src/tests.rs
+++ b/frame/balances/src/tests.rs
@@ -639,6 +639,15 @@ macro_rules! decl_tests {
 			}.assimilate_storage(&mut t).unwrap();
 		}
 
+		#[test]
+		#[should_panic = "duplicate balances in genesis."]
+		fn cannot_set_genesis_value_twice() {
+			let mut t = frame_system::GenesisConfig::default().build_storage::<$test>().unwrap();
+			let _ = GenesisConfig::<$test> {
+				balances: vec![(1, 10), (2, 20), (1, 15)],
+			}.assimilate_storage(&mut t).unwrap();
+		}
+
 		#[test]
 		fn dust_moves_between_free_and_reserved() {
 			<$ext_builder>::default()

From ba2fc2be16301520c5db959e12395d5e1ab30548 Mon Sep 17 00:00:00 2001
From: RK <r.raajey@gmail.com>
Date: Tue, 15 Dec 2020 23:59:11 +0530
Subject: [PATCH 0177/1194] Participating in Council Governance is Free for
 First Time Voters and Successful Closing (#7661)

* wk2049 | D5 | addition-motions first free vote for members | p1

* Update frame/collective/src/lib.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* wk2049 | D6 | addition-motions first free vote for members | p2

* Update frame/collective/src/lib.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Update frame/collective/src/lib.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* wk2049 | D7 | addition-motions first free vote for members | p3

* Update frame/collective/src/lib.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* wk2049 | D7 | addition-motions first free vote for members | p4

* wk2049 | D7 | addition-motions first free vote for members | p6

* Update frame/collective/src/lib.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Update frame/collective/src/lib.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Update frame/collective/src/lib.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Update frame/collective/src/lib.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Update frame/collective/src/lib.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Update frame/collective/src/lib.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Update frame/collective/src/lib.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* wk2050 | D3 | addition-motions first free vote for members | p7

* wk2050 | D3 | addition-motions first free vote for members | p8

* update comment

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
---
 frame/collective/src/lib.rs | 141 ++++++++++++++++++++++++++++++++----
 1 file changed, 127 insertions(+), 14 deletions(-)

diff --git a/frame/collective/src/lib.rs b/frame/collective/src/lib.rs
index abaf579861e4..efc8626d6892 100644
--- a/frame/collective/src/lib.rs
+++ b/frame/collective/src/lib.rs
@@ -56,7 +56,7 @@ use frame_support::{
 	},
 	ensure,
 	traits::{ChangeMembers, EnsureOrigin, Get, InitializeMembers},
-	weights::{DispatchClass, GetDispatchInfo, Weight},
+	weights::{DispatchClass, GetDispatchInfo, Weight, Pays},
 };
 use frame_system::{self as system, ensure_signed, ensure_root};
 
@@ -488,6 +488,8 @@ decl_module! {
 		///
 		/// Requires the sender to be a member.
 		///
+		/// Transaction fees will be waived if the member is voting on any particular proposal
+		/// for the first time and the call is successful. Subsequent vote changes will charge a fee.
 		/// # <weight>
 		/// ## Weight
 		/// - `O(M)` where `M` is members-count (code- and governance-bounded)
@@ -515,6 +517,9 @@ decl_module! {
 			let position_yes = voting.ayes.iter().position(|a| a == &who);
 			let position_no = voting.nays.iter().position(|a| a == &who);
 
+			// Detects first vote of the member in the motion
+			let is_account_voting_first_time = position_yes.is_none() && position_no.is_none();
+
 			if approve {
 				if position_yes.is_none() {
 					voting.ayes.push(who.clone());
@@ -541,7 +546,17 @@ decl_module! {
 
 			Voting::<T, I>::insert(&proposal, voting);
 
-			Ok(Some(T::WeightInfo::vote(members.len() as u32)).into())
+			if is_account_voting_first_time {
+				Ok((
+					Some(T::WeightInfo::vote(members.len() as u32)),
+					Pays::No,
+				).into())
+			} else {
+				Ok((
+					Some(T::WeightInfo::vote(members.len() as u32)),
+					Pays::Yes,
+				).into())
+			}
 		}
 
 		/// Close a vote that is either approved, disapproved or whose voting period has ended.
@@ -554,6 +569,9 @@ decl_module! {
 		/// If called after the end of the voting period abstentions are counted as rejections
 		/// unless there is a prime member set and the prime member cast an approval.
 		///
+		/// If the close operation completes successfully with disapproval, the transaction fee will
+		/// be waived. Otherwise execution of the approved operation will be charged to the caller.
+		///
 		/// + `proposal_weight_bound`: The maximum amount of weight consumed by executing the closed proposal.
 		/// + `length_bound`: The upper bound for the length of the proposal in storage. Checked via
 		///                   `storage::read` so it is `size_of::<u32>() == 4` larger than the pure length.
@@ -606,20 +624,23 @@ decl_module! {
 				let (proposal, len) = Self::validate_and_get_proposal(
 					&proposal_hash,
 					length_bound,
-					proposal_weight_bound
+					proposal_weight_bound,
 				)?;
 				Self::deposit_event(RawEvent::Closed(proposal_hash, yes_votes, no_votes));
 				let (proposal_weight, proposal_count) =
 					Self::do_approve_proposal(seats, voting, proposal_hash, proposal);
-				return Ok(Some(
-					T::WeightInfo::close_early_approved(len as u32, seats, proposal_count)
-						.saturating_add(proposal_weight)
+				return Ok((
+					Some(T::WeightInfo::close_early_approved(len as u32, seats, proposal_count)
+					.saturating_add(proposal_weight)),
+					Pays::Yes,
 				).into());
+
 			} else if disapproved {
 				Self::deposit_event(RawEvent::Closed(proposal_hash, yes_votes, no_votes));
 				let proposal_count = Self::do_disapprove_proposal(proposal_hash);
-				return Ok(Some(
-					T::WeightInfo::close_early_disapproved(seats, proposal_count)
+				return Ok((
+					Some(T::WeightInfo::close_early_disapproved(seats, proposal_count)),
+					Pays::No,
 				).into());
 			}
 
@@ -642,20 +663,22 @@ decl_module! {
 				let (proposal, len) = Self::validate_and_get_proposal(
 					&proposal_hash,
 					length_bound,
-					proposal_weight_bound
+					proposal_weight_bound,
 				)?;
 				Self::deposit_event(RawEvent::Closed(proposal_hash, yes_votes, no_votes));
 				let (proposal_weight, proposal_count) =
 					Self::do_approve_proposal(seats, voting, proposal_hash, proposal);
-				return Ok(Some(
-					T::WeightInfo::close_approved(len as u32, seats, proposal_count)
-						.saturating_add(proposal_weight)
+				return Ok((
+					Some(T::WeightInfo::close_approved(len as u32, seats, proposal_count)
+					.saturating_add(proposal_weight)),
+					Pays::Yes,
 				).into());
 			} else {
 				Self::deposit_event(RawEvent::Closed(proposal_hash, yes_votes, no_votes));
 				let proposal_count = Self::do_disapprove_proposal(proposal_hash);
-				return Ok(Some(
-					T::WeightInfo::close_disapproved(seats, proposal_count)
+				return Ok((
+					Some(T::WeightInfo::close_disapproved(seats, proposal_count)),
+					Pays::No,
 				).into());
 			}
 		}
@@ -1436,6 +1459,96 @@ mod tests {
 		});
 	}
 
+	#[test]
+	fn motions_all_first_vote_free_works() {
+		new_test_ext().execute_with(|| {
+			let proposal = make_proposal(42);
+			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
+			let hash: H256 = proposal.blake2_256().into();
+			let end = 4;
+			assert_ok!(
+				Collective::propose(
+					Origin::signed(1),
+					2,
+					Box::new(proposal.clone()),
+					proposal_len,
+				)
+			);
+			assert_eq!(
+				Collective::voting(&hash),
+				Some(Votes { index: 0, threshold: 2, ayes: vec![1], nays: vec![], end })
+			);
+
+			// For the motion, acc 2's first vote, expecting Ok with Pays::No.
+			let vote_rval: DispatchResultWithPostInfo = Collective::vote(
+				Origin::signed(2),
+				hash.clone(),
+				0,
+				true,
+			);
+			assert_eq!(vote_rval.unwrap().pays_fee, Pays::No);
+
+			// Duplicate vote, expecting error with Pays::Yes.
+			let vote_rval: DispatchResultWithPostInfo = Collective::vote(
+				Origin::signed(2),
+				hash.clone(),
+				0,
+				true,
+			);
+			assert_eq!(vote_rval.unwrap_err().post_info.pays_fee, Pays::Yes);
+
+			// Modifying vote, expecting ok with Pays::Yes.
+			let vote_rval: DispatchResultWithPostInfo = Collective::vote(
+				Origin::signed(2),
+				hash.clone(),
+				0,
+				false,
+			);
+			assert_eq!(vote_rval.unwrap().pays_fee, Pays::Yes);
+
+			// For the motion, acc 3's first vote, expecting Ok with Pays::No.
+			let vote_rval: DispatchResultWithPostInfo = Collective::vote(
+				Origin::signed(3),
+				hash.clone(),
+				0,
+				true,
+			);
+			assert_eq!(vote_rval.unwrap().pays_fee, Pays::No);
+
+			// acc 3 modify the vote, expecting Ok with Pays::Yes.
+			let vote_rval: DispatchResultWithPostInfo = Collective::vote(
+				Origin::signed(3),
+				hash.clone(),
+				0,
+				false,
+			);
+			assert_eq!(vote_rval.unwrap().pays_fee, Pays::Yes);
+
+			// Test close() Extrincis | Check DispatchResultWithPostInfo with Pay Info
+
+			let proposal_weight = proposal.get_dispatch_info().weight;
+			let close_rval: DispatchResultWithPostInfo = Collective::close(
+				Origin::signed(2),
+				hash.clone(),
+				0,
+				proposal_weight,
+				proposal_len,
+			);
+			assert_eq!(close_rval.unwrap().pays_fee, Pays::No);
+
+			// trying to close the proposal, which is already closed.
+			// Expecting error "ProposalMissing" with Pays::Yes
+			let close_rval: DispatchResultWithPostInfo = Collective::close(
+				Origin::signed(2),
+				hash.clone(),
+				0,
+				proposal_weight,
+				proposal_len,
+			);
+			assert_eq!(close_rval.unwrap_err().post_info.pays_fee, Pays::Yes);
+		});
+	}
+
 	#[test]
 	fn motions_reproposing_disapproved_works() {
 		new_test_ext().execute_with(|| {

From 6584375358d77ba950fe39847497ad64e3227fea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Dec 2020 20:01:05 +0100
Subject: [PATCH 0178/1194] Bump zeroize from 1.1.1 to 1.2.0 (#7731)

Bumps [zeroize](https://github.com/iqlusioninc/crates) from 1.1.1 to 1.2.0.
- [Release notes](https://github.com/iqlusioninc/crates/releases)
- [Commits](https://github.com/iqlusioninc/crates/compare/zeroize/v1.1.1...zeroize/v1.2.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                 | 4 ++--
 client/network/Cargo.toml  | 2 +-
 primitives/core/Cargo.toml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index dbb640806c69..57f6028f5fc3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10391,9 +10391,9 @@ dependencies = [
 
 [[package]]
 name = "zeroize"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f33972566adbd2d3588b0491eb94b98b43695c4ef897903470ede4f3f5a28a"
+checksum = "81a974bcdd357f0dca4d41677db03436324d45a4c9ed2d0b873a5a360ce41c36"
 dependencies = [
  "zeroize_derive",
 ]
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index 1ad54366ce42..b7cb1512dd45 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -61,7 +61,7 @@ thiserror = "1"
 unsigned-varint = { version = "0.5.0", features = ["futures", "futures-codec"] }
 void = "1.0.2"
 wasm-timer = "0.2"
-zeroize = "1.0.0"
+zeroize = "1.2.0"
 
 [dependencies.libp2p]
 version = "0.32.2"
diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml
index ca385df2365b..1d0ff4f20828 100644
--- a/primitives/core/Cargo.toml
+++ b/primitives/core/Cargo.toml
@@ -29,7 +29,7 @@ substrate-bip39 = { version = "0.4.2", optional = true }
 tiny-bip39 = { version = "0.8", optional = true }
 regex = { version = "1.4.2", optional = true }
 num-traits = { version = "0.2.8", default-features = false }
-zeroize = { version = "1.0.0", default-features = false }
+zeroize = { version = "1.2.0", default-features = false }
 secrecy = { version = "0.7.0", default-features = false }
 lazy_static = { version = "1.4.0", default-features = false, optional = true }
 parking_lot = { version = "0.10.0", optional = true }

From 566ad03cf8c07c3c3ab226a724b2dcb4b6dbbc9b Mon Sep 17 00:00:00 2001
From: Sergei Shulepov <sergei@parity.io>
Date: Tue, 15 Dec 2020 20:07:04 +0100
Subject: [PATCH 0179/1194] Leave some header related info for inspection
 (#7727)

* Leave some system data for inspection

There is not much benefit in being active when removing this data. It's
actively harmful when one tries to read the block number in runtime
APIs in the context of a block.

* Update the expected root hash

This is excepted since now we persist new members.

* Revert extrinsics_root to `take`

It's going away in one of the following PRs anyway

* Update the state root once again

* Update the comment on the storage items that are left in the storage

Excluding ExtrinsicsRoot since it's going away
---
 frame/executive/src/lib.rs |  2 +-
 frame/system/src/lib.rs    | 28 ++++++++++++++++------------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index 572d58d86b40..59e9cae19837 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -753,7 +753,7 @@ mod tests {
 				header: Header {
 					parent_hash: [69u8; 32].into(),
 					number: 1,
-					state_root: hex!("6a3ad91caba5b8ac15c325a36d7568adf6a7e49321865de7527b851d870343d4").into(),
+					state_root: hex!("ba1a82a264b8007e0c04c9ea35e541593daad08b6e2bf7c0a6780a67d1c55018").into(),
 					extrinsics_root: hex!("03170a2e7597b7b7e3d84c05391d139a62b157e78786d8c082f29dcf4c111314").into(),
 					digest: Digest { logs: vec![], },
 				},
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index 7273ca09aabb..c5586f985668 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -1013,15 +1013,27 @@ impl<T: Config> Module<T> {
 		}
 	}
 
-	/// Remove temporary "environment" entries in storage.
+	/// Remove temporary "environment" entries in storage, compute the storage root and return the
+	/// resulting header for this block.
 	pub fn finalize() -> T::Header {
 		ExecutionPhase::kill();
 		ExtrinsicCount::kill();
 		AllExtrinsicsLen::kill();
 
-		let number = <Number<T>>::take();
-		let parent_hash = <ParentHash<T>>::take();
-		let mut digest = <Digest<T>>::take();
+		// The following fields
+		//
+		// - <Events<T>>
+		// - <EventCount<T>>
+		// - <EventTopics<T>>
+		// - <Number<T>>
+		// - <ParentHash<T>>
+		// - <Digest<T>>
+		//
+		// stay to be inspected by the client and will be cleared by `Self::initialize`.
+		let number = <Number<T>>::get();
+		let parent_hash = <ParentHash<T>>::get();
+		let mut digest = <Digest<T>>::get();
+
 		let extrinsics_root = <ExtrinsicsRoot<T>>::take();
 
 		// move block hash pruning window by one block
@@ -1049,14 +1061,6 @@ impl<T: Config> Module<T> {
 			digest.push(item);
 		}
 
-		// The following fields
-		//
-		// - <Events<T>>
-		// - <EventCount<T>>
-		// - <EventTopics<T>>
-		//
-		// stay to be inspected by the client and will be cleared by `Self::initialize`.
-
 		<T::Header as traits::Header>::new(number, extrinsics_root, storage_root, parent_hash, digest)
 	}
 

From 987a9723920217917f2708388d150add5ef52ef7 Mon Sep 17 00:00:00 2001
From: RK <r.raajey@gmail.com>
Date: Wed, 16 Dec 2020 16:02:16 +0530
Subject: [PATCH 0180/1194] Issue 7143 | Refactor Treasury Pallet into
 Bounties, Tips, and Proposals (#7536)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* wk2046 | D5 | treasury refactor to bounties and tips

* wk2046 | D5 | treasury refactor to bounties and tips | p2

* fix test compilation, ignoring events

* initialize treasury in genesis

* wk2046 | D7 | treasury refactor | fix bounties test build issues

* wk2047 | D1 | treasury refactor | tips pallet bringup

* wk2047 | D2 | treasury refactor | bounties  pallet | unit test bringup

* wk2047 | D2 | treasury refactor | bounties  pallet | unit test bringup | p2

* wk2047 | D2 | treasury refactor | pallet-tips| test_last_reward_migration | test failure - analysis

* wk2047 | D3 | treasury refactor | pallet-tips| test_last_reward_migration | test failure - fix

* wk2047 | D3 | treasury refactor | pallet-bounties | on_initialize() fix

* wk2047 | D3 | treasury refactor | pallet-bounties | on_initialize() fix | p2

* wk2047 | D4 | treasury refactor | pallet-bounties + pallet-treasury | spend_fund runtime hooks

* wk2047 | D4 | treasury refactor | pallet-bounties + pallet-treasury | spend_fund runtime hooks | p2

* wk2047 | D4 | treasury refactor | pallet-bounties + pallet-treasury | spend_fund runtime hooks | p3

* wk2047 | D5 | treasury refactor | pallet-bounties + pallet-treasury | spend_fund runtime hooks | p4

* wk2047 | D6 | treasury refactor | review comments fix

* some fixes

* fix bounties instantiable

* remove instantiable from tips and bounties

* fix compile for benchmarks

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_treasury --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/treasury/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Update lib.rs

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_tips --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/tips/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_bounties --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/bounties/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* add back `on_initialize_bounties`

* patch up bounties benchmarks

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_bounties --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/bounties/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Remove development TODO from public doc comment (#7500)

* refactor subtrait/elevated trait as not needed (#7497)

* Fix comments of indices pallet events (#7511)

Arguments for IndexAssigned and IndexFrozen were inverted in comments.

* Skip slot lenience on first block in BABE (#7515)

The genesis header doesn't have the BABE pre-digest and we insert `0` as
slot number. The slot lenience calculation will return the maximum in
this situation. Besides returning the maximum which is not bad at all,
it also prints some a debug message that can be confusing in the first
moment. To prevent printing this debug message, we now just return early
when we see that the parent block is the genesis block.

* slots: incrementally backoff claiming slots if finality lags behind (#7186)

* babe: backoff authoring blocks when finality lags

* babe: move backoff authoring params to default constructor

* babe: deduplicate the test a bit

* babe: set backoff constants in service

* babe: use better names for backoff authoring block parameters

* babe: remove last unwrap

* babe: slight style tweak

* babe: fix comment

* slots: move backoff block authorship logic to SimpleSlotWorker

* aura: append SlotInfo in on_slot

* slots: use the correct types for parameters

* slots: fix review comments

* aura: add missing backoff authoring blocks parameters

* slots: add comments for default values

* slots: add additional checks in test

* slots: update implementation for new master

* slots: revert the change to SlotInfo

* Fix review comments

* slots: rework unit tests for backing off claiming slots

* slots: add test for asymptotic behaviour for slot claims

* slots: address review comments

* slots: add test for max_interval

* slots: add assertion for intervals between between claimed slots

* slots: remove rustfmt directive

* slots: another attempt at explaining authoring_rate

* slots: up unfinalized_slack to 50 by default

* slots: add tests for time to reach max_interval

* slots: fix typo in comments

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* slots: additional tweaks to comments and info calls

* slots: rename to BackoffAuthoringOnFinalizedHeadLagging

* slots: make the backing off strategy generic

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* slots: implement backoff trait for () for simplicity

* slots: move logging inside backing off function to make it more specific

* aura: add missing function parameter

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Export app-crypto specific keystore functions (#7489)

* Export app-crypto specific keystore functions

* Also add back the insert function

* Switch KeystoreContainer to an enum

* Only export the bare minimal for LocalKeystore and fix service compile

* fix: should return Arc

* Add docs stating that functions only available in local keystore

* Remove insert and generate functions

* fix: generate function should be available in test

* Add keypair function to trait

* Revert "Add keypair function to trait"

This reverts commit ad921b09ca73d3c09298e3a51b562ef8e0067781.

* Add note for local_keystore function in service

* Update doc for the --chain flag (#7520)

* contracts: Add missing instruction to the `Schedule` (#7527)

* Don't log with colors when we are writing to a tty (#7525)

* Don't log with colors when we are writing to a tty

This fixes a regression that was introduced by the switch to tracing.
Before we killed all colors before writing to a tty, this pr brings the
behaviour back.

* Remove accidentally added crate

* Review feedback

* More feedback

* Update client/cli/src/logging.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Update client/cli/src/logging.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* MemoryId -> u32 (#7534)

* Enable local addresses in DHT when chain type == `Local` | `Development` (#7538)

* Enable local addresses in DHT when chain type == `Local` | `Development`

This pr changes when to add local addresses to DHT. Instead of only
checking if `--discover-local` and `--dev` are present, we now also
check if the chain type is `Local` or `Development`.

* Update the docs!

* Update tiny-bip39 to v0.8 (#7539)

It would improve secret zeroization due to
https://github.com/maciejhirsz/tiny-bip39/pull/22, and would also remove
one of the points where we depend on `failure` crate, which is
deprecated (see https://github.com/rust-lang-nursery/failure/pull/347)

* make LocalCallExecutor public (#7528)

* Fix some weirdness in `offchain_worker` (#7541)

We call `offchain_worker` with the state of the imported block and pass
the header of this block. However in the runtime we call all
`offchain_worker` functions with the number of the parent block. Besides
that we also pass all digests and not only the pre runtime digests. In
the context where the offchain worker is executed we have all digests, so
there is no real reason to only pass pre runtime digests. Another fix is
that we also insert the hash of the current header into the block hash map.

* Use inbound peerslot slots when a substream is received, rather than a connection (#7464)

* Use inbound peerslot slots when a substream is received, rather than a connection

* Refactor PeerState

* Some bugfixes

* Fix warnings so that CI runs, gmlrlblbl

* Bugfixes

* Update docs

* Apply suggestions from code review

Co-authored-by: Roman Borschel <romanb@users.noreply.github.com>

* Clean up Banned state

* Refactor connections state

* Fix possibility of Enabled with no Opening or Open connection

* Line width

* Add some debug_asserts! and fix TODO

* Refactor legacy handler

* Rewrite group.rs entirely [part 1]

* Rewrite group.rs entirely [part 2]

* Remove faulty assertion

Because of the asynchronous nature of the behaviour <-> handler communications, it is possible to receive notifications while in the Closing state

* Don't poll the legacy substream is not Open

* Tolerate when not all substreams are accepted

* Remove TODOs

* Dummy commit to make CI log interesting things

* Try race condition fix

* Revert "Try race condition fix"

This reverts commit 0675c659d06195c30f8c5bc13e2d88141d57a3ba.

* Correctly rebuild pending_opening

* Minor tweaks

* Printlns for CI debugging

* Revert "Printlns for CI debugging"

This reverts commit e7852a231f4fc418898767aaa27c9a4358e12e8b.

* Revert "Dummy commit to make CI log interesting things"

This reverts commit 259ddd74088e53e7c6a9b0a62a8d1573a0063ce3.

* mv group.rs ../handler.rs

* Apply suggestions from code review

Co-authored-by: Max Inden <mail@max-inden.de>

* Banned => Backoff

* Mention the actual PeerStates

* OpenDesired -> OpenDesiredByRemote

* OpeningThenClosing

* Add doc links to PeerState

* Simplify increment logic

* One more debug_assert

* debug_assert!

* OpenDesiredByRemote

* Update client/network/src/protocol/generic_proto/behaviour.rs

Co-authored-by: Max Inden <mail@max-inden.de>

Co-authored-by: Roman Borschel <romanb@users.noreply.github.com>
Co-authored-by: Max Inden <mail@max-inden.de>

* *: Update to libp2p v0.30.0 (#7508)

* *: Update to libp2p v0.30.0

* Cargo.lock: Update

* *: Update to libp2p v0.30.1

* make ClientConfig public (#7544)

* sc-basic-authorship: remove useless dependencies (#7550)

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* Add slashing events to elections-phragmen. (#7543)

* Add slashing events to elections-phragmen.

* Fix build

* Apply suggestions from code review

* Update frame/elections-phragmen/src/lib.rs

* Update frame/elections-phragmen/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Remove necessity to pass ConsensusEngineId when registering notifications protocol (#7549)

* Remove necessity to pass ConsensusEngineId when registering notifications protocol

* Line width

* Fix tests protocol name

* Other renames

* Doc update

* Change issue in TODO

* sc-cli: replace bip39 with tiny-bip39 (#7551)

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* Add extra docs to on_initialize (#7552)

* Add some extra on_initialize docs.

* Address review comments.

* More Extensible Multiaddress Format (#7380)

* More extensible multiaddress format

* update name

* Don't depend on indices to define multiaddress type

* Use MultiAddress in Node Template too!

* reduce traits, fix build

* support multiple `StaticLookup`

* bump tx version

* feedback

* Fix weight template to remove ugliness in rust doc (#7565)

fixed weight template

* Cargo.lock: Run cargo update (#7553)

* Cargo.lock: Run cargo update

* Cargo.lock: Downgrade cc to v1.0.62

* Cargo.lock: Revert wasm-* updates

* .github: Add dependabot config and thus enable dependabot (#7509)

* .github: Add dependabot config and thus enable dependabot

* Update .github/dependabot.yml

Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>

Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>

* Thread-local parameter_types for testing. (#7542)

* Thread-local parameter_types for testing.

* Better docs.

* Some minors

* Merge'em

* Update frame/support/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Align more to basti's trick

* Update frame/support/src/lib.rs

* Update frame/support/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: Bastian Köcher <git@kchr.de>

* Bump wasm-bindgen-test from 0.3.12 to 0.3.17 (#7567)

* Bump wasm-bindgen-test from 0.3.12 to 0.3.17

Bumps [wasm-bindgen-test](https://github.com/rustwasm/wasm-bindgen) from 0.3.12 to 0.3.17.
- [Release notes](https://github.com/rustwasm/wasm-bindgen/releases)
- [Changelog](https://github.com/rustwasm/wasm-bindgen/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rustwasm/wasm-bindgen/commits)

Signed-off-by: dependabot[bot] <support@github.com>

* Update wasm-bindgen pin to 0.2.68

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>

* wk2047 | D6 | treasury refactor | review comments fix | p2

* wk2048 | D1 | treasury refactor | review comments fix | p3

* Update bin/node/runtime/src/lib.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Update bin/node/runtime/src/lib.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* wk2048 | D3 | treasury refactor | review comments fix | p4

* wk2048 | D3 | treasury refactor | review comments fix | p5

* wk2048 | D4 | treasury refactor | review comments fix |  removal of deadcode | p6

* remove broken link

* wk2048 | D5 | treasury refactor | review comments fix | bountise doc string | p7

* wk2048 | D5 | treasury refactor | review comments fix | p8

* docs and formatting

* Update frame/tips/src/benchmarking.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* formatting nits

* Trait -> Config

* trait -> config in benchmarks

* clean up weight docs

* Trait -> Config in Runtime

* fix test build

* try to fix polkadot build check

* fix traits

* Update lib.rs

* Apply suggestions from code review

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Apply suggestions from code review

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* fix trait location

* nits

* uncomment on_initialize for bounties benchmarks

* update weights

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
Co-authored-by: Caio <c410.f3r@gmail.com>
Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Antoine Le Calvez <alecalve@users.noreply.github.com>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: Jon Häggblad <jon.haggblad@gmail.com>
Co-authored-by: Wei Tang <wei@that.world>
Co-authored-by: Sergei Shulepov <sergei@parity.io>
Co-authored-by: Alexander Theißen <alex.theissen@me.com>
Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
Co-authored-by: Kirill Pimenov <kirill@parity.io>
Co-authored-by: Andrew Plaza <aplaza@liquidthink.net>
Co-authored-by: Roman Borschel <romanb@users.noreply.github.com>
Co-authored-by: Max Inden <mail@max-inden.de>
Co-authored-by: Qinxuan Chen <koushiro.cqx@gmail.com>
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Co-authored-by: Tomasz Drwięga <tomusdrw@users.noreply.github.com>
Co-authored-by: Bastian Köcher <git@kchr.de>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Addie Wagenknecht <addie@nortd.com>
---
 Cargo.lock                         |   39 +
 Cargo.toml                         |    2 +
 bin/node/runtime/Cargo.toml        |    6 +
 bin/node/runtime/src/lib.rs        |   31 +-
 frame/bounties/Cargo.toml          |   47 ++
 frame/bounties/README.md           |   52 ++
 frame/bounties/src/benchmarking.rs |  247 ++++++
 frame/bounties/src/lib.rs          |  757 +++++++++++++++++++
 frame/bounties/src/tests.rs        |  903 ++++++++++++++++++++++
 frame/bounties/src/weights.rs      |  189 +++++
 frame/tips/Cargo.toml              |   47 ++
 frame/tips/README.md               |   32 +
 frame/tips/src/benchmarking.rs     |  193 +++++
 frame/tips/src/lib.rs              |  576 ++++++++++++++
 frame/tips/src/tests.rs            |  465 ++++++++++++
 frame/tips/src/weights.rs          |  131 ++++
 frame/treasury/Cargo.toml          |    1 +
 frame/treasury/README.md           |  109 +--
 frame/treasury/src/benchmarking.rs |  297 +-------
 frame/treasury/src/lib.rs          | 1113 ++--------------------------
 frame/treasury/src/tests.rs        |  805 +-------------------
 frame/treasury/src/weights.rs      |  262 +------
 22 files changed, 3795 insertions(+), 2509 deletions(-)
 create mode 100644 frame/bounties/Cargo.toml
 create mode 100644 frame/bounties/README.md
 create mode 100644 frame/bounties/src/benchmarking.rs
 create mode 100644 frame/bounties/src/lib.rs
 create mode 100644 frame/bounties/src/tests.rs
 create mode 100644 frame/bounties/src/weights.rs
 create mode 100644 frame/tips/Cargo.toml
 create mode 100644 frame/tips/README.md
 create mode 100644 frame/tips/src/benchmarking.rs
 create mode 100644 frame/tips/src/lib.rs
 create mode 100644 frame/tips/src/tests.rs
 create mode 100644 frame/tips/src/weights.rs

diff --git a/Cargo.lock b/Cargo.lock
index 57f6028f5fc3..c775fbb062e1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3938,6 +3938,7 @@ dependencies = [
  "pallet-authorship",
  "pallet-babe",
  "pallet-balances",
+ "pallet-bounties",
  "pallet-collective",
  "pallet-contracts",
  "pallet-contracts-primitives",
@@ -3964,6 +3965,7 @@ dependencies = [
  "pallet-staking-reward-curve",
  "pallet-sudo",
  "pallet-timestamp",
+ "pallet-tips",
  "pallet-transaction-payment",
  "pallet-transaction-payment-rpc-runtime-api",
  "pallet-treasury",
@@ -4397,6 +4399,24 @@ dependencies = [
  "sp-std",
 ]
 
+[[package]]
+name = "pallet-bounties"
+version = "2.0.0"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "pallet-balances",
+ "pallet-treasury",
+ "parity-scale-codec",
+ "serde",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+ "sp-storage",
+]
+
 [[package]]
 name = "pallet-collective"
 version = "2.0.0"
@@ -5037,6 +5057,24 @@ dependencies = [
  "sp-timestamp",
 ]
 
+[[package]]
+name = "pallet-tips"
+version = "2.0.0"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "pallet-balances",
+ "pallet-treasury",
+ "parity-scale-codec",
+ "serde",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+ "sp-storage",
+]
+
 [[package]]
 name = "pallet-transaction-payment"
 version = "2.0.0"
@@ -5092,6 +5130,7 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "impl-trait-for-tuples",
  "pallet-balances",
  "parity-scale-codec",
  "serde",
diff --git a/Cargo.toml b/Cargo.toml
index 206673c0ef2f..61282189da38 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -66,6 +66,7 @@ members = [
 	"frame/babe",
 	"frame/balances",
 	"frame/benchmarking",
+	"frame/bounties",
 	"frame/collective",
 	"frame/contracts",
 	"frame/contracts/rpc",
@@ -112,6 +113,7 @@ members = [
 	"frame/transaction-payment/rpc",
 	"frame/transaction-payment/rpc/runtime-api",
 	"frame/treasury",
+	"frame/tips",
 	"frame/utility",
 	"frame/vesting",
 	"primitives/allocator",
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index ad0f6b35a25d..4dabc5c01592 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -48,6 +48,7 @@ pallet-authority-discovery = { version = "2.0.0", default-features = false, path
 pallet-authorship = { version = "2.0.0", default-features = false, path = "../../../frame/authorship" }
 pallet-babe = { version = "2.0.0", default-features = false, path = "../../../frame/babe" }
 pallet-balances = { version = "2.0.0", default-features = false, path = "../../../frame/balances" }
+pallet-bounties = { version = "2.0.0", default-features = false, path = "../../../frame/bounties" }
 pallet-collective = { version = "2.0.0", default-features = false, path = "../../../frame/collective" }
 pallet-contracts = { version = "2.0.0", default-features = false, path = "../../../frame/contracts" }
 pallet-contracts-primitives = { version = "2.0.0", default-features = false, path = "../../../frame/contracts/common/" }
@@ -74,6 +75,7 @@ pallet-scheduler = { version = "2.0.0", default-features = false, path = "../../
 pallet-society = { version = "2.0.0", default-features = false, path = "../../../frame/society" }
 pallet-sudo = { version = "2.0.0", default-features = false, path = "../../../frame/sudo" }
 pallet-timestamp = { version = "2.0.0", default-features = false, path = "../../../frame/timestamp" }
+pallet-tips = { version = "2.0.0", default-features = false, path = "../../../frame/tips" }
 pallet-treasury = { version = "2.0.0", default-features = false, path = "../../../frame/treasury" }
 pallet-utility = { version = "2.0.0", default-features = false, path = "../../../frame/utility" }
 pallet-transaction-payment = { version = "2.0.0", default-features = false, path = "../../../frame/transaction-payment" }
@@ -97,6 +99,7 @@ std = [
 	"sp-consensus-babe/std",
 	"pallet-babe/std",
 	"pallet-balances/std",
+	"pallet-bounties/std",
 	"sp-block-builder/std",
 	"codec/std",
 	"pallet-collective/std",
@@ -136,6 +139,7 @@ std = [
 	"frame-system-rpc-runtime-api/std",
 	"frame-system/std",
 	"pallet-timestamp/std",
+	"pallet-tips/std",
 	"pallet-transaction-payment-rpc-runtime-api/std",
 	"pallet-transaction-payment/std",
 	"pallet-treasury/std",
@@ -154,6 +158,7 @@ runtime-benchmarks = [
 	"pallet-assets/runtime-benchmarks",
 	"pallet-babe/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
+	"pallet-bounties/runtime-benchmarks",
 	"pallet-collective/runtime-benchmarks",
 	"pallet-contracts/runtime-benchmarks",
 	"pallet-democracy/runtime-benchmarks",
@@ -169,6 +174,7 @@ runtime-benchmarks = [
 	"pallet-society/runtime-benchmarks",
 	"pallet-staking/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
+	"pallet-tips/runtime-benchmarks",
 	"pallet-treasury/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
 	"pallet-vesting/runtime-benchmarks",
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index fb8f720898bb..fb77fd2ebd40 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -671,25 +671,38 @@ impl pallet_treasury::Config for Runtime {
 		EnsureRoot<AccountId>,
 		pallet_collective::EnsureProportionMoreThan<_1, _2, AccountId, CouncilCollective>
 	>;
-	type Tippers = Elections;
-	type TipCountdown = TipCountdown;
-	type TipFindersFee = TipFindersFee;
-	type TipReportDepositBase = TipReportDepositBase;
-	type DataDepositPerByte = DataDepositPerByte;
 	type Event = Event;
 	type OnSlash = ();
 	type ProposalBond = ProposalBond;
 	type ProposalBondMinimum = ProposalBondMinimum;
 	type SpendPeriod = SpendPeriod;
 	type Burn = Burn;
+	type BurnDestination = ();
+	type SpendFunds = Bounties;
+	type WeightInfo = pallet_treasury::weights::SubstrateWeight<Runtime>;
+}
+
+impl pallet_bounties::Config for Runtime {
+	type Event = Event;
 	type BountyDepositBase = BountyDepositBase;
 	type BountyDepositPayoutDelay = BountyDepositPayoutDelay;
 	type BountyUpdatePeriod = BountyUpdatePeriod;
 	type BountyCuratorDeposit = BountyCuratorDeposit;
 	type BountyValueMinimum = BountyValueMinimum;
+	type DataDepositPerByte = DataDepositPerByte;
 	type MaximumReasonLength = MaximumReasonLength;
-	type BurnDestination = ();
-	type WeightInfo = pallet_treasury::weights::SubstrateWeight<Runtime>;
+	type WeightInfo = pallet_bounties::weights::SubstrateWeight<Runtime>;
+}
+
+impl pallet_tips::Config for Runtime {
+	type Event = Event;
+	type DataDepositPerByte = DataDepositPerByte;
+	type MaximumReasonLength = MaximumReasonLength;
+	type Tippers = Elections;
+	type TipCountdown = TipCountdown;
+	type TipFindersFee = TipFindersFee;
+	type TipReportDepositBase = TipReportDepositBase;
+	type WeightInfo = pallet_tips::weights::SubstrateWeight<Runtime>;
 }
 
 parameter_types! {
@@ -977,6 +990,8 @@ construct_runtime!(
 		Scheduler: pallet_scheduler::{Module, Call, Storage, Event<T>},
 		Proxy: pallet_proxy::{Module, Call, Storage, Event<T>},
 		Multisig: pallet_multisig::{Module, Call, Storage, Event<T>},
+		Bounties: pallet_bounties::{Module, Call, Storage, Event<T>},
+		Tips: pallet_tips::{Module, Call, Storage, Event<T>},
 		Assets: pallet_assets::{Module, Call, Storage, Event<T>},
 		Mmr: pallet_mmr::{Module, Storage},
 	}
@@ -1248,6 +1263,7 @@ impl_runtime_apis! {
 			add_benchmark!(params, batches, pallet_assets, Assets);
 			add_benchmark!(params, batches, pallet_babe, Babe);
 			add_benchmark!(params, batches, pallet_balances, Balances);
+			add_benchmark!(params, batches, pallet_bounties, Bounties);
 			add_benchmark!(params, batches, pallet_collective, Council);
 			add_benchmark!(params, batches, pallet_contracts, Contracts);
 			add_benchmark!(params, batches, pallet_democracy, Democracy);
@@ -1265,6 +1281,7 @@ impl_runtime_apis! {
 			add_benchmark!(params, batches, pallet_staking, Staking);
 			add_benchmark!(params, batches, frame_system, SystemBench::<Runtime>);
 			add_benchmark!(params, batches, pallet_timestamp, Timestamp);
+			add_benchmark!(params, batches, pallet_tips, Tips);
 			add_benchmark!(params, batches, pallet_treasury, Treasury);
 			add_benchmark!(params, batches, pallet_utility, Utility);
 			add_benchmark!(params, batches, pallet_vesting, Vesting);
diff --git a/frame/bounties/Cargo.toml b/frame/bounties/Cargo.toml
new file mode 100644
index 000000000000..214637bb6c8d
--- /dev/null
+++ b/frame/bounties/Cargo.toml
@@ -0,0 +1,47 @@
+[package]
+name = "pallet-bounties"
+version = "2.0.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
+license = "Apache-2.0"
+homepage = "https://substrate.dev"
+repository = "https://github.com/paritytech/substrate/"
+description = "FRAME pallet to manage bounties"
+readme = "README.md"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+serde = { version = "1.0.101", optional = true, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
+sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
+sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
+frame-support = { version = "2.0.0", default-features = false, path = "../support" }
+frame-system = { version = "2.0.0", default-features = false, path = "../system" }
+pallet-treasury = { version = "2.0.0", default-features = false, path = "../treasury" }
+
+frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
+
+[dev-dependencies]
+sp-io ={ version = "2.0.0", path = "../../primitives/io" }
+sp-core = { version = "2.0.0", path = "../../primitives/core" }
+sp-storage = { version = "2.0.0", path = "../../primitives/storage" }
+pallet-balances = { version = "2.0.0", path = "../balances" }
+
+[features]
+default = ["std"]
+std = [
+	"serde",
+	"codec/std",
+	"sp-std/std",
+	"sp-runtime/std",
+	"frame-support/std",
+	"frame-system/std",
+	"pallet-treasury/std",
+]
+runtime-benchmarks = [
+	"frame-benchmarking",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+]
diff --git a/frame/bounties/README.md b/frame/bounties/README.md
new file mode 100644
index 000000000000..bf63fca5f34b
--- /dev/null
+++ b/frame/bounties/README.md
@@ -0,0 +1,52 @@
+# Bounties Module ( pallet-bounties )
+
+## Bounty
+
+**Note :: This pallet is tightly coupled with pallet-treasury**
+
+A Bounty Spending is a reward for a specified body of work - or specified set of objectives - that
+needs to be executed for a predefined Treasury amount to be paid out. A curator is assigned after
+the bounty is approved and funded by Council, to be delegated with the responsibility of assigning a
+payout address once the specified set of objectives is completed.
+
+After the Council has activated a bounty, it delegates the work that requires expertise to a curator
+in exchange of a deposit. Once the curator accepts the bounty, they get to close the active bounty.
+Closing the active bounty enacts a delayed payout to the payout address, the curator fee and the
+return of the curator deposit. The delay allows for intervention through regular democracy. The
+Council gets to unassign the curator, resulting in a new curator election. The Council also gets to
+cancel the bounty if deemed necessary before assigning a curator or once the bounty is active or
+payout is pending, resulting in the slash of the curator's deposit.
+
+### Terminology
+
+- **Bounty spending proposal:** A proposal to reward a predefined body of work upon completion by
+  the Treasury.
+- **Proposer:** An account proposing a bounty spending.
+- **Curator:** An account managing the bounty and assigning a payout address receiving the reward
+  for the completion of work.
+- **Deposit:** The amount held on deposit for placing a bounty proposal plus the amount held on
+  deposit per byte within the bounty description.
+- **Curator deposit:** The payment from a candidate willing to curate an approved bounty. The
+  deposit is returned when/if the bounty is completed.
+- **Bounty value:** The total amount that should be paid to the Payout Address if the bounty is
+  rewarded.
+- **Payout address:** The account to which the total or part of the bounty is assigned to.
+- **Payout Delay:** The delay period for which a bounty beneficiary needs to wait before claiming.
+- **Curator fee:** The reserved upfront payment for a curator for work related to the bounty.
+
+## Interface
+
+### Dispatchable Functions
+
+Bounty protocol:
+- `propose_bounty` - Propose a specific treasury amount to be earmarked for a predefined set of
+  tasks and stake the required deposit.
+- `approve_bounty` - Accept a specific treasury amount to be earmarked for a predefined body of
+  work.
+- `propose_curator` - Assign an account to a bounty as candidate curator.
+- `accept_curator` - Accept a bounty assignment from the Council, setting a curator deposit.
+- `extend_bounty_expiry` - Extend the expiry block number of the bounty and stay active.
+- `award_bounty` - Close and pay out the specified amount for the completed work.
+- `claim_bounty` - Claim a specific bounty amount from the Payout Address.
+- `unassign_curator` - Unassign an accepted curator from a specific earmark.
+- `close_bounty` - Cancel the earmark for a specific treasury amount and close the bounty.
diff --git a/frame/bounties/src/benchmarking.rs b/frame/bounties/src/benchmarking.rs
new file mode 100644
index 000000000000..5a323ff0aafc
--- /dev/null
+++ b/frame/bounties/src/benchmarking.rs
@@ -0,0 +1,247 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! bounties pallet benchmarking.
+
+#![cfg(feature = "runtime-benchmarks")]
+
+use super::*;
+
+use sp_runtime::traits::Bounded;
+use frame_system::{EventRecord, RawOrigin};
+use frame_benchmarking::{benchmarks, account, whitelisted_caller};
+use frame_support::traits::OnInitialize;
+
+use crate::Module as Bounties;
+use pallet_treasury::Module as Treasury;
+
+const SEED: u32 = 0;
+
+// Create bounties that are approved for use in `on_initialize`.
+fn create_approved_bounties<T: Config>(n: u32) -> Result<(), &'static str> {
+	for i in 0 .. n {
+		let (caller, _curator, _fee, value, reason) = setup_bounty::<T>(i, MAX_BYTES);
+		Bounties::<T>::propose_bounty(RawOrigin::Signed(caller).into(), value, reason)?;
+		let bounty_id = BountyCount::get() - 1;
+		Bounties::<T>::approve_bounty(RawOrigin::Root.into(), bounty_id)?;
+	}
+	ensure!(BountyApprovals::get().len() == n as usize, "Not all bounty approved");
+	Ok(())
+}
+
+// Create the pre-requisite information needed to create a treasury `propose_bounty`.
+fn setup_bounty<T: Config>(u: u32, d: u32) -> (
+	T::AccountId,
+	T::AccountId,
+	BalanceOf<T>,
+	BalanceOf<T>,
+	Vec<u8>,
+) {
+	let caller = account("caller", u, SEED);
+	let value: BalanceOf<T> = T::BountyValueMinimum::get().saturating_mul(100u32.into());
+	let fee = value / 2u32.into();
+	let deposit = T::BountyDepositBase::get() + T::DataDepositPerByte::get() * MAX_BYTES.into();
+	let _ = T::Currency::make_free_balance_be(&caller, deposit);
+	let curator = account("curator", u, SEED);
+	let _ = T::Currency::make_free_balance_be(&curator, fee / 2u32.into());
+	let reason = vec![0; d as usize];
+	(caller, curator, fee, value, reason)
+}
+
+fn create_bounty<T: Config>() -> Result<(
+	<T::Lookup as StaticLookup>::Source,
+	BountyIndex,
+), &'static str> {
+	let (caller, curator, fee, value, reason) = setup_bounty::<T>(0, MAX_BYTES);
+	let curator_lookup = T::Lookup::unlookup(curator.clone());
+	Bounties::<T>::propose_bounty(RawOrigin::Signed(caller).into(), value, reason)?;
+	let bounty_id = BountyCount::get() - 1;
+	Bounties::<T>::approve_bounty(RawOrigin::Root.into(), bounty_id)?;
+	Treasury::<T>::on_initialize(T::BlockNumber::zero());
+	Bounties::<T>::propose_curator(RawOrigin::Root.into(), bounty_id, curator_lookup.clone(), fee)?;
+	Bounties::<T>::accept_curator(RawOrigin::Signed(curator).into(), bounty_id)?;
+	Ok((curator_lookup, bounty_id))
+}
+
+fn setup_pod_account<T: Config>() {
+	let pot_account = Bounties::<T>::account_id();
+	let value = T::Currency::minimum_balance().saturating_mul(1_000_000_000u32.into());
+	let _ = T::Currency::make_free_balance_be(&pot_account, value);
+}
+
+fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
+	let events = frame_system::Module::<T>::events();
+	let system_event: <T as frame_system::Config>::Event = generic_event.into();
+	// compare to the last event record
+	let EventRecord { event, .. } = &events[events.len() - 1];
+	assert_eq!(event, &system_event);
+}
+
+const MAX_BYTES: u32 = 16384;
+
+benchmarks! {
+	_ { }
+
+	propose_bounty {
+		let d in 0 .. MAX_BYTES;
+
+		let (caller, curator, fee, value, description) = setup_bounty::<T>(0, d);
+	}: _(RawOrigin::Signed(caller), value, description)
+
+	approve_bounty {
+		let (caller, curator, fee, value, reason) = setup_bounty::<T>(0, MAX_BYTES);
+		Bounties::<T>::propose_bounty(RawOrigin::Signed(caller).into(), value, reason)?;
+		let bounty_id = BountyCount::get() - 1;
+	}: _(RawOrigin::Root, bounty_id)
+
+	propose_curator {
+		setup_pod_account::<T>();
+		let (caller, curator, fee, value, reason) = setup_bounty::<T>(0, MAX_BYTES);
+		let curator_lookup = T::Lookup::unlookup(curator.clone());
+		Bounties::<T>::propose_bounty(RawOrigin::Signed(caller).into(), value, reason)?;
+		let bounty_id = BountyCount::get() - 1;
+		Bounties::<T>::approve_bounty(RawOrigin::Root.into(), bounty_id)?;
+		Bounties::<T>::on_initialize(T::BlockNumber::zero());
+	}: _(RawOrigin::Root, bounty_id, curator_lookup, fee)
+
+	// Worst case when curator is inactive and any sender unassigns the curator.
+	unassign_curator {
+		setup_pod_account::<T>();
+		let (curator_lookup, bounty_id) = create_bounty::<T>()?;
+		Bounties::<T>::on_initialize(T::BlockNumber::zero());
+		let bounty_id = BountyCount::get() - 1;
+		frame_system::Module::<T>::set_block_number(T::BountyUpdatePeriod::get() + 1u32.into());
+		let caller = whitelisted_caller();
+	}: _(RawOrigin::Signed(caller), bounty_id)
+
+	accept_curator {
+		setup_pod_account::<T>();
+		let (caller, curator, fee, value, reason) = setup_bounty::<T>(0, MAX_BYTES);
+		let curator_lookup = T::Lookup::unlookup(curator.clone());
+		Bounties::<T>::propose_bounty(RawOrigin::Signed(caller).into(), value, reason)?;
+		let bounty_id = BountyCount::get() - 1;
+		Bounties::<T>::approve_bounty(RawOrigin::Root.into(), bounty_id)?;
+		Bounties::<T>::on_initialize(T::BlockNumber::zero());
+		Bounties::<T>::propose_curator(RawOrigin::Root.into(), bounty_id, curator_lookup, fee)?;
+	}: _(RawOrigin::Signed(curator), bounty_id)
+
+	award_bounty {
+		setup_pod_account::<T>();
+		let (curator_lookup, bounty_id) = create_bounty::<T>()?;
+		Bounties::<T>::on_initialize(T::BlockNumber::zero());
+
+		let bounty_id = BountyCount::get() - 1;
+		let curator = T::Lookup::lookup(curator_lookup)?;
+		let beneficiary = T::Lookup::unlookup(account("beneficiary", 0, SEED));
+	}: _(RawOrigin::Signed(curator), bounty_id, beneficiary)
+
+	claim_bounty {
+		setup_pod_account::<T>();
+		let (curator_lookup, bounty_id) = create_bounty::<T>()?;
+		Bounties::<T>::on_initialize(T::BlockNumber::zero());
+
+		let bounty_id = BountyCount::get() - 1;
+		let curator = T::Lookup::lookup(curator_lookup)?;
+
+		let beneficiary_account: T::AccountId = account("beneficiary", 0, SEED);
+		let beneficiary = T::Lookup::unlookup(beneficiary_account.clone());
+		Bounties::<T>::award_bounty(RawOrigin::Signed(curator.clone()).into(), bounty_id, beneficiary)?;
+
+		frame_system::Module::<T>::set_block_number(T::BountyDepositPayoutDelay::get());
+		ensure!(T::Currency::free_balance(&beneficiary_account).is_zero(), "Beneficiary already has balance");
+
+	}: _(RawOrigin::Signed(curator), bounty_id)
+	verify {
+		ensure!(!T::Currency::free_balance(&beneficiary_account).is_zero(), "Beneficiary didn't get paid");
+	}
+
+	close_bounty_proposed {
+		setup_pod_account::<T>();
+		let (caller, curator, fee, value, reason) = setup_bounty::<T>(0, 0);
+		Bounties::<T>::propose_bounty(RawOrigin::Signed(caller).into(), value, reason)?;
+		let bounty_id = BountyCount::get() - 1;
+	}: close_bounty(RawOrigin::Root, bounty_id)
+
+	close_bounty_active {
+		setup_pod_account::<T>();
+		let (curator_lookup, bounty_id) = create_bounty::<T>()?;
+		Bounties::<T>::on_initialize(T::BlockNumber::zero());
+		let bounty_id = BountyCount::get() - 1;
+	}: close_bounty(RawOrigin::Root, bounty_id)
+	verify {
+		assert_last_event::<T>(RawEvent::BountyCanceled(bounty_id).into())
+	}
+
+	extend_bounty_expiry {
+		setup_pod_account::<T>();
+		let (curator_lookup, bounty_id) = create_bounty::<T>()?;
+		Bounties::<T>::on_initialize(T::BlockNumber::zero());
+
+		let bounty_id = BountyCount::get() - 1;
+		let curator = T::Lookup::lookup(curator_lookup)?;
+	}: _(RawOrigin::Signed(curator), bounty_id, Vec::new())
+	verify {
+		assert_last_event::<T>(RawEvent::BountyExtended(bounty_id).into())
+	}
+
+	spend_funds {
+		let b in 1 .. 100;
+		setup_pod_account::<T>();
+		create_approved_bounties::<T>(b)?;
+
+		let mut budget_remaining = BalanceOf::<T>::max_value();
+		let mut imbalance = PositiveImbalanceOf::<T>::zero();
+		let mut total_weight = Weight::zero();
+		let mut missed_any = false;
+	}: {
+		<Bounties<T> as pallet_treasury::SpendFunds<T>>::spend_funds(
+			&mut budget_remaining,
+			&mut imbalance,
+			&mut total_weight,
+			&mut missed_any,
+		);
+	}
+	verify {
+		ensure!(budget_remaining < BalanceOf::<T>::max_value(), "Budget not used");
+		ensure!(missed_any == false, "Missed some");
+		assert_last_event::<T>(RawEvent::BountyBecameActive(b - 1).into())
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use crate::tests::{new_test_ext, Test};
+	use frame_support::assert_ok;
+
+	#[test]
+	fn test_benchmarks() {
+		new_test_ext().execute_with(|| {
+			assert_ok!(test_benchmark_propose_bounty::<Test>());
+			assert_ok!(test_benchmark_approve_bounty::<Test>());
+			assert_ok!(test_benchmark_propose_curator::<Test>());
+			assert_ok!(test_benchmark_unassign_curator::<Test>());
+			assert_ok!(test_benchmark_accept_curator::<Test>());
+			assert_ok!(test_benchmark_award_bounty::<Test>());
+			assert_ok!(test_benchmark_claim_bounty::<Test>());
+			assert_ok!(test_benchmark_close_bounty_proposed::<Test>());
+			assert_ok!(test_benchmark_close_bounty_active::<Test>());
+			assert_ok!(test_benchmark_extend_bounty_expiry::<Test>());
+			assert_ok!(test_benchmark_spend_funds::<Test>());
+		});
+	}
+}
diff --git a/frame/bounties/src/lib.rs b/frame/bounties/src/lib.rs
new file mode 100644
index 000000000000..32a377472622
--- /dev/null
+++ b/frame/bounties/src/lib.rs
@@ -0,0 +1,757 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! # Bounties Module ( pallet-bounties )
+//!
+//! ## Bounty
+//!
+//! > NOTE: This pallet is tightly coupled with pallet-treasury.
+//!
+//! A Bounty Spending is a reward for a specified body of work - or specified set of objectives -
+//! that needs to be executed for a predefined Treasury amount to be paid out. A curator is assigned
+//! after the bounty is approved and funded by Council, to be delegated with the responsibility of
+//! assigning a payout address once the specified set of objectives is completed.
+//!
+//! After the Council has activated a bounty, it delegates the work that requires expertise to a
+//! curator in exchange of a deposit. Once the curator accepts the bounty, they get to close the
+//! active bounty. Closing the active bounty enacts a delayed payout to the payout address, the
+//! curator fee and the return of the curator deposit. The delay allows for intervention through
+//! regular democracy. The Council gets to unassign the curator, resulting in a new curator
+//! election. The Council also gets to cancel the bounty if deemed necessary before assigning a
+//! curator or once the bounty is active or payout is pending, resulting in the slash of the
+//! curator's deposit.
+//!
+//!
+//! ### Terminology
+//!
+//! Bounty:
+//! - **Bounty spending proposal:** A proposal to reward a predefined body of work upon completion
+//!   by the Treasury.
+//! - **Proposer:** An account proposing a bounty spending.
+//! - **Curator:** An account managing the bounty and assigning a payout address receiving the
+//!   reward for the completion of work.
+//! - **Deposit:** The amount held on deposit for placing a bounty proposal plus the amount held on
+//!   deposit per byte within the bounty description.
+//! - **Curator deposit:** The payment from a candidate willing to curate an approved bounty. The
+//!   deposit is returned when/if the bounty is completed.
+//! - **Bounty value:** The total amount that should be paid to the Payout Address if the bounty is
+//!   rewarded.
+//! - **Payout address:** The account to which the total or part of the bounty is assigned to.
+//! - **Payout Delay:** The delay period for which a bounty beneficiary needs to wait before
+//!   claiming.
+//! - **Curator fee:** The reserved upfront payment for a curator for work related to the bounty.
+//!
+//! ## Interface
+//!
+//! ### Dispatchable Functions
+//!
+//! Bounty protocol:
+//! - `propose_bounty` - Propose a specific treasury amount to be earmarked for a predefined set of
+//!   tasks and stake the required deposit.
+//! - `approve_bounty` - Accept a specific treasury amount to be earmarked for a predefined body of
+//!   work.
+//! - `propose_curator` - Assign an account to a bounty as candidate curator.
+//! - `accept_curator` - Accept a bounty assignment from the Council, setting a curator deposit.
+//! - `extend_bounty_expiry` - Extend the expiry block number of the bounty and stay active.
+//! - `award_bounty` - Close and pay out the specified amount for the completed work.
+//! - `claim_bounty` - Claim a specific bounty amount from the Payout Address.
+//! - `unassign_curator` - Unassign an accepted curator from a specific earmark.
+//! - `close_bounty` - Cancel the earmark for a specific treasury amount and close the bounty.
+
+#![cfg_attr(not(feature = "std"), no_std)]
+
+mod tests;
+mod benchmarking;
+pub mod weights;
+
+use sp_std::prelude::*;
+
+use frame_support::{decl_module, decl_storage, decl_event, ensure, decl_error};
+
+use frame_support::traits::{
+	Currency, Get, Imbalance, OnUnbalanced, ExistenceRequirement::{AllowDeath},
+	ReservableCurrency};
+
+use sp_runtime::{Permill, RuntimeDebug, DispatchResult, traits::{
+	Zero, StaticLookup, AccountIdConversion, Saturating, BadOrigin
+}};
+
+use frame_support::dispatch::DispatchResultWithPostInfo;
+use frame_support::traits::{EnsureOrigin};
+
+use frame_support::weights::{Weight};
+
+use codec::{Encode, Decode};
+use frame_system::{self as system, ensure_signed};
+pub use weights::WeightInfo;
+
+type BalanceOf<T> = pallet_treasury::BalanceOf<T>;
+
+type PositiveImbalanceOf<T> = pallet_treasury::PositiveImbalanceOf<T>;
+
+pub trait Config: frame_system::Config + pallet_treasury::Config {
+
+	/// The amount held on deposit for placing a bounty proposal.
+	type BountyDepositBase: Get<BalanceOf<Self>>;
+
+	/// The delay period for which a bounty beneficiary need to wait before claim the payout.
+	type BountyDepositPayoutDelay: Get<Self::BlockNumber>;
+
+	/// Bounty duration in blocks.
+	type BountyUpdatePeriod: Get<Self::BlockNumber>;
+
+	/// Percentage of the curator fee that will be reserved upfront as deposit for bounty curator.
+	type BountyCuratorDeposit: Get<Permill>;
+
+	/// Minimum value for a bounty.
+	type BountyValueMinimum: Get<BalanceOf<Self>>;
+
+	/// The amount held on deposit per byte within the tip report reason or bounty description.
+	type DataDepositPerByte: Get<BalanceOf<Self>>;
+
+	/// The overarching event type.
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
+
+	/// Maximum acceptable reason length.
+	type MaximumReasonLength: Get<u32>;
+
+	/// Weight information for extrinsics in this pallet.
+	type WeightInfo: WeightInfo;
+}
+
+/// An index of a bounty. Just a `u32`.
+pub type BountyIndex = u32;
+
+/// A bounty proposal.
+#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug)]
+pub struct Bounty<AccountId, Balance, BlockNumber> {
+	/// The account proposing it.
+	proposer: AccountId,
+	/// The (total) amount that should be paid if the bounty is rewarded.
+	value: Balance,
+	/// The curator fee. Included in value.
+	fee: Balance,
+	/// The deposit of curator.
+	curator_deposit: Balance,
+	/// The amount held on deposit (reserved) for making this proposal.
+	bond: Balance,
+	/// The status of this bounty.
+	status: BountyStatus<AccountId, BlockNumber>,
+}
+
+/// The status of a bounty proposal.
+#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug)]
+pub enum BountyStatus<AccountId, BlockNumber> {
+	/// The bounty is proposed and waiting for approval.
+	Proposed,
+	/// The bounty is approved and waiting to become active at next spend period.
+	Approved,
+	/// The bounty is funded and waiting for curator assignment.
+	Funded,
+	/// A curator has been proposed by the `ApproveOrigin`. Waiting for acceptance from the curator.
+	CuratorProposed {
+		/// The assigned curator of this bounty.
+		curator: AccountId,
+	},
+	/// The bounty is active and waiting to be awarded.
+	Active {
+		/// The curator of this bounty.
+		curator: AccountId,
+		/// An update from the curator is due by this block, else they are considered inactive.
+		update_due: BlockNumber,
+	},
+	/// The bounty is awarded and waiting to released after a delay.
+	PendingPayout {
+		/// The curator of this bounty.
+		curator: AccountId,
+		/// The beneficiary of the bounty.
+		beneficiary: AccountId,
+		/// When the bounty can be claimed.
+		unlock_at: BlockNumber,
+	},
+}
+
+// Note :: For backward compatability reasons,
+// pallet-bounties uses Treasury for storage.
+// This is temporary solution, soon will get replaced with
+// Own storage identifier.
+decl_storage! {
+	trait Store for Module<T: Config> as Treasury {
+
+		/// Number of bounty proposals that have been made.
+		pub BountyCount get(fn bounty_count): BountyIndex;
+
+		/// Bounties that have been made.
+		pub Bounties get(fn bounties):
+		map hasher(twox_64_concat) BountyIndex
+		=> Option<Bounty<T::AccountId, BalanceOf<T>, T::BlockNumber>>;
+
+		/// The description of each bounty.
+		pub BountyDescriptions get(fn bounty_descriptions): map hasher(twox_64_concat) BountyIndex => Option<Vec<u8>>;
+
+		/// Bounty indices that have been approved but not yet funded.
+		pub BountyApprovals get(fn bounty_approvals): Vec<BountyIndex>;
+	}
+}
+
+decl_event!(
+	pub enum Event<T>
+	where
+		Balance = BalanceOf<T>,
+		<T as frame_system::Config>::AccountId,
+	{
+		/// New bounty proposal. \[index\]
+		BountyProposed(BountyIndex),
+		/// A bounty proposal was rejected; funds were slashed. \[index, bond\]
+		BountyRejected(BountyIndex, Balance),
+		/// A bounty proposal is funded and became active. \[index\]
+		BountyBecameActive(BountyIndex),
+		/// A bounty is awarded to a beneficiary. \[index, beneficiary\]
+		BountyAwarded(BountyIndex, AccountId),
+		/// A bounty is claimed by beneficiary. \[index, payout, beneficiary\]
+		BountyClaimed(BountyIndex, Balance, AccountId),
+		/// A bounty is cancelled. \[index\]
+		BountyCanceled(BountyIndex),
+		/// A bounty expiry is extended. \[index\]
+		BountyExtended(BountyIndex),
+	}
+);
+
+decl_error! {
+	/// Error for the treasury module.
+	pub enum Error for Module<T: Config> {
+		/// Proposer's balance is too low.
+		InsufficientProposersBalance,
+		/// No proposal or bounty at that index.
+		InvalidIndex,
+		/// The reason given is just too big.
+		ReasonTooBig,
+		/// The bounty status is unexpected.
+		UnexpectedStatus,
+		/// Require bounty curator.
+		RequireCurator,
+		/// Invalid bounty value.
+		InvalidValue,
+		/// Invalid bounty fee.
+		InvalidFee,
+		/// A bounty payout is pending.
+		/// To cancel the bounty, you must unassign and slash the curator.
+		PendingPayout,
+		/// The bounties cannot be claimed/closed because it's still in the countdown period.
+		Premature,
+	}
+}
+
+decl_module! {
+	pub struct Module<T: Config>
+		for enum Call
+		where origin: T::Origin
+	{
+		/// The amount held on deposit per byte within bounty description.
+		const DataDepositPerByte: BalanceOf<T> = T::DataDepositPerByte::get();
+
+		/// The amount held on deposit for placing a bounty proposal.
+		const BountyDepositBase: BalanceOf<T> = T::BountyDepositBase::get();
+
+		/// The delay period for which a bounty beneficiary need to wait before claim the payout.
+		const BountyDepositPayoutDelay: T::BlockNumber = T::BountyDepositPayoutDelay::get();
+
+		/// Percentage of the curator fee that will be reserved upfront as deposit for bounty curator.
+		const BountyCuratorDeposit: Permill = T::BountyCuratorDeposit::get();
+
+		/// Minimum value for a bounty.
+		const BountyValueMinimum: BalanceOf<T> = T::BountyValueMinimum::get();
+
+		/// Maximum acceptable reason length.
+		const MaximumReasonLength: u32 = T::MaximumReasonLength::get();
+
+		type Error = Error<T>;
+
+		fn deposit_event() = default;
+
+		/// Propose a new bounty.
+		///
+		/// The dispatch origin for this call must be _Signed_.
+		///
+		/// Payment: `TipReportDepositBase` will be reserved from the origin account, as well as
+		/// `DataDepositPerByte` for each byte in `reason`. It will be unreserved upon approval,
+		/// or slashed when rejected.
+		///
+		/// - `curator`: The curator account whom will manage this bounty.
+		/// - `fee`: The curator fee.
+		/// - `value`: The total payment amount of this bounty, curator fee included.
+		/// - `description`: The description of this bounty.
+		#[weight = <T as Config>::WeightInfo::propose_bounty(description.len() as u32)]
+		fn propose_bounty(
+			origin,
+			#[compact] value: BalanceOf<T>,
+			description: Vec<u8>,
+		) {
+			let proposer = ensure_signed(origin)?;
+			Self::create_bounty(proposer, description, value)?;
+		}
+
+		/// Approve a bounty proposal. At a later time, the bounty will be funded and become active
+		/// and the original deposit will be returned.
+		///
+		/// May only be called from `T::ApproveOrigin`.
+		///
+		/// # <weight>
+		/// - O(1).
+		/// # </weight>
+		#[weight = <T as Config>::WeightInfo::approve_bounty()]
+		fn approve_bounty(origin, #[compact] bounty_id: BountyIndex) {
+			T::ApproveOrigin::ensure_origin(origin)?;
+
+			Bounties::<T>::try_mutate_exists(bounty_id, |maybe_bounty| -> DispatchResult {
+				let mut bounty = maybe_bounty.as_mut().ok_or(Error::<T>::InvalidIndex)?;
+				ensure!(bounty.status == BountyStatus::Proposed, Error::<T>::UnexpectedStatus);
+
+				bounty.status = BountyStatus::Approved;
+
+				BountyApprovals::append(bounty_id);
+
+				Ok(())
+			})?;
+		}
+
+		/// Assign a curator to a funded bounty.
+		///
+		/// May only be called from `T::ApproveOrigin`.
+		///
+		/// # <weight>
+		/// - O(1).
+		/// # </weight>
+		#[weight = <T as Config>::WeightInfo::propose_curator()]
+		fn propose_curator(
+			origin,
+			#[compact] bounty_id: BountyIndex,
+			curator: <T::Lookup as StaticLookup>::Source,
+			#[compact] fee: BalanceOf<T>,
+		) {
+			T::ApproveOrigin::ensure_origin(origin)?;
+
+			let curator = T::Lookup::lookup(curator)?;
+			Bounties::<T>::try_mutate_exists(bounty_id, |maybe_bounty| -> DispatchResult {
+
+				let mut bounty = maybe_bounty.as_mut().ok_or(Error::<T>::InvalidIndex)?;
+				match bounty.status {
+					BountyStatus::Proposed | BountyStatus::Approved | BountyStatus::Funded => {},
+					_ => return Err(Error::<T>::UnexpectedStatus.into()),
+				};
+
+				ensure!(fee < bounty.value, Error::<T>::InvalidFee);
+
+				bounty.status = BountyStatus::CuratorProposed { curator };
+				bounty.fee = fee;
+
+				Ok(())
+			})?;
+		}
+
+		/// Unassign curator from a bounty.
+		///
+		/// This function can only be called by the `RejectOrigin` a signed origin.
+		///
+		/// If this function is called by the `RejectOrigin`, we assume that the curator is malicious
+		/// or inactive. As a result, we will slash the curator when possible.
+		///
+		/// If the origin is the curator, we take this as a sign they are unable to do their job and
+		/// they willingly give up. We could slash them, but for now we allow them to recover their
+		/// deposit and exit without issue. (We may want to change this if it is abused.)
+		///
+		/// Finally, the origin can be anyone if and only if the curator is "inactive". This allows
+		/// anyone in the community to call out that a curator is not doing their due diligence, and
+		/// we should pick a new curator. In this case the curator should also be slashed.
+		///
+		/// # <weight>
+		/// - O(1).
+		/// # </weight>
+		#[weight = <T as Config>::WeightInfo::unassign_curator()]
+		fn unassign_curator(
+			origin,
+			#[compact] bounty_id: BountyIndex,
+		) {
+			let maybe_sender = ensure_signed(origin.clone())
+				.map(Some)
+				.or_else(|_| T::RejectOrigin::ensure_origin(origin).map(|_| None))?;
+
+			Bounties::<T>::try_mutate_exists(bounty_id, |maybe_bounty| -> DispatchResult {
+				let mut bounty = maybe_bounty.as_mut().ok_or(Error::<T>::InvalidIndex)?;
+
+				let slash_curator = |curator: &T::AccountId, curator_deposit: &mut BalanceOf<T>| {
+					let imbalance = T::Currency::slash_reserved(curator, *curator_deposit).0;
+					T::OnSlash::on_unbalanced(imbalance);
+					*curator_deposit = Zero::zero();
+				};
+
+				match bounty.status {
+					BountyStatus::Proposed | BountyStatus::Approved | BountyStatus::Funded => {
+						// No curator to unassign at this point.
+						return Err(Error::<T>::UnexpectedStatus.into())
+					}
+					BountyStatus::CuratorProposed { ref curator } => {
+						// A curator has been proposed, but not accepted yet.
+						// Either `RejectOrigin` or the proposed curator can unassign the curator.
+						ensure!(maybe_sender.map_or(true, |sender| sender == *curator), BadOrigin);
+					},
+					BountyStatus::Active { ref curator, ref update_due } => {
+						// The bounty is active.
+						match maybe_sender {
+							// If the `RejectOrigin` is calling this function, slash the curator.
+							None => {
+								slash_curator(curator, &mut bounty.curator_deposit);
+								// Continue to change bounty status below...
+							},
+							Some(sender) => {
+								// If the sender is not the curator, and the curator is inactive,
+								// slash the curator.
+								if sender != *curator {
+									let block_number = system::Module::<T>::block_number();
+									if *update_due < block_number {
+										slash_curator(curator, &mut bounty.curator_deposit);
+										// Continue to change bounty status below...
+									} else {
+										// Curator has more time to give an update.
+										return Err(Error::<T>::Premature.into())
+									}
+								} else {
+									// Else this is the curator, willingly giving up their role.
+									// Give back their deposit.
+									let _ = T::Currency::unreserve(&curator, bounty.curator_deposit);
+									// Continue to change bounty status below...
+								}
+							},
+						}
+					},
+					BountyStatus::PendingPayout { ref curator, .. } => {
+						// The bounty is pending payout, so only council can unassign a curator.
+						// By doing so, they are claiming the curator is acting maliciously, so
+						// we slash the curator.
+						ensure!(maybe_sender.is_none(), BadOrigin);
+						slash_curator(curator, &mut bounty.curator_deposit);
+						// Continue to change bounty status below...
+					}
+				};
+
+				bounty.status = BountyStatus::Funded;
+				Ok(())
+			})?;
+		}
+
+		/// Accept the curator role for a bounty.
+		/// A deposit will be reserved from curator and refund upon successful payout.
+		///
+		/// May only be called from the curator.
+		///
+		/// # <weight>
+		/// - O(1).
+		/// # </weight>
+		#[weight = <T as Config>::WeightInfo::accept_curator()]
+		fn accept_curator(origin, #[compact] bounty_id: BountyIndex) {
+			let signer = ensure_signed(origin)?;
+
+			Bounties::<T>::try_mutate_exists(bounty_id, |maybe_bounty| -> DispatchResult {
+				let mut bounty = maybe_bounty.as_mut().ok_or(Error::<T>::InvalidIndex)?;
+
+				match bounty.status {
+					BountyStatus::CuratorProposed { ref curator } => {
+						ensure!(signer == *curator, Error::<T>::RequireCurator);
+
+						let deposit = T::BountyCuratorDeposit::get() * bounty.fee;
+						T::Currency::reserve(curator, deposit)?;
+						bounty.curator_deposit = deposit;
+
+						let update_due = system::Module::<T>::block_number() + T::BountyUpdatePeriod::get();
+						bounty.status = BountyStatus::Active { curator: curator.clone(), update_due };
+
+						Ok(())
+					},
+					_ => Err(Error::<T>::UnexpectedStatus.into()),
+				}
+			})?;
+		}
+
+		/// Award bounty to a beneficiary account. The beneficiary will be able to claim the funds after a delay.
+		///
+		/// The dispatch origin for this call must be the curator of this bounty.
+		///
+		/// - `bounty_id`: Bounty ID to award.
+		/// - `beneficiary`: The beneficiary account whom will receive the payout.
+		///
+		/// # <weight>
+		/// - O(1).
+		/// # </weight>
+		#[weight = <T as Config>::WeightInfo::award_bounty()]
+		fn award_bounty(origin, #[compact] bounty_id: BountyIndex, beneficiary: <T::Lookup as StaticLookup>::Source) {
+			let signer = ensure_signed(origin)?;
+			let beneficiary = T::Lookup::lookup(beneficiary)?;
+
+			Bounties::<T>::try_mutate_exists(bounty_id, |maybe_bounty| -> DispatchResult {
+				let mut bounty = maybe_bounty.as_mut().ok_or(Error::<T>::InvalidIndex)?;
+				match &bounty.status {
+					BountyStatus::Active {
+						curator,
+						..
+					} => {
+						ensure!(signer == *curator, Error::<T>::RequireCurator);
+					},
+					_ => return Err(Error::<T>::UnexpectedStatus.into()),
+				}
+				bounty.status = BountyStatus::PendingPayout {
+					curator: signer,
+					beneficiary: beneficiary.clone(),
+					unlock_at: system::Module::<T>::block_number() + T::BountyDepositPayoutDelay::get(),
+				};
+
+				Ok(())
+			})?;
+
+			Self::deposit_event(Event::<T>::BountyAwarded(bounty_id, beneficiary));
+		}
+
+		/// Claim the payout from an awarded bounty after payout delay.
+		///
+		/// The dispatch origin for this call must be the beneficiary of this bounty.
+		///
+		/// - `bounty_id`: Bounty ID to claim.
+		///
+		/// # <weight>
+		/// - O(1).
+		/// # </weight>
+		#[weight = <T as Config>::WeightInfo::claim_bounty()]
+		fn claim_bounty(origin, #[compact] bounty_id: BountyIndex) {
+			let _ = ensure_signed(origin)?; // anyone can trigger claim
+
+			Bounties::<T>::try_mutate_exists(bounty_id, |maybe_bounty| -> DispatchResult {
+				let bounty = maybe_bounty.take().ok_or(Error::<T>::InvalidIndex)?;
+				if let BountyStatus::PendingPayout { curator, beneficiary, unlock_at } = bounty.status {
+					ensure!(system::Module::<T>::block_number() >= unlock_at, Error::<T>::Premature);
+					let bounty_account = Self::bounty_account_id(bounty_id);
+					let balance = T::Currency::free_balance(&bounty_account);
+					let fee = bounty.fee.min(balance); // just to be safe
+					let payout = balance.saturating_sub(fee);
+					let _ = T::Currency::unreserve(&curator, bounty.curator_deposit);
+					let _ = T::Currency::transfer(&bounty_account, &curator, fee, AllowDeath); // should not fail
+					let _ = T::Currency::transfer(&bounty_account, &beneficiary, payout, AllowDeath); // should not fail
+					*maybe_bounty = None;
+
+					BountyDescriptions::remove(bounty_id);
+
+					Self::deposit_event(Event::<T>::BountyClaimed(bounty_id, payout, beneficiary));
+					Ok(())
+				} else {
+					Err(Error::<T>::UnexpectedStatus.into())
+				}
+			})?;
+		}
+
+		/// Cancel a proposed or active bounty. All the funds will be sent to treasury and
+		/// the curator deposit will be unreserved if possible.
+		///
+		/// Only `T::RejectOrigin` is able to cancel a bounty.
+		///
+		/// - `bounty_id`: Bounty ID to cancel.
+		///
+		/// # <weight>
+		/// - O(1).
+		/// # </weight>
+		#[weight = <T as Config>::WeightInfo::close_bounty_proposed().max(<T as Config>::WeightInfo::close_bounty_active())]
+		fn close_bounty(origin, #[compact] bounty_id: BountyIndex) -> DispatchResultWithPostInfo {
+			T::RejectOrigin::ensure_origin(origin)?;
+
+			Bounties::<T>::try_mutate_exists(bounty_id, |maybe_bounty| -> DispatchResultWithPostInfo {
+				let bounty = maybe_bounty.as_ref().ok_or(Error::<T>::InvalidIndex)?;
+
+				match &bounty.status {
+					BountyStatus::Proposed => {
+						// The reject origin would like to cancel a proposed bounty.
+						BountyDescriptions::remove(bounty_id);
+						let value = bounty.bond;
+						let imbalance = T::Currency::slash_reserved(&bounty.proposer, value).0;
+						T::OnSlash::on_unbalanced(imbalance);
+						*maybe_bounty = None;
+
+						Self::deposit_event(Event::<T>::BountyRejected(bounty_id, value));
+						// Return early, nothing else to do.
+						return Ok(Some(<T as Config>::WeightInfo::close_bounty_proposed()).into())
+					},
+					BountyStatus::Approved => {
+						// For weight reasons, we don't allow a council to cancel in this phase.
+						// We ask for them to wait until it is funded before they can cancel.
+						return Err(Error::<T>::UnexpectedStatus.into())
+					},
+					BountyStatus::Funded |
+					BountyStatus::CuratorProposed { .. } => {
+						// Nothing extra to do besides the removal of the bounty below.
+					},
+					BountyStatus::Active { curator, .. } => {
+						// Cancelled by council, refund deposit of the working curator.
+						let _ = T::Currency::unreserve(&curator, bounty.curator_deposit);
+						// Then execute removal of the bounty below.
+					},
+					BountyStatus::PendingPayout { .. } => {
+						// Bounty is already pending payout. If council wants to cancel
+						// this bounty, it should mean the curator was acting maliciously.
+						// So the council should first unassign the curator, slashing their
+						// deposit.
+						return Err(Error::<T>::PendingPayout.into())
+					}
+				}
+
+				let bounty_account = Self::bounty_account_id(bounty_id);
+
+				BountyDescriptions::remove(bounty_id);
+
+				let balance = T::Currency::free_balance(&bounty_account);
+				let _ = T::Currency::transfer(&bounty_account, &Self::account_id(), balance, AllowDeath); // should not fail
+				*maybe_bounty = None;
+
+				Self::deposit_event(Event::<T>::BountyCanceled(bounty_id));
+				Ok(Some(<T as Config>::WeightInfo::close_bounty_active()).into())
+			})
+		}
+
+		/// Extend the expiry time of an active bounty.
+		///
+		/// The dispatch origin for this call must be the curator of this bounty.
+		///
+		/// - `bounty_id`: Bounty ID to extend.
+		/// - `remark`: additional information.
+		///
+		/// # <weight>
+		/// - O(1).
+		/// # </weight>
+		#[weight = <T as Config>::WeightInfo::extend_bounty_expiry()]
+		fn extend_bounty_expiry(origin, #[compact] bounty_id: BountyIndex, _remark: Vec<u8>) {
+			let signer = ensure_signed(origin)?;
+
+			Bounties::<T>::try_mutate_exists(bounty_id, |maybe_bounty| -> DispatchResult {
+				let bounty = maybe_bounty.as_mut().ok_or(Error::<T>::InvalidIndex)?;
+
+				match bounty.status {
+					BountyStatus::Active { ref curator, ref mut update_due } => {
+						ensure!(*curator == signer, Error::<T>::RequireCurator);
+						*update_due = (system::Module::<T>::block_number() + T::BountyUpdatePeriod::get()).max(*update_due);
+					},
+					_ => return Err(Error::<T>::UnexpectedStatus.into()),
+				}
+
+				Ok(())
+			})?;
+
+			Self::deposit_event(Event::<T>::BountyExtended(bounty_id));
+		}
+	}
+}
+
+impl<T: Config> Module<T> {
+	// Add public immutables and private mutables.
+
+	/// The account ID of the treasury pot.
+	///
+	/// This actually does computation. If you need to keep using it, then make sure you cache the
+	/// value and only call this once.
+	pub fn account_id() -> T::AccountId {
+		T::ModuleId::get().into_account()
+	}
+
+	/// The account ID of a bounty account
+	pub fn bounty_account_id(id: BountyIndex) -> T::AccountId {
+		// only use two byte prefix to support 16 byte account id (used by test)
+		// "modl" ++ "py/trsry" ++ "bt" is 14 bytes, and two bytes remaining for bounty index
+		T::ModuleId::get().into_sub_account(("bt", id))
+	}
+
+	fn create_bounty(
+		proposer: T::AccountId,
+		description: Vec<u8>,
+		value: BalanceOf<T>,
+	) -> DispatchResult {
+		ensure!(description.len() <= T::MaximumReasonLength::get() as usize, Error::<T>::ReasonTooBig);
+		ensure!(value >= T::BountyValueMinimum::get(), Error::<T>::InvalidValue);
+
+		let index = Self::bounty_count();
+
+		// reserve deposit for new bounty
+		let bond = T::BountyDepositBase::get()
+			+ T::DataDepositPerByte::get() * (description.len() as u32).into();
+		T::Currency::reserve(&proposer, bond)
+			.map_err(|_| Error::<T>::InsufficientProposersBalance)?;
+
+		BountyCount::put(index + 1);
+
+		let bounty = Bounty {
+			proposer,
+			value,
+			fee: 0u32.into(),
+			curator_deposit: 0u32.into(),
+			bond,
+			status: BountyStatus::Proposed,
+		};
+
+		Bounties::<T>::insert(index, &bounty);
+		BountyDescriptions::insert(index, description);
+
+		Self::deposit_event(RawEvent::BountyProposed(index));
+
+		Ok(())
+	}
+
+}
+
+impl<T: Config> pallet_treasury::SpendFunds<T> for Module<T> {
+	fn spend_funds(
+		budget_remaining: &mut BalanceOf<T>,
+		imbalance: &mut PositiveImbalanceOf<T>,
+		total_weight: &mut Weight,
+		missed_any: &mut bool
+	) {
+		let bounties_len = BountyApprovals::mutate(|v| {
+			let bounties_approval_len = v.len() as u32;
+			v.retain(|&index| {
+				Bounties::<T>::mutate(index, |bounty| {
+					// Should always be true, but shouldn't panic if false or we're screwed.
+					if let Some(bounty) = bounty {
+						if bounty.value <= *budget_remaining {
+							*budget_remaining -= bounty.value;
+
+							bounty.status = BountyStatus::Funded;
+
+							// return their deposit.
+							let _ = T::Currency::unreserve(&bounty.proposer, bounty.bond);
+
+							// fund the bounty account
+							imbalance.subsume(T::Currency::deposit_creating(&Self::bounty_account_id(index), bounty.value));
+
+							Self::deposit_event(RawEvent::BountyBecameActive(index));
+							false
+						} else {
+							*missed_any = true;
+							true
+						}
+					} else {
+						false
+					}
+				})
+			});
+			bounties_approval_len
+		});
+
+		*total_weight += <T as Config>::WeightInfo::spend_funds(bounties_len);
+	}
+}
diff --git a/frame/bounties/src/tests.rs b/frame/bounties/src/tests.rs
new file mode 100644
index 000000000000..4ebff64b4e48
--- /dev/null
+++ b/frame/bounties/src/tests.rs
@@ -0,0 +1,903 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! bounties pallet tests.
+
+#![cfg(test)]
+
+use super::*;
+use std::cell::RefCell;
+
+use frame_support::{
+	assert_noop, assert_ok, impl_outer_origin, parameter_types, weights::Weight,
+	impl_outer_event, traits::{OnInitialize}
+};
+
+use sp_core::H256;
+use sp_runtime::{
+	Perbill, ModuleId,
+	testing::Header,
+	traits::{BlakeTwo256, IdentityLookup, BadOrigin},
+};
+
+impl_outer_origin! {
+	pub enum Origin for Test where system = frame_system {}
+}
+
+mod bounties {
+	// Re-export needed for `impl_outer_event!`.
+	pub use crate::*;
+}
+
+impl_outer_event! {
+	pub enum Event for Test {
+		system<T>,
+		pallet_balances<T>,
+		pallet_treasury<T>,
+		bounties<T>,
+	}
+}
+
+#[derive(Clone, Eq, PartialEq)]
+pub struct Test;
+parameter_types! {
+	pub const BlockHashCount: u64 = 250;
+	pub const MaximumBlockWeight: Weight = 1024;
+	pub const MaximumBlockLength: u32 = 2 * 1024;
+	pub const AvailableBlockRatio: Perbill = Perbill::one();
+}
+impl frame_system::Config for Test {
+	type BaseCallFilter = ();
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
+	type Origin = Origin;
+	type Index = u64;
+	type BlockNumber = u64;
+	type Call = ();
+	type Hash = H256;
+	type Hashing = BlakeTwo256;
+	type AccountId = u128; // u64 is not enough to hold bytes used to generate bounty account
+	type Lookup = IdentityLookup<Self::AccountId>;
+	type Header = Header;
+	type Event = Event;
+	type BlockHashCount = BlockHashCount;
+	type Version = ();
+	type PalletInfo = ();
+	type AccountData = pallet_balances::AccountData<u64>;
+	type OnNewAccount = ();
+	type OnKilledAccount = ();
+	type SystemWeightInfo = ();
+}
+parameter_types! {
+	pub const ExistentialDeposit: u64 = 1;
+}
+impl pallet_balances::Config for Test {
+	type MaxLocks = ();
+	type Balance = u64;
+	type Event = Event;
+	type DustRemoval = ();
+	type ExistentialDeposit = ExistentialDeposit;
+	type AccountStore = System;
+	type WeightInfo = ();
+}
+thread_local! {
+	static TEN_TO_FOURTEEN: RefCell<Vec<u128>> = RefCell::new(vec![10,11,12,13,14]);
+}
+parameter_types! {
+	pub const ProposalBond: Permill = Permill::from_percent(5);
+	pub const ProposalBondMinimum: u64 = 1;
+	pub const SpendPeriod: u64 = 2;
+	pub const Burn: Permill = Permill::from_percent(50);
+	pub const DataDepositPerByte: u64 = 1;
+	pub const TreasuryModuleId: ModuleId = ModuleId(*b"py/trsry");
+}
+// impl pallet_treasury::Config for Test {
+impl pallet_treasury::Config for Test {
+	type ModuleId = TreasuryModuleId;
+	type Currency = pallet_balances::Module<Test>;
+	type ApproveOrigin = frame_system::EnsureRoot<u128>;
+	type RejectOrigin = frame_system::EnsureRoot<u128>;
+	type Event = Event;
+	type OnSlash = ();
+	type ProposalBond = ProposalBond;
+	type ProposalBondMinimum = ProposalBondMinimum;
+	type SpendPeriod = SpendPeriod;
+	type Burn = Burn;
+	type BurnDestination = ();  // Just gets burned.
+	type WeightInfo = ();
+	type SpendFunds = Bounties;
+}
+parameter_types! {
+	pub const BountyDepositBase: u64 = 80;
+	pub const BountyDepositPayoutDelay: u64 = 3;
+	pub const BountyUpdatePeriod: u32 = 20;
+	pub const BountyCuratorDeposit: Permill = Permill::from_percent(50);
+	pub const BountyValueMinimum: u64 = 1;
+	pub const MaximumReasonLength: u32 = 16384;
+}
+impl Config for Test {
+	type Event = Event;
+	type BountyDepositBase = BountyDepositBase;
+	type BountyDepositPayoutDelay = BountyDepositPayoutDelay;
+	type BountyUpdatePeriod = BountyUpdatePeriod;
+	type BountyCuratorDeposit = BountyCuratorDeposit;
+	type BountyValueMinimum = BountyValueMinimum;
+	type DataDepositPerByte = DataDepositPerByte;
+	type MaximumReasonLength = MaximumReasonLength;
+	type WeightInfo = ();
+}
+type System = frame_system::Module<Test>;
+type Balances = pallet_balances::Module<Test>;
+type Treasury = pallet_treasury::Module<Test>;
+type Bounties = Module<Test>;
+
+pub fn new_test_ext() -> sp_io::TestExternalities {
+	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+	pallet_balances::GenesisConfig::<Test>{
+		// Total issuance will be 200 with treasury account initialized at ED.
+		balances: vec![(0, 100), (1, 98), (2, 1)],
+	}.assimilate_storage(&mut t).unwrap();
+	pallet_treasury::GenesisConfig::default().assimilate_storage::<Test, _>(&mut t).unwrap();
+	t.into()
+}
+
+fn last_event() -> RawEvent<u64, u128> {
+	System::events().into_iter().map(|r| r.event)
+		.filter_map(|e| {
+			if let Event::bounties(inner) = e { Some(inner) } else { None }
+		})
+		.last()
+		.unwrap()
+}
+
+#[test]
+fn genesis_config_works() {
+	new_test_ext().execute_with(|| {
+		assert_eq!(Treasury::pot(), 0);
+		assert_eq!(Treasury::proposal_count(), 0);
+	});
+}
+
+#[test]
+fn minting_works() {
+	new_test_ext().execute_with(|| {
+		// Check that accumulate works when we have Some value in Dummy already.
+		Balances::make_free_balance_be(&Treasury::account_id(), 101);
+		assert_eq!(Treasury::pot(), 100);
+	});
+}
+
+#[test]
+fn spend_proposal_takes_min_deposit() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Treasury::propose_spend(Origin::signed(0), 1, 3));
+		assert_eq!(Balances::free_balance(0), 99);
+		assert_eq!(Balances::reserved_balance(0), 1);
+	});
+}
+
+#[test]
+fn spend_proposal_takes_proportional_deposit() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Treasury::propose_spend(Origin::signed(0), 100, 3));
+		assert_eq!(Balances::free_balance(0), 95);
+		assert_eq!(Balances::reserved_balance(0), 5);
+	});
+}
+
+#[test]
+fn spend_proposal_fails_when_proposer_poor() {
+	new_test_ext().execute_with(|| {
+		assert_noop!(
+			Treasury::propose_spend(Origin::signed(2), 100, 3),
+			Error::<Test>::InsufficientProposersBalance,
+		);
+	});
+}
+
+#[test]
+fn accepted_spend_proposal_ignored_outside_spend_period() {
+	new_test_ext().execute_with(|| {
+		Balances::make_free_balance_be(&Treasury::account_id(), 101);
+
+		assert_ok!(Treasury::propose_spend(Origin::signed(0), 100, 3));
+		assert_ok!(Treasury::approve_proposal(Origin::root(), 0));
+
+		<Treasury as OnInitialize<u64>>::on_initialize(1);
+		assert_eq!(Balances::free_balance(3), 0);
+		assert_eq!(Treasury::pot(), 100);
+	});
+}
+
+#[test]
+fn unused_pot_should_diminish() {
+	new_test_ext().execute_with(|| {
+		let init_total_issuance = Balances::total_issuance();
+		Balances::make_free_balance_be(&Treasury::account_id(), 101);
+		assert_eq!(Balances::total_issuance(), init_total_issuance + 100);
+
+		<Treasury as OnInitialize<u64>>::on_initialize(2);
+		assert_eq!(Treasury::pot(), 50);
+		assert_eq!(Balances::total_issuance(), init_total_issuance + 50);
+	});
+}
+
+#[test]
+fn rejected_spend_proposal_ignored_on_spend_period() {
+	new_test_ext().execute_with(|| {
+		Balances::make_free_balance_be(&Treasury::account_id(), 101);
+
+		assert_ok!(Treasury::propose_spend(Origin::signed(0), 100, 3));
+		assert_ok!(Treasury::reject_proposal(Origin::root(), 0));
+
+		<Treasury as OnInitialize<u64>>::on_initialize(2);
+		assert_eq!(Balances::free_balance(3), 0);
+		assert_eq!(Treasury::pot(), 50);
+	});
+}
+
+#[test]
+fn reject_already_rejected_spend_proposal_fails() {
+	new_test_ext().execute_with(|| {
+		Balances::make_free_balance_be(&Treasury::account_id(), 101);
+
+		assert_ok!(Treasury::propose_spend(Origin::signed(0), 100, 3));
+		assert_ok!(Treasury::reject_proposal(Origin::root(), 0));
+		assert_noop!(Treasury::reject_proposal(Origin::root(), 0), Error::<Test>::InvalidIndex);
+	});
+}
+
+#[test]
+fn reject_non_existent_spend_proposal_fails() {
+	new_test_ext().execute_with(|| {
+		assert_noop!(Treasury::reject_proposal(Origin::root(), 0), Error::<Test>::InvalidIndex);
+	});
+}
+
+#[test]
+fn accept_non_existent_spend_proposal_fails() {
+	new_test_ext().execute_with(|| {
+		assert_noop!(Treasury::approve_proposal(Origin::root(), 0), Error::<Test>::InvalidIndex);
+	});
+}
+
+#[test]
+fn accept_already_rejected_spend_proposal_fails() {
+	new_test_ext().execute_with(|| {
+		Balances::make_free_balance_be(&Treasury::account_id(), 101);
+
+		assert_ok!(Treasury::propose_spend(Origin::signed(0), 100, 3));
+		assert_ok!(Treasury::reject_proposal(Origin::root(), 0));
+		assert_noop!(Treasury::approve_proposal(Origin::root(), 0), Error::<Test>::InvalidIndex);
+	});
+}
+
+#[test]
+fn accepted_spend_proposal_enacted_on_spend_period() {
+	new_test_ext().execute_with(|| {
+		Balances::make_free_balance_be(&Treasury::account_id(), 101);
+		assert_eq!(Treasury::pot(), 100);
+
+		assert_ok!(Treasury::propose_spend(Origin::signed(0), 100, 3));
+		assert_ok!(Treasury::approve_proposal(Origin::root(), 0));
+
+		<Treasury as OnInitialize<u64>>::on_initialize(2);
+		assert_eq!(Balances::free_balance(3), 100);
+		assert_eq!(Treasury::pot(), 0);
+	});
+}
+
+#[test]
+fn pot_underflow_should_not_diminish() {
+	new_test_ext().execute_with(|| {
+		Balances::make_free_balance_be(&Treasury::account_id(), 101);
+		assert_eq!(Treasury::pot(), 100);
+
+		assert_ok!(Treasury::propose_spend(Origin::signed(0), 150, 3));
+		assert_ok!(Treasury::approve_proposal(Origin::root(), 0));
+
+		<Treasury as OnInitialize<u64>>::on_initialize(2);
+		assert_eq!(Treasury::pot(), 100); // Pot hasn't changed
+
+		let _ = Balances::deposit_into_existing(&Treasury::account_id(), 100).unwrap();
+		<Treasury as OnInitialize<u64>>::on_initialize(4);
+		assert_eq!(Balances::free_balance(3), 150); // Fund has been spent
+		assert_eq!(Treasury::pot(), 25); // Pot has finally changed
+	});
+}
+
+// Treasury account doesn't get deleted if amount approved to spend is all its free balance.
+// i.e. pot should not include existential deposit needed for account survival.
+#[test]
+fn treasury_account_doesnt_get_deleted() {
+	new_test_ext().execute_with(|| {
+		Balances::make_free_balance_be(&Treasury::account_id(), 101);
+		assert_eq!(Treasury::pot(), 100);
+		let treasury_balance = Balances::free_balance(&Treasury::account_id());
+
+		assert_ok!(Treasury::propose_spend(Origin::signed(0), treasury_balance, 3));
+		assert_ok!(Treasury::approve_proposal(Origin::root(), 0));
+
+		<Treasury as OnInitialize<u64>>::on_initialize(2);
+		assert_eq!(Treasury::pot(), 100); // Pot hasn't changed
+
+		assert_ok!(Treasury::propose_spend(Origin::signed(0), Treasury::pot(), 3));
+		assert_ok!(Treasury::approve_proposal(Origin::root(), 1));
+
+		<Treasury as OnInitialize<u64>>::on_initialize(4);
+		assert_eq!(Treasury::pot(), 0); // Pot is emptied
+		assert_eq!(Balances::free_balance(Treasury::account_id()), 1); // but the account is still there
+	});
+}
+
+// In case treasury account is not existing then it works fine.
+// This is useful for chain that will just update runtime.
+#[test]
+fn inexistent_account_works() {
+	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+	pallet_balances::GenesisConfig::<Test>{
+		balances: vec![(0, 100), (1, 99), (2, 1)],
+	}.assimilate_storage(&mut t).unwrap();
+	// Treasury genesis config is not build thus treasury account does not exist
+	let mut t: sp_io::TestExternalities = t.into();
+
+	t.execute_with(|| {
+		assert_eq!(Balances::free_balance(Treasury::account_id()), 0); // Account does not exist
+		assert_eq!(Treasury::pot(), 0); // Pot is empty
+
+		assert_ok!(Treasury::propose_spend(Origin::signed(0), 99, 3));
+		assert_ok!(Treasury::approve_proposal(Origin::root(), 0));
+		assert_ok!(Treasury::propose_spend(Origin::signed(0), 1, 3));
+		assert_ok!(Treasury::approve_proposal(Origin::root(), 1));
+		<Treasury as OnInitialize<u64>>::on_initialize(2);
+		assert_eq!(Treasury::pot(), 0); // Pot hasn't changed
+		assert_eq!(Balances::free_balance(3), 0); // Balance of `3` hasn't changed
+
+		Balances::make_free_balance_be(&Treasury::account_id(), 100);
+		assert_eq!(Treasury::pot(), 99); // Pot now contains funds
+		assert_eq!(Balances::free_balance(Treasury::account_id()), 100); // Account does exist
+
+		<Treasury as OnInitialize<u64>>::on_initialize(4);
+
+		assert_eq!(Treasury::pot(), 0); // Pot has changed
+		assert_eq!(Balances::free_balance(3), 99); // Balance of `3` has changed
+	});
+}
+
+#[test]
+fn propose_bounty_works() {
+	new_test_ext().execute_with(|| {
+		System::set_block_number(1);
+
+		Balances::make_free_balance_be(&Treasury::account_id(), 101);
+		assert_eq!(Treasury::pot(), 100);
+
+		assert_ok!(Bounties::propose_bounty(Origin::signed(0), 10, b"1234567890".to_vec()));
+
+		assert_eq!(last_event(), RawEvent::BountyProposed(0));
+
+		let deposit: u64 = 85 + 5;
+		assert_eq!(Balances::reserved_balance(0), deposit);
+		assert_eq!(Balances::free_balance(0), 100 - deposit);
+
+		assert_eq!(Bounties::bounties(0).unwrap(), Bounty {
+			proposer: 0,
+			fee: 0,
+			curator_deposit: 0,
+			value: 10,
+			bond: deposit,
+			status: BountyStatus::Proposed,
+		});
+
+		assert_eq!(Bounties::bounty_descriptions(0).unwrap(), b"1234567890".to_vec());
+
+		assert_eq!(Bounties::bounty_count(), 1);
+	});
+}
+
+#[test]
+fn propose_bounty_validation_works() {
+	new_test_ext().execute_with(|| {
+		System::set_block_number(1);
+
+		Balances::make_free_balance_be(&Treasury::account_id(), 101);
+		assert_eq!(Treasury::pot(), 100);
+
+		assert_noop!(
+			Bounties::propose_bounty(Origin::signed(1), 0, [0; 17_000].to_vec()),
+			Error::<Test>::ReasonTooBig
+		);
+
+		assert_noop!(
+			Bounties::propose_bounty(Origin::signed(1), 10, b"12345678901234567890".to_vec()),
+			Error::<Test>::InsufficientProposersBalance
+		);
+
+		assert_noop!(
+			Bounties::propose_bounty(Origin::signed(1), 0, b"12345678901234567890".to_vec()),
+			Error::<Test>::InvalidValue
+		);
+	});
+}
+
+#[test]
+fn close_bounty_works() {
+	new_test_ext().execute_with(|| {
+		System::set_block_number(1);
+		Balances::make_free_balance_be(&Treasury::account_id(), 101);
+		assert_noop!(Bounties::close_bounty(Origin::root(), 0), Error::<Test>::InvalidIndex);
+
+		assert_ok!(Bounties::propose_bounty(Origin::signed(0), 10, b"12345".to_vec()));
+
+		assert_ok!(Bounties::close_bounty(Origin::root(), 0));
+
+		let deposit: u64 = 80 + 5;
+
+		assert_eq!(last_event(), RawEvent::BountyRejected(0, deposit));
+
+		assert_eq!(Balances::reserved_balance(0), 0);
+		assert_eq!(Balances::free_balance(0), 100 - deposit);
+
+		assert_eq!(Bounties::bounties(0), None);
+		assert!(!pallet_treasury::Proposals::<Test>::contains_key(0));
+
+		assert_eq!(Bounties::bounty_descriptions(0), None);
+	});
+}
+
+#[test]
+fn approve_bounty_works() {
+	new_test_ext().execute_with(|| {
+		System::set_block_number(1);
+		Balances::make_free_balance_be(&Treasury::account_id(), 101);
+		assert_noop!(Bounties::approve_bounty(Origin::root(), 0), Error::<Test>::InvalidIndex);
+
+		assert_ok!(Bounties::propose_bounty(Origin::signed(0), 50, b"12345".to_vec()));
+
+		assert_ok!(Bounties::approve_bounty(Origin::root(), 0));
+
+		let deposit: u64 = 80 + 5;
+
+		assert_eq!(Bounties::bounties(0).unwrap(), Bounty {
+			proposer: 0,
+			fee: 0,
+			value: 50,
+			curator_deposit: 0,
+			bond: deposit,
+			status: BountyStatus::Approved,
+		});
+		assert_eq!(Bounties::bounty_approvals(), vec![0]);
+
+		assert_noop!(Bounties::close_bounty(Origin::root(), 0), Error::<Test>::UnexpectedStatus);
+
+		// deposit not returned yet
+		assert_eq!(Balances::reserved_balance(0), deposit);
+		assert_eq!(Balances::free_balance(0), 100 - deposit);
+
+		<Treasury as OnInitialize<u64>>::on_initialize(2);
+
+		// return deposit
+		assert_eq!(Balances::reserved_balance(0), 0);
+		assert_eq!(Balances::free_balance(0), 100);
+
+		assert_eq!(Bounties::bounties(0).unwrap(), Bounty {
+			proposer: 0,
+			fee: 0,
+			curator_deposit: 0,
+			value: 50,
+			bond: deposit,
+			status: BountyStatus::Funded,
+		});
+
+		assert_eq!(Treasury::pot(), 100 - 50 - 25); // burn 25
+		assert_eq!(Balances::free_balance(Bounties::bounty_account_id(0)), 50);
+	});
+}
+
+#[test]
+fn assign_curator_works() {
+	new_test_ext().execute_with(|| {
+		System::set_block_number(1);
+		Balances::make_free_balance_be(&Treasury::account_id(), 101);
+
+		assert_noop!(Bounties::propose_curator(Origin::root(), 0, 4, 4), Error::<Test>::InvalidIndex);
+
+		assert_ok!(Bounties::propose_bounty(Origin::signed(0), 50, b"12345".to_vec()));
+
+		assert_ok!(Bounties::approve_bounty(Origin::root(), 0));
+
+		System::set_block_number(2);
+		<Treasury as OnInitialize<u64>>::on_initialize(2);
+
+		assert_noop!(Bounties::propose_curator(Origin::root(), 0, 4, 50), Error::<Test>::InvalidFee);
+
+		assert_ok!(Bounties::propose_curator(Origin::root(), 0, 4, 4));
+
+		assert_eq!(Bounties::bounties(0).unwrap(), Bounty {
+			proposer: 0,
+			fee: 4,
+			curator_deposit: 0,
+			value: 50,
+			bond: 85,
+			status: BountyStatus::CuratorProposed {
+				curator: 4,
+			},
+		});
+
+		assert_noop!(Bounties::accept_curator(Origin::signed(1), 0), Error::<Test>::RequireCurator);
+		assert_noop!(Bounties::accept_curator(Origin::signed(4), 0), pallet_balances::Error::<Test, _>::InsufficientBalance);
+
+		Balances::make_free_balance_be(&4, 10);
+
+		assert_ok!(Bounties::accept_curator(Origin::signed(4), 0));
+
+		assert_eq!(Bounties::bounties(0).unwrap(), Bounty {
+			proposer: 0,
+			fee: 4,
+			curator_deposit: 2,
+			value: 50,
+			bond: 85,
+			status: BountyStatus::Active {
+				curator: 4,
+				update_due: 22,
+			},
+		});
+
+		assert_eq!(Balances::free_balance(&4), 8);
+		assert_eq!(Balances::reserved_balance(&4), 2);
+	});
+}
+
+#[test]
+fn unassign_curator_works() {
+	new_test_ext().execute_with(|| {
+		System::set_block_number(1);
+		Balances::make_free_balance_be(&Treasury::account_id(), 101);
+		assert_ok!(Bounties::propose_bounty(Origin::signed(0), 50, b"12345".to_vec()));
+
+		assert_ok!(Bounties::approve_bounty(Origin::root(), 0));
+
+		System::set_block_number(2);
+		<Treasury as OnInitialize<u64>>::on_initialize(2);
+
+		assert_ok!(Bounties::propose_curator(Origin::root(), 0, 4, 4));
+
+		assert_noop!(Bounties::unassign_curator(Origin::signed(1), 0), BadOrigin);
+
+		assert_ok!(Bounties::unassign_curator(Origin::signed(4), 0));
+
+		assert_eq!(Bounties::bounties(0).unwrap(), Bounty {
+			proposer: 0,
+			fee: 4,
+			curator_deposit: 0,
+			value: 50,
+			bond: 85,
+			status: BountyStatus::Funded,
+		});
+
+		assert_ok!(Bounties::propose_curator(Origin::root(), 0, 4, 4));
+
+		Balances::make_free_balance_be(&4, 10);
+
+		assert_ok!(Bounties::accept_curator(Origin::signed(4), 0));
+
+		assert_ok!(Bounties::unassign_curator(Origin::root(), 0));
+
+		assert_eq!(Bounties::bounties(0).unwrap(), Bounty {
+			proposer: 0,
+			fee: 4,
+			curator_deposit: 0,
+			value: 50,
+			bond: 85,
+			status: BountyStatus::Funded,
+		});
+
+		assert_eq!(Balances::free_balance(&4), 8);
+		assert_eq!(Balances::reserved_balance(&4), 0); // slashed 2
+	});
+}
+
+
+#[test]
+fn award_and_claim_bounty_works() {
+	new_test_ext().execute_with(|| {
+		System::set_block_number(1);
+		Balances::make_free_balance_be(&Treasury::account_id(), 101);
+		Balances::make_free_balance_be(&4, 10);
+		assert_ok!(Bounties::propose_bounty(Origin::signed(0), 50, b"12345".to_vec()));
+
+		assert_ok!(Bounties::approve_bounty(Origin::root(), 0));
+
+		System::set_block_number(2);
+		<Treasury as OnInitialize<u64>>::on_initialize(2);
+
+		assert_ok!(Bounties::propose_curator(Origin::root(), 0, 4, 4));
+		assert_ok!(Bounties::accept_curator(Origin::signed(4), 0));
+
+		assert_eq!(Balances::free_balance(4), 8); // inital 10 - 2 deposit
+
+		assert_noop!(Bounties::award_bounty(Origin::signed(1), 0, 3), Error::<Test>::RequireCurator);
+
+		assert_ok!(Bounties::award_bounty(Origin::signed(4), 0, 3));
+
+		assert_eq!(Bounties::bounties(0).unwrap(), Bounty {
+			proposer: 0,
+			fee: 4,
+			curator_deposit: 2,
+			value: 50,
+			bond: 85,
+			status: BountyStatus::PendingPayout {
+				curator: 4,
+				beneficiary: 3,
+				unlock_at: 5
+			},
+		});
+
+		assert_noop!(Bounties::claim_bounty(Origin::signed(1), 0), Error::<Test>::Premature);
+
+		System::set_block_number(5);
+		<Treasury as OnInitialize<u64>>::on_initialize(5);
+
+		assert_ok!(Balances::transfer(Origin::signed(0), Bounties::bounty_account_id(0), 10));
+
+		assert_ok!(Bounties::claim_bounty(Origin::signed(1), 0));
+
+		assert_eq!(last_event(), RawEvent::BountyClaimed(0, 56, 3));
+
+		assert_eq!(Balances::free_balance(4), 14); // initial 10 + fee 4
+
+		assert_eq!(Balances::free_balance(3), 56);
+		assert_eq!(Balances::free_balance(Bounties::bounty_account_id(0)), 0);
+
+		assert_eq!(Bounties::bounties(0), None);
+		assert_eq!(Bounties::bounty_descriptions(0), None);
+	});
+}
+
+#[test]
+fn claim_handles_high_fee() {
+	new_test_ext().execute_with(|| {
+		System::set_block_number(1);
+		Balances::make_free_balance_be(&Treasury::account_id(), 101);
+		Balances::make_free_balance_be(&4, 30);
+		assert_ok!(Bounties::propose_bounty(Origin::signed(0), 50, b"12345".to_vec()));
+
+		assert_ok!(Bounties::approve_bounty(Origin::root(), 0));
+
+		System::set_block_number(2);
+		<Treasury as OnInitialize<u64>>::on_initialize(2);
+
+		assert_ok!(Bounties::propose_curator(Origin::root(), 0, 4, 49));
+		assert_ok!(Bounties::accept_curator(Origin::signed(4), 0));
+
+		assert_ok!(Bounties::award_bounty(Origin::signed(4), 0, 3));
+
+		System::set_block_number(5);
+		<Treasury as OnInitialize<u64>>::on_initialize(5);
+
+		// make fee > balance
+		let _ = Balances::slash(&Bounties::bounty_account_id(0), 10);
+
+		assert_ok!(Bounties::claim_bounty(Origin::signed(1), 0));
+
+		assert_eq!(last_event(), RawEvent::BountyClaimed(0, 0, 3));
+
+		assert_eq!(Balances::free_balance(4), 70); // 30 + 50 - 10
+		assert_eq!(Balances::free_balance(3), 0);
+		assert_eq!(Balances::free_balance(Bounties::bounty_account_id(0)), 0);
+
+		assert_eq!(Bounties::bounties(0), None);
+		assert_eq!(Bounties::bounty_descriptions(0), None);
+	});
+}
+
+#[test]
+fn cancel_and_refund() {
+	new_test_ext().execute_with(|| {
+
+		System::set_block_number(1);
+
+		Balances::make_free_balance_be(&Treasury::account_id(), 101);
+
+		assert_ok!(Bounties::propose_bounty(Origin::signed(0), 50, b"12345".to_vec()));
+
+		assert_ok!(Bounties::approve_bounty(Origin::root(), 0));
+
+		System::set_block_number(2);
+		<Treasury as OnInitialize<u64>>::on_initialize(2);
+
+		assert_ok!(Balances::transfer(Origin::signed(0), Bounties::bounty_account_id(0), 10));
+
+		assert_eq!(Bounties::bounties(0).unwrap(), Bounty {
+			proposer: 0,
+			fee: 0,
+			curator_deposit: 0,
+			value: 50,
+			bond: 85,
+			status: BountyStatus::Funded,
+		});
+
+		assert_eq!(Balances::free_balance(Bounties::bounty_account_id(0)), 60);
+
+		assert_noop!(Bounties::close_bounty(Origin::signed(0), 0), BadOrigin);
+
+		assert_ok!(Bounties::close_bounty(Origin::root(), 0));
+
+		assert_eq!(Treasury::pot(), 85); // - 25 + 10
+
+	});
+
+}
+
+#[test]
+fn award_and_cancel() {
+	new_test_ext().execute_with(|| {
+		System::set_block_number(1);
+		Balances::make_free_balance_be(&Treasury::account_id(), 101);
+		assert_ok!(Bounties::propose_bounty(Origin::signed(0), 50, b"12345".to_vec()));
+
+		assert_ok!(Bounties::approve_bounty(Origin::root(), 0));
+
+		System::set_block_number(2);
+		<Treasury as OnInitialize<u64>>::on_initialize(2);
+
+		assert_ok!(Bounties::propose_curator(Origin::root(), 0, 0, 10));
+		assert_ok!(Bounties::accept_curator(Origin::signed(0), 0));
+
+		assert_eq!(Balances::free_balance(0), 95);
+		assert_eq!(Balances::reserved_balance(0), 5);
+
+		assert_ok!(Bounties::award_bounty(Origin::signed(0), 0, 3));
+
+		// Cannot close bounty directly when payout is happening...
+		assert_noop!(Bounties::close_bounty(Origin::root(), 0), Error::<Test>::PendingPayout);
+
+		// Instead unassign the curator to slash them and then close.
+		assert_ok!(Bounties::unassign_curator(Origin::root(), 0));
+		assert_ok!(Bounties::close_bounty(Origin::root(), 0));
+
+		assert_eq!(last_event(), RawEvent::BountyCanceled(0));
+
+		assert_eq!(Balances::free_balance(Bounties::bounty_account_id(0)), 0);
+
+		// Slashed.
+		assert_eq!(Balances::free_balance(0), 95);
+		assert_eq!(Balances::reserved_balance(0), 0);
+
+		assert_eq!(Bounties::bounties(0), None);
+		assert_eq!(Bounties::bounty_descriptions(0), None);
+	});
+}
+
+#[test]
+fn expire_and_unassign() {
+	new_test_ext().execute_with(|| {
+		System::set_block_number(1);
+		Balances::make_free_balance_be(&Treasury::account_id(), 101);
+		assert_ok!(Bounties::propose_bounty(Origin::signed(0), 50, b"12345".to_vec()));
+
+		assert_ok!(Bounties::approve_bounty(Origin::root(), 0));
+
+		System::set_block_number(2);
+		<Treasury as OnInitialize<u64>>::on_initialize(2);
+
+		assert_ok!(Bounties::propose_curator(Origin::root(), 0, 1, 10));
+		assert_ok!(Bounties::accept_curator(Origin::signed(1), 0));
+
+		assert_eq!(Balances::free_balance(1), 93);
+		assert_eq!(Balances::reserved_balance(1), 5);
+
+		System::set_block_number(22);
+		<Treasury as OnInitialize<u64>>::on_initialize(22);
+
+		assert_noop!(Bounties::unassign_curator(Origin::signed(0), 0), Error::<Test>::Premature);
+
+		System::set_block_number(23);
+		<Treasury as OnInitialize<u64>>::on_initialize(23);
+
+		assert_ok!(Bounties::unassign_curator(Origin::signed(0), 0));
+
+		assert_eq!(Bounties::bounties(0).unwrap(), Bounty {
+			proposer: 0,
+			fee: 10,
+			curator_deposit: 0,
+			value: 50,
+			bond: 85,
+			status: BountyStatus::Funded,
+		});
+
+		assert_eq!(Balances::free_balance(1), 93);
+		assert_eq!(Balances::reserved_balance(1), 0); // slashed
+
+	});
+}
+
+#[test]
+fn extend_expiry() {
+	new_test_ext().execute_with(|| {
+		System::set_block_number(1);
+		Balances::make_free_balance_be(&Treasury::account_id(), 101);
+		Balances::make_free_balance_be(&4, 10);
+		assert_ok!(Bounties::propose_bounty(Origin::signed(0), 50, b"12345".to_vec()));
+
+		assert_ok!(Bounties::approve_bounty(Origin::root(), 0));
+
+		assert_noop!(Bounties::extend_bounty_expiry(Origin::signed(1), 0, Vec::new()), Error::<Test>::UnexpectedStatus);
+
+		System::set_block_number(2);
+		<Treasury as OnInitialize<u64>>::on_initialize(2);
+
+		assert_ok!(Bounties::propose_curator(Origin::root(), 0, 4, 10));
+		assert_ok!(Bounties::accept_curator(Origin::signed(4), 0));
+
+		assert_eq!(Balances::free_balance(4), 5);
+		assert_eq!(Balances::reserved_balance(4), 5);
+
+		System::set_block_number(10);
+		<Treasury as OnInitialize<u64>>::on_initialize(10);
+
+		assert_noop!(Bounties::extend_bounty_expiry(Origin::signed(0), 0, Vec::new()), Error::<Test>::RequireCurator);
+		assert_ok!(Bounties::extend_bounty_expiry(Origin::signed(4), 0, Vec::new()));
+
+		assert_eq!(Bounties::bounties(0).unwrap(), Bounty {
+			proposer: 0,
+			fee: 10,
+			curator_deposit: 5,
+			value: 50,
+			bond: 85,
+			status: BountyStatus::Active { curator: 4, update_due: 30 },
+		});
+
+		assert_ok!(Bounties::extend_bounty_expiry(Origin::signed(4), 0, Vec::new()));
+
+		assert_eq!(Bounties::bounties(0).unwrap(), Bounty {
+			proposer: 0,
+			fee: 10,
+			curator_deposit: 5,
+			value: 50,
+			bond: 85,
+			status: BountyStatus::Active { curator: 4, update_due: 30 }, // still the same
+		});
+
+		System::set_block_number(25);
+		<Treasury as OnInitialize<u64>>::on_initialize(25);
+
+		assert_noop!(Bounties::unassign_curator(Origin::signed(0), 0), Error::<Test>::Premature);
+		assert_ok!(Bounties::unassign_curator(Origin::signed(4), 0));
+
+		assert_eq!(Balances::free_balance(4), 10); // not slashed
+		assert_eq!(Balances::reserved_balance(4), 0);
+	});
+}
+
+#[test]
+fn genesis_funding_works() {
+	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+	let initial_funding = 100;
+	pallet_balances::GenesisConfig::<Test>{
+		// Total issuance will be 200 with treasury account initialized with 100.
+		balances: vec![(0, 100), (Treasury::account_id(), initial_funding)],
+	}.assimilate_storage(&mut t).unwrap();
+	pallet_treasury::GenesisConfig::default().assimilate_storage::<Test, _>(&mut t).unwrap();
+	let mut t: sp_io::TestExternalities = t.into();
+
+	t.execute_with(|| {
+		assert_eq!(Balances::free_balance(Treasury::account_id()), initial_funding);
+		assert_eq!(Treasury::pot(), initial_funding - Balances::minimum_balance());
+	});
+}
diff --git a/frame/bounties/src/weights.rs b/frame/bounties/src/weights.rs
new file mode 100644
index 000000000000..6ba1b9d32b10
--- /dev/null
+++ b/frame/bounties/src/weights.rs
@@ -0,0 +1,189 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Autogenerated weights for pallet_bounties
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
+//! DATE: 2020-12-16, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
+
+// Executed Command:
+// ./target/release/substrate
+// benchmark
+// --chain=dev
+// --steps=50
+// --repeat=20
+// --pallet=pallet_bounties
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./frame/bounties/src/weights.rs
+// --template=./.maintain/frame-weight-template.hbs
+
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for pallet_bounties.
+pub trait WeightInfo {
+	fn propose_bounty(d: u32, ) -> Weight;
+	fn approve_bounty() -> Weight;
+	fn propose_curator() -> Weight;
+	fn unassign_curator() -> Weight;
+	fn accept_curator() -> Weight;
+	fn award_bounty() -> Weight;
+	fn claim_bounty() -> Weight;
+	fn close_bounty_proposed() -> Weight;
+	fn close_bounty_active() -> Weight;
+	fn extend_bounty_expiry() -> Weight;
+	fn spend_funds(b: u32, ) -> Weight;
+}
+
+/// Weights for pallet_bounties using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	fn propose_bounty(d: u32, ) -> Weight {
+		(64_778_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((1_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(4 as Weight))
+	}
+	fn approve_bounty() -> Weight {
+		(18_293_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+	}
+	fn propose_curator() -> Weight {
+		(14_248_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn unassign_curator() -> Weight {
+		(52_100_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+	}
+	fn accept_curator() -> Weight {
+		(52_564_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+	}
+	fn award_bounty() -> Weight {
+		(37_426_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn claim_bounty() -> Weight {
+		(176_077_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().writes(5 as Weight))
+	}
+	fn close_bounty_proposed() -> Weight {
+		(51_162_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+	}
+	fn close_bounty_active() -> Weight {
+		(116_907_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(4 as Weight))
+	}
+	fn extend_bounty_expiry() -> Weight {
+		(36_419_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn spend_funds(b: u32, ) -> Weight {
+		(7_562_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((77_328_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(b as Weight)))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(b as Weight)))
+	}
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+	fn propose_bounty(d: u32, ) -> Weight {
+		(64_778_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((1_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
+	}
+	fn approve_bounty() -> Weight {
+		(18_293_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+	}
+	fn propose_curator() -> Weight {
+		(14_248_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn unassign_curator() -> Weight {
+		(52_100_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+	}
+	fn accept_curator() -> Weight {
+		(52_564_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+	}
+	fn award_bounty() -> Weight {
+		(37_426_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn claim_bounty() -> Weight {
+		(176_077_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
+	}
+	fn close_bounty_proposed() -> Weight {
+		(51_162_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+	}
+	fn close_bounty_active() -> Weight {
+		(116_907_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
+	}
+	fn extend_bounty_expiry() -> Weight {
+		(36_419_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn spend_funds(b: u32, ) -> Weight {
+		(7_562_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((77_328_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(b as Weight)))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(b as Weight)))
+	}
+}
diff --git a/frame/tips/Cargo.toml b/frame/tips/Cargo.toml
new file mode 100644
index 000000000000..386d49372c76
--- /dev/null
+++ b/frame/tips/Cargo.toml
@@ -0,0 +1,47 @@
+[package]
+name = "pallet-tips"
+version = "2.0.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
+license = "Apache-2.0"
+homepage = "https://substrate.dev"
+repository = "https://github.com/paritytech/substrate/"
+description = "FRAME pallet to manage tips"
+readme = "README.md"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+serde = { version = "1.0.101", optional = true, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
+sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
+sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
+frame-support = { version = "2.0.0", default-features = false, path = "../support" }
+frame-system = { version = "2.0.0", default-features = false, path = "../system" }
+pallet-treasury = { version = "2.0.0", default-features = false, path = "../treasury" }
+
+frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
+
+[dev-dependencies]
+sp-io ={ version = "2.0.0", path = "../../primitives/io" }
+sp-core = { version = "2.0.0", path = "../../primitives/core" }
+sp-storage = { version = "2.0.0", path = "../../primitives/storage" }
+pallet-balances = { version = "2.0.0", path = "../balances" }
+
+[features]
+default = ["std"]
+std = [
+	"serde",
+	"codec/std",
+	"sp-std/std",
+	"sp-runtime/std",
+	"frame-support/std",
+	"frame-system/std",
+	"pallet-treasury/std",
+]
+runtime-benchmarks = [
+	"frame-benchmarking",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+]
diff --git a/frame/tips/README.md b/frame/tips/README.md
new file mode 100644
index 000000000000..457e5b3bd0e7
--- /dev/null
+++ b/frame/tips/README.md
@@ -0,0 +1,32 @@
+# Tipping Module ( pallet-tips )
+
+**Note :: This pallet is tightly coupled to pallet-treasury**
+
+A subsystem to allow for an agile "tipping" process, whereby a reward may be given without first
+having a pre-determined stakeholder group come to consensus on how much should be paid.
+
+A group of `Tippers` is determined through the config `Trait`. After half of these have declared
+some amount that they believe a particular reported reason deserves, then a countdown period is
+entered where any remaining members can declare their tip amounts also. After the close of the
+countdown period, the median of all declared tips is paid to the reported beneficiary, along with
+any finders fee, in case of a public (and bonded) original report.
+
+### Terminology
+
+- **Tipping:** The process of gathering declarations of amounts to tip and taking the median amount
+  to be transferred from the treasury to a beneficiary account.
+- **Tip Reason:** The reason for a tip; generally a URL which embodies or explains why a particular
+  individual (identified by an account ID) is worthy of a recognition by the treasury.
+- **Finder:** The original public reporter of some reason for tipping.
+- **Finders Fee:** Some proportion of the tip amount that is paid to the reporter of  the tip,
+  rather than the main beneficiary.
+
+## Interface
+
+### Dispatchable Functions
+
+- `report_awesome` - Report something worthy of a tip and register for a finders fee.
+- `retract_tip` - Retract a previous (finders fee registered) report.
+- `tip_new` - Report an item worthy of a tip and declare a specific amount to tip.
+- `tip` - Declare or redeclare an amount to tip for a particular reason.
+- `close_tip` - Close and pay out a tip.
diff --git a/frame/tips/src/benchmarking.rs b/frame/tips/src/benchmarking.rs
new file mode 100644
index 000000000000..71f9002b9bf1
--- /dev/null
+++ b/frame/tips/src/benchmarking.rs
@@ -0,0 +1,193 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Treasury tips benchmarking.
+
+#![cfg(feature = "runtime-benchmarks")]
+
+use super::*;
+
+use frame_system::RawOrigin;
+use frame_benchmarking::{benchmarks, account, whitelisted_caller};
+use sp_runtime::{traits::{Saturating}};
+
+use crate::Module as TipsMod;
+
+const SEED: u32 = 0;
+
+// Create the pre-requisite information needed to create a `report_awesome`.
+fn setup_awesome<T: Config>(length: u32) -> (T::AccountId, Vec<u8>, T::AccountId) {
+	let caller = whitelisted_caller();
+	let value = T::TipReportDepositBase::get()
+		+ T::DataDepositPerByte::get() * length.into()
+		+ T::Currency::minimum_balance();
+	let _ = T::Currency::make_free_balance_be(&caller, value);
+	let reason = vec![0; length as usize];
+	let awesome_person = account("awesome", 0, SEED);
+	(caller, reason, awesome_person)
+}
+
+// Create the pre-requisite information needed to call `tip_new`.
+fn setup_tip<T: Config>(r: u32, t: u32) ->
+	Result<(T::AccountId, Vec<u8>, T::AccountId, BalanceOf<T>), &'static str>
+{
+	let tippers_count = T::Tippers::count();
+
+	for i in 0 .. t {
+		let member = account("member", i, SEED);
+		T::Tippers::add(&member);
+		ensure!(T::Tippers::contains(&member), "failed to add tipper");
+	}
+
+	ensure!(T::Tippers::count() == tippers_count + t as usize, "problem creating tippers");
+	let caller = account("member", t - 1, SEED);
+	let reason = vec![0; r as usize];
+	let beneficiary = account("beneficiary", t, SEED);
+	let value = T::Currency::minimum_balance().saturating_mul(100u32.into());
+	Ok((caller, reason, beneficiary, value))
+}
+
+// Create `t` new tips for the tip proposal with `hash`.
+// This function automatically makes the tip able to close.
+fn create_tips<T: Config>(t: u32, hash: T::Hash, value: BalanceOf<T>) ->
+	Result<(), &'static str>
+{
+	for i in 0 .. t {
+		let caller = account("member", i, SEED);
+		ensure!(T::Tippers::contains(&caller), "caller is not a tipper");
+		TipsMod::<T>::tip(RawOrigin::Signed(caller).into(), hash, value)?;
+	}
+	Tips::<T>::mutate(hash, |maybe_tip| {
+		if let Some(open_tip) = maybe_tip {
+			open_tip.closes = Some(T::BlockNumber::zero());
+		}
+	});
+	Ok(())
+}
+
+fn setup_pod_account<T: Config>() {
+	let pot_account = TipsMod::<T>::account_id();
+	let value = T::Currency::minimum_balance().saturating_mul(1_000_000_000u32.into());
+	let _ = T::Currency::make_free_balance_be(&pot_account, value);
+}
+
+const MAX_BYTES: u32 = 16384;
+const MAX_TIPPERS: u32 = 100;
+
+benchmarks! {
+	_ { }
+
+	report_awesome {
+		let r in 0 .. MAX_BYTES;
+		let (caller, reason, awesome_person) = setup_awesome::<T>(r);
+		// Whitelist caller account from further DB operations.
+		let caller_key = frame_system::Account::<T>::hashed_key_for(&caller);
+		frame_benchmarking::benchmarking::add_to_whitelist(caller_key.into());
+	}: _(RawOrigin::Signed(caller), reason, awesome_person)
+
+	retract_tip {
+		let r = MAX_BYTES;
+		let (caller, reason, awesome_person) = setup_awesome::<T>(r);
+		TipsMod::<T>::report_awesome(
+			RawOrigin::Signed(caller.clone()).into(),
+			reason.clone(),
+			awesome_person.clone()
+		)?;
+		let reason_hash = T::Hashing::hash(&reason[..]);
+		let hash = T::Hashing::hash_of(&(&reason_hash, &awesome_person));
+		// Whitelist caller account from further DB operations.
+		let caller_key = frame_system::Account::<T>::hashed_key_for(&caller);
+		frame_benchmarking::benchmarking::add_to_whitelist(caller_key.into());
+	}: _(RawOrigin::Signed(caller), hash)
+
+	tip_new {
+		let r in 0 .. MAX_BYTES;
+		let t in 1 .. MAX_TIPPERS;
+
+		let (caller, reason, beneficiary, value) = setup_tip::<T>(r, t)?;
+		// Whitelist caller account from further DB operations.
+		let caller_key = frame_system::Account::<T>::hashed_key_for(&caller);
+		frame_benchmarking::benchmarking::add_to_whitelist(caller_key.into());
+	}: _(RawOrigin::Signed(caller), reason, beneficiary, value)
+
+	tip {
+		let t in 1 .. MAX_TIPPERS;
+		let (member, reason, beneficiary, value) = setup_tip::<T>(0, t)?;
+		let value = T::Currency::minimum_balance().saturating_mul(100u32.into());
+		TipsMod::<T>::tip_new(
+			RawOrigin::Signed(member).into(),
+			reason.clone(),
+			beneficiary.clone(),
+			value
+		)?;
+		let reason_hash = T::Hashing::hash(&reason[..]);
+		let hash = T::Hashing::hash_of(&(&reason_hash, &beneficiary));
+		ensure!(Tips::<T>::contains_key(hash), "tip does not exist");
+		create_tips::<T>(t - 1, hash.clone(), value)?;
+		let caller = account("member", t - 1, SEED);
+		// Whitelist caller account from further DB operations.
+		let caller_key = frame_system::Account::<T>::hashed_key_for(&caller);
+		frame_benchmarking::benchmarking::add_to_whitelist(caller_key.into());
+	}: _(RawOrigin::Signed(caller), hash, value)
+
+	close_tip {
+		let t in 1 .. MAX_TIPPERS;
+
+		// Make sure pot is funded
+		setup_pod_account::<T>();
+
+		// Set up a new tip proposal
+		let (member, reason, beneficiary, value) = setup_tip::<T>(0, t)?;
+		let value = T::Currency::minimum_balance().saturating_mul(100u32.into());
+		TipsMod::<T>::tip_new(
+			RawOrigin::Signed(member).into(),
+			reason.clone(),
+			beneficiary.clone(),
+			value
+		)?;
+
+		// Create a bunch of tips
+		let reason_hash = T::Hashing::hash(&reason[..]);
+		let hash = T::Hashing::hash_of(&(&reason_hash, &beneficiary));
+		ensure!(Tips::<T>::contains_key(hash), "tip does not exist");
+		create_tips::<T>(t, hash.clone(), value)?;
+
+		let caller = account("caller", t, SEED);
+		// Whitelist caller account from further DB operations.
+		let caller_key = frame_system::Account::<T>::hashed_key_for(&caller);
+		frame_benchmarking::benchmarking::add_to_whitelist(caller_key.into());
+	}: _(RawOrigin::Signed(caller), hash)
+
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use crate::tests::{new_test_ext, Test};
+	use frame_support::assert_ok;
+
+	#[test]
+	fn test_benchmarks() {
+		new_test_ext().execute_with(|| {
+			assert_ok!(test_benchmark_report_awesome::<Test>());
+			assert_ok!(test_benchmark_retract_tip::<Test>());
+			assert_ok!(test_benchmark_tip_new::<Test>());
+			assert_ok!(test_benchmark_tip::<Test>());
+			assert_ok!(test_benchmark_close_tip::<Test>());
+		});
+	}
+}
diff --git a/frame/tips/src/lib.rs b/frame/tips/src/lib.rs
new file mode 100644
index 000000000000..3507b220d5db
--- /dev/null
+++ b/frame/tips/src/lib.rs
@@ -0,0 +1,576 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! # Tipping Module ( pallet-tips )
+//!
+//! > NOTE: This pallet is tightly coupled with pallet-treasury.
+//!
+//! A subsystem to allow for an agile "tipping" process, whereby a reward may be given without first
+//! having a pre-determined stakeholder group come to consensus on how much should be paid.
+//!
+//! A group of `Tippers` is determined through the config `Config`. After half of these have declared
+//! some amount that they believe a particular reported reason deserves, then a countdown period is
+//! entered where any remaining members can declare their tip amounts also. After the close of the
+//! countdown period, the median of all declared tips is paid to the reported beneficiary, along
+//! with any finders fee, in case of a public (and bonded) original report.
+//!
+//!
+//! ### Terminology
+//!
+//! Tipping protocol:
+//! - **Tipping:** The process of gathering declarations of amounts to tip and taking the median
+//!   amount to be transferred from the treasury to a beneficiary account.
+//! - **Tip Reason:** The reason for a tip; generally a URL which embodies or explains why a
+//!   particular individual (identified by an account ID) is worthy of a recognition by the
+//!   treasury.
+//! - **Finder:** The original public reporter of some reason for tipping.
+//! - **Finders Fee:** Some proportion of the tip amount that is paid to the reporter of the tip,
+//!   rather than the main beneficiary.
+//!
+//! ## Interface
+//!
+//! ### Dispatchable Functions
+//!
+//! Tipping protocol:
+//! - `report_awesome` - Report something worthy of a tip and register for a finders fee.
+//! - `retract_tip` - Retract a previous (finders fee registered) report.
+//! - `tip_new` - Report an item worthy of a tip and declare a specific amount to tip.
+//! - `tip` - Declare or redeclare an amount to tip for a particular reason.
+//! - `close_tip` - Close and pay out a tip.
+
+#![cfg_attr(not(feature = "std"), no_std)]
+
+mod tests;
+mod benchmarking;
+pub mod weights;
+
+use sp_std::if_std;
+
+use sp_std::prelude::*;
+use frame_support::{decl_module, decl_storage, decl_event, ensure, decl_error, Parameter};
+use frame_support::traits::{
+	Currency, Get, ExistenceRequirement::{KeepAlive},
+	ReservableCurrency
+};
+
+use sp_runtime::{ Percent, RuntimeDebug, traits::{
+	Zero, AccountIdConversion, Hash, BadOrigin
+}};
+
+use frame_support::traits::{Contains, ContainsLengthBound};
+use codec::{Encode, Decode};
+use frame_system::{self as system, ensure_signed};
+pub use weights::WeightInfo;
+
+pub type BalanceOf<T> = pallet_treasury::BalanceOf<T>;
+pub type NegativeImbalanceOf<T> = pallet_treasury::NegativeImbalanceOf<T>;
+
+pub trait Config: frame_system::Config + pallet_treasury::Config {
+	/// Maximum acceptable reason length.
+	type MaximumReasonLength: Get<u32>;
+
+	/// The amount held on deposit per byte within the tip report reason or bounty description.
+	type DataDepositPerByte: Get<BalanceOf<Self>>;
+
+	/// Origin from which tippers must come.
+	///
+	/// `ContainsLengthBound::max_len` must be cost free (i.e. no storage read or heavy operation).
+	type Tippers: Contains<Self::AccountId> + ContainsLengthBound;
+
+	/// The period for which a tip remains open after is has achieved threshold tippers.
+	type TipCountdown: Get<Self::BlockNumber>;
+
+	/// The percent of the final tip which goes to the original reporter of the tip.
+	type TipFindersFee: Get<Percent>;
+
+	/// The amount held on deposit for placing a tip report.
+	type TipReportDepositBase: Get<BalanceOf<Self>>;
+
+	/// The overarching event type.
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
+
+	/// Weight information for extrinsics in this pallet.
+	type WeightInfo: WeightInfo;
+}
+
+/// An open tipping "motion". Retains all details of a tip including information on the finder
+/// and the members who have voted.
+#[derive(Clone, Eq, PartialEq, Encode, Decode, RuntimeDebug)]
+pub struct OpenTip<
+	AccountId: Parameter,
+	Balance: Parameter,
+	BlockNumber: Parameter,
+	Hash: Parameter,
+> {
+	/// The hash of the reason for the tip. The reason should be a human-readable UTF-8 encoded string. A URL would be
+	/// sensible.
+	reason: Hash,
+	/// The account to be tipped.
+	who: AccountId,
+	/// The account who began this tip.
+	finder: AccountId,
+	/// The amount held on deposit for this tip.
+	deposit: Balance,
+	/// The block number at which this tip will close if `Some`. If `None`, then no closing is
+	/// scheduled.
+	closes: Option<BlockNumber>,
+	/// The members who have voted for this tip. Sorted by AccountId.
+	tips: Vec<(AccountId, Balance)>,
+	/// Whether this tip should result in the finder taking a fee.
+	finders_fee: bool,
+}
+
+// Note :: For backward compatability reasons,
+// pallet-tips uses Treasury for storage.
+// This is temporary solution, soon will get replaced with
+// Own storage identifier.
+decl_storage! {
+	trait Store for Module<T: Config> as Treasury {
+
+		/// TipsMap that are not yet completed. Keyed by the hash of `(reason, who)` from the value.
+		/// This has the insecure enumerable hash function since the key itself is already
+		/// guaranteed to be a secure hash.
+		pub Tips get(fn tips):
+			map hasher(twox_64_concat) T::Hash
+			=> Option<OpenTip<T::AccountId, BalanceOf<T>, T::BlockNumber, T::Hash>>;
+
+		/// Simple preimage lookup from the reason's hash to the original data. Again, has an
+		/// insecure enumerable hash since the key is guaranteed to be the result of a secure hash.
+		pub Reasons get(fn reasons): map hasher(identity) T::Hash => Option<Vec<u8>>;
+
+	}
+}
+
+decl_event!(
+	pub enum Event<T>
+	where
+		Balance = BalanceOf<T>,
+		<T as frame_system::Config>::AccountId,
+		<T as frame_system::Config>::Hash,
+	{
+		/// A new tip suggestion has been opened. \[tip_hash\]
+		NewTip(Hash),
+		/// A tip suggestion has reached threshold and is closing. \[tip_hash\]
+		TipClosing(Hash),
+		/// A tip suggestion has been closed. \[tip_hash, who, payout\]
+		TipClosed(Hash, AccountId, Balance),
+		/// A tip suggestion has been retracted. \[tip_hash\]
+		TipRetracted(Hash),
+	}
+);
+
+decl_error! {
+	/// Error for the tips module.
+	pub enum Error for Module<T: Config> {
+		/// The reason given is just too big.
+		ReasonTooBig,
+		/// The tip was already found/started.
+		AlreadyKnown,
+		/// The tip hash is unknown.
+		UnknownTip,
+		/// The account attempting to retract the tip is not the finder of the tip.
+		NotFinder,
+		/// The tip cannot be claimed/closed because there are not enough tippers yet.
+		StillOpen,
+		/// The tip cannot be claimed/closed because it's still in the countdown period.
+		Premature,
+	}
+}
+
+decl_module! {
+	pub struct Module<T: Config>
+		for enum Call
+		where origin: T::Origin
+	{
+
+		/// The period for which a tip remains open after is has achieved threshold tippers.
+		const TipCountdown: T::BlockNumber = T::TipCountdown::get();
+
+		/// The amount of the final tip which goes to the original reporter of the tip.
+		const TipFindersFee: Percent = T::TipFindersFee::get();
+
+		/// The amount held on deposit for placing a tip report.
+		const TipReportDepositBase: BalanceOf<T> = T::TipReportDepositBase::get();
+
+		/// The amount held on deposit per byte within the tip report reason.
+		const DataDepositPerByte: BalanceOf<T> = T::DataDepositPerByte::get();
+
+		/// Maximum acceptable reason length.
+		const MaximumReasonLength: u32 = T::MaximumReasonLength::get();
+
+		type Error = Error<T>;
+
+		fn deposit_event() = default;
+
+		/// Report something `reason` that deserves a tip and claim any eventual the finder's fee.
+		///
+		/// The dispatch origin for this call must be _Signed_.
+		///
+		/// Payment: `TipReportDepositBase` will be reserved from the origin account, as well as
+		/// `DataDepositPerByte` for each byte in `reason`.
+		///
+		/// - `reason`: The reason for, or the thing that deserves, the tip; generally this will be
+		///   a UTF-8-encoded URL.
+		/// - `who`: The account which should be credited for the tip.
+		///
+		/// Emits `NewTip` if successful.
+		///
+		/// # <weight>
+		/// - Complexity: `O(R)` where `R` length of `reason`.
+		///   - encoding and hashing of 'reason'
+		/// - DbReads: `Reasons`, `Tips`
+		/// - DbWrites: `Reasons`, `Tips`
+		/// # </weight>
+		#[weight = <T as Config>::WeightInfo::report_awesome(reason.len() as u32)]
+		fn report_awesome(origin, reason: Vec<u8>, who: T::AccountId) {
+			let finder = ensure_signed(origin)?;
+
+			ensure!(reason.len() <= T::MaximumReasonLength::get() as usize, Error::<T>::ReasonTooBig);
+
+			let reason_hash = T::Hashing::hash(&reason[..]);
+			ensure!(!Reasons::<T>::contains_key(&reason_hash), Error::<T>::AlreadyKnown);
+			let hash = T::Hashing::hash_of(&(&reason_hash, &who));
+			ensure!(!Tips::<T>::contains_key(&hash), Error::<T>::AlreadyKnown);
+
+			let deposit = T::TipReportDepositBase::get()
+				+ T::DataDepositPerByte::get() * (reason.len() as u32).into();
+			T::Currency::reserve(&finder, deposit)?;
+
+			Reasons::<T>::insert(&reason_hash, &reason);
+			let tip = OpenTip {
+				reason: reason_hash,
+				who,
+				finder,
+				deposit,
+				closes: None,
+				tips: vec![],
+				finders_fee: true
+			};
+			Tips::<T>::insert(&hash, tip);
+			Self::deposit_event(RawEvent::NewTip(hash));
+		}
+
+		/// Retract a prior tip-report from `report_awesome`, and cancel the process of tipping.
+		///
+		/// If successful, the original deposit will be unreserved.
+		///
+		/// The dispatch origin for this call must be _Signed_ and the tip identified by `hash`
+		/// must have been reported by the signing account through `report_awesome` (and not
+		/// through `tip_new`).
+		///
+		/// - `hash`: The identity of the open tip for which a tip value is declared. This is formed
+		///   as the hash of the tuple of the original tip `reason` and the beneficiary account ID.
+		///
+		/// Emits `TipRetracted` if successful.
+		///
+		/// # <weight>
+		/// - Complexity: `O(1)`
+		///   - Depends on the length of `T::Hash` which is fixed.
+		/// - DbReads: `Tips`, `origin account`
+		/// - DbWrites: `Reasons`, `Tips`, `origin account`
+		/// # </weight>
+		#[weight = <T as Config>::WeightInfo::retract_tip()]
+		fn retract_tip(origin, hash: T::Hash) {
+			let who = ensure_signed(origin)?;
+			let tip = Tips::<T>::get(&hash).ok_or(Error::<T>::UnknownTip)?;
+			ensure!(tip.finder == who, Error::<T>::NotFinder);
+
+			Reasons::<T>::remove(&tip.reason);
+			Tips::<T>::remove(&hash);
+			if !tip.deposit.is_zero() {
+				let _ = T::Currency::unreserve(&who, tip.deposit);
+			}
+			Self::deposit_event(RawEvent::TipRetracted(hash));
+		}
+
+		/// Give a tip for something new; no finder's fee will be taken.
+		///
+		/// The dispatch origin for this call must be _Signed_ and the signing account must be a
+		/// member of the `Tippers` set.
+		///
+		/// - `reason`: The reason for, or the thing that deserves, the tip; generally this will be
+		///   a UTF-8-encoded URL.
+		/// - `who`: The account which should be credited for the tip.
+		/// - `tip_value`: The amount of tip that the sender would like to give. The median tip
+		///   value of active tippers will be given to the `who`.
+		///
+		/// Emits `NewTip` if successful.
+		///
+		/// # <weight>
+		/// - Complexity: `O(R + T)` where `R` length of `reason`, `T` is the number of tippers.
+		///   - `O(T)`: decoding `Tipper` vec of length `T`
+		///     `T` is charged as upper bound given by `ContainsLengthBound`.
+		///     The actual cost depends on the implementation of `T::Tippers`.
+		///   - `O(R)`: hashing and encoding of reason of length `R`
+		/// - DbReads: `Tippers`, `Reasons`
+		/// - DbWrites: `Reasons`, `Tips`
+		/// # </weight>
+		#[weight = <T as Config>::WeightInfo::tip_new(reason.len() as u32, T::Tippers::max_len() as u32)]
+		fn tip_new(origin, reason: Vec<u8>, who: T::AccountId, #[compact] tip_value: BalanceOf<T>) {
+			let tipper = ensure_signed(origin)?;
+			ensure!(T::Tippers::contains(&tipper), BadOrigin);
+			let reason_hash = T::Hashing::hash(&reason[..]);
+			ensure!(!Reasons::<T>::contains_key(&reason_hash), Error::<T>::AlreadyKnown);
+			let hash = T::Hashing::hash_of(&(&reason_hash, &who));
+
+			Reasons::<T>::insert(&reason_hash, &reason);
+			Self::deposit_event(RawEvent::NewTip(hash.clone()));
+			let tips = vec![(tipper.clone(), tip_value)];
+			let tip = OpenTip {
+				reason: reason_hash,
+				who,
+				finder: tipper,
+				deposit: Zero::zero(),
+				closes: None,
+				tips,
+				finders_fee: false,
+			};
+			Tips::<T>::insert(&hash, tip);
+		}
+
+		/// Declare a tip value for an already-open tip.
+		///
+		/// The dispatch origin for this call must be _Signed_ and the signing account must be a
+		/// member of the `Tippers` set.
+		///
+		/// - `hash`: The identity of the open tip for which a tip value is declared. This is formed
+		///   as the hash of the tuple of the hash of the original tip `reason` and the beneficiary
+		///   account ID.
+		/// - `tip_value`: The amount of tip that the sender would like to give. The median tip
+		///   value of active tippers will be given to the `who`.
+		///
+		/// Emits `TipClosing` if the threshold of tippers has been reached and the countdown period
+		/// has started.
+		///
+		/// # <weight>
+		/// - Complexity: `O(T)` where `T` is the number of tippers.
+		///   decoding `Tipper` vec of length `T`, insert tip and check closing,
+		///   `T` is charged as upper bound given by `ContainsLengthBound`.
+		///   The actual cost depends on the implementation of `T::Tippers`.
+		///
+		///   Actually weight could be lower as it depends on how many tips are in `OpenTip` but it
+		///   is weighted as if almost full i.e of length `T-1`.
+		/// - DbReads: `Tippers`, `Tips`
+		/// - DbWrites: `Tips`
+		/// # </weight>
+		#[weight = <T as Config>::WeightInfo::tip(T::Tippers::max_len() as u32)]
+		fn tip(origin, hash: T::Hash, #[compact] tip_value: BalanceOf<T>) {
+			let tipper = ensure_signed(origin)?;
+			ensure!(T::Tippers::contains(&tipper), BadOrigin);
+
+			let mut tip = Tips::<T>::get(hash).ok_or(Error::<T>::UnknownTip)?;
+			if Self::insert_tip_and_check_closing(&mut tip, tipper, tip_value) {
+				Self::deposit_event(RawEvent::TipClosing(hash.clone()));
+			}
+			Tips::<T>::insert(&hash, tip);
+		}
+
+		/// Close and payout a tip.
+		///
+		/// The dispatch origin for this call must be _Signed_.
+		///
+		/// The tip identified by `hash` must have finished its countdown period.
+		///
+		/// - `hash`: The identity of the open tip for which a tip value is declared. This is formed
+		///   as the hash of the tuple of the original tip `reason` and the beneficiary account ID.
+		///
+		/// # <weight>
+		/// - Complexity: `O(T)` where `T` is the number of tippers.
+		///   decoding `Tipper` vec of length `T`.
+		///   `T` is charged as upper bound given by `ContainsLengthBound`.
+		///   The actual cost depends on the implementation of `T::Tippers`.
+		/// - DbReads: `Tips`, `Tippers`, `tip finder`
+		/// - DbWrites: `Reasons`, `Tips`, `Tippers`, `tip finder`
+		/// # </weight>
+		#[weight = <T as Config>::WeightInfo::close_tip(T::Tippers::max_len() as u32)]
+		fn close_tip(origin, hash: T::Hash) {
+			ensure_signed(origin)?;
+
+			let tip = Tips::<T>::get(hash).ok_or(Error::<T>::UnknownTip)?;
+			let n = tip.closes.as_ref().ok_or(Error::<T>::StillOpen)?;
+			ensure!(system::Module::<T>::block_number() >= *n, Error::<T>::Premature);
+			// closed.
+			Reasons::<T>::remove(&tip.reason);
+			Tips::<T>::remove(hash);
+			Self::payout_tip(hash, tip);
+		}
+	}
+}
+
+impl<T: Config> Module<T> {
+	// Add public immutables and private mutables.
+
+	/// The account ID of the treasury pot.
+	///
+	/// This actually does computation. If you need to keep using it, then make sure you cache the
+	/// value and only call this once.
+	pub fn account_id() -> T::AccountId {
+		T::ModuleId::get().into_account()
+	}
+
+	/// Given a mutable reference to an `OpenTip`, insert the tip into it and check whether it
+	/// closes, if so, then deposit the relevant event and set closing accordingly.
+	///
+	/// `O(T)` and one storage access.
+	fn insert_tip_and_check_closing(
+		tip: &mut OpenTip<T::AccountId, BalanceOf<T>, T::BlockNumber, T::Hash>,
+		tipper: T::AccountId,
+		tip_value: BalanceOf<T>,
+	) -> bool {
+		match tip.tips.binary_search_by_key(&&tipper, |x| &x.0) {
+			Ok(pos) => tip.tips[pos] = (tipper, tip_value),
+			Err(pos) => tip.tips.insert(pos, (tipper, tip_value)),
+		}
+		Self::retain_active_tips(&mut tip.tips);
+		let threshold = (T::Tippers::count() + 1) / 2;
+		if tip.tips.len() >= threshold && tip.closes.is_none() {
+			tip.closes = Some(system::Module::<T>::block_number() + T::TipCountdown::get());
+			true
+		} else {
+			false
+		}
+	}
+
+	/// Remove any non-members of `Tippers` from a `tips` vector. `O(T)`.
+	fn retain_active_tips(tips: &mut Vec<(T::AccountId, BalanceOf<T>)>) {
+		let members = T::Tippers::sorted_members();
+		let mut members_iter = members.iter();
+		let mut member = members_iter.next();
+		tips.retain(|(ref a, _)| loop {
+			match member {
+				None => break false,
+				Some(m) if m > a => break false,
+				Some(m) => {
+					member = members_iter.next();
+					if m < a {
+						continue
+					} else {
+						break true;
+					}
+				}
+			}
+		});
+	}
+
+	/// Execute the payout of a tip.
+	///
+	/// Up to three balance operations.
+	/// Plus `O(T)` (`T` is Tippers length).
+	fn payout_tip(hash: T::Hash, tip: OpenTip<T::AccountId, BalanceOf<T>, T::BlockNumber, T::Hash>) {
+		let mut tips = tip.tips;
+		Self::retain_active_tips(&mut tips);
+		tips.sort_by_key(|i| i.1);
+
+		let treasury = Self::account_id();
+		let max_payout = pallet_treasury::Module::<T>::pot();
+
+		let mut payout = tips[tips.len() / 2].1.min(max_payout);
+		if !tip.deposit.is_zero() {
+			let _ = T::Currency::unreserve(&tip.finder, tip.deposit);
+		}
+
+		if tip.finders_fee && tip.finder != tip.who {
+			// pay out the finder's fee.
+			let finders_fee = T::TipFindersFee::get() * payout;
+			payout -= finders_fee;
+			// this should go through given we checked it's at most the free balance, but still
+			// we only make a best-effort.
+			let _ = T::Currency::transfer(&treasury, &tip.finder, finders_fee, KeepAlive);
+		}
+
+		// same as above: best-effort only.
+		let _ = T::Currency::transfer(&treasury, &tip.who, payout, KeepAlive);
+		Self::deposit_event(RawEvent::TipClosed(hash, tip.who, payout));
+	}
+
+	pub fn migrate_retract_tip_for_tip_new() {
+		/// An open tipping "motion". Retains all details of a tip including information on the finder
+		/// and the members who have voted.
+		#[derive(Clone, Eq, PartialEq, Encode, Decode, RuntimeDebug)]
+		pub struct OldOpenTip<
+			AccountId: Parameter,
+			Balance: Parameter,
+			BlockNumber: Parameter,
+			Hash: Parameter,
+		> {
+			/// The hash of the reason for the tip. The reason should be a human-readable UTF-8 encoded string. A URL would be
+			/// sensible.
+			reason: Hash,
+			/// The account to be tipped.
+			who: AccountId,
+			/// The account who began this tip and the amount held on deposit.
+			finder: Option<(AccountId, Balance)>,
+			/// The block number at which this tip will close if `Some`. If `None`, then no closing is
+			/// scheduled.
+			closes: Option<BlockNumber>,
+			/// The members who have voted for this tip. Sorted by AccountId.
+			tips: Vec<(AccountId, Balance)>,
+		}
+
+		use frame_support::{Twox64Concat, migration::StorageKeyIterator};
+
+		if_std! {
+			println!("Inside migrate_retract_tip_for_tip_new()!");
+		}
+
+		for (hash, old_tip) in StorageKeyIterator::<
+			T::Hash,
+			OldOpenTip<T::AccountId, BalanceOf<T>, T::BlockNumber, T::Hash>,
+			Twox64Concat,
+		>::new(b"Treasury", b"Tips").drain()
+		{
+
+			if_std! {
+				println!("Inside loop migrate_retract_tip_for_tip_new()!");
+			}
+
+			let (finder, deposit, finders_fee) = match old_tip.finder {
+				Some((finder, deposit)) => {
+					if_std! {
+						// This code is only being compiled and executed when the `std` feature is enabled.
+						println!("OK case!");
+						println!("value is: {:#?},{:#?}", finder, deposit);
+					}
+					(finder, deposit, true)
+				},
+				None => {
+					if_std! {
+						// This code is only being compiled and executed when the `std` feature is enabled.
+						println!("None case!");
+						// println!("value is: {:#?},{:#?}", T::AccountId::default(), Zero::zero());
+					}
+					(T::AccountId::default(), Zero::zero(), false)
+				},
+			};
+			let new_tip = OpenTip {
+				reason: old_tip.reason,
+				who: old_tip.who,
+				finder,
+				deposit,
+				closes: old_tip.closes,
+				tips: old_tip.tips,
+				finders_fee
+			};
+			Tips::<T>::insert(hash, new_tip)
+		}
+
+		if_std! {
+			println!("Exit migrate_retract_tip_for_tip_new()!");
+		}
+
+	}
+}
diff --git a/frame/tips/src/tests.rs b/frame/tips/src/tests.rs
new file mode 100644
index 000000000000..e6f9cd4e66b7
--- /dev/null
+++ b/frame/tips/src/tests.rs
@@ -0,0 +1,465 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Treasury pallet tests.
+
+#![cfg(test)]
+
+use super::*;
+use std::cell::RefCell;
+use frame_support::{
+	assert_noop, assert_ok, impl_outer_origin, parameter_types, weights::Weight,
+	impl_outer_event, traits::{Contains}
+};
+use sp_runtime::{Permill};
+use sp_core::H256;
+use sp_runtime::{
+	Perbill, ModuleId,
+	testing::Header,
+	traits::{BlakeTwo256, IdentityLookup, BadOrigin},
+};
+
+impl_outer_origin! {
+	pub enum Origin for Test where system = frame_system {}
+}
+
+mod tips {
+	// Re-export needed for `impl_outer_event!`.
+	pub use crate::*;
+}
+
+impl_outer_event! {
+	pub enum Event for Test {
+		system<T>,
+		pallet_balances<T>,
+		pallet_treasury<T>,
+		tips<T>,
+	}
+}
+
+#[derive(Clone, Eq, PartialEq)]
+pub struct Test;
+parameter_types! {
+	pub const BlockHashCount: u64 = 250;
+	pub const MaximumBlockWeight: Weight = 1024;
+	pub const MaximumBlockLength: u32 = 2 * 1024;
+	pub const AvailableBlockRatio: Perbill = Perbill::one();
+}
+impl frame_system::Config for Test {
+	type BaseCallFilter = ();
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
+	type Origin = Origin;
+	type Index = u64;
+	type BlockNumber = u64;
+	type Call = ();
+	type Hash = H256;
+	type Hashing = BlakeTwo256;
+	type AccountId = u128; // u64 is not enough to hold bytes used to generate bounty account
+	type Lookup = IdentityLookup<Self::AccountId>;
+	type Header = Header;
+	type Event = Event;
+	type BlockHashCount = BlockHashCount;
+	type Version = ();
+	type PalletInfo = ();
+	type AccountData = pallet_balances::AccountData<u64>;
+	type OnNewAccount = ();
+	type OnKilledAccount = ();
+	type SystemWeightInfo = ();
+}
+parameter_types! {
+	pub const ExistentialDeposit: u64 = 1;
+}
+impl pallet_balances::Config for Test {
+	type MaxLocks = ();
+	type Balance = u64;
+	type Event = Event;
+	type DustRemoval = ();
+	type ExistentialDeposit = ExistentialDeposit;
+	type AccountStore = System;
+	type WeightInfo = ();
+}
+thread_local! {
+	static TEN_TO_FOURTEEN: RefCell<Vec<u128>> = RefCell::new(vec![10,11,12,13,14]);
+}
+pub struct TenToFourteen;
+impl Contains<u128> for TenToFourteen {
+	fn sorted_members() -> Vec<u128> {
+		TEN_TO_FOURTEEN.with(|v| {
+			v.borrow().clone()
+		})
+	}
+	#[cfg(feature = "runtime-benchmarks")]
+	fn add(new: &u128) {
+		TEN_TO_FOURTEEN.with(|v| {
+			let mut members = v.borrow_mut();
+			members.push(*new);
+			members.sort();
+		})
+	}
+}
+impl ContainsLengthBound for TenToFourteen {
+	fn max_len() -> usize {
+		TEN_TO_FOURTEEN.with(|v| v.borrow().len())
+	}
+	fn min_len() -> usize { 0 }
+}
+parameter_types! {
+	pub const ProposalBond: Permill = Permill::from_percent(5);
+	pub const ProposalBondMinimum: u64 = 1;
+	pub const SpendPeriod: u64 = 2;
+	pub const Burn: Permill = Permill::from_percent(50);
+	pub const DataDepositPerByte: u64 = 1;
+	pub const TreasuryModuleId: ModuleId = ModuleId(*b"py/trsry");
+	pub const MaximumReasonLength: u32 = 16384;
+}
+impl pallet_treasury::Config for Test {
+	type ModuleId = TreasuryModuleId;
+	type Currency = pallet_balances::Module<Test>;
+	type ApproveOrigin = frame_system::EnsureRoot<u128>;
+	type RejectOrigin = frame_system::EnsureRoot<u128>;
+	type Event = Event;
+	type OnSlash = ();
+	type ProposalBond = ProposalBond;
+	type ProposalBondMinimum = ProposalBondMinimum;
+	type SpendPeriod = SpendPeriod;
+	type Burn = Burn;
+	type BurnDestination = ();  // Just gets burned.
+	type WeightInfo = ();
+	type SpendFunds = ();
+}
+parameter_types! {
+	pub const TipCountdown: u64 = 1;
+	pub const TipFindersFee: Percent = Percent::from_percent(20);
+	pub const TipReportDepositBase: u64 = 1;
+}
+impl Config for Test {
+	type MaximumReasonLength = MaximumReasonLength;
+	type Tippers = TenToFourteen;
+	type TipCountdown = TipCountdown;
+	type TipFindersFee = TipFindersFee;
+	type TipReportDepositBase = TipReportDepositBase;
+	type DataDepositPerByte = DataDepositPerByte;
+	type Event = Event;
+	type WeightInfo = ();
+}
+type System = frame_system::Module<Test>;
+type Balances = pallet_balances::Module<Test>;
+type Treasury = pallet_treasury::Module<Test>;
+type TipsModTestInst = Module<Test>;
+
+pub fn new_test_ext() -> sp_io::TestExternalities {
+	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+	pallet_balances::GenesisConfig::<Test>{
+		// Total issuance will be 200 with treasury account initialized at ED.
+		balances: vec![(0, 100), (1, 98), (2, 1)],
+	}.assimilate_storage(&mut t).unwrap();
+	pallet_treasury::GenesisConfig::default().assimilate_storage::<Test, _>(&mut t).unwrap();
+	t.into()
+}
+
+fn last_event() -> RawEvent<u64, u128, H256> {
+	System::events().into_iter().map(|r| r.event)
+		.filter_map(|e| {
+			if let Event::tips(inner) = e { Some(inner) } else { None }
+		})
+		.last()
+		.unwrap()
+}
+
+#[test]
+fn genesis_config_works() {
+	new_test_ext().execute_with(|| {
+		assert_eq!(Treasury::pot(), 0);
+		assert_eq!(Treasury::proposal_count(), 0);
+	});
+}
+
+fn tip_hash() -> H256 {
+	BlakeTwo256::hash_of(&(BlakeTwo256::hash(b"awesome.dot"), 3u128))
+}
+
+#[test]
+fn tip_new_cannot_be_used_twice() {
+	new_test_ext().execute_with(|| {
+		Balances::make_free_balance_be(&Treasury::account_id(), 101);
+		assert_ok!(TipsModTestInst::tip_new(Origin::signed(10), b"awesome.dot".to_vec(), 3, 10));
+		assert_noop!(
+			TipsModTestInst::tip_new(Origin::signed(11), b"awesome.dot".to_vec(), 3, 10),
+			Error::<Test>::AlreadyKnown
+		);
+	});
+}
+
+#[test]
+fn report_awesome_and_tip_works() {
+	new_test_ext().execute_with(|| {
+		Balances::make_free_balance_be(&Treasury::account_id(), 101);
+		assert_ok!(TipsModTestInst::report_awesome(Origin::signed(0), b"awesome.dot".to_vec(), 3));
+		assert_eq!(Balances::reserved_balance(0), 12);
+		assert_eq!(Balances::free_balance(0), 88);
+
+		// other reports don't count.
+		assert_noop!(
+			TipsModTestInst::report_awesome(Origin::signed(1), b"awesome.dot".to_vec(), 3),
+			Error::<Test>::AlreadyKnown
+		);
+
+		let h = tip_hash();
+		assert_ok!(TipsModTestInst::tip(Origin::signed(10), h.clone(), 10));
+		assert_ok!(TipsModTestInst::tip(Origin::signed(11), h.clone(), 10));
+		assert_ok!(TipsModTestInst::tip(Origin::signed(12), h.clone(), 10));
+		assert_noop!(TipsModTestInst::tip(Origin::signed(9), h.clone(), 10), BadOrigin);
+		System::set_block_number(2);
+		assert_ok!(TipsModTestInst::close_tip(Origin::signed(100), h.into()));
+		assert_eq!(Balances::reserved_balance(0), 0);
+		assert_eq!(Balances::free_balance(0), 102);
+		assert_eq!(Balances::free_balance(3), 8);
+	});
+}
+
+#[test]
+fn report_awesome_from_beneficiary_and_tip_works() {
+	new_test_ext().execute_with(|| {
+		Balances::make_free_balance_be(&Treasury::account_id(), 101);
+		assert_ok!(TipsModTestInst::report_awesome(Origin::signed(0), b"awesome.dot".to_vec(), 0));
+		assert_eq!(Balances::reserved_balance(0), 12);
+		assert_eq!(Balances::free_balance(0), 88);
+		let h = BlakeTwo256::hash_of(&(BlakeTwo256::hash(b"awesome.dot"), 0u128));
+		assert_ok!(TipsModTestInst::tip(Origin::signed(10), h.clone(), 10));
+		assert_ok!(TipsModTestInst::tip(Origin::signed(11), h.clone(), 10));
+		assert_ok!(TipsModTestInst::tip(Origin::signed(12), h.clone(), 10));
+		System::set_block_number(2);
+		assert_ok!(TipsModTestInst::close_tip(Origin::signed(100), h.into()));
+		assert_eq!(Balances::reserved_balance(0), 0);
+		assert_eq!(Balances::free_balance(0), 110);
+	});
+}
+
+#[test]
+fn close_tip_works() {
+	new_test_ext().execute_with(|| {
+		System::set_block_number(1);
+
+		Balances::make_free_balance_be(&Treasury::account_id(), 101);
+		assert_eq!(Treasury::pot(), 100);
+
+		assert_ok!(TipsModTestInst::tip_new(Origin::signed(10), b"awesome.dot".to_vec(), 3, 10));
+
+		let h = tip_hash();
+
+		assert_eq!(last_event(), RawEvent::NewTip(h));
+
+		assert_ok!(TipsModTestInst::tip(Origin::signed(11), h.clone(), 10));
+
+		assert_noop!(TipsModTestInst::close_tip(Origin::signed(0), h.into()), Error::<Test>::StillOpen);
+
+		assert_ok!(TipsModTestInst::tip(Origin::signed(12), h.clone(), 10));
+
+		assert_eq!(last_event(), RawEvent::TipClosing(h));
+
+		assert_noop!(TipsModTestInst::close_tip(Origin::signed(0), h.into()), Error::<Test>::Premature);
+
+		System::set_block_number(2);
+		assert_noop!(TipsModTestInst::close_tip(Origin::none(), h.into()), BadOrigin);
+		assert_ok!(TipsModTestInst::close_tip(Origin::signed(0), h.into()));
+		assert_eq!(Balances::free_balance(3), 10);
+
+		assert_eq!(last_event(), RawEvent::TipClosed(h, 3, 10));
+
+		assert_noop!(TipsModTestInst::close_tip(Origin::signed(100), h.into()), Error::<Test>::UnknownTip);
+	});
+}
+
+#[test]
+fn retract_tip_works() {
+	new_test_ext().execute_with(|| {
+		// with report awesome
+		Balances::make_free_balance_be(&Treasury::account_id(), 101);
+		assert_ok!(TipsModTestInst::report_awesome(Origin::signed(0), b"awesome.dot".to_vec(), 3));
+		let h = tip_hash();
+		assert_ok!(TipsModTestInst::tip(Origin::signed(10), h.clone(), 10));
+		assert_ok!(TipsModTestInst::tip(Origin::signed(11), h.clone(), 10));
+		assert_ok!(TipsModTestInst::tip(Origin::signed(12), h.clone(), 10));
+		assert_noop!(TipsModTestInst::retract_tip(Origin::signed(10), h.clone()), Error::<Test>::NotFinder);
+		assert_ok!(TipsModTestInst::retract_tip(Origin::signed(0), h.clone()));
+		System::set_block_number(2);
+		assert_noop!(TipsModTestInst::close_tip(Origin::signed(0), h.into()), Error::<Test>::UnknownTip);
+
+		// with tip new
+		Balances::make_free_balance_be(&Treasury::account_id(), 101);
+		assert_ok!(TipsModTestInst::tip_new(Origin::signed(10), b"awesome.dot".to_vec(), 3, 10));
+		let h = tip_hash();
+		assert_ok!(TipsModTestInst::tip(Origin::signed(11), h.clone(), 10));
+		assert_ok!(TipsModTestInst::tip(Origin::signed(12), h.clone(), 10));
+		assert_noop!(TipsModTestInst::retract_tip(Origin::signed(0), h.clone()), Error::<Test>::NotFinder);
+		assert_ok!(TipsModTestInst::retract_tip(Origin::signed(10), h.clone()));
+		System::set_block_number(2);
+		assert_noop!(TipsModTestInst::close_tip(Origin::signed(10), h.into()), Error::<Test>::UnknownTip);
+	});
+}
+
+#[test]
+fn tip_median_calculation_works() {
+	new_test_ext().execute_with(|| {
+		Balances::make_free_balance_be(&Treasury::account_id(), 101);
+		assert_ok!(TipsModTestInst::tip_new(Origin::signed(10), b"awesome.dot".to_vec(), 3, 0));
+		let h = tip_hash();
+		assert_ok!(TipsModTestInst::tip(Origin::signed(11), h.clone(), 10));
+		assert_ok!(TipsModTestInst::tip(Origin::signed(12), h.clone(), 1000000));
+		System::set_block_number(2);
+		assert_ok!(TipsModTestInst::close_tip(Origin::signed(0), h.into()));
+		assert_eq!(Balances::free_balance(3), 10);
+	});
+}
+
+#[test]
+fn tip_changing_works() {
+	new_test_ext().execute_with(|| {
+		Balances::make_free_balance_be(&Treasury::account_id(), 101);
+		assert_ok!(TipsModTestInst::tip_new(Origin::signed(10), b"awesome.dot".to_vec(), 3, 10000));
+		let h = tip_hash();
+		assert_ok!(TipsModTestInst::tip(Origin::signed(11), h.clone(), 10000));
+		assert_ok!(TipsModTestInst::tip(Origin::signed(12), h.clone(), 10000));
+		assert_ok!(TipsModTestInst::tip(Origin::signed(13), h.clone(), 0));
+		assert_ok!(TipsModTestInst::tip(Origin::signed(14), h.clone(), 0));
+		assert_ok!(TipsModTestInst::tip(Origin::signed(12), h.clone(), 1000));
+		assert_ok!(TipsModTestInst::tip(Origin::signed(11), h.clone(), 100));
+		assert_ok!(TipsModTestInst::tip(Origin::signed(10), h.clone(), 10));
+		System::set_block_number(2);
+		assert_ok!(TipsModTestInst::close_tip(Origin::signed(0), h.into()));
+		assert_eq!(Balances::free_balance(3), 10);
+	});
+}
+
+#[test]
+fn test_last_reward_migration() {
+	use sp_storage::Storage;
+
+	let mut s = Storage::default();
+
+	#[derive(Clone, Eq, PartialEq, Encode, Decode, RuntimeDebug)]
+	pub struct OldOpenTip<
+		AccountId: Parameter,
+		Balance: Parameter,
+		BlockNumber: Parameter,
+		Hash: Parameter,
+	> {
+		/// The hash of the reason for the tip. The reason should be a human-readable UTF-8 encoded string. A URL would be
+		/// sensible.
+		reason: Hash,
+		/// The account to be tipped.
+		who: AccountId,
+		/// The account who began this tip and the amount held on deposit.
+		finder: Option<(AccountId, Balance)>,
+		/// The block number at which this tip will close if `Some`. If `None`, then no closing is
+		/// scheduled.
+		closes: Option<BlockNumber>,
+		/// The members who have voted for this tip. Sorted by AccountId.
+		tips: Vec<(AccountId, Balance)>,
+	}
+
+	let reason1 = BlakeTwo256::hash(b"reason1");
+	let hash1 = BlakeTwo256::hash_of(&(reason1, 10u64));
+
+	let old_tip_finder = OldOpenTip::<u128, u64, u64, H256> {
+		reason: reason1,
+		who: 10,
+		finder: Some((20, 30)),
+		closes: Some(13),
+		tips: vec![(40, 50), (60, 70)]
+	};
+
+	let reason2 = BlakeTwo256::hash(b"reason2");
+	let hash2 = BlakeTwo256::hash_of(&(reason2, 20u64));
+
+	let old_tip_no_finder = OldOpenTip::<u128, u64, u64, H256> {
+		reason: reason2,
+		who: 20,
+		finder: None,
+		closes: Some(13),
+		tips: vec![(40, 50), (60, 70)]
+	};
+
+	let data = vec![
+		(
+			Tips::<Test>::hashed_key_for(hash1),
+			old_tip_finder.encode().to_vec()
+		),
+		(
+			Tips::<Test>::hashed_key_for(hash2),
+			old_tip_no_finder.encode().to_vec()
+		),
+	];
+
+	s.top = data.into_iter().collect();
+
+	println!("Executing the test!");
+
+	sp_io::TestExternalities::new(s).execute_with(|| {
+
+		println!("Calling migrate_retract_tip_for_tip_new()!");
+
+		TipsModTestInst::migrate_retract_tip_for_tip_new();
+
+		// Test w/ finder
+		assert_eq!(
+			Tips::<Test>::get(hash1),
+			Some(OpenTip {
+				reason: reason1,
+				who: 10,
+				finder: 20,
+				deposit: 30,
+				closes: Some(13),
+				tips: vec![(40, 50), (60, 70)],
+				finders_fee: true,
+			})
+		);
+
+		// Test w/o finder
+		assert_eq!(
+			Tips::<Test>::get(hash2),
+			Some(OpenTip {
+				reason: reason2,
+				who: 20,
+				finder: Default::default(),
+				deposit: 0,
+				closes: Some(13),
+				tips: vec![(40, 50), (60, 70)],
+				finders_fee: false,
+			})
+		);
+	});
+}
+
+#[test]
+fn genesis_funding_works() {
+	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+	let initial_funding = 100;
+	pallet_balances::GenesisConfig::<Test>{
+		// Total issuance will be 200 with treasury account initialized with 100.
+		balances: vec![(0, 100), (Treasury::account_id(), initial_funding)],
+	}.assimilate_storage(&mut t).unwrap();
+	pallet_treasury::GenesisConfig::default().assimilate_storage::<Test, _>(&mut t).unwrap();
+	let mut t: sp_io::TestExternalities = t.into();
+
+	t.execute_with(|| {
+		assert_eq!(Balances::free_balance(Treasury::account_id()), initial_funding);
+		assert_eq!(Treasury::pot(), initial_funding - Balances::minimum_balance());
+	});
+}
diff --git a/frame/tips/src/weights.rs b/frame/tips/src/weights.rs
new file mode 100644
index 000000000000..ad2d3104cafe
--- /dev/null
+++ b/frame/tips/src/weights.rs
@@ -0,0 +1,131 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Autogenerated weights for pallet_tips
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
+//! DATE: 2020-12-16, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
+
+// Executed Command:
+// ./target/release/substrate
+// benchmark
+// --chain=dev
+// --steps=50
+// --repeat=20
+// --pallet=pallet_tips
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./frame/tips/src/weights.rs
+// --template=./.maintain/frame-weight-template.hbs
+
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for pallet_tips.
+pub trait WeightInfo {
+	fn report_awesome(r: u32, ) -> Weight;
+	fn retract_tip() -> Weight;
+	fn tip_new(r: u32, t: u32, ) -> Weight;
+	fn tip(t: u32, ) -> Weight;
+	fn close_tip(t: u32, ) -> Weight;
+}
+
+/// Weights for pallet_tips using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	fn report_awesome(r: u32, ) -> Weight {
+		(74_814_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+	}
+	fn retract_tip() -> Weight {
+		(62_962_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+	}
+	fn tip_new(r: u32, t: u32, ) -> Weight {
+		(48_132_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 0
+			.saturating_add((155_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+	}
+	fn tip(t: u32, ) -> Weight {
+		(36_168_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((695_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn close_tip(t: u32, ) -> Weight {
+		(119_313_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((372_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+	}
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+	fn report_awesome(r: u32, ) -> Weight {
+		(74_814_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+	}
+	fn retract_tip() -> Weight {
+		(62_962_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+	}
+	fn tip_new(r: u32, t: u32, ) -> Weight {
+		(48_132_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 0
+			.saturating_add((155_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+	}
+	fn tip(t: u32, ) -> Weight {
+		(36_168_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((695_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn close_tip(t: u32, ) -> Weight {
+		(119_313_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((372_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+	}
+}
diff --git a/frame/treasury/Cargo.toml b/frame/treasury/Cargo.toml
index fd2d103e9f33..7570d2a499c3 100644
--- a/frame/treasury/Cargo.toml
+++ b/frame/treasury/Cargo.toml
@@ -20,6 +20,7 @@ sp-runtime = { version = "2.0.0", default-features = false, path = "../../primit
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
 pallet-balances = { version = "2.0.0", default-features = false, path = "../balances" }
+impl-trait-for-tuples = "0.1.3"
 
 frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
 
diff --git a/frame/treasury/README.md b/frame/treasury/README.md
index c8e1a57350d2..4b061359fea7 100644
--- a/frame/treasury/README.md
+++ b/frame/treasury/README.md
@@ -1,118 +1,31 @@
 # Treasury Module
 
-The Treasury module provides a "pot" of funds that can be managed by stakeholders in the
-system and a structure for making spending proposals from this pot.
-
-- [`treasury::Trait`](https://docs.rs/pallet-treasury/latest/pallet_treasury/trait.Trait.html)
-- [`Call`](https://docs.rs/pallet-treasury/latest/pallet_treasury/enum.Call.html)
+The Treasury module provides a "pot" of funds that can be managed by stakeholders in the system and
+a structure for making spending proposals from this pot.
 
 ## Overview
 
-The Treasury Module itself provides the pot to store funds, and a means for stakeholders to
-propose, approve, and deny expenditures. The chain will need to provide a method (e.g.
-inflation, fees) for collecting funds.
-
-By way of example, the Council could vote to fund the Treasury with a portion of the block
-reward and use the funds to pay developers.
-
-### Tipping
-
-A separate subsystem exists to allow for an agile "tipping" process, whereby a reward may be
-given without first having a pre-determined stakeholder group come to consensus on how much
-should be paid.
-
-A group of `Tippers` is determined through the config `Config`. After half of these have declared
-some amount that they believe a particular reported reason deserves, then a countdown period is
-entered where any remaining members can declare their tip amounts also. After the close of the
-countdown period, the median of all declared tips is paid to the reported beneficiary, along
-with any finders fee, in case of a public (and bonded) original report.
-
-### Bounty
-
-A Bounty Spending is a reward for a specified body of work - or specified set of objectives - that
-needs to be executed for a predefined Treasury amount to be paid out. A curator is assigned after
-the bounty is approved and funded by Council, to be delegated
-with the responsibility of assigning a payout address once the specified set of objectives is completed.
-
-After the Council has activated a bounty, it delegates the work that requires expertise to a curator
-in exchange of a deposit. Once the curator accepts the bounty, they
-get to close the Active bounty. Closing the Active bounty enacts a delayed payout to the payout
-address, the curator fee and the return of the curator deposit. The
-delay allows for intervention through regular democracy. The Council gets to unassign the curator,
-resulting in a new curator election. The Council also gets to cancel
-the bounty if deemed necessary before assigning a curator or once the bounty is active or payout
-is pending, resulting in the slash of the curator's deposit.
+The Treasury Module itself provides the pot to store funds, and a means for stakeholders to propose,
+approve, and deny expenditures. The chain will need to provide a method (e.g.inflation, fees) for
+collecting funds.
 
+By way of example, the Council could vote to fund the Treasury with a portion of the block reward
+and use the funds to pay developers.
 
 ### Terminology
 
 - **Proposal:** A suggestion to allocate funds from the pot to a beneficiary.
-- **Beneficiary:** An account who will receive the funds from a proposal iff
-the proposal is approved.
-- **Deposit:** Funds that a proposer must lock when making a proposal. The
-deposit will be returned or slashed if the proposal is approved or rejected
-respectively.
+- **Beneficiary:** An account who will receive the funds from a proposal if the proposal is
+  approved.
+- **Deposit:** Funds that a proposer must lock when making a proposal. The deposit will be returned
+  or slashed if the proposal is approved or rejected respectively.
 - **Pot:** Unspent funds accumulated by the treasury module.
 
-Tipping protocol:
-- **Tipping:** The process of gathering declarations of amounts to tip and taking the median
-  amount to be transferred from the treasury to a beneficiary account.
-- **Tip Reason:** The reason for a tip; generally a URL which embodies or explains why a
-  particular individual (identified by an account ID) is worthy of a recognition by the
-  treasury.
-- **Finder:** The original public reporter of some reason for tipping.
-- **Finders Fee:** Some proportion of the tip amount that is paid to the reporter of the tip,
-  rather than the main beneficiary.
-
-Bounty:
-- **Bounty spending proposal:** A proposal to reward a predefined body of work upon completion by
-the Treasury.
-- **Proposer:** An account proposing a bounty spending.
-- **Curator:** An account managing the bounty and assigning a payout address receiving the reward
-for the completion of work.
-- **Deposit:** The amount held on deposit for placing a bounty proposal plus the amount held on
-deposit per byte within the bounty description.
-- **Curator deposit:** The payment from a candidate willing to curate an approved bounty. The deposit
-is returned when/if the bounty is completed.
-- **Bounty value:** The total amount that should be paid to the Payout Address if the bounty is
-rewarded.
-- **Payout address:** The account to which the total or part of the bounty is assigned to.
-- **Payout Delay:** The delay period for which a bounty beneficiary needs to wait before claiming.
-- **Curator fee:** The reserved upfront payment for a curator for work related to the bounty.
-
 ## Interface
 
 ### Dispatchable Functions
 
 General spending/proposal protocol:
 - `propose_spend` - Make a spending proposal and stake the required deposit.
-- `set_pot` - Set the spendable balance of funds.
-- `configure` - Configure the module's proposal requirements.
 - `reject_proposal` - Reject a proposal, slashing the deposit.
 - `approve_proposal` - Accept the proposal, returning the deposit.
-
-Tipping protocol:
-- `report_awesome` - Report something worthy of a tip and register for a finders fee.
-- `retract_tip` - Retract a previous (finders fee registered) report.
-- `tip_new` - Report an item worthy of a tip and declare a specific amount to tip.
-- `tip` - Declare or redeclare an amount to tip for a particular reason.
-- `close_tip` - Close and pay out a tip.
-
-Bounty protocol:
-- `propose_bounty` - Propose a specific treasury amount to be earmarked for a predefined set of
-tasks and stake the required deposit.
-- `approve_bounty` - Accept a specific treasury amount to be earmarked for a predefined body of work.
-- `propose_curator` - Assign an account to a bounty as candidate curator.
-- `accept_curator` - Accept a bounty assignment from the Council, setting a curator deposit.
-- `extend_bounty_expiry` - Extend the expiry block number of the bounty and stay active.
-- `award_bounty` - Close and pay out the specified amount for the completed work.
-- `claim_bounty` - Claim a specific bounty amount from the Payout Address.
-- `unassign_curator` - Unassign an accepted curator from a specific earmark.
-- `close_bounty` - Cancel the earmark for a specific treasury amount and close the bounty.
-
-
-## GenesisConfig
-
-The Treasury module depends on the [`GenesisConfig`](https://docs.rs/pallet-treasury/latest/pallet_treasury/struct.GenesisConfig.html).
-
-License: Apache-2.0
diff --git a/frame/treasury/src/benchmarking.rs b/frame/treasury/src/benchmarking.rs
index 4606689e86d9..16ed1b01ae0d 100644
--- a/frame/treasury/src/benchmarking.rs
+++ b/frame/treasury/src/benchmarking.rs
@@ -22,7 +22,7 @@
 use super::*;
 
 use frame_system::RawOrigin;
-use frame_benchmarking::{benchmarks_instance, account, whitelisted_caller};
+use frame_benchmarking::{benchmarks_instance, account};
 use frame_support::traits::OnInitialize;
 
 use crate::Module as Treasury;
@@ -43,56 +43,6 @@ fn setup_proposal<T: Config<I>, I: Instance>(u: u32) -> (
 	(caller, value, beneficiary_lookup)
 }
 
-// Create the pre-requisite information needed to create a `report_awesome`.
-fn setup_awesome<T: Config<I>, I: Instance>(length: u32) -> (T::AccountId, Vec<u8>, T::AccountId) {
-	let caller = whitelisted_caller();
-	let value = T::TipReportDepositBase::get()
-		+ T::DataDepositPerByte::get() * length.into()
-		+ T::Currency::minimum_balance();
-	let _ = T::Currency::make_free_balance_be(&caller, value);
-	let reason = vec![0; length as usize];
-	let awesome_person = account("awesome", 0, SEED);
-	(caller, reason, awesome_person)
-}
-
-// Create the pre-requisite information needed to call `tip_new`.
-fn setup_tip<T: Config<I>, I: Instance>(r: u32, t: u32) ->
-	Result<(T::AccountId, Vec<u8>, T::AccountId, BalanceOf<T, I>), &'static str>
-{
-	let tippers_count = T::Tippers::count();
-
-	for i in 0 .. t {
-		let member = account("member", i, SEED);
-		T::Tippers::add(&member);
-		ensure!(T::Tippers::contains(&member), "failed to add tipper");
-	}
-
-	ensure!(T::Tippers::count() == tippers_count + t as usize, "problem creating tippers");
-	let caller = account("member", t - 1, SEED);
-	let reason = vec![0; r as usize];
-	let beneficiary = account("beneficiary", t, SEED);
-	let value = T::Currency::minimum_balance().saturating_mul(100u32.into());
-	Ok((caller, reason, beneficiary, value))
-}
-
-// Create `t` new tips for the tip proposal with `hash`.
-// This function automatically makes the tip able to close.
-fn create_tips<T: Config<I>, I: Instance>(t: u32, hash: T::Hash, value: BalanceOf<T, I>) ->
-	Result<(), &'static str>
-{
-	for i in 0 .. t {
-		let caller = account("member", i, SEED);
-		ensure!(T::Tippers::contains(&caller), "caller is not a tipper");
-		Treasury::<T, I>::tip(RawOrigin::Signed(caller).into(), hash, value)?;
-	}
-	Tips::<T, I>::mutate(hash, |maybe_tip| {
-		if let Some(open_tip) = maybe_tip {
-			open_tip.closes = Some(T::BlockNumber::zero());
-		}
-	});
-	Ok(())
-}
-
 // Create proposals that are approved for use in `on_initialize`.
 fn create_approved_proposals<T: Config<I>, I: Instance>(n: u32) -> Result<(), &'static str> {
 	for i in 0 .. n {
@@ -109,61 +59,12 @@ fn create_approved_proposals<T: Config<I>, I: Instance>(n: u32) -> Result<(), &'
 	Ok(())
 }
 
-// Create bounties that are approved for use in `on_initialize`.
-fn create_approved_bounties<T: Config<I>, I: Instance>(n: u32) -> Result<(), &'static str> {
-	for i in 0 .. n {
-		let (caller, _curator, _fee, value, reason) = setup_bounty::<T, I>(i, MAX_BYTES);
-		Treasury::<T, I>::propose_bounty(RawOrigin::Signed(caller).into(), value, reason)?;
-		let bounty_id = BountyCount::<I>::get() - 1;
-		Treasury::<T, I>::approve_bounty(RawOrigin::Root.into(), bounty_id)?;
-	}
-	ensure!(BountyApprovals::<I>::get().len() == n as usize, "Not all bounty approved");
-	Ok(())
-}
-
-// Create the pre-requisite information needed to create a treasury `propose_bounty`.
-fn setup_bounty<T: Config<I>, I: Instance>(u: u32, d: u32) -> (
-	T::AccountId,
-	T::AccountId,
-	BalanceOf<T, I>,
-	BalanceOf<T, I>,
-	Vec<u8>,
-) {
-	let caller = account("caller", u, SEED);
-	let value: BalanceOf<T, I> = T::BountyValueMinimum::get().saturating_mul(100u32.into());
-	let fee = value / 2u32.into();
-	let deposit = T::BountyDepositBase::get() + T::DataDepositPerByte::get() * MAX_BYTES.into();
-	let _ = T::Currency::make_free_balance_be(&caller, deposit);
-	let curator = account("curator", u, SEED);
-	let _ = T::Currency::make_free_balance_be(&curator, fee / 2u32.into());
-	let reason = vec![0; d as usize];
-	(caller, curator, fee, value, reason)
-}
-
-fn create_bounty<T: Config<I>, I: Instance>() -> Result<(
-	<T::Lookup as StaticLookup>::Source,
-	BountyIndex,
-), &'static str> {
-	let (caller, curator, fee, value, reason) = setup_bounty::<T, I>(0, MAX_BYTES);
-	let curator_lookup = T::Lookup::unlookup(curator.clone());
-	Treasury::<T, I>::propose_bounty(RawOrigin::Signed(caller).into(), value, reason)?;
-	let bounty_id = BountyCount::<I>::get() - 1;
-	Treasury::<T, I>::approve_bounty(RawOrigin::Root.into(), bounty_id)?;
-	Treasury::<T, I>::on_initialize(T::BlockNumber::zero());
-	Treasury::<T, I>::propose_curator(RawOrigin::Root.into(), bounty_id, curator_lookup.clone(), fee)?;
-	Treasury::<T, I>::accept_curator(RawOrigin::Signed(curator).into(), bounty_id)?;
-	Ok((curator_lookup, bounty_id))
-}
-
 fn setup_pod_account<T: Config<I>, I: Instance>() {
 	let pot_account = Treasury::<T, I>::account_id();
 	let value = T::Currency::minimum_balance().saturating_mul(1_000_000_000u32.into());
 	let _ = T::Currency::make_free_balance_be(&pot_account, value);
 }
 
-const MAX_BYTES: u32 = 16384;
-const MAX_TIPPERS: u32 = 100;
-
 benchmarks_instance! {
 	_ { }
 
@@ -194,178 +95,6 @@ benchmarks_instance! {
 		let proposal_id = Treasury::<T, _>::proposal_count() - 1;
 	}: _(RawOrigin::Root, proposal_id)
 
-	report_awesome {
-		let r in 0 .. MAX_BYTES;
-		let (caller, reason, awesome_person) = setup_awesome::<T, _>(r);
-		// Whitelist caller account from further DB operations.
-		let caller_key = frame_system::Account::<T>::hashed_key_for(&caller);
-		frame_benchmarking::benchmarking::add_to_whitelist(caller_key.into());
-	}: _(RawOrigin::Signed(caller), reason, awesome_person)
-
-	retract_tip {
-		let r = MAX_BYTES;
-		let (caller, reason, awesome_person) = setup_awesome::<T, _>(r);
-		Treasury::<T, _>::report_awesome(
-			RawOrigin::Signed(caller.clone()).into(),
-			reason.clone(),
-			awesome_person.clone()
-		)?;
-		let reason_hash = T::Hashing::hash(&reason[..]);
-		let hash = T::Hashing::hash_of(&(&reason_hash, &awesome_person));
-		// Whitelist caller account from further DB operations.
-		let caller_key = frame_system::Account::<T>::hashed_key_for(&caller);
-		frame_benchmarking::benchmarking::add_to_whitelist(caller_key.into());
-	}: _(RawOrigin::Signed(caller), hash)
-
-	tip_new {
-		let r in 0 .. MAX_BYTES;
-		let t in 1 .. MAX_TIPPERS;
-
-		let (caller, reason, beneficiary, value) = setup_tip::<T, _>(r, t)?;
-		// Whitelist caller account from further DB operations.
-		let caller_key = frame_system::Account::<T>::hashed_key_for(&caller);
-		frame_benchmarking::benchmarking::add_to_whitelist(caller_key.into());
-	}: _(RawOrigin::Signed(caller), reason, beneficiary, value)
-
-	tip {
-		let t in 1 .. MAX_TIPPERS;
-		let (member, reason, beneficiary, value) = setup_tip::<T, _>(0, t)?;
-		let value = T::Currency::minimum_balance().saturating_mul(100u32.into());
-		Treasury::<T, _>::tip_new(
-			RawOrigin::Signed(member).into(),
-			reason.clone(),
-			beneficiary.clone(),
-			value
-		)?;
-		let reason_hash = T::Hashing::hash(&reason[..]);
-		let hash = T::Hashing::hash_of(&(&reason_hash, &beneficiary));
-		ensure!(Tips::<T, _>::contains_key(hash), "tip does not exist");
-		create_tips::<T, _>(t - 1, hash.clone(), value)?;
-		let caller = account("member", t - 1, SEED);
-		// Whitelist caller account from further DB operations.
-		let caller_key = frame_system::Account::<T>::hashed_key_for(&caller);
-		frame_benchmarking::benchmarking::add_to_whitelist(caller_key.into());
-	}: _(RawOrigin::Signed(caller), hash, value)
-
-	close_tip {
-		let t in 1 .. MAX_TIPPERS;
-
-		// Make sure pot is funded
-		setup_pod_account::<T, _>();
-
-		// Set up a new tip proposal
-		let (member, reason, beneficiary, value) = setup_tip::<T, _>(0, t)?;
-		let value = T::Currency::minimum_balance().saturating_mul(100u32.into());
-		Treasury::<T, _>::tip_new(
-			RawOrigin::Signed(member).into(),
-			reason.clone(),
-			beneficiary.clone(),
-			value
-		)?;
-
-		// Create a bunch of tips
-		let reason_hash = T::Hashing::hash(&reason[..]);
-		let hash = T::Hashing::hash_of(&(&reason_hash, &beneficiary));
-		ensure!(Tips::<T, _>::contains_key(hash), "tip does not exist");
-		create_tips::<T, _>(t, hash.clone(), value)?;
-
-		let caller = account("caller", t, SEED);
-		// Whitelist caller account from further DB operations.
-		let caller_key = frame_system::Account::<T>::hashed_key_for(&caller);
-		frame_benchmarking::benchmarking::add_to_whitelist(caller_key.into());
-	}: _(RawOrigin::Signed(caller), hash)
-
-	propose_bounty {
-		let d in 0 .. MAX_BYTES;
-
-		let (caller, curator, fee, value, description) = setup_bounty::<T, _>(0, d);
-	}: _(RawOrigin::Signed(caller), value, description)
-
-	approve_bounty {
-		let (caller, curator, fee, value, reason) = setup_bounty::<T, _>(0, MAX_BYTES);
-		Treasury::<T, _>::propose_bounty(RawOrigin::Signed(caller).into(), value, reason)?;
-		let bounty_id = BountyCount::<I>::get() - 1;
-	}: _(RawOrigin::Root, bounty_id)
-
-	propose_curator {
-		setup_pod_account::<T, _>();
-		let (caller, curator, fee, value, reason) = setup_bounty::<T, _>(0, MAX_BYTES);
-		let curator_lookup = T::Lookup::unlookup(curator.clone());
-		Treasury::<T, _>::propose_bounty(RawOrigin::Signed(caller).into(), value, reason)?;
-		let bounty_id = BountyCount::<I>::get() - 1;
-		Treasury::<T, _>::approve_bounty(RawOrigin::Root.into(), bounty_id)?;
-		Treasury::<T, _>::on_initialize(T::BlockNumber::zero());
-	}: _(RawOrigin::Root, bounty_id, curator_lookup, fee)
-
-	// Worst case when curator is inactive and any sender unassigns the curator.
-	unassign_curator {
-		setup_pod_account::<T, _>();
-		let (curator_lookup, bounty_id) = create_bounty::<T, _>()?;
-		Treasury::<T, _>::on_initialize(T::BlockNumber::zero());
-		let bounty_id = BountyCount::<I>::get() - 1;
-		frame_system::Module::<T>::set_block_number(T::BountyUpdatePeriod::get() + 1u32.into());
-		let caller = whitelisted_caller();
-	}: _(RawOrigin::Signed(caller), bounty_id)
-
-	accept_curator {
-		setup_pod_account::<T, _>();
-		let (caller, curator, fee, value, reason) = setup_bounty::<T, _>(0, MAX_BYTES);
-		let curator_lookup = T::Lookup::unlookup(curator.clone());
-		Treasury::<T, _>::propose_bounty(RawOrigin::Signed(caller).into(), value, reason)?;
-		let bounty_id = BountyCount::<I>::get() - 1;
-		Treasury::<T, _>::approve_bounty(RawOrigin::Root.into(), bounty_id)?;
-		Treasury::<T, _>::on_initialize(T::BlockNumber::zero());
-		Treasury::<T, _>::propose_curator(RawOrigin::Root.into(), bounty_id, curator_lookup, fee)?;
-	}: _(RawOrigin::Signed(curator), bounty_id)
-
-	award_bounty {
-		setup_pod_account::<T, _>();
-		let (curator_lookup, bounty_id) = create_bounty::<T, _>()?;
-		Treasury::<T, _>::on_initialize(T::BlockNumber::zero());
-
-		let bounty_id = BountyCount::<I>::get() - 1;
-		let curator = T::Lookup::lookup(curator_lookup)?;
-		let beneficiary = T::Lookup::unlookup(account("beneficiary", 0, SEED));
-	}: _(RawOrigin::Signed(curator), bounty_id, beneficiary)
-
-	claim_bounty {
-		setup_pod_account::<T, _>();
-		let (curator_lookup, bounty_id) = create_bounty::<T, _>()?;
-		Treasury::<T, _>::on_initialize(T::BlockNumber::zero());
-
-		let bounty_id = BountyCount::<I>::get() - 1;
-		let curator = T::Lookup::lookup(curator_lookup)?;
-
-		let beneficiary = T::Lookup::unlookup(account("beneficiary", 0, SEED));
-		Treasury::<T, _>::award_bounty(RawOrigin::Signed(curator.clone()).into(), bounty_id, beneficiary)?;
-
-		frame_system::Module::<T>::set_block_number(T::BountyDepositPayoutDelay::get());
-
-	}: _(RawOrigin::Signed(curator), bounty_id)
-
-	close_bounty_proposed {
-		setup_pod_account::<T, _>();
-		let (caller, curator, fee, value, reason) = setup_bounty::<T, _>(0, 0);
-		Treasury::<T, _>::propose_bounty(RawOrigin::Signed(caller).into(), value, reason)?;
-		let bounty_id = BountyCount::<I>::get() - 1;
-	}: close_bounty(RawOrigin::Root, bounty_id)
-
-	close_bounty_active {
-		setup_pod_account::<T, _>();
-		let (curator_lookup, bounty_id) = create_bounty::<T, _>()?;
-		Treasury::<T, _>::on_initialize(T::BlockNumber::zero());
-		let bounty_id = BountyCount::<I>::get() - 1;
-	}: close_bounty(RawOrigin::Root, bounty_id)
-
-	extend_bounty_expiry {
-		setup_pod_account::<T, _>();
-		let (curator_lookup, bounty_id) = create_bounty::<T, _>()?;
-		Treasury::<T, _>::on_initialize(T::BlockNumber::zero());
-
-		let bounty_id = BountyCount::<I>::get() - 1;
-		let curator = T::Lookup::lookup(curator_lookup)?;
-	}: _(RawOrigin::Signed(curator), bounty_id, Vec::new())
-
 	on_initialize_proposals {
 		let p in 0 .. 100;
 		setup_pod_account::<T, _>();
@@ -373,14 +102,6 @@ benchmarks_instance! {
 	}: {
 		Treasury::<T, _>::on_initialize(T::BlockNumber::zero());
 	}
-
-	on_initialize_bounties {
-		let b in 0 .. 100;
-		setup_pod_account::<T, _>();
-		create_approved_bounties::<T, _>(b)?;
-	}: {
-		Treasury::<T, _>::on_initialize(T::BlockNumber::zero());
-	}
 }
 
 #[cfg(test)]
@@ -395,23 +116,7 @@ mod tests {
 			assert_ok!(test_benchmark_propose_spend::<Test>());
 			assert_ok!(test_benchmark_reject_proposal::<Test>());
 			assert_ok!(test_benchmark_approve_proposal::<Test>());
-			assert_ok!(test_benchmark_report_awesome::<Test>());
-			assert_ok!(test_benchmark_retract_tip::<Test>());
-			assert_ok!(test_benchmark_tip_new::<Test>());
-			assert_ok!(test_benchmark_tip::<Test>());
-			assert_ok!(test_benchmark_close_tip::<Test>());
-			assert_ok!(test_benchmark_propose_bounty::<Test>());
-			assert_ok!(test_benchmark_approve_bounty::<Test>());
-			assert_ok!(test_benchmark_propose_curator::<Test>());
-			assert_ok!(test_benchmark_unassign_curator::<Test>());
-			assert_ok!(test_benchmark_accept_curator::<Test>());
-			assert_ok!(test_benchmark_award_bounty::<Test>());
-			assert_ok!(test_benchmark_claim_bounty::<Test>());
-			assert_ok!(test_benchmark_close_bounty_proposed::<Test>());
-			assert_ok!(test_benchmark_close_bounty_active::<Test>());
-			assert_ok!(test_benchmark_extend_bounty_expiry::<Test>());
 			assert_ok!(test_benchmark_on_initialize_proposals::<Test>());
-			assert_ok!(test_benchmark_on_initialize_bounties::<Test>());
 		});
 	}
 }
diff --git a/frame/treasury/src/lib.rs b/frame/treasury/src/lib.rs
index 6ccd8f03a159..835cf11d721a 100644
--- a/frame/treasury/src/lib.rs
+++ b/frame/treasury/src/lib.rs
@@ -17,8 +17,8 @@
 
 //! # Treasury Module
 //!
-//! The Treasury module provides a "pot" of funds that can be managed by stakeholders in the
-//! system and a structure for making spending proposals from this pot.
+//! The Treasury module provides a "pot" of funds that can be managed by stakeholders in the system
+//! and a structure for making spending proposals from this pot.
 //!
 //! - [`treasury::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
@@ -32,71 +32,16 @@
 //! By way of example, the Council could vote to fund the Treasury with a portion of the block
 //! reward and use the funds to pay developers.
 //!
-//! ### Tipping
-//!
-//! A separate subsystem exists to allow for an agile "tipping" process, whereby a reward may be
-//! given without first having a pre-determined stakeholder group come to consensus on how much
-//! should be paid.
-//!
-//! A group of `Tippers` is determined through the config `Config`. After half of these have declared
-//! some amount that they believe a particular reported reason deserves, then a countdown period is
-//! entered where any remaining members can declare their tip amounts also. After the close of the
-//! countdown period, the median of all declared tips is paid to the reported beneficiary, along
-//! with any finders fee, in case of a public (and bonded) original report.
-//!
-//! ### Bounty
-//!
-//! A Bounty Spending is a reward for a specified body of work - or specified set of objectives - that
-//! needs to be executed for a predefined Treasury amount to be paid out. A curator is assigned after
-//! the bounty is approved and funded by Council, to be delegated
-//! with the responsibility of assigning a payout address once the specified set of objectives is completed.
-//!
-//! After the Council has activated a bounty, it delegates the work that requires expertise to a curator
-//! in exchange of a deposit. Once the curator accepts the bounty, they
-//! get to close the Active bounty. Closing the Active bounty enacts a delayed payout to the payout
-//! address, the curator fee and the return of the curator deposit. The
-//! delay allows for intervention through regular democracy. The Council gets to unassign the curator,
-//! resulting in a new curator election. The Council also gets to cancel
-//! the bounty if deemed necessary before assigning a curator or once the bounty is active or payout
-//! is pending, resulting in the slash of the curator's deposit.
-//!
 //!
 //! ### Terminology
 //!
 //! - **Proposal:** A suggestion to allocate funds from the pot to a beneficiary.
-//! - **Beneficiary:** An account who will receive the funds from a proposal iff
-//! the proposal is approved.
-//! - **Deposit:** Funds that a proposer must lock when making a proposal. The
-//! deposit will be returned or slashed if the proposal is approved or rejected
-//! respectively.
+//! - **Beneficiary:** An account who will receive the funds from a proposal iff the proposal is
+//!   approved.
+//! - **Deposit:** Funds that a proposer must lock when making a proposal. The deposit will be
+//!   returned or slashed if the proposal is approved or rejected respectively.
 //! - **Pot:** Unspent funds accumulated by the treasury module.
 //!
-//! Tipping protocol:
-//! - **Tipping:** The process of gathering declarations of amounts to tip and taking the median
-//!   amount to be transferred from the treasury to a beneficiary account.
-//! - **Tip Reason:** The reason for a tip; generally a URL which embodies or explains why a
-//!   particular individual (identified by an account ID) is worthy of a recognition by the
-//!   treasury.
-//! - **Finder:** The original public reporter of some reason for tipping.
-//! - **Finders Fee:** Some proportion of the tip amount that is paid to the reporter of the tip,
-//!   rather than the main beneficiary.
-//!
-//! Bounty:
-//! - **Bounty spending proposal:** A proposal to reward a predefined body of work upon completion by
-//! the Treasury.
-//! - **Proposer:** An account proposing a bounty spending.
-//! - **Curator:** An account managing the bounty and assigning a payout address receiving the reward
-//! for the completion of work.
-//! - **Deposit:** The amount held on deposit for placing a bounty proposal plus the amount held on
-//! deposit per byte within the bounty description.
-//! - **Curator deposit:** The payment from a candidate willing to curate an approved bounty. The deposit
-//! is returned when/if the bounty is completed.
-//! - **Bounty value:** The total amount that should be paid to the Payout Address if the bounty is
-//! rewarded.
-//! - **Payout address:** The account to which the total or part of the bounty is assigned to.
-//! - **Payout Delay:** The delay period for which a bounty beneficiary needs to wait before claiming.
-//! - **Curator fee:** The reserved upfront payment for a curator for work related to the bounty.
-//!
 //! ## Interface
 //!
 //! ### Dispatchable Functions
@@ -106,59 +51,40 @@
 //! - `reject_proposal` - Reject a proposal, slashing the deposit.
 //! - `approve_proposal` - Accept the proposal, returning the deposit.
 //!
-//! Tipping protocol:
-//! - `report_awesome` - Report something worthy of a tip and register for a finders fee.
-//! - `retract_tip` - Retract a previous (finders fee registered) report.
-//! - `tip_new` - Report an item worthy of a tip and declare a specific amount to tip.
-//! - `tip` - Declare or redeclare an amount to tip for a particular reason.
-//! - `close_tip` - Close and pay out a tip.
-//!
-//! Bounty protocol:
-//! - `propose_bounty` - Propose a specific treasury amount to be earmarked for a predefined set of
-//! tasks and stake the required deposit.
-//! - `approve_bounty` - Accept a specific treasury amount to be earmarked for a predefined body of work.
-//! - `propose_curator` - Assign an account to a bounty as candidate curator.
-//! - `accept_curator` - Accept a bounty assignment from the Council, setting a curator deposit.
-//! - `extend_bounty_expiry` - Extend the expiry block number of the bounty and stay active.
-//! - `award_bounty` - Close and pay out the specified amount for the completed work.
-//! - `claim_bounty` - Claim a specific bounty amount from the Payout Address.
-//! - `unassign_curator` - Unassign an accepted curator from a specific earmark.
-//! - `close_bounty` - Cancel the earmark for a specific treasury amount and close the bounty.
-//!
-//!
 //! ## GenesisConfig
 //!
 //! The Treasury module depends on the [`GenesisConfig`](./struct.GenesisConfig.html).
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
+#[cfg(test)]
 mod tests;
 mod benchmarking;
+
 pub mod weights;
 
 #[cfg(feature = "std")]
 use serde::{Serialize, Deserialize};
 use sp_std::prelude::*;
-use frame_support::{decl_module, decl_storage, decl_event, ensure, print, decl_error, Parameter};
+use frame_support::{decl_module, decl_storage, decl_event, ensure, print, decl_error};
 use frame_support::traits::{
-	Currency, Get, Imbalance, OnUnbalanced, ExistenceRequirement::{KeepAlive, AllowDeath},
+	Currency, Get, Imbalance, OnUnbalanced, ExistenceRequirement::{KeepAlive},
 	ReservableCurrency, WithdrawReasons
 };
-use sp_runtime::{Permill, ModuleId, Percent, RuntimeDebug, DispatchResult, traits::{
-	Zero, StaticLookup, AccountIdConversion, Saturating, Hash, BadOrigin
+use sp_runtime::{Permill, ModuleId, RuntimeDebug, traits::{
+	Zero, StaticLookup, AccountIdConversion, Saturating
 }};
-use frame_support::dispatch::DispatchResultWithPostInfo;
 use frame_support::weights::{Weight, DispatchClass};
-use frame_support::traits::{Contains, ContainsLengthBound, EnsureOrigin};
+use frame_support::traits::{EnsureOrigin};
 use codec::{Encode, Decode};
-use frame_system::{self as system, ensure_signed};
+use frame_system::{ensure_signed};
 pub use weights::WeightInfo;
 
-type BalanceOf<T, I> =
+pub type BalanceOf<T, I=DefaultInstance> =
 	<<T as Config<I>>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
-type PositiveImbalanceOf<T, I> =
+pub type PositiveImbalanceOf<T, I=DefaultInstance> =
 	<<T as Config<I>>::Currency as Currency<<T as frame_system::Config>::AccountId>>::PositiveImbalance;
-type NegativeImbalanceOf<T, I> =
+pub type NegativeImbalanceOf<T, I=DefaultInstance> =
 	<<T as Config<I>>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
 
 pub trait Config<I=DefaultInstance>: frame_system::Config {
@@ -174,23 +100,6 @@ pub trait Config<I=DefaultInstance>: frame_system::Config {
 	/// Origin from which rejections must come.
 	type RejectOrigin: EnsureOrigin<Self::Origin>;
 
-	/// Origin from which tippers must come.
-	///
-	/// `ContainsLengthBound::max_len` must be cost free (i.e. no storage read or heavy operation).
-	type Tippers: Contains<Self::AccountId> + ContainsLengthBound;
-
-	/// The period for which a tip remains open after is has achieved threshold tippers.
-	type TipCountdown: Get<Self::BlockNumber>;
-
-	/// The percent of the final tip which goes to the original reporter of the tip.
-	type TipFindersFee: Get<Percent>;
-
-	/// The amount held on deposit for placing a tip report.
-	type TipReportDepositBase: Get<BalanceOf<Self, I>>;
-
-	/// The amount held on deposit per byte within the tip report reason or bounty description.
-	type DataDepositPerByte: Get<BalanceOf<Self, I>>;
-
 	/// The overarching event type.
 	type Event: From<Event<Self, I>> + Into<<Self as frame_system::Config>::Event>;
 
@@ -210,29 +119,36 @@ pub trait Config<I=DefaultInstance>: frame_system::Config {
 	/// Percentage of spare funds (if any) that are burnt per spend period.
 	type Burn: Get<Permill>;
 
-	/// The amount held on deposit for placing a bounty proposal.
-	type BountyDepositBase: Get<BalanceOf<Self, I>>;
-
-	/// The delay period for which a bounty beneficiary need to wait before claim the payout.
-	type BountyDepositPayoutDelay: Get<Self::BlockNumber>;
-
-	/// Bounty duration in blocks.
-	type BountyUpdatePeriod: Get<Self::BlockNumber>;
-
-	/// Percentage of the curator fee that will be reserved upfront as deposit for bounty curator.
-	type BountyCuratorDeposit: Get<Permill>;
-
-	/// Minimum value for a bounty.
-	type BountyValueMinimum: Get<BalanceOf<Self, I>>;
-
-	/// Maximum acceptable reason length.
-	type MaximumReasonLength: Get<u32>;
-
 	/// Handler for the unbalanced decrease when treasury funds are burned.
 	type BurnDestination: OnUnbalanced<NegativeImbalanceOf<Self, I>>;
 
 	/// Weight information for extrinsics in this pallet.
 	type WeightInfo: WeightInfo;
+
+	/// Runtime hooks to external pallet using treasury to compute spend funds.
+	type SpendFunds: SpendFunds<Self, I>;
+}
+
+/// A trait to allow the Treasury Pallet to spend it's funds for other purposes.
+/// There is an expectation that the implementer of this trait will correctly manage
+/// the mutable variables passed to it:
+/// * `budget_remaining`: How much available funds that can be spent by the treasury.
+///    As funds are spent, you must correctly deduct from this value.
+/// * `imbalance`: Any imbalances that you create should be subsumed in here to
+///    maximize efficiency of updating the total issuance. (i.e. `deposit_creating`)
+/// * `total_weight`: Track any weight that your `spend_fund` implementation uses by
+///    updating this value.
+/// * `missed_any`: If there were items that you want to spend on, but there were
+///    not enough funds, mark this value as `true`. This will prevent the treasury
+///    from burning the excess funds.
+#[impl_trait_for_tuples::impl_for_tuples(30)]
+pub trait SpendFunds<T: Config<I>, I=DefaultInstance> {
+	fn spend_funds(
+		budget_remaining: &mut BalanceOf<T, I>,
+		imbalance: &mut PositiveImbalanceOf<T, I>,
+		total_weight: &mut Weight,
+		missed_any: &mut bool,
+	);
 }
 
 /// An index of a proposal. Just a `u32`.
@@ -252,122 +168,18 @@ pub struct Proposal<AccountId, Balance> {
 	bond: Balance,
 }
 
-/// An open tipping "motion". Retains all details of a tip including information on the finder
-/// and the members who have voted.
-#[derive(Clone, Eq, PartialEq, Encode, Decode, RuntimeDebug)]
-pub struct OpenTip<
-	AccountId: Parameter,
-	Balance: Parameter,
-	BlockNumber: Parameter,
-	Hash: Parameter,
-> {
-	/// The hash of the reason for the tip. The reason should be a human-readable UTF-8 encoded string. A URL would be
-	/// sensible.
-	reason: Hash,
-	/// The account to be tipped.
-	who: AccountId,
-	/// The account who began this tip.
-	finder: AccountId,
-	/// The amount held on deposit for this tip.
-	deposit: Balance,
-	/// The block number at which this tip will close if `Some`. If `None`, then no closing is
-	/// scheduled.
-	closes: Option<BlockNumber>,
-	/// The members who have voted for this tip. Sorted by AccountId.
-	tips: Vec<(AccountId, Balance)>,
-	/// Whether this tip should result in the finder taking a fee.
-	finders_fee: bool,
-}
-
-/// An index of a bounty. Just a `u32`.
-pub type BountyIndex = u32;
-
-/// A bounty proposal.
-#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug)]
-pub struct Bounty<AccountId, Balance, BlockNumber> {
-	/// The account proposing it.
-	proposer: AccountId,
-	/// The (total) amount that should be paid if the bounty is rewarded.
-	value: Balance,
-	/// The curator fee. Included in value.
-	fee: Balance,
-	/// The deposit of curator.
-	curator_deposit: Balance,
-	/// The amount held on deposit (reserved) for making this proposal.
-	bond: Balance,
-	/// The status of this bounty.
-	status: BountyStatus<AccountId, BlockNumber>,
-}
-
-/// The status of a bounty proposal.
-#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug)]
-pub enum BountyStatus<AccountId, BlockNumber> {
-	/// The bounty is proposed and waiting for approval.
-	Proposed,
-	/// The bounty is approved and waiting to become active at next spend period.
-	Approved,
-	/// The bounty is funded and waiting for curator assignment.
-	Funded,
-	/// A curator has been proposed by the `ApproveOrigin`. Waiting for acceptance from the curator.
-	CuratorProposed {
-		/// The assigned curator of this bounty.
-		curator: AccountId,
-	},
-	/// The bounty is active and waiting to be awarded.
-	Active {
-		/// The curator of this bounty.
-		curator: AccountId,
-		/// An update from the curator is due by this block, else they are considered inactive.
-		update_due: BlockNumber,
-	},
-	/// The bounty is awarded and waiting to released after a delay.
-	PendingPayout {
-		/// The curator of this bounty.
-		curator: AccountId,
-		/// The beneficiary of the bounty.
-		beneficiary: AccountId,
-		/// When the bounty can be claimed.
-		unlock_at: BlockNumber,
-	},
-}
-
 decl_storage! {
 	trait Store for Module<T: Config<I>, I: Instance=DefaultInstance> as Treasury {
 		/// Number of proposals that have been made.
 		ProposalCount get(fn proposal_count): ProposalIndex;
 
 		/// Proposals that have been made.
-		Proposals get(fn proposals):
+		pub Proposals get(fn proposals):
 			map hasher(twox_64_concat) ProposalIndex
 			=> Option<Proposal<T::AccountId, BalanceOf<T, I>>>;
 
 		/// Proposal indices that have been approved but not yet awarded.
-		Approvals get(fn approvals): Vec<ProposalIndex>;
-
-		/// Tips that are not yet completed. Keyed by the hash of `(reason, who)` from the value.
-		/// This has the insecure enumerable hash function since the key itself is already
-		/// guaranteed to be a secure hash.
-		pub Tips get(fn tips):
-			map hasher(twox_64_concat) T::Hash
-			=> Option<OpenTip<T::AccountId, BalanceOf<T, I>, T::BlockNumber, T::Hash>>;
-
-		/// Simple preimage lookup from the reason's hash to the original data. Again, has an
-		/// insecure enumerable hash since the key is guaranteed to be the result of a secure hash.
-		pub Reasons get(fn reasons): map hasher(identity) T::Hash => Option<Vec<u8>>;
-
-		/// Number of bounty proposals that have been made.
-		pub BountyCount get(fn bounty_count): BountyIndex;
-
-		/// Bounties that have been made.
-		pub Bounties get(fn bounties):
-			map hasher(twox_64_concat) BountyIndex
-			=> Option<Bounty<T::AccountId, BalanceOf<T, I>, T::BlockNumber>>;
-
-		/// The description of each bounty.
-		pub BountyDescriptions get(fn bounty_descriptions): map hasher(twox_64_concat) BountyIndex => Option<Vec<u8>>;
-
-		/// Bounty indices that have been approved but not yet funded.
-		pub BountyApprovals get(fn bounty_approvals): Vec<BountyIndex>;
+		pub Approvals get(fn approvals): Vec<ProposalIndex>;
 	}
 	add_extra_genesis {
 		build(|_config| {
@@ -389,7 +201,6 @@ decl_event!(
 	where
 		Balance = BalanceOf<T, I>,
 		<T as frame_system::Config>::AccountId,
-		<T as frame_system::Config>::Hash,
 	{
 		/// New proposal. \[proposal_index\]
 		Proposed(ProposalIndex),
@@ -406,28 +217,6 @@ decl_event!(
 		Rollover(Balance),
 		/// Some funds have been deposited. \[deposit\]
 		Deposit(Balance),
-		/// A new tip suggestion has been opened. \[tip_hash\]
-		NewTip(Hash),
-		/// A tip suggestion has reached threshold and is closing. \[tip_hash\]
-		TipClosing(Hash),
-		/// A tip suggestion has been closed. \[tip_hash, who, payout\]
-		TipClosed(Hash, AccountId, Balance),
-		/// A tip suggestion has been retracted. \[tip_hash\]
-		TipRetracted(Hash),
-		/// New bounty proposal. \[index\]
-		BountyProposed(BountyIndex),
-		/// A bounty proposal was rejected; funds were slashed. [index, bond]
-		BountyRejected(BountyIndex, Balance),
-		/// A bounty proposal is funded and became active. \[index\]
-		BountyBecameActive(BountyIndex),
-		/// A bounty is awarded to a beneficiary. [index, beneficiary]
-		BountyAwarded(BountyIndex, AccountId),
-		/// A bounty is claimed by beneficiary. [index, payout, beneficiary]
-		BountyClaimed(BountyIndex, Balance, AccountId),
-		/// A bounty is cancelled. \[index\]
-		BountyCanceled(BountyIndex),
-		/// A bounty expiry is extended. \[index\]
-		BountyExtended(BountyIndex),
 	}
 );
 
@@ -438,29 +227,6 @@ decl_error! {
 		InsufficientProposersBalance,
 		/// No proposal or bounty at that index.
 		InvalidIndex,
-		/// The reason given is just too big.
-		ReasonTooBig,
-		/// The tip was already found/started.
-		AlreadyKnown,
-		/// The tip hash is unknown.
-		UnknownTip,
-		/// The account attempting to retract the tip is not the finder of the tip.
-		NotFinder,
-		/// The tip cannot be claimed/closed because there are not enough tippers yet.
-		StillOpen,
-		/// The tip cannot be claimed/closed because it's still in the countdown period.
-		Premature,
-		/// The bounty status is unexpected.
-		UnexpectedStatus,
-		/// Require bounty curator.
-		RequireCurator,
-		/// Invalid bounty value.
-		InvalidValue,
-		/// Invalid bounty fee.
-		InvalidFee,
-		/// A bounty payout is pending.
-		/// To cancel the bounty, you must unassign and slash the curator.
-		PendingPayout,
 	}
 }
 
@@ -482,35 +248,9 @@ decl_module! {
 		/// Percentage of spare funds (if any) that are burnt per spend period.
 		const Burn: Permill = T::Burn::get();
 
-		/// The period for which a tip remains open after is has achieved threshold tippers.
-		const TipCountdown: T::BlockNumber = T::TipCountdown::get();
-
-		/// The amount of the final tip which goes to the original reporter of the tip.
-		const TipFindersFee: Percent = T::TipFindersFee::get();
-
-		/// The amount held on deposit for placing a tip report.
-		const TipReportDepositBase: BalanceOf<T, I> = T::TipReportDepositBase::get();
-
-		/// The amount held on deposit per byte within the tip report reason or bounty description.
-		const DataDepositPerByte: BalanceOf<T, I> = T::DataDepositPerByte::get();
-
 		/// The treasury's module id, used for deriving its sovereign account ID.
 		const ModuleId: ModuleId = T::ModuleId::get();
 
-		/// The amount held on deposit for placing a bounty proposal.
-		const BountyDepositBase: BalanceOf<T, I> = T::BountyDepositBase::get();
-
-		/// The delay period for which a bounty beneficiary need to wait before claim the payout.
-		const BountyDepositPayoutDelay: T::BlockNumber = T::BountyDepositPayoutDelay::get();
-
-		/// Percentage of the curator fee that will be reserved upfront as deposit for bounty curator.
-		const BountyCuratorDeposit: Permill = T::BountyCuratorDeposit::get();
-
-		const BountyValueMinimum: BalanceOf<T, I> = T::BountyValueMinimum::get();
-
-		/// Maximum acceptable reason length.
-		const MaximumReasonLength: u32 = T::MaximumReasonLength::get();
-
 		type Error = Error<T, I>;
 
 		fn deposit_event() = default;
@@ -525,7 +265,7 @@ decl_module! {
 		/// - DbWrites: `ProposalCount`, `Proposals`, `origin account`
 		/// # </weight>
 		#[weight = T::WeightInfo::propose_spend()]
-		fn propose_spend(
+		pub fn propose_spend(
 			origin,
 			#[compact] value: BalanceOf<T, I>,
 			beneficiary: <T::Lookup as StaticLookup>::Source
@@ -554,7 +294,7 @@ decl_module! {
 		/// - DbWrites: `Proposals`, `rejected proposer account`
 		/// # </weight>
 		#[weight = (T::WeightInfo::reject_proposal(), DispatchClass::Operational)]
-		fn reject_proposal(origin, #[compact] proposal_id: ProposalIndex) {
+		pub fn reject_proposal(origin, #[compact] proposal_id: ProposalIndex) {
 			T::RejectOrigin::ensure_origin(origin)?;
 
 			let proposal = <Proposals<T, I>>::take(&proposal_id).ok_or(Error::<T, I>::InvalidIndex)?;
@@ -576,571 +316,13 @@ decl_module! {
 		/// - DbWrite: `Approvals`
 		/// # </weight>
 		#[weight = (T::WeightInfo::approve_proposal(), DispatchClass::Operational)]
-		fn approve_proposal(origin, #[compact] proposal_id: ProposalIndex) {
+		pub fn approve_proposal(origin, #[compact] proposal_id: ProposalIndex) {
 			T::ApproveOrigin::ensure_origin(origin)?;
 
 			ensure!(<Proposals<T, I>>::contains_key(proposal_id), Error::<T, I>::InvalidIndex);
 			Approvals::<I>::append(proposal_id);
 		}
 
-		/// Report something `reason` that deserves a tip and claim any eventual the finder's fee.
-		///
-		/// The dispatch origin for this call must be _Signed_.
-		///
-		/// Payment: `TipReportDepositBase` will be reserved from the origin account, as well as
-		/// `DataDepositPerByte` for each byte in `reason`.
-		///
-		/// - `reason`: The reason for, or the thing that deserves, the tip; generally this will be
-		///   a UTF-8-encoded URL.
-		/// - `who`: The account which should be credited for the tip.
-		///
-		/// Emits `NewTip` if successful.
-		///
-		/// # <weight>
-		/// - Complexity: `O(R)` where `R` length of `reason`.
-		///   - encoding and hashing of 'reason'
-		/// - DbReads: `Reasons`, `Tips`
-		/// - DbWrites: `Reasons`, `Tips`
-		/// # </weight>
-		#[weight = T::WeightInfo::report_awesome(reason.len() as u32)]
-		fn report_awesome(origin, reason: Vec<u8>, who: T::AccountId) {
-			let finder = ensure_signed(origin)?;
-
-			ensure!(reason.len() <= T::MaximumReasonLength::get() as usize, Error::<T, I>::ReasonTooBig);
-
-			let reason_hash = T::Hashing::hash(&reason[..]);
-			ensure!(!Reasons::<T, I>::contains_key(&reason_hash), Error::<T, I>::AlreadyKnown);
-			let hash = T::Hashing::hash_of(&(&reason_hash, &who));
-			ensure!(!Tips::<T, I>::contains_key(&hash), Error::<T, I>::AlreadyKnown);
-
-			let deposit = T::TipReportDepositBase::get()
-				+ T::DataDepositPerByte::get() * (reason.len() as u32).into();
-			T::Currency::reserve(&finder, deposit)?;
-
-			Reasons::<T, I>::insert(&reason_hash, &reason);
-			let tip = OpenTip {
-				reason: reason_hash,
-				who,
-				finder,
-				deposit,
-				closes: None,
-				tips: vec![],
-				finders_fee: true
-			};
-			Tips::<T, I>::insert(&hash, tip);
-			Self::deposit_event(RawEvent::NewTip(hash));
-		}
-
-		/// Retract a prior tip-report from `report_awesome`, and cancel the process of tipping.
-		///
-		/// If successful, the original deposit will be unreserved.
-		///
-		/// The dispatch origin for this call must be _Signed_ and the tip identified by `hash`
-		/// must have been reported by the signing account through `report_awesome` (and not
-		/// through `tip_new`).
-		///
-		/// - `hash`: The identity of the open tip for which a tip value is declared. This is formed
-		///   as the hash of the tuple of the original tip `reason` and the beneficiary account ID.
-		///
-		/// Emits `TipRetracted` if successful.
-		///
-		/// # <weight>
-		/// - Complexity: `O(1)`
-		///   - Depends on the length of `T::Hash` which is fixed.
-		/// - DbReads: `Tips`, `origin account`
-		/// - DbWrites: `Reasons`, `Tips`, `origin account`
-		/// # </weight>
-		#[weight = T::WeightInfo::retract_tip()]
-		fn retract_tip(origin, hash: T::Hash) {
-			let who = ensure_signed(origin)?;
-			let tip = Tips::<T, I>::get(&hash).ok_or(Error::<T, I>::UnknownTip)?;
-			ensure!(tip.finder == who, Error::<T, I>::NotFinder);
-
-			Reasons::<T, I>::remove(&tip.reason);
-			Tips::<T, I>::remove(&hash);
-			if !tip.deposit.is_zero() {
-				let _ = T::Currency::unreserve(&who, tip.deposit);
-			}
-			Self::deposit_event(RawEvent::TipRetracted(hash));
-		}
-
-		/// Give a tip for something new; no finder's fee will be taken.
-		///
-		/// The dispatch origin for this call must be _Signed_ and the signing account must be a
-		/// member of the `Tippers` set.
-		///
-		/// - `reason`: The reason for, or the thing that deserves, the tip; generally this will be
-		///   a UTF-8-encoded URL.
-		/// - `who`: The account which should be credited for the tip.
-		/// - `tip_value`: The amount of tip that the sender would like to give. The median tip
-		///   value of active tippers will be given to the `who`.
-		///
-		/// Emits `NewTip` if successful.
-		///
-		/// # <weight>
-		/// - Complexity: `O(R + T)` where `R` length of `reason`, `T` is the number of tippers.
-		///   - `O(T)`: decoding `Tipper` vec of length `T`
-		///     `T` is charged as upper bound given by `ContainsLengthBound`.
-		///     The actual cost depends on the implementation of `T::Tippers`.
-		///   - `O(R)`: hashing and encoding of reason of length `R`
-		/// - DbReads: `Tippers`, `Reasons`
-		/// - DbWrites: `Reasons`, `Tips`
-		/// # </weight>
-		#[weight = T::WeightInfo::tip_new(reason.len() as u32, T::Tippers::max_len() as u32)]
-		fn tip_new(origin, reason: Vec<u8>, who: T::AccountId, #[compact] tip_value: BalanceOf<T, I>) {
-			let tipper = ensure_signed(origin)?;
-			ensure!(T::Tippers::contains(&tipper), BadOrigin);
-			let reason_hash = T::Hashing::hash(&reason[..]);
-			ensure!(!Reasons::<T, I>::contains_key(&reason_hash), Error::<T, I>::AlreadyKnown);
-			let hash = T::Hashing::hash_of(&(&reason_hash, &who));
-
-			Reasons::<T, I>::insert(&reason_hash, &reason);
-			Self::deposit_event(RawEvent::NewTip(hash.clone()));
-			let tips = vec![(tipper.clone(), tip_value)];
-			let tip = OpenTip {
-				reason: reason_hash,
-				who,
-				finder: tipper,
-				deposit: Zero::zero(),
-				closes: None,
-				tips,
-				finders_fee: false,
-			};
-			Tips::<T, I>::insert(&hash, tip);
-		}
-
-		/// Declare a tip value for an already-open tip.
-		///
-		/// The dispatch origin for this call must be _Signed_ and the signing account must be a
-		/// member of the `Tippers` set.
-		///
-		/// - `hash`: The identity of the open tip for which a tip value is declared. This is formed
-		///   as the hash of the tuple of the hash of the original tip `reason` and the beneficiary
-		///   account ID.
-		/// - `tip_value`: The amount of tip that the sender would like to give. The median tip
-		///   value of active tippers will be given to the `who`.
-		///
-		/// Emits `TipClosing` if the threshold of tippers has been reached and the countdown period
-		/// has started.
-		///
-		/// # <weight>
-		/// - Complexity: `O(T)` where `T` is the number of tippers.
-		///   decoding `Tipper` vec of length `T`, insert tip and check closing,
-		///   `T` is charged as upper bound given by `ContainsLengthBound`.
-		///   The actual cost depends on the implementation of `T::Tippers`.
-		///
-		///   Actually weight could be lower as it depends on how many tips are in `OpenTip` but it
-		///   is weighted as if almost full i.e of length `T-1`.
-		/// - DbReads: `Tippers`, `Tips`
-		/// - DbWrites: `Tips`
-		/// # </weight>
-		#[weight = T::WeightInfo::tip(T::Tippers::max_len() as u32)]
-		fn tip(origin, hash: T::Hash, #[compact] tip_value: BalanceOf<T, I>) {
-			let tipper = ensure_signed(origin)?;
-			ensure!(T::Tippers::contains(&tipper), BadOrigin);
-
-			let mut tip = Tips::<T, I>::get(hash).ok_or(Error::<T, I>::UnknownTip)?;
-			if Self::insert_tip_and_check_closing(&mut tip, tipper, tip_value) {
-				Self::deposit_event(RawEvent::TipClosing(hash.clone()));
-			}
-			Tips::<T, I>::insert(&hash, tip);
-		}
-
-		/// Close and payout a tip.
-		///
-		/// The dispatch origin for this call must be _Signed_.
-		///
-		/// The tip identified by `hash` must have finished its countdown period.
-		///
-		/// - `hash`: The identity of the open tip for which a tip value is declared. This is formed
-		///   as the hash of the tuple of the original tip `reason` and the beneficiary account ID.
-		///
-		/// # <weight>
-		/// - Complexity: `O(T)` where `T` is the number of tippers.
-		///   decoding `Tipper` vec of length `T`.
-		///   `T` is charged as upper bound given by `ContainsLengthBound`.
-		///   The actual cost depends on the implementation of `T::Tippers`.
-		/// - DbReads: `Tips`, `Tippers`, `tip finder`
-		/// - DbWrites: `Reasons`, `Tips`, `Tippers`, `tip finder`
-		/// # </weight>
-		#[weight = T::WeightInfo::close_tip(T::Tippers::max_len() as u32)]
-		fn close_tip(origin, hash: T::Hash) {
-			ensure_signed(origin)?;
-
-			let tip = Tips::<T, I>::get(hash).ok_or(Error::<T, I>::UnknownTip)?;
-			let n = tip.closes.as_ref().ok_or(Error::<T, I>::StillOpen)?;
-			ensure!(system::Module::<T>::block_number() >= *n, Error::<T, I>::Premature);
-			// closed.
-			Reasons::<T, I>::remove(&tip.reason);
-			Tips::<T, I>::remove(hash);
-			Self::payout_tip(hash, tip);
-		}
-
-		/// Propose a new bounty.
-		///
-		/// The dispatch origin for this call must be _Signed_.
-		///
-		/// Payment: `TipReportDepositBase` will be reserved from the origin account, as well as
-		/// `DataDepositPerByte` for each byte in `reason`. It will be unreserved upon approval,
-		/// or slashed when rejected.
-		///
-		/// - `curator`: The curator account whom will manage this bounty.
-		/// - `fee`: The curator fee.
-		/// - `value`: The total payment amount of this bounty, curator fee included.
-		/// - `description`: The description of this bounty.
-		#[weight = T::WeightInfo::propose_bounty(description.len() as u32)]
-		fn propose_bounty(
-			origin,
-			#[compact] value: BalanceOf<T, I>,
-			description: Vec<u8>,
-		) {
-			let proposer = ensure_signed(origin)?;
-			Self::create_bounty(proposer, description, value)?;
-		}
-
-		/// Approve a bounty proposal. At a later time, the bounty will be funded and become active
-		/// and the original deposit will be returned.
-		///
-		/// May only be called from `T::ApproveOrigin`.
-		///
-		/// # <weight>
-		/// - O(1).
-		/// - Limited storage reads.
-		/// - One DB change.
-		/// # </weight>
-		#[weight = T::WeightInfo::approve_bounty()]
-		fn approve_bounty(origin, #[compact] bounty_id: ProposalIndex) {
-			T::ApproveOrigin::ensure_origin(origin)?;
-
-			Bounties::<T, I>::try_mutate_exists(bounty_id, |maybe_bounty| -> DispatchResult {
-				let mut bounty = maybe_bounty.as_mut().ok_or(Error::<T, I>::InvalidIndex)?;
-				ensure!(bounty.status == BountyStatus::Proposed, Error::<T, I>::UnexpectedStatus);
-
-				bounty.status = BountyStatus::Approved;
-
-				BountyApprovals::<I>::append(bounty_id);
-
-				Ok(())
-			})?;
-		}
-
-		/// Assign a curator to a funded bounty.
-		///
-		/// May only be called from `T::ApproveOrigin`.
-		///
-		/// # <weight>
-		/// - O(1).
-		/// - Limited storage reads.
-		/// - One DB change.
-		/// # </weight>
-		#[weight = T::WeightInfo::propose_curator()]
-		fn propose_curator(
-			origin,
-			#[compact] bounty_id: ProposalIndex,
-			curator: <T::Lookup as StaticLookup>::Source,
-			#[compact] fee: BalanceOf<T, I>,
-		) {
-			T::ApproveOrigin::ensure_origin(origin)?;
-
-			let curator = T::Lookup::lookup(curator)?;
-			Bounties::<T, I>::try_mutate_exists(bounty_id, |maybe_bounty| -> DispatchResult {
-				let mut bounty = maybe_bounty.as_mut().ok_or(Error::<T, I>::InvalidIndex)?;
-				match bounty.status {
-					BountyStatus::Funded | BountyStatus::CuratorProposed { .. } => {},
-					_ => return Err(Error::<T, I>::UnexpectedStatus.into()),
-				};
-
-				ensure!(fee < bounty.value, Error::<T, I>::InvalidFee);
-
-				bounty.status = BountyStatus::CuratorProposed { curator };
-				bounty.fee = fee;
-
-				Ok(())
-			})?;
-		}
-
-		/// Unassign curator from a bounty.
-		///
-		/// This function can only be called by the `RejectOrigin` a signed origin.
-		///
-		/// If this function is called by the `RejectOrigin`, we assume that the curator is malicious
-		/// or inactive. As a result, we will slash the curator when possible.
-		///
-		/// If the origin is the curator, we take this as a sign they are unable to do their job and
-		/// they willingly give up. We could slash them, but for now we allow them to recover their
-		/// deposit and exit without issue. (We may want to change this if it is abused.)
-		///
-		/// Finally, the origin can be anyone if and only if the curator is "inactive". This allows
-		/// anyone in the community to call out that a curator is not doing their due diligence, and
-		/// we should pick a new curator. In this case the curator should also be slashed.
-		///
-		/// # <weight>
-		/// - O(1).
-		/// - Limited storage reads.
-		/// - One DB change.
-		/// # </weight>
-		#[weight = T::WeightInfo::unassign_curator()]
-		fn unassign_curator(
-			origin,
-			#[compact] bounty_id: ProposalIndex,
-		) {
-			let maybe_sender = ensure_signed(origin.clone())
-				.map(Some)
-				.or_else(|_| T::RejectOrigin::ensure_origin(origin).map(|_| None))?;
-
-			Bounties::<T, I>::try_mutate_exists(bounty_id, |maybe_bounty| -> DispatchResult {
-				let mut bounty = maybe_bounty.as_mut().ok_or(Error::<T, I>::InvalidIndex)?;
-
-				let slash_curator = |curator: &T::AccountId, curator_deposit: &mut BalanceOf<T, I>| {
-					let imbalance = T::Currency::slash_reserved(curator, *curator_deposit).0;
-					T::OnSlash::on_unbalanced(imbalance);
-					*curator_deposit = Zero::zero();
-				};
-
-				match bounty.status {
-					BountyStatus::Proposed | BountyStatus::Approved | BountyStatus::Funded => {
-						// No curator to unassign at this point.
-						return Err(Error::<T, I>::UnexpectedStatus.into())
-					}
-					BountyStatus::CuratorProposed { ref curator } => {
-						// A curator has been proposed, but not accepted yet.
-						// Either `RejectOrigin` or the proposed curator can unassign the curator.
-						ensure!(maybe_sender.map_or(true, |sender| sender == *curator), BadOrigin);
-					},
-					BountyStatus::Active { ref curator, ref update_due } => {
-						// The bounty is active.
-						match maybe_sender {
-							// If the `RejectOrigin` is calling this function, slash the curator.
-							None => {
-								slash_curator(curator, &mut bounty.curator_deposit);
-								// Continue to change bounty status below...
-							},
-							Some(sender) => {
-								// If the sender is not the curator, and the curator is inactive,
-								// slash the curator.
-								if sender != *curator {
-									let block_number = system::Module::<T>::block_number();
-									if *update_due < block_number {
-										slash_curator(curator, &mut bounty.curator_deposit);
-										// Continue to change bounty status below...
-									} else {
-										// Curator has more time to give an update.
-										return Err(Error::<T, I>::Premature.into())
-									}
-								} else {
-									// Else this is the curator, willingly giving up their role.
-									// Give back their deposit.
-									let _ = T::Currency::unreserve(&curator, bounty.curator_deposit);
-									// Continue to change bounty status below...
-								}
-							},
-						}
-					},
-					BountyStatus::PendingPayout { ref curator, .. } => {
-						// The bounty is pending payout, so only council can unassign a curator.
-						// By doing so, they are claiming the curator is acting maliciously, so
-						// we slash the curator.
-						ensure!(maybe_sender.is_none(), BadOrigin);
-						slash_curator(curator, &mut bounty.curator_deposit);
-						// Continue to change bounty status below...
-					}
-				};
-
-				bounty.status = BountyStatus::Funded;
-				Ok(())
-			})?;
-		}
-
-		/// Accept the curator role for a bounty.
-		/// A deposit will be reserved from curator and refund upon successful payout.
-		///
-		/// May only be called from the curator.
-		///
-		/// # <weight>
-		/// - O(1).
-		/// - Limited storage reads.
-		/// - One DB change.
-		/// # </weight>
-		#[weight = T::WeightInfo::accept_curator()]
-		fn accept_curator(origin, #[compact] bounty_id: ProposalIndex) {
-			let signer = ensure_signed(origin)?;
-
-			Bounties::<T, I>::try_mutate_exists(bounty_id, |maybe_bounty| -> DispatchResult {
-				let mut bounty = maybe_bounty.as_mut().ok_or(Error::<T, I>::InvalidIndex)?;
-
-				match bounty.status {
-					BountyStatus::CuratorProposed { ref curator } => {
-						ensure!(signer == *curator, Error::<T, I>::RequireCurator);
-
-						let deposit = T::BountyCuratorDeposit::get() * bounty.fee;
-						T::Currency::reserve(curator, deposit)?;
-						bounty.curator_deposit = deposit;
-
-						let update_due = system::Module::<T>::block_number() + T::BountyUpdatePeriod::get();
-						bounty.status = BountyStatus::Active { curator: curator.clone(), update_due };
-
-						Ok(())
-					},
-					_ => Err(Error::<T, I>::UnexpectedStatus.into()),
-				}
-			})?;
-		}
-
-		/// Award bounty to a beneficiary account. The beneficiary will be able to claim the funds after a delay.
-		///
-		/// The dispatch origin for this call must be the curator of this bounty.
-		///
-		/// - `bounty_id`: Bounty ID to award.
-		/// - `beneficiary`: The beneficiary account whom will receive the payout.
-		#[weight = T::WeightInfo::award_bounty()]
-		fn award_bounty(origin, #[compact] bounty_id: ProposalIndex, beneficiary: <T::Lookup as StaticLookup>::Source) {
-			let signer = ensure_signed(origin)?;
-			let beneficiary = T::Lookup::lookup(beneficiary)?;
-
-			Bounties::<T, I>::try_mutate_exists(bounty_id, |maybe_bounty| -> DispatchResult {
-				let mut bounty = maybe_bounty.as_mut().ok_or(Error::<T, I>::InvalidIndex)?;
-				match &bounty.status {
-					BountyStatus::Active {
-						curator,
-						..
-					} => {
-						ensure!(signer == *curator, Error::<T, I>::RequireCurator);
-					},
-					_ => return Err(Error::<T, I>::UnexpectedStatus.into()),
-				}
-				bounty.status = BountyStatus::PendingPayout {
-					curator: signer,
-					beneficiary: beneficiary.clone(),
-					unlock_at: system::Module::<T>::block_number() + T::BountyDepositPayoutDelay::get(),
-				};
-
-				Ok(())
-			})?;
-
-			Self::deposit_event(Event::<T, I>::BountyAwarded(bounty_id, beneficiary));
-		}
-
-		/// Claim the payout from an awarded bounty after payout delay.
-		///
-		/// The dispatch origin for this call must be the beneficiary of this bounty.
-		///
-		/// - `bounty_id`: Bounty ID to claim.
-		#[weight = T::WeightInfo::claim_bounty()]
-		fn claim_bounty(origin, #[compact] bounty_id: BountyIndex) {
-			let _ = ensure_signed(origin)?; // anyone can trigger claim
-
-			Bounties::<T, I>::try_mutate_exists(bounty_id, |maybe_bounty| -> DispatchResult {
-				let bounty = maybe_bounty.take().ok_or(Error::<T, I>::InvalidIndex)?;
-				if let BountyStatus::PendingPayout { curator, beneficiary, unlock_at } = bounty.status {
-					ensure!(system::Module::<T>::block_number() >= unlock_at, Error::<T, I>::Premature);
-					let bounty_account = Self::bounty_account_id(bounty_id);
-					let balance = T::Currency::free_balance(&bounty_account);
-					let fee = bounty.fee.min(balance); // just to be safe
-					let payout = balance.saturating_sub(fee);
-					let _ = T::Currency::unreserve(&curator, bounty.curator_deposit);
-					let _ = T::Currency::transfer(&bounty_account, &curator, fee, AllowDeath); // should not fail
-					let _ = T::Currency::transfer(&bounty_account, &beneficiary, payout, AllowDeath); // should not fail
-					*maybe_bounty = None;
-
-					BountyDescriptions::<I>::remove(bounty_id);
-
-					Self::deposit_event(Event::<T, I>::BountyClaimed(bounty_id, payout, beneficiary));
-					Ok(())
-				} else {
-					Err(Error::<T, I>::UnexpectedStatus.into())
-				}
-			})?;
-		}
-
-		/// Cancel a proposed or active bounty. All the funds will be sent to treasury and
-		/// the curator deposit will be unreserved if possible.
-		///
-		/// Only `T::RejectOrigin` is able to cancel a bounty.
-		///
-		/// - `bounty_id`: Bounty ID to cancel.
-		#[weight = T::WeightInfo::close_bounty_proposed().max(T::WeightInfo::close_bounty_active())]
-		fn close_bounty(origin, #[compact] bounty_id: BountyIndex) -> DispatchResultWithPostInfo {
-			T::RejectOrigin::ensure_origin(origin)?;
-
-			Bounties::<T, I>::try_mutate_exists(bounty_id, |maybe_bounty| -> DispatchResultWithPostInfo {
-				let bounty = maybe_bounty.as_ref().ok_or(Error::<T, I>::InvalidIndex)?;
-
-				match &bounty.status {
-					BountyStatus::Proposed => {
-						// The reject origin would like to cancel a proposed bounty.
-						BountyDescriptions::<I>::remove(bounty_id);
-						let value = bounty.bond;
-						let imbalance = T::Currency::slash_reserved(&bounty.proposer, value).0;
-						T::OnSlash::on_unbalanced(imbalance);
-						*maybe_bounty = None;
-
-						Self::deposit_event(Event::<T, I>::BountyRejected(bounty_id, value));
-						// Return early, nothing else to do.
-						return Ok(Some(T::WeightInfo::close_bounty_proposed()).into())
-					},
-					BountyStatus::Approved => {
-						// For weight reasons, we don't allow a council to cancel in this phase.
-						// We ask for them to wait until it is funded before they can cancel.
-						return Err(Error::<T, I>::UnexpectedStatus.into())
-					},
-					BountyStatus::Funded |
-					BountyStatus::CuratorProposed { .. } => {
-						// Nothing extra to do besides the removal of the bounty below.
-					},
-					BountyStatus::Active { curator, .. } => {
-						// Cancelled by council, refund deposit of the working curator.
-						let _ = T::Currency::unreserve(&curator, bounty.curator_deposit);
-						// Then execute removal of the bounty below.
-					},
-					BountyStatus::PendingPayout { .. } => {
-						// Bounty is already pending payout. If council wants to cancel
-						// this bounty, it should mean the curator was acting maliciously.
-						// So the council should first unassign the curator, slashing their
-						// deposit.
-						return Err(Error::<T, I>::PendingPayout.into())
-					}
-				}
-
-				let bounty_account = Self::bounty_account_id(bounty_id);
-
-				BountyDescriptions::<I>::remove(bounty_id);
-
-				let balance = T::Currency::free_balance(&bounty_account);
-				let _ = T::Currency::transfer(&bounty_account, &Self::account_id(), balance, AllowDeath); // should not fail
-				*maybe_bounty = None;
-
-				Self::deposit_event(Event::<T, I>::BountyCanceled(bounty_id));
-				Ok(Some(T::WeightInfo::close_bounty_active()).into())
-			})
-		}
-
-		/// Extend the expiry time of an active bounty.
-		///
-		/// The dispatch origin for this call must be the curator of this bounty.
-		///
-		/// - `bounty_id`: Bounty ID to extend.
-		/// - `remark`: additional information.
-		#[weight = T::WeightInfo::extend_bounty_expiry()]
-		fn extend_bounty_expiry(origin, #[compact] bounty_id: BountyIndex, _remark: Vec<u8>) {
-			let signer = ensure_signed(origin)?;
-
-			Bounties::<T, I>::try_mutate_exists(bounty_id, |maybe_bounty| -> DispatchResult {
-				let bounty = maybe_bounty.as_mut().ok_or(Error::<T, I>::InvalidIndex)?;
-
-				match bounty.status {
-					BountyStatus::Active { ref curator, ref mut update_due } => {
-						ensure!(*curator == signer, Error::<T, I>::RequireCurator);
-						*update_due = (system::Module::<T>::block_number() + T::BountyUpdatePeriod::get()).max(*update_due);
-					},
-					_ => return Err(Error::<T, I>::UnexpectedStatus.into()),
-				}
-
-				Ok(())
-			})?;
-
-			Self::deposit_event(Event::<T, I>::BountyExtended(bounty_id));
-		}
-
 		/// # <weight>
 		/// - Complexity: `O(A)` where `A` is the number of approvals
 		/// - Db reads and writes: `Approvals`, `pot account data`
@@ -1170,93 +352,13 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 		T::ModuleId::get().into_account()
 	}
 
-	/// The account ID of a bounty account
-	pub fn bounty_account_id(id: BountyIndex) -> T::AccountId {
-		// only use two byte prefix to support 16 byte account id (used by test)
-		// "modl" ++ "py/trsry" ++ "bt" is 14 bytes, and two bytes remaining for bounty index
-		T::ModuleId::get().into_sub_account(("bt", id))
-	}
-
 	/// The needed bond for a proposal whose spend is `value`.
 	fn calculate_bond(value: BalanceOf<T, I>) -> BalanceOf<T, I> {
 		T::ProposalBondMinimum::get().max(T::ProposalBond::get() * value)
 	}
 
-	/// Given a mutable reference to an `OpenTip`, insert the tip into it and check whether it
-	/// closes, if so, then deposit the relevant event and set closing accordingly.
-	///
-	/// `O(T)` and one storage access.
-	fn insert_tip_and_check_closing(
-		tip: &mut OpenTip<T::AccountId, BalanceOf<T, I>, T::BlockNumber, T::Hash>,
-		tipper: T::AccountId,
-		tip_value: BalanceOf<T, I>,
-	) -> bool {
-		match tip.tips.binary_search_by_key(&&tipper, |x| &x.0) {
-			Ok(pos) => tip.tips[pos] = (tipper, tip_value),
-			Err(pos) => tip.tips.insert(pos, (tipper, tip_value)),
-		}
-		Self::retain_active_tips(&mut tip.tips);
-		let threshold = (T::Tippers::count() + 1) / 2;
-		if tip.tips.len() >= threshold && tip.closes.is_none() {
-			tip.closes = Some(system::Module::<T>::block_number() + T::TipCountdown::get());
-			true
-		} else {
-			false
-		}
-	}
-
-	/// Remove any non-members of `Tippers` from a `tips` vector. `O(T)`.
-	fn retain_active_tips(tips: &mut Vec<(T::AccountId, BalanceOf<T, I>)>) {
-		let members = T::Tippers::sorted_members();
-		let mut members_iter = members.iter();
-		let mut member = members_iter.next();
-		tips.retain(|(ref a, _)| loop {
-			match member {
-				None => break false,
-				Some(m) if m > a => break false,
-				Some(m) => {
-					member = members_iter.next();
-					if m < a {
-						continue
-					} else {
-						break true;
-					}
-				}
-			}
-		});
-	}
-
-	/// Execute the payout of a tip.
-	///
-	/// Up to three balance operations.
-	/// Plus `O(T)` (`T` is Tippers length).
-	fn payout_tip(hash: T::Hash, tip: OpenTip<T::AccountId, BalanceOf<T, I>, T::BlockNumber, T::Hash>) {
-		let mut tips = tip.tips;
-		Self::retain_active_tips(&mut tips);
-		tips.sort_by_key(|i| i.1);
-		let treasury = Self::account_id();
-		let max_payout = Self::pot();
-		let mut payout = tips[tips.len() / 2].1.min(max_payout);
-		if !tip.deposit.is_zero() {
-			let _ = T::Currency::unreserve(&tip.finder, tip.deposit);
-		}
-		if tip.finders_fee {
-			if tip.finder != tip.who {
-				// pay out the finder's fee.
-				let finders_fee = T::TipFindersFee::get() * payout;
-				payout -= finders_fee;
-				// this should go through given we checked it's at most the free balance, but still
-				// we only make a best-effort.
-				let _ = T::Currency::transfer(&treasury, &tip.finder, finders_fee, KeepAlive);
-			}
-		}
-		// same as above: best-effort only.
-		let _ = T::Currency::transfer(&treasury, &tip.who, payout, KeepAlive);
-		Self::deposit_event(RawEvent::TipClosed(hash, tip.who, payout));
-	}
-
 	/// Spend some money! returns number of approvals before spend.
-	fn spend_funds() -> Weight {
+	pub fn spend_funds() -> Weight {
 		let mut total_weight: Weight = Zero::zero();
 
 		let mut budget_remaining = Self::pot();
@@ -1295,38 +397,8 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 
 		total_weight += T::WeightInfo::on_initialize_proposals(proposals_len);
 
-		let bounties_len = BountyApprovals::<I>::mutate(|v| {
-			let bounties_approval_len = v.len() as u32;
-			v.retain(|&index| {
-				Bounties::<T, I>::mutate(index, |bounty| {
-					// Should always be true, but shouldn't panic if false or we're screwed.
-					if let Some(bounty) = bounty {
-						if bounty.value <= budget_remaining {
-							budget_remaining -= bounty.value;
-
-							bounty.status = BountyStatus::Funded;
-
-							// return their deposit.
-							let _ = T::Currency::unreserve(&bounty.proposer, bounty.bond);
-
-							// fund the bounty account
-							imbalance.subsume(T::Currency::deposit_creating(&Self::bounty_account_id(index), bounty.value));
-
-							Self::deposit_event(RawEvent::BountyBecameActive(index));
-							false
-						} else {
-							missed_any = true;
-							true
-						}
-					} else {
-						false
-					}
-				})
-			});
-			bounties_approval_len
-		});
-
-		total_weight += T::WeightInfo::on_initialize_bounties(bounties_len);
+		// Call Runtime hooks to external pallet using treasury to compute spend funds.
+		T::SpendFunds::spend_funds( &mut budget_remaining, &mut imbalance, &mut total_weight, &mut missed_any);
 
 		if !missed_any {
 			// burn some proportion of the remaining budget if we run a surplus.
@@ -1361,95 +433,12 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 
 	/// Return the amount of money in the pot.
 	// The existential deposit is not part of the pot so treasury account never gets deleted.
-	fn pot() -> BalanceOf<T, I> {
+	pub fn pot() -> BalanceOf<T, I> {
 		T::Currency::free_balance(&Self::account_id())
 			// Must never be less than 0 but better be safe.
 			.saturating_sub(T::Currency::minimum_balance())
 	}
 
-	fn create_bounty(
-		proposer: T::AccountId,
-		description: Vec<u8>,
-		value: BalanceOf<T, I>,
-	) -> DispatchResult {
-		ensure!(description.len() <= T::MaximumReasonLength::get() as usize, Error::<T, I>::ReasonTooBig);
-		ensure!(value >= T::BountyValueMinimum::get(), Error::<T, I>::InvalidValue);
-
-		let index = Self::bounty_count();
-
-		// reserve deposit for new bounty
-		let bond = T::BountyDepositBase::get()
-			+ T::DataDepositPerByte::get() * (description.len() as u32).into();
-		T::Currency::reserve(&proposer, bond)
-			.map_err(|_| Error::<T, I>::InsufficientProposersBalance)?;
-
-		BountyCount::<I>::put(index + 1);
-
-		let bounty = Bounty {
-			proposer,
-			value,
-			fee: 0u32.into(),
-			curator_deposit: 0u32.into(),
-			bond,
-			status: BountyStatus::Proposed,
-		};
-
-		Bounties::<T, I>::insert(index, &bounty);
-		BountyDescriptions::<I>::insert(index, description);
-
-		Self::deposit_event(RawEvent::BountyProposed(index));
-
-		Ok(())
-	}
-
-	pub fn migrate_retract_tip_for_tip_new() {
-		/// An open tipping "motion". Retains all details of a tip including information on the finder
-		/// and the members who have voted.
-		#[derive(Clone, Eq, PartialEq, Encode, Decode, RuntimeDebug)]
-		pub struct OldOpenTip<
-			AccountId: Parameter,
-			Balance: Parameter,
-			BlockNumber: Parameter,
-			Hash: Parameter,
-		> {
-			/// The hash of the reason for the tip. The reason should be a human-readable UTF-8 encoded string. A URL would be
-			/// sensible.
-			reason: Hash,
-			/// The account to be tipped.
-			who: AccountId,
-			/// The account who began this tip and the amount held on deposit.
-			finder: Option<(AccountId, Balance)>,
-			/// The block number at which this tip will close if `Some`. If `None`, then no closing is
-			/// scheduled.
-			closes: Option<BlockNumber>,
-			/// The members who have voted for this tip. Sorted by AccountId.
-			tips: Vec<(AccountId, Balance)>,
-		}
-
-		use frame_support::{Twox64Concat, migration::StorageKeyIterator};
-
-		for (hash, old_tip) in StorageKeyIterator::<
-			T::Hash,
-			OldOpenTip<T::AccountId, BalanceOf<T, I>, T::BlockNumber, T::Hash>,
-			Twox64Concat,
-		>::new(I::PREFIX.as_bytes(), b"Tips").drain()
-		{
-			let (finder, deposit, finders_fee) = match old_tip.finder {
-				Some((finder, deposit)) => (finder, deposit, true),
-				None => (T::AccountId::default(), Zero::zero(), false),
-			};
-			let new_tip = OpenTip {
-				reason: old_tip.reason,
-				who: old_tip.who,
-				finder,
-				deposit,
-				closes: old_tip.closes,
-				tips: old_tip.tips,
-				finders_fee
-			};
-			Tips::<T, I>::insert(hash, new_tip)
-		}
-	}
 }
 
 impl<T: Config<I>, I: Instance> OnUnbalanced<NegativeImbalanceOf<T, I>> for Module<T, I> {
diff --git a/frame/treasury/src/tests.rs b/frame/treasury/src/tests.rs
index 3cf1272a19ec..8db303a426d0 100644
--- a/frame/treasury/src/tests.rs
+++ b/frame/treasury/src/tests.rs
@@ -23,20 +23,21 @@ use super::*;
 use std::cell::RefCell;
 use frame_support::{
 	assert_noop, assert_ok, impl_outer_origin, impl_outer_event, parameter_types,
-	traits::{Contains, OnInitialize}
+	traits::{OnInitialize}
 };
+use frame_system::{self as system};
+
 use sp_core::H256;
 use sp_runtime::{
 	ModuleId,
 	testing::Header,
-	traits::{BlakeTwo256, IdentityLookup, BadOrigin},
+	traits::{BlakeTwo256, IdentityLookup},
 };
 
 impl_outer_origin! {
 	pub enum Origin for Test where system = frame_system {}
 }
 
-
 mod treasury {
 	// Re-export needed for `impl_outer_event!`.
 	pub use super::super::*;
@@ -50,7 +51,6 @@ impl_outer_event! {
 	}
 }
 
-
 #[derive(Clone, Eq, PartialEq)]
 pub struct Test;
 parameter_types! {
@@ -96,42 +96,13 @@ impl pallet_balances::Config for Test {
 thread_local! {
 	static TEN_TO_FOURTEEN: RefCell<Vec<u128>> = RefCell::new(vec![10,11,12,13,14]);
 }
-pub struct TenToFourteen;
-impl Contains<u128> for TenToFourteen {
-	fn sorted_members() -> Vec<u128> {
-		TEN_TO_FOURTEEN.with(|v| {
-			v.borrow().clone()
-		})
-	}
-	#[cfg(feature = "runtime-benchmarks")]
-	fn add(new: &u128) {
-		TEN_TO_FOURTEEN.with(|v| {
-			let mut members = v.borrow_mut();
-			members.push(*new);
-			members.sort();
-		})
-	}
-}
-impl ContainsLengthBound for TenToFourteen {
-	fn max_len() -> usize {
-		TEN_TO_FOURTEEN.with(|v| v.borrow().len())
-	}
-	fn min_len() -> usize { 0 }
-}
 parameter_types! {
 	pub const ProposalBond: Permill = Permill::from_percent(5);
 	pub const ProposalBondMinimum: u64 = 1;
 	pub const SpendPeriod: u64 = 2;
 	pub const Burn: Permill = Permill::from_percent(50);
-	pub const TipCountdown: u64 = 1;
-	pub const TipFindersFee: Percent = Percent::from_percent(20);
-	pub const TipReportDepositBase: u64 = 1;
-	pub const DataDepositPerByte: u64 = 1;
-	pub const BountyDepositBase: u64 = 80;
-	pub const BountyDepositPayoutDelay: u64 = 3;
 	pub const TreasuryModuleId: ModuleId = ModuleId(*b"py/trsry");
 	pub const BountyUpdatePeriod: u32 = 20;
-	pub const MaximumReasonLength: u32 = 16384;
 	pub const BountyCuratorDeposit: Permill = Permill::from_percent(50);
 	pub const BountyValueMinimum: u64 = 1;
 }
@@ -140,25 +111,15 @@ impl Config for Test {
 	type Currency = pallet_balances::Module<Test>;
 	type ApproveOrigin = frame_system::EnsureRoot<u128>;
 	type RejectOrigin = frame_system::EnsureRoot<u128>;
-	type Tippers = TenToFourteen;
-	type TipCountdown = TipCountdown;
-	type TipFindersFee = TipFindersFee;
-	type TipReportDepositBase = TipReportDepositBase;
-	type DataDepositPerByte = DataDepositPerByte;
 	type Event = Event;
 	type OnSlash = ();
 	type ProposalBond = ProposalBond;
 	type ProposalBondMinimum = ProposalBondMinimum;
 	type SpendPeriod = SpendPeriod;
 	type Burn = Burn;
-	type BountyDepositBase = BountyDepositBase;
-	type BountyDepositPayoutDelay = BountyDepositPayoutDelay;
-	type BountyUpdatePeriod = BountyUpdatePeriod;
-	type BountyCuratorDeposit = BountyCuratorDeposit;
-	type BountyValueMinimum = BountyValueMinimum;
-	type MaximumReasonLength = MaximumReasonLength;
 	type BurnDestination = ();  // Just gets burned.
 	type WeightInfo = ();
+	type SpendFunds = ();
 }
 type System = frame_system::Module<Test>;
 type Balances = pallet_balances::Module<Test>;
@@ -174,15 +135,6 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 	t.into()
 }
 
-fn last_event() -> RawEvent<u64, u128, H256, DefaultInstance> {
-	System::events().into_iter().map(|r| r.event)
-		.filter_map(|e| {
-			if let Event::treasury(inner) = e { Some(inner) } else { None }
-		})
-		.last()
-		.unwrap()
-}
-
 #[test]
 fn genesis_config_works() {
 	new_test_ext().execute_with(|| {
@@ -191,163 +143,6 @@ fn genesis_config_works() {
 	});
 }
 
-fn tip_hash() -> H256 {
-	BlakeTwo256::hash_of(&(BlakeTwo256::hash(b"awesome.dot"), 3u128))
-}
-
-#[test]
-fn tip_new_cannot_be_used_twice() {
-	new_test_ext().execute_with(|| {
-		Balances::make_free_balance_be(&Treasury::account_id(), 101);
-		assert_ok!(Treasury::tip_new(Origin::signed(10), b"awesome.dot".to_vec(), 3, 10));
-		assert_noop!(
-			Treasury::tip_new(Origin::signed(11), b"awesome.dot".to_vec(), 3, 10),
-			Error::<Test, _>::AlreadyKnown
-		);
-	});
-}
-
-#[test]
-fn report_awesome_and_tip_works() {
-	new_test_ext().execute_with(|| {
-		Balances::make_free_balance_be(&Treasury::account_id(), 101);
-		assert_ok!(Treasury::report_awesome(Origin::signed(0), b"awesome.dot".to_vec(), 3));
-		assert_eq!(Balances::reserved_balance(0), 12);
-		assert_eq!(Balances::free_balance(0), 88);
-
-		// other reports don't count.
-		assert_noop!(
-			Treasury::report_awesome(Origin::signed(1), b"awesome.dot".to_vec(), 3),
-			Error::<Test, _>::AlreadyKnown
-		);
-
-		let h = tip_hash();
-		assert_ok!(Treasury::tip(Origin::signed(10), h.clone(), 10));
-		assert_ok!(Treasury::tip(Origin::signed(11), h.clone(), 10));
-		assert_ok!(Treasury::tip(Origin::signed(12), h.clone(), 10));
-		assert_noop!(Treasury::tip(Origin::signed(9), h.clone(), 10), BadOrigin);
-		System::set_block_number(2);
-		assert_ok!(Treasury::close_tip(Origin::signed(100), h.into()));
-		assert_eq!(Balances::reserved_balance(0), 0);
-		assert_eq!(Balances::free_balance(0), 102);
-		assert_eq!(Balances::free_balance(3), 8);
-	});
-}
-
-#[test]
-fn report_awesome_from_beneficiary_and_tip_works() {
-	new_test_ext().execute_with(|| {
-		Balances::make_free_balance_be(&Treasury::account_id(), 101);
-		assert_ok!(Treasury::report_awesome(Origin::signed(0), b"awesome.dot".to_vec(), 0));
-		assert_eq!(Balances::reserved_balance(0), 12);
-		assert_eq!(Balances::free_balance(0), 88);
-		let h = BlakeTwo256::hash_of(&(BlakeTwo256::hash(b"awesome.dot"), 0u128));
-		assert_ok!(Treasury::tip(Origin::signed(10), h.clone(), 10));
-		assert_ok!(Treasury::tip(Origin::signed(11), h.clone(), 10));
-		assert_ok!(Treasury::tip(Origin::signed(12), h.clone(), 10));
-		System::set_block_number(2);
-		assert_ok!(Treasury::close_tip(Origin::signed(100), h.into()));
-		assert_eq!(Balances::reserved_balance(0), 0);
-		assert_eq!(Balances::free_balance(0), 110);
-	});
-}
-
-#[test]
-fn close_tip_works() {
-	new_test_ext().execute_with(|| {
-		System::set_block_number(1);
-
-		Balances::make_free_balance_be(&Treasury::account_id(), 101);
-		assert_eq!(Treasury::pot(), 100);
-
-		assert_ok!(Treasury::tip_new(Origin::signed(10), b"awesome.dot".to_vec(), 3, 10));
-
-		let h = tip_hash();
-
-		assert_eq!(last_event(), RawEvent::NewTip(h));
-
-		assert_ok!(Treasury::tip(Origin::signed(11), h.clone(), 10));
-
-		assert_noop!(Treasury::close_tip(Origin::signed(0), h.into()), Error::<Test, _>::StillOpen);
-
-		assert_ok!(Treasury::tip(Origin::signed(12), h.clone(), 10));
-
-		assert_eq!(last_event(), RawEvent::TipClosing(h));
-
-		assert_noop!(Treasury::close_tip(Origin::signed(0), h.into()), Error::<Test, _>::Premature);
-
-		System::set_block_number(2);
-		assert_noop!(Treasury::close_tip(Origin::none(), h.into()), BadOrigin);
-		assert_ok!(Treasury::close_tip(Origin::signed(0), h.into()));
-		assert_eq!(Balances::free_balance(3), 10);
-
-		assert_eq!(last_event(), RawEvent::TipClosed(h, 3, 10));
-
-		assert_noop!(Treasury::close_tip(Origin::signed(100), h.into()), Error::<Test, _>::UnknownTip);
-	});
-}
-
-#[test]
-fn retract_tip_works() {
-	new_test_ext().execute_with(|| {
-		// with report awesome
-		Balances::make_free_balance_be(&Treasury::account_id(), 101);
-		assert_ok!(Treasury::report_awesome(Origin::signed(0), b"awesome.dot".to_vec(), 3));
-		let h = tip_hash();
-		assert_ok!(Treasury::tip(Origin::signed(10), h.clone(), 10));
-		assert_ok!(Treasury::tip(Origin::signed(11), h.clone(), 10));
-		assert_ok!(Treasury::tip(Origin::signed(12), h.clone(), 10));
-		assert_noop!(Treasury::retract_tip(Origin::signed(10), h.clone()), Error::<Test, _>::NotFinder);
-		assert_ok!(Treasury::retract_tip(Origin::signed(0), h.clone()));
-		System::set_block_number(2);
-		assert_noop!(Treasury::close_tip(Origin::signed(0), h.into()), Error::<Test, _>::UnknownTip);
-
-		// with tip new
-		Balances::make_free_balance_be(&Treasury::account_id(), 101);
-		assert_ok!(Treasury::tip_new(Origin::signed(10), b"awesome.dot".to_vec(), 3, 10));
-		let h = tip_hash();
-		assert_ok!(Treasury::tip(Origin::signed(11), h.clone(), 10));
-		assert_ok!(Treasury::tip(Origin::signed(12), h.clone(), 10));
-		assert_noop!(Treasury::retract_tip(Origin::signed(0), h.clone()), Error::<Test, _>::NotFinder);
-		assert_ok!(Treasury::retract_tip(Origin::signed(10), h.clone()));
-		System::set_block_number(2);
-		assert_noop!(Treasury::close_tip(Origin::signed(10), h.into()), Error::<Test, _>::UnknownTip);
-	});
-}
-
-#[test]
-fn tip_median_calculation_works() {
-	new_test_ext().execute_with(|| {
-		Balances::make_free_balance_be(&Treasury::account_id(), 101);
-		assert_ok!(Treasury::tip_new(Origin::signed(10), b"awesome.dot".to_vec(), 3, 0));
-		let h = tip_hash();
-		assert_ok!(Treasury::tip(Origin::signed(11), h.clone(), 10));
-		assert_ok!(Treasury::tip(Origin::signed(12), h.clone(), 1000000));
-		System::set_block_number(2);
-		assert_ok!(Treasury::close_tip(Origin::signed(0), h.into()));
-		assert_eq!(Balances::free_balance(3), 10);
-	});
-}
-
-#[test]
-fn tip_changing_works() {
-	new_test_ext().execute_with(|| {
-		Balances::make_free_balance_be(&Treasury::account_id(), 101);
-		assert_ok!(Treasury::tip_new(Origin::signed(10), b"awesome.dot".to_vec(), 3, 10000));
-		let h = tip_hash();
-		assert_ok!(Treasury::tip(Origin::signed(11), h.clone(), 10000));
-		assert_ok!(Treasury::tip(Origin::signed(12), h.clone(), 10000));
-		assert_ok!(Treasury::tip(Origin::signed(13), h.clone(), 0));
-		assert_ok!(Treasury::tip(Origin::signed(14), h.clone(), 0));
-		assert_ok!(Treasury::tip(Origin::signed(12), h.clone(), 1000));
-		assert_ok!(Treasury::tip(Origin::signed(11), h.clone(), 100));
-		assert_ok!(Treasury::tip(Origin::signed(10), h.clone(), 10));
-		System::set_block_number(2);
-		assert_ok!(Treasury::close_tip(Origin::signed(0), h.into()));
-		assert_eq!(Balances::free_balance(3), 10);
-	});
-}
-
 #[test]
 fn minting_works() {
 	new_test_ext().execute_with(|| {
@@ -554,596 +349,6 @@ fn inexistent_account_works() {
 	});
 }
 
-#[test]
-fn propose_bounty_works() {
-	new_test_ext().execute_with(|| {
-		System::set_block_number(1);
-
-		Balances::make_free_balance_be(&Treasury::account_id(), 101);
-		assert_eq!(Treasury::pot(), 100);
-
-		assert_ok!(Treasury::propose_bounty(Origin::signed(0), 10, b"1234567890".to_vec()));
-
-		assert_eq!(last_event(), RawEvent::BountyProposed(0));
-
-		let deposit: u64 = 85 + 5;
-		assert_eq!(Balances::reserved_balance(0), deposit);
-		assert_eq!(Balances::free_balance(0), 100 - deposit);
-
-		assert_eq!(Treasury::bounties(0).unwrap(), Bounty {
-			proposer: 0,
-			fee: 0,
-			curator_deposit: 0,
-			value: 10,
-			bond: deposit,
-			status: BountyStatus::Proposed,
-		});
-
-		assert_eq!(Treasury::bounty_descriptions(0).unwrap(), b"1234567890".to_vec());
-
-		assert_eq!(Treasury::bounty_count(), 1);
-	});
-}
-
-#[test]
-fn propose_bounty_validation_works() {
-	new_test_ext().execute_with(|| {
-		System::set_block_number(1);
-
-		Balances::make_free_balance_be(&Treasury::account_id(), 101);
-		assert_eq!(Treasury::pot(), 100);
-
-		assert_noop!(
-			Treasury::propose_bounty(Origin::signed(1), 0, [0; 17_000].to_vec()),
-			Error::<Test, _>::ReasonTooBig
-		);
-
-		assert_noop!(
-			Treasury::propose_bounty(Origin::signed(1), 10, b"12345678901234567890".to_vec()),
-			Error::<Test, _>::InsufficientProposersBalance
-		);
-
-		assert_noop!(
-			Treasury::propose_bounty(Origin::signed(1), 0, b"12345678901234567890".to_vec()),
-			Error::<Test, _>::InvalidValue
-		);
-	});
-}
-
-#[test]
-fn close_bounty_works() {
-	new_test_ext().execute_with(|| {
-		System::set_block_number(1);
-		Balances::make_free_balance_be(&Treasury::account_id(), 101);
-		assert_noop!(Treasury::close_bounty(Origin::root(), 0), Error::<Test, _>::InvalidIndex);
-
-		assert_ok!(Treasury::propose_bounty(Origin::signed(0), 10, b"12345".to_vec()));
-
-		assert_ok!(Treasury::close_bounty(Origin::root(), 0));
-
-		let deposit: u64 = 80 + 5;
-
-		assert_eq!(last_event(), RawEvent::BountyRejected(0, deposit));
-
-		assert_eq!(Balances::reserved_balance(0), 0);
-		assert_eq!(Balances::free_balance(0), 100 - deposit);
-
-		assert_eq!(Treasury::bounties(0), None);
-		assert!(!Bounties::<Test>::contains_key(0));
-		assert_eq!(Treasury::bounty_descriptions(0), None);
-	});
-}
-
-#[test]
-fn approve_bounty_works() {
-	new_test_ext().execute_with(|| {
-		System::set_block_number(1);
-		Balances::make_free_balance_be(&Treasury::account_id(), 101);
-		assert_noop!(Treasury::approve_bounty(Origin::root(), 0), Error::<Test, _>::InvalidIndex);
-
-		assert_ok!(Treasury::propose_bounty(Origin::signed(0), 50, b"12345".to_vec()));
-
-		assert_ok!(Treasury::approve_bounty(Origin::root(), 0));
-
-		let deposit: u64 = 80 + 5;
-
-		assert_eq!(Treasury::bounties(0).unwrap(), Bounty {
-			proposer: 0,
-			fee: 0,
-			value: 50,
-			curator_deposit: 0,
-			bond: deposit,
-			status: BountyStatus::Approved,
-		});
-		assert_eq!(Treasury::bounty_approvals(), vec![0]);
-
-		assert_noop!(Treasury::close_bounty(Origin::root(), 0), Error::<Test, _>::UnexpectedStatus);
-
-		// deposit not returned yet
-		assert_eq!(Balances::reserved_balance(0), deposit);
-		assert_eq!(Balances::free_balance(0), 100 - deposit);
-
-		<Treasury as OnInitialize<u64>>::on_initialize(2);
-
-		// return deposit
-		assert_eq!(Balances::reserved_balance(0), 0);
-		assert_eq!(Balances::free_balance(0), 100);
-
-		assert_eq!(Treasury::bounties(0).unwrap(), Bounty {
-			proposer: 0,
-			fee: 0,
-			curator_deposit: 0,
-			value: 50,
-			bond: deposit,
-			status: BountyStatus::Funded,
-		});
-		assert_eq!(Treasury::pot(), 100 - 50 - 25); // burn 25
-		assert_eq!(Balances::free_balance(Treasury::bounty_account_id(0)), 50);
-	});
-}
-
-#[test]
-fn assign_curator_works() {
-	new_test_ext().execute_with(|| {
-		System::set_block_number(1);
-		Balances::make_free_balance_be(&Treasury::account_id(), 101);
-
-		assert_noop!(Treasury::propose_curator(Origin::root(), 0, 4, 4), Error::<Test, _>::InvalidIndex);
-
-		assert_ok!(Treasury::propose_bounty(Origin::signed(0), 50, b"12345".to_vec()));
-
-		assert_ok!(Treasury::approve_bounty(Origin::root(), 0));
-
-		System::set_block_number(2);
-		<Treasury as OnInitialize<u64>>::on_initialize(2);
-
-		assert_noop!(Treasury::propose_curator(Origin::root(), 0, 4, 50), Error::<Test, _>::InvalidFee);
-
-		assert_ok!(Treasury::propose_curator(Origin::root(), 0, 4, 4));
-
-		assert_eq!(Treasury::bounties(0).unwrap(), Bounty {
-			proposer: 0,
-			fee: 4,
-			curator_deposit: 0,
-			value: 50,
-			bond: 85,
-			status: BountyStatus::CuratorProposed {
-				curator: 4,
-			},
-		});
-
-		assert_noop!(Treasury::accept_curator(Origin::signed(1), 0), Error::<Test, _>::RequireCurator);
-		assert_noop!(Treasury::accept_curator(Origin::signed(4), 0), pallet_balances::Error::<Test, _>::InsufficientBalance);
-
-		Balances::make_free_balance_be(&4, 10);
-
-		assert_ok!(Treasury::accept_curator(Origin::signed(4), 0));
-
-		assert_eq!(Treasury::bounties(0).unwrap(), Bounty {
-			proposer: 0,
-			fee: 4,
-			curator_deposit: 2,
-			value: 50,
-			bond: 85,
-			status: BountyStatus::Active {
-				curator: 4,
-				update_due: 22,
-			},
-		});
-
-		assert_eq!(Balances::free_balance(&4), 8);
-		assert_eq!(Balances::reserved_balance(&4), 2);
-	});
-}
-
-#[test]
-fn unassign_curator_works() {
-	new_test_ext().execute_with(|| {
-		System::set_block_number(1);
-		Balances::make_free_balance_be(&Treasury::account_id(), 101);
-		assert_ok!(Treasury::propose_bounty(Origin::signed(0), 50, b"12345".to_vec()));
-
-		assert_ok!(Treasury::approve_bounty(Origin::root(), 0));
-
-		System::set_block_number(2);
-		<Treasury as OnInitialize<u64>>::on_initialize(2);
-
-		assert_ok!(Treasury::propose_curator(Origin::root(), 0, 4, 4));
-
-		assert_noop!(Treasury::unassign_curator(Origin::signed(1), 0), BadOrigin);
-
-		assert_ok!(Treasury::unassign_curator(Origin::signed(4), 0));
-
-		assert_eq!(Treasury::bounties(0).unwrap(), Bounty {
-			proposer: 0,
-			fee: 4,
-			curator_deposit: 0,
-			value: 50,
-			bond: 85,
-			status: BountyStatus::Funded,
-		});
-
-		assert_ok!(Treasury::propose_curator(Origin::root(), 0, 4, 4));
-
-		Balances::make_free_balance_be(&4, 10);
-
-		assert_ok!(Treasury::accept_curator(Origin::signed(4), 0));
-
-		assert_ok!(Treasury::unassign_curator(Origin::root(), 0));
-
-		assert_eq!(Treasury::bounties(0).unwrap(), Bounty {
-			proposer: 0,
-			fee: 4,
-			curator_deposit: 0,
-			value: 50,
-			bond: 85,
-			status: BountyStatus::Funded,
-		});
-
-		assert_eq!(Balances::free_balance(&4), 8);
-		assert_eq!(Balances::reserved_balance(&4), 0); // slashed 2
-	});
-}
-
-#[test]
-fn award_and_claim_bounty_works() {
-	new_test_ext().execute_with(|| {
-		System::set_block_number(1);
-		Balances::make_free_balance_be(&Treasury::account_id(), 101);
-		Balances::make_free_balance_be(&4, 10);
-		assert_ok!(Treasury::propose_bounty(Origin::signed(0), 50, b"12345".to_vec()));
-
-		assert_ok!(Treasury::approve_bounty(Origin::root(), 0));
-
-		System::set_block_number(2);
-		<Treasury as OnInitialize<u64>>::on_initialize(2);
-
-		assert_ok!(Treasury::propose_curator(Origin::root(), 0, 4, 4));
-		assert_ok!(Treasury::accept_curator(Origin::signed(4), 0));
-
-		assert_eq!(Balances::free_balance(4), 8); // inital 10 - 2 deposit
-
-		assert_noop!(Treasury::award_bounty(Origin::signed(1), 0, 3), Error::<Test, _>::RequireCurator);
-
-		assert_ok!(Treasury::award_bounty(Origin::signed(4), 0, 3));
-
-		assert_eq!(Treasury::bounties(0).unwrap(), Bounty {
-			proposer: 0,
-			fee: 4,
-			curator_deposit: 2,
-			value: 50,
-			bond: 85,
-			status: BountyStatus::PendingPayout {
-				curator: 4,
-				beneficiary: 3,
-				unlock_at: 5
-			},
-		});
-
-		assert_noop!(Treasury::claim_bounty(Origin::signed(1), 0), Error::<Test, _>::Premature);
-
-		System::set_block_number(5);
-		<Treasury as OnInitialize<u64>>::on_initialize(5);
-
-		assert_ok!(Balances::transfer(Origin::signed(0), Treasury::bounty_account_id(0), 10));
-
-		assert_ok!(Treasury::claim_bounty(Origin::signed(1), 0));
-
-		assert_eq!(last_event(), RawEvent::BountyClaimed(0, 56, 3));
-
-		assert_eq!(Balances::free_balance(4), 14); // initial 10 + fee 4
-		assert_eq!(Balances::free_balance(3), 56);
-		assert_eq!(Balances::free_balance(Treasury::bounty_account_id(0)), 0);
-
-		assert_eq!(Treasury::bounties(0), None);
-		assert_eq!(Treasury::bounty_descriptions(0), None);
-	});
-}
-
-#[test]
-fn claim_handles_high_fee() {
-	new_test_ext().execute_with(|| {
-		System::set_block_number(1);
-		Balances::make_free_balance_be(&Treasury::account_id(), 101);
-		Balances::make_free_balance_be(&4, 30);
-		assert_ok!(Treasury::propose_bounty(Origin::signed(0), 50, b"12345".to_vec()));
-
-		assert_ok!(Treasury::approve_bounty(Origin::root(), 0));
-
-		System::set_block_number(2);
-		<Treasury as OnInitialize<u64>>::on_initialize(2);
-
-		assert_ok!(Treasury::propose_curator(Origin::root(), 0, 4, 49));
-		assert_ok!(Treasury::accept_curator(Origin::signed(4), 0));
-
-		assert_ok!(Treasury::award_bounty(Origin::signed(4), 0, 3));
-
-		System::set_block_number(5);
-		<Treasury as OnInitialize<u64>>::on_initialize(5);
-
-		// make fee > balance
-		let _ = Balances::slash(&Treasury::bounty_account_id(0), 10);
-
-		assert_ok!(Treasury::claim_bounty(Origin::signed(1), 0));
-
-		assert_eq!(last_event(), RawEvent::BountyClaimed(0, 0, 3));
-
-		assert_eq!(Balances::free_balance(4), 70); // 30 + 50 - 10
-		assert_eq!(Balances::free_balance(3), 0);
-		assert_eq!(Balances::free_balance(Treasury::bounty_account_id(0)), 0);
-
-		assert_eq!(Treasury::bounties(0), None);
-		assert_eq!(Treasury::bounty_descriptions(0), None);
-	});
-}
-
-#[test]
-fn cancel_and_refund() {
-	new_test_ext().execute_with(|| {
-		System::set_block_number(1);
-		Balances::make_free_balance_be(&Treasury::account_id(), 101);
-		assert_ok!(Treasury::propose_bounty(Origin::signed(0), 50, b"12345".to_vec()));
-
-		assert_ok!(Treasury::approve_bounty(Origin::root(), 0));
-
-		System::set_block_number(2);
-		<Treasury as OnInitialize<u64>>::on_initialize(2);
-
-		assert_ok!(Balances::transfer(Origin::signed(0), Treasury::bounty_account_id(0), 10));
-
-		assert_eq!(Treasury::bounties(0).unwrap(), Bounty {
-			proposer: 0,
-			fee: 0,
-			curator_deposit: 0,
-			value: 50,
-			bond: 85,
-			status: BountyStatus::Funded,
-		});
-
-		assert_eq!(Balances::free_balance(Treasury::bounty_account_id(0)), 60);
-
-		assert_noop!(Treasury::close_bounty(Origin::signed(0), 0), BadOrigin);
-
-		assert_ok!(Treasury::close_bounty(Origin::root(), 0));
-
-		assert_eq!(Treasury::pot(), 85); // - 25 + 10
-	});
-}
-
-#[test]
-fn award_and_cancel() {
-	new_test_ext().execute_with(|| {
-		System::set_block_number(1);
-		Balances::make_free_balance_be(&Treasury::account_id(), 101);
-		assert_ok!(Treasury::propose_bounty(Origin::signed(0), 50, b"12345".to_vec()));
-
-		assert_ok!(Treasury::approve_bounty(Origin::root(), 0));
-
-		System::set_block_number(2);
-		<Treasury as OnInitialize<u64>>::on_initialize(2);
-
-		assert_ok!(Treasury::propose_curator(Origin::root(), 0, 0, 10));
-		assert_ok!(Treasury::accept_curator(Origin::signed(0), 0));
-
-		assert_eq!(Balances::free_balance(0), 95);
-		assert_eq!(Balances::reserved_balance(0), 5);
-
-		assert_ok!(Treasury::award_bounty(Origin::signed(0), 0, 3));
-
-		// Cannot close bounty directly when payout is happening...
-		assert_noop!(Treasury::close_bounty(Origin::root(), 0), Error::<Test, _>::PendingPayout);
-
-		// Instead unassign the curator to slash them and then close.
-		assert_ok!(Treasury::unassign_curator(Origin::root(), 0));
-		assert_ok!(Treasury::close_bounty(Origin::root(), 0));
-
-		assert_eq!(last_event(), RawEvent::BountyCanceled(0));
-
-		assert_eq!(Balances::free_balance(Treasury::bounty_account_id(0)), 0);
-		// Slashed.
-		assert_eq!(Balances::free_balance(0), 95);
-		assert_eq!(Balances::reserved_balance(0), 0);
-
-		assert_eq!(Treasury::bounties(0), None);
-		assert_eq!(Treasury::bounty_descriptions(0), None);
-	});
-}
-
-#[test]
-fn expire_and_unassign() {
-	new_test_ext().execute_with(|| {
-		System::set_block_number(1);
-		Balances::make_free_balance_be(&Treasury::account_id(), 101);
-		assert_ok!(Treasury::propose_bounty(Origin::signed(0), 50, b"12345".to_vec()));
-
-		assert_ok!(Treasury::approve_bounty(Origin::root(), 0));
-
-		System::set_block_number(2);
-		<Treasury as OnInitialize<u64>>::on_initialize(2);
-
-		assert_ok!(Treasury::propose_curator(Origin::root(), 0, 1, 10));
-		assert_ok!(Treasury::accept_curator(Origin::signed(1), 0));
-
-		assert_eq!(Balances::free_balance(1), 93);
-		assert_eq!(Balances::reserved_balance(1), 5);
-
-		System::set_block_number(22);
-		<Treasury as OnInitialize<u64>>::on_initialize(22);
-
-		assert_noop!(Treasury::unassign_curator(Origin::signed(0), 0), Error::<Test, _>::Premature);
-
-		System::set_block_number(23);
-		<Treasury as OnInitialize<u64>>::on_initialize(23);
-
-		assert_ok!(Treasury::unassign_curator(Origin::signed(0), 0));
-
-		assert_eq!(Treasury::bounties(0).unwrap(), Bounty {
-			proposer: 0,
-			fee: 10,
-			curator_deposit: 0,
-			value: 50,
-			bond: 85,
-			status: BountyStatus::Funded,
-		});
-
-		assert_eq!(Balances::free_balance(1), 93);
-		assert_eq!(Balances::reserved_balance(1), 0); // slashed
-
-	});
-}
-
-#[test]
-fn extend_expiry() {
-	new_test_ext().execute_with(|| {
-		System::set_block_number(1);
-		Balances::make_free_balance_be(&Treasury::account_id(), 101);
-		Balances::make_free_balance_be(&4, 10);
-		assert_ok!(Treasury::propose_bounty(Origin::signed(0), 50, b"12345".to_vec()));
-
-		assert_ok!(Treasury::approve_bounty(Origin::root(), 0));
-
-		assert_noop!(Treasury::extend_bounty_expiry(Origin::signed(1), 0, Vec::new()), Error::<Test, _>::UnexpectedStatus);
-
-		System::set_block_number(2);
-		<Treasury as OnInitialize<u64>>::on_initialize(2);
-
-		assert_ok!(Treasury::propose_curator(Origin::root(), 0, 4, 10));
-		assert_ok!(Treasury::accept_curator(Origin::signed(4), 0));
-
-		assert_eq!(Balances::free_balance(4), 5);
-		assert_eq!(Balances::reserved_balance(4), 5);
-
-		System::set_block_number(10);
-		<Treasury as OnInitialize<u64>>::on_initialize(10);
-
-		assert_noop!(Treasury::extend_bounty_expiry(Origin::signed(0), 0, Vec::new()), Error::<Test, _>::RequireCurator);
-		assert_ok!(Treasury::extend_bounty_expiry(Origin::signed(4), 0, Vec::new()));
-
-		assert_eq!(Treasury::bounties(0).unwrap(), Bounty {
-			proposer: 0,
-			fee: 10,
-			curator_deposit: 5,
-			value: 50,
-			bond: 85,
-			status: BountyStatus::Active { curator: 4, update_due: 30 },
-		});
-
-		assert_ok!(Treasury::extend_bounty_expiry(Origin::signed(4), 0, Vec::new()));
-
-		assert_eq!(Treasury::bounties(0).unwrap(), Bounty {
-			proposer: 0,
-			fee: 10,
-			curator_deposit: 5,
-			value: 50,
-			bond: 85,
-			status: BountyStatus::Active { curator: 4, update_due: 30 }, // still the same
-		});
-
-		System::set_block_number(25);
-		<Treasury as OnInitialize<u64>>::on_initialize(25);
-
-		assert_noop!(Treasury::unassign_curator(Origin::signed(0), 0), Error::<Test, _>::Premature);
-		assert_ok!(Treasury::unassign_curator(Origin::signed(4), 0));
-
-		assert_eq!(Balances::free_balance(4), 10); // not slashed
-		assert_eq!(Balances::reserved_balance(4), 0);
-	});
-}
-
-#[test]
-fn test_last_reward_migration() {
-	use sp_storage::Storage;
-
-	let mut s = Storage::default();
-
-	#[derive(Clone, Eq, PartialEq, Encode, Decode, RuntimeDebug)]
-	pub struct OldOpenTip<
-		AccountId: Parameter,
-		Balance: Parameter,
-		BlockNumber: Parameter,
-		Hash: Parameter,
-	> {
-		/// The hash of the reason for the tip. The reason should be a human-readable UTF-8 encoded string. A URL would be
-		/// sensible.
-		reason: Hash,
-		/// The account to be tipped.
-		who: AccountId,
-		/// The account who began this tip and the amount held on deposit.
-		finder: Option<(AccountId, Balance)>,
-		/// The block number at which this tip will close if `Some`. If `None`, then no closing is
-		/// scheduled.
-		closes: Option<BlockNumber>,
-		/// The members who have voted for this tip. Sorted by AccountId.
-		tips: Vec<(AccountId, Balance)>,
-	}
-
-	let reason1 = BlakeTwo256::hash(b"reason1");
-	let hash1 = BlakeTwo256::hash_of(&(reason1, 10u64));
-
-	let old_tip_finder = OldOpenTip::<u128, u64, u64, H256> {
-		reason: reason1,
-		who: 10,
-		finder: Some((20, 30)),
-		closes: Some(13),
-		tips: vec![(40, 50), (60, 70)]
-	};
-
-	let reason2 = BlakeTwo256::hash(b"reason2");
-	let hash2 = BlakeTwo256::hash_of(&(reason2, 20u64));
-
-	let old_tip_no_finder = OldOpenTip::<u128, u64, u64, H256> {
-		reason: reason2,
-		who: 20,
-		finder: None,
-		closes: Some(13),
-		tips: vec![(40, 50), (60, 70)]
-	};
-
-	let data = vec![
-		(
-			Tips::<Test>::hashed_key_for(hash1),
-			old_tip_finder.encode().to_vec()
-		),
-		(
-			Tips::<Test>::hashed_key_for(hash2),
-			old_tip_no_finder.encode().to_vec()
-		),
-	];
-
-	s.top = data.into_iter().collect();
-	sp_io::TestExternalities::new(s).execute_with(|| {
-		Treasury::migrate_retract_tip_for_tip_new();
-
-		// Test w/ finder
-		assert_eq!(
-			Tips::<Test>::get(hash1),
-			Some(OpenTip {
-				reason: reason1,
-				who: 10,
-				finder: 20,
-				deposit: 30,
-				closes: Some(13),
-				tips: vec![(40, 50), (60, 70)],
-				finders_fee: true,
-			})
-		);
-
-		// Test w/o finder
-		assert_eq!(
-			Tips::<Test>::get(hash2),
-			Some(OpenTip {
-				reason: reason2,
-				who: 20,
-				finder: Default::default(),
-				deposit: 0,
-				closes: Some(13),
-				tips: vec![(40, 50), (60, 70)],
-				finders_fee: false,
-			})
-		);
-	});
-}
-
 #[test]
 fn genesis_funding_works() {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
diff --git a/frame/treasury/src/weights.rs b/frame/treasury/src/weights.rs
index 013a27a5cdc9..3bc1fcd23087 100644
--- a/frame/treasury/src/weights.rs
+++ b/frame/treasury/src/weights.rs
@@ -15,13 +15,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Weights for pallet_treasury
+//! Autogenerated weights for pallet_treasury
+//!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2020-12-16, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
-// target/release/substrate
+// ./target/release/substrate
 // benchmark
 // --chain=dev
 // --steps=50
@@ -46,293 +47,62 @@ pub trait WeightInfo {
 	fn propose_spend() -> Weight;
 	fn reject_proposal() -> Weight;
 	fn approve_proposal() -> Weight;
-	fn report_awesome(r: u32, ) -> Weight;
-	fn retract_tip() -> Weight;
-	fn tip_new(r: u32, t: u32, ) -> Weight;
-	fn tip(t: u32, ) -> Weight;
-	fn close_tip(t: u32, ) -> Weight;
-	fn propose_bounty(d: u32, ) -> Weight;
-	fn approve_bounty() -> Weight;
-	fn propose_curator() -> Weight;
-	fn unassign_curator() -> Weight;
-	fn accept_curator() -> Weight;
-	fn award_bounty() -> Weight;
-	fn claim_bounty() -> Weight;
-	fn close_bounty_proposed() -> Weight;
-	fn close_bounty_active() -> Weight;
-	fn extend_bounty_expiry() -> Weight;
 	fn on_initialize_proposals(p: u32, ) -> Weight;
-	fn on_initialize_bounties(b: u32, ) -> Weight;
-	
 }
 
 /// Weights for pallet_treasury using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn propose_spend() -> Weight {
-		(56_844_000 as Weight)
+		(59_986_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
 	fn reject_proposal() -> Weight {
-		(46_098_000 as Weight)
+		(48_300_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
 	fn approve_proposal() -> Weight {
-		(13_622_000 as Weight)
+		(14_054_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
-	}
-	fn report_awesome(r: u32, ) -> Weight {
-		(71_823_000 as Weight)
-			.saturating_add((2_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
-	}
-	fn retract_tip() -> Weight {
-		(60_150_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
-	}
-	fn tip_new(r: u32, t: u32, ) -> Weight {
-		(46_522_000 as Weight)
-			.saturating_add((2_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((145_000 as Weight).saturating_mul(t as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
-	}
-	fn tip(t: u32, ) -> Weight {
-		(33_790_000 as Weight)
-			.saturating_add((713_000 as Weight).saturating_mul(t as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
-	}
-	fn close_tip(t: u32, ) -> Weight {
-		(113_040_000 as Weight)
-			.saturating_add((375_000 as Weight).saturating_mul(t as Weight))
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
-			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-			
-	}
-	fn propose_bounty(d: u32, ) -> Weight {
-		(60_887_000 as Weight)
-			.saturating_add((1_000 as Weight).saturating_mul(d as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(4 as Weight))
-			
-	}
-	fn approve_bounty() -> Weight {
-		(17_337_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
-	}
-	fn propose_curator() -> Weight {
-		(14_068_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
-	}
-	fn unassign_curator() -> Weight {
-		(49_717_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
-	}
-	fn accept_curator() -> Weight {
-		(50_596_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
-	}
-	fn award_bounty() -> Weight {
-		(36_030_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
-	}
-	fn claim_bounty() -> Weight {
-		(167_088_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().writes(5 as Weight))
-			
-	}
-	fn close_bounty_proposed() -> Weight {
-		(48_977_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-			
-	}
-	fn close_bounty_active() -> Weight {
-		(110_959_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
-			.saturating_add(T::DbWeight::get().writes(4 as Weight))
-			
-	}
-	fn extend_bounty_expiry() -> Weight {
-		(34_987_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn on_initialize_proposals(p: u32, ) -> Weight {
-		(76_596_000 as Weight)
-			.saturating_add((73_988_000 as Weight).saturating_mul(p as Weight))
+		(86_038_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((78_781_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(p as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(p as Weight)))
 	}
-	fn on_initialize_bounties(b: u32, ) -> Weight {
-		(75_165_000 as Weight)
-			.saturating_add((73_634_000 as Weight).saturating_mul(b as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(b as Weight)))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(b as Weight)))
-	}
-	
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn propose_spend() -> Weight {
-		(56_844_000 as Weight)
+		(59_986_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
 	fn reject_proposal() -> Weight {
-		(46_098_000 as Weight)
+		(48_300_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
 	fn approve_proposal() -> Weight {
-		(13_622_000 as Weight)
+		(14_054_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
-	}
-	fn report_awesome(r: u32, ) -> Weight {
-		(71_823_000 as Weight)
-			.saturating_add((2_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
-	}
-	fn retract_tip() -> Weight {
-		(60_150_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
-	}
-	fn tip_new(r: u32, t: u32, ) -> Weight {
-		(46_522_000 as Weight)
-			.saturating_add((2_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((145_000 as Weight).saturating_mul(t as Weight))
-			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
-	}
-	fn tip(t: u32, ) -> Weight {
-		(33_790_000 as Weight)
-			.saturating_add((713_000 as Weight).saturating_mul(t as Weight))
-			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
-	}
-	fn close_tip(t: u32, ) -> Weight {
-		(113_040_000 as Weight)
-			.saturating_add((375_000 as Weight).saturating_mul(t as Weight))
-			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
-			
-	}
-	fn propose_bounty(d: u32, ) -> Weight {
-		(60_887_000 as Weight)
-			.saturating_add((1_000 as Weight).saturating_mul(d as Weight))
-			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
-			
-	}
-	fn approve_bounty() -> Weight {
-		(17_337_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
-	}
-	fn propose_curator() -> Weight {
-		(14_068_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
-	}
-	fn unassign_curator() -> Weight {
-		(49_717_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
-	}
-	fn accept_curator() -> Weight {
-		(50_596_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
-	}
-	fn award_bounty() -> Weight {
-		(36_030_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
-	}
-	fn claim_bounty() -> Weight {
-		(167_088_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
-			
-	}
-	fn close_bounty_proposed() -> Weight {
-		(48_977_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
-			
-	}
-	fn close_bounty_active() -> Weight {
-		(110_959_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
-			
-	}
-	fn extend_bounty_expiry() -> Weight {
-		(34_987_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn on_initialize_proposals(p: u32, ) -> Weight {
-		(76_596_000 as Weight)
-			.saturating_add((73_988_000 as Weight).saturating_mul(p as Weight))
+		(86_038_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((78_781_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(p as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(p as Weight)))
 	}
-	fn on_initialize_bounties(b: u32, ) -> Weight {
-		(75_165_000 as Weight)
-			.saturating_add((73_634_000 as Weight).saturating_mul(b as Weight))
-			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
-			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(b as Weight)))
-			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			.saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(b as Weight)))
-	}
-	
 }

From 032bd12b988c61d4de00619a5cd01c28bea403d0 Mon Sep 17 00:00:00 2001
From: Denis Pisarev <denis.pisarev@parity.io>
Date: Thu, 17 Dec 2020 11:05:39 +0100
Subject: [PATCH 0181/1194] CI: buildah to build images (#7741)

* CI: buildah to build images

* CI: simplify variables

* CI: whitespaces

* CI: secure login
---
 .gitlab-ci.yml | 121 ++++++++-----------------------------------------
 1 file changed, 20 insertions(+), 101 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 07b0dd319cf7..62e438645e10 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,8 +24,6 @@ stages:
   - check
   - test
   - build
-  - chaos-env
-  - chaos
   - publish
   - deploy
   - flaming-fir
@@ -399,12 +397,11 @@ build-linux-substrate:             &build-binary
   <<:                              *collect-artifacts
   <<:                              *docker-env
   rules:
-    # .build-refs with manual on PRs and chaos
+    # .build-refs with manual on PRs
     - if: $CI_PIPELINE_SOURCE == "web"
     - if: $CI_COMMIT_REF_NAME == "master"
     - if: $CI_COMMIT_REF_NAME == "tags"
     - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
-    - if: $CI_COMMIT_MESSAGE =~ /\[chaos:(basic|medium|large)\]/ && $CI_COMMIT_REF_NAME =~ /^[0-9]+$/  # i.e add [chaos:basic] in commit message to trigger
     - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
       when: manual
       allow_failure: true
@@ -490,118 +487,40 @@ build-rust-doc:
     - echo "<meta http-equiv=refresh content=0;url=sc_service/index.html>" > ./crate-docs/index.html
     - sccache -s
 
-#### stage:                        chaos-env
-
-build-chaos-docker:
-  stage:                           chaos-env
-  rules:
-    # .build-refs with chaos
-    - if: $CI_PIPELINE_SOURCE == "web"
-    - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME == "tags"
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
-    - if: $CI_COMMIT_MESSAGE =~ /\[chaos:(basic|medium|large)\]/ && $CI_COMMIT_REF_NAME =~ /^[0-9]+$/  # i.e add [chaos:basic] in commit message to trigger
-  needs:
-    - job:                         build-linux-substrate
-  image:                           docker:stable
-  tags:
-    - kubernetes-parity-build
-  variables:
-    <<:                            *default-vars
-    DOCKER_HOST:                   tcp://localhost:2375
-    DOCKER_DRIVER:                 overlay2
-    PRODUCT:                       substrate
-    DOCKERFILE:                    $PRODUCT.Dockerfile
-    CONTAINER_IMAGE:               paritypr/$PRODUCT
-  environment:
-    name:                          parity-simnet
-  services:
-    - docker:dind
-  before_script:
-    - test "$DOCKER_CHAOS_USER" -a "$DOCKER_CHAOS_TOKEN"
-        || ( echo "no docker credentials provided"; exit 1 )
-    - docker login -u "$DOCKER_CHAOS_USER" -p "$DOCKER_CHAOS_TOKEN"
-    - docker info
-  script:
-    - cd ./artifacts/$PRODUCT/
-    - VERSION="ci-${CI_COMMIT_SHORT_SHA}"
-    - echo "${PRODUCT} version = ${VERSION}"
-    - test -z "${VERSION}" && exit 1
-    - docker build
-      --build-arg VCS_REF="${CI_COMMIT_SHA}"
-      --build-arg BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M:%SZ')"
-      --tag $CONTAINER_IMAGE:$VERSION
-      --file $DOCKERFILE .
-    - docker push $CONTAINER_IMAGE:$VERSION
-  after_script:
-    - docker logout
-
-#### stage:                        chaos
-
-chaos-test-singlenodeheight:
-  stage:                           chaos
-  rules:
-    # .build-refs with chaos
-    - if: $CI_PIPELINE_SOURCE == "web"
-    - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME == "tags"
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
-    - if: $CI_COMMIT_MESSAGE =~ /\[chaos:(basic|medium|large)\]/ && $CI_COMMIT_REF_NAME =~ /^[0-9]+$/  # i.e add [chaos:basic] in commit message to trigger
-  image:                           paritypr/simnet:latest
-  needs:
-    - job:                         build-chaos-docker
-  tags:
-    - parity-simnet
-  variables:
-    <<:                            *default-vars
-    PRODUCT:                       substrate
-    DOCKERFILE:                    $PRODUCT.Dockerfile
-    CONTAINER_IMAGE:               paritypr/$PRODUCT
-    KEEP_NAMESPACE:                0
-    NAMESPACE:                     "substrate-ci-${CI_COMMIT_SHORT_SHA}-${CI_PIPELINE_ID}"
-    VERSION:                       "ci-${CI_COMMIT_SHORT_SHA}"
-  interruptible: true
-  environment:
-    name:                          parity-simnet
-  script:
-    - simnet spawn dev -i $CONTAINER_IMAGE:$VERSION
-    - simnet singlenodeheight -h 30
-  after_script:
-    - simnet clean
-
 #### stage:                        publish
 
 .build-push-docker-image:          &build-push-docker-image
   <<:                              *build-refs
   <<:                              *kubernetes-build
-  image:                           docker:stable
-  services:
-    - docker:dind
+  image:                           quay.io/buildah/stable
   variables:                       &docker-build-vars
     <<:                            *default-vars
-    DOCKER_HOST:                   tcp://localhost:2375
-    DOCKER_DRIVER:                 overlay2
     GIT_STRATEGY:                  none
     DOCKERFILE:                    $PRODUCT.Dockerfile
-    CONTAINER_IMAGE:               parity/$PRODUCT
+    IMAGE_NAME:                    docker.io/parity/$PRODUCT
   before_script:
-    - test "$Docker_Hub_User_Parity" -a "$Docker_Hub_Pass_Parity"
-        || ( echo "no docker credentials provided"; exit 1 )
-    - docker login -u "$Docker_Hub_User_Parity" -p "$Docker_Hub_Pass_Parity"
-    - docker info
+    - test "$Docker_Hub_User_Parity" -a "$Docker_Hub_Pass_Parity" ||
+        ( echo "no docker credentials provided"; exit 1 )
   script:
     - cd ./artifacts/$PRODUCT/
     - VERSION="$(cat ./VERSION)"
     - echo "${PRODUCT} version = ${VERSION}"
     - test -z "${VERSION}" && exit 1
-    - docker build
+    - buildah bud
+      --squash
+      --format=docker
       --build-arg VCS_REF="${CI_COMMIT_SHA}"
       --build-arg BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M:%SZ')"
-      --tag $CONTAINER_IMAGE:$VERSION
-      --tag $CONTAINER_IMAGE:latest
-      --file $DOCKERFILE .
-    - docker push $CONTAINER_IMAGE:$VERSION
-    - docker push $CONTAINER_IMAGE:latest
+      --tag "$IMAGE_NAME:$VERSION"
+      --tag "$IMAGE_NAME:latest"
+      --file "$DOCKERFILE" .
+    - echo "$Docker_Hub_Pass_Parity" |
+      buildah login --username "$Docker_Hub_User_Parity" --password-stdin docker.io
+    - buildah info
+    - buildah push
+      --format=v2s2
+      "$IMAGE_NAME:$VERSION"
+      "$IMAGE_NAME:latest"
 
 publish-docker-substrate:
   stage:                           publish
@@ -615,7 +534,7 @@ publish-docker-substrate:
     <<:                            *docker-build-vars
     PRODUCT:                       substrate
   after_script:
-    - docker logout
+    - buildah logout "$IMAGE_NAME"
     # only VERSION information is needed for the deployment
     - find ./artifacts/ -depth -not -name VERSION -type f -delete
 
@@ -629,7 +548,7 @@ publish-docker-subkey:
     <<:                            *docker-build-vars
     PRODUCT:                       subkey
   after_script:
-    - docker logout
+    - buildah logout "$IMAGE_NAME"
 
 publish-s3-release:
   stage:                           publish

From 2bc674a10957a3dd9ed30a5c1256e9134d9a5cab Mon Sep 17 00:00:00 2001
From: honeywest <50997103+honeywest@users.noreply.github.com>
Date: Thu, 17 Dec 2020 18:54:05 +0800
Subject: [PATCH 0182/1194] optimize arithmetic cargo path (#7745)

---
 primitives/arithmetic/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/primitives/arithmetic/Cargo.toml b/primitives/arithmetic/Cargo.toml
index b8e482491a7d..c8f812215f4a 100644
--- a/primitives/arithmetic/Cargo.toml
+++ b/primitives/arithmetic/Cargo.toml
@@ -20,7 +20,7 @@ integer-sqrt = "0.1.2"
 num-traits = { version = "0.2.8", default-features = false }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-sp-debug-derive = { version = "2.0.0", default-features = false, path = "../../primitives/debug-derive" }
+sp-debug-derive = { version = "2.0.0", default-features = false, path = "../debug-derive" }
 
 [dev-dependencies]
 rand = "0.7.2"

From fec28e120a240bcb69fdbe8fd08640335b379b59 Mon Sep 17 00:00:00 2001
From: honeywest <50997103+honeywest@users.noreply.github.com>
Date: Thu, 17 Dec 2020 20:00:26 +0800
Subject: [PATCH 0183/1194] optimize runtime-interface cargo path (#7729)

---
 primitives/runtime-interface/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/primitives/runtime-interface/Cargo.toml b/primitives/runtime-interface/Cargo.toml
index 180914e89dd6..b8ad0c1261e4 100644
--- a/primitives/runtime-interface/Cargo.toml
+++ b/primitives/runtime-interface/Cargo.toml
@@ -27,7 +27,7 @@ impl-trait-for-tuples = "0.1.3"
 
 [dev-dependencies]
 sp-runtime-interface-test-wasm = { version = "2.0.0", path = "test-wasm" }
-sp-state-machine = { version = "0.8.0", path = "../../primitives/state-machine" }
+sp-state-machine = { version = "0.8.0", path = "../state-machine" }
 sp-core = { version = "2.0.0", path = "../core" }
 sp-io = { version = "2.0.0", path = "../io" }
 rustversion = "1.0.0"

From ad054e6452f4762d33b3e6e7cd32a8dbb4c3ae29 Mon Sep 17 00:00:00 2001
From: honeywest <50997103+honeywest@users.noreply.github.com>
Date: Fri, 18 Dec 2020 01:11:07 +0800
Subject: [PATCH 0184/1194] delete primitives in Cargo in primitives (#7751)

---
 primitives/api/Cargo.toml                    | 2 +-
 primitives/api/test/Cargo.toml               | 4 ++--
 primitives/application-crypto/Cargo.toml     | 2 +-
 primitives/consensus/common/Cargo.toml       | 2 +-
 primitives/io/Cargo.toml                     | 6 +++---
 primitives/npos-elections/Cargo.toml         | 2 +-
 primitives/runtime-interface/test/Cargo.toml | 2 +-
 primitives/runtime/Cargo.toml                | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/primitives/api/Cargo.toml b/primitives/api/Cargo.toml
index 92bf9bea2bdc..97f9618fe56f 100644
--- a/primitives/api/Cargo.toml
+++ b/primitives/api/Cargo.toml
@@ -19,7 +19,7 @@ sp-core = { version = "2.0.0", default-features = false, path = "../core" }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../runtime" }
 sp-version = { version = "2.0.0", default-features = false, path = "../version" }
-sp-state-machine = { version = "0.8.0", optional = true, path = "../../primitives/state-machine" }
+sp-state-machine = { version = "0.8.0", optional = true, path = "../state-machine" }
 hash-db = { version = "0.15.2", optional = true }
 thiserror = { version = "1.0.21", optional = true }
 
diff --git a/primitives/api/test/Cargo.toml b/primitives/api/test/Cargo.toml
index 1110b02020b3..f3f698e0ccb0 100644
--- a/primitives/api/test/Cargo.toml
+++ b/primitives/api/test/Cargo.toml
@@ -17,10 +17,10 @@ substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils
 sp-version = { version = "2.0.0", path = "../../version" }
 sp-runtime = { version = "2.0.0", path = "../../runtime" }
 sp-blockchain = { version = "2.0.0", path = "../../blockchain" }
-sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
+sp-consensus = { version = "0.8.0", path = "../../consensus/common" }
 sc-block-builder = { version = "0.8.0", path = "../../../client/block-builder" }
 codec = { package = "parity-scale-codec", version = "1.3.1" }
-sp-state-machine = { version = "0.8.0", path = "../../../primitives/state-machine" }
+sp-state-machine = { version = "0.8.0", path = "../../state-machine" }
 trybuild = { git = "https://github.com/bkchr/trybuild.git", branch = "bkchr-use-workspace-cargo-lock" }
 rustversion = "1.0.0"
 
diff --git a/primitives/application-crypto/Cargo.toml b/primitives/application-crypto/Cargo.toml
index 2ab682375957..47776d809110 100644
--- a/primitives/application-crypto/Cargo.toml
+++ b/primitives/application-crypto/Cargo.toml
@@ -19,7 +19,7 @@ sp-core = { version = "2.0.0", default-features = false, path = "../core" }
 codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
-sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
+sp-io = { version = "2.0.0", default-features = false, path = "../io" }
 
 [features]
 default = [ "std" ]
diff --git a/primitives/consensus/common/Cargo.toml b/primitives/consensus/common/Cargo.toml
index dc1550ed2953..642e047223bc 100644
--- a/primitives/consensus/common/Cargo.toml
+++ b/primitives/consensus/common/Cargo.toml
@@ -20,7 +20,7 @@ libp2p = { version = "0.32.2", default-features = false }
 log = "0.4.8"
 sp-core = { path= "../../core", version = "2.0.0"}
 sp-inherents = { version = "2.0.0", path = "../../inherents" }
-sp-state-machine = { version = "0.8.0", path = "../../../primitives/state-machine" }
+sp-state-machine = { version = "0.8.0", path = "../../state-machine" }
 futures = { version = "0.3.1", features = ["thread-pool"] }
 futures-timer = "3.0.1"
 sp-std = { version = "2.0.0", path = "../../std" }
diff --git a/primitives/io/Cargo.toml b/primitives/io/Cargo.toml
index e470461d60b8..e65d75146d65 100644
--- a/primitives/io/Cargo.toml
+++ b/primitives/io/Cargo.toml
@@ -21,10 +21,10 @@ sp-core = { version = "2.0.0", default-features = false, path = "../core" }
 sp-keystore = { version = "0.8.0", default-features = false, optional = true, path = "../keystore" }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 libsecp256k1 = { version = "0.3.4", optional = true }
-sp-state-machine = { version = "0.8.0", optional = true, path = "../../primitives/state-machine" }
-sp-wasm-interface = { version = "2.0.0", path = "../../primitives/wasm-interface", default-features = false }
+sp-state-machine = { version = "0.8.0", optional = true, path = "../state-machine" }
+sp-wasm-interface = { version = "2.0.0", path = "../wasm-interface", default-features = false }
 sp-runtime-interface = { version = "2.0.0", default-features = false, path = "../runtime-interface" }
-sp-trie = { version = "2.0.0", optional = true, path = "../../primitives/trie" }
+sp-trie = { version = "2.0.0", optional = true, path = "../trie" }
 sp-externalities = { version = "0.8.0", optional = true, path = "../externalities" }
 sp-tracing = { version = "2.0.0", default-features = false, path = "../tracing" }
 log = { version = "0.4.8", optional = true }
diff --git a/primitives/npos-elections/Cargo.toml b/primitives/npos-elections/Cargo.toml
index 4a66743028d1..44bcb2af8752 100644
--- a/primitives/npos-elections/Cargo.toml
+++ b/primitives/npos-elections/Cargo.toml
@@ -22,7 +22,7 @@ sp-arithmetic = { version = "2.0.0", default-features = false, path = "../arithm
 [dev-dependencies]
 substrate-test-utils = { version = "2.0.0", path = "../../test-utils" }
 rand = "0.7.3"
-sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
+sp-runtime = { version = "2.0.0", path = "../runtime" }
 
 [features]
 default = ["std"]
diff --git a/primitives/runtime-interface/test/Cargo.toml b/primitives/runtime-interface/test/Cargo.toml
index d6da3db4b69b..fb000166ac5b 100644
--- a/primitives/runtime-interface/test/Cargo.toml
+++ b/primitives/runtime-interface/test/Cargo.toml
@@ -16,7 +16,7 @@ sp-runtime-interface = { version = "2.0.0", path = "../" }
 sc-executor = { version = "0.8.0", path = "../../../client/executor" }
 sp-runtime-interface-test-wasm = { version = "2.0.0", path = "../test-wasm" }
 sp-runtime-interface-test-wasm-deprecated = { version = "2.0.0", path = "../test-wasm-deprecated" }
-sp-state-machine = { version = "0.8.0", path = "../../../primitives/state-machine" }
+sp-state-machine = { version = "0.8.0", path = "../../state-machine" }
 sp-runtime = { version = "2.0.0", path = "../../runtime" }
 sp-core = { version = "2.0.0", path = "../../core" }
 sp-io = { version = "2.0.0", path = "../../io" }
diff --git a/primitives/runtime/Cargo.toml b/primitives/runtime/Cargo.toml
index 9c3286cd4750..0ad05561581a 100644
--- a/primitives/runtime/Cargo.toml
+++ b/primitives/runtime/Cargo.toml
@@ -33,7 +33,7 @@ either = { version = "1.5", default-features = false }
 [dev-dependencies]
 serde_json = "1.0.41"
 rand = "0.7.2"
-sp-state-machine = { version = "0.8.0", path = "../../primitives/state-machine" }
+sp-state-machine = { version = "0.8.0", path = "../state-machine" }
 
 [features]
 bench = []

From 36d64331b90ab8096dff22390121cb64cd96e5b3 Mon Sep 17 00:00:00 2001
From: honeywest <50997103+honeywest@users.noreply.github.com>
Date: Fri, 18 Dec 2020 01:12:27 +0800
Subject: [PATCH 0185/1194] delete client in Cargo in client (#7752)

---
 client/basic-authorship/Cargo.toml | 2 +-
 client/consensus/aura/Cargo.toml   | 2 +-
 client/finality-grandpa/Cargo.toml | 2 +-
 client/network/test/Cargo.toml     | 2 +-
 client/offchain/Cargo.toml         | 2 +-
 client/rpc/Cargo.toml              | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/basic-authorship/Cargo.toml b/client/basic-authorship/Cargo.toml
index f097d8044f61..c5a67c0a6436 100644
--- a/client/basic-authorship/Cargo.toml
+++ b/client/basic-authorship/Cargo.toml
@@ -31,6 +31,6 @@ sc-block-builder = { version = "0.8.0", path = "../block-builder" }
 sc-proposer-metrics = { version = "0.8.0", path = "../proposer-metrics" }
 
 [dev-dependencies]
-sc-transaction-pool = { version = "2.0.0", path = "../../client/transaction-pool" }
+sc-transaction-pool = { version = "2.0.0", path = "../transaction-pool" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 parking_lot = "0.10.0"
diff --git a/client/consensus/aura/Cargo.toml b/client/consensus/aura/Cargo.toml
index ccc4d515a8e1..c240fa4cb4da 100644
--- a/client/consensus/aura/Cargo.toml
+++ b/client/consensus/aura/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 sp-application-crypto = { version = "2.0.0", path = "../../../primitives/application-crypto" }
 sp-consensus-aura = { version = "0.8.0", path = "../../../primitives/consensus/aura" }
 sp-block-builder = { version = "2.0.0", path = "../../../primitives/block-builder" }
-sc-block-builder = { version = "0.8.0", path = "../../../client/block-builder" }
+sc-block-builder = { version = "0.8.0", path = "../../block-builder" }
 sc-client-api = { version = "2.0.0", path = "../../api" }
 codec = { package = "parity-scale-codec", version = "1.3.4" }
 sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml
index 8966f5e8f657..d19fc18b22bd 100644
--- a/client/finality-grandpa/Cargo.toml
+++ b/client/finality-grandpa/Cargo.toml
@@ -28,7 +28,7 @@ sp-arithmetic = { version = "2.0.0", path = "../../primitives/arithmetic" }
 sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
 sp-utils = { version = "2.0.0", path = "../../primitives/utils" }
 sp-consensus = { version = "0.8.0", path = "../../primitives/consensus/common" }
-sc-consensus = { version = "0.8.0", path = "../../client/consensus/common" }
+sc-consensus = { version = "0.8.0", path = "../consensus/common" }
 sp-core = { version = "2.0.0", path = "../../primitives/core" }
 sp-keystore = { version = "0.8.0", path = "../../primitives/keystore" }
 sp-api = { version = "2.0.0", path = "../../primitives/api" }
diff --git a/client/network/test/Cargo.toml b/client/network/test/Cargo.toml
index 880e2c1f04ed..d3036742f176 100644
--- a/client/network/test/Cargo.toml
+++ b/client/network/test/Cargo.toml
@@ -21,7 +21,7 @@ futures-timer = "3.0.1"
 rand = "0.7.2"
 libp2p = { version = "0.32.2", default-features = false }
 sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
-sc-consensus = { version = "0.8.0", path = "../../../client/consensus/common" }
+sc-consensus = { version = "0.8.0", path = "../../consensus/common" }
 sc-client-api = { version = "2.0.0", path = "../../api" }
 sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
 sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
diff --git a/client/offchain/Cargo.toml b/client/offchain/Cargo.toml
index 1a31d278eb53..5c561105f02c 100644
--- a/client/offchain/Cargo.toml
+++ b/client/offchain/Cargo.toml
@@ -38,7 +38,7 @@ hyper-rustls = "0.21.0"
 
 [dev-dependencies]
 sc-client-db = { version = "0.8.0", default-features = true, path = "../db/" }
-sc-transaction-pool = { version = "2.0.0", path = "../../client/transaction-pool" }
+sc-transaction-pool = { version = "2.0.0", path = "../transaction-pool" }
 sp-transaction-pool = { version = "2.0.0", path = "../../primitives/transaction-pool" }
 sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml
index e68ac6e4e918..e02d88f158b8 100644
--- a/client/rpc/Cargo.toml
+++ b/client/rpc/Cargo.toml
@@ -33,11 +33,11 @@ sp-keystore = { version = "0.8.0", path = "../../primitives/keystore" }
 sp-state-machine = { version = "0.8.0", path = "../../primitives/state-machine" }
 sp-chain-spec = { version = "2.0.0", path = "../../primitives/chain-spec" }
 sc-executor = { version = "0.8.0", path = "../executor" }
-sc-block-builder = { version = "0.8.0", path = "../../client/block-builder" }
+sc-block-builder = { version = "0.8.0", path = "../block-builder" }
 sc-keystore = { version = "2.0.0", path = "../keystore" }
 sp-transaction-pool = { version = "2.0.0", path = "../../primitives/transaction-pool" }
 sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
-sc-tracing = { version = "2.0.0", path = "../../client/tracing" }
+sc-tracing = { version = "2.0.0", path = "../tracing" }
 hash-db = { version = "0.15.2", default-features = false }
 parking_lot = "0.10.0"
 lazy_static = { version = "1.4.0", optional = true }

From 039d3ffa69dcd613a5b18535e129f3ce4b276ffc Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Thu, 17 Dec 2020 22:17:57 +0000
Subject: [PATCH 0186/1194] prevent too many genesis council members (#7749)

* Prevent too many genesis members in elections-phragmen.

* Fix test.

* reformat.'
---
 frame/elections-phragmen/src/lib.rs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index db2428971cc5..b541303f651f 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -213,6 +213,10 @@ decl_storage! {
 	} add_extra_genesis {
 		config(members): Vec<(T::AccountId, BalanceOf<T>)>;
 		build(|config: &GenesisConfig<T>| {
+			assert!(
+				config.members.len() as u32 <= T::DesiredMembers::get(),
+				"Cannot accept more than DesiredMembers genesis member",
+			);
 			let members = config.members.iter().map(|(ref member, ref stake)| {
 				// make sure they have enough stake
 				assert!(
@@ -1442,10 +1446,20 @@ mod tests {
 	#[should_panic = "Duplicate member in elections phragmen genesis: 2"]
 	fn genesis_members_cannot_be_duplicate() {
 		ExtBuilder::default()
+			.desired_members(3)
 			.genesis_members(vec![(1, 10), (2, 10), (2, 10)])
 			.build_and_execute(|| {});
 	}
 
+	#[test]
+	#[should_panic = "Cannot accept more than DesiredMembers genesis member"]
+	fn genesis_members_cannot_too_many() {
+		ExtBuilder::default()
+			.genesis_members(vec![(1, 10), (2, 10), (3, 30)])
+			.desired_members(2)
+			.build_and_execute(|| {});
+	}
+
 	#[test]
 	fn term_duration_zero_is_passive() {
 		ExtBuilder::default()

From 330f5c0dbfdf4ffbb891251e90880757687a8a72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Fri, 18 Dec 2020 12:04:17 +0100
Subject: [PATCH 0187/1194] Update common block in sync after importing blocks
 of a peer, please read UPDATE (#7733)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update common block in sync after importing blocks of a peer

This updates the sync code to update the common block of a peer, after
we have imported blocks from this peer. This fixes a bug for when we are
connected to one or more nodes that are doing a full sync as our node.
Nodes in full sync will not announce new blocks, as we don't send import
notifications on full sync. The problem as now that we were connected to
some peer that reported some low number as its best and we tried to sync
these blocks. But, as we did not update the common block of this peer,
we would sync these blocks over and over again. Being captured in some
time warp.
The solution to this problem is that we increase the common number as we
import blocks from this peer.

* Test

* Test name..

* Fix test

* Cleanup some code and write some new regression test

* Implement the ancestor search

* Check that the common number is smaller than the last finalized block

* Update client/network/src/protocol/sync.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Update client/network/src/protocol/sync.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Update client/network/src/protocol/sync.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Change the way we build the status messages

* Start some new test...

* Finish test

* Rename test

* Update client/network/src/protocol.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
---
 client/network/src/protocol.rs                |  54 +-
 client/network/src/protocol/sync.rs           | 550 +++++++++++++++---
 .../src/protocol/sync/extra_requests.rs       |   5 +-
 client/network/test/src/block_import.rs       |   2 +-
 client/network/test/src/lib.rs                |   2 +
 client/network/test/src/sync.rs               |  36 +-
 .../consensus/common/src/import_queue.rs      |   4 +-
 7 files changed, 546 insertions(+), 107 deletions(-)

diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index 41326b6d82a0..1a67aec57abb 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -307,27 +307,35 @@ struct BlockAnnouncesHandshake<B: BlockT> {
 }
 
 impl<B: BlockT> BlockAnnouncesHandshake<B> {
-	fn build(protocol_config: &ProtocolConfig, chain: &Arc<dyn Client<B>>) -> Self {
-		let info = chain.info();
+	fn build(
+		protocol_config: &ProtocolConfig,
+		best_number: NumberFor<B>,
+		best_hash: B::Hash,
+		genesis_hash: B::Hash,
+	) -> Self {
 		BlockAnnouncesHandshake {
-			genesis_hash: info.genesis_hash,
+			genesis_hash,
 			roles: protocol_config.roles,
-			best_number: info.best_number,
-			best_hash: info.best_hash,
+			best_number,
+			best_hash,
 		}
 	}
 }
 
 /// Builds a SCALE-encoded "Status" message to send as handshake for the legacy protocol.
-fn build_status_message<B: BlockT>(protocol_config: &ProtocolConfig, chain: &Arc<dyn Client<B>>) -> Vec<u8> {
-	let info = chain.info();
+fn build_status_message<B: BlockT>(
+	protocol_config: &ProtocolConfig,
+	best_number: NumberFor<B>,
+	best_hash: B::Hash,
+	genesis_hash: B::Hash,
+) -> Vec<u8> {
 	let status = message::generic::Status {
 		version: CURRENT_VERSION,
 		min_supported_version: MIN_VERSION,
-		genesis_hash: info.genesis_hash,
+		genesis_hash,
 		roles: protocol_config.roles.into(),
-		best_number: info.best_number,
-		best_hash: info.best_hash,
+		best_number,
+		best_hash,
 		chain_status: Vec::new(), // TODO: find a way to make this backwards-compatible
 	};
 
@@ -400,12 +408,22 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 
 		let behaviour = {
 			let versions = &((MIN_VERSION as u8)..=(CURRENT_VERSION as u8)).collect::<Vec<u8>>();
-			let block_announces_handshake = BlockAnnouncesHandshake::build(&config, &chain).encode();
+
+			let best_number = info.best_number;
+			let best_hash = info.best_hash;
+			let genesis_hash = info.genesis_hash;
+
+			let block_announces_handshake = BlockAnnouncesHandshake::<B>::build(
+				&config,
+				best_number,
+				best_hash,
+				genesis_hash,
+			).encode();
 			GenericProto::new(
 				local_peer_id,
 				protocol_id.clone(),
 				versions,
-				build_status_message(&config, &chain),
+				build_status_message::<B>(&config, best_number, best_hash, genesis_hash),
 				peerset,
 				// As documented in `GenericProto`, the first protocol in the list is always the
 				// one carrying the handshake reported in the `CustomProtocolOpen` event.
@@ -528,13 +546,21 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 
 	/// Inform sync about new best imported block.
 	pub fn new_best_block_imported(&mut self, hash: B::Hash, number: NumberFor<B>) {
+		trace!(target: "sync", "New best block imported {:?}/#{}", hash, number);
+
 		self.sync.update_chain_info(&hash, number);
+
 		self.behaviour.set_legacy_handshake_message(
-			build_status_message(&self.config, &self.context_data.chain),
+			build_status_message::<B>(&self.config, number, hash, self.genesis_hash),
 		);
 		self.behaviour.set_notif_protocol_handshake(
 			&self.block_announces_protocol,
-			BlockAnnouncesHandshake::build(&self.config, &self.context_data.chain).encode()
+			BlockAnnouncesHandshake::<B>::build(
+				&self.config,
+				number,
+				hash,
+				self.genesis_hash,
+			).encode()
 		);
 	}
 
diff --git a/client/network/src/protocol/sync.rs b/client/network/src/protocol/sync.rs
index 1ff8d37afeca..712c13002883 100644
--- a/client/network/src/protocol/sync.rs
+++ b/client/network/src/protocol/sync.rs
@@ -67,6 +67,10 @@ const MAX_IMPORTING_BLOCKS: usize = 2048;
 /// Maximum blocks to download ahead of any gap.
 const MAX_DOWNLOAD_AHEAD: u32 = 2048;
 
+/// Maximum blocks to look backwards. The gap is the difference between the highest block and the
+/// common block of a node.
+const MAX_BLOCKS_TO_LOOK_BACKWARDS: u32 = MAX_DOWNLOAD_AHEAD / 2;
+
 /// Maximum number of concurrent block announce validations.
 ///
 /// If the queue reaches the maximum, we drop any new block
@@ -211,6 +215,8 @@ pub struct ChainSync<B: BlockT> {
 /// All the data we have about a Peer that we are trying to sync with
 #[derive(Debug, Clone)]
 pub struct PeerSync<B: BlockT> {
+	/// Peer id of this peer.
+	pub peer_id: PeerId,
 	/// The common number is the block number that is a common point of
 	/// ancestry for both our chains (as far as we know).
 	pub common_number: NumberFor<B>,
@@ -223,6 +229,22 @@ pub struct PeerSync<B: BlockT> {
 	pub state: PeerSyncState<B>,
 }
 
+impl<B: BlockT> PeerSync<B> {
+	/// Update the `common_number` iff `new_common > common_number`.
+	fn update_common_number(&mut self, new_common: NumberFor<B>) {
+		if self.common_number < new_common {
+			trace!(
+				target: "sync",
+				"Updating peer {} common number from={} => to={}.",
+				self.peer_id,
+				self.common_number,
+				new_common,
+			);
+			self.common_number = new_common;
+		}
+	}
+}
+
 /// The sync status of a peer we are trying to sync with
 #[derive(Debug)]
 pub struct PeerInfo<B: BlockT> {
@@ -264,11 +286,7 @@ pub enum PeerSyncState<B: BlockT> {
 
 impl<B: BlockT> PeerSyncState<B> {
 	pub fn is_available(&self) -> bool {
-		if let PeerSyncState::Available = self {
-			true
-		} else {
-			false
-		}
+		matches!(self, Self::Available)
 	}
 }
 
@@ -315,6 +333,18 @@ pub enum OnBlockData<B: BlockT> {
 	Request(PeerId, BlockRequest<B>)
 }
 
+impl<B: BlockT> OnBlockData<B> {
+	/// Returns `self` as request.
+	#[cfg(test)]
+	fn into_request(self) -> Option<(PeerId, BlockRequest<B>)> {
+		if let Self::Request(peer, req) = self {
+			Some((peer, req))
+		} else {
+			None
+		}
+	}
+}
+
 /// Result of [`ChainSync::poll_block_announce_validation`].
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum PollBlockAnnounceValidation<H> {
@@ -512,7 +542,8 @@ impl<B: BlockT> ChainSync<B> {
 						self.best_queued_hash,
 						self.best_queued_number
 					);
-					self.peers.insert(who, PeerSync {
+					self.peers.insert(who.clone(), PeerSync {
+						peer_id: who,
 						common_number: self.best_queued_number,
 						best_hash,
 						best_number,
@@ -522,43 +553,55 @@ impl<B: BlockT> ChainSync<B> {
 				}
 
 				// If we are at genesis, just start downloading.
-				if self.best_queued_number.is_zero() {
-					debug!(target:"sync", "New peer with best hash {} ({}).", best_hash, best_number);
-					self.peers.insert(who.clone(), PeerSync {
-						common_number: Zero::zero(),
+				let (state, req) = if self.best_queued_number.is_zero() {
+					debug!(
+						target:"sync",
+						"New peer with best hash {} ({}).",
 						best_hash,
 						best_number,
-						state: PeerSyncState::Available,
-					});
-					self.pending_requests.add(&who);
-					return Ok(None)
-				}
+					);
 
-				let common_best = std::cmp::min(self.best_queued_number, best_number);
+					(PeerSyncState::Available, None)
+				} else {
+					let common_best = std::cmp::min(self.best_queued_number, best_number);
 
-				debug!(target:"sync",
-					"New peer with unknown best hash {} ({}), searching for common ancestor.",
-					best_hash,
-					best_number
-				);
+					debug!(
+						target:"sync",
+						"New peer with unknown best hash {} ({}), searching for common ancestor.",
+						best_hash,
+						best_number
+					);
+
+					(
+						PeerSyncState::AncestorSearch {
+							current: common_best,
+							start: self.best_queued_number,
+							state: AncestorSearchState::ExponentialBackoff(One::one()),
+						},
+						Some(ancestry_request::<B>(common_best))
+					)
+				};
 
 				self.pending_requests.add(&who);
-				self.peers.insert(who, PeerSync {
+				self.peers.insert(who.clone(), PeerSync {
+					peer_id: who,
 					common_number: Zero::zero(),
 					best_hash,
 					best_number,
-					state: PeerSyncState::AncestorSearch {
-						current: common_best,
-						start: self.best_queued_number,
-						state: AncestorSearchState::ExponentialBackoff(One::one()),
-					},
+					state,
 				});
 
-				Ok(Some(ancestry_request::<B>(common_best)))
+				Ok(req)
 			}
 			Ok(BlockStatus::Queued) | Ok(BlockStatus::InChainWithState) | Ok(BlockStatus::InChainPruned) => {
-				debug!(target:"sync", "New peer with known best hash {} ({}).", best_hash, best_number);
+				debug!(
+					target: "sync",
+					"New peer with known best hash {} ({}).",
+					best_hash,
+					best_number,
+				);
 				self.peers.insert(who.clone(), PeerSync {
+					peer_id: who.clone(),
 					common_number: best_number,
 					best_hash,
 					best_number,
@@ -687,7 +730,21 @@ impl<B: BlockT> ChainSync<B> {
 				return None
 			}
 
-			if let Some((range, req)) = peer_block_request(
+			// If our best queued is more than `MAX_BLOCKS_TO_LOOK_BACKWARDS` blocks away from the
+			// common number, the peer best number is higher than our best queued and the common
+			// number is smaller than the last finalized block number, we should do an ancestor
+			// search to find a better common block.
+			if best_queued.saturating_sub(peer.common_number) > MAX_BLOCKS_TO_LOOK_BACKWARDS.into()
+				&& best_queued < peer.best_number && peer.common_number < last_finalized
+			{
+				let current = std::cmp::min(peer.best_number, best_queued);
+				peer.state = PeerSyncState::AncestorSearch {
+					current,
+					start: best_queued,
+					state: AncestorSearchState::ExponentialBackoff(One::one()),
+				};
+				Some((id, ancestry_request::<B>(current)))
+			} else if let Some((range, req)) = peer_block_request(
 				id,
 				peer,
 				blocks,
@@ -795,15 +852,29 @@ impl<B: BlockT> ChainSync<B> {
 						PeerSyncState::AncestorSearch { current, start, state } => {
 							let matching_hash = match (blocks.get(0), self.client.hash(*current)) {
 								(Some(block), Ok(maybe_our_block_hash)) => {
-									trace!(target: "sync", "Got ancestry block #{} ({}) from peer {}", current, block.hash, who);
+									trace!(
+										target: "sync",
+										"Got ancestry block #{} ({}) from peer {}",
+										current,
+										block.hash,
+										who,
+									);
 									maybe_our_block_hash.filter(|x| x == &block.hash)
 								},
 								(None, _) => {
-									debug!(target: "sync", "Invalid response when searching for ancestor from {}", who);
+									debug!(
+										target: "sync",
+										"Invalid response when searching for ancestor from {}",
+										who,
+									);
 									return Err(BadPeer(who.clone(), rep::UNKNOWN_ANCESTOR))
 								},
 								(_, Err(e)) => {
-									info!("❌ Error answering legitimate blockchain query: {:?}", e);
+									info!(
+										target: "sync",
+										"❌ Error answering legitimate blockchain query: {:?}",
+										e,
+									);
 									return Err(BadPeer(who.clone(), rep::BLOCKCHAIN_READ_ERROR))
 								}
 							};
@@ -822,17 +893,23 @@ impl<B: BlockT> ChainSync<B> {
 								trace!(target:"sync", "Ancestry search: genesis mismatch for peer {}", who);
 								return Err(BadPeer(who.clone(), rep::GENESIS_MISMATCH))
 							}
-							if let Some((next_state, next_num)) = handle_ancestor_search_state(state, *current, matching_hash.is_some()) {
+							if let Some((next_state, next_num)) =
+								handle_ancestor_search_state(state, *current, matching_hash.is_some())
+							{
 								peer.state = PeerSyncState::AncestorSearch {
 									current: next_num,
 									start: *start,
 									state: next_state,
 								};
-								return Ok(OnBlockData::Request(who.clone(), ancestry_request::<B>(next_num)))
+								return Ok(
+									OnBlockData::Request(who.clone(), ancestry_request::<B>(next_num))
+								)
 							} else {
 								// Ancestry search is complete. Check if peer is on a stale fork unknown to us and
 								// add it to sync targets if necessary.
-								trace!(target: "sync", "Ancestry search complete. Ours={} ({}), Theirs={} ({}), Common={:?} ({})",
+								trace!(
+									target: "sync",
+									"Ancestry search complete. Ours={} ({}), Theirs={} ({}), Common={:?} ({})",
 									self.best_queued_hash,
 									self.best_queued_number,
 									peer.best_hash,
@@ -843,7 +920,12 @@ impl<B: BlockT> ChainSync<B> {
 								if peer.common_number < peer.best_number
 									&& peer.best_number < self.best_queued_number
 								{
-									trace!(target: "sync", "Added fork target {} for {}" , peer.best_hash, who);
+									trace!(
+										target: "sync",
+										"Added fork target {} for {}",
+										peer.best_hash,
+										who,
+									);
 									self.fork_targets
 										.entry(peer.best_hash.clone())
 										.or_insert_with(|| ForkTarget {
@@ -991,7 +1073,11 @@ impl<B: BlockT> ChainSync<B> {
 			}
 
 			match result {
-				Ok(BlockImportResult::ImportedKnown(_number)) => {}
+				Ok(BlockImportResult::ImportedKnown(number, who)) => {
+					if let Some(peer) = who.and_then(|p| self.peers.get_mut(&p)) {
+						peer.update_common_number(number);
+					}
+				}
 				Ok(BlockImportResult::ImportedUnknown(number, aux, who)) => {
 					if aux.clear_justification_requests {
 						trace!(
@@ -1004,38 +1090,61 @@ impl<B: BlockT> ChainSync<B> {
 					}
 
 					if aux.needs_justification {
-						trace!(target: "sync", "Block imported but requires justification {}: {:?}", number, hash);
+						trace!(
+							target: "sync",
+							"Block imported but requires justification {}: {:?}",
+							number,
+							hash,
+						);
 						self.request_justification(&hash, number);
 					}
 
 					if aux.bad_justification {
-						if let Some(peer) = who {
+						if let Some(ref peer) = who {
 							info!("💔 Sent block with bad justification to import");
-							output.push(Err(BadPeer(peer, rep::BAD_JUSTIFICATION)));
+							output.push(Err(BadPeer(peer.clone(), rep::BAD_JUSTIFICATION)));
 						}
 					}
 
 					if number > self.best_imported_number {
 						self.best_imported_number = number;
 					}
+
+					if let Some(peer) = who.and_then(|p| self.peers.get_mut(&p)) {
+						peer.update_common_number(number);
+					}
 				},
 				Err(BlockImportError::IncompleteHeader(who)) => {
 					if let Some(peer) = who {
-						warn!("💔 Peer sent block with incomplete header to import");
+						warn!(
+							target: "sync",
+							"💔 Peer sent block with incomplete header to import",
+						);
 						output.push(Err(BadPeer(peer, rep::INCOMPLETE_HEADER)));
 						output.extend(self.restart());
 					}
 				},
 				Err(BlockImportError::VerificationFailed(who, e)) => {
 					if let Some(peer) = who {
-						warn!("💔 Verification failed for block {:?} received from peer: {}, {:?}", hash, peer, e);
+						warn!(
+							target: "sync",
+							"💔 Verification failed for block {:?} received from peer: {}, {:?}",
+							hash,
+							peer,
+							e,
+						);
 						output.push(Err(BadPeer(peer, rep::VERIFICATION_FAIL)));
 						output.extend(self.restart());
 					}
 				},
 				Err(BlockImportError::BadBlock(who)) => {
 					if let Some(peer) = who {
-						info!("💔 Block {:?} received from peer {} has been blacklisted", hash, peer);
+						info!(
+							target: "sync",
+							"💔 Block {:?} received from peer {} has been blacklisted",
+							hash,
+							peer,
+						);
 						output.push(Err(BadPeer(peer, rep::BAD_BLOCK)));
 					}
 				},
@@ -1074,7 +1183,11 @@ impl<B: BlockT> ChainSync<B> {
 		});
 
 		if let Err(err) = r {
-			warn!(target: "sync", "💔 Error cleaning up pending extra justification data requests: {:?}", err);
+			warn!(
+				target: "sync",
+				"💔 Error cleaning up pending extra justification data requests: {:?}",
+				err,
+			);
 		}
 	}
 
@@ -1279,6 +1392,12 @@ impl<B: BlockT> ChainSync<B> {
 		&mut self,
 		pre_validation_result: PreValidateBlockAnnounce<B::Header>,
 	) -> PollBlockAnnounceValidation<B::Header> {
+		trace!(
+			target: "sync",
+			"Finished block announce validation: {:?}",
+			pre_validation_result,
+		);
+
 		let (announce, is_best, who) = match pre_validation_result {
 			PreValidateBlockAnnounce::Nothing { is_best, who, announce } => {
 				self.peer_block_announce_validation_finished(&who);
@@ -1316,6 +1435,7 @@ impl<B: BlockT> ChainSync<B> {
 		}
 
 		if let PeerSyncState::AncestorSearch {..} = peer.state {
+			trace!(target: "sync", "Peer state is ancestor search.");
 			return PollBlockAnnounceValidation::Nothing { is_best, who, header }
 		}
 
@@ -1323,11 +1443,11 @@ impl<B: BlockT> ChainSync<B> {
 		// is either one further ahead or it's the one they just announced, if we know about it.
 		if is_best {
 			if known && self.best_queued_number >= number {
-				peer.common_number = number
+				peer.update_common_number(number);
 			} else if header.parent_hash() == &self.best_queued_hash
 				|| known_parent && self.best_queued_number >= number
 			{
-				peer.common_number = number - One::one();
+				peer.update_common_number(number - One::one());
 			}
 		}
 		self.pending_requests.add(&who);
@@ -1367,6 +1487,7 @@ impl<B: BlockT> ChainSync<B> {
 				.peers.insert(who.clone());
 		}
 
+		trace!(target: "sync", "Announce validation result is nothing");
 		PollBlockAnnounceValidation::Nothing { is_best, who, header }
 	}
 
@@ -1485,7 +1606,7 @@ pub enum AncestorSearchState<B: BlockT> {
 fn handle_ancestor_search_state<B: BlockT>(
 	state: &AncestorSearchState<B>,
 	curr_block_num: NumberFor<B>,
-	block_hash_match: bool
+	block_hash_match: bool,
 ) -> Option<(AncestorSearchState<B>, NumberFor<B>)> {
 	let two = <NumberFor<B>>::one() + <NumberFor<B>>::one();
 	match state {
@@ -1536,44 +1657,41 @@ fn peer_block_request<B: BlockT>(
 	if best_num >= peer.best_number {
 		// Will be downloaded as alternative fork instead.
 		return None;
-	}
-	if peer.common_number < finalized {
+	} else if peer.common_number < finalized {
 		trace!(
 			target: "sync",
 			"Requesting pre-finalized chain from {:?}, common={}, finalized={}, peer best={}, our best={}",
 			id, peer.common_number, finalized, peer.best_number, best_num,
 		);
 	}
-	if let Some(range) = blocks.needed_blocks(
+	let range = blocks.needed_blocks(
 		id.clone(),
 		MAX_BLOCKS_TO_REQUEST,
 		peer.best_number,
 		peer.common_number,
 		max_parallel_downloads,
 		MAX_DOWNLOAD_AHEAD,
-	) {
-		// The end is not part of the range.
-		let last = range.end.saturating_sub(One::one());
+	)?;
 
-		let from = if peer.best_number == last {
-			message::FromBlock::Hash(peer.best_hash)
-		} else {
-			message::FromBlock::Number(last)
-		};
+	// The end is not part of the range.
+	let last = range.end.saturating_sub(One::one());
 
-		let request = message::generic::BlockRequest {
-			id: 0,
-			fields: attrs.clone(),
-			from,
-			to: None,
-			direction: message::Direction::Descending,
-			max: Some((range.end - range.start).saturated_into::<u32>())
-		};
-
-		Some((range, request))
+	let from = if peer.best_number == last {
+		message::FromBlock::Hash(peer.best_hash)
 	} else {
-		None
-	}
+		message::FromBlock::Number(last)
+	};
+
+	let request = message::generic::BlockRequest {
+		id: 0,
+		fields: attrs.clone(),
+		from,
+		to: None,
+		direction: message::Direction::Descending,
+		max: Some((range.end - range.start).saturated_into::<u32>())
+	};
+
+	Some((range, request))
 }
 
 /// Get pending fork sync targets for a peer.
@@ -1750,7 +1868,7 @@ mod test {
 	use substrate_test_runtime_client::{
 		runtime::{Block, Hash, Header},
 		ClientBlockImportExt, DefaultTestClientBuilderExt, TestClientBuilder, TestClientBuilderExt,
-		BlockBuilderExt,
+		BlockBuilderExt, TestClient, ClientExt,
 	};
 	use futures::{future::poll_fn, executor::block_on};
 
@@ -1948,11 +2066,14 @@ mod test {
 	/// Get a block request from `sync` and check that is matches the expected request.
 	fn get_block_request(
 		sync: &mut ChainSync<Block>,
-		from: message::FromBlock<Hash, u64>,
+		from: FromBlock<Hash, u64>,
 		max: u32,
 		peer: &PeerId,
 	) -> BlockRequest<Block> {
 		let requests = sync.block_requests().collect::<Vec<_>>();
+
+		log::trace!(target: "sync", "Requests: {:?}", requests);
+
 		assert_eq!(1, requests.len());
 		assert_eq!(peer, requests[0].0);
 
@@ -1963,6 +2084,26 @@ mod test {
 		request
 	}
 
+	/// Build and import a new best block.
+	fn build_block(client: &mut Arc<TestClient>, at: Option<Hash>, fork: bool) -> Block {
+		let at = at.unwrap_or_else(|| client.info().best_hash);
+
+		let mut block_builder = client.new_block_at(
+			&BlockId::Hash(at),
+			Default::default(),
+			false,
+		).unwrap();
+
+		if fork {
+			block_builder.push_storage_change(vec![1, 2, 3], Some(vec![4, 5, 6])).unwrap();
+		}
+
+		let block = block_builder.build().unwrap().block;
+
+		client.import(BlockOrigin::Own, block.clone()).unwrap();
+		block
+	}
+
 	/// This test is a regression test as observed on a real network.
 	///
 	/// The node is connected to multiple peers. Both of these peers are having a best block (1) that
@@ -1990,14 +2131,6 @@ mod test {
 		let peer_id1 = PeerId::random();
 		let peer_id2 = PeerId::random();
 
-		let mut client2 = client.clone();
-		let mut build_block = || {
-			let block = client2.new_block(Default::default()).unwrap().build().unwrap().block;
-			client2.import(BlockOrigin::Own, block.clone()).unwrap();
-
-			block
-		};
-
 		let mut client2 = client.clone();
 		let mut build_block_at = |at, import| {
 			let mut block_builder = client2.new_block_at(&BlockId::Hash(at), Default::default(), false)
@@ -2014,9 +2147,9 @@ mod test {
 			block
 		};
 
-		let block1 = build_block();
-		let block2 = build_block();
-		let block3 = build_block();
+		let block1 = build_block(&mut client, None, false);
+		let block2 = build_block(&mut client, None, false);
+		let block3 = build_block(&mut client, None, false);
 		let block3_fork = build_block_at(block2.hash(), false);
 
 		// Add two peers which are on block 1.
@@ -2073,4 +2206,253 @@ mod test {
 		// Nothing to import
 		assert!(matches!(res, OnBlockData::Import(_, blocks) if blocks.is_empty()));
 	}
+
+	fn unwrap_from_block_number(from: FromBlock<Hash, u64>) -> u64 {
+		if let FromBlock::Number(from) = from {
+			from
+		} else {
+			panic!("Expected a number!");
+		}
+	}
+
+	/// A regression test for a behavior we have seen on a live network.
+	///
+	/// The scenario is that the node is doing a full resync and is connected to some node that is
+	/// doing a major sync as well. This other node that is doing a major sync will finish before
+	/// our node and send a block announcement message, but we don't have seen any block announcement
+	/// from this node in its sync process. Meaning our common number didn't change. It is now expected
+	/// that we start an ancestor search to find the common number.
+	#[test]
+	fn do_ancestor_search_when_common_block_to_best_qeued_gap_is_to_big() {
+		sp_tracing::try_init_simple();
+
+		let blocks = {
+			let mut client = Arc::new(TestClientBuilder::new().build());
+			(0..MAX_DOWNLOAD_AHEAD * 2).map(|_| build_block(&mut client, None, false)).collect::<Vec<_>>()
+		};
+
+		let mut client = Arc::new(TestClientBuilder::new().build());
+		let info = client.info();
+
+		let mut sync = ChainSync::new(
+			Roles::AUTHORITY,
+			client.clone(),
+			&info,
+			Box::new(DefaultBlockAnnounceValidator),
+			5,
+		);
+
+		let peer_id1 = PeerId::random();
+		let peer_id2 = PeerId::random();
+
+		let best_block = blocks.last().unwrap().clone();
+		// Connect the node we will sync from
+		sync.new_peer(peer_id1.clone(), best_block.hash(), *best_block.header().number()).unwrap();
+		sync.new_peer(peer_id2.clone(), info.best_hash, 0).unwrap();
+
+		let mut best_block_num = 0;
+		while best_block_num < MAX_DOWNLOAD_AHEAD {
+			let request = get_block_request(
+				&mut sync,
+				FromBlock::Number(MAX_BLOCKS_TO_REQUEST as u64 + best_block_num as u64),
+				MAX_BLOCKS_TO_REQUEST as u32,
+				&peer_id1,
+			);
+
+			let from = unwrap_from_block_number(request.from.clone());
+
+			let mut resp_blocks = blocks[best_block_num as usize..from as usize].to_vec();
+			resp_blocks.reverse();
+
+			let response = create_block_response(resp_blocks.clone());
+
+			let res = sync.on_block_data(&peer_id1, Some(request), response).unwrap();
+			assert!(
+				matches!(
+					res,
+					OnBlockData::Import(_, blocks) if blocks.len() == MAX_BLOCKS_TO_REQUEST
+				),
+			);
+
+			best_block_num += MAX_BLOCKS_TO_REQUEST as u32;
+
+			resp_blocks.into_iter()
+					.rev()
+					.for_each(|b| client.import_as_final(BlockOrigin::Own, b).unwrap());
+		}
+
+		// Let peer2 announce that it finished syncing
+		send_block_announce(best_block.header().clone(), &peer_id2, &mut sync);
+
+		let (peer1_req, peer2_req) = sync.block_requests().fold((None, None), |res, req| {
+			if req.0 == &peer_id1 {
+				(Some(req.1), res.1)
+			} else if req.0 == &peer_id2 {
+				(res.0, Some(req.1))
+			} else {
+				panic!("Unexpected req: {:?}", req)
+			}
+		});
+
+		// We should now do an ancestor search to find the correct common block.
+		let peer2_req = peer2_req.unwrap();
+		assert_eq!(Some(1), peer2_req.max);
+		assert_eq!(FromBlock::Number(best_block_num as u64), peer2_req.from);
+
+		let response = create_block_response(vec![blocks[(best_block_num - 1) as usize].clone()]);
+		let res = sync.on_block_data(&peer_id2, Some(peer2_req), response).unwrap();
+		assert!(
+			matches!(
+				res,
+				OnBlockData::Import(_, blocks) if blocks.is_empty()
+			),
+		);
+
+		let peer1_from = unwrap_from_block_number(peer1_req.unwrap().from);
+
+		// As we are on the same chain, we should directly continue with requesting blocks from
+		// peer 2 as well.
+		get_block_request(
+			&mut sync,
+			FromBlock::Number(peer1_from + MAX_BLOCKS_TO_REQUEST as u64),
+			MAX_BLOCKS_TO_REQUEST as u32,
+			&peer_id2,
+		);
+	}
+
+	/// A test that ensures that we can sync a huge fork.
+	///
+	/// The following scenario:
+	/// A peer connects to us and we both have the common block 512. The last finalized is 2048.
+	/// Our best block is 4096. The peer send us a block announcement with 4097 from a fork.
+	///
+	/// We will first do an ancestor search to find the common block. After that we start to sync
+	/// the fork and finish it ;)
+	#[test]
+	fn can_sync_huge_fork() {
+		sp_tracing::try_init_simple();
+
+		let mut client = Arc::new(TestClientBuilder::new().build());
+		let blocks = (0..MAX_BLOCKS_TO_LOOK_BACKWARDS * 4)
+			.map(|_| build_block(&mut client, None, false))
+			.collect::<Vec<_>>();
+
+		let fork_blocks = {
+			let mut client = Arc::new(TestClientBuilder::new().build());
+			let fork_blocks = blocks[..MAX_BLOCKS_TO_LOOK_BACKWARDS as usize * 2]
+				.into_iter()
+				.inspect(|b| client.import(BlockOrigin::Own, (*b).clone()).unwrap())
+				.cloned()
+				.collect::<Vec<_>>();
+
+				fork_blocks.into_iter().chain(
+					(0..MAX_BLOCKS_TO_LOOK_BACKWARDS * 2 + 1)
+						.map(|_| build_block(&mut client, None, true))
+				).collect::<Vec<_>>()
+		};
+
+		let info = client.info();
+
+		let mut sync = ChainSync::new(
+			Roles::AUTHORITY,
+			client.clone(),
+			&info,
+			Box::new(DefaultBlockAnnounceValidator),
+			5,
+		);
+
+		let finalized_block = blocks[MAX_BLOCKS_TO_LOOK_BACKWARDS as usize * 2 - 1].clone();
+		client.finalize_block(BlockId::Hash(finalized_block.hash()), Some(Vec::new())).unwrap();
+		sync.update_chain_info(&info.best_hash, info.best_number);
+
+		let peer_id1 = PeerId::random();
+
+		let common_block = blocks[MAX_BLOCKS_TO_LOOK_BACKWARDS as usize / 2].clone();
+		// Connect the node we will sync from
+		sync.new_peer(peer_id1.clone(), common_block.hash(), *common_block.header().number()).unwrap();
+
+		send_block_announce(fork_blocks.last().unwrap().header().clone(), &peer_id1, &mut sync);
+
+		let mut request = get_block_request(
+			&mut sync,
+			FromBlock::Number(info.best_number),
+			1,
+			&peer_id1,
+		);
+
+		// Do the ancestor search
+		loop {
+			let block = &fork_blocks[unwrap_from_block_number(request.from.clone()) as usize - 1];
+			let response = create_block_response(vec![block.clone()]);
+
+			let on_block_data = sync.on_block_data(&peer_id1, Some(request), response).unwrap();
+			request = match on_block_data.into_request() {
+				Some(req) => req.1,
+				// We found the ancenstor
+				None => break,
+			};
+
+			log::trace!(target: "sync", "Request: {:?}", request);
+		}
+
+		// Now request and import the fork.
+		let mut best_block_num = finalized_block.header().number().clone() as u32;
+		while best_block_num < *fork_blocks.last().unwrap().header().number() as u32 - 1 {
+			let request = get_block_request(
+				&mut sync,
+				FromBlock::Number(MAX_BLOCKS_TO_REQUEST as u64 + best_block_num as u64),
+				MAX_BLOCKS_TO_REQUEST as u32,
+				&peer_id1,
+			);
+
+			let from = unwrap_from_block_number(request.from.clone());
+
+			let mut resp_blocks = fork_blocks[best_block_num as usize..from as usize].to_vec();
+			resp_blocks.reverse();
+
+			let response = create_block_response(resp_blocks.clone());
+
+			let res = sync.on_block_data(&peer_id1, Some(request), response).unwrap();
+			assert!(
+				matches!(
+					res,
+					OnBlockData::Import(_, blocks) if blocks.len() == MAX_BLOCKS_TO_REQUEST
+				),
+			);
+
+			best_block_num += MAX_BLOCKS_TO_REQUEST as u32;
+
+			let _ = sync.on_blocks_processed(
+				MAX_BLOCKS_TO_REQUEST as usize,
+				MAX_BLOCKS_TO_REQUEST as usize,
+				resp_blocks.iter()
+					.rev()
+					.map(|b|
+						(
+							Ok(
+								BlockImportResult::ImportedUnknown(
+									b.header().number().clone(),
+									Default::default(),
+									Some(peer_id1.clone()),
+								)
+							),
+							b.hash(),
+						)
+					)
+					.collect()
+			);
+
+			resp_blocks.into_iter()
+				.rev()
+				.for_each(|b| client.import(BlockOrigin::Own, b).unwrap());
+		}
+
+		// Request the tip
+		get_block_request(
+			&mut sync,
+			FromBlock::Hash(fork_blocks.last().unwrap().hash()),
+			1,
+			&peer_id1,
+		);
+	}
 }
diff --git a/client/network/src/protocol/sync/extra_requests.rs b/client/network/src/protocol/sync/extra_requests.rs
index 7a7198aa7a0b..84ad308c61ed 100644
--- a/client/network/src/protocol/sync/extra_requests.rs
+++ b/client/network/src/protocol/sync/extra_requests.rs
@@ -545,6 +545,7 @@ mod tests {
 	impl Arbitrary for ArbitraryPeerSync {
 		fn arbitrary<G: Gen>(g: &mut G) -> Self {
 			let ps = PeerSync {
+				peer_id: PeerId::random(),
 				common_number: g.gen(),
 				best_hash: Hash::random(),
 				best_number: g.gen(),
@@ -561,10 +562,10 @@ mod tests {
 		fn arbitrary<G: Gen>(g: &mut G) -> Self {
 			let mut peers = HashMap::with_capacity(g.size());
 			for _ in 0 .. g.size() {
-				peers.insert(PeerId::random(), ArbitraryPeerSync::arbitrary(g).0);
+				let ps = ArbitraryPeerSync::arbitrary(g).0;
+				peers.insert(ps.peer_id.clone(), ps);
 			}
 			ArbitraryPeers(peers)
 		}
 	}
-
 }
diff --git a/client/network/test/src/block_import.rs b/client/network/test/src/block_import.rs
index a5d0600abefe..5f9064d410e0 100644
--- a/client/network/test/src/block_import.rs
+++ b/client/network/test/src/block_import.rs
@@ -76,7 +76,7 @@ fn import_single_good_known_block_is_ignored() {
 		block,
 		&mut PassThroughVerifier::new(true)
 	) {
-		Ok(BlockImportResult::ImportedKnown(ref n)) if *n == number => {}
+		Ok(BlockImportResult::ImportedKnown(ref n, _)) if *n == number => {}
 		_ => panic!()
 	}
 }
diff --git a/client/network/test/src/lib.rs b/client/network/test/src/lib.rs
index a70ecb4fb048..428d8390b365 100644
--- a/client/network/test/src/lib.rs
+++ b/client/network/test/src/lib.rs
@@ -696,6 +696,8 @@ pub trait TestNetFactory: Sized {
 			metrics_registry: None,
 		}).unwrap();
 
+		trace!(target: "test_network", "Peer identifier: {}", network.service().local_peer_id());
+
 		self.mut_peers(|peers| {
 			for peer in peers.iter_mut() {
 				peer.network.add_known_address(network.service().local_peer_id().clone(), listen_addr.clone());
diff --git a/client/network/test/src/sync.rs b/client/network/test/src/sync.rs
index 9a488ae4fa49..e04ef060f08c 100644
--- a/client/network/test/src/sync.rs
+++ b/client/network/test/src/sync.rs
@@ -702,7 +702,7 @@ fn can_sync_to_peers_with_wrong_common_block() {
 
 	net.block_until_sync();
 
-	assert!(net.peer(1).client().header(&BlockId::Hash(final_hash)).unwrap().is_some());
+	assert!(net.peer(1).has_block(&final_hash));
 }
 
 /// Returns `is_new_best = true` for each validated announcement.
@@ -721,7 +721,6 @@ impl BlockAnnounceValidator<Block> for NewBestBlockAnnounceValidator {
 #[test]
 fn sync_blocks_when_block_announce_validator_says_it_is_new_best() {
 	sp_tracing::try_init_simple();
-	log::trace!(target: "sync", "Test");
 	let mut net = TestNet::with_fork_choice(ForkChoiceStrategy::Custom(false));
 	net.add_full_peer_with_config(Default::default());
 	net.add_full_peer_with_config(Default::default());
@@ -763,7 +762,6 @@ impl BlockAnnounceValidator<Block> for DeferredBlockAnnounceValidator {
 #[test]
 fn wait_until_deferred_block_announce_validation_is_ready() {
 	sp_tracing::try_init_simple();
-	log::trace!(target: "sync", "Test");
 	let mut net = TestNet::with_fork_choice(ForkChoiceStrategy::Custom(false));
 	net.add_full_peer_with_config(Default::default());
 	net.add_full_peer_with_config(FullPeerConfig {
@@ -785,7 +783,6 @@ fn wait_until_deferred_block_announce_validation_is_ready() {
 #[test]
 fn sync_to_tip_requires_that_sync_protocol_is_informed_about_best_block() {
 	sp_tracing::try_init_simple();
-	log::trace!(target: "sync", "Test");
 	let mut net = TestNet::new(1);
 
 	// Produce some blocks
@@ -814,3 +811,34 @@ fn sync_to_tip_requires_that_sync_protocol_is_informed_about_best_block() {
 	// However peer 1 should still not have the block.
 	assert!(!net.peer(1).has_block(&block_hash));
 }
+
+/// Ensures that if we as a syncing node sync to the tip while we are connected to another peer
+/// that is currently also doing a major sync.
+#[test]
+fn sync_to_tip_when_we_sync_together_with_multiple_peers() {
+	sp_tracing::try_init_simple();
+
+	let mut net = TestNet::new(3);
+
+	let block_hash = net.peer(0).push_blocks_at_without_informing_sync(
+		BlockId::Number(0),
+		10_000,
+		false,
+	);
+
+	net.peer(1).push_blocks_at_without_informing_sync(
+		BlockId::Number(0),
+		5_000,
+		false,
+	);
+
+	net.block_until_connected();
+	net.block_until_idle();
+
+	assert!(!net.peer(2).has_block(&block_hash));
+
+	net.peer(0).network_service().new_best_block_imported(block_hash, 10_000);
+	while !net.peer(2).has_block(&block_hash) && !net.peer(1).has_block(&block_hash) {
+		net.block_until_idle();
+	}
+}
diff --git a/primitives/consensus/common/src/import_queue.rs b/primitives/consensus/common/src/import_queue.rs
index b32ca0133d99..713c59b07a54 100644
--- a/primitives/consensus/common/src/import_queue.rs
+++ b/primitives/consensus/common/src/import_queue.rs
@@ -138,7 +138,7 @@ pub trait Link<B: BlockT>: Send {
 #[derive(Debug, PartialEq)]
 pub enum BlockImportResult<N: std::fmt::Debug + PartialEq> {
 	/// Imported known block.
-	ImportedKnown(N),
+	ImportedKnown(N, Option<Origin>),
 	/// Imported unknown block.
 	ImportedUnknown(N, ImportedAux, Option<Origin>),
 }
@@ -204,7 +204,7 @@ pub(crate) fn import_single_block_metered<B: BlockT, V: Verifier<B>, Transaction
 		match import {
 			Ok(ImportResult::AlreadyInChain) => {
 				trace!(target: "sync", "Block already in chain {}: {:?}", number, hash);
-				Ok(BlockImportResult::ImportedKnown(number))
+				Ok(BlockImportResult::ImportedKnown(number, peer.clone()))
 			},
 			Ok(ImportResult::Imported(aux)) => Ok(BlockImportResult::ImportedUnknown(number, aux, peer.clone())),
 			Ok(ImportResult::MissingState) => {

From aa5184d709b8320aff4ca681dee6a12843a1a640 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Fri, 18 Dec 2020 15:02:08 +0100
Subject: [PATCH 0188/1194] Remove unnecessary parameter from sync (#7761)

---
 client/network/src/protocol/sync.rs | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/client/network/src/protocol/sync.rs b/client/network/src/protocol/sync.rs
index 712c13002883..7e50f5869179 100644
--- a/client/network/src/protocol/sync.rs
+++ b/client/network/src/protocol/sync.rs
@@ -191,9 +191,6 @@ pub struct ChainSync<B: BlockT> {
 	/// A set of hashes of blocks that are being downloaded or have been
 	/// downloaded and are queued for import.
 	queue_blocks: HashSet<B::Hash>,
-	/// The best block number that was successfully imported into the chain.
-	/// This can not decrease.
-	best_imported_number: NumberFor<B>,
 	/// Fork sync targets.
 	fork_targets: HashMap<B::Hash, ForkTarget<B>>,
 	/// A set of peers for which there might be potential block requests
@@ -455,7 +452,6 @@ impl<B: BlockT> ChainSync<B> {
 			blocks: BlockCollection::new(),
 			best_queued_hash: info.best_hash,
 			best_queued_number: info.best_number,
-			best_imported_number: info.best_number,
 			extra_justifications: ExtraRequests::new("justification"),
 			role,
 			required_block_attributes,
@@ -1106,10 +1102,6 @@ impl<B: BlockT> ChainSync<B> {
 						}
 					}
 
-					if number > self.best_imported_number {
-						self.best_imported_number = number;
-					}
-
 					if let Some(peer) = who.and_then(|p| self.peers.get_mut(&p)) {
 						peer.update_common_number(number);
 					}
@@ -1508,7 +1500,7 @@ impl<B: BlockT> ChainSync<B> {
 		self.blocks.clear();
 		let info = self.client.info();
 		self.best_queued_hash = info.best_hash;
-		self.best_queued_number = std::cmp::max(info.best_number, self.best_imported_number);
+		self.best_queued_number = info.best_number;
 		self.pending_requests.set_all();
 		debug!(target:"sync", "Restarted with {} ({})", self.best_queued_number, self.best_queued_hash);
 		let old_peers = std::mem::take(&mut self.peers);

From 94c34f3eb0ad201e064e6e356dbd6cb6c1e3dfef Mon Sep 17 00:00:00 2001
From: Zeke Mostov <32168567+emostov@users.noreply.github.com>
Date: Fri, 18 Dec 2020 22:59:48 -0800
Subject: [PATCH 0189/1194] Improve `InvalidTransaction::AncientBirthBlock` doc
 comment (#7743)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Improve `InvalidTransaction::AncientBirthBlock` doc comment

Update

Remove stray parentheses

Tabs not spaces

Improve

whoops

* Update primitives/runtime/src/transaction_validity.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Possible causes section; Expand example

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 primitives/runtime/src/transaction_validity.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/primitives/runtime/src/transaction_validity.rs b/primitives/runtime/src/transaction_validity.rs
index 2191e59b9bb2..74709d9ae9ce 100644
--- a/primitives/runtime/src/transaction_validity.rs
+++ b/primitives/runtime/src/transaction_validity.rs
@@ -54,6 +54,13 @@ pub enum InvalidTransaction {
 	/// it will only be able to assume a bad signature and cannot express a more meaningful error.
 	BadProof,
 	/// The transaction birth block is ancient.
+	///
+	/// # Possible causes
+	///
+	/// For `FRAME`-based runtimes this would be caused by `current block number
+	/// - Era::birth block number > BlockHashCount`. (e.g. in Polkadot `BlockHashCount` = 2400, so a
+	/// transaction with birth block number 1337 would be valid up until block number 1337 + 2400,
+	/// after which point the transaction would be considered to have an ancient birth block.)
 	AncientBirthBlock,
 	/// The transaction would exhaust the resources of current block.
 	///

From 61cb65ecbda3c5edef5e140a178a2d1aadf3e3cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Sat, 19 Dec 2020 10:22:08 +0100
Subject: [PATCH 0190/1194] Switch back to the crates.io release of trybuild
 (#7764)

* Switch back to the crates.io release of trybuild

My fix was merged on upstream and this release contains it. So, no
more reason to keep the git dependency.

* The lock file...
---
 Cargo.lock                              | 5 +++--
 frame/support/test/Cargo.toml           | 2 +-
 primitives/api/test/Cargo.toml          | 2 +-
 primitives/runtime-interface/Cargo.toml | 2 +-
 test-utils/Cargo.toml                   | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c775fbb062e1..e1c7673650f8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9744,8 +9744,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 
 [[package]]
 name = "trybuild"
-version = "1.0.35"
-source = "git+https://github.com/bkchr/trybuild.git?branch=bkchr-use-workspace-cargo-lock#0eaad05ba8a32a743751ff52b57a7d9f57da4869"
+version = "1.0.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17b06f8610494cbeb9a7665b398306f0109ab8708296d7f24b0bcd89178bb350"
 dependencies = [
  "dissimilar",
  "glob",
diff --git a/frame/support/test/Cargo.toml b/frame/support/test/Cargo.toml
index 01484ccfb882..4175c2e4c933 100644
--- a/frame/support/test/Cargo.toml
+++ b/frame/support/test/Cargo.toml
@@ -21,7 +21,7 @@ sp-inherents = { version = "2.0.0", default-features = false, path = "../../../p
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../../primitives/runtime" }
 sp-core = { version = "2.0.0", default-features = false, path = "../../../primitives/core" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../../primitives/std" }
-trybuild = { git = "https://github.com/bkchr/trybuild.git", branch = "bkchr-use-workspace-cargo-lock" }
+trybuild = "1.0.38"
 pretty_assertions = "0.6.1"
 rustversion = "1.0.0"
 frame-metadata = { version = "12.0.0", default-features = false, path = "../../metadata" }
diff --git a/primitives/api/test/Cargo.toml b/primitives/api/test/Cargo.toml
index f3f698e0ccb0..046c923c03b6 100644
--- a/primitives/api/test/Cargo.toml
+++ b/primitives/api/test/Cargo.toml
@@ -21,7 +21,7 @@ sp-consensus = { version = "0.8.0", path = "../../consensus/common" }
 sc-block-builder = { version = "0.8.0", path = "../../../client/block-builder" }
 codec = { package = "parity-scale-codec", version = "1.3.1" }
 sp-state-machine = { version = "0.8.0", path = "../../state-machine" }
-trybuild = { git = "https://github.com/bkchr/trybuild.git", branch = "bkchr-use-workspace-cargo-lock" }
+trybuild = "1.0.38"
 rustversion = "1.0.0"
 
 [dev-dependencies]
diff --git a/primitives/runtime-interface/Cargo.toml b/primitives/runtime-interface/Cargo.toml
index b8ad0c1261e4..cbd26823012a 100644
--- a/primitives/runtime-interface/Cargo.toml
+++ b/primitives/runtime-interface/Cargo.toml
@@ -31,7 +31,7 @@ sp-state-machine = { version = "0.8.0", path = "../state-machine" }
 sp-core = { version = "2.0.0", path = "../core" }
 sp-io = { version = "2.0.0", path = "../io" }
 rustversion = "1.0.0"
-trybuild = { git = "https://github.com/bkchr/trybuild.git", branch = "bkchr-use-workspace-cargo-lock" }
+trybuild = "1.0.38"
 
 [features]
 default = [ "std" ]
diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml
index 7606b0c1c15b..66f5703b2c94 100644
--- a/test-utils/Cargo.toml
+++ b/test-utils/Cargo.toml
@@ -18,4 +18,4 @@ tokio = { version = "0.2.13", features = ["macros"] }
 
 [dev-dependencies]
 sc-service = { version = "0.8.0", path = "../client/service" }
-trybuild = { git = "https://github.com/bkchr/trybuild.git", branch = "bkchr-use-workspace-cargo-lock", features = [ "diff" ] }
+trybuild = { version = "1.0.38", features = [ "diff" ] }

From 8b9a441a7ba268612512850f66e25e437d10b591 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Sat, 19 Dec 2020 12:34:56 +0100
Subject: [PATCH 0191/1194] No longer put keys back manually after a failed
 restoration (#7747)

This is no longer necessary with storage transactions.
---
 frame/contracts/src/rent.rs  | 22 +++++++++++-----------
 frame/contracts/src/tests.rs | 17 +++++++++++++++--
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/frame/contracts/src/rent.rs b/frame/contracts/src/rent.rs
index 8b6f81c916be..4b10a0408c15 100644
--- a/frame/contracts/src/rent.rs
+++ b/frame/contracts/src/rent.rs
@@ -451,14 +451,19 @@ where
 			origin_contract.last_write
 		};
 
-		let key_values_taken = delta.iter()
+		// We are allowed to eagerly modify storage even though the function can
+		// fail later due to tombstones not matching. This is because the restoration
+		// is always called from a contract and therefore in a storage transaction.
+		// The failure of this function will lead to this transaction's rollback.
+		let bytes_taken: u32 = delta.iter()
 			.filter_map(|key| {
-				child::get_raw(&child_trie_info, &blake2_256(key)).map(|value| {
-					child::kill(&child_trie_info, &blake2_256(key));
-					(key, value)
+				let key = blake2_256(key);
+				child::get_raw(&child_trie_info, &key).map(|value| {
+					child::kill(&child_trie_info, &key);
+					value.len() as u32
 				})
 			})
-			.collect::<Vec<_>>();
+			.sum();
 
 		let tombstone = <TombstoneContractInfo<T>>::new(
 			// This operation is cheap enough because last_write (delta not included)
@@ -468,15 +473,10 @@ where
 		);
 
 		if tombstone != dest_tombstone {
-			for (key, value) in key_values_taken {
-				child::put_raw(&child_trie_info, &blake2_256(key), &value);
-			}
 			return Err(Error::<T>::InvalidTombstone.into());
 		}
 
-		origin_contract.storage_size -= key_values_taken.iter()
-			.map(|(_, value)| value.len() as u32)
-			.sum::<u32>();
+		origin_contract.storage_size -= bytes_taken;
 
 		<ContractInfoOf<T>>::remove(&origin);
 		<ContractInfoOf<T>>::insert(&dest, ContractInfo::Alive(AliveContractInfo::<T> {
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index c0b9b671068d..3a7a8c6436e5 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -1221,7 +1221,7 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 				30_000,
 				GAS_LIMIT,
 				restoration_code_hash.into(),
-				<Test as pallet_balances::Config>::Balance::from(0u32).encode(),
+				vec![],
 				vec![],
 			));
 			let addr_django = Contracts::contract_address(&CHARLIE, &restoration_code_hash, &[]);
@@ -1253,6 +1253,15 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 				)
 			};
 
+			// The key that is used in the restorer contract but is not in the target contract.
+			// Is supplied as delta to the restoration. We need it to check whether the key
+			// is properly removed on success but still there on failure.
+			let delta_key = {
+				let mut key = [0u8; 32];
+				key[0] = 1;
+				key
+			};
+
 			if test_different_storage || test_restore_to_with_dirty_storage {
 				// Parametrization of the test imply restoration failure. Check that `DJANGO` aka
 				// restoration contract is still in place and also that `BOB` doesn't exist.
@@ -1263,6 +1272,10 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 				assert_eq!(django_contract.storage_size, 8);
 				assert_eq!(django_contract.trie_id, django_trie_id);
 				assert_eq!(django_contract.deduct_block, System::block_number());
+				assert_eq!(
+					Storage::<Test>::read(&django_trie_id, &delta_key),
+					Some(vec![40, 0, 0, 0]),
+				);
 				match (test_different_storage, test_restore_to_with_dirty_storage) {
 					(true, false) => {
 						assert_err_ignore_postinfo!(
@@ -1321,7 +1334,6 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 
 				// Here we expect that the restoration is succeeded. Check that the restoration
 				// contract `DJANGO` ceased to exist and that `BOB` returned back.
-				println!("{:?}", ContractInfoOf::<Test>::get(&addr_bob));
 				let bob_contract = ContractInfoOf::<Test>::get(&addr_bob).unwrap()
 					.get_alive().unwrap();
 				assert_eq!(bob_contract.rent_allowance, 50);
@@ -1329,6 +1341,7 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 				assert_eq!(bob_contract.trie_id, django_trie_id);
 				assert_eq!(bob_contract.deduct_block, System::block_number());
 				assert!(ContractInfoOf::<Test>::get(&addr_django).is_none());
+				assert_matches!(Storage::<Test>::read(&django_trie_id, &delta_key), None);
 				assert_eq!(System::events(), vec![
 					EventRecord {
 						phase: Phase::Initialization,

From 3c531e291fcc2c315abd3dcf436c487cdd91bd25 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Sat, 19 Dec 2020 07:16:34 -0800
Subject: [PATCH 0192/1194] Fix UI Tests (#7722)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix UI tests

* make updates.

* Revert "make updates."

This reverts commit 3f41979c12e86acb75fd086675ac09659dde533e.

* Try to fix companion build

* Use some depth

* tests: fix UI tests on the latest nightly

* tests: fix polkadot companion test, depth

* chore: update deps

* chore: update deps

* chore: sp-io

Co-authored-by: kianenigma <kian.peymani@gmail.com>
Co-authored-by: Bastian Köcher <git@kchr.de>
Co-authored-by: Denis P <denis.pisarev@parity.io>
---
 .../gitlab/check_polkadot_companion_build.sh  |  2 +-
 Cargo.lock                                    | 24 +++++++++----------
 bin/node/browser-testing/Cargo.toml           |  2 +-
 .../tests/derive_no_bound_ui/clone.stderr     |  6 ++---
 .../test/tests/derive_no_bound_ui/eq.stderr   |  2 +-
 .../ui/impl_incorrect_method_signature.stderr |  4 ++--
 .../tests/ui/mock_only_one_error_type.stderr  | 14 +++++------
 .../tests/ui/mock_only_self_reference.stderr  |  8 +++----
 ...reference_in_impl_runtime_apis_call.stderr |  4 ++--
 9 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/.maintain/gitlab/check_polkadot_companion_build.sh b/.maintain/gitlab/check_polkadot_companion_build.sh
index 4a7e9869abf5..f2b61c6192d6 100755
--- a/.maintain/gitlab/check_polkadot_companion_build.sh
+++ b/.maintain/gitlab/check_polkadot_companion_build.sh
@@ -45,7 +45,7 @@ cargo install -f --version 0.2.0 diener
 
 # Merge master into our branch before building Polkadot to make sure we don't miss
 # any commits that are required by Polkadot.
-git fetch --depth 20 origin
+git fetch --depth 100 origin
 git merge origin/master
 
 # Clone the current Polkadot master branch into ./polkadot.
diff --git a/Cargo.lock b/Cargo.lock
index e1c7673650f8..ff6f679ed78b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9764,7 +9764,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04f8ab788026715fa63b31960869617cba39117e520eb415b0139543e325ab59"
 dependencies = [
  "cfg-if 0.1.10",
- "rand 0.7.3",
+ "rand 0.6.5",
  "static_assertions",
 ]
 
@@ -9979,11 +9979,11 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.68"
+version = "0.2.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ac64ead5ea5f05873d7c12b545865ca2b8d28adfc50a49b84770a3a97265d42"
+checksum = "3cd364751395ca0f68cafb17666eee36b63077fb5ecd972bbcd74c90c4bf736e"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "serde",
  "serde_json",
  "wasm-bindgen-macro",
@@ -9991,9 +9991,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.68"
+version = "0.2.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f22b422e2a757c35a73774860af8e112bff612ce6cb604224e8e47641a9e4f68"
+checksum = "1114f89ab1f4106e5b55e688b828c0ab0ea593a1ea7c094b141b14cbaaec2d62"
 dependencies = [
  "bumpalo",
  "lazy_static",
@@ -10018,9 +10018,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.68"
+version = "0.2.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b13312a745c08c469f0b292dd2fcd6411dba5f7160f593da6ef69b64e407038"
+checksum = "7a6ac8995ead1f084a8dea1e65f194d0973800c7f571f6edd70adf06ecf77084"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -10028,9 +10028,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.68"
+version = "0.2.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f249f06ef7ee334cc3b8ff031bfc11ec99d00f34d86da7498396dc1e3b1498fe"
+checksum = "b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10041,9 +10041,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.68"
+version = "0.2.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d649a3145108d7d3fbcde896a468d1bd636791823c9921135218ad89be08307"
+checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158"
 
 [[package]]
 name = "wasm-bindgen-test"
diff --git a/bin/node/browser-testing/Cargo.toml b/bin/node/browser-testing/Cargo.toml
index f60dc55b6f7e..f297e624ca03 100644
--- a/bin/node/browser-testing/Cargo.toml
+++ b/bin/node/browser-testing/Cargo.toml
@@ -12,7 +12,7 @@ libp2p = { version = "0.32.2", default-features = false }
 jsonrpc-core = "15.0.0"
 serde = "1.0.106"
 serde_json = "1.0.48"
-wasm-bindgen = { version = "=0.2.68", features = ["serde-serialize"] }
+wasm-bindgen = { version = "=0.2.69", features = ["serde-serialize"] }
 wasm-bindgen-futures = "0.4.18"
 wasm-bindgen-test = "0.3.18"
 futures = "0.3.4"
diff --git a/frame/support/test/tests/derive_no_bound_ui/clone.stderr b/frame/support/test/tests/derive_no_bound_ui/clone.stderr
index af322f386aec..4b253ad12451 100644
--- a/frame/support/test/tests/derive_no_bound_ui/clone.stderr
+++ b/frame/support/test/tests/derive_no_bound_ui/clone.stderr
@@ -1,7 +1,7 @@
-error[E0277]: the trait bound `<T as Config>::C: std::clone::Clone` is not satisfied
+error[E0277]: the trait bound `<T as Config>::C: Clone` is not satisfied
  --> $DIR/clone.rs:7:2
   |
 7 |     c: T::C,
-  |     ^ the trait `std::clone::Clone` is not implemented for `<T as Config>::C`
+  |     ^ the trait `Clone` is not implemented for `<T as Config>::C`
   |
-  = note: required by `std::clone::Clone::clone`
+  = note: required by `clone`
diff --git a/frame/support/test/tests/derive_no_bound_ui/eq.stderr b/frame/support/test/tests/derive_no_bound_ui/eq.stderr
index bd5df600dc42..bbd907adecb3 100644
--- a/frame/support/test/tests/derive_no_bound_ui/eq.stderr
+++ b/frame/support/test/tests/derive_no_bound_ui/eq.stderr
@@ -4,4 +4,4 @@ error[E0277]: can't compare `Foo<T>` with `Foo<T>`
 6   | struct Foo<T: Config> {
     |        ^^^ no implementation for `Foo<T> == Foo<T>`
     |
-    = help: the trait `std::cmp::PartialEq` is not implemented for `Foo<T>`
+    = help: the trait `PartialEq` is not implemented for `Foo<T>`
diff --git a/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr b/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr
index 851d2b8a4b65..fcda69533e3a 100644
--- a/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr
+++ b/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr
@@ -23,8 +23,8 @@ error[E0053]: method `Api_test_runtime_api_impl` has an incompatible type for tr
 17 |   sp_api::impl_runtime_apis! {
    |   ^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `u64`, found struct `std::string::String`
    |
-   = note: expected fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::BlockId<__SR_API_BLOCK__>, sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ExecutionContext, std::option::Option<u64>, std::vec::Vec<_>) -> std::result::Result<_, _>`
-              found fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::BlockId<__SR_API_BLOCK__>, sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ExecutionContext, std::option::Option<std::string::String>, std::vec::Vec<_>) -> std::result::Result<_, _>`
+   = note: expected fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option<u64>, Vec<_>) -> std::result::Result<_, _>`
+              found fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option<std::string::String>, Vec<_>) -> std::result::Result<_, _>`
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0308]: mismatched types
diff --git a/primitives/api/test/tests/ui/mock_only_one_error_type.stderr b/primitives/api/test/tests/ui/mock_only_one_error_type.stderr
index 82fd04e8c5e0..eccd80ecd828 100644
--- a/primitives/api/test/tests/ui/mock_only_one_error_type.stderr
+++ b/primitives/api/test/tests/ui/mock_only_one_error_type.stderr
@@ -10,20 +10,20 @@ error: First error type was declared here.
 17 |         type Error = u32;
    |                      ^^^
 
-error[E0277]: the trait bound `u32: std::convert::From<sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ApiError>` is not satisfied
+error[E0277]: the trait bound `u32: From<sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ApiError>` is not satisfied
    --> $DIR/mock_only_one_error_type.rs:17:16
     |
 17  |         type Error = u32;
-    |                      ^^^ the trait `std::convert::From<sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ApiError>` is not implemented for `u32`
+    |                      ^^^ the trait `From<sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ApiError>` is not implemented for `u32`
     |
    ::: $WORKSPACE/primitives/api/src/lib.rs
     |
     |     type Error: std::fmt::Debug + From<ApiError>;
-    |                                   -------------- required by this bound in `sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ApiErrorExt`
+    |                                   -------------- required by this bound in `ApiErrorExt`
     |
     = help: the following implementations were found:
-              <u32 as std::convert::From<bool>>
-              <u32 as std::convert::From<char>>
-              <u32 as std::convert::From<h2::frame::reason::Reason>>
-              <u32 as std::convert::From<h2::frame::reason::Reason>>
+              <u32 as From<HttpError>>
+              <u32 as From<HttpRequestId>>
+              <u32 as From<HttpRequestStatus>>
+              <u32 as From<Ipv4Addr>>
             and 18 others
diff --git a/primitives/api/test/tests/ui/mock_only_self_reference.stderr b/primitives/api/test/tests/ui/mock_only_self_reference.stderr
index ed5b64144a6f..73cf93610379 100644
--- a/primitives/api/test/tests/ui/mock_only_self_reference.stderr
+++ b/primitives/api/test/tests/ui/mock_only_self_reference.stderr
@@ -24,8 +24,8 @@ error[E0053]: method `Api_test_runtime_api_impl` has an incompatible type for tr
 12 |   sp_api::mock_impl_runtime_apis! {
    |   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `u64`, found `()`
    |
-   = note: expected fn pointer `fn(&MockApi, &sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, substrate_test_runtime_client::substrate_test_runtime::Extrinsic>>, sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ExecutionContext, std::option::Option<u64>, std::vec::Vec<_>) -> std::result::Result<_, _>`
-              found fn pointer `fn(&MockApi, &sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, substrate_test_runtime_client::substrate_test_runtime::Extrinsic>>, sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ExecutionContext, std::option::Option<()>, std::vec::Vec<_>) -> std::result::Result<_, _>`
+   = note: expected fn pointer `fn(&MockApi, &BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, Extrinsic>>, ExecutionContext, Option<u64>, Vec<_>) -> std::result::Result<_, _>`
+              found fn pointer `fn(&MockApi, &BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, Extrinsic>>, ExecutionContext, Option<()>, Vec<_>) -> std::result::Result<_, _>`
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0053]: method `Api_test2_runtime_api_impl` has an incompatible type for trait
@@ -42,6 +42,6 @@ error[E0053]: method `Api_test2_runtime_api_impl` has an incompatible type for t
 12 |   sp_api::mock_impl_runtime_apis! {
    |   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `u64`, found `()`
    |
-   = note: expected fn pointer `fn(&MockApi, &sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, substrate_test_runtime_client::substrate_test_runtime::Extrinsic>>, sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ExecutionContext, std::option::Option<u64>, std::vec::Vec<_>) -> std::result::Result<_, _>`
-              found fn pointer `fn(&MockApi, &sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, substrate_test_runtime_client::substrate_test_runtime::Extrinsic>>, sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ExecutionContext, std::option::Option<()>, std::vec::Vec<_>) -> std::result::Result<_, _>`
+   = note: expected fn pointer `fn(&MockApi, &BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, Extrinsic>>, ExecutionContext, Option<u64>, Vec<_>) -> std::result::Result<_, _>`
+              found fn pointer `fn(&MockApi, &BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, Extrinsic>>, ExecutionContext, Option<()>, Vec<_>) -> std::result::Result<_, _>`
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr b/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr
index c3e485003609..71f12b415a2b 100644
--- a/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr
+++ b/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr
@@ -23,8 +23,8 @@ error[E0053]: method `Api_test_runtime_api_impl` has an incompatible type for tr
 17 |   sp_api::impl_runtime_apis! {
    |   ^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `u64`, found `&u64`
    |
-   = note: expected fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::BlockId<__SR_API_BLOCK__>, sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ExecutionContext, std::option::Option<u64>, std::vec::Vec<_>) -> std::result::Result<_, _>`
-              found fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::BlockId<__SR_API_BLOCK__>, sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ExecutionContext, std::option::Option<&u64>, std::vec::Vec<_>) -> std::result::Result<_, _>`
+   = note: expected fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option<u64>, Vec<_>) -> std::result::Result<_, _>`
+              found fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option<&u64>, Vec<_>) -> std::result::Result<_, _>`
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0308]: mismatched types

From 532cce0118fe7a64168413e638b177e7e144ef72 Mon Sep 17 00:00:00 2001
From: honeywest <50997103+honeywest@users.noreply.github.com>
Date: Mon, 21 Dec 2020 11:09:52 +0800
Subject: [PATCH 0193/1194] update substrate to sc in docs (#7767)

---
 docs/Structure.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Structure.adoc b/docs/Structure.adoc
index c8cd63506a34..6c810a83c51b 100644
--- a/docs/Structure.adoc
+++ b/docs/Structure.adoc
@@ -33,7 +33,7 @@ In the lowest level, Substrate defines primitives, interfaces and traits to impl
 === Client
 
 * _found in_: `/client`
-* _crates prefix_: `substrate-`
+* _crates prefix_: `sc-`
 * _constraints_:
 ** crates may not (dev-)depend on any `frame-`-crates
 

From 9e2d7b74742f7b1db7e09a00d423f613787d19a8 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Mon, 21 Dec 2020 09:54:04 +0000
Subject: [PATCH 0194/1194] Allow Staking tests to run with session length
 other than 1 (#7719)

* fix periodic session

* Allow staking tests to run with session lengths other than 1.

* Update frame/staking/src/mock.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Fix all tests with session length 5.

* Test for active != current

* Better doc

* Update frame/staking/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* also set the timestamp properly.

* trigger CI

* Revert "trigger CI"

This reverts commit 0f254944cdad848aa6e63bd8a618db95447a8e68.

* Update frame/staking/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
---
 frame/session/src/lib.rs   |  96 ++---
 frame/session/src/tests.rs |  27 +-
 frame/staking/src/lib.rs   |  46 ++-
 frame/staking/src/mock.rs  | 199 ++++++----
 frame/staking/src/tests.rs | 732 +++++++++++++++++++++++--------------
 5 files changed, 675 insertions(+), 425 deletions(-)

diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs
index dd176219aa7c..cd02ddaac498 100644
--- a/frame/session/src/lib.rs
+++ b/frame/session/src/lib.rs
@@ -17,8 +17,8 @@
 
 //! # Session Module
 //!
-//! The Session module allows validators to manage their session keys, provides a function for changing
-//! the session length, and handles session rotation.
+//! The Session module allows validators to manage their session keys, provides a function for
+//! changing the session length, and handles session rotation.
 //!
 //! - [`session::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
@@ -29,34 +29,39 @@
 //! ### Terminology
 //! <!-- Original author of paragraph: @gavofyork -->
 //!
-//! - **Session:** A session is a period of time that has a constant set of validators. Validators can only join
-//! or exit the validator set at a session change. It is measured in block numbers. The block where a session is
-//! ended is determined by the `ShouldEndSession` trait. When the session is ending, a new validator set
-//! can be chosen by `OnSessionEnding` implementations.
-//! - **Session key:** A session key is actually several keys kept together that provide the various signing
-//! functions required by network authorities/validators in pursuit of their duties.
-//! - **Validator ID:** Every account has an associated validator ID. For some simple staking systems, this
-//! may just be the same as the account ID. For staking systems using a stash/controller model,
-//! the validator ID would be the stash account ID of the controller.
+//! - **Session:** A session is a period of time that has a constant set of validators. Validators
+//!   can only join or exit the validator set at a session change. It is measured in block numbers.
+//!   The block where a session is ended is determined by the `ShouldEndSession` trait. When the
+//!   session is ending, a new validator set can be chosen by `OnSessionEnding` implementations.
+//!
+//! - **Session key:** A session key is actually several keys kept together that provide the various
+//!   signing functions required by network authorities/validators in pursuit of their duties.
+//! - **Validator ID:** Every account has an associated validator ID. For some simple staking
+//!   systems, this may just be the same as the account ID. For staking systems using a
+//!   stash/controller model, the validator ID would be the stash account ID of the controller.
+//!
 //! - **Session key configuration process:** Session keys are set using `set_keys` for use not in
-//! the next session, but the session after next. They are stored in `NextKeys`, a mapping between
-//! the caller's `ValidatorId` and the session keys provided. `set_keys` allows users to set their
-//! session key prior to being selected as validator.
-//! It is a public call since it uses `ensure_signed`, which checks that the origin is a signed account.
-//! As such, the account ID of the origin stored in `NextKeys` may not necessarily be associated with
-//! a block author or a validator. The session keys of accounts are removed once their account balance is zero.
+//!   the next session, but the session after next. They are stored in `NextKeys`, a mapping between
+//!   the caller's `ValidatorId` and the session keys provided. `set_keys` allows users to set their
+//!   session key prior to being selected as validator. It is a public call since it uses
+//!   `ensure_signed`, which checks that the origin is a signed account. As such, the account ID of
+//!   the origin stored in `NextKeys` may not necessarily be associated with a block author or a
+//!   validator. The session keys of accounts are removed once their account balance is zero.
+//!
 //! - **Session length:** This pallet does not assume anything about the length of each session.
-//! Rather, it relies on an implementation of `ShouldEndSession` to dictate a new session's start.
-//! This pallet provides the `PeriodicSessions` struct for simple periodic sessions.
-//! - **Session rotation configuration:** Configure as either a 'normal' (rewardable session where rewards are
-//! applied) or 'exceptional' (slashable) session rotation.
+//!   Rather, it relies on an implementation of `ShouldEndSession` to dictate a new session's start.
+//!   This pallet provides the `PeriodicSessions` struct for simple periodic sessions.
+//!
+//! - **Session rotation configuration:** Configure as either a 'normal' (rewardable session where
+//!   rewards are applied) or 'exceptional' (slashable) session rotation.
+//!
 //! - **Session rotation process:** At the beginning of each block, the `on_initialize` function
-//! queries the provided implementation of `ShouldEndSession`. If the session is to end the newly
-//! activated validator IDs and session keys are taken from storage and passed to the
-//! `SessionHandler`. The validator set supplied by `SessionManager::new_session` and the corresponding session
-//! keys, which may have been registered via `set_keys` during the previous session, are written
-//! to storage where they will wait one session before being passed to the `SessionHandler`
-//! themselves.
+//!   queries the provided implementation of `ShouldEndSession`. If the session is to end the newly
+//!   activated validator IDs and session keys are taken from storage and passed to the
+//!   `SessionHandler`. The validator set supplied by `SessionManager::new_session` and the
+//!   corresponding session keys, which may have been registered via `set_keys` during the previous
+//!   session, are written to storage where they will wait one session before being passed to the
+//!   `SessionHandler` themselves.
 //!
 //! ### Goals
 //!
@@ -75,7 +80,7 @@
 //! ### Public Functions
 //!
 //! - `rotate_session` - Change to the next session. Register the new authority set. Queue changes
-//! for next session rotation.
+//!   for next session rotation.
 //! - `disable_index` - Disable a validator by index.
 //! - `disable` - Disable a validator by Validator ID
 //!
@@ -83,13 +88,14 @@
 //!
 //! ### Example from the FRAME
 //!
-//! The [Staking pallet](../pallet_staking/index.html) uses the Session pallet to get the validator set.
+//! The [Staking pallet](../pallet_staking/index.html) uses the Session pallet to get the validator
+//! set.
 //!
 //! ```
 //! use pallet_session as session;
 //!
 //! fn validators<T: pallet_session::Config>() -> Vec<<T as pallet_session::Config>::ValidatorId> {
-//!	<pallet_session::Module<T>>::validators()
+//! <pallet_session::Module<T>>::validators()
 //! }
 //! # fn main(){}
 //! ```
@@ -166,7 +172,7 @@ impl<
 					period.saturating_sub(block_after_last_session)
 				)
 			} else {
-				Zero::zero()
+				now
 			}
 		} else {
 			offset
@@ -174,10 +180,10 @@ impl<
 	}
 
 	fn weight(_now: BlockNumber) -> Weight {
-		// Weight note: `estimate_next_session_rotation` has no storage reads and trivial computational overhead.
-		// There should be no risk to the chain having this weight value be zero for now.
-		// However, this value of zero was not properly calculated, and so it would be reasonable
-		// to come back here and properly calculate the weight of this function.
+		// Weight note: `estimate_next_session_rotation` has no storage reads and trivial
+		// computational overhead. There should be no risk to the chain having this weight value be
+		// zero for now. However, this value of zero was not properly calculated, and so it would be
+		// reasonable to come back here and properly calculate the weight of this function.
 		0
 	}
 }
@@ -186,17 +192,17 @@ impl<
 pub trait SessionManager<ValidatorId> {
 	/// Plan a new session, and optionally provide the new validator set.
 	///
-	/// Even if the validator-set is the same as before, if any underlying economic
-	/// conditions have changed (i.e. stake-weights), the new validator set must be returned.
-	/// This is necessary for consensus engines making use of the session module to
-	/// issue a validator-set change so misbehavior can be provably associated with the new
-	/// economic conditions as opposed to the old.
-	/// The returned validator set, if any, will not be applied until `new_index`.
-	/// `new_index` is strictly greater than from previous call.
+	/// Even if the validator-set is the same as before, if any underlying economic conditions have
+	/// changed (i.e. stake-weights), the new validator set must be returned. This is necessary for
+	/// consensus engines making use of the session module to issue a validator-set change so
+	/// misbehavior can be provably associated with the new economic conditions as opposed to the
+	/// old. The returned validator set, if any, will not be applied until `new_index`. `new_index`
+	/// is strictly greater than from previous call.
 	///
 	/// The first session start at index 0.
 	///
-	/// `new_session(session)` is guaranteed to be called before `end_session(session-1)`.
+	/// `new_session(session)` is guaranteed to be called before `end_session(session-1)`. In other
+	/// words, a new session must always be planned before an ongoing one can be finished.
 	fn new_session(new_index: SessionIndex) -> Option<Vec<ValidatorId>>;
 	/// End the session.
 	///
@@ -205,7 +211,7 @@ pub trait SessionManager<ValidatorId> {
 	fn end_session(end_index: SessionIndex);
 	/// Start the session.
 	///
-	/// The session start to be used for validation
+	/// The session start to be used for validation.
 	fn start_session(start_index: SessionIndex);
 }
 
@@ -242,7 +248,7 @@ pub trait SessionHandler<ValidatorId> {
 
 	/// A notification for end of the session.
 	///
-	/// Note it is triggered before any `SessionManager::end_session` handlers,
+	/// Note it is triggered before any [`SessionManager::end_session`] handlers,
 	/// so we can still affect the validator set.
 	fn on_before_session_ending() {}
 
diff --git a/frame/session/src/tests.rs b/frame/session/src/tests.rs
index 7a33aa5296bc..3da5d16caad5 100644
--- a/frame/session/src/tests.rs
+++ b/frame/session/src/tests.rs
@@ -252,31 +252,32 @@ fn session_changed_flag_works() {
 
 #[test]
 fn periodic_session_works() {
-	struct Period;
-	struct Offset;
 
-	impl Get<u64> for Period {
-		fn get() -> u64 { 10 }
+	frame_support::parameter_types! {
+		const Period: u64 = 10;
+		const Offset: u64 = 3;
 	}
 
-	impl Get<u64> for Offset {
-		fn get() -> u64 { 3 }
-	}
-
-
 	type P = PeriodicSessions<Period, Offset>;
 
-	for i in 0..3 {
+	for i in 0u64..3 {
 		assert!(!P::should_end_session(i));
+		assert_eq!(P::estimate_next_session_rotation(i).unwrap(), 3);
 	}
 
-	assert!(P::should_end_session(3));
+	assert!(P::should_end_session(3u64));
+	assert_eq!(P::estimate_next_session_rotation(3u64).unwrap(), 3);
 
-	for i in (1..10).map(|i| 3 + i) {
+	for i in (1u64..10).map(|i| 3 + i) {
 		assert!(!P::should_end_session(i));
+		assert_eq!(P::estimate_next_session_rotation(i).unwrap(), 13);
 	}
 
-	assert!(P::should_end_session(13));
+	assert!(P::should_end_session(13u64));
+	assert_eq!(P::estimate_next_session_rotation(13u64).unwrap(), 13);
+
+	assert!(!P::should_end_session(14u64));
+	assert_eq!(P::estimate_next_session_rotation(14u64).unwrap(), 23);
 }
 
 #[test]
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index af326e27c62a..f70a76cb1acc 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -952,11 +952,14 @@ decl_storage! {
 
 		/// The active era information, it holds index and start.
 		///
-		/// The active era is the era currently rewarded.
-		/// Validator set of this era must be equal to `SessionInterface::validators`.
+		/// The active era is the era being currently rewarded. Validator set of this era must be
+		/// equal to [`SessionInterface::validators`].
 		pub ActiveEra get(fn active_era): Option<ActiveEraInfo>;
 
 		/// The session index at which the era start for the last `HISTORY_DEPTH` eras.
+		///
+		/// Note: This tracks the starting session (i.e. session index when era start being active)
+		/// for the eras in `[CurrentEra - HISTORY_DEPTH, CurrentEra]`.
 		pub ErasStartSessionIndex get(fn eras_start_session_index):
 			map hasher(twox_64_concat) EraIndex => Option<SessionIndex>;
 
@@ -2630,14 +2633,17 @@ impl<T: Config> Module<T> {
 	/// Start a session potentially starting an era.
 	fn start_session(start_session: SessionIndex) {
 		let next_active_era = Self::active_era().map(|e| e.index + 1).unwrap_or(0);
+		// This is only `Some` when current era has already progressed to the next era, while the
+		// active era is one behind (i.e. in the *last session of the active era*, or *first session
+		// of the new current era*, depending on how you look at it).
 		if let Some(next_active_era_start_session_index) =
 			Self::eras_start_session_index(next_active_era)
 		{
 			if next_active_era_start_session_index == start_session {
 				Self::start_era(start_session);
 			} else if next_active_era_start_session_index < start_session {
-				// This arm should never happen, but better handle it than to stall the
-				// staking pallet.
+				// This arm should never happen, but better handle it than to stall the staking
+				// pallet.
 				frame_support::print("Warning: A session appears to have been skipped.");
 				Self::start_era(start_session);
 			}
@@ -2893,9 +2899,11 @@ impl<T: Config> Module<T> {
 	/// Self votes are added and nominations before the most recent slashing span are ignored.
 	///
 	/// No storage item is updated.
-	pub fn do_phragmen<Accuracy: PerThing>(iterations: usize)
-	-> Option<PrimitiveElectionResult<T::AccountId, Accuracy>>
-		where ExtendedBalance: From<InnerOf<Accuracy>>
+	pub fn do_phragmen<Accuracy: PerThing>(
+		iterations: usize,
+	) -> Option<PrimitiveElectionResult<T::AccountId, Accuracy>>
+	where
+		ExtendedBalance: From<InnerOf<Accuracy>>,
 	{
 		let weight_of = Self::slashable_balance_of_fn();
 		let mut all_nominators: Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)> = Vec::new();
@@ -2928,7 +2936,11 @@ impl<T: Config> Module<T> {
 
 		if all_validators.len() < Self::minimum_validator_count().max(1) as usize {
 			// If we don't have enough candidates, nothing to do.
-			log!(error, "💸 Chain does not have enough staking candidates to operate. Era {:?}.", Self::current_era());
+			log!(
+				warn,
+				"💸 Chain does not have enough staking candidates to operate. Era {:?}.",
+				Self::current_era()
+			);
 			None
 		} else {
 			seq_phragmen::<_, Accuracy>(
@@ -3090,12 +3102,30 @@ impl<T: Config> Module<T> {
 /// some session can lag in between the newest session planned and the latest session started.
 impl<T: Config> pallet_session::SessionManager<T::AccountId> for Module<T> {
 	fn new_session(new_index: SessionIndex) -> Option<Vec<T::AccountId>> {
+		frame_support::debug::native::trace!(
+			target: LOG_TARGET,
+			"[{}] planning new_session({})",
+			<frame_system::Module<T>>::block_number(),
+			new_index
+		);
 		Self::new_session(new_index)
 	}
 	fn start_session(start_index: SessionIndex) {
+		frame_support::debug::native::trace!(
+			target: LOG_TARGET,
+			"[{}] starting start_session({})",
+			<frame_system::Module<T>>::block_number(),
+			start_index
+		);
 		Self::start_session(start_index)
 	}
 	fn end_session(end_index: SessionIndex) {
+		frame_support::debug::native::trace!(
+			target: LOG_TARGET,
+			"[{}] ending end_session({})",
+			<frame_system::Module<T>>::block_number(),
+			end_index
+		);
 		Self::end_session(end_index)
 	}
 }
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index 76689503f65a..f3c6d50d4cf5 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -38,6 +38,7 @@ use sp_staking::offence::{OffenceDetails, OnOffenceHandler};
 use std::{cell::RefCell, collections::HashSet};
 
 pub const INIT_TIMESTAMP: u64 = 30_000;
+pub const BLOCK_TIME: u64 = 1000;
 
 /// The AccountId alias in this test module.
 pub(crate) type AccountId = u64;
@@ -135,10 +136,11 @@ parameter_types! {
 		);
 	pub const MaxLocks: u32 = 1024;
 	pub static SessionsPerEra: SessionIndex = 3;
-	pub static ExistentialDeposit: Balance = 0;
+	pub static ExistentialDeposit: Balance = 1;
 	pub static SlashDeferDuration: EraIndex = 0;
 	pub static ElectionLookahead: BlockNumber = 0;
-	pub static Period: BlockNumber = 1;
+	pub static Period: BlockNumber = 5;
+	pub static Offset: BlockNumber = 0;
 	pub static MaxIterations: u32 = 0;
 }
 
@@ -175,7 +177,6 @@ impl pallet_balances::Config for Test {
 	type WeightInfo = ();
 }
 parameter_types! {
-	pub const Offset: BlockNumber = 0;
 	pub const UncleGenerations: u64 = 0;
 	pub const DisabledValidatorsThreshold: Perbill = Perbill::from_percent(25);
 }
@@ -286,46 +287,36 @@ where
 pub type Extrinsic = TestXt<Call, ()>;
 
 pub struct ExtBuilder {
-	session_length: BlockNumber,
-	election_lookahead: BlockNumber,
-	session_per_era: SessionIndex,
-	existential_deposit: Balance,
 	validator_pool: bool,
 	nominate: bool,
 	validator_count: u32,
 	minimum_validator_count: u32,
-	slash_defer_duration: EraIndex,
 	fair: bool,
 	num_validators: Option<u32>,
 	invulnerables: Vec<AccountId>,
 	has_stakers: bool,
-	max_offchain_iterations: u32,
+	initialize_first_session: bool,
 }
 
 impl Default for ExtBuilder {
 	fn default() -> Self {
 		Self {
-			session_length: 1,
-			election_lookahead: 0,
-			session_per_era: 3,
-			existential_deposit: 1,
 			validator_pool: false,
 			nominate: true,
 			validator_count: 2,
 			minimum_validator_count: 0,
-			slash_defer_duration: 0,
 			fair: true,
 			num_validators: None,
 			invulnerables: vec![],
 			has_stakers: true,
-			max_offchain_iterations: 0,
+			initialize_first_session: true,
 		}
 	}
 }
 
 impl ExtBuilder {
-	pub fn existential_deposit(mut self, existential_deposit: Balance) -> Self {
-		self.existential_deposit = existential_deposit;
+	pub fn existential_deposit(self, existential_deposit: Balance) -> Self {
+		EXISTENTIAL_DEPOSIT.with(|v| *v.borrow_mut() = existential_deposit);
 		self
 	}
 	pub fn validator_pool(mut self, validator_pool: bool) -> Self {
@@ -344,8 +335,8 @@ impl ExtBuilder {
 		self.minimum_validator_count = count;
 		self
 	}
-	pub fn slash_defer_duration(mut self, eras: EraIndex) -> Self {
-		self.slash_defer_duration = eras;
+	pub fn slash_defer_duration(self, eras: EraIndex) -> Self {
+		SLASH_DEFER_DURATION.with(|v| *v.borrow_mut() = eras);
 		self
 	}
 	pub fn fair(mut self, is_fair: bool) -> Self {
@@ -360,46 +351,43 @@ impl ExtBuilder {
 		self.invulnerables = invulnerables;
 		self
 	}
-	pub fn session_per_era(mut self, length: SessionIndex) -> Self {
-		self.session_per_era = length;
+	pub fn session_per_era(self, length: SessionIndex) -> Self {
+		SESSIONS_PER_ERA.with(|v| *v.borrow_mut() = length);
 		self
 	}
-	pub fn election_lookahead(mut self, look: BlockNumber) -> Self {
-		self.election_lookahead = look;
+	pub fn election_lookahead(self, look: BlockNumber) -> Self {
+		ELECTION_LOOKAHEAD.with(|v| *v.borrow_mut() = look);
 		self
 	}
-	pub fn session_length(mut self, length: BlockNumber) -> Self {
-		self.session_length = length;
+	pub fn period(self, length: BlockNumber) -> Self {
+		PERIOD.with(|v| *v.borrow_mut() = length);
 		self
 	}
 	pub fn has_stakers(mut self, has: bool) -> Self {
 		self.has_stakers = has;
 		self
 	}
-	pub fn max_offchain_iterations(mut self, iterations: u32) -> Self {
-		self.max_offchain_iterations = iterations;
+	pub fn max_offchain_iterations(self, iterations: u32) -> Self {
+		MAX_ITERATIONS.with(|v| *v.borrow_mut() = iterations);
 		self
 	}
 	pub fn offchain_election_ext(self) -> Self {
-		self.session_per_era(4)
-			.session_length(5)
-			.election_lookahead(3)
-	}
-	pub fn set_associated_constants(&self) {
-		EXISTENTIAL_DEPOSIT.with(|v| *v.borrow_mut() = self.existential_deposit);
-		SLASH_DEFER_DURATION.with(|v| *v.borrow_mut() = self.slash_defer_duration);
-		SESSIONS_PER_ERA.with(|v| *v.borrow_mut() = self.session_per_era);
-		ELECTION_LOOKAHEAD.with(|v| *v.borrow_mut() = self.election_lookahead);
-		PERIOD.with(|v| *v.borrow_mut() = self.session_length);
-		MAX_ITERATIONS.with(|v| *v.borrow_mut() = self.max_offchain_iterations);
+		self.session_per_era(4).period(5).election_lookahead(3)
+	}
+	pub fn initialize_first_session(mut self, init: bool) -> Self {
+		self.initialize_first_session = init;
+		self
+	}
+	pub fn offset(self, offset: BlockNumber) -> Self {
+		OFFSET.with(|v| *v.borrow_mut() = offset);
+		self
 	}
 	pub fn build(self) -> sp_io::TestExternalities {
 		sp_tracing::try_init_simple();
-		self.set_associated_constants();
 		let mut storage = frame_system::GenesisConfig::default()
 			.build_storage::<Test>()
 			.unwrap();
-		let balance_factor = if self.existential_deposit > 1 {
+		let balance_factor = if ExistentialDeposit::get() > 1 {
 			256
 		} else {
 			1
@@ -475,13 +463,17 @@ impl ExtBuilder {
 			SESSION.with(|x| *x.borrow_mut() = (validators.clone(), HashSet::new()));
 		});
 
-		// We consider all test to start after timestamp is initialized
-		// This must be ensured by having `timestamp::on_initialize` called before
-		// `staking::on_initialize`
-		ext.execute_with(|| {
-			System::set_block_number(1);
-			Timestamp::set_timestamp(INIT_TIMESTAMP);
-		});
+		if self.initialize_first_session {
+			// We consider all test to start after timestamp is initialized This must be ensured by
+			// having `timestamp::on_initialize` called before `staking::on_initialize`. Also, if
+			// session length is 1, then it is already triggered.
+			ext.execute_with(|| {
+				System::set_block_number(1);
+				Session::on_initialize(1);
+				Staking::on_initialize(1);
+				Timestamp::set_timestamp(INIT_TIMESTAMP);
+			});
+		}
 
 		ext
 	}
@@ -498,20 +490,12 @@ pub type Session = pallet_session::Module<Test>;
 pub type Timestamp = pallet_timestamp::Module<Test>;
 pub type Staking = Module<Test>;
 
-pub(crate) fn current_era() -> EraIndex {
-	Staking::current_era().unwrap()
-}
-
 fn post_conditions() {
 	check_nominators();
 	check_exposures();
 	check_ledgers();
 }
 
-pub(crate) fn active_era() -> EraIndex {
-	Staking::active_era().unwrap().index
-}
-
 fn check_ledgers() {
 	// check the ledger of all stakers.
 	Bonded::<Test>::iter().for_each(|(_, ctrl)| assert_ledger_consistent(ctrl))
@@ -593,6 +577,14 @@ fn assert_ledger_consistent(ctrl: AccountId) {
 	);
 }
 
+pub(crate) fn active_era() -> EraIndex {
+	Staking::active_era().unwrap().index
+}
+
+pub(crate) fn current_era() -> EraIndex {
+	Staking::current_era().unwrap()
+}
+
 pub(crate) fn bond_validator(stash: AccountId, ctrl: AccountId, val: Balance) {
 	let _ = Balances::make_free_balance_be(&stash, val);
 	let _ = Balances::make_free_balance_be(&ctrl, val);
@@ -625,52 +617,98 @@ pub(crate) fn bond_nominator(
 	assert_ok!(Staking::nominate(Origin::signed(ctrl), target));
 }
 
+/// Progress to the given block, triggering session and era changes as we progress.
+///
+/// This will finalize the previous block, initialize up to the given block, essentially simulating
+/// a block import/propose process where we first initialize the block, then execute some stuff (not
+/// in the function), and then finalize the block.
 pub(crate) fn run_to_block(n: BlockNumber) {
 	Staking::on_finalize(System::block_number());
-	for b in System::block_number() + 1..=n {
+	for b in (System::block_number() + 1)..=n {
 		System::set_block_number(b);
 		Session::on_initialize(b);
 		Staking::on_initialize(b);
+		Timestamp::set_timestamp(System::block_number() * BLOCK_TIME + INIT_TIMESTAMP);
 		if b != n {
 			Staking::on_finalize(System::block_number());
 		}
 	}
 }
 
+/// Progresses from the current block number (whatever that may be) to the `P * session_index + 1`.
+pub(crate) fn start_session(session_index: SessionIndex) {
+	let end: u64 = if Offset::get().is_zero() {
+		(session_index as u64) * Period::get()
+	} else {
+		Offset::get() + (session_index.saturating_sub(1) as u64) * Period::get()
+	};
+	run_to_block(end);
+	// session must have progressed properly.
+	assert_eq!(
+		Session::current_index(),
+		session_index,
+		"current session index = {}, expected = {}",
+		Session::current_index(),
+		session_index,
+	);
+}
+
+/// Go one session forward.
 pub(crate) fn advance_session() {
 	let current_index = Session::current_index();
 	start_session(current_index + 1);
 }
 
-pub(crate) fn start_session(session_index: SessionIndex) {
-	assert_eq!(<Period as Get<BlockNumber>>::get(), 1, "start_session can only be used with session length 1.");
-	for i in Session::current_index()..session_index {
-		Staking::on_finalize(System::block_number());
-		System::set_block_number((i + 1).into());
-		Timestamp::set_timestamp(System::block_number() * 1000 + INIT_TIMESTAMP);
-		Session::on_initialize(System::block_number());
-		Staking::on_initialize(System::block_number());
-	}
-
-	assert_eq!(Session::current_index(), session_index);
-}
-
-// This start and activate the era given.
-// Because the mock use pallet-session which delays session by one, this will be one session after
-// the election happened, not the first session after the election has happened.
-pub(crate) fn start_era(era_index: EraIndex) {
+/// Progress until the given era.
+pub(crate) fn start_active_era(era_index: EraIndex) {
 	start_session((era_index * <SessionsPerEra as Get<u32>>::get()).into());
-	assert_eq!(Staking::current_era().unwrap(), era_index);
-	assert_eq!(Staking::active_era().unwrap().index, era_index);
+	assert_eq!(active_era(), era_index);
+	// One way or another, current_era must have changed before the active era, so they must match
+	// at this point.
+	assert_eq!(current_era(), active_era());
 }
 
 pub(crate) fn current_total_payout_for_duration(duration: u64) -> Balance {
+	let reward = inflation::compute_total_payout(
+		<Test as Config>::RewardCurve::get(),
+		Staking::eras_total_stake(active_era()),
+		Balances::total_issuance(),
+		duration,
+	)
+	.0;
+	assert!(reward > 0);
+	reward
+}
+
+pub(crate) fn maximum_payout_for_duration(duration: u64) -> Balance {
 	inflation::compute_total_payout(
 		<Test as Config>::RewardCurve::get(),
-		Staking::eras_total_stake(Staking::active_era().unwrap().index),
+		0,
 		Balances::total_issuance(),
 		duration,
-	).0
+	)
+	.1
+}
+
+/// Time it takes to finish a session.
+///
+/// Note, if you see `time_per_session() - BLOCK_TIME`, it is fine. This is because we set the
+/// timestamp after on_initialize, so the timestamp is always one block old.
+pub(crate) fn time_per_session() -> u64 {
+	Period::get() * BLOCK_TIME
+}
+
+/// Time it takes to finish an era.
+///
+/// Note, if you see `time_per_era() - BLOCK_TIME`, it is fine. This is because we set the
+/// timestamp after on_initialize, so the timestamp is always one block old.
+pub(crate) fn time_per_era() -> u64 {
+	time_per_session() * SessionsPerEra::get() as u64
+}
+
+/// Time that will be calculated for the reward per era.
+pub(crate) fn reward_time_per_era() -> u64 {
+	time_per_era() - BLOCK_TIME
 }
 
 pub(crate) fn reward_all_elected() {
@@ -939,8 +977,11 @@ pub(crate) fn make_all_reward_payment(era: EraIndex) {
 	// reward validators
 	for validator_controller in validators_with_reward.iter().filter_map(Staking::bonded) {
 		let ledger = <Ledger<Test>>::get(&validator_controller).unwrap();
-
-		assert_ok!(Staking::payout_stakers(Origin::signed(1337), ledger.stash, era));
+		assert_ok!(Staking::payout_stakers(
+			Origin::signed(1337),
+			ledger.stash,
+			era
+		));
 	}
 }
 
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index 79edc012cd3f..86186af7d3e7 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -158,7 +158,7 @@ fn change_controller_works() {
 		// change controller
 		assert_ok!(Staking::set_controller(Origin::signed(11), 5));
 		assert_eq!(Staking::bonded(&11), Some(5));
-		mock::start_era(1);
+		mock::start_active_era(1);
 
 		// 10 is no longer in control.
 		assert_noop!(
@@ -171,12 +171,7 @@ fn change_controller_works() {
 
 #[test]
 fn rewards_should_work() {
-	// should check that:
-	// * rewards get recorded per session
-	// * rewards get paid per Era
-	// * `RewardRemainder::on_unbalanced` is called
-	// * Check that nominators are also rewarded
-	ExtBuilder::default().nominate(true).build_and_execute(|| {
+	ExtBuilder::default().nominate(true).session_per_era(3).build_and_execute(|| {
 		let init_balance_10 = Balances::total_balance(&10);
 		let init_balance_11 = Balances::total_balance(&11);
 		let init_balance_20 = Balances::total_balance(&20);
@@ -184,7 +179,7 @@ fn rewards_should_work() {
 		let init_balance_100 = Balances::total_balance(&100);
 		let init_balance_101 = Balances::total_balance(&101);
 
-		// Check state
+		// Set payees
 		Payee::<Test>::insert(11, RewardDestination::Controller);
 		Payee::<Test>::insert(21, RewardDestination::Controller);
 		Payee::<Test>::insert(101, RewardDestination::Controller);
@@ -194,9 +189,9 @@ fn rewards_should_work() {
 		// This is the second validator of the current elected set.
 		<Module<Test>>::reward_by_ids(vec![(21, 50)]);
 
-		// Compute total payout now for whole duration as other parameter won't change
-		let total_payout_0 = current_total_payout_for_duration(3 * 1000);
-		assert!(total_payout_0 > 10); // Test is meaningful if reward something
+		// Compute total payout now for whole duration of the session.
+		let total_payout_0 = current_total_payout_for_duration(reward_time_per_era());
+		let maximum_payout = maximum_payout_for_duration(reward_time_per_era());
 
 		start_session(1);
 
@@ -207,10 +202,13 @@ fn rewards_should_work() {
 		assert_eq!(Balances::total_balance(&100), init_balance_100);
 		assert_eq!(Balances::total_balance(&101), init_balance_101);
 		assert_eq_uvec!(Session::validators(), vec![11, 21]);
-		assert_eq!(Staking::eras_reward_points(Staking::active_era().unwrap().index), EraRewardPoints {
-			total: 50*3,
-			individual: vec![(11, 100), (21, 50)].into_iter().collect(),
-		});
+		assert_eq!(
+			Staking::eras_reward_points(Staking::active_era().unwrap().index),
+			EraRewardPoints {
+				total: 50 * 3,
+				individual: vec![(11, 100), (21, 50)].into_iter().collect(),
+			}
+		);
 		let part_for_10 = Perbill::from_rational_approximation::<u32>(1000, 1125);
 		let part_for_20 = Perbill::from_rational_approximation::<u32>(1000, 1375);
 		let part_for_100_from_10 = Perbill::from_rational_approximation::<u32>(125, 1125);
@@ -220,14 +218,28 @@ fn rewards_should_work() {
 		start_session(3);
 
 		assert_eq!(Staking::active_era().unwrap().index, 1);
-		assert_eq!(mock::REWARD_REMAINDER_UNBALANCED.with(|v| *v.borrow()), 7050);
-		assert_eq!(*mock::staking_events().last().unwrap(), RawEvent::EraPayout(0, 2350, 7050));
+		assert_eq!(
+			mock::REWARD_REMAINDER_UNBALANCED.with(|v| *v.borrow()),
+			maximum_payout - total_payout_0,
+		);
+		assert_eq!(
+			*mock::staking_events().last().unwrap(),
+			RawEvent::EraPayout(0, total_payout_0, maximum_payout - total_payout_0)
+		);
 		mock::make_all_reward_payment(0);
 
-		assert_eq_error_rate!(Balances::total_balance(&10), init_balance_10 + part_for_10 * total_payout_0*2/3, 2);
-		assert_eq_error_rate!(Balances::total_balance(&11), init_balance_11, 2);
-		assert_eq_error_rate!(Balances::total_balance(&20), init_balance_20 + part_for_20 * total_payout_0*1/3, 2);
-		assert_eq_error_rate!(Balances::total_balance(&21), init_balance_21, 2);
+		assert_eq_error_rate!(
+			Balances::total_balance(&10),
+			init_balance_10 + part_for_10 * total_payout_0 * 2 / 3,
+			2,
+		);
+		assert_eq_error_rate!(Balances::total_balance(&11), init_balance_11, 2,);
+		assert_eq_error_rate!(
+			Balances::total_balance(&20),
+			init_balance_20 + part_for_20 * total_payout_0 * 1 / 3,
+			2,
+		);
+		assert_eq_error_rate!(Balances::total_balance(&21), init_balance_21, 2,);
 		assert_eq_error_rate!(
 			Balances::total_balance(&100),
 			init_balance_100
@@ -241,18 +253,31 @@ fn rewards_should_work() {
 		<Module<Test>>::reward_by_ids(vec![(11, 1)]);
 
 		// Compute total payout now for whole duration as other parameter won't change
-		let total_payout_1 = current_total_payout_for_duration(3 * 1000);
-		assert!(total_payout_1 > 10); // Test is meaningful if reward something
+		let total_payout_1 = current_total_payout_for_duration(reward_time_per_era());
 
-		mock::start_era(2);
-		assert_eq!(mock::REWARD_REMAINDER_UNBALANCED.with(|v| *v.borrow()), 7050*2);
-		assert_eq!(*mock::staking_events().last().unwrap(), RawEvent::EraPayout(1, 2350, 7050));
+		mock::start_active_era(2);
+		assert_eq!(
+			mock::REWARD_REMAINDER_UNBALANCED.with(|v| *v.borrow()),
+			maximum_payout * 2 - total_payout_0 - total_payout_1,
+		);
+		assert_eq!(
+			*mock::staking_events().last().unwrap(),
+			RawEvent::EraPayout(1, total_payout_1, maximum_payout - total_payout_1)
+		);
 		mock::make_all_reward_payment(1);
 
-		assert_eq_error_rate!(Balances::total_balance(&10), init_balance_10 + part_for_10 * (total_payout_0 * 2/3 + total_payout_1), 2);
-		assert_eq_error_rate!(Balances::total_balance(&11), init_balance_11, 2);
-		assert_eq_error_rate!(Balances::total_balance(&20), init_balance_20 + part_for_20 * total_payout_0 * 1/3, 2);
-		assert_eq_error_rate!(Balances::total_balance(&21), init_balance_21, 2);
+		assert_eq_error_rate!(
+			Balances::total_balance(&10),
+			init_balance_10 + part_for_10 * (total_payout_0 * 2 / 3 + total_payout_1),
+			2,
+		);
+		assert_eq_error_rate!(Balances::total_balance(&11), init_balance_11, 2,);
+		assert_eq_error_rate!(
+			Balances::total_balance(&20),
+			init_balance_20 + part_for_20 * total_payout_0 * 1 / 3,
+			2,
+		);
+		assert_eq_error_rate!(Balances::total_balance(&21), init_balance_21, 2,);
 		assert_eq_error_rate!(
 			Balances::total_balance(&100),
 			init_balance_100
@@ -266,18 +291,11 @@ fn rewards_should_work() {
 
 #[test]
 fn staking_should_work() {
-	// should test:
-	// * new validators can be added to the default set
-	// * new ones will be chosen per era
-	// * either one can unlock the stash and back-down from being a validator via `chill`ing.
 	ExtBuilder::default()
 		.nominate(false)
 		.fair(false) // to give 20 more staked value
 		.build()
 		.execute_with(|| {
-			// --- Block 1:
-			start_session(1);
-
 			// remember + compare this along with the test.
 			assert_eq_uvec!(validator_controllers(), vec![20, 10]);
 
@@ -359,7 +377,7 @@ fn less_than_needed_candidates_works() {
 			assert_eq!(Staking::minimum_validator_count(), 1);
 			assert_eq_uvec!(validator_controllers(), vec![30, 20, 10]);
 
-			mock::start_era(1);
+			mock::start_active_era(1);
 
 			// Previous set is selected. NO election algorithm is even executed.
 			assert_eq_uvec!(validator_controllers(), vec![30, 20, 10]);
@@ -395,7 +413,7 @@ fn no_candidate_emergency_condition() {
 			let _ = Staking::chill(Origin::signed(10));
 
 			// trigger era
-			mock::start_era(1);
+			mock::start_active_era(1);
 
 			// Previous ones are elected. chill is invalidates. TODO: #2494
 			assert_eq_uvec!(validator_controllers(), vec![10, 20, 30, 40]);
@@ -435,12 +453,11 @@ fn nominating_and_rewards_should_work() {
 			assert_ok!(Staking::nominate(Origin::signed(4), vec![11, 21, 41]));
 
 			// the total reward for era 0
-			let total_payout_0 = current_total_payout_for_duration(3000);
-			assert!(total_payout_0 > 100); // Test is meaningful if reward something
+			let total_payout_0 = current_total_payout_for_duration(reward_time_per_era());
 			<Module<Test>>::reward_by_ids(vec![(41, 1)]);
 			<Module<Test>>::reward_by_ids(vec![(31, 1)]);
 
-			mock::start_era(1);
+			mock::start_active_era(1);
 
 			// 10 and 20 have more votes, they will be chosen.
 			assert_eq_uvec!(validator_controllers(), vec![20, 10]);
@@ -478,12 +495,11 @@ fn nominating_and_rewards_should_work() {
 			);
 
 			// the total reward for era 1
-			let total_payout_1 = current_total_payout_for_duration(3000);
-			assert!(total_payout_1 > 100); // Test is meaningful if reward something
+			let total_payout_1 = current_total_payout_for_duration(reward_time_per_era());
 			<Module<Test>>::reward_by_ids(vec![(21, 2)]);
 			<Module<Test>>::reward_by_ids(vec![(11, 1)]);
 
-			mock::start_era(2);
+			mock::start_active_era(2);
 
 			// nothing else will happen, era ends and rewards are paid again,
 			// it is expected that nominators will also be paid. See below
@@ -495,26 +511,26 @@ fn nominating_and_rewards_should_work() {
 			assert_eq_error_rate!(
 				Balances::total_balance(&2),
 				initial_balance + (2 * payout_for_10 / 9 + 3 * payout_for_20 / 11),
-				1,
+				2,
 			);
 			// Nominator 4: has [400/1800 ~ 2/9 from 10] + [600/2200 ~ 3/11 from 20]'s reward. ==> 2/9 + 3/11
 			assert_eq_error_rate!(
 				Balances::total_balance(&4),
 				initial_balance + (2 * payout_for_10 / 9 + 3 * payout_for_20 / 11),
-				1,
+				2,
 			);
 
 			// Validator 10: got 800 / 1800 external stake => 8/18 =? 4/9 => Validator's share = 5/9
 			assert_eq_error_rate!(
 				Balances::total_balance(&10),
 				initial_balance + 5 * payout_for_10 / 9,
-				1,
+				2,
 			);
 			// Validator 20: got 1200 / 2200 external stake => 12/22 =? 6/11 => Validator's share = 5/11
 			assert_eq_error_rate!(
 				Balances::total_balance(&20),
 				initial_balance + 5 * payout_for_20 / 11,
-				1,
+				2,
 			);
 		});
 }
@@ -522,7 +538,7 @@ fn nominating_and_rewards_should_work() {
 #[test]
 fn nominators_also_get_slashed_pro_rata() {
 	ExtBuilder::default().build_and_execute(|| {
-		mock::start_era(1);
+		mock::start_active_era(1);
 		let slash_percent = Perbill::from_percent(5);
 		let initial_exposure = Staking::eras_stakers(active_era(), 11);
 		// 101 is a nominator for 11
@@ -637,40 +653,87 @@ fn double_controlling_should_fail() {
 }
 
 #[test]
-fn session_and_eras_work() {
-	ExtBuilder::default().build_and_execute(|| {
-		assert_eq!(Staking::active_era().unwrap().index, 0);
-		assert_eq!(Session::current_index(), 0);
+fn session_and_eras_work_simple() {
+	ExtBuilder::default().period(1).build_and_execute(|| {
+		assert_eq!(active_era(), 0);
+		assert_eq!(current_era(), 0);
+		assert_eq!(Session::current_index(), 1);
+		assert_eq!(System::block_number(), 1);
 
-		// Session 1: No change.
+		// Session 1: this is basically a noop. This has already been started.
 		start_session(1);
 		assert_eq!(Session::current_index(), 1);
-		assert_eq!(Staking::active_era().unwrap().index, 0);
+		assert_eq!(active_era(), 0);
+		assert_eq!(System::block_number(), 1);
 
 		// Session 2: No change.
 		start_session(2);
 		assert_eq!(Session::current_index(), 2);
-		assert_eq!(Staking::active_era().unwrap().index, 0);
+		assert_eq!(active_era(), 0);
+		assert_eq!(System::block_number(), 2);
 
 		// Session 3: Era increment.
 		start_session(3);
 		assert_eq!(Session::current_index(), 3);
-		assert_eq!(Staking::active_era().unwrap().index, 1);
+		assert_eq!(active_era(), 1);
+		assert_eq!(System::block_number(), 3);
 
 		// Session 4: No change.
 		start_session(4);
 		assert_eq!(Session::current_index(), 4);
-		assert_eq!(Staking::active_era().unwrap().index, 1);
+		assert_eq!(active_era(), 1);
+		assert_eq!(System::block_number(), 4);
 
 		// Session 5: No change.
 		start_session(5);
 		assert_eq!(Session::current_index(), 5);
-		assert_eq!(Staking::active_era().unwrap().index, 1);
+		assert_eq!(active_era(), 1);
+		assert_eq!(System::block_number(), 5);
 
 		// Session 6: Era increment.
 		start_session(6);
 		assert_eq!(Session::current_index(), 6);
-		assert_eq!(Staking::active_era().unwrap().index, 2);
+		assert_eq!(active_era(), 2);
+		assert_eq!(System::block_number(), 6);
+	});
+}
+
+#[test]
+fn session_and_eras_work_complex() {
+	ExtBuilder::default().period(5).build_and_execute(|| {
+		assert_eq!(active_era(), 0);
+		assert_eq!(Session::current_index(), 0);
+		assert_eq!(System::block_number(), 1);
+
+		start_session(1);
+		assert_eq!(Session::current_index(), 1);
+		assert_eq!(active_era(), 0);
+		assert_eq!(System::block_number(), 5);
+
+		start_session(2);
+		assert_eq!(Session::current_index(), 2);
+		assert_eq!(active_era(), 0);
+		assert_eq!(System::block_number(), 10);
+
+		start_session(3);
+		assert_eq!(Session::current_index(), 3);
+		assert_eq!(active_era(), 1);
+		assert_eq!(System::block_number(), 15);
+
+		start_session(4);
+		assert_eq!(Session::current_index(), 4);
+		assert_eq!(active_era(), 1);
+		assert_eq!(System::block_number(), 20);
+
+		start_session(5);
+		assert_eq!(Session::current_index(), 5);
+		assert_eq!(active_era(), 1);
+		assert_eq!(System::block_number(), 25);
+
+		start_session(6);
+		assert_eq!(Session::current_index(), 6);
+		assert_eq!(active_era(), 2);
+		assert_eq!(System::block_number(), 30);
 	});
 }
 
@@ -678,53 +741,62 @@ fn session_and_eras_work() {
 fn forcing_new_era_works() {
 	ExtBuilder::default().build_and_execute(|| {
 		// normal flow of session.
-		assert_eq!(Staking::active_era().unwrap().index, 0);
-		start_session(0);
-		assert_eq!(Staking::active_era().unwrap().index, 0);
 		start_session(1);
-		assert_eq!(Staking::active_era().unwrap().index, 0);
+		assert_eq!(active_era(), 0);
+
 		start_session(2);
-		assert_eq!(Staking::active_era().unwrap().index, 0);
+		assert_eq!(active_era(), 0);
+
 		start_session(3);
-		assert_eq!(Staking::active_era().unwrap().index, 1);
+		assert_eq!(active_era(), 1);
 
 		// no era change.
 		ForceEra::put(Forcing::ForceNone);
+
 		start_session(4);
-		assert_eq!(Staking::active_era().unwrap().index, 1);
+		assert_eq!(active_era(), 1);
+
 		start_session(5);
-		assert_eq!(Staking::active_era().unwrap().index, 1);
+		assert_eq!(active_era(), 1);
+
 		start_session(6);
-		assert_eq!(Staking::active_era().unwrap().index, 1);
+		assert_eq!(active_era(), 1);
+
 		start_session(7);
-		assert_eq!(Staking::active_era().unwrap().index, 1);
+		assert_eq!(active_era(), 1);
 
 		// back to normal.
 		// this immediately starts a new session.
 		ForceEra::put(Forcing::NotForcing);
+
 		start_session(8);
-		assert_eq!(Staking::active_era().unwrap().index, 1); // There is one session delay
-		start_session(9);
-		assert_eq!(Staking::active_era().unwrap().index, 2);
+		assert_eq!(active_era(), 1);
 
+		start_session(9);
+		assert_eq!(active_era(), 2);
 		// forceful change
 		ForceEra::put(Forcing::ForceAlways);
+
 		start_session(10);
-		assert_eq!(Staking::active_era().unwrap().index, 2); // There is one session delay
+		assert_eq!(active_era(), 2);
+
 		start_session(11);
-		assert_eq!(Staking::active_era().unwrap().index, 3);
+		assert_eq!(active_era(), 3);
+
 		start_session(12);
-		assert_eq!(Staking::active_era().unwrap().index, 4);
+		assert_eq!(active_era(), 4);
 
 		// just one forceful change
 		ForceEra::put(Forcing::ForceNew);
 		start_session(13);
-		assert_eq!(Staking::active_era().unwrap().index, 5);
+		assert_eq!(active_era(), 5);
 		assert_eq!(ForceEra::get(), Forcing::NotForcing);
+
 		start_session(14);
-		assert_eq!(Staking::active_era().unwrap().index, 6);
+		assert_eq!(active_era(), 6);
+
 		start_session(15);
-		assert_eq!(Staking::active_era().unwrap().index, 6);
+		assert_eq!(active_era(), 6);
 
 	});
 }
@@ -738,7 +810,7 @@ fn cannot_transfer_staked_balance() {
 		// Confirm account 11 has some free balance
 		assert_eq!(Balances::free_balance(11), 1000);
 		// Confirm account 11 (via controller 10) is totally staked
-		assert_eq!(Staking::eras_stakers(Staking::active_era().unwrap().index, 11).total, 1000);
+		assert_eq!(Staking::eras_stakers(active_era(), 11).total, 1000);
 		// Confirm account 11 cannot transfer as a result
 		assert_noop!(
 			Balances::transfer(Origin::signed(11), 20, 1),
@@ -816,11 +888,10 @@ fn reward_destination_works() {
 		}));
 
 		// Compute total payout now for whole duration as other parameter won't change
-		let total_payout_0 = current_total_payout_for_duration(3000);
-		assert!(total_payout_0 > 100); // Test is meaningful if reward something
+		let total_payout_0 = current_total_payout_for_duration(reward_time_per_era());
 		<Module<Test>>::reward_by_ids(vec![(11, 1)]);
 
-		mock::start_era(1);
+		mock::start_active_era(1);
 		mock::make_all_reward_payment(0);
 
 		// Check that RewardDestination is Staked (default)
@@ -840,11 +911,10 @@ fn reward_destination_works() {
 		<Payee<Test>>::insert(&11, RewardDestination::Stash);
 
 		// Compute total payout now for whole duration as other parameter won't change
-		let total_payout_1 = current_total_payout_for_duration(3000);
-		assert!(total_payout_1 > 100); // Test is meaningful if reward something
+		let total_payout_1 = current_total_payout_for_duration(reward_time_per_era());
 		<Module<Test>>::reward_by_ids(vec![(11, 1)]);
 
-		mock::start_era(2);
+		mock::start_active_era(2);
 		mock::make_all_reward_payment(1);
 
 		// Check that RewardDestination is Stash
@@ -869,11 +939,10 @@ fn reward_destination_works() {
 		assert_eq!(Balances::free_balance(10), 1);
 
 		// Compute total payout now for whole duration as other parameter won't change
-		let total_payout_2 = current_total_payout_for_duration(3000);
-		assert!(total_payout_2 > 100); // Test is meaningful if reward something
+		let total_payout_2 = current_total_payout_for_duration(reward_time_per_era());
 		<Module<Test>>::reward_by_ids(vec![(11, 1)]);
 
-		mock::start_era(3);
+		mock::start_active_era(3);
 		mock::make_all_reward_payment(2);
 
 		// Check that RewardDestination is Controller
@@ -908,19 +977,18 @@ fn validator_payment_prefs_work() {
 		<Payee<Test>>::insert(&11, RewardDestination::Controller);
 		<Payee<Test>>::insert(&101, RewardDestination::Controller);
 
-		mock::start_era(1);
+		mock::start_active_era(1);
 		mock::make_all_reward_payment(0);
 
 		let balance_era_1_10 = Balances::total_balance(&10);
 		let balance_era_1_100 = Balances::total_balance(&100);
 
 		// Compute total payout now for whole duration as other parameter won't change
-		let total_payout_1 = current_total_payout_for_duration(3000);
-		assert!(total_payout_1 > 100); // Test is meaningful if reward something
+		let total_payout_1 = current_total_payout_for_duration(reward_time_per_era());
 		let exposure_1 = Staking::eras_stakers(Staking::active_era().unwrap().index, 11);
 		<Module<Test>>::reward_by_ids(vec![(11, 1)]);
 
-		mock::start_era(2);
+		mock::start_active_era(2);
 		mock::make_all_reward_payment(1);
 
 		let taken_cut = commission * total_payout_1;
@@ -995,13 +1063,12 @@ fn bond_extra_and_withdraw_unbonded_works() {
 
 		// Initial config should be correct
 		assert_eq!(Staking::active_era().unwrap().index, 0);
-		assert_eq!(Session::current_index(), 0);
 
 		// check the balance of a validator accounts.
 		assert_eq!(Balances::total_balance(&10), 1);
 
 		// confirm that 10 is a normal validator and gets paid at the end of the era.
-		mock::start_era(1);
+		mock::start_active_era(1);
 
 		// Initial state of 10
 		assert_eq!(Staking::ledger(&10), Some(StakingLedger {
@@ -1033,7 +1100,7 @@ fn bond_extra_and_withdraw_unbonded_works() {
 		);
 
 		// trigger next era.
-		mock::start_era(2);
+		mock::start_active_era(2);
 		assert_eq!(Staking::active_era().unwrap().index, 2);
 
 		// ledger should be the same.
@@ -1077,7 +1144,7 @@ fn bond_extra_and_withdraw_unbonded_works() {
 		);
 
 		// trigger next era.
-		mock::start_era(3);
+		mock::start_active_era(3);
 
 		// nothing yet
 		assert_ok!(Staking::withdraw_unbonded(Origin::signed(10), 0));
@@ -1093,7 +1160,7 @@ fn bond_extra_and_withdraw_unbonded_works() {
 		);
 
 		// trigger next era.
-		mock::start_era(5);
+		mock::start_active_era(5);
 
 		assert_ok!(Staking::withdraw_unbonded(Origin::signed(10), 0));
 		// Now the value is free and the staking ledger is updated.
@@ -1118,14 +1185,14 @@ fn too_many_unbond_calls_should_not_work() {
 			assert_ok!(Staking::unbond(Origin::signed(10), 1));
 		}
 
-		mock::start_era(1);
+		mock::start_active_era(1);
 
 		// locked at era 1 until 4
 		assert_ok!(Staking::unbond(Origin::signed(10), 1));
 		// can't do more.
 		assert_noop!(Staking::unbond(Origin::signed(10), 1), Error::<Test>::NoMoreChunks);
 
-		mock::start_era(3);
+		mock::start_active_era(3);
 
 		assert_noop!(Staking::unbond(Origin::signed(10), 1), Error::<Test>::NoMoreChunks);
 		// free up.
@@ -1157,7 +1224,7 @@ fn rebond_works() {
 			let _ = Balances::make_free_balance_be(&11, 1000000);
 
 			// confirm that 10 is a normal validator and gets paid at the end of the era.
-			mock::start_era(1);
+			mock::start_active_era(1);
 
 			// Initial state of 10
 			assert_eq!(
@@ -1171,7 +1238,7 @@ fn rebond_works() {
 				})
 			);
 
-			mock::start_era(2);
+			mock::start_active_era(2);
 			assert_eq!(Staking::active_era().unwrap().index, 2);
 
 			// Try to rebond some funds. We get an error since no fund is unbonded.
@@ -1302,7 +1369,7 @@ fn rebond_is_fifo() {
 			let _ = Balances::make_free_balance_be(&11, 1000000);
 
 			// confirm that 10 is a normal validator and gets paid at the end of the era.
-			mock::start_era(1);
+			mock::start_active_era(1);
 
 			// Initial state of 10
 			assert_eq!(
@@ -1316,7 +1383,7 @@ fn rebond_is_fifo() {
 				})
 			);
 
-			mock::start_era(2);
+			mock::start_active_era(2);
 
 			// Unbond some of the funds in stash.
 			Staking::unbond(Origin::signed(10), 400).unwrap();
@@ -1333,7 +1400,7 @@ fn rebond_is_fifo() {
 				})
 			);
 
-			mock::start_era(3);
+			mock::start_active_era(3);
 
 			// Unbond more of the funds in stash.
 			Staking::unbond(Origin::signed(10), 300).unwrap();
@@ -1351,7 +1418,7 @@ fn rebond_is_fifo() {
 				})
 			);
 
-			mock::start_era(4);
+			mock::start_active_era(4);
 
 			// Unbond yet more of the funds in stash.
 			Staking::unbond(Origin::signed(10), 200).unwrap();
@@ -1411,13 +1478,12 @@ fn reward_to_stake_works() {
 		<Ledger<Test>>::insert(&20, StakingLedger { stash: 21, total: 69, active: 69, unlocking: vec![], claimed_rewards: vec![] });
 
 		// Compute total payout now for whole duration as other parameter won't change
-		let total_payout_0 = current_total_payout_for_duration(3000);
-		assert!(total_payout_0 > 100); // Test is meaningful if reward something
+		let total_payout_0 = current_total_payout_for_duration(reward_time_per_era());
 		<Module<Test>>::reward_by_ids(vec![(11, 1)]);
 		<Module<Test>>::reward_by_ids(vec![(21, 1)]);
 
 		// New era --> rewards are paid --> stakes are changed
-		mock::start_era(1);
+		mock::start_active_era(1);
 		mock::make_all_reward_payment(0);
 
 		assert_eq!(Staking::eras_stakers(Staking::active_era().unwrap().index, 11).total, 1000);
@@ -1427,7 +1493,7 @@ fn reward_to_stake_works() {
 		assert_eq!(_11_balance, 1000 + total_payout_0 / 2);
 
 		// Trigger another new era as the info are frozen before the era start.
-		mock::start_era(2);
+		mock::start_active_era(2);
 
 		// -- new infos
 		assert_eq!(Staking::eras_stakers(Staking::active_era().unwrap().index, 11).total, 1000 + total_payout_0 / 2);
@@ -1568,7 +1634,7 @@ fn switching_roles() {
 		assert_ok!(Staking::bond(Origin::signed(5), 6, 1000, RewardDestination::Controller));
 		assert_ok!(Staking::validate(Origin::signed(6), ValidatorPrefs::default()));
 
-		mock::start_era(1);
+		mock::start_active_era(1);
 
 		// with current nominators 10 and 5 have the most stake
 		assert_eq_uvec!(validator_controllers(), vec![6, 10]);
@@ -1582,7 +1648,7 @@ fn switching_roles() {
 		// 2 : 2000 self vote + 250 vote.
 		// Winners: 20 and 2
 
-		mock::start_era(2);
+		mock::start_active_era(2);
 
 		assert_eq_uvec!(validator_controllers(), vec![2, 20]);
 	});
@@ -1604,7 +1670,7 @@ fn wrong_vote_is_null() {
 		]));
 
 		// new block
-		mock::start_era(1);
+		mock::start_active_era(1);
 
 		assert_eq_uvec!(validator_controllers(), vec![20, 10]);
 	});
@@ -1643,15 +1709,15 @@ fn bond_with_no_staked_value() {
 				})
 			);
 
-			mock::start_era(1);
-			mock::start_era(2);
+			mock::start_active_era(1);
+			mock::start_active_era(2);
 
 			// not yet removed.
 			assert_ok!(Staking::withdraw_unbonded(Origin::signed(2), 0));
 			assert!(Staking::ledger(2).is_some());
 			assert_eq!(Balances::locks(&1)[0].amount, 5);
 
-			mock::start_era(3);
+			mock::start_active_era(3);
 
 			// poof. Account 1 is removed from the staking system.
 			assert_ok!(Staking::withdraw_unbonded(Origin::signed(2), 0));
@@ -1662,8 +1728,6 @@ fn bond_with_no_staked_value() {
 
 #[test]
 fn bond_with_little_staked_value_bounded() {
-	// Behavior when someone bonds with little staked value.
-	// Particularly when she votes and the candidate is elected.
 	ExtBuilder::default()
 		.validator_count(3)
 		.nominate(false)
@@ -1680,37 +1744,38 @@ fn bond_with_little_staked_value_bounded() {
 			assert_ok!(Staking::bond(Origin::signed(1), 2, 1, RewardDestination::Controller));
 			assert_ok!(Staking::validate(Origin::signed(2), ValidatorPrefs::default()));
 
-			// reward era 0
-			let total_payout_0 = current_total_payout_for_duration(3000);
-			assert!(total_payout_0 > 100); // Test is meaningful if reward something
+			// 1 era worth of reward. BUT, we set the timestamp after on_initialize, so outdated by
+			// one block.
+			let total_payout_0 = current_total_payout_for_duration(reward_time_per_era());
+
 			reward_all_elected();
-			mock::start_era(1);
+			mock::start_active_era(1);
 			mock::make_all_reward_payment(0);
 
 			// 2 is elected.
 			assert_eq_uvec!(validator_controllers(), vec![20, 10, 2]);
-			// And has minimal stake
-			assert_eq!(Staking::eras_stakers(Staking::active_era().unwrap().index, 2).total, 0);
+			assert_eq!(Staking::eras_stakers(active_era(), 2).total, 0);
 
 			// Old ones are rewarded.
-			assert_eq!(Balances::free_balance(10), init_balance_10 + total_payout_0 / 3);
+			assert_eq_error_rate!(Balances::free_balance(10), init_balance_10 + total_payout_0 / 3, 1);
 			// no rewards paid to 2. This was initial election.
 			assert_eq!(Balances::free_balance(2), init_balance_2);
 
-			// reward era 1
-			let total_payout_1 = current_total_payout_for_duration(3000);
-			assert!(total_payout_1 > 100); // Test is meaningful if reward something
+			// reward era 2
+			let total_payout_1 = current_total_payout_for_duration(reward_time_per_era());
 			reward_all_elected();
-			mock::start_era(2);
+			mock::start_active_era(2);
 			mock::make_all_reward_payment(1);
 
 			assert_eq_uvec!(validator_controllers(), vec![20, 10, 2]);
-			assert_eq!(Staking::eras_stakers(Staking::active_era().unwrap().index, 2).total, 0);
+			assert_eq!(Staking::eras_stakers(active_era(), 2).total, 0);
 
-			assert_eq!(Balances::free_balance(2), init_balance_2 + total_payout_1 / 3);
-			assert_eq!(
+			// 2 is now rewarded.
+			assert_eq_error_rate!(Balances::free_balance(2), init_balance_2 + total_payout_1 / 3, 1);
+			assert_eq_error_rate!(
 				Balances::free_balance(&10),
 				init_balance_10 + total_payout_0 / 3 + total_payout_1 / 3,
+				2,
 			);
 		});
 }
@@ -1842,7 +1907,7 @@ fn phragmen_should_not_overflow() {
 		bond_nominator(7, 6, Votes::max_value() as Balance, vec![3, 5]);
 		bond_nominator(9, 8, Votes::max_value() as Balance, vec![3, 5]);
 
-		mock::start_era(1);
+		mock::start_active_era(1);
 
 		assert_eq_uvec!(validator_controllers(), vec![4, 2]);
 
@@ -1983,10 +2048,10 @@ fn era_is_always_same_length() {
 	ExtBuilder::default().build_and_execute(|| {
 		let session_per_era = <SessionsPerEra as Get<SessionIndex>>::get();
 
-		mock::start_era(1);
+		mock::start_active_era(1);
 		assert_eq!(Staking::eras_start_session_index(current_era()).unwrap(), session_per_era);
 
-		mock::start_era(2);
+		mock::start_active_era(2);
 		assert_eq!(Staking::eras_start_session_index(current_era()).unwrap(), session_per_era * 2u32);
 
 		let session = Session::current_index();
@@ -1996,7 +2061,7 @@ fn era_is_always_same_length() {
 		assert_eq!(current_era(), 3);
 		assert_eq!(Staking::eras_start_session_index(current_era()).unwrap(), session + 2);
 
-		mock::start_era(4);
+		mock::start_active_era(4);
 		assert_eq!(Staking::eras_start_session_index(current_era()).unwrap(), session + 2u32 + session_per_era);
 	});
 }
@@ -2060,7 +2125,7 @@ fn offence_deselects_validator_even_when_slash_is_zero() {
 		assert_eq!(Staking::force_era(), Forcing::ForceNew);
 		assert!(!<Validators<Test>>::contains_key(11));
 
-		mock::start_era(1);
+		mock::start_active_era(1);
 
 		assert!(!Session::validators().contains(&11));
 		assert!(!<Validators<Test>>::contains_key(11));
@@ -2098,7 +2163,7 @@ fn slashing_performed_according_exposure() {
 #[test]
 fn slash_in_old_span_does_not_deselect() {
 	ExtBuilder::default().build_and_execute(|| {
-		mock::start_era(1);
+		mock::start_active_era(1);
 
 		assert!(<Validators<Test>>::contains_key(11));
 		assert!(Session::validators().contains(&11));
@@ -2117,14 +2182,14 @@ fn slash_in_old_span_does_not_deselect() {
 		assert_eq!(Staking::force_era(), Forcing::ForceNew);
 		assert!(!<Validators<Test>>::contains_key(11));
 
-		mock::start_era(2);
+		mock::start_active_era(2);
 
 		Staking::validate(Origin::signed(10), Default::default()).unwrap();
 		assert_eq!(Staking::force_era(), Forcing::NotForcing);
 		assert!(<Validators<Test>>::contains_key(11));
 		assert!(!Session::validators().contains(&11));
 
-		mock::start_era(3);
+		mock::start_active_era(3);
 
 		// this staker is in a new slashing span now, having re-registered after
 		// their prior slash.
@@ -2409,7 +2474,7 @@ fn garbage_collection_on_window_pruning() {
 	// ensures that `ValidatorSlashInEra` and `NominatorSlashInEra` are cleared after
 	// `BondingDuration`.
 	ExtBuilder::default().build_and_execute(|| {
-		mock::start_era(1);
+		mock::start_active_era(1);
 
 		assert_eq!(Balances::free_balance(11), 1000);
 		let now = Staking::active_era().unwrap().index;
@@ -2439,7 +2504,7 @@ fn garbage_collection_on_window_pruning() {
 			assert!(<Staking as crate::Store>::ValidatorSlashInEra::get(&now, &11).is_some());
 			assert!(<Staking as crate::Store>::NominatorSlashInEra::get(&now, &101).is_some());
 
-			mock::start_era(era);
+			mock::start_active_era(era);
 		}
 
 		assert!(<Staking as crate::Store>::ValidatorSlashInEra::get(&now, &11).is_none());
@@ -2450,9 +2515,9 @@ fn garbage_collection_on_window_pruning() {
 #[test]
 fn slashing_nominators_by_span_max() {
 	ExtBuilder::default().build_and_execute(|| {
-		mock::start_era(1);
-		mock::start_era(2);
-		mock::start_era(3);
+		mock::start_active_era(1);
+		mock::start_active_era(2);
+		mock::start_active_era(3);
 
 		assert_eq!(Balances::free_balance(11), 1000);
 		assert_eq!(Balances::free_balance(21), 2000);
@@ -2548,9 +2613,9 @@ fn slashing_nominators_by_span_max() {
 #[test]
 fn slashes_are_summed_across_spans() {
 	ExtBuilder::default().build_and_execute(|| {
-		mock::start_era(1);
-		mock::start_era(2);
-		mock::start_era(3);
+		mock::start_active_era(1);
+		mock::start_active_era(2);
+		mock::start_active_era(3);
 
 		assert_eq!(Balances::free_balance(21), 2000);
 		assert_eq!(Staking::slashable_balance_of(&21), 1000);
@@ -2578,7 +2643,7 @@ fn slashes_are_summed_across_spans() {
 		// 21 has been force-chilled. re-signal intent to validate.
 		Staking::validate(Origin::signed(20), Default::default()).unwrap();
 
-		mock::start_era(4);
+		mock::start_active_era(4);
 
 		assert_eq!(Staking::slashable_balance_of(&21), 900);
 
@@ -2605,16 +2670,18 @@ fn slashes_are_summed_across_spans() {
 
 #[test]
 fn deferred_slashes_are_deferred() {
-	ExtBuilder::default().slash_defer_duration(2).build_and_execute(|| {
-		mock::start_era(1);
+	ExtBuilder::default()
+		.slash_defer_duration(2)
+		.build_and_execute(|| {
+			mock::start_active_era(1);
 
-		assert_eq!(Balances::free_balance(11), 1000);
+			assert_eq!(Balances::free_balance(11), 1000);
 
-		let exposure = Staking::eras_stakers(Staking::active_era().unwrap().index, 11);
-		assert_eq!(Balances::free_balance(101), 2000);
-		let nominated_value = exposure.others.iter().find(|o| o.who == 101).unwrap().value;
+			let exposure = Staking::eras_stakers(Staking::active_era().unwrap().index, 11);
+			assert_eq!(Balances::free_balance(101), 2000);
+			let nominated_value = exposure.others.iter().find(|o| o.who == 101).unwrap().value;
 
-		on_offence_now(
+			on_offence_now(
 			&[
 				OffenceDetails {
 					offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
@@ -2624,40 +2691,42 @@ fn deferred_slashes_are_deferred() {
 			&[Perbill::from_percent(10)],
 		);
 
-		assert_eq!(Balances::free_balance(11), 1000);
-		assert_eq!(Balances::free_balance(101), 2000);
+			assert_eq!(Balances::free_balance(11), 1000);
+			assert_eq!(Balances::free_balance(101), 2000);
 
-		mock::start_era(2);
+			mock::start_active_era(2);
 
-		assert_eq!(Balances::free_balance(11), 1000);
-		assert_eq!(Balances::free_balance(101), 2000);
+			assert_eq!(Balances::free_balance(11), 1000);
+			assert_eq!(Balances::free_balance(101), 2000);
 
-		mock::start_era(3);
+			mock::start_active_era(3);
 
-		assert_eq!(Balances::free_balance(11), 1000);
-		assert_eq!(Balances::free_balance(101), 2000);
+			assert_eq!(Balances::free_balance(11), 1000);
+			assert_eq!(Balances::free_balance(101), 2000);
 
-		// at the start of era 4, slashes from era 1 are processed,
-		// after being deferred for at least 2 full eras.
-		mock::start_era(4);
+			// at the start of era 4, slashes from era 1 are processed,
+			// after being deferred for at least 2 full eras.
+			mock::start_active_era(4);
 
-		assert_eq!(Balances::free_balance(11), 900);
-		assert_eq!(Balances::free_balance(101), 2000 - (nominated_value / 10));
-	})
+			assert_eq!(Balances::free_balance(11), 900);
+			assert_eq!(Balances::free_balance(101), 2000 - (nominated_value / 10));
+		})
 }
 
 #[test]
 fn remove_deferred() {
-	ExtBuilder::default().slash_defer_duration(2).build_and_execute(|| {
-		mock::start_era(1);
+	ExtBuilder::default()
+		.slash_defer_duration(2)
+		.build_and_execute(|| {
+			mock::start_active_era(1);
 
-		assert_eq!(Balances::free_balance(11), 1000);
+			assert_eq!(Balances::free_balance(11), 1000);
 
-		let exposure = Staking::eras_stakers(Staking::active_era().unwrap().index, 11);
-		assert_eq!(Balances::free_balance(101), 2000);
-		let nominated_value = exposure.others.iter().find(|o| o.who == 101).unwrap().value;
+			let exposure = Staking::eras_stakers(Staking::active_era().unwrap().index, 11);
+			assert_eq!(Balances::free_balance(101), 2000);
+			let nominated_value = exposure.others.iter().find(|o| o.who == 101).unwrap().value;
 
-		on_offence_now(
+			on_offence_now(
 			&[
 				OffenceDetails {
 					offender: (11, exposure.clone()),
@@ -2667,12 +2736,12 @@ fn remove_deferred() {
 			&[Perbill::from_percent(10)],
 		);
 
-		assert_eq!(Balances::free_balance(11), 1000);
-		assert_eq!(Balances::free_balance(101), 2000);
+			assert_eq!(Balances::free_balance(11), 1000);
+			assert_eq!(Balances::free_balance(101), 2000);
 
-		mock::start_era(2);
+			mock::start_active_era(2);
 
-		on_offence_in_era(
+			on_offence_in_era(
 			&[
 				OffenceDetails {
 					offender: (11, exposure.clone()),
@@ -2689,32 +2758,32 @@ fn remove_deferred() {
 			Error::<Test>::EmptyTargets
 		);
 
-		assert_ok!(Staking::cancel_deferred_slash(Origin::root(), 1, vec![0]));
+			assert_ok!(Staking::cancel_deferred_slash(Origin::root(), 1, vec![0]));
 
-		assert_eq!(Balances::free_balance(11), 1000);
-		assert_eq!(Balances::free_balance(101), 2000);
+			assert_eq!(Balances::free_balance(11), 1000);
+			assert_eq!(Balances::free_balance(101), 2000);
 
-		mock::start_era(3);
+			mock::start_active_era(3);
 
-		assert_eq!(Balances::free_balance(11), 1000);
-		assert_eq!(Balances::free_balance(101), 2000);
+			assert_eq!(Balances::free_balance(11), 1000);
+			assert_eq!(Balances::free_balance(101), 2000);
 
-		// at the start of era 4, slashes from era 1 are processed,
-		// after being deferred for at least 2 full eras.
-		mock::start_era(4);
+			// at the start of era 4, slashes from era 1 are processed,
+			// after being deferred for at least 2 full eras.
+			mock::start_active_era(4);
 
-		// the first slash for 10% was cancelled, so no effect.
-		assert_eq!(Balances::free_balance(11), 1000);
-		assert_eq!(Balances::free_balance(101), 2000);
+			// the first slash for 10% was cancelled, so no effect.
+			assert_eq!(Balances::free_balance(11), 1000);
+			assert_eq!(Balances::free_balance(101), 2000);
 
-		mock::start_era(5);
+			mock::start_active_era(5);
 
-		let slash_10 = Perbill::from_percent(10);
-		let slash_15 = Perbill::from_percent(15);
-		let initial_slash = slash_10 * nominated_value;
+			let slash_10 = Perbill::from_percent(10);
+			let slash_15 = Perbill::from_percent(15);
+			let initial_slash = slash_10 * nominated_value;
 
-		let total_slash = slash_15 * nominated_value;
-		let actual_slash = total_slash - initial_slash;
+			let total_slash = slash_15 * nominated_value;
+			let actual_slash = total_slash - initial_slash;
 
 		// 5% slash (15 - 10) processed now.
 		assert_eq!(Balances::free_balance(11), 950);
@@ -2724,15 +2793,17 @@ fn remove_deferred() {
 
 #[test]
 fn remove_multi_deferred() {
-	ExtBuilder::default().slash_defer_duration(2).build_and_execute(|| {
-		mock::start_era(1);
+	ExtBuilder::default()
+		.slash_defer_duration(2)
+		.build_and_execute(|| {
+			mock::start_active_era(1);
 
-		assert_eq!(Balances::free_balance(11), 1000);
+			assert_eq!(Balances::free_balance(11), 1000);
 
-		let exposure = Staking::eras_stakers(Staking::active_era().unwrap().index, 11);
-		assert_eq!(Balances::free_balance(101), 2000);
+			let exposure = Staking::eras_stakers(Staking::active_era().unwrap().index, 11);
+			assert_eq!(Balances::free_balance(101), 2000);
 
-		on_offence_now(
+			on_offence_now(
 			&[
 				OffenceDetails {
 					offender: (11, exposure.clone()),
@@ -2899,7 +2970,7 @@ mod offchain_election {
 			.session_per_era(3)
 			.build()
 			.execute_with(|| {
-				mock::start_era(1);
+				mock::start_active_era(1);
 				assert_eq!(Session::current_index(), 3);
 				assert_eq!(Staking::current_era(), Some(1));
 				assert_eq!(Staking::is_current_session_final(), false);
@@ -2921,7 +2992,7 @@ mod offchain_election {
 	fn offchain_window_is_triggered() {
 		ExtBuilder::default()
 			.session_per_era(5)
-			.session_length(10)
+			.period(10)
 			.election_lookahead(3)
 			.build()
 			.execute_with(|| {
@@ -2981,7 +3052,7 @@ mod offchain_election {
 	fn offchain_window_is_triggered_when_forcing() {
 		ExtBuilder::default()
 			.session_per_era(5)
-			.session_length(10)
+			.period(10)
 			.election_lookahead(3)
 			.build()
 			.execute_with(|| {
@@ -3002,11 +3073,10 @@ mod offchain_election {
 	fn offchain_window_is_triggered_when_force_always() {
 		ExtBuilder::default()
 			.session_per_era(5)
-			.session_length(10)
+			.period(10)
 			.election_lookahead(3)
 			.build()
 			.execute_with(|| {
-
 				ForceEra::put(Forcing::ForceAlways);
 				run_to_block(16);
 				assert_eq!(Staking::era_election_status(), ElectionStatus::Closed);
@@ -3029,7 +3099,7 @@ mod offchain_election {
 	fn offchain_window_closes_when_forcenone() {
 		ExtBuilder::default()
 			.session_per_era(5)
-			.session_length(10)
+			.period(10)
 			.election_lookahead(3)
 			.build()
 			.execute_with(|| {
@@ -4101,7 +4171,7 @@ mod offchain_election {
 #[test]
 fn slash_kicks_validators_not_nominators_and_disables_nominator_for_kicked_validator() {
 	ExtBuilder::default().build_and_execute(|| {
-		mock::start_era(1);
+		mock::start_active_era(1);
 		assert_eq_uvec!(Session::validators(), vec![11, 21]);
 
 		// pre-slash balance
@@ -4149,7 +4219,7 @@ fn slash_kicks_validators_not_nominators_and_disables_nominator_for_kicked_valid
 		// actually re-bond the slashed validator
 		assert_ok!(Staking::validate(Origin::signed(10), Default::default()));
 
-		mock::start_era(2);
+		mock::start_active_era(2);
 		let exposure_11 = Staking::eras_stakers(Staking::active_era().unwrap().index, &11);
 		let exposure_21 = Staking::eras_stakers(Staking::active_era().unwrap().index, &21);
 
@@ -4180,31 +4250,28 @@ fn claim_reward_at_the_last_era_and_no_double_claim_and_invalid_claim() {
 
 		<Module<Test>>::reward_by_ids(vec![(11, 1)]);
 		// Compute total payout now for whole duration as other parameter won't change
-		let total_payout_0 = current_total_payout_for_duration(3000);
-		assert!(total_payout_0 > 10); // Test is meaningful if reward something
+		let total_payout_0 = current_total_payout_for_duration(reward_time_per_era());
 
-		mock::start_era(1);
+		mock::start_active_era(1);
 
 		<Module<Test>>::reward_by_ids(vec![(11, 1)]);
 		// Change total issuance in order to modify total payout
 		let _ = Balances::deposit_creating(&999, 1_000_000_000);
 		// Compute total payout now for whole duration as other parameter won't change
-		let total_payout_1 = current_total_payout_for_duration(3000);
-		assert!(total_payout_1 > 10); // Test is meaningful if reward something
+		let total_payout_1 = current_total_payout_for_duration(reward_time_per_era());
 		assert!(total_payout_1 != total_payout_0);
 
-		mock::start_era(2);
+		mock::start_active_era(2);
 
 		<Module<Test>>::reward_by_ids(vec![(11, 1)]);
 		// Change total issuance in order to modify total payout
 		let _ = Balances::deposit_creating(&999, 1_000_000_000);
 		// Compute total payout now for whole duration as other parameter won't change
-		let total_payout_2 = current_total_payout_for_duration(3000);
-		assert!(total_payout_2 > 10); // Test is meaningful if reward something
+		let total_payout_2 = current_total_payout_for_duration(reward_time_per_era());
 		assert!(total_payout_2 != total_payout_0);
 		assert!(total_payout_2 != total_payout_1);
 
-		mock::start_era(Staking::history_depth() + 1);
+		mock::start_active_era(Staking::history_depth() + 1);
 
 		let active_era = Staking::active_era().unwrap().index;
 
@@ -4248,7 +4315,7 @@ fn claim_reward_at_the_last_era_and_no_double_claim_and_invalid_claim() {
 #[test]
 fn zero_slash_keeps_nominators() {
 	ExtBuilder::default().build_and_execute(|| {
-		mock::start_era(1);
+		mock::start_active_era(1);
 
 		assert_eq!(Balances::free_balance(11), 1000);
 
@@ -4285,12 +4352,13 @@ fn zero_slash_keeps_nominators() {
 
 #[test]
 fn six_session_delay() {
-	ExtBuilder::default().build_and_execute(|| {
+	ExtBuilder::default().initialize_first_session(false).build_and_execute(|| {
 		use pallet_session::SessionManager;
 
 		let val_set = Session::validators();
 		let init_session = Session::current_index();
 		let init_active_era = Staking::active_era().unwrap().index;
+
 		// pallet-session is delaying session by one, thus the next session to plan is +2.
 		assert_eq!(<Staking as SessionManager<_>>::new_session(init_session + 2), None);
 		assert_eq!(<Staking as SessionManager<_>>::new_session(init_session + 3), Some(val_set.clone()));
@@ -4300,10 +4368,11 @@ fn six_session_delay() {
 
 		<Staking as SessionManager<_>>::end_session(init_session);
 		<Staking as SessionManager<_>>::start_session(init_session + 1);
-		assert_eq!(Staking::active_era().unwrap().index, init_active_era);
+		assert_eq!(active_era(), init_active_era);
+
 		<Staking as SessionManager<_>>::end_session(init_session + 1);
 		<Staking as SessionManager<_>>::start_session(init_session + 2);
-		assert_eq!(Staking::active_era().unwrap().index, init_active_era);
+		assert_eq!(active_era(), init_active_era);
 
 		// Reward current era
 		Staking::reward_by_ids(vec![(11, 1)]);
@@ -4311,13 +4380,15 @@ fn six_session_delay() {
 		// New active era is triggered here.
 		<Staking as SessionManager<_>>::end_session(init_session + 2);
 		<Staking as SessionManager<_>>::start_session(init_session + 3);
-		assert_eq!(Staking::active_era().unwrap().index, init_active_era + 1);
+		assert_eq!(active_era(), init_active_era + 1);
+
 		<Staking as SessionManager<_>>::end_session(init_session + 3);
 		<Staking as SessionManager<_>>::start_session(init_session + 4);
-		assert_eq!(Staking::active_era().unwrap().index, init_active_era + 1);
+		assert_eq!(active_era(), init_active_era + 1);
+
 		<Staking as SessionManager<_>>::end_session(init_session + 4);
 		<Staking as SessionManager<_>>::start_session(init_session + 5);
-		assert_eq!(Staking::active_era().unwrap().index, init_active_era + 1);
+		assert_eq!(active_era(), init_active_era + 1);
 
 		// Reward current era
 		Staking::reward_by_ids(vec![(21, 2)]);
@@ -4325,7 +4396,7 @@ fn six_session_delay() {
 		// New active era is triggered here.
 		<Staking as SessionManager<_>>::end_session(init_session + 5);
 		<Staking as SessionManager<_>>::start_session(init_session + 6);
-		assert_eq!(Staking::active_era().unwrap().index, init_active_era + 2);
+		assert_eq!(active_era(), init_active_era + 2);
 
 		// That reward are correct
 		assert_eq!(Staking::eras_reward_points(init_active_era).total, 1);
@@ -4335,10 +4406,6 @@ fn six_session_delay() {
 
 #[test]
 fn test_max_nominator_rewarded_per_validator_and_cant_steal_someone_else_reward() {
-	// Test:
-	// * If nominator nomination is below the $MaxNominatorRewardedPerValidator other nominator
-	//   then the nominator can't claim its reward
-	// * A nominator can't claim another nominator reward
 	ExtBuilder::default().build_and_execute(|| {
 		for i in 0..=<Test as Config>::MaxNominatorRewardedPerValidator::get() {
 			let stash = 10_000 + i as AccountId;
@@ -4355,14 +4422,13 @@ fn test_max_nominator_rewarded_per_validator_and_cant_steal_someone_else_reward(
 			);
 			assert_ok!(Staking::nominate(Origin::signed(controller), vec![11]));
 		}
-		mock::start_era(1);
+		mock::start_active_era(1);
 
 		<Module<Test>>::reward_by_ids(vec![(11, 1)]);
-		// Compute total payout now for whole duration as other parameter won't change
-		let total_payout_0 = current_total_payout_for_duration(3 * 1000);
-		assert!(total_payout_0 > 100); // Test is meaningful if reward something
+		// compute and ensure the reward amount is greater than zero.
+		let _ = current_total_payout_for_duration(reward_time_per_era());
 
-		mock::start_era(2);
+		mock::start_active_era(2);
 		mock::make_all_reward_payment(1);
 
 		// Assert only nominators from 1 to Max are rewarded
@@ -4381,7 +4447,7 @@ fn test_max_nominator_rewarded_per_validator_and_cant_steal_someone_else_reward(
 #[test]
 fn set_history_depth_works() {
 	ExtBuilder::default().build_and_execute(|| {
-		mock::start_era(10);
+		mock::start_active_era(10);
 		Staking::set_history_depth(Origin::root(), 20, 0).unwrap();
 		assert!(<Staking as Store>::ErasTotalStake::contains_key(10 - 4));
 		assert!(<Staking as Store>::ErasTotalStake::contains_key(10 - 5));
@@ -4411,12 +4477,13 @@ fn test_payout_stakers() {
 			bond_nominator(1000 + i, 100 + i, balance + i as Balance, vec![11]);
 		}
 
-		mock::start_era(1);
+		mock::start_active_era(1);
 		Staking::reward_by_ids(vec![(11, 1)]);
-		// Compute total payout now for whole duration as other parameter won't change
-		let total_payout_0 = current_total_payout_for_duration(3 * 1000);
-		assert!(total_payout_0 > 100); // Test is meaningful if reward something
-		mock::start_era(2);
+
+		// compute and ensure the reward amount is greater than zero.
+		let _ = current_total_payout_for_duration(reward_time_per_era());
+
+		mock::start_active_era(2);
 		assert_ok!(Staking::payout_stakers(Origin::signed(1337), 11, 1));
 
 		// Top 64 nominators of validator 11 automatically paid out, including the validator
@@ -4438,10 +4505,11 @@ fn test_payout_stakers() {
 
 		for i in 3..16 {
 			Staking::reward_by_ids(vec![(11, 1)]);
-			// Compute total payout now for whole duration as other parameter won't change
-			let total_payout_0 = current_total_payout_for_duration(3 * 1000);
-			assert!(total_payout_0 > 100); // Test is meaningful if reward something
-			mock::start_era(i);
+
+			// compute and ensure the reward amount is greater than zero.
+			let _ = current_total_payout_for_duration(reward_time_per_era());
+
+			mock::start_active_era(i);
 			assert_ok!(Staking::payout_stakers(Origin::signed(1337), 11, i - 1));
 		}
 
@@ -4453,10 +4521,9 @@ fn test_payout_stakers() {
 
 		for i in 16..100 {
 			Staking::reward_by_ids(vec![(11, 1)]);
-			// Compute total payout now for whole duration as other parameter won't change
-			let total_payout_0 = current_total_payout_for_duration(3 * 1000);
-			assert!(total_payout_0 > 100); // Test is meaningful if reward something
-			mock::start_era(i);
+			// compute and ensure the reward amount is greater than zero.
+			let _ = current_total_payout_for_duration(reward_time_per_era());
+			mock::start_active_era(i);
 		}
 
 		// We clean it up as history passes
@@ -4491,12 +4558,13 @@ fn payout_stakers_handles_basic_errors() {
 			bond_nominator(1000 + i, 100 + i, balance + i as Balance, vec![11]);
 		}
 
-		mock::start_era(1);
+		mock::start_active_era(1);
 		Staking::reward_by_ids(vec![(11, 1)]);
-		// Compute total payout now for whole duration as other parameter won't change
-		let total_payout_0 = current_total_payout_for_duration(3 * 1000);
-		assert!(total_payout_0 > 100); // Test is meaningful if reward something
-		mock::start_era(2);
+
+		// compute and ensure the reward amount is greater than zero.
+		let _ = current_total_payout_for_duration(reward_time_per_era());
+
+		mock::start_active_era(2);
 
 		// Wrong Era, too big
 		assert_noop!(Staking::payout_stakers(Origin::signed(1337), 11, 2), Error::<Test>::InvalidEraToReward);
@@ -4505,10 +4573,9 @@ fn payout_stakers_handles_basic_errors() {
 
 		for i in 3..100 {
 			Staking::reward_by_ids(vec![(11, 1)]);
-			// Compute total payout now for whole duration as other parameter won't change
-			let total_payout_0 = current_total_payout_for_duration(3 * 1000);
-			assert!(total_payout_0 > 100); // Test is meaningful if reward something
-			mock::start_era(i);
+			// compute and ensure the reward amount is greater than zero.
+			let _ = current_total_payout_for_duration(reward_time_per_era());
+			mock::start_active_era(i);
 		}
 		// We are at era 99, with history depth of 84
 		// We should be able to payout era 15 through 98 (84 total eras), but not 14 or 99.
@@ -4538,7 +4605,7 @@ fn bond_during_era_correctly_populates_claimed_rewards() {
 				claimed_rewards: vec![],
 			})
 		);
-		mock::start_era(5);
+		mock::start_active_era(5);
 		bond_validator(11, 10, 1000);
 		assert_eq!(
 			Staking::ledger(&10),
@@ -4550,7 +4617,7 @@ fn bond_during_era_correctly_populates_claimed_rewards() {
 				claimed_rewards: (0..5).collect(),
 			})
 		);
-		mock::start_era(99);
+		mock::start_active_era(99);
 		bond_validator(13, 12, 1000);
 		assert_eq!(
 			Staking::ledger(&12),
@@ -4655,12 +4722,11 @@ fn payout_creates_controller() {
 		assert_ok!(Balances::transfer(Origin::signed(1337), 1234, 100));
 		assert_eq!(Balances::free_balance(1337), 0);
 
-		mock::start_era(1);
+		mock::start_active_era(1);
 		Staking::reward_by_ids(vec![(11, 1)]);
-		// Compute total payout now for whole duration as other parameter won't change
-		let total_payout_0 = current_total_payout_for_duration(3 * 1000);
-		assert!(total_payout_0 > 100); // Test is meaningful if reward something
-		mock::start_era(2);
+		// compute and ensure the reward amount is greater than zero.
+		let _ = current_total_payout_for_duration(reward_time_per_era());
+		mock::start_active_era(2);
 		assert_ok!(Staking::payout_stakers(Origin::signed(1337), 11, 1));
 
 		// Controller is created
@@ -4684,12 +4750,11 @@ fn payout_to_any_account_works() {
 		// Reward Destination account doesn't exist
 		assert_eq!(Balances::free_balance(42), 0);
 
-		mock::start_era(1);
+		mock::start_active_era(1);
 		Staking::reward_by_ids(vec![(11, 1)]);
-		// Compute total payout now for whole duration as other parameter won't change
-		let total_payout_0 = current_total_payout_for_duration(3 * 1000);
-		assert!(total_payout_0 > 100); // Test is meaningful if reward something
-		mock::start_era(2);
+		// compute and ensure the reward amount is greater than zero.
+		let _ = current_total_payout_for_duration(reward_time_per_era());
+		mock::start_active_era(2);
 		assert_ok!(Staking::payout_stakers(Origin::signed(1337), 11, 1));
 
 		// Payment is successful
@@ -4698,7 +4763,111 @@ fn payout_to_any_account_works() {
 }
 
 #[test]
-fn cannot_bond_extra_to_lower_than_ed() {
+fn session_buffering_with_offset() {
+	// similar to live-chains, have some offset for the first session
+	ExtBuilder::default()
+		.offset(2)
+		.period(5)
+		.session_per_era(5)
+		.build_and_execute(|| {
+			assert_eq!(current_era(), 0);
+			assert_eq!(active_era(), 0);
+			assert_eq!(Session::current_index(), 0);
+
+			start_session(1);
+			assert_eq!(current_era(), 0);
+			assert_eq!(active_era(), 0);
+			assert_eq!(Session::current_index(), 1);
+			assert_eq!(System::block_number(), 2);
+
+			start_session(2);
+			assert_eq!(current_era(), 0);
+			assert_eq!(active_era(), 0);
+			assert_eq!(Session::current_index(), 2);
+			assert_eq!(System::block_number(), 7);
+
+			start_session(3);
+			assert_eq!(current_era(), 0);
+			assert_eq!(active_era(), 0);
+			assert_eq!(Session::current_index(), 3);
+			assert_eq!(System::block_number(), 12);
+
+			// active era is lagging behind by one session, because of how session module works.
+			start_session(4);
+			assert_eq!(current_era(), 1);
+			assert_eq!(active_era(), 0);
+			assert_eq!(Session::current_index(), 4);
+			assert_eq!(System::block_number(), 17);
+
+			start_session(5);
+			assert_eq!(current_era(), 1);
+			assert_eq!(active_era(), 1);
+			assert_eq!(Session::current_index(), 5);
+			assert_eq!(System::block_number(), 22);
+
+			// go all the way to active 2.
+			start_active_era(2);
+			assert_eq!(current_era(), 2);
+			assert_eq!(active_era(), 2);
+			assert_eq!(Session::current_index(), 10);
+
+		});
+}
+
+#[test]
+fn session_buffering_no_offset() {
+	// no offset, first session starts immediately
+	ExtBuilder::default()
+		.offset(0)
+		.period(5)
+		.session_per_era(5)
+		.build_and_execute(|| {
+			assert_eq!(current_era(), 0);
+			assert_eq!(active_era(), 0);
+			assert_eq!(Session::current_index(), 0);
+
+			start_session(1);
+			assert_eq!(current_era(), 0);
+			assert_eq!(active_era(), 0);
+			assert_eq!(Session::current_index(), 1);
+			assert_eq!(System::block_number(), 5);
+
+			start_session(2);
+			assert_eq!(current_era(), 0);
+			assert_eq!(active_era(), 0);
+			assert_eq!(Session::current_index(), 2);
+			assert_eq!(System::block_number(), 10);
+
+			start_session(3);
+			assert_eq!(current_era(), 0);
+			assert_eq!(active_era(), 0);
+			assert_eq!(Session::current_index(), 3);
+			assert_eq!(System::block_number(), 15);
+
+			// active era is lagging behind by one session, because of how session module works.
+			start_session(4);
+			assert_eq!(current_era(), 1);
+			assert_eq!(active_era(), 0);
+			assert_eq!(Session::current_index(), 4);
+			assert_eq!(System::block_number(), 20);
+
+			start_session(5);
+			assert_eq!(current_era(), 1);
+			assert_eq!(active_era(), 1);
+			assert_eq!(Session::current_index(), 5);
+			assert_eq!(System::block_number(), 25);
+
+			// go all the way to active 2.
+			start_active_era(2);
+			assert_eq!(current_era(), 2);
+			assert_eq!(active_era(), 2);
+			assert_eq!(Session::current_index(), 10);
+
+		});
+}
+
+#[test]
+fn cannot_rebond_to_lower_than_ed() {
 	ExtBuilder::default()
 		.existential_deposit(10)
 		.build_and_execute(|| {
@@ -4732,14 +4901,14 @@ fn cannot_bond_extra_to_lower_than_ed() {
 
 			// now bond a wee bit more
 			assert_noop!(
-				Staking::bond_extra(Origin::signed(21), 5),
+				Staking::rebond(Origin::signed(20), 5),
 				Error::<Test>::InsufficientValue,
 			);
 		})
 }
 
 #[test]
-fn cannot_rebond_to_lower_than_ed() {
+fn cannot_bond_extra_to_lower_than_ed() {
 	ExtBuilder::default()
 		.existential_deposit(10)
 		.build_and_execute(|| {
@@ -4766,14 +4935,17 @@ fn cannot_rebond_to_lower_than_ed() {
 					stash: 21,
 					total: 1000,
 					active: 0,
-					unlocking: vec![UnlockChunk { value: 1000, era: 3 }],
+					unlocking: vec![UnlockChunk {
+						value: 1000,
+						era: 3
+					}],
 					claimed_rewards: vec![]
 				}
 			);
 
 			// now bond a wee bit more
 			assert_noop!(
-				Staking::rebond(Origin::signed(20), 5),
+				Staking::bond_extra(Origin::signed(21), 5),
 				Error::<Test>::InsufficientValue,
 			);
 		})

From 48bf02ad068d4958b186dd2090c215eadf9dacda Mon Sep 17 00:00:00 2001
From: honeywest <50997103+honeywest@users.noreply.github.com>
Date: Mon, 21 Dec 2020 22:22:47 +0800
Subject: [PATCH 0195/1194] optimize biguint div closure (#7754)

* optimize biguint div closure

* optimize biguint sub and fix note

* change and add biguint split test

* add biguint div_unit test

* update biguint sub v to v1

* add biguint shift_check
---
 primitives/arithmetic/src/biguint.rs | 36 ++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/primitives/arithmetic/src/biguint.rs b/primitives/arithmetic/src/biguint.rs
index 03f2bb1e55f6..64418956fcd7 100644
--- a/primitives/arithmetic/src/biguint.rs
+++ b/primitives/arithmetic/src/biguint.rs
@@ -7,7 +7,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-// 	http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -212,9 +212,9 @@ impl BigUint {
 				let mut needs_borrow = false;
 				let mut t = 0;
 
-				if let Some(v) = u.checked_sub(v) {
-					if let Some(v2) = v.checked_sub(k) {
-						t = v2 % B;
+				if let Some(v1) = u.checked_sub(v) {
+					if let Some(v2) = v1.checked_sub(k) {
+						t = v2;
 						k = 0;
 					} else {
 						needs_borrow = true;
@@ -228,9 +228,9 @@ impl BigUint {
 				}
 				t
 			};
-			// PROOF: t either comes from `v2 % B`, or from `u + B - v - k`. The former is
+			// PROOF: t either comes from `v2`, or from `u + B - v - k`. The former is
 			// trivial. The latter will not overflow this branch will only happen if the sum of
-			// `u - v - k` part has been negative, hence `u + B - v - k < b`.
+			// `u - v - k` part has been negative, hence `u + B - v - k < B`.
 			w.set(j, s as Single);
 		}
 
@@ -287,9 +287,9 @@ impl BigUint {
 		let mut out = Self::with_capacity(n);
 		let mut r: Single = 0;
 		// PROOF: (B-1) * B + (B-1) still fits in double
-		let with_r = |x: Double, r: Single| { Double::from(r) * B + x };
+		let with_r = |x: Single, r: Single| { Double::from(r) * B + Double::from(x) };
 		for d in (0..n).rev() {
-			let (q, rr) = div_single(with_r(self.get(d).into(), r), other) ;
+			let (q, rr) = div_single(with_r(self.get(d), r), other) ;
 			out.set(d, q as Single);
 			r = rr;
 		}
@@ -580,14 +580,25 @@ pub mod tests {
 		BigUint { digits: vec![1; n] }
 	}
 
+	#[test]
+	fn shift_check() {
+		let shift = sp_std::mem::size_of::<Double>() - sp_std::mem::size_of::<Single>();
+		assert_eq!(shift * 8, SHIFT);
+	}
+
 	#[test]
 	fn split_works() {
 		let a = SHIFT / 2;
 		let b = SHIFT * 3 / 2;
 		let num: Double = 1 << a | 1 << b;
-		// example when `Single = u8`
-		// assert_eq!(num, 0b_0001_0000_0001_0000)
+		assert_eq!(num, 0x_0001_0000_0001_0000);
 		assert_eq!(split(num), (1 << a, 1 << a));
+
+		let a = SHIFT / 2 + 4;
+		let b = SHIFT / 2 - 4;
+		let num: Double = 1 << (SHIFT + a) | 1 << b;
+		assert_eq!(num, 0x_0010_0000_0000_1000);
+		assert_eq!(split(num), (1 << a, 1 << b));
 	}
 
 	#[test]
@@ -734,6 +745,7 @@ pub mod tests {
 	fn div_unit_works() {
 		let a = BigUint { digits: vec![100] };
 		let b = BigUint { digits: vec![1, 100] };
+		let c = BigUint { digits: vec![14, 28, 100] };
 
 		assert_eq!(a.clone().div_unit(1), a);
 		assert_eq!(a.clone().div_unit(0), a);
@@ -745,5 +757,9 @@ pub mod tests {
 		assert_eq!(b.clone().div_unit(2), BigUint::from(((B + 100) / 2) as Single));
 		assert_eq!(b.clone().div_unit(7), BigUint::from(((B + 100) / 7) as Single));
 
+		assert_eq!(c.clone().div_unit(1), c);
+		assert_eq!(c.clone().div_unit(0), c);
+		assert_eq!(c.clone().div_unit(2), BigUint { digits: vec![7, 14, 50] });
+		assert_eq!(c.clone().div_unit(7), BigUint { digits: vec![2, 4, 14] });
 	}
 }

From 22b34bbc45521c79d77b07c96ac5e841480ef502 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Mon, 21 Dec 2020 18:08:22 +0100
Subject: [PATCH 0196/1194] Make it possible to calculate the storage root as
 often as you want (#7714)

* Make it possible to calculate the storage as often as you want

So, until now each Substrate based blockchain has calculated the storage
root once, at the end of the block. Now there is Frontier that wants to
calculate some intermediate storage root. However this failed on block
import. The problem with that was the extrinsics root. When building the
block we stored `Default::default()` as extrinsics root, because yeah,
we don't know the extrinsics root before finishing the block. At the end
this extrinsics root was then calculated. But on block import we passed
the already known extrinsics root. This was no problem, as we removed
this value at the end of the block. However when you all the storage
root in between, that changes the storage root between block building
and block import.

This pr changes this behavior. It removes the `ExtrinsicsRoot` storage
entry and also doesn't pass it anymore to `System::initialize`. By doing
it, we remove the difference in the storage and fix the storage root mismatch.

* Fix bug with incorrectly calculating the extrinscs root

* Review feedback
---
 frame/authorship/src/lib.rs                 |  2 -
 frame/babe/src/mock.rs                      |  4 +-
 frame/babe/src/tests.rs                     |  4 --
 frame/contracts/src/tests.rs                |  1 -
 frame/executive/src/lib.rs                  | 78 +++++++++++++--------
 frame/grandpa/src/mock.rs                   |  2 -
 frame/merkle-mountain-range/src/tests.rs    |  1 -
 frame/randomness-collective-flip/src/lib.rs |  1 -
 frame/system/src/lib.rs                     | 41 ++++-------
 frame/system/src/tests.rs                   | 32 +++++++--
 10 files changed, 90 insertions(+), 76 deletions(-)

diff --git a/frame/authorship/src/lib.rs b/frame/authorship/src/lib.rs
index b991beaaa2b6..693375e3c50e 100644
--- a/frame/authorship/src/lib.rs
+++ b/frame/authorship/src/lib.rs
@@ -582,7 +582,6 @@ mod tests {
 				&number,
 				&hash,
 				&Default::default(),
-				&Default::default(),
 				Default::default()
 			);
 
@@ -681,7 +680,6 @@ mod tests {
 			System::initialize(
 				&1,
 				&Default::default(),
-				&Default::default(),
 				header.digest(),
 				Default::default(),
 			);
diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index 8af92c79e91f..77b117db7f36 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -259,7 +259,7 @@ pub fn go_to_block(n: u64, s: u64) {
 
 	let pre_digest = make_secondary_plain_pre_digest(0, s);
 
-	System::initialize(&n, &parent_hash, &Default::default(), &pre_digest, InitKind::Full);
+	System::initialize(&n, &parent_hash, &pre_digest, InitKind::Full);
 	System::set_block_number(n);
 	Timestamp::set_timestamp(n);
 
@@ -447,7 +447,7 @@ pub fn generate_equivocation_proof(
 	let make_header = || {
 		let parent_hash = System::parent_hash();
 		let pre_digest = make_secondary_plain_pre_digest(offender_authority_index, slot_number);
-		System::initialize(&current_block, &parent_hash, &Default::default(), &pre_digest, InitKind::Full);
+		System::initialize(&current_block, &parent_hash, &pre_digest, InitKind::Full);
 		System::set_block_number(current_block);
 		Timestamp::set_timestamp(current_block);
 		System::finalize()
diff --git a/frame/babe/src/tests.rs b/frame/babe/src/tests.rs
index 29b080493f46..1e522bd83cd0 100644
--- a/frame/babe/src/tests.rs
+++ b/frame/babe/src/tests.rs
@@ -77,7 +77,6 @@ fn first_block_epoch_zero_start() {
 		System::initialize(
 			&1,
 			&Default::default(),
-			&Default::default(),
 			&pre_digest,
 			Default::default(),
 		);
@@ -128,7 +127,6 @@ fn author_vrf_output_for_primary() {
 		System::initialize(
 			&1,
 			&Default::default(),
-			&Default::default(),
 			&primary_pre_digest,
 			Default::default(),
 		);
@@ -155,7 +153,6 @@ fn author_vrf_output_for_secondary_vrf() {
 		System::initialize(
 			&1,
 			&Default::default(),
-			&Default::default(),
 			&secondary_vrf_pre_digest,
 			Default::default(),
 		);
@@ -179,7 +176,6 @@ fn no_author_vrf_output_for_secondary_plain() {
 		System::initialize(
 			&1,
 			&Default::default(),
-			&Default::default(),
 			&secondary_plain_pre_digest,
 			Default::default(),
 		);
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index 3a7a8c6436e5..6ac2fb0f976b 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -698,7 +698,6 @@ fn initialize_block(number: u64) {
 	System::initialize(
 		&number,
 		&[0u8; 32].into(),
-		&[0u8; 32].into(),
 		&Default::default(),
 		Default::default(),
 	);
diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index 59e9cae19837..caba857254d6 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -130,7 +130,7 @@ use sp_runtime::{
 	transaction_validity::{TransactionValidity, TransactionSource},
 };
 use codec::{Codec, Encode};
-use frame_system::{extrinsics_root, DigestOf};
+use frame_system::DigestOf;
 
 /// Trait that can be used to execute a block.
 pub trait ExecuteBlock<Block: BlockT> {
@@ -213,7 +213,6 @@ where
 		Self::initialize_block_impl(
 			header.number(),
 			header.parent_hash(),
-			header.extrinsics_root(),
 			&digests
 		);
 	}
@@ -231,7 +230,6 @@ where
 	fn initialize_block_impl(
 		block_number: &System::BlockNumber,
 		parent_hash: &System::Hash,
-		extrinsics_root: &System::Hash,
 		digest: &Digest<System::Hash>,
 	) {
 		let mut weight = 0;
@@ -244,7 +242,6 @@ where
 		<frame_system::Module<System>>::initialize(
 			block_number,
 			parent_hash,
-			extrinsics_root,
 			digest,
 			frame_system::InitKind::Full,
 		);
@@ -286,13 +283,8 @@ where
 		assert!(
 			n > System::BlockNumber::zero()
 			&& <frame_system::Module<System>>::block_hash(n - System::BlockNumber::one()) == *header.parent_hash(),
-			"Parent hash should be valid."
+			"Parent hash should be valid.",
 		);
-
-		// Check that transaction trie root represents the transactions.
-		let xts_root = extrinsics_root::<System::Hashing, _>(&block.extrinsics());
-		header.extrinsics_root().check_equal(&xts_root);
-		assert!(header.extrinsics_root() == &xts_root, "Transaction trie root must be valid.");
 	}
 
 	/// Actually execute all transitions for `block`.
@@ -322,8 +314,14 @@ where
 	}
 
 	/// Execute given extrinsics and take care of post-extrinsics book-keeping.
-	fn execute_extrinsics_with_book_keeping(extrinsics: Vec<Block::Extrinsic>, block_number: NumberFor<Block>) {
-		extrinsics.into_iter().for_each(Self::apply_extrinsic_no_note);
+	fn execute_extrinsics_with_book_keeping(
+		extrinsics: Vec<Block::Extrinsic>,
+		block_number: NumberFor<Block>,
+	) {
+		extrinsics.into_iter().for_each(|e| if let Err(e) = Self::apply_extrinsic(e) {
+			let err: &'static str = e.into();
+			panic!(err)
+		});
 
 		// post-extrinsics book-keeping
 		<frame_system::Module<System>>::note_finished_extrinsics();
@@ -341,8 +339,6 @@ where
 		<frame_system::Module<System> as OnFinalize<System::BlockNumber>>::on_finalize(block_number);
 		<AllModules as OnFinalize<System::BlockNumber>>::on_finalize(block_number);
 
-		// set up extrinsics
-		<frame_system::Module<System>>::derive_extrinsics();
 		<frame_system::Module<System>>::finalize()
 	}
 
@@ -354,23 +350,14 @@ where
 		sp_io::init_tracing();
 		let encoded = uxt.encode();
 		let encoded_len = encoded.len();
-		Self::apply_extrinsic_with_len(uxt, encoded_len, Some(encoded))
-	}
-
-	/// Apply an extrinsic inside the block execution function.
-	fn apply_extrinsic_no_note(uxt: Block::Extrinsic) {
-		let l = uxt.encode().len();
-		match Self::apply_extrinsic_with_len(uxt, l, None) {
-			Ok(_) => (),
-			Err(e) => { let err: &'static str = e.into(); panic!(err) },
-		}
+		Self::apply_extrinsic_with_len(uxt, encoded_len, encoded)
 	}
 
 	/// Actually apply an extrinsic given its `encoded_len`; this doesn't note its hash.
 	fn apply_extrinsic_with_len(
 		uxt: Block::Extrinsic,
 		encoded_len: usize,
-		to_note: Option<Vec<u8>>,
+		to_note: Vec<u8>,
 	) -> ApplyExtrinsicResult {
 		sp_tracing::enter_span!(
 			sp_tracing::info_span!("apply_extrinsic",
@@ -382,9 +369,7 @@ where
 		// We don't need to make sure to `note_extrinsic` only after we know it's going to be
 		// executed to prevent it from leaking in storage since at this point, it will either
 		// execute or panic (and revert storage changes).
-		if let Some(encoded) = to_note {
-			<frame_system::Module<System>>::note_extrinsic(encoded);
-		}
+		<frame_system::Module<System>>::note_extrinsic(to_note);
 
 		// AUDIT: Under no circumstances may this function panic from here onwards.
 
@@ -418,6 +403,11 @@ where
 		let storage_root = new_header.state_root();
 		header.state_root().check_equal(&storage_root);
 		assert!(header.state_root() == storage_root, "Storage root must match that calculated.");
+
+		assert!(
+			header.extrinsics_root() == new_header.extrinsics_root(),
+			"Transaction trie root must be valid.",
+		);
 	}
 
 	/// Check a given signed transaction for validity. This doesn't execute any
@@ -462,7 +452,6 @@ where
 		<frame_system::Module<System>>::initialize(
 			header.number(),
 			header.parent_hash(),
-			header.extrinsics_root(),
 			&digests,
 			frame_system::InitKind::Inspection,
 		);
@@ -558,6 +547,12 @@ mod tests {
 				fn offchain_worker(n: T::BlockNumber) {
 					assert_eq!(T::BlockNumber::from(1u32), n);
 				}
+
+				#[weight = 0]
+				fn calculate_storage_root(origin) {
+					let root = sp_io::storage::root();
+					sp_io::storage::set("storage_root".as_bytes(), &root);
+				}
 			}
 		}
 
@@ -1153,4 +1148,29 @@ mod tests {
 			assert_eq!(header.hash(), System::block_hash(1));
 		});
 	}
+
+	#[test]
+	fn calculating_storage_root_twice_works() {
+		let call = Call::Custom(custom::Call::calculate_storage_root());
+		let xt = TestXt::new(call, sign_extra(1, 0, 0));
+
+		let header = new_test_ext(1).execute_with(|| {
+			// Let's build some fake block.
+			Executive::initialize_block(&Header::new(
+				1,
+				H256::default(),
+				H256::default(),
+				[69u8; 32].into(),
+				Digest::default(),
+			));
+
+			Executive::apply_extrinsic(xt.clone()).unwrap().unwrap();
+
+			Executive::finalize_block()
+		});
+
+		new_test_ext(1).execute_with(|| {
+			Executive::execute_block(Block::new(header, vec![xt]));
+		});
+	}
 }
diff --git a/frame/grandpa/src/mock.rs b/frame/grandpa/src/mock.rs
index 4a5de63e839b..ae13c946597e 100644
--- a/frame/grandpa/src/mock.rs
+++ b/frame/grandpa/src/mock.rs
@@ -359,7 +359,6 @@ pub fn start_session(session_index: SessionIndex) {
 			&(i as u64 + 1),
 			&parent_hash,
 			&Default::default(),
-			&Default::default(),
 			Default::default(),
 		);
 		System::set_block_number((i + 1).into());
@@ -384,7 +383,6 @@ pub fn initialize_block(number: u64, parent_hash: H256) {
 		&number,
 		&parent_hash,
 		&Default::default(),
-		&Default::default(),
 		Default::default(),
 	);
 }
diff --git a/frame/merkle-mountain-range/src/tests.rs b/frame/merkle-mountain-range/src/tests.rs
index 059ff6612f1b..34ce96eaba7b 100644
--- a/frame/merkle-mountain-range/src/tests.rs
+++ b/frame/merkle-mountain-range/src/tests.rs
@@ -46,7 +46,6 @@ fn new_block() -> u64 {
 		&number,
 		&hash,
 		&Default::default(),
-		&Default::default(),
 		frame_system::InitKind::Full,
 	);
 	MMR::on_initialize(number)
diff --git a/frame/randomness-collective-flip/src/lib.rs b/frame/randomness-collective-flip/src/lib.rs
index 7e0e64f3cc08..9332262d6876 100644
--- a/frame/randomness-collective-flip/src/lib.rs
+++ b/frame/randomness-collective-flip/src/lib.rs
@@ -205,7 +205,6 @@ mod tests {
 				&i,
 				&parent_hash,
 				&Default::default(),
-				&Default::default(),
 				frame_system::InitKind::Full,
 			);
 			CollectiveFlip::on_initialize(i);
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index c5586f985668..4bcab6e6c0ed 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -107,7 +107,7 @@ use sp_runtime::{
 		self, CheckEqual, AtLeast32Bit, Zero, Lookup, LookupError,
 		SimpleBitOps, Hash, Member, MaybeDisplay, BadOrigin,
 		MaybeSerialize, MaybeSerializeDeserialize, MaybeMallocSizeOf, StaticLookup, One, Bounded,
-		Dispatchable, AtLeast32BitUnsigned
+		Dispatchable, AtLeast32BitUnsigned, Saturating,
 	},
 	offchain::storage_lock::BlockNumberProvider,
 };
@@ -405,9 +405,6 @@ decl_storage! {
 		/// Hash of the previous block.
 		ParentHash get(fn parent_hash) build(|_| hash69()): T::Hash;
 
-		/// Extrinsics root of the current block, also part of the block header.
-		ExtrinsicsRoot get(fn extrinsics_root): T::Hash;
-
 		/// Digest of the current block, also part of the block header.
 		Digest get(fn digest): DigestOf<T>;
 
@@ -989,7 +986,6 @@ impl<T: Config> Module<T> {
 	pub fn initialize(
 		number: &T::BlockNumber,
 		parent_hash: &T::Hash,
-		txs_root: &T::Hash,
 		digest: &DigestOf<T>,
 		kind: InitKind,
 	) {
@@ -1000,7 +996,6 @@ impl<T: Config> Module<T> {
 		<Digest<T>>::put(digest);
 		<ParentHash<T>>::put(parent_hash);
 		<BlockHash<T>>::insert(*number - One::one(), parent_hash);
-		<ExtrinsicsRoot<T>>::put(txs_root);
 
 		// Remove previous block data from storage
 		BlockWeight::kill();
@@ -1017,7 +1012,6 @@ impl<T: Config> Module<T> {
 	/// resulting header for this block.
 	pub fn finalize() -> T::Header {
 		ExecutionPhase::kill();
-		ExtrinsicCount::kill();
 		AllExtrinsicsLen::kill();
 
 		// The following fields
@@ -1034,17 +1028,18 @@ impl<T: Config> Module<T> {
 		let parent_hash = <ParentHash<T>>::get();
 		let mut digest = <Digest<T>>::get();
 
-		let extrinsics_root = <ExtrinsicsRoot<T>>::take();
+		let extrinsics = (0..ExtrinsicCount::take().unwrap_or_default())
+			.map(ExtrinsicData::take)
+			.collect();
+		let extrinsics_root = extrinsics_data_root::<T::Hashing>(extrinsics);
 
 		// move block hash pruning window by one block
-		let block_hash_count = <T::BlockHashCount>::get();
-		if number > block_hash_count {
-			let to_remove = number - block_hash_count - One::one();
+		let block_hash_count = T::BlockHashCount::get();
+		let to_remove = number.saturating_sub(block_hash_count).saturating_sub(One::one());
 
-			// keep genesis hash
-			if to_remove != Zero::zero() {
-				<BlockHash<T>>::remove(to_remove);
-			}
+		// keep genesis hash
+		if !to_remove.is_zero() {
+			<BlockHash<T>>::remove(to_remove);
 		}
 
 		let storage_root = T::Hash::decode(&mut &sp_io::storage::root()[..])
@@ -1138,12 +1133,10 @@ impl<T: Config> Module<T> {
 		Account::<T>::mutate(who, |a| a.nonce += T::Index::one());
 	}
 
-	/// Note what the extrinsic data of the current extrinsic index is. If this
-	/// is called, then ensure `derive_extrinsics` is also called before
-	/// block-building is completed.
+	/// Note what the extrinsic data of the current extrinsic index is.
 	///
-	/// NOTE: This function is called only when the block is being constructed locally.
-	/// `execute_block` doesn't note any extrinsics.
+	/// This is required to be called before applying an extrinsic. The data will used
+	/// in [`Self::finalize`] to calculate the correct extrinsics root.
 	pub fn note_extrinsic(encoded_xt: Vec<u8>) {
 		ExtrinsicData::insert(Self::extrinsic_index().unwrap_or_default(), encoded_xt);
 	}
@@ -1182,14 +1175,6 @@ impl<T: Config> Module<T> {
 		ExecutionPhase::put(Phase::ApplyExtrinsic(0))
 	}
 
-	/// Remove all extrinsic data and save the extrinsics trie root.
-	pub fn derive_extrinsics() {
-		let extrinsics = (0..ExtrinsicCount::get().unwrap_or_default())
-			.map(ExtrinsicData::take).collect();
-		let xts_root = extrinsics_data_root::<T::Hashing>(extrinsics);
-		<ExtrinsicsRoot<T>>::put(xts_root);
-	}
-
 	/// An account is being created.
 	pub fn on_created_account(who: T::AccountId) {
 		T::OnNewAccount::on_new_account(&who);
diff --git a/frame/system/src/tests.rs b/frame/system/src/tests.rs
index 55286d951cc2..58cb0b95e5e2 100644
--- a/frame/system/src/tests.rs
+++ b/frame/system/src/tests.rs
@@ -18,7 +18,7 @@
 use crate::*;
 use mock::{*, Origin};
 use sp_core::H256;
-use sp_runtime::DispatchError;
+use sp_runtime::{DispatchError, traits::{Header, BlakeTwo256}};
 use frame_support::weights::WithPostDispatchInfo;
 
 #[test]
@@ -55,7 +55,6 @@ fn deposit_event_should_work() {
 		System::initialize(
 			&1,
 			&[0u8; 32].into(),
-			&[0u8; 32].into(),
 			&Default::default(),
 			InitKind::Full,
 		);
@@ -76,7 +75,6 @@ fn deposit_event_should_work() {
 		System::initialize(
 			&2,
 			&[0u8; 32].into(),
-			&[0u8; 32].into(),
 			&Default::default(),
 			InitKind::Full,
 		);
@@ -133,7 +131,6 @@ fn deposit_event_uses_actual_weight() {
 		System::initialize(
 			&1,
 			&[0u8; 32].into(),
-			&[0u8; 32].into(),
 			&Default::default(),
 			InitKind::Full,
 		);
@@ -218,7 +215,6 @@ fn deposit_event_topics() {
 		System::initialize(
 			&BLOCK_NUMBER,
 			&[0u8; 32].into(),
-			&[0u8; 32].into(),
 			&Default::default(),
 			InitKind::Full,
 		);
@@ -284,7 +280,6 @@ fn prunes_block_hash_mappings() {
 			System::initialize(
 				&n,
 				&[n as u8 - 1; 32].into(),
-				&[0u8; 32].into(),
 				&Default::default(),
 				InitKind::Full,
 			);
@@ -422,3 +417,28 @@ fn ensure_one_of_works() {
 	assert_eq!(ensure_root_or_signed(RawOrigin::Signed(0)).unwrap(), Either::Right(0));
 	assert!(ensure_root_or_signed(RawOrigin::None).is_err())
 }
+
+#[test]
+fn extrinsics_root_is_calculated_correctly() {
+	new_test_ext().execute_with(|| {
+		System::initialize(
+			&1,
+			&[0u8; 32].into(),
+			&Default::default(),
+			InitKind::Full,
+		);
+		System::note_finished_initialize();
+		System::note_extrinsic(vec![1]);
+		System::note_applied_extrinsic(&Ok(().into()), Default::default());
+		System::note_extrinsic(vec![2]);
+		System::note_applied_extrinsic(
+			&Err(DispatchError::BadOrigin.into()),
+			Default::default()
+		);
+		System::note_finished_extrinsics();
+		let header = System::finalize();
+
+		let ext_root = extrinsics_data_root::<BlakeTwo256>(vec![vec![1], vec![2]]);
+		assert_eq!(ext_root, *header.extrinsics_root());
+	});
+}

From 5c70d7bb2b78d4ed5e3aa4fd0449cc6c81d3db98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bruno=20=C5=A0kvorc?= <bruno@skvorc.me>
Date: Mon, 21 Dec 2020 20:52:57 +0100
Subject: [PATCH 0197/1194] Typo fix: eror => error (#7773)

---
 primitives/database/src/kvdb.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/primitives/database/src/kvdb.rs b/primitives/database/src/kvdb.rs
index f436979aaf4c..c48bd9c610f0 100644
--- a/primitives/database/src/kvdb.rs
+++ b/primitives/database/src/kvdb.rs
@@ -27,7 +27,7 @@ fn handle_err<T>(result: std::io::Result<T>) -> T {
 	match result {
 		Ok(r) => r,
 		Err(e) =>  {
-			panic!("Critical database eror: {:?}", e);
+			panic!("Critical database error: {:?}", e);
 		}
 	}
 }

From 37a7727353f9bac1258acf59cd81688354c9120d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 22 Dec 2020 15:41:49 +0100
Subject: [PATCH 0198/1194] Adds `try_get` for `StorageMap` and
 `StorageDoubleMap` (#7774)

* Adds `try_get` for `StorageMap` and `StorageDoubleMap`

* Switch to Value as return type
---
 .../src/storage/generator/double_map.rs       |  7 +++++
 frame/support/src/storage/generator/map.rs    |  4 +++
 frame/support/src/storage/mod.rs              | 31 +++++++++++++------
 frame/support/src/storage/types/double_map.rs | 12 +++++++
 frame/support/src/storage/types/map.rs        |  9 ++++++
 5 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/frame/support/src/storage/generator/double_map.rs b/frame/support/src/storage/generator/double_map.rs
index 6fb3abca5ca7..d8891a5ee677 100644
--- a/frame/support/src/storage/generator/double_map.rs
+++ b/frame/support/src/storage/generator/double_map.rs
@@ -153,6 +153,13 @@ impl<K1, K2, V, G> storage::StorageDoubleMap<K1, K2, V> for G where
 		G::from_optional_value_to_query(unhashed::get(&Self::storage_double_map_final_key(k1, k2)))
 	}
 
+	fn try_get<KArg1, KArg2>(k1: KArg1, k2: KArg2) -> Result<V, ()>
+	where
+		KArg1: EncodeLike<K1>,
+		KArg2: EncodeLike<K2> {
+		unhashed::get(&Self::storage_double_map_final_key(k1, k2)).ok_or(())
+	}
+
 	fn take<KArg1, KArg2>(k1: KArg1, k2: KArg2) -> Self::Query where
 		KArg1: EncodeLike<K1>,
 		KArg2: EncodeLike<K2>,
diff --git a/frame/support/src/storage/generator/map.rs b/frame/support/src/storage/generator/map.rs
index 2c2390865d02..11d895577f63 100644
--- a/frame/support/src/storage/generator/map.rs
+++ b/frame/support/src/storage/generator/map.rs
@@ -226,6 +226,10 @@ impl<K: FullEncode, V: FullCodec, G: StorageMap<K, V>> storage::StorageMap<K, V>
 		G::from_optional_value_to_query(unhashed::get(Self::storage_map_final_key(key).as_ref()))
 	}
 
+	fn try_get<KeyArg: EncodeLike<K>>(key: KeyArg) -> Result<V, ()> {
+		unhashed::get(Self::storage_map_final_key(key).as_ref()).ok_or(())
+	}
+
 	fn insert<KeyArg: EncodeLike<K>, ValArg: EncodeLike<V>>(key: KeyArg, val: ValArg) {
 		unhashed::put(Self::storage_map_final_key(key).as_ref(), &val)
 	}
diff --git a/frame/support/src/storage/mod.rs b/frame/support/src/storage/mod.rs
index 302f176ef4a8..61ba147b0919 100644
--- a/frame/support/src/storage/mod.rs
+++ b/frame/support/src/storage/mod.rs
@@ -107,8 +107,7 @@ pub fn with_transaction<R>(f: impl FnOnce() -> TransactionOutcome<R>) -> R {
 
 /// A trait for working with macro-generated storage values under the substrate storage API.
 ///
-/// Details on implementation can be found at
-/// [`generator::StorageValue`]
+/// Details on implementation can be found at [`generator::StorageValue`].
 pub trait StorageValue<T: FullCodec> {
 	/// The type that get/take return.
 	type Query;
@@ -122,8 +121,9 @@ pub trait StorageValue<T: FullCodec> {
 	/// Load the value from the provided storage instance.
 	fn get() -> Self::Query;
 
-	/// Try to get the underlying value from the provided storage instance; `Ok` if it exists,
-	/// `Err` if not.
+	/// Try to get the underlying value from the provided storage instance.
+	///
+	/// Returns `Ok` if it exists, `Err` if not.
 	fn try_get() -> Result<T, ()>;
 
 	/// Translate a value from some previous type (`O`) to the current type.
@@ -200,8 +200,7 @@ pub trait StorageValue<T: FullCodec> {
 
 /// A strongly-typed map in storage.
 ///
-/// Details on implementation can be found at
-/// [`generator::StorageMap`]
+/// Details on implementation can be found at [`generator::StorageMap`].
 pub trait StorageMap<K: FullEncode, V: FullCodec> {
 	/// The type that get/take return.
 	type Query;
@@ -215,6 +214,11 @@ pub trait StorageMap<K: FullEncode, V: FullCodec> {
 	/// Load the value associated with the given key from the map.
 	fn get<KeyArg: EncodeLike<K>>(key: KeyArg) -> Self::Query;
 
+	/// Try to get the value for the given key from the map.
+	///
+	/// Returns `Ok` if it exists, `Err` if not.
+	fn try_get<KeyArg: EncodeLike<K>>(key: KeyArg) -> Result<V, ()>;
+
 	/// Swap the values of two keys.
 	fn swap<KeyArg1: EncodeLike<K>, KeyArg2: EncodeLike<K>>(key1: KeyArg1, key2: KeyArg2);
 
@@ -233,7 +237,9 @@ pub trait StorageMap<K: FullEncode, V: FullCodec> {
 		f: F,
 	) -> Result<R, E>;
 
-	/// Mutate the value under a key. Deletes the item if mutated to a `None`.
+	/// Mutate the value under a key.
+	///
+	/// Deletes the item if mutated to a `None`.
 	fn mutate_exists<KeyArg: EncodeLike<K>, R, F: FnOnce(&mut Option<V>) -> R>(key: KeyArg, f: F) -> R;
 
 	/// Mutate the item, only if an `Ok` value is returned. Deletes the item if mutated to a `None`.
@@ -354,8 +360,7 @@ pub trait IterableStorageDoubleMap<
 /// It provides an important ability to efficiently remove all entries
 /// that have a common first key.
 ///
-/// Details on implementation can be found at
-/// [`generator::StorageDoubleMap`]
+/// Details on implementation can be found at [`generator::StorageDoubleMap`].
 pub trait StorageDoubleMap<K1: FullEncode, K2: FullEncode, V: FullCodec> {
 	/// The type that get/take returns.
 	type Query;
@@ -378,6 +383,14 @@ pub trait StorageDoubleMap<K1: FullEncode, K2: FullEncode, V: FullCodec> {
 		KArg1: EncodeLike<K1>,
 		KArg2: EncodeLike<K2>;
 
+	/// Try to get the value for the given key from the double map.
+	///
+	/// Returns `Ok` if it exists, `Err` if not.
+	fn try_get<KArg1, KArg2>(k1: KArg1, k2: KArg2) -> Result<V, ()>
+	where
+		KArg1: EncodeLike<K1>,
+		KArg2: EncodeLike<K2>;
+
 	/// Take a value from storage, removing it afterwards.
 	fn take<KArg1, KArg2>(k1: KArg1, k2: KArg2) -> Self::Query
 	where
diff --git a/frame/support/src/storage/types/double_map.rs b/frame/support/src/storage/types/double_map.rs
index 3e37c0522e32..1133dbd84d9c 100644
--- a/frame/support/src/storage/types/double_map.rs
+++ b/frame/support/src/storage/types/double_map.rs
@@ -141,6 +141,16 @@ where
 		<Self as crate::storage::StorageDoubleMap<Key1, Key2, Value>>::get(k1, k2)
 	}
 
+	/// Try to get the value for the given key from the double map.
+	///
+	/// Returns `Ok` if it exists, `Err` if not.
+	pub fn try_get<KArg1, KArg2>(k1: KArg1, k2: KArg2) -> Result<Value, ()>
+	where
+		KArg1: EncodeLike<Key1>,
+		KArg2: EncodeLike<Key2> {
+		<Self as crate::storage::StorageDoubleMap<Key1, Key2, Value>>::try_get(k1, k2)
+	}
+
 	/// Take a value from storage, removing it afterwards.
 	pub fn take<KArg1, KArg2>(k1: KArg1, k2: KArg2) -> QueryKind::Query
 	where
@@ -514,6 +524,7 @@ mod test {
 			});
 			assert_eq!(A::contains_key(2, 20), true);
 			assert_eq!(A::get(2, 20), Some(100));
+			assert_eq!(A::try_get(2, 20), Ok(100));
 			let _: Result<(), ()> = AValueQueryWithAnOnEmpty::try_mutate_exists(2, 20, |v| {
 				*v = Some(v.unwrap() * 10);
 				Err(())
@@ -527,6 +538,7 @@ mod test {
 			assert_eq!(A::contains_key(2, 20), false);
 			assert_eq!(AValueQueryWithAnOnEmpty::take(2, 20), 97);
 			assert_eq!(A::contains_key(2, 20), false);
+			assert_eq!(A::try_get(2, 20), Err(()));
 
 			B::insert(2, 20, 10);
 			assert_eq!(A::migrate_keys::<Blake2_256, Twox128, _, _>(2, 20), Some(10));
diff --git a/frame/support/src/storage/types/map.rs b/frame/support/src/storage/types/map.rs
index 64f9ff4b052a..8fe11488b115 100644
--- a/frame/support/src/storage/types/map.rs
+++ b/frame/support/src/storage/types/map.rs
@@ -116,6 +116,13 @@ where
 		<Self as crate::storage::StorageMap<Key, Value>>::get(key)
 	}
 
+	/// Try to get the value for the given key from the map.
+	///
+	/// Returns `Ok` if it exists, `Err` if not.
+	pub fn try_get<KeyArg: EncodeLike<Key>>(key: KeyArg) -> Result<Value, ()> {
+		<Self as crate::storage::StorageMap<Key, Value>>::try_get(key)
+	}
+
 	/// Swap the values of two keys.
 	pub fn swap<KeyArg1: EncodeLike<Key>, KeyArg2: EncodeLike<Key>>(key1: KeyArg1, key2: KeyArg2) {
 		<Self as crate::storage::StorageMap<Key, Value>>::swap(key1, key2)
@@ -352,12 +359,14 @@ mod test {
 			A::insert(3, 10);
 			assert_eq!(A::contains_key(3), true);
 			assert_eq!(A::get(3), Some(10));
+			assert_eq!(A::try_get(3), Ok(10));
 			assert_eq!(AValueQueryWithAnOnEmpty::get(3), 10);
 
 			A::swap(3, 2);
 			assert_eq!(A::contains_key(3), false);
 			assert_eq!(A::contains_key(2), true);
 			assert_eq!(A::get(3), None);
+			assert_eq!(A::try_get(3), Err(()));
 			assert_eq!(AValueQueryWithAnOnEmpty::get(3), 97);
 			assert_eq!(A::get(2), Some(10));
 			assert_eq!(AValueQueryWithAnOnEmpty::get(2), 10);

From 60225756fd391491f8d8b507d76d705ba8ecd159 Mon Sep 17 00:00:00 2001
From: Daniel Olano <me@olanod.com>
Date: Wed, 23 Dec 2020 22:11:32 +0100
Subject: [PATCH 0199/1194] Add account prefix for Valiu (#7776)

---
 primitives/core/src/crypto.rs | 2 ++
 ss58-registry.json            | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index f2101a671242..5a7136b83683 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -502,6 +502,8 @@ ss58_address_format!(
 		(32, "robonomics", "Any Robonomics network standard account (*25519).")
 	DataHighwayAccount =>
 		(33, "datahighway", "DataHighway mainnet, standard account (*25519).")
+	ValiuAccount =>
+		(35, "vln", "Valiu Liquidity Network mainnet, standard account (*25519).")
 	CentrifugeAccount =>
 		(36, "centrifuge", "Centrifuge Chain mainnet, standard account (*25519).")
 	NodleAccount =>
diff --git a/ss58-registry.json b/ss58-registry.json
index 5c90856505a6..30069ab21710 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -280,6 +280,15 @@
 			"standardAccount": "*25519",
 			"website": null
 		},
+		{
+			"prefix": 35,
+			"network": "vln",
+			"displayName": "Valiu Liquidity Network",
+			"symbols": ["USDv"],
+			"decimals": [15],
+			"standardAccount": "*25519",
+			"website": "https://valiu.com/"
+		},
 		{
 			"prefix": 36,
 			"network": "centrifuge",

From 3c5bfc05f9299da6da50dd36b701679d5172bdbe Mon Sep 17 00:00:00 2001
From: honeywest <50997103+honeywest@users.noreply.github.com>
Date: Thu, 24 Dec 2020 05:52:52 +0800
Subject: [PATCH 0200/1194] Feat support weight test (#7769)

* update support weights_are_correct

* add support polynomial_does_not_underflow
---
 frame/support/src/weights.rs | 37 +++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/frame/support/src/weights.rs b/frame/support/src/weights.rs
index d4dda427ef1c..fc0d7854a7db 100644
--- a/frame/support/src/weights.rs
+++ b/frame/support/src/weights.rs
@@ -866,7 +866,7 @@ mod tests {
 			fn f12(_origin, _a: u32, _eb: u32) { unimplemented!(); }
 
 			#[weight = T::DbWeight::get().reads(3) + T::DbWeight::get().writes(2) + 10_000]
-			fn f2(_origin) { unimplemented!(); }
+			fn f20(_origin) { unimplemented!(); }
 
 			#[weight = T::DbWeight::get().reads_writes(6, 5) + 40_000]
 			fn f21(_origin) { unimplemented!(); }
@@ -900,13 +900,29 @@ mod tests {
 		assert_eq!(info.class, DispatchClass::Operational);
 		assert_eq!(info.pays_fee, Pays::No);
 
-		assert_eq!(Call::<TraitImpl>::f11(10, 20).get_dispatch_info().weight, 120);
-		assert_eq!(Call::<TraitImpl>::f11(10, 20).get_dispatch_info().class, DispatchClass::Normal);
-		assert_eq!(Call::<TraitImpl>::f12(10, 20).get_dispatch_info().weight, 0);
-		assert_eq!(Call::<TraitImpl>::f12(10, 20).get_dispatch_info().class, DispatchClass::Operational);
-		assert_eq!(Call::<TraitImpl>::f2().get_dispatch_info().weight, 12300);
-		assert_eq!(Call::<TraitImpl>::f21().get_dispatch_info().weight, 45600);
-		assert_eq!(Call::<TraitImpl>::f2().get_dispatch_info().class, DispatchClass::Normal);
+		// #[weight = ((_a * 10 + _eb * 1) as Weight, DispatchClass::Normal, Pays::Yes)]
+		let info = Call::<TraitImpl>::f11(13, 20).get_dispatch_info();
+		assert_eq!(info.weight, 150); // 13*10 + 20
+		assert_eq!(info.class, DispatchClass::Normal);
+		assert_eq!(info.pays_fee, Pays::Yes);
+
+		// #[weight = (0, DispatchClass::Operational, Pays::Yes)]
+		let info = Call::<TraitImpl>::f12(10, 20).get_dispatch_info();
+		assert_eq!(info.weight, 0);
+		assert_eq!(info.class, DispatchClass::Operational);
+		assert_eq!(info.pays_fee, Pays::Yes);
+
+		// #[weight = T::DbWeight::get().reads(3) + T::DbWeight::get().writes(2) + 10_000]
+		let info = Call::<TraitImpl>::f20().get_dispatch_info();
+		assert_eq!(info.weight, 12300); // 100*3 + 1000*2 + 10_1000
+		assert_eq!(info.class, DispatchClass::Normal);
+		assert_eq!(info.pays_fee, Pays::Yes);
+
+		// #[weight = T::DbWeight::get().reads_writes(6, 5) + 40_000]
+		let info = Call::<TraitImpl>::f21().get_dispatch_info();
+		assert_eq!(info.weight, 45600); // 100*6 + 1000*5 + 40_1000
+		assert_eq!(info.class, DispatchClass::Normal);
+		assert_eq!(info.pays_fee, Pays::Yes);
 	}
 
 	#[test]
@@ -938,7 +954,7 @@ mod tests {
 
 	type Balance = u64;
 
-	// 0.5x^3 + 2.333x2 + 7x - 10_000
+	// 0.5x^3 + 2.333x^2 + 7x - 10_000
 	struct Poly;
 	impl WeightToFeePolynomial for Poly {
 		type Balance = Balance;
@@ -975,13 +991,16 @@ mod tests {
 
 	#[test]
 	fn polynomial_works() {
+		// 100^3/2=500000 100^2*(2+1/3)=23333 700 -10000
 		assert_eq!(Poly::calc(&100), 514033);
+		// 10123^3/2=518677865433 10123^2*(2+1/3)=239108634 70861 -10000
 		assert_eq!(Poly::calc(&10_123), 518917034928);
 	}
 
 	#[test]
 	fn polynomial_does_not_underflow() {
 		assert_eq!(Poly::calc(&0), 0);
+		assert_eq!(Poly::calc(&10), 0);
 	}
 
 	#[test]

From 0d6953ccc3e960f86a059578feef3469f25b81c0 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Thu, 24 Dec 2020 12:33:40 +0100
Subject: [PATCH 0201/1194] Add `pallet` attribute macro to declare pallets
 (#6877)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* rename system Config to system Trait.

command used:
```
find frame/ bin/ test-utils/ utils/ -name *.rs -exec sed -i 's/system::Trait>::/system::Config>::/g' {} \;
find frame/ bin/ test-utils/ utils/ -name *.rs -exec sed -i 's/impl frame_system::Trait for /impl frame_system::Config for /g' {} \;
find frame/ bin/ test-utils/ utils/ -name *.rs -exec sed -i 's/impl system::Trait for /impl system::Config for /g' {} \;
```
plus some manual ones especially for frame-support tests and frame-system

* make construct_runtime handle Pallet and Module

pallets can now be implemented on struct named Pallet or Module, both
definition are valid.
This is because next macro will generate only Pallet placeholder.

* introduce pallet attribute macro

currently just with tests, frame_system and other example hasn't been
upgraded

* allow to print some upgrade helper from decl_storage

* Improved error msg, typo.

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Improved error msg, typo.

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Improved error message on unexpected attributes + ui test

* add test for transactional

* various typo

* some tips when spans are lost

* allow pallet to depend on other pallet instances

* make event type metadata consistent with call and constant

* error messages

* ignore doc example

* fix pallet upgrade template

* fixup

* fix doc

* fix indentation

* Apply suggestions code formatting

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* some renames + fix compilation

* remove unsupported genesis config type alias

* merge fixup

* fix ui tests

* additional doc

* implement StorageInstance with new syntax

* fix line width

* fix doc: because pallet doc goes below reexport doc

* Update frame/support/procedural/src/pallet/parse/event.rs

Co-authored-by: Andrew Jones <ascjones@gmail.com>

* Update frame/system/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update frame/support/test/tests/pallet_ui.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* improve doc as suggested

* revert construct_runtime Pallet part.

This revert the changes on construct_runtime. Now construct_runtime is
unchanged and instead pallet macro create a type alias
`type Module<..> = Pallet<..>` to be used by construct_runtime

* refactor with less intricated code

* fix ui test with new image

* fix ui tests

* add minor tests

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Co-authored-by: Andrew Jones <ascjones@gmail.com>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 frame/support/procedural/src/lib.rs           |    8 +
 .../procedural/src/pallet/expand/call.rs      |  201 ++++
 .../procedural/src/pallet/expand/constants.rs |  138 +++
 .../procedural/src/pallet/expand/error.rs     |  141 +++
 .../procedural/src/pallet/expand/event.rs     |  143 +++
 .../src/pallet/expand/genesis_build.rs        |   72 ++
 .../src/pallet/expand/genesis_config.rs       |   49 +
 .../procedural/src/pallet/expand/hooks.rs     |  110 ++
 .../procedural/src/pallet/expand/instances.rs |   40 +
 .../procedural/src/pallet/expand/mod.rs       |   81 ++
 .../src/pallet/expand/pallet_struct.rs        |  117 ++
 .../procedural/src/pallet/expand/storage.rs   |  267 +++++
 .../src/pallet/expand/store_trait.rs          |   55 +
 .../src/pallet/expand/type_value.rs           |   55 +
 frame/support/procedural/src/pallet/mod.rs    |   50 +
 .../procedural/src/pallet/parse/call.rs       |  235 ++++
 .../procedural/src/pallet/parse/config.rs     |  384 +++++++
 .../procedural/src/pallet/parse/error.rs      |   86 ++
 .../procedural/src/pallet/parse/event.rs      |  220 ++++
 .../src/pallet/parse/extra_constants.rs       |  121 ++
 .../src/pallet/parse/genesis_build.rs         |   56 +
 .../src/pallet/parse/genesis_config.rs        |   78 ++
 .../procedural/src/pallet/parse/helper.rs     |  600 ++++++++++
 .../procedural/src/pallet/parse/hooks.rs      |   69 ++
 .../procedural/src/pallet/parse/inherent.rs   |   59 +
 .../procedural/src/pallet/parse/mod.rs        |  461 ++++++++
 .../procedural/src/pallet/parse/origin.rs     |   80 ++
 .../src/pallet/parse/pallet_struct.rs         |   99 ++
 .../procedural/src/pallet/parse/storage.rs    |  221 ++++
 .../procedural/src/pallet/parse/type_value.rs |  101 ++
 .../src/pallet/parse/validate_unsigned.rs     |   61 +
 .../support/procedural/src/pallet_version.rs  |    2 +-
 .../src/storage/genesis_config/mod.rs         |    4 +-
 frame/support/procedural/src/storage/mod.rs   |    5 +
 .../src/storage/print_pallet_upgrade.rs       |  387 +++++++
 frame/support/procedural/src/transactional.rs |    4 +-
 frame/support/procedural/tools/src/lib.rs     |   16 +-
 frame/support/src/instances.rs                |   96 ++
 frame/support/src/lib.rs                      | 1005 ++++++++++++++++-
 frame/support/src/traits.rs                   |   73 ++
 frame/support/test/tests/pallet.rs            |  764 +++++++++++++
 .../test/tests/pallet_compatibility.rs        |  298 +++++
 .../tests/pallet_compatibility_instance.rs    |  315 ++++++
 frame/support/test/tests/pallet_instance.rs   |  708 ++++++++++++
 frame/support/test/tests/pallet_ui.rs         |   26 +
 .../test/tests/pallet_ui/attr_non_empty.rs    |    6 +
 .../tests/pallet_ui/attr_non_empty.stderr     |    5 +
 .../pallet_ui/call_argument_invalid_bound.rs  |   27 +
 .../call_argument_invalid_bound.stderr        |   28 +
 .../call_argument_invalid_bound_2.rs          |   27 +
 .../call_argument_invalid_bound_2.stderr      |   11 +
 .../call_argument_invalid_bound_3.rs          |   29 +
 .../call_argument_invalid_bound_3.stderr      |   26 +
 .../tests/pallet_ui/call_invalid_const.rs     |   22 +
 .../tests/pallet_ui/call_invalid_const.stderr |    5 +
 .../pallet_ui/call_invalid_origin_type.rs     |   22 +
 .../pallet_ui/call_invalid_origin_type.stderr |   11 +
 .../tests/pallet_ui/call_missing_weight.rs    |   22 +
 .../pallet_ui/call_missing_weight.stderr      |    5 +
 .../test/tests/pallet_ui/call_no_origin.rs    |   22 +
 .../tests/pallet_ui/call_no_origin.stderr     |    5 +
 .../test/tests/pallet_ui/call_no_return.rs    |   22 +
 .../tests/pallet_ui/call_no_return.stderr     |    5 +
 .../tests/pallet_ui/duplicate_call_attr.rs    |   28 +
 .../pallet_ui/duplicate_call_attr.stderr      |    5 +
 .../tests/pallet_ui/duplicate_store_attr.rs   |   26 +
 .../pallet_ui/duplicate_store_attr.stderr     |    5 +
 .../tests/pallet_ui/error_no_fieldless.rs     |   25 +
 .../tests/pallet_ui/error_no_fieldless.stderr |    5 +
 .../test/tests/pallet_ui/error_wrong_item.rs  |   23 +
 .../tests/pallet_ui/error_wrong_item.stderr   |    5 +
 .../tests/pallet_ui/error_wrong_item_name.rs  |   23 +
 .../pallet_ui/error_wrong_item_name.stderr    |    5 +
 .../tests/pallet_ui/event_field_not_member.rs |   28 +
 .../pallet_ui/event_field_not_member.stderr   |   28 +
 .../tests/pallet_ui/event_not_in_trait.rs     |   27 +
 .../tests/pallet_ui/event_not_in_trait.stderr |    7 +
 .../pallet_ui/event_type_invalid_bound.rs     |   28 +
 .../pallet_ui/event_type_invalid_bound.stderr |    5 +
 .../pallet_ui/event_type_invalid_bound_2.rs   |   28 +
 .../event_type_invalid_bound_2.stderr         |    5 +
 .../test/tests/pallet_ui/event_wrong_item.rs  |   23 +
 .../tests/pallet_ui/event_wrong_item.stderr   |    5 +
 .../tests/pallet_ui/event_wrong_item_name.rs  |   23 +
 .../pallet_ui/event_wrong_item_name.stderr    |    5 +
 .../genesis_default_not_satisfied.rs          |   26 +
 .../genesis_default_not_satisfied.stderr      |   10 +
 .../genesis_inconsistent_build_config.rs      |   23 +
 .../genesis_inconsistent_build_config.stderr  |    5 +
 .../pallet_ui/genesis_invalid_generic.rs      |   23 +
 .../pallet_ui/genesis_invalid_generic.stderr  |   13 +
 .../tests/pallet_ui/genesis_wrong_name.rs     |   23 +
 .../tests/pallet_ui/genesis_wrong_name.stderr |    5 +
 .../tests/pallet_ui/hooks_invalid_item.rs     |   19 +
 .../tests/pallet_ui/hooks_invalid_item.stderr |    5 +
 .../pallet_ui/inconsistent_instance_1.rs      |   20 +
 .../pallet_ui/inconsistent_instance_1.stderr  |   29 +
 .../pallet_ui/inconsistent_instance_2.rs      |   20 +
 .../pallet_ui/inconsistent_instance_2.stderr  |   29 +
 .../pallet_ui/inherent_check_inner_span.rs    |   23 +
 .../inherent_check_inner_span.stderr          |   10 +
 .../tests/pallet_ui/inherent_invalid_item.rs  |   23 +
 .../pallet_ui/inherent_invalid_item.stderr    |    5 +
 .../test/tests/pallet_ui/mod_not_inlined.rs   |    5 +
 .../tests/pallet_ui/mod_not_inlined.stderr    |   13 +
 .../pallet_ui/storage_incomplete_item.rs      |   23 +
 .../pallet_ui/storage_incomplete_item.stderr  |   13 +
 .../storage_invalid_first_generic.rs          |   23 +
 .../storage_invalid_first_generic.stderr      |   11 +
 .../pallet_ui/storage_not_storage_type.rs     |   23 +
 .../pallet_ui/storage_not_storage_type.stderr |    5 +
 .../pallet_ui/storage_value_no_generic.rs     |   23 +
 .../pallet_ui/storage_value_no_generic.stderr |    5 +
 .../tests/pallet_ui/storage_wrong_item.rs     |   23 +
 .../tests/pallet_ui/storage_wrong_item.stderr |    5 +
 .../pallet_ui/store_trait_leak_private.rs     |   25 +
 .../pallet_ui/store_trait_leak_private.stderr |    8 +
 .../pallet_ui/trait_constant_invalid_bound.rs |   23 +
 .../trait_constant_invalid_bound.stderr       |   11 +
 .../tests/pallet_ui/trait_invalid_item.rs     |   23 +
 .../tests/pallet_ui/trait_invalid_item.stderr |    5 +
 .../tests/pallet_ui/trait_no_supertrait.rs    |   21 +
 .../pallet_ui/trait_no_supertrait.stderr      |    5 +
 .../pallet_ui/type_value_error_in_block.rs    |   25 +
 .../type_value_error_in_block.stderr          |    5 +
 .../pallet_ui/type_value_invalid_item.rs      |   22 +
 .../pallet_ui/type_value_invalid_item.stderr  |    5 +
 .../tests/pallet_ui/type_value_no_return.rs   |   22 +
 .../pallet_ui/type_value_no_return.stderr     |    5 +
 frame/support/test/tests/pallet_version.rs    |  111 +-
 frame/system/src/lib.rs                       |   17 +
 131 files changed, 9609 insertions(+), 30 deletions(-)
 create mode 100644 frame/support/procedural/src/pallet/expand/call.rs
 create mode 100644 frame/support/procedural/src/pallet/expand/constants.rs
 create mode 100644 frame/support/procedural/src/pallet/expand/error.rs
 create mode 100644 frame/support/procedural/src/pallet/expand/event.rs
 create mode 100644 frame/support/procedural/src/pallet/expand/genesis_build.rs
 create mode 100644 frame/support/procedural/src/pallet/expand/genesis_config.rs
 create mode 100644 frame/support/procedural/src/pallet/expand/hooks.rs
 create mode 100644 frame/support/procedural/src/pallet/expand/instances.rs
 create mode 100644 frame/support/procedural/src/pallet/expand/mod.rs
 create mode 100644 frame/support/procedural/src/pallet/expand/pallet_struct.rs
 create mode 100644 frame/support/procedural/src/pallet/expand/storage.rs
 create mode 100644 frame/support/procedural/src/pallet/expand/store_trait.rs
 create mode 100644 frame/support/procedural/src/pallet/expand/type_value.rs
 create mode 100644 frame/support/procedural/src/pallet/mod.rs
 create mode 100644 frame/support/procedural/src/pallet/parse/call.rs
 create mode 100644 frame/support/procedural/src/pallet/parse/config.rs
 create mode 100644 frame/support/procedural/src/pallet/parse/error.rs
 create mode 100644 frame/support/procedural/src/pallet/parse/event.rs
 create mode 100644 frame/support/procedural/src/pallet/parse/extra_constants.rs
 create mode 100644 frame/support/procedural/src/pallet/parse/genesis_build.rs
 create mode 100644 frame/support/procedural/src/pallet/parse/genesis_config.rs
 create mode 100644 frame/support/procedural/src/pallet/parse/helper.rs
 create mode 100644 frame/support/procedural/src/pallet/parse/hooks.rs
 create mode 100644 frame/support/procedural/src/pallet/parse/inherent.rs
 create mode 100644 frame/support/procedural/src/pallet/parse/mod.rs
 create mode 100644 frame/support/procedural/src/pallet/parse/origin.rs
 create mode 100644 frame/support/procedural/src/pallet/parse/pallet_struct.rs
 create mode 100644 frame/support/procedural/src/pallet/parse/storage.rs
 create mode 100644 frame/support/procedural/src/pallet/parse/type_value.rs
 create mode 100644 frame/support/procedural/src/pallet/parse/validate_unsigned.rs
 create mode 100644 frame/support/procedural/src/storage/print_pallet_upgrade.rs
 create mode 100644 frame/support/src/instances.rs
 create mode 100644 frame/support/test/tests/pallet.rs
 create mode 100644 frame/support/test/tests/pallet_compatibility.rs
 create mode 100644 frame/support/test/tests/pallet_compatibility_instance.rs
 create mode 100644 frame/support/test/tests/pallet_instance.rs
 create mode 100644 frame/support/test/tests/pallet_ui.rs
 create mode 100644 frame/support/test/tests/pallet_ui/attr_non_empty.rs
 create mode 100644 frame/support/test/tests/pallet_ui/attr_non_empty.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/call_argument_invalid_bound.rs
 create mode 100644 frame/support/test/tests/pallet_ui/call_argument_invalid_bound.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.rs
 create mode 100644 frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.rs
 create mode 100644 frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/call_invalid_const.rs
 create mode 100644 frame/support/test/tests/pallet_ui/call_invalid_const.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/call_invalid_origin_type.rs
 create mode 100644 frame/support/test/tests/pallet_ui/call_invalid_origin_type.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/call_missing_weight.rs
 create mode 100644 frame/support/test/tests/pallet_ui/call_missing_weight.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/call_no_origin.rs
 create mode 100644 frame/support/test/tests/pallet_ui/call_no_origin.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/call_no_return.rs
 create mode 100644 frame/support/test/tests/pallet_ui/call_no_return.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/duplicate_call_attr.rs
 create mode 100644 frame/support/test/tests/pallet_ui/duplicate_call_attr.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/duplicate_store_attr.rs
 create mode 100644 frame/support/test/tests/pallet_ui/duplicate_store_attr.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/error_no_fieldless.rs
 create mode 100644 frame/support/test/tests/pallet_ui/error_no_fieldless.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/error_wrong_item.rs
 create mode 100644 frame/support/test/tests/pallet_ui/error_wrong_item.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/error_wrong_item_name.rs
 create mode 100644 frame/support/test/tests/pallet_ui/error_wrong_item_name.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/event_field_not_member.rs
 create mode 100644 frame/support/test/tests/pallet_ui/event_field_not_member.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/event_not_in_trait.rs
 create mode 100644 frame/support/test/tests/pallet_ui/event_not_in_trait.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/event_type_invalid_bound.rs
 create mode 100644 frame/support/test/tests/pallet_ui/event_type_invalid_bound.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/event_type_invalid_bound_2.rs
 create mode 100644 frame/support/test/tests/pallet_ui/event_type_invalid_bound_2.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/event_wrong_item.rs
 create mode 100644 frame/support/test/tests/pallet_ui/event_wrong_item.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/event_wrong_item_name.rs
 create mode 100644 frame/support/test/tests/pallet_ui/event_wrong_item_name.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/genesis_default_not_satisfied.rs
 create mode 100644 frame/support/test/tests/pallet_ui/genesis_default_not_satisfied.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/genesis_inconsistent_build_config.rs
 create mode 100644 frame/support/test/tests/pallet_ui/genesis_inconsistent_build_config.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/genesis_invalid_generic.rs
 create mode 100644 frame/support/test/tests/pallet_ui/genesis_invalid_generic.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/genesis_wrong_name.rs
 create mode 100644 frame/support/test/tests/pallet_ui/genesis_wrong_name.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/hooks_invalid_item.rs
 create mode 100644 frame/support/test/tests/pallet_ui/hooks_invalid_item.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/inconsistent_instance_1.rs
 create mode 100644 frame/support/test/tests/pallet_ui/inconsistent_instance_1.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/inconsistent_instance_2.rs
 create mode 100644 frame/support/test/tests/pallet_ui/inconsistent_instance_2.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/inherent_check_inner_span.rs
 create mode 100644 frame/support/test/tests/pallet_ui/inherent_check_inner_span.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/inherent_invalid_item.rs
 create mode 100644 frame/support/test/tests/pallet_ui/inherent_invalid_item.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/mod_not_inlined.rs
 create mode 100644 frame/support/test/tests/pallet_ui/mod_not_inlined.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/storage_incomplete_item.rs
 create mode 100644 frame/support/test/tests/pallet_ui/storage_incomplete_item.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/storage_invalid_first_generic.rs
 create mode 100644 frame/support/test/tests/pallet_ui/storage_invalid_first_generic.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/storage_not_storage_type.rs
 create mode 100644 frame/support/test/tests/pallet_ui/storage_not_storage_type.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/storage_value_no_generic.rs
 create mode 100644 frame/support/test/tests/pallet_ui/storage_value_no_generic.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/storage_wrong_item.rs
 create mode 100644 frame/support/test/tests/pallet_ui/storage_wrong_item.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/store_trait_leak_private.rs
 create mode 100644 frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/trait_constant_invalid_bound.rs
 create mode 100644 frame/support/test/tests/pallet_ui/trait_constant_invalid_bound.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/trait_invalid_item.rs
 create mode 100644 frame/support/test/tests/pallet_ui/trait_invalid_item.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/trait_no_supertrait.rs
 create mode 100644 frame/support/test/tests/pallet_ui/trait_no_supertrait.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/type_value_error_in_block.rs
 create mode 100644 frame/support/test/tests/pallet_ui/type_value_error_in_block.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/type_value_invalid_item.rs
 create mode 100644 frame/support/test/tests/pallet_ui/type_value_invalid_item.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/type_value_no_return.rs
 create mode 100644 frame/support/test/tests/pallet_ui/type_value_no_return.stderr

diff --git a/frame/support/procedural/src/lib.rs b/frame/support/procedural/src/lib.rs
index 8d3d1ce59004..7adc646c339f 100644
--- a/frame/support/procedural/src/lib.rs
+++ b/frame/support/procedural/src/lib.rs
@@ -21,12 +21,14 @@
 
 mod storage;
 mod construct_runtime;
+mod pallet;
 mod pallet_version;
 mod transactional;
 mod debug_no_bound;
 mod clone_no_bound;
 mod partial_eq_no_bound;
 
+pub(crate) use storage::INHERENT_INSTANCE_NAME;
 use proc_macro::TokenStream;
 
 /// Declares strongly-typed wrappers around codec-compatible types in storage.
@@ -305,6 +307,12 @@ pub fn construct_runtime(input: TokenStream) -> TokenStream {
 	construct_runtime::construct_runtime(input)
 }
 
+/// Macro to define a pallet. Docs are at `frame_support::pallet`.
+#[proc_macro_attribute]
+pub fn pallet(attr: TokenStream, item: TokenStream) -> TokenStream {
+	pallet::pallet(attr, item)
+}
+
 /// Execute the annotated function in a new storage transaction.
 ///
 /// The return type of the annotated function must be `Result`. All changes to storage performed
diff --git a/frame/support/procedural/src/pallet/expand/call.rs b/frame/support/procedural/src/pallet/expand/call.rs
new file mode 100644
index 000000000000..56b8ecf99415
--- /dev/null
+++ b/frame/support/procedural/src/pallet/expand/call.rs
@@ -0,0 +1,201 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::pallet::Def;
+use frame_support_procedural_tools::clean_type_string;
+use syn::spanned::Spanned;
+
+/// * Generate enum call and implement various trait on it.
+/// * Implement Callable and call_function on `Pallet`
+pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
+	let frame_support = &def.frame_support;
+	let frame_system = &def.frame_system;
+	let type_impl_gen = &def.type_impl_generics();
+	let type_decl_bounded_gen = &def.type_decl_bounded_generics();
+	let type_use_gen = &def.type_use_generics();
+	let call_ident = syn::Ident::new("Call", def.call.attr_span.clone());
+	let pallet_ident = &def.pallet_struct.pallet;
+	let where_clause = &def.call.where_clause;
+
+	let fn_name = def.call.methods.iter().map(|method| &method.name).collect::<Vec<_>>();
+
+	let fn_weight = def.call.methods.iter().map(|method| &method.weight);
+
+	let fn_doc = def.call.methods.iter().map(|method| &method.docs).collect::<Vec<_>>();
+
+	let args_name = def.call.methods.iter()
+		.map(|method| method.args.iter().map(|(_, name, _)| name.clone()).collect::<Vec<_>>())
+		.collect::<Vec<_>>();
+
+	let args_type = def.call.methods.iter()
+		.map(|method| method.args.iter().map(|(_, _, type_)| type_.clone()).collect::<Vec<_>>())
+		.collect::<Vec<_>>();
+
+	let args_compact_attr = def.call.methods.iter().map(|method| {
+		method.args.iter()
+			.map(|(is_compact, _, type_)| {
+				if *is_compact {
+					quote::quote_spanned!(type_.span() => #[codec(compact)] )
+				} else {
+					quote::quote!()
+				}
+			})
+			.collect::<Vec<_>>()
+	});
+
+	let args_metadata_type = def.call.methods.iter().map(|method| {
+		method.args.iter()
+			.map(|(is_compact, _, type_)| {
+				let final_type = if *is_compact {
+					quote::quote!(Compact<#type_>)
+				} else {
+					quote::quote!(#type_)
+				};
+				clean_type_string(&final_type.to_string())
+			})
+			.collect::<Vec<_>>()
+	});
+
+	quote::quote_spanned!(def.call.attr_span =>
+		#[derive(
+			#frame_support::RuntimeDebugNoBound,
+			#frame_support::CloneNoBound,
+			#frame_support::EqNoBound,
+			#frame_support::PartialEqNoBound,
+			#frame_support::codec::Encode,
+			#frame_support::codec::Decode,
+		)]
+		#[allow(non_camel_case_types)]
+		pub enum #call_ident<#type_decl_bounded_gen> #where_clause {
+			#[doc(hidden)]
+			#[codec(skip)]
+			__Ignore(
+				#frame_support::sp_std::marker::PhantomData<(#type_use_gen,)>,
+				#frame_support::Never,
+			),
+			#( #fn_name( #( #args_compact_attr #args_type ),* ), )*
+		}
+
+		impl<#type_impl_gen> #frame_support::dispatch::GetDispatchInfo
+			for #call_ident<#type_use_gen>
+			#where_clause
+		{
+			fn get_dispatch_info(&self) -> #frame_support::dispatch::DispatchInfo {
+				match *self {
+					#(
+						Self::#fn_name ( #( ref #args_name, )* ) => {
+							let base_weight = #fn_weight;
+
+							let weight = <
+								dyn #frame_support::dispatch::WeighData<( #( & #args_type, )* )>
+							>::weigh_data(&base_weight, ( #( #args_name, )* ));
+
+							let class = <
+								dyn #frame_support::dispatch::ClassifyDispatch<
+									( #( & #args_type, )* )
+								>
+							>::classify_dispatch(&base_weight, ( #( #args_name, )* ));
+
+							let pays_fee = <
+								dyn #frame_support::dispatch::PaysFee<( #( & #args_type, )* )>
+							>::pays_fee(&base_weight, ( #( #args_name, )* ));
+
+							#frame_support::dispatch::DispatchInfo {
+								weight,
+								class,
+								pays_fee,
+							}
+						},
+					)*
+					Self::__Ignore(_, _) => unreachable!("__Ignore cannot be used"),
+				}
+			}
+		}
+
+		impl<#type_impl_gen> #frame_support::dispatch::GetCallName for #call_ident<#type_use_gen>
+			#where_clause
+		{
+			fn get_call_name(&self) -> &'static str {
+				match *self {
+					#( Self::#fn_name(..) => stringify!(#fn_name), )*
+					Self::__Ignore(_, _) => unreachable!("__PhantomItem cannot be used."),
+				}
+			}
+
+			fn get_call_names() -> &'static [&'static str] {
+				&[ #( stringify!(#fn_name), )* ]
+			}
+		}
+
+		impl<#type_impl_gen> #frame_support::traits::UnfilteredDispatchable
+			for #call_ident<#type_use_gen>
+			#where_clause
+		{
+			type Origin = #frame_system::pallet_prelude::OriginFor<T>;
+			fn dispatch_bypass_filter(
+				self,
+				origin: Self::Origin
+			) -> #frame_support::dispatch::DispatchResultWithPostInfo {
+				match self {
+					#(
+						Self::#fn_name( #( #args_name, )* ) =>
+							<#pallet_ident<#type_use_gen>>::#fn_name(origin, #( #args_name, )* )
+								.map(Into::into).map_err(Into::into),
+					)*
+					Self::__Ignore(_, _) => {
+						let _ = origin; // Use origin for empty Call enum
+						unreachable!("__PhantomItem cannot be used.");
+					},
+				}
+			}
+		}
+
+		impl<#type_impl_gen> #frame_support::dispatch::Callable<T> for #pallet_ident<#type_use_gen>
+			#where_clause
+		{
+			type Call = #call_ident<#type_use_gen>;
+		}
+
+		impl<#type_impl_gen> #pallet_ident<#type_use_gen> #where_clause {
+			#[doc(hidden)]
+			pub fn call_functions() -> &'static [#frame_support::dispatch::FunctionMetadata] {
+				&[ #(
+					#frame_support::dispatch::FunctionMetadata {
+						name: #frame_support::dispatch::DecodeDifferent::Encode(
+							stringify!(#fn_name)
+						),
+						arguments: #frame_support::dispatch::DecodeDifferent::Encode(
+							&[ #(
+								#frame_support::dispatch::FunctionArgumentMetadata {
+									name: #frame_support::dispatch::DecodeDifferent::Encode(
+										stringify!(#args_name)
+									),
+									ty: #frame_support::dispatch::DecodeDifferent::Encode(
+										#args_metadata_type
+									),
+								},
+							)* ]
+						),
+						documentation: #frame_support::dispatch::DecodeDifferent::Encode(
+							&[ #( #fn_doc ),* ]
+						),
+					},
+				)* ]
+			}
+		}
+	)
+}
diff --git a/frame/support/procedural/src/pallet/expand/constants.rs b/frame/support/procedural/src/pallet/expand/constants.rs
new file mode 100644
index 000000000000..25cceb7449e1
--- /dev/null
+++ b/frame/support/procedural/src/pallet/expand/constants.rs
@@ -0,0 +1,138 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::pallet::Def;
+use frame_support_procedural_tools::clean_type_string;
+use quote::ToTokens;
+
+struct ConstDef {
+	/// Name of the associated type.
+	pub ident: syn::Ident,
+	/// The type in Get, e.g. `u32` in `type Foo: Get<u32>;`, but `Self` is replaced by `T`
+	pub type_: syn::Type,
+	/// The doc associated
+	pub doc: Vec<syn::Lit>,
+	/// default_byte implementation
+	pub default_byte_impl: proc_macro2::TokenStream,
+}
+
+/// * Impl fn module_constant_metadata for pallet.
+pub fn expand_constants(def: &mut Def) -> proc_macro2::TokenStream {
+	let frame_support = &def.frame_support;
+	let type_impl_gen = &def.type_impl_generics();
+	let type_decl_gen = &def.type_decl_generics();
+	let type_use_gen = &def.type_use_generics();
+	let pallet_ident = &def.pallet_struct.pallet;
+
+	let mut where_clauses = vec![&def.config.where_clause];
+	where_clauses.extend(def.extra_constants.iter().map(|d| &d.where_clause));
+	let completed_where_clause = super::merge_where_clauses(&where_clauses);
+
+	let config_consts = def.config.consts_metadata.iter().map(|const_| {
+		let ident = &const_.ident;
+		let const_type = &const_.type_;
+
+		ConstDef {
+			ident: const_.ident.clone(),
+			type_: const_.type_.clone(),
+			doc: const_.doc.clone(),
+			default_byte_impl: quote::quote!(
+				let value = <T::#ident as #frame_support::traits::Get<#const_type>>::get();
+				#frame_support::codec::Encode::encode(&value)
+			),
+		}
+	});
+
+	let extra_consts = def.extra_constants.iter().flat_map(|d| &d.extra_constants).map(|const_| {
+		let ident = &const_.ident;
+
+		ConstDef {
+			ident: const_.ident.clone(),
+			type_: const_.type_.clone(),
+			doc: const_.doc.clone(),
+			default_byte_impl: quote::quote!(
+				let value = <Pallet<#type_use_gen>>::#ident();
+				#frame_support::codec::Encode::encode(&value)
+			),
+		}
+	});
+
+	let consts = config_consts.chain(extra_consts)
+		.map(|const_| {
+			let const_type = &const_.type_;
+			let const_type_str = clean_type_string(&const_type.to_token_stream().to_string());
+			let ident = &const_.ident;
+			let ident_str = format!("{}", ident);
+			let doc = const_.doc.clone().into_iter();
+			let default_byte_impl = &const_.default_byte_impl;
+			let default_byte_getter = syn::Ident::new(
+				&format!("{}DefaultByteGetter", ident),
+				ident.span()
+			);
+
+			quote::quote!({
+				#[allow(non_upper_case_types)]
+				#[allow(non_camel_case_types)]
+				struct #default_byte_getter<#type_decl_gen>(
+					#frame_support::sp_std::marker::PhantomData<(#type_use_gen)>
+				);
+
+				impl<#type_impl_gen> #frame_support::dispatch::DefaultByte for
+					#default_byte_getter<#type_use_gen>
+					#completed_where_clause
+				{
+					fn default_byte(&self) -> #frame_support::sp_std::vec::Vec<u8> {
+						#default_byte_impl
+					}
+				}
+
+				unsafe impl<#type_impl_gen> Send for #default_byte_getter<#type_use_gen>
+					#completed_where_clause
+				{}
+				unsafe impl<#type_impl_gen> Sync for #default_byte_getter<#type_use_gen>
+					#completed_where_clause
+				{}
+
+				#frame_support::dispatch::ModuleConstantMetadata {
+					name: #frame_support::dispatch::DecodeDifferent::Encode(#ident_str),
+					ty: #frame_support::dispatch::DecodeDifferent::Encode(#const_type_str),
+					value: #frame_support::dispatch::DecodeDifferent::Encode(
+						#frame_support::dispatch::DefaultByteGetter(
+							&#default_byte_getter::<#type_use_gen>(
+								#frame_support::sp_std::marker::PhantomData
+							)
+						)
+					),
+					documentation: #frame_support::dispatch::DecodeDifferent::Encode(
+						&[ #( #doc ),* ]
+					),
+				}
+			})
+		});
+
+	quote::quote!(
+		impl<#type_impl_gen> #pallet_ident<#type_use_gen> #completed_where_clause{
+
+			#[doc(hidden)]
+			pub fn module_constants_metadata()
+				-> &'static [#frame_support::dispatch::ModuleConstantMetadata]
+			{
+				&[ #( #consts ),* ]
+			}
+		}
+	)
+}
diff --git a/frame/support/procedural/src/pallet/expand/error.rs b/frame/support/procedural/src/pallet/expand/error.rs
new file mode 100644
index 000000000000..e60d717ff7dd
--- /dev/null
+++ b/frame/support/procedural/src/pallet/expand/error.rs
@@ -0,0 +1,141 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::pallet::Def;
+use syn::spanned::Spanned;
+
+/// * impl various trait on Error
+/// * impl ModuleErrorMetadata for Error
+pub fn expand_error(def: &mut Def) -> proc_macro2::TokenStream {
+	let error = if let Some(error) = &def.error {
+		error
+	} else {
+		return Default::default()
+	};
+
+	let error_item_span =
+		def.item.content.as_mut().expect("Checked by def parser").1[error.index].span();
+	let error_ident = &error.error;
+	let frame_support = &def.frame_support;
+	let frame_system = &def.frame_system;
+	let type_impl_gen = &def.type_impl_generics();
+	let type_use_gen = &def.type_use_generics();
+	let config_where_clause = &def.config.where_clause;
+
+	let phantom_variant: syn::Variant = syn::parse_quote!(
+		#[doc(hidden)]
+		__Ignore(
+			#frame_support::sp_std::marker::PhantomData<(#type_use_gen)>,
+			#frame_support::Never,
+		)
+	);
+
+	let as_u8_matches = error.variants.iter().enumerate()
+		.map(|(i, (variant, _))| quote::quote!(Self::#variant => #i as u8,));
+
+	let as_str_matches = error.variants.iter()
+		.map(|(variant, _)| {
+			let variant_str = format!("{}", variant);
+			quote::quote!(Self::#variant => #variant_str,)
+		});
+
+	let metadata = error.variants.iter()
+		.map(|(variant, doc)| {
+			let variant_str = format!("{}", variant);
+			quote::quote!(
+				#frame_support::error::ErrorMetadata {
+					name: #frame_support::error::DecodeDifferent::Encode(#variant_str),
+					documentation: #frame_support::error::DecodeDifferent::Encode(&[ #( #doc, )* ]),
+				},
+			)
+		});
+
+	let error_item = {
+		let item = &mut def.item.content.as_mut().expect("Checked by def parser").1[error.index];
+		if let syn::Item::Enum(item) = item {
+			item
+		} else {
+			unreachable!("Checked by event parser")
+		}
+	};
+
+	error_item.variants.insert(0, phantom_variant);
+
+	quote::quote_spanned!(error_item_span =>
+		impl<#type_impl_gen> #frame_support::sp_std::fmt::Debug for #error_ident<#type_use_gen>
+			#config_where_clause
+		{
+			fn fmt(&self, f: &mut #frame_support::sp_std::fmt::Formatter<'_>)
+				-> #frame_support::sp_std::fmt::Result
+			{
+				f.write_str(self.as_str())
+			}
+		}
+
+		impl<#type_impl_gen> #error_ident<#type_use_gen> #config_where_clause {
+			pub fn as_u8(&self) -> u8 {
+				match &self {
+					Self::__Ignore(_, _) => unreachable!("`__Ignore` can never be constructed"),
+					#( #as_u8_matches )*
+				}
+			}
+
+			pub fn as_str(&self) -> &'static str {
+				match &self {
+					Self::__Ignore(_, _) => unreachable!("`__Ignore` can never be constructed"),
+					#( #as_str_matches )*
+				}
+			}
+		}
+
+		impl<#type_impl_gen> From<#error_ident<#type_use_gen>> for &'static str
+			#config_where_clause
+		{
+			fn from(err: #error_ident<#type_use_gen>) -> &'static str {
+				err.as_str()
+			}
+		}
+
+		impl<#type_impl_gen> From<#error_ident<#type_use_gen>>
+			for #frame_support::sp_runtime::DispatchError
+			#config_where_clause
+		{
+			fn from(err: #error_ident<#type_use_gen>) -> Self {
+				let index = <
+					<T as #frame_system::Config>::PalletInfo
+					as #frame_support::traits::PalletInfo
+				>::index::<Pallet<#type_use_gen>>()
+					.expect("Every active module has an index in the runtime; qed") as u8;
+
+				#frame_support::sp_runtime::DispatchError::Module {
+					index,
+					error: err.as_u8(),
+					message: Some(err.as_str()),
+				}
+			}
+		}
+
+		impl<#type_impl_gen> #frame_support::error::ModuleErrorMetadata
+			for #error_ident<#type_use_gen>
+			#config_where_clause
+		{
+			fn metadata() -> &'static [#frame_support::error::ErrorMetadata] {
+				&[ #( #metadata )* ]
+			}
+		}
+	)
+}
diff --git a/frame/support/procedural/src/pallet/expand/event.rs b/frame/support/procedural/src/pallet/expand/event.rs
new file mode 100644
index 000000000000..1dc3431f9bac
--- /dev/null
+++ b/frame/support/procedural/src/pallet/expand/event.rs
@@ -0,0 +1,143 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::pallet::Def;
+use syn::spanned::Spanned;
+
+/// * Add __Ignore variant on Event
+/// * Impl various trait on Event including metadata
+/// * if deposit_event is defined, implement deposit_event on module.
+pub fn expand_event(def: &mut Def) -> proc_macro2::TokenStream {
+	let event = if let Some(event) = &def.event {
+		event
+	} else {
+		return Default::default()
+	};
+
+	let event_where_clause = &event.where_clause;
+
+	// NOTE: actually event where clause must be a subset of config where clause because of
+	// `type Event: From<Event<Self>>`. But we merge either way for potential better error message
+	let completed_where_clause = super::merge_where_clauses(&[
+		&event.where_clause,
+		&def.config.where_clause,
+	]);
+
+	let event_ident = &event.event;
+	let frame_system = &def.frame_system;
+	let frame_support = &def.frame_support;
+	let event_use_gen = &event.gen_kind.type_use_gen();
+	let event_impl_gen= &event.gen_kind.type_impl_gen();
+	let metadata = event.metadata.iter()
+		.map(|(ident, args, docs)| {
+			let name = format!("{}", ident);
+			quote::quote!(
+				#frame_support::event::EventMetadata {
+					name: #frame_support::event::DecodeDifferent::Encode(#name),
+					arguments: #frame_support::event::DecodeDifferent::Encode(&[
+						#( #args, )*
+					]),
+					documentation: #frame_support::event::DecodeDifferent::Encode(&[
+						#( #docs, )*
+					]),
+				},
+			)
+		});
+
+	let event_item_span =
+		def.item.content.as_mut().expect("Checked by def parser").1[event.index].span();
+
+	let event_item = {
+		let item = &mut def.item.content.as_mut().expect("Checked by def parser").1[event.index];
+		if let syn::Item::Enum(item) = item {
+			item
+		} else {
+			unreachable!("Checked by event parser")
+		}
+	};
+
+	// Phantom data is added for generic event.
+	if event.gen_kind.is_generic() {
+		let variant = syn::parse_quote!(
+			#[doc(hidden)]
+			#[codec(skip)]
+			__Ignore(
+				#frame_support::sp_std::marker::PhantomData<(#event_use_gen)>,
+				#frame_support::Never,
+			)
+		);
+
+		// Push ignore variant at the end.
+		event_item.variants.push(variant);
+	}
+
+	// derive some traits because system event require Clone, FullCodec, Eq, PartialEq and Debug
+	event_item.attrs.push(syn::parse_quote!(
+		#[derive(
+			#frame_support::CloneNoBound,
+			#frame_support::EqNoBound,
+			#frame_support::PartialEqNoBound,
+			#frame_support::RuntimeDebugNoBound,
+			#frame_support::codec::Encode,
+			#frame_support::codec::Decode,
+		)]
+	));
+
+
+	let deposit_event = if let Some((fn_vis, fn_span)) = &event.deposit_event {
+		let event_use_gen = &event.gen_kind.type_use_gen();
+		let trait_use_gen = &def.trait_use_generics();
+		let type_impl_gen = &def.type_impl_generics();
+		let type_use_gen = &def.type_use_generics();
+
+		quote::quote_spanned!(*fn_span =>
+			impl<#type_impl_gen> Pallet<#type_use_gen> #completed_where_clause {
+				#fn_vis fn deposit_event(event: Event<#event_use_gen>) {
+					let event = <
+						<T as Config#trait_use_gen>::Event as
+						From<Event<#event_use_gen>>
+					>::from(event);
+
+					let event = <
+						<T as Config#trait_use_gen>::Event as
+						Into<<T as #frame_system::Config>::Event>
+					>::into(event);
+
+					<#frame_system::Pallet<T>>::deposit_event(event)
+				}
+			}
+		)
+	} else {
+		Default::default()
+	};
+
+	quote::quote_spanned!(event_item_span =>
+		#deposit_event
+
+		impl<#event_impl_gen> From<#event_ident<#event_use_gen>> for () #event_where_clause {
+			fn from(_: #event_ident<#event_use_gen>) -> () { () }
+		}
+
+		impl<#event_impl_gen> #event_ident<#event_use_gen> #event_where_clause {
+			#[allow(dead_code)]
+			#[doc(hidden)]
+			pub fn metadata() -> &'static [#frame_support::event::EventMetadata] {
+				&[ #( #metadata )* ]
+			}
+		}
+	)
+}
diff --git a/frame/support/procedural/src/pallet/expand/genesis_build.rs b/frame/support/procedural/src/pallet/expand/genesis_build.rs
new file mode 100644
index 000000000000..678e89eddf24
--- /dev/null
+++ b/frame/support/procedural/src/pallet/expand/genesis_build.rs
@@ -0,0 +1,72 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::pallet::Def;
+use syn::spanned::Spanned;
+
+/// * implement the trait `sp_runtime::BuildModuleGenesisStorage`
+/// * add #[cfg(features = "std")] to GenesisBuild implementation.
+pub fn expand_genesis_build(def: &mut Def) -> proc_macro2::TokenStream {
+	let genesis_config = if let Some(genesis_config) = &def.genesis_config {
+		genesis_config
+	} else {
+		return Default::default()
+	};
+
+	let frame_support = &def.frame_support;
+	let type_impl_gen = &def.type_impl_generics();
+	let type_use_gen = &def.type_use_generics();
+	let trait_use_gen = if def.config.has_instance {
+		quote::quote!(T, I)
+	} else {
+		// `__InherentHiddenInstance` used by construct_runtime here is alias for `()`
+		quote::quote!(T, ())
+	};
+	let gen_cfg_ident = &genesis_config.genesis_config;
+
+	let gen_cfg_use_gen = genesis_config.gen_kind.type_use_gen();
+
+	let genesis_build = def.genesis_build.as_ref().expect("Checked by def parser");
+	let genesis_build_item = &mut def.item.content.as_mut()
+		.expect("Checked by def parser").1[genesis_build.index];
+
+	let genesis_build_item_impl = if let syn::Item::Impl(impl_) = genesis_build_item {
+		impl_
+	} else {
+		unreachable!("Checked by genesis_build parser")
+	};
+
+	genesis_build_item_impl.attrs.push(syn::parse_quote!( #[cfg(feature = "std")] ));
+	let where_clause = &genesis_build.where_clause;
+
+	quote::quote_spanned!(genesis_build_item.span() =>
+		#[cfg(feature = "std")]
+		impl<#type_impl_gen> #frame_support::sp_runtime::BuildModuleGenesisStorage<#trait_use_gen>
+			for #gen_cfg_ident<#gen_cfg_use_gen> #where_clause
+		{
+			fn build_module_genesis_storage(
+				&self,
+				storage: &mut #frame_support::sp_runtime::Storage,
+			) -> std::result::Result<(), std::string::String> {
+				#frame_support::BasicExternalities::execute_with_storage(storage, || {
+					<Self as #frame_support::traits::GenesisBuild<#type_use_gen>>::build(self);
+					Ok(())
+				})
+			}
+		}
+	)
+}
diff --git a/frame/support/procedural/src/pallet/expand/genesis_config.rs b/frame/support/procedural/src/pallet/expand/genesis_config.rs
new file mode 100644
index 000000000000..db67eaeaee74
--- /dev/null
+++ b/frame/support/procedural/src/pallet/expand/genesis_config.rs
@@ -0,0 +1,49 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::pallet::Def;
+
+/// * add various derive trait on GenesisConfig struct.
+pub fn expand_genesis_config(def: &mut Def) -> proc_macro2::TokenStream {
+	let genesis_config = if let Some(genesis_config) = &def.genesis_config {
+		genesis_config
+	} else {
+		return Default::default()
+	};
+	let frame_support = &def.frame_support;
+
+	let genesis_config_item = &mut def.item.content.as_mut()
+		.expect("Checked by def parser").1[genesis_config.index];
+
+	match genesis_config_item {
+		syn::Item::Enum(syn::ItemEnum { attrs, ..}) |
+		syn::Item::Struct(syn::ItemStruct { attrs, .. }) |
+		syn::Item::Type(syn::ItemType { attrs, .. }) => {
+			attrs.push(syn::parse_quote!( #[cfg(feature = "std")] ));
+			attrs.push(syn::parse_quote!(
+				#[derive(#frame_support::Serialize, #frame_support::Deserialize)]
+			));
+			attrs.push(syn::parse_quote!( #[serde(rename_all = "camelCase")] ));
+			attrs.push(syn::parse_quote!( #[serde(deny_unknown_fields)] ));
+			attrs.push(syn::parse_quote!( #[serde(bound(serialize = ""))] ));
+			attrs.push(syn::parse_quote!( #[serde(bound(deserialize = ""))] ));
+		},
+		_ => unreachable!("Checked by genesis_config parser"),
+	}
+
+	Default::default()
+}
diff --git a/frame/support/procedural/src/pallet/expand/hooks.rs b/frame/support/procedural/src/pallet/expand/hooks.rs
new file mode 100644
index 000000000000..8ae7738bcc17
--- /dev/null
+++ b/frame/support/procedural/src/pallet/expand/hooks.rs
@@ -0,0 +1,110 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::pallet::Def;
+use syn::spanned::Spanned;
+
+/// * implement the individual traits using the Hooks trait
+pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
+	let frame_support = &def.frame_support;
+	let type_impl_gen = &def.type_impl_generics();
+	let type_use_gen = &def.type_use_generics();
+	let pallet_ident = &def.pallet_struct.pallet;
+	let where_clause = &def.hooks.where_clause;
+	let frame_system = &def.frame_system;
+
+	let hooks_item_span = def.item.content.as_mut()
+		.expect("Checked by def parser").1[def.hooks.index].span();
+
+	quote::quote_spanned!(hooks_item_span =>
+		impl<#type_impl_gen>
+			#frame_support::traits::OnFinalize<<T as #frame_system::Config>::BlockNumber>
+			for #pallet_ident<#type_use_gen> #where_clause
+		{
+			fn on_finalize(n: <T as #frame_system::Config>::BlockNumber) {
+				<
+					Self as #frame_support::traits::Hooks<
+						<T as #frame_system::Config>::BlockNumber
+					>
+				>::on_finalize(n)
+			}
+		}
+
+		impl<#type_impl_gen>
+			#frame_support::traits::OnInitialize<<T as #frame_system::Config>::BlockNumber>
+			for #pallet_ident<#type_use_gen> #where_clause
+		{
+			fn on_initialize(
+				n: <T as #frame_system::Config>::BlockNumber
+			) -> #frame_support::weights::Weight {
+				<
+					Self as #frame_support::traits::Hooks<
+						<T as #frame_system::Config>::BlockNumber
+					>
+				>::on_initialize(n)
+			}
+		}
+
+		impl<#type_impl_gen>
+			#frame_support::traits::OnRuntimeUpgrade
+			for #pallet_ident<#type_use_gen> #where_clause
+		{
+			fn on_runtime_upgrade() -> #frame_support::weights::Weight {
+				let result = <
+					Self as #frame_support::traits::Hooks<
+						<T as #frame_system::Config>::BlockNumber
+					>
+				>::on_runtime_upgrade();
+
+				#frame_support::crate_to_pallet_version!()
+					.put_into_storage::<<T as #frame_system::Config>::PalletInfo, Self>();
+
+				let additional_write = <
+					<T as #frame_system::Config>::DbWeight as #frame_support::traits::Get<_>
+				>::get().writes(1);
+
+				result.saturating_add(additional_write)
+			}
+		}
+
+		impl<#type_impl_gen>
+			#frame_support::traits::OffchainWorker<<T as #frame_system::Config>::BlockNumber>
+			for #pallet_ident<#type_use_gen> #where_clause
+		{
+			fn offchain_worker(n: <T as #frame_system::Config>::BlockNumber) {
+				<
+					Self as #frame_support::traits::Hooks<
+						<T as #frame_system::Config>::BlockNumber
+					>
+				>::offchain_worker(n)
+			}
+		}
+
+		impl<#type_impl_gen>
+			#frame_support::traits::IntegrityTest
+			for #pallet_ident<#type_use_gen> #where_clause
+		{
+			fn integrity_test() {
+				<
+					Self as #frame_support::traits::Hooks<
+						<T as #frame_system::Config>::BlockNumber
+					>
+				>::integrity_test()
+			}
+		}
+	)
+}
diff --git a/frame/support/procedural/src/pallet/expand/instances.rs b/frame/support/procedural/src/pallet/expand/instances.rs
new file mode 100644
index 000000000000..1b05be4f61f9
--- /dev/null
+++ b/frame/support/procedural/src/pallet/expand/instances.rs
@@ -0,0 +1,40 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use proc_macro2::Span;
+use crate::pallet::Def;
+
+/// * Provide inherent instance to be used by construct_runtime
+/// * Provide Instance0 .. Instance16 for instantiable pallet
+pub fn expand_instances(def: &mut Def) -> proc_macro2::TokenStream {
+	let frame_support = &def.frame_support;
+	let inherent_ident = syn::Ident::new(crate::INHERENT_INSTANCE_NAME, Span::call_site());
+	let instances = if def.config.has_instance {
+		(0..16).map(|i| syn::Ident::new(&format!("Instance{}", i), Span::call_site())).collect()
+	} else {
+		vec![]
+	};
+
+	quote::quote!(
+		/// Hidden instance generated to be internally used when module is used without
+		/// instance.
+		#[doc(hidden)]
+		pub type #inherent_ident = ();
+
+		#( pub use #frame_support::instances::#instances; )*
+	)
+}
diff --git a/frame/support/procedural/src/pallet/expand/mod.rs b/frame/support/procedural/src/pallet/expand/mod.rs
new file mode 100644
index 000000000000..6bfc1f9a9ee4
--- /dev/null
+++ b/frame/support/procedural/src/pallet/expand/mod.rs
@@ -0,0 +1,81 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+mod constants;
+mod pallet_struct;
+mod call;
+mod error;
+mod event;
+mod storage;
+mod hooks;
+mod store_trait;
+mod instances;
+mod genesis_build;
+mod genesis_config;
+mod type_value;
+
+use crate::pallet::Def;
+use quote::ToTokens;
+
+/// Merge where clause together, `where` token span is taken from the first not none one.
+pub fn merge_where_clauses(clauses: &[&Option<syn::WhereClause>]) -> Option<syn::WhereClause> {
+	let mut clauses = clauses.iter().filter_map(|f| f.as_ref());
+	let mut res = clauses.next()?.clone();
+	for other in clauses {
+		res.predicates.extend(other.predicates.iter().cloned())
+	}
+	Some(res)
+}
+
+/// Expand definition, in particular:
+/// * add some bounds and variants to type defined,
+/// * create some new types,
+/// * impl stuff on them.
+pub fn expand(mut def: Def) -> proc_macro2::TokenStream {
+	let constants = constants::expand_constants(&mut def);
+	let pallet_struct = pallet_struct::expand_pallet_struct(&mut def);
+	let call = call::expand_call(&mut def);
+	let error = error::expand_error(&mut def);
+	let event = event::expand_event(&mut def);
+	let storages = storage::expand_storages(&mut def);
+	let instances = instances::expand_instances(&mut def);
+	let store_trait = store_trait::expand_store_trait(&mut def);
+	let hooks = hooks::expand_hooks(&mut def);
+	let genesis_build = genesis_build::expand_genesis_build(&mut def);
+	let genesis_config = genesis_config::expand_genesis_config(&mut def);
+	let type_values = type_value::expand_type_values(&mut def);
+
+	let new_items = quote::quote!(
+		#constants
+		#pallet_struct
+		#call
+		#error
+		#event
+		#storages
+		#instances
+		#store_trait
+		#hooks
+		#genesis_build
+		#genesis_config
+		#type_values
+	);
+
+	def.item.content.as_mut().expect("This is checked by parsing").1
+		.push(syn::Item::Verbatim(new_items));
+
+	def.item.into_token_stream()
+}
diff --git a/frame/support/procedural/src/pallet/expand/pallet_struct.rs b/frame/support/procedural/src/pallet/expand/pallet_struct.rs
new file mode 100644
index 000000000000..133e49a85d8e
--- /dev/null
+++ b/frame/support/procedural/src/pallet/expand/pallet_struct.rs
@@ -0,0 +1,117 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::pallet::Def;
+
+/// * Add derive trait on Pallet
+/// * Implement GetPalletVersion on Pallet
+/// * Implement OnGenesis on Pallet
+/// * Implement ModuleErrorMetadata on Pallet
+/// * declare Module type alias for construct_runtime
+pub fn expand_pallet_struct(def: &mut Def) -> proc_macro2::TokenStream {
+	let frame_support = &def.frame_support;
+	let frame_system = &def.frame_system;
+	let type_impl_gen = &def.type_impl_generics();
+	let type_use_gen = &def.type_use_generics();
+	let type_decl_gen = &def.type_decl_generics();
+	let pallet_ident = &def.pallet_struct.pallet;
+	let config_where_clause = &def.config.where_clause;
+
+	let pallet_item = {
+		let pallet_module_items = &mut def.item.content.as_mut().expect("Checked by def").1;
+		let item = &mut pallet_module_items[def.pallet_struct.index];
+		if let syn::Item::Struct(item) = item {
+			item
+		} else {
+			unreachable!("Checked by pallet struct parser")
+		}
+	};
+
+	pallet_item.attrs.push(syn::parse_quote!(
+		#[derive(
+			#frame_support::CloneNoBound,
+			#frame_support::EqNoBound,
+			#frame_support::PartialEqNoBound,
+			#frame_support::RuntimeDebugNoBound,
+		)]
+	));
+
+	let module_error_metadata = if let Some(error_def) = &def.error {
+		let error_ident = &error_def.error;
+		quote::quote!(
+			impl<#type_impl_gen> #frame_support::error::ModuleErrorMetadata
+				for #pallet_ident<#type_use_gen>
+				#config_where_clause
+			{
+				fn metadata() -> &'static [#frame_support::error::ErrorMetadata] {
+					<
+						#error_ident<#type_use_gen> as #frame_support::error::ModuleErrorMetadata
+					>::metadata()
+				}
+			}
+		)
+	} else {
+		quote::quote!(
+			impl<#type_impl_gen> #frame_support::error::ModuleErrorMetadata
+				for #pallet_ident<#type_use_gen>
+				#config_where_clause
+			{
+				fn metadata() -> &'static [#frame_support::error::ErrorMetadata] {
+					&[]
+				}
+			}
+		)
+	};
+
+	quote::quote!(
+		#module_error_metadata
+
+		/// Type alias to `Pallet`, to be used by `construct_runtime`.
+		///
+		/// Generated by `pallet` attribute macro.
+		pub type Module<#type_decl_gen> = #pallet_ident<#type_use_gen>;
+
+		// Implement `GetPalletVersion` for `Pallet`
+		impl<#type_impl_gen> #frame_support::traits::GetPalletVersion
+			for #pallet_ident<#type_use_gen>
+			#config_where_clause
+		{
+			fn current_version() -> #frame_support::traits::PalletVersion {
+				#frame_support::crate_to_pallet_version!()
+			}
+
+			fn storage_version() -> Option<#frame_support::traits::PalletVersion> {
+				let key = #frame_support::traits::PalletVersion::storage_key::<
+						<T as #frame_system::Config>::PalletInfo, Self
+					>().expect("Every active pallet has a name in the runtime; qed");
+
+				#frame_support::storage::unhashed::get(&key)
+			}
+		}
+
+		// Implement `OnGenesis` for `Pallet`
+		impl<#type_impl_gen> #frame_support::traits::OnGenesis
+			for #pallet_ident<#type_use_gen>
+			#config_where_clause
+		{
+			fn on_genesis() {
+				#frame_support::crate_to_pallet_version!()
+					.put_into_storage::<<T as #frame_system::Config>::PalletInfo, Self>();
+			}
+		}
+	)
+}
diff --git a/frame/support/procedural/src/pallet/expand/storage.rs b/frame/support/procedural/src/pallet/expand/storage.rs
new file mode 100644
index 000000000000..a8b6b2f0d7ba
--- /dev/null
+++ b/frame/support/procedural/src/pallet/expand/storage.rs
@@ -0,0 +1,267 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::pallet::Def;
+use crate::pallet::parse::storage::{Metadata, QueryKind};
+use frame_support_procedural_tools::clean_type_string;
+
+/// Generate the prefix_ident related the the storage.
+/// prefix_ident is used for the prefix struct to be given to storage as first generic param.
+fn prefix_ident(storage_ident: &syn::Ident) -> syn::Ident {
+	syn::Ident::new(&format!("_GeneratedPrefixForStorage{}", storage_ident), storage_ident.span())
+}
+
+/// * generate StoragePrefix structs (e.g. for a storage `MyStorage` a struct with the name
+///   `_GeneratedPrefixForStorage$NameOfStorage` is generated) and implements StorageInstance trait.
+/// * replace the first generic `_` by the generated prefix structure
+/// * generate metadatas
+pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
+	let frame_support = &def.frame_support;
+	let frame_system = &def.frame_system;
+	let type_impl_gen = &def.type_impl_generics();
+	let type_use_gen = &def.type_use_generics();
+	let pallet_ident = &def.pallet_struct.pallet;
+
+	// Replace first arg `_` by the generated prefix structure.
+	// Add `#[allow(type_alias_bounds)]`
+	for storage_def in def.storages.iter_mut() {
+		let item = &mut def.item.content.as_mut().expect("Checked by def").1[storage_def.index];
+
+		let typ_item = if let syn::Item::Type(t) = item {
+			t
+		} else {
+			unreachable!("Checked by def");
+		};
+
+		typ_item.attrs.push(syn::parse_quote!(#[allow(type_alias_bounds)]));
+
+		let typ_path = if let syn::Type::Path(p) = &mut *typ_item.ty {
+			p
+		} else {
+			unreachable!("Checked by def");
+		};
+
+		let args = if let syn::PathArguments::AngleBracketed(args) =
+			&mut typ_path.path.segments[0].arguments
+		{
+			args
+		} else {
+			unreachable!("Checked by def");
+		};
+
+		let prefix_ident = prefix_ident(&storage_def.ident);
+		args.args[0] = syn::parse_quote!( #prefix_ident<#type_use_gen> );
+	}
+
+	let entries = def.storages.iter()
+		.map(|storage| {
+			let docs = &storage.docs;
+
+			let ident = &storage.ident;
+			let gen = &def.type_use_generics();
+			let full_ident = quote::quote!( #ident<#gen> );
+
+			let metadata_trait = match &storage.metadata {
+				Metadata::Value { .. } =>
+					quote::quote!(#frame_support::storage::types::StorageValueMetadata),
+				Metadata::Map { .. } =>
+					quote::quote!(#frame_support::storage::types::StorageMapMetadata),
+				Metadata::DoubleMap { .. } =>
+					quote::quote!(#frame_support::storage::types::StorageDoubleMapMetadata),
+			};
+
+			let ty = match &storage.metadata {
+				Metadata::Value { value } => {
+					let value = clean_type_string(&quote::quote!(#value).to_string());
+					quote::quote!(
+						#frame_support::metadata::StorageEntryType::Plain(
+							#frame_support::metadata::DecodeDifferent::Encode(#value)
+						)
+					)
+				},
+				Metadata::Map { key, value } => {
+					let value = clean_type_string(&quote::quote!(#value).to_string());
+					let key = clean_type_string(&quote::quote!(#key).to_string());
+					quote::quote!(
+						#frame_support::metadata::StorageEntryType::Map {
+							hasher: <#full_ident as #metadata_trait>::HASHER,
+							key: #frame_support::metadata::DecodeDifferent::Encode(#key),
+							value: #frame_support::metadata::DecodeDifferent::Encode(#value),
+							unused: false,
+						}
+					)
+				},
+				Metadata::DoubleMap { key1, key2, value } => {
+					let value = clean_type_string(&quote::quote!(#value).to_string());
+					let key1 = clean_type_string(&quote::quote!(#key1).to_string());
+					let key2 = clean_type_string(&quote::quote!(#key2).to_string());
+					quote::quote!(
+						#frame_support::metadata::StorageEntryType::DoubleMap {
+							hasher: <#full_ident as #metadata_trait>::HASHER1,
+							key2_hasher: <#full_ident as #metadata_trait>::HASHER2,
+							key1: #frame_support::metadata::DecodeDifferent::Encode(#key1),
+							key2: #frame_support::metadata::DecodeDifferent::Encode(#key2),
+							value: #frame_support::metadata::DecodeDifferent::Encode(#value),
+						}
+					)
+				}
+			};
+
+			quote::quote_spanned!(storage.ident.span() =>
+				#frame_support::metadata::StorageEntryMetadata {
+					name: #frame_support::metadata::DecodeDifferent::Encode(
+						<#full_ident as #metadata_trait>::NAME
+					),
+					modifier: <#full_ident as #metadata_trait>::MODIFIER,
+					ty: #ty,
+					default: #frame_support::metadata::DecodeDifferent::Encode(
+						<#full_ident as #metadata_trait>::DEFAULT
+					),
+					documentation: #frame_support::metadata::DecodeDifferent::Encode(&[
+						#( #docs, )*
+					]),
+				}
+			)
+		});
+
+	let getters = def.storages.iter()
+		.map(|storage| if let Some(getter) = &storage.getter {
+			let completed_where_clause = super::merge_where_clauses(&[
+				&storage.where_clause,
+				&def.config.where_clause,
+			]);
+			let docs = storage.docs.iter().map(|d| quote::quote!(#[doc = #d]));
+
+			let ident = &storage.ident;
+			let gen = &def.type_use_generics();
+			let full_ident = quote::quote!( #ident<#gen> );
+
+			match &storage.metadata {
+				Metadata::Value { value } => {
+					let query = match storage.query_kind.as_ref().expect("Checked by def") {
+						QueryKind::OptionQuery => quote::quote!(Option<#value>),
+						QueryKind::ValueQuery => quote::quote!(#value),
+					};
+					quote::quote_spanned!(getter.span() =>
+						impl<#type_impl_gen> #pallet_ident<#type_use_gen> #completed_where_clause {
+							#( #docs )*
+							pub fn #getter() -> #query {
+								<
+									#full_ident as #frame_support::storage::StorageValue<#value>
+								>::get()
+							}
+						}
+					)
+				},
+				Metadata::Map { key, value } => {
+					let query = match storage.query_kind.as_ref().expect("Checked by def") {
+						QueryKind::OptionQuery => quote::quote!(Option<#value>),
+						QueryKind::ValueQuery => quote::quote!(#value),
+					};
+					quote::quote_spanned!(getter.span() =>
+						impl<#type_impl_gen> #pallet_ident<#type_use_gen> #completed_where_clause {
+							#( #docs )*
+							pub fn #getter<KArg>(k: KArg) -> #query where
+								KArg: #frame_support::codec::EncodeLike<#key>,
+							{
+								<
+									#full_ident as #frame_support::storage::StorageMap<#key, #value>
+								>::get(k)
+							}
+						}
+					)
+				},
+				Metadata::DoubleMap { key1, key2, value } => {
+					let query = match storage.query_kind.as_ref().expect("Checked by def") {
+						QueryKind::OptionQuery => quote::quote!(Option<#value>),
+						QueryKind::ValueQuery => quote::quote!(#value),
+					};
+					quote::quote_spanned!(getter.span() =>
+						impl<#type_impl_gen> #pallet_ident<#type_use_gen> #completed_where_clause {
+							#( #docs )*
+							pub fn #getter<KArg1, KArg2>(k1: KArg1, k2: KArg2) -> #query where
+								KArg1: #frame_support::codec::EncodeLike<#key1>,
+								KArg2: #frame_support::codec::EncodeLike<#key2>,
+							{
+								<
+									#full_ident as
+									#frame_support::storage::StorageDoubleMap<#key1, #key2, #value>
+								>::get(k1, k2)
+							}
+						}
+					)
+				},
+			}
+		} else {
+			Default::default()
+		});
+
+	let prefix_structs = def.storages.iter().map(|storage_def| {
+		let prefix_struct_ident = prefix_ident(&storage_def.ident);
+		let prefix_struct_vis = &storage_def.vis;
+		let prefix_struct_const = storage_def.ident.to_string();
+		let config_where_clause = &def.config.where_clause;
+
+		quote::quote_spanned!(storage_def.ident.span() =>
+			#prefix_struct_vis struct #prefix_struct_ident<#type_use_gen>(
+				core::marker::PhantomData<(#type_use_gen,)>
+			);
+			impl<#type_impl_gen> #frame_support::traits::StorageInstance
+				for #prefix_struct_ident<#type_use_gen>
+				#config_where_clause
+			{
+				fn pallet_prefix() -> &'static str {
+					<
+						<T as #frame_system::Config>::PalletInfo
+						as #frame_support::traits::PalletInfo
+					>::name::<Pallet<#type_use_gen>>()
+						.expect("Every active pallet has a name in the runtime; qed")
+				}
+				const STORAGE_PREFIX: &'static str = #prefix_struct_const;
+			}
+		)
+	});
+
+	let mut where_clauses = vec![&def.config.where_clause];
+	where_clauses.extend(def.storages.iter().map(|storage| &storage.where_clause));
+	let completed_where_clause = super::merge_where_clauses(&where_clauses);
+
+	quote::quote!(
+		impl<#type_impl_gen> #pallet_ident<#type_use_gen>
+			#completed_where_clause
+		{
+			#[doc(hidden)]
+			pub fn storage_metadata() -> #frame_support::metadata::StorageMetadata {
+				#frame_support::metadata::StorageMetadata {
+					prefix: #frame_support::metadata::DecodeDifferent::Encode(
+						<
+							<T as #frame_system::Config>::PalletInfo as
+							#frame_support::traits::PalletInfo
+						>::name::<#pallet_ident<#type_use_gen>>()
+							.expect("Every active pallet has a name in the runtime; qed")
+					),
+					entries: #frame_support::metadata::DecodeDifferent::Encode(
+						&[ #( #entries, )* ]
+					),
+				}
+			}
+		}
+
+		#( #getters )*
+		#( #prefix_structs )*
+	)
+}
diff --git a/frame/support/procedural/src/pallet/expand/store_trait.rs b/frame/support/procedural/src/pallet/expand/store_trait.rs
new file mode 100644
index 000000000000..ceea270bb9f3
--- /dev/null
+++ b/frame/support/procedural/src/pallet/expand/store_trait.rs
@@ -0,0 +1,55 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::pallet::Def;
+use syn::spanned::Spanned;
+
+/// If attribute `#[pallet::generate_store(..)]` is defined then:
+/// * generate Store trait with all storages,
+/// * implement Store trait for Pallet.
+pub fn expand_store_trait(def: &mut Def) -> proc_macro2::TokenStream {
+	let (trait_vis, trait_store) = if let Some(store) = &def.pallet_struct.store {
+		store
+	} else {
+		return Default::default()
+	};
+
+	let type_impl_gen = &def.type_impl_generics();
+	let type_use_gen = &def.type_use_generics();
+	let pallet_ident = &def.pallet_struct.pallet;
+
+	let mut where_clauses = vec![&def.config.where_clause];
+	where_clauses.extend(def.storages.iter().map(|storage| &storage.where_clause));
+	let completed_where_clause = super::merge_where_clauses(&where_clauses);
+
+	let storage_names = &def.storages.iter().map(|storage| &storage.ident).collect::<Vec<_>>();
+
+	quote::quote_spanned!(trait_store.span() =>
+		#trait_vis trait #trait_store {
+			#(
+				type #storage_names;
+			)*
+		}
+		impl<#type_impl_gen> #trait_store for #pallet_ident<#type_use_gen>
+			#completed_where_clause
+		{
+			#(
+				type #storage_names = #storage_names<#type_use_gen>;
+			)*
+		}
+	)
+}
diff --git a/frame/support/procedural/src/pallet/expand/type_value.rs b/frame/support/procedural/src/pallet/expand/type_value.rs
new file mode 100644
index 000000000000..3de3be8fcf27
--- /dev/null
+++ b/frame/support/procedural/src/pallet/expand/type_value.rs
@@ -0,0 +1,55 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::pallet::Def;
+use syn::spanned::Spanned;
+
+/// * Generate the struct
+/// * implement the `Get<..>` on it
+pub fn expand_type_values(def: &mut Def) -> proc_macro2::TokenStream {
+	let mut expand = quote::quote!();
+	let frame_support = &def.frame_support;
+
+	for type_value in &def.type_values {
+		// Remove item from module content
+		let item = &mut def.item.content.as_mut().expect("Checked by def").1[type_value.index];
+		let span = item.span();
+		*item = syn::Item::Verbatim(Default::default());
+
+		let vis = &type_value.vis;
+		let ident = &type_value.ident;
+		let block = &type_value.block;
+		let type_ = &type_value.type_;
+		let where_clause = &type_value.where_clause;
+
+		let (struct_impl_gen, struct_use_gen) = if type_value.is_generic {
+			(def.type_impl_generics(), def.type_use_generics())
+		} else {
+			(Default::default(), Default::default())
+		};
+
+		expand.extend(quote::quote_spanned!(span =>
+			#vis struct #ident<#struct_use_gen>(core::marker::PhantomData<((), #struct_use_gen)>);
+			impl<#struct_impl_gen> #frame_support::traits::Get<#type_> for #ident<#struct_use_gen>
+			#where_clause
+			{
+				fn get() -> #type_ #block
+			}
+		));
+	}
+	expand
+}
diff --git a/frame/support/procedural/src/pallet/mod.rs b/frame/support/procedural/src/pallet/mod.rs
new file mode 100644
index 000000000000..7ae5a573d010
--- /dev/null
+++ b/frame/support/procedural/src/pallet/mod.rs
@@ -0,0 +1,50 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Implementation for pallet attribute macro.
+//!
+//! General workflow:
+//! 1 - parse all pallet attributes:
+//!   This step remove all attributes `#[pallet::*]` from the ItemMod and build the `Def` struct
+//!   which holds the ItemMod without `#[pallet::*]` and information given by those attributes
+//! 2 - expand from the parsed information
+//!   This step will modify the ItemMod by adding some derive attributes or phantom data variants
+//!   to user defined types. And also crate new types and implement block.
+
+mod parse;
+mod expand;
+
+pub use parse::Def;
+use syn::spanned::Spanned;
+
+pub fn pallet(
+	attr: proc_macro::TokenStream,
+	item: proc_macro::TokenStream
+) -> proc_macro::TokenStream {
+	if !attr.is_empty() {
+		let msg = "Invalid pallet macro call: expected no attributes, e.g. macro call must be just \
+			`#[frame_support::pallet]` or `#[pallet]`";
+		let span = proc_macro2::TokenStream::from(attr).span();
+		return syn::Error::new(span, msg).to_compile_error().into();
+	}
+
+	let item = syn::parse_macro_input!(item as syn::ItemMod);
+	match parse::Def::try_from(item) {
+		Ok(def) => expand::expand(def).into(),
+		Err(e) => e.to_compile_error().into(),
+	}
+}
diff --git a/frame/support/procedural/src/pallet/parse/call.rs b/frame/support/procedural/src/pallet/parse/call.rs
new file mode 100644
index 000000000000..239329639e5f
--- /dev/null
+++ b/frame/support/procedural/src/pallet/parse/call.rs
@@ -0,0 +1,235 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use super::helper;
+use quote::ToTokens;
+use syn::spanned::Spanned;
+
+/// List of additional token to be used for parsing.
+mod keyword {
+	syn::custom_keyword!(DispatchResultWithPostInfo);
+	syn::custom_keyword!(Call);
+	syn::custom_keyword!(OriginFor);
+	syn::custom_keyword!(weight);
+	syn::custom_keyword!(compact);
+	syn::custom_keyword!(T);
+	syn::custom_keyword!(pallet);
+}
+
+/// Definition of dispatchables typically `impl<T: Config> Pallet<T> { ... }`
+pub struct CallDef {
+	/// The where_clause used.
+	pub where_clause: Option<syn::WhereClause>,
+	/// A set of usage of instance, must be check for consistency with trait.
+	pub instances: Vec<helper::InstanceUsage>,
+	/// The index of call item in pallet module.
+	pub index: usize,
+	/// Information on methods (used for expansion).
+	pub methods: Vec<CallVariantDef>,
+	/// The span of the attribute.
+	pub attr_span: proc_macro2::Span,
+}
+
+/// Definition of dispatchable typically: `#[weight...] fn foo(origin .., param1: ...) -> ..`
+pub struct CallVariantDef {
+	/// Function name.
+	pub name: syn::Ident,
+	/// Information on args: `(is_compact, name, type)`
+	pub args: Vec<(bool, syn::Ident, Box<syn::Type>)>,
+	/// Weight formula.
+	pub weight: syn::Expr,
+	/// Docs, used for metadata.
+	pub docs: Vec<syn::Lit>,
+}
+
+/// Attributes for functions in call impl block.
+/// Parse for `#[pallet::weight = expr]`
+pub struct FunctionAttr {
+	weight: syn::Expr,
+}
+
+impl syn::parse::Parse for FunctionAttr {
+	fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+		input.parse::<syn::Token![#]>()?;
+		let content;
+		syn::bracketed!(content in input);
+		content.parse::<keyword::pallet>()?;
+		content.parse::<syn::Token![::]>()?;
+		content.parse::<keyword::weight>()?;
+
+		let weight_content;
+		syn::parenthesized!(weight_content in content);
+		Ok(FunctionAttr {
+			weight: weight_content.parse::<syn::Expr>()?,
+		})
+	}
+}
+
+/// Attribute for arguments in function in call impl block.
+/// Parse for `#[pallet::compact]|
+pub struct ArgAttrIsCompact;
+
+impl syn::parse::Parse for ArgAttrIsCompact {
+	fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+		input.parse::<syn::Token![#]>()?;
+		let content;
+		syn::bracketed!(content in input);
+		content.parse::<keyword::pallet>()?;
+		content.parse::<syn::Token![::]>()?;
+
+		content.parse::<keyword::compact>()?;
+		Ok(ArgAttrIsCompact)
+	}
+}
+
+/// Check the syntax is `OriginFor<T>`
+pub fn check_dispatchable_first_arg_type(ty: &syn::Type) -> syn::Result<()> {
+
+	pub struct CheckDispatchableFirstArg;
+	impl syn::parse::Parse for CheckDispatchableFirstArg {
+		fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+			input.parse::<keyword::OriginFor>()?;
+			input.parse::<syn::Token![<]>()?;
+			input.parse::<keyword::T>()?;
+			input.parse::<syn::Token![>]>()?;
+
+			Ok(Self)
+		}
+	}
+
+	syn::parse2::<CheckDispatchableFirstArg>(ty.to_token_stream())
+		.map_err(|e| {
+			let msg = "Invalid type: expected `OriginFor<T>`";
+			let mut err = syn::Error::new(ty.span(), msg);
+			err.combine(e);
+			err
+		})?;
+
+	Ok(())
+}
+
+impl CallDef {
+	pub fn try_from(
+		// Span needed for expansion
+		attr_span: proc_macro2::Span,
+		index: usize,
+		item: &mut syn::Item
+	) -> syn::Result<Self> {
+		let item = if let syn::Item::Impl(item) = item {
+			item
+		} else {
+			return Err(syn::Error::new(item.span(), "Invalid pallet::call, expected item impl"));
+		};
+
+		let mut instances = vec![];
+		instances.push(helper::check_impl_gen(&item.generics, item.impl_token.span())?);
+		instances.push(helper::check_pallet_struct_usage(&item.self_ty)?);
+
+		if let Some((_, _, for_)) = item.trait_ {
+			let msg = "Invalid pallet::call, expected no trait ident as in \
+				`impl<..> Pallet<..> { .. }`";
+			return Err(syn::Error::new(for_.span(), msg))
+		}
+
+		let mut methods = vec![];
+		for impl_item in &mut item.items {
+			if let syn::ImplItem::Method(method) = impl_item {
+				match method.sig.inputs.first() {
+					None => {
+						let msg = "Invalid pallet::call, must have at least origin arg";
+						return Err(syn::Error::new(method.sig.span(), msg));
+					},
+					Some(syn::FnArg::Receiver(_)) => {
+						let msg = "Invalid pallet::call, first argument must be a typed argument, \
+							e.g. `origin: OriginFor<T>`";
+						return Err(syn::Error::new(method.sig.span(), msg));
+					},
+					Some(syn::FnArg::Typed(arg)) => {
+						check_dispatchable_first_arg_type(&*arg.ty)?;
+					},
+				}
+
+				if let syn::ReturnType::Type(_, type_) = &method.sig.output {
+					syn::parse2::<keyword::DispatchResultWithPostInfo>(type_.to_token_stream())?;
+				} else {
+					let msg = "Invalid pallet::call, require return type \
+						DispatchResultWithPostInfo";
+					return Err(syn::Error::new(method.sig.span(), msg));
+				}
+
+				let mut call_var_attrs: Vec<FunctionAttr> =
+					helper::take_item_attrs(&mut method.attrs)?;
+
+				if call_var_attrs.len() != 1 {
+					let msg = if call_var_attrs.len() == 0 {
+						"Invalid pallet::call, require weight attribute i.e. `#[pallet::weight = $expr]`"
+					} else {
+						"Invalid pallet::call, too many weight attributes given"
+					};
+					return Err(syn::Error::new(method.sig.span(), msg));
+				}
+				let weight = call_var_attrs.pop().unwrap().weight;
+
+				let mut args = vec![];
+				for arg in method.sig.inputs.iter_mut().skip(1) {
+					let arg = if let syn::FnArg::Typed(arg) = arg {
+						arg
+					} else {
+						unreachable!("Only first argument can be receiver");
+					};
+
+					let arg_attrs: Vec<ArgAttrIsCompact> =
+						helper::take_item_attrs(&mut arg.attrs)?;
+
+					if arg_attrs.len() > 1 {
+						let msg = "Invalid pallet::call, argument has too many attributes";
+						return Err(syn::Error::new(arg.span(), msg));
+					}
+
+					let arg_ident = if let syn::Pat::Ident(pat) = &*arg.pat {
+						pat.ident.clone()
+					} else {
+						let msg = "Invalid pallet::call, argument must be ident";
+						return Err(syn::Error::new(arg.pat.span(), msg));
+					};
+
+					args.push((!arg_attrs.is_empty(), arg_ident, arg.ty.clone()));
+				}
+
+				let docs = helper::get_doc_literals(&method.attrs);
+
+				methods.push(CallVariantDef {
+					name: method.sig.ident.clone(),
+					weight,
+					args,
+					docs,
+				});
+			} else {
+				let msg = "Invalid pallet::call, only method accepted";
+				return Err(syn::Error::new(impl_item.span(), msg));
+			}
+		}
+
+		Ok(Self {
+			index,
+			attr_span,
+			instances,
+			methods,
+			where_clause: item.generics.where_clause.clone(),
+		})
+	}
+}
diff --git a/frame/support/procedural/src/pallet/parse/config.rs b/frame/support/procedural/src/pallet/parse/config.rs
new file mode 100644
index 000000000000..46355b0fdb15
--- /dev/null
+++ b/frame/support/procedural/src/pallet/parse/config.rs
@@ -0,0 +1,384 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use super::helper;
+use syn::spanned::Spanned;
+use quote::ToTokens;
+
+/// List of additional token to be used for parsing.
+mod keyword {
+	syn::custom_keyword!(Config);
+	syn::custom_keyword!(From);
+	syn::custom_keyword!(T);
+	syn::custom_keyword!(I);
+	syn::custom_keyword!(Get);
+	syn::custom_keyword!(config);
+	syn::custom_keyword!(IsType);
+	syn::custom_keyword!(Event);
+	syn::custom_keyword!(constant);
+	syn::custom_keyword!(frame_system);
+	syn::custom_keyword!(disable_frame_system_supertrait_check);
+}
+
+/// Input definition for the pallet config.
+pub struct ConfigDef {
+	/// The index of item in pallet module.
+	pub index: usize,
+	/// Whether the trait has instance (i.e. define with `Config<I = ()>`)
+	pub has_instance: bool,
+	/// Const associated type.
+	pub consts_metadata: Vec<ConstMetadataDef>,
+	/// Whether the trait has the associated type `Event`, note that those bounds are checked:
+	/// * `IsType<Self as frame_system::Config>::Event`
+	/// * `From<Event>` or `From<Event<T>>` or `From<Event<T, I>>`
+	pub has_event_type: bool,
+	/// The where clause on trait definition but modified so `Self` is `T`.
+	pub where_clause: Option<syn::WhereClause>,
+
+}
+
+/// Input definition for a constant in pallet config.
+pub struct ConstMetadataDef {
+	/// Name of the associated type.
+	pub ident: syn::Ident,
+	/// The type in Get, e.g. `u32` in `type Foo: Get<u32>;`, but `Self` is replaced by `T`
+	pub type_: syn::Type,
+	/// The doc associated
+	pub doc: Vec<syn::Lit>,
+}
+
+impl syn::parse::Parse for ConstMetadataDef  {
+	fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+		let doc = helper::get_doc_literals(&syn::Attribute::parse_outer(input)?);
+		input.parse::<syn::Token![type]>()?;
+		let ident = input.parse::<syn::Ident>()?;
+		input.parse::<syn::Token![:]>()?;
+		input.parse::<keyword::Get>()?;
+		input.parse::<syn::Token![<]>()?;
+		let mut type_ = input.parse::<syn::Type>()?;
+		type_ = syn::parse2::<syn::Type>(replace_self_by_t(type_.to_token_stream()))
+			.expect("Internal error: replacing `Self` by `T` should result in valid type");
+		input.parse::<syn::Token![>]>()?;
+		input.parse::<syn::Token![;]>()?;
+
+		Ok(Self { ident, type_, doc })
+	}
+}
+
+/// Parse for `#[pallet::disable_frame_system_supertrait_check]`
+pub struct DisableFrameSystemSupertraitCheck;
+
+impl syn::parse::Parse for DisableFrameSystemSupertraitCheck {
+	fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+		input.parse::<syn::Token![#]>()?;
+		let content;
+		syn::bracketed!(content in input);
+		content.parse::<syn::Ident>()?;
+		content.parse::<syn::Token![::]>()?;
+
+		content.parse::<keyword::disable_frame_system_supertrait_check>()?;
+		Ok(Self)
+	}
+}
+
+/// Parse for `#[pallet::constant]`
+pub struct TypeAttrConst(proc_macro2::Span);
+
+impl Spanned for TypeAttrConst {
+	fn span(&self) -> proc_macro2::Span {
+		self.0
+	}
+}
+
+impl syn::parse::Parse for TypeAttrConst {
+	fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+		input.parse::<syn::Token![#]>()?;
+		let content;
+		syn::bracketed!(content in input);
+		content.parse::<syn::Ident>()?;
+		content.parse::<syn::Token![::]>()?;
+
+		Ok(TypeAttrConst(content.parse::<keyword::constant>()?.span()))
+	}
+}
+
+/// Parse for `$ident::Config`
+pub struct ConfigBoundParse(syn::Ident);
+
+impl syn::parse::Parse for ConfigBoundParse {
+	fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+		let ident = input.parse::<syn::Ident>()?;
+		input.parse::<syn::Token![::]>()?;
+		input.parse::<keyword::Config>()?;
+
+		Ok(Self(ident))
+	}
+}
+
+/// Parse for `IsType<<Sef as $ident::Config>::Event>` and retrieve `$ident`
+pub struct IsTypeBoundEventParse(syn::Ident);
+
+impl syn::parse::Parse for IsTypeBoundEventParse {
+	fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+		input.parse::<keyword::IsType>()?;
+		input.parse::<syn::Token![<]>()?;
+		input.parse::<syn::Token![<]>()?;
+		input.parse::<syn::Token![Self]>()?;
+		input.parse::<syn::Token![as]>()?;
+		let ident = input.parse::<syn::Ident>()?;
+		input.parse::<syn::Token![::]>()?;
+		input.parse::<keyword::Config>()?;
+		input.parse::<syn::Token![>]>()?;
+		input.parse::<syn::Token![::]>()?;
+		input.parse::<keyword::Event>()?;
+		input.parse::<syn::Token![>]>()?;
+
+		Ok(Self(ident))
+	}
+}
+
+/// Parse for `From<Event>` or `From<Event<Self>>` or `From<Event<Self, I>>`
+pub struct FromEventParse {
+	is_generic: bool,
+	has_instance: bool,
+}
+
+impl syn::parse::Parse for FromEventParse {
+	fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+		let mut is_generic = false;
+		let mut has_instance = false;
+
+		input.parse::<keyword::From>()?;
+		input.parse::<syn::Token![<]>()?;
+		input.parse::<keyword::Event>()?;
+		if input.peek(syn::Token![<]) {
+			is_generic = true;
+			input.parse::<syn::Token![<]>()?;
+			input.parse::<syn::Token![Self]>()?;
+			if input.peek(syn::Token![,]) {
+				input.parse::<syn::Token![,]>()?;
+				input.parse::<keyword::I>()?;
+				has_instance = true;
+			}
+			input.parse::<syn::Token![>]>()?;
+		}
+		input.parse::<syn::Token![>]>()?;
+
+		Ok(Self { is_generic, has_instance })
+	}
+}
+
+/// Check if trait_item is `type Event`, if so checks its bounds are those expected.
+/// (Event type is reserved type)
+fn check_event_type(
+	frame_system: &syn::Ident,
+	trait_item: &syn::TraitItem,
+	trait_has_instance: bool
+)  -> syn::Result<bool> {
+	if let syn::TraitItem::Type(type_) = trait_item {
+		if type_.ident == "Event" {
+			// Check event has no generics
+			if !type_.generics.params.is_empty() || type_.generics.where_clause.is_some() {
+				let msg = "Invalid `type Event`, associated type `Event` is reserved and must have\
+					no generics nor where_clause";
+				return Err(syn::Error::new(trait_item.span(), msg));
+			}
+			// Check bound contains IsType and From
+
+			let has_is_type_bound = type_.bounds.iter().any(|s| {
+				syn::parse2::<IsTypeBoundEventParse>(s.to_token_stream())
+					.map_or(false, |b| b.0 == *frame_system)
+			});
+
+			if !has_is_type_bound {
+				let msg = format!(
+					"Invalid `type Event`, associated type `Event` is reserved and must \
+					bound: `IsType<<Self as {}::Config>::Event>`",
+					frame_system,
+				);
+				return Err(syn::Error::new(type_.span(), msg));
+			}
+
+			let from_event_bound = type_.bounds.iter().find_map(|s| {
+				syn::parse2::<FromEventParse>(s.to_token_stream()).ok()
+			});
+
+			let from_event_bound = if let Some(b) = from_event_bound {
+				b
+			} else {
+				let msg = "Invalid `type Event`, associated type `Event` is reserved and must \
+					bound: `From<Event>` or `From<Event<Self>>` or `From<Event<Self, I>>`";
+				return Err(syn::Error::new(type_.span(), msg));
+			};
+
+			if from_event_bound.is_generic
+				&& (from_event_bound.has_instance != trait_has_instance)
+			{
+				let msg = "Invalid `type Event`, associated type `Event` bounds inconsistent \
+					`From<Event..>`. Config and generic Event must be both with instance or \
+					without instance";
+				return Err(syn::Error::new(type_.span(), msg));
+			}
+
+			Ok(true)
+		} else {
+			Ok(false)
+		}
+	} else {
+		Ok(false)
+	}
+}
+
+/// Replace ident `Self` by `T`
+pub fn replace_self_by_t(input: proc_macro2::TokenStream) -> proc_macro2::TokenStream {
+	input.into_iter()
+		.map(|token_tree| match token_tree {
+			proc_macro2::TokenTree::Group(group) =>
+				proc_macro2::Group::new(
+					group.delimiter(),
+					replace_self_by_t(group.stream())
+				).into(),
+			proc_macro2::TokenTree::Ident(ident) if ident == "Self" =>
+				proc_macro2::Ident::new("T", ident.span()).into(),
+			other @ _ => other
+		})
+		.collect()
+}
+
+impl ConfigDef {
+	pub fn try_from(
+		frame_system: &syn::Ident,
+		index: usize,
+		item: &mut syn::Item
+	) -> syn::Result<Self> {
+		let item = if let syn::Item::Trait(item) = item {
+			item
+		} else {
+			let msg = "Invalid pallet::config, expected trait definition";
+			return Err(syn::Error::new(item.span(), msg));
+		};
+
+		if !matches!(item.vis, syn::Visibility::Public(_)) {
+			let msg = "Invalid pallet::config, trait must be public";
+			return Err(syn::Error::new(item.span(), msg));
+		}
+
+		syn::parse2::<keyword::Config>(item.ident.to_token_stream())?;
+
+
+		let where_clause = {
+			let stream = replace_self_by_t(item.generics.where_clause.to_token_stream());
+			syn::parse2::<Option<syn::WhereClause>>(stream)
+				.expect("Internal error: replacing `Self` by `T` should result in valid where
+					clause")
+		};
+
+		if item.generics.params.len() > 1 {
+			let msg = "Invalid pallet::config, expected no more than one generic";
+			return Err(syn::Error::new(item.generics.params[2].span(), msg));
+		}
+
+		let has_instance = if let Some(_) = item.generics.params.first() {
+			helper::check_config_def_gen(&item.generics, item.ident.span())?;
+			true
+		} else {
+			false
+		};
+
+		let mut has_event_type = false;
+		let mut consts_metadata = vec![];
+		for trait_item in &mut item.items {
+			// Parse for event
+			has_event_type = has_event_type
+				|| check_event_type(frame_system, trait_item, has_instance)?;
+
+			// Parse for constant
+			let type_attrs_const: Vec<TypeAttrConst> = helper::take_item_attrs(trait_item)?;
+
+			if type_attrs_const.len() > 1 {
+				let msg = "Invalid attribute in pallet::config, only one attribute is expected";
+				return Err(syn::Error::new(type_attrs_const[1].span(), msg));
+			}
+
+			if type_attrs_const.len() == 1 {
+				match trait_item {
+					syn::TraitItem::Type(type_) => {
+						let constant = syn::parse2::<ConstMetadataDef>(type_.to_token_stream())
+							.map_err(|e| {
+								let error_msg = "Invalid usage of `#[pallet::constant]`, syntax \
+									must be `type $SomeIdent: Get<$SomeType>;`";
+								let mut err = syn::Error::new(type_.span(), error_msg);
+								err.combine(e);
+								err
+							})?;
+
+						consts_metadata.push(constant);
+					},
+					_ => {
+						let msg = "Invalid pallet::constant in pallet::config, expected type trait \
+							item";
+						return Err(syn::Error::new(trait_item.span(), msg));
+					},
+				}
+			}
+		}
+
+		let attr: Option<DisableFrameSystemSupertraitCheck> = helper::take_first_item_attr(
+			&mut item.attrs
+		)?;
+
+		let disable_system_supertrait_check = attr.is_some();
+
+		let has_frame_system_supertrait = item.supertraits.iter().any(|s| {
+			syn::parse2::<ConfigBoundParse>(s.to_token_stream())
+				.map_or(false, |b| b.0 == *frame_system)
+		});
+
+		if !has_frame_system_supertrait && !disable_system_supertrait_check {
+			let found = if item.supertraits.is_empty() {
+				"none".to_string()
+			} else {
+				let mut found = item.supertraits.iter()
+					.fold(String::new(), |acc, s| {
+						format!("{}`{}`, ", acc, quote::quote!(#s).to_string())
+					});
+				found.pop();
+				found.pop();
+				found
+			};
+
+			let msg = format!(
+				"Invalid pallet::trait, expected explicit `{}::Config` as supertrait, \
+				found {}. \
+				(try `pub trait Config: frame_system::Config {{ ...` or \
+				`pub trait Config<I: 'static>: frame_system::Config {{ ...`). \
+				To disable this check, use `#[pallet::disable_frame_system_supertrait_check]`",
+				frame_system,
+				found,
+			);
+			return Err(syn::Error::new(item.span(), msg));
+		}
+
+		Ok(Self {
+			index,
+			has_instance,
+			consts_metadata,
+			has_event_type,
+			where_clause,
+		})
+	}
+}
diff --git a/frame/support/procedural/src/pallet/parse/error.rs b/frame/support/procedural/src/pallet/parse/error.rs
new file mode 100644
index 000000000000..0bdf8e73b374
--- /dev/null
+++ b/frame/support/procedural/src/pallet/parse/error.rs
@@ -0,0 +1,86 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use super::helper;
+use syn::spanned::Spanned;
+use quote::ToTokens;
+
+/// List of additional token to be used for parsing.
+mod keyword {
+	syn::custom_keyword!(Error);
+}
+
+/// This checks error declaration as a enum declaration with only variants without fields nor
+/// discriminant.
+pub struct ErrorDef {
+	/// The index of error item in pallet module.
+	pub index: usize,
+	/// Variants ident and doc literals (ordered as declaration order)
+	pub variants: Vec<(syn::Ident, Vec<syn::Lit>)>,
+	/// A set of usage of instance, must be check for consistency with trait.
+	pub instances: Vec<helper::InstanceUsage>,
+	/// The keyword error used (contains span).
+	pub error: keyword::Error
+}
+
+impl ErrorDef {
+	pub fn try_from(index: usize, item: &mut syn::Item) -> syn::Result<Self> {
+		let item = if let syn::Item::Enum(item) = item {
+			item
+		} else {
+			return Err(syn::Error::new(item.span(), "Invalid pallet::error, expected item enum"));
+		};
+		if !matches!(item.vis, syn::Visibility::Public(_)) {
+			let msg = "Invalid pallet::error, `Error` must be public";
+			return Err(syn::Error::new(item.span(), msg));
+		}
+
+		let mut instances = vec![];
+		instances.push(helper::check_type_def_gen_no_bounds(&item.generics, item.ident.span())?);
+
+		if item.generics.where_clause.is_some() {
+			let msg = "Invalid pallet::error, unexpected where clause";
+			return Err(syn::Error::new(item.generics.where_clause.as_ref().unwrap().span(), msg));
+		}
+
+		let error = syn::parse2::<keyword::Error>(item.ident.to_token_stream())?;
+
+		let variants = item.variants.iter()
+			.map(|variant| {
+				if !matches!(variant.fields, syn::Fields::Unit) {
+					let msg = "Invalid pallet::error, unexpected fields, must be `Unit`";
+					return Err(syn::Error::new(variant.fields.span(), msg));
+				}
+				if variant.discriminant.is_some() {
+					let msg = "Invalid pallet::error, unexpected discriminant, discriminant \
+						are not supported";
+					let span = variant.discriminant.as_ref().unwrap().0.span();
+					return Err(syn::Error::new(span, msg));
+				}
+
+				Ok((variant.ident.clone(), helper::get_doc_literals(&variant.attrs)))
+			})
+			.collect::<Result<_, _>>()?;
+
+		Ok(ErrorDef {
+			index,
+			variants,
+			instances,
+			error,
+		})
+	}
+}
diff --git a/frame/support/procedural/src/pallet/parse/event.rs b/frame/support/procedural/src/pallet/parse/event.rs
new file mode 100644
index 000000000000..6b83ca4bf044
--- /dev/null
+++ b/frame/support/procedural/src/pallet/parse/event.rs
@@ -0,0 +1,220 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use super::helper;
+use syn::spanned::Spanned;
+use quote::ToTokens;
+use frame_support_procedural_tools::clean_type_string;
+
+/// List of additional token to be used for parsing.
+mod keyword {
+	syn::custom_keyword!(metadata);
+	syn::custom_keyword!(Event);
+	syn::custom_keyword!(pallet);
+	syn::custom_keyword!(generate_deposit);
+	syn::custom_keyword!(deposit_event);
+}
+
+/// Definition for pallet event enum.
+pub struct EventDef {
+	/// The index of event item in pallet module.
+	pub index: usize,
+	/// The keyword Event used (contains span).
+	pub event: keyword::Event,
+	/// Event metadatas: `(name, args, docs)`.
+	pub metadata: Vec<(syn::Ident, Vec<String>, Vec<syn::Lit>)>,
+	/// A set of usage of instance, must be check for consistency with trait.
+	pub instances: Vec<helper::InstanceUsage>,
+	/// The kind of generic the type `Event` has.
+	pub gen_kind: super::GenericKind,
+	/// Whether the function `deposit_event` must be generated.
+	pub deposit_event: Option<(syn::Visibility, proc_macro2::Span)>,
+	/// Where clause used in event definition.
+	pub where_clause: Option<syn::WhereClause>,
+}
+
+/// Attribute for Event: defines metadata name to use.
+///
+/// Syntax is:
+/// * `#[pallet::metadata(SomeType = MetadataName, ...)]`
+/// * `#[pallet::generate_deposit($vis fn deposit_event)]`
+enum PalletEventAttr {
+	Metadata {
+		metadata: Vec<(syn::Type, String)>,
+		// Span of the attribute
+		span: proc_macro2::Span,
+	},
+	DepositEvent {
+		fn_vis: syn::Visibility,
+		// Span for the keyword deposit_event
+		fn_span: proc_macro2::Span,
+		// Span of the attribute
+		span: proc_macro2::Span,
+	},
+}
+
+impl PalletEventAttr {
+	fn span(&self) -> proc_macro2::Span {
+		match self {
+			Self::Metadata { span, .. } => span.clone(),
+			Self::DepositEvent { span, .. } => span.clone(),
+		}
+	}
+}
+
+/// Parse for syntax `$Type = "$SomeString"`.
+fn parse_event_metadata_element(
+	input: syn::parse::ParseStream
+) -> syn::Result<(syn::Type, String)> {
+	let typ = input.parse::<syn::Type>()?;
+	input.parse::<syn::Token![=]>()?;
+	let ident = input.parse::<syn::LitStr>()?;
+	Ok((typ, ident.value()))
+}
+
+impl syn::parse::Parse for PalletEventAttr {
+	fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+		input.parse::<syn::Token![#]>()?;
+		let content;
+		syn::bracketed!(content in input);
+		content.parse::<keyword::pallet>()?;
+		content.parse::<syn::Token![::]>()?;
+
+		let lookahead = content.lookahead1();
+		if lookahead.peek(keyword::metadata) {
+			let span = content.parse::<keyword::metadata>()?.span();
+			let metadata_content;
+			syn::parenthesized!(metadata_content in content);
+
+			let metadata = metadata_content
+				.parse_terminated::<_, syn::Token![,]>(parse_event_metadata_element)?
+				.into_pairs()
+				.map(syn::punctuated::Pair::into_value)
+				.collect();
+
+			Ok(PalletEventAttr::Metadata { metadata, span })
+		} else if lookahead.peek(keyword::generate_deposit) {
+			let span = content.parse::<keyword::generate_deposit>()?.span();
+
+			let generate_content;
+			syn::parenthesized!(generate_content in content);
+			let fn_vis = generate_content.parse::<syn::Visibility>()?;
+			generate_content.parse::<syn::Token![fn]>()?;
+			let fn_span = generate_content.parse::<keyword::deposit_event>()?.span();
+
+
+			Ok(PalletEventAttr::DepositEvent { fn_vis, span, fn_span })
+		} else {
+			Err(lookahead.error())
+		}
+	}
+}
+
+struct PalletEventAttrInfo {
+	metadata: Option<Vec<(syn::Type, String)>>,
+	deposit_event: Option<(syn::Visibility, proc_macro2::Span)>,
+}
+
+impl PalletEventAttrInfo {
+	fn from_attrs(attrs: Vec<PalletEventAttr>) -> syn::Result<Self> {
+		let mut metadata = None;
+		let mut deposit_event = None;
+		for attr in attrs {
+			match attr {
+				PalletEventAttr::Metadata { metadata: m, .. } if metadata.is_none() =>
+					metadata = Some(m),
+				PalletEventAttr::DepositEvent { fn_vis, fn_span, .. } if deposit_event.is_none() =>
+					deposit_event = Some((fn_vis, fn_span)),
+				attr => {
+					return Err(syn::Error::new(attr.span(), "Duplicate attribute"));
+				}
+			}
+		}
+
+		Ok(PalletEventAttrInfo { metadata, deposit_event })
+	}
+}
+
+impl EventDef {
+	pub fn try_from(index: usize, item: &mut syn::Item) -> syn::Result<Self> {
+		let item = if let syn::Item::Enum(item) = item {
+			item
+		} else {
+			return Err(syn::Error::new(item.span(), "Invalid pallet::event, expected item enum"))
+		};
+
+		let event_attrs: Vec<PalletEventAttr> = helper::take_item_attrs(&mut item.attrs)?;
+		let attr_info = PalletEventAttrInfo::from_attrs(event_attrs)?;
+		let metadata = attr_info.metadata.unwrap_or_else(|| vec![]);
+		let deposit_event = attr_info.deposit_event;
+
+		if !matches!(item.vis, syn::Visibility::Public(_)) {
+			let msg = "Invalid pallet::event, `Error` must be public";
+			return Err(syn::Error::new(item.span(), msg));
+		}
+
+		let where_clause = item.generics.where_clause.clone();
+
+		let mut instances = vec![];
+		// NOTE: Event is not allowed to be only generic on I because it is not supported
+		// by construct_runtime.
+		if let Some(u) = helper::check_type_def_optional_gen(&item.generics, item.ident.span())? {
+			instances.push(u);
+		} else {
+			// construct_runtime only allow non generic event for non instantiable pallet.
+			instances.push(helper::InstanceUsage {
+				has_instance: false,
+				span: item.ident.span(),
+			})
+		}
+
+		let has_instance = item.generics.type_params().any(|t| t.ident == "I");
+		let has_config = item.generics.type_params().any(|t| t.ident == "T");
+		let gen_kind = super::GenericKind::from_gens(has_config, has_instance)
+			.expect("Checked by `helper::check_type_def_optional_gen` above");
+
+		let event = syn::parse2::<keyword::Event>(item.ident.to_token_stream())?;
+
+		let metadata = item.variants.iter()
+			.map(|variant| {
+				let name = variant.ident.clone();
+				let docs = helper::get_doc_literals(&variant.attrs);
+				let args = variant.fields.iter()
+					.map(|field| {
+						metadata.iter().find(|m| m.0 == field.ty)
+							.map(|m| m.1.clone())
+							.unwrap_or_else(|| {
+								clean_type_string(&field.ty.to_token_stream().to_string())
+							})
+					})
+					.collect();
+
+				(name, args, docs)
+			})
+			.collect();
+
+		Ok(EventDef {
+			index,
+			metadata,
+			instances,
+			deposit_event,
+			event,
+			gen_kind,
+			where_clause,
+		})
+	}
+}
diff --git a/frame/support/procedural/src/pallet/parse/extra_constants.rs b/frame/support/procedural/src/pallet/parse/extra_constants.rs
new file mode 100644
index 000000000000..f37c7135de8f
--- /dev/null
+++ b/frame/support/procedural/src/pallet/parse/extra_constants.rs
@@ -0,0 +1,121 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use super::helper;
+use syn::spanned::Spanned;
+
+/// List of additional token to be used for parsing.
+mod keyword {
+	syn::custom_keyword!(DispatchResultWithPostInfo);
+	syn::custom_keyword!(Call);
+	syn::custom_keyword!(OriginFor);
+	syn::custom_keyword!(weight);
+	syn::custom_keyword!(compact);
+	syn::custom_keyword!(T);
+	syn::custom_keyword!(pallet);
+}
+
+/// Definition of extra constants typically `impl<T: Config> Pallet<T> { ... }`
+pub struct ExtraConstantsDef {
+	/// The where_clause used.
+	pub where_clause: Option<syn::WhereClause>,
+	/// A set of usage of instance, must be check for consistency with trait.
+	pub instances: Vec<helper::InstanceUsage>,
+	/// The index of call item in pallet module.
+	pub index: usize,
+	/// The extra constant defined.
+	pub extra_constants: Vec<ExtraConstantDef>,
+}
+
+/// Input definition for an constant in pallet.
+pub struct ExtraConstantDef {
+	/// Name of the function
+	pub ident: syn::Ident,
+	/// The type returned by the function
+	pub type_: syn::Type,
+	/// The doc associated
+	pub doc: Vec<syn::Lit>,
+}
+
+impl ExtraConstantsDef {
+	pub fn try_from(
+		index: usize,
+		item: &mut syn::Item
+	) -> syn::Result<Self> {
+		let item = if let syn::Item::Impl(item) = item {
+			item
+		} else {
+			return Err(syn::Error::new(item.span(), "Invalid pallet::call, expected item impl"));
+		};
+
+		let mut instances = vec![];
+		instances.push(helper::check_impl_gen(&item.generics, item.impl_token.span())?);
+		instances.push(helper::check_pallet_struct_usage(&item.self_ty)?);
+
+		if let Some((_, _, for_)) = item.trait_ {
+			let msg = "Invalid pallet::call, expected no trait ident as in \
+				`impl<..> Pallet<..> { .. }`";
+			return Err(syn::Error::new(for_.span(), msg))
+		}
+
+		let mut extra_constants = vec![];
+		for impl_item in &mut item.items {
+			let method = if let syn::ImplItem::Method(method) = impl_item {
+				method
+			} else {
+				let msg = "Invalid pallet::call, only method accepted";
+				return Err(syn::Error::new(impl_item.span(), msg));
+			};
+
+			if method.sig.inputs.len() != 0 {
+				let msg = "Invalid pallet::extra_constants, method must have 0 args";
+				return Err(syn::Error::new(method.sig.span(), msg));
+			}
+
+			if method.sig.generics.params.len() != 0 {
+				let msg = "Invalid pallet::extra_constants, method must have 0 generics";
+				return Err(syn::Error::new(method.sig.generics.params[0].span(), msg));
+			}
+
+			if method.sig.generics.where_clause.is_some() {
+				let msg = "Invalid pallet::extra_constants, method must have no where clause";
+				return Err(syn::Error::new(method.sig.generics.where_clause.span(), msg));
+			}
+
+			let type_ = match &method.sig.output {
+				syn::ReturnType::Default => {
+					let msg = "Invalid pallet::extra_constants, method must have a return type";
+					return Err(syn::Error::new(method.span(), msg));
+				},
+				syn::ReturnType::Type(_, type_) => *type_.clone(),
+			};
+
+			extra_constants.push(ExtraConstantDef {
+				ident: method.sig.ident.clone(),
+				type_,
+				doc: helper::get_doc_literals(&method.attrs),
+			});
+		}
+
+		Ok(Self {
+			index,
+			instances,
+			where_clause: item.generics.where_clause.clone(),
+			extra_constants,
+		})
+	}
+}
diff --git a/frame/support/procedural/src/pallet/parse/genesis_build.rs b/frame/support/procedural/src/pallet/parse/genesis_build.rs
new file mode 100644
index 000000000000..79c64b8a1a9c
--- /dev/null
+++ b/frame/support/procedural/src/pallet/parse/genesis_build.rs
@@ -0,0 +1,56 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use syn::spanned::Spanned;
+use super::helper;
+
+/// Definition for pallet genesis build implementation.
+pub struct GenesisBuildDef {
+	/// The index of item in pallet module.
+	pub index: usize,
+	/// A set of usage of instance, must be check for consistency with trait.
+	pub instances: Vec<helper::InstanceUsage>,
+	/// The where_clause used.
+	pub where_clause: Option<syn::WhereClause>,
+}
+
+impl GenesisBuildDef {
+	pub fn try_from(index: usize, item: &mut syn::Item) -> syn::Result<Self> {
+		let item = if let syn::Item::Impl(item) = item {
+			item
+		} else {
+			let msg = "Invalid pallet::genesis_build, expected item impl";
+			return Err(syn::Error::new(item.span(), msg));
+		};
+
+		let item_trait = &item.trait_.as_ref()
+			.ok_or_else(|| {
+				let msg = "Invalid pallet::genesis_build, expected impl<..> GenesisBuild<..> \
+					for GenesisConfig<..>";
+				syn::Error::new(item.span(), msg)
+			})?.1;
+
+		let mut instances = vec![];
+		instances.push(helper::check_genesis_builder_usage(&item_trait)?);
+
+		Ok(Self {
+			index,
+			instances,
+			where_clause: item.generics.where_clause.clone(),
+		})
+	}
+}
diff --git a/frame/support/procedural/src/pallet/parse/genesis_config.rs b/frame/support/procedural/src/pallet/parse/genesis_config.rs
new file mode 100644
index 000000000000..f42fcc6dac3d
--- /dev/null
+++ b/frame/support/procedural/src/pallet/parse/genesis_config.rs
@@ -0,0 +1,78 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use syn::spanned::Spanned;
+use super::helper;
+
+/// Definition for pallet genesis config type.
+///
+/// Either:
+/// * `struct GenesisConfig`
+/// * `enum GenesisConfig`
+pub struct GenesisConfigDef {
+	/// The index of item in pallet module.
+	pub index: usize,
+	/// The kind of generic the type `GenesisConfig` has.
+	pub gen_kind: super::GenericKind,
+	/// A set of usage of instance, must be check for consistency with trait.
+	pub instances: Vec<helper::InstanceUsage>,
+	/// The ident of genesis_config, can be used for span.
+	pub genesis_config: syn::Ident,
+}
+
+impl GenesisConfigDef {
+	pub fn try_from(index: usize, item: &mut syn::Item) -> syn::Result<Self> {
+		let item_span = item.span();
+		let (vis, ident, generics) = match &item {
+			syn::Item::Enum(item) => (&item.vis, &item.ident, &item.generics),
+			syn::Item::Struct(item) => (&item.vis, &item.ident, &item.generics),
+			_ => {
+				let msg = "Invalid pallet::genesis_config, expected enum or struct";
+				return Err(syn::Error::new(item.span(), msg));
+			},
+		};
+
+		let mut instances = vec![];
+		// NOTE: GenesisConfig is not allowed to be only generic on I because it is not supported
+		// by construct_runtime.
+		if let Some(u) = helper::check_type_def_optional_gen(&generics, ident.span())? {
+			instances.push(u);
+		}
+
+		let has_instance = generics.type_params().any(|t| t.ident == "I");
+		let has_config = generics.type_params().any(|t| t.ident == "T");
+		let gen_kind = super::GenericKind::from_gens(has_config, has_instance)
+			.expect("Checked by `helper::check_type_def_optional_gen` above");
+
+		if !matches!(vis, syn::Visibility::Public(_)) {
+			let msg = "Invalid pallet::genesis_config, GenesisConfig must be public";
+			return Err(syn::Error::new(item_span, msg));
+		}
+
+		if ident != "GenesisConfig" {
+			let msg = "Invalid pallet::genesis_config, ident must `GenesisConfig`";
+			return Err(syn::Error::new(ident.span(), msg));
+		}
+
+		Ok(GenesisConfigDef {
+			index,
+			genesis_config: ident.clone(),
+			instances,
+			gen_kind,
+		})
+	}
+}
diff --git a/frame/support/procedural/src/pallet/parse/helper.rs b/frame/support/procedural/src/pallet/parse/helper.rs
new file mode 100644
index 000000000000..cbf09ee23175
--- /dev/null
+++ b/frame/support/procedural/src/pallet/parse/helper.rs
@@ -0,0 +1,600 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use syn::spanned::Spanned;
+use quote::ToTokens;
+
+/// List of additional token to be used for parsing.
+mod keyword {
+	syn::custom_keyword!(I);
+	syn::custom_keyword!(compact);
+	syn::custom_keyword!(GenesisBuild);
+	syn::custom_keyword!(Config);
+	syn::custom_keyword!(T);
+	syn::custom_keyword!(Pallet);
+	syn::custom_keyword!(origin);
+}
+
+/// A usage of instance, either the trait `Config` has been used with instance or without instance.
+/// Used to check for consistency.
+#[derive(Clone)]
+pub struct InstanceUsage {
+	pub has_instance: bool,
+	pub span: proc_macro2::Span,
+}
+
+/// Trait implemented for syn items to get mutable references on their attributes.
+///
+/// NOTE: verbatim variants are not supported.
+pub trait MutItemAttrs {
+	fn mut_item_attrs(&mut self) -> Option<&mut Vec<syn::Attribute>>;
+}
+
+/// Take the first pallet attribute (e.g. attribute like `#[pallet..]`) and decode it to `Attr`
+pub fn take_first_item_attr<Attr>(item: &mut impl MutItemAttrs) -> syn::Result<Option<Attr>> where
+	Attr: syn::parse::Parse,
+{
+	let attrs = if let Some(attrs) = item.mut_item_attrs() {
+		attrs
+	} else {
+		return Ok(None)
+	};
+
+	if let Some(index) = attrs.iter()
+		.position(|attr|
+			attr.path.segments.first().map_or(false, |segment| segment.ident == "pallet")
+		)
+	{
+		let pallet_attr = attrs.remove(index);
+		Ok(Some(syn::parse2(pallet_attr.into_token_stream())?))
+	} else {
+		Ok(None)
+	}
+}
+
+/// Take all the pallet attributes (e.g. attribute like `#[pallet..]`) and decode them to `Attr`
+pub fn take_item_attrs<Attr>(item: &mut impl MutItemAttrs) -> syn::Result<Vec<Attr>> where
+	Attr: syn::parse::Parse,
+{
+	let mut pallet_attrs = Vec::new();
+
+	while let Some(attr) = take_first_item_attr(item)? {
+		pallet_attrs.push(attr)
+	}
+
+	Ok(pallet_attrs)
+}
+
+impl MutItemAttrs for syn::Item {
+	fn mut_item_attrs(&mut self) -> Option<&mut Vec<syn::Attribute>> {
+		match self {
+			Self::Const(item) => Some(item.attrs.as_mut()),
+			Self::Enum(item) => Some(item.attrs.as_mut()),
+			Self::ExternCrate(item) => Some(item.attrs.as_mut()),
+			Self::Fn(item) => Some(item.attrs.as_mut()),
+			Self::ForeignMod(item) => Some(item.attrs.as_mut()),
+			Self::Impl(item) => Some(item.attrs.as_mut()),
+			Self::Macro(item) => Some(item.attrs.as_mut()),
+			Self::Macro2(item) => Some(item.attrs.as_mut()),
+			Self::Mod(item) => Some(item.attrs.as_mut()),
+			Self::Static(item) => Some(item.attrs.as_mut()),
+			Self::Struct(item) => Some(item.attrs.as_mut()),
+			Self::Trait(item) => Some(item.attrs.as_mut()),
+			Self::TraitAlias(item) => Some(item.attrs.as_mut()),
+			Self::Type(item) => Some(item.attrs.as_mut()),
+			Self::Union(item) => Some(item.attrs.as_mut()),
+			Self::Use(item) => Some(item.attrs.as_mut()),
+			Self::Verbatim(_) => None,
+			Self::__Nonexhaustive => None,
+		}
+	}
+}
+
+
+impl MutItemAttrs for syn::TraitItem {
+	fn mut_item_attrs(&mut self) -> Option<&mut Vec<syn::Attribute>> {
+		match self {
+			Self::Const(item) => Some(item.attrs.as_mut()),
+			Self::Method(item) => Some(item.attrs.as_mut()),
+			Self::Type(item) => Some(item.attrs.as_mut()),
+			Self::Macro(item) => Some(item.attrs.as_mut()),
+			Self::Verbatim(_) => None,
+			Self::__Nonexhaustive => None,
+		}
+	}
+}
+
+impl MutItemAttrs for Vec<syn::Attribute> {
+	fn mut_item_attrs(&mut self) -> Option<&mut Vec<syn::Attribute>> {
+		Some(self)
+	}
+}
+
+impl MutItemAttrs for syn::ItemMod {
+	fn mut_item_attrs(&mut self) -> Option<&mut Vec<syn::Attribute>> {
+		Some(&mut self.attrs)
+	}
+}
+
+/// Return all doc attributes literals found.
+pub fn get_doc_literals(attrs: &Vec<syn::Attribute>) -> Vec<syn::Lit> {
+	attrs.iter()
+		.filter_map(|attr| {
+			if let Ok(syn::Meta::NameValue(meta)) = attr.parse_meta() {
+				if meta.path.get_ident().map_or(false, |ident| ident == "doc") {
+					Some(meta.lit.clone())
+				} else {
+					None
+				}
+			} else {
+				None
+			}
+		})
+		.collect()
+}
+
+/// Parse for `()`
+struct Unit;
+impl syn::parse::Parse for Unit {
+	fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+		let content;
+		syn::parenthesized!(content in input);
+		if !content.is_empty() {
+			let msg = "unexpected tokens, expected nothing inside parenthesis as `()`";
+			return Err(syn::Error::new(content.span(), msg));
+		}
+		Ok(Self)
+	}
+}
+
+/// Parse for `'static`
+struct StaticLifetime;
+impl syn::parse::Parse for StaticLifetime {
+	fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+		let lifetime = input.parse::<syn::Lifetime>()?;
+		if lifetime.ident != "static" {
+			let msg = "unexpected tokens, expected `static`";
+			return Err(syn::Error::new(lifetime.ident.span(), msg));
+		}
+		Ok(Self)
+	}
+}
+
+/// Check the syntax: `I: 'static = ()`
+///
+/// `span` is used in case generics is empty (empty generics has span == call_site).
+///
+/// return the instance if found.
+pub fn check_config_def_gen(
+	gen: &syn::Generics,
+	span: proc_macro2::Span,
+) -> syn::Result<()> {
+	let expected = "expected `I: 'static = ()`";
+	pub struct CheckTraitDefGenerics;
+	impl syn::parse::Parse for CheckTraitDefGenerics {
+		fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+			input.parse::<keyword::I>()?;
+			input.parse::<syn::Token![:]>()?;
+			input.parse::<StaticLifetime>()?;
+			input.parse::<syn::Token![=]>()?;
+			input.parse::<Unit>()?;
+
+			Ok(Self)
+		}
+	}
+
+	syn::parse2::<CheckTraitDefGenerics>(gen.params.to_token_stream())
+		.map_err(|e| {
+			let msg = format!("Invalid generics: {}", expected);
+			let mut err = syn::Error::new(span, msg);
+			err.combine(e);
+			err
+		})?;
+
+	Ok(())
+}
+
+/// Check the syntax:
+/// * either `T`
+/// * or `T, I = ()`
+///
+/// `span` is used in case generics is empty (empty generics has span == call_site).
+///
+/// return the instance if found.
+pub fn check_type_def_gen_no_bounds(
+	gen: &syn::Generics,
+	span: proc_macro2::Span,
+) -> syn::Result<InstanceUsage> {
+	let expected = "expected `T` or `T, I = ()`";
+	pub struct Checker(InstanceUsage);
+	impl syn::parse::Parse for Checker {
+		fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+			let mut instance_usage = InstanceUsage {
+				has_instance: false,
+				span: input.span(),
+			};
+
+			input.parse::<keyword::T>()?;
+			if input.peek(syn::Token![,]) {
+				instance_usage.has_instance = true;
+				input.parse::<syn::Token![,]>()?;
+				input.parse::<keyword::I>()?;
+				input.parse::<syn::Token![=]>()?;
+				input.parse::<Unit>()?;
+			}
+
+			Ok(Self(instance_usage))
+		}
+	}
+
+	let i = syn::parse2::<Checker>(gen.params.to_token_stream())
+		.map_err(|e| {
+			let msg = format!("Invalid type def generics: {}", expected);
+			let mut err = syn::Error::new(span, msg);
+			err.combine(e);
+			err
+		})?.0;
+
+	Ok(i)
+}
+
+/// Check the syntax:
+/// * either `` (no generics
+/// * or `T`
+/// * or `T: Config`
+/// * or `T, I = ()`
+/// * or `T: Config<I>, I: 'static = ()`
+///
+/// `span` is used in case generics is empty (empty generics has span == call_site).
+///
+/// return some instance usage if there is some generic, or none otherwise.
+pub fn check_type_def_optional_gen(
+	gen: &syn::Generics,
+	span: proc_macro2::Span,
+) -> syn::Result<Option<InstanceUsage>> {
+	let expected = "expected `` or `T` or `T: Config` or `T, I = ()` or \
+		`T: Config<I>, I: 'static = ()`";
+	pub struct Checker(Option<InstanceUsage>);
+	impl syn::parse::Parse for Checker {
+		fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+			if input.is_empty() {
+				return Ok(Self(None))
+			}
+
+			let mut instance_usage = InstanceUsage {
+				span: input.span(),
+				has_instance: false,
+			};
+
+			input.parse::<keyword::T>()?;
+
+			if input.is_empty() {
+				return Ok(Self(Some(instance_usage)))
+			}
+
+			let lookahead = input.lookahead1();
+			if lookahead.peek(syn::Token![,]) {
+				instance_usage.has_instance = true;
+				input.parse::<syn::Token![,]>()?;
+				input.parse::<keyword::I>()?;
+				input.parse::<syn::Token![=]>()?;
+				input.parse::<Unit>()?;
+
+				Ok(Self(Some(instance_usage)))
+			} else if lookahead.peek(syn::Token![:]) {
+				input.parse::<syn::Token![:]>()?;
+				input.parse::<keyword::Config>()?;
+
+				if input.is_empty() {
+					return Ok(Self(Some(instance_usage)))
+				}
+
+				instance_usage.has_instance = true;
+				input.parse::<syn::Token![<]>()?;
+				input.parse::<keyword::I>()?;
+				input.parse::<syn::Token![>]>()?;
+				input.parse::<syn::Token![,]>()?;
+				input.parse::<keyword::I>()?;
+				input.parse::<syn::Token![:]>()?;
+				input.parse::<StaticLifetime>()?;
+				input.parse::<syn::Token![=]>()?;
+				input.parse::<Unit>()?;
+
+				Ok(Self(Some(instance_usage)))
+			} else {
+				Err(lookahead.error())
+			}
+		}
+	}
+
+	let i = syn::parse2::<Checker>(gen.params.to_token_stream())
+		.map_err(|e| {
+			let msg = format!("Invalid type def generics: {}", expected);
+			let mut err = syn::Error::new(span, msg);
+			err.combine(e);
+			err
+		})?.0
+		// Span can be call_site if generic is empty. Thus we replace it.
+		.map(|mut i| { i.span = span; i });
+
+	Ok(i)
+}
+
+/// Check the syntax:
+/// * either `Pallet<T>`
+/// * or `Pallet<T, I>`
+///
+/// return the instance if found.
+pub fn check_pallet_struct_usage(type_: &Box<syn::Type>) -> syn::Result<InstanceUsage> {
+	let expected = "expected `Pallet<T>` or `Pallet<T, I>`";
+	pub struct Checker(InstanceUsage);
+	impl syn::parse::Parse for Checker {
+		fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+			let mut instance_usage = InstanceUsage {
+				span: input.span(),
+				has_instance: false,
+			};
+
+			input.parse::<keyword::Pallet>()?;
+			input.parse::<syn::Token![<]>()?;
+			input.parse::<keyword::T>()?;
+			if input.peek(syn::Token![,]) {
+				instance_usage.has_instance = true;
+				input.parse::<syn::Token![,]>()?;
+				input.parse::<keyword::I>()?;
+			}
+			input.parse::<syn::Token![>]>()?;
+
+			Ok(Self(instance_usage))
+		}
+	}
+
+	let i = syn::parse2::<Checker>(type_.to_token_stream())
+		.map_err(|e| {
+			let msg = format!("Invalid pallet struct: {}", expected);
+			let mut err = syn::Error::new(type_.span(), msg);
+			err.combine(e);
+			err
+		})?.0;
+
+	Ok(i)
+}
+
+/// Check the generic is:
+/// * either `T: Config`
+/// * or `T: Config<I>, I: 'static`
+///
+/// `span` is used in case generics is empty (empty generics has span == call_site).
+///
+/// return whether it contains instance.
+pub fn check_impl_gen(
+	gen: &syn::Generics,
+	span: proc_macro2::Span
+) -> syn::Result<InstanceUsage> {
+	let expected = "expected `impl<T: Config>` or `impl<T: Config<I>, I: 'static>`";
+	pub struct Checker(InstanceUsage);
+	impl syn::parse::Parse for Checker {
+		fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+			let mut instance_usage = InstanceUsage {
+				span: input.span(),
+				has_instance: false,
+			};
+
+			input.parse::<keyword::T>()?;
+			input.parse::<syn::Token![:]>()?;
+			input.parse::<keyword::Config>()?;
+			if input.peek(syn::Token![<]) {
+				instance_usage.has_instance = true;
+				input.parse::<syn::Token![<]>()?;
+				input.parse::<keyword::I>()?;
+				input.parse::<syn::Token![>]>()?;
+				input.parse::<syn::Token![,]>()?;
+				input.parse::<keyword::I>()?;
+				input.parse::<syn::Token![:]>()?;
+				input.parse::<StaticLifetime>()?;
+			}
+
+			Ok(Self(instance_usage))
+		}
+	}
+
+	let i = syn::parse2::<Checker>(gen.params.to_token_stream())
+		.map_err(|e| {
+			let mut err = syn::Error::new(span, format!("Invalid generics: {}", expected));
+			err.combine(e);
+			err
+		})?.0;
+
+	Ok(i)
+}
+
+/// Check the syntax:
+/// * or `T`
+/// * or `T: Config`
+/// * or `T, I = ()`
+/// * or `T: Config<I>, I: 'static = ()`
+///
+/// `span` is used in case generics is empty (empty generics has span == call_site).
+///
+/// return the instance if found.
+pub fn check_type_def_gen(
+	gen: &syn::Generics,
+	span: proc_macro2::Span,
+) -> syn::Result<InstanceUsage> {
+	let expected = "expected `T` or `T: Config` or `T, I = ()` or \
+		`T: Config<I>, I: 'static = ()`";
+	pub struct Checker(InstanceUsage);
+	impl syn::parse::Parse for Checker {
+		fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+			let mut instance_usage = InstanceUsage {
+				span: input.span(),
+				has_instance: false,
+			};
+
+			input.parse::<keyword::T>()?;
+
+			if input.is_empty() {
+				return Ok(Self(instance_usage))
+			}
+
+			let lookahead = input.lookahead1();
+			if lookahead.peek(syn::Token![,]) {
+				instance_usage.has_instance = true;
+				input.parse::<syn::Token![,]>()?;
+				input.parse::<keyword::I>()?;
+				input.parse::<syn::Token![=]>()?;
+				input.parse::<Unit>()?;
+
+				Ok(Self(instance_usage))
+			} else if lookahead.peek(syn::Token![:]) {
+				input.parse::<syn::Token![:]>()?;
+				input.parse::<keyword::Config>()?;
+
+				if input.is_empty() {
+					return Ok(Self(instance_usage))
+				}
+
+				instance_usage.has_instance = true;
+				input.parse::<syn::Token![<]>()?;
+				input.parse::<keyword::I>()?;
+				input.parse::<syn::Token![>]>()?;
+				input.parse::<syn::Token![,]>()?;
+				input.parse::<keyword::I>()?;
+				input.parse::<syn::Token![:]>()?;
+				input.parse::<StaticLifetime>()?;
+				input.parse::<syn::Token![=]>()?;
+				input.parse::<Unit>()?;
+
+				Ok(Self(instance_usage))
+			} else {
+				Err(lookahead.error())
+			}
+		}
+	}
+
+	let mut i = syn::parse2::<Checker>(gen.params.to_token_stream())
+		.map_err(|e| {
+			let msg = format!("Invalid type def generics: {}", expected);
+			let mut err = syn::Error::new(span, msg);
+			err.combine(e);
+			err
+		})?.0;
+
+	// Span can be call_site if generic is empty. Thus we replace it.
+	i.span = span;
+
+	Ok(i)
+}
+
+/// Check the syntax:
+/// * either `GenesisBuild<T>`
+/// * or `GenesisBuild<T, I>`
+///
+/// return the instance if found.
+pub fn check_genesis_builder_usage(type_: &syn::Path) -> syn::Result<InstanceUsage> {
+	let expected = "expected `GenesisBuild<T>` or `GenesisBuild<T, I>`";
+	pub struct Checker(InstanceUsage);
+	impl syn::parse::Parse for Checker {
+		fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+			let mut instance_usage = InstanceUsage {
+				span: input.span(),
+				has_instance: false,
+			};
+
+			input.parse::<keyword::GenesisBuild>()?;
+			input.parse::<syn::Token![<]>()?;
+			input.parse::<keyword::T>()?;
+			if input.peek(syn::Token![,]) {
+				instance_usage.has_instance = true;
+				input.parse::<syn::Token![,]>()?;
+				input.parse::<keyword::I>()?;
+			}
+			input.parse::<syn::Token![>]>()?;
+
+			Ok(Self(instance_usage))
+		}
+	}
+
+	let i = syn::parse2::<Checker>(type_.to_token_stream())
+		.map_err(|e| {
+			let msg = format!("Invalid genesis builder: {}", expected);
+			let mut err = syn::Error::new(type_.span(), msg);
+			err.combine(e);
+			err
+		})?.0;
+
+	Ok(i)
+}
+
+/// Check the syntax:
+/// * either `` (no generics)
+/// * or `T: Config`
+/// * or `T: Config<I>, I: 'static`
+///
+/// `span` is used in case generics is empty (empty generics has span == call_site).
+///
+/// return the instance if found.
+pub fn check_type_value_gen(
+	gen: &syn::Generics,
+	span: proc_macro2::Span,
+) -> syn::Result<Option<InstanceUsage>> {
+	let expected = "expected `` or `T: Config` or `T: Config<I>, I: 'static`";
+	pub struct Checker(Option<InstanceUsage>);
+	impl syn::parse::Parse for Checker {
+		fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+			if input.is_empty() {
+				return Ok(Self(None))
+			}
+
+			input.parse::<keyword::T>()?;
+			input.parse::<syn::Token![:]>()?;
+			input.parse::<keyword::Config>()?;
+
+			let mut instance_usage = InstanceUsage {
+				span: input.span(),
+				has_instance: false,
+			};
+
+			if input.is_empty() {
+				return Ok(Self(Some(instance_usage)))
+			}
+
+			instance_usage.has_instance = true;
+			input.parse::<syn::Token![<]>()?;
+			input.parse::<keyword::I>()?;
+			input.parse::<syn::Token![>]>()?;
+			input.parse::<syn::Token![,]>()?;
+			input.parse::<keyword::I>()?;
+			input.parse::<syn::Token![:]>()?;
+			input.parse::<StaticLifetime>()?;
+
+			Ok(Self(Some(instance_usage)))
+		}
+	}
+
+	let i = syn::parse2::<Checker>(gen.params.to_token_stream())
+		.map_err(|e| {
+			let msg = format!("Invalid type def generics: {}", expected);
+			let mut err = syn::Error::new(span, msg);
+			err.combine(e);
+			err
+		})?.0
+		// Span can be call_site if generic is empty. Thus we replace it.
+		.map(|mut i| { i.span = span; i });
+
+	Ok(i)
+}
diff --git a/frame/support/procedural/src/pallet/parse/hooks.rs b/frame/support/procedural/src/pallet/parse/hooks.rs
new file mode 100644
index 000000000000..93061069f8c3
--- /dev/null
+++ b/frame/support/procedural/src/pallet/parse/hooks.rs
@@ -0,0 +1,69 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use syn::spanned::Spanned;
+use super::helper;
+
+/// Implementation of the pallet hooks.
+pub struct HooksDef {
+	/// The index of item in pallet.
+	pub index: usize,
+	/// A set of usage of instance, must be check for consistency with trait.
+	pub instances: Vec<helper::InstanceUsage>,
+	/// The where_clause used.
+	pub where_clause: Option<syn::WhereClause>,
+}
+
+impl HooksDef {
+	pub fn try_from(index: usize, item: &mut syn::Item) -> syn::Result<Self> {
+		let item = if let syn::Item::Impl(item) = item {
+			item
+		} else {
+			let msg = "Invalid pallet::hooks, expected item impl";
+			return Err(syn::Error::new(item.span(), msg));
+		};
+
+		let mut instances = vec![];
+		instances.push(helper::check_pallet_struct_usage(&item.self_ty)?);
+		instances.push(helper::check_impl_gen(&item.generics, item.impl_token.span())?);
+
+		let item_trait = &item.trait_.as_ref()
+			.ok_or_else(|| {
+				let msg = "Invalid pallet::hooks, expected impl<..> Hooks \
+					for Pallet<..>";
+				syn::Error::new(item.span(), msg)
+			})?.1;
+
+		if item_trait.segments.len() != 1
+			|| item_trait.segments[0].ident != "Hooks"
+		{
+			let msg = format!(
+				"Invalid pallet::hooks, expected trait to be `Hooks` found `{}`\
+				, you can import from `frame_support::pallet_prelude`",
+				quote::quote!(#item_trait)
+			);
+
+			return Err(syn::Error::new(item_trait.span(), msg));
+		}
+
+		Ok(Self {
+			index,
+			instances,
+			where_clause: item.generics.where_clause.clone(),
+		})
+	}
+}
diff --git a/frame/support/procedural/src/pallet/parse/inherent.rs b/frame/support/procedural/src/pallet/parse/inherent.rs
new file mode 100644
index 000000000000..b4dfd71d8a50
--- /dev/null
+++ b/frame/support/procedural/src/pallet/parse/inherent.rs
@@ -0,0 +1,59 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use syn::spanned::Spanned;
+use super::helper;
+
+/// The definition of the pallet inherent implementation.
+pub struct InherentDef {
+	/// The index of inherent item in pallet module.
+	pub index: usize,
+	/// A set of usage of instance, must be check for consistency with trait.
+	pub instances: Vec<helper::InstanceUsage>,
+}
+
+impl InherentDef {
+	pub fn try_from(index: usize, item: &mut syn::Item) -> syn::Result<Self> {
+		let item = if let syn::Item::Impl(item) = item {
+			item
+		} else {
+			let msg = "Invalid pallet::inherent, expected item impl";
+			return Err(syn::Error::new(item.span(), msg));
+		};
+
+		if item.trait_.is_none() {
+			let msg = "Invalid pallet::inherent, expected impl<..> ProvideInherent for Pallet<..>";
+			return Err(syn::Error::new(item.span(), msg));
+		}
+
+		if let Some(last) = item.trait_.as_ref().unwrap().1.segments.last() {
+			if last.ident != "ProvideInherent" {
+				let msg = "Invalid pallet::inherent, expected trait ProvideInherent";
+				return Err(syn::Error::new(last.span(), msg));
+			}
+		} else {
+			let msg = "Invalid pallet::inherent, expected impl<..> ProvideInherent for Pallet<..>";
+			return Err(syn::Error::new(item.span(), msg));
+		}
+
+		let mut instances = vec![];
+		instances.push(helper::check_pallet_struct_usage(&item.self_ty)?);
+		instances.push(helper::check_impl_gen(&item.generics, item.impl_token.span())?);
+
+		Ok(InherentDef { index, instances })
+	}
+}
diff --git a/frame/support/procedural/src/pallet/parse/mod.rs b/frame/support/procedural/src/pallet/parse/mod.rs
new file mode 100644
index 000000000000..085467bdaa2e
--- /dev/null
+++ b/frame/support/procedural/src/pallet/parse/mod.rs
@@ -0,0 +1,461 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Parse for pallet macro.
+//!
+//! Parse the module into `Def` struct through `Def::try_from` function.
+
+pub mod config;
+pub mod pallet_struct;
+pub mod hooks;
+pub mod call;
+pub mod error;
+pub mod origin;
+pub mod inherent;
+pub mod storage;
+pub mod event;
+pub mod helper;
+pub mod genesis_config;
+pub mod genesis_build;
+pub mod validate_unsigned;
+pub mod type_value;
+pub mod extra_constants;
+
+use syn::spanned::Spanned;
+use frame_support_procedural_tools::generate_crate_access_2018;
+
+/// Parsed definition of a pallet.
+pub struct Def {
+	/// The module items.
+	/// (their order must not be modified because they are registered in individual definitions).
+	pub item: syn::ItemMod,
+	pub config: config::ConfigDef,
+	pub pallet_struct: pallet_struct::PalletStructDef,
+	pub hooks: hooks::HooksDef,
+	pub call: call::CallDef,
+	pub storages: Vec<storage::StorageDef>,
+	pub error: Option<error::ErrorDef>,
+	pub event: Option<event::EventDef>,
+	pub origin: Option<origin::OriginDef>,
+	pub inherent: Option<inherent::InherentDef>,
+	pub genesis_config: Option<genesis_config::GenesisConfigDef>,
+	pub genesis_build: Option<genesis_build::GenesisBuildDef>,
+	pub validate_unsigned: Option<validate_unsigned::ValidateUnsignedDef>,
+	pub extra_constants: Option<extra_constants::ExtraConstantsDef>,
+	pub type_values: Vec<type_value::TypeValueDef>,
+	pub frame_system: syn::Ident,
+	pub frame_support: syn::Ident,
+}
+
+impl Def {
+	pub fn try_from(mut item: syn::ItemMod) -> syn::Result<Self> {
+		let frame_system = generate_crate_access_2018("frame-system")?;
+		let frame_support = generate_crate_access_2018("frame-support")?;
+
+		let item_span = item.span().clone();
+		let items = &mut item.content.as_mut()
+			.ok_or_else(|| {
+				let msg = "Invalid pallet definition, expected mod to be inlined.";
+				syn::Error::new(item_span, msg)
+			})?.1;
+
+		let mut config = None;
+		let mut pallet_struct = None;
+		let mut hooks = None;
+		let mut call = None;
+		let mut error = None;
+		let mut event = None;
+		let mut origin = None;
+		let mut inherent = None;
+		let mut genesis_config = None;
+		let mut genesis_build = None;
+		let mut validate_unsigned = None;
+		let mut extra_constants = None;
+		let mut storages = vec![];
+		let mut type_values = vec![];
+
+		for (index, item) in items.iter_mut().enumerate() {
+			let pallet_attr: Option<PalletAttr> = helper::take_first_item_attr(item)?;
+
+			match pallet_attr {
+				Some(PalletAttr::Config(_)) if config.is_none() =>
+					config = Some(config::ConfigDef::try_from(&frame_system, index, item)?),
+				Some(PalletAttr::Pallet(_)) if pallet_struct.is_none() =>
+					pallet_struct = Some(pallet_struct::PalletStructDef::try_from(index, item)?),
+				Some(PalletAttr::Hooks(_)) if hooks.is_none() => {
+					let m = hooks::HooksDef::try_from(index, item)?;
+					hooks = Some(m);
+				},
+				Some(PalletAttr::Call(span)) if call.is_none() =>
+					call = Some(call::CallDef::try_from(span, index, item)?),
+				Some(PalletAttr::Error(_)) if error.is_none() =>
+					error = Some(error::ErrorDef::try_from(index, item)?),
+				Some(PalletAttr::Event(_)) if event.is_none() =>
+					event = Some(event::EventDef::try_from(index, item)?),
+				Some(PalletAttr::GenesisConfig(_)) if genesis_config.is_none() => {
+					genesis_config =
+						Some(genesis_config::GenesisConfigDef::try_from(index, item)?);
+				},
+				Some(PalletAttr::GenesisBuild(_)) if genesis_build.is_none() =>
+					genesis_build = Some(genesis_build::GenesisBuildDef::try_from(index, item)?),
+				Some(PalletAttr::Origin(_)) if origin.is_none() =>
+					origin = Some(origin::OriginDef::try_from(index, item)?),
+				Some(PalletAttr::Inherent(_)) if inherent.is_none() =>
+					inherent = Some(inherent::InherentDef::try_from(index, item)?),
+				Some(PalletAttr::Storage(_)) =>
+					storages.push(storage::StorageDef::try_from(index, item)?),
+				Some(PalletAttr::ValidateUnsigned(_)) if validate_unsigned.is_none() => {
+					let v = validate_unsigned::ValidateUnsignedDef::try_from(index, item)?;
+					validate_unsigned = Some(v);
+				},
+				Some(PalletAttr::TypeValue(_)) =>
+					type_values.push(type_value::TypeValueDef::try_from(index, item)?),
+				Some(PalletAttr::ExtraConstants(_)) => {
+					extra_constants =
+						Some(extra_constants::ExtraConstantsDef::try_from(index, item)?)
+				},
+				Some(attr) => {
+					let msg = "Invalid duplicated attribute";
+					return Err(syn::Error::new(attr.span(), msg));
+				},
+				None => (),
+			}
+		}
+
+		if genesis_config.is_some() != genesis_build.is_some() {
+			let msg = format!(
+				"`#[pallet::genesis_config]` and `#[pallet::genesis_build]` attributes must be \
+				either both used or both not used, instead genesis_config is {} and genesis_build \
+				is {}",
+				genesis_config.as_ref().map_or("unused", |_| "used"),
+				genesis_build.as_ref().map_or("unused", |_| "used"),
+			);
+			return Err(syn::Error::new(item_span, msg));
+		}
+
+		let def = Def {
+			item: item,
+			config: config.ok_or_else(|| syn::Error::new(item_span, "Missing `#[pallet::config]`"))?,
+			pallet_struct: pallet_struct
+				.ok_or_else(|| syn::Error::new(item_span, "Missing `#[pallet::pallet]`"))?,
+			hooks: hooks
+				.ok_or_else(|| syn::Error::new(item_span, "Missing `#[pallet::hooks]`"))?,
+			call: call.ok_or_else(|| syn::Error::new(item_span, "Missing `#[pallet::call]"))?,
+			extra_constants,
+			genesis_config,
+			genesis_build,
+			validate_unsigned,
+			error,
+			event,
+			origin,
+			inherent,
+			storages,
+			type_values,
+			frame_system,
+			frame_support,
+		};
+
+		def.check_instance_usage()?;
+		def.check_event_usage()?;
+
+		Ok(def)
+	}
+
+	/// Check that usage of trait `Event` is consistent with the definition, i.e. it is declared
+	/// and trait defines type Event, or not declared and no trait associated type.
+	fn check_event_usage(&self) -> syn::Result<()> {
+		match (
+			self.config.has_event_type,
+			self.event.is_some(),
+		) {
+			(true, false) => {
+				let msg = "Invalid usage of Event, `Config` contains associated type `Event`, \
+					but enum `Event` is not declared (i.e. no use of `#[pallet::event]`). \
+					Note that type `Event` in trait is reserved to work alongside pallet event.";
+				Err(syn::Error::new(proc_macro2::Span::call_site(), msg))
+			},
+			(false, true) => {
+				let msg = "Invalid usage of Event, `Config` contains no associated type \
+					`Event`, but enum `Event` is declared (in use of `#[pallet::event]`). \
+					An Event associated type must be declare on trait `Config`.";
+				Err(syn::Error::new(proc_macro2::Span::call_site(), msg))
+			},
+			_ => Ok(())
+		}
+	}
+
+	/// Check that usage of trait `Config` is consistent with the definition, i.e. it is used with
+	/// instance iff it is defined with instance.
+	fn check_instance_usage(&self) -> syn::Result<()> {
+		let mut instances = vec![];
+		instances.extend_from_slice(&self.call.instances[..]);
+		instances.extend_from_slice(&self.pallet_struct.instances[..]);
+		instances.extend_from_slice(&self.hooks.instances[..]);
+		instances.extend(&mut self.storages.iter().flat_map(|s| s.instances.clone()));
+		if let Some(event) = &self.event {
+			instances.extend_from_slice(&event.instances[..]);
+		}
+		if let Some(error) = &self.error {
+			instances.extend_from_slice(&error.instances[..]);
+		}
+		if let Some(inherent) = &self.inherent {
+			instances.extend_from_slice(&inherent.instances[..]);
+		}
+		if let Some(origin) = &self.origin {
+			instances.extend_from_slice(&origin.instances[..]);
+		}
+		if let Some(genesis_config) = &self.genesis_config {
+			instances.extend_from_slice(&genesis_config.instances[..]);
+		}
+		if let Some(genesis_build) = &self.genesis_build {
+			instances.extend_from_slice(&genesis_build.instances[..]);
+		}
+		if let Some(extra_constants) = &self.extra_constants {
+			instances.extend_from_slice(&extra_constants.instances[..]);
+		}
+
+		let mut errors = instances.into_iter()
+			.filter_map(|instances| {
+				if instances.has_instance == self.config.has_instance {
+					return None
+				}
+				let msg = if self.config.has_instance {
+					"Invalid generic declaration, trait is defined with instance but generic use none"
+				} else {
+					"Invalid generic declaration, trait is defined without instance but generic use \
+						some"
+				};
+				Some(syn::Error::new(instances.span, msg))
+			});
+
+		if let Some(mut first_error) = errors.next() {
+			for error in errors {
+				first_error.combine(error)
+			}
+			Err(first_error)
+		} else {
+			Ok(())
+		}
+	}
+
+	/// Depending on if pallet is instantiable:
+	/// * either `T: Config`
+	/// * or `T: Config<I>, I: 'static`
+	pub fn type_impl_generics(&self) -> proc_macro2::TokenStream {
+		if self.config.has_instance {
+			quote::quote!(T: Config<I>, I: 'static)
+		} else {
+			quote::quote!(T: Config)
+		}
+	}
+
+	/// Depending on if pallet is instantiable:
+	/// * either `T: Config`
+	/// * or `T: Config<I>, I: 'static = ()`
+	pub fn type_decl_bounded_generics(&self) -> proc_macro2::TokenStream {
+		if self.config.has_instance {
+			quote::quote!(T: Config<I>, I: 'static = ())
+		} else {
+			quote::quote!(T: Config)
+		}
+	}
+
+	/// Depending on if pallet is instantiable:
+	/// * either `T`
+	/// * or `T, I = ()`
+	pub fn type_decl_generics(&self) -> proc_macro2::TokenStream {
+		if self.config.has_instance {
+			quote::quote!(T, I = ())
+		} else {
+			quote::quote!(T)
+		}
+	}
+
+	/// Depending on if pallet is instantiable:
+	/// * either ``
+	/// * or `<I>`
+	/// to be used when using pallet trait `Config`
+	pub fn trait_use_generics(&self) -> proc_macro2::TokenStream {
+		if self.config.has_instance {
+			quote::quote!(<I>)
+		} else {
+			quote::quote!()
+		}
+	}
+
+	/// Depending on if pallet is instantiable:
+	/// * either `T`
+	/// * or `T, I`
+	pub fn type_use_generics(&self) -> proc_macro2::TokenStream {
+		if self.config.has_instance {
+			quote::quote!(T, I)
+		} else {
+			quote::quote!(T)
+		}
+	}
+}
+
+/// Some generic kind for type which can be not generic, or generic over config,
+/// or generic over config and instance, but not generic only over instance.
+pub enum GenericKind {
+	None,
+	Config,
+	ConfigAndInstance,
+}
+
+impl GenericKind {
+	/// Return Err if it is only generics over instance but not over config.
+	pub fn from_gens(has_config: bool, has_instance: bool) -> Result<Self, ()> {
+		match (has_config, has_instance) {
+			(false, false) => Ok(GenericKind::None),
+			(true, false) => Ok(GenericKind::Config),
+			(true, true) => Ok(GenericKind::ConfigAndInstance),
+			(false, true) => Err(()),
+		}
+	}
+
+	/// Return the generic to be used when using the type.
+	///
+	/// Depending on its definition it can be: ``, `T` or `T, I`
+	pub fn type_use_gen(&self) -> proc_macro2::TokenStream {
+		match self {
+			GenericKind::None => quote::quote!(),
+			GenericKind::Config => quote::quote!(T),
+			GenericKind::ConfigAndInstance => quote::quote!(T, I),
+		}
+	}
+
+	/// Return the generic to be used in `impl<..>` when implementing on the type.
+	pub fn type_impl_gen(&self) -> proc_macro2::TokenStream {
+		match self {
+			GenericKind::None => quote::quote!(),
+			GenericKind::Config => quote::quote!(T: Config),
+			GenericKind::ConfigAndInstance => quote::quote!(T: Config<I>, I: 'static),
+		}
+	}
+
+	/// Return whereas the type has some generic.
+	pub fn is_generic(&self) -> bool {
+		match self {
+			GenericKind::None => false,
+			GenericKind::Config | GenericKind::ConfigAndInstance => true,
+		}
+	}
+}
+
+/// List of additional token to be used for parsing.
+mod keyword {
+	syn::custom_keyword!(origin);
+	syn::custom_keyword!(call);
+	syn::custom_keyword!(event);
+	syn::custom_keyword!(config);
+	syn::custom_keyword!(hooks);
+	syn::custom_keyword!(inherent);
+	syn::custom_keyword!(error);
+	syn::custom_keyword!(storage);
+	syn::custom_keyword!(genesis_build);
+	syn::custom_keyword!(genesis_config);
+	syn::custom_keyword!(validate_unsigned);
+	syn::custom_keyword!(type_value);
+	syn::custom_keyword!(pallet);
+	syn::custom_keyword!(generate_store);
+	syn::custom_keyword!(Store);
+	syn::custom_keyword!(extra_constants);
+}
+
+/// Parse attributes for item in pallet module
+/// syntax must be `pallet::` (e.g. `#[pallet::config]`)
+enum PalletAttr {
+	Config(proc_macro2::Span),
+	Pallet(proc_macro2::Span),
+	Hooks(proc_macro2::Span),
+	Call(proc_macro2::Span),
+	Error(proc_macro2::Span),
+	Event(proc_macro2::Span),
+	Origin(proc_macro2::Span),
+	Inherent(proc_macro2::Span),
+	Storage(proc_macro2::Span),
+	GenesisConfig(proc_macro2::Span),
+	GenesisBuild(proc_macro2::Span),
+	ValidateUnsigned(proc_macro2::Span),
+	TypeValue(proc_macro2::Span),
+	ExtraConstants(proc_macro2::Span),
+}
+
+impl PalletAttr {
+	fn span(&self) -> proc_macro2::Span {
+		match self {
+			Self::Config(span) => span.clone(),
+			Self::Pallet(span) => span.clone(),
+			Self::Hooks(span) => span.clone(),
+			Self::Call(span) => span.clone(),
+			Self::Error(span) => span.clone(),
+			Self::Event(span) => span.clone(),
+			Self::Origin(span) => span.clone(),
+			Self::Inherent(span) => span.clone(),
+			Self::Storage(span) => span.clone(),
+			Self::GenesisConfig(span) => span.clone(),
+			Self::GenesisBuild(span) => span.clone(),
+			Self::ValidateUnsigned(span) => span.clone(),
+			Self::TypeValue(span) => span.clone(),
+			Self::ExtraConstants(span) => span.clone(),
+		}
+	}
+}
+
+impl syn::parse::Parse for PalletAttr {
+	fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+		input.parse::<syn::Token![#]>()?;
+		let content;
+		syn::bracketed!(content in input);
+		content.parse::<keyword::pallet>()?;
+		content.parse::<syn::Token![::]>()?;
+
+		let lookahead = content.lookahead1();
+		if lookahead.peek(keyword::config) {
+			Ok(PalletAttr::Config(content.parse::<keyword::config>()?.span()))
+		} else if lookahead.peek(keyword::pallet) {
+			Ok(PalletAttr::Pallet(content.parse::<keyword::pallet>()?.span()))
+		} else if lookahead.peek(keyword::hooks) {
+			Ok(PalletAttr::Hooks(content.parse::<keyword::hooks>()?.span()))
+		} else if lookahead.peek(keyword::call) {
+			Ok(PalletAttr::Call(content.parse::<keyword::call>()?.span()))
+		} else if lookahead.peek(keyword::error) {
+			Ok(PalletAttr::Error(content.parse::<keyword::error>()?.span()))
+		} else if lookahead.peek(keyword::event) {
+			Ok(PalletAttr::Event(content.parse::<keyword::event>()?.span()))
+		} else if lookahead.peek(keyword::origin) {
+			Ok(PalletAttr::Origin(content.parse::<keyword::origin>()?.span()))
+		} else if lookahead.peek(keyword::inherent) {
+			Ok(PalletAttr::Inherent(content.parse::<keyword::inherent>()?.span()))
+		} else if lookahead.peek(keyword::storage) {
+			Ok(PalletAttr::Storage(content.parse::<keyword::storage>()?.span()))
+		} else if lookahead.peek(keyword::genesis_config) {
+			Ok(PalletAttr::GenesisConfig(content.parse::<keyword::genesis_config>()?.span()))
+		} else if lookahead.peek(keyword::genesis_build) {
+			Ok(PalletAttr::GenesisBuild(content.parse::<keyword::genesis_build>()?.span()))
+		} else if lookahead.peek(keyword::validate_unsigned) {
+			Ok(PalletAttr::ValidateUnsigned(content.parse::<keyword::validate_unsigned>()?.span()))
+		} else if lookahead.peek(keyword::type_value) {
+			Ok(PalletAttr::TypeValue(content.parse::<keyword::type_value>()?.span()))
+		} else if lookahead.peek(keyword::extra_constants) {
+			Ok(PalletAttr::ExtraConstants(content.parse::<keyword::extra_constants>()?.span()))
+		} else {
+			Err(lookahead.error())
+		}
+	}
+}
diff --git a/frame/support/procedural/src/pallet/parse/origin.rs b/frame/support/procedural/src/pallet/parse/origin.rs
new file mode 100644
index 000000000000..00b64c20bc45
--- /dev/null
+++ b/frame/support/procedural/src/pallet/parse/origin.rs
@@ -0,0 +1,80 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use syn::spanned::Spanned;
+use super::helper;
+
+/// Definition of the pallet origin type.
+///
+/// Either:
+/// * `type Origin`
+/// * `struct Origin`
+/// * `enum Origin`
+pub struct OriginDef {
+	/// The index of item in pallet module.
+	pub index: usize,
+	pub has_instance: bool,
+	pub is_generic: bool,
+	/// A set of usage of instance, must be check for consistency with trait.
+	pub instances: Vec<helper::InstanceUsage>,
+}
+
+impl OriginDef {
+	pub fn try_from(index: usize, item: &mut syn::Item) -> syn::Result<Self> {
+		let item_span = item.span();
+		let (vis, ident, generics) = match &item {
+			syn::Item::Enum(item) => (&item.vis, &item.ident, &item.generics),
+			syn::Item::Struct(item) => (&item.vis, &item.ident, &item.generics),
+			syn::Item::Type(item) => (&item.vis, &item.ident, &item.generics),
+			_ => {
+				let msg = "Invalid pallet::origin, expected enum or struct or type";
+				return Err(syn::Error::new(item.span(), msg));
+			},
+		};
+
+		let has_instance = generics.params.len() == 2;
+		let is_generic = generics.params.len() > 0;
+
+		let mut instances = vec![];
+		if let Some(u) = helper::check_type_def_optional_gen(&generics, item.span())? {
+			instances.push(u);
+		} else {
+			// construct_runtime only allow generic event for instantiable pallet.
+			instances.push(helper::InstanceUsage {
+				has_instance: false,
+				span: ident.span(),
+			})
+		}
+
+		if !matches!(vis, syn::Visibility::Public(_)) {
+			let msg = "Invalid pallet::origin, Origin must be public";
+			return Err(syn::Error::new(item_span, msg));
+		}
+
+		if ident != "Origin" {
+			let msg = "Invalid pallet::origin, ident must `Origin`";
+			return Err(syn::Error::new(ident.span(), msg));
+		}
+
+		Ok(OriginDef {
+			index,
+			has_instance,
+			is_generic,
+			instances,
+		})
+	}
+}
diff --git a/frame/support/procedural/src/pallet/parse/pallet_struct.rs b/frame/support/procedural/src/pallet/parse/pallet_struct.rs
new file mode 100644
index 000000000000..140355070df8
--- /dev/null
+++ b/frame/support/procedural/src/pallet/parse/pallet_struct.rs
@@ -0,0 +1,99 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use super::helper;
+use syn::spanned::Spanned;
+use quote::ToTokens;
+
+/// List of additional token to be used for parsing.
+mod keyword {
+	syn::custom_keyword!(pallet);
+	syn::custom_keyword!(Pallet);
+	syn::custom_keyword!(generate_store);
+	syn::custom_keyword!(Store);
+}
+
+/// Definition of the pallet pallet.
+pub struct PalletStructDef {
+	/// The index of item in pallet pallet.
+	pub index: usize,
+	/// A set of usage of instance, must be check for consistency with config trait.
+	pub instances: Vec<helper::InstanceUsage>,
+	/// The keyword Pallet used (contains span).
+	pub pallet: keyword::Pallet,
+	/// Whether the trait `Store` must be generated.
+	pub store: Option<(syn::Visibility, keyword::Store)>
+}
+
+/// Parse for `#[pallet::generate_store($vis trait Store)]`
+pub struct PalletStructAttr {
+	vis: syn::Visibility,
+	keyword: keyword::Store,
+}
+
+impl syn::parse::Parse for PalletStructAttr {
+	fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+		input.parse::<syn::Token![#]>()?;
+		let content;
+		syn::bracketed!(content in input);
+		content.parse::<keyword::pallet>()?;
+		content.parse::<syn::Token![::]>()?;
+		content.parse::<keyword::generate_store>()?;
+
+		let generate_content;
+		syn::parenthesized!(generate_content in content);
+		let vis = generate_content.parse::<syn::Visibility>()?;
+		generate_content.parse::<syn::Token![trait]>()?;
+		let keyword = generate_content.parse::<keyword::Store>()?;
+		Ok(Self { vis, keyword })
+	}
+}
+
+impl PalletStructDef {
+	pub fn try_from(index: usize, item: &mut syn::Item) -> syn::Result<Self> {
+		let item = if let syn::Item::Struct(item) = item {
+			item
+		} else {
+			let msg = "Invalid pallet::pallet, expected struct definition";
+			return Err(syn::Error::new(item.span(), msg));
+		};
+
+		let mut event_attrs: Vec<PalletStructAttr> = helper::take_item_attrs(&mut item.attrs)?;
+		if event_attrs.len() > 1 {
+			let msg = "Invalid pallet::pallet, multiple argument pallet::generate_store found";
+			return Err(syn::Error::new(event_attrs[1].keyword.span(), msg));
+		}
+		let store = event_attrs.pop().map(|attr| (attr.vis, attr.keyword));
+
+		let pallet = syn::parse2::<keyword::Pallet>(item.ident.to_token_stream())?;
+
+		if !matches!(item.vis, syn::Visibility::Public(_)) {
+			let msg = "Invalid pallet::pallet, Pallet must be public";
+			return Err(syn::Error::new(item.span(), msg));
+		}
+
+		if item.generics.where_clause.is_some() {
+			let msg = "Invalid pallet::pallet, where clause not supported on Pallet declaration";
+			return Err(syn::Error::new(item.generics.where_clause.span(), msg));
+		}
+
+		let mut instances = vec![];
+		instances.push(helper::check_type_def_gen_no_bounds(&item.generics, item.ident.span())?);
+
+		Ok(Self { index, instances, pallet, store })
+	}
+}
diff --git a/frame/support/procedural/src/pallet/parse/storage.rs b/frame/support/procedural/src/pallet/parse/storage.rs
new file mode 100644
index 000000000000..b7ffe3da751f
--- /dev/null
+++ b/frame/support/procedural/src/pallet/parse/storage.rs
@@ -0,0 +1,221 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use super::helper;
+use syn::spanned::Spanned;
+use quote::ToTokens;
+
+/// List of additional token to be used for parsing.
+mod keyword {
+	syn::custom_keyword!(Error);
+	syn::custom_keyword!(pallet);
+	syn::custom_keyword!(getter);
+	syn::custom_keyword!(OptionQuery);
+	syn::custom_keyword!(ValueQuery);
+}
+
+/// Parse for `#[pallet::getter(fn dummy)]`
+pub struct PalletStorageAttr {
+	getter: syn::Ident,
+}
+
+impl syn::parse::Parse for PalletStorageAttr {
+	fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+		input.parse::<syn::Token![#]>()?;
+		let content;
+		syn::bracketed!(content in input);
+		content.parse::<keyword::pallet>()?;
+		content.parse::<syn::Token![::]>()?;
+		content.parse::<keyword::getter>()?;
+
+		let generate_content;
+		syn::parenthesized!(generate_content in content);
+		generate_content.parse::<syn::Token![fn]>()?;
+		Ok(Self { getter: generate_content.parse::<syn::Ident>()? })
+	}
+}
+
+/// The value and key types used by storages. Needed to expand metadata.
+pub enum Metadata{
+	Value { value: syn::GenericArgument },
+	Map { value: syn::GenericArgument, key: syn::GenericArgument },
+	DoubleMap {
+		value: syn::GenericArgument,
+		key1: syn::GenericArgument,
+		key2: syn::GenericArgument
+	},
+}
+
+pub enum QueryKind {
+	OptionQuery,
+	ValueQuery,
+}
+
+/// Definition of a storage, storage is a storage type like
+/// `type MyStorage = StorageValue<MyStorageP, u32>`
+/// The keys and values types are parsed in order to get metadata
+pub struct StorageDef {
+	/// The index of error item in pallet module.
+	pub index: usize,
+	/// Visibility of the storage type.
+	pub vis: syn::Visibility,
+	/// The type ident, to generate the StoragePrefix for.
+	pub ident: syn::Ident,
+	/// The keys and value metadata of the storage.
+	pub metadata: Metadata,
+	/// The doc associated to the storage.
+	pub docs: Vec<syn::Lit>,
+	/// A set of usage of instance, must be check for consistency with config.
+	pub instances: Vec<helper::InstanceUsage>,
+	/// Optional getter to generate. If some then query_kind is ensured to be some as well.
+	pub getter: Option<syn::Ident>,
+	/// Whereas the querytype of the storage is OptionQuery or ValueQuery.
+	/// Note that this is best effort as it can't be determined when QueryKind is generic, and
+	/// result can be false if user do some unexpected type alias.
+	pub query_kind: Option<QueryKind>,
+	/// Where clause of type definition.
+	pub where_clause: Option<syn::WhereClause>,
+}
+
+/// In `Foo<A, B, C>` retrieve the argument at given position, i.e. A is argument at position 0.
+fn retrieve_arg(
+	segment: &syn::PathSegment,
+	arg_pos: usize,
+) -> syn::Result<syn::GenericArgument> {
+	if let syn::PathArguments::AngleBracketed(args) = &segment.arguments {
+		if arg_pos < args.args.len() {
+			Ok(args.args[arg_pos].clone())
+		} else {
+			let msg = format!("pallet::storage unexpected number of generic argument, expected at \
+				least {} args, found {}", arg_pos + 1, args.args.len());
+			Err(syn::Error::new(args.span(), msg))
+		}
+	} else {
+		let msg = format!("pallet::storage unexpected number of generic argument, expected at \
+			least {} args, found none", arg_pos + 1);
+		Err(syn::Error::new(segment.span(), msg))
+	}
+}
+
+impl StorageDef {
+	pub fn try_from(index: usize, item: &mut syn::Item) -> syn::Result<Self> {
+		let item = if let syn::Item::Type(item) = item {
+			item
+		} else {
+			return Err(syn::Error::new(item.span(), "Invalid pallet::storage, expected item type"));
+		};
+
+		let mut attrs: Vec<PalletStorageAttr> = helper::take_item_attrs(&mut item.attrs)?;
+		if attrs.len() > 1 {
+			let msg = "Invalid pallet::storage, multiple argument pallet::getter found";
+			return Err(syn::Error::new(attrs[1].getter.span(), msg));
+		}
+		let getter = attrs.pop().map(|attr| attr.getter);
+
+		let mut instances = vec![];
+		instances.push(helper::check_type_def_gen(&item.generics, item.ident.span())?);
+
+		let where_clause = item.generics.where_clause.clone();
+		let docs = helper::get_doc_literals(&item.attrs);
+
+		let typ = if let syn::Type::Path(typ) = &*item.ty {
+			typ
+		} else {
+			let msg = "Invalid pallet::storage, expected type path";
+			return Err(syn::Error::new(item.ty.span(), msg));
+		};
+
+		if typ.path.segments.len() != 1 {
+			let msg = "Invalid pallet::storage, expected type path with one segment";
+			return Err(syn::Error::new(item.ty.span(), msg));
+		}
+
+		let query_kind;
+		let metadata = match &*typ.path.segments[0].ident.to_string() {
+			"StorageValue" => {
+				query_kind = retrieve_arg(&typ.path.segments[0], 2);
+				Metadata::Value {
+					value: retrieve_arg(&typ.path.segments[0], 1)?,
+				}
+			}
+			"StorageMap" => {
+				query_kind = retrieve_arg(&typ.path.segments[0], 4);
+				Metadata::Map {
+					key: retrieve_arg(&typ.path.segments[0], 2)?,
+					value: retrieve_arg(&typ.path.segments[0], 3)?,
+				}
+			}
+			"StorageDoubleMap" => {
+				query_kind = retrieve_arg(&typ.path.segments[0], 6);
+				Metadata::DoubleMap {
+					key1: retrieve_arg(&typ.path.segments[0], 2)?,
+					key2: retrieve_arg(&typ.path.segments[0], 4)?,
+					value: retrieve_arg(&typ.path.segments[0], 5)?,
+				}
+			}
+			found @ _ => {
+				let msg = format!(
+					"Invalid pallet::storage, expected ident: `StorageValue` or \
+					`StorageMap` or `StorageDoubleMap` in order to expand metadata, found \
+					`{}`",
+					found,
+				);
+				return Err(syn::Error::new(item.ty.span(), msg));
+			}
+		};
+		let query_kind = query_kind
+			.map(|query_kind| match query_kind {
+				syn::GenericArgument::Type(syn::Type::Path(path))
+					if path.path.segments.last().map_or(false, |s| s.ident == "OptionQuery")
+				=> Some(QueryKind::OptionQuery),
+				syn::GenericArgument::Type(syn::Type::Path(path))
+					if path.path.segments.last().map_or(false, |s| s.ident == "ValueQuery")
+				=> Some(QueryKind::ValueQuery),
+				_ => None,
+			})
+			.unwrap_or(Some(QueryKind::OptionQuery)); // This value must match the default generic.
+
+		if query_kind.is_none() && getter.is_some() {
+			let msg = "Invalid pallet::storage, cannot generate getter because QueryKind is not \
+				identifiable. QueryKind must be `OptionQuery`, `ValueQuery`, or default one to be \
+				identifiable.";
+			return Err(syn::Error::new(getter.unwrap().span(), msg));
+		}
+
+		let prefix_arg = retrieve_arg(&typ.path.segments[0], 0)?;
+		syn::parse2::<syn::Token![_]>(prefix_arg.to_token_stream())
+			.map_err(|e| {
+				let msg = "Invalid use of `#[pallet::storage]`, the type first generic argument \
+					must be `_`, the final argument is automatically set by macro.";
+				let mut err = syn::Error::new(prefix_arg.span(), msg);
+				err.combine(e);
+				err
+			})?;
+
+		Ok(StorageDef {
+			index,
+			vis: item.vis.clone(),
+			ident: item.ident.clone(),
+			instances,
+			metadata,
+			docs,
+			getter,
+			query_kind,
+			where_clause,
+		})
+	}
+}
diff --git a/frame/support/procedural/src/pallet/parse/type_value.rs b/frame/support/procedural/src/pallet/parse/type_value.rs
new file mode 100644
index 000000000000..0313c76c3ec8
--- /dev/null
+++ b/frame/support/procedural/src/pallet/parse/type_value.rs
@@ -0,0 +1,101 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use super::helper;
+use syn::spanned::Spanned;
+
+/// Definition of type value. Just a function which is expanded to a struct implementing `Get`.
+pub struct TypeValueDef {
+	/// The index of error item in pallet module.
+	pub index: usize,
+	/// Visibility of the struct to generate.
+	pub vis: syn::Visibility,
+	/// Ident of the struct to generate.
+	pub ident: syn::Ident,
+	/// The type return by Get.
+	pub type_: Box<syn::Type>,
+	/// The block returning the value to get
+	pub block: Box<syn::Block>,
+	/// If type value is generic over `T` (or `T` and `I` for instantiable pallet)
+	pub is_generic: bool,
+	/// A set of usage of instance, must be check for consistency with config.
+	pub instances: Vec<helper::InstanceUsage>,
+	/// The where clause of the function.
+	pub where_clause: Option<syn::WhereClause>,
+}
+
+impl TypeValueDef {
+	pub fn try_from(index: usize, item: &mut syn::Item) -> syn::Result<Self> {
+		let item = if let syn::Item::Fn(item) = item {
+			item
+		} else {
+			let msg = "Invalid pallet::type_value, expected item fn";
+			return Err(syn::Error::new(item.span(), msg));
+		};
+
+
+		if !item.attrs.is_empty() {
+			let msg = "Invalid pallet::type_value, unexpected attribute";
+			return Err(syn::Error::new(item.attrs[0].span(), msg));
+		}
+
+		if let Some(span) = item.sig.constness.as_ref().map(|t| t.span())
+			.or(item.sig.asyncness.as_ref().map(|t| t.span()))
+			.or(item.sig.unsafety.as_ref().map(|t| t.span()))
+			.or(item.sig.abi.as_ref().map(|t| t.span()))
+			.or(item.sig.variadic.as_ref().map(|t| t.span()))
+		{
+			let msg = "Invalid pallet::type_value, unexpected token";
+			return Err(syn::Error::new(span, msg));
+		}
+
+		if !item.sig.inputs.is_empty() {
+			let msg = "Invalid pallet::type_value, unexpected argument";
+			return Err(syn::Error::new(item.sig.inputs[0].span(), msg));
+		}
+
+		let vis = item.vis.clone();
+		let ident = item.sig.ident.clone();
+		let block = item.block.clone();
+		let type_ = match item.sig.output.clone() {
+			syn::ReturnType::Type(_, type_) => type_,
+			syn::ReturnType::Default => {
+				let msg = "Invalid pallet::type_value, expected return type";
+				return Err(syn::Error::new(item.sig.span(), msg));
+			},
+		};
+
+		let mut instances = vec![];
+		if let Some(usage) = helper::check_type_value_gen(&item.sig.generics, item.sig.span())? {
+			instances.push(usage);
+		}
+
+		let is_generic = item.sig.generics.type_params().count() > 0;
+		let where_clause = item.sig.generics.where_clause.clone();
+
+		Ok(TypeValueDef {
+			index,
+			is_generic,
+			vis,
+			ident,
+			block,
+			type_,
+			instances,
+			where_clause,
+		})
+	}
+}
diff --git a/frame/support/procedural/src/pallet/parse/validate_unsigned.rs b/frame/support/procedural/src/pallet/parse/validate_unsigned.rs
new file mode 100644
index 000000000000..3c460249811f
--- /dev/null
+++ b/frame/support/procedural/src/pallet/parse/validate_unsigned.rs
@@ -0,0 +1,61 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use syn::spanned::Spanned;
+use super::helper;
+
+/// The definition of the pallet validate unsigned implementation.
+pub struct ValidateUnsignedDef {
+	/// The index of validate unsigned item in pallet module.
+	pub index: usize,
+	/// A set of usage of instance, must be check for consistency with config.
+	pub instances: Vec<helper::InstanceUsage>,
+}
+
+impl ValidateUnsignedDef {
+	pub fn try_from(index: usize, item: &mut syn::Item) -> syn::Result<Self> {
+		let item = if let syn::Item::Impl(item) = item {
+			item
+		} else {
+			let msg = "Invalid pallet::validate_unsigned, expected item impl";
+			return Err(syn::Error::new(item.span(), msg));
+		};
+
+		if item.trait_.is_none() {
+			let msg = "Invalid pallet::validate_unsigned, expected impl<..> ValidateUnsigned for \
+				Pallet<..>";
+			return Err(syn::Error::new(item.span(), msg));
+		}
+
+		if let Some(last) = item.trait_.as_ref().unwrap().1.segments.last() {
+			if last.ident != "ValidateUnsigned" {
+				let msg = "Invalid pallet::validate_unsigned, expected trait ValidateUnsigned";
+				return Err(syn::Error::new(last.span(), msg));
+			}
+		} else {
+			let msg = "Invalid pallet::validate_unsigned, expected impl<..> ValidateUnsigned for \
+				Pallet<..>";
+			return Err(syn::Error::new(item.span(), msg));
+		}
+
+		let mut instances = vec![];
+		instances.push(helper::check_pallet_struct_usage(&item.self_ty)?);
+		instances.push(helper::check_impl_gen(&item.generics, item.impl_token.span())?);
+
+		Ok(ValidateUnsignedDef { index, instances })
+	}
+}
diff --git a/frame/support/procedural/src/pallet_version.rs b/frame/support/procedural/src/pallet_version.rs
index ffd4b41208d5..f0437d4cb6b7 100644
--- a/frame/support/procedural/src/pallet_version.rs
+++ b/frame/support/procedural/src/pallet_version.rs
@@ -52,7 +52,7 @@ pub fn crate_to_pallet_version(input: proc_macro::TokenStream) -> Result<TokenSt
 	let patch_version = get_version::<u8>("CARGO_PKG_VERSION_PATCH")
 		.map_err(|_| create_error("Patch version needs to fit into `u8`"))?;
 
-	let crate_ = generate_crate_access_2018()?;
+	let crate_ = generate_crate_access_2018("frame-support")?;
 
 	Ok(quote::quote! {
 		#crate_::traits::PalletVersion {
diff --git a/frame/support/procedural/src/storage/genesis_config/mod.rs b/frame/support/procedural/src/storage/genesis_config/mod.rs
index 27fbdd2cd38b..ebc4c7a7f79d 100644
--- a/frame/support/procedural/src/storage/genesis_config/mod.rs
+++ b/frame/support/procedural/src/storage/genesis_config/mod.rs
@@ -21,8 +21,8 @@
 use proc_macro2::{TokenStream, Span};
 use quote::quote;
 use super::DeclStorageDefExt;
-use genesis_config_def::GenesisConfigDef;
-use builder_def::BuilderDef;
+pub use genesis_config_def::GenesisConfigDef;
+pub use builder_def::BuilderDef;
 
 mod genesis_config_def;
 mod builder_def;
diff --git a/frame/support/procedural/src/storage/mod.rs b/frame/support/procedural/src/storage/mod.rs
index bc23dad74bcd..265c4b4cd102 100644
--- a/frame/support/procedural/src/storage/mod.rs
+++ b/frame/support/procedural/src/storage/mod.rs
@@ -24,6 +24,9 @@ mod getters;
 mod metadata;
 mod instance_trait;
 mod genesis_config;
+mod print_pallet_upgrade;
+
+pub(crate) use instance_trait::INHERENT_INSTANCE_NAME;
 
 use quote::quote;
 use frame_support_procedural_tools::{
@@ -397,6 +400,8 @@ pub fn decl_storage_impl(input: proc_macro::TokenStream) -> proc_macro::TokenStr
 	let def = syn::parse_macro_input!(input as DeclStorageDef);
 	let def_ext = DeclStorageDefExt::from(def);
 
+	print_pallet_upgrade::maybe_print_pallet_upgrade(&def_ext);
+
 	let hidden_crate_name = def_ext.hidden_crate.as_ref().map(|i| i.to_string())
 		.unwrap_or_else(|| "decl_storage".to_string());
 
diff --git a/frame/support/procedural/src/storage/print_pallet_upgrade.rs b/frame/support/procedural/src/storage/print_pallet_upgrade.rs
new file mode 100644
index 000000000000..66da5fd01b57
--- /dev/null
+++ b/frame/support/procedural/src/storage/print_pallet_upgrade.rs
@@ -0,0 +1,387 @@
+use super::StorageLineTypeDef;
+use quote::ToTokens;
+use frame_support_procedural_tools::clean_type_string;
+
+/// Environment variable that tells us to print pallet upgrade helper.
+const PRINT_PALLET_UPGRADE: &str = "PRINT_PALLET_UPGRADE";
+
+fn check_print_pallet_upgrade() -> bool {
+	std::env::var(PRINT_PALLET_UPGRADE).is_ok()
+}
+
+/// Convert visibilty as now objects are defined in a module.
+fn convert_vis(vis: &syn::Visibility) -> &'static str{
+	match vis {
+		syn::Visibility::Inherited => "pub(super)",
+		syn::Visibility::Public(_) => "pub",
+		_ => "/* TODO_VISIBILITY */",
+	}
+}
+
+/// fn to convert to token stream then string using display and then call clean_type_string on it.
+fn to_cleaned_string(t: impl quote::ToTokens) -> String {
+	clean_type_string(&format!("{}", t.into_token_stream()))
+}
+
+/// Print an incomplete upgrade from decl_storage macro to new pallet attribute.
+pub fn maybe_print_pallet_upgrade(def: &super::DeclStorageDefExt) {
+	if !check_print_pallet_upgrade() {
+		return
+	}
+
+	let scrate = &quote::quote!(frame_support);
+
+	let config_gen = if def.optional_instance.is_some() {
+		"<I: 'static = ()>"
+	} else {
+		Default::default()
+	};
+
+	let impl_gen = if def.optional_instance.is_some() {
+		"<T: Config<I>, I: 'static>"
+	} else {
+		"<T: Config>"
+	};
+
+	let decl_gen = if def.optional_instance.is_some() {
+		"<T, I=()>"
+	} else {
+		"<T>"
+	};
+
+	let full_decl_gen = if def.optional_instance.is_some() {
+		"<T: Config<I>, I: 'static = ()>"
+	} else {
+		"<T: Config>"
+	};
+
+	let use_gen = if def.optional_instance.is_some() {
+		"<T, I>"
+	} else {
+		"<T>"
+	};
+
+	let use_gen_tuple = if def.optional_instance.is_some() {
+		"<(T, I)>"
+	} else {
+		"<T>"
+	};
+
+	let mut genesis_config = String::new();
+	let mut genesis_build = String::new();
+
+	let genesis_config_builder_def = super::genesis_config::BuilderDef::from_def(scrate, def);
+	if !genesis_config_builder_def.blocks.is_empty() {
+		let genesis_config_def = match super::genesis_config::GenesisConfigDef::from_def(def) {
+			Ok(g) => g,
+			Err(err) => {
+				println!("Could not print upgrade due compile error: {:?}", err);
+				return
+			},
+		};
+
+		let genesis_config_impl_gen = if genesis_config_def.is_generic {
+			impl_gen.clone()
+		} else {
+			Default::default()
+		};
+
+		let genesis_config_use_gen = if genesis_config_def.is_generic {
+			use_gen.clone()
+		} else {
+			Default::default()
+		};
+
+		let genesis_config_decl_gen = if genesis_config_def.is_generic {
+			if def.optional_instance.is_some() {
+				"<T: Config<I>, I: 'static = ()>"
+			} else {
+				"<T: Config>"
+			}
+		} else {
+			Default::default()
+		};
+
+		let mut genesis_config_decl_fields = String::new();
+		let mut genesis_config_default_fields = String::new();
+		for field in &genesis_config_def.fields {
+			genesis_config_decl_fields.push_str(&format!("
+		{attrs}pub {name}: {typ},",
+				attrs = field.attrs.iter()
+					.fold(String::new(), |res, attr| {
+						format!("{}#[{}]
+		",
+						res, attr.to_token_stream())
+					}),
+				name = field.name,
+				typ = to_cleaned_string(&field.typ),
+			));
+
+			genesis_config_default_fields.push_str(&format!("
+				{name}: {default},",
+				name = field.name,
+				default = to_cleaned_string(&field.default),
+			));
+		}
+
+		genesis_config = format!("
+	#[pallet::genesis_config]
+	pub struct GenesisConfig{genesis_config_decl_gen}
+		// TODO_MAYBE_WHERE_CLAUSE
+	{{{genesis_config_decl_fields}
+	}}
+
+	#[cfg(feature = \"std\")]
+	impl{genesis_config_impl_gen} Default for GenesisConfig{genesis_config_use_gen}
+		// TODO_MAYBE_WHERE_CLAUSE
+	{{
+		fn default() -> Self {{
+			Self {{{genesis_config_default_fields}
+			}}
+		}}
+	}}",
+			genesis_config_decl_gen = genesis_config_decl_gen,
+			genesis_config_decl_fields = genesis_config_decl_fields,
+			genesis_config_impl_gen = genesis_config_impl_gen,
+			genesis_config_default_fields = genesis_config_default_fields,
+			genesis_config_use_gen = genesis_config_use_gen,
+		);
+
+		let genesis_config_build = genesis_config_builder_def.blocks.iter()
+			.fold(String::new(), |res, block| {
+				format!("{}
+					{}",
+					res,
+					to_cleaned_string(block),
+				)
+			});
+
+		genesis_build = format!("
+	#[pallet::genesis_build]
+	impl{impl_gen} GenesisBuild{use_gen} for GenesisConfig{genesis_config_use_gen}
+		// TODO_MAYBE_WHERE_CLAUSE
+	{{
+		fn build(&self) {{{genesis_config_build}
+		}}
+	}}",
+			impl_gen = impl_gen,
+			use_gen = use_gen,
+			genesis_config_use_gen = genesis_config_use_gen,
+			genesis_config_build = genesis_config_build,
+		);
+	}
+
+	let mut storages = String::new();
+	for line in &def.storage_lines {
+		let storage_vis = convert_vis(&line.visibility);
+
+		let getter = if let Some(getter) = &line.getter {
+			format!("
+	#[pallet::getter(fn {getter})]",
+				getter = getter
+			)
+		} else {
+			Default::default()
+		};
+
+		let value_type = &line.value_type;
+
+		let default_value_type_value = line.default_value.as_ref()
+			.map(|default_expr| {
+				format!("
+	#[pallet::type_value]
+	{storage_vis} fn DefaultFor{name} /* TODO_MAYBE_GENERICS */ () -> {value_type} {{
+		{default_expr}
+	}}
+",
+					name = line.name,
+					storage_vis = storage_vis,
+					value_type = to_cleaned_string(&line.value_type),
+					default_expr = to_cleaned_string(&default_expr),
+				)
+			})
+			.unwrap_or_else(|| String::new());
+
+		let comma_query_kind = if line.is_option {
+			if line.default_value.is_some() {
+				", OptionQuery"
+			} else {
+				Default::default()
+			}
+		} else {
+			", ValueQuery"
+		};
+
+		let comma_default_value_getter_name = line.default_value.as_ref()
+			.map(|_| format!(", DefaultFor{}", line.name))
+			.unwrap_or_else(|| String::new());
+
+		let typ = match &line.storage_type {
+			StorageLineTypeDef::Map(map) => {
+				format!("StorageMap<_, {hasher}, {key}, {value_type}{comma_query_kind}\
+					{comma_default_value_getter_name}>",
+					hasher = &map.hasher.to_storage_hasher_struct(),
+					key = to_cleaned_string(&map.key),
+					value_type = to_cleaned_string(&value_type),
+					comma_query_kind = comma_query_kind,
+					comma_default_value_getter_name = comma_default_value_getter_name,
+				)
+			},
+			StorageLineTypeDef::DoubleMap(double_map) => {
+				format!("StorageDoubleMap<_, {hasher1}, {key1}, {hasher2}, {key2}, {value_type}\
+					{comma_query_kind}{comma_default_value_getter_name}>",
+					hasher1 = double_map.hasher1.to_storage_hasher_struct(),
+					key1 = to_cleaned_string(&double_map.key1),
+					hasher2 = double_map.hasher2.to_storage_hasher_struct(),
+					key2 = to_cleaned_string(&double_map.key2),
+					value_type = to_cleaned_string(&value_type),
+					comma_query_kind = comma_query_kind,
+					comma_default_value_getter_name = comma_default_value_getter_name,
+				)
+			},
+			StorageLineTypeDef::Simple(_) => {
+				format!("StorageValue<_, {value_type}{comma_query_kind}\
+					{comma_default_value_getter_name}>",
+					value_type = to_cleaned_string(&value_type),
+					comma_query_kind = comma_query_kind,
+					comma_default_value_getter_name = comma_default_value_getter_name,
+				)
+			},
+		};
+
+		let additional_comment = if line.is_option && line.default_value.is_some() {
+			" // TODO: This type of storage is no longer supported: `OptionQuery` cannot be used \
+			alongside a not-none value on empty storage. Please use `ValueQuery` instead."
+		} else {
+			""
+		};
+
+		storages.push_str(&format!("
+{default_value_type_value}{doc}
+	#[pallet::storage]{getter}
+	{storage_vis} type {name}{full_decl_gen} = {typ};{additional_comment}",
+			default_value_type_value = default_value_type_value,
+			getter = getter,
+			storage_vis = storage_vis,
+			name = line.name,
+			full_decl_gen = full_decl_gen,
+			typ = typ,
+			additional_comment = additional_comment,
+			doc = line.doc_attrs.iter()
+				.fold(String::new(), |mut res, attr| {
+					if let syn::Meta::NameValue(name_value) = attr {
+						if name_value.path.is_ident("doc") {
+							if let syn::Lit::Str(string) = &name_value.lit {
+								res = format!("{}
+	///{}",
+									res,
+									string.value(),
+								);
+							}
+						}
+					}
+					res
+				}),
+		));
+	}
+
+	let deprecated_instance_stuff = if def.optional_instance.is_some() {
+		"
+	/// Old name for default instance generated by decl_storage.
+	#[deprecated(note=\"use `()` instead\")]
+	pub type DefaultInstance = ();
+
+	/// Old name for instance trait used by old macros.
+	#[deprecated(note=\"use `'static` instead\")]
+	pub trait Instance: 'static {}
+	impl<I: 'static> Instance for I {}"
+	} else {
+		""
+	};
+
+	println!("
+// Template for pallet upgrade for {pallet_name}
+
+pub use pallet::*;
+
+#[frame_support::pallet]
+pub mod pallet {{
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+	use super::*;
+
+	#[pallet::config]
+	pub trait Config{config_gen}: frame_system::Config
+		// TODO_MAYBE_ADDITIONAL_BOUNDS_AND_WHERE_CLAUSE
+	{{
+		// TODO_ASSOCIATED_TYPE_AND_CONSTANTS
+	}}
+
+	{deprecated_instance_stuff}
+
+	#[pallet::pallet]
+	#[pallet::generate_store({store_vis} trait Store)]
+	pub struct Pallet{decl_gen}(PhantomData{use_gen_tuple});
+
+	/// Old name for pallet.
+	#[deprecated(note=\"use `Pallet` instead\")]
+	pub type Module{decl_gen} = Pallet{use_gen};
+
+	#[pallet::interface]
+	impl{impl_gen} Hooks<BlockNumberFor<T>> for Pallet{use_gen}
+		// TODO_MAYBE_WHERE_CLAUSE
+	{{
+		// TODO_ON_FINALIZE
+		// TODO_ON_INITIALIZE
+		// TODO_ON_RUNTIME_UPGRADE
+		// TODO_INTEGRITY_TEST
+		// TODO_OFFCHAIN_WORKER
+	}}
+
+	#[pallet::call]
+	impl{impl_gen} Pallet{use_gen}
+		// TODO_MAYBE_WHERE_CLAUSE
+	{{
+		// TODO_UPGRADE_DISPATCHABLES
+	}}
+
+	#[pallet::inherent]
+	// TODO_INHERENT
+
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	// TODO_EVENT
+
+	// TODO_REMOVE_IF_NO_EVENT
+	/// Old name generated by `decl_event`.
+	#[deprecated(note=\"use `Event` instead\")]
+	pub type RawEvent /* TODO_PUT_EVENT_GENERICS */ = Event /* TODO_PUT_EVENT_GENERICS */;
+
+	#[pallet::error]
+	// TODO_ERROR
+
+	#[pallet::origin]
+	// TODO_ORIGIN
+
+	#[pallet::validate_unsigned]
+	// TODO_VALIDATE_UNSIGNED
+
+	{storages}
+
+	{genesis_config}
+
+	{genesis_build}
+}}",
+		config_gen = config_gen,
+		store_vis = convert_vis(&def.visibility),
+		impl_gen = impl_gen,
+		use_gen = use_gen,
+		use_gen_tuple = use_gen_tuple,
+		decl_gen = decl_gen,
+		storages = storages,
+		genesis_config = genesis_config,
+		genesis_build = genesis_build,
+		pallet_name = def.crate_name,
+		deprecated_instance_stuff = deprecated_instance_stuff,
+	);
+}
diff --git a/frame/support/procedural/src/transactional.rs b/frame/support/procedural/src/transactional.rs
index 3c2617a17e50..8c49a8deec1b 100644
--- a/frame/support/procedural/src/transactional.rs
+++ b/frame/support/procedural/src/transactional.rs
@@ -23,7 +23,7 @@ use frame_support_procedural_tools::generate_crate_access_2018;
 pub fn transactional(_attr: TokenStream, input: TokenStream) -> Result<TokenStream> {
 	let ItemFn { attrs, vis, sig, block } = syn::parse(input)?;
 
-	let crate_ = generate_crate_access_2018()?;
+	let crate_ = generate_crate_access_2018("frame-support")?;
 	let output = quote! {
 		#(#attrs)*
 		#vis #sig {
@@ -45,7 +45,7 @@ pub fn transactional(_attr: TokenStream, input: TokenStream) -> Result<TokenStre
 pub fn require_transactional(_attr: TokenStream, input: TokenStream) -> Result<TokenStream> {
 	let ItemFn { attrs, vis, sig, block } = syn::parse(input)?;
 
-	let crate_ = generate_crate_access_2018()?;
+	let crate_ = generate_crate_access_2018("frame-support")?;
 	let output = quote! {
 		#(#attrs)*
 		#vis #sig {
diff --git a/frame/support/procedural/tools/src/lib.rs b/frame/support/procedural/tools/src/lib.rs
index c5a27c809aff..2cf559eab9b4 100644
--- a/frame/support/procedural/tools/src/lib.rs
+++ b/frame/support/procedural/tools/src/lib.rs
@@ -46,17 +46,17 @@ pub fn generate_crate_access(unique_id: &str, def_crate: &str) -> TokenStream {
 	}
 }
 
-/// Generate the crate access for the `frame-support` crate using 2018 syntax.
+/// Generate the crate access for the crate using 2018 syntax.
 ///
-/// Output will for example be `frame_support`.
-pub fn generate_crate_access_2018() -> Result<TokenStream, Error> {
-	if std::env::var("CARGO_PKG_NAME").unwrap() == "frame-support" {
-		Ok(quote::quote!( frame_support ))
+/// for `frame-support` output will for example be `frame_support`.
+pub fn generate_crate_access_2018(def_crate: &str) -> Result<syn::Ident, Error> {
+	if std::env::var("CARGO_PKG_NAME").unwrap() == def_crate {
+		let name = def_crate.to_string().replace("-", "_");
+		Ok(syn::Ident::new(&name, Span::call_site()))
 	} else {
-		match crate_name("frame-support") {
+		match crate_name(def_crate) {
 			Ok(name) => {
-				let name = Ident::new(&name, Span::call_site());
-				Ok(quote!( #name ))
+				Ok(Ident::new(&name, Span::call_site()))
 			},
 			Err(e) => {
 				Err(Error::new(Span::call_site(), &e))
diff --git a/frame/support/src/instances.rs b/frame/support/src/instances.rs
new file mode 100644
index 000000000000..ee38a6a403e1
--- /dev/null
+++ b/frame/support/src/instances.rs
@@ -0,0 +1,96 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Some instance placeholder to be used in [`frame_support::pallet`] attribute macro.
+//!
+//! [`frame_support::pallet`] attribute macro does only requires the instance generic `I` to be
+//! static (contrary to `decl_*` macro which requires instance generic to implement
+//! [`frame_support::traits::Instance`]).
+//!
+//! Thus support provides some instance types to be used, This allow some instantiable pallet to
+//! depend on specific instance of another:
+//! ```
+//! # mod another_pallet { pub trait Config<I: 'static = ()> {} }
+//! pub trait Config<I: 'static = ()>: another_pallet::Config<I> {}
+//! ```
+//!
+//! NOTE: [`frame_support::pallet`] will reexport them inside the module, in order to make them
+//! accessible to [`frame_support::construct_runtime`].
+
+/// Instance0 to be used for instantiable pallet define with `pallet` macro.
+#[derive(Clone, Copy, PartialEq, Eq, crate::RuntimeDebugNoBound)]
+pub struct Instance0;
+
+/// Instance1 to be used for instantiable pallet define with `pallet` macro.
+#[derive(Clone, Copy, PartialEq, Eq, crate::RuntimeDebugNoBound)]
+pub struct Instance1;
+
+/// Instance2 to be used for instantiable pallet define with `pallet` macro.
+#[derive(Clone, Copy, PartialEq, Eq, crate::RuntimeDebugNoBound)]
+pub struct Instance2;
+
+/// Instance3 to be used for instantiable pallet define with `pallet` macro.
+#[derive(Clone, Copy, PartialEq, Eq, crate::RuntimeDebugNoBound)]
+pub struct Instance3;
+
+/// Instance4 to be used for instantiable pallet define with `pallet` macro.
+#[derive(Clone, Copy, PartialEq, Eq, crate::RuntimeDebugNoBound)]
+pub struct Instance4;
+
+/// Instance5 to be used for instantiable pallet define with `pallet` macro.
+#[derive(Clone, Copy, PartialEq, Eq, crate::RuntimeDebugNoBound)]
+pub struct Instance5;
+
+/// Instance6 to be used for instantiable pallet define with `pallet` macro.
+#[derive(Clone, Copy, PartialEq, Eq, crate::RuntimeDebugNoBound)]
+pub struct Instance6;
+
+/// Instance7 to be used for instantiable pallet define with `pallet` macro.
+#[derive(Clone, Copy, PartialEq, Eq, crate::RuntimeDebugNoBound)]
+pub struct Instance7;
+
+/// Instance8 to be used for instantiable pallet define with `pallet` macro.
+#[derive(Clone, Copy, PartialEq, Eq, crate::RuntimeDebugNoBound)]
+pub struct Instance8;
+
+/// Instance9 to be used for instantiable pallet define with `pallet` macro.
+#[derive(Clone, Copy, PartialEq, Eq, crate::RuntimeDebugNoBound)]
+pub struct Instance9;
+
+/// Instance10 to be used for instantiable pallet define with `pallet` macro.
+#[derive(Clone, Copy, PartialEq, Eq, crate::RuntimeDebugNoBound)]
+pub struct Instance10;
+
+/// Instance11 to be used for instantiable pallet define with `pallet` macro.
+#[derive(Clone, Copy, PartialEq, Eq, crate::RuntimeDebugNoBound)]
+pub struct Instance11;
+
+/// Instance12 to be used for instantiable pallet define with `pallet` macro.
+#[derive(Clone, Copy, PartialEq, Eq, crate::RuntimeDebugNoBound)]
+pub struct Instance12;
+
+/// Instance13 to be used for instantiable pallet define with `pallet` macro.
+#[derive(Clone, Copy, PartialEq, Eq, crate::RuntimeDebugNoBound)]
+pub struct Instance13;
+
+/// Instance14 to be used for instantiable pallet define with `pallet` macro.
+#[derive(Clone, Copy, PartialEq, Eq, crate::RuntimeDebugNoBound)]
+pub struct Instance14;
+
+/// Instance15 to be used for instantiable pallet define with `pallet` macro.
+#[derive(Clone, Copy, PartialEq, Eq, crate::RuntimeDebugNoBound)]
+pub struct Instance15;
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 55bca2610a18..c8279dff9eec 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -67,6 +67,7 @@ pub mod unsigned;
 pub mod error;
 pub mod traits;
 pub mod weights;
+pub mod instances;
 
 pub use self::hash::{
 	Twox256, Twox128, Blake2_256, Blake2_128, Identity, Twox64Concat, Blake2_128Concat, Hashable,
@@ -80,7 +81,7 @@ pub use self::dispatch::{Parameter, Callable};
 pub use sp_runtime::{self, ConsensusEngineId, print, traits::Printable};
 
 /// A type that cannot be instantiated.
-#[derive(Debug)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 pub enum Never {}
 
 /// Create new implementations of the [`Get`](crate::traits::Get) trait.
@@ -1012,3 +1013,1005 @@ mod tests {
 		})
 	}
 }
+
+/// Prelude to be used alongside pallet macro, for ease of use.
+pub mod pallet_prelude {
+	pub use sp_std::marker::PhantomData;
+	#[cfg(feature = "std")]
+	pub use frame_support::traits::GenesisBuild;
+	pub use frame_support::{
+		EqNoBound, PartialEqNoBound, RuntimeDebugNoBound, DebugNoBound, CloneNoBound, Twox256,
+		Twox128, Blake2_256, Blake2_128, Identity, Twox64Concat, Blake2_128Concat, debug, ensure,
+		RuntimeDebug, storage,
+		traits::{Get, Hooks, IsType, GetPalletVersion, EnsureOrigin},
+		dispatch::{DispatchResultWithPostInfo, Parameter, DispatchError},
+		weights::{DispatchClass, Pays, Weight},
+		storage::types::{StorageValue, StorageMap, StorageDoubleMap, ValueQuery, OptionQuery},
+	};
+	pub use codec::{Encode, Decode};
+	pub use sp_inherents::{InherentData, InherentIdentifier, ProvideInherent};
+	pub use sp_runtime::{
+		traits::{MaybeSerializeDeserialize, Member, ValidateUnsigned},
+		transaction_validity::{
+			TransactionSource, TransactionValidity, ValidTransaction, TransactionPriority,
+			TransactionTag, TransactionLongevity, TransactionValidityError, InvalidTransaction,
+			UnknownTransaction,
+		},
+	};
+}
+
+/// `pallet` attribute macro allows to define a pallet to be used in `construct_runtime!`.
+///
+/// It is define by a module item:
+/// ```ignore
+/// #[pallet]
+/// pub mod pallet {
+/// ...
+/// }
+/// ```
+///
+/// Inside the module the macro will parse item with the attribute: `#[pallet::*]`, some attributes
+/// are mandatory, some other optional.
+///
+/// The attribute are explained with the syntax of non instantiable pallets, to see how pallet with
+/// instance work see below example.
+///
+/// Note various type can be automatically imported using pallet_prelude in frame_support and
+/// frame_system:
+/// ```ignore
+/// #[pallet]
+/// pub mod pallet {
+///		use frame_support::pallet_prelude::*;
+///		use frame_system::pallet_prelude::*;
+///		...
+/// }
+/// ```
+///
+/// # Config trait: `#[pallet::config]` mandatory
+///
+/// The trait defining generics of the pallet.
+///
+/// Item must be defined as
+/// ```ignore
+/// #[pallet::config]
+/// pub trait Config: frame_system::Config + $optionally_some_other_supertraits
+/// $optional_where_clause
+/// {
+/// ...
+/// }
+/// ```
+/// I.e. a regular trait definition named `Config`, with supertrait `frame_system::Config`,
+/// optionally other supertrait and where clause.
+///
+/// The associated type `Event` is reserved, if defined it must bounds `From<Event>` and
+/// `IsType<<Self as frame_system::Config>::Event>`, see `#[pallet::event]` for more information.
+///
+/// To put `Get` associated type into metadatas, use the attribute `#[pallet::constant]`, e.g.:
+/// ```ignore
+/// #[pallet::config]
+/// pub trait Config: frame_system::Config {
+///		#[pallet::constant]
+///		type Foo: Get<u32>;
+/// }
+/// ```
+///
+/// To bypass the `frame_system::Config` supertrait check, use the attribute
+/// `#[pallet::disable_frame_system_supertrait_check]`, e.g.:
+/// ```ignore
+/// #[pallet::config]
+/// #[pallet::disable_frame_system_supertrait_check]
+/// pub trait Config: pallet_timestamp::Config {}
+/// ```
+///
+/// ### Macro expansion:
+///
+/// The macro expand pallet constant metadata with the information given by `#[pallet::constant]`.
+///
+/// # Pallet struct placeholder: `#[pallet::pallet]` mandatory
+///
+/// The placeholder struct, on which is implemented pallet informations.
+///
+/// Item must be defined as followed:
+/// ```ignore
+/// #[pallet::pallet]
+/// pub struct Pallet<T>(PhantomData<T>);
+/// ```
+/// I.e. a regular struct definition named `Pallet`, with generic T and no where clause.
+///
+/// To generate a `Store` trait associating all storages, use the attribute
+/// `#[pallet::generate_store($vis trait Store)]`, e.g.:
+/// ```ignore
+/// #[pallet::pallet]
+/// #[pallet::generate_store(pub(super) trait Store)]
+/// pub struct Pallet<T>(PhantomData<T>);
+/// ```
+/// More precisely the store trait contains an associated type for each storage. It is implemented
+/// for `Pallet` allowing to access the storage from pallet struct.
+///
+/// Thus when defining a storage named `Foo`, it can later be accessed from `Pallet` using
+/// `<Pallet as Store>::Foo`.
+///
+/// ### Macro expansion:
+///
+/// The macro add this attribute to the struct definition:
+/// ```ignore
+/// #[derive(
+/// 	frame_support::CloneNoBound,
+/// 	frame_support::EqNoBound,
+/// 	frame_support::PartialEqNoBound,
+/// 	frame_support::RuntimeDebugNoBound,
+/// )]
+/// ```
+///
+/// It implements on pallet:
+/// * [`traits::GetPalletVersion`]
+/// * [`traits::OnGenesis`]: contains some logic to write pallet version into storage.
+/// * `ModuleErrorMetadata`: using error declared or no metadata.
+///
+/// It declare `type Module` type alias for `Pallet`, used by [`construct_runtime`].
+///
+/// If attribute generate_store then macro create the trait `Store` and implement it on `Pallet`.
+///
+/// # Hooks: `#[pallet::hooks]` mandatory
+///
+/// Implementation of `Hooks` on `Pallet` allowing to define some specific pallet logic.
+///
+/// Item must be defined as
+/// ```ignore
+/// #[pallet::hooks]
+/// impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> $optional_where_clause {
+/// }
+/// ```
+/// I.e. a regular trait implementation with generic bound: `T: Config`, for the trait
+/// `Hooks<BlockNumberFor<T>>` (they are defined in preludes), for the type `Pallet<T>`
+/// and with an optional where clause.
+///
+/// ### Macro expansion:
+///
+/// The macro implements the traits `OnInitialize`, `OnFinalize`, `OnRuntimeUpgrade`,
+/// `OffchainWorker`, `IntegrityTest` using `Hooks` implementation.
+///
+/// NOTE: OnRuntimeUpgrade is implemented with `Hooks::on_runtime_upgrade` and some additional
+/// logic. E.g. logic to write pallet version into storage.
+///
+/// # Call: `#[pallet::call]` mandatory
+///
+/// Implementation of pallet dispatchables.
+///
+/// Item must be defined as:
+/// ```ignore
+/// #[pallet::call]
+/// impl<T: Config> Pallet<T> {
+/// 	/// $some_doc
+/// 	#[pallet::weight($ExpressionResultingInWeight)]
+/// 	$vis fn $fn_name(
+/// 		origin: OriginFor<T>,
+/// 		$some_arg: $some_type,
+/// 		// or with compact attribute: #[pallet::compact] $some_arg: $some_type,
+/// 		...
+/// 	) -> DispatchResultWithPostInfo {
+/// 		...
+/// 	}
+/// 	...
+/// }
+/// ```
+/// I.e. a regular type implementation, with generic `T: Config`, on type `Pallet<T>`, with
+/// optional where clause.
+///
+/// Each dispatchable needs to define a weight with `#[pallet::weight($expr)]` attribute,
+/// the first argument must be `origin: OriginFor<T>`, compact encoding for argument can be used
+/// using `#[pallet::compact]`, function must return DispatchResultWithPostInfo.
+///
+/// All arguments must implement `Debug`, `PartialEq`, `Eq`, `Decode`, `Encode`, `Clone`. For ease
+/// of use just bound trait `Member` available in frame_support::pallet_prelude.
+///
+/// **WARNING**: modifying dispatchables, changing their order, removing some must be done with
+/// care. Indeed this will change the outer runtime call type (which is an enum with one variant
+/// per pallet), this outer runtime call can be stored on-chain (e.g. in pallet-scheduler).
+/// Thus migration might be needed.
+///
+/// ### Macro expansion
+///
+/// The macro create an enum `Call` with one variant per dispatchable. This enum implements:
+/// `Clone`, `Eq`, `PartialEq`, `Debug` (with stripped implementation in `not("std")`), `Encode`,
+/// `Decode`, `GetDispatchInfo`, `GetCallName`, `UnfilteredDispatchable`.
+///
+/// The macro implement on `Pallet`, the `Callable` trait and a function `call_functions` which
+/// returns the dispatchable metadatas.
+///
+/// # Extra constants: `#[pallet::extra_constants]` optional
+///
+/// Allow to define some extra constants to put into constant metadata.
+///
+/// Item must be defined as:
+/// ```ignore
+/// #[pallet::extra_constants]
+/// impl<T: Config> Pallet<T> where $optional_where_clause {
+/// 	/// $some_doc
+/// 	$vis fn $fn_name() -> $some_return_type {
+/// 		...
+/// 	}
+/// 	...
+/// }
+/// ```
+/// I.e. a regular rust implement block with some optional where clause and functions with 0 args,
+/// 0 generics, and some return type.
+///
+/// ### Macro expansion
+///
+/// The macro add some extra constant to pallet constant metadata.
+///
+/// # Error: `#[pallet::error]` optional
+///
+/// Allow to define an error type to be return from dispatchable on error.
+/// This error type informations are put into metadata.
+///
+/// Item must be defined as:
+/// ```ignore
+/// #[pallet::error]
+/// pub enum Error<T> {
+/// 	/// $some_optional_doc
+/// 	$SomeFieldLessVariant,
+/// 	...
+/// }
+/// ```
+/// I.e. a regular rust enum named `Error`, with generic `T` and fieldless variants.
+///
+/// ### Macro expansion
+///
+/// The macro implements `Debug` trait and functions `as_u8` using variant position, and `as_str`
+/// using variant doc.
+///
+/// The macro implements `From<Error<T>>` for `&'static str`.
+/// The macro implements `From<Error<T>>` for `DispatchError`.
+///
+/// The macro implements `ModuleErrorMetadata` on `Pallet` defining the `ErrorMetadata` of the
+/// pallet.
+///
+/// # Event: `#[pallet::event]` optional
+///
+/// Allow to define pallet events, pallet events are stored in the block when they deposited (and
+/// removed in next block).
+///
+/// Item is defined as:
+/// ```ignore
+/// #[pallet::event]
+/// #[pallet::metadata($SomeType = "$Metadata", $SomeOtherType = "$Metadata", ..)] // Optional
+/// #[pallet::generate_deposit($visbility fn deposit_event)] // Optional
+/// pub enum Event<$some_generic> $optional_where_clause {
+/// 	/// Some doc
+/// 	$SomeName($SomeType, $YetanotherType, ...),
+/// 	...
+/// }
+/// ```
+/// I.e. an enum (with named or unnamed fields variant), named Event, with generic: none or `T` or
+/// `T: Config`, and optional where clause.
+///
+/// Each field must implement `Clone`, `Eq`, `PartialEq`, `Encode`, `Decode`, and `Debug` (on std
+/// only).
+/// For ease of use just bound trait `Member` available in frame_support::pallet_prelude.
+///
+/// Variant documentations and field types are put into metadata.
+/// The attribute `#[pallet::metadata(..)]` allows to specify the metadata to put for some types.
+///
+/// The metadata of a type is defined by:
+/// * if matching a type in `#[pallet::metadata(..)]`, then the corresponding metadata.
+/// * otherwise the type stringified.
+///
+/// E.g.:
+/// ```ignore
+/// #[pallet::event]
+/// #[pallet::metadata(u32 = "SpecialU32")]
+/// pub enum Event<T: Config> {
+/// 	Proposed(u32, T::AccountId),
+/// }
+/// ```
+/// will write in event variant metadata `"SpecialU32"` and `"T::AccountId"`.
+///
+/// The attribute `#[pallet::generate_deposit($visbility fn deposit_event)]` generate a helper
+/// function on `Pallet` to deposit event.
+///
+/// NOTE: For instantiable pallet, event must be generic over T and I.
+///
+/// ### Macro expansion:
+///
+/// Macro will add on enum `Event` the attributes:
+/// * `#[derive(frame_support::CloneNoBound)]`,
+/// * `#[derive(frame_support::EqNoBound)]`,
+/// * `#[derive(frame_support::PartialEqNoBound)]`,
+/// * `#[derive(codec::Encode)]`,
+/// * `#[derive(codec::Decode)]`,
+/// * `#[derive(frame_support::RuntimeDebugNoBound)]`
+///
+/// Macro implements `From<Event<..>>` for ().
+///
+/// Macro implements metadata function on `Event` returning the `EventMetadata`.
+///
+/// If `#[pallet::generate_deposit]` then macro implement `fn deposit_event` on `Pallet`.
+///
+/// # Storage: `#[pallet::storage]` optional
+///
+/// Allow to define some abstract storage inside runtime storage and also set its metadata.
+/// This attribute can be used multiple times.
+///
+/// Item is defined as:
+/// ```ignore
+/// #[pallet::storage]
+/// #[pallet::getter(fn $getter_name)] // optional
+/// $vis type $StorageName<$some_generic> $optional_where_clause
+/// 	= $StorageType<_, $some_generics, ...>;
+/// ```
+/// I.e. it must be a type alias, with generics: `T` or `T: Config`, aliased type must be one
+/// of `StorageValue`, `StorageMap` or `StorageDoubleMap` (defined in frame_support).
+/// Their first generic must be `_` as it is written by the macro itself.
+///
+/// The Prefix generic written by the macro is generated using `PalletInfo::name::<Pallet<..>>()`
+/// and the name of the storage type.
+/// E.g. if runtime names the pallet "MyExample" then the storage `type Foo<T> = ...` use the
+/// prefix: `Twox128(b"MyExample") ++ Twox128(b"Foo")`.
+///
+/// The optional attribute `#[pallet::getter(fn $my_getter_fn_name)]` allow to define a
+/// getter function on `Pallet`.
+///
+/// E.g:
+/// ```ignore
+/// #[pallet::storage]
+/// #[pallet::getter(fn my_storage)]
+/// pub(super) type MyStorage<T> = StorageMap<_, Blake2_128Concat, u32, u32>;
+/// ```
+///
+/// NOTE: if the querykind generic parameter is still generic at this stage or is using some type
+/// alias then the generation of the getter might fail. In this case getter can be implemented
+/// manually.
+///
+/// ### Macro expansion
+///
+/// For each storage the macro generate a struct named
+/// `_GeneratedPrefixForStorage$NameOfStorage`, implements `StorageInstance` on it using pallet
+/// name and storage name. And use it as first generic of the aliased type.
+///
+///
+/// The macro implement the function `storage_metadata` on `Pallet` implementing the metadata for
+/// storages.
+///
+/// # Type value: `#[pallet::type_value]` optional
+///
+/// Helper to define a struct implementing `Get` trait. To ease use of storage types.
+/// This attribute can be used multiple time.
+///
+/// Item is defined as
+/// ```ignore
+/// #[pallet::type_value]
+/// fn $MyDefaultName<$some_generic>() -> $default_type $optional_where_clause { $expr }
+/// ```
+/// I.e.: a function definition with generics none or `T: Config` and a returned type.
+///
+/// E.g.:
+/// ```ignore
+/// #[pallet::type_value]
+/// fn MyDefault<T: Config>() -> T::Balance { 3.into() }
+/// ```
+///
+/// NOTE: This attribute is meant to be used alongside `#[pallet::storage]` to defined some
+/// specific default value in storage.
+///
+/// ### Macro expansion
+///
+/// Macro generate struct with the name of the function and its generic, and implement
+/// `Get<$ReturnType>` on it using the provided function block.
+///
+/// # Genesis config: `#[pallet::genesis_config]` optional
+///
+/// Allow to define the genesis configuration of the pallet.
+///
+/// Item is defined as either an enum or a struct.
+/// It needs to be public and implement trait GenesisBuild with `#[pallet::genesis_build]`.
+/// The type generics is constrained to be either none, or `T` or `T: Config`.
+///
+/// E.g:
+/// ```ignore
+/// #[pallet::genesis_config]
+/// pub struct GenesisConfig<T: Config> {
+/// 	_myfield: BalanceOf<T>,
+/// }
+/// ```
+///
+/// ### Macro expansion
+///
+/// Macro will add the following attribute on it:
+/// * `#[cfg(feature = "std")]`
+/// * `#[derive(Serialize, Deserialize)]`
+/// * `#[serde(rename_all = "camelCase")]`
+/// * `#[serde(deny_unknown_fields)]`
+/// * `#[serde(bound(serialize = ""))]`
+/// * `#[serde(bound(deserialize = ""))]`
+///
+/// # Genesis build: `#[pallet::genesis_build]` optional
+///
+/// Allow to define how genesis_configuration is built.
+///
+/// Item is defined as
+/// ```ignore
+/// #[pallet::genesis_build]
+/// impl<T: Config> GenesisBuild<T> for GenesisConfig<$maybe_generics> {
+/// 	fn build(&self) { $expr }
+/// }
+/// ```
+/// I.e. a rust trait implementation with generic `T: Config`, of trait `GenesisBuild<T>` on type
+/// `GenesisConfig` with generics none or `T`.
+///
+/// E.g.:
+/// ```ignore
+/// #[pallet::genesis_build]
+/// impl<T: Config> GenesisBuild<T> for GenesisConfig {
+/// 	fn build(&self) {}
+/// }
+/// ```
+///
+/// ### Macro expansion
+///
+/// Macro will add the following attribute on it:
+/// * `#[cfg(feature = "std")]`
+///
+/// Macro will implement `sp_runtime::BuildModuleGenesisStorage` using `()` as second generic for
+/// non-instantiable pallets.
+///
+/// # Inherent: `#[pallet::inherent]` optional
+///
+/// Allow the pallet to provide some inherent:
+///
+/// Item is defined as:
+/// ```ignore
+/// #[pallet::inherent]
+/// impl<T: Config> ProvideInherent for Pallet<T> {
+/// 	// ... regular trait implementation
+/// }
+/// ```
+/// I.e. a trait implementation with bound `T: Config`, of trait `ProvideInherent` for type
+/// `Pallet<T>`, and some optional where clause.
+///
+/// ### Macro expansion
+///
+/// Macro make currently no use of this information, but it might use this information in the
+/// future to give information directly to construct_runtime.
+///
+/// # Validate unsigned: `#[pallet::validate_unsigned]` optional
+///
+/// Allow the pallet to validate some unsigned transaction:
+///
+/// Item is defined as:
+/// ```ignore
+/// #[pallet::validate_unsigned]
+/// impl<T: Config> ValidateUnsigned for Pallet<T> {
+/// 	// ... regular trait implementation
+/// }
+/// ```
+/// I.e. a trait implementation with bound `T: Config`, of trait `ValidateUnsigned` for type
+/// `Pallet<T>`, and some optional where clause.
+///
+/// NOTE: There is also `sp_runtime::traits::SignedExtension` that can be used to add some specific
+/// logic for transaction validation.
+///
+/// ### Macro expansion
+///
+/// Macro make currently no use of this information, but it might use this information in the
+/// future to give information directly to construct_runtime.
+///
+/// # Origin: `#[pallet::origin]` optional
+///
+/// Allow to define some origin for the pallet.
+///
+/// Item must be either a type alias or an enum or a struct. It needs to be public.
+///
+/// E.g.:
+/// ```ignore
+/// #[pallet::origin]
+/// pub struct Origin<T>(PhantomData<(T)>);
+/// ```
+///
+/// **WARNING**: modifying origin changes the outer runtime origin. This outer runtime origin can
+/// be stored on-chain (e.g. in pallet-scheduler), thus any change must be done with care as it
+/// might require some migration.
+///
+/// NOTE: for instantiable pallet, origin must be generic over T and I.
+///
+/// # General notes on instantiable pallet
+///
+/// An instantiable pallet is one where Config is generic, i.e. `Config<I>`. This allow runtime to
+/// implement multiple instance of the pallet, by using different type for the generic.
+/// This is the sole purpose of the generic `I`.
+/// But because `PalletInfo` requires `Pallet` placeholder to be static it is important to bound
+/// `'static` whenever `PalletInfo` can be used.
+/// And in order to have instantiable pallet usable as a regular pallet without instance, it is
+/// important to bound `= ()` on every types.
+///
+/// Thus impl bound look like `impl<T: Config<I>, I: 'static>`, and types look like
+/// `SomeType<T, I=()>` or `SomeType<T: Config<I>, I: 'static = ()>`.
+///
+/// # Example for pallet without instance.
+///
+/// ```
+/// #[frame_support::pallet]
+/// // NOTE: Example is name of the pallet, it will be used as unique identifier for storage
+/// pub mod pallet {
+/// 	use frame_support::pallet_prelude::*; // Import various types used in pallet definition
+/// 	use frame_system::pallet_prelude::*; // OriginFor helper type for implementing dispatchables.
+///
+/// 	type BalanceOf<T> = <T as Config>::Balance;
+///
+/// 	// Define the generic parameter of the pallet
+/// 	// The macro checks trait generics: is expected none or `I = ()`.
+/// 	// The macro parses `#[pallet::constant]` attributes: used to generate constant metadata,
+/// 	// expected syntax is `type $IDENT: Get<$TYPE>;`.
+/// 	#[pallet::config]
+/// 	pub trait Config: frame_system::Config {
+/// 		#[pallet::constant] // put the constant in metadata
+/// 		type MyGetParam: Get<u32>;
+/// 		type Balance: Parameter + From<u8>;
+/// 		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
+/// 	}
+///
+/// 	// Define some additional constant to put into the constant metadata.
+/// 	#[pallet::extra_constants]
+/// 	impl<T: Config> Pallet<T> {
+/// 		/// Some description
+/// 		fn exra_constant_name() -> u128 { 4u128 }
+/// 	}
+///
+/// 	// Define the pallet struct placeholder, various pallet function are implemented on it.
+/// 	// The macro checks struct generics: is expected `T` or `T, I = DefaultInstance`
+/// 	#[pallet::pallet]
+/// 	#[pallet::generate_store(pub(super) trait Store)]
+/// 	pub struct Pallet<T>(PhantomData<T>);
+///
+/// 	// Implement on the pallet hooks on pallet.
+/// 	// The macro checks:
+/// 	// * trait is `Hooks` (imported from pallet_prelude)
+/// 	// * struct is `Pallet<T>` or `Pallet<T, I>`
+/// 	#[pallet::hooks]
+/// 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+/// 	}
+///
+/// 	// Declare Call struct and implement dispatchables.
+/// 	//
+/// 	// WARNING: Each parameter used in functions must implement: Clone, Debug, Eq, PartialEq,
+/// 	// Codec.
+/// 	//
+/// 	// The macro checks:
+/// 	// * pallet is `Pallet<T>` or `Pallet<T, I>`
+/// 	// * trait is `Call`
+/// 	// * each dispatchable functions first argument is `origin: OriginFor<T>` (OriginFor is
+/// 	//   imported from frame_system.
+/// 	//
+/// 	// The macro parse `#[pallet::compact]` attributes, function parameter with this attribute
+/// 	// will be encoded/decoded using compact codec in implementation of codec for the enum
+/// 	// `Call`.
+/// 	//
+/// 	// The macro generate the enum `Call` with a variant for each dispatchable and implements
+/// 	// codec, Eq, PartialEq, Clone and Debug.
+/// 	#[pallet::call]
+/// 	impl<T: Config> Pallet<T> {
+/// 		/// Doc comment put in metadata
+/// 		#[pallet::weight(0)] // Defines weight for call (function parameters are in scope)
+/// 		fn toto(
+/// 			origin: OriginFor<T>,
+/// 			#[pallet::compact] _foo: u32
+/// 		) -> DispatchResultWithPostInfo {
+/// 			let _ = origin;
+/// 			unimplemented!();
+/// 		}
+/// 	}
+///
+/// 	// Declare pallet Error enum. (this is optional)
+/// 	// The macro checks enum generics and that each variant is unit.
+/// 	// The macro generate error metadata using doc comment on each variant.
+/// 	#[pallet::error]
+/// 	pub enum Error<T> {
+/// 		/// doc comment put into metadata
+/// 		InsufficientProposersBalance,
+/// 	}
+///
+/// 	// Declare pallet Event enum. (this is optional)
+/// 	//
+/// 	// WARNING: Each type used in variants must implement: Clone, Debug, Eq, PartialEq, Codec.
+/// 	//
+/// 	// The macro generates event metadata, and derive Clone, Debug, Eq, PartialEq and Codec
+/// 	#[pallet::event]
+/// 	// Additional argument to specify the metadata to use for given type.
+/// 	#[pallet::metadata(BalanceOf<T> = "Balance", u32 = "Other")]
+/// 	// Generate a funciton on Pallet to deposit an event.
+/// 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+/// 	pub enum Event<T: Config> {
+/// 		/// doc comment put in metadata
+/// 		// `<T as frame_system::Config>::AccountId` is not defined in metadata list, the last
+/// 		// Thus the metadata is `<T as frame_system::Config>::AccountId`.
+/// 		Proposed(<T as frame_system::Config>::AccountId),
+/// 		/// doc
+/// 		// here metadata will be `Balance` as define in metadata list
+/// 		Spending(BalanceOf<T>),
+/// 		// here metadata will be `Other` as define in metadata list
+/// 		Something(u32),
+/// 	}
+///
+/// 	// Define a struct which implements `frame_support::traits::Get<T::Balance>`
+/// 	#[pallet::type_value]
+/// 	pub(super) fn MyDefault<T: Config>() -> T::Balance { 3.into() }
+///
+/// 	// Declare a storage, any amount of storage can be declared.
+/// 	//
+/// 	// Is expected either `StorageValue`, `StorageMap` or `StorageDoubleMap`.
+/// 	// The macro generates for struct `$identP` (for storage of name `$ident`) and implement
+/// 	// storage instance on it.
+/// 	// The macro macro expand the metadata for the storage with the type used:
+/// 	// * For storage value the type for value will be copied into metadata
+/// 	// * For storage map the type for value and the type for key will be copied into metadata
+/// 	// * For storage double map the type for value, key1, and key2 will be copied into
+/// 	//   metadata.
+/// 	//
+/// 	// NOTE: for storage hasher, the type is not copied because storage hasher trait already
+/// 	// implements metadata. Thus generic storage hasher is supported.
+/// 	#[pallet::storage]
+/// 	pub(super) type MyStorageValue<T: Config> =
+/// 		StorageValue<_, T::Balance, ValueQuery, MyDefault<T>>;
+///
+/// 	// Another declaration
+/// 	#[pallet::storage]
+/// 	#[pallet::getter(fn my_storage)]
+/// 	pub(super) type MyStorage<T> = StorageMap<_, Blake2_128Concat, u32, u32>;
+///
+/// 	// Declare genesis config. (This is optional)
+/// 	//
+/// 	// The macro accept either type alias or struct or enum, it checks generics are consistent.
+/// 	//
+/// 	// Type must implement `Default` traits
+/// 	#[pallet::genesis_config]
+/// 	#[derive(Default)]
+/// 	pub struct GenesisConfig {
+/// 		_myfield: u32,
+/// 	}
+///
+/// 	// Declare genesis builder. (This is need only if GenesisConfig is declared)
+/// 	#[pallet::genesis_build]
+/// 	impl<T: Config> GenesisBuild<T> for GenesisConfig {
+/// 		fn build(&self) {}
+/// 	}
+///
+/// 	// Declare a pallet origin. (this is optional)
+/// 	//
+/// 	// The macro accept type alias or struct or enum, it checks generics are consistent.
+/// 	#[pallet::origin]
+/// 	pub struct Origin<T>(PhantomData<T>);
+///
+/// 	// Declare validate_unsigned implementation.
+/// 	#[pallet::validate_unsigned]
+/// 	impl<T: Config> ValidateUnsigned for Pallet<T> {
+/// 		type Call = Call<T>;
+/// 		fn validate_unsigned(
+/// 			source: TransactionSource,
+/// 			call: &Self::Call
+/// 		) -> TransactionValidity {
+/// 			Err(TransactionValidityError::Invalid(InvalidTransaction::Call))
+/// 		}
+/// 	}
+///
+/// 	// Declare inherent provider for pallet. (this is optional)
+/// 	//
+/// 	// The macro checks pallet is `Pallet<T>` or `Pallet<T, I>` and trait is `ProvideInherent`
+/// 	#[pallet::inherent]
+/// 	impl<T: Config> ProvideInherent for Pallet<T> {
+/// 		type Call = Call<T>;
+/// 		type Error = InherentError;
+///
+/// 		const INHERENT_IDENTIFIER: InherentIdentifier = INHERENT_IDENTIFIER;
+///
+/// 		fn create_inherent(_data: &InherentData) -> Option<Self::Call> {
+/// 			unimplemented!();
+/// 		}
+/// 	}
+///
+/// 	// Regular rust code needed for implementing ProvideInherent trait
+///
+/// 	#[derive(codec::Encode, sp_runtime::RuntimeDebug)]
+/// 	#[cfg_attr(feature = "std", derive(codec::Decode))]
+/// 	pub enum InherentError {
+/// 	}
+///
+/// 	impl sp_inherents::IsFatalError for InherentError {
+/// 		fn is_fatal_error(&self) -> bool {
+/// 			unimplemented!();
+/// 		}
+/// 	}
+///
+/// 	pub const INHERENT_IDENTIFIER: sp_inherents::InherentIdentifier = *b"testpall";
+/// }
+/// ```
+///
+/// # Example for pallet with instance.
+///
+/// ```
+/// #[frame_support::pallet]
+/// pub mod pallet {
+/// 	use frame_support::pallet_prelude::*;
+/// 	use frame_system::pallet_prelude::*;
+///
+/// 	type BalanceOf<T, I = ()> = <T as Config<I>>::Balance;
+///
+/// 	#[pallet::config]
+/// 	pub trait Config<I: 'static = ()>: frame_system::Config {
+/// 		#[pallet::constant]
+/// 		type MyGetParam: Get<u32>;
+/// 		type Balance: Parameter + From<u8>;
+/// 		type Event: From<Event<Self, I>> + IsType<<Self as frame_system::Config>::Event>;
+/// 	}
+///
+/// 	#[pallet::extra_constants]
+/// 	impl<T: Config<I>, I: 'static> Pallet<T, I> {
+/// 		/// Some description
+/// 		fn exra_constant_name() -> u128 { 4u128 }
+/// 	}
+///
+/// 	#[pallet::pallet]
+/// 	#[pallet::generate_store(pub(super) trait Store)]
+/// 	pub struct Pallet<T, I = ()>(PhantomData<(T, I)>);
+///
+/// 	#[pallet::hooks]
+/// 	impl<T: Config<I>, I: 'static> Hooks<BlockNumberFor<T>> for Pallet<T, I> {
+/// 	}
+///
+/// 	#[pallet::call]
+/// 	impl<T: Config<I>, I: 'static> Pallet<T, I> {
+/// 		/// Doc comment put in metadata
+/// 		#[pallet::weight(0)]
+/// 		fn toto(origin: OriginFor<T>, #[pallet::compact] _foo: u32) -> DispatchResultWithPostInfo {
+/// 			let _ = origin;
+/// 			unimplemented!();
+/// 		}
+/// 	}
+///
+/// 	#[pallet::error]
+/// 	pub enum Error<T, I = ()> {
+/// 		/// doc comment put into metadata
+/// 		InsufficientProposersBalance,
+/// 	}
+///
+/// 	#[pallet::event]
+/// 	#[pallet::metadata(BalanceOf<T> = "Balance", u32 = "Other")]
+/// 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+/// 	pub enum Event<T: Config<I>, I: 'static = ()> {
+/// 		/// doc comment put in metadata
+/// 		Proposed(<T as frame_system::Config>::AccountId),
+/// 		/// doc
+/// 		Spending(BalanceOf<T, I>),
+/// 		Something(u32),
+/// 	}
+///
+/// 	#[pallet::type_value]
+/// 	pub(super) fn MyDefault<T: Config<I>, I: 'static>() -> T::Balance { 3.into() }
+///
+/// 	#[pallet::storage]
+/// 	pub(super) type MyStorageValue<T: Config<I>, I: 'static = ()> =
+/// 		StorageValue<_, T::Balance, ValueQuery, MyDefault<T, I>>;
+///
+/// 	#[pallet::storage]
+/// 	#[pallet::getter(fn my_storage)]
+/// 	pub(super) type MyStorage<T, I = ()> =
+/// 		StorageMap<_, Blake2_128Concat, u32, u32>;
+///
+/// 	#[pallet::genesis_config]
+/// 	#[derive(Default)]
+/// 	pub struct GenesisConfig {
+/// 		_myfield: u32,
+/// 	}
+///
+/// 	#[pallet::genesis_build]
+/// 	impl<T: Config<I>, I: 'static> GenesisBuild<T, I> for GenesisConfig {
+/// 		fn build(&self) {}
+/// 	}
+///
+/// 	#[pallet::origin]
+/// 	pub struct Origin<T, I = ()>(PhantomData<(T, I)>);
+///
+/// 	#[pallet::validate_unsigned]
+/// 	impl<T: Config<I>, I: 'static> ValidateUnsigned for Pallet<T, I> {
+/// 		type Call = Call<T, I>;
+/// 		fn validate_unsigned(
+/// 			source: TransactionSource,
+/// 			call: &Self::Call
+/// 		) -> TransactionValidity {
+/// 			Err(TransactionValidityError::Invalid(InvalidTransaction::Call))
+/// 		}
+/// 	}
+///
+/// 	#[pallet::inherent]
+/// 	impl<T: Config<I>, I: 'static> ProvideInherent for Pallet<T, I> {
+/// 		type Call = Call<T, I>;
+/// 		type Error = InherentError;
+///
+/// 		const INHERENT_IDENTIFIER: InherentIdentifier = INHERENT_IDENTIFIER;
+///
+/// 		fn create_inherent(_data: &InherentData) -> Option<Self::Call> {
+/// 			unimplemented!();
+/// 		}
+/// 	}
+///
+/// 	// Regular rust code needed for implementing ProvideInherent trait
+///
+/// 	#[derive(codec::Encode, sp_runtime::RuntimeDebug)]
+/// 	#[cfg_attr(feature = "std", derive(codec::Decode))]
+/// 	pub enum InherentError {
+/// 	}
+///
+/// 	impl sp_inherents::IsFatalError for InherentError {
+/// 		fn is_fatal_error(&self) -> bool {
+/// 			unimplemented!();
+/// 		}
+/// 	}
+///
+/// 	pub const INHERENT_IDENTIFIER: sp_inherents::InherentIdentifier = *b"testpall";
+/// }
+/// ```
+///
+/// ## Upgrade guidelines:
+///
+/// 1. make crate compiling: rename usage of frame_system::Trait to frame_system::Config.
+/// 2. export metadata of the pallet for later checks
+/// 3. generate the template upgrade for the pallet provided by decl_storage with environment
+/// 	variable `PRINT_PALLET_UPGRADE`: `PRINT_PALLET_UPGRADE=1 cargo check -p my_pallet`
+/// 	This template can be used as information it contains all information for storages, genesis
+/// 	config and genesis build.
+/// 4. reorganize pallet to have trait Trait, decl_* macros, ValidateUnsigned, ProvideInherent,
+/// 	Origin all together in one file. suggested order:
+/// 	* trait,
+/// 	* decl_module,
+/// 	* decl_event,
+/// 	* decl_error,
+/// 	* decl_storage,
+/// 	* origin,
+/// 	* validate_unsigned,
+/// 	* provide_inherent,
+/// 	so far it should compile and all be correct.
+/// 5. start writing new pallet module
+/// 	```ignore
+/// 	pub use pallet::*;
+///
+/// 	#[frame_support::pallet]
+/// 	pub mod pallet {
+/// 		pub use frame_support::pallet_prelude::*;
+/// 		pub use frame_system::pallet_prelude::*;
+/// 		use super::*;
+///
+/// 		#[pallet::pallet]
+/// 		#[pallet::generete($visibility_of_trait_store trait Store)]
+/// 		// NOTE: if the visibility of trait store is private but you want to make it available
+/// 		// in super, then use `pub(super)` or `pub(crate)` to make it available in crate.
+/// 		pub struct Pallet<T>(PhantomData<T>);
+/// 		// pub struct Pallet<T, I = ()>(PhantomData<T>); // for instantiable pallet
+/// 	}
+/// 	```
+/// 6. **migrate trait**: move trait into the module with
+/// 	* rename `Trait` to `Config`
+/// 	* all const in decl_module to `#[pallet::constant]`
+/// 7. **migrate decl_module**: write:
+/// 	```ignore
+/// 	#[pallet::hooks]
+/// 	impl<T: Trait> Hooks for Pallet<T> {
+/// 	}
+/// 	```
+/// 	and write inside on_initialize/on_finalize/on_runtime_upgrade/offchain_worker/integrity_test
+///
+/// 	then write:
+/// 	```ignore
+/// 	#[pallet::call]
+/// 	impl<T: Trait> Pallet<T> {
+/// 	}
+/// 	```
+/// 	and write inside all the call in decl_module with a few changes in the signature:
+/// 	- origin must now be written completely, e.g. `origin: OriginFor<T>`
+/// 	- result type must be `DispatchResultWithPostInfo`, you need to write it and also you might
+/// 	need to put `Ok(().into())` at the end or the function.
+/// 	- `#[compact]` must now be written `#[pallet::compact]`
+/// 	- `#[weight = ..]` must now be written `#[pallet::weight(..)]`
+///
+/// 8. **migrate event**:
+/// 	rewrite as a simple enum under with the attribute `#[pallet::event]`,
+/// 	use `#[pallet::generate_deposit($vis fn deposit_event)]` to generate deposit_event,
+/// 	use `#[pallet::metadata(...)]` to configure the metadata for types in order not to break them.
+/// 9. **migrate error**: just rewrite it with attribute `#[pallet::error]`.
+/// 10. **migrate storage**:
+/// 	decl_storage provide an upgrade template (see 3.). All storages, genesis config, genesis
+/// 	build and default implementation of genesis config can be taken from it directly.
+///
+/// 	Otherwise here is the manual process:
+///
+/// 	first migrate the genesis logic. write:
+/// 	```ignore
+/// 	#[pallet::genesis_config]
+/// 	struct GenesisConfig {
+/// 		// fields of add_extra_genesis
+/// 	}
+/// 	impl Default for GenesisConfig {
+/// 		// type default or default provided for fields
+/// 	}
+/// 	#[pallet::genesis_build]
+/// 	impl<T: Config> GenesisBuild<T> for GenesisConfig {
+/// 	// impl<T: Config, I: 'static> GenesisBuild<T, I> for GenesisConfig { for instantiable pallet
+/// 		fn build() {
+/// 			// The add_extra_genesis build logic
+/// 		}
+/// 	}
+/// 	```
+/// 	for each storages, if it contains config(..) then add a fields, and make its default to the
+/// 	value in `= ..;` or the type default if none, if it contains no build then also add the
+/// 	logic to build the value.
+/// 	for each storages if it contains build(..) then add the logic to genesis_build.
+///
+/// 	NOTE: in decl_storage: is executed first the individual config and build and at the end the
+/// 	add_extra_genesis build
+///
+/// 	Once this is done you can migrate storage individually, a few notes:
+/// 	- for private storage use `pub(crate) type ` or `pub(super) type` or nothing,
+/// 	- for storage with `get(fn ..)` use `#[pallet::getter(fn ...)]`
+/// 	- for storage with value being `Option<$something>` make generic `Value` being `$something`
+/// 		and generic `QueryKind` being `OptionQuery` (note: this is default). Otherwise make
+/// 		`Value` the complete value type and `QueryKind` being `ValueQuery`.
+/// 	- for storage with default value: `= $expr;` provide some specific OnEmpty generic. To do so
+/// 		use of `#[pallet::type_value]` to generate the wanted struct to put.
+/// 		example: `MyStorage: u32 = 3u32` would be written:
+/// 		```ignore
+/// 		#[pallet::type_value] fn MyStorageOnEmpty() -> u32 { 3u32 }
+/// 		#[pallet::storage]
+/// 		pub(super) type MyStorage<T> = StorageValue<u32, ValueQuery, MyStorageOnEmpty>;
+/// 		```
+///
+/// 	NOTE: decl_storage also generates functions `assimilate_storage` and `build_storage`
+/// 	directly on GenesisConfig, those are sometimes used in tests. In order not to break they
+/// 	can be implemented manually, just implement those functions by calling `GenesisBuild`
+/// 	implementation.
+///
+/// 11. **migrate origin**: just move the origin to the pallet module under `#[pallet::origin]`
+/// 12. **migrate validate_unsigned**: just move the ValidateUnsigned implementation to the pallet
+/// 	module under `#[pallet::validate_unsigned]`
+/// 13. **migrate provide_inherent**: just move the ValidateUnsigned implementation to the pallet
+/// 	module under `#[pallet::provide_inherent]`
+/// 14. rename the usage of Module to Pallet and the usage of Config to Trait inside the crate.
+/// 15. migration is done, now double check migration with the checking migration guidelines.
+///
+/// ## Checking upgrade guidelines:
+///
+/// * compare metadata. This checks for:
+/// 	* call, names, signature, doc
+/// 	* event names, docs
+/// 	* error names, docs
+/// 	* storage names, hasher, prefixes, default value
+/// 	* error , error, constant,
+/// * manually check that:
+/// 	* Origin is moved inside macro unser `#[pallet::origin]` if it exists
+/// 	* ValidateUnsigned is moved inside macro under `#[pallet::validate_unsigned)]` if it exists
+/// 	* ProvideInherent is moved inside macro under `#[pallet::inherent)]` if it exists
+/// 	* on_initialize/on_finalize/on_runtime_upgrade/offchain_worker are moved to Hooks
+/// 		implementation
+/// 	* storages with `config(..)` are converted to genesis_config field, and their default is
+/// 		`= $expr;` if the storage have default value
+/// 	* storages with `build($expr)` or `config(..)` are built in genesis_build
+/// 	* add_extra_genesis fields are converted to genesis_config field with their correct default
+/// 		if specified
+/// 	* add_extra_genesis build is written into genesis_build
+/// * storages now use PalletInfo for module_prefix instead of the one given to decl_storage:
+/// 	Thus any use of this pallet in `construct_runtime!` should be careful to update name in
+/// 	order not to break storage or to upgrade storage (moreover for instantiable pallet).
+/// 	If pallet is published, make sure to warn about this breaking change.
+///
+/// # Notes when macro fails to show proper error message spans:
+///
+/// Rustc loses span for some macro input. Some tips to fix it:
+/// * do not use inner attribute:
+/// 	```ignore
+/// 	#[pallet]
+/// 	pub mod pallet {
+/// 		//! This inner attribute will make span fail
+/// 		..
+/// 	}
+/// 	```
+/// * use the newest nightly possible.
+///
+pub use frame_support_procedural::pallet;
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index 718f1d6354a3..1802c3024668 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -1869,6 +1869,79 @@ pub trait IsSubType<T> {
 	fn is_sub_type(&self) -> Option<&T>;
 }
 
+/// The pallet hooks trait. Implementing this lets you express some logic to execute.
+pub trait Hooks<BlockNumber> {
+	/// The block is being finalized. Implement to have something happen.
+	fn on_finalize(_n: BlockNumber) {}
+
+	/// The block is being initialized. Implement to have something happen.
+	///
+	/// Return the non-negotiable weight consumed in the block.
+	fn on_initialize(_n: BlockNumber) -> crate::weights::Weight { 0 }
+
+	/// Perform a module upgrade.
+	///
+	/// NOTE: this doesn't include all pallet logic triggered on runtime upgrade. For instance it
+	/// doesn't include the write of the pallet version in storage. The final complete logic
+	/// triggered on runtime upgrade is given by implementation of `OnRuntimeUpgrade` trait by
+	/// `Pallet`.
+	///
+	/// # Warning
+	///
+	/// This function will be called before we initialized any runtime state, aka `on_initialize`
+	/// wasn't called yet. So, information like the block number and any other
+	/// block local data are not accessible.
+	///
+	/// Return the non-negotiable weight consumed for runtime upgrade.
+	fn on_runtime_upgrade() -> crate::weights::Weight { 0 }
+
+	/// Implementing this function on a module allows you to perform long-running tasks
+	/// that make (by default) validators generate transactions that feed results
+	/// of those long-running computations back on chain.
+	///
+	/// NOTE: This function runs off-chain, so it can access the block state,
+	/// but cannot preform any alterations. More specifically alterations are
+	/// not forbidden, but they are not persisted in any way after the worker
+	/// has finished.
+	///
+	/// This function is being called after every block import (when fully synced).
+	///
+	/// Implement this and use any of the `Offchain` `sp_io` set of APIs
+	/// to perform off-chain computations, calls and submit transactions
+	/// with results to trigger any on-chain changes.
+	/// Any state alterations are lost and are not persisted.
+	fn offchain_worker(_n: BlockNumber) {}
+
+	/// Run integrity test.
+	///
+	/// The test is not executed in a externalities provided environment.
+	fn integrity_test() {}
+}
+
+/// A trait to define the build function of a genesis config, T and I are placeholder for pallet
+/// trait and pallet instance.
+#[cfg(feature = "std")]
+pub trait GenesisBuild<T, I=()>: Default + MaybeSerializeDeserialize {
+	/// The build function is called within an externalities allowing storage APIs.
+	/// Thus one can write to storage using regular pallet storages.
+	fn build(&self);
+
+	/// Build the storage using `build` inside default storage.
+	fn build_storage(&self) -> Result<sp_runtime::Storage, String> {
+		let mut storage = Default::default();
+		self.assimilate_storage(&mut storage)?;
+		Ok(storage)
+	}
+
+	/// Assimilate the storage for this module into pre-existing overlays.
+	fn assimilate_storage(&self, storage: &mut sp_runtime::Storage) -> Result<(), String> {
+		sp_state_machine::BasicExternalities::execute_with_storage(storage, || {
+			self.build();
+			Ok(())
+		})
+	}
+}
+
 /// The storage key postfix that is used to store the [`PalletVersion`] per pallet.
 ///
 /// The full storage key is built by using:
diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
new file mode 100644
index 000000000000..5d2785ebf260
--- /dev/null
+++ b/frame/support/test/tests/pallet.rs
@@ -0,0 +1,764 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use frame_support::{
+	weights::{DispatchInfo, DispatchClass, Pays, GetDispatchInfo},
+	traits::{
+		GetCallName, OnInitialize, OnFinalize, OnRuntimeUpgrade, GetPalletVersion, OnGenesis,
+	},
+	dispatch::{UnfilteredDispatchable, Parameter},
+	storage::unhashed,
+};
+use sp_runtime::{traits::Block as _, DispatchError};
+use sp_io::{TestExternalities, hashing::{twox_64, twox_128, blake2_128}};
+
+pub struct SomeType1;
+impl From<SomeType1> for u64 { fn from(_t: SomeType1) -> Self { 0u64 } }
+
+pub struct SomeType2;
+impl From<SomeType2> for u64 { fn from(_t: SomeType2) -> Self { 100u64 } }
+
+pub struct SomeType3;
+impl From<SomeType3> for u64 { fn from(_t: SomeType3) -> Self { 0u64 } }
+
+pub struct SomeType4;
+impl From<SomeType4> for u64 { fn from(_t: SomeType4) -> Self { 0u64 } }
+
+pub struct SomeType5;
+impl From<SomeType5> for u64 { fn from(_t: SomeType5) -> Self { 0u64 } }
+
+pub struct SomeType6;
+impl From<SomeType6> for u64 { fn from(_t: SomeType6) -> Self { 0u64 } }
+
+pub struct SomeType7;
+impl From<SomeType7> for u64 { fn from(_t: SomeType7) -> Self { 0u64 } }
+
+pub trait SomeAssociation1 { type _1: Parameter; }
+impl SomeAssociation1 for u64 { type _1 = u64; }
+
+pub trait SomeAssociation2 { type _2: Parameter; }
+impl SomeAssociation2 for u64 { type _2 = u64; }
+
+#[frame_support::pallet]
+pub mod pallet {
+	use super::{
+		SomeType1, SomeType2, SomeType3, SomeType4, SomeType5, SomeType6, SomeType7,
+		SomeAssociation1, SomeAssociation2,
+	};
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+
+	type BalanceOf<T> = <T as Config>::Balance;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config
+	where <Self as frame_system::Config>::AccountId: From<SomeType1> + SomeAssociation1,
+	{
+		/// Some comment
+		/// Some comment
+		#[pallet::constant]
+		type MyGetParam: Get<u32>;
+
+		/// Some comment
+		/// Some comment
+		#[pallet::constant]
+		type MyGetParam2: Get<u32>;
+
+		#[pallet::constant]
+		type MyGetParam3: Get<<Self::AccountId as SomeAssociation1>::_1>;
+
+		type Balance: Parameter + Default;
+
+		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
+	}
+
+	#[pallet::extra_constants]
+	impl<T: Config> Pallet<T>
+	where T::AccountId: From<SomeType1> + SomeAssociation1 + From<SomeType2>,
+	{
+		/// Some doc
+		/// Some doc
+		fn some_extra() -> T::AccountId { SomeType2.into() }
+
+		/// Some doc
+		fn some_extra_extra() -> T::AccountId { SomeType1.into() }
+	}
+
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(crate) trait Store)]
+	pub struct Pallet<T>(PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T>
+	where T::AccountId: From<SomeType2> + From<SomeType1> + SomeAssociation1,
+	{
+		fn on_initialize(_: BlockNumberFor<T>) -> Weight {
+			T::AccountId::from(SomeType1); // Test for where clause
+			T::AccountId::from(SomeType2); // Test for where clause
+			Self::deposit_event(Event::Something(10));
+			10
+		}
+		fn on_finalize(_: BlockNumberFor<T>) {
+			T::AccountId::from(SomeType1); // Test for where clause
+			T::AccountId::from(SomeType2); // Test for where clause
+			Self::deposit_event(Event::Something(20));
+		}
+		fn on_runtime_upgrade() -> Weight {
+			T::AccountId::from(SomeType1); // Test for where clause
+			T::AccountId::from(SomeType2); // Test for where clause
+			Self::deposit_event(Event::Something(30));
+			30
+		}
+		fn integrity_test() {
+			T::AccountId::from(SomeType1); // Test for where clause
+			T::AccountId::from(SomeType2); // Test for where clause
+		}
+	}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T>
+	where T::AccountId: From<SomeType1> + From<SomeType3> + SomeAssociation1
+	{
+		/// Doc comment put in metadata
+		#[pallet::weight(Weight::from(*_foo))]
+		fn foo(
+			origin: OriginFor<T>,
+			#[pallet::compact] _foo: u32,
+			_bar: u32,
+		) -> DispatchResultWithPostInfo {
+			T::AccountId::from(SomeType1); // Test for where clause
+			T::AccountId::from(SomeType3); // Test for where clause
+			let _ = origin;
+			Self::deposit_event(Event::Something(3));
+			Ok(().into())
+		}
+
+		/// Doc comment put in metadata
+		#[pallet::weight(1)]
+		#[frame_support::transactional]
+		fn foo_transactional(
+			_origin: OriginFor<T>,
+			#[pallet::compact] foo: u32,
+		) -> DispatchResultWithPostInfo {
+			Self::deposit_event(Event::Something(0));
+			if foo != 0 {
+				Ok(().into())
+			} else {
+				Err(Error::<T>::InsufficientProposersBalance.into())
+			}
+		}
+	}
+
+	#[pallet::error]
+	pub enum Error<T> {
+		/// doc comment put into metadata
+		InsufficientProposersBalance,
+	}
+
+	#[pallet::event]
+	#[pallet::metadata(BalanceOf<T> = "Balance", u32 = "Other")]
+	#[pallet::generate_deposit(fn deposit_event)]
+	pub enum Event<T: Config> where T::AccountId: SomeAssociation1 + From<SomeType1>{
+		/// doc comment put in metadata
+		Proposed(<T as frame_system::Config>::AccountId),
+		/// doc
+		Spending(BalanceOf<T>),
+		Something(u32),
+		SomethingElse(<T::AccountId as SomeAssociation1>::_1),
+	}
+
+	#[pallet::storage]
+	pub type ValueWhereClause<T: Config> where T::AccountId: SomeAssociation2 =
+		StorageValue<_, <T::AccountId as SomeAssociation2>::_2>;
+
+	#[pallet::storage]
+	pub type Value<T> = StorageValue<_, u32>;
+
+	#[pallet::type_value]
+	pub fn MyDefault<T: Config>() -> u16
+	where T::AccountId: From<SomeType7> + From<SomeType1> + SomeAssociation1
+	{
+		T::AccountId::from(SomeType7); // Test where clause works
+		4u16
+	}
+
+	#[pallet::storage]
+	pub type Map<T: Config> where T::AccountId: From<SomeType7> =
+		StorageMap<_, Blake2_128Concat, u8, u16, ValueQuery, MyDefault<T>>;
+
+	#[pallet::storage]
+	pub type Map2<T> = StorageMap<_, Twox64Concat, u16, u32>;
+
+	#[pallet::storage]
+	pub type DoubleMap<T> = StorageDoubleMap<_, Blake2_128Concat, u8, Twox64Concat, u16, u32>;
+
+	#[pallet::storage]
+	pub type DoubleMap2<T> = StorageDoubleMap<_, Twox64Concat, u16, Blake2_128Concat, u32, u64>;
+
+	#[pallet::genesis_config]
+	#[derive(Default)]
+	pub struct GenesisConfig {
+		_myfield: u32,
+	}
+
+	#[pallet::genesis_build]
+	impl<T: Config> GenesisBuild<T> for GenesisConfig
+	where T::AccountId: From<SomeType1> + SomeAssociation1 + From<SomeType4>
+	{
+		fn build(&self) {
+			T::AccountId::from(SomeType1); // Test for where clause
+			T::AccountId::from(SomeType4); // Test for where clause
+		}
+	}
+
+	#[pallet::origin]
+	#[derive(EqNoBound, RuntimeDebugNoBound, CloneNoBound, PartialEqNoBound, Encode, Decode)]
+	pub struct Origin<T>(PhantomData<T>);
+
+	#[pallet::validate_unsigned]
+	impl<T: Config> ValidateUnsigned for Pallet<T>
+	where T::AccountId: From<SomeType1> + SomeAssociation1 + From<SomeType5> + From<SomeType3>
+	{
+		type Call = Call<T>;
+		fn validate_unsigned(
+			_source: TransactionSource,
+			_call: &Self::Call
+		) -> TransactionValidity {
+			T::AccountId::from(SomeType1); // Test for where clause
+			T::AccountId::from(SomeType5); // Test for where clause
+			Err(TransactionValidityError::Invalid(InvalidTransaction::Call))
+		}
+	}
+
+	#[pallet::inherent]
+	impl<T: Config> ProvideInherent for Pallet<T>
+	where T::AccountId: From<SomeType1> + SomeAssociation1 + From<SomeType6> + From<SomeType3>
+	{
+		type Call = Call<T>;
+		type Error = InherentError;
+
+		const INHERENT_IDENTIFIER: InherentIdentifier = INHERENT_IDENTIFIER;
+
+		fn create_inherent(_data: &InherentData) -> Option<Self::Call> {
+			T::AccountId::from(SomeType1); // Test for where clause
+			T::AccountId::from(SomeType6); // Test for where clause
+			unimplemented!();
+		}
+	}
+
+	#[derive(codec::Encode, sp_runtime::RuntimeDebug)]
+	#[cfg_attr(feature = "std", derive(codec::Decode))]
+	pub enum InherentError {
+	}
+
+	impl sp_inherents::IsFatalError for InherentError {
+		fn is_fatal_error(&self) -> bool {
+			unimplemented!();
+		}
+	}
+
+	pub const INHERENT_IDENTIFIER: sp_inherents::InherentIdentifier = *b"testpall";
+}
+
+// Test that a pallet with non generic event and generic genesis_config is correctly handled
+#[frame_support::pallet]
+pub mod pallet2 {
+	use super::{SomeType1, SomeAssociation1};
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config
+	where <Self as frame_system::Config>::AccountId: From<SomeType1> + SomeAssociation1,
+	{
+		type Event: From<Event> + IsType<<Self as frame_system::Config>::Event>;
+	}
+
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(crate) trait Store)]
+	pub struct Pallet<T>(PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T>
+	where T::AccountId: From<SomeType1> + SomeAssociation1,
+	{
+	}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T>
+	where T::AccountId: From<SomeType1> + SomeAssociation1,
+	{
+	}
+
+	#[pallet::event]
+	pub enum Event {
+		/// Something
+		Something(u32),
+	}
+
+	#[pallet::genesis_config]
+	pub struct GenesisConfig<T: Config>
+	where T::AccountId: From<SomeType1> + SomeAssociation1,
+	{
+		phantom: PhantomData<T>,
+	}
+
+	impl<T: Config> Default for GenesisConfig<T>
+	where T::AccountId: From<SomeType1> + SomeAssociation1,
+	{
+		fn default() -> Self {
+			GenesisConfig {
+				phantom: Default::default(),
+			}
+		}
+	}
+
+	#[pallet::genesis_build]
+	impl<T: Config> GenesisBuild<T> for GenesisConfig<T>
+	where T::AccountId: From<SomeType1> + SomeAssociation1,
+	{
+		fn build(&self) {}
+	}
+}
+
+frame_support::parameter_types!(
+	pub const MyGetParam: u32= 10;
+	pub const MyGetParam2: u32= 11;
+	pub const MyGetParam3: u32= 12;
+	pub const BlockHashCount: u32 = 250;
+);
+
+impl frame_system::Config for Runtime {
+	type BaseCallFilter = ();
+	type Origin = Origin;
+	type Index = u64;
+	type BlockNumber = u32;
+	type Call = Call;
+	type Hash = sp_runtime::testing::H256;
+	type Hashing = sp_runtime::traits::BlakeTwo256;
+	type AccountId = u64;
+	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
+	type Header = Header;
+	type Event = Event;
+	type BlockHashCount = BlockHashCount;
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
+	type Version = ();
+	type PalletInfo = PalletInfo;
+	type AccountData = ();
+	type OnNewAccount = ();
+	type OnKilledAccount = ();
+	type SystemWeightInfo = ();
+}
+impl pallet::Config for Runtime {
+	type Event = Event;
+	type MyGetParam = MyGetParam;
+	type MyGetParam2 = MyGetParam2;
+	type MyGetParam3 = MyGetParam3;
+	type Balance = u64;
+}
+
+impl pallet2::Config for Runtime {
+	type Event = Event;
+}
+
+pub type Header = sp_runtime::generic::Header<u32, sp_runtime::traits::BlakeTwo256>;
+pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;
+pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<u32, Call, (), ()>;
+
+frame_support::construct_runtime!(
+	pub enum Runtime where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic
+	{
+		System: frame_system::{Module, Call, Event<T>},
+		Example: pallet::{Module, Call, Event<T>, Config, Storage, Inherent, Origin<T>, ValidateUnsigned},
+		Example2: pallet2::{Module, Call, Event, Config<T>, Storage},
+	}
+);
+
+#[test]
+fn transactional_works() {
+	TestExternalities::default().execute_with(|| {
+		frame_system::Pallet::<Runtime>::set_block_number(1);
+
+		pallet::Call::<Runtime>::foo_transactional(0).dispatch_bypass_filter(None.into())
+			.err().unwrap();
+		assert!(frame_system::Pallet::<Runtime>::events().is_empty());
+
+		pallet::Call::<Runtime>::foo_transactional(1).dispatch_bypass_filter(None.into()).unwrap();
+		assert_eq!(
+			frame_system::Pallet::<Runtime>::events().iter().map(|e| &e.event).collect::<Vec<_>>(),
+			vec![&Event::pallet(pallet::Event::Something(0))],
+		);
+	})
+}
+
+#[test]
+fn call_expand() {
+	let call_foo = pallet::Call::<Runtime>::foo(3, 0);
+	assert_eq!(
+		call_foo.get_dispatch_info(),
+		DispatchInfo {
+			weight: 3,
+			class: DispatchClass::Normal,
+			pays_fee: Pays::Yes,
+		}
+	);
+	assert_eq!(call_foo.get_call_name(), "foo");
+	assert_eq!(
+		pallet::Call::<Runtime>::get_call_names(),
+		&["foo", "foo_transactional"],
+	);
+}
+
+#[test]
+fn error_expand() {
+	assert_eq!(
+		format!("{:?}", pallet::Error::<Runtime>::InsufficientProposersBalance),
+		String::from("InsufficientProposersBalance"),
+	);
+	assert_eq!(
+		<&'static str>::from(pallet::Error::<Runtime>::InsufficientProposersBalance),
+		"InsufficientProposersBalance",
+	);
+	assert_eq!(
+		DispatchError::from(pallet::Error::<Runtime>::InsufficientProposersBalance),
+		DispatchError::Module {
+			index: 1,
+			error: 0,
+			message: Some("InsufficientProposersBalance"),
+		},
+	);
+}
+
+#[test]
+fn instance_expand() {
+	// Assert same type.
+	let _: pallet::__InherentHiddenInstance = ();
+}
+
+#[test]
+fn pallet_expand_deposit_event() {
+	TestExternalities::default().execute_with(|| {
+		frame_system::Pallet::<Runtime>::set_block_number(1);
+		pallet::Call::<Runtime>::foo(3, 0).dispatch_bypass_filter(None.into()).unwrap();
+		assert_eq!(
+			frame_system::Pallet::<Runtime>::events()[0].event,
+			Event::pallet(pallet::Event::Something(3)),
+		);
+	})
+}
+
+#[test]
+fn storage_expand() {
+	use frame_support::pallet_prelude::*;
+	use frame_support::StoragePrefixedMap;
+
+	fn twox_64_concat(d: &[u8]) -> Vec<u8> {
+		let mut v = twox_64(d).to_vec();
+		v.extend_from_slice(d);
+		v
+	}
+
+	fn blake2_128_concat(d: &[u8]) -> Vec<u8> {
+		let mut v = blake2_128(d).to_vec();
+		v.extend_from_slice(d);
+		v
+	}
+
+	TestExternalities::default().execute_with(|| {
+		pallet::Value::<Runtime>::put(1);
+		let k = [twox_128(b"Example"), twox_128(b"Value")].concat();
+		assert_eq!(unhashed::get::<u32>(&k), Some(1u32));
+
+		pallet::Map::<Runtime>::insert(1, 2);
+		let mut k = [twox_128(b"Example"), twox_128(b"Map")].concat();
+		k.extend(1u8.using_encoded(blake2_128_concat));
+		assert_eq!(unhashed::get::<u16>(&k), Some(2u16));
+		assert_eq!(&k[..32], &<pallet::Map<Runtime>>::final_prefix());
+
+		pallet::Map2::<Runtime>::insert(1, 2);
+		let mut k = [twox_128(b"Example"), twox_128(b"Map2")].concat();
+		k.extend(1u16.using_encoded(twox_64_concat));
+		assert_eq!(unhashed::get::<u32>(&k), Some(2u32));
+		assert_eq!(&k[..32], &<pallet::Map2<Runtime>>::final_prefix());
+
+		pallet::DoubleMap::<Runtime>::insert(&1, &2, &3);
+		let mut k = [twox_128(b"Example"), twox_128(b"DoubleMap")].concat();
+		k.extend(1u8.using_encoded(blake2_128_concat));
+		k.extend(2u16.using_encoded(twox_64_concat));
+		assert_eq!(unhashed::get::<u32>(&k), Some(3u32));
+		assert_eq!(&k[..32], &<pallet::DoubleMap<Runtime>>::final_prefix());
+
+		pallet::DoubleMap2::<Runtime>::insert(&1, &2, &3);
+		let mut k = [twox_128(b"Example"), twox_128(b"DoubleMap2")].concat();
+		k.extend(1u16.using_encoded(twox_64_concat));
+		k.extend(2u32.using_encoded(blake2_128_concat));
+		assert_eq!(unhashed::get::<u64>(&k), Some(3u64));
+		assert_eq!(&k[..32], &<pallet::DoubleMap2<Runtime>>::final_prefix());
+	})
+}
+
+#[test]
+fn pallet_hooks_expand() {
+	TestExternalities::default().execute_with(|| {
+		frame_system::Pallet::<Runtime>::set_block_number(1);
+
+		assert_eq!(AllModules::on_initialize(1), 10);
+		AllModules::on_finalize(1);
+
+		assert_eq!(pallet::Pallet::<Runtime>::storage_version(), None);
+		assert_eq!(AllModules::on_runtime_upgrade(), 30);
+		assert_eq!(
+			pallet::Pallet::<Runtime>::storage_version(),
+			Some(pallet::Pallet::<Runtime>::current_version()),
+		);
+
+		assert_eq!(
+			frame_system::Pallet::<Runtime>::events()[0].event,
+			Event::pallet(pallet::Event::Something(10)),
+		);
+		assert_eq!(
+			frame_system::Pallet::<Runtime>::events()[1].event,
+			Event::pallet(pallet::Event::Something(20)),
+		);
+		assert_eq!(
+			frame_system::Pallet::<Runtime>::events()[2].event,
+			Event::pallet(pallet::Event::Something(30)),
+		);
+	})
+}
+
+#[test]
+fn pallet_on_genesis() {
+	TestExternalities::default().execute_with(|| {
+		assert_eq!(pallet::Pallet::<Runtime>::storage_version(), None);
+		pallet::Pallet::<Runtime>::on_genesis();
+		assert_eq!(
+			pallet::Pallet::<Runtime>::storage_version(),
+			Some(pallet::Pallet::<Runtime>::current_version()),
+		);
+	})
+}
+
+#[test]
+fn metadata() {
+	use frame_metadata::*;
+	use codec::{Decode, Encode};
+
+	let expected_pallet_metadata = ModuleMetadata {
+		index: 1,
+		name: DecodeDifferent::Decoded("Example".to_string()),
+		storage: Some(DecodeDifferent::Decoded(StorageMetadata {
+			prefix: DecodeDifferent::Decoded("Example".to_string()),
+			entries: DecodeDifferent::Decoded(vec![
+				StorageEntryMetadata {
+					name: DecodeDifferent::Decoded("ValueWhereClause".to_string()),
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::Plain(
+						DecodeDifferent::Decoded(
+							"<T::AccountId as SomeAssociation2>::_2".to_string()
+						),
+					),
+					default: DecodeDifferent::Decoded(vec![0]),
+					documentation: DecodeDifferent::Decoded(vec![]),
+				},
+				StorageEntryMetadata {
+					name: DecodeDifferent::Decoded("Value".to_string()),
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::Plain(DecodeDifferent::Decoded("u32".to_string())),
+					default: DecodeDifferent::Decoded(vec![0]),
+					documentation: DecodeDifferent::Decoded(vec![]),
+				},
+				StorageEntryMetadata {
+					name: DecodeDifferent::Decoded("Map".to_string()),
+					modifier: StorageEntryModifier::Default,
+					ty: StorageEntryType::Map {
+						key: DecodeDifferent::Decoded("u8".to_string()),
+						value: DecodeDifferent::Decoded("u16".to_string()),
+						hasher: StorageHasher::Blake2_128Concat,
+						unused: false,
+					},
+					default: DecodeDifferent::Decoded(vec![4, 0]),
+					documentation: DecodeDifferent::Decoded(vec![]),
+				},
+				StorageEntryMetadata {
+					name: DecodeDifferent::Decoded("Map2".to_string()),
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::Map {
+						key: DecodeDifferent::Decoded("u16".to_string()),
+						value: DecodeDifferent::Decoded("u32".to_string()),
+						hasher: StorageHasher::Twox64Concat,
+						unused: false,
+					},
+					default: DecodeDifferent::Decoded(vec![0]),
+					documentation: DecodeDifferent::Decoded(vec![]),
+				},
+				StorageEntryMetadata {
+					name: DecodeDifferent::Decoded("DoubleMap".to_string()),
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::DoubleMap {
+						value: DecodeDifferent::Decoded("u32".to_string()),
+						key1: DecodeDifferent::Decoded("u8".to_string()),
+						key2: DecodeDifferent::Decoded("u16".to_string()),
+						hasher: StorageHasher::Blake2_128Concat,
+						key2_hasher: StorageHasher::Twox64Concat,
+					},
+					default: DecodeDifferent::Decoded(vec![0]),
+					documentation: DecodeDifferent::Decoded(vec![]),
+				},
+				StorageEntryMetadata {
+					name: DecodeDifferent::Decoded("DoubleMap2".to_string()),
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::DoubleMap {
+						value: DecodeDifferent::Decoded("u64".to_string()),
+						key1: DecodeDifferent::Decoded("u16".to_string()),
+						key2: DecodeDifferent::Decoded("u32".to_string()),
+						hasher: StorageHasher::Twox64Concat,
+						key2_hasher: StorageHasher::Blake2_128Concat,
+					},
+					default: DecodeDifferent::Decoded(vec![0]),
+					documentation: DecodeDifferent::Decoded(vec![]),
+				},
+			]),
+		})),
+		calls: Some(DecodeDifferent::Decoded(vec![
+			FunctionMetadata {
+				name: DecodeDifferent::Decoded("foo".to_string()),
+				arguments: DecodeDifferent::Decoded(vec![
+					FunctionArgumentMetadata {
+						name: DecodeDifferent::Decoded("_foo".to_string()),
+						ty: DecodeDifferent::Decoded("Compact<u32>".to_string()),
+					},
+					FunctionArgumentMetadata {
+						name: DecodeDifferent::Decoded("_bar".to_string()),
+						ty: DecodeDifferent::Decoded("u32".to_string()),
+					}
+				]),
+				documentation: DecodeDifferent::Decoded(vec![
+					" Doc comment put in metadata".to_string(),
+				]),
+			},
+			FunctionMetadata {
+				name: DecodeDifferent::Decoded("foo_transactional".to_string()),
+				arguments: DecodeDifferent::Decoded(vec![
+					FunctionArgumentMetadata {
+						name: DecodeDifferent::Decoded("foo".to_string()),
+						ty: DecodeDifferent::Decoded("Compact<u32>".to_string()),
+					}
+				]),
+				documentation: DecodeDifferent::Decoded(vec![
+					" Doc comment put in metadata".to_string(),
+				]),
+			},
+		])),
+		event: Some(DecodeDifferent::Decoded(vec![
+			EventMetadata {
+				name: DecodeDifferent::Decoded("Proposed".to_string()),
+				arguments: DecodeDifferent::Decoded(vec!["<T as frame_system::Config>::AccountId".to_string()]),
+				documentation: DecodeDifferent::Decoded(vec![
+					" doc comment put in metadata".to_string()
+				]),
+			},
+			EventMetadata {
+				name: DecodeDifferent::Decoded("Spending".to_string()),
+				arguments: DecodeDifferent::Decoded(vec!["Balance".to_string()]),
+				documentation: DecodeDifferent::Decoded(vec![
+					" doc".to_string()
+				]),
+			},
+			EventMetadata {
+				name: DecodeDifferent::Decoded("Something".to_string()),
+				arguments: DecodeDifferent::Decoded(vec!["Other".to_string()]),
+				documentation: DecodeDifferent::Decoded(vec![]),
+			},
+			EventMetadata {
+				name: DecodeDifferent::Decoded("SomethingElse".to_string()),
+				arguments: DecodeDifferent::Decoded(vec!["<T::AccountId as SomeAssociation1>::_1".to_string()]),
+				documentation: DecodeDifferent::Decoded(vec![]),
+			},
+		])),
+		constants: DecodeDifferent::Decoded(vec![
+			ModuleConstantMetadata {
+				name: DecodeDifferent::Decoded("MyGetParam".to_string()),
+				ty: DecodeDifferent::Decoded("u32".to_string()),
+				value: DecodeDifferent::Decoded(vec![10, 0, 0, 0]),
+				documentation: DecodeDifferent::Decoded(vec![
+					" Some comment".to_string(),
+					" Some comment".to_string(),
+				]),
+			},
+			ModuleConstantMetadata {
+				name: DecodeDifferent::Decoded("MyGetParam2".to_string()),
+				ty: DecodeDifferent::Decoded("u32".to_string()),
+				value: DecodeDifferent::Decoded(vec![11, 0, 0, 0]),
+				documentation: DecodeDifferent::Decoded(vec![
+					" Some comment".to_string(),
+					" Some comment".to_string(),
+				]),
+			},
+			ModuleConstantMetadata {
+				name: DecodeDifferent::Decoded("MyGetParam3".to_string()),
+				ty: DecodeDifferent::Decoded("<T::AccountId as SomeAssociation1>::_1".to_string()),
+				value: DecodeDifferent::Decoded(vec![12, 0, 0, 0, 0, 0, 0, 0]),
+				documentation: DecodeDifferent::Decoded(vec![]),
+			},
+			ModuleConstantMetadata {
+				name: DecodeDifferent::Decoded("some_extra".to_string()),
+				ty: DecodeDifferent::Decoded("T::AccountId".to_string()),
+				value: DecodeDifferent::Decoded(vec![100, 0, 0, 0, 0, 0, 0, 0]),
+				documentation: DecodeDifferent::Decoded(vec![
+					" Some doc".to_string(),
+					" Some doc".to_string(),
+				]),
+			},
+			ModuleConstantMetadata {
+				name: DecodeDifferent::Decoded("some_extra_extra".to_string()),
+				ty: DecodeDifferent::Decoded("T::AccountId".to_string()),
+				value: DecodeDifferent::Decoded(vec![0, 0, 0, 0, 0, 0, 0, 0]),
+				documentation: DecodeDifferent::Decoded(vec![
+					" Some doc".to_string(),
+				]),
+			},
+		]),
+		errors: DecodeDifferent::Decoded(vec![
+			ErrorMetadata {
+				name: DecodeDifferent::Decoded("InsufficientProposersBalance".to_string()),
+				documentation: DecodeDifferent::Decoded(vec![
+					" doc comment put into metadata".to_string(),
+				]),
+			},
+		]),
+	};
+
+	let metadata = match Runtime::metadata().1 {
+		RuntimeMetadata::V12(metadata) => metadata,
+		_ => panic!("metadata has been bump, test needs to be updated"),
+	};
+
+	let modules_metadata = match metadata.modules {
+		DecodeDifferent::Encode(modules_metadata) => modules_metadata,
+		_ => unreachable!(),
+	};
+
+	let pallet_metadata = ModuleMetadata::decode(&mut &modules_metadata[1].encode()[..]).unwrap();
+
+	pretty_assertions::assert_eq!(pallet_metadata, expected_pallet_metadata);
+}
diff --git a/frame/support/test/tests/pallet_compatibility.rs b/frame/support/test/tests/pallet_compatibility.rs
new file mode 100644
index 000000000000..912d68baed16
--- /dev/null
+++ b/frame/support/test/tests/pallet_compatibility.rs
@@ -0,0 +1,298 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use sp_runtime::traits::Block as _;
+
+pub trait SomeAssociation {
+	type A: frame_support::dispatch::Parameter + Default;
+}
+impl SomeAssociation for u64 {
+	type A = u64;
+}
+
+mod pallet_old {
+	use frame_support::{
+		decl_storage, decl_error, decl_event, decl_module, weights::Weight, traits::Get, Parameter
+	};
+	use frame_system::ensure_root;
+	use super::SomeAssociation;
+
+	pub trait Config: frame_system::Config {
+		type SomeConst: Get<Self::Balance>;
+		type Balance: Parameter + codec::HasCompact + From<u32> + Into<Weight> + Default
+			+ SomeAssociation;
+		type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
+	}
+
+	decl_storage! {
+		trait Store for Module<T: Config> as Example {
+			/// Some documentation
+			Dummy get(fn dummy) config(): Option<T::Balance>;
+			Bar get(fn bar) config(): map hasher(blake2_128_concat) T::AccountId => T::Balance;
+			Foo get(fn foo) config(): T::Balance = 3.into();
+			Double get(fn double): double_map
+				hasher(blake2_128_concat) u32,
+				hasher(twox_64_concat) u64
+				=> <T::Balance as SomeAssociation>::A;
+		}
+	}
+
+	decl_event!(
+		pub enum Event<T> where Balance = <T as Config>::Balance {
+			/// Dummy event, just here so there's a generic type that's used.
+			Dummy(Balance),
+		}
+	);
+
+	decl_module! {
+		pub struct Module<T: Config> for enum Call where origin: T::Origin {
+			type Error = Error<T>;
+			fn deposit_event() = default;
+			const SomeConst: T::Balance = T::SomeConst::get();
+
+			#[weight = <T::Balance as Into<Weight>>::into(new_value.clone())]
+			fn set_dummy(origin, #[compact] new_value: T::Balance) {
+				ensure_root(origin)?;
+
+				<Dummy<T>>::put(&new_value);
+				Self::deposit_event(RawEvent::Dummy(new_value));
+			}
+
+			fn on_initialize(_n: T::BlockNumber) -> Weight {
+				<Dummy<T>>::put(T::Balance::from(10));
+				10
+			}
+
+			fn on_finalize(_n: T::BlockNumber) {
+				<Dummy<T>>::put(T::Balance::from(11));
+			}
+		}
+	}
+
+	decl_error! {
+		pub enum Error for Module<T: Config> {
+			/// Some wrong behavior
+			Wrong,
+		}
+	}
+}
+
+#[frame_support::pallet]
+pub mod pallet {
+	use super::SomeAssociation;
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+	use frame_system::ensure_root;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		type Balance: Parameter + codec::HasCompact + From<u32> + Into<Weight> + Default
+			+ MaybeSerializeDeserialize + SomeAssociation;
+		#[pallet::constant]
+		type SomeConst: Get<Self::Balance>;
+		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
+	}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {
+		fn on_initialize(_n: T::BlockNumber) -> Weight {
+			<Dummy<T>>::put(T::Balance::from(10));
+			10
+		}
+
+		fn on_finalize(_n: T::BlockNumber) {
+			<Dummy<T>>::put(T::Balance::from(11));
+		}
+	}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		#[pallet::weight(<T::Balance as Into<Weight>>::into(new_value.clone()))]
+		fn set_dummy(
+			origin: OriginFor<T>,
+			#[pallet::compact] new_value: T::Balance
+		) -> DispatchResultWithPostInfo {
+			ensure_root(origin)?;
+
+			<Dummy<T>>::put(&new_value);
+			Self::deposit_event(Event::Dummy(new_value));
+
+			Ok(().into())
+		}
+	}
+
+	#[pallet::error]
+	pub enum Error<T> {
+		/// Some wrong behavior
+		Wrong,
+	}
+
+	#[pallet::event]
+	#[pallet::generate_deposit(fn deposit_event)]
+	#[pallet::metadata(T::Balance = "Balance")]
+	pub enum Event<T: Config> {
+		/// Dummy event, just here so there's a generic type that's used.
+		Dummy(T::Balance),
+	}
+
+	#[pallet::storage]
+	/// Some documentation
+	type Dummy<T: Config> = StorageValue<_, T::Balance, OptionQuery>;
+
+	#[pallet::storage]
+	type Bar<T: Config> = StorageMap<_, Blake2_128Concat, T::AccountId, T::Balance, ValueQuery>;
+
+	#[pallet::type_value] pub fn OnFooEmpty<T: Config>() -> T::Balance { 3.into() }
+	#[pallet::storage]
+	type Foo<T: Config> = StorageValue<_, T::Balance, ValueQuery, OnFooEmpty<T>>;
+
+	#[pallet::storage]
+	type Double<T: Config> = StorageDoubleMap<
+		_, Blake2_128Concat, u32, Twox64Concat, u64, <T::Balance as SomeAssociation>::A, ValueQuery
+	>;
+
+	#[pallet::genesis_config]
+	pub struct GenesisConfig<T: Config> {
+		dummy: Option<T::Balance>,
+		bar: Vec<(T::AccountId, T::Balance)>,
+		foo: T::Balance,
+	}
+
+	impl<T: Config> Default for GenesisConfig<T> {
+		fn default() -> Self {
+			GenesisConfig {
+				dummy: Default::default(),
+				bar: Default::default(),
+				foo: OnFooEmpty::<T>::get(),
+			}
+		}
+	}
+
+	#[pallet::genesis_build]
+	impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+		fn build(&self) {
+			if let Some(dummy) = self.dummy.as_ref() {
+				<Dummy<T>>::put(dummy);
+			}
+			for (k, v) in &self.bar {
+				<Bar<T>>::insert(k, v);
+			}
+			<Foo<T>>::put(&self.foo);
+		}
+	}
+}
+
+frame_support::parameter_types!(
+	pub const SomeConst: u64 = 10;
+	pub const BlockHashCount: u32 = 250;
+);
+
+impl frame_system::Config for Runtime {
+	type BaseCallFilter = ();
+	type Origin = Origin;
+	type Index = u64;
+	type BlockNumber = u32;
+	type Call = Call;
+	type Hash = sp_runtime::testing::H256;
+	type Hashing = sp_runtime::traits::BlakeTwo256;
+	type AccountId = u64;
+	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
+	type Header = Header;
+	type Event = Event;
+	type BlockHashCount = BlockHashCount;
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
+	type Version = ();
+	type PalletInfo = PalletInfo;
+	type AccountData = ();
+	type OnNewAccount = ();
+	type OnKilledAccount = ();
+	type SystemWeightInfo = ();
+}
+impl pallet::Config for Runtime {
+	type Event = Event;
+	type SomeConst = SomeConst;
+	type Balance = u64;
+}
+impl pallet_old::Config for Runtime {
+	type Event = Event;
+	type SomeConst = SomeConst;
+	type Balance = u64;
+}
+
+pub type Header = sp_runtime::generic::Header<u32, sp_runtime::traits::BlakeTwo256>;
+pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;
+pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<u32, Call, (), ()>;
+
+frame_support::construct_runtime!(
+	pub enum Runtime where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic
+	{
+		System: frame_system::{Module, Call, Event<T>},
+		// NOTE: name Example here is needed in order to have same module prefix
+		Example: pallet::{Module, Call, Event<T>, Config<T>, Storage},
+		PalletOld: pallet_old::{Module, Call, Event<T>, Config<T>, Storage},
+	}
+);
+
+#[cfg(test)]
+mod test {
+	use super::Runtime;
+	use super::pallet;
+	use super::pallet_old;
+	use codec::{Decode, Encode};
+
+	#[test]
+	fn metadata() {
+		let metadata = Runtime::metadata();
+		let modules = match metadata.1 {
+			frame_metadata::RuntimeMetadata::V12(frame_metadata::RuntimeMetadataV12 {
+				modules: frame_metadata::DecodeDifferent::Encode(m),
+				..
+			}) => m,
+			_ => unreachable!(),
+		};
+		pretty_assertions::assert_eq!(modules[1].storage, modules[2].storage);
+		pretty_assertions::assert_eq!(modules[1].calls, modules[2].calls);
+		pretty_assertions::assert_eq!(modules[1].event, modules[2].event);
+		pretty_assertions::assert_eq!(modules[1].constants, modules[2].constants);
+		pretty_assertions::assert_eq!(modules[1].errors, modules[2].errors);
+	}
+
+	#[test]
+	fn types() {
+		assert_eq!(
+			pallet_old::Event::<Runtime>::decode(
+				&mut &pallet::Event::<Runtime>::Dummy(10).encode()[..]
+			).unwrap(),
+			pallet_old::Event::<Runtime>::Dummy(10),
+		);
+
+		assert_eq!(
+			pallet_old::Call::<Runtime>::decode(
+				&mut &pallet::Call::<Runtime>::set_dummy(10).encode()[..]
+			).unwrap(),
+			pallet_old::Call::<Runtime>::set_dummy(10),
+		);
+	}
+}
diff --git a/frame/support/test/tests/pallet_compatibility_instance.rs b/frame/support/test/tests/pallet_compatibility_instance.rs
new file mode 100644
index 000000000000..d2f7a6668ca6
--- /dev/null
+++ b/frame/support/test/tests/pallet_compatibility_instance.rs
@@ -0,0 +1,315 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use sp_runtime::traits::Block as _;
+
+mod pallet_old {
+	use frame_support::{
+		decl_storage, decl_error, decl_event, decl_module, weights::Weight, traits::Get, Parameter
+	};
+	use frame_system::ensure_root;
+
+	pub trait Config<I: Instance = DefaultInstance>: frame_system::Config {
+		type SomeConst: Get<Self::Balance>;
+		type Balance: Parameter + codec::HasCompact + From<u32> + Into<Weight> + Default;
+		type Event: From<Event<Self, I>> + Into<<Self as frame_system::Config>::Event>;
+	}
+
+	decl_storage! {
+		trait Store for Module<T: Config<I>, I: Instance = DefaultInstance> as Example {
+			/// Some documentation
+			Dummy get(fn dummy) config(): Option<T::Balance>;
+			Bar get(fn bar) config(): map hasher(blake2_128_concat) T::AccountId => T::Balance;
+			Foo get(fn foo) config(): T::Balance = 3.into();
+			Double get(fn double):
+				double_map hasher(blake2_128_concat) u32, hasher(twox_64_concat) u64 => u16;
+		}
+	}
+
+	decl_event!(
+		pub enum Event<T, I = DefaultInstance> where Balance = <T as Config<I>>::Balance {
+			/// Dummy event, just here so there's a generic type that's used.
+			Dummy(Balance),
+		}
+	);
+
+	decl_module! {
+		pub struct Module<T: Config<I>, I: Instance = DefaultInstance> for enum Call
+		where origin: T::Origin
+		{
+			type Error = Error<T, I>;
+			fn deposit_event() = default;
+			const SomeConst: T::Balance = T::SomeConst::get();
+
+			#[weight = <T::Balance as Into<Weight>>::into(new_value.clone())]
+			fn set_dummy(origin, #[compact] new_value: T::Balance) {
+				ensure_root(origin)?;
+
+				<Dummy<T, I>>::put(&new_value);
+				Self::deposit_event(RawEvent::Dummy(new_value));
+			}
+
+			fn on_initialize(_n: T::BlockNumber) -> Weight {
+				<Dummy<T, I>>::put(T::Balance::from(10));
+				10
+			}
+
+			fn on_finalize(_n: T::BlockNumber) {
+				<Dummy<T, I>>::put(T::Balance::from(11));
+			}
+		}
+	}
+
+	decl_error! {
+		pub enum Error for Module<T: Config<I>, I: Instance> {
+			/// Some wrong behavior
+			Wrong,
+		}
+	}
+}
+
+#[frame_support::pallet]
+pub mod pallet {
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+	use frame_system::ensure_root;
+
+	#[pallet::config]
+	pub trait Config<I: 'static = ()>: frame_system::Config {
+		type Balance: Parameter + codec::HasCompact + From<u32> + Into<Weight> + Default
+			+ MaybeSerializeDeserialize;
+		#[pallet::constant]
+		type SomeConst: Get<Self::Balance>;
+		type Event: From<Event<Self, I>> + IsType<<Self as frame_system::Config>::Event>;
+	}
+
+	#[pallet::pallet]
+	pub struct Pallet<T, I = ()>(PhantomData<(T, I)>);
+
+	#[pallet::hooks]
+	impl<T: Config<I>, I: 'static> Hooks<T::BlockNumber> for Pallet<T, I> {
+		fn on_initialize(_n: T::BlockNumber) -> Weight {
+			<Dummy<T, I>>::put(T::Balance::from(10));
+			10
+		}
+
+		fn on_finalize(_n: T::BlockNumber) {
+			<Dummy<T, I>>::put(T::Balance::from(11));
+		}
+	}
+
+	#[pallet::call]
+	impl<T: Config<I>, I: 'static> Pallet<T, I> {
+		#[pallet::weight(<T::Balance as Into<Weight>>::into(new_value.clone()))]
+		fn set_dummy(
+			origin: OriginFor<T>,
+			#[pallet::compact] new_value: T::Balance
+		) -> DispatchResultWithPostInfo {
+			ensure_root(origin)?;
+
+			<Dummy<T, I>>::put(&new_value);
+			Self::deposit_event(Event::Dummy(new_value));
+
+			Ok(().into())
+		}
+	}
+
+	#[pallet::error]
+	pub enum Error<T, I = ()> {
+		/// Some wrong behavior
+		Wrong,
+	}
+
+	#[pallet::event]
+	#[pallet::generate_deposit(fn deposit_event)]
+	#[pallet::metadata(T::Balance = "Balance")]
+	pub enum Event<T: Config<I>, I: 'static = ()> {
+		/// Dummy event, just here so there's a generic type that's used.
+		Dummy(T::Balance),
+	}
+
+	#[pallet::storage]
+	/// Some documentation
+	type Dummy<T: Config<I>, I: 'static = ()> = StorageValue<_, T::Balance, OptionQuery>;
+
+	#[pallet::storage]
+	type Bar<T: Config<I>, I: 'static = ()> =
+		StorageMap<_, Blake2_128Concat, T::AccountId, T::Balance, ValueQuery>;
+
+	#[pallet::storage]
+	type Foo<T: Config<I>, I: 'static = ()> =
+		StorageValue<_, T::Balance, ValueQuery, OnFooEmpty<T, I>>;
+	#[pallet::type_value] pub fn OnFooEmpty<T: Config<I>, I: 'static>() -> T::Balance { 3.into() }
+
+	#[pallet::storage]
+	type Double<T, I = ()> = StorageDoubleMap<
+		_, Blake2_128Concat, u32, Twox64Concat, u64, u16, ValueQuery
+	>;
+
+	#[pallet::genesis_config]
+	pub struct GenesisConfig<T: Config<I>, I: 'static = ()> {
+		dummy: Option<T::Balance>,
+		bar: Vec<(T::AccountId, T::Balance)>,
+		foo: T::Balance,
+	}
+
+	impl<T: Config<I>, I: 'static> Default for GenesisConfig<T, I> {
+		fn default() -> Self {
+			GenesisConfig {
+				dummy: Default::default(),
+				bar: Default::default(),
+				foo: OnFooEmpty::<T, I>::get(),
+			}
+		}
+	}
+
+	#[pallet::genesis_build]
+	impl<T: Config<I>, I: 'static> GenesisBuild<T, I> for GenesisConfig<T, I> {
+		fn build(&self) {
+			if let Some(dummy) = self.dummy.as_ref() {
+				<Dummy<T, I>>::put(dummy);
+			}
+			for (k, v) in &self.bar {
+				<Bar<T, I>>::insert(k, v);
+			}
+			<Foo<T, I>>::put(&self.foo);
+		}
+	}
+}
+
+frame_support::parameter_types!(
+	pub const SomeConst: u64 = 10;
+	pub const BlockHashCount: u32 = 250;
+);
+
+impl frame_system::Config for Runtime {
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
+	type BaseCallFilter = ();
+	type Origin = Origin;
+	type Index = u64;
+	type BlockNumber = u32;
+	type Call = Call;
+	type Hash = sp_runtime::testing::H256;
+	type Hashing = sp_runtime::traits::BlakeTwo256;
+	type AccountId = u64;
+	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
+	type Header = Header;
+	type Event = Event;
+	type BlockHashCount = BlockHashCount;
+	type Version = ();
+	type PalletInfo = PalletInfo;
+	type AccountData = ();
+	type OnNewAccount = ();
+	type OnKilledAccount = ();
+	type SystemWeightInfo = ();
+}
+impl pallet::Config for Runtime {
+	type Event = Event;
+	type SomeConst = SomeConst;
+	type Balance = u64;
+}
+impl pallet::Config<pallet::Instance2> for Runtime {
+	type Event = Event;
+	type SomeConst = SomeConst;
+	type Balance = u64;
+}
+impl pallet::Config<pallet::Instance3> for Runtime {
+	type Event = Event;
+	type SomeConst = SomeConst;
+	type Balance = u64;
+}
+impl pallet_old::Config for Runtime {
+	type Event = Event;
+	type SomeConst = SomeConst;
+	type Balance = u64;
+}
+impl pallet_old::Config<pallet_old::Instance2> for Runtime {
+	type Event = Event;
+	type SomeConst = SomeConst;
+	type Balance = u64;
+}
+impl pallet_old::Config<pallet_old::Instance3> for Runtime {
+	type Event = Event;
+	type SomeConst = SomeConst;
+	type Balance = u64;
+}
+
+pub type Header = sp_runtime::generic::Header<u32, sp_runtime::traits::BlakeTwo256>;
+pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;
+pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<u32, Call, (), ()>;
+
+frame_support::construct_runtime!(
+	pub enum Runtime where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic
+	{
+		System: frame_system::{Module, Call, Event<T>},
+		Example: pallet::{Module, Call, Event<T>, Config<T>, Storage},
+		PalletOld: pallet_old::{Module, Call, Event<T>, Config<T>, Storage},
+		Instance2Example: pallet::<Instance2>::{Module, Call, Event<T>, Config<T>, Storage},
+		PalletOld2: pallet_old::<Instance2>::{Module, Call, Event<T>, Config<T>, Storage},
+		Instance3Example: pallet::<Instance3>::{Module, Call, Event<T>, Config<T>, Storage},
+		PalletOld3: pallet_old::<Instance3>::{Module, Call, Event<T>, Config<T>, Storage},
+	}
+);
+
+#[cfg(test)]
+mod test {
+	use super::Runtime;
+	use super::pallet;
+	use super::pallet_old;
+	use codec::{Decode, Encode};
+
+	#[test]
+	fn metadata() {
+		let metadata = Runtime::metadata();
+		let modules = match metadata.1 {
+			frame_metadata::RuntimeMetadata::V12(frame_metadata::RuntimeMetadataV12 {
+				modules: frame_metadata::DecodeDifferent::Encode(m),
+				..
+			}) => m,
+			_ => unreachable!(),
+		};
+		for i in vec![1, 3, 5].into_iter() {
+			pretty_assertions::assert_eq!(modules[i].storage, modules[i+1].storage);
+			pretty_assertions::assert_eq!(modules[i].calls, modules[i+1].calls);
+			pretty_assertions::assert_eq!(modules[i].event, modules[i+1].event);
+			pretty_assertions::assert_eq!(modules[i].constants, modules[i+1].constants);
+			pretty_assertions::assert_eq!(modules[i].errors, modules[i+1].errors);
+		}
+	}
+
+	#[test]
+	fn types() {
+		assert_eq!(
+			pallet_old::Event::<Runtime>::decode(
+				&mut &pallet::Event::<Runtime>::Dummy(10).encode()[..]
+			).unwrap(),
+			pallet_old::Event::<Runtime>::Dummy(10),
+		);
+
+		assert_eq!(
+			pallet_old::Call::<Runtime>::decode(
+				&mut &pallet::Call::<Runtime>::set_dummy(10).encode()[..]
+			).unwrap(),
+			pallet_old::Call::<Runtime>::set_dummy(10),
+		);
+	}
+}
diff --git a/frame/support/test/tests/pallet_instance.rs b/frame/support/test/tests/pallet_instance.rs
new file mode 100644
index 000000000000..82b058b7bddd
--- /dev/null
+++ b/frame/support/test/tests/pallet_instance.rs
@@ -0,0 +1,708 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use frame_support::{
+	weights::{DispatchInfo, DispatchClass, Pays, GetDispatchInfo},
+	traits::{
+		GetCallName, GetPalletVersion, OnInitialize, OnFinalize, OnRuntimeUpgrade, OnGenesis,
+	},
+	dispatch::UnfilteredDispatchable,
+	storage::unhashed,
+};
+use sp_runtime::{traits::Block as _, DispatchError};
+use sp_io::{TestExternalities, hashing::{twox_64, twox_128, blake2_128}};
+
+#[frame_support::pallet]
+pub mod pallet {
+	use sp_std::any::TypeId;
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+
+	type BalanceOf<T, I> = <T as Config<I>>::Balance;
+
+	#[pallet::config]
+	pub trait Config<I: 'static = ()>: frame_system::Config {
+		#[pallet::constant]
+		type MyGetParam: Get<u32>;
+		type Balance: Parameter + Default;
+		type Event: From<Event<Self, I>> + IsType<<Self as frame_system::Config>::Event>;
+	}
+
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(crate) trait Store)]
+	pub struct Pallet<T, I = ()>(PhantomData<(T, I)>);
+
+	#[pallet::hooks]
+	impl<T: Config<I>, I: 'static> Hooks<BlockNumberFor<T>> for Pallet<T, I> {
+		fn on_initialize(_: BlockNumberFor<T>) -> Weight {
+			if TypeId::of::<I>() == TypeId::of::<()>() {
+				Self::deposit_event(Event::Something(10));
+				10
+			} else {
+				Self::deposit_event(Event::Something(11));
+				11
+			}
+		}
+		fn on_finalize(_: BlockNumberFor<T>) {
+			if TypeId::of::<I>() == TypeId::of::<()>() {
+				Self::deposit_event(Event::Something(20));
+			} else {
+				Self::deposit_event(Event::Something(21));
+			}
+		}
+		fn on_runtime_upgrade() -> Weight {
+			if TypeId::of::<I>() == TypeId::of::<()>() {
+				Self::deposit_event(Event::Something(30));
+				30
+			} else {
+				Self::deposit_event(Event::Something(31));
+				31
+			}
+		}
+		fn integrity_test() {
+		}
+	}
+
+	#[pallet::call]
+	impl<T: Config<I>, I: 'static> Pallet<T, I> {
+		/// Doc comment put in metadata
+		#[pallet::weight(Weight::from(*_foo))]
+		fn foo(origin: OriginFor<T>, #[pallet::compact] _foo: u32) -> DispatchResultWithPostInfo {
+			let _ = origin;
+			Self::deposit_event(Event::Something(3));
+			Ok(().into())
+		}
+
+		/// Doc comment put in metadata
+		#[pallet::weight(1)]
+		#[frame_support::transactional]
+		fn foo_transactional(
+			origin: OriginFor<T>,
+			#[pallet::compact] _foo: u32
+		) -> DispatchResultWithPostInfo {
+			let _ = origin;
+			Ok(().into())
+		}
+	}
+
+
+	#[pallet::error]
+	pub enum Error<T, I = ()> {
+		/// doc comment put into metadata
+		InsufficientProposersBalance,
+	}
+
+	#[pallet::event]
+	#[pallet::metadata(BalanceOf<T, I> = "Balance", u32 = "Other")]
+	#[pallet::generate_deposit(fn deposit_event)]
+	pub enum Event<T: Config<I>, I: 'static = ()> {
+		/// doc comment put in metadata
+		Proposed(<T as frame_system::Config>::AccountId),
+		/// doc
+		Spending(BalanceOf<T, I>),
+		Something(u32),
+	}
+
+	#[pallet::storage]
+	pub type Value<T, I = ()> = StorageValue<_, u32>;
+
+	#[pallet::storage]
+	pub type Map<T, I = ()> = StorageMap<_, Blake2_128Concat, u8, u16>;
+
+	#[pallet::storage]
+	pub type Map2<T, I = ()> = StorageMap<_, Twox64Concat, u16, u32>;
+
+	#[pallet::storage]
+	pub type DoubleMap<T, I = ()> =
+		StorageDoubleMap<_, Blake2_128Concat, u8, Twox64Concat, u16, u32>;
+
+	#[pallet::storage]
+	pub type DoubleMap2<T, I = ()> =
+		StorageDoubleMap<_, Twox64Concat, u16, Blake2_128Concat, u32, u64>;
+
+	#[pallet::genesis_config]
+	#[derive(Default)]
+	pub struct GenesisConfig {
+		_myfield: u32,
+	}
+
+	#[pallet::genesis_build]
+	impl<T: Config<I>, I:'static> GenesisBuild<T, I> for GenesisConfig {
+		fn build(&self) {}
+	}
+
+	#[pallet::origin]
+	#[derive(EqNoBound, RuntimeDebugNoBound, CloneNoBound, PartialEqNoBound, Encode, Decode)]
+	pub struct Origin<T, I = ()>(PhantomData<(T, I)>);
+
+	#[pallet::validate_unsigned]
+	impl<T: Config<I>, I: 'static> ValidateUnsigned for Pallet<T, I> {
+		type Call = Call<T, I>;
+		fn validate_unsigned(
+			_source: TransactionSource,
+			_call: &Self::Call
+		) -> TransactionValidity {
+			Err(TransactionValidityError::Invalid(InvalidTransaction::Call))
+		}
+	}
+
+	#[pallet::inherent]
+	impl<T: Config<I>, I: 'static> ProvideInherent for Pallet<T, I> {
+		type Call = Call<T, I>;
+		type Error = InherentError;
+
+		const INHERENT_IDENTIFIER: InherentIdentifier = INHERENT_IDENTIFIER;
+
+		fn create_inherent(_data: &InherentData) -> Option<Self::Call> {
+			unimplemented!();
+		}
+	}
+
+	#[derive(codec::Encode, sp_runtime::RuntimeDebug)]
+	#[cfg_attr(feature = "std", derive(codec::Decode))]
+	pub enum InherentError {
+	}
+
+	impl sp_inherents::IsFatalError for InherentError {
+		fn is_fatal_error(&self) -> bool {
+			unimplemented!();
+		}
+	}
+
+	pub const INHERENT_IDENTIFIER: sp_inherents::InherentIdentifier = *b"testpall";
+}
+
+// Test that a instantiable pallet with a generic genesis_config is correctly handled
+#[frame_support::pallet]
+pub mod pallet2 {
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+
+	#[pallet::config]
+	pub trait Config<I: 'static = ()>: frame_system::Config {
+		type Event: From<Event<Self, I>> + IsType<<Self as frame_system::Config>::Event>;
+	}
+
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(crate) trait Store)]
+	pub struct Pallet<T, I = ()>(PhantomData<(T, I)>);
+
+	#[pallet::hooks]
+	impl<T: Config<I>, I: 'static> Hooks<BlockNumberFor<T>> for Pallet<T, I> {}
+
+	#[pallet::call]
+	impl<T: Config<I>, I: 'static> Pallet<T, I> {}
+
+	#[pallet::event]
+	pub enum Event<T: Config<I>, I: 'static = ()> {
+		/// Something
+		Something(u32),
+	}
+
+	#[pallet::genesis_config]
+	pub struct GenesisConfig<T: Config<I>, I: 'static = ()> {
+		phantom: PhantomData<(T, I)>,
+	}
+
+	impl<T: Config<I>, I: 'static> Default for GenesisConfig<T, I> {
+		fn default() -> Self {
+			GenesisConfig {
+				phantom: Default::default(),
+			}
+		}
+	}
+
+	#[pallet::genesis_build]
+	impl<T: Config<I>, I: 'static> GenesisBuild<T, I> for GenesisConfig<T, I> {
+		fn build(&self) {}
+	}
+}
+
+frame_support::parameter_types!(
+	pub const MyGetParam: u32= 10;
+	pub const BlockHashCount: u32 = 250;
+);
+
+impl frame_system::Config for Runtime {
+	type BaseCallFilter = ();
+	type Origin = Origin;
+	type Index = u64;
+	type BlockNumber = u32;
+	type Call = Call;
+	type Hash = sp_runtime::testing::H256;
+	type Hashing = sp_runtime::traits::BlakeTwo256;
+	type AccountId = u64;
+	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
+	type Header = Header;
+	type Event = Event;
+	type BlockHashCount = BlockHashCount;
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
+	type Version = ();
+	type PalletInfo = PalletInfo;
+	type AccountData = ();
+	type OnNewAccount = ();
+	type OnKilledAccount = ();
+	type SystemWeightInfo = ();
+}
+impl pallet::Config for Runtime {
+	type Event = Event;
+	type MyGetParam= MyGetParam;
+	type Balance = u64;
+}
+impl pallet::Config<pallet::Instance1> for Runtime {
+	type Event = Event;
+	type MyGetParam= MyGetParam;
+	type Balance = u64;
+}
+impl pallet2::Config for Runtime {
+	type Event = Event;
+}
+impl pallet2::Config<pallet::Instance1> for Runtime {
+	type Event = Event;
+}
+
+pub type Header = sp_runtime::generic::Header<u32, sp_runtime::traits::BlakeTwo256>;
+pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;
+pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<u32, Call, (), ()>;
+
+frame_support::construct_runtime!(
+	pub enum Runtime where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic
+	{
+		System: frame_system::{Module, Call, Event<T>},
+		Example: pallet::{Module, Call, Event<T>, Config, Storage, Inherent, Origin<T>, ValidateUnsigned},
+		Instance1Example: pallet::<Instance1>::{
+			Module, Call, Event<T>, Config, Storage, Inherent, Origin<T>, ValidateUnsigned
+		},
+		Example2: pallet2::{Module, Call, Event<T>, Config<T>, Storage},
+		Instance1Example2: pallet2::<Instance1>::{Module, Call, Event<T>, Config<T>, Storage},
+	}
+);
+
+#[test]
+fn call_expand() {
+	let call_foo = pallet::Call::<Runtime>::foo(3);
+	assert_eq!(
+		call_foo.get_dispatch_info(),
+		DispatchInfo {
+			weight: 3,
+			class: DispatchClass::Normal,
+			pays_fee: Pays::Yes,
+		}
+	);
+	assert_eq!(call_foo.get_call_name(), "foo");
+	assert_eq!(
+		pallet::Call::<Runtime>::get_call_names(),
+		&["foo", "foo_transactional"],
+	);
+
+	let call_foo = pallet::Call::<Runtime, pallet::Instance1>::foo(3);
+	assert_eq!(
+		call_foo.get_dispatch_info(),
+		DispatchInfo {
+			weight: 3,
+			class: DispatchClass::Normal,
+			pays_fee: Pays::Yes,
+		}
+	);
+	assert_eq!(call_foo.get_call_name(), "foo");
+	assert_eq!(
+		pallet::Call::<Runtime, pallet::Instance1>::get_call_names(),
+		&["foo", "foo_transactional"],
+	);
+}
+
+#[test]
+fn error_expand() {
+	assert_eq!(
+		format!("{:?}", pallet::Error::<Runtime>::InsufficientProposersBalance),
+		String::from("InsufficientProposersBalance"),
+	);
+	assert_eq!(
+		<&'static str>::from(pallet::Error::<Runtime>::InsufficientProposersBalance),
+		"InsufficientProposersBalance",
+	);
+	assert_eq!(
+		DispatchError::from(pallet::Error::<Runtime>::InsufficientProposersBalance),
+		DispatchError::Module {
+			index: 1,
+			error: 0,
+			message: Some("InsufficientProposersBalance"),
+		},
+	);
+
+	assert_eq!(
+		format!("{:?}", pallet::Error::<Runtime, pallet::Instance1>::InsufficientProposersBalance),
+		String::from("InsufficientProposersBalance"),
+	);
+	assert_eq!(
+		<&'static str>::from(pallet::Error::<Runtime, pallet::Instance1>::InsufficientProposersBalance),
+		"InsufficientProposersBalance",
+	);
+	assert_eq!(
+		DispatchError::from(pallet::Error::<Runtime, pallet::Instance1>::InsufficientProposersBalance),
+		DispatchError::Module {
+			index: 2,
+			error: 0,
+			message: Some("InsufficientProposersBalance"),
+		},
+	);
+}
+
+#[test]
+fn instance_expand() {
+	// assert same type
+	let _: pallet::__InherentHiddenInstance = ();
+}
+
+#[test]
+fn pallet_expand_deposit_event() {
+	TestExternalities::default().execute_with(|| {
+		frame_system::Module::<Runtime>::set_block_number(1);
+		pallet::Call::<Runtime>::foo(3).dispatch_bypass_filter(None.into()).unwrap();
+		assert_eq!(
+			frame_system::Module::<Runtime>::events()[0].event,
+			Event::pallet(pallet::Event::Something(3)),
+		);
+	});
+
+	TestExternalities::default().execute_with(|| {
+		frame_system::Module::<Runtime>::set_block_number(1);
+		pallet::Call::<Runtime, pallet::Instance1>::foo(3).dispatch_bypass_filter(None.into()).unwrap();
+		assert_eq!(
+			frame_system::Module::<Runtime>::events()[0].event,
+			Event::pallet_Instance1(pallet::Event::Something(3)),
+		);
+	});
+}
+
+#[test]
+fn storage_expand() {
+	use frame_support::pallet_prelude::*;
+	use frame_support::StoragePrefixedMap;
+
+	fn twox_64_concat(d: &[u8]) -> Vec<u8> {
+		let mut v = twox_64(d).to_vec();
+		v.extend_from_slice(d);
+		v
+	}
+
+	fn blake2_128_concat(d: &[u8]) -> Vec<u8> {
+		let mut v = blake2_128(d).to_vec();
+		v.extend_from_slice(d);
+		v
+	}
+
+	TestExternalities::default().execute_with(|| {
+		<pallet::Value<Runtime>>::put(1);
+		let k = [twox_128(b"Example"), twox_128(b"Value")].concat();
+		assert_eq!(unhashed::get::<u32>(&k), Some(1u32));
+
+		<pallet::Map<Runtime>>::insert(1, 2);
+		let mut k = [twox_128(b"Example"), twox_128(b"Map")].concat();
+		k.extend(1u8.using_encoded(blake2_128_concat));
+		assert_eq!(unhashed::get::<u16>(&k), Some(2u16));
+		assert_eq!(&k[..32], &<pallet::Map<Runtime>>::final_prefix());
+
+		<pallet::Map2<Runtime>>::insert(1, 2);
+		let mut k = [twox_128(b"Example"), twox_128(b"Map2")].concat();
+		k.extend(1u16.using_encoded(twox_64_concat));
+		assert_eq!(unhashed::get::<u32>(&k), Some(2u32));
+		assert_eq!(&k[..32], &<pallet::Map2<Runtime>>::final_prefix());
+
+		<pallet::DoubleMap<Runtime>>::insert(&1, &2, &3);
+		let mut k = [twox_128(b"Example"), twox_128(b"DoubleMap")].concat();
+		k.extend(1u8.using_encoded(blake2_128_concat));
+		k.extend(2u16.using_encoded(twox_64_concat));
+		assert_eq!(unhashed::get::<u32>(&k), Some(3u32));
+		assert_eq!(&k[..32], &<pallet::DoubleMap<Runtime>>::final_prefix());
+
+		<pallet::DoubleMap2<Runtime>>::insert(&1, &2, &3);
+		let mut k = [twox_128(b"Example"), twox_128(b"DoubleMap2")].concat();
+		k.extend(1u16.using_encoded(twox_64_concat));
+		k.extend(2u32.using_encoded(blake2_128_concat));
+		assert_eq!(unhashed::get::<u64>(&k), Some(3u64));
+		assert_eq!(&k[..32], &<pallet::DoubleMap2<Runtime>>::final_prefix());
+	});
+
+	TestExternalities::default().execute_with(|| {
+		<pallet::Value<Runtime, pallet::Instance1>>::put(1);
+		let k = [twox_128(b"Instance1Example"), twox_128(b"Value")].concat();
+		assert_eq!(unhashed::get::<u32>(&k), Some(1u32));
+
+		<pallet::Map<Runtime, pallet::Instance1>>::insert(1, 2);
+		let mut k = [twox_128(b"Instance1Example"), twox_128(b"Map")].concat();
+		k.extend(1u8.using_encoded(blake2_128_concat));
+		assert_eq!(unhashed::get::<u16>(&k), Some(2u16));
+		assert_eq!(&k[..32], &<pallet::Map<Runtime, pallet::Instance1>>::final_prefix());
+
+		<pallet::Map2<Runtime, pallet::Instance1>>::insert(1, 2);
+		let mut k = [twox_128(b"Instance1Example"), twox_128(b"Map2")].concat();
+		k.extend(1u16.using_encoded(twox_64_concat));
+		assert_eq!(unhashed::get::<u32>(&k), Some(2u32));
+		assert_eq!(&k[..32], &<pallet::Map2<Runtime, pallet::Instance1>>::final_prefix());
+
+		<pallet::DoubleMap<Runtime, pallet::Instance1>>::insert(&1, &2, &3);
+		let mut k = [twox_128(b"Instance1Example"), twox_128(b"DoubleMap")].concat();
+		k.extend(1u8.using_encoded(blake2_128_concat));
+		k.extend(2u16.using_encoded(twox_64_concat));
+		assert_eq!(unhashed::get::<u32>(&k), Some(3u32));
+		assert_eq!(&k[..32], &<pallet::DoubleMap<Runtime, pallet::Instance1>>::final_prefix());
+
+		<pallet::DoubleMap2<Runtime, pallet::Instance1>>::insert(&1, &2, &3);
+		let mut k = [twox_128(b"Instance1Example"), twox_128(b"DoubleMap2")].concat();
+		k.extend(1u16.using_encoded(twox_64_concat));
+		k.extend(2u32.using_encoded(blake2_128_concat));
+		assert_eq!(unhashed::get::<u64>(&k), Some(3u64));
+		assert_eq!(&k[..32], &<pallet::DoubleMap2<Runtime, pallet::Instance1>>::final_prefix());
+	});
+}
+
+#[test]
+fn pallet_hooks_expand() {
+	TestExternalities::default().execute_with(|| {
+		frame_system::Module::<Runtime>::set_block_number(1);
+
+		assert_eq!(AllModules::on_initialize(1), 21);
+		AllModules::on_finalize(1);
+
+		assert_eq!(pallet::Pallet::<Runtime>::storage_version(), None);
+		assert_eq!(pallet::Pallet::<Runtime, pallet::Instance1>::storage_version(), None);
+		assert_eq!(AllModules::on_runtime_upgrade(), 61);
+		assert_eq!(
+			pallet::Pallet::<Runtime>::storage_version(),
+			Some(pallet::Pallet::<Runtime>::current_version()),
+		);
+		assert_eq!(
+			pallet::Pallet::<Runtime, pallet::Instance1>::storage_version(),
+			Some(pallet::Pallet::<Runtime, pallet::Instance1>::current_version()),
+		);
+
+		// The order is indeed reversed due to https://github.com/paritytech/substrate/issues/6280
+		assert_eq!(
+			frame_system::Module::<Runtime>::events()[0].event,
+			Event::pallet_Instance1(pallet::Event::Something(11)),
+		);
+		assert_eq!(
+			frame_system::Module::<Runtime>::events()[1].event,
+			Event::pallet(pallet::Event::Something(10)),
+		);
+		assert_eq!(
+			frame_system::Module::<Runtime>::events()[2].event,
+			Event::pallet_Instance1(pallet::Event::Something(21)),
+		);
+		assert_eq!(
+			frame_system::Module::<Runtime>::events()[3].event,
+			Event::pallet(pallet::Event::Something(20)),
+		);
+		assert_eq!(
+			frame_system::Module::<Runtime>::events()[4].event,
+			Event::pallet_Instance1(pallet::Event::Something(31)),
+		);
+		assert_eq!(
+			frame_system::Module::<Runtime>::events()[5].event,
+			Event::pallet(pallet::Event::Something(30)),
+		);
+	})
+}
+
+#[test]
+fn pallet_on_genesis() {
+	TestExternalities::default().execute_with(|| {
+		assert_eq!(pallet::Pallet::<Runtime>::storage_version(), None);
+		pallet::Pallet::<Runtime>::on_genesis();
+		assert_eq!(
+			pallet::Pallet::<Runtime>::storage_version(),
+			Some(pallet::Pallet::<Runtime>::current_version()),
+		);
+
+		assert_eq!(pallet::Pallet::<Runtime, pallet::Instance1>::storage_version(), None);
+		pallet::Pallet::<Runtime, pallet::Instance1>::on_genesis();
+		assert_eq!(
+			pallet::Pallet::<Runtime, pallet::Instance1>::storage_version(),
+			Some(pallet::Pallet::<Runtime, pallet::Instance1>::current_version()),
+		);
+	})
+}
+
+#[test]
+fn metadata() {
+	use frame_metadata::*;
+	use codec::{Decode, Encode};
+
+	let expected_pallet_metadata = ModuleMetadata {
+		index: 1,
+		name: DecodeDifferent::Decoded("Example".to_string()),
+		storage: Some(DecodeDifferent::Decoded(StorageMetadata {
+			prefix: DecodeDifferent::Decoded("Example".to_string()),
+			entries: DecodeDifferent::Decoded(vec![
+				StorageEntryMetadata {
+					name: DecodeDifferent::Decoded("Value".to_string()),
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::Plain(DecodeDifferent::Decoded("u32".to_string())),
+					default: DecodeDifferent::Decoded(vec![0]),
+					documentation: DecodeDifferent::Decoded(vec![]),
+				},
+				StorageEntryMetadata {
+					name: DecodeDifferent::Decoded("Map".to_string()),
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::Map {
+						key: DecodeDifferent::Decoded("u8".to_string()),
+						value: DecodeDifferent::Decoded("u16".to_string()),
+						hasher: StorageHasher::Blake2_128Concat,
+						unused: false,
+					},
+					default: DecodeDifferent::Decoded(vec![0]),
+					documentation: DecodeDifferent::Decoded(vec![]),
+				},
+				StorageEntryMetadata {
+					name: DecodeDifferent::Decoded("Map2".to_string()),
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::Map {
+						key: DecodeDifferent::Decoded("u16".to_string()),
+						value: DecodeDifferent::Decoded("u32".to_string()),
+						hasher: StorageHasher::Twox64Concat,
+						unused: false,
+					},
+					default: DecodeDifferent::Decoded(vec![0]),
+					documentation: DecodeDifferent::Decoded(vec![]),
+				},
+				StorageEntryMetadata {
+					name: DecodeDifferent::Decoded("DoubleMap".to_string()),
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::DoubleMap {
+						value: DecodeDifferent::Decoded("u32".to_string()),
+						key1: DecodeDifferent::Decoded("u8".to_string()),
+						key2: DecodeDifferent::Decoded("u16".to_string()),
+						hasher: StorageHasher::Blake2_128Concat,
+						key2_hasher: StorageHasher::Twox64Concat,
+					},
+					default: DecodeDifferent::Decoded(vec![0]),
+					documentation: DecodeDifferent::Decoded(vec![]),
+				},
+				StorageEntryMetadata {
+					name: DecodeDifferent::Decoded("DoubleMap2".to_string()),
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::DoubleMap {
+						value: DecodeDifferent::Decoded("u64".to_string()),
+						key1: DecodeDifferent::Decoded("u16".to_string()),
+						key2: DecodeDifferent::Decoded("u32".to_string()),
+						hasher: StorageHasher::Twox64Concat,
+						key2_hasher: StorageHasher::Blake2_128Concat,
+					},
+					default: DecodeDifferent::Decoded(vec![0]),
+					documentation: DecodeDifferent::Decoded(vec![]),
+				},
+			]),
+		})),
+		calls: Some(DecodeDifferent::Decoded(vec![
+			FunctionMetadata {
+				name: DecodeDifferent::Decoded("foo".to_string()),
+				arguments: DecodeDifferent::Decoded(vec![
+					FunctionArgumentMetadata {
+						name: DecodeDifferent::Decoded("_foo".to_string()),
+						ty: DecodeDifferent::Decoded("Compact<u32>".to_string()),
+					}
+				]),
+				documentation: DecodeDifferent::Decoded(vec![
+					" Doc comment put in metadata".to_string(),
+				]),
+			},
+			FunctionMetadata {
+				name: DecodeDifferent::Decoded("foo_transactional".to_string()),
+				arguments: DecodeDifferent::Decoded(vec![
+					FunctionArgumentMetadata {
+						name: DecodeDifferent::Decoded("_foo".to_string()),
+						ty: DecodeDifferent::Decoded("Compact<u32>".to_string()),
+					}
+				]),
+				documentation: DecodeDifferent::Decoded(vec![
+					" Doc comment put in metadata".to_string(),
+				]),
+			},
+		])),
+		event: Some(DecodeDifferent::Decoded(vec![
+			EventMetadata {
+				name: DecodeDifferent::Decoded("Proposed".to_string()),
+				arguments: DecodeDifferent::Decoded(vec!["<T as frame_system::Config>::AccountId".to_string()]),
+				documentation: DecodeDifferent::Decoded(vec![
+					" doc comment put in metadata".to_string()
+				]),
+			},
+			EventMetadata {
+				name: DecodeDifferent::Decoded("Spending".to_string()),
+				arguments: DecodeDifferent::Decoded(vec!["Balance".to_string()]),
+				documentation: DecodeDifferent::Decoded(vec![
+					" doc".to_string()
+				]),
+			},
+			EventMetadata {
+				name: DecodeDifferent::Decoded("Something".to_string()),
+				arguments: DecodeDifferent::Decoded(vec!["Other".to_string()]),
+				documentation: DecodeDifferent::Decoded(vec![]),
+			},
+		])),
+		constants: DecodeDifferent::Decoded(vec![
+			ModuleConstantMetadata {
+				name: DecodeDifferent::Decoded("MyGetParam".to_string()),
+				ty: DecodeDifferent::Decoded("u32".to_string()),
+				value: DecodeDifferent::Decoded(vec![10, 0, 0, 0]),
+				documentation: DecodeDifferent::Decoded(vec![]),
+			},
+		]),
+		errors: DecodeDifferent::Decoded(vec![
+			ErrorMetadata {
+				name: DecodeDifferent::Decoded("InsufficientProposersBalance".to_string()),
+				documentation: DecodeDifferent::Decoded(vec![
+					" doc comment put into metadata".to_string(),
+				]),
+			},
+		]),
+	};
+
+	let mut expected_pallet_instance1_metadata = expected_pallet_metadata.clone();
+	expected_pallet_instance1_metadata.name = DecodeDifferent::Decoded("Instance1Example".to_string());
+	expected_pallet_instance1_metadata.index = 2;
+	match expected_pallet_instance1_metadata.storage {
+		Some(DecodeDifferent::Decoded(ref mut storage_meta)) => {
+			storage_meta.prefix = DecodeDifferent::Decoded("Instance1Example".to_string());
+		},
+		_ => unreachable!(),
+	}
+
+
+	let metadata = match Runtime::metadata().1 {
+		RuntimeMetadata::V12(metadata) => metadata,
+		_ => panic!("metadata has been bump, test needs to be updated"),
+	};
+
+	let modules_metadata = match metadata.modules {
+		DecodeDifferent::Encode(modules_metadata) => modules_metadata,
+		_ => unreachable!(),
+	};
+
+	let pallet_metadata = ModuleMetadata::decode(&mut &modules_metadata[1].encode()[..]).unwrap();
+	let pallet_instance1_metadata =
+		ModuleMetadata::decode(&mut &modules_metadata[2].encode()[..]).unwrap();
+
+	pretty_assertions::assert_eq!(pallet_metadata, expected_pallet_metadata);
+	pretty_assertions::assert_eq!(pallet_instance1_metadata, expected_pallet_instance1_metadata);
+}
diff --git a/frame/support/test/tests/pallet_ui.rs b/frame/support/test/tests/pallet_ui.rs
new file mode 100644
index 000000000000..d323526622a4
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui.rs
@@ -0,0 +1,26 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#[rustversion::attr(not(stable), ignore)]
+#[test]
+fn pallet_ui() {
+	// As trybuild is using `cargo check`, we don't need the real WASM binaries.
+	std::env::set_var("SKIP_WASM_BUILD", "1");
+
+	let t = trybuild::TestCases::new();
+	t.compile_fail("tests/pallet_ui/*.rs");
+}
diff --git a/frame/support/test/tests/pallet_ui/attr_non_empty.rs b/frame/support/test/tests/pallet_ui/attr_non_empty.rs
new file mode 100644
index 000000000000..5173d983bbd8
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/attr_non_empty.rs
@@ -0,0 +1,6 @@
+#[frame_support::pallet [foo]]
+mod foo {
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/attr_non_empty.stderr b/frame/support/test/tests/pallet_ui/attr_non_empty.stderr
new file mode 100644
index 000000000000..144af5a17ea5
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/attr_non_empty.stderr
@@ -0,0 +1,5 @@
+error: Invalid pallet macro call: expected no attributes, e.g. macro call must be just `#[frame_support::pallet]` or `#[pallet]`
+ --> $DIR/attr_non_empty.rs:1:26
+  |
+1 | #[frame_support::pallet [foo]]
+  |                          ^^^
diff --git a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.rs b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.rs
new file mode 100644
index 000000000000..69d35344d576
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.rs
@@ -0,0 +1,27 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::{Hooks, DispatchResultWithPostInfo};
+	use frame_system::pallet_prelude::{BlockNumberFor, OriginFor};
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		type Bar: codec::Codec;
+	}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		#[pallet::weight(0)]
+		fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
+			Ok(().into())
+		}
+	}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.stderr b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.stderr
new file mode 100644
index 000000000000..64f93cd574ed
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.stderr
@@ -0,0 +1,28 @@
+error[E0369]: binary operation `==` cannot be applied to type `&<T as pallet::Config>::Bar`
+  --> $DIR/call_argument_invalid_bound.rs:20:37
+   |
+20 |         fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
+   |                                           ^
+   |
+help: consider further restricting this bound
+   |
+1  | #[frame_support::pallet] + std::cmp::PartialEq
+   |                          ^^^^^^^^^^^^^^^^^^^^^
+
+error[E0277]: the trait bound `<T as pallet::Config>::Bar: Clone` is not satisfied
+  --> $DIR/call_argument_invalid_bound.rs:20:37
+   |
+20 |         fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
+   |                                           ^ the trait `Clone` is not implemented for `<T as pallet::Config>::Bar`
+   |
+   = note: required by `clone`
+
+error[E0277]: `<T as pallet::Config>::Bar` doesn't implement `std::fmt::Debug`
+  --> $DIR/call_argument_invalid_bound.rs:20:37
+   |
+20 |         fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
+   |                                           ^ `<T as pallet::Config>::Bar` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
+   |
+   = help: the trait `std::fmt::Debug` is not implemented for `<T as pallet::Config>::Bar`
+   = note: required because of the requirements on the impl of `std::fmt::Debug` for `&<T as pallet::Config>::Bar`
+   = note: required for the cast to the object type `dyn std::fmt::Debug`
diff --git a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.rs b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.rs
new file mode 100644
index 000000000000..581c72a4240a
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.rs
@@ -0,0 +1,27 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::{Hooks, DispatchResultWithPostInfo};
+	use frame_system::pallet_prelude::{BlockNumberFor, OriginFor};
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		type Bar;
+	}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		#[pallet::weight(0)]
+		fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
+			Ok(().into())
+		}
+	}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr
new file mode 100644
index 000000000000..e366061b1c25
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr
@@ -0,0 +1,11 @@
+error[E0277]: the trait bound `pallet::Call<T>: Decode` is not satisfied
+  --> $DIR/call_argument_invalid_bound_2.rs:17:12
+   |
+17 |     #[pallet::call]
+   |               ^^^^ the trait `Decode` is not implemented for `pallet::Call<T>`
+
+error[E0277]: the trait bound `pallet::Call<T>: pallet::_::_parity_scale_codec::Encode` is not satisfied
+  --> $DIR/call_argument_invalid_bound_2.rs:17:12
+   |
+17 |     #[pallet::call]
+   |               ^^^^ the trait `pallet::_::_parity_scale_codec::Encode` is not implemented for `pallet::Call<T>`
diff --git a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.rs b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.rs
new file mode 100644
index 000000000000..97f362551037
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.rs
@@ -0,0 +1,29 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::{Hooks, DispatchResultWithPostInfo};
+	use frame_system::pallet_prelude::{BlockNumberFor, OriginFor};
+	use codec::{Encode, Decode};
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[derive(Encode, Decode)]
+	struct Bar;
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		#[pallet::weight(0)]
+		fn foo(origin: OriginFor<T>, bar: Bar) -> DispatchResultWithPostInfo {
+			Ok(().into())
+		}
+	}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.stderr b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.stderr
new file mode 100644
index 000000000000..89cee573a275
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.stderr
@@ -0,0 +1,26 @@
+error[E0369]: binary operation `==` cannot be applied to type `&Bar`
+  --> $DIR/call_argument_invalid_bound_3.rs:22:37
+   |
+22 |         fn foo(origin: OriginFor<T>, bar: Bar) -> DispatchResultWithPostInfo {
+   |                                           ^^^
+   |
+   = note: an implementation of `std::cmp::PartialEq` might be missing for `&Bar`
+
+error[E0277]: the trait bound `Bar: Clone` is not satisfied
+  --> $DIR/call_argument_invalid_bound_3.rs:22:37
+   |
+22 |         fn foo(origin: OriginFor<T>, bar: Bar) -> DispatchResultWithPostInfo {
+   |                                           ^^^ the trait `Clone` is not implemented for `Bar`
+   |
+   = note: required by `clone`
+
+error[E0277]: `Bar` doesn't implement `std::fmt::Debug`
+  --> $DIR/call_argument_invalid_bound_3.rs:22:37
+   |
+22 |         fn foo(origin: OriginFor<T>, bar: Bar) -> DispatchResultWithPostInfo {
+   |                                           ^^^ `Bar` cannot be formatted using `{:?}`
+   |
+   = help: the trait `std::fmt::Debug` is not implemented for `Bar`
+   = note: add `#[derive(Debug)]` or manually implement `std::fmt::Debug`
+   = note: required because of the requirements on the impl of `std::fmt::Debug` for `&Bar`
+   = note: required for the cast to the object type `dyn std::fmt::Debug`
diff --git a/frame/support/test/tests/pallet_ui/call_invalid_const.rs b/frame/support/test/tests/pallet_ui/call_invalid_const.rs
new file mode 100644
index 000000000000..1a28bc32e65c
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/call_invalid_const.rs
@@ -0,0 +1,22 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		const Foo: u8 = 3u8;
+	}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/call_invalid_const.stderr b/frame/support/test/tests/pallet_ui/call_invalid_const.stderr
new file mode 100644
index 000000000000..0acb3e864a51
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/call_invalid_const.stderr
@@ -0,0 +1,5 @@
+error: Invalid pallet::call, only method accepted
+  --> $DIR/call_invalid_const.rs:17:3
+   |
+17 |         const Foo: u8 = 3u8;
+   |         ^^^^^
diff --git a/frame/support/test/tests/pallet_ui/call_invalid_origin_type.rs b/frame/support/test/tests/pallet_ui/call_invalid_origin_type.rs
new file mode 100644
index 000000000000..edf953b5976c
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/call_invalid_origin_type.rs
@@ -0,0 +1,22 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		fn foo(origin: u8) {}
+	}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/call_invalid_origin_type.stderr b/frame/support/test/tests/pallet_ui/call_invalid_origin_type.stderr
new file mode 100644
index 000000000000..855c59fd8d57
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/call_invalid_origin_type.stderr
@@ -0,0 +1,11 @@
+error: Invalid type: expected `OriginFor<T>`
+  --> $DIR/call_invalid_origin_type.rs:17:18
+   |
+17 |         fn foo(origin: u8) {}
+   |                        ^^
+
+error: expected `OriginFor`
+  --> $DIR/call_invalid_origin_type.rs:17:18
+   |
+17 |         fn foo(origin: u8) {}
+   |                        ^^
diff --git a/frame/support/test/tests/pallet_ui/call_missing_weight.rs b/frame/support/test/tests/pallet_ui/call_missing_weight.rs
new file mode 100644
index 000000000000..2ce607c53ac3
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/call_missing_weight.rs
@@ -0,0 +1,22 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::{Hooks, DispatchResultWithPostInfo};
+	use frame_system::pallet_prelude::{BlockNumberFor, OriginFor};
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		fn foo(origin: OriginFor<T>) -> DispatchResultWithPostInfo {}
+	}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/call_missing_weight.stderr b/frame/support/test/tests/pallet_ui/call_missing_weight.stderr
new file mode 100644
index 000000000000..f499e8a65da2
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/call_missing_weight.stderr
@@ -0,0 +1,5 @@
+error: Invalid pallet::call, require weight attribute i.e. `#[pallet::weight = $expr]`
+  --> $DIR/call_missing_weight.rs:17:3
+   |
+17 |         fn foo(origin: OriginFor<T>) -> DispatchResultWithPostInfo {}
+   |         ^^
diff --git a/frame/support/test/tests/pallet_ui/call_no_origin.rs b/frame/support/test/tests/pallet_ui/call_no_origin.rs
new file mode 100644
index 000000000000..83d10b6b08b4
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/call_no_origin.rs
@@ -0,0 +1,22 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		fn foo() {}
+	}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/call_no_origin.stderr b/frame/support/test/tests/pallet_ui/call_no_origin.stderr
new file mode 100644
index 000000000000..42afd02c4263
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/call_no_origin.stderr
@@ -0,0 +1,5 @@
+error: Invalid pallet::call, must have at least origin arg
+  --> $DIR/call_no_origin.rs:17:3
+   |
+17 |         fn foo() {}
+   |         ^^
diff --git a/frame/support/test/tests/pallet_ui/call_no_return.rs b/frame/support/test/tests/pallet_ui/call_no_return.rs
new file mode 100644
index 000000000000..a18c30f6d6d9
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/call_no_return.rs
@@ -0,0 +1,22 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::{BlockNumberFor, OriginFor};
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		fn foo(origin: OriginFor<T>) {}
+	}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/call_no_return.stderr b/frame/support/test/tests/pallet_ui/call_no_return.stderr
new file mode 100644
index 000000000000..b16d401355c1
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/call_no_return.stderr
@@ -0,0 +1,5 @@
+error: Invalid pallet::call, require return type DispatchResultWithPostInfo
+  --> $DIR/call_no_return.rs:17:3
+   |
+17 |         fn foo(origin: OriginFor<T>) {}
+   |         ^^
diff --git a/frame/support/test/tests/pallet_ui/duplicate_call_attr.rs b/frame/support/test/tests/pallet_ui/duplicate_call_attr.rs
new file mode 100644
index 000000000000..b8a32a0bd9f6
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/duplicate_call_attr.rs
@@ -0,0 +1,28 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::BlockNumberFor;
+	use frame_support::pallet_prelude::StorageValue;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	#[pallet::generate_store(trait Store)]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::storage]
+	type Foo<T> = StorageValue<_, u8>;
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/duplicate_call_attr.stderr b/frame/support/test/tests/pallet_ui/duplicate_call_attr.stderr
new file mode 100644
index 000000000000..c2956717bb2b
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/duplicate_call_attr.stderr
@@ -0,0 +1,5 @@
+error: Invalid duplicated attribute
+  --> $DIR/duplicate_call_attr.rs:23:12
+   |
+23 |     #[pallet::call]
+   |               ^^^^
diff --git a/frame/support/test/tests/pallet_ui/duplicate_store_attr.rs b/frame/support/test/tests/pallet_ui/duplicate_store_attr.rs
new file mode 100644
index 000000000000..d675ddefe985
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/duplicate_store_attr.rs
@@ -0,0 +1,26 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::BlockNumberFor;
+	use frame_support::pallet_prelude::StorageValue;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	#[pallet::generate_store(trait Store)]
+	#[pallet::generate_store(trait Store)]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::storage]
+	type Foo<T> = StorageValue<_, u8>;
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/duplicate_store_attr.stderr b/frame/support/test/tests/pallet_ui/duplicate_store_attr.stderr
new file mode 100644
index 000000000000..eed6ad4494ed
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/duplicate_store_attr.stderr
@@ -0,0 +1,5 @@
+error: Invalid pallet::pallet, multiple argument pallet::generate_store found
+  --> $DIR/duplicate_store_attr.rs:12:33
+   |
+12 |     #[pallet::generate_store(trait Store)]
+   |                                    ^^^^^
diff --git a/frame/support/test/tests/pallet_ui/error_no_fieldless.rs b/frame/support/test/tests/pallet_ui/error_no_fieldless.rs
new file mode 100644
index 000000000000..c9d444d6f90d
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/error_no_fieldless.rs
@@ -0,0 +1,25 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::error]
+	pub enum Error<T> {
+		U8(u8),
+	}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/error_no_fieldless.stderr b/frame/support/test/tests/pallet_ui/error_no_fieldless.stderr
new file mode 100644
index 000000000000..1d69fbeff9aa
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/error_no_fieldless.stderr
@@ -0,0 +1,5 @@
+error: Invalid pallet::error, unexpected fields, must be `Unit`
+  --> $DIR/error_no_fieldless.rs:20:5
+   |
+20 |         U8(u8),
+   |           ^^^^
diff --git a/frame/support/test/tests/pallet_ui/error_wrong_item.rs b/frame/support/test/tests/pallet_ui/error_wrong_item.rs
new file mode 100644
index 000000000000..50e66dc8c0dc
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/error_wrong_item.rs
@@ -0,0 +1,23 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::error]
+	pub struct Foo;
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/error_wrong_item.stderr b/frame/support/test/tests/pallet_ui/error_wrong_item.stderr
new file mode 100644
index 000000000000..8c0496782fb1
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/error_wrong_item.stderr
@@ -0,0 +1,5 @@
+error: Invalid pallet::error, expected item enum
+  --> $DIR/error_wrong_item.rs:19:2
+   |
+19 |     pub struct Foo;
+   |     ^^^
diff --git a/frame/support/test/tests/pallet_ui/error_wrong_item_name.rs b/frame/support/test/tests/pallet_ui/error_wrong_item_name.rs
new file mode 100644
index 000000000000..14107fafb06e
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/error_wrong_item_name.rs
@@ -0,0 +1,23 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::error]
+	pub enum Foo<T> {}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/error_wrong_item_name.stderr b/frame/support/test/tests/pallet_ui/error_wrong_item_name.stderr
new file mode 100644
index 000000000000..d7e54ad8a751
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/error_wrong_item_name.stderr
@@ -0,0 +1,5 @@
+error: expected `Error`
+  --> $DIR/error_wrong_item_name.rs:19:11
+   |
+19 |     pub enum Foo<T> {}
+   |              ^^^
diff --git a/frame/support/test/tests/pallet_ui/event_field_not_member.rs b/frame/support/test/tests/pallet_ui/event_field_not_member.rs
new file mode 100644
index 000000000000..0ecde4c13087
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/event_field_not_member.rs
@@ -0,0 +1,28 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::{Hooks, IsType};
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		type Bar;
+		type Event: IsType<<Self as frame_system::Config>::Event> + From<Event<Self>>;
+	}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::event]
+	pub enum Event<T: Config> {
+		B { b: T::Bar },
+	}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/event_field_not_member.stderr b/frame/support/test/tests/pallet_ui/event_field_not_member.stderr
new file mode 100644
index 000000000000..97d4db798e61
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/event_field_not_member.stderr
@@ -0,0 +1,28 @@
+error[E0277]: `<T as pallet::Config>::Bar` doesn't implement `std::fmt::Debug`
+  --> $DIR/event_field_not_member.rs:23:7
+   |
+23 |         B { b: T::Bar },
+   |             ^ `<T as pallet::Config>::Bar` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
+   |
+   = help: the trait `std::fmt::Debug` is not implemented for `<T as pallet::Config>::Bar`
+   = note: required because of the requirements on the impl of `std::fmt::Debug` for `&<T as pallet::Config>::Bar`
+   = note: required for the cast to the object type `dyn std::fmt::Debug`
+
+error[E0369]: binary operation `==` cannot be applied to type `&<T as pallet::Config>::Bar`
+  --> $DIR/event_field_not_member.rs:23:7
+   |
+23 |         B { b: T::Bar },
+   |             ^
+   |
+help: consider further restricting this bound
+   |
+22 |     pub enum Event<T: Config + std::cmp::PartialEq> {
+   |                              ^^^^^^^^^^^^^^^^^^^^^
+
+error[E0277]: the trait bound `<T as pallet::Config>::Bar: Clone` is not satisfied
+  --> $DIR/event_field_not_member.rs:23:7
+   |
+23 |         B { b: T::Bar },
+   |             ^ the trait `Clone` is not implemented for `<T as pallet::Config>::Bar`
+   |
+   = note: required by `clone`
diff --git a/frame/support/test/tests/pallet_ui/event_not_in_trait.rs b/frame/support/test/tests/pallet_ui/event_not_in_trait.rs
new file mode 100644
index 000000000000..94151ba4c3d9
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/event_not_in_trait.rs
@@ -0,0 +1,27 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		type Bar;
+	}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::event]
+	pub enum Event<T: Config> {
+		B { b: T::Bar },
+	}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/event_not_in_trait.stderr b/frame/support/test/tests/pallet_ui/event_not_in_trait.stderr
new file mode 100644
index 000000000000..dd96c700ce7e
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/event_not_in_trait.stderr
@@ -0,0 +1,7 @@
+error: Invalid usage of Event, `Config` contains no associated type `Event`, but enum `Event` is declared (in use of `#[pallet::event]`). An Event associated type must be declare on trait `Config`.
+ --> $DIR/event_not_in_trait.rs:1:1
+  |
+1 | #[frame_support::pallet]
+  | ^^^^^^^^^^^^^^^^^^^^^^^^
+  |
+  = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/frame/support/test/tests/pallet_ui/event_type_invalid_bound.rs b/frame/support/test/tests/pallet_ui/event_type_invalid_bound.rs
new file mode 100644
index 000000000000..fa3bf04d3530
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/event_type_invalid_bound.rs
@@ -0,0 +1,28 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		type Bar;
+		type Event;
+	}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::event]
+	pub enum Event<T: Config> {
+		B { b: T::Bar },
+	}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/event_type_invalid_bound.stderr b/frame/support/test/tests/pallet_ui/event_type_invalid_bound.stderr
new file mode 100644
index 000000000000..1f58a37576d0
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/event_type_invalid_bound.stderr
@@ -0,0 +1,5 @@
+error: Invalid `type Event`, associated type `Event` is reserved and must bound: `IsType<<Self as frame_system::Config>::Event>`
+ --> $DIR/event_type_invalid_bound.rs:9:3
+  |
+9 |         type Event;
+  |         ^^^^
diff --git a/frame/support/test/tests/pallet_ui/event_type_invalid_bound_2.rs b/frame/support/test/tests/pallet_ui/event_type_invalid_bound_2.rs
new file mode 100644
index 000000000000..564a539b89f5
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/event_type_invalid_bound_2.rs
@@ -0,0 +1,28 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::{Hooks, IsType};
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		type Bar;
+		type Event: IsType<<Self as frame_system::Config>::Event>;
+	}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::event]
+	pub enum Event<T: Config> {
+		B { b: T::Bar },
+	}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/event_type_invalid_bound_2.stderr b/frame/support/test/tests/pallet_ui/event_type_invalid_bound_2.stderr
new file mode 100644
index 000000000000..8b8946f3b25e
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/event_type_invalid_bound_2.stderr
@@ -0,0 +1,5 @@
+error: Invalid `type Event`, associated type `Event` is reserved and must bound: `From<Event>` or `From<Event<Self>>` or `From<Event<Self, I>>`
+ --> $DIR/event_type_invalid_bound_2.rs:9:3
+  |
+9 |         type Event: IsType<<Self as frame_system::Config>::Event>;
+  |         ^^^^
diff --git a/frame/support/test/tests/pallet_ui/event_wrong_item.rs b/frame/support/test/tests/pallet_ui/event_wrong_item.rs
new file mode 100644
index 000000000000..d6690557c39d
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/event_wrong_item.rs
@@ -0,0 +1,23 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::event]
+	pub struct Foo;
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/event_wrong_item.stderr b/frame/support/test/tests/pallet_ui/event_wrong_item.stderr
new file mode 100644
index 000000000000..21eb0ed35e93
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/event_wrong_item.stderr
@@ -0,0 +1,5 @@
+error: Invalid pallet::event, expected item enum
+  --> $DIR/event_wrong_item.rs:19:2
+   |
+19 |     pub struct Foo;
+   |     ^^^
diff --git a/frame/support/test/tests/pallet_ui/event_wrong_item_name.rs b/frame/support/test/tests/pallet_ui/event_wrong_item_name.rs
new file mode 100644
index 000000000000..d828965c5173
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/event_wrong_item_name.rs
@@ -0,0 +1,23 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::event]
+	pub enum Foo {}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/event_wrong_item_name.stderr b/frame/support/test/tests/pallet_ui/event_wrong_item_name.stderr
new file mode 100644
index 000000000000..14e8615c5619
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/event_wrong_item_name.stderr
@@ -0,0 +1,5 @@
+error: expected `Event`
+  --> $DIR/event_wrong_item_name.rs:19:11
+   |
+19 |     pub enum Foo {}
+   |              ^^^
diff --git a/frame/support/test/tests/pallet_ui/genesis_default_not_satisfied.rs b/frame/support/test/tests/pallet_ui/genesis_default_not_satisfied.rs
new file mode 100644
index 000000000000..da5e8d0c4da5
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/genesis_default_not_satisfied.rs
@@ -0,0 +1,26 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::{Hooks, GenesisBuild};
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::genesis_config]
+	pub struct GenesisConfig;
+
+	#[pallet::genesis_build]
+	impl<T: Config> GenesisBuild<T> for GenesisConfig {}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/genesis_default_not_satisfied.stderr b/frame/support/test/tests/pallet_ui/genesis_default_not_satisfied.stderr
new file mode 100644
index 000000000000..a2998788736a
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/genesis_default_not_satisfied.stderr
@@ -0,0 +1,10 @@
+error[E0277]: the trait bound `pallet::GenesisConfig: std::default::Default` is not satisfied
+    --> $DIR/genesis_default_not_satisfied.rs:22:18
+     |
+22   |     impl<T: Config> GenesisBuild<T> for GenesisConfig {}
+     |                     ^^^^^^^^^^^^^^^ the trait `std::default::Default` is not implemented for `pallet::GenesisConfig`
+     |
+    ::: $WORKSPACE/frame/support/src/traits.rs
+     |
+     | pub trait GenesisBuild<T, I=()>: Default + MaybeSerializeDeserialize {
+     |                                  ------- required by this bound in `GenesisBuild`
diff --git a/frame/support/test/tests/pallet_ui/genesis_inconsistent_build_config.rs b/frame/support/test/tests/pallet_ui/genesis_inconsistent_build_config.rs
new file mode 100644
index 000000000000..9ae851005acb
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/genesis_inconsistent_build_config.rs
@@ -0,0 +1,23 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::genesis_build]
+	impl<T: Config> GenesisBuild<T> for GenesisConfig {}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/genesis_inconsistent_build_config.stderr b/frame/support/test/tests/pallet_ui/genesis_inconsistent_build_config.stderr
new file mode 100644
index 000000000000..9afc1037a48a
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/genesis_inconsistent_build_config.stderr
@@ -0,0 +1,5 @@
+error: `#[pallet::genesis_config]` and `#[pallet::genesis_build]` attributes must be either both used or both not used, instead genesis_config is unused and genesis_build is used
+ --> $DIR/genesis_inconsistent_build_config.rs:2:1
+  |
+2 | mod pallet {
+  | ^^^
diff --git a/frame/support/test/tests/pallet_ui/genesis_invalid_generic.rs b/frame/support/test/tests/pallet_ui/genesis_invalid_generic.rs
new file mode 100644
index 000000000000..f1eae16f4960
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/genesis_invalid_generic.rs
@@ -0,0 +1,23 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::genesis_build]
+	impl GenesisBuild for GenesisConfig {}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/genesis_invalid_generic.stderr b/frame/support/test/tests/pallet_ui/genesis_invalid_generic.stderr
new file mode 100644
index 000000000000..f451f7b16aee
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/genesis_invalid_generic.stderr
@@ -0,0 +1,13 @@
+error: Invalid genesis builder: expected `GenesisBuild<T>` or `GenesisBuild<T, I>`
+  --> $DIR/genesis_invalid_generic.rs:19:7
+   |
+19 |     impl GenesisBuild for GenesisConfig {}
+   |          ^^^^^^^^^^^^
+
+error: expected `<`
+ --> $DIR/genesis_invalid_generic.rs:1:1
+  |
+1 | #[frame_support::pallet]
+  | ^^^^^^^^^^^^^^^^^^^^^^^^
+  |
+  = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/frame/support/test/tests/pallet_ui/genesis_wrong_name.rs b/frame/support/test/tests/pallet_ui/genesis_wrong_name.rs
new file mode 100644
index 000000000000..5e8b297ba4cc
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/genesis_wrong_name.rs
@@ -0,0 +1,23 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::genesis_build]
+	impl Foo {}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/genesis_wrong_name.stderr b/frame/support/test/tests/pallet_ui/genesis_wrong_name.stderr
new file mode 100644
index 000000000000..dd2e65588f56
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/genesis_wrong_name.stderr
@@ -0,0 +1,5 @@
+error: Invalid pallet::genesis_build, expected impl<..> GenesisBuild<..> for GenesisConfig<..>
+  --> $DIR/genesis_wrong_name.rs:19:2
+   |
+19 |     impl Foo {}
+   |     ^^^^
diff --git a/frame/support/test/tests/pallet_ui/hooks_invalid_item.rs b/frame/support/test/tests/pallet_ui/hooks_invalid_item.rs
new file mode 100644
index 000000000000..fae12f133b6a
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/hooks_invalid_item.rs
@@ -0,0 +1,19 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::{Hooks, PhantomData};
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/hooks_invalid_item.stderr b/frame/support/test/tests/pallet_ui/hooks_invalid_item.stderr
new file mode 100644
index 000000000000..0379448f694f
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/hooks_invalid_item.stderr
@@ -0,0 +1,5 @@
+error[E0107]: wrong number of type arguments: expected 1, found 0
+  --> $DIR/hooks_invalid_item.rs:12:18
+   |
+12 |     impl<T: Config> Hooks for Pallet<T> {}
+   |                     ^^^^^ expected 1 type argument
diff --git a/frame/support/test/tests/pallet_ui/inconsistent_instance_1.rs b/frame/support/test/tests/pallet_ui/inconsistent_instance_1.rs
new file mode 100644
index 000000000000..00b57a01235c
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/inconsistent_instance_1.rs
@@ -0,0 +1,20 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config<I: 'static = ()>: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/inconsistent_instance_1.stderr b/frame/support/test/tests/pallet_ui/inconsistent_instance_1.stderr
new file mode 100644
index 000000000000..352c21013cab
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/inconsistent_instance_1.stderr
@@ -0,0 +1,29 @@
+error: Invalid generic declaration, trait is defined with instance but generic use none
+  --> $DIR/inconsistent_instance_1.rs:16:7
+   |
+16 |     impl<T: Config> Pallet<T> {}
+   |          ^
+
+error: Invalid generic declaration, trait is defined with instance but generic use none
+  --> $DIR/inconsistent_instance_1.rs:16:18
+   |
+16 |     impl<T: Config> Pallet<T> {}
+   |                     ^^^^^^
+
+error: Invalid generic declaration, trait is defined with instance but generic use none
+  --> $DIR/inconsistent_instance_1.rs:10:20
+   |
+10 |     pub struct Pallet<T>(core::marker::PhantomData<T>);
+   |                       ^
+
+error: Invalid generic declaration, trait is defined with instance but generic use none
+  --> $DIR/inconsistent_instance_1.rs:13:47
+   |
+13 |     impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+   |                                                  ^^^^^^
+
+error: Invalid generic declaration, trait is defined with instance but generic use none
+  --> $DIR/inconsistent_instance_1.rs:13:7
+   |
+13 |     impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+   |          ^
diff --git a/frame/support/test/tests/pallet_ui/inconsistent_instance_2.rs b/frame/support/test/tests/pallet_ui/inconsistent_instance_2.rs
new file mode 100644
index 000000000000..e7b51cb5ebef
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/inconsistent_instance_2.rs
@@ -0,0 +1,20 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T, I = ()>(core::marker::PhantomData<(T, I)>);
+
+	#[pallet::hooks]
+	impl<T: Config<I>, I: 'static> Hooks<BlockNumberFor<T>> for Pallet<T, I> {}
+
+	#[pallet::call]
+	impl<T: Config<I>, I: 'static> Pallet<T, I> {}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/inconsistent_instance_2.stderr b/frame/support/test/tests/pallet_ui/inconsistent_instance_2.stderr
new file mode 100644
index 000000000000..9f5d3c740cbd
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/inconsistent_instance_2.stderr
@@ -0,0 +1,29 @@
+error: Invalid generic declaration, trait is defined without instance but generic use some
+  --> $DIR/inconsistent_instance_2.rs:16:7
+   |
+16 |     impl<T: Config<I>, I: 'static> Pallet<T, I> {}
+   |          ^
+
+error: Invalid generic declaration, trait is defined without instance but generic use some
+  --> $DIR/inconsistent_instance_2.rs:16:33
+   |
+16 |     impl<T: Config<I>, I: 'static> Pallet<T, I> {}
+   |                                    ^^^^^^
+
+error: Invalid generic declaration, trait is defined without instance but generic use some
+  --> $DIR/inconsistent_instance_2.rs:10:20
+   |
+10 |     pub struct Pallet<T, I = ()>(core::marker::PhantomData<(T, I)>);
+   |                       ^
+
+error: Invalid generic declaration, trait is defined without instance but generic use some
+  --> $DIR/inconsistent_instance_2.rs:13:62
+   |
+13 |     impl<T: Config<I>, I: 'static> Hooks<BlockNumberFor<T>> for Pallet<T, I> {}
+   |                                                                 ^^^^^^
+
+error: Invalid generic declaration, trait is defined without instance but generic use some
+  --> $DIR/inconsistent_instance_2.rs:13:7
+   |
+13 |     impl<T: Config<I>, I: 'static> Hooks<BlockNumberFor<T>> for Pallet<T, I> {}
+   |          ^
diff --git a/frame/support/test/tests/pallet_ui/inherent_check_inner_span.rs b/frame/support/test/tests/pallet_ui/inherent_check_inner_span.rs
new file mode 100644
index 000000000000..9704a7e1a442
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/inherent_check_inner_span.rs
@@ -0,0 +1,23 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::{Hooks, ProvideInherent};
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::inherent]
+	impl<T: Config> ProvideInherent for Pallet<T> {}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/inherent_check_inner_span.stderr b/frame/support/test/tests/pallet_ui/inherent_check_inner_span.stderr
new file mode 100644
index 000000000000..75a522889ebd
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/inherent_check_inner_span.stderr
@@ -0,0 +1,10 @@
+error[E0046]: not all trait items implemented, missing: `Call`, `Error`, `INHERENT_IDENTIFIER`, `create_inherent`
+  --> $DIR/inherent_check_inner_span.rs:19:2
+   |
+19 |     impl<T: Config> ProvideInherent for Pallet<T> {}
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `Call`, `Error`, `INHERENT_IDENTIFIER`, `create_inherent` in implementation
+   |
+   = help: implement the missing item: `type Call = Type;`
+   = help: implement the missing item: `type Error = Type;`
+   = help: implement the missing item: `const INHERENT_IDENTIFIER: [u8; 8] = value;`
+   = help: implement the missing item: `fn create_inherent(_: &InherentData) -> std::option::Option<<Self as ProvideInherent>::Call> { todo!() }`
diff --git a/frame/support/test/tests/pallet_ui/inherent_invalid_item.rs b/frame/support/test/tests/pallet_ui/inherent_invalid_item.rs
new file mode 100644
index 000000000000..97eda4472130
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/inherent_invalid_item.rs
@@ -0,0 +1,23 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::inherent]
+	impl Foo {}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/inherent_invalid_item.stderr b/frame/support/test/tests/pallet_ui/inherent_invalid_item.stderr
new file mode 100644
index 000000000000..b62b1234bdeb
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/inherent_invalid_item.stderr
@@ -0,0 +1,5 @@
+error: Invalid pallet::inherent, expected impl<..> ProvideInherent for Pallet<..>
+  --> $DIR/inherent_invalid_item.rs:19:2
+   |
+19 |     impl Foo {}
+   |     ^^^^
diff --git a/frame/support/test/tests/pallet_ui/mod_not_inlined.rs b/frame/support/test/tests/pallet_ui/mod_not_inlined.rs
new file mode 100644
index 000000000000..c74c7f5ef2a2
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/mod_not_inlined.rs
@@ -0,0 +1,5 @@
+#[frame_support::pallet]
+mod foo;
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/mod_not_inlined.stderr b/frame/support/test/tests/pallet_ui/mod_not_inlined.stderr
new file mode 100644
index 000000000000..9ad93939d8c0
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/mod_not_inlined.stderr
@@ -0,0 +1,13 @@
+error[E0658]: non-inline modules in proc macro input are unstable
+ --> $DIR/mod_not_inlined.rs:2:1
+  |
+2 | mod foo;
+  | ^^^^^^^^
+  |
+  = note: see issue #54727 <https://github.com/rust-lang/rust/issues/54727> for more information
+
+error: Invalid pallet definition, expected mod to be inlined.
+ --> $DIR/mod_not_inlined.rs:2:1
+  |
+2 | mod foo;
+  | ^^^
diff --git a/frame/support/test/tests/pallet_ui/storage_incomplete_item.rs b/frame/support/test/tests/pallet_ui/storage_incomplete_item.rs
new file mode 100644
index 000000000000..e451df8c78a0
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/storage_incomplete_item.rs
@@ -0,0 +1,23 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::storage]
+	type Foo;
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/storage_incomplete_item.stderr b/frame/support/test/tests/pallet_ui/storage_incomplete_item.stderr
new file mode 100644
index 000000000000..57f3ab78a538
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/storage_incomplete_item.stderr
@@ -0,0 +1,13 @@
+error: free type alias without body
+  --> $DIR/storage_incomplete_item.rs:19:2
+   |
+19 |     type Foo;
+   |     ^^^^^^^^-
+   |             |
+   |             help: provide a definition for the type: `= <type>;`
+
+error[E0433]: failed to resolve: use of undeclared crate or module `pallet`
+  --> $DIR/storage_incomplete_item.rs:18:4
+   |
+18 |     #[pallet::storage]
+   |       ^^^^^^ use of undeclared crate or module `pallet`
diff --git a/frame/support/test/tests/pallet_ui/storage_invalid_first_generic.rs b/frame/support/test/tests/pallet_ui/storage_invalid_first_generic.rs
new file mode 100644
index 000000000000..c8df93c9b323
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/storage_invalid_first_generic.rs
@@ -0,0 +1,23 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::storage]
+	type Foo<T> = StorageValue<u8, u8>;
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/storage_invalid_first_generic.stderr b/frame/support/test/tests/pallet_ui/storage_invalid_first_generic.stderr
new file mode 100644
index 000000000000..d332e6c2d3d1
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/storage_invalid_first_generic.stderr
@@ -0,0 +1,11 @@
+error: Invalid use of `#[pallet::storage]`, the type first generic argument must be `_`, the final argument is automatically set by macro.
+  --> $DIR/storage_invalid_first_generic.rs:19:29
+   |
+19 |     type Foo<T> = StorageValue<u8, u8>;
+   |                                ^^
+
+error: expected `_`
+  --> $DIR/storage_invalid_first_generic.rs:19:29
+   |
+19 |     type Foo<T> = StorageValue<u8, u8>;
+   |                                ^^
diff --git a/frame/support/test/tests/pallet_ui/storage_not_storage_type.rs b/frame/support/test/tests/pallet_ui/storage_not_storage_type.rs
new file mode 100644
index 000000000000..03eee6fc8ec7
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/storage_not_storage_type.rs
@@ -0,0 +1,23 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::storage]
+	type Foo<T> = u8;
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/storage_not_storage_type.stderr b/frame/support/test/tests/pallet_ui/storage_not_storage_type.stderr
new file mode 100644
index 000000000000..ec4bde22ac7a
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/storage_not_storage_type.stderr
@@ -0,0 +1,5 @@
+error: Invalid pallet::storage, expected ident: `StorageValue` or `StorageMap` or `StorageDoubleMap` in order to expand metadata, found `u8`
+  --> $DIR/storage_not_storage_type.rs:19:16
+   |
+19 |     type Foo<T> = u8;
+   |                   ^^
diff --git a/frame/support/test/tests/pallet_ui/storage_value_no_generic.rs b/frame/support/test/tests/pallet_ui/storage_value_no_generic.rs
new file mode 100644
index 000000000000..e62bdafaa264
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/storage_value_no_generic.rs
@@ -0,0 +1,23 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::storage]
+	type Foo<T> = StorageValue;
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/storage_value_no_generic.stderr b/frame/support/test/tests/pallet_ui/storage_value_no_generic.stderr
new file mode 100644
index 000000000000..894f7095b2b5
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/storage_value_no_generic.stderr
@@ -0,0 +1,5 @@
+error: pallet::storage unexpected number of generic argument, expected at least 2 args, found none
+  --> $DIR/storage_value_no_generic.rs:19:16
+   |
+19 |     type Foo<T> = StorageValue;
+   |                   ^^^^^^^^^^^^
diff --git a/frame/support/test/tests/pallet_ui/storage_wrong_item.rs b/frame/support/test/tests/pallet_ui/storage_wrong_item.rs
new file mode 100644
index 000000000000..56c4b86f2b35
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/storage_wrong_item.rs
@@ -0,0 +1,23 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::storage]
+	impl Foo {}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/storage_wrong_item.stderr b/frame/support/test/tests/pallet_ui/storage_wrong_item.stderr
new file mode 100644
index 000000000000..8cc180b5bfe4
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/storage_wrong_item.stderr
@@ -0,0 +1,5 @@
+error: Invalid pallet::storage, expected item type
+  --> $DIR/storage_wrong_item.rs:19:2
+   |
+19 |     impl Foo {}
+   |     ^^^^
diff --git a/frame/support/test/tests/pallet_ui/store_trait_leak_private.rs b/frame/support/test/tests/pallet_ui/store_trait_leak_private.rs
new file mode 100644
index 000000000000..3ebd1cb9fa60
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/store_trait_leak_private.rs
@@ -0,0 +1,25 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::BlockNumberFor;
+	use frame_support::pallet_prelude::StorageValue;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	#[pallet::generate_store(pub trait Store)]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::storage]
+	type Foo<T> = StorageValue<_, u8>;
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr b/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr
new file mode 100644
index 000000000000..f0f41a75deb4
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr
@@ -0,0 +1,8 @@
+error[E0446]: private type `_GeneratedPrefixForStorageFoo<T>` in public interface
+  --> $DIR/store_trait_leak_private.rs:11:37
+   |
+11 |     #[pallet::generate_store(pub trait Store)]
+   |                                        ^^^^^ can't leak private type
+...
+21 |     type Foo<T> = StorageValue<_, u8>;
+   |          - `_GeneratedPrefixForStorageFoo<T>` declared as private
diff --git a/frame/support/test/tests/pallet_ui/trait_constant_invalid_bound.rs b/frame/support/test/tests/pallet_ui/trait_constant_invalid_bound.rs
new file mode 100644
index 000000000000..ce599d5a31e7
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/trait_constant_invalid_bound.rs
@@ -0,0 +1,23 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		#[pallet::constant]
+		type U;
+	}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/trait_constant_invalid_bound.stderr b/frame/support/test/tests/pallet_ui/trait_constant_invalid_bound.stderr
new file mode 100644
index 000000000000..16c3531140ea
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/trait_constant_invalid_bound.stderr
@@ -0,0 +1,11 @@
+error: Invalid usage of `#[pallet::constant]`, syntax must be `type $SomeIdent: Get<$SomeType>;`
+ --> $DIR/trait_constant_invalid_bound.rs:9:3
+  |
+9 |         type U;
+  |         ^^^^
+
+error: expected `:`
+ --> $DIR/trait_constant_invalid_bound.rs:9:9
+  |
+9 |         type U;
+  |               ^
diff --git a/frame/support/test/tests/pallet_ui/trait_invalid_item.rs b/frame/support/test/tests/pallet_ui/trait_invalid_item.rs
new file mode 100644
index 000000000000..8537659dcd03
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/trait_invalid_item.rs
@@ -0,0 +1,23 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		#[pallet::constant]
+		const U: u8 = 3;
+	}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/trait_invalid_item.stderr b/frame/support/test/tests/pallet_ui/trait_invalid_item.stderr
new file mode 100644
index 000000000000..72495d94b307
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/trait_invalid_item.stderr
@@ -0,0 +1,5 @@
+error: Invalid pallet::constant in pallet::config, expected type trait item
+ --> $DIR/trait_invalid_item.rs:9:3
+  |
+9 |         const U: u8 = 3;
+  |         ^^^^^
diff --git a/frame/support/test/tests/pallet_ui/trait_no_supertrait.rs b/frame/support/test/tests/pallet_ui/trait_no_supertrait.rs
new file mode 100644
index 000000000000..0fc987f7bbdd
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/trait_no_supertrait.rs
@@ -0,0 +1,21 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config {
+	}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/trait_no_supertrait.stderr b/frame/support/test/tests/pallet_ui/trait_no_supertrait.stderr
new file mode 100644
index 000000000000..c38f43d28eb3
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/trait_no_supertrait.stderr
@@ -0,0 +1,5 @@
+error: Invalid pallet::trait, expected explicit `frame_system::Config` as supertrait, found none. (try `pub trait Config: frame_system::Config { ...` or `pub trait Config<I: 'static>: frame_system::Config { ...`). To disable this check, use `#[pallet::disable_frame_system_supertrait_check]`
+ --> $DIR/trait_no_supertrait.rs:7:2
+  |
+7 |     pub trait Config {
+  |     ^^^
diff --git a/frame/support/test/tests/pallet_ui/type_value_error_in_block.rs b/frame/support/test/tests/pallet_ui/type_value_error_in_block.rs
new file mode 100644
index 000000000000..1a1c451ac39f
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/type_value_error_in_block.rs
@@ -0,0 +1,25 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::{Hooks, PhantomData};
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::type_value] fn Foo() -> u32 {
+		// Just wrong code to see span
+		u32::new()
+	}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/type_value_error_in_block.stderr b/frame/support/test/tests/pallet_ui/type_value_error_in_block.stderr
new file mode 100644
index 000000000000..f46b89a067b0
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/type_value_error_in_block.stderr
@@ -0,0 +1,5 @@
+error[E0599]: no function or associated item named `new` found for type `u32` in the current scope
+  --> $DIR/type_value_error_in_block.rs:20:8
+   |
+20 |         u32::new()
+   |              ^^^ function or associated item not found in `u32`
diff --git a/frame/support/test/tests/pallet_ui/type_value_invalid_item.rs b/frame/support/test/tests/pallet_ui/type_value_invalid_item.rs
new file mode 100644
index 000000000000..476a4a8e1e78
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/type_value_invalid_item.rs
@@ -0,0 +1,22 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::{Hooks, PhantomData};
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::type_value] struct Foo;
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/type_value_invalid_item.stderr b/frame/support/test/tests/pallet_ui/type_value_invalid_item.stderr
new file mode 100644
index 000000000000..5ae618df8837
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/type_value_invalid_item.stderr
@@ -0,0 +1,5 @@
+error: Invalid pallet::type_value, expected item fn
+  --> $DIR/type_value_invalid_item.rs:18:24
+   |
+18 |     #[pallet::type_value] struct Foo;
+   |                           ^^^^^^
diff --git a/frame/support/test/tests/pallet_ui/type_value_no_return.rs b/frame/support/test/tests/pallet_ui/type_value_no_return.rs
new file mode 100644
index 000000000000..eb13436cac7c
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/type_value_no_return.rs
@@ -0,0 +1,22 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::{Hooks, PhantomData};
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::type_value] fn Foo() {}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/type_value_no_return.stderr b/frame/support/test/tests/pallet_ui/type_value_no_return.stderr
new file mode 100644
index 000000000000..65ac0243f9f6
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/type_value_no_return.stderr
@@ -0,0 +1,5 @@
+error: Invalid pallet::type_value, expected return type
+  --> $DIR/type_value_no_return.rs:18:24
+   |
+18 |     #[pallet::type_value] fn Foo() {}
+   |                           ^^
diff --git a/frame/support/test/tests/pallet_version.rs b/frame/support/test/tests/pallet_version.rs
index 00750c676721..25320597ba49 100644
--- a/frame/support/test/tests/pallet_version.rs
+++ b/frame/support/test/tests/pallet_version.rs
@@ -27,22 +27,17 @@ use frame_support::{
 };
 use sp_core::{H256, sr25519};
 
-mod system;
-
 /// A version that we will check for in the tests
 const SOME_TEST_VERSION: PalletVersion = PalletVersion { major: 3000, minor: 30, patch: 13 };
 
 /// Checks that `on_runtime_upgrade` sets the latest pallet version when being called without
 /// being provided by the user.
 mod module1 {
-	use super::*;
-
-	pub trait Config: system::Config {}
+	pub trait Config: frame_system::Config {}
 
 	frame_support::decl_module! {
 		pub struct Module<T: Config> for enum Call where
-			origin: <T as system::Config>::Origin,
-			system = system,
+			origin: <T as frame_system::Config>::Origin,
 		{}
 	}
 }
@@ -52,12 +47,11 @@ mod module1 {
 mod module2 {
 	use super::*;
 
-	pub trait Config<I=DefaultInstance>: system::Config {}
+	pub trait Config<I=DefaultInstance>: frame_system::Config {}
 
 	frame_support::decl_module! {
 		pub struct Module<T: Config<I>, I: Instance=DefaultInstance> for enum Call where
-			origin: <T as system::Config>::Origin,
-			system = system
+			origin: <T as frame_system::Config>::Origin,
 		{
 			fn on_runtime_upgrade() -> Weight {
 				assert_eq!(crate_to_pallet_version!(), Self::current_version());
@@ -82,26 +76,95 @@ mod module2 {
 	}
 }
 
+#[frame_support::pallet]
+mod pallet3 {
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+	}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+		fn on_runtime_upgrade() -> Weight {
+			return 3;
+		}
+	}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+	}
+}
+
+#[frame_support::pallet]
+mod pallet4 {
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+
+	#[pallet::config]
+	pub trait Config<I: 'static = ()>: frame_system::Config {
+	}
+
+	#[pallet::pallet]
+	pub struct Pallet<T, I=()>(PhantomData<(T, I)>);
+
+	#[pallet::hooks]
+	impl<T: Config<I>, I: 'static> Hooks<BlockNumberFor<T>> for Pallet<T, I> {
+		fn on_runtime_upgrade() -> Weight {
+			return 3;
+		}
+	}
+
+	#[pallet::call]
+	impl<T: Config<I>, I: 'static> Pallet<T, I> {
+	}
+}
+
 impl module1::Config for Runtime {}
 impl module2::Config for Runtime {}
 impl module2::Config<module2::Instance1> for Runtime {}
 impl module2::Config<module2::Instance2> for Runtime {}
 
+impl pallet3::Config for Runtime {}
+impl pallet4::Config for Runtime {}
+impl pallet4::Config<pallet4::Instance1> for Runtime {}
+impl pallet4::Config<pallet4::Instance2> for Runtime {}
+
 pub type Signature = sr25519::Signature;
 pub type AccountId = <Signature as Verify>::Signer;
 pub type BlockNumber = u64;
 pub type Index = u64;
 
-impl system::Config for Runtime {
-	type BaseCallFilter= ();
-	type Hash = H256;
+frame_support::parameter_types!(
+	pub const BlockHashCount: u32 = 250;
+);
+
+impl frame_system::Config for Runtime {
+	type BaseCallFilter = ();
 	type Origin = Origin;
+	type Index = u64;
 	type BlockNumber = BlockNumber;
+	type Call = Call;
+	type Hash = H256;
+	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
+	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
+	type Header = Header;
 	type Event = Event;
-	type PalletInfo = PalletInfo;
-	type Call = Call;
+	type BlockHashCount = BlockHashCount;
+	type BlockWeights = ();
+	type BlockLength = ();
 	type DbWeight = ();
+	type Version = ();
+	type PalletInfo = PalletInfo;
+	type AccountData = ();
+	type OnNewAccount = ();
+	type OnKilledAccount = ();
+	type SystemWeightInfo = ();
 }
 
 frame_support::construct_runtime!(
@@ -110,11 +173,15 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: system::{Module, Call, Event<T>},
+		System: frame_system::{Module, Call, Event<T>},
 		Module1: module1::{Module, Call},
 		Module2: module2::{Module, Call},
 		Module2_1: module2::<Instance1>::{Module, Call},
 		Module2_2: module2::<Instance2>::{Module, Call},
+		Pallet3: pallet3::{Module, Call},
+		Pallet4: pallet4::{Module, Call},
+		Pallet4_1: pallet4::<Instance1>::{Module, Call},
+		Pallet4_2: pallet4::<Instance2>::{Module, Call},
 	}
 );
 
@@ -156,6 +223,10 @@ fn on_runtime_upgrade_sets_the_pallet_versions_in_storage() {
 		check_pallet_version("Module2");
 		check_pallet_version("Module2_1");
 		check_pallet_version("Module2_2");
+		check_pallet_version("Pallet3");
+		check_pallet_version("Pallet4");
+		check_pallet_version("Pallet4_1");
+		check_pallet_version("Pallet4_2");
 	});
 }
 
@@ -171,6 +242,10 @@ fn on_runtime_upgrade_overwrites_old_version() {
 		check_pallet_version("Module2");
 		check_pallet_version("Module2_1");
 		check_pallet_version("Module2_2");
+		check_pallet_version("Pallet3");
+		check_pallet_version("Pallet4");
+		check_pallet_version("Pallet4_1");
+		check_pallet_version("Pallet4_2");
 	});
 }
 
@@ -183,6 +258,10 @@ fn genesis_init_puts_pallet_version_into_storage() {
 		check_pallet_version("Module2");
 		check_pallet_version("Module2_1");
 		check_pallet_version("Module2_2");
+		check_pallet_version("Pallet3");
+		check_pallet_version("Pallet4");
+		check_pallet_version("Pallet4_1");
+		check_pallet_version("Pallet4_2");
 
 		let system_version = System::storage_version().expect("System version should be set");
 		assert_eq!(System::current_version(), system_version);
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index 4bcab6e6c0ed..a89577a478b7 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -164,6 +164,7 @@ pub fn extrinsics_data_root<H: Hash>(xts: Vec<Vec<u8>>) -> H::Output {
 /// An object to track the currently used extrinsic weight in a block.
 pub type ConsumedWeight = PerDispatchClass<Weight>;
 
+/// System configuration trait. Implemented by runtime.
 pub trait Config: 'static + Eq + Clone {
 	/// The basic call filter to use in Origin. All origins are built with this filter as base,
 	/// except Root.
@@ -497,6 +498,11 @@ decl_error! {
 	}
 }
 
+/// Pallet struct placeholder on which is implemented the pallet logic.
+///
+/// It is currently an alias for `Module` as old macros still generate/use old name.
+pub type Pallet<T> = Module<T>;
+
 decl_module! {
 	pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {
 		type Error = Error<T>;
@@ -1343,3 +1349,14 @@ impl<T: Config> Lookup for ChainContext<T> {
 		<T::Lookup as StaticLookup>::lookup(s)
 	}
 }
+
+/// Prelude to be used alongside pallet macro, for ease of use.
+pub mod pallet_prelude {
+	pub use crate::{ensure_signed, ensure_none, ensure_root};
+
+	/// Type alias for the `Origin` associated type of system config.
+	pub type OriginFor<T> = <T as crate::Config>::Origin;
+
+	/// Type alias for the `BlockNumber` associated type of system config.
+	pub type BlockNumberFor<T> = <T as crate::Config>::BlockNumber;
+}

From 281f81c971b720833d01a3c3ab23c0ef21754084 Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Sat, 26 Dec 2020 19:34:39 -0500
Subject: [PATCH 0202/1194] add a `current_epoch` to BabeApi (#7789)

* add a `current_epoch` to BabeApi

* add current_epoch_start back again

* fix node-runtime

* bump spec version
---
 bin/node/runtime/src/lib.rs          |  6 +++++-
 frame/babe/src/lib.rs                | 13 ++++++++++++-
 primitives/consensus/babe/src/lib.rs | 18 ++++++++++++++++++
 test-utils/runtime/src/lib.rs        | 12 ++++++++++--
 4 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index fb77fd2ebd40..a86b015dbcf9 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -111,7 +111,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	// and set impl_version to 0. If only runtime
 	// implementation changes and behavior does not, then leave spec_version as
 	// is and increment impl_version.
-	spec_version: 260,
+	spec_version: 261,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 2,
@@ -1141,6 +1141,10 @@ impl_runtime_apis! {
 			Babe::current_epoch_start()
 		}
 
+		fn current_epoch() -> sp_consensus_babe::Epoch {
+			Babe::current_epoch()
+		}
+
 		fn generate_key_ownership_proof(
 			_slot_number: sp_consensus_babe::SlotNumber,
 			authority_id: sp_consensus_babe::AuthorityId,
diff --git a/frame/babe/src/lib.rs b/frame/babe/src/lib.rs
index a61f1244cbeb..fa7954b95123 100644
--- a/frame/babe/src/lib.rs
+++ b/frame/babe/src/lib.rs
@@ -43,7 +43,7 @@ use sp_timestamp::OnTimestampSet;
 use sp_consensus_babe::{
 	digests::{NextConfigDescriptor, NextEpochDescriptor, PreDigest},
 	inherents::{BabeInherentData, INHERENT_IDENTIFIER},
-	BabeAuthorityWeight, ConsensusLog, EquivocationProof, SlotNumber, BABE_ENGINE_ID,
+	BabeAuthorityWeight, ConsensusLog, Epoch, EquivocationProof, SlotNumber, BABE_ENGINE_ID,
 };
 use sp_consensus_vrf::schnorrkel;
 use sp_inherents::{InherentData, InherentIdentifier, MakeFatalError, ProvideInherent};
@@ -486,6 +486,17 @@ impl<T: Config> Module<T> {
 		(EpochIndex::get() * T::EpochDuration::get()) + GenesisSlot::get()
 	}
 
+	/// Produces information about the current epoch.
+	pub fn current_epoch() -> Epoch {
+		Epoch {
+			epoch_index: EpochIndex::get(),
+			start_slot: Self::current_epoch_start(),
+			duration: T::EpochDuration::get(),
+			authorities: Self::authorities(),
+			randomness: Self::randomness(),
+		}
+	}
+
 	fn deposit_consensus<U: Encode>(new: U) {
 		let log: DigestItem<T::Hash> = DigestItem::Consensus(BABE_ENGINE_ID, new.encode());
 		<frame_system::Module<T>>::deposit_log(log.into())
diff --git a/primitives/consensus/babe/src/lib.rs b/primitives/consensus/babe/src/lib.rs
index 74f2659e6e8b..ac75f26a3de6 100644
--- a/primitives/consensus/babe/src/lib.rs
+++ b/primitives/consensus/babe/src/lib.rs
@@ -350,6 +350,21 @@ impl OpaqueKeyOwnershipProof {
 	}
 }
 
+/// BABE epoch information
+#[derive(Decode, Encode, PartialEq, Eq, Clone, Debug)]
+pub struct Epoch {
+	/// The epoch index.
+	pub epoch_index: u64,
+	/// The starting slot of the epoch.
+	pub start_slot: SlotNumber,
+	/// The duration of this epoch.
+	pub duration: SlotNumber,
+	/// The authorities and their weights.
+	pub authorities: Vec<(AuthorityId, BabeAuthorityWeight)>,
+	/// Randomness for this epoch.
+	pub randomness: [u8; VRF_OUTPUT_LENGTH],
+}
+
 sp_api::decl_runtime_apis! {
 	/// API necessary for block authorship with BABE.
 	#[api_version(2)]
@@ -364,6 +379,9 @@ sp_api::decl_runtime_apis! {
 		/// Returns the slot number that started the current epoch.
 		fn current_epoch_start() -> SlotNumber;
 
+		/// Returns information regarding the current epoch.
+		fn current_epoch() -> Epoch;
+
 		/// Generates a proof of key ownership for the given authority in the
 		/// current epoch. An example usage of this module is coupled with the
 		/// session historical module to prove that a given authority key is
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index ea29215a4f7e..6bee4b704fc4 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -732,10 +732,14 @@ cfg_if! {
 					}
 				}
 
-				fn current_epoch_start() -> SlotNumber {
+				fn current_epoch_start() -> sp_consensus_babe::SlotNumber {
 					<pallet_babe::Module<Runtime>>::current_epoch_start()
 				}
 
+				fn current_epoch() -> sp_consensus_babe::Epoch {
+					<pallet_babe::Module<Runtime>>::current_epoch()
+				}
+
 				fn submit_report_equivocation_unsigned_extrinsic(
 					_equivocation_proof: sp_consensus_babe::EquivocationProof<
 						<Block as BlockT>::Header,
@@ -983,10 +987,14 @@ cfg_if! {
 					}
 				}
 
-				fn current_epoch_start() -> SlotNumber {
+				fn current_epoch_start() -> sp_consensus_babe::SlotNumber {
 					<pallet_babe::Module<Runtime>>::current_epoch_start()
 				}
 
+				fn current_epoch() -> sp_consensus_babe::Epoch {
+					<pallet_babe::Module<Runtime>>::current_epoch()
+				}
+
 				fn submit_report_equivocation_unsigned_extrinsic(
 					_equivocation_proof: sp_consensus_babe::EquivocationProof<
 						<Block as BlockT>::Header,

From 165b4b59b2e595dc7ecdfc647eefc1a7d5f4bc45 Mon Sep 17 00:00:00 2001
From: chenwei <chenwei_767@qq.com>
Date: Mon, 28 Dec 2020 06:00:36 +0800
Subject: [PATCH 0203/1194] Update tests.rs (#7784)

Fix testing for number of slashing spans.
---
 frame/staking/src/tests.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index 86186af7d3e7..d4534834d20a 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -45,7 +45,7 @@ fn force_unstake_works() {
 		// Force unstake requires root.
 		assert_noop!(Staking::force_unstake(Origin::signed(11), 11, 2), BadOrigin);
 		// Force unstake needs correct number of slashing spans (for weight calculation)
-		assert_noop!(Staking::force_unstake(Origin::signed(11), 11, 0), BadOrigin);
+		assert_noop!(Staking::force_unstake(Origin::root(), 11, 0), Error::<Test>::IncorrectSlashingSpans);
 		// We now force them to unstake
 		assert_ok!(Staking::force_unstake(Origin::root(), 11, 2));
 		// No longer bonded.

From 6ba867a3b0ed3d19843c27fc3f90aaab5759f211 Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Mon, 28 Dec 2020 05:46:47 -0500
Subject: [PATCH 0204/1194] add a slot-duration getter to babe config (#7793)

---
 client/consensus/babe/src/lib.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index 3f2a583482af..bf929992db02 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -342,6 +342,11 @@ impl Config {
 			}
 		}
 	}
+
+	/// Get the inner slot duration, in milliseconds.
+	pub fn slot_duration(&self) -> u64 {
+		self.0.slot_duration()
+	}
 }
 
 impl std::ops::Deref for Config {

From 54bde60cfd2c544c54e9e8623b6b8725b99557f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Mon, 28 Dec 2020 15:08:30 +0100
Subject: [PATCH 0205/1194] Fix base-path handling in `key insert` (#7775)

This fixes the handling of base-path when using `key insert`. Before
the base-path wasn't setup correctly, as done when starting a node. This
resulted in putting the keys into the wrong directory. This pr fixes
this by creating the correct base-path/config dir for the keystore.
Besides that it also removes the insert command from `subkey` as it
doesn't make that much sense. If requested, we could bring it back later.
---
 bin/node-template/node/src/command.rs    |   2 +-
 bin/node/cli/src/command.rs              |   2 +-
 bin/utils/subkey/src/lib.rs              |   8 +-
 client/cli/src/commands/insert.rs        |  94 ------------
 client/cli/src/commands/insert_key.rs    | 173 +++++++++++++++++++++++
 client/cli/src/commands/key.rs           |  10 +-
 client/cli/src/commands/mod.rs           |   4 +-
 client/cli/src/config.rs                 |  14 +-
 client/cli/src/error.rs                  |   3 -
 client/cli/src/lib.rs                    |   5 +-
 client/cli/src/params/keystore_params.rs |  15 +-
 client/keystore/src/local.rs             |   4 +-
 client/service/src/config.rs             |   7 +
 primitives/core/src/crypto.rs            |   1 +
 14 files changed, 206 insertions(+), 136 deletions(-)
 delete mode 100644 client/cli/src/commands/insert.rs
 create mode 100644 client/cli/src/commands/insert_key.rs

diff --git a/bin/node-template/node/src/command.rs b/bin/node-template/node/src/command.rs
index 5c41643a2932..acf29bd591e4 100644
--- a/bin/node-template/node/src/command.rs
+++ b/bin/node-template/node/src/command.rs
@@ -66,7 +66,7 @@ pub fn run() -> sc_cli::Result<()> {
 	let cli = Cli::from_args();
 
 	match &cli.subcommand {
-		Some(Subcommand::Key(cmd)) => cmd.run(),
+		Some(Subcommand::Key(cmd)) => cmd.run(&cli),
 		Some(Subcommand::BuildSpec(cmd)) => {
 			let runner = cli.create_runner(cmd)?;
 			runner.sync_run(|config| cmd.run(config.chain_spec, config.network))
diff --git a/bin/node/cli/src/command.rs b/bin/node/cli/src/command.rs
index f8a0f3f9b3a3..bb1bf0169e6f 100644
--- a/bin/node/cli/src/command.rs
+++ b/bin/node/cli/src/command.rs
@@ -94,7 +94,7 @@ pub fn run() -> Result<()> {
 				You can enable it with `--features runtime-benchmarks`.".into())
 			}
 		}
-		Some(Subcommand::Key(cmd)) => cmd.run(),
+		Some(Subcommand::Key(cmd)) => cmd.run(&cli),
 		Some(Subcommand::Sign(cmd)) => cmd.run(),
 		Some(Subcommand::Verify(cmd)) => cmd.run(),
 		Some(Subcommand::Vanity(cmd)) => cmd.run(),
diff --git a/bin/utils/subkey/src/lib.rs b/bin/utils/subkey/src/lib.rs
index c38a48576524..0fe6f417d1af 100644
--- a/bin/utils/subkey/src/lib.rs
+++ b/bin/utils/subkey/src/lib.rs
@@ -18,8 +18,8 @@
 
 use structopt::StructOpt;
 use sc_cli::{
-	Error, VanityCmd, SignCmd, VerifyCmd, InsertCmd,
-	GenerateNodeKeyCmd, GenerateCmd, InspectKeyCmd, InspectNodeKeyCmd
+	Error, VanityCmd, SignCmd, VerifyCmd, GenerateNodeKeyCmd, GenerateCmd, InspectKeyCmd,
+	InspectNodeKeyCmd
 };
 use substrate_frame_cli::ModuleIdCmd;
 use sp_core::crypto::Ss58Codec;
@@ -44,9 +44,6 @@ pub enum Subkey {
 	/// Print the peer ID corresponding to the node key in the given file
 	InspectNodeKey(InspectNodeKeyCmd),
 
-	/// Insert a key to the keystore of a node.
-	Insert(InsertCmd),
-
 	/// Inspect a module ID address
 	ModuleId(ModuleIdCmd),
 
@@ -71,7 +68,6 @@ pub fn run<R>() -> Result<(), Error>
 		Subkey::Generate(cmd) => cmd.run()?,
 		Subkey::Inspect(cmd) => cmd.run()?,
 		Subkey::InspectNodeKey(cmd) => cmd.run()?,
-		Subkey::Insert(cmd) => cmd.run()?,
 		Subkey::ModuleId(cmd) => cmd.run::<R>()?,
 		Subkey::Vanity(cmd) => cmd.run()?,
 		Subkey::Verify(cmd) => cmd.run()?,
diff --git a/client/cli/src/commands/insert.rs b/client/cli/src/commands/insert.rs
deleted file mode 100644
index 8b7fe98fc0b9..000000000000
--- a/client/cli/src/commands/insert.rs
+++ /dev/null
@@ -1,94 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Implementation of the `insert` subcommand
-
-use crate::{Error, KeystoreParams, CryptoSchemeFlag, SharedParams, utils, with_crypto_scheme};
-use std::sync::Arc;
-use structopt::StructOpt;
-use sp_core::crypto::KeyTypeId;
-use sp_keystore::{SyncCryptoStorePtr, SyncCryptoStore};
-use std::convert::TryFrom;
-use sc_service::config::KeystoreConfig;
-use sc_keystore::LocalKeystore;
-use sp_core::crypto::SecretString;
-
-/// The `insert` command
-#[derive(Debug, StructOpt)]
-#[structopt(
-	name = "insert",
-	about = "Insert a key to the keystore of a node."
-)]
-pub struct InsertCmd {
-	/// The secret key URI.
-	/// If the value is a file, the file content is used as URI.
-	/// If not given, you will be prompted for the URI.
-	#[structopt(long)]
-	suri: Option<String>,
-
-	/// Key type, examples: "gran", or "imon"
-	#[structopt(long)]
-	key_type: String,
-
-	#[allow(missing_docs)]
-	#[structopt(flatten)]
-	pub shared_params: SharedParams,
-
-	#[allow(missing_docs)]
-	#[structopt(flatten)]
-	pub keystore_params: KeystoreParams,
-
-	#[allow(missing_docs)]
-	#[structopt(flatten)]
-	pub crypto_scheme: CryptoSchemeFlag,
-}
-
-impl InsertCmd {
-	/// Run the command
-	pub fn run(&self) -> Result<(), Error> {
-		let suri = utils::read_uri(self.suri.as_ref())?;
-		let base_path = self.shared_params.base_path.as_ref()
-			.ok_or_else(|| Error::MissingBasePath)?;
-
-		let (keystore, public) = match self.keystore_params.keystore_config(base_path)? {
-			(_, KeystoreConfig::Path { path, password }) => {
-				let public = with_crypto_scheme!(
-					self.crypto_scheme.scheme,
-					to_vec(&suri, password.clone())
-				)?;
-				let keystore: SyncCryptoStorePtr = Arc::new(LocalKeystore::open(path, password)?);
-				(keystore, public)
-			},
-			_ => unreachable!("keystore_config always returns path and password; qed")
-		};
-
-		let key_type = KeyTypeId::try_from(self.key_type.as_str())
-			.map_err(|_e| {
-				Error::KeyTypeInvalid
-			})?;
-
-		SyncCryptoStore::insert_unknown(&*keystore, key_type, &suri, &public[..])
-			.map_err(|_| Error::KeyStoreOperation)?;
-
-		Ok(())
-	}
-}
-
-fn to_vec<P: sp_core::Pair>(uri: &str, pass: Option<SecretString>) -> Result<Vec<u8>, Error> {
-	let p = utils::pair_from_suri::<P>(uri, pass)?;
-	Ok(p.public().as_ref().to_vec())
-}
diff --git a/client/cli/src/commands/insert_key.rs b/client/cli/src/commands/insert_key.rs
new file mode 100644
index 000000000000..3338b708a4fd
--- /dev/null
+++ b/client/cli/src/commands/insert_key.rs
@@ -0,0 +1,173 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Implementation of the `insert` subcommand
+
+use crate::{
+	Error, KeystoreParams, CryptoSchemeFlag, SharedParams, utils, with_crypto_scheme,
+	SubstrateCli,
+};
+use std::{sync::Arc, convert::TryFrom};
+use structopt::StructOpt;
+use sp_core::{crypto::KeyTypeId, crypto::SecretString};
+use sp_keystore::{SyncCryptoStorePtr, SyncCryptoStore};
+use sc_keystore::LocalKeystore;
+use sc_service::config::{KeystoreConfig, BasePath};
+
+/// The `insert` command
+#[derive(Debug, StructOpt)]
+#[structopt(
+	name = "insert",
+	about = "Insert a key to the keystore of a node."
+)]
+pub struct InsertKeyCmd {
+	/// The secret key URI.
+	/// If the value is a file, the file content is used as URI.
+	/// If not given, you will be prompted for the URI.
+	#[structopt(long)]
+	suri: Option<String>,
+
+	/// Key type, examples: "gran", or "imon"
+	#[structopt(long)]
+	key_type: String,
+
+	#[allow(missing_docs)]
+	#[structopt(flatten)]
+	pub shared_params: SharedParams,
+
+	#[allow(missing_docs)]
+	#[structopt(flatten)]
+	pub keystore_params: KeystoreParams,
+
+	#[allow(missing_docs)]
+	#[structopt(flatten)]
+	pub crypto_scheme: CryptoSchemeFlag,
+}
+
+impl InsertKeyCmd {
+	/// Run the command
+	pub fn run<C: SubstrateCli>(&self, cli: &C) -> Result<(), Error> {
+		let suri = utils::read_uri(self.suri.as_ref())?;
+		let base_path = self.shared_params
+			.base_path()
+			.unwrap_or_else(|| BasePath::from_project("", "", &C::executable_name()));
+		let chain_id = self.shared_params.chain_id(self.shared_params.is_dev());
+		let chain_spec = cli.load_spec(&chain_id)?;
+		let config_dir = base_path.config_dir(chain_spec.id());
+
+		let (keystore, public) = match self.keystore_params.keystore_config(&config_dir)? {
+			(_, KeystoreConfig::Path { path, password }) => {
+				let public = with_crypto_scheme!(
+					self.crypto_scheme.scheme,
+					to_vec(&suri, password.clone())
+				)?;
+				let keystore: SyncCryptoStorePtr = Arc::new(LocalKeystore::open(path, password)?);
+				(keystore, public)
+			},
+			_ => unreachable!("keystore_config always returns path and password; qed")
+		};
+
+		let key_type = KeyTypeId::try_from(self.key_type.as_str()).map_err(|_| Error::KeyTypeInvalid)?;
+
+		SyncCryptoStore::insert_unknown(&*keystore, key_type, &suri, &public[..])
+			.map_err(|_| Error::KeyStoreOperation)?;
+
+		Ok(())
+	}
+}
+
+fn to_vec<P: sp_core::Pair>(uri: &str, pass: Option<SecretString>) -> Result<Vec<u8>, Error> {
+	let p = utils::pair_from_suri::<P>(uri, pass)?;
+	Ok(p.public().as_ref().to_vec())
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use structopt::StructOpt;
+	use tempfile::TempDir;
+	use sp_core::{sr25519::Pair, Pair as _, Public};
+	use sc_service::{ChainSpec, GenericChainSpec, ChainType, NoExtension};
+
+	struct Cli;
+
+	impl SubstrateCli for Cli {
+		fn impl_name() -> String {
+			"test".into()
+		}
+
+		fn impl_version() -> String {
+			"2.0".into()
+		}
+
+		fn description() -> String {
+			"test".into()
+		}
+
+		fn support_url() -> String {
+			"test.test".into()
+		}
+
+		fn copyright_start_year() -> i32 {
+			2020
+		}
+
+		fn author() -> String {
+			"test".into()
+		}
+
+		fn native_runtime_version(_: &Box<dyn ChainSpec>) -> &'static sp_version::RuntimeVersion {
+			unimplemented!("Not required in tests")
+		}
+
+		fn load_spec(&self, _: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {
+			Ok(
+				Box::new(
+					GenericChainSpec::from_genesis(
+						"test",
+						"test_id",
+						ChainType::Development,
+						|| unimplemented!("Not required in tests"),
+						Vec::new(),
+						None,
+						None,
+						None,
+						NoExtension::None,
+					),
+				),
+			)
+		}
+	}
+
+	#[test]
+	fn insert_with_custom_base_path() {
+		let path = TempDir::new().unwrap();
+		let path_str = format!("{}", path.path().display());
+		let (key, uri, _) = Pair::generate_with_phrase(None);
+
+		let inspect = InsertKeyCmd::from_iter(
+			&["insert-key", "-d", &path_str, "--key-type", "test", "--suri", &uri],
+		);
+		assert!(inspect.run(&Cli).is_ok());
+
+		let keystore = LocalKeystore::open(
+			path.path().join("chains").join("test_id").join("keystore"),
+			None,
+		).unwrap();
+		assert!(keystore.has_keys(&[(key.public().to_raw_vec(), KeyTypeId(*b"test"))]));
+	}
+}
diff --git a/client/cli/src/commands/key.rs b/client/cli/src/commands/key.rs
index e5bce08145cb..d01e273f0efa 100644
--- a/client/cli/src/commands/key.rs
+++ b/client/cli/src/commands/key.rs
@@ -17,11 +17,11 @@
 
 //! Key related CLI utilities
 
-use crate::Error;
+use crate::{Error, SubstrateCli};
 use structopt::StructOpt;
 
 use super::{
-	insert::InsertCmd,
+	insert_key::InsertKeyCmd,
 	inspect_key::InspectKeyCmd,
 	generate::GenerateCmd,
 	inspect_node_key::InspectNodeKeyCmd,
@@ -45,17 +45,17 @@ pub enum KeySubcommand {
 	InspectNodeKey(InspectNodeKeyCmd),
 
 	/// Insert a key to the keystore of a node.
-	Insert(InsertCmd),
+	Insert(InsertKeyCmd),
 }
 
 impl KeySubcommand {
 	/// run the key subcommands
-	pub fn run(&self) -> Result<(), Error> {
+	pub fn run<C: SubstrateCli>(&self, cli: &C) -> Result<(), Error> {
 		match self {
 			KeySubcommand::GenerateNodeKey(cmd) => cmd.run(),
 			KeySubcommand::Generate(cmd) => cmd.run(),
 			KeySubcommand::InspectKey(cmd) => cmd.run(),
-			KeySubcommand::Insert(cmd) => cmd.run(),
+			KeySubcommand::Insert(cmd) => cmd.run(cli),
 			KeySubcommand::InspectNodeKey(cmd) => cmd.run(),
 		}
 	}
diff --git a/client/cli/src/commands/mod.rs b/client/cli/src/commands/mod.rs
index 9867f61cd277..395d3fa9c5e6 100644
--- a/client/cli/src/commands/mod.rs
+++ b/client/cli/src/commands/mod.rs
@@ -28,7 +28,7 @@ mod revert_cmd;
 mod run_cmd;
 mod generate_node_key;
 mod generate;
-mod insert;
+mod insert_key;
 mod inspect_node_key;
 mod inspect_key;
 mod key;
@@ -43,7 +43,7 @@ pub use self::{
 	purge_chain_cmd::PurgeChainCmd,
 	sign::SignCmd,
 	generate::GenerateCmd,
-	insert::InsertCmd,
+	insert_key::InsertKeyCmd,
 	inspect_key::InspectKeyCmd,
 	generate_node_key::GenerateNodeKeyCmd,
 	inspect_node_key::InspectNodeKeyCmd,
diff --git a/client/cli/src/config.rs b/client/cli/src/config.rs
index 4e1ad19fc46f..b631b85f3774 100644
--- a/client/cli/src/config.rs
+++ b/client/cli/src/config.rs
@@ -186,11 +186,11 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 
 	/// Get the keystore configuration.
 	///
-	/// Bu default this is retrieved from `KeystoreParams` if it is available. Otherwise it uses
+	/// By default this is retrieved from `KeystoreParams` if it is available. Otherwise it uses
 	/// `KeystoreConfig::InMemory`.
-	fn keystore_config(&self, base_path: &PathBuf) -> Result<(Option<String>, KeystoreConfig)> {
+	fn keystore_config(&self, config_dir: &PathBuf) -> Result<(Option<String>, KeystoreConfig)> {
 		self.keystore_params()
-			.map(|x| x.keystore_config(base_path))
+			.map(|x| x.keystore_config(config_dir))
 			.unwrap_or_else(|| Ok((None, KeystoreConfig::InMemory)))
 	}
 
@@ -454,15 +454,11 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 	) -> Result<Configuration> {
 		let is_dev = self.is_dev()?;
 		let chain_id = self.chain_id(is_dev)?;
-		let chain_spec = cli.load_spec(chain_id.as_str())?;
+		let chain_spec = cli.load_spec(&chain_id)?;
 		let base_path = self
 			.base_path()?
 			.unwrap_or_else(|| BasePath::from_project("", "", &C::executable_name()));
-		let config_dir = base_path
-			.path()
-			.to_path_buf()
-			.join("chains")
-			.join(chain_spec.id());
+		let config_dir = base_path.config_dir(chain_spec.id());
 		let net_config_dir = config_dir.join(DEFAULT_NETWORK_CONFIG_PATH);
 		let client_id = C::client_id();
 		let database_cache_size = self.database_cache_size()?.unwrap_or(128);
diff --git a/client/cli/src/error.rs b/client/cli/src/error.rs
index 5190cae2c2ff..6290f071c98a 100644
--- a/client/cli/src/error.rs
+++ b/client/cli/src/error.rs
@@ -59,9 +59,6 @@ pub enum Error {
 		expected: usize,
 	},
 
-	#[error("The base path is missing, please provide one")]
-	MissingBasePath,
-
 	#[error("Unknown key type, must be a known 4-character sequence")]
 	KeyTypeInvalid,
 
diff --git a/client/cli/src/lib.rs b/client/cli/src/lib.rs
index 80882924bd3a..0efd1582aca2 100644
--- a/client/cli/src/lib.rs
+++ b/client/cli/src/lib.rs
@@ -112,10 +112,7 @@ pub trait SubstrateCli: Sized {
 	///
 	/// Gets the struct from the command line arguments. Print the
 	/// error message and quit the program in case of failure.
-	fn from_args() -> Self
-	where
-		Self: StructOpt + Sized,
-	{
+	fn from_args() -> Self where Self: StructOpt + Sized {
 		<Self as SubstrateCli>::from_iter(&mut std::env::args_os())
 	}
 
diff --git a/client/cli/src/params/keystore_params.rs b/client/cli/src/params/keystore_params.rs
index f03fafeb965c..751c2bb0700d 100644
--- a/client/cli/src/params/keystore_params.rs
+++ b/client/cli/src/params/keystore_params.rs
@@ -18,8 +18,7 @@
 
 use crate::error::Result;
 use sc_service::config::KeystoreConfig;
-use std::fs;
-use std::path::PathBuf;
+use std::{fs, path::{PathBuf, Path}};
 use structopt::StructOpt;
 use crate::error;
 use sp_core::crypto::SecretString;
@@ -33,6 +32,7 @@ pub struct KeystoreParams {
 	/// Specify custom URIs to connect to for keystore-services
 	#[structopt(long = "keystore-uri")]
 	pub keystore_uri: Option<String>,
+
 	/// Specify custom keystore path.
 	#[structopt(long = "keystore-path", value_name = "PATH", parse(from_os_str))]
 	pub keystore_path: Option<PathBuf>,
@@ -64,15 +64,14 @@ pub struct KeystoreParams {
 
 /// Parse a sercret string, returning a displayable error.
 pub fn secret_string_from_str(s: &str) -> std::result::Result<SecretString, String> {
-	Ok(std::str::FromStr::from_str(s)
-		.map_err(|_e| "Could not get SecretString".to_string())?)
+	std::str::FromStr::from_str(s).map_err(|_| "Could not get SecretString".to_string())
 }
 
 impl KeystoreParams {
 	/// Get the keystore configuration for the parameters
-	/// returns a vector of remote-urls and the local Keystore configuration
-	pub fn keystore_config(&self, base_path: &PathBuf) -> Result<(Option<String>, KeystoreConfig)> {
-
+	///
+	/// Returns a vector of remote-urls and the local Keystore configuration
+	pub fn keystore_config(&self, config_dir: &Path) -> Result<(Option<String>, KeystoreConfig)> {
 		let password = if self.password_interactive {
 			#[cfg(not(target_os = "unknown"))]
 			{
@@ -92,7 +91,7 @@ impl KeystoreParams {
 		let path = self
 			.keystore_path
 			.clone()
-			.unwrap_or_else(|| base_path.join(DEFAULT_KEYSTORE_CONFIG_PATH));
+			.unwrap_or_else(|| config_dir.join(DEFAULT_KEYSTORE_CONFIG_PATH));
 
 		Ok((self.keystore_uri.clone(), KeystoreConfig::Path { path, password }))
 	}
diff --git a/client/keystore/src/local.rs b/client/keystore/src/local.rs
index a31e3e1f1e40..98f8bf6d0012 100644
--- a/client/keystore/src/local.rs
+++ b/client/keystore/src/local.rs
@@ -167,9 +167,7 @@ impl SyncCryptoStore for LocalKeystore {
 		let all_keys = SyncCryptoStore::keys(self, id)?
 			.into_iter()
 			.collect::<HashSet<_>>();
-		Ok(keys.into_iter()
-		   .filter(|key| all_keys.contains(key))
-		   .collect::<Vec<_>>())
+		Ok(keys.into_iter().filter(|key| all_keys.contains(key)).collect::<Vec<_>>())
 	}
 
 	fn sign_with(
diff --git a/client/service/src/config.rs b/client/service/src/config.rs
index e360e610d490..2b3eff1371cd 100644
--- a/client/service/src/config.rs
+++ b/client/service/src/config.rs
@@ -263,6 +263,13 @@ impl BasePath {
 			BasePath::Permanenent(path) => path.as_path(),
 		}
 	}
+
+	/// Returns the configuration directory inside this base path.
+	///
+	/// The path looks like `$base_path/chains/$chain_id`
+	pub fn config_dir(&self, chain_id: &str) -> PathBuf {
+		self.path().join("chains").join(chain_id)
+	}
 }
 
 impl std::convert::From<PathBuf> for BasePath {
diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index 5a7136b83683..12746a078684 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -1052,6 +1052,7 @@ impl From<KeyTypeId> for u32 {
 
 impl<'a> TryFrom<&'a str> for KeyTypeId {
 	type Error = ();
+
 	fn try_from(x: &'a str) -> Result<Self, ()> {
 		let b = x.as_bytes();
 		if b.len() != 4 {

From 264cfcf8e199ed049ec4cd56c3abcaf8d6bbc7c6 Mon Sep 17 00:00:00 2001
From: Joshy Orndorff <JoshOrndorff@users.noreply.github.com>
Date: Tue, 29 Dec 2020 02:51:17 -0500
Subject: [PATCH 0206/1194] Lazily evaluate error string (#7802)

---
 bin/node-template/node/src/chain_spec.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/node-template/node/src/chain_spec.rs b/bin/node-template/node/src/chain_spec.rs
index 41f582fb64a4..c5451e81f20c 100644
--- a/bin/node-template/node/src/chain_spec.rs
+++ b/bin/node-template/node/src/chain_spec.rs
@@ -39,7 +39,7 @@ pub fn authority_keys_from_seed(s: &str) -> (AuraId, GrandpaId) {
 }
 
 pub fn development_config() -> Result<ChainSpec, String> {
-	let wasm_binary = WASM_BINARY.ok_or("Development wasm binary not available".to_string())?;
+	let wasm_binary = WASM_BINARY.ok_or_else(|| "Development wasm not available".to_string())?;
 
 	Ok(ChainSpec::from_genesis(
 		// Name
@@ -78,7 +78,7 @@ pub fn development_config() -> Result<ChainSpec, String> {
 }
 
 pub fn local_testnet_config() -> Result<ChainSpec, String> {
-	let wasm_binary = WASM_BINARY.ok_or("Development wasm binary not available".to_string())?;
+	let wasm_binary = WASM_BINARY.ok_or_else(|| "Development wasm not available".to_string())?;
 
 	Ok(ChainSpec::from_genesis(
 		// Name

From f36ae22040a123b90dcb090f78dcafaf14f83304 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Tue, 29 Dec 2020 13:58:23 +0100
Subject: [PATCH 0207/1194] contracts: Change `define_env!` to expect a
 `Result<T, DispatchError>` for every function (#7762)

* Make host functions return TrapReason

This avoids the need to manually store any trap reasons
to the `Runtime` from the host function. This adds the following
benefits:

* It properly composes with the upcoming chain extensions
* Missing to set a trap value is now a compile error

* review: Remove superflous .into()
---
 frame/contracts/src/lib.rs                 |   8 +
 frame/contracts/src/wasm/env_def/macros.rs |  47 +++--
 frame/contracts/src/wasm/mod.rs            |   4 +-
 frame/contracts/src/wasm/prepare.rs        |  28 +--
 frame/contracts/src/wasm/runtime.rs        | 215 +++++++++------------
 5 files changed, 146 insertions(+), 156 deletions(-)

diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index f0200fbd15fd..a3c2c914cb87 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -378,6 +378,14 @@ decl_error! {
 		/// on the call stack. Those actions are contract self destruction and restoration
 		/// of a tombstone.
 		ReentranceDenied,
+		/// `seal_input` was called twice from the same contract execution context.
+		InputAlreadyRead,
+		/// The subject passed to `seal_random` exceeds the limit.
+		RandomSubjectTooLong,
+		/// The amount of topics passed to `seal_deposit_events` exceeds the limit.
+		TooManyTopics,
+		/// The topics passed to `seal_deposit_events` contains at least one duplicate.
+		DuplicateTopics,
 	}
 }
 
diff --git a/frame/contracts/src/wasm/env_def/macros.rs b/frame/contracts/src/wasm/env_def/macros.rs
index cc61deb074b7..e49014ed950d 100644
--- a/frame/contracts/src/wasm/env_def/macros.rs
+++ b/frame/contracts/src/wasm/env_def/macros.rs
@@ -96,7 +96,7 @@ macro_rules! unmarshall_then_body {
 #[inline(always)]
 pub fn constrain_closure<R, F>(f: F) -> F
 where
-	F: FnOnce() -> Result<R, sp_sandbox::HostError>,
+	F: FnOnce() -> Result<R, crate::wasm::runtime::TrapReason>,
 {
 	f
 }
@@ -109,14 +109,20 @@ macro_rules! unmarshall_then_body_then_marshall {
 		>(|| {
 			unmarshall_then_body!($body, $ctx, $args_iter, $( $names : $params ),*)
 		});
-		let r = body()?;
+		let r = body().map_err(|reason| {
+			$ctx.set_trap_reason(reason);
+			sp_sandbox::HostError
+		})?;
 		return Ok(sp_sandbox::ReturnValue::Value({ use $crate::wasm::env_def::ConvertibleToWasm; r.to_typed_value() }))
 	});
 	( $args_iter:ident, $ctx:ident, ( $( $names:ident : $params:ty ),* ) => $body:tt ) => ({
 		let body = $crate::wasm::env_def::macros::constrain_closure::<(), _>(|| {
 			unmarshall_then_body!($body, $ctx, $args_iter, $( $names : $params ),*)
 		});
-		body()?;
+		body().map_err(|reason| {
+			$ctx.set_trap_reason(reason);
+			sp_sandbox::HostError
+		})?;
 		return Ok(sp_sandbox::ReturnValue::Unit)
 	})
 }
@@ -207,15 +213,24 @@ mod tests {
 	use parity_wasm::elements::ValueType;
 	use sp_runtime::traits::Zero;
 	use sp_sandbox::{ReturnValue, Value};
-	use crate::wasm::tests::MockExt;
-	use crate::wasm::Runtime;
-	use crate::exec::Ext;
-	use crate::gas::Gas;
+	use crate::{
+		wasm::{Runtime, runtime::TrapReason, tests::MockExt},
+		exec::Ext,
+		gas::Gas,
+	};
+
+	struct TestRuntime {
+		value: u32,
+	}
+
+	impl TestRuntime {
+		fn set_trap_reason(&mut self, _reason: TrapReason) {}
+	}
 
 	#[test]
 	fn macro_unmarshall_then_body_then_marshall_value_or_trap() {
 		fn test_value(
-			_ctx: &mut u32,
+			_ctx: &mut TestRuntime,
 			args: &[sp_sandbox::Value],
 		) -> Result<ReturnValue, sp_sandbox::HostError> {
 			let mut args = args.iter();
@@ -224,7 +239,7 @@ mod tests {
 				_ctx,
 				(a: u32, b: u32) -> u32 => {
 					if b == 0 {
-						Err(sp_sandbox::HostError)
+						Err(crate::wasm::runtime::TrapReason::Termination)
 					} else {
 						Ok(a / b)
 					}
@@ -232,7 +247,7 @@ mod tests {
 			)
 		}
 
-		let ctx = &mut 0;
+		let ctx = &mut TestRuntime { value: 0 };
 		assert_eq!(
 			test_value(ctx, &[Value::I32(15), Value::I32(3)]).unwrap(),
 			ReturnValue::Value(Value::I32(5)),
@@ -243,7 +258,7 @@ mod tests {
 	#[test]
 	fn macro_unmarshall_then_body_then_marshall_unit() {
 		fn test_unit(
-			ctx: &mut u32,
+			ctx: &mut TestRuntime,
 			args: &[sp_sandbox::Value],
 		) -> Result<ReturnValue, sp_sandbox::HostError> {
 			let mut args = args.iter();
@@ -251,16 +266,16 @@ mod tests {
 				args,
 				ctx,
 				(a: u32, b: u32) => {
-					*ctx = a + b;
+					ctx.value = a + b;
 					Ok(())
 				}
 			)
 		}
 
-		let ctx = &mut 0;
+		let ctx = &mut TestRuntime { value: 0 };
 		let result = test_unit(ctx, &[Value::I32(2), Value::I32(3)]).unwrap();
 		assert_eq!(result, ReturnValue::Unit);
-		assert_eq!(*ctx, 5);
+		assert_eq!(ctx.value, 5);
 	}
 
 	#[test]
@@ -270,7 +285,7 @@ mod tests {
 			if !amount.is_zero() {
 				Ok(())
 			} else {
-				Err(sp_sandbox::HostError)
+				Err(TrapReason::Termination)
 			}
 		});
 		let _f: fn(&mut Runtime<MockExt>, &[sp_sandbox::Value])
@@ -322,7 +337,7 @@ mod tests {
 				if !amount.is_zero() {
 					Ok(())
 				} else {
-					Err(sp_sandbox::HostError)
+					Err(crate::wasm::runtime::TrapReason::Termination)
 				}
 			},
 		);
diff --git a/frame/contracts/src/wasm/mod.rs b/frame/contracts/src/wasm/mod.rs
index 7d7668d5ec6d..a10e087cde83 100644
--- a/frame/contracts/src/wasm/mod.rs
+++ b/frame/contracts/src/wasm/mod.rs
@@ -1537,7 +1537,7 @@ mod tests {
 				&mut gas_meter
 			),
 			Err(ExecError {
-				error: Error::<Test>::ContractTrapped.into(),
+				error: Error::<Test>::TooManyTopics.into(),
 				origin: ErrorOrigin::Caller,
 			})
 		);
@@ -1582,7 +1582,7 @@ mod tests {
 				&mut gas_meter
 			),
 			Err(ExecError {
-				error: Error::<Test>::ContractTrapped.into(),
+				error: Error::<Test>::DuplicateTopics.into(),
 				origin: ErrorOrigin::Caller,
 			})
 		);
diff --git a/frame/contracts/src/wasm/prepare.rs b/frame/contracts/src/wasm/prepare.rs
index 56e21d2ee664..070e68bc4758 100644
--- a/frame/contracts/src/wasm/prepare.rs
+++ b/frame/contracts/src/wasm/prepare.rs
@@ -491,18 +491,24 @@ mod tests {
 		}
 	}
 
-	// Define test environment for tests. We need ImportSatisfyCheck
-	// implementation from it. So actual implementations doesn't matter.
-	define_env!(TestEnv, <E: Ext>,
-		panic(_ctx) => { unreachable!(); },
+	/// Using unreachable statements triggers unreachable warnings in the generated code
+	#[allow(unreachable_code)]
+	mod env {
+		use super::*;
 
-		// gas is an implementation defined function and a contract can't import it.
-		gas(_ctx, _amount: u32) => { unreachable!(); },
+		// Define test environment for tests. We need ImportSatisfyCheck
+		// implementation from it. So actual implementations doesn't matter.
+		define_env!(Test, <E: Ext>,
+			panic(_ctx) => { unreachable!(); },
 
-		nop(_ctx, _unused: u64) => { unreachable!(); },
+			// gas is an implementation defined function and a contract can't import it.
+			gas(_ctx, _amount: u32) => { unreachable!(); },
 
-		seal_println(_ctx, _ptr: u32, _len: u32) => { unreachable!(); },
-	);
+			nop(_ctx, _unused: u64) => { unreachable!(); },
+
+			seal_println(_ctx, _ptr: u32, _len: u32) => { unreachable!(); },
+		);
+	}
 
 	macro_rules! prepare_test {
 		($name:ident, $wat:expr, $($expected:tt)*) => {
@@ -520,7 +526,7 @@ mod tests {
 					},
 					.. Default::default()
 				};
-				let r = prepare_contract::<TestEnv, crate::tests::Test>(wasm.as_ref(), &schedule);
+				let r = prepare_contract::<env::Test, crate::tests::Test>(wasm.as_ref(), &schedule);
 				assert_matches!(r, $($expected)*);
 			}
 		};
@@ -931,7 +937,7 @@ mod tests {
 			).unwrap();
 			let mut schedule = Schedule::default();
 			schedule.enable_println = true;
-			let r = prepare_contract::<TestEnv, crate::tests::Test>(wasm.as_ref(), &schedule);
+			let r = prepare_contract::<env::Test, crate::tests::Test>(wasm.as_ref(), &schedule);
 			assert_matches!(r, Ok(_));
 		}
 	}
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index ac1cb1f54d56..c4365e2cb0f5 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -90,7 +90,7 @@ impl From<ExecReturnValue> for ReturnCode {
 }
 
 /// The data passed through when a contract uses `seal_return`.
-struct ReturnData {
+pub struct ReturnData {
 	/// The flags as passed through by the contract. They are still unchecked and
 	/// will later be parsed into a `ReturnFlags` bitflags struct.
 	flags: u32,
@@ -104,7 +104,7 @@ struct ReturnData {
 /// occurred (the SupervisorError variant).
 /// The other case is where the trap does not constitute an error but rather was invoked
 /// as a quick way to terminate the application (all other variants).
-enum TrapReason {
+pub enum TrapReason {
 	/// The supervisor trapped the contract because of an error condition occurred during
 	/// execution in privileged code.
 	SupervisorError(DispatchError),
@@ -117,9 +117,15 @@ enum TrapReason {
 	Restoration,
 }
 
+impl<T: Into<DispatchError>> From<T> for TrapReason {
+	fn from(from: T) -> Self {
+		Self::SupervisorError(from.into())
+	}
+}
+
 #[cfg_attr(test, derive(Debug, PartialEq, Eq))]
 #[derive(Copy, Clone)]
-pub enum RuntimeToken {
+enum RuntimeToken {
 	/// Charge the gas meter with the cost of a metering block. The charged costs are
 	/// the supplied cost of the block plus the overhead of the metering itself.
 	MeteringBlock(u32),
@@ -369,21 +375,25 @@ where
 		}
 	}
 
+	/// Store the reason for a host function triggered trap.
+	///
+	/// This is called by the `define_env` macro in order to store any error returned by
+	/// the host functions defined through the said macro. It should **not** be called
+	/// manually.
+	pub fn set_trap_reason(&mut self, reason: TrapReason) {
+		self.trap_reason = Some(reason);
+	}
+
 	/// Charge the gas meter with the specified token.
 	///
 	/// Returns `Err(HostError)` if there is not enough gas.
-	fn charge_gas<Tok>(&mut self, token: Tok) -> Result<(), sp_sandbox::HostError>
+	fn charge_gas<Tok>(&mut self, token: Tok) -> Result<(), DispatchError>
 	where
 		Tok: Token<E::T, Metadata=HostFnWeights<E::T>>,
 	{
 		match self.gas_meter.charge(&self.schedule.host_fn_weights, token) {
 			GasMeterResult::Proceed => Ok(()),
-			GasMeterResult::OutOfGas =>  {
-				self.trap_reason = Some(
-					TrapReason::SupervisorError(Error::<E::T>::OutOfGas.into())
-				);
-				Err(sp_sandbox::HostError)
-			},
+			GasMeterResult::OutOfGas => Err(Error::<E::T>::OutOfGas.into())
 		}
 	}
 
@@ -392,12 +402,12 @@ where
 	/// Returns `Err` if one of the following conditions occurs:
 	///
 	/// - requested buffer is not within the bounds of the sandbox memory.
-	fn read_sandbox_memory(&mut self, ptr: u32, len: u32)
-	-> Result<Vec<u8>, sp_sandbox::HostError>
+	fn read_sandbox_memory(&self, ptr: u32, len: u32)
+	-> Result<Vec<u8>, DispatchError>
 	{
 		let mut buf = vec![0u8; len as usize];
 		self.memory.get(ptr, buf.as_mut_slice())
-			.map_err(|_| self.store_err(Error::<E::T>::OutOfBounds))?;
+			.map_err(|_| Error::<E::T>::OutOfBounds)?;
 		Ok(buf)
 	}
 
@@ -406,10 +416,10 @@ where
 	/// Returns `Err` if one of the following conditions occurs:
 	///
 	/// - requested buffer is not within the bounds of the sandbox memory.
-	fn read_sandbox_memory_into_buf(&mut self, ptr: u32, buf: &mut [u8])
-	-> Result<(), sp_sandbox::HostError>
+	fn read_sandbox_memory_into_buf(&self, ptr: u32, buf: &mut [u8])
+	-> Result<(), DispatchError>
 	{
-		self.memory.get(ptr, buf).map_err(|_| self.store_err(Error::<E::T>::OutOfBounds))
+		self.memory.get(ptr, buf).map_err(|_| Error::<E::T>::OutOfBounds.into())
 	}
 
 	/// Read designated chunk from the sandbox memory and attempt to decode into the specified type.
@@ -418,11 +428,11 @@ where
 	///
 	/// - requested buffer is not within the bounds of the sandbox memory.
 	/// - the buffer contents cannot be decoded as the required type.
-	fn read_sandbox_memory_as<D: Decode>(&mut self, ptr: u32, len: u32)
-	-> Result<D, sp_sandbox::HostError>
+	fn read_sandbox_memory_as<D: Decode>(&self, ptr: u32, len: u32)
+	-> Result<D, DispatchError>
 	{
 		let buf = self.read_sandbox_memory(ptr, len)?;
-		D::decode(&mut &buf[..]).map_err(|_| self.store_err(Error::<E::T>::DecodingFailed))
+		D::decode(&mut &buf[..]).map_err(|_| Error::<E::T>::DecodingFailed.into())
 	}
 
 	/// Write the given buffer to the designated location in the sandbox memory.
@@ -430,8 +440,8 @@ where
 	/// Returns `Err` if one of the following conditions occurs:
 	///
 	/// - designated area is not within the bounds of the sandbox memory.
-	fn write_sandbox_memory(&mut self, ptr: u32, buf: &[u8]) -> Result<(), sp_sandbox::HostError> {
-		self.memory.set(ptr, buf).map_err(|_| self.store_err(Error::<E::T>::OutOfBounds))
+	fn write_sandbox_memory(&mut self, ptr: u32, buf: &[u8]) -> Result<(), DispatchError> {
+		self.memory.set(ptr, buf).map_err(|_| Error::<E::T>::OutOfBounds.into())
 	}
 
 	/// Write the given buffer and its length to the designated locations in sandbox memory and
@@ -460,7 +470,7 @@ where
 		buf: &[u8],
 		allow_skip: bool,
 		create_token: impl FnOnce(u32) -> Option<RuntimeToken>,
-	) -> Result<(), sp_sandbox::HostError>
+	) -> Result<(), DispatchError>
 	{
 		if allow_skip && out_ptr == u32::max_value() {
 			return Ok(());
@@ -470,7 +480,7 @@ where
 		let len: u32 = self.read_sandbox_memory_as(out_len_ptr, 4)?;
 
 		if len < buf_len {
-			Err(self.store_err(Error::<E::T>::OutputBufferTooSmall))?
+			Err(Error::<E::T>::OutputBufferTooSmall)?
 		}
 
 		if let Some(token) = create_token(buf_len) {
@@ -480,7 +490,7 @@ where
 		self.memory.set(out_ptr, buf).and_then(|_| {
 			self.memory.set(out_len_ptr, &buf_len.encode())
 		})
-		.map_err(|_| self.store_err(Error::<E::T>::OutOfBounds))?;
+		.map_err(|_| Error::<E::T>::OutOfBounds)?;
 
 		Ok(())
 	}
@@ -503,7 +513,7 @@ where
 		input_ptr: u32,
 		input_len: u32,
 		output_ptr: u32,
-	) -> Result<(), sp_sandbox::HostError>
+	) -> Result<(), DispatchError>
 	where
 		F: FnOnce(&[u8]) -> R,
 		R: AsRef<[u8]>,
@@ -517,48 +527,6 @@ where
 		Ok(())
 	}
 
-	/// Stores a DispatchError returned from an Ext function into the trap_reason.
-	///
-	/// This allows through supervisor generated errors to the caller.
-	fn store_err<Error>(&mut self, err: Error) -> sp_sandbox::HostError
-	where
-		Error: Into<DispatchError>,
-	{
-		self.trap_reason = Some(TrapReason::SupervisorError(err.into()));
-		sp_sandbox::HostError
-	}
-
-	/// Used by Runtime API that calls into other contracts.
-	///
-	/// Those need to transform the the `ExecResult` returned from the execution into
-	/// a `ReturnCode`. If this conversion fails because the `ExecResult` constitutes a
-	/// a fatal error then this error is stored in the `ExecutionContext` so it can be
-	/// extracted for display in the UI.
-	fn map_exec_result(&mut self, result: ExecResult) -> Result<ReturnCode, sp_sandbox::HostError> {
-		match Self::exec_into_return_code(result) {
-			Ok(code) => Ok(code),
-			Err(err) => Err(self.store_err(err)),
-		}
-	}
-
-	/// Try to convert an error into a `ReturnCode`.
-	///
-	/// Used to decide between fatal and non-fatal errors.
-	fn map_dispatch_result<T>(&mut self, result: Result<T, DispatchError>)
-	-> Result<ReturnCode, sp_sandbox::HostError>
-	{
-		let err = if let Err(err) = result {
-			err
-		} else {
-			return Ok(ReturnCode::Success)
-		};
-
-		match Self::err_into_return_code(err) {
-			Ok(code) => Ok(code),
-			Err(err) => Err(self.store_err(err)),
-		}
-	}
-
 	/// Fallible conversion of `DispatchError` to `ReturnCode`.
 	fn err_into_return_code(from: DispatchError) -> Result<ReturnCode, DispatchError> {
 		use ReturnCode::*;
@@ -638,7 +606,7 @@ define_env!(Env, <E: Ext>,
 	seal_set_storage(ctx, key_ptr: u32, value_ptr: u32, value_len: u32) => {
 		ctx.charge_gas(RuntimeToken::SetStorage(value_len))?;
 		if value_len > ctx.ext.max_value_size() {
-			Err(ctx.store_err(Error::<E::T>::ValueTooLarge))?;
+			Err(Error::<E::T>::ValueTooLarge)?;
 		}
 		let mut key: StorageKey = [0; 32];
 		ctx.read_sandbox_memory_into_buf(key_ptr, &mut key)?;
@@ -715,7 +683,13 @@ define_env!(Env, <E: Ext>,
 			ctx.read_sandbox_memory_as(value_ptr, value_len)?;
 
 		let result = ctx.ext.transfer(&callee, value);
-		ctx.map_dispatch_result(result)
+		match result {
+			Ok(()) => Ok(ReturnCode::Success),
+			Err(err) => {
+				let code = Runtime::<E>::err_into_return_code(err)?;
+				Ok(code)
+			}
+		}
 	},
 
 	// Make a call to another contract.
@@ -797,7 +771,7 @@ define_env!(Env, <E: Ext>,
 				Some(RuntimeToken::CallCopyOut(len))
 			})?;
 		}
-		ctx.map_exec_result(call_outcome)
+		Ok(Runtime::<E>::exec_into_return_code(call_outcome)?)
 	},
 
 	// Instantiate a contract with the specified code hash.
@@ -899,7 +873,7 @@ define_env!(Env, <E: Ext>,
 				Some(RuntimeToken::InstantiateCopyOut(len))
 			})?;
 		}
-		ctx.map_exec_result(instantiate_outcome.map(|(_id, retval)| retval))
+		Ok(Runtime::<E>::exec_into_return_code(instantiate_outcome.map(|(_id, retval)| retval))?)
 	},
 
 	// Remove the calling account and transfer remaining balance.
@@ -925,10 +899,8 @@ define_env!(Env, <E: Ext>,
 		let beneficiary: <<E as Ext>::T as frame_system::Config>::AccountId =
 			ctx.read_sandbox_memory_as(beneficiary_ptr, beneficiary_len)?;
 
-		if let Ok(_) = ctx.ext.terminate(&beneficiary).map_err(|e| ctx.store_err(e)) {
-			ctx.trap_reason = Some(TrapReason::Termination);
-		}
-		Err(sp_sandbox::HostError)
+		ctx.ext.terminate(&beneficiary)?;
+		Err(TrapReason::Termination)
 	},
 
 	seal_input(ctx, buf_ptr: u32, buf_len_ptr: u32) => {
@@ -936,9 +908,10 @@ define_env!(Env, <E: Ext>,
 		if let Some(input) = ctx.input_data.take() {
 			ctx.write_sandbox_output(buf_ptr, buf_len_ptr, &input, false, |len| {
 				Some(RuntimeToken::InputCopyOut(len))
-			})
+			})?;
+			Ok(())
 		} else {
-			Err(sp_sandbox::HostError)
+			Err(Error::<E::T>::InputAlreadyRead.into())
 		}
 	},
 
@@ -961,15 +934,10 @@ define_env!(Env, <E: Ext>,
 	// Using a reserved bit triggers a trap.
 	seal_return(ctx, flags: u32, data_ptr: u32, data_len: u32) => {
 		ctx.charge_gas(RuntimeToken::Return(data_len))?;
-		ctx.trap_reason = Some(TrapReason::Return(ReturnData {
+		Err(TrapReason::Return(ReturnData {
 			flags,
 			data: ctx.read_sandbox_memory(data_ptr, data_len)?,
-		}));
-
-		// The trap mechanism is used to immediately terminate the execution.
-		// This trap should be handled appropriately before returning the result
-		// to the user of this crate.
-		Err(sp_sandbox::HostError)
+		}))
 	},
 
 	// Stores the address of the caller into the supplied buffer.
@@ -984,9 +952,9 @@ define_env!(Env, <E: Ext>,
 	// address of the contract will be returned. The value is encoded as T::AccountId.
 	seal_caller(ctx, out_ptr: u32, out_len_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::Caller)?;
-		ctx.write_sandbox_output(
+		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.ext.caller().encode(), false, already_charged
-		)
+		)?)
 	},
 
 	// Stores the address of the current contract into the supplied buffer.
@@ -997,9 +965,9 @@ define_env!(Env, <E: Ext>,
 	// space at `out_ptr` is less than the size of the value a trap is triggered.
 	seal_address(ctx, out_ptr: u32, out_len_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::Address)?;
-		ctx.write_sandbox_output(
+		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.ext.address().encode(), false, already_charged
-		)
+		)?)
 	},
 
 	// Stores the price for the specified amount of gas into the supplied buffer.
@@ -1017,9 +985,9 @@ define_env!(Env, <E: Ext>,
 	// gas can be smaller than one.
 	seal_weight_to_fee(ctx, gas: u64, out_ptr: u32, out_len_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::WeightToFee)?;
-		ctx.write_sandbox_output(
+		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.ext.get_weight_price(gas).encode(), false, already_charged
-		)
+		)?)
 	},
 
 	// Stores the amount of gas left into the supplied buffer.
@@ -1032,9 +1000,9 @@ define_env!(Env, <E: Ext>,
 	// The data is encoded as Gas.
 	seal_gas_left(ctx, out_ptr: u32, out_len_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::GasLeft)?;
-		ctx.write_sandbox_output(
+		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.gas_meter.gas_left().encode(), false, already_charged
-		)
+		)?)
 	},
 
 	// Stores the balance of the current account into the supplied buffer.
@@ -1047,9 +1015,9 @@ define_env!(Env, <E: Ext>,
 	// The data is encoded as T::Balance.
 	seal_balance(ctx, out_ptr: u32, out_len_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::Balance)?;
-		ctx.write_sandbox_output(
+		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.ext.balance().encode(), false, already_charged
-		)
+		)?)
 	},
 
 	// Stores the value transferred along with this call or as endowment into the supplied buffer.
@@ -1062,9 +1030,9 @@ define_env!(Env, <E: Ext>,
 	// The data is encoded as T::Balance.
 	seal_value_transferred(ctx, out_ptr: u32, out_len_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::ValueTransferred)?;
-		ctx.write_sandbox_output(
+		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.ext.value_transferred().encode(), false, already_charged
-		)
+		)?)
 	},
 
 	// Stores a random number for the current block and the given subject into the supplied buffer.
@@ -1078,12 +1046,12 @@ define_env!(Env, <E: Ext>,
 	seal_random(ctx, subject_ptr: u32, subject_len: u32, out_ptr: u32, out_len_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::Random)?;
 		if subject_len > ctx.schedule.limits.subject_len {
-			return Err(sp_sandbox::HostError);
+			Err(Error::<E::T>::RandomSubjectTooLong)?;
 		}
 		let subject_buf = ctx.read_sandbox_memory(subject_ptr, subject_len)?;
-		ctx.write_sandbox_output(
+		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.ext.random(&subject_buf).encode(), false, already_charged
-		)
+		)?)
 	},
 
 	// Load the latest block timestamp into the supplied buffer
@@ -1094,9 +1062,9 @@ define_env!(Env, <E: Ext>,
 	// space at `out_ptr` is less than the size of the value a trap is triggered.
 	seal_now(ctx, out_ptr: u32, out_len_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::Now)?;
-		ctx.write_sandbox_output(
+		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.ext.now().encode(), false, already_charged
-		)
+		)?)
 	},
 
 	// Stores the minimum balance (a.k.a. existential deposit) into the supplied buffer.
@@ -1104,9 +1072,9 @@ define_env!(Env, <E: Ext>,
 	// The data is encoded as T::Balance.
 	seal_minimum_balance(ctx, out_ptr: u32, out_len_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::MinimumBalance)?;
-		ctx.write_sandbox_output(
+		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.ext.minimum_balance().encode(), false, already_charged
-		)
+		)?)
 	},
 
 	// Stores the tombstone deposit into the supplied buffer.
@@ -1126,9 +1094,9 @@ define_env!(Env, <E: Ext>,
 	// is commonly referred as subsistence threshold in code.
 	seal_tombstone_deposit(ctx, out_ptr: u32, out_len_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::TombstoneDeposit)?;
-		ctx.write_sandbox_output(
+		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.ext.tombstone_deposit().encode(), false, already_charged
-		)
+		)?)
 	},
 
 	// Try to restore the given destination contract sacrificing the caller.
@@ -1189,21 +1157,14 @@ define_env!(Env, <E: Ext>,
 				delta.push(delta_key);
 
 				// Offset key_ptr to the next element.
-				key_ptr = key_ptr.checked_add(KEY_SIZE as u32).ok_or_else(|| sp_sandbox::HostError)?;
+				key_ptr = key_ptr.checked_add(KEY_SIZE as u32).ok_or(Error::<E::T>::OutOfBounds)?;
 			}
 
 			delta
 		};
 
-		if let Ok(()) = ctx.ext.restore_to(
-			dest,
-			code_hash,
-			rent_allowance,
-			delta,
-		).map_err(|e| ctx.store_err(e)) {
-			ctx.trap_reason = Some(TrapReason::Restoration);
-		}
-		Err(sp_sandbox::HostError)
+		ctx.ext.restore_to(dest, code_hash, rent_allowance, delta)?;
+		Err(TrapReason::Restoration)
 	},
 
 	// Deposit a contract event with the data buffer and optional list of topics. There is a limit
@@ -1217,13 +1178,13 @@ define_env!(Env, <E: Ext>,
 	seal_deposit_event(ctx, topics_ptr: u32, topics_len: u32, data_ptr: u32, data_len: u32) => {
 		let num_topic = topics_len
 			.checked_div(sp_std::mem::size_of::<TopicOf<E::T>>() as u32)
-			.ok_or_else(|| ctx.store_err("Zero sized topics are not allowed"))?;
+			.ok_or_else(|| "Zero sized topics are not allowed")?;
 		ctx.charge_gas(RuntimeToken::DepositEvent {
 			num_topic,
 			len: data_len,
 		})?;
 		if data_len > ctx.ext.max_value_size() {
-			Err(ctx.store_err(Error::<E::T>::ValueTooLarge))?;
+			Err(Error::<E::T>::ValueTooLarge)?;
 		}
 
 		let mut topics: Vec::<TopicOf<<E as Ext>::T>> = match topics_len {
@@ -1233,12 +1194,12 @@ define_env!(Env, <E: Ext>,
 
 		// If there are more than `event_topics`, then trap.
 		if topics.len() > ctx.schedule.limits.event_topics as usize {
-			return Err(sp_sandbox::HostError);
+			Err(Error::<E::T>::TooManyTopics)?;
 		}
 
 		// Check for duplicate topics. If there are any, then trap.
 		if has_duplicates(&mut topics) {
-			return Err(sp_sandbox::HostError);
+			Err(Error::<E::T>::DuplicateTopics)?;
 		}
 
 		let event_data = ctx.read_sandbox_memory(data_ptr, data_len)?;
@@ -1272,9 +1233,9 @@ define_env!(Env, <E: Ext>,
 	// The data is encoded as T::Balance.
 	seal_rent_allowance(ctx, out_ptr: u32, out_len_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::RentAllowance)?;
-		ctx.write_sandbox_output(
+		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.ext.rent_allowance().encode(), false, already_charged
-		)
+		)?)
 	},
 
 	// Prints utf8 encoded string from the data buffer.
@@ -1296,9 +1257,9 @@ define_env!(Env, <E: Ext>,
 	// space at `out_ptr` is less than the size of the value a trap is triggered.
 	seal_block_number(ctx, out_ptr: u32, out_len_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::BlockNumber)?;
-		ctx.write_sandbox_output(
+		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.ext.block_number().encode(), false, already_charged
-		)
+		)?)
 	},
 
 	// Computes the SHA2 256-bit hash on the given input buffer.
@@ -1323,7 +1284,7 @@ define_env!(Env, <E: Ext>,
 	//                 directly into this buffer.
 	seal_hash_sha2_256(ctx, input_ptr: u32, input_len: u32, output_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::HashSha256(input_len))?;
-		ctx.compute_hash_on_intermediate_buffer(sha2_256, input_ptr, input_len, output_ptr)
+		Ok(ctx.compute_hash_on_intermediate_buffer(sha2_256, input_ptr, input_len, output_ptr)?)
 	},
 
 	// Computes the KECCAK 256-bit hash on the given input buffer.
@@ -1348,7 +1309,7 @@ define_env!(Env, <E: Ext>,
 	//                 directly into this buffer.
 	seal_hash_keccak_256(ctx, input_ptr: u32, input_len: u32, output_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::HashKeccak256(input_len))?;
-		ctx.compute_hash_on_intermediate_buffer(keccak_256, input_ptr, input_len, output_ptr)
+		Ok(ctx.compute_hash_on_intermediate_buffer(keccak_256, input_ptr, input_len, output_ptr)?)
 	},
 
 	// Computes the BLAKE2 256-bit hash on the given input buffer.
@@ -1373,7 +1334,7 @@ define_env!(Env, <E: Ext>,
 	//                 directly into this buffer.
 	seal_hash_blake2_256(ctx, input_ptr: u32, input_len: u32, output_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::HashBlake256(input_len))?;
-		ctx.compute_hash_on_intermediate_buffer(blake2_256, input_ptr, input_len, output_ptr)
+		Ok(ctx.compute_hash_on_intermediate_buffer(blake2_256, input_ptr, input_len, output_ptr)?)
 	},
 
 	// Computes the BLAKE2 128-bit hash on the given input buffer.
@@ -1398,6 +1359,6 @@ define_env!(Env, <E: Ext>,
 	//                 directly into this buffer.
 	seal_hash_blake2_128(ctx, input_ptr: u32, input_len: u32, output_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::HashBlake128(input_len))?;
-		ctx.compute_hash_on_intermediate_buffer(blake2_128, input_ptr, input_len, output_ptr)
+		Ok(ctx.compute_hash_on_intermediate_buffer(blake2_128, input_ptr, input_len, output_ptr)?)
 	},
 );

From 7c9f9a5a2772565056943552a18088e3772a05c8 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Tue, 29 Dec 2020 14:39:04 +0100
Subject: [PATCH 0208/1194] Hex Balance deserialize for contracts_call RPC
 (#7807)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Hex Balance deserialize for contracts_call RPC

* Avoid temporary conversion into u128

Co-authored-by: Alexander Theißen <alex.theissen@me.com>
---
 frame/contracts/rpc/src/lib.rs | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/frame/contracts/rpc/src/lib.rs b/frame/contracts/rpc/src/lib.rs
index 6d43ea75c035..a44ba769e96d 100644
--- a/frame/contracts/rpc/src/lib.rs
+++ b/frame/contracts/rpc/src/lib.rs
@@ -33,7 +33,7 @@ use sp_runtime::{
 	traits::{Block as BlockT, Header as HeaderT},
 	DispatchError,
 };
-use std::convert::TryInto;
+use std::convert::{TryFrom, TryInto};
 use pallet_contracts_primitives::ContractExecResult;
 
 pub use pallet_contracts_rpc_runtime_api::ContractsApi as ContractsRuntimeApi;
@@ -76,10 +76,10 @@ impl From<ContractAccessError> for Error {
 #[derive(Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 #[serde(deny_unknown_fields)]
-pub struct CallRequest<AccountId, Balance> {
+pub struct CallRequest<AccountId> {
 	origin: AccountId,
 	dest: AccountId,
-	value: Balance,
+	value: number::NumberOrHex,
 	gas_limit: number::NumberOrHex,
 	input_data: Bytes,
 }
@@ -141,7 +141,7 @@ pub trait ContractsApi<BlockHash, BlockNumber, AccountId, Balance> {
 	#[rpc(name = "contracts_call")]
 	fn call(
 		&self,
-		call_request: CallRequest<AccountId, Balance>,
+		call_request: CallRequest<AccountId>,
 		at: Option<BlockHash>,
 	) -> Result<RpcContractExecResult>;
 
@@ -201,11 +201,11 @@ where
 		<<Block as BlockT>::Header as HeaderT>::Number,
 	>,
 	AccountId: Codec,
-	Balance: Codec,
+	Balance: Codec + TryFrom<number::NumberOrHex>,
 {
 	fn call(
 		&self,
-		call_request: CallRequest<AccountId, Balance>,
+		call_request: CallRequest<AccountId>,
 		at: Option<<Block as BlockT>::Hash>,
 	) -> Result<RpcContractExecResult> {
 		let api = self.client.runtime_api();
@@ -221,6 +221,13 @@ where
 			input_data,
 		} = call_request;
 
+		// Make sure that value fits into the balance type.
+		let value: Balance = value.try_into().map_err(|_| Error {
+			code: ErrorCode::InvalidParams,
+			message: format!("{:?} doesn't fit into the balance type", value),
+			data: None,
+		})?;
+
 		// Make sure that gas_limit fits into 64 bits.
 		let gas_limit: u64 = gas_limit.try_into().map_err(|_| Error {
 			code: ErrorCode::InvalidParams,
@@ -305,17 +312,18 @@ mod tests {
 
 	#[test]
 	fn call_request_should_serialize_deserialize_properly() {
-		type Req = CallRequest<String, u128>;
+		type Req = CallRequest<String>;
 		let req: Req = serde_json::from_str(r#"
 		{
 			"origin": "5CiPPseXPECbkjWCa6MnjNokrgYjMqmKndv2rSnekmSK2DjL",
 			"dest": "5DRakbLVnjVrW6niwLfHGW24EeCEvDAFGEXrtaYS5M4ynoom",
-			"value": 0,
+			"value": "0x112210f4B16c1cb1",
 			"gasLimit": 1000000000000,
 			"inputData": "0x8c97db39"
 		}
 		"#).unwrap();
 		assert_eq!(req.gas_limit.into_u256(), U256::from(0xe8d4a51000u64));
+		assert_eq!(req.value.into_u256(), U256::from(1234567890987654321u128));
 	}
 
 	#[test]

From 5d5a3b8b96643fa6b5ce2acb9639fe3ce8f82d65 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Tue, 29 Dec 2020 13:31:44 -0400
Subject: [PATCH 0209/1194] Don't allow self proxies (#7803)

---
 frame/proxy/src/lib.rs   | 3 +++
 frame/proxy/src/tests.rs | 1 +
 2 files changed, 4 insertions(+)

diff --git a/frame/proxy/src/lib.rs b/frame/proxy/src/lib.rs
index 6342f0c052b8..93f1d8e80d5c 100644
--- a/frame/proxy/src/lib.rs
+++ b/frame/proxy/src/lib.rs
@@ -168,6 +168,8 @@ decl_error! {
 		NoPermission,
 		/// Announcement, if made at all, was made too recently.
 		Unannounced,
+		/// Cannot add self as proxy.
+		NoSelfProxy,
 	}
 }
 
@@ -567,6 +569,7 @@ impl<T: Config> Module<T> {
 		proxy_type: T::ProxyType,
 		delay: T::BlockNumber,
 	) -> DispatchResult {
+		ensure!(delegator != &delegatee, Error::<T>::NoSelfProxy);
 		Proxies::<T>::try_mutate(delegator, |(ref mut proxies, ref mut deposit)| {
 			ensure!(proxies.len() < T::MaxProxies::get() as usize, Error::<T>::TooMany);
 			let proxy_def = ProxyDefinition { delegate: delegatee, proxy_type, delay };
diff --git a/frame/proxy/src/tests.rs b/frame/proxy/src/tests.rs
index 082110523562..b1dca43b6a70 100644
--- a/frame/proxy/src/tests.rs
+++ b/frame/proxy/src/tests.rs
@@ -396,6 +396,7 @@ fn add_remove_proxies_works() {
 		assert_eq!(Balances::reserved_balance(1), 2);
 		assert_ok!(Proxy::remove_proxy(Origin::signed(1), 2, ProxyType::JustTransfer, 0));
 		assert_eq!(Balances::reserved_balance(1), 0);
+		assert_noop!(Proxy::add_proxy(Origin::signed(1), 1, ProxyType::Any, 0), Error::<Test>::NoSelfProxy);
 	});
 }
 

From f1d8be84f443b9c6198d8c788118e30ef6e2a646 Mon Sep 17 00:00:00 2001
From: RK <r.raajey@gmail.com>
Date: Wed, 30 Dec 2020 00:07:19 +0530
Subject: [PATCH 0210/1194] Allow council to slash treasury tip (#7753)

* wk2051 | D4 |Allow council to slash treasury tip | p1

* Update frame/tips/src/lib.rs

Co-authored-by: Xiliang Chen <xlchen1291@gmail.com>

* wk2051 | D5 |Allow council to slash treasury tip | p2

* wk2051 | D5 |Allow council to slash treasury tip | p3

* wk2051 | D5 |Allow council to slash treasury tip | p4

* wk2051 | D5 |Allow council to slash treasury tip | p5

* random change

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_tips --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/tips/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* fix typo

* Update frame/tips/src/lib.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Update frame/tips/src/lib.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Update frame/tips/src/lib.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Update frame/tips/src/lib.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Update frame/tips/src/tests.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* wk2052 | D1 | Allow council to slash treasury tip | p6

Co-authored-by: Xiliang Chen <xlchen1291@gmail.com>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
---
 frame/bounties/src/benchmarking.rs | 20 +++++------
 frame/tips/README.md               |  1 +
 frame/tips/src/benchmarking.rs     | 26 ++++++++++++--
 frame/tips/src/lib.rs              | 56 ++++++++++++++++--------------
 frame/tips/src/tests.rs            | 38 +++++++++++++++++---
 frame/tips/src/weights.rs          | 51 +++++++++++++++++----------
 frame/treasury/src/benchmarking.rs |  4 +--
 7 files changed, 133 insertions(+), 63 deletions(-)

diff --git a/frame/bounties/src/benchmarking.rs b/frame/bounties/src/benchmarking.rs
index 5a323ff0aafc..21f68b078191 100644
--- a/frame/bounties/src/benchmarking.rs
+++ b/frame/bounties/src/benchmarking.rs
@@ -77,7 +77,7 @@ fn create_bounty<T: Config>() -> Result<(
 	Ok((curator_lookup, bounty_id))
 }
 
-fn setup_pod_account<T: Config>() {
+fn setup_pot_account<T: Config>() {
 	let pot_account = Bounties::<T>::account_id();
 	let value = T::Currency::minimum_balance().saturating_mul(1_000_000_000u32.into());
 	let _ = T::Currency::make_free_balance_be(&pot_account, value);
@@ -109,7 +109,7 @@ benchmarks! {
 	}: _(RawOrigin::Root, bounty_id)
 
 	propose_curator {
-		setup_pod_account::<T>();
+		setup_pot_account::<T>();
 		let (caller, curator, fee, value, reason) = setup_bounty::<T>(0, MAX_BYTES);
 		let curator_lookup = T::Lookup::unlookup(curator.clone());
 		Bounties::<T>::propose_bounty(RawOrigin::Signed(caller).into(), value, reason)?;
@@ -120,7 +120,7 @@ benchmarks! {
 
 	// Worst case when curator is inactive and any sender unassigns the curator.
 	unassign_curator {
-		setup_pod_account::<T>();
+		setup_pot_account::<T>();
 		let (curator_lookup, bounty_id) = create_bounty::<T>()?;
 		Bounties::<T>::on_initialize(T::BlockNumber::zero());
 		let bounty_id = BountyCount::get() - 1;
@@ -129,7 +129,7 @@ benchmarks! {
 	}: _(RawOrigin::Signed(caller), bounty_id)
 
 	accept_curator {
-		setup_pod_account::<T>();
+		setup_pot_account::<T>();
 		let (caller, curator, fee, value, reason) = setup_bounty::<T>(0, MAX_BYTES);
 		let curator_lookup = T::Lookup::unlookup(curator.clone());
 		Bounties::<T>::propose_bounty(RawOrigin::Signed(caller).into(), value, reason)?;
@@ -140,7 +140,7 @@ benchmarks! {
 	}: _(RawOrigin::Signed(curator), bounty_id)
 
 	award_bounty {
-		setup_pod_account::<T>();
+		setup_pot_account::<T>();
 		let (curator_lookup, bounty_id) = create_bounty::<T>()?;
 		Bounties::<T>::on_initialize(T::BlockNumber::zero());
 
@@ -150,7 +150,7 @@ benchmarks! {
 	}: _(RawOrigin::Signed(curator), bounty_id, beneficiary)
 
 	claim_bounty {
-		setup_pod_account::<T>();
+		setup_pot_account::<T>();
 		let (curator_lookup, bounty_id) = create_bounty::<T>()?;
 		Bounties::<T>::on_initialize(T::BlockNumber::zero());
 
@@ -170,14 +170,14 @@ benchmarks! {
 	}
 
 	close_bounty_proposed {
-		setup_pod_account::<T>();
+		setup_pot_account::<T>();
 		let (caller, curator, fee, value, reason) = setup_bounty::<T>(0, 0);
 		Bounties::<T>::propose_bounty(RawOrigin::Signed(caller).into(), value, reason)?;
 		let bounty_id = BountyCount::get() - 1;
 	}: close_bounty(RawOrigin::Root, bounty_id)
 
 	close_bounty_active {
-		setup_pod_account::<T>();
+		setup_pot_account::<T>();
 		let (curator_lookup, bounty_id) = create_bounty::<T>()?;
 		Bounties::<T>::on_initialize(T::BlockNumber::zero());
 		let bounty_id = BountyCount::get() - 1;
@@ -187,7 +187,7 @@ benchmarks! {
 	}
 
 	extend_bounty_expiry {
-		setup_pod_account::<T>();
+		setup_pot_account::<T>();
 		let (curator_lookup, bounty_id) = create_bounty::<T>()?;
 		Bounties::<T>::on_initialize(T::BlockNumber::zero());
 
@@ -200,7 +200,7 @@ benchmarks! {
 
 	spend_funds {
 		let b in 1 .. 100;
-		setup_pod_account::<T>();
+		setup_pot_account::<T>();
 		create_approved_bounties::<T>(b)?;
 
 		let mut budget_remaining = BalanceOf::<T>::max_value();
diff --git a/frame/tips/README.md b/frame/tips/README.md
index 457e5b3bd0e7..36148e276edc 100644
--- a/frame/tips/README.md
+++ b/frame/tips/README.md
@@ -30,3 +30,4 @@ any finders fee, in case of a public (and bonded) original report.
 - `tip_new` - Report an item worthy of a tip and declare a specific amount to tip.
 - `tip` - Declare or redeclare an amount to tip for a particular reason.
 - `close_tip` - Close and pay out a tip.
+- `slash_tip` - Remove and slash an already-open tip.
\ No newline at end of file
diff --git a/frame/tips/src/benchmarking.rs b/frame/tips/src/benchmarking.rs
index 71f9002b9bf1..4f0338b9c5db 100644
--- a/frame/tips/src/benchmarking.rs
+++ b/frame/tips/src/benchmarking.rs
@@ -79,7 +79,7 @@ fn create_tips<T: Config>(t: u32, hash: T::Hash, value: BalanceOf<T>) ->
 	Ok(())
 }
 
-fn setup_pod_account<T: Config>() {
+fn setup_pot_account<T: Config>() {
 	let pot_account = TipsMod::<T>::account_id();
 	let value = T::Currency::minimum_balance().saturating_mul(1_000_000_000u32.into());
 	let _ = T::Currency::make_free_balance_be(&pot_account, value);
@@ -148,7 +148,7 @@ benchmarks! {
 		let t in 1 .. MAX_TIPPERS;
 
 		// Make sure pot is funded
-		setup_pod_account::<T>();
+		setup_pot_account::<T>();
 
 		// Set up a new tip proposal
 		let (member, reason, beneficiary, value) = setup_tip::<T>(0, t)?;
@@ -164,6 +164,7 @@ benchmarks! {
 		let reason_hash = T::Hashing::hash(&reason[..]);
 		let hash = T::Hashing::hash_of(&(&reason_hash, &beneficiary));
 		ensure!(Tips::<T>::contains_key(hash), "tip does not exist");
+
 		create_tips::<T>(t, hash.clone(), value)?;
 
 		let caller = account("caller", t, SEED);
@@ -172,6 +173,26 @@ benchmarks! {
 		frame_benchmarking::benchmarking::add_to_whitelist(caller_key.into());
 	}: _(RawOrigin::Signed(caller), hash)
 
+	slash_tip {
+		let t in 1 .. MAX_TIPPERS;
+
+		// Make sure pot is funded
+		setup_pot_account::<T>();
+
+		// Set up a new tip proposal
+		let (member, reason, beneficiary, value) = setup_tip::<T>(0, t)?;
+		let value = T::Currency::minimum_balance().saturating_mul(100u32.into());
+		TipsMod::<T>::tip_new(
+			RawOrigin::Signed(member).into(),
+			reason.clone(),
+			beneficiary.clone(),
+			value
+		)?;
+
+		let reason_hash = T::Hashing::hash(&reason[..]);
+		let hash = T::Hashing::hash_of(&(&reason_hash, &beneficiary));
+		ensure!(Tips::<T>::contains_key(hash), "tip does not exist");
+	}: _(RawOrigin::Root, hash)
 }
 
 #[cfg(test)]
@@ -188,6 +209,7 @@ mod tests {
 			assert_ok!(test_benchmark_tip_new::<Test>());
 			assert_ok!(test_benchmark_tip::<Test>());
 			assert_ok!(test_benchmark_close_tip::<Test>());
+			assert_ok!(test_benchmark_slash_tip::<Test>());
 		});
 	}
 }
diff --git a/frame/tips/src/lib.rs b/frame/tips/src/lib.rs
index 3507b220d5db..eaa785a5638e 100644
--- a/frame/tips/src/lib.rs
+++ b/frame/tips/src/lib.rs
@@ -58,8 +58,6 @@ mod tests;
 mod benchmarking;
 pub mod weights;
 
-use sp_std::if_std;
-
 use sp_std::prelude::*;
 use frame_support::{decl_module, decl_storage, decl_event, ensure, decl_error, Parameter};
 use frame_support::traits::{
@@ -70,8 +68,7 @@ use frame_support::traits::{
 use sp_runtime::{ Percent, RuntimeDebug, traits::{
 	Zero, AccountIdConversion, Hash, BadOrigin
 }};
-
-use frame_support::traits::{Contains, ContainsLengthBound};
+use frame_support::traits::{Contains, ContainsLengthBound, OnUnbalanced, EnsureOrigin};
 use codec::{Encode, Decode};
 use frame_system::{self as system, ensure_signed};
 pub use weights::WeightInfo;
@@ -170,6 +167,8 @@ decl_event!(
 		TipClosed(Hash, AccountId, Balance),
 		/// A tip suggestion has been retracted. \[tip_hash\]
 		TipRetracted(Hash),
+		/// A tip suggestion has been slashed. \[tip_hash, finder, deposit\]
+		TipSlashed(Hash, AccountId, Balance),
 	}
 );
 
@@ -408,6 +407,32 @@ decl_module! {
 			Tips::<T>::remove(hash);
 			Self::payout_tip(hash, tip);
 		}
+
+		/// Remove and slash an already-open tip.
+		///
+		/// May only be called from `T::RejectOrigin`.
+		///
+		/// As a result, the finder is slashed and the deposits are lost.
+		///
+		/// Emits `TipSlashed` if successful.
+		///
+		/// # <weight>
+		///   `T` is charged as upper bound given by `ContainsLengthBound`.
+		///   The actual cost depends on the implementation of `T::Tippers`.
+		/// # </weight>
+		#[weight = <T as Config>::WeightInfo::slash_tip(T::Tippers::max_len() as u32)]
+		fn slash_tip(origin, hash: T::Hash) {
+			T::RejectOrigin::ensure_origin(origin)?;
+
+			let tip = Tips::<T>::take(hash).ok_or(Error::<T>::UnknownTip)?;
+
+			if !tip.deposit.is_zero() {
+				let imbalance = T::Currency::slash_reserved(&tip.finder, tip.deposit).0;
+				T::OnSlash::on_unbalanced(imbalance);
+			}
+			Reasons::<T>::remove(&tip.reason);
+			Self::deposit_event(RawEvent::TipSlashed(hash, tip.finder, tip.deposit));
+		}
 	}
 }
 
@@ -523,10 +548,6 @@ impl<T: Config> Module<T> {
 
 		use frame_support::{Twox64Concat, migration::StorageKeyIterator};
 
-		if_std! {
-			println!("Inside migrate_retract_tip_for_tip_new()!");
-		}
-
 		for (hash, old_tip) in StorageKeyIterator::<
 			T::Hash,
 			OldOpenTip<T::AccountId, BalanceOf<T>, T::BlockNumber, T::Hash>,
@@ -534,25 +555,11 @@ impl<T: Config> Module<T> {
 		>::new(b"Treasury", b"Tips").drain()
 		{
 
-			if_std! {
-				println!("Inside loop migrate_retract_tip_for_tip_new()!");
-			}
-
 			let (finder, deposit, finders_fee) = match old_tip.finder {
 				Some((finder, deposit)) => {
-					if_std! {
-						// This code is only being compiled and executed when the `std` feature is enabled.
-						println!("OK case!");
-						println!("value is: {:#?},{:#?}", finder, deposit);
-					}
 					(finder, deposit, true)
 				},
 				None => {
-					if_std! {
-						// This code is only being compiled and executed when the `std` feature is enabled.
-						println!("None case!");
-						// println!("value is: {:#?},{:#?}", T::AccountId::default(), Zero::zero());
-					}
 					(T::AccountId::default(), Zero::zero(), false)
 				},
 			};
@@ -567,10 +574,5 @@ impl<T: Config> Module<T> {
 			};
 			Tips::<T>::insert(hash, new_tip)
 		}
-
-		if_std! {
-			println!("Exit migrate_retract_tip_for_tip_new()!");
-		}
-
 	}
 }
diff --git a/frame/tips/src/tests.rs b/frame/tips/src/tests.rs
index e6f9cd4e66b7..3bfecafeaf97 100644
--- a/frame/tips/src/tests.rs
+++ b/frame/tips/src/tests.rs
@@ -286,6 +286,40 @@ fn close_tip_works() {
 	});
 }
 
+#[test]
+fn slash_tip_works() {
+	new_test_ext().execute_with(|| {
+		System::set_block_number(1);
+		Balances::make_free_balance_be(&Treasury::account_id(), 101);
+		assert_eq!(Treasury::pot(), 100);
+		
+		assert_eq!(Balances::reserved_balance(0), 0);
+		assert_eq!(Balances::free_balance(0), 100);
+		
+		assert_ok!(TipsModTestInst::report_awesome(Origin::signed(0), b"awesome.dot".to_vec(), 3));
+		
+		assert_eq!(Balances::reserved_balance(0), 12);
+		assert_eq!(Balances::free_balance(0), 88);
+		
+		let h = tip_hash();
+		assert_eq!(last_event(), RawEvent::NewTip(h));
+		
+		// can't remove from any origin
+		assert_noop!(
+			TipsModTestInst::slash_tip(Origin::signed(0), h.clone()),
+			BadOrigin,
+		);
+		
+		// can remove from root.
+		assert_ok!(TipsModTestInst::slash_tip(Origin::root(), h.clone()));
+		assert_eq!(last_event(), RawEvent::TipSlashed(h, 0, 12));
+		
+		// tipper slashed
+		assert_eq!(Balances::reserved_balance(0), 0);
+		assert_eq!(Balances::free_balance(0), 88);
+	});
+}
+
 #[test]
 fn retract_tip_works() {
 	new_test_ext().execute_with(|| {
@@ -409,12 +443,8 @@ fn test_last_reward_migration() {
 
 	s.top = data.into_iter().collect();
 
-	println!("Executing the test!");
-
 	sp_io::TestExternalities::new(s).execute_with(|| {
 
-		println!("Calling migrate_retract_tip_for_tip_new()!");
-
 		TipsModTestInst::migrate_retract_tip_for_tip_new();
 
 		// Test w/ finder
diff --git a/frame/tips/src/weights.rs b/frame/tips/src/weights.rs
index ad2d3104cafe..c1d998291001 100644
--- a/frame/tips/src/weights.rs
+++ b/frame/tips/src/weights.rs
@@ -18,11 +18,11 @@
 //! Autogenerated weights for pallet_tips
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-12-16, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2020-12-20, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
-// ./target/release/substrate
+// target/release/substrate
 // benchmark
 // --chain=dev
 // --steps=50
@@ -49,83 +49,98 @@ pub trait WeightInfo {
 	fn tip_new(r: u32, t: u32, ) -> Weight;
 	fn tip(t: u32, ) -> Weight;
 	fn close_tip(t: u32, ) -> Weight;
+	fn slash_tip(t: u32, ) -> Weight;
 }
 
 /// Weights for pallet_tips using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn report_awesome(r: u32, ) -> Weight {
-		(74_814_000 as Weight)
+		(73_795_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((2_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn retract_tip() -> Weight {
-		(62_962_000 as Weight)
+		(61_753_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn tip_new(r: u32, t: u32, ) -> Weight {
-		(48_132_000 as Weight)
+		(47_731_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((2_000 as Weight).saturating_mul(r as Weight))
 			// Standard Error: 0
-			.saturating_add((155_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((154_000 as Weight).saturating_mul(t as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn tip(t: u32, ) -> Weight {
-		(36_168_000 as Weight)
+		(35_215_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((695_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((712_000 as Weight).saturating_mul(t as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn close_tip(t: u32, ) -> Weight {
-		(119_313_000 as Weight)
+		(117_027_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((372_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((375_000 as Weight).saturating_mul(t as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
+	fn slash_tip(t: u32, ) -> Weight {
+		(37_184_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((11_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn report_awesome(r: u32, ) -> Weight {
-		(74_814_000 as Weight)
+		(73_795_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((2_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn retract_tip() -> Weight {
-		(62_962_000 as Weight)
+		(61_753_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn tip_new(r: u32, t: u32, ) -> Weight {
-		(48_132_000 as Weight)
+		(47_731_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((2_000 as Weight).saturating_mul(r as Weight))
 			// Standard Error: 0
-			.saturating_add((155_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((154_000 as Weight).saturating_mul(t as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn tip(t: u32, ) -> Weight {
-		(36_168_000 as Weight)
+		(35_215_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((695_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((712_000 as Weight).saturating_mul(t as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn close_tip(t: u32, ) -> Weight {
-		(119_313_000 as Weight)
+		(117_027_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((372_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((375_000 as Weight).saturating_mul(t as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
+	fn slash_tip(t: u32, ) -> Weight {
+		(37_184_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((11_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+	}
 }
diff --git a/frame/treasury/src/benchmarking.rs b/frame/treasury/src/benchmarking.rs
index 16ed1b01ae0d..39b398ab8916 100644
--- a/frame/treasury/src/benchmarking.rs
+++ b/frame/treasury/src/benchmarking.rs
@@ -59,7 +59,7 @@ fn create_approved_proposals<T: Config<I>, I: Instance>(n: u32) -> Result<(), &'
 	Ok(())
 }
 
-fn setup_pod_account<T: Config<I>, I: Instance>() {
+fn setup_pot_account<T: Config<I>, I: Instance>() {
 	let pot_account = Treasury::<T, I>::account_id();
 	let value = T::Currency::minimum_balance().saturating_mul(1_000_000_000u32.into());
 	let _ = T::Currency::make_free_balance_be(&pot_account, value);
@@ -97,7 +97,7 @@ benchmarks_instance! {
 
 	on_initialize_proposals {
 		let p in 0 .. 100;
-		setup_pod_account::<T, _>();
+		setup_pot_account::<T, _>();
 		create_approved_proposals::<T, _>(p)?;
 	}: {
 		Treasury::<T, _>::on_initialize(T::BlockNumber::zero());

From 6abbbd639d07f041255fb326491fea27ece8a490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Wed, 30 Dec 2020 00:08:58 +0100
Subject: [PATCH 0211/1194] Add CLI argument to disable log color output
 (#7795)

---
 client/cli/src/config.rs               | 15 ++++--
 client/cli/src/lib.rs                  | 66 ++++++++++++++++++--------
 client/cli/src/params/shared_params.rs |  9 ++++
 client/rpc/src/system/tests.rs         |  8 ++--
 4 files changed, 71 insertions(+), 27 deletions(-)

diff --git a/client/cli/src/config.rs b/client/cli/src/config.rs
index b631b85f3774..f0eb84f853bf 100644
--- a/client/cli/src/config.rs
+++ b/client/cli/src/config.rs
@@ -22,7 +22,7 @@ use crate::arg_enums::Database;
 use crate::error::Result;
 use crate::{
 	init_logger, DatabaseParams, ImportParams, KeystoreParams, NetworkParams, NodeKeyParams,
-	OffchainWorkerParams, PruningParams, SharedParams, SubstrateCli,
+	OffchainWorkerParams, PruningParams, SharedParams, SubstrateCli, InitLoggerParams,
 };
 use log::warn;
 use names::{Generator, Name};
@@ -538,6 +538,11 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 		Ok(self.shared_params().is_log_filter_reloading_disabled())
 	}
 
+	/// Should the log color output be disabled?
+	fn disable_log_color(&self) -> Result<bool> {
+		Ok(self.shared_params().disable_log_color())
+	}
+
 	/// Initialize substrate. This must be done only once per process.
 	///
 	/// This method:
@@ -550,15 +555,17 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 		let tracing_receiver = self.tracing_receiver()?;
 		let tracing_targets = self.tracing_targets()?;
 		let disable_log_reloading = self.is_log_filter_reloading_disabled()?;
+		let disable_log_color = self.disable_log_color()?;
 
 		sp_panic_handler::set(&C::support_url(), &C::impl_version());
 
-		init_logger(
-			&logger_pattern,
+		init_logger(InitLoggerParams {
+			pattern: logger_pattern,
 			tracing_receiver,
 			tracing_targets,
 			disable_log_reloading,
-		)?;
+			disable_log_color,
+		})?;
 
 		if let Some(new_limit) = fdlimit::raise_fd_limit() {
 			if new_limit < RECOMMENDED_OPEN_FILE_DESCRIPTOR_LIMIT {
diff --git a/client/cli/src/lib.rs b/client/cli/src/lib.rs
index 0efd1582aca2..0ab26e606474 100644
--- a/client/cli/src/lib.rs
+++ b/client/cli/src/lib.rs
@@ -237,30 +237,50 @@ pub trait SubstrateCli: Sized {
 	fn native_runtime_version(chain_spec: &Box<dyn ChainSpec>) -> &'static RuntimeVersion;
 }
 
+/// The parameters for [`init_logger`].
+#[derive(Default)]
+pub struct InitLoggerParams {
+	/// A comma seperated list of logging patterns.
+	///
+	/// E.g.: `test-crate=debug`
+	pub pattern: String,
+	/// The tracing receiver.
+	pub tracing_receiver: sc_tracing::TracingReceiver,
+	/// Optional comma seperated list of tracing targets.
+	pub tracing_targets: Option<String>,
+	/// Should log reloading be disabled?
+	pub disable_log_reloading: bool,
+	/// Should the log color output be disabled?
+	pub disable_log_color: bool,
+}
+
 /// Initialize the global logger
 ///
 /// This sets various global logging and tracing instances and thus may only be called once.
 pub fn init_logger(
-	pattern: &str,
-	tracing_receiver: sc_tracing::TracingReceiver,
-	profiling_targets: Option<String>,
-	disable_log_reloading: bool,
+	InitLoggerParams {
+		pattern,
+		tracing_receiver,
+		tracing_targets,
+		disable_log_reloading,
+		disable_log_color,
+	}: InitLoggerParams,
 ) -> std::result::Result<(), String> {
 	use sc_tracing::parse_default_directive;
 
 	// Accept all valid directives and print invalid ones
-	fn parse_user_directives(mut env_filter: EnvFilter, dirs: &str) -> std::result::Result<EnvFilter, String> {
+	fn parse_user_directives(
+		mut env_filter: EnvFilter,
+		dirs: &str,
+	) -> std::result::Result<EnvFilter, String> {
 		for dir in dirs.split(',') {
 			env_filter = env_filter.add_directive(parse_default_directive(&dir)?);
 		}
 		Ok(env_filter)
 	}
 
-	if let Err(e) = tracing_log::LogTracer::init() {
-		return Err(format!(
-			"Registering Substrate logger failed: {:}!", e
-		))
-	}
+	tracing_log::LogTracer::init()
+		.map_err(|e| format!("Registering Substrate logger failed: {:}!", e))?;
 
 	// Initialize filter - ensure to use `parse_default_directive` for any defaults to persist
 	// after log filter reloading by RPC
@@ -290,7 +310,7 @@ pub fn init_logger(
 	if pattern != "" {
 		// We're not sure if log or tracing is available at this moment, so silently ignore the
 		// parse error.
-		env_filter = parse_user_directives(env_filter, pattern)?;
+		env_filter = parse_user_directives(env_filter, &pattern)?;
 	}
 
 	// If we're only logging `INFO` entries then we'll use a simplified logging format.
@@ -308,11 +328,11 @@ pub fn init_logger(
 	);
 
 	// Make sure to include profiling targets in the filter
-	if let Some(profiling_targets) = profiling_targets.clone() {
-		env_filter = parse_user_directives(env_filter, &profiling_targets)?;
+	if let Some(tracing_targets) = tracing_targets.clone() {
+		env_filter = parse_user_directives(env_filter, &tracing_targets)?;
 	}
 
-	let enable_color = atty::is(atty::Stream::Stderr);
+	let enable_color = atty::is(atty::Stream::Stderr) && !disable_log_color;
 	let timer = ChronoLocal::with_format(if simple {
 		"%Y-%m-%d %H:%M:%S".to_string()
 	} else {
@@ -333,7 +353,7 @@ pub fn init_logger(
 		let subscriber = subscriber_builder
 			.finish()
 			.with(logging::NodeNameLayer);
-		initialize_tracing(subscriber, tracing_receiver, profiling_targets)
+		initialize_tracing(subscriber, tracing_receiver, tracing_targets)
 	} else {
 		let subscriber_builder = subscriber_builder.with_filter_reloading();
 		let handle = subscriber_builder.reload_handle();
@@ -341,7 +361,7 @@ pub fn init_logger(
 		let subscriber = subscriber_builder
 			.finish()
 			.with(logging::NodeNameLayer);
-		initialize_tracing(subscriber, tracing_receiver, profiling_targets)
+		initialize_tracing(subscriber, tracing_receiver, tracing_targets)
 	}
 }
 
@@ -380,7 +400,9 @@ mod tests {
 	#[test]
 	fn test_logger_filters() {
 		let test_pattern = "afg=debug,sync=trace,client=warn,telemetry,something-with-dash=error";
-		init_logger(&test_pattern, Default::default(), Default::default(), false).unwrap();
+		init_logger(
+			InitLoggerParams { pattern: test_pattern.into(), ..Default::default() },
+		).unwrap();
 
 		tracing::dispatcher::get_default(|dispatcher| {
 			let test_filter = |target, level| {
@@ -439,7 +461,9 @@ mod tests {
 	fn log_something_with_dash_target_name() {
 		if env::var("ENABLE_LOGGING").is_ok() {
 			let test_pattern = "test-target=info";
-			init_logger(&test_pattern, Default::default(), Default::default(), false).unwrap();
+			init_logger(
+				InitLoggerParams { pattern: test_pattern.into(), ..Default::default() },
+			).unwrap();
 
 			log::info!(target: "test-target", "{}", EXPECTED_LOG_MESSAGE);
 		}
@@ -475,7 +499,9 @@ mod tests {
 	fn prefix_in_log_lines_entrypoint() {
 		if env::var("ENABLE_LOGGING").is_ok() {
 			let test_pattern = "test-target=info";
-			init_logger(&test_pattern, Default::default(), Default::default(), false).unwrap();
+			init_logger(
+				InitLoggerParams { pattern: test_pattern.into(), ..Default::default() },
+			).unwrap();
 			prefix_in_log_lines_process();
 		}
 	}
@@ -491,7 +517,7 @@ mod tests {
 	#[test]
 	fn do_not_write_with_colors_on_tty_entrypoint() {
 		if env::var("ENABLE_LOGGING").is_ok() {
-			init_logger("", Default::default(), Default::default(), false).unwrap();
+			init_logger(InitLoggerParams::default()).unwrap();
 			log::info!("{}", ansi_term::Colour::Yellow.paint(EXPECTED_LOG_MESSAGE));
 		}
 	}
diff --git a/client/cli/src/params/shared_params.rs b/client/cli/src/params/shared_params.rs
index 52b1488ea9cc..13e24938482a 100644
--- a/client/cli/src/params/shared_params.rs
+++ b/client/cli/src/params/shared_params.rs
@@ -46,6 +46,10 @@ pub struct SharedParams {
 	#[structopt(short = "l", long, value_name = "LOG_PATTERN")]
 	pub log: Vec<String>,
 
+	/// Disable log color output.
+	#[structopt(long)]
+	pub disable_log_color: bool,
+
 	/// Disable feature to dynamically update and reload the log filter.
 	///
 	/// By default this feature is enabled, however it leads to a small performance decrease.
@@ -99,6 +103,11 @@ impl SharedParams {
 		&self.log
 	}
 
+	/// Should the log color output be disabled?
+	pub fn disable_log_color(&self) -> bool {
+		self.disable_log_color
+	}
+
 	/// Is log reloading disabled
 	pub fn is_log_filter_reloading_disabled(&self) -> bool {
 		self.disable_log_reloading
diff --git a/client/rpc/src/system/tests.rs b/client/rpc/src/system/tests.rs
index fa3574e9dae0..f6463c2fc775 100644
--- a/client/rpc/src/system/tests.rs
+++ b/client/rpc/src/system/tests.rs
@@ -344,13 +344,15 @@ fn test_add_reset_log_filter() {
 
 	// Enter log generation / filter reload
 	if std::env::var("TEST_LOG_FILTER").is_ok() {
-		sc_cli::init_logger("test_before_add=debug", Default::default(), Default::default(), false).unwrap();
+		sc_cli::init_logger(
+			sc_cli::InitLoggerParams { pattern: "test_before_add=debug".into(), ..Default::default() },
+		).unwrap();
 		for line in std::io::stdin().lock().lines() {
 			let line = line.expect("Failed to read bytes");
 			if line.contains("add_reload") {
-				assert!(api(None).system_add_log_filter("test_after_add".to_owned()).is_ok(), "`system_add_log_filter` failed");
+				api(None).system_add_log_filter("test_after_add".into()).expect("`system_add_log_filter` failed");
 			} else if line.contains("reset") {
-				assert!(api(None).system_reset_log_filter().is_ok(), "`system_reset_log_filter` failed");
+				api(None).system_reset_log_filter().expect("`system_reset_log_filter` failed");
 			} else if line.contains("exit") {
 				return;
 			}

From 67c8cadb33313ef317a4266edb334b7fc594629c Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Wed, 30 Dec 2020 06:31:29 -0400
Subject: [PATCH 0212/1194] Use path instead of ident (#7809)

---
 frame/benchmarking/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
index 6296c000e289..c963642fabbc 100644
--- a/frame/benchmarking/src/lib.rs
+++ b/frame/benchmarking/src/lib.rs
@@ -1072,7 +1072,7 @@ macro_rules! impl_benchmark_test {
 
 #[macro_export]
 macro_rules! add_benchmark {
-	( $params:ident, $batches:ident, $name:ident, $( $location:tt )* ) => (
+	( $params:ident, $batches:ident, $name:path, $( $location:tt )* ) => (
 		let name_string = stringify!($name).as_bytes();
 		let instance_string = stringify!( $( $location )* ).as_bytes();
 		let (config, whitelist) = $params;

From b44221489f0c491e2b1d797a9c7f65ef6f045ed6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Wed, 30 Dec 2020 14:33:05 +0100
Subject: [PATCH 0213/1194] Add proper `commit_all` to `TestExternalities`
 (#7808)

* Add proper `commit_all` to `TestExternalities`

This pr adds a propoer `commit_all` function to `TestExternalities` to
commit all changes from the overlay to the internal backend. Besides
that it fixes some bugs with handling empty dbs when calculating a delta
storage root. It also changes the way data is added to the in memory
backend.

* Update primitives/state-machine/src/testing.rs

Co-authored-by: cheme <emericchevalier.pro@gmail.com>

* Don't allow self proxies (#7803)

* Allow council to slash treasury tip (#7753)

* wk2051 | D4 |Allow council to slash treasury tip | p1

* Update frame/tips/src/lib.rs

Co-authored-by: Xiliang Chen <xlchen1291@gmail.com>

* wk2051 | D5 |Allow council to slash treasury tip | p2

* wk2051 | D5 |Allow council to slash treasury tip | p3

* wk2051 | D5 |Allow council to slash treasury tip | p4

* wk2051 | D5 |Allow council to slash treasury tip | p5

* random change

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_tips --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/tips/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* fix typo

* Update frame/tips/src/lib.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Update frame/tips/src/lib.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Update frame/tips/src/lib.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Update frame/tips/src/lib.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Update frame/tips/src/tests.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* wk2052 | D1 | Allow council to slash treasury tip | p6

Co-authored-by: Xiliang Chen <xlchen1291@gmail.com>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Review feedback

* Review feedback

* Update docs

* More docs

* Make it private

* Use `None`

* Use apply transaction

* Update primitives/state-machine/src/testing.rs

Co-authored-by: cheme <emericchevalier.pro@gmail.com>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: RK <r.raajey@gmail.com>
Co-authored-by: Xiliang Chen <xlchen1291@gmail.com>
Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
---
 .../state-machine/src/in_memory_backend.rs    | 99 +++++++------------
 primitives/state-machine/src/testing.rs       | 69 ++++++++++++-
 primitives/trie/src/lib.rs                    | 10 +-
 3 files changed, 106 insertions(+), 72 deletions(-)

diff --git a/primitives/state-machine/src/in_memory_backend.rs b/primitives/state-machine/src/in_memory_backend.rs
index f211f6020273..ca300aec919c 100644
--- a/primitives/state-machine/src/in_memory_backend.rs
+++ b/primitives/state-machine/src/in_memory_backend.rs
@@ -17,56 +17,21 @@
 //! State machine in memory backend.
 
 use crate::{
-	StorageKey, StorageValue, StorageCollection,
-	trie_backend::TrieBackend,
+	StorageKey, StorageValue, StorageCollection, trie_backend::TrieBackend, backend::Backend,
 };
-use std::{collections::{BTreeMap, HashMap}};
+use std::collections::{BTreeMap, HashMap};
 use hash_db::Hasher;
-use sp_trie::{
-	MemoryDB, TrieMut,
-	trie_types::TrieDBMut,
-};
+use sp_trie::{MemoryDB, empty_trie_root, Layout};
 use codec::Codec;
 use sp_core::storage::{ChildInfo, Storage};
 
-/// Insert input pairs into memory db.
-fn insert_into_memory_db<H, I>(mut root: H::Out, mdb: &mut MemoryDB<H>, input: I) -> H::Out
-where
-	H: Hasher,
-	I: IntoIterator<Item=(StorageKey, Option<StorageValue>)>,
-{
-	{
-		let mut trie = if root == Default::default() {
-			TrieDBMut::<H>::new(mdb, &mut root)
-		} else {
-			TrieDBMut::<H>::from_existing(mdb, &mut root).unwrap()
-		};
-		for (key, value) in input {
-			if let Err(e) = match value {
-				Some(value) => {
-					trie.insert(&key, &value)
-				},
-				None => {
-					trie.remove(&key)
-				},
-			}  {
-				panic!("Failed to write to trie: {}", e);
-			}
-		}
-		trie.commit();
-	}
-	root
-}
-
 /// Create a new empty instance of in-memory backend.
 pub fn new_in_mem<H: Hasher>() -> TrieBackend<MemoryDB<H>, H>
 where
 	H::Out: Codec + Ord,
 {
 	let db = MemoryDB::default();
-	let mut backend = TrieBackend::new(db, Default::default());
-	backend.insert(std::iter::empty());
-	backend
+	TrieBackend::new(db, empty_trie_root::<Layout<H>>())
 }
 
 impl<H: Hasher> TrieBackend<MemoryDB<H>, H>
@@ -92,32 +57,16 @@ where
 		&mut self,
 		changes: T,
 	) {
-		let mut new_child_roots = Vec::new();
-		let mut root_map = None;
-		let root = self.root().clone();
-		for (child_info, map) in changes {
-			if let Some(child_info) = child_info.as_ref() {
-				let prefix_storage_key = child_info.prefixed_storage_key();
-				let ch = insert_into_memory_db::<H, _>(root, self.backend_storage_mut(), map.clone().into_iter());
-				new_child_roots.push((prefix_storage_key.into_inner(), Some(ch.as_ref().into())));
-			} else {
-				root_map = Some(map);
-			}
-		}
+		let (top, child) = changes.into_iter().partition::<Vec<_>, _>(|v| v.0.is_none());
+		let (root, transaction) = self.full_storage_root(
+			top.iter().map(|(_, v)| v).flatten().map(|(k, v)| (&k[..], v.as_deref())),
+			child.iter()
+				.filter_map(|v|
+					v.0.as_ref().map(|c| (c, v.1.iter().map(|(k, v)| (&k[..], v.as_deref()))))
+				),
+		);
 
-		let root = match root_map {
-			Some(map) => insert_into_memory_db::<H, _>(
-				root,
-				self.backend_storage_mut(),
-				map.into_iter().chain(new_child_roots.into_iter()),
-			),
-			None => insert_into_memory_db::<H, _>(
-				root,
-				self.backend_storage_mut(),
-				new_child_roots.into_iter(),
-			),
-		};
-		self.essence.set_root(root);
+		self.apply_transaction(root, transaction);
 	}
 
 	/// Merge trie nodes into this backend.
@@ -127,6 +76,12 @@ where
 		Self::new(clone, root)
 	}
 
+	/// Apply the given transaction to this backend and set the root to the given value.
+	pub fn apply_transaction(&mut self, root: H::Out, transaction: MemoryDB<H>) {
+		self.backend_storage_mut().consolidate(transaction);
+		self.essence.set_root(root);
+	}
+
 	/// Compare with another in-memory backend.
 	pub fn eq(&self, other: &Self) -> bool {
 		self.root() == other.root()
@@ -158,7 +113,9 @@ where
 {
 	fn from(inner: HashMap<Option<ChildInfo>, BTreeMap<StorageKey, StorageValue>>) -> Self {
 		let mut backend = new_in_mem();
-		backend.insert(inner.into_iter().map(|(k, m)| (k, m.into_iter().map(|(k, v)| (k, Some(v))).collect())));
+		backend.insert(
+			inner.into_iter().map(|(k, m)| (k, m.into_iter().map(|(k, v)| (k, Some(v))).collect())),
+		);
 		backend
 	}
 }
@@ -232,4 +189,16 @@ mod tests {
 		let storage_key = child_info.prefixed_storage_key();
 		assert!(trie_backend.storage(storage_key.as_slice()).unwrap().is_some());
 	}
+
+	#[test]
+	fn insert_multiple_times_child_data_works() {
+		let mut storage = new_in_mem::<BlakeTwo256>();
+		let child_info = ChildInfo::new_default(b"1");
+
+		storage.insert(vec![(Some(child_info.clone()), vec![(b"2".to_vec(), Some(b"3".to_vec()))])]);
+		storage.insert(vec![(Some(child_info.clone()), vec![(b"1".to_vec(), Some(b"3".to_vec()))])]);
+
+		assert_eq!(storage.child_storage(&child_info, &b"2"[..]), Ok(Some(b"3".to_vec())));
+		assert_eq!(storage.child_storage(&child_info, &b"1"[..]), Ok(Some(b"3".to_vec())));
+	}
 }
diff --git a/primitives/state-machine/src/testing.rs b/primitives/state-machine/src/testing.rs
index 4dcd30828562..23c3abe4910c 100644
--- a/primitives/state-machine/src/testing.rs
+++ b/primitives/state-machine/src/testing.rs
@@ -153,8 +153,11 @@ impl<H: Hasher, N: ChangesTrieBlockNumber> TestExternalities<H, N>
 		&mut self.changes_trie_storage
 	}
 
-	/// Return a new backend with all pending value.
-	pub fn commit_all(&self) -> InMemoryBackend<H> {
+	/// Return a new backend with all pending changes.
+	///
+	/// In contrast to [`commit_all`](Self::commit_all) this will not panic if there are open
+	/// transactions.
+	fn as_backend(&self) -> InMemoryBackend<H> {
 		let top: Vec<_> = self.overlay.changes()
 			.map(|(k, v)| (k.clone(), v.value().cloned()))
 			.collect();
@@ -172,6 +175,23 @@ impl<H: Hasher, N: ChangesTrieBlockNumber> TestExternalities<H, N>
 		self.backend.update(transaction)
 	}
 
+	/// Commit all pending changes to the underlying backend.
+	///
+	/// # Panic
+	///
+	/// This will panic if there are still open transactions.
+	pub fn commit_all(&mut self) -> Result<(), String> {
+		let changes = self.overlay.drain_storage_changes::<_, _, N>(
+			&self.backend,
+			None,
+			Default::default(),
+			&mut Default::default(),
+		)?;
+
+		self.backend.apply_transaction(changes.transaction_storage_root, changes.transaction);
+		Ok(())
+	}
+
 	/// Execute the given closure while `self` is set as externalities.
 	///
 	/// Returns the result of the given closure.
@@ -209,7 +229,7 @@ impl<H: Hasher, N: ChangesTrieBlockNumber> PartialEq for TestExternalities<H, N>
 	/// This doesn't test if they are in the same state, only if they contains the
 	/// same data at this state
 	fn eq(&self, other: &TestExternalities<H, N>) -> bool {
-		self.commit_all().eq(&other.commit_all())
+		self.as_backend().eq(&other.as_backend())
 	}
 }
 
@@ -258,7 +278,7 @@ impl<H, N> sp_externalities::ExtensionStore for TestExternalities<H, N> where
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use sp_core::{H256, traits::Externalities};
+	use sp_core::{H256, traits::Externalities, storage::ChildInfo};
 	use sp_runtime::traits::BlakeTwo256;
 	use hex_literal::hex;
 
@@ -289,4 +309,45 @@ mod tests {
 		fn assert_send<T: Send>() {}
 		assert_send::<TestExternalities::<BlakeTwo256, u64>>();
 	}
+
+	#[test]
+	fn commit_all_and_kill_child_storage() {
+		let mut ext = TestExternalities::<BlakeTwo256, u64>::default();
+		let child_info = ChildInfo::new_default(&b"test_child"[..]);
+
+		{
+			let mut ext = ext.ext();
+			ext.place_child_storage(&child_info, b"doe".to_vec(), Some(b"reindeer".to_vec()));
+			ext.place_child_storage(&child_info, b"dog".to_vec(), Some(b"puppy".to_vec()));
+			ext.place_child_storage(&child_info, b"dog2".to_vec(), Some(b"puppy2".to_vec()));
+		}
+
+		ext.commit_all().unwrap();
+
+		{
+			let mut ext = ext.ext();
+
+			assert!(!ext.kill_child_storage(&child_info, Some(2)), "Should not delete all keys");
+
+			assert!(ext.child_storage(&child_info, &b"doe"[..]).is_none());
+			assert!(ext.child_storage(&child_info, &b"dog"[..]).is_none());
+			assert!(ext.child_storage(&child_info, &b"dog2"[..]).is_some());
+		}
+	}
+
+	#[test]
+	fn as_backend_generates_same_backend_as_commit_all() {
+		let mut ext = TestExternalities::<BlakeTwo256, u64>::default();
+		{
+			let mut ext = ext.ext();
+			ext.set_storage(b"doe".to_vec(), b"reindeer".to_vec());
+			ext.set_storage(b"dog".to_vec(), b"puppy".to_vec());
+			ext.set_storage(b"dogglesworth".to_vec(), b"cat".to_vec());
+		}
+
+		let backend = ext.as_backend();
+
+		ext.commit_all().unwrap();
+		assert!(ext.backend.eq(&backend), "Both backend should be equal.");
+	}
 }
diff --git a/primitives/trie/src/lib.rs b/primitives/trie/src/lib.rs
index 2687d8e42279..4914d85f5811 100644
--- a/primitives/trie/src/lib.rs
+++ b/primitives/trie/src/lib.rs
@@ -184,7 +184,7 @@ pub fn delta_trie_root<L: TrieConfiguration, I, A, B, DB, V>(
 	DB: hash_db::HashDB<L::Hash, trie_db::DBValue>,
 {
 	{
-		let mut trie = TrieDBMut::<L>::from_existing(&mut *db, &mut root)?;
+		let mut trie = TrieDBMut::<L>::from_existing(db, &mut root)?;
 
 		let mut delta = delta.into_iter().collect::<Vec<_>>();
 		delta.sort_by(|l, r| l.0.borrow().cmp(r.0.borrow()));
@@ -223,9 +223,13 @@ pub fn read_trie_value_with<
 	Ok(TrieDB::<L>::new(&*db, root)?.get_with(key, query).map(|x| x.map(|val| val.to_vec()))?)
 }
 
+/// Determine the empty trie root.
+pub fn empty_trie_root<L: TrieConfiguration>() -> <L::Hash as Hasher>::Out {
+	L::trie_root::<_, Vec<u8>, Vec<u8>>(core::iter::empty())
+}
+
 /// Determine the empty child trie root.
-pub fn empty_child_trie_root<L: TrieConfiguration>(
-) -> <L::Hash as Hasher>::Out {
+pub fn empty_child_trie_root<L: TrieConfiguration>() -> <L::Hash as Hasher>::Out {
 	L::trie_root::<_, Vec<u8>, Vec<u8>>(core::iter::empty())
 }
 

From 0fc832988bef7ab27f6cf2f3040fcb2d3c9b6568 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Wed, 30 Dec 2020 23:07:37 +0100
Subject: [PATCH 0214/1194] Define ss58 prefix inside the runtime (#7810)

* Add SS58Prefix type to the frame_system config trait

* Remove unused chain_id runtime interface
---
 bin/node-template/pallets/template/src/mock.rs    |  2 ++
 bin/node-template/runtime/src/lib.rs              |  3 +++
 bin/node/runtime/src/lib.rs                       |  2 ++
 frame/assets/src/lib.rs                           |  1 +
 frame/atomic-swap/src/tests.rs                    |  1 +
 frame/aura/src/mock.rs                            |  1 +
 frame/authority-discovery/src/lib.rs              |  1 +
 frame/authorship/src/lib.rs                       |  1 +
 frame/babe/src/mock.rs                            |  1 +
 frame/balances/src/tests_composite.rs             |  1 +
 frame/balances/src/tests_local.rs                 |  1 +
 frame/benchmarking/src/tests.rs                   |  1 +
 frame/bounties/src/tests.rs                       |  1 +
 frame/collective/src/lib.rs                       |  1 +
 frame/contracts/src/tests.rs                      |  1 +
 frame/democracy/src/tests.rs                      |  1 +
 frame/elections-phragmen/src/lib.rs               |  1 +
 frame/elections/src/mock.rs                       |  1 +
 frame/example-offchain-worker/src/tests.rs        |  1 +
 frame/example-parallel/src/tests.rs               |  1 +
 frame/example/src/lib.rs                          |  1 +
 frame/executive/src/lib.rs                        |  1 +
 frame/grandpa/src/mock.rs                         |  1 +
 frame/identity/src/tests.rs                       |  1 +
 frame/im-online/src/mock.rs                       |  1 +
 frame/indices/src/mock.rs                         |  1 +
 frame/membership/src/lib.rs                       |  1 +
 frame/merkle-mountain-range/src/mock.rs           |  1 +
 frame/multisig/src/tests.rs                       |  1 +
 frame/nicks/src/lib.rs                            |  1 +
 frame/node-authorization/src/lib.rs               |  1 +
 frame/offences/benchmarking/src/mock.rs           |  1 +
 frame/offences/src/mock.rs                        |  1 +
 frame/proxy/src/tests.rs                          |  1 +
 frame/randomness-collective-flip/src/lib.rs       |  1 +
 frame/recovery/src/mock.rs                        |  1 +
 frame/scheduler/src/lib.rs                        |  1 +
 frame/scored-pool/src/mock.rs                     |  1 +
 frame/session/benchmarking/src/mock.rs            |  1 +
 frame/session/src/mock.rs                         |  1 +
 frame/society/src/mock.rs                         |  1 +
 frame/staking/fuzzer/src/mock.rs                  |  1 +
 frame/staking/src/mock.rs                         |  1 +
 frame/sudo/src/mock.rs                            |  1 +
 frame/support/test/tests/pallet.rs                |  1 +
 frame/support/test/tests/pallet_compatibility.rs  |  1 +
 .../test/tests/pallet_compatibility_instance.rs   |  1 +
 frame/support/test/tests/pallet_instance.rs       |  1 +
 frame/support/test/tests/pallet_version.rs        |  1 +
 .../test/tests/pallet_with_name_trait_is_valid.rs |  1 +
 frame/system/benches/bench.rs                     |  1 +
 frame/system/benchmarking/src/mock.rs             |  1 +
 frame/system/src/lib.rs                           | 14 ++++++++++++++
 frame/system/src/mock.rs                          |  1 +
 frame/timestamp/src/lib.rs                        |  1 +
 frame/tips/src/tests.rs                           | 15 ++++++++-------
 frame/transaction-payment/src/lib.rs              |  1 +
 frame/treasury/src/tests.rs                       |  1 +
 frame/utility/src/tests.rs                        |  1 +
 frame/vesting/src/lib.rs                          |  1 +
 primitives/externalities/src/lib.rs               |  3 ---
 primitives/io/src/lib.rs                          |  5 -----
 primitives/state-machine/src/basic.rs             |  2 --
 primitives/state-machine/src/ext.rs               |  4 ----
 primitives/state-machine/src/read_only.rs         |  2 --
 primitives/tasks/src/async_externalities.rs       |  2 --
 test-utils/runtime/src/lib.rs                     |  1 +
 67 files changed, 85 insertions(+), 25 deletions(-)

diff --git a/bin/node-template/pallets/template/src/mock.rs b/bin/node-template/pallets/template/src/mock.rs
index 84af63a1c3bb..60d22aad7bc6 100644
--- a/bin/node-template/pallets/template/src/mock.rs
+++ b/bin/node-template/pallets/template/src/mock.rs
@@ -16,6 +16,7 @@ impl_outer_origin! {
 pub struct Test;
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
+	pub const SS58Prefix: u8 = 42;
 }
 
 impl system::Config for Test {
@@ -40,6 +41,7 @@ impl system::Config for Test {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = SS58Prefix;
 }
 
 impl Config for Test {
diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index 51df3dd5a3e4..081234677964 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -136,6 +136,7 @@ parameter_types! {
 		::with_sensible_defaults(2 * WEIGHT_PER_SECOND, NORMAL_DISPATCH_RATIO);
 	pub BlockLength: frame_system::limits::BlockLength = frame_system::limits::BlockLength
 		::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO);
+	pub const SS58Prefix: u8 = 42;
 }
 
 // Configure FRAME pallets to include in runtime.
@@ -185,6 +186,8 @@ impl frame_system::Config for Runtime {
 	type AccountData = pallet_balances::AccountData<Balance>;
 	/// Weight information for the extrinsics of this pallet.
 	type SystemWeightInfo = ();
+	/// This is used as an identifier of the chain. 42 is the generic substrate prefix.
+	type SS58Prefix = SS58Prefix;
 }
 
 impl pallet_aura::Config for Runtime {
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index a86b015dbcf9..4eee9d83a58e 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -176,6 +176,7 @@ parameter_types! {
 		})
 		.avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)
 		.build_or_panic();
+	pub const SS58Prefix: u8 = 42;
 }
 
 const_assert!(NORMAL_DISPATCH_RATIO.deconstruct() >= AVERAGE_ON_INITIALIZE_RATIO.deconstruct());
@@ -202,6 +203,7 @@ impl frame_system::Config for Runtime {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = frame_system::weights::SubstrateWeight<Runtime>;
+	type SS58Prefix = SS58Prefix;
 }
 
 impl pallet_utility::Config for Runtime {
diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index df1cb87f75b2..137ba81f389a 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -952,6 +952,7 @@ mod tests {
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
+		type SS58Prefix = ();
 	}
 
 	parameter_types! {
diff --git a/frame/atomic-swap/src/tests.rs b/frame/atomic-swap/src/tests.rs
index 47b5102bc568..19f5fc1dff58 100644
--- a/frame/atomic-swap/src/tests.rs
+++ b/frame/atomic-swap/src/tests.rs
@@ -42,6 +42,7 @@ impl frame_system::Config for Test {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
diff --git a/frame/aura/src/mock.rs b/frame/aura/src/mock.rs
index 1fcb1c2340d1..8d5cbcc9b7b0 100644
--- a/frame/aura/src/mock.rs
+++ b/frame/aura/src/mock.rs
@@ -66,6 +66,7 @@ impl frame_system::Config for Test {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 
 impl pallet_timestamp::Config for Test {
diff --git a/frame/authority-discovery/src/lib.rs b/frame/authority-discovery/src/lib.rs
index 2d275e01bba2..59321421755d 100644
--- a/frame/authority-discovery/src/lib.rs
+++ b/frame/authority-discovery/src/lib.rs
@@ -164,6 +164,7 @@ mod tests {
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
+		type SS58Prefix = ();
 	}
 
 	impl_outer_origin! {
diff --git a/frame/authorship/src/lib.rs b/frame/authorship/src/lib.rs
index 693375e3c50e..3672174e2574 100644
--- a/frame/authorship/src/lib.rs
+++ b/frame/authorship/src/lib.rs
@@ -438,6 +438,7 @@ mod tests {
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
+		type SS58Prefix = ();
 	}
 
 	parameter_types! {
diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index 77b117db7f36..f8805f7a1091 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -86,6 +86,7 @@ impl frame_system::Config for Test {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 
 impl<C> frame_system::offchain::SendTransactionTypes<C> for Test
diff --git a/frame/balances/src/tests_composite.rs b/frame/balances/src/tests_composite.rs
index 81c2b895273b..f98194c503e2 100644
--- a/frame/balances/src/tests_composite.rs
+++ b/frame/balances/src/tests_composite.rs
@@ -77,6 +77,7 @@ impl frame_system::Config for Test {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 parameter_types! {
 	pub const TransactionByteFee: u64 = 1;
diff --git a/frame/balances/src/tests_local.rs b/frame/balances/src/tests_local.rs
index c168e1d8e59e..e9d6fe2530a7 100644
--- a/frame/balances/src/tests_local.rs
+++ b/frame/balances/src/tests_local.rs
@@ -78,6 +78,7 @@ impl frame_system::Config for Test {
 	type OnNewAccount = ();
 	type OnKilledAccount = Module<Test>;
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 parameter_types! {
 	pub const TransactionByteFee: u64 = 1;
diff --git a/frame/benchmarking/src/tests.rs b/frame/benchmarking/src/tests.rs
index f86abebbb928..e31f5ec0916e 100644
--- a/frame/benchmarking/src/tests.rs
+++ b/frame/benchmarking/src/tests.rs
@@ -94,6 +94,7 @@ impl frame_system::Config for Test {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 
 impl Config for Test {
diff --git a/frame/bounties/src/tests.rs b/frame/bounties/src/tests.rs
index 4ebff64b4e48..bcf371eae492 100644
--- a/frame/bounties/src/tests.rs
+++ b/frame/bounties/src/tests.rs
@@ -82,6 +82,7 @@ impl frame_system::Config for Test {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
diff --git a/frame/collective/src/lib.rs b/frame/collective/src/lib.rs
index efc8626d6892..1448bd9bc3a8 100644
--- a/frame/collective/src/lib.rs
+++ b/frame/collective/src/lib.rs
@@ -996,6 +996,7 @@ mod tests {
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
+		type SS58Prefix = ();
 	}
 	impl Config<Instance1> for Test {
 		type Origin = Origin;
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index 6ac2fb0f976b..991a89563eb9 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -130,6 +130,7 @@ impl frame_system::Config for Test {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 impl pallet_balances::Config for Test {
 	type MaxLocks = ();
diff --git a/frame/democracy/src/tests.rs b/frame/democracy/src/tests.rs
index dae3a262209e..0e369bf3bd55 100644
--- a/frame/democracy/src/tests.rs
+++ b/frame/democracy/src/tests.rs
@@ -113,6 +113,7 @@ impl frame_system::Config for Test {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 parameter_types! {
 	pub MaximumSchedulerWeight: Weight = Perbill::from_percent(80) * BlockWeights::get().max_block;
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index b541303f651f..9b7b9064fbf2 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -1099,6 +1099,7 @@ mod tests {
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
+	type SS58Prefix = ();
 	}
 
 	parameter_types! {
diff --git a/frame/elections/src/mock.rs b/frame/elections/src/mock.rs
index 482c905f89c1..8a4111a38c4c 100644
--- a/frame/elections/src/mock.rs
+++ b/frame/elections/src/mock.rs
@@ -57,6 +57,7 @@ impl frame_system::Config for Test {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 
 parameter_types! {
diff --git a/frame/example-offchain-worker/src/tests.rs b/frame/example-offchain-worker/src/tests.rs
index 196d4cac4adc..a94174a33bb6 100644
--- a/frame/example-offchain-worker/src/tests.rs
+++ b/frame/example-offchain-worker/src/tests.rs
@@ -76,6 +76,7 @@ impl frame_system::Config for Test {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 
 type Extrinsic = TestXt<Call<Test>, ()>;
diff --git a/frame/example-parallel/src/tests.rs b/frame/example-parallel/src/tests.rs
index 24e846c3de42..3da41b22185e 100644
--- a/frame/example-parallel/src/tests.rs
+++ b/frame/example-parallel/src/tests.rs
@@ -59,6 +59,7 @@ impl frame_system::Config for Test {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 
 parameter_types! {
diff --git a/frame/example/src/lib.rs b/frame/example/src/lib.rs
index 3ddb2fd4c1d3..14c40778bab1 100644
--- a/frame/example/src/lib.rs
+++ b/frame/example/src/lib.rs
@@ -764,6 +764,7 @@ mod tests {
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
+		type SS58Prefix = ();
 	}
 	parameter_types! {
 		pub const ExistentialDeposit: u64 = 1;
diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index caba857254d6..cb45a49b233d 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -618,6 +618,7 @@ mod tests {
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
+		type SS58Prefix = ();
 	}
 
 	type Balance = u64;
diff --git a/frame/grandpa/src/mock.rs b/frame/grandpa/src/mock.rs
index ae13c946597e..288ef47a8ef9 100644
--- a/frame/grandpa/src/mock.rs
+++ b/frame/grandpa/src/mock.rs
@@ -100,6 +100,7 @@ impl frame_system::Config for Test {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 
 impl<C> frame_system::offchain::SendTransactionTypes<C> for Test
diff --git a/frame/identity/src/tests.rs b/frame/identity/src/tests.rs
index 7f3a95dcd124..04e6bb7df394 100644
--- a/frame/identity/src/tests.rs
+++ b/frame/identity/src/tests.rs
@@ -63,6 +63,7 @@ impl frame_system::Config for Test {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
diff --git a/frame/im-online/src/mock.rs b/frame/im-online/src/mock.rs
index 0a6dc1f79c07..71dc3d52acdb 100644
--- a/frame/im-online/src/mock.rs
+++ b/frame/im-online/src/mock.rs
@@ -130,6 +130,7 @@ impl frame_system::Config for Runtime {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 
 parameter_types! {
diff --git a/frame/indices/src/mock.rs b/frame/indices/src/mock.rs
index 63f0277548f9..0e1e9c3d4364 100644
--- a/frame/indices/src/mock.rs
+++ b/frame/indices/src/mock.rs
@@ -69,6 +69,7 @@ impl frame_system::Config for Test {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 
 parameter_types! {
diff --git a/frame/membership/src/lib.rs b/frame/membership/src/lib.rs
index cfdc38752b5e..943071c9a1d2 100644
--- a/frame/membership/src/lib.rs
+++ b/frame/membership/src/lib.rs
@@ -321,6 +321,7 @@ mod tests {
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
+		type SS58Prefix = ();
 	}
 	ord_parameter_types! {
 		pub const One: u64 = 1;
diff --git a/frame/merkle-mountain-range/src/mock.rs b/frame/merkle-mountain-range/src/mock.rs
index c311d53446bb..4865ea7e5723 100644
--- a/frame/merkle-mountain-range/src/mock.rs
+++ b/frame/merkle-mountain-range/src/mock.rs
@@ -63,6 +63,7 @@ impl frame_system::Config for Test {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 
 impl Config for Test {
diff --git a/frame/multisig/src/tests.rs b/frame/multisig/src/tests.rs
index 7a959ec37f28..4101b718bce6 100644
--- a/frame/multisig/src/tests.rs
+++ b/frame/multisig/src/tests.rs
@@ -80,6 +80,7 @@ impl frame_system::Config for Test {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
diff --git a/frame/nicks/src/lib.rs b/frame/nicks/src/lib.rs
index 2b74f323d872..994e6996a148 100644
--- a/frame/nicks/src/lib.rs
+++ b/frame/nicks/src/lib.rs
@@ -283,6 +283,7 @@ mod tests {
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
+		type SS58Prefix = ();
 	}
 	parameter_types! {
 		pub const ExistentialDeposit: u64 = 1;
diff --git a/frame/node-authorization/src/lib.rs b/frame/node-authorization/src/lib.rs
index 9641bea116a0..e48faef128d6 100644
--- a/frame/node-authorization/src/lib.rs
+++ b/frame/node-authorization/src/lib.rs
@@ -472,6 +472,7 @@ mod tests {
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
+		type SS58Prefix = ();
 	}
 
 	ord_parameter_types! {
diff --git a/frame/offences/benchmarking/src/mock.rs b/frame/offences/benchmarking/src/mock.rs
index e55d7ac8e3a7..2a93bfa2c8fe 100644
--- a/frame/offences/benchmarking/src/mock.rs
+++ b/frame/offences/benchmarking/src/mock.rs
@@ -63,6 +63,7 @@ impl frame_system::Config for Test {
 	type OnNewAccount = ();
 	type OnKilledAccount = (Balances,);
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 parameter_types! {
 	pub const ExistentialDeposit: Balance = 10;
diff --git a/frame/offences/src/mock.rs b/frame/offences/src/mock.rs
index 124b00302940..7d23780b12e4 100644
--- a/frame/offences/src/mock.rs
+++ b/frame/offences/src/mock.rs
@@ -116,6 +116,7 @@ impl frame_system::Config for Runtime {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 
 parameter_types! {
diff --git a/frame/proxy/src/tests.rs b/frame/proxy/src/tests.rs
index b1dca43b6a70..b3f9ebc75dd0 100644
--- a/frame/proxy/src/tests.rs
+++ b/frame/proxy/src/tests.rs
@@ -82,6 +82,7 @@ impl frame_system::Config for Test {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
diff --git a/frame/randomness-collective-flip/src/lib.rs b/frame/randomness-collective-flip/src/lib.rs
index 9332262d6876..04db12d1df65 100644
--- a/frame/randomness-collective-flip/src/lib.rs
+++ b/frame/randomness-collective-flip/src/lib.rs
@@ -180,6 +180,7 @@ mod tests {
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
+		type SS58Prefix = ();
 	}
 
 	type System = frame_system::Module<Test>;
diff --git a/frame/recovery/src/mock.rs b/frame/recovery/src/mock.rs
index 9b991987ceeb..130337678410 100644
--- a/frame/recovery/src/mock.rs
+++ b/frame/recovery/src/mock.rs
@@ -78,6 +78,7 @@ impl frame_system::Config for Test {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 
 parameter_types! {
diff --git a/frame/scheduler/src/lib.rs b/frame/scheduler/src/lib.rs
index 9f0f806233d8..67b86fad826f 100644
--- a/frame/scheduler/src/lib.rs
+++ b/frame/scheduler/src/lib.rs
@@ -837,6 +837,7 @@ mod tests {
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
+	type SS58Prefix = ();
 	}
 	impl logger::Config for Test {
 		type Event = ();
diff --git a/frame/scored-pool/src/mock.rs b/frame/scored-pool/src/mock.rs
index 7d49136cef4f..b96daf6ba324 100644
--- a/frame/scored-pool/src/mock.rs
+++ b/frame/scored-pool/src/mock.rs
@@ -68,6 +68,7 @@ impl frame_system::Config for Test {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 
 impl pallet_balances::Config for Test {
diff --git a/frame/session/benchmarking/src/mock.rs b/frame/session/benchmarking/src/mock.rs
index 9001dee87901..db6c465854b6 100644
--- a/frame/session/benchmarking/src/mock.rs
+++ b/frame/session/benchmarking/src/mock.rs
@@ -67,6 +67,7 @@ impl frame_system::Config for Test {
 	type OnNewAccount = ();
 	type OnKilledAccount = Balances;
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 parameter_types! {
 	pub const ExistentialDeposit: Balance = 10;
diff --git a/frame/session/src/mock.rs b/frame/session/src/mock.rs
index fa71859feb40..e69eec14b09f 100644
--- a/frame/session/src/mock.rs
+++ b/frame/session/src/mock.rs
@@ -218,6 +218,7 @@ impl frame_system::Config for Test {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 
 impl pallet_timestamp::Config for Test {
diff --git a/frame/society/src/mock.rs b/frame/society/src/mock.rs
index 6a718c218507..c70400806711 100644
--- a/frame/society/src/mock.rs
+++ b/frame/society/src/mock.rs
@@ -78,6 +78,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type AccountData = pallet_balances::AccountData<u64>;
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 
 impl pallet_balances::Config for Test {
diff --git a/frame/staking/fuzzer/src/mock.rs b/frame/staking/fuzzer/src/mock.rs
index 6f58d6a669d7..ca36bfb4c3bc 100644
--- a/frame/staking/fuzzer/src/mock.rs
+++ b/frame/staking/fuzzer/src/mock.rs
@@ -65,6 +65,7 @@ impl frame_system::Config for Test {
 	type OnNewAccount = ();
 	type OnKilledAccount = (Balances,);
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 parameter_types! {
 	pub const ExistentialDeposit: Balance = 10;
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index f3c6d50d4cf5..6f7842b6b5a9 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -166,6 +166,7 @@ impl frame_system::Config for Test {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 impl pallet_balances::Config for Test {
 	type MaxLocks = MaxLocks;
diff --git a/frame/sudo/src/mock.rs b/frame/sudo/src/mock.rs
index 12707d3e9da6..5a0919b8d73a 100644
--- a/frame/sudo/src/mock.rs
+++ b/frame/sudo/src/mock.rs
@@ -139,6 +139,7 @@ impl frame_system::Config for Test {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 
 // Implement the logger module's `Config` on the Test runtime.
diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index 5d2785ebf260..e05a0e9bdfee 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -364,6 +364,7 @@ impl frame_system::Config for Runtime {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 impl pallet::Config for Runtime {
 	type Event = Event;
diff --git a/frame/support/test/tests/pallet_compatibility.rs b/frame/support/test/tests/pallet_compatibility.rs
index 912d68baed16..5711326300c2 100644
--- a/frame/support/test/tests/pallet_compatibility.rs
+++ b/frame/support/test/tests/pallet_compatibility.rs
@@ -226,6 +226,7 @@ impl frame_system::Config for Runtime {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 impl pallet::Config for Runtime {
 	type Event = Event;
diff --git a/frame/support/test/tests/pallet_compatibility_instance.rs b/frame/support/test/tests/pallet_compatibility_instance.rs
index d2f7a6668ca6..cdcc6a99cf13 100644
--- a/frame/support/test/tests/pallet_compatibility_instance.rs
+++ b/frame/support/test/tests/pallet_compatibility_instance.rs
@@ -218,6 +218,7 @@ impl frame_system::Config for Runtime {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 impl pallet::Config for Runtime {
 	type Event = Event;
diff --git a/frame/support/test/tests/pallet_instance.rs b/frame/support/test/tests/pallet_instance.rs
index 82b058b7bddd..caa9019edf6b 100644
--- a/frame/support/test/tests/pallet_instance.rs
+++ b/frame/support/test/tests/pallet_instance.rs
@@ -259,6 +259,7 @@ impl frame_system::Config for Runtime {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 impl pallet::Config for Runtime {
 	type Event = Event;
diff --git a/frame/support/test/tests/pallet_version.rs b/frame/support/test/tests/pallet_version.rs
index 25320597ba49..e70d752e40f4 100644
--- a/frame/support/test/tests/pallet_version.rs
+++ b/frame/support/test/tests/pallet_version.rs
@@ -165,6 +165,7 @@ impl frame_system::Config for Runtime {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 
 frame_support::construct_runtime!(
diff --git a/frame/support/test/tests/pallet_with_name_trait_is_valid.rs b/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
index 01b965f3b514..fba19594897a 100644
--- a/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
+++ b/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
@@ -141,6 +141,7 @@ mod tests {
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
+		type SS58Prefix = ();
 	}
 
 	impl pallet_test::Trait for Runtime {
diff --git a/frame/system/benches/bench.rs b/frame/system/benches/bench.rs
index 490931748863..2e5d6292180b 100644
--- a/frame/system/benches/bench.rs
+++ b/frame/system/benches/bench.rs
@@ -87,6 +87,7 @@ impl system::Config for Runtime {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 
 impl module::Config for Runtime {
diff --git a/frame/system/benchmarking/src/mock.rs b/frame/system/benchmarking/src/mock.rs
index 8cfd70b2f095..686db8fb5a92 100644
--- a/frame/system/benchmarking/src/mock.rs
+++ b/frame/system/benchmarking/src/mock.rs
@@ -72,6 +72,7 @@ impl frame_system::Config for Test {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 
 impl crate::Config for Test {}
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index a89577a478b7..a8ffd05bf615 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -257,6 +257,13 @@ pub trait Config: 'static + Eq + Clone {
 	type OnKilledAccount: OnKilledAccount<Self::AccountId>;
 
 	type SystemWeightInfo: WeightInfo;
+
+	/// The designated SS85 prefix of this chain.
+	///
+	/// This replaces the "ss58Format" property declared in the chain spec. Reason is
+	/// that the runtime should know about the prefix in order to make use of it as
+	/// an identifier of the chain.
+	type SS58Prefix: Get<u8>;
 }
 
 pub type DigestOf<T> = generic::Digest<<T as Config>::Hash>;
@@ -516,6 +523,13 @@ decl_module! {
 		/// The weight configuration (limits & base values) for each class of extrinsics and block.
 		const BlockWeights: limits::BlockWeights = T::BlockWeights::get();
 
+		/// The designated SS85 prefix of this chain.
+		///
+		/// This replaces the "ss58Format" property declared in the chain spec. Reason is
+		/// that the runtime should know about the prefix in order to make use of it as
+		/// an identifier of the chain.
+		const SS58Prefix: u8 = T::SS58Prefix::get();
+
 		fn on_runtime_upgrade() -> frame_support::weights::Weight {
 			if !UpgradedToU32RefCount::get() {
 				Account::<T>::translate::<(T::Index, u8, T::AccountData), _>(|_key, (nonce, rc, data)|
diff --git a/frame/system/src/mock.rs b/frame/system/src/mock.rs
index 1558a5ed3970..e22f5870eef8 100644
--- a/frame/system/src/mock.rs
+++ b/frame/system/src/mock.rs
@@ -117,6 +117,7 @@ impl Config for Test {
 	type OnNewAccount = ();
 	type OnKilledAccount = RecordKilled;
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 
 pub type System = Module<Test>;
diff --git a/frame/timestamp/src/lib.rs b/frame/timestamp/src/lib.rs
index b62777832ab7..423f7f5128e8 100644
--- a/frame/timestamp/src/lib.rs
+++ b/frame/timestamp/src/lib.rs
@@ -335,6 +335,7 @@ mod tests {
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
+		type SS58Prefix = ();
 	}
 	parameter_types! {
 		pub const MinimumPeriod: u64 = 5;
diff --git a/frame/tips/src/tests.rs b/frame/tips/src/tests.rs
index 3bfecafeaf97..15f3481ba255 100644
--- a/frame/tips/src/tests.rs
+++ b/frame/tips/src/tests.rs
@@ -81,6 +81,7 @@ impl frame_system::Config for Test {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
@@ -292,28 +293,28 @@ fn slash_tip_works() {
 		System::set_block_number(1);
 		Balances::make_free_balance_be(&Treasury::account_id(), 101);
 		assert_eq!(Treasury::pot(), 100);
-		
+
 		assert_eq!(Balances::reserved_balance(0), 0);
 		assert_eq!(Balances::free_balance(0), 100);
-		
+
 		assert_ok!(TipsModTestInst::report_awesome(Origin::signed(0), b"awesome.dot".to_vec(), 3));
-		
+
 		assert_eq!(Balances::reserved_balance(0), 12);
 		assert_eq!(Balances::free_balance(0), 88);
-		
+
 		let h = tip_hash();
 		assert_eq!(last_event(), RawEvent::NewTip(h));
-		
+
 		// can't remove from any origin
 		assert_noop!(
 			TipsModTestInst::slash_tip(Origin::signed(0), h.clone()),
 			BadOrigin,
 		);
-		
+
 		// can remove from root.
 		assert_ok!(TipsModTestInst::slash_tip(Origin::root(), h.clone()));
 		assert_eq!(last_event(), RawEvent::TipSlashed(h, 0, 12));
-		
+
 		// tipper slashed
 		assert_eq!(Balances::reserved_balance(0), 0);
 		assert_eq!(Balances::free_balance(0), 88);
diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
index e530380dfbb4..a787836d24c0 100644
--- a/frame/transaction-payment/src/lib.rs
+++ b/frame/transaction-payment/src/lib.rs
@@ -662,6 +662,7 @@ mod tests {
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
+		type SS58Prefix = ();
 	}
 
 	parameter_types! {
diff --git a/frame/treasury/src/tests.rs b/frame/treasury/src/tests.rs
index 8db303a426d0..4d0bdf32e45f 100644
--- a/frame/treasury/src/tests.rs
+++ b/frame/treasury/src/tests.rs
@@ -80,6 +80,7 @@ impl frame_system::Config for Test {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
diff --git a/frame/utility/src/tests.rs b/frame/utility/src/tests.rs
index 95973a8823f5..4837be695265 100644
--- a/frame/utility/src/tests.rs
+++ b/frame/utility/src/tests.rs
@@ -118,6 +118,7 @@ impl frame_system::Config for Test {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
diff --git a/frame/vesting/src/lib.rs b/frame/vesting/src/lib.rs
index a7a8147a062f..6a65e58d4107 100644
--- a/frame/vesting/src/lib.rs
+++ b/frame/vesting/src/lib.rs
@@ -433,6 +433,7 @@ mod tests {
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
+		type SS58Prefix = ();
 	}
 	parameter_types! {
 		pub const MaxLocks: u32 = 10;
diff --git a/primitives/externalities/src/lib.rs b/primitives/externalities/src/lib.rs
index 6869969f4ba1..a6596a22d106 100644
--- a/primitives/externalities/src/lib.rs
+++ b/primitives/externalities/src/lib.rs
@@ -170,9 +170,6 @@ pub trait Externalities: ExtensionStore {
 		value: Option<Vec<u8>>,
 	);
 
-	/// Get the identity of the chain.
-	fn chain_id(&self) -> u64;
-
 	/// Get the trie root of the current storage map.
 	///
 	/// This will also update all child storage keys in the top-level storage map.
diff --git a/primitives/io/src/lib.rs b/primitives/io/src/lib.rs
index 023bf7dcb308..dba984f43335 100644
--- a/primitives/io/src/lib.rs
+++ b/primitives/io/src/lib.rs
@@ -388,11 +388,6 @@ pub trait Trie {
 /// Interface that provides miscellaneous functions for communicating between the runtime and the node.
 #[runtime_interface]
 pub trait Misc {
-	/// The current relay chain identifier.
-	fn chain_id(&self) -> u64 {
-		sp_externalities::Externalities::chain_id(*self)
-	}
-
 	/// Print a number.
 	fn print_num(val: u64) {
 		log::debug!(target: "runtime", "{}", val);
diff --git a/primitives/state-machine/src/basic.rs b/primitives/state-machine/src/basic.rs
index 9de75785e459..def0eecf709f 100644
--- a/primitives/state-machine/src/basic.rs
+++ b/primitives/state-machine/src/basic.rs
@@ -263,8 +263,6 @@ impl Externalities for BasicExternalities {
 		crate::ext::StorageAppend::new(current).append(value);
 	}
 
-	fn chain_id(&self) -> u64 { 42 }
-
 	fn storage_root(&mut self) -> Vec<u8> {
 		let mut top = self.inner.top.clone();
 		let prefixed_keys: Vec<_> = self.inner.children_default.iter().map(|(_k, v)| {
diff --git a/primitives/state-machine/src/ext.rs b/primitives/state-machine/src/ext.rs
index 3c4d88f3920b..c46d0d56be4b 100644
--- a/primitives/state-machine/src/ext.rs
+++ b/primitives/state-machine/src/ext.rs
@@ -507,10 +507,6 @@ where
 		StorageAppend::new(current_value).append(value);
 	}
 
-	fn chain_id(&self) -> u64 {
-		42
-	}
-
 	fn storage_root(&mut self) -> Vec<u8> {
 		let _guard = guard();
 		if let Some(ref root) = self.storage_transaction_cache.transaction_storage_root {
diff --git a/primitives/state-machine/src/read_only.rs b/primitives/state-machine/src/read_only.rs
index 2ab92f5fbb6c..ba9984a6c7d5 100644
--- a/primitives/state-machine/src/read_only.rs
+++ b/primitives/state-machine/src/read_only.rs
@@ -156,8 +156,6 @@ impl<'a, H: Hasher, B: 'a + Backend<H>> Externalities for ReadOnlyExternalities<
 		unimplemented!("storage_append is not supported in ReadOnlyExternalities")
 	}
 
-	fn chain_id(&self) -> u64 { 42 }
-
 	fn storage_root(&mut self) -> Vec<u8> {
 		unimplemented!("storage_root is not supported in ReadOnlyExternalities")
 	}
diff --git a/primitives/tasks/src/async_externalities.rs b/primitives/tasks/src/async_externalities.rs
index efb4c498f75f..e2afeee413cd 100644
--- a/primitives/tasks/src/async_externalities.rs
+++ b/primitives/tasks/src/async_externalities.rs
@@ -143,8 +143,6 @@ impl Externalities for AsyncExternalities {
 		panic!("`storage_append`: should not be used in async externalities!")
 	}
 
-	fn chain_id(&self) -> u64 { 42 }
-
 	fn storage_root(&mut self) -> Vec<u8> {
 		panic!("`storage_root`: should not be used in async externalities!")
 	}
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index 6bee4b704fc4..3e5ab8f69754 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -462,6 +462,7 @@ impl frame_system::Config for Runtime {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 
 impl pallet_timestamp::Config for Runtime {

From 2eaeb91bc6d20786aa4ad5f5538c0deac46e14cd Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Fri, 1 Jan 2021 17:46:38 +0100
Subject: [PATCH 0215/1194] remove some unecessary bound (#7813)

---
 frame/transaction-payment/rpc/src/lib.rs |  2 +-
 frame/transaction-payment/src/lib.rs     | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/frame/transaction-payment/rpc/src/lib.rs b/frame/transaction-payment/rpc/src/lib.rs
index 5043f0257fc3..bf1565f1a40e 100644
--- a/frame/transaction-payment/rpc/src/lib.rs
+++ b/frame/transaction-payment/rpc/src/lib.rs
@@ -73,7 +73,7 @@ impl<C, Block, Balance> TransactionPaymentApi<<Block as BlockT>::Hash, RuntimeDi
 	for TransactionPayment<C, Block>
 where
 	Block: BlockT,
-	C: Send + Sync + 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block>,
+	C: 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block>,
 	C::Api: TransactionPaymentRuntimeApi<Block, Balance>,
 	Balance: Codec + MaybeDisplay + MaybeFromStr,
 {
diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
index a787836d24c0..a9c595e57ac9 100644
--- a/frame/transaction-payment/src/lib.rs
+++ b/frame/transaction-payment/src/lib.rs
@@ -314,8 +314,6 @@ impl<T: Config> Module<T> where
 		len: u32,
 	) -> RuntimeDispatchInfo<BalanceOf<T>>
 	where
-		T: Send + Sync,
-		BalanceOf<T>: Send + Sync,
 		T::Call: Dispatchable<Info=DispatchInfo>,
 	{
 		// NOTE: we can actually make it understand `ChargeTransactionPayment`, but would be some
@@ -444,9 +442,9 @@ impl<T> Convert<Weight, BalanceOf<T>> for Module<T> where
 /// Require the transactor pay for themselves and maybe include a tip to gain additional priority
 /// in the queue.
 #[derive(Encode, Decode, Clone, Eq, PartialEq)]
-pub struct ChargeTransactionPayment<T: Config + Send + Sync>(#[codec(compact)] BalanceOf<T>);
+pub struct ChargeTransactionPayment<T: Config>(#[codec(compact)] BalanceOf<T>);
 
-impl<T: Config + Send + Sync> ChargeTransactionPayment<T> where
+impl<T: Config> ChargeTransactionPayment<T> where
 	T::Call: Dispatchable<Info=DispatchInfo, PostInfo=PostDispatchInfo>,
 	BalanceOf<T>: Send + Sync + FixedPointOperand,
 {
@@ -494,7 +492,7 @@ impl<T: Config + Send + Sync> ChargeTransactionPayment<T> where
 	}
 }
 
-impl<T: Config + Send + Sync> sp_std::fmt::Debug for ChargeTransactionPayment<T> {
+impl<T: Config> sp_std::fmt::Debug for ChargeTransactionPayment<T> {
 	#[cfg(feature = "std")]
 	fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
 		write!(f, "ChargeTransactionPayment<{:?}>", self.0)
@@ -505,7 +503,7 @@ impl<T: Config + Send + Sync> sp_std::fmt::Debug for ChargeTransactionPayment<T>
 	}
 }
 
-impl<T: Config + Send + Sync> SignedExtension for ChargeTransactionPayment<T> where
+impl<T: Config> SignedExtension for ChargeTransactionPayment<T> where
 	BalanceOf<T>: Send + Sync + From<u64> + FixedPointOperand,
 	T::Call: Dispatchable<Info=DispatchInfo, PostInfo=PostDispatchInfo>,
 {

From e8a8301c1b3c46926ea58941aed8de36772f2d0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Sun, 3 Jan 2021 22:17:31 +0100
Subject: [PATCH 0216/1194] Fix ss58check test when executed with other tests
 (#7815)

There was a bug that could make other ss58 tests fail when being
executed with this one in parallel. This test changes the default ss58
version and if other tests are run at the time the default version is
changed, they would fail. To fix this problem, we now run the actual
test as a new process.
---
 primitives/core/src/ecdsa.rs | 40 +++++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/primitives/core/src/ecdsa.rs b/primitives/core/src/ecdsa.rs
index a836eb0e4c22..8d2ba4a3d1b1 100644
--- a/primitives/core/src/ecdsa.rs
+++ b/primitives/core/src/ecdsa.rs
@@ -678,18 +678,34 @@ mod test {
 
 	#[test]
 	fn ss58check_custom_format_works() {
-		use crate::crypto::Ss58AddressFormat;
-		// temp save default format version
-		let default_format = Ss58AddressFormat::default();
-		// set current ss58 version is custom "200" `Ss58AddressFormat::Custom(200)`
-		set_default_ss58_version(Ss58AddressFormat::Custom(200));
-		// custom addr encoded by version 200
-		let addr = "2X64kMNEWAW5KLZMSKcGKEc96MyuaRsRUku7vomuYxKgqjVCRj";
-		Public::from_ss58check(&addr).unwrap();
-		set_default_ss58_version(default_format);
-		// set  current ss58 version to default version
-		let addr = "KWAfgC2aRG5UVD6CpbPQXCx4YZZUhvWqqAJE6qcYc9Rtr6g5C";
-		Public::from_ss58check(&addr).unwrap();
+		// We need to run this test in its own process to not interfere with other tests running in
+		// parallel and also relying on the ss58 version.
+		if std::env::var("RUN_CUSTOM_FORMAT_TEST") == Ok("1".into()) {
+			use crate::crypto::Ss58AddressFormat;
+			// temp save default format version
+			let default_format = Ss58AddressFormat::default();
+			// set current ss58 version is custom "200" `Ss58AddressFormat::Custom(200)`
+			set_default_ss58_version(Ss58AddressFormat::Custom(200));
+			// custom addr encoded by version 200
+			let addr = "2X64kMNEWAW5KLZMSKcGKEc96MyuaRsRUku7vomuYxKgqjVCRj";
+			Public::from_ss58check(&addr).unwrap();
+			set_default_ss58_version(default_format);
+			// set current ss58 version to default version
+			let addr = "KWAfgC2aRG5UVD6CpbPQXCx4YZZUhvWqqAJE6qcYc9Rtr6g5C";
+			Public::from_ss58check(&addr).unwrap();
+
+			println!("CUSTOM_FORMAT_SUCCESSFUL");
+		} else {
+			let executable = std::env::current_exe().unwrap();
+			let output = std::process::Command::new(executable)
+				.env("RUN_CUSTOM_FORMAT_TEST", "1")
+				.args(&["--nocapture", "ss58check_custom_format_works"])
+				.output()
+				.unwrap();
+
+			let output = String::from_utf8(output.stdout).unwrap();
+			assert!(output.contains("CUSTOM_FORMAT_SUCCESSFUL"));
+		}
 	}
 
 	#[test]

From 5215cd71aed415465e4d25926d426900a0b1f29a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Sun, 3 Jan 2021 23:29:46 +0000
Subject: [PATCH 0217/1194] Cleanup some warnings (#7816)

* client: cleanup redundant semicolon warnings

* grandpa: remove usage of deprecated compare_and_swap
---
 client/finality-grandpa/src/communication/mod.rs    | 2 +-
 client/finality-grandpa/src/import.rs               | 2 +-
 client/finality-grandpa/src/tests.rs                | 8 ++++----
 client/service/src/client/client.rs                 | 2 +-
 client/transaction-pool/graph/src/validated_pool.rs | 2 +-
 utils/fork-tree/src/lib.rs                          | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/client/finality-grandpa/src/communication/mod.rs b/client/finality-grandpa/src/communication/mod.rs
index 29fe8bc7471a..04c0a0f6ad0f 100644
--- a/client/finality-grandpa/src/communication/mod.rs
+++ b/client/finality-grandpa/src/communication/mod.rs
@@ -846,7 +846,7 @@ fn check_catch_up<Block: BlockT>(
 		}
 
 		Ok(())
-	};
+	}
 
 	check_weight(
 		voters,
diff --git a/client/finality-grandpa/src/import.rs b/client/finality-grandpa/src/import.rs
index 89f9d0c16ad7..749d482871e4 100644
--- a/client/finality-grandpa/src/import.rs
+++ b/client/finality-grandpa/src/import.rs
@@ -25,7 +25,7 @@ use parking_lot::RwLockWriteGuard;
 use sp_blockchain::{BlockStatus, well_known_cache_keys};
 use sc_client_api::{backend::Backend, utils::is_descendent_of};
 use sp_utils::mpsc::TracingUnboundedSender;
-use sp_api::{TransactionFor};
+use sp_api::TransactionFor;
 
 use sp_consensus::{
 	BlockImport, Error as ConsensusError,
diff --git a/client/finality-grandpa/src/tests.rs b/client/finality-grandpa/src/tests.rs
index 452b30941de5..cf1201c6e916 100644
--- a/client/finality-grandpa/src/tests.rs
+++ b/client/finality-grandpa/src/tests.rs
@@ -1068,7 +1068,7 @@ fn voter_persists_its_votes() {
 				drop(_block_import);
 				r
 			})
-	};
+	}
 
 	runtime.spawn(alice_voter1);
 
@@ -1110,7 +1110,7 @@ fn voter_persists_its_votes() {
 			let runtime_handle = runtime_handle.clone();
 
 			async move {
-				if state.compare_and_swap(0, 1, Ordering::SeqCst) == 0 {
+				if state.compare_exchange(0, 1, Ordering::SeqCst, Ordering::SeqCst).unwrap() == 0 {
 					// the first message we receive should be a prevote from alice.
 					let prevote = match signed.message {
 						finality_grandpa::Message::Prevote(prevote) => prevote,
@@ -1156,7 +1156,7 @@ fn voter_persists_its_votes() {
 					// we send in a loop including a delay until items are received, this can be
 					// ignored for the sake of reduced complexity.
 					Pin::new(&mut *round_tx.lock()).start_send(finality_grandpa::Message::Prevote(prevote)).unwrap();
-				} else if state.compare_and_swap(1, 2, Ordering::SeqCst) == 1 {
+				} else if state.compare_exchange(1, 2, Ordering::SeqCst, Ordering::SeqCst).unwrap() == 1 {
 					// the next message we receive should be our own prevote
 					let prevote = match signed.message {
 						finality_grandpa::Message::Prevote(prevote) => prevote,
@@ -1170,7 +1170,7 @@ fn voter_persists_its_votes() {
 					// therefore we won't ever receive it again since it will be a
 					// known message on the gossip layer
 
-				} else if state.compare_and_swap(2, 3, Ordering::SeqCst) == 2 {
+				} else if state.compare_exchange(2, 3, Ordering::SeqCst, Ordering::SeqCst).unwrap() == 2 {
 					// we then receive a precommit from alice for block 15
 					// even though we casted a prevote for block 30
 					let precommit = match signed.message {
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index 84174738b560..26892416b34f 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -401,7 +401,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 			storage: &'a dyn ChangesTrieStorage<HashFor<Block>, NumberFor<Block>>,
 			min: NumberFor<Block>,
 			required_roots_proofs: Mutex<BTreeMap<NumberFor<Block>, Block::Hash>>,
-		};
+		}
 
 		impl<'a, Block: BlockT> ChangesTrieRootsStorage<HashFor<Block>, NumberFor<Block>> for
 			AccessedRootsRecorder<'a, Block>
diff --git a/client/transaction-pool/graph/src/validated_pool.rs b/client/transaction-pool/graph/src/validated_pool.rs
index 86c2e75832f0..ad2fdda73b49 100644
--- a/client/transaction-pool/graph/src/validated_pool.rs
+++ b/client/transaction-pool/graph/src/validated_pool.rs
@@ -286,7 +286,7 @@ impl<B: ChainApi> ValidatedPool<B> {
 	/// Transactions that are missing from the pool are not submitted.
 	pub fn resubmit(&self, mut updated_transactions: HashMap<ExtrinsicHash<B>, ValidatedTransactionFor<B>>) {
 		#[derive(Debug, Clone, Copy, PartialEq)]
-		enum Status { Future, Ready, Failed, Dropped };
+		enum Status { Future, Ready, Failed, Dropped }
 
 		let (mut initial_statuses, final_statuses) = {
 			let mut pool = self.pool.write();
diff --git a/utils/fork-tree/src/lib.rs b/utils/fork-tree/src/lib.rs
index d2a0a4f3dd65..2eaced74d319 100644
--- a/utils/fork-tree/src/lib.rs
+++ b/utils/fork-tree/src/lib.rs
@@ -1224,7 +1224,7 @@ mod test {
 	#[test]
 	fn finalize_with_descendent_works() {
 		#[derive(Debug, PartialEq)]
-		struct Change { effective: u64 };
+		struct Change { effective: u64 }
 
 		let (mut tree, is_descendent_of) = {
 			let mut tree = ForkTree::new();

From 9b08105b8c7106d723c4f470304ad9e2868569d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Mon, 4 Jan 2021 10:03:13 +0100
Subject: [PATCH 0218/1194] Happy new year (#7814)

* Happy new year

Updates the copyright years and fixes wrong license headers.

* Fix the template

* Split HEADER into HEADER-APACHE & HEADER-GPL
---
 .maintain/frame-weight-template.hbs           |  2 +-
 .maintain/update-copyright.sh                 | 11 +++---
 HEADER => HEADER-APACHE                       |  2 +-
 docs/license_header.txt => HEADER-GPL         | 12 ++++---
 bin/node-template/node/src/command.rs         |  2 +-
 bin/node/bench/src/common.rs                  |  5 ++-
 bin/node/bench/src/construct.rs               |  2 +-
 bin/node/bench/src/core.rs                    |  2 +-
 bin/node/bench/src/generator.rs               |  2 +-
 bin/node/bench/src/import.rs                  |  2 +-
 bin/node/bench/src/main.rs                    |  2 +-
 bin/node/bench/src/simple_trie.rs             |  2 +-
 bin/node/bench/src/state_sizes.rs             | 16 +++++----
 bin/node/bench/src/tempdb.rs                  |  2 +-
 bin/node/bench/src/trie.rs                    |  2 +-
 bin/node/bench/src/txpool.rs                  |  2 +-
 bin/node/browser-testing/src/lib.rs           |  2 +-
 bin/node/cli/bin/main.rs                      |  2 +-
 bin/node/cli/build.rs                         |  2 +-
 bin/node/cli/src/browser.rs                   |  2 +-
 bin/node/cli/src/chain_spec.rs                |  2 +-
 bin/node/cli/src/cli.rs                       |  2 +-
 bin/node/cli/src/command.rs                   |  2 +-
 bin/node/cli/src/lib.rs                       |  2 +-
 bin/node/cli/src/service.rs                   |  2 +-
 bin/node/cli/tests/build_spec_works.rs        |  2 +-
 bin/node/cli/tests/check_block_works.rs       |  2 +-
 bin/node/cli/tests/common.rs                  |  2 +-
 bin/node/cli/tests/export_import_flow.rs      |  2 +-
 bin/node/cli/tests/inspect_works.rs           |  2 +-
 bin/node/cli/tests/purge_chain_works.rs       |  2 +-
 .../tests/running_the_node_and_interrupt.rs   |  2 +-
 bin/node/cli/tests/temp_base_path_works.rs    |  2 +-
 bin/node/cli/tests/version.rs                 |  2 +-
 bin/node/executor/benches/bench.rs            |  2 +-
 bin/node/executor/src/lib.rs                  |  2 +-
 bin/node/executor/tests/basic.rs              |  2 +-
 bin/node/executor/tests/common.rs             |  2 +-
 bin/node/executor/tests/fees.rs               |  2 +-
 bin/node/executor/tests/submit_transaction.rs |  2 +-
 bin/node/inspect/src/cli.rs                   |  2 +-
 bin/node/inspect/src/command.rs               |  2 +-
 bin/node/inspect/src/lib.rs                   |  2 +-
 bin/node/primitives/src/lib.rs                |  2 +-
 bin/node/rpc-client/src/main.rs               |  2 +-
 bin/node/rpc/src/lib.rs                       |  2 +-
 bin/node/runtime/build.rs                     |  2 +-
 bin/node/runtime/src/constants.rs             |  2 +-
 bin/node/runtime/src/impls.rs                 |  2 +-
 bin/node/runtime/src/lib.rs                   |  2 +-
 bin/node/testing/src/bench.rs                 |  2 +-
 bin/node/testing/src/client.rs                |  2 +-
 bin/node/testing/src/genesis.rs               |  2 +-
 bin/node/testing/src/keyring.rs               |  2 +-
 bin/node/testing/src/lib.rs                   |  2 +-
 bin/utils/chain-spec-builder/build.rs         |  2 +-
 bin/utils/chain-spec-builder/src/main.rs      |  2 +-
 bin/utils/subkey/src/lib.rs                   |  2 +-
 bin/utils/subkey/src/main.rs                  |  2 +-
 client/api/src/backend.rs                     |  2 +-
 client/api/src/call_executor.rs               |  2 +-
 client/api/src/cht.rs                         |  2 +-
 client/api/src/client.rs                      | 12 ++++---
 client/api/src/execution_extensions.rs        | 12 ++++---
 client/api/src/in_mem.rs                      |  2 +-
 client/api/src/leaves.rs                      |  2 +-
 client/api/src/lib.rs                         | 12 ++++---
 client/api/src/light.rs                       | 12 ++++---
 client/api/src/notifications.rs               |  2 +-
 client/api/src/proof_provider.rs              |  2 +-
 client/authority-discovery/src/error.rs       | 12 ++++---
 client/authority-discovery/src/interval.rs    | 12 ++++---
 client/authority-discovery/src/lib.rs         | 12 ++++---
 client/authority-discovery/src/service.rs     | 12 ++++---
 client/authority-discovery/src/tests.rs       |  2 +-
 client/authority-discovery/src/worker.rs      | 12 ++++---
 .../src/worker/addr_cache.rs                  | 12 ++++---
 .../authority-discovery/src/worker/tests.rs   |  2 +-
 .../basic-authorship/src/basic_authorship.rs  |  2 +-
 client/basic-authorship/src/lib.rs            |  2 +-
 client/block-builder/src/lib.rs               |  2 +-
 client/chain-spec/derive/src/impls.rs         | 12 ++++---
 client/chain-spec/derive/src/lib.rs           | 12 ++++---
 client/chain-spec/src/chain_spec.rs           |  2 +-
 client/chain-spec/src/extension.rs            | 12 ++++---
 client/chain-spec/src/lib.rs                  | 12 ++++---
 client/cli/proc-macro/src/lib.rs              |  2 +-
 client/cli/src/arg_enums.rs                   |  2 +-
 client/cli/src/commands/build_spec_cmd.rs     |  2 +-
 client/cli/src/commands/check_block_cmd.rs    |  2 +-
 client/cli/src/commands/export_blocks_cmd.rs  |  2 +-
 client/cli/src/commands/export_state_cmd.rs   |  2 +-
 client/cli/src/commands/generate.rs           |  2 +-
 client/cli/src/commands/generate_node_key.rs  |  2 +-
 client/cli/src/commands/import_blocks_cmd.rs  |  2 +-
 client/cli/src/commands/insert_key.rs         |  2 +-
 client/cli/src/commands/inspect_key.rs        |  2 +-
 client/cli/src/commands/inspect_node_key.rs   |  2 +-
 client/cli/src/commands/key.rs                |  2 +-
 client/cli/src/commands/mod.rs                |  2 +-
 client/cli/src/commands/purge_chain_cmd.rs    |  2 +-
 client/cli/src/commands/revert_cmd.rs         |  2 +-
 client/cli/src/commands/run_cmd.rs            |  2 +-
 client/cli/src/commands/sign.rs               |  2 +-
 client/cli/src/commands/utils.rs              |  2 +-
 client/cli/src/commands/vanity.rs             |  2 +-
 client/cli/src/commands/verify.rs             |  2 +-
 client/cli/src/config.rs                      |  2 +-
 client/cli/src/error.rs                       |  2 +-
 client/cli/src/lib.rs                         |  2 +-
 client/cli/src/params/database_params.rs      |  2 +-
 client/cli/src/params/import_params.rs        |  2 +-
 client/cli/src/params/keystore_params.rs      |  2 +-
 client/cli/src/params/mod.rs                  |  2 +-
 client/cli/src/params/network_params.rs       |  2 +-
 client/cli/src/params/node_key_params.rs      |  2 +-
 .../cli/src/params/offchain_worker_params.rs  |  2 +-
 client/cli/src/params/pruning_params.rs       |  2 +-
 client/cli/src/params/shared_params.rs        |  2 +-
 .../cli/src/params/transaction_pool_params.rs |  2 +-
 client/cli/src/runner.rs                      |  2 +-
 client/consensus/aura/src/digests.rs          |  2 +-
 client/consensus/aura/src/lib.rs              |  2 +-
 client/consensus/babe/rpc/src/lib.rs          |  2 +-
 client/consensus/babe/src/authorship.rs       | 12 ++++---
 client/consensus/babe/src/aux_schema.rs       | 12 ++++---
 client/consensus/babe/src/lib.rs              | 12 ++++---
 client/consensus/babe/src/tests.rs            | 12 ++++---
 client/consensus/babe/src/verification.rs     | 12 ++++---
 client/consensus/common/src/lib.rs            | 12 ++++---
 client/consensus/common/src/longest_chain.rs  | 15 ++++----
 client/consensus/epochs/src/lib.rs            | 12 ++++---
 client/consensus/epochs/src/migration.rs      | 12 ++++---
 client/consensus/manual-seal/src/consensus.rs |  2 +-
 .../manual-seal/src/consensus/babe.rs         |  2 +-
 client/consensus/manual-seal/src/error.rs     |  2 +-
 .../manual-seal/src/finalize_block.rs         | 12 ++++---
 client/consensus/manual-seal/src/lib.rs       |  2 +-
 client/consensus/manual-seal/src/rpc.rs       | 12 ++++---
 .../consensus/manual-seal/src/seal_block.rs   | 12 ++++---
 client/consensus/pow/src/lib.rs               |  2 +-
 client/consensus/pow/src/worker.rs            |  2 +-
 client/consensus/slots/build.rs               | 12 ++++---
 client/consensus/slots/src/aux_schema.rs      | 12 ++++---
 client/consensus/slots/src/lib.rs             | 12 ++++---
 client/consensus/slots/src/slots.rs           | 12 ++++---
 client/consensus/uncles/src/lib.rs            | 12 ++++---
 client/db/src/bench.rs                        |  2 +-
 client/db/src/cache/list_cache.rs             |  2 +-
 client/db/src/cache/list_entry.rs             |  2 +-
 client/db/src/cache/list_storage.rs           |  2 +-
 client/db/src/cache/mod.rs                    |  2 +-
 client/db/src/changes_tries_storage.rs        | 12 ++++---
 client/db/src/children.rs                     | 12 ++++---
 client/db/src/lib.rs                          |  2 +-
 client/db/src/light.rs                        |  2 +-
 client/db/src/offchain.rs                     |  2 +-
 client/db/src/parity_db.rs                    |  2 +-
 client/db/src/stats.rs                        |  2 +-
 client/db/src/storage_cache.rs                | 12 ++++---
 client/db/src/upgrade.rs                      | 12 ++++---
 client/db/src/utils.rs                        |  2 +-
 client/executor/common/src/error.rs           |  2 +-
 client/executor/common/src/lib.rs             | 12 ++++---
 client/executor/common/src/sandbox.rs         |  2 +-
 client/executor/common/src/util.rs            |  2 +-
 client/executor/common/src/wasm_runtime.rs    | 12 ++++---
 client/executor/runtime-test/build.rs         | 12 ++++---
 client/executor/src/integration_tests/mod.rs  |  2 +-
 .../executor/src/integration_tests/sandbox.rs |  2 +-
 client/executor/src/lib.rs                    |  2 +-
 client/executor/src/native_executor.rs        |  2 +-
 client/executor/src/wasm_runtime.rs           | 12 ++++---
 client/executor/wasmi/src/lib.rs              | 12 ++++---
 client/executor/wasmtime/src/host.rs          | 12 ++++---
 client/executor/wasmtime/src/imports.rs       |  2 +-
 .../executor/wasmtime/src/instance_wrapper.rs |  2 +-
 .../src/instance_wrapper/globals_snapshot.rs  |  2 +-
 client/executor/wasmtime/src/lib.rs           | 12 ++++---
 client/executor/wasmtime/src/runtime.rs       | 12 ++++---
 client/executor/wasmtime/src/state_holder.rs  |  2 +-
 client/executor/wasmtime/src/util.rs          | 12 ++++---
 client/finality-grandpa/rpc/src/error.rs      |  2 +-
 client/finality-grandpa/rpc/src/finality.rs   |  2 +-
 client/finality-grandpa/rpc/src/lib.rs        |  2 +-
 .../finality-grandpa/rpc/src/notification.rs  |  2 +-
 client/finality-grandpa/rpc/src/report.rs     |  2 +-
 client/finality-grandpa/src/authorities.rs    |  2 +-
 client/finality-grandpa/src/aux_schema.rs     | 12 ++++---
 .../src/communication/gossip.rs               | 12 ++++---
 .../finality-grandpa/src/communication/mod.rs |  2 +-
 .../src/communication/periodic.rs             | 12 ++++---
 .../src/communication/tests.rs                | 12 ++++---
 client/finality-grandpa/src/environment.rs    |  2 +-
 client/finality-grandpa/src/finality_proof.rs |  2 +-
 client/finality-grandpa/src/import.rs         |  2 +-
 client/finality-grandpa/src/justification.rs  |  2 +-
 client/finality-grandpa/src/lib.rs            |  2 +-
 client/finality-grandpa/src/notification.rs   |  2 +-
 client/finality-grandpa/src/observer.rs       |  2 +-
 client/finality-grandpa/src/tests.rs          |  2 +-
 client/finality-grandpa/src/until_imported.rs |  2 +-
 client/finality-grandpa/src/voting_rule.rs    |  2 +-
 client/informant/src/display.rs               | 12 ++++---
 client/informant/src/lib.rs                   |  2 +-
 client/keystore/src/lib.rs                    | 12 ++++---
 client/keystore/src/local.rs                  |  2 +-
 client/light/src/backend.rs                   |  2 +-
 client/light/src/blockchain.rs                |  2 +-
 client/light/src/call_executor.rs             |  2 +-
 client/light/src/fetcher.rs                   |  2 +-
 client/light/src/lib.rs                       |  2 +-
 client/network-gossip/src/bridge.rs           | 12 ++++---
 client/network-gossip/src/lib.rs              | 12 ++++---
 client/network-gossip/src/state_machine.rs    |  2 +-
 client/network-gossip/src/validator.rs        |  2 +-
 client/network/src/behaviour.rs               | 12 ++++---
 client/network/src/block_requests.rs          | 18 +++++-----
 client/network/src/chain.rs                   |  2 +-
 client/network/src/config.rs                  |  2 +-
 client/network/src/discovery.rs               | 12 ++++---
 client/network/src/error.rs                   |  2 +-
 client/network/src/gossip.rs                  |  2 +-
 client/network/src/gossip/tests.rs            |  2 +-
 client/network/src/lib.rs                     |  2 +-
 client/network/src/light_client_handler.rs    | 18 +++++-----
 client/network/src/network_state.rs           |  2 +-
 client/network/src/on_demand_layer.rs         |  2 +-
 client/network/src/peer_info.rs               | 12 ++++---
 client/network/src/protocol.rs                |  2 +-
 client/network/src/protocol/event.rs          | 12 ++++---
 client/network/src/protocol/generic_proto.rs  | 12 ++++---
 .../src/protocol/generic_proto/behaviour.rs   | 12 ++++---
 .../src/protocol/generic_proto/handler.rs     | 12 ++++---
 .../src/protocol/generic_proto/tests.rs       | 12 ++++---
 .../src/protocol/generic_proto/upgrade.rs     |  2 +-
 .../protocol/generic_proto/upgrade/collec.rs  | 36 +++++++++----------
 .../protocol/generic_proto/upgrade/legacy.rs  |  2 +-
 .../generic_proto/upgrade/notifications.rs    | 12 ++++---
 client/network/src/protocol/message.rs        |  2 +-
 client/network/src/protocol/sync.rs           | 18 +++++-----
 client/network/src/protocol/sync/blocks.rs    |  2 +-
 .../src/protocol/sync/extra_requests.rs       |  2 +-
 client/network/src/request_responses.rs       | 12 ++++---
 client/network/src/schema.rs                  |  2 +-
 client/network/src/service.rs                 |  2 +-
 client/network/src/service/metrics.rs         |  2 +-
 client/network/src/service/out_events.rs      |  2 +-
 client/network/src/service/tests.rs           |  2 +-
 client/network/src/transport.rs               |  2 +-
 client/network/src/utils.rs                   | 12 ++++---
 client/network/test/src/block_import.rs       |  2 +-
 client/network/test/src/lib.rs                |  2 +-
 client/network/test/src/sync.rs               |  2 +-
 client/offchain/src/api.rs                    | 12 ++++---
 client/offchain/src/api/http.rs               | 12 ++++---
 client/offchain/src/api/http_dummy.rs         | 12 ++++---
 client/offchain/src/api/timestamp.rs          | 12 ++++---
 client/offchain/src/lib.rs                    | 12 ++++---
 client/peerset/src/lib.rs                     |  2 +-
 client/peerset/src/peersstate.rs              | 12 ++++---
 client/peerset/tests/fuzz.rs                  |  2 +-
 client/proposer-metrics/src/lib.rs            | 12 ++++---
 client/rpc-api/src/author/error.rs            |  2 +-
 client/rpc-api/src/author/hash.rs             | 12 ++++---
 client/rpc-api/src/author/mod.rs              |  2 +-
 client/rpc-api/src/chain/error.rs             |  2 +-
 client/rpc-api/src/chain/mod.rs               |  2 +-
 client/rpc-api/src/child_state/mod.rs         |  2 +-
 client/rpc-api/src/errors.rs                  |  2 +-
 client/rpc-api/src/helpers.rs                 |  2 +-
 client/rpc-api/src/lib.rs                     | 12 ++++---
 client/rpc-api/src/metadata.rs                |  2 +-
 client/rpc-api/src/offchain/error.rs          |  2 +-
 client/rpc-api/src/offchain/mod.rs            |  2 +-
 client/rpc-api/src/policy.rs                  |  2 +-
 client/rpc-api/src/state/error.rs             |  2 +-
 client/rpc-api/src/state/helpers.rs           |  2 +-
 client/rpc-api/src/state/mod.rs               |  2 +-
 client/rpc-api/src/system/error.rs            |  2 +-
 client/rpc-api/src/system/helpers.rs          |  2 +-
 client/rpc-api/src/system/mod.rs              |  2 +-
 client/rpc-servers/src/lib.rs                 |  2 +-
 client/rpc-servers/src/middleware.rs          |  2 +-
 client/rpc/src/author/mod.rs                  |  2 +-
 client/rpc/src/author/tests.rs                |  2 +-
 client/rpc/src/chain/chain_full.rs            | 12 ++++---
 client/rpc/src/chain/chain_light.rs           | 12 ++++---
 client/rpc/src/chain/mod.rs                   |  2 +-
 client/rpc/src/chain/tests.rs                 |  2 +-
 client/rpc/src/lib.rs                         |  2 +-
 client/rpc/src/offchain/mod.rs                |  2 +-
 client/rpc/src/offchain/tests.rs              |  2 +-
 client/rpc/src/state/mod.rs                   |  2 +-
 client/rpc/src/state/state_full.rs            | 12 ++++---
 client/rpc/src/state/state_light.rs           | 12 ++++---
 client/rpc/src/state/tests.rs                 |  2 +-
 client/rpc/src/system/mod.rs                  |  2 +-
 client/rpc/src/system/tests.rs                |  2 +-
 client/rpc/src/testing.rs                     |  2 +-
 client/service/src/builder.rs                 |  2 +-
 client/service/src/chain_ops/check_block.rs   | 12 ++++---
 client/service/src/chain_ops/export_blocks.rs | 12 ++++---
 .../service/src/chain_ops/export_raw_state.rs | 12 ++++---
 client/service/src/chain_ops/import_blocks.rs |  2 +-
 client/service/src/chain_ops/mod.rs           | 12 ++++---
 client/service/src/chain_ops/revert_chain.rs  | 12 ++++---
 client/service/src/client/block_rules.rs      |  2 +-
 client/service/src/client/call_executor.rs    |  2 +-
 client/service/src/client/client.rs           |  2 +-
 client/service/src/client/genesis.rs          |  2 +-
 client/service/src/client/light.rs            |  2 +-
 client/service/src/client/mod.rs              |  2 +-
 client/service/src/client/wasm_override.rs    |  2 +-
 client/service/src/config.rs                  |  2 +-
 client/service/src/error.rs                   |  2 +-
 client/service/src/lib.rs                     |  2 +-
 client/service/src/metrics.rs                 |  2 +-
 client/service/src/task_manager/mod.rs        | 13 ++++---
 .../src/task_manager/prometheus_future.rs     | 13 ++++---
 client/service/src/task_manager/tests.rs      |  2 +-
 client/service/test/src/client/db.rs          |  2 +-
 client/service/test/src/client/light.rs       |  2 +-
 client/service/test/src/client/mod.rs         |  2 +-
 client/service/test/src/lib.rs                |  2 +-
 client/state-db/src/lib.rs                    |  2 +-
 client/state-db/src/noncanonical.rs           |  2 +-
 client/state-db/src/pruning.rs                |  2 +-
 client/state-db/src/test.rs                   |  2 +-
 client/sync-state-rpc/src/lib.rs              | 12 ++++---
 client/telemetry/src/lib.rs                   |  2 +-
 client/telemetry/src/worker.rs                |  2 +-
 client/telemetry/src/worker/node.rs           |  2 +-
 client/tracing/src/lib.rs                     | 12 ++++---
 client/tracing/src/logging.rs                 |  2 +-
 .../transaction-pool/graph/benches/basics.rs  |  2 +-
 .../transaction-pool/graph/src/base_pool.rs   |  2 +-
 client/transaction-pool/graph/src/future.rs   |  2 +-
 client/transaction-pool/graph/src/lib.rs      |  2 +-
 client/transaction-pool/graph/src/listener.rs |  2 +-
 client/transaction-pool/graph/src/pool.rs     |  2 +-
 client/transaction-pool/graph/src/ready.rs    |  2 +-
 client/transaction-pool/graph/src/rotator.rs  |  2 +-
 .../transaction-pool/graph/src/tracked_map.rs |  2 +-
 .../graph/src/validated_pool.rs               |  2 +-
 client/transaction-pool/graph/src/watcher.rs  |  2 +-
 client/transaction-pool/src/api.rs            |  2 +-
 client/transaction-pool/src/error.rs          |  2 +-
 client/transaction-pool/src/lib.rs            |  2 +-
 client/transaction-pool/src/metrics.rs        |  2 +-
 client/transaction-pool/src/revalidation.rs   |  2 +-
 client/transaction-pool/src/testing/mod.rs    |  2 +-
 client/transaction-pool/src/testing/pool.rs   |  2 +-
 frame/assets/src/benchmarking.rs              |  2 +-
 frame/assets/src/lib.rs                       |  2 +-
 frame/assets/src/weights.rs                   |  2 +-
 frame/atomic-swap/src/lib.rs                  |  2 +-
 frame/aura/src/lib.rs                         |  2 +-
 frame/aura/src/mock.rs                        |  2 +-
 frame/aura/src/tests.rs                       |  2 +-
 frame/authority-discovery/src/lib.rs          |  2 +-
 frame/authorship/src/lib.rs                   |  2 +-
 frame/babe/src/benchmarking.rs                |  2 +-
 frame/babe/src/default_weights.rs             |  2 +-
 frame/babe/src/equivocation.rs                |  2 +-
 frame/babe/src/lib.rs                         |  2 +-
 frame/babe/src/mock.rs                        |  2 +-
 frame/babe/src/tests.rs                       |  2 +-
 frame/balances/src/benchmarking.rs            |  2 +-
 frame/balances/src/lib.rs                     |  2 +-
 frame/balances/src/tests.rs                   |  2 +-
 frame/balances/src/tests_composite.rs         |  2 +-
 frame/balances/src/tests_local.rs             |  2 +-
 frame/balances/src/weights.rs                 |  2 +-
 frame/benchmarking/src/analysis.rs            |  2 +-
 frame/benchmarking/src/lib.rs                 |  2 +-
 frame/benchmarking/src/tests.rs               |  2 +-
 frame/benchmarking/src/utils.rs               |  2 +-
 frame/bounties/src/benchmarking.rs            |  2 +-
 frame/bounties/src/lib.rs                     |  2 +-
 frame/bounties/src/tests.rs                   |  2 +-
 frame/bounties/src/weights.rs                 |  2 +-
 frame/collective/src/benchmarking.rs          |  2 +-
 frame/collective/src/lib.rs                   |  2 +-
 frame/collective/src/weights.rs               |  2 +-
 frame/contracts/common/src/lib.rs             | 27 +++++++-------
 frame/contracts/proc-macro/src/lib.rs         |  2 +-
 frame/contracts/rpc/runtime-api/src/lib.rs    |  2 +-
 frame/contracts/rpc/src/lib.rs                |  2 +-
 frame/contracts/src/benchmarking/code.rs      |  2 +-
 frame/contracts/src/benchmarking/mod.rs       |  2 +-
 frame/contracts/src/benchmarking/sandbox.rs   |  2 +-
 frame/contracts/src/exec.rs                   | 27 +++++++-------
 frame/contracts/src/gas.rs                    | 27 +++++++-------
 frame/contracts/src/lib.rs                    | 27 +++++++-------
 frame/contracts/src/rent.rs                   | 27 +++++++-------
 frame/contracts/src/schedule.rs               | 27 +++++++-------
 frame/contracts/src/storage.rs                | 29 +++++++--------
 frame/contracts/src/tests.rs                  | 27 +++++++-------
 frame/contracts/src/wasm/code_cache.rs        | 25 ++++++-------
 frame/contracts/src/wasm/env_def/macros.rs    | 27 +++++++-------
 frame/contracts/src/wasm/env_def/mod.rs       | 25 ++++++-------
 frame/contracts/src/wasm/mod.rs               | 27 +++++++-------
 frame/contracts/src/wasm/prepare.rs           | 27 +++++++-------
 frame/contracts/src/wasm/runtime.rs           | 25 ++++++-------
 frame/contracts/src/weights.rs                |  2 +-
 frame/democracy/src/benchmarking.rs           |  2 +-
 frame/democracy/src/conviction.rs             |  2 +-
 frame/democracy/src/lib.rs                    |  2 +-
 frame/democracy/src/tests.rs                  |  2 +-
 frame/democracy/src/tests/cancellation.rs     |  2 +-
 frame/democracy/src/tests/decoders.rs         | 25 ++++++-------
 frame/democracy/src/tests/delegation.rs       |  2 +-
 .../democracy/src/tests/external_proposing.rs |  2 +-
 frame/democracy/src/tests/fast_tracking.rs    |  2 +-
 frame/democracy/src/tests/lock_voting.rs      |  2 +-
 frame/democracy/src/tests/preimage.rs         |  2 +-
 frame/democracy/src/tests/public_proposals.rs |  2 +-
 frame/democracy/src/tests/scheduling.rs       |  2 +-
 frame/democracy/src/tests/voting.rs           |  2 +-
 frame/democracy/src/types.rs                  |  2 +-
 frame/democracy/src/vote.rs                   |  2 +-
 frame/democracy/src/vote_threshold.rs         |  2 +-
 frame/democracy/src/weights.rs                |  2 +-
 frame/elections-phragmen/src/benchmarking.rs  | 27 +++++++-------
 frame/elections-phragmen/src/lib.rs           |  2 +-
 frame/elections-phragmen/src/weights.rs       |  2 +-
 frame/elections/src/lib.rs                    |  2 +-
 frame/elections/src/mock.rs                   |  2 +-
 frame/elections/src/tests.rs                  |  2 +-
 frame/example-offchain-worker/src/lib.rs      |  2 +-
 frame/example-offchain-worker/src/tests.rs    |  2 +-
 frame/example-parallel/src/lib.rs             |  2 +-
 frame/example-parallel/src/tests.rs           |  2 +-
 frame/example/src/lib.rs                      |  2 +-
 frame/executive/src/lib.rs                    |  2 +-
 frame/grandpa/src/benchmarking.rs             |  2 +-
 frame/grandpa/src/default_weights.rs          |  2 +-
 frame/grandpa/src/equivocation.rs             |  2 +-
 frame/grandpa/src/lib.rs                      |  2 +-
 frame/grandpa/src/mock.rs                     |  2 +-
 frame/grandpa/src/tests.rs                    |  2 +-
 frame/identity/src/benchmarking.rs            |  2 +-
 frame/identity/src/lib.rs                     |  2 +-
 frame/identity/src/tests.rs                   |  2 +-
 frame/identity/src/weights.rs                 |  2 +-
 frame/im-online/src/benchmarking.rs           |  2 +-
 frame/im-online/src/lib.rs                    |  2 +-
 frame/im-online/src/mock.rs                   |  2 +-
 frame/im-online/src/tests.rs                  |  2 +-
 frame/im-online/src/weights.rs                |  2 +-
 frame/indices/src/benchmarking.rs             |  2 +-
 frame/indices/src/lib.rs                      |  2 +-
 frame/indices/src/mock.rs                     |  2 +-
 frame/indices/src/tests.rs                    |  2 +-
 frame/indices/src/weights.rs                  |  2 +-
 frame/membership/src/lib.rs                   |  2 +-
 .../merkle-mountain-range/src/benchmarking.rs |  2 +-
 .../src/default_weights.rs                    |  2 +-
 frame/merkle-mountain-range/src/lib.rs        |  2 +-
 frame/merkle-mountain-range/src/mmr/mmr.rs    |  2 +-
 frame/merkle-mountain-range/src/mmr/mod.rs    |  2 +-
 .../merkle-mountain-range/src/mmr/storage.rs  |  2 +-
 frame/merkle-mountain-range/src/mmr/utils.rs  |  2 +-
 frame/merkle-mountain-range/src/mock.rs       |  2 +-
 frame/merkle-mountain-range/src/primitives.rs |  2 +-
 frame/merkle-mountain-range/src/tests.rs      |  2 +-
 frame/metadata/src/lib.rs                     |  2 +-
 frame/multisig/src/benchmarking.rs            |  2 +-
 frame/multisig/src/lib.rs                     |  2 +-
 frame/multisig/src/tests.rs                   |  2 +-
 frame/multisig/src/weights.rs                 |  2 +-
 frame/nicks/src/lib.rs                        |  2 +-
 frame/node-authorization/src/lib.rs           |  2 +-
 frame/offences/benchmarking/src/lib.rs        |  2 +-
 frame/offences/benchmarking/src/mock.rs       |  2 +-
 frame/offences/src/lib.rs                     |  2 +-
 frame/offences/src/mock.rs                    |  2 +-
 frame/offences/src/tests.rs                   |  2 +-
 frame/proxy/src/benchmarking.rs               |  2 +-
 frame/proxy/src/lib.rs                        |  2 +-
 frame/proxy/src/tests.rs                      |  2 +-
 frame/proxy/src/weights.rs                    |  2 +-
 frame/randomness-collective-flip/src/lib.rs   |  2 +-
 frame/recovery/src/lib.rs                     |  2 +-
 frame/recovery/src/mock.rs                    |  2 +-
 frame/recovery/src/tests.rs                   |  2 +-
 frame/scheduler/src/benchmarking.rs           |  2 +-
 frame/scheduler/src/lib.rs                    |  2 +-
 frame/scheduler/src/weights.rs                |  2 +-
 frame/scored-pool/src/lib.rs                  |  2 +-
 frame/scored-pool/src/mock.rs                 |  2 +-
 frame/scored-pool/src/tests.rs                |  2 +-
 frame/session/benchmarking/src/lib.rs         |  2 +-
 frame/session/benchmarking/src/mock.rs        |  2 +-
 frame/session/src/historical/mod.rs           |  2 +-
 frame/session/src/historical/offchain.rs      |  2 +-
 frame/session/src/historical/onchain.rs       |  2 +-
 frame/session/src/historical/shared.rs        |  2 +-
 frame/session/src/lib.rs                      |  2 +-
 frame/session/src/mock.rs                     |  2 +-
 frame/session/src/tests.rs                    |  2 +-
 frame/session/src/weights.rs                  |  2 +-
 frame/society/src/lib.rs                      |  2 +-
 frame/society/src/mock.rs                     |  2 +-
 frame/society/src/tests.rs                    |  2 +-
 frame/staking/fuzzer/src/mock.rs              |  2 +-
 frame/staking/fuzzer/src/submit_solution.rs   |  2 +-
 frame/staking/reward-curve/src/lib.rs         |  2 +-
 frame/staking/reward-curve/tests/test.rs      |  2 +-
 frame/staking/src/benchmarking.rs             |  2 +-
 frame/staking/src/inflation.rs                |  2 +-
 frame/staking/src/lib.rs                      |  2 +-
 frame/staking/src/mock.rs                     |  2 +-
 frame/staking/src/offchain_election.rs        |  2 +-
 frame/staking/src/slashing.rs                 |  2 +-
 frame/staking/src/testing_utils.rs            |  2 +-
 frame/staking/src/tests.rs                    |  2 +-
 frame/staking/src/weights.rs                  |  2 +-
 frame/sudo/src/lib.rs                         |  2 +-
 frame/sudo/src/mock.rs                        |  2 +-
 frame/sudo/src/tests.rs                       |  2 +-
 .../support/procedural/src/clone_no_bound.rs  |  2 +-
 .../procedural/src/construct_runtime/mod.rs   |  2 +-
 .../procedural/src/construct_runtime/parse.rs |  2 +-
 .../support/procedural/src/debug_no_bound.rs  |  2 +-
 frame/support/procedural/src/lib.rs           |  2 +-
 .../procedural/src/pallet/expand/call.rs      |  2 +-
 .../procedural/src/pallet/expand/constants.rs |  2 +-
 .../procedural/src/pallet/expand/error.rs     |  2 +-
 .../procedural/src/pallet/expand/event.rs     |  2 +-
 .../src/pallet/expand/genesis_build.rs        |  2 +-
 .../src/pallet/expand/genesis_config.rs       |  2 +-
 .../procedural/src/pallet/expand/hooks.rs     |  2 +-
 .../procedural/src/pallet/expand/instances.rs |  2 +-
 .../procedural/src/pallet/expand/mod.rs       |  2 +-
 .../src/pallet/expand/pallet_struct.rs        |  2 +-
 .../procedural/src/pallet/expand/storage.rs   |  2 +-
 .../src/pallet/expand/store_trait.rs          |  2 +-
 .../src/pallet/expand/type_value.rs           |  2 +-
 frame/support/procedural/src/pallet/mod.rs    |  2 +-
 .../procedural/src/pallet/parse/call.rs       |  2 +-
 .../procedural/src/pallet/parse/config.rs     |  2 +-
 .../procedural/src/pallet/parse/error.rs      |  2 +-
 .../procedural/src/pallet/parse/event.rs      |  2 +-
 .../src/pallet/parse/extra_constants.rs       |  2 +-
 .../src/pallet/parse/genesis_build.rs         |  2 +-
 .../src/pallet/parse/genesis_config.rs        |  2 +-
 .../procedural/src/pallet/parse/helper.rs     |  2 +-
 .../procedural/src/pallet/parse/hooks.rs      |  2 +-
 .../procedural/src/pallet/parse/inherent.rs   |  2 +-
 .../procedural/src/pallet/parse/mod.rs        |  2 +-
 .../procedural/src/pallet/parse/origin.rs     |  2 +-
 .../src/pallet/parse/pallet_struct.rs         |  2 +-
 .../procedural/src/pallet/parse/storage.rs    |  2 +-
 .../procedural/src/pallet/parse/type_value.rs |  2 +-
 .../src/pallet/parse/validate_unsigned.rs     |  2 +-
 .../support/procedural/src/pallet_version.rs  |  2 +-
 .../procedural/src/partial_eq_no_bound.rs     |  2 +-
 .../src/storage/genesis_config/builder_def.rs |  2 +-
 .../genesis_config/genesis_config_def.rs      |  2 +-
 .../src/storage/genesis_config/mod.rs         |  2 +-
 .../support/procedural/src/storage/getters.rs |  2 +-
 .../procedural/src/storage/instance_trait.rs  |  2 +-
 .../procedural/src/storage/metadata.rs        |  2 +-
 frame/support/procedural/src/storage/mod.rs   |  2 +-
 frame/support/procedural/src/storage/parse.rs |  2 +-
 .../procedural/src/storage/storage_struct.rs  |  2 +-
 .../procedural/src/storage/store_trait.rs     |  2 +-
 frame/support/procedural/src/transactional.rs |  2 +-
 .../procedural/tools/derive/src/lib.rs        |  2 +-
 frame/support/procedural/tools/src/lib.rs     |  2 +-
 frame/support/procedural/tools/src/syn_ext.rs |  2 +-
 frame/support/src/debug.rs                    |  2 +-
 frame/support/src/dispatch.rs                 |  2 +-
 frame/support/src/error.rs                    |  2 +-
 frame/support/src/event.rs                    | 24 +++++++------
 frame/support/src/genesis_config.rs           |  2 +-
 frame/support/src/hash.rs                     |  2 +-
 frame/support/src/inherent.rs                 |  2 +-
 frame/support/src/instances.rs                |  2 +-
 frame/support/src/lib.rs                      |  2 +-
 frame/support/src/metadata.rs                 |  2 +-
 frame/support/src/origin.rs                   |  2 +-
 frame/support/src/storage/child.rs            |  2 +-
 .../src/storage/generator/double_map.rs       |  2 +-
 frame/support/src/storage/generator/map.rs    |  2 +-
 frame/support/src/storage/generator/mod.rs    |  2 +-
 frame/support/src/storage/generator/value.rs  |  2 +-
 frame/support/src/storage/hashed.rs           |  2 +-
 frame/support/src/storage/migration.rs        |  2 +-
 frame/support/src/storage/mod.rs              |  2 +-
 frame/support/src/storage/types/double_map.rs |  2 +-
 frame/support/src/storage/types/map.rs        |  2 +-
 frame/support/src/storage/types/mod.rs        |  2 +-
 frame/support/src/storage/types/value.rs      |  2 +-
 frame/support/src/storage/unhashed.rs         |  2 +-
 frame/support/src/traits.rs                   |  2 +-
 frame/support/src/unsigned.rs                 |  2 +-
 frame/support/src/weights.rs                  |  2 +-
 frame/support/test/src/lib.rs                 |  2 +-
 frame/support/test/src/pallet_version.rs      |  2 +-
 frame/support/test/tests/construct_runtime.rs |  2 +-
 .../test/tests/construct_runtime_ui.rs        |  2 +-
 frame/support/test/tests/decl_module_ui.rs    |  2 +-
 frame/support/test/tests/decl_storage.rs      |  2 +-
 frame/support/test/tests/decl_storage_ui.rs   |  2 +-
 .../tests/decl_storage_ui/config_duplicate.rs |  2 +-
 .../decl_storage_ui/config_get_duplicate.rs   |  2 +-
 .../tests/decl_storage_ui/get_duplicate.rs    |  2 +-
 frame/support/test/tests/derive_no_bound.rs   |  2 +-
 .../support/test/tests/derive_no_bound_ui.rs  |  2 +-
 frame/support/test/tests/final_keys.rs        |  2 +-
 frame/support/test/tests/genesisconfig.rs     |  2 +-
 frame/support/test/tests/instance.rs          |  2 +-
 frame/support/test/tests/issue2219.rs         |  2 +-
 frame/support/test/tests/pallet.rs            |  2 +-
 .../test/tests/pallet_compatibility.rs        |  2 +-
 .../tests/pallet_compatibility_instance.rs    |  2 +-
 frame/support/test/tests/pallet_instance.rs   |  2 +-
 frame/support/test/tests/pallet_ui.rs         |  2 +-
 frame/support/test/tests/pallet_version.rs    |  2 +-
 .../tests/pallet_with_name_trait_is_valid.rs  |  2 +-
 frame/support/test/tests/reserved_keyword.rs  |  2 +-
 .../support/test/tests/storage_transaction.rs |  2 +-
 frame/support/test/tests/system.rs            |  2 +-
 frame/system/benches/bench.rs                 |  2 +-
 frame/system/benchmarking/src/lib.rs          |  2 +-
 frame/system/benchmarking/src/mock.rs         |  2 +-
 frame/system/rpc/runtime-api/src/lib.rs       |  2 +-
 frame/system/src/extensions/check_genesis.rs  |  2 +-
 .../system/src/extensions/check_mortality.rs  |  2 +-
 frame/system/src/extensions/check_nonce.rs    |  2 +-
 .../src/extensions/check_spec_version.rs      |  2 +-
 .../system/src/extensions/check_tx_version.rs |  2 +-
 frame/system/src/extensions/check_weight.rs   |  2 +-
 frame/system/src/extensions/mod.rs            |  2 +-
 frame/system/src/lib.rs                       |  2 +-
 frame/system/src/limits.rs                    |  2 +-
 frame/system/src/mock.rs                      |  2 +-
 frame/system/src/offchain.rs                  |  2 +-
 frame/system/src/tests.rs                     |  2 +-
 frame/system/src/weights.rs                   |  2 +-
 frame/timestamp/src/benchmarking.rs           |  2 +-
 frame/timestamp/src/lib.rs                    |  2 +-
 frame/timestamp/src/weights.rs                |  2 +-
 frame/tips/src/benchmarking.rs                |  2 +-
 frame/tips/src/lib.rs                         |  2 +-
 frame/tips/src/tests.rs                       |  2 +-
 frame/tips/src/weights.rs                     |  2 +-
 .../rpc/runtime-api/src/lib.rs                |  2 +-
 frame/transaction-payment/rpc/src/lib.rs      |  2 +-
 frame/transaction-payment/src/lib.rs          |  2 +-
 frame/treasury/src/benchmarking.rs            |  2 +-
 frame/treasury/src/lib.rs                     |  2 +-
 frame/treasury/src/tests.rs                   |  2 +-
 frame/treasury/src/weights.rs                 |  2 +-
 frame/utility/src/benchmarking.rs             |  2 +-
 frame/utility/src/lib.rs                      |  2 +-
 frame/utility/src/tests.rs                    |  2 +-
 frame/utility/src/weights.rs                  |  2 +-
 frame/vesting/src/benchmarking.rs             |  2 +-
 frame/vesting/src/lib.rs                      |  2 +-
 frame/vesting/src/weights.rs                  |  2 +-
 primitives/allocator/src/error.rs             |  2 +-
 primitives/allocator/src/freeing_bump.rs      |  2 +-
 primitives/allocator/src/lib.rs               |  2 +-
 .../api/proc-macro/src/decl_runtime_apis.rs   |  2 +-
 .../api/proc-macro/src/impl_runtime_apis.rs   |  2 +-
 primitives/api/proc-macro/src/lib.rs          |  2 +-
 .../proc-macro/src/mock_impl_runtime_apis.rs  |  2 +-
 primitives/api/proc-macro/src/utils.rs        |  2 +-
 primitives/api/src/lib.rs                     |  2 +-
 primitives/api/test/benches/bench.rs          |  2 +-
 primitives/api/test/tests/decl_and_impl.rs    |  2 +-
 primitives/api/test/tests/runtime_calls.rs    |  2 +-
 primitives/api/test/tests/trybuild.rs         |  2 +-
 primitives/application-crypto/src/ecdsa.rs    | 27 +++++++-------
 primitives/application-crypto/src/ed25519.rs  |  2 +-
 primitives/application-crypto/src/lib.rs      |  2 +-
 primitives/application-crypto/src/sr25519.rs  |  2 +-
 primitives/application-crypto/src/traits.rs   |  2 +-
 .../application-crypto/test/src/ecdsa.rs      | 25 ++++++-------
 .../application-crypto/test/src/ed25519.rs    |  2 +-
 primitives/application-crypto/test/src/lib.rs |  2 +-
 .../application-crypto/test/src/sr25519.rs    |  2 +-
 primitives/arithmetic/benches/bench.rs        |  2 +-
 primitives/arithmetic/fuzzer/src/biguint.rs   |  2 +-
 .../arithmetic/fuzzer/src/fixed_point.rs      |  2 +-
 .../fuzzer/src/multiply_by_rational.rs        |  2 +-
 primitives/arithmetic/fuzzer/src/normalize.rs |  2 +-
 .../fuzzer/src/per_thing_rational.rs          |  2 +-
 primitives/arithmetic/src/biguint.rs          |  2 +-
 primitives/arithmetic/src/fixed_point.rs      | 27 +++++++-------
 primitives/arithmetic/src/helpers_128bit.rs   |  2 +-
 primitives/arithmetic/src/lib.rs              |  2 +-
 primitives/arithmetic/src/per_things.rs       |  2 +-
 primitives/arithmetic/src/rational.rs         |  2 +-
 primitives/arithmetic/src/traits.rs           |  2 +-
 primitives/authority-discovery/src/lib.rs     |  2 +-
 primitives/authorship/src/lib.rs              |  2 +-
 primitives/block-builder/src/lib.rs           |  2 +-
 primitives/blockchain/src/backend.rs          |  2 +-
 primitives/blockchain/src/error.rs            |  2 +-
 primitives/blockchain/src/header_metadata.rs  |  2 +-
 primitives/blockchain/src/lib.rs              |  2 +-
 primitives/chain-spec/src/lib.rs              |  2 +-
 primitives/consensus/aura/src/inherents.rs    |  2 +-
 primitives/consensus/aura/src/lib.rs          |  2 +-
 primitives/consensus/babe/src/digests.rs      |  2 +-
 primitives/consensus/babe/src/inherents.rs    |  2 +-
 primitives/consensus/babe/src/lib.rs          |  2 +-
 .../consensus/common/src/block_import.rs      |  2 +-
 .../consensus/common/src/block_validation.rs  | 25 ++++++-------
 primitives/consensus/common/src/error.rs      |  2 +-
 primitives/consensus/common/src/evaluation.rs |  2 +-
 .../consensus/common/src/import_queue.rs      |  2 +-
 .../common/src/import_queue/basic_queue.rs    |  2 +-
 .../common/src/import_queue/buffered_link.rs  |  2 +-
 primitives/consensus/common/src/lib.rs        | 31 ++++++++--------
 primitives/consensus/common/src/metrics.rs    | 25 ++++++-------
 .../consensus/common/src/offline_tracker.rs   |  2 +-
 .../consensus/common/src/select_chain.rs      | 31 ++++++++--------
 primitives/consensus/pow/src/lib.rs           |  2 +-
 primitives/consensus/slots/src/lib.rs         |  2 +-
 primitives/consensus/vrf/src/lib.rs           |  2 +-
 primitives/consensus/vrf/src/schnorrkel.rs    |  2 +-
 primitives/core/src/changes_trie.rs           |  2 +-
 primitives/core/src/crypto.rs                 |  2 +-
 primitives/core/src/ecdsa.rs                  |  2 +-
 primitives/core/src/ed25519.rs                |  2 +-
 primitives/core/src/hash.rs                   |  2 +-
 primitives/core/src/hasher.rs                 |  2 +-
 primitives/core/src/hashing.rs                |  2 +-
 primitives/core/src/hexdisplay.rs             |  2 +-
 primitives/core/src/lib.rs                    |  2 +-
 primitives/core/src/offchain/mod.rs           |  2 +-
 primitives/core/src/offchain/storage.rs       |  2 +-
 primitives/core/src/offchain/testing.rs       |  2 +-
 primitives/core/src/sandbox.rs                |  2 +-
 primitives/core/src/sr25519.rs                |  2 +-
 primitives/core/src/testing.rs                |  2 +-
 primitives/core/src/traits.rs                 |  2 +-
 primitives/core/src/u32_trait.rs              |  2 +-
 primitives/core/src/uint.rs                   |  2 +-
 primitives/database/src/error.rs              |  2 +-
 primitives/database/src/kvdb.rs               |  2 +-
 primitives/database/src/lib.rs                |  2 +-
 primitives/database/src/mem.rs                |  2 +-
 primitives/debug-derive/src/impls.rs          |  2 +-
 primitives/debug-derive/src/lib.rs            |  2 +-
 primitives/debug-derive/tests/tests.rs        |  2 +-
 primitives/externalities/src/extensions.rs    |  2 +-
 primitives/externalities/src/lib.rs           |  2 +-
 primitives/externalities/src/scope_limited.rs |  2 +-
 primitives/finality-grandpa/src/lib.rs        |  2 +-
 primitives/inherents/src/lib.rs               |  2 +-
 primitives/io/src/batch_verifier.rs           |  2 +-
 primitives/io/src/lib.rs                      |  2 +-
 primitives/keyring/src/ed25519.rs             |  2 +-
 primitives/keyring/src/lib.rs                 |  2 +-
 primitives/keyring/src/sr25519.rs             |  2 +-
 primitives/keystore/src/lib.rs                |  2 +-
 primitives/keystore/src/testing.rs            |  2 +-
 primitives/keystore/src/vrf.rs                |  2 +-
 .../npos-elections/compact/src/assignment.rs  |  2 +-
 .../npos-elections/compact/src/codec.rs       |  2 +-
 primitives/npos-elections/compact/src/lib.rs  |  2 +-
 .../npos-elections/fuzzer/src/common.rs       |  2 +-
 .../fuzzer/src/phragmen_balancing.rs          |  2 +-
 .../fuzzer/src/phragmms_balancing.rs          |  2 +-
 .../npos-elections/fuzzer/src/reduce.rs       |  2 +-
 primitives/npos-elections/src/balancing.rs    |  2 +-
 primitives/npos-elections/src/helpers.rs      |  2 +-
 primitives/npos-elections/src/lib.rs          |  2 +-
 primitives/npos-elections/src/mock.rs         |  2 +-
 primitives/npos-elections/src/node.rs         |  2 +-
 primitives/npos-elections/src/phragmen.rs     |  2 +-
 primitives/npos-elections/src/phragmms.rs     |  2 +-
 primitives/npos-elections/src/reduce.rs       |  2 +-
 primitives/npos-elections/src/tests.rs        |  2 +-
 primitives/offchain/src/lib.rs                |  2 +-
 primitives/panic-handler/src/lib.rs           |  2 +-
 primitives/rpc/src/lib.rs                     |  2 +-
 primitives/rpc/src/list.rs                    |  2 +-
 primitives/rpc/src/number.rs                  |  2 +-
 .../runtime-interface/proc-macro/src/lib.rs   |  2 +-
 .../proc-macro/src/pass_by/codec.rs           |  2 +-
 .../proc-macro/src/pass_by/enum_.rs           |  2 +-
 .../proc-macro/src/pass_by/inner.rs           |  2 +-
 .../proc-macro/src/pass_by/mod.rs             |  2 +-
 .../bare_function_interface.rs                |  2 +-
 .../host_function_interface.rs                |  2 +-
 .../proc-macro/src/runtime_interface/mod.rs   |  2 +-
 .../src/runtime_interface/trait_decl_impl.rs  |  2 +-
 .../runtime-interface/proc-macro/src/utils.rs | 29 +++++++--------
 primitives/runtime-interface/src/host.rs      |  2 +-
 primitives/runtime-interface/src/impls.rs     |  2 +-
 primitives/runtime-interface/src/lib.rs       |  2 +-
 primitives/runtime-interface/src/pass_by.rs   |  2 +-
 primitives/runtime-interface/src/util.rs      |  2 +-
 primitives/runtime-interface/src/wasm.rs      |  2 +-
 .../test-wasm-deprecated/build.rs             |  2 +-
 .../test-wasm-deprecated/src/lib.rs           |  2 +-
 .../runtime-interface/test-wasm/build.rs      |  2 +-
 .../runtime-interface/test-wasm/src/lib.rs    |  2 +-
 primitives/runtime-interface/test/src/lib.rs  |  2 +-
 primitives/runtime-interface/tests/ui.rs      |  2 +-
 primitives/runtime/src/curve.rs               |  2 +-
 primitives/runtime/src/generic/block.rs       |  2 +-
 .../runtime/src/generic/checked_extrinsic.rs  |  2 +-
 primitives/runtime/src/generic/digest.rs      |  2 +-
 primitives/runtime/src/generic/era.rs         |  2 +-
 primitives/runtime/src/generic/header.rs      |  2 +-
 primitives/runtime/src/generic/mod.rs         |  2 +-
 primitives/runtime/src/generic/tests.rs       |  2 +-
 .../src/generic/unchecked_extrinsic.rs        |  2 +-
 primitives/runtime/src/lib.rs                 |  2 +-
 primitives/runtime/src/multiaddress.rs        |  2 +-
 primitives/runtime/src/offchain/http.rs       |  2 +-
 primitives/runtime/src/offchain/mod.rs        |  2 +-
 primitives/runtime/src/offchain/storage.rs    |  2 +-
 .../runtime/src/offchain/storage_lock.rs      | 27 +++++++-------
 .../runtime/src/random_number_generator.rs    |  2 +-
 primitives/runtime/src/runtime_string.rs      |  2 +-
 primitives/runtime/src/testing.rs             |  2 +-
 primitives/runtime/src/traits.rs              |  2 +-
 .../runtime/src/transaction_validity.rs       |  2 +-
 primitives/sandbox/src/lib.rs                 |  2 +-
 primitives/sandbox/with_std.rs                |  2 +-
 primitives/sandbox/without_std.rs             |  2 +-
 primitives/serializer/src/lib.rs              |  2 +-
 primitives/session/src/lib.rs                 |  2 +-
 primitives/sr-api/proc-macro/src/lib.rs       | 25 ++++++-------
 primitives/staking/src/lib.rs                 | 23 ++++++------
 primitives/staking/src/offence.rs             |  2 +-
 primitives/state-machine/src/backend.rs       |  2 +-
 primitives/state-machine/src/basic.rs         |  2 +-
 .../state-machine/src/changes_trie/build.rs   |  2 +-
 .../src/changes_trie/build_cache.rs           |  2 +-
 .../src/changes_trie/build_iterator.rs        |  2 +-
 .../src/changes_trie/changes_iterator.rs      |  2 +-
 .../state-machine/src/changes_trie/input.rs   |  2 +-
 .../state-machine/src/changes_trie/mod.rs     |  2 +-
 .../state-machine/src/changes_trie/prune.rs   |  2 +-
 .../state-machine/src/changes_trie/storage.rs |  2 +-
 .../src/changes_trie/surface_iterator.rs      |  2 +-
 primitives/state-machine/src/error.rs         |  2 +-
 primitives/state-machine/src/ext.rs           |  2 +-
 .../state-machine/src/in_memory_backend.rs    | 27 +++++++-------
 primitives/state-machine/src/lib.rs           |  2 +-
 .../src/overlayed_changes/changeset.rs        |  2 +-
 .../src/overlayed_changes/mod.rs              |  2 +-
 .../state-machine/src/proving_backend.rs      |  2 +-
 primitives/state-machine/src/read_only.rs     |  2 +-
 primitives/state-machine/src/stats.rs         |  2 +-
 primitives/state-machine/src/testing.rs       |  2 +-
 primitives/state-machine/src/trie_backend.rs  |  2 +-
 .../state-machine/src/trie_backend_essence.rs |  2 +-
 primitives/std/src/lib.rs                     |  2 +-
 primitives/std/with_std.rs                    |  2 +-
 primitives/std/without_std.rs                 |  2 +-
 primitives/storage/src/lib.rs                 |  2 +-
 primitives/tasks/src/async_externalities.rs   |  2 +-
 primitives/tasks/src/lib.rs                   |  2 +-
 primitives/test-primitives/src/lib.rs         |  2 +-
 primitives/timestamp/src/lib.rs               |  2 +-
 primitives/tracing/src/lib.rs                 |  2 +-
 primitives/tracing/src/types.rs               |  2 +-
 primitives/transaction-pool/src/error.rs      |  2 +-
 primitives/transaction-pool/src/lib.rs        |  2 +-
 primitives/transaction-pool/src/pool.rs       |  2 +-
 .../transaction-pool/src/runtime_api.rs       |  2 +-
 primitives/trie/benches/bench.rs              | 25 ++++++-------
 primitives/trie/src/error.rs                  | 21 +++++++----
 primitives/trie/src/lib.rs                    | 27 +++++++-------
 primitives/trie/src/node_codec.rs             | 27 +++++++-------
 primitives/trie/src/node_header.rs            | 25 ++++++-------
 primitives/trie/src/storage_proof.rs          | 27 +++++++-------
 primitives/trie/src/trie_stream.rs            | 27 +++++++-------
 primitives/utils/src/lib.rs                   |  2 +-
 primitives/utils/src/metrics.rs               |  2 +-
 primitives/utils/src/mpsc.rs                  |  2 +-
 primitives/utils/src/status_sinks.rs          | 27 +++++++-------
 primitives/version/src/lib.rs                 |  2 +-
 primitives/wasm-interface/src/lib.rs          |  2 +-
 primitives/wasm-interface/src/wasmi_impl.rs   |  2 +-
 test-utils/client/src/client_ext.rs           |  2 +-
 test-utils/client/src/lib.rs                  |  2 +-
 test-utils/derive/src/lib.rs                  |  2 +-
 test-utils/runtime/build.rs                   |  2 +-
 .../runtime/client/src/block_builder_ext.rs   |  2 +-
 test-utils/runtime/client/src/lib.rs          |  2 +-
 test-utils/runtime/client/src/trait_tests.rs  |  2 +-
 test-utils/runtime/src/genesismap.rs          |  2 +-
 test-utils/runtime/src/lib.rs                 |  2 +-
 test-utils/runtime/src/system.rs              |  2 +-
 .../runtime/transaction-pool/src/lib.rs       |  2 +-
 test-utils/src/lib.rs                         |  2 +-
 test-utils/test-crate/src/main.rs             |  2 +-
 test-utils/tests/basic.rs                     |  2 +-
 test-utils/tests/ui.rs                        |  2 +-
 test-utils/tests/ui/missing-func-parameter.rs |  2 +-
 .../tests/ui/too-many-func-parameters.rs      |  2 +-
 utils/browser/src/lib.rs                      |  2 +-
 utils/build-script-utils/src/git.rs           |  2 +-
 utils/build-script-utils/src/lib.rs           |  2 +-
 utils/build-script-utils/src/version.rs       |  2 +-
 utils/fork-tree/src/lib.rs                    |  2 +-
 utils/frame/benchmarking-cli/src/command.rs   |  2 +-
 utils/frame/benchmarking-cli/src/lib.rs       |  2 +-
 utils/frame/benchmarking-cli/src/writer.rs    |  2 +-
 utils/frame/frame-utilities-cli/src/lib.rs    |  2 +-
 .../frame-utilities-cli/src/module_id.rs      |  2 +-
 utils/frame/rpc/support/src/lib.rs            |  2 +-
 utils/frame/rpc/system/src/lib.rs             |  2 +-
 utils/prometheus/src/lib.rs                   | 27 +++++++-------
 utils/prometheus/src/networking.rs            |  2 +-
 utils/prometheus/src/sourced.rs               | 27 +++++++-------
 utils/wasm-builder/src/builder.rs             |  2 +-
 utils/wasm-builder/src/lib.rs                 |  2 +-
 utils/wasm-builder/src/prerequisites.rs       |  2 +-
 utils/wasm-builder/src/wasm_project.rs        |  2 +-
 923 files changed, 2004 insertions(+), 1769 deletions(-)
 rename HEADER => HEADER-APACHE (92%)
 rename docs/license_header.txt => HEADER-GPL (50%)

diff --git a/.maintain/frame-weight-template.hbs b/.maintain/frame-weight-template.hbs
index 76f89eafbaee..2253452e203d 100644
--- a/.maintain/frame-weight-template.hbs
+++ b/.maintain/frame-weight-template.hbs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/.maintain/update-copyright.sh b/.maintain/update-copyright.sh
index d48fc3cc979d..d67cab7c1e15 100755
--- a/.maintain/update-copyright.sh
+++ b/.maintain/update-copyright.sh
@@ -1,15 +1,14 @@
 #!/usr/bin/env bash
 
-SINGLE_DATES=$(grep -lr "// Copyright [0-9]* Parity Technologies (UK) Ltd.")
-RANGE_DATES=$(grep -lr "// Copyright [0-9]*-[0-9]* Parity Technologies (UK) Ltd.")
+SINGLE_DATES=$(grep -lr "// Copyright (C) [0-9]* Parity Technologies (UK) Ltd.")
 YEAR=$(date +%Y)
 
 for file in $SINGLE_DATES; do
-  FILE_YEAR=$(cat $file | sed -n "s|// Copyright \([[:digit:]][[:digit:]][[:digit:]][[:digit:]]\) Parity Technologies (UK) Ltd.|\1|p")
+  FILE_YEAR=$(cat $file | sed -n "s|// Copyright (C) \([[:digit:]][[:digit:]][[:digit:]][[:digit:]]\) Parity Technologies (UK) Ltd.|\1|p")
   if [ $YEAR -ne $FILE_YEAR ]; then
-    sed -i -e "s|// Copyright \([[:digit:]][[:digit:]][[:digit:]][[:digit:]]\) Parity Technologies (UK) Ltd.|// Copyright \1-$YEAR Parity Technologies (UK) Ltd.|g" $file
+    sed -i -e "s|// Copyright (C) \([[:digit:]][[:digit:]][[:digit:]][[:digit:]]\) Parity Technologies (UK) Ltd.|// Copyright (C) \1-$YEAR Parity Technologies (UK) Ltd.|g" $file
   fi
 done
 
-grep -lr "// Copyright [0-9]*-[0-9]* Parity Technologies (UK) Ltd." |
-  xargs sed -i -e "s|// Copyright \([[:digit:]][[:digit:]][[:digit:]][[:digit:]]\)-[[:digit:]][[:digit:]][[:digit:]][[:digit:]] Parity Technologies (UK) Ltd.|// Copyright \1-$YEAR Parity Technologies (UK) Ltd.|g"
+grep -lr "// Copyright (C) [0-9]*-[0-9]* Parity Technologies (UK) Ltd." |
+  xargs sed -i -e "s|// Copyright (C) \([[:digit:]][[:digit:]][[:digit:]][[:digit:]]\)-[[:digit:]][[:digit:]][[:digit:]][[:digit:]] Parity Technologies (UK) Ltd.|// Copyright (C) \1-$YEAR Parity Technologies (UK) Ltd.|g"
diff --git a/HEADER b/HEADER-APACHE
similarity index 92%
rename from HEADER
rename to HEADER-APACHE
index c9b28a07b0f2..f364f4bdf845 100644
--- a/HEADER
+++ b/HEADER-APACHE
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/docs/license_header.txt b/HEADER-GPL
similarity index 50%
rename from docs/license_header.txt
rename to HEADER-GPL
index f9c1daa1ad1c..0dd7e4f76028 100644
--- a/docs/license_header.txt
+++ b/HEADER-GPL
@@ -1,15 +1,17 @@
-// Copyright 2017-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
diff --git a/bin/node-template/node/src/command.rs b/bin/node-template/node/src/command.rs
index acf29bd591e4..1c22b388af78 100644
--- a/bin/node-template/node/src/command.rs
+++ b/bin/node-template/node/src/command.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/node/bench/src/common.rs b/bin/node/bench/src/common.rs
index 2637d6e9bd04..d04d79e9907a 100644
--- a/bin/node/bench/src/common.rs
+++ b/bin/node/bench/src/common.rs
@@ -1,7 +1,6 @@
-
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
@@ -45,4 +44,4 @@ impl SizeType {
 			SizeType::Custom(val) => Some(*val),
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/bin/node/bench/src/construct.rs b/bin/node/bench/src/construct.rs
index 5506dc426de0..a8a02f19c306 100644
--- a/bin/node/bench/src/construct.rs
+++ b/bin/node/bench/src/construct.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/bench/src/core.rs b/bin/node/bench/src/core.rs
index 6faa7b72721f..26b7f92b1448 100644
--- a/bin/node/bench/src/core.rs
+++ b/bin/node/bench/src/core.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/bench/src/generator.rs b/bin/node/bench/src/generator.rs
index 759a4299c727..c540ae147c9f 100644
--- a/bin/node/bench/src/generator.rs
+++ b/bin/node/bench/src/generator.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/bench/src/import.rs b/bin/node/bench/src/import.rs
index ae28a20089e1..b4fee58dac02 100644
--- a/bin/node/bench/src/import.rs
+++ b/bin/node/bench/src/import.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/bench/src/main.rs b/bin/node/bench/src/main.rs
index 46b659dd8838..40e9e1577777 100644
--- a/bin/node/bench/src/main.rs
+++ b/bin/node/bench/src/main.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/bench/src/simple_trie.rs b/bin/node/bench/src/simple_trie.rs
index 3cfd7ddb300a..a29b51a38af5 100644
--- a/bin/node/bench/src/simple_trie.rs
+++ b/bin/node/bench/src/simple_trie.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/bench/src/state_sizes.rs b/bin/node/bench/src/state_sizes.rs
index d35989f61be3..f9288c105489 100644
--- a/bin/node/bench/src/state_sizes.rs
+++ b/bin/node/bench/src/state_sizes.rs
@@ -1,18 +1,20 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
+// This file is part of Substrate.
 
-// Parity is free software: you can redistribute it and/or modify
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Parity is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 /// Kusama value size distribution
 pub const KUSAMA_STATE_DISTRIBUTION: &'static[(u32, u32)] = &[
@@ -4753,4 +4755,4 @@ pub const KUSAMA_STATE_DISTRIBUTION: &'static[(u32, u32)] = &[
 	(1516670, 1),
 	(1605731, 1),
 	(1605821, 1),
-];
\ No newline at end of file
+];
diff --git a/bin/node/bench/src/tempdb.rs b/bin/node/bench/src/tempdb.rs
index abce7daa518b..31ef71fba7b5 100644
--- a/bin/node/bench/src/tempdb.rs
+++ b/bin/node/bench/src/tempdb.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/bench/src/trie.rs b/bin/node/bench/src/trie.rs
index eb6c574e2717..a3e7620473d9 100644
--- a/bin/node/bench/src/trie.rs
+++ b/bin/node/bench/src/trie.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/bench/src/txpool.rs b/bin/node/bench/src/txpool.rs
index 7ea13fc15ec6..ecac3827adf6 100644
--- a/bin/node/bench/src/txpool.rs
+++ b/bin/node/bench/src/txpool.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/browser-testing/src/lib.rs b/bin/node/browser-testing/src/lib.rs
index f4dc09085678..ad18de87b3d3 100644
--- a/bin/node/browser-testing/src/lib.rs
+++ b/bin/node/browser-testing/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/node/cli/bin/main.rs b/bin/node/cli/bin/main.rs
index 299b760c82e3..cf32a7cf2886 100644
--- a/bin/node/cli/bin/main.rs
+++ b/bin/node/cli/bin/main.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/cli/build.rs b/bin/node/cli/build.rs
index a36f0d01a0a0..befcdaea6d9c 100644
--- a/bin/node/cli/build.rs
+++ b/bin/node/cli/build.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/cli/src/browser.rs b/bin/node/cli/src/browser.rs
index 41770f5fcde6..42886a668d34 100644
--- a/bin/node/cli/src/browser.rs
+++ b/bin/node/cli/src/browser.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/cli/src/chain_spec.rs b/bin/node/cli/src/chain_spec.rs
index 83dc95e3b64d..7bee74d6c677 100644
--- a/bin/node/cli/src/chain_spec.rs
+++ b/bin/node/cli/src/chain_spec.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/cli/src/cli.rs b/bin/node/cli/src/cli.rs
index 2130ff1e4b10..63a07e00e219 100644
--- a/bin/node/cli/src/cli.rs
+++ b/bin/node/cli/src/cli.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/cli/src/command.rs b/bin/node/cli/src/command.rs
index bb1bf0169e6f..ed3aff88c75d 100644
--- a/bin/node/cli/src/command.rs
+++ b/bin/node/cli/src/command.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/cli/src/lib.rs b/bin/node/cli/src/lib.rs
index bd2298514a7a..d29836c7499f 100644
--- a/bin/node/cli/src/lib.rs
+++ b/bin/node/cli/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index 5eb8e35e69ec..0b4e24f2ce64 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/cli/tests/build_spec_works.rs b/bin/node/cli/tests/build_spec_works.rs
index 800a4a8c51e6..6d863ea7f949 100644
--- a/bin/node/cli/tests/build_spec_works.rs
+++ b/bin/node/cli/tests/build_spec_works.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/cli/tests/check_block_works.rs b/bin/node/cli/tests/check_block_works.rs
index 34078b08cf07..39963fb00287 100644
--- a/bin/node/cli/tests/check_block_works.rs
+++ b/bin/node/cli/tests/check_block_works.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/cli/tests/common.rs b/bin/node/cli/tests/common.rs
index 61a07dd1ca87..c3bb96555da5 100644
--- a/bin/node/cli/tests/common.rs
+++ b/bin/node/cli/tests/common.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/cli/tests/export_import_flow.rs b/bin/node/cli/tests/export_import_flow.rs
index 557e722ddb7b..02fba49e834e 100644
--- a/bin/node/cli/tests/export_import_flow.rs
+++ b/bin/node/cli/tests/export_import_flow.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/cli/tests/inspect_works.rs b/bin/node/cli/tests/inspect_works.rs
index aa9653acadba..67dbc97056cf 100644
--- a/bin/node/cli/tests/inspect_works.rs
+++ b/bin/node/cli/tests/inspect_works.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/cli/tests/purge_chain_works.rs b/bin/node/cli/tests/purge_chain_works.rs
index 001bed8b136f..4c0727d26cb1 100644
--- a/bin/node/cli/tests/purge_chain_works.rs
+++ b/bin/node/cli/tests/purge_chain_works.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/cli/tests/running_the_node_and_interrupt.rs b/bin/node/cli/tests/running_the_node_and_interrupt.rs
index bd79dcd77a49..05eb9a7027b7 100644
--- a/bin/node/cli/tests/running_the_node_and_interrupt.rs
+++ b/bin/node/cli/tests/running_the_node_and_interrupt.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/cli/tests/temp_base_path_works.rs b/bin/node/cli/tests/temp_base_path_works.rs
index 9351568d8795..0152ddb464dc 100644
--- a/bin/node/cli/tests/temp_base_path_works.rs
+++ b/bin/node/cli/tests/temp_base_path_works.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/cli/tests/version.rs b/bin/node/cli/tests/version.rs
index bbc9139d4f0f..38e4b1fbda72 100644
--- a/bin/node/cli/tests/version.rs
+++ b/bin/node/cli/tests/version.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/executor/benches/bench.rs b/bin/node/executor/benches/bench.rs
index 168cff0ff456..554e6c4af428 100644
--- a/bin/node/executor/benches/bench.rs
+++ b/bin/node/executor/benches/bench.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/node/executor/src/lib.rs b/bin/node/executor/src/lib.rs
index 4c3b82bc7d3b..e7fb09a19c51 100644
--- a/bin/node/executor/src/lib.rs
+++ b/bin/node/executor/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/node/executor/tests/basic.rs b/bin/node/executor/tests/basic.rs
index 09438bfacd45..2b644fad2915 100644
--- a/bin/node/executor/tests/basic.rs
+++ b/bin/node/executor/tests/basic.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/node/executor/tests/common.rs b/bin/node/executor/tests/common.rs
index efc54ebebf19..b376ebc35bae 100644
--- a/bin/node/executor/tests/common.rs
+++ b/bin/node/executor/tests/common.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/node/executor/tests/fees.rs b/bin/node/executor/tests/fees.rs
index d04af1d82700..07460e54680d 100644
--- a/bin/node/executor/tests/fees.rs
+++ b/bin/node/executor/tests/fees.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/node/executor/tests/submit_transaction.rs b/bin/node/executor/tests/submit_transaction.rs
index 5bac6b5e374c..f3cb90cbecdd 100644
--- a/bin/node/executor/tests/submit_transaction.rs
+++ b/bin/node/executor/tests/submit_transaction.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/node/inspect/src/cli.rs b/bin/node/inspect/src/cli.rs
index d66644bab52f..abdbedc296d0 100644
--- a/bin/node/inspect/src/cli.rs
+++ b/bin/node/inspect/src/cli.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/inspect/src/command.rs b/bin/node/inspect/src/command.rs
index fae6c10c7fe7..a1a9c947a561 100644
--- a/bin/node/inspect/src/command.rs
+++ b/bin/node/inspect/src/command.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/inspect/src/lib.rs b/bin/node/inspect/src/lib.rs
index 02f5614b81a7..2a55fdcda62e 100644
--- a/bin/node/inspect/src/lib.rs
+++ b/bin/node/inspect/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 //
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/primitives/src/lib.rs b/bin/node/primitives/src/lib.rs
index 137fb1d94c77..9470adc399f9 100644
--- a/bin/node/primitives/src/lib.rs
+++ b/bin/node/primitives/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/node/rpc-client/src/main.rs b/bin/node/rpc-client/src/main.rs
index 31f1efa28ccd..ddd8a50ad36e 100644
--- a/bin/node/rpc-client/src/main.rs
+++ b/bin/node/rpc-client/src/main.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/node/rpc/src/lib.rs b/bin/node/rpc/src/lib.rs
index 1ced3d60ab36..e68ca6843bc9 100644
--- a/bin/node/rpc/src/lib.rs
+++ b/bin/node/rpc/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/node/runtime/build.rs b/bin/node/runtime/build.rs
index 8a0b4d7a0c15..a1c4b2d892cf 100644
--- a/bin/node/runtime/build.rs
+++ b/bin/node/runtime/build.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/node/runtime/src/constants.rs b/bin/node/runtime/src/constants.rs
index 0301c30d5b63..f447486c7ffc 100644
--- a/bin/node/runtime/src/constants.rs
+++ b/bin/node/runtime/src/constants.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/node/runtime/src/impls.rs b/bin/node/runtime/src/impls.rs
index d7910c2c63b8..c6a56e5ac0da 100644
--- a/bin/node/runtime/src/impls.rs
+++ b/bin/node/runtime/src/impls.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 4eee9d83a58e..206008624345 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/testing/src/bench.rs b/bin/node/testing/src/bench.rs
index 35af52a2f36c..3bc31c6e414a 100644
--- a/bin/node/testing/src/bench.rs
+++ b/bin/node/testing/src/bench.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/testing/src/client.rs b/bin/node/testing/src/client.rs
index f44747b26b7a..c4ace4ced9b4 100644
--- a/bin/node/testing/src/client.rs
+++ b/bin/node/testing/src/client.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/testing/src/genesis.rs b/bin/node/testing/src/genesis.rs
index 6fa178ba4bcd..75d0d18e6ef8 100644
--- a/bin/node/testing/src/genesis.rs
+++ b/bin/node/testing/src/genesis.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/testing/src/keyring.rs b/bin/node/testing/src/keyring.rs
index f0b8ff707294..da61040206ea 100644
--- a/bin/node/testing/src/keyring.rs
+++ b/bin/node/testing/src/keyring.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/node/testing/src/lib.rs b/bin/node/testing/src/lib.rs
index d682347e4001..c5792bccee80 100644
--- a/bin/node/testing/src/lib.rs
+++ b/bin/node/testing/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/utils/chain-spec-builder/build.rs b/bin/utils/chain-spec-builder/build.rs
index 8d5aac1a0874..57424f016f3e 100644
--- a/bin/utils/chain-spec-builder/build.rs
+++ b/bin/utils/chain-spec-builder/build.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/utils/chain-spec-builder/src/main.rs b/bin/utils/chain-spec-builder/src/main.rs
index c2db944050eb..f3336b1d53a8 100644
--- a/bin/utils/chain-spec-builder/src/main.rs
+++ b/bin/utils/chain-spec-builder/src/main.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/utils/subkey/src/lib.rs b/bin/utils/subkey/src/lib.rs
index 0fe6f417d1af..5f7787f02240 100644
--- a/bin/utils/subkey/src/lib.rs
+++ b/bin/utils/subkey/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/bin/utils/subkey/src/main.rs b/bin/utils/subkey/src/main.rs
index dd14425130b7..39f2f9e2e5b9 100644
--- a/bin/utils/subkey/src/main.rs
+++ b/bin/utils/subkey/src/main.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/api/src/backend.rs b/client/api/src/backend.rs
index 47fec977f5e8..c2b42d1b3444 100644
--- a/client/api/src/backend.rs
+++ b/client/api/src/backend.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/api/src/call_executor.rs b/client/api/src/call_executor.rs
index 86e3440f19c9..9c0ea87ea718 100644
--- a/client/api/src/call_executor.rs
+++ b/client/api/src/call_executor.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/api/src/cht.rs b/client/api/src/cht.rs
index 7fd7aa0dbcb7..b4c4ce70cb3e 100644
--- a/client/api/src/cht.rs
+++ b/client/api/src/cht.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/api/src/client.rs b/client/api/src/client.rs
index f97daa487638..4dc2b6bb524e 100644
--- a/client/api/src/client.rs
+++ b/client/api/src/client.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! A set of APIs supported by the client along with their primitives.
 
diff --git a/client/api/src/execution_extensions.rs b/client/api/src/execution_extensions.rs
index c187e7580023..68b412a0d778 100644
--- a/client/api/src/execution_extensions.rs
+++ b/client/api/src/execution_extensions.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Execution extensions for runtime calls.
 //!
diff --git a/client/api/src/in_mem.rs b/client/api/src/in_mem.rs
index ded030fb8046..cef52982f167 100644
--- a/client/api/src/in_mem.rs
+++ b/client/api/src/in_mem.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/api/src/leaves.rs b/client/api/src/leaves.rs
index d10fa7ac0e56..1971012c6aab 100644
--- a/client/api/src/leaves.rs
+++ b/client/api/src/leaves.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/api/src/lib.rs b/client/api/src/lib.rs
index 677066936330..0f860b95e780 100644
--- a/client/api/src/lib.rs
+++ b/client/api/src/lib.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Substrate client interfaces.
 #![warn(missing_docs)]
diff --git a/client/api/src/light.rs b/client/api/src/light.rs
index f9ba64544a8c..a068e2d4a341 100644
--- a/client/api/src/light.rs
+++ b/client/api/src/light.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Substrate light client interfaces
 
diff --git a/client/api/src/notifications.rs b/client/api/src/notifications.rs
index ec63c372c7e5..bfd419ec9a58 100644
--- a/client/api/src/notifications.rs
+++ b/client/api/src/notifications.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/api/src/proof_provider.rs b/client/api/src/proof_provider.rs
index 5749ae0576fc..a0dbcf1d1e80 100644
--- a/client/api/src/proof_provider.rs
+++ b/client/api/src/proof_provider.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/authority-discovery/src/error.rs b/client/authority-discovery/src/error.rs
index 82e4a6dd6f3f..f482d1924835 100644
--- a/client/authority-discovery/src/error.rs
+++ b/client/authority-discovery/src/error.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Authority discovery errors.
 
diff --git a/client/authority-discovery/src/interval.rs b/client/authority-discovery/src/interval.rs
index b3aa5b1c0f67..0710487203d5 100644
--- a/client/authority-discovery/src/interval.rs
+++ b/client/authority-discovery/src/interval.rs
@@ -1,18 +1,20 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use futures::stream::Stream;
 use futures::future::FutureExt;
diff --git a/client/authority-discovery/src/lib.rs b/client/authority-discovery/src/lib.rs
index 41aa01e56bde..26d4396ca883 100644
--- a/client/authority-discovery/src/lib.rs
+++ b/client/authority-discovery/src/lib.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 #![warn(missing_docs)]
 #![recursion_limit = "1024"]
diff --git a/client/authority-discovery/src/service.rs b/client/authority-discovery/src/service.rs
index d23d2f3a480f..1da97cbb03b5 100644
--- a/client/authority-discovery/src/service.rs
+++ b/client/authority-discovery/src/service.rs
@@ -1,18 +1,20 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::ServicetoWorkerMsg;
 
diff --git a/client/authority-discovery/src/tests.rs b/client/authority-discovery/src/tests.rs
index 414ffc1e3f39..78e978e07a1a 100644
--- a/client/authority-discovery/src/tests.rs
+++ b/client/authority-discovery/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/authority-discovery/src/worker.rs b/client/authority-discovery/src/worker.rs
index d886f24542d7..0f4986a4a146 100644
--- a/client/authority-discovery/src/worker.rs
+++ b/client/authority-discovery/src/worker.rs
@@ -1,18 +1,20 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{error::{Error, Result}, interval::ExpIncInterval, ServicetoWorkerMsg};
 
diff --git a/client/authority-discovery/src/worker/addr_cache.rs b/client/authority-discovery/src/worker/addr_cache.rs
index 75fcaa840176..4ae6ae0cdeb7 100644
--- a/client/authority-discovery/src/worker/addr_cache.rs
+++ b/client/authority-discovery/src/worker/addr_cache.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use libp2p::core::multiaddr::{Multiaddr, Protocol};
 use rand::seq::SliceRandom;
diff --git a/client/authority-discovery/src/worker/tests.rs b/client/authority-discovery/src/worker/tests.rs
index fee861dfeb0c..2bc9c1ba6aaf 100644
--- a/client/authority-discovery/src/worker/tests.rs
+++ b/client/authority-discovery/src/worker/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/basic-authorship/src/basic_authorship.rs b/client/basic-authorship/src/basic_authorship.rs
index 065acbde2cc9..8a7750c69fe2 100644
--- a/client/basic-authorship/src/basic_authorship.rs
+++ b/client/basic-authorship/src/basic_authorship.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/basic-authorship/src/lib.rs b/client/basic-authorship/src/lib.rs
index 2cb66d4ccc40..3bb0a0b7e5c0 100644
--- a/client/basic-authorship/src/lib.rs
+++ b/client/basic-authorship/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/block-builder/src/lib.rs b/client/block-builder/src/lib.rs
index cc1431ea349b..5a7e0277d9e8 100644
--- a/client/block-builder/src/lib.rs
+++ b/client/block-builder/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/chain-spec/derive/src/impls.rs b/client/chain-spec/derive/src/impls.rs
index ded961a6da81..bb72270ed551 100644
--- a/client/chain-spec/derive/src/impls.rs
+++ b/client/chain-spec/derive/src/impls.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use proc_macro2::{Span, TokenStream};
 use quote::quote;
diff --git a/client/chain-spec/derive/src/lib.rs b/client/chain-spec/derive/src/lib.rs
index 0dc053f7e301..53f0c69491ec 100644
--- a/client/chain-spec/derive/src/lib.rs
+++ b/client/chain-spec/derive/src/lib.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Macros to derive chain spec extension traits implementation.
 
diff --git a/client/chain-spec/src/chain_spec.rs b/client/chain-spec/src/chain_spec.rs
index 39c47e32908d..2faf95568290 100644
--- a/client/chain-spec/src/chain_spec.rs
+++ b/client/chain-spec/src/chain_spec.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/chain-spec/src/extension.rs b/client/chain-spec/src/extension.rs
index c0338203eb10..c0352529f867 100644
--- a/client/chain-spec/src/extension.rs
+++ b/client/chain-spec/src/extension.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Chain Spec extensions helpers.
 
diff --git a/client/chain-spec/src/lib.rs b/client/chain-spec/src/lib.rs
index 27657ccb7f86..ee4f757f8cf0 100644
--- a/client/chain-spec/src/lib.rs
+++ b/client/chain-spec/src/lib.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Substrate chain configurations.
 //!
diff --git a/client/cli/proc-macro/src/lib.rs b/client/cli/proc-macro/src/lib.rs
index 775d1eb96ea3..0e2466ec3ae7 100644
--- a/client/cli/proc-macro/src/lib.rs
+++ b/client/cli/proc-macro/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/cli/src/arg_enums.rs b/client/cli/src/arg_enums.rs
index 85400f2a2775..2ebfa38925e2 100644
--- a/client/cli/src/arg_enums.rs
+++ b/client/cli/src/arg_enums.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/cli/src/commands/build_spec_cmd.rs b/client/cli/src/commands/build_spec_cmd.rs
index 616c5139f64f..3d66e752b81e 100644
--- a/client/cli/src/commands/build_spec_cmd.rs
+++ b/client/cli/src/commands/build_spec_cmd.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/cli/src/commands/check_block_cmd.rs b/client/cli/src/commands/check_block_cmd.rs
index b536d4f26bb6..74e2d34f975b 100644
--- a/client/cli/src/commands/check_block_cmd.rs
+++ b/client/cli/src/commands/check_block_cmd.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/cli/src/commands/export_blocks_cmd.rs b/client/cli/src/commands/export_blocks_cmd.rs
index 497531ad393b..55f05d9d7f30 100644
--- a/client/cli/src/commands/export_blocks_cmd.rs
+++ b/client/cli/src/commands/export_blocks_cmd.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/cli/src/commands/export_state_cmd.rs b/client/cli/src/commands/export_state_cmd.rs
index c078db0d8aea..2211b3131a01 100644
--- a/client/cli/src/commands/export_state_cmd.rs
+++ b/client/cli/src/commands/export_state_cmd.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/cli/src/commands/generate.rs b/client/cli/src/commands/generate.rs
index 86b039ce6a4c..08b5f2077236 100644
--- a/client/cli/src/commands/generate.rs
+++ b/client/cli/src/commands/generate.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/client/cli/src/commands/generate_node_key.rs b/client/cli/src/commands/generate_node_key.rs
index ad292e4712d8..ec22c6298adb 100644
--- a/client/cli/src/commands/generate_node_key.rs
+++ b/client/cli/src/commands/generate_node_key.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/client/cli/src/commands/import_blocks_cmd.rs b/client/cli/src/commands/import_blocks_cmd.rs
index 00f8ec43b02f..89f70d06813c 100644
--- a/client/cli/src/commands/import_blocks_cmd.rs
+++ b/client/cli/src/commands/import_blocks_cmd.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/cli/src/commands/insert_key.rs b/client/cli/src/commands/insert_key.rs
index 3338b708a4fd..90588f96d20b 100644
--- a/client/cli/src/commands/insert_key.rs
+++ b/client/cli/src/commands/insert_key.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/client/cli/src/commands/inspect_key.rs b/client/cli/src/commands/inspect_key.rs
index fb3a7ef4f3b4..2642eee88adc 100644
--- a/client/cli/src/commands/inspect_key.rs
+++ b/client/cli/src/commands/inspect_key.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/client/cli/src/commands/inspect_node_key.rs b/client/cli/src/commands/inspect_node_key.rs
index be0b88589d5e..4db32aefb5fb 100644
--- a/client/cli/src/commands/inspect_node_key.rs
+++ b/client/cli/src/commands/inspect_node_key.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/client/cli/src/commands/key.rs b/client/cli/src/commands/key.rs
index d01e273f0efa..546454159718 100644
--- a/client/cli/src/commands/key.rs
+++ b/client/cli/src/commands/key.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/client/cli/src/commands/mod.rs b/client/cli/src/commands/mod.rs
index 395d3fa9c5e6..8c0d6acd6a51 100644
--- a/client/cli/src/commands/mod.rs
+++ b/client/cli/src/commands/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/cli/src/commands/purge_chain_cmd.rs b/client/cli/src/commands/purge_chain_cmd.rs
index 9c9c6e91fb24..1902d92e6345 100644
--- a/client/cli/src/commands/purge_chain_cmd.rs
+++ b/client/cli/src/commands/purge_chain_cmd.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/cli/src/commands/revert_cmd.rs b/client/cli/src/commands/revert_cmd.rs
index b2e3c1bf8e2b..2745ce2c6524 100644
--- a/client/cli/src/commands/revert_cmd.rs
+++ b/client/cli/src/commands/revert_cmd.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/cli/src/commands/run_cmd.rs b/client/cli/src/commands/run_cmd.rs
index 48bad16afb67..bbb8d6f68d7f 100644
--- a/client/cli/src/commands/run_cmd.rs
+++ b/client/cli/src/commands/run_cmd.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/cli/src/commands/sign.rs b/client/cli/src/commands/sign.rs
index 605fd5b12313..a39e14697b99 100644
--- a/client/cli/src/commands/sign.rs
+++ b/client/cli/src/commands/sign.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/cli/src/commands/utils.rs b/client/cli/src/commands/utils.rs
index 25c7294fd1e0..1bbff392eca4 100644
--- a/client/cli/src/commands/utils.rs
+++ b/client/cli/src/commands/utils.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/cli/src/commands/vanity.rs b/client/cli/src/commands/vanity.rs
index 33b9025c13fb..da47e8bb26cc 100644
--- a/client/cli/src/commands/vanity.rs
+++ b/client/cli/src/commands/vanity.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/cli/src/commands/verify.rs b/client/cli/src/commands/verify.rs
index 15abc04002f4..f5bd5a06060c 100644
--- a/client/cli/src/commands/verify.rs
+++ b/client/cli/src/commands/verify.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/cli/src/config.rs b/client/cli/src/config.rs
index f0eb84f853bf..017d2b421683 100644
--- a/client/cli/src/config.rs
+++ b/client/cli/src/config.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/cli/src/error.rs b/client/cli/src/error.rs
index 6290f071c98a..75867e2f76b2 100644
--- a/client/cli/src/error.rs
+++ b/client/cli/src/error.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/cli/src/lib.rs b/client/cli/src/lib.rs
index 0ab26e606474..1402e5e7ae44 100644
--- a/client/cli/src/lib.rs
+++ b/client/cli/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/cli/src/params/database_params.rs b/client/cli/src/params/database_params.rs
index 24b23f6076a0..21529f65a56b 100644
--- a/client/cli/src/params/database_params.rs
+++ b/client/cli/src/params/database_params.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/cli/src/params/import_params.rs b/client/cli/src/params/import_params.rs
index 376a72b8421f..7409dbf79dc0 100644
--- a/client/cli/src/params/import_params.rs
+++ b/client/cli/src/params/import_params.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/cli/src/params/keystore_params.rs b/client/cli/src/params/keystore_params.rs
index 751c2bb0700d..d75cdebc5a56 100644
--- a/client/cli/src/params/keystore_params.rs
+++ b/client/cli/src/params/keystore_params.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/cli/src/params/mod.rs b/client/cli/src/params/mod.rs
index 93467bc8ec63..8308b123f71f 100644
--- a/client/cli/src/params/mod.rs
+++ b/client/cli/src/params/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/cli/src/params/network_params.rs b/client/cli/src/params/network_params.rs
index a973d61272ce..2040bd9bc78e 100644
--- a/client/cli/src/params/network_params.rs
+++ b/client/cli/src/params/network_params.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/cli/src/params/node_key_params.rs b/client/cli/src/params/node_key_params.rs
index 875411fbfb62..d43c87804dd3 100644
--- a/client/cli/src/params/node_key_params.rs
+++ b/client/cli/src/params/node_key_params.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/cli/src/params/offchain_worker_params.rs b/client/cli/src/params/offchain_worker_params.rs
index f8d48edc4729..ef39a1ed41be 100644
--- a/client/cli/src/params/offchain_worker_params.rs
+++ b/client/cli/src/params/offchain_worker_params.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/cli/src/params/pruning_params.rs b/client/cli/src/params/pruning_params.rs
index 7db808e6d8f2..80118cafd876 100644
--- a/client/cli/src/params/pruning_params.rs
+++ b/client/cli/src/params/pruning_params.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/cli/src/params/shared_params.rs b/client/cli/src/params/shared_params.rs
index 13e24938482a..45ce41846bf1 100644
--- a/client/cli/src/params/shared_params.rs
+++ b/client/cli/src/params/shared_params.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/cli/src/params/transaction_pool_params.rs b/client/cli/src/params/transaction_pool_params.rs
index 3ad278426922..bf0ed53e531c 100644
--- a/client/cli/src/params/transaction_pool_params.rs
+++ b/client/cli/src/params/transaction_pool_params.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/cli/src/runner.rs b/client/cli/src/runner.rs
index e6d35282ada2..9836471fb9fa 100644
--- a/client/cli/src/runner.rs
+++ b/client/cli/src/runner.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/consensus/aura/src/digests.rs b/client/consensus/aura/src/digests.rs
index 3332e4c6a6df..fec412b62d1e 100644
--- a/client/consensus/aura/src/digests.rs
+++ b/client/consensus/aura/src/digests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index 246b39771277..60aad59e8f97 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/consensus/babe/rpc/src/lib.rs b/client/consensus/babe/rpc/src/lib.rs
index a90964cdf73f..4d5c091e0cbb 100644
--- a/client/consensus/babe/rpc/src/lib.rs
+++ b/client/consensus/babe/rpc/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/consensus/babe/src/authorship.rs b/client/consensus/babe/src/authorship.rs
index 28a3692958e1..90ad12c4558c 100644
--- a/client/consensus/babe/src/authorship.rs
+++ b/client/consensus/babe/src/authorship.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! BABE authority selection and slot claiming.
 
diff --git a/client/consensus/babe/src/aux_schema.rs b/client/consensus/babe/src/aux_schema.rs
index 287121566a41..d399a12ea8a5 100644
--- a/client/consensus/babe/src/aux_schema.rs
+++ b/client/consensus/babe/src/aux_schema.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Schema for BABE epoch changes in the aux-db.
 
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index bf929992db02..ea3ca29dad0e 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! # BABE (Blind Assignment for Blockchain Extension)
 //!
diff --git a/client/consensus/babe/src/tests.rs b/client/consensus/babe/src/tests.rs
index 6e0536c85ced..82d8f9de5af0 100644
--- a/client/consensus/babe/src/tests.rs
+++ b/client/consensus/babe/src/tests.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! BABE testsuite
 
diff --git a/client/consensus/babe/src/verification.rs b/client/consensus/babe/src/verification.rs
index fd3c27be4f34..47c4da0834d0 100644
--- a/client/consensus/babe/src/verification.rs
+++ b/client/consensus/babe/src/verification.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Verification for BABE headers.
 use sp_runtime::{traits::Header, traits::DigestItemFor};
diff --git a/client/consensus/common/src/lib.rs b/client/consensus/common/src/lib.rs
index 1d9b072cfe96..a53517c5c35e 100644
--- a/client/consensus/common/src/lib.rs
+++ b/client/consensus/common/src/lib.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Collection of common consensus specific implementations
 mod longest_chain;
diff --git a/client/consensus/common/src/longest_chain.rs b/client/consensus/common/src/longest_chain.rs
index 981dbad0f607..8cf32a1dbd3c 100644
--- a/client/consensus/common/src/longest_chain.rs
+++ b/client/consensus/common/src/longest_chain.rs
@@ -1,18 +1,21 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
 //! Longest chain implementation
 
 use std::sync::Arc;
@@ -98,4 +101,4 @@ impl<B, Block> SelectChain<Block> for LongestChain<B, Block>
 		self.backend.blockchain().best_containing(target_hash, maybe_max_number, import_lock)
 			.map_err(|e| ConsensusError::ChainLookup(e.to_string()).into())
 	}
-}
\ No newline at end of file
+}
diff --git a/client/consensus/epochs/src/lib.rs b/client/consensus/epochs/src/lib.rs
index acb07dd668a3..76e8c8ed5419 100644
--- a/client/consensus/epochs/src/lib.rs
+++ b/client/consensus/epochs/src/lib.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Generic utilities for epoch-based consensus engines.
 
diff --git a/client/consensus/epochs/src/migration.rs b/client/consensus/epochs/src/migration.rs
index e4717b5584e0..6e7baba8053a 100644
--- a/client/consensus/epochs/src/migration.rs
+++ b/client/consensus/epochs/src/migration.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Migration types for epoch changes.
 
diff --git a/client/consensus/manual-seal/src/consensus.rs b/client/consensus/manual-seal/src/consensus.rs
index 7bafeb50207d..0cfd99cab5c9 100644
--- a/client/consensus/manual-seal/src/consensus.rs
+++ b/client/consensus/manual-seal/src/consensus.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/consensus/manual-seal/src/consensus/babe.rs b/client/consensus/manual-seal/src/consensus/babe.rs
index c2fdf6243c30..1566b647f2c0 100644
--- a/client/consensus/manual-seal/src/consensus/babe.rs
+++ b/client/consensus/manual-seal/src/consensus/babe.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/consensus/manual-seal/src/error.rs b/client/consensus/manual-seal/src/error.rs
index e2628008c24c..77140c835a3e 100644
--- a/client/consensus/manual-seal/src/error.rs
+++ b/client/consensus/manual-seal/src/error.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/consensus/manual-seal/src/finalize_block.rs b/client/consensus/manual-seal/src/finalize_block.rs
index 5780a25f9725..76ae6eeeae5a 100644
--- a/client/consensus/manual-seal/src/finalize_block.rs
+++ b/client/consensus/manual-seal/src/finalize_block.rs
@@ -1,18 +1,20 @@
-// Copyright 2019 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Block finalization utilities
 
diff --git a/client/consensus/manual-seal/src/lib.rs b/client/consensus/manual-seal/src/lib.rs
index 9c4465f82fda..5bf08571195d 100644
--- a/client/consensus/manual-seal/src/lib.rs
+++ b/client/consensus/manual-seal/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/consensus/manual-seal/src/rpc.rs b/client/consensus/manual-seal/src/rpc.rs
index 690b6c1eb999..293d4487a5d5 100644
--- a/client/consensus/manual-seal/src/rpc.rs
+++ b/client/consensus/manual-seal/src/rpc.rs
@@ -1,18 +1,20 @@
-// Copyright 2019 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! RPC interface for the `ManualSeal` Engine.
 
diff --git a/client/consensus/manual-seal/src/seal_block.rs b/client/consensus/manual-seal/src/seal_block.rs
index a4afaa343e90..59b99349bf9b 100644
--- a/client/consensus/manual-seal/src/seal_block.rs
+++ b/client/consensus/manual-seal/src/seal_block.rs
@@ -1,18 +1,20 @@
-// Copyright 2019 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Block sealing utilities
 
diff --git a/client/consensus/pow/src/lib.rs b/client/consensus/pow/src/lib.rs
index e353ed6358a0..975a6f17e795 100644
--- a/client/consensus/pow/src/lib.rs
+++ b/client/consensus/pow/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/consensus/pow/src/worker.rs b/client/consensus/pow/src/worker.rs
index 4ed863dcd9ed..c19c5524d977 100644
--- a/client/consensus/pow/src/worker.rs
+++ b/client/consensus/pow/src/worker.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/consensus/slots/build.rs b/client/consensus/slots/build.rs
index 513cc234d436..57424f016f3e 100644
--- a/client/consensus/slots/build.rs
+++ b/client/consensus/slots/build.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use std::env;
 
diff --git a/client/consensus/slots/src/aux_schema.rs b/client/consensus/slots/src/aux_schema.rs
index 1f1fe37068f8..c8095f238ec8 100644
--- a/client/consensus/slots/src/aux_schema.rs
+++ b/client/consensus/slots/src/aux_schema.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Schema for slots in the aux-db.
 
diff --git a/client/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs
index 571766bc44b1..93d3614584f8 100644
--- a/client/consensus/slots/src/lib.rs
+++ b/client/consensus/slots/src/lib.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Slots functionality for Substrate.
 //!
diff --git a/client/consensus/slots/src/slots.rs b/client/consensus/slots/src/slots.rs
index e7c84a2c1fd2..0c93e16461cc 100644
--- a/client/consensus/slots/src/slots.rs
+++ b/client/consensus/slots/src/slots.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Utility stream for yielding slots in a loop.
 //!
diff --git a/client/consensus/uncles/src/lib.rs b/client/consensus/uncles/src/lib.rs
index 2a129b200063..f38849300d0d 100644
--- a/client/consensus/uncles/src/lib.rs
+++ b/client/consensus/uncles/src/lib.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Uncles functionality for Substrate.
 #![forbid(unsafe_code, missing_docs)]
diff --git a/client/db/src/bench.rs b/client/db/src/bench.rs
index 5696922b4fbb..f0c187bd379f 100644
--- a/client/db/src/bench.rs
+++ b/client/db/src/bench.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/db/src/cache/list_cache.rs b/client/db/src/cache/list_cache.rs
index 15ad339b1f2c..341105b16a5b 100644
--- a/client/db/src/cache/list_cache.rs
+++ b/client/db/src/cache/list_cache.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/db/src/cache/list_entry.rs b/client/db/src/cache/list_entry.rs
index d14fab9274cc..94d4eb9f49b2 100644
--- a/client/db/src/cache/list_entry.rs
+++ b/client/db/src/cache/list_entry.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/db/src/cache/list_storage.rs b/client/db/src/cache/list_storage.rs
index 377d744effa6..e4b3677b4ab3 100644
--- a/client/db/src/cache/list_storage.rs
+++ b/client/db/src/cache/list_storage.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/db/src/cache/mod.rs b/client/db/src/cache/mod.rs
index 5501f0f1864c..005d25b90f93 100644
--- a/client/db/src/cache/mod.rs
+++ b/client/db/src/cache/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/db/src/changes_tries_storage.rs b/client/db/src/changes_tries_storage.rs
index a2299a82337a..6233eab3ea39 100644
--- a/client/db/src/changes_tries_storage.rs
+++ b/client/db/src/changes_tries_storage.rs
@@ -1,18 +1,20 @@
-// Copyright 2019 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! DB-backed changes tries storage.
 
diff --git a/client/db/src/children.rs b/client/db/src/children.rs
index bfba797cd467..62352e6d0614 100644
--- a/client/db/src/children.rs
+++ b/client/db/src/children.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Functionality for reading and storing children hashes from db.
 
diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index e32e45a2f314..e3b94b03c87d 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/db/src/light.rs b/client/db/src/light.rs
index acfb6217ce9e..91f37dd374d9 100644
--- a/client/db/src/light.rs
+++ b/client/db/src/light.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/db/src/offchain.rs b/client/db/src/offchain.rs
index c4f0ce115ca5..aead4397343e 100644
--- a/client/db/src/offchain.rs
+++ b/client/db/src/offchain.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/db/src/parity_db.rs b/client/db/src/parity_db.rs
index 313069706f33..e56ca4de6cb7 100644
--- a/client/db/src/parity_db.rs
+++ b/client/db/src/parity_db.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/db/src/stats.rs b/client/db/src/stats.rs
index 8d208024b4bb..3fd93db931d0 100644
--- a/client/db/src/stats.rs
+++ b/client/db/src/stats.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/db/src/storage_cache.rs b/client/db/src/storage_cache.rs
index 292d3c516260..bbbc8413be79 100644
--- a/client/db/src/storage_cache.rs
+++ b/client/db/src/storage_cache.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Global cache state.
 
diff --git a/client/db/src/upgrade.rs b/client/db/src/upgrade.rs
index 95592d071f77..e87b11b69660 100644
--- a/client/db/src/upgrade.rs
+++ b/client/db/src/upgrade.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Database upgrade logic.
 
diff --git a/client/db/src/utils.rs b/client/db/src/utils.rs
index e999469c18ff..dfc1e945b3a4 100644
--- a/client/db/src/utils.rs
+++ b/client/db/src/utils.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/executor/common/src/error.rs b/client/executor/common/src/error.rs
index df0eaf8cc261..0af148fd9580 100644
--- a/client/executor/common/src/error.rs
+++ b/client/executor/common/src/error.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/executor/common/src/lib.rs b/client/executor/common/src/lib.rs
index df839d4ab652..050bad27d6c3 100644
--- a/client/executor/common/src/lib.rs
+++ b/client/executor/common/src/lib.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! A set of common definitions that are needed for defining execution engines.
 
diff --git a/client/executor/common/src/sandbox.rs b/client/executor/common/src/sandbox.rs
index b2c35b758271..8ed294bb8398 100644
--- a/client/executor/common/src/sandbox.rs
+++ b/client/executor/common/src/sandbox.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/executor/common/src/util.rs b/client/executor/common/src/util.rs
index 564f9dadcbec..5947be4469cd 100644
--- a/client/executor/common/src/util.rs
+++ b/client/executor/common/src/util.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/executor/common/src/wasm_runtime.rs b/client/executor/common/src/wasm_runtime.rs
index c407d9967cbf..cca0d99c4b91 100644
--- a/client/executor/common/src/wasm_runtime.rs
+++ b/client/executor/common/src/wasm_runtime.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Definitions for a wasm runtime.
 
diff --git a/client/executor/runtime-test/build.rs b/client/executor/runtime-test/build.rs
index a83de21db7f0..9456d6bc90f4 100644
--- a/client/executor/runtime-test/build.rs
+++ b/client/executor/runtime-test/build.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use substrate_wasm_builder::WasmBuilder;
 
diff --git a/client/executor/src/integration_tests/mod.rs b/client/executor/src/integration_tests/mod.rs
index 0a00375145fb..5920d269c86e 100644
--- a/client/executor/src/integration_tests/mod.rs
+++ b/client/executor/src/integration_tests/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/executor/src/integration_tests/sandbox.rs b/client/executor/src/integration_tests/sandbox.rs
index 447e395c2fb0..3c964c628046 100644
--- a/client/executor/src/integration_tests/sandbox.rs
+++ b/client/executor/src/integration_tests/sandbox.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/executor/src/lib.rs b/client/executor/src/lib.rs
index 56a81b24b407..ccb7aa1b445b 100644
--- a/client/executor/src/lib.rs
+++ b/client/executor/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/executor/src/native_executor.rs b/client/executor/src/native_executor.rs
index b5d67b9e73f4..766dada331cd 100644
--- a/client/executor/src/native_executor.rs
+++ b/client/executor/src/native_executor.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/executor/src/wasm_runtime.rs b/client/executor/src/wasm_runtime.rs
index 7288df35f31c..a7d8b0ce2387 100644
--- a/client/executor/src/wasm_runtime.rs
+++ b/client/executor/src/wasm_runtime.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Traits and accessor functions for calling into the Substrate Wasm runtime.
 //!
diff --git a/client/executor/wasmi/src/lib.rs b/client/executor/wasmi/src/lib.rs
index 17b92e04950c..e6a6ef3a6103 100644
--- a/client/executor/wasmi/src/lib.rs
+++ b/client/executor/wasmi/src/lib.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! This crate provides an implementation of `WasmModule` that is baked by wasmi.
 
diff --git a/client/executor/wasmtime/src/host.rs b/client/executor/wasmtime/src/host.rs
index 8d20c9a566dc..c1eb77ff81f3 100644
--- a/client/executor/wasmtime/src/host.rs
+++ b/client/executor/wasmtime/src/host.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! This module defines `HostState` and `HostContext` structs which provide logic and state
 //! required for execution of host.
diff --git a/client/executor/wasmtime/src/imports.rs b/client/executor/wasmtime/src/imports.rs
index add62df5cef4..b5eaeae5e66c 100644
--- a/client/executor/wasmtime/src/imports.rs
+++ b/client/executor/wasmtime/src/imports.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/executor/wasmtime/src/instance_wrapper.rs b/client/executor/wasmtime/src/instance_wrapper.rs
index 089d8cb237b5..2103ab9b7b98 100644
--- a/client/executor/wasmtime/src/instance_wrapper.rs
+++ b/client/executor/wasmtime/src/instance_wrapper.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/executor/wasmtime/src/instance_wrapper/globals_snapshot.rs b/client/executor/wasmtime/src/instance_wrapper/globals_snapshot.rs
index 42935d851d95..a6b1ed394150 100644
--- a/client/executor/wasmtime/src/instance_wrapper/globals_snapshot.rs
+++ b/client/executor/wasmtime/src/instance_wrapper/globals_snapshot.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/executor/wasmtime/src/lib.rs b/client/executor/wasmtime/src/lib.rs
index 66e4e085235a..db7776d4c584 100644
--- a/client/executor/wasmtime/src/lib.rs
+++ b/client/executor/wasmtime/src/lib.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 ///! Defines a `WasmRuntime` that uses the Wasmtime JIT to execute.
 
diff --git a/client/executor/wasmtime/src/runtime.rs b/client/executor/wasmtime/src/runtime.rs
index 965b06753572..a17a034918db 100644
--- a/client/executor/wasmtime/src/runtime.rs
+++ b/client/executor/wasmtime/src/runtime.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Defines the compiled Wasm runtime that uses Wasmtime internally.
 
diff --git a/client/executor/wasmtime/src/state_holder.rs b/client/executor/wasmtime/src/state_holder.rs
index 711d3bb735d7..0e2684cd2513 100644
--- a/client/executor/wasmtime/src/state_holder.rs
+++ b/client/executor/wasmtime/src/state_holder.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/executor/wasmtime/src/util.rs b/client/executor/wasmtime/src/util.rs
index d2de95d4cc71..1437c6f8509b 100644
--- a/client/executor/wasmtime/src/util.rs
+++ b/client/executor/wasmtime/src/util.rs
@@ -1,18 +1,20 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use std::ops::Range;
 
diff --git a/client/finality-grandpa/rpc/src/error.rs b/client/finality-grandpa/rpc/src/error.rs
index 6464acbe10ea..6122db03f880 100644
--- a/client/finality-grandpa/rpc/src/error.rs
+++ b/client/finality-grandpa/rpc/src/error.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/finality-grandpa/rpc/src/finality.rs b/client/finality-grandpa/rpc/src/finality.rs
index 1f288b86a0e4..9272edb39b64 100644
--- a/client/finality-grandpa/rpc/src/finality.rs
+++ b/client/finality-grandpa/rpc/src/finality.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/finality-grandpa/rpc/src/lib.rs b/client/finality-grandpa/rpc/src/lib.rs
index 172473ad6518..c6e4613c4f51 100644
--- a/client/finality-grandpa/rpc/src/lib.rs
+++ b/client/finality-grandpa/rpc/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/finality-grandpa/rpc/src/notification.rs b/client/finality-grandpa/rpc/src/notification.rs
index fd03a622b219..4c9141be3631 100644
--- a/client/finality-grandpa/rpc/src/notification.rs
+++ b/client/finality-grandpa/rpc/src/notification.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/finality-grandpa/rpc/src/report.rs b/client/finality-grandpa/rpc/src/report.rs
index a635728cb938..0482d90f58f0 100644
--- a/client/finality-grandpa/rpc/src/report.rs
+++ b/client/finality-grandpa/rpc/src/report.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/finality-grandpa/src/authorities.rs b/client/finality-grandpa/src/authorities.rs
index de14c7b3ba39..62a23a7ceab8 100644
--- a/client/finality-grandpa/src/authorities.rs
+++ b/client/finality-grandpa/src/authorities.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/finality-grandpa/src/aux_schema.rs b/client/finality-grandpa/src/aux_schema.rs
index 97041f4081a7..0146269c8f71 100644
--- a/client/finality-grandpa/src/aux_schema.rs
+++ b/client/finality-grandpa/src/aux_schema.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Schema for stuff in the aux-db.
 
diff --git a/client/finality-grandpa/src/communication/gossip.rs b/client/finality-grandpa/src/communication/gossip.rs
index 276529d555ff..c217218aecc4 100644
--- a/client/finality-grandpa/src/communication/gossip.rs
+++ b/client/finality-grandpa/src/communication/gossip.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Gossip and politeness for polite-grandpa.
 //!
diff --git a/client/finality-grandpa/src/communication/mod.rs b/client/finality-grandpa/src/communication/mod.rs
index 04c0a0f6ad0f..77d2d15e5d02 100644
--- a/client/finality-grandpa/src/communication/mod.rs
+++ b/client/finality-grandpa/src/communication/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/finality-grandpa/src/communication/periodic.rs b/client/finality-grandpa/src/communication/periodic.rs
index dadd7deb57fc..377882ed5dd2 100644
--- a/client/finality-grandpa/src/communication/periodic.rs
+++ b/client/finality-grandpa/src/communication/periodic.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Periodic rebroadcast of neighbor packets.
 
diff --git a/client/finality-grandpa/src/communication/tests.rs b/client/finality-grandpa/src/communication/tests.rs
index 27a394a062bc..d7db68d0652b 100644
--- a/client/finality-grandpa/src/communication/tests.rs
+++ b/client/finality-grandpa/src/communication/tests.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Tests for the communication portion of the GRANDPA crate.
 
diff --git a/client/finality-grandpa/src/environment.rs b/client/finality-grandpa/src/environment.rs
index 790be2a22178..5e4203b2a40f 100644
--- a/client/finality-grandpa/src/environment.rs
+++ b/client/finality-grandpa/src/environment.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/finality-grandpa/src/finality_proof.rs b/client/finality-grandpa/src/finality_proof.rs
index bf367ab3f4a5..bd29b18bae12 100644
--- a/client/finality-grandpa/src/finality_proof.rs
+++ b/client/finality-grandpa/src/finality_proof.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/finality-grandpa/src/import.rs b/client/finality-grandpa/src/import.rs
index 749d482871e4..d9630e272ef9 100644
--- a/client/finality-grandpa/src/import.rs
+++ b/client/finality-grandpa/src/import.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/finality-grandpa/src/justification.rs b/client/finality-grandpa/src/justification.rs
index d5ca92d50e93..9429acff06d8 100644
--- a/client/finality-grandpa/src/justification.rs
+++ b/client/finality-grandpa/src/justification.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/finality-grandpa/src/lib.rs b/client/finality-grandpa/src/lib.rs
index 0757a484afb4..0c38d796197c 100644
--- a/client/finality-grandpa/src/lib.rs
+++ b/client/finality-grandpa/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/finality-grandpa/src/notification.rs b/client/finality-grandpa/src/notification.rs
index 841558305190..b545f0d8a637 100644
--- a/client/finality-grandpa/src/notification.rs
+++ b/client/finality-grandpa/src/notification.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/finality-grandpa/src/observer.rs b/client/finality-grandpa/src/observer.rs
index c61998225e32..c9db917e1699 100644
--- a/client/finality-grandpa/src/observer.rs
+++ b/client/finality-grandpa/src/observer.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/finality-grandpa/src/tests.rs b/client/finality-grandpa/src/tests.rs
index cf1201c6e916..1ee71dddc4d4 100644
--- a/client/finality-grandpa/src/tests.rs
+++ b/client/finality-grandpa/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/finality-grandpa/src/until_imported.rs b/client/finality-grandpa/src/until_imported.rs
index 3ac94f3b062f..c27eab535156 100644
--- a/client/finality-grandpa/src/until_imported.rs
+++ b/client/finality-grandpa/src/until_imported.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/finality-grandpa/src/voting_rule.rs b/client/finality-grandpa/src/voting_rule.rs
index 700b0aeb551c..a861e792755f 100644
--- a/client/finality-grandpa/src/voting_rule.rs
+++ b/client/finality-grandpa/src/voting_rule.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/informant/src/display.rs b/client/informant/src/display.rs
index 5c8f5f8ef84a..0caef4e5fbae 100644
--- a/client/informant/src/display.rs
+++ b/client/informant/src/display.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::OutputFormat;
 use ansi_term::Colour;
diff --git a/client/informant/src/lib.rs b/client/informant/src/lib.rs
index d4f34cb488a9..c955834c0f11 100644
--- a/client/informant/src/lib.rs
+++ b/client/informant/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/keystore/src/lib.rs b/client/keystore/src/lib.rs
index 0b6d654bc623..9cad56efacfd 100644
--- a/client/keystore/src/lib.rs
+++ b/client/keystore/src/lib.rs
@@ -1,18 +1,20 @@
-// Copyright 2017-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Keystore (and session key management) for ed25519 based chains like Polkadot.
 
diff --git a/client/keystore/src/local.rs b/client/keystore/src/local.rs
index 98f8bf6d0012..866a50ae4c93 100644
--- a/client/keystore/src/local.rs
+++ b/client/keystore/src/local.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/client/light/src/backend.rs b/client/light/src/backend.rs
index 74e1d613bcf5..27e0754eb552 100644
--- a/client/light/src/backend.rs
+++ b/client/light/src/backend.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/light/src/blockchain.rs b/client/light/src/blockchain.rs
index 3b5753f2849d..f682e6e35b3d 100644
--- a/client/light/src/blockchain.rs
+++ b/client/light/src/blockchain.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/light/src/call_executor.rs b/client/light/src/call_executor.rs
index 458ea2bd6b84..7115f24a77d6 100644
--- a/client/light/src/call_executor.rs
+++ b/client/light/src/call_executor.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/light/src/fetcher.rs b/client/light/src/fetcher.rs
index 60fce87b8d0c..b71c4871803d 100644
--- a/client/light/src/fetcher.rs
+++ b/client/light/src/fetcher.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/light/src/lib.rs b/client/light/src/lib.rs
index 899d1ae31a3d..e647b8743cc0 100644
--- a/client/light/src/lib.rs
+++ b/client/light/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/network-gossip/src/bridge.rs b/client/network-gossip/src/bridge.rs
index 4deaad6d748f..9f1813f22244 100644
--- a/client/network-gossip/src/bridge.rs
+++ b/client/network-gossip/src/bridge.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{Network, Validator};
 use crate::state_machine::{ConsensusGossip, TopicNotification, PERIODIC_MAINTENANCE_INTERVAL};
diff --git a/client/network-gossip/src/lib.rs b/client/network-gossip/src/lib.rs
index 2b333610223e..81575bdc774e 100644
--- a/client/network-gossip/src/lib.rs
+++ b/client/network-gossip/src/lib.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Polite gossiping.
 //!
diff --git a/client/network-gossip/src/state_machine.rs b/client/network-gossip/src/state_machine.rs
index 88f9d48375de..7ae630a97232 100644
--- a/client/network-gossip/src/state_machine.rs
+++ b/client/network-gossip/src/state_machine.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/network-gossip/src/validator.rs b/client/network-gossip/src/validator.rs
index fd29aaddafe6..4b5440c1a06f 100644
--- a/client/network-gossip/src/validator.rs
+++ b/client/network-gossip/src/validator.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/network/src/behaviour.rs b/client/network/src/behaviour.rs
index 8b9e321ca599..e0ca241ede2e 100644
--- a/client/network/src/behaviour.rs
+++ b/client/network/src/behaviour.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{
 	config::{ProtocolId, Role}, block_requests, light_client_handler,
diff --git a/client/network/src/block_requests.rs b/client/network/src/block_requests.rs
index ace63e6e1cdd..ff107e37ef3f 100644
--- a/client/network/src/block_requests.rs
+++ b/client/network/src/block_requests.rs
@@ -1,18 +1,20 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
-//
-// Substrate is free software: you can redistribute it and/or modify
+
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
-//
-// Substrate is distributed in the hope that it will be useful,
+
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
-//
+
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! `NetworkBehaviour` implementation which handles incoming block requests.
 //!
diff --git a/client/network/src/chain.rs b/client/network/src/chain.rs
index 61d19c10dae5..081d4b0d3ac3 100644
--- a/client/network/src/chain.rs
+++ b/client/network/src/chain.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/network/src/config.rs b/client/network/src/config.rs
index b7b113dc1469..7c85da8bbaa1 100644
--- a/client/network/src/config.rs
+++ b/client/network/src/config.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/network/src/discovery.rs b/client/network/src/discovery.rs
index b2517efb6607..d9d28569ad30 100644
--- a/client/network/src/discovery.rs
+++ b/client/network/src/discovery.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Discovery mechanisms of Substrate.
 //!
diff --git a/client/network/src/error.rs b/client/network/src/error.rs
index 7d7603ce92aa..2a226b58b46a 100644
--- a/client/network/src/error.rs
+++ b/client/network/src/error.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/network/src/gossip.rs b/client/network/src/gossip.rs
index 8a46d0701e93..4e6845e34126 100644
--- a/client/network/src/gossip.rs
+++ b/client/network/src/gossip.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/network/src/gossip/tests.rs b/client/network/src/gossip/tests.rs
index 93b69f7b64c8..d284616ce942 100644
--- a/client/network/src/gossip/tests.rs
+++ b/client/network/src/gossip/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/network/src/lib.rs b/client/network/src/lib.rs
index fb65c754d79a..533a69dd4d5a 100644
--- a/client/network/src/lib.rs
+++ b/client/network/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/network/src/light_client_handler.rs b/client/network/src/light_client_handler.rs
index 007cdcbf7a60..83c1160a3364 100644
--- a/client/network/src/light_client_handler.rs
+++ b/client/network/src/light_client_handler.rs
@@ -1,18 +1,20 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
-//
-// Substrate is free software: you can redistribute it and/or modify
+
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
-//
-// Substrate is distributed in the hope that it will be useful,
+
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
-//
+
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! [`NetworkBehaviour`] implementation which handles light client requests.
 //!
diff --git a/client/network/src/network_state.rs b/client/network/src/network_state.rs
index db2b6429304b..ba3e7cbff456 100644
--- a/client/network/src/network_state.rs
+++ b/client/network/src/network_state.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/network/src/on_demand_layer.rs b/client/network/src/on_demand_layer.rs
index 6e0add18adb0..9ec1fb7508c3 100644
--- a/client/network/src/on_demand_layer.rs
+++ b/client/network/src/on_demand_layer.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/network/src/peer_info.rs b/client/network/src/peer_info.rs
index 0bf2fe59fa21..28b913ea4019 100644
--- a/client/network/src/peer_info.rs
+++ b/client/network/src/peer_info.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use fnv::FnvHashMap;
 use futures::prelude::*;
diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index 1a67aec57abb..3bbfdb2cb65f 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/network/src/protocol/event.rs b/client/network/src/protocol/event.rs
index 86cb93bef26d..3fb383040dd2 100644
--- a/client/network/src/protocol/event.rs
+++ b/client/network/src/protocol/event.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Network event types. These are are not the part of the protocol, but rather
 //! events that happen on the network like DHT get/put results received.
diff --git a/client/network/src/protocol/generic_proto.rs b/client/network/src/protocol/generic_proto.rs
index 4d6e607a146e..a305fc1f5ea5 100644
--- a/client/network/src/protocol/generic_proto.rs
+++ b/client/network/src/protocol/generic_proto.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Implementation of libp2p's `NetworkBehaviour` trait that opens a single substream with the
 //! remote and then allows any communication with them.
diff --git a/client/network/src/protocol/generic_proto/behaviour.rs b/client/network/src/protocol/generic_proto/behaviour.rs
index b8b4cce0a72c..c7bd7ce8cb02 100644
--- a/client/network/src/protocol/generic_proto/behaviour.rs
+++ b/client/network/src/protocol/generic_proto/behaviour.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::config::ProtocolId;
 use crate::protocol::generic_proto::{
diff --git a/client/network/src/protocol/generic_proto/handler.rs b/client/network/src/protocol/generic_proto/handler.rs
index e479a34d14f3..97417000c20b 100644
--- a/client/network/src/protocol/generic_proto/handler.rs
+++ b/client/network/src/protocol/generic_proto/handler.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Implementations of the `IntoProtocolsHandler` and `ProtocolsHandler` traits for both incoming
 //! and outgoing substreams for all gossiping protocols together.
diff --git a/client/network/src/protocol/generic_proto/tests.rs b/client/network/src/protocol/generic_proto/tests.rs
index 9c45c62f8bb4..fb28bd40d3dd 100644
--- a/client/network/src/protocol/generic_proto/tests.rs
+++ b/client/network/src/protocol/generic_proto/tests.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 #![cfg(test)]
 
diff --git a/client/network/src/protocol/generic_proto/upgrade.rs b/client/network/src/protocol/generic_proto/upgrade.rs
index 6322a10b572a..6917742d8abb 100644
--- a/client/network/src/protocol/generic_proto/upgrade.rs
+++ b/client/network/src/protocol/generic_proto/upgrade.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/network/src/protocol/generic_proto/upgrade/collec.rs b/client/network/src/protocol/generic_proto/upgrade/collec.rs
index f8d199974940..8531fb8bdfdb 100644
--- a/client/network/src/protocol/generic_proto/upgrade/collec.rs
+++ b/client/network/src/protocol/generic_proto/upgrade/collec.rs
@@ -1,22 +1,20 @@
-// Copyright 2018-2020 Parity Technologies (UK) Ltd.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// This file is part of Substrate.
+
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use futures::prelude::*;
 use libp2p::core::upgrade::{InboundUpgrade, ProtocolName, UpgradeInfo};
diff --git a/client/network/src/protocol/generic_proto/upgrade/legacy.rs b/client/network/src/protocol/generic_proto/upgrade/legacy.rs
index 91282d0cf57d..307bfd7ad639 100644
--- a/client/network/src/protocol/generic_proto/upgrade/legacy.rs
+++ b/client/network/src/protocol/generic_proto/upgrade/legacy.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/network/src/protocol/generic_proto/upgrade/notifications.rs b/client/network/src/protocol/generic_proto/upgrade/notifications.rs
index 64b4b980da00..ae9839f4f046 100644
--- a/client/network/src/protocol/generic_proto/upgrade/notifications.rs
+++ b/client/network/src/protocol/generic_proto/upgrade/notifications.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 /// Notifications protocol.
 ///
diff --git a/client/network/src/protocol/message.rs b/client/network/src/protocol/message.rs
index 4213d56bbf02..c0a92629d900 100644
--- a/client/network/src/protocol/message.rs
+++ b/client/network/src/protocol/message.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/network/src/protocol/sync.rs b/client/network/src/protocol/sync.rs
index 7e50f5869179..70f860bdcb33 100644
--- a/client/network/src/protocol/sync.rs
+++ b/client/network/src/protocol/sync.rs
@@ -1,18 +1,20 @@
-// Copyright 2017-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
-//
-// Substrate is free software: you can redistribute it and/or modify
+
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
-//
-// Substrate is distributed in the hope that it will be useful,
+
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
-//
+
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Contains the state of the chain synchronization process
 //!
diff --git a/client/network/src/protocol/sync/blocks.rs b/client/network/src/protocol/sync/blocks.rs
index b64c9e053e97..60492f24ed8c 100644
--- a/client/network/src/protocol/sync/blocks.rs
+++ b/client/network/src/protocol/sync/blocks.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/network/src/protocol/sync/extra_requests.rs b/client/network/src/protocol/sync/extra_requests.rs
index 84ad308c61ed..d0fcfb777b8b 100644
--- a/client/network/src/protocol/sync/extra_requests.rs
+++ b/client/network/src/protocol/sync/extra_requests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/network/src/request_responses.rs b/client/network/src/request_responses.rs
index a410ae0dff55..4cd6bc3c5c40 100644
--- a/client/network/src/request_responses.rs
+++ b/client/network/src/request_responses.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Collection of request-response protocols.
 //!
diff --git a/client/network/src/schema.rs b/client/network/src/schema.rs
index 423d3ef5b41e..5b9a70b0cd5d 100644
--- a/client/network/src/schema.rs
+++ b/client/network/src/schema.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 3a368088e539..c2d3dcc55b8b 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/network/src/service/metrics.rs b/client/network/src/service/metrics.rs
index 614c24b522de..3dd0d48888ec 100644
--- a/client/network/src/service/metrics.rs
+++ b/client/network/src/service/metrics.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/network/src/service/out_events.rs b/client/network/src/service/out_events.rs
index 976548f6ed44..eb811d56ab86 100644
--- a/client/network/src/service/out_events.rs
+++ b/client/network/src/service/out_events.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/network/src/service/tests.rs b/client/network/src/service/tests.rs
index 225a3ae98ab5..3372fd9f9292 100644
--- a/client/network/src/service/tests.rs
+++ b/client/network/src/service/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/network/src/transport.rs b/client/network/src/transport.rs
index 4bf252d57978..4d9d4fbde23a 100644
--- a/client/network/src/transport.rs
+++ b/client/network/src/transport.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/network/src/utils.rs b/client/network/src/utils.rs
index 490e2ced3826..02673ef49fb4 100644
--- a/client/network/src/utils.rs
+++ b/client/network/src/utils.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use futures::{stream::unfold, FutureExt, Stream, StreamExt};
 use futures_timer::Delay;
diff --git a/client/network/test/src/block_import.rs b/client/network/test/src/block_import.rs
index 5f9064d410e0..4000e53420b4 100644
--- a/client/network/test/src/block_import.rs
+++ b/client/network/test/src/block_import.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/network/test/src/lib.rs b/client/network/test/src/lib.rs
index 428d8390b365..68e2bd1594d1 100644
--- a/client/network/test/src/lib.rs
+++ b/client/network/test/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/network/test/src/sync.rs b/client/network/test/src/sync.rs
index e04ef060f08c..999f9fe1ee3a 100644
--- a/client/network/test/src/sync.rs
+++ b/client/network/test/src/sync.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/offchain/src/api.rs b/client/offchain/src/api.rs
index 6fb1da19bf05..6bef7187e450 100644
--- a/client/offchain/src/api.rs
+++ b/client/offchain/src/api.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use std::{
 	str::FromStr,
diff --git a/client/offchain/src/api/http.rs b/client/offchain/src/api/http.rs
index 1f542b7c11e1..dbe8e55b3646 100644
--- a/client/offchain/src/api/http.rs
+++ b/client/offchain/src/api/http.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! This module is composed of two structs: [`HttpApi`] and [`HttpWorker`]. Calling the [`http`]
 //! function returns a pair of [`HttpApi`] and [`HttpWorker`] that share some state.
diff --git a/client/offchain/src/api/http_dummy.rs b/client/offchain/src/api/http_dummy.rs
index 1c83325c93b2..ff9c2fb2aa02 100644
--- a/client/offchain/src/api/http_dummy.rs
+++ b/client/offchain/src/api/http_dummy.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Contains the same API as the `http` module, except that everything returns an error.
 
diff --git a/client/offchain/src/api/timestamp.rs b/client/offchain/src/api/timestamp.rs
index 222d3273cb35..31370d4f733c 100644
--- a/client/offchain/src/api/timestamp.rs
+++ b/client/offchain/src/api/timestamp.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Helper methods dedicated to timestamps.
 
diff --git a/client/offchain/src/lib.rs b/client/offchain/src/lib.rs
index 885294449fb9..767d2ac5a12d 100644
--- a/client/offchain/src/lib.rs
+++ b/client/offchain/src/lib.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Substrate offchain workers.
 //!
diff --git a/client/peerset/src/lib.rs b/client/peerset/src/lib.rs
index bb08bdc18e67..141cafc0d12b 100644
--- a/client/peerset/src/lib.rs
+++ b/client/peerset/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/peerset/src/peersstate.rs b/client/peerset/src/peersstate.rs
index 19b2489eff48..d635f51781c9 100644
--- a/client/peerset/src/peersstate.rs
+++ b/client/peerset/src/peersstate.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Reputation and slots allocation system behind the peerset.
 //!
diff --git a/client/peerset/tests/fuzz.rs b/client/peerset/tests/fuzz.rs
index e02742fc40ad..6f1bcb653de3 100644
--- a/client/peerset/tests/fuzz.rs
+++ b/client/peerset/tests/fuzz.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/proposer-metrics/src/lib.rs b/client/proposer-metrics/src/lib.rs
index 50498d40b62d..8fec9779de47 100644
--- a/client/proposer-metrics/src/lib.rs
+++ b/client/proposer-metrics/src/lib.rs
@@ -1,18 +1,20 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Prometheus basic proposer metrics.
 
diff --git a/client/rpc-api/src/author/error.rs b/client/rpc-api/src/author/error.rs
index 69c036be95fe..4d3a256a1a42 100644
--- a/client/rpc-api/src/author/error.rs
+++ b/client/rpc-api/src/author/error.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/rpc-api/src/author/hash.rs b/client/rpc-api/src/author/hash.rs
index 4287af8ede59..618159a8ad4d 100644
--- a/client/rpc-api/src/author/hash.rs
+++ b/client/rpc-api/src/author/hash.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Extrinsic helpers for author RPC module.
 
diff --git a/client/rpc-api/src/author/mod.rs b/client/rpc-api/src/author/mod.rs
index 29f5b1d26e84..6ccf1ebab375 100644
--- a/client/rpc-api/src/author/mod.rs
+++ b/client/rpc-api/src/author/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/rpc-api/src/chain/error.rs b/client/rpc-api/src/chain/error.rs
index fd7bd0a43d77..59a0c0a2f840 100644
--- a/client/rpc-api/src/chain/error.rs
+++ b/client/rpc-api/src/chain/error.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/rpc-api/src/chain/mod.rs b/client/rpc-api/src/chain/mod.rs
index 9bb75216c018..5e2d48441304 100644
--- a/client/rpc-api/src/chain/mod.rs
+++ b/client/rpc-api/src/chain/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/rpc-api/src/child_state/mod.rs b/client/rpc-api/src/child_state/mod.rs
index d956a7554f8e..7efff7422596 100644
--- a/client/rpc-api/src/child_state/mod.rs
+++ b/client/rpc-api/src/child_state/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/rpc-api/src/errors.rs b/client/rpc-api/src/errors.rs
index 4e1a5b10fc51..8e4883a4cc20 100644
--- a/client/rpc-api/src/errors.rs
+++ b/client/rpc-api/src/errors.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/rpc-api/src/helpers.rs b/client/rpc-api/src/helpers.rs
index 025fef1102c4..e85c26062b50 100644
--- a/client/rpc-api/src/helpers.rs
+++ b/client/rpc-api/src/helpers.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/rpc-api/src/lib.rs b/client/rpc-api/src/lib.rs
index 7bae75181056..814319add2a3 100644
--- a/client/rpc-api/src/lib.rs
+++ b/client/rpc-api/src/lib.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Substrate RPC interfaces.
 //!
diff --git a/client/rpc-api/src/metadata.rs b/client/rpc-api/src/metadata.rs
index cffcbf61f544..efe090acc621 100644
--- a/client/rpc-api/src/metadata.rs
+++ b/client/rpc-api/src/metadata.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/rpc-api/src/offchain/error.rs b/client/rpc-api/src/offchain/error.rs
index ea5223f1ce7f..f74d419e5442 100644
--- a/client/rpc-api/src/offchain/error.rs
+++ b/client/rpc-api/src/offchain/error.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/rpc-api/src/offchain/mod.rs b/client/rpc-api/src/offchain/mod.rs
index 427b6a1cc017..7a1f6db9e80b 100644
--- a/client/rpc-api/src/offchain/mod.rs
+++ b/client/rpc-api/src/offchain/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/rpc-api/src/policy.rs b/client/rpc-api/src/policy.rs
index 141dcfbc415f..5d56c62bfece 100644
--- a/client/rpc-api/src/policy.rs
+++ b/client/rpc-api/src/policy.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/rpc-api/src/state/error.rs b/client/rpc-api/src/state/error.rs
index 1c22788062c7..4f2a2c854ae0 100644
--- a/client/rpc-api/src/state/error.rs
+++ b/client/rpc-api/src/state/error.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/rpc-api/src/state/helpers.rs b/client/rpc-api/src/state/helpers.rs
index 0d176ea67f35..cb7bd380afa5 100644
--- a/client/rpc-api/src/state/helpers.rs
+++ b/client/rpc-api/src/state/helpers.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/rpc-api/src/state/mod.rs b/client/rpc-api/src/state/mod.rs
index 874fc862a39d..aae2dcb5ae7d 100644
--- a/client/rpc-api/src/state/mod.rs
+++ b/client/rpc-api/src/state/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/rpc-api/src/system/error.rs b/client/rpc-api/src/system/error.rs
index 4897aa485cbe..a0dfd863ce3a 100644
--- a/client/rpc-api/src/system/error.rs
+++ b/client/rpc-api/src/system/error.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/rpc-api/src/system/helpers.rs b/client/rpc-api/src/system/helpers.rs
index c5dddedef956..b2b793a8ee40 100644
--- a/client/rpc-api/src/system/helpers.rs
+++ b/client/rpc-api/src/system/helpers.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/rpc-api/src/system/mod.rs b/client/rpc-api/src/system/mod.rs
index f05f1fada901..2cf22b980299 100644
--- a/client/rpc-api/src/system/mod.rs
+++ b/client/rpc-api/src/system/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/rpc-servers/src/lib.rs b/client/rpc-servers/src/lib.rs
index 1f99e8bb0d24..26d3cb1b7816 100644
--- a/client/rpc-servers/src/lib.rs
+++ b/client/rpc-servers/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/rpc-servers/src/middleware.rs b/client/rpc-servers/src/middleware.rs
index 233ceab3cf8a..2cbc61716c31 100644
--- a/client/rpc-servers/src/middleware.rs
+++ b/client/rpc-servers/src/middleware.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/rpc/src/author/mod.rs b/client/rpc/src/author/mod.rs
index 1a2d84e4e572..7cd980544503 100644
--- a/client/rpc/src/author/mod.rs
+++ b/client/rpc/src/author/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/rpc/src/author/tests.rs b/client/rpc/src/author/tests.rs
index dc553e60dbfb..9dd4f1b143fd 100644
--- a/client/rpc/src/author/tests.rs
+++ b/client/rpc/src/author/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/rpc/src/chain/chain_full.rs b/client/rpc/src/chain/chain_full.rs
index 816dbba86641..9687b13d50fc 100644
--- a/client/rpc/src/chain/chain_full.rs
+++ b/client/rpc/src/chain/chain_full.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Blockchain API backend for full nodes.
 
diff --git a/client/rpc/src/chain/chain_light.rs b/client/rpc/src/chain/chain_light.rs
index 8a4afbed71c1..41d4d02e33c9 100644
--- a/client/rpc/src/chain/chain_light.rs
+++ b/client/rpc/src/chain/chain_light.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Blockchain API backend for light nodes.
 
diff --git a/client/rpc/src/chain/mod.rs b/client/rpc/src/chain/mod.rs
index cb67d9ba2316..d3a28d534335 100644
--- a/client/rpc/src/chain/mod.rs
+++ b/client/rpc/src/chain/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/rpc/src/chain/tests.rs b/client/rpc/src/chain/tests.rs
index b36fc4eab1d8..80b990a9fbf0 100644
--- a/client/rpc/src/chain/tests.rs
+++ b/client/rpc/src/chain/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/rpc/src/lib.rs b/client/rpc/src/lib.rs
index 434859a39c2f..7b3af8cb2f32 100644
--- a/client/rpc/src/lib.rs
+++ b/client/rpc/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/rpc/src/offchain/mod.rs b/client/rpc/src/offchain/mod.rs
index f8d2bb6a50f9..dbb48a9e5193 100644
--- a/client/rpc/src/offchain/mod.rs
+++ b/client/rpc/src/offchain/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/rpc/src/offchain/tests.rs b/client/rpc/src/offchain/tests.rs
index f65971a7ffe8..b8054d816325 100644
--- a/client/rpc/src/offchain/tests.rs
+++ b/client/rpc/src/offchain/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/rpc/src/state/mod.rs b/client/rpc/src/state/mod.rs
index 8573b3cf8255..52a4ed1d753b 100644
--- a/client/rpc/src/state/mod.rs
+++ b/client/rpc/src/state/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/rpc/src/state/state_full.rs b/client/rpc/src/state/state_full.rs
index a1b9fbc4eebc..8d93d445b08c 100644
--- a/client/rpc/src/state/state_full.rs
+++ b/client/rpc/src/state/state_full.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! State API backend for full nodes.
 
diff --git a/client/rpc/src/state/state_light.rs b/client/rpc/src/state/state_light.rs
index 8f4dce08b3fb..c1294dd27b08 100644
--- a/client/rpc/src/state/state_light.rs
+++ b/client/rpc/src/state/state_light.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! State API backend for light nodes.
 
diff --git a/client/rpc/src/state/tests.rs b/client/rpc/src/state/tests.rs
index d145ac5e5510..87b0fae1d6b3 100644
--- a/client/rpc/src/state/tests.rs
+++ b/client/rpc/src/state/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/rpc/src/system/mod.rs b/client/rpc/src/system/mod.rs
index f1ebf5f702a2..60a410b80568 100644
--- a/client/rpc/src/system/mod.rs
+++ b/client/rpc/src/system/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/rpc/src/system/tests.rs b/client/rpc/src/system/tests.rs
index f6463c2fc775..c24c7a3faa6e 100644
--- a/client/rpc/src/system/tests.rs
+++ b/client/rpc/src/system/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/rpc/src/testing.rs b/client/rpc/src/testing.rs
index 9530ff002064..b69cc7d4b194 100644
--- a/client/rpc/src/testing.rs
+++ b/client/rpc/src/testing.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index 5e511d3d7c77..5426169a8331 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/service/src/chain_ops/check_block.rs b/client/service/src/chain_ops/check_block.rs
index 34baeb55445a..94f6d25c9eb8 100644
--- a/client/service/src/chain_ops/check_block.rs
+++ b/client/service/src/chain_ops/check_block.rs
@@ -1,18 +1,20 @@
-// Copyright 2017-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::error::Error;
 use futures::{future, prelude::*};
diff --git a/client/service/src/chain_ops/export_blocks.rs b/client/service/src/chain_ops/export_blocks.rs
index 3d2dbcbb9d00..1d9325d1d745 100644
--- a/client/service/src/chain_ops/export_blocks.rs
+++ b/client/service/src/chain_ops/export_blocks.rs
@@ -1,18 +1,20 @@
-// Copyright 2017-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::error::Error;
 use log::info;
diff --git a/client/service/src/chain_ops/export_raw_state.rs b/client/service/src/chain_ops/export_raw_state.rs
index 3fe44dbdb142..71822cf6275f 100644
--- a/client/service/src/chain_ops/export_raw_state.rs
+++ b/client/service/src/chain_ops/export_raw_state.rs
@@ -1,18 +1,20 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::error::Error;
 use sp_runtime::traits::Block as BlockT;
diff --git a/client/service/src/chain_ops/import_blocks.rs b/client/service/src/chain_ops/import_blocks.rs
index 74a33c6557c9..3f918e05120e 100644
--- a/client/service/src/chain_ops/import_blocks.rs
+++ b/client/service/src/chain_ops/import_blocks.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/service/src/chain_ops/mod.rs b/client/service/src/chain_ops/mod.rs
index af6e6f632fc0..c213e745a5d6 100644
--- a/client/service/src/chain_ops/mod.rs
+++ b/client/service/src/chain_ops/mod.rs
@@ -1,18 +1,20 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Chain utilities.
 
diff --git a/client/service/src/chain_ops/revert_chain.rs b/client/service/src/chain_ops/revert_chain.rs
index eaee2c03f9b3..e3301eb2627e 100644
--- a/client/service/src/chain_ops/revert_chain.rs
+++ b/client/service/src/chain_ops/revert_chain.rs
@@ -1,18 +1,20 @@
-// Copyright 2017-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::error::Error;
 use log::info;
diff --git a/client/service/src/client/block_rules.rs b/client/service/src/client/block_rules.rs
index be84614c2a59..1af06666339c 100644
--- a/client/service/src/client/block_rules.rs
+++ b/client/service/src/client/block_rules.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/service/src/client/call_executor.rs b/client/service/src/client/call_executor.rs
index cd01a5877758..d6f04d702704 100644
--- a/client/service/src/client/call_executor.rs
+++ b/client/service/src/client/call_executor.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index 26892416b34f..d8884f235f90 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/service/src/client/genesis.rs b/client/service/src/client/genesis.rs
index 4df08025e382..08235f7efb6e 100644
--- a/client/service/src/client/genesis.rs
+++ b/client/service/src/client/genesis.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/service/src/client/light.rs b/client/service/src/client/light.rs
index 6d4f9aa1c9d1..5b5c0cb0eb38 100644
--- a/client/service/src/client/light.rs
+++ b/client/service/src/client/light.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/service/src/client/mod.rs b/client/service/src/client/mod.rs
index e4d1dc8bd850..06f48048f8f2 100644
--- a/client/service/src/client/mod.rs
+++ b/client/service/src/client/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/service/src/client/wasm_override.rs b/client/service/src/client/wasm_override.rs
index ba76f7a0fcf2..aca29694fca8 100644
--- a/client/service/src/client/wasm_override.rs
+++ b/client/service/src/client/wasm_override.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/service/src/config.rs b/client/service/src/config.rs
index 2b3eff1371cd..e253ed97ff3a 100644
--- a/client/service/src/config.rs
+++ b/client/service/src/config.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/service/src/error.rs b/client/service/src/error.rs
index 3515df78be87..31c3cea4ef43 100644
--- a/client/service/src/error.rs
+++ b/client/service/src/error.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index cd129de32607..8b26b1a75ddf 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/service/src/metrics.rs b/client/service/src/metrics.rs
index d3ad780b5be6..446cce952741 100644
--- a/client/service/src/metrics.rs
+++ b/client/service/src/metrics.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/service/src/task_manager/mod.rs b/client/service/src/task_manager/mod.rs
index a0aeba3009de..d1ab8c9c2a7e 100644
--- a/client/service/src/task_manager/mod.rs
+++ b/client/service/src/task_manager/mod.rs
@@ -1,16 +1,21 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
 //! Substrate service tasks management module.
 
 use std::{panic, result::Result, pin::Pin};
diff --git a/client/service/src/task_manager/prometheus_future.rs b/client/service/src/task_manager/prometheus_future.rs
index 53bd59aa7a50..6d2a52354d6c 100644
--- a/client/service/src/task_manager/prometheus_future.rs
+++ b/client/service/src/task_manager/prometheus_future.rs
@@ -1,16 +1,21 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
 //! Wrapper around a `Future` that reports statistics about when the `Future` is polled.
 
 use futures::prelude::*;
diff --git a/client/service/src/task_manager/tests.rs b/client/service/src/task_manager/tests.rs
index 27d9b0b9e9ad..0509392ce388 100644
--- a/client/service/src/task_manager/tests.rs
+++ b/client/service/src/task_manager/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/service/test/src/client/db.rs b/client/service/test/src/client/db.rs
index 36d49732246e..a86e8f2de467 100644
--- a/client/service/test/src/client/db.rs
+++ b/client/service/test/src/client/db.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/service/test/src/client/light.rs b/client/service/test/src/client/light.rs
index f38aef008e11..201b24a6efa2 100644
--- a/client/service/test/src/client/light.rs
+++ b/client/service/test/src/client/light.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/service/test/src/client/mod.rs b/client/service/test/src/client/mod.rs
index 23d6a3429732..6bb09981107a 100644
--- a/client/service/test/src/client/mod.rs
+++ b/client/service/test/src/client/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/service/test/src/lib.rs b/client/service/test/src/lib.rs
index 1f200b4cbeed..c30246e91ca0 100644
--- a/client/service/test/src/lib.rs
+++ b/client/service/test/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/state-db/src/lib.rs b/client/state-db/src/lib.rs
index 61470894e487..8fd02ee17b99 100644
--- a/client/state-db/src/lib.rs
+++ b/client/state-db/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/state-db/src/noncanonical.rs b/client/state-db/src/noncanonical.rs
index d77f20c50d05..551bf5fb860c 100644
--- a/client/state-db/src/noncanonical.rs
+++ b/client/state-db/src/noncanonical.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/state-db/src/pruning.rs b/client/state-db/src/pruning.rs
index 69b07c285fad..0c682d8954b1 100644
--- a/client/state-db/src/pruning.rs
+++ b/client/state-db/src/pruning.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/state-db/src/test.rs b/client/state-db/src/test.rs
index 11ce4ad82262..e1bb6d01c37e 100644
--- a/client/state-db/src/test.rs
+++ b/client/state-db/src/test.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/sync-state-rpc/src/lib.rs b/client/sync-state-rpc/src/lib.rs
index 573610fb2f61..846652311644 100644
--- a/client/sync-state-rpc/src/lib.rs
+++ b/client/sync-state-rpc/src/lib.rs
@@ -1,18 +1,20 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! A RPC handler to create sync states for light clients.
 //! Currently only usable with BABE + GRANDPA.
diff --git a/client/telemetry/src/lib.rs b/client/telemetry/src/lib.rs
index 6a5ac0e0cb31..58c9fe73b28c 100644
--- a/client/telemetry/src/lib.rs
+++ b/client/telemetry/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/telemetry/src/worker.rs b/client/telemetry/src/worker.rs
index a01ab89e7dde..158781f04335 100644
--- a/client/telemetry/src/worker.rs
+++ b/client/telemetry/src/worker.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/telemetry/src/worker/node.rs b/client/telemetry/src/worker/node.rs
index eef7ca7e8155..5fbafde8c941 100644
--- a/client/telemetry/src/worker/node.rs
+++ b/client/telemetry/src/worker/node.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/tracing/src/lib.rs b/client/tracing/src/lib.rs
index f4017023eff1..639ba56b12e5 100644
--- a/client/tracing/src/lib.rs
+++ b/client/tracing/src/lib.rs
@@ -1,18 +1,20 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
-// Substrate is distributed in the hope that it will be useful,
+// This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Instrumentation implementation for substrate.
 //!
diff --git a/client/tracing/src/logging.rs b/client/tracing/src/logging.rs
index 370b09f781b4..248c91feb80f 100644
--- a/client/tracing/src/logging.rs
+++ b/client/tracing/src/logging.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/transaction-pool/graph/benches/basics.rs b/client/transaction-pool/graph/benches/basics.rs
index bb10086bd4a5..f7096b021440 100644
--- a/client/transaction-pool/graph/benches/basics.rs
+++ b/client/transaction-pool/graph/benches/basics.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/transaction-pool/graph/src/base_pool.rs b/client/transaction-pool/graph/src/base_pool.rs
index 81d8e802c2c9..445ef0adaf7b 100644
--- a/client/transaction-pool/graph/src/base_pool.rs
+++ b/client/transaction-pool/graph/src/base_pool.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/transaction-pool/graph/src/future.rs b/client/transaction-pool/graph/src/future.rs
index 80e6825d4ff9..98d49817e32a 100644
--- a/client/transaction-pool/graph/src/future.rs
+++ b/client/transaction-pool/graph/src/future.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/transaction-pool/graph/src/lib.rs b/client/transaction-pool/graph/src/lib.rs
index bf220ce22973..b8d36d0399b9 100644
--- a/client/transaction-pool/graph/src/lib.rs
+++ b/client/transaction-pool/graph/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/transaction-pool/graph/src/listener.rs b/client/transaction-pool/graph/src/listener.rs
index 1bc3720fa6b8..d707c0a0f802 100644
--- a/client/transaction-pool/graph/src/listener.rs
+++ b/client/transaction-pool/graph/src/listener.rs
@@ -1,7 +1,7 @@
 
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/transaction-pool/graph/src/pool.rs b/client/transaction-pool/graph/src/pool.rs
index 56ff550d7754..8255370df55d 100644
--- a/client/transaction-pool/graph/src/pool.rs
+++ b/client/transaction-pool/graph/src/pool.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/transaction-pool/graph/src/ready.rs b/client/transaction-pool/graph/src/ready.rs
index cbdb25078931..c2af4f9cb914 100644
--- a/client/transaction-pool/graph/src/ready.rs
+++ b/client/transaction-pool/graph/src/ready.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/transaction-pool/graph/src/rotator.rs b/client/transaction-pool/graph/src/rotator.rs
index 65e21d0d4b50..3d9b359fd365 100644
--- a/client/transaction-pool/graph/src/rotator.rs
+++ b/client/transaction-pool/graph/src/rotator.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/transaction-pool/graph/src/tracked_map.rs b/client/transaction-pool/graph/src/tracked_map.rs
index c799eb0b96ea..9cd6ad84b483 100644
--- a/client/transaction-pool/graph/src/tracked_map.rs
+++ b/client/transaction-pool/graph/src/tracked_map.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/transaction-pool/graph/src/validated_pool.rs b/client/transaction-pool/graph/src/validated_pool.rs
index ad2fdda73b49..ef689436275a 100644
--- a/client/transaction-pool/graph/src/validated_pool.rs
+++ b/client/transaction-pool/graph/src/validated_pool.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/transaction-pool/graph/src/watcher.rs b/client/transaction-pool/graph/src/watcher.rs
index 9d9a91bb23f6..6f8eb7c6e566 100644
--- a/client/transaction-pool/graph/src/watcher.rs
+++ b/client/transaction-pool/graph/src/watcher.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/transaction-pool/src/api.rs b/client/transaction-pool/src/api.rs
index 853b66f6e74b..fc14a5a0cba6 100644
--- a/client/transaction-pool/src/api.rs
+++ b/client/transaction-pool/src/api.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/transaction-pool/src/error.rs b/client/transaction-pool/src/error.rs
index 49fc433e320c..62c812d14704 100644
--- a/client/transaction-pool/src/error.rs
+++ b/client/transaction-pool/src/error.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/transaction-pool/src/lib.rs b/client/transaction-pool/src/lib.rs
index e03c01bd1d81..e9a1c3906f48 100644
--- a/client/transaction-pool/src/lib.rs
+++ b/client/transaction-pool/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/transaction-pool/src/metrics.rs b/client/transaction-pool/src/metrics.rs
index 376e6dfe9448..e0b70183a86b 100644
--- a/client/transaction-pool/src/metrics.rs
+++ b/client/transaction-pool/src/metrics.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/transaction-pool/src/revalidation.rs b/client/transaction-pool/src/revalidation.rs
index 7be8688eaea5..69b601484c77 100644
--- a/client/transaction-pool/src/revalidation.rs
+++ b/client/transaction-pool/src/revalidation.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/transaction-pool/src/testing/mod.rs b/client/transaction-pool/src/testing/mod.rs
index 350c4137c37b..9c7f1dfd7f33 100644
--- a/client/transaction-pool/src/testing/mod.rs
+++ b/client/transaction-pool/src/testing/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/client/transaction-pool/src/testing/pool.rs b/client/transaction-pool/src/testing/pool.rs
index 8fa742cd419a..6e00af47602d 100644
--- a/client/transaction-pool/src/testing/pool.rs
+++ b/client/transaction-pool/src/testing/pool.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/frame/assets/src/benchmarking.rs b/frame/assets/src/benchmarking.rs
index cecb2ccae58b..db98164023d5 100644
--- a/frame/assets/src/benchmarking.rs
+++ b/frame/assets/src/benchmarking.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index 137ba81f389a..0455f35e2455 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/assets/src/weights.rs b/frame/assets/src/weights.rs
index f6408e527f51..a8e17615d282 100644
--- a/frame/assets/src/weights.rs
+++ b/frame/assets/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/atomic-swap/src/lib.rs b/frame/atomic-swap/src/lib.rs
index ac9b82b0df06..e6d44d73c40d 100644
--- a/frame/atomic-swap/src/lib.rs
+++ b/frame/atomic-swap/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/aura/src/lib.rs b/frame/aura/src/lib.rs
index 34f216850c67..2e32fc61585d 100644
--- a/frame/aura/src/lib.rs
+++ b/frame/aura/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/aura/src/mock.rs b/frame/aura/src/mock.rs
index 8d5cbcc9b7b0..69e914a23a10 100644
--- a/frame/aura/src/mock.rs
+++ b/frame/aura/src/mock.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/aura/src/tests.rs b/frame/aura/src/tests.rs
index ca0fc3de3763..b198308282c4 100644
--- a/frame/aura/src/tests.rs
+++ b/frame/aura/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/authority-discovery/src/lib.rs b/frame/authority-discovery/src/lib.rs
index 59321421755d..fdc13cd74706 100644
--- a/frame/authority-discovery/src/lib.rs
+++ b/frame/authority-discovery/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/authorship/src/lib.rs b/frame/authorship/src/lib.rs
index 3672174e2574..d31d6866254d 100644
--- a/frame/authorship/src/lib.rs
+++ b/frame/authorship/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/babe/src/benchmarking.rs b/frame/babe/src/benchmarking.rs
index 8ee4a5913c88..4d75c36669ea 100644
--- a/frame/babe/src/benchmarking.rs
+++ b/frame/babe/src/benchmarking.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/babe/src/default_weights.rs b/frame/babe/src/default_weights.rs
index a0e13781961c..c7c87b583740 100644
--- a/frame/babe/src/default_weights.rs
+++ b/frame/babe/src/default_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/babe/src/equivocation.rs b/frame/babe/src/equivocation.rs
index 55aaedfe082f..e7053f5ac0fe 100644
--- a/frame/babe/src/equivocation.rs
+++ b/frame/babe/src/equivocation.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/babe/src/lib.rs b/frame/babe/src/lib.rs
index fa7954b95123..d7da96a3ddd9 100644
--- a/frame/babe/src/lib.rs
+++ b/frame/babe/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index f8805f7a1091..d29e467b7919 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/babe/src/tests.rs b/frame/babe/src/tests.rs
index 1e522bd83cd0..0d0536359f61 100644
--- a/frame/babe/src/tests.rs
+++ b/frame/babe/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/balances/src/benchmarking.rs b/frame/balances/src/benchmarking.rs
index 078d74006ba2..249934a61b4d 100644
--- a/frame/balances/src/benchmarking.rs
+++ b/frame/balances/src/benchmarking.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index b7d2488bfdd0..4fcda02c4fd2 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/balances/src/tests.rs b/frame/balances/src/tests.rs
index f47776e0ee6c..728bf036bb3b 100644
--- a/frame/balances/src/tests.rs
+++ b/frame/balances/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/balances/src/tests_composite.rs b/frame/balances/src/tests_composite.rs
index f98194c503e2..7cb9b9d502ba 100644
--- a/frame/balances/src/tests_composite.rs
+++ b/frame/balances/src/tests_composite.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/balances/src/tests_local.rs b/frame/balances/src/tests_local.rs
index e9d6fe2530a7..887b280945f1 100644
--- a/frame/balances/src/tests_local.rs
+++ b/frame/balances/src/tests_local.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/balances/src/weights.rs b/frame/balances/src/weights.rs
index 189947003b13..1f7e1bec080c 100644
--- a/frame/balances/src/weights.rs
+++ b/frame/balances/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/benchmarking/src/analysis.rs b/frame/benchmarking/src/analysis.rs
index dafe42de92e8..bdfa1cf65c47 100644
--- a/frame/benchmarking/src/analysis.rs
+++ b/frame/benchmarking/src/analysis.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
index c963642fabbc..308e5285d3f6 100644
--- a/frame/benchmarking/src/lib.rs
+++ b/frame/benchmarking/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/benchmarking/src/tests.rs b/frame/benchmarking/src/tests.rs
index e31f5ec0916e..7ea6bfd9afa2 100644
--- a/frame/benchmarking/src/tests.rs
+++ b/frame/benchmarking/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/benchmarking/src/utils.rs b/frame/benchmarking/src/utils.rs
index 2c2aee910e36..945141345cef 100644
--- a/frame/benchmarking/src/utils.rs
+++ b/frame/benchmarking/src/utils.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/bounties/src/benchmarking.rs b/frame/bounties/src/benchmarking.rs
index 21f68b078191..0fe479bda7bd 100644
--- a/frame/bounties/src/benchmarking.rs
+++ b/frame/bounties/src/benchmarking.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/bounties/src/lib.rs b/frame/bounties/src/lib.rs
index 32a377472622..a8b97d9e33b8 100644
--- a/frame/bounties/src/lib.rs
+++ b/frame/bounties/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/bounties/src/tests.rs b/frame/bounties/src/tests.rs
index bcf371eae492..2f503f39b94b 100644
--- a/frame/bounties/src/tests.rs
+++ b/frame/bounties/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/bounties/src/weights.rs b/frame/bounties/src/weights.rs
index 6ba1b9d32b10..fcbee727abe5 100644
--- a/frame/bounties/src/weights.rs
+++ b/frame/bounties/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/collective/src/benchmarking.rs b/frame/collective/src/benchmarking.rs
index 551d6c7856cd..50fab1b3e474 100644
--- a/frame/collective/src/benchmarking.rs
+++ b/frame/collective/src/benchmarking.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/collective/src/lib.rs b/frame/collective/src/lib.rs
index 1448bd9bc3a8..7c41b97996a6 100644
--- a/frame/collective/src/lib.rs
+++ b/frame/collective/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/collective/src/weights.rs b/frame/collective/src/weights.rs
index 8a76ff516ca3..f8558c833f01 100644
--- a/frame/collective/src/weights.rs
+++ b/frame/collective/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/contracts/common/src/lib.rs b/frame/contracts/common/src/lib.rs
index 9da105cf2d80..2b325d63d628 100644
--- a/frame/contracts/common/src/lib.rs
+++ b/frame/contracts/common/src/lib.rs
@@ -1,18 +1,19 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! A crate that hosts a common definitions that are relevant for the pallet-contracts.
 
diff --git a/frame/contracts/proc-macro/src/lib.rs b/frame/contracts/proc-macro/src/lib.rs
index 4e38508297d2..6fc2fbe82e03 100644
--- a/frame/contracts/proc-macro/src/lib.rs
+++ b/frame/contracts/proc-macro/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/contracts/rpc/runtime-api/src/lib.rs b/frame/contracts/rpc/runtime-api/src/lib.rs
index 94b9fe7967c0..6f0399586fa2 100644
--- a/frame/contracts/rpc/runtime-api/src/lib.rs
+++ b/frame/contracts/rpc/runtime-api/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/contracts/rpc/src/lib.rs b/frame/contracts/rpc/src/lib.rs
index a44ba769e96d..e0a056906f74 100644
--- a/frame/contracts/rpc/src/lib.rs
+++ b/frame/contracts/rpc/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/contracts/src/benchmarking/code.rs b/frame/contracts/src/benchmarking/code.rs
index 847be9b434cb..88e8b265a57e 100644
--- a/frame/contracts/src/benchmarking/code.rs
+++ b/frame/contracts/src/benchmarking/code.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index 4bdd279eb8b2..d6092f40a67b 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/contracts/src/benchmarking/sandbox.rs b/frame/contracts/src/benchmarking/sandbox.rs
index 61277ebce678..a97fcc2b113e 100644
--- a/frame/contracts/src/benchmarking/sandbox.rs
+++ b/frame/contracts/src/benchmarking/sandbox.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index 8577d04452fa..b5f4034b5bff 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -1,18 +1,19 @@
-// Copyright 2018-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 use crate::{
 	CodeHash, ConfigCache, Event, RawEvent, Config, Module as Contracts,
diff --git a/frame/contracts/src/gas.rs b/frame/contracts/src/gas.rs
index 18a200fd312c..949f970f03be 100644
--- a/frame/contracts/src/gas.rs
+++ b/frame/contracts/src/gas.rs
@@ -1,18 +1,19 @@
-// Copyright 2018-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 use crate::Config;
 use sp_std::marker::PhantomData;
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index a3c2c914cb87..1be5b8f44843 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -1,18 +1,19 @@
-// Copyright 2018-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! # Contract Module
 //!
diff --git a/frame/contracts/src/rent.rs b/frame/contracts/src/rent.rs
index 4b10a0408c15..d31efd5f5526 100644
--- a/frame/contracts/src/rent.rs
+++ b/frame/contracts/src/rent.rs
@@ -1,18 +1,19 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! A module responsible for computing the right amount of weight and charging it.
 
diff --git a/frame/contracts/src/schedule.rs b/frame/contracts/src/schedule.rs
index df1ea240630c..e6902c53b9c7 100644
--- a/frame/contracts/src/schedule.rs
+++ b/frame/contracts/src/schedule.rs
@@ -1,18 +1,19 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! This module contains the cost schedule and supporting code that constructs a
 //! sane default schedule from a `WeightInfo` implementation.
diff --git a/frame/contracts/src/storage.rs b/frame/contracts/src/storage.rs
index ba09adb285b9..180ec7237ff0 100644
--- a/frame/contracts/src/storage.rs
+++ b/frame/contracts/src/storage.rs
@@ -1,18 +1,19 @@
-// Copyright 2019 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! This module contains routines for accessing and altering a contract related state.
 
@@ -225,4 +226,4 @@ where
 			.and_then(|i| i.as_alive().map(|i| i.code_hash))
 			.ok_or(ContractAbsentError)
 	}
-}
\ No newline at end of file
+}
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index 991a89563eb9..e9307e14b63d 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -1,18 +1,19 @@
-// Copyright 2018-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 use crate::{
 	BalanceOf, ContractInfo, ContractInfoOf, GenesisConfig, Module,
diff --git a/frame/contracts/src/wasm/code_cache.rs b/frame/contracts/src/wasm/code_cache.rs
index d90c7502b85e..3150ee4b7bde 100644
--- a/frame/contracts/src/wasm/code_cache.rs
+++ b/frame/contracts/src/wasm/code_cache.rs
@@ -1,18 +1,19 @@
-// Copyright 2018-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
 
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! A module that implements instrumented code cache.
 //!
diff --git a/frame/contracts/src/wasm/env_def/macros.rs b/frame/contracts/src/wasm/env_def/macros.rs
index e49014ed950d..dbb6705e9722 100644
--- a/frame/contracts/src/wasm/env_def/macros.rs
+++ b/frame/contracts/src/wasm/env_def/macros.rs
@@ -1,18 +1,19 @@
-// Copyright 2018-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Definition of macros that hides boilerplate of defining external environment
 //! for a wasm module.
diff --git a/frame/contracts/src/wasm/env_def/mod.rs b/frame/contracts/src/wasm/env_def/mod.rs
index 7b67f74ec95c..0d9ceeee0237 100644
--- a/frame/contracts/src/wasm/env_def/mod.rs
+++ b/frame/contracts/src/wasm/env_def/mod.rs
@@ -1,18 +1,19 @@
-// Copyright 2018-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
 
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 use super::Runtime;
 use crate::exec::Ext;
diff --git a/frame/contracts/src/wasm/mod.rs b/frame/contracts/src/wasm/mod.rs
index a10e087cde83..e150e84d3495 100644
--- a/frame/contracts/src/wasm/mod.rs
+++ b/frame/contracts/src/wasm/mod.rs
@@ -1,18 +1,19 @@
-// Copyright 2018-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! This module provides a means for executing contracts
 //! represented in wasm.
diff --git a/frame/contracts/src/wasm/prepare.rs b/frame/contracts/src/wasm/prepare.rs
index 070e68bc4758..b30feb72ede9 100644
--- a/frame/contracts/src/wasm/prepare.rs
+++ b/frame/contracts/src/wasm/prepare.rs
@@ -1,18 +1,19 @@
-// Copyright 2018-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! This module takes care of loading, checking and preprocessing of a
 //! wasm module before execution. It also extracts some essential information
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index c4365e2cb0f5..c8e142d12cc2 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -1,18 +1,19 @@
-// Copyright 2018-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
 
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Environment definition of the wasm smart-contract runtime.
 
diff --git a/frame/contracts/src/weights.rs b/frame/contracts/src/weights.rs
index 24c1273a44ff..b9d7bc6e1fcc 100644
--- a/frame/contracts/src/weights.rs
+++ b/frame/contracts/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/democracy/src/benchmarking.rs b/frame/democracy/src/benchmarking.rs
index 542bfaa79db1..7460249b6c39 100644
--- a/frame/democracy/src/benchmarking.rs
+++ b/frame/democracy/src/benchmarking.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/democracy/src/conviction.rs b/frame/democracy/src/conviction.rs
index bb563e4b7483..c2dff741a9c2 100644
--- a/frame/democracy/src/conviction.rs
+++ b/frame/democracy/src/conviction.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/democracy/src/lib.rs b/frame/democracy/src/lib.rs
index 70383beaa065..a7dd2d5bd929 100644
--- a/frame/democracy/src/lib.rs
+++ b/frame/democracy/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/democracy/src/tests.rs b/frame/democracy/src/tests.rs
index 0e369bf3bd55..5927f1dcdd85 100644
--- a/frame/democracy/src/tests.rs
+++ b/frame/democracy/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/democracy/src/tests/cancellation.rs b/frame/democracy/src/tests/cancellation.rs
index 4221865a3e5b..d48173a39d83 100644
--- a/frame/democracy/src/tests/cancellation.rs
+++ b/frame/democracy/src/tests/cancellation.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/democracy/src/tests/decoders.rs b/frame/democracy/src/tests/decoders.rs
index 6b8e661ca9fd..52b61d8d9e7d 100644
--- a/frame/democracy/src/tests/decoders.rs
+++ b/frame/democracy/src/tests/decoders.rs
@@ -1,18 +1,19 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
 
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! The for various partial storage decoders
 
diff --git a/frame/democracy/src/tests/delegation.rs b/frame/democracy/src/tests/delegation.rs
index 34dec6d0b49a..d3afa1c13f90 100644
--- a/frame/democracy/src/tests/delegation.rs
+++ b/frame/democracy/src/tests/delegation.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/democracy/src/tests/external_proposing.rs b/frame/democracy/src/tests/external_proposing.rs
index 3f9be2137906..ff1a7a87da85 100644
--- a/frame/democracy/src/tests/external_proposing.rs
+++ b/frame/democracy/src/tests/external_proposing.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/democracy/src/tests/fast_tracking.rs b/frame/democracy/src/tests/fast_tracking.rs
index 8df34001cde0..d01dafaa762b 100644
--- a/frame/democracy/src/tests/fast_tracking.rs
+++ b/frame/democracy/src/tests/fast_tracking.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/democracy/src/tests/lock_voting.rs b/frame/democracy/src/tests/lock_voting.rs
index 93867030588c..29cd24e1de60 100644
--- a/frame/democracy/src/tests/lock_voting.rs
+++ b/frame/democracy/src/tests/lock_voting.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/democracy/src/tests/preimage.rs b/frame/democracy/src/tests/preimage.rs
index 8a2cbaf53403..135b167520be 100644
--- a/frame/democracy/src/tests/preimage.rs
+++ b/frame/democracy/src/tests/preimage.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/democracy/src/tests/public_proposals.rs b/frame/democracy/src/tests/public_proposals.rs
index d862aa98e788..4785ef0a8946 100644
--- a/frame/democracy/src/tests/public_proposals.rs
+++ b/frame/democracy/src/tests/public_proposals.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/democracy/src/tests/scheduling.rs b/frame/democracy/src/tests/scheduling.rs
index 5bcfbae99468..e178ff0fc1a2 100644
--- a/frame/democracy/src/tests/scheduling.rs
+++ b/frame/democracy/src/tests/scheduling.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/democracy/src/tests/voting.rs b/frame/democracy/src/tests/voting.rs
index 9ae57797d15d..207085ceb570 100644
--- a/frame/democracy/src/tests/voting.rs
+++ b/frame/democracy/src/tests/voting.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/democracy/src/types.rs b/frame/democracy/src/types.rs
index 8ee0838f8a36..22341ba31ee0 100644
--- a/frame/democracy/src/types.rs
+++ b/frame/democracy/src/types.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/democracy/src/vote.rs b/frame/democracy/src/vote.rs
index 09ff0d71e48c..fdf13b944d62 100644
--- a/frame/democracy/src/vote.rs
+++ b/frame/democracy/src/vote.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/democracy/src/vote_threshold.rs b/frame/democracy/src/vote_threshold.rs
index 2268a55936c5..3114b22499d0 100644
--- a/frame/democracy/src/vote_threshold.rs
+++ b/frame/democracy/src/vote_threshold.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/democracy/src/weights.rs b/frame/democracy/src/weights.rs
index 06899b47dea7..7c169cc813ea 100644
--- a/frame/democracy/src/weights.rs
+++ b/frame/democracy/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/elections-phragmen/src/benchmarking.rs b/frame/elections-phragmen/src/benchmarking.rs
index eaa5bbe9ed4f..db3a8c96023a 100644
--- a/frame/elections-phragmen/src/benchmarking.rs
+++ b/frame/elections-phragmen/src/benchmarking.rs
@@ -1,18 +1,19 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Elections-Phragmen pallet benchmarking.
 
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index 9b7b9064fbf2..5027840aef3c 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/elections-phragmen/src/weights.rs b/frame/elections-phragmen/src/weights.rs
index 48fd40e782e4..baecda618006 100644
--- a/frame/elections-phragmen/src/weights.rs
+++ b/frame/elections-phragmen/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/elections/src/lib.rs b/frame/elections/src/lib.rs
index 1490b6d86aeb..6eaa2dfad373 100644
--- a/frame/elections/src/lib.rs
+++ b/frame/elections/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/elections/src/mock.rs b/frame/elections/src/mock.rs
index 8a4111a38c4c..bf3d355b6dee 100644
--- a/frame/elections/src/mock.rs
+++ b/frame/elections/src/mock.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/elections/src/tests.rs b/frame/elections/src/tests.rs
index 38a16953572f..62e28eb6da08 100644
--- a/frame/elections/src/tests.rs
+++ b/frame/elections/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/example-offchain-worker/src/lib.rs b/frame/example-offchain-worker/src/lib.rs
index 29e545ae2d97..dbcf7b10f4ab 100644
--- a/frame/example-offchain-worker/src/lib.rs
+++ b/frame/example-offchain-worker/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/example-offchain-worker/src/tests.rs b/frame/example-offchain-worker/src/tests.rs
index a94174a33bb6..882c2d6057cd 100644
--- a/frame/example-offchain-worker/src/tests.rs
+++ b/frame/example-offchain-worker/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/example-parallel/src/lib.rs b/frame/example-parallel/src/lib.rs
index b616e3d49278..c83a722be127 100644
--- a/frame/example-parallel/src/lib.rs
+++ b/frame/example-parallel/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/example-parallel/src/tests.rs b/frame/example-parallel/src/tests.rs
index 3da41b22185e..4623de196df8 100644
--- a/frame/example-parallel/src/tests.rs
+++ b/frame/example-parallel/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/example/src/lib.rs b/frame/example/src/lib.rs
index 14c40778bab1..382d67263d1b 100644
--- a/frame/example/src/lib.rs
+++ b/frame/example/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index cb45a49b233d..fdde914b07e0 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/grandpa/src/benchmarking.rs b/frame/grandpa/src/benchmarking.rs
index bac2c2458446..d91bd223a570 100644
--- a/frame/grandpa/src/benchmarking.rs
+++ b/frame/grandpa/src/benchmarking.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/grandpa/src/default_weights.rs b/frame/grandpa/src/default_weights.rs
index 4893fc2cf186..63122fcf4b53 100644
--- a/frame/grandpa/src/default_weights.rs
+++ b/frame/grandpa/src/default_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/grandpa/src/equivocation.rs b/frame/grandpa/src/equivocation.rs
index 72f1434b24a9..593ebf6ba650 100644
--- a/frame/grandpa/src/equivocation.rs
+++ b/frame/grandpa/src/equivocation.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/grandpa/src/lib.rs b/frame/grandpa/src/lib.rs
index 15099672d0d2..078acbaa5756 100644
--- a/frame/grandpa/src/lib.rs
+++ b/frame/grandpa/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/grandpa/src/mock.rs b/frame/grandpa/src/mock.rs
index 288ef47a8ef9..bf4ce5a519e7 100644
--- a/frame/grandpa/src/mock.rs
+++ b/frame/grandpa/src/mock.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/grandpa/src/tests.rs b/frame/grandpa/src/tests.rs
index 4963d7e6b6d4..0e2a458a3dfe 100644
--- a/frame/grandpa/src/tests.rs
+++ b/frame/grandpa/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/identity/src/benchmarking.rs b/frame/identity/src/benchmarking.rs
index 0176986c8224..dccef494a0e8 100644
--- a/frame/identity/src/benchmarking.rs
+++ b/frame/identity/src/benchmarking.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/identity/src/lib.rs b/frame/identity/src/lib.rs
index 959107e527a2..fed32afa2e62 100644
--- a/frame/identity/src/lib.rs
+++ b/frame/identity/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/identity/src/tests.rs b/frame/identity/src/tests.rs
index 04e6bb7df394..0ac3c93a75b0 100644
--- a/frame/identity/src/tests.rs
+++ b/frame/identity/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/identity/src/weights.rs b/frame/identity/src/weights.rs
index 431a26cc0960..1026e8f73f85 100644
--- a/frame/identity/src/weights.rs
+++ b/frame/identity/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/im-online/src/benchmarking.rs b/frame/im-online/src/benchmarking.rs
index 452a9f26ed7d..8493f2b4c642 100644
--- a/frame/im-online/src/benchmarking.rs
+++ b/frame/im-online/src/benchmarking.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/im-online/src/lib.rs b/frame/im-online/src/lib.rs
index 09cb2afa22be..71ee25d779bd 100644
--- a/frame/im-online/src/lib.rs
+++ b/frame/im-online/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/im-online/src/mock.rs b/frame/im-online/src/mock.rs
index 71dc3d52acdb..624014cd55f7 100644
--- a/frame/im-online/src/mock.rs
+++ b/frame/im-online/src/mock.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/im-online/src/tests.rs b/frame/im-online/src/tests.rs
index 22c6b4464c37..dc6fc4f37330 100644
--- a/frame/im-online/src/tests.rs
+++ b/frame/im-online/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/im-online/src/weights.rs b/frame/im-online/src/weights.rs
index c0f11c69c4b2..8f4140fc793a 100644
--- a/frame/im-online/src/weights.rs
+++ b/frame/im-online/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/indices/src/benchmarking.rs b/frame/indices/src/benchmarking.rs
index 382bf07f1136..51182b104775 100644
--- a/frame/indices/src/benchmarking.rs
+++ b/frame/indices/src/benchmarking.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/indices/src/lib.rs b/frame/indices/src/lib.rs
index 18eb54498481..c925d3a0533e 100644
--- a/frame/indices/src/lib.rs
+++ b/frame/indices/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/indices/src/mock.rs b/frame/indices/src/mock.rs
index 0e1e9c3d4364..77797213cb56 100644
--- a/frame/indices/src/mock.rs
+++ b/frame/indices/src/mock.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/indices/src/tests.rs b/frame/indices/src/tests.rs
index e288871d5530..96b8c4acfcd2 100644
--- a/frame/indices/src/tests.rs
+++ b/frame/indices/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/indices/src/weights.rs b/frame/indices/src/weights.rs
index 96470625329f..6cc9593d20b9 100644
--- a/frame/indices/src/weights.rs
+++ b/frame/indices/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/membership/src/lib.rs b/frame/membership/src/lib.rs
index 943071c9a1d2..a43a5b4089f1 100644
--- a/frame/membership/src/lib.rs
+++ b/frame/membership/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/merkle-mountain-range/src/benchmarking.rs b/frame/merkle-mountain-range/src/benchmarking.rs
index af634e18821f..4a5ff4b72965 100644
--- a/frame/merkle-mountain-range/src/benchmarking.rs
+++ b/frame/merkle-mountain-range/src/benchmarking.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/merkle-mountain-range/src/default_weights.rs b/frame/merkle-mountain-range/src/default_weights.rs
index 0b31698545ac..98bb404e3f3a 100644
--- a/frame/merkle-mountain-range/src/default_weights.rs
+++ b/frame/merkle-mountain-range/src/default_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/merkle-mountain-range/src/lib.rs b/frame/merkle-mountain-range/src/lib.rs
index 81833a205386..85e448fd3a17 100644
--- a/frame/merkle-mountain-range/src/lib.rs
+++ b/frame/merkle-mountain-range/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/merkle-mountain-range/src/mmr/mmr.rs b/frame/merkle-mountain-range/src/mmr/mmr.rs
index ee27163ae435..10762d98d7e0 100644
--- a/frame/merkle-mountain-range/src/mmr/mmr.rs
+++ b/frame/merkle-mountain-range/src/mmr/mmr.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/merkle-mountain-range/src/mmr/mod.rs b/frame/merkle-mountain-range/src/mmr/mod.rs
index 7fd8f5ae1bf0..38833af6f2f8 100644
--- a/frame/merkle-mountain-range/src/mmr/mod.rs
+++ b/frame/merkle-mountain-range/src/mmr/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/merkle-mountain-range/src/mmr/storage.rs b/frame/merkle-mountain-range/src/mmr/storage.rs
index a1aa57087a25..c8390e27047c 100644
--- a/frame/merkle-mountain-range/src/mmr/storage.rs
+++ b/frame/merkle-mountain-range/src/mmr/storage.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/merkle-mountain-range/src/mmr/utils.rs b/frame/merkle-mountain-range/src/mmr/utils.rs
index 7a55605a64c9..e966367b71f2 100644
--- a/frame/merkle-mountain-range/src/mmr/utils.rs
+++ b/frame/merkle-mountain-range/src/mmr/utils.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/merkle-mountain-range/src/mock.rs b/frame/merkle-mountain-range/src/mock.rs
index 4865ea7e5723..153aecdbd313 100644
--- a/frame/merkle-mountain-range/src/mock.rs
+++ b/frame/merkle-mountain-range/src/mock.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/merkle-mountain-range/src/primitives.rs b/frame/merkle-mountain-range/src/primitives.rs
index cab4b6a0dc83..4d13a32c89f8 100644
--- a/frame/merkle-mountain-range/src/primitives.rs
+++ b/frame/merkle-mountain-range/src/primitives.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/merkle-mountain-range/src/tests.rs b/frame/merkle-mountain-range/src/tests.rs
index 34ce96eaba7b..c279e42a8c23 100644
--- a/frame/merkle-mountain-range/src/tests.rs
+++ b/frame/merkle-mountain-range/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/metadata/src/lib.rs b/frame/metadata/src/lib.rs
index 109f33f42019..8e6b8b6bd796 100644
--- a/frame/metadata/src/lib.rs
+++ b/frame/metadata/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/multisig/src/benchmarking.rs b/frame/multisig/src/benchmarking.rs
index 0b549b3d9471..a257a96cacac 100644
--- a/frame/multisig/src/benchmarking.rs
+++ b/frame/multisig/src/benchmarking.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/multisig/src/lib.rs b/frame/multisig/src/lib.rs
index b39b979f999d..f58fe549fe50 100644
--- a/frame/multisig/src/lib.rs
+++ b/frame/multisig/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/multisig/src/tests.rs b/frame/multisig/src/tests.rs
index 4101b718bce6..d16b0ad49556 100644
--- a/frame/multisig/src/tests.rs
+++ b/frame/multisig/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/multisig/src/weights.rs b/frame/multisig/src/weights.rs
index c0f6399e7642..f67e0c8868af 100644
--- a/frame/multisig/src/weights.rs
+++ b/frame/multisig/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/nicks/src/lib.rs b/frame/nicks/src/lib.rs
index 994e6996a148..983be4056d0c 100644
--- a/frame/nicks/src/lib.rs
+++ b/frame/nicks/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/node-authorization/src/lib.rs b/frame/node-authorization/src/lib.rs
index e48faef128d6..79b1d6e74c30 100644
--- a/frame/node-authorization/src/lib.rs
+++ b/frame/node-authorization/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/offences/benchmarking/src/lib.rs b/frame/offences/benchmarking/src/lib.rs
index 1d133c1b613b..09ac820cf5c4 100644
--- a/frame/offences/benchmarking/src/lib.rs
+++ b/frame/offences/benchmarking/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/offences/benchmarking/src/mock.rs b/frame/offences/benchmarking/src/mock.rs
index 2a93bfa2c8fe..8e0bb361e15c 100644
--- a/frame/offences/benchmarking/src/mock.rs
+++ b/frame/offences/benchmarking/src/mock.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/offences/src/lib.rs b/frame/offences/src/lib.rs
index e3f01823c18f..5c1247853da1 100644
--- a/frame/offences/src/lib.rs
+++ b/frame/offences/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/offences/src/mock.rs b/frame/offences/src/mock.rs
index 7d23780b12e4..042c0501094c 100644
--- a/frame/offences/src/mock.rs
+++ b/frame/offences/src/mock.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/offences/src/tests.rs b/frame/offences/src/tests.rs
index 18582ec042ca..a33ba96447a4 100644
--- a/frame/offences/src/tests.rs
+++ b/frame/offences/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/proxy/src/benchmarking.rs b/frame/proxy/src/benchmarking.rs
index ac0fa52c9707..b08b47123d91 100644
--- a/frame/proxy/src/benchmarking.rs
+++ b/frame/proxy/src/benchmarking.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/proxy/src/lib.rs b/frame/proxy/src/lib.rs
index 93f1d8e80d5c..1e5aaadcc62d 100644
--- a/frame/proxy/src/lib.rs
+++ b/frame/proxy/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/proxy/src/tests.rs b/frame/proxy/src/tests.rs
index b3f9ebc75dd0..6867dd510dd9 100644
--- a/frame/proxy/src/tests.rs
+++ b/frame/proxy/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/proxy/src/weights.rs b/frame/proxy/src/weights.rs
index 8f5a608aa585..92cf66120dfb 100644
--- a/frame/proxy/src/weights.rs
+++ b/frame/proxy/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/randomness-collective-flip/src/lib.rs b/frame/randomness-collective-flip/src/lib.rs
index 04db12d1df65..b3eb64db9a0c 100644
--- a/frame/randomness-collective-flip/src/lib.rs
+++ b/frame/randomness-collective-flip/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/recovery/src/lib.rs b/frame/recovery/src/lib.rs
index 023a805a719b..7cd1eb4b028b 100644
--- a/frame/recovery/src/lib.rs
+++ b/frame/recovery/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/recovery/src/mock.rs b/frame/recovery/src/mock.rs
index 130337678410..38b5d58ddda5 100644
--- a/frame/recovery/src/mock.rs
+++ b/frame/recovery/src/mock.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/recovery/src/tests.rs b/frame/recovery/src/tests.rs
index 8e9484f0fb08..4c7c6ef108d7 100644
--- a/frame/recovery/src/tests.rs
+++ b/frame/recovery/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/scheduler/src/benchmarking.rs b/frame/scheduler/src/benchmarking.rs
index 6a67efc9d2dc..e45551269bc5 100644
--- a/frame/scheduler/src/benchmarking.rs
+++ b/frame/scheduler/src/benchmarking.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/scheduler/src/lib.rs b/frame/scheduler/src/lib.rs
index 67b86fad826f..9ea6c7603712 100644
--- a/frame/scheduler/src/lib.rs
+++ b/frame/scheduler/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/scheduler/src/weights.rs b/frame/scheduler/src/weights.rs
index 3c8be54c9ae5..0508930f4ef2 100644
--- a/frame/scheduler/src/weights.rs
+++ b/frame/scheduler/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/scored-pool/src/lib.rs b/frame/scored-pool/src/lib.rs
index afcac229367b..ce2279b15005 100644
--- a/frame/scored-pool/src/lib.rs
+++ b/frame/scored-pool/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/scored-pool/src/mock.rs b/frame/scored-pool/src/mock.rs
index b96daf6ba324..e3707806e819 100644
--- a/frame/scored-pool/src/mock.rs
+++ b/frame/scored-pool/src/mock.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/scored-pool/src/tests.rs b/frame/scored-pool/src/tests.rs
index 44b71bc00ba4..8f33f30f6ed8 100644
--- a/frame/scored-pool/src/tests.rs
+++ b/frame/scored-pool/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/session/benchmarking/src/lib.rs b/frame/session/benchmarking/src/lib.rs
index bd85b97c0d33..89afc73b6b44 100644
--- a/frame/session/benchmarking/src/lib.rs
+++ b/frame/session/benchmarking/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/session/benchmarking/src/mock.rs b/frame/session/benchmarking/src/mock.rs
index db6c465854b6..31593b3da54b 100644
--- a/frame/session/benchmarking/src/mock.rs
+++ b/frame/session/benchmarking/src/mock.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/session/src/historical/mod.rs b/frame/session/src/historical/mod.rs
index 53f4dd7639b8..85d7c3f3f349 100644
--- a/frame/session/src/historical/mod.rs
+++ b/frame/session/src/historical/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/session/src/historical/offchain.rs b/frame/session/src/historical/offchain.rs
index 9bb20ababb3a..7a636c6e14c8 100644
--- a/frame/session/src/historical/offchain.rs
+++ b/frame/session/src/historical/offchain.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/session/src/historical/onchain.rs b/frame/session/src/historical/onchain.rs
index 1ee7ce4419df..3b933bf262a0 100644
--- a/frame/session/src/historical/onchain.rs
+++ b/frame/session/src/historical/onchain.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/session/src/historical/shared.rs b/frame/session/src/historical/shared.rs
index fda0361b0595..b054854d88fe 100644
--- a/frame/session/src/historical/shared.rs
+++ b/frame/session/src/historical/shared.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs
index cd02ddaac498..90eba3815a7a 100644
--- a/frame/session/src/lib.rs
+++ b/frame/session/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/session/src/mock.rs b/frame/session/src/mock.rs
index e69eec14b09f..3201500ee640 100644
--- a/frame/session/src/mock.rs
+++ b/frame/session/src/mock.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/session/src/tests.rs b/frame/session/src/tests.rs
index 3da5d16caad5..4ef3bb9f9802 100644
--- a/frame/session/src/tests.rs
+++ b/frame/session/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/session/src/weights.rs b/frame/session/src/weights.rs
index 243ddc04b085..05d9f7d78731 100644
--- a/frame/session/src/weights.rs
+++ b/frame/session/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/society/src/lib.rs b/frame/society/src/lib.rs
index 6fe8a2673b21..f8f8fa61a00f 100644
--- a/frame/society/src/lib.rs
+++ b/frame/society/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/society/src/mock.rs b/frame/society/src/mock.rs
index c70400806711..b7735994ec92 100644
--- a/frame/society/src/mock.rs
+++ b/frame/society/src/mock.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/society/src/tests.rs b/frame/society/src/tests.rs
index 0374c7bcd7a6..7c8344839577 100644
--- a/frame/society/src/tests.rs
+++ b/frame/society/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/staking/fuzzer/src/mock.rs b/frame/staking/fuzzer/src/mock.rs
index ca36bfb4c3bc..b3c9dd9f57b6 100644
--- a/frame/staking/fuzzer/src/mock.rs
+++ b/frame/staking/fuzzer/src/mock.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/staking/fuzzer/src/submit_solution.rs b/frame/staking/fuzzer/src/submit_solution.rs
index 4f85066f7f66..d94ee49b96db 100644
--- a/frame/staking/fuzzer/src/submit_solution.rs
+++ b/frame/staking/fuzzer/src/submit_solution.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/staking/reward-curve/src/lib.rs b/frame/staking/reward-curve/src/lib.rs
index 275669fe26b3..3a8d625e8357 100644
--- a/frame/staking/reward-curve/src/lib.rs
+++ b/frame/staking/reward-curve/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/staking/reward-curve/tests/test.rs b/frame/staking/reward-curve/tests/test.rs
index 45ad59e00ad2..fda7df145d0f 100644
--- a/frame/staking/reward-curve/tests/test.rs
+++ b/frame/staking/reward-curve/tests/test.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/staking/src/benchmarking.rs b/frame/staking/src/benchmarking.rs
index d336bfd1ddda..0ebe1eab788c 100644
--- a/frame/staking/src/benchmarking.rs
+++ b/frame/staking/src/benchmarking.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/staking/src/inflation.rs b/frame/staking/src/inflation.rs
index 2161fe20af82..bd9d1f8bbdb3 100644
--- a/frame/staking/src/inflation.rs
+++ b/frame/staking/src/inflation.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index f70a76cb1acc..795f222158e0 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index 6f7842b6b5a9..048806b06239 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/staking/src/offchain_election.rs b/frame/staking/src/offchain_election.rs
index 35d9fa7c1f85..433e02261cc5 100644
--- a/frame/staking/src/offchain_election.rs
+++ b/frame/staking/src/offchain_election.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/staking/src/slashing.rs b/frame/staking/src/slashing.rs
index e59f2e84e432..2b2ac61356c4 100644
--- a/frame/staking/src/slashing.rs
+++ b/frame/staking/src/slashing.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/staking/src/testing_utils.rs b/frame/staking/src/testing_utils.rs
index 2f198166d7ee..d3139b53e6f9 100644
--- a/frame/staking/src/testing_utils.rs
+++ b/frame/staking/src/testing_utils.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index d4534834d20a..bf0b2bf0da48 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/staking/src/weights.rs b/frame/staking/src/weights.rs
index 2e715c53356f..c0099f637850 100644
--- a/frame/staking/src/weights.rs
+++ b/frame/staking/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/sudo/src/lib.rs b/frame/sudo/src/lib.rs
index e8a13c8b00f0..1d20fd2bb77b 100644
--- a/frame/sudo/src/lib.rs
+++ b/frame/sudo/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/sudo/src/mock.rs b/frame/sudo/src/mock.rs
index 5a0919b8d73a..6cb418de1325 100644
--- a/frame/sudo/src/mock.rs
+++ b/frame/sudo/src/mock.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/sudo/src/tests.rs b/frame/sudo/src/tests.rs
index 03ce100c3a40..1aeb9b57b616 100644
--- a/frame/sudo/src/tests.rs
+++ b/frame/sudo/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/clone_no_bound.rs b/frame/support/procedural/src/clone_no_bound.rs
index 35854d23f4db..1911fdfd9fb2 100644
--- a/frame/support/procedural/src/clone_no_bound.rs
+++ b/frame/support/procedural/src/clone_no_bound.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/construct_runtime/mod.rs b/frame/support/procedural/src/construct_runtime/mod.rs
index 15f0935f3823..31fc71faf44f 100644
--- a/frame/support/procedural/src/construct_runtime/mod.rs
+++ b/frame/support/procedural/src/construct_runtime/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/construct_runtime/parse.rs b/frame/support/procedural/src/construct_runtime/parse.rs
index 4a45044d67f2..b6c9ce8375fa 100644
--- a/frame/support/procedural/src/construct_runtime/parse.rs
+++ b/frame/support/procedural/src/construct_runtime/parse.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/debug_no_bound.rs b/frame/support/procedural/src/debug_no_bound.rs
index 2a818fb205fb..7a5509cf986d 100644
--- a/frame/support/procedural/src/debug_no_bound.rs
+++ b/frame/support/procedural/src/debug_no_bound.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/lib.rs b/frame/support/procedural/src/lib.rs
index 7adc646c339f..3f6afd3ff53c 100644
--- a/frame/support/procedural/src/lib.rs
+++ b/frame/support/procedural/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/pallet/expand/call.rs b/frame/support/procedural/src/pallet/expand/call.rs
index 56b8ecf99415..2709995bf88b 100644
--- a/frame/support/procedural/src/pallet/expand/call.rs
+++ b/frame/support/procedural/src/pallet/expand/call.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/pallet/expand/constants.rs b/frame/support/procedural/src/pallet/expand/constants.rs
index 25cceb7449e1..5740d606a332 100644
--- a/frame/support/procedural/src/pallet/expand/constants.rs
+++ b/frame/support/procedural/src/pallet/expand/constants.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/pallet/expand/error.rs b/frame/support/procedural/src/pallet/expand/error.rs
index e60d717ff7dd..a88f626fdc52 100644
--- a/frame/support/procedural/src/pallet/expand/error.rs
+++ b/frame/support/procedural/src/pallet/expand/error.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/pallet/expand/event.rs b/frame/support/procedural/src/pallet/expand/event.rs
index 1dc3431f9bac..76eda4448ba1 100644
--- a/frame/support/procedural/src/pallet/expand/event.rs
+++ b/frame/support/procedural/src/pallet/expand/event.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/pallet/expand/genesis_build.rs b/frame/support/procedural/src/pallet/expand/genesis_build.rs
index 678e89eddf24..8f42bfadc200 100644
--- a/frame/support/procedural/src/pallet/expand/genesis_build.rs
+++ b/frame/support/procedural/src/pallet/expand/genesis_build.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/pallet/expand/genesis_config.rs b/frame/support/procedural/src/pallet/expand/genesis_config.rs
index db67eaeaee74..1dade8f0144b 100644
--- a/frame/support/procedural/src/pallet/expand/genesis_config.rs
+++ b/frame/support/procedural/src/pallet/expand/genesis_config.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/pallet/expand/hooks.rs b/frame/support/procedural/src/pallet/expand/hooks.rs
index 8ae7738bcc17..a20dac09166d 100644
--- a/frame/support/procedural/src/pallet/expand/hooks.rs
+++ b/frame/support/procedural/src/pallet/expand/hooks.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/pallet/expand/instances.rs b/frame/support/procedural/src/pallet/expand/instances.rs
index 1b05be4f61f9..c60cd5ebe8d8 100644
--- a/frame/support/procedural/src/pallet/expand/instances.rs
+++ b/frame/support/procedural/src/pallet/expand/instances.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/pallet/expand/mod.rs b/frame/support/procedural/src/pallet/expand/mod.rs
index 6bfc1f9a9ee4..c2a81e9bbcd8 100644
--- a/frame/support/procedural/src/pallet/expand/mod.rs
+++ b/frame/support/procedural/src/pallet/expand/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/pallet/expand/pallet_struct.rs b/frame/support/procedural/src/pallet/expand/pallet_struct.rs
index 133e49a85d8e..6c89c0217cec 100644
--- a/frame/support/procedural/src/pallet/expand/pallet_struct.rs
+++ b/frame/support/procedural/src/pallet/expand/pallet_struct.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/pallet/expand/storage.rs b/frame/support/procedural/src/pallet/expand/storage.rs
index a8b6b2f0d7ba..a77f9cf60849 100644
--- a/frame/support/procedural/src/pallet/expand/storage.rs
+++ b/frame/support/procedural/src/pallet/expand/storage.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/pallet/expand/store_trait.rs b/frame/support/procedural/src/pallet/expand/store_trait.rs
index ceea270bb9f3..1fa95addb18f 100644
--- a/frame/support/procedural/src/pallet/expand/store_trait.rs
+++ b/frame/support/procedural/src/pallet/expand/store_trait.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/pallet/expand/type_value.rs b/frame/support/procedural/src/pallet/expand/type_value.rs
index 3de3be8fcf27..cb5d8307d89e 100644
--- a/frame/support/procedural/src/pallet/expand/type_value.rs
+++ b/frame/support/procedural/src/pallet/expand/type_value.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/pallet/mod.rs b/frame/support/procedural/src/pallet/mod.rs
index 7ae5a573d010..560d57d50e03 100644
--- a/frame/support/procedural/src/pallet/mod.rs
+++ b/frame/support/procedural/src/pallet/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/pallet/parse/call.rs b/frame/support/procedural/src/pallet/parse/call.rs
index 239329639e5f..92613fa981bb 100644
--- a/frame/support/procedural/src/pallet/parse/call.rs
+++ b/frame/support/procedural/src/pallet/parse/call.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/pallet/parse/config.rs b/frame/support/procedural/src/pallet/parse/config.rs
index 46355b0fdb15..7684009bcb36 100644
--- a/frame/support/procedural/src/pallet/parse/config.rs
+++ b/frame/support/procedural/src/pallet/parse/config.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/pallet/parse/error.rs b/frame/support/procedural/src/pallet/parse/error.rs
index 0bdf8e73b374..7df88ce7b821 100644
--- a/frame/support/procedural/src/pallet/parse/error.rs
+++ b/frame/support/procedural/src/pallet/parse/error.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/pallet/parse/event.rs b/frame/support/procedural/src/pallet/parse/event.rs
index 6b83ca4bf044..ef0c3e2e9285 100644
--- a/frame/support/procedural/src/pallet/parse/event.rs
+++ b/frame/support/procedural/src/pallet/parse/event.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/pallet/parse/extra_constants.rs b/frame/support/procedural/src/pallet/parse/extra_constants.rs
index f37c7135de8f..4b03fd99f1fd 100644
--- a/frame/support/procedural/src/pallet/parse/extra_constants.rs
+++ b/frame/support/procedural/src/pallet/parse/extra_constants.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/pallet/parse/genesis_build.rs b/frame/support/procedural/src/pallet/parse/genesis_build.rs
index 79c64b8a1a9c..f9aa26d173a9 100644
--- a/frame/support/procedural/src/pallet/parse/genesis_build.rs
+++ b/frame/support/procedural/src/pallet/parse/genesis_build.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/pallet/parse/genesis_config.rs b/frame/support/procedural/src/pallet/parse/genesis_config.rs
index f42fcc6dac3d..729d1241390a 100644
--- a/frame/support/procedural/src/pallet/parse/genesis_config.rs
+++ b/frame/support/procedural/src/pallet/parse/genesis_config.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/pallet/parse/helper.rs b/frame/support/procedural/src/pallet/parse/helper.rs
index cbf09ee23175..9d4298cc005c 100644
--- a/frame/support/procedural/src/pallet/parse/helper.rs
+++ b/frame/support/procedural/src/pallet/parse/helper.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/pallet/parse/hooks.rs b/frame/support/procedural/src/pallet/parse/hooks.rs
index 93061069f8c3..f7fec5696d49 100644
--- a/frame/support/procedural/src/pallet/parse/hooks.rs
+++ b/frame/support/procedural/src/pallet/parse/hooks.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/pallet/parse/inherent.rs b/frame/support/procedural/src/pallet/parse/inherent.rs
index b4dfd71d8a50..a3f12b157498 100644
--- a/frame/support/procedural/src/pallet/parse/inherent.rs
+++ b/frame/support/procedural/src/pallet/parse/inherent.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/pallet/parse/mod.rs b/frame/support/procedural/src/pallet/parse/mod.rs
index 085467bdaa2e..d7bb605a954a 100644
--- a/frame/support/procedural/src/pallet/parse/mod.rs
+++ b/frame/support/procedural/src/pallet/parse/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/pallet/parse/origin.rs b/frame/support/procedural/src/pallet/parse/origin.rs
index 00b64c20bc45..6cb8520dbf15 100644
--- a/frame/support/procedural/src/pallet/parse/origin.rs
+++ b/frame/support/procedural/src/pallet/parse/origin.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/pallet/parse/pallet_struct.rs b/frame/support/procedural/src/pallet/parse/pallet_struct.rs
index 140355070df8..8e7ddf27c4e7 100644
--- a/frame/support/procedural/src/pallet/parse/pallet_struct.rs
+++ b/frame/support/procedural/src/pallet/parse/pallet_struct.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/pallet/parse/storage.rs b/frame/support/procedural/src/pallet/parse/storage.rs
index b7ffe3da751f..c744ad3b52e7 100644
--- a/frame/support/procedural/src/pallet/parse/storage.rs
+++ b/frame/support/procedural/src/pallet/parse/storage.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/pallet/parse/type_value.rs b/frame/support/procedural/src/pallet/parse/type_value.rs
index 0313c76c3ec8..7d675b82e7e9 100644
--- a/frame/support/procedural/src/pallet/parse/type_value.rs
+++ b/frame/support/procedural/src/pallet/parse/type_value.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/pallet/parse/validate_unsigned.rs b/frame/support/procedural/src/pallet/parse/validate_unsigned.rs
index 3c460249811f..0a406413f394 100644
--- a/frame/support/procedural/src/pallet/parse/validate_unsigned.rs
+++ b/frame/support/procedural/src/pallet/parse/validate_unsigned.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/pallet_version.rs b/frame/support/procedural/src/pallet_version.rs
index f0437d4cb6b7..d7227b47bae8 100644
--- a/frame/support/procedural/src/pallet_version.rs
+++ b/frame/support/procedural/src/pallet_version.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/partial_eq_no_bound.rs b/frame/support/procedural/src/partial_eq_no_bound.rs
index df8d661a2b26..1c37be8021c9 100644
--- a/frame/support/procedural/src/partial_eq_no_bound.rs
+++ b/frame/support/procedural/src/partial_eq_no_bound.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/storage/genesis_config/builder_def.rs b/frame/support/procedural/src/storage/genesis_config/builder_def.rs
index a045794529c9..0cbfa04787f7 100644
--- a/frame/support/procedural/src/storage/genesis_config/builder_def.rs
+++ b/frame/support/procedural/src/storage/genesis_config/builder_def.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/storage/genesis_config/genesis_config_def.rs b/frame/support/procedural/src/storage/genesis_config/genesis_config_def.rs
index 93543075a3d2..300e47bc850e 100644
--- a/frame/support/procedural/src/storage/genesis_config/genesis_config_def.rs
+++ b/frame/support/procedural/src/storage/genesis_config/genesis_config_def.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/storage/genesis_config/mod.rs b/frame/support/procedural/src/storage/genesis_config/mod.rs
index ebc4c7a7f79d..87dfabcefbaa 100644
--- a/frame/support/procedural/src/storage/genesis_config/mod.rs
+++ b/frame/support/procedural/src/storage/genesis_config/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/storage/getters.rs b/frame/support/procedural/src/storage/getters.rs
index 5507db463059..65a3519033aa 100644
--- a/frame/support/procedural/src/storage/getters.rs
+++ b/frame/support/procedural/src/storage/getters.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/storage/instance_trait.rs b/frame/support/procedural/src/storage/instance_trait.rs
index a28c3ae62208..5468c3d34419 100644
--- a/frame/support/procedural/src/storage/instance_trait.rs
+++ b/frame/support/procedural/src/storage/instance_trait.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/storage/metadata.rs b/frame/support/procedural/src/storage/metadata.rs
index 065320cd018a..c321386ae1dc 100644
--- a/frame/support/procedural/src/storage/metadata.rs
+++ b/frame/support/procedural/src/storage/metadata.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/storage/mod.rs b/frame/support/procedural/src/storage/mod.rs
index 265c4b4cd102..2f9625d2c941 100644
--- a/frame/support/procedural/src/storage/mod.rs
+++ b/frame/support/procedural/src/storage/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/storage/parse.rs b/frame/support/procedural/src/storage/parse.rs
index 504af6d0ffca..c9602344c597 100644
--- a/frame/support/procedural/src/storage/parse.rs
+++ b/frame/support/procedural/src/storage/parse.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/storage/storage_struct.rs b/frame/support/procedural/src/storage/storage_struct.rs
index e89b06770a6c..9c049789f9bd 100644
--- a/frame/support/procedural/src/storage/storage_struct.rs
+++ b/frame/support/procedural/src/storage/storage_struct.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/storage/store_trait.rs b/frame/support/procedural/src/storage/store_trait.rs
index 7efe65b5f317..18adadbc6105 100644
--- a/frame/support/procedural/src/storage/store_trait.rs
+++ b/frame/support/procedural/src/storage/store_trait.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/src/transactional.rs b/frame/support/procedural/src/transactional.rs
index 8c49a8deec1b..6ef26834cf02 100644
--- a/frame/support/procedural/src/transactional.rs
+++ b/frame/support/procedural/src/transactional.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/tools/derive/src/lib.rs b/frame/support/procedural/tools/derive/src/lib.rs
index 6e5d6c896cbf..15394e0c559d 100644
--- a/frame/support/procedural/tools/derive/src/lib.rs
+++ b/frame/support/procedural/tools/derive/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/tools/src/lib.rs b/frame/support/procedural/tools/src/lib.rs
index 2cf559eab9b4..ce84f6981990 100644
--- a/frame/support/procedural/tools/src/lib.rs
+++ b/frame/support/procedural/tools/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/procedural/tools/src/syn_ext.rs b/frame/support/procedural/tools/src/syn_ext.rs
index 2ba4cf3f28a1..36bd03fed1be 100644
--- a/frame/support/procedural/tools/src/syn_ext.rs
+++ b/frame/support/procedural/tools/src/syn_ext.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/src/debug.rs b/frame/support/src/debug.rs
index 54a1e9c3a037..43efd3d91623 100644
--- a/frame/support/src/debug.rs
+++ b/frame/support/src/debug.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/src/dispatch.rs b/frame/support/src/dispatch.rs
index 2477f9421ffe..03cda0e4d40e 100644
--- a/frame/support/src/dispatch.rs
+++ b/frame/support/src/dispatch.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/src/error.rs b/frame/support/src/error.rs
index 0e3f66f9f3c9..508de49e949c 100644
--- a/frame/support/src/error.rs
+++ b/frame/support/src/error.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/src/event.rs b/frame/support/src/event.rs
index 3cb91e4a3e31..b55f5d7e0b2a 100644
--- a/frame/support/src/event.rs
+++ b/frame/support/src/event.rs
@@ -1,15 +1,19 @@
-// Copyright 2018-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Macros that define an Event types. Events can be used to easily report changes or conditions
 //! in your runtime to external entities like users, chain explorers, or dApps.
diff --git a/frame/support/src/genesis_config.rs b/frame/support/src/genesis_config.rs
index 99f8ad886dd2..2b7cae898ff5 100644
--- a/frame/support/src/genesis_config.rs
+++ b/frame/support/src/genesis_config.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/src/hash.rs b/frame/support/src/hash.rs
index 147a63013806..0a8be8aec035 100644
--- a/frame/support/src/hash.rs
+++ b/frame/support/src/hash.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/src/inherent.rs b/frame/support/src/inherent.rs
index 83a1872ab4f3..feb200dae5ba 100644
--- a/frame/support/src/inherent.rs
+++ b/frame/support/src/inherent.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/src/instances.rs b/frame/support/src/instances.rs
index ee38a6a403e1..086ed9a6cc17 100644
--- a/frame/support/src/instances.rs
+++ b/frame/support/src/instances.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index c8279dff9eec..da4bfbb5d86b 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/src/metadata.rs b/frame/support/src/metadata.rs
index f72365985da0..a60481933701 100644
--- a/frame/support/src/metadata.rs
+++ b/frame/support/src/metadata.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/src/origin.rs b/frame/support/src/origin.rs
index 980ab902a389..c17c617b86b7 100644
--- a/frame/support/src/origin.rs
+++ b/frame/support/src/origin.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/src/storage/child.rs b/frame/support/src/storage/child.rs
index d98615544727..ede7b98e5eeb 100644
--- a/frame/support/src/storage/child.rs
+++ b/frame/support/src/storage/child.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/src/storage/generator/double_map.rs b/frame/support/src/storage/generator/double_map.rs
index d8891a5ee677..e5ee7ec45b13 100644
--- a/frame/support/src/storage/generator/double_map.rs
+++ b/frame/support/src/storage/generator/double_map.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/src/storage/generator/map.rs b/frame/support/src/storage/generator/map.rs
index 11d895577f63..198fad08dc73 100644
--- a/frame/support/src/storage/generator/map.rs
+++ b/frame/support/src/storage/generator/map.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/src/storage/generator/mod.rs b/frame/support/src/storage/generator/mod.rs
index 4b444ce074f0..a9e5665c544d 100644
--- a/frame/support/src/storage/generator/mod.rs
+++ b/frame/support/src/storage/generator/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/src/storage/generator/value.rs b/frame/support/src/storage/generator/value.rs
index 2da3d9171843..093dcb305e64 100644
--- a/frame/support/src/storage/generator/value.rs
+++ b/frame/support/src/storage/generator/value.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/src/storage/hashed.rs b/frame/support/src/storage/hashed.rs
index 96a487111a2a..a0c9ab6708e7 100644
--- a/frame/support/src/storage/hashed.rs
+++ b/frame/support/src/storage/hashed.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/src/storage/migration.rs b/frame/support/src/storage/migration.rs
index 75f90ba7b06c..69b9920194f4 100644
--- a/frame/support/src/storage/migration.rs
+++ b/frame/support/src/storage/migration.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/src/storage/mod.rs b/frame/support/src/storage/mod.rs
index 61ba147b0919..dbb1062c2463 100644
--- a/frame/support/src/storage/mod.rs
+++ b/frame/support/src/storage/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/src/storage/types/double_map.rs b/frame/support/src/storage/types/double_map.rs
index 1133dbd84d9c..93f40b660f7b 100644
--- a/frame/support/src/storage/types/double_map.rs
+++ b/frame/support/src/storage/types/double_map.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/src/storage/types/map.rs b/frame/support/src/storage/types/map.rs
index 8fe11488b115..5c236e7f6b59 100644
--- a/frame/support/src/storage/types/map.rs
+++ b/frame/support/src/storage/types/map.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/src/storage/types/mod.rs b/frame/support/src/storage/types/mod.rs
index 73b032b39e7b..5bb6684b7925 100644
--- a/frame/support/src/storage/types/mod.rs
+++ b/frame/support/src/storage/types/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/src/storage/types/value.rs b/frame/support/src/storage/types/value.rs
index 649b7b9fd272..39f718956eb6 100644
--- a/frame/support/src/storage/types/value.rs
+++ b/frame/support/src/storage/types/value.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/src/storage/unhashed.rs b/frame/support/src/storage/unhashed.rs
index 42f21cab4993..8ac4240a9f0e 100644
--- a/frame/support/src/storage/unhashed.rs
+++ b/frame/support/src/storage/unhashed.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index 1802c3024668..0b2d3bceea5e 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/src/unsigned.rs b/frame/support/src/unsigned.rs
index 16c434fe638b..71ae31d95d19 100644
--- a/frame/support/src/unsigned.rs
+++ b/frame/support/src/unsigned.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/src/weights.rs b/frame/support/src/weights.rs
index fc0d7854a7db..7fde8b342c4b 100644
--- a/frame/support/src/weights.rs
+++ b/frame/support/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/test/src/lib.rs b/frame/support/test/src/lib.rs
index 2baf698f1e52..d837056fe6ab 100644
--- a/frame/support/test/src/lib.rs
+++ b/frame/support/test/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/test/src/pallet_version.rs b/frame/support/test/src/pallet_version.rs
index 5912bd5b8e47..aaa46c3ef2c6 100644
--- a/frame/support/test/src/pallet_version.rs
+++ b/frame/support/test/src/pallet_version.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/test/tests/construct_runtime.rs b/frame/support/test/tests/construct_runtime.rs
index 33bb4a9cc877..2b9f026487b1 100644
--- a/frame/support/test/tests/construct_runtime.rs
+++ b/frame/support/test/tests/construct_runtime.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/test/tests/construct_runtime_ui.rs b/frame/support/test/tests/construct_runtime_ui.rs
index 83a90c96dd62..a55e80062858 100644
--- a/frame/support/test/tests/construct_runtime_ui.rs
+++ b/frame/support/test/tests/construct_runtime_ui.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/test/tests/decl_module_ui.rs b/frame/support/test/tests/decl_module_ui.rs
index 22237d904aea..2c097bb6e133 100644
--- a/frame/support/test/tests/decl_module_ui.rs
+++ b/frame/support/test/tests/decl_module_ui.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/test/tests/decl_storage.rs b/frame/support/test/tests/decl_storage.rs
index 97cf68c799b2..99697393785f 100644
--- a/frame/support/test/tests/decl_storage.rs
+++ b/frame/support/test/tests/decl_storage.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/test/tests/decl_storage_ui.rs b/frame/support/test/tests/decl_storage_ui.rs
index 4b082cb8172a..99d2da87aca2 100644
--- a/frame/support/test/tests/decl_storage_ui.rs
+++ b/frame/support/test/tests/decl_storage_ui.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/test/tests/decl_storage_ui/config_duplicate.rs b/frame/support/test/tests/decl_storage_ui/config_duplicate.rs
index c7de52dd8935..17f80c8c8475 100644
--- a/frame/support/test/tests/decl_storage_ui/config_duplicate.rs
+++ b/frame/support/test/tests/decl_storage_ui/config_duplicate.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/test/tests/decl_storage_ui/config_get_duplicate.rs b/frame/support/test/tests/decl_storage_ui/config_get_duplicate.rs
index 60bfa7f89c36..fec6aeb64cec 100644
--- a/frame/support/test/tests/decl_storage_ui/config_get_duplicate.rs
+++ b/frame/support/test/tests/decl_storage_ui/config_get_duplicate.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/test/tests/decl_storage_ui/get_duplicate.rs b/frame/support/test/tests/decl_storage_ui/get_duplicate.rs
index 921dfa6b774d..13c57a638bb1 100644
--- a/frame/support/test/tests/decl_storage_ui/get_duplicate.rs
+++ b/frame/support/test/tests/decl_storage_ui/get_duplicate.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/test/tests/derive_no_bound.rs b/frame/support/test/tests/derive_no_bound.rs
index 48f2f3ec3f6b..b96fbcfba931 100644
--- a/frame/support/test/tests/derive_no_bound.rs
+++ b/frame/support/test/tests/derive_no_bound.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/test/tests/derive_no_bound_ui.rs b/frame/support/test/tests/derive_no_bound_ui.rs
index ba8fff1f3a5c..434671e19b10 100644
--- a/frame/support/test/tests/derive_no_bound_ui.rs
+++ b/frame/support/test/tests/derive_no_bound_ui.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/test/tests/final_keys.rs b/frame/support/test/tests/final_keys.rs
index e7c95c6b432a..9839a3d3b2d9 100644
--- a/frame/support/test/tests/final_keys.rs
+++ b/frame/support/test/tests/final_keys.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/test/tests/genesisconfig.rs b/frame/support/test/tests/genesisconfig.rs
index 4a875bb68890..dd98fca8c953 100644
--- a/frame/support/test/tests/genesisconfig.rs
+++ b/frame/support/test/tests/genesisconfig.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/test/tests/instance.rs b/frame/support/test/tests/instance.rs
index b5bb6dd671b9..a734363b0183 100644
--- a/frame/support/test/tests/instance.rs
+++ b/frame/support/test/tests/instance.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/test/tests/issue2219.rs b/frame/support/test/tests/issue2219.rs
index 70a84dfee59d..59410c6db22f 100644
--- a/frame/support/test/tests/issue2219.rs
+++ b/frame/support/test/tests/issue2219.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index e05a0e9bdfee..1e4bfa7474e6 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/test/tests/pallet_compatibility.rs b/frame/support/test/tests/pallet_compatibility.rs
index 5711326300c2..7cc3392ef042 100644
--- a/frame/support/test/tests/pallet_compatibility.rs
+++ b/frame/support/test/tests/pallet_compatibility.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/test/tests/pallet_compatibility_instance.rs b/frame/support/test/tests/pallet_compatibility_instance.rs
index cdcc6a99cf13..05ad44e7a7ff 100644
--- a/frame/support/test/tests/pallet_compatibility_instance.rs
+++ b/frame/support/test/tests/pallet_compatibility_instance.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/test/tests/pallet_instance.rs b/frame/support/test/tests/pallet_instance.rs
index caa9019edf6b..2317fb05a2be 100644
--- a/frame/support/test/tests/pallet_instance.rs
+++ b/frame/support/test/tests/pallet_instance.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/test/tests/pallet_ui.rs b/frame/support/test/tests/pallet_ui.rs
index d323526622a4..1836b06cabfd 100644
--- a/frame/support/test/tests/pallet_ui.rs
+++ b/frame/support/test/tests/pallet_ui.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/test/tests/pallet_version.rs b/frame/support/test/tests/pallet_version.rs
index e70d752e40f4..ca36ee7fc466 100644
--- a/frame/support/test/tests/pallet_version.rs
+++ b/frame/support/test/tests/pallet_version.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/test/tests/pallet_with_name_trait_is_valid.rs b/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
index fba19594897a..42b0ebc6e934 100644
--- a/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
+++ b/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/test/tests/reserved_keyword.rs b/frame/support/test/tests/reserved_keyword.rs
index 8136d11824ac..d29b0477c383 100644
--- a/frame/support/test/tests/reserved_keyword.rs
+++ b/frame/support/test/tests/reserved_keyword.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/test/tests/storage_transaction.rs b/frame/support/test/tests/storage_transaction.rs
index 93b531a678d9..0c3fa2ff3649 100644
--- a/frame/support/test/tests/storage_transaction.rs
+++ b/frame/support/test/tests/storage_transaction.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/support/test/tests/system.rs b/frame/support/test/tests/system.rs
index 2021aa43f518..19858731b3a0 100644
--- a/frame/support/test/tests/system.rs
+++ b/frame/support/test/tests/system.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/system/benches/bench.rs b/frame/system/benches/bench.rs
index 2e5d6292180b..c5e95e3c44f6 100644
--- a/frame/system/benches/bench.rs
+++ b/frame/system/benches/bench.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/system/benchmarking/src/lib.rs b/frame/system/benchmarking/src/lib.rs
index 080b1cd80f29..f60cd94a0f62 100644
--- a/frame/system/benchmarking/src/lib.rs
+++ b/frame/system/benchmarking/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/system/benchmarking/src/mock.rs b/frame/system/benchmarking/src/mock.rs
index 686db8fb5a92..87f9113a4931 100644
--- a/frame/system/benchmarking/src/mock.rs
+++ b/frame/system/benchmarking/src/mock.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/system/rpc/runtime-api/src/lib.rs b/frame/system/rpc/runtime-api/src/lib.rs
index 0ead94aabe01..319883c36d74 100644
--- a/frame/system/rpc/runtime-api/src/lib.rs
+++ b/frame/system/rpc/runtime-api/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/system/src/extensions/check_genesis.rs b/frame/system/src/extensions/check_genesis.rs
index f60437887b1d..de635b4fb91a 100644
--- a/frame/system/src/extensions/check_genesis.rs
+++ b/frame/system/src/extensions/check_genesis.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/system/src/extensions/check_mortality.rs b/frame/system/src/extensions/check_mortality.rs
index fbc37f527d81..8e5fd36e6217 100644
--- a/frame/system/src/extensions/check_mortality.rs
+++ b/frame/system/src/extensions/check_mortality.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/system/src/extensions/check_nonce.rs b/frame/system/src/extensions/check_nonce.rs
index a1a310833cd3..0c610506d661 100644
--- a/frame/system/src/extensions/check_nonce.rs
+++ b/frame/system/src/extensions/check_nonce.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/system/src/extensions/check_spec_version.rs b/frame/system/src/extensions/check_spec_version.rs
index f4838ab35472..1fd8376d342b 100644
--- a/frame/system/src/extensions/check_spec_version.rs
+++ b/frame/system/src/extensions/check_spec_version.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/system/src/extensions/check_tx_version.rs b/frame/system/src/extensions/check_tx_version.rs
index 5a1c8cc73861..fa11a0a5727f 100644
--- a/frame/system/src/extensions/check_tx_version.rs
+++ b/frame/system/src/extensions/check_tx_version.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/system/src/extensions/check_weight.rs b/frame/system/src/extensions/check_weight.rs
index fc74b03a61cc..c84c29518593 100644
--- a/frame/system/src/extensions/check_weight.rs
+++ b/frame/system/src/extensions/check_weight.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/system/src/extensions/mod.rs b/frame/system/src/extensions/mod.rs
index ff61353e2d17..8b6c9b49e4d6 100644
--- a/frame/system/src/extensions/mod.rs
+++ b/frame/system/src/extensions/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index a8ffd05bf615..463712ba68df 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/system/src/limits.rs b/frame/system/src/limits.rs
index aac347b8e658..3d59bd2b7fa2 100644
--- a/frame/system/src/limits.rs
+++ b/frame/system/src/limits.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/system/src/mock.rs b/frame/system/src/mock.rs
index e22f5870eef8..d67f00917fd0 100644
--- a/frame/system/src/mock.rs
+++ b/frame/system/src/mock.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/system/src/offchain.rs b/frame/system/src/offchain.rs
index f5186234b602..db417c028675 100644
--- a/frame/system/src/offchain.rs
+++ b/frame/system/src/offchain.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/system/src/tests.rs b/frame/system/src/tests.rs
index 58cb0b95e5e2..ca9163011036 100644
--- a/frame/system/src/tests.rs
+++ b/frame/system/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/system/src/weights.rs b/frame/system/src/weights.rs
index 99ea4a033ca9..f28e90b34c38 100644
--- a/frame/system/src/weights.rs
+++ b/frame/system/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/timestamp/src/benchmarking.rs b/frame/timestamp/src/benchmarking.rs
index a0700179a933..27294a91c526 100644
--- a/frame/timestamp/src/benchmarking.rs
+++ b/frame/timestamp/src/benchmarking.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/timestamp/src/lib.rs b/frame/timestamp/src/lib.rs
index 423f7f5128e8..44f88347c08d 100644
--- a/frame/timestamp/src/lib.rs
+++ b/frame/timestamp/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/timestamp/src/weights.rs b/frame/timestamp/src/weights.rs
index d3f2dcc7ba6f..8cc40faecc93 100644
--- a/frame/timestamp/src/weights.rs
+++ b/frame/timestamp/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/tips/src/benchmarking.rs b/frame/tips/src/benchmarking.rs
index 4f0338b9c5db..6e54247cdb6d 100644
--- a/frame/tips/src/benchmarking.rs
+++ b/frame/tips/src/benchmarking.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/tips/src/lib.rs b/frame/tips/src/lib.rs
index eaa785a5638e..442df89428fc 100644
--- a/frame/tips/src/lib.rs
+++ b/frame/tips/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/tips/src/tests.rs b/frame/tips/src/tests.rs
index 15f3481ba255..ae16117d6b17 100644
--- a/frame/tips/src/tests.rs
+++ b/frame/tips/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/tips/src/weights.rs b/frame/tips/src/weights.rs
index c1d998291001..94c12f740c04 100644
--- a/frame/tips/src/weights.rs
+++ b/frame/tips/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/transaction-payment/rpc/runtime-api/src/lib.rs b/frame/transaction-payment/rpc/runtime-api/src/lib.rs
index 5575f8f7d095..f2c1b2c14149 100644
--- a/frame/transaction-payment/rpc/runtime-api/src/lib.rs
+++ b/frame/transaction-payment/rpc/runtime-api/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/transaction-payment/rpc/src/lib.rs b/frame/transaction-payment/rpc/src/lib.rs
index bf1565f1a40e..ec06fad08d10 100644
--- a/frame/transaction-payment/rpc/src/lib.rs
+++ b/frame/transaction-payment/rpc/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
index a9c595e57ac9..932aaf43dc9d 100644
--- a/frame/transaction-payment/src/lib.rs
+++ b/frame/transaction-payment/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/treasury/src/benchmarking.rs b/frame/treasury/src/benchmarking.rs
index 39b398ab8916..ee462cd372f5 100644
--- a/frame/treasury/src/benchmarking.rs
+++ b/frame/treasury/src/benchmarking.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/treasury/src/lib.rs b/frame/treasury/src/lib.rs
index 835cf11d721a..b5e2c7881bb5 100644
--- a/frame/treasury/src/lib.rs
+++ b/frame/treasury/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/treasury/src/tests.rs b/frame/treasury/src/tests.rs
index 4d0bdf32e45f..177c39eec244 100644
--- a/frame/treasury/src/tests.rs
+++ b/frame/treasury/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/treasury/src/weights.rs b/frame/treasury/src/weights.rs
index 3bc1fcd23087..ea939396c5f1 100644
--- a/frame/treasury/src/weights.rs
+++ b/frame/treasury/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/utility/src/benchmarking.rs b/frame/utility/src/benchmarking.rs
index 501e1b293bcc..068d40c399be 100644
--- a/frame/utility/src/benchmarking.rs
+++ b/frame/utility/src/benchmarking.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/utility/src/lib.rs b/frame/utility/src/lib.rs
index 3aee32b250d5..2286c64fcf3b 100644
--- a/frame/utility/src/lib.rs
+++ b/frame/utility/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/utility/src/tests.rs b/frame/utility/src/tests.rs
index 4837be695265..9d03ead0eb12 100644
--- a/frame/utility/src/tests.rs
+++ b/frame/utility/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/utility/src/weights.rs b/frame/utility/src/weights.rs
index c03ef0d064b9..5e2eb39f6ef5 100644
--- a/frame/utility/src/weights.rs
+++ b/frame/utility/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/vesting/src/benchmarking.rs b/frame/vesting/src/benchmarking.rs
index 0cb030668d05..6a61a6479b11 100644
--- a/frame/vesting/src/benchmarking.rs
+++ b/frame/vesting/src/benchmarking.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/vesting/src/lib.rs b/frame/vesting/src/lib.rs
index 6a65e58d4107..5e20c863c51f 100644
--- a/frame/vesting/src/lib.rs
+++ b/frame/vesting/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/vesting/src/weights.rs b/frame/vesting/src/weights.rs
index 3d2d6dd9670e..f4a1ee366910 100644
--- a/frame/vesting/src/weights.rs
+++ b/frame/vesting/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/allocator/src/error.rs b/primitives/allocator/src/error.rs
index 77c911cef9d5..8464cd225d00 100644
--- a/primitives/allocator/src/error.rs
+++ b/primitives/allocator/src/error.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/allocator/src/freeing_bump.rs b/primitives/allocator/src/freeing_bump.rs
index 19d7866e1b53..14746c8784f8 100644
--- a/primitives/allocator/src/freeing_bump.rs
+++ b/primitives/allocator/src/freeing_bump.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/allocator/src/lib.rs b/primitives/allocator/src/lib.rs
index b7cfce804835..7d45fb5f368c 100644
--- a/primitives/allocator/src/lib.rs
+++ b/primitives/allocator/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/api/proc-macro/src/decl_runtime_apis.rs b/primitives/api/proc-macro/src/decl_runtime_apis.rs
index aebefe7ea03a..7c6f95c926dc 100644
--- a/primitives/api/proc-macro/src/decl_runtime_apis.rs
+++ b/primitives/api/proc-macro/src/decl_runtime_apis.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/api/proc-macro/src/impl_runtime_apis.rs b/primitives/api/proc-macro/src/impl_runtime_apis.rs
index 85f5a1797b1e..d44792ef7737 100644
--- a/primitives/api/proc-macro/src/impl_runtime_apis.rs
+++ b/primitives/api/proc-macro/src/impl_runtime_apis.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/api/proc-macro/src/lib.rs b/primitives/api/proc-macro/src/lib.rs
index 4dd48094683d..30767efd41c1 100644
--- a/primitives/api/proc-macro/src/lib.rs
+++ b/primitives/api/proc-macro/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/api/proc-macro/src/mock_impl_runtime_apis.rs b/primitives/api/proc-macro/src/mock_impl_runtime_apis.rs
index 14cf47fc64b2..c6ff98c0f1dc 100644
--- a/primitives/api/proc-macro/src/mock_impl_runtime_apis.rs
+++ b/primitives/api/proc-macro/src/mock_impl_runtime_apis.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/api/proc-macro/src/utils.rs b/primitives/api/proc-macro/src/utils.rs
index 534ddcfddd96..dbe7c723af0b 100644
--- a/primitives/api/proc-macro/src/utils.rs
+++ b/primitives/api/proc-macro/src/utils.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/api/src/lib.rs b/primitives/api/src/lib.rs
index 96da63cf2e25..265439bf37ad 100644
--- a/primitives/api/src/lib.rs
+++ b/primitives/api/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/api/test/benches/bench.rs b/primitives/api/test/benches/bench.rs
index 280b70790287..20ddbbe7116d 100644
--- a/primitives/api/test/benches/bench.rs
+++ b/primitives/api/test/benches/bench.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/api/test/tests/decl_and_impl.rs b/primitives/api/test/tests/decl_and_impl.rs
index be549d7b7f4c..134ee5085658 100644
--- a/primitives/api/test/tests/decl_and_impl.rs
+++ b/primitives/api/test/tests/decl_and_impl.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/api/test/tests/runtime_calls.rs b/primitives/api/test/tests/runtime_calls.rs
index d72872959cef..ec1a86d8379f 100644
--- a/primitives/api/test/tests/runtime_calls.rs
+++ b/primitives/api/test/tests/runtime_calls.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/api/test/tests/trybuild.rs b/primitives/api/test/tests/trybuild.rs
index f23c7291e8ef..5a6025f463af 100644
--- a/primitives/api/test/tests/trybuild.rs
+++ b/primitives/api/test/tests/trybuild.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/application-crypto/src/ecdsa.rs b/primitives/application-crypto/src/ecdsa.rs
index 287ac8f3afcf..fe54dab39eef 100644
--- a/primitives/application-crypto/src/ecdsa.rs
+++ b/primitives/application-crypto/src/ecdsa.rs
@@ -1,18 +1,19 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Ecdsa crypto types.
 
diff --git a/primitives/application-crypto/src/ed25519.rs b/primitives/application-crypto/src/ed25519.rs
index e761745cf542..98eb4727df63 100644
--- a/primitives/application-crypto/src/ed25519.rs
+++ b/primitives/application-crypto/src/ed25519.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/application-crypto/src/lib.rs b/primitives/application-crypto/src/lib.rs
index 12e11d690541..d085d961a102 100644
--- a/primitives/application-crypto/src/lib.rs
+++ b/primitives/application-crypto/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/application-crypto/src/sr25519.rs b/primitives/application-crypto/src/sr25519.rs
index 4700e0f75671..f3ce86785833 100644
--- a/primitives/application-crypto/src/sr25519.rs
+++ b/primitives/application-crypto/src/sr25519.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/application-crypto/src/traits.rs b/primitives/application-crypto/src/traits.rs
index f06e194aefdd..8daa866af63e 100644
--- a/primitives/application-crypto/src/traits.rs
+++ b/primitives/application-crypto/src/traits.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/application-crypto/test/src/ecdsa.rs b/primitives/application-crypto/test/src/ecdsa.rs
index 89def7cd6877..5ad10e79ef96 100644
--- a/primitives/application-crypto/test/src/ecdsa.rs
+++ b/primitives/application-crypto/test/src/ecdsa.rs
@@ -1,18 +1,19 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
 
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Integration tests for ecdsa
 use std::sync::Arc;
diff --git a/primitives/application-crypto/test/src/ed25519.rs b/primitives/application-crypto/test/src/ed25519.rs
index 9df198dc4f9d..06b962f1902b 100644
--- a/primitives/application-crypto/test/src/ed25519.rs
+++ b/primitives/application-crypto/test/src/ed25519.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/application-crypto/test/src/lib.rs b/primitives/application-crypto/test/src/lib.rs
index b78539239691..bee926f8dd8c 100644
--- a/primitives/application-crypto/test/src/lib.rs
+++ b/primitives/application-crypto/test/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/application-crypto/test/src/sr25519.rs b/primitives/application-crypto/test/src/sr25519.rs
index f96d7b7ef000..889f662b6814 100644
--- a/primitives/application-crypto/test/src/sr25519.rs
+++ b/primitives/application-crypto/test/src/sr25519.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/arithmetic/benches/bench.rs b/primitives/arithmetic/benches/bench.rs
index 7a576c8af144..fd535c1d2d0f 100644
--- a/primitives/arithmetic/benches/bench.rs
+++ b/primitives/arithmetic/benches/bench.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/arithmetic/fuzzer/src/biguint.rs b/primitives/arithmetic/fuzzer/src/biguint.rs
index 481ac5561dda..57be7f534204 100644
--- a/primitives/arithmetic/fuzzer/src/biguint.rs
+++ b/primitives/arithmetic/fuzzer/src/biguint.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/arithmetic/fuzzer/src/fixed_point.rs b/primitives/arithmetic/fuzzer/src/fixed_point.rs
index 9a88197ac32a..db415ecb84c7 100644
--- a/primitives/arithmetic/fuzzer/src/fixed_point.rs
+++ b/primitives/arithmetic/fuzzer/src/fixed_point.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/arithmetic/fuzzer/src/multiply_by_rational.rs b/primitives/arithmetic/fuzzer/src/multiply_by_rational.rs
index 5d06df3f1f8a..40f315ce755d 100644
--- a/primitives/arithmetic/fuzzer/src/multiply_by_rational.rs
+++ b/primitives/arithmetic/fuzzer/src/multiply_by_rational.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/arithmetic/fuzzer/src/normalize.rs b/primitives/arithmetic/fuzzer/src/normalize.rs
index 3c1759d56852..48d52ba71bab 100644
--- a/primitives/arithmetic/fuzzer/src/normalize.rs
+++ b/primitives/arithmetic/fuzzer/src/normalize.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/arithmetic/fuzzer/src/per_thing_rational.rs b/primitives/arithmetic/fuzzer/src/per_thing_rational.rs
index 8ddbd0c6d59d..ff172b8bd270 100644
--- a/primitives/arithmetic/fuzzer/src/per_thing_rational.rs
+++ b/primitives/arithmetic/fuzzer/src/per_thing_rational.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/arithmetic/src/biguint.rs b/primitives/arithmetic/src/biguint.rs
index 64418956fcd7..210cba8e2b1f 100644
--- a/primitives/arithmetic/src/biguint.rs
+++ b/primitives/arithmetic/src/biguint.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/arithmetic/src/fixed_point.rs b/primitives/arithmetic/src/fixed_point.rs
index 8b882666946d..44a869561070 100644
--- a/primitives/arithmetic/src/fixed_point.rs
+++ b/primitives/arithmetic/src/fixed_point.rs
@@ -1,18 +1,19 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Decimal Fixed Point implementations for Substrate runtime.
 
diff --git a/primitives/arithmetic/src/helpers_128bit.rs b/primitives/arithmetic/src/helpers_128bit.rs
index 1e332f54d3bd..a979b6a48aa2 100644
--- a/primitives/arithmetic/src/helpers_128bit.rs
+++ b/primitives/arithmetic/src/helpers_128bit.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/arithmetic/src/lib.rs b/primitives/arithmetic/src/lib.rs
index f6521988c91a..ca02df0d1d4b 100644
--- a/primitives/arithmetic/src/lib.rs
+++ b/primitives/arithmetic/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/arithmetic/src/per_things.rs b/primitives/arithmetic/src/per_things.rs
index 59d98eea2b78..c6a31a0ffe86 100644
--- a/primitives/arithmetic/src/per_things.rs
+++ b/primitives/arithmetic/src/per_things.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/arithmetic/src/rational.rs b/primitives/arithmetic/src/rational.rs
index 07556bc0e2d7..88eaca1efb6c 100644
--- a/primitives/arithmetic/src/rational.rs
+++ b/primitives/arithmetic/src/rational.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/arithmetic/src/traits.rs b/primitives/arithmetic/src/traits.rs
index ce645cfe65d9..ea297077e351 100644
--- a/primitives/arithmetic/src/traits.rs
+++ b/primitives/arithmetic/src/traits.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/authority-discovery/src/lib.rs b/primitives/authority-discovery/src/lib.rs
index 0ae47c9758ee..b04ce43a2c74 100644
--- a/primitives/authority-discovery/src/lib.rs
+++ b/primitives/authority-discovery/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/authorship/src/lib.rs b/primitives/authorship/src/lib.rs
index a760c546a25d..7bf6769951b2 100644
--- a/primitives/authorship/src/lib.rs
+++ b/primitives/authorship/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/block-builder/src/lib.rs b/primitives/block-builder/src/lib.rs
index 6367a18afa61..f51d041c9f1c 100644
--- a/primitives/block-builder/src/lib.rs
+++ b/primitives/block-builder/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/blockchain/src/backend.rs b/primitives/blockchain/src/backend.rs
index 01a7a59d6f94..b50545b1a20a 100644
--- a/primitives/blockchain/src/backend.rs
+++ b/primitives/blockchain/src/backend.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/blockchain/src/error.rs b/primitives/blockchain/src/error.rs
index c7180a61b00c..6ed5fe1b335f 100644
--- a/primitives/blockchain/src/error.rs
+++ b/primitives/blockchain/src/error.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/blockchain/src/header_metadata.rs b/primitives/blockchain/src/header_metadata.rs
index b8d9c5c93458..87d0057f32c2 100644
--- a/primitives/blockchain/src/header_metadata.rs
+++ b/primitives/blockchain/src/header_metadata.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/blockchain/src/lib.rs b/primitives/blockchain/src/lib.rs
index 27b9c3585e9c..696050f57ac8 100644
--- a/primitives/blockchain/src/lib.rs
+++ b/primitives/blockchain/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/chain-spec/src/lib.rs b/primitives/chain-spec/src/lib.rs
index 869fae8236b7..5456718e351d 100644
--- a/primitives/chain-spec/src/lib.rs
+++ b/primitives/chain-spec/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/consensus/aura/src/inherents.rs b/primitives/consensus/aura/src/inherents.rs
index a18bd3370306..e92775c501af 100644
--- a/primitives/consensus/aura/src/inherents.rs
+++ b/primitives/consensus/aura/src/inherents.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/consensus/aura/src/lib.rs b/primitives/consensus/aura/src/lib.rs
index cf0bcf2218a0..f3de26da90d3 100644
--- a/primitives/consensus/aura/src/lib.rs
+++ b/primitives/consensus/aura/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/consensus/babe/src/digests.rs b/primitives/consensus/babe/src/digests.rs
index f7ae560afff3..eeea747179a5 100644
--- a/primitives/consensus/babe/src/digests.rs
+++ b/primitives/consensus/babe/src/digests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/consensus/babe/src/inherents.rs b/primitives/consensus/babe/src/inherents.rs
index 5384183f9e67..98104385c70f 100644
--- a/primitives/consensus/babe/src/inherents.rs
+++ b/primitives/consensus/babe/src/inherents.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/consensus/babe/src/lib.rs b/primitives/consensus/babe/src/lib.rs
index ac75f26a3de6..84915c3e71e2 100644
--- a/primitives/consensus/babe/src/lib.rs
+++ b/primitives/consensus/babe/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/consensus/common/src/block_import.rs b/primitives/consensus/common/src/block_import.rs
index 0100041fc0a0..41b5f391f65c 100644
--- a/primitives/consensus/common/src/block_import.rs
+++ b/primitives/consensus/common/src/block_import.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/consensus/common/src/block_validation.rs b/primitives/consensus/common/src/block_validation.rs
index b92614415957..8ae832ad27ca 100644
--- a/primitives/consensus/common/src/block_validation.rs
+++ b/primitives/consensus/common/src/block_validation.rs
@@ -1,18 +1,19 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// 	http://www.apache.org/licenses/LICENSE-2.0
 //
-// You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Block announcement validation.
 
diff --git a/primitives/consensus/common/src/error.rs b/primitives/consensus/common/src/error.rs
index 11b24d273d5e..d7461fe92032 100644
--- a/primitives/consensus/common/src/error.rs
+++ b/primitives/consensus/common/src/error.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/consensus/common/src/evaluation.rs b/primitives/consensus/common/src/evaluation.rs
index fc9ab24d15db..be930fa4a001 100644
--- a/primitives/consensus/common/src/evaluation.rs
+++ b/primitives/consensus/common/src/evaluation.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/consensus/common/src/import_queue.rs b/primitives/consensus/common/src/import_queue.rs
index 713c59b07a54..83f6271941fa 100644
--- a/primitives/consensus/common/src/import_queue.rs
+++ b/primitives/consensus/common/src/import_queue.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/consensus/common/src/import_queue/basic_queue.rs b/primitives/consensus/common/src/import_queue/basic_queue.rs
index b426c39100e6..03c0661f92c8 100644
--- a/primitives/consensus/common/src/import_queue/basic_queue.rs
+++ b/primitives/consensus/common/src/import_queue/basic_queue.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/consensus/common/src/import_queue/buffered_link.rs b/primitives/consensus/common/src/import_queue/buffered_link.rs
index db9bcc8f0ad6..0295f704c4ef 100644
--- a/primitives/consensus/common/src/import_queue/buffered_link.rs
+++ b/primitives/consensus/common/src/import_queue/buffered_link.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/consensus/common/src/lib.rs b/primitives/consensus/common/src/lib.rs
index 10fe8a2b3158..43edf4f7776c 100644
--- a/primitives/consensus/common/src/lib.rs
+++ b/primitives/consensus/common/src/lib.rs
@@ -1,18 +1,19 @@
-// Copyright 2018-2020 Parity Technologies (UK) Ltd.
-// This file is part of Substrate Consensus Common.
-
-// Substrate Demo is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Substrate Consensus Common is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate Consensus Common.  If not, see <http://www.gnu.org/licenses/>.
+// This file is part of Substrate.
+
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Common utilities for building and using consensus engines in substrate.
 //!
diff --git a/primitives/consensus/common/src/metrics.rs b/primitives/consensus/common/src/metrics.rs
index 6e6b582e1259..29d39436cbef 100644
--- a/primitives/consensus/common/src/metrics.rs
+++ b/primitives/consensus/common/src/metrics.rs
@@ -1,18 +1,19 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
 
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Metering tools for consensus
 
diff --git a/primitives/consensus/common/src/offline_tracker.rs b/primitives/consensus/common/src/offline_tracker.rs
index b96498041f25..8e33a2c449e3 100644
--- a/primitives/consensus/common/src/offline_tracker.rs
+++ b/primitives/consensus/common/src/offline_tracker.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/consensus/common/src/select_chain.rs b/primitives/consensus/common/src/select_chain.rs
index fe0d3972043b..11f6fbeb54d3 100644
--- a/primitives/consensus/common/src/select_chain.rs
+++ b/primitives/consensus/common/src/select_chain.rs
@@ -1,18 +1,19 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
-// This file is part of Substrate Consensus Common.
-
-// Substrate Demo is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Substrate Consensus Common is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate Consensus Common.  If not, see <http://www.gnu.org/licenses/>.
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 use crate::error::Error;
 use sp_runtime::traits::{Block as BlockT, NumberFor};
diff --git a/primitives/consensus/pow/src/lib.rs b/primitives/consensus/pow/src/lib.rs
index 79c9b6f16c3b..12d3440ea9d5 100644
--- a/primitives/consensus/pow/src/lib.rs
+++ b/primitives/consensus/pow/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/consensus/slots/src/lib.rs b/primitives/consensus/slots/src/lib.rs
index f898cf9da6e2..52df467c2910 100644
--- a/primitives/consensus/slots/src/lib.rs
+++ b/primitives/consensus/slots/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/consensus/vrf/src/lib.rs b/primitives/consensus/vrf/src/lib.rs
index 430e11974bcd..19391c6c1c84 100644
--- a/primitives/consensus/vrf/src/lib.rs
+++ b/primitives/consensus/vrf/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/consensus/vrf/src/schnorrkel.rs b/primitives/consensus/vrf/src/schnorrkel.rs
index 65e68375865d..400bdb2f5808 100644
--- a/primitives/consensus/vrf/src/schnorrkel.rs
+++ b/primitives/consensus/vrf/src/schnorrkel.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/core/src/changes_trie.rs b/primitives/core/src/changes_trie.rs
index 1d88242e43d6..32991ce44a50 100644
--- a/primitives/core/src/changes_trie.rs
+++ b/primitives/core/src/changes_trie.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index 12746a078684..7943ac1beed2 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/core/src/ecdsa.rs b/primitives/core/src/ecdsa.rs
index 8d2ba4a3d1b1..0f654f816c47 100644
--- a/primitives/core/src/ecdsa.rs
+++ b/primitives/core/src/ecdsa.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/core/src/ed25519.rs b/primitives/core/src/ed25519.rs
index ad08f9ab8bae..658931093120 100644
--- a/primitives/core/src/ed25519.rs
+++ b/primitives/core/src/ed25519.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/core/src/hash.rs b/primitives/core/src/hash.rs
index 20a6788c3207..dcaafd2906de 100644
--- a/primitives/core/src/hash.rs
+++ b/primitives/core/src/hash.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/core/src/hasher.rs b/primitives/core/src/hasher.rs
index 8ccaa4d90a78..13a168c70f93 100644
--- a/primitives/core/src/hasher.rs
+++ b/primitives/core/src/hasher.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/core/src/hashing.rs b/primitives/core/src/hashing.rs
index 6807da02feb0..8a4c5191dd31 100644
--- a/primitives/core/src/hashing.rs
+++ b/primitives/core/src/hashing.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/core/src/hexdisplay.rs b/primitives/core/src/hexdisplay.rs
index 9d2b7a12d032..304b665a72c9 100644
--- a/primitives/core/src/hexdisplay.rs
+++ b/primitives/core/src/hexdisplay.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/core/src/lib.rs b/primitives/core/src/lib.rs
index 7857937aebfd..7fc9fa091969 100644
--- a/primitives/core/src/lib.rs
+++ b/primitives/core/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/core/src/offchain/mod.rs b/primitives/core/src/offchain/mod.rs
index 4768496c4a50..002e35400481 100644
--- a/primitives/core/src/offchain/mod.rs
+++ b/primitives/core/src/offchain/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/core/src/offchain/storage.rs b/primitives/core/src/offchain/storage.rs
index 7d7c711ed95f..ec6f91e6a5ae 100644
--- a/primitives/core/src/offchain/storage.rs
+++ b/primitives/core/src/offchain/storage.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/core/src/offchain/testing.rs b/primitives/core/src/offchain/testing.rs
index 5256f417711b..773f74b7379c 100644
--- a/primitives/core/src/offchain/testing.rs
+++ b/primitives/core/src/offchain/testing.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/core/src/sandbox.rs b/primitives/core/src/sandbox.rs
index 4cb5bd41d582..330ea7eb92e1 100644
--- a/primitives/core/src/sandbox.rs
+++ b/primitives/core/src/sandbox.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/core/src/sr25519.rs b/primitives/core/src/sr25519.rs
index 9a757c890054..37926d8f801c 100644
--- a/primitives/core/src/sr25519.rs
+++ b/primitives/core/src/sr25519.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/core/src/testing.rs b/primitives/core/src/testing.rs
index cee8bec22aa0..1506abb77f9c 100644
--- a/primitives/core/src/testing.rs
+++ b/primitives/core/src/testing.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/core/src/traits.rs b/primitives/core/src/traits.rs
index 97100ea58f8c..8488a1873cac 100644
--- a/primitives/core/src/traits.rs
+++ b/primitives/core/src/traits.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/core/src/u32_trait.rs b/primitives/core/src/u32_trait.rs
index 6f73e1f6ba71..07f9bb003283 100644
--- a/primitives/core/src/u32_trait.rs
+++ b/primitives/core/src/u32_trait.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/core/src/uint.rs b/primitives/core/src/uint.rs
index ef1adc4a0e0e..f917f472d787 100644
--- a/primitives/core/src/uint.rs
+++ b/primitives/core/src/uint.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/database/src/error.rs b/primitives/database/src/error.rs
index 3253839bbeff..4bf5a20aff40 100644
--- a/primitives/database/src/error.rs
+++ b/primitives/database/src/error.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/database/src/kvdb.rs b/primitives/database/src/kvdb.rs
index c48bd9c610f0..b50ca53786f9 100644
--- a/primitives/database/src/kvdb.rs
+++ b/primitives/database/src/kvdb.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/database/src/lib.rs b/primitives/database/src/lib.rs
index 1908eb49bb6c..94fe16ce01db 100644
--- a/primitives/database/src/lib.rs
+++ b/primitives/database/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/database/src/mem.rs b/primitives/database/src/mem.rs
index 51cb854334d5..41af2e2f235c 100644
--- a/primitives/database/src/mem.rs
+++ b/primitives/database/src/mem.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/debug-derive/src/impls.rs b/primitives/debug-derive/src/impls.rs
index 1757b294d9d4..898e4eef5d06 100644
--- a/primitives/debug-derive/src/impls.rs
+++ b/primitives/debug-derive/src/impls.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/debug-derive/src/lib.rs b/primitives/debug-derive/src/lib.rs
index db370f890810..74907b13874a 100644
--- a/primitives/debug-derive/src/lib.rs
+++ b/primitives/debug-derive/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/debug-derive/tests/tests.rs b/primitives/debug-derive/tests/tests.rs
index 6a03762b1c65..d51d6a05bf21 100644
--- a/primitives/debug-derive/tests/tests.rs
+++ b/primitives/debug-derive/tests/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/externalities/src/extensions.rs b/primitives/externalities/src/extensions.rs
index a7f5ee8bc739..611951dd1a56 100644
--- a/primitives/externalities/src/extensions.rs
+++ b/primitives/externalities/src/extensions.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/externalities/src/lib.rs b/primitives/externalities/src/lib.rs
index a6596a22d106..a10ce32bdc85 100644
--- a/primitives/externalities/src/lib.rs
+++ b/primitives/externalities/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/externalities/src/scope_limited.rs b/primitives/externalities/src/scope_limited.rs
index 1f70276f02d3..3b5013ba8e7f 100644
--- a/primitives/externalities/src/scope_limited.rs
+++ b/primitives/externalities/src/scope_limited.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/finality-grandpa/src/lib.rs b/primitives/finality-grandpa/src/lib.rs
index 0426dad94682..5a5468aff560 100644
--- a/primitives/finality-grandpa/src/lib.rs
+++ b/primitives/finality-grandpa/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/inherents/src/lib.rs b/primitives/inherents/src/lib.rs
index e91fb06e3f34..8adf44cbc418 100644
--- a/primitives/inherents/src/lib.rs
+++ b/primitives/inherents/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/io/src/batch_verifier.rs b/primitives/io/src/batch_verifier.rs
index 39229b1200b9..341df36c5564 100644
--- a/primitives/io/src/batch_verifier.rs
+++ b/primitives/io/src/batch_verifier.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/io/src/lib.rs b/primitives/io/src/lib.rs
index dba984f43335..397dd3c21712 100644
--- a/primitives/io/src/lib.rs
+++ b/primitives/io/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/keyring/src/ed25519.rs b/primitives/keyring/src/ed25519.rs
index 17882027387c..c9dd70d63d5c 100644
--- a/primitives/keyring/src/ed25519.rs
+++ b/primitives/keyring/src/ed25519.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/keyring/src/lib.rs b/primitives/keyring/src/lib.rs
index 55ed14d294f1..d7fb7c4fd2f2 100644
--- a/primitives/keyring/src/lib.rs
+++ b/primitives/keyring/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/keyring/src/sr25519.rs b/primitives/keyring/src/sr25519.rs
index 80397f0de9fc..a4f43be07f07 100644
--- a/primitives/keyring/src/sr25519.rs
+++ b/primitives/keyring/src/sr25519.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/keystore/src/lib.rs b/primitives/keystore/src/lib.rs
index 068c174aecdf..25f8cb496547 100644
--- a/primitives/keystore/src/lib.rs
+++ b/primitives/keystore/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/keystore/src/testing.rs b/primitives/keystore/src/testing.rs
index a5e460951493..702e2bbc857d 100644
--- a/primitives/keystore/src/testing.rs
+++ b/primitives/keystore/src/testing.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/keystore/src/vrf.rs b/primitives/keystore/src/vrf.rs
index 9c1ac92738dc..759c8263cebc 100644
--- a/primitives/keystore/src/vrf.rs
+++ b/primitives/keystore/src/vrf.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/npos-elections/compact/src/assignment.rs b/primitives/npos-elections/compact/src/assignment.rs
index 8b61076521d7..4f527aa40a74 100644
--- a/primitives/npos-elections/compact/src/assignment.rs
+++ b/primitives/npos-elections/compact/src/assignment.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/npos-elections/compact/src/codec.rs b/primitives/npos-elections/compact/src/codec.rs
index 6c5a3bc2134d..6e8d4d9277db 100644
--- a/primitives/npos-elections/compact/src/codec.rs
+++ b/primitives/npos-elections/compact/src/codec.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/npos-elections/compact/src/lib.rs b/primitives/npos-elections/compact/src/lib.rs
index 22997e4f616c..32397652f9b9 100644
--- a/primitives/npos-elections/compact/src/lib.rs
+++ b/primitives/npos-elections/compact/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/npos-elections/fuzzer/src/common.rs b/primitives/npos-elections/fuzzer/src/common.rs
index a5099098f5a8..29f0247f84f3 100644
--- a/primitives/npos-elections/fuzzer/src/common.rs
+++ b/primitives/npos-elections/fuzzer/src/common.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/npos-elections/fuzzer/src/phragmen_balancing.rs b/primitives/npos-elections/fuzzer/src/phragmen_balancing.rs
index 67cc7ba3c9a9..024b721b222a 100644
--- a/primitives/npos-elections/fuzzer/src/phragmen_balancing.rs
+++ b/primitives/npos-elections/fuzzer/src/phragmen_balancing.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/npos-elections/fuzzer/src/phragmms_balancing.rs b/primitives/npos-elections/fuzzer/src/phragmms_balancing.rs
index 0aada6a5624d..868aa67236f4 100644
--- a/primitives/npos-elections/fuzzer/src/phragmms_balancing.rs
+++ b/primitives/npos-elections/fuzzer/src/phragmms_balancing.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/npos-elections/fuzzer/src/reduce.rs b/primitives/npos-elections/fuzzer/src/reduce.rs
index 0f0d9893e048..074c1546d49d 100644
--- a/primitives/npos-elections/fuzzer/src/reduce.rs
+++ b/primitives/npos-elections/fuzzer/src/reduce.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/npos-elections/src/balancing.rs b/primitives/npos-elections/src/balancing.rs
index 517ac5c03f12..48cb980d78c3 100644
--- a/primitives/npos-elections/src/balancing.rs
+++ b/primitives/npos-elections/src/balancing.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/npos-elections/src/helpers.rs b/primitives/npos-elections/src/helpers.rs
index bfde63676c6e..6f4400b6748f 100644
--- a/primitives/npos-elections/src/helpers.rs
+++ b/primitives/npos-elections/src/helpers.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/npos-elections/src/lib.rs b/primitives/npos-elections/src/lib.rs
index 2c7d133529c9..1e3c2707497c 100644
--- a/primitives/npos-elections/src/lib.rs
+++ b/primitives/npos-elections/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd. SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd. SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 // in compliance with the License. You may obtain a copy of the License at
diff --git a/primitives/npos-elections/src/mock.rs b/primitives/npos-elections/src/mock.rs
index 75ff292450df..410adcc3779e 100644
--- a/primitives/npos-elections/src/mock.rs
+++ b/primitives/npos-elections/src/mock.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/npos-elections/src/node.rs b/primitives/npos-elections/src/node.rs
index d18c0e9016b6..ae65318ff046 100644
--- a/primitives/npos-elections/src/node.rs
+++ b/primitives/npos-elections/src/node.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/npos-elections/src/phragmen.rs b/primitives/npos-elections/src/phragmen.rs
index 135f992aba78..8f88c45ae6de 100644
--- a/primitives/npos-elections/src/phragmen.rs
+++ b/primitives/npos-elections/src/phragmen.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/npos-elections/src/phragmms.rs b/primitives/npos-elections/src/phragmms.rs
index 9b59e22c249b..b0f841e57f24 100644
--- a/primitives/npos-elections/src/phragmms.rs
+++ b/primitives/npos-elections/src/phragmms.rs
@@ -1,6 +1,6 @@
  // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/npos-elections/src/reduce.rs b/primitives/npos-elections/src/reduce.rs
index a96a2ed8457d..a34f1612ca1a 100644
--- a/primitives/npos-elections/src/reduce.rs
+++ b/primitives/npos-elections/src/reduce.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/npos-elections/src/tests.rs b/primitives/npos-elections/src/tests.rs
index 79f95a469adf..1d26909911f3 100644
--- a/primitives/npos-elections/src/tests.rs
+++ b/primitives/npos-elections/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/offchain/src/lib.rs b/primitives/offchain/src/lib.rs
index fa5ab808df8a..fbbcdcd9b83d 100644
--- a/primitives/offchain/src/lib.rs
+++ b/primitives/offchain/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/panic-handler/src/lib.rs b/primitives/panic-handler/src/lib.rs
index 2ac30dd63691..150ce5297680 100644
--- a/primitives/panic-handler/src/lib.rs
+++ b/primitives/panic-handler/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/rpc/src/lib.rs b/primitives/rpc/src/lib.rs
index c479f0df8b60..822aba4ba196 100644
--- a/primitives/rpc/src/lib.rs
+++ b/primitives/rpc/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/rpc/src/list.rs b/primitives/rpc/src/list.rs
index a80d5a22272c..1f4c6ff098c4 100644
--- a/primitives/rpc/src/list.rs
+++ b/primitives/rpc/src/list.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/rpc/src/number.rs b/primitives/rpc/src/number.rs
index 0a81a34db8f7..93d64aa2c37f 100644
--- a/primitives/rpc/src/number.rs
+++ b/primitives/rpc/src/number.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime-interface/proc-macro/src/lib.rs b/primitives/runtime-interface/proc-macro/src/lib.rs
index df43551398a1..53df4e084d27 100644
--- a/primitives/runtime-interface/proc-macro/src/lib.rs
+++ b/primitives/runtime-interface/proc-macro/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime-interface/proc-macro/src/pass_by/codec.rs b/primitives/runtime-interface/proc-macro/src/pass_by/codec.rs
index 5e5144093845..1e6b72f88233 100644
--- a/primitives/runtime-interface/proc-macro/src/pass_by/codec.rs
+++ b/primitives/runtime-interface/proc-macro/src/pass_by/codec.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime-interface/proc-macro/src/pass_by/enum_.rs b/primitives/runtime-interface/proc-macro/src/pass_by/enum_.rs
index 35ed9c0cb802..cc0428fc9b56 100644
--- a/primitives/runtime-interface/proc-macro/src/pass_by/enum_.rs
+++ b/primitives/runtime-interface/proc-macro/src/pass_by/enum_.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime-interface/proc-macro/src/pass_by/inner.rs b/primitives/runtime-interface/proc-macro/src/pass_by/inner.rs
index cf3bb965d074..7fe0d1734c36 100644
--- a/primitives/runtime-interface/proc-macro/src/pass_by/inner.rs
+++ b/primitives/runtime-interface/proc-macro/src/pass_by/inner.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime-interface/proc-macro/src/pass_by/mod.rs b/primitives/runtime-interface/proc-macro/src/pass_by/mod.rs
index ff5ea4849af7..80ac3396759f 100644
--- a/primitives/runtime-interface/proc-macro/src/pass_by/mod.rs
+++ b/primitives/runtime-interface/proc-macro/src/pass_by/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime-interface/proc-macro/src/runtime_interface/bare_function_interface.rs b/primitives/runtime-interface/proc-macro/src/runtime_interface/bare_function_interface.rs
index 2725bd2c89ce..c5d0073e3fb6 100644
--- a/primitives/runtime-interface/proc-macro/src/runtime_interface/bare_function_interface.rs
+++ b/primitives/runtime-interface/proc-macro/src/runtime_interface/bare_function_interface.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime-interface/proc-macro/src/runtime_interface/host_function_interface.rs b/primitives/runtime-interface/proc-macro/src/runtime_interface/host_function_interface.rs
index 7a4dbc5773a2..fb127b194153 100644
--- a/primitives/runtime-interface/proc-macro/src/runtime_interface/host_function_interface.rs
+++ b/primitives/runtime-interface/proc-macro/src/runtime_interface/host_function_interface.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime-interface/proc-macro/src/runtime_interface/mod.rs b/primitives/runtime-interface/proc-macro/src/runtime_interface/mod.rs
index 02c291975738..78feda663850 100644
--- a/primitives/runtime-interface/proc-macro/src/runtime_interface/mod.rs
+++ b/primitives/runtime-interface/proc-macro/src/runtime_interface/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime-interface/proc-macro/src/runtime_interface/trait_decl_impl.rs b/primitives/runtime-interface/proc-macro/src/runtime_interface/trait_decl_impl.rs
index 70015d02426d..0e392b1a02fb 100644
--- a/primitives/runtime-interface/proc-macro/src/runtime_interface/trait_decl_impl.rs
+++ b/primitives/runtime-interface/proc-macro/src/runtime_interface/trait_decl_impl.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime-interface/proc-macro/src/utils.rs b/primitives/runtime-interface/proc-macro/src/utils.rs
index 45f66e3bf652..f4cef852076b 100644
--- a/primitives/runtime-interface/proc-macro/src/utils.rs
+++ b/primitives/runtime-interface/proc-macro/src/utils.rs
@@ -1,18 +1,19 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Util function used by this crate.
 
@@ -297,4 +298,4 @@ pub fn get_runtime_interface<'a>(trait_def: &'a ItemTrait)
 	}
 
 	Ok(RuntimeInterface { items: functions })
-}
\ No newline at end of file
+}
diff --git a/primitives/runtime-interface/src/host.rs b/primitives/runtime-interface/src/host.rs
index 4a01291e6845..a6ea96af9004 100644
--- a/primitives/runtime-interface/src/host.rs
+++ b/primitives/runtime-interface/src/host.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime-interface/src/impls.rs b/primitives/runtime-interface/src/impls.rs
index 7d84085a9e49..4dd79aeccb39 100644
--- a/primitives/runtime-interface/src/impls.rs
+++ b/primitives/runtime-interface/src/impls.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime-interface/src/lib.rs b/primitives/runtime-interface/src/lib.rs
index 7a7b78bc45b4..93b4a8db87e9 100644
--- a/primitives/runtime-interface/src/lib.rs
+++ b/primitives/runtime-interface/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime-interface/src/pass_by.rs b/primitives/runtime-interface/src/pass_by.rs
index 5ccb3a5e96ee..e2a9b4ed4274 100644
--- a/primitives/runtime-interface/src/pass_by.rs
+++ b/primitives/runtime-interface/src/pass_by.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime-interface/src/util.rs b/primitives/runtime-interface/src/util.rs
index 604e37e8be39..5b3aa07e60d9 100644
--- a/primitives/runtime-interface/src/util.rs
+++ b/primitives/runtime-interface/src/util.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime-interface/src/wasm.rs b/primitives/runtime-interface/src/wasm.rs
index 5511f60e30d2..387d6901e2f2 100644
--- a/primitives/runtime-interface/src/wasm.rs
+++ b/primitives/runtime-interface/src/wasm.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime-interface/test-wasm-deprecated/build.rs b/primitives/runtime-interface/test-wasm-deprecated/build.rs
index 8a0b4d7a0c15..a1c4b2d892cf 100644
--- a/primitives/runtime-interface/test-wasm-deprecated/build.rs
+++ b/primitives/runtime-interface/test-wasm-deprecated/build.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime-interface/test-wasm-deprecated/src/lib.rs b/primitives/runtime-interface/test-wasm-deprecated/src/lib.rs
index ae0697b2938f..0a7e2b49bbbb 100644
--- a/primitives/runtime-interface/test-wasm-deprecated/src/lib.rs
+++ b/primitives/runtime-interface/test-wasm-deprecated/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime-interface/test-wasm/build.rs b/primitives/runtime-interface/test-wasm/build.rs
index 8a0b4d7a0c15..a1c4b2d892cf 100644
--- a/primitives/runtime-interface/test-wasm/build.rs
+++ b/primitives/runtime-interface/test-wasm/build.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime-interface/test-wasm/src/lib.rs b/primitives/runtime-interface/test-wasm/src/lib.rs
index 852be609fef7..4cdf59349dd7 100644
--- a/primitives/runtime-interface/test-wasm/src/lib.rs
+++ b/primitives/runtime-interface/test-wasm/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime-interface/test/src/lib.rs b/primitives/runtime-interface/test/src/lib.rs
index 1f079e86ff3d..75aebf1caef7 100644
--- a/primitives/runtime-interface/test/src/lib.rs
+++ b/primitives/runtime-interface/test/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime-interface/tests/ui.rs b/primitives/runtime-interface/tests/ui.rs
index f23c7291e8ef..5a6025f463af 100644
--- a/primitives/runtime-interface/tests/ui.rs
+++ b/primitives/runtime-interface/tests/ui.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime/src/curve.rs b/primitives/runtime/src/curve.rs
index 27eb89a76947..09ca9a9c46af 100644
--- a/primitives/runtime/src/curve.rs
+++ b/primitives/runtime/src/curve.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime/src/generic/block.rs b/primitives/runtime/src/generic/block.rs
index 4a758b7416de..7b2a10297f9c 100644
--- a/primitives/runtime/src/generic/block.rs
+++ b/primitives/runtime/src/generic/block.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime/src/generic/checked_extrinsic.rs b/primitives/runtime/src/generic/checked_extrinsic.rs
index f355308a59f9..2c3392a13379 100644
--- a/primitives/runtime/src/generic/checked_extrinsic.rs
+++ b/primitives/runtime/src/generic/checked_extrinsic.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime/src/generic/digest.rs b/primitives/runtime/src/generic/digest.rs
index ec0963e5ba00..16bd887f0474 100644
--- a/primitives/runtime/src/generic/digest.rs
+++ b/primitives/runtime/src/generic/digest.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime/src/generic/era.rs b/primitives/runtime/src/generic/era.rs
index 9bfab517a92c..381c34ef419d 100644
--- a/primitives/runtime/src/generic/era.rs
+++ b/primitives/runtime/src/generic/era.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime/src/generic/header.rs b/primitives/runtime/src/generic/header.rs
index e6c800e5787f..09f473e7d819 100644
--- a/primitives/runtime/src/generic/header.rs
+++ b/primitives/runtime/src/generic/header.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime/src/generic/mod.rs b/primitives/runtime/src/generic/mod.rs
index 2a25c063ead7..f5087eccab08 100644
--- a/primitives/runtime/src/generic/mod.rs
+++ b/primitives/runtime/src/generic/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime/src/generic/tests.rs b/primitives/runtime/src/generic/tests.rs
index 56138094fa02..ec31e7de4852 100644
--- a/primitives/runtime/src/generic/tests.rs
+++ b/primitives/runtime/src/generic/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime/src/generic/unchecked_extrinsic.rs b/primitives/runtime/src/generic/unchecked_extrinsic.rs
index ab9afdb28b60..5c87d2715509 100644
--- a/primitives/runtime/src/generic/unchecked_extrinsic.rs
+++ b/primitives/runtime/src/generic/unchecked_extrinsic.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime/src/lib.rs b/primitives/runtime/src/lib.rs
index ccd50334af66..563e0965d83a 100644
--- a/primitives/runtime/src/lib.rs
+++ b/primitives/runtime/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime/src/multiaddress.rs b/primitives/runtime/src/multiaddress.rs
index bb352f7eb5f8..d09cd7acaf4d 100644
--- a/primitives/runtime/src/multiaddress.rs
+++ b/primitives/runtime/src/multiaddress.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime/src/offchain/http.rs b/primitives/runtime/src/offchain/http.rs
index 12a0fcf1e5b4..31eec32f6a31 100644
--- a/primitives/runtime/src/offchain/http.rs
+++ b/primitives/runtime/src/offchain/http.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime/src/offchain/mod.rs b/primitives/runtime/src/offchain/mod.rs
index fe5844ce3004..c9d1eda0f873 100644
--- a/primitives/runtime/src/offchain/mod.rs
+++ b/primitives/runtime/src/offchain/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime/src/offchain/storage.rs b/primitives/runtime/src/offchain/storage.rs
index e39514686e17..56bebf956c13 100644
--- a/primitives/runtime/src/offchain/storage.rs
+++ b/primitives/runtime/src/offchain/storage.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime/src/offchain/storage_lock.rs b/primitives/runtime/src/offchain/storage_lock.rs
index 0d9cf835c15e..416689cadfb8 100644
--- a/primitives/runtime/src/offchain/storage_lock.rs
+++ b/primitives/runtime/src/offchain/storage_lock.rs
@@ -1,18 +1,19 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! # Off-chain Storage Lock
 //!
diff --git a/primitives/runtime/src/random_number_generator.rs b/primitives/runtime/src/random_number_generator.rs
index 23d0421742bd..a4d1a66370c1 100644
--- a/primitives/runtime/src/random_number_generator.rs
+++ b/primitives/runtime/src/random_number_generator.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime/src/runtime_string.rs b/primitives/runtime/src/runtime_string.rs
index 7fd38f48df63..df57def219e5 100644
--- a/primitives/runtime/src/runtime_string.rs
+++ b/primitives/runtime/src/runtime_string.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime/src/testing.rs b/primitives/runtime/src/testing.rs
index 97e128f363c8..3e72c25af9e9 100644
--- a/primitives/runtime/src/testing.rs
+++ b/primitives/runtime/src/testing.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime/src/traits.rs b/primitives/runtime/src/traits.rs
index d475be3579ba..b0567b7ae0d0 100644
--- a/primitives/runtime/src/traits.rs
+++ b/primitives/runtime/src/traits.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/runtime/src/transaction_validity.rs b/primitives/runtime/src/transaction_validity.rs
index 74709d9ae9ce..b0c3e4dd031c 100644
--- a/primitives/runtime/src/transaction_validity.rs
+++ b/primitives/runtime/src/transaction_validity.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/sandbox/src/lib.rs b/primitives/sandbox/src/lib.rs
index a1348370dfe4..22e68439958d 100755
--- a/primitives/sandbox/src/lib.rs
+++ b/primitives/sandbox/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/sandbox/with_std.rs b/primitives/sandbox/with_std.rs
index 0f46f49503ca..d5f87f165137 100755
--- a/primitives/sandbox/with_std.rs
+++ b/primitives/sandbox/with_std.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/sandbox/without_std.rs b/primitives/sandbox/without_std.rs
index dfd3742c6e96..5897462629c4 100755
--- a/primitives/sandbox/without_std.rs
+++ b/primitives/sandbox/without_std.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/serializer/src/lib.rs b/primitives/serializer/src/lib.rs
index c1e03e58a7af..3aef9ef5a387 100644
--- a/primitives/serializer/src/lib.rs
+++ b/primitives/serializer/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/session/src/lib.rs b/primitives/session/src/lib.rs
index 38a852dafd1d..8000c23dd431 100644
--- a/primitives/session/src/lib.rs
+++ b/primitives/session/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/sr-api/proc-macro/src/lib.rs b/primitives/sr-api/proc-macro/src/lib.rs
index 0c506a1455db..4c4aa0d7cb92 100644
--- a/primitives/sr-api/proc-macro/src/lib.rs
+++ b/primitives/sr-api/proc-macro/src/lib.rs
@@ -1,18 +1,19 @@
-// Copyright 2018-2019 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
 
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Macros for declaring and implementing runtime apis.
 
diff --git a/primitives/staking/src/lib.rs b/primitives/staking/src/lib.rs
index 3f6c1873ff03..4bb8ed93f88a 100644
--- a/primitives/staking/src/lib.rs
+++ b/primitives/staking/src/lib.rs
@@ -1,16 +1,19 @@
-
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
 
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
diff --git a/primitives/staking/src/offence.rs b/primitives/staking/src/offence.rs
index 650a17e7898a..0212d1bd8f2f 100644
--- a/primitives/staking/src/offence.rs
+++ b/primitives/staking/src/offence.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/state-machine/src/backend.rs b/primitives/state-machine/src/backend.rs
index 02151c2480e3..eb1c566c6dde 100644
--- a/primitives/state-machine/src/backend.rs
+++ b/primitives/state-machine/src/backend.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/state-machine/src/basic.rs b/primitives/state-machine/src/basic.rs
index def0eecf709f..3b265208136a 100644
--- a/primitives/state-machine/src/basic.rs
+++ b/primitives/state-machine/src/basic.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/state-machine/src/changes_trie/build.rs b/primitives/state-machine/src/changes_trie/build.rs
index b23481411ae2..1e0fc5c4d6c8 100644
--- a/primitives/state-machine/src/changes_trie/build.rs
+++ b/primitives/state-machine/src/changes_trie/build.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/state-machine/src/changes_trie/build_cache.rs b/primitives/state-machine/src/changes_trie/build_cache.rs
index ef83966795f5..901ea86835af 100644
--- a/primitives/state-machine/src/changes_trie/build_cache.rs
+++ b/primitives/state-machine/src/changes_trie/build_cache.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/state-machine/src/changes_trie/build_iterator.rs b/primitives/state-machine/src/changes_trie/build_iterator.rs
index 3bafd608efa8..43089d819b66 100644
--- a/primitives/state-machine/src/changes_trie/build_iterator.rs
+++ b/primitives/state-machine/src/changes_trie/build_iterator.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/state-machine/src/changes_trie/changes_iterator.rs b/primitives/state-machine/src/changes_trie/changes_iterator.rs
index f9398b3ce5dd..be35581e7514 100644
--- a/primitives/state-machine/src/changes_trie/changes_iterator.rs
+++ b/primitives/state-machine/src/changes_trie/changes_iterator.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/state-machine/src/changes_trie/input.rs b/primitives/state-machine/src/changes_trie/input.rs
index 56971f708975..3702eefb9964 100644
--- a/primitives/state-machine/src/changes_trie/input.rs
+++ b/primitives/state-machine/src/changes_trie/input.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/state-machine/src/changes_trie/mod.rs b/primitives/state-machine/src/changes_trie/mod.rs
index fd7b38c052f9..105f3d7de6d3 100644
--- a/primitives/state-machine/src/changes_trie/mod.rs
+++ b/primitives/state-machine/src/changes_trie/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/state-machine/src/changes_trie/prune.rs b/primitives/state-machine/src/changes_trie/prune.rs
index 54456f97add1..a741b814a5c7 100644
--- a/primitives/state-machine/src/changes_trie/prune.rs
+++ b/primitives/state-machine/src/changes_trie/prune.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/state-machine/src/changes_trie/storage.rs b/primitives/state-machine/src/changes_trie/storage.rs
index 51b7ff6f50f7..e08fe36126c7 100644
--- a/primitives/state-machine/src/changes_trie/storage.rs
+++ b/primitives/state-machine/src/changes_trie/storage.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/state-machine/src/changes_trie/surface_iterator.rs b/primitives/state-machine/src/changes_trie/surface_iterator.rs
index b9c9d09f0f73..13da8511f3f9 100644
--- a/primitives/state-machine/src/changes_trie/surface_iterator.rs
+++ b/primitives/state-machine/src/changes_trie/surface_iterator.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/state-machine/src/error.rs b/primitives/state-machine/src/error.rs
index f20f9e530dc7..2705e4623a78 100644
--- a/primitives/state-machine/src/error.rs
+++ b/primitives/state-machine/src/error.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/state-machine/src/ext.rs b/primitives/state-machine/src/ext.rs
index c46d0d56be4b..e080192d49b6 100644
--- a/primitives/state-machine/src/ext.rs
+++ b/primitives/state-machine/src/ext.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/state-machine/src/in_memory_backend.rs b/primitives/state-machine/src/in_memory_backend.rs
index ca300aec919c..4ee16dfd2f8a 100644
--- a/primitives/state-machine/src/in_memory_backend.rs
+++ b/primitives/state-machine/src/in_memory_backend.rs
@@ -1,18 +1,19 @@
-// Copyright 2017-2019 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! State machine in memory backend.
 
diff --git a/primitives/state-machine/src/lib.rs b/primitives/state-machine/src/lib.rs
index c83dce4bedf6..6d85b56f8aae 100644
--- a/primitives/state-machine/src/lib.rs
+++ b/primitives/state-machine/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/state-machine/src/overlayed_changes/changeset.rs b/primitives/state-machine/src/overlayed_changes/changeset.rs
index 5e4fd77c6856..311af042177b 100644
--- a/primitives/state-machine/src/overlayed_changes/changeset.rs
+++ b/primitives/state-machine/src/overlayed_changes/changeset.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/state-machine/src/overlayed_changes/mod.rs b/primitives/state-machine/src/overlayed_changes/mod.rs
index 6ef09fc81505..edf4c2e88e84 100644
--- a/primitives/state-machine/src/overlayed_changes/mod.rs
+++ b/primitives/state-machine/src/overlayed_changes/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/state-machine/src/proving_backend.rs b/primitives/state-machine/src/proving_backend.rs
index 63a027cfba06..6b87aa12eb1a 100644
--- a/primitives/state-machine/src/proving_backend.rs
+++ b/primitives/state-machine/src/proving_backend.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/state-machine/src/read_only.rs b/primitives/state-machine/src/read_only.rs
index ba9984a6c7d5..dee7c9e337cd 100644
--- a/primitives/state-machine/src/read_only.rs
+++ b/primitives/state-machine/src/read_only.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/state-machine/src/stats.rs b/primitives/state-machine/src/stats.rs
index f84de6a5bad0..9d4ac27e5e94 100644
--- a/primitives/state-machine/src/stats.rs
+++ b/primitives/state-machine/src/stats.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/state-machine/src/testing.rs b/primitives/state-machine/src/testing.rs
index 23c3abe4910c..40e37f2116c7 100644
--- a/primitives/state-machine/src/testing.rs
+++ b/primitives/state-machine/src/testing.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/state-machine/src/trie_backend.rs b/primitives/state-machine/src/trie_backend.rs
index ffae1a02c036..3e74f2d3df4b 100644
--- a/primitives/state-machine/src/trie_backend.rs
+++ b/primitives/state-machine/src/trie_backend.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/state-machine/src/trie_backend_essence.rs b/primitives/state-machine/src/trie_backend_essence.rs
index 8485cb27e700..c085099da77d 100644
--- a/primitives/state-machine/src/trie_backend_essence.rs
+++ b/primitives/state-machine/src/trie_backend_essence.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/std/src/lib.rs b/primitives/std/src/lib.rs
index b323c43720da..6acf4b75967a 100644
--- a/primitives/std/src/lib.rs
+++ b/primitives/std/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/std/with_std.rs b/primitives/std/with_std.rs
index 92e804b27e1d..b044eb291227 100644
--- a/primitives/std/with_std.rs
+++ b/primitives/std/with_std.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/std/without_std.rs b/primitives/std/without_std.rs
index 3c130d547a1e..697a0787e531 100755
--- a/primitives/std/without_std.rs
+++ b/primitives/std/without_std.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/storage/src/lib.rs b/primitives/storage/src/lib.rs
index b253733e7b29..268448ae125e 100644
--- a/primitives/storage/src/lib.rs
+++ b/primitives/storage/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/tasks/src/async_externalities.rs b/primitives/tasks/src/async_externalities.rs
index e2afeee413cd..249222ec71c3 100644
--- a/primitives/tasks/src/async_externalities.rs
+++ b/primitives/tasks/src/async_externalities.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/primitives/tasks/src/lib.rs b/primitives/tasks/src/lib.rs
index 030e178109d7..96aca0e1cef6 100644
--- a/primitives/tasks/src/lib.rs
+++ b/primitives/tasks/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/test-primitives/src/lib.rs b/primitives/test-primitives/src/lib.rs
index 27c7ec5e10e6..ed408f338e49 100644
--- a/primitives/test-primitives/src/lib.rs
+++ b/primitives/test-primitives/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/timestamp/src/lib.rs b/primitives/timestamp/src/lib.rs
index 89bfcc20e0e6..59f792678c4b 100644
--- a/primitives/timestamp/src/lib.rs
+++ b/primitives/timestamp/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/tracing/src/lib.rs b/primitives/tracing/src/lib.rs
index 9130c08744d9..227e1ee994ec 100644
--- a/primitives/tracing/src/lib.rs
+++ b/primitives/tracing/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/tracing/src/types.rs b/primitives/tracing/src/types.rs
index 050ac4c31416..725565c37184 100644
--- a/primitives/tracing/src/types.rs
+++ b/primitives/tracing/src/types.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/transaction-pool/src/error.rs b/primitives/transaction-pool/src/error.rs
index e356df75908a..62d4a5281c95 100644
--- a/primitives/transaction-pool/src/error.rs
+++ b/primitives/transaction-pool/src/error.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/transaction-pool/src/lib.rs b/primitives/transaction-pool/src/lib.rs
index b991c541521c..276c53443eb7 100644
--- a/primitives/transaction-pool/src/lib.rs
+++ b/primitives/transaction-pool/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/transaction-pool/src/pool.rs b/primitives/transaction-pool/src/pool.rs
index 6235ca7cdfcf..b0964cab2d18 100644
--- a/primitives/transaction-pool/src/pool.rs
+++ b/primitives/transaction-pool/src/pool.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/transaction-pool/src/runtime_api.rs b/primitives/transaction-pool/src/runtime_api.rs
index 9080c023f589..e1c3280ca2aa 100644
--- a/primitives/transaction-pool/src/runtime_api.rs
+++ b/primitives/transaction-pool/src/runtime_api.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/trie/benches/bench.rs b/primitives/trie/benches/bench.rs
index d385b4bacd4c..c2ccb31328aa 100644
--- a/primitives/trie/benches/bench.rs
+++ b/primitives/trie/benches/bench.rs
@@ -1,18 +1,19 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
+// Copyright (C) 2015-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
 
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 use criterion::{Criterion, criterion_group, criterion_main};
 criterion_group!(benches, benchmark);
diff --git a/primitives/trie/src/error.rs b/primitives/trie/src/error.rs
index 2d3a1b79287c..453f74afeb81 100644
--- a/primitives/trie/src/error.rs
+++ b/primitives/trie/src/error.rs
@@ -1,10 +1,19 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// This file is part of Substrate.
+
+// Copyright (C) 2015-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
 //
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 #[cfg(feature="std")]
 use std::fmt;
diff --git a/primitives/trie/src/lib.rs b/primitives/trie/src/lib.rs
index 4914d85f5811..572283f1c027 100644
--- a/primitives/trie/src/lib.rs
+++ b/primitives/trie/src/lib.rs
@@ -1,18 +1,19 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2015-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Utility functions to interact with Substrate's Base-16 Modified Merkle Patricia tree ("trie").
 
diff --git a/primitives/trie/src/node_codec.rs b/primitives/trie/src/node_codec.rs
index 8a61f372cf2a..0c923ff024c5 100644
--- a/primitives/trie/src/node_codec.rs
+++ b/primitives/trie/src/node_codec.rs
@@ -1,18 +1,19 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2015-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! `NodeCodec` implementation for Substrate's trie format.
 
diff --git a/primitives/trie/src/node_header.rs b/primitives/trie/src/node_header.rs
index 7aa16292549e..14a998903d69 100644
--- a/primitives/trie/src/node_header.rs
+++ b/primitives/trie/src/node_header.rs
@@ -1,18 +1,19 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
+// Copyright (C) 2015-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
 
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! The node header.
 
diff --git a/primitives/trie/src/storage_proof.rs b/primitives/trie/src/storage_proof.rs
index 254adc2fcb48..f0b2bfd4bc3d 100644
--- a/primitives/trie/src/storage_proof.rs
+++ b/primitives/trie/src/storage_proof.rs
@@ -1,18 +1,19 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 use sp_std::vec::Vec;
 use codec::{Encode, Decode};
diff --git a/primitives/trie/src/trie_stream.rs b/primitives/trie/src/trie_stream.rs
index 0c92e673aae9..3a65c5a9190b 100644
--- a/primitives/trie/src/trie_stream.rs
+++ b/primitives/trie/src/trie_stream.rs
@@ -1,18 +1,19 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2015-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! `TrieStream` implementation for Substrate's trie format.
 
diff --git a/primitives/utils/src/lib.rs b/primitives/utils/src/lib.rs
index 77bcd096561b..430ec1ecb6f6 100644
--- a/primitives/utils/src/lib.rs
+++ b/primitives/utils/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/utils/src/metrics.rs b/primitives/utils/src/metrics.rs
index a66589b5927f..45d68ae4e6f7 100644
--- a/primitives/utils/src/metrics.rs
+++ b/primitives/utils/src/metrics.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/utils/src/mpsc.rs b/primitives/utils/src/mpsc.rs
index 321ab72f0d27..b033a5527d84 100644
--- a/primitives/utils/src/mpsc.rs
+++ b/primitives/utils/src/mpsc.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/utils/src/status_sinks.rs b/primitives/utils/src/status_sinks.rs
index 6ca9452893f3..dc8115670de1 100644
--- a/primitives/utils/src/status_sinks.rs
+++ b/primitives/utils/src/status_sinks.rs
@@ -1,18 +1,19 @@
-// Copyright 2019-2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 use crate::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use futures::{prelude::*, lock::Mutex};
diff --git a/primitives/version/src/lib.rs b/primitives/version/src/lib.rs
index 133d0497a258..24a1b85ed0c3 100644
--- a/primitives/version/src/lib.rs
+++ b/primitives/version/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/wasm-interface/src/lib.rs b/primitives/wasm-interface/src/lib.rs
index c432a966056c..fd200268473b 100644
--- a/primitives/wasm-interface/src/lib.rs
+++ b/primitives/wasm-interface/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/primitives/wasm-interface/src/wasmi_impl.rs b/primitives/wasm-interface/src/wasmi_impl.rs
index 5931671c97ed..79110487ffca 100644
--- a/primitives/wasm-interface/src/wasmi_impl.rs
+++ b/primitives/wasm-interface/src/wasmi_impl.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test-utils/client/src/client_ext.rs b/test-utils/client/src/client_ext.rs
index 43e89c8f10bc..db3e42f7e01c 100644
--- a/test-utils/client/src/client_ext.rs
+++ b/test-utils/client/src/client_ext.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test-utils/client/src/lib.rs b/test-utils/client/src/lib.rs
index bde2156e0cc8..487be14a7896 100644
--- a/test-utils/client/src/lib.rs
+++ b/test-utils/client/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test-utils/derive/src/lib.rs b/test-utils/derive/src/lib.rs
index f5d627068963..7a9954d21d82 100644
--- a/test-utils/derive/src/lib.rs
+++ b/test-utils/derive/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/test-utils/runtime/build.rs b/test-utils/runtime/build.rs
index 5c9af20528a0..1de18d32b08b 100644
--- a/test-utils/runtime/build.rs
+++ b/test-utils/runtime/build.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test-utils/runtime/client/src/block_builder_ext.rs b/test-utils/runtime/client/src/block_builder_ext.rs
index cc0bbc69e8fc..9dc27c64143f 100644
--- a/test-utils/runtime/client/src/block_builder_ext.rs
+++ b/test-utils/runtime/client/src/block_builder_ext.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test-utils/runtime/client/src/lib.rs b/test-utils/runtime/client/src/lib.rs
index 9089be3ad4f4..5800203cf7e7 100644
--- a/test-utils/runtime/client/src/lib.rs
+++ b/test-utils/runtime/client/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test-utils/runtime/client/src/trait_tests.rs b/test-utils/runtime/client/src/trait_tests.rs
index b240a42a7855..5a8083065ec0 100644
--- a/test-utils/runtime/client/src/trait_tests.rs
+++ b/test-utils/runtime/client/src/trait_tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test-utils/runtime/src/genesismap.rs b/test-utils/runtime/src/genesismap.rs
index 126447d48184..63c4bab55ec4 100644
--- a/test-utils/runtime/src/genesismap.rs
+++ b/test-utils/runtime/src/genesismap.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index 3e5ab8f69754..f7bff6930217 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test-utils/runtime/src/system.rs b/test-utils/runtime/src/system.rs
index db22a6092c71..9fcb81b7b092 100644
--- a/test-utils/runtime/src/system.rs
+++ b/test-utils/runtime/src/system.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test-utils/runtime/transaction-pool/src/lib.rs b/test-utils/runtime/transaction-pool/src/lib.rs
index f772ba9b02d5..bcba2fb6e678 100644
--- a/test-utils/runtime/transaction-pool/src/lib.rs
+++ b/test-utils/runtime/transaction-pool/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test-utils/src/lib.rs b/test-utils/src/lib.rs
index 224eacd5129e..a2e83fe7b0bf 100644
--- a/test-utils/src/lib.rs
+++ b/test-utils/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test-utils/test-crate/src/main.rs b/test-utils/test-crate/src/main.rs
index 209f29f76132..2f04568591af 100644
--- a/test-utils/test-crate/src/main.rs
+++ b/test-utils/test-crate/src/main.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/test-utils/tests/basic.rs b/test-utils/tests/basic.rs
index 3e96bfe83d3a..3273d0386e8a 100644
--- a/test-utils/tests/basic.rs
+++ b/test-utils/tests/basic.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/test-utils/tests/ui.rs b/test-utils/tests/ui.rs
index 1f3b466c7dd6..13602f25572d 100644
--- a/test-utils/tests/ui.rs
+++ b/test-utils/tests/ui.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/test-utils/tests/ui/missing-func-parameter.rs b/test-utils/tests/ui/missing-func-parameter.rs
index bd34a76902ef..e08d8ae13100 100644
--- a/test-utils/tests/ui/missing-func-parameter.rs
+++ b/test-utils/tests/ui/missing-func-parameter.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/test-utils/tests/ui/too-many-func-parameters.rs b/test-utils/tests/ui/too-many-func-parameters.rs
index 9aeadc2a8843..3b742fac7a60 100644
--- a/test-utils/tests/ui/too-many-func-parameters.rs
+++ b/test-utils/tests/ui/too-many-func-parameters.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/utils/browser/src/lib.rs b/utils/browser/src/lib.rs
index 071ed332fcdf..07404f044126 100644
--- a/utils/browser/src/lib.rs
+++ b/utils/browser/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/utils/build-script-utils/src/git.rs b/utils/build-script-utils/src/git.rs
index 29c6a325fe7e..d01343634bc9 100644
--- a/utils/build-script-utils/src/git.rs
+++ b/utils/build-script-utils/src/git.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/utils/build-script-utils/src/lib.rs b/utils/build-script-utils/src/lib.rs
index 512e6dcaefda..8eb17a7de61f 100644
--- a/utils/build-script-utils/src/lib.rs
+++ b/utils/build-script-utils/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/utils/build-script-utils/src/version.rs b/utils/build-script-utils/src/version.rs
index 103fd5b1d24a..f92c637c78cc 100644
--- a/utils/build-script-utils/src/version.rs
+++ b/utils/build-script-utils/src/version.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/utils/fork-tree/src/lib.rs b/utils/fork-tree/src/lib.rs
index 2eaced74d319..d1ec67d37b95 100644
--- a/utils/fork-tree/src/lib.rs
+++ b/utils/fork-tree/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/utils/frame/benchmarking-cli/src/command.rs b/utils/frame/benchmarking-cli/src/command.rs
index 00a2e7bd7f94..8a6a39f045c6 100644
--- a/utils/frame/benchmarking-cli/src/command.rs
+++ b/utils/frame/benchmarking-cli/src/command.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/utils/frame/benchmarking-cli/src/lib.rs b/utils/frame/benchmarking-cli/src/lib.rs
index b89bceeb953c..ba1a52aa3644 100644
--- a/utils/frame/benchmarking-cli/src/lib.rs
+++ b/utils/frame/benchmarking-cli/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/utils/frame/benchmarking-cli/src/writer.rs b/utils/frame/benchmarking-cli/src/writer.rs
index 4afc81073067..bde0be25d036 100644
--- a/utils/frame/benchmarking-cli/src/writer.rs
+++ b/utils/frame/benchmarking-cli/src/writer.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/utils/frame/frame-utilities-cli/src/lib.rs b/utils/frame/frame-utilities-cli/src/lib.rs
index 872cfc99a63d..2d6bf4ab9d8f 100644
--- a/utils/frame/frame-utilities-cli/src/lib.rs
+++ b/utils/frame/frame-utilities-cli/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/utils/frame/frame-utilities-cli/src/module_id.rs b/utils/frame/frame-utilities-cli/src/module_id.rs
index ae26f31ad24f..187c2de1dd6d 100644
--- a/utils/frame/frame-utilities-cli/src/module_id.rs
+++ b/utils/frame/frame-utilities-cli/src/module_id.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/utils/frame/rpc/support/src/lib.rs b/utils/frame/rpc/support/src/lib.rs
index 85cb433cb2b3..417f2bfc22ac 100644
--- a/utils/frame/rpc/support/src/lib.rs
+++ b/utils/frame/rpc/support/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/utils/frame/rpc/system/src/lib.rs b/utils/frame/rpc/system/src/lib.rs
index cefe39534a16..db19652507b9 100644
--- a/utils/frame/rpc/system/src/lib.rs
+++ b/utils/frame/rpc/system/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/utils/prometheus/src/lib.rs b/utils/prometheus/src/lib.rs
index 097073239c41..d7cdfcd0443b 100644
--- a/utils/prometheus/src/lib.rs
+++ b/utils/prometheus/src/lib.rs
@@ -1,18 +1,19 @@
-// Copyright 2019 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 use futures_util::{FutureExt, future::Future};
 pub use prometheus::{
diff --git a/utils/prometheus/src/networking.rs b/utils/prometheus/src/networking.rs
index 92b9fedf6c79..48ae8a23297c 100644
--- a/utils/prometheus/src/networking.rs
+++ b/utils/prometheus/src/networking.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/utils/prometheus/src/sourced.rs b/utils/prometheus/src/sourced.rs
index 58f60e4969bb..014bdb30f8ab 100644
--- a/utils/prometheus/src/sourced.rs
+++ b/utils/prometheus/src/sourced.rs
@@ -1,18 +1,19 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
-// Substrate is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Substrate is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Metrics that are collected from existing sources.
 
diff --git a/utils/wasm-builder/src/builder.rs b/utils/wasm-builder/src/builder.rs
index 75e1d8057201..8ef6c95324c7 100644
--- a/utils/wasm-builder/src/builder.rs
+++ b/utils/wasm-builder/src/builder.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/utils/wasm-builder/src/lib.rs b/utils/wasm-builder/src/lib.rs
index 573afbfcb6dc..0a3c856344dc 100644
--- a/utils/wasm-builder/src/lib.rs
+++ b/utils/wasm-builder/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/utils/wasm-builder/src/prerequisites.rs b/utils/wasm-builder/src/prerequisites.rs
index 3df2707d1d44..5dedcc4641a7 100644
--- a/utils/wasm-builder/src/prerequisites.rs
+++ b/utils/wasm-builder/src/prerequisites.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/utils/wasm-builder/src/wasm_project.rs b/utils/wasm-builder/src/wasm_project.rs
index 4c4c80e5a866..73dc2e13af34 100644
--- a/utils/wasm-builder/src/wasm_project.rs
+++ b/utils/wasm-builder/src/wasm_project.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");

From d972eb143317001415747f50921ae7a1af29b8b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Mon, 4 Jan 2021 12:15:17 +0100
Subject: [PATCH 0219/1194] contracts: Allow runtime authors to define a chain
 extension (#7548)

* Make host functions return TrapReason

This avoids the need to manually store any trap reasons
to the `Runtime` from the host function. This adds the following
benefits:

* It properly composes with the upcoming chain extensions
* Missing to set a trap value is now a compile error

* Add chain extension

The chain extension is a way for the contract author to add new
host functions for contracts to call.

* Add tests for chain extensions

* Fix regression in set_rent.wat fixture

Not all offsets where properly updated when changing the fixtures
for the new salt on instantiate.

* Pre-charge a weight amount based off the specified length

* Improve fn write docs

* Renamed state to phantom

* Fix typo
---
 bin/node/runtime/src/lib.rs                  |   1 +
 frame/contracts/fixtures/chain_extension.wat |  46 +++
 frame/contracts/fixtures/set_rent.wat        |   6 +-
 frame/contracts/src/chain_extension.rs       | 393 +++++++++++++++++++
 frame/contracts/src/gas.rs                   |  28 +-
 frame/contracts/src/lib.rs                   |   9 +
 frame/contracts/src/tests.rs                 | 201 ++++++++++
 frame/contracts/src/wasm/mod.rs              |   3 +-
 frame/contracts/src/wasm/prepare.rs          |  15 +-
 frame/contracts/src/wasm/runtime.rs          | 103 ++++-
 10 files changed, 768 insertions(+), 37 deletions(-)
 create mode 100644 frame/contracts/fixtures/chain_extension.wat
 create mode 100644 frame/contracts/src/chain_extension.rs

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 206008624345..45f47f904e75 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -734,6 +734,7 @@ impl pallet_contracts::Config for Runtime {
 	type MaxValueSize = MaxValueSize;
 	type WeightPrice = pallet_transaction_payment::Module<Self>;
 	type WeightInfo = pallet_contracts::weights::SubstrateWeight<Self>;
+	type ChainExtension = ();
 }
 
 impl pallet_sudo::Config for Runtime {
diff --git a/frame/contracts/fixtures/chain_extension.wat b/frame/contracts/fixtures/chain_extension.wat
new file mode 100644
index 000000000000..db7e83fd96b4
--- /dev/null
+++ b/frame/contracts/fixtures/chain_extension.wat
@@ -0,0 +1,46 @@
+;; Call chain extension by passing through input and output of this contract
+(module
+	(import "seal0" "seal_call_chain_extension"
+		(func $seal_call_chain_extension (param i32 i32 i32 i32 i32) (result i32))
+	)
+	(import "seal0" "seal_input" (func $seal_input (param i32 i32)))
+	(import "seal0" "seal_return" (func $seal_return (param i32 i32 i32)))
+	(import "env" "memory" (memory 16 16))
+
+	(func $assert (param i32)
+		(block $ok
+			(br_if $ok (get_local 0))
+			(unreachable)
+		)
+	)
+
+	;; [0, 4) len of input output
+	(data (i32.const 0) "\02")
+
+	;; [4, 12) buffer for input
+
+	;; [12, 16) len of output buffer
+	(data (i32.const 12) "\02")
+
+	;; [16, inf) buffer for output
+
+	(func (export "deploy"))
+
+	(func (export "call")
+		(call $seal_input (i32.const 4) (i32.const 0))
+
+		;; the chain extension passes through the input and returns it as output
+		(call $seal_call_chain_extension
+			(i32.load8_u (i32.const 4))	;; func_id
+			(i32.const 4)				;; input_ptr
+			(i32.load (i32.const 0))	;; input_len
+			(i32.const 16)				;; output_ptr
+			(i32.const 12)				;; output_len_ptr
+		)
+
+		;; the chain extension passes through the func_id
+		(call $assert (i32.eq (i32.load8_u (i32.const 4))))
+
+		(call $seal_return (i32.const 0) (i32.const 16) (i32.load (i32.const 12)))
+	)
+)
diff --git a/frame/contracts/fixtures/set_rent.wat b/frame/contracts/fixtures/set_rent.wat
index 1c6b512cc77a..4abb7ffe9dbb 100644
--- a/frame/contracts/fixtures/set_rent.wat
+++ b/frame/contracts/fixtures/set_rent.wat
@@ -84,11 +84,11 @@
 		)
 		(i32.store (i32.const 128) (i32.const 64))
 		(call $seal_input
-			(i32.const 104)
-			(i32.const 100)
+			(i32.const 132)
+			(i32.const 128)
 		)
 		(call $seal_set_rent_allowance
-			(i32.const 104)
+			(i32.const 132)
 			(i32.load (i32.const 128))
 		)
 	)
diff --git a/frame/contracts/src/chain_extension.rs b/frame/contracts/src/chain_extension.rs
new file mode 100644
index 000000000000..662cfb2053e6
--- /dev/null
+++ b/frame/contracts/src/chain_extension.rs
@@ -0,0 +1,393 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! A mechanism for runtime authors to augment the functionality of contracts.
+//!
+//! The runtime is able to call into any contract and retrieve the result using
+//! [`bare_call`](crate::Module::bare_call). This already allows customization of runtime
+//! behaviour by user generated code (contracts). However, often it is more straightforward
+//! to allow the reverse behaviour: The contract calls into the runtime. We call the latter
+//! one a "chain extension" because it allows the chain to extend the set of functions that are
+//! callable by a contract.
+//!
+//! In order to create a chain extension the runtime author implements the [`ChainExtension`]
+//! trait and declares it in this pallet's [configuration Trait](crate::Config). All types
+//! required for this endeavour are defined or re-exported in this module. There is an
+//! implementation on `()` which can be used to signal that no chain extension is available.
+//!
+//! # Security
+//!
+//! The chain author alone is responsible for the security of the chain extension.
+//! This includes avoiding the exposure of exploitable functions and charging the
+//! appropriate amount of weight. In order to do so benchmarks must be written and the
+//! [`charge_weight`](Environment::charge_weight) function must be called **before**
+//! carrying out any action that causes the consumption of the chargeable weight.
+//! It cannot be overstated how delicate of a process the creation of a chain extension
+//! is. Check whether using [`bare_call`](crate::Module::bare_call) suffices for the
+//! use case at hand.
+//!
+//! # Benchmarking
+//!
+//! The builtin contract callable functions that pallet-contracts provides all have
+//! benchmarks that determine the correct weight that an invocation of these functions
+//! induces. In order to be able to charge the correct weight for the functions defined
+//! by a chain extension benchmarks must be written, too. In the near future this crate
+//! will provide the means for easier creation of those specialized benchmarks.
+
+use crate::{
+	Error,
+	wasm::{Runtime, RuntimeToken},
+};
+use codec::Decode;
+use frame_support::weights::Weight;
+use sp_runtime::DispatchError;
+use sp_std::{
+	marker::PhantomData,
+	vec::Vec,
+};
+
+pub use frame_system::Config as SysConfig;
+pub use pallet_contracts_primitives::ReturnFlags;
+pub use sp_core::crypto::UncheckedFrom;
+pub use crate::exec::Ext;
+pub use state::Init as InitState;
+
+/// Result that returns a [`DispatchError`] on error.
+pub type Result<T> = sp_std::result::Result<T, DispatchError>;
+
+/// A trait used to extend the set of contract callable functions.
+///
+/// In order to create a custom chain extension this trait must be implemented and supplied
+/// to the pallet contracts configuration trait as the associated type of the same name.
+/// Consult the [module documentation](self) for a general explanation of chain extensions.
+pub trait ChainExtension {
+	/// Call the chain extension logic.
+	///
+	/// This is the only function that needs to be implemented in order to write a
+	/// chain extensions. It is called whenever a contract calls the `seal_call_chain_extension`
+	/// imported wasm function.
+	///
+	/// # Parameters
+	/// - `func_id`: The first argument to `seal_call_chain_extension`. Usually used to
+	///		determine which function to realize.
+	/// - `env`: Access to the remaining arguments and the execution environment.
+	///
+	/// # Return
+	///
+	/// In case of `Err` the contract execution is immediatly suspended and the passed error
+	/// is returned to the caller. Otherwise the value of [`RetVal`] determines the exit
+	/// behaviour.
+	fn call<E: Ext>(func_id: u32, env: Environment<E, InitState>) -> Result<RetVal>
+	where
+		<E::T as SysConfig>::AccountId: UncheckedFrom<<E::T as SysConfig>::Hash> + AsRef<[u8]>;
+
+	/// Determines whether chain extensions are enabled for this chain.
+	///
+	/// The default implementation returns `true`. Therefore it is not necessary to overwrite
+	/// this function when implementing a chain extension. In case of `false` the deployment of
+	/// a contract that references `seal_call_chain_extension` will be denied and calling this
+	/// function will return [`NoChainExtension`](Error::NoChainExtension) without first calling
+	/// into [`call`](Self::call).
+	fn enabled() -> bool {
+		true
+	}
+}
+
+/// Implementation that indicates that no chain extension is available.
+impl ChainExtension for () {
+	fn call<E: Ext>(_func_id: u32, mut _env: Environment<E, InitState>) -> Result<RetVal>
+	where
+		<E::T as SysConfig>::AccountId: UncheckedFrom<<E::T as SysConfig>::Hash> + AsRef<[u8]>,
+	{
+		// Never called since [`Self::enabled()`] is set to `false`. Because we want to
+		// avoid panics at all costs we supply a sensible error value here instead
+		// of an `unimplemented!`.
+		Err(Error::<E::T>::NoChainExtension.into())
+	}
+
+	fn enabled() -> bool {
+		false
+	}
+}
+
+/// Determines the exit behaviour and return value of a chain extension.
+pub enum RetVal {
+	/// The chain extensions returns the supplied value to its calling contract.
+	Converging(u32),
+	/// The control does **not** return to the calling contract.
+	///
+	/// Use this to stop the execution of the contract when the chain extension returns.
+	/// The semantic is the same as for calling `seal_return`: The control returns to
+	/// the caller of the currently executing contract yielding the supplied buffer and
+	/// flags.
+	Diverging{flags: ReturnFlags, data: Vec<u8>},
+}
+
+/// Grants the chain extension access to its parameters and execution environment.
+///
+/// It uses the typestate pattern to enforce the correct usage of the parameters passed
+/// to the chain extension.
+pub struct Environment<'a, 'b, E: Ext, S: state::State> {
+	/// The actual data of this type.
+	inner: Inner<'a, 'b, E>,
+	/// `S` is only used in the type system but never as value.
+	phantom: PhantomData<S>,
+}
+
+/// Functions that are available in every state of this type.
+impl<'a, 'b, E: Ext, S: state::State> Environment<'a, 'b, E, S>
+where
+	<E::T as SysConfig>::AccountId: UncheckedFrom<<E::T as SysConfig>::Hash> + AsRef<[u8]>,
+{
+	/// Charge the passed `amount` of weight from the overall limit.
+	///
+	/// It returns `Ok` when there the remaining weight budget is larger than the passed
+	/// `weight`. It returns `Err` otherwise. In this case the chain extension should
+	/// abort the execution and pass through the error.
+	///
+	/// # Note
+	///
+	/// Weight is synonymous with gas in substrate.
+	pub fn charge_weight(&mut self, amount: Weight) -> Result<()> {
+		self.inner.runtime.charge_gas(RuntimeToken::ChainExtension(amount)).map(|_| ())
+	}
+
+	/// Grants access to the execution environment of the current contract call.
+	///
+	/// Consult the functions on the returned type before re-implementing those functions.
+	pub fn ext(&mut self) -> &mut E {
+		self.inner.runtime.ext()
+	}
+}
+
+/// Functions that are only available in the initial state of this type.
+///
+/// Those are the functions that determine how the arguments to the chain extensions
+/// should be consumed.
+impl<'a, 'b, E: Ext> Environment<'a, 'b, E, state::Init> {
+	/// Creates a new environment for consumption by a chain extension.
+	///
+	/// It is only available to this crate because only the wasm runtime module needs to
+	/// ever create this type. Chain extensions merely consume it.
+	pub(crate) fn new(
+		runtime: &'a mut Runtime::<'b, E>,
+		input_ptr: u32,
+		input_len: u32,
+		output_ptr: u32,
+		output_len_ptr: u32,
+	) -> Self {
+		Environment {
+			inner: Inner {
+				runtime,
+				input_ptr,
+				input_len,
+				output_ptr,
+				output_len_ptr,
+			},
+			phantom: PhantomData,
+		}
+	}
+
+	/// Use all arguments as integer values.
+	pub fn only_in(self) -> Environment<'a, 'b, E, state::OnlyIn> {
+		Environment {
+			inner: self.inner,
+			phantom: PhantomData,
+		}
+	}
+
+	/// Use input arguments as integer and output arguments as pointer to a buffer.
+	pub fn prim_in_buf_out(self) -> Environment<'a, 'b, E, state::PrimInBufOut> {
+		Environment {
+			inner: self.inner,
+			phantom: PhantomData,
+		}
+	}
+
+	/// Use input and output arguments as pointers to a buffer.
+	pub fn buf_in_buf_out(self) -> Environment<'a, 'b, E, state::BufInBufOut> {
+		Environment {
+			inner: self.inner,
+			phantom: PhantomData,
+		}
+	}
+}
+
+/// Functions to use the input arguments as integers.
+impl<'a, 'b, E: Ext, S: state::PrimIn> Environment<'a, 'b, E, S> {
+	/// The `input_ptr` argument.
+	pub fn val0(&self) -> u32 {
+		self.inner.input_ptr
+	}
+
+	/// The `input_len` argument.
+	pub fn val1(&self) -> u32 {
+		self.inner.input_len
+	}
+}
+
+/// Functions to use the output arguments as integers.
+impl<'a, 'b, E: Ext, S: state::PrimOut> Environment<'a, 'b, E, S> {
+	/// The `output_ptr` argument.
+	pub fn val2(&self) -> u32 {
+		self.inner.output_ptr
+	}
+
+	/// The `output_len_ptr` argument.
+	pub fn val3(&self) -> u32 {
+		self.inner.output_len_ptr
+	}
+}
+
+/// Functions to use the input arguments as pointer to a buffer.
+impl<'a, 'b, E: Ext, S: state::BufIn> Environment<'a, 'b, E, S>
+where
+	<E::T as SysConfig>::AccountId: UncheckedFrom<<E::T as SysConfig>::Hash> + AsRef<[u8]>,
+{
+	/// Reads `min(max_len, in_len)` from contract memory.
+	///
+	/// This does **not** charge any weight. The caller must make sure that the an
+	/// appropriate amount of weight is charged **before** reading from contract memory.
+	/// The reason for that is that usually the costs for reading data and processing
+	/// said data cannot be separated in a benchmark. Therefore a chain extension would
+	/// charge the overall costs either using `max_len` (worst case approximation) or using
+	/// [`in_len()`](Self::in_len).
+	pub fn read(&self, max_len: u32) -> Result<Vec<u8>> {
+		self.inner.runtime.read_sandbox_memory(
+			self.inner.input_ptr,
+			self.inner.input_len.min(max_len),
+		)
+	}
+
+	/// Reads `min(buffer.len(), in_len) from contract memory.
+	///
+	/// This takes a mutable pointer to a buffer fills it with data and shrinks it to
+	/// the size of the actual data. Apart from supporting pre-allocated buffers it is
+	/// equivalent to to [`read()`](Self::read).
+	pub fn read_into(&self, buffer: &mut &mut [u8]) -> Result<()> {
+		let len = buffer.len();
+		let sliced = {
+			let buffer = core::mem::take(buffer);
+			&mut buffer[..len.min(self.inner.input_len as usize)]
+		};
+		self.inner.runtime.read_sandbox_memory_into_buf(
+			self.inner.input_ptr,
+			sliced,
+		)?;
+		*buffer = sliced;
+		Ok(())
+	}
+
+	/// Reads `in_len` from contract memory and scale decodes it.
+	///
+	/// This function is secure and recommended for all input types of fixed size
+	/// as long as the cost of reading the memory is included in the overall already charged
+	/// weight of the chain extension. This should usually be the case when fixed input types
+	/// are used. Non fixed size types (like everything using `Vec`) usually need to use
+	/// [`in_len()`](Self::in_len) in order to properly charge the necessary weight.
+	pub fn read_as<T: Decode>(&mut self) -> Result<T> {
+		self.inner.runtime.read_sandbox_memory_as(
+			self.inner.input_ptr,
+			self.inner.input_len,
+		)
+	}
+
+	/// The length of the input as passed in as `input_len`.
+	///
+	/// A chain extension would use this value to calculate the dynamic part of its
+	/// weight. For example a chain extension that calculates the hash of some passed in
+	/// bytes would use `in_len` to charge the costs of hashing that amount of bytes.
+	/// This also subsumes the act of copying those bytes as a benchmarks measures both.
+	pub fn in_len(&self) -> u32 {
+		self.inner.input_len
+	}
+}
+
+/// Functions to use the output arguments as pointer to a buffer.
+impl<'a, 'b, E: Ext, S: state::BufOut> Environment<'a, 'b, E, S>
+where
+	<E::T as SysConfig>::AccountId: UncheckedFrom<<E::T as SysConfig>::Hash> + AsRef<[u8]>,
+{
+	/// Write the supplied buffer to contract memory.
+	///
+	/// If the contract supplied buffer is smaller than the passed `buffer` an `Err` is returned.
+	/// If `allow_skip` is set to true the contract is allowed to skip the copying of the buffer
+	/// by supplying the guard value of [`u32::max_value()`] as `out_ptr`. The
+	/// `weight_per_byte` is only charged when the write actually happens and is not skipped or
+	/// failed due to a too small output buffer.
+	pub fn write(
+		&mut self,
+		buffer: &[u8],
+		allow_skip: bool,
+		weight_per_byte: Option<Weight>,
+	) -> Result<()> {
+		self.inner.runtime.write_sandbox_output(
+			self.inner.output_ptr,
+			self.inner.output_len_ptr,
+			buffer,
+			allow_skip,
+			|len| {
+				weight_per_byte.map(|w| RuntimeToken::ChainExtension(w.saturating_mul(len.into())))
+			},
+		)
+	}
+}
+
+/// The actual data of an `Environment`.
+///
+/// All data is put into this struct to easily pass it around as part of the typestate
+/// pattern. Also it creates the opportunity to box this struct in the future in case it
+/// gets too large.
+struct Inner<'a, 'b, E: Ext> {
+	/// The runtime contains all necessary functions to interact with the running contract.
+	runtime: &'a mut Runtime::<'b, E>,
+	/// Verbatim argument passed to `seal_call_chain_extension`.
+	input_ptr: u32,
+	/// Verbatim argument passed to `seal_call_chain_extension`.
+	input_len: u32,
+	/// Verbatim argument passed to `seal_call_chain_extension`.
+	output_ptr: u32,
+	/// Verbatim argument passed to `seal_call_chain_extension`.
+	output_len_ptr: u32,
+}
+
+/// Private submodule with public types to prevent other modules from naming them.
+mod state {
+	pub trait State {}
+
+	pub trait PrimIn: State {}
+	pub trait PrimOut: State {}
+	pub trait BufIn: State {}
+	pub trait BufOut: State {}
+
+	pub enum Init {}
+	pub enum OnlyIn {}
+	pub enum PrimInBufOut {}
+	pub enum BufInBufOut {}
+
+	impl State for Init {}
+	impl State for OnlyIn {}
+	impl State for PrimInBufOut {}
+	impl State for BufInBufOut {}
+
+	impl PrimIn for OnlyIn {}
+	impl PrimOut for OnlyIn {}
+	impl PrimIn for PrimInBufOut {}
+	impl BufOut for PrimInBufOut {}
+	impl BufIn for BufInBufOut {}
+	impl BufOut for BufInBufOut {}
+}
diff --git a/frame/contracts/src/gas.rs b/frame/contracts/src/gas.rs
index 949f970f03be..9bb6185e558a 100644
--- a/frame/contracts/src/gas.rs
+++ b/frame/contracts/src/gas.rs
@@ -32,7 +32,7 @@ pub type Gas = frame_support::weights::Weight;
 #[must_use]
 #[derive(Debug, PartialEq, Eq)]
 pub enum GasMeterResult {
-	Proceed,
+	Proceed(ChargedAmount),
 	OutOfGas,
 }
 
@@ -40,11 +40,20 @@ impl GasMeterResult {
 	pub fn is_out_of_gas(&self) -> bool {
 		match *self {
 			GasMeterResult::OutOfGas => true,
-			GasMeterResult::Proceed => false,
+			GasMeterResult::Proceed(_) => false,
 		}
 	}
 }
 
+#[derive(Debug, PartialEq, Eq)]
+pub struct ChargedAmount(Gas);
+
+impl ChargedAmount {
+	pub fn amount(&self) -> Gas {
+		self.0
+	}
+}
+
 #[cfg(not(test))]
 pub trait TestAuxiliaries {}
 #[cfg(not(test))]
@@ -139,17 +148,18 @@ impl<T: Config> GasMeter<T> {
 		self.gas_left = new_value.unwrap_or_else(Zero::zero);
 
 		match new_value {
-			Some(_) => GasMeterResult::Proceed,
+			Some(_) => GasMeterResult::Proceed(ChargedAmount(amount)),
 			None => GasMeterResult::OutOfGas,
 		}
 	}
 
-	// Account for not fully used gas.
-	//
-	// This can be used after dispatching a runtime call to refund gas that was not
-	// used by the dispatchable.
-	pub fn refund(&mut self, gas: Gas) {
-		self.gas_left = self.gas_left.saturating_add(gas).max(self.gas_limit);
+	/// Refund previously charged gas back to the gas meter.
+	///
+	/// This can be used if a gas worst case estimation must be charged before
+	/// performing a certain action. This way the difference can be refundend when
+	/// the worst case did not happen.
+	pub fn refund(&mut self, amount: ChargedAmount) {
+		self.gas_left = self.gas_left.saturating_add(amount.0).min(self.gas_limit)
 	}
 
 	/// Allocate some amount of gas and perform some work with
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index 1be5b8f44843..ad694b0c877b 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -89,6 +89,8 @@ mod wasm;
 mod rent;
 mod benchmarking;
 mod schedule;
+
+pub mod chain_extension;
 pub mod weights;
 
 #[cfg(test)]
@@ -320,6 +322,9 @@ pub trait Config: frame_system::Config {
 	/// Describes the weights of the dispatchables of this module and is also used to
 	/// construct a default cost schedule.
 	type WeightInfo: WeightInfo;
+
+	/// Type that allows the runtime authors to add new host functions for a contract to call.
+	type ChainExtension: chain_extension::ChainExtension;
 }
 
 decl_error! {
@@ -387,6 +392,10 @@ decl_error! {
 		TooManyTopics,
 		/// The topics passed to `seal_deposit_events` contains at least one duplicate.
 		DuplicateTopics,
+		/// The chain does not provide a chain extension. Calling the chain extension results
+		/// in this error. Note that this usually  shouldn't happen as deploying such contracts
+		/// is rejected.
+		NoChainExtension,
 	}
 }
 
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index e9307e14b63d..1f069a9b4652 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -19,6 +19,10 @@ use crate::{
 	BalanceOf, ContractInfo, ContractInfoOf, GenesisConfig, Module,
 	RawAliveContractInfo, RawEvent, Config, Schedule, gas::Gas,
 	Error, ConfigCache, RuntimeReturnCode, storage::Storage,
+	chain_extension::{
+		Result as ExtensionResult, Environment, ChainExtension, Ext, SysConfig, RetVal,
+		UncheckedFrom, InitState, ReturnFlags,
+	},
 	exec::AccountIdOf,
 };
 use assert_matches::assert_matches;
@@ -101,6 +105,85 @@ pub mod test_utils {
 	}
 }
 
+thread_local! {
+	static TEST_EXTENSION: sp_std::cell::RefCell<TestExtension> = Default::default();
+}
+
+pub struct TestExtension {
+	enabled: bool,
+	last_seen_buffer: Vec<u8>,
+	last_seen_inputs: (u32, u32, u32, u32),
+}
+
+impl TestExtension {
+	fn disable() {
+		TEST_EXTENSION.with(|e| e.borrow_mut().enabled = false)
+	}
+
+	fn last_seen_buffer() -> Vec<u8> {
+		TEST_EXTENSION.with(|e| e.borrow().last_seen_buffer.clone())
+	}
+
+	fn last_seen_inputs() -> (u32, u32, u32, u32) {
+		TEST_EXTENSION.with(|e| e.borrow().last_seen_inputs.clone())
+	}
+}
+
+impl Default for TestExtension {
+	fn default() -> Self {
+		Self {
+			enabled: true,
+			last_seen_buffer: vec![],
+			last_seen_inputs: (0, 0, 0, 0),
+		}
+	}
+}
+
+impl ChainExtension for TestExtension {
+	fn call<E: Ext>(func_id: u32, env: Environment<E, InitState>) -> ExtensionResult<RetVal>
+	where
+		<E::T as SysConfig>::AccountId: UncheckedFrom<<E::T as SysConfig>::Hash> + AsRef<[u8]>,
+	{
+		match func_id {
+			0 => {
+				let mut env = env.buf_in_buf_out();
+				let input = env.read(2)?;
+				env.write(&input, false, None)?;
+				TEST_EXTENSION.with(|e| e.borrow_mut().last_seen_buffer = input);
+				Ok(RetVal::Converging(func_id))
+			},
+			1 => {
+				let env = env.only_in();
+				TEST_EXTENSION.with(|e|
+					e.borrow_mut().last_seen_inputs = (
+						env.val0(), env.val1(), env.val2(), env.val3()
+					)
+				);
+				Ok(RetVal::Converging(func_id))
+			},
+			2 => {
+				let mut env = env.buf_in_buf_out();
+				let weight = env.read(2)?[1].into();
+				env.charge_weight(weight)?;
+				Ok(RetVal::Converging(func_id))
+			},
+			3 => {
+				Ok(RetVal::Diverging{
+					flags: ReturnFlags::REVERT,
+					data: vec![42, 99],
+				})
+			},
+			_ => {
+				panic!("Passed unknown func_id to test chain extension: {}", func_id);
+			}
+		}
+	}
+
+	fn enabled() -> bool {
+		TEST_EXTENSION.with(|e| e.borrow().enabled)
+	}
+}
+
 #[derive(Clone, Eq, PartialEq, Debug)]
 pub struct Test;
 parameter_types! {
@@ -188,6 +271,7 @@ impl Config for Test {
 	type MaxValueSize = MaxValueSize;
 	type WeightPrice = Self;
 	type WeightInfo = ();
+	type ChainExtension = TestExtension;
 }
 
 type Balances = pallet_balances::Module<Test>;
@@ -1933,3 +2017,120 @@ fn instantiate_return_code() {
 
 	});
 }
+
+#[test]
+fn disabled_chain_extension_wont_deploy() {
+	let (code, _hash) = compile_module::<Test>("chain_extension").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
+		let _ = Balances::deposit_creating(&ALICE, 10 * subsistence);
+		TestExtension::disable();
+		assert_eq!(
+			Contracts::put_code(Origin::signed(ALICE), code),
+			Err("module uses chain extensions but chain extensions are disabled".into()),
+		);
+	});
+}
+
+#[test]
+fn disabled_chain_extension_errors_on_call() {
+	let (code, hash) = compile_module::<Test>("chain_extension").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
+		let _ = Balances::deposit_creating(&ALICE, 10 * subsistence);
+		assert_ok!(Contracts::put_code(Origin::signed(ALICE), code));
+		TestExtension::disable();
+		assert_ok!(
+			Contracts::instantiate(
+				Origin::signed(ALICE),
+				subsistence,
+				GAS_LIMIT,
+				hash.into(),
+				vec![],
+				vec![],
+			),
+		);
+		let addr = Contracts::contract_address(&ALICE, &hash, &[]);
+		assert_err_ignore_postinfo!(
+			Contracts::call(
+				Origin::signed(ALICE),
+				addr.clone(),
+				0,
+				GAS_LIMIT,
+				vec![],
+			),
+			Error::<Test>::NoChainExtension,
+		);
+	});
+}
+
+#[test]
+fn chain_extension_works() {
+	let (code, hash) = compile_module::<Test>("chain_extension").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
+		let _ = Balances::deposit_creating(&ALICE, 10 * subsistence);
+		assert_ok!(Contracts::put_code(Origin::signed(ALICE), code));
+		assert_ok!(
+			Contracts::instantiate(
+				Origin::signed(ALICE),
+				subsistence,
+				GAS_LIMIT,
+				hash.into(),
+				vec![],
+				vec![],
+			),
+		);
+		let addr = Contracts::contract_address(&ALICE, &hash, &[]);
+
+		// The contract takes a up to 2 byte buffer where the first byte passed is used as
+		// as func_id to the chain extension which behaves differently based on the
+		// func_id.
+
+		// 0 = read input buffer and pass it through as output
+		let result = Contracts::bare_call(
+			ALICE,
+			addr.clone(),
+			0,
+			GAS_LIMIT,
+			vec![0, 99],
+		);
+		let gas_consumed = result.gas_consumed;
+		assert_eq!(TestExtension::last_seen_buffer(), vec![0, 99]);
+		assert_eq!(result.exec_result.unwrap().data, vec![0, 99]);
+
+		// 1 = treat inputs as integer primitives and store the supplied integers
+		Contracts::bare_call(
+			ALICE,
+			addr.clone(),
+			0,
+			GAS_LIMIT,
+			vec![1],
+		).exec_result.unwrap();
+		// those values passed in the fixture
+		assert_eq!(TestExtension::last_seen_inputs(), (4, 1, 16, 12));
+
+		// 2 = charge some extra weight (amount supplied in second byte)
+		let result = Contracts::bare_call(
+			ALICE,
+			addr.clone(),
+			0,
+			GAS_LIMIT,
+			vec![2, 42],
+		);
+		assert_ok!(result.exec_result);
+		assert_eq!(result.gas_consumed, gas_consumed + 42);
+
+		// 3 = diverging chain extension call that sets flags to 0x1 and returns a fixed buffer
+		let result = Contracts::bare_call(
+			ALICE,
+			addr.clone(),
+			0,
+			GAS_LIMIT,
+			vec![3],
+		).exec_result.unwrap();
+		assert_eq!(result.flags, ReturnFlags::REVERT);
+		assert_eq!(result.data, vec![42, 99]);
+	});
+}
+
diff --git a/frame/contracts/src/wasm/mod.rs b/frame/contracts/src/wasm/mod.rs
index e150e84d3495..e295febb5147 100644
--- a/frame/contracts/src/wasm/mod.rs
+++ b/frame/contracts/src/wasm/mod.rs
@@ -34,14 +34,13 @@ mod code_cache;
 mod prepare;
 mod runtime;
 
-use self::runtime::Runtime;
 use self::code_cache::load as load_code;
 use pallet_contracts_primitives::ExecResult;
 
 pub use self::code_cache::save as save_code;
 #[cfg(feature = "runtime-benchmarks")]
 pub use self::code_cache::save_raw as save_code_raw;
-pub use self::runtime::ReturnCode;
+pub use self::runtime::{ReturnCode, Runtime, RuntimeToken};
 
 /// A prepared wasm module ready for execution.
 #[derive(Clone, Encode, Decode)]
diff --git a/frame/contracts/src/wasm/prepare.rs b/frame/contracts/src/wasm/prepare.rs
index b30feb72ede9..e03eb3d39bc1 100644
--- a/frame/contracts/src/wasm/prepare.rs
+++ b/frame/contracts/src/wasm/prepare.rs
@@ -19,10 +19,11 @@
 //! wasm module before execution. It also extracts some essential information
 //! from a module.
 
-use crate::wasm::env_def::ImportSatisfyCheck;
-use crate::wasm::PrefabWasmModule;
-use crate::{Schedule, Config};
-
+use crate::{
+	Schedule, Config,
+	chain_extension::ChainExtension,
+	wasm::{PrefabWasmModule, env_def::ImportSatisfyCheck},
+};
 use parity_wasm::elements::{self, Internal, External, MemoryType, Type, ValueType};
 use pwasm_utils;
 use sp_std::prelude::*;
@@ -355,6 +356,12 @@ impl<'a, T: Config> ContractModule<'a, T> {
 				return Err("module imports `seal_println` but debug features disabled");
 			}
 
+			if !T::ChainExtension::enabled() &&
+				import.field().as_bytes() == b"seal_call_chain_extension"
+			{
+				return Err("module uses chain extensions but chain extensions are disabled");
+			}
+
 			if import_fn_banlist.iter().any(|f| import.field().as_bytes() == *f)
 				|| !C::can_satisfy(import.field().as_bytes(), func_ty)
 			{
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index c8e142d12cc2..41ab3e390aea 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -20,7 +20,7 @@
 use crate::{
 	HostFnWeights, Schedule, Config, CodeHash, BalanceOf, Error,
 	exec::{Ext, StorageKey, TopicOf},
-	gas::{Gas, GasMeter, Token, GasMeterResult},
+	gas::{Gas, GasMeter, Token, GasMeterResult, ChargedAmount},
 	wasm::env_def::ConvertibleToWasm,
 };
 use sp_sandbox;
@@ -28,7 +28,7 @@ use parity_wasm::elements::ValueType;
 use frame_system;
 use frame_support::dispatch::DispatchError;
 use sp_std::prelude::*;
-use codec::{Decode, Encode};
+use codec::{Decode, DecodeAll, Encode};
 use sp_runtime::traits::SaturatedConversion;
 use sp_core::crypto::UncheckedFrom;
 use sp_io::hashing::{
@@ -126,7 +126,7 @@ impl<T: Into<DispatchError>> From<T> for TrapReason {
 
 #[cfg_attr(test, derive(Debug, PartialEq, Eq))]
 #[derive(Copy, Clone)]
-enum RuntimeToken {
+pub enum RuntimeToken {
 	/// Charge the gas meter with the cost of a metering block. The charged costs are
 	/// the supplied cost of the block plus the overhead of the metering itself.
 	MeteringBlock(u32),
@@ -198,6 +198,10 @@ enum RuntimeToken {
 	HashBlake256(u32),
 	/// Weight of calling `seal_hash_blake2_128` for the given input size.
 	HashBlake128(u32),
+	/// Weight charged by a chain extension through `seal_call_chain_extension`.
+	ChainExtension(u64),
+	/// Weight charged for copying data from the sandbox.
+	CopyIn(u32),
 }
 
 impl<T: Config> Token<T> for RuntimeToken
@@ -256,6 +260,8 @@ where
 				.saturating_add(s.hash_blake2_256_per_byte.saturating_mul(len.into())),
 			HashBlake128(len) => s.hash_blake2_128
 				.saturating_add(s.hash_blake2_128_per_byte.saturating_mul(len.into())),
+			ChainExtension(amount) => amount,
+			CopyIn(len) => s.return_per_byte.saturating_mul(len.into()),
 		}
 	}
 }
@@ -376,6 +382,14 @@ where
 		}
 	}
 
+	/// Get a mutable reference to the inner `Ext`.
+	///
+	/// This is mainly for the chain extension to have access to the environment the
+	/// contract is executing in.
+	pub fn ext(&mut self) -> &mut E {
+		self.ext
+	}
+
 	/// Store the reason for a host function triggered trap.
 	///
 	/// This is called by the `define_env` macro in order to store any error returned by
@@ -388,12 +402,12 @@ where
 	/// Charge the gas meter with the specified token.
 	///
 	/// Returns `Err(HostError)` if there is not enough gas.
-	fn charge_gas<Tok>(&mut self, token: Tok) -> Result<(), DispatchError>
+	pub fn charge_gas<Tok>(&mut self, token: Tok) -> Result<ChargedAmount, DispatchError>
 	where
 		Tok: Token<E::T, Metadata=HostFnWeights<E::T>>,
 	{
 		match self.gas_meter.charge(&self.schedule.host_fn_weights, token) {
-			GasMeterResult::Proceed => Ok(()),
+			GasMeterResult::Proceed(amount) => Ok(amount),
 			GasMeterResult::OutOfGas => Err(Error::<E::T>::OutOfGas.into())
 		}
 	}
@@ -403,7 +417,7 @@ where
 	/// Returns `Err` if one of the following conditions occurs:
 	///
 	/// - requested buffer is not within the bounds of the sandbox memory.
-	fn read_sandbox_memory(&self, ptr: u32, len: u32)
+	pub fn read_sandbox_memory(&self, ptr: u32, len: u32)
 	-> Result<Vec<u8>, DispatchError>
 	{
 		let mut buf = vec![0u8; len as usize];
@@ -417,7 +431,7 @@ where
 	/// Returns `Err` if one of the following conditions occurs:
 	///
 	/// - requested buffer is not within the bounds of the sandbox memory.
-	fn read_sandbox_memory_into_buf(&self, ptr: u32, buf: &mut [u8])
+	pub fn read_sandbox_memory_into_buf(&self, ptr: u32, buf: &mut [u8])
 	-> Result<(), DispatchError>
 	{
 		self.memory.get(ptr, buf).map_err(|_| Error::<E::T>::OutOfBounds.into())
@@ -429,20 +443,29 @@ where
 	///
 	/// - requested buffer is not within the bounds of the sandbox memory.
 	/// - the buffer contents cannot be decoded as the required type.
-	fn read_sandbox_memory_as<D: Decode>(&self, ptr: u32, len: u32)
+	///
+	/// # Note
+	///
+	/// It is safe to forgo benchmarking and charging weight relative to `len` for fixed
+	/// size types (basically everything not containing a heap collection):
+	/// Despite the fact that we are usually about to read the encoding of a fixed size
+	/// type, we cannot know the encoded size of that type. We therefore are required to
+	/// use the length provided by the contract. This length is untrusted and therefore
+	/// we charge weight relative to the provided size upfront that covers the copy costs.
+	/// On success this cost is refunded as the copying was already covered in the
+	/// overall cost of the host function. This is different from `read_sandbox_memory`
+	/// where the size is dynamic and the costs resulting from that dynamic size must
+	/// be charged relative to this dynamic size anyways (before reading) by constructing
+	/// the benchmark for that.
+	pub fn read_sandbox_memory_as<D: Decode>(&mut self, ptr: u32, len: u32)
 	-> Result<D, DispatchError>
 	{
+		let amount = self.charge_gas(RuntimeToken::CopyIn(len))?;
 		let buf = self.read_sandbox_memory(ptr, len)?;
-		D::decode(&mut &buf[..]).map_err(|_| Error::<E::T>::DecodingFailed.into())
-	}
-
-	/// Write the given buffer to the designated location in the sandbox memory.
-	///
-	/// Returns `Err` if one of the following conditions occurs:
-	///
-	/// - designated area is not within the bounds of the sandbox memory.
-	fn write_sandbox_memory(&mut self, ptr: u32, buf: &[u8]) -> Result<(), DispatchError> {
-		self.memory.set(ptr, buf).map_err(|_| Error::<E::T>::OutOfBounds.into())
+		let decoded = D::decode_all(&mut &buf[..])
+			.map_err(|_| DispatchError::from(Error::<E::T>::DecodingFailed))?;
+		self.gas_meter.refund(amount);
+		Ok(decoded)
 	}
 
 	/// Write the given buffer and its length to the designated locations in sandbox memory and
@@ -464,7 +487,7 @@ where
 	///
 	/// In addition to the error conditions of `write_sandbox_memory` this functions returns
 	/// `Err` if the size of the buffer located at `out_ptr` is too small to fit `buf`.
-	fn write_sandbox_output(
+	pub fn write_sandbox_output(
 		&mut self,
 		out_ptr: u32,
 		out_len_ptr: u32,
@@ -496,6 +519,15 @@ where
 		Ok(())
 	}
 
+	/// Write the given buffer to the designated location in the sandbox memory.
+	///
+	/// Returns `Err` if one of the following conditions occurs:
+	///
+	/// - designated area is not within the bounds of the sandbox memory.
+	fn write_sandbox_memory(&mut self, ptr: u32, buf: &[u8]) -> Result<(), DispatchError> {
+		self.memory.set(ptr, buf).map_err(|_| Error::<E::T>::OutOfBounds.into())
+	}
+
 	/// Computes the given hash function on the supplied input.
 	///
 	/// Reads from the sandboxed input buffer into an intermediate buffer.
@@ -1362,4 +1394,37 @@ define_env!(Env, <E: Ext>,
 		ctx.charge_gas(RuntimeToken::HashBlake128(input_len))?;
 		Ok(ctx.compute_hash_on_intermediate_buffer(blake2_128, input_ptr, input_len, output_ptr)?)
 	},
+
+	// Call into the chain extension provided by the chain if any.
+	//
+	// Handling of the input values is up to the specific chain extension and so is the
+	// return value. The extension can decide to use the inputs as primitive inputs or as
+	// in/out arguments by interpreting them as pointers. Any caller of this function
+	// must therefore coordinate with the chain that it targets.
+	//
+	// # Note
+	//
+	// If no chain extension exists the contract will trap with the `NoChainExtension`
+	// module error.
+	seal_call_chain_extension(
+		ctx,
+		func_id: u32,
+		input_ptr: u32,
+		input_len: u32,
+		output_ptr: u32,
+		output_len_ptr: u32
+	) -> u32 => {
+		use crate::chain_extension::{ChainExtension, Environment, RetVal};
+		if <E::T as Config>::ChainExtension::enabled() == false {
+			Err(Error::<E::T>::NoChainExtension)?;
+		}
+		let env = Environment::new(ctx, input_ptr, input_len, output_ptr, output_len_ptr);
+		match <E::T as Config>::ChainExtension::call(func_id, env)? {
+			RetVal::Converging(val) => Ok(val),
+			RetVal::Diverging{flags, data} => Err(TrapReason::Return(ReturnData {
+				flags: flags.bits(),
+				data,
+			})),
+		}
+	},
 );

From 28ffe375838bc918efd348cc18cc4a46b364e949 Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Mon, 4 Jan 2021 12:54:51 +0100
Subject: [PATCH 0220/1194] *: Update to libp2p v0.33.0 (#7759)

* *: Update to libp2p v0.33.0

* client/network: Consistently track request arrival time

With https://github.com/libp2p/rust-libp2p/pull/1886/ one is guaranteed
to receive either a `ResponseSent` or a `InboundFailure` event for each
received inbound request via `RequestResponseEvent::Message`. Given this
guarantee there is no need to track arrival times in a best-effort
manner and thus there is no need to use a LRU cache for arrival times.

* client/offchain: Adjust to PeerId API changes
---
 Cargo.lock                              | 103 +++++++++++++-----------
 bin/node/browser-testing/Cargo.toml     |   2 +-
 client/authority-discovery/Cargo.toml   |   2 +-
 client/cli/Cargo.toml                   |   2 +-
 client/network-gossip/Cargo.toml        |   2 +-
 client/network/Cargo.toml               |   5 +-
 client/network/src/behaviour.rs         |   4 +-
 client/network/src/request_responses.rs |  34 +++-----
 client/network/src/service.rs           |   7 +-
 client/network/test/Cargo.toml          |   2 +-
 client/offchain/src/api.rs              |   8 +-
 client/peerset/Cargo.toml               |   2 +-
 client/telemetry/Cargo.toml             |   2 +-
 primitives/consensus/common/Cargo.toml  |   2 +-
 utils/browser/Cargo.toml                |   2 +-
 15 files changed, 88 insertions(+), 91 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ff6f679ed78b..c99c439eee60 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -716,6 +716,15 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "cipher"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801"
+dependencies = [
+ "generic-array 0.14.4",
+]
+
 [[package]]
 name = "ckb-merkle-mountain-range"
 version = "0.3.1"
@@ -2819,9 +2828,9 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
 
 [[package]]
 name = "libp2p"
-version = "0.32.2"
+version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "022cdac4ab124be12de581e591796d4dfb7d1f1eef94669d2c1eaa0e98dd2f0e"
+checksum = "2e17c636b5fe5ff900ccc2840b643074bfac321551d821243a781d0d46f06588"
 dependencies = [
  "atomic",
  "bytes 0.5.6",
@@ -2857,13 +2866,12 @@ dependencies = [
 
 [[package]]
 name = "libp2p-core"
-version = "0.25.2"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc9c96d3a606a696a3a6c0ad3c3352c57bda2082ec9090930f1bd9daf787039f"
+checksum = "e1cb706da14c064dce54d8864ade6836b3486b51689300da74eeb7053aa4551e"
 dependencies = [
  "asn1_der",
  "bs58",
- "bytes 0.5.6",
  "ed25519-dalek",
  "either",
  "fnv",
@@ -2902,9 +2910,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-deflate"
-version = "0.25.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a579d7dd506d0620ba88ccc1754436b7de35ed6c884234f9a226bbfce382640"
+checksum = "e3257a41f376aa23f237231971fee7e350e4d8353cfcf233aef34d6d6b638f0c"
 dependencies = [
  "flate2",
  "futures 0.3.8",
@@ -2913,9 +2921,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-dns"
-version = "0.25.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15dea5933f570844d7b5222b12b58f7bd52e9ca38cd65a1bd4f35341f053f012"
+checksum = "2e09bab25af01326b4ed9486d31325911437448edda30bc57681502542d49f20"
 dependencies = [
  "futures 0.3.8",
  "libp2p-core",
@@ -2924,9 +2932,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-floodsub"
-version = "0.25.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23070a0838bd9a8adb27e6eba477eeb650c498f9d139383dd0135d20a8170253"
+checksum = "6fd8cdd5ef1dd0b7346975477216d752de976b92e43051bc8bd808c372ea6cec"
 dependencies = [
  "cuckoofilter",
  "fnv",
@@ -2942,9 +2950,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-gossipsub"
-version = "0.25.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65e8f3aa0906fbad435dac23c177eef3cdfaaf62609791bd7f54f8553edcfdf9"
+checksum = "d489531aa9d4ba8726a08b3b74e21c2e10a518ad266ebca98d79040123ab0036"
 dependencies = [
  "base64 0.13.0",
  "byteorder",
@@ -2968,9 +2976,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-identify"
-version = "0.25.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "802fb973a7e0dde3fb9a2113a62bad90338ebe01983b706e1d576d0c2af93cda"
+checksum = "c43bc51a9bc3780288c526615ba0f5f8216820ea6dcc02b89e8daee526c5fccb"
 dependencies = [
  "futures 0.3.8",
  "libp2p-core",
@@ -2984,9 +2992,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-kad"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6506b7b7982f7626fc96a91bc61be4b1fe7ae9ac23824f0ecefcce21cb39238c"
+checksum = "a226956b49438a10f3206480b8faf5e61fc445c349ea9d9cc37766a83745fa9a"
 dependencies = [
  "arrayvec 0.5.2",
  "bytes 0.5.6",
@@ -3010,9 +3018,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-mdns"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b934ee03a361f317df7d75defa4177b285534c58f49d5e6e240278e13ef3f65"
+checksum = "8a9e12688e8f14008c950c1efde587cb44dbf316fa805f419cd4e524991236f5"
 dependencies = [
  "async-io",
  "data-encoding",
@@ -3031,9 +3039,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-mplex"
-version = "0.25.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae2132b14045009b0f8e577a06e1459592ef0a89dedc58f3d4baf4eac956837b"
+checksum = "ce3200fbe6608e623bd9efa459cc8bafa0e4efbb0a2dfcdd0e1387ff4181264b"
 dependencies = [
  "bytes 0.5.6",
  "futures 0.3.8",
@@ -3049,9 +3057,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-noise"
-version = "0.27.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9610a524bef4db383cd96b4ec3ec4722eafa72c7242fa89990b74166760583d"
+checksum = "0580e0d18019d254c9c349c03ff7b22e564b6f2ada70c045fc39738e144f2139"
 dependencies = [
  "bytes 0.5.6",
  "curve25519-dalek 3.0.0",
@@ -3071,9 +3079,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-ping"
-version = "0.25.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "659adf89356e04f65398bb74ee791b269e63da9e41b37f8dc19eaacd12487bfe"
+checksum = "50b2ec86a18cbf09d7df440e7786a2409640c774e476e9a3b4d031382c3d7588"
 dependencies = [
  "futures 0.3.8",
  "libp2p-core",
@@ -3086,9 +3094,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-plaintext"
-version = "0.25.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96dfe26270c91d4ff095030d1fcadd602f3fd84968ebd592829916d0715798a6"
+checksum = "6a7b1bdcbe46a3a2159c231601ed29645282653c0a96ce3a2ad8352c9fbe6800"
 dependencies = [
  "bytes 0.5.6",
  "futures 0.3.8",
@@ -3103,13 +3111,13 @@ dependencies = [
 
 [[package]]
 name = "libp2p-pnet"
-version = "0.19.2"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96b3c2d5d26a9500e959a0e19743897239a6c4be78dadf99b70414301a70c006"
+checksum = "6ce3374f3b28162db9d3442c9347c4f14cb01e8290052615c7d341d40eae0599"
 dependencies = [
  "futures 0.3.8",
  "log",
- "pin-project 0.4.27",
+ "pin-project 1.0.2",
  "rand 0.7.3",
  "salsa20",
  "sha3",
@@ -3117,9 +3125,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-request-response"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd96c3580fe59a9379ac7906c2f61c7f5ad3b7515362af0e72153a7cc9a45550"
+checksum = "620e2950decbf77554b5aed3824f7d0e2c04923f28c70f9bff1a402c47ef6b1e"
 dependencies = [
  "async-trait",
  "bytes 0.5.6",
@@ -3137,9 +3145,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-swarm"
-version = "0.25.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de333c483f27d02ecf7b6cef814a36f5e1876f15139eefb00225c405350e1c22"
+checksum = "fdf5894ee1ee63a38aa58d58a16e3dcf7ede6b59ea7b22302c00c1a41d7aec41"
 dependencies = [
  "either",
  "futures 0.3.8",
@@ -3153,9 +3161,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-tcp"
-version = "0.25.1"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc28c9ad6dc43f4c3950411cf808639d90307a076330e7996e5e94e70279bde0"
+checksum = "1d2113a7dab2b502c55fe290910cd7399a2aa04fe70a2f5a415a87a1db600c0e"
 dependencies = [
  "async-std",
  "futures 0.3.8",
@@ -3169,9 +3177,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-uds"
-version = "0.25.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d821208d4b9af4b293a56dde470edd9f9fac8bb94a51f4f5327cc29a471b3f3"
+checksum = "af05fe92c2a3aa320bc82a308ddb7b33bef3b060154c5a4b9fb0b01f15385fc0"
 dependencies = [
  "async-std",
  "futures 0.3.8",
@@ -3181,9 +3189,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-wasm-ext"
-version = "0.25.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e6ef400b231ba78e866b860445480ca21ee447e03034138c6d57cf2969d6bf4"
+checksum = "37cd44ea05a4523f40183f60ab6e6a80e400a5ddfc98b0df1c55edeb85576cd9"
 dependencies = [
  "futures 0.3.8",
  "js-sys",
@@ -3195,9 +3203,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-websocket"
-version = "0.26.3"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "522a877ce42ededf1f5dd011dbc40ea116f1776818f09dacb3d7a206f3ad6305"
+checksum = "270c80528e21089ea25b41dd1ab8fd834bdf093ebee422fed3b68699a857a083"
 dependencies = [
  "async-tls",
  "either",
@@ -3215,9 +3223,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-yamux"
-version = "0.28.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be7ac000fa3e42ac09a6e658e48de34ac8ef9fff64a4e6e6b08dcc8f4b0e5f6"
+checksum = "36799de9092c35782f080032eddbc8de870f94a0def87cf9f8883efccd5cacf0"
 dependencies = [
  "futures 0.3.8",
  "libp2p-core",
@@ -6372,11 +6380,11 @@ dependencies = [
 
 [[package]]
 name = "salsa20"
-version = "0.6.0"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7f47b10fa80f6969bbbd9c8e7cc998f082979d402a9e10579e2303a87955395"
+checksum = "399f290ffc409596022fce5ea5d4138184be4784f2b28c62c59f0d8389059a15"
 dependencies = [
- "stream-cipher",
+ "cipher",
 ]
 
 [[package]]
@@ -7101,7 +7109,6 @@ dependencies = [
  "linked-hash-map",
  "linked_hash_set",
  "log",
- "lru",
  "nohash-hasher",
  "parity-scale-codec",
  "parking_lot 0.11.1",
diff --git a/bin/node/browser-testing/Cargo.toml b/bin/node/browser-testing/Cargo.toml
index f297e624ca03..e29f104f87e4 100644
--- a/bin/node/browser-testing/Cargo.toml
+++ b/bin/node/browser-testing/Cargo.toml
@@ -8,7 +8,7 @@ license = "Apache-2.0"
 
 [dependencies]
 futures-timer = "3.0.2"
-libp2p = { version = "0.32.2", default-features = false }
+libp2p = { version = "0.33.0", default-features = false }
 jsonrpc-core = "15.0.0"
 serde = "1.0.106"
 serde_json = "1.0.48"
diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml
index 8878becd7e02..5c1d0b9d91f8 100644
--- a/client/authority-discovery/Cargo.toml
+++ b/client/authority-discovery/Cargo.toml
@@ -23,7 +23,7 @@ derive_more = "0.99.2"
 either = "1.5.3"
 futures = "0.3.4"
 futures-timer = "3.0.1"
-libp2p = { version = "0.32.2", default-features = false, features = ["kad"] }
+libp2p = { version = "0.33.0", default-features = false, features = ["kad"] }
 log = "0.4.8"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.8.0"}
 prost = "0.6.1"
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index 02d14d0d1941..cd8afb1cce1e 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -19,7 +19,7 @@ regex = "1.4.2"
 tokio = { version = "0.2.21", features = [ "signal", "rt-core", "rt-threaded", "blocking" ] }
 futures = "0.3.4"
 fdlimit = "0.2.1"
-libp2p = "0.32.2"
+libp2p = "0.33.0"
 parity-scale-codec = "1.3.0"
 hex = "0.4.2"
 rand = "0.7.3"
diff --git a/client/network-gossip/Cargo.toml b/client/network-gossip/Cargo.toml
index 5b82bd679c01..5c3990d320bb 100644
--- a/client/network-gossip/Cargo.toml
+++ b/client/network-gossip/Cargo.toml
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 futures = "0.3.4"
 futures-timer = "3.0.1"
-libp2p = { version = "0.32.2", default-features = false }
+libp2p = { version = "0.33.0", default-features = false }
 log = "0.4.8"
 lru = "0.6.1"
 sc-network = { version = "0.8.0", path = "../network" }
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index b7cb1512dd45..a300dac19bfc 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -36,7 +36,6 @@ ip_network = "0.3.4"
 linked-hash-map = "0.5.2"
 linked_hash_set = "0.1.3"
 log = "0.4.8"
-lru = "0.6.1"
 nohash-hasher = "0.2.0"
 parking_lot = "0.11.1"
 pin-project = "0.4.6"
@@ -64,13 +63,13 @@ wasm-timer = "0.2"
 zeroize = "1.2.0"
 
 [dependencies.libp2p]
-version = "0.32.2"
+version = "0.33.0"
 default-features = false
 features = ["identify", "kad", "mdns", "mplex", "noise", "ping", "request-response", "tcp-async-std", "websocket", "yamux"]
 
 [dev-dependencies]
 assert_matches = "1.3"
-libp2p = { version = "0.32.2", default-features = false }
+libp2p = { version = "0.33.0", default-features = false }
 quickcheck = "0.9.0"
 rand = "0.7.2"
 sp-keyring = { version = "2.0.0", path = "../../primitives/keyring" }
diff --git a/client/network/src/behaviour.rs b/client/network/src/behaviour.rs
index e0ca241ede2e..a7366d00e7cf 100644
--- a/client/network/src/behaviour.rs
+++ b/client/network/src/behaviour.rs
@@ -90,7 +90,7 @@ pub enum BehaviourOut<B: BlockT> {
 		protocol: Cow<'static, str>,
 		/// If `Ok`, contains the time elapsed between when we received the request and when we
 		/// sent back the response. If `Err`, the error that happened.
-		result: Result<Option<Duration>, ResponseFailure>,
+		result: Result<Duration, ResponseFailure>,
 	},
 
 	/// A request initiated using [`Behaviour::send_request`] has succeeded or failed.
@@ -419,7 +419,7 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviourEventProcess<block_requests::Event<B
 				self.events.push_back(BehaviourOut::InboundRequest {
 					peer,
 					protocol: self.block_requests.protocol_name().to_owned().into(),
-					result: Ok(Some(total_handling_time)),
+					result: Ok(total_handling_time),
 				});
 			},
 			block_requests::Event::Response { peer, response, request_duration } => {
diff --git a/client/network/src/request_responses.rs b/client/network/src/request_responses.rs
index 4cd6bc3c5c40..806c04e5f307 100644
--- a/client/network/src/request_responses.rs
+++ b/client/network/src/request_responses.rs
@@ -50,7 +50,6 @@ use libp2p::{
 		PollParameters, ProtocolsHandler,
 	},
 };
-use lru::LruCache;
 use std::{
 	borrow::Cow, collections::{hash_map::Entry, HashMap}, convert::TryFrom as _, io, iter,
 	pin::Pin, task::{Context, Poll}, time::{Duration, Instant},
@@ -129,12 +128,11 @@ pub enum Event {
 		peer: PeerId,
 		/// Name of the protocol in question.
 		protocol: Cow<'static, str>,
-		/// If `Ok`, contains the time elapsed between when we received the request and when we
-		/// sent back the response. If `Err`, the error that happened.
+		/// Whether handling the request was successful or unsuccessful.
 		///
-		/// Note: Given that response time is tracked on a best-effort basis only, `Ok(time)` can be
-		/// `None`.
-		result: Result<Option<Duration>, ResponseFailure>,
+		/// When successful contains the time elapsed between when we received the request and when
+		/// we sent back the response. When unsuccessful contains the failure reason.
+		result: Result<Duration, ResponseFailure>,
 	},
 
 	/// A request initiated using [`RequestResponsesBehaviour::send_request`] has succeeded or
@@ -164,7 +162,7 @@ pub struct RequestResponsesBehaviour {
 	>,
 
 	/// Whenever an incoming request arrives, the arrival [`Instant`] is recorded here.
-	pending_responses_arrival_time: LruCache<RequestId, Instant>,
+	pending_responses_arrival_time: HashMap<RequestId, Instant>,
 }
 
 /// Generated by the response builder and waiting to be processed.
@@ -206,7 +204,7 @@ impl RequestResponsesBehaviour {
 		Ok(Self {
 			protocols,
 			pending_responses: Default::default(),
-			pending_responses_arrival_time: LruCache::new(1_000),
+			pending_responses_arrival_time: Default::default(),
 		})
 	}
 
@@ -367,9 +365,8 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 
 				if let Some((protocol, _)) = self.protocols.get_mut(&*protocol_name) {
 					if let Err(_) = protocol.send_response(inner_channel, Ok(response)) {
-						// Note: In case this happened due to a timeout, the corresponding
-						// `RequestResponse` behaviour will emit an `InboundFailure::Timeout` event.
-						self.pending_responses_arrival_time.pop(&request_id);
+						// Note: Failure is handled further below when receiving `InboundFailure`
+						// event from `RequestResponse` behaviour.
 						log::debug!(
 							target: "sub-libp2p",
 							"Failed to send response for {:?} on protocol {:?} due to a \
@@ -425,7 +422,7 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 							peer,
 							message: RequestResponseMessage::Request { request_id, request, channel, .. },
 						} => {
-							self.pending_responses_arrival_time.put(
+							self.pending_responses_arrival_time.insert(
 								request_id.clone(),
 								Instant::now(),
 							);
@@ -495,7 +492,7 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 						// An inbound request failed, either while reading the request or due to failing
 						// to send a response.
 						RequestResponseEvent::InboundFailure { request_id, peer, error, .. } => {
-							self.pending_responses_arrival_time.pop(&request_id);
+							self.pending_responses_arrival_time.remove(&request_id);
 							let out = Event::InboundRequest {
 								peer,
 								protocol: protocol.clone(),
@@ -504,14 +501,9 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 							return Poll::Ready(NetworkBehaviourAction::GenerateEvent(out));
 						}
 						RequestResponseEvent::ResponseSent { request_id, peer } => {
-							let arrival_time = self.pending_responses_arrival_time.pop(&request_id)
-								.map(|t| t.elapsed());
-							if arrival_time.is_none() {
-								log::debug!(
-									"Expected to find arrival time for sent response. Is the LRU \
-									 cache size set too small?",
-								);
-							}
+							let arrival_time = self.pending_responses_arrival_time.remove(&request_id)
+								.map(|t| t.elapsed())
+								.expect("To find request arrival time for answered request.");
 
 							let out = Event::InboundRequest {
 								peer,
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index c2d3dcc55b8b..816f80106b8d 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -1373,14 +1373,11 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::InboundRequest { protocol, result, .. })) => {
 					if let Some(metrics) = this.metrics.as_ref() {
 						match result {
-							Ok(Some(serve_time)) => {
+							Ok(serve_time) => {
 								metrics.requests_in_success_total
 									.with_label_values(&[&protocol])
 									.observe(serve_time.as_secs_f64());
 							}
-							// Response time tracking is happening on a best-effort basis. Ignore
-							// the event in case response time could not be provided.
-							Ok(None) => {},
 							Err(err) => {
 								let reason = match err {
 									ResponseFailure::Network(InboundFailure::Timeout) => "timeout",
@@ -1388,6 +1385,8 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 										"unsupported",
 									ResponseFailure::Network(InboundFailure::ResponseOmission) =>
 										"busy-omitted",
+									ResponseFailure::Network(InboundFailure::ConnectionClosed) =>
+										"connection-closed",
 								};
 
 								metrics.requests_in_failure_total
diff --git a/client/network/test/Cargo.toml b/client/network/test/Cargo.toml
index d3036742f176..4bc46e358323 100644
--- a/client/network/test/Cargo.toml
+++ b/client/network/test/Cargo.toml
@@ -19,7 +19,7 @@ parking_lot = "0.10.0"
 futures = "0.3.4"
 futures-timer = "3.0.1"
 rand = "0.7.2"
-libp2p = { version = "0.32.2", default-features = false }
+libp2p = { version = "0.33.0", default-features = false }
 sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
 sc-consensus = { version = "0.8.0", path = "../../consensus/common" }
 sc-client-api = { version = "2.0.0", path = "../../api" }
diff --git a/client/offchain/src/api.rs b/client/offchain/src/api.rs
index 6bef7187e450..64c5060fb0c6 100644
--- a/client/offchain/src/api.rs
+++ b/client/offchain/src/api.rs
@@ -187,9 +187,9 @@ impl<Storage: OffchainStorage> OffchainExt for Api<Storage> {
 
 	fn set_authorized_nodes(&mut self, nodes: Vec<OpaquePeerId>, authorized_only: bool) {
 		let peer_ids: HashSet<PeerId> = nodes.into_iter()
-			.filter_map(|node| PeerId::from_bytes(node.0).ok())
+			.filter_map(|node| PeerId::from_bytes(&node.0).ok())
 			.collect();
-		
+
 		self.network_provider.set_authorized_peers(peer_ids);
 		self.network_provider.set_authorized_only(authorized_only);
 	}
@@ -213,7 +213,7 @@ impl NetworkState {
 
 impl From<NetworkState> for OpaqueNetworkState {
 	fn from(state: NetworkState) -> OpaqueNetworkState {
-		let enc = Encode::encode(&state.peer_id.into_bytes());
+		let enc = Encode::encode(&state.peer_id.to_bytes());
 		let peer_id = OpaquePeerId::new(enc);
 
 		let external_addresses: Vec<OpaqueMultiaddr> = state
@@ -239,7 +239,7 @@ impl TryFrom<OpaqueNetworkState> for NetworkState {
 		let inner_vec = state.peer_id.0;
 
 		let bytes: Vec<u8> = Decode::decode(&mut &inner_vec[..]).map_err(|_| ())?;
-		let peer_id = PeerId::from_bytes(bytes).map_err(|_| ())?;
+		let peer_id = PeerId::from_bytes(&bytes).map_err(|_| ())?;
 
 		let external_addresses: Result<Vec<Multiaddr>, Self::Error> = state.external_addresses
 			.iter()
diff --git a/client/peerset/Cargo.toml b/client/peerset/Cargo.toml
index 41e2033bccfc..92a4cf27753c 100644
--- a/client/peerset/Cargo.toml
+++ b/client/peerset/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 futures = "0.3.4"
-libp2p = { version = "0.32.2", default-features = false }
+libp2p = { version = "0.33.0", default-features = false }
 sp-utils = { version = "2.0.0", path = "../../primitives/utils"}
 log = "0.4.8"
 serde_json = "1.0.41"
diff --git a/client/telemetry/Cargo.toml b/client/telemetry/Cargo.toml
index 98ed63886615..de8eea442ef7 100644
--- a/client/telemetry/Cargo.toml
+++ b/client/telemetry/Cargo.toml
@@ -19,7 +19,7 @@ parking_lot = "0.10.0"
 futures = "0.3.4"
 futures-timer = "3.0.1"
 wasm-timer = "0.2.5"
-libp2p = { version = "0.32.2", default-features = false, features = ["dns", "tcp-async-std", "wasm-ext", "websocket"] }
+libp2p = { version = "0.33.0", default-features = false, features = ["dns", "tcp-async-std", "wasm-ext", "websocket"] }
 log = "0.4.8"
 pin-project = "0.4.6"
 rand = "0.7.2"
diff --git a/primitives/consensus/common/Cargo.toml b/primitives/consensus/common/Cargo.toml
index 642e047223bc..f53e80aab79b 100644
--- a/primitives/consensus/common/Cargo.toml
+++ b/primitives/consensus/common/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 thiserror = "1.0.21"
-libp2p = { version = "0.32.2", default-features = false }
+libp2p = { version = "0.33.0", default-features = false }
 log = "0.4.8"
 sp-core = { path= "../../core", version = "2.0.0"}
 sp-inherents = { version = "2.0.0", path = "../../inherents" }
diff --git a/utils/browser/Cargo.toml b/utils/browser/Cargo.toml
index 31fc1e37f3d4..96fdf5ce1912 100644
--- a/utils/browser/Cargo.toml
+++ b/utils/browser/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 futures = { version = "0.3", features = ["compat"] }
 futures01 = { package = "futures", version = "0.1.29" }
 log = "0.4.8"
-libp2p-wasm-ext = { version = "0.25", features = ["websocket"] }
+libp2p-wasm-ext = { version = "0.26", features = ["websocket"] }
 console_error_panic_hook = "0.1.6"
 console_log = "0.2.0"
 js-sys = "0.3.34"

From fcdba68bc7b6bbc960bdfb326e2a706d580aa8a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Mon, 4 Jan 2021 13:35:57 +0100
Subject: [PATCH 0221/1194] contracts: Lazy storage removal (#7740)

* Do not evict a contract from within a call stack

We don't want to trigger contract eviction automatically when
a contract is called. This is because those changes can be
reverted due to how storage transactions are used at the moment.
More Information:
https://github.com/paritytech/substrate/issues/6439#issuecomment-648754324

It can be re-introduced once the linked issue is resolved. In the meantime
`claim_surcharge` must be called to evict a contract.

* Lazily delete storage in on_initialize instead of when removing the contract

* Add missing documentation of new error

* Make Module::claim_surcharge public

It being the only dispatchable that is private is an oversight.

* review: Add final newline

* review: Simplify assert statement

* Add test that checks that partial remove of a contract works

* Premote warning to error

* Added missing docs for seal_terminate

* Lazy deletion should only take AVERAGE_ON_INITIALIZE_RATIO of the block

* Added informational about the lazy deletion throughput

* Avoid lazy deletion in case the block is already full

* Prevent queue decoding in case of an already full block

* Add test that checks that on_initialize honors block limits
---
 bin/node/runtime/src/lib.rs             |   12 +
 frame/contracts/src/benchmarking/mod.rs |   92 +-
 frame/contracts/src/exec.rs             |   29 +-
 frame/contracts/src/lib.rs              |   56 +-
 frame/contracts/src/rent.rs             |   99 +--
 frame/contracts/src/storage.rs          |  131 ++-
 frame/contracts/src/tests.rs            |  414 ++++++++-
 frame/contracts/src/wasm/runtime.rs     |    2 +
 frame/contracts/src/weights.rs          | 1038 ++++++++++++++---------
 9 files changed, 1348 insertions(+), 525 deletions(-)

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 45f47f904e75..a36448c47081 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -71,6 +71,7 @@ pub use pallet_transaction_payment::{Multiplier, TargetedFeeAdjustment, Currency
 use pallet_session::{historical as pallet_session_historical};
 use sp_inherents::{InherentData, CheckInherentsResult};
 use static_assertions::const_assert;
+use pallet_contracts::WeightInfo;
 
 #[cfg(any(feature = "std", test))]
 pub use sp_runtime::BuildStorage;
@@ -716,6 +717,15 @@ parameter_types! {
 	pub const MaxDepth: u32 = 32;
 	pub const StorageSizeOffset: u32 = 8;
 	pub const MaxValueSize: u32 = 16 * 1024;
+	// The lazy deletion runs inside on_initialize.
+	pub DeletionWeightLimit: Weight = AVERAGE_ON_INITIALIZE_RATIO *
+		RuntimeBlockWeights::get().max_block;
+	// The weight needed for decoding the queue should be less or equal than a fifth
+	// of the overall weight dedicated to the lazy deletion.
+	pub DeletionQueueDepth: u32 = ((DeletionWeightLimit::get() / (
+			<Runtime as pallet_contracts::Config>::WeightInfo::on_initialize_per_queue_item(1) -
+			<Runtime as pallet_contracts::Config>::WeightInfo::on_initialize_per_queue_item(0)
+		)) / 5) as u32;
 }
 
 impl pallet_contracts::Config for Runtime {
@@ -735,6 +745,8 @@ impl pallet_contracts::Config for Runtime {
 	type WeightPrice = pallet_transaction_payment::Module<Self>;
 	type WeightInfo = pallet_contracts::weights::SubstrateWeight<Self>;
 	type ChainExtension = ();
+	type DeletionQueueDepth = DeletionQueueDepth;
+	type DeletionWeightLimit = DeletionWeightLimit;
 }
 
 impl pallet_sudo::Config for Runtime {
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index d6092f40a67b..d08f0ab5e65e 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -39,7 +39,7 @@ use self::{
 use frame_benchmarking::{benchmarks, account, whitelisted_caller};
 use frame_system::{Module as System, RawOrigin};
 use parity_wasm::elements::{Instruction, ValueType, BlockType};
-use sp_runtime::traits::{Hash, Bounded};
+use sp_runtime::traits::{Hash, Bounded, Zero};
 use sp_std::{default::Default, convert::{TryInto}, vec::Vec, vec};
 use pallet_contracts_primitives::RentProjection;
 
@@ -209,37 +209,52 @@ where
 	}
 }
 
-/// A `Contract` that was evicted after accumulating some storage.
+/// A `Contract` that contains some storage items.
 ///
-/// This is used to benchmark contract resurrection.
-struct Tombstone<T: Config> {
+/// This is used to benchmark contract destruction and resurection. Those operations'
+/// weight depend on the amount of storage accumulated.
+struct ContractWithStorage<T: Config> {
 	/// The contract that was evicted.
 	contract: Contract<T>,
 	/// The storage the contract held when it was avicted.
 	storage: Vec<(StorageKey, Vec<u8>)>,
 }
 
-impl<T: Config> Tombstone<T>
+impl<T: Config> ContractWithStorage<T>
 where
 	T: Config,
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
-	/// Create and evict a new contract with the supplied storage item count and size each.
+	/// Same as [`Self::with_code`] but with dummy contract code.
 	fn new(stor_num: u32, stor_size: u32) -> Result<Self, &'static str> {
-		let contract = Contract::<T>::new(WasmModule::dummy(), vec![], Endow::CollectRent)?;
+		Self::with_code(WasmModule::dummy(), stor_num, stor_size)
+	}
+
+	/// Create and evict a new contract with the supplied storage item count and size each.
+	fn with_code(code: WasmModule<T>, stor_num: u32, stor_size: u32) -> Result<Self, &'static str> {
+		let contract = Contract::<T>::new(code, vec![], Endow::CollectRent)?;
 		let storage_items = create_storage::<T>(stor_num, stor_size)?;
 		contract.store(&storage_items)?;
-		System::<T>::set_block_number(
-			contract.eviction_at()? + T::SignedClaimHandicap::get() + 5u32.into()
-		);
-		Rent::<T>::collect(&contract.account_id);
-		contract.ensure_tombstone()?;
-
-		Ok(Tombstone {
+		Ok(Self {
 			contract,
 			storage: storage_items,
 		})
 	}
+
+	/// Increase the system block number so that this contract is eligible for eviction.
+	fn set_block_num_for_eviction(&self) -> Result<(), &'static str>  {
+		System::<T>::set_block_number(
+			self.contract.eviction_at()? + T::SignedClaimHandicap::get() + 5u32.into()
+		);
+		Ok(())
+	}
+
+	/// Evict this contract.
+	fn evict(&mut self) -> Result<(), &'static str> {
+		self.set_block_num_for_eviction()?;
+		Rent::<T>::snitch_contract_should_be_evicted(&self.contract.account_id, Zero::zero())?;
+		self.contract.ensure_tombstone()
+	}
 }
 
 /// Generate `stor_num` storage items. Each has the size `stor_size`.
@@ -270,6 +285,30 @@ benchmarks! {
 	_ {
 	}
 
+	// The base weight without any actual work performed apart from the setup costs.
+	on_initialize {}: {
+		Storage::<T>::process_deletion_queue_batch(Weight::max_value())
+	}
+
+	on_initialize_per_trie_key {
+		let k in 0..1024;
+		let instance = ContractWithStorage::<T>::new(k, T::MaxValueSize::get())?;
+		Storage::<T>::queue_trie_for_deletion(&instance.contract.alive_info()?)?;
+	}: {
+		Storage::<T>::process_deletion_queue_batch(Weight::max_value())
+	}
+
+	on_initialize_per_queue_item {
+		let q in 0..1024.min(T::DeletionQueueDepth::get());
+		for i in 0 .. q {
+			let instance = Contract::<T>::with_index(i, WasmModule::dummy(), vec![], Endow::Max)?;
+			Storage::<T>::queue_trie_for_deletion(&instance.alive_info()?)?;
+			ContractInfoOf::<T>::remove(instance.account_id);
+		}
+	}: {
+		Storage::<T>::process_deletion_queue_batch(Weight::max_value())
+	}
+
 	// This extrinsic is pretty much constant as it is only a simple setter.
 	update_schedule {
 		let schedule = Schedule {
@@ -650,7 +689,8 @@ benchmarks! {
 		// Restore just moves the trie id from origin to destination and therefore
 		// does not depend on the size of the destination contract. However, to not
 		// trigger any edge case we won't use an empty contract as destination.
-		let tombstone = Tombstone::<T>::new(10, T::MaxValueSize::get())?;
+		let mut tombstone = ContractWithStorage::<T>::new(10, T::MaxValueSize::get())?;
+		tombstone.evict()?;
 
 		let dest = tombstone.contract.account_id.encode();
 		let dest_len = dest.len();
@@ -723,7 +763,8 @@ benchmarks! {
 
 	seal_restore_to_per_delta {
 		let d in 0 .. API_BENCHMARK_BATCHES;
-		let tombstone = Tombstone::<T>::new(0, 0)?;
+		let mut tombstone = ContractWithStorage::<T>::new(0, 0)?;
+		tombstone.evict()?;
 		let delta = create_storage::<T>(d * API_BENCHMARK_BATCH_SIZE, T::MaxValueSize::get())?;
 
 		let dest = tombstone.contract.account_id.encode();
@@ -2368,7 +2409,20 @@ benchmarks! {
 	#[extra]
 	print_schedule {
 		#[cfg(feature = "std")]
-		println!("{:#?}", Schedule::<T>::default());
+		{
+			let weight_per_key = T::WeightInfo::on_initialize_per_trie_key(1) -
+				T::WeightInfo::on_initialize_per_trie_key(0);
+			let weight_per_queue_item = T::WeightInfo::on_initialize_per_queue_item(1) -
+				T::WeightInfo::on_initialize_per_queue_item(0);
+			let weight_limit = T::DeletionWeightLimit::get();
+			let queue_depth: u64 = T::DeletionQueueDepth::get().into();
+			println!("{:#?}", Schedule::<T>::default());
+			println!("###############################################");
+			println!("Lazy deletion throughput per block (empty queue, full queue): {}, {}",
+				weight_limit / weight_per_key,
+				(weight_limit - weight_per_queue_item * queue_depth) / weight_per_key,
+			);
+		}
 		#[cfg(not(feature = "std"))]
 		return Err("Run this bench with a native runtime in order to see the schedule.");
 	}: {}
@@ -2394,6 +2448,10 @@ mod tests {
 		}
 	}
 
+	create_test!(on_initialize);
+	create_test!(on_initialize_per_trie_key);
+	create_test!(on_initialize_per_queue_item);
+
 	create_test!(update_schedule);
 	create_test!(put_code);
 	create_test!(instantiate);
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index b5f4034b5bff..47ff216cd23e 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -268,12 +268,12 @@ where
 			Err(Error::<T>::MaxCallDepthReached)?
 		}
 
-		// Assumption: `collect` doesn't collide with overlay because
-		// `collect` will be done on first call and destination contract and balance
-		// cannot be changed before the first call
-		// We do not allow 'calling' plain accounts. For transfering value
-		// `seal_transfer` must be used.
-		let contract = if let Some(ContractInfo::Alive(info)) = Rent::<T>::collect(&dest) {
+		// This charges the rent and denies access to a contract that is in need of
+		// eviction by returning `None`. We cannot evict eagerly here because those
+		// changes would be rolled back in case this contract is called by another
+		// contract.
+		// See: https://github.com/paritytech/substrate/issues/6439#issuecomment-648754324
+		let contract = if let Ok(Some(ContractInfo::Alive(info))) = Rent::<T>::charge(&dest) {
 			info
 		} else {
 			Err(Error::<T>::NotCallable)?
@@ -575,13 +575,16 @@ where
 			value,
 			self.ctx,
 		)?;
-		let self_trie_id = self.ctx.self_trie_id.as_ref().expect(
-			"this function is only invoked by in the context of a contract;\
-				a contract has a trie id;\
-				this can't be None; qed",
-		);
-		Storage::<T>::destroy_contract(&self_id, self_trie_id);
-		Ok(())
+		if let Some(ContractInfo::Alive(info)) = ContractInfoOf::<T>::take(&self_id) {
+			Storage::<T>::queue_trie_for_deletion(&info)?;
+			Ok(())
+		} else {
+			panic!(
+				"this function is only invoked by in the context of a contract;\
+				this contract is therefore alive;\
+				qed"
+			);
+		}
 	}
 
 	fn call(
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index ad694b0c877b..7b919fe2172e 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -123,7 +123,7 @@ use frame_support::{
 	dispatch::{DispatchResult, DispatchResultWithPostInfo},
 	traits::{OnUnbalanced, Currency, Get, Time, Randomness},
 };
-use frame_system::{ensure_signed, ensure_root};
+use frame_system::{ensure_signed, ensure_root, Module as System};
 use pallet_contracts_primitives::{
 	RentProjectionResult, GetStorageResult, ContractAccessError, ContractExecResult, ExecResult,
 };
@@ -325,6 +325,12 @@ pub trait Config: frame_system::Config {
 
 	/// Type that allows the runtime authors to add new host functions for a contract to call.
 	type ChainExtension: chain_extension::ChainExtension;
+
+	/// The maximum number of tries that can be queued for deletion.
+	type DeletionQueueDepth: Get<u32>;
+
+	/// The maximum amount of weight that can be consumed per block for lazy trie removal.
+	type DeletionWeightLimit: Get<Weight>;
 }
 
 decl_error! {
@@ -396,6 +402,17 @@ decl_error! {
 		/// in this error. Note that this usually  shouldn't happen as deploying such contracts
 		/// is rejected.
 		NoChainExtension,
+		/// Removal of a contract failed because the deletion queue is full.
+		///
+		/// This can happen when either calling [`Module::claim_surcharge`] or `seal_terminate`.
+		/// The queue is filled by deleting contracts and emptied by a fixed amount each block.
+		/// Trying again during another block is the only way to resolve this issue.
+		DeletionQueueFull,
+		/// A contract could not be evicted because it has enough balance to pay rent.
+		///
+		/// This can be returned from [`Module::claim_surcharge`] because the target
+		/// contract has enough balance to pay for its rent.
+		ContractNotEvictable,
 	}
 }
 
@@ -449,8 +466,24 @@ decl_module! {
 		/// The maximum size of a storage value in bytes. A reasonable default is 16 KiB.
 		const MaxValueSize: u32 = T::MaxValueSize::get();
 
+		/// The maximum number of tries that can be queued for deletion.
+		const DeletionQueueDepth: u32 = T::DeletionQueueDepth::get();
+
+		/// The maximum amount of weight that can be consumed per block for lazy trie removal.
+		const DeletionWeightLimit: Weight = T::DeletionWeightLimit::get();
+
 		fn deposit_event() = default;
 
+		fn on_initialize() -> Weight {
+			// We do not want to go above the block limit and rather avoid lazy deletion
+			// in that case. This should only happen on runtime upgrades.
+			let weight_limit = T::BlockWeights::get().max_block
+				.saturating_sub(System::<T>::block_weight().total())
+				.min(T::DeletionWeightLimit::get());
+			Storage::<T>::process_deletion_queue_batch(weight_limit)
+				.saturating_add(T::WeightInfo::on_initialize())
+		}
+
 		/// Updates the schedule for metering contracts.
 		///
 		/// The schedule must have a greater version than the stored schedule.
@@ -549,10 +582,14 @@ decl_module! {
 		/// Allows block producers to claim a small reward for evicting a contract. If a block producer
 		/// fails to do so, a regular users will be allowed to claim the reward.
 		///
-		/// If contract is not evicted as a result of this call, no actions are taken and
-		/// the sender is not eligible for the reward.
+		/// If contract is not evicted as a result of this call, [`Error::ContractNotEvictable`]
+		/// is returned and the sender is not eligible for the reward.
 		#[weight = T::WeightInfo::claim_surcharge()]
-		fn claim_surcharge(origin, dest: T::AccountId, aux_sender: Option<T::AccountId>) {
+		pub fn claim_surcharge(
+			origin,
+			dest: T::AccountId,
+			aux_sender: Option<T::AccountId>
+		) -> DispatchResult {
 			let origin = origin.into();
 			let (signed, rewarded) = match (origin, aux_sender) {
 				(Ok(frame_system::RawOrigin::Signed(account)), None) => {
@@ -574,8 +611,10 @@ decl_module! {
 			};
 
 			// If poking the contract has lead to eviction of the contract, give out the rewards.
-			if Rent::<T>::snitch_contract_should_be_evicted(&dest, handicap) {
-				T::Currency::deposit_into_existing(&rewarded, T::SurchargeReward::get())?;
+			if Rent::<T>::snitch_contract_should_be_evicted(&dest, handicap)? {
+				T::Currency::deposit_into_existing(&rewarded, T::SurchargeReward::get()).map(|_| ())
+			} else {
+				Err(Error::<T>::ContractNotEvictable.into())
 			}
 		}
 	}
@@ -733,6 +772,11 @@ decl_storage! {
 		///
 		/// TWOX-NOTE: SAFE since `AccountId` is a secure hash.
 		pub ContractInfoOf: map hasher(twox_64_concat) T::AccountId => Option<ContractInfo<T>>;
+		/// Evicted contracts that await child trie deletion.
+		///
+		/// Child trie deletion is a heavy operation depending on the amount of storage items
+		/// stored in said trie. Therefore this operation is performed lazily in `on_initialize`.
+		pub DeletionQueue: Vec<storage::DeletedContract>;
 	}
 }
 
diff --git a/frame/contracts/src/rent.rs b/frame/contracts/src/rent.rs
index d31efd5f5526..f30b25b447a2 100644
--- a/frame/contracts/src/rent.rs
+++ b/frame/contracts/src/rent.rs
@@ -20,13 +20,16 @@
 use crate::{
 	AliveContractInfo, BalanceOf, ContractInfo, ContractInfoOf, Module, RawEvent,
 	TombstoneContractInfo, Config, CodeHash, ConfigCache, Error,
+	storage::Storage,
 };
 use sp_std::prelude::*;
 use sp_io::hashing::blake2_256;
 use sp_core::crypto::UncheckedFrom;
-use frame_support::storage::child;
-use frame_support::traits::{Currency, ExistenceRequirement, Get, OnUnbalanced, WithdrawReasons};
-use frame_support::StorageMap;
+use frame_support::{
+	debug, StorageMap,
+	storage::child,
+	traits::{Currency, ExistenceRequirement, Get, OnUnbalanced, WithdrawReasons},
+};
 use pallet_contracts_primitives::{ContractAccessError, RentProjection, RentProjectionResult};
 use sp_runtime::{
 	DispatchError,
@@ -74,10 +77,6 @@ enum Verdict<T: Config> {
 	/// For example, it already paid its rent in the current block, or it has enough deposit for not
 	/// paying rent at all.
 	Exempt,
-	/// Funds dropped below the subsistence deposit.
-	///
-	/// Remove the contract along with it's storage.
-	Kill,
 	/// The contract cannot afford payment within its rent budget so it gets evicted. However,
 	/// because its balance is greater than the subsistence threshold it leaves a tombstone.
 	Evict {
@@ -181,11 +180,17 @@ where
 		let rent_budget = match Self::rent_budget(&total_balance, &free_balance, contract) {
 			Some(rent_budget) => rent_budget,
 			None => {
-				// The contract's total balance is already below subsistence threshold. That
-				// indicates that the contract cannot afford to leave a tombstone.
-				//
-				// So cleanly wipe the contract.
-				return Verdict::Kill;
+				// All functions that allow a contract to transfer balance enforce
+				// that the contract always stays above the subsistence threshold.
+				// We want the rent system to always leave a tombstone to prevent the
+				// accidental loss of a contract. Ony `seal_terminate` can remove a
+				// contract without a tombstone. Therefore this case should be never
+				// hit.
+				debug::error!(
+					"Tombstoned a contract that is below the subsistence threshold: {:?}",
+					account
+				);
+				0u32.into()
 			}
 		};
 
@@ -234,19 +239,19 @@ where
 		alive_contract_info: AliveContractInfo<T>,
 		current_block_number: T::BlockNumber,
 		verdict: Verdict<T>,
-	) -> Option<ContractInfo<T>> {
+		allow_eviction: bool,
+	) -> Result<Option<ContractInfo<T>>, DispatchError> {
 		match verdict {
-			Verdict::Exempt => return Some(ContractInfo::Alive(alive_contract_info)),
-			Verdict::Kill => {
-				<ContractInfoOf<T>>::remove(account);
-				child::kill_storage(
-					&alive_contract_info.child_trie_info(),
-					None,
-				);
-				<Module<T>>::deposit_event(RawEvent::Evicted(account.clone(), false));
-				None
+			Verdict::Exempt => return Ok(Some(ContractInfo::Alive(alive_contract_info))),
+			Verdict::Evict { amount: _ } if !allow_eviction => {
+				Ok(None)
 			}
 			Verdict::Evict { amount } => {
+				// We need to remove the trie first because it is the only operation
+				// that can fail and this function is called without a storage
+				// transaction when called through `claim_surcharge`.
+				Storage::<T>::queue_trie_for_deletion(&alive_contract_info)?;
+
 				if let Some(amount) = amount {
 					amount.withdraw(account);
 				}
@@ -262,14 +267,8 @@ where
 				);
 				let tombstone_info = ContractInfo::Tombstone(tombstone);
 				<ContractInfoOf<T>>::insert(account, &tombstone_info);
-
-				child::kill_storage(
-					&alive_contract_info.child_trie_info(),
-					None,
-				);
-
 				<Module<T>>::deposit_event(RawEvent::Evicted(account.clone(), true));
-				Some(tombstone_info)
+				Ok(Some(tombstone_info))
 			}
 			Verdict::Charge { amount } => {
 				let contract_info = ContractInfo::Alive(AliveContractInfo::<T> {
@@ -278,21 +277,21 @@ where
 					..alive_contract_info
 				});
 				<ContractInfoOf<T>>::insert(account, &contract_info);
-
 				amount.withdraw(account);
-				Some(contract_info)
+				Ok(Some(contract_info))
 			}
 		}
 	}
 
 	/// Make account paying the rent for the current block number
 	///
-	/// NOTE this function performs eviction eagerly. All changes are read and written directly to
-	/// storage.
-	pub fn collect(account: &T::AccountId) -> Option<ContractInfo<T>> {
+	/// This functions does **not** evict the contract. It returns `None` in case the
+	/// contract is in need of eviction. [`snitch_contract_should_be_evicted`] must
+	/// be called to perform the eviction.
+	pub fn charge(account: &T::AccountId) -> Result<Option<ContractInfo<T>>, DispatchError> {
 		let contract_info = <ContractInfoOf<T>>::get(account);
 		let alive_contract_info = match contract_info {
-			None | Some(ContractInfo::Tombstone(_)) => return contract_info,
+			None | Some(ContractInfo::Tombstone(_)) => return Ok(contract_info),
 			Some(ContractInfo::Alive(contract)) => contract,
 		};
 
@@ -303,7 +302,7 @@ where
 			Zero::zero(),
 			&alive_contract_info,
 		);
-		Self::enact_verdict(account, alive_contract_info, current_block_number, verdict)
+		Self::enact_verdict(account, alive_contract_info, current_block_number, verdict, false)
 	}
 
 	/// Process a report that a contract under the given address should be evicted.
@@ -321,10 +320,10 @@ where
 	pub fn snitch_contract_should_be_evicted(
 		account: &T::AccountId,
 		handicap: T::BlockNumber,
-	) -> bool {
-		let contract_info = <ContractInfoOf<T>>::get(account);
-		let alive_contract_info = match contract_info {
-			None | Some(ContractInfo::Tombstone(_)) => return false,
+	) -> Result<bool, DispatchError> {
+		let contract = <ContractInfoOf<T>>::get(account);
+		let contract = match contract {
+			None | Some(ContractInfo::Tombstone(_)) => return Ok(false),
 			Some(ContractInfo::Alive(contract)) => contract,
 		};
 		let current_block_number = <frame_system::Module<T>>::block_number();
@@ -332,16 +331,16 @@ where
 			account,
 			current_block_number,
 			handicap,
-			&alive_contract_info,
+			&contract,
 		);
 
 		// Enact the verdict only if the contract gets removed.
 		match verdict {
-			Verdict::Kill | Verdict::Evict { .. } => {
-				Self::enact_verdict(account, alive_contract_info, current_block_number, verdict);
-				true
+			Verdict::Evict { .. } => {
+				Self::enact_verdict(account, contract, current_block_number, verdict, true)?;
+				Ok(true)
 			}
-			_ => false,
+			_ => Ok(false),
 		}
 	}
 
@@ -359,9 +358,11 @@ where
 	pub fn compute_projection(
 		account: &T::AccountId,
 	) -> RentProjectionResult<T::BlockNumber> {
+		use ContractAccessError::IsTombstone;
+
 		let contract_info = <ContractInfoOf<T>>::get(account);
 		let alive_contract_info = match contract_info {
-			None | Some(ContractInfo::Tombstone(_)) => return Err(ContractAccessError::IsTombstone),
+			None | Some(ContractInfo::Tombstone(_)) => return Err(IsTombstone),
 			Some(ContractInfo::Alive(contract)) => contract,
 		};
 		let current_block_number = <frame_system::Module<T>>::block_number();
@@ -372,11 +373,11 @@ where
 			&alive_contract_info,
 		);
 		let new_contract_info =
-			Self::enact_verdict(account, alive_contract_info, current_block_number, verdict);
+			Self::enact_verdict(account, alive_contract_info, current_block_number, verdict, false);
 
 		// Check what happened after enaction of the verdict.
-		let alive_contract_info = match new_contract_info {
-			None | Some(ContractInfo::Tombstone(_)) => return Err(ContractAccessError::IsTombstone),
+		let alive_contract_info = match new_contract_info.map_err(|_| IsTombstone)? {
+			None | Some(ContractInfo::Tombstone(_)) => return Err(IsTombstone),
 			Some(ContractInfo::Alive(contract)) => contract,
 		};
 
diff --git a/frame/contracts/src/storage.rs b/frame/contracts/src/storage.rs
index 180ec7237ff0..520a114986f4 100644
--- a/frame/contracts/src/storage.rs
+++ b/frame/contracts/src/storage.rs
@@ -20,20 +20,37 @@
 use crate::{
 	exec::{AccountIdOf, StorageKey},
 	AliveContractInfo, BalanceOf, CodeHash, ContractInfo, ContractInfoOf, Config, TrieId,
-	AccountCounter,
+	AccountCounter, DeletionQueue, Error,
+	weights::WeightInfo,
 };
+use codec::{Encode, Decode};
 use sp_std::prelude::*;
 use sp_std::marker::PhantomData;
 use sp_io::hashing::blake2_256;
 use sp_runtime::traits::Bounded;
 use sp_core::crypto::UncheckedFrom;
-use frame_support::{storage::child, StorageMap};
+use frame_support::{
+	dispatch::DispatchResult,
+	StorageMap,
+	debug,
+	storage::{child::{self, KillOutcome}, StorageValue},
+	traits::Get,
+	weights::Weight,
+};
 
 /// An error that means that the account requested either doesn't exist or represents a tombstone
 /// account.
 #[cfg_attr(test, derive(PartialEq, Eq, Debug))]
 pub struct ContractAbsentError;
 
+#[derive(Encode, Decode)]
+pub struct DeletedContract {
+	pair_count: u32,
+	trie_id: TrieId,
+}
+
+
+
 pub struct Storage<T>(PhantomData<T>);
 
 impl<T> Storage<T>
@@ -191,18 +208,105 @@ where
 		})
 	}
 
-	/// Removes the contract and all the storage associated with it.
+	/// Push a contract's trie to the deletion queue for lazy removal.
 	///
-	/// This function doesn't affect the account.
-	pub fn destroy_contract(address: &AccountIdOf<T>, trie_id: &TrieId) {
-		<ContractInfoOf<T>>::remove(address);
-		child::kill_storage(&crate::child_trie_info(&trie_id), None);
+	/// You must make sure that the contract is also removed or converted into a tombstone
+	/// when queuing the trie for deletion.
+	pub fn queue_trie_for_deletion(contract: &AliveContractInfo<T>) -> DispatchResult {
+		if DeletionQueue::decode_len().unwrap_or(0) >= T::DeletionQueueDepth::get() as usize {
+			Err(Error::<T>::DeletionQueueFull.into())
+		} else {
+			DeletionQueue::append(DeletedContract {
+				pair_count: contract.total_pair_count,
+				trie_id: contract.trie_id.clone(),
+			});
+			Ok(())
+		}
+	}
+
+	/// Calculates the weight that is necessary to remove one key from the trie and how many
+	/// of those keys can be deleted from the deletion queue given the supplied queue length
+	/// and weight limit.
+	pub fn deletion_budget(queue_len: usize, weight_limit: Weight) -> (u64, u32) {
+		let base_weight = T::WeightInfo::on_initialize();
+		let weight_per_queue_item = T::WeightInfo::on_initialize_per_queue_item(1) -
+			T::WeightInfo::on_initialize_per_queue_item(0);
+		let weight_per_key = T::WeightInfo::on_initialize_per_trie_key(1) -
+			T::WeightInfo::on_initialize_per_trie_key(0);
+		let decoding_weight = weight_per_queue_item.saturating_mul(queue_len as Weight);
+
+		// `weight_per_key` being zero makes no sense and would constitute a failure to
+		// benchmark properly. We opt for not removing any keys at all in this case.
+		let key_budget = weight_limit
+			.saturating_sub(base_weight)
+			.saturating_sub(decoding_weight)
+			.checked_div(weight_per_key)
+			.unwrap_or(0) as u32;
+
+		(weight_per_key, key_budget)
+	}
+
+	/// Delete as many items from the deletion queue possible within the supplied weight limit.
+	///
+	/// It returns the amount of weight used for that task or `None` when no weight was used
+	/// apart from the base weight.
+	pub fn process_deletion_queue_batch(weight_limit: Weight) -> Weight {
+		let queue_len = DeletionQueue::decode_len().unwrap_or(0);
+		if queue_len == 0 {
+			return weight_limit;
+		}
+
+		let (weight_per_key, mut remaining_key_budget) = Self::deletion_budget(
+			queue_len,
+			weight_limit,
+		);
+
+		// We want to check whether we have enough weight to decode the queue before
+		// proceeding. Too little weight for decoding might happen during runtime upgrades
+		// which consume the whole block before the other `on_initialize` blocks are called.
+		if remaining_key_budget == 0 {
+			return weight_limit;
+		}
+
+		let mut queue = DeletionQueue::get();
+
+		while !queue.is_empty() && remaining_key_budget > 0 {
+			// Cannot panic due to loop condition
+			let trie = &mut queue[0];
+			let pair_count = trie.pair_count;
+			let outcome = child::kill_storage(
+				&crate::child_trie_info(&trie.trie_id),
+				Some(remaining_key_budget),
+			);
+			if pair_count > remaining_key_budget {
+				// Cannot underflow because of the if condition
+				trie.pair_count -= remaining_key_budget;
+			} else {
+				// We do not care to preserve order. The contract is deleted already and
+				// noone waits for the trie to be deleted.
+				let removed = queue.swap_remove(0);
+				match outcome {
+					// This should not happen as our budget was large enough to remove all keys.
+					KillOutcome::SomeRemaining => {
+						debug::error!(
+							"After deletion keys are remaining in this child trie: {:?}",
+							removed.trie_id,
+						);
+					},
+					KillOutcome::AllRemoved => (),
+				}
+			}
+			remaining_key_budget = remaining_key_budget
+				.saturating_sub(remaining_key_budget.min(pair_count));
+		}
+
+		DeletionQueue::put(queue);
+		weight_limit.saturating_sub(weight_per_key.saturating_mul(remaining_key_budget as Weight))
 	}
 
 	/// This generator uses inner counter for account id and applies the hash over `AccountId +
 	/// accountid_counter`.
 	pub fn generate_trie_id(account_id: &AccountIdOf<T>) -> TrieId {
-		use frame_support::StorageValue;
 		use sp_runtime::traits::Hash;
 		// Note that skipping a value due to error is not an issue here.
 		// We only need uniqueness, not sequence.
@@ -226,4 +330,15 @@ where
 			.and_then(|i| i.as_alive().map(|i| i.code_hash))
 			.ok_or(ContractAbsentError)
 	}
+
+	/// Fill up the queue in order to exercise the limits during testing.
+	#[cfg(test)]
+	pub fn fill_queue_with_dummies() {
+		let queue: Vec<_> = (0..T::DeletionQueueDepth::get()).map(|_| DeletedContract {
+			pair_count: 0,
+			trie_id: vec![],
+		})
+		.collect();
+		DeletionQueue::put(queue);
+	}
 }
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index 1f069a9b4652..d1a9521924f7 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -32,12 +32,14 @@ use sp_runtime::{
 	testing::{Header, H256},
 	AccountId32,
 };
+use sp_io::hashing::blake2_256;
 use frame_support::{
-	assert_ok, assert_err_ignore_postinfo, impl_outer_dispatch, impl_outer_event,
+	assert_ok, assert_err, assert_err_ignore_postinfo, impl_outer_dispatch, impl_outer_event,
 	impl_outer_origin, parameter_types, StorageMap,
-	traits::{Currency, ReservableCurrency},
-	weights::{Weight, PostDispatchInfo},
+	traits::{Currency, ReservableCurrency, OnInitialize},
+	weights::{Weight, PostDispatchInfo, DispatchClass, constants::WEIGHT_PER_SECOND},
 	dispatch::DispatchErrorWithPostInfo,
+	storage::child,
 };
 use frame_system::{self as system, EventRecord, Phase};
 
@@ -189,12 +191,12 @@ pub struct Test;
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 	pub BlockWeights: frame_system::limits::BlockWeights =
-		frame_system::limits::BlockWeights::simple_max(1024);
+		frame_system::limits::BlockWeights::simple_max(2 * WEIGHT_PER_SECOND);
 	pub static ExistentialDeposit: u64 = 0;
 }
 impl frame_system::Config for Test {
 	type BaseCallFilter = ();
-	type BlockWeights = ();
+	type BlockWeights = BlockWeights;
 	type BlockLength = ();
 	type DbWeight = ();
 	type Origin = Origin;
@@ -243,6 +245,8 @@ parameter_types! {
 	pub const SurchargeReward: u64 = 150;
 	pub const MaxDepth: u32 = 100;
 	pub const MaxValueSize: u32 = 16_384;
+	pub const DeletionQueueDepth: u32 = 1024;
+	pub const DeletionWeightLimit: Weight = 500_000_000_000;
 }
 
 parameter_types! {
@@ -272,6 +276,8 @@ impl Config for Test {
 	type WeightPrice = Self;
 	type WeightInfo = ();
 	type ChainExtension = TestExtension;
+	type DeletionQueueDepth = DeletionQueueDepth;
+	type DeletionWeightLimit = DeletionWeightLimit;
 }
 
 type Balances = pallet_balances::Module<Test>;
@@ -859,15 +865,6 @@ fn deduct_blocks() {
 		});
 }
 
-#[test]
-fn call_contract_removals() {
-	removals(|addr| {
-		// Call on already-removed account might fail, and this is fine.
-		let _ = Contracts::call(Origin::signed(ALICE), addr, 0, GAS_LIMIT, call::null());
-		true
-	});
-}
-
 #[test]
 fn inherent_claim_surcharge_contract_removals() {
 	removals(|addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok());
@@ -918,7 +915,7 @@ fn claim_surcharge(blocks: u64, trigger_call: impl Fn(AccountIdOf<Test>) -> bool
 			initialize_block(blocks);
 
 			// Trigger rent through call
-			assert!(trigger_call(addr.clone()));
+			assert_eq!(trigger_call(addr.clone()), removes);
 
 			if removes {
 				assert!(ContractInfoOf::<Test>::get(&addr).unwrap().get_tombstone().is_some());
@@ -956,7 +953,7 @@ fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
 			let subsistence_threshold = 50 /*existential_deposit*/ + 16 /*tombstone_deposit*/;
 
 			// Trigger rent must have no effect
-			assert!(trigger_call(addr.clone()));
+			assert!(!trigger_call(addr.clone()));
 			assert_eq!(ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap().rent_allowance, 1_000);
 			assert_eq!(Balances::free_balance(&addr), 100);
 
@@ -972,7 +969,7 @@ fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
 			initialize_block(20);
 
 			// Trigger rent must have no effect
-			assert!(trigger_call(addr.clone()));
+			assert!(!trigger_call(addr.clone()));
 			assert!(ContractInfoOf::<Test>::get(&addr).unwrap().get_tombstone().is_some());
 			assert_eq!(Balances::free_balance(&addr), subsistence_threshold);
 		});
@@ -996,7 +993,7 @@ fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
 			// Trigger rent must have no effect
-			assert!(trigger_call(addr.clone()));
+			assert!(!trigger_call(addr.clone()));
 			assert_eq!(
 				ContractInfoOf::<Test>::get(&addr)
 					.unwrap()
@@ -1023,7 +1020,7 @@ fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
 			initialize_block(20);
 
 			// Trigger rent must have no effect
-			assert!(trigger_call(addr.clone()));
+			assert!(!trigger_call(addr.clone()));
 			assert!(ContractInfoOf::<Test>::get(&addr)
 				.unwrap()
 				.get_tombstone()
@@ -1052,7 +1049,7 @@ fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
 			// Trigger rent must have no effect
-			assert!(trigger_call(addr.clone()));
+			assert!(!trigger_call(addr.clone()));
 			assert_eq!(
 				ContractInfoOf::<Test>::get(&addr)
 					.unwrap()
@@ -1096,7 +1093,7 @@ fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
 			initialize_block(20);
 
 			// Trigger rent must have no effect
-			assert!(trigger_call(addr.clone()));
+			assert!(!trigger_call(addr.clone()));
 			assert_matches!(ContractInfoOf::<Test>::get(&addr), Some(ContractInfo::Tombstone(_)));
 			assert_eq!(Balances::free_balance(&addr), subsistence_threshold);
 		});
@@ -1131,25 +1128,23 @@ fn call_removed_contract() {
 			// Advance blocks
 			initialize_block(10);
 
-			// Calling contract should remove contract and fail.
+			// Calling contract should deny access because rent cannot be paid.
 			assert_err_ignore_postinfo!(
 				Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, call::null()),
 				Error::<Test>::NotCallable
 			);
-			// Calling a contract that is about to evict shall emit an event.
-			assert_eq!(System::events(), vec![
-				EventRecord {
-					phase: Phase::Initialization,
-					event: MetaEvent::contracts(RawEvent::Evicted(addr.clone(), true)),
-					topics: vec![],
-				},
-			]);
+			// No event is generated because the contract is not actually removed.
+			assert_eq!(System::events(), vec![]);
 
 			// Subsequent contract calls should also fail.
 			assert_err_ignore_postinfo!(
-				Contracts::call(Origin::signed(ALICE), addr, 0, GAS_LIMIT, call::null()),
+				Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, call::null()),
 				Error::<Test>::NotCallable
 			);
+
+			// A snitch can now remove the contract
+			assert_ok!(Contracts::claim_surcharge(Origin::none(), addr.clone(), Some(ALICE)));
+			assert!(ContractInfoOf::<Test>::get(&addr).unwrap().get_tombstone().is_some());
 		})
 }
 
@@ -1278,13 +1273,17 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 			initialize_block(5);
 
 			// Call `BOB`, which makes it pay rent. Since the rent allowance is set to 0
-			// we expect that it will get removed leaving tombstone.
+			// we expect that it is no longer callable but keeps existing until someone
+			// calls `claim_surcharge`.
 			assert_err_ignore_postinfo!(
 				Contracts::call(
 					Origin::signed(ALICE), addr_bob.clone(), 0, GAS_LIMIT, call::null()
 				),
 				Error::<Test>::NotCallable
 			);
+			assert!(System::events().is_empty());
+			assert!(ContractInfoOf::<Test>::get(&addr_bob).unwrap().get_alive().is_some());
+			assert_ok!(Contracts::claim_surcharge(Origin::none(), addr_bob.clone(), Some(ALICE)));
 			assert!(ContractInfoOf::<Test>::get(&addr_bob).unwrap().get_tombstone().is_some());
 			assert_eq!(System::events(), vec![
 				EventRecord {
@@ -2134,3 +2133,354 @@ fn chain_extension_works() {
 	});
 }
 
+#[test]
+fn lazy_removal_works() {
+	let (code, hash) = compile_module::<Test>("self_destruct").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
+		let _ = Balances::deposit_creating(&ALICE, 10 * subsistence);
+		assert_ok!(Contracts::put_code(Origin::signed(ALICE), code));
+
+		assert_ok!(
+			Contracts::instantiate(
+				Origin::signed(ALICE),
+				subsistence,
+				GAS_LIMIT,
+				hash.into(),
+				vec![],
+				vec![],
+			),
+		);
+
+		let addr = Contracts::contract_address(&ALICE, &hash, &[]);
+		let info = <ContractInfoOf::<Test>>::get(&addr).unwrap().get_alive().unwrap();
+		let trie = &info.child_trie_info();
+
+		// Put value into the contracts child trie
+		child::put(trie, &[99], &42);
+
+		// Terminate the contract
+		assert_ok!(Contracts::call(
+			Origin::signed(ALICE),
+			addr.clone(),
+			0,
+			GAS_LIMIT,
+			vec![],
+		));
+
+		// Contract info should be gone
+		assert!(!<ContractInfoOf::<Test>>::contains_key(&addr));
+
+		// But value should be still there as the lazy removal did not run, yet.
+		assert_matches!(child::get(trie, &[99]), Some(42));
+
+		// Run the lazy removal
+		Contracts::on_initialize(Weight::max_value());
+
+		// Value should be gone now
+		assert_matches!(child::get::<i32>(trie, &[99]), None);
+	});
+}
+
+#[test]
+fn lazy_removal_partial_remove_works() {
+	let (code, hash) = compile_module::<Test>("self_destruct").unwrap();
+
+	// We create a contract with some extra keys above the weight limit
+	let extra_keys = 7u32;
+	let weight_limit = 5_000_000_000;
+	let (_, max_keys) = Storage::<Test>::deletion_budget(1, weight_limit);
+	let vals: Vec<_> = (0..max_keys + extra_keys).map(|i| {
+		(blake2_256(&i.encode()), (i as u32), (i as u32).encode())
+	})
+	.collect();
+
+	let mut ext = ExtBuilder::default().existential_deposit(50).build();
+
+	let trie = ext.execute_with(|| {
+		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
+		let _ = Balances::deposit_creating(&ALICE, 10 * subsistence);
+		assert_ok!(Contracts::put_code(Origin::signed(ALICE), code));
+
+		assert_ok!(
+			Contracts::instantiate(
+				Origin::signed(ALICE),
+				subsistence,
+				GAS_LIMIT,
+				hash.into(),
+				vec![],
+				vec![],
+			),
+		);
+
+		let addr = Contracts::contract_address(&ALICE, &hash, &[]);
+		let info = <ContractInfoOf::<Test>>::get(&addr).unwrap().get_alive().unwrap();
+		let trie = &info.child_trie_info();
+
+		// Put value into the contracts child trie
+		for val in &vals {
+			Storage::<Test>::write(
+				&addr,
+				&info.trie_id,
+				&val.0,
+				Some(val.2.clone()),
+			).unwrap();
+		}
+
+		// Terminate the contract
+		assert_ok!(Contracts::call(
+			Origin::signed(ALICE),
+			addr.clone(),
+			0,
+			GAS_LIMIT,
+			vec![],
+		));
+
+		// Contract info should be gone
+		assert!(!<ContractInfoOf::<Test>>::contains_key(&addr));
+
+		// But value should be still there as the lazy removal did not run, yet.
+		for val in &vals {
+			assert_eq!(child::get::<u32>(trie, &blake2_256(&val.0)), Some(val.1));
+		}
+
+		trie.clone()
+	});
+
+	// The lazy removal limit only applies to the backend but not to the overlay.
+	// This commits all keys from the overlay to the backend.
+	ext.commit_all().unwrap();
+
+	ext.execute_with(|| {
+		// Run the lazy removal
+		let weight_used = Storage::<Test>::process_deletion_queue_batch(weight_limit);
+
+		// Weight should be exhausted because we could not even delete all keys
+		assert_eq!(weight_used, weight_limit);
+
+		let mut num_deleted = 0u32;
+		let mut num_remaining = 0u32;
+
+		for val in &vals {
+			match child::get::<u32>(&trie, &blake2_256(&val.0)) {
+				None => num_deleted += 1,
+				Some(x) if x == val.1 => num_remaining += 1,
+				Some(_) => panic!("Unexpected value in contract storage"),
+			}
+		}
+
+		// All but one key is removed
+		assert_eq!(num_deleted + num_remaining, vals.len() as u32);
+		assert_eq!(num_deleted, max_keys);
+		assert_eq!(num_remaining, extra_keys);
+	});
+}
+
+#[test]
+fn lazy_removal_does_no_run_on_full_block() {
+	let (code, hash) = compile_module::<Test>("self_destruct").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
+		let _ = Balances::deposit_creating(&ALICE, 10 * subsistence);
+		assert_ok!(Contracts::put_code(Origin::signed(ALICE), code));
+
+		assert_ok!(
+			Contracts::instantiate(
+				Origin::signed(ALICE),
+				subsistence,
+				GAS_LIMIT,
+				hash.into(),
+				vec![],
+				vec![],
+			),
+		);
+
+		let addr = Contracts::contract_address(&ALICE, &hash, &[]);
+		let info = <ContractInfoOf::<Test>>::get(&addr).unwrap().get_alive().unwrap();
+		let trie = &info.child_trie_info();
+		let max_keys = 30;
+
+		// Create some storage items for the contract.
+		let vals: Vec<_> = (0..max_keys).map(|i| {
+			(blake2_256(&i.encode()), (i as u32), (i as u32).encode())
+		})
+		.collect();
+
+		// Put value into the contracts child trie
+		for val in &vals {
+			Storage::<Test>::write(
+				&addr,
+				&info.trie_id,
+				&val.0,
+				Some(val.2.clone()),
+			).unwrap();
+		}
+
+		// Terminate the contract
+		assert_ok!(Contracts::call(
+			Origin::signed(ALICE),
+			addr.clone(),
+			0,
+			GAS_LIMIT,
+			vec![],
+		));
+
+		// Contract info should be gone
+		assert!(!<ContractInfoOf::<Test>>::contains_key(&addr));
+
+		// But value should be still there as the lazy removal did not run, yet.
+		for val in &vals {
+			assert_eq!(child::get::<u32>(trie, &blake2_256(&val.0)), Some(val.1));
+		}
+
+		// Fill up the block which should prevent the lazy storage removal from running.
+		System::register_extra_weight_unchecked(
+			<Test as system::Config>::BlockWeights::get().max_block,
+			DispatchClass::Mandatory,
+		);
+
+		// Run the lazy removal without any limit so that all keys would be removed if there
+		// had been some weight left in the block.
+		let weight_used = Contracts::on_initialize(Weight::max_value());
+		let base = <<Test as crate::Config>::WeightInfo as crate::WeightInfo>::on_initialize();
+		assert_eq!(weight_used, base);
+
+		// All the keys are still in place
+		for val in &vals {
+			assert_eq!(child::get::<u32>(trie, &blake2_256(&val.0)), Some(val.1));
+		}
+
+		// Run the lazy removal directly which disregards the block limits
+		Storage::<Test>::process_deletion_queue_batch(Weight::max_value());
+
+		// Now the keys should be gone
+		for val in &vals {
+			assert_eq!(child::get::<u32>(trie, &blake2_256(&val.0)), None);
+		}
+	});
+}
+
+
+#[test]
+fn lazy_removal_does_not_use_all_weight() {
+	let (code, hash) = compile_module::<Test>("self_destruct").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
+		let _ = Balances::deposit_creating(&ALICE, 10 * subsistence);
+		assert_ok!(Contracts::put_code(Origin::signed(ALICE), code));
+
+		assert_ok!(
+			Contracts::instantiate(
+				Origin::signed(ALICE),
+				subsistence,
+				GAS_LIMIT,
+				hash.into(),
+				vec![],
+				vec![],
+			),
+		);
+
+		let addr = Contracts::contract_address(&ALICE, &hash, &[]);
+		let info = <ContractInfoOf::<Test>>::get(&addr).unwrap().get_alive().unwrap();
+		let trie = &info.child_trie_info();
+		let weight_limit = 5_000_000_000;
+		let (weight_per_key, max_keys) = Storage::<Test>::deletion_budget(1, weight_limit);
+
+		// We create a contract with one less storage item than we can remove within the limit
+		let vals: Vec<_> = (0..max_keys - 1).map(|i| {
+			(blake2_256(&i.encode()), (i as u32), (i as u32).encode())
+		})
+		.collect();
+
+		// Put value into the contracts child trie
+		for val in &vals {
+			Storage::<Test>::write(
+				&addr,
+				&info.trie_id,
+				&val.0,
+				Some(val.2.clone()),
+			).unwrap();
+		}
+
+		// Terminate the contract
+		assert_ok!(Contracts::call(
+			Origin::signed(ALICE),
+			addr.clone(),
+			0,
+			GAS_LIMIT,
+			vec![],
+		));
+
+		// Contract info should be gone
+		assert!(!<ContractInfoOf::<Test>>::contains_key(&addr));
+
+		// But value should be still there as the lazy removal did not run, yet.
+		for val in &vals {
+			assert_eq!(child::get::<u32>(trie, &blake2_256(&val.0)), Some(val.1));
+		}
+
+		// Run the lazy removal
+		let weight_used = Storage::<Test>::process_deletion_queue_batch(weight_limit);
+
+		// We have one less key in our trie than our weight limit suffices for
+		assert_eq!(weight_used, weight_limit - weight_per_key);
+
+		// All the keys are removed
+		for val in vals {
+			assert_eq!(child::get::<u32>(trie, &blake2_256(&val.0)), None);
+		}
+	});
+}
+
+#[test]
+fn deletion_queue_full() {
+	let (code, hash) = compile_module::<Test>("self_destruct").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
+		let _ = Balances::deposit_creating(&ALICE, 10 * subsistence);
+		assert_ok!(Contracts::put_code(Origin::signed(ALICE), code));
+
+		assert_ok!(
+			Contracts::instantiate(
+				Origin::signed(ALICE),
+				subsistence,
+				GAS_LIMIT,
+				hash.into(),
+				vec![],
+				vec![],
+			),
+		);
+
+		let addr = Contracts::contract_address(&ALICE, &hash, &[]);
+
+		// fill the deletion queue up until its limit
+		Storage::<Test>::fill_queue_with_dummies();
+
+		// Terminate the contract should fail
+		assert_err_ignore_postinfo!(
+			Contracts::call(
+				Origin::signed(ALICE),
+				addr.clone(),
+				0,
+				GAS_LIMIT,
+				vec![],
+			),
+			Error::<Test>::DeletionQueueFull,
+		);
+
+		// Contract should be alive because removal failed
+		<ContractInfoOf::<Test>>::get(&addr).unwrap().get_alive().unwrap();
+
+		// make the contract ripe for eviction
+		initialize_block(5);
+
+		// eviction should fail for the same reason as termination
+		assert_err!(
+			Contracts::claim_surcharge(Origin::none(), addr.clone(), Some(ALICE)),
+			Error::<Test>::DeletionQueueFull,
+		);
+
+		// Contract should be alive because removal failed
+		<ContractInfoOf::<Test>>::get(&addr).unwrap().get_alive().unwrap();
+	});
+}
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index 41ab3e390aea..dd4e37b8e8fe 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -923,6 +923,8 @@ define_env!(Env, <E: Ext>,
 	// # Traps
 	//
 	// - The contract is live i.e is already on the call stack.
+	// - Failed to send the balance to the beneficiary.
+	// - The deletion queue is full.
 	seal_terminate(
 		ctx,
 		beneficiary_ptr: u32,
diff --git a/frame/contracts/src/weights.rs b/frame/contracts/src/weights.rs
index b9d7bc6e1fcc..8b1b77327665 100644
--- a/frame/contracts/src/weights.rs
+++ b/frame/contracts/src/weights.rs
@@ -15,9 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Weights for pallet_contracts
+//! Autogenerated weights for pallet_contracts
+//!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-11-10, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2020-12-12, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -43,6 +44,9 @@ use sp_std::marker::PhantomData;
 
 /// Weight functions needed for pallet_contracts.
 pub trait WeightInfo {
+	fn on_initialize() -> Weight;
+	fn on_initialize_per_trie_key(k: u32, ) -> Weight;
+	fn on_initialize_per_queue_item(q: u32, ) -> Weight;
 	fn update_schedule() -> Weight;
 	fn put_code(n: u32, ) -> Weight;
 	fn instantiate(n: u32, s: u32, ) -> Weight;
@@ -145,948 +149,1182 @@ pub trait WeightInfo {
 /// Weights for pallet_contracts using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	fn on_initialize() -> Weight {
+		(7_239_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+	}
+	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
+		(40_584_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((2_314_000 as Weight).saturating_mul(k as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
+	}
+	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
+		(0 as Weight)
+			// Standard Error: 175_000
+			.saturating_add((135_919_000 as Weight).saturating_mul(q as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+	}
 	fn update_schedule() -> Weight {
-		(35_214_000 as Weight)
+		(36_262_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn put_code(n: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((109_242_000 as Weight).saturating_mul(n as Weight))
+		(22_510_000 as Weight)
+			// Standard Error: 209_000
+			.saturating_add((113_251_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn instantiate(n: u32, s: u32, ) -> Weight {
-		(195_276_000 as Weight)
-			.saturating_add((35_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add((2_244_000 as Weight).saturating_mul(s as Weight))
+		(216_181_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((6_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 1_000
+			.saturating_add((2_240_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn call() -> Weight {
-		(207_142_000 as Weight)
+		(209_785_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn claim_surcharge() -> Weight {
-		(489_633_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+		(302_124_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn seal_caller(r: u32, ) -> Weight {
-		(136_550_000 as Weight)
-			.saturating_add((373_182_000 as Weight).saturating_mul(r as Weight))
+		(138_697_000 as Weight)
+			// Standard Error: 412_000
+			.saturating_add((390_370_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 	}
 	fn seal_address(r: u32, ) -> Weight {
-		(136_329_000 as Weight)
-			.saturating_add((373_392_000 as Weight).saturating_mul(r as Weight))
+		(141_999_000 as Weight)
+			// Standard Error: 218_000
+			.saturating_add((389_261_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 	}
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(111_577_000 as Weight)
-			.saturating_add((373_536_000 as Weight).saturating_mul(r as Weight))
+		(134_956_000 as Weight)
+			// Standard Error: 205_000
+			.saturating_add((384_439_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 	}
 	fn seal_balance(r: u32, ) -> Weight {
-		(157_531_000 as Weight)
-			.saturating_add((810_382_000 as Weight).saturating_mul(r as Weight))
+		(130_585_000 as Weight)
+			// Standard Error: 784_000
+			.saturating_add((860_797_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(143_801_000 as Weight)
-			.saturating_add((369_769_000 as Weight).saturating_mul(r as Weight))
+		(138_382_000 as Weight)
+			// Standard Error: 163_000
+			.saturating_add((384_676_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 	}
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(133_546_000 as Weight)
-			.saturating_add((370_036_000 as Weight).saturating_mul(r as Weight))
+		(137_766_000 as Weight)
+			// Standard Error: 218_000
+			.saturating_add((386_002_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 	}
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(138_568_000 as Weight)
-			.saturating_add((370_322_000 as Weight).saturating_mul(r as Weight))
+		(144_552_000 as Weight)
+			// Standard Error: 187_000
+			.saturating_add((384_754_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 	}
 	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(144_431_000 as Weight)
-			.saturating_add((851_810_000 as Weight).saturating_mul(r as Weight))
+		(150_812_000 as Weight)
+			// Standard Error: 276_000
+			.saturating_add((903_965_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 	}
 	fn seal_block_number(r: u32, ) -> Weight {
-		(133_237_000 as Weight)
-			.saturating_add((369_156_000 as Weight).saturating_mul(r as Weight))
+		(145_168_000 as Weight)
+			// Standard Error: 191_000
+			.saturating_add((382_798_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 	}
 	fn seal_now(r: u32, ) -> Weight {
-		(139_700_000 as Weight)
-			.saturating_add((368_961_000 as Weight).saturating_mul(r as Weight))
+		(145_806_000 as Weight)
+			// Standard Error: 195_000
+			.saturating_add((382_888_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 	}
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(149_395_000 as Weight)
-			.saturating_add((625_812_000 as Weight).saturating_mul(r as Weight))
+		(154_081_000 as Weight)
+			// Standard Error: 248_000
+			.saturating_add((716_294_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_gas(r: u32, ) -> Weight {
-		(125_777_000 as Weight)
-			.saturating_add((187_585_000 as Weight).saturating_mul(r as Weight))
+		(149_684_000 as Weight)
+			// Standard Error: 460_000
+			.saturating_add((196_251_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 	}
 	fn seal_input(r: u32, ) -> Weight {
-		(132_584_000 as Weight)
-			.saturating_add((7_661_000 as Weight).saturating_mul(r as Weight))
+		(135_447_000 as Weight)
+			// Standard Error: 75_000
+			.saturating_add((8_362_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 	}
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(143_408_000 as Weight)
-			.saturating_add((274_000 as Weight).saturating_mul(n as Weight))
+		(146_099_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((270_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 	}
 	fn seal_return(r: u32, ) -> Weight {
-		(126_257_000 as Weight)
-			.saturating_add((5_455_000 as Weight).saturating_mul(r as Weight))
+		(125_358_000 as Weight)
+			// Standard Error: 52_000
+			.saturating_add((5_454_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 	}
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(133_286_000 as Weight)
-			.saturating_add((698_000 as Weight).saturating_mul(n as Weight))
+		(135_523_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((785_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 	}
 	fn seal_terminate(r: u32, ) -> Weight {
-		(130_607_000 as Weight)
-			.saturating_add((358_370_000 as Weight).saturating_mul(r as Weight))
+		(135_321_000 as Weight)
+			// Standard Error: 100_000
+			.saturating_add((110_300_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
-			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(T::DbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_restore_to(r: u32, ) -> Weight {
-		(233_645_000 as Weight)
-			.saturating_add((135_355_000 as Weight).saturating_mul(r as Weight))
+		(242_790_000 as Weight)
+			// Standard Error: 823_000
+			.saturating_add((135_544_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_restore_to_per_delta(d: u32, ) -> Weight {
-		(74_573_000 as Weight)
-			.saturating_add((3_768_682_000 as Weight).saturating_mul(d as Weight))
+		(34_052_000 as Weight)
+			// Standard Error: 2_395_000
+			.saturating_add((3_970_866_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
 	}
 	fn seal_random(r: u32, ) -> Weight {
-		(140_286_000 as Weight)
-			.saturating_add((950_890_000 as Weight).saturating_mul(r as Weight))
+		(154_549_000 as Weight)
+			// Standard Error: 692_000
+			.saturating_add((989_540_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(167_735_000 as Weight)
-			.saturating_add((1_375_429_000 as Weight).saturating_mul(r as Weight))
+		(125_367_000 as Weight)
+			// Standard Error: 977_000
+			.saturating_add((1_424_216_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 	}
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_715_857_000 as Weight)
-			.saturating_add((760_777_000 as Weight).saturating_mul(t as Weight))
-			.saturating_add((241_853_000 as Weight).saturating_mul(n as Weight))
+		(1_843_333_000 as Weight)
+			// Standard Error: 3_040_000
+			.saturating_add((771_663_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 599_000
+			.saturating_add((251_555_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(156_911_000 as Weight)
-			.saturating_add((1_006_139_000 as Weight).saturating_mul(r as Weight))
+		(136_437_000 as Weight)
+			// Standard Error: 299_000
+			.saturating_add((1_072_778_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((14_938_793_000 as Weight).saturating_mul(r as Weight))
+		(182_452_000 as Weight)
+			// Standard Error: 26_839_000
+			.saturating_add((15_911_876_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(2_300_169_000 as Weight)
-			.saturating_add((204_543_000 as Weight).saturating_mul(n as Weight))
+		(2_385_415_000 as Weight)
+			// Standard Error: 751_000
+			.saturating_add((223_264_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn seal_clear_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			.saturating_add((5_140_241_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 2_154_000
+			.saturating_add((5_341_117_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_get_storage(r: u32, ) -> Weight {
-		(45_212_000 as Weight)
-			.saturating_add((1_131_504_000 as Weight).saturating_mul(r as Weight))
+		(62_353_000 as Weight)
+			// Standard Error: 1_183_000
+			.saturating_add((1_141_653_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(885_531_000 as Weight)
-			.saturating_add((148_986_000 as Weight).saturating_mul(n as Weight))
+		(905_905_000 as Weight)
+			// Standard Error: 363_000
+			.saturating_add((155_161_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_transfer(r: u32, ) -> Weight {
-		(92_276_000 as Weight)
-			.saturating_add((6_216_852_000 as Weight).saturating_mul(r as Weight))
+		(60_519_000 as Weight)
+			// Standard Error: 1_942_000
+			.saturating_add((6_453_551_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_call(r: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((10_734_719_000 as Weight).saturating_mul(r as Weight))
+		(192_122_000 as Weight)
+			// Standard Error: 7_851_000
+			.saturating_add((10_736_771_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight {
-		(12_735_614_000 as Weight)
-			.saturating_add((2_870_730_000 as Weight).saturating_mul(t as Weight))
-			.saturating_add((52_569_000 as Weight).saturating_mul(i as Weight))
-			.saturating_add((73_956_000 as Weight).saturating_mul(o as Weight))
+		(10_599_501_000 as Weight)
+			// Standard Error: 133_182_000
+			.saturating_add((5_423_848_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 47_000
+			.saturating_add((60_108_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 50_000
+			.saturating_add((82_691_000 as Weight).saturating_mul(o as Weight))
 			.saturating_add(T::DbWeight::get().reads(105 as Weight))
 			.saturating_add(T::DbWeight::get().reads((101 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(T::DbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			.saturating_add((22_365_908_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 39_807_000
+			.saturating_add((22_562_812_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes((200 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_instantiate_per_input_output_salt_kb(i: u32, o: u32, s: u32, ) -> Weight {
-		(18_899_296_000 as Weight)
-			.saturating_add((53_289_000 as Weight).saturating_mul(i as Weight))
-			.saturating_add((76_026_000 as Weight).saturating_mul(o as Weight))
-			.saturating_add((281_097_000 as Weight).saturating_mul(s as Weight))
+		(19_823_256_000 as Weight)
+			// Standard Error: 153_000
+			.saturating_add((60_707_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 153_000
+			.saturating_add((83_770_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 153_000
+			.saturating_add((284_423_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(207 as Weight))
 			.saturating_add(T::DbWeight::get().writes(202 as Weight))
 	}
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(136_601_000 as Weight)
-			.saturating_add((323_373_000 as Weight).saturating_mul(r as Weight))
+		(142_838_000 as Weight)
+			// Standard Error: 243_000
+			.saturating_add((332_354_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 	}
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(777_563_000 as Weight)
-			.saturating_add((423_353_000 as Weight).saturating_mul(n as Weight))
+		(877_119_000 as Weight)
+			// Standard Error: 73_000
+			.saturating_add((434_752_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 	}
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(136_771_000 as Weight)
-			.saturating_add((337_881_000 as Weight).saturating_mul(r as Weight))
+		(139_913_000 as Weight)
+			// Standard Error: 160_000
+			.saturating_add((345_830_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 	}
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(337_906_000 as Weight)
-			.saturating_add((336_778_000 as Weight).saturating_mul(n as Weight))
+		(723_122_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((343_949_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 	}
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(131_040_000 as Weight)
-			.saturating_add((312_992_000 as Weight).saturating_mul(r as Weight))
+		(137_249_000 as Weight)
+			// Standard Error: 168_000
+			.saturating_add((320_295_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 	}
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(693_415_000 as Weight)
-			.saturating_add((152_745_000 as Weight).saturating_mul(n as Weight))
+		(736_756_000 as Weight)
+			// Standard Error: 39_000
+			.saturating_add((159_952_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 	}
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(135_654_000 as Weight)
-			.saturating_add((311_271_000 as Weight).saturating_mul(r as Weight))
+		(124_530_000 as Weight)
+			// Standard Error: 203_000
+			.saturating_add((321_292_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 	}
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(839_521_000 as Weight)
-			.saturating_add((153_146_000 as Weight).saturating_mul(n as Weight))
+		(782_032_000 as Weight)
+			// Standard Error: 36_000
+			.saturating_add((159_878_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(26_679_000 as Weight)
-			.saturating_add((3_155_000 as Weight).saturating_mul(r as Weight))
+		(24_624_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((3_280_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(28_920_000 as Weight)
-			.saturating_add((159_343_000 as Weight).saturating_mul(r as Weight))
+		(27_171_000 as Weight)
+			// Standard Error: 62_000
+			.saturating_add((161_737_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(28_928_000 as Weight)
-			.saturating_add((227_286_000 as Weight).saturating_mul(r as Weight))
+		(27_106_000 as Weight)
+			// Standard Error: 94_000
+			.saturating_add((229_960_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(26_591_000 as Weight)
-			.saturating_add((12_591_000 as Weight).saturating_mul(r as Weight))
+		(24_566_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((12_157_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(26_597_000 as Weight)
-			.saturating_add((12_258_000 as Weight).saturating_mul(r as Weight))
+		(24_531_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((12_007_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(26_586_000 as Weight)
-			.saturating_add((5_811_000 as Weight).saturating_mul(r as Weight))
+		(24_567_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((6_132_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(26_581_000 as Weight)
-			.saturating_add((14_058_000 as Weight).saturating_mul(r as Weight))
+		(24_628_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((13_480_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(26_615_000 as Weight)
-			.saturating_add((15_687_000 as Weight).saturating_mul(r as Weight))
+		(24_653_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((15_005_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(40_963_000 as Weight)
-			.saturating_add((92_000 as Weight).saturating_mul(e as Weight))
+		(38_573_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((118_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(26_880_000 as Weight)
-			.saturating_add((97_523_000 as Weight).saturating_mul(r as Weight))
+		(24_952_000 as Weight)
+			// Standard Error: 61_000
+			.saturating_add((99_409_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(34_628_000 as Weight)
-			.saturating_add((201_913_000 as Weight).saturating_mul(r as Weight))
+		(32_478_000 as Weight)
+			// Standard Error: 242_000
+			.saturating_add((193_797_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(255_763_000 as Weight)
-			.saturating_add((3_612_000 as Weight).saturating_mul(p as Weight))
+		(238_200_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((3_467_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(45_954_000 as Weight)
-			.saturating_add((3_439_000 as Weight).saturating_mul(r as Weight))
+		(41_994_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((3_230_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(45_952_000 as Weight)
-			.saturating_add((3_601_000 as Weight).saturating_mul(r as Weight))
+		(41_994_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((3_558_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(45_883_000 as Weight)
-			.saturating_add((5_203_000 as Weight).saturating_mul(r as Weight))
+		(41_965_000 as Weight)
+			// Standard Error: 33_000
+			.saturating_add((4_806_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(29_895_000 as Weight)
-			.saturating_add((8_221_000 as Weight).saturating_mul(r as Weight))
+		(27_997_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((7_859_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(29_916_000 as Weight)
-			.saturating_add((12_036_000 as Weight).saturating_mul(r as Weight))
+		(28_118_000 as Weight)
+			// Standard Error: 33_000
+			.saturating_add((11_825_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(28_878_000 as Weight)
-			.saturating_add((3_794_000 as Weight).saturating_mul(r as Weight))
+		(27_172_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((3_466_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(27_351_000 as Weight)
-			.saturating_add((2_302_301_000 as Weight).saturating_mul(r as Weight))
+		(25_582_000 as Weight)
+			// Standard Error: 4_756_000
+			.saturating_add((2_290_170_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(26_535_000 as Weight)
-			.saturating_add((5_450_000 as Weight).saturating_mul(r as Weight))
+		(24_712_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((5_226_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(26_489_000 as Weight)
-			.saturating_add((5_410_000 as Weight).saturating_mul(r as Weight))
+		(24_631_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((5_282_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(26_576_000 as Weight)
-			.saturating_add((5_976_000 as Weight).saturating_mul(r as Weight))
+		(24_640_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((5_964_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(26_521_000 as Weight)
-			.saturating_add((5_465_000 as Weight).saturating_mul(r as Weight))
+		(24_631_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((5_128_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(26_534_000 as Weight)
-			.saturating_add((5_375_000 as Weight).saturating_mul(r as Weight))
+		(24_540_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((5_224_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(26_560_000 as Weight)
-			.saturating_add((5_284_000 as Weight).saturating_mul(r as Weight))
+		(24_623_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((5_138_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(26_554_000 as Weight)
-			.saturating_add((5_358_000 as Weight).saturating_mul(r as Weight))
+		(24_623_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((5_242_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(26_549_000 as Weight)
-			.saturating_add((7_402_000 as Weight).saturating_mul(r as Weight))
+		(24_575_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((7_328_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(26_582_000 as Weight)
-			.saturating_add((7_266_000 as Weight).saturating_mul(r as Weight))
+		(24_674_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((7_147_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(26_558_000 as Weight)
-			.saturating_add((7_293_000 as Weight).saturating_mul(r as Weight))
+		(24_645_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((7_158_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(26_569_000 as Weight)
-			.saturating_add((7_278_000 as Weight).saturating_mul(r as Weight))
+		(24_688_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((7_226_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(26_516_000 as Weight)
-			.saturating_add((7_334_000 as Weight).saturating_mul(r as Weight))
+		(24_579_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((7_187_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(26_561_000 as Weight)
-			.saturating_add((7_283_000 as Weight).saturating_mul(r as Weight))
+		(24_578_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((7_235_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(26_589_000 as Weight)
-			.saturating_add((7_244_000 as Weight).saturating_mul(r as Weight))
+		(24_625_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((7_089_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(26_593_000 as Weight)
-			.saturating_add((7_318_000 as Weight).saturating_mul(r as Weight))
+		(24_589_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((7_078_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(26_626_000 as Weight)
-			.saturating_add((7_348_000 as Weight).saturating_mul(r as Weight))
+		(24_572_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((7_286_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(26_595_000 as Weight)
-			.saturating_add((7_330_000 as Weight).saturating_mul(r as Weight))
+		(24_566_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((7_247_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(26_568_000 as Weight)
-			.saturating_add((8_657_000 as Weight).saturating_mul(r as Weight))
+		(24_581_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_190_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(27_393_000 as Weight)
-			.saturating_add((6_743_000 as Weight).saturating_mul(r as Weight))
+		(24_565_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((7_242_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(26_571_000 as Weight)
-			.saturating_add((7_329_000 as Weight).saturating_mul(r as Weight))
+		(24_542_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((7_216_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(26_585_000 as Weight)
-			.saturating_add((12_977_000 as Weight).saturating_mul(r as Weight))
+		(24_608_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((12_966_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(26_554_000 as Weight)
-			.saturating_add((11_955_000 as Weight).saturating_mul(r as Weight))
+		(24_564_000 as Weight)
+			// Standard Error: 1_424_000
+			.saturating_add((13_665_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(26_570_000 as Weight)
-			.saturating_add((12_903_000 as Weight).saturating_mul(r as Weight))
+		(24_611_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((12_932_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(26_561_000 as Weight)
-			.saturating_add((12_112_000 as Weight).saturating_mul(r as Weight))
+		(24_590_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((12_207_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(26_587_000 as Weight)
-			.saturating_add((7_411_000 as Weight).saturating_mul(r as Weight))
+		(24_622_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((7_172_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(26_588_000 as Weight)
-			.saturating_add((7_479_000 as Weight).saturating_mul(r as Weight))
+		(24_585_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_202_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(26_541_000 as Weight)
-			.saturating_add((7_386_000 as Weight).saturating_mul(r as Weight))
+		(24_600_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((7_182_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(26_562_000 as Weight)
-			.saturating_add((7_263_000 as Weight).saturating_mul(r as Weight))
+		(24_621_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((7_226_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(26_569_000 as Weight)
-			.saturating_add((7_353_000 as Weight).saturating_mul(r as Weight))
+		(24_643_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((7_254_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(26_533_000 as Weight)
-			.saturating_add((7_342_000 as Weight).saturating_mul(r as Weight))
+		(24_586_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((7_246_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(26_545_000 as Weight)
-			.saturating_add((7_362_000 as Weight).saturating_mul(r as Weight))
+		(24_631_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((7_306_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(26_535_000 as Weight)
-			.saturating_add((7_330_000 as Weight).saturating_mul(r as Weight))
+		(24_643_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((7_183_000 as Weight).saturating_mul(r as Weight))
 	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
+	fn on_initialize() -> Weight {
+		(7_239_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+	}
+	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
+		(40_584_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((2_314_000 as Weight).saturating_mul(k as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
+	}
+	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
+		(0 as Weight)
+			// Standard Error: 175_000
+			.saturating_add((135_919_000 as Weight).saturating_mul(q as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+	}
 	fn update_schedule() -> Weight {
-		(35_214_000 as Weight)
+		(36_262_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn put_code(n: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((109_242_000 as Weight).saturating_mul(n as Weight))
+		(22_510_000 as Weight)
+			// Standard Error: 209_000
+			.saturating_add((113_251_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn instantiate(n: u32, s: u32, ) -> Weight {
-		(195_276_000 as Weight)
-			.saturating_add((35_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add((2_244_000 as Weight).saturating_mul(s as Weight))
+		(216_181_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((6_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 1_000
+			.saturating_add((2_240_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn call() -> Weight {
-		(207_142_000 as Weight)
+		(209_785_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn claim_surcharge() -> Weight {
-		(489_633_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+		(302_124_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn seal_caller(r: u32, ) -> Weight {
-		(136_550_000 as Weight)
-			.saturating_add((373_182_000 as Weight).saturating_mul(r as Weight))
+		(138_697_000 as Weight)
+			// Standard Error: 412_000
+			.saturating_add((390_370_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 	}
 	fn seal_address(r: u32, ) -> Weight {
-		(136_329_000 as Weight)
-			.saturating_add((373_392_000 as Weight).saturating_mul(r as Weight))
+		(141_999_000 as Weight)
+			// Standard Error: 218_000
+			.saturating_add((389_261_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 	}
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(111_577_000 as Weight)
-			.saturating_add((373_536_000 as Weight).saturating_mul(r as Weight))
+		(134_956_000 as Weight)
+			// Standard Error: 205_000
+			.saturating_add((384_439_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 	}
 	fn seal_balance(r: u32, ) -> Weight {
-		(157_531_000 as Weight)
-			.saturating_add((810_382_000 as Weight).saturating_mul(r as Weight))
+		(130_585_000 as Weight)
+			// Standard Error: 784_000
+			.saturating_add((860_797_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(143_801_000 as Weight)
-			.saturating_add((369_769_000 as Weight).saturating_mul(r as Weight))
+		(138_382_000 as Weight)
+			// Standard Error: 163_000
+			.saturating_add((384_676_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 	}
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(133_546_000 as Weight)
-			.saturating_add((370_036_000 as Weight).saturating_mul(r as Weight))
+		(137_766_000 as Weight)
+			// Standard Error: 218_000
+			.saturating_add((386_002_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 	}
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(138_568_000 as Weight)
-			.saturating_add((370_322_000 as Weight).saturating_mul(r as Weight))
+		(144_552_000 as Weight)
+			// Standard Error: 187_000
+			.saturating_add((384_754_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 	}
 	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(144_431_000 as Weight)
-			.saturating_add((851_810_000 as Weight).saturating_mul(r as Weight))
+		(150_812_000 as Weight)
+			// Standard Error: 276_000
+			.saturating_add((903_965_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 	}
 	fn seal_block_number(r: u32, ) -> Weight {
-		(133_237_000 as Weight)
-			.saturating_add((369_156_000 as Weight).saturating_mul(r as Weight))
+		(145_168_000 as Weight)
+			// Standard Error: 191_000
+			.saturating_add((382_798_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 	}
 	fn seal_now(r: u32, ) -> Weight {
-		(139_700_000 as Weight)
-			.saturating_add((368_961_000 as Weight).saturating_mul(r as Weight))
+		(145_806_000 as Weight)
+			// Standard Error: 195_000
+			.saturating_add((382_888_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 	}
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(149_395_000 as Weight)
-			.saturating_add((625_812_000 as Weight).saturating_mul(r as Weight))
+		(154_081_000 as Weight)
+			// Standard Error: 248_000
+			.saturating_add((716_294_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_gas(r: u32, ) -> Weight {
-		(125_777_000 as Weight)
-			.saturating_add((187_585_000 as Weight).saturating_mul(r as Weight))
+		(149_684_000 as Weight)
+			// Standard Error: 460_000
+			.saturating_add((196_251_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 	}
 	fn seal_input(r: u32, ) -> Weight {
-		(132_584_000 as Weight)
-			.saturating_add((7_661_000 as Weight).saturating_mul(r as Weight))
+		(135_447_000 as Weight)
+			// Standard Error: 75_000
+			.saturating_add((8_362_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 	}
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(143_408_000 as Weight)
-			.saturating_add((274_000 as Weight).saturating_mul(n as Weight))
+		(146_099_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((270_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 	}
 	fn seal_return(r: u32, ) -> Weight {
-		(126_257_000 as Weight)
-			.saturating_add((5_455_000 as Weight).saturating_mul(r as Weight))
+		(125_358_000 as Weight)
+			// Standard Error: 52_000
+			.saturating_add((5_454_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 	}
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(133_286_000 as Weight)
-			.saturating_add((698_000 as Weight).saturating_mul(n as Weight))
+		(135_523_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((785_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 	}
 	fn seal_terminate(r: u32, ) -> Weight {
-		(130_607_000 as Weight)
-			.saturating_add((358_370_000 as Weight).saturating_mul(r as Weight))
+		(135_321_000 as Weight)
+			// Standard Error: 100_000
+			.saturating_add((110_300_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			.saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
-			.saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(RocksDbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_restore_to(r: u32, ) -> Weight {
-		(233_645_000 as Weight)
-			.saturating_add((135_355_000 as Weight).saturating_mul(r as Weight))
+		(242_790_000 as Weight)
+			// Standard Error: 823_000
+			.saturating_add((135_544_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_restore_to_per_delta(d: u32, ) -> Weight {
-		(74_573_000 as Weight)
-			.saturating_add((3_768_682_000 as Weight).saturating_mul(d as Weight))
+		(34_052_000 as Weight)
+			// Standard Error: 2_395_000
+			.saturating_add((3_970_866_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
 	}
 	fn seal_random(r: u32, ) -> Weight {
-		(140_286_000 as Weight)
-			.saturating_add((950_890_000 as Weight).saturating_mul(r as Weight))
+		(154_549_000 as Weight)
+			// Standard Error: 692_000
+			.saturating_add((989_540_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(167_735_000 as Weight)
-			.saturating_add((1_375_429_000 as Weight).saturating_mul(r as Weight))
+		(125_367_000 as Weight)
+			// Standard Error: 977_000
+			.saturating_add((1_424_216_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 	}
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_715_857_000 as Weight)
-			.saturating_add((760_777_000 as Weight).saturating_mul(t as Weight))
-			.saturating_add((241_853_000 as Weight).saturating_mul(n as Weight))
+		(1_843_333_000 as Weight)
+			// Standard Error: 3_040_000
+			.saturating_add((771_663_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 599_000
+			.saturating_add((251_555_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(156_911_000 as Weight)
-			.saturating_add((1_006_139_000 as Weight).saturating_mul(r as Weight))
+		(136_437_000 as Weight)
+			// Standard Error: 299_000
+			.saturating_add((1_072_778_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((14_938_793_000 as Weight).saturating_mul(r as Weight))
+		(182_452_000 as Weight)
+			// Standard Error: 26_839_000
+			.saturating_add((15_911_876_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(2_300_169_000 as Weight)
-			.saturating_add((204_543_000 as Weight).saturating_mul(n as Weight))
+		(2_385_415_000 as Weight)
+			// Standard Error: 751_000
+			.saturating_add((223_264_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn seal_clear_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			.saturating_add((5_140_241_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 2_154_000
+			.saturating_add((5_341_117_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_get_storage(r: u32, ) -> Weight {
-		(45_212_000 as Weight)
-			.saturating_add((1_131_504_000 as Weight).saturating_mul(r as Weight))
+		(62_353_000 as Weight)
+			// Standard Error: 1_183_000
+			.saturating_add((1_141_653_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(885_531_000 as Weight)
-			.saturating_add((148_986_000 as Weight).saturating_mul(n as Weight))
+		(905_905_000 as Weight)
+			// Standard Error: 363_000
+			.saturating_add((155_161_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_transfer(r: u32, ) -> Weight {
-		(92_276_000 as Weight)
-			.saturating_add((6_216_852_000 as Weight).saturating_mul(r as Weight))
+		(60_519_000 as Weight)
+			// Standard Error: 1_942_000
+			.saturating_add((6_453_551_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_call(r: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((10_734_719_000 as Weight).saturating_mul(r as Weight))
+		(192_122_000 as Weight)
+			// Standard Error: 7_851_000
+			.saturating_add((10_736_771_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight {
-		(12_735_614_000 as Weight)
-			.saturating_add((2_870_730_000 as Weight).saturating_mul(t as Weight))
-			.saturating_add((52_569_000 as Weight).saturating_mul(i as Weight))
-			.saturating_add((73_956_000 as Weight).saturating_mul(o as Weight))
+		(10_599_501_000 as Weight)
+			// Standard Error: 133_182_000
+			.saturating_add((5_423_848_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 47_000
+			.saturating_add((60_108_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 50_000
+			.saturating_add((82_691_000 as Weight).saturating_mul(o as Weight))
 			.saturating_add(RocksDbWeight::get().reads(105 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((101 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			.saturating_add((22_365_908_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 39_807_000
+			.saturating_add((22_562_812_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((200 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_instantiate_per_input_output_salt_kb(i: u32, o: u32, s: u32, ) -> Weight {
-		(18_899_296_000 as Weight)
-			.saturating_add((53_289_000 as Weight).saturating_mul(i as Weight))
-			.saturating_add((76_026_000 as Weight).saturating_mul(o as Weight))
-			.saturating_add((281_097_000 as Weight).saturating_mul(s as Weight))
+		(19_823_256_000 as Weight)
+			// Standard Error: 153_000
+			.saturating_add((60_707_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 153_000
+			.saturating_add((83_770_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 153_000
+			.saturating_add((284_423_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(207 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(202 as Weight))
 	}
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(136_601_000 as Weight)
-			.saturating_add((323_373_000 as Weight).saturating_mul(r as Weight))
+		(142_838_000 as Weight)
+			// Standard Error: 243_000
+			.saturating_add((332_354_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 	}
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(777_563_000 as Weight)
-			.saturating_add((423_353_000 as Weight).saturating_mul(n as Weight))
+		(877_119_000 as Weight)
+			// Standard Error: 73_000
+			.saturating_add((434_752_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 	}
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(136_771_000 as Weight)
-			.saturating_add((337_881_000 as Weight).saturating_mul(r as Weight))
+		(139_913_000 as Weight)
+			// Standard Error: 160_000
+			.saturating_add((345_830_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 	}
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(337_906_000 as Weight)
-			.saturating_add((336_778_000 as Weight).saturating_mul(n as Weight))
+		(723_122_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((343_949_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 	}
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(131_040_000 as Weight)
-			.saturating_add((312_992_000 as Weight).saturating_mul(r as Weight))
+		(137_249_000 as Weight)
+			// Standard Error: 168_000
+			.saturating_add((320_295_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 	}
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(693_415_000 as Weight)
-			.saturating_add((152_745_000 as Weight).saturating_mul(n as Weight))
+		(736_756_000 as Weight)
+			// Standard Error: 39_000
+			.saturating_add((159_952_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 	}
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(135_654_000 as Weight)
-			.saturating_add((311_271_000 as Weight).saturating_mul(r as Weight))
+		(124_530_000 as Weight)
+			// Standard Error: 203_000
+			.saturating_add((321_292_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 	}
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(839_521_000 as Weight)
-			.saturating_add((153_146_000 as Weight).saturating_mul(n as Weight))
+		(782_032_000 as Weight)
+			// Standard Error: 36_000
+			.saturating_add((159_878_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(26_679_000 as Weight)
-			.saturating_add((3_155_000 as Weight).saturating_mul(r as Weight))
+		(24_624_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((3_280_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(28_920_000 as Weight)
-			.saturating_add((159_343_000 as Weight).saturating_mul(r as Weight))
+		(27_171_000 as Weight)
+			// Standard Error: 62_000
+			.saturating_add((161_737_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(28_928_000 as Weight)
-			.saturating_add((227_286_000 as Weight).saturating_mul(r as Weight))
+		(27_106_000 as Weight)
+			// Standard Error: 94_000
+			.saturating_add((229_960_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(26_591_000 as Weight)
-			.saturating_add((12_591_000 as Weight).saturating_mul(r as Weight))
+		(24_566_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((12_157_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(26_597_000 as Weight)
-			.saturating_add((12_258_000 as Weight).saturating_mul(r as Weight))
+		(24_531_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((12_007_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(26_586_000 as Weight)
-			.saturating_add((5_811_000 as Weight).saturating_mul(r as Weight))
+		(24_567_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((6_132_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(26_581_000 as Weight)
-			.saturating_add((14_058_000 as Weight).saturating_mul(r as Weight))
+		(24_628_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((13_480_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(26_615_000 as Weight)
-			.saturating_add((15_687_000 as Weight).saturating_mul(r as Weight))
+		(24_653_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((15_005_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(40_963_000 as Weight)
-			.saturating_add((92_000 as Weight).saturating_mul(e as Weight))
+		(38_573_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((118_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(26_880_000 as Weight)
-			.saturating_add((97_523_000 as Weight).saturating_mul(r as Weight))
+		(24_952_000 as Weight)
+			// Standard Error: 61_000
+			.saturating_add((99_409_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(34_628_000 as Weight)
-			.saturating_add((201_913_000 as Weight).saturating_mul(r as Weight))
+		(32_478_000 as Weight)
+			// Standard Error: 242_000
+			.saturating_add((193_797_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(255_763_000 as Weight)
-			.saturating_add((3_612_000 as Weight).saturating_mul(p as Weight))
+		(238_200_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((3_467_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(45_954_000 as Weight)
-			.saturating_add((3_439_000 as Weight).saturating_mul(r as Weight))
+		(41_994_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((3_230_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(45_952_000 as Weight)
-			.saturating_add((3_601_000 as Weight).saturating_mul(r as Weight))
+		(41_994_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((3_558_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(45_883_000 as Weight)
-			.saturating_add((5_203_000 as Weight).saturating_mul(r as Weight))
+		(41_965_000 as Weight)
+			// Standard Error: 33_000
+			.saturating_add((4_806_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(29_895_000 as Weight)
-			.saturating_add((8_221_000 as Weight).saturating_mul(r as Weight))
+		(27_997_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((7_859_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(29_916_000 as Weight)
-			.saturating_add((12_036_000 as Weight).saturating_mul(r as Weight))
+		(28_118_000 as Weight)
+			// Standard Error: 33_000
+			.saturating_add((11_825_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(28_878_000 as Weight)
-			.saturating_add((3_794_000 as Weight).saturating_mul(r as Weight))
+		(27_172_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((3_466_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(27_351_000 as Weight)
-			.saturating_add((2_302_301_000 as Weight).saturating_mul(r as Weight))
+		(25_582_000 as Weight)
+			// Standard Error: 4_756_000
+			.saturating_add((2_290_170_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(26_535_000 as Weight)
-			.saturating_add((5_450_000 as Weight).saturating_mul(r as Weight))
+		(24_712_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((5_226_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(26_489_000 as Weight)
-			.saturating_add((5_410_000 as Weight).saturating_mul(r as Weight))
+		(24_631_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((5_282_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(26_576_000 as Weight)
-			.saturating_add((5_976_000 as Weight).saturating_mul(r as Weight))
+		(24_640_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((5_964_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(26_521_000 as Weight)
-			.saturating_add((5_465_000 as Weight).saturating_mul(r as Weight))
+		(24_631_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((5_128_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(26_534_000 as Weight)
-			.saturating_add((5_375_000 as Weight).saturating_mul(r as Weight))
+		(24_540_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((5_224_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(26_560_000 as Weight)
-			.saturating_add((5_284_000 as Weight).saturating_mul(r as Weight))
+		(24_623_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((5_138_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(26_554_000 as Weight)
-			.saturating_add((5_358_000 as Weight).saturating_mul(r as Weight))
+		(24_623_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((5_242_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(26_549_000 as Weight)
-			.saturating_add((7_402_000 as Weight).saturating_mul(r as Weight))
+		(24_575_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((7_328_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(26_582_000 as Weight)
-			.saturating_add((7_266_000 as Weight).saturating_mul(r as Weight))
+		(24_674_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((7_147_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(26_558_000 as Weight)
-			.saturating_add((7_293_000 as Weight).saturating_mul(r as Weight))
+		(24_645_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((7_158_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(26_569_000 as Weight)
-			.saturating_add((7_278_000 as Weight).saturating_mul(r as Weight))
+		(24_688_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((7_226_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(26_516_000 as Weight)
-			.saturating_add((7_334_000 as Weight).saturating_mul(r as Weight))
+		(24_579_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((7_187_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(26_561_000 as Weight)
-			.saturating_add((7_283_000 as Weight).saturating_mul(r as Weight))
+		(24_578_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((7_235_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(26_589_000 as Weight)
-			.saturating_add((7_244_000 as Weight).saturating_mul(r as Weight))
+		(24_625_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((7_089_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(26_593_000 as Weight)
-			.saturating_add((7_318_000 as Weight).saturating_mul(r as Weight))
+		(24_589_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((7_078_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(26_626_000 as Weight)
-			.saturating_add((7_348_000 as Weight).saturating_mul(r as Weight))
+		(24_572_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((7_286_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(26_595_000 as Weight)
-			.saturating_add((7_330_000 as Weight).saturating_mul(r as Weight))
+		(24_566_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((7_247_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(26_568_000 as Weight)
-			.saturating_add((8_657_000 as Weight).saturating_mul(r as Weight))
+		(24_581_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_190_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(27_393_000 as Weight)
-			.saturating_add((6_743_000 as Weight).saturating_mul(r as Weight))
+		(24_565_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((7_242_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(26_571_000 as Weight)
-			.saturating_add((7_329_000 as Weight).saturating_mul(r as Weight))
+		(24_542_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((7_216_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(26_585_000 as Weight)
-			.saturating_add((12_977_000 as Weight).saturating_mul(r as Weight))
+		(24_608_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((12_966_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(26_554_000 as Weight)
-			.saturating_add((11_955_000 as Weight).saturating_mul(r as Weight))
+		(24_564_000 as Weight)
+			// Standard Error: 1_424_000
+			.saturating_add((13_665_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(26_570_000 as Weight)
-			.saturating_add((12_903_000 as Weight).saturating_mul(r as Weight))
+		(24_611_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((12_932_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(26_561_000 as Weight)
-			.saturating_add((12_112_000 as Weight).saturating_mul(r as Weight))
+		(24_590_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((12_207_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(26_587_000 as Weight)
-			.saturating_add((7_411_000 as Weight).saturating_mul(r as Weight))
+		(24_622_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((7_172_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(26_588_000 as Weight)
-			.saturating_add((7_479_000 as Weight).saturating_mul(r as Weight))
+		(24_585_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_202_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(26_541_000 as Weight)
-			.saturating_add((7_386_000 as Weight).saturating_mul(r as Weight))
+		(24_600_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((7_182_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(26_562_000 as Weight)
-			.saturating_add((7_263_000 as Weight).saturating_mul(r as Weight))
+		(24_621_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((7_226_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(26_569_000 as Weight)
-			.saturating_add((7_353_000 as Weight).saturating_mul(r as Weight))
+		(24_643_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((7_254_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(26_533_000 as Weight)
-			.saturating_add((7_342_000 as Weight).saturating_mul(r as Weight))
+		(24_586_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((7_246_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(26_545_000 as Weight)
-			.saturating_add((7_362_000 as Weight).saturating_mul(r as Weight))
+		(24_631_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((7_306_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(26_535_000 as Weight)
-			.saturating_add((7_330_000 as Weight).saturating_mul(r as Weight))
+		(24_643_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((7_183_000 as Weight).saturating_mul(r as Weight))
 	}
 }

From 3a904bbf6223f0b5e9f23d1caf444dc49a7a81e1 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Mon, 4 Jan 2021 22:17:59 +0100
Subject: [PATCH 0222/1194] fix template (#7823)

---
 frame/support/procedural/src/storage/print_pallet_upgrade.rs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/frame/support/procedural/src/storage/print_pallet_upgrade.rs b/frame/support/procedural/src/storage/print_pallet_upgrade.rs
index 66da5fd01b57..100bb9b35913 100644
--- a/frame/support/procedural/src/storage/print_pallet_upgrade.rs
+++ b/frame/support/procedural/src/storage/print_pallet_upgrade.rs
@@ -323,10 +323,6 @@ pub mod pallet {{
 	#[pallet::generate_store({store_vis} trait Store)]
 	pub struct Pallet{decl_gen}(PhantomData{use_gen_tuple});
 
-	/// Old name for pallet.
-	#[deprecated(note=\"use `Pallet` instead\")]
-	pub type Module{decl_gen} = Pallet{use_gen};
-
 	#[pallet::interface]
 	impl{impl_gen} Hooks<BlockNumberFor<T>> for Pallet{use_gen}
 		// TODO_MAYBE_WHERE_CLAUSE

From 30009d9c995c3509be745b42ed8b968ca98395d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Tue, 5 Jan 2021 00:23:44 +0000
Subject: [PATCH 0223/1194] rename HEADER files so that they are consistent
 with LICENSE filenames (#7825)

---
 HEADER-APACHE => HEADER-APACHE2 | 0
 HEADER-GPL => HEADER-GPL3       | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename HEADER-APACHE => HEADER-APACHE2 (100%)
 rename HEADER-GPL => HEADER-GPL3 (100%)

diff --git a/HEADER-APACHE b/HEADER-APACHE2
similarity index 100%
rename from HEADER-APACHE
rename to HEADER-APACHE2
diff --git a/HEADER-GPL b/HEADER-GPL3
similarity index 100%
rename from HEADER-GPL
rename to HEADER-GPL3

From 91dd683f68a78a1163a853ad1e6caea0e5e7ab55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Tue, 5 Jan 2021 09:06:44 +0100
Subject: [PATCH 0224/1194] contracts: Prevent contracts from allocating a too
 large buffer (#7818)

* Prevent contracts from allocating a too large buffer

* Fix possible integer overflow
---
 frame/contracts/src/schedule.rs     |  7 +++++++
 frame/contracts/src/wasm/runtime.rs | 27 ++++++++++++++++-----------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/frame/contracts/src/schedule.rs b/frame/contracts/src/schedule.rs
index e6902c53b9c7..63e3f3c28589 100644
--- a/frame/contracts/src/schedule.rs
+++ b/frame/contracts/src/schedule.rs
@@ -110,6 +110,13 @@ pub struct Limits {
 	pub code_size: u32,
 }
 
+impl Limits {
+	/// The maximum memory size in bytes that a contract can occupy.
+	pub fn max_memory_size(&self) -> u32 {
+		self.memory_pages * 64 * 1024
+	}
+}
+
 /// Describes the weight for all categories of supported wasm instructions.
 ///
 /// There there is one field for each wasm instruction that describes the weight to
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index dd4e37b8e8fe..88f51046d9e6 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -23,10 +23,8 @@ use crate::{
 	gas::{Gas, GasMeter, Token, GasMeterResult, ChargedAmount},
 	wasm::env_def::ConvertibleToWasm,
 };
-use sp_sandbox;
 use parity_wasm::elements::ValueType;
-use frame_system;
-use frame_support::dispatch::DispatchError;
+use frame_support::{dispatch::DispatchError, ensure};
 use sp_std::prelude::*;
 use codec::{Decode, DecodeAll, Encode};
 use sp_runtime::traits::SaturatedConversion;
@@ -420,6 +418,7 @@ where
 	pub fn read_sandbox_memory(&self, ptr: u32, len: u32)
 	-> Result<Vec<u8>, DispatchError>
 	{
+		ensure!(len <= self.schedule.limits.max_memory_size(), Error::<E::T>::OutOfBounds);
 		let mut buf = vec![0u8; len as usize];
 		self.memory.get(ptr, buf.as_mut_slice())
 			.map_err(|_| Error::<E::T>::OutOfBounds)?;
@@ -1179,17 +1178,23 @@ define_env!(Env, <E: Ext>,
 		let rent_allowance: BalanceOf<<E as Ext>::T> =
 			ctx.read_sandbox_memory_as(rent_allowance_ptr, rent_allowance_len)?;
 		let delta = {
+			const KEY_SIZE: usize = 32;
+
 			// We can eagerly allocate because we charged for the complete delta count already
-			let mut delta = Vec::with_capacity(delta_count as usize);
+			// We still need to make sure that the allocation isn't larger than the memory
+			// allocator can handle.
+			ensure!(
+				delta_count
+					.saturating_mul(KEY_SIZE as u32) <= ctx.schedule.limits.max_memory_size(),
+				Error::<E::T>::OutOfBounds,
+			);
+			let mut delta = vec![[0; KEY_SIZE]; delta_count as usize];
 			let mut key_ptr = delta_ptr;
 
-			for _ in 0..delta_count {
-				const KEY_SIZE: usize = 32;
-
-				// Read the delta into the provided buffer and collect it into the buffer.
-				let mut delta_key: StorageKey = [0; KEY_SIZE];
-				ctx.read_sandbox_memory_into_buf(key_ptr, &mut delta_key)?;
-				delta.push(delta_key);
+			for i in 0..delta_count {
+				// Read the delta into the provided buffer
+				// This cannot panic because of the loop condition
+				ctx.read_sandbox_memory_into_buf(key_ptr, &mut delta[i as usize])?;
 
 				// Offset key_ptr to the next element.
 				key_ptr = key_ptr.checked_add(KEY_SIZE as u32).ok_or(Error::<E::T>::OutOfBounds)?;

From 80d7559675662a8a51f4a9d618286addb9a9a575 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Tue, 5 Jan 2021 10:51:46 +0100
Subject: [PATCH 0225/1194] Improve error message on where clause on pallet
 error (#7821)

* improve error message on where clause on pallet error

* Revert "improve error message on where clause on pallet error"

This reverts commit 5a3cc38976813fccef3357833553ce30f5b988ea.

* Revert "Revert "improve error message on where clause on pallet error""

This reverts commit e3b3fca6bc4fa89816f80dbcb82dc4536a9b2549.
---
 .../procedural/src/pallet/parse/error.rs      |  2 +-
 frame/support/src/lib.rs                      |  2 ++
 .../tests/pallet_ui/error_where_clause.rs     | 23 +++++++++++++++++++
 .../tests/pallet_ui/error_where_clause.stderr |  5 ++++
 4 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 frame/support/test/tests/pallet_ui/error_where_clause.rs
 create mode 100644 frame/support/test/tests/pallet_ui/error_where_clause.stderr

diff --git a/frame/support/procedural/src/pallet/parse/error.rs b/frame/support/procedural/src/pallet/parse/error.rs
index 7df88ce7b821..cc8b7f11ff40 100644
--- a/frame/support/procedural/src/pallet/parse/error.rs
+++ b/frame/support/procedural/src/pallet/parse/error.rs
@@ -53,7 +53,7 @@ impl ErrorDef {
 		instances.push(helper::check_type_def_gen_no_bounds(&item.generics, item.ident.span())?);
 
 		if item.generics.where_clause.is_some() {
-			let msg = "Invalid pallet::error, unexpected where clause";
+			let msg = "Invalid pallet::error, where clause is not allowed on pallet error item";
 			return Err(syn::Error::new(item.generics.where_clause.as_ref().unwrap().span(), msg));
 		}
 
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index da4bfbb5d86b..911c060729a3 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -1256,6 +1256,8 @@ pub mod pallet_prelude {
 /// }
 /// ```
 /// I.e. a regular rust enum named `Error`, with generic `T` and fieldless variants.
+/// The generic `T` mustn't bound anything and where clause is not allowed. But bounds and where
+/// clause shouldn't be needed for any usecase.
 ///
 /// ### Macro expansion
 ///
diff --git a/frame/support/test/tests/pallet_ui/error_where_clause.rs b/frame/support/test/tests/pallet_ui/error_where_clause.rs
new file mode 100644
index 000000000000..29d7435bc4bc
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/error_where_clause.rs
@@ -0,0 +1,23 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::error]
+	pub enum Error<T> where u32: From<u8> {}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/error_where_clause.stderr b/frame/support/test/tests/pallet_ui/error_where_clause.stderr
new file mode 100644
index 000000000000..8e9d0e60692d
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/error_where_clause.stderr
@@ -0,0 +1,5 @@
+error: Invalid pallet::error, where clause is not allowed on pallet error item
+  --> $DIR/error_where_clause.rs:19:20
+   |
+19 |     pub enum Error<T> where u32: From<u8> {}
+   |                       ^^^^^

From 4dcde7e913bc16b11e72554db49d8437621c7d46 Mon Sep 17 00:00:00 2001
From: honeywest <50997103+honeywest@users.noreply.github.com>
Date: Tue, 5 Jan 2021 19:32:35 +0800
Subject: [PATCH 0226/1194] Feat sp keystore (#7826)

* delete not used VRFTranscriptValue

* specification variable naming
---
 primitives/keystore/src/lib.rs | 6 +++---
 primitives/keystore/src/vrf.rs | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/primitives/keystore/src/lib.rs b/primitives/keystore/src/lib.rs
index 25f8cb496547..f42f6dd7122d 100644
--- a/primitives/keystore/src/lib.rs
+++ b/primitives/keystore/src/lib.rs
@@ -96,9 +96,9 @@ pub trait CryptoStore: Send + Sync {
 	/// `Err` if there's some sort of weird filesystem error, but should generally be `Ok`.
 	async fn insert_unknown(
 		&self,
-		_key_type: KeyTypeId,
-		_suri: &str,
-		_public: &[u8]
+		id: KeyTypeId,
+		suri: &str,
+		public: &[u8]
 	) -> Result<(), ()>;
 
 	/// Find intersection between provided keys and supported keys
diff --git a/primitives/keystore/src/vrf.rs b/primitives/keystore/src/vrf.rs
index 759c8263cebc..463a565f9d86 100644
--- a/primitives/keystore/src/vrf.rs
+++ b/primitives/keystore/src/vrf.rs
@@ -70,7 +70,6 @@ pub fn make_transcript(data: VRFTranscriptData) -> Transcript {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use crate::vrf::VRFTranscriptValue;
 	use rand::RngCore;
 	use rand_chacha::{
 		rand_core::SeedableRng,

From 0091c0927fb27c7f4d49e77ab981b4454417becc Mon Sep 17 00:00:00 2001
From: kaichao <kaichaosuna@gmail.com>
Date: Tue, 5 Jan 2021 19:55:21 +0800
Subject: [PATCH 0227/1194] minor fix (#7828)

---
 client/api/src/cht.rs                                 |  2 +-
 client/consensus/aura/src/lib.rs                      |  2 +-
 client/service/src/client/client.rs                   |  2 +-
 frame/support/src/weights.rs                          | 11 ++++++-----
 primitives/externalities/src/extensions.rs            |  2 +-
 .../state-machine/src/changes_trie/build_cache.rs     |  2 +-
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/client/api/src/cht.rs b/client/api/src/cht.rs
index b4c4ce70cb3e..8fec00403bde 100644
--- a/client/api/src/cht.rs
+++ b/client/api/src/cht.rs
@@ -22,7 +22,7 @@
 //! One is generated for every `SIZE` blocks, allowing us to discard those blocks in
 //! favor of the trie root. When the "ancient" blocks need to be accessed, we simply
 //! request an inclusion proof of a specific block number against the trie with the
-//! root has. A correct proof implies that the claimed block is identical to the one
+//! root hash. A correct proof implies that the claimed block is identical to the one
 //! we discarded.
 
 use hash_db;
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index 60aad59e8f97..84d3783927e5 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -256,7 +256,7 @@ where
 	) -> Option<Self::Claim> {
 		let expected_author = slot_author::<P>(slot_number, epoch_data);
 		expected_author.and_then(|p| {
-			 if SyncCryptoStore::has_keys(
+			if SyncCryptoStore::has_keys(
 				 &*self.keystore,
 				 &[(p.to_raw_vec(), sp_application_crypto::key_types::AURA)],
 			) {
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index d8884f235f90..d52a3666db85 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -1306,7 +1306,7 @@ impl<B, E, Block, RA> BlockBuilderProvider<B, Block, Self> for Client<B, E, Bloc
 	}
 }
 
-impl<B, E, Block, RA>  ExecutorProvider<Block> for Client<B, E, Block, RA> where
+impl<B, E, Block, RA> ExecutorProvider<Block> for Client<B, E, Block, RA> where
 	B: backend::Backend<Block>,
 	E: CallExecutor<Block>,
 	Block: BlockT,
diff --git a/frame/support/src/weights.rs b/frame/support/src/weights.rs
index 7fde8b342c4b..32dc9e1f2529 100644
--- a/frame/support/src/weights.rs
+++ b/frame/support/src/weights.rs
@@ -24,7 +24,7 @@
 //! - [`ClassifyDispatch`]: class of the dispatch.
 //! - [`PaysFee`]: weather this weight should be translated to fee and deducted upon dispatch.
 //!
-//! Substrate then bundles then output information of the two traits into [`DispatchInfo`] struct
+//! Substrate then bundles the output information of the three traits into [`DispatchInfo`] struct
 //! and provides it by implementing the [`GetDispatchInfo`] for all `Call` both inner and outer call
 //! types.
 //!
@@ -91,10 +91,11 @@
 //! # fn main() {}
 //! ```
 //!
-//! ### 2. Define weights as a function of input arguments using `FunctionOf` tuple struct. This struct works
-//! in a similar manner as above. 3 items must be provided and each can be either a fixed value or a
-//! function/closure with the same parameters list as the dispatchable function itself, wrapper in a
-//! tuple.
+//! ### 2. Define weights as a function of input arguments using `FunctionOf` tuple struct.
+//!
+//! This struct works in a similar manner as above. 3 items must be provided and each can be either
+//! a fixed value or a function/closure with the same parameters list as the dispatchable function
+//! itself, wrapper in a tuple.
 //!
 //! Using this only makes sense if you want to use a function for at least one of the elements. If
 //! all 3 are static values, providing a raw tuple is easier.
diff --git a/primitives/externalities/src/extensions.rs b/primitives/externalities/src/extensions.rs
index 611951dd1a56..69c6c09be448 100644
--- a/primitives/externalities/src/extensions.rs
+++ b/primitives/externalities/src/extensions.rs
@@ -98,7 +98,7 @@ pub trait ExtensionStore {
 	/// instead of this function to get type system support and automatic type downcasting.
 	fn extension_by_type_id(&mut self, type_id: TypeId) -> Option<&mut dyn Any>;
 
-	/// Register extension `extension` with speciifed `type_id`.
+	/// Register extension `extension` with specified `type_id`.
 	///
 	/// It should return error if extension is already registered.
 	fn register_extension_with_type_id(&mut self, type_id: TypeId, extension: Box<dyn Extension>) -> Result<(), Error>;
diff --git a/primitives/state-machine/src/changes_trie/build_cache.rs b/primitives/state-machine/src/changes_trie/build_cache.rs
index 901ea86835af..9b2190ae1951 100644
--- a/primitives/state-machine/src/changes_trie/build_cache.rs
+++ b/primitives/state-machine/src/changes_trie/build_cache.rs
@@ -34,7 +34,7 @@ use sp_core::storage::PrefixedStorageKey;
 /// is inserted (because digest block will includes all keys from this entry).
 /// When there's a fork, entries are pruned when first changes trie is inserted.
 pub struct BuildCache<H, N> {
-	/// Map of block (implies changes true) number => changes trie root.
+	/// Map of block (implies changes trie) number => changes trie root.
 	roots_by_number: HashMap<N, H>,
 	/// Map of changes trie root => set of storage keys that are in this trie.
 	/// The `Option<Vec<u8>>` in inner `HashMap` stands for the child storage key.

From 1b840aa0d7eb88919b7503843cff3a7ddf66564c Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Tue, 5 Jan 2021 09:58:04 -0400
Subject: [PATCH 0228/1194] Participation Lottery Pallet (#7221)

* Basic design

* start adding tests

* finish tests

* clean up crates

* use call index for match

* finish benchmarks

* add to runtime

* fix

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_lottery --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/lottery/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* more efficient storage

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_lottery --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/lottery/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Update lib.rs

* Update bin/node/runtime/src/lib.rs

* trait -> config

* add repeating lottery

* new benchmarks

* fix build

* move trait for warning

* feedback from @xlc

* add stop_repeat

* fix

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_lottery --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/lottery/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Support static calls

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_lottery --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/lottery/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* fix test

* add loop to mitigate modulo bias

* Update weights for worst case scenario loop

* Initialize pot with ED

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_lottery --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/lottery/src/weights.rs --template=./.maintain/frame-weight-template.hbs

Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
---
 Cargo.lock                        |  16 ++
 Cargo.toml                        |   1 +
 bin/node/runtime/Cargo.toml       |   3 +
 bin/node/runtime/src/lib.rs       |  21 ++
 frame/lottery/Cargo.toml          |  42 +++
 frame/lottery/src/benchmarking.rs | 192 +++++++++++++
 frame/lottery/src/lib.rs          | 452 ++++++++++++++++++++++++++++++
 frame/lottery/src/mock.rs         | 138 +++++++++
 frame/lottery/src/tests.rs        | 261 +++++++++++++++++
 frame/lottery/src/weights.rs      | 124 ++++++++
 10 files changed, 1250 insertions(+)
 create mode 100644 frame/lottery/Cargo.toml
 create mode 100644 frame/lottery/src/benchmarking.rs
 create mode 100644 frame/lottery/src/lib.rs
 create mode 100644 frame/lottery/src/mock.rs
 create mode 100644 frame/lottery/src/tests.rs
 create mode 100644 frame/lottery/src/weights.rs

diff --git a/Cargo.lock b/Cargo.lock
index c99c439eee60..42a51de70ec5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3957,6 +3957,7 @@ dependencies = [
  "pallet-identity",
  "pallet-im-online",
  "pallet-indices",
+ "pallet-lottery",
  "pallet-membership",
  "pallet-mmr",
  "pallet-multisig",
@@ -4704,6 +4705,21 @@ dependencies = [
  "sp-std",
 ]
 
+[[package]]
+name = "pallet-lottery"
+version = "2.0.0"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "pallet-balances",
+ "parity-scale-codec",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
 [[package]]
 name = "pallet-membership"
 version = "2.0.0"
diff --git a/Cargo.toml b/Cargo.toml
index 61282189da38..12e79490ef6b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -81,6 +81,7 @@ members = [
 	"frame/identity",
 	"frame/im-online",
 	"frame/indices",
+	"frame/lottery",
 	"frame/membership",
 	"frame/merkle-mountain-range",
 	"frame/metadata",
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index 4dabc5c01592..3aa906ba0fc5 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -59,6 +59,7 @@ pallet-grandpa = { version = "2.0.0", default-features = false, path = "../../..
 pallet-im-online = { version = "2.0.0", default-features = false, path = "../../../frame/im-online" }
 pallet-indices = { version = "2.0.0", default-features = false, path = "../../../frame/indices" }
 pallet-identity = { version = "2.0.0", default-features = false, path = "../../../frame/identity" }
+pallet-lottery = { version = "2.0.0", default-features = false, path = "../../../frame/lottery" }
 pallet-membership = { version = "2.0.0", default-features = false, path = "../../../frame/membership" }
 pallet-mmr = { version = "2.0.0", default-features = false, path = "../../../frame/merkle-mountain-range" }
 pallet-multisig = { version = "2.0.0", default-features = false, path = "../../../frame/multisig" }
@@ -113,6 +114,7 @@ std = [
 	"pallet-im-online/std",
 	"pallet-indices/std",
 	"sp-inherents/std",
+	"pallet-lottery/std",
 	"pallet-membership/std",
 	"pallet-mmr/std",
 	"pallet-multisig/std",
@@ -167,6 +169,7 @@ runtime-benchmarks = [
 	"pallet-identity/runtime-benchmarks",
 	"pallet-im-online/runtime-benchmarks",
 	"pallet-indices/runtime-benchmarks",
+	"pallet-lottery/runtime-benchmarks",
 	"pallet-mmr/runtime-benchmarks",
 	"pallet-multisig/runtime-benchmarks",
 	"pallet-proxy/runtime-benchmarks",
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index a36448c47081..2afa89f86c02 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -952,6 +952,25 @@ impl pallet_mmr::Config for Runtime {
 	type WeightInfo = ();
 }
 
+parameter_types! {
+	pub const LotteryModuleId: ModuleId = ModuleId(*b"py/lotto");
+	pub const MaxCalls: usize = 10;
+	pub const MaxGenerateRandom: u32 = 10;
+}
+
+impl pallet_lottery::Config for Runtime {
+	type ModuleId = LotteryModuleId;
+	type Call = Call;
+	type Event = Event;
+	type Currency = Balances;
+	type Randomness = RandomnessCollectiveFlip;
+	type ManagerOrigin = EnsureRoot<AccountId>;
+	type MaxCalls = MaxCalls;
+	type ValidateCall = Lottery;
+	type MaxGenerateRandom = MaxGenerateRandom;
+	type WeightInfo = pallet_lottery::weights::SubstrateWeight<Runtime>;
+}
+
 parameter_types! {
 	pub const AssetDepositBase: Balance = 100 * DOLLARS;
 	pub const AssetDepositPerZombie: Balance = 1 * DOLLARS;
@@ -1009,6 +1028,7 @@ construct_runtime!(
 		Tips: pallet_tips::{Module, Call, Storage, Event<T>},
 		Assets: pallet_assets::{Module, Call, Storage, Event<T>},
 		Mmr: pallet_mmr::{Module, Storage},
+		Lottery: pallet_lottery::{Module, Call, Storage, Event<T>},
 	}
 );
 
@@ -1291,6 +1311,7 @@ impl_runtime_apis! {
 			add_benchmark!(params, batches, pallet_identity, Identity);
 			add_benchmark!(params, batches, pallet_im_online, ImOnline);
 			add_benchmark!(params, batches, pallet_indices, Indices);
+			add_benchmark!(params, batches, pallet_lottery, Lottery);
 			add_benchmark!(params, batches, pallet_mmr, Mmr);
 			add_benchmark!(params, batches, pallet_multisig, Multisig);
 			add_benchmark!(params, batches, pallet_offences, OffencesBench::<Runtime>);
diff --git a/frame/lottery/Cargo.toml b/frame/lottery/Cargo.toml
new file mode 100644
index 000000000000..db76316c4296
--- /dev/null
+++ b/frame/lottery/Cargo.toml
@@ -0,0 +1,42 @@
+[package]
+name = "pallet-lottery"
+version = "2.0.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
+license = "Apache-2.0"
+homepage = "https://substrate.dev"
+repository = "https://github.com/paritytech/substrate/"
+description = "FRAME Participation Lottery Pallet"
+readme = "README.md"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
+sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
+frame-support = { version = "2.0.0", default-features = false, path = "../support" }
+frame-system = { version = "2.0.0", default-features = false, path = "../system" }
+
+frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
+
+[dev-dependencies]
+pallet-balances = { version = "2.0.0", path = "../balances" }
+sp-core = { version = "2.0.0", path = "../../primitives/core" }
+sp-io = { version = "2.0.0", path = "../../primitives/io" }
+
+[features]
+default = ["std"]
+std = [
+	"codec/std",
+	"sp-std/std",
+	"frame-support/std",
+	"sp-runtime/std",
+	"frame-system/std",
+]
+runtime-benchmarks = [
+	"frame-benchmarking",
+	"frame-system/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+]
diff --git a/frame/lottery/src/benchmarking.rs b/frame/lottery/src/benchmarking.rs
new file mode 100644
index 000000000000..34a7f236c181
--- /dev/null
+++ b/frame/lottery/src/benchmarking.rs
@@ -0,0 +1,192 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Lottery pallet benchmarking.
+
+#![cfg(feature = "runtime-benchmarks")]
+
+use super::*;
+
+use frame_system::RawOrigin;
+use frame_support::traits::{OnInitialize, UnfilteredDispatchable};
+use frame_benchmarking::{benchmarks, account, whitelisted_caller};
+use sp_runtime::traits::{Bounded, Zero};
+
+use crate::Module as Lottery;
+
+// Set up and start a lottery
+fn setup_lottery<T: Config>(repeat: bool) -> Result<(), &'static str> {
+	let price = T::Currency::minimum_balance();
+	let length = 10u32.into();
+	let delay = 5u32.into();
+	// Calls will be maximum length...
+	let mut calls = vec![
+		frame_system::Call::<T>::set_code(vec![]).into();
+		T::MaxCalls::get().saturating_sub(1)
+	];
+	// Last call will be the match for worst case scenario.
+	calls.push(frame_system::Call::<T>::remark(vec![]).into());
+	let origin = T::ManagerOrigin::successful_origin();
+	Lottery::<T>::set_calls(origin.clone(), calls)?;
+	Lottery::<T>::start_lottery(origin, price, length, delay, repeat)?;
+	Ok(())
+}
+
+benchmarks! {
+	_ { }
+
+	buy_ticket {
+		let caller = whitelisted_caller();
+		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
+		setup_lottery::<T>(false)?;
+		// force user to have a long vec of calls participating
+		let set_code_index: CallIndex = Lottery::<T>::call_to_index(
+			&frame_system::Call::<T>::set_code(vec![]).into()
+		)?;
+		let already_called: (u32, Vec<CallIndex>) = (
+			LotteryIndex::get(),
+			vec![
+				set_code_index;
+				T::MaxCalls::get().saturating_sub(1)
+			],
+		);
+		Participants::<T>::insert(&caller, already_called);
+
+		let call = frame_system::Call::<T>::remark(vec![]);
+	}: _(RawOrigin::Signed(caller), Box::new(call.into()))
+	verify {
+		assert_eq!(TicketsCount::get(), 1);
+	}
+
+	set_calls {
+		let n in 0 .. T::MaxCalls::get() as u32;
+		let calls = vec![frame_system::Call::<T>::remark(vec![]).into(); n as usize];
+
+		let call = Call::<T>::set_calls(calls);
+		let origin = T::ManagerOrigin::successful_origin();
+		assert!(CallIndices::get().is_empty());
+	}: { call.dispatch_bypass_filter(origin)? }
+	verify {
+		if !n.is_zero() {
+			assert!(!CallIndices::get().is_empty());
+		}
+	}
+
+	start_lottery {
+		let price = BalanceOf::<T>::max_value();
+		let end = 10u32.into();
+		let payout = 5u32.into();
+
+		let call = Call::<T>::start_lottery(price, end, payout, true);
+		let origin = T::ManagerOrigin::successful_origin();
+	}: { call.dispatch_bypass_filter(origin)? }
+	verify {
+		assert!(crate::Lottery::<T>::get().is_some());
+	}
+
+	stop_repeat {
+		setup_lottery::<T>(true)?;
+		assert_eq!(crate::Lottery::<T>::get().unwrap().repeat, true);
+		let call = Call::<T>::stop_repeat();
+		let origin = T::ManagerOrigin::successful_origin();
+	}: { call.dispatch_bypass_filter(origin)? }
+	verify {
+		assert_eq!(crate::Lottery::<T>::get().unwrap().repeat, false);
+	}
+
+	on_initialize_end {
+		setup_lottery::<T>(false)?;
+		let winner = account("winner", 0, 0);
+		// User needs more than min balance to get ticket
+		T::Currency::make_free_balance_be(&winner, T::Currency::minimum_balance() * 10u32.into());
+		// Make sure lottery account has at least min balance too
+		let lottery_account = Lottery::<T>::account_id();
+		T::Currency::make_free_balance_be(&lottery_account, T::Currency::minimum_balance() * 10u32.into());
+		// Buy a ticket
+		let call = frame_system::Call::<T>::remark(vec![]);
+		Lottery::<T>::buy_ticket(RawOrigin::Signed(winner.clone()).into(), Box::new(call.into()))?;
+		// Kill user account for worst case
+		T::Currency::make_free_balance_be(&winner, 0u32.into());
+		// Assert that lotto is set up for winner
+		assert_eq!(TicketsCount::get(), 1);
+		assert!(!Lottery::<T>::pot().1.is_zero());
+	}: {
+		// Generate `MaxGenerateRandom` numbers for worst case scenario
+		for i in 0 .. T::MaxGenerateRandom::get() {
+			Lottery::<T>::generate_random_number(i);
+		}
+		// Start lottery has block 15 configured for payout
+		Lottery::<T>::on_initialize(15u32.into());
+	}
+	verify {
+		assert!(crate::Lottery::<T>::get().is_none());
+		assert_eq!(TicketsCount::get(), 0);
+		assert_eq!(Lottery::<T>::pot().1, 0u32.into());
+		assert!(!T::Currency::free_balance(&winner).is_zero())
+	}
+
+	on_initialize_repeat {
+		setup_lottery::<T>(true)?;
+		let winner = account("winner", 0, 0);
+		// User needs more than min balance to get ticket
+		T::Currency::make_free_balance_be(&winner, T::Currency::minimum_balance() * 10u32.into());
+		// Make sure lottery account has at least min balance too
+		let lottery_account = Lottery::<T>::account_id();
+		T::Currency::make_free_balance_be(&lottery_account, T::Currency::minimum_balance() * 10u32.into());
+		// Buy a ticket
+		let call = frame_system::Call::<T>::remark(vec![]);
+		Lottery::<T>::buy_ticket(RawOrigin::Signed(winner.clone()).into(), Box::new(call.into()))?;
+		// Kill user account for worst case
+		T::Currency::make_free_balance_be(&winner, 0u32.into());
+		// Assert that lotto is set up for winner
+		assert_eq!(TicketsCount::get(), 1);
+		assert!(!Lottery::<T>::pot().1.is_zero());
+	}: {
+		// Generate `MaxGenerateRandom` numbers for worst case scenario
+		for i in 0 .. T::MaxGenerateRandom::get() {
+			Lottery::<T>::generate_random_number(i);
+		}
+		// Start lottery has block 15 configured for payout
+		Lottery::<T>::on_initialize(15u32.into());
+	}
+	verify {
+		assert!(crate::Lottery::<T>::get().is_some());
+		assert_eq!(LotteryIndex::get(), 2);
+		assert_eq!(TicketsCount::get(), 0);
+		assert_eq!(Lottery::<T>::pot().1, 0u32.into());
+		assert!(!T::Currency::free_balance(&winner).is_zero())
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use crate::mock::{new_test_ext, Test};
+	use frame_support::assert_ok;
+
+	#[test]
+	fn test_benchmarks() {
+		new_test_ext().execute_with(|| {
+			assert_ok!(test_benchmark_buy_ticket::<Test>());
+			assert_ok!(test_benchmark_set_calls::<Test>());
+			assert_ok!(test_benchmark_start_lottery::<Test>());
+			assert_ok!(test_benchmark_stop_repeat::<Test>());
+			assert_ok!(test_benchmark_on_initialize_end::<Test>());
+			assert_ok!(test_benchmark_on_initialize_repeat::<Test>());
+		});
+	}
+}
diff --git a/frame/lottery/src/lib.rs b/frame/lottery/src/lib.rs
new file mode 100644
index 000000000000..b8568ad269f5
--- /dev/null
+++ b/frame/lottery/src/lib.rs
@@ -0,0 +1,452 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! A lottery pallet that uses participation in the network to purchase tickets.
+//!
+//! With this pallet, you can configure a lottery, which is a pot of money that
+//! users contribute to, and that is reallocated to a single user at the end of
+//! the lottery period. Just like a normal lottery system, to participate, you
+//! need to "buy a ticket", which is used to fund the pot.
+//!
+//! The unique feature of this lottery system is that tickets can only be
+//! purchased by making a "valid call" dispatched through this pallet.
+//! By configuring certain calls to be valid for the lottery, you can encourage
+//! users to make those calls on your network. An example of how this could be
+//! used is to set validator nominations as a valid lottery call. If the lottery
+//! is set to repeat every month, then users would be encouraged to re-nominate
+//! validators every month. A user can ony purchase one ticket per valid call
+//! per lottery.
+//!
+//! This pallet can be configured to use dynamically set calls or statically set
+//! calls. Call validation happens through the `ValidateCall` implementation.
+//! This pallet provides one implementation of this using the `CallIndices`
+//! storage item. You can also make your own implementation at the runtime level
+//! which can contain much more complex logic, such as validation of the
+//! parameters, which this pallet alone cannot do.
+//!
+//! This pallet uses the modulus operator to pick a random winner. It is known
+//! that this might introduce a bias if the random number chosen in a range that
+//! is not perfectly divisible by the total number of participants. The
+//! `MaxGenerateRandom` configuration can help mitigate this by generating new
+//! numbers until we hit the limit or we find a "fair" number. This is best
+//! effort only.
+
+#![cfg_attr(not(feature = "std"), no_std)]
+
+#[cfg(test)]
+mod mock;
+#[cfg(test)]
+mod tests;
+mod benchmarking;
+pub mod weights;
+
+use sp_std::prelude::*;
+use sp_runtime::{
+	DispatchError, ModuleId,
+	traits::{AccountIdConversion, Saturating, Zero},
+};
+use frame_support::{
+	Parameter, decl_module, decl_error, decl_event, decl_storage, ensure, RuntimeDebug,
+	dispatch::{Dispatchable, DispatchResult, GetDispatchInfo},
+	traits::{
+		Currency, ReservableCurrency, Get, EnsureOrigin, ExistenceRequirement::KeepAlive, Randomness,
+	},
+};
+use frame_support::weights::Weight;
+use frame_system::ensure_signed;
+use codec::{Encode, Decode};
+pub use weights::WeightInfo;
+
+type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+
+/// The module's config trait.
+pub trait Config: frame_system::Config {
+	/// The Lottery's module id
+	type ModuleId: Get<ModuleId>;
+
+	/// A dispatchable call.
+	type Call: Parameter + Dispatchable<Origin=Self::Origin> + GetDispatchInfo + From<frame_system::Call<Self>>;
+
+	/// The currency trait.
+	type Currency: ReservableCurrency<Self::AccountId>;
+
+	/// Something that provides randomness in the runtime.
+	type Randomness: Randomness<Self::Hash>;
+
+	/// The overarching event type.
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
+
+	/// The manager origin.
+	type ManagerOrigin: EnsureOrigin<Self::Origin>;
+
+	/// The max number of calls available in a single lottery.
+	type MaxCalls: Get<usize>;
+
+	/// Used to determine if a call would be valid for purchasing a ticket.
+	///
+	/// Be conscious of the implementation used here. We assume at worst that
+	/// a vector of `MaxCalls` indices are queried for any call validation.
+	/// You may need to provide a custom benchmark if this assumption is broken.
+	type ValidateCall: ValidateCall<Self>;
+
+	/// Number of time we should try to generate a random number that has no modulo bias.
+	/// The larger this number, the more potential computation is used for picking the winner,
+	/// but also the more likely that the chosen winner is done fairly.
+	type MaxGenerateRandom: Get<u32>;
+
+	/// Weight information for extrinsics in this pallet.
+	type WeightInfo: WeightInfo;
+}
+
+// Any runtime call can be encoded into two bytes which represent the pallet and call index.
+// We use this to uniquely match someone's incoming call with the calls configured for the lottery.
+type CallIndex = (u8, u8);
+
+#[derive(Encode, Decode, Default, Eq, PartialEq, RuntimeDebug)]
+pub struct LotteryConfig<BlockNumber, Balance> {
+	/// Price per entry.
+	price: Balance,
+	/// Starting block of the lottery.
+	start: BlockNumber,
+	/// Length of the lottery (start + length = end).
+	length: BlockNumber,
+	/// Delay for choosing the winner of the lottery. (start + length + delay = payout).
+	/// Randomness in the "payout" block will be used to determine the winner.
+	delay: BlockNumber,
+	/// Whether this lottery will repeat after it completes.
+	repeat: bool,
+}
+
+pub trait ValidateCall<T: Config> {
+	fn validate_call(call: &<T as Config>::Call) -> bool;
+}
+
+impl<T: Config> ValidateCall<T> for () {
+	fn validate_call(_: &<T as Config>::Call) -> bool { false }
+}
+
+impl<T: Config> ValidateCall<T> for Module<T> {
+	fn validate_call(call: &<T as Config>::Call) -> bool {
+		let valid_calls = CallIndices::get();
+		let call_index = match Self::call_to_index(&call) {
+			Ok(call_index) => call_index,
+			Err(_) => return false,
+		};
+		valid_calls.iter().any(|c| call_index == *c)
+	}
+}
+
+decl_storage! {
+	trait Store for Module<T: Config> as Lottery {
+		LotteryIndex: u32;
+		/// The configuration for the current lottery.
+		Lottery: Option<LotteryConfig<T::BlockNumber, BalanceOf<T>>>;
+		/// Users who have purchased a ticket. (Lottery Index, Tickets Purchased)
+		Participants: map hasher(twox_64_concat) T::AccountId => (u32, Vec<CallIndex>);
+		/// Total number of tickets sold.
+		TicketsCount: u32;
+		/// Each ticket's owner.
+		///
+		/// May have residual storage from previous lotteries. Use `TicketsCount` to see which ones
+		/// are actually valid ticket mappings.
+		Tickets: map hasher(twox_64_concat) u32 => Option<T::AccountId>;
+		/// The calls stored in this pallet to be used in an active lottery if configured
+		/// by `Config::ValidateCall`.
+		CallIndices: Vec<CallIndex>;
+	}
+}
+
+decl_event!(
+	pub enum Event<T> where
+		<T as frame_system::Config>::AccountId,
+		Balance = BalanceOf<T>,
+	{
+		/// A lottery has been started!
+		LotteryStarted,
+		/// A new set of calls have been set!
+		CallsUpdated,
+		/// A winner has been chosen!
+		Winner(AccountId, Balance),
+		/// A ticket has been bought!
+		TicketBought(AccountId, CallIndex),
+	}
+);
+
+decl_error! {
+	pub enum Error for Module<T: Config> {
+		/// An overflow has occurred.
+		Overflow,
+		/// A lottery has not been configured.
+		NotConfigured,
+		/// A lottery is already in progress.
+		InProgress,
+		/// A lottery has already ended.
+		AlreadyEnded,
+		/// The call is not valid for an open lottery.
+		InvalidCall,
+		/// You are already participating in the lottery with this call.
+		AlreadyParticipating,
+		/// Too many calls for a single lottery.
+		TooManyCalls,
+		/// Failed to encode calls
+		EncodingFailed,
+	}
+}
+
+decl_module! {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin, system = frame_system {
+		const ModuleId: ModuleId = T::ModuleId::get();
+		const MaxCalls: u32 = T::MaxCalls::get() as u32;
+
+		fn deposit_event() = default;
+
+		/// Buy a ticket to enter the lottery.
+		///
+		/// This extrinsic acts as a passthrough function for `call`. In all
+		/// situations where `call` alone would succeed, this extrinsic should
+		/// succeed.
+		///
+		/// If `call` is successful, then we will attempt to purchase a ticket,
+		/// which may fail silently. To detect success of a ticket purchase, you
+		/// should listen for the `TicketBought` event.
+		///
+		/// This extrinsic must be called by a signed origin.
+		#[weight =
+			T::WeightInfo::buy_ticket()
+				.saturating_add(call.get_dispatch_info().weight)
+		]
+		fn buy_ticket(origin, call: Box<<T as Config>::Call>) {
+			let caller = ensure_signed(origin.clone())?;
+			call.clone().dispatch(origin).map_err(|e| e.error)?;
+
+			let _ = Self::do_buy_ticket(&caller, &call);
+		}
+
+		/// Set calls in storage which can be used to purchase a lottery ticket.
+		///
+		/// This function only matters if you use the `ValidateCall` implementation
+		/// provided by this pallet, which uses storage to determine the valid calls.
+		///
+		/// This extrinsic must be called by the Manager origin.
+		#[weight = T::WeightInfo::set_calls(calls.len() as u32)]
+		fn set_calls(origin, calls: Vec<<T as Config>::Call>) {
+			T::ManagerOrigin::ensure_origin(origin)?;
+			ensure!(calls.len() <= T::MaxCalls::get(), Error::<T>::TooManyCalls);
+			if calls.is_empty() {
+				CallIndices::kill();
+			} else {
+				let indices = Self::calls_to_indices(&calls)?;
+				CallIndices::put(indices);
+			}
+			Self::deposit_event(RawEvent::CallsUpdated);
+		}
+
+		/// Start a lottery using the provided configuration.
+		///
+		/// This extrinsic must be called by the `ManagerOrigin`.
+		///
+		/// Parameters:
+		///
+		/// * `price`: The cost of a single ticket.
+		/// * `length`: How long the lottery should run for starting at the current block.
+		/// * `delay`: How long after the lottery end we should wait before picking a winner.
+		/// * `repeat`: If the lottery should repeat when completed.
+		#[weight = T::WeightInfo::start_lottery()]
+		fn start_lottery(origin,
+			price: BalanceOf<T>,
+			length: T::BlockNumber,
+			delay: T::BlockNumber,
+			repeat: bool,
+		) {
+			T::ManagerOrigin::ensure_origin(origin)?;
+			Lottery::<T>::try_mutate(|lottery| -> DispatchResult {
+				ensure!(lottery.is_none(), Error::<T>::InProgress);
+				let index = LotteryIndex::get();
+				let new_index = index.checked_add(1).ok_or(Error::<T>::Overflow)?;
+				let start = frame_system::Module::<T>::block_number();
+				// Use new_index to more easily track everything with the current state.
+				*lottery = Some(LotteryConfig {
+					price,
+					start,
+					length,
+					delay,
+					repeat,
+				});
+				LotteryIndex::put(new_index);
+				Ok(())
+			})?;
+			// Make sure pot exists.
+			let lottery_account = Self::account_id();
+			if T::Currency::total_balance(&lottery_account).is_zero() {
+				T::Currency::deposit_creating(&lottery_account, T::Currency::minimum_balance());
+			}
+			Self::deposit_event(RawEvent::LotteryStarted);
+		}
+
+		/// If a lottery is repeating, you can use this to stop the repeat.
+		/// The lottery will continue to run to completion.
+		///
+		/// This extrinsic must be called by the `ManagerOrigin`.
+		#[weight = T::WeightInfo::stop_repeat()]
+		fn stop_repeat(origin) {
+			T::ManagerOrigin::ensure_origin(origin)?;
+			Lottery::<T>::mutate(|mut lottery| {
+				if let Some(config) = &mut lottery {
+					config.repeat = false
+				}
+			});
+		}
+
+		fn on_initialize(n: T::BlockNumber) -> Weight {
+			Lottery::<T>::mutate(|mut lottery| -> Weight {
+				if let Some(config) = &mut lottery {
+					let payout_block = config.start
+						.saturating_add(config.length)
+						.saturating_add(config.delay);
+					if payout_block <= n {
+						let (lottery_account, lottery_balance) = Self::pot();
+						let ticket_count = TicketsCount::get();
+
+						let winning_number = Self::choose_winner(ticket_count);
+						let winner = Tickets::<T>::get(winning_number).unwrap_or(lottery_account);
+						// Not much we can do if this fails...
+						let _ = T::Currency::transfer(&Self::account_id(), &winner, lottery_balance, KeepAlive);
+
+						Self::deposit_event(RawEvent::Winner(winner, lottery_balance));
+
+						TicketsCount::kill();
+
+						if config.repeat {
+							// If lottery should repeat, increment index by 1.
+							LotteryIndex::mutate(|index| *index = index.saturating_add(1));
+							// Set a new start with the current block.
+							config.start = n;
+							return T::WeightInfo::on_initialize_repeat()
+						} else {
+							// Else, kill the lottery storage.
+							*lottery = None;
+							return T::WeightInfo::on_initialize_end()
+						}
+						// We choose not need to kill Participants and Tickets to avoid a large number
+						// of writes at one time. Instead, data persists between lotteries, but is not used
+						// if it is not relevant.
+					}
+				}
+				return T::DbWeight::get().reads(1)
+			})
+		}
+	}
+}
+
+impl<T: Config> Module<T> {
+	/// The account ID of the lottery pot.
+	///
+	/// This actually does computation. If you need to keep using it, then make sure you cache the
+	/// value and only call this once.
+	pub fn account_id() -> T::AccountId {
+		T::ModuleId::get().into_account()
+	}
+
+	/// Return the pot account and amount of money in the pot.
+	// The existential deposit is not part of the pot so lottery account never gets deleted.
+	fn pot() -> (T::AccountId, BalanceOf<T>) {
+		let account_id = Self::account_id();
+		let balance = T::Currency::free_balance(&account_id)
+			.saturating_sub(T::Currency::minimum_balance());
+
+		(account_id, balance)
+	}
+
+	// Converts a vector of calls into a vector of call indices.
+	fn calls_to_indices(calls: &[<T as Config>::Call]) -> Result<Vec<CallIndex>, DispatchError> {
+		let mut indices = Vec::with_capacity(calls.len());
+		for c in calls.iter() {
+			let index = Self::call_to_index(c)?;
+			indices.push(index)
+		}
+		Ok(indices)
+	}
+
+	// Convert a call to it's call index by encoding the call and taking the first two bytes.
+	fn call_to_index(call: &<T as Config>::Call) -> Result<CallIndex, DispatchError> {
+		let encoded_call = call.encode();
+		if encoded_call.len() < 2 { Err(Error::<T>::EncodingFailed)? }
+		return Ok((encoded_call[0], encoded_call[1]))
+	}
+
+	// Logic for buying a ticket.
+	fn do_buy_ticket(caller: &T::AccountId, call: &<T as Config>::Call) -> DispatchResult {
+		// Check the call is valid lottery
+		let config = Lottery::<T>::get().ok_or(Error::<T>::NotConfigured)?;
+		let block_number = frame_system::Module::<T>::block_number();
+		ensure!(block_number < config.start.saturating_add(config.length), Error::<T>::AlreadyEnded);
+		ensure!(T::ValidateCall::validate_call(call), Error::<T>::InvalidCall);
+		let call_index = Self::call_to_index(call)?;
+		let ticket_count = TicketsCount::get();
+		let new_ticket_count = ticket_count.checked_add(1).ok_or(Error::<T>::Overflow)?;
+		// Try to update the participant status
+		Participants::<T>::try_mutate(&caller, |(lottery_index, participating_calls)| -> DispatchResult {
+			let index = LotteryIndex::get();
+			// If lottery index doesn't match, then reset participating calls and index.
+			if *lottery_index != index {
+				*participating_calls = Vec::new();
+				*lottery_index = index;
+			} else {
+				// Check that user is not already participating under this call.
+				ensure!(!participating_calls.iter().any(|c| call_index == *c), Error::<T>::AlreadyParticipating);
+			}
+			// Check user has enough funds and send it to the Lottery account.
+			T::Currency::transfer(caller, &Self::account_id(), config.price, KeepAlive)?;
+			// Create a new ticket.
+			TicketsCount::put(new_ticket_count);
+			Tickets::<T>::insert(ticket_count, caller.clone());
+			participating_calls.push(call_index);
+			Ok(())
+		})?;
+
+		Self::deposit_event(RawEvent::TicketBought(caller.clone(), call_index));
+
+		Ok(())
+	}
+
+	// Randomly choose a winner from among the total number of participants.
+	fn choose_winner(total: u32) -> u32 {
+		let mut random_number = Self::generate_random_number(0);
+
+		// Best effort attempt to remove bias from modulus operator.
+		for i in 1 .. T::MaxGenerateRandom::get() {
+			if random_number < u32::MAX - u32::MAX % total {
+				break;
+			}
+
+			random_number = Self::generate_random_number(i);
+		}
+
+		random_number % total
+	}
+
+	// Generate a random number from a given seed.
+	// Note that there is potential bias introduced by using modulus operator.
+	// You should call this function with different seed values until the random
+	// number lies within `u32::MAX - u32::MAX % n`.
+	fn generate_random_number(seed: u32) -> u32 {
+		let random_seed = T::Randomness::random(&(T::ModuleId::get(), seed).encode());
+		let random_number = <u32>::decode(&mut random_seed.as_ref())
+			.expect("secure hashes should always be bigger than u32; qed");
+		random_number
+	}
+}
diff --git a/frame/lottery/src/mock.rs b/frame/lottery/src/mock.rs
new file mode 100644
index 000000000000..67ecb6cbb63a
--- /dev/null
+++ b/frame/lottery/src/mock.rs
@@ -0,0 +1,138 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Test utilities
+
+use super::*;
+
+use frame_support::{
+	impl_outer_origin, impl_outer_dispatch, parameter_types,
+	traits::{OnInitialize, OnFinalize, TestRandomness},
+};
+use sp_core::H256;
+use sp_runtime::{
+	Perbill,
+	testing::Header,
+	traits::{BlakeTwo256, IdentityLookup},
+};
+use frame_system::EnsureRoot;
+
+impl_outer_origin! {
+	pub enum Origin for Test {}
+}
+
+impl_outer_dispatch! {
+	pub enum Call for Test where origin: Origin {
+		frame_system::System,
+		pallet_balances::Balances,
+	}
+}
+
+#[derive(Clone, Eq, PartialEq)]
+pub struct Test;
+parameter_types! {
+	pub const BlockHashCount: u64 = 250;
+	pub const MaximumBlockWeight: u32 = 1024;
+	pub const MaximumBlockLength: u32 = 2 * 1024;
+	pub const AvailableBlockRatio: Perbill = Perbill::one();
+}
+
+impl frame_system::Config for Test {
+	type BaseCallFilter = ();
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
+	type Origin = Origin;
+	type Index = u64;
+	type Call = Call;
+	type BlockNumber = u64;
+	type Hash = H256;
+	type Hashing = BlakeTwo256;
+	type AccountId = u64;
+	type Lookup = IdentityLookup<Self::AccountId>;
+	type Header = Header;
+	type Event = ();
+	type BlockHashCount = BlockHashCount;
+	type Version = ();
+	type PalletInfo = ();
+	type AccountData = pallet_balances::AccountData<u64>;
+	type OnNewAccount = ();
+	type OnKilledAccount = ();
+	type SystemWeightInfo = ();
+	type SS58Prefix = ();
+}
+
+parameter_types! {
+	pub const ExistentialDeposit: u64 = 1;
+}
+
+impl pallet_balances::Config for Test {
+	type MaxLocks = ();
+	type Balance = u64;
+	type Event = ();
+	type DustRemoval = ();
+	type ExistentialDeposit = ExistentialDeposit;
+	type AccountStore = System;
+	type WeightInfo = ();
+}
+
+parameter_types! {
+	pub const LotteryModuleId: ModuleId = ModuleId(*b"py/lotto");
+	pub const MaxCalls: usize = 2;
+	pub const MaxGenerateRandom: u32 = 10;
+}
+
+impl Config for Test {
+	type ModuleId = LotteryModuleId;
+	type Call = Call;
+	type Currency = Balances;
+	type Randomness = TestRandomness;
+	type Event = ();
+	type ManagerOrigin = EnsureRoot<u64>;
+	type MaxCalls = MaxCalls;
+	type ValidateCall = Lottery;
+	type MaxGenerateRandom = MaxGenerateRandom;
+	type WeightInfo = ();
+}
+
+pub type Lottery = Module<Test>;
+pub type System = frame_system::Module<Test>;
+pub type Balances = pallet_balances::Module<Test>;
+
+pub type SystemCall = frame_system::Call<Test>;
+pub type BalancesCall = pallet_balances::Call<Test>;
+
+pub fn new_test_ext() -> sp_io::TestExternalities {
+	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+	pallet_balances::GenesisConfig::<Test> {
+		balances: vec![(1, 100), (2, 100), (3, 100), (4, 100), (5, 100)],
+	}.assimilate_storage(&mut t).unwrap();
+	t.into()
+}
+
+/// Run until a particular block.
+pub fn run_to_block(n: u64) {
+	while System::block_number() < n {
+		if System::block_number() > 1 {
+			Lottery::on_finalize(System::block_number());
+			System::on_finalize(System::block_number());
+		}
+		System::set_block_number(System::block_number() + 1);
+		System::on_initialize(System::block_number());
+		Lottery::on_initialize(System::block_number());
+	}
+}
diff --git a/frame/lottery/src/tests.rs b/frame/lottery/src/tests.rs
new file mode 100644
index 000000000000..69a8a1267dd4
--- /dev/null
+++ b/frame/lottery/src/tests.rs
@@ -0,0 +1,261 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Tests for the module.
+
+use super::*;
+use mock::{
+	Lottery, Balances, Test, Origin, Call, SystemCall, BalancesCall,
+	new_test_ext, run_to_block
+};
+use sp_runtime::traits::{BadOrigin};
+use frame_support::{assert_noop, assert_ok};
+use pallet_balances::Error as BalancesError;
+
+#[test]
+fn initial_state() {
+	new_test_ext().execute_with(|| {
+		assert_eq!(Balances::free_balance(Lottery::account_id()), 0);
+		assert!(crate::Lottery::<Test>::get().is_none());
+		assert_eq!(Participants::<Test>::get(&1), (0, vec![]));
+		assert_eq!(TicketsCount::get(), 0);
+		assert!(Tickets::<Test>::get(0).is_none());
+	});
+}
+
+#[test]
+fn basic_end_to_end_works() {
+	new_test_ext().execute_with(|| {
+		let price = 10;
+		let length = 20;
+		let delay = 5;
+		let calls = vec![
+			Call::Balances(BalancesCall::force_transfer(0, 0, 0)),
+			Call::Balances(BalancesCall::transfer(0, 0)),
+		];
+
+		// Set calls for the lottery
+		assert_ok!(Lottery::set_calls(Origin::root(), calls));
+
+		// Start lottery, it repeats
+		assert_ok!(Lottery::start_lottery(Origin::root(), price, length, delay, true));
+		assert!(crate::Lottery::<Test>::get().is_some());
+
+		assert_eq!(Balances::free_balance(&1), 100);
+		let call = Box::new(Call::Balances(BalancesCall::transfer(2, 20)));
+		assert_ok!(Lottery::buy_ticket(Origin::signed(1), call.clone()));
+		// 20 from the transfer, 10 from buying a ticket
+		assert_eq!(Balances::free_balance(&1), 100 - 20 - 10);
+		assert_eq!(Participants::<Test>::get(&1).1.len(), 1);
+		assert_eq!(TicketsCount::get(), 1);
+		// 1 owns the 0 ticket
+		assert_eq!(Tickets::<Test>::get(0), Some(1));
+
+		// More ticket purchases
+		assert_ok!(Lottery::buy_ticket(Origin::signed(2), call.clone()));
+		assert_ok!(Lottery::buy_ticket(Origin::signed(3), call.clone()));
+		assert_ok!(Lottery::buy_ticket(Origin::signed(4), call.clone()));
+		assert_eq!(TicketsCount::get(), 4);
+
+		// Go to end
+		run_to_block(20);
+		assert_ok!(Lottery::buy_ticket(Origin::signed(5), call.clone()));
+		// Ticket isn't bought
+		assert_eq!(TicketsCount::get(), 4);
+
+		// Go to payout
+		run_to_block(25);
+		// User 1 wins
+		assert_eq!(Balances::free_balance(&1), 70 + 40);
+		// Lottery is reset and restarted
+		assert_eq!(TicketsCount::get(), 0);
+		assert_eq!(LotteryIndex::get(), 2);
+		assert_eq!(
+			crate::Lottery::<Test>::get().unwrap(),
+			LotteryConfig {
+				price,
+				start: 25,
+				length,
+				delay,
+				repeat: true,
+			}
+		);
+	});
+}
+
+#[test]
+fn set_calls_works() {
+	new_test_ext().execute_with(|| {
+		assert!(!CallIndices::exists());
+
+		let calls = vec![
+			Call::Balances(BalancesCall::force_transfer(0, 0, 0)),
+			Call::Balances(BalancesCall::transfer(0, 0)),
+		];
+
+		assert_ok!(Lottery::set_calls(Origin::root(), calls));
+		assert!(CallIndices::exists());
+
+		let too_many_calls = vec![
+			Call::Balances(BalancesCall::force_transfer(0, 0, 0)),
+			Call::Balances(BalancesCall::transfer(0, 0)),
+			Call::System(SystemCall::remark(vec![])),
+		];
+
+		assert_noop!(
+			Lottery::set_calls(Origin::root(), too_many_calls),
+			Error::<Test>::TooManyCalls,
+		);
+
+		// Clear calls
+		assert_ok!(Lottery::set_calls(Origin::root(), vec![]));
+		assert!(CallIndices::get().is_empty());
+	});
+}
+
+#[test]
+fn start_lottery_works() {
+	new_test_ext().execute_with(|| {
+		let price = 10;
+		let length = 20;
+		let delay = 5;
+
+		// Setup ignores bad origin
+		assert_noop!(
+			Lottery::start_lottery(Origin::signed(1), price, length, delay, false),
+			BadOrigin,
+		);
+
+		// All good
+		assert_ok!(Lottery::start_lottery(Origin::root(), price, length, delay, false));
+
+		// Can't open another one if lottery is already present
+		assert_noop!(
+			Lottery::start_lottery(Origin::root(), price, length, delay, false),
+			Error::<Test>::InProgress,
+		);
+	});
+}
+
+#[test]
+fn buy_ticket_works_as_simple_passthrough() {
+	// This test checks that even if the user could not buy a ticket, that `buy_ticket` acts
+	// as a simple passthrough to the real call.
+	new_test_ext().execute_with(|| {
+		// No lottery set up
+		let call = Box::new(Call::Balances(BalancesCall::transfer(2, 20)));
+		// This is just a basic transfer then
+		assert_ok!(Lottery::buy_ticket(Origin::signed(1), call.clone()));
+		assert_eq!(Balances::free_balance(&1), 100 - 20);
+		assert_eq!(TicketsCount::get(), 0);
+
+		// Lottery is set up, but too expensive to enter, so `do_buy_ticket` fails.
+		let calls = vec![
+			Call::Balances(BalancesCall::force_transfer(0, 0, 0)),
+			Call::Balances(BalancesCall::transfer(0, 0)),
+		];
+		assert_ok!(Lottery::set_calls(Origin::root(), calls));
+
+		// Ticket price of 60 would kill the user's account
+		assert_ok!(Lottery::start_lottery(Origin::root(), 60, 10, 5, false));
+		assert_ok!(Lottery::buy_ticket(Origin::signed(1), call.clone()));
+		assert_eq!(Balances::free_balance(&1), 100 - 20 - 20);
+		assert_eq!(TicketsCount::get(), 0);
+
+		// If call would fail, the whole thing still fails the same
+		let fail_call = Box::new(Call::Balances(BalancesCall::transfer(2, 1000)));
+		assert_noop!(
+			Lottery::buy_ticket(Origin::signed(1), fail_call),
+			BalancesError::<Test, _>::InsufficientBalance,
+		);
+
+		let bad_origin_call = Box::new(Call::Balances(BalancesCall::force_transfer(0, 0, 0)));
+		assert_noop!(
+			Lottery::buy_ticket(Origin::signed(1), bad_origin_call),
+			BadOrigin,
+		);
+
+		// User can call other txs, but doesn't get a ticket
+		let remark_call = Box::new(Call::System(SystemCall::remark(b"hello, world!".to_vec())));
+		assert_ok!(Lottery::buy_ticket(Origin::signed(2), remark_call));
+		assert_eq!(TicketsCount::get(), 0);
+
+		let successful_call = Box::new(Call::Balances(BalancesCall::transfer(2, 1)));
+		assert_ok!(Lottery::buy_ticket(Origin::signed(2), successful_call));
+		assert_eq!(TicketsCount::get(), 1);
+	});
+}
+
+#[test]
+fn buy_ticket_works() {
+	new_test_ext().execute_with(|| {
+		// Set calls for the lottery.
+		let calls = vec![
+			Call::System(SystemCall::remark(vec![])),
+			Call::Balances(BalancesCall::transfer(0, 0)),
+		];
+		assert_ok!(Lottery::set_calls(Origin::root(), calls));
+
+
+		// Can't buy ticket before start
+		let call = Box::new(Call::Balances(BalancesCall::transfer(2, 1)));
+		assert_ok!(Lottery::buy_ticket(Origin::signed(1), call.clone()));
+		assert_eq!(TicketsCount::get(), 0);
+
+		// Start lottery
+		assert_ok!(Lottery::start_lottery(Origin::root(), 1, 20, 5, false));
+
+		// Go to start, buy ticket for transfer
+		run_to_block(5);
+		assert_ok!(Lottery::buy_ticket(Origin::signed(1), call));
+		assert_eq!(TicketsCount::get(), 1);
+
+		// Can't buy another of the same ticket (even if call is slightly changed)
+		let call = Box::new(Call::Balances(BalancesCall::transfer(3, 30)));
+		assert_ok!(Lottery::buy_ticket(Origin::signed(1), call));
+		assert_eq!(TicketsCount::get(), 1);
+
+		// Buy ticket for remark
+		let call = Box::new(Call::System(SystemCall::remark(b"hello, world!".to_vec())));
+		assert_ok!(Lottery::buy_ticket(Origin::signed(1), call.clone()));
+		assert_eq!(TicketsCount::get(), 2);
+
+		// Go to end, can't buy tickets anymore
+		run_to_block(20);
+		assert_ok!(Lottery::buy_ticket(Origin::signed(2), call.clone()));
+		assert_eq!(TicketsCount::get(), 2);
+
+		// Go to payout, can't buy tickets when there is no lottery open
+		run_to_block(25);
+		assert_ok!(Lottery::buy_ticket(Origin::signed(2), call.clone()));
+		assert_eq!(TicketsCount::get(), 0);
+		assert_eq!(LotteryIndex::get(), 1);
+	});
+}
+
+#[test]
+fn start_lottery_will_create_account() {
+	new_test_ext().execute_with(|| {
+		let price = 10;
+		let length = 20;
+		let delay = 5;
+
+		assert_eq!(Balances::total_balance(&Lottery::account_id()), 0);
+		assert_ok!(Lottery::start_lottery(Origin::root(), price, length, delay, false));
+		assert_eq!(Balances::total_balance(&Lottery::account_id()), 1);
+	});
+}
diff --git a/frame/lottery/src/weights.rs b/frame/lottery/src/weights.rs
new file mode 100644
index 000000000000..28d5ac0945b1
--- /dev/null
+++ b/frame/lottery/src/weights.rs
@@ -0,0 +1,124 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Autogenerated weights for pallet_lottery
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
+//! DATE: 2021-01-05, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
+
+// Executed Command:
+// target/release/substrate
+// benchmark
+// --chain=dev
+// --steps=50
+// --repeat=20
+// --pallet=pallet_lottery
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./frame/lottery/src/weights.rs
+// --template=./.maintain/frame-weight-template.hbs
+
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for pallet_lottery.
+pub trait WeightInfo {
+	fn buy_ticket() -> Weight;
+	fn set_calls(n: u32, ) -> Weight;
+	fn start_lottery() -> Weight;
+	fn stop_repeat() -> Weight;
+	fn on_initialize_end() -> Weight;
+	fn on_initialize_repeat() -> Weight;
+}
+
+/// Weights for pallet_lottery using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	fn buy_ticket() -> Weight {
+		(97_799_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(6 as Weight))
+			.saturating_add(T::DbWeight::get().writes(4 as Weight))
+	}
+	fn set_calls(n: u32, ) -> Weight {
+		(20_932_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((513_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn start_lottery() -> Weight {
+		(77_600_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+	}
+	fn stop_repeat() -> Weight {
+		(10_707_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn on_initialize_end() -> Weight {
+		(162_126_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(6 as Weight))
+			.saturating_add(T::DbWeight::get().writes(4 as Weight))
+	}
+	fn on_initialize_repeat() -> Weight {
+		(169_310_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(7 as Weight))
+			.saturating_add(T::DbWeight::get().writes(5 as Weight))
+	}
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+	fn buy_ticket() -> Weight {
+		(97_799_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
+	}
+	fn set_calls(n: u32, ) -> Weight {
+		(20_932_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((513_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn start_lottery() -> Weight {
+		(77_600_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+	}
+	fn stop_repeat() -> Weight {
+		(10_707_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn on_initialize_end() -> Weight {
+		(162_126_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
+	}
+	fn on_initialize_repeat() -> Weight {
+		(169_310_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
+	}
+}

From dbe20312848e03d0acdb580411a8dd7aaf3fc547 Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Tue, 5 Jan 2021 19:20:54 +0100
Subject: [PATCH 0229/1194] client/network: Use request response for block
 requests (#7478)

* client/network: Add scaffolding for finality req to use req resp
	#sc

* client/network/src/finality_requests: Remove

* client/network/src/behaviour: Pass request id down to sync

* client/network: Use request response for block requests

* client/network: Move handler logic into *_*_handler.rs

* client/network: Track ongoing finality requests in protocol.rs

* client/network: Remove commented out finalization initialization

* client/network: Add docs for request handlers

* client/network/finality_request_handler: Log errors

* client/network/block_request_handler: Log errors

* client/network: Format

* client/network: Handle block request failure

* protocols/network: Fix tests

* client/network/src/behaviour: Handle request sending errors

* client/network: Move response handling into custom method

* client/network/protocol: Handle block response errors

* client/network/protocol: Remove tracking of obsolete requests

* client/network/protocol: Remove block request start time tracking

This will be handled generically via request-responses.

* client/network/protocol: Refactor on_*_request_started

* client/network: Pass protocol config instead of protocol name

* client/network: Pass protocol config in tests

* client/network/config: Document request response configs

* client/network/src/_request_handler: Document protocol config gen

* client/network/src/protocol: Document Peer request values

* client/network: Rework request response to always use oneshot

* client/network: Unified metric reporting for all request protocols

* client/network: Move protobuf parsing into protocol.rs

* client/network/src/protocol: Return pending events after poll

* client/network: Improve error handling and documentation

* client/network/behaviour: Remove outdated error types

* Update client/network/src/block_request_handler.rs

Co-authored-by: Ashley <ashley.ruglys@gmail.com>

* Update client/network/src/finality_request_handler.rs

Co-authored-by: Ashley <ashley.ruglys@gmail.com>

* client/network/protocol: Reduce reputation on timeout

* client/network/protocol: Refine reputation changes

* client/network/block_request_handler: Set and explain queue length

* client/service: Deny block requests when light client

* client/service: Fix role matching

* client: Enforce line width

* client/network/request_responses: Fix unit tests

* client/network: Expose time to build response via metrics

* client/network/request_responses: Fix early connection closed error

* client/network/protocol: Fix line length

* client/network/protocol: Disconnect on most request failures

* client/network/protocol: Disconnect peer when oneshot is canceled

* client/network/protocol: Disconnect peer even when connection closed

* client/network/protocol: Remove debugging log line

* client/network/request_response: Use Clone::clone for error

* client/network/request_response: Remove outdated comment

With libp2p v0.33.0 libp2p-request-response properly sends inbound
failures on connections being closed.

Co-authored-by: Addie Wagenknecht <addie@nortd.com>
Co-authored-by: Ashley <ashley.ruglys@gmail.com>
---
 .maintain/sentry-node/docker-compose.yml    |  14 +-
 Cargo.lock                                  |   1 +
 client/network/src/behaviour.rs             | 153 ++--
 client/network/src/block_request_handler.rs | 220 +++++
 client/network/src/block_requests.rs        | 859 --------------------
 client/network/src/config.rs                |  12 +
 client/network/src/gossip/tests.rs          |  22 +-
 client/network/src/lib.rs                   |   2 +-
 client/network/src/light_client_handler.rs  |  18 +-
 client/network/src/protocol.rs              | 395 +++++----
 client/network/src/request_responses.rs     | 174 ++--
 client/network/src/service.rs               | 121 +--
 client/network/src/service/metrics.rs       |  13 +-
 client/network/src/service/tests.rs         |  15 +-
 client/network/test/Cargo.toml              |   1 +
 client/network/test/src/lib.rs              |  28 +-
 client/service/src/builder.rs               |  19 +-
 17 files changed, 774 insertions(+), 1293 deletions(-)
 create mode 100644 client/network/src/block_request_handler.rs
 delete mode 100644 client/network/src/block_requests.rs

diff --git a/.maintain/sentry-node/docker-compose.yml b/.maintain/sentry-node/docker-compose.yml
index 2af9449853c7..a4cc8f1ebb92 100644
--- a/.maintain/sentry-node/docker-compose.yml
+++ b/.maintain/sentry-node/docker-compose.yml
@@ -47,9 +47,9 @@ services:
       - "--validator"
       - "--alice"
       - "--sentry-nodes"
-      - "/dns/sentry-a/tcp/30333/p2p/QmV7EhW6J6KgmNdr558RH1mPx2xGGznW7At4BhXzntRFsi"
+      - "/dns/sentry-a/tcp/30333/p2p/12D3KooWSCufgHzV4fCwRijfH2k3abrpAJxTKxEvN1FDuRXA2U9x"
       - "--reserved-nodes"
-      - "/dns/sentry-a/tcp/30333/p2p/QmV7EhW6J6KgmNdr558RH1mPx2xGGznW7At4BhXzntRFsi"
+      - "/dns/sentry-a/tcp/30333/p2p/12D3KooWSCufgHzV4fCwRijfH2k3abrpAJxTKxEvN1FDuRXA2U9x"
       # Not only bind to localhost.
       - "--unsafe-ws-external"
       - "--unsafe-rpc-external"
@@ -83,11 +83,11 @@ services:
       - "--port"
       - "30333"
       - "--sentry"
-      - "/dns/validator-a/tcp/30333/p2p/QmRpheLN4JWdAnY7HGJfWFNbfkQCb6tFf4vvA6hgjMZKrR"
+      - "/dns/validator-a/tcp/30333/p2p/12D3KooWEyoppNCUx8Yx66oV9fJnriXwCcXwDDUA2kj6vnc6iDEp"
       - "--reserved-nodes"
-      - "/dns/validator-a/tcp/30333/p2p/QmRpheLN4JWdAnY7HGJfWFNbfkQCb6tFf4vvA6hgjMZKrR"
+      - "/dns/validator-a/tcp/30333/p2p/12D3KooWEyoppNCUx8Yx66oV9fJnriXwCcXwDDUA2kj6vnc6iDEp"
       - "--bootnodes"
-      - "/dns/validator-b/tcp/30333/p2p/QmSVnNf9HwVMT1Y4cK1P6aoJcEZjmoTXpjKBmAABLMnZEk"
+      - "/dns/validator-b/tcp/30333/p2p/12D3KooWHdiAxVd8uMQR1hGWXccidmfCwLqcMpGwR6QcTP6QRMuD"
       - "--no-telemetry"
       - "--rpc-cors"
       - "all"
@@ -118,9 +118,9 @@ services:
       - "--validator"
       - "--bob"
       - "--bootnodes"
-      - "/dns/validator-a/tcp/30333/p2p/QmRpheLN4JWdAnY7HGJfWFNbfkQCb6tFf4vvA6hgjMZKrR"
+      - "/dns/validator-a/tcp/30333/p2p/12D3KooWEyoppNCUx8Yx66oV9fJnriXwCcXwDDUA2kj6vnc6iDEp"
       - "--bootnodes"
-      - "/dns/sentry-a/tcp/30333/p2p/QmV7EhW6J6KgmNdr558RH1mPx2xGGznW7At4BhXzntRFsi"
+      - "/dns/sentry-a/tcp/30333/p2p/12D3KooWSCufgHzV4fCwRijfH2k3abrpAJxTKxEvN1FDuRXA2U9x"
       - "--no-telemetry"
       - "--rpc-cors"
       - "all"
diff --git a/Cargo.lock b/Cargo.lock
index 42a51de70ec5..c5034978a410 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7183,6 +7183,7 @@ dependencies = [
 name = "sc-network-test"
 version = "0.8.0"
 dependencies = [
+ "async-std",
  "futures 0.3.8",
  "futures-timer 3.0.2",
  "libp2p",
diff --git a/client/network/src/behaviour.rs b/client/network/src/behaviour.rs
index a7366d00e7cf..64426cae6f65 100644
--- a/client/network/src/behaviour.rs
+++ b/client/network/src/behaviour.rs
@@ -17,20 +17,22 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{
-	config::{ProtocolId, Role}, block_requests, light_client_handler,
-	peer_info, request_responses, discovery::{DiscoveryBehaviour, DiscoveryConfig, DiscoveryOut},
+	config::{ProtocolId, Role}, light_client_handler, peer_info, request_responses,
+	discovery::{DiscoveryBehaviour, DiscoveryConfig, DiscoveryOut},
 	protocol::{message::Roles, CustomMessageOutcome, NotificationsSink, Protocol},
 	ObservedRole, DhtEvent, ExHashT,
 };
 
 use bytes::Bytes;
 use codec::Encode as _;
+use futures::channel::oneshot;
 use libp2p::NetworkBehaviour;
 use libp2p::core::{Multiaddr, PeerId, PublicKey};
 use libp2p::identify::IdentifyInfo;
 use libp2p::kad::record;
 use libp2p::swarm::{NetworkBehaviourAction, NetworkBehaviourEventProcess, PollParameters};
 use log::debug;
+use prost::Message;
 use sp_consensus::{BlockOrigin, import_queue::{IncomingBlock, Origin}};
 use sp_runtime::{traits::{Block as BlockT, NumberFor}, Justification};
 use std::{
@@ -42,7 +44,7 @@ use std::{
 };
 
 pub use crate::request_responses::{
-	ResponseFailure, InboundFailure, RequestFailure, OutboundFailure, RequestId, SendRequestError
+	ResponseFailure, InboundFailure, RequestFailure, OutboundFailure, RequestId,
 };
 
 /// General behaviour of the network. Combines all protocols together.
@@ -58,8 +60,6 @@ pub struct Behaviour<B: BlockT, H: ExHashT> {
 	discovery: DiscoveryBehaviour,
 	/// Generic request-reponse protocols.
 	request_responses: request_responses::RequestResponsesBehaviour,
-	/// Block request handling.
-	block_requests: block_requests::BlockRequests<B>,
 	/// Light client request handling.
 	light_client_handler: light_client_handler::LightClientHandler<B>,
 
@@ -70,6 +70,11 @@ pub struct Behaviour<B: BlockT, H: ExHashT> {
 	/// Role of our local node, as originally passed from the configuration.
 	#[behaviour(ignore)]
 	role: Role,
+
+	/// Protocol name used to send out block requests via
+	/// [`request_responses::RequestResponsesBehaviour`].
+	#[behaviour(ignore)]
+	block_request_protocol_name: String,
 }
 
 /// Event generated by `Behaviour`.
@@ -93,34 +98,18 @@ pub enum BehaviourOut<B: BlockT> {
 		result: Result<Duration, ResponseFailure>,
 	},
 
-	/// A request initiated using [`Behaviour::send_request`] has succeeded or failed.
-	RequestFinished {
-		/// Request that has succeeded.
-		request_id: RequestId,
-		/// Response sent by the remote or reason for failure.
-		result: Result<Vec<u8>, RequestFailure>,
-	},
-
-	/// Started a new request with the given node.
-	///
-	/// This event is for statistics purposes only. The request and response handling are entirely
-	/// internal to the behaviour.
-	OpaqueRequestStarted {
-		peer: PeerId,
-		/// Protocol name of the request.
-		protocol: String,
-	},
-	/// Finished, successfully or not, a previously-started request.
+	/// A request has succeeded or failed.
 	///
-	/// This event is for statistics purposes only. The request and response handling are entirely
-	/// internal to the behaviour.
-	OpaqueRequestFinished {
-		/// Who we were requesting.
+	/// This event is generated for statistics purposes.
+	RequestFinished {
+		/// Peer that we send a request to.
 		peer: PeerId,
-		/// Protocol name of the request.
-		protocol: String,
-		/// How long before the response came or the request got cancelled.
-		request_duration: Duration,
+		/// Name of the protocol in question.
+		protocol: Cow<'static, str>,
+		/// Duration the request took.
+		duration: Duration,
+		/// Result of the request.
+		result: Result<(), RequestFailure>,
 	},
 
 	/// Opened a substream with the given node with the given notifications protocol.
@@ -180,21 +169,28 @@ impl<B: BlockT, H: ExHashT> Behaviour<B, H> {
 		role: Role,
 		user_agent: String,
 		local_public_key: PublicKey,
-		block_requests: block_requests::BlockRequests<B>,
 		light_client_handler: light_client_handler::LightClientHandler<B>,
 		disco_config: DiscoveryConfig,
-		request_response_protocols: Vec<request_responses::ProtocolConfig>,
+		// Block request protocol config.
+		block_request_protocol_config: request_responses::ProtocolConfig,
+		// All remaining request protocol configs.
+		mut request_response_protocols: Vec<request_responses::ProtocolConfig>,
 	) -> Result<Self, request_responses::RegisterError> {
+		// Extract protocol name and add to `request_response_protocols`.
+		let block_request_protocol_name = block_request_protocol_config.name.to_string();
+		request_response_protocols.push(block_request_protocol_config);
+
 		Ok(Behaviour {
 			substrate,
 			peer_info: peer_info::PeerInfoBehaviour::new(user_agent, local_public_key),
 			discovery: disco_config.finish(),
 			request_responses:
 				request_responses::RequestResponsesBehaviour::new(request_response_protocols.into_iter())?,
-			block_requests,
 			light_client_handler,
 			events: VecDeque::new(),
 			role,
+
+			block_request_protocol_name,
 		})
 	}
 
@@ -236,13 +232,14 @@ impl<B: BlockT, H: ExHashT> Behaviour<B, H> {
 	}
 
 	/// Initiates sending a request.
-	///
-	/// An error is returned if we are not connected to the target peer of if the protocol doesn't
-	/// match one that has been registered.
-	pub fn send_request(&mut self, target: &PeerId, protocol: &str, request: Vec<u8>)
-		-> Result<RequestId, SendRequestError>
-	{
-		self.request_responses.send_request(target, protocol, request)
+	pub fn send_request(
+		&mut self,
+		target: &PeerId,
+		protocol: &str,
+		request: Vec<u8>,
+		pending_response: oneshot::Sender<Result<Vec<u8>, RequestFailure>>,
+	) {
+		self.request_responses.send_request(target, protocol, request, pending_response)
 	}
 
 	/// Registers a new notifications protocol.
@@ -331,28 +328,20 @@ Behaviour<B, H> {
 				self.events.push_back(BehaviourOut::BlockImport(origin, blocks)),
 			CustomMessageOutcome::JustificationImport(origin, hash, nb, justification) =>
 				self.events.push_back(BehaviourOut::JustificationImport(origin, hash, nb, justification)),
-			CustomMessageOutcome::BlockRequest { target, request } => {
-				match self.block_requests.send_request(&target, request) {
-					block_requests::SendRequestOutcome::Ok => {
-						self.events.push_back(BehaviourOut::OpaqueRequestStarted {
-							peer: target,
-							protocol: self.block_requests.protocol_name().to_owned(),
-						});
-					},
-					block_requests::SendRequestOutcome::Replaced { request_duration, .. } => {
-						self.events.push_back(BehaviourOut::OpaqueRequestFinished {
-							peer: target.clone(),
-							protocol: self.block_requests.protocol_name().to_owned(),
-							request_duration,
-						});
-						self.events.push_back(BehaviourOut::OpaqueRequestStarted {
-							peer: target,
-							protocol: self.block_requests.protocol_name().to_owned(),
-						});
-					}
-					block_requests::SendRequestOutcome::NotConnected |
-					block_requests::SendRequestOutcome::EncodeError(_) => {},
+			CustomMessageOutcome::BlockRequest { target, request, pending_response } => {
+				let mut buf = Vec::with_capacity(request.encoded_len());
+				if let Err(err) = request.encode(&mut buf) {
+					log::warn!(
+						target: "sync",
+						"Failed to encode block request {:?}: {:?}",
+						request, err
+					);
+					return
 				}
+
+				self.request_responses.send_request(
+					&target, &self.block_request_protocol_name, buf, pending_response,
+				);
 			},
 			CustomMessageOutcome::NotificationStreamOpened { remote, protocols, roles, notifications_sink } => {
 				let role = reported_roles_to_observed_role(&self.role, &remote, roles);
@@ -401,51 +390,15 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviourEventProcess<request_responses::Even
 					result,
 				});
 			}
-
-			request_responses::Event::RequestFinished { request_id, result } => {
+			request_responses::Event::RequestFinished { peer, protocol, duration, result } => {
 				self.events.push_back(BehaviourOut::RequestFinished {
-					request_id,
-					result,
+					peer, protocol, duration, result,
 				});
 			},
 		}
 	}
 }
 
-impl<B: BlockT, H: ExHashT> NetworkBehaviourEventProcess<block_requests::Event<B>> for Behaviour<B, H> {
-	fn inject_event(&mut self, event: block_requests::Event<B>) {
-		match event {
-			block_requests::Event::AnsweredRequest { peer, total_handling_time } => {
-				self.events.push_back(BehaviourOut::InboundRequest {
-					peer,
-					protocol: self.block_requests.protocol_name().to_owned().into(),
-					result: Ok(total_handling_time),
-				});
-			},
-			block_requests::Event::Response { peer, response, request_duration } => {
-				self.events.push_back(BehaviourOut::OpaqueRequestFinished {
-					peer: peer.clone(),
-					protocol: self.block_requests.protocol_name().to_owned(),
-					request_duration,
-				});
-				let ev = self.substrate.on_block_response(peer, response);
-				self.inject_event(ev);
-			}
-			block_requests::Event::RequestCancelled { peer, request_duration, .. } |
-			block_requests::Event::RequestTimeout { peer, request_duration, .. } => {
-				// There doesn't exist any mechanism to report cancellations or timeouts yet, so
-				// we process them by disconnecting the node.
-				self.events.push_back(BehaviourOut::OpaqueRequestFinished {
-					peer: peer.clone(),
-					protocol: self.block_requests.protocol_name().to_owned(),
-					request_duration,
-				});
-				self.substrate.on_block_request_failed(&peer);
-			}
-		}
-	}
-}
-
 impl<B: BlockT, H: ExHashT> NetworkBehaviourEventProcess<peer_info::PeerInfoEvent>
 	for Behaviour<B, H> {
 	fn inject_event(&mut self, event: peer_info::PeerInfoEvent) {
diff --git a/client/network/src/block_request_handler.rs b/client/network/src/block_request_handler.rs
new file mode 100644
index 000000000000..c88be52ecf0d
--- /dev/null
+++ b/client/network/src/block_request_handler.rs
@@ -0,0 +1,220 @@
+// Copyright 2020 Parity Technologies (UK) Ltd.
+// This file is part of Substrate.
+
+// Substrate is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Substrate is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Helper for handling (i.e. answering) block requests from a remote peer via the
+//! [`crate::request_responses::RequestResponsesBehaviour`].
+
+use codec::{Encode, Decode};
+use crate::chain::Client;
+use crate::config::ProtocolId;
+use crate::protocol::{message::BlockAttributes};
+use crate::request_responses::{IncomingRequest, ProtocolConfig};
+use crate::schema::v1::block_request::FromBlock;
+use crate::schema::v1::{BlockResponse, Direction};
+use futures::channel::{mpsc, oneshot};
+use futures::stream::StreamExt;
+use log::debug;
+use prost::Message;
+use sp_runtime::generic::BlockId;
+use sp_runtime::traits::{Block as BlockT, Header, One, Zero};
+use std::cmp::min;
+use std::sync::{Arc};
+use std::time::Duration;
+
+const LOG_TARGET: &str = "block-request-handler";
+const MAX_BLOCKS_IN_RESPONSE: usize = 128;
+const MAX_BODY_BYTES: usize = 8 * 1024 * 1024;
+
+/// Generates a [`ProtocolConfig`] for the block request protocol, refusing incoming requests.
+pub fn generate_protocol_config(protocol_id: ProtocolId) -> ProtocolConfig {
+	ProtocolConfig {
+		name: generate_protocol_name(protocol_id).into(),
+		max_request_size: 1024 * 1024,
+		max_response_size: 16 * 1024 * 1024,
+		request_timeout: Duration::from_secs(40),
+		inbound_queue: None,
+	}
+}
+
+/// Generate the block protocol name from chain specific protocol identifier.
+fn generate_protocol_name(protocol_id: ProtocolId) -> String {
+	let mut s = String::new();
+	s.push_str("/");
+	s.push_str(protocol_id.as_ref());
+	s.push_str("/sync/2");
+	s
+}
+
+/// Handler for incoming block requests from a remote peer.
+pub struct BlockRequestHandler<B> {
+	client: Arc<dyn Client<B>>,
+	request_receiver: mpsc::Receiver<IncomingRequest>,
+}
+
+impl <B: BlockT> BlockRequestHandler<B> {
+	/// Create a new [`BlockRequestHandler`].
+	pub fn new(protocol_id: ProtocolId, client: Arc<dyn Client<B>>) -> (Self, ProtocolConfig) {
+		// Rate of arrival multiplied with the waiting time in the queue equals the queue length.
+		//
+		// An average Polkadot sentry node serves less than 5 requests per second. The 95th percentile
+		// serving a request is less than 2 second. Thus one would estimate the queue length to be
+		// below 10.
+		//
+		// Choosing 20 as the queue length to give some additional buffer.
+		let (tx, request_receiver) = mpsc::channel(20);
+
+		let mut protocol_config = generate_protocol_config(protocol_id);
+		protocol_config.inbound_queue = Some(tx);
+
+		(Self { client, request_receiver }, protocol_config)
+	}
+
+	fn handle_request(
+		&self,
+		payload: Vec<u8>,
+		pending_response: oneshot::Sender<Vec<u8>>
+	) -> Result<(), HandleRequestError> {
+		let request = crate::schema::v1::BlockRequest::decode(&payload[..])?;
+
+		let from_block_id = match request.from_block.ok_or(HandleRequestError::MissingFromField)? {
+			FromBlock::Hash(ref h) => {
+				let h = Decode::decode(&mut h.as_ref())?;
+				BlockId::<B>::Hash(h)
+			}
+			FromBlock::Number(ref n) => {
+				let n = Decode::decode(&mut n.as_ref())?;
+				BlockId::<B>::Number(n)
+			}
+		};
+
+		let max_blocks = if request.max_blocks == 0 {
+			MAX_BLOCKS_IN_RESPONSE
+		} else {
+			min(request.max_blocks as usize, MAX_BLOCKS_IN_RESPONSE)
+		};
+
+		let direction = Direction::from_i32(request.direction)
+			.ok_or(HandleRequestError::ParseDirection)?;
+		let attributes = BlockAttributes::from_be_u32(request.fields)?;
+		let get_header = attributes.contains(BlockAttributes::HEADER);
+		let get_body = attributes.contains(BlockAttributes::BODY);
+		let get_justification = attributes.contains(BlockAttributes::JUSTIFICATION);
+
+		let mut blocks = Vec::new();
+		let mut block_id = from_block_id;
+
+		let mut total_size: usize = 0;
+		while let Some(header) = self.client.header(block_id).unwrap_or(None) {
+			let number = *header.number();
+			let hash = header.hash();
+			let parent_hash = *header.parent_hash();
+			let justification = if get_justification {
+				self.client.justification(&BlockId::Hash(hash))?
+			} else {
+				None
+			};
+			let is_empty_justification = justification.as_ref().map(|j| j.is_empty()).unwrap_or(false);
+
+			let body = if get_body {
+				match self.client.block_body(&BlockId::Hash(hash))? {
+					Some(mut extrinsics) => extrinsics.iter_mut()
+						.map(|extrinsic| extrinsic.encode())
+						.collect(),
+					None => {
+						log::trace!(target: "sync", "Missing data for block request.");
+						break;
+					}
+				}
+			} else {
+				Vec::new()
+			};
+
+			let block_data = crate::schema::v1::BlockData {
+				hash: hash.encode(),
+				header: if get_header {
+					header.encode()
+				} else {
+					Vec::new()
+				},
+				body,
+				receipt: Vec::new(),
+				message_queue: Vec::new(),
+				justification: justification.unwrap_or_default(),
+				is_empty_justification,
+			};
+
+			total_size += block_data.body.len();
+			blocks.push(block_data);
+
+			if blocks.len() >= max_blocks as usize || total_size > MAX_BODY_BYTES {
+				break
+			}
+
+			match direction {
+				Direction::Ascending => {
+					block_id = BlockId::Number(number + One::one())
+				}
+				Direction::Descending => {
+					if number.is_zero() {
+						break
+					}
+					block_id = BlockId::Hash(parent_hash)
+				}
+			}
+		}
+
+		let res = BlockResponse { blocks };
+
+		let mut data = Vec::with_capacity(res.encoded_len());
+		res.encode(&mut data)?;
+
+		pending_response.send(data)
+			.map_err(|_| HandleRequestError::SendResponse)
+	}
+
+	/// Run [`BlockRequestHandler`].
+	pub async fn run(mut self) {
+		while let Some(request) = self.request_receiver.next().await {
+			let IncomingRequest { peer, payload, pending_response } = request;
+
+			match self.handle_request(payload, pending_response) {
+				Ok(()) => debug!(target: LOG_TARGET, "Handled block request from {}.", peer),
+				Err(e) => debug!(
+					target: LOG_TARGET,
+					"Failed to handle block request from {}: {}",
+					peer, e,
+				),
+			}
+		}
+	}
+}
+
+#[derive(derive_more::Display, derive_more::From)]
+enum HandleRequestError {
+	#[display(fmt = "Failed to decode request: {}.", _0)]
+	DecodeProto(prost::DecodeError),
+	#[display(fmt = "Failed to encode response: {}.", _0)]
+	EncodeProto(prost::EncodeError),
+	#[display(fmt = "Failed to decode block hash: {}.", _0)]
+	DecodeScale(codec::Error),
+	#[display(fmt = "Missing `BlockRequest::from_block` field.")]
+	MissingFromField,
+	#[display(fmt = "Failed to parse BlockRequest::direction.")]
+	ParseDirection,
+	Client(sp_blockchain::Error),
+	#[display(fmt = "Failed to send response.")]
+	SendResponse,
+}
diff --git a/client/network/src/block_requests.rs b/client/network/src/block_requests.rs
deleted file mode 100644
index ff107e37ef3f..000000000000
--- a/client/network/src/block_requests.rs
+++ /dev/null
@@ -1,859 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-//! `NetworkBehaviour` implementation which handles incoming block requests.
-//!
-//! Every request is coming in on a separate connection substream which gets
-//! closed after we have sent the response back. Incoming requests are encoded
-//! as protocol buffers (cf. `api.v1.proto`).
-
-#![allow(unused)]
-
-use bytes::Bytes;
-use codec::{Encode, Decode};
-use crate::{
-	chain::Client,
-	config::ProtocolId,
-	protocol::{message::{self, BlockAttributes}},
-	schema,
-};
-use futures::{future::BoxFuture, prelude::*, stream::FuturesUnordered};
-use futures_timer::Delay;
-use libp2p::{
-	core::{
-		ConnectedPoint,
-		Multiaddr,
-		PeerId,
-		connection::ConnectionId,
-		upgrade::{InboundUpgrade, OutboundUpgrade, ReadOneError, UpgradeInfo, Negotiated},
-		upgrade::{DeniedUpgrade, read_one, write_one}
-	},
-	swarm::{
-		NegotiatedSubstream,
-		NetworkBehaviour,
-		NetworkBehaviourAction,
-		NotifyHandler,
-		OneShotHandler,
-		OneShotHandlerConfig,
-		PollParameters,
-		SubstreamProtocol
-	}
-};
-use prost::Message;
-use sp_runtime::{generic::BlockId, traits::{Block, Header, One, Zero}};
-use std::{
-	cmp::min,
-	collections::{HashMap, VecDeque},
-	io,
-	iter,
-	marker::PhantomData,
-	pin::Pin,
-	sync::Arc,
-	time::Duration,
-	task::{Context, Poll}
-};
-use void::{Void, unreachable};
-use wasm_timer::Instant;
-
-// Type alias for convenience.
-pub type Error = Box<dyn std::error::Error + 'static>;
-
-/// Event generated by the block requests behaviour.
-#[derive(Debug)]
-pub enum Event<B: Block> {
-	/// A request came and we have successfully answered it.
-	AnsweredRequest {
-		/// Peer which has emitted the request.
-		peer: PeerId,
-		/// Time elapsed between when we received the request and when we sent back the response.
-		total_handling_time: Duration,
-	},
-
-	/// A response to a block request has arrived.
-	Response {
-		peer: PeerId,
-		response: message::BlockResponse<B>,
-		/// Time elapsed between the start of the request and the response.
-		request_duration: Duration,
-	},
-
-	/// A request has been cancelled because the peer has disconnected.
-	/// Disconnects can also happen as a result of violating the network protocol.
-	///
-	/// > **Note**: This event is NOT emitted if a request is overridden by calling `send_request`.
-	/// > For that, you must check the value returned by `send_request`.
-	RequestCancelled {
-		peer: PeerId,
-		/// Time elapsed between the start of the request and the cancellation.
-		request_duration: Duration,
-	},
-
-	/// A request has timed out.
-	RequestTimeout {
-		peer: PeerId,
-		/// Time elapsed between the start of the request and the timeout.
-		request_duration: Duration,
-	}
-}
-
-/// Configuration options for `BlockRequests`.
-#[derive(Debug, Clone)]
-pub struct Config {
-	max_block_data_response: u32,
-	max_block_body_bytes: usize,
-	max_request_len: usize,
-	max_response_len: usize,
-	inactivity_timeout: Duration,
-	request_timeout: Duration,
-	protocol: String,
-}
-
-impl Config {
-	/// Create a fresh configuration with the following options:
-	///
-	/// - max. block data in response = 128
-	/// - max. request size = 1 MiB
-	/// - max. response size = 16 MiB
-	/// - inactivity timeout = 15s
-	/// - request timeout = 40s
-	pub fn new(id: &ProtocolId) -> Self {
-		let mut c = Config {
-			max_block_data_response: 128,
-			max_block_body_bytes: 8 * 1024 * 1024,
-			max_request_len: 1024 * 1024,
-			max_response_len: 16 * 1024 * 1024,
-			inactivity_timeout: Duration::from_secs(15),
-			request_timeout: Duration::from_secs(40),
-			protocol: String::new(),
-		};
-		c.set_protocol(id);
-		c
-	}
-
-	/// Limit the max. number of block data in a response.
-	pub fn set_max_block_data_response(&mut self, v: u32) -> &mut Self {
-		self.max_block_data_response = v;
-		self
-	}
-
-	/// Limit the max. length of incoming block request bytes.
-	pub fn set_max_request_len(&mut self, v: usize) -> &mut Self {
-		self.max_request_len = v;
-		self
-	}
-
-	/// Limit the max. size of responses to our block requests.
-	pub fn set_max_response_len(&mut self, v: usize) -> &mut Self {
-		self.max_response_len = v;
-		self
-	}
-
-	/// Limit the max. duration the substream may remain inactive before closing it.
-	pub fn set_inactivity_timeout(&mut self, v: Duration) -> &mut Self {
-		self.inactivity_timeout = v;
-		self
-	}
-
-	/// Set the maximum total bytes of block bodies that are send in the response.
-	/// Note that at least one block is always sent regardless of the limit.
-	/// This should be lower than the value specified in `set_max_response_len`
-	/// accounting for headers, justifications and encoding overhead.
-	pub fn set_max_block_body_bytes(&mut self, v: usize) -> &mut Self {
-		self.max_block_body_bytes = v;
-		self
-	}
-
-	/// Set protocol to use for upgrade negotiation.
-	pub fn set_protocol(&mut self, id: &ProtocolId) -> &mut Self {
-		let mut s = String::new();
-		s.push_str("/");
-		s.push_str(id.as_ref());
-		s.push_str("/sync/2");
-		self.protocol = s;
-		self
-	}
-}
-
-/// The block request handling behaviour.
-pub struct BlockRequests<B: Block> {
-	/// This behaviour's configuration.
-	config: Config,
-	/// Blockchain client.
-	chain: Arc<dyn Client<B>>,
-	/// List of all active connections and the requests we've sent.
-	peers: HashMap<PeerId, Vec<Connection<B>>>,
-	/// Futures sending back the block request response. Returns the `PeerId` we sent back to, and
-	/// the total time the handling of this request took.
-	outgoing: FuturesUnordered<BoxFuture<'static, (PeerId, Duration)>>,
-	/// Events to return as soon as possible from `poll`.
-	pending_events: VecDeque<NetworkBehaviourAction<OutboundProtocol<B>, Event<B>>>,
-}
-
-/// Local tracking of a libp2p connection.
-#[derive(Debug)]
-struct Connection<B: Block> {
-	id: ConnectionId,
-	ongoing_request: Option<OngoingRequest<B>>,
-}
-
-#[derive(Debug)]
-struct OngoingRequest<B: Block> {
-	/// `Instant` when the request has been emitted. Used for diagnostic purposes.
-	emitted: Instant,
-	request: message::BlockRequest<B>,
-	timeout: Delay,
-}
-
-/// Outcome of calling `send_request`.
-#[derive(Debug)]
-#[must_use]
-pub enum SendRequestOutcome<B: Block> {
-	/// Request has been emitted.
-	Ok,
-	/// The request has been emitted and has replaced an existing request.
-	Replaced {
-		/// The previously-emitted request.
-		previous: message::BlockRequest<B>,
-		/// Time that had elapsed since `previous` has been emitted.
-		request_duration: Duration,
-	},
-	/// Didn't start a request because we have no connection to this node.
-	/// If `send_request` returns that, it is as if the function had never been called.
-	NotConnected,
-	/// Error while serializing the request.
-	EncodeError(prost::EncodeError),
-}
-
-impl<B> BlockRequests<B>
-where
-	B: Block,
-{
-	pub fn new(cfg: Config, chain: Arc<dyn Client<B>>) -> Self {
-		BlockRequests {
-			config: cfg,
-			chain,
-			peers: HashMap::new(),
-			outgoing: FuturesUnordered::new(),
-			pending_events: VecDeque::new(),
-		}
-	}
-
-	/// Returns the libp2p protocol name used on the wire (e.g. `/foo/sync/2`).
-	pub fn protocol_name(&self) -> &str {
-		&self.config.protocol
-	}
-
-	/// Issue a new block request.
-	///
-	/// Cancels any existing request targeting the same `PeerId`.
-	///
-	/// If the response doesn't arrive in time, or if the remote answers improperly, the target
-	/// will be disconnected.
-	pub fn send_request(&mut self, target: &PeerId, req: message::BlockRequest<B>) -> SendRequestOutcome<B> {
-		// Determine which connection to send the request to.
-		let connection = if let Some(peer) = self.peers.get_mut(target) {
-			// We don't want to have multiple requests for any given node, so in priority try to
-			// find a connection with an existing request, to override it.
-			if let Some(entry) = peer.iter_mut().find(|c| c.ongoing_request.is_some()) {
-				entry
-			} else if let Some(entry) = peer.get_mut(0) {
-				entry
-			} else {
-				log::error!(
-					target: "sync",
-					"State inconsistency: empty list of peer connections"
-				);
-				return SendRequestOutcome::NotConnected;
-			}
-		} else {
-			return SendRequestOutcome::NotConnected;
-		};
-
-		let protobuf_rq = build_protobuf_block_request(
-			req.fields,
-			req.from.clone(),
-			req.to.clone(),
-			req.direction,
-			req.max,
-		);
-
-		let mut buf = Vec::with_capacity(protobuf_rq.encoded_len());
-		if let Err(err) = protobuf_rq.encode(&mut buf) {
-			log::warn!(
-				target: "sync",
-				"Failed to encode block request {:?}: {:?}",
-				protobuf_rq,
-				err
-			);
-			return SendRequestOutcome::EncodeError(err);
-		}
-
-		let previous_request = connection.ongoing_request.take();
-		connection.ongoing_request = Some(OngoingRequest {
-			emitted: Instant::now(),
-			request: req.clone(),
-			timeout: Delay::new(self.config.request_timeout),
-		});
-
-		log::trace!(target: "sync", "Enqueueing block request to {:?}: {:?}", target, protobuf_rq);
-		self.pending_events.push_back(NetworkBehaviourAction::NotifyHandler {
-			peer_id: target.clone(),
-			handler: NotifyHandler::One(connection.id),
-			event: OutboundProtocol {
-				request: buf,
-				original_request: req,
-				max_response_size: self.config.max_response_len,
-				protocol: self.config.protocol.as_bytes().to_vec().into(),
-			},
-		});
-
-		if let Some(previous_request) = previous_request {
-			log::debug!(
-				target: "sync",
-				"Replacing existing block request on connection {:?}",
-				connection.id
-			);
-			SendRequestOutcome::Replaced {
-				previous: previous_request.request,
-				request_duration: previous_request.emitted.elapsed(),
-			}
-		} else {
-			SendRequestOutcome::Ok
-		}
-	}
-
-	/// Callback, invoked when a new block request has been received from remote.
-	fn on_block_request
-		( &mut self
-		, peer: &PeerId
-		, request: &schema::v1::BlockRequest
-		) -> Result<schema::v1::BlockResponse, Error>
-	{
-		log::trace!(
-			target: "sync",
-			"Block request from peer {}: from block {:?} to block {:?}, max blocks {:?}",
-			peer,
-			request.from_block,
-			request.to_block,
-			request.max_blocks);
-
-		let from_block_id =
-			match request.from_block {
-				Some(schema::v1::block_request::FromBlock::Hash(ref h)) => {
-					let h = Decode::decode(&mut h.as_ref())?;
-					BlockId::<B>::Hash(h)
-				}
-				Some(schema::v1::block_request::FromBlock::Number(ref n)) => {
-					let n = Decode::decode(&mut n.as_ref())?;
-					BlockId::<B>::Number(n)
-				}
-				None => {
-					let msg = "missing `BlockRequest::from_block` field";
-					return Err(io::Error::new(io::ErrorKind::Other, msg).into())
-				}
-			};
-
-		let max_blocks =
-			if request.max_blocks == 0 {
-				self.config.max_block_data_response
-			} else {
-				min(request.max_blocks, self.config.max_block_data_response)
-			};
-
-		let direction =
-			if request.direction == schema::v1::Direction::Ascending as i32 {
-				schema::v1::Direction::Ascending
-			} else if request.direction == schema::v1::Direction::Descending as i32 {
-				schema::v1::Direction::Descending
-			} else {
-				let msg = format!("invalid `BlockRequest::direction` value: {}", request.direction);
-				return Err(io::Error::new(io::ErrorKind::Other, msg).into())
-			};
-
-		let attributes = BlockAttributes::from_be_u32(request.fields)?;
-		let get_header = attributes.contains(BlockAttributes::HEADER);
-		let get_body = attributes.contains(BlockAttributes::BODY);
-		let get_justification = attributes.contains(BlockAttributes::JUSTIFICATION);
-
-		let mut blocks = Vec::new();
-		let mut block_id = from_block_id;
-		let mut total_size = 0;
-		while let Some(header) = self.chain.header(block_id).unwrap_or(None) {
-			if blocks.len() >= max_blocks as usize
-				|| (blocks.len() >= 1 && total_size > self.config.max_block_body_bytes)
-			{
-				break
-			}
-
-			let number = *header.number();
-			let hash = header.hash();
-			let parent_hash = *header.parent_hash();
-			let justification = if get_justification {
-				self.chain.justification(&BlockId::Hash(hash))?
-			} else {
-				None
-			};
-			let is_empty_justification = justification.as_ref().map(|j| j.is_empty()).unwrap_or(false);
-
-			let body = if get_body {
-				match self.chain.block_body(&BlockId::Hash(hash))? {
-					Some(mut extrinsics) => extrinsics.iter_mut()
-						.map(|extrinsic| extrinsic.encode())
-						.collect(),
-					None => {
-						log::trace!(target: "sync", "Missing data for block request.");
-						break;
-					}
-				}
-			} else {
-				Vec::new()
-			};
-
-			let block_data = schema::v1::BlockData {
-				hash: hash.encode(),
-				header: if get_header {
-					header.encode()
-				} else {
-					Vec::new()
-				},
-				body,
-				receipt: Vec::new(),
-				message_queue: Vec::new(),
-				justification: justification.unwrap_or_default(),
-				is_empty_justification,
-			};
-
-			total_size += block_data.body.len();
-			blocks.push(block_data);
-
-			match direction {
-				schema::v1::Direction::Ascending => {
-					block_id = BlockId::Number(number + One::one())
-				}
-				schema::v1::Direction::Descending => {
-					if number.is_zero() {
-						break
-					}
-					block_id = BlockId::Hash(parent_hash)
-				}
-			}
-		}
-
-		Ok(schema::v1::BlockResponse { blocks })
-	}
-}
-
-impl<B> NetworkBehaviour for BlockRequests<B>
-where
-	B: Block
-{
-	type ProtocolsHandler = OneShotHandler<InboundProtocol<B>, OutboundProtocol<B>, NodeEvent<B, NegotiatedSubstream>>;
-	type OutEvent = Event<B>;
-
-	fn new_handler(&mut self) -> Self::ProtocolsHandler {
-		let p = InboundProtocol {
-			max_request_len: self.config.max_request_len,
-			protocol: self.config.protocol.as_bytes().to_owned().into(),
-			marker: PhantomData,
-		};
-		let mut cfg = OneShotHandlerConfig::default();
-		cfg.keep_alive_timeout = self.config.inactivity_timeout;
-		cfg.outbound_substream_timeout = self.config.request_timeout;
-		OneShotHandler::new(SubstreamProtocol::new(p, ()), cfg)
-	}
-
-	fn addresses_of_peer(&mut self, _: &PeerId) -> Vec<Multiaddr> {
-		Vec::new()
-	}
-
-	fn inject_connected(&mut self, _peer: &PeerId) {
-	}
-
-	fn inject_disconnected(&mut self, _peer: &PeerId) {
-	}
-
-	fn inject_connection_established(&mut self, peer_id: &PeerId, id: &ConnectionId, _: &ConnectedPoint) {
-		self.peers.entry(peer_id.clone())
-			.or_default()
-			.push(Connection {
-				id: *id,
-				ongoing_request: None,
-			});
-	}
-
-	fn inject_connection_closed(&mut self, peer_id: &PeerId, id: &ConnectionId, _: &ConnectedPoint) {
-		let mut needs_remove = false;
-		if let Some(entry) = self.peers.get_mut(peer_id) {
-			if let Some(pos) = entry.iter().position(|i| i.id == *id) {
-				let ongoing_request = entry.remove(pos).ongoing_request;
-				if let Some(ongoing_request) = ongoing_request {
-					log::debug!(
-						target: "sync",
-						"Connection {:?} with {} closed with ongoing sync request: {:?}",
-						id,
-						peer_id,
-						ongoing_request
-					);
-					let ev = Event::RequestCancelled {
-						peer: peer_id.clone(),
-						request_duration: ongoing_request.emitted.elapsed(),
-					};
-					self.pending_events.push_back(NetworkBehaviourAction::GenerateEvent(ev));
-				}
-				if entry.is_empty() {
-					needs_remove = true;
-				}
-			} else {
-				log::error!(
-					target: "sync",
-					"State inconsistency: connection id not found in list"
-				);
-			}
-		} else {
-			log::error!(
-				target: "sync",
-				"State inconsistency: peer_id not found in list of connections"
-			);
-		}
-		if needs_remove {
-			self.peers.remove(peer_id);
-		}
-	}
-
-	fn inject_event(
-		&mut self,
-		peer: PeerId,
-		connection_id: ConnectionId,
-		node_event: NodeEvent<B, NegotiatedSubstream>
-	) {
-		match node_event {
-			NodeEvent::Request(request, mut stream, handling_start) => {
-				match self.on_block_request(&peer, &request) {
-					Ok(res) => {
-						log::trace!(
-							target: "sync",
-							"Enqueueing block response for peer {} with {} blocks",
-							peer, res.blocks.len()
-						);
-						let mut data = Vec::with_capacity(res.encoded_len());
-						if let Err(e) = res.encode(&mut data) {
-							log::debug!(
-								target: "sync",
-								"Error encoding block response for peer {}: {}",
-								peer, e
-							)
-						} else {
-							self.outgoing.push(async move {
-								if let Err(e) = write_one(&mut stream, data).await {
-									log::debug!(
-										target: "sync",
-										"Error writing block response: {}",
-										e
-									);
-								}
-								(peer, handling_start.elapsed())
-							}.boxed());
-						}
-					}
-					Err(e) => log::debug!(
-						target: "sync",
-						"Error handling block request from peer {}: {}", peer, e
-					)
-				}
-			}
-			NodeEvent::Response(original_request, response) => {
-				log::trace!(
-					target: "sync",
-					"Received block response from peer {} with {} blocks",
-					peer, response.blocks.len()
-				);
-				let request_duration = if let Some(connections) = self.peers.get_mut(&peer) {
-					if let Some(connection) = connections.iter_mut().find(|c| c.id == connection_id) {
-						if let Some(ongoing_request) = &mut connection.ongoing_request {
-							if ongoing_request.request == original_request {
-								let request_duration = ongoing_request.emitted.elapsed();
-								connection.ongoing_request = None;
-								request_duration
-							} else {
-								// We're no longer interested in that request.
-								log::debug!(
-									target: "sync",
-									"Received response from {} to obsolete block request {:?}",
-									peer,
-									original_request
-								);
-								return;
-							}
-						} else {
-							// We remove from `self.peers` requests we're no longer interested in,
-							// so this can legitimately happen.
-							log::trace!(
-								target: "sync",
-								"Response discarded because it concerns an obsolete request"
-							);
-							return;
-						}
-					} else {
-						log::error!(
-							target: "sync",
-							"State inconsistency: response on non-existing connection {:?}",
-							connection_id
-						);
-						return;
-					}
-				} else {
-					log::error!(
-						target: "sync",
-						"State inconsistency: response on non-connected peer {}",
-						peer
-					);
-					return;
-				};
-
-				let blocks = response.blocks.into_iter().map(|block_data| {
-					Ok(message::BlockData::<B> {
-						hash: Decode::decode(&mut block_data.hash.as_ref())?,
-						header: if !block_data.header.is_empty() {
-							Some(Decode::decode(&mut block_data.header.as_ref())?)
-						} else {
-							None
-						},
-						body: if original_request.fields.contains(message::BlockAttributes::BODY) {
-							Some(block_data.body.iter().map(|body| {
-								Decode::decode(&mut body.as_ref())
-							}).collect::<Result<Vec<_>, _>>()?)
-						} else {
-							None
-						},
-						receipt: if !block_data.message_queue.is_empty() {
-							Some(block_data.receipt)
-						} else {
-							None
-						},
-						message_queue: if !block_data.message_queue.is_empty() {
-							Some(block_data.message_queue)
-						} else {
-							None
-						},
-						justification: if !block_data.justification.is_empty() {
-							Some(block_data.justification)
-						} else if block_data.is_empty_justification {
-							Some(Vec::new())
-						} else {
-							None
-						},
-					})
-				}).collect::<Result<Vec<_>, codec::Error>>();
-
-				match blocks {
-					Ok(blocks) => {
-						let id = original_request.id;
-						let ev = Event::Response {
-							peer,
-							response: message::BlockResponse::<B> { id, blocks },
-							request_duration,
-						};
-						self.pending_events.push_back(NetworkBehaviourAction::GenerateEvent(ev));
-					}
-					Err(err) => {
-						log::debug!(
-							target: "sync",
-							"Failed to decode block response from peer {}: {}", peer, err
-						);
-					}
-				}
-			}
-		}
-	}
-
-	fn poll(&mut self, cx: &mut Context, _: &mut impl PollParameters)
-		-> Poll<NetworkBehaviourAction<OutboundProtocol<B>, Event<B>>>
-	{
-		if let Some(ev) = self.pending_events.pop_front() {
-			return Poll::Ready(ev);
-		}
-
-		// Check the request timeouts.
-		for (peer, connections) in &mut self.peers {
-			for connection in connections {
-				let ongoing_request = match &mut connection.ongoing_request {
-					Some(rq) => rq,
-					None => continue,
-				};
-
-				if let Poll::Ready(_) = Pin::new(&mut ongoing_request.timeout).poll(cx) {
-					let original_request = ongoing_request.request.clone();
-					let request_duration = ongoing_request.emitted.elapsed();
-					connection.ongoing_request = None;
-					log::debug!(
-						target: "sync",
-						"Request timeout for {}: {:?}",
-						peer, original_request
-					);
-					let ev = Event::RequestTimeout {
-						peer: peer.clone(),
-						request_duration,
-					};
-					return Poll::Ready(NetworkBehaviourAction::GenerateEvent(ev));
-				}
-			}
-		}
-
-		if let Poll::Ready(Some((peer, total_handling_time))) = self.outgoing.poll_next_unpin(cx) {
-			let ev = Event::AnsweredRequest {
-				peer,
-				total_handling_time,
-			};
-			return Poll::Ready(NetworkBehaviourAction::GenerateEvent(ev));
-		}
-
-		Poll::Pending
-	}
-}
-
-/// Output type of inbound and outbound substream upgrades.
-#[derive(Debug)]
-pub enum NodeEvent<B: Block, T> {
-	/// Incoming request from remote, substream to use for the response, and when we started
-	/// handling this request.
-	Request(schema::v1::BlockRequest, T, Instant),
-	/// Incoming response from remote.
-	Response(message::BlockRequest<B>, schema::v1::BlockResponse),
-}
-
-/// Substream upgrade protocol.
-///
-/// We attempt to parse an incoming protobuf encoded request (cf. `Request`)
-/// which will be handled by the `BlockRequests` behaviour, i.e. the request
-/// will become visible via `inject_node_event` which then dispatches to the
-/// relevant callback to process the message and prepare a response.
-#[derive(Debug, Clone)]
-pub struct InboundProtocol<B> {
-	/// The max. request length in bytes.
-	max_request_len: usize,
-	/// The protocol to use during upgrade negotiation.
-	protocol: Bytes,
-	/// Type of the block.
-	marker: PhantomData<B>,
-}
-
-impl<B: Block> UpgradeInfo for InboundProtocol<B> {
-	type Info = Bytes;
-	type InfoIter = iter::Once<Self::Info>;
-
-	fn protocol_info(&self) -> Self::InfoIter {
-		iter::once(self.protocol.clone())
-	}
-}
-
-impl<B, T> InboundUpgrade<T> for InboundProtocol<B>
-where
-	B: Block,
-	T: AsyncRead + AsyncWrite + Unpin + Send + 'static
-{
-	type Output = NodeEvent<B, T>;
-	type Error = ReadOneError;
-	type Future = BoxFuture<'static, Result<Self::Output, Self::Error>>;
-
-	fn upgrade_inbound(self, mut s: T, _: Self::Info) -> Self::Future {
-		// This `Instant` will be passed around until the processing of this request is done.
-		let handling_start = Instant::now();
-
-		let future = async move {
-			let len = self.max_request_len;
-			let vec = read_one(&mut s, len).await?;
-			match schema::v1::BlockRequest::decode(&vec[..]) {
-				Ok(r) => Ok(NodeEvent::Request(r, s, handling_start)),
-				Err(e) => Err(ReadOneError::Io(io::Error::new(io::ErrorKind::Other, e)))
-			}
-		};
-		future.boxed()
-	}
-}
-
-/// Substream upgrade protocol.
-///
-/// Sends a request to remote and awaits the response.
-#[derive(Debug, Clone)]
-pub struct OutboundProtocol<B: Block> {
-	/// The serialized protobuf request.
-	request: Vec<u8>,
-	/// The original request. Passed back through the API when the response comes back.
-	original_request: message::BlockRequest<B>,
-	/// The max. response length in bytes.
-	max_response_size: usize,
-	/// The protocol to use for upgrade negotiation.
-	protocol: Bytes,
-}
-
-impl<B: Block> UpgradeInfo for OutboundProtocol<B> {
-	type Info = Bytes;
-	type InfoIter = iter::Once<Self::Info>;
-
-	fn protocol_info(&self) -> Self::InfoIter {
-		iter::once(self.protocol.clone())
-	}
-}
-
-impl<B, T> OutboundUpgrade<T> for OutboundProtocol<B>
-where
-	B: Block,
-	T: AsyncRead + AsyncWrite + Unpin + Send + 'static
-{
-	type Output = NodeEvent<B, T>;
-	type Error = ReadOneError;
-	type Future = BoxFuture<'static, Result<Self::Output, Self::Error>>;
-
-	fn upgrade_outbound(self, mut s: T, _: Self::Info) -> Self::Future {
-		async move {
-			write_one(&mut s, &self.request).await?;
-			let vec = read_one(&mut s, self.max_response_size).await?;
-
-			schema::v1::BlockResponse::decode(&vec[..])
-				.map(|r| NodeEvent::Response(self.original_request, r))
-				.map_err(|e| {
-					ReadOneError::Io(io::Error::new(io::ErrorKind::Other, e))
-				})
-		}.boxed()
-	}
-}
-
-/// Build protobuf block request message.
-pub(crate) fn build_protobuf_block_request<Hash: Encode, Number: Encode>(
-	attributes: BlockAttributes,
-	from_block: message::FromBlock<Hash, Number>,
-	to_block: Option<Hash>,
-	direction: message::Direction,
-	max_blocks: Option<u32>,
-) -> schema::v1::BlockRequest {
-	schema::v1::BlockRequest {
-		fields: attributes.to_be_u32(),
-		from_block: match from_block {
-			message::FromBlock::Hash(h) =>
-				Some(schema::v1::block_request::FromBlock::Hash(h.encode())),
-			message::FromBlock::Number(n) =>
-				Some(schema::v1::block_request::FromBlock::Number(n.encode())),
-		},
-		to_block: to_block.map(|h| h.encode()).unwrap_or_default(),
-		direction: match direction {
-			message::Direction::Ascending => schema::v1::Direction::Ascending as i32,
-			message::Direction::Descending => schema::v1::Direction::Descending as i32,
-		},
-		max_blocks: max_blocks.unwrap_or(0),
-	}
-}
diff --git a/client/network/src/config.rs b/client/network/src/config.rs
index 7c85da8bbaa1..b7e47e973a33 100644
--- a/client/network/src/config.rs
+++ b/client/network/src/config.rs
@@ -95,6 +95,18 @@ pub struct Params<B: BlockT, H: ExHashT> {
 
 	/// Registry for recording prometheus metrics to.
 	pub metrics_registry: Option<Registry>,
+
+	/// Request response configuration for the block request protocol.
+	///
+	/// [`RequestResponseConfig`] [`name`] is used to tag outgoing block requests with the correct
+	/// protocol name. In addition all of [`RequestResponseConfig`] is used to handle incoming block
+	/// requests, if enabled.
+	///
+	/// Can be constructed either via [`block_request_handler::generate_protocol_config`] allowing
+	/// outgoing but not incoming requests, or constructed via
+	/// [`block_request_handler::BlockRequestHandler::new`] allowing both outgoing and incoming
+	/// requests.
+	pub block_request_protocol_config: RequestResponseConfig,
 }
 
 /// Role of the local node.
diff --git a/client/network/src/gossip/tests.rs b/client/network/src/gossip/tests.rs
index d284616ce942..e621adf0c09e 100644
--- a/client/network/src/gossip/tests.rs
+++ b/client/network/src/gossip/tests.rs
@@ -16,7 +16,9 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::{config, gossip::QueuedSender, Event, NetworkService, NetworkWorker};
+use crate::block_request_handler::BlockRequestHandler;
+use crate::gossip::QueuedSender;
+use crate::{config,  Event, NetworkService, NetworkWorker};
 
 use futures::prelude::*;
 use sp_runtime::traits::{Block as BlockT, Header as _};
@@ -33,7 +35,7 @@ type TestNetworkService = NetworkService<
 ///
 /// > **Note**: We return the events stream in order to not possibly lose events between the
 /// >			construction of the service and the moment the events stream is grabbed.
-fn build_test_full_node(config: config::NetworkConfiguration)
+fn build_test_full_node(network_config: config::NetworkConfiguration)
 	-> (Arc<TestNetworkService>, impl Stream<Item = Event>)
 {
 	let client = Arc::new(
@@ -90,19 +92,31 @@ fn build_test_full_node(config: config::NetworkConfiguration)
 		None,
 	));
 
+	let protocol_id = config::ProtocolId::from("/test-protocol-name");
+
+	let block_request_protocol_config = {
+		let (handler, protocol_config) = BlockRequestHandler::new(
+			protocol_id.clone(),
+			client.clone(),
+		);
+		async_std::task::spawn(handler.run().boxed());
+		protocol_config
+	};
+
 	let worker = NetworkWorker::new(config::Params {
 		role: config::Role::Full,
 		executor: None,
-		network_config: config,
+		network_config,
 		chain: client.clone(),
 		on_demand: None,
 		transaction_pool: Arc::new(crate::config::EmptyTransactionPool),
-		protocol_id: config::ProtocolId::from("/test-protocol-name"),
+		protocol_id,
 		import_queue,
 		block_announce_validator: Box::new(
 			sp_consensus::block_validation::DefaultBlockAnnounceValidator,
 		),
 		metrics_registry: None,
+		block_request_protocol_config,
 	})
 	.unwrap();
 
diff --git a/client/network/src/lib.rs b/client/network/src/lib.rs
index 533a69dd4d5a..ab7625ff9fe8 100644
--- a/client/network/src/lib.rs
+++ b/client/network/src/lib.rs
@@ -246,7 +246,6 @@
 //!
 
 mod behaviour;
-mod block_requests;
 mod chain;
 mod peer_info;
 mod discovery;
@@ -259,6 +258,7 @@ mod service;
 mod transport;
 mod utils;
 
+pub mod block_request_handler;
 pub mod config;
 pub mod error;
 pub mod gossip;
diff --git a/client/network/src/light_client_handler.rs b/client/network/src/light_client_handler.rs
index 83c1160a3364..3ac6e67a2327 100644
--- a/client/network/src/light_client_handler.rs
+++ b/client/network/src/light_client_handler.rs
@@ -29,7 +29,6 @@
 use bytes::Bytes;
 use codec::{self, Encode, Decode};
 use crate::{
-	block_requests::build_protobuf_block_request,
 	chain::Client,
 	config::ProtocolId,
 	protocol::message::{BlockAttributes, Direction, FromBlock},
@@ -1066,13 +1065,16 @@ fn retries<B: Block>(request: &Request<B>) -> usize {
 fn serialize_request<B: Block>(request: &Request<B>) -> Result<Vec<u8>, prost::EncodeError> {
 	let request = match request {
 		Request::Body { request, .. } => {
-			let rq = build_protobuf_block_request::<_, NumberFor<B>>(
-				BlockAttributes::BODY,
-				FromBlock::Hash(request.header.hash()),
-				None,
-				Direction::Ascending,
-				Some(1),
-			);
+			let rq = schema::v1::BlockRequest {
+				fields: BlockAttributes::BODY.to_be_u32(),
+				from_block: Some(schema::v1::block_request::FromBlock::Hash(
+					request.header.hash().encode(),
+				)),
+				to_block: Default::default(),
+				direction: schema::v1::Direction::Ascending as i32,
+				max_blocks: 1,
+			};
+
 			let mut buf = Vec::with_capacity(rq.encoded_len());
 			rq.encode(&mut buf)?;
 			return Ok(buf);
diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index 3bbfdb2cb65f..e3d6d5e815c3 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -21,41 +21,43 @@ use crate::{
 	chain::Client,
 	config::{ProtocolId, TransactionPool, TransactionImportFuture, TransactionImport},
 	error,
+	request_responses::RequestFailure,
 	utils::{interval, LruHashSet},
 };
 
 use bytes::{Bytes, BytesMut};
-use futures::{prelude::*, stream::FuturesUnordered};
+use codec::{Decode, DecodeAll, Encode};
+use futures::{channel::oneshot, prelude::*, stream::FuturesUnordered};
 use generic_proto::{GenericProto, GenericProtoOut};
-use libp2p::{Multiaddr, PeerId};
 use libp2p::core::{ConnectedPoint, connection::{ConnectionId, ListenerId}};
-use libp2p::swarm::{ProtocolsHandler, IntoProtocolsHandler};
+use libp2p::request_response::OutboundFailure;
 use libp2p::swarm::{NetworkBehaviour, NetworkBehaviourAction, PollParameters};
+use libp2p::swarm::{ProtocolsHandler, IntoProtocolsHandler};
+use libp2p::{Multiaddr, PeerId};
+use log::{log, Level, trace, debug, warn, error};
+use message::{BlockAnnounce, Message};
+use message::generic::{Message as GenericMessage, Roles};
+use prometheus_endpoint::{
+	Registry, Gauge, Counter, GaugeVec,
+	PrometheusError, Opts, register, U64
+};
+use prost::Message as _;
 use sp_consensus::{
 	BlockOrigin,
 	block_validation::BlockAnnounceValidator,
 	import_queue::{BlockImportResult, BlockImportError, IncomingBlock, Origin}
 };
-use codec::{Decode, DecodeAll, Encode};
 use sp_runtime::{generic::BlockId, Justification};
 use sp_runtime::traits::{
 	Block as BlockT, Header as HeaderT, NumberFor, Zero, CheckedSub
 };
 use sp_arithmetic::traits::SaturatedConversion;
-use message::{BlockAnnounce, Message};
-use message::generic::{Message as GenericMessage, Roles};
-use prometheus_endpoint::{
-	Registry, Gauge, Counter, GaugeVec,
-	PrometheusError, Opts, register, U64
-};
 use sync::{ChainSync, SyncState};
 use std::borrow::Cow;
 use std::collections::{HashMap, HashSet, VecDeque, hash_map::Entry};
 use std::sync::Arc;
 use std::fmt::Write;
 use std::{io, iter, num::NonZeroUsize, pin::Pin, task::Poll, time};
-use log::{log, Level, trace, debug, warn, error};
-use wasm_timer::Instant;
 
 mod generic_proto;
 
@@ -65,7 +67,6 @@ pub mod sync;
 
 pub use generic_proto::{NotificationsSink, Ready, NotifsHandlerError};
 
-const REQUEST_TIMEOUT_SEC: u64 = 40;
 /// Interval at which we perform time based maintenance
 const TICK_TIMEOUT: time::Duration = time::Duration::from_millis(1100);
 /// Interval at which we propagate transactions;
@@ -95,6 +96,8 @@ mod rep {
 	use sc_peerset::ReputationChange as Rep;
 	/// Reputation change when a peer doesn't respond in time to our messages.
 	pub const TIMEOUT: Rep = Rep::new(-(1 << 10), "Request timeout");
+	/// Reputation change when a peer refuses a request.
+	pub const REFUSED: Rep = Rep::new(-(1 << 10), "Request refused");
 	/// Reputation change when we are a light client and a peer is behind us.
 	pub const PEER_BEHIND_US_LIGHT: Rep = Rep::new(-(1 << 8), "Useless for a light peer");
 	/// Reputation change when a peer sends us any transaction.
@@ -110,8 +113,6 @@ mod rep {
 	pub const BAD_TRANSACTION: Rep = Rep::new(-(1 << 12), "Bad transaction");
 	/// We received a message that failed to decode.
 	pub const BAD_MESSAGE: Rep = Rep::new(-(1 << 12), "Bad message");
-	/// We received an unexpected response.
-	pub const UNEXPECTED_RESPONSE: Rep = Rep::new_fatal("Unexpected response packet");
 	/// We received an unexpected transaction packet.
 	pub const UNEXPECTED_TRANSACTIONS: Rep = Rep::new_fatal("Unexpected transactions packet");
 	/// Peer has different genesis.
@@ -125,7 +126,6 @@ mod rep {
 }
 
 struct Metrics {
-	obsolete_requests: Gauge<U64>,
 	peers: Gauge<U64>,
 	queued_blocks: Gauge<U64>,
 	fork_targets: Gauge<U64>,
@@ -136,10 +136,6 @@ struct Metrics {
 impl Metrics {
 	fn register(r: &Registry) -> Result<Self, PrometheusError> {
 		Ok(Metrics {
-			obsolete_requests: {
-				let g = Gauge::new("sync_obsolete_requests", "Number of obsolete requests")?;
-				register(g, r)?
-			},
 			peers: {
 				let g = Gauge::new("sync_peers", "Number of peers we sync with")?;
 				register(g, r)?
@@ -241,13 +237,14 @@ struct PacketStats {
 }
 
 /// Peer information
-#[derive(Debug, Clone)]
+#[derive(Debug)]
 struct Peer<B: BlockT, H: ExHashT> {
 	info: PeerInfo<B>,
-	/// Current block request, if any.
-	block_request: Option<(Instant, message::BlockRequest<B>)>,
-	/// Requests we are no longer interested in.
-	obsolete_requests: HashMap<message::RequestId, Instant>,
+	/// Current block request, if any. Started by emitting [`CustomMessageOutcome::BlockRequest`].
+	block_request: Option<(
+		message::BlockRequest<B>,
+		oneshot::Receiver<Result<Vec<u8>, RequestFailure>>,
+	)>,
 	/// Holds a set of transactions known to this peer.
 	known_transactions: LruHashSet<H>,
 	/// Holds a set of blocks known to this peer.
@@ -640,8 +637,12 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 		CustomMessageOutcome::None
 	}
 
-	fn update_peer_request(&mut self, who: &PeerId, request: &mut message::BlockRequest<B>) {
-		update_peer_request::<B, H>(&mut self.context_data.peers, who, request)
+	fn prepare_block_request(
+		&mut self,
+		who: PeerId,
+		request: message::BlockRequest<B>,
+	) -> CustomMessageOutcome<B> {
+		prepare_block_request::<B, H>(&mut self.context_data.peers, who, request)
 	}
 
 	/// Called by peer when it is disconnecting
@@ -674,52 +675,76 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 	/// Must contain the same `PeerId` and request that have been emitted.
 	pub fn on_block_response(
 		&mut self,
-		peer: PeerId,
-		response: message::BlockResponse<B>,
+		peer_id: PeerId,
+		request: message::BlockRequest<B>,
+		response: crate::schema::v1::BlockResponse,
 	) -> CustomMessageOutcome<B> {
-		let request = if let Some(ref mut p) = self.context_data.peers.get_mut(&peer) {
-			if p.obsolete_requests.remove(&response.id).is_some() {
-				trace!(target: "sync", "Ignoring obsolete block response packet from {} ({})", peer, response.id);
+		let blocks = response.blocks.into_iter().map(|block_data| {
+			Ok(message::BlockData::<B> {
+				hash: Decode::decode(&mut block_data.hash.as_ref())?,
+				header: if !block_data.header.is_empty() {
+					Some(Decode::decode(&mut block_data.header.as_ref())?)
+				} else {
+					None
+				},
+				body: if request.fields.contains(message::BlockAttributes::BODY) {
+					Some(block_data.body.iter().map(|body| {
+						Decode::decode(&mut body.as_ref())
+					}).collect::<Result<Vec<_>, _>>()?)
+				} else {
+					None
+				},
+				receipt: if !block_data.message_queue.is_empty() {
+					Some(block_data.receipt)
+				} else {
+					None
+				},
+				message_queue: if !block_data.message_queue.is_empty() {
+					Some(block_data.message_queue)
+				} else {
+					None
+				},
+				justification: if !block_data.justification.is_empty() {
+					Some(block_data.justification)
+				} else if block_data.is_empty_justification {
+					Some(Vec::new())
+				} else {
+					None
+				},
+			})
+		}).collect::<Result<Vec<_>, codec::Error>>();
+
+		let blocks = match blocks {
+			Ok(blocks) => blocks,
+			Err(err) => {
+				debug!(target: "sync", "Failed to decode block response from {}: {}", peer_id, err);
+				self.peerset_handle.report_peer(peer_id, rep::BAD_MESSAGE);
 				return CustomMessageOutcome::None;
 			}
-			// Clear the request. If the response is invalid peer will be disconnected anyway.
-			match p.block_request.take() {
-				Some((_, request)) if request.id == response.id => request,
-				Some(_) =>  {
-					trace!(target: "sync", "Ignoring obsolete block response packet from {} ({})", peer, response.id);
-					return CustomMessageOutcome::None;
-				}
-				None => {
-					trace!(target: "sync", "Unexpected response packet from unknown peer {}", peer);
-					self.behaviour.disconnect_peer(&peer);
-					self.peerset_handle.report_peer(peer, rep::UNEXPECTED_RESPONSE);
-					return CustomMessageOutcome::None;
-				}
-			}
-		} else {
-			trace!(target: "sync", "Unexpected response packet from unknown peer {}", peer);
-			self.behaviour.disconnect_peer(&peer);
-			self.peerset_handle.report_peer(peer, rep::UNEXPECTED_RESPONSE);
-			return CustomMessageOutcome::None;
+		};
+
+		let block_response = message::BlockResponse::<B> {
+			id: request.id,
+			blocks,
 		};
 
 		let blocks_range = || match (
-			response.blocks.first().and_then(|b| b.header.as_ref().map(|h| h.number())),
-			response.blocks.last().and_then(|b| b.header.as_ref().map(|h| h.number())),
+			block_response.blocks.first().and_then(|b| b.header.as_ref().map(|h| h.number())),
+			block_response.blocks.last().and_then(|b| b.header.as_ref().map(|h| h.number())),
 		) {
 			(Some(first), Some(last)) if first != last => format!(" ({}..{})", first, last),
 			(Some(first), Some(_)) => format!(" ({})", first),
 			_ => Default::default(),
 		};
 		trace!(target: "sync", "BlockResponse {} from {} with {} blocks {}",
-			response.id,
-			peer,
-			response.blocks.len(),
+			block_response.id,
+			peer_id,
+			block_response.blocks.len(),
 			blocks_range(),
 		);
 
 		if request.fields == message::BlockAttributes::JUSTIFICATION {
-			match self.sync.on_block_justification(peer, response) {
+			match self.sync.on_block_justification(peer_id, block_response) {
 				Ok(sync::OnBlockJustification::Nothing) => CustomMessageOutcome::None,
 				Ok(sync::OnBlockJustification::Import { peer, hash, number, justification }) =>
 					CustomMessageOutcome::JustificationImport(peer, hash, number, justification),
@@ -730,15 +755,11 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 				}
 			}
 		} else {
-			match self.sync.on_block_data(&peer, Some(request), response) {
+			match self.sync.on_block_data(&peer_id, Some(request), block_response) {
 				Ok(sync::OnBlockData::Import(origin, blocks)) =>
 					CustomMessageOutcome::BlockImport(origin, blocks),
-				Ok(sync::OnBlockData::Request(peer, mut req)) => {
-					self.update_peer_request(&peer, &mut req);
-					CustomMessageOutcome::BlockRequest {
-						target: peer,
-						request: req,
-					}
+				Ok(sync::OnBlockData::Request(peer, req)) => {
+					self.prepare_block_request(peer, req)
 				}
 				Err(sync::BadPeer(id, repu)) => {
 					self.behaviour.disconnect_peer(&id);
@@ -749,52 +770,13 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 		}
 	}
 
-	/// Must be called in response to a [`CustomMessageOutcome::BlockRequest`] if it has failed.
-	pub fn on_block_request_failed(
-		&mut self,
-		peer: &PeerId,
-	) {
-		self.peerset_handle.report_peer(peer.clone(), rep::TIMEOUT);
-		self.behaviour.disconnect_peer(peer);
-	}
-
 	/// Perform time based maintenance.
 	///
 	/// > **Note**: This method normally doesn't have to be called except for testing purposes.
 	pub fn tick(&mut self) {
-		self.maintain_peers();
 		self.report_metrics()
 	}
 
-	fn maintain_peers(&mut self) {
-		let tick = Instant::now();
-		let mut aborting = Vec::new();
-		{
-			for (who, peer) in self.context_data.peers.iter() {
-				if peer.block_request.as_ref().map_or(false, |(t, _)| (tick - *t).as_secs() > REQUEST_TIMEOUT_SEC) {
-					log!(
-						target: "sync",
-						if self.important_peers.contains(who) { Level::Warn } else { Level::Trace },
-						"Request timeout {}", who
-					);
-					aborting.push(who.clone());
-				} else if peer.obsolete_requests.values().any(|t| (tick - *t).as_secs() > REQUEST_TIMEOUT_SEC) {
-					log!(
-						target: "sync",
-						if self.important_peers.contains(who) { Level::Warn } else { Level::Trace },
-						"Obsolete timeout {}", who
-					);
-					aborting.push(who.clone());
-				}
-			}
-		}
-
-		for p in aborting {
-			self.behaviour.disconnect_peer(&p);
-			self.peerset_handle.report_peer(p, rep::TIMEOUT);
-		}
-	}
-
 	/// Called on the first connection between two peers, after their exchange of handshake.
 	fn on_peer_connected(
 		&mut self,
@@ -870,7 +852,6 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 			known_blocks: LruHashSet::new(NonZeroUsize::new(MAX_KNOWN_BLOCKS)
 				.expect("Constant is nonzero")),
 			next_request_id: 0,
-			obsolete_requests: HashMap::new(),
 		};
 		self.context_data.peers.insert(who.clone(), peer);
 
@@ -881,12 +862,9 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 		if info.roles.is_full() {
 			match self.sync.new_peer(who.clone(), info.best_hash, info.best_number) {
 				Ok(None) => (),
-				Ok(Some(mut req)) => {
-					self.update_peer_request(&who, &mut req);
-					self.pending_messages.push_back(CustomMessageOutcome::BlockRequest {
-						target: who.clone(),
-						request: req,
-					});
+				Ok(Some(req)) => {
+					let event = self.prepare_block_request(who.clone(), req);
+					self.pending_messages.push_back(event);
 				},
 				Err(sync::BadPeer(id, repu)) => {
 					self.behaviour.disconnect_peer(&id);
@@ -1216,12 +1194,8 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 			Ok(sync::OnBlockData::Import(origin, blocks)) => {
 				CustomMessageOutcome::BlockImport(origin, blocks)
 			},
-			Ok(sync::OnBlockData::Request(peer, mut req)) => {
-				self.update_peer_request(&peer, &mut req);
-				CustomMessageOutcome::BlockRequest {
-					target: peer,
-					request: req,
-				}
+			Ok(sync::OnBlockData::Request(peer, req)) => {
+				self.prepare_block_request(peer, req)
 			}
 			Err(sync::BadPeer(id, repu)) => {
 				self.behaviour.disconnect_peer(&id);
@@ -1268,12 +1242,10 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 		);
 		for result in results {
 			match result {
-				Ok((id, mut req)) => {
-					update_peer_request(&mut self.context_data.peers, &id, &mut req);
-					self.pending_messages.push_back(CustomMessageOutcome::BlockRequest {
-						target: id,
-						request: req,
-					});
+				Ok((id, req)) => {
+					self.pending_messages.push_back(
+						prepare_block_request(&mut self.context_data.peers, id, req)
+					);
 				}
 				Err(sync::BadPeer(id, repu)) => {
 					self.behaviour.disconnect_peer(&id);
@@ -1316,13 +1288,6 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 		use std::convert::TryInto;
 
 		if let Some(metrics) = &self.metrics {
-			let mut obsolete_requests: u64 = 0;
-			for peer in self.context_data.peers.values() {
-				let n = peer.obsolete_requests.len().try_into().unwrap_or(std::u64::MAX);
-				obsolete_requests = obsolete_requests.saturating_add(n);
-			}
-			metrics.obsolete_requests.set(obsolete_requests);
-
 			let n = self.context_data.peers.len().try_into().unwrap_or(std::u64::MAX);
 			metrics.peers.set(n);
 
@@ -1343,6 +1308,39 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 	}
 }
 
+fn prepare_block_request<B: BlockT, H: ExHashT>(
+	peers: &mut HashMap<PeerId, Peer<B, H>>,
+	who: PeerId,
+	mut request: message::BlockRequest<B>,
+) -> CustomMessageOutcome<B> {
+	let (tx, rx) = oneshot::channel();
+
+	if let Some(ref mut peer) = peers.get_mut(&who) {
+		request.id = peer.next_request_id;
+		peer.next_request_id += 1;
+		peer.block_request = Some((request.clone(), rx));
+	}
+
+	let request = crate::schema::v1::BlockRequest {
+		fields: request.fields.to_be_u32(),
+		from_block: match request.from {
+			message::FromBlock::Hash(h) =>
+				Some(crate::schema::v1::block_request::FromBlock::Hash(h.encode())),
+			message::FromBlock::Number(n) =>
+				Some(crate::schema::v1::block_request::FromBlock::Number(n.encode())),
+		},
+		to_block: request.to.map(|h| h.encode()).unwrap_or_default(),
+		direction: request.direction as i32,
+		max_blocks: request.max.unwrap_or(0),
+	};
+
+	CustomMessageOutcome::BlockRequest {
+		target: who,
+		request: request,
+		pending_response: tx,
+	}
+}
+
 /// Outcome of an incoming custom message.
 #[derive(Debug)]
 #[must_use]
@@ -1367,33 +1365,16 @@ pub enum CustomMessageOutcome<B: BlockT> {
 	/// Messages have been received on one or more notifications protocols.
 	NotificationsReceived { remote: PeerId, messages: Vec<(Cow<'static, str>, Bytes)> },
 	/// A new block request must be emitted.
-	/// You must later call either [`Protocol::on_block_response`] or
-	/// [`Protocol::on_block_request_failed`].
-	/// Each peer can only have one active request. If a request already exists for this peer, it
-	/// must be silently discarded.
-	/// It is the responsibility of the handler to ensure that a timeout exists.
-	BlockRequest { target: PeerId, request: message::BlockRequest<B> },
+	BlockRequest {
+		target: PeerId,
+		request: crate::schema::v1::BlockRequest,
+		pending_response: oneshot::Sender<Result<Vec<u8>, RequestFailure>>,
+	},
 	/// Peer has a reported a new head of chain.
 	PeerNewBest(PeerId, NumberFor<B>),
 	None,
 }
 
-fn update_peer_request<B: BlockT, H: ExHashT>(
-	peers: &mut HashMap<PeerId, Peer<B, H>>,
-	who: &PeerId,
-	request: &mut message::BlockRequest<B>,
-) {
-	if let Some(ref mut peer) = peers.get_mut(who) {
-		request.id = peer.next_request_id;
-		peer.next_request_id += 1;
-		if let Some((timestamp, request)) = peer.block_request.take() {
-			trace!(target: "sync", "Request {} for {} is now obsolete.", request.id, who);
-			peer.obsolete_requests.insert(request.id, timestamp);
-		}
-		peer.block_request = Some((Instant::now(), request.clone()));
-	}
-}
-
 impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 	type ProtocolsHandler = <GenericProto as NetworkBehaviour>::ProtocolsHandler;
 	type OutEvent = CustomMessageOutcome<B>;
@@ -1445,6 +1426,80 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 			return Poll::Ready(NetworkBehaviourAction::GenerateEvent(message));
 		}
 
+		// Check for finished outgoing requests.
+		let mut finished_block_requests = Vec::new();
+		for (id, peer) in self.context_data.peers.iter_mut() {
+			if let Peer { block_request: Some((_, pending_response)), .. } = peer {
+				match pending_response.poll_unpin(cx) {
+					Poll::Ready(Ok(Ok(resp))) => {
+						let (req, _) = peer.block_request.take().unwrap();
+
+						let protobuf_response = match crate::schema::v1::BlockResponse::decode(&resp[..]) {
+							Ok(proto) => proto,
+							Err(e) => {
+								trace!(target: "sync", "Failed to decode block request to peer {:?}: {:?}.", id, e);
+								self.peerset_handle.report_peer(id.clone(), rep::BAD_MESSAGE);
+								self.behaviour.disconnect_peer(id);
+								continue;
+							}
+						};
+
+						finished_block_requests.push((id.clone(), req, protobuf_response));
+					},
+					Poll::Ready(Ok(Err(e))) => {
+						peer.block_request.take();
+						trace!(target: "sync", "Block request to peer {:?} failed: {:?}.", id, e);
+
+						match e {
+							RequestFailure::Network(OutboundFailure::Timeout) => {
+								self.peerset_handle.report_peer(id.clone(), rep::TIMEOUT);
+								self.behaviour.disconnect_peer(id);
+							}
+							RequestFailure::Network(OutboundFailure::UnsupportedProtocols) => {
+								self.peerset_handle.report_peer(id.clone(), rep::BAD_PROTOCOL);
+								self.behaviour.disconnect_peer(id);
+							}
+							RequestFailure::Network(OutboundFailure::DialFailure) => {
+								self.behaviour.disconnect_peer(id);
+							}
+							RequestFailure::Refused => {
+								self.peerset_handle.report_peer(id.clone(), rep::REFUSED);
+								self.behaviour.disconnect_peer(id);
+							}
+							RequestFailure::Network(OutboundFailure::ConnectionClosed)
+							| RequestFailure::NotConnected => {
+								self.behaviour.disconnect_peer(id);
+							},
+							RequestFailure::UnknownProtocol => {
+								debug_assert!(false, "Block request protocol should always be known.");
+							}
+							RequestFailure::Obsolete => {
+								debug_assert!(
+									false,
+									"Can not receive `RequestFailure::Obsolete` after dropping the \
+									 response receiver.",
+								);
+							}
+						}
+					},
+					Poll::Ready(Err(oneshot::Canceled)) => {
+						peer.block_request.take();
+						trace!(
+							target: "sync",
+							"Block request to peer {:?} failed due to oneshot being canceled.",
+							id,
+						);
+						self.behaviour.disconnect_peer(id);
+					},
+					Poll::Pending => {},
+				}
+			}
+		}
+		for (id, req, protobuf_response) in finished_block_requests {
+			let ev = self.on_block_response(id, req, protobuf_response);
+			self.pending_messages.push_back(ev);
+		}
+
 		while let Poll::Ready(Some(())) = self.tick_timeout.poll_next_unpin(cx) {
 			self.tick();
 		}
@@ -1453,20 +1508,12 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 			self.propagate_transactions();
 		}
 
-		for (id, mut r) in self.sync.block_requests() {
-			update_peer_request(&mut self.context_data.peers, &id, &mut r);
-			let event = CustomMessageOutcome::BlockRequest {
-				target: id.clone(),
-				request: r,
-			};
+		for (id, request) in self.sync.block_requests() {
+			let event = prepare_block_request(&mut self.context_data.peers, id.clone(), request);
 			self.pending_messages.push_back(event);
 		}
-		for (id, mut r) in self.sync.justification_requests() {
-			update_peer_request(&mut self.context_data.peers, &id, &mut r);
-			let event = CustomMessageOutcome::BlockRequest {
-				target: id,
-				request: r,
-			};
+		for (id, request) in self.sync.justification_requests() {
+			let event = prepare_block_request(&mut self.context_data.peers, id, request);
 			self.pending_messages.push_back(event);
 		}
 		if let Poll::Ready(Some((tx_hash, result))) = self.pending_transactions.poll_next_unpin(cx) {
@@ -1570,7 +1617,9 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 						}
 					}
 					Some(Fallback::Transactions) => {
-						if let Ok(m) = message::Transactions::decode(&mut message.as_ref()) {
+						if let Ok(m) = <message::Transactions<B::Extrinsic> as Decode>::decode(
+							&mut message.as_ref(),
+						) {
 							self.on_transactions(peer_id, m);
 						} else {
 							warn!(target: "sub-libp2p", "Failed to decode transactions list");
@@ -1594,17 +1643,25 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 						}
 					}
 					None => {
-						debug!(target: "sub-libp2p", "Received notification from unknown protocol {:?}", protocol_name);
+						debug!(
+							target: "sub-libp2p",
+							"Received notification from unknown protocol {:?}",
+							protocol_name,
+						);
 						CustomMessageOutcome::None
 					}
 				}
 		};
 
-		if let CustomMessageOutcome::None = outcome {
-			Poll::Pending
-		} else {
-			Poll::Ready(NetworkBehaviourAction::GenerateEvent(outcome))
+		if !matches!(outcome, CustomMessageOutcome::<B>::None) {
+			return Poll::Ready(NetworkBehaviourAction::GenerateEvent(outcome));
 		}
+
+		if let Some(message) = self.pending_messages.pop_front() {
+			return Poll::Ready(NetworkBehaviourAction::GenerateEvent(message));
+		}
+
+		Poll::Pending
 	}
 
 	fn inject_addr_reach_failure(
diff --git a/client/network/src/request_responses.rs b/client/network/src/request_responses.rs
index 806c04e5f307..fbdb1432379e 100644
--- a/client/network/src/request_responses.rs
+++ b/client/network/src/request_responses.rs
@@ -137,11 +137,17 @@ pub enum Event {
 
 	/// A request initiated using [`RequestResponsesBehaviour::send_request`] has succeeded or
 	/// failed.
+	///
+	/// This event is generated for statistics purposes.
 	RequestFinished {
-		/// Request that has succeeded.
-		request_id: RequestId,
-		/// Response sent by the remote or reason for failure.
-		result: Result<Vec<u8>, RequestFailure>,
+		/// Peer that we send a request to.
+		peer: PeerId,
+		/// Name of the protocol in question.
+		protocol: Cow<'static, str>,
+		/// Duration the request took.
+		duration: Duration,
+		/// Result of the request.
+		result: Result<(), RequestFailure>
 	},
 }
 
@@ -155,8 +161,11 @@ pub struct RequestResponsesBehaviour {
 		(RequestResponse<GenericCodec>, Option<mpsc::Sender<IncomingRequest>>)
 	>,
 
+	/// Pending requests, passed down to a [`RequestResponse`] behaviour, awaiting a reply.
+	pending_requests: HashMap<RequestId, (Instant, oneshot::Sender<Result<Vec<u8>, RequestFailure>>)>,
+
 	/// Whenever an incoming request arrives, a `Future` is added to this list and will yield the
-	/// response to send back to the remote.
+	/// start time and the response to send back to the remote.
 	pending_responses: stream::FuturesUnordered<
 		Pin<Box<dyn Future<Output = Option<RequestProcessingOutcome>> + Send>>
 	>,
@@ -203,6 +212,7 @@ impl RequestResponsesBehaviour {
 
 		Ok(Self {
 			protocols,
+			pending_requests: Default::default(),
 			pending_responses: Default::default(),
 			pending_responses_arrival_time: Default::default(),
 		})
@@ -212,17 +222,36 @@ impl RequestResponsesBehaviour {
 	///
 	/// An error is returned if we are not connected to the target peer or if the protocol doesn't
 	/// match one that has been registered.
-	pub fn send_request(&mut self, target: &PeerId, protocol: &str, request: Vec<u8>)
-		-> Result<RequestId, SendRequestError>
-	{
+	pub fn send_request(
+		&mut self,
+		target: &PeerId,
+		protocol: &str,
+		request: Vec<u8>,
+		pending_response: oneshot::Sender<Result<Vec<u8>, RequestFailure>>,
+	) {
 		if let Some((protocol, _)) = self.protocols.get_mut(protocol) {
 			if protocol.is_connected(target) {
-				Ok(protocol.send_request(target, request))
+				let request_id = protocol.send_request(target, request);
+				self.pending_requests.insert(request_id, (Instant::now(), pending_response));
 			} else {
-				Err(SendRequestError::NotConnected)
+				if pending_response.send(Err(RequestFailure::NotConnected)).is_err() {
+					log::debug!(
+						target: "sub-libp2p",
+						"Not connected to peer {:?}. At the same time local \
+						 node is no longer interested in the result.",
+						target,
+					);
+				};
 			}
 		} else {
-			Err(SendRequestError::UnknownProtocol)
+			if pending_response.send(Err(RequestFailure::UnknownProtocol)).is_err() {
+				log::debug!(
+					target: "sub-libp2p",
+					"Unknown protocol {:?}. At the same time local \
+					 node is no longer interested in the result.",
+					protocol,
+				);
+			};
 		}
 	}
 }
@@ -440,6 +469,8 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 									payload: request,
 									pending_response: tx,
 								});
+							} else {
+								debug_assert!(false, "Received message on outbound-only protocol.");
 							}
 
 							let protocol = protocol.clone();
@@ -463,29 +494,80 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 
 						// Received a response from a remote to one of our requests.
 						RequestResponseEvent::Message {
+							peer,
 							message: RequestResponseMessage::Response {
 								request_id,
 								response,
 							},
 							..
 						} => {
+							let (started, delivered) = match self.pending_requests.remove(&request_id) {
+								Some((started, pending_response)) => {
+									let delivered = pending_response.send(
+										response.map_err(|()| RequestFailure::Refused),
+									).map_err(|_| RequestFailure::Obsolete);
+									(started, delivered)
+								}
+								None => {
+									log::warn!(
+										target: "sub-libp2p",
+										"Received `RequestResponseEvent::Message` with unexpected request id {:?}",
+										request_id,
+									);
+									debug_assert!(false);
+									continue;
+								}
+							};
+
 							let out = Event::RequestFinished {
-								request_id,
-								result: response.map_err(|()| RequestFailure::Refused),
+								peer,
+								protocol: protocol.clone(),
+								duration: started.elapsed(),
+								result: delivered,
 							};
+
 							return Poll::Ready(NetworkBehaviourAction::GenerateEvent(out));
 						}
 
 						// One of our requests has failed.
 						RequestResponseEvent::OutboundFailure {
+							peer,
 							request_id,
 							error,
 							..
 						} => {
+							let started = match self.pending_requests.remove(&request_id) {
+								Some((started, pending_response)) => {
+									if pending_response.send(
+										Err(RequestFailure::Network(error.clone())),
+									).is_err() {
+										log::debug!(
+											target: "sub-libp2p",
+											"Request with id {:?} failed. At the same time local \
+											 node is no longer interested in the result.",
+											request_id,
+										);
+									}
+									started
+								}
+								None => {
+									log::warn!(
+										target: "sub-libp2p",
+										"Received `RequestResponseEvent::Message` with unexpected request id {:?}",
+										request_id,
+									);
+									debug_assert!(false);
+									continue;
+								}
+							};
+
 							let out = Event::RequestFinished {
-								request_id,
+								peer,
+								protocol: protocol.clone(),
+								duration: started.elapsed(),
 								result: Err(RequestFailure::Network(error)),
 							};
+
 							return Poll::Ready(NetworkBehaviourAction::GenerateEvent(out));
 						}
 
@@ -529,21 +611,18 @@ pub enum RegisterError {
 	DuplicateProtocol(#[error(ignore)] Cow<'static, str>),
 }
 
-/// Error when sending a request.
+/// Error in a request.
 #[derive(Debug, derive_more::Display, derive_more::Error)]
-pub enum SendRequestError {
+pub enum RequestFailure {
 	/// We are not currently connected to the requested peer.
 	NotConnected,
 	/// Given protocol hasn't been registered.
 	UnknownProtocol,
-}
-
-/// Error in a request.
-#[derive(Debug, derive_more::Display, derive_more::Error)]
-pub enum RequestFailure {
 	/// Remote has closed the substream before answering, thereby signaling that it considers the
 	/// request as valid, but refused to answer it.
 	Refused,
+	/// The remote replied, but the local node is no longer interested in the response.
+	Obsolete,
 	/// Problem on the network.
 	#[display(fmt = "Problem on the network")]
 	Network(#[error(ignore)] OutboundFailure),
@@ -685,7 +764,7 @@ impl RequestResponseCodec for GenericCodec {
 
 #[cfg(test)]
 mod tests {
-	use futures::channel::mpsc;
+	use futures::channel::{mpsc, oneshot};
 	use futures::executor::LocalPool;
 	use futures::prelude::*;
 	use futures::task::Spawn;
@@ -771,31 +850,32 @@ mod tests {
 		// Remove and run the remaining swarm.
 		let (mut swarm, _) = swarms.remove(0);
 		pool.run_until(async move {
-			let mut sent_request_id = None;
+			let mut response_receiver = None;
 
 			loop {
 				match swarm.next_event().await {
 					SwarmEvent::ConnectionEstablished { peer_id, .. } => {
-						let id = swarm.send_request(
+						let (sender, receiver) = oneshot::channel();
+						swarm.send_request(
 							&peer_id,
 							protocol_name,
-							b"this is a request".to_vec()
-						).unwrap();
-						assert!(sent_request_id.is_none());
-						sent_request_id = Some(id);
+							b"this is a request".to_vec(),
+							sender,
+						);
+						assert!(response_receiver.is_none());
+						response_receiver = Some(receiver);
 					}
 					SwarmEvent::Behaviour(super::Event::RequestFinished {
-						request_id,
-						result,
+						result, ..
 					}) => {
-						assert_eq!(Some(request_id), sent_request_id);
-						let result = result.unwrap();
-						assert_eq!(result, b"this is a response");
+						result.unwrap();
 						break;
 					}
 					_ => {}
 				}
 			}
+
+			assert_eq!(response_receiver.unwrap().await.unwrap().unwrap(), b"this is a response");
 		});
 	}
 
@@ -875,33 +955,35 @@ mod tests {
 		// Remove and run the remaining swarm.
 		let (mut swarm, _) = swarms.remove(0);
 		pool.run_until(async move {
-			let mut sent_request_id = None;
+			let mut response_receiver = None;
 
 			loop {
 				match swarm.next_event().await {
 					SwarmEvent::ConnectionEstablished { peer_id, .. } => {
-						let id = swarm.send_request(
+						let (sender, receiver) = oneshot::channel();
+						swarm.send_request(
 							&peer_id,
 							protocol_name,
-							b"this is a request".to_vec()
-						).unwrap();
-						assert!(sent_request_id.is_none());
-						sent_request_id = Some(id);
+							b"this is a request".to_vec(),
+							sender,
+						);
+						assert!(response_receiver.is_none());
+						response_receiver = Some(receiver);
 					}
 					SwarmEvent::Behaviour(super::Event::RequestFinished {
-						request_id,
-						result,
+						result, ..
 					}) => {
-						assert_eq!(Some(request_id), sent_request_id);
-						match result {
-							Err(super::RequestFailure::Network(super::OutboundFailure::ConnectionClosed)) => {},
-							_ => panic!()
-						}
+						assert!(result.is_err());
 						break;
 					}
 					_ => {}
 				}
 			}
+
+			match response_receiver.unwrap().await.unwrap().unwrap_err() {
+				super::RequestFailure::Network(super::OutboundFailure::ConnectionClosed) => {},
+				_ => panic!()
+			}
 		});
 	}
 }
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 816f80106b8d..d8f0146e2e33 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -38,7 +38,7 @@ use crate::{
 		NetworkState, NotConnectedPeer as NetworkStateNotConnectedPeer, Peer as NetworkStatePeer,
 	},
 	on_demand_layer::AlwaysBadChecker,
-	light_client_handler, block_requests,
+	light_client_handler,
 	protocol::{
 		self,
 		NotifsHandlerError,
@@ -94,7 +94,6 @@ use std::{
 	},
 	task::Poll,
 };
-use wasm_timer::Instant;
 
 pub use behaviour::{ResponseFailure, InboundFailure, RequestFailure, OutboundFailure};
 
@@ -287,10 +286,6 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 				params.network_config.client_version,
 				params.network_config.node_name
 			);
-			let block_requests = {
-				let config = block_requests::Config::new(&params.protocol_id);
-				block_requests::BlockRequests::new(config, params.chain.clone())
-			};
 			let light_client_handler = {
 				let config = light_client_handler::Config::new(&params.protocol_id);
 				light_client_handler::LightClientHandler::new(
@@ -329,9 +324,9 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 					params.role,
 					user_agent,
 					local_public,
-					block_requests,
 					light_client_handler,
 					discovery_config,
+					params.block_request_protocol_config,
 					params.network_config.request_response_protocols,
 				);
 
@@ -430,7 +425,6 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 			peers_notifications_sinks,
 			metrics,
 			boot_node_ids,
-			pending_requests: HashMap::with_capacity(128),
 		})
 	}
 
@@ -1231,13 +1225,6 @@ pub struct NetworkWorker<B: BlockT + 'static, H: ExHashT> {
 	metrics: Option<Metrics>,
 	/// The `PeerId`'s of all boot nodes.
 	boot_node_ids: Arc<HashSet<PeerId>>,
-	/// Requests started using [`NetworkService::request`]. Includes the channel to send back the
-	/// response, when the request has started, and the name of the protocol for diagnostic
-	/// purposes.
-	pending_requests: HashMap<
-		behaviour::RequestId,
-		(oneshot::Sender<Result<Vec<u8>, RequestFailure>>, Instant, String)
-	>,
 	/// For each peer and protocol combination, an object that allows sending notifications to
 	/// that peer. Shared with the [`NetworkService`].
 	peers_notifications_sinks: Arc<Mutex<HashMap<(PeerId, Cow<'static, str>), NotificationsSink>>>,
@@ -1310,29 +1297,7 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 				ServiceToWorkerMsg::EventStream(sender) =>
 					this.event_streams.push(sender),
 				ServiceToWorkerMsg::Request { target, protocol, request, pending_response } => {
-					// Calling `send_request` can fail immediately in some circumstances.
-					// This is handled by sending back an error on the channel.
-					match this.network_service.send_request(&target, &protocol, request) {
-						Ok(request_id) => {
-							if let Some(metrics) = this.metrics.as_ref() {
-								metrics.requests_out_started_total
-									.with_label_values(&[&protocol])
-									.inc();
-							}
-							this.pending_requests.insert(
-								request_id,
-								(pending_response, Instant::now(), protocol.to_string())
-							);
-						},
-						Err(behaviour::SendRequestError::NotConnected) => {
-							let err = RequestFailure::Network(OutboundFailure::ConnectionClosed);
-							let _ = pending_response.send(Err(err));
-						},
-						Err(behaviour::SendRequestError::UnknownProtocol) => {
-							let err = RequestFailure::Network(OutboundFailure::UnsupportedProtocols);
-							let _ = pending_response.send(Err(err));
-						},
-					}
+					this.network_service.send_request(&target, &protocol, request, pending_response);
 				},
 				ServiceToWorkerMsg::DisconnectPeer(who) =>
 					this.network_service.user_protocol_mut().disconnect_peer(&who),
@@ -1396,51 +1361,37 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 						}
 					}
 				},
-				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::RequestFinished { request_id, result })) => {
-					if let Some((send_back, started, protocol)) = this.pending_requests.remove(&request_id) {
-						if let Some(metrics) = this.metrics.as_ref() {
-							match &result {
-								Ok(_) => {
-									metrics.requests_out_success_total
-										.with_label_values(&[&protocol])
-										.observe(started.elapsed().as_secs_f64());
-								}
-								Err(err) => {
-									let reason = match err {
-										RequestFailure::Refused => "refused",
-										RequestFailure::Network(OutboundFailure::DialFailure) =>
-											"dial-failure",
-										RequestFailure::Network(OutboundFailure::Timeout) =>
-											"timeout",
-										RequestFailure::Network(OutboundFailure::ConnectionClosed) =>
-											"connection-closed",
-										RequestFailure::Network(OutboundFailure::UnsupportedProtocols) =>
-											"unsupported",
-									};
-
-									metrics.requests_out_failure_total
-										.with_label_values(&[&protocol, reason])
-										.inc();
-								}
+				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::RequestFinished {
+					protocol, duration, result, ..
+				})) => {
+					if let Some(metrics) = this.metrics.as_ref() {
+						match result {
+							Ok(_) => {
+								metrics.requests_out_success_total
+									.with_label_values(&[&protocol])
+									.observe(duration.as_secs_f64());
+							}
+							Err(err) => {
+								let reason = match err {
+									RequestFailure::NotConnected => "not-connected",
+									RequestFailure::UnknownProtocol => "unknown-protocol",
+									RequestFailure::Refused => "refused",
+									RequestFailure::Obsolete => "obsolete",
+									RequestFailure::Network(OutboundFailure::DialFailure) =>
+										"dial-failure",
+									RequestFailure::Network(OutboundFailure::Timeout) =>
+										"timeout",
+									RequestFailure::Network(OutboundFailure::ConnectionClosed) =>
+										"connection-closed",
+									RequestFailure::Network(OutboundFailure::UnsupportedProtocols) =>
+										"unsupported",
+								};
+
+								metrics.requests_out_failure_total
+									.with_label_values(&[&protocol, reason])
+									.inc();
 							}
 						}
-						let _ = send_back.send(result);
-					} else {
-						error!("Request not in pending_requests");
-					}
-				},
-				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::OpaqueRequestStarted { protocol, .. })) => {
-					if let Some(metrics) = this.metrics.as_ref() {
-						metrics.requests_out_started_total
-							.with_label_values(&[&protocol])
-							.inc();
-					}
-				},
-				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::OpaqueRequestFinished { protocol, request_duration, .. })) => {
-					if let Some(metrics) = this.metrics.as_ref() {
-						metrics.requests_out_success_total
-							.with_label_values(&[&protocol])
-							.observe(request_duration.as_secs_f64());
 					}
 				},
 				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::RandomKademliaStarted(protocol))) => {
@@ -1567,11 +1518,11 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 						let reason = match cause {
 							Some(ConnectionError::IO(_)) => "transport-error",
 							Some(ConnectionError::Handler(NodeHandlerWrapperError::Handler(EitherError::A(EitherError::A(
-								EitherError::A(EitherError::A(EitherError::B(
-								EitherError::A(PingFailure::Timeout))))))))) => "ping-timeout",
+								EitherError::A(EitherError::B(EitherError::A(
+								PingFailure::Timeout)))))))) => "ping-timeout",
 							Some(ConnectionError::Handler(NodeHandlerWrapperError::Handler(EitherError::A(EitherError::A(
-								EitherError::A(EitherError::A(EitherError::A(
-								NotifsHandlerError::SyncNotificationsClogged)))))))) => "sync-notifications-clogged",
+								EitherError::A(EitherError::A(
+								NotifsHandlerError::SyncNotificationsClogged))))))) => "sync-notifications-clogged",
 							Some(ConnectionError::Handler(NodeHandlerWrapperError::Handler(_))) => "protocol-error",
 							Some(ConnectionError::Handler(NodeHandlerWrapperError::KeepAliveTimeout)) => "keep-alive-timeout",
 							None => "actively-closed",
diff --git a/client/network/src/service/metrics.rs b/client/network/src/service/metrics.rs
index 3dd0d48888ec..40d65ea45f11 100644
--- a/client/network/src/service/metrics.rs
+++ b/client/network/src/service/metrics.rs
@@ -78,7 +78,6 @@ pub struct Metrics {
 	pub requests_in_success_total: HistogramVec,
 	pub requests_out_failure_total: CounterVec<U64>,
 	pub requests_out_success_total: HistogramVec,
-	pub requests_out_started_total: CounterVec<U64>,
 }
 
 impl Metrics {
@@ -230,7 +229,8 @@ impl Metrics {
 				HistogramOpts {
 					common_opts: Opts::new(
 						"sub_libp2p_requests_in_success_total",
-						"Total number of requests received and answered"
+						"For successful incoming requests, time between receiving the request and \
+						 starting to send the response"
 					),
 					buckets: prometheus::exponential_buckets(0.001, 2.0, 16)
 						.expect("parameters are always valid values; qed"),
@@ -248,20 +248,13 @@ impl Metrics {
 				HistogramOpts {
 					common_opts: Opts::new(
 						"sub_libp2p_requests_out_success_total",
-						"For successful requests, time between a request's start and finish"
+						"For successful outgoing requests, time between a request's start and finish"
 					),
 					buckets: prometheus::exponential_buckets(0.001, 2.0, 16)
 						.expect("parameters are always valid values; qed"),
 				},
 				&["protocol"]
 			)?, registry)?,
-			requests_out_started_total: prometheus::register(CounterVec::new(
-				Opts::new(
-					"sub_libp2p_requests_out_started_total",
-					"Total number of requests emitted"
-				),
-				&["protocol"]
-			)?, registry)?,
 		})
 	}
 }
diff --git a/client/network/src/service/tests.rs b/client/network/src/service/tests.rs
index 3372fd9f9292..2b0405d88e58 100644
--- a/client/network/src/service/tests.rs
+++ b/client/network/src/service/tests.rs
@@ -17,6 +17,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{config, Event, NetworkService, NetworkWorker};
+use crate::block_request_handler::BlockRequestHandler;
 
 use libp2p::PeerId;
 use futures::prelude::*;
@@ -91,6 +92,17 @@ fn build_test_full_node(config: config::NetworkConfiguration)
 		None,
 	));
 
+	let protocol_id = config::ProtocolId::from("/test-protocol-name");
+
+	let block_request_protocol_config = {
+		let (handler, protocol_config) = BlockRequestHandler::new(
+			protocol_id.clone(),
+			client.clone(),
+		);
+		async_std::task::spawn(handler.run().boxed());
+		protocol_config
+	};
+
 	let worker = NetworkWorker::new(config::Params {
 		role: config::Role::Full,
 		executor: None,
@@ -98,12 +110,13 @@ fn build_test_full_node(config: config::NetworkConfiguration)
 		chain: client.clone(),
 		on_demand: None,
 		transaction_pool: Arc::new(crate::config::EmptyTransactionPool),
-		protocol_id: config::ProtocolId::from("/test-protocol-name"),
+		protocol_id,
 		import_queue,
 		block_announce_validator: Box::new(
 			sp_consensus::block_validation::DefaultBlockAnnounceValidator,
 		),
 		metrics_registry: None,
+		block_request_protocol_config,
 	})
 	.unwrap();
 
diff --git a/client/network/test/Cargo.toml b/client/network/test/Cargo.toml
index 4bc46e358323..826b8c300f9a 100644
--- a/client/network/test/Cargo.toml
+++ b/client/network/test/Cargo.toml
@@ -13,6 +13,7 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+async-std = "1.6.5"
 sc-network = { version = "0.8.0", path = "../" }
 log = "0.4.8"
 parking_lot = "0.10.0"
diff --git a/client/network/test/src/lib.rs b/client/network/test/src/lib.rs
index 68e2bd1594d1..b8b230f5d071 100644
--- a/client/network/test/src/lib.rs
+++ b/client/network/test/src/lib.rs
@@ -29,6 +29,7 @@ use std::{
 
 use libp2p::build_multiaddr;
 use log::trace;
+use sc_network::block_request_handler::{self, BlockRequestHandler};
 use sp_blockchain::{
 	HeaderBackend, Result as ClientResult,
 	well_known_cache_keys::{self, Id as CacheKeyId},
@@ -49,6 +50,7 @@ use sp_consensus::block_import::{BlockImport, ImportResult};
 use sp_consensus::Error as ConsensusError;
 use sp_consensus::{BlockOrigin, ForkChoiceStrategy, BlockImportParams, BlockCheckParams, JustificationImport};
 use futures::prelude::*;
+use futures::future::BoxFuture;
 use sc_network::{NetworkWorker, NetworkService, config::ProtocolId};
 use sc_network::config::{NetworkConfiguration, TransportConfig};
 use libp2p::PeerId;
@@ -682,6 +684,14 @@ pub trait TestNetFactory: Sized {
 		network_config.allow_non_globals_in_dht = true;
 		network_config.notifications_protocols = config.notifications_protocols;
 
+		let protocol_id = ProtocolId::from("test-protocol-name");
+
+		let block_request_protocol_config = {
+			let (handler, protocol_config) = BlockRequestHandler::new(protocol_id.clone(), client.clone());
+			self.spawn_task(handler.run().boxed());
+			protocol_config
+		};
+
 		let network = NetworkWorker::new(sc_network::config::Params {
 			role: Role::Full,
 			executor: None,
@@ -689,11 +699,12 @@ pub trait TestNetFactory: Sized {
 			chain: client.clone(),
 			on_demand: None,
 			transaction_pool: Arc::new(EmptyTransactionPool),
-			protocol_id: ProtocolId::from("test-protocol-name"),
+			protocol_id,
 			import_queue,
 			block_announce_validator: config.block_announce_validator
 				.unwrap_or_else(|| Box::new(DefaultBlockAnnounceValidator)),
 			metrics_registry: None,
+			block_request_protocol_config,
 		}).unwrap();
 
 		trace!(target: "test_network", "Peer identifier: {}", network.service().local_peer_id());
@@ -757,6 +768,13 @@ pub trait TestNetFactory: Sized {
 		network_config.listen_addresses = vec![listen_addr.clone()];
 		network_config.allow_non_globals_in_dht = true;
 
+		let protocol_id = ProtocolId::from("test-protocol-name");
+
+		// Add block request handler.
+		let block_request_protocol_config = block_request_handler::generate_protocol_config(
+			protocol_id.clone(),
+		);
+
 		let network = NetworkWorker::new(sc_network::config::Params {
 			role: Role::Light,
 			executor: None,
@@ -764,10 +782,11 @@ pub trait TestNetFactory: Sized {
 			chain: client.clone(),
 			on_demand: None,
 			transaction_pool: Arc::new(EmptyTransactionPool),
-			protocol_id: ProtocolId::from("test-protocol-name"),
+			protocol_id,
 			import_queue,
 			block_announce_validator: Box::new(DefaultBlockAnnounceValidator),
 			metrics_registry: None,
+			block_request_protocol_config,
 		}).unwrap();
 
 		self.mut_peers(|peers| {
@@ -792,6 +811,11 @@ pub trait TestNetFactory: Sized {
 		});
 	}
 
+	/// Used to spawn background tasks, e.g. the block request protocol handler.
+	fn spawn_task(&self, f: BoxFuture<'static, ()>) {
+		async_std::task::spawn(f);
+	}
+
 	/// Polls the testnet until all nodes are in sync.
 	///
 	/// Must be executed in a task context.
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index 5426169a8331..e3476e625ca5 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -43,6 +43,7 @@ use sc_keystore::LocalKeystore;
 use log::{info, warn};
 use sc_network::config::{Role, OnDemand};
 use sc_network::NetworkService;
+use sc_network::block_request_handler::{self, BlockRequestHandler};
 use sp_runtime::generic::BlockId;
 use sp_runtime::traits::{
 	Block as BlockT, SaturatedConversion, HashFor, Zero, BlockIdTo,
@@ -908,6 +909,21 @@ pub fn build_network<TBl, TExPool, TImpQu, TCl>(
 		Box::new(DefaultBlockAnnounceValidator)
 	};
 
+	let block_request_protocol_config = {
+		if matches!(config.role, Role::Light) {
+			// Allow outgoing requests but deny incoming requests.
+			block_request_handler::generate_protocol_config(protocol_id.clone())
+		} else {
+			// Allow both outgoing and incoming requests.
+			let (handler, protocol_config) = BlockRequestHandler::new(
+				protocol_id.clone(),
+				client.clone(),
+			);
+			spawn_handle.spawn("block_request_handler", handler.run());
+			protocol_config
+		}
+	};
+
 	let network_params = sc_network::config::Params {
 		role: config.role.clone(),
 		executor: {
@@ -923,7 +939,8 @@ pub fn build_network<TBl, TExPool, TImpQu, TCl>(
 		import_queue: Box::new(import_queue),
 		protocol_id,
 		block_announce_validator,
-		metrics_registry: config.prometheus_config.as_ref().map(|config| config.registry.clone())
+		metrics_registry: config.prometheus_config.as_ref().map(|config| config.registry.clone()),
+		block_request_protocol_config,
 	};
 
 	let has_bootnodes = !network_params.network_config.boot_nodes.is_empty();

From a2ee0b414f29ce558155dac5cbf78b40723bcc73 Mon Sep 17 00:00:00 2001
From: Stanly Johnson <stanlyjohnson@outlook.com>
Date: Wed, 6 Jan 2021 07:21:02 +0530
Subject: [PATCH 0230/1194] fix : remove `_{ }` syntax from benchmark macro
 (#7822)

* commented use of common

* hack to pass tests

* another hack

* remove all commented code

* fix the easy tests

* temp hack

* follow through comma hack until better solution

* patch macro

* missed one

* update benchmarks

* update docs

* fix docs

* removed too much

* fix changes

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 frame/assets/src/benchmarking.rs              |  2 -
 frame/babe/src/benchmarking.rs                |  2 -
 frame/balances/src/benchmarking.rs            |  2 -
 frame/benchmarking/src/lib.rs                 | 97 +++++--------------
 frame/benchmarking/src/tests.rs               | 11 +--
 frame/bounties/src/benchmarking.rs            |  2 -
 frame/collective/src/benchmarking.rs          |  3 +-
 frame/contracts/src/benchmarking/mod.rs       |  3 -
 frame/democracy/src/benchmarking.rs           |  2 -
 frame/elections-phragmen/src/benchmarking.rs  |  2 -
 frame/example/src/lib.rs                      |  9 +-
 frame/grandpa/src/benchmarking.rs             |  2 -
 frame/identity/src/benchmarking.rs            | 71 +++++++-------
 frame/im-online/src/benchmarking.rs           |  2 -
 frame/indices/src/benchmarking.rs             |  2 -
 .../merkle-mountain-range/src/benchmarking.rs |  2 -
 frame/multisig/src/benchmarking.rs            |  2 -
 frame/offences/benchmarking/src/lib.rs        |  2 -
 frame/proxy/src/benchmarking.rs               | 22 ++---
 frame/scheduler/src/benchmarking.rs           |  2 -
 frame/session/benchmarking/src/lib.rs         |  2 -
 frame/staking/src/benchmarking.rs             |  2 -
 frame/system/benchmarking/src/lib.rs          |  2 -
 frame/timestamp/src/benchmarking.rs           |  2 -
 frame/tips/src/benchmarking.rs                |  2 -
 frame/treasury/src/benchmarking.rs            |  3 +-
 frame/utility/src/benchmarking.rs             |  2 -
 frame/vesting/src/benchmarking.rs             |  2 -
 28 files changed, 74 insertions(+), 185 deletions(-)

diff --git a/frame/assets/src/benchmarking.rs b/frame/assets/src/benchmarking.rs
index db98164023d5..63258c2f591b 100644
--- a/frame/assets/src/benchmarking.rs
+++ b/frame/assets/src/benchmarking.rs
@@ -74,8 +74,6 @@ fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
 }
 
 benchmarks! {
-	_ { }
-
 	create {
 		let caller: T::AccountId = whitelisted_caller();
 		let caller_lookup = T::Lookup::unlookup(caller.clone());
diff --git a/frame/babe/src/benchmarking.rs b/frame/babe/src/benchmarking.rs
index 4d75c36669ea..087cac2ed6cc 100644
--- a/frame/babe/src/benchmarking.rs
+++ b/frame/babe/src/benchmarking.rs
@@ -23,8 +23,6 @@ use frame_benchmarking::benchmarks;
 type Header = sp_runtime::generic::Header<u64, sp_runtime::traits::BlakeTwo256>;
 
 benchmarks! {
-	_ {	}
-
 	check_equivocation_proof {
 		let x in 0 .. 1;
 
diff --git a/frame/balances/src/benchmarking.rs b/frame/balances/src/benchmarking.rs
index 249934a61b4d..53cf273d850d 100644
--- a/frame/balances/src/benchmarking.rs
+++ b/frame/balances/src/benchmarking.rs
@@ -33,8 +33,6 @@ const ED_MULTIPLIER: u32 = 10;
 
 
 benchmarks! {
-	_ { }
-
 	// Benchmark `transfer` extrinsic with the worst possible conditions:
 	// * Transfer will kill the sender account.
 	// * Transfer will create the recipient account.
diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
index 308e5285d3f6..6db8674a3d2d 100644
--- a/frame/benchmarking/src/lib.rs
+++ b/frame/benchmarking/src/lib.rs
@@ -88,24 +88,18 @@ pub use sp_storage::TrackedStorageKey;
 /// benchmarks! {
 ///   where_clause {  where T::A: From<u32> } // Optional line to give additional bound on `T`.
 ///
-///   // common parameter; just one for this example.
-///   // will be `1`, `MAX_LENGTH` or any value inbetween
-///   _ {
-///     let l in 1 .. MAX_LENGTH => initialize_l(l);
-///   }
-///
 ///   // first dispatchable: foo; this is a user dispatchable and operates on a `u8` vector of
-///   // size `l`, which we allow to be initialized as usual.
+///   // size `l`
 ///   foo {
 ///     let caller = account::<T>(b"caller", 0, benchmarks_seed);
-///     let l = ...;
+///     let l in 1 .. MAX_LENGTH => initialize_l(l);
 ///   }: _(Origin::Signed(caller), vec![0u8; l])
 ///
 ///   // second dispatchable: bar; this is a root dispatchable and accepts a `u8` vector of size
-///   // `l`. We don't want it pre-initialized like before so we override using the `=> ()` notation.
+///   // `l`.
 ///   // In this case, we explicitly name the call using `bar` instead of `_`.
 ///   bar {
-///     let l = _ .. _ => ();
+///     let l in 1 .. MAX_LENGTH => initialize_l(l);
 ///   }: bar(Origin::Root, vec![0u8; l])
 ///
 ///   // third dispatchable: baz; this is a user dispatchable. It isn't dependent on length like the
@@ -176,18 +170,11 @@ pub use sp_storage::TrackedStorageKey;
 #[macro_export]
 macro_rules! benchmarks {
 	(
-		$( where_clause { where $( $where_ty:ty: $where_bound:path ),* $(,)? } )?
-		_ {
-			$(
-				let $common:ident in $common_from:tt .. $common_to:expr => $common_instancer:expr;
-			)*
-		}
 		$( $rest:tt )*
 	) => {
 		$crate::benchmarks_iter!(
 			{ }
-			{ $( $( $where_ty: $where_bound ),* )? }
-			{ $( { $common , $common_from , $common_to , $common_instancer } )* }
+			{ }
 			( )
 			( )
 			$( $rest )*
@@ -199,18 +186,11 @@ macro_rules! benchmarks {
 #[macro_export]
 macro_rules! benchmarks_instance {
 	(
-		$( where_clause { where $( $where_ty:ty: $where_bound:path ),* $(,)? } )?
-		_ {
-			$(
-				let $common:ident in $common_from:tt .. $common_to:expr => $common_instancer:expr;
-			)*
-		}
 		$( $rest:tt )*
 	) => {
 		$crate::benchmarks_iter!(
 			{ I }
-			{ $( $( $where_ty: $where_bound ),* )? }
-			{ $( { $common , $common_from , $common_to , $common_instancer } )* }
+			{ }
 			( )
 			( )
 			$( $rest )*
@@ -221,11 +201,27 @@ macro_rules! benchmarks_instance {
 #[macro_export]
 #[doc(hidden)]
 macro_rules! benchmarks_iter {
+	// detect and extract where clause:
+	(
+		{ $( $instance:ident )? }
+		{ $( $where_clause:tt )* }
+		( $( $names:tt )* )
+		( $( $names_extra:tt )* )
+		where_clause { where $( $where_ty:ty: $where_bound:path ),* $(,)? }
+		$( $rest:tt )*
+	) => {
+		$crate::benchmarks_iter! {
+			{ $( $instance)? }
+			{ $( $where_ty: $where_bound ),* }
+			( $( $names )* )
+			( $( $names_extra )* )
+			$( $rest )*
+		}
+	};
 	// detect and extract extra tag:
 	(
 		{ $( $instance:ident )? }
 		{ $( $where_clause:tt )* }
-		{ $( $common:tt )* }
 		( $( $names:tt )* )
 		( $( $names_extra:tt )* )
 		#[extra]
@@ -235,7 +231,6 @@ macro_rules! benchmarks_iter {
 		$crate::benchmarks_iter! {
 			{ $( $instance)? }
 			{ $( $where_clause )* }
-			{ $( $common )* }
 			( $( $names )* )
 			( $( $names_extra )* $name )
 			$name
@@ -246,7 +241,6 @@ macro_rules! benchmarks_iter {
 	(
 		{ $( $instance:ident )? }
 		{ $( $where_clause:tt )* }
-		{ $( $common:tt )* }
 		( $( $names:tt )* ) // This contains $( $( { $instance } )? $name:ident )*
 		( $( $names_extra:tt )* )
 		$name:ident { $( $code:tt )* }: _ ( $origin:expr $( , $arg:expr )* )
@@ -256,7 +250,6 @@ macro_rules! benchmarks_iter {
 		$crate::benchmarks_iter! {
 			{ $( $instance)? }
 			{ $( $where_clause )* }
-			{ $( $common )* }
 			( $( $names )* )
 			( $( $names_extra )* )
 			$name { $( $code )* }: $name ( $origin $( , $arg )* )
@@ -268,7 +261,6 @@ macro_rules! benchmarks_iter {
 	(
 		{ $( $instance:ident )? }
 		{ $( $where_clause:tt )* }
-		{ $( $common:tt )* }
 		( $( $names:tt )* )
 		( $( $names_extra:tt )* )
 		$name:ident { $( $code:tt )* }: $dispatch:ident ( $origin:expr $( , $arg:expr )* )
@@ -278,7 +270,6 @@ macro_rules! benchmarks_iter {
 		$crate::benchmarks_iter! {
 			{ $( $instance)? }
 			{ $( $where_clause )* }
-			{ $( $common )* }
 			( $( $names )* )
 			( $( $names_extra )* )
 			$name { $( $code )* }: {
@@ -296,7 +287,6 @@ macro_rules! benchmarks_iter {
 	(
 		{ $( $instance:ident )? }
 		{ $( $where_clause:tt )* }
-		{ $( $common:tt )* }
 		( $( $names:tt )* )
 		( $( $names_extra:tt )* )
 		$name:ident { $( $code:tt )* }: $eval:block
@@ -307,7 +297,6 @@ macro_rules! benchmarks_iter {
 			{ $( $instance)? }
 			$name
 			{ $( $where_clause )* }
-			{ $( $common )* }
 			{ }
 			{ $eval }
 			{ $( $code )* }
@@ -324,7 +313,6 @@ macro_rules! benchmarks_iter {
 		$crate::benchmarks_iter!(
 			{ $( $instance)? }
 			{ $( $where_clause )* }
-			{ $( $common )* }
 			( $( $names )* { $( $instance )? } $name )
 			( $( $names_extra )* )
 			$( $rest )*
@@ -334,7 +322,6 @@ macro_rules! benchmarks_iter {
 	(
 		{ $( $instance:ident )? }
 		{ $( $where_clause:tt )* }
-		{ $( $common:tt )* }
 		( $( $names:tt )* )
 		( $( $names_extra:tt )* )
 	) => {
@@ -354,7 +341,6 @@ macro_rules! benchmarks_iter {
 	(
 		{ $( $instance:ident )? }
 		{ $( $where_clause:tt )* }
-		{ $( $common:tt )* }
 		( $( $names:tt )* )
 		( $( $names_extra:tt )* )
 		$name:ident { $( $code:tt )* }: _ ( $origin:expr $( , $arg:expr )* )
@@ -363,7 +349,6 @@ macro_rules! benchmarks_iter {
 		$crate::benchmarks_iter! {
 			{ $( $instance)? }
 			{ $( $where_clause )* }
-			{ $( $common )* }
 			( $( $names )* )
 			( $( $names_extra )* )
 			$name { $( $code )* }: _ ( $origin $( , $arg )* )
@@ -375,7 +360,6 @@ macro_rules! benchmarks_iter {
 	(
 		{ $( $instance:ident )? }
 		{ $( $where_clause:tt )* }
-		{ $( $common:tt )* }
 		( $( $names:tt )* )
 		( $( $names_extra:tt )* )
 		$name:ident { $( $code:tt )* }: $dispatch:ident ( $origin:expr $( , $arg:expr )* )
@@ -384,7 +368,6 @@ macro_rules! benchmarks_iter {
 		$crate::benchmarks_iter! {
 			{ $( $instance)? }
 			{ $( $where_clause )* }
-			{ $( $common )* }
 			( $( $names )* )
 			( $( $names_extra )* )
 			$name { $( $code )* }: $dispatch ( $origin $( , $arg )* )
@@ -396,7 +379,6 @@ macro_rules! benchmarks_iter {
 	(
 		{ $( $instance:ident )? }
 		{ $( $where_clause:tt )* }
-		{ $( $common:tt )* }
 		( $( $names:tt )* )
 		( $( $names_extra:tt )* )
 		$name:ident { $( $code:tt )* }: $eval:block
@@ -405,7 +387,6 @@ macro_rules! benchmarks_iter {
 		$crate::benchmarks_iter!(
 			{ $( $instance)? }
 			{ $( $where_clause )* }
-			{ $( $common )* }
 			( $( $names )* )
 			( $( $names_extra )* )
 			$name { $( $code )* }: $eval
@@ -423,7 +404,6 @@ macro_rules! benchmark_backend {
 		{ $( $instance:ident )? }
 		$name:ident
 		{ $( $where_clause:tt )* }
-		{ $( $common:tt )* }
 		{ $( PRE { $( $pre_parsed:tt )* } )* }
 		{ $eval:block }
 		{
@@ -436,7 +416,6 @@ macro_rules! benchmark_backend {
 			{ $( $instance)? }
 			$name
 			{ $( $where_clause )* }
-			{ $( $common )* }
 			{
 				$( PRE { $( $pre_parsed )* } )*
 				PRE { $pre_id , $pre_ty , $pre_ex }
@@ -450,7 +429,6 @@ macro_rules! benchmark_backend {
 		{ $( $instance:ident )? }
 		$name:ident
 		{ $( $where_clause:tt )* }
-		{ $( $common:tt )* }
 		{ $( $parsed:tt )* }
 		{ $eval:block }
 		{
@@ -463,7 +441,6 @@ macro_rules! benchmark_backend {
 			{ $( $instance)? }
 			$name
 			{ $( $where_clause )* }
-			{ $( $common )* }
 			{
 				$( $parsed )*
 				PARAM { $param , $param_from , $param_to , $param_instancer }
@@ -478,7 +455,6 @@ macro_rules! benchmark_backend {
 		{ $( $instance:ident )? }
 		$name:ident
 		{ $( $where_clause:tt )* }
-		{ $( { $common:ident , $common_from:tt , $common_to:expr , $common_instancer:expr } )* }
 		{ $( $parsed:tt )* }
 		{ $eval:block }
 		{
@@ -491,16 +467,8 @@ macro_rules! benchmark_backend {
 			{ $( $instance)? }
 			$name
 			{ $( $where_clause )* }
-			{ $( { $common , $common_from , $common_to , $common_instancer } )* }
 			{ $( $parsed )* }
 			{ $eval }
-			{
-				let $param
-					in ({ $( let $common = $common_from; )* $param })
-					.. ({ $( let $common = $common_to; )* $param })
-					=> ({ $( let $common = || -> Result<(), &'static str> { $common_instancer ; Ok(()) }; )* $param()? });
-				$( $rest )*
-			}
 			$postcode
 		}
 	};
@@ -509,7 +477,6 @@ macro_rules! benchmark_backend {
 		{ $( $instance:ident )? }
 		$name:ident
 		{ $( $where_clause:tt )* }
-		{ $( { $common:ident , $common_from:tt , $common_to:expr , $common_instancer:expr } )* }
 		{ $( $parsed:tt )* }
 		{ $eval:block }
 		{
@@ -522,16 +489,8 @@ macro_rules! benchmark_backend {
 			{ $( $instance)? }
 			$name
 			{ $( $where_clause )* }
-			{ $( { $common , $common_from , $common_to , $common_instancer } )* }
 			{ $( $parsed )* }
 			{ $eval }
-			{
-				let $param
-					in ({ $( let $common = $common_from; )* $param })
-					.. ({ $( let $common = $common_to; )* $param })
-					=> $param_instancer ;
-				$( $rest )*
-			}
 			$postcode
 		}
 	};
@@ -540,7 +499,6 @@ macro_rules! benchmark_backend {
 		{ $( $instance:ident )? }
 		$name:ident
 		{ $( $where_clause:tt )* }
-		{ $( $common:tt )* }
 		{ $( $parsed:tt )* }
 		{ $eval:block }
 		{
@@ -553,7 +511,6 @@ macro_rules! benchmark_backend {
 			{ $( $instance)? }
 			$name
 			{ $( $where_clause )* }
-			{ $( $common )* }
 			{ $( $parsed )* }
 			{ $eval }
 			{
@@ -568,7 +525,6 @@ macro_rules! benchmark_backend {
 		{ $( $instance:ident )? }
 		$name:ident
 		{ $( $where_clause:tt )* }
-		{ $( $common:tt )* }
 		{ $( $parsed:tt )* }
 		{ $eval:block }
 		{
@@ -581,7 +537,6 @@ macro_rules! benchmark_backend {
 			{ $( $instance)? }
 			$name
 			{ $( $where_clause )* }
-			{ $( $common )* }
 			{ $( $parsed )* }
 			{ $eval }
 			{
@@ -596,7 +551,6 @@ macro_rules! benchmark_backend {
 		{ $( $instance:ident )? }
 		$name:ident
 		{ $( $where_clause:tt )* }
-		{ $( $common:tt )* }
 		{ $( $parsed:tt )* }
 		{ $eval:block }
 		{
@@ -609,7 +563,6 @@ macro_rules! benchmark_backend {
 			{ $( $instance)? }
 			$name
 			{ $( $where_clause )* }
-			{ $( $common )* }
 			{ $( $parsed )* }
 			{ $eval }
 			{
@@ -624,7 +577,6 @@ macro_rules! benchmark_backend {
 		{ $( $instance:ident )? }
 		$name:ident
 		{ $( $where_clause:tt )* }
-		{ $( { $common:ident , $common_from:tt , $common_to:expr , $common_instancer:expr } )* }
 		{
 			$( PRE { $pre_id:tt , $pre_ty:ty , $pre_ex:expr } )*
 			$( PARAM { $param:ident , $param_from:expr , $param_to:expr , $param_instancer:expr } )*
@@ -653,9 +605,6 @@ macro_rules! benchmark_backend {
 				components: &[($crate::BenchmarkParameter, u32)],
 				verify: bool
 			) -> Result<Box<dyn FnOnce() -> Result<(), &'static str>>, &'static str> {
-				$(
-					let $common = $common_from;
-				)*
 				$(
 					// Prepare instance
 					let $param = components.iter()
diff --git a/frame/benchmarking/src/tests.rs b/frame/benchmarking/src/tests.rs
index 7ea6bfd9afa2..2cbf4b9d1950 100644
--- a/frame/benchmarking/src/tests.rs
+++ b/frame/benchmarking/src/tests.rs
@@ -112,13 +112,8 @@ fn new_test_ext() -> sp_io::TestExternalities {
 benchmarks!{
 	where_clause { where <T as OtherConfig>::OtherEvent: Into<<T as Config>::Event> }
 
-	_ {
-		// Define a common range for `b`.
-		let b in 1 .. 1000 => ();
-	}
-
 	set_value {
-		let b in ...;
+		let b in 1 .. 1000;
 		let caller = account::<T::AccountId>("caller", 0, 0);
 	}: _ (RawOrigin::Signed(caller), b.into())
 	verify {
@@ -126,7 +121,7 @@ benchmarks!{
 	}
 
 	other_name {
-		let b in ...;
+		let b in 1 .. 1000;
 	}: dummy (RawOrigin::None, b.into())
 
 	sort_vector {
@@ -142,7 +137,7 @@ benchmarks!{
 	}
 
 	bad_origin {
-		let b in ...;
+		let b in 1 .. 1000;
 		let caller = account::<T::AccountId>("caller", 0, 0);
 	}: dummy (RawOrigin::Signed(caller), b.into())
 
diff --git a/frame/bounties/src/benchmarking.rs b/frame/bounties/src/benchmarking.rs
index 0fe479bda7bd..f6fc11ad0bf0 100644
--- a/frame/bounties/src/benchmarking.rs
+++ b/frame/bounties/src/benchmarking.rs
@@ -94,8 +94,6 @@ fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
 const MAX_BYTES: u32 = 16384;
 
 benchmarks! {
-	_ { }
-
 	propose_bounty {
 		let d in 0 .. MAX_BYTES;
 
diff --git a/frame/collective/src/benchmarking.rs b/frame/collective/src/benchmarking.rs
index 50fab1b3e474..bff7dad59d89 100644
--- a/frame/collective/src/benchmarking.rs
+++ b/frame/collective/src/benchmarking.rs
@@ -42,8 +42,7 @@ fn assert_last_event<T: Config<I>, I: Instance>(generic_event: <T as Config<I>>:
 }
 
 benchmarks_instance! {
-	_{ }
-
+	
 	set_members {
 		let m in 1 .. T::MaxMembers::get();
 		let n in 1 .. T::MaxMembers::get();
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index d08f0ab5e65e..9fa365116c7a 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -282,9 +282,6 @@ benchmarks! {
 		T::AccountId: AsRef<[u8]>,
 	}
 
-	_ {
-	}
-
 	// The base weight without any actual work performed apart from the setup costs.
 	on_initialize {}: {
 		Storage::<T>::process_deletion_queue_batch(Weight::max_value())
diff --git a/frame/democracy/src/benchmarking.rs b/frame/democracy/src/benchmarking.rs
index 7460249b6c39..c66ce20dab87 100644
--- a/frame/democracy/src/benchmarking.rs
+++ b/frame/democracy/src/benchmarking.rs
@@ -97,8 +97,6 @@ fn account_vote<T: Config>(b: BalanceOf<T>) -> AccountVote<BalanceOf<T>> {
 }
 
 benchmarks! {
-	_ { }
-
 	propose {
 		let p = T::MaxProposals::get();
 
diff --git a/frame/elections-phragmen/src/benchmarking.rs b/frame/elections-phragmen/src/benchmarking.rs
index db3a8c96023a..3ed4af2487df 100644
--- a/frame/elections-phragmen/src/benchmarking.rs
+++ b/frame/elections-phragmen/src/benchmarking.rs
@@ -167,8 +167,6 @@ fn clean<T: Config>() {
 }
 
 benchmarks! {
-	_ {}
-
 	// -- Signed ones
 	vote {
 		let v in 1 .. (MAXIMUM_VOTE as u32);
diff --git a/frame/example/src/lib.rs b/frame/example/src/lib.rs
index 382d67263d1b..05526d2c7a29 100644
--- a/frame/example/src/lib.rs
+++ b/frame/example/src/lib.rs
@@ -655,20 +655,15 @@ mod benchmarking {
 	use frame_system::RawOrigin;
 
 	benchmarks!{
-		_ {
-			// Define a common range for `b`.
-			let b in 1 .. 1000 => ();
-		}
-
 		// This will measure the execution time of `accumulate_dummy` for b in [1..1000] range.
 		accumulate_dummy {
-			let b in ...;
+			let b in 1 .. 1000;
 			let caller = account("caller", 0, 0);
 		}: _ (RawOrigin::Signed(caller), b.into())
 
 		// This will measure the execution time of `set_dummy` for b in [1..1000] range.
 		set_dummy {
-			let b in ...;
+			let b in 1 .. 1000;
 		}: set_dummy (RawOrigin::Root, b.into())
 
 		// This will measure the execution time of `set_dummy` for b in [1..10] range.
diff --git a/frame/grandpa/src/benchmarking.rs b/frame/grandpa/src/benchmarking.rs
index d91bd223a570..5f08a5ea4bac 100644
--- a/frame/grandpa/src/benchmarking.rs
+++ b/frame/grandpa/src/benchmarking.rs
@@ -25,8 +25,6 @@ use frame_system::RawOrigin;
 use sp_core::H256;
 
 benchmarks! {
-	_ {	}
-
 	check_equivocation_proof {
 		let x in 0 .. 1;
 
diff --git a/frame/identity/src/benchmarking.rs b/frame/identity/src/benchmarking.rs
index dccef494a0e8..e916bdfa5046 100644
--- a/frame/identity/src/benchmarking.rs
+++ b/frame/identity/src/benchmarking.rs
@@ -107,25 +107,6 @@ fn create_identity_info<T: Config>(num_fields: u32) -> IdentityInfo {
 }
 
 benchmarks! {
-	// These are the common parameters along with their instancing.
-	_ {
-		let r in 1 .. T::MaxRegistrars::get() => add_registrars::<T>(r)?;
-		// extra parameter for the set_subs bench for previous sub accounts
-		let p in 1 .. T::MaxSubAccounts::get() => ();
-		let s in 1 .. T::MaxSubAccounts::get() => {
-			// Give them s many sub accounts
-			let caller: T::AccountId = whitelisted_caller();
-			let _ = add_sub_accounts::<T>(&caller, s)?;
-		};
-		let x in 1 .. T::MaxAdditionalFields::get() => {
-			// Create their main identity with x additional fields
-			let info = create_identity_info::<T>(x);
-			let caller: T::AccountId = whitelisted_caller();
-			let caller_origin = <T as frame_system::Config>::Origin::from(RawOrigin::Signed(caller));
-			Identity::<T>::set_identity(caller_origin, info)?;
-		};
-	}
-
 	add_registrar {
 		let r in 1 .. T::MaxRegistrars::get() - 1 => add_registrars::<T>(r)?;
 		ensure!(Registrars::<T>::get().len() as u32 == r, "Registrars not set up correctly.");
@@ -135,10 +116,8 @@ benchmarks! {
 	}
 
 	set_identity {
-		let r in ...;
-		// This X doesn't affect the caller ID up front like with the others, so we don't use the
-		// standard preparation.
-		let x in _ .. _ => ();
+		let r in 1 .. T::MaxRegistrars::get() => add_registrars::<T>(r)?;
+		let x in 1 .. T::MaxAdditionalFields::get();
 		let caller = {
 			// The target user
 			let caller: T::AccountId = whitelisted_caller();
@@ -204,9 +183,19 @@ benchmarks! {
 		let caller_lookup = <T::Lookup as StaticLookup>::unlookup(caller.clone());
 		let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 
-		let r in ...;
-		let s in ...;
-		let x in ...;
+		let r in 1 .. T::MaxRegistrars::get() => add_registrars::<T>(r)?;
+		let s in 1 .. T::MaxSubAccounts::get() => {
+			// Give them s many sub accounts
+			let caller: T::AccountId = whitelisted_caller();
+			let _ = add_sub_accounts::<T>(&caller, s)?;
+		};
+		let x in 1 .. T::MaxAdditionalFields::get() => {
+			// Create their main identity with x additional fields
+			let info = create_identity_info::<T>(x);
+			let caller: T::AccountId = whitelisted_caller();
+			let caller_origin = <T as frame_system::Config>::Origin::from(RawOrigin::Signed(caller));
+			Identity::<T>::set_identity(caller_origin, info)?;
+		};
 
 		// User requests judgement from all the registrars, and they approve
 		for i in 0..r {
@@ -228,8 +217,14 @@ benchmarks! {
 		let caller: T::AccountId = whitelisted_caller();
 		let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 
-		let r in ...;
-		let x in ...;
+		let r in 1 .. T::MaxRegistrars::get() => add_registrars::<T>(r)?;
+		let x in 1 .. T::MaxAdditionalFields::get() => {
+			// Create their main identity with x additional fields
+			let info = create_identity_info::<T>(x);
+			let caller: T::AccountId = whitelisted_caller();
+			let caller_origin = <T as frame_system::Config>::Origin::from(RawOrigin::Signed(caller));
+			Identity::<T>::set_identity(caller_origin, info)?;
+		};
 	}: _(RawOrigin::Signed(caller.clone()), r - 1, 10u32.into())
 	verify {
 		assert_last_event::<T>(Event::<T>::JudgementRequested(caller, r-1).into());
@@ -240,8 +235,14 @@ benchmarks! {
 		let caller_origin = <T as frame_system::Config>::Origin::from(RawOrigin::Signed(caller.clone()));
 		let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 
-		let r in ...;
-		let x in ...;
+		let r in 1 .. T::MaxRegistrars::get() => add_registrars::<T>(r)?;
+		let x in 1 .. T::MaxAdditionalFields::get() => {
+			// Create their main identity with x additional fields
+			let info = create_identity_info::<T>(x);
+			let caller: T::AccountId = whitelisted_caller();
+			let caller_origin = <T as frame_system::Config>::Origin::from(RawOrigin::Signed(caller));
+			Identity::<T>::set_identity(caller_origin, info)?;
+		};
 
 		Identity::<T>::request_judgement(caller_origin, r - 1, 10u32.into())?;
 	}: _(RawOrigin::Signed(caller.clone()), r - 1)
@@ -308,8 +309,7 @@ benchmarks! {
 		let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 
 		let r in 1 .. T::MaxRegistrars::get() - 1 => add_registrars::<T>(r)?;
-		// For this x, it's the user identity that gts the fields, not the caller.
-		let x in _ .. _ => {
+		let x in 1 .. T::MaxAdditionalFields::get() => {
 			let info = create_identity_info::<T>(x);
 			Identity::<T>::set_identity(user_origin.clone(), info)?;
 		};
@@ -322,10 +322,9 @@ benchmarks! {
 	}
 
 	kill_identity {
-		let r in ...;
-		// Setting up our own account below.
-		let s in _ .. _ => {};
-		let x in _ .. _ => {};
+		let r in 1 .. T::MaxRegistrars::get() => add_registrars::<T>(r)?;
+		let s in 1 .. T::MaxSubAccounts::get();
+		let x in 1 .. T::MaxAdditionalFields::get();
 
 		let target: T::AccountId = account("target", 0, SEED);
 		let target_origin: <T as frame_system::Config>::Origin = RawOrigin::Signed(target.clone()).into();
diff --git a/frame/im-online/src/benchmarking.rs b/frame/im-online/src/benchmarking.rs
index 8493f2b4c642..ef7f66307a99 100644
--- a/frame/im-online/src/benchmarking.rs
+++ b/frame/im-online/src/benchmarking.rs
@@ -63,8 +63,6 @@ pub fn create_heartbeat<T: Config>(k: u32, e: u32) ->
 }
 
 benchmarks! {
-	_{ }
-
 	#[extra]
 	heartbeat {
 		let k in 1 .. MAX_KEYS;
diff --git a/frame/indices/src/benchmarking.rs b/frame/indices/src/benchmarking.rs
index 51182b104775..f83e05ee9c62 100644
--- a/frame/indices/src/benchmarking.rs
+++ b/frame/indices/src/benchmarking.rs
@@ -29,8 +29,6 @@ use crate::Module as Indices;
 const SEED: u32 = 0;
 
 benchmarks! {
-	_ { }
-
 	claim {
 		let account_index = T::AccountIndex::from(SEED);
 		let caller: T::AccountId = whitelisted_caller();
diff --git a/frame/merkle-mountain-range/src/benchmarking.rs b/frame/merkle-mountain-range/src/benchmarking.rs
index 4a5ff4b72965..e6b3cf7f2172 100644
--- a/frame/merkle-mountain-range/src/benchmarking.rs
+++ b/frame/merkle-mountain-range/src/benchmarking.rs
@@ -25,8 +25,6 @@ use frame_benchmarking::benchmarks;
 use sp_std::prelude::*;
 
 benchmarks! {
-	_ {	}
-
 	on_initialize {
 		let x in 1 .. 1_000;
 
diff --git a/frame/multisig/src/benchmarking.rs b/frame/multisig/src/benchmarking.rs
index a257a96cacac..748223072b99 100644
--- a/frame/multisig/src/benchmarking.rs
+++ b/frame/multisig/src/benchmarking.rs
@@ -48,8 +48,6 @@ fn setup_multi<T: Config>(s: u32, z: u32)
 }
 
 benchmarks! {
-	_ { }
-
 	as_multi_threshold_1 {
 		// Transaction Length
 		let z in 0 .. 10_000;
diff --git a/frame/offences/benchmarking/src/lib.rs b/frame/offences/benchmarking/src/lib.rs
index 09ac820cf5c4..f2807ba6c7a8 100644
--- a/frame/offences/benchmarking/src/lib.rs
+++ b/frame/offences/benchmarking/src/lib.rs
@@ -203,8 +203,6 @@ fn check_events<T: Config, I: Iterator<Item = <T as SystemConfig>::Event>>(expec
 }
 
 benchmarks! {
-	_ { }
-
 	report_offence_im_online {
 		let r in 1 .. MAX_REPORTERS;
 		// we skip 1 offender, because in such case there is no slashing
diff --git a/frame/proxy/src/benchmarking.rs b/frame/proxy/src/benchmarking.rs
index b08b47123d91..29c2e475c64f 100644
--- a/frame/proxy/src/benchmarking.rs
+++ b/frame/proxy/src/benchmarking.rs
@@ -80,12 +80,8 @@ fn add_announcements<T: Config>(
 }
 
 benchmarks! {
-	_ {
-		let p in 1 .. (T::MaxProxies::get() - 1).into() => add_proxies::<T>(p, None)?;
-	}
-
 	proxy {
-		let p in ...;
+		let p in 1 .. (T::MaxProxies::get() - 1).into() => add_proxies::<T>(p, None)?;
 		// In this case the caller is the "target" proxy
 		let caller: T::AccountId = account("target", p - 1, SEED);
 		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
@@ -99,7 +95,7 @@ benchmarks! {
 
 	proxy_announced {
 		let a in 0 .. T::MaxPending::get() - 1;
-		let p in ...;
+		let p in 1 .. (T::MaxProxies::get() - 1).into() => add_proxies::<T>(p, None)?;
 		// In this case the caller is the "target" proxy
 		let caller: T::AccountId = account("anonymous", 0, SEED);
 		let delegate: T::AccountId = account("target", p - 1, SEED);
@@ -120,7 +116,7 @@ benchmarks! {
 
 	remove_announcement {
 		let a in 0 .. T::MaxPending::get() - 1;
-		let p in ...;
+		let p in 1 .. (T::MaxProxies::get() - 1).into() => add_proxies::<T>(p, None)?;
 		// In this case the caller is the "target" proxy
 		let caller: T::AccountId = account("target", p - 1, SEED);
 		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
@@ -141,7 +137,7 @@ benchmarks! {
 
 	reject_announcement {
 		let a in 0 .. T::MaxPending::get() - 1;
-		let p in ...;
+		let p in 1 .. (T::MaxProxies::get() - 1).into() => add_proxies::<T>(p, None)?;
 		// In this case the caller is the "target" proxy
 		let caller: T::AccountId = account("target", p - 1, SEED);
 		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
@@ -162,7 +158,7 @@ benchmarks! {
 
 	announce {
 		let a in 0 .. T::MaxPending::get() - 1;
-		let p in ...;
+		let p in 1 .. (T::MaxProxies::get() - 1).into() => add_proxies::<T>(p, None)?;
 		// In this case the caller is the "target" proxy
 		let caller: T::AccountId = account("target", p - 1, SEED);
 		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
@@ -177,7 +173,7 @@ benchmarks! {
 	}
 
 	add_proxy {
-		let p in ...;
+		let p in 1 .. (T::MaxProxies::get() - 1).into() => add_proxies::<T>(p, None)?;
 		let caller: T::AccountId = whitelisted_caller();
 	}: _(
 		RawOrigin::Signed(caller.clone()),
@@ -191,7 +187,7 @@ benchmarks! {
 	}
 
 	remove_proxy {
-		let p in ...;
+		let p in 1 .. (T::MaxProxies::get() - 1).into() => add_proxies::<T>(p, None)?;
 		let caller: T::AccountId = whitelisted_caller();
 	}: _(
 		RawOrigin::Signed(caller.clone()),
@@ -205,7 +201,7 @@ benchmarks! {
 	}
 
 	remove_proxies {
-		let p in ...;
+		let p in 1 .. (T::MaxProxies::get() - 1).into() => add_proxies::<T>(p, None)?;
 		let caller: T::AccountId = whitelisted_caller();
 	}: _(RawOrigin::Signed(caller.clone()))
 	verify {
@@ -214,7 +210,7 @@ benchmarks! {
 	}
 
 	anonymous {
-		let p in ...;
+		let p in 1 .. (T::MaxProxies::get() - 1).into() => add_proxies::<T>(p, None)?;
 		let caller: T::AccountId = whitelisted_caller();
 	}: _(
 		RawOrigin::Signed(caller.clone()),
diff --git a/frame/scheduler/src/benchmarking.rs b/frame/scheduler/src/benchmarking.rs
index e45551269bc5..defc334ba736 100644
--- a/frame/scheduler/src/benchmarking.rs
+++ b/frame/scheduler/src/benchmarking.rs
@@ -52,8 +52,6 @@ fn fill_schedule<T: Config> (when: T::BlockNumber, n: u32) -> Result<(), &'stati
 }
 
 benchmarks! {
-	_ { }
-
 	schedule {
 		let s in 0 .. T::MaxScheduledPerBlock::get();
 		let when = BLOCK_NUMBER.into();
diff --git a/frame/session/benchmarking/src/lib.rs b/frame/session/benchmarking/src/lib.rs
index 89afc73b6b44..8f1911c125b8 100644
--- a/frame/session/benchmarking/src/lib.rs
+++ b/frame/session/benchmarking/src/lib.rs
@@ -51,8 +51,6 @@ impl<T: Config> OnInitialize<T::BlockNumber> for Module<T> {
 }
 
 benchmarks! {
-	_ {	}
-
 	set_keys {
 		let n = MAX_NOMINATIONS as u32;
 		let (v_stash, _) = create_validator_with_nominators::<T>(
diff --git a/frame/staking/src/benchmarking.rs b/frame/staking/src/benchmarking.rs
index 0ebe1eab788c..29e71f953986 100644
--- a/frame/staking/src/benchmarking.rs
+++ b/frame/staking/src/benchmarking.rs
@@ -113,8 +113,6 @@ pub fn create_validator_with_nominators<T: Config>(
 const USER_SEED: u32 = 999666;
 
 benchmarks! {
-	_{}
-
 	bond {
 		let stash = create_funded_user::<T>("stash", USER_SEED, 100);
 		let controller = create_funded_user::<T>("controller", USER_SEED, 100);
diff --git a/frame/system/benchmarking/src/lib.rs b/frame/system/benchmarking/src/lib.rs
index f60cd94a0f62..57ae99886295 100644
--- a/frame/system/benchmarking/src/lib.rs
+++ b/frame/system/benchmarking/src/lib.rs
@@ -38,8 +38,6 @@ pub struct Module<T: Config>(System<T>);
 pub trait Config: frame_system::Config {}
 
 benchmarks! {
-	_ { }
-
 	remark {
 		let b in 0 .. *T::BlockLength::get().max.get(DispatchClass::Normal) as u32;
 		let remark_message = vec![1; b as usize];
diff --git a/frame/timestamp/src/benchmarking.rs b/frame/timestamp/src/benchmarking.rs
index 27294a91c526..024e6967826c 100644
--- a/frame/timestamp/src/benchmarking.rs
+++ b/frame/timestamp/src/benchmarking.rs
@@ -30,8 +30,6 @@ use crate::Module as Timestamp;
 const MAX_TIME: u32 = 100;
 
 benchmarks! {
-	_ { }
-
 	set {
 		let t = MAX_TIME;
 		// Ignore write to `DidUpdate` since it transient.
diff --git a/frame/tips/src/benchmarking.rs b/frame/tips/src/benchmarking.rs
index 6e54247cdb6d..e05afc0b2ab2 100644
--- a/frame/tips/src/benchmarking.rs
+++ b/frame/tips/src/benchmarking.rs
@@ -89,8 +89,6 @@ const MAX_BYTES: u32 = 16384;
 const MAX_TIPPERS: u32 = 100;
 
 benchmarks! {
-	_ { }
-
 	report_awesome {
 		let r in 0 .. MAX_BYTES;
 		let (caller, reason, awesome_person) = setup_awesome::<T>(r);
diff --git a/frame/treasury/src/benchmarking.rs b/frame/treasury/src/benchmarking.rs
index ee462cd372f5..9cb214420ca4 100644
--- a/frame/treasury/src/benchmarking.rs
+++ b/frame/treasury/src/benchmarking.rs
@@ -66,8 +66,7 @@ fn setup_pot_account<T: Config<I>, I: Instance>() {
 }
 
 benchmarks_instance! {
-	_ { }
-
+	
 	propose_spend {
 		let (caller, value, beneficiary_lookup) = setup_proposal::<T, _>(SEED);
 		// Whitelist caller account from further DB operations.
diff --git a/frame/utility/src/benchmarking.rs b/frame/utility/src/benchmarking.rs
index 068d40c399be..24de60215799 100644
--- a/frame/utility/src/benchmarking.rs
+++ b/frame/utility/src/benchmarking.rs
@@ -34,8 +34,6 @@ fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
 }
 
 benchmarks! {
-	_ { }
-
 	batch {
 		let c in 0 .. 1000;
 		let mut calls: Vec<<T as Config>::Call> = Vec::new();
diff --git a/frame/vesting/src/benchmarking.rs b/frame/vesting/src/benchmarking.rs
index 6a61a6479b11..f65011050422 100644
--- a/frame/vesting/src/benchmarking.rs
+++ b/frame/vesting/src/benchmarking.rs
@@ -58,8 +58,6 @@ fn add_vesting_schedule<T: Config>(who: &T::AccountId) -> Result<(), &'static st
 }
 
 benchmarks! {
-	_ { }
-
 	vest_locked {
 		let l in 0 .. MaxLocksOf::<T>::get();
 

From 170eed5e396a9df2707950a115548e0866611684 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Wed, 6 Jan 2021 10:16:05 +0100
Subject: [PATCH 0231/1194] Improve spans of pallet macro (#7830)

* fix spans

* convert name to snake case
---
 Cargo.lock                                    |  1 +
 frame/support/procedural/Cargo.toml           |  1 +
 .../procedural/src/pallet/expand/call.rs      |  8 +-
 .../procedural/src/pallet/expand/constants.rs |  6 +-
 .../procedural/src/pallet/expand/error.rs     | 19 ++---
 .../procedural/src/pallet/expand/event.rs     | 20 ++---
 .../src/pallet/expand/genesis_build.rs        | 15 ++--
 .../procedural/src/pallet/expand/hooks.rs     | 10 +--
 .../src/pallet/expand/pallet_struct.rs        | 12 +--
 .../procedural/src/pallet/expand/storage.rs   | 67 +++++++++------
 .../src/pallet/expand/store_trait.rs          |  4 +-
 .../src/pallet/expand/type_value.rs           | 36 ++++++--
 .../procedural/src/pallet/parse/call.rs       |  3 +-
 .../procedural/src/pallet/parse/config.rs     |  7 +-
 .../procedural/src/pallet/parse/error.rs      | 11 ++-
 .../procedural/src/pallet/parse/event.rs      |  9 +-
 .../src/pallet/parse/genesis_build.rs         |  9 +-
 .../procedural/src/pallet/parse/hooks.rs      |  9 +-
 .../procedural/src/pallet/parse/mod.rs        | 82 ++++++++++---------
 .../src/pallet/parse/pallet_struct.rs         | 12 ++-
 .../procedural/src/pallet/parse/storage.rs    |  9 +-
 .../procedural/src/pallet/parse/type_value.rs |  9 +-
 frame/support/src/lib.rs                      |  5 +-
 .../call_argument_invalid_bound.stderr        |  4 +-
 .../pallet_ui/store_trait_leak_private.stderr |  4 +-
 .../type_value_forgotten_where_clause.rs      | 28 +++++++
 .../type_value_forgotten_where_clause.stderr  | 47 +++++++++++
 27 files changed, 303 insertions(+), 144 deletions(-)
 create mode 100644 frame/support/test/tests/pallet_ui/type_value_forgotten_where_clause.rs
 create mode 100644 frame/support/test/tests/pallet_ui/type_value_forgotten_where_clause.stderr

diff --git a/Cargo.lock b/Cargo.lock
index c5034978a410..23beb5a3ef3f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1658,6 +1658,7 @@ dependencies = [
 name = "frame-support-procedural"
 version = "2.0.0"
 dependencies = [
+ "Inflector",
  "frame-support-procedural-tools",
  "proc-macro2",
  "quote",
diff --git a/frame/support/procedural/Cargo.toml b/frame/support/procedural/Cargo.toml
index 70662d710775..1f1a2f93ccbf 100644
--- a/frame/support/procedural/Cargo.toml
+++ b/frame/support/procedural/Cargo.toml
@@ -18,6 +18,7 @@ proc-macro = true
 frame-support-procedural-tools = { version = "2.0.0", path = "./tools" }
 proc-macro2 = "1.0.6"
 quote = "1.0.3"
+Inflector = "0.11.4"
 syn = { version = "1.0.7", features = ["full"] }
 
 [features]
diff --git a/frame/support/procedural/src/pallet/expand/call.rs b/frame/support/procedural/src/pallet/expand/call.rs
index 2709995bf88b..215997dfcf15 100644
--- a/frame/support/procedural/src/pallet/expand/call.rs
+++ b/frame/support/procedural/src/pallet/expand/call.rs
@@ -24,9 +24,9 @@ use syn::spanned::Spanned;
 pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
 	let frame_support = &def.frame_support;
 	let frame_system = &def.frame_system;
-	let type_impl_gen = &def.type_impl_generics();
-	let type_decl_bounded_gen = &def.type_decl_bounded_generics();
-	let type_use_gen = &def.type_use_generics();
+	let type_impl_gen = &def.type_impl_generics(def.call.attr_span);
+	let type_decl_bounded_gen = &def.type_decl_bounded_generics(def.call.attr_span);
+	let type_use_gen = &def.type_use_generics(def.call.attr_span);
 	let call_ident = syn::Ident::new("Call", def.call.attr_span.clone());
 	let pallet_ident = &def.pallet_struct.pallet;
 	let where_clause = &def.call.where_clause;
@@ -61,7 +61,7 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
 		method.args.iter()
 			.map(|(is_compact, _, type_)| {
 				let final_type = if *is_compact {
-					quote::quote!(Compact<#type_>)
+					quote::quote_spanned!(type_.span() => Compact<#type_>)
 				} else {
 					quote::quote!(#type_)
 				};
diff --git a/frame/support/procedural/src/pallet/expand/constants.rs b/frame/support/procedural/src/pallet/expand/constants.rs
index 5740d606a332..e5acf42270aa 100644
--- a/frame/support/procedural/src/pallet/expand/constants.rs
+++ b/frame/support/procedural/src/pallet/expand/constants.rs
@@ -33,9 +33,9 @@ struct ConstDef {
 /// * Impl fn module_constant_metadata for pallet.
 pub fn expand_constants(def: &mut Def) -> proc_macro2::TokenStream {
 	let frame_support = &def.frame_support;
-	let type_impl_gen = &def.type_impl_generics();
-	let type_decl_gen = &def.type_decl_generics();
-	let type_use_gen = &def.type_use_generics();
+	let type_impl_gen = &def.type_impl_generics(proc_macro2::Span::call_site());
+	let type_decl_gen = &def.type_decl_generics(proc_macro2::Span::call_site());
+	let type_use_gen = &def.type_use_generics(proc_macro2::Span::call_site());
 	let pallet_ident = &def.pallet_struct.pallet;
 
 	let mut where_clauses = vec![&def.config.where_clause];
diff --git a/frame/support/procedural/src/pallet/expand/error.rs b/frame/support/procedural/src/pallet/expand/error.rs
index a88f626fdc52..c8c0a3c0c4d5 100644
--- a/frame/support/procedural/src/pallet/expand/error.rs
+++ b/frame/support/procedural/src/pallet/expand/error.rs
@@ -16,7 +16,6 @@
 // limitations under the License.
 
 use crate::pallet::Def;
-use syn::spanned::Spanned;
 
 /// * impl various trait on Error
 /// * impl ModuleErrorMetadata for Error
@@ -27,13 +26,11 @@ pub fn expand_error(def: &mut Def) -> proc_macro2::TokenStream {
 		return Default::default()
 	};
 
-	let error_item_span =
-		def.item.content.as_mut().expect("Checked by def parser").1[error.index].span();
 	let error_ident = &error.error;
 	let frame_support = &def.frame_support;
 	let frame_system = &def.frame_system;
-	let type_impl_gen = &def.type_impl_generics();
-	let type_use_gen = &def.type_use_generics();
+	let type_impl_gen = &def.type_impl_generics(error.attr_span);
+	let type_use_gen = &def.type_use_generics(error.attr_span);
 	let config_where_clause = &def.config.where_clause;
 
 	let phantom_variant: syn::Variant = syn::parse_quote!(
@@ -45,18 +42,20 @@ pub fn expand_error(def: &mut Def) -> proc_macro2::TokenStream {
 	);
 
 	let as_u8_matches = error.variants.iter().enumerate()
-		.map(|(i, (variant, _))| quote::quote!(Self::#variant => #i as u8,));
+		.map(|(i, (variant, _))| {
+			quote::quote_spanned!(error.attr_span => Self::#variant => #i as u8,)
+		});
 
 	let as_str_matches = error.variants.iter()
 		.map(|(variant, _)| {
 			let variant_str = format!("{}", variant);
-			quote::quote!(Self::#variant => #variant_str,)
+			quote::quote_spanned!(error.attr_span => Self::#variant => #variant_str,)
 		});
 
 	let metadata = error.variants.iter()
 		.map(|(variant, doc)| {
 			let variant_str = format!("{}", variant);
-			quote::quote!(
+			quote::quote_spanned!(error.attr_span =>
 				#frame_support::error::ErrorMetadata {
 					name: #frame_support::error::DecodeDifferent::Encode(#variant_str),
 					documentation: #frame_support::error::DecodeDifferent::Encode(&[ #( #doc, )* ]),
@@ -69,13 +68,13 @@ pub fn expand_error(def: &mut Def) -> proc_macro2::TokenStream {
 		if let syn::Item::Enum(item) = item {
 			item
 		} else {
-			unreachable!("Checked by event parser")
+			unreachable!("Checked by error parser")
 		}
 	};
 
 	error_item.variants.insert(0, phantom_variant);
 
-	quote::quote_spanned!(error_item_span =>
+	quote::quote_spanned!(error.attr_span =>
 		impl<#type_impl_gen> #frame_support::sp_std::fmt::Debug for #error_ident<#type_use_gen>
 			#config_where_clause
 		{
diff --git a/frame/support/procedural/src/pallet/expand/event.rs b/frame/support/procedural/src/pallet/expand/event.rs
index 76eda4448ba1..e04d64750bca 100644
--- a/frame/support/procedural/src/pallet/expand/event.rs
+++ b/frame/support/procedural/src/pallet/expand/event.rs
@@ -16,7 +16,6 @@
 // limitations under the License.
 
 use crate::pallet::Def;
-use syn::spanned::Spanned;
 
 /// * Add __Ignore variant on Event
 /// * Impl various trait on Event including metadata
@@ -40,12 +39,12 @@ pub fn expand_event(def: &mut Def) -> proc_macro2::TokenStream {
 	let event_ident = &event.event;
 	let frame_system = &def.frame_system;
 	let frame_support = &def.frame_support;
-	let event_use_gen = &event.gen_kind.type_use_gen();
-	let event_impl_gen= &event.gen_kind.type_impl_gen();
+	let event_use_gen = &event.gen_kind.type_use_gen(event.attr_span);
+	let event_impl_gen= &event.gen_kind.type_impl_gen(event.attr_span);
 	let metadata = event.metadata.iter()
 		.map(|(ident, args, docs)| {
 			let name = format!("{}", ident);
-			quote::quote!(
+			quote::quote_spanned!(event.attr_span =>
 				#frame_support::event::EventMetadata {
 					name: #frame_support::event::DecodeDifferent::Encode(#name),
 					arguments: #frame_support::event::DecodeDifferent::Encode(&[
@@ -58,9 +57,6 @@ pub fn expand_event(def: &mut Def) -> proc_macro2::TokenStream {
 			)
 		});
 
-	let event_item_span =
-		def.item.content.as_mut().expect("Checked by def parser").1[event.index].span();
-
 	let event_item = {
 		let item = &mut def.item.content.as_mut().expect("Checked by def parser").1[event.index];
 		if let syn::Item::Enum(item) = item {
@@ -99,10 +95,10 @@ pub fn expand_event(def: &mut Def) -> proc_macro2::TokenStream {
 
 
 	let deposit_event = if let Some((fn_vis, fn_span)) = &event.deposit_event {
-		let event_use_gen = &event.gen_kind.type_use_gen();
-		let trait_use_gen = &def.trait_use_generics();
-		let type_impl_gen = &def.type_impl_generics();
-		let type_use_gen = &def.type_use_generics();
+		let event_use_gen = &event.gen_kind.type_use_gen(event.attr_span);
+		let trait_use_gen = &def.trait_use_generics(event.attr_span);
+		let type_impl_gen = &def.type_impl_generics(event.attr_span);
+		let type_use_gen = &def.type_use_generics(event.attr_span);
 
 		quote::quote_spanned!(*fn_span =>
 			impl<#type_impl_gen> Pallet<#type_use_gen> #completed_where_clause {
@@ -125,7 +121,7 @@ pub fn expand_event(def: &mut Def) -> proc_macro2::TokenStream {
 		Default::default()
 	};
 
-	quote::quote_spanned!(event_item_span =>
+	quote::quote_spanned!(event.attr_span =>
 		#deposit_event
 
 		impl<#event_impl_gen> From<#event_ident<#event_use_gen>> for () #event_where_clause {
diff --git a/frame/support/procedural/src/pallet/expand/genesis_build.rs b/frame/support/procedural/src/pallet/expand/genesis_build.rs
index 8f42bfadc200..374d21001d6a 100644
--- a/frame/support/procedural/src/pallet/expand/genesis_build.rs
+++ b/frame/support/procedural/src/pallet/expand/genesis_build.rs
@@ -16,7 +16,6 @@
 // limitations under the License.
 
 use crate::pallet::Def;
-use syn::spanned::Spanned;
 
 /// * implement the trait `sp_runtime::BuildModuleGenesisStorage`
 /// * add #[cfg(features = "std")] to GenesisBuild implementation.
@@ -26,21 +25,21 @@ pub fn expand_genesis_build(def: &mut Def) -> proc_macro2::TokenStream {
 	} else {
 		return Default::default()
 	};
+	let genesis_build = def.genesis_build.as_ref().expect("Checked by def parser");
 
 	let frame_support = &def.frame_support;
-	let type_impl_gen = &def.type_impl_generics();
-	let type_use_gen = &def.type_use_generics();
+	let type_impl_gen = &def.type_impl_generics(genesis_build.attr_span);
+	let type_use_gen = &def.type_use_generics(genesis_build.attr_span);
 	let trait_use_gen = if def.config.has_instance {
-		quote::quote!(T, I)
+		quote::quote_spanned!(genesis_build.attr_span => T, I)
 	} else {
 		// `__InherentHiddenInstance` used by construct_runtime here is alias for `()`
-		quote::quote!(T, ())
+		quote::quote_spanned!(genesis_build.attr_span => T, ())
 	};
 	let gen_cfg_ident = &genesis_config.genesis_config;
 
-	let gen_cfg_use_gen = genesis_config.gen_kind.type_use_gen();
+	let gen_cfg_use_gen = genesis_config.gen_kind.type_use_gen(genesis_build.attr_span);
 
-	let genesis_build = def.genesis_build.as_ref().expect("Checked by def parser");
 	let genesis_build_item = &mut def.item.content.as_mut()
 		.expect("Checked by def parser").1[genesis_build.index];
 
@@ -53,7 +52,7 @@ pub fn expand_genesis_build(def: &mut Def) -> proc_macro2::TokenStream {
 	genesis_build_item_impl.attrs.push(syn::parse_quote!( #[cfg(feature = "std")] ));
 	let where_clause = &genesis_build.where_clause;
 
-	quote::quote_spanned!(genesis_build_item.span() =>
+	quote::quote_spanned!(genesis_build.attr_span =>
 		#[cfg(feature = "std")]
 		impl<#type_impl_gen> #frame_support::sp_runtime::BuildModuleGenesisStorage<#trait_use_gen>
 			for #gen_cfg_ident<#gen_cfg_use_gen> #where_clause
diff --git a/frame/support/procedural/src/pallet/expand/hooks.rs b/frame/support/procedural/src/pallet/expand/hooks.rs
index a20dac09166d..2e4fddebb7b0 100644
--- a/frame/support/procedural/src/pallet/expand/hooks.rs
+++ b/frame/support/procedural/src/pallet/expand/hooks.rs
@@ -16,21 +16,17 @@
 // limitations under the License.
 
 use crate::pallet::Def;
-use syn::spanned::Spanned;
 
 /// * implement the individual traits using the Hooks trait
 pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 	let frame_support = &def.frame_support;
-	let type_impl_gen = &def.type_impl_generics();
-	let type_use_gen = &def.type_use_generics();
+	let type_impl_gen = &def.type_impl_generics(def.hooks.attr_span);
+	let type_use_gen = &def.type_use_generics(def.hooks.attr_span);
 	let pallet_ident = &def.pallet_struct.pallet;
 	let where_clause = &def.hooks.where_clause;
 	let frame_system = &def.frame_system;
 
-	let hooks_item_span = def.item.content.as_mut()
-		.expect("Checked by def parser").1[def.hooks.index].span();
-
-	quote::quote_spanned!(hooks_item_span =>
+	quote::quote_spanned!(def.hooks.attr_span =>
 		impl<#type_impl_gen>
 			#frame_support::traits::OnFinalize<<T as #frame_system::Config>::BlockNumber>
 			for #pallet_ident<#type_use_gen> #where_clause
diff --git a/frame/support/procedural/src/pallet/expand/pallet_struct.rs b/frame/support/procedural/src/pallet/expand/pallet_struct.rs
index 6c89c0217cec..aff7af4afb5e 100644
--- a/frame/support/procedural/src/pallet/expand/pallet_struct.rs
+++ b/frame/support/procedural/src/pallet/expand/pallet_struct.rs
@@ -25,9 +25,9 @@ use crate::pallet::Def;
 pub fn expand_pallet_struct(def: &mut Def) -> proc_macro2::TokenStream {
 	let frame_support = &def.frame_support;
 	let frame_system = &def.frame_system;
-	let type_impl_gen = &def.type_impl_generics();
-	let type_use_gen = &def.type_use_generics();
-	let type_decl_gen = &def.type_decl_generics();
+	let type_impl_gen = &def.type_impl_generics(def.pallet_struct.attr_span);
+	let type_use_gen = &def.type_use_generics(def.pallet_struct.attr_span);
+	let type_decl_gen = &def.type_decl_generics(def.pallet_struct.attr_span);
 	let pallet_ident = &def.pallet_struct.pallet;
 	let config_where_clause = &def.config.where_clause;
 
@@ -52,7 +52,7 @@ pub fn expand_pallet_struct(def: &mut Def) -> proc_macro2::TokenStream {
 
 	let module_error_metadata = if let Some(error_def) = &def.error {
 		let error_ident = &error_def.error;
-		quote::quote!(
+		quote::quote_spanned!(def.pallet_struct.attr_span =>
 			impl<#type_impl_gen> #frame_support::error::ModuleErrorMetadata
 				for #pallet_ident<#type_use_gen>
 				#config_where_clause
@@ -65,7 +65,7 @@ pub fn expand_pallet_struct(def: &mut Def) -> proc_macro2::TokenStream {
 			}
 		)
 	} else {
-		quote::quote!(
+		quote::quote_spanned!(def.pallet_struct.attr_span =>
 			impl<#type_impl_gen> #frame_support::error::ModuleErrorMetadata
 				for #pallet_ident<#type_use_gen>
 				#config_where_clause
@@ -77,7 +77,7 @@ pub fn expand_pallet_struct(def: &mut Def) -> proc_macro2::TokenStream {
 		)
 	};
 
-	quote::quote!(
+	quote::quote_spanned!(def.pallet_struct.attr_span =>
 		#module_error_metadata
 
 		/// Type alias to `Pallet`, to be used by `construct_runtime`.
diff --git a/frame/support/procedural/src/pallet/expand/storage.rs b/frame/support/procedural/src/pallet/expand/storage.rs
index a77f9cf60849..7948fca2faf0 100644
--- a/frame/support/procedural/src/pallet/expand/storage.rs
+++ b/frame/support/procedural/src/pallet/expand/storage.rs
@@ -32,8 +32,6 @@ fn prefix_ident(storage_ident: &syn::Ident) -> syn::Ident {
 pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 	let frame_support = &def.frame_support;
 	let frame_system = &def.frame_system;
-	let type_impl_gen = &def.type_impl_generics();
-	let type_use_gen = &def.type_use_generics();
 	let pallet_ident = &def.pallet_struct.pallet;
 
 	// Replace first arg `_` by the generated prefix structure.
@@ -63,6 +61,11 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 			unreachable!("Checked by def");
 		};
 
+		let type_use_gen = if def.config.has_instance {
+			quote::quote_spanned!(storage_def.attr_span => T, I)
+		} else {
+			quote::quote_spanned!(storage_def.attr_span => T)
+		};
 		let prefix_ident = prefix_ident(&storage_def.ident);
 		args.args[0] = syn::parse_quote!( #prefix_ident<#type_use_gen> );
 	}
@@ -72,22 +75,25 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 			let docs = &storage.docs;
 
 			let ident = &storage.ident;
-			let gen = &def.type_use_generics();
-			let full_ident = quote::quote!( #ident<#gen> );
+			let gen = &def.type_use_generics(storage.attr_span);
+			let full_ident = quote::quote_spanned!(storage.attr_span => #ident<#gen> );
 
 			let metadata_trait = match &storage.metadata {
-				Metadata::Value { .. } =>
-					quote::quote!(#frame_support::storage::types::StorageValueMetadata),
-				Metadata::Map { .. } =>
-					quote::quote!(#frame_support::storage::types::StorageMapMetadata),
-				Metadata::DoubleMap { .. } =>
-					quote::quote!(#frame_support::storage::types::StorageDoubleMapMetadata),
+				Metadata::Value { .. } => quote::quote_spanned!(storage.attr_span =>
+					#frame_support::storage::types::StorageValueMetadata
+				),
+				Metadata::Map { .. } => quote::quote_spanned!(storage.attr_span =>
+					#frame_support::storage::types::StorageMapMetadata
+				),
+				Metadata::DoubleMap { .. } => quote::quote_spanned!(storage.attr_span =>
+					#frame_support::storage::types::StorageDoubleMapMetadata
+				),
 			};
 
 			let ty = match &storage.metadata {
 				Metadata::Value { value } => {
 					let value = clean_type_string(&quote::quote!(#value).to_string());
-					quote::quote!(
+					quote::quote_spanned!(storage.attr_span =>
 						#frame_support::metadata::StorageEntryType::Plain(
 							#frame_support::metadata::DecodeDifferent::Encode(#value)
 						)
@@ -96,7 +102,7 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 				Metadata::Map { key, value } => {
 					let value = clean_type_string(&quote::quote!(#value).to_string());
 					let key = clean_type_string(&quote::quote!(#key).to_string());
-					quote::quote!(
+					quote::quote_spanned!(storage.attr_span =>
 						#frame_support::metadata::StorageEntryType::Map {
 							hasher: <#full_ident as #metadata_trait>::HASHER,
 							key: #frame_support::metadata::DecodeDifferent::Encode(#key),
@@ -109,7 +115,7 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 					let value = clean_type_string(&quote::quote!(#value).to_string());
 					let key1 = clean_type_string(&quote::quote!(#key1).to_string());
 					let key2 = clean_type_string(&quote::quote!(#key2).to_string());
-					quote::quote!(
+					quote::quote_spanned!(storage.attr_span =>
 						#frame_support::metadata::StorageEntryType::DoubleMap {
 							hasher: <#full_ident as #metadata_trait>::HASHER1,
 							key2_hasher: <#full_ident as #metadata_trait>::HASHER2,
@@ -121,7 +127,7 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 				}
 			};
 
-			quote::quote_spanned!(storage.ident.span() =>
+			quote::quote_spanned!(storage.attr_span =>
 				#frame_support::metadata::StorageEntryMetadata {
 					name: #frame_support::metadata::DecodeDifferent::Encode(
 						<#full_ident as #metadata_trait>::NAME
@@ -144,19 +150,24 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 				&storage.where_clause,
 				&def.config.where_clause,
 			]);
-			let docs = storage.docs.iter().map(|d| quote::quote!(#[doc = #d]));
+			let docs = storage.docs.iter()
+				.map(|d| quote::quote_spanned!(storage.attr_span => #[doc = #d]));
 
 			let ident = &storage.ident;
-			let gen = &def.type_use_generics();
-			let full_ident = quote::quote!( #ident<#gen> );
+			let gen = &def.type_use_generics(storage.attr_span);
+			let type_impl_gen = &def.type_impl_generics(storage.attr_span);
+			let type_use_gen = &def.type_use_generics(storage.attr_span);
+			let full_ident = quote::quote_spanned!(storage.attr_span => #ident<#gen> );
 
 			match &storage.metadata {
 				Metadata::Value { value } => {
 					let query = match storage.query_kind.as_ref().expect("Checked by def") {
-						QueryKind::OptionQuery => quote::quote!(Option<#value>),
+						QueryKind::OptionQuery => quote::quote_spanned!(storage.attr_span =>
+							Option<#value>
+						),
 						QueryKind::ValueQuery => quote::quote!(#value),
 					};
-					quote::quote_spanned!(getter.span() =>
+					quote::quote_spanned!(storage.attr_span =>
 						impl<#type_impl_gen> #pallet_ident<#type_use_gen> #completed_where_clause {
 							#( #docs )*
 							pub fn #getter() -> #query {
@@ -169,10 +180,12 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 				},
 				Metadata::Map { key, value } => {
 					let query = match storage.query_kind.as_ref().expect("Checked by def") {
-						QueryKind::OptionQuery => quote::quote!(Option<#value>),
+						QueryKind::OptionQuery => quote::quote_spanned!(storage.attr_span =>
+							Option<#value>
+						),
 						QueryKind::ValueQuery => quote::quote!(#value),
 					};
-					quote::quote_spanned!(getter.span() =>
+					quote::quote_spanned!(storage.attr_span =>
 						impl<#type_impl_gen> #pallet_ident<#type_use_gen> #completed_where_clause {
 							#( #docs )*
 							pub fn #getter<KArg>(k: KArg) -> #query where
@@ -187,10 +200,12 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 				},
 				Metadata::DoubleMap { key1, key2, value } => {
 					let query = match storage.query_kind.as_ref().expect("Checked by def") {
-						QueryKind::OptionQuery => quote::quote!(Option<#value>),
+						QueryKind::OptionQuery => quote::quote_spanned!(storage.attr_span =>
+							Option<#value>
+						),
 						QueryKind::ValueQuery => quote::quote!(#value),
 					};
-					quote::quote_spanned!(getter.span() =>
+					quote::quote_spanned!(storage.attr_span =>
 						impl<#type_impl_gen> #pallet_ident<#type_use_gen> #completed_where_clause {
 							#( #docs )*
 							pub fn #getter<KArg1, KArg2>(k1: KArg1, k2: KArg2) -> #query where
@@ -211,12 +226,14 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 		});
 
 	let prefix_structs = def.storages.iter().map(|storage_def| {
+		let type_impl_gen = &def.type_impl_generics(storage_def.attr_span);
+		let type_use_gen = &def.type_use_generics(storage_def.attr_span);
 		let prefix_struct_ident = prefix_ident(&storage_def.ident);
 		let prefix_struct_vis = &storage_def.vis;
 		let prefix_struct_const = storage_def.ident.to_string();
 		let config_where_clause = &def.config.where_clause;
 
-		quote::quote_spanned!(storage_def.ident.span() =>
+		quote::quote_spanned!(storage_def.attr_span =>
 			#prefix_struct_vis struct #prefix_struct_ident<#type_use_gen>(
 				core::marker::PhantomData<(#type_use_gen,)>
 			);
@@ -239,6 +256,8 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 	let mut where_clauses = vec![&def.config.where_clause];
 	where_clauses.extend(def.storages.iter().map(|storage| &storage.where_clause));
 	let completed_where_clause = super::merge_where_clauses(&where_clauses);
+	let type_impl_gen = &def.type_impl_generics(proc_macro2::Span::call_site());
+	let type_use_gen = &def.type_use_generics(proc_macro2::Span::call_site());
 
 	quote::quote!(
 		impl<#type_impl_gen> #pallet_ident<#type_use_gen>
diff --git a/frame/support/procedural/src/pallet/expand/store_trait.rs b/frame/support/procedural/src/pallet/expand/store_trait.rs
index 1fa95addb18f..cdc7e2837245 100644
--- a/frame/support/procedural/src/pallet/expand/store_trait.rs
+++ b/frame/support/procedural/src/pallet/expand/store_trait.rs
@@ -28,8 +28,8 @@ pub fn expand_store_trait(def: &mut Def) -> proc_macro2::TokenStream {
 		return Default::default()
 	};
 
-	let type_impl_gen = &def.type_impl_generics();
-	let type_use_gen = &def.type_use_generics();
+	let type_impl_gen = &def.type_impl_generics(trait_store.span());
+	let type_use_gen = &def.type_use_generics(trait_store.span());
 	let pallet_ident = &def.pallet_struct.pallet;
 
 	let mut where_clauses = vec![&def.config.where_clause];
diff --git a/frame/support/procedural/src/pallet/expand/type_value.rs b/frame/support/procedural/src/pallet/expand/type_value.rs
index cb5d8307d89e..b1b94eb4fbe6 100644
--- a/frame/support/procedural/src/pallet/expand/type_value.rs
+++ b/frame/support/procedural/src/pallet/expand/type_value.rs
@@ -16,38 +16,56 @@
 // limitations under the License.
 
 use crate::pallet::Def;
-use syn::spanned::Spanned;
 
 /// * Generate the struct
 /// * implement the `Get<..>` on it
+/// * Rename the name of the function to internal name
 pub fn expand_type_values(def: &mut Def) -> proc_macro2::TokenStream {
 	let mut expand = quote::quote!();
 	let frame_support = &def.frame_support;
 
 	for type_value in &def.type_values {
-		// Remove item from module content
-		let item = &mut def.item.content.as_mut().expect("Checked by def").1[type_value.index];
-		let span = item.span();
-		*item = syn::Item::Verbatim(Default::default());
+		let fn_name_str = &type_value.ident.to_string();
+		let fn_name_snakecase = inflector::cases::snakecase::to_snake_case(fn_name_str);
+		let fn_ident_renamed = syn::Ident::new(
+			&format!("__type_value_for_{}", fn_name_snakecase),
+			type_value.ident.span(),
+		);
+
+		let type_value_item = {
+			let item = &mut def.item.content.as_mut().expect("Checked by def").1[type_value.index];
+			if let syn::Item::Fn(item) = item {
+				item
+			} else {
+				unreachable!("Checked by error parser")
+			}
+		};
+
+		// Rename the type_value function name
+		type_value_item.sig.ident = fn_ident_renamed.clone();
 
 		let vis = &type_value.vis;
 		let ident = &type_value.ident;
-		let block = &type_value.block;
 		let type_ = &type_value.type_;
 		let where_clause = &type_value.where_clause;
 
 		let (struct_impl_gen, struct_use_gen) = if type_value.is_generic {
-			(def.type_impl_generics(), def.type_use_generics())
+			(
+				def.type_impl_generics(type_value.attr_span),
+				def.type_use_generics(type_value.attr_span),
+			)
 		} else {
 			(Default::default(), Default::default())
 		};
 
-		expand.extend(quote::quote_spanned!(span =>
+		expand.extend(quote::quote_spanned!(type_value.attr_span =>
 			#vis struct #ident<#struct_use_gen>(core::marker::PhantomData<((), #struct_use_gen)>);
 			impl<#struct_impl_gen> #frame_support::traits::Get<#type_> for #ident<#struct_use_gen>
 			#where_clause
 			{
-				fn get() -> #type_ #block
+				fn get() -> #type_ {
+					#fn_ident_renamed::<#struct_use_gen>()
+				}
 			}
 		));
 	}
diff --git a/frame/support/procedural/src/pallet/parse/call.rs b/frame/support/procedural/src/pallet/parse/call.rs
index 92613fa981bb..e26e2ca1ab5c 100644
--- a/frame/support/procedural/src/pallet/parse/call.rs
+++ b/frame/support/procedural/src/pallet/parse/call.rs
@@ -40,7 +40,7 @@ pub struct CallDef {
 	pub index: usize,
 	/// Information on methods (used for expansion).
 	pub methods: Vec<CallVariantDef>,
-	/// The span of the attribute.
+	/// The span of the pallet::call attribute.
 	pub attr_span: proc_macro2::Span,
 }
 
@@ -124,7 +124,6 @@ pub fn check_dispatchable_first_arg_type(ty: &syn::Type) -> syn::Result<()> {
 
 impl CallDef {
 	pub fn try_from(
-		// Span needed for expansion
 		attr_span: proc_macro2::Span,
 		index: usize,
 		item: &mut syn::Item
diff --git a/frame/support/procedural/src/pallet/parse/config.rs b/frame/support/procedural/src/pallet/parse/config.rs
index 7684009bcb36..44298c1d7fe4 100644
--- a/frame/support/procedural/src/pallet/parse/config.rs
+++ b/frame/support/procedural/src/pallet/parse/config.rs
@@ -48,7 +48,8 @@ pub struct ConfigDef {
 	pub has_event_type: bool,
 	/// The where clause on trait definition but modified so `Self` is `T`.
 	pub where_clause: Option<syn::WhereClause>,
-
+	/// The span of the pallet::config attribute.
+	pub attr_span: proc_macro2::Span,
 }
 
 /// Input definition for a constant in pallet config.
@@ -262,8 +263,9 @@ pub fn replace_self_by_t(input: proc_macro2::TokenStream) -> proc_macro2::TokenS
 impl ConfigDef {
 	pub fn try_from(
 		frame_system: &syn::Ident,
+		attr_span: proc_macro2::Span,
 		index: usize,
-		item: &mut syn::Item
+		item: &mut syn::Item,
 	) -> syn::Result<Self> {
 		let item = if let syn::Item::Trait(item) = item {
 			item
@@ -379,6 +381,7 @@ impl ConfigDef {
 			consts_metadata,
 			has_event_type,
 			where_clause,
+			attr_span,
 		})
 	}
 }
diff --git a/frame/support/procedural/src/pallet/parse/error.rs b/frame/support/procedural/src/pallet/parse/error.rs
index cc8b7f11ff40..49aaebc87f42 100644
--- a/frame/support/procedural/src/pallet/parse/error.rs
+++ b/frame/support/procedural/src/pallet/parse/error.rs
@@ -34,11 +34,17 @@ pub struct ErrorDef {
 	/// A set of usage of instance, must be check for consistency with trait.
 	pub instances: Vec<helper::InstanceUsage>,
 	/// The keyword error used (contains span).
-	pub error: keyword::Error
+	pub error: keyword::Error,
+	/// The span of the pallet::error attribute.
+	pub attr_span: proc_macro2::Span,
 }
 
 impl ErrorDef {
-	pub fn try_from(index: usize, item: &mut syn::Item) -> syn::Result<Self> {
+	pub fn try_from(
+		attr_span: proc_macro2::Span,
+		index: usize,
+		item: &mut syn::Item,
+	) -> syn::Result<Self> {
 		let item = if let syn::Item::Enum(item) = item {
 			item
 		} else {
@@ -77,6 +83,7 @@ impl ErrorDef {
 			.collect::<Result<_, _>>()?;
 
 		Ok(ErrorDef {
+			attr_span,
 			index,
 			variants,
 			instances,
diff --git a/frame/support/procedural/src/pallet/parse/event.rs b/frame/support/procedural/src/pallet/parse/event.rs
index ef0c3e2e9285..3d2f12a133b2 100644
--- a/frame/support/procedural/src/pallet/parse/event.rs
+++ b/frame/support/procedural/src/pallet/parse/event.rs
@@ -45,6 +45,8 @@ pub struct EventDef {
 	pub deposit_event: Option<(syn::Visibility, proc_macro2::Span)>,
 	/// Where clause used in event definition.
 	pub where_clause: Option<syn::WhereClause>,
+	/// The span of the pallet::event attribute.
+	pub attr_span: proc_macro2::Span,
 }
 
 /// Attribute for Event: defines metadata name to use.
@@ -150,7 +152,11 @@ impl PalletEventAttrInfo {
 }
 
 impl EventDef {
-	pub fn try_from(index: usize, item: &mut syn::Item) -> syn::Result<Self> {
+	pub fn try_from(
+		attr_span: proc_macro2::Span,
+		index: usize,
+		item: &mut syn::Item,
+	) -> syn::Result<Self> {
 		let item = if let syn::Item::Enum(item) = item {
 			item
 		} else {
@@ -208,6 +214,7 @@ impl EventDef {
 			.collect();
 
 		Ok(EventDef {
+			attr_span,
 			index,
 			metadata,
 			instances,
diff --git a/frame/support/procedural/src/pallet/parse/genesis_build.rs b/frame/support/procedural/src/pallet/parse/genesis_build.rs
index f9aa26d173a9..1438c400b17f 100644
--- a/frame/support/procedural/src/pallet/parse/genesis_build.rs
+++ b/frame/support/procedural/src/pallet/parse/genesis_build.rs
@@ -26,10 +26,16 @@ pub struct GenesisBuildDef {
 	pub instances: Vec<helper::InstanceUsage>,
 	/// The where_clause used.
 	pub where_clause: Option<syn::WhereClause>,
+	/// The span of the pallet::genesis_build attribute.
+	pub attr_span: proc_macro2::Span,
 }
 
 impl GenesisBuildDef {
-	pub fn try_from(index: usize, item: &mut syn::Item) -> syn::Result<Self> {
+	pub fn try_from(
+		attr_span: proc_macro2::Span,
+		index: usize,
+		item: &mut syn::Item,
+	) -> syn::Result<Self> {
 		let item = if let syn::Item::Impl(item) = item {
 			item
 		} else {
@@ -48,6 +54,7 @@ impl GenesisBuildDef {
 		instances.push(helper::check_genesis_builder_usage(&item_trait)?);
 
 		Ok(Self {
+			attr_span,
 			index,
 			instances,
 			where_clause: item.generics.where_clause.clone(),
diff --git a/frame/support/procedural/src/pallet/parse/hooks.rs b/frame/support/procedural/src/pallet/parse/hooks.rs
index f7fec5696d49..585222060e5f 100644
--- a/frame/support/procedural/src/pallet/parse/hooks.rs
+++ b/frame/support/procedural/src/pallet/parse/hooks.rs
@@ -26,10 +26,16 @@ pub struct HooksDef {
 	pub instances: Vec<helper::InstanceUsage>,
 	/// The where_clause used.
 	pub where_clause: Option<syn::WhereClause>,
+	/// The span of the pallet::hooks attribute.
+	pub attr_span: proc_macro2::Span,
 }
 
 impl HooksDef {
-	pub fn try_from(index: usize, item: &mut syn::Item) -> syn::Result<Self> {
+	pub fn try_from(
+		attr_span: proc_macro2::Span,
+		index: usize,
+		item: &mut syn::Item,
+	) -> syn::Result<Self> {
 		let item = if let syn::Item::Impl(item) = item {
 			item
 		} else {
@@ -61,6 +67,7 @@ impl HooksDef {
 		}
 
 		Ok(Self {
+			attr_span,
 			index,
 			instances,
 			where_clause: item.generics.where_clause.clone(),
diff --git a/frame/support/procedural/src/pallet/parse/mod.rs b/frame/support/procedural/src/pallet/parse/mod.rs
index d7bb605a954a..be54f709a47a 100644
--- a/frame/support/procedural/src/pallet/parse/mod.rs
+++ b/frame/support/procedural/src/pallet/parse/mod.rs
@@ -92,38 +92,42 @@ impl Def {
 			let pallet_attr: Option<PalletAttr> = helper::take_first_item_attr(item)?;
 
 			match pallet_attr {
-				Some(PalletAttr::Config(_)) if config.is_none() =>
-					config = Some(config::ConfigDef::try_from(&frame_system, index, item)?),
-				Some(PalletAttr::Pallet(_)) if pallet_struct.is_none() =>
-					pallet_struct = Some(pallet_struct::PalletStructDef::try_from(index, item)?),
-				Some(PalletAttr::Hooks(_)) if hooks.is_none() => {
-					let m = hooks::HooksDef::try_from(index, item)?;
+				Some(PalletAttr::Config(span)) if config.is_none() =>
+					config = Some(config::ConfigDef::try_from(&frame_system, span, index, item)?),
+				Some(PalletAttr::Pallet(span)) if pallet_struct.is_none() => {
+					let p = pallet_struct::PalletStructDef::try_from(span, index, item)?;
+					pallet_struct = Some(p);
+				},
+				Some(PalletAttr::Hooks(span)) if hooks.is_none() => {
+					let m = hooks::HooksDef::try_from(span, index, item)?;
 					hooks = Some(m);
 				},
 				Some(PalletAttr::Call(span)) if call.is_none() =>
 					call = Some(call::CallDef::try_from(span, index, item)?),
-				Some(PalletAttr::Error(_)) if error.is_none() =>
-					error = Some(error::ErrorDef::try_from(index, item)?),
-				Some(PalletAttr::Event(_)) if event.is_none() =>
-					event = Some(event::EventDef::try_from(index, item)?),
+				Some(PalletAttr::Error(span)) if error.is_none() =>
+					error = Some(error::ErrorDef::try_from(span, index, item)?),
+				Some(PalletAttr::Event(span)) if event.is_none() =>
+					event = Some(event::EventDef::try_from(span, index, item)?),
 				Some(PalletAttr::GenesisConfig(_)) if genesis_config.is_none() => {
-					genesis_config =
-						Some(genesis_config::GenesisConfigDef::try_from(index, item)?);
+					let g = genesis_config::GenesisConfigDef::try_from(index, item)?;
+					genesis_config = Some(g);
+				},
+				Some(PalletAttr::GenesisBuild(span)) if genesis_build.is_none() => {
+					let g = genesis_build::GenesisBuildDef::try_from(span, index, item)?;
+					genesis_build = Some(g);
 				},
-				Some(PalletAttr::GenesisBuild(_)) if genesis_build.is_none() =>
-					genesis_build = Some(genesis_build::GenesisBuildDef::try_from(index, item)?),
 				Some(PalletAttr::Origin(_)) if origin.is_none() =>
 					origin = Some(origin::OriginDef::try_from(index, item)?),
 				Some(PalletAttr::Inherent(_)) if inherent.is_none() =>
 					inherent = Some(inherent::InherentDef::try_from(index, item)?),
-				Some(PalletAttr::Storage(_)) =>
-					storages.push(storage::StorageDef::try_from(index, item)?),
+				Some(PalletAttr::Storage(span)) =>
+					storages.push(storage::StorageDef::try_from(span, index, item)?),
 				Some(PalletAttr::ValidateUnsigned(_)) if validate_unsigned.is_none() => {
 					let v = validate_unsigned::ValidateUnsignedDef::try_from(index, item)?;
 					validate_unsigned = Some(v);
 				},
-				Some(PalletAttr::TypeValue(_)) =>
-					type_values.push(type_value::TypeValueDef::try_from(index, item)?),
+				Some(PalletAttr::TypeValue(span)) =>
+					type_values.push(type_value::TypeValueDef::try_from(span, index, item)?),
 				Some(PalletAttr::ExtraConstants(_)) => {
 					extra_constants =
 						Some(extra_constants::ExtraConstantsDef::try_from(index, item)?)
@@ -255,33 +259,33 @@ impl Def {
 	/// Depending on if pallet is instantiable:
 	/// * either `T: Config`
 	/// * or `T: Config<I>, I: 'static`
-	pub fn type_impl_generics(&self) -> proc_macro2::TokenStream {
+	pub fn type_impl_generics(&self, span: proc_macro2::Span) -> proc_macro2::TokenStream {
 		if self.config.has_instance {
-			quote::quote!(T: Config<I>, I: 'static)
+			quote::quote_spanned!(span => T: Config<I>, I: 'static)
 		} else {
-			quote::quote!(T: Config)
+			quote::quote_spanned!(span => T: Config)
 		}
 	}
 
 	/// Depending on if pallet is instantiable:
 	/// * either `T: Config`
 	/// * or `T: Config<I>, I: 'static = ()`
-	pub fn type_decl_bounded_generics(&self) -> proc_macro2::TokenStream {
+	pub fn type_decl_bounded_generics(&self, span: proc_macro2::Span) -> proc_macro2::TokenStream {
 		if self.config.has_instance {
-			quote::quote!(T: Config<I>, I: 'static = ())
+			quote::quote_spanned!(span => T: Config<I>, I: 'static = ())
 		} else {
-			quote::quote!(T: Config)
+			quote::quote_spanned!(span => T: Config)
 		}
 	}
 
 	/// Depending on if pallet is instantiable:
 	/// * either `T`
 	/// * or `T, I = ()`
-	pub fn type_decl_generics(&self) -> proc_macro2::TokenStream {
+	pub fn type_decl_generics(&self, span: proc_macro2::Span) -> proc_macro2::TokenStream {
 		if self.config.has_instance {
-			quote::quote!(T, I = ())
+			quote::quote_spanned!(span => T, I = ())
 		} else {
-			quote::quote!(T)
+			quote::quote_spanned!(span => T)
 		}
 	}
 
@@ -289,22 +293,22 @@ impl Def {
 	/// * either ``
 	/// * or `<I>`
 	/// to be used when using pallet trait `Config`
-	pub fn trait_use_generics(&self) -> proc_macro2::TokenStream {
+	pub fn trait_use_generics(&self, span: proc_macro2::Span) -> proc_macro2::TokenStream {
 		if self.config.has_instance {
-			quote::quote!(<I>)
+			quote::quote_spanned!(span => <I>)
 		} else {
-			quote::quote!()
+			quote::quote_spanned!(span => )
 		}
 	}
 
 	/// Depending on if pallet is instantiable:
 	/// * either `T`
 	/// * or `T, I`
-	pub fn type_use_generics(&self) -> proc_macro2::TokenStream {
+	pub fn type_use_generics(&self, span: proc_macro2::Span) -> proc_macro2::TokenStream {
 		if self.config.has_instance {
-			quote::quote!(T, I)
+			quote::quote_spanned!(span => T, I)
 		} else {
-			quote::quote!(T)
+			quote::quote_spanned!(span => T)
 		}
 	}
 }
@@ -331,20 +335,20 @@ impl GenericKind {
 	/// Return the generic to be used when using the type.
 	///
 	/// Depending on its definition it can be: ``, `T` or `T, I`
-	pub fn type_use_gen(&self) -> proc_macro2::TokenStream {
+	pub fn type_use_gen(&self, span: proc_macro2::Span) -> proc_macro2::TokenStream {
 		match self {
 			GenericKind::None => quote::quote!(),
-			GenericKind::Config => quote::quote!(T),
-			GenericKind::ConfigAndInstance => quote::quote!(T, I),
+			GenericKind::Config => quote::quote_spanned!(span => T),
+			GenericKind::ConfigAndInstance => quote::quote_spanned!(span => T, I),
 		}
 	}
 
 	/// Return the generic to be used in `impl<..>` when implementing on the type.
-	pub fn type_impl_gen(&self) -> proc_macro2::TokenStream {
+	pub fn type_impl_gen(&self, span: proc_macro2::Span) -> proc_macro2::TokenStream {
 		match self {
 			GenericKind::None => quote::quote!(),
-			GenericKind::Config => quote::quote!(T: Config),
-			GenericKind::ConfigAndInstance => quote::quote!(T: Config<I>, I: 'static),
+			GenericKind::Config => quote::quote_spanned!(span => T: Config),
+			GenericKind::ConfigAndInstance => quote::quote_spanned!(span => T: Config<I>, I: 'static),
 		}
 	}
 
diff --git a/frame/support/procedural/src/pallet/parse/pallet_struct.rs b/frame/support/procedural/src/pallet/parse/pallet_struct.rs
index 8e7ddf27c4e7..1c979741d980 100644
--- a/frame/support/procedural/src/pallet/parse/pallet_struct.rs
+++ b/frame/support/procedural/src/pallet/parse/pallet_struct.rs
@@ -36,7 +36,9 @@ pub struct PalletStructDef {
 	/// The keyword Pallet used (contains span).
 	pub pallet: keyword::Pallet,
 	/// Whether the trait `Store` must be generated.
-	pub store: Option<(syn::Visibility, keyword::Store)>
+	pub store: Option<(syn::Visibility, keyword::Store)>,
+	/// The span of the pallet::pallet attribute.
+	pub attr_span: proc_macro2::Span,
 }
 
 /// Parse for `#[pallet::generate_store($vis trait Store)]`
@@ -64,7 +66,11 @@ impl syn::parse::Parse for PalletStructAttr {
 }
 
 impl PalletStructDef {
-	pub fn try_from(index: usize, item: &mut syn::Item) -> syn::Result<Self> {
+	pub fn try_from(
+		attr_span: proc_macro2::Span,
+		index: usize,
+		item: &mut syn::Item,
+	) -> syn::Result<Self> {
 		let item = if let syn::Item::Struct(item) = item {
 			item
 		} else {
@@ -94,6 +100,6 @@ impl PalletStructDef {
 		let mut instances = vec![];
 		instances.push(helper::check_type_def_gen_no_bounds(&item.generics, item.ident.span())?);
 
-		Ok(Self { index, instances, pallet, store })
+		Ok(Self { index, instances, pallet, store, attr_span })
 	}
 }
diff --git a/frame/support/procedural/src/pallet/parse/storage.rs b/frame/support/procedural/src/pallet/parse/storage.rs
index c744ad3b52e7..cbf252a0c073 100644
--- a/frame/support/procedural/src/pallet/parse/storage.rs
+++ b/frame/support/procedural/src/pallet/parse/storage.rs
@@ -89,6 +89,8 @@ pub struct StorageDef {
 	pub query_kind: Option<QueryKind>,
 	/// Where clause of type definition.
 	pub where_clause: Option<syn::WhereClause>,
+	/// The span of the pallet::storage attribute.
+	pub attr_span: proc_macro2::Span,
 }
 
 /// In `Foo<A, B, C>` retrieve the argument at given position, i.e. A is argument at position 0.
@@ -112,7 +114,11 @@ fn retrieve_arg(
 }
 
 impl StorageDef {
-	pub fn try_from(index: usize, item: &mut syn::Item) -> syn::Result<Self> {
+	pub fn try_from(
+		attr_span: proc_macro2::Span,
+		index: usize,
+		item: &mut syn::Item,
+	) -> syn::Result<Self> {
 		let item = if let syn::Item::Type(item) = item {
 			item
 		} else {
@@ -207,6 +213,7 @@ impl StorageDef {
 			})?;
 
 		Ok(StorageDef {
+			attr_span,
 			index,
 			vis: item.vis.clone(),
 			ident: item.ident.clone(),
diff --git a/frame/support/procedural/src/pallet/parse/type_value.rs b/frame/support/procedural/src/pallet/parse/type_value.rs
index 7d675b82e7e9..5d901e772c91 100644
--- a/frame/support/procedural/src/pallet/parse/type_value.rs
+++ b/frame/support/procedural/src/pallet/parse/type_value.rs
@@ -36,10 +36,16 @@ pub struct TypeValueDef {
 	pub instances: Vec<helper::InstanceUsage>,
 	/// The where clause of the function.
 	pub where_clause: Option<syn::WhereClause>,
+	/// The span of the pallet::type_value attribute.
+	pub attr_span: proc_macro2::Span,
 }
 
 impl TypeValueDef {
-	pub fn try_from(index: usize, item: &mut syn::Item) -> syn::Result<Self> {
+	pub fn try_from(
+		attr_span: proc_macro2::Span,
+		index: usize,
+		item: &mut syn::Item,
+	) -> syn::Result<Self> {
 		let item = if let syn::Item::Fn(item) = item {
 			item
 		} else {
@@ -88,6 +94,7 @@ impl TypeValueDef {
 		let where_clause = item.sig.generics.where_clause.clone();
 
 		Ok(TypeValueDef {
+			attr_span,
 			index,
 			is_generic,
 			vis,
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 911c060729a3..adea790a3fb0 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -1399,8 +1399,9 @@ pub mod pallet_prelude {
 ///
 /// ### Macro expansion
 ///
-/// Macro generate struct with the name of the function and its generic, and implement
-/// `Get<$ReturnType>` on it using the provided function block.
+/// Macro renames the function to some internal name, generate a struct with the original name of
+/// the function and its generic, and implement `Get<$ReturnType>` by calling the user defined
+/// function.
 ///
 /// # Genesis config: `#[pallet::genesis_config]` optional
 ///
diff --git a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.stderr b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.stderr
index 64f93cd574ed..1eaf71be1710 100644
--- a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.stderr
+++ b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.stderr
@@ -6,8 +6,8 @@ error[E0369]: binary operation `==` cannot be applied to type `&<T as pallet::Co
    |
 help: consider further restricting this bound
    |
-1  | #[frame_support::pallet] + std::cmp::PartialEq
-   |                          ^^^^^^^^^^^^^^^^^^^^^
+17 |     #[pallet::call + std::cmp::PartialEq]
+   |                    ^^^^^^^^^^^^^^^^^^^^^
 
 error[E0277]: the trait bound `<T as pallet::Config>::Bar: Clone` is not satisfied
   --> $DIR/call_argument_invalid_bound.rs:20:37
diff --git a/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr b/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr
index f0f41a75deb4..f8ba5ecdc21b 100644
--- a/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr
+++ b/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr
@@ -4,5 +4,5 @@ error[E0446]: private type `_GeneratedPrefixForStorageFoo<T>` in public interfac
 11 |     #[pallet::generate_store(pub trait Store)]
    |                                        ^^^^^ can't leak private type
 ...
-21 |     type Foo<T> = StorageValue<_, u8>;
-   |          - `_GeneratedPrefixForStorageFoo<T>` declared as private
+20 |     #[pallet::storage]
+   |               - `_GeneratedPrefixForStorageFoo<T>` declared as private
diff --git a/frame/support/test/tests/pallet_ui/type_value_forgotten_where_clause.rs b/frame/support/test/tests/pallet_ui/type_value_forgotten_where_clause.rs
new file mode 100644
index 000000000000..9c0662e3f77c
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/type_value_forgotten_where_clause.rs
@@ -0,0 +1,28 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::{Hooks, PhantomData};
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config
+	where <Self as frame_system::Config>::AccountId: From<u32>
+	{}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T>
+	where <T as frame_system::Config>::AccountId: From<u32>
+	{}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T>
+	where <T as frame_system::Config>::AccountId: From<u32>
+	{}
+
+	#[pallet::type_value] fn Foo<T: Config>() -> u32 { 3u32 }
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/type_value_forgotten_where_clause.stderr b/frame/support/test/tests/pallet_ui/type_value_forgotten_where_clause.stderr
new file mode 100644
index 000000000000..85d7342b253d
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/type_value_forgotten_where_clause.stderr
@@ -0,0 +1,47 @@
+error[E0277]: the trait bound `<T as frame_system::Config>::AccountId: From<u32>` is not satisfied
+  --> $DIR/type_value_forgotten_where_clause.rs:24:34
+   |
+7  |     pub trait Config: frame_system::Config
+   |               ------ required by a bound in this
+8  |     where <Self as frame_system::Config>::AccountId: From<u32>
+   |                                                      --------- required by this bound in `pallet::Config`
+...
+24 |     #[pallet::type_value] fn Foo<T: Config>() -> u32 { 3u32 }
+   |                                     ^^^^^^ the trait `From<u32>` is not implemented for `<T as frame_system::Config>::AccountId`
+   |
+help: consider further restricting the associated type
+   |
+24 |     #[pallet::type_value] fn Foo<T: Config>() -> u32 where <T as frame_system::Config>::AccountId: From<u32> { 3u32 }
+   |                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0277]: the trait bound `<T as frame_system::Config>::AccountId: From<u32>` is not satisfied
+  --> $DIR/type_value_forgotten_where_clause.rs:24:12
+   |
+7  |     pub trait Config: frame_system::Config
+   |               ------ required by a bound in this
+8  |     where <Self as frame_system::Config>::AccountId: From<u32>
+   |                                                      --------- required by this bound in `pallet::Config`
+...
+24 |     #[pallet::type_value] fn Foo<T: Config>() -> u32 { 3u32 }
+   |               ^^^^^^^^^^ the trait `From<u32>` is not implemented for `<T as frame_system::Config>::AccountId`
+   |
+help: consider further restricting the associated type
+   |
+24 |     #[pallet::type_value where <T as frame_system::Config>::AccountId: From<u32>] fn Foo<T: Config>() -> u32 { 3u32 }
+   |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0277]: the trait bound `<T as frame_system::Config>::AccountId: From<u32>` is not satisfied
+  --> $DIR/type_value_forgotten_where_clause.rs:24:12
+   |
+7  |     pub trait Config: frame_system::Config
+   |               ------ required by a bound in this
+8  |     where <Self as frame_system::Config>::AccountId: From<u32>
+   |                                                      --------- required by this bound in `pallet::Config`
+...
+24 |     #[pallet::type_value] fn Foo<T: Config>() -> u32 { 3u32 }
+   |               ^^^^^^^^^^ the trait `From<u32>` is not implemented for `<T as frame_system::Config>::AccountId`
+   |
+help: consider further restricting the associated type
+   |
+24 |     #[pallet::type_value] fn Foo<T: Config>() -> u32 where <T as frame_system::Config>::AccountId: From<u32> { 3u32 }
+   |                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

From 71e47d792ff9997e742b8f90e4fb3a8397f502c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Wed, 6 Jan 2021 10:45:56 +0100
Subject: [PATCH 0232/1194] Fix master build (#7837)

* Fix master build

* Use correct copyright year
---
 frame/lottery/src/benchmarking.rs | 4 +---
 frame/lottery/src/lib.rs          | 2 +-
 frame/lottery/src/mock.rs         | 2 +-
 frame/lottery/src/tests.rs        | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/frame/lottery/src/benchmarking.rs b/frame/lottery/src/benchmarking.rs
index 34a7f236c181..b9b0d7fd0002 100644
--- a/frame/lottery/src/benchmarking.rs
+++ b/frame/lottery/src/benchmarking.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -47,8 +47,6 @@ fn setup_lottery<T: Config>(repeat: bool) -> Result<(), &'static str> {
 }
 
 benchmarks! {
-	_ { }
-
 	buy_ticket {
 		let caller = whitelisted_caller();
 		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
diff --git a/frame/lottery/src/lib.rs b/frame/lottery/src/lib.rs
index b8568ad269f5..11543d67b316 100644
--- a/frame/lottery/src/lib.rs
+++ b/frame/lottery/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/lottery/src/mock.rs b/frame/lottery/src/mock.rs
index 67ecb6cbb63a..0f25e9fc7fac 100644
--- a/frame/lottery/src/mock.rs
+++ b/frame/lottery/src/mock.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/frame/lottery/src/tests.rs b/frame/lottery/src/tests.rs
index 69a8a1267dd4..03c542d5000d 100644
--- a/frame/lottery/src/tests.rs
+++ b/frame/lottery/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");

From 89275433863532d797318b75bb5321af098fea7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Wed, 6 Jan 2021 11:08:29 +0000
Subject: [PATCH 0233/1194] babe: expose next epoch data (#7829)

* babe: expose next epoch data

* babe: add runtime api for next_epoch

* babe: avoid reading next authorities from storage unnecessarily

* babe: add notes about epoch duration constraints

* babe: guard against overflow

* babe: add test for fetching current and next epoch data
---
 bin/node/runtime/src/lib.rs          |  4 +++
 frame/babe/src/lib.rs                | 43 +++++++++++++++++++++++++++-
 frame/babe/src/mock.rs               |  2 +-
 frame/babe/src/tests.rs              | 31 ++++++++++++++++++--
 primitives/consensus/babe/src/lib.rs |  4 +++
 test-utils/runtime/src/lib.rs        |  8 ++++++
 6 files changed, 88 insertions(+), 4 deletions(-)

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 2afa89f86c02..fa07cf1bd8e9 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -1180,6 +1180,10 @@ impl_runtime_apis! {
 			Babe::current_epoch()
 		}
 
+		fn next_epoch() -> sp_consensus_babe::Epoch {
+			Babe::next_epoch()
+		}
+
 		fn generate_key_ownership_proof(
 			_slot_number: sp_consensus_babe::SlotNumber,
 			authority_id: sp_consensus_babe::AuthorityId,
diff --git a/frame/babe/src/lib.rs b/frame/babe/src/lib.rs
index d7da96a3ddd9..79b87cd5c018 100644
--- a/frame/babe/src/lib.rs
+++ b/frame/babe/src/lib.rs
@@ -64,6 +64,8 @@ pub use equivocation::{BabeEquivocationOffence, EquivocationHandler, HandleEquiv
 
 pub trait Config: pallet_timestamp::Config {
 	/// The amount of time, in slots, that each epoch should last.
+	/// NOTE: Currently it is not possible to change the epoch duration after
+	/// the chain has started. Attempting to do so will brick block production.
 	type EpochDuration: Get<SlotNumber>;
 
 	/// The expected average block time at which BABE should be creating
@@ -192,6 +194,9 @@ decl_storage! {
 		/// Next epoch randomness.
 		NextRandomness: schnorrkel::Randomness;
 
+		/// Next epoch authorities.
+		NextAuthorities: Vec<(AuthorityId, BabeAuthorityWeight)>;
+
 		/// Randomness under construction.
 		///
 		/// We make a tradeoff between storage accesses and list length.
@@ -233,6 +238,9 @@ decl_module! {
 	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		/// The number of **slots** that an epoch takes. We couple sessions to
 		/// epochs, i.e. we start a new session once the new epoch begins.
+		/// NOTE: Currently it is not possible to change the epoch duration
+		/// after the chain has started. Attempting to do so will brick block
+		/// production.
 		const EpochDuration: u64 = T::EpochDuration::get();
 
 		/// The expected average block time at which BABE should be creating
@@ -464,6 +472,9 @@ impl<T: Config> Module<T> {
 		let randomness = Self::randomness_change_epoch(next_epoch_index);
 		Randomness::put(randomness);
 
+		// Update the next epoch authorities.
+		NextAuthorities::put(&next_authorities);
+
 		// After we update the current epoch, we signal the *next* epoch change
 		// so that nodes can track changes.
 		let next_randomness = NextRandomness::get();
@@ -483,7 +494,7 @@ impl<T: Config> Module<T> {
 	// give correct results after `do_initialize` of the first block
 	// in the chain (as its result is based off of `GenesisSlot`).
 	pub fn current_epoch_start() -> SlotNumber {
-		(EpochIndex::get() * T::EpochDuration::get()) + GenesisSlot::get()
+		Self::epoch_start(EpochIndex::get())
 	}
 
 	/// Produces information about the current epoch.
@@ -497,6 +508,36 @@ impl<T: Config> Module<T> {
 		}
 	}
 
+	/// Produces information about the next epoch (which was already previously
+	/// announced).
+	pub fn next_epoch() -> Epoch {
+		let next_epoch_index = EpochIndex::get().checked_add(1).expect(
+			"epoch index is u64; it is always only incremented by one; \
+			 if u64 is not enough we should crash for safety; qed.",
+		);
+
+		Epoch {
+			epoch_index: next_epoch_index,
+			start_slot: Self::epoch_start(next_epoch_index),
+			duration: T::EpochDuration::get(),
+			authorities: NextAuthorities::get(),
+			randomness: NextRandomness::get(),
+		}
+	}
+
+	fn epoch_start(epoch_index: u64) -> SlotNumber {
+		// (epoch_index * epoch_duration) + genesis_slot
+
+		const PROOF: &str = "slot number is u64; it should relate in some way to wall clock time; \
+							 if u64 is not enough we should crash for safety; qed.";
+
+		let epoch_start = epoch_index
+			.checked_mul(T::EpochDuration::get())
+			.expect(PROOF);
+
+		epoch_start.checked_add(GenesisSlot::get()).expect(PROOF)
+	}
+
 	fn deposit_consensus<U: Encode>(new: U) {
 		let log: DigestItem<T::Hash> = DigestItem::Consensus(BABE_ENGINE_ID, new.encode());
 		<frame_system::Module<T>>::deposit_log(log.into())
diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index d29e467b7919..58e2af873fd9 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -295,7 +295,7 @@ pub fn start_era(era_index: EraIndex) {
 	assert_eq!(Staking::current_era(), Some(era_index));
 }
 
-pub fn make_pre_digest(
+pub fn make_primary_pre_digest(
 	authority_index: sp_consensus_babe::AuthorityIndex,
 	slot_number: sp_consensus_babe::SlotNumber,
 	vrf_output: VRFOutput,
diff --git a/frame/babe/src/tests.rs b/frame/babe/src/tests.rs
index 0d0536359f61..4bef98873444 100644
--- a/frame/babe/src/tests.rs
+++ b/frame/babe/src/tests.rs
@@ -66,7 +66,7 @@ fn first_block_epoch_zero_start() {
 		let (vrf_output, vrf_proof, vrf_randomness) = make_vrf_output(genesis_slot, &pairs[0]);
 
 		let first_vrf = vrf_output;
-		let pre_digest = make_pre_digest(
+		let pre_digest = make_primary_pre_digest(
 			0,
 			genesis_slot,
 			first_vrf.clone(),
@@ -122,7 +122,7 @@ fn author_vrf_output_for_primary() {
 	ext.execute_with(|| {
 		let genesis_slot = 10;
 		let (vrf_output, vrf_proof, vrf_randomness) = make_vrf_output(genesis_slot, &pairs[0]);
-		let primary_pre_digest = make_pre_digest(0, genesis_slot, vrf_output, vrf_proof);
+		let primary_pre_digest = make_primary_pre_digest(0, genesis_slot, vrf_output, vrf_proof);
 
 		System::initialize(
 			&1,
@@ -252,6 +252,33 @@ fn can_enact_next_config() {
 	});
 }
 
+#[test]
+fn can_fetch_current_and_next_epoch_data() {
+	new_test_ext(5).execute_with(|| {
+		// 1 era = 3 epochs
+		// 1 epoch = 3 slots
+		// Eras start from 0.
+		// Therefore at era 1 we should be starting epoch 3 with slot 10.
+		start_era(1);
+
+		let current_epoch = Babe::current_epoch();
+		assert_eq!(current_epoch.epoch_index, 3);
+		assert_eq!(current_epoch.start_slot, 10);
+		assert_eq!(current_epoch.authorities.len(), 5);
+
+		let next_epoch = Babe::next_epoch();
+		assert_eq!(next_epoch.epoch_index, 4);
+		assert_eq!(next_epoch.start_slot, 13);
+		assert_eq!(next_epoch.authorities.len(), 5);
+
+		// the on-chain randomness should always change across epochs
+		assert!(current_epoch.randomness != next_epoch.randomness);
+
+		// but in this case the authorities stay the same
+		assert!(current_epoch.authorities == next_epoch.authorities);
+	});
+}
+
 #[test]
 fn report_equivocation_current_session_works() {
 	let (pairs, mut ext) = new_test_ext_with_pairs(3);
diff --git a/primitives/consensus/babe/src/lib.rs b/primitives/consensus/babe/src/lib.rs
index 84915c3e71e2..6ecc21ab7a11 100644
--- a/primitives/consensus/babe/src/lib.rs
+++ b/primitives/consensus/babe/src/lib.rs
@@ -382,6 +382,10 @@ sp_api::decl_runtime_apis! {
 		/// Returns information regarding the current epoch.
 		fn current_epoch() -> Epoch;
 
+		/// Returns information regarding the next epoch (which was already
+		/// previously announced).
+		fn next_epoch() -> Epoch;
+
 		/// Generates a proof of key ownership for the given authority in the
 		/// current epoch. An example usage of this module is coupled with the
 		/// session historical module to prove that a given authority key is
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index f7bff6930217..115083d90cc6 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -741,6 +741,10 @@ cfg_if! {
 					<pallet_babe::Module<Runtime>>::current_epoch()
 				}
 
+				fn next_epoch() -> sp_consensus_babe::Epoch {
+					<pallet_babe::Module<Runtime>>::next_epoch()
+				}
+
 				fn submit_report_equivocation_unsigned_extrinsic(
 					_equivocation_proof: sp_consensus_babe::EquivocationProof<
 						<Block as BlockT>::Header,
@@ -996,6 +1000,10 @@ cfg_if! {
 					<pallet_babe::Module<Runtime>>::current_epoch()
 				}
 
+				fn next_epoch() -> sp_consensus_babe::Epoch {
+					<pallet_babe::Module<Runtime>>::next_epoch()
+				}
+
 				fn submit_report_equivocation_unsigned_extrinsic(
 					_equivocation_proof: sp_consensus_babe::EquivocationProof<
 						<Block as BlockT>::Header,

From 762f4b0242bb9d14fa0df5b6a1a3a64b005268e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Wed, 6 Jan 2021 16:47:22 +0100
Subject: [PATCH 0234/1194] contracts: Add configurable per-storage item cost
 (#7819)

* Rework rent parameters

* No need for empty_pair_count any longer

* Parameterize runtime
---
 bin/node/runtime/src/lib.rs             | 19 ++++---
 frame/contracts/src/benchmarking/mod.rs |  7 +--
 frame/contracts/src/lib.rs              | 70 ++++++++++++++++---------
 frame/contracts/src/rent.rs             | 27 ++++------
 frame/contracts/src/storage.rs          | 30 +++--------
 frame/contracts/src/tests.rs            | 62 +++++++++-------------
 6 files changed, 103 insertions(+), 112 deletions(-)

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index fa07cf1bd8e9..3e6452465831 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -709,13 +709,17 @@ impl pallet_tips::Config for Runtime {
 }
 
 parameter_types! {
-	pub const TombstoneDeposit: Balance = 16 * MILLICENTS;
-	pub const RentByteFee: Balance = 4 * MILLICENTS;
-	pub const RentDepositOffset: Balance = 1000 * MILLICENTS;
+	pub const TombstoneDeposit: Balance = deposit(
+		1,
+		sp_std::mem::size_of::<pallet_contracts::ContractInfo<Runtime>>() as u32
+	);
+	pub const DepositPerContract: Balance = TombstoneDeposit::get();
+	pub const DepositPerStorageByte: Balance = deposit(0, 1);
+	pub const DepositPerStorageItem: Balance = deposit(1, 0);
+	pub RentFraction: Perbill = Perbill::from_rational_approximation(1u32, 30 * DAYS);
 	pub const SurchargeReward: Balance = 150 * MILLICENTS;
 	pub const SignedClaimHandicap: u32 = 2;
 	pub const MaxDepth: u32 = 32;
-	pub const StorageSizeOffset: u32 = 8;
 	pub const MaxValueSize: u32 = 16 * 1024;
 	// The lazy deletion runs inside on_initialize.
 	pub DeletionWeightLimit: Weight = AVERAGE_ON_INITIALIZE_RATIO *
@@ -736,9 +740,10 @@ impl pallet_contracts::Config for Runtime {
 	type RentPayment = ();
 	type SignedClaimHandicap = SignedClaimHandicap;
 	type TombstoneDeposit = TombstoneDeposit;
-	type StorageSizeOffset = StorageSizeOffset;
-	type RentByteFee = RentByteFee;
-	type RentDepositOffset = RentDepositOffset;
+	type DepositPerContract = DepositPerContract;
+	type DepositPerStorageByte = DepositPerStorageByte;
+	type DepositPerStorageItem = DepositPerStorageItem;
+	type RentFraction = RentFraction;
 	type SurchargeReward = SurchargeReward;
 	type MaxDepth = MaxDepth;
 	type MaxValueSize = MaxValueSize;
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index 9fa365116c7a..393b0f60875b 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -116,12 +116,13 @@ where
 				// the subsistence threshold does not pay rent given a large enough subsistence
 				// threshold. But we need rent payments to occur in order to benchmark for worst cases.
 				let storage_size = ConfigCache::<T>::subsistence_threshold_uncached()
-					.checked_div(&T::RentDepositOffset::get())
+					.checked_div(&T::DepositPerStorageByte::get())
 					.unwrap_or_else(Zero::zero);
 
 				// Endowment should be large but not as large to inhibit rent payments.
-				let endowment = T::RentDepositOffset::get()
-					.saturating_mul(storage_size + T::StorageSizeOffset::get().into())
+				let endowment = T::DepositPerStorageByte::get()
+					.saturating_mul(storage_size)
+					.saturating_add(T::DepositPerContract::get())
 					.saturating_sub(1u32.into());
 
 				(storage_size, endowment)
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index 7b919fe2172e..2e9b934e4dc1 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -115,7 +115,7 @@ use sp_runtime::{
 	traits::{
 		Hash, StaticLookup, Zero, MaybeSerializeDeserialize, Member, Convert, Saturating,
 	},
-	RuntimeDebug,
+	RuntimeDebug, Perbill,
 };
 use frame_support::{
 	decl_module, decl_event, decl_storage, decl_error, ensure,
@@ -205,11 +205,8 @@ pub struct RawAliveContractInfo<CodeHash, Balance, BlockNumber> {
 	///
 	/// It is a sum of each key-value pair stored by this contract.
 	pub storage_size: u32,
-	/// The number of key-value pairs that have values of zero length.
-	/// The condition `empty_pair_count ≤ total_pair_count` always holds.
-	pub empty_pair_count: u32,
 	/// The total number of key-value pairs in storage of this contract.
-	pub total_pair_count: u32,
+	pub pair_count: u32,
 	/// The code associated with a given account.
 	pub code_hash: CodeHash,
 	/// Pay rent at most up to this value.
@@ -286,24 +283,35 @@ pub trait Config: frame_system::Config {
 	/// The minimum amount required to generate a tombstone.
 	type TombstoneDeposit: Get<BalanceOf<Self>>;
 
-	/// A size offset for an contract. A just created account with untouched storage will have that
-	/// much of storage from the perspective of the state rent.
+	/// The balance every contract needs to deposit to stay alive indefinitely.
+	///
+	/// This is different from the [`Self::TombstoneDeposit`] because this only needs to be
+	/// deposited while the contract is alive. Costs for additional storage are added to
+	/// this base cost.
 	///
 	/// This is a simple way to ensure that contracts with empty storage eventually get deleted by
 	/// making them pay rent. This creates an incentive to remove them early in order to save rent.
-	type StorageSizeOffset: Get<u32>;
-
-	/// Price of a byte of storage per one block interval. Should be greater than 0.
-	type RentByteFee: Get<BalanceOf<Self>>;
+	type DepositPerContract: Get<BalanceOf<Self>>;
 
-	/// The amount of funds a contract should deposit in order to offset
-	/// the cost of one byte.
+	/// The balance a contract needs to deposit per storage byte to stay alive indefinitely.
 	///
 	/// Let's suppose the deposit is 1,000 BU (balance units)/byte and the rent is 1 BU/byte/day,
 	/// then a contract with 1,000,000 BU that uses 1,000 bytes of storage would pay no rent.
 	/// But if the balance reduced to 500,000 BU and the storage stayed the same at 1,000,
 	/// then it would pay 500 BU/day.
-	type RentDepositOffset: Get<BalanceOf<Self>>;
+	type DepositPerStorageByte: Get<BalanceOf<Self>>;
+
+	/// The balance a contract needs to deposit per storage item to stay alive indefinitely.
+	///
+	/// It works the same as [`Self::DepositPerStorageByte`] but for storage items.
+	type DepositPerStorageItem: Get<BalanceOf<Self>>;
+
+	/// The fraction of the deposit that should be used as rent per block.
+	///
+	/// When a contract hasn't enough balance deposited to stay alive indefinitely it needs
+	/// to pay per block for the storage it consumes that is not covered by the deposit.
+	/// This determines how high this rent payment is per block as a fraction of the deposit.
+	type RentFraction: Get<Perbill>;
 
 	/// Reward that is received by the party whose touch has led
 	/// to removal of a contract.
@@ -435,25 +443,35 @@ decl_module! {
 		/// The minimum amount required to generate a tombstone.
 		const TombstoneDeposit: BalanceOf<T> = T::TombstoneDeposit::get();
 
-		/// A size offset for an contract. A just created account with untouched storage will have that
-		/// much of storage from the perspective of the state rent.
+		/// The balance every contract needs to deposit to stay alive indefinitely.
 		///
-		/// This is a simple way to ensure that contracts with empty storage eventually get deleted
-		/// by making them pay rent. This creates an incentive to remove them early in order to save
-		/// rent.
-		const StorageSizeOffset: u32 = T::StorageSizeOffset::get();
-
-		/// Price of a byte of storage per one block interval. Should be greater than 0.
-		const RentByteFee: BalanceOf<T> = T::RentByteFee::get();
+		/// This is different from the [`Self::TombstoneDeposit`] because this only needs to be
+		/// deposited while the contract is alive. Costs for additional storage are added to
+		/// this base cost.
+		///
+		/// This is a simple way to ensure that contracts with empty storage eventually get deleted by
+		/// making them pay rent. This creates an incentive to remove them early in order to save rent.
+		const DepositPerContract: BalanceOf<T> = T::DepositPerContract::get();
 
-		/// The amount of funds a contract should deposit in order to offset
-		/// the cost of one byte.
+		/// The balance a contract needs to deposit per storage byte to stay alive indefinitely.
 		///
 		/// Let's suppose the deposit is 1,000 BU (balance units)/byte and the rent is 1 BU/byte/day,
 		/// then a contract with 1,000,000 BU that uses 1,000 bytes of storage would pay no rent.
 		/// But if the balance reduced to 500,000 BU and the storage stayed the same at 1,000,
 		/// then it would pay 500 BU/day.
-		const RentDepositOffset: BalanceOf<T> = T::RentDepositOffset::get();
+		const DepositPerStorageByte: BalanceOf<T> = T::DepositPerStorageByte::get();
+
+		/// The balance a contract needs to deposit per storage item to stay alive indefinitely.
+		///
+		/// It works the same as [`Self::DepositPerStorageByte`] but for storage items.
+		const DepositPerStorageItem: BalanceOf<T> = T::DepositPerStorageItem::get();
+
+		/// The fraction of the deposit that should be used as rent per block.
+		///
+		/// When a contract hasn't enough balance deposited to stay alive indefinitely it needs
+		/// to pay per block for the storage it consumes that is not covered by the deposit.
+		/// This determines how high this rent payment is per block as a fraction of the deposit.
+		const RentFraction: Perbill = T::RentFraction::get();
 
 		/// Reward that is received by the party whose touch has led
 		/// to removal of a contract.
diff --git a/frame/contracts/src/rent.rs b/frame/contracts/src/rent.rs
index f30b25b447a2..c67776c9e109 100644
--- a/frame/contracts/src/rent.rs
+++ b/frame/contracts/src/rent.rs
@@ -101,21 +101,15 @@ where
 		free_balance: &BalanceOf<T>,
 		contract: &AliveContractInfo<T>
 	) -> BalanceOf<T> {
-		let free_storage = free_balance
-			.checked_div(&T::RentDepositOffset::get())
-			.unwrap_or_else(Zero::zero);
-
-		// For now, we treat every empty KV pair as if it was one byte long.
-		let empty_pairs_equivalent = contract.empty_pair_count;
-
-		let effective_storage_size = <BalanceOf<T>>::from(
-			contract.storage_size + T::StorageSizeOffset::get() + empty_pairs_equivalent,
-		)
-		.saturating_sub(free_storage);
-
-		effective_storage_size
-			.checked_mul(&T::RentByteFee::get())
-			.unwrap_or_else(|| <BalanceOf<T>>::max_value())
+		let uncovered_by_balance = T::DepositPerStorageByte::get()
+			.saturating_mul(contract.storage_size.into())
+			.saturating_add(
+				T::DepositPerStorageItem::get()
+					.saturating_mul(contract.pair_count.into())
+			)
+			.saturating_add(T::DepositPerContract::get())
+			.saturating_sub(*free_balance);
+		T::RentFraction::get().mul_ceil(uncovered_by_balance)
 	}
 
 	/// Returns amount of funds available to consume by rent mechanism.
@@ -484,8 +478,7 @@ where
 		<ContractInfoOf<T>>::insert(&dest, ContractInfo::Alive(AliveContractInfo::<T> {
 			trie_id: origin_contract.trie_id,
 			storage_size: origin_contract.storage_size,
-			empty_pair_count: origin_contract.empty_pair_count,
-			total_pair_count: origin_contract.total_pair_count,
+			pair_count: origin_contract.pair_count,
 			code_hash,
 			rent_allowance,
 			deduct_block: current_block,
diff --git a/frame/contracts/src/storage.rs b/frame/contracts/src/storage.rs
index 520a114986f4..282c1acc0709 100644
--- a/frame/contracts/src/storage.rs
+++ b/frame/contracts/src/storage.rs
@@ -102,27 +102,14 @@ where
 
 		// Update the total number of KV pairs and the number of empty pairs.
 		match (&opt_prev_value, &opt_new_value) {
-			(Some(prev_value), None) => {
-				new_info.total_pair_count -= 1;
-				if prev_value.is_empty() {
-					new_info.empty_pair_count -= 1;
-				}
+			(Some(_), None) => {
+				new_info.pair_count -= 1;
 			},
-			(None, Some(new_value)) => {
-				new_info.total_pair_count += 1;
-				if new_value.is_empty() {
-					new_info.empty_pair_count += 1;
-				}
+			(None, Some(_)) => {
+				new_info.pair_count += 1;
 			},
-			(Some(prev_value), Some(new_value)) => {
-				if prev_value.is_empty() {
-					new_info.empty_pair_count -= 1;
-				}
-				if new_value.is_empty() {
-					new_info.empty_pair_count += 1;
-				}
-			}
-			(None, None) => {}
+			(Some(_), Some(_)) => {},
+			(None, None) => {},
 		}
 
 		// Update the total storage size.
@@ -197,8 +184,7 @@ where
 					trie_id,
 					deduct_block: <frame_system::Module<T>>::block_number(),
 					rent_allowance: <BalanceOf<T>>::max_value(),
-					empty_pair_count: 0,
-					total_pair_count: 0,
+					pair_count: 0,
 					last_write: None,
 				}
 				.into(),
@@ -217,7 +203,7 @@ where
 			Err(Error::<T>::DeletionQueueFull.into())
 		} else {
 			DeletionQueue::append(DeletedContract {
-				pair_count: contract.total_pair_count,
+				pair_count: contract.pair_count,
 				trie_id: contract.trie_id.clone(),
 			});
 			Ok(())
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index d1a9521924f7..9021e9677d76 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -30,7 +30,7 @@ use codec::Encode;
 use sp_runtime::{
 	traits::{BlakeTwo256, Hash, IdentityLookup, Convert},
 	testing::{Header, H256},
-	AccountId32,
+	AccountId32, Perbill,
 };
 use sp_io::hashing::blake2_256;
 use frame_support::{
@@ -239,9 +239,10 @@ impl pallet_timestamp::Config for Test {
 parameter_types! {
 	pub const SignedClaimHandicap: u64 = 2;
 	pub const TombstoneDeposit: u64 = 16;
-	pub const StorageSizeOffset: u32 = 8;
-	pub const RentByteFee: u64 = 4;
-	pub const RentDepositOffset: u64 = 10_000;
+	pub const DepositPerContract: u64 = 8 * DepositPerStorageByte::get();
+	pub const DepositPerStorageByte: u64 = 10_000;
+	pub const DepositPerStorageItem: u64 = 10_000;
+	pub RentFraction: Perbill = Perbill::from_rational_approximation(4u32, 10_000u32);
 	pub const SurchargeReward: u64 = 150;
 	pub const MaxDepth: u32 = 100;
 	pub const MaxValueSize: u32 = 16_384;
@@ -267,9 +268,10 @@ impl Config for Test {
 	type RentPayment = ();
 	type SignedClaimHandicap = SignedClaimHandicap;
 	type TombstoneDeposit = TombstoneDeposit;
-	type StorageSizeOffset = StorageSizeOffset;
-	type RentByteFee = RentByteFee;
-	type RentDepositOffset = RentDepositOffset;
+	type DepositPerContract = DepositPerContract;
+	type DepositPerStorageByte = DepositPerStorageByte;
+	type DepositPerStorageItem = DepositPerStorageItem;
+	type RentFraction = RentFraction;
 	type SurchargeReward = SurchargeReward;
 	type MaxDepth = MaxDepth;
 	type MaxValueSize = MaxValueSize;
@@ -384,8 +386,7 @@ fn account_removal_does_not_remove_storage() {
 			let alice_contract_info = ContractInfo::Alive(RawAliveContractInfo {
 				trie_id: trie_id1.clone(),
 				storage_size: 0,
-				empty_pair_count: 0,
-				total_pair_count: 0,
+				pair_count: 0,
 				deduct_block: System::block_number(),
 				code_hash: H256::repeat_byte(1),
 				rent_allowance: 40,
@@ -399,8 +400,7 @@ fn account_removal_does_not_remove_storage() {
 			let bob_contract_info = ContractInfo::Alive(RawAliveContractInfo {
 				trie_id: trie_id2.clone(),
 				storage_size: 0,
-				empty_pair_count: 0,
-				total_pair_count: 0,
+				pair_count: 0,
 				deduct_block: System::block_number(),
 				code_hash: H256::repeat_byte(2),
 				rent_allowance: 40,
@@ -690,13 +690,9 @@ fn storage_size() {
 				4
 			);
 			assert_eq!(
-				bob_contract.total_pair_count,
+				bob_contract.pair_count,
 				1,
 			);
-			assert_eq!(
-				bob_contract.empty_pair_count,
-				0,
-			);
 
 			assert_ok!(Contracts::call(
 				Origin::signed(ALICE),
@@ -714,13 +710,9 @@ fn storage_size() {
 				4 + 4
 			);
 			assert_eq!(
-				bob_contract.total_pair_count,
+				bob_contract.pair_count,
 				2,
 			);
-			assert_eq!(
-				bob_contract.empty_pair_count,
-				0,
-			);
 
 			assert_ok!(Contracts::call(
 				Origin::signed(ALICE),
@@ -738,13 +730,9 @@ fn storage_size() {
 				4
 			);
 			assert_eq!(
-				bob_contract.total_pair_count,
+				bob_contract.pair_count,
 				1,
 			);
-			assert_eq!(
-				bob_contract.empty_pair_count,
-				0,
-			);
 		});
 }
 
@@ -776,11 +764,7 @@ fn empty_kv_pairs() {
 				0,
 			);
 			assert_eq!(
-				bob_contract.total_pair_count,
-				1,
-			);
-			assert_eq!(
-				bob_contract.empty_pair_count,
+				bob_contract.pair_count,
 				1,
 			);
 		});
@@ -828,9 +812,11 @@ fn deduct_blocks() {
 			);
 
 			// Check result
-			let rent = (8 + 4 - 3) // storage size = size_offset + deploy_set_storage - deposit_offset
-				* 4 // rent byte price
-				* 4; // blocks to rent
+			let rent = <Test as Config>::RentFraction::get()
+				// base_deposit + deploy_set_storage (4 bytes in 1 item) - free_balance
+				.mul_ceil(80_000 + 40_000 + 10_000 - 30_000)
+				// blocks to rent
+				* 4;
 			let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
 			assert_eq!(bob_contract.rent_allowance, 1_000 - rent);
 			assert_eq!(bob_contract.deduct_block, 5);
@@ -845,9 +831,11 @@ fn deduct_blocks() {
 			);
 
 			// Check result
-			let rent_2 = (8 + 4 - 2) // storage size = size_offset + deploy_set_storage - deposit_offset
-				* 4 // rent byte price
-				* 7; // blocks to rent
+			let rent_2 = <Test as Config>::RentFraction::get()
+				// base_deposit + deploy_set_storage (4 bytes in 1 item) - free_balance
+				.mul_ceil(80_000 + 40_000 + 10_000 - (30_000 - rent))
+				// blocks to rent
+				* 7;
 			let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
 			assert_eq!(bob_contract.rent_allowance, 1_000 - rent - rent_2);
 			assert_eq!(bob_contract.deduct_block, 12);

From e5e7606fa54175dfc424b7ca90d60b07a3c3f026 Mon Sep 17 00:00:00 2001
From: Andronik Ordian <write@reusable.software>
Date: Wed, 6 Jan 2021 17:12:17 +0100
Subject: [PATCH 0235/1194] upgrade a few dependencies (#7831)

* upgrade a few dependencies

* make it compile at the expense of duplicate deps

* fix web-wasm and a warning

* introduce activate-wasm-bindgen-features crate

* Revert "introduce activate-wasm-bindgen-features crate"

This reverts commit 5a6e41e683f8a4844c0a735dcd08caabb2313f11.

* add getrandom feature to sc-consensus-aura
---
 .gitlab-ci.yml                                |   9 +-
 Cargo.lock                                    | 280 +++++++++++-------
 bin/node/bench/Cargo.toml                     |   6 +-
 bin/node/cli/Cargo.toml                       |   2 +-
 client/api/Cargo.toml                         |   6 +-
 client/basic-authorship/Cargo.toml            |   2 +-
 client/chain-spec/Cargo.toml                  |   2 +-
 client/consensus/aura/Cargo.toml              |   5 +-
 client/consensus/babe/Cargo.toml              |   2 +-
 client/consensus/epochs/Cargo.toml            |   2 +-
 client/consensus/manual-seal/Cargo.toml       |   2 +-
 client/consensus/pow/Cargo.toml               |   2 +-
 client/consensus/slots/Cargo.toml             |   2 +-
 client/db/Cargo.toml                          |  12 +-
 client/executor/Cargo.toml                    |   2 +-
 client/finality-grandpa/Cargo.toml            |   2 +-
 client/informant/Cargo.toml                   |   2 +-
 client/keystore/Cargo.toml                    |   2 +-
 client/light/Cargo.toml                       |   2 +-
 client/network/test/Cargo.toml                |   2 +-
 client/offchain/Cargo.toml                    |   2 +-
 client/rpc-api/Cargo.toml                     |   2 +-
 client/rpc/Cargo.toml                         |   2 +-
 client/service/Cargo.toml                     |   4 +-
 client/service/test/Cargo.toml                |   2 +-
 client/state-db/Cargo.toml                    |   4 +-
 client/telemetry/Cargo.toml                   |   2 +-
 client/tracing/Cargo.toml                     |   2 +-
 client/transaction-pool/Cargo.toml            |   4 +-
 client/transaction-pool/graph/Cargo.toml      |   4 +-
 frame/aura/Cargo.toml                         |   2 +-
 frame/authorship/Cargo.toml                   |   2 +-
 frame/session/Cargo.toml                      |   2 +-
 frame/staking/Cargo.toml                      |   2 +-
 frame/support/Cargo.toml                      |   4 +-
 frame/system/Cargo.toml                       |   2 +-
 frame/system/benches/bench.rs                 |   2 +-
 frame/timestamp/Cargo.toml                    |   2 +-
 frame/treasury/Cargo.toml                     |   2 +-
 primitives/arithmetic/Cargo.toml              |   2 +-
 primitives/arithmetic/fuzzer/Cargo.toml       |   2 +-
 primitives/blockchain/Cargo.toml              |   2 +-
 primitives/consensus/common/Cargo.toml        |   2 +-
 primitives/core/Cargo.toml                    |   6 +-
 primitives/database/Cargo.toml                |   4 +-
 primitives/inherents/Cargo.toml               |   2 +-
 primitives/io/Cargo.toml                      |   2 +-
 primitives/keystore/Cargo.toml                |   2 +-
 primitives/runtime-interface/Cargo.toml       |   4 +-
 primitives/runtime/Cargo.toml                 |   4 +-
 primitives/state-machine/Cargo.toml           |   4 +-
 primitives/test-primitives/Cargo.toml         |   2 +-
 primitives/timestamp/Cargo.toml               |   2 +-
 primitives/trie/Cargo.toml                    |   6 +-
 primitives/wasm-interface/Cargo.toml          |   2 +-
 test-utils/runtime/Cargo.toml                 |   6 +-
 .../runtime/transaction-pool/Cargo.toml       |   2 +-
 utils/browser/Cargo.toml                      |   4 +-
 58 files changed, 253 insertions(+), 201 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 62e438645e10..5d5a74f30535 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -303,13 +303,8 @@ check-web-wasm:
   script:
     # WASM support is in progress. As more and more crates support WASM, we
     # should add entries here. See https://github.com/paritytech/substrate/issues/2416
-    - time cargo build --target=wasm32-unknown-unknown -p sp-io
-    - time cargo build --target=wasm32-unknown-unknown -p sp-runtime
-    - time cargo build --target=wasm32-unknown-unknown -p sp-std
-    - time cargo build --target=wasm32-unknown-unknown -p sc-consensus-aura
-    - time cargo build --target=wasm32-unknown-unknown -p sc-consensus-babe
-    - time cargo build --target=wasm32-unknown-unknown -p sp-consensus
-    - time cargo build --target=wasm32-unknown-unknown -p sc-telemetry
+    # Note: we don't need to test crates imported in `bin/node/cli`
+    - time cargo build --manifest-path=client/consensus/aura/Cargo.toml --target=wasm32-unknown-unknown --features getrandom
     # Note: the command below is a bit weird because several Cargo issues prevent us from compiling the node in a more straight-forward way.
     - time cargo +nightly build --manifest-path=bin/node/cli/Cargo.toml --no-default-features --features browser --target=wasm32-unknown-unknown -Z features=itarget
     # with-tracing must be explicitly activated, we run a test to ensure this works as expected in both cases
diff --git a/Cargo.lock b/Cargo.lock
index 23beb5a3ef3f..df1ab73b63c3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -79,12 +79,6 @@ dependencies = [
  "opaque-debug 0.3.0",
 ]
 
-[[package]]
-name = "ahash"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217"
-
 [[package]]
 name = "ahash"
 version = "0.4.6"
@@ -1503,12 +1497,12 @@ dependencies = [
 
 [[package]]
 name = "fixed-hash"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11498d382790b7a8f2fd211780bec78619bba81cdad3a283997c0c41f836759c"
+checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c"
 dependencies = [
  "byteorder",
- "rand 0.7.3",
+ "rand 0.8.1",
  "rustc-hex",
  "static_assertions",
 ]
@@ -1633,7 +1627,7 @@ dependencies = [
  "frame-metadata",
  "frame-support-procedural",
  "frame-system",
- "impl-trait-for-tuples",
+ "impl-trait-for-tuples 0.2.0",
  "log",
  "once_cell",
  "parity-scale-codec",
@@ -1711,7 +1705,7 @@ version = "2.0.0"
 dependencies = [
  "criterion",
  "frame-support",
- "impl-trait-for-tuples",
+ "impl-trait-for-tuples 0.2.0",
  "parity-scale-codec",
  "serde",
  "sp-core",
@@ -2017,6 +2011,19 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4060f4657be78b8e766215b02b18a2e862d83745545de804638e2b545e81aee6"
+dependencies = [
+ "cfg-if 1.0.0",
+ "js-sys",
+ "libc",
+ "wasi 0.10.0+wasi-snapshot-preview1",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "ghash"
 version = "0.3.0"
@@ -2148,23 +2155,13 @@ dependencies = [
  "crunchy",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25"
-dependencies = [
- "ahash 0.3.8",
- "autocfg 1.0.1",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
 dependencies = [
- "ahash 0.4.6",
+ "ahash",
 ]
 
 [[package]]
@@ -2470,6 +2467,17 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "impl-trait-for-tuples"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f65a8ecf74feeacdab8d38cb129e550ca871cccaa7d1921d8636ecd75534903"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "indexmap"
 version = "1.6.0"
@@ -2477,7 +2485,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55e2e4c765aa53a0424761bf9f41aa7a6ac1efa87238f59560640e27fca028f2"
 dependencies = [
  "autocfg 1.0.1",
- "hashbrown 0.9.1",
+ "hashbrown",
  "serde",
 ]
 
@@ -2488,6 +2496,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb1fc4429a33e1f80d41dc9fea4d108a88bec1de8053878898ae448a0b52f613"
 dependencies = [
  "cfg-if 1.0.0",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
 ]
 
 [[package]]
@@ -2565,9 +2576,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.45"
+version = "0.3.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca059e81d9486668f12d455a4ea6daa600bd408134cd17e3d3fb5a32d1f016f8"
+checksum = "cf3d7383929f7c9c7c2d0fa596f325832df98c3704f2c60553080f7127a58175"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2733,9 +2744,9 @@ dependencies = [
 
 [[package]]
 name = "kvdb"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0315ef2f688e33844400b31f11c263f2b3dc21d8b9355c6891c5f185fae43f9a"
+checksum = "92312348daade49976a6dc59263ad39ed54f840aacb5664874f7c9aa16e5f848"
 dependencies = [
  "parity-util-mem",
  "smallvec 1.5.0",
@@ -2743,20 +2754,20 @@ dependencies = [
 
 [[package]]
 name = "kvdb-memorydb"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73de822b260a3bdfb889dbbb65bb2d473eee2253973d6fa4a5d149a2a4a7c66e"
+checksum = "986052a8d16c692eaebe775391f9a3ac26714f3907132658500b601dec94c8c2"
 dependencies = [
  "kvdb",
  "parity-util-mem",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
 ]
 
 [[package]]
 name = "kvdb-rocksdb"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44947dd392f09475af614d740fe0320b66d01cb5b977f664bbbb5e45a70ea4c1"
+checksum = "8d92c36be64baba5ea549116ff0d7ffd445456a7be8aaee21ec05882b980cd11"
 dependencies = [
  "fs-swap",
  "kvdb",
@@ -2764,7 +2775,7 @@ dependencies = [
  "num_cpus",
  "owning_ref",
  "parity-util-mem",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "regex",
  "rocksdb",
  "smallvec 1.5.0",
@@ -2772,9 +2783,9 @@ dependencies = [
 
 [[package]]
 name = "kvdb-web"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2701a1369d6ea4f1b9f606db46e5e2a4a8e47f22530a07823d653f85ab1f6c34"
+checksum = "f7bfe11b3202691673766b1224c432996f6b8047db17ceb743675bef3404e714"
 dependencies = [
  "futures 0.3.8",
  "js-sys",
@@ -2782,7 +2793,8 @@ dependencies = [
  "kvdb-memorydb",
  "log",
  "parity-util-mem",
- "send_wrapper 0.3.0",
+ "parking_lot 0.11.1",
+ "send_wrapper 0.5.0",
  "wasm-bindgen",
  "web-sys",
 ]
@@ -3011,7 +3023,7 @@ dependencies = [
  "rand 0.7.3",
  "sha2 0.9.2",
  "smallvec 1.5.0",
- "uint",
+ "uint 0.8.5",
  "unsigned-varint",
  "void",
  "wasm-timer",
@@ -3363,7 +3375,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be716eb6878ca2263eb5d00a781aa13264a794f519fe6af4fbb2668b2d5441c0"
 dependencies = [
- "hashbrown 0.9.1",
+ "hashbrown",
 ]
 
 [[package]]
@@ -3444,12 +3456,12 @@ dependencies = [
 
 [[package]]
 name = "memory-db"
-version = "0.24.1"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36f36ddb0b2cdc25d38babba472108798e3477f02be5165f038c5e393e50c57a"
+checksum = "6cbd2a22f201c03cc1706a727842490abfea17b7b53260358239828208daba3c"
 dependencies = [
  "hash-db",
- "hashbrown 0.8.2",
+ "hashbrown",
  "parity-util-mem",
 ]
 
@@ -3773,7 +3785,7 @@ dependencies = [
  "pallet-timestamp",
  "pallet-transaction-payment",
  "parity-scale-codec",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "platforms",
  "rand 0.7.3",
  "regex",
@@ -4318,7 +4330,7 @@ dependencies = [
  "pallet-session",
  "pallet-timestamp",
  "parity-scale-codec",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "serde",
  "sp-application-crypto",
  "sp-consensus-aura",
@@ -4354,7 +4366,7 @@ version = "2.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
- "impl-trait-for-tuples",
+ "impl-trait-for-tuples 0.2.0",
  "parity-scale-codec",
  "sp-authorship",
  "sp-core",
@@ -4923,7 +4935,7 @@ version = "2.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
- "impl-trait-for-tuples",
+ "impl-trait-for-tuples 0.1.3",
  "lazy_static",
  "pallet-timestamp",
  "parity-scale-codec",
@@ -4990,7 +5002,7 @@ dependencies = [
  "pallet-staking-reward-curve",
  "pallet-timestamp",
  "parity-scale-codec",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "rand_chacha 0.2.2",
  "serde",
  "sp-application-crypto",
@@ -5071,7 +5083,7 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "impl-trait-for-tuples",
+ "impl-trait-for-tuples 0.2.0",
  "parity-scale-codec",
  "serde",
  "sp-core",
@@ -5155,7 +5167,7 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "impl-trait-for-tuples",
+ "impl-trait-for-tuples 0.2.0",
  "pallet-balances",
  "parity-scale-codec",
  "serde",
@@ -5285,15 +5297,15 @@ dependencies = [
 
 [[package]]
 name = "parity-util-mem"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "297ff91fa36aec49ce183484b102f6b75b46776822bd81525bfc4cc9b0dd0f5c"
+checksum = "8f17f15cb05897127bf36a240085a1f0bbef7bce3024849eccf7f93f6171bc27"
 dependencies = [
- "cfg-if 0.1.10",
- "hashbrown 0.8.2",
- "impl-trait-for-tuples",
+ "cfg-if 1.0.0",
+ "hashbrown",
+ "impl-trait-for-tuples 0.2.0",
  "parity-util-mem-derive",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "primitive-types",
  "smallvec 1.5.0",
  "winapi 0.3.9",
@@ -5706,14 +5718,14 @@ dependencies = [
 
 [[package]]
 name = "primitive-types"
-version = "0.7.3"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd39dcacf71411ba488570da7bbc89b717225e46478b30ba99b92db6b149809"
+checksum = "b3824ae2c5e27160113b9e029a10ec9e3f0237bad8029f69c7724393c9fdefd8"
 dependencies = [
  "fixed-hash",
  "impl-codec",
  "impl-serde",
- "uint",
+ "uint 0.9.0",
 ]
 
 [[package]]
@@ -5955,7 +5967,7 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
 dependencies = [
- "getrandom",
+ "getrandom 0.1.15",
  "libc",
  "rand_chacha 0.2.2",
  "rand_core 0.5.1",
@@ -5963,6 +5975,17 @@ dependencies = [
  "rand_pcg 0.2.1",
 ]
 
+[[package]]
+name = "rand"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c24fcd450d3fa2b592732565aa4f17a27a61c65ece4726353e000939b0edee34"
+dependencies = [
+ "libc",
+ "rand_chacha 0.3.0",
+ "rand_core 0.6.1",
+]
+
 [[package]]
 name = "rand_chacha"
 version = "0.1.1"
@@ -5983,6 +6006,16 @@ dependencies = [
  "rand_core 0.5.1",
 ]
 
+[[package]]
+name = "rand_chacha"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.6.1",
+]
+
 [[package]]
 name = "rand_core"
 version = "0.3.1"
@@ -6004,7 +6037,16 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
 dependencies = [
- "getrandom",
+ "getrandom 0.1.15",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c026d7df8b298d90ccbbc5190bd04d85e159eaf5576caeacf8741da93ccbd2e5"
+dependencies = [
+ "getrandom 0.2.1",
 ]
 
 [[package]]
@@ -6065,7 +6107,6 @@ dependencies = [
  "libc",
  "rand_core 0.4.2",
  "rdrand",
- "wasm-bindgen",
  "winapi 0.3.9",
 ]
 
@@ -6160,7 +6201,7 @@ version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
 dependencies = [
- "getrandom",
+ "getrandom 0.1.15",
  "redox_syscall",
  "rust-argon2",
 ]
@@ -6452,7 +6493,7 @@ dependencies = [
  "futures-timer 3.0.2",
  "log",
  "parity-scale-codec",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "sc-block-builder",
  "sc-client-api",
  "sc-proposer-metrics",
@@ -6491,7 +6532,7 @@ dependencies = [
 name = "sc-chain-spec"
 version = "2.0.0"
 dependencies = [
- "impl-trait-for-tuples",
+ "impl-trait-for-tuples 0.2.0",
  "parity-scale-codec",
  "sc-chain-spec-derive",
  "sc-consensus-babe",
@@ -6584,7 +6625,7 @@ dependencies = [
  "lazy_static",
  "log",
  "parity-scale-codec",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "sc-executor",
  "sp-api",
  "sp-blockchain",
@@ -6622,7 +6663,7 @@ dependencies = [
  "parity-db",
  "parity-scale-codec",
  "parity-util-mem",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "quickcheck",
  "sc-client-api",
  "sc-executor",
@@ -6659,9 +6700,10 @@ dependencies = [
  "derive_more",
  "futures 0.3.8",
  "futures-timer 3.0.2",
+ "getrandom 0.2.1",
  "log",
  "parity-scale-codec",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "sc-block-builder",
  "sc-client-api",
  "sc-consensus-slots",
@@ -6705,7 +6747,7 @@ dependencies = [
  "num-rational",
  "num-traits",
  "parity-scale-codec",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "pdqselect",
  "rand 0.7.3",
  "rand_chacha 0.2.2",
@@ -6780,7 +6822,7 @@ version = "0.8.0"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "sc-client-api",
  "sp-blockchain",
  "sp-runtime",
@@ -6798,7 +6840,7 @@ dependencies = [
  "jsonrpc-derive",
  "log",
  "parity-scale-codec",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "sc-basic-authorship",
  "sc-client-api",
  "sc-consensus-babe",
@@ -6832,7 +6874,7 @@ dependencies = [
  "futures-timer 3.0.2",
  "log",
  "parity-scale-codec",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "sc-client-api",
  "sp-api",
  "sp-block-builder",
@@ -6854,7 +6896,7 @@ dependencies = [
  "futures-timer 3.0.2",
  "log",
  "parity-scale-codec",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "sc-client-api",
  "sc-telemetry",
  "sp-api",
@@ -6897,7 +6939,7 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "parity-wasm 0.41.0",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "sc-executor-common",
  "sc-executor-wasmi",
  "sc-executor-wasmtime",
@@ -6984,7 +7026,7 @@ dependencies = [
  "futures-timer 3.0.2",
  "log",
  "parity-scale-codec",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "pin-project 0.4.27",
  "rand 0.7.3",
  "sc-block-builder",
@@ -7074,7 +7116,7 @@ dependencies = [
  "futures-util",
  "hex",
  "merlin",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "rand 0.7.3",
  "serde_json",
  "sp-application-crypto",
@@ -7091,7 +7133,7 @@ dependencies = [
  "hash-db",
  "lazy_static",
  "parity-scale-codec",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "sc-client-api",
  "sc-executor",
  "sp-api",
@@ -7189,7 +7231,7 @@ dependencies = [
  "futures-timer 3.0.2",
  "libp2p",
  "log",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "rand 0.7.3",
  "sc-block-builder",
  "sc-client-api",
@@ -7221,7 +7263,7 @@ dependencies = [
  "log",
  "num_cpus",
  "parity-scale-codec",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "rand 0.7.3",
  "sc-client-api",
  "sc-client-db",
@@ -7274,7 +7316,7 @@ dependencies = [
  "lazy_static",
  "log",
  "parity-scale-codec",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "sc-block-builder",
  "sc-cli",
  "sc-client-api",
@@ -7315,7 +7357,7 @@ dependencies = [
  "jsonrpc-pubsub",
  "log",
  "parity-scale-codec",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "serde",
  "serde_json",
  "sp-chain-spec",
@@ -7374,7 +7416,7 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "parity-util-mem",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "pin-project 0.4.27",
  "rand 0.7.3",
  "sc-block-builder",
@@ -7437,7 +7479,7 @@ dependencies = [
  "hex-literal",
  "log",
  "parity-scale-codec",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "sc-block-builder",
  "sc-client-api",
  "sc-client-db",
@@ -7471,7 +7513,7 @@ dependencies = [
  "parity-scale-codec",
  "parity-util-mem",
  "parity-util-mem-derive",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "sc-client-api",
  "sp-core",
  "thiserror",
@@ -7504,7 +7546,7 @@ dependencies = [
  "futures-timer 3.0.2",
  "libp2p",
  "log",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "pin-project 0.4.27",
  "rand 0.7.3",
  "serde",
@@ -7525,7 +7567,7 @@ dependencies = [
  "lazy_static",
  "log",
  "once_cell",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "regex",
  "rustc-hash",
  "sc-telemetry",
@@ -7551,7 +7593,7 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "parity-util-mem",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "retain_mut",
  "serde",
  "sp-blockchain",
@@ -7576,7 +7618,7 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "parity-util-mem",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "sc-block-builder",
  "sc-client-api",
  "sc-transaction-graph",
@@ -7615,7 +7657,7 @@ dependencies = [
  "arrayref",
  "arrayvec 0.5.2",
  "curve25519-dalek 2.1.0",
- "getrandom",
+ "getrandom 0.1.15",
  "merlin",
  "rand 0.7.3",
  "rand_core 0.5.1",
@@ -7744,15 +7786,15 @@ dependencies = [
 
 [[package]]
 name = "send_wrapper"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "686ef91cf020ad8d4aca9a7047641fd6add626b7b89e14546c2b6a76781cf822"
+checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0"
 
 [[package]]
 name = "send_wrapper"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0"
+checksum = "930c0acf610d3fdb5e2ab6213019aaa04e227ebe9547b0649ba599b16d788bd7"
 
 [[package]]
 name = "serde"
@@ -8158,7 +8200,7 @@ dependencies = [
  "log",
  "lru",
  "parity-scale-codec",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "sp-api",
  "sp-consensus",
  "sp-database",
@@ -8184,7 +8226,7 @@ dependencies = [
  "libp2p",
  "log",
  "parity-scale-codec",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "serde",
  "sp-api",
  "sp-core",
@@ -8286,7 +8328,7 @@ dependencies = [
  "num-traits",
  "parity-scale-codec",
  "parity-util-mem",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "pretty_assertions",
  "primitive-types",
  "rand 0.7.3",
@@ -8317,7 +8359,7 @@ name = "sp-database"
 version = "2.0.0"
 dependencies = [
  "kvdb",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
 ]
 
 [[package]]
@@ -8360,7 +8402,7 @@ name = "sp-inherents"
 version = "2.0.0"
 dependencies = [
  "parity-scale-codec",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "sp-core",
  "sp-std",
  "thiserror",
@@ -8375,7 +8417,7 @@ dependencies = [
  "libsecp256k1",
  "log",
  "parity-scale-codec",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "sp-core",
  "sp-externalities",
  "sp-keystore",
@@ -8408,7 +8450,7 @@ dependencies = [
  "futures 0.3.8",
  "merlin",
  "parity-scale-codec",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "rand 0.7.3",
  "rand_chacha 0.2.2",
  "schnorrkel",
@@ -8485,7 +8527,7 @@ version = "2.0.0"
 dependencies = [
  "either",
  "hash256-std-hasher",
- "impl-trait-for-tuples",
+ "impl-trait-for-tuples 0.2.0",
  "log",
  "parity-scale-codec",
  "parity-util-mem",
@@ -8505,7 +8547,7 @@ dependencies = [
 name = "sp-runtime-interface"
 version = "2.0.0"
 dependencies = [
- "impl-trait-for-tuples",
+ "impl-trait-for-tuples 0.2.0",
  "parity-scale-codec",
  "primitive-types",
  "rustversion",
@@ -8624,7 +8666,7 @@ dependencies = [
  "log",
  "num-traits",
  "parity-scale-codec",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "pretty_assertions",
  "rand 0.7.3",
  "smallvec 1.5.0",
@@ -8684,7 +8726,7 @@ dependencies = [
 name = "sp-timestamp"
 version = "2.0.0"
 dependencies = [
- "impl-trait-for-tuples",
+ "impl-trait-for-tuples 0.2.0",
  "parity-scale-codec",
  "sp-api",
  "sp-inherents",
@@ -8764,7 +8806,7 @@ dependencies = [
 name = "sp-wasm-interface"
 version = "2.0.0"
 dependencies = [
- "impl-trait-for-tuples",
+ "impl-trait-for-tuples 0.2.0",
  "parity-scale-codec",
  "sp-std",
  "wasmi",
@@ -8903,11 +8945,11 @@ dependencies = [
  "futures 0.1.30",
  "futures 0.3.8",
  "futures-timer 3.0.2",
+ "getrandom 0.2.1",
  "js-sys",
  "kvdb-web",
  "libp2p-wasm-ext",
  "log",
- "rand 0.6.5",
  "rand 0.7.3",
  "sc-chain-spec",
  "sc-informant",
@@ -9087,7 +9129,7 @@ dependencies = [
  "derive_more",
  "futures 0.3.8",
  "parity-scale-codec",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "sc-transaction-graph",
  "sp-blockchain",
  "sp-runtime",
@@ -9715,9 +9757,9 @@ checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41"
 
 [[package]]
 name = "trie-bench"
-version = "0.25.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af2cc37cac8cc158119982c920cbb9b8243d8540c1d13b8aca84484bfc83a426"
+checksum = "92d03b477b8837fd2e6bd17df374e5de60959c54058208de98833347c02b778c"
 dependencies = [
  "criterion",
  "hash-db",
@@ -9731,12 +9773,12 @@ dependencies = [
 
 [[package]]
 name = "trie-db"
-version = "0.22.1"
+version = "0.22.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e55f7ace33d6237e14137e386f4e1672e2a5c6bbc97fef9f438581a143971f0"
+checksum = "5cc176c377eb24d652c9c69c832c832019011b6106182bf84276c66b66d5c9a6"
 dependencies = [
  "hash-db",
- "hashbrown 0.8.2",
+ "hashbrown",
  "log",
  "rustc-hex",
  "smallvec 1.5.0",
@@ -9789,7 +9831,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04f8ab788026715fa63b31960869617cba39117e520eb415b0139543e325ab59"
 dependencies = [
  "cfg-if 0.1.10",
- "rand 0.6.5",
+ "rand 0.7.3",
  "static_assertions",
 ]
 
@@ -9817,6 +9859,18 @@ dependencies = [
  "static_assertions",
 ]
 
+[[package]]
+name = "uint"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e11fe9a9348741cf134085ad57c249508345fe16411b3d7fb4ff2da2f1d6382e"
+dependencies = [
+ "byteorder",
+ "crunchy",
+ "hex",
+ "static_assertions",
+]
+
 [[package]]
 name = "unicase"
 version = "2.6.0"
@@ -10331,9 +10385,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.44"
+version = "0.3.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dda38f4e5ca63eda02c059d243aa25b5f35ab98451e518c51612cd0f1bd19a47"
+checksum = "222b1ef9334f92a21d3fb53dc3fd80f30836959a90f9274a626d7e06315ba3c3"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
diff --git a/bin/node/bench/Cargo.toml b/bin/node/bench/Cargo.toml
index 88362f7e5102..06d89ff7d0d5 100644
--- a/bin/node/bench/Cargo.toml
+++ b/bin/node/bench/Cargo.toml
@@ -21,8 +21,8 @@ serde = "1.0.101"
 serde_json = "1.0.41"
 structopt = "0.3"
 derive_more = "0.99.2"
-kvdb = "0.7"
-kvdb-rocksdb = "0.9.1"
+kvdb = "0.8.0"
+kvdb-rocksdb = "0.10.0"
 sp-trie = { version = "2.0.0", path = "../../../primitives/trie" }
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
 sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
@@ -37,7 +37,7 @@ fs_extra = "1"
 hex = "0.4.0"
 rand = { version = "0.7.2", features = ["small_rng"] }
 lazy_static = "1.4.0"
-parity-util-mem = { version = "0.7.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.8.0", default-features = false, features = ["primitive-types"] }
 parity-db = { version = "0.1.2" }
 sc-transaction-pool = { version = "2.0.0", path = "../../../client/transaction-pool" }
 futures = { version = "0.3.4", features = ["thread-pool"] }
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index 6574ccb733b5..773934e95fa3 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -42,7 +42,7 @@ log = "0.4.8"
 rand = "0.7.2"
 structopt = { version = "0.3.8", optional = true }
 tracing = "0.1.22"
-parking_lot = "0.10.0"
+parking_lot = "0.11.1"
 
 # primitives
 sp-authority-discovery = { version = "2.0.0",  path = "../../../primitives/authority-discovery" }
diff --git a/client/api/Cargo.toml b/client/api/Cargo.toml
index 07036bfb414a..63cdf39d7d28 100644
--- a/client/api/Cargo.toml
+++ b/client/api/Cargo.toml
@@ -24,9 +24,9 @@ futures = "0.3.1"
 hash-db = { version = "0.15.2", default-features = false }
 sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
 sp-inherents = { version = "2.0.0", default-features = false, path = "../../primitives/inherents" }
-kvdb = "0.7.0"
+kvdb = "0.8.0"
 log = "0.4.8"
-parking_lot = "0.10.0"
+parking_lot = "0.11.1"
 lazy_static =  "1.4.0"
 sp-database = { version = "2.0.0", path = "../../primitives/database" }
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
@@ -43,7 +43,7 @@ sp-transaction-pool = { version = "2.0.0", path = "../../primitives/transaction-
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.8.0", path = "../../utils/prometheus" }
 
 [dev-dependencies]
-kvdb-memorydb = "0.7.0"
+kvdb-memorydb = "0.8.0"
 sp-test-primitives = { version = "2.0.0", path = "../../primitives/test-primitives" }
 substrate-test-runtime = { version = "2.0.0", path = "../../test-utils/runtime"  }
 thiserror = "1.0.21"
diff --git a/client/basic-authorship/Cargo.toml b/client/basic-authorship/Cargo.toml
index c5a67c0a6436..f8d2c2f16c71 100644
--- a/client/basic-authorship/Cargo.toml
+++ b/client/basic-authorship/Cargo.toml
@@ -33,4 +33,4 @@ sc-proposer-metrics = { version = "0.8.0", path = "../proposer-metrics" }
 [dev-dependencies]
 sc-transaction-pool = { version = "2.0.0", path = "../transaction-pool" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
-parking_lot = "0.10.0"
+parking_lot = "0.11.1"
diff --git a/client/chain-spec/Cargo.toml b/client/chain-spec/Cargo.toml
index 79f14058aad6..c47331a62457 100644
--- a/client/chain-spec/Cargo.toml
+++ b/client/chain-spec/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 sc-chain-spec-derive = { version = "2.0.0", path = "./derive" }
-impl-trait-for-tuples = "0.1.3"
+impl-trait-for-tuples = "0.2.0"
 sc-network = { version = "0.8.0", path = "../network" }
 sp-core = { version = "2.0.0", path = "../../primitives/core" }
 serde = { version = "1.0.101", features = ["derive"] }
diff --git a/client/consensus/aura/Cargo.toml b/client/consensus/aura/Cargo.toml
index c240fa4cb4da..b7bdf220d90c 100644
--- a/client/consensus/aura/Cargo.toml
+++ b/client/consensus/aura/Cargo.toml
@@ -25,7 +25,7 @@ futures = "0.3.4"
 futures-timer = "3.0.1"
 sp-inherents = { version = "2.0.0", path = "../../../primitives/inherents" }
 log = "0.4.8"
-parking_lot = "0.10.0"
+parking_lot = "0.11.1"
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
 sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
 sp-io = { version = "2.0.0", path = "../../../primitives/io" }
@@ -37,6 +37,9 @@ sp-timestamp = { version = "2.0.0", path = "../../../primitives/timestamp" }
 sp-keystore = { version = "0.8.0", path = "../../../primitives/keystore" }
 sc-telemetry = { version = "2.0.0", path = "../../telemetry" }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.8.0"}
+# We enable it only for web-wasm check
+# See https://docs.rs/getrandom/0.2.1/getrandom/#webassembly-support
+getrandom = { version = "0.2", features = ["js"], optional = true }
 
 [dev-dependencies]
 sp-keyring = { version = "2.0.0", path = "../../../primitives/keyring" }
diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml
index 2178f1cf9701..1b97ba68cc84 100644
--- a/client/consensus/babe/Cargo.toml
+++ b/client/consensus/babe/Cargo.toml
@@ -44,7 +44,7 @@ fork-tree = { version = "2.0.0", path = "../../../utils/fork-tree" }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.8.0"}
 futures = "0.3.4"
 futures-timer = "3.0.1"
-parking_lot = "0.10.0"
+parking_lot = "0.11.1"
 log = "0.4.8"
 schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated"] }
 rand = "0.7.2"
diff --git a/client/consensus/epochs/Cargo.toml b/client/consensus/epochs/Cargo.toml
index d50ec29ed9c6..b7de4494bf7a 100644
--- a/client/consensus/epochs/Cargo.toml
+++ b/client/consensus/epochs/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "1.3.4", features = ["derive"] }
-parking_lot = "0.10.0"
+parking_lot = "0.11.1"
 fork-tree = { version = "2.0.0", path = "../../../utils/fork-tree" }
 sp-runtime = {  path = "../../../primitives/runtime" , version = "2.0.0"}
 sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
diff --git a/client/consensus/manual-seal/Cargo.toml b/client/consensus/manual-seal/Cargo.toml
index d50cb5936526..80dbed3668c0 100644
--- a/client/consensus/manual-seal/Cargo.toml
+++ b/client/consensus/manual-seal/Cargo.toml
@@ -19,7 +19,7 @@ jsonrpc-core = "15.1.0"
 jsonrpc-core-client = "15.1.0"
 jsonrpc-derive = "15.1.0"
 log = "0.4.8"
-parking_lot = "0.10.0"
+parking_lot = "0.11.1"
 codec = { package = "parity-scale-codec", version = "1.3.1" }
 serde = { version = "1.0", features=["derive"] }
 assert_matches = "1.3.0"
diff --git a/client/consensus/pow/Cargo.toml b/client/consensus/pow/Cargo.toml
index fbb02ccc7112..cd4d12c37188 100644
--- a/client/consensus/pow/Cargo.toml
+++ b/client/consensus/pow/Cargo.toml
@@ -26,7 +26,7 @@ sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common
 log = "0.4.8"
 futures = { version = "0.3.1", features = ["compat"] }
 futures-timer = "3.0.1"
-parking_lot = "0.10.0"
+parking_lot = "0.11.1"
 sp-timestamp = { version = "2.0.0", path = "../../../primitives/timestamp" }
 derive_more = "0.99.2"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.8.0"}
diff --git a/client/consensus/slots/Cargo.toml b/client/consensus/slots/Cargo.toml
index e8bd1f33631e..35b08444d45d 100644
--- a/client/consensus/slots/Cargo.toml
+++ b/client/consensus/slots/Cargo.toml
@@ -30,7 +30,7 @@ sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common
 sp-inherents = { version = "2.0.0", path = "../../../primitives/inherents" }
 futures = "0.3.4"
 futures-timer = "3.0.1"
-parking_lot = "0.10.0"
+parking_lot = "0.11.1"
 log = "0.4.11"
 thiserror = "1.0.21"
 
diff --git a/client/db/Cargo.toml b/client/db/Cargo.toml
index 70a0b1953259..e5f5a59be9f5 100644
--- a/client/db/Cargo.toml
+++ b/client/db/Cargo.toml
@@ -13,14 +13,14 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-parking_lot = "0.10.0"
+parking_lot = "0.11.1"
 log = "0.4.8"
-kvdb = "0.7.0"
-kvdb-rocksdb = { version = "0.9.1", optional = true }
-kvdb-memorydb = "0.7.0"
+kvdb = "0.8.0"
+kvdb-rocksdb = { version = "0.10.0", optional = true }
+kvdb-memorydb = "0.8.0"
 linked-hash-map = "0.5.2"
 hash-db = "0.15.2"
-parity-util-mem = { version = "0.7.0", default-features = false, features = ["std"] }
+parity-util-mem = { version = "0.8.0", default-features = false, features = ["std"] }
 codec = { package = "parity-scale-codec", version = "1.3.4", features = ["derive"] }
 blake2-rfc = "0.2.18"
 
@@ -43,7 +43,7 @@ sp-keyring = { version = "2.0.0", path = "../../primitives/keyring" }
 sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 quickcheck = "0.9"
-kvdb-rocksdb = "0.9.1"
+kvdb-rocksdb = "0.10.0"
 tempfile = "3"
 
 [features]
diff --git a/client/executor/Cargo.toml b/client/executor/Cargo.toml
index c5ce4b86e12f..f06a8c66f144 100644
--- a/client/executor/Cargo.toml
+++ b/client/executor/Cargo.toml
@@ -33,7 +33,7 @@ sp-externalities = { version = "0.8.0", path = "../../primitives/externalities"
 sc-executor-common = { version = "0.8.0", path = "common" }
 sc-executor-wasmi = { version = "0.8.0", path = "wasmi" }
 sc-executor-wasmtime = { version = "0.8.0", path = "wasmtime", optional = true }
-parking_lot = "0.10.0"
+parking_lot = "0.11.1"
 log = "0.4.8"
 libsecp256k1 = "0.3.4"
 
diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml
index d19fc18b22bd..69744691b820 100644
--- a/client/finality-grandpa/Cargo.toml
+++ b/client/finality-grandpa/Cargo.toml
@@ -20,7 +20,7 @@ fork-tree = { version = "2.0.0", path = "../../utils/fork-tree" }
 futures = "0.3.4"
 futures-timer = "3.0.1"
 log = "0.4.8"
-parking_lot = "0.10.0"
+parking_lot = "0.11.1"
 rand = "0.7.2"
 parity-scale-codec = { version = "1.3.4", features = ["derive"] }
 sp-application-crypto = { version = "2.0.0", path = "../../primitives/application-crypto" }
diff --git a/client/informant/Cargo.toml b/client/informant/Cargo.toml
index 871cc3ef426e..7cc321e4001f 100644
--- a/client/informant/Cargo.toml
+++ b/client/informant/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 ansi_term = "0.12.1"
 futures = "0.3.4"
 log = "0.4.8"
-parity-util-mem = { version = "0.7.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.8.0", default-features = false, features = ["primitive-types"] }
 sc-client-api = { version = "2.0.0", path = "../api" }
 sc-network = { version = "0.8.0", path = "../network" }
 sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
diff --git a/client/keystore/Cargo.toml b/client/keystore/Cargo.toml
index c0c3acde25ed..d4d06b6f48d4 100644
--- a/client/keystore/Cargo.toml
+++ b/client/keystore/Cargo.toml
@@ -24,7 +24,7 @@ sp-core = { version = "2.0.0", path = "../../primitives/core" }
 sp-keystore = { version = "0.8.0", path = "../../primitives/keystore" }
 hex = "0.4.0"
 merlin = { version = "2.0", default-features = false }
-parking_lot = "0.10.0"
+parking_lot = "0.11.1"
 rand = "0.7.2"
 serde_json = "1.0.41"
 subtle = "2.1.1"
diff --git a/client/light/Cargo.toml b/client/light/Cargo.toml
index d9fecb7aa8fa..4516b5c4b665 100644
--- a/client/light/Cargo.toml
+++ b/client/light/Cargo.toml
@@ -11,7 +11,7 @@ documentation = "https://docs.rs/sc-light"
 readme = "README.md"
 
 [dependencies]
-parking_lot = "0.10.0"
+parking_lot = "0.11.1"
 lazy_static = "1.4.0"
 hash-db = "0.15.2"
 sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
diff --git a/client/network/test/Cargo.toml b/client/network/test/Cargo.toml
index 826b8c300f9a..e9f49021bbf5 100644
--- a/client/network/test/Cargo.toml
+++ b/client/network/test/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 async-std = "1.6.5"
 sc-network = { version = "0.8.0", path = "../" }
 log = "0.4.8"
-parking_lot = "0.10.0"
+parking_lot = "0.11.1"
 futures = "0.3.4"
 futures-timer = "3.0.1"
 rand = "0.7.2"
diff --git a/client/offchain/Cargo.toml b/client/offchain/Cargo.toml
index 5c561105f02c..c78aed367034 100644
--- a/client/offchain/Cargo.toml
+++ b/client/offchain/Cargo.toml
@@ -24,7 +24,7 @@ threadpool = "1.7"
 num_cpus = "1.10"
 sp-offchain = { version = "2.0.0", path = "../../primitives/offchain" }
 codec = { package = "parity-scale-codec", version = "1.3.4", features = ["derive"] }
-parking_lot = "0.10.0"
+parking_lot = "0.11.1"
 sp-core = { version = "2.0.0", path = "../../primitives/core" }
 rand = "0.7.2"
 sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
diff --git a/client/rpc-api/Cargo.toml b/client/rpc-api/Cargo.toml
index 0947dc47819c..30f6f24f04d0 100644
--- a/client/rpc-api/Cargo.toml
+++ b/client/rpc-api/Cargo.toml
@@ -21,7 +21,7 @@ jsonrpc-core-client = "15.1.0"
 jsonrpc-derive = "15.1.0"
 jsonrpc-pubsub = "15.1.0"
 log = "0.4.8"
-parking_lot = "0.10.0"
+parking_lot = "0.11.1"
 sp-core = { version = "2.0.0", path = "../../primitives/core" }
 sp-version = { version = "2.0.0", path = "../../primitives/version" }
 sp-runtime = { path = "../../primitives/runtime" , version = "2.0.0"}
diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml
index e02d88f158b8..5ccb15dedbc9 100644
--- a/client/rpc/Cargo.toml
+++ b/client/rpc/Cargo.toml
@@ -39,7 +39,7 @@ sp-transaction-pool = { version = "2.0.0", path = "../../primitives/transaction-
 sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
 sc-tracing = { version = "2.0.0", path = "../tracing" }
 hash-db = { version = "0.15.2", default-features = false }
-parking_lot = "0.10.0"
+parking_lot = "0.11.1"
 lazy_static = { version = "1.4.0", optional = true }
 
 [dev-dependencies]
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index 4350e1a2bf2a..1059e8f5e146 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -30,7 +30,7 @@ futures = { version = "0.3.4", features = ["compat"] }
 jsonrpc-pubsub = "15.1"
 jsonrpc-core = "15.1"
 rand = "0.7.3"
-parking_lot = "0.10.0"
+parking_lot = "0.11.1"
 lazy_static = "1.4.0"
 log = "0.4.11"
 slog = { version = "2.5.2", features = ["nested-values"] }
@@ -78,7 +78,7 @@ sc-tracing = { version = "2.0.0", path = "../tracing" }
 sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
 tracing = "0.1.22"
 tracing-futures = { version = "0.2.4" }
-parity-util-mem = { version = "0.7.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.8.0", default-features = false, features = ["primitive-types"] }
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
 tempfile = "3.1.0"
diff --git a/client/service/test/Cargo.toml b/client/service/test/Cargo.toml
index 84ac84e630d0..ccf122a7bcca 100644
--- a/client/service/test/Cargo.toml
+++ b/client/service/test/Cargo.toml
@@ -18,7 +18,7 @@ tokio = "0.1.22"
 futures01 = { package = "futures", version = "0.1.29" }
 log = "0.4.8"
 fdlimit = "0.2.1"
-parking_lot = "0.10.0"
+parking_lot = "0.11.1"
 sc-light = { version = "2.0.0", path = "../../light" }
 sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
 sp-api = { version = "2.0.0", path = "../../../primitives/api" }
diff --git a/client/state-db/Cargo.toml b/client/state-db/Cargo.toml
index 18facd720db2..e0aa860ded5c 100644
--- a/client/state-db/Cargo.toml
+++ b/client/state-db/Cargo.toml
@@ -14,10 +14,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 thiserror = "1.0.21"
-parking_lot = "0.10.0"
+parking_lot = "0.11.1"
 log = "0.4.11"
 sc-client-api = { version = "2.0.0", path = "../api" }
 sp-core = { version = "2.0.0", path = "../../primitives/core" }
 codec = { package = "parity-scale-codec", version = "1.3.4", features = ["derive"] }
-parity-util-mem = { version = "0.7.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.8.0", default-features = false, features = ["primitive-types"] }
 parity-util-mem-derive = "0.1.0"
diff --git a/client/telemetry/Cargo.toml b/client/telemetry/Cargo.toml
index de8eea442ef7..3affd8e98456 100644
--- a/client/telemetry/Cargo.toml
+++ b/client/telemetry/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 
 [dependencies]
-parking_lot = "0.10.0"
+parking_lot = "0.11.1"
 futures = "0.3.4"
 futures-timer = "3.0.1"
 wasm-timer = "0.2.5"
diff --git a/client/tracing/Cargo.toml b/client/tracing/Cargo.toml
index 28eeab0bdf71..a5839ecc9755 100644
--- a/client/tracing/Cargo.toml
+++ b/client/tracing/Cargo.toml
@@ -19,7 +19,7 @@ erased-serde = "0.3.9"
 lazy_static = "1.4.0"
 log = { version = "0.4.8" }
 once_cell = "1.4.1"
-parking_lot = "0.10.0"
+parking_lot = "0.11.1"
 regex = "1.4.2"
 rustc-hash = "1.1.0"
 serde = "1.0.101"
diff --git a/client/transaction-pool/Cargo.toml b/client/transaction-pool/Cargo.toml
index a4d7bc685c99..467df6a1fa1a 100644
--- a/client/transaction-pool/Cargo.toml
+++ b/client/transaction-pool/Cargo.toml
@@ -19,8 +19,8 @@ futures = { version = "0.3.1", features = ["compat"] }
 futures-diagnose = "1.0"
 intervalier = "0.4.0"
 log = "0.4.8"
-parity-util-mem = { version = "0.7.0", default-features = false, features = ["primitive-types"] }
-parking_lot = "0.10.0"
+parity-util-mem = { version = "0.8.0", default-features = false, features = ["primitive-types"] }
+parking_lot = "0.11.1"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.8.0"}
 sc-client-api = { version = "2.0.0", path = "../api" }
 sc-transaction-graph = { version = "2.0.0", path = "./graph" }
diff --git a/client/transaction-pool/graph/Cargo.toml b/client/transaction-pool/graph/Cargo.toml
index 94c80c6f298a..06b6b587eb9c 100644
--- a/client/transaction-pool/graph/Cargo.toml
+++ b/client/transaction-pool/graph/Cargo.toml
@@ -17,7 +17,7 @@ derive_more = "0.99.2"
 thiserror = "1.0.21"
 futures = "0.3.4"
 log = "0.4.8"
-parking_lot = "0.10.0"
+parking_lot = "0.11.1"
 serde = { version = "1.0.101", features = ["derive"] }
 wasm-timer = "0.2"
 sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
@@ -25,7 +25,7 @@ sp-utils = { version = "2.0.0", path = "../../../primitives/utils" }
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
 sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
 sp-transaction-pool = { version = "2.0.0", path = "../../../primitives/transaction-pool" }
-parity-util-mem = { version = "0.7.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.8.0", default-features = false, features = ["primitive-types"] }
 linked-hash-map = "0.5.2"
 retain_mut = "0.1.1"
 
diff --git a/frame/aura/Cargo.toml b/frame/aura/Cargo.toml
index 27a579e0f9f8..4307c93a5186 100644
--- a/frame/aura/Cargo.toml
+++ b/frame/aura/Cargo.toml
@@ -31,7 +31,7 @@ pallet-timestamp = { version = "2.0.0", default-features = false, path = "../tim
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
 sp-io ={ version = "2.0.0", path = "../../primitives/io" }
 lazy_static = "1.4.0"
-parking_lot = "0.10.0"
+parking_lot = "0.11.1"
 
 [features]
 default = ["std"]
diff --git a/frame/authorship/Cargo.toml b/frame/authorship/Cargo.toml
index e8b644458382..ec0611d38084 100644
--- a/frame/authorship/Cargo.toml
+++ b/frame/authorship/Cargo.toml
@@ -20,7 +20,7 @@ sp-std = { version = "2.0.0", default-features = false, path = "../../primitives
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
-impl-trait-for-tuples = "0.1.3"
+impl-trait-for-tuples = "0.2.0"
 
 [dev-dependencies]
 sp-core = { version = "2.0.0", path = "../../primitives/core" }
diff --git a/frame/session/Cargo.toml b/frame/session/Cargo.toml
index ea3a3d3cdf7f..4785e312a900 100644
--- a/frame/session/Cargo.toml
+++ b/frame/session/Cargo.toml
@@ -25,7 +25,7 @@ frame-support = { version = "2.0.0", default-features = false, path = "../suppor
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
 pallet-timestamp = { version = "2.0.0", default-features = false, path = "../timestamp" }
 sp-trie = { version = "2.0.0", optional = true, default-features = false, path = "../../primitives/trie" }
-impl-trait-for-tuples = "0.1.3"
+impl-trait-for-tuples = "0.1"
 
 [dev-dependencies]
 sp-application-crypto = { version = "2.0.0", path = "../../primitives/application-crypto" }
diff --git a/frame/staking/Cargo.toml b/frame/staking/Cargo.toml
index 88b8c1270a4e..ac029c07eb1d 100644
--- a/frame/staking/Cargo.toml
+++ b/frame/staking/Cargo.toml
@@ -41,7 +41,7 @@ pallet-staking-reward-curve = { version = "2.0.0",  path = "../staking/reward-cu
 substrate-test-utils = { version = "2.0.0", path = "../../test-utils" }
 frame-benchmarking = { version = "2.0.0", path = "../benchmarking" }
 rand_chacha = { version = "0.2" }
-parking_lot = "0.10.2"
+parking_lot = "0.11.1"
 hex = "0.4"
 
 [features]
diff --git a/frame/support/Cargo.toml b/frame/support/Cargo.toml
index 0189dc172fb6..981cbb7498c2 100644
--- a/frame/support/Cargo.toml
+++ b/frame/support/Cargo.toml
@@ -29,13 +29,13 @@ paste = "0.1.6"
 once_cell = { version = "1", default-features = false, optional = true }
 sp-state-machine = { version = "0.8.0", optional = true, path = "../../primitives/state-machine" }
 bitflags = "1.2"
-impl-trait-for-tuples = "0.1.3"
+impl-trait-for-tuples = "0.2.0"
 smallvec = "1.4.1"
 
 [dev-dependencies]
 pretty_assertions = "0.6.1"
 frame-system = { version = "2.0.0", path = "../system" }
-parity-util-mem = { version = "0.7.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.8.0", default-features = false, features = ["primitive-types"] }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 sp-api = { version = "2.0.0", default-features = false, path = "../../primitives/api" }
 
diff --git a/frame/system/Cargo.toml b/frame/system/Cargo.toml
index cebf761a907c..7b678f44e1c2 100644
--- a/frame/system/Cargo.toml
+++ b/frame/system/Cargo.toml
@@ -21,7 +21,7 @@ sp-io = { version = "2.0.0", path = "../../primitives/io", default-features = fa
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
 sp-version = { version = "2.0.0", default-features = false, path = "../../primitives/version" }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-impl-trait-for-tuples = "0.1.3"
+impl-trait-for-tuples = "0.2.0"
 
 [dev-dependencies]
 criterion = "0.3.3"
diff --git a/frame/system/benches/bench.rs b/frame/system/benches/bench.rs
index c5e95e3c44f6..5bebeaf932b9 100644
--- a/frame/system/benches/bench.rs
+++ b/frame/system/benches/bench.rs
@@ -17,7 +17,7 @@
 
 use criterion::{Criterion, criterion_group, criterion_main, black_box};
 use frame_system as system;
-use frame_support::{decl_module, decl_event, impl_outer_origin, impl_outer_event, weights::Weight};
+use frame_support::{decl_module, decl_event, impl_outer_origin, impl_outer_event};
 use sp_core::H256;
 use sp_runtime::{Perbill, traits::{BlakeTwo256, IdentityLookup}, testing::Header};
 
diff --git a/frame/timestamp/Cargo.toml b/frame/timestamp/Cargo.toml
index 5a99c5d02c5a..0d44e22da9e4 100644
--- a/frame/timestamp/Cargo.toml
+++ b/frame/timestamp/Cargo.toml
@@ -25,7 +25,7 @@ frame-benchmarking = { version = "2.0.0", default-features = false, path = "../b
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
 sp-timestamp = { version = "2.0.0", default-features = false, path = "../../primitives/timestamp" }
-impl-trait-for-tuples = "0.1.3"
+impl-trait-for-tuples = "0.2.0"
 
 [dev-dependencies]
 sp-io ={ version = "2.0.0", path = "../../primitives/io" }
diff --git a/frame/treasury/Cargo.toml b/frame/treasury/Cargo.toml
index 7570d2a499c3..6be555a3e379 100644
--- a/frame/treasury/Cargo.toml
+++ b/frame/treasury/Cargo.toml
@@ -20,7 +20,7 @@ sp-runtime = { version = "2.0.0", default-features = false, path = "../../primit
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
 pallet-balances = { version = "2.0.0", default-features = false, path = "../balances" }
-impl-trait-for-tuples = "0.1.3"
+impl-trait-for-tuples = "0.2.0"
 
 frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
 
diff --git a/primitives/arithmetic/Cargo.toml b/primitives/arithmetic/Cargo.toml
index c8f812215f4a..03891956dec0 100644
--- a/primitives/arithmetic/Cargo.toml
+++ b/primitives/arithmetic/Cargo.toml
@@ -26,7 +26,7 @@ sp-debug-derive = { version = "2.0.0", default-features = false, path = "../debu
 rand = "0.7.2"
 criterion = "0.3"
 serde_json = "1.0"
-primitive-types = "0.7.0"
+primitive-types = "0.8.0"
 
 [features]
 default = ["std"]
diff --git a/primitives/arithmetic/fuzzer/Cargo.toml b/primitives/arithmetic/fuzzer/Cargo.toml
index 6a28142f9e82..74b9d782ef89 100644
--- a/primitives/arithmetic/fuzzer/Cargo.toml
+++ b/primitives/arithmetic/fuzzer/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 sp-arithmetic = { version = "2.0.0", path = ".." }
 honggfuzz = "0.5.49"
-primitive-types = "0.7.0"
+primitive-types = "0.8.0"
 num-bigint = "0.2"
 num-traits = "0.2"
 
diff --git a/primitives/blockchain/Cargo.toml b/primitives/blockchain/Cargo.toml
index 3458b8c0846b..137a8a79791f 100644
--- a/primitives/blockchain/Cargo.toml
+++ b/primitives/blockchain/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 log = "0.4.11"
 lru = "0.6.1"
-parking_lot = "0.10.0"
+parking_lot = "0.11.1"
 thiserror = "1.0.21"
 futures = "0.3"
 codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
diff --git a/primitives/consensus/common/Cargo.toml b/primitives/consensus/common/Cargo.toml
index f53e80aab79b..360b3c6021a3 100644
--- a/primitives/consensus/common/Cargo.toml
+++ b/primitives/consensus/common/Cargo.toml
@@ -30,7 +30,7 @@ sp-utils = { version = "2.0.0", path = "../../utils" }
 sp-trie = { version = "2.0.0", path = "../../trie" }
 sp-api = { version = "2.0.0", path = "../../api" }
 codec = { package = "parity-scale-codec", version = "1.3.1", features = ["derive"] }
-parking_lot = "0.10.0"
+parking_lot = "0.11.1"
 serde = { version = "1.0", features = ["derive"] }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.8.0"}
 wasm-timer = "0.2.5"
diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml
index 1d0ff4f20828..cdbc1520e36f 100644
--- a/primitives/core/Cargo.toml
+++ b/primitives/core/Cargo.toml
@@ -18,7 +18,7 @@ codec = { package = "parity-scale-codec", version = "1.3.1", default-features =
 log = { version = "0.4.11", default-features = false }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 byteorder = { version = "1.3.2", default-features = false }
-primitive-types = { version = "0.7.0", default-features = false, features = ["codec"] }
+primitive-types = { version = "0.8.0", default-features = false, features = ["codec"] }
 impl-serde = { version = "0.3.0", optional = true }
 wasmi = { version = "0.6.2", optional = true }
 hash-db = { version = "0.15.2", default-features = false }
@@ -32,11 +32,11 @@ num-traits = { version = "0.2.8", default-features = false }
 zeroize = { version = "1.2.0", default-features = false }
 secrecy = { version = "0.7.0", default-features = false }
 lazy_static = { version = "1.4.0", default-features = false, optional = true }
-parking_lot = { version = "0.10.0", optional = true }
+parking_lot = { version = "0.11.1", optional = true }
 sp-debug-derive = { version = "2.0.0", path = "../debug-derive" }
 sp-externalities = { version = "0.8.0", optional = true, path = "../externalities" }
 sp-storage = { version = "2.0.0", default-features = false, path = "../storage" }
-parity-util-mem = { version = "0.7.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.8.0", default-features = false, features = ["primitive-types"] }
 futures = { version = "0.3.1", optional = true }
 dyn-clonable = { version = "0.9.0", optional = true }
 thiserror = { version = "1.0.21", optional = true }
diff --git a/primitives/database/Cargo.toml b/primitives/database/Cargo.toml
index cc3fe7cd1b47..33546c32df2c 100644
--- a/primitives/database/Cargo.toml
+++ b/primitives/database/Cargo.toml
@@ -11,5 +11,5 @@ documentation = "https://docs.rs/sp-database"
 readme = "README.md"
 
 [dependencies]
-parking_lot = "0.10.0"
-kvdb = "0.7.0"
+parking_lot = "0.11.1"
+kvdb = "0.8.0"
diff --git a/primitives/inherents/Cargo.toml b/primitives/inherents/Cargo.toml
index fdece1f9d3d3..bb6b7bbff1ff 100644
--- a/primitives/inherents/Cargo.toml
+++ b/primitives/inherents/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 
 [dependencies]
-parking_lot = { version = "0.10.0", optional = true }
+parking_lot = { version = "0.11.1", optional = true }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 sp-core = { version = "2.0.0", default-features = false, path = "../core" }
 codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
diff --git a/primitives/io/Cargo.toml b/primitives/io/Cargo.toml
index e65d75146d65..ce2173bd028e 100644
--- a/primitives/io/Cargo.toml
+++ b/primitives/io/Cargo.toml
@@ -29,7 +29,7 @@ sp-externalities = { version = "0.8.0", optional = true, path = "../externalitie
 sp-tracing = { version = "2.0.0", default-features = false, path = "../tracing" }
 log = { version = "0.4.8", optional = true }
 futures = { version = "0.3.1", features = ["thread-pool"], optional = true }
-parking_lot = { version = "0.10.0", optional = true }
+parking_lot = { version = "0.11.1", optional = true }
 tracing = { version = "0.1.22", default-features = false }
 tracing-core = { version = "0.1.17", default-features = false}
 
diff --git a/primitives/keystore/Cargo.toml b/primitives/keystore/Cargo.toml
index deffc2ccf9d3..2068a97356d4 100644
--- a/primitives/keystore/Cargo.toml
+++ b/primitives/keystore/Cargo.toml
@@ -19,7 +19,7 @@ codec = { package = "parity-scale-codec", version = "1.3.1", default-features =
 futures = { version = "0.3.1" }
 schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated", "u64_backend"], default-features = false }
 merlin = { version = "2.0", default-features = false }
-parking_lot = { version = "0.10.0", default-features = false }
+parking_lot = { version = "0.11.1", default-features = false }
 serde = { version = "1.0", optional = true}
 sp-core = { version = "2.0.0", path = "../core" }
 sp-externalities = { version = "0.8.0", path = "../externalities", default-features = false }
diff --git a/primitives/runtime-interface/Cargo.toml b/primitives/runtime-interface/Cargo.toml
index cbd26823012a..d68631e2911f 100644
--- a/primitives/runtime-interface/Cargo.toml
+++ b/primitives/runtime-interface/Cargo.toml
@@ -21,9 +21,9 @@ sp-runtime-interface-proc-macro = { version = "2.0.0", path = "proc-macro" }
 sp-externalities = { version = "0.8.0", optional = true, path = "../externalities" }
 codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false }
 static_assertions = "1.0.0"
-primitive-types = { version = "0.7.0", default-features = false }
+primitive-types = { version = "0.8.0", default-features = false }
 sp-storage = { version = "2.0.0", default-features = false, path = "../storage" }
-impl-trait-for-tuples = "0.1.3"
+impl-trait-for-tuples = "0.2.0"
 
 [dev-dependencies]
 sp-runtime-interface-test-wasm = { version = "2.0.0", path = "test-wasm" }
diff --git a/primitives/runtime/Cargo.toml b/primitives/runtime/Cargo.toml
index 0ad05561581a..705157b63f25 100644
--- a/primitives/runtime/Cargo.toml
+++ b/primitives/runtime/Cargo.toml
@@ -25,8 +25,8 @@ sp-io = { version = "2.0.0", default-features = false, path = "../io" }
 log = { version = "0.4.8", optional = true }
 paste = "0.1.6"
 rand = { version = "0.7.2", optional = true }
-impl-trait-for-tuples = "0.1.3"
-parity-util-mem = { version = "0.7.0", default-features = false, features = ["primitive-types"] }
+impl-trait-for-tuples = "0.2.0"
+parity-util-mem = { version = "0.8.0", default-features = false, features = ["primitive-types"] }
 hash256-std-hasher = { version = "0.15.2", default-features = false }
 either = { version = "1.5", default-features = false }
 
diff --git a/primitives/state-machine/Cargo.toml b/primitives/state-machine/Cargo.toml
index 95751bd4cb1d..679a961a85b7 100644
--- a/primitives/state-machine/Cargo.toml
+++ b/primitives/state-machine/Cargo.toml
@@ -16,9 +16,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 log = { version = "0.4.11", optional = true }
 thiserror = { version = "1.0.21", optional = true }
-parking_lot = { version = "0.10.0", optional = true }
+parking_lot = { version = "0.11.1", optional = true }
 hash-db = { version = "0.15.2", default-features = false }
-trie-db = { version = "0.22.0", default-features = false }
+trie-db = { version = "0.22.2", default-features = false }
 trie-root = { version = "0.16.0", default-features = false }
 sp-trie = { version = "2.0.0", path = "../trie", default-features = false }
 sp-core = { version = "2.0.0", path = "../core", default-features = false }
diff --git a/primitives/test-primitives/Cargo.toml b/primitives/test-primitives/Cargo.toml
index 18468a33ae42..6ae45aefa49d 100644
--- a/primitives/test-primitives/Cargo.toml
+++ b/primitives/test-primitives/Cargo.toml
@@ -17,7 +17,7 @@ codec = { package = "parity-scale-codec", version = "1.3.1", default-features =
 sp-core = { version = "2.0.0", default-features = false, path = "../core" }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../runtime" }
-parity-util-mem = { version = "0.7.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.8.0", default-features = false, features = ["primitive-types"] }
 
 [features]
 default = [
diff --git a/primitives/timestamp/Cargo.toml b/primitives/timestamp/Cargo.toml
index 79dae2910222..4916e4c3d84e 100644
--- a/primitives/timestamp/Cargo.toml
+++ b/primitives/timestamp/Cargo.toml
@@ -18,7 +18,7 @@ sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../runtime" }
 codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
 sp-inherents = { version = "2.0.0", default-features = false, path = "../inherents" }
-impl-trait-for-tuples = "0.1.3"
+impl-trait-for-tuples = "0.2.0"
 wasm-timer = { version = "0.2", optional = true }
 
 [features]
diff --git a/primitives/trie/Cargo.toml b/primitives/trie/Cargo.toml
index 7b7629bbf9bb..4f3a5cdd4ea7 100644
--- a/primitives/trie/Cargo.toml
+++ b/primitives/trie/Cargo.toml
@@ -21,13 +21,13 @@ harness = false
 codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 hash-db = { version = "0.15.2", default-features = false }
-trie-db = { version = "0.22.0", default-features = false }
+trie-db = { version = "0.22.2", default-features = false }
 trie-root = { version = "0.16.0", default-features = false }
-memory-db = { version = "0.24.0", default-features = false }
+memory-db = { version = "0.25.0", default-features = false }
 sp-core = { version = "2.0.0", default-features = false, path = "../core" }
 
 [dev-dependencies]
-trie-bench = "0.25.0"
+trie-bench = "0.26.0"
 trie-standardmap = "0.15.2"
 criterion = "0.3.3"
 hex-literal = "0.3.1"
diff --git a/primitives/wasm-interface/Cargo.toml b/primitives/wasm-interface/Cargo.toml
index a85b6cd1d118..67fa91b7798d 100644
--- a/primitives/wasm-interface/Cargo.toml
+++ b/primitives/wasm-interface/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 wasmi = { version = "0.6.2", optional = true }
-impl-trait-for-tuples = "0.1.2"
+impl-trait-for-tuples = "0.2.0"
 sp-std = { version = "2.0.0", path = "../std", default-features = false }
 codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
 
diff --git a/test-utils/runtime/Cargo.toml b/test-utils/runtime/Cargo.toml
index cf1a4bcddd5b..f67946c69e7a 100644
--- a/test-utils/runtime/Cargo.toml
+++ b/test-utils/runtime/Cargo.toml
@@ -21,7 +21,7 @@ codec = { package = "parity-scale-codec", version = "1.3.1", default-features =
 frame-executive = { version = "2.0.0", default-features = false, path = "../../frame/executive" }
 sp-inherents = { version = "2.0.0", default-features = false, path = "../../primitives/inherents" }
 sp-keyring = { version = "2.0.0", optional = true, path = "../../primitives/keyring" }
-memory-db = { version = "0.24.0", default-features = false }
+memory-db = { version = "0.25.0", default-features = false }
 sp-offchain = { path = "../../primitives/offchain", default-features = false, version = "2.0.0"}
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
@@ -39,8 +39,8 @@ pallet-timestamp = { version = "2.0.0", default-features = false, path = "../../
 sp-finality-grandpa = { version = "2.0.0", default-features = false, path = "../../primitives/finality-grandpa" }
 sp-trie = { version = "2.0.0", default-features = false, path = "../../primitives/trie" }
 sp-transaction-pool = { version = "2.0.0", default-features = false, path = "../../primitives/transaction-pool" }
-trie-db = { version = "0.22.0", default-features = false }
-parity-util-mem = { version = "0.7.0", default-features = false, features = ["primitive-types"] }
+trie-db = { version = "0.22.2", default-features = false }
+parity-util-mem = { version = "0.8.0", default-features = false, features = ["primitive-types"] }
 sc-service = { version = "0.8.0", default-features = false, optional = true, features = ["test-helpers"], path = "../../client/service" }
 sp-state-machine = { version = "0.8.0", default-features = false, path = "../../primitives/state-machine" }
 sp-externalities = { version = "0.8.0", default-features = false, path = "../../primitives/externalities" }
diff --git a/test-utils/runtime/transaction-pool/Cargo.toml b/test-utils/runtime/transaction-pool/Cargo.toml
index a37477fdae58..c9d6d88e15eb 100644
--- a/test-utils/runtime/transaction-pool/Cargo.toml
+++ b/test-utils/runtime/transaction-pool/Cargo.toml
@@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 substrate-test-runtime-client = { version = "2.0.0", path = "../client" }
-parking_lot = "0.10.0"
+parking_lot = "0.11.1"
 codec = { package = "parity-scale-codec", version = "1.3.1" }
 sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
 sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
diff --git a/utils/browser/Cargo.toml b/utils/browser/Cargo.toml
index 96fdf5ce1912..a779c9005da7 100644
--- a/utils/browser/Cargo.toml
+++ b/utils/browser/Cargo.toml
@@ -22,7 +22,7 @@ console_log = "0.2.0"
 js-sys = "0.3.34"
 wasm-bindgen = "0.2.57"
 wasm-bindgen-futures = "0.4.18"
-kvdb-web = "0.7"
+kvdb-web = "0.8.0"
 sp-database = { version = "2.0.0", path = "../../primitives/database" }
 sc-informant = { version = "0.8.0", path = "../../client/informant" }
 sc-service = { version = "0.8.0", path = "../../client/service", default-features = false }
@@ -30,7 +30,7 @@ sc-network = { path = "../../client/network", version = "0.8.0"}
 sc-chain-spec = { path = "../../client/chain-spec", version = "2.0.0"}
 
 # Imported just for the `wasm-bindgen` feature
-rand6 = { package = "rand", version = "0.6", features = ["wasm-bindgen"] }
+getrandom = { version = "0.2", features = ["js"] }
 rand = { version = "0.7", features = ["wasm-bindgen"] }
 futures-timer = { version = "3.0.1", features = ["wasm-bindgen"]}
 chrono = { version = "0.4", features = ["wasmbind"] }

From 698d80b3254dd62c67f6f8de3f97d8061baa3a73 Mon Sep 17 00:00:00 2001
From: Denis Pisarev <denis.pisarev@parity.io>
Date: Wed, 6 Jan 2021 18:51:36 +0100
Subject: [PATCH 0236/1194] CI: remove squash and fix buildah push (#7841)

---
 .gitlab-ci.yml | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5d5a74f30535..eb432191dbe6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -502,20 +502,17 @@ build-rust-doc:
     - echo "${PRODUCT} version = ${VERSION}"
     - test -z "${VERSION}" && exit 1
     - buildah bud
-      --squash
-      --format=docker
-      --build-arg VCS_REF="${CI_COMMIT_SHA}"
-      --build-arg BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M:%SZ')"
-      --tag "$IMAGE_NAME:$VERSION"
-      --tag "$IMAGE_NAME:latest"
-      --file "$DOCKERFILE" .
+        --format=docker
+        --build-arg VCS_REF="${CI_COMMIT_SHA}"
+        --build-arg BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M:%SZ')"
+        --tag "$IMAGE_NAME:$VERSION"
+        --tag "$IMAGE_NAME:latest"
+        --file "$DOCKERFILE" .
     - echo "$Docker_Hub_Pass_Parity" |
       buildah login --username "$Docker_Hub_User_Parity" --password-stdin docker.io
     - buildah info
-    - buildah push
-      --format=v2s2
-      "$IMAGE_NAME:$VERSION"
-      "$IMAGE_NAME:latest"
+    - buildah push --format=v2s2 "$IMAGE_NAME:$VERSION"
+    - buildah push --format=v2s2 "$IMAGE_NAME:latest"
 
 publish-docker-substrate:
   stage:                           publish

From b27503591d019b94a0eea7510578dadc5ad3196c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Wed, 6 Jan 2021 22:22:23 +0100
Subject: [PATCH 0237/1194] Fix incorrect use of syn::exports (#7838)

* Fix incorrect use of syn::exports

Instead of using `syn::exports` we should import the trait from the
quote crate directly.

* Use own macro for test cases to fix compilation with latest syn

* Fix test
---
 Cargo.lock                                    |  19 +--
 client/chain-spec/derive/Cargo.toml           |   2 +-
 client/cli/proc-macro/Cargo.toml              |   2 +-
 client/executor/Cargo.toml                    |   2 +-
 client/executor/src/integration_tests/mod.rs  | 116 +++++++++---------
 .../executor/src/integration_tests/sandbox.rs |  32 ++---
 frame/staking/reward-curve/Cargo.toml         |   2 +-
 frame/support/procedural/Cargo.toml           |   2 +-
 frame/support/procedural/src/storage/parse.rs |   2 +-
 frame/support/procedural/tools/Cargo.toml     |   2 +-
 .../procedural/tools/derive/Cargo.toml        |   2 +-
 primitives/api/proc-macro/Cargo.toml          |   2 +-
 primitives/debug-derive/Cargo.toml            |   2 +-
 primitives/npos-elections/compact/Cargo.toml  |   2 +-
 .../runtime-interface/proc-macro/Cargo.toml   |   2 +-
 test-utils/derive/Cargo.toml                  |   2 +-
 16 files changed, 86 insertions(+), 107 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index df1ab73b63c3..fa7bc74ae1a1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6940,6 +6940,7 @@ dependencies = [
  "parity-scale-codec",
  "parity-wasm 0.41.0",
  "parking_lot 0.11.1",
+ "paste 0.1.18",
  "sc-executor-common",
  "sc-executor-wasmi",
  "sc-executor-wasmtime",
@@ -6960,7 +6961,6 @@ dependencies = [
  "sp-version",
  "sp-wasm-interface",
  "substrate-test-runtime",
- "test-case",
  "tracing",
  "tracing-subscriber",
  "wasmi",
@@ -9194,9 +9194,9 @@ checksum = "343f3f510c2915908f155e94f17220b19ccfacf2a64a2a5d8004f2c3e311e7fd"
 
 [[package]]
 name = "syn"
-version = "1.0.48"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac"
+checksum = "cc60a3d73ea6594cd712d830cc1f0390fd71542d8c8cd24e70cc54cdfd5e05d5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9250,19 +9250,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "test-case"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a605baa797821796a751f4a959e1206079b24a4b7e1ed302b7d785d81a9276c9"
-dependencies = [
- "lazy_static",
- "proc-macro2",
- "quote",
- "syn",
- "version_check",
-]
-
 [[package]]
 name = "textwrap"
 version = "0.11.0"
diff --git a/client/chain-spec/derive/Cargo.toml b/client/chain-spec/derive/Cargo.toml
index 6826168a206a..9ad50482da46 100644
--- a/client/chain-spec/derive/Cargo.toml
+++ b/client/chain-spec/derive/Cargo.toml
@@ -18,6 +18,6 @@ proc-macro = true
 proc-macro-crate = "0.1.4"
 proc-macro2 = "1.0.6"
 quote = "1.0.3"
-syn = "1.0.7"
+syn = "1.0.58"
 
 [dev-dependencies]
diff --git a/client/cli/proc-macro/Cargo.toml b/client/cli/proc-macro/Cargo.toml
index 9b9d134c5a83..9805d87cb30e 100644
--- a/client/cli/proc-macro/Cargo.toml
+++ b/client/cli/proc-macro/Cargo.toml
@@ -18,4 +18,4 @@ proc-macro = true
 proc-macro-crate = "0.1.4"
 proc-macro2 = "1.0.6"
 quote = { version = "1.0.3", features = ["proc-macro"] }
-syn = { version = "1.0.7", features = ["proc-macro", "full", "extra-traits", "parsing"] }
+syn = { version = "1.0.58", features = ["proc-macro", "full", "extra-traits", "parsing"] }
diff --git a/client/executor/Cargo.toml b/client/executor/Cargo.toml
index f06a8c66f144..44eb6b98b056 100644
--- a/client/executor/Cargo.toml
+++ b/client/executor/Cargo.toml
@@ -44,12 +44,12 @@ hex-literal = "0.3.1"
 sc-runtime-test = { version = "2.0.0", path = "runtime-test" }
 substrate-test-runtime = { version = "2.0.0", path = "../../test-utils/runtime" }
 sp-state-machine = { version = "0.8.0", path = "../../primitives/state-machine" }
-test-case = "0.3.3"
 sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
 sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
 sc-tracing = { version = "2.0.0", path = "../tracing" }
 tracing = "0.1.22"
 tracing-subscriber = "0.2.15"
+paste = "0.1.6"
 
 [features]
 default = [ "std" ]
diff --git a/client/executor/src/integration_tests/mod.rs b/client/executor/src/integration_tests/mod.rs
index 5920d269c86e..661d2c5d3d35 100644
--- a/client/executor/src/integration_tests/mod.rs
+++ b/client/executor/src/integration_tests/mod.rs
@@ -26,7 +26,6 @@ use sp_core::{
 };
 use sc_runtime_test::wasm_binary_unwrap;
 use sp_state_machine::TestExternalities as CoreTestExternalities;
-use test_case::test_case;
 use sp_trie::{TrieConfiguration, trie_types::Layout};
 use sp_wasm_interface::HostFunctions as _;
 use sp_runtime::traits::BlakeTwo256;
@@ -37,6 +36,34 @@ use crate::WasmExecutionMethod;
 pub type TestExternalities = CoreTestExternalities<BlakeTwo256, u64>;
 type HostFunctions = sp_io::SubstrateHostFunctions;
 
+/// Simple macro that runs a given method as test with the available wasm execution methods.
+#[macro_export]
+macro_rules! test_wasm_execution {
+	($method_name:ident) => {
+		paste::item! {
+			#[test]
+			fn [<$method_name _interpreted>]() {
+				$method_name(WasmExecutionMethod::Interpreted);
+			}
+
+			#[test]
+			#[cfg(feature = "wasmtime")]
+			fn [<$method_name _compiled>]() {
+				$method_name(WasmExecutionMethod::Compiled);
+			}
+		}
+	};
+
+	(interpreted_only $method_name:ident) => {
+		paste::item! {
+			#[test]
+			fn [<$method_name _interpreted>]() {
+				$method_name(WasmExecutionMethod::Interpreted);
+			}
+		}
+	};
+}
+
 fn call_in_wasm<E: Externalities>(
 	function: &str,
 	call_data: &[u8],
@@ -59,8 +86,7 @@ fn call_in_wasm<E: Externalities>(
 	)
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
+test_wasm_execution!(returning_should_work);
 fn returning_should_work(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
@@ -74,8 +100,7 @@ fn returning_should_work(wasm_method: WasmExecutionMethod) {
 	assert_eq!(output, vec![0u8; 0]);
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
+test_wasm_execution!(call_not_existing_function);
 fn call_not_existing_function(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
@@ -102,8 +127,7 @@ fn call_not_existing_function(wasm_method: WasmExecutionMethod) {
 	}
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
+test_wasm_execution!(call_yet_another_not_existing_function);
 fn call_yet_another_not_existing_function(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
@@ -130,8 +154,7 @@ fn call_yet_another_not_existing_function(wasm_method: WasmExecutionMethod) {
 	}
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
+test_wasm_execution!(panicking_should_work);
 fn panicking_should_work(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
@@ -161,8 +184,7 @@ fn panicking_should_work(wasm_method: WasmExecutionMethod) {
 	assert!(output.is_err());
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
+test_wasm_execution!(storage_should_work);
 fn storage_should_work(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 
@@ -191,8 +213,7 @@ fn storage_should_work(wasm_method: WasmExecutionMethod) {
 	assert_eq!(ext, expected);
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
+test_wasm_execution!(clear_prefix_should_work);
 fn clear_prefix_should_work(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	{
@@ -225,8 +246,7 @@ fn clear_prefix_should_work(wasm_method: WasmExecutionMethod) {
 	assert_eq!(expected, ext);
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
+test_wasm_execution!(blake2_256_should_work);
 fn blake2_256_should_work(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
@@ -250,8 +270,7 @@ fn blake2_256_should_work(wasm_method: WasmExecutionMethod) {
 	);
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
+test_wasm_execution!(blake2_128_should_work);
 fn blake2_128_should_work(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
@@ -275,8 +294,7 @@ fn blake2_128_should_work(wasm_method: WasmExecutionMethod) {
 	);
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
+test_wasm_execution!(sha2_256_should_work);
 fn sha2_256_should_work(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
@@ -306,8 +324,7 @@ fn sha2_256_should_work(wasm_method: WasmExecutionMethod) {
 	);
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
+test_wasm_execution!(twox_256_should_work);
 fn twox_256_should_work(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
@@ -335,8 +352,7 @@ fn twox_256_should_work(wasm_method: WasmExecutionMethod) {
 	);
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
+test_wasm_execution!(twox_128_should_work);
 fn twox_128_should_work(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
@@ -360,8 +376,7 @@ fn twox_128_should_work(wasm_method: WasmExecutionMethod) {
 	);
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
+test_wasm_execution!(ed25519_verify_should_work);
 fn ed25519_verify_should_work(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
@@ -397,8 +412,7 @@ fn ed25519_verify_should_work(wasm_method: WasmExecutionMethod) {
 	);
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
+test_wasm_execution!(sr25519_verify_should_work);
 fn sr25519_verify_should_work(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
@@ -434,8 +448,7 @@ fn sr25519_verify_should_work(wasm_method: WasmExecutionMethod) {
 	);
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
+test_wasm_execution!(ordered_trie_root_should_work);
 fn ordered_trie_root_should_work(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let trie_input = vec![b"zero".to_vec(), b"one".to_vec(), b"two".to_vec()];
@@ -450,8 +463,7 @@ fn ordered_trie_root_should_work(wasm_method: WasmExecutionMethod) {
 	);
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
+test_wasm_execution!(offchain_index);
 fn offchain_index(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let (offchain, _state) = testing::TestOffchainExt::new();
@@ -472,8 +484,7 @@ fn offchain_index(wasm_method: WasmExecutionMethod) {
 	);
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
+test_wasm_execution!(offchain_local_storage_should_work);
 fn offchain_local_storage_should_work(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let (offchain, state) = testing::TestOffchainExt::new();
@@ -490,8 +501,7 @@ fn offchain_local_storage_should_work(wasm_method: WasmExecutionMethod) {
 	assert_eq!(state.read().persistent_storage.get(b"test"), Some(vec![]));
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
+test_wasm_execution!(offchain_http_should_work);
 fn offchain_http_should_work(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let (offchain, state) = testing::TestOffchainExt::new();
@@ -519,9 +529,7 @@ fn offchain_http_should_work(wasm_method: WasmExecutionMethod) {
 	);
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
-#[should_panic(expected = "Allocator ran out of space")]
+test_wasm_execution!(should_trap_when_heap_exhausted);
 fn should_trap_when_heap_exhausted(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 
@@ -531,18 +539,20 @@ fn should_trap_when_heap_exhausted(wasm_method: WasmExecutionMethod) {
 		HostFunctions::host_functions(),
 		8,
 	);
-	executor.call_in_wasm(
+
+	let err = executor.call_in_wasm(
 		&wasm_binary_unwrap()[..],
 		None,
 		"test_exhaust_heap",
 		&[0],
 		&mut ext.ext(),
 		sp_core::traits::MissingHostFunctions::Allow,
-	).unwrap();
+	).unwrap_err();
+
+	assert!(err.contains("Allocator ran out of space"));
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
+test_wasm_execution!(returns_mutable_static);
 fn returns_mutable_static(wasm_method: WasmExecutionMethod) {
 	let runtime = crate::wasm_runtime::create_wasm_runtime_with_code(
 		wasm_method,
@@ -567,8 +577,7 @@ fn returns_mutable_static(wasm_method: WasmExecutionMethod) {
 // returned to its initial value and thus the stack space is going to be leaked.
 //
 // See https://github.com/paritytech/substrate/issues/2967 for details
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
+test_wasm_execution!(restoration_of_globals);
 fn restoration_of_globals(wasm_method: WasmExecutionMethod) {
 	// Allocate 32 pages (of 65536 bytes) which gives the runtime 2048KB of heap to operate on
 	// (plus some additional space unused from the initial pages requested by the wasm runtime
@@ -596,7 +605,7 @@ fn restoration_of_globals(wasm_method: WasmExecutionMethod) {
 	assert!(res.is_ok());
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
+test_wasm_execution!(interpreted_only heap_is_reset_between_calls);
 fn heap_is_reset_between_calls(wasm_method: WasmExecutionMethod) {
 	let runtime = crate::wasm_runtime::create_wasm_runtime_with_code(
 		wasm_method,
@@ -620,8 +629,7 @@ fn heap_is_reset_between_calls(wasm_method: WasmExecutionMethod) {
 	instance.call_export("check_and_set_in_heap", &params).unwrap();
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
+test_wasm_execution!(parallel_execution);
 fn parallel_execution(wasm_method: WasmExecutionMethod) {
 	let executor = std::sync::Arc::new(crate::WasmExecutor::new(
 		wasm_method,
@@ -656,7 +664,7 @@ fn parallel_execution(wasm_method: WasmExecutionMethod) {
 	}
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
+test_wasm_execution!(wasm_tracing_should_work);
 fn wasm_tracing_should_work(wasm_method: WasmExecutionMethod) {
 
 	use std::sync::{Arc, Mutex};
@@ -728,10 +736,8 @@ fn wasm_tracing_should_work(wasm_method: WasmExecutionMethod) {
 	assert_eq!(len, 2);
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
+test_wasm_execution!(spawning_runtime_instance_should_work);
 fn spawning_runtime_instance_should_work(wasm_method: WasmExecutionMethod) {
-
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
 
@@ -743,10 +749,8 @@ fn spawning_runtime_instance_should_work(wasm_method: WasmExecutionMethod) {
 	).unwrap();
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
+test_wasm_execution!(spawning_runtime_instance_nested_should_work);
 fn spawning_runtime_instance_nested_should_work(wasm_method: WasmExecutionMethod) {
-
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
 
@@ -758,10 +762,8 @@ fn spawning_runtime_instance_nested_should_work(wasm_method: WasmExecutionMethod
 	).unwrap();
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
+test_wasm_execution!(panic_in_spawned_instance_panics_on_joining_its_result);
 fn panic_in_spawned_instance_panics_on_joining_its_result(wasm_method: WasmExecutionMethod) {
-
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
 
diff --git a/client/executor/src/integration_tests/sandbox.rs b/client/executor/src/integration_tests/sandbox.rs
index 3c964c628046..7ce9c94a2db8 100644
--- a/client/executor/src/integration_tests/sandbox.rs
+++ b/client/executor/src/integration_tests/sandbox.rs
@@ -18,12 +18,11 @@
 
 use super::{TestExternalities, call_in_wasm};
 use crate::WasmExecutionMethod;
+use crate::test_wasm_execution;
 
 use codec::Encode;
-use test_case::test_case;
 
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
+test_wasm_execution!(sandbox_should_work);
 fn sandbox_should_work(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
@@ -60,8 +59,7 @@ fn sandbox_should_work(wasm_method: WasmExecutionMethod) {
 	);
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
+test_wasm_execution!(sandbox_trap);
 fn sandbox_trap(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
@@ -87,8 +85,7 @@ fn sandbox_trap(wasm_method: WasmExecutionMethod) {
 	);
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
+test_wasm_execution!(start_called);
 fn start_called(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
@@ -131,8 +128,7 @@ fn start_called(wasm_method: WasmExecutionMethod) {
 	);
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
+test_wasm_execution!(invoke_args);
 fn invoke_args(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
@@ -171,8 +167,7 @@ fn invoke_args(wasm_method: WasmExecutionMethod) {
 	);
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
+test_wasm_execution!(return_val);
 fn return_val(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
@@ -199,8 +194,7 @@ fn return_val(wasm_method: WasmExecutionMethod) {
 	);
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
+test_wasm_execution!(unlinkable_module);
 fn unlinkable_module(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
@@ -225,8 +219,7 @@ fn unlinkable_module(wasm_method: WasmExecutionMethod) {
 	);
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
+test_wasm_execution!(corrupted_module);
 fn corrupted_module(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
@@ -245,8 +238,7 @@ fn corrupted_module(wasm_method: WasmExecutionMethod) {
 	);
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
+test_wasm_execution!(start_fn_ok);
 fn start_fn_ok(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
@@ -274,8 +266,7 @@ fn start_fn_ok(wasm_method: WasmExecutionMethod) {
 	);
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
+test_wasm_execution!(start_fn_traps);
 fn start_fn_traps(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
@@ -304,8 +295,7 @@ fn start_fn_traps(wasm_method: WasmExecutionMethod) {
 	);
 }
 
-#[test_case(WasmExecutionMethod::Interpreted)]
-#[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
+test_wasm_execution!(get_global_val_works);
 fn get_global_val_works(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
diff --git a/frame/staking/reward-curve/Cargo.toml b/frame/staking/reward-curve/Cargo.toml
index 19f7e51b8f6c..cde4482d7bb6 100644
--- a/frame/staking/reward-curve/Cargo.toml
+++ b/frame/staking/reward-curve/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 proc-macro = true
 
 [dependencies]
-syn = { version = "1.0.7", features = ["full", "visit"] }
+syn = { version = "1.0.58", features = ["full", "visit"] }
 quote = "1.0.3"
 proc-macro2 = "1.0.6"
 proc-macro-crate = "0.1.4"
diff --git a/frame/support/procedural/Cargo.toml b/frame/support/procedural/Cargo.toml
index 1f1a2f93ccbf..35ee5ce94c62 100644
--- a/frame/support/procedural/Cargo.toml
+++ b/frame/support/procedural/Cargo.toml
@@ -19,7 +19,7 @@ frame-support-procedural-tools = { version = "2.0.0", path = "./tools" }
 proc-macro2 = "1.0.6"
 quote = "1.0.3"
 Inflector = "0.11.4"
-syn = { version = "1.0.7", features = ["full"] }
+syn = { version = "1.0.58", features = ["full"] }
 
 [features]
 default = ["std"]
diff --git a/frame/support/procedural/src/storage/parse.rs b/frame/support/procedural/src/storage/parse.rs
index c9602344c597..2ff7f1fbf38c 100644
--- a/frame/support/procedural/src/storage/parse.rs
+++ b/frame/support/procedural/src/storage/parse.rs
@@ -47,7 +47,7 @@ mod keyword {
 pub struct Opt<P> {
 	pub inner: Option<P>,
 }
-impl<P: syn::export::ToTokens> syn::export::ToTokens for Opt<P> {
+impl<P: quote::ToTokens> quote::ToTokens for Opt<P> {
 	fn to_tokens(&self, tokens: &mut proc_macro2::TokenStream) {
 		if let Some(ref p) = self.inner {
 			p.to_tokens(tokens);
diff --git a/frame/support/procedural/tools/Cargo.toml b/frame/support/procedural/tools/Cargo.toml
index b9a9cc7adb0d..3f73df8fa219 100644
--- a/frame/support/procedural/tools/Cargo.toml
+++ b/frame/support/procedural/tools/Cargo.toml
@@ -15,5 +15,5 @@ targets = ["x86_64-unknown-linux-gnu"]
 frame-support-procedural-tools-derive = { version = "2.0.0", path = "./derive" }
 proc-macro2 = "1.0.6"
 quote = "1.0.3"
-syn = { version = "1.0.7", features = ["full", "visit"] }
+syn = { version = "1.0.58", features = ["full", "visit"] }
 proc-macro-crate = "0.1.5"
diff --git a/frame/support/procedural/tools/derive/Cargo.toml b/frame/support/procedural/tools/derive/Cargo.toml
index b616dd790d61..461d2f6fbf8c 100644
--- a/frame/support/procedural/tools/derive/Cargo.toml
+++ b/frame/support/procedural/tools/derive/Cargo.toml
@@ -17,4 +17,4 @@ proc-macro = true
 [dependencies]
 proc-macro2 = "1.0.6"
 quote = { version = "1.0.3", features = ["proc-macro"] }
-syn = { version = "1.0.7", features = ["proc-macro" ,"full", "extra-traits", "parsing"] }
+syn = { version = "1.0.58", features = ["proc-macro" ,"full", "extra-traits", "parsing"] }
diff --git a/primitives/api/proc-macro/Cargo.toml b/primitives/api/proc-macro/Cargo.toml
index 9b1661cf5ef6..21f4dec96b56 100644
--- a/primitives/api/proc-macro/Cargo.toml
+++ b/primitives/api/proc-macro/Cargo.toml
@@ -18,7 +18,7 @@ proc-macro = true
 
 [dependencies]
 quote = "1.0.3"
-syn = { version = "1.0.8", features = ["full", "fold", "extra-traits", "visit"] }
+syn = { version = "1.0.58", features = ["full", "fold", "extra-traits", "visit"] }
 proc-macro2 = "1.0.6"
 blake2-rfc = { version = "0.2.18", default-features = false }
 proc-macro-crate = "0.1.4"
diff --git a/primitives/debug-derive/Cargo.toml b/primitives/debug-derive/Cargo.toml
index 10164553f857..d39af3a5be69 100644
--- a/primitives/debug-derive/Cargo.toml
+++ b/primitives/debug-derive/Cargo.toml
@@ -18,7 +18,7 @@ proc-macro = true
 
 [dependencies]
 quote = "1.0.3"
-syn = "1.0.7"
+syn = "1.0.58"
 proc-macro2 = "1.0"
 
 [features]
diff --git a/primitives/npos-elections/compact/Cargo.toml b/primitives/npos-elections/compact/Cargo.toml
index 1873f8fa1605..cee3bf9f67aa 100644
--- a/primitives/npos-elections/compact/Cargo.toml
+++ b/primitives/npos-elections/compact/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 proc-macro = true
 
 [dependencies]
-syn = { version = "1.0.7", features = ["full", "visit"] }
+syn = { version = "1.0.58", features = ["full", "visit"] }
 quote = "1.0"
 proc-macro2 = "1.0.6"
 proc-macro-crate = "0.1.4"
diff --git a/primitives/runtime-interface/proc-macro/Cargo.toml b/primitives/runtime-interface/proc-macro/Cargo.toml
index 8358d2170575..67aa201dce24 100644
--- a/primitives/runtime-interface/proc-macro/Cargo.toml
+++ b/primitives/runtime-interface/proc-macro/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 proc-macro = true
 
 [dependencies]
-syn = { version = "1.0.5", features = ["full", "visit", "fold", "extra-traits"] }
+syn = { version = "1.0.58", features = ["full", "visit", "fold", "extra-traits"] }
 quote = "1.0.3"
 proc-macro2 = "1.0.3"
 Inflector = "0.11.4"
diff --git a/test-utils/derive/Cargo.toml b/test-utils/derive/Cargo.toml
index 263bfd353734..a8e5a3463567 100644
--- a/test-utils/derive/Cargo.toml
+++ b/test-utils/derive/Cargo.toml
@@ -10,7 +10,7 @@ description = "Substrate test utilities macros"
 
 [dependencies]
 quote = "1.0.6"
-syn = { version = "1.0.33", features = ["full"] }
+syn = { version = "1.0.58", features = ["full"] }
 proc-macro-crate = "0.1.4"
 
 [lib]

From 08a60097cc310edd511ea5ecc5bd930702b46dfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Thu, 7 Jan 2021 13:14:42 +0100
Subject: [PATCH 0238/1194] Subkey should not import the entire world. (#7845)

There is no reason for subkey to import the default Substrate node to
support a feature that would only be usable for the Substrate node.
Subkey itself should be more the default key management binary for
Substrate related chains. If certain chains require some special
functionality, they can easily stick together their own "my-chain-key".
---
 Cargo.lock                   |  5 -----
 bin/utils/subkey/Cargo.toml  |  8 --------
 bin/utils/subkey/src/lib.rs  | 30 +++++++++---------------------
 bin/utils/subkey/src/main.rs |  4 +---
 4 files changed, 10 insertions(+), 37 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fa7bc74ae1a1..1cd16f289748 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8913,13 +8913,8 @@ dependencies = [
 name = "subkey"
 version = "2.0.0"
 dependencies = [
- "frame-system",
- "node-primitives",
- "node-runtime",
  "sc-cli",
- "sp-core",
  "structopt",
- "substrate-frame-cli",
 ]
 
 [[package]]
diff --git a/bin/utils/subkey/Cargo.toml b/bin/utils/subkey/Cargo.toml
index fa0b345bc840..e445749c2c2e 100644
--- a/bin/utils/subkey/Cargo.toml
+++ b/bin/utils/subkey/Cargo.toml
@@ -16,13 +16,5 @@ name = "subkey"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-node-runtime = { version = "2.0.0", path = "../../node/runtime" }
-node-primitives = { version = "2.0.0", path = "../../node/primitives" }
 sc-cli = { version = "0.8.0", path = "../../../client/cli" }
-substrate-frame-cli = { version = "2.0.0", path = "../../../utils/frame/frame-utilities-cli" }
 structopt = "0.3.14"
-frame-system = { version = "2.0.0", path = "../../../frame/system" }
-sp-core = { version = "2.0.0", path = "../../../primitives/core" }
-
-[features]
-bench = []
diff --git a/bin/utils/subkey/src/lib.rs b/bin/utils/subkey/src/lib.rs
index 5f7787f02240..e7243fbd43e4 100644
--- a/bin/utils/subkey/src/lib.rs
+++ b/bin/utils/subkey/src/lib.rs
@@ -21,8 +21,6 @@ use sc_cli::{
 	Error, VanityCmd, SignCmd, VerifyCmd, GenerateNodeKeyCmd, GenerateCmd, InspectKeyCmd,
 	InspectNodeKeyCmd
 };
-use substrate_frame_cli::ModuleIdCmd;
-use sp_core::crypto::Ss58Codec;
 
 #[derive(Debug, StructOpt)]
 #[structopt(
@@ -44,9 +42,6 @@ pub enum Subkey {
 	/// Print the peer ID corresponding to the node key in the given file
 	InspectNodeKey(InspectNodeKeyCmd),
 
-	/// Inspect a module ID address
-	ModuleId(ModuleIdCmd),
-
 	/// Sign a message, with a given (secret) key.
 	Sign(SignCmd),
 
@@ -58,21 +53,14 @@ pub enum Subkey {
 }
 
 /// Run the subkey command, given the apropriate runtime.
-pub fn run<R>() -> Result<(), Error>
-	where
-		R: frame_system::Config,
-		R::AccountId: Ss58Codec
-{
+pub fn run() -> Result<(), Error> {
 	match Subkey::from_args() {
-		Subkey::GenerateNodeKey(cmd) => cmd.run()?,
-		Subkey::Generate(cmd) => cmd.run()?,
-		Subkey::Inspect(cmd) => cmd.run()?,
-		Subkey::InspectNodeKey(cmd) => cmd.run()?,
-		Subkey::ModuleId(cmd) => cmd.run::<R>()?,
-		Subkey::Vanity(cmd) => cmd.run()?,
-		Subkey::Verify(cmd) => cmd.run()?,
-		Subkey::Sign(cmd) => cmd.run()?,
-	};
-
-	Ok(())
+		Subkey::GenerateNodeKey(cmd) => cmd.run(),
+		Subkey::Generate(cmd) => cmd.run(),
+		Subkey::Inspect(cmd) => cmd.run(),
+		Subkey::InspectNodeKey(cmd) => cmd.run(),
+		Subkey::Vanity(cmd) => cmd.run(),
+		Subkey::Verify(cmd) => cmd.run(),
+		Subkey::Sign(cmd) => cmd.run(),
+	}
 }
diff --git a/bin/utils/subkey/src/main.rs b/bin/utils/subkey/src/main.rs
index 39f2f9e2e5b9..2a0f0850713f 100644
--- a/bin/utils/subkey/src/main.rs
+++ b/bin/utils/subkey/src/main.rs
@@ -18,8 +18,6 @@
 
 //! Subkey utility, based on node_runtime.
 
-use node_runtime::Runtime;
-
 fn main() -> Result<(), sc_cli::Error> {
-	subkey::run::<Runtime>()
+	subkey::run()
 }

From c9d93653e567f10867273b0171f3025419795c37 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Thu, 7 Jan 2021 14:52:39 +0100
Subject: [PATCH 0239/1194] Rework priority groups, take 2 (#7700)

* Rework priority groups

* Broken tests fix

* Fix warning causing CI to fail

* [Hack] Try restore backwards-compatibility

* Fix peerset bug

* Doc fixes and clean up

* Error on state mismatch

* Try debug CI

* CI debugging

* [CI debug] Can I please see this line

* Revert "[CI debug] Can I please see this line"

This reverts commit 4b7cf7c1511f579cd818b21d46bd11642dfac5cb.

* Revert "CI debugging"

This reverts commit 9011f1f564b860386dc7dd6ffa9fc34ea7107623.

* Fix error! which isn't actually an error

* Fix Ok() returned when actually Err()

* Tweaks and fixes

* Fix build

* Peerset bugfix

* [Debug] Try outbound GrandPa slots

* Another bugfix

* Revert "[Debug] Try outbound GrandPa slots"

This reverts commit d175b9208c088faad77d9f0ce36ff6f48bd92dd3.

* [Debug] Try outbound GrandPa slots

* Apply suggestions from code review

Co-authored-by: Max Inden <mail@max-inden.de>

* Use consts for hardcoded peersets

* Revert "Try debug CI"

This reverts commit 62c4ad5e79c03d561c714a008022ecac463a597e.

* Renames

* Line widths

* Add doc

Co-authored-by: Max Inden <mail@max-inden.de>
---
 bin/node-template/node/src/service.rs         |    5 +-
 bin/node/cli/src/service.rs                   |    4 +-
 client/authority-discovery/src/error.rs       |    2 -
 client/authority-discovery/src/worker.rs      |   78 --
 .../src/worker/addr_cache.rs                  |   41 -
 .../authority-discovery/src/worker/tests.rs   |   44 +-
 client/cli/src/params/network_params.rs       |   20 +-
 .../src/communication/tests.rs                |    6 +-
 client/finality-grandpa/src/lib.rs            |   17 +-
 client/network-gossip/src/bridge.rs           |   14 +-
 client/network-gossip/src/lib.rs              |   39 +-
 client/network-gossip/src/state_machine.rs    |    8 +-
 client/network/src/behaviour.rs               |   86 +-
 client/network/src/config.rs                  |   59 +-
 client/network/src/gossip/tests.rs            |   24 +-
 client/network/src/light_client_handler.rs    |    5 +-
 client/network/src/network_state.rs           |    6 -
 client/network/src/protocol.rs                |  667 +++++++----
 client/network/src/protocol/event.rs          |   12 +
 .../src/protocol/generic_proto/behaviour.rs   | 1026 ++++++++---------
 .../src/protocol/generic_proto/handler.rs     |  854 ++++++--------
 .../src/protocol/generic_proto/tests.rs       |   43 +-
 .../generic_proto/upgrade/notifications.rs    |    5 -
 client/network/src/service.rs                 |  343 +++---
 client/network/src/service/out_events.rs      |   20 +
 client/network/src/service/tests.rs           |   70 +-
 client/network/test/src/lib.rs                |    9 +-
 client/peerset/src/lib.rs                     |  726 ++++++------
 client/peerset/src/peersstate.rs              |  608 +++++++---
 client/peerset/tests/fuzz.rs                  |  142 ++-
 30 files changed, 2716 insertions(+), 2267 deletions(-)

diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
index 7e1939fb023a..92dfc8f1887c 100644
--- a/bin/node-template/node/src/service.rs
+++ b/bin/node-template/node/src/service.rs
@@ -107,7 +107,8 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 			}
 		};
 	}
-	config.network.notifications_protocols.push(sc_finality_grandpa::GRANDPA_PROTOCOL_NAME.into());
+
+	config.network.extra_sets.push(sc_finality_grandpa::grandpa_peers_set_config());
 
 	let (network, network_status_sinks, system_rpc_tx, network_starter) =
 		sc_service::build_network(sc_service::BuildNetworkParams {
@@ -244,7 +245,7 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
 	let (client, backend, keystore_container, mut task_manager, on_demand) =
 		sc_service::new_light_parts::<Block, RuntimeApi, Executor>(&config)?;
 
-	config.network.notifications_protocols.push(sc_finality_grandpa::GRANDPA_PROTOCOL_NAME.into());
+	config.network.extra_sets.push(sc_finality_grandpa::grandpa_peers_set_config());
 
 	let select_chain = sc_consensus::LongestChain::new(backend.clone());
 
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index 0b4e24f2ce64..84d931b2a1e2 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -178,7 +178,7 @@ pub fn new_full_base(
 
 	let shared_voter_state = rpc_setup;
 
-	config.network.notifications_protocols.push(grandpa::GRANDPA_PROTOCOL_NAME.into());
+	config.network.extra_sets.push(grandpa::grandpa_peers_set_config());
 
 	let (network, network_status_sinks, system_rpc_tx, network_starter) =
 		sc_service::build_network(sc_service::BuildNetworkParams {
@@ -346,7 +346,7 @@ pub fn new_light_base(mut config: Configuration) -> Result<(
 	let (client, backend, keystore_container, mut task_manager, on_demand) =
 		sc_service::new_light_parts::<Block, RuntimeApi, Executor>(&config)?;
 
-	config.network.notifications_protocols.push(grandpa::GRANDPA_PROTOCOL_NAME.into());
+	config.network.extra_sets.push(grandpa::grandpa_peers_set_config());
 
 	let select_chain = sc_consensus::LongestChain::new(backend.clone());
 
diff --git a/client/authority-discovery/src/error.rs b/client/authority-discovery/src/error.rs
index f482d1924835..b271f7b9d62b 100644
--- a/client/authority-discovery/src/error.rs
+++ b/client/authority-discovery/src/error.rs
@@ -38,8 +38,6 @@ pub enum Error {
 	CallingRuntime(sp_blockchain::Error),
 	/// Received a dht record with a key that does not match any in-flight awaited keys.
 	ReceivingUnexpectedRecord,
-	/// Failed to set the authority discovery peerset priority group in the peerset module.
-	SettingPeersetPriorityGroup(String),
 	/// Failed to encode a protobuf payload.
 	EncodingProto(prost::EncodeError),
 	/// Failed to decode a protobuf payload.
diff --git a/client/authority-discovery/src/worker.rs b/client/authority-discovery/src/worker.rs
index 0f4986a4a146..e47f42a445ee 100644
--- a/client/authority-discovery/src/worker.rs
+++ b/client/authority-discovery/src/worker.rs
@@ -57,10 +57,6 @@ pub mod tests;
 
 const LOG_TARGET: &'static str = "sub-authority-discovery";
 
-/// Name of the Substrate peerset priority group for authorities discovered through the authority
-/// discovery module.
-const AUTHORITIES_PRIORITY_GROUP_NAME: &'static str = "authorities";
-
 /// Maximum number of addresses cached per authority. Additional addresses are discarded.
 const MAX_ADDRESSES_PER_AUTHORITY: usize = 10;
 
@@ -115,9 +111,6 @@ pub struct Worker<Client, Network, Block, DhtEventStream> {
 	publish_interval: ExpIncInterval,
 	/// Interval at which to request addresses of authorities, refilling the pending lookups queue.
 	query_interval: ExpIncInterval,
-	/// Interval on which to set the peerset priority group to a new random
-	/// set of addresses.
-	priority_group_set_interval: ExpIncInterval,
 
 	/// Queue of throttled lookups pending to be passed to the network.
 	pending_lookups: Vec<AuthorityId>,
@@ -166,13 +159,6 @@ where
 			Duration::from_secs(2),
 			config.max_query_interval,
 		);
-		let priority_group_set_interval = ExpIncInterval::new(
-			Duration::from_secs(2),
-			// Trade-off between node connection churn and connectivity. Using half of
-			// [`crate::WorkerConfig::max_query_interval`] to update priority group once at the
-			// beginning and once in the middle of each query interval.
-			config.max_query_interval / 2,
-		);
 
 		let addr_cache = AddrCache::new();
 
@@ -196,7 +182,6 @@ where
 			dht_event_rx,
 			publish_interval,
 			query_interval,
-			priority_group_set_interval,
 			pending_lookups: Vec::new(),
 			in_flight_lookups: HashMap::new(),
 			addr_cache,
@@ -226,15 +211,6 @@ where
 				msg = self.from_service.select_next_some() => {
 					self.process_message_from_service(msg);
 				},
-				// Set peerset priority group to a new random set of addresses.
-				_ = self.priority_group_set_interval.next().fuse() => {
-					if let Err(e) = self.set_priority_group().await {
-						error!(
-							target: LOG_TARGET,
-							"Failed to set priority group: {:?}", e,
-						);
-					}
-				},
 				// Publish own addresses.
 				_ = self.publish_interval.next().fuse() => {
 					if let Err(e) = self.publish_ext_addresses().await {
@@ -582,38 +558,6 @@ where
 
 		Ok(intersection)
 	}
-
-	/// Set the peer set 'authority' priority group to a new random set of
-	/// [`Multiaddr`]s.
-	async fn set_priority_group(&self) -> Result<()> {
-		let addresses = self.addr_cache.get_random_subset();
-
-		if addresses.is_empty() {
-			debug!(
-				target: LOG_TARGET,
-				"Got no addresses in cache for peerset priority group.",
-			);
-			return Ok(());
-		}
-
-		if let Some(metrics) = &self.metrics {
-			metrics.priority_group_size.set(addresses.len().try_into().unwrap_or(std::u64::MAX));
-		}
-
-		debug!(
-			target: LOG_TARGET,
-			"Applying priority group {:?} to peerset.", addresses,
-		);
-
-		self.network
-			.set_priority_group(
-				AUTHORITIES_PRIORITY_GROUP_NAME.to_string(),
-				addresses.into_iter().collect(),
-			).await
-			.map_err(Error::SettingPeersetPriorityGroup)?;
-
-		Ok(())
-	}
 }
 
 /// NetworkProvider provides [`Worker`] with all necessary hooks into the
@@ -621,13 +565,6 @@ where
 /// [`sc_network::NetworkService`] directly is necessary to unit test [`Worker`].
 #[async_trait]
 pub trait NetworkProvider: NetworkStateInfo {
-	/// Modify a peerset priority group.
-	async fn set_priority_group(
-		&self,
-		group_id: String,
-		peers: HashSet<libp2p::Multiaddr>,
-	) -> std::result::Result<(), String>;
-
 	/// Start putting a value in the Dht.
 	fn put_value(&self, key: libp2p::kad::record::Key, value: Vec<u8>);
 
@@ -641,13 +578,6 @@ where
 	B: BlockT + 'static,
 	H: ExHashT,
 {
-	async fn set_priority_group(
-		&self,
-		group_id: String,
-		peers: HashSet<libp2p::Multiaddr>,
-	) -> std::result::Result<(), String> {
-		self.set_priority_group(group_id, peers).await
-	}
 	fn put_value(&self, key: libp2p::kad::record::Key, value: Vec<u8>) {
 		self.put_value(key, value)
 	}
@@ -670,7 +600,6 @@ pub(crate) struct Metrics {
 	dht_event_received: CounterVec<U64>,
 	handle_value_found_event_failure: Counter<U64>,
 	known_authorities_count: Gauge<U64>,
-	priority_group_size: Gauge<U64>,
 }
 
 impl Metrics {
@@ -730,13 +659,6 @@ impl Metrics {
 				)?,
 				registry,
 			)?,
-			priority_group_size: register(
-				Gauge::new(
-					"authority_discovery_priority_group_size",
-					"Number of addresses passed to the peer set as a priority group."
-				)?,
-				registry,
-			)?,
 		})
 	}
 }
diff --git a/client/authority-discovery/src/worker/addr_cache.rs b/client/authority-discovery/src/worker/addr_cache.rs
index 4ae6ae0cdeb7..1ad7f585e294 100644
--- a/client/authority-discovery/src/worker/addr_cache.rs
+++ b/client/authority-discovery/src/worker/addr_cache.rs
@@ -17,17 +17,11 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use libp2p::core::multiaddr::{Multiaddr, Protocol};
-use rand::seq::SliceRandom;
 use std::collections::HashMap;
 
 use sp_authority_discovery::AuthorityId;
 use sc_network::PeerId;
 
-/// The maximum number of authority connections initialized through the authority discovery module.
-///
-/// In other words the maximum size of the `authority` peerset priority group.
-const MAX_NUM_AUTHORITY_CONN: usize = 10;
-
 /// Cache for [`AuthorityId`] -> [`Vec<Multiaddr>`] and [`PeerId`] -> [`AuthorityId`] mappings.
 pub(super) struct AddrCache {
 	authority_id_to_addresses: HashMap<AuthorityId, Vec<Multiaddr>>,
@@ -77,30 +71,6 @@ impl AddrCache {
 		self.peer_id_to_authority_id.get(peer_id)
 	}
 
-	/// Returns a single address for a random subset (maximum of [`MAX_NUM_AUTHORITY_CONN`]) of all
-	/// known authorities.
-	pub fn get_random_subset(&self) -> Vec<Multiaddr> {
-		let mut rng = rand::thread_rng();
-
-		let mut addresses = self
-			.authority_id_to_addresses
-			.iter()
-			.filter_map(|(_authority_id, addresses)| {
-				debug_assert!(!addresses.is_empty());
-				addresses
-					.choose(&mut rng)
-			})
-			.collect::<Vec<&Multiaddr>>();
-
-		addresses.sort_unstable_by(|a, b| a.as_ref().cmp(b.as_ref()));
-		addresses.dedup();
-
-		addresses
-			.choose_multiple(&mut rng, MAX_NUM_AUTHORITY_CONN)
-			.map(|a| (**a).clone())
-			.collect()
-	}
-
 	/// Removes all [`PeerId`]s and [`Multiaddr`]s from the cache that are not related to the given
 	/// [`AuthorityId`]s.
 	pub fn retain_ids(&mut self, authority_ids: &Vec<AuthorityId>) {
@@ -192,11 +162,6 @@ mod tests {
 			cache.insert(second.0.clone(), vec![second.1.clone()]);
 			cache.insert(third.0.clone(), vec![third.1.clone()]);
 
-			let subset = cache.get_random_subset();
-			assert!(
-				subset.contains(&first.1) && subset.contains(&second.1) && subset.contains(&third.1),
-				"Expect initial subset to contain all authorities.",
-			);
 			assert_eq!(
 				Some(&vec![third.1.clone()]),
 				cache.get_addresses_by_authority_id(&third.0),
@@ -210,12 +175,6 @@ mod tests {
 
 			cache.retain_ids(&vec![first.0, second.0]);
 
-			let subset = cache.get_random_subset();
-			assert!(
-				subset.contains(&first.1) || subset.contains(&second.1),
-				"Expected both first and second authority."
-			);
-			assert!(!subset.contains(&third.1), "Did not expect address from third authority");
 			assert_eq!(
 				None, cache.get_addresses_by_authority_id(&third.0),
 				"Expect `get_addresses_by_authority_id` to not return `None` for third authority."
diff --git a/client/authority-discovery/src/worker/tests.rs b/client/authority-discovery/src/worker/tests.rs
index 2bc9c1ba6aaf..20c4c937096a 100644
--- a/client/authority-discovery/src/worker/tests.rs
+++ b/client/authority-discovery/src/worker/tests.rs
@@ -18,7 +18,7 @@
 
 use crate::worker::schema;
 
-use std::{iter::FromIterator, sync::{Arc, Mutex}, task::Poll};
+use std::{sync::{Arc, Mutex}, task::Poll};
 
 use async_trait::async_trait;
 use futures::channel::mpsc::{self, channel};
@@ -112,10 +112,6 @@ sp_api::mock_impl_runtime_apis! {
 pub enum TestNetworkEvent {
 	GetCalled(kad::record::Key),
 	PutCalled(kad::record::Key, Vec<u8>),
-	SetPriorityGroupCalled {
-		group_id: String,
-		peers: HashSet<Multiaddr>
-	},
 }
 
 pub struct TestNetwork {
@@ -125,7 +121,6 @@ pub struct TestNetwork {
 	// vectors below.
 	pub put_value_call: Arc<Mutex<Vec<(kad::record::Key, Vec<u8>)>>>,
 	pub get_value_call: Arc<Mutex<Vec<kad::record::Key>>>,
-	pub set_priority_group_call: Arc<Mutex<Vec<(String, HashSet<Multiaddr>)>>>,
 	event_sender: mpsc::UnboundedSender<TestNetworkEvent>,
 	event_receiver: Option<mpsc::UnboundedReceiver<TestNetworkEvent>>,
 }
@@ -147,7 +142,6 @@ impl Default for TestNetwork {
 			],
 			put_value_call: Default::default(),
 			get_value_call: Default::default(),
-			set_priority_group_call: Default::default(),
 			event_sender: tx,
 			event_receiver: Some(rx),
 		}
@@ -156,21 +150,6 @@ impl Default for TestNetwork {
 
 #[async_trait]
 impl NetworkProvider for TestNetwork {
-	async fn set_priority_group(
-		&self,
-		group_id: String,
-		peers: HashSet<Multiaddr>,
-	) -> std::result::Result<(), String> {
-		self.set_priority_group_call
-			.lock()
-			.unwrap()
-			.push((group_id.clone(), peers.clone()));
-		self.event_sender.clone().unbounded_send(TestNetworkEvent::SetPriorityGroupCalled {
-			group_id,
-			peers,
-		}).unwrap();
-		Ok(())
-	}
 	fn put_value(&self, key: kad::record::Key, value: Vec<u8>) {
 		self.put_value_call.lock().unwrap().push((key.clone(), value.clone()));
 		self.event_sender.clone().unbounded_send(TestNetworkEvent::PutCalled(key, value)).unwrap();
@@ -296,14 +275,6 @@ fn publish_discover_cycle() {
 	let (_dht_event_tx, dht_event_rx) = channel(1000);
 
 	let network: Arc<TestNetwork> = Arc::new(Default::default());
-	let node_a_multiaddr = {
-		let peer_id = network.local_peer_id();
-		let address = network.external_addresses().pop().unwrap();
-
-		address.with(multiaddr::Protocol::P2p(
-			peer_id.into(),
-		))
-	};
 
 	let key_store = KeyStore::new();
 
@@ -365,19 +336,6 @@ fn publish_discover_cycle() {
 
 		// Make authority discovery handle the event.
 		worker.handle_dht_event(dht_event).await;
-
-		worker.set_priority_group().await.unwrap();
-
-		// Expect authority discovery to set the priority set.
-		assert_eq!(network.set_priority_group_call.lock().unwrap().len(), 1);
-
-		assert_eq!(
-			network.set_priority_group_call.lock().unwrap()[0],
-			(
-				"authorities".to_string(),
-				HashSet::from_iter(vec![node_a_multiaddr.clone()].into_iter())
-			)
-		);
 	}.boxed_local().into());
 
 	pool.run();
diff --git a/client/cli/src/params/network_params.rs b/client/cli/src/params/network_params.rs
index 2040bd9bc78e..130325a7f9d4 100644
--- a/client/cli/src/params/network_params.rs
+++ b/client/cli/src/params/network_params.rs
@@ -18,7 +18,7 @@
 
 use crate::params::node_key_params::NodeKeyParams;
 use sc_network::{
-	config::{NetworkConfiguration, NodeKeyConfig, NonReservedPeerMode, TransportConfig},
+	config::{NetworkConfiguration, NodeKeyConfig, NonReservedPeerMode, SetConfig, TransportConfig},
 	multiaddr::Protocol,
 };
 use sc_service::{ChainSpec, ChainType, config::{Multiaddr, MultiaddrWithPeerId}};
@@ -150,21 +150,23 @@ impl NetworkParams {
 		NetworkConfiguration {
 			boot_nodes,
 			net_config_path,
-			reserved_nodes: self.reserved_nodes.clone(),
-			non_reserved_mode: if self.reserved_only {
-				NonReservedPeerMode::Deny
-			} else {
-				NonReservedPeerMode::Accept
+			default_peers_set: SetConfig {
+				in_peers: self.in_peers,
+				out_peers: self.out_peers,
+				reserved_nodes: self.reserved_nodes.clone(),
+				non_reserved_mode: if self.reserved_only {
+					NonReservedPeerMode::Deny
+				} else {
+					NonReservedPeerMode::Accept
+				},
 			},
 			listen_addresses,
 			public_addresses,
-			notifications_protocols: Vec::new(),
+			extra_sets: Vec::new(),
 			request_response_protocols: Vec::new(),
 			node_key,
 			node_name: node_name.to_string(),
 			client_version: client_id.to_string(),
-			in_peers: self.in_peers,
-			out_peers: self.out_peers,
 			transport: TransportConfig::Normal {
 				enable_mdns: !is_dev && !self.no_mdns,
 				allow_private_ipv4: !self.no_private_ipv4,
diff --git a/client/finality-grandpa/src/communication/tests.rs b/client/finality-grandpa/src/communication/tests.rs
index d7db68d0652b..b2e4c405b4f7 100644
--- a/client/finality-grandpa/src/communication/tests.rs
+++ b/client/finality-grandpa/src/communication/tests.rs
@@ -58,7 +58,11 @@ impl sc_network_gossip::Network<Block> for TestNetwork {
 		let _ = self.sender.unbounded_send(Event::Report(who, cost_benefit));
 	}
 
-	fn disconnect_peer(&self, _: PeerId) {}
+	fn add_set_reserved(&self, _: PeerId, _: Cow<'static, str>) {}
+
+	fn remove_set_reserved(&self, _: PeerId, _: Cow<'static, str>) {}
+
+	fn disconnect_peer(&self, _: PeerId, _: Cow<'static, str>) {}
 
 	fn write_notification(&self, who: PeerId, _: Cow<'static, str>, message: Vec<u8>) {
 		let _ = self.sender.unbounded_send(Event::WriteNotification(who, message));
diff --git a/client/finality-grandpa/src/lib.rs b/client/finality-grandpa/src/lib.rs
index 0c38d796197c..6215e2b9f993 100644
--- a/client/finality-grandpa/src/lib.rs
+++ b/client/finality-grandpa/src/lib.rs
@@ -122,7 +122,6 @@ mod until_imported;
 mod voting_rule;
 
 pub use authorities::{SharedAuthoritySet, AuthoritySet};
-pub use communication::GRANDPA_PROTOCOL_NAME;
 pub use finality_proof::{FinalityProofFragment, FinalityProofProvider, StorageAndProofProvider};
 pub use notification::{GrandpaJustificationSender, GrandpaJustificationStream};
 pub use import::GrandpaBlockImport;
@@ -656,7 +655,7 @@ pub struct GrandpaParams<Block: BlockT, C, N, SC, VR> {
 	///
 	/// It is assumed that this network will feed us Grandpa notifications. When using the
 	/// `sc_network` crate, it is assumed that the Grandpa notifications protocol has been passed
-	/// to the configuration of the networking.
+	/// to the configuration of the networking. See [`grandpa_peers_set_config`].
 	pub network: N,
 	/// If supplied, can be used to hook on telemetry connection established events.
 	pub telemetry_on_connect: Option<TracingUnboundedReceiver<()>>,
@@ -668,6 +667,20 @@ pub struct GrandpaParams<Block: BlockT, C, N, SC, VR> {
 	pub shared_voter_state: SharedVoterState,
 }
 
+/// Returns the configuration value to put in
+/// [`sc_network::config::NetworkConfiguration::extra_sets`].
+pub fn grandpa_peers_set_config() -> sc_network::config::NonDefaultSetConfig {
+	sc_network::config::NonDefaultSetConfig {
+		notifications_protocol: communication::GRANDPA_PROTOCOL_NAME.into(),
+		set_config: sc_network::config::SetConfig {
+			in_peers: 25,
+			out_peers: 25,
+			reserved_nodes: Vec::new(),
+			non_reserved_mode: sc_network::config::NonReservedPeerMode::Accept,
+		},
+	}
+}
+
 /// Run a GRANDPA voter as a task. Provide configuration and a link to a
 /// block import worker that has already been instantiated with `block_import`.
 pub fn run_grandpa_voter<Block: BlockT, BE: 'static, C, N, SC, VR>(
diff --git a/client/network-gossip/src/bridge.rs b/client/network-gossip/src/bridge.rs
index 9f1813f22244..d444409d1cd3 100644
--- a/client/network-gossip/src/bridge.rs
+++ b/client/network-gossip/src/bridge.rs
@@ -180,6 +180,12 @@ impl<B: BlockT> Future for GossipEngine<B> {
 				ForwardingState::Idle => {
 					match this.network_event_stream.poll_next_unpin(cx) {
 						Poll::Ready(Some(event)) => match event {
+							Event::SyncConnected { remote } => {
+								this.network.add_set_reserved(remote, this.protocol.clone());
+							}
+							Event::SyncDisconnected { remote } => {
+								this.network.remove_set_reserved(remote, this.protocol.clone());
+							}
 							Event::NotificationStreamOpened { remote, protocol, role } => {
 								if protocol != this.protocol {
 									continue;
@@ -325,10 +331,16 @@ mod tests {
 		fn report_peer(&self, _: PeerId, _: ReputationChange) {
 		}
 
-		fn disconnect_peer(&self, _: PeerId) {
+		fn disconnect_peer(&self, _: PeerId, _: Cow<'static, str>) {
 			unimplemented!();
 		}
 
+		fn add_set_reserved(&self, _: PeerId, _: Cow<'static, str>) {
+		}
+
+		fn remove_set_reserved(&self, _: PeerId, _: Cow<'static, str>) {
+		}
+
 		fn write_notification(&self, _: PeerId, _: Cow<'static, str>, _: Vec<u8>) {
 			unimplemented!();
 		}
diff --git a/client/network-gossip/src/lib.rs b/client/network-gossip/src/lib.rs
index 81575bdc774e..59c99088bdf2 100644
--- a/client/network-gossip/src/lib.rs
+++ b/client/network-gossip/src/lib.rs
@@ -40,6 +40,11 @@
 //! - Use the methods of the `GossipEngine` in order to send out messages and receive incoming
 //!   messages.
 //!
+//! The `GossipEngine` will automatically use `Network::add_set_reserved` and
+//! `Network::remove_set_reserved` to maintain a set of peers equal to the set of peers the
+//! node is syncing from. See the documentation of `sc-network` for more explanations about the
+//! concepts of peer sets.
+//!
 //! # What is a validator?
 //!
 //! The primary role of a `Validator` is to process incoming messages from peers, and decide
@@ -61,9 +66,9 @@ pub use self::state_machine::TopicNotification;
 pub use self::validator::{DiscardAll, MessageIntent, Validator, ValidatorContext, ValidationResult};
 
 use futures::prelude::*;
-use sc_network::{Event, ExHashT, NetworkService, PeerId, ReputationChange};
+use sc_network::{multiaddr, Event, ExHashT, NetworkService, PeerId, ReputationChange};
 use sp_runtime::{traits::Block as BlockT};
-use std::{borrow::Cow, pin::Pin, sync::Arc};
+use std::{borrow::Cow, iter, pin::Pin, sync::Arc};
 
 mod bridge;
 mod state_machine;
@@ -77,8 +82,14 @@ pub trait Network<B: BlockT> {
 	/// Adjust the reputation of a node.
 	fn report_peer(&self, peer_id: PeerId, reputation: ReputationChange);
 
+	/// Adds the peer to the set of peers to be connected to with this protocol.
+	fn add_set_reserved(&self, who: PeerId, protocol: Cow<'static, str>);
+
+	/// Removes the peer from the set of peers to be connected to with this protocol.
+	fn remove_set_reserved(&self, who: PeerId, protocol: Cow<'static, str>);
+
 	/// Force-disconnect a peer.
-	fn disconnect_peer(&self, who: PeerId);
+	fn disconnect_peer(&self, who: PeerId, protocol: Cow<'static, str>);
 
 	/// Send a notification to a peer.
 	fn write_notification(&self, who: PeerId, protocol: Cow<'static, str>, message: Vec<u8>);
@@ -99,8 +110,26 @@ impl<B: BlockT, H: ExHashT> Network<B> for Arc<NetworkService<B, H>> {
 		NetworkService::report_peer(self, peer_id, reputation);
 	}
 
-	fn disconnect_peer(&self, who: PeerId) {
-		NetworkService::disconnect_peer(self, who)
+	fn add_set_reserved(&self, who: PeerId, protocol: Cow<'static, str>) {
+		let addr = iter::once(multiaddr::Protocol::P2p(who.into()))
+			.collect::<multiaddr::Multiaddr>();
+		let result = NetworkService::add_to_peers_set(self, protocol, iter::once(addr).collect());
+		if let Err(err) = result {
+			log::error!(target: "gossip", "add_set_reserved failed: {}", err);
+		}
+	}
+
+	fn remove_set_reserved(&self, who: PeerId, protocol: Cow<'static, str>) {
+		let addr = iter::once(multiaddr::Protocol::P2p(who.into()))
+			.collect::<multiaddr::Multiaddr>();
+		let result = NetworkService::remove_from_peers_set(self, protocol, iter::once(addr).collect());
+		if let Err(err) = result {
+			log::error!(target: "gossip", "remove_set_reserved failed: {}", err);
+		}
+	}
+
+	fn disconnect_peer(&self, who: PeerId, protocol: Cow<'static, str>) {
+		NetworkService::disconnect_peer(self, who, protocol)
 	}
 
 	fn write_notification(&self, who: PeerId, protocol: Cow<'static, str>, message: Vec<u8>) {
diff --git a/client/network-gossip/src/state_machine.rs b/client/network-gossip/src/state_machine.rs
index 7ae630a97232..58a0f62cb130 100644
--- a/client/network-gossip/src/state_machine.rs
+++ b/client/network-gossip/src/state_machine.rs
@@ -495,10 +495,16 @@ mod tests {
 			self.inner.lock().unwrap().peer_reports.push((peer_id, reputation_change));
 		}
 
-		fn disconnect_peer(&self, _: PeerId) {
+		fn disconnect_peer(&self, _: PeerId, _: Cow<'static, str>) {
 			unimplemented!();
 		}
 
+		fn add_set_reserved(&self, _: PeerId, _: Cow<'static, str>) {
+		}
+
+		fn remove_set_reserved(&self, _: PeerId, _: Cow<'static, str>) {
+		}
+
 		fn write_notification(&self, _: PeerId, _: Cow<'static, str>, _: Vec<u8>) {
 			unimplemented!();
 		}
diff --git a/client/network/src/behaviour.rs b/client/network/src/behaviour.rs
index 64426cae6f65..de983bd7139d 100644
--- a/client/network/src/behaviour.rs
+++ b/client/network/src/behaviour.rs
@@ -24,7 +24,6 @@ use crate::{
 };
 
 use bytes::Bytes;
-use codec::Encode as _;
 use futures::channel::oneshot;
 use libp2p::NetworkBehaviour;
 use libp2p::core::{Multiaddr, PeerId, PublicKey};
@@ -157,6 +156,12 @@ pub enum BehaviourOut<B: BlockT> {
 		messages: Vec<(Cow<'static, str>, Bytes)>,
 	},
 
+	/// Now connected to a new peer for syncing purposes.
+	SyncConnected(PeerId),
+
+	/// No longer connected to a peer for syncing purposes.
+	SyncDisconnected(PeerId),
+
 	/// Events generated by a DHT as a response to get_value or put_value requests as well as the
 	/// request duration.
 	Dht(DhtEvent, Duration),
@@ -242,35 +247,6 @@ impl<B: BlockT, H: ExHashT> Behaviour<B, H> {
 		self.request_responses.send_request(target, protocol, request, pending_response)
 	}
 
-	/// Registers a new notifications protocol.
-	///
-	/// Please call `event_stream` before registering a protocol, otherwise you may miss events
-	/// about the protocol that you have registered.
-	///
-	/// You are very strongly encouraged to call this method very early on. Any connection open
-	/// will retain the protocols that were registered then, and not any new one.
-	pub fn register_notifications_protocol(
-		&mut self,
-		protocol: impl Into<Cow<'static, str>>,
-	) {
-		let protocol = protocol.into();
-
-		// This is the message that we will send to the remote as part of the initial handshake.
-		// At the moment, we force this to be an encoded `Roles`.
-		let handshake_message = Roles::from(&self.role).encode();
-
-		let list = self.substrate.register_notifications_protocol(protocol.clone(), handshake_message);
-		for (remote, roles, notifications_sink) in list {
-			let role = reported_roles_to_observed_role(&self.role, remote, roles);
-			self.events.push_back(BehaviourOut::NotificationStreamOpened {
-				remote: remote.clone(),
-				protocol: protocol.clone(),
-				role,
-				notifications_sink: notifications_sink.clone(),
-			});
-		}
-	}
-
 	/// Returns a shared reference to the user protocol.
 	pub fn user_protocol(&self) -> &Protocol<B, H> {
 		&self.substrate
@@ -343,38 +319,36 @@ Behaviour<B, H> {
 					&target, &self.block_request_protocol_name, buf, pending_response,
 				);
 			},
-			CustomMessageOutcome::NotificationStreamOpened { remote, protocols, roles, notifications_sink } => {
+			CustomMessageOutcome::NotificationStreamOpened { remote, protocol, roles, notifications_sink } => {
 				let role = reported_roles_to_observed_role(&self.role, &remote, roles);
-				for protocol in protocols {
-					self.events.push_back(BehaviourOut::NotificationStreamOpened {
-						remote: remote.clone(),
-						protocol,
-						role: role.clone(),
-						notifications_sink: notifications_sink.clone(),
-					});
-				}
+				self.events.push_back(BehaviourOut::NotificationStreamOpened {
+					remote,
+					protocol,
+					role: role.clone(),
+					notifications_sink: notifications_sink.clone(),
+				});
 			},
-			CustomMessageOutcome::NotificationStreamReplaced { remote, protocols, notifications_sink } =>
-				for protocol in protocols {
-					self.events.push_back(BehaviourOut::NotificationStreamReplaced {
-						remote: remote.clone(),
-						protocol,
-						notifications_sink: notifications_sink.clone(),
-					});
-				},
-			CustomMessageOutcome::NotificationStreamClosed { remote, protocols } =>
-				for protocol in protocols {
-					self.events.push_back(BehaviourOut::NotificationStreamClosed {
-						remote: remote.clone(),
-						protocol,
-					});
-				},
+			CustomMessageOutcome::NotificationStreamReplaced { remote, protocol, notifications_sink } =>
+				self.events.push_back(BehaviourOut::NotificationStreamReplaced {
+					remote,
+					protocol,
+					notifications_sink,
+				}),
+			CustomMessageOutcome::NotificationStreamClosed { remote, protocol } =>
+				self.events.push_back(BehaviourOut::NotificationStreamClosed {
+					remote,
+					protocol,
+				}),
 			CustomMessageOutcome::NotificationsReceived { remote, messages } => {
 				self.events.push_back(BehaviourOut::NotificationsReceived { remote, messages });
 			},
 			CustomMessageOutcome::PeerNewBest(peer_id, number) => {
 				self.light_client_handler.update_best_block(&peer_id, number);
 			}
+			CustomMessageOutcome::SyncConnected(peer_id) =>
+				self.events.push_back(BehaviourOut::SyncConnected(peer_id)),
+			CustomMessageOutcome::SyncDisconnected(peer_id) =>
+				self.events.push_back(BehaviourOut::SyncDisconnected(peer_id)),
 			CustomMessageOutcome::None => {}
 		}
 	}
@@ -425,7 +399,7 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviourEventProcess<peer_info::PeerInfoEven
 		for addr in listen_addrs {
 			self.discovery.add_self_reported_address(&peer_id, protocols.iter(), addr);
 		}
-		self.substrate.add_discovered_nodes(iter::once(peer_id));
+		self.substrate.add_default_set_discovered_nodes(iter::once(peer_id));
 	}
 }
 
@@ -440,7 +414,7 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviourEventProcess<DiscoveryOut>
 				// implementation for `PeerInfoEvent`.
 			}
 			DiscoveryOut::Discovered(peer_id) => {
-				self.substrate.add_discovered_nodes(iter::once(peer_id));
+				self.substrate.add_default_set_discovered_nodes(iter::once(peer_id));
 			}
 			DiscoveryOut::ValueFound(results, duration) => {
 				self.events.push_back(BehaviourOut::Dht(DhtEvent::ValueFound(results), duration));
diff --git a/client/network/src/config.rs b/client/network/src/config.rs
index b7e47e973a33..aee07e74645c 100644
--- a/client/network/src/config.rs
+++ b/client/network/src/config.rs
@@ -382,18 +382,12 @@ pub struct NetworkConfiguration {
 	pub boot_nodes: Vec<MultiaddrWithPeerId>,
 	/// The node key configuration, which determines the node's network identity keypair.
 	pub node_key: NodeKeyConfig,
-	/// List of names of notifications protocols that the node supports.
-	pub notifications_protocols: Vec<Cow<'static, str>>,
 	/// List of request-response protocols that the node supports.
 	pub request_response_protocols: Vec<RequestResponseConfig>,
-	/// Maximum allowed number of incoming connections.
-	pub in_peers: u32,
-	/// Number of outgoing connections we're trying to maintain.
-	pub out_peers: u32,
-	/// List of reserved node addresses.
-	pub reserved_nodes: Vec<MultiaddrWithPeerId>,
-	/// The non-reserved peer mode.
-	pub non_reserved_mode: NonReservedPeerMode,
+	/// Configuration for the default set of nodes used for block syncing and transactions.
+	pub default_peers_set: SetConfig,
+	/// Configuration for extra sets of nodes.
+	pub extra_sets: Vec<NonDefaultSetConfig>,
 	/// Client identifier. Sent over the wire for debugging purposes.
 	pub client_version: String,
 	/// Name of the node. Sent over the wire for debugging purposes.
@@ -423,12 +417,9 @@ impl NetworkConfiguration {
 			public_addresses: Vec::new(),
 			boot_nodes: Vec::new(),
 			node_key,
-			notifications_protocols: Vec::new(),
 			request_response_protocols: Vec::new(),
-			in_peers: 25,
-			out_peers: 75,
-			reserved_nodes: Vec::new(),
-			non_reserved_mode: NonReservedPeerMode::Accept,
+			default_peers_set: Default::default(),
+			extra_sets: Vec::new(),
 			client_version: client_version.into(),
 			node_name: node_name.into(),
 			transport: TransportConfig::Normal {
@@ -481,6 +472,44 @@ impl NetworkConfiguration {
 	}
 }
 
+/// Configuration for a set of nodes.
+#[derive(Clone, Debug)]
+pub struct SetConfig {
+	/// Maximum allowed number of incoming substreams related to this set.
+	pub in_peers: u32,
+	/// Number of outgoing substreams related to this set that we're trying to maintain.
+	pub out_peers: u32,
+	/// List of reserved node addresses.
+	pub reserved_nodes: Vec<MultiaddrWithPeerId>,
+	/// Whether nodes that aren't in [`SetConfig::reserved_nodes`] are accepted or automatically
+	/// refused.
+	pub non_reserved_mode: NonReservedPeerMode,
+}
+
+impl Default for SetConfig {
+	fn default() -> Self {
+		SetConfig {
+			in_peers: 25,
+			out_peers: 75,
+			reserved_nodes: Vec::new(),
+			non_reserved_mode: NonReservedPeerMode::Accept,
+		}
+	}
+}
+
+/// Extension to [`SetConfig`] for sets that aren't the default set.
+#[derive(Clone, Debug)]
+pub struct NonDefaultSetConfig {
+	/// Name of the notifications protocols of this set. A substream on this set will be
+	/// considered established once this protocol is open.
+	///
+	/// > **Note**: This field isn't present for the default set, as this is handled internally
+	/// >           by the networking code.
+	pub notifications_protocol: Cow<'static, str>,
+	/// Base configuration.
+	pub set_config: SetConfig,
+}
+
 /// Configuration for the transport layer.
 #[derive(Clone, Debug)]
 pub enum TransportConfig {
diff --git a/client/network/src/gossip/tests.rs b/client/network/src/gossip/tests.rs
index e621adf0c09e..d2bf4eeca61a 100644
--- a/client/network/src/gossip/tests.rs
+++ b/client/network/src/gossip/tests.rs
@@ -141,19 +141,31 @@ fn build_nodes_one_proto()
 	let listen_addr = config::build_multiaddr![Memory(rand::random::<u64>())];
 
 	let (node1, events_stream1) = build_test_full_node(config::NetworkConfiguration {
-		notifications_protocols: vec![PROTOCOL_NAME],
+		extra_sets: vec![
+			config::NonDefaultSetConfig {
+				notifications_protocol: PROTOCOL_NAME,
+				set_config: Default::default()
+			}
+		],
 		listen_addresses: vec![listen_addr.clone()],
 		transport: config::TransportConfig::MemoryOnly,
 		.. config::NetworkConfiguration::new_local()
 	});
 
 	let (node2, events_stream2) = build_test_full_node(config::NetworkConfiguration {
-		notifications_protocols: vec![PROTOCOL_NAME],
 		listen_addresses: vec![],
-		reserved_nodes: vec![config::MultiaddrWithPeerId {
-			multiaddr: listen_addr,
-			peer_id: node1.local_peer_id().clone(),
-		}],
+		extra_sets: vec![
+			config::NonDefaultSetConfig {
+				notifications_protocol: PROTOCOL_NAME,
+				set_config: config::SetConfig {
+					reserved_nodes: vec![config::MultiaddrWithPeerId {
+						multiaddr: listen_addr,
+						peer_id: node1.local_peer_id().clone(),
+					}],
+					.. Default::default()
+				},
+			}
+		],
 		transport: config::TransportConfig::MemoryOnly,
 		.. config::NetworkConfiguration::new_local()
 	});
diff --git a/client/network/src/light_client_handler.rs b/client/network/src/light_client_handler.rs
index 3ac6e67a2327..3974d3ecd7c3 100644
--- a/client/network/src/light_client_handler.rs
+++ b/client/network/src/light_client_handler.rs
@@ -1301,7 +1301,8 @@ fn fmt_keys(first: Option<&Vec<u8>>, last: Option<&Vec<u8>>) -> String {
 	}
 }
 
-#[cfg(test)]
+// TODO:
+/*#[cfg(test)]
 mod tests {
 	use super::*;
 	use async_std::task;
@@ -2058,4 +2059,4 @@ mod tests {
 				.contains(BlockAttributes::BODY)
 		);
 	}
-}
+}*/
diff --git a/client/network/src/network_state.rs b/client/network/src/network_state.rs
index ba3e7cbff456..fe612dcccf91 100644
--- a/client/network/src/network_state.rs
+++ b/client/network/src/network_state.rs
@@ -57,12 +57,6 @@ pub struct Peer {
 	pub version_string: Option<String>,
 	/// Latest ping duration with this node.
 	pub latest_ping_time: Option<Duration>,
-	/// If true, the peer is "enabled", which means that we try to open Substrate-related protocols
-	/// with this peer. If false, we stick to Kademlia and/or other network-only protocols.
-	pub enabled: bool,
-	/// If true, the peer is "open", which means that we have a Substrate-related protocol
-	/// with this peer.
-	pub open: bool,
 	/// List of addresses known for this node.
 	pub known_addresses: HashSet<Multiaddr>,
 }
diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index e3d6d5e815c3..5679292967df 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -19,7 +19,7 @@
 use crate::{
 	ExHashT,
 	chain::Client,
-	config::{ProtocolId, TransactionPool, TransactionImportFuture, TransactionImport},
+	config::{self, ProtocolId, TransactionPool, TransactionImportFuture, TransactionImport},
 	error,
 	request_responses::RequestFailure,
 	utils::{interval, LruHashSet},
@@ -87,6 +87,14 @@ pub(crate) const CURRENT_VERSION: u32 = 6;
 /// Lowest version we support
 pub(crate) const MIN_VERSION: u32 = 3;
 
+/// Identifier of the peerset for the block announces protocol.
+const HARDCODED_PEERSETS_SYNC: sc_peerset::SetId = sc_peerset::SetId::from(0);
+/// Identifier of the peerset for the transactions protocol.
+const HARDCODED_PEERSETS_TX: sc_peerset::SetId = sc_peerset::SetId::from(1);
+/// Number of hardcoded peersets (the constants right above). Any set whose identifier is equal or
+/// superior to this value corresponds to a user-defined protocol.
+const NUM_HARDCODED_PEERSETS: usize = 2;
+
 /// When light node connects to the full node and the full node is behind light node
 /// for at least `LIGHT_MAXIMAL_BLOCKS_DIFFERENCE` blocks, we consider it not useful
 /// and disconnect to free connection slot.
@@ -216,16 +224,10 @@ pub struct Protocol<B: BlockT, H: ExHashT> {
 	behaviour: GenericProto,
 	/// List of notifications protocols that have been registered.
 	notification_protocols: Vec<Cow<'static, str>>,
-	/// For each protocol name, the legacy equivalent.
-	legacy_equiv_by_name: HashMap<Cow<'static, str>, Fallback>,
-	/// Name of the protocol used for transactions.
-	transactions_protocol: Cow<'static, str>,
-	/// Name of the protocol used for block announces.
-	block_announces_protocol: Cow<'static, str>,
 	/// Prometheus metrics.
 	metrics: Option<Metrics>,
 	/// The `PeerId`'s of all boot nodes.
-	boot_node_ids: Arc<HashSet<PeerId>>,
+	boot_node_ids: HashSet<PeerId>,
 }
 
 #[derive(Default)]
@@ -339,30 +341,18 @@ fn build_status_message<B: BlockT>(
 	Message::<B>::Status(status).encode()
 }
 
-/// Fallback mechanism to use to send a notification if no substream is open.
-#[derive(Debug, Clone, PartialEq, Eq)]
-enum Fallback {
-	/// Formerly-known as `Consensus` messages. Now regular notifications.
-	Consensus,
-	/// The message is the bytes encoding of a `Transactions<E>` (which is itself defined as a `Vec<E>`).
-	Transactions,
-	/// The message is the bytes encoding of a `BlockAnnounce<H>`.
-	BlockAnnounce,
-}
-
 impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 	/// Create a new instance.
 	pub fn new(
 		config: ProtocolConfig,
-		local_peer_id: PeerId,
 		chain: Arc<dyn Client<B>>,
 		transaction_pool: Arc<dyn TransactionPool<H, B>>,
 		protocol_id: ProtocolId,
-		peerset_config: sc_peerset::PeersetConfig,
+		config_role: &config::Role,
+		network_config: &config::NetworkConfiguration,
 		block_announce_validator: Box<dyn BlockAnnounceValidator<B> + Send>,
 		metrics_registry: Option<&Registry>,
-		boot_node_ids: Arc<HashSet<PeerId>>,
-	) -> error::Result<(Protocol<B, H>, sc_peerset::PeersetHandle)> {
+	) -> error::Result<(Protocol<B, H>, sc_peerset::PeersetHandle, Vec<(PeerId, Multiaddr)>)> {
 		let info = chain.info();
 		let sync = ChainSync::new(
 			config.roles,
@@ -372,18 +362,104 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 			config.max_parallel_downloads,
 		);
 
+		let boot_node_ids = {
+			let mut list = HashSet::new();
+			for node in &network_config.boot_nodes {
+				list.insert(node.peer_id.clone());
+			}
+			list.shrink_to_fit();
+			list
+		};
+
 		let important_peers = {
 			let mut imp_p = HashSet::new();
-			for reserved in peerset_config.priority_groups.iter().flat_map(|(_, l)| l.iter()) {
-				imp_p.insert(reserved.clone());
+			for reserved in &network_config.default_peers_set.reserved_nodes {
+				imp_p.insert(reserved.peer_id.clone());
+			}
+			for reserved in network_config.extra_sets.iter().flat_map(|s| s.set_config.reserved_nodes.iter()) {
+				imp_p.insert(reserved.peer_id.clone());
 			}
 			imp_p.shrink_to_fit();
 			imp_p
 		};
 
-		let (peerset, peerset_handle) = sc_peerset::Peerset::from_config(peerset_config);
+		let mut known_addresses = Vec::new();
+
+		let (peerset, peerset_handle) = {
+			let mut sets = Vec::with_capacity(NUM_HARDCODED_PEERSETS + network_config.extra_sets.len());
+
+			let mut default_sets_reserved = HashSet::new();
+			match config_role {
+				config::Role::Sentry { validators } => {
+					for validator in validators {
+						default_sets_reserved.insert(validator.peer_id.clone());
+						known_addresses.push((validator.peer_id.clone(), validator.multiaddr.clone()));
+					}
+				}
+				config::Role::Authority { sentry_nodes } => {
+					for sentry_node in sentry_nodes {
+						default_sets_reserved.insert(sentry_node.peer_id.clone());
+						known_addresses.push((sentry_node.peer_id.clone(), sentry_node.multiaddr.clone()));
+					}
+				}
+				_ => {}
+			};
+			for reserved in network_config.default_peers_set.reserved_nodes.iter() {
+				default_sets_reserved.insert(reserved.peer_id.clone());
+				known_addresses.push((reserved.peer_id.clone(), reserved.multiaddr.clone()));
+			}
+
+			let mut bootnodes = Vec::with_capacity(network_config.boot_nodes.len());
+			for bootnode in network_config.boot_nodes.iter() {
+				bootnodes.push(bootnode.peer_id.clone());
+				known_addresses.push((bootnode.peer_id.clone(), bootnode.multiaddr.clone()));
+			}
+
+			// Set number 0 is used for block announces.
+			sets.push(sc_peerset::SetConfig {
+				in_peers: network_config.default_peers_set.in_peers,
+				out_peers: network_config.default_peers_set.out_peers,
+				bootnodes,
+				reserved_nodes: default_sets_reserved.clone(),
+				reserved_only: network_config.default_peers_set.non_reserved_mode
+					== config::NonReservedPeerMode::Deny,
+			});
+
+			// Set number 1 is used for transactions.
+			// The `reserved_nodes` of this set are later kept in sync with the peers we connect
+			// to through set 0.
+			sets.push(sc_peerset::SetConfig {
+				in_peers: network_config.default_peers_set.in_peers,
+				out_peers: network_config.default_peers_set.out_peers,
+				bootnodes: Vec::new(),
+				reserved_nodes: default_sets_reserved,
+				reserved_only: network_config.default_peers_set.non_reserved_mode
+					== config::NonReservedPeerMode::Deny,
+			});
+
+			for set_cfg in &network_config.extra_sets {
+				let mut reserved_nodes = HashSet::new();
+				for reserved in set_cfg.set_config.reserved_nodes.iter() {
+					reserved_nodes.insert(reserved.peer_id.clone());
+					known_addresses.push((reserved.peer_id.clone(), reserved.multiaddr.clone()));
+				}
+
+				let reserved_only =
+					set_cfg.set_config.non_reserved_mode == config::NonReservedPeerMode::Deny;
+
+				sets.push(sc_peerset::SetConfig {
+					in_peers: set_cfg.set_config.in_peers,
+					out_peers: set_cfg.set_config.out_peers,
+					bootnodes: Vec::new(),
+					reserved_nodes,
+					reserved_only,
+				});
+			}
 
-		let mut legacy_equiv_by_name = HashMap::new();
+			sc_peerset::Peerset::from_config(sc_peerset::PeersetConfig {
+				sets,
+			})
+		};
 
 		let transactions_protocol: Cow<'static, str> = Cow::from({
 			let mut proto = String::new();
@@ -392,7 +468,6 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 			proto.push_str("/transactions/1");
 			proto
 		});
-		legacy_equiv_by_name.insert(transactions_protocol.clone(), Fallback::Transactions);
 
 		let block_announces_protocol: Cow<'static, str> = Cow::from({
 			let mut proto = String::new();
@@ -401,10 +476,10 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 			proto.push_str("/block-announces/1");
 			proto
 		});
-		legacy_equiv_by_name.insert(block_announces_protocol.clone(), Fallback::BlockAnnounce);
 
 		let behaviour = {
 			let versions = &((MIN_VERSION as u8)..=(CURRENT_VERSION as u8)).collect::<Vec<u8>>();
+			let handshake_message = Roles::from(config_role).encode();
 
 			let best_number = info.best_number;
 			let best_hash = info.best_hash;
@@ -417,15 +492,15 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 				genesis_hash,
 			).encode();
 			GenericProto::new(
-				local_peer_id,
 				protocol_id.clone(),
 				versions,
 				build_status_message::<B>(&config, best_number, best_hash, genesis_hash),
 				peerset,
-				// As documented in `GenericProto`, the first protocol in the list is always the
-				// one carrying the handshake reported in the `CustomProtocolOpen` event.
-				iter::once((block_announces_protocol.clone(), block_announces_handshake))
-					.chain(iter::once((transactions_protocol.clone(), vec![]))),
+				iter::once((block_announces_protocol, block_announces_handshake))
+					.chain(iter::once((transactions_protocol, vec![])))
+					.chain(network_config.extra_sets.iter()
+						.map(|s| (s.notifications_protocol.clone(), handshake_message.clone()))
+					),
 			)
 		};
 
@@ -447,10 +522,8 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 			transaction_pool,
 			peerset_handle: peerset_handle.clone(),
 			behaviour,
-			notification_protocols: Vec::new(),
-			legacy_equiv_by_name,
-			transactions_protocol,
-			block_announces_protocol,
+			notification_protocols:
+				network_config.extra_sets.iter().map(|s| s.notifications_protocol.clone()).collect(),
 			metrics: if let Some(r) = metrics_registry {
 				Some(Metrics::register(r)?)
 			} else {
@@ -459,7 +532,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 			boot_node_ids,
 		};
 
-		Ok((protocol, peerset_handle))
+		Ok((protocol, peerset_handle, known_addresses))
 	}
 
 	/// Returns the list of all the peers we have an open channel to.
@@ -467,14 +540,10 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 		self.behaviour.open_peers()
 	}
 
-	/// Returns true if we have a channel open with this node.
-	pub fn is_open(&self, peer_id: &PeerId) -> bool {
-		self.behaviour.is_open(peer_id)
-	}
-
-	/// Returns the list of all the peers that the peerset currently requests us to be connected to.
+	/// Returns the list of all the peers that the peerset currently requests us to be connected
+	/// to on the default set.
 	pub fn requested_peers(&self) -> impl Iterator<Item = &PeerId> {
-		self.behaviour.requested_peers()
+		self.behaviour.requested_peers(HARDCODED_PEERSETS_SYNC)
 	}
 
 	/// Returns the number of discovered nodes that we keep in memory.
@@ -483,13 +552,12 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 	}
 
 	/// Disconnects the given peer if we are connected to it.
-	pub fn disconnect_peer(&mut self, peer_id: &PeerId) {
-		self.behaviour.disconnect_peer(peer_id)
-	}
-
-	/// Returns true if we try to open protocols with the given peer.
-	pub fn is_enabled(&self, peer_id: &PeerId) -> bool {
-		self.behaviour.is_enabled(peer_id)
+	pub fn disconnect_peer(&mut self, peer_id: &PeerId, protocol_name: &str) {
+		if let Some(position) = self.notification_protocols.iter().position(|p| *p == protocol_name) {
+			self.behaviour.disconnect_peer(peer_id, sc_peerset::SetId::from(position + NUM_HARDCODED_PEERSETS));
+		} else {
+			log::warn!(target: "sub-libp2p", "disconnect_peer() with invalid protocol name")
+		}
 	}
 
 	/// Returns the state of the peerset manager, for debugging purposes.
@@ -551,7 +619,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 			build_status_message::<B>(&self.config, number, hash, self.genesis_hash),
 		);
 		self.behaviour.set_notif_protocol_handshake(
-			&self.block_announces_protocol,
+			HARDCODED_PEERSETS_SYNC,
 			BlockAnnouncesHandshake::<B>::build(
 				&self.config,
 				number,
@@ -629,7 +697,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 					"Received no longer supported legacy request from {:?}",
 					who
 				);
-				self.disconnect_peer(&who);
+				self.behaviour.disconnect_peer(&who, HARDCODED_PEERSETS_SYNC);
 				self.peerset_handle.report_peer(who, rep::BAD_PROTOCOL);
 			},
 		}
@@ -645,24 +713,21 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 		prepare_block_request::<B, H>(&mut self.context_data.peers, who, request)
 	}
 
-	/// Called by peer when it is disconnecting
-	pub fn on_peer_disconnected(&mut self, peer: PeerId) -> CustomMessageOutcome<B> {
+	/// Called by peer when it is disconnecting.
+	///
+	/// Returns a result if the handshake of this peer was indeed accepted.
+	pub fn on_sync_peer_disconnected(&mut self, peer: PeerId) -> Result<(), ()> {
 		if self.important_peers.contains(&peer) {
 			warn!(target: "sync", "Reserved peer {} disconnected", peer);
 		} else {
 			trace!(target: "sync", "{} disconnected", peer);
 		}
 
-		if let Some(_peer_data) =  self.context_data.peers.remove(&peer) {
+		if let Some(_peer_data) = self.context_data.peers.remove(&peer) {
 			self.sync.peer_disconnected(&peer);
-
-			// Notify all the notification protocols as closed.
-			CustomMessageOutcome::NotificationStreamClosed {
-				remote: peer,
-				protocols: self.notification_protocols.clone(),
-			}
+			Ok(())
 		} else {
-			CustomMessageOutcome::None
+			Err(())
 		}
 	}
 
@@ -749,7 +814,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 				Ok(sync::OnBlockJustification::Import { peer, hash, number, justification }) =>
 					CustomMessageOutcome::JustificationImport(peer, hash, number, justification),
 				Err(sync::BadPeer(id, repu)) => {
-					self.behaviour.disconnect_peer(&id);
+					self.behaviour.disconnect_peer(&id, HARDCODED_PEERSETS_SYNC);
 					self.peerset_handle.report_peer(id, repu);
 					CustomMessageOutcome::None
 				}
@@ -762,7 +827,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 					self.prepare_block_request(peer, req)
 				}
 				Err(sync::BadPeer(id, repu)) => {
-					self.behaviour.disconnect_peer(&id);
+					self.behaviour.disconnect_peer(&id, HARDCODED_PEERSETS_SYNC);
 					self.peerset_handle.report_peer(id, repu);
 					CustomMessageOutcome::None
 				}
@@ -777,19 +842,24 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 		self.report_metrics()
 	}
 
-	/// Called on the first connection between two peers, after their exchange of handshake.
-	fn on_peer_connected(
+	/// Called on the first connection between two peers on the default set, after their exchange
+	/// of handshake.
+	///
+	/// Returns `Ok` if the handshake is accepted and the peer added to the list of peers we sync
+	/// from.
+	fn on_sync_peer_connected(
 		&mut self,
 		who: PeerId,
 		status: BlockAnnouncesHandshake<B>,
-		notifications_sink: NotificationsSink,
-	) -> CustomMessageOutcome<B> {
+	) -> Result<(), ()> {
 		trace!(target: "sync", "New peer {} {:?}", who, status);
 
 		if self.context_data.peers.contains_key(&who) {
-			debug!(target: "sync", "Ignoring duplicate status packet from {}", who);
-			return CustomMessageOutcome::None;
+			log::error!(target: "sync", "Called on_sync_peer_connected with already connected peer {}", who);
+			debug_assert!(false);
+			return Err(());
 		}
+
 		if status.genesis_hash != self.genesis_hash {
 			log!(
 				target: "sync",
@@ -798,7 +868,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 				self.genesis_hash, status.genesis_hash
 			);
 			self.peerset_handle.report_peer(who.clone(), rep::GENESIS_MISMATCH);
-			self.behaviour.disconnect_peer(&who);
+			self.behaviour.disconnect_peer(&who, HARDCODED_PEERSETS_SYNC);
 
 			if self.boot_node_ids.contains(&who) {
 				error!(
@@ -810,7 +880,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 				);
 			}
 
-			return CustomMessageOutcome::None;
+			return Err(());
 		}
 
 		if self.config.roles.is_light() {
@@ -818,8 +888,8 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 			if status.roles.is_light() {
 				debug!(target: "sync", "Peer {} is unable to serve light requests", who);
 				self.peerset_handle.report_peer(who.clone(), rep::BAD_ROLE);
-				self.behaviour.disconnect_peer(&who);
-				return CustomMessageOutcome::None;
+				self.behaviour.disconnect_peer(&who, HARDCODED_PEERSETS_SYNC);
+				return Err(());
 			}
 
 			// we don't interested in peers that are far behind us
@@ -835,8 +905,8 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 			if blocks_difference > LIGHT_MAXIMAL_BLOCKS_DIFFERENCE {
 				debug!(target: "sync", "Peer {} is far behind us and will unable to serve light requests", who);
 				self.peerset_handle.report_peer(who.clone(), rep::PEER_BEHIND_US_LIGHT);
-				self.behaviour.disconnect_peer(&who);
-				return CustomMessageOutcome::None;
+				self.behaviour.disconnect_peer(&who, HARDCODED_PEERSETS_SYNC);
+				return Err(());
 			}
 		}
 
@@ -853,64 +923,31 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 				.expect("Constant is nonzero")),
 			next_request_id: 0,
 		};
-		self.context_data.peers.insert(who.clone(), peer);
-
-		debug!(target: "sync", "Connected {}", who);
 
-		let info = self.context_data.peers.get(&who).expect("We just inserted above; QED").info.clone();
-		self.pending_messages.push_back(CustomMessageOutcome::PeerNewBest(who.clone(), status.best_number));
-		if info.roles.is_full() {
-			match self.sync.new_peer(who.clone(), info.best_hash, info.best_number) {
-				Ok(None) => (),
-				Ok(Some(req)) => {
-					let event = self.prepare_block_request(who.clone(), req);
-					self.pending_messages.push_back(event);
-				},
+		let req = if peer.info.roles.is_full() {
+			match self.sync.new_peer(who.clone(), peer.info.best_hash, peer.info.best_number) {
+				Ok(req) => req,
 				Err(sync::BadPeer(id, repu)) => {
-					self.behaviour.disconnect_peer(&id);
-					self.peerset_handle.report_peer(id, repu)
+					self.behaviour.disconnect_peer(&id, HARDCODED_PEERSETS_SYNC);
+					self.peerset_handle.report_peer(id, repu);
+					return Err(())
 				}
 			}
-		}
+		} else {
+			None
+		};
 
-		// Notify all the notification protocols as open.
-		CustomMessageOutcome::NotificationStreamOpened {
-			remote: who,
-			protocols: self.notification_protocols.clone(),
-			roles: info.roles,
-			notifications_sink,
-		}
-	}
+		debug!(target: "sync", "Connected {}", who);
 
-	/// Registers a new notifications protocol.
-	///
-	/// While registering a protocol while we already have open connections is discouraged, we
-	/// nonetheless handle it by notifying that we opened channels with everyone. This function
-	/// returns a list of substreams to open as a result.
-	pub fn register_notifications_protocol<'a>(
-		&'a mut self,
-		protocol: impl Into<Cow<'static, str>>,
-		handshake_message: Vec<u8>,
-	) -> impl Iterator<Item = (&'a PeerId, Roles, &'a NotificationsSink)> + 'a {
-		let protocol = protocol.into();
-
-		if self.notification_protocols.iter().any(|p| *p == protocol) {
-			error!(target: "sub-libp2p", "Notifications protocol already registered: {:?}", protocol);
-		} else {
-			self.notification_protocols.push(protocol.clone());
-			self.behaviour.register_notif_protocol(protocol.clone(), handshake_message);
-			self.legacy_equiv_by_name.insert(protocol, Fallback::Consensus);
+		self.context_data.peers.insert(who.clone(), peer);
+		self.pending_messages.push_back(CustomMessageOutcome::PeerNewBest(who.clone(), status.best_number));
+
+		if let Some(req) = req {
+			let event = self.prepare_block_request(who.clone(), req);
+			self.pending_messages.push_back(event);
 		}
 
-		let behaviour = &self.behaviour;
-		self.context_data.peers.iter().filter_map(move |(peer_id, peer)| {
-			if let Some(notifications_sink) = behaviour.notifications_sink(peer_id) {
-				Some((peer_id, peer.info.roles, notifications_sink))
-			} else {
-				log::error!("State mismatch: no notifications sink for opened peer {:?}", peer_id);
-				None
-			}
-		})
+		Ok(())
 	}
 
 	/// Called when peer sends us new transactions
@@ -922,7 +959,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 		// sending transaction to light node is considered a bad behavior
 		if !self.config.roles.is_full() {
 			trace!(target: "sync", "Peer {} is trying to send transactions to the light node", who);
-			self.behaviour.disconnect_peer(&who);
+			self.behaviour.disconnect_peer(&who, HARDCODED_PEERSETS_TX);
 			self.peerset_handle.report_peer(who, rep::UNEXPECTED_TRANSACTIONS);
 			return;
 		}
@@ -1004,6 +1041,10 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 				continue;
 			}
 
+			if !self.behaviour.is_open(who, HARDCODED_PEERSETS_TX) {
+				continue;
+			}
+
 			let (hashes, to_send): (Vec<_>, Vec<_>) = transactions
 				.iter()
 				.filter(|&(ref hash, _)| peer.known_transactions.insert(hash.clone()))
@@ -1022,7 +1063,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 				trace!(target: "sync", "Sending {} transactions to {}", to_send.len(), who);
 				self.behaviour.write_notification(
 					who,
-					self.transactions_protocol.clone(),
+					HARDCODED_PEERSETS_TX,
 					to_send.encode()
 				);
 			}
@@ -1088,7 +1129,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 
 				self.behaviour.write_notification(
 					who,
-					self.block_announces_protocol.clone(),
+					HARDCODED_PEERSETS_SYNC,
 					message.encode()
 				);
 			}
@@ -1115,16 +1156,25 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 	) {
 		let hash = announce.header.hash();
 
-		if let Some(ref mut peer) = self.context_data.peers.get_mut(&who) {
-			peer.known_blocks.insert(hash.clone());
-		}
+		let peer = match self.context_data.peers.get_mut(&who) {
+			Some(p) => p,
+			None => {
+				log::error!(target: "sync", "Received block announce from disconnected peer {}", who);
+				debug_assert!(false);
+				return;
+			}
+		};
+
+		peer.known_blocks.insert(hash.clone());
 
 		let is_best = match announce.state.unwrap_or(message::BlockState::Best) {
 			message::BlockState::Best => true,
 			message::BlockState::Normal => false,
 		};
 
-		self.sync.push_block_announce_validation(who, hash, announce, is_best);
+		if peer.info.roles.is_full() {
+			self.sync.push_block_announce_validation(who, hash, announce, is_best);
+		}
 	}
 
 	/// Process the result of the block announce validation.
@@ -1154,7 +1204,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 			}
 			sync::PollBlockAnnounceValidation::Failure { who, disconnect } => {
 				if disconnect {
-					self.disconnect_peer(&who);
+					self.behaviour.disconnect_peer(&who, HARDCODED_PEERSETS_SYNC);
 				}
 
 				self.report_peer(who, rep::BAD_BLOCK_ANNOUNCEMENT);
@@ -1198,7 +1248,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 				self.prepare_block_request(peer, req)
 			}
 			Err(sync::BadPeer(id, repu)) => {
-				self.behaviour.disconnect_peer(&id);
+				self.behaviour.disconnect_peer(&id, HARDCODED_PEERSETS_SYNC);
 				self.peerset_handle.report_peer(id, repu);
 				CustomMessageOutcome::None
 			}
@@ -1248,7 +1298,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 					);
 				}
 				Err(sync::BadPeer(id, repu)) => {
-					self.behaviour.disconnect_peer(&id);
+					self.behaviour.disconnect_peer(&id, HARDCODED_PEERSETS_SYNC);
 					self.peerset_handle.report_peer(id, repu)
 				}
 			}
@@ -1257,15 +1307,101 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 
 	/// Call this when a justification has been processed by the import queue, with or without
 	/// errors.
-	pub fn justification_import_result(&mut self, hash: B::Hash, number: NumberFor<B>, success: bool) {
-		self.sync.on_justification_import(hash, number, success)
+	pub fn justification_import_result(&mut self, who: PeerId, hash: B::Hash, number: NumberFor<B>, success: bool) {
+		self.sync.on_justification_import(hash, number, success);
+		if !success {
+			log::info!("💔 Invalid justification provided by {} for #{}", who, hash);
+			self.behaviour.disconnect_peer(&who, HARDCODED_PEERSETS_SYNC);
+			self.peerset_handle.report_peer(
+				who,
+				sc_peerset::ReputationChange::new_fatal("Invalid justification")
+			);
+		}
 	}
 
-	/// Notify the protocol that we have learned about the existence of nodes.
+	/// Set whether the syncing peers set is in reserved-only mode.
+	pub fn set_reserved_only(&self, reserved_only: bool) {
+		self.peerset_handle.set_reserved_only(HARDCODED_PEERSETS_SYNC, reserved_only);
+		self.peerset_handle.set_reserved_only(HARDCODED_PEERSETS_TX, reserved_only);
+	}
+
+	/// Removes a `PeerId` from the list of reserved peers for syncing purposes.
+	pub fn remove_reserved_peer(&self, peer: PeerId) {
+		self.peerset_handle.remove_reserved_peer(HARDCODED_PEERSETS_SYNC, peer.clone());
+		self.peerset_handle.remove_reserved_peer(HARDCODED_PEERSETS_TX, peer);
+	}
+
+	/// Adds a `PeerId` to the list of reserved peers for syncing purposes.
+	pub fn add_reserved_peer(&self, peer: PeerId) {
+		self.peerset_handle.add_reserved_peer(HARDCODED_PEERSETS_SYNC, peer.clone());
+		self.peerset_handle.add_reserved_peer(HARDCODED_PEERSETS_TX, peer);
+	}
+
+	/// Sets the list of reserved peers for syncing purposes.
+	pub fn set_reserved_peers(&self, peers: HashSet<PeerId>) {
+		self.peerset_handle.set_reserved_peers(HARDCODED_PEERSETS_SYNC, peers.clone());
+		self.peerset_handle.set_reserved_peers(HARDCODED_PEERSETS_TX, peers);
+	}
+
+	/// Removes a `PeerId` from the list of reserved peers.
+	pub fn remove_set_reserved_peer(&self, protocol: Cow<'static, str>, peer: PeerId) {
+		if let Some(index) = self.notification_protocols.iter().position(|p| *p == protocol) {
+			self.peerset_handle.remove_reserved_peer(sc_peerset::SetId::from(index + NUM_HARDCODED_PEERSETS), peer);
+		} else {
+			log::error!(
+				target: "sub-libp2p",
+				"remove_set_reserved_peer with unknown protocol: {}",
+				protocol
+			);
+		}
+	}
+
+	/// Adds a `PeerId` to the list of reserved peers.
+	pub fn add_set_reserved_peer(&self, protocol: Cow<'static, str>, peer: PeerId) {
+		if let Some(index) = self.notification_protocols.iter().position(|p| *p == protocol) {
+			self.peerset_handle.add_reserved_peer(sc_peerset::SetId::from(index + NUM_HARDCODED_PEERSETS), peer);
+		} else {
+			log::error!(
+				target: "sub-libp2p",
+				"add_set_reserved_peer with unknown protocol: {}",
+				protocol
+			);
+		}
+	}
+
+	/// Notify the protocol that we have learned about the existence of nodes on the default set.
 	///
 	/// Can be called multiple times with the same `PeerId`s.
-	pub fn add_discovered_nodes(&mut self, peer_ids: impl Iterator<Item = PeerId>) {
-		self.behaviour.add_discovered_nodes(peer_ids)
+	pub fn add_default_set_discovered_nodes(&mut self, peer_ids: impl Iterator<Item = PeerId>) {
+		for peer_id in peer_ids {
+			self.peerset_handle.add_to_peers_set(HARDCODED_PEERSETS_SYNC, peer_id);
+		}
+	}
+
+	/// Add a peer to a peers set.
+	pub fn add_to_peers_set(&self, protocol: Cow<'static, str>, peer: PeerId) {
+		if let Some(index) = self.notification_protocols.iter().position(|p| *p == protocol) {
+			self.peerset_handle.add_to_peers_set(sc_peerset::SetId::from(index + NUM_HARDCODED_PEERSETS), peer);
+		} else {
+			log::error!(
+				target: "sub-libp2p",
+				"add_to_peers_set with unknown protocol: {}",
+				protocol
+			);
+		}
+	}
+
+	/// Remove a peer from a peers set.
+	pub fn remove_from_peers_set(&self, protocol: Cow<'static, str>, peer: PeerId) {
+		if let Some(index) = self.notification_protocols.iter().position(|p| *p == protocol) {
+			self.peerset_handle.remove_from_peers_set(sc_peerset::SetId::from(index + NUM_HARDCODED_PEERSETS), peer);
+		} else {
+			log::error!(
+				target: "sub-libp2p",
+				"remove_from_peers_set with unknown protocol: {}",
+				protocol
+			);
+		}
 	}
 
 	fn format_stats(&self) -> String {
@@ -1350,18 +1486,18 @@ pub enum CustomMessageOutcome<B: BlockT> {
 	/// Notification protocols have been opened with a remote.
 	NotificationStreamOpened {
 		remote: PeerId,
-		protocols: Vec<Cow<'static, str>>,
+		protocol: Cow<'static, str>,
 		roles: Roles,
 		notifications_sink: NotificationsSink
 	},
 	/// The [`NotificationsSink`] of some notification protocols need an update.
 	NotificationStreamReplaced {
 		remote: PeerId,
-		protocols: Vec<Cow<'static, str>>,
+		protocol: Cow<'static, str>,
 		notifications_sink: NotificationsSink,
 	},
 	/// Notification protocols have been closed with a remote.
-	NotificationStreamClosed { remote: PeerId, protocols: Vec<Cow<'static, str>> },
+	NotificationStreamClosed { remote: PeerId, protocol: Cow<'static, str> },
 	/// Messages have been received on one or more notifications protocols.
 	NotificationsReceived { remote: PeerId, messages: Vec<(Cow<'static, str>, Bytes)> },
 	/// A new block request must be emitted.
@@ -1372,6 +1508,10 @@ pub enum CustomMessageOutcome<B: BlockT> {
 	},
 	/// Peer has a reported a new head of chain.
 	PeerNewBest(PeerId, NumberFor<B>),
+	/// Now connected to a new peer for syncing purposes.
+	SyncConnected(PeerId),
+	/// No longer connected to a peer for syncing purposes.
+	SyncDisconnected(PeerId),
 	None,
 }
 
@@ -1439,7 +1579,7 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 							Err(e) => {
 								trace!(target: "sync", "Failed to decode block request to peer {:?}: {:?}.", id, e);
 								self.peerset_handle.report_peer(id.clone(), rep::BAD_MESSAGE);
-								self.behaviour.disconnect_peer(id);
+								self.behaviour.disconnect_peer(id, HARDCODED_PEERSETS_SYNC);
 								continue;
 							}
 						};
@@ -1453,22 +1593,22 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 						match e {
 							RequestFailure::Network(OutboundFailure::Timeout) => {
 								self.peerset_handle.report_peer(id.clone(), rep::TIMEOUT);
-								self.behaviour.disconnect_peer(id);
+								self.behaviour.disconnect_peer(id, HARDCODED_PEERSETS_SYNC);
 							}
 							RequestFailure::Network(OutboundFailure::UnsupportedProtocols) => {
 								self.peerset_handle.report_peer(id.clone(), rep::BAD_PROTOCOL);
-								self.behaviour.disconnect_peer(id);
+								self.behaviour.disconnect_peer(id, HARDCODED_PEERSETS_SYNC);
 							}
 							RequestFailure::Network(OutboundFailure::DialFailure) => {
-								self.behaviour.disconnect_peer(id);
+								self.behaviour.disconnect_peer(id, HARDCODED_PEERSETS_SYNC);
 							}
 							RequestFailure::Refused => {
 								self.peerset_handle.report_peer(id.clone(), rep::REFUSED);
-								self.behaviour.disconnect_peer(id);
+								self.behaviour.disconnect_peer(id, HARDCODED_PEERSETS_SYNC);
 							}
 							RequestFailure::Network(OutboundFailure::ConnectionClosed)
 							| RequestFailure::NotConnected => {
-								self.behaviour.disconnect_peer(id);
+								self.behaviour.disconnect_peer(id, HARDCODED_PEERSETS_SYNC);
 							},
 							RequestFailure::UnknownProtocol => {
 								debug_assert!(false, "Block request protocol should always be known.");
@@ -1489,7 +1629,7 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 							"Block request to peer {:?} failed due to oneshot being canceled.",
 							id,
 						);
-						self.behaviour.disconnect_peer(id);
+						self.behaviour.disconnect_peer(id, HARDCODED_PEERSETS_SYNC);
 					},
 					Poll::Pending => {},
 				}
@@ -1550,83 +1690,141 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 		};
 
 		let outcome = match event {
-			GenericProtoOut::CustomProtocolOpen { peer_id, received_handshake, notifications_sink, .. } => {
-				// `received_handshake` can be either a `Status` message if received from the
-				// legacy substream ,or a `BlockAnnouncesHandshake` if received from the block
-				// announces substream.
-				match <Message<B> as DecodeAll>::decode_all(&mut &received_handshake[..]) {
-					Ok(GenericMessage::Status(handshake)) => {
-						let handshake = BlockAnnouncesHandshake {
-							roles: handshake.roles,
-							best_number: handshake.best_number,
-							best_hash: handshake.best_hash,
-							genesis_hash: handshake.genesis_hash,
-						};
-
-						self.on_peer_connected(peer_id, handshake, notifications_sink)
-					},
-					Ok(msg) => {
-						debug!(
-							target: "sync",
-							"Expected Status message from {}, but got {:?}",
-							peer_id,
-							msg,
-						);
-						self.peerset_handle.report_peer(peer_id, rep::BAD_MESSAGE);
-						CustomMessageOutcome::None
-					}
-					Err(err) => {
-						match <BlockAnnouncesHandshake<B> as DecodeAll>::decode_all(&mut &received_handshake[..]) {
-							Ok(handshake) => {
-								self.on_peer_connected(peer_id, handshake, notifications_sink)
-							}
-							Err(err2) => {
-								debug!(
-									target: "sync",
-									"Couldn't decode handshake sent by {}: {:?}: {} & {}",
-									peer_id,
-									received_handshake,
-									err.what(),
-									err2,
+			GenericProtoOut::CustomProtocolOpen { peer_id, set_id, received_handshake, notifications_sink, .. } => {
+				// Set number 0 is hardcoded the default set of peers we sync from.
+				if set_id == HARDCODED_PEERSETS_SYNC {
+					// `received_handshake` can be either a `Status` message if received from the
+					// legacy substream ,or a `BlockAnnouncesHandshake` if received from the block
+					// announces substream.
+					match <Message<B> as DecodeAll>::decode_all(&mut &received_handshake[..]) {
+						Ok(GenericMessage::Status(handshake)) => {
+							let handshake = BlockAnnouncesHandshake {
+								roles: handshake.roles,
+								best_number: handshake.best_number,
+								best_hash: handshake.best_hash,
+								genesis_hash: handshake.genesis_hash,
+							};
+
+							if self.on_sync_peer_connected(peer_id.clone(), handshake).is_ok() {
+								// Set 1 is kept in sync with the connected peers of set 0.
+								self.peerset_handle.add_to_peers_set(
+									HARDCODED_PEERSETS_TX,
+									peer_id.clone()
 								);
-								self.peerset_handle.report_peer(peer_id, rep::BAD_MESSAGE);
+								CustomMessageOutcome::SyncConnected(peer_id)
+							} else {
 								CustomMessageOutcome::None
 							}
+						},
+						Ok(msg) => {
+							debug!(
+								target: "sync",
+								"Expected Status message from {}, but got {:?}",
+								peer_id,
+								msg,
+							);
+							self.peerset_handle.report_peer(peer_id, rep::BAD_MESSAGE);
+							CustomMessageOutcome::None
+						}
+						Err(err) => {
+							match <BlockAnnouncesHandshake<B> as DecodeAll>::decode_all(&mut &received_handshake[..]) {
+								Ok(handshake) => {
+									if self.on_sync_peer_connected(peer_id.clone(), handshake).is_ok() {
+										// Set 1 is kept in sync with the connected peers of set 0.
+										self.peerset_handle.add_to_peers_set(
+											HARDCODED_PEERSETS_TX,
+											peer_id.clone()
+										);
+										CustomMessageOutcome::SyncConnected(peer_id)
+									} else {
+										CustomMessageOutcome::None
+									}
+								}
+								Err(err2) => {
+									debug!(
+										target: "sync",
+										"Couldn't decode handshake sent by {}: {:?}: {} & {}",
+										peer_id,
+										received_handshake,
+										err.what(),
+										err2,
+									);
+									self.peerset_handle.report_peer(peer_id, rep::BAD_MESSAGE);
+									CustomMessageOutcome::None
+								}
+							}
+						}
+					}
+
+				} else if set_id == HARDCODED_PEERSETS_TX {
+					// Nothing to do.
+					CustomMessageOutcome::None
+				} else {
+					match message::Roles::decode_all(&received_handshake[..]) {
+						Ok(roles) =>
+							CustomMessageOutcome::NotificationStreamOpened {
+								remote: peer_id,
+								protocol: self.notification_protocols[usize::from(set_id) - NUM_HARDCODED_PEERSETS].clone(),
+								roles,
+								notifications_sink,
+							},
+						Err(err) => {
+							debug!(target: "sync", "Failed to parse remote handshake: {}", err);
+							self.behaviour.disconnect_peer(&peer_id, set_id);
+							self.peerset_handle.report_peer(peer_id, rep::BAD_MESSAGE);
+							CustomMessageOutcome::None
 						}
 					}
 				}
 			}
-			GenericProtoOut::CustomProtocolReplaced { peer_id, notifications_sink, .. } => {
-				CustomMessageOutcome::NotificationStreamReplaced {
-					remote: peer_id,
-					protocols: self.notification_protocols.clone(),
-					notifications_sink,
+			GenericProtoOut::CustomProtocolReplaced { peer_id, notifications_sink, set_id } => {
+				if set_id == HARDCODED_PEERSETS_SYNC || set_id == HARDCODED_PEERSETS_TX {
+					CustomMessageOutcome::None
+				} else {
+					CustomMessageOutcome::NotificationStreamReplaced {
+						remote: peer_id,
+						protocol: self.notification_protocols[usize::from(set_id) - NUM_HARDCODED_PEERSETS].clone(),
+						notifications_sink,
+					}
 				}
 			},
-			GenericProtoOut::CustomProtocolClosed { peer_id } => {
-				self.on_peer_disconnected(peer_id)
-			},
-			GenericProtoOut::LegacyMessage { peer_id, message } =>
-				self.on_custom_message(peer_id, message),
-			GenericProtoOut::Notification { peer_id, protocol_name, message } =>
-				match self.legacy_equiv_by_name.get(&protocol_name) {
-					Some(Fallback::Consensus) => {
-						CustomMessageOutcome::NotificationsReceived {
-							remote: peer_id,
-							messages: vec![(protocol_name, message.freeze())],
-						}
-					}
-					Some(Fallback::Transactions) => {
-						if let Ok(m) = <message::Transactions<B::Extrinsic> as Decode>::decode(
-							&mut message.as_ref(),
-						) {
-							self.on_transactions(peer_id, m);
-						} else {
-							warn!(target: "sub-libp2p", "Failed to decode transactions list");
-						}
+			GenericProtoOut::CustomProtocolClosed { peer_id, set_id } => {
+				// Set number 0 is hardcoded the default set of peers we sync from.
+				if set_id == HARDCODED_PEERSETS_SYNC {
+					if self.on_sync_peer_disconnected(peer_id.clone()).is_ok() {
+						// Set 1 is kept in sync with the connected peers of set 0.
+						self.peerset_handle.remove_reserved_peer(
+							HARDCODED_PEERSETS_TX,
+							peer_id.clone()
+						);
+						CustomMessageOutcome::SyncDisconnected(peer_id)
+					} else {
+						log::debug!(
+							target: "sync",
+							"Disconnected peer which had earlier been refused by on_sync_peer_connected {}",
+							peer_id
+						);
 						CustomMessageOutcome::None
 					}
-					Some(Fallback::BlockAnnounce) => {
+				} else if set_id == HARDCODED_PEERSETS_TX {
+					CustomMessageOutcome::None
+				} else {
+					CustomMessageOutcome::NotificationStreamClosed {
+						remote: peer_id,
+						protocol: self.notification_protocols[usize::from(set_id) - NUM_HARDCODED_PEERSETS].clone(),
+					}
+				}
+			},
+			GenericProtoOut::LegacyMessage { peer_id, message } => {
+				if self.context_data.peers.contains_key(&peer_id) {
+					self.on_custom_message(peer_id, message)
+				} else {
+					CustomMessageOutcome::None
+				}
+			},
+			GenericProtoOut::Notification { peer_id, set_id, message } =>
+				match usize::from(set_id) {
+					0 if self.context_data.peers.contains_key(&peer_id) => {
 						if let Ok(announce) = message::BlockAnnounce::decode(&mut message.as_ref()) {
 							self.push_block_announce_validation(peer_id, announce);
 
@@ -1642,14 +1840,31 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 							CustomMessageOutcome::None
 						}
 					}
-					None => {
+					1 if self.context_data.peers.contains_key(&peer_id) => {
+						if let Ok(m) = <message::Transactions<B::Extrinsic> as Decode>::decode(
+							&mut message.as_ref(),
+						) {
+							self.on_transactions(peer_id, m);
+						} else {
+							warn!(target: "sub-libp2p", "Failed to decode transactions list");
+						}
+						CustomMessageOutcome::None
+					}
+					0 | 1 => {
 						debug!(
-							target: "sub-libp2p",
-							"Received notification from unknown protocol {:?}",
-							protocol_name,
+							target: "sync",
+							"Received sync or transaction for peer earlier refused by sync layer: {}",
+							peer_id
 						);
 						CustomMessageOutcome::None
 					}
+					_ => {
+						let protocol_name = self.notification_protocols[usize::from(set_id) - NUM_HARDCODED_PEERSETS].clone();
+						CustomMessageOutcome::NotificationsReceived {
+							remote: peer_id,
+							messages: vec![(protocol_name, message.freeze())],
+						}
+					}
 				}
 		};
 
@@ -1661,6 +1876,10 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 			return Poll::Ready(NetworkBehaviourAction::GenerateEvent(message));
 		}
 
+		// This block can only be reached if an event was pulled from the behaviour and that
+		// resulted in `CustomMessageOutcome::None`. Since there might be another pending
+		// message from the behaviour, the task is scheduled again.
+		cx.waker().wake_by_ref();
 		Poll::Pending
 	}
 
diff --git a/client/network/src/protocol/event.rs b/client/network/src/protocol/event.rs
index 3fb383040dd2..e20dbcb9ee27 100644
--- a/client/network/src/protocol/event.rs
+++ b/client/network/src/protocol/event.rs
@@ -48,6 +48,18 @@ pub enum Event {
 	/// Event generated by a DHT.
 	Dht(DhtEvent),
 
+	/// Now connected to a new peer for syncing purposes.
+	SyncConnected {
+		/// Node we are now syncing from.
+		remote: PeerId,
+	},
+
+	/// Now disconnected from a peer for syncing purposes.
+	SyncDisconnected {
+		/// Node we are no longer syncing from.
+		remote: PeerId,
+	},
+
 	/// Opened a substream with the given node with the given notifications protocol.
 	///
 	/// The protocol is always one of the notification protocols that have been registered.
diff --git a/client/network/src/protocol/generic_proto/behaviour.rs b/client/network/src/protocol/generic_proto/behaviour.rs
index c7bd7ce8cb02..88c2791ce45d 100644
--- a/client/network/src/protocol/generic_proto/behaviour.rs
+++ b/client/network/src/protocol/generic_proto/behaviour.rs
@@ -97,9 +97,6 @@ use wasm_timer::Instant;
 /// accommodates for any number of connections.
 ///
 pub struct GenericProto {
-	/// `PeerId` of the local node.
-	local_peer_id: PeerId,
-
 	/// Legacy protocol to open with peers. Never modified.
 	legacy_protocol: RegisteredProtocol,
 
@@ -112,7 +109,7 @@ pub struct GenericProto {
 	peerset: sc_peerset::Peerset,
 
 	/// List of peers in our state.
-	peers: FnvHashMap<PeerId, PeerState>,
+	peers: FnvHashMap<(PeerId, sc_peerset::SetId), PeerState>,
 
 	/// The elements in `peers` occasionally contain `Delay` objects that we would normally have
 	/// to be polled one by one. In order to avoid doing so, as an optimization, every `Delay` is
@@ -121,7 +118,7 @@ pub struct GenericProto {
 	///
 	/// By design, we never remove elements from this list. Elements are removed only when the
 	/// `Delay` triggers. As such, this stream may produce obsolete elements.
-	delays: stream::FuturesUnordered<Pin<Box<dyn Future<Output = (DelayId, PeerId)> + Send>>>,
+	delays: stream::FuturesUnordered<Pin<Box<dyn Future<Output = (DelayId, PeerId, sc_peerset::SetId)> + Send>>>,
 
 	/// [`DelayId`] to assign to the next delay.
 	next_delay_id: DelayId,
@@ -299,8 +296,10 @@ enum ConnectionState {
 /// State of an "incoming" message sent to the peer set manager.
 #[derive(Debug)]
 struct IncomingPeer {
-	/// Id of the remote peer of the incoming connection.
+	/// Id of the remote peer of the incoming substream.
 	peer_id: PeerId,
+	/// Id of the set the incoming substream would belong to.
+	set_id: sc_peerset::SetId,
 	/// If true, this "incoming" still corresponds to an actual connection. If false, then the
 	/// connection corresponding to it has been closed or replaced already.
 	alive: bool,
@@ -315,6 +314,8 @@ pub enum GenericProtoOut {
 	CustomProtocolOpen {
 		/// Id of the peer we are connected to.
 		peer_id: PeerId,
+		/// Peerset set ID the substream is tied to.
+		set_id: sc_peerset::SetId,
 		/// Handshake that was sent to us.
 		/// This is normally a "Status" message, but this is out of the concern of this code.
 		received_handshake: Vec<u8>,
@@ -330,6 +331,8 @@ pub enum GenericProtoOut {
 	CustomProtocolReplaced {
 		/// Id of the peer we are connected to.
 		peer_id: PeerId,
+		/// Peerset set ID the substream is tied to.
+		set_id: sc_peerset::SetId,
 		/// Replacement for the previous [`NotificationsSink`].
 		notifications_sink: NotificationsSink,
 	},
@@ -339,6 +342,8 @@ pub enum GenericProtoOut {
 	CustomProtocolClosed {
 		/// Id of the peer we were connected to.
 		peer_id: PeerId,
+		/// Peerset set ID the substream was tied to.
+		set_id: sc_peerset::SetId,
 	},
 
 	/// Receives a message on the legacy substream.
@@ -355,8 +360,8 @@ pub enum GenericProtoOut {
 	Notification {
 		/// Id of the peer the message came from.
 		peer_id: PeerId,
-		/// Engine corresponding to the message.
-		protocol_name: Cow<'static, str>,
+		/// Peerset set ID the substream is tied to.
+		set_id: sc_peerset::SetId,
 		/// Message that has been received.
 		message: BytesMut,
 	},
@@ -365,7 +370,6 @@ pub enum GenericProtoOut {
 impl GenericProto {
 	/// Creates a `CustomProtos`.
 	pub fn new(
-		local_peer_id: PeerId,
 		protocol: impl Into<ProtocolId>,
 		versions: &[u8],
 		handshake_message: Vec<u8>,
@@ -382,7 +386,6 @@ impl GenericProto {
 		let legacy_protocol = RegisteredProtocol::new(protocol, versions, legacy_handshake_message);
 
 		GenericProto {
-			local_peer_id,
 			legacy_protocol,
 			notif_protocols,
 			peerset,
@@ -395,28 +398,17 @@ impl GenericProto {
 		}
 	}
 
-	/// Registers a new notifications protocol.
-	///
-	/// You are very strongly encouraged to call this method very early on. Any open connection
-	/// will retain the protocols that were registered then, and not any new one.
-	pub fn register_notif_protocol(
-		&mut self,
-		protocol_name: impl Into<Cow<'static, str>>,
-		handshake_msg: impl Into<Vec<u8>>
-	) {
-		self.notif_protocols.push((protocol_name.into(), Arc::new(RwLock::new(handshake_msg.into()))));
-	}
-
 	/// Modifies the handshake of the given notifications protocol.
-	///
-	/// Has no effect if the protocol is unknown.
 	pub fn set_notif_protocol_handshake(
 		&mut self,
-		protocol_name: &str,
+		set_id: sc_peerset::SetId,
 		handshake_message: impl Into<Vec<u8>>
 	) {
-		if let Some(protocol) = self.notif_protocols.iter_mut().find(|(name, _)| name == protocol_name) {
-			*protocol.1.write() = handshake_message.into();
+		if let Some(p) = self.notif_protocols.get_mut(usize::from(set_id)) {
+			*p.1.write() = handshake_message.into();
+		} else {
+			log::error!(target: "sub-libp2p", "Unknown handshake change set: {:?}", set_id);
+			debug_assert!(false);
 		}
 	}
 
@@ -435,33 +427,29 @@ impl GenericProto {
 
 	/// Returns the list of all the peers we have an open channel to.
 	pub fn open_peers<'a>(&'a self) -> impl Iterator<Item = &'a PeerId> + 'a {
-		self.peers.iter().filter(|(_, state)| state.is_open()).map(|(id, _)| id)
+		self.peers.iter().filter(|(_, state)| state.is_open()).map(|((id, _), _)| id)
 	}
 
-	/// Returns true if we have an open connection to the given peer.
-	pub fn is_open(&self, peer_id: &PeerId) -> bool {
-		self.peers.get(peer_id).map(|p| p.is_open()).unwrap_or(false)
-	}
-
-	/// Returns the [`NotificationsSink`] that sends notifications to the given peer, or `None`
-	/// if the custom protocols aren't opened with this peer.
-	///
-	/// If [`GenericProto::is_open`] returns `true` for this `PeerId`, then this method is
-	/// guaranteed to return `Some`.
-	pub fn notifications_sink(&self, peer_id: &PeerId) -> Option<&NotificationsSink> {
-		self.peers.get(peer_id).and_then(|p| p.get_open())
+	/// Returns true if we have an open substream to the given peer.
+	pub fn is_open(&self, peer_id: &PeerId, set_id: sc_peerset::SetId) -> bool {
+		self.peers.get(&(peer_id.clone(), set_id)).map(|p| p.is_open()).unwrap_or(false)
 	}
 
 	/// Disconnects the given peer if we are connected to it.
-	pub fn disconnect_peer(&mut self, peer_id: &PeerId) {
-		debug!(target: "sub-libp2p", "External API => Disconnect {:?}", peer_id);
-		self.disconnect_peer_inner(peer_id, None);
+	pub fn disconnect_peer(&mut self, peer_id: &PeerId, set_id: sc_peerset::SetId) {
+		debug!(target: "sub-libp2p", "External API => Disconnect({}, {:?})", peer_id, set_id);
+		self.disconnect_peer_inner(peer_id, set_id, None);
 	}
 
 	/// Inner implementation of `disconnect_peer`. If `ban` is `Some`, we ban the peer
 	/// for the specific duration.
-	fn disconnect_peer_inner(&mut self, peer_id: &PeerId, ban: Option<Duration>) {
-		let mut entry = if let Entry::Occupied(entry) = self.peers.entry(peer_id.clone()) {
+	fn disconnect_peer_inner(
+		&mut self,
+		peer_id: &PeerId,
+		set_id: sc_peerset::SetId,
+		ban: Option<Duration>
+	) {
+		let mut entry = if let Entry::Occupied(entry) = self.peers.entry((peer_id.clone(), set_id)) {
 			entry
 		} else {
 			return
@@ -480,8 +468,8 @@ impl GenericProto {
 				timer_deadline,
 				timer: _
 			} => {
-				debug!(target: "sub-libp2p", "PSM <= Dropped({:?})", peer_id);
-				self.peerset.dropped(peer_id.clone());
+				debug!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
+				self.peerset.dropped(set_id, peer_id.clone());
 				let backoff_until = Some(if let Some(ban) = ban {
 					cmp::max(timer_deadline, Instant::now() + ban)
 				} else {
@@ -497,13 +485,14 @@ impl GenericProto {
 			// All open or opening connections are sent a `Close` message.
 			// If relevant, the external API is instantly notified.
 			PeerState::Enabled { mut connections } => {
-				debug!(target: "sub-libp2p", "PSM <= Dropped({:?})", peer_id);
-				self.peerset.dropped(peer_id.clone());
+				debug!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
+				self.peerset.dropped(set_id, peer_id.clone());
 
 				if connections.iter().any(|(_, s)| matches!(s, ConnectionState::Open(_))) {
-					debug!(target: "sub-libp2p", "External API <= Closed({})", peer_id);
+					debug!(target: "sub-libp2p", "External API <= Closed({}, {:?})", peer_id, set_id);
 					let event = GenericProtoOut::CustomProtocolClosed {
 						peer_id: peer_id.clone(),
+						set_id,
 					};
 					self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
 				}
@@ -511,11 +500,11 @@ impl GenericProto {
 				for (connec_id, connec_state) in connections.iter_mut()
 					.filter(|(_, s)| matches!(s, ConnectionState::Open(_)))
 				{
-					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close", peer_id, *connec_id);
+					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close({:?})", peer_id, *connec_id, set_id);
 					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
 						peer_id: peer_id.clone(),
 						handler: NotifyHandler::One(*connec_id),
-						event: NotifsHandlerIn::Close,
+						event: NotifsHandlerIn::Close { protocol_index: set_id.into() },
 					});
 					*connec_state = ConnectionState::Closing;
 				}
@@ -523,11 +512,11 @@ impl GenericProto {
 				for (connec_id, connec_state) in connections.iter_mut()
 					.filter(|(_, s)| matches!(s, ConnectionState::Opening))
 				{
-					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close", peer_id, *connec_id);
+					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close({:?})", peer_id, *connec_id, set_id);
 					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
 						peer_id: peer_id.clone(),
 						handler: NotifyHandler::One(*connec_id),
-						event: NotifsHandlerIn::Close,
+						event: NotifsHandlerIn::Close { protocol_index: set_id.into() },
 					});
 					*connec_state = ConnectionState::OpeningThenClosing;
 				}
@@ -546,7 +535,7 @@ impl GenericProto {
 			// Ongoing opening requests from the remote are rejected.
 			PeerState::Incoming { mut connections, backoff_until } => {
 				let inc = if let Some(inc) = self.incoming.iter_mut()
-					.find(|i| i.peer_id == *entry.key() && i.alive) {
+					.find(|i| i.peer_id == entry.key().0 && i.set_id == set_id && i.alive) {
 					inc
 				} else {
 					error!(target: "sub-libp2p", "State mismatch in libp2p: no entry in \
@@ -559,11 +548,11 @@ impl GenericProto {
 				for (connec_id, connec_state) in connections.iter_mut()
 					.filter(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote))
 				{
-					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close", peer_id, *connec_id);
+					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close({:?})", peer_id, *connec_id, set_id);
 					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
 						peer_id: peer_id.clone(),
 						handler: NotifyHandler::One(*connec_id),
-						event: NotifsHandlerIn::Close,
+						event: NotifsHandlerIn::Close { protocol_index: set_id.into() },
 					});
 					*connec_state = ConnectionState::Closing;
 				}
@@ -588,42 +577,10 @@ impl GenericProto {
 	}
 
 	/// Returns the list of all the peers that the peerset currently requests us to be connected to.
-	pub fn requested_peers<'a>(&'a self) -> impl Iterator<Item = &'a PeerId> + 'a {
-		self.peers.iter().filter(|(_, state)| state.is_requested()).map(|(id, _)| id)
-	}
-
-	/// Returns true if we try to open protocols with the given peer.
-	pub fn is_enabled(&self, peer_id: &PeerId) -> bool {
-		match self.peers.get(peer_id) {
-			None => false,
-			Some(PeerState::Disabled { .. }) => false,
-			Some(PeerState::DisabledPendingEnable { .. }) => false,
-			Some(PeerState::Enabled { .. }) => true,
-			Some(PeerState::Incoming { .. }) => false,
-			Some(PeerState::Requested) => false,
-			Some(PeerState::PendingRequest { .. }) => false,
-			Some(PeerState::Backoff { .. }) => false,
-			Some(PeerState::Poisoned) => false,
-		}
-	}
-
-	/// Notify the behaviour that we have learned about the existence of nodes.
-	///
-	/// Can be called multiple times with the same `PeerId`s.
-	pub fn add_discovered_nodes(&mut self, peer_ids: impl Iterator<Item = PeerId>) {
-		let local_peer_id = &self.local_peer_id;
-		self.peerset.discovered(peer_ids.filter_map(|peer_id| {
-			if peer_id == *local_peer_id {
-				error!(
-					target: "sub-libp2p",
-					"Discovered our own identity. This is a minor inconsequential bug."
-				);
-				return None;
-			}
-
-			debug!(target: "sub-libp2p", "PSM <= Discovered({:?})", peer_id);
-			Some(peer_id)
-		}));
+	pub fn requested_peers<'a>(&'a self, set_id: sc_peerset::SetId) -> impl Iterator<Item = &'a PeerId> + 'a {
+		self.peers.iter()
+			.filter(move |((_, set), state)| *set == set_id && state.is_requested())
+			.map(|((id, _), _)| id)
 	}
 
 	/// Sends a notification to a peer.
@@ -639,10 +596,10 @@ impl GenericProto {
 	pub fn write_notification(
 		&mut self,
 		target: &PeerId,
-		protocol_name: Cow<'static, str>,
+		set_id: sc_peerset::SetId,
 		message: impl Into<Vec<u8>>,
 	) {
-		let notifs_sink = match self.peers.get(target).and_then(|p| p.get_open()) {
+		let notifs_sink = match self.peers.get(&(target.clone(), set_id)).and_then(|p| p.get_open()) {
 			None => {
 				debug!(target: "sub-libp2p",
 					"Tried to sent notification to {:?} without an open channel.",
@@ -658,15 +615,12 @@ impl GenericProto {
 			target: "sub-libp2p",
 			"External API => Notification({:?}, {:?}, {} bytes)",
 			target,
-			protocol_name,
+			set_id,
 			message.len(),
 		);
 		trace!(target: "sub-libp2p", "Handler({:?}) <= Sync notification", target);
 
-		notifs_sink.send_sync_notification(
-			protocol_name,
-			message
-		);
+		notifs_sink.send_sync_notification(message);
 	}
 
 	/// Returns the state of the peerset manager, for debugging purposes.
@@ -675,16 +629,18 @@ impl GenericProto {
 	}
 
 	/// Function that is called when the peerset wants us to connect to a peer.
-	fn peerset_report_connect(&mut self, peer_id: PeerId) {
+	fn peerset_report_connect(&mut self, peer_id: PeerId, set_id: sc_peerset::SetId) {
 		// If `PeerId` is unknown to us, insert an entry, start dialing, and return early.
-		let mut occ_entry = match self.peers.entry(peer_id.clone()) {
+		let mut occ_entry = match self.peers.entry((peer_id.clone(), set_id)) {
 			Entry::Occupied(entry) => entry,
 			Entry::Vacant(entry) => {
 				// If there's no entry in `self.peers`, start dialing.
-				debug!(target: "sub-libp2p", "PSM => Connect({:?}): Starting to connect", entry.key());
-				debug!(target: "sub-libp2p", "Libp2p <= Dial {:?}", entry.key());
+				debug!(target: "sub-libp2p", "PSM => Connect({}, {:?}): Starting to connect",
+					entry.key().0, set_id);
+				debug!(target: "sub-libp2p", "Libp2p <= Dial {}", entry.key().0);
+				// The `DialPeerCondition` ensures that dial attempts are de-duplicated
 				self.events.push_back(NetworkBehaviourAction::DialPeer {
-					peer_id: entry.key().clone(),
+					peer_id: entry.key().0.clone(),
 					condition: DialPeerCondition::Disconnected
 				});
 				entry.insert(PeerState::Requested);
@@ -697,9 +653,9 @@ impl GenericProto {
 		match mem::replace(occ_entry.get_mut(), PeerState::Poisoned) {
 			// Backoff (not expired) => PendingRequest
 			PeerState::Backoff { ref timer, ref timer_deadline } if *timer_deadline > now => {
-				let peer_id = occ_entry.key().clone();
-				debug!(target: "sub-libp2p", "PSM => Connect({:?}): Will start to connect at \
-					until {:?}", peer_id, timer_deadline);
+				let peer_id = occ_entry.key().0.clone();
+				debug!(target: "sub-libp2p", "PSM => Connect({}, {:?}): Will start to connect at \
+					until {:?}", peer_id, set_id, timer_deadline);
 				*occ_entry.into_mut() = PeerState::PendingRequest {
 					timer: *timer,
 					timer_deadline: *timer_deadline,
@@ -708,10 +664,12 @@ impl GenericProto {
 
 			// Backoff (expired) => Requested
 			PeerState::Backoff { .. } => {
-				debug!(target: "sub-libp2p", "PSM => Connect({:?}): Starting to connect", occ_entry.key());
+				debug!(target: "sub-libp2p", "PSM => Connect({}, {:?}): Starting to connect",
+					occ_entry.key().0, set_id);
 				debug!(target: "sub-libp2p", "Libp2p <= Dial {:?}", occ_entry.key());
+				// The `DialPeerCondition` ensures that dial attempts are de-duplicated
 				self.events.push_back(NetworkBehaviourAction::DialPeer {
-					peer_id: occ_entry.key().clone(),
+					peer_id: occ_entry.key().0.clone(),
 					condition: DialPeerCondition::Disconnected
 				});
 				*occ_entry.into_mut() = PeerState::Requested;
@@ -722,16 +680,16 @@ impl GenericProto {
 				connections,
 				backoff_until: Some(ref backoff)
 			} if *backoff > now => {
-				let peer_id = occ_entry.key().clone();
-				debug!(target: "sub-libp2p", "PSM => Connect({:?}): But peer is backed-off until {:?}",
-					peer_id, backoff);
+				let peer_id = occ_entry.key().0.clone();
+				debug!(target: "sub-libp2p", "PSM => Connect({}, {:?}): But peer is backed-off until {:?}",
+					peer_id, set_id, backoff);
 
 				let delay_id = self.next_delay_id;
 				self.next_delay_id.0 += 1;
 				let delay = futures_timer::Delay::new(*backoff - now);
 				self.delays.push(async move {
 					delay.await;
-					(delay_id, peer_id)
+					(delay_id, peer_id, set_id)
 				}.boxed());
 
 				*occ_entry.into_mut() = PeerState::DisabledPendingEnable {
@@ -751,13 +709,13 @@ impl GenericProto {
 				if let Some((connec_id, connec_state)) = connections.iter_mut()
 					.find(|(_, s)| matches!(s, ConnectionState::Closed))
 				{
-					debug!(target: "sub-libp2p", "PSM => Connect({:?}): Enabling connections.",
-						occ_entry.key());
-					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open", peer_id, *connec_id);
+					debug!(target: "sub-libp2p", "PSM => Connect({}, {:?}): Enabling connections.",
+						occ_entry.key().0, set_id);
+					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open({:?})", peer_id, *connec_id, set_id);
 					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
 						peer_id: peer_id.clone(),
 						handler: NotifyHandler::One(*connec_id),
-						event: NotifsHandlerIn::Open,
+						event: NotifsHandlerIn::Open { protocol_index: set_id.into() },
 					});
 					*connec_state = ConnectionState::Opening;
 					*occ_entry.into_mut() = PeerState::Enabled { connections };
@@ -769,8 +727,8 @@ impl GenericProto {
 					}));
 					debug!(
 						target: "sub-libp2p",
-						"PSM => Connect({:?}): No connection in proper state. Delaying.",
-						occ_entry.key()
+						"PSM => Connect({}, {:?}): No connection in proper state. Delaying.",
+						occ_entry.key().0, set_id
 					);
 
 					let timer_deadline = {
@@ -788,7 +746,7 @@ impl GenericProto {
 					let delay = futures_timer::Delay::new(timer_deadline - now);
 					self.delays.push(async move {
 						delay.await;
-						(delay_id, peer_id)
+						(delay_id, peer_id, set_id)
 					}.boxed());
 
 					*occ_entry.into_mut() = PeerState::DisabledPendingEnable {
@@ -801,10 +759,10 @@ impl GenericProto {
 
 			// Incoming => Enabled
 			PeerState::Incoming { mut connections, .. } => {
-				debug!(target: "sub-libp2p", "PSM => Connect({:?}): Enabling connections.",
-					occ_entry.key());
+				debug!(target: "sub-libp2p", "PSM => Connect({}, {:?}): Enabling connections.",
+					occ_entry.key().0, set_id);
 				if let Some(inc) = self.incoming.iter_mut()
-					.find(|i| i.peer_id == *occ_entry.key() && i.alive) {
+					.find(|i| i.peer_id == occ_entry.key().0 && i.set_id == set_id && i.alive) {
 					inc.alive = false;
 				} else {
 					error!(target: "sub-libp2p", "State mismatch in libp2p: no entry in \
@@ -815,11 +773,12 @@ impl GenericProto {
 				for (connec_id, connec_state) in connections.iter_mut()
 					.filter(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote))
 				{
-					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open", occ_entry.key(), *connec_id);
+					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open({:?})",
+						occ_entry.key(), *connec_id, set_id);
 					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
-						peer_id: occ_entry.key().clone(),
+						peer_id: occ_entry.key().0.clone(),
 						handler: NotifyHandler::One(*connec_id),
-						event: NotifsHandlerIn::Open,
+						event: NotifsHandlerIn::Open { protocol_index: set_id.into() },
 					});
 					*connec_state = ConnectionState::Opening;
 				}
@@ -830,22 +789,22 @@ impl GenericProto {
 			// Other states are kept as-is.
 			st @ PeerState::Enabled { .. } => {
 				warn!(target: "sub-libp2p",
-					"PSM => Connect({:?}): Already connected.",
-					occ_entry.key());
+					"PSM => Connect({}, {:?}): Already connected.",
+					occ_entry.key().0, set_id);
 				*occ_entry.into_mut() = st;
 				debug_assert!(false);
 			},
 			st @ PeerState::DisabledPendingEnable { .. } => {
 				warn!(target: "sub-libp2p",
-					"PSM => Connect({:?}): Already pending enabling.",
-					occ_entry.key());
+					"PSM => Connect({}, {:?}): Already pending enabling.",
+					occ_entry.key().0, set_id);
 				*occ_entry.into_mut() = st;
 				debug_assert!(false);
 			},
 			st @ PeerState::Requested { .. } | st @ PeerState::PendingRequest { .. } => {
 				warn!(target: "sub-libp2p",
-					"PSM => Connect({:?}): Duplicate request.",
-					occ_entry.key());
+					"PSM => Connect({}, {:?}): Duplicate request.",
+					occ_entry.key().0, set_id);
 				*occ_entry.into_mut() = st;
 				debug_assert!(false);
 			},
@@ -858,18 +817,20 @@ impl GenericProto {
 	}
 
 	/// Function that is called when the peerset wants us to disconnect from a peer.
-	fn peerset_report_disconnect(&mut self, peer_id: PeerId) {
-		let mut entry = match self.peers.entry(peer_id) {
+	fn peerset_report_disconnect(&mut self, peer_id: PeerId, set_id: sc_peerset::SetId) {
+		let mut entry = match self.peers.entry((peer_id, set_id)) {
 			Entry::Occupied(entry) => entry,
 			Entry::Vacant(entry) => {
-				debug!(target: "sub-libp2p", "PSM => Drop({:?}): Already disabled.", entry.key());
+				debug!(target: "sub-libp2p", "PSM => Drop({}, {:?}): Already disabled.",
+					entry.key().0, set_id);
 				return
 			}
 		};
 
 		match mem::replace(entry.get_mut(), PeerState::Poisoned) {
 			st @ PeerState::Disabled { .. } | st @ PeerState::Backoff { .. } => {
-				debug!(target: "sub-libp2p", "PSM => Drop({:?}): Already disabled.", entry.key());
+				debug!(target: "sub-libp2p", "PSM => Drop({}, {:?}): Already disabled.",
+					entry.key().0, set_id);
 				*entry.into_mut() = st;
 			},
 
@@ -877,8 +838,8 @@ impl GenericProto {
 			PeerState::DisabledPendingEnable { connections, timer_deadline, timer: _ } => {
 				debug_assert!(!connections.is_empty());
 				debug!(target: "sub-libp2p",
-					"PSM => Drop({:?}): Interrupting pending enabling.",
-					entry.key());
+					"PSM => Drop({}, {:?}): Interrupting pending enabling.",
+					entry.key().0, set_id);
 				*entry.into_mut() = PeerState::Disabled {
 					connections,
 					backoff_until: Some(timer_deadline),
@@ -887,15 +848,17 @@ impl GenericProto {
 
 			// Enabled => Disabled
 			PeerState::Enabled { mut connections } => {
-				debug!(target: "sub-libp2p", "PSM => Drop({:?}): Disabling connections.", entry.key());
+				debug!(target: "sub-libp2p", "PSM => Drop({}, {:?}): Disabling connections.",
+					entry.key().0, set_id);
 
 				debug_assert!(connections.iter().any(|(_, s)|
 					matches!(s, ConnectionState::Opening | ConnectionState::Open(_))));
 
 				if connections.iter().any(|(_, s)| matches!(s, ConnectionState::Open(_))) {
-					debug!(target: "sub-libp2p", "External API <= Closed({})", entry.key());
+					debug!(target: "sub-libp2p", "External API <= Closed({}, {:?})", entry.key().0, set_id);
 					let event = GenericProtoOut::CustomProtocolClosed {
-						peer_id: entry.key().clone(),
+						peer_id: entry.key().0.clone(),
+						set_id,
 					};
 					self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
 				}
@@ -903,11 +866,12 @@ impl GenericProto {
 				for (connec_id, connec_state) in connections.iter_mut()
 					.filter(|(_, s)| matches!(s, ConnectionState::Opening))
 				{
-					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close", entry.key(), *connec_id);
+					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close({:?})",
+						entry.key(), *connec_id, set_id);
 					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
-						peer_id: entry.key().clone(),
+						peer_id: entry.key().0.clone(),
 						handler: NotifyHandler::One(*connec_id),
-						event: NotifsHandlerIn::Close,
+						event: NotifsHandlerIn::Close { protocol_index: set_id.into() },
 					});
 					*connec_state = ConnectionState::OpeningThenClosing;
 				}
@@ -915,11 +879,12 @@ impl GenericProto {
 				for (connec_id, connec_state) in connections.iter_mut()
 					.filter(|(_, s)| matches!(s, ConnectionState::Open(_)))
 				{
-					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close", entry.key(), *connec_id);
+					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close({:?})",
+						entry.key(), *connec_id, set_id);
 					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
-						peer_id: entry.key().clone(),
+						peer_id: entry.key().0.clone(),
 						handler: NotifyHandler::One(*connec_id),
-						event: NotifsHandlerIn::Close,
+						event: NotifsHandlerIn::Close { protocol_index: set_id.into() },
 					});
 					*connec_state = ConnectionState::Closing;
 				}
@@ -932,20 +897,22 @@ impl GenericProto {
 				// We don't cancel dialing. Libp2p doesn't expose that on purpose, as other
 				// sub-systems (such as the discovery mechanism) may require dialing this peer as
 				// well at the same time.
-				debug!(target: "sub-libp2p", "PSM => Drop({:?}): Not yet connected.", entry.key());
+				debug!(target: "sub-libp2p", "PSM => Drop({}, {:?}): Not yet connected.",
+					entry.key().0, set_id);
 				entry.remove();
 			},
 
 			// PendingRequest => Backoff
 			PeerState::PendingRequest { timer, timer_deadline } => {
-				debug!(target: "sub-libp2p", "PSM => Drop({:?}): Not yet connected", entry.key());
+				debug!(target: "sub-libp2p", "PSM => Drop({}, {:?}): Not yet connected",
+					entry.key().0, set_id);
 				*entry.into_mut() = PeerState::Backoff { timer, timer_deadline }
 			},
 
 			// Invalid state transitions.
 			st @ PeerState::Incoming { .. } => {
-				error!(target: "sub-libp2p", "PSM => Drop({:?}): Not enabled (Incoming).",
-					entry.key());
+				error!(target: "sub-libp2p", "PSM => Drop({}, {:?}): Not enabled (Incoming).",
+					entry.key().0, set_id);
 				*entry.into_mut() = st;
 				debug_assert!(!false);
 			},
@@ -967,20 +934,21 @@ impl GenericProto {
 		};
 
 		if !incoming.alive {
-			debug!(target: "sub-libp2p", "PSM => Accept({:?}, {:?}): Obsolete incoming",
-				index, incoming.peer_id);
-			match self.peers.get_mut(&incoming.peer_id) {
+			debug!(target: "sub-libp2p", "PSM => Accept({:?}, {}, {:?}): Obsolete incoming",
+				index, incoming.peer_id, incoming.set_id);
+			match self.peers.get_mut(&(incoming.peer_id.clone(), incoming.set_id)) {
 				Some(PeerState::DisabledPendingEnable { .. }) |
 				Some(PeerState::Enabled { .. }) => {}
 				_ => {
-					debug!(target: "sub-libp2p", "PSM <= Dropped({:?})", incoming.peer_id);
-					self.peerset.dropped(incoming.peer_id);
+					debug!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})",
+						incoming.peer_id, incoming.set_id);
+					self.peerset.dropped(incoming.set_id, incoming.peer_id);
 				},
 			}
 			return
 		}
 
-		let state = match self.peers.get_mut(&incoming.peer_id) {
+		let state = match self.peers.get_mut(&(incoming.peer_id.clone(), incoming.set_id)) {
 			Some(s) => s,
 			None => {
 				debug_assert!(false);
@@ -991,18 +959,19 @@ impl GenericProto {
 		match mem::replace(state, PeerState::Poisoned) {
 			// Incoming => Enabled
 			PeerState::Incoming { mut connections, .. } => {
-				debug!(target: "sub-libp2p", "PSM => Accept({:?}, {:?}): Enabling connections.",
-					index, incoming.peer_id);
+				debug!(target: "sub-libp2p", "PSM => Accept({:?}, {}, {:?}): Enabling connections.",
+					index, incoming.peer_id, incoming.set_id);
 
 				debug_assert!(connections.iter().any(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote)));
 				for (connec_id, connec_state) in connections.iter_mut()
 					.filter(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote))
 				{
-					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open", incoming.peer_id, *connec_id);
+					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open({:?})",
+						incoming.peer_id, *connec_id, incoming.set_id);
 					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
 						peer_id: incoming.peer_id.clone(),
 						handler: NotifyHandler::One(*connec_id),
-						event: NotifsHandlerIn::Open,
+						event: NotifsHandlerIn::Open { protocol_index: incoming.set_id.into() },
 					});
 					*connec_state = ConnectionState::Opening;
 				}
@@ -1030,12 +999,12 @@ impl GenericProto {
 		};
 
 		if !incoming.alive {
-			debug!(target: "sub-libp2p", "PSM => Reject({:?}, {:?}): Obsolete incoming, \
-				ignoring", index, incoming.peer_id);
+			debug!(target: "sub-libp2p", "PSM => Reject({:?}, {}, {:?}): Obsolete incoming, \
+				ignoring", index, incoming.peer_id, incoming.set_id);
 			return
 		}
 
-		let state = match self.peers.get_mut(&incoming.peer_id) {
+		let state = match self.peers.get_mut(&(incoming.peer_id.clone(), incoming.set_id)) {
 			Some(s) => s,
 			None => {
 				debug_assert!(false);
@@ -1046,18 +1015,19 @@ impl GenericProto {
 		match mem::replace(state, PeerState::Poisoned) {
 			// Incoming => Disabled
 			PeerState::Incoming { mut connections, backoff_until } => {
-				debug!(target: "sub-libp2p", "PSM => Reject({:?}, {:?}): Rejecting connections.",
-					index, incoming.peer_id);
+				debug!(target: "sub-libp2p", "PSM => Reject({:?}, {}, {:?}): Rejecting connections.",
+					index, incoming.peer_id, incoming.set_id);
 
 				debug_assert!(connections.iter().any(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote)));
 				for (connec_id, connec_state) in connections.iter_mut()
 					.filter(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote))
 				{
-					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close", incoming.peer_id, connec_id);
+					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close({:?})",
+						incoming.peer_id, connec_id, incoming.set_id);
 					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
 						peer_id: incoming.peer_id.clone(),
 						handler: NotifyHandler::One(*connec_id),
-						event: NotifsHandlerIn::Close,
+						event: NotifsHandlerIn::Close { protocol_index: incoming.set_id.into() },
 					});
 					*connec_state = ConnectionState::Closing;
 				}
@@ -1090,303 +1060,317 @@ impl NetworkBehaviour for GenericProto {
 	}
 
 	fn inject_connection_established(&mut self, peer_id: &PeerId, conn: &ConnectionId, endpoint: &ConnectedPoint) {
-		match self.peers.entry(peer_id.clone()).or_insert(PeerState::Poisoned) {
-			// Requested | PendingRequest => Enabled
-			st @ &mut PeerState::Requested |
-			st @ &mut PeerState::PendingRequest { .. } => {
-				debug!(target: "sub-libp2p",
-					"Libp2p => Connected({}, {:?}): Connection was requested by PSM.",
-					peer_id, endpoint
-				);
-				debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open", peer_id, *conn);
-				self.events.push_back(NetworkBehaviourAction::NotifyHandler {
-					peer_id: peer_id.clone(),
-					handler: NotifyHandler::One(*conn),
-					event: NotifsHandlerIn::Open
-				});
+		for set_id in (0..self.notif_protocols.len()).map(sc_peerset::SetId::from) {
+			match self.peers.entry((peer_id.clone(), set_id)).or_insert(PeerState::Poisoned) {
+				// Requested | PendingRequest => Enabled
+				st @ &mut PeerState::Requested |
+				st @ &mut PeerState::PendingRequest { .. } => {
+					debug!(target: "sub-libp2p",
+						"Libp2p => Connected({}, {:?}, {:?}): Connection was requested by PSM.",
+						peer_id, set_id, endpoint
+					);
+					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open({:?})", peer_id, *conn, set_id);
+					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
+						peer_id: peer_id.clone(),
+						handler: NotifyHandler::One(*conn),
+						event: NotifsHandlerIn::Open { protocol_index: set_id.into() },
+					});
 
-				let mut connections = SmallVec::new();
-				connections.push((*conn, ConnectionState::Opening));
-				*st = PeerState::Enabled { connections };
-			}
+					let mut connections = SmallVec::new();
+					connections.push((*conn, ConnectionState::Opening));
+					*st = PeerState::Enabled { connections };
+				}
 
-			// Poisoned gets inserted above if the entry was missing.
-			// Ø | Backoff => Disabled
-			st @ &mut PeerState::Poisoned |
-			st @ &mut PeerState::Backoff { .. } => {
-				let backoff_until = if let PeerState::Backoff { timer_deadline, .. } = st {
-					Some(*timer_deadline)
-				} else {
-					None
-				};
-				debug!(target: "sub-libp2p",
-					"Libp2p => Connected({}, {:?}, {:?}): Not requested by PSM, disabling.",
-					peer_id, endpoint, *conn);
+				// Poisoned gets inserted above if the entry was missing.
+				// Ø | Backoff => Disabled
+				st @ &mut PeerState::Poisoned |
+				st @ &mut PeerState::Backoff { .. } => {
+					let backoff_until = if let PeerState::Backoff { timer_deadline, .. } = st {
+						Some(*timer_deadline)
+					} else {
+						None
+					};
+					debug!(target: "sub-libp2p",
+						"Libp2p => Connected({}, {:?}, {:?}, {:?}): Not requested by PSM, disabling.",
+						peer_id, set_id, endpoint, *conn);
 
-				let mut connections = SmallVec::new();
-				connections.push((*conn, ConnectionState::Closed));
-				*st = PeerState::Disabled { connections, backoff_until };
-			}
+					let mut connections = SmallVec::new();
+					connections.push((*conn, ConnectionState::Closed));
+					*st = PeerState::Disabled { connections, backoff_until };
+				}
 
-			// In all other states, add this new connection to the list of closed inactive
-			// connections.
-			PeerState::Incoming { connections, .. } |
-			PeerState::Disabled { connections, .. } |
-			PeerState::DisabledPendingEnable { connections, .. } |
-			PeerState::Enabled { connections, .. } => {
-				debug!(target: "sub-libp2p",
-					"Libp2p => Connected({}, {:?}, {:?}): Secondary connection. Leaving closed.",
-					peer_id, endpoint, *conn);
-				connections.push((*conn, ConnectionState::Closed));
+				// In all other states, add this new connection to the list of closed inactive
+				// connections.
+				PeerState::Incoming { connections, .. } |
+				PeerState::Disabled { connections, .. } |
+				PeerState::DisabledPendingEnable { connections, .. } |
+				PeerState::Enabled { connections, .. } => {
+					debug!(target: "sub-libp2p",
+						"Libp2p => Connected({}, {:?}, {:?}, {:?}): Secondary connection. Leaving closed.",
+						peer_id, set_id, endpoint, *conn);
+					connections.push((*conn, ConnectionState::Closed));
+				}
 			}
 		}
 	}
 
 	fn inject_connection_closed(&mut self, peer_id: &PeerId, conn: &ConnectionId, _endpoint: &ConnectedPoint) {
-		let mut entry = if let Entry::Occupied(entry) = self.peers.entry(peer_id.clone()) {
-			entry
-		} else {
-			error!(target: "sub-libp2p", "inject_connection_closed: State mismatch in the custom protos handler");
-			debug_assert!(false);
-			return
-		};
+		for set_id in (0..self.notif_protocols.len()).map(sc_peerset::SetId::from) {
+			let mut entry = if let Entry::Occupied(entry) = self.peers.entry((peer_id.clone(), set_id)) {
+				entry
+			} else {
+				error!(target: "sub-libp2p", "inject_connection_closed: State mismatch in the custom protos handler");
+				debug_assert!(false);
+				return
+			};
 
-		match mem::replace(entry.get_mut(), PeerState::Poisoned) {
-			// Disabled => Disabled | Backoff | Ø
-			PeerState::Disabled { mut connections, backoff_until } => {
-				debug!(target: "sub-libp2p", "Libp2p => Disconnected({}, {:?}): Disabled.", peer_id, *conn);
+			match mem::replace(entry.get_mut(), PeerState::Poisoned) {
+				// Disabled => Disabled | Backoff | Ø
+				PeerState::Disabled { mut connections, backoff_until } => {
+					debug!(target: "sub-libp2p", "Libp2p => Disconnected({}, {:?}, {:?}): Disabled.",
+						peer_id, set_id, *conn);
 
-				if let Some(pos) = connections.iter().position(|(c, _)| *c == *conn) {
-					connections.remove(pos);
-				} else {
-					debug_assert!(false);
-					error!(target: "sub-libp2p",
-						"inject_connection_closed: State mismatch in the custom protos handler");
-				}
+					if let Some(pos) = connections.iter().position(|(c, _)| *c == *conn) {
+						connections.remove(pos);
+					} else {
+						debug_assert!(false);
+						error!(target: "sub-libp2p",
+							"inject_connection_closed: State mismatch in the custom protos handler");
+					}
 
-				if connections.is_empty() {
-					if let Some(until) = backoff_until {
-						let now = Instant::now();
-						if until > now {
-							let delay_id = self.next_delay_id;
-							self.next_delay_id.0 += 1;
-							let delay = futures_timer::Delay::new(until - now);
-							let peer_id = peer_id.clone();
-							self.delays.push(async move {
-								delay.await;
-								(delay_id, peer_id)
-							}.boxed());
-
-							*entry.get_mut() = PeerState::Backoff {
-								timer: delay_id,
-								timer_deadline: until,
-							};
+					if connections.is_empty() {
+						if let Some(until) = backoff_until {
+							let now = Instant::now();
+							if until > now {
+								let delay_id = self.next_delay_id;
+								self.next_delay_id.0 += 1;
+								let delay = futures_timer::Delay::new(until - now);
+								let peer_id = peer_id.clone();
+								self.delays.push(async move {
+									delay.await;
+									(delay_id, peer_id, set_id)
+								}.boxed());
+
+								*entry.get_mut() = PeerState::Backoff {
+									timer: delay_id,
+									timer_deadline: until,
+								};
+							} else {
+								entry.remove();
+							}
 						} else {
 							entry.remove();
 						}
 					} else {
-						entry.remove();
+						*entry.get_mut() = PeerState::Disabled { connections, backoff_until };
 					}
-				} else {
-					*entry.get_mut() = PeerState::Disabled { connections, backoff_until };
-				}
-			},
-
-			// DisabledPendingEnable => DisabledPendingEnable | Backoff
-			PeerState::DisabledPendingEnable { mut connections, timer_deadline, timer } => {
-				debug!(
-					target: "sub-libp2p",
-					"Libp2p => Disconnected({}, {:?}): Disabled but pending enable.",
-					peer_id, *conn
-				);
-
-				if let Some(pos) = connections.iter().position(|(c, _)| *c == *conn) {
-					connections.remove(pos);
-				} else {
-					debug_assert!(false);
-					error!(target: "sub-libp2p",
-						"inject_connection_closed: State mismatch in the custom protos handler");
-				}
+				},
 
-				if connections.is_empty() {
-					debug!(target: "sub-libp2p", "PSM <= Dropped({})", peer_id);
-					self.peerset.dropped(peer_id.clone());
-					*entry.get_mut() = PeerState::Backoff { timer, timer_deadline };
+				// DisabledPendingEnable => DisabledPendingEnable | Backoff
+				PeerState::DisabledPendingEnable { mut connections, timer_deadline, timer } => {
+					debug!(
+						target: "sub-libp2p",
+						"Libp2p => Disconnected({}, {:?}, {:?}): Disabled but pending enable.",
+						peer_id, set_id, *conn
+					);
 
-				} else {
-					*entry.get_mut() = PeerState::DisabledPendingEnable {
-						connections, timer_deadline, timer
-					};
-				}
-			},
+					if let Some(pos) = connections.iter().position(|(c, _)| *c == *conn) {
+						connections.remove(pos);
+					} else {
+						error!(target: "sub-libp2p",
+							"inject_connection_closed: State mismatch in the custom protos handler");
+						debug_assert!(false);
+					}
 
-			// Incoming => Incoming | Disabled | Backoff | Ø
-			PeerState::Incoming { mut connections, backoff_until } => {
-				debug!(
-					target: "sub-libp2p",
-					"Libp2p => Disconnected({}, {:?}): OpenDesiredByRemote.",
-					peer_id, *conn
-				);
+					if connections.is_empty() {
+						debug!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
+						self.peerset.dropped(set_id, peer_id.clone());
+						*entry.get_mut() = PeerState::Backoff { timer, timer_deadline };
 
-				debug_assert!(connections.iter().any(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote)));
+					} else {
+						*entry.get_mut() = PeerState::DisabledPendingEnable {
+							connections, timer_deadline, timer
+						};
+					}
+				},
 
-				if let Some(pos) = connections.iter().position(|(c, _)| *c == *conn) {
-					connections.remove(pos);
-				} else {
-					debug_assert!(false);
-					error!(target: "sub-libp2p",
-						"inject_connection_closed: State mismatch in the custom protos handler");
-				}
+				// Incoming => Incoming | Disabled | Backoff | Ø
+				PeerState::Incoming { mut connections, backoff_until } => {
+					debug!(
+						target: "sub-libp2p",
+						"Libp2p => Disconnected({}, {:?}, {:?}): OpenDesiredByRemote.",
+						peer_id, set_id, *conn
+					);
 
-				let no_desired_left = !connections.iter().any(|(_, s)| {
-					matches!(s, ConnectionState::OpenDesiredByRemote)
-				});
+					debug_assert!(connections.iter().any(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote)));
 
-				// If no connection is `OpenDesiredByRemote` anymore, clean up the peerset incoming
-				// request.
-				if no_desired_left {
-					// In the incoming state, we don't report "Dropped". Instead we will just
-					// ignore the corresponding Accept/Reject.
-					if let Some(state) = self.incoming.iter_mut()
-						.find(|i| i.alive && i.peer_id == *peer_id)
-					{
-						state.alive = false;
+					if let Some(pos) = connections.iter().position(|(c, _)| *c == *conn) {
+						connections.remove(pos);
 					} else {
-						error!(target: "sub-libp2p", "State mismatch in libp2p: no entry in \
-							incoming corresponding to an incoming state in peers");
 						debug_assert!(false);
+						error!(target: "sub-libp2p",
+							"inject_connection_closed: State mismatch in the custom protos handler");
 					}
-				}
 
-				if connections.is_empty() {
-					if let Some(until) = backoff_until {
-						let now = Instant::now();
-						if until > now {
-							let delay_id = self.next_delay_id;
-							self.next_delay_id.0 += 1;
-							let delay = futures_timer::Delay::new(until - now);
-							let peer_id = peer_id.clone();
-							self.delays.push(async move {
-								delay.await;
-								(delay_id, peer_id)
-							}.boxed());
-
-							*entry.get_mut() = PeerState::Backoff {
-								timer: delay_id,
-								timer_deadline: until,
-							};
+					let no_desired_left = !connections.iter().any(|(_, s)| {
+						matches!(s, ConnectionState::OpenDesiredByRemote)
+					});
+
+					// If no connection is `OpenDesiredByRemote` anymore, clean up the peerset incoming
+					// request.
+					if no_desired_left {
+						// In the incoming state, we don't report "Dropped". Instead we will just
+						// ignore the corresponding Accept/Reject.
+						if let Some(state) = self.incoming.iter_mut()
+							.find(|i| i.alive && i.set_id == set_id && i.peer_id == *peer_id)
+						{
+							state.alive = false;
+						} else {
+							error!(target: "sub-libp2p", "State mismatch in libp2p: no entry in \
+								incoming corresponding to an incoming state in peers");
+							debug_assert!(false);
+						}
+					}
+
+					if connections.is_empty() {
+						if let Some(until) = backoff_until {
+							let now = Instant::now();
+							if until > now {
+								let delay_id = self.next_delay_id;
+								self.next_delay_id.0 += 1;
+								let delay = futures_timer::Delay::new(until - now);
+								let peer_id = peer_id.clone();
+								self.delays.push(async move {
+									delay.await;
+									(delay_id, peer_id, set_id)
+								}.boxed());
+
+								*entry.get_mut() = PeerState::Backoff {
+									timer: delay_id,
+									timer_deadline: until,
+								};
+							} else {
+								entry.remove();
+							}
 						} else {
 							entry.remove();
 						}
+
+					} else if no_desired_left {
+						// If no connection is `OpenDesiredByRemote` anymore, switch to `Disabled`.
+						*entry.get_mut() = PeerState::Disabled { connections, backoff_until };
 					} else {
-						entry.remove();
+						*entry.get_mut() = PeerState::Incoming { connections, backoff_until };
 					}
-
-				} else if no_desired_left {
-					// If no connection is `OpenDesiredByRemote` anymore, switch to `Disabled`.
-					*entry.get_mut() = PeerState::Disabled { connections, backoff_until };
-				} else {
-					*entry.get_mut() = PeerState::Incoming { connections, backoff_until };
 				}
-			}
-
-			// Enabled => Enabled | Backoff
-			// Peers are always backed-off when disconnecting while Enabled.
-			PeerState::Enabled { mut connections } => {
-				debug!(
-					target: "sub-libp2p",
-					"Libp2p => Disconnected({}, {:?}): Enabled.",
-					peer_id, *conn
-				);
 
-				debug_assert!(connections.iter().any(|(_, s)|
-					matches!(s, ConnectionState::Opening | ConnectionState::Open(_))));
+				// Enabled => Enabled | Backoff
+				// Peers are always backed-off when disconnecting while Enabled.
+				PeerState::Enabled { mut connections } => {
+					debug!(
+						target: "sub-libp2p",
+						"Libp2p => Disconnected({}, {:?}, {:?}): Enabled.",
+						peer_id, set_id, *conn
+					);
 
-				if let Some(pos) = connections.iter().position(|(c, _)| *c == *conn) {
-					let (_, state) = connections.remove(pos);
-					if let ConnectionState::Open(_) = state {
-						if let Some((replacement_pos, replacement_sink)) = connections
-							.iter()
-							.enumerate()
-							.filter_map(|(num, (_, s))| {
-								match s {
-									ConnectionState::Open(s) => Some((num, s.clone())),
-									_ => None
+					debug_assert!(connections.iter().any(|(_, s)|
+						matches!(s, ConnectionState::Opening | ConnectionState::Open(_))));
+
+					if let Some(pos) = connections.iter().position(|(c, _)| *c == *conn) {
+						let (_, state) = connections.remove(pos);
+						if let ConnectionState::Open(_) = state {
+							if let Some((replacement_pos, replacement_sink)) = connections
+								.iter()
+								.enumerate()
+								.filter_map(|(num, (_, s))| {
+									match s {
+										ConnectionState::Open(s) => Some((num, s.clone())),
+										_ => None
+									}
+								})
+								.next()
+							{
+								if pos <= replacement_pos {
+									debug!(
+										target: "sub-libp2p",
+										"External API <= Sink replaced({}, {:?})",
+										peer_id, set_id
+									);
+									let event = GenericProtoOut::CustomProtocolReplaced {
+										peer_id: peer_id.clone(),
+										set_id,
+										notifications_sink: replacement_sink,
+									};
+									self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
 								}
-							})
-							.next()
-						{
-							if pos <= replacement_pos {
-								debug!(target: "sub-libp2p", "External API <= Sink replaced({})", peer_id);
-								let event = GenericProtoOut::CustomProtocolReplaced {
+							} else {
+								debug!(
+									target: "sub-libp2p", "External API <= Closed({}, {:?})",
+									peer_id, set_id
+								);
+								let event = GenericProtoOut::CustomProtocolClosed {
 									peer_id: peer_id.clone(),
-									notifications_sink: replacement_sink,
+									set_id,
 								};
 								self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
 							}
-						} else {
-							debug!(target: "sub-libp2p", "External API <= Closed({})", peer_id);
-							let event = GenericProtoOut::CustomProtocolClosed {
-								peer_id: peer_id.clone(),
-							};
-							self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
 						}
-					}
 
-				} else {
-					error!(target: "sub-libp2p",
-						"inject_connection_closed: State mismatch in the custom protos handler");
-					debug_assert!(false);
-				}
+					} else {
+						error!(target: "sub-libp2p",
+							"inject_connection_closed: State mismatch in the custom protos handler");
+						debug_assert!(false);
+					}
 
-				if connections.is_empty() {
-					debug!(target: "sub-libp2p", "PSM <= Dropped({})", peer_id);
-					self.peerset.dropped(peer_id.clone());
-					let ban_dur = Uniform::new(5, 10).sample(&mut rand::thread_rng());
+					if connections.is_empty() {
+						debug!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
+						self.peerset.dropped(set_id, peer_id.clone());
+						let ban_dur = Uniform::new(5, 10).sample(&mut rand::thread_rng());
 
-					let delay_id = self.next_delay_id;
-					self.next_delay_id.0 += 1;
-					let delay = futures_timer::Delay::new(Duration::from_secs(ban_dur));
-					let peer_id = peer_id.clone();
-					self.delays.push(async move {
-						delay.await;
-						(delay_id, peer_id)
-					}.boxed());
+						let delay_id = self.next_delay_id;
+						self.next_delay_id.0 += 1;
+						let delay = futures_timer::Delay::new(Duration::from_secs(ban_dur));
+						let peer_id = peer_id.clone();
+						self.delays.push(async move {
+							delay.await;
+							(delay_id, peer_id, set_id)
+						}.boxed());
 
-					*entry.get_mut() = PeerState::Backoff {
-						timer: delay_id,
-						timer_deadline: Instant::now() + Duration::from_secs(ban_dur),
-					};
+						*entry.get_mut() = PeerState::Backoff {
+							timer: delay_id,
+							timer_deadline: Instant::now() + Duration::from_secs(ban_dur),
+						};
 
-				} else if !connections.iter().any(|(_, s)|
-					matches!(s, ConnectionState::Opening | ConnectionState::Open(_)))
-				{
-					debug!(target: "sub-libp2p", "PSM <= Dropped({:?})", peer_id);
-					self.peerset.dropped(peer_id.clone());
+					} else if !connections.iter().any(|(_, s)|
+						matches!(s, ConnectionState::Opening | ConnectionState::Open(_)))
+					{
+						debug!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
+						self.peerset.dropped(set_id, peer_id.clone());
 
-					*entry.get_mut() = PeerState::Disabled {
-						connections,
-						backoff_until: None
-					};
+						*entry.get_mut() = PeerState::Disabled {
+							connections,
+							backoff_until: None
+						};
 
-				} else {
-					*entry.get_mut() = PeerState::Enabled { connections };
+					} else {
+						*entry.get_mut() = PeerState::Enabled { connections };
+					}
 				}
-			}
 
-			PeerState::Requested |
-			PeerState::PendingRequest { .. } |
-			PeerState::Backoff { .. } => {
-				// This is a serious bug either in this state machine or in libp2p.
-				error!(target: "sub-libp2p",
-					"`inject_connection_closed` called for unknown peer {}",
-					peer_id);
-				debug_assert!(false);
-			},
-			PeerState::Poisoned => {
-				error!(target: "sub-libp2p", "State of peer {} is poisoned", peer_id);
-				debug_assert!(false);
-			},
+				PeerState::Requested |
+				PeerState::PendingRequest { .. } |
+				PeerState::Backoff { .. } => {
+					// This is a serious bug either in this state machine or in libp2p.
+					error!(target: "sub-libp2p",
+						"`inject_connection_closed` called for unknown peer {}",
+						peer_id);
+					debug_assert!(false);
+				},
+				PeerState::Poisoned => {
+					error!(target: "sub-libp2p", "State of peer {} is poisoned", peer_id);
+					debug_assert!(false);
+				},
+			}
 		}
 	}
 
@@ -1398,61 +1382,57 @@ impl NetworkBehaviour for GenericProto {
 	}
 
 	fn inject_dial_failure(&mut self, peer_id: &PeerId) {
-		if let Entry::Occupied(mut entry) = self.peers.entry(peer_id.clone()) {
-			match mem::replace(entry.get_mut(), PeerState::Poisoned) {
-				// The peer is not in our list.
-				st @ PeerState::Backoff { .. } => {
-					trace!(target: "sub-libp2p", "Libp2p => Dial failure for {:?}", peer_id);
-					*entry.into_mut() = st;
-				},
+		debug!(target: "sub-libp2p", "Libp2p => Dial failure for {:?}", peer_id);
 
-				// "Basic" situation: we failed to reach a peer that the peerset requested.
-				st @ PeerState::Requested |
-				st @ PeerState::PendingRequest { .. } => {
-					debug!(target: "sub-libp2p", "Libp2p => Dial failure for {:?}", peer_id);
+		for set_id in (0..self.notif_protocols.len()).map(sc_peerset::SetId::from) {
+			if let Entry::Occupied(mut entry) = self.peers.entry((peer_id.clone(), set_id)) {
+				match mem::replace(entry.get_mut(), PeerState::Poisoned) {
+					// The peer is not in our list.
+					st @ PeerState::Backoff { .. } => {
+						*entry.into_mut() = st;
+					},
 
-					debug!(target: "sub-libp2p", "PSM <= Dropped({:?})", peer_id);
-					self.peerset.dropped(peer_id.clone());
+					// "Basic" situation: we failed to reach a peer that the peerset requested.
+					st @ PeerState::Requested |
+					st @ PeerState::PendingRequest { .. } => {
+						debug!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
+						self.peerset.dropped(set_id, peer_id.clone());
 
-					let now = Instant::now();
-					let ban_duration = match st {
-						PeerState::PendingRequest { timer_deadline, .. } if timer_deadline > now =>
-							cmp::max(timer_deadline - now, Duration::from_secs(5)),
-						_ => Duration::from_secs(5)
-					};
+						let now = Instant::now();
+						let ban_duration = match st {
+							PeerState::PendingRequest { timer_deadline, .. } if timer_deadline > now =>
+								cmp::max(timer_deadline - now, Duration::from_secs(5)),
+							_ => Duration::from_secs(5)
+						};
 
-					let delay_id = self.next_delay_id;
-					self.next_delay_id.0 += 1;
-					let delay = futures_timer::Delay::new(ban_duration);
-					let peer_id = peer_id.clone();
-					self.delays.push(async move {
-						delay.await;
-						(delay_id, peer_id)
-					}.boxed());
+						let delay_id = self.next_delay_id;
+						self.next_delay_id.0 += 1;
+						let delay = futures_timer::Delay::new(ban_duration);
+						let peer_id = peer_id.clone();
+						self.delays.push(async move {
+							delay.await;
+							(delay_id, peer_id, set_id)
+						}.boxed());
 
-					*entry.into_mut() = PeerState::Backoff {
-						timer: delay_id,
-						timer_deadline: now + ban_duration,
-					};
-				},
+						*entry.into_mut() = PeerState::Backoff {
+							timer: delay_id,
+							timer_deadline: now + ban_duration,
+						};
+					},
 
-				// We can still get dial failures even if we are already connected to the peer,
-				// as an extra diagnostic for an earlier attempt.
-				st @ PeerState::Disabled { .. } | st @ PeerState::Enabled { .. } |
-					st @ PeerState::DisabledPendingEnable { .. } | st @ PeerState::Incoming { .. } => {
-					debug!(target: "sub-libp2p", "Libp2p => Dial failure for {:?}", peer_id);
-					*entry.into_mut() = st;
-				},
+					// We can still get dial failures even if we are already connected to the peer,
+					// as an extra diagnostic for an earlier attempt.
+					st @ PeerState::Disabled { .. } | st @ PeerState::Enabled { .. } |
+						st @ PeerState::DisabledPendingEnable { .. } | st @ PeerState::Incoming { .. } => {
+						*entry.into_mut() = st;
+					},
 
-				PeerState::Poisoned => {
-					error!(target: "sub-libp2p", "State of {:?} is poisoned", peer_id);
-					debug_assert!(false);
-				},
+					PeerState::Poisoned => {
+						error!(target: "sub-libp2p", "State of {:?} is poisoned", peer_id);
+						debug_assert!(false);
+					},
+				}
 			}
-
-		} else {
-			// The peer is not in our list.
-			trace!(target: "sub-libp2p", "Libp2p => Dial failure for {:?}", peer_id);
 		}
 	}
 
@@ -1463,12 +1443,14 @@ impl NetworkBehaviour for GenericProto {
 		event: NotifsHandlerOut,
 	) {
 		match event {
-			NotifsHandlerOut::OpenDesiredByRemote => {
+			NotifsHandlerOut::OpenDesiredByRemote { protocol_index } => {
+				let set_id = sc_peerset::SetId::from(protocol_index);
+
 				debug!(target: "sub-libp2p",
-					"Handler({:?}, {:?}]) => OpenDesiredByRemote",
-					source, connection);
+					"Handler({:?}, {:?}]) => OpenDesiredByRemote({:?})",
+					source, connection, set_id);
 
-				let mut entry = if let Entry::Occupied(entry) = self.peers.entry(source.clone()) {
+				let mut entry = if let Entry::Occupied(entry) = self.peers.entry((source.clone(), set_id)) {
 					entry
 				} else {
 					error!(target: "sub-libp2p", "OpenDesiredByRemote: State mismatch in the custom protos handler");
@@ -1511,11 +1493,12 @@ impl NetworkBehaviour for GenericProto {
 
 						if let Some((_, connec_state)) = connections.iter_mut().find(|(c, _)| *c == connection) {
 							if let ConnectionState::Closed = *connec_state {
-								debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open", source, connection);
+								debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open({:?})",
+									source, connection, set_id);
 								self.events.push_back(NetworkBehaviourAction::NotifyHandler {
 									peer_id: source,
 									handler: NotifyHandler::One(connection),
-									event: NotifsHandlerIn::Open,
+									event: NotifsHandlerIn::Open { protocol_index: set_id.into() },
 								});
 								*connec_state = ConnectionState::Opening;
 							} else {
@@ -1550,9 +1533,10 @@ impl NetworkBehaviour for GenericProto {
 
 								debug!(target: "sub-libp2p", "PSM <= Incoming({}, {:?}).",
 									source, incoming_id);
-								self.peerset.incoming(source.clone(), incoming_id);
+								self.peerset.incoming(set_id, source.clone(), incoming_id);
 								self.incoming.push(IncomingPeer {
 									peer_id: source.clone(),
+									set_id,
 									alive: true,
 									incoming_id,
 								});
@@ -1582,12 +1566,12 @@ impl NetworkBehaviour for GenericProto {
 					PeerState::DisabledPendingEnable { mut connections, timer, timer_deadline } => {
 						if let Some((_, connec_state)) = connections.iter_mut().find(|(c, _)| *c == connection) {
 							if let ConnectionState::Closed = *connec_state {
-								debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open",
-									source, connection);
+								debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open({:?})",
+									source, connection, set_id);
 								self.events.push_back(NetworkBehaviourAction::NotifyHandler {
 									peer_id: source.clone(),
 									handler: NotifyHandler::One(connection),
-									event: NotifsHandlerIn::Open,
+									event: NotifsHandlerIn::Open { protocol_index: set_id.into() },
 								});
 								*connec_state = ConnectionState::Opening;
 
@@ -1626,12 +1610,14 @@ impl NetworkBehaviour for GenericProto {
 				};
 			}
 
-			NotifsHandlerOut::CloseDesired => {
+			NotifsHandlerOut::CloseDesired { protocol_index } => {
+				let set_id = sc_peerset::SetId::from(protocol_index);
+
 				debug!(target: "sub-libp2p",
-					"Handler({}, {:?}) => CloseDesired",
-					source, connection);
+					"Handler({}, {:?}) => CloseDesired({:?})",
+					source, connection, set_id);
 
-				let mut entry = if let Entry::Occupied(entry) = self.peers.entry(source.clone()) {
+				let mut entry = if let Entry::Occupied(entry) = self.peers.entry((source.clone(), set_id)) {
 					entry
 				} else {
 					error!(target: "sub-libp2p", "CloseDesired: State mismatch in the custom protos handler");
@@ -1662,11 +1648,11 @@ impl NetworkBehaviour for GenericProto {
 						debug_assert!(matches!(connections[pos].1, ConnectionState::Open(_)));
 						connections[pos].1 = ConnectionState::Closing;
 
-						debug!(target: "sub-libp2p", "Handler({}, {:?}) <= Close", source, connection);
+						debug!(target: "sub-libp2p", "Handler({}, {:?}) <= Close({:?})", source, connection, set_id);
 						self.events.push_back(NetworkBehaviourAction::NotifyHandler {
 							peer_id: source.clone(),
 							handler: NotifyHandler::One(connection),
-							event: NotifsHandlerIn::Close,
+							event: NotifsHandlerIn::Close { protocol_index: set_id.into() },
 						});
 
 						if let Some((replacement_pos, replacement_sink)) = connections
@@ -1684,6 +1670,7 @@ impl NetworkBehaviour for GenericProto {
 								debug!(target: "sub-libp2p", "External API <= Sink replaced({:?})", source);
 								let event = GenericProtoOut::CustomProtocolReplaced {
 									peer_id: source,
+									set_id,
 									notifications_sink: replacement_sink,
 								};
 								self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
@@ -1693,8 +1680,8 @@ impl NetworkBehaviour for GenericProto {
 						} else {
 							// List of open connections wasn't empty before but now it is.
 							if !connections.iter().any(|(_, s)| matches!(s, ConnectionState::Opening)) {
-								debug!(target: "sub-libp2p", "PSM <= Dropped({:?})", source);
-								self.peerset.dropped(source.clone());
+								debug!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", source, set_id);
+								self.peerset.dropped(set_id, source.clone());
 								*entry.into_mut() = PeerState::Disabled {
 									connections, backoff_until: None
 								};
@@ -1702,9 +1689,10 @@ impl NetworkBehaviour for GenericProto {
 								*entry.into_mut() = PeerState::Enabled { connections };
 							}
 
-							debug!(target: "sub-libp2p", "External API <= Closed({:?})", source);
+							debug!(target: "sub-libp2p", "External API <= Closed({}, {:?})", source, set_id);
 							let event = GenericProtoOut::CustomProtocolClosed {
 								peer_id: source,
+								set_id,
 							};
 							self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
 						}
@@ -1726,12 +1714,14 @@ impl NetworkBehaviour for GenericProto {
 				}
 			}
 
-			NotifsHandlerOut::CloseResult => {
+			NotifsHandlerOut::CloseResult { protocol_index } => {
+				let set_id = sc_peerset::SetId::from(protocol_index);
+
 				debug!(target: "sub-libp2p",
-					"Handler({}, {:?}) => CloseResult",
-					source, connection);
+					"Handler({}, {:?}) => CloseResult({:?})",
+					source, connection, set_id);
 
-				match self.peers.get_mut(&source) {
+				match self.peers.get_mut(&(source.clone(), set_id)) {
 					// Move the connection from `Closing` to `Closed`.
 					Some(PeerState::DisabledPendingEnable { connections, .. }) |
 					Some(PeerState::Disabled { connections, .. }) |
@@ -1757,12 +1747,13 @@ impl NetworkBehaviour for GenericProto {
 				}
 			}
 
-			NotifsHandlerOut::OpenResultOk { received_handshake, notifications_sink, .. } => {
+			NotifsHandlerOut::OpenResultOk { protocol_index, received_handshake, notifications_sink, .. } => {
+				let set_id = sc_peerset::SetId::from(protocol_index);
 				debug!(target: "sub-libp2p",
-					"Handler({}, {:?}) => OpenResultOk",
-					source, connection);
+					"Handler({}, {:?}) => OpenResultOk({:?})",
+					source, connection, set_id);
 
-				match self.peers.get_mut(&source) {
+				match self.peers.get_mut(&(source.clone(), set_id)) {
 					Some(PeerState::Enabled { connections, .. }) => {
 						debug_assert!(connections.iter().any(|(_, s)|
 							matches!(s, ConnectionState::Opening | ConnectionState::Open(_))));
@@ -1775,6 +1766,7 @@ impl NetworkBehaviour for GenericProto {
 								debug!(target: "sub-libp2p", "External API <= Open({:?})", source);
 								let event = GenericProtoOut::CustomProtocolOpen {
 									peer_id: source,
+									set_id,
 									received_handshake,
 									notifications_sink: notifications_sink.clone(),
 								};
@@ -1815,12 +1807,13 @@ impl NetworkBehaviour for GenericProto {
 				}
 			}
 
-			NotifsHandlerOut::OpenResultErr => {
+			NotifsHandlerOut::OpenResultErr { protocol_index } => {
+				let set_id = sc_peerset::SetId::from(protocol_index);
 				debug!(target: "sub-libp2p",
-					"Handler({:?}, {:?}) => OpenResultErr",
-					source, connection);
+					"Handler({:?}, {:?}) => OpenResultErr({:?})",
+					source, connection, set_id);
 
-				let mut entry = if let Entry::Occupied(entry) = self.peers.entry(source.clone()) {
+				let mut entry = if let Entry::Occupied(entry) = self.peers.entry((source.clone(), set_id)) {
 					entry
 				} else {
 					error!(target: "sub-libp2p", "OpenResultErr: State mismatch in the custom protos handler");
@@ -1852,7 +1845,7 @@ impl NetworkBehaviour for GenericProto {
 							matches!(s, ConnectionState::Opening | ConnectionState::Open(_)))
 						{
 							debug!(target: "sub-libp2p", "PSM <= Dropped({:?})", source);
-							self.peerset.dropped(source.clone());
+							self.peerset.dropped(set_id, source.clone());
 
 							*entry.into_mut() = PeerState::Disabled {
 								connections,
@@ -1902,7 +1895,7 @@ impl NetworkBehaviour for GenericProto {
 			}
 
 			NotifsHandlerOut::CustomMessage { message } => {
-				if self.is_open(&source) {
+				if self.is_open(&source, sc_peerset::SetId::from(0)) {  // TODO: using set 0 here is hacky
 					trace!(target: "sub-libp2p", "Handler({:?}) => Message", source);
 					trace!(target: "sub-libp2p", "External API <= Message({:?})", source);
 					let event = GenericProtoOut::LegacyMessage {
@@ -1920,19 +1913,22 @@ impl NetworkBehaviour for GenericProto {
 				}
 			}
 
-			NotifsHandlerOut::Notification { protocol_name, message } => {
-				if self.is_open(&source) {
+			NotifsHandlerOut::Notification { protocol_index, message } => {
+				let set_id = sc_peerset::SetId::from(protocol_index);
+				if self.is_open(&source, set_id) {
 					trace!(
 						target: "sub-libp2p",
-						"Handler({:?}) => Notification({:?}, {} bytes)",
+						"Handler({:?}) => Notification({}, {:?}, {} bytes)",
+						connection,
 						source,
-						protocol_name,
+						set_id,
 						message.len()
 					);
-					trace!(target: "sub-libp2p", "External API <= Message({:?}, {:?})", protocol_name, source);
+					trace!(target: "sub-libp2p", "External API <= Message({}, {:?})",
+						source, set_id);
 					let event = GenericProtoOut::Notification {
 						peer_id: source,
-						protocol_name,
+						set_id,
 						message,
 					};
 
@@ -1940,9 +1936,10 @@ impl NetworkBehaviour for GenericProto {
 				} else {
 					trace!(
 						target: "sub-libp2p",
-						"Handler({:?}) => Post-close notification({:?}, {} bytes)",
+						"Handler({:?}) => Post-close notification({}, {:?}, {} bytes)",
+						connection,
 						source,
-						protocol_name,
+						set_id,
 						message.len()
 					);
 				}
@@ -1974,11 +1971,11 @@ impl NetworkBehaviour for GenericProto {
 				Poll::Ready(Some(sc_peerset::Message::Reject(index))) => {
 					self.peerset_report_reject(index);
 				}
-				Poll::Ready(Some(sc_peerset::Message::Connect(id))) => {
-					self.peerset_report_connect(id);
+				Poll::Ready(Some(sc_peerset::Message::Connect { peer_id, set_id, .. })) => {
+					self.peerset_report_connect(peer_id, set_id);
 				}
-				Poll::Ready(Some(sc_peerset::Message::Drop(id))) => {
-					self.peerset_report_disconnect(id);
+				Poll::Ready(Some(sc_peerset::Message::Drop { peer_id, set_id, .. })) => {
+					self.peerset_report_disconnect(peer_id, set_id);
 				}
 				Poll::Ready(None) => {
 					error!(target: "sub-libp2p", "Peerset receiver stream has returned None");
@@ -1988,9 +1985,9 @@ impl NetworkBehaviour for GenericProto {
 			}
 		}
 
-		while let Poll::Ready(Some((delay_id, peer_id))) =
+		while let Poll::Ready(Some((delay_id, peer_id, set_id))) =
 			Pin::new(&mut self.delays).poll_next(cx) {
-			let peer_state = match self.peers.get_mut(&peer_id) {
+			let peer_state = match self.peers.get_mut(&(peer_id.clone(), set_id)) {
 				Some(s) => s,
 				// We intentionally never remove elements from `delays`, and it may
 				// thus contain peers which are now gone. This is a normal situation.
@@ -2000,11 +1997,12 @@ impl NetworkBehaviour for GenericProto {
 			match peer_state {
 				PeerState::Backoff { timer, .. } if *timer == delay_id => {
 					debug!(target: "sub-libp2p", "Libp2p <= Clean up ban of {:?} from the state", peer_id);
-					self.peers.remove(&peer_id);
+					self.peers.remove(&(peer_id, set_id));
 				}
 
 				PeerState::PendingRequest { timer, .. } if *timer == delay_id => {
 					debug!(target: "sub-libp2p", "Libp2p <= Dial {:?} now that ban has expired", peer_id);
+					// The `DialPeerCondition` ensures that dial attempts are de-duplicated
 					self.events.push_back(NetworkBehaviourAction::DialPeer {
 						peer_id,
 						condition: DialPeerCondition::Disconnected
@@ -2019,12 +2017,12 @@ impl NetworkBehaviour for GenericProto {
 					if let Some((connec_id, connec_state)) = connections.iter_mut()
 						.find(|(_, s)| matches!(s, ConnectionState::Closed))
 					{
-						debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open (ban expired)",
-							peer_id, *connec_id);
+						debug!(target: "sub-libp2p", "Handler({}, {:?}) <= Open({:?}) (ban expired)",
+							peer_id, *connec_id, set_id);
 						self.events.push_back(NetworkBehaviourAction::NotifyHandler {
 							peer_id: peer_id.clone(),
 							handler: NotifyHandler::One(*connec_id),
-							event: NotifsHandlerIn::Open,
+							event: NotifsHandlerIn::Open { protocol_index: set_id.into() },
 						});
 						*connec_state = ConnectionState::Opening;
 						*peer_state = PeerState::Enabled {
@@ -2036,7 +2034,7 @@ impl NetworkBehaviour for GenericProto {
 						let timer = *timer;
 						self.delays.push(async move {
 							delay.await;
-							(timer, peer_id)
+							(timer, peer_id, set_id)
 						}.boxed());
 					}
 				}
diff --git a/client/network/src/protocol/generic_proto/handler.rs b/client/network/src/protocol/generic_proto/handler.rs
index 97417000c20b..6d7e8b145a63 100644
--- a/client/network/src/protocol/generic_proto/handler.rs
+++ b/client/network/src/protocol/generic_proto/handler.rs
@@ -17,41 +17,42 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Implementations of the `IntoProtocolsHandler` and `ProtocolsHandler` traits for both incoming
-//! and outgoing substreams for all gossiping protocols together.
+//! and outgoing substreams for all gossiping protocols.
 //!
 //! This is the main implementation of `ProtocolsHandler` in this crate, that handles all the
-//! protocols that are Substrate-related and outside of the scope of libp2p.
+//! gossiping protocols that are Substrate-related and outside of the scope of libp2p.
 //!
 //! # Usage
 //!
-//! From an API perspective, the [`NotifsHandler`] is always in one of the following state (see [`State`]):
+//! From an API perspective, for each of its protocols, the [`NotifsHandler`] is always in one of
+//! the following state (see [`State`]):
 //!
-//! - Closed substreams. This is the initial state.
-//! - Closed substreams, but remote desires them to be open.
-//! - Open substreams.
-//! - Open substreams, but remote desires them to be closed.
+//! - Closed substream. This is the initial state.
+//! - Closed substream, but remote desires them to be open.
+//! - Open substream.
+//! - Open substream, but remote desires them to be closed.
 //!
-//! The [`NotifsHandler`] can spontaneously switch between these states:
+//! Each protocol in the [`NotifsHandler`] can spontaneously switch between these states:
 //!
-//! - "Closed substreams" to "Closed substreams but open desired". When that happens, a
+//! - "Closed substream" to "Closed substream but open desired". When that happens, a
 //! [`NotifsHandlerOut::OpenDesiredByRemote`] is emitted.
-//! - "Closed substreams but open desired" to "Closed substreams" (i.e. the remote has cancelled
+//! - "Closed substream but open desired" to "Closed substream" (i.e. the remote has cancelled
 //! their request). When that happens, a [`NotifsHandlerOut::CloseDesired`] is emitted.
-//! - "Open substreams" to "Open substreams but close desired". When that happens, a
+//! - "Open substream" to "Open substream but close desired". When that happens, a
 //! [`NotifsHandlerOut::CloseDesired`] is emitted.
 //!
-//! The user can instruct the `NotifsHandler` to switch from "closed" to "open" or vice-versa by
-//! sending either a [`NotifsHandlerIn::Open`] or a [`NotifsHandlerIn::Close`]. The `NotifsHandler`
-//! must answer with [`NotifsHandlerOut::OpenResultOk`] or [`NotifsHandlerOut::OpenResultErr`], or
-//! with [`NotifsHandlerOut::CloseResult`].
+//! The user can instruct a protocol in the `NotifsHandler` to switch from "closed" to "open" or
+//! vice-versa by sending either a [`NotifsHandlerIn::Open`] or a [`NotifsHandlerIn::Close`]. The
+//! `NotifsHandler` must answer with [`NotifsHandlerOut::OpenResultOk`] or
+//! [`NotifsHandlerOut::OpenResultErr`], or with [`NotifsHandlerOut::CloseResult`].
 //!
-//! When a [`NotifsHandlerOut::OpenResultOk`] is emitted, the `NotifsHandler` is now in the open
-//! state. When a [`NotifsHandlerOut::OpenResultErr`] or [`NotifsHandlerOut::CloseResult`] is
-//! emitted, the `NotifsHandler` is now (or remains) in the closed state.
+//! When a [`NotifsHandlerOut::OpenResultOk`] is emitted, the substream is now in the open state.
+//! When a [`NotifsHandlerOut::OpenResultErr`] or [`NotifsHandlerOut::CloseResult`] is emitted,
+//! the `NotifsHandler` is now (or remains) in the closed state.
 //!
-//! When a [`NotifsHandlerOut::OpenDesiredByRemote`] is emitted, the user should always send back either a
-//! [`NotifsHandlerIn::Open`] or a [`NotifsHandlerIn::Close`].If this isn't done, the remote will
-//! be left in a pending state.
+//! When a [`NotifsHandlerOut::OpenDesiredByRemote`] is emitted, the user should always send back
+//! either a [`NotifsHandlerIn::Open`] or a [`NotifsHandlerIn::Close`].If this isn't done, the
+//! remote will be left in a pending state.
 //!
 //! It is illegal to send a [`NotifsHandlerIn::Open`] before a previously-emitted
 //! [`NotifsHandlerIn::Open`] has gotten an answer.
@@ -110,13 +111,9 @@ const INITIAL_KEEPALIVE_TIME: Duration = Duration::from_secs(5);
 ///
 /// See the documentation at the module level for more information.
 pub struct NotifsHandlerProto {
-	/// Prototypes for upgrades for inbound substreams, and the message we respond with in the
-	/// handshake.
-	in_protocols: Vec<(NotificationsIn, Arc<RwLock<Vec<u8>>>)>,
-
-	/// Name of protocols available for outbound substreams, and the initial handshake message we
-	/// send.
-	out_protocols: Vec<(Cow<'static, str>, Arc<RwLock<Vec<u8>>>)>,
+	/// Name of protocols, prototypes for upgrades for inbound substreams, and the message we
+	/// send or respond with in the handshake.
+	protocols: Vec<(Cow<'static, str>, NotificationsIn, Arc<RwLock<Vec<u8>>>)>,
 
 	/// Configuration for the legacy protocol upgrade.
 	legacy_protocol: RegisteredProtocol,
@@ -126,13 +123,8 @@ pub struct NotifsHandlerProto {
 ///
 /// See the documentation at the module level for more information.
 pub struct NotifsHandler {
-	/// Prototypes for upgrades for inbound substreams, and the message we respond with in the
-	/// handshake.
-	in_protocols: Vec<(NotificationsIn, Arc<RwLock<Vec<u8>>>)>,
-
-	/// Name of protocols available for outbound substreams, and the initial handshake message we
-	/// send.
-	out_protocols: Vec<(Cow<'static, str>, Arc<RwLock<Vec<u8>>>)>,
+	/// List of notification protocols, specified by the user at initialization.
+	protocols: Vec<Protocol>,
 
 	/// When the connection with the remote has been successfully established.
 	when_connection_open: Instant,
@@ -143,9 +135,6 @@ pub struct NotifsHandler {
 	/// Remote we are connected to.
 	peer_id: PeerId,
 
-	/// State of this handler.
-	state: State,
-
 	/// Configuration for the legacy protocol upgrade.
 	legacy_protocol: RegisteredProtocol,
 
@@ -161,66 +150,50 @@ pub struct NotifsHandler {
 	>,
 }
 
+/// Fields specific for each individual protocol.
+struct Protocol {
+	/// Name of the protocol.
+	name: Cow<'static, str>,
+
+	/// Prototype for the inbound upgrade.
+	in_upgrade: NotificationsIn,
+
+	/// Handshake to send when opening a substream or receiving an open request.
+	handshake: Arc<RwLock<Vec<u8>>>,
+
+	/// Current state of the substreams for this protocol.
+	state: State,
+}
+
 /// See the module-level documentation to learn about the meaning of these variants.
 enum State {
-	/// Handler is in the "Closed" state.
+	/// Protocol is in the "Closed" state.
 	Closed {
-		/// Vec of the same length as [`NotifsHandler::out_protocols`]. For each protocol, contains
-		/// a boolean indicating whether an outgoing substream is still in the process of being
-		/// opened.
-		pending_opening: Vec<bool>,
+		/// True if an outgoing substream is still in the process of being opened.
+		pending_opening: bool,
 	},
 
-	/// Handler is in the "Closed" state. A [`NotifsHandlerOut::OpenDesiredByRemote`] has been emitted.
+	/// Protocol is in the "Closed" state. A [`NotifsHandlerOut::OpenDesiredByRemote`] has been
+	/// emitted.
 	OpenDesiredByRemote {
-		/// Vec of the same length as [`NotifsHandler::in_protocols`]. For each protocol, contains
-		/// a substream opened by the remote and that hasn't been accepted/rejected yet.
-		///
-		/// Must always contain at least one `Some`.
-		in_substreams: Vec<Option<NotificationsInSubstream<NegotiatedSubstream>>>,
+		/// Substream opened by the remote and that hasn't been accepted/rejected yet.
+		in_substream: NotificationsInSubstream<NegotiatedSubstream>,
 
 		/// See [`State::Closed::pending_opening`].
-		pending_opening: Vec<bool>,
+		pending_opening: bool,
 	},
 
-	/// Handler is in the "Closed" state, but has received a [`NotifsHandlerIn::Open`] and is
+	/// Protocol is in the "Closed" state, but has received a [`NotifsHandlerIn::Open`] and is
 	/// consequently trying to open the various notifications substreams.
 	///
 	/// A [`NotifsHandlerOut::OpenResultOk`] or a [`NotifsHandlerOut::OpenResultErr`] event must
 	/// be emitted when transitionning to respectively [`State::Open`] or [`State::Closed`].
 	Opening {
-		/// In the situation where either the legacy substream has been opened or the
-		/// handshake-bearing notifications protocol is open, but we haven't sent out any
-		/// [`NotifsHandlerOut::Open`] event yet, this contains the received handshake waiting to
-		/// be reported through the external API.
-		pending_handshake: Option<Vec<u8>>,
-
-		/// Vec of the same length as [`NotifsHandler::in_protocols`]. For each protocol, contains
-		/// a substream opened by the remote and that has been accepted.
-		///
-		/// Contrary to [`State::OpenDesiredByRemote::in_substreams`], it is possible for this to
-		/// contain only `None`s.
-		in_substreams: Vec<Option<NotificationsInSubstream<NegotiatedSubstream>>>,
-
-		/// Vec of the same length as [`NotifsHandler::out_protocols`]. For each protocol, contains
-		/// an outbound substream that has been accepted by the remote.
-		///
-		/// Items that contain `None` mean that a substream is still being opened or has been
-		/// rejected by the remote. In other words, this `Vec` is kind of a mirror version of
-		/// [`State::Closed::pending_opening`].
-		///
-		/// Items that contain `Some(None)` have been rejected by the remote, most likely because
-		/// they don't support this protocol. At the time of writing, the external API doesn't
-		/// distinguish between the different protocols. From the external API's point of view,
-		/// either all protocols are open or none are open. In reality, light clients in particular
-		/// don't support for example the GrandPa protocol, and as such will refuse our outgoing
-		/// attempts. This is problematic in theory, but in practice this is handled properly at a
-		/// higher level. This flaw will fixed once the outer layers know to differentiate the
-		/// multiple protocols.
-		out_substreams: Vec<Option<Option<NotificationsOutSubstream<NegotiatedSubstream>>>>,
+		/// Substream opened by the remote. If `Some`, has been accepted.
+		in_substream: Option<NotificationsInSubstream<NegotiatedSubstream>>,
 	},
 
-	/// Handler is in the "Open" state.
+	/// Protocol is in the "Open" state.
 	Open {
 		/// Contains the two `Receiver`s connected to the [`NotificationsSink`] that has been
 		/// sent out. The notifications to send out can be pulled from this receivers.
@@ -232,25 +205,19 @@ enum State {
 			stream::Fuse<mpsc::Receiver<NotificationsSinkMessage>>
 		>,
 
-		/// Vec of the same length as [`NotifsHandler::out_protocols`]. For each protocol, contains
-		/// an outbound substream that has been accepted by the remote.
+		/// Outbound substream that has been accepted by the remote.
 		///
-		/// On transition to [`State::Open`], all the elements must be `Some`. Elements are
-		/// switched to `None` only if the remote closes substreams, in which case `want_closed`
-		/// must be true.
-		out_substreams: Vec<Option<NotificationsOutSubstream<NegotiatedSubstream>>>,
+		/// Always `Some` on transition to [`State::Open`]. Switched to `None` only if the remote
+		/// closed the substream. If `None`, a [`NotifsHandlerOut::CloseDesired`] event has been
+		/// emitted.
+		out_substream: Option<NotificationsOutSubstream<NegotiatedSubstream>>,
 
-		/// Vec of the same length as [`NotifsHandler::in_protocols`]. For each protocol, contains
-		/// a substream opened by the remote and that has been accepted.
+		/// Substream opened by the remote.
 		///
-		/// Contrary to [`State::OpenDesiredByRemote::in_substreams`], it is possible for this to
-		/// contain only `None`s.
-		in_substreams: Vec<Option<NotificationsInSubstream<NegotiatedSubstream>>>,
-
-		/// If true, at least one substream in [`State::Open::out_substreams`] has been closed or
-		/// reset by the remote and a [`NotifsHandlerOut::CloseDesired`] message has been sent
-		/// out.
-		want_closed: bool,
+		/// Contrary to the `out_substream` field, operations continue as normal even if the
+		/// substream has been closed by the remote. A `None` is treated the same way as if there
+		/// was an idle substream.
+		in_substream: Option<NotificationsInSubstream<NegotiatedSubstream>>,
 	},
 }
 
@@ -258,25 +225,28 @@ impl IntoProtocolsHandler for NotifsHandlerProto {
 	type Handler = NotifsHandler;
 
 	fn inbound_protocol(&self) -> SelectUpgrade<UpgradeCollec<NotificationsIn>, RegisteredProtocol> {
-		let in_protocols = self.in_protocols.iter()
-			.map(|(h, _)| h.clone())
+		let protocols = self.protocols.iter()
+			.map(|(_, p, _)| p.clone())
 			.collect::<UpgradeCollec<_>>();
 
-		SelectUpgrade::new(in_protocols, self.legacy_protocol.clone())
+		SelectUpgrade::new(protocols, self.legacy_protocol.clone())
 	}
 
 	fn into_handler(self, peer_id: &PeerId, connected_point: &ConnectedPoint) -> Self::Handler {
-		let num_out_proto = self.out_protocols.len();
-
 		NotifsHandler {
-			in_protocols: self.in_protocols,
-			out_protocols: self.out_protocols,
+			protocols: self.protocols.into_iter().map(|(name, in_upgrade, handshake)| {
+				Protocol {
+					name,
+					in_upgrade,
+					handshake,
+					state: State::Closed {
+						pending_opening: false,
+					}
+				}
+			}).collect(),
 			peer_id: peer_id.clone(),
 			endpoint: connected_point.clone(),
 			when_connection_open: Instant::now(),
-			state: State::Closed {
-				pending_opening: (0..num_out_proto).map(|_| false).collect(),
-			},
 			legacy_protocol: self.legacy_protocol,
 			legacy_substreams: SmallVec::new(),
 			legacy_shutdown: SmallVec::new(),
@@ -295,13 +265,19 @@ pub enum NotifsHandlerIn {
 	///
 	/// Importantly, it is forbidden to send a [`NotifsHandlerIn::Open`] while a previous one is
 	/// already in the fly. It is however possible if a `Close` is still in the fly.
-	Open,
+	Open {
+		/// Index of the protocol in the list of protocols passed at initialization.
+		protocol_index: usize,
+	},
 
 	/// Instruct the handler to close the notification substreams, or reject any pending incoming
 	/// substream request.
 	///
 	/// Must always be answered by a [`NotifsHandlerOut::CloseResult`] event.
-	Close,
+	Close {
+		/// Index of the protocol in the list of protocols passed at initialization.
+		protocol_index: usize,
+	},
 }
 
 /// Event that can be emitted by a `NotifsHandler`.
@@ -309,6 +285,8 @@ pub enum NotifsHandlerIn {
 pub enum NotifsHandlerOut {
 	/// Acknowledges a [`NotifsHandlerIn::Open`].
 	OpenResultOk {
+		/// Index of the protocol in the list of protocols passed at initialization.
+		protocol_index: usize,
 		/// The endpoint of the connection that is open for custom protocols.
 		endpoint: ConnectedPoint,
 		/// Handshake that was sent to us.
@@ -320,23 +298,35 @@ pub enum NotifsHandlerOut {
 
 	/// Acknowledges a [`NotifsHandlerIn::Open`]. The remote has refused the attempt to open
 	/// notification substreams.
-	OpenResultErr,
+	OpenResultErr {
+		/// Index of the protocol in the list of protocols passed at initialization.
+		protocol_index: usize,
+	},
 
 	/// Acknowledges a [`NotifsHandlerIn::Close`].
-	CloseResult,
+	CloseResult {
+		/// Index of the protocol in the list of protocols passed at initialization.
+		protocol_index: usize,
+	},
 
 	/// The remote would like the substreams to be open. Send a [`NotifsHandlerIn::Open`] or a
 	/// [`NotifsHandlerIn::Close`] in order to either accept or deny this request. If a
 	/// [`NotifsHandlerIn::Open`] or [`NotifsHandlerIn::Close`] has been sent before and has not
 	/// yet been acknowledged by a matching [`NotifsHandlerOut`], then you don't need to a send
 	/// another [`NotifsHandlerIn`].
-	OpenDesiredByRemote,
+	OpenDesiredByRemote {
+		/// Index of the protocol in the list of protocols passed at initialization.
+		protocol_index: usize,
+	},
 
 	/// The remote would like the substreams to be closed. Send a [`NotifsHandlerIn::Close`] in
 	/// order to close them. If a [`NotifsHandlerIn::Close`] has been sent before and has not yet
 	/// been acknowledged by a [`NotifsHandlerOut::CloseResult`], then you don't need to a send
 	/// another one.
-	CloseDesired,
+	CloseDesired {
+		/// Index of the protocol in the list of protocols passed at initialization.
+		protocol_index: usize,
+	},
 
 	/// Received a non-gossiping message on the legacy substream.
 	///
@@ -353,9 +343,8 @@ pub enum NotifsHandlerOut {
 	///
 	/// Can only happen when the handler is in the open state.
 	Notification {
-		/// Name of the protocol of the message.
-		protocol_name: Cow<'static, str>,
-
+		/// Index of the protocol in the list of protocols passed at initialization.
+		protocol_index: usize,
 		/// Message that has been received.
 		message: BytesMut,
 	},
@@ -363,7 +352,7 @@ pub enum NotifsHandlerOut {
 
 /// Sink connected directly to the node background task. Allows sending notifications to the peer.
 ///
-/// Can be cloned in order to obtain multiple references to the same peer.
+/// Can be cloned in order to obtain multiple references to the substream of the same peer.
 #[derive(Debug, Clone)]
 pub struct NotificationsSink {
 	inner: Arc<NotificationsSinkInner>,
@@ -389,7 +378,6 @@ enum NotificationsSinkMessage {
 	/// Message emitted by [`NotificationsSink::reserve_notification`] and
 	/// [`NotificationsSink::write_notification_now`].
 	Notification {
-		protocol_name: Cow<'static, str>,
 		message: Vec<u8>,
 	},
 
@@ -414,12 +402,10 @@ impl NotificationsSink {
 	/// This method will be removed in a future version.
 	pub fn send_sync_notification<'a>(
 		&'a self,
-		protocol_name: Cow<'static, str>,
 		message: impl Into<Vec<u8>>
 	) {
 		let mut lock = self.inner.sync_channel.lock();
 		let result = lock.try_send(NotificationsSinkMessage::Notification {
-			protocol_name,
 			message: message.into()
 		});
 
@@ -437,12 +423,12 @@ impl NotificationsSink {
 	///
 	/// The protocol name is expected to be checked ahead of calling this method. It is a logic
 	/// error to send a notification using an unknown protocol.
-	pub async fn reserve_notification<'a>(&'a self, protocol_name: Cow<'static, str>) -> Result<Ready<'a>, ()> {
+	pub async fn reserve_notification<'a>(&'a self) -> Result<Ready<'a>, ()> {
 		let mut lock = self.inner.async_channel.lock().await;
 
 		let poll_ready = future::poll_fn(|cx| lock.poll_ready(cx)).await;
 		if poll_ready.is_ok() {
-			Ok(Ready { protocol_name: protocol_name, lock })
+			Ok(Ready { lock })
 		} else {
 			Err(())
 		}
@@ -455,17 +441,9 @@ impl NotificationsSink {
 pub struct Ready<'a> {
 	/// Guarded channel. The channel inside is guaranteed to not be full.
 	lock: FuturesMutexGuard<'a, mpsc::Sender<NotificationsSinkMessage>>,
-	/// Name of the protocol. Should match one of the protocols passed at initialization.
-	protocol_name: Cow<'static, str>,
 }
 
 impl<'a> Ready<'a> {
-	/// Returns the name of the protocol. Matches the one passed to
-	/// [`NotificationsSink::reserve_notification`].
-	pub fn protocol_name(&self) -> &Cow<'static, str> {
-		&self.protocol_name
-	}
-
 	/// Consumes this slots reservation and actually queues the notification.
 	///
 	/// Returns an error if the substream has been closed.
@@ -474,7 +452,6 @@ impl<'a> Ready<'a> {
 		notification: impl Into<Vec<u8>>
 	) -> Result<(), ()> {
 		self.lock.start_send(NotificationsSinkMessage::Notification {
-			protocol_name: self.protocol_name,
 			message: notification.into(),
 		}).map_err(|_| ())
 	}
@@ -493,34 +470,20 @@ impl NotifsHandlerProto {
 	/// `list` is a list of notification protocols names, and the message to send as part of the
 	/// handshake. At the moment, the message is always the same whether we open a substream
 	/// ourselves or respond to handshake from the remote.
-	///
-	/// The first protocol in `list` is special-cased as the protocol that contains the handshake
-	/// to report through the [`NotifsHandlerOut::Open`] event.
-	///
-	/// # Panic
-	///
-	/// - Panics if `list` is empty.
-	///
 	pub fn new(
 		legacy_protocol: RegisteredProtocol,
 		list: impl Into<Vec<(Cow<'static, str>, Arc<RwLock<Vec<u8>>>)>>,
 	) -> Self {
-		let list = list.into();
-		assert!(!list.is_empty());
-
-		let out_protocols = list
-			.clone()
-			.into_iter()
-			.collect();
-
-		let in_protocols = list.clone()
+		let protocols =	list
+			.into()
 			.into_iter()
-			.map(|(proto_name, msg)| (NotificationsIn::new(proto_name), msg))
+			.map(|(proto_name, msg)| {
+				(proto_name.clone(), NotificationsIn::new(proto_name), msg)
+			})
 			.collect();
 
 		NotifsHandlerProto {
-			in_protocols,
-			out_protocols,
+			protocols,
 			legacy_protocol,
 		}
 	}
@@ -537,12 +500,12 @@ impl ProtocolsHandler for NotifsHandler {
 	type InboundOpenInfo = ();
 
 	fn listen_protocol(&self) -> SubstreamProtocol<Self::InboundProtocol, ()> {
-		let in_protocols = self.in_protocols.iter()
-			.map(|(h, _)| h.clone())
+		let protocols = self.protocols.iter()
+			.map(|p| p.in_upgrade.clone())
 			.collect::<UpgradeCollec<_>>();
 
-		let proto = SelectUpgrade::new(in_protocols, self.legacy_protocol.clone());
-		SubstreamProtocol::new(proto, ())
+		let with_legacy = SelectUpgrade::new(protocols, self.legacy_protocol.clone());
+		SubstreamProtocol::new(with_legacy, ())
 	}
 
 	fn inject_fully_negotiated_inbound(
@@ -552,47 +515,43 @@ impl ProtocolsHandler for NotifsHandler {
 	) {
 		match out {
 			// Received notifications substream.
-			EitherOutput::First(((_remote_handshake, mut proto), num)) => {
-				match &mut self.state {
+			EitherOutput::First(((_remote_handshake, mut new_substream), protocol_index)) => {
+				let mut protocol_info = &mut self.protocols[protocol_index];
+				match protocol_info.state {
 					State::Closed { pending_opening } => {
 						self.events_queue.push_back(ProtocolsHandlerEvent::Custom(
-							NotifsHandlerOut::OpenDesiredByRemote
+							NotifsHandlerOut::OpenDesiredByRemote {
+								protocol_index,
+							}
 						));
 
-						let mut in_substreams = (0..self.in_protocols.len())
-							.map(|_| None)
-							.collect::<Vec<_>>();
-						in_substreams[num] = Some(proto);
-						self.state = State::OpenDesiredByRemote {
-							in_substreams,
-							pending_opening: mem::replace(pending_opening, Vec::new()),
+						protocol_info.state = State::OpenDesiredByRemote {
+							in_substream: new_substream,
+							pending_opening,
 						};
 					},
-					State::OpenDesiredByRemote { in_substreams, .. } => {
-						if in_substreams[num].is_some() {
-							// If a substream already exists, silently drop the new one.
-							// Note that we drop the substream, which will send an equivalent to a
-							// TCP "RST" to the remote and force-close the substream. It might
-							// seem like an unclean way to get rid of a substream. However, keep
-							// in mind that it is invalid for the remote to open multiple such
-							// substreams, and therefore sending a "RST" is the most correct thing
-							// to do.
-							return;
-						}
-						in_substreams[num] = Some(proto);
+					State::OpenDesiredByRemote { .. } => {
+						// If a substream already exists, silently drop the new one.
+						// Note that we drop the substream, which will send an equivalent to a
+						// TCP "RST" to the remote and force-close the substream. It might
+						// seem like an unclean way to get rid of a substream. However, keep
+						// in mind that it is invalid for the remote to open multiple such
+						// substreams, and therefore sending a "RST" is the most correct thing
+						// to do.
+						return;
 					},
-					State::Opening { in_substreams, .. } |
-					State::Open { in_substreams, .. } => {
-						if in_substreams[num].is_some() {
+					State::Opening { ref mut in_substream, .. } |
+					State::Open { ref mut in_substream, .. } => {
+						if in_substream.is_some() {
 							// Same remark as above.
 							return;
 						}
 
-						// We create `handshake_message` on a separate line to be sure
-						// that the lock is released as soon as possible.
-						let handshake_message = self.in_protocols[num].1.read().clone();
-						proto.send_handshake(handshake_message);
-						in_substreams[num] = Some(proto);
+						// Create `handshake_message` on a separate line to be sure that the
+						// lock is released as soon as possible.
+						let handshake_message = protocol_info.handshake.read().clone();
+						new_substream.send_handshake(handshake_message);
+						*in_substream = Some(new_substream);
 					},
 				};
 			}
@@ -615,114 +574,95 @@ impl ProtocolsHandler for NotifsHandler {
 	fn inject_fully_negotiated_outbound(
 		&mut self,
 		(handshake, substream): <Self::OutboundProtocol as OutboundUpgrade<NegotiatedSubstream>>::Output,
-		num: Self::OutboundOpenInfo
+		protocol_index: Self::OutboundOpenInfo
 	) {
-		match &mut self.state {
-			State::Closed { pending_opening } |
-			State::OpenDesiredByRemote { pending_opening, .. } => {
-				debug_assert!(pending_opening[num]);
-				pending_opening[num] = false;
+		match self.protocols[protocol_index].state {
+			State::Closed { ref mut pending_opening } |
+			State::OpenDesiredByRemote { ref mut pending_opening, .. } => {
+				debug_assert!(*pending_opening);
+				*pending_opening = false;
 			}
 			State::Open { .. } => {
 				error!(target: "sub-libp2p", "☎️ State mismatch in notifications handler");
 				debug_assert!(false);
 			}
-			State::Opening { pending_handshake, in_substreams, out_substreams } => {
-				debug_assert!(out_substreams[num].is_none());
-				out_substreams[num] = Some(Some(substream));
-
-				if num == 0 {
-					debug_assert!(pending_handshake.is_none());
-					*pending_handshake = Some(handshake);
-				}
-
-				if !out_substreams.iter().any(|s| s.is_none()) {
-					let (async_tx, async_rx) = mpsc::channel(ASYNC_NOTIFICATIONS_BUFFER_SIZE);
-					let (sync_tx, sync_rx) = mpsc::channel(SYNC_NOTIFICATIONS_BUFFER_SIZE);
-					let notifications_sink = NotificationsSink {
-						inner: Arc::new(NotificationsSinkInner {
-							peer_id: self.peer_id.clone(),
-							async_channel: FuturesMutex::new(async_tx),
-							sync_channel: Mutex::new(sync_tx),
-						}),
-					};
-
-					debug_assert!(pending_handshake.is_some());
-					let pending_handshake = pending_handshake.take().unwrap_or_default();
-
-					let out_substreams = out_substreams
-						.drain(..)
-						.map(|s| s.expect("checked by the if above; qed"))
-						.collect();
+			State::Opening { ref mut in_substream } => {
+				let (async_tx, async_rx) = mpsc::channel(ASYNC_NOTIFICATIONS_BUFFER_SIZE);
+				let (sync_tx, sync_rx) = mpsc::channel(SYNC_NOTIFICATIONS_BUFFER_SIZE);
+				let notifications_sink = NotificationsSink {
+					inner: Arc::new(NotificationsSinkInner {
+						peer_id: self.peer_id.clone(),
+						async_channel: FuturesMutex::new(async_tx),
+						sync_channel: Mutex::new(sync_tx),
+					}),
+				};
 
-					self.state = State::Open {
-						notifications_sink_rx: stream::select(async_rx.fuse(), sync_rx.fuse()),
-						out_substreams,
-						in_substreams: mem::replace(in_substreams, Vec::new()),
-						want_closed: false,
-					};
+				self.protocols[protocol_index].state = State::Open {
+					notifications_sink_rx: stream::select(async_rx.fuse(), sync_rx.fuse()),
+					out_substream: Some(substream),
+					in_substream: in_substream.take(),
+				};
 
-					self.events_queue.push_back(ProtocolsHandlerEvent::Custom(
-						NotifsHandlerOut::OpenResultOk {
-							endpoint: self.endpoint.clone(),
-							received_handshake: pending_handshake,
-							notifications_sink
-						}
-					));
-				}
+				self.events_queue.push_back(ProtocolsHandlerEvent::Custom(
+					NotifsHandlerOut::OpenResultOk {
+						protocol_index,
+						endpoint: self.endpoint.clone(),
+						received_handshake: handshake,
+						notifications_sink
+					}
+				));
 			}
 		}
 	}
 
 	fn inject_event(&mut self, message: NotifsHandlerIn) {
 		match message {
-			NotifsHandlerIn::Open => {
-				match &mut self.state {
-					State::Closed { .. } | State::OpenDesiredByRemote { .. } => {
-						let (pending_opening, mut in_substreams) = match &mut self.state {
-							State::Closed { pending_opening } => (pending_opening, None),
-							State::OpenDesiredByRemote { pending_opening, in_substreams } =>
-								(pending_opening, Some(mem::replace(in_substreams, Vec::new()))),
-							_ => unreachable!()
-						};
-
-						debug_assert_eq!(pending_opening.len(), self.out_protocols.len());
-						for (n, is_pending) in pending_opening.iter().enumerate() {
-							if *is_pending {
-								continue;
-							}
-
+			NotifsHandlerIn::Open { protocol_index } => {
+				let protocol_info = &mut self.protocols[protocol_index];
+				match &mut protocol_info.state {
+					State::Closed { pending_opening } => {
+						if !*pending_opening {
 							let proto = NotificationsOut::new(
-								self.out_protocols[n].0.clone(),
-								self.out_protocols[n].1.read().clone()
+								protocol_info.name.clone(),
+								protocol_info.handshake.read().clone()
 							);
 
 							self.events_queue.push_back(ProtocolsHandlerEvent::OutboundSubstreamRequest {
-								protocol: SubstreamProtocol::new(proto, n)
+								protocol: SubstreamProtocol::new(proto, protocol_index)
 									.with_timeout(OPEN_TIMEOUT),
 							});
 						}
 
-						if let Some(in_substreams) = in_substreams.as_mut() {
-							for (num, substream) in in_substreams.iter_mut().enumerate() {
-								let substream = match substream.as_mut() {
-									Some(s) => s,
-									None => continue,
-								};
+						protocol_info.state = State::Opening {
+							in_substream: None,
+						};
+					},
+					State::OpenDesiredByRemote { pending_opening, in_substream } => {
+						let handshake_message = protocol_info.handshake.read().clone();
 
-								let handshake_message = self.in_protocols[num].1.read().clone();
-								substream.send_handshake(handshake_message);
-							}
+						if !*pending_opening {
+							let proto = NotificationsOut::new(
+								protocol_info.name.clone(),
+								handshake_message.clone()
+							);
+
+							self.events_queue.push_back(ProtocolsHandlerEvent::OutboundSubstreamRequest {
+								protocol: SubstreamProtocol::new(proto, protocol_index)
+									.with_timeout(OPEN_TIMEOUT),
+							});
 						}
 
-						self.state = State::Opening {
-							pending_handshake: None,
-							in_substreams: if let Some(in_substreams) = in_substreams {
-								in_substreams
-							} else {
-								(0..self.in_protocols.len()).map(|_| None).collect()
-							},
-							out_substreams: (0..self.out_protocols.len()).map(|_| None).collect(),
+						in_substream.send_handshake(handshake_message);
+
+						// The state change is done in two steps because of borrowing issues.
+						let in_substream = match
+							mem::replace(&mut protocol_info.state, State::Opening { in_substream: None })
+						{
+							State::OpenDesiredByRemote { in_substream, .. } => in_substream,
+							_ => unreachable!()
+						};
+						protocol_info.state = State::Opening {
+							in_substream: Some(in_substream),
 						};
 					},
 					State::Opening { .. } |
@@ -735,39 +675,41 @@ impl ProtocolsHandler for NotifsHandler {
 				}
 			},
 
-			NotifsHandlerIn::Close => {
+			NotifsHandlerIn::Close { protocol_index } => {
 				for mut substream in self.legacy_substreams.drain(..) {
 					substream.shutdown();
 					self.legacy_shutdown.push(substream);
 				}
 
-				match &mut self.state {
+				match self.protocols[protocol_index].state {
 					State::Open { .. } => {
-						let pending_opening = self.out_protocols.iter().map(|_| false).collect();
-						self.state = State::Closed {
-							pending_opening,
+						self.protocols[protocol_index].state = State::Closed {
+							pending_opening: false,
 						};
 					},
-					State::Opening { out_substreams, .. } => {
-						let pending_opening = out_substreams.iter().map(|s| s.is_none()).collect();
-						self.state = State::Closed {
-							pending_opening,
+					State::Opening { .. } => {
+						self.protocols[protocol_index].state = State::Closed {
+							pending_opening: true,
 						};
 
 						self.events_queue.push_back(ProtocolsHandlerEvent::Custom(
-							NotifsHandlerOut::OpenResultErr
+							NotifsHandlerOut::OpenResultErr {
+								protocol_index,
+							}
 						));
 					},
 					State::OpenDesiredByRemote { pending_opening, .. } => {
-						self.state = State::Closed {
-							pending_opening: mem::replace(pending_opening, Vec::new()),
+						self.protocols[protocol_index].state = State::Closed {
+							pending_opening,
 						};
 					}
 					State::Closed { .. } => {},
 				}
 
 				self.events_queue.push_back(
-					ProtocolsHandlerEvent::Custom(NotifsHandlerOut::CloseResult)
+					ProtocolsHandlerEvent::Custom(NotifsHandlerOut::CloseResult {
+						protocol_index,
+					})
 				);
 			},
 		}
@@ -778,68 +720,23 @@ impl ProtocolsHandler for NotifsHandler {
 		num: usize,
 		_: ProtocolsHandlerUpgrErr<NotificationsHandshakeError>
 	) {
-		match &mut self.state {
-			State::Closed { pending_opening } | State::OpenDesiredByRemote { pending_opening, .. } => {
-				debug_assert!(pending_opening[num]);
-				pending_opening[num] = false;
+		match self.protocols[num].state {
+			State::Closed { ref mut pending_opening } |
+			State::OpenDesiredByRemote { ref mut pending_opening, .. } => {
+				debug_assert!(*pending_opening);
+				*pending_opening = false;
 			}
 
-			State::Opening { in_substreams, pending_handshake, out_substreams } => {
-				// Failing to open a substream isn't considered a failure. Instead, it is marked
-				// as `Some(None)` and the opening continues.
-
-				out_substreams[num] = Some(None);
-
-				// Some substreams are still being opened. Nothing more to do.
-				if out_substreams.iter().any(|s| s.is_none()) {
-					return;
-				}
-
-				// All substreams have finished being open.
-				// If the handshake has been received, proceed and report the opening.
-
-				if let Some(pending_handshake) = pending_handshake.take() {
-					// Open!
-					let (async_tx, async_rx) = mpsc::channel(ASYNC_NOTIFICATIONS_BUFFER_SIZE);
-					let (sync_tx, sync_rx) = mpsc::channel(SYNC_NOTIFICATIONS_BUFFER_SIZE);
-					let notifications_sink = NotificationsSink {
-						inner: Arc::new(NotificationsSinkInner {
-							peer_id: self.peer_id.clone(),
-							async_channel: FuturesMutex::new(async_tx),
-							sync_channel: Mutex::new(sync_tx),
-						}),
-					};
-
-					let out_substreams = out_substreams
-						.drain(..)
-						.map(|s| s.expect("checked by the if above; qed"))
-						.collect();
-
-					self.state = State::Open {
-						notifications_sink_rx: stream::select(async_rx.fuse(), sync_rx.fuse()),
-						out_substreams,
-						in_substreams: mem::replace(in_substreams, Vec::new()),
-						want_closed: false,
-					};
-
-					self.events_queue.push_back(ProtocolsHandlerEvent::Custom(
-						NotifsHandlerOut::OpenResultOk {
-							endpoint: self.endpoint.clone(),
-							received_handshake: pending_handshake,
-							notifications_sink
-						}
-					));
-
-				} else {
-					// Open failure!
-					self.state = State::Closed {
-						pending_opening: (0..self.out_protocols.len()).map(|_| false).collect(),
-					};
+			State::Opening { .. } => {
+				self.protocols[num].state = State::Closed {
+					pending_opening: false,
+				};
 
-					self.events_queue.push_back(ProtocolsHandlerEvent::Custom(
-						NotifsHandlerOut::OpenResultErr
-					));
-				}
+				self.events_queue.push_back(ProtocolsHandlerEvent::Custom(
+					NotifsHandlerOut::OpenResultErr {
+						protocol_index: num,
+					}
+				));
 			}
 
 			// No substream is being open when already `Open`.
@@ -852,11 +749,14 @@ impl ProtocolsHandler for NotifsHandler {
 			return KeepAlive::Yes;
 		}
 
-		match self.state {
-			State::Closed { .. } => KeepAlive::Until(self.when_connection_open + INITIAL_KEEPALIVE_TIME),
-			State::OpenDesiredByRemote { .. } | State::Opening { .. } | State::Open { .. } =>
-				KeepAlive::Yes,
+		// `Yes` if any protocol has some activity.
+		if self.protocols.iter().any(|p| !matches!(p.state, State::Closed { .. })) {
+			return KeepAlive::Yes;
 		}
+
+		// A grace period of `INITIAL_KEEPALIVE_TIME` must be given to leave time for the remote
+		// to express desire to open substreams.
+		KeepAlive::Until(self.when_connection_open + INITIAL_KEEPALIVE_TIME)
 	}
 
 	fn poll(
@@ -869,191 +769,147 @@ impl ProtocolsHandler for NotifsHandler {
 			return Poll::Ready(ev);
 		}
 
-		// Poll inbound substreams.
-		// Inbound substreams being closed is always tolerated, except for the
-		// `OpenDesiredByRemote` state which might need to be switched back to `Closed`.
-		match &mut self.state {
-			State::Closed { .. } => {}
-			State::Open { in_substreams, .. } => {
-				for (num, substream) in in_substreams.iter_mut().enumerate() {
-					match substream.as_mut().map(|s| Stream::poll_next(Pin::new(s), cx)) {
-						None | Some(Poll::Pending) => continue,
-						Some(Poll::Ready(Some(Ok(message)))) => {
+		for protocol_index in 0..self.protocols.len() {
+			// Poll inbound substreams.
+			// Inbound substreams being closed is always tolerated, except for the
+			// `OpenDesiredByRemote` state which might need to be switched back to `Closed`.
+			match &mut self.protocols[protocol_index].state {
+				State::Closed { .. } |
+				State::Open { in_substream: None, .. } |
+				State::Opening { in_substream: None } => {}
+
+				State::Open { in_substream: in_substream @ Some(_), .. } => {
+					match Stream::poll_next(Pin::new(in_substream.as_mut().unwrap()), cx) {
+						Poll::Pending => {},
+						Poll::Ready(Some(Ok(message))) => {
 							let event = NotifsHandlerOut::Notification {
+								protocol_index,
 								message,
-								protocol_name: self.in_protocols[num].0.protocol_name().clone(),
 							};
 							return Poll::Ready(ProtocolsHandlerEvent::Custom(event))
 						},
-						Some(Poll::Ready(None)) | Some(Poll::Ready(Some(Err(_)))) =>
-							*substream = None,
+						Poll::Ready(None) | Poll::Ready(Some(Err(_))) =>
+							*in_substream = None,
 					}
 				}
-			}
 
-			State::OpenDesiredByRemote { in_substreams, .. } |
-			State::Opening { in_substreams, .. } => {
-				for substream in in_substreams {
-					match substream.as_mut().map(|s| NotificationsInSubstream::poll_process(Pin::new(s), cx)) {
-						None | Some(Poll::Pending) => continue,
-						Some(Poll::Ready(Ok(void))) => match void {},
-						Some(Poll::Ready(Err(_))) => *substream = None,
+				State::OpenDesiredByRemote { in_substream, pending_opening } => {
+					match NotificationsInSubstream::poll_process(Pin::new(in_substream), cx) {
+						Poll::Pending => {},
+						Poll::Ready(Ok(void)) => match void {},
+						Poll::Ready(Err(_)) => {
+							self.protocols[protocol_index].state = State::Closed {
+								pending_opening: *pending_opening,
+							};
+							return Poll::Ready(ProtocolsHandlerEvent::Custom(
+								NotifsHandlerOut::CloseDesired { protocol_index }
+							))
+						},
 					}
 				}
-			}
-		}
-
-		// Since the previous block might have closed inbound substreams, make sure that we can
-		// stay in `OpenDesiredByRemote` state.
-		if let State::OpenDesiredByRemote { in_substreams, pending_opening } = &mut self.state {
-			if !in_substreams.iter().any(|s| s.is_some()) {
-				self.state = State::Closed {
-					pending_opening: mem::replace(pending_opening, Vec::new()),
-				};
-				return Poll::Ready(ProtocolsHandlerEvent::Custom(
-					NotifsHandlerOut::CloseDesired
-				))
-			}
-		}
-
-		// Poll outbound substreams.
-		match &mut self.state {
-			State::Open { out_substreams, want_closed, .. } => {
-				let mut any_closed = false;
-
-				for substream in out_substreams.iter_mut() {
-					match substream.as_mut().map(|s| Sink::poll_flush(Pin::new(s), cx)) {
-						None | Some(Poll::Pending) | Some(Poll::Ready(Ok(()))) => continue,
-						Some(Poll::Ready(Err(_))) => {}
-					};
-
-					// Reached if the substream has been closed.
-					*substream = None;
-					any_closed = true;
-				}
 
-				if any_closed {
-					if !*want_closed {
-						*want_closed = true;
-						return Poll::Ready(ProtocolsHandlerEvent::Custom(NotifsHandlerOut::CloseDesired));
+				State::Opening { in_substream: in_substream @ Some(_), .. } => {
+					match NotificationsInSubstream::poll_process(Pin::new(in_substream.as_mut().unwrap()), cx) {
+						Poll::Pending => {},
+						Poll::Ready(Ok(void)) => match void {},
+						Poll::Ready(Err(_)) => *in_substream = None,
 					}
 				}
 			}
 
-			State::Opening { out_substreams, pending_handshake, .. } => {
-				debug_assert!(out_substreams.iter().any(|s| s.is_none()));
-
-				for (num, substream) in out_substreams.iter_mut().enumerate() {
-					match substream {
-						None | Some(None) => continue,
-						Some(Some(substream)) => match Sink::poll_flush(Pin::new(substream), cx) {
-							Poll::Pending | Poll::Ready(Ok(())) => continue,
-							Poll::Ready(Err(_)) => {}
+			// Poll outbound substream.
+			match &mut self.protocols[protocol_index].state {
+				State::Open { out_substream: out_substream @ Some(_), .. } => {
+					match Sink::poll_flush(Pin::new(out_substream.as_mut().unwrap()), cx) {
+						Poll::Pending | Poll::Ready(Ok(())) => {},
+						Poll::Ready(Err(_)) => {
+							*out_substream = None;
+							let event = NotifsHandlerOut::CloseDesired { protocol_index };
+							return Poll::Ready(ProtocolsHandlerEvent::Custom(event));
 						}
-					}
-
-					// Reached if the substream has been closed.
-					*substream = Some(None);
-					if num == 0 {
-						// Cancel the handshake.
-						*pending_handshake = None;
-					}
+					};
 				}
-			}
 
-			State::Closed { .. } |
-			State::OpenDesiredByRemote { .. } => {}
-		}
+				State::Closed { .. } |
+				State::Opening { .. } |
+				State::Open { out_substream: None, .. } |
+				State::OpenDesiredByRemote { .. } => {}
+			}
 
-		if let State::Open { notifications_sink_rx, out_substreams, .. } = &mut self.state {
-			'poll_notifs_sink: loop {
-				// Before we poll the notifications sink receiver, check that all the notification
-				// channels are ready to send a message.
-				// TODO: it is planned that in the future we switch to one `NotificationsSink` per
-				// protocol, in which case each sink should wait only for its corresponding handler
-				// to be ready, and not all handlers
-				// see https://github.com/paritytech/substrate/issues/5670
-				for substream in out_substreams.iter_mut() {
-					match substream.as_mut().map(|s| s.poll_ready_unpin(cx)) {
-						None | Some(Poll::Ready(_)) => {},
-						Some(Poll::Pending) => break 'poll_notifs_sink
+			if let State::Open { notifications_sink_rx, out_substream: Some(out_substream), .. }
+				= &mut self.protocols[protocol_index].state
+			{
+				loop {
+					// Before we poll the notifications sink receiver, check that the substream
+					// is ready to accept a message.
+					match out_substream.poll_ready_unpin(cx) {
+						Poll::Ready(_) => {},
+						Poll::Pending => break
 					}
-				}
 
-				// Now that all substreams are ready for a message, grab what to send.
-				let message = match notifications_sink_rx.poll_next_unpin(cx) {
-					Poll::Ready(Some(msg)) => msg,
-					Poll::Ready(None) | Poll::Pending => break,
-				};
-
-				match message {
-					NotificationsSinkMessage::Notification {
-						protocol_name,
-						message
-					} => {
-						if let Some(pos) = self.out_protocols.iter().position(|(n, _)| *n == protocol_name) {
-							if let Some(substream) = out_substreams[pos].as_mut() {
-								let _ = substream.start_send_unpin(message);
-								// Calling `start_send_unpin` only queues the message. Actually
-								// emitting the message is done with `poll_flush`. In order to
-								// not introduce too much complexity, this flushing is done earlier
-								// in the body of this `poll()` method. As such, we schedule a task
-								// wake-up now in order to guarantee that `poll()` will be called
-								// again and the flush happening.
-								// At the time of the writing of this comment, a rewrite of this
-								// code is being planned. If you find this comment in the wild and
-								// the rewrite didn't happen, please consider a refactor.
-								cx.waker().wake_by_ref();
-								continue 'poll_notifs_sink;
-							}
+					// Now that all substreams are ready for a message, grab what to send.
+					let message = match notifications_sink_rx.poll_next_unpin(cx) {
+						Poll::Ready(Some(msg)) => msg,
+						Poll::Ready(None) | Poll::Pending => break,
+					};
 
-						} else {
-							log::warn!(
-								target: "sub-libp2p",
-								"Tried to send a notification on non-registered protocol: {:?}",
-								protocol_name
+					match message {
+						NotificationsSinkMessage::Notification { message } => {
+							let _ = out_substream.start_send_unpin(message);
+
+							// Calling `start_send_unpin` only queues the message. Actually
+							// emitting the message is done with `poll_flush`. In order to
+							// not introduce too much complexity, this flushing is done earlier
+							// in the body of this `poll()` method. As such, we schedule a task
+							// wake-up now in order to guarantee that `poll()` will be called
+							// again and the flush happening.
+							// At the time of the writing of this comment, a rewrite of this
+							// code is being planned. If you find this comment in the wild and
+							// the rewrite didn't happen, please consider a refactor.
+							cx.waker().wake_by_ref();
+						}
+						NotificationsSinkMessage::ForceClose => {
+							return Poll::Ready(
+								ProtocolsHandlerEvent::Close(NotifsHandlerError::SyncNotificationsClogged)
 							);
 						}
 					}
-					NotificationsSinkMessage::ForceClose => {
-						return Poll::Ready(
-							ProtocolsHandlerEvent::Close(NotifsHandlerError::SyncNotificationsClogged)
-						);
-					}
 				}
 			}
-		}
 
-		// The legacy substreams are polled only if the state is `Open`. Otherwise, it would be
-		// possible to receive notifications that would need to get silently discarded.
-		if matches!(self.state, State::Open { .. }) {
-			for n in (0..self.legacy_substreams.len()).rev() {
-				let mut substream = self.legacy_substreams.swap_remove(n);
-				let poll_outcome = Pin::new(&mut substream).poll_next(cx);
-				match poll_outcome {
-					Poll::Pending => self.legacy_substreams.push(substream),
-					Poll::Ready(Some(Ok(RegisteredProtocolEvent::Message(message)))) => {
-						self.legacy_substreams.push(substream);
-						return Poll::Ready(ProtocolsHandlerEvent::Custom(
-							NotifsHandlerOut::CustomMessage { message }
-						))
-					},
-					Poll::Ready(Some(Ok(RegisteredProtocolEvent::Clogged))) => {
-						return Poll::Ready(ProtocolsHandlerEvent::Close(
-							NotifsHandlerError::SyncNotificationsClogged
-						))
-					}
-					Poll::Ready(None) | Poll::Ready(Some(Err(_))) => {
-						if matches!(poll_outcome, Poll::Ready(None)) {
-							self.legacy_shutdown.push(substream);
+			// The legacy substreams are polled only if the state is `Open`. Otherwise, it would be
+			// possible to receive notifications that would need to get silently discarded.
+			if matches!(self.protocols[0].state, State::Open { .. }) {
+				for n in (0..self.legacy_substreams.len()).rev() {
+					let mut substream = self.legacy_substreams.swap_remove(n);
+					let poll_outcome = Pin::new(&mut substream).poll_next(cx);
+					match poll_outcome {
+						Poll::Pending => self.legacy_substreams.push(substream),
+						Poll::Ready(Some(Ok(RegisteredProtocolEvent::Message(message)))) => {
+							self.legacy_substreams.push(substream);
+							return Poll::Ready(ProtocolsHandlerEvent::Custom(
+								NotifsHandlerOut::CustomMessage { message }
+							))
+						},
+						Poll::Ready(Some(Ok(RegisteredProtocolEvent::Clogged))) => {
+							return Poll::Ready(ProtocolsHandlerEvent::Close(
+								NotifsHandlerError::SyncNotificationsClogged
+							))
 						}
+						Poll::Ready(None) | Poll::Ready(Some(Err(_))) => {
+							if matches!(poll_outcome, Poll::Ready(None)) {
+								self.legacy_shutdown.push(substream);
+							}
 
-						if let State::Open { want_closed, .. } = &mut self.state {
-							if !*want_closed {
-								*want_closed = true;
-								return Poll::Ready(ProtocolsHandlerEvent::Custom(
-									NotifsHandlerOut::CloseDesired
-								))
+							if let State::Open { out_substream, .. } = &mut self.protocols[0].state {
+								if !out_substream.is_some() {
+									*out_substream = None;
+									return Poll::Ready(ProtocolsHandlerEvent::Custom(
+										NotifsHandlerOut::CloseDesired {
+											protocol_index: 0,
+										}
+									))
+								}
 							}
 						}
 					}
diff --git a/client/network/src/protocol/generic_proto/tests.rs b/client/network/src/protocol/generic_proto/tests.rs
index fb28bd40d3dd..7f8de599ed72 100644
--- a/client/network/src/protocol/generic_proto/tests.rs
+++ b/client/network/src/protocol/generic_proto/tests.rs
@@ -47,7 +47,6 @@ fn build_nodes() -> (Swarm<CustomProtoWithAddr>, Swarm<CustomProtoWithAddr>) {
 
 	for index in 0 .. 2 {
 		let keypair = keypairs[index].clone();
-		let local_peer_id = keypair.public().into_peer_id();
 
 		let noise_keys = noise::Keypair::<noise::X25519Spec>::new()
 			.into_authentic(&keypair)
@@ -61,24 +60,28 @@ fn build_nodes() -> (Swarm<CustomProtoWithAddr>, Swarm<CustomProtoWithAddr>) {
 			.boxed();
 
 		let (peerset, _) = sc_peerset::Peerset::from_config(sc_peerset::PeersetConfig {
-			in_peers: 25,
-			out_peers: 25,
-			bootnodes: if index == 0 {
-				keypairs
-					.iter()
-					.skip(1)
-					.map(|keypair| keypair.public().into_peer_id())
-					.collect()
-			} else {
-				vec![]
-			},
-			reserved_only: false,
-			priority_groups: Vec::new(),
+			sets: vec![
+				sc_peerset::SetConfig {
+					in_peers: 25,
+					out_peers: 25,
+					bootnodes: if index == 0 {
+						keypairs
+							.iter()
+							.skip(1)
+							.map(|keypair| keypair.public().into_peer_id())
+							.collect()
+					} else {
+						vec![]
+					},
+					reserved_nodes: Default::default(),
+					reserved_only: false,
+				}
+			],
 		});
 
 		let behaviour = CustomProtoWithAddr {
 			inner: GenericProto::new(
-				local_peer_id, "test", &[1], vec![], peerset,
+				"test", &[1], vec![], peerset,
 				iter::once(("/foo".into(), Vec::new()))
 			),
 			addrs: addrs
@@ -245,7 +248,10 @@ fn reconnect_after_disconnect() {
 						ServiceState::NotConnected => {
 							service1_state = ServiceState::FirstConnec;
 							if service2_state == ServiceState::FirstConnec {
-								service1.disconnect_peer(Swarm::local_peer_id(&service2));
+								service1.disconnect_peer(
+									Swarm::local_peer_id(&service2),
+									sc_peerset::SetId::from(0)
+								);
 							}
 						},
 						ServiceState::Disconnected => service1_state = ServiceState::ConnectedAgain,
@@ -264,7 +270,10 @@ fn reconnect_after_disconnect() {
 						ServiceState::NotConnected => {
 							service2_state = ServiceState::FirstConnec;
 							if service1_state == ServiceState::FirstConnec {
-								service1.disconnect_peer(Swarm::local_peer_id(&service2));
+								service1.disconnect_peer(
+									Swarm::local_peer_id(&service2),
+									sc_peerset::SetId::from(0)
+								);
 							}
 						},
 						ServiceState::Disconnected => service2_state = ServiceState::ConnectedAgain,
diff --git a/client/network/src/protocol/generic_proto/upgrade/notifications.rs b/client/network/src/protocol/generic_proto/upgrade/notifications.rs
index ae9839f4f046..13f2e26907c4 100644
--- a/client/network/src/protocol/generic_proto/upgrade/notifications.rs
+++ b/client/network/src/protocol/generic_proto/upgrade/notifications.rs
@@ -107,11 +107,6 @@ impl NotificationsIn {
 			protocol_name: protocol_name.into(),
 		}
 	}
-
-	/// Returns the name of the protocol that we accept.
-	pub fn protocol_name(&self) -> &Cow<'static, str> {
-		&self.protocol_name
-	}
 }
 
 impl UpgradeInfo for NotificationsIn {
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index d8f0146e2e33..00ca0fb0bbf0 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -30,7 +30,7 @@
 use crate::{
 	ExHashT, NetworkStateInfo, NetworkStatus,
 	behaviour::{self, Behaviour, BehaviourOut},
-	config::{parse_str_addr, NonReservedPeerMode, Params, Role, TransportConfig},
+	config::{parse_str_addr, Params, Role, TransportConfig},
 	DhtEvent,
 	discovery::DiscoveryConfig,
 	error::Error,
@@ -147,9 +147,15 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 			&params.network_config.transport,
 		)?;
 		ensure_addresses_consistent_with_transport(
-			params.network_config.reserved_nodes.iter().map(|x| &x.multiaddr),
+			params.network_config.default_peers_set.reserved_nodes.iter().map(|x| &x.multiaddr),
 			&params.network_config.transport,
 		)?;
+		for extra_set in &params.network_config.extra_sets {
+			ensure_addresses_consistent_with_transport(
+				extra_set.set_config.reserved_nodes.iter().map(|x| &x.multiaddr),
+				&params.network_config.transport,
+			)?;
+		}
 		ensure_addresses_consistent_with_transport(
 			params.network_config.public_addresses.iter(),
 			&params.network_config.transport,
@@ -157,12 +163,35 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 
 		let (to_worker, from_service) = tracing_unbounded("mpsc_network_worker");
 
-		if let Some(path) = params.network_config.net_config_path {
-			fs::create_dir_all(&path)?;
+		if let Some(path) = &params.network_config.net_config_path {
+			fs::create_dir_all(path)?;
 		}
 
+		// Private and public keys configuration.
+		let local_identity = params.network_config.node_key.clone().into_keypair()?;
+		let local_public = local_identity.public();
+		let local_peer_id = local_public.clone().into_peer_id();
+		info!(
+			target: "sub-libp2p",
+			"🏷 Local node identity is: {}",
+			local_peer_id.to_base58(),
+		);
+
+		let (protocol, peerset_handle, mut known_addresses) = Protocol::new(
+			protocol::ProtocolConfig {
+				roles: From::from(&params.role),
+				max_parallel_downloads: params.network_config.max_parallel_downloads,
+			},
+			params.chain.clone(),
+			params.transaction_pool,
+			params.protocol_id.clone(),
+			&params.role,
+			&params.network_config,
+			params.block_announce_validator,
+			params.metrics_registry.as_ref(),
+		)?;
+
 		// List of multiaddresses that we know in the network.
-		let mut known_addresses = Vec::new();
 		let mut bootnodes = Vec::new();
 		let mut boot_node_ids = HashSet::new();
 
@@ -192,71 +221,21 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 				}
 			)?;
 
-		// Initialize the peers we should always be connected to.
-		let priority_groups = {
-			let mut reserved_nodes = HashSet::new();
-			for reserved in params.network_config.reserved_nodes.iter() {
-				reserved_nodes.insert(reserved.peer_id.clone());
-				known_addresses.push((reserved.peer_id.clone(), reserved.multiaddr.clone()));
-			}
-
-			let print_deprecated_message = match &params.role {
-				Role::Sentry { .. } => true,
-				Role::Authority { sentry_nodes } if !sentry_nodes.is_empty() => true,
-				_ => false,
-			};
-			if print_deprecated_message {
-				log::warn!(
-					"🙇 Sentry nodes are deprecated, and the `--sentry` and  `--sentry-nodes` \
-					CLI options will eventually be removed in a future version. The Substrate \
-					and Polkadot networking protocol require validators to be \
-					publicly-accessible. Please do not block access to your validator nodes. \
-					For details, see https://github.com/paritytech/substrate/issues/6845."
-				);
-			}
-
-			let mut sentries_and_validators = HashSet::new();
-			match &params.role {
-				Role::Sentry { validators } => {
-					for validator in validators {
-						sentries_and_validators.insert(validator.peer_id.clone());
-						reserved_nodes.insert(validator.peer_id.clone());
-						known_addresses.push((validator.peer_id.clone(), validator.multiaddr.clone()));
-					}
-				}
-				Role::Authority { sentry_nodes } => {
-					for sentry_node in sentry_nodes {
-						sentries_and_validators.insert(sentry_node.peer_id.clone());
-						reserved_nodes.insert(sentry_node.peer_id.clone());
-						known_addresses.push((sentry_node.peer_id.clone(), sentry_node.multiaddr.clone()));
-					}
-				}
-				_ => {}
-			}
-
-			vec![
-				("reserved".to_owned(), reserved_nodes),
-				("sentries_and_validators".to_owned(), sentries_and_validators),
-			]
+		// Print a message about the deprecation of sentry nodes.
+		let print_deprecated_message = match &params.role {
+			Role::Sentry { .. } => true,
+			Role::Authority { sentry_nodes } if !sentry_nodes.is_empty() => true,
+			_ => false,
 		};
-
-		let peerset_config = sc_peerset::PeersetConfig {
-			in_peers: params.network_config.in_peers,
-			out_peers: params.network_config.out_peers,
-			bootnodes,
-			reserved_only: params.network_config.non_reserved_mode == NonReservedPeerMode::Deny,
-			priority_groups,
-		};
-
-		// Private and public keys configuration.
-		let local_identity = params.network_config.node_key.clone().into_keypair()?;
-		let local_public = local_identity.public();
-		let local_peer_id = local_public.clone().into_peer_id();
-		info!(
-			target: "sub-libp2p",
-			"🏷 Local node identity is: {}",
-			local_peer_id.to_base58(),
-		);
+		if print_deprecated_message {
+			log::warn!(
+				"🙇 Sentry nodes are deprecated, and the `--sentry` and  `--sentry-nodes` \
+				CLI options will eventually be removed in a future version. The Substrate \
+				and Polkadot networking protocol require validators to be \
+				publicly-accessible. Please do not block access to your validator nodes. \
+				For details, see https://github.com/paritytech/substrate/issues/6845."
+			);
+		}
 
 		let checker = params.on_demand.as_ref()
 			.map(|od| od.checker().clone())
@@ -264,20 +243,6 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 
 		let num_connected = Arc::new(AtomicUsize::new(0));
 		let is_major_syncing = Arc::new(AtomicBool::new(false));
-		let (protocol, peerset_handle) = Protocol::new(
-			protocol::ProtocolConfig {
-				roles: From::from(&params.role),
-				max_parallel_downloads: params.network_config.max_parallel_downloads,
-			},
-			local_peer_id.clone(),
-			params.chain.clone(),
-			params.transaction_pool,
-			params.protocol_id.clone(),
-			peerset_config,
-			params.block_announce_validator,
-			params.metrics_registry.as_ref(),
-			boot_node_ids.clone(),
-		)?;
 
 		// Build the swarm.
 		let (mut swarm, bandwidth): (Swarm<B, H>, _) = {
@@ -299,7 +264,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 			let discovery_config = {
 				let mut config = DiscoveryConfig::new(local_public.clone());
 				config.with_user_defined(known_addresses);
-				config.discovery_limit(u64::from(params.network_config.out_peers) + 15);
+				config.discovery_limit(u64::from(params.network_config.default_peers_set.out_peers) + 15);
 				config.add_protocol(params.protocol_id.clone());
 				config.allow_non_globals_in_dht(params.network_config.allow_non_globals_in_dht);
 				config.use_kademlia_disjoint_query_paths(params.network_config.kademlia_disjoint_query_paths);
@@ -318,7 +283,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 				config
 			};
 
-			let mut behaviour = {
+			let behaviour = {
 				let result = Behaviour::new(
 					protocol,
 					params.role,
@@ -340,9 +305,6 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 				}
 			};
 
-			for protocol in &params.network_config.notifications_protocols {
-				behaviour.register_notifications_protocol(protocol.clone());
-			}
 			let (transport, bandwidth) = {
 				let (config_mem, config_wasm) = match params.network_config.transport {
 					TransportConfig::MemoryOnly => (true, None),
@@ -551,8 +513,6 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 					version_string: swarm.node(peer_id)
 						.and_then(|i| i.client_version().map(|s| s.to_owned())),
 					latest_ping_time: swarm.node(peer_id).and_then(|i| i.latest_ping()),
-					enabled: swarm.user_protocol().is_enabled(&peer_id),
-					open: swarm.user_protocol().is_open(&peer_id),
 					known_addresses,
 				}))
 			}).collect()
@@ -622,7 +582,9 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	/// Need a better solution to manage authorized peers, but now just use reserved peers for
 	/// prototyping.
 	pub fn set_authorized_peers(&self, peers: HashSet<PeerId>) {
-		self.peerset.set_reserved_peers(peers)
+		let _ = self
+			.to_worker
+			.unbounded_send(ServiceToWorkerMsg::SetReserved(peers));
 	}
 
 	/// Set authorized_only flag.
@@ -630,7 +592,9 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	/// Need a better solution to decide authorized_only, but now just use reserved_only flag for
 	/// prototyping.
 	pub fn set_authorized_only(&self, reserved_only: bool) {
-		self.peerset.set_reserved_only(reserved_only)
+		let _ = self
+			.to_worker
+			.unbounded_send(ServiceToWorkerMsg::SetReservedOnly(reserved_only));
 	}
 
 	/// Appends a notification to the buffer of pending outgoing notifications with the given peer.
@@ -686,7 +650,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 			message.len()
 		);
 		trace!(target: "sub-libp2p", "Handler({:?}) <= Sync notification", target);
-		sink.send_sync_notification(protocol, message);
+		sink.send_sync_notification(message);
 	}
 
 	/// Obtains a [`NotificationSender`] for a connected peer, if it exists.
@@ -871,8 +835,12 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	/// Disconnect from a node as soon as possible.
 	///
 	/// This triggers the same effects as if the connection had closed itself spontaneously.
-	pub fn disconnect_peer(&self, who: PeerId) {
-		let _ = self.to_worker.unbounded_send(ServiceToWorkerMsg::DisconnectPeer(who));
+	///
+	/// See also [`NetworkService::remove_from_peers_set`], which has the same effect but also
+	/// prevents the local node from re-establishing an outgoing substream to this peer until it
+	/// is added again.
+	pub fn disconnect_peer(&self, who: PeerId, protocol: impl Into<Cow<'static, str>>) {
+		let _ = self.to_worker.unbounded_send(ServiceToWorkerMsg::DisconnectPeer(who, protocol.into()));
 	}
 
 	/// Request a justification for the given block from the network.
@@ -910,19 +878,19 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 			.unbounded_send(ServiceToWorkerMsg::PutValue(key, value));
 	}
 
-	/// Connect to unreserved peers and allow unreserved peers to connect.
+	/// Connect to unreserved peers and allow unreserved peers to connect for syncing purposes.
 	pub fn accept_unreserved_peers(&self) {
-		self.peerset.set_reserved_only(false);
+		let _ = self
+			.to_worker
+			.unbounded_send(ServiceToWorkerMsg::SetReservedOnly(false));
 	}
 
-	/// Disconnect from unreserved peers and deny new unreserved peers to connect.
+	/// Disconnect from unreserved peers and deny new unreserved peers to connect for syncing
+	/// purposes.
 	pub fn deny_unreserved_peers(&self) {
-		self.peerset.set_reserved_only(true);
-	}
-
-	/// Removes a `PeerId` from the list of reserved peers.
-	pub fn remove_reserved_peer(&self, peer: PeerId) {
-		self.peerset.remove_reserved_peer(peer);
+		let _ = self
+			.to_worker
+			.unbounded_send(ServiceToWorkerMsg::SetReservedOnly(true));
 	}
 
 	/// Adds a `PeerId` and its address as reserved. The string should encode the address
@@ -936,87 +904,133 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 		if peer_id == self.local_peer_id {
 			return Err("Local peer ID cannot be added as a reserved peer.".to_string())
 		}
-		self.peerset.add_reserved_peer(peer_id.clone());
+
 		let _ = self
 			.to_worker
-			.unbounded_send(ServiceToWorkerMsg::AddKnownAddress(peer_id, addr));
+			.unbounded_send(ServiceToWorkerMsg::AddKnownAddress(peer_id.clone(), addr));
+		let _ = self
+			.to_worker
+			.unbounded_send(ServiceToWorkerMsg::AddReserved(peer_id));
 		Ok(())
 	}
 
-	/// Configure an explicit fork sync request.
-	/// Note that this function should not be used for recent blocks.
-	/// Sync should be able to download all the recent forks normally.
-	/// `set_sync_fork_request` should only be used if external code detects that there's
-	/// a stale fork missing.
-	/// Passing empty `peers` set effectively removes the sync request.
-	pub fn set_sync_fork_request(&self, peers: Vec<PeerId>, hash: B::Hash, number: NumberFor<B>) {
+	/// Removes a `PeerId` from the list of reserved peers.
+	pub fn remove_reserved_peer(&self, peer_id: PeerId) {
 		let _ = self
 			.to_worker
-			.unbounded_send(ServiceToWorkerMsg::SyncFork(peers, hash, number));
+			.unbounded_send(ServiceToWorkerMsg::RemoveReserved(peer_id));
 	}
 
-	/// Modify a peerset priority group.
+	/// Add peers to a peer set.
 	///
-	/// Each `Multiaddr` must end with a `/p2p/` component containing the `PeerId`.
+	/// Each `Multiaddr` must end with a `/p2p/` component containing the `PeerId`. It can also
+	/// consist of only `/p2p/<peerid>`.
 	///
 	/// Returns an `Err` if one of the given addresses is invalid or contains an
 	/// invalid peer ID (which includes the local peer ID).
-	//
-	// NOTE: even though this function is currently sync, it's marked as async for
-	// future-proofing, see https://github.com/paritytech/substrate/pull/7247#discussion_r502263451.
-	pub async fn set_priority_group(&self, group_id: String, peers: HashSet<Multiaddr>) -> Result<(), String> {
+	pub fn add_peers_to_reserved_set(&self, protocol: Cow<'static, str>, peers: HashSet<Multiaddr>) -> Result<(), String> {
 		let peers = self.split_multiaddr_and_peer_id(peers)?;
 
-		let peer_ids = peers.iter().map(|(peer_id, _addr)| peer_id.clone()).collect();
-
-		self.peerset.set_priority_group(group_id, peer_ids);
-
 		for (peer_id, addr) in peers.into_iter() {
+			// Make sure the local peer ID is never added to the PSM.
+			if peer_id == self.local_peer_id {
+				return Err("Local peer ID cannot be added as a reserved peer.".to_string())
+			}
+
+			if !addr.is_empty() {
+				let _ = self
+					.to_worker
+					.unbounded_send(ServiceToWorkerMsg::AddKnownAddress(peer_id.clone(), addr));
+			}
 			let _ = self
 				.to_worker
-				.unbounded_send(ServiceToWorkerMsg::AddKnownAddress(peer_id, addr));
+				.unbounded_send(ServiceToWorkerMsg::AddSetReserved(protocol.clone(), peer_id));
 		}
 
 		Ok(())
 	}
 
-	/// Add peers to a peerset priority group.
+	/// Remove peers from a peer set.
 	///
 	/// Each `Multiaddr` must end with a `/p2p/` component containing the `PeerId`.
 	///
 	/// Returns an `Err` if one of the given addresses is invalid or contains an
 	/// invalid peer ID (which includes the local peer ID).
 	//
-	// NOTE: even though this function is currently sync, it's marked as async for
-	// future-proofing, see https://github.com/paritytech/substrate/pull/7247#discussion_r502263451.
-	pub async fn add_to_priority_group(&self, group_id: String, peers: HashSet<Multiaddr>) -> Result<(), String> {
+	// NOTE: technically, this function only needs `Vec<PeerId>`, but we use `Multiaddr` here for convenience.
+	pub fn remove_peers_from_reserved_set(
+		&self,
+		protocol: Cow<'static, str>,
+		peers: HashSet<Multiaddr>
+	) -> Result<(), String> {
+		let peers = self.split_multiaddr_and_peer_id(peers)?;
+		for (peer_id, _) in peers.into_iter() {
+			let _ = self
+				.to_worker
+				.unbounded_send(ServiceToWorkerMsg::RemoveSetReserved(protocol.clone(), peer_id));
+		}
+		Ok(())
+	}
+
+	/// Configure an explicit fork sync request.
+	/// Note that this function should not be used for recent blocks.
+	/// Sync should be able to download all the recent forks normally.
+	/// `set_sync_fork_request` should only be used if external code detects that there's
+	/// a stale fork missing.
+	/// Passing empty `peers` set effectively removes the sync request.
+	pub fn set_sync_fork_request(&self, peers: Vec<PeerId>, hash: B::Hash, number: NumberFor<B>) {
+		let _ = self
+			.to_worker
+			.unbounded_send(ServiceToWorkerMsg::SyncFork(peers, hash, number));
+	}
+
+	/// Add a peer to a set of peers.
+	///
+	/// If the set has slots available, it will try to open a substream with this peer.
+	///
+	/// Each `Multiaddr` must end with a `/p2p/` component containing the `PeerId`. It can also
+	/// consist of only `/p2p/<peerid>`.
+	///
+	/// Returns an `Err` if one of the given addresses is invalid or contains an
+	/// invalid peer ID (which includes the local peer ID).
+	pub fn add_to_peers_set(&self, protocol: Cow<'static, str>, peers: HashSet<Multiaddr>) -> Result<(), String> {
 		let peers = self.split_multiaddr_and_peer_id(peers)?;
 
 		for (peer_id, addr) in peers.into_iter() {
-			self.peerset.add_to_priority_group(group_id.clone(), peer_id.clone());
+			// Make sure the local peer ID is never added to the PSM.
+			if peer_id == self.local_peer_id {
+				return Err("Local peer ID cannot be added as a reserved peer.".to_string())
+			}
 
+			if !addr.is_empty() {
+				let _ = self
+					.to_worker
+					.unbounded_send(ServiceToWorkerMsg::AddKnownAddress(peer_id.clone(), addr));
+			}
 			let _ = self
 				.to_worker
-				.unbounded_send(ServiceToWorkerMsg::AddKnownAddress(peer_id, addr));
+				.unbounded_send(ServiceToWorkerMsg::AddToPeersSet(protocol.clone(), peer_id));
 		}
 
 		Ok(())
 	}
 
-	/// Remove peers from a peerset priority group.
+	/// Remove peers from a peer set.
+	///
+	/// If we currently have an open substream with this peer, it will soon be closed.
 	///
 	/// Each `Multiaddr` must end with a `/p2p/` component containing the `PeerId`.
 	///
 	/// Returns an `Err` if one of the given addresses is invalid or contains an
 	/// invalid peer ID (which includes the local peer ID).
 	//
-	// NOTE: even though this function is currently sync, it's marked as async for
-	// future-proofing, see https://github.com/paritytech/substrate/pull/7247#discussion_r502263451.
 	// NOTE: technically, this function only needs `Vec<PeerId>`, but we use `Multiaddr` here for convenience.
-	pub async fn remove_from_priority_group(&self, group_id: String, peers: HashSet<Multiaddr>) -> Result<(), String> {
+	pub fn remove_from_peers_set(&self, protocol: Cow<'static, str>, peers: HashSet<Multiaddr>) -> Result<(), String> {
 		let peers = self.split_multiaddr_and_peer_id(peers)?;
 		for (peer_id, _) in peers.into_iter() {
-			self.peerset.remove_from_priority_group(group_id.clone(), peer_id);
+			let _ = self
+				.to_worker
+				.unbounded_send(ServiceToWorkerMsg::RemoveFromPeersSet(protocol.clone(), peer_id));
 		}
 		Ok(())
 	}
@@ -1033,7 +1047,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 			.unbounded_send(ServiceToWorkerMsg::NewBestBlockImported(hash, number));
 	}
 
-	/// Utility function to extract `PeerId` from each `Multiaddr` for priority group updates.
+	/// Utility function to extract `PeerId` from each `Multiaddr` for peer set updates.
 	///
 	/// Returns an `Err` if one of the given addresses is invalid or contains an
 	/// invalid peer ID (which includes the local peer ID).
@@ -1049,7 +1063,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 				// Make sure the local peer ID is never added to the PSM
 				// or added as a "known address", even if given.
 				if peer == self.local_peer_id {
-					Err("Local peer ID in priority group.".to_string())
+					Err("Local peer ID in peer set.".to_string())
 				} else {
 					Ok((peer, addr))
 				}
@@ -1115,11 +1129,12 @@ impl NotificationSender {
 	/// Returns a future that resolves when the `NotificationSender` is ready to send a notification.
 	pub async fn ready<'a>(&'a self) -> Result<NotificationSenderReady<'a>, NotificationSenderError> {
 		Ok(NotificationSenderReady {
-			ready: match self.sink.reserve_notification(self.protocol_name.clone()).await {
+			ready: match self.sink.reserve_notification().await {
 				Ok(r) => r,
 				Err(()) => return Err(NotificationSenderError::Closed),
 			},
 			peer_id: self.sink.peer_id(),
+			protocol_name: &self.protocol_name,
 			notification_size_metric: self.notification_size_metric.clone(),
 		})
 	}
@@ -1133,6 +1148,9 @@ pub struct NotificationSenderReady<'a> {
 	/// Target of the notification.
 	peer_id: &'a PeerId,
 
+	/// Name of the protocol on the wire.
+	protocol_name: &'a Cow<'static, str>,
+
 	/// Field extracted from the [`Metrics`] struct and necessary to report the
 	/// notifications-related metrics.
 	notification_size_metric: Option<Histogram>,
@@ -1149,9 +1167,9 @@ impl<'a> NotificationSenderReady<'a> {
 
 		trace!(
 			target: "sub-libp2p",
-			"External API => Notification({:?}, {:?}, {} bytes)",
+			"External API => Notification({:?}, {}, {} bytes)",
 			self.peer_id,
-			self.ready.protocol_name(),
+			self.protocol_name,
 			notification.len()
 		);
 		trace!(target: "sub-libp2p", "Handler({:?}) <= Async notification", self.peer_id);
@@ -1186,6 +1204,14 @@ enum ServiceToWorkerMsg<B: BlockT, H: ExHashT> {
 	GetValue(record::Key),
 	PutValue(record::Key, Vec<u8>),
 	AddKnownAddress(PeerId, Multiaddr),
+	SetReservedOnly(bool),
+	AddReserved(PeerId),
+	RemoveReserved(PeerId),
+	SetReserved(HashSet<PeerId>),
+	AddSetReserved(Cow<'static, str>, PeerId),
+	RemoveSetReserved(Cow<'static, str>, PeerId),
+	AddToPeersSet(Cow<'static, str>, PeerId),
+	RemoveFromPeersSet(Cow<'static, str>, PeerId),
 	SyncFork(Vec<PeerId>, B::Hash, NumberFor<B>),
 	EventStream(out_events::Sender),
 	Request {
@@ -1194,7 +1220,7 @@ enum ServiceToWorkerMsg<B: BlockT, H: ExHashT> {
 		request: Vec<u8>,
 		pending_response: oneshot::Sender<Result<Vec<u8>, RequestFailure>>,
 	},
-	DisconnectPeer(PeerId),
+	DisconnectPeer(PeerId, Cow<'static, str>),
 	NewBestBlockImported(B::Hash, NumberFor<B>),
 }
 
@@ -1290,8 +1316,24 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 					this.network_service.get_value(&key),
 				ServiceToWorkerMsg::PutValue(key, value) =>
 					this.network_service.put_value(key, value),
+				ServiceToWorkerMsg::SetReservedOnly(reserved_only) =>
+					this.network_service.user_protocol_mut().set_reserved_only(reserved_only),
+				ServiceToWorkerMsg::SetReserved(peers) =>
+					this.network_service.user_protocol_mut().set_reserved_peers(peers),
+				ServiceToWorkerMsg::AddReserved(peer_id) =>
+					this.network_service.user_protocol_mut().add_reserved_peer(peer_id),
+				ServiceToWorkerMsg::RemoveReserved(peer_id) =>
+					this.network_service.user_protocol_mut().remove_reserved_peer(peer_id),
+				ServiceToWorkerMsg::AddSetReserved(protocol, peer_id) =>
+					this.network_service.user_protocol_mut().add_set_reserved_peer(protocol, peer_id),
+				ServiceToWorkerMsg::RemoveSetReserved(protocol, peer_id) =>
+					this.network_service.user_protocol_mut().remove_set_reserved_peer(protocol, peer_id),
 				ServiceToWorkerMsg::AddKnownAddress(peer_id, addr) =>
 					this.network_service.add_known_address(peer_id, addr),
+				ServiceToWorkerMsg::AddToPeersSet(protocol, peer_id) =>
+					this.network_service.user_protocol_mut().add_to_peers_set(protocol, peer_id),
+				ServiceToWorkerMsg::RemoveFromPeersSet(protocol, peer_id) =>
+					this.network_service.user_protocol_mut().remove_from_peers_set(protocol, peer_id),
 				ServiceToWorkerMsg::SyncFork(peer_ids, hash, number) =>
 					this.network_service.user_protocol_mut().set_sync_fork_request(peer_ids, &hash, number),
 				ServiceToWorkerMsg::EventStream(sender) =>
@@ -1299,8 +1341,8 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 				ServiceToWorkerMsg::Request { target, protocol, request, pending_response } => {
 					this.network_service.send_request(&target, &protocol, request, pending_response);
 				},
-				ServiceToWorkerMsg::DisconnectPeer(who) =>
-					this.network_service.user_protocol_mut().disconnect_peer(&who),
+				ServiceToWorkerMsg::DisconnectPeer(who, protocol_name) =>
+					this.network_service.user_protocol_mut().disconnect_peer(&who, &protocol_name),
 				ServiceToWorkerMsg::NewBestBlockImported(hash, number) =>
 					this.network_service.user_protocol_mut().new_best_block_imported(hash, number),
 			}
@@ -1479,6 +1521,12 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 						messages,
 					});
 				},
+				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::SyncConnected(remote))) => {
+					this.event_streams.send(Event::SyncConnected { remote });
+				},
+				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::SyncDisconnected(remote))) => {
+					this.event_streams.send(Event::SyncDisconnected { remote });
+				},
 				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::Dht(event, duration))) => {
 					if let Some(metrics) = this.metrics.as_ref() {
 						let query_type = match event {
@@ -1702,12 +1750,7 @@ impl<'a, B: BlockT, H: ExHashT> Link<B> for NetworkLink<'a, B, H> {
 		self.protocol.user_protocol_mut().on_blocks_processed(imported, count, results)
 	}
 	fn justification_imported(&mut self, who: PeerId, hash: &B::Hash, number: NumberFor<B>, success: bool) {
-		self.protocol.user_protocol_mut().justification_import_result(hash.clone(), number, success);
-		if !success {
-			info!("💔 Invalid justification provided by {} for #{}", who, hash);
-			self.protocol.user_protocol_mut().disconnect_peer(&who);
-			self.protocol.user_protocol_mut().report_peer(who, ReputationChange::new_fatal("Invalid justification"));
-		}
+		self.protocol.user_protocol_mut().justification_import_result(who, hash.clone(), number, success);
 	}
 	fn request_justification(&mut self, hash: &B::Hash, number: NumberFor<B>) {
 		self.protocol.user_protocol_mut().request_justification(hash, number)
diff --git a/client/network/src/service/out_events.rs b/client/network/src/service/out_events.rs
index eb811d56ab86..06c068e369da 100644
--- a/client/network/src/service/out_events.rs
+++ b/client/network/src/service/out_events.rs
@@ -227,6 +227,16 @@ impl Metrics {
 					.with_label_values(&["dht", "sent", name])
 					.inc_by(num);
 			}
+			Event::SyncConnected { .. } => {
+				self.events_total
+					.with_label_values(&["sync-connected", "sent", name])
+					.inc_by(num);
+			}
+			Event::SyncDisconnected { .. } => {
+				self.events_total
+					.with_label_values(&["sync-disconnected", "sent", name])
+					.inc_by(num);
+			}
 			Event::NotificationStreamOpened { protocol, .. } => {
 				self.events_total
 					.with_label_values(&[&format!("notif-open-{:?}", protocol), "sent", name])
@@ -257,6 +267,16 @@ impl Metrics {
 					.with_label_values(&["dht", "received", name])
 					.inc();
 			}
+			Event::SyncConnected { .. } => {
+				self.events_total
+					.with_label_values(&["sync-connected", "received", name])
+					.inc();
+			}
+			Event::SyncDisconnected { .. } => {
+				self.events_total
+					.with_label_values(&["sync-disconnected", "received", name])
+					.inc();
+			}
 			Event::NotificationStreamOpened { protocol, .. } => {
 				self.events_total
 					.with_label_values(&[&format!("notif-open-{:?}", protocol), "received", name])
diff --git a/client/network/src/service/tests.rs b/client/network/src/service/tests.rs
index 2b0405d88e58..e31158a99265 100644
--- a/client/network/src/service/tests.rs
+++ b/client/network/src/service/tests.rs
@@ -141,19 +141,31 @@ fn build_nodes_one_proto()
 	let listen_addr = config::build_multiaddr![Memory(rand::random::<u64>())];
 
 	let (node1, events_stream1) = build_test_full_node(config::NetworkConfiguration {
-		notifications_protocols: vec![PROTOCOL_NAME],
+		extra_sets: vec![
+			config::NonDefaultSetConfig {
+				notifications_protocol: PROTOCOL_NAME,
+				set_config: Default::default()
+			}
+		],
 		listen_addresses: vec![listen_addr.clone()],
 		transport: config::TransportConfig::MemoryOnly,
 		.. config::NetworkConfiguration::new_local()
 	});
 
 	let (node2, events_stream2) = build_test_full_node(config::NetworkConfiguration {
-		notifications_protocols: vec![PROTOCOL_NAME],
+		extra_sets: vec![
+			config::NonDefaultSetConfig {
+				notifications_protocol: PROTOCOL_NAME,
+				set_config: config::SetConfig {
+					reserved_nodes: vec![config::MultiaddrWithPeerId {
+						multiaddr: listen_addr,
+						peer_id: node1.local_peer_id().clone(),
+					}],
+					.. Default::default()
+				}
+			}
+		],
 		listen_addresses: vec![],
-		reserved_nodes: vec![config::MultiaddrWithPeerId {
-			multiaddr: listen_addr,
-			peer_id: node1.local_peer_id().clone(),
-		}],
 		transport: config::TransportConfig::MemoryOnly,
 		.. config::NetworkConfiguration::new_local()
 	});
@@ -205,10 +217,10 @@ fn notifications_state_consistent() {
 
 			// Also randomly disconnect the two nodes from time to time.
 			if rand::random::<u8>() % 20 == 0 {
-				node1.disconnect_peer(node2.local_peer_id().clone());
+				node1.disconnect_peer(node2.local_peer_id().clone(), PROTOCOL_NAME);
 			}
 			if rand::random::<u8>() % 20 == 0 {
-				node2.disconnect_peer(node1.local_peer_id().clone());
+				node2.disconnect_peer(node1.local_peer_id().clone(), PROTOCOL_NAME);
 			}
 
 			// Grab next event from either `events_stream1` or `events_stream2`.
@@ -279,6 +291,10 @@ fn notifications_state_consistent() {
 				}
 
 				// Add new events here.
+				future::Either::Left(Event::SyncConnected { .. }) => {}
+				future::Either::Right(Event::SyncConnected { .. }) => {}
+				future::Either::Left(Event::SyncDisconnected { .. }) => {}
+				future::Either::Right(Event::SyncDisconnected { .. }) => {}
 				future::Either::Left(Event::Dht(_)) => {}
 				future::Either::Right(Event::Dht(_)) => {}
 			};
@@ -291,9 +307,16 @@ fn lots_of_incoming_peers_works() {
 	let listen_addr = config::build_multiaddr![Memory(rand::random::<u64>())];
 
 	let (main_node, _) = build_test_full_node(config::NetworkConfiguration {
-		notifications_protocols: vec![PROTOCOL_NAME],
 		listen_addresses: vec![listen_addr.clone()],
-		in_peers: u32::max_value(),
+		extra_sets: vec![
+			config::NonDefaultSetConfig {
+				notifications_protocol: PROTOCOL_NAME,
+				set_config: config::SetConfig {
+					in_peers: u32::max_value(),
+					.. Default::default()
+				},
+			}
+		],
 		transport: config::TransportConfig::MemoryOnly,
 		.. config::NetworkConfiguration::new_local()
 	});
@@ -308,12 +331,19 @@ fn lots_of_incoming_peers_works() {
 		let main_node_peer_id = main_node_peer_id.clone();
 
 		let (_dialing_node, event_stream) = build_test_full_node(config::NetworkConfiguration {
-			notifications_protocols: vec![PROTOCOL_NAME],
 			listen_addresses: vec![],
-			reserved_nodes: vec![config::MultiaddrWithPeerId {
-				multiaddr: listen_addr.clone(),
-				peer_id: main_node_peer_id.clone(),
-			}],
+			extra_sets: vec![
+				config::NonDefaultSetConfig {
+					notifications_protocol: PROTOCOL_NAME,
+					set_config: config::SetConfig {
+						reserved_nodes: vec![config::MultiaddrWithPeerId {
+							multiaddr: listen_addr.clone(),
+							peer_id: main_node_peer_id.clone(),
+						}],
+						.. Default::default()
+					},
+				}
+			],
 			transport: config::TransportConfig::MemoryOnly,
 			.. config::NetworkConfiguration::new_local()
 		});
@@ -475,7 +505,10 @@ fn ensure_reserved_node_addresses_consistent_with_transport_memory() {
 	let _ = build_test_full_node(config::NetworkConfiguration {
 		listen_addresses: vec![listen_addr.clone()],
 		transport: config::TransportConfig::MemoryOnly,
-		reserved_nodes: vec![reserved_node],
+		default_peers_set: config::SetConfig {
+			reserved_nodes: vec![reserved_node],
+			.. Default::default()
+		},
 		.. config::NetworkConfiguration::new("test-node", "test-client", Default::default(), None)
 	});
 }
@@ -491,7 +524,10 @@ fn ensure_reserved_node_addresses_consistent_with_transport_not_memory() {
 
 	let _ = build_test_full_node(config::NetworkConfiguration {
 		listen_addresses: vec![listen_addr.clone()],
-		reserved_nodes: vec![reserved_node],
+		default_peers_set: config::SetConfig {
+			reserved_nodes: vec![reserved_node],
+			.. Default::default()
+		},
 		.. config::NetworkConfiguration::new("test-node", "test-client", Default::default(), None)
 	});
 }
diff --git a/client/network/test/src/lib.rs b/client/network/test/src/lib.rs
index b8b230f5d071..86cc7a547385 100644
--- a/client/network/test/src/lib.rs
+++ b/client/network/test/src/lib.rs
@@ -52,7 +52,7 @@ use sp_consensus::{BlockOrigin, ForkChoiceStrategy, BlockImportParams, BlockChec
 use futures::prelude::*;
 use futures::future::BoxFuture;
 use sc_network::{NetworkWorker, NetworkService, config::ProtocolId};
-use sc_network::config::{NetworkConfiguration, TransportConfig};
+use sc_network::config::{NetworkConfiguration, NonDefaultSetConfig, TransportConfig};
 use libp2p::PeerId;
 use parking_lot::Mutex;
 use sp_core::H256;
@@ -682,7 +682,12 @@ pub trait TestNetFactory: Sized {
 		network_config.transport = TransportConfig::MemoryOnly;
 		network_config.listen_addresses = vec![listen_addr.clone()];
 		network_config.allow_non_globals_in_dht = true;
-		network_config.notifications_protocols = config.notifications_protocols;
+		network_config.extra_sets = config.notifications_protocols.into_iter().map(|p| {
+			NonDefaultSetConfig {
+				notifications_protocol: p,
+				set_config: Default::default()
+			}
+		}).collect();
 
 		let protocol_id = ProtocolId::from("test-protocol-name");
 
diff --git a/client/peerset/src/lib.rs b/client/peerset/src/lib.rs
index 141cafc0d12b..564921b1e177 100644
--- a/client/peerset/src/lib.rs
+++ b/client/peerset/src/lib.rs
@@ -18,14 +18,27 @@
 
 //! Peer Set Manager (PSM). Contains the strategy for choosing which nodes the network should be
 //! connected to.
+//!
+//! The PSM handles *sets* of nodes. A set of nodes is defined as the nodes that are believed to
+//! support a certain capability, such as handling blocks and transactions of a specific chain,
+//! or collating a certain parachain.
+//!
+//! For each node in each set, the peerset holds a flag specifying whether the node is
+//! connected to us or not.
+//!
+//! This connected/disconnected status is specific to the node and set combination, and it is for
+//! example possible for a node to be connected through a specific set but not another.
+//!
+//! In addition, for each, set, the peerset also holds a list of reserved nodes towards which it
+//! will at all time try to maintain a connection with.
 
 mod peersstate;
 
-use std::{collections::{HashSet, HashMap}, collections::VecDeque};
+use std::{collections::HashSet, collections::VecDeque};
 use futures::prelude::*;
 use log::{debug, error, trace};
 use serde_json::json;
-use std::{pin::Pin, task::{Context, Poll}, time::Duration};
+use std::{collections::HashMap, pin::Pin, task::{Context, Poll}, time::Duration};
 use wasm_timer::Instant;
 use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedSender, TracingUnboundedReceiver};
 
@@ -35,22 +48,46 @@ pub use libp2p::PeerId;
 const BANNED_THRESHOLD: i32 = 82 * (i32::min_value() / 100);
 /// Reputation change for a node when we get disconnected from it.
 const DISCONNECT_REPUTATION_CHANGE: i32 = -256;
-/// Reserved peers group ID
-const RESERVED_NODES: &str = "reserved";
 /// Amount of time between the moment we disconnect from a node and the moment we remove it from
 /// the list.
 const FORGET_AFTER: Duration = Duration::from_secs(3600);
 
 #[derive(Debug)]
 enum Action {
-	AddReservedPeer(PeerId),
-	RemoveReservedPeer(PeerId),
-	SetReservedPeers(HashSet<PeerId>),
-	SetReservedOnly(bool),
+	AddReservedPeer(SetId, PeerId),
+	RemoveReservedPeer(SetId, PeerId),
+	SetReservedPeers(SetId, HashSet<PeerId>),
+	SetReservedOnly(SetId, bool),
 	ReportPeer(PeerId, ReputationChange),
-	SetPriorityGroup(String, HashSet<PeerId>),
-	AddToPriorityGroup(String, PeerId),
-	RemoveFromPriorityGroup(String, PeerId),
+	AddToPeersSet(SetId, PeerId),
+	RemoveFromPeersSet(SetId, PeerId),
+}
+
+/// Identifier of a set in the peerset.
+///
+/// Can be constructed using the `From<usize>` trait implementation based on the index of the set
+/// within [`PeersetConfig::sets`]. For example, the first element of [`PeersetConfig::sets`] is
+/// later referred to with `SetId::from(0)`. It is intended that the code responsible for building
+/// the [`PeersetConfig`] is also responsible for constructing the [`SetId`]s.
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct SetId(usize);
+
+impl SetId {
+	pub const fn from(id: usize) -> Self {
+		SetId(id)
+	}
+}
+
+impl From<usize> for SetId {
+	fn from(id: usize) -> Self {
+		SetId(id)
+	}
+}
+
+impl From<SetId> for usize {
+	fn from(id: SetId) -> Self {
+		id.0
+	}
 }
 
 /// Description of a reputation adjustment for a node.
@@ -88,25 +125,26 @@ impl PeersetHandle {
 	///
 	/// > **Note**: Keep in mind that the networking has to know an address for this node,
 	/// >           otherwise it will not be able to connect to it.
-	pub fn add_reserved_peer(&self, peer_id: PeerId) {
-		let _ = self.tx.unbounded_send(Action::AddReservedPeer(peer_id));
+	pub fn add_reserved_peer(&self, set_id: SetId, peer_id: PeerId) {
+		let _ = self.tx.unbounded_send(Action::AddReservedPeer(set_id, peer_id));
 	}
 
 	/// Remove a previously-added reserved peer.
 	///
 	/// Has no effect if the node was not a reserved peer.
-	pub fn remove_reserved_peer(&self, peer_id: PeerId) {
-		let _ = self.tx.unbounded_send(Action::RemoveReservedPeer(peer_id));
+	pub fn remove_reserved_peer(&self, set_id: SetId, peer_id: PeerId) {
+		let _ = self.tx.unbounded_send(Action::RemoveReservedPeer(set_id, peer_id));
 	}
 
-	/// Sets whether or not the peerset only has connections .
-	pub fn set_reserved_only(&self, reserved: bool) {
-		let _ = self.tx.unbounded_send(Action::SetReservedOnly(reserved));
+	/// Sets whether or not the peerset only has connections with nodes marked as reserved for
+	/// the given set.
+	pub fn set_reserved_only(&self, set_id: SetId, reserved: bool) {
+		let _ = self.tx.unbounded_send(Action::SetReservedOnly(set_id, reserved));
 	}
 
 	/// Set reserved peers to the new set.
-	pub fn set_reserved_peers(&self, peer_ids: HashSet<PeerId>) {
-		let _ = self.tx.unbounded_send(Action::SetReservedPeers(peer_ids));
+	pub fn set_reserved_peers(&self, set_id: SetId, peer_ids: HashSet<PeerId>) {
+		let _ = self.tx.unbounded_send(Action::SetReservedPeers(set_id, peer_ids));
 	}
 
 	/// Reports an adjustment to the reputation of the given peer.
@@ -114,19 +152,14 @@ impl PeersetHandle {
 		let _ = self.tx.unbounded_send(Action::ReportPeer(peer_id, score_diff));
 	}
 
-	/// Modify a priority group.
-	pub fn set_priority_group(&self, group_id: String, peers: HashSet<PeerId>) {
-		let _ = self.tx.unbounded_send(Action::SetPriorityGroup(group_id, peers));
-	}
-
-	/// Add a peer to a priority group.
-	pub fn add_to_priority_group(&self, group_id: String, peer_id: PeerId) {
-		let _ = self.tx.unbounded_send(Action::AddToPriorityGroup(group_id, peer_id));
+	/// Add a peer to a set.
+	pub fn add_to_peers_set(&self, set_id: SetId, peer_id: PeerId) {
+		let _ = self.tx.unbounded_send(Action::AddToPeersSet(set_id, peer_id));
 	}
 
-	/// Remove a peer from a priority group.
-	pub fn remove_from_priority_group(&self, group_id: String, peer_id: PeerId) {
-		let _ = self.tx.unbounded_send(Action::RemoveFromPriorityGroup(group_id, peer_id));
+	/// Remove a peer from a set.
+	pub fn remove_from_peers_set(&self, set_id: SetId, peer_id: PeerId) {
+		let _ = self.tx.unbounded_send(Action::RemoveFromPeersSet(set_id, peer_id));
 	}
 }
 
@@ -135,10 +168,18 @@ impl PeersetHandle {
 pub enum Message {
 	/// Request to open a connection to the given peer. From the point of view of the PSM, we are
 	/// immediately connected.
-	Connect(PeerId),
+	Connect {
+		set_id: SetId,
+		/// Peer to connect to.
+		peer_id: PeerId,
+	},
 
 	/// Drop the connection to the given peer, or cancel the connection attempt after a `Connect`.
-	Drop(PeerId),
+	Drop {
+		set_id: SetId,
+		/// Peer to disconnect from.
+		peer_id: PeerId,
+	},
 
 	/// Equivalent to `Connect` for the peer corresponding to this incoming index.
 	Accept(IncomingIndex),
@@ -160,26 +201,33 @@ impl From<u64> for IncomingIndex {
 /// Configuration to pass when creating the peer set manager.
 #[derive(Debug)]
 pub struct PeersetConfig {
+	/// List of sets of nodes the peerset manages.
+	pub sets: Vec<SetConfig>,
+}
+
+/// Configuration for a single set of nodes.
+#[derive(Debug)]
+pub struct SetConfig {
 	/// Maximum number of ingoing links to peers.
 	pub in_peers: u32,
 
 	/// Maximum number of outgoing links to peers.
 	pub out_peers: u32,
 
-	/// List of bootstrap nodes to initialize the peer with.
+	/// List of bootstrap nodes to initialize the set with.
 	///
 	/// > **Note**: Keep in mind that the networking has to know an address for these nodes,
 	/// >           otherwise it will not be able to connect to them.
 	pub bootnodes: Vec<PeerId>,
 
-	/// If true, we only accept nodes in [`PeersetConfig::priority_groups`].
-	pub reserved_only: bool,
-
 	/// Lists of nodes we should always be connected to.
 	///
 	/// > **Note**: Keep in mind that the networking has to know an address for these nodes,
-	/// >           otherwise it will not be able to connect to them.
-	pub priority_groups: Vec<(String, HashSet<PeerId>)>,
+	/// >			otherwise it will not be able to connect to them.
+	pub reserved_nodes: HashSet<PeerId>,
+
+	/// If true, we only accept nodes in [`SetConfig::reserved_nodes`].
+	pub reserved_only: bool,
 }
 
 /// Side of the peer set manager owned by the network. In other words, the "receiving" side.
@@ -190,11 +238,10 @@ pub struct PeersetConfig {
 pub struct Peerset {
 	/// Underlying data structure for the nodes's states.
 	data: peersstate::PeersState,
-	/// If true, we only accept reserved nodes.
-	reserved_only: bool,
-	/// Lists of nodes that don't occupy slots and that we should try to always be connected to.
-	/// Is kept in sync with the list of reserved nodes in [`Peerset::data`].
-	priority_groups: HashMap<String, HashSet<PeerId>>,
+	/// For each set, lists of nodes that don't occupy slots and that we should try to always be
+	/// connected to, and whether only reserved nodes are accepted. Is kept in sync with the list
+	/// of non-slot-occupying nodes in [`Peerset::data`].
+	reserved_nodes: Vec<(HashSet<PeerId>, bool)>,
 	/// Receiver for messages from the `PeersetHandle` and from `tx`.
 	rx: TracingUnboundedReceiver<Action>,
 	/// Sending side of `rx`.
@@ -216,28 +263,36 @@ impl Peerset {
 			tx: tx.clone(),
 		};
 
-		let now = Instant::now();
-
-		let mut peerset = Peerset {
-			data: peersstate::PeersState::new(config.in_peers, config.out_peers),
-			tx,
-			rx,
-			reserved_only: config.reserved_only,
-			priority_groups: config.priority_groups.clone().into_iter().collect(),
-			message_queue: VecDeque::new(),
-			created: now,
-			latest_time_update: now,
+		let mut peerset = {
+			let now = Instant::now();
+
+			Peerset {
+				data: peersstate::PeersState::new(config.sets.iter().map(|set| peersstate::SetConfig {
+					in_peers: set.in_peers,
+					out_peers: set.out_peers,
+				})),
+				tx,
+				rx,
+				reserved_nodes: config.sets.iter().map(|set| {
+					(set.reserved_nodes.clone(), set.reserved_only)
+				}).collect(),
+				message_queue: VecDeque::new(),
+				created: now,
+				latest_time_update: now,
+			}
 		};
 
-		for node in config.priority_groups.into_iter().flat_map(|(_, l)| l) {
-			peerset.data.add_no_slot_node(node);
-		}
+		for (set, set_config) in config.sets.into_iter().enumerate() {
+			for node in set_config.reserved_nodes {
+				peerset.data.add_no_slot_node(set, node);
+			}
 
-		for peer_id in config.bootnodes {
-			if let peersstate::Peer::Unknown(entry) = peerset.data.peer(&peer_id) {
-				entry.discover();
-			} else {
-				debug!(target: "peerset", "Duplicate bootnode in config: {:?}", peer_id);
+			for peer_id in set_config.bootnodes {
+				if let peersstate::Peer::Unknown(entry) = peerset.data.peer(set, &peer_id) {
+					entry.discover();
+				} else {
+					debug!(target: "peerset", "Duplicate bootnode in config: {:?}", peer_id);
+				}
 			}
 		}
 
@@ -245,96 +300,109 @@ impl Peerset {
 		(peerset, handle)
 	}
 
-	fn on_add_reserved_peer(&mut self, peer_id: PeerId) {
-		self.on_add_to_priority_group(RESERVED_NODES, peer_id);
-	}
-
-	fn on_remove_reserved_peer(&mut self, peer_id: PeerId) {
-		self.on_remove_from_priority_group(RESERVED_NODES, peer_id);
-	}
+	fn on_add_reserved_peer(&mut self, set_id: SetId, peer_id: PeerId) {
+		let newly_inserted = self.reserved_nodes[set_id.0].0.insert(peer_id.clone());
+		if !newly_inserted {
+			return;
+		}
 
-	fn on_set_reserved_peers(&mut self, peer_ids: HashSet<PeerId>) {
-		self.on_set_priority_group(RESERVED_NODES, peer_ids);
+		self.data.add_no_slot_node(set_id.0, peer_id);
+		self.alloc_slots();
 	}
 
-	fn on_set_reserved_only(&mut self, reserved_only: bool) {
-		self.reserved_only = reserved_only;
+	fn on_remove_reserved_peer(&mut self, set_id: SetId, peer_id: PeerId) {
+		if !self.reserved_nodes[set_id.0].0.remove(&peer_id) {
+			return;
+		}
 
-		if self.reserved_only {
-			// Disconnect all the nodes that aren't reserved.
-			for peer_id in self.data.connected_peers().cloned().collect::<Vec<_>>().into_iter() {
-				if self.priority_groups.get(RESERVED_NODES).map_or(false, |g| g.contains(&peer_id)) {
-					continue;
-				}
+		self.data.remove_no_slot_node(set_id.0, &peer_id);
 
-				let peer = self.data.peer(&peer_id).into_connected()
-					.expect("We are enumerating connected peers, therefore the peer is connected; qed");
-				peer.disconnect();
-				self.message_queue.push_back(Message::Drop(peer_id));
-			}
+		// Nothing more to do if not in reserved-only mode.
+		if !self.reserved_nodes[set_id.0].1 {
+			return;
+		}
 
-		} else {
-			self.alloc_slots();
+		// If, however, the peerset is in reserved-only mode, then the removed node needs to be
+		// disconnected.
+		if let peersstate::Peer::Connected(peer) = self.data.peer(set_id.0, &peer_id) {
+			peer.disconnect();
+			self.message_queue.push_back(Message::Drop {
+				set_id,
+				peer_id,
+			});
 		}
 	}
 
-	fn on_set_priority_group(&mut self, group_id: &str, peers: HashSet<PeerId>) {
+	fn on_set_reserved_peers(&mut self, set_id: SetId, peer_ids: HashSet<PeerId>) {
 		// Determine the difference between the current group and the new list.
 		let (to_insert, to_remove) = {
-			let current_group = self.priority_groups.entry(group_id.to_owned()).or_default();
-			let to_insert = peers.difference(current_group)
+			let to_insert = peer_ids.difference(&self.reserved_nodes[set_id.0].0)
 				.cloned().collect::<Vec<_>>();
-			let to_remove = current_group.difference(&peers)
+			let to_remove = self.reserved_nodes[set_id.0].0.difference(&peer_ids)
 				.cloned().collect::<Vec<_>>();
 			(to_insert, to_remove)
 		};
 
-		// Enumerate elements in `peers` not in `current_group`.
-		for peer_id in &to_insert {
-			// We don't call `on_add_to_priority_group` here in order to avoid calling
-			// `alloc_slots` all the time.
-			self.priority_groups.entry(group_id.to_owned()).or_default().insert(peer_id.clone());
-			self.data.add_no_slot_node(peer_id.clone());
+		for node in to_insert {
+			self.on_add_reserved_peer(set_id, node);
 		}
 
-		// Enumerate elements in `current_group` not in `peers`.
-		for peer in to_remove {
-			self.on_remove_from_priority_group(group_id, peer);
+		for node in to_remove {
+			self.on_remove_reserved_peer(set_id, node);
 		}
+	}
+
+	fn on_set_reserved_only(&mut self, set_id: SetId, reserved_only: bool) {
+		self.reserved_nodes[set_id.0].1 = reserved_only;
 
-		if !to_insert.is_empty() {
+		if reserved_only {
+			// Disconnect all the nodes that aren't reserved.
+			for peer_id in self.data.connected_peers(set_id.0).cloned().collect::<Vec<_>>().into_iter() {
+				if self.reserved_nodes[set_id.0].0.contains(&peer_id) {
+					continue;
+				}
+
+				let peer = self.data.peer(set_id.0, &peer_id).into_connected()
+					.expect("We are enumerating connected peers, therefore the peer is connected; qed");
+				peer.disconnect();
+				self.message_queue.push_back(Message::Drop {
+					set_id,
+					peer_id
+				});
+			}
+
+		} else {
 			self.alloc_slots();
 		}
 	}
 
-	fn on_add_to_priority_group(&mut self, group_id: &str, peer_id: PeerId) {
-		self.priority_groups.entry(group_id.to_owned()).or_default().insert(peer_id.clone());
-		self.data.add_no_slot_node(peer_id);
-		self.alloc_slots();
+	/// Adds a node to the given set. The peerset will, if possible and not already the case,
+	/// try to connect to it.
+	///
+	/// > **Note**: This has the same effect as [`PeersetHandle::add_to_peers_set`].
+	pub fn add_to_peers_set(&mut self, set_id: SetId, peer_id: PeerId) {
+		if let peersstate::Peer::Unknown(entry) = self.data.peer(set_id.0, &peer_id) {
+			entry.discover();
+			self.alloc_slots();
+		}
 	}
 
-	fn on_remove_from_priority_group(&mut self, group_id: &str, peer_id: PeerId) {
-		if let Some(priority_group) = self.priority_groups.get_mut(group_id) {
-			if !priority_group.remove(&peer_id) {
-				// `PeerId` wasn't in the group in the first place.
-				return;
-			}
-		} else {
-			// Group doesn't exist, so the `PeerId` can't be in it.
+	fn on_remove_from_peers_set(&mut self, set_id: SetId, peer_id: PeerId) {
+		// Don't do anything if node is reserved.
+		if self.reserved_nodes[set_id.0].0.contains(&peer_id) {
 			return;
 		}
 
-		// If that `PeerId` isn't in any other group, then it is no longer no-slot-occupying.
-		if !self.priority_groups.values().any(|l| l.contains(&peer_id)) {
-			self.data.remove_no_slot_node(&peer_id);
-		}
-
-		// Disconnect the peer if necessary.
-		if group_id != RESERVED_NODES && self.reserved_only {
-			if let peersstate::Peer::Connected(peer) = self.data.peer(&peer_id) {
-				peer.disconnect();
-				self.message_queue.push_back(Message::Drop(peer_id));
+		match self.data.peer(set_id.0, &peer_id) {
+			peersstate::Peer::Connected(peer) => {
+				self.message_queue.push_back(Message::Drop {
+					set_id,
+					peer_id: peer.peer_id().clone(),
+				});
+				peer.disconnect().forget_peer();
 			}
+			peersstate::Peer::NotConnected(peer) => { peer.forget_peer(); }
+			peersstate::Peer::Unknown(_) => {}
 		}
 	}
 
@@ -342,33 +410,29 @@ impl Peerset {
 		// We want reputations to be up-to-date before adjusting them.
 		self.update_time();
 
-		match self.data.peer(&peer_id) {
-			peersstate::Peer::Connected(mut peer) => {
-				peer.add_reputation(change.value);
-				if peer.reputation() < BANNED_THRESHOLD {
-					debug!(target: "peerset", "Report {}: {:+} to {}. Reason: {}, Disconnecting",
-						peer_id, change.value, peer.reputation(), change.reason
-					);
-					peer.disconnect();
-					self.message_queue.push_back(Message::Drop(peer_id));
-				} else {
-					trace!(target: "peerset", "Report {}: {:+} to {}. Reason: {}",
-						peer_id, change.value, peer.reputation(), change.reason
-					);
-				}
-			},
-			peersstate::Peer::NotConnected(mut peer) => {
-				trace!(target: "peerset", "Report {}: {:+} to {}. Reason: {}",
-					peer_id, change.value, peer.reputation(), change.reason
-				);
-				peer.add_reputation(change.value)
-			},
-			peersstate::Peer::Unknown(peer) => {
-				trace!(target: "peerset", "Discover {}: {:+}. Reason: {}",
-					peer_id, change.value, change.reason
-				);
-				peer.discover().add_reputation(change.value)
-			},
+		let mut reputation = self.data.peer_reputation(peer_id.clone());
+		reputation.add_reputation(change.value);
+		if reputation.reputation() >= BANNED_THRESHOLD {
+			trace!(target: "peerset", "Report {}: {:+} to {}. Reason: {}",
+				peer_id, change.value, reputation.reputation(), change.reason
+			);
+			return;
+		}
+
+		debug!(target: "peerset", "Report {}: {:+} to {}. Reason: {}, Disconnecting",
+			peer_id, change.value, reputation.reputation(), change.reason
+		);
+
+		drop(reputation);
+
+		for set_index in 0..self.data.num_sets() {
+			if let peersstate::Peer::Connected(peer) = self.data.peer(set_index, &peer_id) {
+				let peer = peer.disconnect();
+				self.message_queue.push_back(Message::Drop {
+					set_id: SetId(set_index),
+					peer_id: peer.into_peer_id(),
+				});
+			}
 		}
 	}
 
@@ -403,27 +467,35 @@ impl Peerset {
 					}
 					reput.saturating_sub(diff)
 				}
-				match self.data.peer(&peer_id) {
-					peersstate::Peer::Connected(mut peer) => {
-						let before = peer.reputation();
-						let after = reput_tick(before);
-						trace!(target: "peerset", "Fleeting {}: {} -> {}", peer_id, before, after);
-						peer.set_reputation(after)
-					}
-					peersstate::Peer::NotConnected(mut peer) => {
-						if peer.reputation() == 0 &&
-							peer.last_connected_or_discovered() + FORGET_AFTER < now
-						{
-							peer.forget_peer();
-						} else {
-							let before = peer.reputation();
-							let after = reput_tick(before);
-							trace!(target: "peerset", "Fleeting {}: {} -> {}", peer_id, before, after);
-							peer.set_reputation(after)
+
+				let mut peer_reputation = self.data.peer_reputation(peer_id.clone());
+
+				let before = peer_reputation.reputation();
+				let after = reput_tick(before);
+				trace!(target: "peerset", "Fleeting {}: {} -> {}", peer_id, before, after);
+				peer_reputation.set_reputation(after);
+
+				if after != 0 {
+					continue;
+				}
+
+				drop(peer_reputation);
+
+				// If the peer reaches a reputation of 0, and there is no connection to it,
+				// forget it.
+				for set_index in 0..self.data.num_sets() {
+					match self.data.peer(set_index, &peer_id) {
+						peersstate::Peer::Connected(_) => {}
+						peersstate::Peer::NotConnected(peer) => {
+							if peer.last_connected_or_discovered() + FORGET_AFTER < now {
+								peer.forget_peer();
+							}
+						}
+						peersstate::Peer::Unknown(_) => {
+							// Happens if this peer does not belong to this set.
 						}
 					}
-					peersstate::Peer::Unknown(_) => unreachable!("We iterate over known peers; qed")
-				};
+				}
 			}
 		}
 	}
@@ -433,89 +505,54 @@ impl Peerset {
 		self.update_time();
 
 		// Try to connect to all the reserved nodes that we are not connected to.
-		loop {
-			let next = {
-				let data = &mut self.data;
-				self.priority_groups
-					.get(RESERVED_NODES)
-					.into_iter()
-					.flatten()
-					.find(move |n| {
-						data.peer(n).into_connected().is_none()
-					})
-					.cloned()
-			};
-
-			let next = match next {
-				Some(n) => n,
-				None => break,
-			};
+		for set_index in 0..self.data.num_sets() {
+			for reserved_node in &self.reserved_nodes[set_index].0 {
+				let entry = match self.data.peer(set_index, reserved_node) {
+					peersstate::Peer::Unknown(n) => n.discover(),
+					peersstate::Peer::NotConnected(n) => n,
+					peersstate::Peer::Connected(_) => continue,
+				};
 
-			let next = match self.data.peer(&next) {
-				peersstate::Peer::Unknown(n) => n.discover(),
-				peersstate::Peer::NotConnected(n) => n,
-				peersstate::Peer::Connected(_) => {
-					debug_assert!(false, "State inconsistency: not connected state");
-					break;
+				match entry.try_outgoing() {
+					Ok(conn) => self.message_queue.push_back(Message::Connect {
+						set_id: SetId(set_index),
+						peer_id: conn.into_peer_id()
+					}),
+					Err(_) => {
+						// An error is returned only if no slot is available. Reserved nodes are
+						// marked in the state machine with a flag saying "doesn't occupy a slot",
+						// and as such this should never happen.
+						debug_assert!(false);
+						log::error!(
+							target: "peerset",
+							"Not enough slots to connect to reserved node"
+						);
+					}
 				}
-			};
-
-			match next.try_outgoing() {
-				Ok(conn) => self.message_queue.push_back(Message::Connect(conn.into_peer_id())),
-				Err(_) => break,	// No more slots available.
 			}
 		}
 
-		// Nothing more to do if we're in reserved mode.
-		if self.reserved_only {
-			return;
-		}
-
-		// Try to connect to all the nodes in priority groups and that we are not connected to.
-		loop {
-			let next = {
-				let data = &mut self.data;
-				self.priority_groups
-					.values()
-					.flatten()
-					.find(move |n| {
-						data.peer(n).into_connected().is_none()
-					})
-					.cloned()
-			};
-
-			let next = match next {
-				Some(n) => n,
-				None => break,
-			};
+		// Now, we try to connect to other nodes.
+		for set_index in 0..self.data.num_sets() {
+			// Nothing more to do if we're in reserved mode.
+			if self.reserved_nodes[set_index].1 {
+				continue;
+			}
 
-			let next = match self.data.peer(&next) {
-				peersstate::Peer::Unknown(n) => n.discover(),
-				peersstate::Peer::NotConnected(n) => n,
-				peersstate::Peer::Connected(_) => {
-					debug_assert!(false, "State inconsistency: not connected state");
+			// Try to grab the next node to attempt to connect to.
+			while let Some(next) = self.data.highest_not_connected_peer(set_index) {
+				// Don't connect to nodes with an abysmal reputation.
+				if next.reputation() < BANNED_THRESHOLD {
 					break;
 				}
-			};
 
-			match next.try_outgoing() {
-				Ok(conn) => self.message_queue.push_back(Message::Connect(conn.into_peer_id())),
-				Err(_) => break,	// No more slots available.
-			}
-		}
-
-		// Now, we try to connect to non-priority nodes.
-		while let Some(next) = self.data.highest_not_connected_peer() {
-			// Don't connect to nodes with an abysmal reputation.
-			if next.reputation() < BANNED_THRESHOLD {
-				break;
-			}
-
-			match next.try_outgoing() {
-				Ok(conn) => self
-					.message_queue
-					.push_back(Message::Connect(conn.into_peer_id())),
-				Err(_) => break, // No more slots available.
+				match next.try_outgoing() {
+					Ok(conn) => self.message_queue.push_back(Message::Connect {
+						set_id: SetId(set_index),
+						peer_id: conn.into_peer_id()
+					}),
+					Err(_) => break,	// No more slots available.
+				}
 			}
 		}
 	}
@@ -530,16 +567,19 @@ impl Peerset {
 	// Implementation note: because of concurrency issues, it is possible that we push a `Connect`
 	// message to the output channel with a `PeerId`, and that `incoming` gets called with the same
 	// `PeerId` before that message has been read by the user. In this situation we must not answer.
-	pub fn incoming(&mut self, peer_id: PeerId, index: IncomingIndex) {
+	pub fn incoming(&mut self, set_id: SetId, peer_id: PeerId, index: IncomingIndex) {
 		trace!(target: "peerset", "Incoming {:?}", peer_id);
+
 		self.update_time();
 
-		if self.reserved_only && !self.priority_groups.get(RESERVED_NODES).map_or(false, |n| n.contains(&peer_id)) {
-			self.message_queue.push_back(Message::Reject(index));
-			return;
+		if self.reserved_nodes[set_id.0].1 {
+			if !self.reserved_nodes[set_id.0].0.contains(&peer_id) {
+				self.message_queue.push_back(Message::Reject(index));
+				return;
+			}
 		}
 
-		let not_connected = match self.data.peer(&peer_id) {
+		let not_connected = match self.data.peer(set_id.0, &peer_id) {
 			// If we're already connected, don't answer, as the docs mention.
 			peersstate::Peer::Connected(_) => return,
 			peersstate::Peer::NotConnected(mut entry) => {
@@ -564,11 +604,11 @@ impl Peerset {
 	///
 	/// Must only be called after the PSM has either generated a `Connect` message with this
 	/// `PeerId`, or accepted an incoming connection with this `PeerId`.
-	pub fn dropped(&mut self, peer_id: PeerId) {
+	pub fn dropped(&mut self, set_id: SetId, peer_id: PeerId) {
 		// We want reputations to be up-to-date before adjusting them.
 		self.update_time();
 
-		match self.data.peer(&peer_id) {
+		match self.data.peer(set_id.0, &peer_id) {
 			peersstate::Peer::Connected(mut entry) => {
 				// Decrease the node's reputation so that we don't try it again and again and again.
 				entry.add_reputation(DISCONNECT_REPUTATION_CHANGE);
@@ -583,25 +623,6 @@ impl Peerset {
 		self.alloc_slots();
 	}
 
-	/// Adds discovered peer ids to the PSM.
-	///
-	/// > **Note**: There is no equivalent "expired" message, meaning that it is the responsibility
-	/// >           of the PSM to remove `PeerId`s that fail to dial too often.
-	pub fn discovered<I: IntoIterator<Item = PeerId>>(&mut self, peer_ids: I) {
-		let mut discovered_any = false;
-
-		for peer_id in peer_ids {
-			if let peersstate::Peer::Unknown(entry) = self.data.peer(&peer_id) {
-				entry.discover();
-				discovered_any = true;
-			}
-		}
-
-		if discovered_any {
-			self.alloc_slots();
-		}
-	}
-
 	/// Reports an adjustment to the reputation of the given peer.
 	pub fn report_peer(&mut self, peer_id: PeerId, score_diff: ReputationChange) {
 		// We don't immediately perform the adjustments in order to have state consistency. We
@@ -615,23 +636,29 @@ impl Peerset {
 		self.update_time();
 
 		json!({
-			"nodes": self.data.peers().cloned().collect::<Vec<_>>().into_iter().map(|peer_id| {
-				let state = match self.data.peer(&peer_id) {
-					peersstate::Peer::Connected(entry) => json!({
-						"connected": true,
-						"reputation": entry.reputation()
-					}),
-					peersstate::Peer::NotConnected(entry) => json!({
-						"connected": false,
-						"reputation": entry.reputation()
-					}),
-					peersstate::Peer::Unknown(_) =>
-						unreachable!("We iterate over the known peers; QED")
-				};
-
-				(peer_id.to_base58(), state)
-			}).collect::<HashMap<_, _>>(),
-			"reserved_only": self.reserved_only,
+			"sets": (0..self.data.num_sets()).map(|set_index| {
+				json!({
+					"nodes": self.data.peers().cloned().collect::<Vec<_>>().into_iter().filter_map(|peer_id| {
+						let state = match self.data.peer(set_index, &peer_id) {
+							peersstate::Peer::Connected(entry) => json!({
+								"connected": true,
+								"reputation": entry.reputation()
+							}),
+							peersstate::Peer::NotConnected(entry) => json!({
+								"connected": false,
+								"reputation": entry.reputation()
+							}),
+							peersstate::Peer::Unknown(_) => return None,
+						};
+
+						Some((peer_id.to_base58(), state))
+					}).collect::<HashMap<_, _>>(),
+					"reserved_nodes": self.reserved_nodes[set_index].0.iter().map(|peer_id| {
+						peer_id.to_base58()
+					}).collect::<HashSet<_>>(),
+					"reserved_only": self.reserved_nodes[set_index].1,
+				})
+			}).collect::<Vec<_>>(),
 			"message_queue": self.message_queue.len(),
 		})
 	}
@@ -640,11 +667,6 @@ impl Peerset {
 	pub fn num_discovered_peers(&self) -> usize {
 		self.data.peers().len()
 	}
-
-	/// Returns the content of a priority group.
-	pub fn priority_group(&self, group_id: &str) -> Option<impl ExactSizeIterator<Item = &PeerId>> {
-		self.priority_groups.get(group_id).map(|l| l.iter())
-	}
 }
 
 impl Stream for Peerset {
@@ -663,22 +685,20 @@ impl Stream for Peerset {
 			};
 
 			match action {
-				Action::AddReservedPeer(peer_id) =>
-					self.on_add_reserved_peer(peer_id),
-				Action::RemoveReservedPeer(peer_id) =>
-					self.on_remove_reserved_peer(peer_id),
-				Action::SetReservedPeers(peer_ids) =>
-					self.on_set_reserved_peers(peer_ids),
-				Action::SetReservedOnly(reserved) =>
-					self.on_set_reserved_only(reserved),
+				Action::AddReservedPeer(set_id, peer_id) =>
+					self.on_add_reserved_peer(set_id, peer_id),
+				Action::RemoveReservedPeer(set_id, peer_id) =>
+					self.on_remove_reserved_peer(set_id, peer_id),
+				Action::SetReservedPeers(set_id, peer_ids) =>
+					self.on_set_reserved_peers(set_id, peer_ids),
+				Action::SetReservedOnly(set_id, reserved) =>
+					self.on_set_reserved_only(set_id, reserved),
 				Action::ReportPeer(peer_id, score_diff) =>
 					self.on_report_peer(peer_id, score_diff),
-				Action::SetPriorityGroup(group_id, peers) =>
-					self.on_set_priority_group(&group_id, peers),
-				Action::AddToPriorityGroup(group_id, peer_id) =>
-					self.on_add_to_priority_group(&group_id, peer_id),
-				Action::RemoveFromPriorityGroup(group_id, peer_id) =>
-					self.on_remove_from_priority_group(&group_id, peer_id),
+				Action::AddToPeersSet(sets_name, peer_id) =>
+					self.add_to_peers_set(sets_name, peer_id),
+				Action::RemoveFromPeersSet(sets_name, peer_id) =>
+					self.on_remove_from_peers_set(sets_name, peer_id),
 			}
 		}
 	}
@@ -688,7 +708,7 @@ impl Stream for Peerset {
 mod tests {
 	use libp2p::PeerId;
 	use futures::prelude::*;
-	use super::{PeersetConfig, Peerset, Message, IncomingIndex, ReputationChange, BANNED_THRESHOLD};
+	use super::{PeersetConfig, Peerset, Message, IncomingIndex, ReputationChange, SetConfig, SetId, BANNED_THRESHOLD};
 	use std::{pin::Pin, task::Poll, thread, time::Duration};
 
 	fn assert_messages(mut peerset: Peerset, messages: Vec<Message>) -> Peerset {
@@ -712,20 +732,22 @@ mod tests {
 		let reserved_peer = PeerId::random();
 		let reserved_peer2 = PeerId::random();
 		let config = PeersetConfig {
-			in_peers: 0,
-			out_peers: 2,
-			bootnodes: vec![bootnode],
-			reserved_only: true,
-			priority_groups: Vec::new(),
+			sets: vec![SetConfig {
+				in_peers: 0,
+				out_peers: 2,
+				bootnodes: vec![bootnode],
+				reserved_nodes: Default::default(),
+				reserved_only: true,
+			}],
 		};
 
 		let (peerset, handle) = Peerset::from_config(config);
-		handle.add_reserved_peer(reserved_peer.clone());
-		handle.add_reserved_peer(reserved_peer2.clone());
+		handle.add_reserved_peer(SetId::from(0), reserved_peer.clone());
+		handle.add_reserved_peer(SetId::from(0), reserved_peer2.clone());
 
 		assert_messages(peerset, vec![
-			Message::Connect(reserved_peer),
-			Message::Connect(reserved_peer2)
+			Message::Connect { set_id: SetId::from(0), peer_id: reserved_peer },
+			Message::Connect { set_id: SetId::from(0), peer_id: reserved_peer2 }
 		]);
 	}
 
@@ -740,21 +762,23 @@ mod tests {
 		let ii3 = IncomingIndex(3);
 		let ii4 = IncomingIndex(3);
 		let config = PeersetConfig {
-			in_peers: 2,
-			out_peers: 1,
-			bootnodes: vec![bootnode.clone()],
-			reserved_only: false,
-			priority_groups: Vec::new(),
+			sets: vec![SetConfig {
+				in_peers: 2,
+				out_peers: 1,
+				bootnodes: vec![bootnode.clone()],
+				reserved_nodes: Default::default(),
+				reserved_only: false,
+			}],
 		};
 
 		let (mut peerset, _handle) = Peerset::from_config(config);
-		peerset.incoming(incoming.clone(), ii);
-		peerset.incoming(incoming, ii4);
-		peerset.incoming(incoming2, ii2);
-		peerset.incoming(incoming3, ii3);
+		peerset.incoming(SetId::from(0), incoming.clone(), ii);
+		peerset.incoming(SetId::from(0), incoming.clone(), ii4);
+		peerset.incoming(SetId::from(0), incoming2.clone(), ii2);
+		peerset.incoming(SetId::from(0), incoming3.clone(), ii3);
 
 		assert_messages(peerset, vec![
-			Message::Connect(bootnode),
+			Message::Connect { set_id: SetId::from(0), peer_id: bootnode.clone() },
 			Message::Accept(ii),
 			Message::Accept(ii2),
 			Message::Reject(ii3),
@@ -766,15 +790,17 @@ mod tests {
 		let incoming = PeerId::random();
 		let ii = IncomingIndex(1);
 		let config = PeersetConfig {
-			in_peers: 50,
-			out_peers: 50,
-			bootnodes: vec![],
-			reserved_only: true,
-			priority_groups: vec![],
+			sets: vec![SetConfig {
+				in_peers: 50,
+				out_peers: 50,
+				bootnodes: vec![],
+				reserved_nodes: Default::default(),
+				reserved_only: true,
+			}],
 		};
 
 		let (mut peerset, _) = Peerset::from_config(config);
-		peerset.incoming(incoming, ii);
+		peerset.incoming(SetId::from(0), incoming.clone(), ii);
 
 		assert_messages(peerset, vec![
 			Message::Reject(ii),
@@ -787,32 +813,36 @@ mod tests {
 		let discovered = PeerId::random();
 		let discovered2 = PeerId::random();
 		let config = PeersetConfig {
-			in_peers: 0,
-			out_peers: 2,
-			bootnodes: vec![bootnode.clone()],
-			reserved_only: false,
-			priority_groups: vec![],
+			sets: vec![SetConfig {
+				in_peers: 0,
+				out_peers: 2,
+				bootnodes: vec![bootnode.clone()],
+				reserved_nodes: Default::default(),
+				reserved_only: false,
+			}],
 		};
 
 		let (mut peerset, _handle) = Peerset::from_config(config);
-		peerset.discovered(Some(discovered.clone()));
-		peerset.discovered(Some(discovered.clone()));
-		peerset.discovered(Some(discovered2));
+		peerset.add_to_peers_set(SetId::from(0), discovered.clone());
+		peerset.add_to_peers_set(SetId::from(0), discovered.clone());
+		peerset.add_to_peers_set(SetId::from(0), discovered2);
 
 		assert_messages(peerset, vec![
-			Message::Connect(bootnode),
-			Message::Connect(discovered),
+			Message::Connect { set_id: SetId::from(0), peer_id: bootnode },
+			Message::Connect { set_id: SetId::from(0), peer_id: discovered },
 		]);
 	}
 
 	#[test]
 	fn test_peerset_banned() {
 		let (mut peerset, handle) = Peerset::from_config(PeersetConfig {
-			in_peers: 25,
-			out_peers: 25,
-			bootnodes: vec![],
-			reserved_only: false,
-			priority_groups: vec![],
+			sets: vec![SetConfig {
+				in_peers: 25,
+				out_peers: 25,
+				bootnodes: vec![],
+				reserved_nodes: Default::default(),
+				reserved_only: false,
+			}],
 		});
 
 		// We ban a node by setting its reputation under the threshold.
@@ -824,7 +854,7 @@ mod tests {
 			assert_eq!(Stream::poll_next(Pin::new(&mut peerset), cx), Poll::Pending);
 
 			// Check that an incoming connection from that node gets refused.
-			peerset.incoming(peer_id.clone(), IncomingIndex(1));
+			peerset.incoming(SetId::from(0), peer_id.clone(), IncomingIndex(1));
 			if let Poll::Ready(msg) = Stream::poll_next(Pin::new(&mut peerset), cx) {
 				assert_eq!(msg.unwrap(), Message::Reject(IncomingIndex(1)));
 			} else {
@@ -835,7 +865,7 @@ mod tests {
 			thread::sleep(Duration::from_millis(1500));
 
 			// Try again. This time the node should be accepted.
-			peerset.incoming(peer_id.clone(), IncomingIndex(2));
+			peerset.incoming(SetId::from(0), peer_id.clone(), IncomingIndex(2));
 			while let Poll::Ready(msg) = Stream::poll_next(Pin::new(&mut peerset), cx) {
 				assert_eq!(msg.unwrap(), Message::Accept(IncomingIndex(2)));
 			}
diff --git a/client/peerset/src/peersstate.rs b/client/peerset/src/peersstate.rs
index d635f51781c9..c79dac5e10a7 100644
--- a/client/peerset/src/peersstate.rs
+++ b/client/peerset/src/peersstate.rs
@@ -19,9 +19,10 @@
 //! Reputation and slots allocation system behind the peerset.
 //!
 //! The [`PeersState`] state machine is responsible for managing the reputation and allocating
-//! slots. It holds a list of nodes, each associated with a reputation value and whether we are
-//! connected or not to this node. Thanks to this list, it knows how many slots are occupied. It
-//! also holds a list of nodes which don't occupy slots.
+//! slots. It holds a list of nodes, each associated with a reputation value, a list of sets the
+//! node belongs to, and for each set whether we are connected or not to this node. Thanks to this
+//! list, it knows how many slots are occupied. It also holds a list of nodes which don't occupy
+//! slots.
 //!
 //! > Note: This module is purely dedicated to managing slots and reputations. Features such as
 //! >       for example connecting to some nodes in priority should be added outside of this
@@ -29,7 +30,10 @@
 
 use libp2p::PeerId;
 use log::error;
-use std::{borrow::Cow, collections::{HashSet, HashMap}};
+use std::{
+	borrow::Cow,
+	collections::{HashMap, HashSet, hash_map::{Entry, OccupiedEntry}},
+};
 use wasm_timer::Instant;
 
 /// State storage behind the peerset.
@@ -48,16 +52,33 @@ pub struct PeersState {
 	///           sort, to make the logic easier.
 	nodes: HashMap<PeerId, Node>,
 
-	/// Number of slot-occupying nodes for which the `ConnectionState` is `In`.
+	/// Configuration of each set. The size of this `Vec` is never modified.
+	sets: Vec<SetInfo>,
+}
+
+/// Configuration of a single set.
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+pub struct SetConfig {
+	/// Maximum allowed number of slot-occupying nodes for ingoing connections.
+	pub in_peers: u32,
+
+	/// Maximum allowed number of slot-occupying nodes for outgoing connections.
+	pub out_peers: u32,
+}
+
+/// State of a single set.
+#[derive(Debug, Clone, PartialEq, Eq)]
+struct SetInfo {
+	/// Number of slot-occupying nodes for which the `MembershipState` is `In`.
 	num_in: u32,
 
-	/// Number of slot-occupying nodes for which the `ConnectionState` is `In`.
+	/// Number of slot-occupying nodes for which the `MembershipState` is `In`.
 	num_out: u32,
 
-	/// Maximum allowed number of slot-occupying nodes for which the `ConnectionState` is `In`.
+	/// Maximum allowed number of slot-occupying nodes for which the `MembershipState` is `In`.
 	max_in: u32,
 
-	/// Maximum allowed number of slot-occupying nodes for which the `ConnectionState` is `Out`.
+	/// Maximum allowed number of slot-occupying nodes for which the `MembershipState` is `Out`.
 	max_out: u32,
 
 	/// List of node identities (discovered or not) that don't occupy slots.
@@ -69,35 +90,37 @@ pub struct PeersState {
 }
 
 /// State of a single node that we know about.
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 struct Node {
-	/// Whether we are connected to this node.
-	connection_state: ConnectionState,
+	/// List of sets the node belongs to.
+	/// Always has a fixed size equal to the one of [`PeersState::set`]. The various possible sets
+	/// are indices into this `Vec`.
+	sets: Vec<MembershipState>,
 
 	/// Reputation value of the node, between `i32::min_value` (we hate that node) and
 	/// `i32::max_value` (we love that node).
 	reputation: i32,
 }
 
-impl Default for Node {
-	fn default() -> Node {
+impl Node {
+	fn new(num_sets: usize) -> Node {
 		Node {
-			connection_state: ConnectionState::NotConnected {
-				last_connected: Instant::now(),
-			},
+			sets: (0..num_sets).map(|_| MembershipState::NotMember).collect(),
 			reputation: 0,
 		}
 	}
 }
 
-/// Whether we are connected to a node.
+/// Whether we are connected to a node in the context of a specific set.
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
-enum ConnectionState {
+enum MembershipState {
+	/// Node isn't part of that set.
+	NotMember,
 	/// We are connected through an ingoing connection.
 	In,
 	/// We are connected through an outgoing connection.
 	Out,
-	/// We are not connected to this node.
+	/// Node is part of that set, but we are not connected to it.
 	NotConnected {
 		/// When we were last connected to the node, or if we were never connected when we
 		/// discovered it.
@@ -105,50 +128,87 @@ enum ConnectionState {
 	},
 }
 
-impl ConnectionState {
+impl MembershipState {
 	/// Returns `true` for `In` and `Out`.
 	fn is_connected(self) -> bool {
 		match self {
-			ConnectionState::In => true,
-			ConnectionState::Out => true,
-			ConnectionState::NotConnected { .. } => false,
+			MembershipState::NotMember => false,
+			MembershipState::In => true,
+			MembershipState::Out => true,
+			MembershipState::NotConnected { .. } => false,
 		}
 	}
 }
 
 impl PeersState {
 	/// Builds a new empty `PeersState`.
-	pub fn new(in_peers: u32, out_peers: u32) -> Self {
+	pub fn new(sets: impl IntoIterator<Item = SetConfig>) -> Self {
 		PeersState {
 			nodes: HashMap::new(),
-			num_in: 0,
-			num_out: 0,
-			max_in: in_peers,
-			max_out: out_peers,
-			no_slot_nodes: HashSet::new(),
+			sets: sets
+				.into_iter()
+				.map(|config| SetInfo {
+					num_in: 0,
+					num_out: 0,
+					max_in: config.in_peers,
+					max_out: config.out_peers,
+					no_slot_nodes: HashSet::new(),
+				})
+				.collect(),
 		}
 	}
 
-	/// Returns an object that grants access to the state of a peer.
-	pub fn peer<'a>(&'a mut self, peer_id: &'a PeerId) -> Peer<'a> {
-		match self.nodes.get_mut(peer_id) {
-			None => Peer::Unknown(UnknownPeer {
+	/// Returns the number of sets.
+	///
+	/// Corresponds to the number of elements passed to [`PeersState::new`].
+	pub fn num_sets(&self) -> usize {
+		self.sets.len()
+	}
+
+	/// Returns an object that grants access to the reputation value of a peer.
+	pub fn peer_reputation(&mut self, peer_id: PeerId) -> Reputation {
+		if !self.nodes.contains_key(&peer_id) {
+			self.nodes.insert(peer_id.clone(), Node::new(self.sets.len()));
+		}
+
+		let entry = match self.nodes.entry(peer_id) {
+			Entry::Vacant(_) => unreachable!("guaranteed to be inserted above; qed"),
+			Entry::Occupied(e) => e,
+		};
+
+		Reputation { node: Some(entry) }
+	}
+
+	/// Returns an object that grants access to the state of a peer in the context of a specific
+	/// set.
+	///
+	/// # Panic
+	///
+	/// `set` must be within range of the sets passed to [`PeersState::new`].
+	///
+	pub fn peer<'a>(&'a mut self, set: usize, peer_id: &'a PeerId) -> Peer<'a> {
+		// The code below will panic anyway if this happens to be false, but this earlier assert
+		// makes it explicit what is wrong.
+		assert!(set < self.sets.len());
+
+		match self.nodes.get_mut(peer_id).map(|p| &p.sets[set]) {
+			None | Some(MembershipState::NotMember) => Peer::Unknown(UnknownPeer {
 				parent: self,
+				set,
 				peer_id: Cow::Borrowed(peer_id),
 			}),
-			Some(peer) => {
-				if peer.connection_state.is_connected() {
-					Peer::Connected(ConnectedPeer {
-						state: self,
-						peer_id: Cow::Borrowed(peer_id),
-					})
-				} else {
-					Peer::NotConnected(NotConnectedPeer {
-						state: self,
-						peer_id: Cow::Borrowed(peer_id),
-					})
-				}
+			Some(MembershipState::In) | Some(MembershipState::Out) => {
+				Peer::Connected(ConnectedPeer {
+					state: self,
+					set,
+					peer_id: Cow::Borrowed(peer_id),
+				})
 			}
+			Some(MembershipState::NotConnected { .. }) => Peer::NotConnected(NotConnectedPeer {
+				state: self,
+				set,
+				peer_id: Cow::Borrowed(peer_id),
+			}),
 		}
 	}
 
@@ -159,22 +219,49 @@ impl PeersState {
 		self.nodes.keys()
 	}
 
-	/// Returns the list of peers we are connected to.
+	/// Returns the list of peers we are connected to in the context of a specific set.
+	///
+	/// # Panic
+	///
+	/// `set` must be within range of the sets passed to [`PeersState::new`].
+	///
 	// Note: this method could theoretically return a `ConnectedPeer`, but implementing that
 	// isn't simple.
-	pub fn connected_peers(&self) -> impl Iterator<Item = &PeerId> {
-		self.nodes.iter()
-			.filter(|(_, p)| p.connection_state.is_connected())
+	pub fn connected_peers(&self, set: usize) -> impl Iterator<Item = &PeerId> {
+		// The code below will panic anyway if this happens to be false, but this earlier assert
+		// makes it explicit what is wrong.
+		assert!(set < self.sets.len());
+
+		self.nodes
+			.iter()
+			.filter(move |(_, p)| p.sets[set].is_connected())
 			.map(|(p, _)| p)
 	}
 
 	/// Returns the peer with the highest reputation and that we are not connected to.
 	///
 	/// If multiple nodes have the same reputation, which one is returned is unspecified.
-	pub fn highest_not_connected_peer(&mut self) -> Option<NotConnectedPeer> {
-		let outcome = self.nodes
+	///
+	/// # Panic
+	///
+	/// `set` must be within range of the sets passed to [`PeersState::new`].
+	///
+	pub fn highest_not_connected_peer(&mut self, set: usize) -> Option<NotConnectedPeer> {
+		// The code below will panic anyway if this happens to be false, but this earlier assert
+		// makes it explicit what is wrong.
+		assert!(set < self.sets.len());
+
+		let outcome = self
+			.nodes
 			.iter_mut()
-			.filter(|(_, Node { connection_state, .. })| !connection_state.is_connected())
+			.filter(|(_, Node { sets, .. })| {
+				match sets[set] {
+					MembershipState::NotMember => false,
+					MembershipState::In => false,
+					MembershipState::Out => false,
+					MembershipState::NotConnected { .. } => true,
+				}
+			})
 			.fold(None::<(&PeerId, &mut Node)>, |mut cur_node, to_try| {
 				if let Some(cur_node) = cur_node.take() {
 					if cur_node.1.reputation >= to_try.1.reputation {
@@ -188,6 +275,7 @@ impl PeersState {
 		if let Some(peer_id) = outcome {
 			Some(NotConnectedPeer {
 				state: self,
+				set,
 				peer_id: Cow::Owned(peer_id),
 			})
 		} else {
@@ -197,48 +285,48 @@ impl PeersState {
 
 	/// Add a node to the list of nodes that don't occupy slots.
 	///
-	/// Has no effect if the peer was already in the group.
-	pub fn add_no_slot_node(&mut self, peer_id: PeerId) {
+	/// Has no effect if the node was already in the group.
+	pub fn add_no_slot_node(&mut self, set: usize, peer_id: PeerId) {
 		// Reminder: `HashSet::insert` returns false if the node was already in the set
-		if !self.no_slot_nodes.insert(peer_id.clone()) {
+		if !self.sets[set].no_slot_nodes.insert(peer_id.clone()) {
 			return;
 		}
 
 		if let Some(peer) = self.nodes.get_mut(&peer_id) {
-			match peer.connection_state {
-				ConnectionState::In => self.num_in -= 1,
-				ConnectionState::Out => self.num_out -= 1,
-				ConnectionState::NotConnected { .. } => {},
+			match peer.sets[set] {
+				MembershipState::In => self.sets[set].num_in -= 1,
+				MembershipState::Out => self.sets[set].num_out -= 1,
+				MembershipState::NotConnected { .. } | MembershipState::NotMember => {}
 			}
 		}
 	}
 
 	/// Removes a node from the list of nodes that don't occupy slots.
 	///
-	/// Has no effect if the peer was not in the group.
-	pub fn remove_no_slot_node(&mut self, peer_id: &PeerId) {
+	/// Has no effect if the node was not in the group.
+	pub fn remove_no_slot_node(&mut self, set: usize, peer_id: &PeerId) {
 		// Reminder: `HashSet::remove` returns false if the node was already not in the set
-		if !self.no_slot_nodes.remove(peer_id) {
+		if !self.sets[set].no_slot_nodes.remove(peer_id) {
 			return;
 		}
 
 		if let Some(peer) = self.nodes.get_mut(peer_id) {
-			match peer.connection_state {
-				ConnectionState::In => self.num_in += 1,
-				ConnectionState::Out => self.num_out += 1,
-				ConnectionState::NotConnected { .. } => {},
+			match peer.sets[set] {
+				MembershipState::In => self.sets[set].num_in += 1,
+				MembershipState::Out => self.sets[set].num_out += 1,
+				MembershipState::NotConnected { .. } | MembershipState::NotMember => {}
 			}
 		}
 	}
 }
 
-/// Grants access to the state of a peer in the `PeersState`.
+/// Grants access to the state of a peer in the [`PeersState`] in the context of a specific set.
 pub enum Peer<'a> {
 	/// We are connected to this node.
 	Connected(ConnectedPeer<'a>),
 	/// We are not connected to this node.
 	NotConnected(NotConnectedPeer<'a>),
-	/// We have never heard of this node.
+	/// We have never heard of this node, or it is not part of the set.
 	Unknown(UnknownPeer<'a>),
 }
 
@@ -255,7 +343,7 @@ impl<'a> Peer<'a> {
 
 	/// If we are the `Unknown` variant, returns the inner `ConnectedPeer`. Returns `None`
 	/// otherwise.
-	#[cfg(test)]	// Feel free to remove this if this function is needed outside of tests
+	#[cfg(test)] // Feel free to remove this if this function is needed outside of tests
 	pub fn into_not_connected(self) -> Option<NotConnectedPeer<'a>> {
 		match self {
 			Peer::Connected(_) => None,
@@ -266,7 +354,7 @@ impl<'a> Peer<'a> {
 
 	/// If we are the `Unknown` variant, returns the inner `ConnectedPeer`. Returns `None`
 	/// otherwise.
-	#[cfg(test)]	// Feel free to remove this if this function is needed outside of tests
+	#[cfg(test)] // Feel free to remove this if this function is needed outside of tests
 	pub fn into_unknown(self) -> Option<UnknownPeer<'a>> {
 		match self {
 			Peer::Connected(_) => None,
@@ -279,10 +367,16 @@ impl<'a> Peer<'a> {
 /// A peer that is connected to us.
 pub struct ConnectedPeer<'a> {
 	state: &'a mut PeersState,
+	set: usize,
 	peer_id: Cow<'a, PeerId>,
 }
 
 impl<'a> ConnectedPeer<'a> {
+	/// Get the `PeerId` associated to this `ConnectedPeer`.
+	pub fn peer_id(&self) -> &PeerId {
+		&self.peer_id
+	}
+
 	/// Destroys this `ConnectedPeer` and returns the `PeerId` inside of it.
 	pub fn into_peer_id(self) -> PeerId {
 		self.peer_id.into_owned()
@@ -290,65 +384,74 @@ impl<'a> ConnectedPeer<'a> {
 
 	/// Switches the peer to "not connected".
 	pub fn disconnect(self) -> NotConnectedPeer<'a> {
-		let is_no_slot_occupy = self.state.no_slot_nodes.contains(&*self.peer_id);
-		if let Some(mut node) = self.state.nodes.get_mut(&*self.peer_id) {
+		let is_no_slot_occupy = self.state.sets[self.set].no_slot_nodes.contains(&*self.peer_id);
+		if let Some(node) = self.state.nodes.get_mut(&*self.peer_id) {
 			if !is_no_slot_occupy {
-				match node.connection_state {
-					ConnectionState::In => self.state.num_in -= 1,
-					ConnectionState::Out => self.state.num_out -= 1,
-					ConnectionState::NotConnected { .. } =>
-						debug_assert!(false, "State inconsistency: disconnecting a disconnected node")
+				match node.sets[self.set] {
+					MembershipState::In => self.state.sets[self.set].num_in -= 1,
+					MembershipState::Out => self.state.sets[self.set].num_out -= 1,
+					MembershipState::NotMember | MembershipState::NotConnected { .. } => {
+						debug_assert!(
+							false,
+							"State inconsistency: disconnecting a disconnected node"
+						)
+					}
 				}
 			}
-			node.connection_state = ConnectionState::NotConnected {
+			node.sets[self.set] = MembershipState::NotConnected {
 				last_connected: Instant::now(),
 			};
 		} else {
-			debug_assert!(false, "State inconsistency: disconnecting a disconnected node");
+			debug_assert!(
+				false,
+				"State inconsistency: disconnecting a disconnected node"
+			);
 		}
 
 		NotConnectedPeer {
 			state: self.state,
+			set: self.set,
 			peer_id: self.peer_id,
 		}
 	}
 
-	/// Returns the reputation value of the node.
-	pub fn reputation(&self) -> i32 {
-		self.state.nodes.get(&*self.peer_id).map_or(0, |p| p.reputation)
-	}
-
-	/// Sets the reputation of the peer.
-	pub fn set_reputation(&mut self, value: i32) {
-		if let Some(node) = self.state.nodes.get_mut(&*self.peer_id) {
-			node.reputation = value;
-		} else {
-			debug_assert!(false, "State inconsistency: set_reputation on an unknown node");
-		}
-	}
-
 	/// Performs an arithmetic addition on the reputation score of that peer.
 	///
 	/// In case of overflow, the value will be capped.
+	///
+	/// > **Note**: Reputation values aren't specific to a set but are global per peer.
 	pub fn add_reputation(&mut self, modifier: i32) {
 		if let Some(node) = self.state.nodes.get_mut(&*self.peer_id) {
 			node.reputation = node.reputation.saturating_add(modifier);
 		} else {
-			debug_assert!(false, "State inconsistency: add_reputation on an unknown node");
+			debug_assert!(
+				false,
+				"State inconsistency: add_reputation on an unknown node"
+			);
 		}
 	}
+
+	/// Returns the reputation value of the node.
+	///
+	/// > **Note**: Reputation values aren't specific to a set but are global per peer.
+	pub fn reputation(&self) -> i32 {
+		self.state
+			.nodes
+			.get(&*self.peer_id)
+			.map_or(0, |p| p.reputation)
+	}
 }
 
 /// A peer that is not connected to us.
 #[derive(Debug)]
 pub struct NotConnectedPeer<'a> {
 	state: &'a mut PeersState,
+	set: usize,
 	peer_id: Cow<'a, PeerId>,
 }
 
 impl<'a> NotConnectedPeer<'a> {
 	/// Destroys this `NotConnectedPeer` and returns the `PeerId` inside of it.
-	#[cfg(test)]	// Feel free to remove this if this function is needed outside of tests
 	pub fn into_peer_id(self) -> PeerId {
 		self.peer_id.into_owned()
 	}
@@ -361,7 +464,7 @@ impl<'a> NotConnectedPeer<'a> {
 			None => return,
 		};
 
-		if let ConnectionState::NotConnected { last_connected } = &mut state.connection_state {
+		if let MembershipState::NotConnected { last_connected } = &mut state.sets[self.set] {
 			*last_connected = Instant::now();
 		}
 	}
@@ -383,8 +486,8 @@ impl<'a> NotConnectedPeer<'a> {
 			}
 		};
 
-		match state.connection_state {
-			ConnectionState::NotConnected { last_connected } => last_connected,
+		match state.sets[self.set] {
+			MembershipState::NotConnected { last_connected } => last_connected,
 			_ => {
 				error!(target: "peerset", "State inconsistency with {}", self.peer_id);
 				Instant::now()
@@ -399,25 +502,31 @@ impl<'a> NotConnectedPeer<'a> {
 	///
 	/// Non-slot-occupying nodes don't count towards the number of slots.
 	pub fn try_outgoing(self) -> Result<ConnectedPeer<'a>, NotConnectedPeer<'a>> {
-		let is_no_slot_occupy = self.state.no_slot_nodes.contains(&*self.peer_id);
+		let is_no_slot_occupy = self.state.sets[self.set].no_slot_nodes.contains(&*self.peer_id);
 
 		// Note that it is possible for num_out to be strictly superior to the max, in case we were
 		// connected to reserved node then marked them as not reserved.
-		if self.state.num_out >= self.state.max_out && !is_no_slot_occupy {
+		if self.state.sets[self.set].num_out >= self.state.sets[self.set].max_out
+			&& !is_no_slot_occupy
+		{
 			return Err(self);
 		}
 
-		if let Some(mut peer) = self.state.nodes.get_mut(&*self.peer_id) {
-			peer.connection_state = ConnectionState::Out;
+		if let Some(peer) = self.state.nodes.get_mut(&*self.peer_id) {
+			peer.sets[self.set] = MembershipState::Out;
 			if !is_no_slot_occupy {
-				self.state.num_out += 1;
+				self.state.sets[self.set].num_out += 1;
 			}
 		} else {
-			debug_assert!(false, "State inconsistency: try_outgoing on an unknown node");
+			debug_assert!(
+				false,
+				"State inconsistency: try_outgoing on an unknown node"
+			);
 		}
 
 		Ok(ConnectedPeer {
 			state: self.state,
+			set: self.set,
 			peer_id: self.peer_id,
 		})
 	}
@@ -429,74 +538,95 @@ impl<'a> NotConnectedPeer<'a> {
 	///
 	/// Non-slot-occupying nodes don't count towards the number of slots.
 	pub fn try_accept_incoming(self) -> Result<ConnectedPeer<'a>, NotConnectedPeer<'a>> {
-		let is_no_slot_occupy = self.state.no_slot_nodes.contains(&*self.peer_id);
+		let is_no_slot_occupy = self.state.sets[self.set].no_slot_nodes.contains(&*self.peer_id);
 
 		// Note that it is possible for num_in to be strictly superior to the max, in case we were
 		// connected to reserved node then marked them as not reserved.
-		if self.state.num_in >= self.state.max_in && !is_no_slot_occupy {
+		if self.state.sets[self.set].num_in >= self.state.sets[self.set].max_in
+			&& !is_no_slot_occupy
+		{
 			return Err(self);
 		}
 
-		if let Some(mut peer) = self.state.nodes.get_mut(&*self.peer_id) {
-			peer.connection_state = ConnectionState::In;
+		if let Some(peer) = self.state.nodes.get_mut(&*self.peer_id) {
+			peer.sets[self.set] = MembershipState::In;
 			if !is_no_slot_occupy {
-				self.state.num_in += 1;
+				self.state.sets[self.set].num_in += 1;
 			}
 		} else {
-			debug_assert!(false, "State inconsistency: try_accept_incoming on an unknown node");
+			debug_assert!(
+				false,
+				"State inconsistency: try_accept_incoming on an unknown node"
+			);
 		}
 
 		Ok(ConnectedPeer {
 			state: self.state,
+			set: self.set,
 			peer_id: self.peer_id,
 		})
 	}
 
 	/// Returns the reputation value of the node.
+	///
+	/// > **Note**: Reputation values aren't specific to a set but are global per peer.
 	pub fn reputation(&self) -> i32 {
-		self.state.nodes.get(&*self.peer_id).map_or(0, |p| p.reputation)
+		self.state
+			.nodes
+			.get(&*self.peer_id)
+			.map_or(0, |p| p.reputation)
 	}
 
 	/// Sets the reputation of the peer.
+	///
+	/// > **Note**: Reputation values aren't specific to a set but are global per peer.
+	#[cfg(test)] // Feel free to remove this if this function is needed outside of tests
 	pub fn set_reputation(&mut self, value: i32) {
 		if let Some(node) = self.state.nodes.get_mut(&*self.peer_id) {
 			node.reputation = value;
 		} else {
-			debug_assert!(false, "State inconsistency: set_reputation on an unknown node");
-		}
-	}
-
-	/// Performs an arithmetic addition on the reputation score of that peer.
-	///
-	/// In case of overflow, the value will be capped.
-	pub fn add_reputation(&mut self, modifier: i32) {
-		if let Some(node) = self.state.nodes.get_mut(&*self.peer_id) {
-			node.reputation = node.reputation.saturating_add(modifier);
-		} else {
-			debug_assert!(false, "State inconsistency: add_reputation on an unknown node");
+			debug_assert!(
+				false,
+				"State inconsistency: set_reputation on an unknown node"
+			);
 		}
 	}
 
-	/// Un-discovers the peer. Removes it from the list.
+	/// Removes the peer from the list of members of the set.
 	pub fn forget_peer(self) -> UnknownPeer<'a> {
-		if self.state.nodes.remove(&*self.peer_id).is_none() {
+		if let Some(peer) = self.state.nodes.get_mut(&*self.peer_id) {
+			debug_assert!(!matches!(peer.sets[self.set], MembershipState::NotMember));
+			peer.sets[self.set] = MembershipState::NotMember;
+
+			// Remove the peer from `self.state.nodes` entirely if it isn't a member of any set.
+			if peer.reputation == 0 && peer
+				.sets
+				.iter()
+				.all(|set| matches!(set, MembershipState::NotMember))
+			{
+				self.state.nodes.remove(&*self.peer_id);
+			}
+		} else {
+			debug_assert!(false, "State inconsistency: forget_peer on an unknown node");
 			error!(
 				target: "peerset",
 				"State inconsistency with {} when forgetting peer",
 				self.peer_id
 			);
-		}
+		};
 
 		UnknownPeer {
 			parent: self.state,
+			set: self.set,
 			peer_id: self.peer_id,
 		}
 	}
 }
 
-/// A peer that we have never heard of.
+/// A peer that we have never heard of or that isn't part of the set.
 pub struct UnknownPeer<'a> {
 	parent: &'a mut PeersState,
+	set: usize,
 	peer_id: Cow<'a, PeerId>,
 }
 
@@ -506,96 +636,240 @@ impl<'a> UnknownPeer<'a> {
 	/// The node starts with a reputation of 0. You can adjust these default
 	/// values using the `NotConnectedPeer` that this method returns.
 	pub fn discover(self) -> NotConnectedPeer<'a> {
-		self.parent.nodes.insert(self.peer_id.clone().into_owned(), Node {
-			connection_state: ConnectionState::NotConnected {
-				last_connected: Instant::now(),
-			},
-			reputation: 0,
-		});
+		let num_sets = self.parent.sets.len();
+
+		self.parent
+			.nodes
+			.entry(self.peer_id.clone().into_owned())
+			.or_insert_with(|| Node::new(num_sets))
+			.sets[self.set] = MembershipState::NotConnected {
+			last_connected: Instant::now(),
+		};
 
-		let state = self.parent;
 		NotConnectedPeer {
-			state,
+			state: self.parent,
+			set: self.set,
 			peer_id: self.peer_id,
 		}
 	}
 }
 
+/// Access to the reputation of a peer.
+pub struct Reputation<'a> {
+	/// Node entry in [`PeersState::nodes`]. Always `Some` except right before dropping.
+	node: Option<OccupiedEntry<'a, PeerId, Node>>,
+}
+
+impl<'a> Reputation<'a> {
+	/// Returns the reputation value of the node.
+	pub fn reputation(&self) -> i32 {
+		self.node.as_ref().unwrap().get().reputation
+	}
+
+	/// Sets the reputation of the peer.
+	pub fn set_reputation(&mut self, value: i32) {
+		self.node.as_mut().unwrap().get_mut().reputation = value;
+	}
+
+	/// Performs an arithmetic addition on the reputation score of that peer.
+	///
+	/// In case of overflow, the value will be capped.
+	pub fn add_reputation(&mut self, modifier: i32) {
+		let reputation = &mut self.node.as_mut().unwrap().get_mut().reputation;
+		*reputation = reputation.saturating_add(modifier);
+	}
+}
+
+impl<'a> Drop for Reputation<'a> {
+	fn drop(&mut self) {
+		if let Some(node) = self.node.take() {
+			if node.get().reputation == 0 &&
+				node.get().sets.iter().all(|set| matches!(set, MembershipState::NotMember))
+			{
+				node.remove();
+			}
+		}
+	}
+}
+
 #[cfg(test)]
 mod tests {
-	use super::{PeersState, Peer};
+	use super::{Peer, PeersState, SetConfig};
 	use libp2p::PeerId;
+	use std::iter;
 
 	#[test]
 	fn full_slots_in() {
-		let mut peers_state = PeersState::new(1, 1);
+		let mut peers_state = PeersState::new(iter::once(SetConfig {
+			in_peers: 1,
+			out_peers: 1,
+		}));
 		let id1 = PeerId::random();
 		let id2 = PeerId::random();
 
-		if let Peer::Unknown(e) = peers_state.peer(&id1) {
+		if let Peer::Unknown(e) = peers_state.peer(0, &id1) {
 			assert!(e.discover().try_accept_incoming().is_ok());
 		}
 
-		if let Peer::Unknown(e) = peers_state.peer(&id2) {
+		if let Peer::Unknown(e) = peers_state.peer(0, &id2) {
 			assert!(e.discover().try_accept_incoming().is_err());
 		}
 	}
 
 	#[test]
 	fn no_slot_node_doesnt_use_slot() {
-		let mut peers_state = PeersState::new(1, 1);
+		let mut peers_state = PeersState::new(iter::once(SetConfig {
+			in_peers: 1,
+			out_peers: 1,
+		}));
 		let id1 = PeerId::random();
 		let id2 = PeerId::random();
 
-		peers_state.add_no_slot_node(id1.clone());
-		if let Peer::Unknown(p) = peers_state.peer(&id1) {
+		peers_state.add_no_slot_node(0, id1.clone());
+		if let Peer::Unknown(p) = peers_state.peer(0, &id1) {
 			assert!(p.discover().try_accept_incoming().is_ok());
-		} else { panic!() }
+		} else {
+			panic!()
+		}
 
-		if let Peer::Unknown(e) = peers_state.peer(&id2) {
+		if let Peer::Unknown(e) = peers_state.peer(0, &id2) {
 			assert!(e.discover().try_accept_incoming().is_ok());
-		} else { panic!() }
+		} else {
+			panic!()
+		}
 	}
 
 	#[test]
 	fn disconnecting_frees_slot() {
-		let mut peers_state = PeersState::new(1, 1);
+		let mut peers_state = PeersState::new(iter::once(SetConfig {
+			in_peers: 1,
+			out_peers: 1,
+		}));
 		let id1 = PeerId::random();
 		let id2 = PeerId::random();
 
-		assert!(peers_state.peer(&id1).into_unknown().unwrap().discover().try_accept_incoming().is_ok());
-		assert!(peers_state.peer(&id2).into_unknown().unwrap().discover().try_accept_incoming().is_err());
-		peers_state.peer(&id1).into_connected().unwrap().disconnect();
-		assert!(peers_state.peer(&id2).into_not_connected().unwrap().try_accept_incoming().is_ok());
+		assert!(peers_state
+			.peer(0, &id1)
+			.into_unknown()
+			.unwrap()
+			.discover()
+			.try_accept_incoming()
+			.is_ok());
+		assert!(peers_state
+			.peer(0, &id2)
+			.into_unknown()
+			.unwrap()
+			.discover()
+			.try_accept_incoming()
+			.is_err());
+		peers_state
+			.peer(0, &id1)
+			.into_connected()
+			.unwrap()
+			.disconnect();
+		assert!(peers_state
+			.peer(0, &id2)
+			.into_not_connected()
+			.unwrap()
+			.try_accept_incoming()
+			.is_ok());
 	}
 
 	#[test]
 	fn highest_not_connected_peer() {
-		let mut peers_state = PeersState::new(25, 25);
+		let mut peers_state = PeersState::new(iter::once(SetConfig {
+			in_peers: 25,
+			out_peers: 25,
+		}));
 		let id1 = PeerId::random();
 		let id2 = PeerId::random();
 
-		assert!(peers_state.highest_not_connected_peer().is_none());
-		peers_state.peer(&id1).into_unknown().unwrap().discover().set_reputation(50);
-		peers_state.peer(&id2).into_unknown().unwrap().discover().set_reputation(25);
-		assert_eq!(peers_state.highest_not_connected_peer().map(|p| p.into_peer_id()), Some(id1.clone()));
-		peers_state.peer(&id2).into_not_connected().unwrap().set_reputation(75);
-		assert_eq!(peers_state.highest_not_connected_peer().map(|p| p.into_peer_id()), Some(id2.clone()));
-		peers_state.peer(&id2).into_not_connected().unwrap().try_accept_incoming().unwrap();
-		assert_eq!(peers_state.highest_not_connected_peer().map(|p| p.into_peer_id()), Some(id1.clone()));
-		peers_state.peer(&id1).into_not_connected().unwrap().set_reputation(100);
-		peers_state.peer(&id2).into_connected().unwrap().disconnect();
-		assert_eq!(peers_state.highest_not_connected_peer().map(|p| p.into_peer_id()), Some(id1.clone()));
-		peers_state.peer(&id1).into_not_connected().unwrap().set_reputation(-100);
-		assert_eq!(peers_state.highest_not_connected_peer().map(|p| p.into_peer_id()), Some(id2));
+		assert!(peers_state.highest_not_connected_peer(0).is_none());
+		peers_state
+			.peer(0, &id1)
+			.into_unknown()
+			.unwrap()
+			.discover()
+			.set_reputation(50);
+		peers_state
+			.peer(0, &id2)
+			.into_unknown()
+			.unwrap()
+			.discover()
+			.set_reputation(25);
+		assert_eq!(
+			peers_state
+				.highest_not_connected_peer(0)
+				.map(|p| p.into_peer_id()),
+			Some(id1.clone())
+		);
+		peers_state
+			.peer(0, &id2)
+			.into_not_connected()
+			.unwrap()
+			.set_reputation(75);
+		assert_eq!(
+			peers_state
+				.highest_not_connected_peer(0)
+				.map(|p| p.into_peer_id()),
+			Some(id2.clone())
+		);
+		peers_state
+			.peer(0, &id2)
+			.into_not_connected()
+			.unwrap()
+			.try_accept_incoming()
+			.unwrap();
+		assert_eq!(
+			peers_state
+				.highest_not_connected_peer(0)
+				.map(|p| p.into_peer_id()),
+			Some(id1.clone())
+		);
+		peers_state
+			.peer(0, &id1)
+			.into_not_connected()
+			.unwrap()
+			.set_reputation(100);
+		peers_state
+			.peer(0, &id2)
+			.into_connected()
+			.unwrap()
+			.disconnect();
+		assert_eq!(
+			peers_state
+				.highest_not_connected_peer(0)
+				.map(|p| p.into_peer_id()),
+			Some(id1.clone())
+		);
+		peers_state
+			.peer(0, &id1)
+			.into_not_connected()
+			.unwrap()
+			.set_reputation(-100);
+		assert_eq!(
+			peers_state
+				.highest_not_connected_peer(0)
+				.map(|p| p.into_peer_id()),
+			Some(id2.clone())
+		);
 	}
 
 	#[test]
 	fn disconnect_no_slot_doesnt_panic() {
-		let mut peers_state = PeersState::new(1, 1);
+		let mut peers_state = PeersState::new(iter::once(SetConfig {
+			in_peers: 1,
+			out_peers: 1,
+		}));
 		let id = PeerId::random();
-		peers_state.add_no_slot_node(id.clone());
-		let peer = peers_state.peer(&id).into_unknown().unwrap().discover().try_outgoing().unwrap();
+		peers_state.add_no_slot_node(0, id.clone());
+		let peer = peers_state
+			.peer(0, &id)
+			.into_unknown()
+			.unwrap()
+			.discover()
+			.try_outgoing()
+			.unwrap();
 		peer.disconnect();
 	}
 }
diff --git a/client/peerset/tests/fuzz.rs b/client/peerset/tests/fuzz.rs
index 6f1bcb653de3..8fdd6f5f3ae4 100644
--- a/client/peerset/tests/fuzz.rs
+++ b/client/peerset/tests/fuzz.rs
@@ -20,8 +20,8 @@ use futures::prelude::*;
 use libp2p::PeerId;
 use rand::distributions::{Distribution, Uniform, WeightedIndex};
 use rand::seq::IteratorRandom;
-use std::{collections::HashMap, collections::HashSet, iter, pin::Pin, task::Poll};
-use sc_peerset::{IncomingIndex, Message, PeersetConfig, Peerset, ReputationChange};
+use sc_peerset::{IncomingIndex, Message, Peerset, PeersetConfig, ReputationChange, SetConfig, SetId};
+use std::{collections::HashMap, collections::HashSet, pin::Pin, task::Poll};
 
 #[test]
 fn run() {
@@ -40,23 +40,30 @@ fn test_once() {
 	let mut reserved_nodes = HashSet::<PeerId>::new();
 
 	let (mut peerset, peerset_handle) = Peerset::from_config(PeersetConfig {
-		bootnodes: (0 .. Uniform::new_inclusive(0, 4).sample(&mut rng)).map(|_| {
-			let id = PeerId::random();
-			known_nodes.insert(id.clone());
-			id
-		}).collect(),
-		priority_groups: {
-			let nodes = (0 .. Uniform::new_inclusive(0, 2).sample(&mut rng)).map(|_| {
-				let id = PeerId::random();
-				known_nodes.insert(id.clone());
-				reserved_nodes.insert(id.clone());
-				id
-			}).collect();
-			vec![("foo".to_string(), nodes)]
-		},
-		reserved_only: Uniform::new_inclusive(0, 10).sample(&mut rng) == 0,
-		in_peers: Uniform::new_inclusive(0, 25).sample(&mut rng),
-		out_peers: Uniform::new_inclusive(0, 25).sample(&mut rng),
+		sets: vec![
+			SetConfig {
+				bootnodes: (0..Uniform::new_inclusive(0, 4).sample(&mut rng))
+					.map(|_| {
+						let id = PeerId::random();
+						known_nodes.insert(id.clone());
+						id
+					})
+					.collect(),
+				reserved_nodes: {
+					(0..Uniform::new_inclusive(0, 2).sample(&mut rng))
+						.map(|_| {
+							let id = PeerId::random();
+							known_nodes.insert(id.clone());
+							reserved_nodes.insert(id.clone());
+							id
+						})
+						.collect()
+				},
+				in_peers: Uniform::new_inclusive(0, 25).sample(&mut rng),
+				out_peers: Uniform::new_inclusive(0, 25).sample(&mut rng),
+				reserved_only: Uniform::new_inclusive(0, 10).sample(&mut rng) == 0,
+			},
+		],
 	});
 
 	futures::executor::block_on(futures::future::poll_fn(move |cx| {
@@ -71,70 +78,101 @@ fn test_once() {
 
 		// Perform a certain number of actions while checking that the state is consistent. If we
 		// reach the end of the loop, the run has succeeded.
-		for _ in 0 .. 2500 {
+		for _ in 0..2500 {
 			// Each of these weights corresponds to an action that we may perform.
 			let action_weights = [150, 90, 90, 30, 30, 1, 1, 4, 4];
-			match WeightedIndex::new(&action_weights).unwrap().sample(&mut rng) {
+			match WeightedIndex::new(&action_weights)
+				.unwrap()
+				.sample(&mut rng)
+			{
 				// If we generate 0, poll the peerset.
 				0 => match Stream::poll_next(Pin::new(&mut peerset), cx) {
-					Poll::Ready(Some(Message::Connect(id))) => {
-						if let Some(id) = incoming_nodes.iter().find(|(_, v)| **v == id).map(|(&id, _)| id) {
+					Poll::Ready(Some(Message::Connect { peer_id, .. })) => {
+						if let Some(id) = incoming_nodes
+							.iter()
+							.find(|(_, v)| **v == peer_id)
+							.map(|(&id, _)| id)
+						{
 							incoming_nodes.remove(&id);
 						}
-						assert!(connected_nodes.insert(id));
+						assert!(connected_nodes.insert(peer_id));
+					}
+					Poll::Ready(Some(Message::Drop { peer_id, .. })) => {
+						connected_nodes.remove(&peer_id);
+					}
+					Poll::Ready(Some(Message::Accept(n))) => {
+						assert!(connected_nodes.insert(incoming_nodes.remove(&n).unwrap()))
+					}
+					Poll::Ready(Some(Message::Reject(n))) => {
+						assert!(!connected_nodes.contains(&incoming_nodes.remove(&n).unwrap()))
 					}
-					Poll::Ready(Some(Message::Drop(id))) => { connected_nodes.remove(&id); }
-					Poll::Ready(Some(Message::Accept(n))) =>
-						assert!(connected_nodes.insert(incoming_nodes.remove(&n).unwrap())),
-					Poll::Ready(Some(Message::Reject(n))) =>
-						assert!(!connected_nodes.contains(&incoming_nodes.remove(&n).unwrap())),
 					Poll::Ready(None) => panic!(),
 					Poll::Pending => {}
-				}
+				},
 
 				// If we generate 1, discover a new node.
 				1 => {
 					let new_id = PeerId::random();
 					known_nodes.insert(new_id.clone());
-					peerset.discovered(iter::once(new_id));
+					peerset.add_to_peers_set(SetId::from(0), new_id);
 				}
 
 				// If we generate 2, adjust a random reputation.
-				2 => if let Some(id) = known_nodes.iter().choose(&mut rng) {
-					let val = Uniform::new_inclusive(i32::min_value(), i32::max_value()).sample(&mut rng);
-					peerset_handle.report_peer(id.clone(), ReputationChange::new(val, ""));
+				2 => {
+					if let Some(id) = known_nodes.iter().choose(&mut rng) {
+						let val = Uniform::new_inclusive(i32::min_value(), i32::max_value())
+							.sample(&mut rng);
+						peerset_handle.report_peer(id.clone(), ReputationChange::new(val, ""));
+					}
 				}
 
 				// If we generate 3, disconnect from a random node.
-				3 => if let Some(id) = connected_nodes.iter().choose(&mut rng).cloned() {
-					connected_nodes.remove(&id);
-					peerset.dropped(id);
+				3 => {
+					if let Some(id) = connected_nodes.iter().choose(&mut rng).cloned() {
+						connected_nodes.remove(&id);
+						peerset.dropped(SetId::from(0), id);
+					}
 				}
 
 				// If we generate 4, connect to a random node.
-				4 => if let Some(id) = known_nodes.iter()
-					.filter(|n| incoming_nodes.values().all(|m| m != *n) && !connected_nodes.contains(*n))
-					.choose(&mut rng) {
-					peerset.incoming(id.clone(), next_incoming_id);
-					incoming_nodes.insert(next_incoming_id, id.clone());
-					next_incoming_id.0 += 1;
+				4 => {
+					if let Some(id) = known_nodes
+						.iter()
+						.filter(|n| {
+							incoming_nodes.values().all(|m| m != *n)
+								&& !connected_nodes.contains(*n)
+						})
+						.choose(&mut rng)
+					{
+						peerset.incoming(SetId::from(0), id.clone(), next_incoming_id.clone());
+						incoming_nodes.insert(next_incoming_id.clone(), id.clone());
+						next_incoming_id.0 += 1;
+					}
 				}
 
 				// 5 and 6 are the reserved-only mode.
-				5 => peerset_handle.set_reserved_only(true),
-				6 => peerset_handle.set_reserved_only(false),
+				5 => peerset_handle.set_reserved_only(SetId::from(0), true),
+				6 => peerset_handle.set_reserved_only(SetId::from(0), false),
 
 				// 7 and 8 are about switching a random node in or out of reserved mode.
-				7 => if let Some(id) = known_nodes.iter().filter(|n| !reserved_nodes.contains(*n)).choose(&mut rng) {
-					peerset_handle.add_reserved_peer(id.clone());
-					reserved_nodes.insert(id.clone());
+				7 => {
+					if let Some(id) = known_nodes
+						.iter()
+						.filter(|n| !reserved_nodes.contains(*n))
+						.choose(&mut rng)
+					{
+						peerset_handle.add_reserved_peer(SetId::from(0), id.clone());
+						reserved_nodes.insert(id.clone());
+					}
 				}
-				8 => if let Some(id) = reserved_nodes.iter().choose(&mut rng).cloned() {
-					reserved_nodes.remove(&id);
-					peerset_handle.remove_reserved_peer(id);
+				8 => {
+					if let Some(id) = reserved_nodes.iter().choose(&mut rng).cloned() {
+						reserved_nodes.remove(&id);
+						peerset_handle.remove_reserved_peer(SetId::from(0), id);
+					}
 				}
 
-				_ => unreachable!()
+				_ => unreachable!(),
 			}
 		}
 

From 9c5fc1caf63bc24eff0e6ef0b3d033cd14359ab0 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Thu, 7 Jan 2021 13:42:37 -0400
Subject: [PATCH 0240/1194] Better Handle Dead Accounts in Balances (#7843)

* Don't mutate storage when account is dead and should stay dead

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* more concrete storage noop

Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
---
 frame/balances/src/lib.rs     |  9 +++++---
 frame/balances/src/tests.rs   | 25 +++++++++++++++++++++-
 frame/balances/src/weights.rs | 40 ++++++++++++-----------------------
 frame/support/src/lib.rs      | 15 +++++++++++++
 4 files changed, 59 insertions(+), 30 deletions(-)

diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index 4fcda02c4fd2..10451aca15b1 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -982,7 +982,7 @@ impl<T: Config<I>, I: Instance> Currency<T::AccountId> for Module<T, I> where
 	/// Slash a target account `who`, returning the negative imbalance created and any left over
 	/// amount that could not be slashed.
 	///
-	/// Is a no-op if `value` to be slashed is zero.
+	/// Is a no-op if `value` to be slashed is zero or the account does not exist.
 	///
 	/// NOTE: `slash()` prefers free balance, but assumes that reserve balance can be drawn
 	/// from in extreme circumstances. `can_slash()` should be used prior to `slash()` to avoid having
@@ -993,6 +993,7 @@ impl<T: Config<I>, I: Instance> Currency<T::AccountId> for Module<T, I> where
 		value: Self::Balance
 	) -> (Self::NegativeImbalance, Self::Balance) {
 		if value.is_zero() { return (NegativeImbalance::zero(), Zero::zero()) }
+		if Self::is_dead_account(&who) { return (NegativeImbalance::zero(), value) }
 
 		Self::mutate_account(who, |account| {
 			let free_slash = cmp::min(account.free, value);
@@ -1146,9 +1147,10 @@ impl<T: Config<I>, I: Instance> ReservableCurrency<T::AccountId> for Module<T, I
 
 	/// Unreserve some funds, returning any amount that was unable to be unreserved.
 	///
-	/// Is a no-op if the value to be unreserved is zero.
+	/// Is a no-op if the value to be unreserved is zero or the account does not exist.
 	fn unreserve(who: &T::AccountId, value: Self::Balance) -> Self::Balance {
 		if value.is_zero() { return Zero::zero() }
+		if Self::is_dead_account(&who) { return value }
 
 		let actual = Self::mutate_account(who, |account| {
 			let actual = cmp::min(account.reserved, value);
@@ -1166,12 +1168,13 @@ impl<T: Config<I>, I: Instance> ReservableCurrency<T::AccountId> for Module<T, I
 	/// Slash from reserved balance, returning the negative imbalance created,
 	/// and any amount that was unable to be slashed.
 	///
-	/// Is a no-op if the value to be slashed is zero.
+	/// Is a no-op if the value to be slashed is zero or the account does not exist.
 	fn slash_reserved(
 		who: &T::AccountId,
 		value: Self::Balance
 	) -> (Self::NegativeImbalance, Self::Balance) {
 		if value.is_zero() { return (NegativeImbalance::zero(), Zero::zero()) }
+		if Self::is_dead_account(&who) { return (NegativeImbalance::zero(), value) }
 
 		Self::mutate_account(who, |account| {
 			// underflow should never happen, but it if does, there's nothing to be done here.
diff --git a/frame/balances/src/tests.rs b/frame/balances/src/tests.rs
index 728bf036bb3b..1c120272dd0b 100644
--- a/frame/balances/src/tests.rs
+++ b/frame/balances/src/tests.rs
@@ -40,7 +40,7 @@ macro_rules! decl_tests {
 		use crate::*;
 		use sp_runtime::{FixedPointNumber, traits::{SignedExtension, BadOrigin}};
 		use frame_support::{
-			assert_noop, assert_ok, assert_err,
+			assert_noop, assert_storage_noop, assert_ok, assert_err,
 			traits::{
 				LockableCurrency, LockIdentifier, WithdrawReasons,
 				Currency, ReservableCurrency, ExistenceRequirement::AllowDeath, StoredMap
@@ -796,5 +796,28 @@ macro_rules! decl_tests {
 					);
 				});
 		}
+
+		#[test]
+		fn operations_on_dead_account_should_not_change_state() {
+			// These functions all use `mutate_account` which may introduce a storage change when
+			// the account never existed to begin with, and shouldn't exist in the end.
+			<$ext_builder>::default()
+				.existential_deposit(0)
+				.build()
+				.execute_with(|| {
+					assert!(!<Test as Config>::AccountStore::is_explicit(&1337));
+
+					// Unreserve
+					assert_storage_noop!(assert_eq!(Balances::unreserve(&1337, 42), 42));
+					// Reserve
+					assert_noop!(Balances::reserve(&1337, 42), Error::<Test, _>::InsufficientBalance);
+					// Slash Reserve
+					assert_storage_noop!(assert_eq!(Balances::slash_reserved(&1337, 42).1, 42));
+					// Repatriate Reserve
+					assert_noop!(Balances::repatriate_reserved(&1337, &1338, 42, Status::Free), Error::<Test, _>::DeadAccount);
+					// Slash
+					assert_storage_noop!(assert_eq!(Balances::slash(&1337, 42).1, 42));
+				});
+		}
 	}
 }
diff --git a/frame/balances/src/weights.rs b/frame/balances/src/weights.rs
index 1f7e1bec080c..2b69c9c11d59 100644
--- a/frame/balances/src/weights.rs
+++ b/frame/balances/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Weights for pallet_balances
+//! Autogenerated weights for pallet_balances
+//!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2021-01-06, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -48,76 +49,63 @@ pub trait WeightInfo {
 	fn set_balance_creating() -> Weight;
 	fn set_balance_killing() -> Weight;
 	fn force_transfer() -> Weight;
-	
 }
 
 /// Weights for pallet_balances using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn transfer() -> Weight {
-		(94_088_000 as Weight)
+		(100_698_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn transfer_keep_alive() -> Weight {
-		(64_828_000 as Weight)
+		(69_407_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn set_balance_creating() -> Weight {
-		(36_151_000 as Weight)
+		(38_489_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn set_balance_killing() -> Weight {
-		(45_505_000 as Weight)
+		(48_458_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn force_transfer() -> Weight {
-		(92_986_000 as Weight)
+		(99_320_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
-	
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn transfer() -> Weight {
-		(94_088_000 as Weight)
+		(100_698_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn transfer_keep_alive() -> Weight {
-		(64_828_000 as Weight)
+		(69_407_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn set_balance_creating() -> Weight {
-		(36_151_000 as Weight)
+		(38_489_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn set_balance_killing() -> Weight {
-		(45_505_000 as Weight)
+		(48_458_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn force_transfer() -> Weight {
-		(92_986_000 as Weight)
+		(99_320_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
-	
 }
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index adea790a3fb0..1127afa9e813 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -499,6 +499,21 @@ macro_rules! assert_noop {
 	}
 }
 
+/// Evaluate any expression and assert that runtime storage has not been mutated
+/// (i.e. expression is a storage no-operation).
+///
+/// Used as `assert_storage_noop(expression_to_assert)`.
+#[macro_export]
+macro_rules! assert_storage_noop {
+	(
+		$x:expr
+	) => {
+		let h = $crate::storage_root();
+		$x;
+		assert_eq!(h, $crate::storage_root());
+	}
+}
+
 /// Assert an expression returns an error specified.
 ///
 /// Used as `assert_err!(expression_to_assert, expected_error_expression)`

From 885c1f17cb6fcb542d7977ea3bd2136b9466c921 Mon Sep 17 00:00:00 2001
From: Xiliang Chen <xlchen1291@gmail.com>
Date: Fri, 8 Jan 2021 21:06:58 +1300
Subject: [PATCH 0241/1194] bump fs-swap (#7834)

---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1cd16f289748..287d0268a679 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1742,9 +1742,9 @@ dependencies = [
 
 [[package]]
 name = "fs-swap"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "921d332c89b3b61a826de38c61ee5b6e02c56806cade1b0e5d81bd71f57a71bb"
+checksum = "5839fda247e24ca4919c87c71dd5ca658f1f39e4f06829f80e3f15c3bafcfc2c"
 dependencies = [
  "lazy_static",
  "libc",

From df287fe393d7d4ee3b42b2594c42cac5a24ea2ab Mon Sep 17 00:00:00 2001
From: tuminfei <tuminfei1981@gmail.com>
Date: Fri, 8 Jan 2021 21:43:43 +0800
Subject: [PATCH 0242/1194] UniArts reserve SS58 address id 38 (#7651)

* UniArts reserve SS58 address id 45

* Update ss58-registry.json

Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com>

Co-authored-by: Xiang Li <bigxiang@gmail.com>
Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com>
---
 primitives/core/src/crypto.rs | 2 ++
 ss58-registry.json            | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index 7943ac1beed2..07720b575ed7 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -518,6 +518,8 @@ ss58_address_format!(
 		(43, "reserved43", "Reserved for future use (43).")
 	ChainXAccount =>
 		(44, "chainx", "ChainX mainnet, standard account (*25519).")
+	UniartsAccount =>
+		(45, "uniarts", "UniArts Chain mainnet, standard account (*25519).")
 	Reserved46 =>
 		(46, "reserved46", "Reserved for future use (46).")
 	Reserved47 =>
diff --git a/ss58-registry.json b/ss58-registry.json
index 30069ab21710..ad0c467f778b 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -370,6 +370,14 @@
 			"standardAccount": "*25519",
 			"website": "https://chainx.org/"
 		},
+		{
+			"prefix": 45,
+			"displayName": "UniArts Network",
+			"symbols": ["UART", "UINK"],
+			"decimals": [12, 12],
+			"standardAccount": "*25519",
+			"website": "https://uniarts.me"
+		},
 		{
 			"prefix": 46,
 			"network": "reserved46",

From c8dd4065fee8204a00d3661c3c914615855d20ef Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Fri, 8 Jan 2021 16:47:33 +0100
Subject: [PATCH 0243/1194] Update to futures 0.3.9 (#7854)

---
 Cargo.lock                               | 192 +++++++++++------------
 bin/node/browser-testing/Cargo.toml      |   2 +-
 bin/node/cli/Cargo.toml                  |   2 +-
 client/authority-discovery/Cargo.toml    |   2 +-
 client/basic-authorship/Cargo.toml       |   2 +-
 client/cli/Cargo.toml                    |   2 +-
 client/consensus/aura/Cargo.toml         |   2 +-
 client/consensus/babe/Cargo.toml         |   2 +-
 client/consensus/manual-seal/Cargo.toml  |   2 +-
 client/consensus/slots/Cargo.toml        |   2 +-
 client/finality-grandpa/Cargo.toml       |   2 +-
 client/informant/Cargo.toml              |   2 +-
 client/keystore/Cargo.toml               |   2 +-
 client/network-gossip/Cargo.toml         |   2 +-
 client/network/Cargo.toml                |   2 +-
 client/network/test/Cargo.toml           |   2 +-
 client/offchain/Cargo.toml               |   2 +-
 client/offchain/src/api/timestamp.rs     |   2 +-
 client/peerset/Cargo.toml                |   2 +-
 client/telemetry/Cargo.toml              |   2 +-
 client/transaction-pool/graph/Cargo.toml |   2 +-
 primitives/blockchain/Cargo.toml         |   2 +-
 primitives/consensus/common/Cargo.toml   |   2 +-
 primitives/utils/Cargo.toml              |   2 +-
 test-utils/client/Cargo.toml             |   2 +-
 test-utils/runtime/client/Cargo.toml     |   2 +-
 26 files changed, 121 insertions(+), 121 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 287d0268a679..594d33cfa3da 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1414,7 +1414,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5"
 dependencies = [
- "futures 0.3.8",
+ "futures 0.3.9",
 ]
 
 [[package]]
@@ -1486,7 +1486,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8feb87a63249689640ac9c011742c33139204e3c134293d3054022276869133b"
 dependencies = [
  "either",
- "futures 0.3.8",
+ "futures 0.3.9",
  "futures-timer 2.0.2",
  "log",
  "num-traits",
@@ -1788,9 +1788,9 @@ checksum = "4c7e4c2612746b0df8fed4ce0c69156021b704c9aefa360311c04e6e9e002eed"
 
 [[package]]
 name = "futures"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b3b0c040a1fe6529d30b3c5944b280c7f0dcb2930d2c3062bca967b602583d0"
+checksum = "c70be434c505aee38639abccb918163b63158a4b4bb791b45b7023044bdc3c9c"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1803,9 +1803,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64"
+checksum = "f01c61843314e95f96cc9245702248733a3a3d744e43e2e755e3c7af8348a0a9"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1813,9 +1813,9 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748"
+checksum = "db8d3b0917ff63a2a96173133c02818fac4a746b0a57569d3baca9ec0e945e08"
 
 [[package]]
 name = "futures-cpupool"
@@ -1834,7 +1834,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdcef58a173af8148b182684c9f2d5250875adbcaff7b5794073894f9d8634a9"
 dependencies = [
  "futures 0.1.30",
- "futures 0.3.8",
+ "futures 0.3.9",
  "lazy_static",
  "log",
  "parking_lot 0.9.0",
@@ -1845,9 +1845,9 @@ dependencies = [
 
 [[package]]
 name = "futures-executor"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4caa2b2b68b880003057c1dd49f1ed937e38f22fcf6c212188a121f08cf40a65"
+checksum = "9ee9ca2f7eb4475772cf39dd1cd06208dce2670ad38f4d9c7262b3e15f127068"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1857,9 +1857,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb"
+checksum = "e37c1a51b037b80922864b8eed90692c5cd8abd4c71ce49b77146caa47f3253b"
 
 [[package]]
 name = "futures-lite"
@@ -1878,9 +1878,9 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556"
+checksum = "0f8719ca0e1f3c5e34f3efe4570ef2c0610ca6da85ae7990d472e9cbfba13664"
 dependencies = [
  "proc-macro-hack",
  "proc-macro2",
@@ -1890,15 +1890,15 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d"
+checksum = "f6adabac1290109cfa089f79192fb6244ad2c3f1cc2281f3e1dd987592b71feb"
 
 [[package]]
 name = "futures-task"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d"
+checksum = "a92a0843a2ff66823a8f7c77bffe9a09be2b64e533562c412d63075643ec0038"
 dependencies = [
  "once_cell",
 ]
@@ -1921,9 +1921,9 @@ dependencies = [
 
 [[package]]
 name = "futures-util"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2"
+checksum = "036a2107cdeb57f6d7322f1b6c363dad67cd63ca3b7d1b925bdf75bd5d96cda9"
 dependencies = [
  "futures 0.1.30",
  "futures-channel",
@@ -1933,7 +1933,7 @@ dependencies = [
  "futures-sink",
  "futures-task",
  "memchr",
- "pin-project 1.0.2",
+ "pin-project-lite 0.2.0",
  "pin-utils",
  "proc-macro-hack",
  "proc-macro-nested",
@@ -1947,7 +1947,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce54d63f8b0c75023ed920d46fd71d0cbbb830b0ee012726b5b4f506fb6dea5b"
 dependencies = [
  "bytes 0.5.6",
- "futures 0.3.8",
+ "futures 0.3.9",
  "memchr",
  "pin-project 0.4.27",
 ]
@@ -2429,7 +2429,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16d7c5e361e6b05c882b4847dd98992534cebc6fcde7f4bc98225bcf10fd6d0d"
 dependencies = [
  "async-io",
- "futures 0.3.8",
+ "futures 0.3.9",
  "futures-lite",
  "if-addrs",
  "ipnet",
@@ -2516,7 +2516,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64fa110ec7b8f493f416eed552740d10e7030ad5f63b2308f82c9608ec2df275"
 dependencies = [
- "futures 0.3.8",
+ "futures 0.3.9",
  "futures-timer 2.0.2",
 ]
 
@@ -2787,7 +2787,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7bfe11b3202691673766b1224c432996f6b8047db17ceb743675bef3404e714"
 dependencies = [
- "futures 0.3.8",
+ "futures 0.3.9",
  "js-sys",
  "kvdb",
  "kvdb-memorydb",
@@ -2847,7 +2847,7 @@ checksum = "2e17c636b5fe5ff900ccc2840b643074bfac321551d821243a781d0d46f06588"
 dependencies = [
  "atomic",
  "bytes 0.5.6",
- "futures 0.3.8",
+ "futures 0.3.9",
  "lazy_static",
  "libp2p-core",
  "libp2p-core-derive",
@@ -2888,7 +2888,7 @@ dependencies = [
  "ed25519-dalek",
  "either",
  "fnv",
- "futures 0.3.8",
+ "futures 0.3.9",
  "futures-timer 3.0.2",
  "lazy_static",
  "libsecp256k1",
@@ -2928,7 +2928,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3257a41f376aa23f237231971fee7e350e4d8353cfcf233aef34d6d6b638f0c"
 dependencies = [
  "flate2",
- "futures 0.3.8",
+ "futures 0.3.9",
  "libp2p-core",
 ]
 
@@ -2938,7 +2938,7 @@ version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e09bab25af01326b4ed9486d31325911437448edda30bc57681502542d49f20"
 dependencies = [
- "futures 0.3.8",
+ "futures 0.3.9",
  "libp2p-core",
  "log",
 ]
@@ -2951,7 +2951,7 @@ checksum = "6fd8cdd5ef1dd0b7346975477216d752de976b92e43051bc8bd808c372ea6cec"
 dependencies = [
  "cuckoofilter",
  "fnv",
- "futures 0.3.8",
+ "futures 0.3.9",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -2971,7 +2971,7 @@ dependencies = [
  "byteorder",
  "bytes 0.5.6",
  "fnv",
- "futures 0.3.8",
+ "futures 0.3.9",
  "futures_codec",
  "hex_fmt",
  "libp2p-core",
@@ -2993,7 +2993,7 @@ version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c43bc51a9bc3780288c526615ba0f5f8216820ea6dcc02b89e8daee526c5fccb"
 dependencies = [
- "futures 0.3.8",
+ "futures 0.3.9",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3013,7 +3013,7 @@ dependencies = [
  "bytes 0.5.6",
  "either",
  "fnv",
- "futures 0.3.8",
+ "futures 0.3.9",
  "futures_codec",
  "libp2p-core",
  "libp2p-swarm",
@@ -3038,7 +3038,7 @@ dependencies = [
  "async-io",
  "data-encoding",
  "dns-parser",
- "futures 0.3.8",
+ "futures 0.3.9",
  "if-watch",
  "lazy_static",
  "libp2p-core",
@@ -3057,7 +3057,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce3200fbe6608e623bd9efa459cc8bafa0e4efbb0a2dfcdd0e1387ff4181264b"
 dependencies = [
  "bytes 0.5.6",
- "futures 0.3.8",
+ "futures 0.3.9",
  "futures_codec",
  "libp2p-core",
  "log",
@@ -3076,7 +3076,7 @@ checksum = "0580e0d18019d254c9c349c03ff7b22e564b6f2ada70c045fc39738e144f2139"
 dependencies = [
  "bytes 0.5.6",
  "curve25519-dalek 3.0.0",
- "futures 0.3.8",
+ "futures 0.3.9",
  "lazy_static",
  "libp2p-core",
  "log",
@@ -3096,7 +3096,7 @@ version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "50b2ec86a18cbf09d7df440e7786a2409640c774e476e9a3b4d031382c3d7588"
 dependencies = [
- "futures 0.3.8",
+ "futures 0.3.9",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3112,7 +3112,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a7b1bdcbe46a3a2159c231601ed29645282653c0a96ce3a2ad8352c9fbe6800"
 dependencies = [
  "bytes 0.5.6",
- "futures 0.3.8",
+ "futures 0.3.9",
  "futures_codec",
  "libp2p-core",
  "log",
@@ -3128,7 +3128,7 @@ version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ce3374f3b28162db9d3442c9347c4f14cb01e8290052615c7d341d40eae0599"
 dependencies = [
- "futures 0.3.8",
+ "futures 0.3.9",
  "log",
  "pin-project 1.0.2",
  "rand 0.7.3",
@@ -3144,7 +3144,7 @@ checksum = "620e2950decbf77554b5aed3824f7d0e2c04923f28c70f9bff1a402c47ef6b1e"
 dependencies = [
  "async-trait",
  "bytes 0.5.6",
- "futures 0.3.8",
+ "futures 0.3.9",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3163,7 +3163,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdf5894ee1ee63a38aa58d58a16e3dcf7ede6b59ea7b22302c00c1a41d7aec41"
 dependencies = [
  "either",
- "futures 0.3.8",
+ "futures 0.3.9",
  "libp2p-core",
  "log",
  "rand 0.7.3",
@@ -3179,7 +3179,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d2113a7dab2b502c55fe290910cd7399a2aa04fe70a2f5a415a87a1db600c0e"
 dependencies = [
  "async-std",
- "futures 0.3.8",
+ "futures 0.3.9",
  "futures-timer 3.0.2",
  "if-addrs",
  "ipnet",
@@ -3195,7 +3195,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af05fe92c2a3aa320bc82a308ddb7b33bef3b060154c5a4b9fb0b01f15385fc0"
 dependencies = [
  "async-std",
- "futures 0.3.8",
+ "futures 0.3.9",
  "libp2p-core",
  "log",
 ]
@@ -3206,7 +3206,7 @@ version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37cd44ea05a4523f40183f60ab6e6a80e400a5ddfc98b0df1c55edeb85576cd9"
 dependencies = [
- "futures 0.3.8",
+ "futures 0.3.9",
  "js-sys",
  "libp2p-core",
  "parity-send-wrapper",
@@ -3222,7 +3222,7 @@ checksum = "270c80528e21089ea25b41dd1ab8fd834bdf093ebee422fed3b68699a857a083"
 dependencies = [
  "async-tls",
  "either",
- "futures 0.3.8",
+ "futures 0.3.9",
  "libp2p-core",
  "log",
  "quicksink",
@@ -3240,7 +3240,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "36799de9092c35782f080032eddbc8de870f94a0def87cf9f8883efccd5cacf0"
 dependencies = [
- "futures 0.3.8",
+ "futures 0.3.9",
  "libp2p-core",
  "parking_lot 0.11.1",
  "thiserror",
@@ -3635,7 +3635,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dda822043bba2d6da31c4e14041f9794f8fb130a5959289038d0b809d8888614"
 dependencies = [
  "bytes 0.5.6",
- "futures 0.3.8",
+ "futures 0.3.9",
  "log",
  "pin-project 1.0.2",
  "smallvec 1.5.0",
@@ -3709,7 +3709,7 @@ version = "0.8.0"
 dependencies = [
  "derive_more",
  "fs_extra",
- "futures 0.3.8",
+ "futures 0.3.9",
  "hash-db",
  "hex",
  "kvdb",
@@ -3745,7 +3745,7 @@ dependencies = [
 name = "node-browser-testing"
 version = "2.0.0"
 dependencies = [
- "futures 0.3.8",
+ "futures 0.3.9",
  "futures-timer 3.0.2",
  "jsonrpc-core",
  "libp2p",
@@ -3766,7 +3766,7 @@ dependencies = [
  "frame-benchmarking-cli",
  "frame-support",
  "frame-system",
- "futures 0.3.8",
+ "futures 0.3.9",
  "hex-literal",
  "log",
  "nix",
@@ -4094,7 +4094,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "fs_extra",
- "futures 0.3.8",
+ "futures 0.3.9",
  "log",
  "node-executor",
  "node-primitives",
@@ -6416,7 +6416,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020"
 dependencies = [
- "futures 0.3.8",
+ "futures 0.3.9",
  "pin-project 0.4.27",
  "static_assertions",
 ]
@@ -6461,7 +6461,7 @@ dependencies = [
  "async-trait",
  "derive_more",
  "either",
- "futures 0.3.8",
+ "futures 0.3.9",
  "futures-timer 3.0.2",
  "libp2p",
  "log",
@@ -6489,7 +6489,7 @@ dependencies = [
 name = "sc-basic-authorship"
 version = "0.8.0"
 dependencies = [
- "futures 0.3.8",
+ "futures 0.3.9",
  "futures-timer 3.0.2",
  "log",
  "parity-scale-codec",
@@ -6566,7 +6566,7 @@ dependencies = [
  "atty",
  "chrono",
  "fdlimit",
- "futures 0.3.8",
+ "futures 0.3.9",
  "hex",
  "libp2p",
  "log",
@@ -6618,7 +6618,7 @@ version = "2.0.0"
 dependencies = [
  "derive_more",
  "fnv",
- "futures 0.3.8",
+ "futures 0.3.9",
  "hash-db",
  "kvdb",
  "kvdb-memorydb",
@@ -6698,7 +6698,7 @@ name = "sc-consensus-aura"
 version = "0.8.0"
 dependencies = [
  "derive_more",
- "futures 0.3.8",
+ "futures 0.3.9",
  "futures-timer 3.0.2",
  "getrandom 0.2.1",
  "log",
@@ -6739,7 +6739,7 @@ version = "0.8.0"
 dependencies = [
  "derive_more",
  "fork-tree",
- "futures 0.3.8",
+ "futures 0.3.9",
  "futures-timer 3.0.2",
  "log",
  "merlin",
@@ -6792,7 +6792,7 @@ name = "sc-consensus-babe-rpc"
 version = "0.8.0"
 dependencies = [
  "derive_more",
- "futures 0.3.8",
+ "futures 0.3.9",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -6834,7 +6834,7 @@ version = "0.8.0"
 dependencies = [
  "assert_matches",
  "derive_more",
- "futures 0.3.8",
+ "futures 0.3.9",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -6870,7 +6870,7 @@ name = "sc-consensus-pow"
 version = "0.8.0"
 dependencies = [
  "derive_more",
- "futures 0.3.8",
+ "futures 0.3.9",
  "futures-timer 3.0.2",
  "log",
  "parity-scale-codec",
@@ -6892,7 +6892,7 @@ dependencies = [
 name = "sc-consensus-slots"
 version = "0.8.0"
 dependencies = [
- "futures 0.3.8",
+ "futures 0.3.9",
  "futures-timer 3.0.2",
  "log",
  "parity-scale-codec",
@@ -7022,7 +7022,7 @@ dependencies = [
  "derive_more",
  "finality-grandpa",
  "fork-tree",
- "futures 0.3.8",
+ "futures 0.3.9",
  "futures-timer 3.0.2",
  "log",
  "parity-scale-codec",
@@ -7065,7 +7065,7 @@ version = "0.8.0"
 dependencies = [
  "derive_more",
  "finality-grandpa",
- "futures 0.3.8",
+ "futures 0.3.9",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -7094,7 +7094,7 @@ name = "sc-informant"
 version = "0.8.0"
 dependencies = [
  "ansi_term 0.12.1",
- "futures 0.3.8",
+ "futures 0.3.9",
  "log",
  "parity-util-mem",
  "sc-client-api",
@@ -7112,7 +7112,7 @@ version = "2.0.0"
 dependencies = [
  "async-trait",
  "derive_more",
- "futures 0.3.8",
+ "futures 0.3.9",
  "futures-util",
  "hex",
  "merlin",
@@ -7159,7 +7159,7 @@ dependencies = [
  "erased-serde",
  "fnv",
  "fork-tree",
- "futures 0.3.8",
+ "futures 0.3.9",
  "futures-timer 3.0.2",
  "futures_codec",
  "hex",
@@ -7209,7 +7209,7 @@ name = "sc-network-gossip"
 version = "0.8.0"
 dependencies = [
  "async-std",
- "futures 0.3.8",
+ "futures 0.3.9",
  "futures-timer 3.0.2",
  "libp2p",
  "log",
@@ -7227,7 +7227,7 @@ name = "sc-network-test"
 version = "0.8.0"
 dependencies = [
  "async-std",
- "futures 0.3.8",
+ "futures 0.3.9",
  "futures-timer 3.0.2",
  "libp2p",
  "log",
@@ -7255,7 +7255,7 @@ version = "2.0.0"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
- "futures 0.3.8",
+ "futures 0.3.9",
  "futures-timer 3.0.2",
  "hyper 0.13.9",
  "hyper-rustls",
@@ -7286,7 +7286,7 @@ dependencies = [
 name = "sc-peerset"
 version = "2.0.0"
 dependencies = [
- "futures 0.3.8",
+ "futures 0.3.9",
  "libp2p",
  "log",
  "rand 0.7.3",
@@ -7309,7 +7309,7 @@ version = "2.0.0"
 dependencies = [
  "assert_matches",
  "futures 0.1.30",
- "futures 0.3.8",
+ "futures 0.3.9",
  "hash-db",
  "jsonrpc-core",
  "jsonrpc-pubsub",
@@ -7350,7 +7350,7 @@ name = "sc-rpc-api"
 version = "0.8.0"
 dependencies = [
  "derive_more",
- "futures 0.3.8",
+ "futures 0.3.9",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -7407,7 +7407,7 @@ dependencies = [
  "directories 3.0.1",
  "exit-future",
  "futures 0.1.30",
- "futures 0.3.8",
+ "futures 0.3.9",
  "futures-timer 3.0.2",
  "hash-db",
  "jsonrpc-core",
@@ -7475,7 +7475,7 @@ version = "2.0.0"
 dependencies = [
  "fdlimit",
  "futures 0.1.30",
- "futures 0.3.8",
+ "futures 0.3.9",
  "hex-literal",
  "log",
  "parity-scale-codec",
@@ -7542,7 +7542,7 @@ dependencies = [
 name = "sc-telemetry"
 version = "2.0.0"
 dependencies = [
- "futures 0.3.8",
+ "futures 0.3.9",
  "futures-timer 3.0.2",
  "libp2p",
  "log",
@@ -7588,7 +7588,7 @@ dependencies = [
  "assert_matches",
  "criterion",
  "derive_more",
- "futures 0.3.8",
+ "futures 0.3.9",
  "linked-hash-map",
  "log",
  "parity-scale-codec",
@@ -7611,7 +7611,7 @@ name = "sc-transaction-pool"
 version = "2.0.0"
 dependencies = [
  "assert_matches",
- "futures 0.3.8",
+ "futures 0.3.9",
  "futures-diagnose",
  "hex",
  "intervalier",
@@ -8046,7 +8046,7 @@ dependencies = [
  "base64 0.12.3",
  "bytes 0.5.6",
  "flate2",
- "futures 0.3.8",
+ "futures 0.3.9",
  "httparse",
  "log",
  "rand 0.7.3",
@@ -8196,7 +8196,7 @@ dependencies = [
 name = "sp-blockchain"
 version = "2.0.0"
 dependencies = [
- "futures 0.3.8",
+ "futures 0.3.9",
  "log",
  "lru",
  "parity-scale-codec",
@@ -8221,7 +8221,7 @@ dependencies = [
 name = "sp-consensus"
 version = "0.8.0"
 dependencies = [
- "futures 0.3.8",
+ "futures 0.3.9",
  "futures-timer 3.0.2",
  "libp2p",
  "log",
@@ -8315,7 +8315,7 @@ dependencies = [
  "criterion",
  "dyn-clonable",
  "ed25519-dalek",
- "futures 0.3.8",
+ "futures 0.3.9",
  "hash-db",
  "hash256-std-hasher",
  "hex",
@@ -8412,7 +8412,7 @@ dependencies = [
 name = "sp-io"
 version = "2.0.0"
 dependencies = [
- "futures 0.3.8",
+ "futures 0.3.9",
  "hash-db",
  "libsecp256k1",
  "log",
@@ -8447,7 +8447,7 @@ version = "0.8.0"
 dependencies = [
  "async-trait",
  "derive_more",
- "futures 0.3.8",
+ "futures 0.3.9",
  "merlin",
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -8752,7 +8752,7 @@ name = "sp-transaction-pool"
 version = "2.0.0"
 dependencies = [
  "derive_more",
- "futures 0.3.8",
+ "futures 0.3.9",
  "log",
  "parity-scale-codec",
  "serde",
@@ -8784,7 +8784,7 @@ dependencies = [
 name = "sp-utils"
 version = "2.0.0"
 dependencies = [
- "futures 0.3.8",
+ "futures 0.3.9",
  "futures-core",
  "futures-timer 3.0.2",
  "lazy_static",
@@ -8938,7 +8938,7 @@ dependencies = [
  "console_error_panic_hook",
  "console_log",
  "futures 0.1.30",
- "futures 0.3.8",
+ "futures 0.3.9",
  "futures-timer 3.0.2",
  "getrandom 0.2.1",
  "js-sys",
@@ -8979,7 +8979,7 @@ version = "2.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
- "futures 0.3.8",
+ "futures 0.3.9",
  "jsonrpc-client-transports",
  "jsonrpc-core",
  "parity-scale-codec",
@@ -8994,7 +8994,7 @@ name = "substrate-frame-rpc-system"
 version = "2.0.0"
 dependencies = [
  "frame-system-rpc-runtime-api",
- "futures 0.3.8",
+ "futures 0.3.9",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -9032,7 +9032,7 @@ name = "substrate-test-client"
 version = "2.0.0"
 dependencies = [
  "futures 0.1.30",
- "futures 0.3.8",
+ "futures 0.3.9",
  "hash-db",
  "hex",
  "parity-scale-codec",
@@ -9101,7 +9101,7 @@ dependencies = [
 name = "substrate-test-runtime-client"
 version = "2.0.0"
 dependencies = [
- "futures 0.3.8",
+ "futures 0.3.9",
  "parity-scale-codec",
  "sc-block-builder",
  "sc-client-api",
@@ -9122,7 +9122,7 @@ name = "substrate-test-runtime-transaction-pool"
 version = "2.0.0"
 dependencies = [
  "derive_more",
- "futures 0.3.8",
+ "futures 0.3.9",
  "parity-scale-codec",
  "parking_lot 0.11.1",
  "sc-transaction-graph",
@@ -9136,7 +9136,7 @@ dependencies = [
 name = "substrate-test-utils"
 version = "2.0.0"
 dependencies = [
- "futures 0.3.8",
+ "futures 0.3.9",
  "sc-service",
  "substrate-test-utils-derive",
  "tokio 0.2.23",
@@ -10147,7 +10147,7 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f"
 dependencies = [
- "futures 0.3.8",
+ "futures 0.3.9",
  "js-sys",
  "parking_lot 0.11.1",
  "pin-utils",
@@ -10482,7 +10482,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9aeb8c4043cac71c3c299dff107171c220d179492350ea198e109a414981b83c"
 dependencies = [
- "futures 0.3.8",
+ "futures 0.3.9",
  "log",
  "nohash-hasher",
  "parking_lot 0.11.1",
diff --git a/bin/node/browser-testing/Cargo.toml b/bin/node/browser-testing/Cargo.toml
index e29f104f87e4..db64da19a15c 100644
--- a/bin/node/browser-testing/Cargo.toml
+++ b/bin/node/browser-testing/Cargo.toml
@@ -15,7 +15,7 @@ serde_json = "1.0.48"
 wasm-bindgen = { version = "=0.2.69", features = ["serde-serialize"] }
 wasm-bindgen-futures = "0.4.18"
 wasm-bindgen-test = "0.3.18"
-futures = "0.3.4"
+futures = "0.3.9"
 
 node-cli = { path = "../cli", default-features = false, features = ["browser"] , version = "2.0.0"}
 sc-rpc-api = { path = "../../../client/rpc-api" , version = "0.8.0"}
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index 773934e95fa3..519ea9661b58 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -117,7 +117,7 @@ sc-consensus = { version = "0.8.0", path = "../../../client/consensus/common" }
 sc-consensus-babe = { version = "0.8.0", features = ["test-helpers"], path = "../../../client/consensus/babe" }
 sc-consensus-epochs = { version = "0.8.0", path = "../../../client/consensus/epochs" }
 sc-service-test = { version = "2.0.0", path = "../../../client/service/test" }
-futures = "0.3.4"
+futures = "0.3.9"
 tempfile = "3.1.0"
 assert_cmd = "1.0"
 nix = "0.17"
diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml
index 5c1d0b9d91f8..dd356663f032 100644
--- a/client/authority-discovery/Cargo.toml
+++ b/client/authority-discovery/Cargo.toml
@@ -21,7 +21,7 @@ async-trait = "0.1"
 codec = { package = "parity-scale-codec", default-features = false, version = "1.3.4" }
 derive_more = "0.99.2"
 either = "1.5.3"
-futures = "0.3.4"
+futures = "0.3.9"
 futures-timer = "3.0.1"
 libp2p = { version = "0.33.0", default-features = false, features = ["kad"] }
 log = "0.4.8"
diff --git a/client/basic-authorship/Cargo.toml b/client/basic-authorship/Cargo.toml
index f8d2c2f16c71..62ba6a55da13 100644
--- a/client/basic-authorship/Cargo.toml
+++ b/client/basic-authorship/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "1.3.4" }
-futures = "0.3.4"
+futures = "0.3.9"
 futures-timer = "3.0.1"
 log = "0.4.8"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.8.0"}
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index cd8afb1cce1e..5baef9156574 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -17,7 +17,7 @@ log = "0.4.11"
 atty = "0.2.13"
 regex = "1.4.2"
 tokio = { version = "0.2.21", features = [ "signal", "rt-core", "rt-threaded", "blocking" ] }
-futures = "0.3.4"
+futures = "0.3.9"
 fdlimit = "0.2.1"
 libp2p = "0.33.0"
 parity-scale-codec = "1.3.0"
diff --git a/client/consensus/aura/Cargo.toml b/client/consensus/aura/Cargo.toml
index b7bdf220d90c..d85b0e2797d3 100644
--- a/client/consensus/aura/Cargo.toml
+++ b/client/consensus/aura/Cargo.toml
@@ -21,7 +21,7 @@ sc-client-api = { version = "2.0.0", path = "../../api" }
 codec = { package = "parity-scale-codec", version = "1.3.4" }
 sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
 derive_more = "0.99.2"
-futures = "0.3.4"
+futures = "0.3.9"
 futures-timer = "3.0.1"
 sp-inherents = { version = "2.0.0", path = "../../../primitives/inherents" }
 log = "0.4.8"
diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml
index 1b97ba68cc84..161c13df4bc0 100644
--- a/client/consensus/babe/Cargo.toml
+++ b/client/consensus/babe/Cargo.toml
@@ -42,7 +42,7 @@ sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
 sp-utils = { version = "2.0.0", path = "../../../primitives/utils" }
 fork-tree = { version = "2.0.0", path = "../../../utils/fork-tree" }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.8.0"}
-futures = "0.3.4"
+futures = "0.3.9"
 futures-timer = "3.0.1"
 parking_lot = "0.11.1"
 log = "0.4.8"
diff --git a/client/consensus/manual-seal/Cargo.toml b/client/consensus/manual-seal/Cargo.toml
index 80dbed3668c0..358730cf26f8 100644
--- a/client/consensus/manual-seal/Cargo.toml
+++ b/client/consensus/manual-seal/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 derive_more = "0.99.2"
-futures = "0.3.4"
+futures = "0.3.9"
 jsonrpc-core = "15.1.0"
 jsonrpc-core-client = "15.1.0"
 jsonrpc-derive = "15.1.0"
diff --git a/client/consensus/slots/Cargo.toml b/client/consensus/slots/Cargo.toml
index 35b08444d45d..1a43448ceb3d 100644
--- a/client/consensus/slots/Cargo.toml
+++ b/client/consensus/slots/Cargo.toml
@@ -28,7 +28,7 @@ sp-api = { version = "2.0.0", path = "../../../primitives/api" }
 sc-telemetry = { version = "2.0.0", path = "../../telemetry" }
 sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
 sp-inherents = { version = "2.0.0", path = "../../../primitives/inherents" }
-futures = "0.3.4"
+futures = "0.3.9"
 futures-timer = "3.0.1"
 parking_lot = "0.11.1"
 log = "0.4.11"
diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml
index 69744691b820..7898e87c6c23 100644
--- a/client/finality-grandpa/Cargo.toml
+++ b/client/finality-grandpa/Cargo.toml
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 derive_more = "0.99.2"
 fork-tree = { version = "2.0.0", path = "../../utils/fork-tree" }
-futures = "0.3.4"
+futures = "0.3.9"
 futures-timer = "3.0.1"
 log = "0.4.8"
 parking_lot = "0.11.1"
diff --git a/client/informant/Cargo.toml b/client/informant/Cargo.toml
index 7cc321e4001f..816927a69cf5 100644
--- a/client/informant/Cargo.toml
+++ b/client/informant/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 ansi_term = "0.12.1"
-futures = "0.3.4"
+futures = "0.3.9"
 log = "0.4.8"
 parity-util-mem = { version = "0.8.0", default-features = false, features = ["primitive-types"] }
 sc-client-api = { version = "2.0.0", path = "../api" }
diff --git a/client/keystore/Cargo.toml b/client/keystore/Cargo.toml
index d4d06b6f48d4..ba0585419288 100644
--- a/client/keystore/Cargo.toml
+++ b/client/keystore/Cargo.toml
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 async-trait = "0.1.30"
 derive_more = "0.99.2"
-futures = "0.3.4"
+futures = "0.3.9"
 futures-util = "0.3.4"
 sp-application-crypto = { version = "2.0.0", path = "../../primitives/application-crypto" }
 sp-core = { version = "2.0.0", path = "../../primitives/core" }
diff --git a/client/network-gossip/Cargo.toml b/client/network-gossip/Cargo.toml
index 5c3990d320bb..15d4db9075b9 100644
--- a/client/network-gossip/Cargo.toml
+++ b/client/network-gossip/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 
 [dependencies]
-futures = "0.3.4"
+futures = "0.3.9"
 futures-timer = "3.0.1"
 libp2p = { version = "0.33.0", default-features = false }
 log = "0.4.8"
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index a300dac19bfc..c333c451b501 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -28,7 +28,7 @@ either = "1.5.3"
 erased-serde = "0.3.9"
 fnv = "1.0.6"
 fork-tree = { version = "2.0.0", path = "../../utils/fork-tree" }
-futures = "0.3.4"
+futures = "0.3.9"
 futures-timer = "3.0.2"
 futures_codec = "0.4.0"
 hex = "0.4.0"
diff --git a/client/network/test/Cargo.toml b/client/network/test/Cargo.toml
index e9f49021bbf5..537e3378dbda 100644
--- a/client/network/test/Cargo.toml
+++ b/client/network/test/Cargo.toml
@@ -17,7 +17,7 @@ async-std = "1.6.5"
 sc-network = { version = "0.8.0", path = "../" }
 log = "0.4.8"
 parking_lot = "0.11.1"
-futures = "0.3.4"
+futures = "0.3.9"
 futures-timer = "3.0.1"
 rand = "0.7.2"
 libp2p = { version = "0.33.0", default-features = false }
diff --git a/client/offchain/Cargo.toml b/client/offchain/Cargo.toml
index c78aed367034..9fc8c68b9ce6 100644
--- a/client/offchain/Cargo.toml
+++ b/client/offchain/Cargo.toml
@@ -17,7 +17,7 @@ bytes = "0.5"
 sc-client-api = { version = "2.0.0", path = "../api" }
 sp-api = { version = "2.0.0", path = "../../primitives/api" }
 fnv = "1.0.6"
-futures = "0.3.4"
+futures = "0.3.9"
 futures-timer = "3.0.1"
 log = "0.4.8"
 threadpool = "1.7"
diff --git a/client/offchain/src/api/timestamp.rs b/client/offchain/src/api/timestamp.rs
index 31370d4f733c..6ea0f000f8d1 100644
--- a/client/offchain/src/api/timestamp.rs
+++ b/client/offchain/src/api/timestamp.rs
@@ -52,7 +52,7 @@ pub fn timestamp_from_now(timestamp: Timestamp) -> Duration {
 /// If `None`, returns a never-ending `Future`.
 pub fn deadline_to_future(
 	deadline: Option<Timestamp>,
-) -> futures::future::MaybeDone<impl futures::Future> {
+) -> futures::future::MaybeDone<impl futures::Future<Output = ()>> {
 	use futures::future::{self, Either};
 
 	future::maybe_done(match deadline.map(timestamp_from_now) {
diff --git a/client/peerset/Cargo.toml b/client/peerset/Cargo.toml
index 92a4cf27753c..29d33b851793 100644
--- a/client/peerset/Cargo.toml
+++ b/client/peerset/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 
 [dependencies]
-futures = "0.3.4"
+futures = "0.3.9"
 libp2p = { version = "0.33.0", default-features = false }
 sp-utils = { version = "2.0.0", path = "../../primitives/utils"}
 log = "0.4.8"
diff --git a/client/telemetry/Cargo.toml b/client/telemetry/Cargo.toml
index 3affd8e98456..fff25661e5ff 100644
--- a/client/telemetry/Cargo.toml
+++ b/client/telemetry/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 parking_lot = "0.11.1"
-futures = "0.3.4"
+futures = "0.3.9"
 futures-timer = "3.0.1"
 wasm-timer = "0.2.5"
 libp2p = { version = "0.33.0", default-features = false, features = ["dns", "tcp-async-std", "wasm-ext", "websocket"] }
diff --git a/client/transaction-pool/graph/Cargo.toml b/client/transaction-pool/graph/Cargo.toml
index 06b6b587eb9c..28afbe36fab3 100644
--- a/client/transaction-pool/graph/Cargo.toml
+++ b/client/transaction-pool/graph/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 derive_more = "0.99.2"
 thiserror = "1.0.21"
-futures = "0.3.4"
+futures = "0.3.9"
 log = "0.4.8"
 parking_lot = "0.11.1"
 serde = { version = "1.0.101", features = ["derive"] }
diff --git a/primitives/blockchain/Cargo.toml b/primitives/blockchain/Cargo.toml
index 137a8a79791f..1be4331db1c0 100644
--- a/primitives/blockchain/Cargo.toml
+++ b/primitives/blockchain/Cargo.toml
@@ -18,7 +18,7 @@ log = "0.4.11"
 lru = "0.6.1"
 parking_lot = "0.11.1"
 thiserror = "1.0.21"
-futures = "0.3"
+futures = "0.3.9"
 codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
 sp-consensus = { version = "0.8.0", path = "../consensus/common" }
 sp-runtime = { version = "2.0.0", path = "../runtime" }
diff --git a/primitives/consensus/common/Cargo.toml b/primitives/consensus/common/Cargo.toml
index 360b3c6021a3..1f6a993886d3 100644
--- a/primitives/consensus/common/Cargo.toml
+++ b/primitives/consensus/common/Cargo.toml
@@ -36,7 +36,7 @@ prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../..
 wasm-timer = "0.2.5"
 
 [dev-dependencies]
-futures = "0.3.4"
+futures = "0.3.9"
 sp-test-primitives = { version = "2.0.0", path = "../../test-primitives" }
 
 [features]
diff --git a/primitives/utils/Cargo.toml b/primitives/utils/Cargo.toml
index 80329d2e59ea..7a02d1c0e98d 100644
--- a/primitives/utils/Cargo.toml
+++ b/primitives/utils/Cargo.toml
@@ -10,7 +10,7 @@ description = "I/O for Substrate runtimes"
 readme = "README.md"
 
 [dependencies]
-futures = "0.3.4"
+futures = "0.3.9"
 futures-core = "0.3.4"
 lazy_static = "1.4.0"
 prometheus = { version = "0.10.0", default-features = false }
diff --git a/test-utils/client/Cargo.toml b/test-utils/client/Cargo.toml
index 07d28660f618..8b8f06d5273e 100644
--- a/test-utils/client/Cargo.toml
+++ b/test-utils/client/Cargo.toml
@@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "1.3.1" }
-futures = "0.3.4"
+futures = "0.3.9"
 futures01 = { package = "futures", version = "0.1.29" }
 hash-db = "0.15.2"
 hex = "0.4"
diff --git a/test-utils/runtime/client/Cargo.toml b/test-utils/runtime/client/Cargo.toml
index b310bbe7a709..c798cdca1f3f 100644
--- a/test-utils/runtime/client/Cargo.toml
+++ b/test-utils/runtime/client/Cargo.toml
@@ -25,4 +25,4 @@ codec = { package = "parity-scale-codec", version = "1.3.1" }
 sc-client-api = { version = "2.0.0", path = "../../../client/api" }
 sc-consensus = { version = "0.8.0", path = "../../../client/consensus/common" }
 sc-service = { version = "0.8.0", default-features = false, path = "../../../client/service" }
-futures = "0.3.4"
+futures = "0.3.9"

From d1923a4bc1eded37e57062f8b501c646e5321221 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Fri, 8 Jan 2021 12:04:46 -0400
Subject: [PATCH 0244/1194] Store dispatch info of calls locally in weight
 calculation (#7849)

* utility

* sudo

* more

* recovery

* better formatting
---
 frame/multisig/src/lib.rs | 17 +++++++-----
 frame/recovery/src/lib.rs | 17 +++++++-----
 frame/sudo/src/lib.rs     | 22 +++++++++------
 frame/utility/src/lib.rs  | 57 ++++++++++++++++++++++-----------------
 4 files changed, 66 insertions(+), 47 deletions(-)

diff --git a/frame/multisig/src/lib.rs b/frame/multisig/src/lib.rs
index f58fe549fe50..a015f291bc71 100644
--- a/frame/multisig/src/lib.rs
+++ b/frame/multisig/src/lib.rs
@@ -223,13 +223,16 @@ decl_module! {
 		/// - DB Weight: None
 		/// - Plus Call Weight
 		/// # </weight>
-		#[weight = (
-			T::WeightInfo::as_multi_threshold_1(call.using_encoded(|c| c.len() as u32))
-				.saturating_add(call.get_dispatch_info().weight)
-				 // AccountData for inner call origin accountdata.
-				.saturating_add(T::DbWeight::get().reads_writes(1, 1)),
-			call.get_dispatch_info().class,
-		)]
+		#[weight = {
+			let dispatch_info = call.get_dispatch_info();
+			(
+				T::WeightInfo::as_multi_threshold_1(call.using_encoded(|c| c.len() as u32))
+					.saturating_add(dispatch_info.weight)
+					// AccountData for inner call origin accountdata.
+					.saturating_add(T::DbWeight::get().reads_writes(1, 1)),
+				dispatch_info.class,
+			)
+		}]
 		fn as_multi_threshold_1(origin,
 			other_signatories: Vec<T::AccountId>,
 			call: Box<<T as Config>::Call>,
diff --git a/frame/recovery/src/lib.rs b/frame/recovery/src/lib.rs
index 7cd1eb4b028b..606cb8225077 100644
--- a/frame/recovery/src/lib.rs
+++ b/frame/recovery/src/lib.rs
@@ -352,13 +352,16 @@ decl_module! {
 		/// - The weight of the `call` + 10,000.
 		/// - One storage lookup to check account is recovered by `who`. O(1)
 		/// # </weight>
-		#[weight = (
-			call.get_dispatch_info().weight
-				.saturating_add(10_000)
-				 // AccountData for inner call origin accountdata.
-				.saturating_add(T::DbWeight::get().reads_writes(1, 1)),
-			call.get_dispatch_info().class
-		)]
+		#[weight = {
+			let dispatch_info = call.get_dispatch_info();
+			(
+				dispatch_info.weight
+					.saturating_add(10_000)
+					// AccountData for inner call origin accountdata.
+					.saturating_add(T::DbWeight::get().reads_writes(1, 1)),
+				dispatch_info.class,
+			)
+		}]
 		fn as_recovered(origin,
 			account: T::AccountId,
 			call: Box<<T as Config>::Call>
diff --git a/frame/sudo/src/lib.rs b/frame/sudo/src/lib.rs
index 1d20fd2bb77b..c7cc38a81c13 100644
--- a/frame/sudo/src/lib.rs
+++ b/frame/sudo/src/lib.rs
@@ -130,7 +130,10 @@ decl_module! {
 		/// - One DB write (event).
 		/// - Weight of derivative `call` execution + 10,000.
 		/// # </weight>
-		#[weight = (call.get_dispatch_info().weight + 10_000, call.get_dispatch_info().class)]
+		#[weight = {
+			let dispatch_info = call.get_dispatch_info();
+			(dispatch_info.weight.saturating_add(10_000), dispatch_info.class)
+		}]
 		fn sudo(origin, call: Box<<T as Config>::Call>) -> DispatchResultWithPostInfo {
 			// This is a public call, so we ensure that the origin is some signed account.
 			let sender = ensure_signed(origin)?;
@@ -197,13 +200,16 @@ decl_module! {
 		/// - One DB write (event).
 		/// - Weight of derivative `call` execution + 10,000.
 		/// # </weight>
-		#[weight = (
-			call.get_dispatch_info().weight
-				.saturating_add(10_000)
-				 // AccountData for inner call origin accountdata.
-				.saturating_add(T::DbWeight::get().reads_writes(1, 1)),
-			call.get_dispatch_info().class
-		)]
+		#[weight = {
+			let dispatch_info = call.get_dispatch_info();
+			(
+				dispatch_info.weight
+					.saturating_add(10_000)
+					// AccountData for inner call origin accountdata.
+					.saturating_add(T::DbWeight::get().reads_writes(1, 1)),
+				dispatch_info.class,
+			)
+		}]
 		fn sudo_as(origin,
 			who: <T::Lookup as StaticLookup>::Source,
 			call: Box<<T as Config>::Call>
diff --git a/frame/utility/src/lib.rs b/frame/utility/src/lib.rs
index 2286c64fcf3b..28345e5ffe72 100644
--- a/frame/utility/src/lib.rs
+++ b/frame/utility/src/lib.rs
@@ -133,22 +133,24 @@ decl_module! {
 		/// `BatchInterrupted` event is deposited, along with the number of successful calls made
 		/// and the error of the failed call. If all were successful, then the `BatchCompleted`
 		/// event is deposited.
-		#[weight = (
-			calls.iter()
-				.map(|call| call.get_dispatch_info().weight)
+		#[weight = {
+			let dispatch_infos = calls.iter().map(|call| call.get_dispatch_info()).collect::<Vec<_>>();
+			let dispatch_weight = dispatch_infos.iter()
+				.map(|di| di.weight)
 				.fold(0, |total: Weight, weight: Weight| total.saturating_add(weight))
-				.saturating_add(T::WeightInfo::batch(calls.len() as u32)),
-			{
-				let all_operational = calls.iter()
-					.map(|call| call.get_dispatch_info().class)
+				.saturating_add(T::WeightInfo::batch(calls.len() as u32));
+			let dispatch_class = {
+				let all_operational = dispatch_infos.iter()
+					.map(|di| di.class)
 					.all(|class| class == DispatchClass::Operational);
 				if all_operational {
 					DispatchClass::Operational
 				} else {
 					DispatchClass::Normal
 				}
-			},
-		)]
+			};
+			(dispatch_weight, dispatch_class)
+		}]
 		fn batch(origin, calls: Vec<<T as Config>::Call>) -> DispatchResultWithPostInfo {
 			let is_root = ensure_root(origin.clone()).is_ok();
 			let calls_len = calls.len();
@@ -190,13 +192,16 @@ decl_module! {
 		/// NOTE: Prior to version *12, this was called `as_limited_sub`.
 		///
 		/// The dispatch origin for this call must be _Signed_.
-		#[weight = (
-			T::WeightInfo::as_derivative()
-				.saturating_add(call.get_dispatch_info().weight)
-				 // AccountData for inner call origin accountdata.
-				.saturating_add(T::DbWeight::get().reads_writes(1, 1)),
-			call.get_dispatch_info().class,
-		)]
+		#[weight = {
+			let dispatch_info = call.get_dispatch_info();
+			(
+				T::WeightInfo::as_derivative()
+					.saturating_add(dispatch_info.weight)
+					// AccountData for inner call origin accountdata.
+					.saturating_add(T::DbWeight::get().reads_writes(1, 1)),
+				dispatch_info.class,
+			)
+		}]
 		fn as_derivative(origin, index: u16, call: Box<<T as Config>::Call>) -> DispatchResultWithPostInfo {
 			let mut origin = origin;
 			let who = ensure_signed(origin.clone())?;
@@ -227,22 +232,24 @@ decl_module! {
 		/// # <weight>
 		/// - Complexity: O(C) where C is the number of calls to be batched.
 		/// # </weight>
-		#[weight = (
-			calls.iter()
-				.map(|call| call.get_dispatch_info().weight)
+		#[weight = {
+			let dispatch_infos = calls.iter().map(|call| call.get_dispatch_info()).collect::<Vec<_>>();
+			let dispatch_weight = dispatch_infos.iter()
+				.map(|di| di.weight)
 				.fold(0, |total: Weight, weight: Weight| total.saturating_add(weight))
-				.saturating_add(T::WeightInfo::batch_all(calls.len() as u32)),
-			{
-				let all_operational = calls.iter()
-					.map(|call| call.get_dispatch_info().class)
+				.saturating_add(T::WeightInfo::batch_all(calls.len() as u32));
+			let dispatch_class = {
+				let all_operational = dispatch_infos.iter()
+					.map(|di| di.class)
 					.all(|class| class == DispatchClass::Operational);
 				if all_operational {
 					DispatchClass::Operational
 				} else {
 					DispatchClass::Normal
 				}
-			},
-		)]
+			};
+			(dispatch_weight, dispatch_class)
+		}]
 		#[transactional]
 		fn batch_all(origin, calls: Vec<<T as Config>::Call>) -> DispatchResultWithPostInfo {
 			let is_root = ensure_root(origin.clone()).is_ok();

From 5f3db3359ae822a1ea610059e93976c6b3dfcdde Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Fri, 8 Jan 2021 17:22:55 +0100
Subject: [PATCH 0245/1194] client/network: Re-enable light_client_handler.rs
 unit tests (#7853)

---
 client/network/src/light_client_handler.rs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/client/network/src/light_client_handler.rs b/client/network/src/light_client_handler.rs
index 3974d3ecd7c3..1062236e25eb 100644
--- a/client/network/src/light_client_handler.rs
+++ b/client/network/src/light_client_handler.rs
@@ -1301,8 +1301,7 @@ fn fmt_keys(first: Option<&Vec<u8>>, last: Option<&Vec<u8>>) -> String {
 	}
 }
 
-// TODO:
-/*#[cfg(test)]
+#[cfg(test)]
 mod tests {
 	use super::*;
 	use async_std::task;
@@ -1489,14 +1488,14 @@ mod tests {
 	}
 
 	fn peerset() -> (sc_peerset::Peerset, sc_peerset::PeersetHandle) {
-		let cfg = sc_peerset::PeersetConfig {
+		let cfg = sc_peerset::SetConfig {
 			in_peers: 128,
 			out_peers: 128,
-			bootnodes: Vec::new(),
+			bootnodes: Default::default(),
 			reserved_only: false,
-			priority_groups: Vec::new(),
+			reserved_nodes: Default::default(),
 		};
-		sc_peerset::Peerset::from_config(cfg)
+		sc_peerset::Peerset::from_config(sc_peerset::PeersetConfig{ sets: vec![cfg] })
 	}
 
 	fn make_behaviour
@@ -2059,4 +2058,4 @@ mod tests {
 				.contains(BlockAttributes::BODY)
 		);
 	}
-}*/
+}

From fa404167bbfe7bfd459689d25fc19b86da698367 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Fri, 8 Jan 2021 20:32:49 +0100
Subject: [PATCH 0246/1194] Fix max log level (#7851)

With the switch to tracing we did not set the `max_log_level` anymore.
This resulted in a performance degradation as logging did not early
exited and thus, `trace` logs were at least resolved every time.

This pr fixes it by ensuring that we set the correct max log level.
---
 client/cli/src/lib.rs | 78 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 66 insertions(+), 12 deletions(-)

diff --git a/client/cli/src/lib.rs b/client/cli/src/lib.rs
index 1402e5e7ae44..bf8be8a4e77b 100644
--- a/client/cli/src/lib.rs
+++ b/client/cli/src/lib.rs
@@ -279,9 +279,6 @@ pub fn init_logger(
 		Ok(env_filter)
 	}
 
-	tracing_log::LogTracer::init()
-		.map_err(|e| format!("Registering Substrate logger failed: {:}!", e))?;
-
 	// Initialize filter - ensure to use `parse_default_directive` for any defaults to persist
 	// after log filter reloading by RPC
 	let mut env_filter = EnvFilter::default()
@@ -313,22 +310,43 @@ pub fn init_logger(
 		env_filter = parse_user_directives(env_filter, &pattern)?;
 	}
 
+	let max_level_hint = Layer::<FmtSubscriber>::max_level_hint(&env_filter);
+
+	let max_level = if tracing_targets.is_some() {
+		// If profiling is activated, we require `trace` logging.
+		log::LevelFilter::Trace
+	} else {
+		match max_level_hint {
+			Some(tracing_subscriber::filter::LevelFilter::INFO) | None => log::LevelFilter::Info,
+			Some(tracing_subscriber::filter::LevelFilter::TRACE) => log::LevelFilter::Trace,
+			Some(tracing_subscriber::filter::LevelFilter::WARN) => log::LevelFilter::Warn,
+			Some(tracing_subscriber::filter::LevelFilter::ERROR) => log::LevelFilter::Error,
+			Some(tracing_subscriber::filter::LevelFilter::DEBUG) => log::LevelFilter::Debug,
+			Some(tracing_subscriber::filter::LevelFilter::OFF) => log::LevelFilter::Off,
+		}
+	};
+
+	tracing_log::LogTracer::builder()
+		.with_max_level(max_level)
+		.init()
+		.map_err(|e| format!("Registering Substrate logger failed: {:}!", e))?;
+
 	// If we're only logging `INFO` entries then we'll use a simplified logging format.
-	let simple = match Layer::<FmtSubscriber>::max_level_hint(&env_filter) {
+	let simple = match max_level_hint {
 		Some(level) if level <= tracing_subscriber::filter::LevelFilter::INFO => true,
 		_ => false,
 	};
 
-	// Always log the special target `sc_tracing`, overrides global level.
-	// Required because profiling traces are emitted via `sc_tracing`
-	// NOTE: this must be done after we check the `max_level_hint` otherwise
-	// it is always raised to `TRACE`.
-	env_filter = env_filter.add_directive(
-		parse_default_directive("sc_tracing=trace").expect("provided directive is valid")
-	);
-
 	// Make sure to include profiling targets in the filter
 	if let Some(tracing_targets) = tracing_targets.clone() {
+		// Always log the special target `sc_tracing`, overrides global level.
+		// Required because profiling traces are emitted via `sc_tracing`
+		// NOTE: this must be done after we check the `max_level_hint` otherwise
+		// it is always raised to `TRACE`.
+		env_filter = env_filter.add_directive(
+			parse_default_directive("sc_tracing=trace").expect("provided directive is valid")
+		);
+
 		env_filter = parse_user_directives(env_filter, &tracing_targets)?;
 	}
 
@@ -541,4 +559,40 @@ mod tests {
 			format!("Expected:\n{}\nGot:\n{}", re, output),
 		);
 	}
+
+	#[test]
+	fn log_max_level_is_set_properly() {
+		fn run_test(rust_log: Option<String>, tracing_targets: Option<String>) -> String {
+			let executable = env::current_exe().unwrap();
+			let mut command = Command::new(executable);
+
+			command.env("PRINT_MAX_LOG_LEVEL", "1")
+				.args(&["--nocapture", "log_max_level_is_set_properly"]);
+
+			if let Some(rust_log) = rust_log {
+				command.env("RUST_LOG", rust_log);
+			}
+
+			if let Some(tracing_targets) = tracing_targets {
+				command.env("TRACING_TARGETS", tracing_targets);
+			}
+
+			let output = command.output().unwrap();
+
+			String::from_utf8(output.stderr).unwrap()
+		}
+
+		if env::var("PRINT_MAX_LOG_LEVEL").is_ok() {
+			init_logger(InitLoggerParams {
+				tracing_targets: env::var("TRACING_TARGETS").ok(),
+				..Default::default()
+			}).unwrap();
+			eprint!("MAX_LOG_LEVEL={:?}", log::max_level());
+		} else {
+			assert_eq!("MAX_LOG_LEVEL=Info", run_test(None, None));
+			assert_eq!("MAX_LOG_LEVEL=Trace", run_test(Some("test=trace".into()), None));
+			assert_eq!("MAX_LOG_LEVEL=Debug", run_test(Some("test=debug".into()), None));
+			assert_eq!("MAX_LOG_LEVEL=Trace", run_test(None, Some("test=info".into())));
+		}
+	}
 }

From 712085115cdef4a79a66747338c920d6ba4e479f Mon Sep 17 00:00:00 2001
From: Xiang Li <bigxiang@gmail.com>
Date: Sat, 9 Jan 2021 19:08:28 +0800
Subject: [PATCH 0247/1194] Fix missing network for uniarts (#7859)

---
 ss58-registry.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ss58-registry.json b/ss58-registry.json
index ad0c467f778b..a203db2b8e83 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -372,6 +372,7 @@
 		},
 		{
 			"prefix": 45,
+			"network": "uniarts",
 			"displayName": "UniArts Network",
 			"symbols": ["UART", "UINK"],
 			"decimals": [12, 12],

From 0fd461c0180d07769786fe4dfd4750eb29f6aae5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Mon, 11 Jan 2021 11:16:50 +0100
Subject: [PATCH 0248/1194] contracts: Collect rent for the first block during
 deployment (#7847)

* Pay first rent during instantiation

* Fix and add new tests

* Do not increment trie id counter on failure
---
 frame/contracts/src/benchmarking/mod.rs |   9 +-
 frame/contracts/src/exec.rs             | 121 ++++++------
 frame/contracts/src/storage.rs          |   8 +-
 frame/contracts/src/tests.rs            | 233 +++++++++++++++---------
 4 files changed, 221 insertions(+), 150 deletions(-)

diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index 393b0f60875b..4691a8298abe 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -336,7 +336,7 @@ benchmarks! {
 		let s in 0 .. code::max_pages::<T>() * 64;
 		let data = vec![42u8; (n * 1024) as usize];
 		let salt = vec![42u8; (s * 1024) as usize];
-		let endowment = ConfigCache::<T>::subsistence_threshold_uncached();
+		let endowment = caller_funding::<T>() / 3u32.into();
 		let caller = whitelisted_caller();
 		T::Currency::make_free_balance_be(&caller, caller_funding::<T>());
 		let WasmModule { code, hash, .. } = WasmModule::<T>::dummy_with_mem();
@@ -1373,7 +1373,7 @@ benchmarks! {
 		let hash_len = hashes.get(0).map(|x| x.encode().len()).unwrap_or(0);
 		let hashes_bytes = hashes.iter().flat_map(|x| x.encode()).collect::<Vec<_>>();
 		let hashes_len = hashes_bytes.len();
-		let value = ConfigCache::<T>::subsistence_threshold_uncached();
+		let value = Endow::max::<T>() / (r * API_BENCHMARK_BATCH_SIZE + 2).into();
 		assert!(value > 0u32.into());
 		let value_bytes = value.encode();
 		let value_len = value_bytes.len();
@@ -1457,7 +1457,8 @@ benchmarks! {
 	}: call(origin, callee, 0u32.into(), Weight::max_value(), vec![])
 	verify {
 		for addr in &addresses {
-			instance.alive_info()?;
+			ContractInfoOf::<T>::get(&addr).and_then(|c| c.get_alive())
+				.ok_or_else(|| "Contract should have been instantiated")?;
 		}
 	}
 
@@ -1493,7 +1494,7 @@ benchmarks! {
 		let input_len = inputs.get(0).map(|x| x.len()).unwrap_or(0);
 		let input_bytes = inputs.iter().cloned().flatten().collect::<Vec<_>>();
 		let inputs_len = input_bytes.len();
-		let value = ConfigCache::<T>::subsistence_threshold_uncached();
+		let value = Endow::max::<T>() / (API_BENCHMARK_BATCH_SIZE + 2).into();
 		assert!(value > 0u32.into());
 		let value_bytes = value.encode();
 		let value_len = value_bytes.len();
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index 47ff216cd23e..d19408f95c25 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -322,53 +322,62 @@ where
 		let caller = self.self_account.clone();
 		let dest = Contracts::<T>::contract_address(&caller, code_hash, salt);
 
-		// TrieId has not been generated yet and storage is empty since contract is new.
-		//
-		// Generate it now.
-		let dest_trie_id = Storage::<T>::generate_trie_id(&dest);
+		let output = frame_support::storage::with_transaction(|| {
+			// Generate the trie id in a new transaction to only increment the counter on success.
+			let dest_trie_id = Storage::<T>::generate_trie_id(&dest);
 
-		let output = self.with_nested_context(dest.clone(), dest_trie_id, |nested| {
-			Storage::<T>::place_contract(
-				&dest,
-				nested
-					.self_trie_id
-					.clone()
-					.expect("the nested context always has to have self_trie_id"),
-				code_hash.clone()
-			)?;
-
-			// Send funds unconditionally here. If the `endowment` is below existential_deposit
-			// then error will be returned here.
-			transfer(
-				TransferCause::Instantiate,
-				transactor_kind,
-				&caller,
-				&dest,
-				endowment,
-				nested,
-			)?;
-
-			let executable = nested.loader.load_init(&code_hash)
-				.map_err(|_| Error::<T>::CodeNotFound)?;
-			let output = nested.vm
-				.execute(
-					&executable,
-					nested.new_call_context(caller.clone(), endowment),
-					input_data,
-					gas_meter,
-				).map_err(|e| ExecError { error: e.error, origin: ErrorOrigin::Callee })?;
-
-			// We need each contract that exists to be above the subsistence threshold
-			// in order to keep up the guarantuee that we always leave a tombstone behind
-			// with the exception of a contract that called `seal_terminate`.
-			if T::Currency::total_balance(&dest) < nested.config.subsistence_threshold() {
-				Err(Error::<T>::NewContractNotFunded)?
-			}
+			let output = self.with_nested_context(dest.clone(), dest_trie_id, |nested| {
+				Storage::<T>::place_contract(
+					&dest,
+					nested
+						.self_trie_id
+						.clone()
+						.expect("the nested context always has to have self_trie_id"),
+					code_hash.clone()
+				)?;
+
+				// Send funds unconditionally here. If the `endowment` is below existential_deposit
+				// then error will be returned here.
+				transfer(
+					TransferCause::Instantiate,
+					transactor_kind,
+					&caller,
+					&dest,
+					endowment,
+					nested,
+				)?;
+
+				let executable = nested.loader.load_init(&code_hash)
+					.map_err(|_| Error::<T>::CodeNotFound)?;
+				let output = nested.vm
+					.execute(
+						&executable,
+						nested.new_call_context(caller.clone(), endowment),
+						input_data,
+						gas_meter,
+					).map_err(|e| ExecError { error: e.error, origin: ErrorOrigin::Callee })?;
+
+
+				// Collect the rent for the first block to prevent the creation of very large
+				// contracts that never intended to pay for even one block.
+				// This also makes sure that it is above the subsistence threshold
+				// in order to keep up the guarantuee that we always leave a tombstone behind
+				// with the exception of a contract that called `seal_terminate`.
+				Rent::<T>::charge(&dest)?
+					.and_then(|c| c.get_alive())
+					.ok_or_else(|| Error::<T>::NewContractNotFunded)?;
+
+				// Deposit an instantiation event.
+				deposit_event::<T>(vec![], RawEvent::Instantiated(caller.clone(), dest.clone()));
 
-			// Deposit an instantiation event.
-			deposit_event::<T>(vec![], RawEvent::Instantiated(caller.clone(), dest.clone()));
+				Ok(output)
+			});
 
-			Ok(output)
+			use frame_support::storage::TransactionOutcome::*;
+			match output {
+				Ok(_) => Commit(output),
+				Err(_) => Rollback(output),
+			}
 		})?;
 
 		Ok((dest, output))
@@ -908,7 +917,7 @@ mod tests {
 			let mut ctx = ExecutionContext::top_level(origin.clone(), &cfg, &vm, &loader);
 			place_contract(&BOB, return_ch);
 			set_balance(&origin, 100);
-			set_balance(&dest, 0);
+			let balance = get_balance(&dest);
 
 			let output = ctx.call(
 				dest.clone(),
@@ -919,7 +928,9 @@ mod tests {
 
 			assert!(!output.is_success());
 			assert_eq!(get_balance(&origin), 100);
-			assert_eq!(get_balance(&dest), 0);
+
+			// the rent is still charged
+			assert!(get_balance(&dest) < balance);
 		});
 	}
 
@@ -1057,10 +1068,10 @@ mod tests {
 			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
 
-			set_balance(&ALICE, 100);
+			set_balance(&ALICE, cfg.subsistence_threshold() * 10);
 
 			let result = ctx.instantiate(
-				cfg.subsistence_threshold(),
+				cfg.subsistence_threshold() * 3,
 				&mut GasMeter::<Test>::new(GAS_LIMIT),
 				&input_data_ch,
 				vec![1, 2, 3, 4],
@@ -1307,7 +1318,7 @@ mod tests {
 				// Instantiate a contract and save it's address in `instantiated_contract_address`.
 				let (address, output) = ctx.ext.instantiate(
 					&dummy_ch,
-					ConfigCache::<Test>::subsistence_threshold_uncached(),
+					ConfigCache::<Test>::subsistence_threshold_uncached() * 3,
 					ctx.gas_meter,
 					vec![],
 					&[48, 49, 50],
@@ -1321,8 +1332,7 @@ mod tests {
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
 			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
-			set_balance(&ALICE, 1000);
-			set_balance(&BOB, 100);
+			set_balance(&ALICE, cfg.subsistence_threshold() * 100);
 			place_contract(&BOB, instantiator_ch);
 
 			assert_matches!(
@@ -1431,19 +1441,20 @@ mod tests {
 		let vm = MockVm::new();
 		let mut loader = MockLoader::empty();
 		let rent_allowance_ch = loader.insert(|ctx| {
+			let allowance = ConfigCache::<Test>::subsistence_threshold_uncached() * 3;
 			assert_eq!(ctx.ext.rent_allowance(), <BalanceOf<Test>>::max_value());
-			ctx.ext.set_rent_allowance(10);
-			assert_eq!(ctx.ext.rent_allowance(), 10);
+			ctx.ext.set_rent_allowance(allowance);
+			assert_eq!(ctx.ext.rent_allowance(), allowance);
 			exec_success()
 		});
 
 		ExtBuilder::default().build().execute_with(|| {
 			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
-			set_balance(&ALICE, 100);
+			set_balance(&ALICE, cfg.subsistence_threshold() * 10);
 
 			let result = ctx.instantiate(
-				cfg.subsistence_threshold(),
+				cfg.subsistence_threshold() * 5,
 				&mut GasMeter::<Test>::new(GAS_LIMIT),
 				&rent_allowance_ch,
 				vec![],
diff --git a/frame/contracts/src/storage.rs b/frame/contracts/src/storage.rs
index 282c1acc0709..11a4bd7708cd 100644
--- a/frame/contracts/src/storage.rs
+++ b/frame/contracts/src/storage.rs
@@ -27,7 +27,7 @@ use codec::{Encode, Decode};
 use sp_std::prelude::*;
 use sp_std::marker::PhantomData;
 use sp_io::hashing::blake2_256;
-use sp_runtime::traits::Bounded;
+use sp_runtime::traits::{Bounded, Saturating};
 use sp_core::crypto::UncheckedFrom;
 use frame_support::{
 	dispatch::DispatchResult,
@@ -182,7 +182,11 @@ where
 					code_hash: ch,
 					storage_size: 0,
 					trie_id,
-					deduct_block: <frame_system::Module<T>>::block_number(),
+					deduct_block:
+						// We want to charge rent for the first block in advance. Therefore we
+						// treat the contract as if it was created in the last block and then
+						// charge rent for it during instantation.
+						<frame_system::Module<T>>::block_number().saturating_sub(1u32.into()),
 					rent_allowance: <BalanceOf<T>>::max_value(),
 					pair_count: 0,
 					last_write: None,
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index 9021e9677d76..78b1f7e30f82 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -35,7 +35,7 @@ use sp_runtime::{
 use sp_io::hashing::blake2_256;
 use frame_support::{
 	assert_ok, assert_err, assert_err_ignore_postinfo, impl_outer_dispatch, impl_outer_event,
-	impl_outer_origin, parameter_types, StorageMap,
+	impl_outer_origin, parameter_types, StorageMap, assert_storage_noop,
 	traits::{Currency, ReservableCurrency, OnInitialize},
 	weights::{Weight, PostDispatchInfo, DispatchClass, constants::WEIGHT_PER_SECOND},
 	dispatch::DispatchErrorWithPostInfo,
@@ -74,6 +74,7 @@ impl_outer_dispatch! {
 pub mod test_utils {
 	use super::{Test, Balances};
 	use crate::{
+		ConfigCache,
 		ContractInfoOf, CodeHash,
 		storage::Storage,
 		exec::{StorageKey, AccountIdOf},
@@ -90,6 +91,7 @@ pub mod test_utils {
 	}
 	pub fn place_contract(address: &AccountIdOf<Test>, code_hash: CodeHash<Test>) {
 		let trie_id = Storage::<Test>::generate_trie_id(address);
+		set_balance(address, ConfigCache::<Test>::subsistence_threshold_uncached() * 10);
 		Storage::<Test>::place_contract(&address, trie_id, code_hash).unwrap()
 	}
 	pub fn set_balance(who: &AccountIdOf<Test>, amount: u64) {
@@ -453,14 +455,14 @@ fn instantiate_and_call_and_deposit_event() {
 		.build()
 		.execute_with(|| {
 			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			let subsistence = super::ConfigCache::<Test>::subsistence_threshold_uncached();
+			let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
 
 			assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm));
 
 			// Check at the end to get hash on error easily
 			let creation = Contracts::instantiate(
 				Origin::signed(ALICE),
-				subsistence,
+				subsistence * 3,
 				GAS_LIMIT,
 				code_hash.into(),
 				vec![],
@@ -494,14 +496,14 @@ fn instantiate_and_call_and_deposit_event() {
 				EventRecord {
 					phase: Phase::Initialization,
 					event: MetaEvent::balances(
-						pallet_balances::RawEvent::Endowed(addr.clone(), subsistence)
+						pallet_balances::RawEvent::Endowed(addr.clone(), subsistence * 3)
 					),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
 					event: MetaEvent::balances(
-						pallet_balances::RawEvent::Transfer(ALICE, addr.clone(), subsistence)
+						pallet_balances::RawEvent::Transfer(ALICE, addr.clone(), subsistence * 3)
 					),
 					topics: vec![],
 				},
@@ -545,12 +547,19 @@ fn deposit_event_max_value_limit() {
 			));
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
+			// The instantation deducted the rent for one block immediatly
+			let first_rent = <Test as Config>::RentFraction::get()
+				// base_deposit - free_balance
+				.mul_ceil(80_000 - 30_000)
+				// blocks to rent
+				* 1;
+
 			// Check creation
 			let bob_contract = ContractInfoOf::<Test>::get(addr.clone())
 				.unwrap()
 				.get_alive()
 				.unwrap();
-			assert_eq!(bob_contract.rent_allowance, <BalanceOf<Test>>::max_value());
+			assert_eq!(bob_contract.rent_allowance, <BalanceOf<Test>>::max_value() - first_rent);
 
 			// Call contract with allowed storage value.
 			assert_ok!(Contracts::call(
@@ -617,6 +626,7 @@ mod call {
 	use super::{AccountIdOf, Test};
 	pub fn set_storage_4_byte() -> Vec<u8> { 0u32.to_le_bytes().to_vec() }
 	pub fn remove_storage_4_byte() -> Vec<u8> { 1u32.to_le_bytes().to_vec() }
+	#[allow(dead_code)]
 	pub fn transfer(to: &AccountIdOf<Test>) -> Vec<u8> {
 		2u32.to_le_bytes().iter().chain(AsRef::<[u8]>::as_ref(to)).cloned().collect()
 	}
@@ -798,10 +808,18 @@ fn deduct_blocks() {
 				vec![],
 			));
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+			ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
 
-			// Check creation
+			// The instantation deducted the rent for one block immediatly
+			let rent0 = <Test as Config>::RentFraction::get()
+				// base_deposit + deploy_set_storage (4 bytes in 1 item) - free_balance
+				.mul_ceil(80_000 + 40_000 + 10_000 - 30_000)
+				// blocks to rent
+				* 1;
 			let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
-			assert_eq!(bob_contract.rent_allowance, 1_000);
+			assert_eq!(bob_contract.rent_allowance, 1_000 - rent0);
+			assert_eq!(bob_contract.deduct_block, 1);
+			assert_eq!(Balances::free_balance(&addr), 30_000 - rent0);
 
 			// Advance 4 blocks
 			initialize_block(5);
@@ -814,13 +832,13 @@ fn deduct_blocks() {
 			// Check result
 			let rent = <Test as Config>::RentFraction::get()
 				// base_deposit + deploy_set_storage (4 bytes in 1 item) - free_balance
-				.mul_ceil(80_000 + 40_000 + 10_000 - 30_000)
+				.mul_ceil(80_000 + 40_000 + 10_000 - (30_000 - rent0))
 				// blocks to rent
 				* 4;
 			let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
-			assert_eq!(bob_contract.rent_allowance, 1_000 - rent);
+			assert_eq!(bob_contract.rent_allowance, 1_000 - rent0 - rent);
 			assert_eq!(bob_contract.deduct_block, 5);
-			assert_eq!(Balances::free_balance(&addr), 30_000 - rent);
+			assert_eq!(Balances::free_balance(&addr), 30_000 - rent0 - rent);
 
 			// Advance 7 blocks more
 			initialize_block(12);
@@ -833,23 +851,22 @@ fn deduct_blocks() {
 			// Check result
 			let rent_2 = <Test as Config>::RentFraction::get()
 				// base_deposit + deploy_set_storage (4 bytes in 1 item) - free_balance
-				.mul_ceil(80_000 + 40_000 + 10_000 - (30_000 - rent))
+				.mul_ceil(80_000 + 40_000 + 10_000 - (30_000 - rent0 - rent))
 				// blocks to rent
 				* 7;
 			let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
-			assert_eq!(bob_contract.rent_allowance, 1_000 - rent - rent_2);
+			assert_eq!(bob_contract.rent_allowance, 1_000 - rent0 - rent - rent_2);
 			assert_eq!(bob_contract.deduct_block, 12);
-			assert_eq!(Balances::free_balance(&addr), 30_000 - rent - rent_2);
+			assert_eq!(Balances::free_balance(&addr), 30_000 - rent0 - rent - rent_2);
 
 			// Second call on same block should have no effect on rent
 			assert_ok!(
 				Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, call::null())
 			);
-
 			let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
-			assert_eq!(bob_contract.rent_allowance, 1_000 - rent - rent_2);
+			assert_eq!(bob_contract.rent_allowance, 1_000 - rent0 - rent - rent_2);
 			assert_eq!(bob_contract.deduct_block, 12);
-			assert_eq!(Balances::free_balance(&addr), 30_000 - rent - rent_2);
+			assert_eq!(Balances::free_balance(&addr), 30_000 - rent0 - rent - rent_2)
 		});
 }
 
@@ -866,16 +883,16 @@ fn signed_claim_surcharge_contract_removals() {
 #[test]
 fn claim_surcharge_malus() {
 	// Test surcharge malus for inherent
-	claim_surcharge(4, |addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(), true);
-	claim_surcharge(3, |addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(), true);
-	claim_surcharge(2, |addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(), true);
-	claim_surcharge(1, |addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(), false);
+	claim_surcharge(27, |addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(), true);
+	claim_surcharge(26, |addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(), true);
+	claim_surcharge(25, |addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(), true);
+	claim_surcharge(24, |addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(), false);
 
 	// Test surcharge malus for signed
-	claim_surcharge(4, |addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(), true);
-	claim_surcharge(3, |addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(), false);
-	claim_surcharge(2, |addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(), false);
-	claim_surcharge(1, |addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(), false);
+	claim_surcharge(27, |addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(), true);
+	claim_surcharge(26, |addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(), false);
+	claim_surcharge(25, |addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(), false);
+	claim_surcharge(24, |addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(), false);
 }
 
 /// Claim surcharge with the given trigger_call at the given blocks.
@@ -892,7 +909,7 @@ fn claim_surcharge(blocks: u64, trigger_call: impl Fn(AccountIdOf<Test>) -> bool
 			assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm));
 			assert_ok!(Contracts::instantiate(
 				Origin::signed(ALICE),
-				100,
+				30_000,
 				GAS_LIMIT, code_hash.into(),
 				<Test as pallet_balances::Config>::Balance::from(1_000u32).encode(), // rent allowance
 				vec![],
@@ -931,30 +948,36 @@ fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
 			assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm.clone()));
 			assert_ok!(Contracts::instantiate(
 				Origin::signed(ALICE),
-				100,
+				500,
 				GAS_LIMIT, code_hash.into(),
 				<Test as pallet_balances::Config>::Balance::from(1_000u32).encode(), // rent allowance
 				vec![],
 			));
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+			let allowance = ContractInfoOf::<Test>::get(&addr)
+				.unwrap().get_alive().unwrap().rent_allowance;
+			let balance = Balances::free_balance(&addr);
 
-			let subsistence_threshold = 50 /*existential_deposit*/ + 16 /*tombstone_deposit*/;
+			let subsistence_threshold = ConfigCache::<Test>::subsistence_threshold_uncached();
 
 			// Trigger rent must have no effect
 			assert!(!trigger_call(addr.clone()));
-			assert_eq!(ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap().rent_allowance, 1_000);
-			assert_eq!(Balances::free_balance(&addr), 100);
+			assert_eq!(
+				ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap().rent_allowance,
+				allowance,
+			);
+			assert_eq!(Balances::free_balance(&addr), balance);
 
 			// Advance blocks
-			initialize_block(10);
+			initialize_block(27);
 
-			// Trigger rent through call
+			// Trigger rent through call (should remove the contract)
 			assert!(trigger_call(addr.clone()));
 			assert!(ContractInfoOf::<Test>::get(&addr).unwrap().get_tombstone().is_some());
 			assert_eq!(Balances::free_balance(&addr), subsistence_threshold);
 
 			// Advance blocks
-			initialize_block(20);
+			initialize_block(30);
 
 			// Trigger rent must have no effect
 			assert!(!trigger_call(addr.clone()));
@@ -972,13 +995,16 @@ fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
 			assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm.clone()));
 			assert_ok!(Contracts::instantiate(
 				Origin::signed(ALICE),
-				1_000,
+				30_000,
 				GAS_LIMIT,
 				code_hash.into(),
-				<Test as pallet_balances::Config>::Balance::from(100u32).encode(), // rent allowance
+				<Test as pallet_balances::Config>::Balance::from(1000u32).encode(), // rent allowance
 				vec![],
 			));
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+			let allowance = ContractInfoOf::<Test>::get(&addr)
+				.unwrap().get_alive().unwrap().rent_allowance;
+			let balance = Balances::free_balance(&addr);
 
 			// Trigger rent must have no effect
 			assert!(!trigger_call(addr.clone()));
@@ -988,12 +1014,12 @@ fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
 					.get_alive()
 					.unwrap()
 					.rent_allowance,
-				100
+				allowance,
 			);
-			assert_eq!(Balances::free_balance(&addr), 1_000);
+			assert_eq!(Balances::free_balance(&addr), balance);
 
 			// Advance blocks
-			initialize_block(10);
+			initialize_block(27);
 
 			// Trigger rent through call
 			assert!(trigger_call(addr.clone()));
@@ -1002,7 +1028,7 @@ fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
 				.get_tombstone()
 				.is_some());
 			// Balance should be initial balance - initial rent_allowance
-			assert_eq!(Balances::free_balance(&addr), 900);
+			assert_eq!(Balances::free_balance(&addr), 29000);
 
 			// Advance blocks
 			initialize_block(20);
@@ -1013,7 +1039,7 @@ fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
 				.unwrap()
 				.get_tombstone()
 				.is_some());
-			assert_eq!(Balances::free_balance(&addr), 900);
+			assert_eq!(Balances::free_balance(&addr), 29000);
 		});
 
 	// Balance reached and inferior to subsistence threshold
@@ -1023,18 +1049,20 @@ fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
 		.execute_with(|| {
 			// Create
 			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			let subsistence_threshold =
-				Balances::minimum_balance() + <Test as Config>::TombstoneDeposit::get();
+			let subsistence_threshold = ConfigCache::<Test>::subsistence_threshold_uncached();
 			assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm.clone()));
 			assert_ok!(Contracts::instantiate(
 				Origin::signed(ALICE),
-				50 + subsistence_threshold,
+				subsistence_threshold * 3,
 				GAS_LIMIT,
 				code_hash.into(),
 				<Test as pallet_balances::Config>::Balance::from(1_000u32).encode(), // rent allowance
 				vec![],
 			));
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+			let allowance = ContractInfoOf::<Test>::get(&addr)
+				.unwrap().get_alive().unwrap().rent_allowance;
+			let balance = Balances::free_balance(&addr);
 
 			// Trigger rent must have no effect
 			assert!(!trigger_call(addr.clone()));
@@ -1044,32 +1072,18 @@ fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
 					.get_alive()
 					.unwrap()
 					.rent_allowance,
-				1_000
+				allowance,
 			);
 			assert_eq!(
 				Balances::free_balance(&addr),
-				50 + subsistence_threshold,
+				balance,
 			);
 
-			// Transfer funds
-			assert_ok!(Contracts::call(
-				Origin::signed(ALICE),
-				addr.clone(),
-				0,
-				GAS_LIMIT,
-				call::transfer(&BOB),
-			));
-			assert_eq!(
-				ContractInfoOf::<Test>::get(&addr)
-					.unwrap()
-					.get_alive()
-					.unwrap()
-					.rent_allowance,
-				1_000
-			);
+			// Make contract have exactly the subsitence threshold
+			Balances::make_free_balance_be(&addr, subsistence_threshold);
 			assert_eq!(Balances::free_balance(&addr), subsistence_threshold);
 
-			// Advance blocks
+			// Advance blocks (should remove as balance is exactly subsistence)
 			initialize_block(10);
 
 			// Trigger rent through call
@@ -1101,7 +1115,7 @@ fn call_removed_contract() {
 			assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm.clone()));
 			assert_ok!(Contracts::instantiate(
 				Origin::signed(ALICE),
-				100,
+				30_000,
 				GAS_LIMIT, code_hash.into(),
 				<Test as pallet_balances::Config>::Balance::from(1_000u32).encode(), // rent allowance
 				vec![],
@@ -1114,7 +1128,7 @@ fn call_removed_contract() {
 			);
 
 			// Advance blocks
-			initialize_block(10);
+			initialize_block(27);
 
 			// Calling contract should deny access because rent cannot be paid.
 			assert_err_ignore_postinfo!(
@@ -1157,9 +1171,16 @@ fn default_rent_allowance_on_instantiate() {
 			));
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
+			// The instantation deducted the rent for one block immediatly
+			let first_rent = <Test as Config>::RentFraction::get()
+				// base_deposit - free_balance
+				.mul_ceil(80_000 - 30_000)
+				// blocks to rent
+				* 1;
+
 			// Check creation
 			let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
-			assert_eq!(bob_contract.rent_allowance, <BalanceOf<Test>>::max_value());
+			assert_eq!(bob_contract.rent_allowance, <BalanceOf<Test>>::max_value() - first_rent);
 
 			// Advance blocks
 			initialize_block(5);
@@ -1239,15 +1260,15 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 				30_000,
 				GAS_LIMIT,
 				set_rent_code_hash.into(),
-				<Test as pallet_balances::Config>::Balance::from(0u32).encode(),
+				<Test as pallet_balances::Config>::Balance::from(1_000u32).encode(),
 				vec![],
 			));
 			let addr_bob = Contracts::contract_address(&ALICE, &set_rent_code_hash, &[]);
 
-			// Check if `BOB` was created successfully and that the rent allowance is
-			// set to 0.
+			// Check if `BOB` was created successfully and that the rent allowance is below what
+			// we specified as the first rent was already collected.
 			let bob_contract = ContractInfoOf::<Test>::get(&addr_bob).unwrap().get_alive().unwrap();
-			assert_eq!(bob_contract.rent_allowance, 0);
+			assert!(bob_contract.rent_allowance < 5_000);
 
 			if test_different_storage {
 				assert_ok!(Contracts::call(
@@ -1257,10 +1278,10 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 				);
 			}
 
-			// Advance 4 blocks, to the 5th.
-			initialize_block(5);
+			// Advance blocks in order to make the contract run out of money for rent.
+			initialize_block(27);
 
-			// Call `BOB`, which makes it pay rent. Since the rent allowance is set to 0
+			// Call `BOB`, which makes it pay rent. Since the rent allowance is set to 20_000
 			// we expect that it is no longer callable but keeps existing until someone
 			// calls `claim_surcharge`.
 			assert_err_ignore_postinfo!(
@@ -1304,8 +1325,8 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 
 			// The trie is regarded as 'dirty' when it was written to in the current block.
 			if !test_restore_to_with_dirty_storage {
-				// Advance 1 block, to the 6th.
-				initialize_block(6);
+				// Advance 1 block.
+				initialize_block(28);
 			}
 
 			// Perform a call to `DJANGO`. This should either perform restoration successfully or
@@ -1452,10 +1473,7 @@ fn storage_max_value_limit() {
 				vec![],
 			));
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
-
-			// Check creation
-			let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
-			assert_eq!(bob_contract.rent_allowance, <BalanceOf<Test>>::max_value());
+			ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
 
 			// Call contract with allowed storage value.
 			assert_ok!(Contracts::call(
@@ -1795,7 +1813,7 @@ fn transfer_return_code() {
 		assert_ok!(
 			Contracts::instantiate(
 				Origin::signed(ALICE),
-				subsistence,
+				subsistence * 3,
 				GAS_LIMIT,
 				code_hash.into(),
 				vec![],
@@ -1805,6 +1823,7 @@ fn transfer_return_code() {
 		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
 		// Contract has only the minimal balance so any transfer will return BelowSubsistence.
+		Balances::make_free_balance_be(&addr, subsistence);
 		let result = Contracts::bare_call(
 			ALICE,
 			addr.clone(),
@@ -1844,7 +1863,7 @@ fn call_return_code() {
 		assert_ok!(
 			Contracts::instantiate(
 				Origin::signed(ALICE),
-				subsistence,
+				subsistence * 3,
 				GAS_LIMIT,
 				caller_hash.into(),
 				vec![0],
@@ -1852,6 +1871,7 @@ fn call_return_code() {
 			),
 		);
 		let addr_bob = Contracts::contract_address(&ALICE, &caller_hash, &[]);
+		Balances::make_free_balance_be(&addr_bob, subsistence);
 
 		// Contract calls into Django which is no valid contract
 		let result = Contracts::bare_call(
@@ -1866,7 +1886,7 @@ fn call_return_code() {
 		assert_ok!(
 			Contracts::instantiate(
 				Origin::signed(CHARLIE),
-				subsistence,
+				subsistence * 3,
 				GAS_LIMIT,
 				callee_hash.into(),
 				vec![0],
@@ -1874,6 +1894,7 @@ fn call_return_code() {
 			),
 		);
 		let addr_django = Contracts::contract_address(&CHARLIE, &callee_hash, &[]);
+		Balances::make_free_balance_be(&addr_django, subsistence);
 
 		// Contract has only the minimal balance so any transfer will return BelowSubsistence.
 		let result = Contracts::bare_call(
@@ -1938,7 +1959,7 @@ fn instantiate_return_code() {
 		assert_ok!(
 			Contracts::instantiate(
 				Origin::signed(ALICE),
-				subsistence,
+				subsistence * 3,
 				GAS_LIMIT,
 				caller_hash.into(),
 				vec![],
@@ -1948,6 +1969,7 @@ fn instantiate_return_code() {
 		let addr = Contracts::contract_address(&ALICE, &caller_hash, &[]);
 
 		// Contract has only the minimal balance so any transfer will return BelowSubsistence.
+		Balances::make_free_balance_be(&addr, subsistence);
 		let result = Contracts::bare_call(
 			ALICE,
 			addr.clone(),
@@ -2030,7 +2052,7 @@ fn disabled_chain_extension_errors_on_call() {
 		assert_ok!(
 			Contracts::instantiate(
 				Origin::signed(ALICE),
-				subsistence,
+				subsistence * 3,
 				GAS_LIMIT,
 				hash.into(),
 				vec![],
@@ -2061,7 +2083,7 @@ fn chain_extension_works() {
 		assert_ok!(
 			Contracts::instantiate(
 				Origin::signed(ALICE),
-				subsistence,
+				subsistence * 3,
 				GAS_LIMIT,
 				hash.into(),
 				vec![],
@@ -2132,7 +2154,7 @@ fn lazy_removal_works() {
 		assert_ok!(
 			Contracts::instantiate(
 				Origin::signed(ALICE),
-				subsistence,
+				subsistence * 3,
 				GAS_LIMIT,
 				hash.into(),
 				vec![],
@@ -2193,7 +2215,7 @@ fn lazy_removal_partial_remove_works() {
 		assert_ok!(
 			Contracts::instantiate(
 				Origin::signed(ALICE),
-				subsistence,
+				subsistence * 3,
 				GAS_LIMIT,
 				hash.into(),
 				vec![],
@@ -2275,7 +2297,7 @@ fn lazy_removal_does_no_run_on_full_block() {
 		assert_ok!(
 			Contracts::instantiate(
 				Origin::signed(ALICE),
-				subsistence,
+				subsistence * 3,
 				GAS_LIMIT,
 				hash.into(),
 				vec![],
@@ -2360,7 +2382,7 @@ fn lazy_removal_does_not_use_all_weight() {
 		assert_ok!(
 			Contracts::instantiate(
 				Origin::signed(ALICE),
-				subsistence,
+				subsistence * 3,
 				GAS_LIMIT,
 				hash.into(),
 				vec![],
@@ -2431,7 +2453,7 @@ fn deletion_queue_full() {
 		assert_ok!(
 			Contracts::instantiate(
 				Origin::signed(ALICE),
-				subsistence,
+				subsistence * 3,
 				GAS_LIMIT,
 				hash.into(),
 				vec![],
@@ -2472,3 +2494,36 @@ fn deletion_queue_full() {
 		<ContractInfoOf::<Test>>::get(&addr).unwrap().get_alive().unwrap();
 	});
 }
+
+#[test]
+fn not_deployed_if_endowment_too_low_for_first_rent() {
+	let (wasm, code_hash) = compile_module::<Test>("set_rent").unwrap();
+
+	// The instantation deducted the rent for one block immediatly
+	let first_rent = <Test as Config>::RentFraction::get()
+		// base_deposit + deploy_set_storage (4 bytes in 1 item) - free_balance
+		.mul_ceil(80_000u32 + 40_000 + 10_000 - 30_000)
+		// blocks to rent
+		* 1;
+
+	ExtBuilder::default()
+		.existential_deposit(50)
+		.build()
+		.execute_with(|| {
+			// Create
+			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
+			assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm));
+			assert_storage_noop!(assert_err_ignore_postinfo!(Contracts::instantiate(
+					Origin::signed(ALICE),
+					30_000,
+					GAS_LIMIT, code_hash.into(),
+					(BalanceOf::<Test>::from(first_rent) - BalanceOf::<Test>::from(1u32))
+						.encode(), // rent allowance
+					vec![],
+				),
+				Error::<Test>::NewContractNotFunded,
+			));
+			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+			assert_matches!(ContractInfoOf::<Test>::get(&addr), None);
+		});
+}

From 00b41bcea913acad52e48de692cc615e7e2fc3e5 Mon Sep 17 00:00:00 2001
From: Igor Matuszewski <Xanewok@gmail.com>
Date: Mon, 11 Jan 2021 11:24:29 +0100
Subject: [PATCH 0249/1194] Merge 2.0.1 backport branch into mainline master
 (#7842)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Backport paritytech/substrate#7381

* Bring back genesis storage build in aura/timestamp

To not change spec version, see
https://github.com/paritytech/substrate/pull/7686#discussion_r540032743

* Backport paritytech/substrate#7238

* Backport paritytech/substrate#7395

* Bump impl_version

* Fix UI tests and bump trybuild dep

See https://github.com/rust-lang/rust/pull/73996

Backports:
https://github.com/paritytech/substrate/pull/7764
https://github.com/paritytech/substrate/pull/7656

* Partially backport paritytech/substrate#7838

* Release frame-support with a dep compilation fix

* Bump patch level for remaining crates

This is done because at the time of writing cargo-unleash does not fully
support partial workspace publishing and mixes both local and crates.io
versions of the packages, leading to errors in the release check workflow.

* Backport paritytech/substrate#7854

...to fix compilation error when using futures-* v0.3.9.

* Adding Changelog  entry for patch release

Co-authored-by: Bastian Köcher <git@kchr.de>
Co-authored-by: Benjamin Kampmann <ben@parity.io>
---
 Cargo.lock                                    | 308 +++++++++---------
 bin/node/runtime/Cargo.toml                   |   2 +-
 client/api/Cargo.toml                         |   2 +-
 client/authority-discovery/Cargo.toml         |   2 +-
 client/basic-authorship/Cargo.toml            |   2 +-
 client/block-builder/Cargo.toml               |   2 +-
 client/chain-spec/Cargo.toml                  |   2 +-
 client/chain-spec/derive/Cargo.toml           |   2 +-
 client/cli/Cargo.toml                         |   2 +-
 client/consensus/aura/Cargo.toml              |   2 +-
 client/consensus/babe/Cargo.toml              |   2 +-
 client/consensus/babe/rpc/Cargo.toml          |   2 +-
 client/consensus/common/Cargo.toml            |   2 +-
 client/consensus/epochs/Cargo.toml            |   2 +-
 client/consensus/manual-seal/Cargo.toml       |   2 +-
 client/consensus/pow/Cargo.toml               |   2 +-
 client/consensus/slots/Cargo.toml             |   2 +-
 client/consensus/uncles/Cargo.toml            |   2 +-
 client/db/Cargo.toml                          |   2 +-
 client/executor/Cargo.toml                    |   2 +-
 client/executor/common/Cargo.toml             |   2 +-
 client/executor/wasmi/Cargo.toml              |   2 +-
 client/executor/wasmtime/Cargo.toml           |   2 +-
 client/finality-grandpa/Cargo.toml            |   2 +-
 client/finality-grandpa/rpc/Cargo.toml        |   2 +-
 client/informant/Cargo.toml                   |   2 +-
 client/keystore/Cargo.toml                    |   2 +-
 client/light/Cargo.toml                       |   2 +-
 client/network-gossip/Cargo.toml              |   2 +-
 client/network/Cargo.toml                     |   2 +-
 client/offchain/Cargo.toml                    |   2 +-
 client/peerset/Cargo.toml                     |   2 +-
 client/proposer-metrics/Cargo.toml            |   2 +-
 client/rpc-api/Cargo.toml                     |   2 +-
 client/rpc-servers/Cargo.toml                 |   2 +-
 client/rpc/Cargo.toml                         |   2 +-
 client/service/Cargo.toml                     |   2 +-
 client/state-db/Cargo.toml                    |   2 +-
 client/telemetry/Cargo.toml                   |   2 +-
 client/tracing/Cargo.toml                     |   2 +-
 client/transaction-pool/Cargo.toml            |   2 +-
 client/transaction-pool/graph/Cargo.toml      |   2 +-
 docs/CHANGELOG.md                             |  12 +
 frame/assets/Cargo.toml                       |   2 +-
 frame/atomic-swap/Cargo.toml                  |   2 +-
 frame/aura/Cargo.toml                         |   2 +-
 frame/authority-discovery/Cargo.toml          |   2 +-
 frame/authorship/Cargo.toml                   |   2 +-
 frame/babe/Cargo.toml                         |   2 +-
 frame/balances/Cargo.toml                     |   2 +-
 frame/benchmarking/Cargo.toml                 |   2 +-
 frame/collective/Cargo.toml                   |   2 +-
 frame/contracts/Cargo.toml                    |   2 +-
 frame/contracts/common/Cargo.toml             |   2 +-
 frame/contracts/rpc/Cargo.toml                |   2 +-
 frame/contracts/rpc/runtime-api/Cargo.toml    |   2 +-
 frame/democracy/Cargo.toml                    |   2 +-
 frame/elections-phragmen/Cargo.toml           |   2 +-
 frame/elections/Cargo.toml                    |   2 +-
 frame/example-offchain-worker/Cargo.toml      |   2 +-
 frame/example-parallel/Cargo.toml             |   2 +-
 frame/executive/Cargo.toml                    |   2 +-
 frame/grandpa/Cargo.toml                      |   2 +-
 frame/identity/Cargo.toml                     |   2 +-
 frame/im-online/Cargo.toml                    |   2 +-
 frame/indices/Cargo.toml                      |   2 +-
 frame/membership/Cargo.toml                   |   2 +-
 frame/merkle-mountain-range/Cargo.toml        |   2 +-
 frame/metadata/Cargo.toml                     |   2 +-
 frame/multisig/Cargo.toml                     |   2 +-
 frame/nicks/Cargo.toml                        |   2 +-
 frame/offences/Cargo.toml                     |   2 +-
 frame/offences/benchmarking/Cargo.toml        |   2 +-
 frame/randomness-collective-flip/Cargo.toml   |   2 +-
 frame/recovery/Cargo.toml                     |   2 +-
 frame/scheduler/Cargo.toml                    |   2 +-
 frame/scored-pool/Cargo.toml                  |   2 +-
 frame/session/Cargo.toml                      |   2 +-
 frame/session/benchmarking/Cargo.toml         |   2 +-
 frame/society/Cargo.toml                      |   2 +-
 frame/staking/Cargo.toml                      |   2 +-
 frame/staking/reward-curve/Cargo.toml         |   2 +-
 frame/sudo/Cargo.toml                         |   2 +-
 frame/support/Cargo.toml                      |   4 +-
 frame/support/procedural/Cargo.toml           |   2 +-
 frame/support/procedural/tools/Cargo.toml     |   2 +-
 .../procedural/tools/derive/Cargo.toml        |   2 +-
 frame/support/test/Cargo.toml                 |   2 +-
 frame/system/Cargo.toml                       |   4 +-
 frame/system/benchmarking/Cargo.toml          |   2 +-
 frame/system/rpc/runtime-api/Cargo.toml       |   2 +-
 frame/timestamp/Cargo.toml                    |   2 +-
 frame/transaction-payment/Cargo.toml          |   2 +-
 frame/transaction-payment/rpc/Cargo.toml      |   2 +-
 .../rpc/runtime-api/Cargo.toml                |   2 +-
 frame/treasury/Cargo.toml                     |   2 +-
 frame/utility/Cargo.toml                      |   2 +-
 frame/vesting/Cargo.toml                      |   2 +-
 primitives/allocator/Cargo.toml               |   2 +-
 primitives/api/Cargo.toml                     |   2 +-
 primitives/api/proc-macro/Cargo.toml          |   2 +-
 primitives/api/test/Cargo.toml                |   2 +-
 primitives/application-crypto/Cargo.toml      |   2 +-
 primitives/arithmetic/Cargo.toml              |   2 +-
 primitives/authority-discovery/Cargo.toml     |   2 +-
 primitives/authorship/Cargo.toml              |   2 +-
 primitives/block-builder/Cargo.toml           |   2 +-
 primitives/blockchain/Cargo.toml              |   2 +-
 primitives/chain-spec/Cargo.toml              |   2 +-
 primitives/consensus/aura/Cargo.toml          |   2 +-
 primitives/consensus/babe/Cargo.toml          |   2 +-
 primitives/consensus/common/Cargo.toml        |   2 +-
 primitives/consensus/pow/Cargo.toml           |   2 +-
 primitives/consensus/slots/Cargo.toml         |   2 +-
 primitives/consensus/vrf/Cargo.toml           |   2 +-
 primitives/core/Cargo.toml                    |   2 +-
 primitives/database/Cargo.toml                |   2 +-
 primitives/debug-derive/Cargo.toml            |   2 +-
 primitives/externalities/Cargo.toml           |   2 +-
 primitives/finality-grandpa/Cargo.toml        |   2 +-
 primitives/inherents/Cargo.toml               |   2 +-
 primitives/io/Cargo.toml                      |   2 +-
 primitives/keyring/Cargo.toml                 |   2 +-
 primitives/npos-elections/Cargo.toml          |   2 +-
 primitives/npos-elections/compact/Cargo.toml  |   2 +-
 primitives/offchain/Cargo.toml                |   2 +-
 primitives/panic-handler/Cargo.toml           |   2 +-
 primitives/rpc/Cargo.toml                     |   2 +-
 primitives/runtime-interface/Cargo.toml       |   2 +-
 .../runtime-interface/proc-macro/Cargo.toml   |   2 +-
 primitives/runtime/Cargo.toml                 |   2 +-
 primitives/sandbox/Cargo.toml                 |   2 +-
 primitives/serializer/Cargo.toml              |   2 +-
 primitives/session/Cargo.toml                 |   2 +-
 primitives/staking/Cargo.toml                 |   2 +-
 primitives/state-machine/Cargo.toml           |   2 +-
 primitives/std/Cargo.toml                     |   2 +-
 primitives/storage/Cargo.toml                 |   2 +-
 primitives/timestamp/Cargo.toml               |   2 +-
 primitives/tracing/Cargo.toml                 |   2 +-
 primitives/transaction-pool/Cargo.toml        |   2 +-
 primitives/trie/Cargo.toml                    |   2 +-
 primitives/utils/Cargo.toml                   |   2 +-
 primitives/version/Cargo.toml                 |   2 +-
 primitives/wasm-interface/Cargo.toml          |   2 +-
 test-utils/Cargo.toml                         |   2 +-
 test-utils/client/Cargo.toml                  |   2 +-
 test-utils/derive/Cargo.toml                  |   2 +-
 utils/browser/Cargo.toml                      |   2 +-
 utils/build-script-utils/Cargo.toml           |   2 +-
 utils/fork-tree/Cargo.toml                    |   2 +-
 utils/frame/benchmarking-cli/Cargo.toml       |   2 +-
 utils/frame/frame-utilities-cli/Cargo.toml    |   2 +-
 utils/frame/rpc/support/Cargo.toml            |   2 +-
 utils/frame/rpc/system/Cargo.toml             |   2 +-
 utils/prometheus/Cargo.toml                   |   2 +-
 156 files changed, 322 insertions(+), 310 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 594d33cfa3da..871b0f60d77e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1534,7 +1534,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "fork-tree"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -1551,7 +1551,7 @@ dependencies = [
 
 [[package]]
 name = "frame-benchmarking"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1569,7 +1569,7 @@ dependencies = [
 
 [[package]]
 name = "frame-benchmarking-cli"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "Inflector",
  "chrono",
@@ -1591,7 +1591,7 @@ dependencies = [
 
 [[package]]
 name = "frame-executive"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1611,7 +1611,7 @@ dependencies = [
 
 [[package]]
 name = "frame-metadata"
-version = "12.0.0"
+version = "12.0.1"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -1621,7 +1621,7 @@ dependencies = [
 
 [[package]]
 name = "frame-support"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -1650,7 +1650,7 @@ dependencies = [
 
 [[package]]
 name = "frame-support-procedural"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "Inflector",
  "frame-support-procedural-tools",
@@ -1661,7 +1661,7 @@ dependencies = [
 
 [[package]]
 name = "frame-support-procedural-tools"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -1672,7 +1672,7 @@ dependencies = [
 
 [[package]]
 name = "frame-support-procedural-tools-derive"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1681,7 +1681,7 @@ dependencies = [
 
 [[package]]
 name = "frame-support-test"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-metadata",
  "frame-support",
@@ -1701,7 +1701,7 @@ dependencies = [
 
 [[package]]
 name = "frame-system"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "criterion",
  "frame-support",
@@ -1719,7 +1719,7 @@ dependencies = [
 
 [[package]]
 name = "frame-system-benchmarking"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -1734,7 +1734,7 @@ dependencies = [
 
 [[package]]
 name = "frame-system-rpc-runtime-api"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -3944,7 +3944,7 @@ dependencies = [
 
 [[package]]
 name = "node-runtime"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-benchmarking",
  "frame-executive",
@@ -4291,7 +4291,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-assets"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4307,7 +4307,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-atomic-swap"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4322,7 +4322,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-aura"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4344,7 +4344,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-authority-discovery"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4362,7 +4362,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-authorship"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4378,7 +4378,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-babe"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4407,7 +4407,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-balances"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4441,7 +4441,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-collective"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4458,7 +4458,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-contracts"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "assert_matches",
  "frame-benchmarking",
@@ -4489,7 +4489,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-contracts-primitives"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "bitflags",
  "parity-scale-codec",
@@ -4508,7 +4508,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-contracts-rpc"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -4527,7 +4527,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-contracts-rpc-runtime-api"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "pallet-contracts-primitives",
  "parity-scale-codec",
@@ -4538,7 +4538,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-democracy"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4558,7 +4558,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-elections"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4574,7 +4574,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-elections-phragmen"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4609,7 +4609,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-example-offchain-worker"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4625,7 +4625,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-example-parallel"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4639,7 +4639,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-grandpa"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "finality-grandpa",
  "frame-benchmarking",
@@ -4667,7 +4667,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-identity"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -4684,7 +4684,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-im-online"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4703,7 +4703,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-indices"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4735,7 +4735,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-membership"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4749,7 +4749,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-mmr"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "ckb-merkle-mountain-range",
  "env_logger 0.5.13",
@@ -4767,7 +4767,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-multisig"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4783,7 +4783,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-nicks"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4812,7 +4812,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-offences"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4828,7 +4828,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-offences-benchmarking"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4870,7 +4870,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-randomness-collective-flip"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4884,7 +4884,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-recovery"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -4900,7 +4900,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-scheduler"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4916,7 +4916,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-scored-pool"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4931,7 +4931,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-session"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4952,7 +4952,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-session-benchmarking"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4974,7 +4974,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-society"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4990,7 +4990,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-staking"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5041,7 +5041,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-staking-reward-curve"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -5052,7 +5052,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-sudo"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5078,7 +5078,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-timestamp"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5114,7 +5114,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-transaction-payment"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5132,7 +5132,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-transaction-payment-rpc"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -5149,7 +5149,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -5162,7 +5162,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-treasury"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5180,7 +5180,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-utility"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5196,7 +5196,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-vesting"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -6456,7 +6456,7 @@ dependencies = [
 
 [[package]]
 name = "sc-authority-discovery"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -6487,7 +6487,7 @@ dependencies = [
 
 [[package]]
 name = "sc-basic-authorship"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "futures 0.3.9",
  "futures-timer 3.0.2",
@@ -6512,7 +6512,7 @@ dependencies = [
 
 [[package]]
 name = "sc-block-builder"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -6530,7 +6530,7 @@ dependencies = [
 
 [[package]]
 name = "sc-chain-spec"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "impl-trait-for-tuples 0.2.0",
  "parity-scale-codec",
@@ -6550,7 +6550,7 @@ dependencies = [
 
 [[package]]
 name = "sc-chain-spec-derive"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -6560,7 +6560,7 @@ dependencies = [
 
 [[package]]
 name = "sc-cli"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -6614,7 +6614,7 @@ dependencies = [
 
 [[package]]
 name = "sc-client-api"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "derive_more",
  "fnv",
@@ -6651,7 +6651,7 @@ dependencies = [
 
 [[package]]
 name = "sc-client-db"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -6685,7 +6685,7 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "sc-client-api",
  "sp-blockchain",
@@ -6695,7 +6695,7 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-aura"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "derive_more",
  "futures 0.3.9",
@@ -6735,7 +6735,7 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-babe"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "derive_more",
  "fork-tree",
@@ -6789,7 +6789,7 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-babe-rpc"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "derive_more",
  "futures 0.3.9",
@@ -6818,7 +6818,7 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-epochs"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -6830,7 +6830,7 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-manual-seal"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "assert_matches",
  "derive_more",
@@ -6867,7 +6867,7 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-pow"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "derive_more",
  "futures 0.3.9",
@@ -6890,7 +6890,7 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-slots"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "futures 0.3.9",
  "futures-timer 3.0.2",
@@ -6916,7 +6916,7 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-uncles"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "log",
  "sc-client-api",
@@ -6929,7 +6929,7 @@ dependencies = [
 
 [[package]]
 name = "sc-executor"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "assert_matches",
  "derive_more",
@@ -6969,7 +6969,7 @@ dependencies = [
 
 [[package]]
 name = "sc-executor-common"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "derive_more",
  "parity-scale-codec",
@@ -6984,7 +6984,7 @@ dependencies = [
 
 [[package]]
 name = "sc-executor-wasmi"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -6998,7 +6998,7 @@ dependencies = [
 
 [[package]]
 name = "sc-executor-wasmtime"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "assert_matches",
  "log",
@@ -7016,7 +7016,7 @@ dependencies = [
 
 [[package]]
 name = "sc-finality-grandpa"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "assert_matches",
  "derive_more",
@@ -7061,7 +7061,7 @@ dependencies = [
 
 [[package]]
 name = "sc-finality-grandpa-rpc"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "derive_more",
  "finality-grandpa",
@@ -7091,7 +7091,7 @@ dependencies = [
 
 [[package]]
 name = "sc-informant"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.9",
@@ -7108,7 +7108,7 @@ dependencies = [
 
 [[package]]
 name = "sc-keystore"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7128,7 +7128,7 @@ dependencies = [
 
 [[package]]
 name = "sc-light"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "hash-db",
  "lazy_static",
@@ -7146,7 +7146,7 @@ dependencies = [
 
 [[package]]
 name = "sc-network"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "assert_matches",
  "async-std",
@@ -7206,7 +7206,7 @@ dependencies = [
 
 [[package]]
 name = "sc-network-gossip"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "async-std",
  "futures 0.3.9",
@@ -7251,7 +7251,7 @@ dependencies = [
 
 [[package]]
 name = "sc-offchain"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
@@ -7284,7 +7284,7 @@ dependencies = [
 
 [[package]]
 name = "sc-peerset"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "futures 0.3.9",
  "libp2p",
@@ -7297,7 +7297,7 @@ dependencies = [
 
 [[package]]
 name = "sc-proposer-metrics"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -7305,7 +7305,7 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "assert_matches",
  "futures 0.1.30",
@@ -7347,7 +7347,7 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc-api"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "derive_more",
  "futures 0.3.9",
@@ -7370,7 +7370,7 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc-server"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "futures 0.1.30",
  "jsonrpc-core",
@@ -7401,7 +7401,7 @@ dependencies = [
 
 [[package]]
 name = "sc-service"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "async-std",
  "directories 3.0.1",
@@ -7507,7 +7507,7 @@ dependencies = [
 
 [[package]]
 name = "sc-state-db"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7540,7 +7540,7 @@ dependencies = [
 
 [[package]]
 name = "sc-telemetry"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "futures 0.3.9",
  "futures-timer 3.0.2",
@@ -7560,7 +7560,7 @@ dependencies = [
 
 [[package]]
 name = "sc-tracing"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "ansi_term 0.12.1",
  "erased-serde",
@@ -7583,7 +7583,7 @@ dependencies = [
 
 [[package]]
 name = "sc-transaction-graph"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "assert_matches",
  "criterion",
@@ -7608,7 +7608,7 @@ dependencies = [
 
 [[package]]
 name = "sc-transaction-pool"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "assert_matches",
  "futures 0.3.9",
@@ -8055,7 +8055,7 @@ dependencies = [
 
 [[package]]
 name = "sp-allocator"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "log",
  "sp-core",
@@ -8066,7 +8066,7 @@ dependencies = [
 
 [[package]]
 name = "sp-api"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "hash-db",
  "parity-scale-codec",
@@ -8082,7 +8082,7 @@ dependencies = [
 
 [[package]]
 name = "sp-api-proc-macro"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate",
@@ -8093,7 +8093,7 @@ dependencies = [
 
 [[package]]
 name = "sp-api-test"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "criterion",
  "parity-scale-codec",
@@ -8112,7 +8112,7 @@ dependencies = [
 
 [[package]]
 name = "sp-application-crypto"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -8135,7 +8135,7 @@ dependencies = [
 
 [[package]]
 name = "sp-arithmetic"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "criterion",
  "integer-sqrt",
@@ -8162,7 +8162,7 @@ dependencies = [
 
 [[package]]
 name = "sp-authority-discovery"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8173,7 +8173,7 @@ dependencies = [
 
 [[package]]
 name = "sp-authorship"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -8183,7 +8183,7 @@ dependencies = [
 
 [[package]]
 name = "sp-block-builder"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8194,7 +8194,7 @@ dependencies = [
 
 [[package]]
 name = "sp-blockchain"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "futures 0.3.9",
  "log",
@@ -8211,7 +8211,7 @@ dependencies = [
 
 [[package]]
 name = "sp-chain-spec"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "serde",
  "serde_json",
@@ -8219,7 +8219,7 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "futures 0.3.9",
  "futures-timer 3.0.2",
@@ -8245,7 +8245,7 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-aura"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8258,7 +8258,7 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-babe"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "merlin",
  "parity-scale-codec",
@@ -8277,7 +8277,7 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-pow"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8288,7 +8288,7 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-slots"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -8296,7 +8296,7 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-vrf"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -8307,7 +8307,7 @@ dependencies = [
 
 [[package]]
 name = "sp-core"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -8356,7 +8356,7 @@ dependencies = [
 
 [[package]]
 name = "sp-database"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "kvdb",
  "parking_lot 0.11.1",
@@ -8364,7 +8364,7 @@ dependencies = [
 
 [[package]]
 name = "sp-debug-derive"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8373,7 +8373,7 @@ dependencies = [
 
 [[package]]
 name = "sp-externalities"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -8383,7 +8383,7 @@ dependencies = [
 
 [[package]]
 name = "sp-finality-grandpa"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -8399,7 +8399,7 @@ dependencies = [
 
 [[package]]
 name = "sp-inherents"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -8410,7 +8410,7 @@ dependencies = [
 
 [[package]]
 name = "sp-io"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "futures 0.3.9",
  "hash-db",
@@ -8433,7 +8433,7 @@ dependencies = [
 
 [[package]]
 name = "sp-keyring"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -8461,7 +8461,7 @@ dependencies = [
 
 [[package]]
 name = "sp-npos-elections"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "parity-scale-codec",
  "rand 0.7.3",
@@ -8475,7 +8475,7 @@ dependencies = [
 
 [[package]]
 name = "sp-npos-elections-compact"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -8497,7 +8497,7 @@ dependencies = [
 
 [[package]]
 name = "sp-offchain"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -8507,14 +8507,14 @@ dependencies = [
 
 [[package]]
 name = "sp-panic-handler"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "backtrace",
 ]
 
 [[package]]
 name = "sp-rpc"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "serde",
  "serde_json",
@@ -8523,7 +8523,7 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -8545,7 +8545,7 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime-interface"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "impl-trait-for-tuples 0.2.0",
  "parity-scale-codec",
@@ -8567,7 +8567,7 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime-interface-proc-macro"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -8616,7 +8616,7 @@ dependencies = [
 
 [[package]]
 name = "sp-sandbox"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "assert_matches",
  "parity-scale-codec",
@@ -8630,7 +8630,7 @@ dependencies = [
 
 [[package]]
 name = "sp-serializer"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "serde",
  "serde_json",
@@ -8638,7 +8638,7 @@ dependencies = [
 
 [[package]]
 name = "sp-session"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8650,7 +8650,7 @@ dependencies = [
 
 [[package]]
 name = "sp-staking"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -8659,7 +8659,7 @@ dependencies = [
 
 [[package]]
 name = "sp-state-machine"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "hash-db",
  "hex-literal",
@@ -8683,11 +8683,11 @@ dependencies = [
 
 [[package]]
 name = "sp-std"
-version = "2.0.0"
+version = "2.0.1"
 
 [[package]]
 name = "sp-storage"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -8724,7 +8724,7 @@ dependencies = [
 
 [[package]]
 name = "sp-timestamp"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "impl-trait-for-tuples 0.2.0",
  "parity-scale-codec",
@@ -8737,7 +8737,7 @@ dependencies = [
 
 [[package]]
 name = "sp-tracing"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -8749,7 +8749,7 @@ dependencies = [
 
 [[package]]
 name = "sp-transaction-pool"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "derive_more",
  "futures 0.3.9",
@@ -8764,7 +8764,7 @@ dependencies = [
 
 [[package]]
 name = "sp-trie"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "criterion",
  "hash-db",
@@ -8782,7 +8782,7 @@ dependencies = [
 
 [[package]]
 name = "sp-utils"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "futures 0.3.9",
  "futures-core",
@@ -8793,7 +8793,7 @@ dependencies = [
 
 [[package]]
 name = "sp-version"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -8804,7 +8804,7 @@ dependencies = [
 
 [[package]]
 name = "sp-wasm-interface"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "impl-trait-for-tuples 0.2.0",
  "parity-scale-codec",
@@ -8932,7 +8932,7 @@ dependencies = [
 
 [[package]]
 name = "substrate-browser-utils"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "chrono",
  "console_error_panic_hook",
@@ -8957,14 +8957,14 @@ dependencies = [
 
 [[package]]
 name = "substrate-build-script-utils"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "platforms",
 ]
 
 [[package]]
 name = "substrate-frame-cli"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-system",
  "sc-cli",
@@ -8975,7 +8975,7 @@ dependencies = [
 
 [[package]]
 name = "substrate-frame-rpc-support"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8991,7 +8991,7 @@ dependencies = [
 
 [[package]]
 name = "substrate-frame-rpc-system"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.9",
@@ -9016,7 +9016,7 @@ dependencies = [
 
 [[package]]
 name = "substrate-prometheus-endpoint"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "async-std",
  "derive_more",
@@ -9029,7 +9029,7 @@ dependencies = [
 
 [[package]]
 name = "substrate-test-client"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "futures 0.1.30",
  "futures 0.3.9",
@@ -9134,7 +9134,7 @@ dependencies = [
 
 [[package]]
 name = "substrate-test-utils"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "futures 0.3.9",
  "sc-service",
@@ -9145,7 +9145,7 @@ dependencies = [
 
 [[package]]
 name = "substrate-test-utils-derive"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "proc-macro-crate",
  "quote",
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index 3aa906ba0fc5..d8479975c37b 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "node-runtime"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 build = "build.rs"
diff --git a/client/api/Cargo.toml b/client/api/Cargo.toml
index 63cdf39d7d28..5f83c2635606 100644
--- a/client/api/Cargo.toml
+++ b/client/api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-client-api"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml
index dd356663f032..9d3a1e118f24 100644
--- a/client/authority-discovery/Cargo.toml
+++ b/client/authority-discovery/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-authority-discovery"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 build = "build.rs"
diff --git a/client/basic-authorship/Cargo.toml b/client/basic-authorship/Cargo.toml
index 62ba6a55da13..1e5e3ec1ac07 100644
--- a/client/basic-authorship/Cargo.toml
+++ b/client/basic-authorship/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-basic-authorship"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
diff --git a/client/block-builder/Cargo.toml b/client/block-builder/Cargo.toml
index 0c3d289bbcbc..c8d2fd82dee9 100644
--- a/client/block-builder/Cargo.toml
+++ b/client/block-builder/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-block-builder"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
diff --git a/client/chain-spec/Cargo.toml b/client/chain-spec/Cargo.toml
index c47331a62457..320cf406b4aa 100644
--- a/client/chain-spec/Cargo.toml
+++ b/client/chain-spec/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-chain-spec"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
diff --git a/client/chain-spec/derive/Cargo.toml b/client/chain-spec/derive/Cargo.toml
index 9ad50482da46..09196c125b7d 100644
--- a/client/chain-spec/derive/Cargo.toml
+++ b/client/chain-spec/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-chain-spec-derive"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index 5baef9156574..18f1f4d6a99b 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-cli"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Substrate CLI interface."
 edition = "2018"
diff --git a/client/consensus/aura/Cargo.toml b/client/consensus/aura/Cargo.toml
index d85b0e2797d3..dc3f958501af 100644
--- a/client/consensus/aura/Cargo.toml
+++ b/client/consensus/aura/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-consensus-aura"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Aura consensus algorithm for substrate"
 edition = "2018"
diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml
index 161c13df4bc0..ae72da4ccb62 100644
--- a/client/consensus/babe/Cargo.toml
+++ b/client/consensus/babe/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-consensus-babe"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "BABE consensus algorithm for substrate"
 edition = "2018"
diff --git a/client/consensus/babe/rpc/Cargo.toml b/client/consensus/babe/rpc/Cargo.toml
index 8a376e6c95b9..adebccdfa742 100644
--- a/client/consensus/babe/rpc/Cargo.toml
+++ b/client/consensus/babe/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-consensus-babe-rpc"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "RPC extensions for the BABE consensus algorithm"
 edition = "2018"
diff --git a/client/consensus/common/Cargo.toml b/client/consensus/common/Cargo.toml
index 0a8a4c43d711..6587553a7370 100644
--- a/client/consensus/common/Cargo.toml
+++ b/client/consensus/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-consensus"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
diff --git a/client/consensus/epochs/Cargo.toml b/client/consensus/epochs/Cargo.toml
index b7de4494bf7a..85d5818dc395 100644
--- a/client/consensus/epochs/Cargo.toml
+++ b/client/consensus/epochs/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-consensus-epochs"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Generic epochs-based utilities for consensus"
 edition = "2018"
diff --git a/client/consensus/manual-seal/Cargo.toml b/client/consensus/manual-seal/Cargo.toml
index 358730cf26f8..943ac74e5c35 100644
--- a/client/consensus/manual-seal/Cargo.toml
+++ b/client/consensus/manual-seal/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-consensus-manual-seal"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Manual sealing engine for Substrate"
 edition = "2018"
diff --git a/client/consensus/pow/Cargo.toml b/client/consensus/pow/Cargo.toml
index cd4d12c37188..c131a3c6277d 100644
--- a/client/consensus/pow/Cargo.toml
+++ b/client/consensus/pow/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-consensus-pow"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "PoW consensus algorithm for substrate"
 edition = "2018"
diff --git a/client/consensus/slots/Cargo.toml b/client/consensus/slots/Cargo.toml
index 1a43448ceb3d..53b66e9aa314 100644
--- a/client/consensus/slots/Cargo.toml
+++ b/client/consensus/slots/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-consensus-slots"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Generic slots-based utilities for consensus"
 edition = "2018"
diff --git a/client/consensus/uncles/Cargo.toml b/client/consensus/uncles/Cargo.toml
index bb23c829a6e0..0bdb25b1220a 100644
--- a/client/consensus/uncles/Cargo.toml
+++ b/client/consensus/uncles/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-consensus-uncles"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Generic uncle inclusion utilities for consensus"
 edition = "2018"
diff --git a/client/db/Cargo.toml b/client/db/Cargo.toml
index e5f5a59be9f5..3a7928469595 100644
--- a/client/db/Cargo.toml
+++ b/client/db/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-client-db"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
diff --git a/client/executor/Cargo.toml b/client/executor/Cargo.toml
index 44eb6b98b056..98273c7e4e4a 100644
--- a/client/executor/Cargo.toml
+++ b/client/executor/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-executor"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
diff --git a/client/executor/common/Cargo.toml b/client/executor/common/Cargo.toml
index 8501144a9a98..d324cb71e9b6 100644
--- a/client/executor/common/Cargo.toml
+++ b/client/executor/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-executor-common"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
diff --git a/client/executor/wasmi/Cargo.toml b/client/executor/wasmi/Cargo.toml
index bf174bca2d46..da576b1bbae4 100644
--- a/client/executor/wasmi/Cargo.toml
+++ b/client/executor/wasmi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-executor-wasmi"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
diff --git a/client/executor/wasmtime/Cargo.toml b/client/executor/wasmtime/Cargo.toml
index 7a8aa1ff458f..461bc570fe09 100644
--- a/client/executor/wasmtime/Cargo.toml
+++ b/client/executor/wasmtime/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-executor-wasmtime"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml
index 7898e87c6c23..831ac509ff0a 100644
--- a/client/finality-grandpa/Cargo.toml
+++ b/client/finality-grandpa/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-finality-grandpa"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
diff --git a/client/finality-grandpa/rpc/Cargo.toml b/client/finality-grandpa/rpc/Cargo.toml
index d1be93a19a72..7f171dc19022 100644
--- a/client/finality-grandpa/rpc/Cargo.toml
+++ b/client/finality-grandpa/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-finality-grandpa-rpc"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "RPC extensions for the GRANDPA finality gadget"
 repository = "https://github.com/paritytech/substrate/"
diff --git a/client/informant/Cargo.toml b/client/informant/Cargo.toml
index 816927a69cf5..fe5ae3857f09 100644
--- a/client/informant/Cargo.toml
+++ b/client/informant/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-informant"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Substrate informant."
 edition = "2018"
diff --git a/client/keystore/Cargo.toml b/client/keystore/Cargo.toml
index ba0585419288..29cbfea3acfd 100644
--- a/client/keystore/Cargo.toml
+++ b/client/keystore/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-keystore"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
diff --git a/client/light/Cargo.toml b/client/light/Cargo.toml
index 4516b5c4b665..d873f7bf9572 100644
--- a/client/light/Cargo.toml
+++ b/client/light/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "components for a light client"
 name = "sc-light"
-version = "2.0.0"
+version = "2.0.1"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
diff --git a/client/network-gossip/Cargo.toml b/client/network-gossip/Cargo.toml
index 15d4db9075b9..3a10c62ac6dd 100644
--- a/client/network-gossip/Cargo.toml
+++ b/client/network-gossip/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "Gossiping for the Substrate network protocol"
 name = "sc-network-gossip"
-version = "0.8.0"
+version = "0.8.1"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index c333c451b501..db2c80e8d3b8 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "Substrate network protocol"
 name = "sc-network"
-version = "0.8.0"
+version = "0.8.1"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
diff --git a/client/offchain/Cargo.toml b/client/offchain/Cargo.toml
index 9fc8c68b9ce6..41109120fb2d 100644
--- a/client/offchain/Cargo.toml
+++ b/client/offchain/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "Substrate offchain workers"
 name = "sc-offchain"
-version = "2.0.0"
+version = "2.0.1"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
diff --git a/client/peerset/Cargo.toml b/client/peerset/Cargo.toml
index 29d33b851793..b2cedbc7733e 100644
--- a/client/peerset/Cargo.toml
+++ b/client/peerset/Cargo.toml
@@ -3,7 +3,7 @@ description = "Connectivity manager based on reputation"
 homepage = "http://parity.io"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 name = "sc-peerset"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 repository = "https://github.com/paritytech/substrate/"
diff --git a/client/proposer-metrics/Cargo.toml b/client/proposer-metrics/Cargo.toml
index 085f50f5be55..29a5701bc9e4 100644
--- a/client/proposer-metrics/Cargo.toml
+++ b/client/proposer-metrics/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-proposer-metrics"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
diff --git a/client/rpc-api/Cargo.toml b/client/rpc-api/Cargo.toml
index 30f6f24f04d0..2be0912d36e1 100644
--- a/client/rpc-api/Cargo.toml
+++ b/client/rpc-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-rpc-api"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
diff --git a/client/rpc-servers/Cargo.toml b/client/rpc-servers/Cargo.toml
index d414fbf259d3..0ee186923e8f 100644
--- a/client/rpc-servers/Cargo.toml
+++ b/client/rpc-servers/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-rpc-server"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml
index 5ccb15dedbc9..b3895cda2a1f 100644
--- a/client/rpc/Cargo.toml
+++ b/client/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-rpc"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index 1059e8f5e146..353a126e5934 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-service"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
diff --git a/client/state-db/Cargo.toml b/client/state-db/Cargo.toml
index e0aa860ded5c..dcf49e1a17ce 100644
--- a/client/state-db/Cargo.toml
+++ b/client/state-db/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-state-db"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
diff --git a/client/telemetry/Cargo.toml b/client/telemetry/Cargo.toml
index fff25661e5ff..3d253c511415 100644
--- a/client/telemetry/Cargo.toml
+++ b/client/telemetry/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-telemetry"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Telemetry utils"
 edition = "2018"
diff --git a/client/tracing/Cargo.toml b/client/tracing/Cargo.toml
index a5839ecc9755..f5cb577a193b 100644
--- a/client/tracing/Cargo.toml
+++ b/client/tracing/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-tracing"
-version = "2.0.0"
+version = "2.0.1"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
diff --git a/client/transaction-pool/Cargo.toml b/client/transaction-pool/Cargo.toml
index 467df6a1fa1a..2183132e778e 100644
--- a/client/transaction-pool/Cargo.toml
+++ b/client/transaction-pool/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-transaction-pool"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
diff --git a/client/transaction-pool/graph/Cargo.toml b/client/transaction-pool/graph/Cargo.toml
index 28afbe36fab3..1427c9c39fca 100644
--- a/client/transaction-pool/graph/Cargo.toml
+++ b/client/transaction-pool/graph/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-transaction-graph"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 1582eee5d926..1dbe447d6267 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -6,6 +6,18 @@ The format is based on [Keep a Changelog].
 
 ## Unreleased
 
+## 2.0.0-> 2.0.1
+
+Patch release with backports to fix broken nightly builds.
+Namely contains backports of
+
+* [#7381: Make Substrate compile with latest nightly](https://github.com/paritytech/substrate/pull/7381)
+* [#7238: Fix compilation with environmental on latest nightly](https://github.com/paritytech/substrate/pull/7238)
+* [#7395: Make benchmarks compile with latest nightly](https://github.com/paritytech/substrate/pull/7395)
+* [#7838: Fix incorrect use of syn::exports](https://github.com/paritytech/substrate/pull/7838) (partially)
+* [#7854: Update to futures 0.3.9](https://github.com/paritytech/substrate/pull/7854)
+
+
 ## 2.0.0-rc6 -> 2.0.0 – two dot 😮
 
 Runtime
diff --git a/frame/assets/Cargo.toml b/frame/assets/Cargo.toml
index 380b561dba40..c04f4f2a600b 100644
--- a/frame/assets/Cargo.toml
+++ b/frame/assets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-assets"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/atomic-swap/Cargo.toml b/frame/atomic-swap/Cargo.toml
index a65632289426..4486057be956 100644
--- a/frame/atomic-swap/Cargo.toml
+++ b/frame/atomic-swap/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-atomic-swap"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/aura/Cargo.toml b/frame/aura/Cargo.toml
index 4307c93a5186..231934b73797 100644
--- a/frame/aura/Cargo.toml
+++ b/frame/aura/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-aura"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/authority-discovery/Cargo.toml b/frame/authority-discovery/Cargo.toml
index 0e1db7463278..e77261e5b29c 100644
--- a/frame/authority-discovery/Cargo.toml
+++ b/frame/authority-discovery/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-authority-discovery"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/authorship/Cargo.toml b/frame/authorship/Cargo.toml
index ec0611d38084..b5a5197834e9 100644
--- a/frame/authorship/Cargo.toml
+++ b/frame/authorship/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-authorship"
-version = "2.0.0"
+version = "2.0.1"
 description = "Block and Uncle Author tracking for the FRAME"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
diff --git a/frame/babe/Cargo.toml b/frame/babe/Cargo.toml
index a210a2a8ef06..e1b4590d5bf7 100644
--- a/frame/babe/Cargo.toml
+++ b/frame/babe/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-babe"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/balances/Cargo.toml b/frame/balances/Cargo.toml
index 21c8abbc24a6..004e631d4871 100644
--- a/frame/balances/Cargo.toml
+++ b/frame/balances/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-balances"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/benchmarking/Cargo.toml b/frame/benchmarking/Cargo.toml
index acd29e468243..bbd61b6cea0a 100644
--- a/frame/benchmarking/Cargo.toml
+++ b/frame/benchmarking/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-benchmarking"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/collective/Cargo.toml b/frame/collective/Cargo.toml
index fd302fb83657..f25490b2df83 100644
--- a/frame/collective/Cargo.toml
+++ b/frame/collective/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-collective"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/contracts/Cargo.toml b/frame/contracts/Cargo.toml
index 67d9ae8101fe..76c429bd44f6 100644
--- a/frame/contracts/Cargo.toml
+++ b/frame/contracts/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-contracts"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/contracts/common/Cargo.toml b/frame/contracts/common/Cargo.toml
index 45195fc8c45f..016e3e2eb00e 100644
--- a/frame/contracts/common/Cargo.toml
+++ b/frame/contracts/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-contracts-primitives"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/contracts/rpc/Cargo.toml b/frame/contracts/rpc/Cargo.toml
index 5136af5450dd..45abaa2c8497 100644
--- a/frame/contracts/rpc/Cargo.toml
+++ b/frame/contracts/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-contracts-rpc"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/contracts/rpc/runtime-api/Cargo.toml b/frame/contracts/rpc/runtime-api/Cargo.toml
index ec390ee4b166..b9f248fb1214 100644
--- a/frame/contracts/rpc/runtime-api/Cargo.toml
+++ b/frame/contracts/rpc/runtime-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-contracts-rpc-runtime-api"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/democracy/Cargo.toml b/frame/democracy/Cargo.toml
index 44639a227564..8f331385fe4b 100644
--- a/frame/democracy/Cargo.toml
+++ b/frame/democracy/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-democracy"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/elections-phragmen/Cargo.toml b/frame/elections-phragmen/Cargo.toml
index 8d59cde19255..8b09e7742253 100644
--- a/frame/elections-phragmen/Cargo.toml
+++ b/frame/elections-phragmen/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-elections-phragmen"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/elections/Cargo.toml b/frame/elections/Cargo.toml
index f0281a3033dd..08fc8267ed68 100644
--- a/frame/elections/Cargo.toml
+++ b/frame/elections/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-elections"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/example-offchain-worker/Cargo.toml b/frame/example-offchain-worker/Cargo.toml
index 7db1d348ab2d..32fb12cbedf1 100644
--- a/frame/example-offchain-worker/Cargo.toml
+++ b/frame/example-offchain-worker/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-example-offchain-worker"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Unlicense"
diff --git a/frame/example-parallel/Cargo.toml b/frame/example-parallel/Cargo.toml
index 01a612fb82fb..83276ba5dc6b 100644
--- a/frame/example-parallel/Cargo.toml
+++ b/frame/example-parallel/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-example-parallel"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Unlicense"
diff --git a/frame/executive/Cargo.toml b/frame/executive/Cargo.toml
index 3bd8da04e6cf..7cd160118970 100644
--- a/frame/executive/Cargo.toml
+++ b/frame/executive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-executive"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/grandpa/Cargo.toml b/frame/grandpa/Cargo.toml
index 6cde1061df87..2d96c5be1295 100644
--- a/frame/grandpa/Cargo.toml
+++ b/frame/grandpa/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-grandpa"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/identity/Cargo.toml b/frame/identity/Cargo.toml
index 08777c44ad2b..b39ce1c944e4 100644
--- a/frame/identity/Cargo.toml
+++ b/frame/identity/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-identity"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/im-online/Cargo.toml b/frame/im-online/Cargo.toml
index ef22d6768873..69cf402a12f3 100644
--- a/frame/im-online/Cargo.toml
+++ b/frame/im-online/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-im-online"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/indices/Cargo.toml b/frame/indices/Cargo.toml
index aea8dbf1a866..42af6aa49859 100644
--- a/frame/indices/Cargo.toml
+++ b/frame/indices/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-indices"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/membership/Cargo.toml b/frame/membership/Cargo.toml
index 1cac5d38c5f1..251f987ded99 100644
--- a/frame/membership/Cargo.toml
+++ b/frame/membership/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-membership"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/merkle-mountain-range/Cargo.toml b/frame/merkle-mountain-range/Cargo.toml
index b46f42cacf65..8f1f14f8cfbb 100644
--- a/frame/merkle-mountain-range/Cargo.toml
+++ b/frame/merkle-mountain-range/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-mmr"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/metadata/Cargo.toml b/frame/metadata/Cargo.toml
index 2934b15562c4..f0db94541357 100644
--- a/frame/metadata/Cargo.toml
+++ b/frame/metadata/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-metadata"
-version = "12.0.0"
+version = "12.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/multisig/Cargo.toml b/frame/multisig/Cargo.toml
index 2be66ebb722c..78e71080c339 100644
--- a/frame/multisig/Cargo.toml
+++ b/frame/multisig/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-multisig"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/nicks/Cargo.toml b/frame/nicks/Cargo.toml
index 8f348d665b7e..c23fa9badada 100644
--- a/frame/nicks/Cargo.toml
+++ b/frame/nicks/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-nicks"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/offences/Cargo.toml b/frame/offences/Cargo.toml
index c5c8881007c2..fbc8567534c6 100644
--- a/frame/offences/Cargo.toml
+++ b/frame/offences/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-offences"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/offences/benchmarking/Cargo.toml b/frame/offences/benchmarking/Cargo.toml
index 7a95cebc4fb2..d2e020ef681e 100644
--- a/frame/offences/benchmarking/Cargo.toml
+++ b/frame/offences/benchmarking/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-offences-benchmarking"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/randomness-collective-flip/Cargo.toml b/frame/randomness-collective-flip/Cargo.toml
index d35f6960af5d..bca617e6f484 100644
--- a/frame/randomness-collective-flip/Cargo.toml
+++ b/frame/randomness-collective-flip/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-randomness-collective-flip"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/recovery/Cargo.toml b/frame/recovery/Cargo.toml
index 0ba2f5437c61..dd4a783af42f 100644
--- a/frame/recovery/Cargo.toml
+++ b/frame/recovery/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-recovery"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/scheduler/Cargo.toml b/frame/scheduler/Cargo.toml
index 613762bb689e..5178e0c86069 100644
--- a/frame/scheduler/Cargo.toml
+++ b/frame/scheduler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-scheduler"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Unlicense"
diff --git a/frame/scored-pool/Cargo.toml b/frame/scored-pool/Cargo.toml
index b36bade8e925..45eb5ee7b278 100644
--- a/frame/scored-pool/Cargo.toml
+++ b/frame/scored-pool/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-scored-pool"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/session/Cargo.toml b/frame/session/Cargo.toml
index 4785e312a900..3d58ad6749a2 100644
--- a/frame/session/Cargo.toml
+++ b/frame/session/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-session"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/session/benchmarking/Cargo.toml b/frame/session/benchmarking/Cargo.toml
index dea05934cd87..7b025e52a7d1 100644
--- a/frame/session/benchmarking/Cargo.toml
+++ b/frame/session/benchmarking/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-session-benchmarking"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/society/Cargo.toml b/frame/society/Cargo.toml
index 2f3f3adabc2c..b380620226bf 100644
--- a/frame/society/Cargo.toml
+++ b/frame/society/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-society"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/staking/Cargo.toml b/frame/staking/Cargo.toml
index ac029c07eb1d..cbb16e1f4749 100644
--- a/frame/staking/Cargo.toml
+++ b/frame/staking/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-staking"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/staking/reward-curve/Cargo.toml b/frame/staking/reward-curve/Cargo.toml
index cde4482d7bb6..9d2564522cd9 100644
--- a/frame/staking/reward-curve/Cargo.toml
+++ b/frame/staking/reward-curve/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-staking-reward-curve"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/sudo/Cargo.toml b/frame/sudo/Cargo.toml
index 4713baea518f..5ed084c1fbd3 100644
--- a/frame/sudo/Cargo.toml
+++ b/frame/sudo/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-sudo"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/support/Cargo.toml b/frame/support/Cargo.toml
index 981cbb7498c2..0bb842fbf539 100644
--- a/frame/support/Cargo.toml
+++ b/frame/support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-support"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -24,7 +24,7 @@ sp-tracing = { version = "2.0.0", default-features = false, path = "../../primit
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
 sp-arithmetic = { version = "2.0.0", default-features = false, path = "../../primitives/arithmetic" }
 sp-inherents = { version = "2.0.0", default-features = false, path = "../../primitives/inherents" }
-frame-support-procedural = { version = "2.0.0", default-features = false, path = "./procedural" }
+frame-support-procedural = { version = "2.0.1", default-features = false, path = "./procedural" }
 paste = "0.1.6"
 once_cell = { version = "1", default-features = false, optional = true }
 sp-state-machine = { version = "0.8.0", optional = true, path = "../../primitives/state-machine" }
diff --git a/frame/support/procedural/Cargo.toml b/frame/support/procedural/Cargo.toml
index 35ee5ce94c62..3d829afb0ca3 100644
--- a/frame/support/procedural/Cargo.toml
+++ b/frame/support/procedural/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-support-procedural"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/support/procedural/tools/Cargo.toml b/frame/support/procedural/tools/Cargo.toml
index 3f73df8fa219..0c8b9249b5ca 100644
--- a/frame/support/procedural/tools/Cargo.toml
+++ b/frame/support/procedural/tools/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-support-procedural-tools"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/support/procedural/tools/derive/Cargo.toml b/frame/support/procedural/tools/derive/Cargo.toml
index 461d2f6fbf8c..0ec72f1388e0 100644
--- a/frame/support/procedural/tools/derive/Cargo.toml
+++ b/frame/support/procedural/tools/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-support-procedural-tools-derive"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/support/test/Cargo.toml b/frame/support/test/Cargo.toml
index 4175c2e4c933..4424bd2a3215 100644
--- a/frame/support/test/Cargo.toml
+++ b/frame/support/test/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-support-test"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/system/Cargo.toml b/frame/system/Cargo.toml
index 7b678f44e1c2..da188b335789 100644
--- a/frame/system/Cargo.toml
+++ b/frame/system/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-system"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -20,7 +20,7 @@ sp-std = { version = "2.0.0", default-features = false, path = "../../primitives
 sp-io = { version = "2.0.0", path = "../../primitives/io", default-features = false }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
 sp-version = { version = "2.0.0", default-features = false, path = "../../primitives/version" }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
+frame-support = { version = "2.0.1", default-features = false, path = "../support" }
 impl-trait-for-tuples = "0.2.0"
 
 [dev-dependencies]
diff --git a/frame/system/benchmarking/Cargo.toml b/frame/system/benchmarking/Cargo.toml
index 26b9bd9230e0..39f33b033bb5 100644
--- a/frame/system/benchmarking/Cargo.toml
+++ b/frame/system/benchmarking/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-system-benchmarking"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/system/rpc/runtime-api/Cargo.toml b/frame/system/rpc/runtime-api/Cargo.toml
index d00094364e3e..9df5fbec11d0 100644
--- a/frame/system/rpc/runtime-api/Cargo.toml
+++ b/frame/system/rpc/runtime-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-system-rpc-runtime-api"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/timestamp/Cargo.toml b/frame/timestamp/Cargo.toml
index 0d44e22da9e4..59304e199c6e 100644
--- a/frame/timestamp/Cargo.toml
+++ b/frame/timestamp/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-timestamp"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/transaction-payment/Cargo.toml b/frame/transaction-payment/Cargo.toml
index 1fa452190042..57e33ae3eb64 100644
--- a/frame/transaction-payment/Cargo.toml
+++ b/frame/transaction-payment/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-transaction-payment"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/transaction-payment/rpc/Cargo.toml b/frame/transaction-payment/rpc/Cargo.toml
index 77ebc0fb80e9..348f7ae158e8 100644
--- a/frame/transaction-payment/rpc/Cargo.toml
+++ b/frame/transaction-payment/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-transaction-payment-rpc"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/transaction-payment/rpc/runtime-api/Cargo.toml b/frame/transaction-payment/rpc/runtime-api/Cargo.toml
index 881c4330eb9a..9d4883993407 100644
--- a/frame/transaction-payment/rpc/runtime-api/Cargo.toml
+++ b/frame/transaction-payment/rpc/runtime-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-transaction-payment-rpc-runtime-api"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/treasury/Cargo.toml b/frame/treasury/Cargo.toml
index 6be555a3e379..ce0532b434f0 100644
--- a/frame/treasury/Cargo.toml
+++ b/frame/treasury/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-treasury"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/utility/Cargo.toml b/frame/utility/Cargo.toml
index 098730aa3008..a8ab438fc06c 100644
--- a/frame/utility/Cargo.toml
+++ b/frame/utility/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-utility"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/vesting/Cargo.toml b/frame/vesting/Cargo.toml
index bea64c2b4f94..eda21dc8bbc7 100644
--- a/frame/vesting/Cargo.toml
+++ b/frame/vesting/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-vesting"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/allocator/Cargo.toml b/primitives/allocator/Cargo.toml
index 130723730c4e..4fef71db7540 100644
--- a/primitives/allocator/Cargo.toml
+++ b/primitives/allocator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-allocator"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/api/Cargo.toml b/primitives/api/Cargo.toml
index 97f9618fe56f..69ed31da7aae 100644
--- a/primitives/api/Cargo.toml
+++ b/primitives/api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-api"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/api/proc-macro/Cargo.toml b/primitives/api/proc-macro/Cargo.toml
index 21f4dec96b56..98ca45081c1e 100644
--- a/primitives/api/proc-macro/Cargo.toml
+++ b/primitives/api/proc-macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-api-proc-macro"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/api/test/Cargo.toml b/primitives/api/test/Cargo.toml
index 046c923c03b6..20842aab1f7f 100644
--- a/primitives/api/test/Cargo.toml
+++ b/primitives/api/test/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-api-test"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/application-crypto/Cargo.toml b/primitives/application-crypto/Cargo.toml
index 47776d809110..9960e229a277 100644
--- a/primitives/application-crypto/Cargo.toml
+++ b/primitives/application-crypto/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-application-crypto"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 description = "Provides facilities for generating application specific crypto wrapper types."
diff --git a/primitives/arithmetic/Cargo.toml b/primitives/arithmetic/Cargo.toml
index 03891956dec0..5b306ff71736 100644
--- a/primitives/arithmetic/Cargo.toml
+++ b/primitives/arithmetic/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-arithmetic"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/authority-discovery/Cargo.toml b/primitives/authority-discovery/Cargo.toml
index ae373f1866ff..b47d489deebd 100644
--- a/primitives/authority-discovery/Cargo.toml
+++ b/primitives/authority-discovery/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-authority-discovery"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Authority discovery primitives"
 edition = "2018"
diff --git a/primitives/authorship/Cargo.toml b/primitives/authorship/Cargo.toml
index b6f463029077..b97a9d4f4554 100644
--- a/primitives/authorship/Cargo.toml
+++ b/primitives/authorship/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-authorship"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Authorship primitives"
 edition = "2018"
diff --git a/primitives/block-builder/Cargo.toml b/primitives/block-builder/Cargo.toml
index 767307c2a842..019fa4518425 100644
--- a/primitives/block-builder/Cargo.toml
+++ b/primitives/block-builder/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-block-builder"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/blockchain/Cargo.toml b/primitives/blockchain/Cargo.toml
index 1be4331db1c0..516094179e36 100644
--- a/primitives/blockchain/Cargo.toml
+++ b/primitives/blockchain/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-blockchain"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/chain-spec/Cargo.toml b/primitives/chain-spec/Cargo.toml
index a94bd8ad0139..52747dca94c9 100644
--- a/primitives/chain-spec/Cargo.toml
+++ b/primitives/chain-spec/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-chain-spec"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/consensus/aura/Cargo.toml b/primitives/consensus/aura/Cargo.toml
index 7ef5f67350ba..89f83ddcb6a6 100644
--- a/primitives/consensus/aura/Cargo.toml
+++ b/primitives/consensus/aura/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-consensus-aura"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Primitives for Aura consensus"
 edition = "2018"
diff --git a/primitives/consensus/babe/Cargo.toml b/primitives/consensus/babe/Cargo.toml
index 4a22e3f77be4..6b65bc5f3dbd 100644
--- a/primitives/consensus/babe/Cargo.toml
+++ b/primitives/consensus/babe/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-consensus-babe"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Primitives for BABE consensus"
 edition = "2018"
diff --git a/primitives/consensus/common/Cargo.toml b/primitives/consensus/common/Cargo.toml
index 1f6a993886d3..7172451bc968 100644
--- a/primitives/consensus/common/Cargo.toml
+++ b/primitives/consensus/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-consensus"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/consensus/pow/Cargo.toml b/primitives/consensus/pow/Cargo.toml
index cbcea886a709..3c8ce89a800a 100644
--- a/primitives/consensus/pow/Cargo.toml
+++ b/primitives/consensus/pow/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-consensus-pow"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Primitives for Aura consensus"
 edition = "2018"
diff --git a/primitives/consensus/slots/Cargo.toml b/primitives/consensus/slots/Cargo.toml
index e605d585b722..60e8020aa7e1 100644
--- a/primitives/consensus/slots/Cargo.toml
+++ b/primitives/consensus/slots/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-consensus-slots"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Primitives for slots-based consensus"
 edition = "2018"
diff --git a/primitives/consensus/vrf/Cargo.toml b/primitives/consensus/vrf/Cargo.toml
index d0b7d2e2f7aa..58daab488c39 100644
--- a/primitives/consensus/vrf/Cargo.toml
+++ b/primitives/consensus/vrf/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-consensus-vrf"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Primitives for VRF based consensus"
 edition = "2018"
diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml
index cdbc1520e36f..de06ecd87e9e 100644
--- a/primitives/core/Cargo.toml
+++ b/primitives/core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-core"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/database/Cargo.toml b/primitives/database/Cargo.toml
index 33546c32df2c..728396aea74c 100644
--- a/primitives/database/Cargo.toml
+++ b/primitives/database/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-database"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/debug-derive/Cargo.toml b/primitives/debug-derive/Cargo.toml
index d39af3a5be69..f72842b19615 100644
--- a/primitives/debug-derive/Cargo.toml
+++ b/primitives/debug-derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-debug-derive"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/externalities/Cargo.toml b/primitives/externalities/Cargo.toml
index 9000dde058cd..ca03fe3b735d 100644
--- a/primitives/externalities/Cargo.toml
+++ b/primitives/externalities/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-externalities"
-version = "0.8.0"
+version = "0.8.1"
 license = "Apache-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
diff --git a/primitives/finality-grandpa/Cargo.toml b/primitives/finality-grandpa/Cargo.toml
index 88098139ceec..df146ccd74d9 100644
--- a/primitives/finality-grandpa/Cargo.toml
+++ b/primitives/finality-grandpa/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-finality-grandpa"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/inherents/Cargo.toml b/primitives/inherents/Cargo.toml
index bb6b7bbff1ff..ad474c009811 100644
--- a/primitives/inherents/Cargo.toml
+++ b/primitives/inherents/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-inherents"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/io/Cargo.toml b/primitives/io/Cargo.toml
index ce2173bd028e..a1bdc5c2d899 100644
--- a/primitives/io/Cargo.toml
+++ b/primitives/io/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-io"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/keyring/Cargo.toml b/primitives/keyring/Cargo.toml
index be4db5834458..e3e927f70bb8 100644
--- a/primitives/keyring/Cargo.toml
+++ b/primitives/keyring/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-keyring"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/npos-elections/Cargo.toml b/primitives/npos-elections/Cargo.toml
index 44bcb2af8752..71e66e932739 100644
--- a/primitives/npos-elections/Cargo.toml
+++ b/primitives/npos-elections/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-npos-elections"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/npos-elections/compact/Cargo.toml b/primitives/npos-elections/compact/Cargo.toml
index cee3bf9f67aa..7383dd67d593 100644
--- a/primitives/npos-elections/compact/Cargo.toml
+++ b/primitives/npos-elections/compact/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-npos-elections-compact"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/offchain/Cargo.toml b/primitives/offchain/Cargo.toml
index 02041d5c678e..6678ac32ea67 100644
--- a/primitives/offchain/Cargo.toml
+++ b/primitives/offchain/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "Substrate offchain workers primitives"
 name = "sp-offchain"
-version = "2.0.0"
+version = "2.0.1"
 license = "Apache-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
diff --git a/primitives/panic-handler/Cargo.toml b/primitives/panic-handler/Cargo.toml
index 0baba8ee7aba..5ec47423c014 100644
--- a/primitives/panic-handler/Cargo.toml
+++ b/primitives/panic-handler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-panic-handler"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/rpc/Cargo.toml b/primitives/rpc/Cargo.toml
index 0c9fe8ebd666..364489436278 100644
--- a/primitives/rpc/Cargo.toml
+++ b/primitives/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-rpc"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/runtime-interface/Cargo.toml b/primitives/runtime-interface/Cargo.toml
index d68631e2911f..5e11294cc5c3 100644
--- a/primitives/runtime-interface/Cargo.toml
+++ b/primitives/runtime-interface/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-runtime-interface"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/runtime-interface/proc-macro/Cargo.toml b/primitives/runtime-interface/proc-macro/Cargo.toml
index 67aa201dce24..a63247758c3a 100644
--- a/primitives/runtime-interface/proc-macro/Cargo.toml
+++ b/primitives/runtime-interface/proc-macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-runtime-interface-proc-macro"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/runtime/Cargo.toml b/primitives/runtime/Cargo.toml
index 705157b63f25..42586dec3fb2 100644
--- a/primitives/runtime/Cargo.toml
+++ b/primitives/runtime/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-runtime"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/sandbox/Cargo.toml b/primitives/sandbox/Cargo.toml
index 70ae56fb4810..4a4dd2f28a41 100755
--- a/primitives/sandbox/Cargo.toml
+++ b/primitives/sandbox/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-sandbox"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/serializer/Cargo.toml b/primitives/serializer/Cargo.toml
index 5a4514db86da..670d8736400b 100644
--- a/primitives/serializer/Cargo.toml
+++ b/primitives/serializer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-serializer"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/session/Cargo.toml b/primitives/session/Cargo.toml
index 4fccce628314..024a9fad6e70 100644
--- a/primitives/session/Cargo.toml
+++ b/primitives/session/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-session"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/staking/Cargo.toml b/primitives/staking/Cargo.toml
index 315d5acc49da..2fe36db3871b 100644
--- a/primitives/staking/Cargo.toml
+++ b/primitives/staking/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-staking"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/state-machine/Cargo.toml b/primitives/state-machine/Cargo.toml
index 679a961a85b7..62879e5712ea 100644
--- a/primitives/state-machine/Cargo.toml
+++ b/primitives/state-machine/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-state-machine"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Substrate State Machine"
 edition = "2018"
diff --git a/primitives/std/Cargo.toml b/primitives/std/Cargo.toml
index 5b988cabc150..91edfc973263 100644
--- a/primitives/std/Cargo.toml
+++ b/primitives/std/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-std"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/storage/Cargo.toml b/primitives/storage/Cargo.toml
index 4f14ba38f214..bc593bca0a4e 100644
--- a/primitives/storage/Cargo.toml
+++ b/primitives/storage/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-storage"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 description = "Storage related primitives"
diff --git a/primitives/timestamp/Cargo.toml b/primitives/timestamp/Cargo.toml
index 4916e4c3d84e..9bdb0bac5ee5 100644
--- a/primitives/timestamp/Cargo.toml
+++ b/primitives/timestamp/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-timestamp"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/tracing/Cargo.toml b/primitives/tracing/Cargo.toml
index c6d4d7b4cacc..31527b204963 100644
--- a/primitives/tracing/Cargo.toml
+++ b/primitives/tracing/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-tracing"
-version = "2.0.0"
+version = "2.0.1"
 license = "Apache-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
diff --git a/primitives/transaction-pool/Cargo.toml b/primitives/transaction-pool/Cargo.toml
index 4247e1a50c9b..0b563481e5db 100644
--- a/primitives/transaction-pool/Cargo.toml
+++ b/primitives/transaction-pool/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-transaction-pool"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/trie/Cargo.toml b/primitives/trie/Cargo.toml
index 4f3a5cdd4ea7..3179333edd5d 100644
--- a/primitives/trie/Cargo.toml
+++ b/primitives/trie/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-trie"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Patricia trie stuff using a parity-scale-codec node format"
 repository = "https://github.com/paritytech/substrate/"
diff --git a/primitives/utils/Cargo.toml b/primitives/utils/Cargo.toml
index 7a02d1c0e98d..b42c92abad92 100644
--- a/primitives/utils/Cargo.toml
+++ b/primitives/utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-utils"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/version/Cargo.toml b/primitives/version/Cargo.toml
index e9475846246e..5b369c424455 100644
--- a/primitives/version/Cargo.toml
+++ b/primitives/version/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-version"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/wasm-interface/Cargo.toml b/primitives/wasm-interface/Cargo.toml
index 67fa91b7798d..0473bb4c51ce 100644
--- a/primitives/wasm-interface/Cargo.toml
+++ b/primitives/wasm-interface/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-wasm-interface"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml
index 66f5703b2c94..1b15c34401fe 100644
--- a/test-utils/Cargo.toml
+++ b/test-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-test-utils"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/test-utils/client/Cargo.toml b/test-utils/client/Cargo.toml
index 8b8f06d5273e..af15f356a3e8 100644
--- a/test-utils/client/Cargo.toml
+++ b/test-utils/client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-test-client"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/test-utils/derive/Cargo.toml b/test-utils/derive/Cargo.toml
index a8e5a3463567..1fb1db555f49 100644
--- a/test-utils/derive/Cargo.toml
+++ b/test-utils/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-test-utils-derive"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/utils/browser/Cargo.toml b/utils/browser/Cargo.toml
index a779c9005da7..c8b2ac957433 100644
--- a/utils/browser/Cargo.toml
+++ b/utils/browser/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-browser-utils"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Utilities for creating a browser light-client."
 edition = "2018"
diff --git a/utils/build-script-utils/Cargo.toml b/utils/build-script-utils/Cargo.toml
index 30c8a4c52b65..f82ee7487d9f 100644
--- a/utils/build-script-utils/Cargo.toml
+++ b/utils/build-script-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-build-script-utils"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/utils/fork-tree/Cargo.toml b/utils/fork-tree/Cargo.toml
index 23662722a1f6..6e9318e1ca0f 100644
--- a/utils/fork-tree/Cargo.toml
+++ b/utils/fork-tree/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fork-tree"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/utils/frame/benchmarking-cli/Cargo.toml b/utils/frame/benchmarking-cli/Cargo.toml
index 83f93799691d..717224f787f5 100644
--- a/utils/frame/benchmarking-cli/Cargo.toml
+++ b/utils/frame/benchmarking-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-benchmarking-cli"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/utils/frame/frame-utilities-cli/Cargo.toml b/utils/frame/frame-utilities-cli/Cargo.toml
index 0e39f3551254..4f0030b02182 100644
--- a/utils/frame/frame-utilities-cli/Cargo.toml
+++ b/utils/frame/frame-utilities-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-frame-cli"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/utils/frame/rpc/support/Cargo.toml b/utils/frame/rpc/support/Cargo.toml
index 3b310b3a91c4..7eb0dfcf614c 100644
--- a/utils/frame/rpc/support/Cargo.toml
+++ b/utils/frame/rpc/support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-frame-rpc-support"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>", "Andrew Dirksen <andrew@dirksen.com>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/utils/frame/rpc/system/Cargo.toml b/utils/frame/rpc/system/Cargo.toml
index 19b6a6e8302b..735fd51cc91b 100644
--- a/utils/frame/rpc/system/Cargo.toml
+++ b/utils/frame/rpc/system/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-frame-rpc-system"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/utils/prometheus/Cargo.toml b/utils/prometheus/Cargo.toml
index 335f84bf0f26..19df4fb8059d 100644
--- a/utils/prometheus/Cargo.toml
+++ b/utils/prometheus/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "Endpoint to expose Prometheus metrics"
 name = "substrate-prometheus-endpoint"
-version = "0.8.0"
+version = "0.8.1"
 license = "Apache-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"

From f6ca02da559fab0a0a9815637f184e818052b398 Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann <ben@gnunicorn.org>
Date: Mon, 11 Jan 2021 12:17:21 +0100
Subject: [PATCH 0250/1194] Bump cargo-unleash to latest alpha release (#7867)

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eb432191dbe6..2a9f02a3a61b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,7 +35,7 @@ variables:                         &default-vars
   DOCKER_OS:                       "debian:stretch"
   ARCH:                            "x86_64"
   # FIXME set to release
-  CARGO_UNLEASH_INSTALL_PARAMS:    "--version 1.0.0-alpha.10"
+  CARGO_UNLEASH_INSTALL_PARAMS:    "--version 1.0.0-alpha.11"
   CARGO_UNLEASH_PKG_DEF:           "--skip node node-* pallet-template pallet-example pallet-example-* subkey chain-spec-builder"
 
 default:

From 8b3e4c86bc5a86570a3091e470011604fb46d324 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Jan 2021 11:58:26 +0000
Subject: [PATCH 0251/1194] Bump sha2 from 0.8.2 to 0.9.2 (#7643)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Bump sha2 from 0.8.2 to 0.9.2

Bumps [sha2](https://github.com/RustCrypto/hashes) from 0.8.2 to 0.9.2.
- [Release notes](https://github.com/RustCrypto/hashes/releases)
- [Commits](https://github.com/RustCrypto/hashes/compare/sha2-v0.8.2...streebog-v0.9.2)

Signed-off-by: dependabot[bot] <support@github.com>

* Fix compilation error

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Bastian Köcher <git@kchr.de>
---
 Cargo.lock                     | 2 +-
 primitives/core/Cargo.toml     | 2 +-
 primitives/core/src/hashing.rs | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 871b0f60d77e..6e7c1085828f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8338,7 +8338,7 @@ dependencies = [
  "secrecy",
  "serde",
  "serde_json",
- "sha2 0.8.2",
+ "sha2 0.9.2",
  "sp-debug-derive",
  "sp-externalities",
  "sp-runtime-interface",
diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml
index de06ecd87e9e..50c57e068da4 100644
--- a/primitives/core/Cargo.toml
+++ b/primitives/core/Cargo.toml
@@ -46,7 +46,7 @@ ed25519-dalek = { version = "1.0.1", default-features = false, features = ["u64_
 blake2-rfc = { version = "0.2.18", default-features = false, optional = true }
 tiny-keccak = { version = "2.0.1", features = ["keccak"], optional = true }
 schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated", "u64_backend"], default-features = false, optional = true }
-sha2 = { version = "0.8.0", default-features = false, optional = true }
+sha2 = { version = "0.9.2", default-features = false, optional = true }
 hex = { version = "0.4", default-features = false, optional = true }
 twox-hash = { version = "1.5.0", default-features = false, optional = true }
 libsecp256k1 = { version = "0.3.2", default-features = false, features = ["hmac"], optional = true }
diff --git a/primitives/core/src/hashing.rs b/primitives/core/src/hashing.rs
index 8a4c5191dd31..0b67d33235ae 100644
--- a/primitives/core/src/hashing.rs
+++ b/primitives/core/src/hashing.rs
@@ -77,7 +77,7 @@ pub fn blake2_64(data: &[u8]) -> [u8; 8] {
 
 /// Do a XX 64-bit hash and place result in `dest`.
 pub fn twox_64_into(data: &[u8], dest: &mut [u8; 8]) {
-	use ::core::hash::Hasher;
+	use core::hash::Hasher;
 	let mut h0 = twox_hash::XxHash::with_seed(0);
 	h0.write(data);
 	let r0 = h0.finish();
@@ -94,7 +94,7 @@ pub fn twox_64(data: &[u8]) -> [u8; 8] {
 
 /// Do a XX 128-bit hash and place result in `dest`.
 pub fn twox_128_into(data: &[u8], dest: &mut [u8; 16]) {
-	use ::core::hash::Hasher;
+	use core::hash::Hasher;
 	let mut h0 = twox_hash::XxHash::with_seed(0);
 	let mut h1 = twox_hash::XxHash::with_seed(1);
 	h0.write(data);
@@ -163,8 +163,8 @@ pub fn keccak_512(data: &[u8]) -> [u8; 64] {
 /// Do a sha2 256-bit hash and return result.
 pub fn sha2_256(data: &[u8]) -> [u8; 32] {
 	let mut hasher = Sha256::new();
-	hasher.input(data);
+	hasher.update(data);
 	let mut output = [0u8; 32];
-	output.copy_from_slice(&hasher.result());
+	output.copy_from_slice(&hasher.finalize());
 	output
 }

From b2f10ede7e9e805994a3e45181a2ec8539936501 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Tue, 12 Jan 2021 09:25:47 +0100
Subject: [PATCH 0252/1194] bumpd minor version (#7873)

---
 Cargo.lock                                           | 4 ++--
 bin/node-template/pallets/template/Cargo.toml        | 2 +-
 bin/node-template/runtime/Cargo.toml                 | 2 +-
 bin/node/cli/Cargo.toml                              | 2 +-
 bin/node/executor/Cargo.toml                         | 2 +-
 bin/node/inspect/Cargo.toml                          | 2 +-
 bin/node/primitives/Cargo.toml                       | 2 +-
 bin/node/runtime/Cargo.toml                          | 2 +-
 bin/node/testing/Cargo.toml                          | 2 +-
 client/api/Cargo.toml                                | 2 +-
 client/authority-discovery/Cargo.toml                | 2 +-
 client/basic-authorship/Cargo.toml                   | 2 +-
 client/block-builder/Cargo.toml                      | 2 +-
 client/chain-spec/Cargo.toml                         | 2 +-
 client/cli/Cargo.toml                                | 2 +-
 client/consensus/aura/Cargo.toml                     | 2 +-
 client/consensus/babe/Cargo.toml                     | 2 +-
 client/consensus/epochs/Cargo.toml                   | 2 +-
 client/consensus/manual-seal/Cargo.toml              | 2 +-
 client/consensus/pow/Cargo.toml                      | 2 +-
 client/consensus/slots/Cargo.toml                    | 2 +-
 client/db/Cargo.toml                                 | 2 +-
 client/executor/Cargo.toml                           | 2 +-
 client/executor/common/Cargo.toml                    | 2 +-
 client/executor/wasmi/Cargo.toml                     | 2 +-
 client/executor/wasmtime/Cargo.toml                  | 2 +-
 client/finality-grandpa/Cargo.toml                   | 2 +-
 client/finality-grandpa/rpc/Cargo.toml               | 2 +-
 client/light/Cargo.toml                              | 2 +-
 client/network/Cargo.toml                            | 2 +-
 client/offchain/Cargo.toml                           | 2 +-
 client/rpc-api/Cargo.toml                            | 2 +-
 client/rpc/Cargo.toml                                | 2 +-
 client/service/Cargo.toml                            | 2 +-
 client/service/test/Cargo.toml                       | 2 +-
 client/state-db/Cargo.toml                           | 2 +-
 client/transaction-pool/Cargo.toml                   | 2 +-
 client/transaction-pool/graph/Cargo.toml             | 2 +-
 frame/assets/Cargo.toml                              | 2 +-
 frame/atomic-swap/Cargo.toml                         | 2 +-
 frame/aura/Cargo.toml                                | 2 +-
 frame/authority-discovery/Cargo.toml                 | 2 +-
 frame/authorship/Cargo.toml                          | 2 +-
 frame/babe/Cargo.toml                                | 2 +-
 frame/balances/Cargo.toml                            | 2 +-
 frame/benchmarking/Cargo.toml                        | 2 +-
 frame/bounties/Cargo.toml                            | 2 +-
 frame/collective/Cargo.toml                          | 2 +-
 frame/contracts/Cargo.toml                           | 2 +-
 frame/contracts/common/Cargo.toml                    | 2 +-
 frame/contracts/rpc/Cargo.toml                       | 2 +-
 frame/contracts/rpc/runtime-api/Cargo.toml           | 2 +-
 frame/democracy/Cargo.toml                           | 2 +-
 frame/elections-phragmen/Cargo.toml                  | 2 +-
 frame/elections/Cargo.toml                           | 2 +-
 frame/example-offchain-worker/Cargo.toml             | 2 +-
 frame/example-parallel/Cargo.toml                    | 2 +-
 frame/example/Cargo.toml                             | 2 +-
 frame/executive/Cargo.toml                           | 2 +-
 frame/grandpa/Cargo.toml                             | 2 +-
 frame/identity/Cargo.toml                            | 2 +-
 frame/im-online/Cargo.toml                           | 2 +-
 frame/indices/Cargo.toml                             | 2 +-
 frame/lottery/Cargo.toml                             | 2 +-
 frame/membership/Cargo.toml                          | 2 +-
 frame/merkle-mountain-range/Cargo.toml               | 2 +-
 frame/metadata/Cargo.toml                            | 2 +-
 frame/multisig/Cargo.toml                            | 2 +-
 frame/nicks/Cargo.toml                               | 2 +-
 frame/node-authorization/Cargo.toml                  | 2 +-
 frame/offences/Cargo.toml                            | 2 +-
 frame/offences/benchmarking/Cargo.toml               | 2 +-
 frame/proxy/Cargo.toml                               | 2 +-
 frame/randomness-collective-flip/Cargo.toml          | 2 +-
 frame/recovery/Cargo.toml                            | 2 +-
 frame/scheduler/Cargo.toml                           | 2 +-
 frame/scored-pool/Cargo.toml                         | 2 +-
 frame/session/Cargo.toml                             | 2 +-
 frame/session/benchmarking/Cargo.toml                | 2 +-
 frame/society/Cargo.toml                             | 2 +-
 frame/staking/Cargo.toml                             | 2 +-
 frame/staking/fuzzer/Cargo.toml                      | 2 +-
 frame/sudo/Cargo.toml                                | 2 +-
 frame/support/Cargo.toml                             | 2 +-
 frame/support/test/Cargo.toml                        | 2 +-
 frame/system/Cargo.toml                              | 2 +-
 frame/system/benchmarking/Cargo.toml                 | 2 +-
 frame/system/rpc/runtime-api/Cargo.toml              | 2 +-
 frame/timestamp/Cargo.toml                           | 2 +-
 frame/tips/Cargo.toml                                | 2 +-
 frame/transaction-payment/Cargo.toml                 | 2 +-
 frame/transaction-payment/rpc/Cargo.toml             | 2 +-
 frame/transaction-payment/rpc/runtime-api/Cargo.toml | 2 +-
 frame/treasury/Cargo.toml                            | 2 +-
 frame/utility/Cargo.toml                             | 2 +-
 frame/vesting/Cargo.toml                             | 2 +-
 primitives/api/Cargo.toml                            | 2 +-
 primitives/api/test/Cargo.toml                       | 2 +-
 primitives/application-crypto/Cargo.toml             | 2 +-
 primitives/arithmetic/Cargo.toml                     | 2 +-
 primitives/authority-discovery/Cargo.toml            | 2 +-
 primitives/authorship/Cargo.toml                     | 2 +-
 primitives/block-builder/Cargo.toml                  | 2 +-
 primitives/blockchain/Cargo.toml                     | 2 +-
 primitives/consensus/aura/Cargo.toml                 | 2 +-
 primitives/consensus/babe/Cargo.toml                 | 2 +-
 primitives/consensus/common/Cargo.toml               | 2 +-
 primitives/consensus/pow/Cargo.toml                  | 2 +-
 primitives/consensus/slots/Cargo.toml                | 2 +-
 primitives/core/Cargo.toml                           | 2 +-
 primitives/externalities/Cargo.toml                  | 2 +-
 primitives/finality-grandpa/Cargo.toml               | 2 +-
 primitives/inherents/Cargo.toml                      | 2 +-
 primitives/io/Cargo.toml                             | 2 +-
 primitives/keystore/Cargo.toml                       | 2 +-
 primitives/npos-elections/Cargo.toml                 | 2 +-
 primitives/npos-elections/fuzzer/Cargo.toml          | 2 +-
 primitives/runtime-interface/Cargo.toml              | 2 +-
 primitives/runtime/Cargo.toml                        | 2 +-
 primitives/sandbox/Cargo.toml                        | 2 +-
 primitives/session/Cargo.toml                        | 2 +-
 primitives/staking/Cargo.toml                        | 2 +-
 primitives/state-machine/Cargo.toml                  | 2 +-
 primitives/storage/Cargo.toml                        | 2 +-
 primitives/tasks/Cargo.toml                          | 2 +-
 primitives/test-primitives/Cargo.toml                | 2 +-
 primitives/timestamp/Cargo.toml                      | 2 +-
 primitives/transaction-pool/Cargo.toml               | 2 +-
 primitives/trie/Cargo.toml                           | 2 +-
 primitives/version/Cargo.toml                        | 2 +-
 primitives/wasm-interface/Cargo.toml                 | 2 +-
 test-utils/client/Cargo.toml                         | 2 +-
 test-utils/runtime/Cargo.toml                        | 2 +-
 test-utils/runtime/client/Cargo.toml                 | 2 +-
 test-utils/runtime/transaction-pool/Cargo.toml       | 2 +-
 utils/fork-tree/Cargo.toml                           | 2 +-
 utils/frame/rpc/support/Cargo.toml                   | 2 +-
 utils/frame/rpc/system/Cargo.toml                    | 2 +-
 138 files changed, 139 insertions(+), 139 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6e7c1085828f..e1d57b254146 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5247,9 +5247,9 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec"
-version = "1.3.5"
+version = "1.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c740e5fbcb6847058b40ac7e5574766c6388f585e184d769910fe0d3a2ca861"
+checksum = "79602888a81ace83e3d1d4b2873286c1f5f906c84db667594e8db8da3506c383"
 dependencies = [
  "arrayvec 0.5.2",
  "bitvec",
diff --git a/bin/node-template/pallets/template/Cargo.toml b/bin/node-template/pallets/template/Cargo.toml
index 12b810de186f..f6d69206209e 100644
--- a/bin/node-template/pallets/template/Cargo.toml
+++ b/bin/node-template/pallets/template/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 
 [dependencies.frame-support]
 default-features = false
diff --git a/bin/node-template/runtime/Cargo.toml b/bin/node-template/runtime/Cargo.toml
index f1b15070ddde..7cf1519941dc 100644
--- a/bin/node-template/runtime/Cargo.toml
+++ b/bin/node-template/runtime/Cargo.toml
@@ -11,7 +11,7 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 
 pallet-aura = { version = "2.0.0", default-features = false, path = "../../../frame/aura" }
 pallet-balances = { version = "2.0.0", default-features = false, path = "../../../frame/balances" }
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index 519ea9661b58..3b7d56c2dbbc 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -34,7 +34,7 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 # third-party dependencies
-codec = { package = "parity-scale-codec", version = "1.3.4" }
+codec = { package = "parity-scale-codec", version = "1.3.6" }
 serde = { version = "1.0.102", features = ["derive"] }
 futures = { version = "0.3.1", features = ["compat"] }
 hex-literal = "0.3.1"
diff --git a/bin/node/executor/Cargo.toml b/bin/node/executor/Cargo.toml
index f7bef798e4d0..a2177ac9cd79 100644
--- a/bin/node/executor/Cargo.toml
+++ b/bin/node/executor/Cargo.toml
@@ -12,7 +12,7 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.4" }
+codec = { package = "parity-scale-codec", version = "1.3.6" }
 node-primitives = { version = "2.0.0", path = "../primitives" }
 node-runtime = { version = "2.0.0", path = "../runtime" }
 sc-executor = { version = "0.8.0", path = "../../../client/executor" }
diff --git a/bin/node/inspect/Cargo.toml b/bin/node/inspect/Cargo.toml
index 3686ddf27669..7f94e15bb8fc 100644
--- a/bin/node/inspect/Cargo.toml
+++ b/bin/node/inspect/Cargo.toml
@@ -11,7 +11,7 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.4" }
+codec = { package = "parity-scale-codec", version = "1.3.6" }
 derive_more = "0.99"
 log = "0.4.8"
 sc-cli = { version = "0.8.0", path = "../../../client/cli" }
diff --git a/bin/node/primitives/Cargo.toml b/bin/node/primitives/Cargo.toml
index 305764970c14..db28472087fe 100644
--- a/bin/node/primitives/Cargo.toml
+++ b/bin/node/primitives/Cargo.toml
@@ -11,7 +11,7 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 frame-system = { version = "2.0.0", default-features = false, path = "../../../frame/system" }
 sp-application-crypto = { version = "2.0.0", default-features = false, path = "../../../primitives/application-crypto" }
 sp-core = { version = "2.0.0", default-features = false, path = "../../../primitives/core" }
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index d8479975c37b..d3cc0101e082 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 
 # third-party dependencies
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 serde = { version = "1.0.102", optional = true }
 static_assertions = "1.1.0"
 hex-literal = { version = "0.3.1", optional = true }
diff --git a/bin/node/testing/Cargo.toml b/bin/node/testing/Cargo.toml
index bc1f07645eed..f6cf92d77e8e 100644
--- a/bin/node/testing/Cargo.toml
+++ b/bin/node/testing/Cargo.toml
@@ -17,7 +17,7 @@ pallet-balances = { version = "2.0.0", path = "../../../frame/balances" }
 sc-service = { version = "0.8.0", features = ["test-helpers", "db"],  path = "../../../client/service" }
 sc-client-db = { version = "0.8.0", path = "../../../client/db/", features = ["kvdb-rocksdb", "parity-db"] }
 sc-client-api = { version = "2.0.0", path = "../../../client/api/" }
-codec = { package = "parity-scale-codec", version = "1.3.4" }
+codec = { package = "parity-scale-codec", version = "1.3.6" }
 pallet-contracts = { version = "2.0.0", path = "../../../frame/contracts" }
 pallet-grandpa = { version = "2.0.0", path = "../../../frame/grandpa" }
 pallet-indices = { version = "2.0.0", path = "../../../frame/indices" }
diff --git a/client/api/Cargo.toml b/client/api/Cargo.toml
index 5f83c2635606..205d5a51cde3 100644
--- a/client/api/Cargo.toml
+++ b/client/api/Cargo.toml
@@ -14,7 +14,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-consensus = { version = "0.8.0", path = "../../primitives/consensus/common" }
 derive_more = "0.99.2"
 sc-executor = { version = "0.8.0", path = "../executor" }
diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml
index 9d3a1e118f24..e42e822eba62 100644
--- a/client/authority-discovery/Cargo.toml
+++ b/client/authority-discovery/Cargo.toml
@@ -18,7 +18,7 @@ prost-build = "0.6.1"
 
 [dependencies]
 async-trait = "0.1"
-codec = { package = "parity-scale-codec", default-features = false, version = "1.3.4" }
+codec = { package = "parity-scale-codec", default-features = false, version = "1.3.6" }
 derive_more = "0.99.2"
 either = "1.5.3"
 futures = "0.3.9"
diff --git a/client/basic-authorship/Cargo.toml b/client/basic-authorship/Cargo.toml
index 1e5e3ec1ac07..c1df76253a46 100644
--- a/client/basic-authorship/Cargo.toml
+++ b/client/basic-authorship/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.4" }
+codec = { package = "parity-scale-codec", version = "1.3.6" }
 futures = "0.3.9"
 futures-timer = "3.0.1"
 log = "0.4.8"
diff --git a/client/block-builder/Cargo.toml b/client/block-builder/Cargo.toml
index c8d2fd82dee9..64a82505a9fa 100644
--- a/client/block-builder/Cargo.toml
+++ b/client/block-builder/Cargo.toml
@@ -23,7 +23,7 @@ sp-core = { version = "2.0.0", path = "../../primitives/core" }
 sp-block-builder = { version = "2.0.0", path = "../../primitives/block-builder" }
 sp-inherents = { version = "2.0.0", path = "../../primitives/inherents" }
 sc-client-api = { version = "2.0.0", path = "../api" }
-codec = { package = "parity-scale-codec", version = "1.3.4", features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", features = ["derive"] }
 
 [dev-dependencies]
 substrate-test-runtime-client = { path = "../../test-utils/runtime/client" }
diff --git a/client/chain-spec/Cargo.toml b/client/chain-spec/Cargo.toml
index 320cf406b4aa..e7144d330c69 100644
--- a/client/chain-spec/Cargo.toml
+++ b/client/chain-spec/Cargo.toml
@@ -22,7 +22,7 @@ serde_json = "1.0.41"
 sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
 sp-chain-spec = { version = "2.0.0", path = "../../primitives/chain-spec" }
 sc-telemetry = { version = "2.0.0", path = "../telemetry" }
-codec = { package = "parity-scale-codec", version = "1.3.4" }
+codec = { package = "parity-scale-codec", version = "1.3.6" }
 sc-consensus-babe = { version = "0.8.0-rc6", path = "../consensus/babe" }
 sp-consensus-babe = { version = "0.8.0-rc6", path = "../../primitives/consensus/babe" }
 sc-consensus-epochs = { version = "0.8.0-rc6", path = "../consensus/epochs" }
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index 18f1f4d6a99b..bff80147ac20 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -20,7 +20,7 @@ tokio = { version = "0.2.21", features = [ "signal", "rt-core", "rt-threaded", "
 futures = "0.3.9"
 fdlimit = "0.2.1"
 libp2p = "0.33.0"
-parity-scale-codec = "1.3.0"
+parity-scale-codec = "1.3.6"
 hex = "0.4.2"
 rand = "0.7.3"
 tiny-bip39 = "0.8.0"
diff --git a/client/consensus/aura/Cargo.toml b/client/consensus/aura/Cargo.toml
index dc3f958501af..b6e1ba6bc10d 100644
--- a/client/consensus/aura/Cargo.toml
+++ b/client/consensus/aura/Cargo.toml
@@ -18,7 +18,7 @@ sp-consensus-aura = { version = "0.8.0", path = "../../../primitives/consensus/a
 sp-block-builder = { version = "2.0.0", path = "../../../primitives/block-builder" }
 sc-block-builder = { version = "0.8.0", path = "../../block-builder" }
 sc-client-api = { version = "2.0.0", path = "../../api" }
-codec = { package = "parity-scale-codec", version = "1.3.4" }
+codec = { package = "parity-scale-codec", version = "1.3.6" }
 sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
 derive_more = "0.99.2"
 futures = "0.3.9"
diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml
index ae72da4ccb62..bd07e3dd2269 100644
--- a/client/consensus/babe/Cargo.toml
+++ b/client/consensus/babe/Cargo.toml
@@ -14,7 +14,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.4", features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", features = ["derive"] }
 sp-consensus-babe = { version = "0.8.0", path = "../../../primitives/consensus/babe" }
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
 sp-application-crypto = { version = "2.0.0", path = "../../../primitives/application-crypto" }
diff --git a/client/consensus/epochs/Cargo.toml b/client/consensus/epochs/Cargo.toml
index 85d5818dc395..752280e3547d 100644
--- a/client/consensus/epochs/Cargo.toml
+++ b/client/consensus/epochs/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.4", features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", features = ["derive"] }
 parking_lot = "0.11.1"
 fork-tree = { version = "2.0.0", path = "../../../utils/fork-tree" }
 sp-runtime = {  path = "../../../primitives/runtime" , version = "2.0.0"}
diff --git a/client/consensus/manual-seal/Cargo.toml b/client/consensus/manual-seal/Cargo.toml
index 943ac74e5c35..b13cbc7b5590 100644
--- a/client/consensus/manual-seal/Cargo.toml
+++ b/client/consensus/manual-seal/Cargo.toml
@@ -20,7 +20,7 @@ jsonrpc-core-client = "15.1.0"
 jsonrpc-derive = "15.1.0"
 log = "0.4.8"
 parking_lot = "0.11.1"
-codec = { package = "parity-scale-codec", version = "1.3.1" }
+codec = { package = "parity-scale-codec", version = "1.3.6" }
 serde = { version = "1.0", features=["derive"] }
 assert_matches = "1.3.0"
 
diff --git a/client/consensus/pow/Cargo.toml b/client/consensus/pow/Cargo.toml
index c131a3c6277d..b5112f9fa628 100644
--- a/client/consensus/pow/Cargo.toml
+++ b/client/consensus/pow/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.4", features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", features = ["derive"] }
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
 sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
 sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
diff --git a/client/consensus/slots/Cargo.toml b/client/consensus/slots/Cargo.toml
index 53b66e9aa314..bdf28f35236b 100644
--- a/client/consensus/slots/Cargo.toml
+++ b/client/consensus/slots/Cargo.toml
@@ -14,7 +14,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.4" }
+codec = { package = "parity-scale-codec", version = "1.3.6" }
 sc-client-api = { version = "2.0.0", path = "../../api" }
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
 sp-trie = { version = "2.0.0", path = "../../../primitives/trie" }
diff --git a/client/db/Cargo.toml b/client/db/Cargo.toml
index 3a7928469595..23f6fa9b1f62 100644
--- a/client/db/Cargo.toml
+++ b/client/db/Cargo.toml
@@ -21,7 +21,7 @@ kvdb-memorydb = "0.8.0"
 linked-hash-map = "0.5.2"
 hash-db = "0.15.2"
 parity-util-mem = { version = "0.8.0", default-features = false, features = ["std"] }
-codec = { package = "parity-scale-codec", version = "1.3.4", features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", features = ["derive"] }
 blake2-rfc = "0.2.18"
 
 sc-client-api = { version = "2.0.0", path = "../api" }
diff --git a/client/executor/Cargo.toml b/client/executor/Cargo.toml
index 98273c7e4e4a..8cfbe8d600d4 100644
--- a/client/executor/Cargo.toml
+++ b/client/executor/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 derive_more = "0.99.2"
-codec = { package = "parity-scale-codec", version = "1.3.4" }
+codec = { package = "parity-scale-codec", version = "1.3.6" }
 sp-io = { version = "2.0.0", path = "../../primitives/io" }
 sp-core = { version = "2.0.0", path = "../../primitives/core" }
 sp-tasks = { version = "2.0.0", path = "../../primitives/tasks" }
diff --git a/client/executor/common/Cargo.toml b/client/executor/common/Cargo.toml
index d324cb71e9b6..a479f4e1f4dd 100644
--- a/client/executor/common/Cargo.toml
+++ b/client/executor/common/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 derive_more = "0.99.2"
 parity-wasm = "0.41.0"
-codec = { package = "parity-scale-codec", version = "1.3.4" }
+codec = { package = "parity-scale-codec", version = "1.3.6" }
 wasmi = "0.6.2"
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
 sp-allocator = { version = "2.0.0", path = "../../../primitives/allocator" }
diff --git a/client/executor/wasmi/Cargo.toml b/client/executor/wasmi/Cargo.toml
index da576b1bbae4..38d1cf3072a1 100644
--- a/client/executor/wasmi/Cargo.toml
+++ b/client/executor/wasmi/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 log = "0.4.8"
 wasmi = "0.6.2"
-codec = { package = "parity-scale-codec", version = "1.3.4" }
+codec = { package = "parity-scale-codec", version = "1.3.6" }
 sc-executor-common = { version = "0.8.0", path = "../common" }
 sp-wasm-interface = { version = "2.0.0", path = "../../../primitives/wasm-interface" }
 sp-runtime-interface = { version = "2.0.0", path = "../../../primitives/runtime-interface" }
diff --git a/client/executor/wasmtime/Cargo.toml b/client/executor/wasmtime/Cargo.toml
index 461bc570fe09..071cbc66001d 100644
--- a/client/executor/wasmtime/Cargo.toml
+++ b/client/executor/wasmtime/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 log = "0.4.8"
 scoped-tls = "1.0"
 parity-wasm = "0.41.0"
-codec = { package = "parity-scale-codec", version = "1.3.4" }
+codec = { package = "parity-scale-codec", version = "1.3.6" }
 sc-executor-common = { version = "0.8.0", path = "../common" }
 sp-wasm-interface = { version = "2.0.0", path = "../../../primitives/wasm-interface" }
 sp-runtime-interface = { version = "2.0.0", path = "../../../primitives/runtime-interface" }
diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml
index 831ac509ff0a..1309cbb316b6 100644
--- a/client/finality-grandpa/Cargo.toml
+++ b/client/finality-grandpa/Cargo.toml
@@ -22,7 +22,7 @@ futures-timer = "3.0.1"
 log = "0.4.8"
 parking_lot = "0.11.1"
 rand = "0.7.2"
-parity-scale-codec = { version = "1.3.4", features = ["derive"] }
+parity-scale-codec = { version = "1.3.6", features = ["derive"] }
 sp-application-crypto = { version = "2.0.0", path = "../../primitives/application-crypto" }
 sp-arithmetic = { version = "2.0.0", path = "../../primitives/arithmetic" }
 sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
diff --git a/client/finality-grandpa/rpc/Cargo.toml b/client/finality-grandpa/rpc/Cargo.toml
index 7f171dc19022..52f6b094a8dd 100644
--- a/client/finality-grandpa/rpc/Cargo.toml
+++ b/client/finality-grandpa/rpc/Cargo.toml
@@ -24,7 +24,7 @@ serde = { version = "1.0.105", features = ["derive"] }
 serde_json = "1.0.50"
 log = "0.4.8"
 derive_more = "0.99.2"
-parity-scale-codec = { version = "1.3.0", features = ["derive"] }
+parity-scale-codec = { version = "1.3.6", features = ["derive"] }
 sc-client-api = { version = "2.0.0", path = "../../api" }
 
 [dev-dependencies]
diff --git a/client/light/Cargo.toml b/client/light/Cargo.toml
index d873f7bf9572..60d16ff0359c 100644
--- a/client/light/Cargo.toml
+++ b/client/light/Cargo.toml
@@ -21,7 +21,7 @@ sp-core = { version = "2.0.0", path = "../../primitives/core" }
 sp-state-machine = { version = "0.8.0", path = "../../primitives/state-machine" }
 sc-client-api = { version = "2.0.0", path = "../api" }
 sp-api = { version = "2.0.0", path = "../../primitives/api" }
-codec = { package = "parity-scale-codec", version = "1.3.4" }
+codec = { package = "parity-scale-codec", version = "1.3.6" }
 sc-executor = { version = "0.8.0", path = "../executor" }
 
 [features]
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index db2c80e8d3b8..2251746de945 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -22,7 +22,7 @@ async-std = "1.6.5"
 bitflags = "1.2.0"
 bs58 = "0.4.0"
 bytes = "0.5.0"
-codec = { package = "parity-scale-codec", version = "1.3.4", features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", features = ["derive"] }
 derive_more = "0.99.2"
 either = "1.5.3"
 erased-serde = "0.3.9"
diff --git a/client/offchain/Cargo.toml b/client/offchain/Cargo.toml
index 41109120fb2d..0f19caf7395b 100644
--- a/client/offchain/Cargo.toml
+++ b/client/offchain/Cargo.toml
@@ -23,7 +23,7 @@ log = "0.4.8"
 threadpool = "1.7"
 num_cpus = "1.10"
 sp-offchain = { version = "2.0.0", path = "../../primitives/offchain" }
-codec = { package = "parity-scale-codec", version = "1.3.4", features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", features = ["derive"] }
 parking_lot = "0.11.1"
 sp-core = { version = "2.0.0", path = "../../primitives/core" }
 rand = "0.7.2"
diff --git a/client/rpc-api/Cargo.toml b/client/rpc-api/Cargo.toml
index 2be0912d36e1..546deb1283c5 100644
--- a/client/rpc-api/Cargo.toml
+++ b/client/rpc-api/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.4" }
+codec = { package = "parity-scale-codec", version = "1.3.6" }
 derive_more = "0.99.2"
 futures = { version = "0.3.1", features = ["compat"] }
 jsonrpc-core = "15.1.0"
diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml
index b3895cda2a1f..bab436c93a7f 100644
--- a/client/rpc/Cargo.toml
+++ b/client/rpc/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 sc-rpc-api = { version = "0.8.0", path = "../rpc-api" }
 sc-client-api = { version = "2.0.0", path = "../api" }
 sp-api = { version = "2.0.0", path = "../../primitives/api" }
-codec = { package = "parity-scale-codec", version = "1.3.4" }
+codec = { package = "parity-scale-codec", version = "1.3.6" }
 futures = { version = "0.3.1", features = ["compat"] }
 jsonrpc-pubsub = "15.1.0"
 log = "0.4.8"
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index 353a126e5934..9d040802e66a 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -62,7 +62,7 @@ sc-light = { version = "2.0.0", path = "../light" }
 sc-client-api = { version = "2.0.0", path = "../api" }
 sp-api = { version = "2.0.0", path = "../../primitives/api" }
 sc-client-db = { version = "0.8.0", default-features = false, path = "../db" }
-codec = { package = "parity-scale-codec", version = "1.3.4" }
+codec = { package = "parity-scale-codec", version = "1.3.6" }
 sc-executor = { version = "0.8.0", path = "../executor" }
 sc-transaction-pool = { version = "2.0.0", path = "../transaction-pool" }
 sp-transaction-pool = { version = "2.0.0", path = "../../primitives/transaction-pool" }
diff --git a/client/service/test/Cargo.toml b/client/service/test/Cargo.toml
index ccf122a7bcca..8fcd09b8298d 100644
--- a/client/service/test/Cargo.toml
+++ b/client/service/test/Cargo.toml
@@ -40,5 +40,5 @@ sc-client-api = { version = "2.0.0", path = "../../api" }
 sc-block-builder = { version = "0.8.0", path = "../../block-builder" }
 sc-executor = { version = "0.8.0", path = "../../executor" }
 sp-panic-handler = { version = "2.0.0", path = "../../../primitives/panic-handler" }
-parity-scale-codec = "1.3.4"
+parity-scale-codec = "1.3.6"
 sp-tracing = { version = "2.0.0", path = "../../../primitives/tracing" }
diff --git a/client/state-db/Cargo.toml b/client/state-db/Cargo.toml
index dcf49e1a17ce..26939b769b8a 100644
--- a/client/state-db/Cargo.toml
+++ b/client/state-db/Cargo.toml
@@ -18,6 +18,6 @@ parking_lot = "0.11.1"
 log = "0.4.11"
 sc-client-api = { version = "2.0.0", path = "../api" }
 sp-core = { version = "2.0.0", path = "../../primitives/core" }
-codec = { package = "parity-scale-codec", version = "1.3.4", features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", features = ["derive"] }
 parity-util-mem = { version = "0.8.0", default-features = false, features = ["primitive-types"] }
 parity-util-mem-derive = "0.1.0"
diff --git a/client/transaction-pool/Cargo.toml b/client/transaction-pool/Cargo.toml
index 2183132e778e..e68e39f5542d 100644
--- a/client/transaction-pool/Cargo.toml
+++ b/client/transaction-pool/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.4" }
+codec = { package = "parity-scale-codec", version = "1.3.6" }
 thiserror = "1.0.21"
 futures = { version = "0.3.1", features = ["compat"] }
 futures-diagnose = "1.0"
diff --git a/client/transaction-pool/graph/Cargo.toml b/client/transaction-pool/graph/Cargo.toml
index 1427c9c39fca..d09f58f2df16 100644
--- a/client/transaction-pool/graph/Cargo.toml
+++ b/client/transaction-pool/graph/Cargo.toml
@@ -31,7 +31,7 @@ retain_mut = "0.1.1"
 
 [dev-dependencies]
 assert_matches = "1.3.0"
-codec = { package = "parity-scale-codec", version = "1.3.4" }
+codec = { package = "parity-scale-codec", version = "1.3.6" }
 substrate-test-runtime = { version = "2.0.0", path = "../../../test-utils/runtime" }
 criterion = "0.3"
 
diff --git a/frame/assets/Cargo.toml b/frame/assets/Cargo.toml
index c04f4f2a600b..fe7b30eaace8 100644
--- a/frame/assets/Cargo.toml
+++ b/frame/assets/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 # Needed for various traits. In our case, `OnFinalize`.
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
diff --git a/frame/atomic-swap/Cargo.toml b/frame/atomic-swap/Cargo.toml
index 4486057be956..55d8de86582a 100644
--- a/frame/atomic-swap/Cargo.toml
+++ b/frame/atomic-swap/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
diff --git a/frame/aura/Cargo.toml b/frame/aura/Cargo.toml
index 231934b73797..cc8e678fb559 100644
--- a/frame/aura/Cargo.toml
+++ b/frame/aura/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 sp-application-crypto = { version = "2.0.0", default-features = false, path = "../../primitives/application-crypto" }
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-inherents = { version = "2.0.0", default-features = false, path = "../../primitives/inherents" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 serde = { version = "1.0.101", optional = true }
diff --git a/frame/authority-discovery/Cargo.toml b/frame/authority-discovery/Cargo.toml
index e77261e5b29c..3538d8a5f81c 100644
--- a/frame/authority-discovery/Cargo.toml
+++ b/frame/authority-discovery/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 sp-authority-discovery = { version = "2.0.0", default-features = false, path = "../../primitives/authority-discovery" }
 sp-application-crypto = { version = "2.0.0", default-features = false, path = "../../primitives/application-crypto" }
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 serde = { version = "1.0.101", optional = true }
 pallet-session = { version = "2.0.0", features = ["historical" ], path = "../session", default-features = false }
diff --git a/frame/authorship/Cargo.toml b/frame/authorship/Cargo.toml
index b5a5197834e9..d957fb909404 100644
--- a/frame/authorship/Cargo.toml
+++ b/frame/authorship/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-inherents = { version = "2.0.0", default-features = false, path = "../../primitives/inherents" }
 sp-authorship = { version = "2.0.0", default-features = false, path = "../../primitives/authorship" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
diff --git a/frame/babe/Cargo.toml b/frame/babe/Cargo.toml
index e1b4590d5bf7..13ac2e4034c9 100644
--- a/frame/babe/Cargo.toml
+++ b/frame/babe/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
diff --git a/frame/balances/Cargo.toml b/frame/balances/Cargo.toml
index 004e631d4871..82f0e3f6b075 100644
--- a/frame/balances/Cargo.toml
+++ b/frame/balances/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
 frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
diff --git a/frame/benchmarking/Cargo.toml b/frame/benchmarking/Cargo.toml
index bbd61b6cea0a..e045f259be77 100644
--- a/frame/benchmarking/Cargo.toml
+++ b/frame/benchmarking/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 linregress = { version = "0.4.0", optional = true }
 paste = "0.1"
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
 sp-api = { version = "2.0.0", path = "../../primitives/api", default-features = false }
 sp-runtime-interface = { version = "2.0.0", path = "../../primitives/runtime-interface", default-features = false }
 sp-runtime = { version = "2.0.0", path = "../../primitives/runtime", default-features = false }
diff --git a/frame/bounties/Cargo.toml b/frame/bounties/Cargo.toml
index 214637bb6c8d..0e37e3b9d4a5 100644
--- a/frame/bounties/Cargo.toml
+++ b/frame/bounties/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
diff --git a/frame/collective/Cargo.toml b/frame/collective/Cargo.toml
index f25490b2df83..47f8414ef4bb 100644
--- a/frame/collective/Cargo.toml
+++ b/frame/collective/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
diff --git a/frame/contracts/Cargo.toml b/frame/contracts/Cargo.toml
index 76c429bd44f6..710258037e7a 100644
--- a/frame/contracts/Cargo.toml
+++ b/frame/contracts/Cargo.toml
@@ -16,7 +16,7 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
diff --git a/frame/contracts/common/Cargo.toml b/frame/contracts/common/Cargo.toml
index 016e3e2eb00e..ff5f38637765 100644
--- a/frame/contracts/common/Cargo.toml
+++ b/frame/contracts/common/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 # This crate should not rely on any of the frame primitives.
 bitflags = "1.0"
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../../../primitives/std" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../../primitives/runtime" }
 
diff --git a/frame/contracts/rpc/Cargo.toml b/frame/contracts/rpc/Cargo.toml
index 45abaa2c8497..39c3b373c8cf 100644
--- a/frame/contracts/rpc/Cargo.toml
+++ b/frame/contracts/rpc/Cargo.toml
@@ -14,7 +14,7 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.4" }
+codec = { package = "parity-scale-codec", version = "1.3.6" }
 jsonrpc-core = "15.1.0"
 jsonrpc-core-client = "15.1.0"
 jsonrpc-derive = "15.1.0"
diff --git a/frame/contracts/rpc/runtime-api/Cargo.toml b/frame/contracts/rpc/runtime-api/Cargo.toml
index b9f248fb1214..fe1cb91b8453 100644
--- a/frame/contracts/rpc/runtime-api/Cargo.toml
+++ b/frame/contracts/rpc/runtime-api/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 sp-api = { version = "2.0.0", default-features = false, path = "../../../../primitives/api" }
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../../../../primitives/std" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../../../primitives/runtime" }
 pallet-contracts-primitives = { version = "2.0.0", default-features = false, path = "../../common" }
diff --git a/frame/democracy/Cargo.toml b/frame/democracy/Cargo.toml
index 8f331385fe4b..a63382922545 100644
--- a/frame/democracy/Cargo.toml
+++ b/frame/democracy/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
diff --git a/frame/elections-phragmen/Cargo.toml b/frame/elections-phragmen/Cargo.toml
index 8b09e7742253..55cbcfe985d5 100644
--- a/frame/elections-phragmen/Cargo.toml
+++ b/frame/elections-phragmen/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 serde = { version = "1.0.101", optional = true }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
 sp-npos-elections = { version = "2.0.0", default-features = false, path = "../../primitives/npos-elections" }
diff --git a/frame/elections/Cargo.toml b/frame/elections/Cargo.toml
index 08fc8267ed68..90e69ea21275 100644
--- a/frame/elections/Cargo.toml
+++ b/frame/elections/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
diff --git a/frame/example-offchain-worker/Cargo.toml b/frame/example-offchain-worker/Cargo.toml
index 32fb12cbedf1..be3c03e4c454 100644
--- a/frame/example-offchain-worker/Cargo.toml
+++ b/frame/example-offchain-worker/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
 serde = { version = "1.0.101", optional = true }
diff --git a/frame/example-parallel/Cargo.toml b/frame/example-parallel/Cargo.toml
index 83276ba5dc6b..ee816d963be9 100644
--- a/frame/example-parallel/Cargo.toml
+++ b/frame/example-parallel/Cargo.toml
@@ -12,7 +12,7 @@ description = "FRAME example pallet using runtime worker threads"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
diff --git a/frame/example/Cargo.toml b/frame/example/Cargo.toml
index 41889ea4828d..e805a27a96b8 100644
--- a/frame/example/Cargo.toml
+++ b/frame/example/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
 pallet-balances = { version = "2.0.0", default-features = false, path = "../balances" }
diff --git a/frame/executive/Cargo.toml b/frame/executive/Cargo.toml
index 7cd160118970..3f9820b5f3f5 100644
--- a/frame/executive/Cargo.toml
+++ b/frame/executive/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
 serde = { version = "1.0.101", optional = true }
diff --git a/frame/grandpa/Cargo.toml b/frame/grandpa/Cargo.toml
index 2d96c5be1295..c6a76de23e45 100644
--- a/frame/grandpa/Cargo.toml
+++ b/frame/grandpa/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-application-crypto = { version = "2.0.0", default-features = false, path = "../../primitives/application-crypto" }
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
 sp-finality-grandpa = { version = "2.0.0", default-features = false, path = "../../primitives/finality-grandpa" }
diff --git a/frame/identity/Cargo.toml b/frame/identity/Cargo.toml
index b39ce1c944e4..124ac4f00644 100644
--- a/frame/identity/Cargo.toml
+++ b/frame/identity/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 enumflags2 = { version = "0.6.2" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
diff --git a/frame/im-online/Cargo.toml b/frame/im-online/Cargo.toml
index 69cf402a12f3..95948c86de49 100644
--- a/frame/im-online/Cargo.toml
+++ b/frame/im-online/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 sp-application-crypto = { version = "2.0.0", default-features = false, path = "../../primitives/application-crypto" }
 pallet-authorship = { version = "2.0.0", default-features = false, path = "../authorship" }
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 serde = { version = "1.0.101", optional = true }
diff --git a/frame/indices/Cargo.toml b/frame/indices/Cargo.toml
index 42af6aa49859..afe315cfaa6b 100644
--- a/frame/indices/Cargo.toml
+++ b/frame/indices/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-keyring = { version = "2.0.0", optional = true, path = "../../primitives/keyring" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
diff --git a/frame/lottery/Cargo.toml b/frame/lottery/Cargo.toml
index db76316c4296..b223625c87a0 100644
--- a/frame/lottery/Cargo.toml
+++ b/frame/lottery/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
diff --git a/frame/membership/Cargo.toml b/frame/membership/Cargo.toml
index 251f987ded99..f1ce20df17ed 100644
--- a/frame/membership/Cargo.toml
+++ b/frame/membership/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
diff --git a/frame/merkle-mountain-range/Cargo.toml b/frame/merkle-mountain-range/Cargo.toml
index 8f1f14f8cfbb..096333680c6a 100644
--- a/frame/merkle-mountain-range/Cargo.toml
+++ b/frame/merkle-mountain-range/Cargo.toml
@@ -12,7 +12,7 @@ description = "FRAME Merkle Mountain Range pallet."
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
 frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
diff --git a/frame/metadata/Cargo.toml b/frame/metadata/Cargo.toml
index f0db94541357..c809b3d1fcbd 100644
--- a/frame/metadata/Cargo.toml
+++ b/frame/metadata/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
diff --git a/frame/multisig/Cargo.toml b/frame/multisig/Cargo.toml
index 78e71080c339..70412fa6de0a 100644
--- a/frame/multisig/Cargo.toml
+++ b/frame/multisig/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
diff --git a/frame/nicks/Cargo.toml b/frame/nicks/Cargo.toml
index c23fa9badada..3e1ddf897d34 100644
--- a/frame/nicks/Cargo.toml
+++ b/frame/nicks/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
diff --git a/frame/node-authorization/Cargo.toml b/frame/node-authorization/Cargo.toml
index 1448e99bd2a1..d78ffd13fd57 100644
--- a/frame/node-authorization/Cargo.toml
+++ b/frame/node-authorization/Cargo.toml
@@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
diff --git a/frame/offences/Cargo.toml b/frame/offences/Cargo.toml
index fbc8567534c6..2860e3ef8ee2 100644
--- a/frame/offences/Cargo.toml
+++ b/frame/offences/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 pallet-balances = { version = "2.0.0", default-features = false, path = "../balances" }
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 serde = { version = "1.0.101", optional = true }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
diff --git a/frame/offences/benchmarking/Cargo.toml b/frame/offences/benchmarking/Cargo.toml
index d2e020ef681e..80492288d74b 100644
--- a/frame/offences/benchmarking/Cargo.toml
+++ b/frame/offences/benchmarking/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
 frame-benchmarking = { version = "2.0.0", default-features = false, path = "../../benchmarking" }
 frame-support = { version = "2.0.0", default-features = false, path = "../../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../../system" }
diff --git a/frame/proxy/Cargo.toml b/frame/proxy/Cargo.toml
index 219e72502e0e..da3d50ab2234 100644
--- a/frame/proxy/Cargo.toml
+++ b/frame/proxy/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
diff --git a/frame/randomness-collective-flip/Cargo.toml b/frame/randomness-collective-flip/Cargo.toml
index bca617e6f484..0f6b48ff0757 100644
--- a/frame/randomness-collective-flip/Cargo.toml
+++ b/frame/randomness-collective-flip/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 safe-mix = { version = "1.0", default-features = false }
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
diff --git a/frame/recovery/Cargo.toml b/frame/recovery/Cargo.toml
index dd4a783af42f..a0d4c0f14df5 100644
--- a/frame/recovery/Cargo.toml
+++ b/frame/recovery/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 enumflags2 = { version = "0.6.2" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
diff --git a/frame/scheduler/Cargo.toml b/frame/scheduler/Cargo.toml
index 5178e0c86069..7d21b125e6e6 100644
--- a/frame/scheduler/Cargo.toml
+++ b/frame/scheduler/Cargo.toml
@@ -11,7 +11,7 @@ readme = "README.md"
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.2.0", default-features = false }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
diff --git a/frame/scored-pool/Cargo.toml b/frame/scored-pool/Cargo.toml
index 45eb5ee7b278..6c9bceb32e00 100644
--- a/frame/scored-pool/Cargo.toml
+++ b/frame/scored-pool/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 serde = { version = "1.0.101", optional = true }
 sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
diff --git a/frame/session/Cargo.toml b/frame/session/Cargo.toml
index 3d58ad6749a2..3a9f4609a2e2 100644
--- a/frame/session/Cargo.toml
+++ b/frame/session/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
diff --git a/frame/session/benchmarking/Cargo.toml b/frame/session/benchmarking/Cargo.toml
index 7b025e52a7d1..fc3099e1b95c 100644
--- a/frame/session/benchmarking/Cargo.toml
+++ b/frame/session/benchmarking/Cargo.toml
@@ -25,7 +25,7 @@ rand = { version = "0.7.2", default-features = false }
 
 [dev-dependencies]
 serde = { version = "1.0.101" }
-codec = { package = "parity-scale-codec", version = "1.3.4", features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", features = ["derive"] }
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
 pallet-staking-reward-curve = { version = "2.0.0", path = "../../staking/reward-curve" }
 sp-io ={ version = "2.0.0", path = "../../../primitives/io" }
diff --git a/frame/society/Cargo.toml b/frame/society/Cargo.toml
index b380620226bf..fce6ebe51bb3 100644
--- a/frame/society/Cargo.toml
+++ b/frame/society/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
diff --git a/frame/staking/Cargo.toml b/frame/staking/Cargo.toml
index cbb16e1f4749..7c2fc21fde54 100644
--- a/frame/staking/Cargo.toml
+++ b/frame/staking/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 static_assertions = "1.1.0"
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-npos-elections = { version = "2.0.0", default-features = false, path = "../../primitives/npos-elections" }
 sp-io ={ version = "2.0.0", default-features = false, path = "../../primitives/io" }
diff --git a/frame/staking/fuzzer/Cargo.toml b/frame/staking/fuzzer/Cargo.toml
index e1431aa54d4a..db65e347d8e2 100644
--- a/frame/staking/fuzzer/Cargo.toml
+++ b/frame/staking/fuzzer/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 honggfuzz = "0.5"
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 pallet-staking = { version = "2.0.0", path = "..", features = ["runtime-benchmarks"] }
 pallet-staking-reward-curve = { version = "2.0.0",  path = "../reward-curve" }
 pallet-session = { version = "2.0.0", path = "../../session" }
diff --git a/frame/sudo/Cargo.toml b/frame/sudo/Cargo.toml
index 5ed084c1fbd3..a566cd2a9f06 100644
--- a/frame/sudo/Cargo.toml
+++ b/frame/sudo/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
diff --git a/frame/support/Cargo.toml b/frame/support/Cargo.toml
index 0bb842fbf539..9353dc6e121d 100644
--- a/frame/support/Cargo.toml
+++ b/frame/support/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 log = "0.4"
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 frame-metadata = { version = "12.0.0", default-features = false, path = "../metadata" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
diff --git a/frame/support/test/Cargo.toml b/frame/support/test/Cargo.toml
index 4424bd2a3215..ef66bd190215 100644
--- a/frame/support/test/Cargo.toml
+++ b/frame/support/test/Cargo.toml
@@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", default-features = false, features = ["derive"] }
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-io = { version = "2.0.0", path = "../../../primitives/io", default-features = false }
 sp-state-machine = { version = "0.8.0", optional = true, path = "../../../primitives/state-machine" }
 frame-support = { version = "2.0.0", default-features = false, path = "../" }
diff --git a/frame/system/Cargo.toml b/frame/system/Cargo.toml
index da188b335789..49f3056aff2f 100644
--- a/frame/system/Cargo.toml
+++ b/frame/system/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "2.0.0", path = "../../primitives/io", default-features = false }
diff --git a/frame/system/benchmarking/Cargo.toml b/frame/system/benchmarking/Cargo.toml
index 39f33b033bb5..e164a0d62e0f 100644
--- a/frame/system/benchmarking/Cargo.toml
+++ b/frame/system/benchmarking/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
 sp-std = { version = "2.0.0", default-features = false, path = "../../../primitives/std" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../../primitives/runtime" }
 frame-benchmarking = { version = "2.0.0", default-features = false, path = "../../benchmarking" }
diff --git a/frame/system/rpc/runtime-api/Cargo.toml b/frame/system/rpc/runtime-api/Cargo.toml
index 9df5fbec11d0..4820df10fe16 100644
--- a/frame/system/rpc/runtime-api/Cargo.toml
+++ b/frame/system/rpc/runtime-api/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 sp-api = { version = "2.0.0", default-features = false, path = "../../../../primitives/api" }
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
 
 [features]
 default = ["std"]
diff --git a/frame/timestamp/Cargo.toml b/frame/timestamp/Cargo.toml
index 59304e199c6e..79d8e30935f7 100644
--- a/frame/timestamp/Cargo.toml
+++ b/frame/timestamp/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io", optional = true }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
diff --git a/frame/tips/Cargo.toml b/frame/tips/Cargo.toml
index 386d49372c76..0ce81a6d5d1b 100644
--- a/frame/tips/Cargo.toml
+++ b/frame/tips/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
diff --git a/frame/transaction-payment/Cargo.toml b/frame/transaction-payment/Cargo.toml
index 57e33ae3eb64..16be1b5fba62 100644
--- a/frame/transaction-payment/Cargo.toml
+++ b/frame/transaction-payment/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 serde = { version = "1.0.101", optional = true }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
diff --git a/frame/transaction-payment/rpc/Cargo.toml b/frame/transaction-payment/rpc/Cargo.toml
index 348f7ae158e8..c459fbcf4a88 100644
--- a/frame/transaction-payment/rpc/Cargo.toml
+++ b/frame/transaction-payment/rpc/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.1" }
+codec = { package = "parity-scale-codec", version = "1.3.6" }
 jsonrpc-core = "15.1.0"
 jsonrpc-core-client = "15.1.0"
 jsonrpc-derive = "15.1.0"
diff --git a/frame/transaction-payment/rpc/runtime-api/Cargo.toml b/frame/transaction-payment/rpc/runtime-api/Cargo.toml
index 9d4883993407..a55cec5cfeec 100644
--- a/frame/transaction-payment/rpc/runtime-api/Cargo.toml
+++ b/frame/transaction-payment/rpc/runtime-api/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 sp-api = { version = "2.0.0", default-features = false, path = "../../../../primitives/api" }
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../../../../primitives/std" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../../../primitives/runtime" }
 frame-support = { version = "2.0.0", default-features = false, path = "../../../support" }
diff --git a/frame/treasury/Cargo.toml b/frame/treasury/Cargo.toml
index ce0532b434f0..07b22002ee38 100644
--- a/frame/treasury/Cargo.toml
+++ b/frame/treasury/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
diff --git a/frame/utility/Cargo.toml b/frame/utility/Cargo.toml
index a8ab438fc06c..ea8dc1ac015c 100644
--- a/frame/utility/Cargo.toml
+++ b/frame/utility/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
diff --git a/frame/vesting/Cargo.toml b/frame/vesting/Cargo.toml
index eda21dc8bbc7..a15121950155 100644
--- a/frame/vesting/Cargo.toml
+++ b/frame/vesting/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 enumflags2 = { version = "0.6.2" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
diff --git a/primitives/api/Cargo.toml b/primitives/api/Cargo.toml
index 69ed31da7aae..c1effc523fcb 100644
--- a/primitives/api/Cargo.toml
+++ b/primitives/api/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
 sp-api-proc-macro = { version = "2.0.0", path = "proc-macro" }
 sp-core = { version = "2.0.0", default-features = false, path = "../core" }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
diff --git a/primitives/api/test/Cargo.toml b/primitives/api/test/Cargo.toml
index 20842aab1f7f..310840d1ca9c 100644
--- a/primitives/api/test/Cargo.toml
+++ b/primitives/api/test/Cargo.toml
@@ -19,7 +19,7 @@ sp-runtime = { version = "2.0.0", path = "../../runtime" }
 sp-blockchain = { version = "2.0.0", path = "../../blockchain" }
 sp-consensus = { version = "0.8.0", path = "../../consensus/common" }
 sc-block-builder = { version = "0.8.0", path = "../../../client/block-builder" }
-codec = { package = "parity-scale-codec", version = "1.3.1" }
+codec = { package = "parity-scale-codec", version = "1.3.6" }
 sp-state-machine = { version = "0.8.0", path = "../../state-machine" }
 trybuild = "1.0.38"
 rustversion = "1.0.0"
diff --git a/primitives/application-crypto/Cargo.toml b/primitives/application-crypto/Cargo.toml
index 9960e229a277..8791ce4174bb 100644
--- a/primitives/application-crypto/Cargo.toml
+++ b/primitives/application-crypto/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 sp-core = { version = "2.0.0", default-features = false, path = "../core" }
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 sp-io = { version = "2.0.0", default-features = false, path = "../io" }
diff --git a/primitives/arithmetic/Cargo.toml b/primitives/arithmetic/Cargo.toml
index 5b306ff71736..5f951d8d248d 100644
--- a/primitives/arithmetic/Cargo.toml
+++ b/primitives/arithmetic/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 integer-sqrt = "0.1.2"
 num-traits = { version = "0.2.8", default-features = false }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
diff --git a/primitives/authority-discovery/Cargo.toml b/primitives/authority-discovery/Cargo.toml
index b47d489deebd..917f3eb024ae 100644
--- a/primitives/authority-discovery/Cargo.toml
+++ b/primitives/authority-discovery/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 sp-application-crypto = { version = "2.0.0", default-features = false, path = "../application-crypto" }
-codec = { package = "parity-scale-codec", default-features = false, version = "1.3.1" }
+codec = { package = "parity-scale-codec", default-features = false, version = "1.3.6" }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 sp-api = { version = "2.0.0", default-features = false, path = "../api" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../runtime" }
diff --git a/primitives/authorship/Cargo.toml b/primitives/authorship/Cargo.toml
index b97a9d4f4554..a63f75467ebf 100644
--- a/primitives/authorship/Cargo.toml
+++ b/primitives/authorship/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 sp-inherents = { version = "2.0.0", default-features = false, path = "../inherents" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../runtime" }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 
 [features]
 default = [ "std" ]
diff --git a/primitives/block-builder/Cargo.toml b/primitives/block-builder/Cargo.toml
index 019fa4518425..5c6dad5ab767 100644
--- a/primitives/block-builder/Cargo.toml
+++ b/primitives/block-builder/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 sp-runtime = { version = "2.0.0", default-features = false, path = "../runtime" }
 sp-api = { version = "2.0.0", default-features = false, path = "../api" }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
 sp-inherents = { version = "2.0.0", default-features = false, path = "../inherents" }
 
 [features]
diff --git a/primitives/blockchain/Cargo.toml b/primitives/blockchain/Cargo.toml
index 516094179e36..7d2d64de85e7 100644
--- a/primitives/blockchain/Cargo.toml
+++ b/primitives/blockchain/Cargo.toml
@@ -19,7 +19,7 @@ lru = "0.6.1"
 parking_lot = "0.11.1"
 thiserror = "1.0.21"
 futures = "0.3.9"
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-consensus = { version = "0.8.0", path = "../consensus/common" }
 sp-runtime = { version = "2.0.0", path = "../runtime" }
 sp-state-machine = { version = "0.8.0", path = "../state-machine" }
diff --git a/primitives/consensus/aura/Cargo.toml b/primitives/consensus/aura/Cargo.toml
index 89f83ddcb6a6..eed368e5c1d1 100644
--- a/primitives/consensus/aura/Cargo.toml
+++ b/primitives/consensus/aura/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 sp-application-crypto = { version = "2.0.0", default-features = false, path = "../../application-crypto" }
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
 sp-std = { version = "2.0.0", default-features = false, path = "../../std" }
 sp-api = { version = "2.0.0", default-features = false, path = "../../api" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../runtime" }
diff --git a/primitives/consensus/babe/Cargo.toml b/primitives/consensus/babe/Cargo.toml
index 6b65bc5f3dbd..65321d324a69 100644
--- a/primitives/consensus/babe/Cargo.toml
+++ b/primitives/consensus/babe/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 sp-application-crypto = { version = "2.0.0", default-features = false, path = "../../application-crypto" }
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
 merlin = { version = "2.0", default-features = false }
 sp-std = { version = "2.0.0", default-features = false, path = "../../std" }
 sp-api = { version = "2.0.0", default-features = false, path = "../../api" }
diff --git a/primitives/consensus/common/Cargo.toml b/primitives/consensus/common/Cargo.toml
index 7172451bc968..78dc3a85087c 100644
--- a/primitives/consensus/common/Cargo.toml
+++ b/primitives/consensus/common/Cargo.toml
@@ -29,7 +29,7 @@ sp-runtime = { version = "2.0.0", path = "../../runtime" }
 sp-utils = { version = "2.0.0", path = "../../utils" }
 sp-trie = { version = "2.0.0", path = "../../trie" }
 sp-api = { version = "2.0.0", path = "../../api" }
-codec = { package = "parity-scale-codec", version = "1.3.1", features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", features = ["derive"] }
 parking_lot = "0.11.1"
 serde = { version = "1.0", features = ["derive"] }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.8.0"}
diff --git a/primitives/consensus/pow/Cargo.toml b/primitives/consensus/pow/Cargo.toml
index 3c8ce89a800a..15b37d6690ba 100644
--- a/primitives/consensus/pow/Cargo.toml
+++ b/primitives/consensus/pow/Cargo.toml
@@ -17,7 +17,7 @@ sp-api = { version = "2.0.0", default-features = false, path = "../../api" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../std" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../runtime" }
 sp-core = { version = "2.0.0", default-features = false, path = "../../core" }
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 
 [features]
 default = ["std"]
diff --git a/primitives/consensus/slots/Cargo.toml b/primitives/consensus/slots/Cargo.toml
index 60e8020aa7e1..11f81628b38a 100644
--- a/primitives/consensus/slots/Cargo.toml
+++ b/primitives/consensus/slots/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../runtime" }
 
 [features]
diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml
index 50c57e068da4..2b27161b0751 100644
--- a/primitives/core/Cargo.toml
+++ b/primitives/core/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 log = { version = "0.4.11", default-features = false }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 byteorder = { version = "1.3.2", default-features = false }
diff --git a/primitives/externalities/Cargo.toml b/primitives/externalities/Cargo.toml
index ca03fe3b735d..f1990e89d757 100644
--- a/primitives/externalities/Cargo.toml
+++ b/primitives/externalities/Cargo.toml
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 sp-storage = { version = "2.0.0", path = "../storage", default-features = false }
 sp-std = { version = "2.0.0", path = "../std", default-features = false }
 environmental = { version = "1.1.2", default-features = false }
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
 
 [features]
 default = ["std"]
diff --git a/primitives/finality-grandpa/Cargo.toml b/primitives/finality-grandpa/Cargo.toml
index df146ccd74d9..f96196bdb190 100644
--- a/primitives/finality-grandpa/Cargo.toml
+++ b/primitives/finality-grandpa/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 grandpa = { package = "finality-grandpa", version = "0.12.3", default-features = false, features = ["derive-codec"] }
 log = { version = "0.4.8", optional = true }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
diff --git a/primitives/inherents/Cargo.toml b/primitives/inherents/Cargo.toml
index ad474c009811..f73bd97bf4b0 100644
--- a/primitives/inherents/Cargo.toml
+++ b/primitives/inherents/Cargo.toml
@@ -18,7 +18,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 parking_lot = { version = "0.11.1", optional = true }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 sp-core = { version = "2.0.0", default-features = false, path = "../core" }
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.21", optional = true }
 
 [features]
diff --git a/primitives/io/Cargo.toml b/primitives/io/Cargo.toml
index a1bdc5c2d899..01ea58e87e3e 100644
--- a/primitives/io/Cargo.toml
+++ b/primitives/io/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
 hash-db = { version = "0.15.2", default-features = false }
 sp-core = { version = "2.0.0", default-features = false, path = "../core" }
 sp-keystore = { version = "0.8.0", default-features = false, optional = true, path = "../keystore" }
diff --git a/primitives/keystore/Cargo.toml b/primitives/keystore/Cargo.toml
index 2068a97356d4..7fb6b4b93fc2 100644
--- a/primitives/keystore/Cargo.toml
+++ b/primitives/keystore/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 async-trait = "0.1.30"
 derive_more = "0.99.2"
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 futures = { version = "0.3.1" }
 schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated", "u64_backend"], default-features = false }
 merlin = { version = "2.0", default-features = false }
diff --git a/primitives/npos-elections/Cargo.toml b/primitives/npos-elections/Cargo.toml
index 71e66e932739..a9e86b84849b 100644
--- a/primitives/npos-elections/Cargo.toml
+++ b/primitives/npos-elections/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 sp-npos-elections-compact = { version = "2.0.0", path = "./compact" }
diff --git a/primitives/npos-elections/fuzzer/Cargo.toml b/primitives/npos-elections/fuzzer/Cargo.toml
index 49740b2cf3ca..a1fa4a2f4ca4 100644
--- a/primitives/npos-elections/fuzzer/Cargo.toml
+++ b/primitives/npos-elections/fuzzer/Cargo.toml
@@ -19,7 +19,7 @@ sp-std = { version = "2.0.0", path = "../../std" }
 sp-runtime = { version = "2.0.0", path = "../../runtime" }
 honggfuzz = "0.5"
 rand = { version = "0.7.3", features = ["std", "small_rng"] }
-codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 
 [[bin]]
 name = "reduce"
diff --git a/primitives/runtime-interface/Cargo.toml b/primitives/runtime-interface/Cargo.toml
index 5e11294cc5c3..bbf02578848e 100644
--- a/primitives/runtime-interface/Cargo.toml
+++ b/primitives/runtime-interface/Cargo.toml
@@ -19,7 +19,7 @@ sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 sp-tracing = { version = "2.0.0", default-features = false, path = "../tracing" }
 sp-runtime-interface-proc-macro = { version = "2.0.0", path = "proc-macro" }
 sp-externalities = { version = "0.8.0", optional = true, path = "../externalities" }
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
 static_assertions = "1.0.0"
 primitive-types = { version = "0.8.0", default-features = false }
 sp-storage = { version = "2.0.0", default-features = false, path = "../storage" }
diff --git a/primitives/runtime/Cargo.toml b/primitives/runtime/Cargo.toml
index 42586dec3fb2..9ce6a95c0c87 100644
--- a/primitives/runtime/Cargo.toml
+++ b/primitives/runtime/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-core = { version = "2.0.0", default-features = false, path = "../core" }
 sp-application-crypto = { version = "2.0.0", default-features = false, path = "../application-crypto" }
 sp-arithmetic = { version = "2.0.0", default-features = false, path = "../arithmetic" }
diff --git a/primitives/sandbox/Cargo.toml b/primitives/sandbox/Cargo.toml
index 4a4dd2f28a41..5ec8c203b54d 100755
--- a/primitives/sandbox/Cargo.toml
+++ b/primitives/sandbox/Cargo.toml
@@ -18,7 +18,7 @@ sp-core = { version = "2.0.0", default-features = false, path = "../core" }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 sp-io = { version = "2.0.0", default-features = false, path = "../io" }
 sp-wasm-interface = { version = "2.0.0", default-features = false, path = "../wasm-interface" }
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
 
 [dev-dependencies]
 wat = "1.0"
diff --git a/primitives/session/Cargo.toml b/primitives/session/Cargo.toml
index 024a9fad6e70..d47a8062ef1a 100644
--- a/primitives/session/Cargo.toml
+++ b/primitives/session/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-api = { version = "2.0.0", default-features = false, path = "../api" }
 sp-core = { version = "2.0.0", default-features = false, path = "../core" }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
diff --git a/primitives/staking/Cargo.toml b/primitives/staking/Cargo.toml
index 2fe36db3871b..fbe4b30f00b8 100644
--- a/primitives/staking/Cargo.toml
+++ b/primitives/staking/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../runtime" }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 
diff --git a/primitives/state-machine/Cargo.toml b/primitives/state-machine/Cargo.toml
index 62879e5712ea..c594c27fc7a2 100644
--- a/primitives/state-machine/Cargo.toml
+++ b/primitives/state-machine/Cargo.toml
@@ -23,7 +23,7 @@ trie-root = { version = "0.16.0", default-features = false }
 sp-trie = { version = "2.0.0", path = "../trie", default-features = false }
 sp-core = { version = "2.0.0", path = "../core", default-features = false }
 sp-panic-handler = { version = "2.0.0", path = "../panic-handler", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
 num-traits = { version = "0.2.8", default-features = false }
 rand = { version = "0.7.2", optional = true }
 sp-externalities = { version = "0.8.0", path = "../externalities", default-features = false }
diff --git a/primitives/storage/Cargo.toml b/primitives/storage/Cargo.toml
index bc593bca0a4e..b025b5a10671 100644
--- a/primitives/storage/Cargo.toml
+++ b/primitives/storage/Cargo.toml
@@ -19,7 +19,7 @@ serde = { version = "1.0.101", optional = true, features = ["derive"] }
 impl-serde = { version = "0.3.1", optional = true }
 ref-cast = "1.0.0"
 sp-debug-derive = { version = "2.0.0", path = "../debug-derive" }
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 
 [features]
 default = [ "std" ]
diff --git a/primitives/tasks/Cargo.toml b/primitives/tasks/Cargo.toml
index 0c0f410824c8..7ad5e6dd5139 100644
--- a/primitives/tasks/Cargo.toml
+++ b/primitives/tasks/Cargo.toml
@@ -22,7 +22,7 @@ sp-runtime-interface = { version = "2.0.0", default-features = false, path = "..
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 
 [dev-dependencies]
-codec = { package = "parity-scale-codec", default-features = false, version = "1.3.1" }
+codec = { package = "parity-scale-codec", default-features = false, version = "1.3.6" }
 
 [features]
 default = ["std"]
diff --git a/primitives/test-primitives/Cargo.toml b/primitives/test-primitives/Cargo.toml
index 6ae45aefa49d..1bfb793610b6 100644
--- a/primitives/test-primitives/Cargo.toml
+++ b/primitives/test-primitives/Cargo.toml
@@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 sp-application-crypto = { version = "2.0.0", default-features = false, path = "../application-crypto" }
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-core = { version = "2.0.0", default-features = false, path = "../core" }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../runtime" }
diff --git a/primitives/timestamp/Cargo.toml b/primitives/timestamp/Cargo.toml
index 9bdb0bac5ee5..de1271b0dd02 100644
--- a/primitives/timestamp/Cargo.toml
+++ b/primitives/timestamp/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 sp-api = { version = "2.0.0", default-features = false, path = "../api" }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../runtime" }
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-inherents = { version = "2.0.0", default-features = false, path = "../inherents" }
 impl-trait-for-tuples = "0.2.0"
 wasm-timer = { version = "0.2", optional = true }
diff --git a/primitives/transaction-pool/Cargo.toml b/primitives/transaction-pool/Cargo.toml
index 0b563481e5db..675987e3a127 100644
--- a/primitives/transaction-pool/Cargo.toml
+++ b/primitives/transaction-pool/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 thiserror = { version = "1.0.21", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.1", optional = true }
+codec = { package = "parity-scale-codec", version = "1.3.6", optional = true }
 derive_more = { version = "0.99.11", optional = true }
 futures = { version = "0.3.1", optional = true }
 log = { version = "0.4.8", optional = true }
diff --git a/primitives/trie/Cargo.toml b/primitives/trie/Cargo.toml
index 3179333edd5d..4392f01d222a 100644
--- a/primitives/trie/Cargo.toml
+++ b/primitives/trie/Cargo.toml
@@ -18,7 +18,7 @@ name = "bench"
 harness = false
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 hash-db = { version = "0.15.2", default-features = false }
 trie-db = { version = "0.22.2", default-features = false }
diff --git a/primitives/version/Cargo.toml b/primitives/version/Cargo.toml
index 5b369c424455..113639434d5b 100644
--- a/primitives/version/Cargo.toml
+++ b/primitives/version/Cargo.toml
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 impl-serde = { version = "0.3.1", optional = true }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../runtime" }
 
diff --git a/primitives/wasm-interface/Cargo.toml b/primitives/wasm-interface/Cargo.toml
index 0473bb4c51ce..32c283a8527f 100644
--- a/primitives/wasm-interface/Cargo.toml
+++ b/primitives/wasm-interface/Cargo.toml
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 wasmi = { version = "0.6.2", optional = true }
 impl-trait-for-tuples = "0.2.0"
 sp-std = { version = "2.0.0", path = "../std", default-features = false }
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 
 [features]
 default = [ "std" ]
diff --git a/test-utils/client/Cargo.toml b/test-utils/client/Cargo.toml
index af15f356a3e8..fad66c5a6708 100644
--- a/test-utils/client/Cargo.toml
+++ b/test-utils/client/Cargo.toml
@@ -12,7 +12,7 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.1" }
+codec = { package = "parity-scale-codec", version = "1.3.6" }
 futures = "0.3.9"
 futures01 = { package = "futures", version = "0.1.29" }
 hash-db = "0.15.2"
diff --git a/test-utils/runtime/Cargo.toml b/test-utils/runtime/Cargo.toml
index f67946c69e7a..c99ec9a05e7c 100644
--- a/test-utils/runtime/Cargo.toml
+++ b/test-utils/runtime/Cargo.toml
@@ -17,7 +17,7 @@ sp-application-crypto = { version = "2.0.0", default-features = false, path = ".
 sp-consensus-aura = { version = "0.8.0", default-features = false, path = "../../primitives/consensus/aura" }
 sp-consensus-babe = { version = "0.8.0", default-features = false, path = "../../primitives/consensus/babe" }
 sp-block-builder = { version = "2.0.0", default-features = false, path = "../../primitives/block-builder" }
-codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 frame-executive = { version = "2.0.0", default-features = false, path = "../../frame/executive" }
 sp-inherents = { version = "2.0.0", default-features = false, path = "../../primitives/inherents" }
 sp-keyring = { version = "2.0.0", optional = true, path = "../../primitives/keyring" }
diff --git a/test-utils/runtime/client/Cargo.toml b/test-utils/runtime/client/Cargo.toml
index c798cdca1f3f..2540e29c8b0e 100644
--- a/test-utils/runtime/client/Cargo.toml
+++ b/test-utils/runtime/client/Cargo.toml
@@ -21,7 +21,7 @@ substrate-test-runtime = { version = "2.0.0", path = "../../runtime" }
 sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
 sp-api = { version = "2.0.0", path = "../../../primitives/api" }
 sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
-codec = { package = "parity-scale-codec", version = "1.3.1" }
+codec = { package = "parity-scale-codec", version = "1.3.6" }
 sc-client-api = { version = "2.0.0", path = "../../../client/api" }
 sc-consensus = { version = "0.8.0", path = "../../../client/consensus/common" }
 sc-service = { version = "0.8.0", default-features = false, path = "../../../client/service" }
diff --git a/test-utils/runtime/transaction-pool/Cargo.toml b/test-utils/runtime/transaction-pool/Cargo.toml
index c9d6d88e15eb..7fbea1e3c0ed 100644
--- a/test-utils/runtime/transaction-pool/Cargo.toml
+++ b/test-utils/runtime/transaction-pool/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 substrate-test-runtime-client = { version = "2.0.0", path = "../client" }
 parking_lot = "0.11.1"
-codec = { package = "parity-scale-codec", version = "1.3.1" }
+codec = { package = "parity-scale-codec", version = "1.3.6" }
 sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
 sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
 sp-transaction-pool = { version = "2.0.0", path = "../../../primitives/transaction-pool" }
diff --git a/utils/fork-tree/Cargo.toml b/utils/fork-tree/Cargo.toml
index 6e9318e1ca0f..292d1a83b7e5 100644
--- a/utils/fork-tree/Cargo.toml
+++ b/utils/fork-tree/Cargo.toml
@@ -14,4 +14,4 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.1", features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.6", features = ["derive"] }
diff --git a/utils/frame/rpc/support/Cargo.toml b/utils/frame/rpc/support/Cargo.toml
index 7eb0dfcf614c..b9ee76b846e0 100644
--- a/utils/frame/rpc/support/Cargo.toml
+++ b/utils/frame/rpc/support/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 futures = { version = "0.3.0", features = ["compat"] }
 jsonrpc-client-transports = { version = "15.1.0", default-features = false, features = ["http"] }
 jsonrpc-core = "15.1.0"
-codec = { package = "parity-scale-codec", version = "1.3.1" }
+codec = { package = "parity-scale-codec", version = "1.3.6" }
 serde = "1"
 frame-support = { version = "2.0.0", path = "../../../../frame/support" }
 sp-storage = { version = "2.0.0", path = "../../../../primitives/storage" }
diff --git a/utils/frame/rpc/system/Cargo.toml b/utils/frame/rpc/system/Cargo.toml
index 735fd51cc91b..03016462cbea 100644
--- a/utils/frame/rpc/system/Cargo.toml
+++ b/utils/frame/rpc/system/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 sc-client-api = { version = "2.0.0", path = "../../../../client/api" }
-codec = { package = "parity-scale-codec", version = "1.3.1" }
+codec = { package = "parity-scale-codec", version = "1.3.6" }
 futures = { version = "0.3.4", features = ["compat"] }
 jsonrpc-core = "15.1.0"
 jsonrpc-core-client = "15.1.0"

From af88571b44c9656c4d0c4fef577c797cca3c05a2 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Tue, 12 Jan 2021 09:59:17 +0100
Subject: [PATCH 0253/1194] Add Prometheus alerts if unbounded channels are too
 large (#7866)

* Add Prometheus alerts if unbounded channels are too large

* Tweaks
---
 .../alerting-rules/alerting-rules.yaml        | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/.maintain/monitoring/alerting-rules/alerting-rules.yaml b/.maintain/monitoring/alerting-rules/alerting-rules.yaml
index 6bca918735e7..deb454c462bd 100644
--- a/.maintain/monitoring/alerting-rules/alerting-rules.yaml
+++ b/.maintain/monitoring/alerting-rules/alerting-rules.yaml
@@ -147,3 +147,28 @@ groups:
       message: 'Authority discovery on node {{ $labels.instance }} fails to
       process more than 50 % of the values found on the DHT for more than 2
       hours.'
+
+  - alert: UnboundedChannelPersistentlyLarge
+    expr: '(
+        (polkadot_unbounded_channel_len{action = "send"} -
+            ignoring(action) polkadot_unbounded_channel_len{action = "received"})
+        or on(instance) polkadot_unbounded_channel_len{action = "send"}
+    ) >= 200'
+    for: 5m
+    labels:
+      severity: warning
+    annotations:
+      message: 'Channel {{ $labels.entity }} on node {{ $labels.instance }} contains
+      more than 200 items for more than 5 minutes. Node might be frozen.'
+
+  - alert: UnboundedChannelVeryLarge
+    expr: '(
+        (polkadot_unbounded_channel_len{action = "send"} -
+            ignoring(action) polkadot_unbounded_channel_len{action = "received"})
+        or on(instance) polkadot_unbounded_channel_len{action = "send"}
+    ) > 5000'
+    labels:
+      severity: warning
+    annotations:
+      message: 'Channel {{ $labels.entity }} on node {{ $labels.instance }} contains more than
+      5000 items.'

From f977fb8a16548534481ba1dac948fa6835c1835d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Jan 2021 09:51:01 +0000
Subject: [PATCH 0254/1194] Bump retain_mut from 0.1.1 to 0.1.2 (#7869)

Bumps [retain_mut](https://github.com/upsuper/retain_mut) from 0.1.1 to 0.1.2.
- [Release notes](https://github.com/upsuper/retain_mut/releases)
- [Commits](https://github.com/upsuper/retain_mut/compare/v0.1.1...v0.1.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                               | 4 ++--
 client/consensus/babe/Cargo.toml         | 2 +-
 client/transaction-pool/graph/Cargo.toml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e1d57b254146..7421af5ff1b5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6288,9 +6288,9 @@ dependencies = [
 
 [[package]]
 name = "retain_mut"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e005d658ad26eacc2b6c506dfde519f4e277e328d0eb3379ca61647d70a8f531"
+checksum = "53552c6c49e1e13f1a203ef0080ab3bbef0beb570a528993e83df057a9d9bba1"
 
 [[package]]
 name = "ring"
diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml
index bd07e3dd2269..8104ca2047ca 100644
--- a/client/consensus/babe/Cargo.toml
+++ b/client/consensus/babe/Cargo.toml
@@ -51,7 +51,7 @@ rand = "0.7.2"
 merlin = "2.0"
 pdqselect = "0.1.0"
 derive_more = "0.99.2"
-retain_mut = "0.1.1"
+retain_mut = "0.1.2"
 
 [dev-dependencies]
 sp-keyring = { version = "2.0.0", path = "../../../primitives/keyring" }
diff --git a/client/transaction-pool/graph/Cargo.toml b/client/transaction-pool/graph/Cargo.toml
index d09f58f2df16..f6143f8837bf 100644
--- a/client/transaction-pool/graph/Cargo.toml
+++ b/client/transaction-pool/graph/Cargo.toml
@@ -27,7 +27,7 @@ sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
 sp-transaction-pool = { version = "2.0.0", path = "../../../primitives/transaction-pool" }
 parity-util-mem = { version = "0.8.0", default-features = false, features = ["primitive-types"] }
 linked-hash-map = "0.5.2"
-retain_mut = "0.1.1"
+retain_mut = "0.1.2"
 
 [dev-dependencies]
 assert_matches = "1.3.0"

From 7a52a744173f8f64b90d4b597c2d68a767160557 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Tue, 12 Jan 2021 11:08:52 +0000
Subject: [PATCH 0255/1194] babe: initialize next authorities on genesis
 (#7872)

* babe: initialize next authorities on genesis

* babe: add test for genesis authorities
---
 frame/babe/src/lib.rs   | 1 +
 frame/babe/src/tests.rs | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/frame/babe/src/lib.rs b/frame/babe/src/lib.rs
index 79b87cd5c018..d604bfd57d1a 100644
--- a/frame/babe/src/lib.rs
+++ b/frame/babe/src/lib.rs
@@ -674,6 +674,7 @@ impl<T: Config> Module<T> {
 		if !authorities.is_empty() {
 			assert!(Authorities::get().is_empty(), "Authorities are already initialized!");
 			Authorities::put(authorities);
+			NextAuthorities::put(authorities);
 		}
 	}
 
diff --git a/frame/babe/src/tests.rs b/frame/babe/src/tests.rs
index 4bef98873444..23e8bc765c80 100644
--- a/frame/babe/src/tests.rs
+++ b/frame/babe/src/tests.rs
@@ -255,6 +255,12 @@ fn can_enact_next_config() {
 #[test]
 fn can_fetch_current_and_next_epoch_data() {
 	new_test_ext(5).execute_with(|| {
+		// genesis authorities should be used for the first and second epoch
+		assert_eq!(
+			Babe::current_epoch().authorities,
+			Babe::next_epoch().authorities,
+		);
+
 		// 1 era = 3 epochs
 		// 1 epoch = 3 slots
 		// Eras start from 0.

From 928b7358886280517dc48bb0172867e76520906d Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Tue, 12 Jan 2021 13:04:16 +0100
Subject: [PATCH 0256/1194] Update serde and parity-multiaddr, to fix master CI
 (#7877)

---
 Cargo.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7421af5ff1b5..833628d7ed8c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5229,9 +5229,9 @@ dependencies = [
 
 [[package]]
 name = "parity-multiaddr"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f51a30667591b14f96068b2d12f1306d07a41ebd98239d194356d4d9707ac16"
+checksum = "180cd097078b337d2ba6400c6a67b181b38b611273cb1d8d12f3d8d5d8eaaacb"
 dependencies = [
  "arrayref",
  "bs58",
@@ -7798,9 +7798,9 @@ checksum = "930c0acf610d3fdb5e2ab6213019aaa04e227ebe9547b0649ba599b16d788bd7"
 
 [[package]]
 name = "serde"
-version = "1.0.117"
+version = "1.0.119"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a"
+checksum = "9bdd36f49e35b61d49efd8aa7fc068fd295961fd2286d0b2ee9a4c7a14e99cc3"
 dependencies = [
  "serde_derive",
 ]
@@ -7817,9 +7817,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.117"
+version = "1.0.119"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e"
+checksum = "552954ce79a059ddd5fd68c271592374bd15cab2274970380c000118aeffe1cd"
 dependencies = [
  "proc-macro2",
  "quote",

From ecb85f764fa68dcf89dbf01e50567420f8605524 Mon Sep 17 00:00:00 2001
From: Satish Mohan <54302767+smohan-dw@users.noreply.github.com>
Date: Tue, 12 Jan 2021 18:54:03 +0530
Subject: [PATCH 0257/1194] Add ss58 version prefix for CORD (from Dhiway)
 (#7862)

* Add ss58 version prefix for CORD

* Add ss58 version prefix for CORD
---
 primitives/core/src/crypto.rs | 2 ++
 ss58-registry.json            | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index 07720b575ed7..b11cae50364e 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -496,6 +496,8 @@ ss58_address_format!(
 		(25, "alphaville", "ZERO testnet, standard account (*25519).")
 	SubsocialAccount =>
 		(28, "subsocial", "Subsocial network, standard account (*25519).")
+	DhiwayAccount =>
+		(29, "cord", "Dhiway CORD network, standard account (*25519).")	
 	PhalaAccount =>
 		(30, "phala", "Phala Network, standard account (*25519).")
 	RobonomicsAccount =>
diff --git a/ss58-registry.json b/ss58-registry.json
index a203db2b8e83..60d678c0c598 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -253,6 +253,15 @@
 			"standardAccount": "*25519",
 			"website": null
 		},
+		{
+			"prefix": 29,
+			"network": "cord",
+			"displayName": "Dhiway CORD Network",
+			"symbols": ["DCU"],
+			"decimals": [18],
+			"standardAccount": "*25519",
+			"website": "https://dhiway.com/"
+		},
 		{
 			"prefix": 30,
 			"network": "phala",

From b2a50198d3fa71959c77d22edb5fdb8c1e74006c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Tue, 12 Jan 2021 15:04:48 +0000
Subject: [PATCH 0258/1194] network-gossip: add metric for number of local
 messages (#7871)

* network-gossip: add metric for number of local messages

* grandpa: fix GossipEngine missing metrics registry parameter

* network-gossip: increase known messages cache size

* network-gossip: fix tests

* grandpa: remove unnecessary clone

Co-authored-by: Max Inden <mail@max-inden.de>

* network-gossip: count registered and expired messages separately

* network-gossip: add comment on known messages cache size

* network-gossip: extend comment with cache size in memory

Co-authored-by: Max Inden <mail@max-inden.de>
---
 Cargo.lock                                    |   1 +
 .../finality-grandpa/src/communication/mod.rs |   3 +-
 client/network-gossip/Cargo.toml              |   1 +
 client/network-gossip/src/bridge.rs           |  19 ++-
 client/network-gossip/src/state_machine.rs    | 111 +++++++++++++-----
 5 files changed, 101 insertions(+), 34 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 833628d7ed8c..4c74549d08b9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7218,6 +7218,7 @@ dependencies = [
  "rand 0.7.3",
  "sc-network",
  "sp-runtime",
+ "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
  "wasm-timer",
 ]
diff --git a/client/finality-grandpa/src/communication/mod.rs b/client/finality-grandpa/src/communication/mod.rs
index 77d2d15e5d02..66b7f004895f 100644
--- a/client/finality-grandpa/src/communication/mod.rs
+++ b/client/finality-grandpa/src/communication/mod.rs
@@ -217,7 +217,8 @@ impl<B: BlockT, N: Network<B>> NetworkBridge<B, N> {
 		let gossip_engine = Arc::new(Mutex::new(GossipEngine::new(
 			service.clone(),
 			GRANDPA_PROTOCOL_NAME,
-			validator.clone()
+			validator.clone(),
+			prometheus_registry,
 		)));
 
 		{
diff --git a/client/network-gossip/Cargo.toml b/client/network-gossip/Cargo.toml
index 3a10c62ac6dd..9ad591d0af69 100644
--- a/client/network-gossip/Cargo.toml
+++ b/client/network-gossip/Cargo.toml
@@ -20,6 +20,7 @@ futures-timer = "3.0.1"
 libp2p = { version = "0.33.0", default-features = false }
 log = "0.4.8"
 lru = "0.6.1"
+prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.8.0", path = "../../utils/prometheus" }
 sc-network = { version = "0.8.0", path = "../network" }
 sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
 wasm-timer = "0.2"
diff --git a/client/network-gossip/src/bridge.rs b/client/network-gossip/src/bridge.rs
index d444409d1cd3..4e8ebfda20c2 100644
--- a/client/network-gossip/src/bridge.rs
+++ b/client/network-gossip/src/bridge.rs
@@ -25,6 +25,7 @@ use futures::prelude::*;
 use futures::channel::mpsc::{channel, Sender, Receiver};
 use libp2p::PeerId;
 use log::trace;
+use prometheus_endpoint::Registry;
 use sp_runtime::traits::Block as BlockT;
 use std::{
 	borrow::Cow,
@@ -72,12 +73,13 @@ impl<B: BlockT> GossipEngine<B> {
 		network: N,
 		protocol: impl Into<Cow<'static, str>>,
 		validator: Arc<dyn Validator<B>>,
+		metrics_registry: Option<&Registry>,
 	) -> Self where B: 'static {
 		let protocol = protocol.into();
 		let network_event_stream = network.event_stream();
 
 		GossipEngine {
-			state_machine: ConsensusGossip::new(validator, protocol.clone()),
+			state_machine: ConsensusGossip::new(validator, protocol.clone(), metrics_registry),
 			network: Box::new(network),
 			periodic_maintenance_interval: futures_timer::Delay::new(PERIODIC_MAINTENANCE_INTERVAL),
 			protocol,
@@ -372,7 +374,8 @@ mod tests {
 		let mut gossip_engine = GossipEngine::<Block>::new(
 			network.clone(),
 			"/my_protocol",
-			Arc::new(AllowAll{}),
+			Arc::new(AllowAll {}),
+			None,
 		);
 
 		// Drop network event stream sender side.
@@ -399,7 +402,8 @@ mod tests {
 		let mut gossip_engine = GossipEngine::<Block>::new(
 			network.clone(),
 			protocol.clone(),
-			Arc::new(AllowAll{}),
+			Arc::new(AllowAll {}),
+			None,
 		);
 
 		let mut event_sender = network.inner.lock()
@@ -533,7 +537,8 @@ mod tests {
 			let mut gossip_engine = GossipEngine::<Block>::new(
 				network.clone(),
 				protocol.clone(),
-				Arc::new(TestValidator{}),
+				Arc::new(TestValidator {}),
+				None,
 			);
 
 			// Create channels.
@@ -549,8 +554,10 @@ mod tests {
 			// Insert sender sides into `gossip_engine`.
 			for (topic, tx) in txs {
 				match gossip_engine.message_sinks.get_mut(&topic) {
-					Some(entry) =>  entry.push(tx),
-					None => {gossip_engine.message_sinks.insert(topic, vec![tx]);},
+					Some(entry) => entry.push(tx),
+					None => {
+						gossip_engine.message_sinks.insert(topic, vec![tx]);
+					}
 				}
 			}
 
diff --git a/client/network-gossip/src/state_machine.rs b/client/network-gossip/src/state_machine.rs
index 58a0f62cb130..805f2e82ea25 100644
--- a/client/network-gossip/src/state_machine.rs
+++ b/client/network-gossip/src/state_machine.rs
@@ -23,15 +23,24 @@ use std::collections::{HashMap, HashSet};
 use std::sync::Arc;
 use std::iter;
 use std::time;
-use log::{error, trace};
+use log::{debug, error, trace};
 use lru::LruCache;
 use libp2p::PeerId;
+use prometheus_endpoint::{register, Counter, PrometheusError, Registry, U64};
 use sp_runtime::traits::{Block as BlockT, Hash, HashFor};
 use sc_network::ObservedRole;
 use wasm_timer::Instant;
 
 // FIXME: Add additional spam/DoS attack protection: https://github.com/paritytech/substrate/issues/1115
-const KNOWN_MESSAGES_CACHE_SIZE: usize = 4096;
+// NOTE: The current value is adjusted based on largest production network deployment (Kusama) and
+// the current main gossip user (GRANDPA). Currently there are ~800 validators on Kusama, as such,
+// each GRANDPA round should generate ~1600 messages, and we currently keep track of the last 2
+// completed rounds and the current live one. That makes it so that at any point we will be holding
+// ~4800 live messages.
+//
+// Assuming that each known message is tracked with a 32 byte hash (common for `Block::Hash`), then
+// this cache should take about 256 KB of memory.
+const KNOWN_MESSAGES_CACHE_SIZE: usize = 8192;
 
 const REBROADCAST_INTERVAL: time::Duration = time::Duration::from_secs(30);
 
@@ -151,11 +160,25 @@ pub struct ConsensusGossip<B: BlockT> {
 	protocol: Cow<'static, str>,
 	validator: Arc<dyn Validator<B>>,
 	next_broadcast: Instant,
+	metrics: Option<Metrics>,
 }
 
 impl<B: BlockT> ConsensusGossip<B> {
 	/// Create a new instance using the given validator.
-	pub fn new(validator: Arc<dyn Validator<B>>, protocol: Cow<'static, str>) -> Self {
+	pub fn new(
+		validator: Arc<dyn Validator<B>>,
+		protocol: Cow<'static, str>,
+		metrics_registry: Option<&Registry>,
+	) -> Self {
+		let metrics = match metrics_registry.map(Metrics::register) {
+			Some(Ok(metrics)) => Some(metrics),
+			Some(Err(e)) => {
+				debug!(target: "gossip", "Failed to register metrics: {:?}", e);
+				None
+			}
+			None => None,
+		};
+
 		ConsensusGossip {
 			peers: HashMap::new(),
 			messages: Default::default(),
@@ -163,6 +186,7 @@ impl<B: BlockT> ConsensusGossip<B> {
 			protocol,
 			validator,
 			next_broadcast: Instant::now() + REBROADCAST_INTERVAL,
+			metrics,
 		}
 	}
 
@@ -197,6 +221,10 @@ impl<B: BlockT> ConsensusGossip<B> {
 				message,
 				sender,
 			});
+
+			if let Some(ref metrics) = self.metrics {
+				metrics.registered_messages.inc();
+			}
 		}
 	}
 
@@ -264,10 +292,17 @@ impl<B: BlockT> ConsensusGossip<B> {
 		let before = self.messages.len();
 
 		let mut message_expired = self.validator.message_expired();
-		self.messages.retain(|entry| !message_expired(entry.topic, &entry.message));
+		self.messages
+			.retain(|entry| !message_expired(entry.topic, &entry.message));
+
+		let expired_messages = before - self.messages.len();
+
+		if let Some(ref metrics) = self.metrics {
+			metrics.expired_messages.inc_by(expired_messages as u64)
+		}
 
 		trace!(target: "gossip", "Cleaned up {} stale messages, {} left ({} known)",
-			before - self.messages.len(),
+			expired_messages,
 			self.messages.len(),
 			known_messages.len(),
 		);
@@ -429,6 +464,32 @@ impl<B: BlockT> ConsensusGossip<B> {
 	}
 }
 
+struct Metrics {
+	registered_messages: Counter<U64>,
+	expired_messages: Counter<U64>,
+}
+
+impl Metrics {
+	fn register(registry: &Registry) -> Result<Self, PrometheusError> {
+		Ok(Self {
+			registered_messages: register(
+				Counter::new(
+					"network_gossip_registered_messages_total",
+					"Number of registered messages by the gossip service.",
+				)?,
+				registry,
+			)?,
+			expired_messages: register(
+				Counter::new(
+					"network_gossip_expired_messages_total",
+					"Number of expired messages by the gossip service.",
+				)?,
+				registry,
+			)?,
+		})
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use futures::prelude::*;
@@ -538,7 +599,7 @@ mod tests {
 
 		let prev_hash = H256::random();
 		let best_hash = H256::random();
-		let mut consensus = ConsensusGossip::<Block>::new(Arc::new(AllowAll), "/foo".into());
+		let mut consensus = ConsensusGossip::<Block>::new(Arc::new(AllowAll), "/foo".into(), None);
 		let m1_hash = H256::random();
 		let m2_hash = H256::random();
 		let m1 = vec![1, 2, 3];
@@ -565,11 +626,11 @@ mod tests {
 
 	#[test]
 	fn message_stream_include_those_sent_before_asking() {
-		let mut consensus = ConsensusGossip::<Block>::new(Arc::new(AllowAll), "/foo".into());
+		let mut consensus = ConsensusGossip::<Block>::new(Arc::new(AllowAll), "/foo".into(), None);
 
 		// Register message.
 		let message = vec![4, 5, 6];
-		let topic = HashFor::<Block>::hash(&[1,2,3]);
+		let topic = HashFor::<Block>::hash(&[1, 2, 3]);
 		consensus.register_message(topic, message.clone());
 
 		assert_eq!(
@@ -580,7 +641,7 @@ mod tests {
 
 	#[test]
 	fn can_keep_multiple_messages_per_topic() {
-		let mut consensus = ConsensusGossip::<Block>::new(Arc::new(AllowAll), "/foo".into());
+		let mut consensus = ConsensusGossip::<Block>::new(Arc::new(AllowAll), "/foo".into(), None);
 
 		let topic = [1; 32].into();
 		let msg_a = vec![1, 2, 3];
@@ -594,7 +655,7 @@ mod tests {
 
 	#[test]
 	fn peer_is_removed_on_disconnect() {
-		let mut consensus = ConsensusGossip::<Block>::new(Arc::new(AllowAll), "/foo".into());
+		let mut consensus = ConsensusGossip::<Block>::new(Arc::new(AllowAll), "/foo".into(), None);
 
 		let mut network = NoOpNetwork::default();
 
@@ -608,14 +669,12 @@ mod tests {
 
 	#[test]
 	fn on_incoming_ignores_discarded_messages() {
-		let to_forward = ConsensusGossip::<Block>::new(
-			Arc::new(DiscardAll),
-			"/foo".into(),
-		).on_incoming(
-			&mut NoOpNetwork::default(),
-			PeerId::random(),
-			vec![vec![1, 2, 3]],
-		);
+		let to_forward = ConsensusGossip::<Block>::new(Arc::new(DiscardAll), "/foo".into(), None)
+			.on_incoming(
+				&mut NoOpNetwork::default(),
+				PeerId::random(),
+				vec![vec![1, 2, 3]],
+			);
 
 		assert!(
 			to_forward.is_empty(),
@@ -628,15 +687,13 @@ mod tests {
 		let mut network = NoOpNetwork::default();
 		let remote = PeerId::random();
 
-		let to_forward = ConsensusGossip::<Block>::new(
-			Arc::new(AllowAll),
-			"/foo".into(),
-		).on_incoming(
-			&mut network,
-			// Unregistered peer.
-			remote.clone(),
-			vec![vec![1, 2, 3]],
-		);
+		let to_forward = ConsensusGossip::<Block>::new(Arc::new(AllowAll), "/foo".into(), None)
+			.on_incoming(
+				&mut network,
+				// Unregistered peer.
+				remote.clone(),
+				vec![vec![1, 2, 3]],
+			);
 
 		assert!(
 			to_forward.is_empty(),

From 82d97c80d8688ad540a6e1bdb96da7ea4bee1283 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Wed, 13 Jan 2021 11:27:49 +0100
Subject: [PATCH 0259/1194] Clean-up pass in network/src/protocol.rs (#7889)

* Remove statistics system

* Remove ContextData struct

* Remove next_request_id

* Some TryFrom nit-picking

* Use constants for peer sets
---
 client/network/src/protocol.rs         | 114 +++++++------------------
 client/network/src/protocol/message.rs |  24 ------
 2 files changed, 31 insertions(+), 107 deletions(-)

diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index 5679292967df..0a9efbb3ba01 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -54,9 +54,9 @@ use sp_runtime::traits::{
 use sp_arithmetic::traits::SaturatedConversion;
 use sync::{ChainSync, SyncState};
 use std::borrow::Cow;
+use std::convert::TryFrom as _;
 use std::collections::{HashMap, HashSet, VecDeque, hash_map::Entry};
 use std::sync::Arc;
-use std::fmt::Write;
 use std::{io, iter, num::NonZeroUsize, pin::Pin, task::Poll, time};
 
 mod generic_proto;
@@ -213,7 +213,9 @@ pub struct Protocol<B: BlockT, H: ExHashT> {
 	config: ProtocolConfig,
 	genesis_hash: B::Hash,
 	sync: ChainSync<B>,
-	context_data: ContextData<B, H>,
+	// All connected peers
+	peers: HashMap<PeerId, Peer<B, H>>,
+	chain: Arc<dyn Client<B>>,
 	/// List of nodes for which we perform additional logging because they are important for the
 	/// user.
 	important_peers: HashSet<PeerId>,
@@ -230,14 +232,6 @@ pub struct Protocol<B: BlockT, H: ExHashT> {
 	boot_node_ids: HashSet<PeerId>,
 }
 
-#[derive(Default)]
-struct PacketStats {
-	bytes_in: u64,
-	bytes_out: u64,
-	count_in: u64,
-	count_out: u64,
-}
-
 /// Peer information
 #[derive(Debug)]
 struct Peer<B: BlockT, H: ExHashT> {
@@ -251,8 +245,6 @@ struct Peer<B: BlockT, H: ExHashT> {
 	known_transactions: LruHashSet<H>,
 	/// Holds a set of blocks known to this peer.
 	known_blocks: LruHashSet<B::Hash>,
-	/// Request counter,
-	next_request_id: message::RequestId,
 }
 
 /// Info about a peer's known state.
@@ -266,14 +258,6 @@ pub struct PeerInfo<B: BlockT> {
 	pub best_number: <B::Header as HeaderT>::Number,
 }
 
-/// Data necessary to create a context.
-struct ContextData<B: BlockT, H: ExHashT> {
-	// All connected peers
-	peers: HashMap<PeerId, Peer<B, H>>,
-	stats: HashMap<&'static str, PacketStats>,
-	pub chain: Arc<dyn Client<B>>,
-}
-
 /// Configuration for the Substrate-specific part of the networking layer.
 #[derive(Clone)]
 pub struct ProtocolConfig {
@@ -511,11 +495,8 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 			pending_transactions: FuturesUnordered::new(),
 			pending_transactions_peers: HashMap::new(),
 			config,
-			context_data: ContextData {
-				peers: HashMap::new(),
-				stats: HashMap::new(),
-				chain,
-			},
+			peers: HashMap::new(),
+			chain,
 			genesis_hash: info.genesis_hash,
 			sync,
 			important_peers,
@@ -567,13 +548,12 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 
 	/// Returns the number of peers we're connected to.
 	pub fn num_connected_peers(&self) -> usize {
-		self.context_data.peers.values().count()
+		self.peers.values().count()
 	}
 
 	/// Returns the number of peers we're connected to and that are being queried.
 	pub fn num_active_peers(&self) -> usize {
-		self.context_data
-			.peers
+		self.peers
 			.values()
 			.filter(|p| p.block_request.is_some())
 			.count()
@@ -631,7 +611,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 
 	fn update_peer_info(&mut self, who: &PeerId) {
 		if let Some(info) = self.sync.peer_info(who) {
-			if let Some(ref mut peer) = self.context_data.peers.get_mut(who) {
+			if let Some(ref mut peer) = self.peers.get_mut(who) {
 				peer.info.best_hash = info.best_hash;
 				peer.info.best_number = info.best_number;
 			}
@@ -640,7 +620,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 
 	/// Returns information about all the peers we are connected to after the handshake message.
 	pub fn peers_info(&self) -> impl Iterator<Item = (&PeerId, &PeerInfo<B>)> {
-		self.context_data.peers.iter().map(|(id, peer)| (id, &peer.info))
+		self.peers.iter().map(|(id, peer)| (id, &peer.info))
 	}
 
 	fn on_custom_message(
@@ -663,10 +643,6 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 			}
 		};
 
-		let mut stats = self.context_data.stats.entry(message.id()).or_default();
-		stats.bytes_in += data.len() as u64;
-		stats.count_in += 1;
-
 		match message {
 			GenericMessage::Status(_) =>
 				debug!(target: "sub-libp2p", "Received unexpected Status"),
@@ -710,7 +686,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 		who: PeerId,
 		request: message::BlockRequest<B>,
 	) -> CustomMessageOutcome<B> {
-		prepare_block_request::<B, H>(&mut self.context_data.peers, who, request)
+		prepare_block_request::<B, H>(&mut self.peers, who, request)
 	}
 
 	/// Called by peer when it is disconnecting.
@@ -723,7 +699,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 			trace!(target: "sync", "{} disconnected", peer);
 		}
 
-		if let Some(_peer_data) = self.context_data.peers.remove(&peer) {
+		if let Some(_peer_data) = self.peers.remove(&peer) {
 			self.sync.peer_disconnected(&peer);
 			Ok(())
 		} else {
@@ -854,7 +830,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 	) -> Result<(), ()> {
 		trace!(target: "sync", "New peer {} {:?}", who, status);
 
-		if self.context_data.peers.contains_key(&who) {
+		if self.peers.contains_key(&who) {
 			log::error!(target: "sync", "Called on_sync_peer_connected with already connected peer {}", who);
 			debug_assert!(false);
 			return Err(());
@@ -894,7 +870,6 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 
 			// we don't interested in peers that are far behind us
 			let self_best_block = self
-				.context_data
 				.chain
 				.info()
 				.best_number;
@@ -921,7 +896,6 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 				.expect("Constant is nonzero")),
 			known_blocks: LruHashSet::new(NonZeroUsize::new(MAX_KNOWN_BLOCKS)
 				.expect("Constant is nonzero")),
-			next_request_id: 0,
 		};
 
 		let req = if peer.info.roles.is_full() {
@@ -939,7 +913,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 
 		debug!(target: "sync", "Connected {}", who);
 
-		self.context_data.peers.insert(who.clone(), peer);
+		self.peers.insert(who.clone(), peer);
 		self.pending_messages.push_back(CustomMessageOutcome::PeerNewBest(who.clone(), status.best_number));
 
 		if let Some(req) = req {
@@ -971,7 +945,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 		}
 
 		trace!(target: "sync", "Received {} transactions from {}", transactions.len(), who);
-		if let Some(ref mut peer) = self.context_data.peers.get_mut(&who) {
+		if let Some(ref mut peer) = self.peers.get_mut(&who) {
 			for t in transactions {
 				if self.pending_transactions.len() > MAX_PENDING_TRANSACTIONS {
 					debug!(
@@ -1035,7 +1009,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 		let mut propagated_to = HashMap::<_, Vec<_>>::new();
 		let mut propagated_transactions = 0;
 
-		for (who, peer) in self.context_data.peers.iter_mut() {
+		for (who, peer) in self.peers.iter_mut() {
 			// never send transactions to the light node
 			if !peer.info.roles.is_full() {
 				continue;
@@ -1093,7 +1067,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 	/// In chain-based consensus, we often need to make sure non-best forks are
 	/// at least temporarily synced.
 	pub fn announce_block(&mut self, hash: B::Hash, data: Vec<u8>) {
-		let header = match self.context_data.chain.header(BlockId::Hash(hash)) {
+		let header = match self.chain.header(BlockId::Hash(hash)) {
 			Ok(Some(header)) => header,
 			Ok(None) => {
 				warn!("Trying to announce unknown block: {}", hash);
@@ -1110,10 +1084,10 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 			return;
 		}
 
-		let is_best = self.context_data.chain.info().best_hash == hash;
+		let is_best = self.chain.info().best_hash == hash;
 		debug!(target: "sync", "Reannouncing block {:?} is_best: {}", hash, is_best);
 
-		for (who, ref mut peer) in self.context_data.peers.iter_mut() {
+		for (who, ref mut peer) in self.peers.iter_mut() {
 			let inserted = peer.known_blocks.insert(hash);
 			if inserted {
 				trace!(target: "sync", "Announcing block {:?} to {}", hash, who);
@@ -1156,7 +1130,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 	) {
 		let hash = announce.header.hash();
 
-		let peer = match self.context_data.peers.get_mut(&who) {
+		let peer = match self.peers.get_mut(&who) {
 			Some(p) => p,
 			None => {
 				log::error!(target: "sync", "Received block announce from disconnected peer {}", who);
@@ -1294,7 +1268,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 			match result {
 				Ok((id, req)) => {
 					self.pending_messages.push_back(
-						prepare_block_request(&mut self.context_data.peers, id, req)
+						prepare_block_request(&mut self.peers, id, req)
 					);
 				}
 				Err(sync::BadPeer(id, repu)) => {
@@ -1404,27 +1378,9 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 		}
 	}
 
-	fn format_stats(&self) -> String {
-		let mut out = String::new();
-		for (id, stats) in &self.context_data.stats {
-			let _ = writeln!(
-				&mut out,
-				"{}: In: {} bytes ({}), Out: {} bytes ({})",
-				id,
-				stats.bytes_in,
-				stats.count_in,
-				stats.bytes_out,
-				stats.count_out,
-			);
-		}
-		out
-	}
-
 	fn report_metrics(&self) {
-		use std::convert::TryInto;
-
 		if let Some(metrics) = &self.metrics {
-			let n = self.context_data.peers.len().try_into().unwrap_or(std::u64::MAX);
+			let n = u64::try_from(self.peers.len()).unwrap_or(std::u64::MAX);
 			metrics.peers.set(n);
 
 			let m = self.sync.metrics();
@@ -1447,13 +1403,11 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 fn prepare_block_request<B: BlockT, H: ExHashT>(
 	peers: &mut HashMap<PeerId, Peer<B, H>>,
 	who: PeerId,
-	mut request: message::BlockRequest<B>,
+	request: message::BlockRequest<B>,
 ) -> CustomMessageOutcome<B> {
 	let (tx, rx) = oneshot::channel();
 
 	if let Some(ref mut peer) = peers.get_mut(&who) {
-		request.id = peer.next_request_id;
-		peer.next_request_id += 1;
 		peer.block_request = Some((request.clone(), rx));
 	}
 
@@ -1568,7 +1522,7 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 
 		// Check for finished outgoing requests.
 		let mut finished_block_requests = Vec::new();
-		for (id, peer) in self.context_data.peers.iter_mut() {
+		for (id, peer) in self.peers.iter_mut() {
 			if let Peer { block_request: Some((_, pending_response)), .. } = peer {
 				match pending_response.poll_unpin(cx) {
 					Poll::Ready(Ok(Ok(resp))) => {
@@ -1649,11 +1603,11 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 		}
 
 		for (id, request) in self.sync.block_requests() {
-			let event = prepare_block_request(&mut self.context_data.peers, id.clone(), request);
+			let event = prepare_block_request(&mut self.peers, id.clone(), request);
 			self.pending_messages.push_back(event);
 		}
 		for (id, request) in self.sync.justification_requests() {
-			let event = prepare_block_request(&mut self.context_data.peers, id, request);
+			let event = prepare_block_request(&mut self.peers, id, request);
 			self.pending_messages.push_back(event);
 		}
 		if let Poll::Ready(Some((tx_hash, result))) = self.pending_transactions.poll_next_unpin(cx) {
@@ -1816,15 +1770,15 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 				}
 			},
 			GenericProtoOut::LegacyMessage { peer_id, message } => {
-				if self.context_data.peers.contains_key(&peer_id) {
+				if self.peers.contains_key(&peer_id) {
 					self.on_custom_message(peer_id, message)
 				} else {
 					CustomMessageOutcome::None
 				}
 			},
 			GenericProtoOut::Notification { peer_id, set_id, message } =>
-				match usize::from(set_id) {
-					0 if self.context_data.peers.contains_key(&peer_id) => {
+				match set_id {
+					HARDCODED_PEERSETS_SYNC if self.peers.contains_key(&peer_id) => {
 						if let Ok(announce) = message::BlockAnnounce::decode(&mut message.as_ref()) {
 							self.push_block_announce_validation(peer_id, announce);
 
@@ -1840,7 +1794,7 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 							CustomMessageOutcome::None
 						}
 					}
-					1 if self.context_data.peers.contains_key(&peer_id) => {
+					HARDCODED_PEERSETS_TX if self.peers.contains_key(&peer_id) => {
 						if let Ok(m) = <message::Transactions<B::Extrinsic> as Decode>::decode(
 							&mut message.as_ref(),
 						) {
@@ -1850,7 +1804,7 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 						}
 						CustomMessageOutcome::None
 					}
-					0 | 1 => {
+					HARDCODED_PEERSETS_SYNC | HARDCODED_PEERSETS_TX => {
 						debug!(
 							target: "sync",
 							"Received sync or transaction for peer earlier refused by sync layer: {}",
@@ -1916,9 +1870,3 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 		self.behaviour.inject_listener_closed(id, reason);
 	}
 }
-
-impl<B: BlockT, H: ExHashT> Drop for Protocol<B, H> {
-	fn drop(&mut self) {
-		debug!(target: "sync", "Network stats:\n{}", self.format_stats());
-	}
-}
diff --git a/client/network/src/protocol/message.rs b/client/network/src/protocol/message.rs
index c0a92629d900..3aa1e2cf34a7 100644
--- a/client/network/src/protocol/message.rs
+++ b/client/network/src/protocol/message.rs
@@ -286,30 +286,6 @@ pub mod generic {
 		ConsensusBatch(Vec<ConsensusMessage>),
 	}
 
-	impl<Header, Hash, Number, Extrinsic> Message<Header, Hash, Number, Extrinsic> {
-		/// Message id useful for logging.
-		pub fn id(&self) -> &'static str {
-			match self {
-				Message::Status(_) => "Status",
-				Message::BlockRequest(_) => "BlockRequest",
-				Message::BlockResponse(_) => "BlockResponse",
-				Message::BlockAnnounce(_) => "BlockAnnounce",
-				Message::Transactions(_) => "Transactions",
-				Message::Consensus(_) => "Consensus",
-				Message::RemoteCallRequest(_) => "RemoteCallRequest",
-				Message::RemoteCallResponse(_) => "RemoteCallResponse",
-				Message::RemoteReadRequest(_) => "RemoteReadRequest",
-				Message::RemoteReadResponse(_) => "RemoteReadResponse",
-				Message::RemoteHeaderRequest(_) => "RemoteHeaderRequest",
-				Message::RemoteHeaderResponse(_) => "RemoteHeaderResponse",
-				Message::RemoteChangesRequest(_) => "RemoteChangesRequest",
-				Message::RemoteChangesResponse(_) => "RemoteChangesResponse",
-				Message::RemoteReadChildRequest(_) => "RemoteReadChildRequest",
-				Message::ConsensusBatch(_) => "ConsensusBatch",
-			}
-		}
-	}
-
 	/// Status sent on connection.
 	// TODO https://github.com/paritytech/substrate/issues/4674: replace the `Status`
 	// struct with this one, after waiting a few releases beyond `NetworkSpecialization`'s

From 05e589286ba2bab6991ab5f031c9d023812b3de7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Wed, 13 Jan 2021 13:31:14 +0100
Subject: [PATCH 0260/1194] contracts: Don't read the previous value when
 overwriting a storage item (#7879)

* Add `len` function that can return the length of a storage item efficiently

* Make use of the new len function in contracts

* Fix benchmarks

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_contracts --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/contracts/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Remove unused imports

Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
---
 frame/contracts/src/benchmarking/mod.rs |   13 +-
 frame/contracts/src/storage.rs          |   18 +-
 frame/contracts/src/weights.rs          | 1340 ++++++++++++-----------
 frame/support/src/storage/child.rs      |   18 +
 4 files changed, 697 insertions(+), 692 deletions(-)

diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index 4691a8298abe..b5c0a0da1385 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -109,21 +109,18 @@ where
 		endowment: Endow,
 	) -> Result<Contract<T>, &'static str>
 	{
-		use sp_runtime::traits::{CheckedDiv, SaturatedConversion};
 		let (storage_size, endowment) = match endowment {
 			Endow::CollectRent => {
 				// storage_size cannot be zero because otherwise a contract that is just above
 				// the subsistence threshold does not pay rent given a large enough subsistence
 				// threshold. But we need rent payments to occur in order to benchmark for worst cases.
-				let storage_size = ConfigCache::<T>::subsistence_threshold_uncached()
-					.checked_div(&T::DepositPerStorageByte::get())
-					.unwrap_or_else(Zero::zero);
+				let storage_size = u32::max_value() / 10;
 
 				// Endowment should be large but not as large to inhibit rent payments.
+				// Balance will only cover half the storage
 				let endowment = T::DepositPerStorageByte::get()
-					.saturating_mul(storage_size)
-					.saturating_add(T::DepositPerContract::get())
-					.saturating_sub(1u32.into());
+					.saturating_mul(<BalanceOf<T>>::from(storage_size) / 2u32.into())
+					.saturating_add(T::DepositPerContract::get());
 
 				(storage_size, endowment)
 			},
@@ -159,7 +156,7 @@ where
 		};
 
 		let mut contract = result.alive_info()?;
-		contract.storage_size = storage_size.saturated_into::<u32>();
+		contract.storage_size = storage_size;
 		ContractInfoOf::<T>::insert(&result.account_id, ContractInfo::Alive(contract));
 
 		Ok(result)
diff --git a/frame/contracts/src/storage.rs b/frame/contracts/src/storage.rs
index 11a4bd7708cd..b4f3071c1e83 100644
--- a/frame/contracts/src/storage.rs
+++ b/frame/contracts/src/storage.rs
@@ -89,19 +89,10 @@ where
 		let hashed_key = blake2_256(key);
 		let child_trie_info = &crate::child_trie_info(&trie_id);
 
-		// In order to correctly update the book keeping we need to fetch the previous
-		// value of the key-value pair.
-		//
-		// It might be a bit more clean if we had an API that supported getting the size
-		// of the value without going through the loading of it. But at the moment of
-		// writing, there is no such API.
-		//
-		// That's not a show stopper in any case, since the performance cost is
-		// dominated by the trie traversal anyway.
-		let opt_prev_value = child::get_raw(&child_trie_info, &hashed_key);
+		let opt_prev_len = child::len(&child_trie_info, &hashed_key);
 
 		// Update the total number of KV pairs and the number of empty pairs.
-		match (&opt_prev_value, &opt_new_value) {
+		match (&opt_prev_len, &opt_new_value) {
 			(Some(_), None) => {
 				new_info.pair_count -= 1;
 			},
@@ -113,10 +104,7 @@ where
 		}
 
 		// Update the total storage size.
-		let prev_value_len = opt_prev_value
-			.as_ref()
-			.map(|old_value| old_value.len() as u32)
-			.unwrap_or(0);
+		let prev_value_len = opt_prev_len.unwrap_or(0);
 		let new_value_len = opt_new_value
 			.as_ref()
 			.map(|new_value| new_value.len() as u32)
diff --git a/frame/contracts/src/weights.rs b/frame/contracts/src/weights.rs
index 8b1b77327665..60d229101816 100644
--- a/frame/contracts/src/weights.rs
+++ b/frame/contracts/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_contracts
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-12-12, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.1
+//! DATE: 2021-01-12, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -150,1181 +150,1183 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn on_initialize() -> Weight {
-		(7_239_000 as Weight)
+		(3_659_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 	}
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
-		(40_584_000 as Weight)
+		(40_731_000 as Weight)
 			// Standard Error: 4_000
-			.saturating_add((2_314_000 as Weight).saturating_mul(k as Weight))
+			.saturating_add((2_317_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 175_000
-			.saturating_add((135_919_000 as Weight).saturating_mul(q as Weight))
+		(384_459_000 as Weight)
+			// Standard Error: 45_000
+			.saturating_add((146_401_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn update_schedule() -> Weight {
-		(36_262_000 as Weight)
+		(27_803_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn put_code(n: u32, ) -> Weight {
-		(22_510_000 as Weight)
-			// Standard Error: 209_000
-			.saturating_add((113_251_000 as Weight).saturating_mul(n as Weight))
+		(0 as Weight)
+			// Standard Error: 208_000
+			.saturating_add((110_774_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn instantiate(n: u32, s: u32, ) -> Weight {
-		(216_181_000 as Weight)
+		(175_290_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((6_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((3_000 as Weight).saturating_mul(n as Weight))
 			// Standard Error: 1_000
-			.saturating_add((2_240_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((2_244_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn call() -> Weight {
-		(209_785_000 as Weight)
+		(161_225_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn claim_surcharge() -> Weight {
-		(302_124_000 as Weight)
+		(283_759_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn seal_caller(r: u32, ) -> Weight {
-		(138_697_000 as Weight)
-			// Standard Error: 412_000
-			.saturating_add((390_370_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(118_373_000 as Weight)
+			// Standard Error: 337_000
+			.saturating_add((250_358_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_address(r: u32, ) -> Weight {
-		(141_999_000 as Weight)
-			// Standard Error: 218_000
-			.saturating_add((389_261_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(125_126_000 as Weight)
+			// Standard Error: 127_000
+			.saturating_add((248_900_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(134_956_000 as Weight)
-			// Standard Error: 205_000
-			.saturating_add((384_439_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(127_087_000 as Weight)
+			// Standard Error: 145_000
+			.saturating_add((243_311_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_balance(r: u32, ) -> Weight {
-		(130_585_000 as Weight)
-			// Standard Error: 784_000
-			.saturating_add((860_797_000 as Weight).saturating_mul(r as Weight))
+		(123_879_000 as Weight)
+			// Standard Error: 227_000
+			.saturating_add((521_306_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(138_382_000 as Weight)
-			// Standard Error: 163_000
-			.saturating_add((384_676_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(121_348_000 as Weight)
+			// Standard Error: 125_000
+			.saturating_add((244_379_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(137_766_000 as Weight)
-			// Standard Error: 218_000
-			.saturating_add((386_002_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(120_680_000 as Weight)
+			// Standard Error: 107_000
+			.saturating_add((244_096_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(144_552_000 as Weight)
-			// Standard Error: 187_000
-			.saturating_add((384_754_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(117_310_000 as Weight)
+			// Standard Error: 130_000
+			.saturating_add((245_096_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(150_812_000 as Weight)
-			// Standard Error: 276_000
-			.saturating_add((903_965_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(131_643_000 as Weight)
+			// Standard Error: 171_000
+			.saturating_add((554_208_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_block_number(r: u32, ) -> Weight {
-		(145_168_000 as Weight)
-			// Standard Error: 191_000
-			.saturating_add((382_798_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(117_553_000 as Weight)
+			// Standard Error: 128_000
+			.saturating_add((244_494_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_now(r: u32, ) -> Weight {
-		(145_806_000 as Weight)
-			// Standard Error: 195_000
-			.saturating_add((382_888_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(123_184_000 as Weight)
+			// Standard Error: 116_000
+			.saturating_add((244_414_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(154_081_000 as Weight)
-			// Standard Error: 248_000
-			.saturating_add((716_294_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(132_846_000 as Weight)
+			// Standard Error: 189_000
+			.saturating_add((482_450_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 	}
 	fn seal_gas(r: u32, ) -> Weight {
-		(149_684_000 as Weight)
-			// Standard Error: 460_000
-			.saturating_add((196_251_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(113_681_000 as Weight)
+			// Standard Error: 116_000
+			.saturating_add((120_711_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_input(r: u32, ) -> Weight {
-		(135_447_000 as Weight)
-			// Standard Error: 75_000
-			.saturating_add((8_362_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(118_826_000 as Weight)
+			// Standard Error: 89_000
+			.saturating_add((6_650_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(146_099_000 as Weight)
+		(132_497_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((270_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add((278_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_return(r: u32, ) -> Weight {
-		(125_358_000 as Weight)
-			// Standard Error: 52_000
-			.saturating_add((5_454_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(112_447_000 as Weight)
+			// Standard Error: 73_000
+			.saturating_add((4_398_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(135_523_000 as Weight)
+		(120_288_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((785_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add((787_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_terminate(r: u32, ) -> Weight {
-		(135_321_000 as Weight)
-			// Standard Error: 100_000
-			.saturating_add((110_300_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(r as Weight)))
+		(118_973_000 as Weight)
+			// Standard Error: 124_000
+			.saturating_add((75_967_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_restore_to(r: u32, ) -> Weight {
-		(242_790_000 as Weight)
-			// Standard Error: 823_000
-			.saturating_add((135_544_000 as Weight).saturating_mul(r as Weight))
+		(207_295_000 as Weight)
+			// Standard Error: 385_000
+			.saturating_add((103_584_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_restore_to_per_delta(d: u32, ) -> Weight {
-		(34_052_000 as Weight)
-			// Standard Error: 2_395_000
-			.saturating_add((3_970_866_000 as Weight).saturating_mul(d as Weight))
+		(0 as Weight)
+			// Standard Error: 2_349_000
+			.saturating_add((3_693_440_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
 	}
 	fn seal_random(r: u32, ) -> Weight {
-		(154_549_000 as Weight)
-			// Standard Error: 692_000
-			.saturating_add((989_540_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(166_160_000 as Weight)
+			// Standard Error: 237_000
+			.saturating_add((594_474_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 	}
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(125_367_000 as Weight)
-			// Standard Error: 977_000
-			.saturating_add((1_424_216_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(145_170_000 as Weight)
+			// Standard Error: 397_000
+			.saturating_add((859_096_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_843_333_000 as Weight)
-			// Standard Error: 3_040_000
-			.saturating_add((771_663_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 599_000
-			.saturating_add((251_555_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(1_128_905_000 as Weight)
+			// Standard Error: 4_299_000
+			.saturating_add((559_485_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 847_000
+			.saturating_add((253_404_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(136_437_000 as Weight)
-			// Standard Error: 299_000
-			.saturating_add((1_072_778_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(127_849_000 as Weight)
+			// Standard Error: 220_000
+			.saturating_add((628_543_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(182_452_000 as Weight)
-			// Standard Error: 26_839_000
-			.saturating_add((15_911_876_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(0 as Weight)
+			// Standard Error: 45_695_000
+			.saturating_add((17_015_513_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(2_385_415_000 as Weight)
-			// Standard Error: 751_000
-			.saturating_add((223_264_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(1_632_351_000 as Weight)
+			// Standard Error: 399_000
+			.saturating_add((73_694_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn seal_clear_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_154_000
-			.saturating_add((5_341_117_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			// Standard Error: 2_632_000
+			.saturating_add((2_148_012_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_get_storage(r: u32, ) -> Weight {
-		(62_353_000 as Weight)
-			// Standard Error: 1_183_000
-			.saturating_add((1_141_653_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(48_127_000 as Weight)
+			// Standard Error: 1_123_000
+			.saturating_add((906_947_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(905_905_000 as Weight)
-			// Standard Error: 363_000
-			.saturating_add((155_161_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(676_986_000 as Weight)
+			// Standard Error: 307_000
+			.saturating_add((153_667_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 	}
 	fn seal_transfer(r: u32, ) -> Weight {
-		(60_519_000 as Weight)
-			// Standard Error: 1_942_000
-			.saturating_add((6_453_551_000 as Weight).saturating_mul(r as Weight))
+		(36_730_000 as Weight)
+			// Standard Error: 1_966_000
+			.saturating_add((3_972_101_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_call(r: u32, ) -> Weight {
-		(192_122_000 as Weight)
-			// Standard Error: 7_851_000
-			.saturating_add((10_736_771_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
-			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
+		(0 as Weight)
+			// Standard Error: 10_776_000
+			.saturating_add((9_860_978_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(6 as Weight))
+			.saturating_add(T::DbWeight::get().reads((200 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight {
-		(10_599_501_000 as Weight)
-			// Standard Error: 133_182_000
-			.saturating_add((5_423_848_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 47_000
-			.saturating_add((60_108_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 50_000
-			.saturating_add((82_691_000 as Weight).saturating_mul(o as Weight))
-			.saturating_add(T::DbWeight::get().reads(105 as Weight))
-			.saturating_add(T::DbWeight::get().reads((101 as Weight).saturating_mul(t as Weight)))
+		(9_838_971_000 as Weight)
+			// Standard Error: 112_906_000
+			.saturating_add((3_413_715_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 40_000
+			.saturating_add((60_054_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 43_000
+			.saturating_add((82_629_000 as Weight).saturating_mul(o as Weight))
+			.saturating_add(T::DbWeight::get().reads(206 as Weight))
 			.saturating_add(T::DbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 39_807_000
-			.saturating_add((22_562_812_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 36_803_000
+			.saturating_add((18_211_156_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes((200 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_instantiate_per_input_output_salt_kb(i: u32, o: u32, s: u32, ) -> Weight {
-		(19_823_256_000 as Weight)
-			// Standard Error: 153_000
-			.saturating_add((60_707_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 153_000
-			.saturating_add((83_770_000 as Weight).saturating_mul(o as Weight))
-			// Standard Error: 153_000
-			.saturating_add((284_423_000 as Weight).saturating_mul(s as Weight))
+		(15_975_563_000 as Weight)
+			// Standard Error: 167_000
+			.saturating_add((60_759_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 167_000
+			.saturating_add((83_681_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 167_000
+			.saturating_add((284_260_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(207 as Weight))
 			.saturating_add(T::DbWeight::get().writes(202 as Weight))
 	}
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(142_838_000 as Weight)
-			// Standard Error: 243_000
-			.saturating_add((332_354_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(120_795_000 as Weight)
+			// Standard Error: 115_000
+			.saturating_add((226_658_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(877_119_000 as Weight)
-			// Standard Error: 73_000
-			.saturating_add((434_752_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(731_640_000 as Weight)
+			// Standard Error: 56_000
+			.saturating_add((430_102_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(139_913_000 as Weight)
-			// Standard Error: 160_000
-			.saturating_add((345_830_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(121_490_000 as Weight)
+			// Standard Error: 144_000
+			.saturating_add((242_726_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(723_122_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((343_949_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(624_029_000 as Weight)
+			// Standard Error: 36_000
+			.saturating_add((344_476_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(137_249_000 as Weight)
-			// Standard Error: 168_000
-			.saturating_add((320_295_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(120_959_000 as Weight)
+			// Standard Error: 103_000
+			.saturating_add((215_519_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(736_756_000 as Weight)
-			// Standard Error: 39_000
-			.saturating_add((159_952_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(713_448_000 as Weight)
+			// Standard Error: 47_000
+			.saturating_add((160_493_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(124_530_000 as Weight)
-			// Standard Error: 203_000
-			.saturating_add((321_292_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(122_428_000 as Weight)
+			// Standard Error: 111_000
+			.saturating_add((213_863_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(782_032_000 as Weight)
-			// Standard Error: 36_000
-			.saturating_add((159_878_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(757_838_000 as Weight)
+			// Standard Error: 47_000
+			.saturating_add((160_245_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(24_624_000 as Weight)
+		(24_075_000 as Weight)
 			// Standard Error: 18_000
-			.saturating_add((3_280_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((3_122_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(27_171_000 as Weight)
-			// Standard Error: 62_000
-			.saturating_add((161_737_000 as Weight).saturating_mul(r as Weight))
+		(26_406_000 as Weight)
+			// Standard Error: 31_000
+			.saturating_add((159_539_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(27_106_000 as Weight)
-			// Standard Error: 94_000
-			.saturating_add((229_960_000 as Weight).saturating_mul(r as Weight))
+		(26_266_000 as Weight)
+			// Standard Error: 3_229_000
+			.saturating_add((238_726_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(24_566_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((12_157_000 as Weight).saturating_mul(r as Weight))
+		(27_469_000 as Weight)
+			// Standard Error: 592_000
+			.saturating_add((10_423_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(24_531_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((12_007_000 as Weight).saturating_mul(r as Weight))
+		(24_627_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((11_999_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(24_567_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((6_132_000 as Weight).saturating_mul(r as Weight))
+		(24_008_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((6_614_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(24_628_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((13_480_000 as Weight).saturating_mul(r as Weight))
+		(24_040_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((14_190_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(24_653_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((15_005_000 as Weight).saturating_mul(r as Weight))
+		(23_997_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((15_529_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(38_573_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((118_000 as Weight).saturating_mul(e as Weight))
+		(36_890_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((112_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(24_952_000 as Weight)
-			// Standard Error: 61_000
-			.saturating_add((99_409_000 as Weight).saturating_mul(r as Weight))
+		(24_266_000 as Weight)
+			// Standard Error: 198_000
+			.saturating_add((99_702_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(32_478_000 as Weight)
-			// Standard Error: 242_000
-			.saturating_add((193_797_000 as Weight).saturating_mul(r as Weight))
+		(31_901_000 as Weight)
+			// Standard Error: 322_000
+			.saturating_add((197_671_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(238_200_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((3_467_000 as Weight).saturating_mul(p as Weight))
+		(239_803_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((3_474_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(41_994_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((3_230_000 as Weight).saturating_mul(r as Weight))
+		(41_697_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((3_225_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(41_994_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((3_558_000 as Weight).saturating_mul(r as Weight))
+		(41_698_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((3_458_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(41_965_000 as Weight)
-			// Standard Error: 33_000
-			.saturating_add((4_806_000 as Weight).saturating_mul(r as Weight))
+		(41_715_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((4_684_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(27_997_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((7_859_000 as Weight).saturating_mul(r as Weight))
+		(27_751_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((7_980_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(28_118_000 as Weight)
-			// Standard Error: 33_000
-			.saturating_add((11_825_000 as Weight).saturating_mul(r as Weight))
+		(27_632_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((12_050_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(27_172_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((3_466_000 as Weight).saturating_mul(r as Weight))
+		(26_302_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((3_480_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(25_582_000 as Weight)
-			// Standard Error: 4_756_000
-			.saturating_add((2_290_170_000 as Weight).saturating_mul(r as Weight))
+		(24_695_000 as Weight)
+			// Standard Error: 3_876_000
+			.saturating_add((2_324_806_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(24_712_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((5_226_000 as Weight).saturating_mul(r as Weight))
+		(24_043_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((5_187_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(24_631_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((5_282_000 as Weight).saturating_mul(r as Weight))
+		(24_040_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((5_077_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(24_640_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((5_964_000 as Weight).saturating_mul(r as Weight))
+		(23_995_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((5_801_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(24_631_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((5_128_000 as Weight).saturating_mul(r as Weight))
+		(24_010_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((5_221_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(24_540_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((5_224_000 as Weight).saturating_mul(r as Weight))
+		(24_073_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((5_205_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(24_623_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((5_138_000 as Weight).saturating_mul(r as Weight))
+		(23_993_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((5_079_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(24_623_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((5_242_000 as Weight).saturating_mul(r as Weight))
+		(24_008_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((5_077_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(24_575_000 as Weight)
-			// Standard Error: 9_000
-			.saturating_add((7_328_000 as Weight).saturating_mul(r as Weight))
+		(23_991_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((7_248_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(24_674_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((7_147_000 as Weight).saturating_mul(r as Weight))
+		(23_983_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((7_303_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(24_645_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((7_158_000 as Weight).saturating_mul(r as Weight))
+		(23_991_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((7_106_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(24_688_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((7_226_000 as Weight).saturating_mul(r as Weight))
+		(24_062_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((7_168_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(24_579_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((7_187_000 as Weight).saturating_mul(r as Weight))
+		(24_028_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((7_130_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(24_578_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((7_235_000 as Weight).saturating_mul(r as Weight))
+		(23_998_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_279_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(24_625_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((7_089_000 as Weight).saturating_mul(r as Weight))
+		(24_010_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((7_114_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(24_589_000 as Weight)
-			// Standard Error: 9_000
-			.saturating_add((7_078_000 as Weight).saturating_mul(r as Weight))
+		(24_003_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((7_052_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(24_572_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((7_286_000 as Weight).saturating_mul(r as Weight))
+		(23_948_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((7_236_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(24_566_000 as Weight)
+		(24_042_000 as Weight)
 			// Standard Error: 19_000
-			.saturating_add((7_247_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((7_223_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(24_581_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((7_190_000 as Weight).saturating_mul(r as Weight))
+		(23_965_000 as Weight)
+			// Standard Error: 37_000
+			.saturating_add((7_261_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(24_565_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((7_242_000 as Weight).saturating_mul(r as Weight))
+		(24_023_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((7_170_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(24_542_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((7_216_000 as Weight).saturating_mul(r as Weight))
+		(24_057_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((7_050_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(24_608_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((12_966_000 as Weight).saturating_mul(r as Weight))
+		(24_038_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((12_934_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(24_564_000 as Weight)
-			// Standard Error: 1_424_000
-			.saturating_add((13_665_000 as Weight).saturating_mul(r as Weight))
+		(23_992_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((12_055_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(24_611_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((12_932_000 as Weight).saturating_mul(r as Weight))
+		(24_082_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((12_898_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(24_590_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((12_207_000 as Weight).saturating_mul(r as Weight))
+		(24_025_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((12_178_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(24_622_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((7_172_000 as Weight).saturating_mul(r as Weight))
+		(23_984_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_214_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(24_585_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((7_202_000 as Weight).saturating_mul(r as Weight))
+		(24_012_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((7_183_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(24_600_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((7_182_000 as Weight).saturating_mul(r as Weight))
+		(24_001_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_122_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(24_621_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((7_226_000 as Weight).saturating_mul(r as Weight))
+		(23_973_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((7_251_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(24_643_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((7_254_000 as Weight).saturating_mul(r as Weight))
+		(23_969_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((7_289_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(24_586_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((7_246_000 as Weight).saturating_mul(r as Weight))
+		(24_008_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((7_292_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(24_631_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((7_306_000 as Weight).saturating_mul(r as Weight))
+		(24_010_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((7_305_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(24_643_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((7_183_000 as Weight).saturating_mul(r as Weight))
+		(24_001_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((7_299_000 as Weight).saturating_mul(r as Weight))
 	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn on_initialize() -> Weight {
-		(7_239_000 as Weight)
+		(3_659_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 	}
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
-		(40_584_000 as Weight)
+		(40_731_000 as Weight)
 			// Standard Error: 4_000
-			.saturating_add((2_314_000 as Weight).saturating_mul(k as Weight))
+			.saturating_add((2_317_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 175_000
-			.saturating_add((135_919_000 as Weight).saturating_mul(q as Weight))
+		(384_459_000 as Weight)
+			// Standard Error: 45_000
+			.saturating_add((146_401_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn update_schedule() -> Weight {
-		(36_262_000 as Weight)
+		(27_803_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn put_code(n: u32, ) -> Weight {
-		(22_510_000 as Weight)
-			// Standard Error: 209_000
-			.saturating_add((113_251_000 as Weight).saturating_mul(n as Weight))
+		(0 as Weight)
+			// Standard Error: 208_000
+			.saturating_add((110_774_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn instantiate(n: u32, s: u32, ) -> Weight {
-		(216_181_000 as Weight)
+		(175_290_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((6_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((3_000 as Weight).saturating_mul(n as Weight))
 			// Standard Error: 1_000
-			.saturating_add((2_240_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((2_244_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn call() -> Weight {
-		(209_785_000 as Weight)
+		(161_225_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn claim_surcharge() -> Weight {
-		(302_124_000 as Weight)
+		(283_759_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn seal_caller(r: u32, ) -> Weight {
-		(138_697_000 as Weight)
-			// Standard Error: 412_000
-			.saturating_add((390_370_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(118_373_000 as Weight)
+			// Standard Error: 337_000
+			.saturating_add((250_358_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_address(r: u32, ) -> Weight {
-		(141_999_000 as Weight)
-			// Standard Error: 218_000
-			.saturating_add((389_261_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(125_126_000 as Weight)
+			// Standard Error: 127_000
+			.saturating_add((248_900_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(134_956_000 as Weight)
-			// Standard Error: 205_000
-			.saturating_add((384_439_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(127_087_000 as Weight)
+			// Standard Error: 145_000
+			.saturating_add((243_311_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_balance(r: u32, ) -> Weight {
-		(130_585_000 as Weight)
-			// Standard Error: 784_000
-			.saturating_add((860_797_000 as Weight).saturating_mul(r as Weight))
+		(123_879_000 as Weight)
+			// Standard Error: 227_000
+			.saturating_add((521_306_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(138_382_000 as Weight)
-			// Standard Error: 163_000
-			.saturating_add((384_676_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(121_348_000 as Weight)
+			// Standard Error: 125_000
+			.saturating_add((244_379_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(137_766_000 as Weight)
-			// Standard Error: 218_000
-			.saturating_add((386_002_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(120_680_000 as Weight)
+			// Standard Error: 107_000
+			.saturating_add((244_096_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(144_552_000 as Weight)
-			// Standard Error: 187_000
-			.saturating_add((384_754_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(117_310_000 as Weight)
+			// Standard Error: 130_000
+			.saturating_add((245_096_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(150_812_000 as Weight)
-			// Standard Error: 276_000
-			.saturating_add((903_965_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(131_643_000 as Weight)
+			// Standard Error: 171_000
+			.saturating_add((554_208_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_block_number(r: u32, ) -> Weight {
-		(145_168_000 as Weight)
-			// Standard Error: 191_000
-			.saturating_add((382_798_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(117_553_000 as Weight)
+			// Standard Error: 128_000
+			.saturating_add((244_494_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_now(r: u32, ) -> Weight {
-		(145_806_000 as Weight)
-			// Standard Error: 195_000
-			.saturating_add((382_888_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(123_184_000 as Weight)
+			// Standard Error: 116_000
+			.saturating_add((244_414_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(154_081_000 as Weight)
-			// Standard Error: 248_000
-			.saturating_add((716_294_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(132_846_000 as Weight)
+			// Standard Error: 189_000
+			.saturating_add((482_450_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 	}
 	fn seal_gas(r: u32, ) -> Weight {
-		(149_684_000 as Weight)
-			// Standard Error: 460_000
-			.saturating_add((196_251_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(113_681_000 as Weight)
+			// Standard Error: 116_000
+			.saturating_add((120_711_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_input(r: u32, ) -> Weight {
-		(135_447_000 as Weight)
-			// Standard Error: 75_000
-			.saturating_add((8_362_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(118_826_000 as Weight)
+			// Standard Error: 89_000
+			.saturating_add((6_650_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(146_099_000 as Weight)
+		(132_497_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((270_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add((278_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_return(r: u32, ) -> Weight {
-		(125_358_000 as Weight)
-			// Standard Error: 52_000
-			.saturating_add((5_454_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(112_447_000 as Weight)
+			// Standard Error: 73_000
+			.saturating_add((4_398_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(135_523_000 as Weight)
+		(120_288_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((785_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add((787_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_terminate(r: u32, ) -> Weight {
-		(135_321_000 as Weight)
-			// Standard Error: 100_000
-			.saturating_add((110_300_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(r as Weight)))
+		(118_973_000 as Weight)
+			// Standard Error: 124_000
+			.saturating_add((75_967_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_restore_to(r: u32, ) -> Weight {
-		(242_790_000 as Weight)
-			// Standard Error: 823_000
-			.saturating_add((135_544_000 as Weight).saturating_mul(r as Weight))
+		(207_295_000 as Weight)
+			// Standard Error: 385_000
+			.saturating_add((103_584_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_restore_to_per_delta(d: u32, ) -> Weight {
-		(34_052_000 as Weight)
-			// Standard Error: 2_395_000
-			.saturating_add((3_970_866_000 as Weight).saturating_mul(d as Weight))
+		(0 as Weight)
+			// Standard Error: 2_349_000
+			.saturating_add((3_693_440_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
 	}
 	fn seal_random(r: u32, ) -> Weight {
-		(154_549_000 as Weight)
-			// Standard Error: 692_000
-			.saturating_add((989_540_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(166_160_000 as Weight)
+			// Standard Error: 237_000
+			.saturating_add((594_474_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 	}
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(125_367_000 as Weight)
-			// Standard Error: 977_000
-			.saturating_add((1_424_216_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(145_170_000 as Weight)
+			// Standard Error: 397_000
+			.saturating_add((859_096_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_843_333_000 as Weight)
-			// Standard Error: 3_040_000
-			.saturating_add((771_663_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 599_000
-			.saturating_add((251_555_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(1_128_905_000 as Weight)
+			// Standard Error: 4_299_000
+			.saturating_add((559_485_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 847_000
+			.saturating_add((253_404_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(136_437_000 as Weight)
-			// Standard Error: 299_000
-			.saturating_add((1_072_778_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(127_849_000 as Weight)
+			// Standard Error: 220_000
+			.saturating_add((628_543_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(182_452_000 as Weight)
-			// Standard Error: 26_839_000
-			.saturating_add((15_911_876_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(0 as Weight)
+			// Standard Error: 45_695_000
+			.saturating_add((17_015_513_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(2_385_415_000 as Weight)
-			// Standard Error: 751_000
-			.saturating_add((223_264_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(1_632_351_000 as Weight)
+			// Standard Error: 399_000
+			.saturating_add((73_694_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn seal_clear_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_154_000
-			.saturating_add((5_341_117_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			// Standard Error: 2_632_000
+			.saturating_add((2_148_012_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_get_storage(r: u32, ) -> Weight {
-		(62_353_000 as Weight)
-			// Standard Error: 1_183_000
-			.saturating_add((1_141_653_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(48_127_000 as Weight)
+			// Standard Error: 1_123_000
+			.saturating_add((906_947_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(905_905_000 as Weight)
-			// Standard Error: 363_000
-			.saturating_add((155_161_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(676_986_000 as Weight)
+			// Standard Error: 307_000
+			.saturating_add((153_667_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 	}
 	fn seal_transfer(r: u32, ) -> Weight {
-		(60_519_000 as Weight)
-			// Standard Error: 1_942_000
-			.saturating_add((6_453_551_000 as Weight).saturating_mul(r as Weight))
+		(36_730_000 as Weight)
+			// Standard Error: 1_966_000
+			.saturating_add((3_972_101_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_call(r: u32, ) -> Weight {
-		(192_122_000 as Weight)
-			// Standard Error: 7_851_000
-			.saturating_add((10_736_771_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
-			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
+		(0 as Weight)
+			// Standard Error: 10_776_000
+			.saturating_add((9_860_978_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((200 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight {
-		(10_599_501_000 as Weight)
-			// Standard Error: 133_182_000
-			.saturating_add((5_423_848_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 47_000
-			.saturating_add((60_108_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 50_000
-			.saturating_add((82_691_000 as Weight).saturating_mul(o as Weight))
-			.saturating_add(RocksDbWeight::get().reads(105 as Weight))
-			.saturating_add(RocksDbWeight::get().reads((101 as Weight).saturating_mul(t as Weight)))
+		(9_838_971_000 as Weight)
+			// Standard Error: 112_906_000
+			.saturating_add((3_413_715_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 40_000
+			.saturating_add((60_054_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 43_000
+			.saturating_add((82_629_000 as Weight).saturating_mul(o as Weight))
+			.saturating_add(RocksDbWeight::get().reads(206 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 39_807_000
-			.saturating_add((22_562_812_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 36_803_000
+			.saturating_add((18_211_156_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((200 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_instantiate_per_input_output_salt_kb(i: u32, o: u32, s: u32, ) -> Weight {
-		(19_823_256_000 as Weight)
-			// Standard Error: 153_000
-			.saturating_add((60_707_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 153_000
-			.saturating_add((83_770_000 as Weight).saturating_mul(o as Weight))
-			// Standard Error: 153_000
-			.saturating_add((284_423_000 as Weight).saturating_mul(s as Weight))
+		(15_975_563_000 as Weight)
+			// Standard Error: 167_000
+			.saturating_add((60_759_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 167_000
+			.saturating_add((83_681_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 167_000
+			.saturating_add((284_260_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(207 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(202 as Weight))
 	}
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(142_838_000 as Weight)
-			// Standard Error: 243_000
-			.saturating_add((332_354_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(120_795_000 as Weight)
+			// Standard Error: 115_000
+			.saturating_add((226_658_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(877_119_000 as Weight)
-			// Standard Error: 73_000
-			.saturating_add((434_752_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(731_640_000 as Weight)
+			// Standard Error: 56_000
+			.saturating_add((430_102_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(139_913_000 as Weight)
-			// Standard Error: 160_000
-			.saturating_add((345_830_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(121_490_000 as Weight)
+			// Standard Error: 144_000
+			.saturating_add((242_726_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(723_122_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((343_949_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(624_029_000 as Weight)
+			// Standard Error: 36_000
+			.saturating_add((344_476_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(137_249_000 as Weight)
-			// Standard Error: 168_000
-			.saturating_add((320_295_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(120_959_000 as Weight)
+			// Standard Error: 103_000
+			.saturating_add((215_519_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(736_756_000 as Weight)
-			// Standard Error: 39_000
-			.saturating_add((159_952_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(713_448_000 as Weight)
+			// Standard Error: 47_000
+			.saturating_add((160_493_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(124_530_000 as Weight)
-			// Standard Error: 203_000
-			.saturating_add((321_292_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(122_428_000 as Weight)
+			// Standard Error: 111_000
+			.saturating_add((213_863_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(782_032_000 as Weight)
-			// Standard Error: 36_000
-			.saturating_add((159_878_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(757_838_000 as Weight)
+			// Standard Error: 47_000
+			.saturating_add((160_245_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(24_624_000 as Weight)
+		(24_075_000 as Weight)
 			// Standard Error: 18_000
-			.saturating_add((3_280_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((3_122_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(27_171_000 as Weight)
-			// Standard Error: 62_000
-			.saturating_add((161_737_000 as Weight).saturating_mul(r as Weight))
+		(26_406_000 as Weight)
+			// Standard Error: 31_000
+			.saturating_add((159_539_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(27_106_000 as Weight)
-			// Standard Error: 94_000
-			.saturating_add((229_960_000 as Weight).saturating_mul(r as Weight))
+		(26_266_000 as Weight)
+			// Standard Error: 3_229_000
+			.saturating_add((238_726_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(24_566_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((12_157_000 as Weight).saturating_mul(r as Weight))
+		(27_469_000 as Weight)
+			// Standard Error: 592_000
+			.saturating_add((10_423_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(24_531_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((12_007_000 as Weight).saturating_mul(r as Weight))
+		(24_627_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((11_999_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(24_567_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((6_132_000 as Weight).saturating_mul(r as Weight))
+		(24_008_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((6_614_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(24_628_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((13_480_000 as Weight).saturating_mul(r as Weight))
+		(24_040_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((14_190_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(24_653_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((15_005_000 as Weight).saturating_mul(r as Weight))
+		(23_997_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((15_529_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(38_573_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((118_000 as Weight).saturating_mul(e as Weight))
+		(36_890_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((112_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(24_952_000 as Weight)
-			// Standard Error: 61_000
-			.saturating_add((99_409_000 as Weight).saturating_mul(r as Weight))
+		(24_266_000 as Weight)
+			// Standard Error: 198_000
+			.saturating_add((99_702_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(32_478_000 as Weight)
-			// Standard Error: 242_000
-			.saturating_add((193_797_000 as Weight).saturating_mul(r as Weight))
+		(31_901_000 as Weight)
+			// Standard Error: 322_000
+			.saturating_add((197_671_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(238_200_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((3_467_000 as Weight).saturating_mul(p as Weight))
+		(239_803_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((3_474_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(41_994_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((3_230_000 as Weight).saturating_mul(r as Weight))
+		(41_697_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((3_225_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(41_994_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((3_558_000 as Weight).saturating_mul(r as Weight))
+		(41_698_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((3_458_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(41_965_000 as Weight)
-			// Standard Error: 33_000
-			.saturating_add((4_806_000 as Weight).saturating_mul(r as Weight))
+		(41_715_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((4_684_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(27_997_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((7_859_000 as Weight).saturating_mul(r as Weight))
+		(27_751_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((7_980_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(28_118_000 as Weight)
-			// Standard Error: 33_000
-			.saturating_add((11_825_000 as Weight).saturating_mul(r as Weight))
+		(27_632_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((12_050_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(27_172_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((3_466_000 as Weight).saturating_mul(r as Weight))
+		(26_302_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((3_480_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(25_582_000 as Weight)
-			// Standard Error: 4_756_000
-			.saturating_add((2_290_170_000 as Weight).saturating_mul(r as Weight))
+		(24_695_000 as Weight)
+			// Standard Error: 3_876_000
+			.saturating_add((2_324_806_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(24_712_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((5_226_000 as Weight).saturating_mul(r as Weight))
+		(24_043_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((5_187_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(24_631_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((5_282_000 as Weight).saturating_mul(r as Weight))
+		(24_040_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((5_077_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(24_640_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((5_964_000 as Weight).saturating_mul(r as Weight))
+		(23_995_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((5_801_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(24_631_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((5_128_000 as Weight).saturating_mul(r as Weight))
+		(24_010_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((5_221_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(24_540_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((5_224_000 as Weight).saturating_mul(r as Weight))
+		(24_073_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((5_205_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(24_623_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((5_138_000 as Weight).saturating_mul(r as Weight))
+		(23_993_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((5_079_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(24_623_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((5_242_000 as Weight).saturating_mul(r as Weight))
+		(24_008_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((5_077_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(24_575_000 as Weight)
-			// Standard Error: 9_000
-			.saturating_add((7_328_000 as Weight).saturating_mul(r as Weight))
+		(23_991_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((7_248_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(24_674_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((7_147_000 as Weight).saturating_mul(r as Weight))
+		(23_983_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((7_303_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(24_645_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((7_158_000 as Weight).saturating_mul(r as Weight))
+		(23_991_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((7_106_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(24_688_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((7_226_000 as Weight).saturating_mul(r as Weight))
+		(24_062_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((7_168_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(24_579_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((7_187_000 as Weight).saturating_mul(r as Weight))
+		(24_028_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((7_130_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(24_578_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((7_235_000 as Weight).saturating_mul(r as Weight))
+		(23_998_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_279_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(24_625_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((7_089_000 as Weight).saturating_mul(r as Weight))
+		(24_010_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((7_114_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(24_589_000 as Weight)
-			// Standard Error: 9_000
-			.saturating_add((7_078_000 as Weight).saturating_mul(r as Weight))
+		(24_003_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((7_052_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(24_572_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((7_286_000 as Weight).saturating_mul(r as Weight))
+		(23_948_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((7_236_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(24_566_000 as Weight)
+		(24_042_000 as Weight)
 			// Standard Error: 19_000
-			.saturating_add((7_247_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((7_223_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(24_581_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((7_190_000 as Weight).saturating_mul(r as Weight))
+		(23_965_000 as Weight)
+			// Standard Error: 37_000
+			.saturating_add((7_261_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(24_565_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((7_242_000 as Weight).saturating_mul(r as Weight))
+		(24_023_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((7_170_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(24_542_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((7_216_000 as Weight).saturating_mul(r as Weight))
+		(24_057_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((7_050_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(24_608_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((12_966_000 as Weight).saturating_mul(r as Weight))
+		(24_038_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((12_934_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(24_564_000 as Weight)
-			// Standard Error: 1_424_000
-			.saturating_add((13_665_000 as Weight).saturating_mul(r as Weight))
+		(23_992_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((12_055_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(24_611_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((12_932_000 as Weight).saturating_mul(r as Weight))
+		(24_082_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((12_898_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(24_590_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((12_207_000 as Weight).saturating_mul(r as Weight))
+		(24_025_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((12_178_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(24_622_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((7_172_000 as Weight).saturating_mul(r as Weight))
+		(23_984_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_214_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(24_585_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((7_202_000 as Weight).saturating_mul(r as Weight))
+		(24_012_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((7_183_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(24_600_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((7_182_000 as Weight).saturating_mul(r as Weight))
+		(24_001_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_122_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(24_621_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((7_226_000 as Weight).saturating_mul(r as Weight))
+		(23_973_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((7_251_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(24_643_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((7_254_000 as Weight).saturating_mul(r as Weight))
+		(23_969_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((7_289_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(24_586_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((7_246_000 as Weight).saturating_mul(r as Weight))
+		(24_008_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((7_292_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(24_631_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((7_306_000 as Weight).saturating_mul(r as Weight))
+		(24_010_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((7_305_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(24_643_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((7_183_000 as Weight).saturating_mul(r as Weight))
+		(24_001_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((7_299_000 as Weight).saturating_mul(r as Weight))
 	}
 }
diff --git a/frame/support/src/storage/child.rs b/frame/support/src/storage/child.rs
index ede7b98e5eeb..c1885fc07430 100644
--- a/frame/support/src/storage/child.rs
+++ b/frame/support/src/storage/child.rs
@@ -243,3 +243,21 @@ pub fn root(
 		),
 	}
 }
+
+/// Return the length in bytes of the value without reading it. `None` if it does not exist.
+pub fn len(
+	child_info: &ChildInfo,
+	key: &[u8],
+) -> Option<u32> {
+	match child_info.child_type() {
+		ChildType::ParentKeyId => {
+			let mut buffer = [0; 0];
+			sp_io::default_child_storage::read(
+				child_info.storage_key(),
+				key,
+				&mut buffer,
+				0,
+			)
+		}
+	}
+}

From aa8b7db2aaf79631b04976fb1a528ca49a7ab480 Mon Sep 17 00:00:00 2001
From: cheme <emericchevalier.pro@gmail.com>
Date: Wed, 13 Jan 2021 13:45:31 +0100
Subject: [PATCH 0261/1194] Fix clear prefix check to avoid erasing child trie
 roots. (#7848)

* Fix clear prefix check to avoid erasing child trie roots.

* Renaming and extend existing test with check.

* last nitpicks.
---
 primitives/state-machine/src/ext.rs | 44 +++++++++++++++++++++++++++--
 primitives/storage/src/lib.rs       | 10 +++++++
 2 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/primitives/state-machine/src/ext.rs b/primitives/state-machine/src/ext.rs
index e080192d49b6..3321f0561fa1 100644
--- a/primitives/state-machine/src/ext.rs
+++ b/primitives/state-machine/src/ext.rs
@@ -454,8 +454,9 @@ where
 			HexDisplay::from(&prefix),
 		);
 		let _guard = guard();
-		if is_child_storage_key(prefix) {
-			warn!(target: "trie", "Refuse to directly clear prefix that is part of child storage key");
+
+		if sp_core::storage::well_known_keys::starts_with_child_storage_key(prefix) {
+			warn!(target: "trie", "Refuse to directly clear prefix that is part or contains of child storage key");
 			return;
 		}
 
@@ -1024,6 +1025,45 @@ mod tests {
 		);
 	}
 
+	#[test]
+	fn clear_prefix_cannot_delete_a_child_root() {
+		let child_info = ChildInfo::new_default(b"Child1");
+		let child_info = &child_info;
+		let mut cache = StorageTransactionCache::default();
+		let mut overlay = OverlayedChanges::default();
+		let mut offchain_overlay = prepare_offchain_overlay_with_changes();
+		let backend = Storage {
+			top: map![],
+			children_default: map![
+				child_info.storage_key().to_vec() => StorageChild {
+					data: map![
+						vec![30] => vec![40]
+					],
+					child_info: child_info.to_owned(),
+				}
+			],
+		}.into();
+
+		let ext = TestExt::new(&mut overlay, &mut offchain_overlay, &mut cache, &backend, None, None);
+
+		use sp_core::storage::well_known_keys;
+		let mut ext = ext;
+		let mut not_under_prefix = well_known_keys::CHILD_STORAGE_KEY_PREFIX.to_vec();
+		not_under_prefix[4] = 88;
+		not_under_prefix.extend(b"path");
+		ext.set_storage(not_under_prefix.clone(), vec![10]);
+
+		ext.clear_prefix(&[]);
+		ext.clear_prefix(&well_known_keys::CHILD_STORAGE_KEY_PREFIX[..4]);
+		let mut under_prefix = well_known_keys::CHILD_STORAGE_KEY_PREFIX.to_vec();
+		under_prefix.extend(b"path");
+		ext.clear_prefix(&well_known_keys::CHILD_STORAGE_KEY_PREFIX[..4]);
+		assert_eq!(ext.child_storage(child_info, &[30]), Some(vec![40]));
+		assert_eq!(ext.storage(not_under_prefix.as_slice()), Some(vec![10]));
+		ext.clear_prefix(&not_under_prefix[..5]);
+		assert_eq!(ext.storage(not_under_prefix.as_slice()), None);
+	}
+
 	#[test]
 	fn storage_append_works() {
 		let mut data = Vec::new();
diff --git a/primitives/storage/src/lib.rs b/primitives/storage/src/lib.rs
index 268448ae125e..1e9f9766072e 100644
--- a/primitives/storage/src/lib.rs
+++ b/primitives/storage/src/lib.rs
@@ -180,6 +180,16 @@ pub mod well_known_keys {
 		// Other code might depend on this, so be careful changing this.
 		key.starts_with(CHILD_STORAGE_KEY_PREFIX)
 	}
+
+	/// Returns if the given `key` starts with [`CHILD_STORAGE_KEY_PREFIX`] or collides with it.
+	pub fn starts_with_child_storage_key(key: &[u8]) -> bool {
+		if key.len() > CHILD_STORAGE_KEY_PREFIX.len() {
+			key.starts_with(CHILD_STORAGE_KEY_PREFIX)
+		} else {
+			CHILD_STORAGE_KEY_PREFIX.starts_with(key)
+		}
+	}
+
 }
 
 /// Information related to a child state.

From 559e56be73ac68d4ea021f088f2a6c723c90da84 Mon Sep 17 00:00:00 2001
From: Denis Pisarev <denis.pisarev@parity.io>
Date: Wed, 13 Jan 2021 15:37:06 +0100
Subject: [PATCH 0262/1194] CI: test prometheus alerts moved to check; deploy
 depends on tests; chore (#7887)

---
 .gitlab-ci.yml | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2a9f02a3a61b..f22b79c4df59 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,8 +52,6 @@ default:
 .kubernetes-build:                 &kubernetes-build
   tags:
     - kubernetes-parity-build
-  environment:
-    name: parity-build
   interruptible:                   true
 
 .docker-env:                       &docker-env
@@ -129,7 +127,7 @@ check-signed-tag:
   <<:                              *kubernetes-build
   rules:
     - if: $CI_COMMIT_REF_NAME =~ /^ci-release-.*$/
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+\.[0-9]+.*$/
+    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
   script:
     - ./.maintain/gitlab/check_signed.sh
 
@@ -150,6 +148,19 @@ test-dependency-rules:
   script:
     - .maintain/ensure-deps.sh
 
+test-prometheus-alerting-rules:
+  stage:                           check
+  image:                           paritytech/tools:latest
+  <<:                              *kubernetes-build
+  rules:
+    - if: $CI_COMMIT_BRANCH
+      changes:
+        - .gitlab-ci.yml
+        - .maintain/monitoring/**/*
+  script:
+    - echo "promtool check rules .maintain/monitoring/alerting-rules/alerting-rules.yaml"
+    - cat .maintain/monitoring/alerting-rules/alerting-rules.yaml | promtool test rules .maintain/monitoring/alerting-rules/alerting-rule-tests.yaml
+
 #### stage:                        test
 
 cargo-audit:
@@ -340,14 +351,6 @@ cargo-check-macos:
   tags:
     - osx
 
-test-prometheus-alerting-rules:
-  stage:                           test
-  image:                           paritytech/tools:latest
-  <<:                              *kubernetes-build
-  script:
-    - promtool check rules .maintain/monitoring/alerting-rules/alerting-rules.yaml
-    - cat .maintain/monitoring/alerting-rules/alerting-rules.yaml | promtool test rules .maintain/monitoring/alerting-rules/alerting-rule-tests.yaml
-
 #### stage:                        build
 
 check-polkadot-companion-status:
@@ -509,7 +512,7 @@ build-rust-doc:
         --tag "$IMAGE_NAME:latest"
         --file "$DOCKERFILE" .
     - echo "$Docker_Hub_Pass_Parity" |
-      buildah login --username "$Docker_Hub_User_Parity" --password-stdin docker.io
+        buildah login --username "$Docker_Hub_User_Parity" --password-stdin docker.io
     - buildah info
     - buildah push --format=v2s2 "$IMAGE_NAME:$VERSION"
     - buildah push --format=v2s2 "$IMAGE_NAME:latest"
@@ -595,7 +598,7 @@ publish-draft-release:
   image:                           paritytech/tools:latest
   rules:
     - if: $CI_COMMIT_REF_NAME =~ /^ci-release-.*$/
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+\.[0-9]+.*$/
+    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
   script:
     - ./.maintain/gitlab/publish_draft_release.sh
   allow_failure:                   true
@@ -605,14 +608,17 @@ publish-to-crates-io:
   <<:                              *docker-env
   rules:
     - if: $CI_COMMIT_REF_NAME =~ /^ci-release-.*$/
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+\.[0-9]+.*$/
+    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
   script:
     - cargo install cargo-unleash ${CARGO_UNLEASH_INSTALL_PARAMS}
     - cargo unleash em-dragons --no-check --owner github:paritytech:core-devs ${CARGO_UNLEASH_PKG_DEF}
   allow_failure:                   true
 
-deploy-kubernetes-alerting-rules:
+deploy-prometheus-alerting-rules:
   stage:                           deploy
+  needs:
+    - job:                         test-prometheus-alerting-rules
+      artifacts:                   false
   interruptible:                   true
   retry:                           1
   tags:

From 1334eb7224185b0c5f4016378842695fef036a13 Mon Sep 17 00:00:00 2001
From: Andronik Ordian <write@reusable.software>
Date: Wed, 13 Jan 2021 19:35:29 +0100
Subject: [PATCH 0263/1194] pallet_authority_discovery: introduce
 current_authorities and next_authorities methods  (#7892)

* split authorities discovery keys for the current and next session

* Revert "split authorities discovery keys for the current and next session"

This reverts commit 0a40b8b4c14e85d95357a27f6db30199cbe0aa4d.

* pallet_authority_discovery: introduce a next_authorities method

* address feedback

* amend the doccomments
---
 frame/authority-discovery/src/lib.rs | 40 +++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/frame/authority-discovery/src/lib.rs b/frame/authority-discovery/src/lib.rs
index fdc13cd74706..9a7c20988710 100644
--- a/frame/authority-discovery/src/lib.rs
+++ b/frame/authority-discovery/src/lib.rs
@@ -17,13 +17,13 @@
 
 //! # Authority discovery module.
 //!
-//! This module is used by the `client/authority-discovery` to retrieve the
-//! current set of authorities.
+//! This module is used by the `client/authority-discovery` and by polkadot's parachain logic
+//! to retrieve the current and the next set of authorities.
 
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use sp_std::{collections::btree_set::BTreeSet, prelude::*};
+use sp_std::prelude::*;
 use frame_support::{decl_module, decl_storage};
 use sp_authority_discovery::AuthorityId;
 
@@ -32,8 +32,10 @@ pub trait Config: frame_system::Config + pallet_session::Config {}
 
 decl_storage! {
 	trait Store for Module<T: Config> as AuthorityDiscovery {
-		/// Keys of the current and next authority set.
+		/// Keys of the current authority set.
 		Keys get(fn keys): Vec<AuthorityId>;
+		/// Keys of the next authority set.
+		NextKeys get(fn next_keys): Vec<AuthorityId>;
 	}
 	add_extra_genesis {
 		config(keys): Vec<AuthorityId>;
@@ -47,15 +49,34 @@ decl_module! {
 }
 
 impl<T: Config> Module<T> {
-	/// Retrieve authority identifiers of the current and next authority set.
+	/// Retrieve authority identifiers of the current and next authority set
+	/// sorted and deduplicated.
 	pub fn authorities() -> Vec<AuthorityId> {
+		let mut keys = Keys::get();
+		let next = NextKeys::get();
+
+		keys.extend(next);
+		keys.sort();
+		keys.dedup();
+
+		keys
+	}
+
+	/// Retrieve authority identifiers of the current authority set in the original order.
+	pub fn current_authorities() -> Vec<AuthorityId> {
 		Keys::get()
 	}
 
+	/// Retrieve authority identifiers of the next authority set in the original order.
+	pub fn next_authorities() -> Vec<AuthorityId> {
+		NextKeys::get()
+	}
+
 	fn initialize_keys(keys: &[AuthorityId]) {
 		if !keys.is_empty() {
 			assert!(Keys::get().is_empty(), "Keys are already initialized!");
 			Keys::put(keys);
+			NextKeys::put(keys);
 		}
 	}
 }
@@ -80,8 +101,10 @@ impl<T: Config> pallet_session::OneSessionHandler<T::AccountId> for Module<T> {
 	{
 		// Remember who the authorities are for the new and next session.
 		if changed {
-			let keys = validators.chain(queued_validators).map(|x| x.1).collect::<BTreeSet<_>>();
-			Keys::put(keys.into_iter().collect::<Vec<_>>());
+			let keys = validators.map(|x| x.1);
+			Keys::put(keys.collect::<Vec<_>>());
+			let next_keys = queued_validators.map(|x| x.1);
+			NextKeys::put(next_keys.collect::<Vec<_>>());
 		}
 	}
 
@@ -250,8 +273,7 @@ mod tests {
 				second_authorities_and_account_ids.clone().into_iter(),
 				third_authorities_and_account_ids.clone().into_iter(),
 			);
-			let mut authorities_returned = AuthorityDiscovery::authorities();
-			authorities_returned.sort();
+			let authorities_returned = AuthorityDiscovery::authorities();
 			assert_eq!(
 				first_authorities,
 				authorities_returned,

From c2aa42566437dbf0697e6f545c7cc7cb50722b11 Mon Sep 17 00:00:00 2001
From: Bernhard Schuster <bernhard@ahoi.io>
Date: Wed, 13 Jan 2021 19:44:46 +0100
Subject: [PATCH 0264/1194] make helper error types generics (#7878)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* make helper error types generics

* avoid From<io::Error> dep in runner helper logic

* slip of the pen, bump futures to 0.3.9

* more generics

* generic var spaces

Co-authored-by: Andronik Ordian <write@reusable.software>

* network-gossip: add metric for number of local messages (#7871)

* network-gossip: add metric for number of local messages

* grandpa: fix GossipEngine missing metrics registry parameter

* network-gossip: increase known messages cache size

* network-gossip: fix tests

* grandpa: remove unnecessary clone

Co-authored-by: Max Inden <mail@max-inden.de>

* network-gossip: count registered and expired messages separately

* network-gossip: add comment on known messages cache size

* network-gossip: extend comment with cache size in memory

Co-authored-by: Max Inden <mail@max-inden.de>

* Clean-up pass in network/src/protocol.rs (#7889)

* Remove statistics system

* Remove ContextData struct

* Remove next_request_id

* Some TryFrom nit-picking

* Use constants for peer sets

* contracts: Don't read the previous value when overwriting a storage item (#7879)

* Add `len` function that can return the length of a storage item efficiently

* Make use of the new len function in contracts

* Fix benchmarks

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_contracts --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/contracts/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Remove unused imports

Co-authored-by: Parity Benchmarking Bot <admin@parity.io>

* Fix clear prefix check to avoid erasing child trie roots. (#7848)

* Fix clear prefix check to avoid erasing child trie roots.

* Renaming and extend existing test with check.

* last nitpicks.

* use follow paths to std standarad components

* line width

Co-authored-by: Bernhard Schuster <bernhard@parity.io>
Co-authored-by: Andronik Ordian <write@reusable.software>
Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
Co-authored-by: Max Inden <mail@max-inden.de>
Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
Co-authored-by: Alexander Theißen <alex.theissen@me.com>
Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
Co-authored-by: cheme <emericchevalier.pro@gmail.com>
---
 Cargo.lock                            |  2 +-
 bin/node-template/node/src/command.rs |  2 +-
 bin/node/cli/Cargo.toml               |  2 +-
 bin/node/cli/src/command.rs           |  2 +-
 client/cli/src/runner.rs              | 55 +++++++++++++++++----------
 5 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4c74549d08b9..0ea53a0aa78f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9814,7 +9814,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04f8ab788026715fa63b31960869617cba39117e520eb415b0139543e325ab59"
 dependencies = [
  "cfg-if 0.1.10",
- "rand 0.7.3",
+ "rand 0.3.23",
  "static_assertions",
 ]
 
diff --git a/bin/node-template/node/src/command.rs b/bin/node-template/node/src/command.rs
index 1c22b388af78..e61dd8641882 100644
--- a/bin/node-template/node/src/command.rs
+++ b/bin/node-template/node/src/command.rs
@@ -131,7 +131,7 @@ pub fn run() -> sc_cli::Result<()> {
 				match config.role {
 					Role::Light => service::new_light(config),
 					_ => service::new_full(config),
-				}
+				}.map_err(sc_cli::Error::Service)
 			})
 		}
 	}
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index 3b7d56c2dbbc..5c84f4cab7d6 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -36,7 +36,7 @@ crate-type = ["cdylib", "rlib"]
 # third-party dependencies
 codec = { package = "parity-scale-codec", version = "1.3.6" }
 serde = { version = "1.0.102", features = ["derive"] }
-futures = { version = "0.3.1", features = ["compat"] }
+futures = { version = "0.3.9", features = ["compat"] }
 hex-literal = "0.3.1"
 log = "0.4.8"
 rand = "0.7.2"
diff --git a/bin/node/cli/src/command.rs b/bin/node/cli/src/command.rs
index ed3aff88c75d..fcb8b6f0085e 100644
--- a/bin/node/cli/src/command.rs
+++ b/bin/node/cli/src/command.rs
@@ -76,7 +76,7 @@ pub fn run() -> Result<()> {
 				match config.role {
 					Role::Light => service::new_light(config),
 					_ => service::new_full(config),
-				}
+				}.map_err(sc_cli::Error::Service)
 			})
 		}
 		Some(Subcommand::Inspect(cmd)) => {
diff --git a/client/cli/src/runner.rs b/client/cli/src/runner.rs
index 9836471fb9fa..74ac9e5bc7f6 100644
--- a/client/cli/src/runner.rs
+++ b/client/cli/src/runner.rs
@@ -27,17 +27,19 @@ use log::info;
 use sc_service::{Configuration, TaskType, TaskManager};
 use sp_utils::metrics::{TOKIO_THREADS_ALIVE, TOKIO_THREADS_TOTAL};
 use std::marker::PhantomData;
+use sc_service::Error as ServiceError;
+use crate::error::Error as CliError;
 
 #[cfg(target_family = "unix")]
-async fn main<F, E>(func: F) -> std::result::Result<(), Box<dyn std::error::Error>>
+async fn main<F, E>(func: F) -> std::result::Result<(), E>
 where
 	F: Future<Output = std::result::Result<(), E>> + future::FusedFuture,
-	E: 'static + std::error::Error,
+	E: std::error::Error + Send + Sync + 'static + From<ServiceError>,
 {
 	use tokio::signal::unix::{signal, SignalKind};
 
-	let mut stream_int = signal(SignalKind::interrupt())?;
-	let mut stream_term = signal(SignalKind::terminate())?;
+	let mut stream_int = signal(SignalKind::interrupt()).map_err(ServiceError::Io)?;
+	let mut stream_term = signal(SignalKind::terminate()).map_err(ServiceError::Io)?;
 
 	let t1 = stream_int.recv().fuse();
 	let t2 = stream_term.recv().fuse();
@@ -55,10 +57,10 @@ where
 }
 
 #[cfg(not(unix))]
-async fn main<F, E>(func: F) -> std::result::Result<(), Box<dyn std::error::Error>>
+async fn main<F, E>(func: F) -> std::result::Result<(), E>
 where
 	F: Future<Output = std::result::Result<(), E>> + future::FusedFuture,
-	E: 'static + std::error::Error,
+	E: std::error::Error + Send + Sync + 'static + From<ServiceError>,
 {
 	use tokio::signal::ctrl_c;
 
@@ -90,19 +92,19 @@ pub fn build_runtime() -> std::result::Result<tokio::runtime::Runtime, std::io::
 		.build()
 }
 
-fn run_until_exit<FUT, ERR>(
+fn run_until_exit<F, E>(
 	mut tokio_runtime: tokio::runtime::Runtime,
-	future: FUT,
+	future: F,
 	task_manager: TaskManager,
-) -> Result<()>
+) -> std::result::Result<(), E>
 where
-	FUT: Future<Output = std::result::Result<(), ERR>> + future::Future,
-	ERR: 'static + std::error::Error,
+	F: Future<Output = std::result::Result<(), E>> + future::Future,
+	E: std::error::Error + Send + Sync + 'static + From<ServiceError>,
 {
 	let f = future.fuse();
 	pin_mut!(f);
 
-	tokio_runtime.block_on(main(f)).map_err(|e| e.to_string())?;
+	tokio_runtime.block_on(main(f))?;
 	tokio_runtime.block_on(task_manager.clean_shutdown());
 
 	Ok(())
@@ -172,32 +174,43 @@ impl<C: SubstrateCli> Runner<C> {
 
 	/// A helper function that runs a node with tokio and stops if the process receives the signal
 	/// `SIGTERM` or `SIGINT`.
-	pub fn run_node_until_exit<F: Future<Output = sc_service::error::Result<TaskManager>>>(
+	pub fn run_node_until_exit<F, E>(
 		mut self,
 		initialize: impl FnOnce(Configuration) -> F,
-	) -> Result<()> {
+	) -> std::result::Result<(), E>
+	where
+		F: Future<Output = std::result::Result<TaskManager, E>>,
+		E: std::error::Error + Send + Sync + 'static + From<ServiceError>,
+	{
 		self.print_node_infos();
 		let mut task_manager = self.tokio_runtime.block_on(initialize(self.config))?;
 		let res = self.tokio_runtime.block_on(main(task_manager.future().fuse()));
 		self.tokio_runtime.block_on(task_manager.clean_shutdown());
-		res.map_err(|e| e.to_string().into())
+		Ok(res?)
 	}
 
 	/// A helper function that runs a command with the configuration of this node.
-	pub fn sync_run(self, runner: impl FnOnce(Configuration) -> Result<()>) -> Result<()> {
+	pub fn sync_run<E>(
+		self,
+		runner: impl FnOnce(Configuration) -> std::result::Result<(), E>
+	) -> std::result::Result<(), E>
+	where
+		E: std::error::Error + Send + Sync + 'static + From<ServiceError>,
+	{
 		runner(self.config)
 	}
 
 	/// A helper function that runs a future with tokio and stops if the process receives
 	/// the signal `SIGTERM` or `SIGINT`.
-	pub fn async_run<FUT>(
-		self, runner: impl FnOnce(Configuration) -> Result<(FUT, TaskManager)>,
-	) -> Result<()>
+	pub fn async_run<F, E>(
+		self, runner: impl FnOnce(Configuration) -> std::result::Result<(F, TaskManager), E>,
+	) -> std::result::Result<(), E>
 	where
-		FUT: Future<Output = Result<()>>,
+		F: Future<Output = std::result::Result<(), E>>,
+		E: std::error::Error + Send + Sync + 'static + From<ServiceError> + From<CliError>,
 	{
 		let (future, task_manager) = runner(self.config)?;
-		run_until_exit(self.tokio_runtime, future, task_manager)
+		run_until_exit::<_, E>(self.tokio_runtime, future, task_manager)
 	}
 
 	/// Get an immutable reference to the node Configuration

From f2367f72ddabfb1580af7f9f21d72a0f86d32b07 Mon Sep 17 00:00:00 2001
From: Liu-Cheng Xu <xuliuchengxlc@gmail.com>
Date: Thu, 14 Jan 2021 19:43:53 +0800
Subject: [PATCH 0265/1194] Add payment_queryFeeDetails RPC (#7692)

* Return FeeDetails in compute_fee_raw()

* Add payment_queryDetails rpc

* Simplify serde attribute a bit

* Fix line width check

* Use saturating_add()

* Move transaction payment rpc types to types.rs

* Add file header

* Fix test

* Update Cargo.lock

* Nit

* Apply the review suggestions

* .

* .

* Fix serde

* Fix rust doc

* .

* Update frame/transaction-payment/src/types.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Use NumberOrHex in fee details RPC

* Address review feedback

* Nits

* Update some docs

* Address review

* Update frame/transaction-payment/src/types.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Happy 2021

* Nit

* Address code review

* Remove needless bound

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
---
 Cargo.lock                                    |   8 +-
 bin/node-template/runtime/src/lib.rs          |   6 +
 bin/node/runtime/src/lib.rs                   |   5 +-
 frame/transaction-payment/Cargo.toml          |   3 +-
 frame/transaction-payment/rpc/Cargo.toml      |   1 -
 .../rpc/runtime-api/Cargo.toml                |  11 +-
 .../rpc/runtime-api/src/lib.rs                |  79 +--------
 frame/transaction-payment/rpc/src/lib.rs      |  66 +++++++-
 frame/transaction-payment/src/lib.rs          | 101 ++++++++----
 frame/transaction-payment/src/types.rs        | 155 ++++++++++++++++++
 primitives/rpc/src/number.rs                  |  24 ++-
 11 files changed, 322 insertions(+), 137 deletions(-)
 create mode 100644 frame/transaction-payment/src/types.rs

diff --git a/Cargo.lock b/Cargo.lock
index 0ea53a0aa78f..4d334f5f2588 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5119,9 +5119,9 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "pallet-transaction-payment-rpc-runtime-api",
  "parity-scale-codec",
  "serde",
+ "serde_json",
  "smallvec 1.5.0",
  "sp-core",
  "sp-io",
@@ -5139,7 +5139,6 @@ dependencies = [
  "jsonrpc-derive",
  "pallet-transaction-payment-rpc-runtime-api",
  "parity-scale-codec",
- "serde",
  "sp-api",
  "sp-blockchain",
  "sp-core",
@@ -5151,13 +5150,10 @@ dependencies = [
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "2.0.1"
 dependencies = [
- "frame-support",
+ "pallet-transaction-payment",
  "parity-scale-codec",
- "serde",
- "serde_json",
  "sp-api",
  "sp-runtime",
- "sp-std",
 ]
 
 [[package]]
diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index 081234677964..5efe5492b92d 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -438,6 +438,12 @@ impl_runtime_apis! {
 		) -> pallet_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo<Balance> {
 			TransactionPayment::query_info(uxt, len)
 		}
+		fn query_fee_details(
+			uxt: <Block as BlockT>::Extrinsic,
+			len: u32,
+		) -> pallet_transaction_payment::FeeDetails<Balance> {
+			TransactionPayment::query_fee_details(uxt, len)
+		}
 	}
 
 	#[cfg(feature = "runtime-benchmarks")]
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 3e6452465831..e88484e47295 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -66,7 +66,7 @@ use pallet_grandpa::{AuthorityId as GrandpaId, AuthorityList as GrandpaAuthority
 use pallet_grandpa::fg_primitives;
 use pallet_im_online::sr25519::AuthorityId as ImOnlineId;
 use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId;
-use pallet_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo;
+use pallet_transaction_payment::{FeeDetails, RuntimeDispatchInfo};
 pub use pallet_transaction_payment::{Multiplier, TargetedFeeAdjustment, CurrencyAdapter};
 use pallet_session::{historical as pallet_session_historical};
 use sp_inherents::{InherentData, CheckInherentsResult};
@@ -1259,6 +1259,9 @@ impl_runtime_apis! {
 		fn query_info(uxt: <Block as BlockT>::Extrinsic, len: u32) -> RuntimeDispatchInfo<Balance> {
 			TransactionPayment::query_info(uxt, len)
 		}
+		fn query_fee_details(uxt: <Block as BlockT>::Extrinsic, len: u32) -> FeeDetails<Balance> {
+			TransactionPayment::query_fee_details(uxt, len)
+		}
 	}
 
 	impl sp_session::SessionKeys<Block> for Runtime {
diff --git a/frame/transaction-payment/Cargo.toml b/frame/transaction-payment/Cargo.toml
index 16be1b5fba62..1f64ae03995b 100644
--- a/frame/transaction-payment/Cargo.toml
+++ b/frame/transaction-payment/Cargo.toml
@@ -19,12 +19,12 @@ sp-std = { version = "2.0.0", default-features = false, path = "../../primitives
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
-pallet-transaction-payment-rpc-runtime-api = { version = "2.0.0", default-features = false, path = "./rpc/runtime-api" }
 smallvec = "1.4.1"
 sp-io = { version = "2.0.0", path = "../../primitives/io", default-features = false }
 sp-core = { version = "2.0.0", path = "../../primitives/core", default-features = false }
 
 [dev-dependencies]
+serde_json = "1.0.41"
 pallet-balances = { version = "2.0.0", path = "../balances" }
 sp-storage = { version = "2.0.0", path = "../../primitives/storage" }
 
@@ -37,7 +37,6 @@ std = [
 	"sp-runtime/std",
 	"frame-support/std",
 	"frame-system/std",
-	"pallet-transaction-payment-rpc-runtime-api/std",
 	"sp-io/std",
 	"sp-core/std",
 ]
diff --git a/frame/transaction-payment/rpc/Cargo.toml b/frame/transaction-payment/rpc/Cargo.toml
index c459fbcf4a88..410827d0efb5 100644
--- a/frame/transaction-payment/rpc/Cargo.toml
+++ b/frame/transaction-payment/rpc/Cargo.toml
@@ -19,7 +19,6 @@ jsonrpc-core-client = "15.1.0"
 jsonrpc-derive = "15.1.0"
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
 sp-rpc = { version = "2.0.0", path = "../../../primitives/rpc" }
-serde = { version = "1.0.101", features = ["derive"] }
 sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
 sp-api = { version = "2.0.0", path = "../../../primitives/api" }
 sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
diff --git a/frame/transaction-payment/rpc/runtime-api/Cargo.toml b/frame/transaction-payment/rpc/runtime-api/Cargo.toml
index a55cec5cfeec..64c082b420c9 100644
--- a/frame/transaction-payment/rpc/runtime-api/Cargo.toml
+++ b/frame/transaction-payment/rpc/runtime-api/Cargo.toml
@@ -13,23 +13,16 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.101", optional = true, features = ["derive"] }
 sp-api = { version = "2.0.0", default-features = false, path = "../../../../primitives/api" }
 codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
-sp-std = { version = "2.0.0", default-features = false, path = "../../../../primitives/std" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../../../primitives/runtime" }
-frame-support = { version = "2.0.0", default-features = false, path = "../../../support" }
-
-[dev-dependencies]
-serde_json = "1.0.41"
+pallet-transaction-payment = { version = "2.0.0", default-features = false, path = "../../../transaction-payment" }
 
 [features]
 default = ["std"]
 std = [
-	"serde",
 	"sp-api/std",
 	"codec/std",
-	"sp-std/std",
 	"sp-runtime/std",
-	"frame-support/std",
+	"pallet-transaction-payment/std",
 ]
diff --git a/frame/transaction-payment/rpc/runtime-api/src/lib.rs b/frame/transaction-payment/rpc/runtime-api/src/lib.rs
index f2c1b2c14149..bd05aec30333 100644
--- a/frame/transaction-payment/rpc/runtime-api/src/lib.rs
+++ b/frame/transaction-payment/rpc/runtime-api/src/lib.rs
@@ -19,85 +19,16 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use sp_std::prelude::*;
-use frame_support::weights::{Weight, DispatchClass};
-use codec::{Encode, Codec, Decode};
-#[cfg(feature = "std")]
-use serde::{Serialize, Deserialize, Serializer, Deserializer};
-use sp_runtime::traits::{MaybeDisplay, MaybeFromStr};
+use codec::Codec;
+use sp_runtime::traits::MaybeDisplay;
 
-/// Information related to a dispatchable's class, weight, and fee that can be queried from the runtime.
-#[derive(Eq, PartialEq, Encode, Decode, Default)]
-#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
-#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
-pub struct RuntimeDispatchInfo<Balance> {
-	/// Weight of this dispatch.
-	pub weight: Weight,
-	/// Class of this dispatch.
-	pub class: DispatchClass,
-	/// The inclusion fee of this dispatch. This does not include a tip or anything else that
-	/// depends on the signature (i.e. depends on a `SignedExtension`).
-	#[cfg_attr(feature = "std", serde(bound(serialize = "Balance: std::fmt::Display")))]
-	#[cfg_attr(feature = "std", serde(serialize_with = "serialize_as_string"))]
-	#[cfg_attr(feature = "std", serde(bound(deserialize = "Balance: std::str::FromStr")))]
-	#[cfg_attr(feature = "std", serde(deserialize_with = "deserialize_from_string"))]
-	pub partial_fee: Balance,
-}
-
-#[cfg(feature = "std")]
-fn serialize_as_string<S: Serializer, T: std::fmt::Display>(t: &T, serializer: S) -> Result<S::Ok, S::Error> {
-	serializer.serialize_str(&t.to_string())
-}
-
-#[cfg(feature = "std")]
-fn deserialize_from_string<'de, D: Deserializer<'de>, T: std::str::FromStr>(deserializer: D) -> Result<T, D::Error> {
-	let s = String::deserialize(deserializer)?;
-	s.parse::<T>().map_err(|_| serde::de::Error::custom("Parse from string failed"))
-}
+pub use pallet_transaction_payment::{FeeDetails, InclusionFee, RuntimeDispatchInfo};
 
 sp_api::decl_runtime_apis! {
 	pub trait TransactionPaymentApi<Balance> where
-		Balance: Codec + MaybeDisplay + MaybeFromStr,
+		Balance: Codec + MaybeDisplay,
 	{
 		fn query_info(uxt: Block::Extrinsic, len: u32) -> RuntimeDispatchInfo<Balance>;
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-
-	#[test]
-	fn should_serialize_and_deserialize_properly_with_string() {
-		let info = RuntimeDispatchInfo {
-			weight: 5,
-			class: DispatchClass::Normal,
-			partial_fee: 1_000_000_u64,
-		};
-
-		let json_str = r#"{"weight":5,"class":"normal","partialFee":"1000000"}"#;
-
-		assert_eq!(serde_json::to_string(&info).unwrap(), json_str);
-		assert_eq!(serde_json::from_str::<RuntimeDispatchInfo<u64>>(json_str).unwrap(), info);
-
-		// should not panic
-		serde_json::to_value(&info).unwrap();
-	}
-
-	#[test]
-	fn should_serialize_and_deserialize_properly_large_value() {
-		let info = RuntimeDispatchInfo {
-			weight: 5,
-			class: DispatchClass::Normal,
-			partial_fee: u128::max_value(),
-		};
-
-		let json_str = r#"{"weight":5,"class":"normal","partialFee":"340282366920938463463374607431768211455"}"#;
-
-		assert_eq!(serde_json::to_string(&info).unwrap(), json_str);
-		assert_eq!(serde_json::from_str::<RuntimeDispatchInfo<u128>>(json_str).unwrap(), info);
-
-		// should not panic
-		serde_json::to_value(&info).unwrap();
+		fn query_fee_details(uxt: Block::Extrinsic, len: u32) -> FeeDetails<Balance>;
 	}
 }
diff --git a/frame/transaction-payment/rpc/src/lib.rs b/frame/transaction-payment/rpc/src/lib.rs
index ec06fad08d10..b3e892c165e3 100644
--- a/frame/transaction-payment/rpc/src/lib.rs
+++ b/frame/transaction-payment/rpc/src/lib.rs
@@ -18,14 +18,16 @@
 //! RPC interface for the transaction payment module.
 
 use std::sync::Arc;
+use std::convert::TryInto;
 use codec::{Codec, Decode};
 use sp_blockchain::HeaderBackend;
 use jsonrpc_core::{Error as RpcError, ErrorCode, Result};
 use jsonrpc_derive::rpc;
-use sp_runtime::{generic::BlockId, traits::{Block as BlockT, MaybeDisplay, MaybeFromStr}};
+use sp_runtime::{generic::BlockId, traits::{Block as BlockT, MaybeDisplay}};
 use sp_api::ProvideRuntimeApi;
 use sp_core::Bytes;
-use pallet_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo;
+use sp_rpc::number::NumberOrHex;
+use pallet_transaction_payment_rpc_runtime_api::{FeeDetails, InclusionFee, RuntimeDispatchInfo};
 pub use pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi as TransactionPaymentRuntimeApi;
 pub use self::gen_client::Client as TransactionPaymentClient;
 
@@ -37,6 +39,12 @@ pub trait TransactionPaymentApi<BlockHash, ResponseType> {
 		encoded_xt: Bytes,
 		at: Option<BlockHash>
 	) -> Result<ResponseType>;
+	#[rpc(name = "payment_queryFeeDetails")]
+	fn query_fee_details(
+		&self,
+		encoded_xt: Bytes,
+		at: Option<BlockHash>
+	) -> Result<FeeDetails<NumberOrHex>>;
 }
 
 /// A struct that implements the [`TransactionPaymentApi`].
@@ -48,7 +56,7 @@ pub struct TransactionPayment<C, P> {
 impl<C, P> TransactionPayment<C, P> {
 	/// Create new `TransactionPayment` with the given reference to the client.
 	pub fn new(client: Arc<C>) -> Self {
-		TransactionPayment { client, _marker: Default::default() }
+		Self { client, _marker: Default::default() }
 	}
 }
 
@@ -69,13 +77,15 @@ impl From<Error> for i64 {
 	}
 }
 
-impl<C, Block, Balance> TransactionPaymentApi<<Block as BlockT>::Hash, RuntimeDispatchInfo<Balance>>
-	for TransactionPayment<C, Block>
+impl<C, Block, Balance> TransactionPaymentApi<
+	<Block as BlockT>::Hash,
+	RuntimeDispatchInfo<Balance>,
+> for TransactionPayment<C, Block>
 where
 	Block: BlockT,
 	C: 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block>,
 	C::Api: TransactionPaymentRuntimeApi<Block, Balance>,
-	Balance: Codec + MaybeDisplay + MaybeFromStr,
+	Balance: Codec + MaybeDisplay + Copy + TryInto<NumberOrHex>,
 {
 	fn query_info(
 		&self,
@@ -101,4 +111,48 @@ where
 			data: Some(format!("{:?}", e).into()),
 		})
 	}
+
+	fn query_fee_details(
+		&self,
+		encoded_xt: Bytes,
+		at: Option<<Block as BlockT>::Hash>,
+	) -> Result<FeeDetails<NumberOrHex>> {
+		let api = self.client.runtime_api();
+		let at = BlockId::hash(at.unwrap_or_else(||
+			// If the block hash is not supplied assume the best block.
+			self.client.info().best_hash
+		));
+
+		let encoded_len = encoded_xt.len() as u32;
+
+		let uxt: Block::Extrinsic = Decode::decode(&mut &*encoded_xt).map_err(|e| RpcError {
+			code: ErrorCode::ServerError(Error::DecodeError.into()),
+			message: "Unable to query fee details.".into(),
+			data: Some(format!("{:?}", e).into()),
+		})?;
+		let fee_details = api.query_fee_details(&at, uxt, encoded_len).map_err(|e| RpcError {
+			code: ErrorCode::ServerError(Error::RuntimeError.into()),
+			message: "Unable to query fee details.".into(),
+			data: Some(format!("{:?}", e).into()),
+		})?;
+
+		let try_into_rpc_balance = |value: Balance| value.try_into().map_err(|_| RpcError {
+			code: ErrorCode::InvalidParams,
+			message: format!("{} doesn't fit in NumberOrHex representation", value),
+			data: None,
+		});
+
+		Ok(FeeDetails {
+			inclusion_fee: if let Some(inclusion_fee) = fee_details.inclusion_fee {
+				Some(InclusionFee {
+					base_fee: try_into_rpc_balance(inclusion_fee.base_fee)?,
+					len_fee: try_into_rpc_balance(inclusion_fee.len_fee)?,
+					adjusted_weight_fee: try_into_rpc_balance(inclusion_fee.adjusted_weight_fee)?,
+				})
+			} else {
+				None
+			},
+			tip: Default::default(),
+		})
+	}
 }
diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
index 932aaf43dc9d..c55eb333237c 100644
--- a/frame/transaction-payment/src/lib.rs
+++ b/frame/transaction-payment/src/lib.rs
@@ -19,11 +19,25 @@
 //!
 //! This module provides the basic logic needed to pay the absolute minimum amount needed for a
 //! transaction to be included. This includes:
+//!   - _base fee_: This is the minimum amount a user pays for a transaction. It is declared
+//! 	as a base _weight_ in the runtime and converted to a fee using `WeightToFee`.
 //!   - _weight fee_: A fee proportional to amount of weight a transaction consumes.
 //!   - _length fee_: A fee proportional to the encoded length of the transaction.
 //!   - _tip_: An optional tip. Tip increases the priority of the transaction, giving it a higher
 //!     chance to be included by the transaction queue.
 //!
+//! The base fee and adjusted weight and length fees constitute the _inclusion fee_, which is
+//! the minimum fee for a transaction to be included in a block.
+//!
+//! The formula of final fee:
+//!   ```ignore
+//!   inclusion_fee = base_fee + length_fee + [targeted_fee_adjustment * weight_fee];
+//!   final_fee = inclusion_fee + tip;
+//!   ```
+//!
+//!   - `targeted_fee_adjustment`: This is a multiplier that can tune the final fee based on
+//! 	the congestion of the network.
+//!
 //! Additionally, this module allows one to configure:
 //!   - The mapping between one unit of weight to one unit of fee via [`Config::WeightToFee`].
 //!   - A means of updating the fee for the next block, via defining a multiplier, based on the
@@ -54,10 +68,12 @@ use sp_runtime::{
 		DispatchInfoOf, PostDispatchInfoOf,
 	},
 };
-use pallet_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo;
 
 mod payment;
+mod types;
+
 pub use payment::*;
+pub use types::{InclusionFee, FeeDetails, RuntimeDispatchInfo};
 
 /// Fee multiplier.
 pub type Multiplier = FixedU128;
@@ -329,27 +345,19 @@ impl<T: Config> Module<T> where
 		RuntimeDispatchInfo { weight, class, partial_fee }
 	}
 
+	/// Query the detailed fee of a given `call`.
+	pub fn query_fee_details<Extrinsic: GetDispatchInfo>(
+		unchecked_extrinsic: Extrinsic,
+		len: u32,
+	) -> FeeDetails<BalanceOf<T>>
+	where
+		T::Call: Dispatchable<Info=DispatchInfo>,
+	{
+		let dispatch_info = <Extrinsic as GetDispatchInfo>::get_dispatch_info(&unchecked_extrinsic);
+		Self::compute_fee_details(len, &dispatch_info, 0u32.into())
+	}
+
 	/// Compute the final fee value for a particular transaction.
-	///
-	/// The final fee is composed of:
-	///   - `base_fee`: This is the minimum amount a user pays for a transaction. It is declared
-	///     as a base _weight_ in the runtime and converted to a fee using `WeightToFee`.
-	///   - `len_fee`: The length fee, the amount paid for the encoded length (in bytes) of the
-	///     transaction.
-	///   - `weight_fee`: This amount is computed based on the weight of the transaction. Weight
-	///     accounts for the execution time of a transaction.
-	///   - `targeted_fee_adjustment`: This is a multiplier that can tune the final fee based on
-	///     the congestion of the network.
-	///   - (Optional) `tip`: If included in the transaction, the tip will be added on top. Only
-	///     signed transactions can have a tip.
-	///
-	/// The base fee and adjusted weight and length fees constitute the _inclusion fee,_ which is
-	/// the minimum fee for a transaction to be included in a block.
-	///
-	/// ```ignore
-	/// inclusion_fee = base_fee + len_fee + [targeted_fee_adjustment * weight_fee];
-	/// final_fee = inclusion_fee + tip;
-	/// ```
 	pub fn compute_fee(
 		len: u32,
 		info: &DispatchInfoOf<T::Call>,
@@ -357,13 +365,18 @@ impl<T: Config> Module<T> where
 	) -> BalanceOf<T> where
 		T::Call: Dispatchable<Info=DispatchInfo>,
 	{
-		Self::compute_fee_raw(
-			len,
-			info.weight,
-			tip,
-			info.pays_fee,
-			info.class,
-		)
+		Self::compute_fee_details(len, info, tip).final_fee()
+	}
+
+	/// Compute the fee details for a particular transaction.
+	pub fn compute_fee_details(
+		len: u32,
+		info: &DispatchInfoOf<T::Call>,
+		tip: BalanceOf<T>,
+	) -> FeeDetails<BalanceOf<T>> where
+		T::Call: Dispatchable<Info=DispatchInfo>,
+	{
+		Self::compute_fee_raw(len, info.weight, tip, info.pays_fee, info.class)
 	}
 
 	/// Compute the actual post dispatch fee for a particular transaction.
@@ -377,6 +390,18 @@ impl<T: Config> Module<T> where
 		tip: BalanceOf<T>,
 	) -> BalanceOf<T> where
 		T::Call: Dispatchable<Info=DispatchInfo,PostInfo=PostDispatchInfo>,
+	{
+		Self::compute_actual_fee_details(len, info, post_info, tip).final_fee()
+	}
+
+	/// Compute the actual post dispatch fee details for a particular transaction.
+	pub fn compute_actual_fee_details(
+		len: u32,
+		info: &DispatchInfoOf<T::Call>,
+		post_info: &PostDispatchInfoOf<T::Call>,
+		tip: BalanceOf<T>,
+	) -> FeeDetails<BalanceOf<T>> where
+		T::Call: Dispatchable<Info=DispatchInfo,PostInfo=PostDispatchInfo>,
 	{
 		Self::compute_fee_raw(
 			len,
@@ -393,7 +418,7 @@ impl<T: Config> Module<T> where
 		tip: BalanceOf<T>,
 		pays_fee: Pays,
 		class: DispatchClass,
-	) -> BalanceOf<T> {
+	) -> FeeDetails<BalanceOf<T>> {
 		if pays_fee == Pays::Yes {
 			let len = <BalanceOf<T>>::from(len);
 			let per_byte = T::TransactionByteFee::get();
@@ -408,12 +433,19 @@ impl<T: Config> Module<T> where
 			let adjusted_weight_fee = multiplier.saturating_mul_int(unadjusted_weight_fee);
 
 			let base_fee = Self::weight_to_fee(T::BlockWeights::get().get(class).base_extrinsic);
-			base_fee
-				.saturating_add(fixed_len_fee)
-				.saturating_add(adjusted_weight_fee)
-				.saturating_add(tip)
+			FeeDetails {
+				inclusion_fee: Some(InclusionFee {
+					base_fee,
+					len_fee: fixed_len_fee,
+					adjusted_weight_fee
+				}),
+				tip
+			}
 		} else {
-			tip
+			FeeDetails {
+				inclusion_fee: None,
+				tip
+			}
 		}
 	}
 
@@ -578,7 +610,6 @@ mod tests {
 		traits::Currency,
 	};
 	use pallet_balances::Call as BalancesCall;
-	use pallet_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo;
 	use sp_core::H256;
 	use sp_runtime::{
 		testing::{Header, TestXt},
diff --git a/frame/transaction-payment/src/types.rs b/frame/transaction-payment/src/types.rs
new file mode 100644
index 000000000000..ab771eb8ba5d
--- /dev/null
+++ b/frame/transaction-payment/src/types.rs
@@ -0,0 +1,155 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Types for transaction-payment RPC.
+
+use sp_std::prelude::*;
+use frame_support::weights::{Weight, DispatchClass};
+use codec::{Encode, Decode};
+#[cfg(feature = "std")]
+use serde::{Serialize, Deserialize};
+use sp_runtime::traits::{AtLeast32BitUnsigned, Zero};
+
+/// The base fee and adjusted weight and length fees constitute the _inclusion fee_.
+#[derive(Encode, Decode, Clone, Eq, PartialEq)]
+#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
+#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
+pub struct InclusionFee<Balance> {
+	/// This is the minimum amount a user pays for a transaction. It is declared
+	/// as a base _weight_ in the runtime and converted to a fee using `WeightToFee`.
+	pub base_fee: Balance,
+	/// The length fee, the amount paid for the encoded length (in bytes) of the transaction.
+	pub len_fee: Balance,
+	/// - `targeted_fee_adjustment`: This is a multiplier that can tune the final fee based on
+	///     the congestion of the network.
+	/// - `weight_fee`: This amount is computed based on the weight of the transaction. Weight
+	/// accounts for the execution time of a transaction.
+	///
+	/// adjusted_weight_fee = targeted_fee_adjustment * weight_fee
+	pub adjusted_weight_fee: Balance,
+}
+
+impl<Balance: AtLeast32BitUnsigned + Copy> InclusionFee<Balance> {
+	/// Returns the total of inclusion fee.
+	///
+	/// ```ignore
+	/// inclusion_fee = base_fee + len_fee + adjusted_weight_fee
+	/// ```
+	pub fn inclusion_fee(&self) -> Balance {
+		self.base_fee
+			.saturating_add(self.len_fee)
+			.saturating_add(self.adjusted_weight_fee)
+	}
+}
+
+/// The `FeeDetails` is composed of:
+///   - (Optional) `inclusion_fee`: Only the `Pays::Yes` transaction can have the inclusion fee.
+///   - `tip`: If included in the transaction, the tip will be added on top. Only
+///     signed transactions can have a tip.
+#[derive(Encode, Decode, Clone, Eq, PartialEq)]
+#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
+#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
+pub struct FeeDetails<Balance> {
+	/// The minimum fee for a transaction to be included in a block.
+	pub inclusion_fee: Option<InclusionFee<Balance>>,
+	// Do not serialize and deserialize `tip` as we actually can not pass any tip to the RPC.
+	#[cfg_attr(feature = "std", serde(skip))]
+	pub tip: Balance,
+}
+
+impl<Balance: AtLeast32BitUnsigned + Copy> FeeDetails<Balance> {
+	/// Returns the final fee.
+	///
+	/// ```ignore
+	/// final_fee = inclusion_fee + tip;
+	/// ```
+	pub fn final_fee(&self) -> Balance {
+		self.inclusion_fee.as_ref().map(|i| i.inclusion_fee()).unwrap_or_else(|| Zero::zero()).saturating_add(self.tip)
+	}
+}
+
+/// Information related to a dispatchable's class, weight, and fee that can be queried from the runtime.
+#[derive(Eq, PartialEq, Encode, Decode, Default)]
+#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
+#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
+#[cfg_attr(feature = "std", serde(bound(serialize = "Balance: std::fmt::Display")))]
+#[cfg_attr(feature = "std", serde(bound(deserialize = "Balance: std::str::FromStr")))]
+pub struct RuntimeDispatchInfo<Balance> {
+	/// Weight of this dispatch.
+	pub weight: Weight,
+	/// Class of this dispatch.
+	pub class: DispatchClass,
+	/// The inclusion fee of this dispatch.
+	///
+	/// This does not include a tip or anything else that
+	/// depends on the signature (i.e. depends on a `SignedExtension`).
+	#[cfg_attr(feature = "std", serde(with = "serde_balance"))]
+	pub partial_fee: Balance,
+}
+
+#[cfg(feature = "std")]
+mod serde_balance {
+	use serde::{Deserialize, Serializer, Deserializer};
+
+	pub fn serialize<S: Serializer, T: std::fmt::Display>(t: &T, serializer: S) -> Result<S::Ok, S::Error> {
+		serializer.serialize_str(&t.to_string())
+	}
+
+	pub fn deserialize<'de, D: Deserializer<'de>, T: std::str::FromStr>(deserializer: D) -> Result<T, D::Error> {
+		let s = String::deserialize(deserializer)?;
+		s.parse::<T>().map_err(|_| serde::de::Error::custom("Parse from string failed"))
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+
+	#[test]
+	fn should_serialize_and_deserialize_properly_with_string() {
+		let info = RuntimeDispatchInfo {
+			weight: 5,
+			class: DispatchClass::Normal,
+			partial_fee: 1_000_000_u64,
+		};
+
+		let json_str = r#"{"weight":5,"class":"normal","partialFee":"1000000"}"#;
+
+		assert_eq!(serde_json::to_string(&info).unwrap(), json_str);
+		assert_eq!(serde_json::from_str::<RuntimeDispatchInfo<u64>>(json_str).unwrap(), info);
+
+		// should not panic
+		serde_json::to_value(&info).unwrap();
+	}
+
+	#[test]
+	fn should_serialize_and_deserialize_properly_large_value() {
+		let info = RuntimeDispatchInfo {
+			weight: 5,
+			class: DispatchClass::Normal,
+			partial_fee: u128::max_value(),
+		};
+
+		let json_str = r#"{"weight":5,"class":"normal","partialFee":"340282366920938463463374607431768211455"}"#;
+
+		assert_eq!(serde_json::to_string(&info).unwrap(), json_str);
+		assert_eq!(serde_json::from_str::<RuntimeDispatchInfo<u128>>(json_str).unwrap(), info);
+
+		// should not panic
+		serde_json::to_value(&info).unwrap();
+	}
+}
diff --git a/primitives/rpc/src/number.rs b/primitives/rpc/src/number.rs
index 93d64aa2c37f..ad19b7f5b436 100644
--- a/primitives/rpc/src/number.rs
+++ b/primitives/rpc/src/number.rs
@@ -39,6 +39,12 @@ pub enum NumberOrHex {
 	Hex(U256),
 }
 
+impl Default for NumberOrHex {
+	fn default() -> Self {
+		Self::Number(Default::default())
+	}
+}
+
 impl NumberOrHex {
 	/// Converts this number into an U256.
 	pub fn into_u256(self) -> U256 {
@@ -49,12 +55,24 @@ impl NumberOrHex {
 	}
 }
 
+impl From<u32> for NumberOrHex {
+	fn from(n: u32) -> Self {
+		NumberOrHex::Number(n.into())
+	}
+}
+
 impl From<u64> for NumberOrHex {
 	fn from(n: u64) -> Self {
 		NumberOrHex::Number(n)
 	}
 }
 
+impl From<u128> for NumberOrHex {
+	fn from(n: u128) -> Self {
+		NumberOrHex::Hex(n.into())
+	}
+}
+
 impl From<U256> for NumberOrHex {
 	fn from(n: U256) -> Self {
 		NumberOrHex::Hex(n)
@@ -66,21 +84,21 @@ pub struct TryFromIntError(pub(crate) ());
 
 impl TryFrom<NumberOrHex> for u32 {
 	type Error = TryFromIntError;
-	fn try_from(num_or_hex: NumberOrHex) -> Result<u32, TryFromIntError> {
+	fn try_from(num_or_hex: NumberOrHex) -> Result<u32, Self::Error> {
 		num_or_hex.into_u256().try_into().map_err(|_| TryFromIntError(()))
 	}
 }
 
 impl TryFrom<NumberOrHex> for u64 {
 	type Error = TryFromIntError;
-	fn try_from(num_or_hex: NumberOrHex) -> Result<u64, TryFromIntError> {
+	fn try_from(num_or_hex: NumberOrHex) -> Result<u64, Self::Error> {
 		num_or_hex.into_u256().try_into().map_err(|_| TryFromIntError(()))
 	}
 }
 
 impl TryFrom<NumberOrHex> for u128 {
 	type Error = TryFromIntError;
-	fn try_from(num_or_hex: NumberOrHex) -> Result<u128, TryFromIntError> {
+	fn try_from(num_or_hex: NumberOrHex) -> Result<u128, Self::Error> {
 		num_or_hex.into_u256().try_into().map_err(|_| TryFromIntError(()))
 	}
 }

From fae26bb2eea7bd9d06176d8b269483fd7b610905 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Thu, 14 Jan 2021 13:44:42 +0100
Subject: [PATCH 0266/1194] Use checked math when calculating storage size
 (#7885)

---
 frame/contracts/src/exec.rs         | 36 +++++++++++++----------------
 frame/contracts/src/lib.rs          |  5 ++++
 frame/contracts/src/storage.rs      | 21 ++++++++++-------
 frame/contracts/src/wasm/mod.rs     | 19 +++++++--------
 frame/contracts/src/wasm/runtime.rs |  6 ++---
 5 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index d19408f95c25..05eaf52c1bc9 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -24,7 +24,7 @@ use sp_core::crypto::UncheckedFrom;
 use sp_std::prelude::*;
 use sp_runtime::traits::{Bounded, Zero, Convert, Saturating};
 use frame_support::{
-	dispatch::DispatchError,
+	dispatch::DispatchResult,
 	traits::{ExistenceRequirement, Currency, Time, Randomness},
 	weights::Weight,
 	ensure, StorageMap,
@@ -65,7 +65,7 @@ pub trait Ext {
 
 	/// Sets the storage entry by the given key to the specified value. If `value` is `None` then
 	/// the storage entry is deleted.
-	fn set_storage(&mut self, key: StorageKey, value: Option<Vec<u8>>);
+	fn set_storage(&mut self, key: StorageKey, value: Option<Vec<u8>>) -> DispatchResult;
 
 	/// Instantiate a contract from the given code.
 	///
@@ -85,7 +85,7 @@ pub trait Ext {
 		&mut self,
 		to: &AccountIdOf<Self::T>,
 		value: BalanceOf<Self::T>,
-	) -> Result<(), DispatchError>;
+	) -> DispatchResult;
 
 	/// Transfer all funds to `beneficiary` and delete the contract.
 	///
@@ -97,7 +97,7 @@ pub trait Ext {
 	fn terminate(
 		&mut self,
 		beneficiary: &AccountIdOf<Self::T>,
-	) -> Result<(), DispatchError>;
+	) -> DispatchResult;
 
 	/// Call (possibly transferring some amount of funds) into the specified account.
 	fn call(
@@ -121,7 +121,7 @@ pub trait Ext {
 		code_hash: CodeHash<Self::T>,
 		rent_allowance: BalanceOf<Self::T>,
 		delta: Vec<StorageKey>,
-	) -> Result<(), DispatchError>;
+	) -> DispatchResult;
 
 	/// Returns a reference to the account id of the caller.
 	fn caller(&self) -> &AccountIdOf<Self::T>;
@@ -454,7 +454,7 @@ fn transfer<'a, T: Config, V: Vm<T>, L: Loader<T>>(
 	dest: &T::AccountId,
 	value: BalanceOf<T>,
 	ctx: &mut ExecutionContext<'a, T, V, L>,
-) -> Result<(), DispatchError>
+) -> DispatchResult
 where
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
@@ -520,23 +520,19 @@ where
 		Storage::<T>::read(trie_id, key)
 	}
 
-	fn set_storage(&mut self, key: StorageKey, value: Option<Vec<u8>>) {
+	fn set_storage(&mut self, key: StorageKey, value: Option<Vec<u8>>) -> DispatchResult {
 		let trie_id = self.ctx.self_trie_id.as_ref().expect(
 			"`ctx.self_trie_id` points to an alive contract within the `CallContext`;\
 				it cannot be `None`;\
 				expect can't fail;\
 				qed",
 		);
-		if let Err(storage::ContractAbsentError) =
-			Storage::<T>::write(&self.ctx.self_account, trie_id, &key, value)
-		{
-			panic!(
-				"the contract must be in the alive state within the `CallContext`;\
-				the contract cannot be absent in storage;
-				write cannot return `None`;
-				qed"
-			);
-		}
+		// write panics if the passed account is not alive.
+		// the contract must be in the alive state within the `CallContext`;\
+		// the contract cannot be absent in storage;
+		// write cannot return `None`;
+		// qed
+		Storage::<T>::write(&self.ctx.self_account, trie_id, &key, value)
 	}
 
 	fn instantiate(
@@ -554,7 +550,7 @@ where
 		&mut self,
 		to: &T::AccountId,
 		value: BalanceOf<T>,
-	) -> Result<(), DispatchError> {
+	) -> DispatchResult {
 		transfer(
 			TransferCause::Call,
 			TransactorKind::Contract,
@@ -568,7 +564,7 @@ where
 	fn terminate(
 		&mut self,
 		beneficiary: &AccountIdOf<Self::T>,
-	) -> Result<(), DispatchError> {
+	) -> DispatchResult {
 		let self_id = self.ctx.self_account.clone();
 		let value = T::Currency::free_balance(&self_id);
 		if let Some(caller_ctx) = self.ctx.caller {
@@ -612,7 +608,7 @@ where
 		code_hash: CodeHash<Self::T>,
 		rent_allowance: BalanceOf<Self::T>,
 		delta: Vec<StorageKey>,
-	) -> Result<(), DispatchError> {
+	) -> DispatchResult {
 		if let Some(caller_ctx) = self.ctx.caller {
 			if caller_ctx.is_live(&self.ctx.self_account) {
 				return Err(Error::<T>::ReentranceDenied.into());
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index 2e9b934e4dc1..1c191bfa04ed 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -421,6 +421,11 @@ decl_error! {
 		/// This can be returned from [`Module::claim_surcharge`] because the target
 		/// contract has enough balance to pay for its rent.
 		ContractNotEvictable,
+		/// A storage modification exhausted the 32bit type that holds the storage size.
+		///
+		/// This can either happen when the accumulated storage in bytes is too large or
+		/// when number of storage items is too large.
+		StorageExhausted,
 	}
 }
 
diff --git a/frame/contracts/src/storage.rs b/frame/contracts/src/storage.rs
index b4f3071c1e83..0d4393aa967d 100644
--- a/frame/contracts/src/storage.rs
+++ b/frame/contracts/src/storage.rs
@@ -49,8 +49,6 @@ pub struct DeletedContract {
 	trie_id: TrieId,
 }
 
-
-
 pub struct Storage<T>(PhantomData<T>);
 
 impl<T> Storage<T>
@@ -75,15 +73,19 @@ where
 	/// `read`, this function also requires the `account` ID.
 	///
 	/// If the contract specified by the id `account` doesn't exist `Err` is returned.`
+	///
+	/// # Panics
+	///
+	/// Panics iff the `account` specified is not alive and in storage.
 	pub fn write(
 		account: &AccountIdOf<T>,
 		trie_id: &TrieId,
 		key: &StorageKey,
 		opt_new_value: Option<Vec<u8>>,
-	) -> Result<(), ContractAbsentError> {
+	) -> DispatchResult {
 		let mut new_info = match <ContractInfoOf<T>>::get(account) {
 			Some(ContractInfo::Alive(alive)) => alive,
-			None | Some(ContractInfo::Tombstone(_)) => return Err(ContractAbsentError),
+			None | Some(ContractInfo::Tombstone(_)) => panic!("Contract not found"),
 		};
 
 		let hashed_key = blake2_256(key);
@@ -94,10 +96,12 @@ where
 		// Update the total number of KV pairs and the number of empty pairs.
 		match (&opt_prev_len, &opt_new_value) {
 			(Some(_), None) => {
-				new_info.pair_count -= 1;
+				new_info.pair_count = new_info.pair_count.checked_sub(1)
+					.ok_or_else(|| Error::<T>::StorageExhausted)?;
 			},
 			(None, Some(_)) => {
-				new_info.pair_count += 1;
+				new_info.pair_count = new_info.pair_count.checked_add(1)
+					.ok_or_else(|| Error::<T>::StorageExhausted)?;
 			},
 			(Some(_), Some(_)) => {},
 			(None, None) => {},
@@ -111,8 +115,9 @@ where
 			.unwrap_or(0);
 		new_info.storage_size = new_info
 			.storage_size
-			.saturating_add(new_value_len)
-			.saturating_sub(prev_value_len);
+			.checked_sub(prev_value_len)
+			.and_then(|val| val.checked_add(new_value_len))
+			.ok_or_else(|| Error::<T>::StorageExhausted)?;
 
 		new_info.last_write = Some(<frame_system::Module<T>>::block_number());
 		<ContractInfoOf<T>>::insert(&account, ContractInfo::Alive(new_info));
diff --git a/frame/contracts/src/wasm/mod.rs b/frame/contracts/src/wasm/mod.rs
index e295febb5147..45c927dfaa4b 100644
--- a/frame/contracts/src/wasm/mod.rs
+++ b/frame/contracts/src/wasm/mod.rs
@@ -18,15 +18,15 @@
 //! This module provides a means for executing contracts
 //! represented in wasm.
 
-use crate::{CodeHash, Schedule, Config};
-use crate::wasm::env_def::FunctionImplProvider;
-use crate::exec::Ext;
-use crate::gas::GasMeter;
-
+use crate::{
+	CodeHash, Schedule, Config,
+	wasm::env_def::FunctionImplProvider,
+	exec::Ext,
+	gas::GasMeter,
+};
 use sp_std::prelude::*;
 use sp_core::crypto::UncheckedFrom;
 use codec::{Encode, Decode};
-use sp_sandbox;
 
 #[macro_use]
 mod env_def;
@@ -172,7 +172,7 @@ mod tests {
 	use sp_core::H256;
 	use hex_literal::hex;
 	use sp_runtime::DispatchError;
-	use frame_support::weights::Weight;
+	use frame_support::{dispatch::DispatchResult, weights::Weight};
 	use assert_matches::assert_matches;
 	use pallet_contracts_primitives::{ExecReturnValue, ReturnFlags, ExecError, ErrorOrigin};
 
@@ -228,8 +228,9 @@ mod tests {
 		fn get_storage(&self, key: &StorageKey) -> Option<Vec<u8>> {
 			self.storage.get(key).cloned()
 		}
-		fn set_storage(&mut self, key: StorageKey, value: Option<Vec<u8>>) {
+		fn set_storage(&mut self, key: StorageKey, value: Option<Vec<u8>>) -> DispatchResult {
 			*self.storage.entry(key).or_insert(Vec::new()) = value.unwrap_or(Vec::new());
+			Ok(())
 		}
 		fn instantiate(
 			&mut self,
@@ -362,7 +363,7 @@ mod tests {
 		fn get_storage(&self, key: &[u8; 32]) -> Option<Vec<u8>> {
 			(**self).get_storage(key)
 		}
-		fn set_storage(&mut self, key: [u8; 32], value: Option<Vec<u8>>) {
+		fn set_storage(&mut self, key: [u8; 32], value: Option<Vec<u8>>) -> DispatchResult {
 			(**self).set_storage(key, value)
 		}
 		fn instantiate(
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index 88f51046d9e6..6b459f05193c 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -643,8 +643,7 @@ define_env!(Env, <E: Ext>,
 		let mut key: StorageKey = [0; 32];
 		ctx.read_sandbox_memory_into_buf(key_ptr, &mut key)?;
 		let value = Some(ctx.read_sandbox_memory(value_ptr, value_len)?);
-		ctx.ext.set_storage(key, value);
-		Ok(())
+		ctx.ext.set_storage(key, value).map_err(Into::into)
 	},
 
 	// Clear the value at the given key in the contract storage.
@@ -656,8 +655,7 @@ define_env!(Env, <E: Ext>,
 		ctx.charge_gas(RuntimeToken::ClearStorage)?;
 		let mut key: StorageKey = [0; 32];
 		ctx.read_sandbox_memory_into_buf(key_ptr, &mut key)?;
-		ctx.ext.set_storage(key, None);
-		Ok(())
+		ctx.ext.set_storage(key, None).map_err(Into::into)
 	},
 
 	// Retrieve the value under the given key from storage.

From 1c9a9e4798e10c3eba277eeef143cb4ca12e9bae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Thu, 14 Jan 2021 13:45:13 +0100
Subject: [PATCH 0267/1194] contracts: Cap the surcharge reward by the amount
 of rent that way payed by a contract (#7870)

* Add rent_payed field to the contract info

* Don't pay out more as reward as was spent in rent

* Make successful evictions free

* Add tests to check that surcharge reward is capped by rent payed

* review: Fixed docs
---
 frame/contracts/src/benchmarking/mod.rs | 12 +++-
 frame/contracts/src/lib.rs              | 24 +++++--
 frame/contracts/src/rent.rs             | 29 ++++++---
 frame/contracts/src/storage.rs          |  3 +-
 frame/contracts/src/tests.rs            | 84 ++++++++++++++++++-------
 5 files changed, 112 insertions(+), 40 deletions(-)

diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index b5c0a0da1385..c6fc3bf3ac51 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -250,7 +250,7 @@ where
 	/// Evict this contract.
 	fn evict(&mut self) -> Result<(), &'static str> {
 		self.set_block_num_for_eviction()?;
-		Rent::<T>::snitch_contract_should_be_evicted(&self.contract.account_id, Zero::zero())?;
+		Rent::<T>::try_eviction(&self.contract.account_id, Zero::zero())?;
 		self.contract.ensure_tombstone()
 	}
 }
@@ -406,8 +406,14 @@ benchmarks! {
 		instance.ensure_tombstone()?;
 
 		// the caller should get the reward for being a good snitch
-		assert_eq!(
-			T::Currency::free_balance(&instance.caller),
+		// this is capped by the maximum amount of rent payed. So we only now that it should
+		// have increased by at most the surcharge reward.
+		assert!(
+			T::Currency::free_balance(&instance.caller) >
+			caller_funding::<T>() - instance.endowment
+		);
+		assert!(
+			T::Currency::free_balance(&instance.caller) <
 			caller_funding::<T>() - instance.endowment + <T as Config>::SurchargeReward::get(),
 		);
 	}
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index 1c191bfa04ed..d585ac4f7fab 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -122,6 +122,7 @@ use frame_support::{
 	storage::child::ChildInfo,
 	dispatch::{DispatchResult, DispatchResultWithPostInfo},
 	traits::{OnUnbalanced, Currency, Get, Time, Randomness},
+	weights::Pays,
 };
 use frame_system::{ensure_signed, ensure_root, Module as System};
 use pallet_contracts_primitives::{
@@ -211,6 +212,10 @@ pub struct RawAliveContractInfo<CodeHash, Balance, BlockNumber> {
 	pub code_hash: CodeHash,
 	/// Pay rent at most up to this value.
 	pub rent_allowance: Balance,
+	/// The amount of rent that was payed by the contract over its whole lifetime.
+	///
+	/// A restored contract starts with a value of zero just like a new contract.
+	pub rent_payed: Balance,
 	/// Last block rent has been payed.
 	pub deduct_block: BlockNumber,
 	/// Last block child storage has been written.
@@ -602,8 +607,12 @@ decl_module! {
 			gas_meter.into_dispatch_result(result)
 		}
 
-		/// Allows block producers to claim a small reward for evicting a contract. If a block producer
-		/// fails to do so, a regular users will be allowed to claim the reward.
+		/// Allows block producers to claim a small reward for evicting a contract. If a block
+		/// producer fails to do so, a regular users will be allowed to claim the reward.
+		///
+		/// In case of a successful eviction no fees are charged from the sender. However, the
+		/// reward is capped by the total amount of rent that was payed by the contract while
+		/// it was alive.
 		///
 		/// If contract is not evicted as a result of this call, [`Error::ContractNotEvictable`]
 		/// is returned and the sender is not eligible for the reward.
@@ -612,7 +621,7 @@ decl_module! {
 			origin,
 			dest: T::AccountId,
 			aux_sender: Option<T::AccountId>
-		) -> DispatchResult {
+		) -> DispatchResultWithPostInfo {
 			let origin = origin.into();
 			let (signed, rewarded) = match (origin, aux_sender) {
 				(Ok(frame_system::RawOrigin::Signed(account)), None) => {
@@ -634,8 +643,13 @@ decl_module! {
 			};
 
 			// If poking the contract has lead to eviction of the contract, give out the rewards.
-			if Rent::<T>::snitch_contract_should_be_evicted(&dest, handicap)? {
-				T::Currency::deposit_into_existing(&rewarded, T::SurchargeReward::get()).map(|_| ())
+			if let Some(rent_payed) = Rent::<T>::try_eviction(&dest, handicap)? {
+				T::Currency::deposit_into_existing(
+					&rewarded,
+					T::SurchargeReward::get().min(rent_payed),
+				)
+				.map(|_| Pays::No.into())
+				.map_err(Into::into)
 			} else {
 				Err(Error::<T>::ContractNotEvictable.into())
 			}
diff --git a/frame/contracts/src/rent.rs b/frame/contracts/src/rent.rs
index c67776c9e109..0bf229d49469 100644
--- a/frame/contracts/src/rent.rs
+++ b/frame/contracts/src/rent.rs
@@ -142,7 +142,7 @@ where
 	/// Consider the case for rent payment of the given account and returns a `Verdict`.
 	///
 	/// Use `handicap` in case you want to change the reference block number. (To get more details see
-	/// `snitch_contract_should_be_evicted` ).
+	/// `try_eviction` ).
 	fn consider_case(
 		account: &T::AccountId,
 		current_block_number: T::BlockNumber,
@@ -268,6 +268,7 @@ where
 				let contract_info = ContractInfo::Alive(AliveContractInfo::<T> {
 					rent_allowance: alive_contract_info.rent_allowance - amount.peek(),
 					deduct_block: current_block_number,
+					rent_payed: alive_contract_info.rent_payed.saturating_add(amount.peek()),
 					..alive_contract_info
 				});
 				<ContractInfoOf<T>>::insert(account, &contract_info);
@@ -280,7 +281,7 @@ where
 	/// Make account paying the rent for the current block number
 	///
 	/// This functions does **not** evict the contract. It returns `None` in case the
-	/// contract is in need of eviction. [`snitch_contract_should_be_evicted`] must
+	/// contract is in need of eviction. [`try_eviction`] must
 	/// be called to perform the eviction.
 	pub fn charge(account: &T::AccountId) -> Result<Option<ContractInfo<T>>, DispatchError> {
 		let contract_info = <ContractInfoOf<T>>::get(account);
@@ -301,8 +302,9 @@ where
 
 	/// Process a report that a contract under the given address should be evicted.
 	///
-	/// Enact the eviction right away if the contract should be evicted and return true.
-	/// Otherwise, **do nothing** and return false.
+	/// Enact the eviction right away if the contract should be evicted and return the amount
+	/// of rent that the contract payed over its lifetime.
+	/// Otherwise, **do nothing** and return None.
 	///
 	/// The `handicap` parameter gives a way to check the rent to a moment in the past instead
 	/// of current block. E.g. if the contract is going to be evicted at the current block,
@@ -311,13 +313,13 @@ where
 	///
 	/// NOTE this function performs eviction eagerly. All changes are read and written directly to
 	/// storage.
-	pub fn snitch_contract_should_be_evicted(
+	pub fn try_eviction(
 		account: &T::AccountId,
 		handicap: T::BlockNumber,
-	) -> Result<bool, DispatchError> {
+	) -> Result<Option<BalanceOf<T>>, DispatchError> {
 		let contract = <ContractInfoOf<T>>::get(account);
 		let contract = match contract {
-			None | Some(ContractInfo::Tombstone(_)) => return Ok(false),
+			None | Some(ContractInfo::Tombstone(_)) => return Ok(None),
 			Some(ContractInfo::Alive(contract)) => contract,
 		};
 		let current_block_number = <frame_system::Module<T>>::block_number();
@@ -330,11 +332,17 @@ where
 
 		// Enact the verdict only if the contract gets removed.
 		match verdict {
-			Verdict::Evict { .. } => {
+			Verdict::Evict { ref amount } => {
+				// The outstanding `amount` is withdrawn inside `enact_verdict`.
+				let rent_payed = amount
+					.as_ref()
+					.map(|a| a.peek())
+					.unwrap_or_else(|| <BalanceOf<T>>::zero())
+					.saturating_add(contract.rent_payed);
 				Self::enact_verdict(account, contract, current_block_number, verdict, true)?;
-				Ok(true)
+				Ok(Some(rent_payed))
 			}
-			_ => Ok(false),
+			_ => Ok(None),
 		}
 	}
 
@@ -481,6 +489,7 @@ where
 			pair_count: origin_contract.pair_count,
 			code_hash,
 			rent_allowance,
+			rent_payed: <BalanceOf<T>>::zero(),
 			deduct_block: current_block,
 			last_write,
 		}));
diff --git a/frame/contracts/src/storage.rs b/frame/contracts/src/storage.rs
index 0d4393aa967d..030f62fc4088 100644
--- a/frame/contracts/src/storage.rs
+++ b/frame/contracts/src/storage.rs
@@ -27,7 +27,7 @@ use codec::{Encode, Decode};
 use sp_std::prelude::*;
 use sp_std::marker::PhantomData;
 use sp_io::hashing::blake2_256;
-use sp_runtime::traits::{Bounded, Saturating};
+use sp_runtime::traits::{Bounded, Saturating, Zero};
 use sp_core::crypto::UncheckedFrom;
 use frame_support::{
 	dispatch::DispatchResult,
@@ -181,6 +181,7 @@ where
 						// charge rent for it during instantation.
 						<frame_system::Module<T>>::block_number().saturating_sub(1u32.into()),
 					rent_allowance: <BalanceOf<T>>::max_value(),
+					rent_payed: <BalanceOf<T>>::zero(),
 					pair_count: 0,
 					last_write: None,
 				}
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index 78b1f7e30f82..965cb7e49a0a 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -245,7 +245,7 @@ parameter_types! {
 	pub const DepositPerStorageByte: u64 = 10_000;
 	pub const DepositPerStorageItem: u64 = 10_000;
 	pub RentFraction: Perbill = Perbill::from_rational_approximation(4u32, 10_000u32);
-	pub const SurchargeReward: u64 = 150;
+	pub const SurchargeReward: u64 = 500_000;
 	pub const MaxDepth: u32 = 100;
 	pub const MaxValueSize: u32 = 16_384;
 	pub const DeletionQueueDepth: u32 = 1024;
@@ -392,6 +392,7 @@ fn account_removal_does_not_remove_storage() {
 				deduct_block: System::block_number(),
 				code_hash: H256::repeat_byte(1),
 				rent_allowance: 40,
+				rent_payed: 0,
 				last_write: None,
 			});
 			let _ = Balances::deposit_creating(&ALICE, 110);
@@ -406,6 +407,7 @@ fn account_removal_does_not_remove_storage() {
 				deduct_block: System::block_number(),
 				code_hash: H256::repeat_byte(2),
 				rent_allowance: 40,
+				rent_payed: 0,
 				last_write: None,
 			});
 			let _ = Balances::deposit_creating(&BOB, 110);
@@ -2506,24 +2508,64 @@ fn not_deployed_if_endowment_too_low_for_first_rent() {
 		// blocks to rent
 		* 1;
 
-	ExtBuilder::default()
-		.existential_deposit(50)
-		.build()
-		.execute_with(|| {
-			// Create
-			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm));
-			assert_storage_noop!(assert_err_ignore_postinfo!(Contracts::instantiate(
-					Origin::signed(ALICE),
-					30_000,
-					GAS_LIMIT, code_hash.into(),
-					(BalanceOf::<Test>::from(first_rent) - BalanceOf::<Test>::from(1u32))
-						.encode(), // rent allowance
-					vec![],
-				),
-				Error::<Test>::NewContractNotFunded,
-			));
-			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
-			assert_matches!(ContractInfoOf::<Test>::get(&addr), None);
-		});
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		// Create
+		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
+		assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm));
+		assert_storage_noop!(assert_err_ignore_postinfo!(
+			Contracts::instantiate(
+				Origin::signed(ALICE),
+				30_000,
+				GAS_LIMIT, code_hash.into(),
+				(BalanceOf::<Test>::from(first_rent) - BalanceOf::<Test>::from(1u32))
+					.encode(), // rent allowance
+				vec![],
+			),
+			Error::<Test>::NewContractNotFunded,
+		));
+		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+		assert_matches!(ContractInfoOf::<Test>::get(&addr), None);
+	});
+}
+
+#[test]
+fn surcharge_reward_is_capped() {
+	let (wasm, code_hash) = compile_module::<Test>("set_rent").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
+		assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm));
+		assert_ok!(Contracts::instantiate(
+			Origin::signed(ALICE),
+			30_000,
+			GAS_LIMIT, code_hash.into(),
+			<BalanceOf<Test>>::from(1_000u32).encode(), // rent allowance
+			vec![],
+		));
+		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+		let contract = <ContractInfoOf::<Test>>::get(&addr).unwrap().get_alive().unwrap();
+		let balance = Balances::free_balance(&ALICE);
+		let reward = <Test as Config>::SurchargeReward::get();
+
+		// some rent should have payed due to instantation
+		assert_ne!(contract.rent_payed, 0);
+
+		// the reward should be parameterized sufficiently high to make this test useful
+		assert!(reward > contract.rent_payed);
+
+		// make contract eligible for eviction
+		initialize_block(40);
+
+		// this should have removed the contract
+		assert_ok!(Contracts::claim_surcharge(Origin::none(), addr.clone(), Some(ALICE)));
+
+		// this reward does not take into account the last rent payment collected during eviction
+		let capped_reward = reward.min(contract.rent_payed);
+
+		// this is smaller than the actual reward because it does not take into account the
+		// rent collected during eviction
+		assert!(Balances::free_balance(&ALICE) > balance + capped_reward);
+
+		// the full reward is not payed out because of the cap introduced by rent_payed
+		assert!(Balances::free_balance(&ALICE) < balance + reward);
+	});
 }

From a962daaade5b4d77d5a763a5263b7d99e8fab57b Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Thu, 14 Jan 2021 14:35:46 +0100
Subject: [PATCH 0268/1194] Update the Grafana dashboards (#7886)

---
 .../substrate-networking.json                 | 2063 +++++++----------
 .../substrate-service-tasks.json              |  466 ++--
 2 files changed, 1001 insertions(+), 1528 deletions(-)

diff --git a/.maintain/monitoring/grafana-dashboards/substrate-networking.json b/.maintain/monitoring/grafana-dashboards/substrate-networking.json
index dfc143005493..d2abfd1cb864 100644
--- a/.maintain/monitoring/grafana-dashboards/substrate-networking.json
+++ b/.maintain/monitoring/grafana-dashboards/substrate-networking.json
@@ -1,13 +1,5 @@
 {
   "__inputs": [
-    {
-      "name": "DS_PROMETHEUS",
-      "label": "Prometheus",
-      "description": "",
-      "type": "datasource",
-      "pluginId": "prometheus",
-      "pluginName": "Prometheus"
-    },
     {
       "name": "VAR_METRIC_NAMESPACE",
       "type": "constant",
@@ -17,11 +9,17 @@
     }
   ],
   "__requires": [
+    {
+      "type": "panel",
+      "id": "dashlist",
+      "name": "Dashboard list",
+      "version": ""
+    },
     {
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "6.7.3"
+      "version": "7.3.6"
     },
     {
       "type": "panel",
@@ -29,17 +27,17 @@
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "panel",
-      "id": "heatmap",
-      "name": "Heatmap",
-      "version": ""
-    },
     {
       "type": "datasource",
       "id": "prometheus",
       "name": "Prometheus",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
   "annotations": {
@@ -76,78 +74,162 @@
   "gnetId": null,
   "graphTooltip": 0,
   "id": null,
-  "iteration": 1600780210197,
+  "iteration": 1610462565248,
   "links": [],
   "panels": [
     {
       "datasource": null,
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "gridPos": {
         "h": 1,
-        "w": 24,
+        "w": 12,
         "x": 0,
         "y": 0
       },
-      "id": 167,
-      "title": "Sync",
+      "id": 308,
+      "options": {
+        "content": "",
+        "mode": "markdown"
+      },
+      "pluginVersion": "7.3.6",
+      "repeat": "nodename",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "$nodename",
+      "type": "text"
+    },
+    {
+      "collapsed": false,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 1
+      },
+      "id": 27,
+      "panels": [],
+      "title": "Transport",
       "type": "row"
     },
     {
       "aliasColors": {},
-      "bars": false,
+      "bars": true,
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
-      "fill": 0,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
+      "fill": 1,
       "fillGradient": 0,
       "gridPos": {
-        "h": 5,
-        "w": 24,
+        "h": 6,
+        "w": 12,
         "x": 0,
-        "y": 1
+        "y": 2
       },
       "hiddenSeries": false,
-      "id": 101,
+      "id": 19,
+      "interval": "1m",
       "legend": {
+        "alignAsTable": false,
         "avg": false,
         "current": false,
+        "hideEmpty": false,
         "max": false,
         "min": false,
-        "show": false,
+        "rightSide": false,
+        "show": true,
         "total": false,
         "values": false
       },
-      "lines": true,
+      "lines": false,
       "linewidth": 1,
-      "nullPointMode": "connected",
+      "maxPerRow": 12,
+      "nullPointMode": "null as zero",
       "options": {
-        "dataLinks": []
+        "alertThreshold": true
       },
       "percentage": false,
+      "pluginVersion": "7.3.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
-      "repeat": null,
-      "repeatDirection": "v",
-      "seriesOverrides": [],
+      "repeat": "nodename",
+      "repeatDirection": "h",
+      "seriesOverrides": [
+        {
+          "alias": "established (in)",
+          "color": "#37872D"
+        },
+        {
+          "alias": "established (out)",
+          "color": "#C4162A"
+        },
+        {
+          "alias": "pending (out)",
+          "color": "#FF7383"
+        },
+        {
+          "alias": "closed-recently",
+          "color": "#FADE2A",
+          "steppedLine": true
+        }
+      ],
       "spaceLength": 10,
-      "stack": false,
-      "steppedLine": true,
+      "stack": true,
+      "steppedLine": false,
       "targets": [
         {
-          "expr": "1 - (${metric_namespace}_sub_libp2p_peerset_num_requested{instance=~\"${nodename}\"} - ${metric_namespace}_sub_libp2p_peers_count{instance=~\"${nodename}\"}) / ${metric_namespace}_sub_libp2p_peerset_num_requested{instance=~\"${nodename}\"}",
+          "expr": "(\n  sum(${metric_namespace}_sub_libp2p_connections_opened_total{direction=\"in\", instance=~\"${nodename}\"}) by (instance) -\n  sum(${metric_namespace}_sub_libp2p_connections_closed_total{direction=\"in\", instance=~\"${nodename}\"}) by (instance)\n)\n\n# Because `closed_total` can be null, this serves as fallback\nor on(instance) sum(${metric_namespace}_sub_libp2p_connections_opened_total{direction=\"in\", instance=~\"${nodename}\"}) by (instance)",
+          "format": "time_series",
+          "hide": false,
           "interval": "",
-          "legendFormat": "{{instance}}",
+          "legendFormat": "established (in)",
           "refId": "A"
+        },
+        {
+          "expr": "(\n  sum(${metric_namespace}_sub_libp2p_connections_opened_total{direction=\"out\", instance=~\"${nodename}\"}) by (instance) -\n  sum(${metric_namespace}_sub_libp2p_connections_closed_total{direction=\"out\", instance=~\"${nodename}\"}) by (instance)\n)\n\n# Because `closed_total` can be null, this serves as fallback\nor on(instance) sum(${metric_namespace}_sub_libp2p_connections_opened_total{direction=\"out\", instance=~\"${nodename}\"}) by (instance)",
+          "hide": false,
+          "instant": false,
+          "interval": "",
+          "legendFormat": "established (out)",
+          "refId": "C"
+        },
+        {
+          "expr": "sum by (instance) (${metric_namespace}_sub_libp2p_pending_connections{instance=~\"${nodename}\"})",
+          "hide": false,
+          "interval": "",
+          "legendFormat": "pending (out)",
+          "refId": "B"
+        },
+        {
+          "expr": "sum(rate(${metric_namespace}_sub_libp2p_connections_closed_total{instance=~\"${nodename}\"}[$__interval]))",
+          "hide": false,
+          "interval": "",
+          "legendFormat": "closed-per-sec",
+          "refId": "D"
         }
       ],
       "thresholds": [],
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Number of peer slots filled",
+      "title": "Average transport-level (TCP, QUIC, ...) connections",
       "tooltip": {
         "shared": true,
-        "sort": 1,
+        "sort": 0,
         "value_type": "individual"
       },
       "type": "graph",
@@ -160,10 +242,10 @@
       },
       "yaxes": [
         {
-          "format": "percentunit",
-          "label": null,
+          "format": "short",
+          "label": "Connections",
           "logBase": 1,
-          "max": "1.0",
+          "max": null,
           "min": null,
           "show": true
         },
@@ -181,63 +263,65 @@
         "alignLevel": null
       }
     },
-    {
-      "collapsed": false,
-      "datasource": null,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 6
-      },
-      "id": 29,
-      "panels": [],
-      "repeat": "request_protocol",
-      "title": "Requests (${request_protocol})",
-      "type": "row"
-    },
     {
       "aliasColors": {},
       "bars": false,
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
-        "h": 4,
+        "h": 6,
         "w": 12,
         "x": 0,
-        "y": 7
+        "y": 8
       },
       "hiddenSeries": false,
-      "id": 148,
+      "id": 189,
+      "interval": "1m",
       "legend": {
+        "alignAsTable": false,
         "avg": false,
         "current": false,
+        "hideEmpty": false,
         "max": false,
         "min": false,
-        "show": false,
+        "rightSide": false,
+        "show": true,
         "total": false,
         "values": false
       },
       "lines": true,
       "linewidth": 1,
-      "nullPointMode": "null",
+      "maxPerRow": 12,
+      "nullPointMode": "null as zero",
       "options": {
-        "dataLinks": []
+        "alertThreshold": true
       },
       "percentage": false,
+      "pluginVersion": "7.3.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
+      "repeat": "nodename",
+      "repeatDirection": "h",
       "seriesOverrides": [],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
       "targets": [
         {
-          "expr": "irate(${metric_namespace}_sub_libp2p_requests_out_started_total{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])",
+          "expr": "1 - \n\navg(\n  ${metric_namespace}_sub_libp2p_distinct_peers_connections_opened_total{instance=~\"${nodename}\"} - ${metric_namespace}_sub_libp2p_distinct_peers_connections_closed_total{instance=~\"${nodename}\"}\n) by (instance)\n\n/\n\navg(\r\n  sum(${metric_namespace}_sub_libp2p_connections_opened_total{instance=~\"${nodename}\"}) by (instance) - sum(${metric_namespace}_sub_libp2p_connections_closed_total{instance=~\"${nodename}\"}) by (instance)\r\n) by (instance)",
+          "format": "time_series",
+          "hide": false,
           "interval": "",
           "legendFormat": "{{instance}}",
           "refId": "A"
@@ -247,7 +331,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Requests emitted per second",
+      "title": "Percentage of peers for which we have more than one connection open",
       "tooltip": {
         "shared": true,
         "sort": 2,
@@ -263,8 +347,8 @@
       },
       "yaxes": [
         {
-          "format": "reqps",
-          "label": null,
+          "format": "percentunit",
+          "label": "",
           "logBase": 1,
           "max": null,
           "min": null,
@@ -276,7 +360,7 @@
           "logBase": 1,
           "max": null,
           "min": null,
-          "show": true
+          "show": false
         }
       ],
       "yaxis": {
@@ -286,20 +370,28 @@
     },
     {
       "aliasColors": {},
-      "bars": false,
+      "bars": true,
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
-      "fill": 0,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
+      "fill": 1,
       "fillGradient": 0,
       "gridPos": {
-        "h": 4,
+        "h": 6,
         "w": 12,
-        "x": 12,
-        "y": 7
+        "x": 0,
+        "y": 14
       },
       "hiddenSeries": false,
-      "id": 151,
+      "id": 39,
+      "interval": "1m",
       "legend": {
         "avg": false,
         "current": false,
@@ -309,33 +401,47 @@
         "total": false,
         "values": false
       },
-      "lines": true,
+      "lines": false,
       "linewidth": 1,
-      "nullPointMode": "null",
+      "nullPointMode": "null as zero",
       "options": {
-        "dataLinks": []
+        "alertThreshold": true
       },
       "percentage": false,
+      "pluginVersion": "7.3.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
-      "seriesOverrides": [],
+      "repeat": "nodename",
+      "seriesOverrides": [
+        {
+          "alias": "/.*/",
+          "color": "#FF780A"
+        }
+      ],
       "spaceLength": 10,
-      "stack": false,
+      "stack": true,
       "steppedLine": false,
       "targets": [
         {
-          "expr": "irate(${metric_namespace}_sub_libp2p_requests_in_success_total_count{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])",
+          "expr": "rate(${metric_namespace}_sub_libp2p_incoming_connections_handshake_errors_total{instance=~\"${nodename}\"}[$__interval])",
+          "hide": false,
           "interval": "",
-          "legendFormat": "{{instance}}",
+          "legendFormat": "{{reason}}",
           "refId": "A"
+        },
+        {
+          "expr": "rate(${metric_namespace}_sub_libp2p_listeners_errors_total{instance=~\"${nodename}\"}[$__interval])",
+          "interval": "",
+          "legendFormat": "pre-handshake",
+          "refId": "B"
         }
       ],
       "thresholds": [],
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Requests served per second",
+      "title": "Number of incoming connection errors",
       "tooltip": {
         "shared": true,
         "sort": 2,
@@ -351,8 +457,8 @@
       },
       "yaxes": [
         {
-          "format": "reqps",
-          "label": null,
+          "format": "short",
+          "label": "Errors",
           "logBase": 1,
           "max": null,
           "min": null,
@@ -364,7 +470,7 @@
           "logBase": 1,
           "max": null,
           "min": null,
-          "show": true
+          "show": false
         }
       ],
       "yaxis": {
@@ -378,56 +484,64 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
-      "fill": 0,
+      "description": "Each bucket represent a certain number of nodes using a certain bandwidth range.",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "fill": 1,
       "fillGradient": 0,
       "gridPos": {
-        "h": 4,
+        "h": 6,
         "w": 12,
         "x": 0,
-        "y": 11
+        "y": 20
       },
       "hiddenSeries": false,
-      "id": 256,
+      "id": 4,
       "legend": {
         "avg": false,
         "current": false,
         "max": false,
         "min": false,
-        "show": false,
+        "show": true,
         "total": false,
         "values": false
       },
       "lines": true,
       "linewidth": 1,
-      "nullPointMode": "null as zero",
+      "nullPointMode": "null",
       "options": {
-        "dataLinks": []
+        "alertThreshold": true
       },
       "percentage": false,
+      "pluginVersion": "7.3.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
+      "repeat": "nodename",
       "seriesOverrides": [],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
       "targets": [
         {
-          "expr": "histogram_quantile(0.5, sum(rate(${metric_namespace}_sub_libp2p_requests_out_success_total_bucket{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])) by (instance, le)) > 0",
-          "instant": false,
+          "expr": "rate(${metric_namespace}_sub_libp2p_network_bytes_total{instance=~\"${nodename}\"}[5m])",
           "interval": "",
-          "legendFormat": "{{instance}}",
-          "refId": "A"
+          "legendFormat": "{{direction}}",
+          "refId": "B"
         }
       ],
       "thresholds": [],
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Median request answer time",
+      "title": "Network bandwidth - # bytes per second",
       "tooltip": {
         "shared": true,
-        "sort": 2,
+        "sort": 0,
         "value_type": "individual"
       },
       "type": "graph",
@@ -440,7 +554,7 @@
       },
       "yaxes": [
         {
-          "format": "s",
+          "format": "short",
           "label": null,
           "logBase": 1,
           "max": null,
@@ -463,48 +577,63 @@
     },
     {
       "aliasColors": {},
-      "bars": false,
+      "bars": true,
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
-      "fill": 0,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
+      "fill": 1,
       "fillGradient": 0,
       "gridPos": {
-        "h": 4,
+        "h": 7,
         "w": 12,
-        "x": 12,
-        "y": 11
+        "x": 0,
+        "y": 26
       },
       "hiddenSeries": false,
-      "id": 258,
+      "id": 81,
+      "interval": "1m",
       "legend": {
+        "alignAsTable": false,
         "avg": false,
         "current": false,
+        "hideEmpty": true,
+        "hideZero": true,
         "max": false,
         "min": false,
-        "show": false,
+        "rightSide": false,
+        "show": true,
         "total": false,
         "values": false
       },
-      "lines": true,
+      "lines": false,
       "linewidth": 1,
-      "nullPointMode": "null",
+      "nullPointMode": "null as zero",
       "options": {
-        "dataLinks": []
+        "alertThreshold": true
       },
       "percentage": false,
+      "pluginVersion": "7.3.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
+      "repeat": "nodename",
+      "repeatDirection": "h",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "stack": false,
+      "stack": true,
       "steppedLine": false,
       "targets": [
         {
-          "expr": "histogram_quantile(0.5, sum(rate(${metric_namespace}_sub_libp2p_requests_in_success_total_bucket{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])) by (instance, le))",
+          "expr": "rate(${metric_namespace}_sub_libp2p_pending_connections_errors_total{instance=~\"${nodename}\"}[$__interval])",
           "interval": "",
-          "legendFormat": "{{instance}}",
+          "legendFormat": "{{reason}}",
           "refId": "A"
         }
       ],
@@ -512,7 +641,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Median request serving time",
+      "title": "Dialing attempt errors",
       "tooltip": {
         "shared": true,
         "sort": 2,
@@ -528,7 +657,7 @@
       },
       "yaxes": [
         {
-          "format": "s",
+          "format": "short",
           "label": null,
           "logBase": 1,
           "max": null,
@@ -541,7 +670,7 @@
           "logBase": 1,
           "max": null,
           "min": null,
-          "show": true
+          "show": false
         }
       ],
       "yaxis": {
@@ -551,49 +680,60 @@
     },
     {
       "aliasColors": {},
-      "bars": false,
+      "bars": true,
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
-      "fill": 0,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
+      "fill": 1,
       "fillGradient": 0,
       "gridPos": {
-        "h": 4,
+        "h": 7,
         "w": 12,
         "x": 0,
-        "y": 15
+        "y": 33
       },
       "hiddenSeries": false,
-      "id": 257,
+      "id": 46,
+      "interval": "1m",
       "legend": {
         "avg": false,
         "current": false,
         "max": false,
         "min": false,
-        "show": false,
+        "show": true,
         "total": false,
         "values": false
       },
-      "lines": true,
+      "lines": false,
       "linewidth": 1,
+      "maxPerRow": 12,
       "nullPointMode": "null as zero",
       "options": {
-        "dataLinks": []
+        "alertThreshold": true
       },
       "percentage": false,
+      "pluginVersion": "7.3.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
+      "repeat": "nodename",
+      "repeatDirection": "h",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "stack": false,
+      "stack": true,
       "steppedLine": false,
       "targets": [
         {
-          "expr": "histogram_quantile(0.99, sum(rate(${metric_namespace}_sub_libp2p_requests_out_success_total_bucket{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])) by (instance, le)) > 0",
-          "instant": false,
+          "expr": "rate(${metric_namespace}_sub_libp2p_connections_closed_total{instance=~\"${nodename}\"}[$__interval])",
           "interval": "",
-          "legendFormat": "{{instance}}",
+          "legendFormat": "{{reason}} ({{direction}})",
           "refId": "A"
         }
       ],
@@ -601,7 +741,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "99th percentile request answer time",
+      "title": "Disconnects",
       "tooltip": {
         "shared": true,
         "sort": 2,
@@ -617,8 +757,9 @@
       },
       "yaxes": [
         {
-          "format": "s",
-          "label": null,
+          "decimals": null,
+          "format": "short",
+          "label": "Disconnects",
           "logBase": 1,
           "max": null,
           "min": null,
@@ -630,7 +771,7 @@
           "logBase": 1,
           "max": null,
           "min": null,
-          "show": true
+          "show": false
         }
       ],
       "yaxis": {
@@ -638,22 +779,44 @@
         "alignLevel": null
       }
     },
+    {
+      "collapsed": false,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 40
+      },
+      "id": 167,
+      "panels": [],
+      "repeat": null,
+      "title": "Sync",
+      "type": "row"
+    },
     {
       "aliasColors": {},
       "bars": false,
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
-        "h": 4,
+        "h": 5,
         "w": 12,
-        "x": 12,
-        "y": 15
+        "x": 0,
+        "y": 41
       },
       "hiddenSeries": false,
-      "id": 259,
+      "id": 101,
       "legend": {
         "avg": false,
         "current": false,
@@ -665,34 +828,43 @@
       },
       "lines": true,
       "linewidth": 1,
-      "nullPointMode": "null as zero",
+      "nullPointMode": "connected",
       "options": {
-        "dataLinks": []
+        "alertThreshold": true
       },
       "percentage": false,
+      "pluginVersion": "7.3.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
+      "repeat": "nodename",
+      "repeatDirection": "h",
       "seriesOverrides": [],
       "spaceLength": 10,
       "stack": false,
-      "steppedLine": false,
+      "steppedLine": true,
       "targets": [
         {
-          "expr": "histogram_quantile(0.99, sum(rate(${metric_namespace}_sub_libp2p_requests_in_success_total_bucket{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])) by (instance, le))",
+          "expr": "${metric_namespace}_sub_libp2p_peerset_num_requested{instance=~\"${nodename}\"}",
           "interval": "",
-          "legendFormat": "{{instance}}",
+          "legendFormat": "peers-requested",
           "refId": "A"
+        },
+        {
+          "expr": "polkadot_sub_libp2p_peers_count{instance=~\"${nodename}.*\"}",
+          "interval": "",
+          "legendFormat": "peers-count",
+          "refId": "B"
         }
       ],
       "thresholds": [],
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "99th percentile request serving time",
+      "title": "Number of peer slots filled",
       "tooltip": {
-        "shared": false,
-        "sort": 2,
+        "shared": true,
+        "sort": 1,
         "value_type": "individual"
       },
       "type": "graph",
@@ -705,11 +877,11 @@
       },
       "yaxes": [
         {
-          "format": "s",
+          "format": "none",
           "label": null,
           "logBase": 1,
           "max": null,
-          "min": null,
+          "min": "0",
           "show": true
         },
         {
@@ -718,7 +890,7 @@
           "logBase": 1,
           "max": null,
           "min": null,
-          "show": true
+          "show": false
         }
       ],
       "yaxis": {
@@ -726,22 +898,44 @@
         "alignLevel": null
       }
     },
+    {
+      "collapsed": false,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 46
+      },
+      "id": 29,
+      "panels": [],
+      "repeat": "request_protocol",
+      "title": "Requests (${request_protocol})",
+      "type": "row"
+    },
     {
       "aliasColors": {},
       "bars": false,
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
         "h": 4,
         "w": 12,
         "x": 0,
-        "y": 19
+        "y": 47
       },
       "hiddenSeries": false,
-      "id": 287,
+      "id": 148,
       "legend": {
         "avg": false,
         "current": false,
@@ -753,24 +947,25 @@
       },
       "lines": true,
       "linewidth": 1,
-      "nullPointMode": "null as zero",
+      "nullPointMode": "null",
       "options": {
-        "dataLinks": []
+        "alertThreshold": true
       },
       "percentage": false,
+      "pluginVersion": "7.3.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
+      "repeat": "nodename",
       "seriesOverrides": [],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
       "targets": [
         {
-          "expr": "avg(irate(${metric_namespace}_sub_libp2p_requests_out_failure_total{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])) by (reason)",
-          "instant": false,
+          "expr": "irate(${metric_namespace}_sub_libp2p_requests_out_started_total{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])",
           "interval": "",
-          "legendFormat": "{{reason}}",
+          "legendFormat": "{{instance}}",
           "refId": "A"
         }
       ],
@@ -778,7 +973,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Outgoing request failures per second",
+      "title": "Requests emitted per second",
       "tooltip": {
         "shared": true,
         "sort": 2,
@@ -794,7 +989,7 @@
       },
       "yaxes": [
         {
-          "format": "short",
+          "format": "reqps",
           "label": null,
           "logBase": 1,
           "max": null,
@@ -821,16 +1016,23 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
         "h": 4,
         "w": 12,
-        "x": 12,
-        "y": 19
+        "x": 0,
+        "y": 51
       },
       "hiddenSeries": false,
-      "id": 286,
+      "id": 151,
       "legend": {
         "avg": false,
         "current": false,
@@ -842,24 +1044,25 @@
       },
       "lines": true,
       "linewidth": 1,
-      "nullPointMode": "null as zero",
+      "nullPointMode": "null",
       "options": {
-        "dataLinks": []
+        "alertThreshold": true
       },
       "percentage": false,
+      "pluginVersion": "7.3.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
+      "repeat": "nodename",
       "seriesOverrides": [],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
       "targets": [
         {
-          "expr": "avg(irate(${metric_namespace}_sub_libp2p_requests_in_failure_total{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])) by (reason)",
-          "instant": false,
+          "expr": "irate(${metric_namespace}_sub_libp2p_requests_in_success_total_count{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])",
           "interval": "",
-          "legendFormat": "{{reason}}",
+          "legendFormat": "{{instance}}",
           "refId": "A"
         }
       ],
@@ -867,7 +1070,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Ingoing request failures per second",
+      "title": "Requests served per second",
       "tooltip": {
         "shared": true,
         "sort": 2,
@@ -883,7 +1086,7 @@
       },
       "yaxes": [
         {
-          "format": "short",
+          "format": "reqps",
           "label": null,
           "logBase": 1,
           "max": null,
@@ -904,79 +1107,60 @@
         "alignLevel": null
       }
     },
-    {
-      "collapsed": false,
-      "datasource": null,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 40
-      },
-      "id": 23,
-      "panels": [],
-      "repeat": "notif_protocol",
-      "title": "Notifications (${notif_protocol})",
-      "type": "row"
-    },
     {
       "aliasColors": {},
       "bars": false,
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
-        "h": 7,
+        "h": 4,
         "w": 12,
         "x": 0,
-        "y": 41
+        "y": 55
       },
       "hiddenSeries": false,
-      "id": 31,
-      "interval": "1m",
+      "id": 256,
       "legend": {
         "avg": false,
         "current": false,
         "max": false,
         "min": false,
-        "rightSide": true,
-        "show": true,
+        "show": false,
         "total": false,
         "values": false
       },
       "lines": true,
       "linewidth": 1,
-      "maxPerRow": 2,
       "nullPointMode": "null as zero",
       "options": {
-        "dataLinks": []
+        "alertThreshold": true
       },
       "percentage": false,
+      "pluginVersion": "7.3.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
-      "repeat": null,
-      "repeatDirection": "v",
-      "seriesOverrides": [
-        {
-          "alias": "/(in)/",
-          "color": "#73BF69"
-        },
-        {
-          "alias": "/(out)/",
-          "color": "#F2495C"
-        }
-      ],
+      "repeat": "nodename",
+      "seriesOverrides": [],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
       "targets": [
         {
-          "expr": "avg by (direction) (irate(${metric_namespace}_sub_libp2p_notifications_sizes_count{instance=~\"${nodename}\", protocol=\"${notif_protocol}\"}[$__interval]))",
+          "expr": "histogram_quantile(0.5, sum(rate(${metric_namespace}_sub_libp2p_requests_out_success_total_bucket{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])) by (instance, le)) > 0",
+          "instant": false,
           "interval": "",
-          "legendFormat": "{{direction}}",
+          "legendFormat": "{{instance}}",
           "refId": "A"
         }
       ],
@@ -984,7 +1168,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Average network notifications per second",
+      "title": "Median request answer time",
       "tooltip": {
         "shared": true,
         "sort": 2,
@@ -1000,8 +1184,8 @@
       },
       "yaxes": [
         {
-          "format": "cps",
-          "label": "Notifs/sec",
+          "format": "s",
+          "label": null,
           "logBase": 1,
           "max": null,
           "min": null,
@@ -1013,7 +1197,7 @@
           "logBase": 1,
           "max": null,
           "min": null,
-          "show": false
+          "show": true
         }
       ],
       "yaxis": {
@@ -1027,62 +1211,53 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
-        "h": 7,
+        "h": 4,
         "w": 12,
-        "x": 12,
-        "y": 41
+        "x": 0,
+        "y": 59
       },
       "hiddenSeries": false,
-      "id": 37,
-      "interval": "1m",
+      "id": 258,
       "legend": {
-        "alignAsTable": false,
         "avg": false,
         "current": false,
-        "hideEmpty": false,
-        "hideZero": false,
         "max": false,
         "min": false,
-        "rightSide": true,
-        "show": true,
+        "show": false,
         "total": false,
         "values": false
       },
       "lines": true,
       "linewidth": 1,
-      "maxPerRow": 2,
-      "nullPointMode": "null as zero",
+      "nullPointMode": "null",
       "options": {
-        "dataLinks": []
+        "alertThreshold": true
       },
       "percentage": false,
+      "pluginVersion": "7.3.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
-      "repeat": null,
-      "repeatDirection": "v",
-      "seriesOverrides": [
-        {
-          "alias": "/(in)/",
-          "color": "#73BF69"
-        },
-        {
-          "alias": "/(out)/",
-          "color": "#F2495C"
-        }
-      ],
+      "repeat": "nodename",
+      "seriesOverrides": [],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
       "targets": [
         {
-          "expr": "avg(irate(${metric_namespace}_sub_libp2p_notifications_sizes_sum{instance=~\"${nodename}\", protocol=\"${notif_protocol}\"}[$__interval])) by (direction)",
-          "instant": false,
+          "expr": "histogram_quantile(0.5, sum(rate(${metric_namespace}_sub_libp2p_requests_in_success_total_bucket{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])) by (instance, le))",
           "interval": "",
-          "legendFormat": "{{direction}}",
+          "legendFormat": "{{instance}}",
           "refId": "A"
         }
       ],
@@ -1090,7 +1265,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Average bandwidth used by notifications",
+      "title": "Median request serving time",
       "tooltip": {
         "shared": true,
         "sort": 2,
@@ -1106,8 +1281,8 @@
       },
       "yaxes": [
         {
-          "format": "Bps",
-          "label": "Bandwidth",
+          "format": "s",
+          "label": null,
           "logBase": 1,
           "max": null,
           "min": null,
@@ -1119,7 +1294,7 @@
           "logBase": 1,
           "max": null,
           "min": null,
-          "show": false
+          "show": true
         }
       ],
       "yaxis": {
@@ -1133,16 +1308,23 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
-      "fill": 1,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
+      "fill": 0,
       "fillGradient": 0,
       "gridPos": {
-        "h": 6,
+        "h": 4,
         "w": 12,
         "x": 0,
-        "y": 48
+        "y": 63
       },
       "hiddenSeries": false,
-      "id": 16,
+      "id": 257,
       "legend": {
         "avg": false,
         "current": false,
@@ -1156,19 +1338,22 @@
       "linewidth": 1,
       "nullPointMode": "null as zero",
       "options": {
-        "dataLinks": []
+        "alertThreshold": true
       },
       "percentage": false,
+      "pluginVersion": "7.3.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
+      "repeat": "nodename",
       "seriesOverrides": [],
       "spaceLength": 10,
       "stack": false,
-      "steppedLine": true,
+      "steppedLine": false,
       "targets": [
         {
-          "expr": "max(${metric_namespace}_sub_libp2p_out_events_notifications_sizes{instance=~\"${nodename}\", protocol=\"${notif_protocol}\", action=\"sent\"} - ignoring(action) ${metric_namespace}_sub_libp2p_out_events_notifications_sizes{instance=~\"${nodename}\", protocol=\"${notif_protocol}\", action=\"received\"}) by (instance) > 0",
+          "expr": "histogram_quantile(0.99, sum(rate(${metric_namespace}_sub_libp2p_requests_out_success_total_bucket{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])) by (instance, le)) > 0",
+          "instant": false,
           "interval": "",
           "legendFormat": "{{instance}}",
           "refId": "A"
@@ -1178,10 +1363,10 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Total sizes of notifications waiting to be delivered to the rest of Substrate",
+      "title": "99th percentile request answer time",
       "tooltip": {
-        "shared": false,
-        "sort": 1,
+        "shared": true,
+        "sort": 2,
         "value_type": "individual"
       },
       "type": "graph",
@@ -1194,7 +1379,7 @@
       },
       "yaxes": [
         {
-          "format": "bytes",
+          "format": "s",
           "label": null,
           "logBase": 1,
           "max": null,
@@ -1207,7 +1392,7 @@
           "logBase": 1,
           "max": null,
           "min": null,
-          "show": false
+          "show": true
         }
       ],
       "yaxis": {
@@ -1221,16 +1406,23 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
-      "fill": 1,
-      "fillGradient": 1,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
+      "fill": 0,
+      "fillGradient": 0,
       "gridPos": {
-        "h": 6,
+        "h": 4,
         "w": 12,
-        "x": 12,
-        "y": 48
+        "x": 0,
+        "y": 67
       },
       "hiddenSeries": false,
-      "id": 21,
+      "id": 259,
       "legend": {
         "avg": false,
         "current": false,
@@ -1244,23 +1436,23 @@
       "linewidth": 1,
       "nullPointMode": "null as zero",
       "options": {
-        "dataLinks": []
+        "alertThreshold": true
       },
       "percentage": false,
-      "pluginVersion": "6.4.5",
+      "pluginVersion": "7.3.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
+      "repeat": "nodename",
       "seriesOverrides": [],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(rate(${metric_namespace}_sub_libp2p_notifications_sizes_sum{instance=~\"${nodename}\", protocol=\"${notif_protocol}\"}[5m])) by (direction, protocol) / sum(rate(${metric_namespace}_sub_libp2p_notifications_sizes_count{instance=~\"${nodename}\", protocol=\"${notif_protocol}\"}[5m])) by (direction, protocol)",
-          "format": "time_series",
+          "expr": "histogram_quantile(0.99, sum(rate(${metric_namespace}_sub_libp2p_requests_in_success_total_bucket{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])) by (instance, le))",
           "interval": "",
-          "legendFormat": "{{direction}}",
+          "legendFormat": "{{instance}}",
           "refId": "A"
         }
       ],
@@ -1268,9 +1460,9 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Average size of sent and received notifications in the past 5 minutes",
+      "title": "99th percentile request serving time",
       "tooltip": {
-        "shared": true,
+        "shared": false,
         "sort": 2,
         "value_type": "individual"
       },
@@ -1284,9 +1476,9 @@
       },
       "yaxes": [
         {
-          "format": "bytes",
-          "label": "Max. notification size",
-          "logBase": 10,
+          "format": "s",
+          "label": null,
+          "logBase": 1,
           "max": null,
           "min": null,
           "show": true
@@ -1297,7 +1489,7 @@
           "logBase": 1,
           "max": null,
           "min": null,
-          "show": false
+          "show": true
         }
       ],
       "yaxis": {
@@ -1311,73 +1503,65 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
-      "description": "99.9% of the time, the output queue size for this protocol is below the given value",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
-        "h": 6,
+        "h": 4,
         "w": 12,
         "x": 0,
-        "y": 54
+        "y": 71
       },
       "hiddenSeries": false,
-      "id": 14,
+      "id": 287,
       "legend": {
-        "alignAsTable": false,
         "avg": false,
-        "current": true,
-        "hideEmpty": false,
-        "hideZero": true,
-        "max": true,
+        "current": false,
+        "max": false,
         "min": false,
-        "rightSide": true,
-        "show": true,
+        "show": false,
         "total": false,
-        "values": true
+        "values": false
       },
       "lines": true,
       "linewidth": 1,
-      "nullPointMode": "null",
+      "nullPointMode": "null as zero",
       "options": {
-        "dataLinks": []
+        "alertThreshold": true
       },
       "percentage": false,
+      "pluginVersion": "7.3.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
-      "seriesOverrides": [
-        {
-          "alias": "max",
-          "fill": 1,
-          "linewidth": 0
-        }
-      ],
+      "repeat": "nodename",
+      "seriesOverrides": [],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
       "targets": [
         {
-          "expr": "histogram_quantile(0.99, sum(rate(${metric_namespace}_sub_libp2p_notifications_queues_size_bucket{instance=~\"${nodename}\", protocol=\"${notif_protocol}\"}[2m])) by (le, instance))",
-          "hide": false,
+          "expr": "avg(irate(${metric_namespace}_sub_libp2p_requests_out_failure_total{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])) by (reason)",
+          "instant": false,
           "interval": "",
-          "legendFormat": "{{protocol}}",
+          "legendFormat": "{{reason}}",
           "refId": "A"
-        },
-        {
-          "expr": "max(histogram_quantile(0.99, sum(rate(${metric_namespace}_sub_libp2p_notifications_queues_size_bucket{instance=~\"${nodename}\", protocol=\"${notif_protocol}\"}[2m])) by (le, instance)))",
-          "interval": "",
-          "legendFormat": "max",
-          "refId": "B"
         }
       ],
       "thresholds": [],
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "99th percentile of queues sizes",
+      "title": "Outgoing request failures per second",
       "tooltip": {
         "shared": true,
-        "sort": 0,
+        "sort": 2,
         "value_type": "individual"
       },
       "type": "graph",
@@ -1393,8 +1577,8 @@
           "format": "short",
           "label": null,
           "logBase": 1,
-          "max": "300",
-          "min": "0",
+          "max": null,
+          "min": null,
           "show": true
         },
         {
@@ -1403,7 +1587,7 @@
           "logBase": 1,
           "max": null,
           "min": null,
-          "show": false
+          "show": true
         }
       ],
       "yaxis": {
@@ -1417,16 +1601,23 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
-      "fill": 1,
-      "fillGradient": 1,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
+      "fill": 0,
+      "fillGradient": 0,
       "gridPos": {
-        "h": 6,
+        "h": 4,
         "w": 12,
-        "x": 12,
-        "y": 54
+        "x": 0,
+        "y": 75
       },
       "hiddenSeries": false,
-      "id": 134,
+      "id": 286,
       "legend": {
         "avg": false,
         "current": false,
@@ -1440,23 +1631,24 @@
       "linewidth": 1,
       "nullPointMode": "null as zero",
       "options": {
-        "dataLinks": []
+        "alertThreshold": true
       },
       "percentage": false,
-      "pluginVersion": "6.4.5",
+      "pluginVersion": "7.3.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
+      "repeat": "nodename",
       "seriesOverrides": [],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
       "targets": [
         {
-          "expr": "histogram_quantile(1.0, sum(rate(${metric_namespace}_sub_libp2p_notifications_sizes_bucket{instance=~\"${nodename}\", protocol=\"${notif_protocol}\"}[5m])) by (direction, le))",
-          "format": "time_series",
+          "expr": "avg(irate(${metric_namespace}_sub_libp2p_requests_in_failure_total{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])) by (reason)",
+          "instant": false,
           "interval": "",
-          "legendFormat": "{{direction}}",
+          "legendFormat": "{{reason}}",
           "refId": "A"
         }
       ],
@@ -1464,7 +1656,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Maximum size of sent and received notifications in the past 5 minutes",
+      "title": "Ingoing request failures per second",
       "tooltip": {
         "shared": true,
         "sort": 2,
@@ -1480,9 +1672,9 @@
       },
       "yaxes": [
         {
-          "format": "bytes",
-          "label": "Max. notification size",
-          "logBase": 10,
+          "format": "short",
+          "label": null,
+          "logBase": 1,
           "max": null,
           "min": null,
           "show": true
@@ -1493,7 +1685,7 @@
           "logBase": 1,
           "max": null,
           "min": null,
-          "show": false
+          "show": true
         }
       ],
       "yaxis": {
@@ -1508,117 +1700,81 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 60
+        "y": 79
       },
-      "id": 27,
+      "id": 23,
       "panels": [],
-      "title": "Transport",
+      "repeat": "notif_protocol",
+      "title": "Notifications (${notif_protocol})",
       "type": "row"
     },
     {
       "aliasColors": {},
-      "bars": true,
+      "bars": false,
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
         "h": 6,
-        "w": 24,
+        "w": 12,
         "x": 0,
-        "y": 61
+        "y": 80
       },
       "hiddenSeries": false,
-      "id": 19,
-      "interval": "1m",
+      "id": 447,
       "legend": {
-        "alignAsTable": false,
-        "avg": false,
-        "current": false,
-        "hideEmpty": false,
-        "max": false,
-        "min": false,
+        "alignAsTable": true,
+        "avg": true,
+        "current": true,
+        "max": true,
+        "min": true,
         "rightSide": false,
         "show": true,
         "total": false,
-        "values": false
+        "values": true
       },
-      "lines": false,
+      "lines": true,
       "linewidth": 1,
-      "maxPerRow": 2,
       "nullPointMode": "null as zero",
       "options": {
-        "dataLinks": []
+        "alertThreshold": true
       },
       "percentage": false,
+      "pluginVersion": "7.3.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
-      "repeat": null,
-      "repeatDirection": "v",
-      "seriesOverrides": [
-        {
-          "alias": "established (in)",
-          "color": "#37872D"
-        },
-        {
-          "alias": "established (out)",
-          "color": "#C4162A"
-        },
-        {
-          "alias": "pending (out)",
-          "color": "#FF7383"
-        },
-        {
-          "alias": "closed-recently",
-          "color": "#FADE2A",
-          "steppedLine": true
-        }
-      ],
+      "repeat": "nodename",
+      "repeatDirection": "h",
+      "seriesOverrides": [],
       "spaceLength": 10,
-      "stack": true,
+      "stack": false,
       "steppedLine": false,
       "targets": [
         {
-          "expr": "avg(sum(${metric_namespace}_sub_libp2p_connections_opened_total{direction=\"in\", instance=~\"${nodename}\"}) by (instance) - sum(${metric_namespace}_sub_libp2p_connections_closed_total{direction=\"in\", instance=~\"${nodename}\"}) by (instance))",
-          "format": "time_series",
-          "hide": false,
-          "interval": "",
-          "legendFormat": "established (in)",
-          "refId": "A"
-        },
-        {
-          "expr": "avg(sum(${metric_namespace}_sub_libp2p_connections_opened_total{direction=\"out\", instance=~\"${nodename}\"}) by (instance) - sum(${metric_namespace}_sub_libp2p_connections_closed_total{direction=\"out\", instance=~\"${nodename}\"}) by (instance))",
-          "hide": false,
-          "instant": false,
-          "interval": "",
-          "legendFormat": "established (out)",
-          "refId": "C"
-        },
-        {
-          "expr": "avg(sum by (instance) (${metric_namespace}_sub_libp2p_pending_connections{instance=~\"${nodename}\"}))",
-          "hide": false,
+          "expr": "${metric_namespace}_sub_libp2p_notifications_streams_opened_total{instance=~\"${nodename}\", protocol=\"${notif_protocol}\"} - ${metric_namespace}_sub_libp2p_notifications_streams_closed_total{instance=~\"${nodename}\", protocol=\"${notif_protocol}\"}",
           "interval": "",
-          "legendFormat": "pending (out)",
+          "legendFormat": "{{instance}}",
           "refId": "B"
-        },
-        {
-          "expr": "avg(sum by(instance) (increase(${metric_namespace}_sub_libp2p_connections_closed_total{instance=~\"${nodename}\"}[$__interval])))",
-          "hide": false,
-          "interval": "",
-          "legendFormat": "closed-recently",
-          "refId": "D"
         }
       ],
       "thresholds": [],
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Average transport-level (TCP, QUIC, ...) connections per node",
+      "title": "Number of open substreams",
       "tooltip": {
-        "shared": true,
-        "sort": 0,
+        "shared": false,
+        "sort": 1,
         "value_type": "individual"
       },
       "type": "graph",
@@ -1632,7 +1788,7 @@
       "yaxes": [
         {
           "format": "short",
-          "label": "Connections",
+          "label": null,
           "logBase": 1,
           "max": null,
           "min": null,
@@ -1658,52 +1814,66 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
         "h": 6,
-        "w": 24,
+        "w": 12,
         "x": 0,
-        "y": 67
+        "y": 86
       },
       "hiddenSeries": false,
-      "id": 189,
+      "id": 31,
       "interval": "1m",
       "legend": {
-        "alignAsTable": false,
         "avg": false,
         "current": false,
-        "hideEmpty": false,
         "max": false,
         "min": false,
-        "rightSide": false,
+        "rightSide": true,
         "show": true,
         "total": false,
         "values": false
       },
       "lines": true,
       "linewidth": 1,
-      "maxPerRow": 2,
+      "maxPerRow": 12,
       "nullPointMode": "null as zero",
       "options": {
-        "dataLinks": []
+        "alertThreshold": true
       },
       "percentage": false,
+      "pluginVersion": "7.3.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
-      "repeatDirection": "v",
-      "seriesOverrides": [],
+      "repeat": "nodename",
+      "repeatDirection": "h",
+      "seriesOverrides": [
+        {
+          "alias": "/(in)/",
+          "color": "#73BF69"
+        },
+        {
+          "alias": "/(out)/",
+          "color": "#F2495C"
+        }
+      ],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
       "targets": [
         {
-          "expr": "1 - \n\navg(\n  ${metric_namespace}_sub_libp2p_distinct_peers_connections_opened_total{instance=~\"${nodename}\"} - ${metric_namespace}_sub_libp2p_distinct_peers_connections_closed_total{instance=~\"${nodename}\"}\n) by (instance)\n\n/\n\navg(\r\n  sum(${metric_namespace}_sub_libp2p_connections_opened_total{instance=~\"${nodename}\"}) by (instance) - sum(${metric_namespace}_sub_libp2p_connections_closed_total{instance=~\"${nodename}\"}) by (instance)\r\n) by (instance)",
-          "format": "time_series",
-          "hide": false,
+          "expr": "avg by (direction) (irate(${metric_namespace}_sub_libp2p_notifications_sizes_count{instance=~\"${nodename}\", protocol=\"${notif_protocol}\"}[$__interval]))",
           "interval": "",
-          "legendFormat": "{{instance}}",
+          "legendFormat": "{{direction}}",
           "refId": "A"
         }
       ],
@@ -1711,7 +1881,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Percentage of peers for which we have more than one connection open",
+      "title": "Average network notifications per second",
       "tooltip": {
         "shared": true,
         "sort": 2,
@@ -1725,686 +1895,10 @@
         "show": true,
         "values": []
       },
-      "yaxes": [
-        {
-          "format": "percentunit",
-          "label": "",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": false
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": true,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "$data_source",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 12,
-        "x": 0,
-        "y": 73
-      },
-      "hiddenSeries": false,
-      "id": 39,
-      "interval": "1m",
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": false,
-      "linewidth": 1,
-      "nullPointMode": "null as zero",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [
-        {
-          "alias": "/.*/",
-          "color": "#FF780A"
-        }
-      ],
-      "spaceLength": 10,
-      "stack": true,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "avg(increase(${metric_namespace}_sub_libp2p_incoming_connections_handshake_errors_total{instance=~\"${nodename}\"}[$__interval])) by (reason)",
-          "interval": "",
-          "legendFormat": "{{reason}}",
-          "refId": "A"
-        },
-        {
-          "expr": "avg(increase(${metric_namespace}_sub_libp2p_listeners_errors_total{instance=~\"${nodename}\"}[$__interval]))",
-          "interval": "",
-          "legendFormat": "pre-handshake",
-          "refId": "B"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Number of incoming connection errors, averaged by node",
-      "tooltip": {
-        "shared": true,
-        "sort": 2,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": "Errors",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": false
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "cards": {
-        "cardPadding": null,
-        "cardRound": null
-      },
-      "color": {
-        "cardColor": "#b4ff00",
-        "colorScale": "sqrt",
-        "colorScheme": "interpolateOranges",
-        "exponent": 0.5,
-        "max": 100,
-        "min": 0,
-        "mode": "spectrum"
-      },
-      "dataFormat": "timeseries",
-      "datasource": "$data_source",
-      "description": "Each bucket represent a certain number of nodes using a certain bandwidth range.",
-      "gridPos": {
-        "h": 6,
-        "w": 12,
-        "x": 12,
-        "y": 73
-      },
-      "heatmap": {},
-      "hideZeroBuckets": false,
-      "highlightCards": true,
-      "id": 4,
-      "legend": {
-        "show": false
-      },
-      "reverseYBuckets": false,
-      "targets": [
-        {
-          "expr": "${metric_namespace}_network_per_sec_bytes{instance=~\"${nodename}\"}",
-          "format": "time_series",
-          "interval": "",
-          "legendFormat": "",
-          "refId": "A"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Heatmap of network bandwidth",
-      "tooltip": {
-        "show": true,
-        "showHistogram": false
-      },
-      "type": "heatmap",
-      "xAxis": {
-        "show": true
-      },
-      "xBucketNumber": null,
-      "xBucketSize": "2.5m",
-      "yAxis": {
-        "decimals": null,
-        "format": "Bps",
-        "logBase": 1,
-        "max": null,
-        "min": null,
-        "show": true,
-        "splitFactor": null
-      },
-      "yBucketBound": "auto",
-      "yBucketNumber": null,
-      "yBucketSize": null
-    },
-    {
-      "aliasColors": {},
-      "bars": true,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "$data_source",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 7,
-        "w": 12,
-        "x": 0,
-        "y": 79
-      },
-      "hiddenSeries": false,
-      "id": 81,
-      "interval": "1m",
-      "legend": {
-        "alignAsTable": false,
-        "avg": false,
-        "current": false,
-        "hideEmpty": true,
-        "hideZero": true,
-        "max": false,
-        "min": false,
-        "rightSide": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": false,
-      "linewidth": 1,
-      "nullPointMode": "null as zero",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "repeat": null,
-      "repeatDirection": "v",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": true,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "avg(increase(${metric_namespace}_sub_libp2p_pending_connections_errors_total{instance=~\"${nodename}\"}[$__interval])) by (reason)",
-          "interval": "",
-          "legendFormat": "{{reason}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Dialing attempt errors, averaged per node",
-      "tooltip": {
-        "shared": true,
-        "sort": 2,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": false
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": true,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "$data_source",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 7,
-        "w": 12,
-        "x": 12,
-        "y": 79
-      },
-      "hiddenSeries": false,
-      "id": 46,
-      "interval": "1m",
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": false,
-      "linewidth": 1,
-      "maxPerRow": 2,
-      "nullPointMode": "null as zero",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "repeat": null,
-      "repeatDirection": "v",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": true,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "avg(increase(${metric_namespace}_sub_libp2p_connections_closed_total{instance=~\"${nodename}\"}[$__interval])) by (reason)",
-          "interval": "",
-          "legendFormat": "{{reason}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Disconnects, averaged per node",
-      "tooltip": {
-        "shared": true,
-        "sort": 2,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "decimals": null,
-          "format": "short",
-          "label": "Disconnects",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": false
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "collapsed": false,
-      "datasource": null,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 86
-      },
-      "id": 52,
-      "panels": [],
-      "title": "GrandPa",
-      "type": "row"
-    },
-    {
-      "aliasColors": {},
-      "bars": true,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "$data_source",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 24,
-        "x": 0,
-        "y": 87
-      },
-      "hiddenSeries": false,
-      "id": 54,
-      "interval": "1m",
-      "legend": {
-        "alignAsTable": true,
-        "avg": false,
-        "current": false,
-        "hideEmpty": true,
-        "hideZero": true,
-        "max": false,
-        "min": false,
-        "rightSide": true,
-        "show": true,
-        "total": true,
-        "values": true
-      },
-      "lines": false,
-      "linewidth": 1,
-      "nullPointMode": "null as zero",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "repeat": null,
-      "repeatDirection": "v",
-      "seriesOverrides": [
-        {
-          "alias": "/discard/",
-          "color": "#FA6400",
-          "zindex": -2
-        },
-        {
-          "alias": "/keep/",
-          "color": "#73BF69",
-          "zindex": 2
-        },
-        {
-          "alias": "/process_and_discard/",
-          "color": "#5794F2"
-        }
-      ],
-      "spaceLength": 10,
-      "stack": true,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "avg(increase(${metric_namespace}_finality_grandpa_communication_gossip_validator_messages{instance=~\"${nodename}\"}[$__interval])) by (action, message)",
-          "interval": "",
-          "legendFormat": "{{message}} => {{action}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "GrandPa messages received from the network, and action",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "collapsed": false,
-      "datasource": null,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 93
-      },
-      "id": 25,
-      "panels": [],
-      "repeat": null,
-      "title": "Kademlia & authority-discovery",
-      "type": "row"
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "$data_source",
-      "description": "",
-      "fill": 0,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 5,
-        "w": 12,
-        "x": 0,
-        "y": 94
-      },
-      "hiddenSeries": false,
-      "id": 33,
-      "legend": {
-        "alignAsTable": false,
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": true,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "sum(${metric_namespace}_sub_libp2p_kbuckets_num_nodes{instance=~\"${nodename}\"}) by (instance)",
-          "format": "time_series",
-          "instant": false,
-          "interval": "",
-          "legendFormat": "{{instance}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Number of entries in Kademlia k-buckets",
-      "tooltip": {
-        "shared": true,
-        "sort": 1,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "max": 0,
-        "min": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": false
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "$data_source",
-      "fill": 0,
-      "fillGradient": 7,
-      "gridPos": {
-        "h": 5,
-        "w": 12,
-        "x": 12,
-        "y": 94
-      },
-      "hiddenSeries": false,
-      "id": 35,
-      "interval": "",
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "rate(${metric_namespace}_sub_libp2p_kademlia_random_queries_total{instance=~\"${nodename}\"}[5m])",
-          "interval": "",
-          "legendFormat": "{{instance}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Kademlia random discovery queries started per second",
-      "tooltip": {
-        "shared": true,
-        "sort": 1,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
       "yaxes": [
         {
           "format": "cps",
-          "label": "Queries per second",
+          "label": "Notifs/sec",
           "logBase": 1,
           "max": null,
           "min": null,
@@ -2430,44 +1924,70 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
-        "h": 4,
+        "h": 6,
         "w": 12,
         "x": 0,
-        "y": 99
+        "y": 92
       },
       "hiddenSeries": false,
-      "id": 111,
+      "id": 37,
+      "interval": "1m",
       "legend": {
+        "alignAsTable": false,
         "avg": false,
         "current": false,
+        "hideEmpty": false,
+        "hideZero": false,
         "max": false,
         "min": false,
-        "show": false,
+        "rightSide": true,
+        "show": true,
         "total": false,
         "values": false
       },
       "lines": true,
       "linewidth": 1,
-      "nullPointMode": "null",
+      "maxPerRow": 12,
+      "nullPointMode": "null as zero",
       "options": {
-        "dataLinks": []
+        "alertThreshold": true
       },
       "percentage": false,
+      "pluginVersion": "7.3.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
-      "seriesOverrides": [],
+      "repeat": "nodename",
+      "repeatDirection": "h",
+      "seriesOverrides": [
+        {
+          "alias": "/(in)/",
+          "color": "#73BF69"
+        },
+        {
+          "alias": "/(out)/",
+          "color": "#F2495C"
+        }
+      ],
       "spaceLength": 10,
       "stack": false,
-      "steppedLine": true,
+      "steppedLine": false,
       "targets": [
         {
-          "expr": "${metric_namespace}_sub_libp2p_kademlia_records_count{instance=~\"${nodename}\"}",
+          "expr": "avg(irate(${metric_namespace}_sub_libp2p_notifications_sizes_sum{instance=~\"${nodename}\", protocol=\"${notif_protocol}\"}[$__interval])) by (direction)",
+          "instant": false,
           "interval": "",
-          "legendFormat": "{{instance}}",
+          "legendFormat": "{{direction}}",
           "refId": "A"
         }
       ],
@@ -2475,10 +1995,10 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Number of Kademlia records",
+      "title": "Average bandwidth used by notifications",
       "tooltip": {
         "shared": true,
-        "sort": 1,
+        "sort": 2,
         "value_type": "individual"
       },
       "type": "graph",
@@ -2491,8 +2011,8 @@
       },
       "yaxes": [
         {
-          "format": "short",
-          "label": null,
+          "format": "Bps",
+          "label": "Bandwidth",
           "logBase": 1,
           "max": null,
           "min": null,
@@ -2518,16 +2038,23 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
-      "fill": 0,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
+      "fill": 1,
       "fillGradient": 0,
       "gridPos": {
-        "h": 4,
+        "h": 6,
         "w": 12,
-        "x": 12,
-        "y": 99
+        "x": 0,
+        "y": 98
       },
       "hiddenSeries": false,
-      "id": 112,
+      "id": 16,
       "legend": {
         "avg": false,
         "current": false,
@@ -2539,21 +2066,23 @@
       },
       "lines": true,
       "linewidth": 1,
-      "nullPointMode": "null",
+      "nullPointMode": "null as zero",
       "options": {
-        "dataLinks": []
+        "alertThreshold": true
       },
       "percentage": false,
+      "pluginVersion": "7.3.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
+      "repeat": "nodename",
       "seriesOverrides": [],
       "spaceLength": 10,
       "stack": false,
-      "steppedLine": false,
+      "steppedLine": true,
       "targets": [
         {
-          "expr": "${metric_namespace}_sub_libp2p_kademlia_records_sizes_total{instance=~\"${nodename}\"}",
+          "expr": "max(${metric_namespace}_sub_libp2p_out_events_notifications_sizes{instance=~\"${nodename}\", protocol=\"${notif_protocol}\", action=\"sent\"} - ignoring(action) ${metric_namespace}_sub_libp2p_out_events_notifications_sizes{instance=~\"${nodename}\", protocol=\"${notif_protocol}\", action=\"received\"}) by (instance) > 0",
           "interval": "",
           "legendFormat": "{{instance}}",
           "refId": "A"
@@ -2563,10 +2092,10 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Total size of Kademlia records",
+      "title": "Total sizes of notifications waiting to be delivered to the rest of Substrate",
       "tooltip": {
-        "shared": true,
-        "sort": 2,
+        "shared": false,
+        "sort": 1,
         "value_type": "individual"
       },
       "type": "graph",
@@ -2606,19 +2135,24 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
-      "description": "",
-      "fill": 0,
-      "fillGradient": 0,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "fillGradient": 1,
       "gridPos": {
-        "h": 5,
+        "h": 6,
         "w": 12,
         "x": 0,
-        "y": 103
+        "y": 104
       },
       "hiddenSeries": false,
-      "id": 211,
+      "id": 21,
       "legend": {
-        "alignAsTable": false,
         "avg": false,
         "current": false,
         "max": false,
@@ -2629,25 +2163,26 @@
       },
       "lines": true,
       "linewidth": 1,
-      "nullPointMode": "null",
+      "nullPointMode": "null as zero",
       "options": {
-        "dataLinks": []
+        "alertThreshold": true
       },
-      "percentage": true,
+      "percentage": false,
+      "pluginVersion": "7.3.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
+      "repeat": "nodename",
       "seriesOverrides": [],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
       "targets": [
         {
-          "expr": "${metric_namespace}_authority_discovery_known_authorities_count{instance=~\"${nodename}\"}",
+          "expr": "sum(rate(${metric_namespace}_sub_libp2p_notifications_sizes_sum{instance=~\"${nodename}\", protocol=\"${notif_protocol}\"}[5m])) by (direction, protocol) / sum(rate(${metric_namespace}_sub_libp2p_notifications_sizes_count{instance=~\"${nodename}\", protocol=\"${notif_protocol}\"}[5m])) by (direction, protocol)",
           "format": "time_series",
-          "instant": false,
           "interval": "",
-          "legendFormat": "{{instance}}",
+          "legendFormat": "{{direction}}",
           "refId": "A"
         }
       ],
@@ -2655,17 +2190,15 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Number of authorities discovered by authority-discovery",
+      "title": "Average size of sent and received notifications in the past 5 minutes",
       "tooltip": {
         "shared": true,
-        "sort": 1,
+        "sort": 2,
         "value_type": "individual"
       },
       "type": "graph",
       "xaxis": {
         "buckets": null,
-        "max": 0,
-        "min": null,
         "mode": "time",
         "name": null,
         "show": true,
@@ -2673,9 +2206,9 @@
       },
       "yaxes": [
         {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
+          "format": "bytes",
+          "label": "Max. notification size",
+          "logBase": 10,
           "max": null,
           "min": null,
           "show": true
@@ -2700,19 +2233,24 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
-      "description": "",
-      "fill": 0,
-      "fillGradient": 0,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "fillGradient": 1,
       "gridPos": {
-        "h": 5,
+        "h": 6,
         "w": 12,
-        "x": 12,
-        "y": 103
+        "x": 0,
+        "y": 110
       },
       "hiddenSeries": false,
-      "id": 233,
+      "id": 134,
       "legend": {
-        "alignAsTable": false,
         "avg": false,
         "current": false,
         "max": false,
@@ -2723,25 +2261,26 @@
       },
       "lines": true,
       "linewidth": 1,
-      "nullPointMode": "null",
+      "nullPointMode": "null as zero",
       "options": {
-        "dataLinks": []
+        "alertThreshold": true
       },
-      "percentage": true,
+      "percentage": false,
+      "pluginVersion": "7.3.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
+      "repeat": "nodename",
       "seriesOverrides": [],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
       "targets": [
         {
-          "expr": "${metric_namespace}_authority_discovery_amount_external_addresses_last_published{instance=~\"${nodename}\"}",
+          "expr": "histogram_quantile(1.0, sum(rate(${metric_namespace}_sub_libp2p_notifications_sizes_bucket{instance=~\"${nodename}\", protocol=\"${notif_protocol}\"}[5m])) by (direction, le))",
           "format": "time_series",
-          "instant": false,
           "interval": "",
-          "legendFormat": "{{instance}}",
+          "legendFormat": "{{direction}}",
           "refId": "A"
         }
       ],
@@ -2749,17 +2288,15 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Number of addresses published by authority-discovery",
+      "title": "Maximum size of sent and received notifications in the past 5 minutes",
       "tooltip": {
         "shared": true,
-        "sort": 1,
+        "sort": 2,
         "value_type": "individual"
       },
       "type": "graph",
       "xaxis": {
         "buckets": null,
-        "max": 0,
-        "min": null,
         "mode": "time",
         "name": null,
         "show": true,
@@ -2767,9 +2304,9 @@
       },
       "yaxes": [
         {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
+          "format": "bytes",
+          "label": "Max. notification size",
+          "logBase": 10,
           "max": null,
           "min": null,
           "show": true
@@ -2794,47 +2331,71 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "description": "99.9% of the time, the output queue size for this protocol is below the given value",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
-        "h": 5,
+        "h": 6,
         "w": 12,
         "x": 0,
-        "y": 108
+        "y": 116
       },
       "hiddenSeries": false,
-      "id": 68,
-      "interval": "1m",
+      "id": 14,
       "legend": {
+        "alignAsTable": false,
         "avg": false,
-        "current": false,
-        "max": false,
+        "current": true,
+        "hideEmpty": false,
+        "hideZero": true,
+        "max": true,
         "min": false,
-        "show": false,
+        "rightSide": true,
+        "show": true,
         "total": false,
-        "values": false
+        "values": true
       },
       "lines": true,
       "linewidth": 1,
-      "nullPointMode": "connected",
+      "nullPointMode": "null",
       "options": {
-        "dataLinks": []
+        "alertThreshold": true
       },
       "percentage": false,
+      "pluginVersion": "7.3.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
-      "repeat": null,
-      "repeatDirection": "v",
-      "seriesOverrides": [],
+      "repeat": "nodename",
+      "seriesOverrides": [
+        {
+          "alias": "max",
+          "fill": 1,
+          "linewidth": 0
+        }
+      ],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
       "targets": [
         {
-          "expr": "rate(${metric_namespace}_authority_discovery_dht_event_received{name=\"value_found\", instance=~\"${nodename}\"}[2h]) / ignoring(name) (\n  rate(${metric_namespace}_authority_discovery_dht_event_received{name=\"value_found\", instance=~\"${nodename}\"}[2h]) +\n  ignoring(name) rate(${metric_namespace}_authority_discovery_dht_event_received{name=\"value_not_found\", instance=~\"${nodename}\"}[2h])\n)",
+          "expr": "histogram_quantile(0.99, sum(rate(${metric_namespace}_sub_libp2p_notifications_queues_size_bucket{instance=~\"${nodename}\", protocol=\"${notif_protocol}\"}[2m])) by (le, instance))",
+          "hide": false,
           "interval": "",
-          "legendFormat": "{{instance}}",
+          "legendFormat": "{{protocol}}",
+          "refId": "A"
+        },
+        {
+          "expr": "max(histogram_quantile(0.99, sum(rate(${metric_namespace}_sub_libp2p_notifications_queues_size_bucket{instance=~\"${nodename}\", protocol=\"${notif_protocol}\"}[2m])) by (le, instance)))",
+          "interval": "",
+          "legendFormat": "max",
           "refId": "B"
         }
       ],
@@ -2842,10 +2403,10 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Authority discovery get_value success rate in past two hours",
+      "title": "99th percentile of queues sizes",
       "tooltip": {
         "shared": true,
-        "sort": 1,
+        "sort": 0,
         "value_type": "individual"
       },
       "type": "graph",
@@ -2858,11 +2419,11 @@
       },
       "yaxes": [
         {
-          "format": "percentunit",
+          "format": "short",
           "label": null,
           "logBase": 1,
-          "max": "1.0",
-          "min": null,
+          "max": "300",
+          "min": "0",
           "show": true
         },
         {
@@ -2879,63 +2440,105 @@
         "alignLevel": null
       }
     },
+    {
+      "collapsed": false,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 122
+      },
+      "id": 52,
+      "panels": [],
+      "title": "GrandPa",
+      "type": "row"
+    },
     {
       "aliasColors": {},
-      "bars": false,
+      "bars": true,
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
-      "fill": 0,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
+      "fill": 1,
       "fillGradient": 0,
       "gridPos": {
-        "h": 5,
+        "h": 6,
         "w": 12,
-        "x": 12,
-        "y": 108
+        "x": 0,
+        "y": 123
       },
       "hiddenSeries": false,
-      "id": 234,
+      "id": 54,
       "interval": "1m",
       "legend": {
+        "alignAsTable": true,
         "avg": false,
         "current": false,
+        "hideEmpty": true,
+        "hideZero": true,
         "max": false,
         "min": false,
-        "show": false,
-        "total": false,
-        "values": false
+        "rightSide": true,
+        "show": true,
+        "total": true,
+        "values": true
       },
-      "lines": true,
+      "lines": false,
       "linewidth": 1,
-      "nullPointMode": "connected",
+      "nullPointMode": "null as zero",
       "options": {
-        "dataLinks": []
+        "alertThreshold": true
       },
       "percentage": false,
+      "pluginVersion": "7.3.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
-      "repeatDirection": "v",
-      "seriesOverrides": [],
+      "repeat": "nodename",
+      "repeatDirection": "h",
+      "seriesOverrides": [
+        {
+          "alias": "/discard/",
+          "color": "#FA6400",
+          "zindex": -2
+        },
+        {
+          "alias": "/keep/",
+          "color": "#73BF69",
+          "zindex": 2
+        },
+        {
+          "alias": "/process_and_discard/",
+          "color": "#5794F2"
+        }
+      ],
       "spaceLength": 10,
-      "stack": false,
+      "stack": true,
       "steppedLine": false,
       "targets": [
         {
-          "expr": "rate(${metric_namespace}_authority_discovery_dht_event_received{name=\"value_put\", instance=~\"${nodename}\"}[2h]) / ignoring(name) (\n  rate(${metric_namespace}_authority_discovery_dht_event_received{name=\"value_put\", instance=~\"${nodename}\"}[2h]) +\n  ignoring(name) rate(${metric_namespace}_authority_discovery_dht_event_received{name=\"value_put_failed\", instance=~\"${nodename}\"}[2h])\n)",
+          "expr": "rate(${metric_namespace}_finality_grandpa_communication_gossip_validator_messages{instance=~\"${nodename}\"}[$__interval])",
           "interval": "",
-          "legendFormat": "{{instance}}",
-          "refId": "B"
+          "legendFormat": "{{message}} => {{action}}",
+          "refId": "A"
         }
       ],
       "thresholds": [],
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Authority discovery put_value success rate in past two hours",
+      "title": "GrandPa messages received from the network, and action",
       "tooltip": {
         "shared": true,
-        "sort": 1,
+        "sort": 0,
         "value_type": "individual"
       },
       "type": "graph",
@@ -2948,10 +2551,10 @@
       },
       "yaxes": [
         {
-          "format": "percentunit",
+          "format": "short",
           "label": null,
           "logBase": 1,
-          "max": "1.0",
+          "max": null,
           "min": null,
           "show": true
         },
@@ -2961,17 +2564,62 @@
           "logBase": 1,
           "max": null,
           "min": null,
-          "show": false
+          "show": true
         }
       ],
       "yaxis": {
         "align": false,
         "alignLevel": null
       }
+    },
+    {
+      "collapsed": false,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 129
+      },
+      "id": 25,
+      "panels": [],
+      "repeat": null,
+      "title": "Kademlia & authority-discovery",
+      "type": "row"
+    },
+    {
+      "datasource": null,
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "folderId": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 130
+      },
+      "headings": true,
+      "id": 423,
+      "limit": 10,
+      "pluginVersion": "7.2.1",
+      "query": "kademlia",
+      "recent": false,
+      "search": false,
+      "starred": false,
+      "tags": [],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Kademlia and Authority Discovery metrics moved to \"kademlia-and-authority-discovery\" dashboard.",
+      "type": "dashlist"
     }
   ],
   "refresh": "1m",
-  "schemaVersion": 22,
+  "schemaVersion": 26,
   "style": "dark",
   "tags": [],
   "templating": {
@@ -2981,9 +2629,9 @@
         "current": {},
         "datasource": "$data_source",
         "definition": "${metric_namespace}_process_start_time_seconds",
+        "error": null,
         "hide": 0,
-        "includeAll": true,
-        "index": -1,
+        "includeAll": false,
         "label": "Instance name filter",
         "multi": true,
         "name": "nodename",
@@ -3003,15 +2651,15 @@
         "allValue": null,
         "current": {},
         "datasource": "$data_source",
-        "definition": "${metric_namespace}_sub_libp2p_notifications_sizes_count",
+        "definition": "${metric_namespace}_sub_libp2p_notifications_sizes_count{instance=~\"${nodename}\"}",
+        "error": null,
         "hide": 2,
         "includeAll": true,
-        "index": -1,
         "label": null,
         "multi": false,
         "name": "notif_protocol",
         "options": [],
-        "query": "${metric_namespace}_sub_libp2p_notifications_sizes_count",
+        "query": "${metric_namespace}_sub_libp2p_notifications_sizes_count{instance=~\"${nodename}\"}",
         "refresh": 1,
         "regex": "/protocol=\"(.*?)\"/",
         "skipUrlSync": false,
@@ -3026,15 +2674,15 @@
         "allValue": null,
         "current": {},
         "datasource": "$data_source",
-        "definition": "${metric_namespace}_sub_libp2p_requests_out_started_total",
+        "definition": "${metric_namespace}_sub_libp2p_requests_out_started_total{instance=~\"${nodename}\"}",
+        "error": null,
         "hide": 2,
         "includeAll": true,
-        "index": -1,
         "label": null,
         "multi": false,
         "name": "request_protocol",
         "options": [],
-        "query": "${metric_namespace}_sub_libp2p_requests_out_started_total",
+        "query": "${metric_namespace}_sub_libp2p_requests_out_started_total{instance=~\"${nodename}\"}",
         "refresh": 1,
         "regex": "/protocol=\"(.*?)\"/",
         "skipUrlSync": false,
@@ -3048,9 +2696,10 @@
       {
         "current": {
           "selected": false,
-          "text": "Prometheus",
-          "value": "Prometheus"
+          "text": "prometheus.parity-mgmt",
+          "value": "prometheus.parity-mgmt"
         },
+        "error": null,
         "hide": 0,
         "includeAll": false,
         "label": "Source of data",
@@ -3066,15 +2715,18 @@
       {
         "current": {
           "value": "${VAR_METRIC_NAMESPACE}",
-          "text": "${VAR_METRIC_NAMESPACE}"
+          "text": "${VAR_METRIC_NAMESPACE}",
+          "selected": false
         },
+        "error": null,
         "hide": 2,
         "label": "Prefix of the metrics",
         "name": "metric_namespace",
         "options": [
           {
             "value": "${VAR_METRIC_NAMESPACE}",
-            "text": "${VAR_METRIC_NAMESPACE}"
+            "text": "${VAR_METRIC_NAMESPACE}",
+            "selected": false
           }
         ],
         "query": "${VAR_METRIC_NAMESPACE}",
@@ -3101,11 +2753,8 @@
       "1d"
     ]
   },
-  "timezone": "",
+  "timezone": "utc",
   "title": "Substrate Networking",
   "uid": "vKVuiD9Zk",
-  "variables": {
-    "list": []
-  },
-  "version": 121
+  "version": 147
 }
diff --git a/.maintain/monitoring/grafana-dashboards/substrate-service-tasks.json b/.maintain/monitoring/grafana-dashboards/substrate-service-tasks.json
index 539fdec086a3..a3db46ec6d2a 100644
--- a/.maintain/monitoring/grafana-dashboards/substrate-service-tasks.json
+++ b/.maintain/monitoring/grafana-dashboards/substrate-service-tasks.json
@@ -13,7 +13,7 @@
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "6.7.3"
+      "version": "7.3.6"
     },
     {
       "type": "panel",
@@ -26,6 +26,12 @@
       "id": "prometheus",
       "name": "Prometheus",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
   "annotations": {
@@ -75,18 +81,45 @@
   "gnetId": null,
   "graphTooltip": 0,
   "id": null,
-  "iteration": 1599471940817,
+  "iteration": 1610462629581,
   "links": [],
   "panels": [
     {
-      "collapsed": false,
       "datasource": null,
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
         "x": 0,
         "y": 0
       },
+      "id": 42,
+      "options": {
+        "content": "",
+        "mode": "markdown"
+      },
+      "pluginVersion": "7.3.6",
+      "repeat": "nodename",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "$nodename",
+      "type": "text"
+    },
+    {
+      "collapsed": false,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 1
+      },
       "id": 29,
       "panels": [],
       "title": "Tasks",
@@ -94,17 +127,24 @@
     },
     {
       "aliasColors": {},
-      "bars": false,
+      "bars": true,
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
-      "fill": 0,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
+      "fill": 2,
       "fillGradient": 0,
       "gridPos": {
         "h": 6,
         "w": 24,
         "x": 0,
-        "y": 1
+        "y": 2
       },
       "hiddenSeries": false,
       "id": 11,
@@ -122,23 +162,25 @@
         "total": false,
         "values": true
       },
-      "lines": true,
-      "linewidth": 2,
-      "nullPointMode": "null",
+      "lines": false,
+      "linewidth": 1,
+      "nullPointMode": "null as zero",
       "options": {
-        "dataLinks": []
+        "alertThreshold": true
       },
       "percentage": false,
+      "pluginVersion": "7.3.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
+      "repeat": "nodename",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "stack": false,
-      "steppedLine": true,
+      "stack": true,
+      "steppedLine": false,
       "targets": [
         {
-          "expr": "avg(irate(${metric_namespace}_tasks_polling_duration_sum{instance=~\"${nodename}\"}[10m])) by (task_name)",
+          "expr": "irate(${metric_namespace}_tasks_polling_duration_sum{instance=~\"${nodename}\"}[10m])",
           "interval": "",
           "legendFormat": "{{task_name}}",
           "refId": "A"
@@ -148,7 +190,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "CPU time spent on each task (average per node)",
+      "title": "CPU time spent on each task",
       "tooltip": {
         "shared": true,
         "sort": 2,
@@ -191,13 +233,20 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
         "h": 6,
         "w": 24,
         "x": 0,
-        "y": 7
+        "y": 8
       },
       "hiddenSeries": false,
       "id": 30,
@@ -219,19 +268,21 @@
       "linewidth": 2,
       "nullPointMode": "null",
       "options": {
-        "dataLinks": []
+        "alertThreshold": true
       },
       "percentage": false,
+      "pluginVersion": "7.3.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
+      "repeat": "nodename",
       "seriesOverrides": [],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": true,
       "targets": [
         {
-          "expr": "avg(irate(${metric_namespace}_tasks_polling_duration_count{instance=~\"${nodename}\"}[10m])) by (task_name)",
+          "expr": "irate(${metric_namespace}_tasks_polling_duration_count{instance=~\"${nodename}\"}[10m])",
           "interval": "",
           "legendFormat": "{{task_name}}",
           "refId": "A"
@@ -241,7 +292,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Task polling rate per second (average per node)",
+      "title": "Task polling rate per second",
       "tooltip": {
         "shared": true,
         "sort": 2,
@@ -284,104 +335,20 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
-      "fill": 0,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 24,
-        "x": 0,
-        "y": 13
-      },
-      "hiddenSeries": false,
-      "id": 31,
-      "interval": "",
-      "legend": {
-        "alignAsTable": true,
-        "avg": false,
-        "current": false,
-        "max": true,
-        "min": false,
-        "rightSide": true,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 2,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": true,
-      "targets": [
-        {
-          "expr": "max(irate(${metric_namespace}_tasks_polling_duration_count{instance=~\"${nodename}\"}[10m])) by (task_name)",
-          "interval": "",
-          "legendFormat": "{{task_name}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Task polling rate per second (maximum per node)",
-      "tooltip": {
-        "shared": true,
-        "sort": 2,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "cps",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
         },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": false
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "$data_source",
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
         "h": 6,
         "w": 24,
         "x": 0,
-        "y": 19
+        "y": 14
       },
       "hiddenSeries": false,
       "id": 15,
@@ -401,19 +368,21 @@
       "linewidth": 1,
       "nullPointMode": "null as zero",
       "options": {
-        "dataLinks": []
+        "alertThreshold": true
       },
       "percentage": false,
+      "pluginVersion": "7.3.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
+      "repeat": "nodename",
       "seriesOverrides": [],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": true,
       "targets": [
         {
-          "expr": "avg by(task_name) (irate(${metric_namespace}_tasks_spawned_total{instance=~\"${nodename}\"}[10m]))",
+          "expr": "irate(${metric_namespace}_tasks_spawned_total{instance=~\"${nodename}\"}[10m])",
           "interval": "",
           "legendFormat": "{{task_name}}",
           "refId": "A"
@@ -423,7 +392,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Number of tasks started per second (average per node)",
+      "title": "Number of tasks started per second",
       "tooltip": {
         "shared": true,
         "sort": 2,
@@ -466,104 +435,20 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
-      "fill": 0,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 24,
-        "x": 0,
-        "y": 25
-      },
-      "hiddenSeries": false,
-      "id": 16,
-      "interval": "",
-      "legend": {
-        "alignAsTable": true,
-        "avg": false,
-        "current": false,
-        "max": true,
-        "min": false,
-        "rightSide": true,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null as zero",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": true,
-      "targets": [
-        {
-          "expr": "max by(task_name) (irate(${metric_namespace}_tasks_spawned_total{instance=~\"${nodename}\"}[10m]))",
-          "interval": "",
-          "legendFormat": "{{task_name}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Number of tasks started per second (maximum over all nodes)",
-      "tooltip": {
-        "shared": true,
-        "sort": 2,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 10,
-          "max": null,
-          "min": "0",
-          "show": true
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
         },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "$data_source",
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
         "h": 6,
         "w": 24,
         "x": 0,
-        "y": 31
+        "y": 20
       },
       "hiddenSeries": false,
       "id": 2,
@@ -583,110 +468,21 @@
       "linewidth": 1,
       "nullPointMode": "null as zero",
       "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": true,
-      "targets": [
-        {
-          "expr": "avg by(task_name) (${metric_namespace}_tasks_spawned_total{instance=~\"${nodename}\"} - sum(${metric_namespace}_tasks_ended_total{instance=~\"${nodename}\"}) without(reason))",
-          "interval": "",
-          "legendFormat": "{{task_name}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Number of tasks running (average per node)",
-      "tooltip": {
-        "shared": true,
-        "sort": 2,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 10,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "$data_source",
-      "fill": 0,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 24,
-        "x": 0,
-        "y": 37
-      },
-      "hiddenSeries": false,
-      "id": 3,
-      "interval": "",
-      "legend": {
-        "alignAsTable": true,
-        "avg": false,
-        "current": false,
-        "max": true,
-        "min": false,
-        "rightSide": true,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null as zero",
-      "options": {
-        "dataLinks": []
+        "alertThreshold": true
       },
       "percentage": false,
+      "pluginVersion": "7.3.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
+      "repeat": "nodename",
       "seriesOverrides": [],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": true,
       "targets": [
         {
-          "expr": "max by(task_name) (${metric_namespace}_tasks_spawned_total{instance=~\"${nodename}\"} - sum(${metric_namespace}_tasks_ended_total{instance=~\"${nodename}\"}) without(reason))",
+          "expr": "${metric_namespace}_tasks_spawned_total{instance=~\"${nodename}\"} - sum(${metric_namespace}_tasks_ended_total{instance=~\"${nodename}\"}) without(reason)\n\n# Fallback if tasks_ended_total is null for that task\nor on(instance, task_name) ${metric_namespace}_tasks_spawned_total{instance=~\"${nodename}\"}",
           "interval": "",
           "legendFormat": "{{task_name}}",
           "refId": "A"
@@ -696,7 +492,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Number of tasks running (maximum over all nodes)",
+      "title": "Number of tasks running",
       "tooltip": {
         "shared": true,
         "sort": 2,
@@ -740,13 +536,20 @@
       "dashes": false,
       "datasource": "$data_source",
       "decimals": null,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
         "h": 6,
         "w": 24,
         "x": 0,
-        "y": 43
+        "y": 26
       },
       "hiddenSeries": false,
       "id": 7,
@@ -768,19 +571,21 @@
       "linewidth": 1,
       "nullPointMode": "null as zero",
       "options": {
-        "dataLinks": []
+        "alertThreshold": true
       },
       "percentage": false,
+      "pluginVersion": "7.3.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
+      "repeat": "nodename",
       "seriesOverrides": [],
       "spaceLength": 10,
       "stack": true,
       "steppedLine": true,
       "targets": [
         {
-          "expr": "avg(\n  irate(${metric_namespace}_tasks_polling_duration_bucket{instance=~\"${nodename}\", le=\"+Inf\"}[10m])\n    - ignoring(le)\n  irate(${metric_namespace}_tasks_polling_duration_bucket{instance=~\"${nodename}\", le=\"1.024\"}[10m])\n) by (task_name) > 0",
+          "expr": "irate(${metric_namespace}_tasks_polling_duration_bucket{instance=~\"${nodename}\", le=\"+Inf\"}[10m])\n    - ignoring(le)\n  irate(${metric_namespace}_tasks_polling_duration_bucket{instance=~\"${nodename}\", le=\"1.024\"}[10m]) > 0",
           "interval": "",
           "legendFormat": "{{task_name}}",
           "refId": "A"
@@ -790,7 +595,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Calls to `Future::poll` that took more than one second (average per node)",
+      "title": "Number of calls to `Future::poll` that took more than one second",
       "tooltip": {
         "shared": true,
         "sort": 2,
@@ -835,11 +640,11 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 49
+        "y": 32
       },
       "id": 27,
       "panels": [],
-      "title": "Misc",
+      "title": "Unbounded Channels",
       "type": "row"
     },
     {
@@ -848,13 +653,20 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
         "h": 7,
         "w": 24,
         "x": 0,
-        "y": 50
+        "y": 33
       },
       "hiddenSeries": false,
       "id": 32,
@@ -873,19 +685,21 @@
       "linewidth": 1,
       "nullPointMode": "null",
       "options": {
-        "dataLinks": []
+        "alertThreshold": true
       },
       "percentage": false,
+      "pluginVersion": "7.3.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
+      "repeat": "nodename",
       "seriesOverrides": [],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
       "targets": [
         {
-          "expr": "avg(${metric_namespace}_unbounded_channel_len{instance=~\"${nodename}\", action = \"send\"} - ignoring(action) ${metric_namespace}_unbounded_channel_len{instance=~\"${nodename}\", action = \"received\"}) by (entity)",
+          "expr": "(\n  ${metric_namespace}_unbounded_channel_len{instance=~\"${nodename}\", action = \"send\"} - ignoring(action) ${metric_namespace}_unbounded_channel_len{instance=~\"${nodename}\", action = \"received\"}\n)\n\n# Fallback if the `received` is null\nor on(instance) ${metric_namespace}_unbounded_channel_len{instance=~\"${nodename}\", action = \"send\"}",
           "interval": "",
           "legendFormat": "{{entity}}",
           "refId": "B"
@@ -895,7 +709,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Unbounded channels size (average per node)",
+      "title": "Unbounded channels size",
       "tooltip": {
         "shared": true,
         "sort": 2,
@@ -938,13 +752,20 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
         "h": 7,
         "w": 24,
         "x": 0,
-        "y": 57
+        "y": 40
       },
       "hiddenSeries": false,
       "id": 33,
@@ -963,19 +784,21 @@
       "linewidth": 1,
       "nullPointMode": "null",
       "options": {
-        "dataLinks": []
+        "alertThreshold": true
       },
       "percentage": false,
+      "pluginVersion": "7.3.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
+      "repeat": "nodename",
       "seriesOverrides": [],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
       "targets": [
         {
-          "expr": "avg(irate(${metric_namespace}_unbounded_channel_len{instance=~\"${nodename}\", action = \"send\"}[10m])) by (entity)",
+          "expr": "irate(${metric_namespace}_unbounded_channel_len{instance=~\"${nodename}\", action = \"send\"}[10m])",
           "interval": "",
           "legendFormat": "{{entity}}",
           "refId": "B"
@@ -985,7 +808,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Unbounded channels rate (average per node)",
+      "title": "Unbounded channels message sending rate (1s)",
       "tooltip": {
         "shared": true,
         "sort": 2,
@@ -1024,7 +847,7 @@
     }
   ],
   "refresh": false,
-  "schemaVersion": 22,
+  "schemaVersion": 26,
   "style": "dark",
   "tags": [],
   "templating": {
@@ -1034,9 +857,9 @@
         "current": {},
         "datasource": "$data_source",
         "definition": "${metric_namespace}_process_start_time_seconds",
+        "error": null,
         "hide": 0,
-        "includeAll": true,
-        "index": -1,
+        "includeAll": false,
         "label": "Instance filter",
         "multi": true,
         "name": "nodename",
@@ -1055,15 +878,18 @@
       {
         "current": {
           "value": "${VAR_METRIC_NAMESPACE}",
-          "text": "${VAR_METRIC_NAMESPACE}"
+          "text": "${VAR_METRIC_NAMESPACE}",
+          "selected": false
         },
+        "error": null,
         "hide": 2,
         "label": "Prefix of the metrics",
         "name": "metric_namespace",
         "options": [
           {
             "value": "${VAR_METRIC_NAMESPACE}",
-            "text": "${VAR_METRIC_NAMESPACE}"
+            "text": "${VAR_METRIC_NAMESPACE}",
+            "selected": false
           }
         ],
         "query": "${VAR_METRIC_NAMESPACE}",
@@ -1076,6 +902,7 @@
           "text": "prometheus.parity-mgmt",
           "value": "prometheus.parity-mgmt"
         },
+        "error": null,
         "hide": 0,
         "includeAll": false,
         "label": "Source of all the data",
@@ -1108,11 +935,8 @@
       "1d"
     ]
   },
-  "timezone": "",
+  "timezone": "utc",
   "title": "Substrate Service Tasks",
   "uid": "3LA6XNqZz",
-  "variables": {
-    "list": []
-  },
-  "version": 52
+  "version": 59
 }

From a9bbc7bdbfd3fa66537e5feedf1562dcb2c132a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Thu, 14 Jan 2021 17:04:41 +0100
Subject: [PATCH 0269/1194] Log target before prefix for more consistent
 logging (#7897)

* Log target before prefix for more consistent logging

As requested, this moves the target before the prefix to have consistent
logging between logs with and without a prefix.

* Add a space
---
 client/tracing/src/logging.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/tracing/src/logging.rs b/client/tracing/src/logging.rs
index 248c91feb80f..c552d64bc7fb 100644
--- a/client/tracing/src/logging.rs
+++ b/client/tracing/src/logging.rs
@@ -125,6 +125,10 @@ where
 			}
 		}
 
+		if self.display_target {
+			write!(writer, "{}: ", meta.target())?;
+		}
+
 		// Custom code to display node name
 		if let Some(span) = ctx.lookup_current() {
 			let parents = span.parents();
@@ -137,9 +141,6 @@ where
 			}
 		}
 
-		if self.display_target {
-			write!(writer, "{}:", meta.target())?;
-		}
 		ctx.format_fields(writer, event)?;
 		writeln!(writer)?;
 

From d0b2e7d88c0068c5a0d5902fb231b9090172fe5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Thu, 14 Jan 2021 18:15:17 +0100
Subject: [PATCH 0270/1194] contracts: Fix failing benchmark test (#7900)

---
 frame/contracts/src/benchmarking/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index c6fc3bf3ac51..649d09188032 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -413,7 +413,7 @@ benchmarks! {
 			caller_funding::<T>() - instance.endowment
 		);
 		assert!(
-			T::Currency::free_balance(&instance.caller) <
+			T::Currency::free_balance(&instance.caller) <=
 			caller_funding::<T>() - instance.endowment + <T as Config>::SurchargeReward::get(),
 		);
 	}

From f1c67253bb563708c90cec6c49ebcebef4aebb3a Mon Sep 17 00:00:00 2001
From: Denis Pisarev <denis.pisarev@parity.io>
Date: Thu, 14 Jan 2021 19:44:53 +0100
Subject: [PATCH 0271/1194] CI: trigger simnet master and wait for status
 (#7899)

* CI: trigger simnet master and wait for status

* chore: remove leftovers from chaosnet; remove flaming-fir deployment
---
 .gitlab-ci.yml                                |   77 +-
 .maintain/chaostest/.eslintignore             |    1 -
 .maintain/chaostest/.eslintrc.json            |   19 -
 .maintain/chaostest/.gitignore                |   11 -
 .maintain/chaostest/README.md                 |   90 -
 .maintain/chaostest/bin/run                   |    5 -
 .maintain/chaostest/bin/run.cmd               |    3 -
 .maintain/chaostest/package-lock.json         | 5950 -----------------
 .maintain/chaostest/package.json              |   61 -
 .../chaostest/src/commands/clean/index.js     |   31 -
 .../src/commands/singlenodeheight/index.js    |   63 -
 .../chaostest/src/commands/spawn/index.js     |   52 -
 .maintain/chaostest/src/config/README.md      |   34 -
 .maintain/chaostest/src/config/index.js       |   70 -
 .../chaostest/src/hypervisor/chainApi/api.js  |   16 -
 .../src/hypervisor/chainApi/index.js          |    4 -
 .../src/hypervisor/deployment/deployment.js   |  123 -
 .../src/hypervisor/deployment/index.js        |    4 -
 .maintain/chaostest/src/hypervisor/index.js   |   11 -
 .../src/hypervisor/modules/chainApi.js        |   18 -
 .../chaostest/src/hypervisor/modules/k8s.js   |  113 -
 .maintain/chaostest/src/index.js              |    1 -
 .maintain/chaostest/src/utils/exit.js         |   12 -
 .maintain/chaostest/src/utils/index.js        |    9 -
 .maintain/chaostest/src/utils/logger.js       |   50 -
 .maintain/chaostest/src/utils/wait.js         |   32 -
 .maintain/flamingfir-deploy.sh                |   35 -
 27 files changed, 25 insertions(+), 6870 deletions(-)
 delete mode 100644 .maintain/chaostest/.eslintignore
 delete mode 100644 .maintain/chaostest/.eslintrc.json
 delete mode 100644 .maintain/chaostest/.gitignore
 delete mode 100644 .maintain/chaostest/README.md
 delete mode 100755 .maintain/chaostest/bin/run
 delete mode 100644 .maintain/chaostest/bin/run.cmd
 delete mode 100644 .maintain/chaostest/package-lock.json
 delete mode 100644 .maintain/chaostest/package.json
 delete mode 100644 .maintain/chaostest/src/commands/clean/index.js
 delete mode 100644 .maintain/chaostest/src/commands/singlenodeheight/index.js
 delete mode 100644 .maintain/chaostest/src/commands/spawn/index.js
 delete mode 100644 .maintain/chaostest/src/config/README.md
 delete mode 100644 .maintain/chaostest/src/config/index.js
 delete mode 100644 .maintain/chaostest/src/hypervisor/chainApi/api.js
 delete mode 100644 .maintain/chaostest/src/hypervisor/chainApi/index.js
 delete mode 100644 .maintain/chaostest/src/hypervisor/deployment/deployment.js
 delete mode 100644 .maintain/chaostest/src/hypervisor/deployment/index.js
 delete mode 100644 .maintain/chaostest/src/hypervisor/index.js
 delete mode 100644 .maintain/chaostest/src/hypervisor/modules/chainApi.js
 delete mode 100644 .maintain/chaostest/src/hypervisor/modules/k8s.js
 delete mode 100644 .maintain/chaostest/src/index.js
 delete mode 100644 .maintain/chaostest/src/utils/exit.js
 delete mode 100644 .maintain/chaostest/src/utils/index.js
 delete mode 100644 .maintain/chaostest/src/utils/logger.js
 delete mode 100644 .maintain/chaostest/src/utils/wait.js
 delete mode 100755 .maintain/flamingfir-deploy.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f22b79c4df59..b643489d9009 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,6 +28,11 @@ stages:
   - deploy
   - flaming-fir
 
+workflow:
+  rules:
+    - if: $CI_COMMIT_TAG
+    - if: $CI_COMMIT_BRANCH
+
 variables:                         &default-vars
   GIT_STRATEGY:                    fetch
   GIT_DEPTH:                       100
@@ -70,11 +75,6 @@ default:
   tags:
     - linux-docker
 
-workflow:
-  rules:
-    - if: $CI_COMMIT_TAG
-    - if: $CI_COMMIT_BRANCH
-
 .test-refs:                        &test-refs
   rules:
     - if: $CI_PIPELINE_SOURCE == "web"
@@ -158,7 +158,7 @@ test-prometheus-alerting-rules:
         - .gitlab-ci.yml
         - .maintain/monitoring/**/*
   script:
-    - echo "promtool check rules .maintain/monitoring/alerting-rules/alerting-rules.yaml"
+    - promtool check rules .maintain/monitoring/alerting-rules/alerting-rules.yaml
     - cat .maintain/monitoring/alerting-rules/alerting-rules.yaml | promtool test rules .maintain/monitoring/alerting-rules/alerting-rule-tests.yaml
 
 #### stage:                        test
@@ -497,13 +497,13 @@ build-rust-doc:
     DOCKERFILE:                    $PRODUCT.Dockerfile
     IMAGE_NAME:                    docker.io/parity/$PRODUCT
   before_script:
-    - test "$Docker_Hub_User_Parity" -a "$Docker_Hub_Pass_Parity" ||
-        ( echo "no docker credentials provided"; exit 1 )
-  script:
     - cd ./artifacts/$PRODUCT/
     - VERSION="$(cat ./VERSION)"
     - echo "${PRODUCT} version = ${VERSION}"
     - test -z "${VERSION}" && exit 1
+  script:
+    - test "$Docker_Hub_User_Parity" -a "$Docker_Hub_Pass_Parity" ||
+        ( echo "no docker credentials provided"; exit 1 )
     - buildah bud
         --format=docker
         --build-arg VCS_REF="${CI_COMMIT_SHA}"
@@ -516,6 +516,7 @@ build-rust-doc:
     - buildah info
     - buildah push --format=v2s2 "$IMAGE_NAME:$VERSION"
     - buildah push --format=v2s2 "$IMAGE_NAME:latest"
+    - buildah logout "$IMAGE_NAME"
 
 publish-docker-substrate:
   stage:                           publish
@@ -529,7 +530,6 @@ publish-docker-substrate:
     <<:                            *docker-build-vars
     PRODUCT:                       substrate
   after_script:
-    - buildah logout "$IMAGE_NAME"
     # only VERSION information is needed for the deployment
     - find ./artifacts/ -depth -not -name VERSION -type f -delete
 
@@ -542,8 +542,6 @@ publish-docker-subkey:
   variables:
     <<:                            *docker-build-vars
     PRODUCT:                       subkey
-  after_script:
-    - buildah logout "$IMAGE_NAME"
 
 publish-s3-release:
   stage:                           publish
@@ -614,6 +612,8 @@ publish-to-crates-io:
     - cargo unleash em-dragons --no-check --owner github:paritytech:core-devs ${CARGO_UNLEASH_PKG_DEF}
   allow_failure:                   true
 
+#### stage:                        deploy
+
 deploy-prometheus-alerting-rules:
   stage:                           deploy
   needs:
@@ -640,52 +640,25 @@ deploy-prometheus-alerting-rules:
         - .gitlab-ci.yml
         - .maintain/monitoring/**/*
 
-.validator-deploy:                 &validator-deploy
-  stage:                           flaming-fir
+trigger-simnet:
+  stage:                           deploy
   rules:
-    # .build-refs, but manual
-    - if: $CI_COMMIT_REF_NAME == "master"
-      when: manual
-    - if: $CI_PIPELINE_SOURCE == "web"
-      when: manual
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
-      when: manual
+    # this job runs only on nightly pipeline with the mentioned variable, against `master` branch
+    - if: $CI_COMMIT_REF_NAME == "master" && $CI_PIPELINE_SOURCE == "schedule" && $PIPELINE == "nightly"
   needs:
-    # script will fail if there is no artifacts/substrate/VERSION
     - job:                         publish-docker-substrate
-      artifacts:                   true
-  image:                           parity/azure-ansible:v1
-  allow_failure:                   true
-  interruptible:                   true
-  tags:
-    - linux-docker
-
-validator 1 4:
-  <<:                              *validator-deploy
-  script:
-    - ./.maintain/flamingfir-deploy.sh flamingfir-validator1
-
-validator 2 4:
-  <<:                              *validator-deploy
-  script:
-    - ./.maintain/flamingfir-deploy.sh flamingfir-validator2
-
-validator 3 4:
-  <<:                              *validator-deploy
-  script:
-    - ./.maintain/flamingfir-deploy.sh flamingfir-validator3
-
-validator 4 4:
-  <<:                              *validator-deploy
-  script:
-    - ./.maintain/flamingfir-deploy.sh flamingfir-validator4
+      artifacts:                   false
+  trigger:
+    project:                       parity/simnet
+    branch:                        master
+    strategy:                      depend
 
-#### stage:                       .post
+#### stage:                        .post
 
 check-labels:
-  stage:                          .post
-  image:                          paritytech/tools:latest
-  <<:                             *kubernetes-build
+  stage:                           .post
+  image:                           paritytech/tools:latest
+  <<:                              *kubernetes-build
   rules:
     - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
   script:
diff --git a/.maintain/chaostest/.eslintignore b/.maintain/chaostest/.eslintignore
deleted file mode 100644
index 3c3629e647f5..000000000000
--- a/.maintain/chaostest/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules
diff --git a/.maintain/chaostest/.eslintrc.json b/.maintain/chaostest/.eslintrc.json
deleted file mode 100644
index 43e483a80b2e..000000000000
--- a/.maintain/chaostest/.eslintrc.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "env": {
-        "node": true,
-        "commonjs": true,
-        "es6": true
-    },
-    "extends": [
-        "standard"
-    ],
-    "globals": {
-        "Atomics": "readonly",
-        "SharedArrayBuffer": "readonly"
-    },
-    "parserOptions": {
-        "ecmaVersion": 2018
-    },
-    "rules": {
-    }
-}
diff --git a/.maintain/chaostest/.gitignore b/.maintain/chaostest/.gitignore
deleted file mode 100644
index ef9e9d1e696e..000000000000
--- a/.maintain/chaostest/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-*-debug.log
-*-error.log
-/.nyc_output
-/dist
-/tmp
-/log
-.DS_Store
-.editorconfig
-yarn.lock
-node_modules
-/src/config/config.json
diff --git a/.maintain/chaostest/README.md b/.maintain/chaostest/README.md
deleted file mode 100644
index 60342e15b7d5..000000000000
--- a/.maintain/chaostest/README.md
+++ /dev/null
@@ -1,90 +0,0 @@
-<!-- markdown-link-check-disable -->
-chaostest
-=========
-
-A cli for chaos testing on substrate
-
-[![oclif](https://img.shields.io/badge/cli-oclif-brightgreen.svg)](https://oclif.io)
-[![Version](https://img.shields.io/npm/v/chaostest.svg)](https://npmjs.org/package/chaostest)
-[![Downloads/week](https://img.shields.io/npm/dw/chaostest.svg)](https://npmjs.org/package/chaostest)
-
-<!-- toc -->
-* [Usage](#usage)
-* [Commands](#commands)
-<!-- tocstop -->
-# Usage
-<!-- usage -->
-```sh-session
-$ npm install -g chaostest // yarn add global chaostest
-$ chaostest COMMAND
-running command...
-$ chaostest (-v|--version|version)
-chaostest/0.0.0 darwin-x64 node-v8.16.0
-$ chaostest --help [COMMAND]
-USAGE
-  $ chaostest COMMAND
-...
-```
-<!-- usagestop -->
-# Commands
-<!-- commands -->
-* [`chaostest spawn`](#chaostest-spawn)
-* [`chaostest singlenodeheight`](#chaostest-singlenodeheight)
-* [`chaostest clean`](#chaostest-clean)
-
-## `chaostest spawn`
-
-Spawn a testnet based on your local k8s configuration. Could be either a dev node, a two node alicebob chain or a customized chain with various validators/fullnodes.
-
-```
-USAGE
-  $ chaostest spawn [ARGUMENTS] [FLAGS]
-
-Arguments
-  dev,  a single fullnode in --dev mode
-  alicebob, a two nodes private chain with Alice as bootnode and Bob as validator
-  [chainName], a customized chain deployed with -v numbers of validators and -n numbers of fullnodes
-
-Flags
-  --image, -i, the image tag of the certain substrate version you want to deploy
-  --port, -p, the port to expose when image is deployed in a pod
-  --namespace, the desired namespace to deploy on
-  --validator, -v, the number of substrate validators to deploy
-  --node, -n, the number of full nodes, if not set but exists, default to 1
-  
-DESCRIPTION
-  ...
-  Extra documentation goes here
-```
-
-_See code: [src/commands/spawn/index.js](https://github.com/paritytech/substrate/blob/master/.maintain/chaostest/src/commands/spawn/index.js)_
-
-## `chaostest singlenodeheight`
-
-Test against a fullnode on --dev mode to check if it can successfully produce blocks to a certain height.
-
-```
-USAGE
-  $ chaostest singlenodeheight [FLAGS]
-
-FLAGS
-  -h , the desired height of blocks to check if reachable, this only works with integers smaller than 2^6 
-  -t, the wait time out before it halts the polling
-```
-
-_See code: [src/commands/singlenodeheight/index.js](https://github.com/paritytech/substrate/blob/master/.maintain/chaostest/src/commands/singlenodeheight/index.js)_
-
-## `chaostest clean`
-
-Clean up the k8s deployment by namespace.
-
-```
-USAGE
-  $ chaostest clean [FLAGS]
-
-FLAGS
-  -n , the desired namespace to delete on your k8s cluster
-```
-
-_See code: [src/commands/clean/index.js](https://github.com/paritytech/substrate/blob/master/.maintain/chaostest/src/commands/clean/index.js)_
-<!-- commandsstop -->
diff --git a/.maintain/chaostest/bin/run b/.maintain/chaostest/bin/run
deleted file mode 100755
index 30b14e177331..000000000000
--- a/.maintain/chaostest/bin/run
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env node
-
-require('@oclif/command').run()
-.then(require('@oclif/command/flush'))
-.catch(require('@oclif/errors/handle'))
diff --git a/.maintain/chaostest/bin/run.cmd b/.maintain/chaostest/bin/run.cmd
deleted file mode 100644
index 968fc30758e6..000000000000
--- a/.maintain/chaostest/bin/run.cmd
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-
-node "%~dp0\run" %*
diff --git a/.maintain/chaostest/package-lock.json b/.maintain/chaostest/package-lock.json
deleted file mode 100644
index 09468e12fb4f..000000000000
--- a/.maintain/chaostest/package-lock.json
+++ /dev/null
@@ -1,5950 +0,0 @@
-{
-  "name": "chaostest",
-  "version": "0.0.0",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "@babel/code-frame": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
-      "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
-      "dev": true,
-      "requires": {
-        "@babel/highlight": "^7.8.3"
-      }
-    },
-    "@babel/generator": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz",
-      "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.9.6",
-        "jsesc": "^2.5.1",
-        "lodash": "^4.17.13",
-        "source-map": "^0.5.0"
-      }
-    },
-    "@babel/helper-function-name": {
-      "version": "7.9.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz",
-      "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-get-function-arity": "^7.8.3",
-        "@babel/template": "^7.8.3",
-        "@babel/types": "^7.9.5"
-      }
-    },
-    "@babel/helper-get-function-arity": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz",
-      "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.8.3"
-      }
-    },
-    "@babel/helper-split-export-declaration": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz",
-      "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.8.3"
-      }
-    },
-    "@babel/helper-validator-identifier": {
-      "version": "7.9.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz",
-      "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==",
-      "dev": true
-    },
-    "@babel/highlight": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
-      "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-validator-identifier": "^7.9.0",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "@babel/parser": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz",
-      "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==",
-      "dev": true
-    },
-    "@babel/runtime": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz",
-      "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==",
-      "requires": {
-        "regenerator-runtime": "^0.13.4"
-      }
-    },
-    "@babel/template": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
-      "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.8.3",
-        "@babel/parser": "^7.8.6",
-        "@babel/types": "^7.8.6"
-      }
-    },
-    "@babel/traverse": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz",
-      "integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.8.3",
-        "@babel/generator": "^7.9.6",
-        "@babel/helper-function-name": "^7.9.5",
-        "@babel/helper-split-export-declaration": "^7.8.3",
-        "@babel/parser": "^7.9.6",
-        "@babel/types": "^7.9.6",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.13"
-      }
-    },
-    "@babel/types": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz",
-      "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-validator-identifier": "^7.9.5",
-        "lodash": "^4.17.13",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "@kubernetes/client-node": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/@kubernetes/client-node/-/client-node-0.11.2.tgz",
-      "integrity": "sha512-Uhwd2y2qCvugICnHRC5h2MT5vw0a1dJPVVltVwmkeMuyGTPBccsTtpTcSfSLitwOrh4yr+9wG5bRcMdgeRjYPw==",
-      "requires": {
-        "@types/js-yaml": "^3.12.1",
-        "@types/node": "^10.12.0",
-        "@types/request": "^2.47.1",
-        "@types/underscore": "^1.8.9",
-        "@types/ws": "^6.0.1",
-        "byline": "^5.0.0",
-        "execa": "1.0.0",
-        "isomorphic-ws": "^4.0.1",
-        "js-yaml": "^3.13.1",
-        "jsonpath-plus": "^0.19.0",
-        "openid-client": "2.5.0",
-        "request": "^2.88.0",
-        "rfc4648": "^1.3.0",
-        "shelljs": "^0.8.2",
-        "tslib": "^1.9.3",
-        "underscore": "^1.9.1",
-        "ws": "^6.1.0"
-      },
-      "dependencies": {
-        "jsonpath-plus": {
-          "version": "0.19.0",
-          "resolved": "https://registry.npmjs.org/jsonpath-plus/-/jsonpath-plus-0.19.0.tgz",
-          "integrity": "sha512-GSVwsrzW9LsA5lzsqe4CkuZ9wp+kxBb2GwNniaWzI2YFn5Ig42rSW8ZxVpWXaAfakXNrx5pgY5AbQq7kzX29kg=="
-        }
-      }
-    },
-    "@nodelib/fs.scandir": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz",
-      "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==",
-      "dev": true,
-      "requires": {
-        "@nodelib/fs.stat": "2.0.3",
-        "run-parallel": "^1.1.9"
-      }
-    },
-    "@nodelib/fs.stat": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz",
-      "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==",
-      "dev": true
-    },
-    "@nodelib/fs.walk": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz",
-      "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==",
-      "dev": true,
-      "requires": {
-        "@nodelib/fs.scandir": "2.1.3",
-        "fastq": "^1.6.0"
-      }
-    },
-    "@oclif/command": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/@oclif/command/-/command-1.6.1.tgz",
-      "integrity": "sha512-pvmMmfGn+zm4e4RwVw63mg9sIaqKqmVsFbImQoUrCO/43UmWzoSHWNXKdgEGigOezWrkZfFucaeZcSbp149OWg==",
-      "requires": {
-        "@oclif/config": "^1.15.1",
-        "@oclif/errors": "^1.2.2",
-        "@oclif/parser": "^3.8.3",
-        "@oclif/plugin-help": "^3",
-        "debug": "^4.1.1",
-        "semver": "^5.6.0"
-      },
-      "dependencies": {
-        "@oclif/plugin-help": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-3.0.1.tgz",
-          "integrity": "sha512-Q1OITeUBkkydPf6r5qX75KgE9capr1mNrfHtfD7gkVXmqoTndrbc++z4KfAYNf5nhTCY7N9l52sjbF6BrSGu9w==",
-          "requires": {
-            "@oclif/command": "^1.5.20",
-            "@oclif/config": "^1.15.1",
-            "chalk": "^2.4.1",
-            "indent-string": "^4.0.0",
-            "lodash.template": "^4.4.0",
-            "string-width": "^3.0.0",
-            "strip-ansi": "^5.0.0",
-            "widest-line": "^2.0.1",
-            "wrap-ansi": "^4.0.0"
-          }
-        },
-        "indent-string": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-          "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        }
-      }
-    },
-    "@oclif/config": {
-      "version": "1.15.1",
-      "resolved": "https://registry.npmjs.org/@oclif/config/-/config-1.15.1.tgz",
-      "integrity": "sha512-GdyHpEZuWlfU8GSaZoiywtfVBsPcfYn1KuSLT1JTfvZGpPG6vShcGr24YZ3HG2jXUFlIuAqDcYlTzOrqOdTPNQ==",
-      "requires": {
-        "@oclif/errors": "^1.0.0",
-        "@oclif/parser": "^3.8.0",
-        "debug": "^4.1.1",
-        "tslib": "^1.9.3"
-      }
-    },
-    "@oclif/dev-cli": {
-      "version": "1.22.2",
-      "resolved": "https://registry.npmjs.org/@oclif/dev-cli/-/dev-cli-1.22.2.tgz",
-      "integrity": "sha512-c7633R37RxrQIpwqPKxjNRm6/jb1yuG8fd16hmNz9Nw+/MUhEtQtKHSCe9ScH8n5M06l6LEo4ldk9LEGtpaWwA==",
-      "dev": true,
-      "requires": {
-        "@oclif/command": "^1.5.13",
-        "@oclif/config": "^1.12.12",
-        "@oclif/errors": "^1.2.2",
-        "@oclif/plugin-help": "^2.1.6",
-        "cli-ux": "^5.2.1",
-        "debug": "^4.1.1",
-        "fs-extra": "^7.0.1",
-        "github-slugger": "^1.2.1",
-        "lodash": "^4.17.11",
-        "normalize-package-data": "^2.5.0",
-        "qqjs": "^0.3.10",
-        "tslib": "^1.9.3"
-      }
-    },
-    "@oclif/errors": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@oclif/errors/-/errors-1.2.2.tgz",
-      "integrity": "sha512-Eq8BFuJUQcbAPVofDxwdE0bL14inIiwt5EaKRVY9ZDIG11jwdXZqiQEECJx0VfnLyUZdYfRd/znDI/MytdJoKg==",
-      "requires": {
-        "clean-stack": "^1.3.0",
-        "fs-extra": "^7.0.0",
-        "indent-string": "^3.2.0",
-        "strip-ansi": "^5.0.0",
-        "wrap-ansi": "^4.0.0"
-      }
-    },
-    "@oclif/linewrap": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@oclif/linewrap/-/linewrap-1.0.0.tgz",
-      "integrity": "sha512-Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw=="
-    },
-    "@oclif/parser": {
-      "version": "3.8.5",
-      "resolved": "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.5.tgz",
-      "integrity": "sha512-yojzeEfmSxjjkAvMRj0KzspXlMjCfBzNRPkWw8ZwOSoNWoJn+OCS/m/S+yfV6BvAM4u2lTzX9Y5rCbrFIgkJLg==",
-      "requires": {
-        "@oclif/errors": "^1.2.2",
-        "@oclif/linewrap": "^1.0.0",
-        "chalk": "^2.4.2",
-        "tslib": "^1.9.3"
-      }
-    },
-    "@oclif/plugin-help": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-2.2.3.tgz",
-      "integrity": "sha512-bGHUdo5e7DjPJ0vTeRBMIrfqTRDBfyR5w0MP41u0n3r7YG5p14lvMmiCXxi6WDaP2Hw5nqx3PnkAIntCKZZN7g==",
-      "requires": {
-        "@oclif/command": "^1.5.13",
-        "chalk": "^2.4.1",
-        "indent-string": "^4.0.0",
-        "lodash.template": "^4.4.0",
-        "string-width": "^3.0.0",
-        "strip-ansi": "^5.0.0",
-        "widest-line": "^2.0.1",
-        "wrap-ansi": "^4.0.0"
-      },
-      "dependencies": {
-        "indent-string": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-          "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        }
-      }
-    },
-    "@oclif/screen": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@oclif/screen/-/screen-1.0.4.tgz",
-      "integrity": "sha512-60CHpq+eqnTxLZQ4PGHYNwUX572hgpMHGPtTWMjdTMsAvlm69lZV/4ly6O3sAYkomo4NggGcomrDpBe34rxUqw==",
-      "dev": true
-    },
-    "@oclif/test": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@oclif/test/-/test-1.2.6.tgz",
-      "integrity": "sha512-8BQm0VFwTf/JpDnI3x6Lbp3S4RRUvQcv8WalKm82+7FNEylWMAXFNgBuzG65cNPj11J2jhlVo0gOWGF6hbiaJQ==",
-      "dev": true,
-      "requires": {
-        "fancy-test": "^1.4.3"
-      }
-    },
-    "@polkadot/api": {
-      "version": "0.95.2",
-      "resolved": "https://registry.npmjs.org/@polkadot/api/-/api-0.95.2.tgz",
-      "integrity": "sha512-SrYiEE9T+AmCx18NyhEk5l/7yPvVqogiz7rmW8YGlOZ89OEPHe2dOTaD5tZJ5daKXEkXFsqPPtwemCv2OZ2F1g==",
-      "requires": {
-        "@babel/runtime": "^7.6.3",
-        "@polkadot/api-derive": "^0.95.2",
-        "@polkadot/api-metadata": "^0.95.2",
-        "@polkadot/keyring": "^1.6.1",
-        "@polkadot/rpc-core": "^0.95.2",
-        "@polkadot/rpc-provider": "^0.95.2",
-        "@polkadot/types": "^0.95.2",
-        "@polkadot/util-crypto": "^1.6.1"
-      }
-    },
-    "@polkadot/api-derive": {
-      "version": "0.95.2",
-      "resolved": "https://registry.npmjs.org/@polkadot/api-derive/-/api-derive-0.95.2.tgz",
-      "integrity": "sha512-IScOMoUnrs/TCPk2zZZWUfw1EfV718HuFbIRFVg11PiG/uYQ+knNpr9cG/auRWelDMO0ef7eI+YOpf9+gV3EZw==",
-      "requires": {
-        "@babel/runtime": "^7.6.3",
-        "@polkadot/api": "^0.95.2",
-        "@polkadot/types": "^0.95.2"
-      }
-    },
-    "@polkadot/api-metadata": {
-      "version": "0.95.2",
-      "resolved": "https://registry.npmjs.org/@polkadot/api-metadata/-/api-metadata-0.95.2.tgz",
-      "integrity": "sha512-RyHr6o8Qdi0k1cTJj11AqZ3MFoPbqUK37RMpFH8vK6VHlZRlpqaZsCctWMEiOXQC2CtTnE5CIoQH11AKeIK+jw==",
-      "requires": {
-        "@babel/runtime": "^7.6.3",
-        "@polkadot/types": "^0.95.2",
-        "@polkadot/util": "^1.6.1",
-        "@polkadot/util-crypto": "^1.6.1"
-      }
-    },
-    "@polkadot/jsonrpc": {
-      "version": "0.95.2",
-      "resolved": "https://registry.npmjs.org/@polkadot/jsonrpc/-/jsonrpc-0.95.2.tgz",
-      "integrity": "sha512-U8cx5MuhWPRcuosSHv/Qw4OmlgSk410oTQtYvHAFDoHuPDcYXTBcCJ0e31cCZFBkaed+GTelkex9EPnHFi0x1g==",
-      "requires": {
-        "@babel/runtime": "^7.6.3"
-      }
-    },
-    "@polkadot/keyring": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/@polkadot/keyring/-/keyring-1.8.1.tgz",
-      "integrity": "sha512-KeDbfP8biY3bXEhMv1ANp9d3kCuXj2oxseuDK0jvxRo7CehVME9UwAMGQK3Y9NCUuYWd+xTO2To0ZOqR7hdmuQ==",
-      "requires": {
-        "@babel/runtime": "^7.7.7",
-        "@polkadot/util": "^1.8.1",
-        "@polkadot/util-crypto": "^1.8.1"
-      }
-    },
-    "@polkadot/rpc-core": {
-      "version": "0.95.2",
-      "resolved": "https://registry.npmjs.org/@polkadot/rpc-core/-/rpc-core-0.95.2.tgz",
-      "integrity": "sha512-IjuzYfNSBWalzingkvpGdO9lZH6s5wFc5lWCINFDP/MSlnLfKzufzR0JeSiVCluraoohtUB/INVuBujDziZPzg==",
-      "requires": {
-        "@babel/runtime": "^7.6.3",
-        "@polkadot/jsonrpc": "^0.95.2",
-        "@polkadot/rpc-provider": "^0.95.2",
-        "@polkadot/types": "^0.95.2",
-        "@polkadot/util": "^1.6.1",
-        "rxjs": "^6.5.3"
-      }
-    },
-    "@polkadot/rpc-provider": {
-      "version": "0.95.2",
-      "resolved": "https://registry.npmjs.org/@polkadot/rpc-provider/-/rpc-provider-0.95.2.tgz",
-      "integrity": "sha512-+vSoI9mdHPnjL7jK666+HLJ21Ymxo8GHdO72mI1A3xGO7wBmjKbUMHEYUtRwxg7DGF4mSZ/HJogoSU4i9smzpw==",
-      "requires": {
-        "@babel/runtime": "^7.6.3",
-        "@polkadot/api-metadata": "^0.95.2",
-        "@polkadot/util": "^1.6.1",
-        "@polkadot/util-crypto": "^1.6.1",
-        "@types/nock": "^11.1.0",
-        "eventemitter3": "^4.0.0",
-        "isomorphic-fetch": "^2.2.1",
-        "websocket": "^1.0.30"
-      }
-    },
-    "@polkadot/types": {
-      "version": "0.95.2",
-      "resolved": "https://registry.npmjs.org/@polkadot/types/-/types-0.95.2.tgz",
-      "integrity": "sha512-YiZbLgJ82rmgwbsYWEL8vtYqO1n1xEPxD5C8D0dmZQcwn9iSUibIqeij1xfd8y2ZyUmMW3YhdoJR6a8Ah6g3yw==",
-      "requires": {
-        "@babel/runtime": "^7.6.3",
-        "@polkadot/util": "^1.6.1",
-        "@polkadot/util-crypto": "^1.6.1",
-        "@types/memoizee": "^0.4.3",
-        "memoizee": "^0.4.14"
-      }
-    },
-    "@polkadot/util": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/@polkadot/util/-/util-1.8.1.tgz",
-      "integrity": "sha512-sFpr+JLCG9d+epjboXsmJ1qcKa96r8ZYzXmVo8+aPzI/9jKKyez6Unox/dnfnpKppZB2nJuLcsxQm6nocp2Caw==",
-      "requires": {
-        "@babel/runtime": "^7.7.7",
-        "@types/bn.js": "^4.11.6",
-        "bn.js": "^4.11.8",
-        "camelcase": "^5.3.1",
-        "chalk": "^3.0.0",
-        "ip-regex": "^4.1.0",
-        "moment": "^2.24.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "@polkadot/util-crypto": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/@polkadot/util-crypto/-/util-crypto-1.8.1.tgz",
-      "integrity": "sha512-ypUs10hV1HPvYc0ZsEu+LTGSEh0rkr0as/FUh7+Z9v3Bxibn3aO+EOxJPQuDbZZ59FSMRmc9SeOSa0wn9ddrnw==",
-      "requires": {
-        "@babel/runtime": "^7.7.7",
-        "@polkadot/util": "^1.8.1",
-        "@polkadot/wasm-crypto": "^0.14.1",
-        "@types/bip39": "^2.4.2",
-        "@types/bs58": "^4.0.0",
-        "@types/pbkdf2": "^3.0.0",
-        "@types/secp256k1": "^3.5.0",
-        "@types/xxhashjs": "^0.2.1",
-        "base-x": "3.0.5",
-        "bip39": "^2.5.0",
-        "blakejs": "^1.1.0",
-        "bs58": "^4.0.1",
-        "js-sha3": "^0.8.0",
-        "secp256k1": "^3.8.0",
-        "tweetnacl": "^1.0.1",
-        "xxhashjs": "^0.2.2"
-      },
-      "dependencies": {
-        "secp256k1": {
-          "version": "3.8.0",
-          "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-3.8.0.tgz",
-          "integrity": "sha512-k5ke5avRZbtl9Tqx/SA7CbY3NF6Ro+Sj9cZxezFzuBlLDmyqPiL8hJJ+EmzD8Ig4LUDByHJ3/iPOVoRixs/hmw==",
-          "requires": {
-            "bindings": "^1.5.0",
-            "bip66": "^1.1.5",
-            "bn.js": "^4.11.8",
-            "create-hash": "^1.2.0",
-            "drbg.js": "^1.0.1",
-            "elliptic": "^6.5.2",
-            "nan": "^2.14.0",
-            "safe-buffer": "^5.1.2"
-          }
-        },
-        "tweetnacl": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz",
-          "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw=="
-        }
-      }
-    },
-    "@polkadot/wasm-crypto": {
-      "version": "0.14.1",
-      "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto/-/wasm-crypto-0.14.1.tgz",
-      "integrity": "sha512-Xng7L2Z8TNZa/5g6pot4O06Jf0ohQRZdvfl8eQL+E/L2mcqJYC1IjkMxJBSBuQEV7hisWzh9mHOy5WCcgPk29Q=="
-    },
-    "@sindresorhus/is": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz",
-      "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow=="
-    },
-    "@types/bip39": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/@types/bip39/-/bip39-2.4.2.tgz",
-      "integrity": "sha512-Vo9lqOIRq8uoIzEVrV87ZvcIM0PN9t0K3oYZ/CS61fIYKCBdOIM7mlWzXuRvSXrDtVa1uUO2w1cdfufxTC0bzg==",
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/bn.js": {
-      "version": "4.11.6",
-      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-4.11.6.tgz",
-      "integrity": "sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==",
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/bs58": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@types/bs58/-/bs58-4.0.1.tgz",
-      "integrity": "sha512-yfAgiWgVLjFCmRv8zAcOIHywYATEwiTVccTLnRp6UxTNavT55M9d/uhK3T03St/+8/z/wW+CRjGKUNmEqoHHCA==",
-      "requires": {
-        "base-x": "^3.0.6"
-      },
-      "dependencies": {
-        "base-x": {
-          "version": "3.0.8",
-          "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.8.tgz",
-          "integrity": "sha512-Rl/1AWP4J/zRrk54hhlxH4drNxPJXYUaKffODVI53/dAsV4t9fBxyxYKAVPU1XBHxYwOWP9h9H0hM2MVw4YfJA==",
-          "requires": {
-            "safe-buffer": "^5.0.1"
-          }
-        }
-      }
-    },
-    "@types/caseless": {
-      "version": "0.12.2",
-      "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz",
-      "integrity": "sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w=="
-    },
-    "@types/chai": {
-      "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.11.tgz",
-      "integrity": "sha512-t7uW6eFafjO+qJ3BIV2gGUyZs27egcNRkUdalkud+Qa3+kg//f129iuOFivHDXQ+vnU3fDXuwgv0cqMCbcE8sw==",
-      "dev": true
-    },
-    "@types/color-name": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
-      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="
-    },
-    "@types/events": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
-      "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==",
-      "dev": true
-    },
-    "@types/glob": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz",
-      "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==",
-      "dev": true,
-      "requires": {
-        "@types/events": "*",
-        "@types/minimatch": "*",
-        "@types/node": "*"
-      }
-    },
-    "@types/js-yaml": {
-      "version": "3.12.4",
-      "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.4.tgz",
-      "integrity": "sha512-fYMgzN+9e28R81weVN49inn/u798ruU91En1ZnGvSZzCRc5jXx9B2EDhlRaWmcO1RIxFHL8AajRXzxDuJu93+A=="
-    },
-    "@types/lodash": {
-      "version": "4.14.152",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.152.tgz",
-      "integrity": "sha512-Vwf9YF2x1GE3WNeUMjT5bTHa2DqgUo87ocdgTScupY2JclZ5Nn7W2RLM/N0+oreexUk8uaVugR81NnTY/jNNXg==",
-      "dev": true
-    },
-    "@types/memoizee": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/@types/memoizee/-/memoizee-0.4.4.tgz",
-      "integrity": "sha512-c9+1g6+6vEqcw5UuM0RbfQV0mssmZcoG9+hNC5ptDCsv4G+XJW1Z4pE13wV5zbc9e0+YrDydALBTiD3nWG1a3g=="
-    },
-    "@types/minimatch": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
-      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
-      "dev": true
-    },
-    "@types/mocha": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-7.0.2.tgz",
-      "integrity": "sha512-ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w==",
-      "dev": true
-    },
-    "@types/nock": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/@types/nock/-/nock-11.1.0.tgz",
-      "integrity": "sha512-jI/ewavBQ7X5178262JQR0ewicPAcJhXS/iFaNJl0VHLfyosZ/kwSrsa6VNQNSO8i9d8SqdRgOtZSOKJ/+iNMw==",
-      "requires": {
-        "nock": "*"
-      }
-    },
-    "@types/node": {
-      "version": "10.17.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.24.tgz",
-      "integrity": "sha512-5SCfvCxV74kzR3uWgTYiGxrd69TbT1I6+cMx1A5kEly/IVveJBimtAMlXiEyVFn5DvUFewQWxOOiJhlxeQwxgA=="
-    },
-    "@types/pbkdf2": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/pbkdf2/-/pbkdf2-3.0.0.tgz",
-      "integrity": "sha512-6J6MHaAlBJC/eVMy9jOwj9oHaprfutukfW/Dyt0NEnpQ/6HN6YQrpvLwzWdWDeWZIdenjGHlbYDzyEODO5Z+2Q==",
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/request": {
-      "version": "2.48.5",
-      "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.5.tgz",
-      "integrity": "sha512-/LO7xRVnL3DxJ1WkPGDQrp4VTV1reX9RkC85mJ+Qzykj2Bdw+mG15aAfDahc76HtknjzE16SX/Yddn6MxVbmGQ==",
-      "requires": {
-        "@types/caseless": "*",
-        "@types/node": "*",
-        "@types/tough-cookie": "*",
-        "form-data": "^2.5.0"
-      }
-    },
-    "@types/secp256k1": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/@types/secp256k1/-/secp256k1-3.5.3.tgz",
-      "integrity": "sha512-NGcsPDR0P+Q71O63e2ayshmiZGAwCOa/cLJzOIuhOiDvmbvrCIiVtEpqdCJGogG92Bnr6tw/6lqVBsRMEl15OQ==",
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/sinon": {
-      "version": "9.0.4",
-      "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-9.0.4.tgz",
-      "integrity": "sha512-sJmb32asJZY6Z2u09bl0G2wglSxDlROlAejCjsnor+LzBMz17gu8IU7vKC/vWDnv9zEq2wqADHVXFjf4eE8Gdw==",
-      "dev": true,
-      "requires": {
-        "@types/sinonjs__fake-timers": "*"
-      }
-    },
-    "@types/sinonjs__fake-timers": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.1.tgz",
-      "integrity": "sha512-yYezQwGWty8ziyYLdZjwxyMb0CZR49h8JALHGrxjQHWlqGgc8kLdHEgWrgL0uZ29DMvEVBDnHU2Wg36zKSIUtA==",
-      "dev": true
-    },
-    "@types/tough-cookie": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.0.tgz",
-      "integrity": "sha512-I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A=="
-    },
-    "@types/underscore": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.10.0.tgz",
-      "integrity": "sha512-ZAbqul7QAKpM2h1PFGa5ETN27ulmqtj0QviYHasw9LffvXZvVHuraOx/FOsIPPDNGZN0Qo1nASxxSfMYOtSoCw=="
-    },
-    "@types/ws": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-6.0.4.tgz",
-      "integrity": "sha512-PpPrX7SZW9re6+Ha8ojZG4Se8AZXgf0GK6zmfqEuCsY49LFDNXO3SByp44X3dFEqtB73lkCDAdUazhAjVPiNwg==",
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/xxhashjs": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/@types/xxhashjs/-/xxhashjs-0.2.2.tgz",
-      "integrity": "sha512-+hlk/W1kgnZn0vR22XNhxHk/qIRQYF54i0UTF2MwBAPd0e7xSy+jKOJwSwTdRQrNnOMRVv+vsh8ITV0uyhp2yg==",
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "acorn": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.2.0.tgz",
-      "integrity": "sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ==",
-      "dev": true
-    },
-    "acorn-jsx": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz",
-      "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==",
-      "dev": true
-    },
-    "aggregate-error": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-1.0.0.tgz",
-      "integrity": "sha1-iINE2tAiCnLjr1CQYRf0h3GSX6w=",
-      "requires": {
-        "clean-stack": "^1.0.0",
-        "indent-string": "^3.0.0"
-      }
-    },
-    "ajv": {
-      "version": "6.12.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
-      "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
-      "requires": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      }
-    },
-    "ansi-escapes": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
-      "dev": true,
-      "requires": {
-        "type-fest": "^0.11.0"
-      }
-    },
-    "ansi-regex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
-    },
-    "ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "requires": {
-        "color-convert": "^1.9.0"
-      }
-    },
-    "ansicolors": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz",
-      "integrity": "sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk=",
-      "dev": true
-    },
-    "append-transform": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-1.0.0.tgz",
-      "integrity": "sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==",
-      "dev": true,
-      "requires": {
-        "default-require-extensions": "^2.0.0"
-      }
-    },
-    "archy": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
-      "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
-      "dev": true
-    },
-    "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "array-includes": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz",
-      "integrity": "sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0",
-        "is-string": "^1.0.5"
-      }
-    },
-    "array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true
-    },
-    "array.prototype.flat": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz",
-      "integrity": "sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
-      }
-    },
-    "asn1": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-      "requires": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
-    "assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-    },
-    "assertion-error": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
-      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
-      "dev": true
-    },
-    "astral-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
-      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
-      "dev": true
-    },
-    "async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
-      "requires": {
-        "lodash": "^4.17.14"
-      }
-    },
-    "async-limiter": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
-      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="
-    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
-    },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
-    },
-    "aws4": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz",
-      "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug=="
-    },
-    "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
-    },
-    "base-x": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.5.tgz",
-      "integrity": "sha512-C3picSgzPSLE+jW3tcBzJoGwitOtazb5B+5YmAxZm2ybmTi9LNgAtDO/jjVEBZwHoXmDBZ9m/IELj3elJVRBcA==",
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "base64-js": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
-    },
-    "base64url": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz",
-      "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A=="
-    },
-    "bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "requires": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
-    "bindings": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-      "requires": {
-        "file-uri-to-path": "1.0.0"
-      }
-    },
-    "bip39": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/bip39/-/bip39-2.6.0.tgz",
-      "integrity": "sha512-RrnQRG2EgEoqO24ea+Q/fftuPUZLmrEM3qNhhGsA3PbaXaCW791LTzPuVyx/VprXQcTbPJ3K3UeTna8ZnVl2sg==",
-      "requires": {
-        "create-hash": "^1.1.0",
-        "pbkdf2": "^3.0.9",
-        "randombytes": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "unorm": "^1.3.3"
-      }
-    },
-    "bip66": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/bip66/-/bip66-1.1.5.tgz",
-      "integrity": "sha1-AfqHSHhcpwlV1QESF9GzE5lpyiI=",
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "bl": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz",
-      "integrity": "sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==",
-      "dev": true,
-      "requires": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
-      }
-    },
-    "blakejs": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/blakejs/-/blakejs-1.1.0.tgz",
-      "integrity": "sha1-ad+S75U6qIylGjLfarHFShVfx6U="
-    },
-    "bn.js": {
-      "version": "4.11.9",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "requires": {
-        "fill-range": "^7.0.1"
-      }
-    },
-    "brorand": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
-    },
-    "browserify-aes": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-      "requires": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "browserify-zlib": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
-      "requires": {
-        "pako": "~1.0.5"
-      }
-    },
-    "bs58": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
-      "integrity": "sha1-vhYedsNU9veIrkBx9j806MTwpCo=",
-      "requires": {
-        "base-x": "^3.0.2"
-      }
-    },
-    "buffer": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz",
-      "integrity": "sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==",
-      "requires": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4"
-      }
-    },
-    "buffer-xor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk="
-    },
-    "byline": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz",
-      "integrity": "sha1-dBxSFkaOrcRXsDQQEYrXfejB3bE="
-    },
-    "cacheable-request": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz",
-      "integrity": "sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=",
-      "requires": {
-        "clone-response": "1.0.2",
-        "get-stream": "3.0.0",
-        "http-cache-semantics": "3.8.1",
-        "keyv": "3.0.0",
-        "lowercase-keys": "1.0.0",
-        "normalize-url": "2.0.1",
-        "responselike": "1.0.2"
-      },
-      "dependencies": {
-        "get-stream": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
-        },
-        "lowercase-keys": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz",
-          "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY="
-        }
-      }
-    },
-    "caching-transform": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-3.0.2.tgz",
-      "integrity": "sha512-Mtgcv3lh3U0zRii/6qVgQODdPA4G3zhG+jtbCWj39RXuUFTMzH0vcdMtaJS1jPowd+It2Pqr6y3NJMQqOqCE2w==",
-      "dev": true,
-      "requires": {
-        "hasha": "^3.0.0",
-        "make-dir": "^2.0.0",
-        "package-hash": "^3.0.0",
-        "write-file-atomic": "^2.4.2"
-      },
-      "dependencies": {
-        "make-dir": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-          "dev": true,
-          "requires": {
-            "pify": "^4.0.1",
-            "semver": "^5.6.0"
-          }
-        },
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-          "dev": true
-        },
-        "write-file-atomic": {
-          "version": "2.4.3",
-          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
-          "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.11",
-            "imurmurhash": "^0.1.4",
-            "signal-exit": "^3.0.2"
-          }
-        }
-      }
-    },
-    "callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true
-    },
-    "camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
-    },
-    "cardinal": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/cardinal/-/cardinal-2.1.1.tgz",
-      "integrity": "sha1-fMEFXYItISlU0HsIXeolHMe8VQU=",
-      "dev": true,
-      "requires": {
-        "ansicolors": "~0.3.2",
-        "redeyed": "~2.1.0"
-      }
-    },
-    "caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
-    },
-    "chai": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz",
-      "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==",
-      "dev": true,
-      "requires": {
-        "assertion-error": "^1.1.0",
-        "check-error": "^1.0.2",
-        "deep-eql": "^3.0.1",
-        "get-func-name": "^2.0.0",
-        "pathval": "^1.1.0",
-        "type-detect": "^4.0.5"
-      }
-    },
-    "chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      }
-    },
-    "chardet": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-      "dev": true
-    },
-    "check-error": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
-      "dev": true
-    },
-    "chownr": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-      "dev": true
-    },
-    "cipher-base": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "clean-regexp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/clean-regexp/-/clean-regexp-1.0.0.tgz",
-      "integrity": "sha1-jffHquUf02h06PjQW5GAvBGj/tc=",
-      "dev": true,
-      "requires": {
-        "escape-string-regexp": "^1.0.5"
-      }
-    },
-    "clean-stack": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-1.3.0.tgz",
-      "integrity": "sha1-noIVAa6XmYbEax1m0tQy2y/UrjE="
-    },
-    "cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dev": true,
-      "requires": {
-        "restore-cursor": "^3.1.0"
-      }
-    },
-    "cli-progress": {
-      "version": "3.8.2",
-      "resolved": "https://registry.npmjs.org/cli-progress/-/cli-progress-3.8.2.tgz",
-      "integrity": "sha512-qRwBxLldMSfxB+YGFgNRaj5vyyHe1yMpVeDL79c+7puGujdKJHQHydgqXDcrkvQgJ5U/d3lpf6vffSoVVUftVQ==",
-      "dev": true,
-      "requires": {
-        "colors": "^1.1.2",
-        "string-width": "^4.2.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
-        },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        }
-      }
-    },
-    "cli-ux": {
-      "version": "5.4.6",
-      "resolved": "https://registry.npmjs.org/cli-ux/-/cli-ux-5.4.6.tgz",
-      "integrity": "sha512-EeiS2TzEndRVknCqE+8Ri8g0bsP617a1nq6n+3Trwft1JCDzyUNlX2J1fl7fwTgRPWtmBmiF6xIyueL5YGs65g==",
-      "dev": true,
-      "requires": {
-        "@oclif/command": "^1.6.0",
-        "@oclif/errors": "^1.2.1",
-        "@oclif/linewrap": "^1.0.0",
-        "@oclif/screen": "^1.0.3",
-        "ansi-escapes": "^4.3.0",
-        "ansi-styles": "^4.2.0",
-        "cardinal": "^2.1.1",
-        "chalk": "^2.4.1",
-        "clean-stack": "^2.0.0",
-        "cli-progress": "^3.4.0",
-        "extract-stack": "^1.0.0",
-        "fs-extra": "^7.0.1",
-        "hyperlinker": "^1.0.0",
-        "indent-string": "^4.0.0",
-        "is-wsl": "^1.1.0",
-        "js-yaml": "^3.13.1",
-        "lodash": "^4.17.11",
-        "natural-orderby": "^2.0.1",
-        "object-treeify": "^1.1.4",
-        "password-prompt": "^1.1.2",
-        "semver": "^5.6.0",
-        "string-width": "^3.1.0",
-        "strip-ansi": "^5.1.0",
-        "supports-color": "^5.5.0",
-        "supports-hyperlinks": "^1.0.1",
-        "tslib": "^1.9.3"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "clean-stack": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-          "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-          "dev": true
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "indent-string": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-          "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        }
-      }
-    },
-    "cli-width": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
-      "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==",
-      "dev": true
-    },
-    "cliui": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-      "dev": true,
-      "requires": {
-        "string-width": "^3.1.0",
-        "strip-ansi": "^5.2.0",
-        "wrap-ansi": "^5.1.0"
-      },
-      "dependencies": {
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        },
-        "wrap-ansi": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.0",
-            "string-width": "^3.0.0",
-            "strip-ansi": "^5.0.0"
-          }
-        }
-      }
-    },
-    "clone-response": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
-      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
-      "requires": {
-        "mimic-response": "^1.0.0"
-      }
-    },
-    "color": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/color/-/color-3.0.0.tgz",
-      "integrity": "sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==",
-      "requires": {
-        "color-convert": "^1.9.1",
-        "color-string": "^1.5.2"
-      }
-    },
-    "color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "requires": {
-        "color-name": "1.1.3"
-      }
-    },
-    "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-    },
-    "color-string": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz",
-      "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==",
-      "requires": {
-        "color-name": "^1.0.0",
-        "simple-swizzle": "^0.2.2"
-      }
-    },
-    "colornames": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz",
-      "integrity": "sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y="
-    },
-    "colors": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
-      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="
-    },
-    "colorspace": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.2.tgz",
-      "integrity": "sha512-vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ==",
-      "requires": {
-        "color": "3.0.x",
-        "text-hex": "1.0.x"
-      }
-    },
-    "combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "requires": {
-        "delayed-stream": "~1.0.0"
-      }
-    },
-    "commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
-      "dev": true
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-    },
-    "contains-path": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
-      "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
-      "dev": true
-    },
-    "content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-      "dev": true
-    },
-    "convert-source-map": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.1.1"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
-        }
-      }
-    },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-    },
-    "cp-file": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/cp-file/-/cp-file-6.2.0.tgz",
-      "integrity": "sha512-fmvV4caBnofhPe8kOcitBwSn2f39QLjnAnGq3gO9dfd75mUytzKNZB1hde6QHunW2Rt+OwuBOMc3i1tNElbszA==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "make-dir": "^2.0.0",
-        "nested-error-stacks": "^2.0.0",
-        "pify": "^4.0.1",
-        "safe-buffer": "^5.0.1"
-      },
-      "dependencies": {
-        "make-dir": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-          "dev": true,
-          "requires": {
-            "pify": "^4.0.1",
-            "semver": "^5.6.0"
-          }
-        },
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-          "dev": true
-        }
-      }
-    },
-    "create-hash": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-      "requires": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
-      }
-    },
-    "create-hmac": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-      "requires": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
-    "cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-      "requires": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      }
-    },
-    "cuint": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz",
-      "integrity": "sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs="
-    },
-    "d": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
-      "requires": {
-        "es5-ext": "^0.10.50",
-        "type": "^1.0.1"
-      }
-    },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
-    "debug": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-      "requires": {
-        "ms": "^2.1.1"
-      }
-    },
-    "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true
-    },
-    "decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
-    },
-    "decompress-response": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
-      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
-      "requires": {
-        "mimic-response": "^1.0.0"
-      }
-    },
-    "deep-eql": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
-      "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
-      "dev": true,
-      "requires": {
-        "type-detect": "^4.0.0"
-      }
-    },
-    "deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
-      "dev": true
-    },
-    "default-require-extensions": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-2.0.0.tgz",
-      "integrity": "sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=",
-      "dev": true,
-      "requires": {
-        "strip-bom": "^3.0.0"
-      },
-      "dependencies": {
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-          "dev": true
-        }
-      }
-    },
-    "define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "dev": true,
-      "requires": {
-        "object-keys": "^1.0.12"
-      }
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
-    },
-    "detect-indent": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.0.0.tgz",
-      "integrity": "sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA==",
-      "dev": true
-    },
-    "diagnostics": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.1.tgz",
-      "integrity": "sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ==",
-      "requires": {
-        "colorspace": "1.1.x",
-        "enabled": "1.0.x",
-        "kuler": "1.0.x"
-      }
-    },
-    "dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "requires": {
-        "path-type": "^4.0.0"
-      }
-    },
-    "doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "requires": {
-        "esutils": "^2.0.2"
-      }
-    },
-    "drbg.js": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/drbg.js/-/drbg.js-1.0.1.tgz",
-      "integrity": "sha1-Pja2xCs3BDgjzbwzLVjzHiRFSAs=",
-      "requires": {
-        "browserify-aes": "^1.0.6",
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4"
-      }
-    },
-    "duplexer3": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
-      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI="
-    },
-    "ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-      "requires": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
-    "elliptic": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
-      "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
-      "requires": {
-        "bn.js": "^4.4.0",
-        "brorand": "^1.0.1",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.0"
-      }
-    },
-    "emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
-    },
-    "enabled": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz",
-      "integrity": "sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M=",
-      "requires": {
-        "env-variable": "0.0.x"
-      }
-    },
-    "encoding": {
-      "version": "0.1.12",
-      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
-      "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
-      "requires": {
-        "iconv-lite": "~0.4.13"
-      }
-    },
-    "end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "requires": {
-        "once": "^1.4.0"
-      }
-    },
-    "env-variable": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/env-variable/-/env-variable-0.0.6.tgz",
-      "integrity": "sha512-bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg=="
-    },
-    "error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
-      "requires": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "es-abstract": {
-      "version": "1.17.5",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
-      "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
-      "dev": true,
-      "requires": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.1.5",
-        "is-regex": "^1.0.5",
-        "object-inspect": "^1.7.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.0",
-        "string.prototype.trimleft": "^2.1.1",
-        "string.prototype.trimright": "^2.1.1"
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "requires": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      }
-    },
-    "es5-ext": {
-      "version": "0.10.53",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
-      "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
-      "requires": {
-        "es6-iterator": "~2.0.3",
-        "es6-symbol": "~3.1.3",
-        "next-tick": "~1.0.0"
-      },
-      "dependencies": {
-        "next-tick": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-          "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw="
-        }
-      }
-    },
-    "es6-error": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
-      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
-      "dev": true
-    },
-    "es6-iterator": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-      "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.35",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "es6-promise": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
-      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
-    },
-    "es6-symbol": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
-      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
-      "requires": {
-        "d": "^1.0.1",
-        "ext": "^1.1.2"
-      }
-    },
-    "es6-weak-map": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
-      "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
-      "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.46",
-        "es6-iterator": "^2.0.3",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
-    },
-    "eslint": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.1.0.tgz",
-      "integrity": "sha512-DfS3b8iHMK5z/YLSme8K5cge168I8j8o1uiVmFCgnnjxZQbCGyraF8bMl7Ju4yfBmCuxD7shOF7eqGkcuIHfsA==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "ajv": "^6.10.0",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.0.1",
-        "doctrine": "^3.0.0",
-        "eslint-scope": "^5.0.0",
-        "eslint-utils": "^2.0.0",
-        "eslint-visitor-keys": "^1.1.0",
-        "espree": "^7.0.0",
-        "esquery": "^1.2.0",
-        "esutils": "^2.0.2",
-        "file-entry-cache": "^5.0.1",
-        "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^5.0.0",
-        "globals": "^12.1.0",
-        "ignore": "^4.0.6",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "inquirer": "^7.0.0",
-        "is-glob": "^4.0.0",
-        "js-yaml": "^3.13.1",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash": "^4.17.14",
-        "minimatch": "^3.0.4",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
-        "progress": "^2.0.0",
-        "regexpp": "^3.1.0",
-        "semver": "^7.2.1",
-        "strip-ansi": "^6.0.0",
-        "strip-json-comments": "^3.1.0",
-        "table": "^5.2.3",
-        "text-table": "^0.2.0",
-        "v8-compile-cache": "^2.0.3"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
-          "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "cross-spawn": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-          "dev": true,
-          "requires": {
-            "path-key": "^3.1.0",
-            "shebang-command": "^2.0.0",
-            "which": "^2.0.1"
-          }
-        },
-        "globals": {
-          "version": "12.4.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
-          "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
-          "dev": true,
-          "requires": {
-            "type-fest": "^0.8.1"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "ignore": {
-          "version": "4.0.6",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-          "dev": true
-        },
-        "path-key": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-          "dev": true
-        },
-        "semver": {
-          "version": "7.3.2",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-          "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-          "dev": true
-        },
-        "shebang-command": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-          "dev": true,
-          "requires": {
-            "shebang-regex": "^3.0.0"
-          }
-        },
-        "shebang-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "type-fest": {
-          "version": "0.8.1",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-          "dev": true
-        },
-        "which": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        }
-      }
-    },
-    "eslint-ast-utils": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-ast-utils/-/eslint-ast-utils-1.1.0.tgz",
-      "integrity": "sha512-otzzTim2/1+lVrlH19EfQQJEhVJSu0zOb9ygb3iapN6UlyaDtyRq4b5U1FuW0v1lRa9Fp/GJyHkSwm6NqABgCA==",
-      "dev": true,
-      "requires": {
-        "lodash.get": "^4.4.2",
-        "lodash.zip": "^4.2.0"
-      }
-    },
-    "eslint-config-oclif": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-oclif/-/eslint-config-oclif-3.1.0.tgz",
-      "integrity": "sha512-Tqgy43cNXsSdhTLWW4RuDYGFhV240sC4ISSv/ZiUEg/zFxExSEUpRE6J+AGnkKY9dYwIW4C9b2YSUVv8z/miMA==",
-      "dev": true,
-      "requires": {
-        "eslint-config-xo-space": "^0.20.0",
-        "eslint-plugin-mocha": "^5.2.0",
-        "eslint-plugin-node": "^7.0.1",
-        "eslint-plugin-unicorn": "^6.0.1"
-      },
-      "dependencies": {
-        "eslint-plugin-es": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-1.4.1.tgz",
-          "integrity": "sha512-5fa/gR2yR3NxQf+UXkeLeP8FBBl6tSgdrAz1+cF84v1FMM4twGwQoqTnn+QxFLcPOrF4pdKEJKDB/q9GoyJrCA==",
-          "dev": true,
-          "requires": {
-            "eslint-utils": "^1.4.2",
-            "regexpp": "^2.0.1"
-          }
-        },
-        "eslint-plugin-node": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-7.0.1.tgz",
-          "integrity": "sha512-lfVw3TEqThwq0j2Ba/Ckn2ABdwmL5dkOgAux1rvOk6CO7A6yGyPI2+zIxN6FyNkp1X1X/BSvKOceD6mBWSj4Yw==",
-          "dev": true,
-          "requires": {
-            "eslint-plugin-es": "^1.3.1",
-            "eslint-utils": "^1.3.1",
-            "ignore": "^4.0.2",
-            "minimatch": "^3.0.4",
-            "resolve": "^1.8.1",
-            "semver": "^5.5.0"
-          }
-        },
-        "eslint-plugin-unicorn": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-6.0.1.tgz",
-          "integrity": "sha512-hjy9LhTdtL7pz8WTrzS0CGXRkWK3VAPLDjihofj8JC+uxQLfXm0WwZPPPB7xKmcjRyoH+jruPHOCrHNEINpG/Q==",
-          "dev": true,
-          "requires": {
-            "clean-regexp": "^1.0.0",
-            "eslint-ast-utils": "^1.0.0",
-            "import-modules": "^1.1.0",
-            "lodash.camelcase": "^4.1.1",
-            "lodash.kebabcase": "^4.0.1",
-            "lodash.snakecase": "^4.0.1",
-            "lodash.upperfirst": "^4.2.0",
-            "safe-regex": "^1.1.0"
-          }
-        },
-        "eslint-utils": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
-          "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
-          "dev": true,
-          "requires": {
-            "eslint-visitor-keys": "^1.1.0"
-          }
-        },
-        "ignore": {
-          "version": "4.0.6",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-          "dev": true
-        },
-        "regexpp": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
-          "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
-          "dev": true
-        }
-      }
-    },
-    "eslint-config-standard": {
-      "version": "14.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-14.1.1.tgz",
-      "integrity": "sha512-Z9B+VR+JIXRxz21udPTL9HpFMyoMUEeX1G251EQ6e05WD9aPVtVBn09XUmZ259wCMlCDmYDSZG62Hhm+ZTJcUg==",
-      "dev": true
-    },
-    "eslint-config-xo": {
-      "version": "0.24.2",
-      "resolved": "https://registry.npmjs.org/eslint-config-xo/-/eslint-config-xo-0.24.2.tgz",
-      "integrity": "sha512-ivQ7qISScW6gfBp+p31nQntz1rg34UCybd3uvlngcxt5Utsf4PMMi9QoAluLFcPUM5Tvqk4JGraR9qu3msKPKQ==",
-      "dev": true
-    },
-    "eslint-config-xo-space": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-xo-space/-/eslint-config-xo-space-0.20.0.tgz",
-      "integrity": "sha512-bOsoZA8M6v1HviDUIGVq1fLVnSu3mMZzn85m2tqKb73tSzu4GKD4Jd2Py4ZKjCgvCbRRByEB5HPC3fTMnnJ1uw==",
-      "dev": true,
-      "requires": {
-        "eslint-config-xo": "^0.24.0"
-      }
-    },
-    "eslint-import-resolver-node": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz",
-      "integrity": "sha512-b8crLDo0M5RSe5YG8Pu2DYBj71tSB6OvXkfzwbJU2w7y8P4/yo0MyF8jU26IEuEuHF2K5/gcAJE3LhQGqBBbVg==",
-      "dev": true,
-      "requires": {
-        "debug": "^2.6.9",
-        "resolve": "^1.13.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
-    "eslint-module-utils": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz",
-      "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==",
-      "dev": true,
-      "requires": {
-        "debug": "^2.6.9",
-        "pkg-dir": "^2.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "dev": true,
-          "requires": {
-            "locate-path": "^2.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-          "dev": true,
-          "requires": {
-            "p-locate": "^2.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        },
-        "p-limit": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-          "dev": true,
-          "requires": {
-            "p-try": "^1.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-          "dev": true,
-          "requires": {
-            "p-limit": "^1.1.0"
-          }
-        },
-        "p-try": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-          "dev": true
-        },
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "dev": true
-        },
-        "pkg-dir": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
-          "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
-          "dev": true,
-          "requires": {
-            "find-up": "^2.1.0"
-          }
-        }
-      }
-    },
-    "eslint-plugin-es": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz",
-      "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==",
-      "dev": true,
-      "requires": {
-        "eslint-utils": "^2.0.0",
-        "regexpp": "^3.0.0"
-      }
-    },
-    "eslint-plugin-import": {
-      "version": "2.20.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.20.2.tgz",
-      "integrity": "sha512-FObidqpXrR8OnCh4iNsxy+WACztJLXAHBO5hK79T1Hc77PgQZkyDGA5Ag9xAvRpglvLNxhH/zSmZ70/pZ31dHg==",
-      "dev": true,
-      "requires": {
-        "array-includes": "^3.0.3",
-        "array.prototype.flat": "^1.2.1",
-        "contains-path": "^0.1.0",
-        "debug": "^2.6.9",
-        "doctrine": "1.5.0",
-        "eslint-import-resolver-node": "^0.3.2",
-        "eslint-module-utils": "^2.4.1",
-        "has": "^1.0.3",
-        "minimatch": "^3.0.4",
-        "object.values": "^1.1.0",
-        "read-pkg-up": "^2.0.0",
-        "resolve": "^1.12.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "doctrine": {
-          "version": "1.5.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
-          "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2",
-            "isarray": "^1.0.0"
-          }
-        },
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "dev": true,
-          "requires": {
-            "locate-path": "^2.0.0"
-          }
-        },
-        "load-json-file": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^2.2.0",
-            "pify": "^2.0.0",
-            "strip-bom": "^3.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-          "dev": true,
-          "requires": {
-            "p-locate": "^2.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        },
-        "p-limit": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-          "dev": true,
-          "requires": {
-            "p-try": "^1.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-          "dev": true,
-          "requires": {
-            "p-limit": "^1.1.0"
-          }
-        },
-        "p-try": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-          "dev": true
-        },
-        "parse-json": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-          "dev": true,
-          "requires": {
-            "error-ex": "^1.2.0"
-          }
-        },
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "dev": true
-        },
-        "path-type": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
-          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
-          "dev": true,
-          "requires": {
-            "pify": "^2.0.0"
-          }
-        },
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
-        },
-        "read-pkg": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
-          "dev": true,
-          "requires": {
-            "load-json-file": "^2.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^2.0.0"
-          }
-        },
-        "read-pkg-up": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
-          "dev": true,
-          "requires": {
-            "find-up": "^2.0.0",
-            "read-pkg": "^2.0.0"
-          }
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-          "dev": true
-        }
-      }
-    },
-    "eslint-plugin-mocha": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-5.3.0.tgz",
-      "integrity": "sha512-3uwlJVLijjEmBeNyH60nzqgA1gacUWLUmcKV8PIGNvj1kwP/CTgAWQHn2ayyJVwziX+KETkr9opNwT1qD/RZ5A==",
-      "dev": true,
-      "requires": {
-        "ramda": "^0.26.1"
-      }
-    },
-    "eslint-plugin-node": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz",
-      "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==",
-      "dev": true,
-      "requires": {
-        "eslint-plugin-es": "^3.0.0",
-        "eslint-utils": "^2.0.0",
-        "ignore": "^5.1.1",
-        "minimatch": "^3.0.4",
-        "resolve": "^1.10.1",
-        "semver": "^6.1.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
-    },
-    "eslint-plugin-promise": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz",
-      "integrity": "sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw==",
-      "dev": true
-    },
-    "eslint-plugin-standard": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz",
-      "integrity": "sha512-v/KBnfyaOMPmZc/dmc6ozOdWqekGp7bBGq4jLAecEfPGmfKiWS4sA8sC0LqiV9w5qmXAtXVn4M3p1jSyhY85SQ==",
-      "dev": true
-    },
-    "eslint-scope": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz",
-      "integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==",
-      "dev": true,
-      "requires": {
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
-      }
-    },
-    "eslint-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.0.0.tgz",
-      "integrity": "sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==",
-      "dev": true,
-      "requires": {
-        "eslint-visitor-keys": "^1.1.0"
-      }
-    },
-    "eslint-visitor-keys": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz",
-      "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==",
-      "dev": true
-    },
-    "espree": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-7.0.0.tgz",
-      "integrity": "sha512-/r2XEx5Mw4pgKdyb7GNLQNsu++asx/dltf/CI8RFi9oGHxmQFgvLbc5Op4U6i8Oaj+kdslhJtVlEZeAqH5qOTw==",
-      "dev": true,
-      "requires": {
-        "acorn": "^7.1.1",
-        "acorn-jsx": "^5.2.0",
-        "eslint-visitor-keys": "^1.1.0"
-      }
-    },
-    "esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
-    },
-    "esquery": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz",
-      "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==",
-      "dev": true,
-      "requires": {
-        "estraverse": "^5.1.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.1.0.tgz",
-          "integrity": "sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==",
-          "dev": true
-        }
-      }
-    },
-    "esrecurse": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
-      "dev": true,
-      "requires": {
-        "estraverse": "^4.1.0"
-      }
-    },
-    "estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true
-    },
-    "esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true
-    },
-    "event-emitter": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-      "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14"
-      }
-    },
-    "eventemitter3": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz",
-      "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ=="
-    },
-    "evp_bytestokey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-      "requires": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "execa": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-      "requires": {
-        "cross-spawn": "^6.0.0",
-        "get-stream": "^4.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
-      }
-    },
-    "ext": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
-      "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
-      "requires": {
-        "type": "^2.0.0"
-      },
-      "dependencies": {
-        "type": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/type/-/type-2.0.0.tgz",
-          "integrity": "sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow=="
-        }
-      }
-    },
-    "extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
-    },
-    "external-editor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-      "dev": true,
-      "requires": {
-        "chardet": "^0.7.0",
-        "iconv-lite": "^0.4.24",
-        "tmp": "^0.0.33"
-      },
-      "dependencies": {
-        "tmp": {
-          "version": "0.0.33",
-          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-          "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-          "dev": true,
-          "requires": {
-            "os-tmpdir": "~1.0.2"
-          }
-        }
-      }
-    },
-    "extract-stack": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/extract-stack/-/extract-stack-1.0.0.tgz",
-      "integrity": "sha1-uXrK+UQe6iMyUpYktzL8WhyBZfo=",
-      "dev": true
-    },
-    "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
-    },
-    "fancy-test": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/fancy-test/-/fancy-test-1.4.8.tgz",
-      "integrity": "sha512-/uCv78YSAz4UOQ3ZptnxOq6qYhJDMtwFHQnsghzGl2g6uO2VNfJDKlyczqFpG+KueXe7phoeIS6hMU1x/qhizQ==",
-      "dev": true,
-      "requires": {
-        "@types/chai": "*",
-        "@types/lodash": "*",
-        "@types/mocha": "*",
-        "@types/node": "*",
-        "@types/sinon": "*",
-        "lodash": "^4.17.13",
-        "mock-stdin": "^0.3.1",
-        "stdout-stderr": "^0.1.9"
-      }
-    },
-    "fast-deep-equal": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
-      "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA=="
-    },
-    "fast-glob": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.2.tgz",
-      "integrity": "sha512-UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A==",
-      "dev": true,
-      "requires": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.0",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.2",
-        "picomatch": "^2.2.1"
-      }
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
-    },
-    "fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-      "dev": true
-    },
-    "fast-safe-stringify": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz",
-      "integrity": "sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA=="
-    },
-    "fastq": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz",
-      "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==",
-      "dev": true,
-      "requires": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "fecha": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz",
-      "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg=="
-    },
-    "figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-      "dev": true,
-      "requires": {
-        "escape-string-regexp": "^1.0.5"
-      }
-    },
-    "file-entry-cache": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
-      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
-      "dev": true,
-      "requires": {
-        "flat-cache": "^2.0.1"
-      }
-    },
-    "file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="
-    },
-    "fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "requires": {
-        "to-regex-range": "^5.0.1"
-      }
-    },
-    "find-cache-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
-      "dev": true,
-      "requires": {
-        "commondir": "^1.0.1",
-        "make-dir": "^2.0.0",
-        "pkg-dir": "^3.0.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "make-dir": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-          "dev": true,
-          "requires": {
-            "pify": "^4.0.1",
-            "semver": "^5.6.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "dev": true
-        },
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-          "dev": true
-        },
-        "pkg-dir": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-          "dev": true,
-          "requires": {
-            "find-up": "^3.0.0"
-          }
-        }
-      }
-    },
-    "find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "requires": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      }
-    },
-    "flat-cache": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
-      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
-      "dev": true,
-      "requires": {
-        "flatted": "^2.0.0",
-        "rimraf": "2.6.3",
-        "write": "1.0.3"
-      },
-      "dependencies": {
-        "rimraf": {
-          "version": "2.6.3",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    },
-    "flatted": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
-      "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
-      "dev": true
-    },
-    "foreground-child": {
-      "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-1.5.6.tgz",
-      "integrity": "sha1-T9ca0t/elnibmApcCilZN8svXOk=",
-      "dev": true,
-      "requires": {
-        "cross-spawn": "^4",
-        "signal-exit": "^3.0.0"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
-          "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^4.0.1",
-            "which": "^1.2.9"
-          }
-        },
-        "lru-cache": {
-          "version": "4.1.5",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-          "dev": true,
-          "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^2.1.2"
-          }
-        },
-        "yallist": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-          "dev": true
-        }
-      }
-    },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
-    },
-    "form-data": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
-      "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
-      }
-    },
-    "from2": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
-      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
-      "requires": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0"
-      }
-    },
-    "fs-constants": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-      "dev": true
-    },
-    "fs-extra": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      }
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-    },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "dev": true
-    },
-    "get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true
-    },
-    "get-func-name": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
-      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
-      "dev": true
-    },
-    "get-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-      "requires": {
-        "pump": "^3.0.0"
-      }
-    },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
-    "github-slugger": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-1.3.0.tgz",
-      "integrity": "sha512-gwJScWVNhFYSRDvURk/8yhcFBee6aFjye2a7Lhb2bUyRulpIoek9p0I9Kt7PT67d/nUlZbFu8L9RLiA0woQN8Q==",
-      "dev": true,
-      "requires": {
-        "emoji-regex": ">=6.0.0 <=6.1.1"
-      },
-      "dependencies": {
-        "emoji-regex": {
-          "version": "6.1.1",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.1.1.tgz",
-          "integrity": "sha1-xs0OwbBkLio8Z6ETfvxeeW2k+I4=",
-          "dev": true
-        }
-      }
-    },
-    "glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "glob-parent": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
-      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
-      "dev": true,
-      "requires": {
-        "is-glob": "^4.0.1"
-      }
-    },
-    "globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true
-    },
-    "globby": {
-      "version": "10.0.2",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz",
-      "integrity": "sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==",
-      "dev": true,
-      "requires": {
-        "@types/glob": "^7.1.1",
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.0.3",
-        "glob": "^7.1.3",
-        "ignore": "^5.1.1",
-        "merge2": "^1.2.3",
-        "slash": "^3.0.0"
-      }
-    },
-    "got": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/got/-/got-8.3.2.tgz",
-      "integrity": "sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==",
-      "requires": {
-        "@sindresorhus/is": "^0.7.0",
-        "cacheable-request": "^2.1.1",
-        "decompress-response": "^3.3.0",
-        "duplexer3": "^0.1.4",
-        "get-stream": "^3.0.0",
-        "into-stream": "^3.1.0",
-        "is-retry-allowed": "^1.1.0",
-        "isurl": "^1.0.0-alpha5",
-        "lowercase-keys": "^1.0.0",
-        "mimic-response": "^1.0.0",
-        "p-cancelable": "^0.4.0",
-        "p-timeout": "^2.0.1",
-        "pify": "^3.0.0",
-        "safe-buffer": "^5.1.1",
-        "timed-out": "^4.0.1",
-        "url-parse-lax": "^3.0.0",
-        "url-to-options": "^1.0.1"
-      },
-      "dependencies": {
-        "get-stream": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
-        }
-      }
-    },
-    "graceful-fs": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="
-    },
-    "har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
-    },
-    "har-validator": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-      "requires": {
-        "ajv": "^6.5.5",
-        "har-schema": "^2.0.0"
-      }
-    },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
-    },
-    "has-symbol-support-x": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz",
-      "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw=="
-    },
-    "has-symbols": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
-      "dev": true
-    },
-    "has-to-string-tag-x": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz",
-      "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
-      "requires": {
-        "has-symbol-support-x": "^1.4.1"
-      }
-    },
-    "hash-base": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
-      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
-      "requires": {
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
-      }
-    },
-    "hash.js": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-      "requires": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
-      }
-    },
-    "hasha": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/hasha/-/hasha-3.0.0.tgz",
-      "integrity": "sha1-UqMvq4Vp1BymmmH/GiFPjrfIvTk=",
-      "dev": true,
-      "requires": {
-        "is-stream": "^1.0.1"
-      }
-    },
-    "hmac-drbg": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-      "requires": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "hosted-git-info": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
-      "dev": true
-    },
-    "html-escaper": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-      "dev": true
-    },
-    "http-cache-semantics": {
-      "version": "3.8.1",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
-      "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w=="
-    },
-    "http-call": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/http-call/-/http-call-5.3.0.tgz",
-      "integrity": "sha512-ahwimsC23ICE4kPl9xTBjKB4inbRaeLyZeRunC/1Jy/Z6X8tv22MEAjK+KBOMSVLaqXPTTmd8638waVIKLGx2w==",
-      "dev": true,
-      "requires": {
-        "content-type": "^1.0.4",
-        "debug": "^4.1.1",
-        "is-retry-allowed": "^1.1.0",
-        "is-stream": "^2.0.0",
-        "parse-json": "^4.0.0",
-        "tunnel-agent": "^0.6.0"
-      },
-      "dependencies": {
-        "is-stream": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-          "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
-          "dev": true
-        }
-      }
-    },
-    "http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      }
-    },
-    "hyperlinker": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hyperlinker/-/hyperlinker-1.0.0.tgz",
-      "integrity": "sha512-Ty8UblRWFEcfSuIaajM34LdPXIhbs1ajEX/BBPv24J+enSVaEVY63xQ6lTO9VRYS5LAoghIG0IDJ+p+IPzKUQQ==",
-      "dev": true
-    },
-    "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      }
-    },
-    "ieee754": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
-    },
-    "ignore": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz",
-      "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==",
-      "dev": true
-    },
-    "import-fresh": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
-      "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
-      "dev": true,
-      "requires": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      }
-    },
-    "import-modules": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/import-modules/-/import-modules-1.1.0.tgz",
-      "integrity": "sha1-dI23nFzEK7lwHvq0JPiU5yYA6dw=",
-      "dev": true
-    },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "dev": true
-    },
-    "indent-string": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
-      "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok="
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "inquirer": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz",
-      "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==",
-      "dev": true,
-      "requires": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^3.0.0",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^2.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.15",
-        "mute-stream": "0.0.8",
-        "run-async": "^2.4.0",
-        "rxjs": "^6.5.3",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "interpret": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz",
-      "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw=="
-    },
-    "into-stream": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz",
-      "integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=",
-      "requires": {
-        "from2": "^2.1.1",
-        "p-is-promise": "^1.1.0"
-      }
-    },
-    "ip-regex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.1.0.tgz",
-      "integrity": "sha512-pKnZpbgCTfH/1NLIlOduP/V+WRXzC2MOz3Qo8xmxk8C5GudJLgK5QyLVXOSWy3ParAH7Eemurl3xjv/WXYFvMA=="
-    },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-      "dev": true
-    },
-    "is-callable": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
-      "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
-      "dev": true
-    },
-    "is-date-object": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
-      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
-      "dev": true
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true
-    },
-    "is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-    },
-    "is-glob": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-      "dev": true,
-      "requires": {
-        "is-extglob": "^2.1.1"
-      }
-    },
-    "is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true
-    },
-    "is-object": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz",
-      "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA="
-    },
-    "is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4="
-    },
-    "is-promise": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
-      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="
-    },
-    "is-regex": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
-      "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.3"
-      }
-    },
-    "is-retry-allowed": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
-      "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg=="
-    },
-    "is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
-    },
-    "is-string": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
-      "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==",
-      "dev": true
-    },
-    "is-symbol": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
-      "dev": true,
-      "requires": {
-        "has-symbols": "^1.0.1"
-      }
-    },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
-    },
-    "is-wsl": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
-      "dev": true
-    },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
-    },
-    "isomorphic-fetch": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
-      "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
-      "requires": {
-        "node-fetch": "^1.0.1",
-        "whatwg-fetch": ">=0.10.0"
-      }
-    },
-    "isomorphic-ws": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz",
-      "integrity": "sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w=="
-    },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
-    },
-    "istanbul-lib-coverage": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz",
-      "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==",
-      "dev": true
-    },
-    "istanbul-lib-hook": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-2.0.7.tgz",
-      "integrity": "sha512-vrRztU9VRRFDyC+aklfLoeXyNdTfga2EI3udDGn4cZ6fpSXpHLV9X6CHvfoMCPtggg8zvDDmC4b9xfu0z6/llA==",
-      "dev": true,
-      "requires": {
-        "append-transform": "^1.0.0"
-      }
-    },
-    "istanbul-lib-instrument": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz",
-      "integrity": "sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==",
-      "dev": true,
-      "requires": {
-        "@babel/generator": "^7.4.0",
-        "@babel/parser": "^7.4.3",
-        "@babel/template": "^7.4.0",
-        "@babel/traverse": "^7.4.3",
-        "@babel/types": "^7.4.0",
-        "istanbul-lib-coverage": "^2.0.5",
-        "semver": "^6.0.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
-    },
-    "istanbul-lib-report": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz",
-      "integrity": "sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==",
-      "dev": true,
-      "requires": {
-        "istanbul-lib-coverage": "^2.0.5",
-        "make-dir": "^2.1.0",
-        "supports-color": "^6.1.0"
-      },
-      "dependencies": {
-        "make-dir": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-          "dev": true,
-          "requires": {
-            "pify": "^4.0.1",
-            "semver": "^5.6.0"
-          }
-        },
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "istanbul-lib-source-maps": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz",
-      "integrity": "sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.1",
-        "istanbul-lib-coverage": "^2.0.5",
-        "make-dir": "^2.1.0",
-        "rimraf": "^2.6.3",
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "make-dir": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-          "dev": true,
-          "requires": {
-            "pify": "^4.0.1",
-            "semver": "^5.6.0"
-          }
-        },
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "istanbul-reports": {
-      "version": "2.2.7",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.7.tgz",
-      "integrity": "sha512-uu1F/L1o5Y6LzPVSVZXNOoD/KXpJue9aeLRd0sM9uMXfZvzomB0WxVamWb5ue8kA2vVWEmW7EG+A5n3f1kqHKg==",
-      "dev": true,
-      "requires": {
-        "html-escaper": "^2.0.0"
-      }
-    },
-    "isurl": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz",
-      "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==",
-      "requires": {
-        "has-to-string-tag-x": "^1.2.0",
-        "is-object": "^1.0.1"
-      }
-    },
-    "js-sha3": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",
-      "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q=="
-    },
-    "js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "js-yaml": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
-      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
-      "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      }
-    },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
-    },
-    "jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true
-    },
-    "json-buffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
-      "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg="
-    },
-    "json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
-    },
-    "json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
-    },
-    "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-    },
-    "json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-      "dev": true
-    },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
-    },
-    "jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-      "requires": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      }
-    },
-    "keyv": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz",
-      "integrity": "sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==",
-      "requires": {
-        "json-buffer": "3.0.0"
-      }
-    },
-    "kuler": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz",
-      "integrity": "sha512-J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ==",
-      "requires": {
-        "colornames": "^1.1.1"
-      }
-    },
-    "levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      }
-    },
-    "lines-and-columns": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
-      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
-      "dev": true
-    },
-    "load-json-file": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-6.2.0.tgz",
-      "integrity": "sha512-gUD/epcRms75Cw8RT1pUdHugZYM5ce64ucs2GEISABwkRsOQr0q2wm/MV2TKThycIe5e0ytRweW2RZxclogCdQ==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.15",
-        "parse-json": "^5.0.0",
-        "strip-bom": "^4.0.0",
-        "type-fest": "^0.6.0"
-      },
-      "dependencies": {
-        "parse-json": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz",
-          "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.0.0",
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1",
-            "lines-and-columns": "^1.1.6"
-          }
-        },
-        "type-fest": {
-          "version": "0.6.0",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-          "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-          "dev": true
-        }
-      }
-    },
-    "locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "requires": {
-        "p-locate": "^4.1.0"
-      }
-    },
-    "lodash": {
-      "version": "4.17.20",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-      "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
-    },
-    "lodash._reinterpolate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0="
-    },
-    "lodash.camelcase": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
-      "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=",
-      "dev": true
-    },
-    "lodash.flattendeep": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
-      "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
-      "dev": true
-    },
-    "lodash.get": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
-      "dev": true
-    },
-    "lodash.kebabcase": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz",
-      "integrity": "sha1-hImxyw0p/4gZXM7KRI/21swpXDY=",
-      "dev": true
-    },
-    "lodash.snakecase": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz",
-      "integrity": "sha1-OdcUo1NXFHg3rv1ktdy7Fr7Nj40=",
-      "dev": true
-    },
-    "lodash.template": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
-      "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
-      "requires": {
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.templatesettings": "^4.0.0"
-      }
-    },
-    "lodash.templatesettings": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
-      "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
-      "requires": {
-        "lodash._reinterpolate": "^3.0.0"
-      }
-    },
-    "lodash.upperfirst": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz",
-      "integrity": "sha1-E2Xt9DFIBIHvDRxolXpe2Z1J984=",
-      "dev": true
-    },
-    "lodash.zip": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.zip/-/lodash.zip-4.2.0.tgz",
-      "integrity": "sha1-7GZi5IlkCO1KtsVCo5kLcswIACA=",
-      "dev": true
-    },
-    "logform": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/logform/-/logform-2.1.2.tgz",
-      "integrity": "sha512-+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ==",
-      "requires": {
-        "colors": "^1.2.1",
-        "fast-safe-stringify": "^2.0.4",
-        "fecha": "^2.3.3",
-        "ms": "^2.1.1",
-        "triple-beam": "^1.3.0"
-      }
-    },
-    "long": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
-      "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="
-    },
-    "lowercase-keys": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="
-    },
-    "lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "requires": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "lru-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
-      "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
-      "requires": {
-        "es5-ext": "~0.10.2"
-      }
-    },
-    "make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dev": true,
-      "requires": {
-        "semver": "^6.0.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
-    },
-    "md5.js": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-      "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "memoizee": {
-      "version": "0.4.14",
-      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz",
-      "integrity": "sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==",
-      "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.45",
-        "es6-weak-map": "^2.0.2",
-        "event-emitter": "^0.3.5",
-        "is-promise": "^2.1",
-        "lru-queue": "0.1",
-        "next-tick": "1",
-        "timers-ext": "^0.1.5"
-      }
-    },
-    "merge-source-map": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
-      "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
-      "dev": true,
-      "requires": {
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "merge2": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz",
-      "integrity": "sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==",
-      "dev": true
-    },
-    "micromatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-      "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
-      "dev": true,
-      "requires": {
-        "braces": "^3.0.1",
-        "picomatch": "^2.0.5"
-      }
-    },
-    "mime-db": {
-      "version": "1.44.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
-      "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="
-    },
-    "mime-types": {
-      "version": "2.1.27",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
-      "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
-      "requires": {
-        "mime-db": "1.44.0"
-      }
-    },
-    "mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "dev": true
-    },
-    "mimic-response": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="
-    },
-    "minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
-    },
-    "minimalistic-crypto-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
-    },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-      "dev": true
-    },
-    "mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.5"
-      }
-    },
-    "mkdirp-classic": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
-      "dev": true
-    },
-    "mock-stdin": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/mock-stdin/-/mock-stdin-0.3.1.tgz",
-      "integrity": "sha1-xlfZZC2QeGQ1xkyl6Zu9TQm9fdM=",
-      "dev": true
-    },
-    "moment": {
-      "version": "2.26.0",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.26.0.tgz",
-      "integrity": "sha512-oIixUO+OamkUkwjhAVE18rAMfRJNsNe/Stid/gwHSOfHrOtw9EhAY2AHvdKZ/k/MggcYELFCJz/Sn2pL8b8JMw=="
-    },
-    "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
-      "dev": true
-    },
-    "nan": {
-      "version": "2.14.1",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
-      "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw=="
-    },
-    "natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-      "dev": true
-    },
-    "natural-orderby": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/natural-orderby/-/natural-orderby-2.0.3.tgz",
-      "integrity": "sha512-p7KTHxU0CUrcOXe62Zfrb5Z13nLvPhSWR/so3kFulUQU0sgUll2Z0LwpsLN351eOOD+hRGu/F1g+6xDfPeD++Q==",
-      "dev": true
-    },
-    "nested-error-stacks": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-2.1.0.tgz",
-      "integrity": "sha512-AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug==",
-      "dev": true
-    },
-    "next-tick": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
-      "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="
-    },
-    "nice-try": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
-    },
-    "nock": {
-      "version": "12.0.3",
-      "resolved": "https://registry.npmjs.org/nock/-/nock-12.0.3.tgz",
-      "integrity": "sha512-QNb/j8kbFnKCiyqi9C5DD0jH/FubFGj5rt9NQFONXwQm3IPB0CULECg/eS3AU1KgZb/6SwUa4/DTRKhVxkGABw==",
-      "requires": {
-        "debug": "^4.1.0",
-        "json-stringify-safe": "^5.0.1",
-        "lodash": "^4.17.13",
-        "propagate": "^2.0.0"
-      }
-    },
-    "node-fetch": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
-      "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
-      "requires": {
-        "encoding": "^0.1.11",
-        "is-stream": "^1.0.1"
-      }
-    },
-    "node-forge": {
-      "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.8.5.tgz",
-      "integrity": "sha512-vFMQIWt+J/7FLNyKouZ9TazT74PRV3wgv9UT4cRjC8BffxFbKXkgIWR42URCPSnHm/QDz6BOlb2Q0U4+VQT67Q=="
-    },
-    "node-jose": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/node-jose/-/node-jose-1.1.4.tgz",
-      "integrity": "sha512-L31IFwL3pWWcMHxxidCY51ezqrDXMkvlT/5pLTfNw5sXmmOLJuN6ug7txzF/iuZN55cRpyOmoJrotwBQIoo5Lw==",
-      "requires": {
-        "base64url": "^3.0.1",
-        "browserify-zlib": "^0.2.0",
-        "buffer": "^5.5.0",
-        "es6-promise": "^4.2.8",
-        "lodash": "^4.17.15",
-        "long": "^4.0.0",
-        "node-forge": "^0.8.5",
-        "process": "^0.11.10",
-        "react-zlib-js": "^1.0.4",
-        "uuid": "^3.3.3"
-      }
-    },
-    "normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dev": true,
-      "requires": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      }
-    },
-    "normalize-url": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz",
-      "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==",
-      "requires": {
-        "prepend-http": "^2.0.0",
-        "query-string": "^5.0.1",
-        "sort-keys": "^2.0.0"
-      }
-    },
-    "npm-run-path": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-      "requires": {
-        "path-key": "^2.0.0"
-      }
-    },
-    "nyc": {
-      "version": "14.1.1",
-      "resolved": "https://registry.npmjs.org/nyc/-/nyc-14.1.1.tgz",
-      "integrity": "sha512-OI0vm6ZGUnoGZv/tLdZ2esSVzDwUC88SNs+6JoSOMVxA+gKMB8Tk7jBwgemLx4O40lhhvZCVw1C+OYLOBOPXWw==",
-      "dev": true,
-      "requires": {
-        "archy": "^1.0.0",
-        "caching-transform": "^3.0.2",
-        "convert-source-map": "^1.6.0",
-        "cp-file": "^6.2.0",
-        "find-cache-dir": "^2.1.0",
-        "find-up": "^3.0.0",
-        "foreground-child": "^1.5.6",
-        "glob": "^7.1.3",
-        "istanbul-lib-coverage": "^2.0.5",
-        "istanbul-lib-hook": "^2.0.7",
-        "istanbul-lib-instrument": "^3.3.0",
-        "istanbul-lib-report": "^2.0.8",
-        "istanbul-lib-source-maps": "^3.0.6",
-        "istanbul-reports": "^2.2.4",
-        "js-yaml": "^3.13.1",
-        "make-dir": "^2.1.0",
-        "merge-source-map": "^1.1.0",
-        "resolve-from": "^4.0.0",
-        "rimraf": "^2.6.3",
-        "signal-exit": "^3.0.2",
-        "spawn-wrap": "^1.4.2",
-        "test-exclude": "^5.2.3",
-        "uuid": "^3.3.2",
-        "yargs": "^13.2.2",
-        "yargs-parser": "^13.0.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "make-dir": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-          "dev": true,
-          "requires": {
-            "pify": "^4.0.1",
-            "semver": "^5.6.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "dev": true
-        },
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-          "dev": true
-        }
-      }
-    },
-    "oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
-    },
-    "object-hash": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-1.3.1.tgz",
-      "integrity": "sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA=="
-    },
-    "object-inspect": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
-      "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==",
-      "dev": true
-    },
-    "object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true
-    },
-    "object-treeify": {
-      "version": "1.1.24",
-      "resolved": "https://registry.npmjs.org/object-treeify/-/object-treeify-1.1.24.tgz",
-      "integrity": "sha512-ttlIN3MoqnhevarRtDNELvNjQ85Wguq2zSkR2N9DGFM3pFWMjsz7tSqbjX7lx16BmFwLOwBa3w0TY1jJajklFg==",
-      "dev": true
-    },
-    "object.assign": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.2",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.0",
-        "object-keys": "^1.0.11"
-      }
-    },
-    "object.values": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz",
-      "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3"
-      }
-    },
-    "oidc-token-hash": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/oidc-token-hash/-/oidc-token-hash-3.0.2.tgz",
-      "integrity": "sha512-dTzp80/y/da+um+i+sOucNqiPpwRL7M/xPwj7pH1TFA2/bqQ+OK2sJahSXbemEoLtPkHcFLyhLhLWZa9yW5+RA=="
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "one-time": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/one-time/-/one-time-0.0.4.tgz",
-      "integrity": "sha1-+M33eISCb+Tf+T46nMN7HkSAdC4="
-    },
-    "onetime": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
-      "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
-      "dev": true,
-      "requires": {
-        "mimic-fn": "^2.1.0"
-      }
-    },
-    "openid-client": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/openid-client/-/openid-client-2.5.0.tgz",
-      "integrity": "sha512-t3hFD7xEoW1U25RyBcRFaL19fGGs6hNVTysq9pgmiltH0IVUPzH/bQV9w24pM5Q7MunnGv2/5XjIru6BQcWdxg==",
-      "requires": {
-        "base64url": "^3.0.0",
-        "got": "^8.3.2",
-        "lodash": "^4.17.11",
-        "lru-cache": "^5.1.1",
-        "node-jose": "^1.1.0",
-        "object-hash": "^1.3.1",
-        "oidc-token-hash": "^3.0.1",
-        "p-any": "^1.1.0"
-      }
-    },
-    "optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-      "dev": true,
-      "requires": {
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
-      }
-    },
-    "os-homedir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-      "dev": true
-    },
-    "os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "dev": true
-    },
-    "p-any": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/p-any/-/p-any-1.1.0.tgz",
-      "integrity": "sha512-Ef0tVa4CZ5pTAmKn+Cg3w8ABBXh+hHO1aV8281dKOoUHfX+3tjG2EaFcC+aZyagg9b4EYGsHEjz21DnEE8Og2g==",
-      "requires": {
-        "p-some": "^2.0.0"
-      }
-    },
-    "p-cancelable": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz",
-      "integrity": "sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ=="
-    },
-    "p-finally": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
-    },
-    "p-is-promise": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
-      "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4="
-    },
-    "p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "requires": {
-        "p-try": "^2.0.0"
-      }
-    },
-    "p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "requires": {
-        "p-limit": "^2.2.0"
-      }
-    },
-    "p-some": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/p-some/-/p-some-2.0.1.tgz",
-      "integrity": "sha1-Zdh8ixVO289SIdFnd4ttLhUPbwY=",
-      "requires": {
-        "aggregate-error": "^1.0.0"
-      }
-    },
-    "p-timeout": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz",
-      "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==",
-      "requires": {
-        "p-finally": "^1.0.0"
-      }
-    },
-    "p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true
-    },
-    "package-hash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-3.0.0.tgz",
-      "integrity": "sha512-lOtmukMDVvtkL84rJHI7dpTYq+0rli8N2wlnqUcBuDWCfVhRUfOmnR9SsoHFMLpACvEV60dX7rd0rFaYDZI+FA==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.15",
-        "hasha": "^3.0.0",
-        "lodash.flattendeep": "^4.4.0",
-        "release-zalgo": "^1.0.0"
-      }
-    },
-    "pako": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
-    },
-    "parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "requires": {
-        "callsites": "^3.0.0"
-      }
-    },
-    "parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-      "dev": true,
-      "requires": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
-      }
-    },
-    "password-prompt": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/password-prompt/-/password-prompt-1.1.2.tgz",
-      "integrity": "sha512-bpuBhROdrhuN3E7G/koAju0WjVw9/uQOG5Co5mokNj0MiOSBVZS1JTwM4zl55hu0WFmIEFvO9cU9sJQiBIYeIA==",
-      "dev": true,
-      "requires": {
-        "ansi-escapes": "^3.1.0",
-        "cross-spawn": "^6.0.5"
-      },
-      "dependencies": {
-        "ansi-escapes": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-          "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
-          "dev": true
-        }
-      }
-    },
-    "path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
-    },
-    "path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
-    },
-    "path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
-    },
-    "path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true
-    },
-    "pathval": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz",
-      "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=",
-      "dev": true
-    },
-    "pbkdf2": {
-      "version": "3.0.17",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
-      "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
-      "requires": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
-    "performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
-    },
-    "picomatch": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
-      "dev": true
-    },
-    "pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
-    },
-    "pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dev": true,
-      "requires": {
-        "find-up": "^4.0.0"
-      }
-    },
-    "prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true
-    },
-    "prepend-http": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
-      "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc="
-    },
-    "process": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
-    },
-    "process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
-    },
-    "progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-      "dev": true
-    },
-    "propagate": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/propagate/-/propagate-2.0.1.tgz",
-      "integrity": "sha512-vGrhOavPSTz4QVNuBNdcNXePNdNMaO1xj9yBeH1ScQPjk/rhg9sSlCXPhMkFuaNNW/syTvYqsnbIJxMBfRbbag=="
-    },
-    "pseudomap": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
-      "dev": true
-    },
-    "psl": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
-    },
-    "pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
-    },
-    "qqjs": {
-      "version": "0.3.11",
-      "resolved": "https://registry.npmjs.org/qqjs/-/qqjs-0.3.11.tgz",
-      "integrity": "sha512-pB2X5AduTl78J+xRSxQiEmga1jQV0j43jOPs/MTgTLApGFEOn6NgdE2dEjp7nvDtjkIOZbvFIojAiYUx6ep3zg==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.4.1",
-        "debug": "^4.1.1",
-        "execa": "^0.10.0",
-        "fs-extra": "^6.0.1",
-        "get-stream": "^5.1.0",
-        "glob": "^7.1.2",
-        "globby": "^10.0.1",
-        "http-call": "^5.1.2",
-        "load-json-file": "^6.2.0",
-        "pkg-dir": "^4.2.0",
-        "tar-fs": "^2.0.0",
-        "tmp": "^0.1.0",
-        "write-json-file": "^4.1.1"
-      },
-      "dependencies": {
-        "execa": {
-          "version": "0.10.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz",
-          "integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "^6.0.0",
-            "get-stream": "^3.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          },
-          "dependencies": {
-            "get-stream": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-              "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-              "dev": true
-            }
-          }
-        },
-        "fs-extra": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz",
-          "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        },
-        "get-stream": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
-          "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
-          "dev": true,
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        }
-      }
-    },
-    "qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
-    },
-    "query-string": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
-      "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
-      "requires": {
-        "decode-uri-component": "^0.2.0",
-        "object-assign": "^4.1.0",
-        "strict-uri-encode": "^1.0.0"
-      }
-    },
-    "ramda": {
-      "version": "0.26.1",
-      "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.26.1.tgz",
-      "integrity": "sha512-hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ==",
-      "dev": true
-    },
-    "randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "requires": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "react-zlib-js": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/react-zlib-js/-/react-zlib-js-1.0.4.tgz",
-      "integrity": "sha512-ynXD9DFxpE7vtGoa3ZwBtPmZrkZYw2plzHGbanUjBOSN4RtuXdektSfABykHtTiWEHMh7WdYj45LHtp228ZF1A=="
-    },
-    "read-pkg": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-      "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
-      "dev": true,
-      "requires": {
-        "load-json-file": "^4.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^3.0.0"
-      },
-      "dependencies": {
-        "load-json-file": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^4.0.0",
-            "pify": "^3.0.0",
-            "strip-bom": "^3.0.0"
-          }
-        },
-        "path-type": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-          "dev": true,
-          "requires": {
-            "pify": "^3.0.0"
-          }
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-          "dev": true
-        }
-      }
-    },
-    "read-pkg-up": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz",
-      "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==",
-      "dev": true,
-      "requires": {
-        "find-up": "^3.0.0",
-        "read-pkg": "^3.0.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "dev": true
-        }
-      }
-    },
-    "readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-        }
-      }
-    },
-    "rechoir": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-      "requires": {
-        "resolve": "^1.1.6"
-      }
-    },
-    "redeyed": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/redeyed/-/redeyed-2.1.1.tgz",
-      "integrity": "sha1-iYS1gV2ZyyIEacme7v/jiRPmzAs=",
-      "dev": true,
-      "requires": {
-        "esprima": "~4.0.0"
-      }
-    },
-    "regenerator-runtime": {
-      "version": "0.13.5",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
-      "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="
-    },
-    "regexpp": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
-      "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==",
-      "dev": true
-    },
-    "release-zalgo": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz",
-      "integrity": "sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=",
-      "dev": true,
-      "requires": {
-        "es6-error": "^4.0.1"
-      }
-    },
-    "request": {
-      "version": "2.88.2",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-      "requires": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.3",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      },
-      "dependencies": {
-        "form-data": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-          "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-          "requires": {
-            "asynckit": "^0.4.0",
-            "combined-stream": "^1.0.6",
-            "mime-types": "^2.1.12"
-          }
-        }
-      }
-    },
-    "require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "dev": true
-    },
-    "require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-      "dev": true
-    },
-    "resolve": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
-      "requires": {
-        "path-parse": "^1.0.6"
-      }
-    },
-    "resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true
-    },
-    "responselike": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
-      "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
-      "requires": {
-        "lowercase-keys": "^1.0.0"
-      }
-    },
-    "restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "dev": true,
-      "requires": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      }
-    },
-    "ret": {
-      "version": "0.1.15",
-      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "dev": true
-    },
-    "reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "dev": true
-    },
-    "rfc4648": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/rfc4648/-/rfc4648-1.3.0.tgz",
-      "integrity": "sha512-x36K12jOflpm1V8QjPq3I+pt7Z1xzeZIjiC8J2Oxd7bE1efTrOG241DTYVJByP/SxR9jl1t7iZqYxDX864jgBQ=="
-    },
-    "rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.1.3"
-      }
-    },
-    "ripemd160": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-      "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
-      }
-    },
-    "run-async": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
-      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
-      "dev": true
-    },
-    "run-parallel": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
-      "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==",
-      "dev": true
-    },
-    "rxjs": {
-      "version": "6.5.5",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz",
-      "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==",
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
-    "safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-    },
-    "safe-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
-      "dev": true,
-      "requires": {
-        "ret": "~0.1.10"
-      }
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
-    },
-    "set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-      "dev": true
-    },
-    "sha.js": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "requires": {
-        "shebang-regex": "^1.0.0"
-      }
-    },
-    "shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
-    },
-    "shelljs": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz",
-      "integrity": "sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==",
-      "requires": {
-        "glob": "^7.0.0",
-        "interpret": "^1.0.0",
-        "rechoir": "^0.6.2"
-      }
-    },
-    "signal-exit": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
-    },
-    "simple-swizzle": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
-      "requires": {
-        "is-arrayish": "^0.3.1"
-      },
-      "dependencies": {
-        "is-arrayish": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-          "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
-        }
-      }
-    },
-    "slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true
-    },
-    "slice-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
-      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^3.2.0",
-        "astral-regex": "^1.0.0",
-        "is-fullwidth-code-point": "^2.0.0"
-      }
-    },
-    "sort-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz",
-      "integrity": "sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=",
-      "requires": {
-        "is-plain-obj": "^1.0.0"
-      }
-    },
-    "source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true
-    },
-    "spawn-wrap": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-1.4.3.tgz",
-      "integrity": "sha512-IgB8md0QW/+tWqcavuFgKYR/qIRvJkRLPJDFaoXtLLUaVcCDK0+HeFTkmQHj3eprcYhc+gOl0aEA1w7qZlYezw==",
-      "dev": true,
-      "requires": {
-        "foreground-child": "^1.5.6",
-        "mkdirp": "^0.5.0",
-        "os-homedir": "^1.0.1",
-        "rimraf": "^2.6.2",
-        "signal-exit": "^3.0.2",
-        "which": "^1.3.0"
-      }
-    },
-    "spdx-correct": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
-      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
-      "dev": true,
-      "requires": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "spdx-exceptions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
-      "dev": true
-    },
-    "spdx-expression-parse": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-      "dev": true,
-      "requires": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "spdx-license-ids": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
-      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
-      "dev": true
-    },
-    "sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
-    },
-    "sshpk": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-      "requires": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
-      }
-    },
-    "stack-trace": {
-      "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
-      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA="
-    },
-    "stdout-stderr": {
-      "version": "0.1.13",
-      "resolved": "https://registry.npmjs.org/stdout-stderr/-/stdout-stderr-0.1.13.tgz",
-      "integrity": "sha512-Xnt9/HHHYfjZ7NeQLvuQDyL1LnbsbddgMFKCuaQKwGCdJm8LnstZIXop+uOY36UR1UXXoHXfMbC1KlVdVd2JLA==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.1",
-        "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        }
-      }
-    },
-    "strict-uri-encode": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
-      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
-    },
-    "string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "requires": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        }
-      }
-    },
-    "string.prototype.trimend": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
-      "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
-      }
-    },
-    "string.prototype.trimleft": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz",
-      "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5",
-        "string.prototype.trimstart": "^1.0.0"
-      }
-    },
-    "string.prototype.trimright": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz",
-      "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5",
-        "string.prototype.trimend": "^1.0.0"
-      }
-    },
-    "string.prototype.trimstart": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
-      "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
-      }
-    },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-        }
-      }
-    },
-    "strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "requires": {
-        "ansi-regex": "^4.1.0"
-      }
-    },
-    "strip-bom": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-      "dev": true
-    },
-    "strip-eof": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
-    },
-    "strip-json-comments": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.0.tgz",
-      "integrity": "sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w==",
-      "dev": true
-    },
-    "supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "requires": {
-        "has-flag": "^3.0.0"
-      }
-    },
-    "supports-hyperlinks": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-1.0.1.tgz",
-      "integrity": "sha512-HHi5kVSefKaJkGYXbDuKbUGRVxqnWGn3J2e39CYcNJEfWciGq2zYtOhXLTlvrOZW1QU7VX67w7fMmWafHX9Pfw==",
-      "dev": true,
-      "requires": {
-        "has-flag": "^2.0.0",
-        "supports-color": "^5.0.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-          "dev": true
-        }
-      }
-    },
-    "table": {
-      "version": "5.4.6",
-      "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
-      "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
-      "dev": true,
-      "requires": {
-        "ajv": "^6.10.2",
-        "lodash": "^4.17.14",
-        "slice-ansi": "^2.1.0",
-        "string-width": "^3.0.0"
-      },
-      "dependencies": {
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        }
-      }
-    },
-    "tar-fs": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.0.tgz",
-      "integrity": "sha512-9uW5iDvrIMCVpvasdFHW0wJPez0K4JnMZtsuIeDI7HyMGJNxmDZDOCQROr7lXyS+iL/QMpj07qcjGYTSdRFXUg==",
-      "dev": true,
-      "requires": {
-        "chownr": "^1.1.1",
-        "mkdirp-classic": "^0.5.2",
-        "pump": "^3.0.0",
-        "tar-stream": "^2.0.0"
-      }
-    },
-    "tar-stream": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.2.tgz",
-      "integrity": "sha512-UaF6FoJ32WqALZGOIAApXx+OdxhekNMChu6axLJR85zMMjXKWFGjbIRe+J6P4UnRGg9rAwWvbTT0oI7hD/Un7Q==",
-      "dev": true,
-      "requires": {
-        "bl": "^4.0.1",
-        "end-of-stream": "^1.4.1",
-        "fs-constants": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.1.1"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
-      }
-    },
-    "test-exclude": {
-      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.2.3.tgz",
-      "integrity": "sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.1.3",
-        "minimatch": "^3.0.4",
-        "read-pkg-up": "^4.0.0",
-        "require-main-filename": "^2.0.0"
-      }
-    },
-    "text-hex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz",
-      "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg=="
-    },
-    "text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
-    },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-      "dev": true
-    },
-    "timed-out": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
-      "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8="
-    },
-    "timers-ext": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
-      "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
-      "requires": {
-        "es5-ext": "~0.10.46",
-        "next-tick": "1"
-      }
-    },
-    "tmp": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz",
-      "integrity": "sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==",
-      "dev": true,
-      "requires": {
-        "rimraf": "^2.6.3"
-      }
-    },
-    "to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-      "dev": true
-    },
-    "to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "requires": {
-        "is-number": "^7.0.0"
-      }
-    },
-    "tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-      "requires": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      }
-    },
-    "triple-beam": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz",
-      "integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="
-    },
-    "tslib": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="
-    },
-    "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
-    },
-    "type": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="
-    },
-    "type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "^1.2.1"
-      }
-    },
-    "type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-      "dev": true
-    },
-    "type-fest": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
-      "dev": true
-    },
-    "typedarray-to-buffer": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-      "requires": {
-        "is-typedarray": "^1.0.0"
-      }
-    },
-    "underscore": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.10.2.tgz",
-      "integrity": "sha512-N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg=="
-    },
-    "universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
-    },
-    "unorm": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz",
-      "integrity": "sha512-b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA=="
-    },
-    "uri-js": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "url-parse-lax": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
-      "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
-      "requires": {
-        "prepend-http": "^2.0.0"
-      }
-    },
-    "url-to-options": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz",
-      "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k="
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-    },
-    "uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
-    },
-    "v8-compile-cache": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz",
-      "integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==",
-      "dev": true
-    },
-    "validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dev": true,
-      "requires": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
-    "websocket": {
-      "version": "1.0.31",
-      "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.31.tgz",
-      "integrity": "sha512-VAouplvGKPiKFDTeCCO65vYHsyay8DqoBSlzIO3fayrfOgU94lQN5a1uWVnFrMLceTJw/+fQXR5PGbUVRaHshQ==",
-      "requires": {
-        "debug": "^2.2.0",
-        "es5-ext": "^0.10.50",
-        "nan": "^2.14.0",
-        "typedarray-to-buffer": "^3.1.5",
-        "yaeti": "^0.0.6"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        }
-      }
-    },
-    "whatwg-fetch": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz",
-      "integrity": "sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q=="
-    },
-    "which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "requires": {
-        "isexe": "^2.0.0"
-      }
-    },
-    "which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-      "dev": true
-    },
-    "widest-line": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz",
-      "integrity": "sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==",
-      "requires": {
-        "string-width": "^2.1.1"
-      }
-    },
-    "winston": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/winston/-/winston-3.2.1.tgz",
-      "integrity": "sha512-zU6vgnS9dAWCEKg/QYigd6cgMVVNwyTzKs81XZtTFuRwJOcDdBg7AU0mXVyNbs7O5RH2zdv+BdNZUlx7mXPuOw==",
-      "requires": {
-        "async": "^2.6.1",
-        "diagnostics": "^1.1.1",
-        "is-stream": "^1.1.0",
-        "logform": "^2.1.1",
-        "one-time": "0.0.4",
-        "readable-stream": "^3.1.1",
-        "stack-trace": "0.0.x",
-        "triple-beam": "^1.3.0",
-        "winston-transport": "^4.3.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
-      }
-    },
-    "winston-transport": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.3.0.tgz",
-      "integrity": "sha512-B2wPuwUi3vhzn/51Uukcao4dIduEiPOcOt9HJ3QeaXgkJ5Z7UwpBzxS4ZGNHtrxrUvTwemsQiSys0ihOf8Mp1A==",
-      "requires": {
-        "readable-stream": "^2.3.6",
-        "triple-beam": "^1.2.0"
-      }
-    },
-    "word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-      "dev": true
-    },
-    "wrap-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz",
-      "integrity": "sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==",
-      "requires": {
-        "ansi-styles": "^3.2.0",
-        "string-width": "^2.1.1",
-        "strip-ansi": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        }
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-    },
-    "write": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
-      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
-      "dev": true,
-      "requires": {
-        "mkdirp": "^0.5.1"
-      }
-    },
-    "write-file-atomic": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-      "dev": true,
-      "requires": {
-        "imurmurhash": "^0.1.4",
-        "is-typedarray": "^1.0.0",
-        "signal-exit": "^3.0.2",
-        "typedarray-to-buffer": "^3.1.5"
-      }
-    },
-    "write-json-file": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/write-json-file/-/write-json-file-4.3.0.tgz",
-      "integrity": "sha512-PxiShnxf0IlnQuMYOPPhPkhExoCQuTUNPOa/2JWCYTmBquU9njyyDuwRKN26IZBlp4yn1nt+Agh2HOOBl+55HQ==",
-      "dev": true,
-      "requires": {
-        "detect-indent": "^6.0.0",
-        "graceful-fs": "^4.1.15",
-        "is-plain-obj": "^2.0.0",
-        "make-dir": "^3.0.0",
-        "sort-keys": "^4.0.0",
-        "write-file-atomic": "^3.0.0"
-      },
-      "dependencies": {
-        "is-plain-obj": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
-          "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
-          "dev": true
-        },
-        "sort-keys": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-4.0.0.tgz",
-          "integrity": "sha512-hlJLzrn/VN49uyNkZ8+9b+0q9DjmmYcYOnbMQtpkLrYpPwRApDPZfmqbUfJnAA3sb/nRib+nDot7Zi/1ER1fuA==",
-          "dev": true,
-          "requires": {
-            "is-plain-obj": "^2.0.0"
-          }
-        }
-      }
-    },
-    "ws": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
-      "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
-      "requires": {
-        "async-limiter": "~1.0.0"
-      }
-    },
-    "xxhashjs": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/xxhashjs/-/xxhashjs-0.2.2.tgz",
-      "integrity": "sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==",
-      "requires": {
-        "cuint": "^0.2.2"
-      }
-    },
-    "y18n": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
-      "dev": true
-    },
-    "yaeti": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz",
-      "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc="
-    },
-    "yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
-    },
-    "yargs": {
-      "version": "13.3.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
-      "dev": true,
-      "requires": {
-        "cliui": "^5.0.0",
-        "find-up": "^3.0.0",
-        "get-caller-file": "^2.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^3.0.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^13.1.2"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "dev": true
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        }
-      }
-    },
-    "yargs-parser": {
-      "version": "13.1.2",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-      "dev": true,
-      "requires": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      }
-    }
-  }
-}
diff --git a/.maintain/chaostest/package.json b/.maintain/chaostest/package.json
deleted file mode 100644
index b659f7518111..000000000000
--- a/.maintain/chaostest/package.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "name": "chaostest",
-  "description": "A cli for chaos testing on substrate",
-  "version": "0.0.0",
-  "author": "HarryHong",
-  "bin": {
-    "chaostest": "./bin/run"
-  },
-  "bugs": "https://github.com/paritytech/substrate/issues",
-  "dependencies": {
-    "@kubernetes/client-node": "^0.11.1",
-    "@oclif/command": "^1",
-    "@oclif/config": "^1",
-    "@oclif/plugin-help": "^2",
-    "@polkadot/api": "^0.95.0-beta.14",
-    "@polkadot/keyring": "^1.6.0-beta.9",
-    "winston": "^3.2.1"
-  },
-  "devDependencies": {
-    "@oclif/dev-cli": "^1",
-    "@oclif/test": "^1",
-    "chai": "^4",
-    "eslint": "^7.1.0",
-    "eslint-config-oclif": "^3.1",
-    "eslint-config-standard": "^14.1.1",
-    "eslint-plugin-import": "^2.20.2",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-standard": "^4.0.1",
-    "globby": "^10",
-    "nyc": "^14"
-  },
-  "engines": {
-    "node": ">=8.0.0"
-  },
-  "files": [
-    "/bin",
-    "/npm-shrinkwrap.json",
-    "/oclif.manifest.json",
-    "/src"
-  ],
-  "homepage": "https://github.com/paritytech/substrate/tree/master/.maintain/chaostest",
-  "keywords": [
-    "oclif"
-  ],
-  "main": "src/index.js",
-  "oclif": {
-    "commands": "./src/commands",
-    "bin": "chaostest",
-    "plugins": [
-      "@oclif/plugin-help"
-    ]
-  },
-  "repository": "https://github.com/paritytech/substrate/tree/master/.maintain/chaostest",
-  "scripts": {
-    "postpack": "rm -f oclif.manifest.json",
-    "posttest": "eslint .",
-    "prepack": "oclif-dev manifest && oclif-dev readme",
-    "version": "oclif-dev readme && git add README.md"
-  }
-}
diff --git a/.maintain/chaostest/src/commands/clean/index.js b/.maintain/chaostest/src/commands/clean/index.js
deleted file mode 100644
index 9f8f5b95f897..000000000000
--- a/.maintain/chaostest/src/commands/clean/index.js
+++ /dev/null
@@ -1,31 +0,0 @@
-const { Command, flags } = require('@oclif/command')
-const CONFIG = require('../../config')()
-const logger = require('../../utils/logger')
-const Hypervisor = require('../../hypervisor')
-
-class CleanCommand extends Command {
-  async run () {
-    const { flags } = this.parse(CleanCommand)
-    const namespace = flags.namespace || CONFIG.namespace
-    const hypervisor = new Hypervisor(CONFIG)
-    // Delete corresponding namespace, default to CONFIG.namespace
-    try {
-      if (namespace) {
-        await hypervisor.cleanup(namespace)
-      } else {
-        logger.debug('Nothing to clean up')
-      }
-    } catch (error) {
-      logger.error(error)
-      process.exit(1)
-    }
-  }
-}
-
-CleanCommand.description = 'Clean up resources based on namespace'
-
-CleanCommand.flags = {
-  namespace: flags.string({ char: 'n', description: 'desired namespace to clean up', env: 'NAMESPACE' })
-}
-
-module.exports = CleanCommand
diff --git a/.maintain/chaostest/src/commands/singlenodeheight/index.js b/.maintain/chaostest/src/commands/singlenodeheight/index.js
deleted file mode 100644
index 05006d745b4e..000000000000
--- a/.maintain/chaostest/src/commands/singlenodeheight/index.js
+++ /dev/null
@@ -1,63 +0,0 @@
-const { Command, flags } = require('@oclif/command')
-const CONFIG = require('../../config')()
-const { succeedExit, errorExit } = require('../../utils/exit')
-const Hypervisor = require('../../hypervisor')
-const logger = require('../../utils/logger')
-
-class SingleNodeHeightCommand extends Command {
-  async run () {
-    const { flags } = this.parse(SingleNodeHeightCommand)
-    let port = flags.port
-    let url = flags.url
-    const wait = flags.wait || 600 * 1000
-    const height = flags.height || 10
-    const namespace = flags.namespace || CONFIG.namespace
-    const pod = flags.pod || (CONFIG.nodes && CONFIG.nodes[0]) ? CONFIG.nodes[0].podName : undefined
-    const now = Date.now()
-
-    const hypervisor = new Hypervisor(CONFIG)
-    if (!!url && !!port) {
-      JsonRpcCallTestHeight(url, port)
-    } else if (!!pod && !!namespace) {
-      url = 'http://127.0.0.1'
-      port = 9933
-      await hypervisor.startForwardServer(namespace, pod, port)
-      JsonRpcCallTestHeight(url, port)
-    } else {
-      errorExit('Not enough parameters provided. Either specify url and port or pod and namespace.')
-    }
-
-    async function JsonRpcCallTestHeight (url, port) {
-      logger.debug('Polling chain height...')
-      if (Date.now() < now + wait) {
-        try {
-          const curHeight = await hypervisor.getChainBlockHeight(url, port)
-          logger.debug('Current Block Height: ' + curHeight)
-          if (curHeight > height) {
-            logger.info(`Single dev node Blockheight reached ${height}`)
-            succeedExit()
-          } else {
-            setTimeout(() => JsonRpcCallTestHeight(url, port), 2000)
-          }
-        } catch (error) {
-          errorExit('Error requesting chain block height', error)
-        }
-      } else {
-        errorExit('Timed out')
-      }
-    }
-  }
-}
-
-SingleNodeHeightCommand.description = 'Test if targeted node is producing blocks > certain height'
-
-SingleNodeHeightCommand.flags = {
-  port: flags.integer({ char: 'p', description: 'port to deploy' }),
-  url: flags.string({ char: 'u', description: 'connect url' }),
-  timeout: flags.string({ char: 't', description: 'wait time in miliseconds to halt' }),
-  height: flags.string({ char: 'h', description: 'desired height to test' }),
-  pod: flags.string({ description: 'desired pod to test' }),
-  namespace: flags.string({ description: 'desired namespace to test' })
-}
-
-module.exports = SingleNodeHeightCommand
diff --git a/.maintain/chaostest/src/commands/spawn/index.js b/.maintain/chaostest/src/commands/spawn/index.js
deleted file mode 100644
index 785037b02953..000000000000
--- a/.maintain/chaostest/src/commands/spawn/index.js
+++ /dev/null
@@ -1,52 +0,0 @@
-const { Command, flags } = require('@oclif/command')
-const logger = require('../../utils/logger')
-const Hypervisor = require('../../hypervisor')
-const CONFIG = require('../../config')()
-
-class SpawnCommand extends Command {
-  async run () {
-    const { flags } = this.parse(SpawnCommand)
-    const { args } = this.parse(SpawnCommand)
-    const imageTag = flags.image || 'parity/substrate:latest'
-    const port = flags.port || 9933
-    const namespace = flags.namespace || 'substrate-ci'
-    const validator = flags.validator || 0
-    const node = flags.node || 1
-
-    const hypervisor = new Hypervisor(CONFIG)
-    try {
-      // Check/Create namespace
-      await hypervisor.readOrCreateNamespace(namespace)
-      const chainName = args.chainName
-      if (chainName) {
-        if (chainName === 'dev') {
-          logger.debug('Starting a fullnode in dev mode...')
-          await hypervisor.createDevNode(imageTag, port)
-        } else if (chainName === 'alicebob') {
-          await hypervisor.createAliceBobNodes(imageTag, port)
-        } else {
-          // TODO: customized chain with chainName
-        }
-      }
-    } catch (error) {
-      logger.error(error)
-      process.exit(1)
-    }
-  }
-}
-
-SpawnCommand.description = 'Spawn a local testnet with options'
-
-SpawnCommand.flags = {
-  image: flags.string({ char: 'i', description: 'image to deploy' }),
-  port: flags.integer({ char: 'p', description: 'port to deploy on' }),
-  namespace: flags.string({ description: 'desired namespace to deploy to', env: 'NAMESPACE' }),
-  validator: flags.string({ char: 'v', description: 'number of validators' }),
-  node: flags.string({ char: 'n', description: 'number of full nodes, if not set but exists, default to 1' }),
-  key: flags.string({ char: 'k', description: 'number of full nodes, if not set but exists, default to 1' }),
-  chainspec: flags.string({ char: 'c', description: 'number of full nodes, if not set but exists, default to 1' })
-}
-
-SpawnCommand.args = [{ name: 'chainName' }]
-
-module.exports = SpawnCommand
diff --git a/.maintain/chaostest/src/config/README.md b/.maintain/chaostest/src/config/README.md
deleted file mode 100644
index 655e6deacb37..000000000000
--- a/.maintain/chaostest/src/config/README.md
+++ /dev/null
@@ -1,34 +0,0 @@
-chaostest CONFIG
-=========
-
-Since deployment can behave differently, we want to keep a state between phases including different test subjects.
-
-# Content
-The state could include informations such as:
-```
-{
-    namespace,
-    image,
-    bootnode: {
-        podname,
-        ip,
-        port,
-        peerId,
-        privateKey,
-        publicKey
-    },
-    nodes: [{
-        podname,
-        ip,
-        port,
-        nodeType: 'validator' | 'bootnode' | ,
-        privateKey (validator only),
-        publicKey (validator only)
-    }]
-}
-```
-
-# TODO
-k8s configuration
-chainspec
-chaos-agent
diff --git a/.maintain/chaostest/src/config/index.js b/.maintain/chaostest/src/config/index.js
deleted file mode 100644
index 400597c2bddc..000000000000
--- a/.maintain/chaostest/src/config/index.js
+++ /dev/null
@@ -1,70 +0,0 @@
-const fs = require('fs')
-const path = require('path')
-const configPath = path.join(__dirname, './config.json')
-const logger = require('../utils/logger')
-
-class Config {
-  constructor () {
-    this.load()
-  }
-
-  async load () {
-    fs.readFile(configPath, (err, data) => {
-      if (err) {
-        if (err.code === 'ENOENT') {
-          this.reset()
-        } else {
-          throw err
-        }
-      } else {
-        try {
-          Object.assign(this, JSON.parse(data))
-        } catch (error) {
-          logger.error('config file is corrupted, resetting...')
-          this.reset()
-        }
-      };
-    })
-  };
-
-  getConfig () {
-    return this
-  }
-
-  async update () {
-    const data = JSON.stringify(this.getConfig())
-    fs.writeFile(configPath, data, (err) => {
-      if (err) throw err
-      logger.debug('Configuration updated')
-    })
-  }
-
-  async setNamespace (namespace) {
-    this.namespace = namespace
-    this.update()
-  }
-
-  async addNode (node) {
-    if (!this.nodes || Array.isArray(this.nodes)) {
-      this.nodes = []
-    }
-    if (node.nodeType === 'bootnode') {
-      this.bootnode = node
-    }
-    this.nodes.push(node)
-    this.update()
-  }
-
-  async reset () {
-    const data = JSON.stringify({})
-    fs.writeFile(configPath, data, (err) => {
-      if (err) throw err
-      this.load()
-    })
-  }
-}
-
-module.exports = () => {
-  const config = new Config()
-  return config
-}
diff --git a/.maintain/chaostest/src/hypervisor/chainApi/api.js b/.maintain/chaostest/src/hypervisor/chainApi/api.js
deleted file mode 100644
index f9265b6386ee..000000000000
--- a/.maintain/chaostest/src/hypervisor/chainApi/api.js
+++ /dev/null
@@ -1,16 +0,0 @@
-const chainApi = require('../modules/chainApi')
-
-exports.getApi = async function (endpoint) {
-  if (this._apiInstance && this._apiInstance.endpoint === endpoint) {
-    return this._apiInstance.instance
-  } else {
-    const instance = await chainApi.getApi(endpoint)
-    this._apiInstance = { endpoint, instance }
-    return instance
-  }
-}
-
-exports.getChainBlockHeight = async function (url, port) {
-  const api = await this.getApi(url + ':' + port)
-  return chainApi.getChainBlockHeight(api)
-}
diff --git a/.maintain/chaostest/src/hypervisor/chainApi/index.js b/.maintain/chaostest/src/hypervisor/chainApi/index.js
deleted file mode 100644
index c0802401d918..000000000000
--- a/.maintain/chaostest/src/hypervisor/chainApi/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-const api = require('./api')
-module.exports = function (Hypervisor) {
-  Object.assign(Hypervisor.prototype, api)
-}
diff --git a/.maintain/chaostest/src/hypervisor/deployment/deployment.js b/.maintain/chaostest/src/hypervisor/deployment/deployment.js
deleted file mode 100644
index 906734393af6..000000000000
--- a/.maintain/chaostest/src/hypervisor/deployment/deployment.js
+++ /dev/null
@@ -1,123 +0,0 @@
-const k8s = require('../modules/k8s')
-const { pollUntil } = require('../../utils/wait')
-const { getBootNodeUrl } = require('../../utils')
-const logger = require('../../utils/logger')
-
-exports.readOrCreateNamespace = async function (namespace) {
-  try {
-    logger.debug('Reading namespace')
-    await k8s.readNamespace(namespace) // if namespace is available, do not create here
-  } catch (error) {
-    if (error.response.statusCode !== 404) {
-      logger.error(error)
-      throw error
-    }
-    logger.debug('Namespace not present, creating...')
-    await k8s.createNamespace(namespace)
-  }
-  this.config.setNamespace(namespace)
-}
-exports.createAlice = async function (image, port) {
-  const substrateArgs = [
-    '--chain=local',
-    '--node-key',
-    '0000000000000000000000000000000000000000000000000000000000000001',
-    '--validator',
-    '--no-telemetry',
-    '--rpc-cors',
-    'all',
-    '--alice']
-  const nodeSpec = {
-    nodeId: 'alice',
-    image,
-    port,
-    args: substrateArgs
-  }
-  nodeSpec.extraInfo = {
-    nodeType: 'bootnode',
-    privateKey: '',
-    publicKey: '',
-    peerId: '12D3KooWEyoppNCUx8Yx66oV9fJnriXwCcXwDDUA2kj6vnc6iDEp'
-  }
-  await this.createNode(nodeSpec)
-}
-
-exports.createBob = async function (image, port) {
-  const substrateArgs = [
-    '--chain=local',
-    '--node-key',
-    '0000000000000000000000000000000000000000000000000000000000000002',
-    '--validator',
-    '--bob',
-    '--no-telemetry',
-    '--rpc-cors',
-    'all',
-    '--bootnodes',
-    getBootNodeUrl(this.config.bootnode)]
-  const nodeSpec = {
-    nodeId: 'bob',
-    image,
-    port,
-    args: substrateArgs
-  }
-  nodeSpec.extraInfo = {
-    nodeType: 'validator',
-    privateKey: '',
-    publicKey: ''
-  }
-  await this.createNode(nodeSpec)
-}
-
-exports.createAliceBobNodes = async function (image, port) {
-  await this.createAlice(image, port)
-  await this.createBob(image, port)
-}
-
-exports.createDevNode = async function (image, port) {
-  const substrateArgs = ['--dev', '--rpc-external', '--ws-external']
-  const nodeSpec = {
-    nodeId: 'node-1',
-    image,
-    port,
-    args: substrateArgs
-  }
-  await this.createNode(nodeSpec)
-}
-
-exports.createNode = async function (nodeSpec) {
-  logger.info(`Creating ${nodeSpec.nodeId} as ${nodeSpec.extraInfo ? nodeSpec.extraInfo.nodeType : 'FullNode'} in ${this.config.namespace}`)
-  await k8s.createPod(nodeSpec, this.config.namespace)
-  logger.debug('Polling pod status')
-  const pod = await pollUntil(
-    () => k8s.getPod(nodeSpec.nodeId, this.config.namespace)
-  )
-  const nodeInfo = {
-    podName: nodeSpec.nodeId,
-    ip: pod.status.podIP,
-    port: nodeSpec.port
-  }
-  if (nodeSpec.extraInfo) {
-    Object.assign(nodeInfo, nodeSpec.extraInfo)
-  }
-  logger.info(`${nodeSpec.nodeId} is created`)
-  this.config.addNode(nodeInfo)
-}
-
-exports.cleanup = async function (namespace) {
-  await k8s.deleteNamespace(namespace)
-  if (namespace === this.config.namespace) {
-    this.config.reset()
-  }
-}
-
-exports.getPodInfoInConfig = function (namespace, podName) {
-  if (this.config.namespace === namespace && Array.isArray(this.config.nodes)) {
-    return this.config.nodes.find((node) => node.podName === podName)
-  } else {
-    throw Error('No pod present in the namespace in config')
-  }
-}
-
-exports.startForwardServer = async function (namespace, pod, port, onReady) {
-  await k8s.startForwardServer(namespace, pod, port, onReady)
-}
diff --git a/.maintain/chaostest/src/hypervisor/deployment/index.js b/.maintain/chaostest/src/hypervisor/deployment/index.js
deleted file mode 100644
index a01865b6a543..000000000000
--- a/.maintain/chaostest/src/hypervisor/deployment/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-const deployment = require('./deployment')
-module.exports = function (Hypervisor) {
-  Object.assign(Hypervisor.prototype, deployment)
-}
diff --git a/.maintain/chaostest/src/hypervisor/index.js b/.maintain/chaostest/src/hypervisor/index.js
deleted file mode 100644
index 607f3a33d842..000000000000
--- a/.maintain/chaostest/src/hypervisor/index.js
+++ /dev/null
@@ -1,11 +0,0 @@
-const CONFIG = require('../config')()
-
-function Hypervisor (config) {
-  this.config = config || CONFIG
-}
-
-// Mount sub modules of the Hypervisor class
-require('./deployment')(Hypervisor)
-require('./chainApi')(Hypervisor)
-
-module.exports = Hypervisor
diff --git a/.maintain/chaostest/src/hypervisor/modules/chainApi.js b/.maintain/chaostest/src/hypervisor/modules/chainApi.js
deleted file mode 100644
index b2ad897d06cb..000000000000
--- a/.maintain/chaostest/src/hypervisor/modules/chainApi.js
+++ /dev/null
@@ -1,18 +0,0 @@
-const { ApiPromise, WsProvider } = require('@polkadot/api')
-const { HttpProvider } = require('@polkadot/rpc-provider')
-
-const getApi = async (url) => {
-  const httpProvider = new HttpProvider(url)
-  return httpProvider
-  //   const api = await ApiPromise.create({ provider: wsProvider })
-  //   return api
-  // TODO: tried to use websocket provider here, but the polkadot/api version is not stable yet, using http provider for now
-}
-
-const getChainBlockHeight = async (provider) => {
-  const data = await provider.send('chain_getBlock', [])
-  const height = parseInt(data.block.header.number, 16)
-  return height
-}
-
-module.exports = { getApi, getChainBlockHeight }
diff --git a/.maintain/chaostest/src/hypervisor/modules/k8s.js b/.maintain/chaostest/src/hypervisor/modules/k8s.js
deleted file mode 100644
index 14f22ff5e8df..000000000000
--- a/.maintain/chaostest/src/hypervisor/modules/k8s.js
+++ /dev/null
@@ -1,113 +0,0 @@
-const k8s = require('@kubernetes/client-node')
-const { isFunction } = require('../../utils')
-const logger = require('../../utils/logger')
-
-// load k8s
-const kc = new k8s.KubeConfig()
-kc.loadFromDefault()
-
-// load k8s Apis
-const k8sAppApi = kc.makeApiClient(k8s.AppsV1Api)
-const k8sCoreApi = kc.makeApiClient(k8s.CoreV1Api)
-
-const createNamespace = async namespace => {
-  const namespaceJson = {
-    apiVersion: 'v1',
-    kind: 'Namespace',
-    metadata: {
-      name: namespace
-    }
-  }
-  return await k8sCoreApi.createNamespace(namespaceJson)
-}
-
-const readNamespace = async namespace => {
-  return await k8sCoreApi.readNamespace(namespace)
-}
-
-const createPod = async (nodeSpec, namespace) => {
-  const { label, nodeId, image, args, port } = nodeSpec
-  const spec = {
-    metadata: {
-      labels: {
-        app: label
-      },
-      name: nodeId
-    },
-    spec: {
-      containers: [
-        {
-          image: image,
-          imagePullPolicy: 'Always',
-          name: nodeId,
-          ports: [{ containerPort: port }],
-          args: args
-        }
-      ]
-    }
-  }
-  return await k8sCoreApi.createNamespacedPod(namespace, spec)
-}
-
-const getDeploymentStatus = async (deploymentName, namespace) => {
-  const response = await k8sAppApi.readNamespacedDeploymentStatus(deploymentName, namespace)
-  const status = response.response.body.status
-  function getAvailability (item) {
-    return item.type === 'Available'
-  }
-  if (status && status.conditions) {
-    return status.conditions.find(getAvailability)
-  }
-  return undefined
-}
-
-const deleteNamespace = async (namespace) => {
-  logger.debug(`Taking down Namespace ${namespace}...`)
-  if (process.env.KEEP_NAMESPACE && process.env.KEEP_NAMESPACE === 1) {
-    return
-  }
-  return k8sCoreApi.deleteNamespace(namespace)
-}
-
-const getNamespacedPods = async (namespace) => {
-  const response = await k8sCoreApi.listNamespacedPod(namespace)
-  return response.body.items
-}
-
-const getPod = async (podName, namespace) => {
-  const pods = await getNamespacedPods(namespace)
-  const found = pods.find(
-    (pod) => !!pod.metadata && pod.metadata.name === podName && !!pod.status && pod.status.podIP
-  )
-  if (!found) {
-    throw Error(`GetNode(${podName}): node is not present in the cluster`)
-  }
-  return found
-}
-
-const startForwardServer = async (namespace, pod, port, onReady) => new Promise((resolve, reject) => {
-  const net = require('net')
-  const forward = new k8s.PortForward(kc)
-
-  // This simple server just forwards traffic from itself to a service running in kubernetes
-  // -> localhost:8080 -> port-forward-tunnel -> kubernetes-pod
-  // This is basically equivalent to 'kubectl port-forward ...' but in Javascript.
-  const server = net.createServer((socket) => {
-    forward.portForward(namespace, pod, [port], socket, null, socket)
-  })
-  // TODO: add Ws proxy server to adopt the polkadot/api
-  server.listen(port, '127.0.0.1', (err) => {
-    if (err) {
-      logger.error('Error starting server')
-      reject(err)
-    }
-    logger.info('Forwarding server started, ready to connect')
-    resolve()
-    // Optional onReady hook when server started
-    if (onReady && isFunction(onReady)) {
-      onReady()
-    }
-  })
-})
-
-module.exports = { createNamespace, readNamespace, createPod, deleteNamespace, getDeploymentStatus, getPod, getNamespacedPods, startForwardServer }
diff --git a/.maintain/chaostest/src/index.js b/.maintain/chaostest/src/index.js
deleted file mode 100644
index 176eca6d71ba..000000000000
--- a/.maintain/chaostest/src/index.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('@oclif/command')
diff --git a/.maintain/chaostest/src/utils/exit.js b/.maintain/chaostest/src/utils/exit.js
deleted file mode 100644
index 3cf06d290440..000000000000
--- a/.maintain/chaostest/src/utils/exit.js
+++ /dev/null
@@ -1,12 +0,0 @@
-const logger = require('../utils/logger')
-
-const succeedExit = function () {
-  process.exit(0)
-}
-
-const errorExit = function (msg, err) {
-  logger.error(msg, err)
-  process.exit(1)
-}
-
-module.exports = { succeedExit, errorExit }
diff --git a/.maintain/chaostest/src/utils/index.js b/.maintain/chaostest/src/utils/index.js
deleted file mode 100644
index b50c177215a2..000000000000
--- a/.maintain/chaostest/src/utils/index.js
+++ /dev/null
@@ -1,9 +0,0 @@
-const getBootNodeUrl = (bootnode) => {
-  return `/dns4/${bootnode.ip}/tcp/30333/p2p/${bootnode.peerId}`
-}
-
-const isFunction = (obj) => {
-  return !!(obj && obj.constructor && obj.call && obj.apply)
-}
-
-module.exports = { getBootNodeUrl, isFunction }
diff --git a/.maintain/chaostest/src/utils/logger.js b/.maintain/chaostest/src/utils/logger.js
deleted file mode 100644
index e1da0d8d07f4..000000000000
--- a/.maintain/chaostest/src/utils/logger.js
+++ /dev/null
@@ -1,50 +0,0 @@
-const winston = require('winston')
-const fs = require('fs')
-const logDir = 'log' // Or read from a configuration
-const { format, transports } = winston
-const env = process.env.NODE_ENV || 'development'
-const util = require('util')
-
-if (!fs.existsSync(logDir)) {
-  // Create the directory if it does not exist
-  fs.mkdirSync(logDir)
-}
-
-const logFormat = format.printf(info => {
-  info.message = util.format(info.message)
-  if (info.metadata && Object.keys(info.metadata).length) {
-    info.message = util.format(info.message, info.metadata)
-  }
-  return `${info.timestamp} ${info.level}: ${info.message}`
-})
-
-const logger = winston.createLogger({
-  level: env === 'development' ? 'debug' : 'info',
-  transports: [
-    new transports.Console({
-      format: format.combine(
-        format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }),
-        // Format the metadata object
-        format.metadata({ fillExcept: ['message', 'level', 'timestamp', 'label'] }),
-        format.colorize(),
-        logFormat
-      )
-    }),
-    new winston.transports.File({
-      level: env === 'development' ? 'debug' : 'info',
-      filename: logDir + '/logs.log',
-      format: format.combine(
-        format.timestamp(),
-        format.json()
-      ),
-      maxsize: 1024 * 1024 * 10 // 10MB
-    })
-  ],
-  exceptionHandlers: [
-    new winston.transports.File({
-      filename: 'log/exceptions.log'
-    })
-  ]
-})
-
-module.exports = logger
diff --git a/.maintain/chaostest/src/utils/wait.js b/.maintain/chaostest/src/utils/wait.js
deleted file mode 100644
index 72498d1acb2a..000000000000
--- a/.maintain/chaostest/src/utils/wait.js
+++ /dev/null
@@ -1,32 +0,0 @@
-const logger = require('./logger')
-/**
- * Wait n milliseconds
- *
- * @param n - In milliseconds
- */
-function waitNMilliseconds (n) {
-  return new Promise((resolve) => {
-    setTimeout(resolve, n)
-  })
-}
-
-/**
- * Run a function until that function correctly resolves
- *
- * @param fn - The function to run
- */
-async function pollUntil (fn) {
-  try {
-    const result = await fn()
-
-    return result
-  } catch (_error) {
-    logger.error('Error polling', _error)
-    logger.debug('awaiting...')
-    await waitNMilliseconds(5000) // FIXME We can add exponential delay here
-
-    return pollUntil(fn)
-  }
-}
-
-module.exports = { pollUntil, waitNMilliseconds }
diff --git a/.maintain/flamingfir-deploy.sh b/.maintain/flamingfir-deploy.sh
deleted file mode 100755
index 8f0fb3a2bc01..000000000000
--- a/.maintain/flamingfir-deploy.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-RETRY_COUNT=10
-RETRY_ATTEMPT=0
-SLEEP_TIME=15
-TARGET_HOST="$1"
-COMMIT=$(cat artifacts/substrate/VERSION)
-DOWNLOAD_URL="https://releases.parity.io/substrate/x86_64-debian:stretch/${COMMIT}/substrate/substrate"
-POST_DATA='{"extra_vars":{"artifact_path":"'${DOWNLOAD_URL}'","target_host":"'${TARGET_HOST}'"}}'
-
-JOB_ID=$(wget -O - --header "Authorization: Bearer ${AWX_TOKEN}" --header "Content-type: application/json" --post-data "${POST_DATA}" https://ansible-awx.parity.io/api/v2/job_templates/32/launch/ | jq .job)
-
-echo "Launched job: $JOB_ID"
-
-
-while [ ${RETRY_ATTEMPT} -le ${RETRY_COUNT} ] ; do
-	export RETRY_RESULT=$(wget -O - --header "Authorization: Bearer ${AWX_TOKEN}"  https://ansible-awx.parity.io/api/v2/jobs/${JOB_ID}/ | jq .status)
-	RETRY_ATTEMPT=$(( $RETRY_ATTEMPT +1 ))
-	sleep $SLEEP_TIME
-	if [ $(echo $RETRY_RESULT | egrep  -e successful -e failed) ] ; then
-            break
-        fi
-done
-
-AWX_OUTPUT=$(wget -O - --header "Authorization: Bearer ${AWX_TOKEN}"  https://ansible-awx.parity.io/api/v2/jobs/${JOB_ID}/stdout?format=txt_download)
-
-echo "AWX job log:"
-echo "${AWX_OUTPUT}"
-
-
-JOB_STATUS=$(wget -O - --header "Authorization: Bearer ${AWX_TOKEN}"  https://ansible-awx.parity.io/api/v2/jobs/${JOB_ID}/ | jq .status )
-
-echo "==================================="
-echo -e "Ansible AWX Remote Job: ${JOB_ID} \x1B[31mStatus: ${JOB_STATUS}\x1B[0m"
-echo "==================================="

From 8ee55dde2eb62f85aa64b54a0814529ea2b8368d Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Thu, 14 Jan 2021 21:55:41 +0300
Subject: [PATCH 0272/1194] Storage chains part 1 (#7868)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* CLI options and DB upgrade

* Transaction storage

* Block pruning

* Block pruning test

* Style

* Naming

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Style

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 bin/node/testing/src/bench.rs            |   4 +-
 client/cli/src/config.rs                 |  29 ++-
 client/cli/src/params/database_params.rs |  19 ++
 client/cli/src/params/pruning_params.rs  |  17 +-
 client/db/src/lib.rs                     | 216 +++++++++++++++++++++--
 client/db/src/upgrade.rs                 |  38 +++-
 client/db/src/utils.rs                   |  19 +-
 client/service/src/builder.rs            |   8 +-
 client/service/src/config.rs             |  13 +-
 client/service/src/lib.rs                |   1 +
 client/service/test/src/client/mod.rs    |  12 +-
 client/service/test/src/lib.rs           |   5 +-
 utils/browser/src/lib.rs                 |   7 +-
 13 files changed, 347 insertions(+), 41 deletions(-)

diff --git a/bin/node/testing/src/bench.rs b/bin/node/testing/src/bench.rs
index 3bc31c6e414a..a6f65b86a0e2 100644
--- a/bin/node/testing/src/bench.rs
+++ b/bin/node/testing/src/bench.rs
@@ -410,8 +410,10 @@ impl BenchDb {
 		let db_config = sc_client_db::DatabaseSettings {
 			state_cache_size: 16*1024*1024,
 			state_cache_child_ratio: Some((0, 100)),
-			pruning: PruningMode::ArchiveAll,
+			state_pruning: PruningMode::ArchiveAll,
 			source: database_type.into_settings(dir.into()),
+			keep_blocks: sc_client_db::KeepBlocks::All,
+			transaction_storage: sc_client_db::TransactionStorageMode::BlockBody,
 		};
 		let task_executor = TaskExecutor::new();
 
diff --git a/client/cli/src/config.rs b/client/cli/src/config.rs
index 017d2b421683..854e73ae7812 100644
--- a/client/cli/src/config.rs
+++ b/client/cli/src/config.rs
@@ -32,7 +32,7 @@ use sc_service::config::{
 	NodeKeyConfig, OffchainWorkerConfig, PrometheusConfig, PruningMode, Role, RpcMethods,
 	TaskExecutor, TelemetryEndpoints, TransactionPoolOptions, WasmExecutionMethod,
 };
-use sc_service::{ChainSpec, TracingReceiver};
+use sc_service::{ChainSpec, TracingReceiver, KeepBlocks, TransactionStorageMode };
 use std::net::SocketAddr;
 use std::path::PathBuf;
 
@@ -203,6 +203,13 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 			.unwrap_or_default())
 	}
 
+	/// Get the database transaction storage scheme.
+	fn database_transaction_storage(&self) -> Result<TransactionStorageMode> {
+		Ok(self.database_params()
+			.map(|x| x.transaction_storage())
+			.unwrap_or(TransactionStorageMode::BlockBody))
+	}
+
 	/// Get the database backend variant.
 	///
 	/// By default this is retrieved from `DatabaseParams` if it is available. Otherwise its `None`.
@@ -244,16 +251,26 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 		Ok(Default::default())
 	}
 
-	/// Get the pruning mode.
+	/// Get the state pruning mode.
 	///
 	/// By default this is retrieved from `PruningMode` if it is available. Otherwise its
 	/// `PruningMode::default()`.
-	fn pruning(&self, unsafe_pruning: bool, role: &Role) -> Result<PruningMode> {
+	fn state_pruning(&self, unsafe_pruning: bool, role: &Role) -> Result<PruningMode> {
 		self.pruning_params()
-			.map(|x| x.pruning(unsafe_pruning, role))
+			.map(|x| x.state_pruning(unsafe_pruning, role))
 			.unwrap_or_else(|| Ok(Default::default()))
 	}
 
+	/// Get the block pruning mode.
+	///
+	/// By default this is retrieved from `block_pruning` if it is available. Otherwise its
+	/// `KeepBlocks::All`.
+	fn keep_blocks(&self) -> Result<KeepBlocks> {
+		self.pruning_params()
+			.map(|x| x.keep_blocks())
+			.unwrap_or_else(|| Ok(KeepBlocks::All))
+	}
+
 	/// Get the chain ID (string).
 	///
 	/// By default this is retrieved from `SharedParams`.
@@ -493,7 +510,9 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 			database: self.database_config(&config_dir, database_cache_size, database)?,
 			state_cache_size: self.state_cache_size()?,
 			state_cache_child_ratio: self.state_cache_child_ratio()?,
-			pruning: self.pruning(unsafe_pruning, &role)?,
+			state_pruning: self.state_pruning(unsafe_pruning, &role)?,
+			keep_blocks: self.keep_blocks()?,
+			transaction_storage: self.database_transaction_storage()?,
 			wasm_method: self.wasm_method()?,
 			wasm_runtime_overrides: self.wasm_runtime_overrides(),
 			execution_strategies: self.execution_strategies(is_dev, is_validator)?,
diff --git a/client/cli/src/params/database_params.rs b/client/cli/src/params/database_params.rs
index 21529f65a56b..23d2adc07f9d 100644
--- a/client/cli/src/params/database_params.rs
+++ b/client/cli/src/params/database_params.rs
@@ -18,6 +18,7 @@
 
 use crate::arg_enums::Database;
 use structopt::StructOpt;
+use sc_service::TransactionStorageMode;
 
 /// Parameters for block import.
 #[derive(Debug, StructOpt)]
@@ -34,6 +35,15 @@ pub struct DatabaseParams {
 	/// Limit the memory the database cache can use.
 	#[structopt(long = "db-cache", value_name = "MiB")]
 	pub database_cache_size: Option<usize>,
+
+	/// Enable storage chain mode
+	///
+	/// This changes the storage format for blocks bodys. 
+	/// If this is enabled, each transaction is stored separately in the
+	/// transaction database column and is only referenced by hash
+	/// in the block body column.
+	#[structopt(long)]
+	pub storage_chain: bool,
 }
 
 impl DatabaseParams {
@@ -46,4 +56,13 @@ impl DatabaseParams {
 	pub fn database_cache_size(&self) -> Option<usize> {
 		self.database_cache_size
 	}
+
+	/// Transaction storage scheme.
+	pub fn transaction_storage(&self) -> TransactionStorageMode {
+		if self.storage_chain {
+			TransactionStorageMode::StorageChain
+		} else {
+			TransactionStorageMode::BlockBody
+		}
+	}
 }
diff --git a/client/cli/src/params/pruning_params.rs b/client/cli/src/params/pruning_params.rs
index 80118cafd876..467ca253531f 100644
--- a/client/cli/src/params/pruning_params.rs
+++ b/client/cli/src/params/pruning_params.rs
@@ -17,7 +17,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::error;
-use sc_service::{PruningMode, Role};
+use sc_service::{PruningMode, Role, KeepBlocks};
 use structopt::StructOpt;
 
 /// Parameters to define the pruning mode
@@ -30,11 +30,16 @@ pub struct PruningParams {
 	/// 256 blocks.
 	#[structopt(long = "pruning", value_name = "PRUNING_MODE")]
 	pub pruning: Option<String>,
+	/// Specify the number of finalized blocks to keep in the database.
+	///
+	/// Default is to keep all blocks.
+	#[structopt(long, value_name = "COUNT")]
+	pub keep_blocks: Option<u32>,
 }
 
 impl PruningParams {
 	/// Get the pruning value from the parameters
-	pub fn pruning(&self, unsafe_pruning: bool, role: &Role) -> error::Result<PruningMode> {
+	pub fn state_pruning(&self, unsafe_pruning: bool, role: &Role) -> error::Result<PruningMode> {
 		// by default we disable pruning if the node is an authority (i.e.
 		// `ArchiveAll`), otherwise we keep state for the last 256 blocks. if the
 		// node is an authority and pruning is enabled explicitly, then we error
@@ -58,4 +63,12 @@ impl PruningParams {
 			}
 		})
 	}
+
+	/// Get the block pruning value from the parameters
+	pub fn keep_blocks(&self) -> error::Result<KeepBlocks> {
+		Ok(match self.keep_blocks {
+			Some(n) => KeepBlocks::Some(n),
+			None => KeepBlocks::All,
+		})
+	}
 }
diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index e3b94b03c87d..3fc95d5cdf97 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -66,7 +66,7 @@ use codec::{Decode, Encode};
 use hash_db::Prefix;
 use sp_trie::{MemoryDB, PrefixedMemoryDB, prefixed_key};
 use sp_database::Transaction;
-use sp_core::ChangesTrieConfiguration;
+use sp_core::{Hasher, ChangesTrieConfiguration};
 use sp_core::offchain::storage::{OffchainOverlayedChange, OffchainOverlayedChanges};
 use sp_core::storage::{well_known_keys, ChildInfo};
 use sp_arithmetic::traits::Saturating;
@@ -264,10 +264,33 @@ pub struct DatabaseSettings {
 	pub state_cache_size: usize,
 	/// Ratio of cache size dedicated to child tries.
 	pub state_cache_child_ratio: Option<(usize, usize)>,
-	/// Pruning mode.
-	pub pruning: PruningMode,
+	/// State pruning mode.
+	pub state_pruning: PruningMode,
 	/// Where to find the database.
 	pub source: DatabaseSettingsSrc,
+	/// Block pruning mode.
+	pub keep_blocks: KeepBlocks,
+	/// Block body/Transaction storage scheme.
+	pub transaction_storage: TransactionStorageMode,
+}
+
+/// Block pruning settings.
+#[derive(Debug, Clone, Copy)]
+pub enum KeepBlocks {
+	/// Keep full block history.
+	All,
+	/// Keep N recent finalized blocks.
+	Some(u32),
+}
+
+/// Block body storage scheme.
+#[derive(Debug, Clone, Copy)]
+pub enum TransactionStorageMode {
+	/// Store block body as an encoded list of full transactions in the BODY column
+	BlockBody,
+	/// Store a list of hashes in the BODY column and each transaction individually
+	/// in the TRANSACTION column.
+	StorageChain,
 }
 
 /// Where to find the database..
@@ -334,6 +357,8 @@ pub(crate) mod columns {
 	/// Offchain workers local storage
 	pub const OFFCHAIN: u32 = 9;
 	pub const CACHE: u32 = 10;
+	/// Transactions
+	pub const TRANSACTION: u32 = 11;
 }
 
 struct PendingBlock<Block: BlockT> {
@@ -372,10 +397,14 @@ pub struct BlockchainDb<Block: BlockT> {
 	leaves: RwLock<LeafSet<Block::Hash, NumberFor<Block>>>,
 	header_metadata_cache: Arc<HeaderMetadataCache<Block>>,
 	header_cache: Mutex<LinkedHashMap<Block::Hash, Option<Block::Header>>>,
+	transaction_storage: TransactionStorageMode,
 }
 
 impl<Block: BlockT> BlockchainDb<Block> {
-	fn new(db: Arc<dyn Database<DbHash>>) -> ClientResult<Self> {
+	fn new(
+		db: Arc<dyn Database<DbHash>>,
+		transaction_storage: TransactionStorageMode
+	) -> ClientResult<Self> {
 		let meta = read_meta::<Block>(&*db, columns::HEADER)?;
 		let leaves = LeafSet::read_from_db(&*db, columns::META, meta_keys::LEAF_PREFIX)?;
 		Ok(BlockchainDb {
@@ -384,6 +413,7 @@ impl<Block: BlockT> BlockchainDb<Block> {
 			meta: Arc::new(RwLock::new(meta)),
 			header_metadata_cache: Arc::new(HeaderMetadataCache::default()),
 			header_cache: Default::default(),
+			transaction_storage,
 		})
 	}
 
@@ -418,6 +448,20 @@ impl<Block: BlockT> BlockchainDb<Block> {
 				header.digest().log(DigestItem::as_changes_trie_root)
 					.cloned()))
 	}
+
+	fn extrinsic(&self, hash: &Block::Hash) -> ClientResult<Option<Block::Extrinsic>> {
+		match self.db.get(columns::TRANSACTION, hash.as_ref()) {
+			Some(ex) => {
+				match Decode::decode(&mut &ex[..]) {
+					Ok(ex) => Ok(Some(ex)),
+					Err(err) => Err(sp_blockchain::Error::Backend(
+						format!("Error decoding extrinsic {}: {}", hash, err)
+					)),
+				}
+			},
+			None => Ok(None),
+		}
+	}
 }
 
 impl<Block: BlockT> sc_client_api::blockchain::HeaderBackend<Block> for BlockchainDb<Block> {
@@ -476,11 +520,30 @@ impl<Block: BlockT> sc_client_api::blockchain::HeaderBackend<Block> for Blockcha
 impl<Block: BlockT> sc_client_api::blockchain::Backend<Block> for BlockchainDb<Block> {
 	fn body(&self, id: BlockId<Block>) -> ClientResult<Option<Vec<Block::Extrinsic>>> {
 		match read_db(&*self.db, columns::KEY_LOOKUP, columns::BODY, id)? {
-			Some(body) => match Decode::decode(&mut &body[..]) {
-				Ok(body) => Ok(Some(body)),
-				Err(err) => return Err(sp_blockchain::Error::Backend(
-					format!("Error decoding body: {}", err)
-				)),
+			Some(body) => {
+				match self.transaction_storage {
+					TransactionStorageMode::BlockBody => match Decode::decode(&mut &body[..]) {
+						Ok(body) => Ok(Some(body)),
+						Err(err) => return Err(sp_blockchain::Error::Backend(
+							format!("Error decoding body: {}", err)
+						)),
+					},
+					TransactionStorageMode::StorageChain => {
+						match Vec::<Block::Hash>::decode(&mut &body[..]) {
+							Ok(hashes) => {
+								let extrinsics: ClientResult<Vec<Block::Extrinsic>> = hashes.into_iter().map(
+									|h| self.extrinsic(&h) .and_then(|maybe_ex| maybe_ex.ok_or_else(
+										|| sp_blockchain::Error::Backend(
+											format!("Missing transaction: {}", h))))
+								).collect();
+								Ok(Some(extrinsics?))
+							}
+							Err(err) => return Err(sp_blockchain::Error::Backend(
+								format!("Error decoding body list: {}", err)
+							)),
+						}
+					}
+				}
 			}
 			None => Ok(None),
 		}
@@ -855,6 +918,8 @@ pub struct Backend<Block: BlockT> {
 	shared_cache: SharedCache<Block>,
 	import_lock: Arc<RwLock<()>>,
 	is_archive: bool,
+	keep_blocks: KeepBlocks,
+	transaction_storage: TransactionStorageMode,
 	io_stats: FrozenForDuration<(kvdb::IoStats, StateUsageInfo)>,
 	state_usage: Arc<StateUsageStats>,
 }
@@ -871,13 +936,29 @@ impl<Block: BlockT> Backend<Block> {
 	/// Create new memory-backed client backend for tests.
 	#[cfg(any(test, feature = "test-helpers"))]
 	pub fn new_test(keep_blocks: u32, canonicalization_delay: u64) -> Self {
+		Self::new_test_with_tx_storage(
+			keep_blocks,
+			canonicalization_delay,
+			TransactionStorageMode::BlockBody,
+		)
+	}
+
+	/// Create new memory-backed client backend for tests.
+	#[cfg(any(test, feature = "test-helpers"))]
+	fn new_test_with_tx_storage(
+		keep_blocks: u32,
+		canonicalization_delay: u64,
+		transaction_storage: TransactionStorageMode,
+	) -> Self {
 		let db = kvdb_memorydb::create(crate::utils::NUM_COLUMNS);
 		let db = sp_database::as_database(db);
 		let db_setting = DatabaseSettings {
 			state_cache_size: 16777216,
 			state_cache_child_ratio: Some((50, 100)),
-			pruning: PruningMode::keep_blocks(keep_blocks),
+			state_pruning: PruningMode::keep_blocks(keep_blocks),
 			source: DatabaseSettingsSrc::Custom(db),
+			keep_blocks: KeepBlocks::Some(keep_blocks),
+			transaction_storage,
 		};
 
 		Self::new(db_setting, canonicalization_delay).expect("failed to create test-db")
@@ -888,12 +969,12 @@ impl<Block: BlockT> Backend<Block> {
 		canonicalization_delay: u64,
 		config: &DatabaseSettings,
 	) -> ClientResult<Self> {
-		let is_archive_pruning = config.pruning.is_archive();
-		let blockchain = BlockchainDb::new(db.clone())?;
+		let is_archive_pruning = config.state_pruning.is_archive();
+		let blockchain = BlockchainDb::new(db.clone(), config.transaction_storage.clone())?;
 		let meta = blockchain.meta.clone();
 		let map_e = |e: sc_state_db::Error<io::Error>| sp_blockchain::Error::from_state_db(e);
 		let state_db: StateDb<_, _> = StateDb::new(
-			config.pruning.clone(),
+			config.state_pruning.clone(),
 			!config.source.supports_ref_counting(),
 			&StateMetaDb(&*db),
 		).map_err(map_e)?;
@@ -933,6 +1014,8 @@ impl<Block: BlockT> Backend<Block> {
 			is_archive: is_archive_pruning,
 			io_stats: FrozenForDuration::new(std::time::Duration::from_secs(1)),
 			state_usage: Arc::new(StateUsageStats::new()),
+			keep_blocks: config.keep_blocks.clone(),
+			transaction_storage: config.transaction_storage.clone(),
 		})
 	}
 
@@ -1140,7 +1223,21 @@ impl<Block: BlockT> Backend<Block> {
 
 			transaction.set_from_vec(columns::HEADER, &lookup_key, pending_block.header.encode());
 			if let Some(body) = &pending_block.body {
-				transaction.set_from_vec(columns::BODY, &lookup_key, body.encode());
+				match self.transaction_storage {
+					TransactionStorageMode::BlockBody => {
+						transaction.set_from_vec(columns::BODY, &lookup_key, body.encode());
+					},
+					TransactionStorageMode::StorageChain => {
+						let mut hashes = Vec::with_capacity(body.len());
+						for extrinsic in body {
+							let extrinsic = extrinsic.encode();
+							let hash = HashFor::<Block>::hash(&extrinsic);
+							transaction.set(columns::TRANSACTION, &hash.as_ref(), &extrinsic);
+							hashes.push(hash);
+						}
+						transaction.set_from_vec(columns::BODY, &lookup_key, hashes.encode());
+					},
+				}
 			}
 			if let Some(justification) = pending_block.justification {
 				transaction.set_from_vec(columns::JUSTIFICATION, &lookup_key, justification.encode());
@@ -1391,6 +1488,7 @@ impl<Block: BlockT> Backend<Block> {
 			}
 		}
 
+		self.prune_blocks(transaction, f_num)?;
 		let new_displaced = self.blockchain.leaves.write().finalize_height(f_num);
 		match displaced {
 			x @ &mut None => *x = Some(new_displaced),
@@ -1399,6 +1497,50 @@ impl<Block: BlockT> Backend<Block> {
 
 		Ok(())
 	}
+
+	fn prune_blocks(
+		&self,
+		transaction: &mut Transaction<DbHash>,
+		finalized: NumberFor<Block>,
+	) -> ClientResult<()> {
+		if let KeepBlocks::Some(keep_blocks) = self.keep_blocks {
+			// Always keep the last finalized block
+			let keep = std::cmp::max(keep_blocks, 1);
+			if finalized < keep.into() {
+				return Ok(())
+			}
+			let number = finalized.saturating_sub(keep.into());
+			match read_db(&*self.storage.db, columns::KEY_LOOKUP, columns::BODY, BlockId::<Block>::number(number))? {
+				Some(body) => {
+					debug!(target: "db", "Removing block #{}", number);
+					utils::remove_from_db(
+						transaction,
+						&*self.storage.db,
+						columns::KEY_LOOKUP,
+						columns::BODY,
+						BlockId::<Block>::number(number),
+					)?;
+					match self.transaction_storage {
+						TransactionStorageMode::BlockBody => {},
+						TransactionStorageMode::StorageChain => {
+							match Vec::<Block::Hash>::decode(&mut &body[..]) {
+								Ok(hashes) => {
+									for h in hashes {
+										transaction.remove(columns::TRANSACTION, h.as_ref());
+									}
+								}
+								Err(err) => return Err(sp_blockchain::Error::Backend(
+									format!("Error decoding body list: {}", err)
+								)),
+							}
+						}
+					}
+				}
+				None => return Ok(()),
+			}
+		}
+		Ok(())
+	}
 }
 
 fn apply_state_commit(transaction: &mut Transaction<DbHash>, commit: sc_state_db::CommitSet<Vec<u8>>) {
@@ -1804,6 +1946,17 @@ pub(crate) mod tests {
 		parent_hash: H256,
 		changes: Option<Vec<(Vec<u8>, Vec<u8>)>>,
 		extrinsics_root: H256,
+	) -> H256 {
+		insert_block(backend, number, parent_hash, changes, extrinsics_root, Vec::new())
+	}
+
+	pub fn insert_block(
+		backend: &Backend<Block>,
+		number: u64,
+		parent_hash: H256,
+		changes: Option<Vec<(Vec<u8>, Vec<u8>)>>,
+		extrinsics_root: H256,
+		body: Vec<ExtrinsicWrapper<u64>>,
 	) -> H256 {
 		use sp_runtime::testing::Digest;
 
@@ -1830,7 +1983,7 @@ pub(crate) mod tests {
 		};
 		let mut op = backend.begin_operation().unwrap();
 		backend.begin_state_operation(&mut op, block_id).unwrap();
-		op.set_block_data(header, Some(Vec::new()), None, NewBlockState::Best).unwrap();
+		op.set_block_data(header, Some(body), None, NewBlockState::Best).unwrap();
 		op.update_changes_trie((changes_trie_update, ChangesTrieCacheAction::Clear)).unwrap();
 		backend.commit_operation(op).unwrap();
 
@@ -1882,8 +2035,10 @@ pub(crate) mod tests {
 		let backend = Backend::<Block>::new(DatabaseSettings {
 			state_cache_size: 16777216,
 			state_cache_child_ratio: Some((50, 100)),
-			pruning: PruningMode::keep_blocks(1),
+			state_pruning: PruningMode::keep_blocks(1),
 			source: DatabaseSettingsSrc::Custom(backing),
+			keep_blocks: KeepBlocks::All,
+			transaction_storage: TransactionStorageMode::BlockBody,
 		}, 0).unwrap();
 		assert_eq!(backend.blockchain().info().best_number, 9);
 		for i in 0..10 {
@@ -2427,4 +2582,33 @@ pub(crate) mod tests {
 		assert_eq!(cht_root_1, cht_root_2);
 		assert_eq!(cht_root_2, cht_root_3);
 	}
+
+	#[test]
+	fn prune_blocks_on_finalize() {
+		for storage in &[TransactionStorageMode::BlockBody, TransactionStorageMode::StorageChain] {
+			let backend = Backend::<Block>::new_test_with_tx_storage(2, 0, *storage);
+			let mut blocks = Vec::new();
+			let mut prev_hash = Default::default();
+			for i in 0 .. 5 {
+				let hash = insert_block(&backend, i, prev_hash, None, Default::default(), vec![i.into()]);
+				blocks.push(hash);
+				prev_hash = hash;
+			}
+
+			{
+				let mut op = backend.begin_operation().unwrap();
+				backend.begin_state_operation(&mut op, BlockId::Hash(blocks[4])).unwrap();
+				for i in 1 .. 5 {
+					op.mark_finalized(BlockId::Hash(blocks[i]), None).unwrap();
+				}
+				backend.commit_operation(op).unwrap();
+			}
+			let bc = backend.blockchain();
+			assert_eq!(None, bc.body(BlockId::hash(blocks[0])).unwrap());
+			assert_eq!(None, bc.body(BlockId::hash(blocks[1])).unwrap());
+			assert_eq!(None, bc.body(BlockId::hash(blocks[2])).unwrap());
+			assert_eq!(Some(vec![3.into()]), bc.body(BlockId::hash(blocks[3])).unwrap());
+			assert_eq!(Some(vec![4.into()]), bc.body(BlockId::hash(blocks[4])).unwrap());
+		}
+	}
 }
diff --git a/client/db/src/upgrade.rs b/client/db/src/upgrade.rs
index e87b11b69660..b6e49edba197 100644
--- a/client/db/src/upgrade.rs
+++ b/client/db/src/upgrade.rs
@@ -24,21 +24,26 @@ use std::path::{Path, PathBuf};
 
 use sp_runtime::traits::Block as BlockT;
 use crate::utils::DatabaseType;
+use kvdb_rocksdb::{Database, DatabaseConfig};
 
 /// Version file name.
 const VERSION_FILE_NAME: &'static str = "db_version";
 
 /// Current db version.
-const CURRENT_VERSION: u32 = 1;
+const CURRENT_VERSION: u32 = 2;
+
+/// Number of columns in v1.
+const V1_NUM_COLUMNS: u32 = 11;
 
 /// Upgrade database to current version.
-pub fn upgrade_db<Block: BlockT>(db_path: &Path, _db_type: DatabaseType) -> sp_blockchain::Result<()> {
+pub fn upgrade_db<Block: BlockT>(db_path: &Path, db_type: DatabaseType) -> sp_blockchain::Result<()> {
 	let is_empty = db_path.read_dir().map_or(true, |mut d| d.next().is_none());
 	if !is_empty {
 		let db_version = current_version(db_path)?;
 		match db_version {
 			0 => Err(sp_blockchain::Error::Backend(format!("Unsupported database version: {}", db_version)))?,
-			1 => (),
+			1 => migrate_1_to_2::<Block>(db_path, db_type)?,
+			CURRENT_VERSION => (),
 			_ => Err(sp_blockchain::Error::Backend(format!("Future database version: {}", db_version)))?,
 		}
 	}
@@ -46,6 +51,16 @@ pub fn upgrade_db<Block: BlockT>(db_path: &Path, _db_type: DatabaseType) -> sp_b
 	update_version(db_path)
 }
 
+/// Migration from version1 to version2:
+/// 1) the number of columns has changed from 11 to 12;
+/// 2) transactions column is added;
+fn migrate_1_to_2<Block: BlockT>(db_path: &Path, _db_type: DatabaseType) -> sp_blockchain::Result<()> {
+	let db_path = db_path.to_str()
+		.ok_or_else(|| sp_blockchain::Error::Backend("Invalid database path".into()))?;
+	let db_cfg = DatabaseConfig::with_columns(V1_NUM_COLUMNS);
+	let db = Database::open(&db_cfg, db_path).map_err(db_err)?;
+	db.add_column().map_err(db_err)
+}
 
 /// Reads current database version from the file at given path.
 /// If the file does not exist returns 0.
@@ -87,7 +102,7 @@ fn version_file_path(path: &Path) -> PathBuf {
 #[cfg(test)]
 mod tests {
 	use sc_state_db::PruningMode;
-	use crate::{DatabaseSettings, DatabaseSettingsSrc};
+	use crate::{DatabaseSettings, DatabaseSettingsSrc, KeepBlocks, TransactionStorageMode};
 	use crate::tests::Block;
 	use super::*;
 
@@ -103,8 +118,10 @@ mod tests {
 		crate::utils::open_database::<Block>(&DatabaseSettings {
 			state_cache_size: 0,
 			state_cache_child_ratio: None,
-			pruning: PruningMode::ArchiveAll,
+			state_pruning: PruningMode::ArchiveAll,
 			source: DatabaseSettingsSrc::RocksDb { path: db_path.to_owned(), cache_size: 128 },
+			keep_blocks: KeepBlocks::All,
+			transaction_storage: TransactionStorageMode::BlockBody,
 		}, DatabaseType::Full).map(|_| ())
 	}
 
@@ -122,4 +139,15 @@ mod tests {
 		open_database(db_dir.path()).unwrap();
 		assert_eq!(current_version(db_dir.path()).unwrap(), CURRENT_VERSION);
 	}
+
+	#[test]
+	fn upgrade_from_1_to_2_works() {
+		for version_from_file in &[None, Some(1)] {
+			let db_dir = tempfile::TempDir::new().unwrap();
+			let db_path = db_dir.path();
+			create_db(db_path, *version_from_file);
+			open_database(db_path).unwrap();
+			assert_eq!(current_version(db_path).unwrap(), CURRENT_VERSION);
+		}
+	}
 }
diff --git a/client/db/src/utils.rs b/client/db/src/utils.rs
index dfc1e945b3a4..baea6aab69fa 100644
--- a/client/db/src/utils.rs
+++ b/client/db/src/utils.rs
@@ -37,7 +37,7 @@ use crate::{DatabaseSettings, DatabaseSettingsSrc, Database, DbHash};
 /// Number of columns in the db. Must be the same for both full && light dbs.
 /// Otherwise RocksDb will fail to open database && check its type.
 #[cfg(any(feature = "with-kvdb-rocksdb", feature = "with-parity-db", feature = "test-helpers", test))]
-pub const NUM_COLUMNS: u32 = 11;
+pub const NUM_COLUMNS: u32 = 12;
 /// Meta column. The set of keys in the column is shared by full && light storages.
 pub const COLUMN_META: u32 = 0;
 
@@ -327,6 +327,23 @@ pub fn read_db<Block>(
 	})
 }
 
+/// Remove database column entry for the given block.
+pub fn remove_from_db<Block>(
+	transaction: &mut Transaction<DbHash>,
+	db: &dyn Database<DbHash>,
+	col_index: u32,
+	col: u32,
+	id: BlockId<Block>,
+) -> sp_blockchain::Result<()>
+where
+	Block: BlockT,
+{
+	block_id_to_lookup_key(db, col_index, id).and_then(|key| match key {
+		Some(key) => Ok(transaction.remove(col, key.as_ref())),
+		None => Ok(()),
+	})
+}
+
 /// Read a header from the database.
 pub fn read_header<Block: BlockT>(
 	db: &dyn Database<DbHash>,
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index e3476e625ca5..bac5191f0cca 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -326,8 +326,10 @@ pub fn new_full_parts<TBl, TRtApi, TExecDisp>(
 			state_cache_size: config.state_cache_size,
 			state_cache_child_ratio:
 			config.state_cache_child_ratio.map(|v| (v, 100)),
-			pruning: config.pruning.clone(),
+			state_pruning: config.state_pruning.clone(),
 			source: config.database.clone(),
+			keep_blocks: config.keep_blocks.clone(),
+			transaction_storage: config.transaction_storage.clone(),
 		};
 
 		let extensions = sc_client_api::execution_extensions::ExecutionExtensions::new(
@@ -384,8 +386,10 @@ pub fn new_light_parts<TBl, TRtApi, TExecDisp>(
 			state_cache_size: config.state_cache_size,
 			state_cache_child_ratio:
 				config.state_cache_child_ratio.map(|v| (v, 100)),
-			pruning: config.pruning.clone(),
+			state_pruning: config.state_pruning.clone(),
 			source: config.database.clone(),
+			keep_blocks: config.keep_blocks.clone(),
+			transaction_storage: config.transaction_storage.clone(),
 		};
 		sc_client_db::light::LightStorage::new(db_settings)?
 	};
diff --git a/client/service/src/config.rs b/client/service/src/config.rs
index e253ed97ff3a..5197aa655b24 100644
--- a/client/service/src/config.rs
+++ b/client/service/src/config.rs
@@ -18,7 +18,10 @@
 
 //! Service configuration.
 
-pub use sc_client_db::{Database, PruningMode, DatabaseSettingsSrc as DatabaseConfig};
+pub use sc_client_db::{
+	Database, PruningMode, DatabaseSettingsSrc as DatabaseConfig,
+	KeepBlocks, TransactionStorageMode
+};
 pub use sc_network::Multiaddr;
 pub use sc_network::config::{ExtTransport, MultiaddrWithPeerId, NetworkConfiguration, Role, NodeKeyConfig};
 pub use sc_executor::WasmExecutionMethod;
@@ -58,8 +61,12 @@ pub struct Configuration {
 	pub state_cache_size: usize,
 	/// Size in percent of cache size dedicated to child tries
 	pub state_cache_child_ratio: Option<usize>,
-	/// Pruning settings.
-	pub pruning: PruningMode,
+	/// State pruning settings.
+	pub state_pruning: PruningMode,
+	/// Number of blocks to keep in the db.
+	pub keep_blocks: KeepBlocks,
+	/// Transaction storage scheme.
+	pub transaction_storage: TransactionStorageMode,
 	/// Chain configuration.
 	pub chain_spec: Box<dyn ChainSpec>,
 	/// Wasm execution method.
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index 8b26b1a75ddf..df1cd47db0f7 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -60,6 +60,7 @@ pub use self::builder::{
 };
 pub use config::{
 	BasePath, Configuration, DatabaseConfig, PruningMode, Role, RpcMethods, TaskExecutor, TaskType,
+	KeepBlocks, TransactionStorageMode,
 };
 pub use sc_chain_spec::{
 	ChainSpec, GenericChainSpec, Properties, RuntimeGenesis, Extension as ChainSpecExtension,
diff --git a/client/service/test/src/client/mod.rs b/client/service/test/src/client/mod.rs
index 6bb09981107a..9712e84e6049 100644
--- a/client/service/test/src/client/mod.rs
+++ b/client/service/test/src/client/mod.rs
@@ -31,7 +31,9 @@ use substrate_test_runtime_client::{
 use sc_client_api::{
 	StorageProvider, BlockBackend, in_mem, BlockchainEvents,
 };
-use sc_client_db::{Backend, DatabaseSettings, DatabaseSettingsSrc, PruningMode};
+use sc_client_db::{
+	Backend, DatabaseSettings, DatabaseSettingsSrc, PruningMode, KeepBlocks, TransactionStorageMode
+};
 use sc_block_builder::BlockBuilderProvider;
 use sc_service::client::{self, Client, LocalCallExecutor, new_in_mem};
 use sp_runtime::traits::{
@@ -1275,7 +1277,9 @@ fn doesnt_import_blocks_that_revert_finality() {
 		DatabaseSettings {
 			state_cache_size: 1 << 20,
 			state_cache_child_ratio: None,
-			pruning: PruningMode::ArchiveAll,
+			state_pruning: PruningMode::ArchiveAll,
+			keep_blocks: KeepBlocks::All,
+			transaction_storage: TransactionStorageMode::BlockBody,
 			source: DatabaseSettingsSrc::RocksDb {
 				path: tmp.path().into(),
 				cache_size: 1024,
@@ -1476,7 +1480,9 @@ fn returns_status_for_pruned_blocks() {
 		DatabaseSettings {
 			state_cache_size: 1 << 20,
 			state_cache_child_ratio: None,
-			pruning: PruningMode::keep_blocks(1),
+			state_pruning: PruningMode::keep_blocks(1),
+			keep_blocks: KeepBlocks::All,
+			transaction_storage: TransactionStorageMode::BlockBody,
 			source: DatabaseSettingsSrc::RocksDb {
 				path: tmp.path().into(),
 				cache_size: 1024,
diff --git a/client/service/test/src/lib.rs b/client/service/test/src/lib.rs
index c30246e91ca0..bd4f325908b0 100644
--- a/client/service/test/src/lib.rs
+++ b/client/service/test/src/lib.rs
@@ -35,6 +35,7 @@ use sc_service::{
 	GenericChainSpec,
 	ChainSpecExtension,
 	Configuration,
+	KeepBlocks, TransactionStorageMode,
 	config::{BasePath, DatabaseConfig, KeystoreConfig},
 	RuntimeGenesis,
 	Role,
@@ -250,7 +251,9 @@ fn node_config<G: RuntimeGenesis + 'static, E: ChainSpecExtension + Clone + 'sta
 		},
 		state_cache_size: 16777216,
 		state_cache_child_ratio: None,
-		pruning: Default::default(),
+		state_pruning: Default::default(),
+		keep_blocks: KeepBlocks::All,
+		transaction_storage: TransactionStorageMode::BlockBody,
 		chain_spec: Box::new((*spec).clone()),
 		wasm_method: sc_service::config::WasmExecutionMethod::Interpreted,
 		wasm_runtime_overrides: Default::default(),
diff --git a/utils/browser/src/lib.rs b/utils/browser/src/lib.rs
index 07404f044126..c59fbb991bee 100644
--- a/utils/browser/src/lib.rs
+++ b/utils/browser/src/lib.rs
@@ -21,7 +21,8 @@ use sc_network::config::TransportConfig;
 use sc_service::{
 	RpcSession, Role, Configuration, TaskManager, RpcHandlers,
 	config::{DatabaseConfig, KeystoreConfig, NetworkConfiguration},
-	GenericChainSpec, RuntimeGenesis
+	GenericChainSpec, RuntimeGenesis,
+	KeepBlocks, TransactionStorageMode,
 };
 use wasm_bindgen::prelude::*;
 use futures::{
@@ -86,7 +87,9 @@ where
 		impl_version: String::from("0.0.0"),
 		offchain_worker: Default::default(),
 		prometheus_config: Default::default(),
-		pruning: Default::default(),
+		state_pruning: Default::default(),
+		keep_blocks: KeepBlocks::All,
+		transaction_storage: TransactionStorageMode::BlockBody,
 		rpc_cors: Default::default(),
 		rpc_http: Default::default(),
 		rpc_ipc: Default::default(),

From e6d498a901706c9753cb96de4bec5401143be8f2 Mon Sep 17 00:00:00 2001
From: Denis Pisarev <denis.pisarev@parity.io>
Date: Thu, 14 Jan 2021 22:00:41 +0100
Subject: [PATCH 0273/1194] tests: fix UI test so we can update CI image
 (#7901)

* tests: fix UI test so we can update CI image

* CI: remove diener installation from the script as it's installed in CI image

* tests: another fix

* tests: fix another fix

* tests: NLoEOF

* tests: another broken stderr
---
 .../gitlab/check_polkadot_companion_build.sh  |  4 +-
 .../call_argument_invalid_bound_2.stderr      | 39 +++++++++++++++++++
 .../pallet_ui/store_trait_leak_private.stderr |  2 +-
 .../tests/ui/mock_only_one_error_type.stderr  |  2 +-
 4 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/.maintain/gitlab/check_polkadot_companion_build.sh b/.maintain/gitlab/check_polkadot_companion_build.sh
index f2b61c6192d6..9e412ce26a89 100755
--- a/.maintain/gitlab/check_polkadot_companion_build.sh
+++ b/.maintain/gitlab/check_polkadot_companion_build.sh
@@ -41,8 +41,6 @@ EOT
 git config --global user.name 'CI system'
 git config --global user.email '<>'
 
-cargo install -f --version 0.2.0 diener
-
 # Merge master into our branch before building Polkadot to make sure we don't miss
 # any commits that are required by Polkadot.
 git fetch --depth 100 origin
@@ -88,7 +86,7 @@ else
 fi
 
 cd ..
-$CARGO_HOME/bin/diener --substrate --branch $CI_COMMIT_REF_NAME --git https://gitlab.parity.io/parity/substrate.git --path polkadot
+diener --substrate --branch $CI_COMMIT_REF_NAME --git https://gitlab.parity.io/parity/substrate.git --path polkadot
 cd polkadot
 
 # Test Polkadot pr or master branch with this Substrate commit.
diff --git a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr
index e366061b1c25..86968221cf30 100644
--- a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr
+++ b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr
@@ -3,9 +3,48 @@ error[E0277]: the trait bound `pallet::Call<T>: Decode` is not satisfied
    |
 17 |     #[pallet::call]
    |               ^^^^ the trait `Decode` is not implemented for `pallet::Call<T>`
+   |
+  ::: $WORKSPACE/frame/support/src/dispatch.rs
+   |
+   |     type Call: UnfilteredDispatchable + Codec + Clone + PartialEq + Eq;
+   |                                         ----- required by this bound in `frame_support::Callable::Call`
 
 error[E0277]: the trait bound `pallet::Call<T>: pallet::_::_parity_scale_codec::Encode` is not satisfied
   --> $DIR/call_argument_invalid_bound_2.rs:17:12
    |
 17 |     #[pallet::call]
    |               ^^^^ the trait `pallet::_::_parity_scale_codec::Encode` is not implemented for `pallet::Call<T>`
+   |
+  ::: $WORKSPACE/frame/support/src/dispatch.rs
+   |
+   |     type Call: UnfilteredDispatchable + Codec + Clone + PartialEq + Eq;
+   |                                         ----- required by this bound in `frame_support::Callable::Call`
+
+error[E0369]: binary operation `==` cannot be applied to type `&<T as pallet::Config>::Bar`
+  --> $DIR/call_argument_invalid_bound_2.rs:20:37
+   |
+20 |         fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
+   |                                           ^
+   |
+help: consider further restricting this bound
+   |
+17 |     #[pallet::call + std::cmp::PartialEq]
+   |                    ^^^^^^^^^^^^^^^^^^^^^
+
+error[E0277]: the trait bound `<T as pallet::Config>::Bar: Clone` is not satisfied
+  --> $DIR/call_argument_invalid_bound_2.rs:20:37
+   |
+20 |         fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
+   |                                           ^ the trait `Clone` is not implemented for `<T as pallet::Config>::Bar`
+   |
+   = note: required by `clone`
+
+error[E0277]: `<T as pallet::Config>::Bar` doesn't implement `std::fmt::Debug`
+  --> $DIR/call_argument_invalid_bound_2.rs:20:37
+   |
+20 |         fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
+   |                                           ^ `<T as pallet::Config>::Bar` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
+   |
+   = help: the trait `std::fmt::Debug` is not implemented for `<T as pallet::Config>::Bar`
+   = note: required because of the requirements on the impl of `std::fmt::Debug` for `&<T as pallet::Config>::Bar`
+   = note: required for the cast to the object type `dyn std::fmt::Debug`
diff --git a/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr b/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr
index f8ba5ecdc21b..d8c62faa303e 100644
--- a/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr
+++ b/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr
@@ -5,4 +5,4 @@ error[E0446]: private type `_GeneratedPrefixForStorageFoo<T>` in public interfac
    |                                        ^^^^^ can't leak private type
 ...
 20 |     #[pallet::storage]
-   |               - `_GeneratedPrefixForStorageFoo<T>` declared as private
+   |               ------- `_GeneratedPrefixForStorageFoo<T>` declared as private
diff --git a/primitives/api/test/tests/ui/mock_only_one_error_type.stderr b/primitives/api/test/tests/ui/mock_only_one_error_type.stderr
index eccd80ecd828..ab5b90af3ad1 100644
--- a/primitives/api/test/tests/ui/mock_only_one_error_type.stderr
+++ b/primitives/api/test/tests/ui/mock_only_one_error_type.stderr
@@ -19,7 +19,7 @@ error[E0277]: the trait bound `u32: From<sp_api_hidden_includes_DECL_RUNTIME_API
    ::: $WORKSPACE/primitives/api/src/lib.rs
     |
     |     type Error: std::fmt::Debug + From<ApiError>;
-    |                                   -------------- required by this bound in `ApiErrorExt`
+    |                                   -------------- required by this bound in `sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ApiErrorExt::Error`
     |
     = help: the following implementations were found:
               <u32 as From<HttpError>>

From bb3435a8ed22fcdff1b85353e586035f2f7c05b6 Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Fri, 15 Jan 2021 10:55:42 +0100
Subject: [PATCH 0274/1194] *: Update to libp2p v0.34.0 (#7888)

* *: Update to libp2p v0.34.0

* client/network: Update bytes, unsigned-varint and asynchronous-codec

* client: Update to prost v0.7
---
 Cargo.lock                                    | 289 +++++++++---------
 bin/node/browser-testing/Cargo.toml           |   2 +-
 client/authority-discovery/Cargo.toml         |   6 +-
 client/cli/Cargo.toml                         |   2 +-
 client/network-gossip/Cargo.toml              |   2 +-
 client/network/Cargo.toml                     |  16 +-
 .../protocol/generic_proto/upgrade/legacy.rs  |   2 +-
 .../generic_proto/upgrade/notifications.rs    |   2 +-
 client/network/test/Cargo.toml                |   2 +-
 client/peerset/Cargo.toml                     |   2 +-
 client/telemetry/Cargo.toml                   |   2 +-
 primitives/consensus/common/Cargo.toml        |   2 +-
 utils/browser/Cargo.toml                      |   2 +-
 13 files changed, 162 insertions(+), 169 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4d334f5f2588..c42127aead43 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -298,19 +298,6 @@ version = "4.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0"
 
-[[package]]
-name = "async-tls"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f23d769dbf1838d5df5156e7b1ad404f4c463d1ac2c6aeb6cd943630f8a8400"
-dependencies = [
- "futures-core",
- "futures-io",
- "rustls 0.19.0",
- "webpki",
- "webpki-roots",
-]
-
 [[package]]
 name = "async-trait"
 version = "0.1.41"
@@ -322,6 +309,19 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "asynchronous-codec"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb4401f0a3622dad2e0763fa79e0eb328bc70fb7dccfdd645341f00d671247d6"
+dependencies = [
+ "bytes 1.0.1",
+ "futures-sink",
+ "futures-util",
+ "memchr",
+ "pin-project-lite 0.2.0",
+]
+
 [[package]]
 name = "atomic"
 version = "0.5.0"
@@ -423,7 +423,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "which",
+ "which 3.1.1",
 ]
 
 [[package]]
@@ -602,6 +602,12 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
 
+[[package]]
+name = "bytes"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"
+
 [[package]]
 name = "cache-padded"
 version = "1.1.1"
@@ -947,7 +953,7 @@ dependencies = [
  "clap",
  "criterion-plot",
  "csv",
- "itertools 0.9.0",
+ "itertools",
  "lazy_static",
  "num-traits",
  "oorandom",
@@ -969,7 +975,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d"
 dependencies = [
  "cast",
- "itertools 0.9.0",
+ "itertools",
 ]
 
 [[package]]
@@ -1888,6 +1894,17 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "futures-rustls"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a1387e07917c711fb4ee4f48ea0adb04a3c9739e53ef85bf43ae1edc2937a8b"
+dependencies = [
+ "futures-io",
+ "rustls 0.19.0",
+ "webpki",
+]
+
 [[package]]
 name = "futures-sink"
 version = "0.3.9"
@@ -1940,18 +1957,6 @@ dependencies = [
  "slab",
 ]
 
-[[package]]
-name = "futures_codec"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce54d63f8b0c75023ed920d46fd71d0cbbb830b0ee012726b5b4f506fb6dea5b"
-dependencies = [
- "bytes 0.5.6",
- "futures 0.3.9",
- "memchr",
- "pin-project 0.4.27",
-]
-
 [[package]]
 name = "gcc"
 version = "0.3.55"
@@ -2541,15 +2546,6 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135"
 
-[[package]]
-name = "itertools"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itertools"
 version = "0.9.0"
@@ -2841,12 +2837,12 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
 
 [[package]]
 name = "libp2p"
-version = "0.33.0"
+version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e17c636b5fe5ff900ccc2840b643074bfac321551d821243a781d0d46f06588"
+checksum = "d5133112ce42be9482f6a87be92a605dd6bbc9e93c297aee77d172ff06908f3a"
 dependencies = [
  "atomic",
- "bytes 0.5.6",
+ "bytes 1.0.1",
  "futures 0.3.9",
  "lazy_static",
  "libp2p-core",
@@ -2879,9 +2875,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-core"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cb706da14c064dce54d8864ade6836b3486b51689300da74eeb7053aa4551e"
+checksum = "dad04d3cef6c1df366a6ab58c9cf8b06497699e335d83ac2174783946ff847d6"
 dependencies = [
  "asn1_der",
  "bs58",
@@ -2906,7 +2902,7 @@ dependencies = [
  "sha2 0.9.2",
  "smallvec 1.5.0",
  "thiserror",
- "unsigned-varint",
+ "unsigned-varint 0.6.0",
  "void",
  "zeroize",
 ]
@@ -2923,9 +2919,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-deflate"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3257a41f376aa23f237231971fee7e350e4d8353cfcf233aef34d6d6b638f0c"
+checksum = "935893c0e5b6ca6ef60d5225aab9182f97c8c5671df2fa9dee8f4ed72a90e6eb"
 dependencies = [
  "flate2",
  "futures 0.3.9",
@@ -2934,9 +2930,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-dns"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e09bab25af01326b4ed9486d31325911437448edda30bc57681502542d49f20"
+checksum = "5153b6db68fd4baa3b304e377db744dd8fea8ff4e4504509ee636abcde88d3e3"
 dependencies = [
  "futures 0.3.9",
  "libp2p-core",
@@ -2945,9 +2941,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-floodsub"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fd8cdd5ef1dd0b7346975477216d752de976b92e43051bc8bd808c372ea6cec"
+checksum = "b3c63dfa06581b24b1d12bf9815b43689a784424be217d6545c800c7c75a207f"
 dependencies = [
  "cuckoofilter",
  "fnv",
@@ -2963,35 +2959,35 @@ dependencies = [
 
 [[package]]
 name = "libp2p-gossipsub"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d489531aa9d4ba8726a08b3b74e21c2e10a518ad266ebca98d79040123ab0036"
+checksum = "12451ba9493e87c91baf2a6dffce9ddf1fbc807a0861532d7cf477954f8ebbee"
 dependencies = [
+ "asynchronous-codec",
  "base64 0.13.0",
  "byteorder",
- "bytes 0.5.6",
+ "bytes 1.0.1",
  "fnv",
  "futures 0.3.9",
- "futures_codec",
  "hex_fmt",
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "lru_time_cache",
  "prost",
  "prost-build",
  "rand 0.7.3",
+ "regex",
  "sha2 0.9.2",
  "smallvec 1.5.0",
- "unsigned-varint",
+ "unsigned-varint 0.6.0",
  "wasm-timer",
 ]
 
 [[package]]
 name = "libp2p-identify"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c43bc51a9bc3780288c526615ba0f5f8216820ea6dcc02b89e8daee526c5fccb"
+checksum = "b40fb36a059b7a8cce1514bd8b546fa612e006c9937caa7f5950cb20021fe91e"
 dependencies = [
  "futures 0.3.9",
  "libp2p-core",
@@ -3005,16 +3001,16 @@ dependencies = [
 
 [[package]]
 name = "libp2p-kad"
-version = "0.27.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a226956b49438a10f3206480b8faf5e61fc445c349ea9d9cc37766a83745fa9a"
+checksum = "456f5de8e283d7800ca848b9b9a4e2a578b790bd8ae582b885e831353cf0e5df"
 dependencies = [
  "arrayvec 0.5.2",
- "bytes 0.5.6",
+ "asynchronous-codec",
+ "bytes 1.0.1",
  "either",
  "fnv",
  "futures 0.3.9",
- "futures_codec",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3023,17 +3019,17 @@ dependencies = [
  "rand 0.7.3",
  "sha2 0.9.2",
  "smallvec 1.5.0",
- "uint 0.8.5",
- "unsigned-varint",
+ "uint",
+ "unsigned-varint 0.6.0",
  "void",
  "wasm-timer",
 ]
 
 [[package]]
 name = "libp2p-mdns"
-version = "0.27.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9e12688e8f14008c950c1efde587cb44dbf316fa805f419cd4e524991236f5"
+checksum = "b974db63233fc0e199f4ede7794294aae285c96f4b6010f853eac4099ef08590"
 dependencies = [
  "async-io",
  "data-encoding",
@@ -3052,29 +3048,29 @@ dependencies = [
 
 [[package]]
 name = "libp2p-mplex"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce3200fbe6608e623bd9efa459cc8bafa0e4efbb0a2dfcdd0e1387ff4181264b"
+checksum = "2705dc94b01ab9e3779b42a09bbf3712e637ed213e875c30face247291a85af0"
 dependencies = [
- "bytes 0.5.6",
+ "asynchronous-codec",
+ "bytes 1.0.1",
  "futures 0.3.9",
- "futures_codec",
  "libp2p-core",
  "log",
  "nohash-hasher",
  "parking_lot 0.11.1",
  "rand 0.7.3",
  "smallvec 1.5.0",
- "unsigned-varint",
+ "unsigned-varint 0.6.0",
 ]
 
 [[package]]
 name = "libp2p-noise"
-version = "0.28.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0580e0d18019d254c9c349c03ff7b22e564b6f2ada70c045fc39738e144f2139"
+checksum = "4aca322b52a0c5136142a7c3971446fb1e9964923a526c9cc6ef3b7c94e57778"
 dependencies = [
- "bytes 0.5.6",
+ "bytes 1.0.1",
  "curve25519-dalek 3.0.0",
  "futures 0.3.9",
  "lazy_static",
@@ -3092,9 +3088,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-ping"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50b2ec86a18cbf09d7df440e7786a2409640c774e476e9a3b4d031382c3d7588"
+checksum = "6f3813276d0708c8db0f500d8beda1bda9ad955723b9cb272c41f4727256f73c"
 dependencies = [
  "futures 0.3.9",
  "libp2p-core",
@@ -3107,18 +3103,18 @@ dependencies = [
 
 [[package]]
 name = "libp2p-plaintext"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a7b1bdcbe46a3a2159c231601ed29645282653c0a96ce3a2ad8352c9fbe6800"
+checksum = "48e8c1ec305c9949351925cdc7196b9570f4330477f5e47fbf5bb340b57e26ed"
 dependencies = [
- "bytes 0.5.6",
+ "asynchronous-codec",
+ "bytes 1.0.1",
  "futures 0.3.9",
- "futures_codec",
  "libp2p-core",
  "log",
  "prost",
  "prost-build",
- "unsigned-varint",
+ "unsigned-varint 0.6.0",
  "void",
 ]
 
@@ -3138,12 +3134,12 @@ dependencies = [
 
 [[package]]
 name = "libp2p-request-response"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "620e2950decbf77554b5aed3824f7d0e2c04923f28c70f9bff1a402c47ef6b1e"
+checksum = "d37637a4b33b5390322ccc068a33897d0aa541daf4fec99f6a7efbf37295346e"
 dependencies = [
  "async-trait",
- "bytes 0.5.6",
+ "bytes 1.0.1",
  "futures 0.3.9",
  "libp2p-core",
  "libp2p-swarm",
@@ -3152,15 +3148,15 @@ dependencies = [
  "minicbor",
  "rand 0.7.3",
  "smallvec 1.5.0",
- "unsigned-varint",
+ "unsigned-varint 0.6.0",
  "wasm-timer",
 ]
 
 [[package]]
 name = "libp2p-swarm"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdf5894ee1ee63a38aa58d58a16e3dcf7ede6b59ea7b22302c00c1a41d7aec41"
+checksum = "22ea8c69839a0e593c8c6a24282cb234d48ac37be4153183f4914e00f5303e75"
 dependencies = [
  "either",
  "futures 0.3.9",
@@ -3174,15 +3170,16 @@ dependencies = [
 
 [[package]]
 name = "libp2p-tcp"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2113a7dab2b502c55fe290910cd7399a2aa04fe70a2f5a415a87a1db600c0e"
+checksum = "3dbd3d7076a478ac5a6aca55e74bdc250ac539b95de09b9d09915e0b8d01a6b2"
 dependencies = [
- "async-std",
+ "async-io",
  "futures 0.3.9",
  "futures-timer 3.0.2",
- "if-addrs",
+ "if-watch",
  "ipnet",
+ "libc",
  "libp2p-core",
  "log",
  "socket2",
@@ -3190,9 +3187,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-uds"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af05fe92c2a3aa320bc82a308ddb7b33bef3b060154c5a4b9fb0b01f15385fc0"
+checksum = "80ac51ce419f60be966e02103c17f67ff5dc4422ba83ba54d251d6c62a4ed487"
 dependencies = [
  "async-std",
  "futures 0.3.9",
@@ -3202,9 +3199,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-wasm-ext"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37cd44ea05a4523f40183f60ab6e6a80e400a5ddfc98b0df1c55edeb85576cd9"
+checksum = "6149c46cb76935c80bc8be6ec6e3ebd5f5e1679765a255fb34331d54610f15dd"
 dependencies = [
  "futures 0.3.9",
  "js-sys",
@@ -3216,29 +3213,27 @@ dependencies = [
 
 [[package]]
 name = "libp2p-websocket"
-version = "0.27.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "270c80528e21089ea25b41dd1ab8fd834bdf093ebee422fed3b68699a857a083"
+checksum = "d3b1c6a3431045da8b925ed83384e4c5163e14b990572307fca9c507435d4d22"
 dependencies = [
- "async-tls",
  "either",
  "futures 0.3.9",
+ "futures-rustls",
  "libp2p-core",
  "log",
  "quicksink",
- "rustls 0.19.0",
  "rw-stream-sink",
  "soketto",
  "url 2.2.0",
- "webpki",
  "webpki-roots",
 ]
 
 [[package]]
 name = "libp2p-yamux"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36799de9092c35782f080032eddbc8de870f94a0def87cf9f8883efccd5cacf0"
+checksum = "490b8b27fc40fe35212df1b6a3d14bffaa4117cbff956fdc2892168a371102ad"
 dependencies = [
  "futures 0.3.9",
  "libp2p-core",
@@ -3378,12 +3373,6 @@ dependencies = [
  "hashbrown",
 ]
 
-[[package]]
-name = "lru_time_cache"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebac060fafad3adedd0c66a80741a92ff4bc8e94a273df2ba3770ab206f2e29a"
-
 [[package]]
 name = "mach"
 version = "0.3.2"
@@ -3605,7 +3594,7 @@ dependencies = [
  "generic-array 0.14.4",
  "multihash-derive",
  "sha2 0.9.2",
- "unsigned-varint",
+ "unsigned-varint 0.5.1",
 ]
 
 [[package]]
@@ -3630,16 +3619,16 @@ checksum = "1255076139a83bb467426e7f8d0134968a8118844faa755985e077cf31850333"
 
 [[package]]
 name = "multistream-select"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dda822043bba2d6da31c4e14041f9794f8fb130a5959289038d0b809d8888614"
+checksum = "10ddc0eb0117736f19d556355464fc87efc8ad98b29e3fd84f02531eb6e90840"
 dependencies = [
- "bytes 0.5.6",
+ "bytes 1.0.1",
  "futures 0.3.9",
  "log",
  "pin-project 1.0.2",
  "smallvec 1.5.0",
- "unsigned-varint",
+ "unsigned-varint 0.6.0",
 ]
 
 [[package]]
@@ -5225,9 +5214,9 @@ dependencies = [
 
 [[package]]
 name = "parity-multiaddr"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180cd097078b337d2ba6400c6a67b181b38b611273cb1d8d12f3d8d5d8eaaacb"
+checksum = "8bfda2e46fc5e14122649e2645645a81ee5844e0fb2e727ef560cc71a8b2d801"
 dependencies = [
  "arrayref",
  "bs58",
@@ -5237,7 +5226,7 @@ dependencies = [
  "percent-encoding 2.1.0",
  "serde",
  "static_assertions",
- "unsigned-varint",
+ "unsigned-varint 0.6.0",
  "url 2.2.0",
 ]
 
@@ -5721,7 +5710,7 @@ dependencies = [
  "fixed-hash",
  "impl-codec",
  "impl-serde",
- "uint 0.9.0",
+ "uint",
 ]
 
 [[package]]
@@ -5794,40 +5783,40 @@ dependencies = [
 
 [[package]]
 name = "prost"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce49aefe0a6144a45de32927c77bd2859a5f7677b55f220ae5b744e87389c212"
+checksum = "9e6984d2f1a23009bd270b8bb56d0926810a3d483f59c987d77969e9d8e840b2"
 dependencies = [
- "bytes 0.5.6",
+ "bytes 1.0.1",
  "prost-derive",
 ]
 
 [[package]]
 name = "prost-build"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b10678c913ecbd69350e8535c3aef91a8676c0773fc1d7b95cdd196d7f2f26"
+checksum = "32d3ebd75ac2679c2af3a92246639f9fcc8a442ee420719cc4fe195b98dd5fa3"
 dependencies = [
- "bytes 0.5.6",
+ "bytes 1.0.1",
  "heck",
- "itertools 0.8.2",
+ "itertools",
  "log",
  "multimap",
  "petgraph",
  "prost",
  "prost-types",
  "tempfile",
- "which",
+ "which 4.0.2",
 ]
 
 [[package]]
 name = "prost-derive"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "537aa19b95acde10a12fec4301466386f757403de4cd4e5b4fa78fb5ecb18f72"
+checksum = "169a15f3008ecb5160cba7d37bcd690a7601b6d30cfb87a117d45e59d52af5d4"
 dependencies = [
  "anyhow",
- "itertools 0.8.2",
+ "itertools",
  "proc-macro2",
  "quote",
  "syn",
@@ -5835,11 +5824,11 @@ dependencies = [
 
 [[package]]
 name = "prost-types"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1834f67c0697c001304b75be76f67add9c89742eda3a085ad8ee0bb38c3417aa"
+checksum = "b518d7cdd93dab1d1122cf07fa9a60771836c668dde9d9e2a139f957f0d9f1bb"
 dependencies = [
- "bytes 0.5.6",
+ "bytes 1.0.1",
  "prost",
 ]
 
@@ -7147,9 +7136,10 @@ dependencies = [
  "assert_matches",
  "async-std",
  "async-trait",
+ "asynchronous-codec",
  "bitflags",
  "bs58",
- "bytes 0.5.6",
+ "bytes 1.0.1",
  "derive_more",
  "either",
  "erased-serde",
@@ -7157,7 +7147,6 @@ dependencies = [
  "fork-tree",
  "futures 0.3.9",
  "futures-timer 3.0.2",
- "futures_codec",
  "hex",
  "ip_network",
  "libp2p",
@@ -7194,7 +7183,7 @@ dependencies = [
  "substrate-test-runtime-client",
  "tempfile",
  "thiserror",
- "unsigned-varint",
+ "unsigned-varint 0.6.0",
  "void",
  "wasm-timer",
  "zeroize",
@@ -9826,18 +9815,6 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
 
-[[package]]
-name = "uint"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9db035e67dfaf7edd9aebfe8676afcd63eed53c8a4044fed514c8cccf1835177"
-dependencies = [
- "byteorder",
- "crunchy",
- "rustc-hex",
- "static_assertions",
-]
-
 [[package]]
 name = "uint"
 version = "0.9.0"
@@ -9910,11 +9887,17 @@ name = "unsigned-varint"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7fdeedbf205afadfe39ae559b75c3240f24e257d0ca27e85f85cb82aa19ac35"
+
+[[package]]
+name = "unsigned-varint"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35581ff83d4101e58b582e607120c7f5ffb17e632a980b1f38334d76b36908b2"
 dependencies = [
- "bytes 0.5.6",
+ "asynchronous-codec",
+ "bytes 1.0.1",
  "futures-io",
  "futures-util",
- "futures_codec",
 ]
 
 [[package]]
@@ -10409,6 +10392,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "which"
+version = "4.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87c14ef7e1b8b8ecfc75d5eca37949410046e66f15d185c01d70824f1f8111ef"
+dependencies = [
+ "libc",
+ "thiserror",
+]
+
 [[package]]
 name = "winapi"
 version = "0.2.8"
@@ -10535,6 +10528,6 @@ checksum = "b89249644df056b522696b1bb9e7c18c87e8ffa3e2f0dc3b0155875d6498f01b"
 dependencies = [
  "cc",
  "glob",
- "itertools 0.9.0",
+ "itertools",
  "libc",
 ]
diff --git a/bin/node/browser-testing/Cargo.toml b/bin/node/browser-testing/Cargo.toml
index db64da19a15c..e098ea3e6463 100644
--- a/bin/node/browser-testing/Cargo.toml
+++ b/bin/node/browser-testing/Cargo.toml
@@ -8,7 +8,7 @@ license = "Apache-2.0"
 
 [dependencies]
 futures-timer = "3.0.2"
-libp2p = { version = "0.33.0", default-features = false }
+libp2p = { version = "0.34.0", default-features = false }
 jsonrpc-core = "15.0.0"
 serde = "1.0.106"
 serde_json = "1.0.48"
diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml
index e42e822eba62..d2ba2cf4152f 100644
--- a/client/authority-discovery/Cargo.toml
+++ b/client/authority-discovery/Cargo.toml
@@ -14,7 +14,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [build-dependencies]
-prost-build = "0.6.1"
+prost-build = "0.7"
 
 [dependencies]
 async-trait = "0.1"
@@ -23,10 +23,10 @@ derive_more = "0.99.2"
 either = "1.5.3"
 futures = "0.3.9"
 futures-timer = "3.0.1"
-libp2p = { version = "0.33.0", default-features = false, features = ["kad"] }
+libp2p = { version = "0.34.0", default-features = false, features = ["kad"] }
 log = "0.4.8"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.8.0"}
-prost = "0.6.1"
+prost = "0.7"
 rand = "0.7.2"
 sc-client-api = { version = "2.0.0", path = "../api" }
 sc-network = { version = "0.8.0", path = "../network" }
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index bff80147ac20..32299e6e5f69 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -19,7 +19,7 @@ regex = "1.4.2"
 tokio = { version = "0.2.21", features = [ "signal", "rt-core", "rt-threaded", "blocking" ] }
 futures = "0.3.9"
 fdlimit = "0.2.1"
-libp2p = "0.33.0"
+libp2p = "0.34.0"
 parity-scale-codec = "1.3.6"
 hex = "0.4.2"
 rand = "0.7.3"
diff --git a/client/network-gossip/Cargo.toml b/client/network-gossip/Cargo.toml
index 9ad591d0af69..b0120e306a52 100644
--- a/client/network-gossip/Cargo.toml
+++ b/client/network-gossip/Cargo.toml
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 futures = "0.3.9"
 futures-timer = "3.0.1"
-libp2p = { version = "0.33.0", default-features = false }
+libp2p = { version = "0.34.0", default-features = false }
 log = "0.4.8"
 lru = "0.6.1"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.8.0", path = "../../utils/prometheus" }
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index 2251746de945..9c0fab84a87d 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -14,14 +14,14 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [build-dependencies]
-prost-build = "0.6.1"
+prost-build = "0.7"
 
 [dependencies]
 async-trait = "0.1"
 async-std = "1.6.5"
 bitflags = "1.2.0"
 bs58 = "0.4.0"
-bytes = "0.5.0"
+bytes = "1"
 codec = { package = "parity-scale-codec", version = "1.3.6", features = ["derive"] }
 derive_more = "0.99.2"
 either = "1.5.3"
@@ -30,7 +30,7 @@ fnv = "1.0.6"
 fork-tree = { version = "2.0.0", path = "../../utils/fork-tree" }
 futures = "0.3.9"
 futures-timer = "3.0.2"
-futures_codec = "0.4.0"
+asynchronous-codec = "0.5"
 hex = "0.4.0"
 ip_network = "0.3.4"
 linked-hash-map = "0.5.2"
@@ -40,7 +40,7 @@ nohash-hasher = "0.2.0"
 parking_lot = "0.11.1"
 pin-project = "0.4.6"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.8.0", path = "../../utils/prometheus" }
-prost = "0.6.1"
+prost = "0.7"
 rand = "0.7.2"
 sc-block-builder = { version = "0.8.0", path = "../block-builder" }
 sc-client-api = { version = "2.0.0", path = "../api" }
@@ -57,19 +57,19 @@ sp-core = { version = "2.0.0", path = "../../primitives/core" }
 sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
 sp-utils = { version = "2.0.0", path = "../../primitives/utils" }
 thiserror = "1"
-unsigned-varint = { version = "0.5.0", features = ["futures", "futures-codec"] }
+unsigned-varint = { version = "0.6.0", features = ["futures", "asynchronous_codec"] }
 void = "1.0.2"
 wasm-timer = "0.2"
 zeroize = "1.2.0"
 
 [dependencies.libp2p]
-version = "0.33.0"
+version = "0.34.0"
 default-features = false
-features = ["identify", "kad", "mdns", "mplex", "noise", "ping", "request-response", "tcp-async-std", "websocket", "yamux"]
+features = ["identify", "kad", "mdns", "mplex", "noise", "ping", "request-response", "tcp-async-io", "websocket", "yamux"]
 
 [dev-dependencies]
 assert_matches = "1.3"
-libp2p = { version = "0.33.0", default-features = false }
+libp2p = { version = "0.34.0", default-features = false }
 quickcheck = "0.9.0"
 rand = "0.7.2"
 sp-keyring = { version = "2.0.0", path = "../../primitives/keyring" }
diff --git a/client/network/src/protocol/generic_proto/upgrade/legacy.rs b/client/network/src/protocol/generic_proto/upgrade/legacy.rs
index 307bfd7ad639..6a5ceb5571f9 100644
--- a/client/network/src/protocol/generic_proto/upgrade/legacy.rs
+++ b/client/network/src/protocol/generic_proto/upgrade/legacy.rs
@@ -19,7 +19,7 @@
 use crate::config::ProtocolId;
 use bytes::BytesMut;
 use futures::prelude::*;
-use futures_codec::Framed;
+use asynchronous_codec::Framed;
 use libp2p::core::{UpgradeInfo, InboundUpgrade, OutboundUpgrade, upgrade::ProtocolName};
 use parking_lot::RwLock;
 use std::{collections::VecDeque, io, pin::Pin, sync::Arc, vec::IntoIter as VecIntoIter};
diff --git a/client/network/src/protocol/generic_proto/upgrade/notifications.rs b/client/network/src/protocol/generic_proto/upgrade/notifications.rs
index 13f2e26907c4..29561bafd7a6 100644
--- a/client/network/src/protocol/generic_proto/upgrade/notifications.rs
+++ b/client/network/src/protocol/generic_proto/upgrade/notifications.rs
@@ -38,7 +38,7 @@
 
 use bytes::BytesMut;
 use futures::prelude::*;
-use futures_codec::Framed;
+use asynchronous_codec::Framed;
 use libp2p::core::{UpgradeInfo, InboundUpgrade, OutboundUpgrade, upgrade};
 use log::error;
 use std::{borrow::Cow, convert::Infallible, io, iter, mem, pin::Pin, task::{Context, Poll}};
diff --git a/client/network/test/Cargo.toml b/client/network/test/Cargo.toml
index 537e3378dbda..20265f7680a9 100644
--- a/client/network/test/Cargo.toml
+++ b/client/network/test/Cargo.toml
@@ -20,7 +20,7 @@ parking_lot = "0.11.1"
 futures = "0.3.9"
 futures-timer = "3.0.1"
 rand = "0.7.2"
-libp2p = { version = "0.33.0", default-features = false }
+libp2p = { version = "0.34.0", default-features = false }
 sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
 sc-consensus = { version = "0.8.0", path = "../../consensus/common" }
 sc-client-api = { version = "2.0.0", path = "../../api" }
diff --git a/client/peerset/Cargo.toml b/client/peerset/Cargo.toml
index b2cedbc7733e..1ebb6bde52a6 100644
--- a/client/peerset/Cargo.toml
+++ b/client/peerset/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 futures = "0.3.9"
-libp2p = { version = "0.33.0", default-features = false }
+libp2p = { version = "0.34.0", default-features = false }
 sp-utils = { version = "2.0.0", path = "../../primitives/utils"}
 log = "0.4.8"
 serde_json = "1.0.41"
diff --git a/client/telemetry/Cargo.toml b/client/telemetry/Cargo.toml
index 3d253c511415..8c517574fffb 100644
--- a/client/telemetry/Cargo.toml
+++ b/client/telemetry/Cargo.toml
@@ -19,7 +19,7 @@ parking_lot = "0.11.1"
 futures = "0.3.9"
 futures-timer = "3.0.1"
 wasm-timer = "0.2.5"
-libp2p = { version = "0.33.0", default-features = false, features = ["dns", "tcp-async-std", "wasm-ext", "websocket"] }
+libp2p = { version = "0.34.0", default-features = false, features = ["dns", "tcp-async-io", "wasm-ext", "websocket"] }
 log = "0.4.8"
 pin-project = "0.4.6"
 rand = "0.7.2"
diff --git a/primitives/consensus/common/Cargo.toml b/primitives/consensus/common/Cargo.toml
index 78dc3a85087c..a9d2d92998a6 100644
--- a/primitives/consensus/common/Cargo.toml
+++ b/primitives/consensus/common/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 thiserror = "1.0.21"
-libp2p = { version = "0.33.0", default-features = false }
+libp2p = { version = "0.34.0", default-features = false }
 log = "0.4.8"
 sp-core = { path= "../../core", version = "2.0.0"}
 sp-inherents = { version = "2.0.0", path = "../../inherents" }
diff --git a/utils/browser/Cargo.toml b/utils/browser/Cargo.toml
index c8b2ac957433..7380a308180f 100644
--- a/utils/browser/Cargo.toml
+++ b/utils/browser/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 futures = { version = "0.3", features = ["compat"] }
 futures01 = { package = "futures", version = "0.1.29" }
 log = "0.4.8"
-libp2p-wasm-ext = { version = "0.26", features = ["websocket"] }
+libp2p-wasm-ext = { version = "0.27", features = ["websocket"] }
 console_error_panic_hook = "0.1.6"
 console_log = "0.2.0"
 js-sys = "0.3.34"

From 53fbef5ed46f99b0daf507c183c711893b2a3ee0 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Fri, 15 Jan 2021 11:55:21 +0100
Subject: [PATCH 0275/1194] Fix bad debug_assert (#7904)

---
 client/network/src/protocol/generic_proto/behaviour.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/network/src/protocol/generic_proto/behaviour.rs b/client/network/src/protocol/generic_proto/behaviour.rs
index 88c2791ce45d..4ae8b8b98a61 100644
--- a/client/network/src/protocol/generic_proto/behaviour.rs
+++ b/client/network/src/protocol/generic_proto/behaviour.rs
@@ -914,11 +914,11 @@ impl GenericProto {
 				error!(target: "sub-libp2p", "PSM => Drop({}, {:?}): Not enabled (Incoming).",
 					entry.key().0, set_id);
 				*entry.into_mut() = st;
-				debug_assert!(!false);
+				debug_assert!(false);
 			},
 			PeerState::Poisoned => {
 				error!(target: "sub-libp2p", "State of {:?} is poisoned", entry.key());
-				debug_assert!(!false);
+				debug_assert!(false);
 			},
 		}
 	}

From bfd6826fe2330ccf9ce4020e49dbb3d8a160c50d Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Fri, 15 Jan 2021 12:03:08 +0100
Subject: [PATCH 0276/1194] fix template (#7905)

---
 frame/support/procedural/src/storage/print_pallet_upgrade.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frame/support/procedural/src/storage/print_pallet_upgrade.rs b/frame/support/procedural/src/storage/print_pallet_upgrade.rs
index 100bb9b35913..e0eac516442a 100644
--- a/frame/support/procedural/src/storage/print_pallet_upgrade.rs
+++ b/frame/support/procedural/src/storage/print_pallet_upgrade.rs
@@ -323,7 +323,7 @@ pub mod pallet {{
 	#[pallet::generate_store({store_vis} trait Store)]
 	pub struct Pallet{decl_gen}(PhantomData{use_gen_tuple});
 
-	#[pallet::interface]
+	#[pallet::hooks]
 	impl{impl_gen} Hooks<BlockNumberFor<T>> for Pallet{use_gen}
 		// TODO_MAYBE_WHERE_CLAUSE
 	{{

From ab10fb523013f069e55e76a292eb49b4bd6232c1 Mon Sep 17 00:00:00 2001
From: ropottnik <simonertl.1386@gmail.com>
Date: Fri, 15 Jan 2021 13:38:21 +0100
Subject: [PATCH 0277/1194] improve benchmarking error output (#7863)

* add concat Vec<u8> function and use it for better error logging in add_benchmark! macro

* refactor benchmark error reporting to use format! and RuntimeString
---
 frame/benchmarking/src/lib.rs               | 59 ++++++++++++++++++++-
 frame/benchmarking/src/utils.rs             |  3 +-
 primitives/runtime/src/runtime_string.rs    | 16 ++++++
 utils/frame/benchmarking-cli/src/command.rs |  2 +-
 4 files changed, 75 insertions(+), 5 deletions(-)

diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
index 6db8674a3d2d..0657aea5d6ab 100644
--- a/frame/benchmarking/src/lib.rs
+++ b/frame/benchmarking/src/lib.rs
@@ -955,6 +955,39 @@ macro_rules! impl_benchmark_test {
 	};
 }
 
+/// show error message and debugging info for the case of an error happening
+/// during a benchmark
+pub fn show_benchmark_debug_info(
+	instance_string: &[u8],
+	benchmark: &[u8],
+	lowest_range_values: &sp_std::prelude::Vec<u32>,
+	highest_range_values: &sp_std::prelude::Vec<u32>,
+	steps: &sp_std::prelude::Vec<u32>,
+	repeat: &u32,
+	verify: &bool,
+	error_message: &str,
+) -> sp_runtime::RuntimeString {
+	sp_runtime::format_runtime_string!(
+		"\n* Pallet: {}\n\
+		* Benchmark: {}\n\
+		* Lowest_range_values: {:?}\n\
+		* Highest_range_values: {:?}\n\
+		* Steps: {:?}\n\
+		* Repeat: {:?}\n\
+		* Verify: {:?}\n\
+		* Error message: {}",
+		sp_std::str::from_utf8(instance_string)
+		.expect("it's all just strings ran through the wasm interface. qed"),
+		sp_std::str::from_utf8(benchmark)
+		.expect("it's all just strings ran through the wasm interface. qed"),
+		lowest_range_values,
+		highest_range_values,
+		steps,
+		repeat,
+		verify,
+		error_message,
+	)
+}
 
 /// This macro adds pallet benchmarks to a `Vec<BenchmarkBatch>` object.
 ///
@@ -1050,7 +1083,18 @@ macro_rules! add_benchmark {
 							*repeat,
 							whitelist,
 							*verify,
-						)?,
+						).map_err(|e| { 
+							$crate::show_benchmark_debug_info(
+								instance_string,
+								benchmark,
+								lowest_range_values,
+								highest_range_values,
+								steps,
+								repeat,
+								verify,
+								e,
+							)
+						})?,
 					});
 				}
 			} else {
@@ -1066,7 +1110,18 @@ macro_rules! add_benchmark {
 						*repeat,
 						whitelist,
 						*verify,
-					)?,
+					).map_err(|e| { 
+						$crate::show_benchmark_debug_info(
+							instance_string,
+							benchmark,
+							lowest_range_values,
+							highest_range_values,
+							steps,
+							repeat,
+							verify,
+							e,
+						)
+					})?,
 				});
 			}
 		}
diff --git a/frame/benchmarking/src/utils.rs b/frame/benchmarking/src/utils.rs
index 945141345cef..1574e47454b5 100644
--- a/frame/benchmarking/src/utils.rs
+++ b/frame/benchmarking/src/utils.rs
@@ -20,7 +20,6 @@
 use codec::{Encode, Decode};
 use sp_std::{vec::Vec, prelude::Box};
 use sp_io::hashing::blake2_256;
-use sp_runtime::RuntimeString;
 use sp_storage::TrackedStorageKey;
 
 /// An alphabet of possible parameters to use for benchmarking.
@@ -90,7 +89,7 @@ sp_api::decl_runtime_apis! {
 	/// Runtime api for benchmarking a FRAME runtime.
 	pub trait Benchmark {
 		/// Dispatch the given benchmark.
-		fn dispatch_benchmark(config: BenchmarkConfig) -> Result<Vec<BenchmarkBatch>, RuntimeString>;
+		fn dispatch_benchmark(config: BenchmarkConfig) -> Result<Vec<BenchmarkBatch>, sp_runtime::RuntimeString>;
 	}
 }
 
diff --git a/primitives/runtime/src/runtime_string.rs b/primitives/runtime/src/runtime_string.rs
index df57def219e5..e315de430c12 100644
--- a/primitives/runtime/src/runtime_string.rs
+++ b/primitives/runtime/src/runtime_string.rs
@@ -32,6 +32,22 @@ pub enum RuntimeString {
 	Owned(Vec<u8>),
 }
 
+/// Convenience macro to use the format! interface to get a `RuntimeString::Owned`
+#[macro_export]
+macro_rules! format_runtime_string {
+	($($args:tt)*) => {{
+		#[cfg(feature = "std")]
+		{
+			sp_runtime::RuntimeString::Owned(format!($($args)*))
+		}
+		#[cfg(not(feature = "std"))]
+		{
+			sp_runtime::RuntimeString::Owned(sp_std::alloc::format!($($args)*).as_bytes().to_vec())
+		}
+	}};
+}
+
+
 impl From<&'static str> for RuntimeString {
 	fn from(data: &'static str) -> Self {
 		Self::Borrowed(data)
diff --git a/utils/frame/benchmarking-cli/src/command.rs b/utils/frame/benchmarking-cli/src/command.rs
index 8a6a39f045c6..57b9a592f07d 100644
--- a/utils/frame/benchmarking-cli/src/command.rs
+++ b/utils/frame/benchmarking-cli/src/command.rs
@@ -174,7 +174,7 @@ impl BenchmarkCmd {
 					}
 				}
 			},
-			Err(error) => eprintln!("Error: {:?}", error),
+			Err(error) => eprintln!("Error: {}", error),
 		}
 
 		Ok(())

From caeb3b91152f2412b9a8910bd1be7245ad71fd9f Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Fri, 15 Jan 2021 13:47:32 +0100
Subject: [PATCH 0278/1194] Fix not restoring non-poisoned state (#7906)

---
 client/network/src/protocol/generic_proto/behaviour.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/network/src/protocol/generic_proto/behaviour.rs b/client/network/src/protocol/generic_proto/behaviour.rs
index 4ae8b8b98a61..0547f96a311d 100644
--- a/client/network/src/protocol/generic_proto/behaviour.rs
+++ b/client/network/src/protocol/generic_proto/behaviour.rs
@@ -1674,9 +1674,10 @@ impl NetworkBehaviour for GenericProto {
 									notifications_sink: replacement_sink,
 								};
 								self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
-								*entry.into_mut() = PeerState::Enabled { connections };
 							}
 
+							*entry.into_mut() = PeerState::Enabled { connections };
+
 						} else {
 							// List of open connections wasn't empty before but now it is.
 							if !connections.iter().any(|(_, s)| matches!(s, ConnectionState::Opening)) {

From 23ece2f6e162e1539c7ce1c147ca3dcb66def624 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Fri, 15 Jan 2021 10:44:26 -0400
Subject: [PATCH 0279/1194] Add Test for Variable Components in Benchmarking
 (#7902)

* Adds a test for variable components

* Clean up traces of common parameters which are removed now
---
 frame/benchmarking/src/lib.rs   | 54 +--------------------------------
 frame/benchmarking/src/tests.rs | 17 ++++++++++-
 2 files changed, 17 insertions(+), 54 deletions(-)

diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
index 0657aea5d6ab..d2cba9cc7097 100644
--- a/frame/benchmarking/src/lib.rs
+++ b/frame/benchmarking/src/lib.rs
@@ -68,10 +68,6 @@ pub use sp_storage::TrackedStorageKey;
 /// for arbitrary expresions to be evaluated in a benchmark (including for example,
 /// `on_initialize`).
 ///
-/// The macro allows for common parameters whose ranges and instancing expressions may be drawn upon
-/// (or not) by each arm. Syntax is available to allow for only the range to be drawn upon if
-/// desired, allowing an alternative instancing expression to be given.
-///
 /// Note that the ranges are *inclusive* on both sides. This is in contrast to ranges in Rust which
 /// are left-inclusive right-exclusive.
 ///
@@ -80,9 +76,6 @@ pub use sp_storage::TrackedStorageKey;
 /// at any time. Local variables are shared between the two pre- and post- code blocks, but do not
 /// leak from the interior of any instancing expressions.
 ///
-/// Any common parameters that are unused in an arm do not have their instancing expressions
-/// evaluated.
-///
 /// Example:
 /// ```ignore
 /// benchmarks! {
@@ -105,8 +98,7 @@ pub use sp_storage::TrackedStorageKey;
 ///   // third dispatchable: baz; this is a user dispatchable. It isn't dependent on length like the
 ///   // other two but has its own complexity `c` that needs setting up. It uses `caller` (in the
 ///   // pre-instancing block) within the code block. This is only allowed in the param instancers
-///   // of arms. Instancers of common params cannot optimistically draw upon hypothetical variables
-///   // that the arm's pre-instancing code block might have declared.
+///   // of arms.
 ///   baz1 {
 ///     let caller = account::<T>(b"caller", 0, benchmarks_seed);
 ///     let c = 0 .. 10 => setup_c(&caller, c);
@@ -450,50 +442,6 @@ macro_rules! benchmark_backend {
 			$postcode
 		}
 	};
-	// mutation arm to look after defaulting to a common param
-	(
-		{ $( $instance:ident )? }
-		$name:ident
-		{ $( $where_clause:tt )* }
-		{ $( $parsed:tt )* }
-		{ $eval:block }
-		{
-			let $param:ident in ...;
-			$( $rest:tt )*
-		}
-		$postcode:block
-	) => {
-		$crate::benchmark_backend! {
-			{ $( $instance)? }
-			$name
-			{ $( $where_clause )* }
-			{ $( $parsed )* }
-			{ $eval }
-			$postcode
-		}
-	};
-	// mutation arm to look after defaulting only the range to common param
-	(
-		{ $( $instance:ident )? }
-		$name:ident
-		{ $( $where_clause:tt )* }
-		{ $( $parsed:tt )* }
-		{ $eval:block }
-		{
-			let $param:ident in _ .. _ => $param_instancer:expr ;
-			$( $rest:tt )*
-		}
-		$postcode:block
-	) => {
-		$crate::benchmark_backend! {
-			{ $( $instance)? }
-			$name
-			{ $( $where_clause )* }
-			{ $( $parsed )* }
-			{ $eval }
-			$postcode
-		}
-	};
 	// mutation arm to look after a single tt for param_from.
 	(
 		{ $( $instance:ident )? }
diff --git a/frame/benchmarking/src/tests.rs b/frame/benchmarking/src/tests.rs
index 2cbf4b9d1950..2a2daaffbadc 100644
--- a/frame/benchmarking/src/tests.rs
+++ b/frame/benchmarking/src/tests.rs
@@ -24,7 +24,8 @@ use sp_std::prelude::*;
 use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::{H256, Header}};
 use frame_support::{
 	dispatch::DispatchResult,
-	decl_module, decl_storage, impl_outer_origin, assert_ok, assert_err, ensure
+	decl_module, decl_storage, impl_outer_origin, assert_ok, assert_err, ensure,
+	parameter_types, pallet_prelude::Get,
 };
 use frame_system::{RawOrigin, ensure_signed, ensure_none};
 
@@ -67,6 +68,8 @@ pub trait Config: frame_system::Config + OtherConfig
 	where Self::OtherEvent: Into<<Self as Config>::Event>
 {
 	type Event;
+	type LowerBound: Get<u32>;
+	type UpperBound: Get<u32>;
 }
 
 #[derive(Clone, Eq, PartialEq)]
@@ -97,8 +100,15 @@ impl frame_system::Config for Test {
 	type SS58Prefix = ();
 }
 
+parameter_types!{
+	pub const LowerBound: u32 = 1;
+	pub const UpperBound: u32 = 100;
+}
+
 impl Config for Test {
 	type Event = ();
+	type LowerBound = LowerBound;
+	type UpperBound = UpperBound;
 }
 
 impl OtherConfig for Test {
@@ -155,6 +165,10 @@ benchmarks!{
 	no_components {
 		let caller = account::<T::AccountId>("caller", 0, 0);
 	}: set_value(RawOrigin::Signed(caller), 0)
+
+	variable_components {
+		let b in ( T::LowerBound::get() ) .. T::UpperBound::get();
+	}: dummy (RawOrigin::None, b.into())
 }
 
 #[test]
@@ -248,5 +262,6 @@ fn benchmarks_generate_unit_tests() {
 		assert_err!(test_benchmark_bad_origin::<Test>(), "Bad origin");
 		assert_err!(test_benchmark_bad_verify::<Test>(), "You forgot to sort!");
 		assert_ok!(test_benchmark_no_components::<Test>());
+		assert_ok!(test_benchmark_variable_components::<Test>());
 	});
 }

From 946c0e1749b359ba3889a169079a6296b0717b0f Mon Sep 17 00:00:00 2001
From: honeywest <50997103+honeywest@users.noreply.github.com>
Date: Fri, 15 Jan 2021 22:47:50 +0800
Subject: [PATCH 0280/1194] fix cargo fmt (#7907)

---
 bin/node-template/pallets/template/src/lib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/node-template/pallets/template/src/lib.rs b/bin/node-template/pallets/template/src/lib.rs
index 24de4f2f50dd..7fdf75bb25b1 100644
--- a/bin/node-template/pallets/template/src/lib.rs
+++ b/bin/node-template/pallets/template/src/lib.rs
@@ -34,13 +34,13 @@ decl_storage! {
 
 // Pallets use events to inform users when important changes are made.
 // https://substrate.dev/docs/en/knowledgebase/runtime/events
-decl_event!(
+decl_event! {
 	pub enum Event<T> where AccountId = <T as frame_system::Config>::AccountId {
 		/// Event documentation should end with an array that provides descriptive names for event
 		/// parameters. [something, who]
 		SomethingStored(u32, AccountId),
 	}
-);
+}
 
 // Errors inform users that something went wrong.
 decl_error! {

From cfb8157f0c4e096f5c394f82bca4826c94b41ded Mon Sep 17 00:00:00 2001
From: Aten <jincxmain@gmail.com>
Date: Sat, 16 Jan 2021 00:59:29 +0800
Subject: [PATCH 0281/1194] Add ss58 version prefix for Patract/Jupiter (from
 PatractHubs) (#7785)

---
 primitives/core/src/crypto.rs |  4 ++++
 ss58-registry.json            | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index b11cae50364e..22fb97ae5cc4 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -494,6 +494,10 @@ ss58_address_format!(
 		(24, "zero", "ZERO mainnet, standard account (*25519).")
 	AlphavilleAccount =>
 		(25, "alphaville", "ZERO testnet, standard account (*25519).")
+	JupiterAccount =>
+		(26, "jupiter", "Jupiter testnet, standard account (*25519).")
+	PatractAccount =>
+		(27, "patract", "Patract mainnet, standard account (*25519).")
 	SubsocialAccount =>
 		(28, "subsocial", "Subsocial network, standard account (*25519).")
 	DhiwayAccount =>
diff --git a/ss58-registry.json b/ss58-registry.json
index 60d678c0c598..7cb4e5d2c306 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -244,6 +244,24 @@
 			"standardAccount": "*25519",
 			"website": "https://zero.io"
 		},
+		{
+			"prefix": 26,
+			"network": "jupiter",
+			"displayName": "Jupiter",
+			"symbols": ["jDOT"],
+			"decimals": [10],
+			"standardAccount": "*25519",
+			"website": "https://jupiter.patract.io"
+		},
+		{
+			"prefix": 27,
+			"network": "patract",
+			"displayName": "Patract",
+			"symbols": ["pDOT", "pKSM"],
+			"decimals": [10, 12],
+			"standardAccount": "*25519",
+			"website": "https://patract.network"
+		},
 		{
 			"prefix": 28,
 			"network": "subsocial",

From 7a79f54a5d92cecba1d9c1e4da71df1e8a6ed91b Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Sat, 16 Jan 2021 18:47:28 +0100
Subject: [PATCH 0282/1194] Introduces account existence providers reference
 counting (#7363)

* Initial draft

* Latest changes

* Final bits.

* Fixes

* Fixes

* Test fixes

* Fix tests

* Fix babe tests

* Fix

* Fix

* Fix

* Fix

* Fix

* fix warnings in assets

* Fix UI tests

* fix line width

* Fix

* Update frame/system/src/lib.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Update frame/system/src/lib.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Fix

* fix unused warnings

* Fix

* Update frame/system/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Update frame/system/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Fix

* fix slash and comprehensive slash test

* fix reserved slash and comprehensive tests

* check slash on non-existent account

* Revert "Fix UI tests"

This reverts commit e818dc7c0556baefe39b9cf3e34ff8546e96c590.

* Fix

* Fix utility tests

* keep dispatch error backwards compatible

* Fix

* Fix

* fix ui test

* Companion checker shouldn't be so anal.

* Fix

* Fix

* Fix

* Apply suggestions from code review

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

* Update frame/balances/src/lib.rs

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

* return correct slash info when failing gracefully

* fix missing import

* Update frame/system/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Fix

* Update frame/balances/src/tests_local.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Fixes

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>
---
 .../gitlab/check_polkadot_companion_build.sh  |   4 +-
 .../gitlab/check_polkadot_companion_status.sh |   4 +-
 bin/node/executor/tests/basic.rs              |  16 +-
 bin/node/executor/tests/fees.rs               |  19 +-
 bin/node/executor/tests/submit_transaction.rs |   2 +-
 frame/assets/src/lib.rs                       |  10 +-
 frame/babe/src/mock.rs                        |  28 +-
 frame/balances/src/lib.rs                     | 198 ++++++----
 frame/balances/src/tests.rs                   | 198 +++++++++-
 frame/balances/src/tests_local.rs             |  16 +-
 frame/executive/src/lib.rs                    |   2 +-
 frame/grandpa/src/mock.rs                     |  28 +-
 frame/offences/benchmarking/src/mock.rs       |   2 +-
 frame/proxy/src/tests.rs                      |   4 +-
 frame/recovery/src/lib.rs                     |   6 +-
 frame/session/benchmarking/src/mock.rs        |   2 +-
 frame/session/src/historical/mod.rs           |  15 +-
 frame/session/src/historical/offchain.rs      |  25 +-
 frame/session/src/lib.rs                      |  12 +-
 frame/session/src/mock.rs                     |  19 +-
 frame/session/src/tests.rs                    |   4 +-
 frame/staking/fuzzer/src/mock.rs              |   2 +-
 frame/staking/src/benchmarking.rs             |   2 +-
 frame/staking/src/lib.rs                      |  15 +-
 frame/staking/src/mock.rs                     |  10 +
 frame/staking/src/tests.rs                    |   8 +-
 frame/support/src/traits.rs                   | 162 ++++----
 frame/system/benchmarking/src/lib.rs          |  21 +-
 frame/system/src/extensions/check_nonce.rs    |   3 +-
 frame/system/src/lib.rs                       | 352 +++++++++++-------
 frame/system/src/tests.rs                     |  25 +-
 frame/utility/src/tests.rs                    |   7 +-
 primitives/runtime/src/lib.rs                 |  21 +-
 primitives/runtime/src/traits.rs              |  19 +
 34 files changed, 814 insertions(+), 447 deletions(-)

diff --git a/.maintain/gitlab/check_polkadot_companion_build.sh b/.maintain/gitlab/check_polkadot_companion_build.sh
index 9e412ce26a89..90354f809d4a 100755
--- a/.maintain/gitlab/check_polkadot_companion_build.sh
+++ b/.maintain/gitlab/check_polkadot_companion_build.sh
@@ -67,8 +67,8 @@ then
   pr_body="$(sed -n -r 's/^[[:space:]]+"body": (".*")[^"]+$/\1/p' "${pr_data_file}")"
 
   pr_companion="$(echo "${pr_body}" | sed -n -r \
-      -e 's;^.*polkadot companion: paritytech/polkadot#([0-9]+).*$;\1;p' \
-      -e 's;^.*polkadot companion: https://github.com/paritytech/polkadot/pull/([0-9]+).*$;\1;p' \
+      -e 's;^.*[Cc]ompanion.*paritytech/polkadot#([0-9]+).*$;\1;p' \
+      -e 's;^.*[Cc]ompanion.*https://github.com/paritytech/polkadot/pull/([0-9]+).*$;\1;p' \
     | tail -n 1)"
 
   if [ "${pr_companion}" ]
diff --git a/.maintain/gitlab/check_polkadot_companion_status.sh b/.maintain/gitlab/check_polkadot_companion_status.sh
index 35c2983886f4..4714baf54fb2 100755
--- a/.maintain/gitlab/check_polkadot_companion_status.sh
+++ b/.maintain/gitlab/check_polkadot_companion_status.sh
@@ -43,8 +43,8 @@ pr_body="$(curl -H "${github_header}" -s ${github_api_substrate_pull_url}/${CI_C
 
 # get companion if explicitly specified
 pr_companion="$(echo "${pr_body}" | sed -n -r \
-    -e 's;^.*polkadot companion: paritytech/polkadot#([0-9]+).*$;\1;p' \
-    -e 's;^.*polkadot companion: https://github.com/paritytech/polkadot/pull/([0-9]+).*$;\1;p' \
+    -e 's;^.*[Cc]ompanion.*paritytech/polkadot#([0-9]+).*$;\1;p' \
+    -e 's;^.*[Cc]ompanion.*https://github.com/paritytech/polkadot/pull/([0-9]+).*$;\1;p' \
   | tail -n 1)"
 
 if [ -z "${pr_companion}" ]
diff --git a/bin/node/executor/tests/basic.rs b/bin/node/executor/tests/basic.rs
index 2b644fad2915..26c04efe4999 100644
--- a/bin/node/executor/tests/basic.rs
+++ b/bin/node/executor/tests/basic.rs
@@ -192,7 +192,7 @@ fn bad_extrinsic_with_native_equivalent_code_gives_error() {
 	let mut t = new_test_ext(compact_code_unwrap(), false);
 	t.insert(
 		<frame_system::Account<Runtime>>::hashed_key_for(alice()),
-		(0u32, 0u32, 69u128, 0u128, 0u128, 0u128).encode()
+		(0u32, 0u32, 0u32, 69u128, 0u128, 0u128, 0u128).encode()
 	);
 	t.insert(<pallet_balances::TotalIssuance<Runtime>>::hashed_key().to_vec(), 69_u128.encode());
 	t.insert(<frame_system::BlockHash<Runtime>>::hashed_key_for(0), vec![0u8; 32]);
@@ -221,11 +221,11 @@ fn successful_execution_with_native_equivalent_code_gives_ok() {
 	let mut t = new_test_ext(compact_code_unwrap(), false);
 	t.insert(
 		<frame_system::Account<Runtime>>::hashed_key_for(alice()),
-		(0u32, 0u32, 111 * DOLLARS, 0u128, 0u128, 0u128).encode()
+		(0u32, 0u32, 0u32, 111 * DOLLARS, 0u128, 0u128, 0u128).encode()
 	);
 	t.insert(
 		<frame_system::Account<Runtime>>::hashed_key_for(bob()),
-		(0u32, 0u32, 0 * DOLLARS, 0u128, 0u128, 0u128).encode()
+		(0u32, 0u32, 0u32, 0 * DOLLARS, 0u128, 0u128, 0u128).encode()
 	);
 	t.insert(
 		<pallet_balances::TotalIssuance<Runtime>>::hashed_key().to_vec(),
@@ -264,11 +264,11 @@ fn successful_execution_with_foreign_code_gives_ok() {
 	let mut t = new_test_ext(bloaty_code_unwrap(), false);
 	t.insert(
 		<frame_system::Account<Runtime>>::hashed_key_for(alice()),
-		(0u32, 0u32, 111 * DOLLARS, 0u128, 0u128, 0u128).encode()
+		(0u32, 0u32, 0u32, 111 * DOLLARS, 0u128, 0u128, 0u128).encode()
 	);
 	t.insert(
 		<frame_system::Account<Runtime>>::hashed_key_for(bob()),
-		(0u32, 0u32, 0 * DOLLARS, 0u128, 0u128, 0u128).encode()
+		(0u32, 0u32, 0u32, 0 * DOLLARS, 0u128, 0u128, 0u128).encode()
 	);
 	t.insert(
 		<pallet_balances::TotalIssuance<Runtime>>::hashed_key().to_vec(),
@@ -702,7 +702,7 @@ fn panic_execution_gives_error() {
 	let mut t = new_test_ext(bloaty_code_unwrap(), false);
 	t.insert(
 		<frame_system::Account<Runtime>>::hashed_key_for(alice()),
-		(0u32, 0u32, 0 * DOLLARS, 0u128, 0u128, 0u128).encode()
+		(0u32, 0u32, 0u32, 0 * DOLLARS, 0u128, 0u128, 0u128).encode()
 	);
 	t.insert(<pallet_balances::TotalIssuance<Runtime>>::hashed_key().to_vec(), 0_u128.encode());
 	t.insert(<frame_system::BlockHash<Runtime>>::hashed_key_for(0), vec![0u8; 32]);
@@ -731,11 +731,11 @@ fn successful_execution_gives_ok() {
 	let mut t = new_test_ext(compact_code_unwrap(), false);
 	t.insert(
 		<frame_system::Account<Runtime>>::hashed_key_for(alice()),
-		(0u32, 0u32, 111 * DOLLARS, 0u128, 0u128, 0u128).encode()
+		(0u32, 0u32, 0u32, 111 * DOLLARS, 0u128, 0u128, 0u128).encode()
 	);
 	t.insert(
 		<frame_system::Account<Runtime>>::hashed_key_for(bob()),
-		(0u32, 0u32, 0 * DOLLARS, 0u128, 0u128, 0u128).encode()
+		(0u32, 0u32, 0u32, 0 * DOLLARS, 0u128, 0u128, 0u128).encode()
 	);
 	t.insert(
 		<pallet_balances::TotalIssuance<Runtime>>::hashed_key().to_vec(),
diff --git a/bin/node/executor/tests/fees.rs b/bin/node/executor/tests/fees.rs
index 07460e54680d..ed354d553448 100644
--- a/bin/node/executor/tests/fees.rs
+++ b/bin/node/executor/tests/fees.rs
@@ -121,6 +121,15 @@ fn fee_multiplier_increases_and_decreases_on_big_weight() {
 	});
 }
 
+fn new_account_info(free_dollars: u128) -> Vec<u8> {
+	frame_system::AccountInfo {
+		nonce: 0u32,
+		consumers: 0,
+		providers: 0,
+		data: (free_dollars * DOLLARS, 0 * DOLLARS, 0 * DOLLARS, 0 * DOLLARS),
+	}.encode()
+}
+
 #[test]
 fn transaction_fee_is_correct() {
 	// This uses the exact values of substrate-node.
@@ -131,14 +140,8 @@ fn transaction_fee_is_correct() {
 	//   - 1 milli-dot based on current polkadot runtime.
 	// (this baed on assigning 0.1 CENT to the cheapest tx with `weight = 100`)
 	let mut t = new_test_ext(compact_code_unwrap(), false);
-	t.insert(
-		<frame_system::Account<Runtime>>::hashed_key_for(alice()),
-		(0u32, 0u32, 100 * DOLLARS, 0 * DOLLARS, 0 * DOLLARS, 0 * DOLLARS).encode()
-	);
-	t.insert(
-		<frame_system::Account<Runtime>>::hashed_key_for(bob()),
-		(0u32, 0u32, 10 * DOLLARS, 0 * DOLLARS, 0 * DOLLARS, 0 * DOLLARS).encode()
-	);
+	t.insert(<frame_system::Account<Runtime>>::hashed_key_for(alice()), new_account_info(100));
+	t.insert(<frame_system::Account<Runtime>>::hashed_key_for(bob()), new_account_info(10));
 	t.insert(
 		<pallet_balances::TotalIssuance<Runtime>>::hashed_key().to_vec(),
 		(110 * DOLLARS).encode()
diff --git a/bin/node/executor/tests/submit_transaction.rs b/bin/node/executor/tests/submit_transaction.rs
index f3cb90cbecdd..c628826c62be 100644
--- a/bin/node/executor/tests/submit_transaction.rs
+++ b/bin/node/executor/tests/submit_transaction.rs
@@ -253,7 +253,7 @@ fn submitted_transaction_should_be_valid() {
 		let author = extrinsic.signature.clone().unwrap().0;
 		let address = Indices::lookup(author).unwrap();
 		let data = pallet_balances::AccountData { free: 5_000_000_000_000, ..Default::default() };
-		let account = frame_system::AccountInfo { nonce: 0, refcount: 0, data };
+		let account = frame_system::AccountInfo { nonce: 0, consumers: 0, providers: 0, data };
 		<frame_system::Account<Runtime>>::insert(&address, account);
 
 		// check validity
diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index 0455f35e2455..dcb77cc6ebfd 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -274,6 +274,8 @@ decl_error! {
 		MinBalanceZero,
 		/// A mint operation lead to an overflow.
 		Overflow,
+		/// Some internal state is broken.
+		BadState,
 	}
 }
 
@@ -863,7 +865,7 @@ impl<T: Config> Module<T> {
 	) -> Result<bool, DispatchError> {
 		let accounts = d.accounts.checked_add(1).ok_or(Error::<T>::Overflow)?;
 		let r = Ok(if frame_system::Module::<T>::account_exists(who) {
-			frame_system::Module::<T>::inc_ref(who);
+			frame_system::Module::<T>::inc_consumers(who).map_err(|_| Error::<T>::BadState)?;
 			false
 		} else {
 			ensure!(d.zombies < d.max_zombies, Error::<T>::TooManyZombies);
@@ -881,7 +883,9 @@ impl<T: Config> Module<T> {
 		is_zombie: &mut bool,
 	) {
 		if *is_zombie && frame_system::Module::<T>::account_exists(who) {
-			frame_system::Module::<T>::inc_ref(who);
+			// If the account exists, then it should have at least one provider
+			// so this cannot fail... but being defensive anyway.
+			let _ = frame_system::Module::<T>::inc_consumers(who);
 			*is_zombie = false;
 			d.zombies = d.zombies.saturating_sub(1);
 		}
@@ -895,7 +899,7 @@ impl<T: Config> Module<T> {
 		if is_zombie {
 			d.zombies = d.zombies.saturating_sub(1);
 		} else {
-			frame_system::Module::<T>::dec_ref(who);
+			frame_system::Module::<T>::dec_consumers(who);
 		}
 		d.accounts = d.accounts.saturating_sub(1);
 	}
diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index 58e2af873fd9..0a7576aa0778 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -379,6 +379,14 @@ pub fn new_test_ext_raw_authorities(authorities: Vec<AuthorityId>) -> sp_io::Tes
 		.build_storage::<Test>()
 		.unwrap();
 
+	let balances: Vec<_> = (0..authorities.len())
+		.map(|i| (i as u64, 10_000_000))
+		.collect();
+
+	pallet_balances::GenesisConfig::<Test> { balances }
+		.assimilate_storage(&mut t)
+		.unwrap();
+
 	// stashes are the index.
 	let session_keys: Vec<_> = authorities
 		.iter()
@@ -394,6 +402,12 @@ pub fn new_test_ext_raw_authorities(authorities: Vec<AuthorityId>) -> sp_io::Tes
 		})
 		.collect();
 
+	// NOTE: this will initialize the babe authorities
+	// through OneSessionHandler::on_genesis_session
+	pallet_session::GenesisConfig::<Test> { keys: session_keys }
+		.assimilate_storage(&mut t)
+		.unwrap();
+
 	// controllers are the index + 1000
 	let stakers: Vec<_> = (0..authorities.len())
 		.map(|i| {
@@ -406,20 +420,6 @@ pub fn new_test_ext_raw_authorities(authorities: Vec<AuthorityId>) -> sp_io::Tes
 		})
 		.collect();
 
-	let balances: Vec<_> = (0..authorities.len())
-		.map(|i| (i as u64, 10_000_000))
-		.collect();
-
-	// NOTE: this will initialize the babe authorities
-	// through OneSessionHandler::on_genesis_session
-	pallet_session::GenesisConfig::<Test> { keys: session_keys }
-		.assimilate_storage(&mut t)
-		.unwrap();
-
-	pallet_balances::GenesisConfig::<Test> { balances }
-		.assimilate_storage(&mut t)
-		.unwrap();
-
 	let staking_config = pallet_staking::GenesisConfig::<Test> {
 		stakers,
 		validator_count: 8,
diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index 10451aca15b1..ef069455bbab 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -157,22 +157,22 @@ mod benchmarking;
 pub mod weights;
 
 use sp_std::prelude::*;
-use sp_std::{cmp, result, mem, fmt::Debug, ops::BitOr, convert::Infallible};
+use sp_std::{cmp, result, mem, fmt::Debug, ops::BitOr};
 use codec::{Codec, Encode, Decode};
 use frame_support::{
 	StorageValue, Parameter, decl_event, decl_storage, decl_module, decl_error, ensure,
 	traits::{
-		Currency, OnKilledAccount, OnUnbalanced, TryDrop, StoredMap,
+		Currency, OnUnbalanced, TryDrop, StoredMap,
 		WithdrawReasons, LockIdentifier, LockableCurrency, ExistenceRequirement,
 		Imbalance, SignedImbalance, ReservableCurrency, Get, ExistenceRequirement::KeepAlive,
-		ExistenceRequirement::AllowDeath, IsDeadAccount, BalanceStatus as Status,
+		ExistenceRequirement::AllowDeath, BalanceStatus as Status,
 	}
 };
 use sp_runtime::{
 	RuntimeDebug, DispatchResult, DispatchError,
 	traits::{
 		Zero, AtLeast32BitUnsigned, StaticLookup, Member, CheckedAdd, CheckedSub,
-		MaybeSerializeDeserialize, Saturating, Bounded,
+		MaybeSerializeDeserialize, Saturating, Bounded, StoredMapError,
 	},
 };
 use frame_system::{self as system, ensure_signed, ensure_root};
@@ -419,7 +419,7 @@ decl_storage! {
 			assert!(endowed_accounts.len() == config.balances.len(), "duplicate balances in genesis.");
 
 			for &(ref who, free) in config.balances.iter() {
-				T::AccountStore::insert(who, AccountData { free, .. Default::default() });
+				assert!(T::AccountStore::insert(who, AccountData { free, .. Default::default() }).is_ok());
 			}
 		});
 	}
@@ -524,7 +524,7 @@ decl_module! {
 				account.reserved = new_reserved;
 
 				(account.free, account.reserved)
-			});
+			})?;
 			Self::deposit_event(RawEvent::BalanceSet(who, free, reserved));
 		}
 
@@ -634,9 +634,8 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 	pub fn mutate_account<R>(
 		who: &T::AccountId,
 		f: impl FnOnce(&mut AccountData<T::Balance>) -> R
-	) -> R {
-		Self::try_mutate_account(who, |a, _| -> Result<R, Infallible> { Ok(f(a)) })
-			.expect("Error is infallible; qed")
+	) -> Result<R, StoredMapError> {
+		Self::try_mutate_account(who, |a, _| -> Result<R, StoredMapError> { Ok(f(a)) })
 	}
 
 	/// Mutate an account to some new value, or delete it entirely with `None`. Will enforce
@@ -648,7 +647,7 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 	///
 	/// NOTE: LOW-LEVEL: This will not attempt to maintain total issuance. It is expected that
 	/// the caller will do this.
-	fn try_mutate_account<R, E>(
+	fn try_mutate_account<R, E: From<StoredMapError>>(
 		who: &T::AccountId,
 		f: impl FnOnce(&mut AccountData<T::Balance>, bool) -> Result<R, E>
 	) -> Result<R, E> {
@@ -676,7 +675,8 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 				A runtime configuration adjustment may be needed."
 			);
 		}
-		Self::mutate_account(who, |b| {
+		// No way this can fail since we do not alter the existential balances.
+		let _ = Self::mutate_account(who, |b| {
 			b.misc_frozen = Zero::zero();
 			b.fee_frozen = Zero::zero();
 			for l in locks.iter() {
@@ -695,12 +695,20 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 			if existed {
 				// TODO: use Locks::<T, I>::hashed_key
 				// https://github.com/paritytech/substrate/issues/4969
-				system::Module::<T>::dec_ref(who);
+				system::Module::<T>::dec_consumers(who);
 			}
 		} else {
 			Locks::<T, I>::insert(who, locks);
 			if !existed {
-				system::Module::<T>::inc_ref(who);
+				if system::Module::<T>::inc_consumers(who).is_err() {
+					// No providers for the locks. This is impossible under normal circumstances
+					// since the funds that are under the lock will themselves be stored in the
+					// account and therefore will need a reference.
+					frame_support::debug::warn!(
+						"Warning: Attempt to introduce lock consumer reference, yet no providers. \
+						This is unexpected but should be safe."
+					);
+				}
 			}
 		}
 	}
@@ -711,13 +719,14 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 mod imbalances {
 	use super::{
 		result, DefaultInstance, Imbalance, Config, Zero, Instance, Saturating,
-		StorageValue, TryDrop,
+		StorageValue, TryDrop, RuntimeDebug,
 	};
 	use sp_std::mem;
 
 	/// Opaque, move-only struct with private fields that serves as a token denoting that
 	/// funds have been created without any equal and opposite accounting.
 	#[must_use]
+	#[derive(RuntimeDebug, PartialEq, Eq)]
 	pub struct PositiveImbalance<T: Config<I>, I: Instance=DefaultInstance>(T::Balance);
 
 	impl<T: Config<I>, I: Instance> PositiveImbalance<T, I> {
@@ -730,6 +739,7 @@ mod imbalances {
 	/// Opaque, move-only struct with private fields that serves as a token denoting that
 	/// funds have been destroyed without any equal and opposite accounting.
 	#[must_use]
+	#[derive(RuntimeDebug, PartialEq, Eq)]
 	pub struct NegativeImbalance<T: Config<I>, I: Instance=DefaultInstance>(T::Balance);
 
 	impl<T: Config<I>, I: Instance> NegativeImbalance<T, I> {
@@ -963,10 +973,12 @@ impl<T: Config<I>, I: Instance> Currency<T::AccountId> for Module<T, I> where
 					value,
 					WithdrawReasons::TRANSFER,
 					from_account.free,
-				)?;
+				).map_err(|_| Error::<T, I>::LiquidityRestrictions)?;
 
+				// TODO: This is over-conservative. There may now be other providers, and this module
+				//   may not even be a provider.
 				let allow_death = existence_requirement == ExistenceRequirement::AllowDeath;
-				let allow_death = allow_death && system::Module::<T>::allow_death(transactor);
+				let allow_death = allow_death && !system::Module::<T>::is_provider_required(transactor);
 				ensure!(allow_death || from_account.free >= ed, Error::<T, I>::KeepAlive);
 
 				Ok(())
@@ -993,21 +1005,48 @@ impl<T: Config<I>, I: Instance> Currency<T::AccountId> for Module<T, I> where
 		value: Self::Balance
 	) -> (Self::NegativeImbalance, Self::Balance) {
 		if value.is_zero() { return (NegativeImbalance::zero(), Zero::zero()) }
-		if Self::is_dead_account(&who) { return (NegativeImbalance::zero(), value) }
-
-		Self::mutate_account(who, |account| {
-			let free_slash = cmp::min(account.free, value);
-			account.free -= free_slash;
-
-			let remaining_slash = value - free_slash;
-			if !remaining_slash.is_zero() {
-				let reserved_slash = cmp::min(account.reserved, remaining_slash);
-				account.reserved -= reserved_slash;
-				(NegativeImbalance::new(free_slash + reserved_slash), remaining_slash - reserved_slash)
-			} else {
-				(NegativeImbalance::new(value), Zero::zero())
+		if Self::total_balance(&who).is_zero() { return (NegativeImbalance::zero(), value) }
+
+		for attempt in 0..2 {
+			match Self::try_mutate_account(who,
+				|account, _is_new| -> Result<(Self::NegativeImbalance, Self::Balance), StoredMapError> {
+					// Best value is the most amount we can slash following liveness rules.
+					let best_value = match attempt {
+						// First attempt we try to slash the full amount, and see if liveness issues happen.
+						0 => value,
+						// If acting as a critical provider (i.e. first attempt failed), then slash
+						// as much as possible while leaving at least at ED.
+						_ => value.min((account.free + account.reserved).saturating_sub(T::ExistentialDeposit::get())),
+					};
+
+					let free_slash = cmp::min(account.free, best_value);
+					account.free -= free_slash; // Safe because of above check
+					let remaining_slash = best_value - free_slash; // Safe because of above check
+
+					if !remaining_slash.is_zero() {
+						// If we have remaining slash, take it from reserved balance.
+						let reserved_slash = cmp::min(account.reserved, remaining_slash);
+						account.reserved -= reserved_slash; // Safe because of above check
+						Ok((
+							NegativeImbalance::new(free_slash + reserved_slash),
+							value - free_slash - reserved_slash, // Safe because value is gt or eq total slashed
+						))
+					} else {
+						// Else we are done!
+						Ok((
+							NegativeImbalance::new(free_slash),
+							value - free_slash, // Safe because value is gt or eq to total slashed
+						))
+					}
+				}
+			) {
+				Ok(r) => return r,
+				Err(_) => (),
 			}
-		})
+		}
+
+		// Should never get here. But we'll be defensive anyway.
+		(Self::NegativeImbalance::zero(), value)
 	}
 
 	/// Deposit some `value` into the free balance of an existing target account `who`.
@@ -1030,7 +1069,8 @@ impl<T: Config<I>, I: Instance> Currency<T::AccountId> for Module<T, I> where
 	///
 	/// This function is a no-op if:
 	/// - the `value` to be deposited is zero; or
-	/// - if the `value` to be deposited is less than the ED and the account does not yet exist; or
+	/// - the `value` to be deposited is less than the required ED and the account does not yet exist; or
+	/// - the deposit would necessitate the account to exist and there are no provider references; or
 	/// - `value` is so large it would cause the balance of `who` to overflow.
 	fn deposit_creating(
 		who: &T::AccountId,
@@ -1038,17 +1078,22 @@ impl<T: Config<I>, I: Instance> Currency<T::AccountId> for Module<T, I> where
 	) -> Self::PositiveImbalance {
 		if value.is_zero() { return Self::PositiveImbalance::zero() }
 
-		Self::try_mutate_account(who, |account, is_new| -> Result<Self::PositiveImbalance, Self::PositiveImbalance> {
-			// bail if not yet created and this operation wouldn't be enough to create it.
+		let r = Self::try_mutate_account(who, |account, is_new| -> Result<Self::PositiveImbalance, DispatchError> {
+
 			let ed = T::ExistentialDeposit::get();
-			ensure!(value >= ed || !is_new, Self::PositiveImbalance::zero());
+			ensure!(value >= ed || !is_new, Error::<T, I>::ExistentialDeposit);
 
 			// defensive only: overflow should never happen, however in case it does, then this
 			// operation is a no-op.
-			account.free = account.free.checked_add(&value).ok_or_else(|| Self::PositiveImbalance::zero())?;
+			account.free = match account.free.checked_add(&value) {
+				Some(x) => x,
+				None => return Ok(Self::PositiveImbalance::zero()),
+			};
 
 			Ok(PositiveImbalance::new(value))
-		}).unwrap_or_else(|x| x)
+		}).unwrap_or_else(|_| Self::PositiveImbalance::zero());
+
+		r
 	}
 
 	/// Withdraw some free balance from an account, respecting existence requirements.
@@ -1087,9 +1132,10 @@ impl<T: Config<I>, I: Instance> Currency<T::AccountId> for Module<T, I> where
 		-> SignedImbalance<Self::Balance, Self::PositiveImbalance>
 	{
 		Self::try_mutate_account(who, |account, is_new|
-			-> Result<SignedImbalance<Self::Balance, Self::PositiveImbalance>, ()>
+			-> Result<SignedImbalance<Self::Balance, Self::PositiveImbalance>, DispatchError>
 		{
 			let ed = T::ExistentialDeposit::get();
+			let total = value.saturating_add(account.reserved);
 			// If we're attempting to set an existing account to less than ED, then
 			// bypass the entire operation. It's a no-op if you follow it through, but
 			// since this is an instance where we might account for a negative imbalance
@@ -1097,7 +1143,7 @@ impl<T: Config<I>, I: Instance> Currency<T::AccountId> for Module<T, I> where
 			// equal and opposite cause (returned as an Imbalance), then in the
 			// instance that there's no other accounts on the system at all, we might
 			// underflow the issuance and our arithmetic will be off.
-			ensure!(value.saturating_add(account.reserved) >= ed || !is_new, ());
+			ensure!(total >= ed || !is_new, Error::<T, I>::ExistentialDeposit);
 
 			let imbalance = if account.free <= value {
 				SignedImbalance::Positive(PositiveImbalance::new(value - account.free))
@@ -1150,16 +1196,24 @@ impl<T: Config<I>, I: Instance> ReservableCurrency<T::AccountId> for Module<T, I
 	/// Is a no-op if the value to be unreserved is zero or the account does not exist.
 	fn unreserve(who: &T::AccountId, value: Self::Balance) -> Self::Balance {
 		if value.is_zero() { return Zero::zero() }
-		if Self::is_dead_account(&who) { return value }
+		if Self::total_balance(&who).is_zero() { return value }
 
-		let actual = Self::mutate_account(who, |account| {
+		let actual = match Self::mutate_account(who, |account| {
 			let actual = cmp::min(account.reserved, value);
 			account.reserved -= actual;
 			// defensive only: this can never fail since total issuance which is at least free+reserved
 			// fits into the same data type.
 			account.free = account.free.saturating_add(actual);
 			actual
-		});
+		}) {
+			Ok(x) => x,
+			Err(_) => {
+				// This should never happen since we don't alter the total amount in the account.
+				// If it ever does, then we should fail gracefully though, indicating that nothing
+				// could be done.
+				return value
+			}
+		};
 
 		Self::deposit_event(RawEvent::Unreserved(who.clone(), actual.clone()));
 		value - actual
@@ -1174,14 +1228,33 @@ impl<T: Config<I>, I: Instance> ReservableCurrency<T::AccountId> for Module<T, I
 		value: Self::Balance
 	) -> (Self::NegativeImbalance, Self::Balance) {
 		if value.is_zero() { return (NegativeImbalance::zero(), Zero::zero()) }
-		if Self::is_dead_account(&who) { return (NegativeImbalance::zero(), value) }
-
-		Self::mutate_account(who, |account| {
-			// underflow should never happen, but it if does, there's nothing to be done here.
-			let actual = cmp::min(account.reserved, value);
-			account.reserved -= actual;
-			(NegativeImbalance::new(actual), value - actual)
-		})
+		if Self::total_balance(&who).is_zero() { return (NegativeImbalance::zero(), value) }
+
+		// NOTE: `mutate_account` may fail if it attempts to reduce the balance to the point that an
+		//   account is attempted to be illegally destroyed.
+
+		for attempt in 0..2 {
+			match Self::mutate_account(who, |account| {
+				let best_value = match attempt {
+					0 => value,
+					// If acting as a critical provider (i.e. first attempt failed), then ensure
+					// slash leaves at least the ED.
+					_ => value.min((account.free + account.reserved).saturating_sub(T::ExistentialDeposit::get())),
+				};
+
+				let actual = cmp::min(account.reserved, best_value);
+				account.reserved -= actual;
+
+				// underflow should never happen, but it if does, there's nothing to be done here.
+				(NegativeImbalance::new(actual), value - actual)
+			}) {
+				Ok(r) => return r,
+				Err(_) => (),
+			}
+		}
+		// Should never get here as we ensure that ED is left in the second attempt.
+		// In case we do, though, then we fail gracefully.
+		(Self::NegativeImbalance::zero(), value)
 	}
 
 	/// Move the reserved balance of one account into the balance of another, according to `status`.
@@ -1222,24 +1295,6 @@ impl<T: Config<I>, I: Instance> ReservableCurrency<T::AccountId> for Module<T, I
 	}
 }
 
-/// Implement `OnKilledAccount` to remove the local account, if using local account storage.
-///
-/// NOTE: You probably won't need to use this! This only needs to be "wired in" to System module
-/// if you're using the local balance storage. **If you're using the composite system account
-/// storage (which is the default in most examples and tests) then there's no need.**
-impl<T: Config<I>, I: Instance> OnKilledAccount<T::AccountId> for Module<T, I> {
-	fn on_killed_account(who: &T::AccountId) {
-		Account::<T, I>::mutate_exists(who, |account| {
-			let total = account.as_ref().map(|acc| acc.total()).unwrap_or_default();
-			if !total.is_zero() {
-				T::DustRemoval::on_unbalanced(NegativeImbalance::new(total));
-				Self::deposit_event(RawEvent::DustLost(who.clone(), total));
-			}
-			*account = None;
-		});
-	}
-}
-
 impl<T: Config<I>, I: Instance> LockableCurrency<T::AccountId> for Module<T, I>
 where
 	T::Balance: MaybeSerializeDeserialize + Debug
@@ -1304,12 +1359,3 @@ where
 		Self::update_locks(who, &locks[..]);
 	}
 }
-
-impl<T: Config<I>, I: Instance> IsDeadAccount<T::AccountId> for Module<T, I> where
-	T::Balance: MaybeSerializeDeserialize + Debug
-{
-	fn is_dead_account(who: &T::AccountId) -> bool {
-		// this should always be exactly equivalent to `Self::account(who).total().is_zero()` if ExistentialDeposit > 0
-		!T::AccountStore::is_explicit(who)
-	}
-}
diff --git a/frame/balances/src/tests.rs b/frame/balances/src/tests.rs
index 1c120272dd0b..90e8e0d7cbdc 100644
--- a/frame/balances/src/tests.rs
+++ b/frame/balances/src/tests.rs
@@ -43,7 +43,7 @@ macro_rules! decl_tests {
 			assert_noop, assert_storage_noop, assert_ok, assert_err,
 			traits::{
 				LockableCurrency, LockIdentifier, WithdrawReasons,
-				Currency, ReservableCurrency, ExistenceRequirement::AllowDeath, StoredMap
+				Currency, ReservableCurrency, ExistenceRequirement::AllowDeath
 			}
 		};
 		use pallet_transaction_payment::{ChargeTransactionPayment, Multiplier};
@@ -91,7 +91,8 @@ macro_rules! decl_tests {
 			<$ext_builder>::default().existential_deposit(1).monied(true).build().execute_with(|| {
 				assert_eq!(Balances::free_balance(1), 10);
 				assert_ok!(<Balances as Currency<_>>::transfer(&1, &2, 10, AllowDeath));
-				assert!(!<<Test as Config>::AccountStore as StoredMap<u64, AccountData<u64>>>::is_explicit(&1));
+				// Check that the account is dead.
+				assert!(!frame_system::Account::<Test>::contains_key(&1));
 			});
 		}
 
@@ -262,14 +263,12 @@ macro_rules! decl_tests {
 				.monied(true)
 				.build()
 				.execute_with(|| {
-					assert_eq!(Balances::is_dead_account(&5), true);
 					// account 5 should not exist
 					// ext_deposit is 10, value is 9, not satisfies for ext_deposit
 					assert_noop!(
 						Balances::transfer(Some(1).into(), 5, 9),
 						Error::<$test, _>::ExistentialDeposit,
 					);
-					assert_eq!(Balances::is_dead_account(&5), true); // account 5 should not exist
 					assert_eq!(Balances::free_balance(1), 100);
 				});
 		}
@@ -282,31 +281,25 @@ macro_rules! decl_tests {
 				.build()
 				.execute_with(|| {
 					System::inc_account_nonce(&2);
-					assert_eq!(Balances::is_dead_account(&2), false);
-					assert_eq!(Balances::is_dead_account(&5), true);
 					assert_eq!(Balances::total_balance(&2), 256 * 20);
 
 					assert_ok!(Balances::reserve(&2, 256 * 19 + 1)); // account 2 becomes mostly reserved
 					assert_eq!(Balances::free_balance(2), 255); // "free" account deleted."
 					assert_eq!(Balances::total_balance(&2), 256 * 20); // reserve still exists.
-					assert_eq!(Balances::is_dead_account(&2), false);
 					assert_eq!(System::account_nonce(&2), 1);
 
 					// account 4 tries to take index 1 for account 5.
 					assert_ok!(Balances::transfer(Some(4).into(), 5, 256 * 1 + 0x69));
 					assert_eq!(Balances::total_balance(&5), 256 * 1 + 0x69);
-					assert_eq!(Balances::is_dead_account(&5), false);
 
 					assert!(Balances::slash(&2, 256 * 19 + 2).1.is_zero()); // account 2 gets slashed
 					// "reserve" account reduced to 255 (below ED) so account deleted
 					assert_eq!(Balances::total_balance(&2), 0);
 					assert_eq!(System::account_nonce(&2), 0);    // nonce zero
-					assert_eq!(Balances::is_dead_account(&2), true);
 
 					// account 4 tries to take index 1 again for account 6.
 					assert_ok!(Balances::transfer(Some(4).into(), 6, 256 * 1 + 0x69));
 					assert_eq!(Balances::total_balance(&6), 256 * 1 + 0x69);
-					assert_eq!(Balances::is_dead_account(&6), false);
 				});
 		}
 
@@ -417,7 +410,7 @@ macro_rules! decl_tests {
 		fn refunding_balance_should_work() {
 			<$ext_builder>::default().build().execute_with(|| {
 				let _ = Balances::deposit_creating(&1, 42);
-				Balances::mutate_account(&1, |a| a.reserved = 69);
+				assert!(Balances::mutate_account(&1, |a| a.reserved = 69).is_ok());
 				Balances::unreserve(&1, 69);
 				assert_eq!(Balances::free_balance(1), 111);
 				assert_eq!(Balances::reserved_balance(1), 0);
@@ -623,7 +616,6 @@ macro_rules! decl_tests {
 					Balances::transfer_keep_alive(Some(1).into(), 2, 100),
 					Error::<$test, _>::KeepAlive
 				);
-				assert_eq!(Balances::is_dead_account(&1), false);
 				assert_eq!(Balances::total_balance(&1), 100);
 				assert_eq!(Balances::total_balance(&2), 0);
 			});
@@ -695,7 +687,6 @@ macro_rules! decl_tests {
 					// Reserve some free balance
 					let _ = Balances::slash(&1, 1);
 					// The account should be dead.
-					assert!(Balances::is_dead_account(&1));
 					assert_eq!(Balances::free_balance(1), 0);
 					assert_eq!(Balances::reserved_balance(1), 0);
 				});
@@ -767,7 +758,7 @@ macro_rules! decl_tests {
 		#[test]
 		fn emit_events_with_no_existential_deposit_suicide() {
 			<$ext_builder>::default()
-				.existential_deposit(0)
+				.existential_deposit(1)
 				.build()
 				.execute_with(|| {
 					assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 1, 100, 0));
@@ -783,11 +774,6 @@ macro_rules! decl_tests {
 
 					let _ = Balances::slash(&1, 100);
 
-					// no events
-					assert_eq!(events(), []);
-
-					assert_ok!(System::suicide(Origin::signed(1)));
-
 					assert_eq!(
 						events(),
 						[
@@ -797,6 +783,178 @@ macro_rules! decl_tests {
 				});
 		}
 
+		#[test]
+		fn slash_loop_works() {
+			<$ext_builder>::default()
+				.existential_deposit(100)
+				.build()
+				.execute_with(|| {
+					/* User has no reference counter, so they can die in these scenarios */
+
+					// SCENARIO: Slash would not kill account.
+					assert_ok!(Balances::set_balance(Origin::root(), 1, 1_000, 0));
+					// Slashed completed in full
+					assert_eq!(Balances::slash(&1, 900), (NegativeImbalance::new(900), 0));
+					// Account is still alive
+					assert!(System::account_exists(&1));
+
+					// SCENARIO: Slash will kill account because not enough balance left.
+					assert_ok!(Balances::set_balance(Origin::root(), 1, 1_000, 0));
+					// Slashed completed in full
+					assert_eq!(Balances::slash(&1, 950), (NegativeImbalance::new(950), 0));
+					// Account is killed
+					assert!(!System::account_exists(&1));
+
+					// SCENARIO: Over-slash will kill account, and report missing slash amount.
+					assert_ok!(Balances::set_balance(Origin::root(), 1, 1_000, 0));
+					// Slashed full free_balance, and reports 300 not slashed
+					assert_eq!(Balances::slash(&1, 1_300), (NegativeImbalance::new(1000), 300));
+					// Account is dead
+					assert!(!System::account_exists(&1));
+
+					// SCENARIO: Over-slash can take from reserved, but keep alive.
+					assert_ok!(Balances::set_balance(Origin::root(), 1, 1_000, 400));
+					// Slashed full free_balance and 300 of reserved balance
+					assert_eq!(Balances::slash(&1, 1_300), (NegativeImbalance::new(1300), 0));
+					// Account is still alive
+					assert!(System::account_exists(&1));
+
+					// SCENARIO: Over-slash can take from reserved, and kill.
+					assert_ok!(Balances::set_balance(Origin::root(), 1, 1_000, 350));
+					// Slashed full free_balance and 300 of reserved balance
+					assert_eq!(Balances::slash(&1, 1_300), (NegativeImbalance::new(1300), 0));
+					// Account is dead because 50 reserved balance is not enough to keep alive
+					assert!(!System::account_exists(&1));
+
+					// SCENARIO: Over-slash can take as much as possible from reserved, kill, and report missing amount.
+					assert_ok!(Balances::set_balance(Origin::root(), 1, 1_000, 250));
+					// Slashed full free_balance and 300 of reserved balance
+					assert_eq!(Balances::slash(&1, 1_300), (NegativeImbalance::new(1250), 50));
+					// Account is super dead
+					assert!(!System::account_exists(&1));
+
+					/* User will now have a reference counter on them, keeping them alive in these scenarios */
+
+					// SCENARIO: Slash would not kill account.
+					assert_ok!(Balances::set_balance(Origin::root(), 1, 1_000, 0));
+					assert_ok!(System::inc_consumers(&1)); // <-- Reference counter added here is enough for all tests
+					// Slashed completed in full
+					assert_eq!(Balances::slash(&1, 900), (NegativeImbalance::new(900), 0));
+					// Account is still alive
+					assert!(System::account_exists(&1));
+
+					// SCENARIO: Slash will take as much as possible without killing account.
+					assert_ok!(Balances::set_balance(Origin::root(), 1, 1_000, 0));
+					// Slashed completed in full
+					assert_eq!(Balances::slash(&1, 950), (NegativeImbalance::new(900), 50));
+					// Account is still alive
+					assert!(System::account_exists(&1));
+
+					// SCENARIO: Over-slash will not kill account, and report missing slash amount.
+					assert_ok!(Balances::set_balance(Origin::root(), 1, 1_000, 0));
+					// Slashed full free_balance minus ED, and reports 400 not slashed
+					assert_eq!(Balances::slash(&1, 1_300), (NegativeImbalance::new(900), 400));
+					// Account is still alive
+					assert!(System::account_exists(&1));
+
+					// SCENARIO: Over-slash can take from reserved, but keep alive.
+					assert_ok!(Balances::set_balance(Origin::root(), 1, 1_000, 400));
+					// Slashed full free_balance and 300 of reserved balance
+					assert_eq!(Balances::slash(&1, 1_300), (NegativeImbalance::new(1300), 0));
+					// Account is still alive
+					assert!(System::account_exists(&1));
+
+					// SCENARIO: Over-slash can take from reserved, but keep alive.
+					assert_ok!(Balances::set_balance(Origin::root(), 1, 1_000, 350));
+					// Slashed full free_balance and 250 of reserved balance to leave ED
+					assert_eq!(Balances::slash(&1, 1_300), (NegativeImbalance::new(1250), 50));
+					// Account is still alive
+					assert!(System::account_exists(&1));
+
+					// SCENARIO: Over-slash can take as much as possible from reserved and report missing amount.
+					assert_ok!(Balances::set_balance(Origin::root(), 1, 1_000, 250));
+					// Slashed full free_balance and 300 of reserved balance
+					assert_eq!(Balances::slash(&1, 1_300), (NegativeImbalance::new(1150), 150));
+					// Account is still alive
+					assert!(System::account_exists(&1));
+
+					// Slash on non-existent account is okay.
+					assert_eq!(Balances::slash(&12345, 1_300), (NegativeImbalance::new(0), 1300));
+				});
+		}
+
+		#[test]
+		fn slash_reserved_loop_works() {
+			<$ext_builder>::default()
+				.existential_deposit(100)
+				.build()
+				.execute_with(|| {
+					/* User has no reference counter, so they can die in these scenarios */
+
+					// SCENARIO: Slash would not kill account.
+					assert_ok!(Balances::set_balance(Origin::root(), 1, 50, 1_000));
+					// Slashed completed in full
+					assert_eq!(Balances::slash_reserved(&1, 900), (NegativeImbalance::new(900), 0));
+					// Account is still alive
+					assert!(System::account_exists(&1));
+
+					// SCENARIO: Slash would kill account.
+					assert_ok!(Balances::set_balance(Origin::root(), 1, 50, 1_000));
+					// Slashed completed in full
+					assert_eq!(Balances::slash_reserved(&1, 1_000), (NegativeImbalance::new(1_000), 0));
+					// Account is dead
+					assert!(!System::account_exists(&1));
+
+					// SCENARIO: Over-slash would kill account, and reports left over slash.
+					assert_ok!(Balances::set_balance(Origin::root(), 1, 50, 1_000));
+					// Slashed completed in full
+					assert_eq!(Balances::slash_reserved(&1, 1_300), (NegativeImbalance::new(1_000), 300));
+					// Account is dead
+					assert!(!System::account_exists(&1));
+
+					// SCENARIO: Over-slash does not take from free balance.
+					assert_ok!(Balances::set_balance(Origin::root(), 1, 300, 1_000));
+					// Slashed completed in full
+					assert_eq!(Balances::slash_reserved(&1, 1_300), (NegativeImbalance::new(1_000), 300));
+					// Account is alive because of free balance
+					assert!(System::account_exists(&1));
+
+					/* User has a reference counter, so they cannot die */
+
+					// SCENARIO: Slash would not kill account.
+					assert_ok!(Balances::set_balance(Origin::root(), 1, 50, 1_000));
+					assert_ok!(System::inc_consumers(&1)); // <-- Reference counter added here is enough for all tests
+					// Slashed completed in full
+					assert_eq!(Balances::slash_reserved(&1, 900), (NegativeImbalance::new(900), 0));
+					// Account is still alive
+					assert!(System::account_exists(&1));
+
+					// SCENARIO: Slash as much as possible without killing.
+					assert_ok!(Balances::set_balance(Origin::root(), 1, 50, 1_000));
+					// Slashed as much as possible
+					assert_eq!(Balances::slash_reserved(&1, 1_000), (NegativeImbalance::new(950), 50));
+					// Account is still alive
+					assert!(System::account_exists(&1));
+
+					// SCENARIO: Over-slash reports correctly, where reserved is needed to keep alive.
+					assert_ok!(Balances::set_balance(Origin::root(), 1, 50, 1_000));
+					// Slashed as much as possible
+					assert_eq!(Balances::slash_reserved(&1, 1_300), (NegativeImbalance::new(950), 350));
+					// Account is still alive
+					assert!(System::account_exists(&1));
+
+					// SCENARIO: Over-slash reports correctly, where full reserved is removed.
+					assert_ok!(Balances::set_balance(Origin::root(), 1, 200, 1_000));
+					// Slashed as much as possible
+					assert_eq!(Balances::slash_reserved(&1, 1_300), (NegativeImbalance::new(1_000), 300));
+					// Account is still alive
+					assert!(System::account_exists(&1));
+
+					// Slash on non-existent account is okay.
+					assert_eq!(Balances::slash_reserved(&12345, 1_300), (NegativeImbalance::new(0), 1300));
+				});
+		}
+
 		#[test]
 		fn operations_on_dead_account_should_not_change_state() {
 			// These functions all use `mutate_account` which may introduce a storage change when
@@ -805,7 +963,7 @@ macro_rules! decl_tests {
 				.existential_deposit(0)
 				.build()
 				.execute_with(|| {
-					assert!(!<Test as Config>::AccountStore::is_explicit(&1337));
+					assert!(!frame_system::Account::<Test>::contains_key(&1337));
 
 					// Unreserve
 					assert_storage_noop!(assert_eq!(Balances::unreserve(&1337, 42), 42));
diff --git a/frame/balances/src/tests_local.rs b/frame/balances/src/tests_local.rs
index 887b280945f1..2cbf46709275 100644
--- a/frame/balances/src/tests_local.rs
+++ b/frame/balances/src/tests_local.rs
@@ -74,9 +74,9 @@ impl frame_system::Config for Test {
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
 	type PalletInfo = ();
-	type AccountData = super::AccountData<u64>;
+	type AccountData = ();
 	type OnNewAccount = ();
-	type OnKilledAccount = Module<Test>;
+	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
 }
@@ -99,9 +99,9 @@ impl Config for Test {
 	type ExistentialDeposit = ExistentialDeposit;
 	type AccountStore = StorageMapShim<
 		super::Account<Test>,
-		system::CallOnCreatedAccount<Test>,
-		system::CallKillAccount<Test>,
-		u64, super::AccountData<u64>
+		system::Provider<Test>,
+		u64,
+		super::AccountData<u64>,
 	>;
 	type MaxLocks = MaxLocks;
 	type WeightInfo = ();
@@ -162,7 +162,7 @@ decl_tests!{ Test, ExtBuilder, EXISTENTIAL_DEPOSIT }
 #[test]
 fn emit_events_with_no_existential_deposit_suicide_with_dust() {
 	<ExtBuilder>::default()
-		.existential_deposit(0)
+		.existential_deposit(2)
 		.build()
 		.execute_with(|| {
 			assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 1, 100, 0));
@@ -176,12 +176,12 @@ fn emit_events_with_no_existential_deposit_suicide_with_dust() {
 				]
 			);
 
-			let _ = Balances::slash(&1, 99);
+			let _ = Balances::slash(&1, 98);
 
 			// no events
 			assert_eq!(events(), []);
 
-			assert_ok!(System::suicide(Origin::signed(1)));
+			let _ = Balances::slash(&1, 1);
 
 			assert_eq!(
 				events(),
diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index fdde914b07e0..05b4b0f982a0 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -749,7 +749,7 @@ mod tests {
 				header: Header {
 					parent_hash: [69u8; 32].into(),
 					number: 1,
-					state_root: hex!("ba1a82a264b8007e0c04c9ea35e541593daad08b6e2bf7c0a6780a67d1c55018").into(),
+					state_root: hex!("1599922f15b2d5cf75e83370e29e13b96fdf799d917a5b6319736af292f21665").into(),
 					extrinsics_root: hex!("03170a2e7597b7b7e3d84c05391d139a62b157e78786d8c082f29dcf4c111314").into(),
 					digest: Digest { logs: vec![], },
 				},
diff --git a/frame/grandpa/src/mock.rs b/frame/grandpa/src/mock.rs
index bf4ce5a519e7..fd7230fd9ceb 100644
--- a/frame/grandpa/src/mock.rs
+++ b/frame/grandpa/src/mock.rs
@@ -287,6 +287,14 @@ pub fn new_test_ext_raw_authorities(authorities: AuthorityList) -> sp_io::TestEx
 		.build_storage::<Test>()
 		.unwrap();
 
+	let balances: Vec<_> = (0..authorities.len())
+		.map(|i| (i as u64, 10_000_000))
+		.collect();
+
+	pallet_balances::GenesisConfig::<Test> { balances }
+		.assimilate_storage(&mut t)
+		.unwrap();
+
 	// stashes are the index.
 	let session_keys: Vec<_> = authorities
 		.iter()
@@ -302,6 +310,12 @@ pub fn new_test_ext_raw_authorities(authorities: AuthorityList) -> sp_io::TestEx
 		})
 		.collect();
 
+	// NOTE: this will initialize the grandpa authorities
+	// through OneSessionHandler::on_genesis_session
+	pallet_session::GenesisConfig::<Test> { keys: session_keys }
+		.assimilate_storage(&mut t)
+		.unwrap();
+
 	// controllers are the index + 1000
 	let stakers: Vec<_> = (0..authorities.len())
 		.map(|i| {
@@ -314,20 +328,6 @@ pub fn new_test_ext_raw_authorities(authorities: AuthorityList) -> sp_io::TestEx
 		})
 		.collect();
 
-	let balances: Vec<_> = (0..authorities.len())
-		.map(|i| (i as u64, 10_000_000))
-		.collect();
-
-	// NOTE: this will initialize the grandpa authorities
-	// through OneSessionHandler::on_genesis_session
-	pallet_session::GenesisConfig::<Test> { keys: session_keys }
-		.assimilate_storage(&mut t)
-		.unwrap();
-
-	pallet_balances::GenesisConfig::<Test> { balances }
-		.assimilate_storage(&mut t)
-		.unwrap();
-
 	let staking_config = pallet_staking::GenesisConfig::<Test> {
 		stakers,
 		validator_count: 8,
diff --git a/frame/offences/benchmarking/src/mock.rs b/frame/offences/benchmarking/src/mock.rs
index 8e0bb361e15c..20fd3ba9b067 100644
--- a/frame/offences/benchmarking/src/mock.rs
+++ b/frame/offences/benchmarking/src/mock.rs
@@ -61,7 +61,7 @@ impl frame_system::Config for Test {
 	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
-	type OnKilledAccount = (Balances,);
+	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
 }
diff --git a/frame/proxy/src/tests.rs b/frame/proxy/src/tests.rs
index 6867dd510dd9..3c417647c2cd 100644
--- a/frame/proxy/src/tests.rs
+++ b/frame/proxy/src/tests.rs
@@ -317,7 +317,7 @@ fn proxy_announced_removes_announcement_and_returns_deposit() {
 #[test]
 fn filtering_works() {
 	new_test_ext().execute_with(|| {
-		Balances::mutate_account(&1, |a| a.free = 1000);
+		assert!(Balances::mutate_account(&1, |a| a.free = 1000).is_ok());
 		assert_ok!(Proxy::add_proxy(Origin::signed(1), 2, ProxyType::Any, 0));
 		assert_ok!(Proxy::add_proxy(Origin::signed(1), 3, ProxyType::JustTransfer, 0));
 		assert_ok!(Proxy::add_proxy(Origin::signed(1), 4, ProxyType::JustUtility, 0));
@@ -331,7 +331,7 @@ fn filtering_works() {
 		expect_event(RawEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
 
 		let derivative_id = Utility::derivative_account_id(1, 0);
-		Balances::mutate_account(&derivative_id, |a| a.free = 1000);
+		assert!(Balances::mutate_account(&derivative_id, |a| a.free = 1000).is_ok());
 		let inner = Box::new(Call::Balances(BalancesCall::transfer(6, 1)));
 
 		let call = Box::new(Call::Utility(UtilityCall::as_derivative(0, inner.clone())));
diff --git a/frame/recovery/src/lib.rs b/frame/recovery/src/lib.rs
index 606cb8225077..00cd6ff2a7f7 100644
--- a/frame/recovery/src/lib.rs
+++ b/frame/recovery/src/lib.rs
@@ -317,6 +317,8 @@ decl_error! {
 		Overflow,
 		/// This account is already set up for recovery
 		AlreadyProxy,
+		/// Some internal state is broken.
+		BadState,
 	}
 }
 
@@ -586,9 +588,9 @@ decl_module! {
 				recovery_config.threshold as usize <= active_recovery.friends.len(),
 				Error::<T>::Threshold
 			);
+			system::Module::<T>::inc_consumers(&who).map_err(|_| Error::<T>::BadState)?;
 			// Create the recovery storage item
 			Proxy::<T>::insert(&who, &account);
-			system::Module::<T>::inc_ref(&who);
 			Self::deposit_event(RawEvent::AccountRecovered(account, who));
 		}
 
@@ -675,7 +677,7 @@ decl_module! {
 			// Check `who` is allowed to make a call on behalf of `account`
 			ensure!(Self::proxy(&who) == Some(account), Error::<T>::NotAllowed);
 			Proxy::<T>::remove(&who);
-			system::Module::<T>::dec_ref(&who);
+			system::Module::<T>::dec_consumers(&who);
 		}
 	}
 }
diff --git a/frame/session/benchmarking/src/mock.rs b/frame/session/benchmarking/src/mock.rs
index 31593b3da54b..711cde8e8ecf 100644
--- a/frame/session/benchmarking/src/mock.rs
+++ b/frame/session/benchmarking/src/mock.rs
@@ -65,7 +65,7 @@ impl frame_system::Config for Test {
 	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
-	type OnKilledAccount = Balances;
+	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
 }
diff --git a/frame/session/src/historical/mod.rs b/frame/session/src/historical/mod.rs
index 85d7c3f3f349..48f32af7b474 100644
--- a/frame/session/src/historical/mod.rs
+++ b/frame/session/src/historical/mod.rs
@@ -327,16 +327,21 @@ pub(crate) mod tests {
 		set_next_validators, Test, System, Session,
 	};
 	use frame_support::traits::{KeyOwnerProofSystem, OnInitialize};
+	use frame_support::BasicExternalities;
 
 	type Historical = Module<Test>;
 
 	pub(crate) fn new_test_ext() -> sp_io::TestExternalities {
 		let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-		crate::GenesisConfig::<Test> {
-			keys: NEXT_VALIDATORS.with(|l|
-				l.borrow().iter().cloned().map(|i| (i, i, UintAuthorityId(i).into())).collect()
-			),
-		}.assimilate_storage(&mut t).unwrap();
+		let keys: Vec<_> = NEXT_VALIDATORS.with(|l|
+			l.borrow().iter().cloned().map(|i| (i, i, UintAuthorityId(i).into())).collect()
+		);
+		BasicExternalities::execute_with_storage(&mut t, || {
+			for (ref k, ..) in &keys {
+				frame_system::Module::<Test>::inc_providers(k);
+			}
+		});
+		crate::GenesisConfig::<Test> { keys }.assimilate_storage(&mut t).unwrap();
 		sp_io::TestExternalities::new(t)
 	}
 
diff --git a/frame/session/src/historical/offchain.rs b/frame/session/src/historical/offchain.rs
index 7a636c6e14c8..38cf09124ccf 100644
--- a/frame/session/src/historical/offchain.rs
+++ b/frame/session/src/historical/offchain.rs
@@ -152,28 +152,27 @@ mod tests {
 	};
 
 	use sp_runtime::testing::UintAuthorityId;
+	use frame_support::BasicExternalities;
 
 	type Historical = Module<Test>;
 
 	pub fn new_test_ext() -> sp_io::TestExternalities {
-		let mut ext = frame_system::GenesisConfig::default()
+		let mut t = frame_system::GenesisConfig::default()
 			.build_storage::<Test>()
 			.expect("Failed to create test externalities.");
 
-		crate::GenesisConfig::<Test> {
-			keys: NEXT_VALIDATORS.with(|l| {
-				l.borrow()
-					.iter()
-					.cloned()
-					.map(|i| (i, i, UintAuthorityId(i).into()))
-					.collect()
-			}),
-		}
-		.assimilate_storage(&mut ext)
-		.unwrap();
+		let keys: Vec<_> = NEXT_VALIDATORS.with(|l|
+			l.borrow().iter().cloned().map(|i| (i, i, UintAuthorityId(i).into())).collect()
+		);
+		BasicExternalities::execute_with_storage(&mut t, || {
+			for (ref k, ..) in &keys {
+				frame_system::Module::<Test>::inc_providers(k);
+			}
+		});
 
+		crate::GenesisConfig::<Test>{ keys }.assimilate_storage(&mut t).unwrap();
 
-		let mut ext = sp_io::TestExternalities::new(ext);
+		let mut ext = sp_io::TestExternalities::new(t);
 
 		let (offchain, offchain_state) = TestOffchainExt::with_offchain_db(ext.offchain_db());
 
diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs
index 90eba3815a7a..74105ade15f1 100644
--- a/frame/session/src/lib.rs
+++ b/frame/session/src/lib.rs
@@ -444,7 +444,7 @@ decl_storage! {
 			for (account, val, keys) in config.keys.iter().cloned() {
 				<Module<T>>::inner_set_keys(&val, keys)
 					.expect("genesis config must not contain duplicates; qed");
-				frame_system::Module::<T>::inc_ref(&account);
+				assert!(frame_system::Module::<T>::inc_consumers(&account).is_ok());
 			}
 
 			let initial_validators_0 = T::SessionManager::new_session(0)
@@ -498,6 +498,8 @@ decl_error! {
 		DuplicatedKey,
 		/// No keys are associated with this account.
 		NoKeys,
+		/// Key setting account is not live, so it's impossible to associate keys.
+		NoAccount,
 	}
 }
 
@@ -746,9 +748,11 @@ impl<T: Config> Module<T> {
 		let who = T::ValidatorIdOf::convert(account.clone())
 			.ok_or(Error::<T>::NoAssociatedValidatorId)?;
 
+		frame_system::Module::<T>::inc_consumers(&account).map_err(|_| Error::<T>::NoAccount)?;
 		let old_keys = Self::inner_set_keys(&who, keys)?;
-		if old_keys.is_none() {
-			frame_system::Module::<T>::inc_ref(&account);
+		if old_keys.is_some() {
+			let _ = frame_system::Module::<T>::dec_consumers(&account);
+			// ^^^ Defensive only; Consumers were incremented just before, so should never fail.
 		}
 
 		Ok(())
@@ -796,7 +800,7 @@ impl<T: Config> Module<T> {
 			let key_data = old_keys.get_raw(*id);
 			Self::clear_key_owner(*id, key_data);
 		}
-		frame_system::Module::<T>::dec_ref(&account);
+		frame_system::Module::<T>::dec_consumers(&account);
 
 		Ok(())
 	}
diff --git a/frame/session/src/mock.rs b/frame/session/src/mock.rs
index 3201500ee640..2923530daf41 100644
--- a/frame/session/src/mock.rs
+++ b/frame/session/src/mock.rs
@@ -19,7 +19,7 @@
 
 use super::*;
 use std::cell::RefCell;
-use frame_support::{impl_outer_origin, parameter_types};
+use frame_support::{impl_outer_origin, parameter_types, BasicExternalities};
 use sp_core::{crypto::key_types::DUMMY, H256};
 use sp_runtime::{
 	Perbill, impl_opaque_keys,
@@ -178,11 +178,18 @@ pub fn reset_before_session_end_called() {
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-	GenesisConfig::<Test> {
-		keys: NEXT_VALIDATORS.with(|l|
-			l.borrow().iter().cloned().map(|i| (i, i, UintAuthorityId(i).into())).collect()
-		),
-	}.assimilate_storage(&mut t).unwrap();
+	let keys: Vec<_> = NEXT_VALIDATORS.with(|l|
+		l.borrow().iter().cloned().map(|i| (i, i, UintAuthorityId(i).into())).collect()
+	);
+	BasicExternalities::execute_with_storage(&mut t, || {
+		for (ref k, ..) in &keys {
+			frame_system::Module::<Test>::inc_providers(k);
+		}
+		frame_system::Module::<Test>::inc_providers(&4);
+		// An additional identity that we use.
+		frame_system::Module::<Test>::inc_providers(&69);
+	});
+	GenesisConfig::<Test> { keys }.assimilate_storage(&mut t).unwrap();
 	sp_io::TestExternalities::new(t)
 }
 
diff --git a/frame/session/src/tests.rs b/frame/session/src/tests.rs
index 4ef3bb9f9802..7c1d3c9dcdd2 100644
--- a/frame/session/src/tests.rs
+++ b/frame/session/src/tests.rs
@@ -60,9 +60,9 @@ fn keys_cleared_on_kill() {
 		let id = DUMMY;
 		assert_eq!(Session::key_owner(id, UintAuthorityId(1).get_raw(id)), Some(1));
 
-		assert!(!System::allow_death(&1));
+		assert!(System::is_provider_required(&1));
 		assert_ok!(Session::purge_keys(Origin::signed(1)));
-		assert!(System::allow_death(&1));
+		assert!(!System::is_provider_required(&1));
 
 		assert_eq!(Session::load_keys(&1), None);
 		assert_eq!(Session::key_owner(id, UintAuthorityId(1).get_raw(id)), None);
diff --git a/frame/staking/fuzzer/src/mock.rs b/frame/staking/fuzzer/src/mock.rs
index b3c9dd9f57b6..75e67fa36518 100644
--- a/frame/staking/fuzzer/src/mock.rs
+++ b/frame/staking/fuzzer/src/mock.rs
@@ -63,7 +63,7 @@ impl frame_system::Config for Test {
 	type PalletInfo = ();
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
-	type OnKilledAccount = (Balances,);
+	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
 }
diff --git a/frame/staking/src/benchmarking.rs b/frame/staking/src/benchmarking.rs
index 29e71f953986..df2095e85880 100644
--- a/frame/staking/src/benchmarking.rs
+++ b/frame/staking/src/benchmarking.rs
@@ -397,7 +397,7 @@ benchmarks! {
 		let s in 1 .. MAX_SPANS;
 		let (stash, controller) = create_stash_controller::<T>(0, 100, Default::default())?;
 		add_slashing_spans::<T>(&stash, s);
-		T::Currency::make_free_balance_be(&stash, 0u32.into());
+		T::Currency::make_free_balance_be(&stash, T::Currency::minimum_balance());
 		whitelist_account!(controller);
 	}: _(RawOrigin::Signed(controller), stash.clone(), s)
 	verify {
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 795f222158e0..99c1fe842a23 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -1222,6 +1222,8 @@ decl_error! {
 		IncorrectHistoryDepth,
 		/// Incorrect number of slashing spans provided.
 		IncorrectSlashingSpans,
+		/// Internal state has become somehow corrupted and the operation cannot continue.
+		BadState,
 	}
 }
 
@@ -1423,13 +1425,13 @@ decl_module! {
 				Err(Error::<T>::InsufficientValue)?
 			}
 
+			system::Module::<T>::inc_consumers(&stash).map_err(|_| Error::<T>::BadState)?;
+
 			// You're auto-bonded forever, here. We might improve this by only bonding when
 			// you actually validate/nominate and remove once you unbond __everything__.
 			<Bonded<T>>::insert(&stash, &controller);
 			<Payee<T>>::insert(&stash, payee);
 
-			system::Module::<T>::inc_ref(&stash);
-
 			let current_era = CurrentEra::get().unwrap_or(0);
 			let history_depth = Self::history_depth();
 			let last_reward_era = current_era.saturating_sub(history_depth);
@@ -2028,9 +2030,9 @@ decl_module! {
 			}
 		}
 
-		/// Remove all data structure concerning a staker/stash once its balance is zero.
+		/// Remove all data structure concerning a staker/stash once its balance is at the minimum.
 		/// This is essentially equivalent to `withdraw_unbonded` except it can be called by anyone
-		/// and the target `stash` must have no funds left.
+		/// and the target `stash` must have no funds left beyond the ED.
 		///
 		/// This can be called from any origin.
 		///
@@ -2045,7 +2047,8 @@ decl_module! {
 		/// # </weight>
 		#[weight = T::WeightInfo::reap_stash(*num_slashing_spans)]
 		fn reap_stash(_origin, stash: T::AccountId, num_slashing_spans: u32) {
-			ensure!(T::Currency::total_balance(&stash).is_zero(), Error::<T>::FundedTarget);
+			let at_minimum = T::Currency::total_balance(&stash) == T::Currency::minimum_balance();
+			ensure!(at_minimum, Error::<T>::FundedTarget);
 			Self::kill_stash(&stash, num_slashing_spans)?;
 			T::Currency::remove_lock(STAKING_ID, &stash);
 		}
@@ -3007,7 +3010,7 @@ impl<T: Config> Module<T> {
 		<Validators<T>>::remove(stash);
 		<Nominators<T>>::remove(stash);
 
-		system::Module::<T>::dec_ref(stash);
+		system::Module::<T>::dec_consumers(stash);
 
 		Ok(())
 	}
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index 048806b06239..b8e756a49407 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -395,6 +395,8 @@ impl ExtBuilder {
 		};
 
 		let num_validators = self.num_validators.unwrap_or(self.validator_count);
+		// Check that the number of validators is sensible.
+		assert!(num_validators <= 8);
 		let validators = (0..num_validators)
 			.map(|x| ((x + 1) * 10 + 1) as AccountId)
 			.collect::<Vec<_>>();
@@ -413,6 +415,14 @@ impl ExtBuilder {
 				(31, balance_factor * 2000),
 				(40, balance_factor),
 				(41, balance_factor * 2000),
+				(50, balance_factor),
+				(51, balance_factor * 2000),
+				(60, balance_factor),
+				(61, balance_factor * 2000),
+				(70, balance_factor),
+				(71, balance_factor * 2000),
+				(80, balance_factor),
+				(81, balance_factor * 2000),
 				(100, 2000 * balance_factor),
 				(101, 2000 * balance_factor),
 				// This allows us to have a total_payout different from 0.
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index bf0b2bf0da48..914aff9c4524 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -1540,7 +1540,7 @@ fn on_free_balance_zero_stash_removes_validator() {
 		// Reduce free_balance of stash to 0
 		let _ = Balances::slash(&11, Balance::max_value());
 		// Check total balance of stash
-		assert_eq!(Balances::total_balance(&11), 0);
+		assert_eq!(Balances::total_balance(&11), 10);
 
 		// Reap the stash
 		assert_ok!(Staking::reap_stash(Origin::none(), 11, 0));
@@ -1596,7 +1596,7 @@ fn on_free_balance_zero_stash_removes_nominator() {
 		// Reduce free_balance of stash to 0
 		let _ = Balances::slash(&11, Balance::max_value());
 		// Check total balance of stash
-		assert_eq!(Balances::total_balance(&11), 0);
+		assert_eq!(Balances::total_balance(&11), 10);
 
 		// Reap the stash
 		assert_ok!(Staking::reap_stash(Origin::none(), 11, 0));
@@ -2454,8 +2454,8 @@ fn garbage_collection_after_slashing() {
 		// validator and nominator slash in era are garbage-collected by era change,
 		// so we don't test those here.
 
-		assert_eq!(Balances::free_balance(11), 0);
-		assert_eq!(Balances::total_balance(&11), 0);
+		assert_eq!(Balances::free_balance(11), 2);
+		assert_eq!(Balances::total_balance(&11), 2);
 
 		let slashing_spans = <Staking as crate::Store>::SlashingSpans::get(&11).unwrap();
 		assert_eq!(slashing_spans.iter().count(), 2);
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index 0b2d3bceea5e..1d3048cc9c0b 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -27,7 +27,7 @@ use sp_runtime::{
 	traits::{
 		MaybeSerializeDeserialize, AtLeast32Bit, Saturating, TrailingZeroInput, Bounded, Zero,
 		BadOrigin, AtLeast32BitUnsigned, UniqueSaturatedFrom, UniqueSaturatedInto,
-		SaturatedConversion,
+		SaturatedConversion, StoredMapError,
 	},
 };
 use crate::dispatch::Parameter;
@@ -300,42 +300,61 @@ mod test_impl_filter_stack {
 
 /// An abstraction of a value stored within storage, but possibly as part of a larger composite
 /// item.
-pub trait StoredMap<K, T> {
+pub trait StoredMap<K, T: Default> {
 	/// Get the item, or its default if it doesn't yet exist; we make no distinction between the
 	/// two.
 	fn get(k: &K) -> T;
-	/// Get whether the item takes up any storage. If this is `false`, then `get` will certainly
-	/// return the `T::default()`. If `true`, then there is no implication for `get` (i.e. it
-	/// may return any value, including the default).
-	///
-	/// NOTE: This may still be `true`, even after `remove` is called. This is the case where
-	/// a single storage entry is shared between multiple `StoredMap` items single, without
-	/// additional logic to enforce it, deletion of any one them doesn't automatically imply
-	/// deletion of them all.
-	fn is_explicit(k: &K) -> bool;
-	/// Mutate the item.
-	fn mutate<R>(k: &K, f: impl FnOnce(&mut T) -> R) -> R;
-	/// Mutate the item, removing or resetting to default value if it has been mutated to `None`.
-	fn mutate_exists<R>(k: &K, f: impl FnOnce(&mut Option<T>) -> R) -> R;
+
 	/// Maybe mutate the item only if an `Ok` value is returned from `f`. Do nothing if an `Err` is
 	/// returned. It is removed or reset to default value if it has been mutated to `None`
-	fn try_mutate_exists<R, E>(k: &K, f: impl FnOnce(&mut Option<T>) -> Result<R, E>) -> Result<R, E>;
+	fn try_mutate_exists<R, E: From<StoredMapError>>(
+		k: &K,
+		f: impl FnOnce(&mut Option<T>) -> Result<R, E>,
+	) -> Result<R, E>;
+
+	// Everything past here has a default implementation.
+
+	/// Mutate the item.
+	fn mutate<R>(k: &K, f: impl FnOnce(&mut T) -> R) -> Result<R, StoredMapError> {
+		Self::mutate_exists(k, |maybe_account| match maybe_account {
+			Some(ref mut account) => f(account),
+			x @ None => {
+				let mut account = Default::default();
+				let r = f(&mut account);
+				*x = Some(account);
+				r
+			}
+		})
+	}
+
+	/// Mutate the item, removing or resetting to default value if it has been mutated to `None`.
+	///
+	/// This is infallible as long as the value does not get destroyed.
+	fn mutate_exists<R>(
+		k: &K,
+		f: impl FnOnce(&mut Option<T>) -> R,
+	) -> Result<R, StoredMapError> {
+		Self::try_mutate_exists(k, |x| -> Result<R, StoredMapError> { Ok(f(x)) })
+	}
+
 	/// Set the item to something new.
-	fn insert(k: &K, t: T) { Self::mutate(k, |i| *i = t); }
+	fn insert(k: &K, t: T) -> Result<(), StoredMapError> { Self::mutate(k, |i| *i = t) }
+
 	/// Remove the item or otherwise replace it with its default value; we don't care which.
-	fn remove(k: &K);
+	fn remove(k: &K) -> Result<(), StoredMapError> { Self::mutate_exists(k, |x| *x = None) }
 }
 
 /// A simple, generic one-parameter event notifier/handler.
-pub trait Happened<T> {
-	/// The thing happened.
-	fn happened(t: &T);
-}
+pub trait HandleLifetime<T> {
+	/// An account was created.
+	fn created(_t: &T) -> Result<(), StoredMapError> { Ok(()) }
 
-impl<T> Happened<T> for () {
-	fn happened(_: &T) {}
+	/// An account was killed.
+	fn killed(_t: &T) -> Result<(), StoredMapError> { Ok(()) }
 }
 
+impl<T> HandleLifetime<T> for () {}
+
 /// A shim for placing around a storage item in order to use it as a `StoredValue`. Ideally this
 /// wouldn't be needed as `StorageValue`s should blanket implement `StoredValue`s, however this
 /// would break the ability to have custom impls of `StoredValue`. The other workaround is to
@@ -347,68 +366,63 @@ impl<T> Happened<T> for () {
 /// be the default value), or where the account is being removed or reset back to the default value
 /// where previously it did exist (though may have been in a default state). This works well with
 /// system module's `CallOnCreatedAccount` and `CallKillAccount`.
-pub struct StorageMapShim<
-	S,
-	Created,
-	Removed,
-	K,
-	T
->(sp_std::marker::PhantomData<(S, Created, Removed, K, T)>);
+pub struct StorageMapShim<S, L, K, T>(sp_std::marker::PhantomData<(S, L, K, T)>);
 impl<
 	S: StorageMap<K, T, Query=T>,
-	Created: Happened<K>,
-	Removed: Happened<K>,
+	L: HandleLifetime<K>,
 	K: FullCodec,
-	T: FullCodec,
-> StoredMap<K, T> for StorageMapShim<S, Created, Removed, K, T> {
+	T: FullCodec + Default,
+> StoredMap<K, T> for StorageMapShim<S, L, K, T> {
 	fn get(k: &K) -> T { S::get(k) }
-	fn is_explicit(k: &K) -> bool { S::contains_key(k) }
-	fn insert(k: &K, t: T) {
-		let existed = S::contains_key(&k);
-		S::insert(k, t);
-		if !existed {
-			Created::happened(k);
+	fn insert(k: &K, t: T) -> Result<(), StoredMapError> {
+		if !S::contains_key(&k) {
+			L::created(k)?;
 		}
+		S::insert(k, t);
+		Ok(())
 	}
-	fn remove(k: &K) {
-		let existed = S::contains_key(&k);
-		S::remove(k);
-		if existed {
-			Removed::happened(&k);
+	fn remove(k: &K) -> Result<(), StoredMapError> {
+		if S::contains_key(&k) {
+			L::killed(&k)?;
+			S::remove(k);
 		}
+		Ok(())
 	}
-	fn mutate<R>(k: &K, f: impl FnOnce(&mut T) -> R) -> R {
-		let existed = S::contains_key(&k);
-		let r = S::mutate(k, f);
-		if !existed {
-			Created::happened(k);
+	fn mutate<R>(k: &K, f: impl FnOnce(&mut T) -> R) -> Result<R, StoredMapError> {
+		if !S::contains_key(&k) {
+			L::created(k)?;
 		}
-		r
+		Ok(S::mutate(k, f))
 	}
-	fn mutate_exists<R>(k: &K, f: impl FnOnce(&mut Option<T>) -> R) -> R {
-		let (existed, exists, r) = S::mutate_exists(k, |maybe_value| {
+	fn mutate_exists<R>(k: &K, f: impl FnOnce(&mut Option<T>) -> R) -> Result<R, StoredMapError> {
+		S::try_mutate_exists(k, |maybe_value| {
 			let existed = maybe_value.is_some();
 			let r = f(maybe_value);
-			(existed, maybe_value.is_some(), r)
-		});
-		if !existed && exists {
-			Created::happened(k);
-		} else if existed && !exists {
-			Removed::happened(k);
-		}
-		r
+			let exists = maybe_value.is_some();
+
+			if !existed && exists {
+				L::created(k)?;
+			} else if existed && !exists {
+				L::killed(k)?;
+			}
+			Ok(r)
+		})
 	}
-	fn try_mutate_exists<R, E>(k: &K, f: impl FnOnce(&mut Option<T>) -> Result<R, E>) -> Result<R, E> {
+	fn try_mutate_exists<R, E: From<StoredMapError>>(
+		k: &K,
+		f: impl FnOnce(&mut Option<T>) -> Result<R, E>,
+	) -> Result<R, E> {
 		S::try_mutate_exists(k, |maybe_value| {
 			let existed = maybe_value.is_some();
-			f(maybe_value).map(|v| (existed, maybe_value.is_some(), v))
-		}).map(|(existed, exists, v)| {
+			let r = f(maybe_value)?;
+			let exists = maybe_value.is_some();
+
 			if !existed && exists {
-				Created::happened(k);
+				L::created(k).map_err(E::from)?;
 			} else if existed && !exists {
-				Removed::happened(k);
+				L::killed(k).map_err(E::from)?;
 			}
-			v
+			Ok(r)
 		})
 	}
 }
@@ -507,18 +521,6 @@ pub trait ContainsLengthBound {
 	fn max_len() -> usize;
 }
 
-/// Determiner to say whether a given account is unused.
-pub trait IsDeadAccount<AccountId> {
-	/// Is the given account dead?
-	fn is_dead_account(who: &AccountId) -> bool;
-}
-
-impl<AccountId> IsDeadAccount<AccountId> for () {
-	fn is_dead_account(_who: &AccountId) -> bool {
-		true
-	}
-}
-
 /// Handler for when a new account has been created.
 #[impl_for_tuples(30)]
 pub trait OnNewAccount<AccountId> {
diff --git a/frame/system/benchmarking/src/lib.rs b/frame/system/benchmarking/src/lib.rs
index 57ae99886295..9ff749950ab5 100644
--- a/frame/system/benchmarking/src/lib.rs
+++ b/frame/system/benchmarking/src/lib.rs
@@ -26,11 +26,11 @@ use sp_core::{ChangesTrieConfiguration, storage::well_known_keys};
 use sp_runtime::traits::Hash;
 use frame_benchmarking::{benchmarks, whitelisted_caller};
 use frame_support::{
-	storage::{self, StorageMap},
+	storage,
 	traits::Get,
 	weights::DispatchClass,
 };
-use frame_system::{Module as System, Call, RawOrigin, DigestItemOf, AccountInfo};
+use frame_system::{Module as System, Call, RawOrigin, DigestItemOf};
 
 mod mock;
 
@@ -136,22 +136,6 @@ benchmarks! {
 	verify {
 		assert_eq!(storage::unhashed::get_raw(&last_key), None);
 	}
-
-	suicide {
-		let caller: T::AccountId = whitelisted_caller();
-		let account_info = AccountInfo::<T::Index, T::AccountData> {
-			nonce: 1337u32.into(),
-			refcount: 0,
-			data: T::AccountData::default()
-		};
-		frame_system::Account::<T>::insert(&caller, account_info);
-		let new_account_info = System::<T>::account(caller.clone());
-		assert_eq!(new_account_info.nonce, 1337u32.into());
-	}: _(RawOrigin::Signed(caller.clone()))
-	verify {
-		let account_info = System::<T>::account(&caller);
-		assert_eq!(account_info.nonce, 0u32.into());
-	}
 }
 
 #[cfg(test)]
@@ -170,7 +154,6 @@ mod tests {
 			assert_ok!(test_benchmark_set_storage::<Test>());
 			assert_ok!(test_benchmark_kill_storage::<Test>());
 			assert_ok!(test_benchmark_kill_prefix::<Test>());
-			assert_ok!(test_benchmark_suicide::<Test>());
 		});
 	}
 }
diff --git a/frame/system/src/extensions/check_nonce.rs b/frame/system/src/extensions/check_nonce.rs
index 0c610506d661..c5d0e5242b48 100644
--- a/frame/system/src/extensions/check_nonce.rs
+++ b/frame/system/src/extensions/check_nonce.rs
@@ -129,7 +129,8 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			crate::Account::<Test>::insert(1, crate::AccountInfo {
 				nonce: 1,
-				refcount: 0,
+				consumers: 0,
+				providers: 0,
 				data: 0,
 			});
 			let info = DispatchInfo::default();
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index 463712ba68df..0efa511e99b5 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -97,7 +97,6 @@ use serde::Serialize;
 use sp_std::prelude::*;
 #[cfg(any(feature = "std", test))]
 use sp_std::map;
-use sp_std::convert::Infallible;
 use sp_std::marker::PhantomData;
 use sp_std::fmt::Debug;
 use sp_version::RuntimeVersion;
@@ -107,17 +106,16 @@ use sp_runtime::{
 		self, CheckEqual, AtLeast32Bit, Zero, Lookup, LookupError,
 		SimpleBitOps, Hash, Member, MaybeDisplay, BadOrigin,
 		MaybeSerialize, MaybeSerializeDeserialize, MaybeMallocSizeOf, StaticLookup, One, Bounded,
-		Dispatchable, AtLeast32BitUnsigned, Saturating,
+		Dispatchable, AtLeast32BitUnsigned, Saturating, StoredMapError,
 	},
 	offchain::storage_lock::BlockNumberProvider,
 };
 
 use sp_core::{ChangesTrieConfiguration, storage::well_known_keys};
 use frame_support::{
-	decl_module, decl_event, decl_storage, decl_error, Parameter, ensure, debug,
-	storage,
+	decl_module, decl_event, decl_storage, decl_error, Parameter, debug, storage,
 	traits::{
-		Contains, Get, PalletInfo, OnNewAccount, OnKilledAccount, IsDeadAccount, Happened,
+		Contains, Get, PalletInfo, OnNewAccount, OnKilledAccount, HandleLifetime,
 		StoredMap, EnsureOrigin, OriginTrait, Filter,
 	},
 	weights::{
@@ -352,7 +350,10 @@ pub struct AccountInfo<Index, AccountData> {
 	pub nonce: Index,
 	/// The number of other modules that currently depend on this account's existence. The account
 	/// cannot be reaped until this is zero.
-	pub refcount: RefCount,
+	pub consumers: RefCount,
+	/// The number of other modules that allow this account to exist. The account may not be reaped
+	/// until this is zero.
+	pub providers: RefCount,
 	/// The additional data that belongs to this account. Used to store the balance(s) in a lot of
 	/// chains.
 	pub data: AccountData,
@@ -445,6 +446,10 @@ decl_storage! {
 		/// True if we have upgraded so that `type RefCount` is `u32`. False (default) if not.
 		UpgradedToU32RefCount build(|_| true): bool;
 
+		/// True if we have upgraded so that AccountInfo contains two types of `RefCount`. False
+		/// (default) if not.
+		UpgradedToDualRefCount build(|_| true): bool;
+
 		/// The execution phase of the block.
 		ExecutionPhase: Option<Phase>;
 	}
@@ -505,6 +510,25 @@ decl_error! {
 	}
 }
 
+mod migrations {
+	use super::*;
+
+	#[allow(dead_code)]
+	pub fn migrate_all<T: Config>() -> frame_support::weights::Weight {
+		Account::<T>::translate::<(T::Index, u8, T::AccountData), _>(|_key, (nonce, rc, data)|
+			Some(AccountInfo { nonce, consumers: rc as RefCount, providers: 1, data })
+		);
+		T::BlockWeights::get().max_block
+	}
+
+	pub fn migrate_to_dual_ref_count<T: Config>() -> frame_support::weights::Weight {
+		Account::<T>::translate::<(T::Index, RefCount, T::AccountData), _>(|_key, (nonce, rc, data)|
+			Some(AccountInfo { nonce, consumers: rc as RefCount, providers: 1, data })
+		);
+		T::BlockWeights::get().max_block
+	}
+}
+
 /// Pallet struct placeholder on which is implemented the pallet logic.
 ///
 /// It is currently an alias for `Module` as old macros still generate/use old name.
@@ -531,12 +555,9 @@ decl_module! {
 		const SS58Prefix: u8 = T::SS58Prefix::get();
 
 		fn on_runtime_upgrade() -> frame_support::weights::Weight {
-			if !UpgradedToU32RefCount::get() {
-				Account::<T>::translate::<(T::Index, u8, T::AccountData), _>(|_key, (nonce, rc, data)|
-					Some(AccountInfo { nonce, refcount: rc as RefCount, data })
-				);
-				UpgradedToU32RefCount::put(true);
-				T::BlockWeights::get().max_block
+			if !UpgradedToDualRefCount::get() {
+				UpgradedToDualRefCount::put(true);
+				migrations::migrate_to_dual_ref_count::<T>()
 			} else {
 				0
 			}
@@ -700,25 +721,6 @@ decl_module! {
 			ensure_root(origin)?;
 			storage::unhashed::kill_prefix(&prefix);
 		}
-
-		/// Kill the sending account, assuming there are no references outstanding and the composite
-		/// data is equal to its default value.
-		///
-		/// # <weight>
-		/// - `O(1)`
-		/// - 1 storage read and deletion.
-		/// --------------------
-		/// Base Weight: 8.626 µs
-		/// No DB Read or Write operations because caller is already in overlay
-		/// # </weight>
-		#[weight = (T::SystemWeightInfo::suicide(), DispatchClass::Operational)]
-		pub fn suicide(origin) {
-			let who = ensure_signed(origin)?;
-			let account = Account::<T>::get(&who);
-			ensure!(account.refcount == 0, Error::<T>::NonZeroRefCount);
-			ensure!(account.data == T::AccountData::default(), Error::<T>::NonDefaultComposite);
-			Self::kill_account(&who);
-		}
 	}
 }
 
@@ -894,40 +896,162 @@ impl Default for InitKind {
 }
 
 /// Reference status; can be either referenced or unreferenced.
+#[derive(RuntimeDebug)]
 pub enum RefStatus {
 	Referenced,
 	Unreferenced,
 }
 
-impl<T: Config> Module<T> {
-	/// Deposits an event into this block's event record.
-	pub fn deposit_event(event: impl Into<T::Event>) {
-		Self::deposit_event_indexed(&[], event.into());
-	}
+/// Some resultant status relevant to incrementing a provider reference.
+#[derive(RuntimeDebug)]
+pub enum IncRefStatus {
+	/// Account was created.
+	Created,
+	/// Account already existed.
+	Existed,
+}
+
+/// Some resultant status relevant to decrementing a provider reference.
+#[derive(RuntimeDebug)]
+pub enum DecRefStatus {
+	/// Account was destroyed.
+	Reaped,
+	/// Account still exists.
+	Exists,
+}
+
+/// Some resultant status relevant to decrementing a provider reference.
+#[derive(RuntimeDebug)]
+pub enum DecRefError {
+	/// Account cannot have the last provider reference removed while there is a consumer.
+	ConsumerRemaining,
+}
 
+/// Some resultant status relevant to incrementing a provider reference.
+#[derive(RuntimeDebug)]
+pub enum IncRefError {
+	/// Account cannot introduce a consumer while there are no providers.
+	NoProviders,
+}
+
+impl<T: Config> Module<T> {
 	pub fn account_exists(who: &T::AccountId) -> bool {
 		Account::<T>::contains_key(who)
 	}
 
 	/// Increment the reference counter on an account.
+	#[deprecated = "Use `inc_consumers` instead"]
 	pub fn inc_ref(who: &T::AccountId) {
-		Account::<T>::mutate(who, |a| a.refcount = a.refcount.saturating_add(1));
+		let _ = Self::inc_consumers(who);
 	}
 
 	/// Decrement the reference counter on an account. This *MUST* only be done once for every time
-	/// you called `inc_ref` on `who`.
+	/// you called `inc_consumers` on `who`.
+	#[deprecated = "Use `dec_consumers` instead"]
 	pub fn dec_ref(who: &T::AccountId) {
-		Account::<T>::mutate(who, |a| a.refcount = a.refcount.saturating_sub(1));
+		let _ = Self::dec_consumers(who);
 	}
 
 	/// The number of outstanding references for the account `who`.
+	#[deprecated = "Use `consumers` instead"]
 	pub fn refs(who: &T::AccountId) -> RefCount {
-		Account::<T>::get(who).refcount
+		Self::consumers(who)
 	}
 
 	/// True if the account has no outstanding references.
+	#[deprecated = "Use `!is_provider_required` instead"]
 	pub fn allow_death(who: &T::AccountId) -> bool {
-		Account::<T>::get(who).refcount == 0
+		!Self::is_provider_required(who)
+	}
+
+	/// Increment the reference counter on an account.
+	///
+	/// The account `who`'s `providers` must be non-zero or this will return an error.
+	pub fn inc_providers(who: &T::AccountId) -> IncRefStatus {
+		Account::<T>::mutate(who, |a| if a.providers == 0 {
+			// Account is being created.
+			a.providers = 1;
+			Self::on_created_account(who.clone(), a);
+			IncRefStatus::Created
+		} else {
+			a.providers = a.providers.saturating_add(1);
+			IncRefStatus::Existed
+		})
+	}
+
+	/// Decrement the reference counter on an account. This *MUST* only be done once for every time
+	/// you called `inc_consumers` on `who`.
+	pub fn dec_providers(who: &T::AccountId) -> Result<DecRefStatus, DecRefError> {
+		Account::<T>::try_mutate_exists(who, |maybe_account| {
+			if let Some(mut account) = maybe_account.take() {
+				match (account.providers, account.consumers) {
+					(0, _) => {
+						// Logic error - cannot decrement beyond zero and no item should
+						// exist with zero providers.
+						debug::print!("Logic error: Unexpected underflow in reducing provider");
+						Ok(DecRefStatus::Reaped)
+					},
+					(1, 0) => {
+						Module::<T>::on_killed_account(who.clone());
+						Ok(DecRefStatus::Reaped)
+					}
+					(1, _) => {
+						// Cannot remove last provider if there are consumers.
+						Err(DecRefError::ConsumerRemaining)
+					}
+					(x, _) => {
+						account.providers = x - 1;
+						*maybe_account = Some(account);
+						Ok(DecRefStatus::Exists)
+					}
+				}
+			} else {
+				debug::print!("Logic error: Account already dead when reducing provider");
+				Ok(DecRefStatus::Reaped)
+			}
+		})
+	}
+
+	/// The number of outstanding references for the account `who`.
+	pub fn providers(who: &T::AccountId) -> RefCount {
+		Account::<T>::get(who).providers
+	}
+
+	/// Increment the reference counter on an account.
+	///
+	/// The account `who`'s `providers` must be non-zero or this will return an error.
+	pub fn inc_consumers(who: &T::AccountId) -> Result<(), IncRefError> {
+		Account::<T>::try_mutate(who, |a| if a.providers > 0 {
+			a.consumers = a.consumers.saturating_add(1);
+			Ok(())
+		} else {
+			Err(IncRefError::NoProviders)
+		})
+	}
+
+	/// Decrement the reference counter on an account. This *MUST* only be done once for every time
+	/// you called `inc_consumers` on `who`.
+	pub fn dec_consumers(who: &T::AccountId) {
+		Account::<T>::mutate(who, |a| if a.consumers > 0 {
+			a.consumers -= 1;
+		} else {
+			debug::print!("Logic error: Unexpected underflow in reducing consumer");
+		})
+	}
+
+	/// The number of outstanding references for the account `who`.
+	pub fn consumers(who: &T::AccountId) -> RefCount {
+		Account::<T>::get(who).consumers
+	}
+
+	/// True if the account has some outstanding references.
+	pub fn is_provider_required(who: &T::AccountId) -> bool {
+		Account::<T>::get(who).consumers != 0
+	}
+
+	/// Deposits an event into this block's event record.
+	pub fn deposit_event(event: impl Into<T::Event>) {
+		Self::deposit_event_indexed(&[], event.into());
 	}
 
 	/// Deposits an event into this block's event record adding this event
@@ -1196,7 +1320,7 @@ impl<T: Config> Module<T> {
 	}
 
 	/// An account is being created.
-	pub fn on_created_account(who: T::AccountId) {
+	pub fn on_created_account(who: T::AccountId, _a: &mut AccountInfo<T::Index, T::AccountData>) {
 		T::OnNewAccount::on_new_account(&who);
 		Self::deposit_event(RawEvent::NewAccount(who));
 	}
@@ -1207,24 +1331,6 @@ impl<T: Config> Module<T> {
 		Self::deposit_event(RawEvent::KilledAccount(who));
 	}
 
-	/// Remove an account from storage. This should only be done when its refs are zero or you'll
-	/// get storage leaks in other modules. Nonetheless we assume that the calling logic knows best.
-	///
-	/// This is a no-op if the account doesn't already exist. If it does then it will ensure
-	/// cleanups (those in `on_killed_account`) take place.
-	fn kill_account(who: &T::AccountId) {
-		if Account::<T>::contains_key(who) {
-			let account = Account::<T>::take(who);
-			if account.refcount > 0 {
-				debug::debug!(
-					target: "system",
-					"WARNING: Referenced account deleted. This is probably a bug."
-				);
-			}
-		}
-		Module::<T>::on_killed_account(who.clone());
-	}
-
 	/// Determine whether or not it is possible to update the code.
 	///
 	/// Checks the given code if it is a valid runtime wasm blob by instantianting
@@ -1248,19 +1354,34 @@ impl<T: Config> Module<T> {
 	}
 }
 
-/// Event handler which calls on_created_account when it happens.
-pub struct CallOnCreatedAccount<T>(PhantomData<T>);
-impl<T: Config> Happened<T::AccountId> for CallOnCreatedAccount<T> {
-	fn happened(who: &T::AccountId) {
-		Module::<T>::on_created_account(who.clone());
+/// Event handler which registers a provider when created.
+pub struct Provider<T>(PhantomData<T>);
+impl<T: Config> HandleLifetime<T::AccountId> for Provider<T> {
+	fn created(t: &T::AccountId) -> Result<(), StoredMapError> {
+		Module::<T>::inc_providers(t);
+		Ok(())
+	}
+	fn killed(t: &T::AccountId) -> Result<(), StoredMapError> {
+		Module::<T>::dec_providers(t)
+			.map(|_| ())
+			.or_else(|e| match e {
+				DecRefError::ConsumerRemaining => Err(StoredMapError::ConsumerRemaining),
+			})
 	}
 }
 
-/// Event handler which calls kill_account when it happens.
-pub struct CallKillAccount<T>(PhantomData<T>);
-impl<T: Config> Happened<T::AccountId> for CallKillAccount<T> {
-	fn happened(who: &T::AccountId) {
-		Module::<T>::kill_account(who)
+/// Event handler which registers a consumer when created.
+pub struct Consumer<T>(PhantomData<T>);
+impl<T: Config> HandleLifetime<T::AccountId> for Consumer<T> {
+	fn created(t: &T::AccountId) -> Result<(), StoredMapError> {
+		Module::<T>::inc_consumers(t)
+			.map_err(|e| match e {
+				IncRefError::NoProviders => StoredMapError::NoProviders
+			})
+	}
+	fn killed(t: &T::AccountId) -> Result<(), StoredMapError> {
+		Module::<T>::dec_consumers(t);
+		Ok(())
 	}
 }
 
@@ -1273,59 +1394,44 @@ impl<T: Config> BlockNumberProvider for Module<T>
 	}
 }
 
-// Implement StoredMap for a simple single-item, kill-account-on-remove system. This works fine for
-// storing a single item which is required to not be empty/default for the account to exist.
-// Anything more complex will need more sophisticated logic.
+fn is_providing<T: Default + Eq>(d: &T) -> bool {
+	d != &T::default()
+}
+
+/// Implement StoredMap for a simple single-item, provide-when-not-default system. This works fine
+/// for storing a single item which allows the account to continue existing as long as it's not
+/// empty/default.
+///
+/// Anything more complex will need more sophisticated logic.
 impl<T: Config> StoredMap<T::AccountId, T::AccountData> for Module<T> {
 	fn get(k: &T::AccountId) -> T::AccountData {
 		Account::<T>::get(k).data
 	}
-	fn is_explicit(k: &T::AccountId) -> bool {
-		Account::<T>::contains_key(k)
-	}
-	fn insert(k: &T::AccountId, data: T::AccountData) {
-		let existed = Account::<T>::contains_key(k);
-		Account::<T>::mutate(k, |a| a.data = data);
-		if !existed {
-			Self::on_created_account(k.clone());
-		}
-	}
-	fn remove(k: &T::AccountId) {
-		Self::kill_account(k)
-	}
-	fn mutate<R>(k: &T::AccountId, f: impl FnOnce(&mut T::AccountData) -> R) -> R {
-		let existed = Account::<T>::contains_key(k);
-		let r = Account::<T>::mutate(k, |a| f(&mut a.data));
-		if !existed {
-			Self::on_created_account(k.clone());
-		}
-		r
-	}
-	fn mutate_exists<R>(k: &T::AccountId, f: impl FnOnce(&mut Option<T::AccountData>) -> R) -> R {
-		Self::try_mutate_exists(k, |x| -> Result<R, Infallible> { Ok(f(x)) }).expect("Infallible; qed")
-	}
-	fn try_mutate_exists<R, E>(k: &T::AccountId, f: impl FnOnce(&mut Option<T::AccountData>) -> Result<R, E>) -> Result<R, E> {
-		Account::<T>::try_mutate_exists(k, |maybe_value| {
-			let existed = maybe_value.is_some();
-			let (maybe_prefix, mut maybe_data) = split_inner(
-				maybe_value.take(),
-				|account| ((account.nonce, account.refcount), account.data)
-			);
-			f(&mut maybe_data).map(|result| {
-				*maybe_value = maybe_data.map(|data| {
-					let (nonce, refcount) = maybe_prefix.unwrap_or_default();
-					AccountInfo { nonce, refcount, data }
-				});
-				(existed, maybe_value.is_some(), result)
-			})
-		}).map(|(existed, exists, v)| {
-			if !existed && exists {
-				Self::on_created_account(k.clone());
-			} else if existed && !exists {
-				Self::on_killed_account(k.clone());
+
+	fn try_mutate_exists<R, E: From<StoredMapError>>(
+		k: &T::AccountId,
+		f: impl FnOnce(&mut Option<T::AccountData>) -> Result<R, E>,
+	) -> Result<R, E> {
+		let account = Account::<T>::get(k);
+		let was_providing = is_providing(&account.data);
+		let mut some_data = if was_providing { Some(account.data) } else { None };
+		let result = f(&mut some_data)?;
+		let is_providing = some_data.is_some();
+		if !was_providing && is_providing {
+			Self::inc_providers(k);
+		} else if was_providing && !is_providing {
+			match Self::dec_providers(k) {
+				Err(DecRefError::ConsumerRemaining) => Err(StoredMapError::ConsumerRemaining)?,
+				Ok(DecRefStatus::Reaped) => return Ok(result),
+				Ok(DecRefStatus::Exists) => {
+					// Update value as normal...
+				}
 			}
-			v
-		})
+		} else if !was_providing && !is_providing {
+			return Ok(result)
+		}
+		Account::<T>::mutate(k, |a| a.data = some_data.unwrap_or_default());
+		Ok(result)
 	}
 }
 
@@ -1342,16 +1448,10 @@ pub fn split_inner<T, R, S>(option: Option<T>, splitter: impl FnOnce(T) -> (R, S
 	}
 }
 
-impl<T: Config> IsDeadAccount<T::AccountId> for Module<T> {
-	fn is_dead_account(who: &T::AccountId) -> bool {
-		!Account::<T>::contains_key(who)
-	}
-}
-
-pub struct ChainContext<T>(sp_std::marker::PhantomData<T>);
+pub struct ChainContext<T>(PhantomData<T>);
 impl<T> Default for ChainContext<T> {
 	fn default() -> Self {
-		ChainContext(sp_std::marker::PhantomData)
+		ChainContext(PhantomData)
 	}
 }
 
diff --git a/frame/system/src/tests.rs b/frame/system/src/tests.rs
index ca9163011036..89b84a2cc7ed 100644
--- a/frame/system/src/tests.rs
+++ b/frame/system/src/tests.rs
@@ -31,20 +31,22 @@ fn origin_works() {
 #[test]
 fn stored_map_works() {
 	new_test_ext().execute_with(|| {
-		System::insert(&0, 42);
-		assert!(System::allow_death(&0));
+		assert!(System::insert(&0, 42).is_ok());
+		assert!(!System::is_provider_required(&0));
 
-		System::inc_ref(&0);
-		assert!(!System::allow_death(&0));
+		assert_eq!(Account::<Test>::get(0), AccountInfo { nonce: 0, providers: 1, consumers: 0, data: 42 });
 
-		System::insert(&0, 69);
-		assert!(!System::allow_death(&0));
+		assert!(System::inc_consumers(&0).is_ok());
+		assert!(System::is_provider_required(&0));
 
-		System::dec_ref(&0);
-		assert!(System::allow_death(&0));
+		assert!(System::insert(&0, 69).is_ok());
+		assert!(System::is_provider_required(&0));
+
+		System::dec_consumers(&0);
+		assert!(!System::is_provider_required(&0));
 
 		assert!(KILLED.with(|r| r.borrow().is_empty()));
-		System::kill_account(&0);
+		assert!(System::remove(&0).is_ok());
 		assert_eq!(KILLED.with(|r| r.borrow().clone()), vec![0u64]);
 	});
 }
@@ -398,11 +400,12 @@ fn events_not_emitted_during_genesis() {
 	new_test_ext().execute_with(|| {
 		// Block Number is zero at genesis
 		assert!(System::block_number().is_zero());
-		System::on_created_account(Default::default());
+		let mut account_data = AccountInfo { nonce: 0, consumers: 0, providers: 0, data: 0 };
+		System::on_created_account(Default::default(), &mut account_data);
 		assert!(System::events().is_empty());
 		// Events will be emitted starting on block 1
 		System::set_block_number(1);
-		System::on_created_account(Default::default());
+		System::on_created_account(Default::default(), &mut account_data);
 		assert!(System::events().len() == 1);
 	});
 }
diff --git a/frame/utility/src/tests.rs b/frame/utility/src/tests.rs
index 9d03ead0eb12..556107529e1a 100644
--- a/frame/utility/src/tests.rs
+++ b/frame/utility/src/tests.rs
@@ -144,7 +144,8 @@ pub struct TestBaseCallFilter;
 impl Filter<Call> for TestBaseCallFilter {
 	fn filter(c: &Call) -> bool {
 		match *c {
-			Call::Balances(_) => true,
+			// Transfer works. Use `transfer_keep_alive` for a call that doesn't pass the filter.
+			Call::Balances(pallet_balances::Call::transfer(..)) => true,
 			Call::Utility(_) => true,
 			// For benchmarking, this acts as a noop call
 			Call::System(frame_system::Call::remark(..)) => true,
@@ -275,7 +276,7 @@ fn as_derivative_filters() {
 		assert_err_ignore_postinfo!(Utility::as_derivative(
 			Origin::signed(1),
 			1,
-			Box::new(Call::System(frame_system::Call::suicide())),
+			Box::new(Call::Balances(pallet_balances::Call::transfer_keep_alive(2, 1))),
 		), DispatchError::BadOrigin);
 	});
 }
@@ -320,7 +321,7 @@ fn batch_with_signed_filters() {
 	new_test_ext().execute_with(|| {
 		assert_ok!(
 			Utility::batch(Origin::signed(1), vec![
-				Call::System(frame_system::Call::suicide())
+				Call::Balances(pallet_balances::Call::transfer_keep_alive(2, 1))
 			]),
 		);
 		expect_event(Event::BatchInterrupted(0, DispatchError::BadOrigin));
diff --git a/primitives/runtime/src/lib.rs b/primitives/runtime/src/lib.rs
index 563e0965d83a..2fb4f7546d23 100644
--- a/primitives/runtime/src/lib.rs
+++ b/primitives/runtime/src/lib.rs
@@ -411,6 +411,10 @@ pub enum DispatchError {
 		#[cfg_attr(feature = "std", serde(skip_deserializing))]
 		message: Option<&'static str>,
 	},
+	/// At least one consumer is remaining so the account cannot be destroyed.
+	ConsumerRemaining,
+	/// There are no providers so the account cannot be created.
+	NoProviders,
 }
 
 /// Result of a `Dispatchable` which contains the `DispatchResult` and additional information about
@@ -460,6 +464,15 @@ impl From<crate::traits::BadOrigin> for DispatchError {
 	}
 }
 
+impl From<crate::traits::StoredMapError> for DispatchError {
+	fn from(e: crate::traits::StoredMapError) -> Self {
+		match e {
+			crate::traits::StoredMapError::ConsumerRemaining => Self::ConsumerRemaining,
+			crate::traits::StoredMapError::NoProviders => Self::NoProviders,
+		}
+	}
+}
+
 impl From<&'static str> for DispatchError {
 	fn from(err: &'static str) -> DispatchError {
 		DispatchError::Other(err)
@@ -470,9 +483,11 @@ impl From<DispatchError> for &'static str {
 	fn from(err: DispatchError) -> &'static str {
 		match err {
 			DispatchError::Other(msg) => msg,
-			DispatchError::CannotLookup => "Can not lookup",
+			DispatchError::CannotLookup => "Cannot lookup",
 			DispatchError::BadOrigin => "Bad origin",
 			DispatchError::Module { message, .. } => message.unwrap_or("Unknown module error"),
+			DispatchError::ConsumerRemaining => "Consumer remaining",
+			DispatchError::NoProviders => "No providers",
 		}
 	}
 }
@@ -490,7 +505,7 @@ impl traits::Printable for DispatchError {
 		"DispatchError".print();
 		match self {
 			Self::Other(err) => err.print(),
-			Self::CannotLookup => "Can not lookup".print(),
+			Self::CannotLookup => "Cannot lookup".print(),
 			Self::BadOrigin => "Bad origin".print(),
 			Self::Module { index, error, message } => {
 				index.print();
@@ -499,6 +514,8 @@ impl traits::Printable for DispatchError {
 					msg.print();
 				}
 			}
+			Self::ConsumerRemaining => "Consumer remaining".print(),
+			Self::NoProviders => "No providers".print(),
 		}
 	}
 }
diff --git a/primitives/runtime/src/traits.rs b/primitives/runtime/src/traits.rs
index b0567b7ae0d0..128c9a6eed0a 100644
--- a/primitives/runtime/src/traits.rs
+++ b/primitives/runtime/src/traits.rs
@@ -153,6 +153,25 @@ impl From<BadOrigin> for &'static str {
 	}
 }
 
+/// Error that can be returned by our impl of `StoredMap`.
+#[derive(Encode, Decode, RuntimeDebug)]
+pub enum StoredMapError {
+	/// Attempt to create map value when it is a consumer and there are no providers in place.
+	NoProviders,
+	/// Attempt to anull/remove value when it is the last provider and there is still at
+	/// least one consumer left.
+	ConsumerRemaining,
+}
+
+impl From<StoredMapError> for &'static str {
+	fn from(e: StoredMapError) -> &'static str {
+		match e {
+			StoredMapError::NoProviders => "No providers",
+			StoredMapError::ConsumerRemaining => "Consumer remaining",
+		}
+	}
+}
+
 /// An error that indicates that a lookup failed.
 #[derive(Encode, Decode, RuntimeDebug)]
 pub struct LookupError;

From d3673c2dc4aa4417daae80d932dc996f1bce3e98 Mon Sep 17 00:00:00 2001
From: honeywest <50997103+honeywest@users.noreply.github.com>
Date: Sun, 17 Jan 2021 13:14:40 +0800
Subject: [PATCH 0283/1194] fix clippy error (#7912)

---
 frame/support/procedural/src/storage/print_pallet_upgrade.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frame/support/procedural/src/storage/print_pallet_upgrade.rs b/frame/support/procedural/src/storage/print_pallet_upgrade.rs
index e0eac516442a..e6c6b75dc197 100644
--- a/frame/support/procedural/src/storage/print_pallet_upgrade.rs
+++ b/frame/support/procedural/src/storage/print_pallet_upgrade.rs
@@ -81,13 +81,13 @@ pub fn maybe_print_pallet_upgrade(def: &super::DeclStorageDefExt) {
 		};
 
 		let genesis_config_impl_gen = if genesis_config_def.is_generic {
-			impl_gen.clone()
+			impl_gen
 		} else {
 			Default::default()
 		};
 
 		let genesis_config_use_gen = if genesis_config_def.is_generic {
-			use_gen.clone()
+			use_gen
 		} else {
 			Default::default()
 		};

From d42240ba25eac547ea9c2e95c2e7f721fad29621 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Mon, 18 Jan 2021 11:10:47 +0100
Subject: [PATCH 0284/1194] Allow configuring Yamux window size (#7916)

---
 client/cli/src/params/network_params.rs |  1 +
 client/network/src/config.rs            | 22 ++++++++++++++++++++++
 client/network/src/service.rs           |  8 +++++++-
 client/network/src/transport.rs         |  8 ++++++++
 4 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/client/cli/src/params/network_params.rs b/client/cli/src/params/network_params.rs
index 130325a7f9d4..0b53616b9ed1 100644
--- a/client/cli/src/params/network_params.rs
+++ b/client/cli/src/params/network_params.rs
@@ -175,6 +175,7 @@ impl NetworkParams {
 			max_parallel_downloads: self.max_parallel_downloads,
 			allow_non_globals_in_dht,
 			kademlia_disjoint_query_paths: self.kademlia_disjoint_query_paths,
+			yamux_window_size: None,
 		}
 	}
 }
diff --git a/client/network/src/config.rs b/client/network/src/config.rs
index aee07e74645c..6ba31272da56 100644
--- a/client/network/src/config.rs
+++ b/client/network/src/config.rs
@@ -401,6 +401,27 @@ pub struct NetworkConfiguration {
 	/// Require iterative Kademlia DHT queries to use disjoint paths for increased resiliency in the
 	/// presence of potentially adversarial nodes.
 	pub kademlia_disjoint_query_paths: bool,
+
+	/// Size of Yamux window receive window of all substreams. `None` for the default (256kiB).
+	/// Any value inferior to 256kiB is invalid.
+	///
+	/// # Context
+	///
+	/// By design, notifications substreams on top of Yamux connections only allow up to `N` bytes
+	/// to be transferred at a time, where `N` is the Yamux receive window size configurable here.
+	/// This means, in practice, that every `N` bytes must be acknowledged by the receiver before
+	/// the sender can send more data. The maximum bandwidth of each notifications substream is
+	/// therefore `N / round_trip_time`.
+	///
+	/// It is recommended to leave this to `None`, and use a request-response protocol instead if
+	/// a large amount of data must be transferred. The reason why the value is configurable is
+	/// that some Substrate users mis-use notification protocols to send large amounts of data.
+	/// As such, this option isn't designed to stay and will likely get removed in the future.
+	///
+	/// Note that configuring a value here isn't a modification of the Yamux protocol, but rather
+	/// a modification of the way the implementation works. Different nodes with different
+	/// configured values remain compatible with each other.
+	pub yamux_window_size: Option<u32>,
 }
 
 impl NetworkConfiguration {
@@ -430,6 +451,7 @@ impl NetworkConfiguration {
 			max_parallel_downloads: 5,
 			allow_non_globals_in_dht: false,
 			kademlia_disjoint_query_paths: false,
+			yamux_window_size: None,
 		}
 	}
 
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 00ca0fb0bbf0..fec444846a3f 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -311,7 +311,13 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 					TransportConfig::Normal { wasm_external_transport, .. } =>
 						(false, wasm_external_transport)
 				};
-				transport::build_transport(local_identity, config_mem, config_wasm)
+
+				transport::build_transport(
+					local_identity,
+					config_mem,
+					config_wasm,
+					params.network_config.yamux_window_size
+				)
 			};
 			let mut builder = SwarmBuilder::new(transport, behaviour, local_peer_id.clone())
 				.connection_limits(ConnectionLimits::default()
diff --git a/client/network/src/transport.rs b/client/network/src/transport.rs
index 4d9d4fbde23a..6896e5985637 100644
--- a/client/network/src/transport.rs
+++ b/client/network/src/transport.rs
@@ -35,12 +35,16 @@ pub use self::bandwidth::BandwidthSinks;
 /// If `memory_only` is true, then only communication within the same process are allowed. Only
 /// addresses with the format `/memory/...` are allowed.
 ///
+/// `yamux_window_size` consists in the size of the Yamux windows. `None` to leave the default
+/// (256kiB).
+///
 /// Returns a `BandwidthSinks` object that allows querying the average bandwidth produced by all
 /// the connections spawned with this transport.
 pub fn build_transport(
 	keypair: identity::Keypair,
 	memory_only: bool,
 	wasm_external_transport: Option<wasm_ext::ExtTransport>,
+	yamux_window_size: Option<u32>,
 ) -> (Boxed<(PeerId, StreamMuxerBox)>, Arc<BandwidthSinks>) {
 	// Build the base layer of the transport.
 	let transport = if let Some(t) = wasm_external_transport {
@@ -98,6 +102,10 @@ pub fn build_transport(
 		// buffered data has been consumed.
 		yamux_config.set_window_update_mode(libp2p::yamux::WindowUpdateMode::on_read());
 
+		if let Some(yamux_window_size) = yamux_window_size {
+			yamux_config.set_receive_window_size(yamux_window_size);
+		}
+
 		core::upgrade::SelectUpgrade::new(yamux_config, mplex_config)
 	};
 

From 4ac74e93773f9ce32f544f189b4d1affb66ace3a Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Mon, 18 Jan 2021 10:24:12 +0000
Subject: [PATCH 0285/1194] Decouple Stkaing and Election - Part1: Support
 traits (#7908)

* Base features and traits.

* Fix the build

* Remove unused boxing

* Self review cleanup

* Fix build
---
 Cargo.lock                                    |  12 +
 Cargo.toml                                    |   1 +
 frame/staking/src/benchmarking.rs             |   1 +
 frame/staking/src/lib.rs                      |  35 +-
 frame/staking/src/mock.rs                     |  10 +-
 frame/staking/src/offchain_election.rs        |  23 +-
 frame/staking/src/testing_utils.rs            |   8 +-
 primitives/election-providers/Cargo.toml      |  33 ++
 primitives/election-providers/src/lib.rs      | 241 ++++++++++++
 primitives/election-providers/src/onchain.rs  | 163 +++++++++
 primitives/npos-elections/Cargo.toml          |   2 +
 primitives/npos-elections/benches/phragmen.rs |   4 +-
 .../npos-elections/compact/src/assignment.rs  |  54 +--
 primitives/npos-elections/compact/src/lib.rs  | 121 +++---
 .../fuzzer/src/phragmen_balancing.rs          |  21 +-
 .../fuzzer/src/phragmms_balancing.rs          |  23 +-
 .../npos-elections/fuzzer/src/reduce.rs       |   9 +-
 primitives/npos-elections/src/helpers.rs      |  22 +-
 primitives/npos-elections/src/lib.rs          | 346 ++++++++++++------
 primitives/npos-elections/src/mock.rs         |  12 +-
 primitives/npos-elections/src/phragmen.rs     |  36 +-
 primitives/npos-elections/src/phragmms.rs     |   7 +-
 primitives/npos-elections/src/tests.rs        |  74 ++--
 23 files changed, 921 insertions(+), 337 deletions(-)
 create mode 100644 primitives/election-providers/Cargo.toml
 create mode 100644 primitives/election-providers/src/lib.rs
 create mode 100644 primitives/election-providers/src/onchain.rs

diff --git a/Cargo.lock b/Cargo.lock
index c42127aead43..3a68eb4b1dd9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8357,6 +8357,17 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "sp-election-providers"
+version = "2.0.0"
+dependencies = [
+ "parity-scale-codec",
+ "sp-arithmetic",
+ "sp-npos-elections",
+ "sp-runtime",
+ "sp-std",
+]
+
 [[package]]
 name = "sp-externalities"
 version = "0.8.1"
@@ -8453,6 +8464,7 @@ dependencies = [
  "rand 0.7.3",
  "serde",
  "sp-arithmetic",
+ "sp-core",
  "sp-npos-elections-compact",
  "sp-runtime",
  "sp-std",
diff --git a/Cargo.toml b/Cargo.toml
index 12e79490ef6b..1754f896c884 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -139,6 +139,7 @@ members = [
 	"primitives/database",
 	"primitives/debug-derive",
 	"primitives/externalities",
+	"primitives/election-providers",
 	"primitives/finality-grandpa",
 	"primitives/inherents",
 	"primitives/io",
diff --git a/frame/staking/src/benchmarking.rs b/frame/staking/src/benchmarking.rs
index df2095e85880..6009761f365d 100644
--- a/frame/staking/src/benchmarking.rs
+++ b/frame/staking/src/benchmarking.rs
@@ -21,6 +21,7 @@ use super::*;
 use crate::Module as Staking;
 use testing_utils::*;
 
+use sp_npos_elections::CompactSolution;
 use sp_runtime::traits::One;
 use frame_system::RawOrigin;
 pub use frame_benchmarking::{benchmarks, account, whitelisted_caller, whitelist_account};
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 99c1fe842a23..c3aeaada421b 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -232,10 +232,11 @@
 //!
 //! The controller account can free a portion (or all) of the funds using the
 //! [`unbond`](enum.Call.html#variant.unbond) call. Note that the funds are not immediately
-//! accessible. Instead, a duration denoted by [`BondingDuration`](./trait.Config.html#associatedtype.BondingDuration)
-//! (in number of eras) must pass until the funds can actually be removed. Once the
-//! `BondingDuration` is over, the [`withdraw_unbonded`](./enum.Call.html#variant.withdraw_unbonded)
-//! call can be used to actually withdraw the funds.
+//! accessible. Instead, a duration denoted by
+//! [`BondingDuration`](./trait.Config.html#associatedtype.BondingDuration) (in number of eras) must
+//! pass until the funds can actually be removed. Once the `BondingDuration` is over, the
+//! [`withdraw_unbonded`](./enum.Call.html#variant.withdraw_unbonded) call can be used to actually
+//! withdraw the funds.
 //!
 //! Note that there is a limitation to the number of fund-chunks that can be scheduled to be
 //! unlocked in the future via [`unbond`](enum.Call.html#variant.unbond). In case this maximum
@@ -304,7 +305,7 @@ use frame_support::{
 };
 use pallet_session::historical;
 use sp_runtime::{
-	Percent, Perbill, PerU16, PerThing, InnerOf, RuntimeDebug, DispatchError,
+	Percent, Perbill, PerU16, InnerOf, RuntimeDebug, DispatchError,
 	curve::PiecewiseLinear,
 	traits::{
 		Convert, Zero, StaticLookup, CheckedSub, Saturating, SaturatedConversion,
@@ -327,14 +328,14 @@ use frame_system::{
 };
 use sp_npos_elections::{
 	ExtendedBalance, Assignment, ElectionScore, ElectionResult as PrimitiveElectionResult,
-	build_support_map, evaluate_support, seq_phragmen, generate_solution_type,
-	is_score_better, VotingLimit, SupportMap, VoteWeight,
+	to_support_map, EvaluateSupport, seq_phragmen, generate_solution_type, is_score_better,
+	SupportMap, VoteWeight, CompactSolution, PerThing128,
 };
 pub use weights::WeightInfo;
 
 const STAKING_ID: LockIdentifier = *b"staking ";
 pub const MAX_UNLOCKING_CHUNKS: usize = 32;
-pub const MAX_NOMINATIONS: usize = <CompactAssignments as VotingLimit>::LIMIT;
+pub const MAX_NOMINATIONS: usize = <CompactAssignments as CompactSolution>::LIMIT;
 
 pub(crate) const LOG_TARGET: &'static str = "staking";
 
@@ -2105,7 +2106,7 @@ decl_module! {
 		#[weight = T::WeightInfo::submit_solution_better(
 			size.validators.into(),
 			size.nominators.into(),
-			compact.len() as u32,
+			compact.voter_count() as u32,
 			winners.len() as u32,
 		)]
 		pub fn submit_election_solution(
@@ -2139,7 +2140,7 @@ decl_module! {
 		#[weight = T::WeightInfo::submit_solution_better(
 			size.validators.into(),
 			size.nominators.into(),
-			compact.len() as u32,
+			compact.voter_count() as u32,
 			winners.len() as u32,
 		)]
 		pub fn submit_election_solution_unsigned(
@@ -2601,13 +2602,11 @@ impl<T: Config> Module<T> {
 		);
 
 		// build the support map thereof in order to evaluate.
-		let supports = build_support_map::<T::AccountId>(
-			&winners,
-			&staked_assignments,
-		).map_err(|_| Error::<T>::OffchainElectionBogusEdge)?;
+		let supports = to_support_map::<T::AccountId>(&winners, &staked_assignments)
+			.map_err(|_| Error::<T>::OffchainElectionBogusEdge)?;
 
 		// Check if the score is the same as the claimed one.
-		let submitted_score = evaluate_support(&supports);
+		let submitted_score = (&supports).evaluate();
 		ensure!(submitted_score == claimed_score, Error::<T>::OffchainElectionBogusScore);
 
 		// At last, alles Ok. Exposures and store the result.
@@ -2863,7 +2862,7 @@ impl<T: Config> Module<T> {
 				Self::slashable_balance_of_fn(),
 			);
 
-			let supports = build_support_map::<T::AccountId>(
+			let supports = to_support_map::<T::AccountId>(
 				&elected_stashes,
 				&staked_assignments,
 			)
@@ -2902,7 +2901,7 @@ impl<T: Config> Module<T> {
 	/// Self votes are added and nominations before the most recent slashing span are ignored.
 	///
 	/// No storage item is updated.
-	pub fn do_phragmen<Accuracy: PerThing>(
+	pub fn do_phragmen<Accuracy: PerThing128>(
 		iterations: usize,
 	) -> Option<PrimitiveElectionResult<T::AccountId, Accuracy>>
 	where
@@ -2952,7 +2951,7 @@ impl<T: Config> Module<T> {
 				all_nominators,
 				Some((iterations, 0)), // exactly run `iterations` rounds.
 			)
-			.map_err(|err| log!(error, "Call to seq-phragmen failed due to {}", err))
+			.map_err(|err| log!(error, "Call to seq-phragmen failed due to {:?}", err))
 			.ok()
 		}
 	}
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index b8e756a49407..cf1486a9b691 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -27,7 +27,7 @@ use frame_support::{
 use sp_core::H256;
 use sp_io;
 use sp_npos_elections::{
-	build_support_map, evaluate_support, reduce, ExtendedBalance, StakedAssignment, ElectionScore,
+	to_support_map, EvaluateSupport, reduce, ExtendedBalance, StakedAssignment, ElectionScore,
 };
 use sp_runtime::{
 	curve::PiecewiseLinear,
@@ -860,8 +860,8 @@ pub(crate) fn horrible_npos_solution(
 	let score = {
 		let (_, _, better_score) = prepare_submission_with(true, true, 0, |_| {});
 
-		let support = build_support_map::<AccountId>(&winners, &staked_assignment).unwrap();
-		let score = evaluate_support(&support);
+		let support = to_support_map::<AccountId>(&winners, &staked_assignment).unwrap();
+		let score = support.evaluate();
 
 		assert!(sp_npos_elections::is_score_better::<Perbill>(
 			better_score,
@@ -960,11 +960,11 @@ pub(crate) fn prepare_submission_with(
 			Staking::slashable_balance_of_fn(),
 		);
 
-		let support_map = build_support_map::<AccountId>(
+		let support_map = to_support_map::<AccountId>(
 			winners.as_slice(),
 			staked.as_slice(),
 		).unwrap();
-		evaluate_support::<AccountId>(&support_map)
+		support_map.evaluate()
 	} else {
 		Default::default()
 	};
diff --git a/frame/staking/src/offchain_election.rs b/frame/staking/src/offchain_election.rs
index 433e02261cc5..5b1fe44d7e2c 100644
--- a/frame/staking/src/offchain_election.rs
+++ b/frame/staking/src/offchain_election.rs
@@ -25,8 +25,8 @@ use codec::Decode;
 use frame_support::{traits::Get, weights::Weight, IterableStorageMap};
 use frame_system::offchain::SubmitTransaction;
 use sp_npos_elections::{
-	build_support_map, evaluate_support, reduce, Assignment, ElectionResult, ElectionScore,
-	ExtendedBalance,
+	to_support_map, EvaluateSupport, reduce, Assignment, ElectionResult, ElectionScore,
+	ExtendedBalance, CompactSolution,
 };
 use sp_runtime::{
 	offchain::storage::StorageValueRef, traits::TrailingZeroInput, PerThing, RuntimeDebug,
@@ -265,7 +265,7 @@ pub fn trim_to_weight<T: Config, FN>(
 where
 	for<'r> FN: Fn(&'r T::AccountId) -> Option<NominatorIndex>,
 {
-	match compact.len().checked_sub(maximum_allowed_voters as usize) {
+	match compact.voter_count().checked_sub(maximum_allowed_voters as usize) {
 		Some(to_remove) if to_remove > 0 => {
 			// grab all voters and sort them by least stake.
 			let balance_of = <Module<T>>::slashable_balance_of_fn();
@@ -300,7 +300,7 @@ where
 					warn,
 					"💸 {} nominators out of {} had to be removed from compact solution due to size limits.",
 					removed,
-					compact.len() + removed,
+					compact.voter_count() + removed,
 				);
 			Ok(compact)
 		}
@@ -324,12 +324,7 @@ pub fn prepare_submission<T: Config>(
 	do_reduce: bool,
 	maximum_weight: Weight,
 ) -> Result<
-	(
-		Vec<ValidatorIndex>,
-		CompactAssignments,
-		ElectionScore,
-		ElectionSize,
-	),
+	(Vec<ValidatorIndex>, CompactAssignments, ElectionScore, ElectionSize),
 	OffchainElectionError,
 >
 where
@@ -403,11 +398,11 @@ where
 		T::WeightInfo::submit_solution_better(
 				size.validators.into(),
 				size.nominators.into(),
-				compact.len() as u32,
+				compact.voter_count() as u32,
 				winners.len() as u32,
 		),
 		maximum_allowed_voters,
-		compact.len(),
+		compact.voter_count(),
 	);
 
 	let compact = trim_to_weight::<T, _>(maximum_allowed_voters, compact, &nominator_index)?;
@@ -423,9 +418,9 @@ where
 			<Module<T>>::slashable_balance_of_fn(),
 		);
 
-		let support_map = build_support_map::<T::AccountId>(&winners, &staked)
+		let support_map = to_support_map::<T::AccountId>(&winners, &staked)
 			.map_err(|_| OffchainElectionError::ElectionFailed)?;
-		evaluate_support::<T::AccountId>(&support_map)
+		support_map.evaluate()
 	};
 
 	// winners to index. Use a simple for loop for a more expressive early exit in case of error.
diff --git a/frame/staking/src/testing_utils.rs b/frame/staking/src/testing_utils.rs
index d3139b53e6f9..c8d8cb28e2b2 100644
--- a/frame/staking/src/testing_utils.rs
+++ b/frame/staking/src/testing_utils.rs
@@ -244,11 +244,9 @@ pub fn get_weak_solution<T: Config>(
 			<Module<T>>::slashable_balance_of_fn(),
 		);
 
-		let support_map = build_support_map::<T::AccountId>(
-			winners.as_slice(),
-			staked.as_slice(),
-		).unwrap();
-		evaluate_support::<T::AccountId>(&support_map)
+		let support_map =
+			to_support_map::<T::AccountId>(winners.as_slice(), staked.as_slice()).unwrap();
+		support_map.evaluate()
 	};
 
 	// compact encode the assignment.
diff --git a/primitives/election-providers/Cargo.toml b/primitives/election-providers/Cargo.toml
new file mode 100644
index 000000000000..f017a3763720
--- /dev/null
+++ b/primitives/election-providers/Cargo.toml
@@ -0,0 +1,33 @@
+[package]
+name = "sp-election-providers"
+version = "2.0.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
+license = "Apache-2.0"
+homepage = "https://substrate.dev"
+repository = "https://github.com/paritytech/substrate/"
+description = "Primitive election providers"
+readme = "README.md"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+sp-std = { version = "2.0.1", default-features = false, path = "../std" }
+sp-arithmetic = { version = "2.0.1", default-features = false, path = "../arithmetic" }
+sp-npos-elections = { version = "2.0.1", default-features = false, path = "../npos-elections" }
+
+[dev-dependencies]
+sp-npos-elections = { version = "2.0.1", path = "../npos-elections" }
+sp-runtime = { version = "2.0.1", path = "../runtime" }
+
+[features]
+default = ["std"]
+runtime-benchmarks = []
+std = [
+	"codec/std",
+	"sp-std/std",
+	"sp-npos-elections/std",
+	"sp-arithmetic/std",
+]
diff --git a/primitives/election-providers/src/lib.rs b/primitives/election-providers/src/lib.rs
new file mode 100644
index 000000000000..73ea58c176b2
--- /dev/null
+++ b/primitives/election-providers/src/lib.rs
@@ -0,0 +1,241 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Primitive traits for providing election functionality.
+//!
+//! This crate provides two traits that could interact to enable extensible election functionality
+//! within FRAME pallets.
+//!
+//! Something that will provide the functionality of election will implement [`ElectionProvider`],
+//! whilst needing an associated [`ElectionProvider::DataProvider`], which needs to be fulfilled by
+//! an entity implementing [`ElectionDataProvider`]. Most often, *the data provider is* the receiver
+//! of the election, resulting in a diagram as below:
+//!
+//! ```ignore
+//!                                         ElectionDataProvider
+//!                          <------------------------------------------+
+//!                          |                                          |
+//!                          v                                          |
+//!                    +-----+----+                              +------+---+
+//!                    |          |                              |          |
+//! pallet-do-election |          |                              |          | pallet-needs-election
+//!                    |          |                              |          |
+//!                    |          |                              |          |
+//!                    +-----+----+                              +------+---+
+//!                          |                                          ^
+//!                          |                                          |
+//!                          +------------------------------------------+
+//!                                         ElectionProvider
+//! ```
+//!
+//! > It could also be possible that a third party pallet (C), provides the data of election to an
+//! > election provider (B), which then passes the election result to another pallet (A).
+//!
+//! ## Election Types
+//!
+//! Typically, two types of elections exist:
+//!
+//! 1. **Stateless**: Election data is provided, and the election result is immediately ready.
+//! 2. **Stateful**: Election data is is queried ahead of time, and the election result might be
+//!    ready some number of blocks in the future.
+//!
+//! To accommodate both type of elections in one trait, the traits lean toward **stateful
+//! election**, as it is more general than the stateless. This is why [`ElectionProvider::elect`]
+//! has no parameters. All value and type parameter must be provided by the [`ElectionDataProvider`]
+//! trait, even if the election happens immediately.
+//!
+//! ## Election Data
+//!
+//! The data associated with an election, essentially what the [`ElectionDataProvider`] must convey
+//! is as follows:
+//!
+//! 1. A list of voters, with their stake.
+//! 2. A list of targets (i.e. _candidates_).
+//! 3. A number of desired targets to be elected (i.e. _winners_)
+//!
+//! In addition to that, the [`ElectionDataProvider`] must also hint [`ElectionProvider`] at when
+//! the next election might happen ([`ElectionDataProvider::next_election_prediction`]). A stateless
+//! election provider would probably ignore this. A stateful election provider can use this to
+//! prepare the election result in advance.
+//!
+//! Nonetheless, an [`ElectionProvider`] shan't rely on this and should preferably provide some
+//! means of fallback election as well, in case the `elect` was called immaturely early.
+//!
+//! ## Example
+//!
+//! ```rust
+//! # use sp_election_providers::*;
+//! # use sp_npos_elections::{Support, Assignment};
+//!
+//! type AccountId = u64;
+//! type Balance = u64;
+//! type BlockNumber = u32;
+//!
+//! mod data_provider {
+//!     use super::*;
+//!
+//!     pub trait Config: Sized {
+//!         type ElectionProvider: ElectionProvider<
+//!             AccountId,
+//!             BlockNumber,
+//!             DataProvider = Module<Self>,
+//!         >;
+//!     }
+//!
+//!     pub struct Module<T: Config>(std::marker::PhantomData<T>);
+//!
+//!     impl<T: Config> ElectionDataProvider<AccountId, BlockNumber> for Module<T> {
+//!         fn desired_targets() -> u32 {
+//!             1
+//!         }
+//!         fn voters() -> Vec<(AccountId, VoteWeight, Vec<AccountId>)> {
+//!             Default::default()
+//!         }
+//!         fn targets() -> Vec<AccountId> {
+//!             vec![10, 20, 30]
+//!         }
+//!         fn next_election_prediction(now: BlockNumber) -> BlockNumber {
+//!             0
+//!         }
+//!     }
+//! }
+//!
+//!
+//! mod generic_election_provider {
+//!     use super::*;
+//!
+//!     pub struct GenericElectionProvider<T: Config>(std::marker::PhantomData<T>);
+//!
+//!     pub trait Config {
+//!         type DataProvider: ElectionDataProvider<AccountId, BlockNumber>;
+//!     }
+//!
+//!     impl<T: Config> ElectionProvider<AccountId, BlockNumber> for GenericElectionProvider<T> {
+//!         type Error = ();
+//!         type DataProvider = T::DataProvider;
+//!
+//!         fn elect() -> Result<Supports<AccountId>, Self::Error> {
+//!             Self::DataProvider::targets()
+//!                 .first()
+//!                 .map(|winner| vec![(*winner, Support::default())])
+//!                 .ok_or(())
+//!         }
+//!     }
+//! }
+//!
+//! mod runtime {
+//!     use super::generic_election_provider;
+//!     use super::data_provider;
+//!     use super::AccountId;
+//!
+//!     struct Runtime;
+//!     impl generic_election_provider::Config for Runtime {
+//!         type DataProvider = data_provider::Module<Runtime>;
+//!     }
+//!
+//!     impl data_provider::Config for Runtime {
+//!         type ElectionProvider = generic_election_provider::GenericElectionProvider<Runtime>;
+//!     }
+//!
+//! }
+//!
+//! # fn main() {}
+//! ```
+
+#![cfg_attr(not(feature = "std"), no_std)]
+
+pub mod onchain;
+use sp_std::{prelude::*, fmt::Debug};
+
+/// Re-export some type as they are used in the interface.
+pub use sp_arithmetic::PerThing;
+pub use sp_npos_elections::{Assignment, ExtendedBalance, PerThing128, Supports, VoteWeight};
+
+/// Something that can provide the data to an [`ElectionProvider`].
+pub trait ElectionDataProvider<AccountId, BlockNumber> {
+	/// All possible targets for the election, i.e. the candidates.
+	fn targets() -> Vec<AccountId>;
+
+	/// All possible voters for the election.
+	///
+	/// Note that if a notion of self-vote exists, it should be represented here.
+	fn voters() -> Vec<(AccountId, VoteWeight, Vec<AccountId>)>;
+
+	/// The number of targets to elect.
+	fn desired_targets() -> u32;
+
+	/// Provide a best effort prediction about when the next election is about to happen.
+	///
+	/// In essence, the implementor should predict with this function when it will trigger the
+	/// [`ElectionProvider::elect`].
+	///
+	/// This is only useful for stateful election providers.
+	fn next_election_prediction(now: BlockNumber) -> BlockNumber;
+
+	/// Utility function only to be used in benchmarking scenarios, to be implemented optionally,
+	/// else a noop.
+	#[cfg(any(feature = "runtime-benchmarks", test))]
+	fn put_snapshot(
+		_voters: Vec<(AccountId, VoteWeight, Vec<AccountId>)>,
+		_targets: Vec<AccountId>,
+	) {
+	}
+}
+
+#[cfg(feature = "std")]
+impl<AccountId, BlockNumber> ElectionDataProvider<AccountId, BlockNumber> for () {
+	fn targets() -> Vec<AccountId> {
+		Default::default()
+	}
+	fn voters() -> Vec<(AccountId, VoteWeight, Vec<AccountId>)> {
+		Default::default()
+	}
+	fn desired_targets() -> u32 {
+		Default::default()
+	}
+	fn next_election_prediction(now: BlockNumber) -> BlockNumber {
+		now
+	}
+}
+
+/// Something that can compute the result of an election and pass it back to the caller.
+///
+/// This trait only provides an interface to _request_ an election, i.e.
+/// [`ElectionProvider::elect`]. That data required for the election need to be passed to the
+/// implemented of this trait through [`ElectionProvider::DataProvider`].
+pub trait ElectionProvider<AccountId, BlockNumber> {
+	/// The error type that is returned by the provider.
+	type Error: Debug;
+
+	/// The data provider of the election.
+	type DataProvider: ElectionDataProvider<AccountId, BlockNumber>;
+
+	/// Elect a new set of winners.
+	///
+	/// The result is returned in a target major format, namely as vector of  supports.
+	fn elect() -> Result<Supports<AccountId>, Self::Error>;
+}
+
+#[cfg(feature = "std")]
+impl<AccountId, BlockNumber> ElectionProvider<AccountId, BlockNumber> for () {
+	type Error = &'static str;
+	type DataProvider = ();
+
+	fn elect() -> Result<Supports<AccountId>, Self::Error> {
+		Err("<() as ElectionProvider> cannot do anything.")
+	}
+}
diff --git a/primitives/election-providers/src/onchain.rs b/primitives/election-providers/src/onchain.rs
new file mode 100644
index 000000000000..496ba7fda47e
--- /dev/null
+++ b/primitives/election-providers/src/onchain.rs
@@ -0,0 +1,163 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! An implementation of [`ElectionProvider`] that does an on-chain sequential phragmen.
+
+use sp_arithmetic::InnerOf;
+use crate::{ElectionDataProvider, ElectionProvider};
+use sp_npos_elections::*;
+use sp_std::{collections::btree_map::BTreeMap, marker::PhantomData, prelude::*};
+
+/// Errors of the on-chain election.
+#[derive(Eq, PartialEq, Debug)]
+pub enum Error {
+	/// An internal error in the NPoS elections crate.
+	NposElections(sp_npos_elections::Error),
+}
+
+impl From<sp_npos_elections::Error> for Error {
+	fn from(e: sp_npos_elections::Error) -> Self {
+		Error::NposElections(e)
+	}
+}
+
+/// A simple on-chain implementation of the election provider trait.
+///
+/// This will accept voting data on the fly and produce the results immediately.
+///
+/// ### Warning
+///
+/// This can be very expensive to run frequently on-chain. Use with care.
+pub struct OnChainSequentialPhragmen<T: Config>(PhantomData<T>);
+
+/// Configuration trait of [`OnChainSequentialPhragmen`].
+///
+/// Note that this is similar to a pallet traits, but [`OnChainSequentialPhragmen`] is not a pallet.
+pub trait Config {
+	/// The account identifier type.
+	type AccountId: IdentifierT;
+	/// The block number type.
+	type BlockNumber;
+	/// The accuracy used to compute the election:
+	type Accuracy: PerThing128;
+	/// Something that provides the data for election.
+	type DataProvider: ElectionDataProvider<Self::AccountId, Self::BlockNumber>;
+}
+
+impl<T: Config> ElectionProvider<T::AccountId, T::BlockNumber> for OnChainSequentialPhragmen<T>
+where
+	ExtendedBalance: From<InnerOf<T::Accuracy>>,
+{
+	type Error = Error;
+	type DataProvider = T::DataProvider;
+
+	fn elect() -> Result<Supports<T::AccountId>, Self::Error> {
+		let voters = Self::DataProvider::voters();
+		let targets = Self::DataProvider::targets();
+		let desired_targets = Self::DataProvider::desired_targets() as usize;
+
+		let mut stake_map: BTreeMap<T::AccountId, VoteWeight> = BTreeMap::new();
+
+		voters.iter().for_each(|(v, s, _)| {
+			stake_map.insert(v.clone(), *s);
+		});
+
+		let stake_of = |w: &T::AccountId| -> VoteWeight {
+			stake_map.get(w).cloned().unwrap_or_default()
+		};
+
+		let ElectionResult { winners, assignments } =
+			seq_phragmen::<_, T::Accuracy>(desired_targets, targets, voters, None)
+				.map_err(Error::from)?;
+
+		let staked = assignment_ratio_to_staked_normalized(assignments, &stake_of)?;
+		let winners = to_without_backing(winners);
+
+		to_supports(&winners, &staked).map_err(Error::from)
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use sp_npos_elections::Support;
+	use sp_runtime::Perbill;
+
+	type AccountId = u64;
+	type BlockNumber = u32;
+
+	struct Runtime;
+	impl Config for Runtime {
+		type AccountId = AccountId;
+		type BlockNumber = BlockNumber;
+		type Accuracy = Perbill;
+		type DataProvider = mock_data_provider::DataProvider;
+	}
+
+	type OnChainPhragmen = OnChainSequentialPhragmen<Runtime>;
+
+	mod mock_data_provider {
+		use super::*;
+
+		pub struct DataProvider;
+
+		impl ElectionDataProvider<AccountId, BlockNumber> for DataProvider {
+			fn voters() -> Vec<(AccountId, VoteWeight, Vec<AccountId>)> {
+				vec![
+					(1, 10, vec![10, 20]),
+					(2, 20, vec![30, 20]),
+					(3, 30, vec![10, 30]),
+				]
+			}
+
+			fn targets() -> Vec<AccountId> {
+				vec![10, 20, 30]
+			}
+
+			fn desired_targets() -> u32 {
+				2
+			}
+
+			fn next_election_prediction(_: BlockNumber) -> BlockNumber {
+				0
+			}
+		}
+	}
+
+	#[test]
+	fn onchain_seq_phragmen_works() {
+		assert_eq!(
+			OnChainPhragmen::elect().unwrap(),
+			vec![
+				(
+					10,
+					Support {
+						total: 25,
+						voters: vec![(1, 10), (3, 15)]
+					}
+				),
+				(
+					30,
+					Support {
+						total: 35,
+						voters: vec![(2, 20), (3, 15)]
+					}
+				)
+			]
+		);
+	}
+}
diff --git a/primitives/npos-elections/Cargo.toml b/primitives/npos-elections/Cargo.toml
index a9e86b84849b..82ce6b005a95 100644
--- a/primitives/npos-elections/Cargo.toml
+++ b/primitives/npos-elections/Cargo.toml
@@ -18,6 +18,7 @@ serde = { version = "1.0.101", optional = true, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 sp-npos-elections-compact = { version = "2.0.0", path = "./compact" }
 sp-arithmetic = { version = "2.0.0", default-features = false, path = "../arithmetic" }
+sp-core = { version = "2.0.0", default-features = false, path = "../core" }
 
 [dev-dependencies]
 substrate-test-utils = { version = "2.0.0", path = "../../test-utils" }
@@ -32,4 +33,5 @@ std = [
 	"serde",
 	"sp-std/std",
 	"sp-arithmetic/std",
+	"sp-core/std",
 ]
diff --git a/primitives/npos-elections/benches/phragmen.rs b/primitives/npos-elections/benches/phragmen.rs
index ce4e0196ab4f..07d07658a46a 100644
--- a/primitives/npos-elections/benches/phragmen.rs
+++ b/primitives/npos-elections/benches/phragmen.rs
@@ -30,7 +30,7 @@ use sp_npos_elections::{ElectionResult, VoteWeight};
 use std::collections::BTreeMap;
 use sp_runtime::{Perbill, PerThing, traits::Zero};
 use sp_npos_elections::{
-	balance_solution, assignment_ratio_to_staked, build_support_map, to_without_backing, VoteWeight,
+	balance_solution, assignment_ratio_to_staked, to_support_map, to_without_backing, VoteWeight,
 	ExtendedBalance, Assignment, StakedAssignment, IdentifierT, assignment_ratio_to_staked,
 	seq_phragmen,
 };
@@ -149,7 +149,7 @@ fn do_phragmen(
 		if eq_iters > 0 {
 			let staked = assignment_ratio_to_staked(assignments, &stake_of);
 			let winners = to_without_backing(winners);
-			let mut support = build_support_map(
+			let mut support = to_support_map(
 				winners.as_ref(),
 				staked.as_ref(),
 			).unwrap();
diff --git a/primitives/npos-elections/compact/src/assignment.rs b/primitives/npos-elections/compact/src/assignment.rs
index 4f527aa40a74..12f5ca2b4173 100644
--- a/primitives/npos-elections/compact/src/assignment.rs
+++ b/primitives/npos-elections/compact/src/assignment.rs
@@ -21,7 +21,7 @@ use crate::field_name_for;
 use proc_macro2::TokenStream as TokenStream2;
 use quote::quote;
 
-fn from_impl(count: usize) -> TokenStream2 {
+pub(crate) fn from_impl(count: usize) -> TokenStream2 {
 	let from_impl_single = {
 		let name = field_name_for(1);
 		quote!(1 => compact.#name.push(
@@ -73,7 +73,7 @@ fn from_impl(count: usize) -> TokenStream2 {
 	)
 }
 
-fn into_impl(count: usize, per_thing: syn::Type) -> TokenStream2 {
+pub(crate) fn into_impl(count: usize, per_thing: syn::Type) -> TokenStream2 {
 	let into_impl_single = {
 		let name = field_name_for(1);
 		quote!(
@@ -153,53 +153,3 @@ fn into_impl(count: usize, per_thing: syn::Type) -> TokenStream2 {
 		#into_impl_rest
 	)
 }
-
-pub(crate) fn assignment(
-	ident: syn::Ident,
-	voter_type: syn::Type,
-	target_type: syn::Type,
-	weight_type: syn::Type,
-	count: usize,
-) -> TokenStream2 {
-	let from_impl = from_impl(count);
-	let into_impl = into_impl(count, weight_type.clone());
-
-	quote!(
-		use _npos::__OrInvalidIndex;
-		impl #ident {
-			pub fn from_assignment<FV, FT, A>(
-				assignments: Vec<_npos::Assignment<A, #weight_type>>,
-				index_of_voter: FV,
-				index_of_target: FT,
-			) -> Result<Self, _npos::Error>
-				where
-					A: _npos::IdentifierT,
-					for<'r> FV: Fn(&'r A) -> Option<#voter_type>,
-					for<'r> FT: Fn(&'r A) -> Option<#target_type>,
-			{
-				let mut compact: #ident = Default::default();
-
-				for _npos::Assignment { who, distribution } in assignments {
-					match distribution.len() {
-						0 => continue,
-						#from_impl
-						_ => {
-							return Err(_npos::Error::CompactTargetOverflow);
-						}
-					}
-				};
-				Ok(compact)
-			}
-
-			pub fn into_assignment<A: _npos::IdentifierT>(
-				self,
-				voter_at: impl Fn(#voter_type) -> Option<A>,
-				target_at: impl Fn(#target_type) -> Option<A>,
-			) -> Result<Vec<_npos::Assignment<A, #weight_type>>, _npos::Error> {
-				let mut assignments: Vec<_npos::Assignment<A, #weight_type>> = Default::default();
-				#into_impl
-				Ok(assignments)
-			}
-		}
-	)
-}
diff --git a/primitives/npos-elections/compact/src/lib.rs b/primitives/npos-elections/compact/src/lib.rs
index 32397652f9b9..191998a34192 100644
--- a/primitives/npos-elections/compact/src/lib.rs
+++ b/primitives/npos-elections/compact/src/lib.rs
@@ -95,19 +95,11 @@ pub fn generate_solution_type(item: TokenStream) -> TokenStream {
 		compact_encoding,
 	).unwrap_or_else(|e| e.to_compile_error());
 
-	let assignment_impls = assignment::assignment(
-		ident.clone(),
-		voter_type.clone(),
-		target_type.clone(),
-		weight_type.clone(),
-		count,
-	);
-
 	quote!(
 		#imports
 		#solution_struct
-		#assignment_impls
-	).into()
+	)
+	.into()
 }
 
 fn struct_def(
@@ -125,29 +117,32 @@ fn struct_def(
 
 	let singles = {
 		let name = field_name_for(1);
+		// NOTE: we use the visibility of the struct for the fields as well.. could be made better.
 		quote!(
-			#name: Vec<(#voter_type, #target_type)>,
+			#vis #name: Vec<(#voter_type, #target_type)>,
 		)
 	};
 
 	let doubles = {
 		let name = field_name_for(2);
 		quote!(
-			#name: Vec<(#voter_type, (#target_type, #weight_type), #target_type)>,
+			#vis #name: Vec<(#voter_type, (#target_type, #weight_type), #target_type)>,
 		)
 	};
 
-	let rest = (3..=count).map(|c| {
-		let field_name = field_name_for(c);
-		let array_len = c - 1;
-		quote!(
-			#field_name: Vec<(
-				#voter_type,
-				[(#target_type, #weight_type); #array_len],
-				#target_type
-			)>,
-		)
-	}).collect::<TokenStream2>();
+	let rest = (3..=count)
+		.map(|c| {
+			let field_name = field_name_for(c);
+			let array_len = c - 1;
+			quote!(
+				#vis #field_name: Vec<(
+					#voter_type,
+					[(#target_type, #weight_type); #array_len],
+					#target_type
+				)>,
+			)
+		})
+		.collect::<TokenStream2>();
 
 	let len_impl = len_impl(count);
 	let edge_count_impl = edge_count_impl(count);
@@ -172,40 +167,38 @@ fn struct_def(
 		quote!(#[derive(Default, PartialEq, Eq, Clone, Debug, _npos::codec::Encode, _npos::codec::Decode)])
 	};
 
+	let from_impl = assignment::from_impl(count);
+	let into_impl = assignment::into_impl(count, weight_type.clone());
+
 	Ok(quote! (
 		/// A struct to encode a election assignment in a compact way.
 		#derives_and_maybe_compact_encoding
 		#vis struct #ident { #singles #doubles #rest }
 
-		impl _npos::VotingLimit for #ident {
+		use _npos::__OrInvalidIndex;
+		impl _npos::CompactSolution for #ident {
 			const LIMIT: usize = #count;
-		}
+			type Voter = #voter_type;
+			type Target = #target_type;
+			type Accuracy = #weight_type;
 
-		impl #ident {
-			/// Get the length of all the assignments that this type is encoding. This is basically
-			/// the same as the number of assignments, or the number of voters in total.
-			pub fn len(&self) -> usize {
+			fn voter_count(&self) -> usize {
 				let mut all_len = 0usize;
 				#len_impl
 				all_len
 			}
 
-			/// Get the total count of edges.
-			pub fn edge_count(&self) -> usize {
+			fn edge_count(&self) -> usize {
 				let mut all_edges = 0usize;
 				#edge_count_impl
 				all_edges
 			}
 
-			/// Get the number of unique targets in the whole struct.
-			///
-			/// Once presented with a list of winners, this set and the set of winners must be
-			/// equal.
-			///
-			/// The resulting indices are sorted.
-			pub fn unique_targets(&self) -> Vec<#target_type> {
-				let mut all_targets: Vec<#target_type> = Vec::with_capacity(self.average_edge_count());
-				let mut maybe_insert_target = |t: #target_type| {
+			fn unique_targets(&self) -> Vec<Self::Target> {
+				// NOTE: this implementation returns the targets sorted, but we don't use it yet per
+				// se, nor is the API enforcing it.
+				let mut all_targets: Vec<Self::Target> = Vec::with_capacity(self.average_edge_count());
+				let mut maybe_insert_target = |t: Self::Target| {
 					match all_targets.binary_search(&t) {
 						Ok(_) => (),
 						Err(pos) => all_targets.insert(pos, t)
@@ -217,22 +210,44 @@ fn struct_def(
 				all_targets
 			}
 
-			/// Get the average edge count.
-			pub fn average_edge_count(&self) -> usize {
-				self.edge_count().checked_div(self.len()).unwrap_or(0)
-			}
-
-			/// Remove a certain voter.
-			///
-			/// This will only search until the first instance of `to_remove`, and return true. If
-			/// no instance is found (no-op), then it returns false.
-			///
-			/// In other words, if this return true, exactly one element must have been removed from
-			/// `self.len()`.
-			pub fn remove_voter(&mut self, to_remove: #voter_type) -> bool {
+			fn remove_voter(&mut self, to_remove: Self::Voter) -> bool {
 				#remove_voter_impl
 				return false
 			}
+
+			fn from_assignment<FV, FT, A>(
+				assignments: Vec<_npos::Assignment<A, #weight_type>>,
+				index_of_voter: FV,
+				index_of_target: FT,
+			) -> Result<Self, _npos::Error>
+				where
+					A: _npos::IdentifierT,
+					for<'r> FV: Fn(&'r A) -> Option<Self::Voter>,
+					for<'r> FT: Fn(&'r A) -> Option<Self::Target>,
+			{
+				let mut compact: #ident = Default::default();
+
+				for _npos::Assignment { who, distribution } in assignments {
+					match distribution.len() {
+						0 => continue,
+						#from_impl
+						_ => {
+							return Err(_npos::Error::CompactTargetOverflow);
+						}
+					}
+				};
+				Ok(compact)
+			}
+
+			fn into_assignment<A: _npos::IdentifierT>(
+				self,
+				voter_at: impl Fn(Self::Voter) -> Option<A>,
+				target_at: impl Fn(Self::Target) -> Option<A>,
+			) -> Result<Vec<_npos::Assignment<A, #weight_type>>, _npos::Error> {
+				let mut assignments: Vec<_npos::Assignment<A, #weight_type>> = Default::default();
+				#into_impl
+				Ok(assignments)
+			}
 		}
 	))
 }
diff --git a/primitives/npos-elections/fuzzer/src/phragmen_balancing.rs b/primitives/npos-elections/fuzzer/src/phragmen_balancing.rs
index 024b721b222a..4ff18e95d1ef 100644
--- a/primitives/npos-elections/fuzzer/src/phragmen_balancing.rs
+++ b/primitives/npos-elections/fuzzer/src/phragmen_balancing.rs
@@ -22,8 +22,8 @@ mod common;
 use common::*;
 use honggfuzz::fuzz;
 use sp_npos_elections::{
-	assignment_ratio_to_staked_normalized, build_support_map, to_without_backing, VoteWeight,
-	evaluate_support, is_score_better, seq_phragmen,
+	assignment_ratio_to_staked_normalized, is_score_better, seq_phragmen, to_supports,
+	to_without_backing, EvaluateSupport, VoteWeight,
 };
 use sp_runtime::Perbill;
 use rand::{self, SeedableRng};
@@ -66,11 +66,14 @@ fn main() {
 			};
 
 			let unbalanced_score = {
-				let staked = assignment_ratio_to_staked_normalized(unbalanced.assignments.clone(), &stake_of).unwrap();
+				let staked = assignment_ratio_to_staked_normalized(
+					unbalanced.assignments.clone(),
+					&stake_of,
+				)
+				.unwrap();
 				let winners = to_without_backing(unbalanced.winners.clone());
-				let support = build_support_map(winners.as_ref(), staked.as_ref()).unwrap();
+				let score = to_supports(winners.as_ref(), staked.as_ref()).unwrap().evaluate();
 
-				let score = evaluate_support(&support);
 				if score[0] == 0 {
 					// such cases cannot be improved by balancing.
 					return;
@@ -87,11 +90,13 @@ fn main() {
 				).unwrap();
 
 				let balanced_score = {
-					let staked = assignment_ratio_to_staked_normalized(balanced.assignments.clone(), &stake_of).unwrap();
+					let staked = assignment_ratio_to_staked_normalized(
+						balanced.assignments.clone(),
+						&stake_of,
+					).unwrap();
 					let winners = to_without_backing(balanced.winners);
-					let support = build_support_map(winners.as_ref(), staked.as_ref()).unwrap();
+					to_supports(winners.as_ref(), staked.as_ref()).unwrap().evaluate()
 
-					evaluate_support(&support)
 				};
 
 				let enhance = is_score_better(balanced_score, unbalanced_score, Perbill::zero());
diff --git a/primitives/npos-elections/fuzzer/src/phragmms_balancing.rs b/primitives/npos-elections/fuzzer/src/phragmms_balancing.rs
index 868aa67236f4..8ce7e7d415fa 100644
--- a/primitives/npos-elections/fuzzer/src/phragmms_balancing.rs
+++ b/primitives/npos-elections/fuzzer/src/phragmms_balancing.rs
@@ -22,8 +22,8 @@ mod common;
 use common::*;
 use honggfuzz::fuzz;
 use sp_npos_elections::{
-	assignment_ratio_to_staked_normalized, build_support_map, to_without_backing, VoteWeight,
-	evaluate_support, is_score_better, phragmms,
+	assignment_ratio_to_staked_normalized, is_score_better, phragmms, to_supports,
+	to_without_backing, EvaluateSupport, VoteWeight,
 };
 use sp_runtime::Perbill;
 use rand::{self, SeedableRng};
@@ -66,11 +66,14 @@ fn main() {
 			};
 
 			let unbalanced_score = {
-				let staked = assignment_ratio_to_staked_normalized(unbalanced.assignments.clone(), &stake_of).unwrap();
+				let staked = assignment_ratio_to_staked_normalized(
+					unbalanced.assignments.clone(),
+					&stake_of,
+				)
+				.unwrap();
 				let winners = to_without_backing(unbalanced.winners.clone());
-				let support = build_support_map(winners.as_ref(), staked.as_ref()).unwrap();
+				let score = to_supports(&winners, &staked).unwrap().evaluate();
 
-				let score = evaluate_support(&support);
 				if score[0] == 0 {
 					// such cases cannot be improved by balancing.
 					return;
@@ -86,11 +89,13 @@ fn main() {
 			).unwrap();
 
 			let balanced_score = {
-				let staked = assignment_ratio_to_staked_normalized(balanced.assignments.clone(), &stake_of).unwrap();
+				let staked =
+					assignment_ratio_to_staked_normalized(balanced.assignments.clone(), &stake_of)
+						.unwrap();
 				let winners = to_without_backing(balanced.winners);
-				let support = build_support_map(winners.as_ref(), staked.as_ref()).unwrap();
-
-				evaluate_support(&support)
+				to_supports(winners.as_ref(), staked.as_ref())
+					.unwrap()
+					.evaluate()
 			};
 
 			let enhance = is_score_better(balanced_score, unbalanced_score, Perbill::zero());
diff --git a/primitives/npos-elections/fuzzer/src/reduce.rs b/primitives/npos-elections/fuzzer/src/reduce.rs
index 074c1546d49d..4ee2468d9d14 100644
--- a/primitives/npos-elections/fuzzer/src/reduce.rs
+++ b/primitives/npos-elections/fuzzer/src/reduce.rs
@@ -34,8 +34,8 @@ use honggfuzz::fuzz;
 
 mod common;
 use common::to_range;
-use sp_npos_elections::{StakedAssignment, ExtendedBalance, build_support_map, reduce};
-use rand::{self, Rng, SeedableRng, RngCore};
+use sp_npos_elections::{reduce, to_support_map, ExtendedBalance, StakedAssignment};
+use rand::{self, Rng, RngCore, SeedableRng};
 
 type Balance = u128;
 type AccountId = u64;
@@ -109,9 +109,8 @@ fn assert_assignments_equal(
 	ass1: &Vec<StakedAssignment<AccountId>>,
 	ass2: &Vec<StakedAssignment<AccountId>>,
 ) {
-
-	let support_1 = build_support_map::<AccountId>(winners, ass1).unwrap();
-	let support_2 = build_support_map::<AccountId>(winners, ass2).unwrap();
+	let support_1 = to_support_map::<AccountId>(winners, ass1).unwrap();
+	let support_2 = to_support_map::<AccountId>(winners, ass2).unwrap();
 
 	for (who, support) in support_1.iter() {
 		assert_eq!(support.total, support_2.get(who).unwrap().total);
diff --git a/primitives/npos-elections/src/helpers.rs b/primitives/npos-elections/src/helpers.rs
index 6f4400b6748f..4a2099947ea1 100644
--- a/primitives/npos-elections/src/helpers.rs
+++ b/primitives/npos-elections/src/helpers.rs
@@ -18,21 +18,21 @@
 //! Helper methods for npos-elections.
 
 use crate::{
-	Assignment, ExtendedBalance, VoteWeight, IdentifierT, StakedAssignment, WithApprovalOf, Error,
+	Assignment, Error, ExtendedBalance, IdentifierT, PerThing128, StakedAssignment, VoteWeight,
+	WithApprovalOf,
 };
-use sp_arithmetic::{PerThing, InnerOf};
+use sp_arithmetic::{InnerOf, PerThing};
 use sp_std::prelude::*;
 
 /// Converts a vector of ratio assignments into ones with absolute budget value.
 ///
 /// Note that this will NOT attempt at normalizing the result.
-pub fn assignment_ratio_to_staked<A: IdentifierT, P: PerThing, FS>(
+pub fn assignment_ratio_to_staked<A: IdentifierT, P: PerThing128, FS>(
 	ratios: Vec<Assignment<A, P>>,
 	stake_of: FS,
 ) -> Vec<StakedAssignment<A>>
 where
 	for<'r> FS: Fn(&'r A) -> VoteWeight,
-	P: sp_std::ops::Mul<ExtendedBalance, Output = ExtendedBalance>,
 	ExtendedBalance: From<InnerOf<P>>,
 {
 	ratios
@@ -45,19 +45,21 @@ where
 }
 
 /// Same as [`assignment_ratio_to_staked`] and try and do normalization.
-pub fn assignment_ratio_to_staked_normalized<A: IdentifierT, P: PerThing, FS>(
+pub fn assignment_ratio_to_staked_normalized<A: IdentifierT, P: PerThing128, FS>(
 	ratio: Vec<Assignment<A, P>>,
 	stake_of: FS,
 ) -> Result<Vec<StakedAssignment<A>>, Error>
 where
 	for<'r> FS: Fn(&'r A) -> VoteWeight,
-	P: sp_std::ops::Mul<ExtendedBalance, Output = ExtendedBalance>,
 	ExtendedBalance: From<InnerOf<P>>,
 {
 	let mut staked = assignment_ratio_to_staked(ratio, &stake_of);
-	staked.iter_mut().map(|a|
-		a.try_normalize(stake_of(&a.who).into()).map_err(|err| Error::ArithmeticError(err))
-	).collect::<Result<_, _>>()?;
+	staked
+		.iter_mut()
+		.map(|a| {
+			a.try_normalize(stake_of(&a.who).into()).map_err(|err| Error::ArithmeticError(err))
+		})
+		.collect::<Result<_, _>>()?;
 	Ok(staked)
 }
 
@@ -74,7 +76,7 @@ where
 }
 
 /// Same as [`assignment_staked_to_ratio`] and try and do normalization.
-pub fn assignment_staked_to_ratio_normalized<A: IdentifierT, P: PerThing>(
+pub fn assignment_staked_to_ratio_normalized<A: IdentifierT, P: PerThing128>(
 	staked: Vec<StakedAssignment<A>>,
 ) -> Result<Vec<Assignment<A, P>>, Error>
 where
diff --git a/primitives/npos-elections/src/lib.rs b/primitives/npos-elections/src/lib.rs
index 1e3c2707497c..2f6e133f1dc7 100644
--- a/primitives/npos-elections/src/lib.rs
+++ b/primitives/npos-elections/src/lib.rs
@@ -21,8 +21,8 @@
 //! - [`phragmms()`]: Implements a hybrid approach inspired by Phragmén which is executed faster but
 //!   it can achieve a constant factor approximation of the maximin problem, similar to that of the
 //!   MMS algorithm.
-//! - [`balance`]: Implements the star balancing algorithm. This iterative process can push
-//!   a solution toward being more `balances`, which in turn can increase its score.
+//! - [`balance`]: Implements the star balancing algorithm. This iterative process can push a
+//!   solution toward being more `balances`, which in turn can increase its score.
 //!
 //! ### Terminology
 //!
@@ -57,12 +57,11 @@
 //!
 //! // the combination of the two makes the election result.
 //! let election_result = ElectionResult { winners, assignments };
-//!
 //! ```
 //!
 //! The `Assignment` field of the election result is voter-major, i.e. it is from the perspective of
 //! the voter. The struct that represents the opposite is called a `Support`. This struct is usually
-//! accessed in a map-like manner, i.e. keyed vy voters, therefor it is stored as a mapping called
+//! accessed in a map-like manner, i.e. keyed by voters, therefor it is stored as a mapping called
 //! `SupportMap`.
 //!
 //! Moreover, the support is built from absolute backing values, not ratios like the example above.
@@ -74,18 +73,25 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use sp_std::{
-	prelude::*, collections::btree_map::BTreeMap, fmt::Debug, cmp::Ordering, rc::Rc, cell::RefCell,
-};
 use sp_arithmetic::{
-	PerThing, Rational128, ThresholdOrd, InnerOf, Normalizable,
-	traits::{Zero, Bounded},
+	traits::{Bounded, UniqueSaturatedInto, Zero},
+	InnerOf, Normalizable, PerThing, Rational128, ThresholdOrd,
+};
+use sp_std::{
+	cell::RefCell,
+	cmp::Ordering,
+	collections::btree_map::BTreeMap,
+	convert::{TryFrom, TryInto},
+	fmt::Debug,
+	ops::Mul,
+	prelude::*,
+	rc::Rc,
 };
+use sp_core::RuntimeDebug;
 
+use codec::{Decode, Encode};
 #[cfg(feature = "std")]
-use serde::{Serialize, Deserialize};
-#[cfg(feature = "std")]
-use codec::{Encode, Decode};
+use serde::{Deserialize, Serialize};
 
 #[cfg(test)]
 mod mock;
@@ -125,22 +131,107 @@ impl<T> __OrInvalidIndex<T> for Option<T> {
 	}
 }
 
-// re-export the compact solution type.
-pub use sp_npos_elections_compact::generate_solution_type;
-
-/// A trait to limit the number of votes per voter. The generated compact type will implement this.
-pub trait VotingLimit {
+/// A common interface for all compact solutions.
+///
+/// See [`sp-npos-elections-compact`] for more info.
+pub trait CompactSolution: Sized {
+	/// The maximum number of votes that are allowed.
 	const LIMIT: usize;
+
+	/// The voter type. Needs to be an index (convert to usize).
+	type Voter: UniqueSaturatedInto<usize> + TryInto<usize> + TryFrom<usize> + Debug + Copy + Clone;
+
+	/// The target type. Needs to be an index (convert to usize).
+	type Target: UniqueSaturatedInto<usize> + TryInto<usize> + TryFrom<usize> + Debug + Copy + Clone;
+
+	/// The weight/accuracy type of each vote.
+	type Accuracy: PerThing128;
+
+	/// Build self from a `assignments: Vec<Assignment<A, Self::Accuracy>>`.
+	fn from_assignment<FV, FT, A>(
+		assignments: Vec<Assignment<A, Self::Accuracy>>,
+		voter_index: FV,
+		target_index: FT,
+	) -> Result<Self, Error>
+	where
+		A: IdentifierT,
+		for<'r> FV: Fn(&'r A) -> Option<Self::Voter>,
+		for<'r> FT: Fn(&'r A) -> Option<Self::Target>;
+
+	/// Convert self into a `Vec<Assignment<A, Self::Accuracy>>`
+	fn into_assignment<A: IdentifierT>(
+		self,
+		voter_at: impl Fn(Self::Voter) -> Option<A>,
+		target_at: impl Fn(Self::Target) -> Option<A>,
+	) -> Result<Vec<Assignment<A, Self::Accuracy>>, Error>;
+
+	/// Get the length of all the voters that this type is encoding.
+	///
+	/// This is basically the same as the number of assignments, or number of active voters.
+	fn voter_count(&self) -> usize;
+
+	/// Get the total count of edges.
+	///
+	/// This is effectively in the range of {[`Self::voter_count`], [`Self::voter_count`] *
+	/// [`Self::LIMIT`]}.
+	fn edge_count(&self) -> usize;
+
+	/// Get the number of unique targets in the whole struct.
+	///
+	/// Once presented with a list of winners, this set and the set of winners must be
+	/// equal.
+	fn unique_targets(&self) -> Vec<Self::Target>;
+
+	/// Get the average edge count.
+	fn average_edge_count(&self) -> usize {
+		self.edge_count()
+			.checked_div(self.voter_count())
+			.unwrap_or(0)
+	}
+
+	/// Remove a certain voter.
+	///
+	/// This will only search until the first instance of `to_remove`, and return true. If
+	/// no instance is found (no-op), then it returns false.
+	///
+	/// In other words, if this return true, exactly **one** element must have been removed from
+	/// `self.len()`.
+	fn remove_voter(&mut self, to_remove: Self::Voter) -> bool;
+
+	/// Compute the score of this compact solution type.
+	fn score<A, FS>(
+		self,
+		winners: &[A],
+		stake_of: FS,
+		voter_at: impl Fn(Self::Voter) -> Option<A>,
+		target_at: impl Fn(Self::Target) -> Option<A>,
+	) -> Result<ElectionScore, Error>
+	where
+		for<'r> FS: Fn(&'r A) -> VoteWeight,
+		A: IdentifierT,
+		ExtendedBalance: From<InnerOf<Self::Accuracy>>,
+	{
+		let ratio = self.into_assignment(voter_at, target_at)?;
+		let staked = helpers::assignment_ratio_to_staked_normalized(ratio, stake_of)?;
+		let supports = to_supports(winners, &staked)?;
+		Ok(supports.evaluate())
+	}
 }
 
+// re-export the compact solution type.
+pub use sp_npos_elections_compact::generate_solution_type;
+
 /// an aggregator trait for a generic type of a voter/target identifier. This usually maps to
 /// substrate's account id.
 pub trait IdentifierT: Clone + Eq + Default + Ord + Debug + codec::Codec {}
-
 impl<T: Clone + Eq + Default + Ord + Debug + codec::Codec> IdentifierT for T {}
 
+/// Aggregator trait for a PerThing that can be multiplied by u128 (ExtendedBalance).
+pub trait PerThing128: PerThing + Mul<ExtendedBalance, Output = ExtendedBalance> {}
+impl<T: PerThing + Mul<ExtendedBalance, Output = ExtendedBalance>> PerThing128 for T {}
+
 /// The errors that might occur in the this crate and compact.
-#[derive(Debug, Eq, PartialEq)]
+#[derive(Eq, PartialEq, RuntimeDebug)]
 pub enum Error {
 	/// While going from compact to staked, the stake of all the edges has gone above the total and
 	/// the last stake cannot be assigned.
@@ -151,6 +242,8 @@ pub enum Error {
 	CompactInvalidIndex,
 	/// An error occurred in some arithmetic operation.
 	ArithmeticError(&'static str),
+	/// The data provided to create support map was invalid.
+	InvalidSupportEdge,
 }
 
 /// A type which is used in the API of this crate as a numeric weight of a vote, most often the
@@ -160,7 +253,8 @@ pub type VoteWeight = u64;
 /// A type in which performing operations on vote weights are safe.
 pub type ExtendedBalance = u128;
 
-/// The score of an assignment. This can be computed from the support map via [`evaluate_support`].
+/// The score of an assignment. This can be computed from the support map via
+/// [`EvaluateSupport::evaluate`].
 pub type ElectionScore = [ExtendedBalance; 3];
 
 /// A winner, with their respective approval stake.
@@ -170,7 +264,7 @@ pub type WithApprovalOf<A> = (A, ExtendedBalance);
 pub type CandidatePtr<A> = Rc<RefCell<Candidate<A>>>;
 
 /// A candidate entity for the election.
-#[derive(Debug, Clone, Default)]
+#[derive(RuntimeDebug, Clone, Default)]
 pub struct Candidate<AccountId> {
 	/// Identifier.
 	who: AccountId,
@@ -311,7 +405,7 @@ impl<AccountId: IdentifierT> Voter<AccountId> {
 }
 
 /// Final result of the election.
-#[derive(Debug)]
+#[derive(RuntimeDebug)]
 pub struct ElectionResult<AccountId, P: PerThing> {
 	/// Just winners zipped with their approval stake. Note that the approval stake is merely the
 	/// sub of their received stake and could be used for very basic sorting and approval voting.
@@ -322,7 +416,7 @@ pub struct ElectionResult<AccountId, P: PerThing> {
 }
 
 /// A voter's stake assignment among a set of targets, represented as ratios.
-#[derive(Debug, Clone, Default)]
+#[derive(RuntimeDebug, Clone, Default)]
 #[cfg_attr(feature = "std", derive(PartialEq, Eq, Encode, Decode))]
 pub struct Assignment<AccountId, P: PerThing> {
 	/// Voter's identifier.
@@ -331,24 +425,20 @@ pub struct Assignment<AccountId, P: PerThing> {
 	pub distribution: Vec<(AccountId, P)>,
 }
 
-impl<AccountId: IdentifierT, P: PerThing> Assignment<AccountId, P>
-where
-	ExtendedBalance: From<InnerOf<P>>,
-{
+impl<AccountId: IdentifierT, P: PerThing128> Assignment<AccountId, P> {
 	/// Convert from a ratio assignment into one with absolute values aka. [`StakedAssignment`].
 	///
-	/// It needs `stake` which is the total budget of the voter. If `fill` is set to true, it
-	/// _tries_ to ensure that all the potential rounding errors are compensated and the
-	/// distribution's sum is exactly equal to the total budget, by adding or subtracting the
-	/// remainder from the last distribution.
+	/// It needs `stake` which is the total budget of the voter.
+	///
+	/// Note that this might create _un-normalized_ assignments, due to accuracy loss of `P`. Call
+	/// site might compensate by calling `try_normalize()` on the returned `StakedAssignment` as a
+	/// post-precessing.
 	///
 	/// If an edge ratio is [`Bounded::min_value()`], it is dropped. This edge can never mean
 	/// anything useful.
-	pub fn into_staked(self, stake: ExtendedBalance) -> StakedAssignment<AccountId>
-	where
-		P: sp_std::ops::Mul<ExtendedBalance, Output = ExtendedBalance>,
-	{
-		let distribution = self.distribution
+	pub fn into_staked(self, stake: ExtendedBalance) -> StakedAssignment<AccountId> {
+		let distribution = self
+			.distribution
 			.into_iter()
 			.filter_map(|(target, p)| {
 				// if this ratio is zero, then skip it.
@@ -396,7 +486,7 @@ where
 
 /// A voter's stake assignment among a set of targets, represented as absolute values in the scale
 /// of [`ExtendedBalance`].
-#[derive(Debug, Clone, Default)]
+#[derive(RuntimeDebug, Clone, Default)]
 #[cfg_attr(feature = "std", derive(PartialEq, Eq, Encode, Decode))]
 pub struct StakedAssignment<AccountId> {
 	/// Voter's identifier
@@ -408,11 +498,8 @@ pub struct StakedAssignment<AccountId> {
 impl<AccountId> StakedAssignment<AccountId> {
 	/// Converts self into the normal [`Assignment`] type.
 	///
-	/// If `fill` is set to true, it _tries_ to ensure that all the potential rounding errors are
-	/// compensated and the distribution's sum is exactly equal to 100%, by adding or subtracting
-	/// the remainder from the last distribution.
-	///
-	/// NOTE: it is quite critical that this attempt always works. The data type returned here will
+	/// NOTE: This will always round down, and thus the results might be less than a full 100% `P`.
+	/// Use a normalization post-processing to fix this. The data type returned here will
 	/// potentially get used to create a compact type; a compact type requires sum of ratios to be
 	/// less than 100% upon un-compacting.
 	///
@@ -479,8 +566,8 @@ impl<AccountId> StakedAssignment<AccountId> {
 ///
 /// This, at the current version, resembles the `Exposure` defined in the Staking pallet, yet they
 /// do not necessarily have to be the same.
-#[derive(Default, Debug)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Eq, PartialEq))]
+#[derive(Default, RuntimeDebug, Encode, Decode, Clone, Eq, PartialEq)]
+#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 pub struct Support<AccountId> {
 	/// Total support.
 	pub total: ExtendedBalance,
@@ -488,51 +575,43 @@ pub struct Support<AccountId> {
 	pub voters: Vec<(AccountId, ExtendedBalance)>,
 }
 
-/// A linkage from a candidate and its [`Support`].
-pub type SupportMap<A> = BTreeMap<A, Support<A>>;
-
-/// Build the support map from the given election result. It maps a flat structure like
+/// A target-major representation of the the election outcome.
 ///
-/// ```nocompile
-/// assignments: vec![
-///     voter1, vec![(candidate1, w11), (candidate2, w12)],
-///     voter2, vec![(candidate1, w21), (candidate2, w22)]
-/// ]
-/// ```
+/// Essentially a flat variant of [`SupportMap`].
 ///
-/// into a mapping of candidates and their respective support:
-///
-/// ```nocompile
-///  SupportMap {
-///     candidate1: Support {
-///         own:0,
-///         total: w11 + w21,
-///         others: vec![(candidate1, w11), (candidate2, w21)]
-///     },
-///     candidate2: Support {
-///         own:0,
-///         total: w12 + w22,
-///         others: vec![(candidate1, w12), (candidate2, w22)]
-///     },
-/// }
-/// ```
+/// The main advantage of this is that it is encodable.
+pub type Supports<A> = Vec<(A, Support<A>)>;
+
+/// Linkage from a winner to their [`Support`].
 ///
-/// The second returned flag indicates the number of edges who didn't corresponded to an actual
-/// winner from the given winner set. A value in this place larger than 0 indicates a potentially
-/// faulty assignment.
+/// This is more helpful than a normal [`Supports`] as it allows faster error checking.
+pub type SupportMap<A> = BTreeMap<A, Support<A>>;
+
+/// Helper trait to convert from a support map to a flat support vector.
+pub trait FlattenSupportMap<A> {
+	/// Flatten the support.
+	fn flatten(self) -> Supports<A>;
+}
+
+impl<A> FlattenSupportMap<A> for SupportMap<A> {
+	fn flatten(self) -> Supports<A> {
+		self.into_iter().collect::<Vec<_>>()
+	}
+}
+
+/// Build the support map from the winners and assignments.
 ///
-/// `O(E)` where `E` is the total number of edges.
-pub fn build_support_map<AccountId>(
-	winners: &[AccountId],
-	assignments: &[StakedAssignment<AccountId>],
-) -> Result<SupportMap<AccountId>, AccountId> where
-	AccountId: IdentifierT,
-{
+/// The list of winners is basically a redundancy for error checking only; It ensures that all the
+/// targets pointed to by the [`Assignment`] are present in the `winners`.
+pub fn to_support_map<A: IdentifierT>(
+	winners: &[A],
+	assignments: &[StakedAssignment<A>],
+) -> Result<SupportMap<A>, Error> {
 	// Initialize the support of each candidate.
-	let mut supports = <SupportMap<AccountId>>::new();
-	winners
-		.iter()
-		.for_each(|e| { supports.insert(e.clone(), Default::default()); });
+	let mut supports = <SupportMap<A>>::new();
+	winners.iter().for_each(|e| {
+		supports.insert(e.clone(), Default::default());
+	});
 
 	// build support struct.
 	for StakedAssignment { who, distribution } in assignments.iter() {
@@ -541,37 +620,83 @@ pub fn build_support_map<AccountId>(
 				support.total = support.total.saturating_add(*weight_extended);
 				support.voters.push((who.clone(), *weight_extended));
 			} else {
-				return Err(c.clone())
+				return Err(Error::InvalidSupportEdge)
 			}
 		}
 	}
 	Ok(supports)
 }
 
-/// Evaluate a support map. The returned tuple contains:
+/// Same as [`to_support_map`] except it calls `FlattenSupportMap` on top of the result to return a
+/// flat vector.
 ///
-/// - Minimum support. This value must be **maximized**.
-/// - Sum of all supports. This value must be **maximized**.
-/// - Sum of all supports squared. This value must be **minimized**.
+/// Similar to [`to_support_map`], `winners` is used for error checking.
+pub fn to_supports<A: IdentifierT>(
+	winners: &[A],
+	assignments: &[StakedAssignment<A>],
+) -> Result<Supports<A>, Error> {
+	to_support_map(winners, assignments).map(FlattenSupportMap::flatten)
+}
+
+/// Extension trait for evaluating a support map or vector.
+pub trait EvaluateSupport<K> {
+	/// Evaluate a support map. The returned tuple contains:
+	///
+	/// - Minimum support. This value must be **maximized**.
+	/// - Sum of all supports. This value must be **maximized**.
+	/// - Sum of all supports squared. This value must be **minimized**.
+	fn evaluate(self) -> ElectionScore;
+}
+
+/// A common wrapper trait for both (&A, &B) and &(A, B).
 ///
-/// `O(E)` where `E` is the total number of edges.
-pub fn evaluate_support<AccountId>(
-	support: &SupportMap<AccountId>,
-) -> ElectionScore {
-	let mut min_support = ExtendedBalance::max_value();
-	let mut sum: ExtendedBalance = Zero::zero();
-	// NOTE: The third element might saturate but fine for now since this will run on-chain and need
-	// to be fast.
-	let mut sum_squared: ExtendedBalance = Zero::zero();
-	for (_, support) in support.iter() {
-		sum = sum.saturating_add(support.total);
-		let squared = support.total.saturating_mul(support.total);
-		sum_squared = sum_squared.saturating_add(squared);
-		if support.total < min_support {
-			min_support = support.total;
+/// This allows us to implemented something for both `Vec<_>` and `BTreeMap<_>`, such as
+/// [`EvaluateSupport`].
+pub trait TupleRef<K, V> {
+	fn extract(&self) -> (&K, &V);
+}
+
+impl<K, V> TupleRef<K, V> for &(K, V) {
+	fn extract(&self) -> (&K, &V) {
+		(&self.0, &self.1)
+	}
+}
+
+impl<K, V> TupleRef<K, V> for (K, V) {
+	fn extract(&self) -> (&K, &V) {
+		(&self.0, &self.1)
+	}
+}
+
+impl<K, V> TupleRef<K, V> for (&K, &V) {
+	fn extract(&self) -> (&K, &V) {
+		(self.0, self.1)
+	}
+}
+
+impl<A, C, I> EvaluateSupport<A> for C
+where
+	C: IntoIterator<Item = I>,
+	I: TupleRef<A, Support<A>>,
+	A: IdentifierT,
+{
+	fn evaluate(self) -> ElectionScore {
+		let mut min_support = ExtendedBalance::max_value();
+		let mut sum: ExtendedBalance = Zero::zero();
+		// NOTE: The third element might saturate but fine for now since this will run on-chain and
+		// need to be fast.
+		let mut sum_squared: ExtendedBalance = Zero::zero();
+		for item in self {
+			let (_, support) = item.extract();
+			sum = sum.saturating_add(support.total);
+			let squared = support.total.saturating_mul(support.total);
+			sum_squared = sum_squared.saturating_add(squared);
+			if support.total < min_support {
+				min_support = support.total;
+			}
 		}
+		[min_support, sum, sum_squared]
 	}
-	[min_support, sum, sum_squared]
 }
 
 /// Compares two sets of election scores based on desirability and returns true if `this` is better
@@ -582,14 +707,15 @@ pub fn evaluate_support<AccountId>(
 ///
 /// Note that the third component should be minimized.
 pub fn is_score_better<P: PerThing>(this: ElectionScore, that: ElectionScore, epsilon: P) -> bool
-	where ExtendedBalance: From<sp_arithmetic::InnerOf<P>>
+where
+	ExtendedBalance: From<InnerOf<P>>,
 {
 	match this
 		.iter()
-		.enumerate()
-		.map(|(i, e)| (
-			e.ge(&that[i]),
-			e.tcmp(&that[i], epsilon.mul_ceil(that[i])),
+		.zip(that.iter())
+		.map(|(thi, tha)| (
+			thi.ge(&tha),
+			thi.tcmp(&tha, epsilon.mul_ceil(*tha)),
 		))
 		.collect::<Vec<(bool, Ordering)>>()
 		.as_slice()
diff --git a/primitives/npos-elections/src/mock.rs b/primitives/npos-elections/src/mock.rs
index 410adcc3779e..57b2204a72b4 100644
--- a/primitives/npos-elections/src/mock.rs
+++ b/primitives/npos-elections/src/mock.rs
@@ -19,10 +19,13 @@
 
 #![cfg(test)]
 
-use crate::{seq_phragmen, ElectionResult, Assignment, VoteWeight, ExtendedBalance};
-use sp_arithmetic::{PerThing, InnerOf, traits::{SaturatedConversion, Zero, One}};
-use sp_std::collections::btree_map::BTreeMap;
+use crate::*;
+use sp_arithmetic::{
+	traits::{One, SaturatedConversion, Zero},
+	InnerOf, PerThing,
+};
 use sp_runtime::assert_eq_error_rate;
+use sp_std::collections::btree_map::BTreeMap;
 
 #[derive(Default, Debug)]
 pub(crate) struct _Candidate<A> {
@@ -313,14 +316,13 @@ pub fn check_assignments_sum<T: PerThing>(assignments: Vec<Assignment<AccountId,
 	}
 }
 
-pub(crate) fn run_and_compare<Output: PerThing>(
+pub(crate) fn run_and_compare<Output: PerThing128>(
 	candidates: Vec<AccountId>,
 	voters: Vec<(AccountId, Vec<AccountId>)>,
 	stake_of: &Box<dyn Fn(&AccountId) -> VoteWeight>,
 	to_elect: usize,
 ) where
 	ExtendedBalance: From<InnerOf<Output>>,
-	Output: sp_std::ops::Mul<ExtendedBalance, Output = ExtendedBalance>,
 {
 	// run fixed point code.
 	let ElectionResult { winners, assignments } = seq_phragmen::<_, Output>(
diff --git a/primitives/npos-elections/src/phragmen.rs b/primitives/npos-elections/src/phragmen.rs
index 8f88c45ae6de..24a6b81af31a 100644
--- a/primitives/npos-elections/src/phragmen.rs
+++ b/primitives/npos-elections/src/phragmen.rs
@@ -21,15 +21,15 @@
 //! to the Maximin problem.
 
 use crate::{
-	IdentifierT, VoteWeight, Voter, CandidatePtr, ExtendedBalance, setup_inputs, ElectionResult,
+	balancing, setup_inputs, CandidatePtr, ElectionResult, ExtendedBalance, IdentifierT,
+	PerThing128, VoteWeight, Voter,
 };
-use sp_std::prelude::*;
 use sp_arithmetic::{
-	PerThing, InnerOf, Rational128,
 	helpers_128bit::multiply_by_rational,
-	traits::{Zero, Bounded},
+	traits::{Bounded, Zero},
+	InnerOf, Rational128,
 };
-use crate::balancing;
+use sp_std::prelude::*;
 
 /// The denominator used for loads. Since votes are collected as u64, the smallest ratio that we
 /// might collect is `1/approval_stake` where approval stake is the sum of votes. Hence, some number
@@ -63,12 +63,15 @@ const DEN: ExtendedBalance = ExtendedBalance::max_value();
 /// `expect` this to return `Ok`.
 ///
 /// This can only fail if the normalization fails.
-pub fn seq_phragmen<AccountId: IdentifierT, P: PerThing>(
+pub fn seq_phragmen<AccountId: IdentifierT, P: PerThing128>(
 	rounds: usize,
 	initial_candidates: Vec<AccountId>,
 	initial_voters: Vec<(AccountId, VoteWeight, Vec<AccountId>)>,
 	balance: Option<(usize, ExtendedBalance)>,
-) -> Result<ElectionResult<AccountId, P>, &'static str> where ExtendedBalance: From<InnerOf<P>> {
+) -> Result<ElectionResult<AccountId, P>, crate::Error>
+where
+	ExtendedBalance: From<InnerOf<P>>,
+{
 	let (candidates, voters) = setup_inputs(initial_candidates, initial_voters);
 
 	let (candidates, mut voters) = seq_phragmen_core::<AccountId>(
@@ -93,11 +96,16 @@ pub fn seq_phragmen<AccountId: IdentifierT, P: PerThing>(
 	// sort winners based on desirability.
 	winners.sort_by_key(|c_ptr| c_ptr.borrow().round);
 
-	let mut assignments = voters.into_iter().filter_map(|v| v.into_assignment()).collect::<Vec<_>>();
-	let _ = assignments.iter_mut().map(|a| a.try_normalize()).collect::<Result<(), _>>()?;
-	let winners = winners.into_iter().map(|w_ptr|
-		(w_ptr.borrow().who.clone(), w_ptr.borrow().backed_stake)
-	).collect();
+	let mut assignments =
+		voters.into_iter().filter_map(|v| v.into_assignment()).collect::<Vec<_>>();
+	let _ = assignments
+		.iter_mut()
+		.map(|a| a.try_normalize().map_err(|e| crate::Error::ArithmeticError(e)))
+		.collect::<Result<(), _>>()?;
+	let winners = winners
+		.into_iter()
+		.map(|w_ptr| (w_ptr.borrow().who.clone(), w_ptr.borrow().backed_stake))
+		.collect();
 
 	Ok(ElectionResult { winners, assignments })
 }
@@ -114,7 +122,7 @@ pub fn seq_phragmen_core<AccountId: IdentifierT>(
 	rounds: usize,
 	candidates: Vec<CandidatePtr<AccountId>>,
 	mut voters: Vec<Voter<AccountId>>,
-) -> Result<(Vec<CandidatePtr<AccountId>>, Vec<Voter<AccountId>>), &'static str> {
+) -> Result<(Vec<CandidatePtr<AccountId>>, Vec<Voter<AccountId>>), crate::Error> {
 	// we have already checked that we have more candidates than minimum_candidate_count.
 	let to_elect = rounds.min(candidates.len());
 
@@ -198,7 +206,7 @@ pub fn seq_phragmen_core<AccountId: IdentifierT>(
 		// edge of all candidates that eventually have a non-zero weight must be elected.
 		debug_assert!(voter.edges.iter().all(|e| e.candidate.borrow().elected));
 		// inc budget to sum the budget.
-		voter.try_normalize_elected()?;
+		voter.try_normalize_elected().map_err(|e| crate::Error::ArithmeticError(e))?;
 	}
 
 	Ok((candidates, voters))
diff --git a/primitives/npos-elections/src/phragmms.rs b/primitives/npos-elections/src/phragmms.rs
index b0f841e57f24..b37d3432f9d7 100644
--- a/primitives/npos-elections/src/phragmms.rs
+++ b/primitives/npos-elections/src/phragmms.rs
@@ -23,7 +23,7 @@
 
 use crate::{
 	IdentifierT, ElectionResult, ExtendedBalance, setup_inputs, VoteWeight, Voter, CandidatePtr,
-	balance,
+	balance, PerThing128,
 };
 use sp_arithmetic::{PerThing, InnerOf, Rational128, traits::Bounded};
 use sp_std::{prelude::*, rc::Rc};
@@ -41,13 +41,14 @@ use sp_std::{prelude::*, rc::Rc};
 /// assignments, `assignment.distribution.map(|p| p.deconstruct()).sum()` fails to fit inside
 /// `UpperOf<P>`. A user of this crate may statically assert that this can never happen and safely
 /// `expect` this to return `Ok`.
-pub fn phragmms<AccountId: IdentifierT, P: PerThing>(
+pub fn phragmms<AccountId: IdentifierT, P: PerThing128>(
 	to_elect: usize,
 	initial_candidates: Vec<AccountId>,
 	initial_voters: Vec<(AccountId, VoteWeight, Vec<AccountId>)>,
 	balancing_config: Option<(usize, ExtendedBalance)>,
 ) -> Result<ElectionResult<AccountId, P>, &'static str>
-	where ExtendedBalance: From<InnerOf<P>>
+where
+	ExtendedBalance: From<InnerOf<P>>,
 {
 	let (candidates, mut voters) = setup_inputs(initial_candidates, initial_voters);
 
diff --git a/primitives/npos-elections/src/tests.rs b/primitives/npos-elections/src/tests.rs
index 1d26909911f3..edfea038ebc5 100644
--- a/primitives/npos-elections/src/tests.rs
+++ b/primitives/npos-elections/src/tests.rs
@@ -17,14 +17,13 @@
 
 //! Tests for npos-elections.
 
-use crate::mock::*;
 use crate::{
-	seq_phragmen, balancing, build_support_map, is_score_better, helpers::*,
-	Support, StakedAssignment, Assignment, ElectionResult, ExtendedBalance, setup_inputs,
-	seq_phragmen_core, Voter,
+	balancing, helpers::*, is_score_better, mock::*, seq_phragmen, seq_phragmen_core, setup_inputs,
+	to_support_map, to_supports, Assignment, ElectionResult, ExtendedBalance, StakedAssignment,
+	Support, Voter, EvaluateSupport,
 };
+use sp_arithmetic::{PerU16, Perbill, Percent, Permill};
 use substrate_test_utils::assert_eq_uvec;
-use sp_arithmetic::{Perbill, Permill, Percent, PerU16};
 
 #[test]
 fn float_phragmen_poc_works() {
@@ -53,22 +52,22 @@ fn float_phragmen_poc_works() {
 
 	assert_eq!(
 		support_map.get(&2).unwrap(),
-		&_Support { own: 0.0, total: 25.0, others: vec![(10u64, 10.0), (30u64, 15.0)]}
+		&_Support { own: 0.0, total: 25.0, others: vec![(10u64, 10.0), (30u64, 15.0)] }
 	);
 	assert_eq!(
 		support_map.get(&3).unwrap(),
-		&_Support { own: 0.0, total: 35.0, others: vec![(20u64, 20.0), (30u64, 15.0)]}
+		&_Support { own: 0.0, total: 35.0, others: vec![(20u64, 20.0), (30u64, 15.0)] }
 	);
 
 	equalize_float(phragmen_result.assignments, &mut support_map, 0.0, 2, stake_of);
 
 	assert_eq!(
 		support_map.get(&2).unwrap(),
-		&_Support { own: 0.0, total: 30.0, others: vec![(10u64, 10.0), (30u64, 20.0)]}
+		&_Support { own: 0.0, total: 30.0, others: vec![(10u64, 10.0), (30u64, 20.0)] }
 	);
 	assert_eq!(
 		support_map.get(&3).unwrap(),
-		&_Support { own: 0.0, total: 30.0, others: vec![(20u64, 20.0), (30u64, 10.0)]}
+		&_Support { own: 0.0, total: 30.0, others: vec![(20u64, 20.0), (30u64, 10.0)] }
 	);
 }
 
@@ -300,7 +299,7 @@ fn phragmen_poc_works() {
 
 	let staked = assignment_ratio_to_staked(assignments, &stake_of);
 	let winners = to_without_backing(winners);
-	let support_map = build_support_map::<AccountId>(&winners, &staked).unwrap();
+	let support_map = to_support_map::<AccountId>(&winners, &staked).unwrap();
 
 	assert_eq_uvec!(
 		staked,
@@ -374,7 +373,7 @@ fn phragmen_poc_works_with_balancing() {
 
 	let staked = assignment_ratio_to_staked(assignments, &stake_of);
 	let winners = to_without_backing(winners);
-	let support_map = build_support_map::<AccountId>(&winners, &staked).unwrap();
+	let support_map = to_support_map::<AccountId>(&winners, &staked).unwrap();
 
 	assert_eq_uvec!(
 		staked,
@@ -766,7 +765,7 @@ fn phragmen_self_votes_should_be_kept() {
 
 	let staked_assignments = assignment_ratio_to_staked(result.assignments, &stake_of);
 	let winners = to_without_backing(result.winners);
-	let supports = build_support_map::<AccountId>(&winners, &staked_assignments).unwrap();
+	let supports = to_support_map::<AccountId>(&winners, &staked_assignments).unwrap();
 
 	assert_eq!(supports.get(&5u64), None);
 	assert_eq!(
@@ -839,6 +838,34 @@ fn duplicate_target_is_ignored_when_winner() {
 	);
 }
 
+#[test]
+fn support_map_and_vec_can_be_evaluated() {
+	let candidates = vec![1, 2, 3];
+	let voters = vec![(10, vec![1, 2]), (20, vec![1, 3]), (30, vec![2, 3])];
+
+	let stake_of = create_stake_of(&[(10, 10), (20, 20), (30, 30)]);
+	let ElectionResult {
+		winners,
+		assignments,
+	} = seq_phragmen::<_, Perbill>(
+		2,
+		candidates,
+		voters
+			.iter()
+			.map(|(ref v, ref vs)| (v.clone(), stake_of(v), vs.clone()))
+			.collect::<Vec<_>>(),
+		None,
+	)
+	.unwrap();
+
+	let staked = assignment_ratio_to_staked(assignments, &stake_of);
+	let winners = to_without_backing(winners);
+	let support_map = to_support_map::<AccountId>(&winners, &staked).unwrap();
+	let support_vec = to_supports(&winners, &staked).unwrap();
+
+	assert_eq!(support_map.evaluate(), support_vec.evaluate());
+}
+
 mod assignment_convert_normalize {
 	use super::*;
 	#[test]
@@ -1112,15 +1139,12 @@ mod score {
 }
 
 mod solution_type {
-	use codec::{Decode, Encode};
 	use super::AccountId;
+	use codec::{Decode, Encode};
 	// these need to come from the same dev-dependency `sp-npos-elections`, not from the crate.
-	use crate::{
-		generate_solution_type, Assignment,
-		Error as PhragmenError,
-	};
-	use sp_std::{convert::TryInto, fmt::Debug};
+	use crate::{generate_solution_type, Assignment, CompactSolution, Error as PhragmenError};
 	use sp_arithmetic::Percent;
+	use sp_std::{convert::TryInto, fmt::Debug};
 
 	type TestAccuracy = Percent;
 
@@ -1136,7 +1160,6 @@ mod solution_type {
 			#[compact]
 			struct InnerTestSolutionCompact::<u32, u8, Percent>(12)
 		);
-
 	}
 
 	#[test]
@@ -1190,7 +1213,7 @@ mod solution_type {
 			compact,
 			Decode::decode(&mut &encoded[..]).unwrap(),
 		);
-		assert_eq!(compact.len(), 4);
+		assert_eq!(compact.voter_count(), 4);
 		assert_eq!(compact.edge_count(), 2 + 4);
 		assert_eq!(compact.unique_targets(), vec![10, 11, 20, 40, 50, 51]);
 	}
@@ -1326,7 +1349,7 @@ mod solution_type {
 		).unwrap();
 
 		// basically number of assignments that it is encoding.
-		assert_eq!(compacted.len(), assignments.len());
+		assert_eq!(compacted.voter_count(), assignments.len());
 		assert_eq!(
 			compacted.edge_count(),
 			assignments.iter().fold(0, |a, b| a + b.distribution.len()),
@@ -1410,9 +1433,12 @@ mod solution_type {
 			..Default::default()
 		};
 
-		assert_eq!(compact.unique_targets(), vec![1, 2, 3, 4, 7, 8, 11, 12, 13, 66, 67]);
+		assert_eq!(
+			compact.unique_targets(),
+			vec![1, 2, 3, 4, 7, 8, 11, 12, 13, 66, 67]
+		);
 		assert_eq!(compact.edge_count(), 2 + (2 * 2) + 3 + 16);
-		assert_eq!(compact.len(), 6);
+		assert_eq!(compact.voter_count(), 6);
 
 		// this one has some duplicates.
 		let compact = TestSolutionCompact {
@@ -1429,7 +1455,7 @@ mod solution_type {
 
 		assert_eq!(compact.unique_targets(), vec![1, 3, 4, 7, 8, 11, 13]);
 		assert_eq!(compact.edge_count(), 2 + (2 * 2) + 3);
-		assert_eq!(compact.len(), 5);
+		assert_eq!(compact.voter_count(), 5);
 	}
 
 	#[test]

From 26795994cfc9ccab0354f1a1054eecdda46209a8 Mon Sep 17 00:00:00 2001
From: honeywest <50997103+honeywest@users.noreply.github.com>
Date: Mon, 18 Jan 2021 20:07:09 +0800
Subject: [PATCH 0286/1194] Feat suppert procedural (#7913)

* fix clippy replace clone with copy

* fix clippy warning pattern

* fix clippy warning replace into_iter with iter

* replace match with if let

* replace =0 with is_empty

* replace or with or_else

* replace vec! with Vec::new
---
 .../procedural/src/construct_runtime/mod.rs   | 68 +++++++++----------
 .../procedural/src/construct_runtime/parse.rs |  2 +-
 .../procedural/src/pallet/expand/call.rs      |  2 +-
 .../procedural/src/pallet/parse/call.rs       |  2 +-
 .../procedural/src/pallet/parse/config.rs     |  4 +-
 .../procedural/src/pallet/parse/event.rs      |  6 +-
 .../src/pallet/parse/extra_constants.rs       |  4 +-
 .../procedural/src/pallet/parse/helper.rs     |  2 +-
 .../procedural/src/pallet/parse/mod.rs        | 32 ++++-----
 .../procedural/src/pallet/parse/origin.rs     |  2 +-
 .../procedural/src/pallet/parse/storage.rs    |  2 +-
 .../procedural/src/pallet/parse/type_value.rs |  8 +--
 .../support/procedural/src/pallet_version.rs  |  2 +-
 .../src/storage/print_pallet_upgrade.rs       |  4 +-
 14 files changed, 67 insertions(+), 73 deletions(-)

diff --git a/frame/support/procedural/src/construct_runtime/mod.rs b/frame/support/procedural/src/construct_runtime/mod.rs
index 31fc71faf44f..fc799c923b0b 100644
--- a/frame/support/procedural/src/construct_runtime/mod.rs
+++ b/frame/support/procedural/src/construct_runtime/mod.rs
@@ -205,7 +205,7 @@ fn construct_runtime_parsed(definition: RuntimeDefinition) -> Result<TokenStream
 		#integrity_test
 	);
 
-	Ok(res.into())
+	Ok(res)
 }
 
 fn decl_validate_unsigned<'a>(
@@ -299,7 +299,7 @@ fn decl_runtime_metadata<'a>(
 			module_declaration.find_part("Module").map(|_| {
 				let filtered_names: Vec<_> = module_declaration
 					.module_parts()
-					.into_iter()
+					.iter()
 					.filter(|part| part.name() != "Module")
 					.map(|part| part.ident())
 					.collect();
@@ -360,24 +360,21 @@ fn decl_outer_origin<'a>(
 ) -> syn::Result<TokenStream2> {
 	let mut modules_tokens = TokenStream2::new();
 	for module_declaration in modules_except_system {
-		match module_declaration.find_part("Origin") {
-			Some(module_entry) => {
-				let module = &module_declaration.module;
-				let instance = module_declaration.instance.as_ref();
-				let generics = &module_entry.generics;
-				if instance.is_some() && generics.params.len() == 0 {
-					let msg = format!(
-						"Instantiable module with no generic `Origin` cannot \
-						 be constructed: module `{}` must have generic `Origin`",
-						module_declaration.name
-					);
-					return Err(syn::Error::new(module_declaration.name.span(), msg));
-				}
-				let index = module_declaration.index.to_string();
-				let tokens = quote!(#[codec(index = #index)] #module #instance #generics,);
-				modules_tokens.extend(tokens);
+		if let Some(module_entry) = module_declaration.find_part("Origin") {
+			let module = &module_declaration.module;
+			let instance = module_declaration.instance.as_ref();
+			let generics = &module_entry.generics;
+			if instance.is_some() && generics.params.is_empty() {
+				let msg = format!(
+					"Instantiable module with no generic `Origin` cannot \
+					 be constructed: module `{}` must have generic `Origin`",
+					module_declaration.name
+				);
+				return Err(syn::Error::new(module_declaration.name.span(), msg));
 			}
-			None => {}
+			let index = module_declaration.index.to_string();
+			let tokens = quote!(#[codec(index = #index)] #module #instance #generics,);
+			modules_tokens.extend(tokens);
 		}
 	}
 
@@ -403,25 +400,22 @@ fn decl_outer_event<'a>(
 ) -> syn::Result<TokenStream2> {
 	let mut modules_tokens = TokenStream2::new();
 	for module_declaration in module_declarations {
-		match module_declaration.find_part("Event") {
-			Some(module_entry) => {
-				let module = &module_declaration.module;
-				let instance = module_declaration.instance.as_ref();
-				let generics = &module_entry.generics;
-				if instance.is_some() && generics.params.len() == 0 {
-					let msg = format!(
-						"Instantiable module with no generic `Event` cannot \
-						 be constructed: module `{}` must have generic `Event`",
-						module_declaration.name,
-					);
-					return Err(syn::Error::new(module_declaration.name.span(), msg));
-				}
-
-				let index = module_declaration.index.to_string();
-				let tokens = quote!(#[codec(index = #index)] #module #instance #generics,);
-				modules_tokens.extend(tokens);
+		if let Some(module_entry) = module_declaration.find_part("Event") {
+			let module = &module_declaration.module;
+			let instance = module_declaration.instance.as_ref();
+			let generics = &module_entry.generics;
+			if instance.is_some() && generics.params.is_empty() {
+				let msg = format!(
+					"Instantiable module with no generic `Event` cannot \
+					 be constructed: module `{}` must have generic `Event`",
+					module_declaration.name,
+				);
+				return Err(syn::Error::new(module_declaration.name.span(), msg));
 			}
-			None => {}
+
+			let index = module_declaration.index.to_string();
+			let tokens = quote!(#[codec(index = #index)] #module #instance #generics,);
+			modules_tokens.extend(tokens);
 		}
 	}
 
diff --git a/frame/support/procedural/src/construct_runtime/parse.rs b/frame/support/procedural/src/construct_runtime/parse.rs
index b6c9ce8375fa..6d4ba6cdbf74 100644
--- a/frame/support/procedural/src/construct_runtime/parse.rs
+++ b/frame/support/procedural/src/construct_runtime/parse.rs
@@ -333,7 +333,7 @@ impl Parse for ModulePart {
 
 impl ModulePart {
 	pub fn format_names(names: &[&'static str]) -> String {
-		let res: Vec<_> = names.into_iter().map(|s| format!("`{}`", s)).collect();
+		let res: Vec<_> = names.iter().map(|s| format!("`{}`", s)).collect();
 		res.join(", ")
 	}
 
diff --git a/frame/support/procedural/src/pallet/expand/call.rs b/frame/support/procedural/src/pallet/expand/call.rs
index 215997dfcf15..830fd267dc9b 100644
--- a/frame/support/procedural/src/pallet/expand/call.rs
+++ b/frame/support/procedural/src/pallet/expand/call.rs
@@ -27,7 +27,7 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
 	let type_impl_gen = &def.type_impl_generics(def.call.attr_span);
 	let type_decl_bounded_gen = &def.type_decl_bounded_generics(def.call.attr_span);
 	let type_use_gen = &def.type_use_generics(def.call.attr_span);
-	let call_ident = syn::Ident::new("Call", def.call.attr_span.clone());
+	let call_ident = syn::Ident::new("Call", def.call.attr_span);
 	let pallet_ident = &def.pallet_struct.pallet;
 	let where_clause = &def.call.where_clause;
 
diff --git a/frame/support/procedural/src/pallet/parse/call.rs b/frame/support/procedural/src/pallet/parse/call.rs
index e26e2ca1ab5c..514dc9203e5c 100644
--- a/frame/support/procedural/src/pallet/parse/call.rs
+++ b/frame/support/procedural/src/pallet/parse/call.rs
@@ -174,7 +174,7 @@ impl CallDef {
 					helper::take_item_attrs(&mut method.attrs)?;
 
 				if call_var_attrs.len() != 1 {
-					let msg = if call_var_attrs.len() == 0 {
+					let msg = if call_var_attrs.is_empty() {
 						"Invalid pallet::call, require weight attribute i.e. `#[pallet::weight = $expr]`"
 					} else {
 						"Invalid pallet::call, too many weight attributes given"
diff --git a/frame/support/procedural/src/pallet/parse/config.rs b/frame/support/procedural/src/pallet/parse/config.rs
index 44298c1d7fe4..44525164f03d 100644
--- a/frame/support/procedural/src/pallet/parse/config.rs
+++ b/frame/support/procedural/src/pallet/parse/config.rs
@@ -255,7 +255,7 @@ pub fn replace_self_by_t(input: proc_macro2::TokenStream) -> proc_macro2::TokenS
 				).into(),
 			proc_macro2::TokenTree::Ident(ident) if ident == "Self" =>
 				proc_macro2::Ident::new("T", ident.span()).into(),
-			other @ _ => other
+			other => other
 		})
 		.collect()
 }
@@ -294,7 +294,7 @@ impl ConfigDef {
 			return Err(syn::Error::new(item.generics.params[2].span(), msg));
 		}
 
-		let has_instance = if let Some(_) = item.generics.params.first() {
+		let has_instance = if item.generics.params.first().is_some() {
 			helper::check_config_def_gen(&item.generics, item.ident.span())?;
 			true
 		} else {
diff --git a/frame/support/procedural/src/pallet/parse/event.rs b/frame/support/procedural/src/pallet/parse/event.rs
index 3d2f12a133b2..7d8b7d075ef2 100644
--- a/frame/support/procedural/src/pallet/parse/event.rs
+++ b/frame/support/procedural/src/pallet/parse/event.rs
@@ -72,8 +72,8 @@ enum PalletEventAttr {
 impl PalletEventAttr {
 	fn span(&self) -> proc_macro2::Span {
 		match self {
-			Self::Metadata { span, .. } => span.clone(),
-			Self::DepositEvent { span, .. } => span.clone(),
+			Self::Metadata { span, .. } => *span,
+			Self::DepositEvent { span, .. } => *span,
 		}
 	}
 }
@@ -165,7 +165,7 @@ impl EventDef {
 
 		let event_attrs: Vec<PalletEventAttr> = helper::take_item_attrs(&mut item.attrs)?;
 		let attr_info = PalletEventAttrInfo::from_attrs(event_attrs)?;
-		let metadata = attr_info.metadata.unwrap_or_else(|| vec![]);
+		let metadata = attr_info.metadata.unwrap_or_else(Vec::new);
 		let deposit_event = attr_info.deposit_event;
 
 		if !matches!(item.vis, syn::Visibility::Public(_)) {
diff --git a/frame/support/procedural/src/pallet/parse/extra_constants.rs b/frame/support/procedural/src/pallet/parse/extra_constants.rs
index 4b03fd99f1fd..430bf9478377 100644
--- a/frame/support/procedural/src/pallet/parse/extra_constants.rs
+++ b/frame/support/procedural/src/pallet/parse/extra_constants.rs
@@ -81,12 +81,12 @@ impl ExtraConstantsDef {
 				return Err(syn::Error::new(impl_item.span(), msg));
 			};
 
-			if method.sig.inputs.len() != 0 {
+			if !method.sig.inputs.is_empty() {
 				let msg = "Invalid pallet::extra_constants, method must have 0 args";
 				return Err(syn::Error::new(method.sig.span(), msg));
 			}
 
-			if method.sig.generics.params.len() != 0 {
+			if !method.sig.generics.params.is_empty() {
 				let msg = "Invalid pallet::extra_constants, method must have 0 generics";
 				return Err(syn::Error::new(method.sig.generics.params[0].span(), msg));
 			}
diff --git a/frame/support/procedural/src/pallet/parse/helper.rs b/frame/support/procedural/src/pallet/parse/helper.rs
index 9d4298cc005c..9570293cccb5 100644
--- a/frame/support/procedural/src/pallet/parse/helper.rs
+++ b/frame/support/procedural/src/pallet/parse/helper.rs
@@ -136,7 +136,7 @@ pub fn get_doc_literals(attrs: &Vec<syn::Attribute>) -> Vec<syn::Lit> {
 		.filter_map(|attr| {
 			if let Ok(syn::Meta::NameValue(meta)) = attr.parse_meta() {
 				if meta.path.get_ident().map_or(false, |ident| ident == "doc") {
-					Some(meta.lit.clone())
+					Some(meta.lit)
 				} else {
 					None
 				}
diff --git a/frame/support/procedural/src/pallet/parse/mod.rs b/frame/support/procedural/src/pallet/parse/mod.rs
index be54f709a47a..4d8f239ded0a 100644
--- a/frame/support/procedural/src/pallet/parse/mod.rs
+++ b/frame/support/procedural/src/pallet/parse/mod.rs
@@ -66,7 +66,7 @@ impl Def {
 		let frame_system = generate_crate_access_2018("frame-system")?;
 		let frame_support = generate_crate_access_2018("frame-support")?;
 
-		let item_span = item.span().clone();
+		let item_span = item.span();
 		let items = &mut item.content.as_mut()
 			.ok_or_else(|| {
 				let msg = "Invalid pallet definition, expected mod to be inlined.";
@@ -152,7 +152,7 @@ impl Def {
 		}
 
 		let def = Def {
-			item: item,
+			item,
 			config: config.ok_or_else(|| syn::Error::new(item_span, "Missing `#[pallet::config]`"))?,
 			pallet_struct: pallet_struct
 				.ok_or_else(|| syn::Error::new(item_span, "Missing `#[pallet::pallet]`"))?,
@@ -403,20 +403,20 @@ enum PalletAttr {
 impl PalletAttr {
 	fn span(&self) -> proc_macro2::Span {
 		match self {
-			Self::Config(span) => span.clone(),
-			Self::Pallet(span) => span.clone(),
-			Self::Hooks(span) => span.clone(),
-			Self::Call(span) => span.clone(),
-			Self::Error(span) => span.clone(),
-			Self::Event(span) => span.clone(),
-			Self::Origin(span) => span.clone(),
-			Self::Inherent(span) => span.clone(),
-			Self::Storage(span) => span.clone(),
-			Self::GenesisConfig(span) => span.clone(),
-			Self::GenesisBuild(span) => span.clone(),
-			Self::ValidateUnsigned(span) => span.clone(),
-			Self::TypeValue(span) => span.clone(),
-			Self::ExtraConstants(span) => span.clone(),
+			Self::Config(span) => *span,
+			Self::Pallet(span) => *span,
+			Self::Hooks(span) => *span,
+			Self::Call(span) => *span,
+			Self::Error(span) => *span,
+			Self::Event(span) => *span,
+			Self::Origin(span) => *span,
+			Self::Inherent(span) => *span,
+			Self::Storage(span) => *span,
+			Self::GenesisConfig(span) => *span,
+			Self::GenesisBuild(span) => *span,
+			Self::ValidateUnsigned(span) => *span,
+			Self::TypeValue(span) => *span,
+			Self::ExtraConstants(span) => *span,
 		}
 	}
 }
diff --git a/frame/support/procedural/src/pallet/parse/origin.rs b/frame/support/procedural/src/pallet/parse/origin.rs
index 6cb8520dbf15..2b47978b808a 100644
--- a/frame/support/procedural/src/pallet/parse/origin.rs
+++ b/frame/support/procedural/src/pallet/parse/origin.rs
@@ -47,7 +47,7 @@ impl OriginDef {
 		};
 
 		let has_instance = generics.params.len() == 2;
-		let is_generic = generics.params.len() > 0;
+		let is_generic = !generics.params.is_empty();
 
 		let mut instances = vec![];
 		if let Some(u) = helper::check_type_def_optional_gen(&generics, item.span())? {
diff --git a/frame/support/procedural/src/pallet/parse/storage.rs b/frame/support/procedural/src/pallet/parse/storage.rs
index cbf252a0c073..c0da266cfca2 100644
--- a/frame/support/procedural/src/pallet/parse/storage.rs
+++ b/frame/support/procedural/src/pallet/parse/storage.rs
@@ -173,7 +173,7 @@ impl StorageDef {
 					value: retrieve_arg(&typ.path.segments[0], 5)?,
 				}
 			}
-			found @ _ => {
+			found => {
 				let msg = format!(
 					"Invalid pallet::storage, expected ident: `StorageValue` or \
 					`StorageMap` or `StorageDoubleMap` in order to expand metadata, found \
diff --git a/frame/support/procedural/src/pallet/parse/type_value.rs b/frame/support/procedural/src/pallet/parse/type_value.rs
index 5d901e772c91..58e6105818e0 100644
--- a/frame/support/procedural/src/pallet/parse/type_value.rs
+++ b/frame/support/procedural/src/pallet/parse/type_value.rs
@@ -60,10 +60,10 @@ impl TypeValueDef {
 		}
 
 		if let Some(span) = item.sig.constness.as_ref().map(|t| t.span())
-			.or(item.sig.asyncness.as_ref().map(|t| t.span()))
-			.or(item.sig.unsafety.as_ref().map(|t| t.span()))
-			.or(item.sig.abi.as_ref().map(|t| t.span()))
-			.or(item.sig.variadic.as_ref().map(|t| t.span()))
+			.or_else(|| item.sig.asyncness.as_ref().map(|t| t.span()))
+			.or_else(|| item.sig.unsafety.as_ref().map(|t| t.span()))
+			.or_else(|| item.sig.abi.as_ref().map(|t| t.span()))
+			.or_else(|| item.sig.variadic.as_ref().map(|t| t.span()))
 		{
 			let msg = "Invalid pallet::type_value, unexpected token";
 			return Err(syn::Error::new(span, msg));
diff --git a/frame/support/procedural/src/pallet_version.rs b/frame/support/procedural/src/pallet_version.rs
index d7227b47bae8..0f3c478d4977 100644
--- a/frame/support/procedural/src/pallet_version.rs
+++ b/frame/support/procedural/src/pallet_version.rs
@@ -27,7 +27,7 @@ use frame_support_procedural_tools::generate_crate_access_2018;
 /// The version is parsed into the requested destination type.
 fn get_version<T: FromStr>(version_env: &str) -> std::result::Result<T, ()> {
 	let version = env::var(version_env)
-		.expect(&format!("`{}` is always set by cargo; qed", version_env));
+		.unwrap_or_else(|_| panic!("`{}` is always set by cargo; qed", version_env));
 
 	T::from_str(&version).map_err(drop)
 }
diff --git a/frame/support/procedural/src/storage/print_pallet_upgrade.rs b/frame/support/procedural/src/storage/print_pallet_upgrade.rs
index e6c6b75dc197..447d13898e8d 100644
--- a/frame/support/procedural/src/storage/print_pallet_upgrade.rs
+++ b/frame/support/procedural/src/storage/print_pallet_upgrade.rs
@@ -200,7 +200,7 @@ pub fn maybe_print_pallet_upgrade(def: &super::DeclStorageDefExt) {
 					default_expr = to_cleaned_string(&default_expr),
 				)
 			})
-			.unwrap_or_else(|| String::new());
+			.unwrap_or_else(String::new);
 
 		let comma_query_kind = if line.is_option {
 			if line.default_value.is_some() {
@@ -214,7 +214,7 @@ pub fn maybe_print_pallet_upgrade(def: &super::DeclStorageDefExt) {
 
 		let comma_default_value_getter_name = line.default_value.as_ref()
 			.map(|_| format!(", DefaultFor{}", line.name))
-			.unwrap_or_else(|| String::new());
+			.unwrap_or_else(String::new);
 
 		let typ = match &line.storage_type {
 			StorageLineTypeDef::Map(map) => {

From 8aa92811b05bdcc9270b09b0370ac9b9ec56d8b8 Mon Sep 17 00:00:00 2001
From: Krzysztof Jelski <kjelski@gmail.com>
Date: Mon, 18 Jan 2021 14:11:30 +0100
Subject: [PATCH 0287/1194] Expose BountyUpdatePeriod. (#7921)

---
 frame/bounties/src/lib.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frame/bounties/src/lib.rs b/frame/bounties/src/lib.rs
index a8b97d9e33b8..ba0d4a5b16cb 100644
--- a/frame/bounties/src/lib.rs
+++ b/frame/bounties/src/lib.rs
@@ -185,7 +185,7 @@ pub enum BountyStatus<AccountId, BlockNumber> {
 	},
 }
 
-// Note :: For backward compatability reasons,
+// Note :: For backward compatibility reasons,
 // pallet-bounties uses Treasury for storage.
 // This is temporary solution, soon will get replaced with
 // Own storage identifier.
@@ -270,6 +270,9 @@ decl_module! {
 		/// The delay period for which a bounty beneficiary need to wait before claim the payout.
 		const BountyDepositPayoutDelay: T::BlockNumber = T::BountyDepositPayoutDelay::get();
 
+		/// Bounty duration in blocks.
+		const BountyUpdatePeriod: T::BlockNumber = T::BountyUpdatePeriod::get();
+
 		/// Percentage of the curator fee that will be reserved upfront as deposit for bounty curator.
 		const BountyCuratorDeposit: Permill = T::BountyCuratorDeposit::get();
 

From 74a50abd6cbaad1253daf3585d5cdaa4592e9184 Mon Sep 17 00:00:00 2001
From: Black3HDF <29630164+Satoshi-Kusumoto@users.noreply.github.com>
Date: Mon, 18 Jan 2021 22:08:19 +0800
Subject: [PATCH 0288/1194] Add ss58 version prefix for Litentry (#7918)

---
 primitives/core/src/crypto.rs | 2 ++
 ss58-registry.json            | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index 22fb97ae5cc4..2cc2d703c617 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -504,6 +504,8 @@ ss58_address_format!(
 		(29, "cord", "Dhiway CORD network, standard account (*25519).")	
 	PhalaAccount =>
 		(30, "phala", "Phala Network, standard account (*25519).")
+	LitentryAccount =>
+		(31, "litentry", "Litentry Network, standard account (*25519).")
 	RobonomicsAccount =>
 		(32, "robonomics", "Any Robonomics network standard account (*25519).")
 	DataHighwayAccount =>
diff --git a/ss58-registry.json b/ss58-registry.json
index 7cb4e5d2c306..d30618e56e5a 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -289,6 +289,15 @@
 			"standardAccount": "*25519",
 			"website": "https://phala.network"
 		},
+		{
+			"prefix": 31,
+			"network": "litentry",
+			"displayName": "Litentry Network",
+			"symbols": ["LIT"],
+			"decimals": [12],
+			"standardAccount": "*25519",
+			"website": "https://litentry.com/"
+		},
 		{
 			"prefix": 32,
 			"network": "robonomics",

From cde8232d80ec97afd73997951ae7830e064d2404 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Mon, 18 Jan 2021 16:52:25 +0100
Subject: [PATCH 0289/1194] Address review comments of #7916 (#7917)

---
 client/network/src/config.rs    | 4 ++--
 client/network/src/transport.rs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/network/src/config.rs b/client/network/src/config.rs
index 6ba31272da56..8c100875bef7 100644
--- a/client/network/src/config.rs
+++ b/client/network/src/config.rs
@@ -402,8 +402,8 @@ pub struct NetworkConfiguration {
 	/// presence of potentially adversarial nodes.
 	pub kademlia_disjoint_query_paths: bool,
 
-	/// Size of Yamux window receive window of all substreams. `None` for the default (256kiB).
-	/// Any value inferior to 256kiB is invalid.
+	/// Size of Yamux receive window of all substreams. `None` for the default (256kiB).
+	/// Any value less than 256kiB is invalid.
 	///
 	/// # Context
 	///
diff --git a/client/network/src/transport.rs b/client/network/src/transport.rs
index 6896e5985637..da0e5aa059b6 100644
--- a/client/network/src/transport.rs
+++ b/client/network/src/transport.rs
@@ -35,8 +35,8 @@ pub use self::bandwidth::BandwidthSinks;
 /// If `memory_only` is true, then only communication within the same process are allowed. Only
 /// addresses with the format `/memory/...` are allowed.
 ///
-/// `yamux_window_size` consists in the size of the Yamux windows. `None` to leave the default
-/// (256kiB).
+///`yamux_window_size` is the maximum size of the Yamux receive windows. `None` to leave the
+/// default (256kiB).
 ///
 /// Returns a `BandwidthSinks` object that allows querying the average bandwidth produced by all
 /// the connections spawned with this transport.

From 2b47773ec33ff4c441ab67e7e44c811a9609a4a7 Mon Sep 17 00:00:00 2001
From: Adam Dossa <adam.dossa@gmail.com>
Date: Mon, 18 Jan 2021 16:48:32 +0000
Subject: [PATCH 0290/1194] Update details for the Polymesh network (#7919)

Co-authored-by: Adam Dossa <adamdossa@Adams-MacBook-Pro.local>
---
 ss58-registry.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ss58-registry.json b/ss58-registry.json
index d30618e56e5a..46d00893207b 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -120,12 +120,12 @@
 		},
 		{
 			"prefix": 12,
-			"network": "polymath",
-			"displayName": "Polymath",
-			"symbols": null,
-			"decimals": null,
+			"network": "polymesh",
+			"displayName": "Polymesh",
+			"symbols": ["POLYX"],
+			"decimals": [6],
 			"standardAccount": "*25519",
-			"website": null
+			"website": "https://polymath.network/"
 		},
 		{
 			"prefix": 13,

From 6c14fac56733c5623ef2497bff9e69558ea7506a Mon Sep 17 00:00:00 2001
From: Sergei Lonshakov <sergeylonshakov@gmail.com>
Date: Mon, 18 Jan 2021 23:29:57 +0400
Subject: [PATCH 0291/1194] Update ss58 registry for Robonomics (#7923)

---
 ss58-registry.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ss58-registry.json b/ss58-registry.json
index 46d00893207b..4501571fa322 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -301,11 +301,11 @@
 		{
 			"prefix": 32,
 			"network": "robonomics",
-			"displayName": "Robonomics Network",
-			"symbols": null,
-			"decimals": null,
+			"displayName": "Robonomics",
+			"symbols": ["XRT"],
+			"decimals": [9],
 			"standardAccount": "*25519",
-			"website": null
+			"website": "https://robonomics.network"
 		},
 		{
 			"prefix": 33,

From e3b63153e59ee7388085f87b7b67d06d163a2780 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Mon, 18 Jan 2021 21:27:17 +0000
Subject: [PATCH 0292/1194] babe: log block and slot number on verification
 (#7920)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* babe: log block and slot number on verification

* babe: debug log formatting

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 client/consensus/babe/src/verification.rs | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/client/consensus/babe/src/verification.rs b/client/consensus/babe/src/verification.rs
index 47c4da0834d0..5d657b8b9711 100644
--- a/client/consensus/babe/src/verification.rs
+++ b/client/consensus/babe/src/verification.rs
@@ -95,7 +95,11 @@ pub(super) fn check_header<B: BlockT + Sized>(
 
 	match &pre_digest {
 		PreDigest::Primary(primary) => {
-			debug!(target: "babe", "Verifying Primary block");
+			debug!(target: "babe",
+				"Verifying primary block #{} at slot: {}",
+				header.number(),
+				primary.slot_number,
+			);
 
 			check_primary_header::<B>(
 				pre_hash,
@@ -106,7 +110,12 @@ pub(super) fn check_header<B: BlockT + Sized>(
 			)?;
 		},
 		PreDigest::SecondaryPlain(secondary) if epoch.config.allowed_slots.is_secondary_plain_slots_allowed() => {
-			debug!(target: "babe", "Verifying Secondary plain block");
+			debug!(target: "babe",
+				"Verifying secondary plain block #{} at slot: {}",
+				header.number(),
+				secondary.slot_number,
+			);
+
 			check_secondary_plain_header::<B>(
 				pre_hash,
 				secondary,
@@ -115,7 +124,12 @@ pub(super) fn check_header<B: BlockT + Sized>(
 			)?;
 		},
 		PreDigest::SecondaryVRF(secondary) if epoch.config.allowed_slots.is_secondary_vrf_slots_allowed() => {
-			debug!(target: "babe", "Verifying Secondary VRF block");
+			debug!(target: "babe",
+				"Verifying secondary VRF block #{} at slot: {}",
+				header.number(),
+				secondary.slot_number,
+			);
+
 			check_secondary_vrf_header::<B>(
 				pre_hash,
 				secondary,

From b64ec19641fea539d56b81466e77552157afe716 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Tue, 19 Jan 2021 12:00:37 +0100
Subject: [PATCH 0293/1194] Add explicit limits to notifications sizes and
 adjust yamux buffer size (#7925)

* Add explicit limits to notifications sizes and adjust yamux buffer size

* Docfix

* Tests

* Document these 10 bytes
---
 client/finality-grandpa/src/lib.rs            |  2 +
 client/network/src/config.rs                  |  2 +
 client/network/src/gossip/tests.rs            |  2 +
 client/network/src/protocol.rs                | 13 +++--
 .../src/protocol/generic_proto/behaviour.rs   |  6 +-
 .../src/protocol/generic_proto/handler.rs     | 31 ++++++----
 .../src/protocol/generic_proto/tests.rs       |  2 +-
 .../generic_proto/upgrade/notifications.rs    | 46 ++++++++++-----
 client/network/src/service.rs                 | 58 ++++++++++++++-----
 client/network/src/service/tests.rs           |  4 ++
 client/network/src/transport.rs               |  9 ++-
 client/network/test/src/lib.rs                |  1 +
 12 files changed, 125 insertions(+), 51 deletions(-)

diff --git a/client/finality-grandpa/src/lib.rs b/client/finality-grandpa/src/lib.rs
index 6215e2b9f993..040748448de6 100644
--- a/client/finality-grandpa/src/lib.rs
+++ b/client/finality-grandpa/src/lib.rs
@@ -672,6 +672,8 @@ pub struct GrandpaParams<Block: BlockT, C, N, SC, VR> {
 pub fn grandpa_peers_set_config() -> sc_network::config::NonDefaultSetConfig {
 	sc_network::config::NonDefaultSetConfig {
 		notifications_protocol: communication::GRANDPA_PROTOCOL_NAME.into(),
+		// Notifications reach ~256kiB in size at the time of writing on Kusama and Polkadot.
+		max_notification_size: 1024 * 1024,
 		set_config: sc_network::config::SetConfig {
 			in_peers: 25,
 			out_peers: 25,
diff --git a/client/network/src/config.rs b/client/network/src/config.rs
index 8c100875bef7..c0e2c66482b9 100644
--- a/client/network/src/config.rs
+++ b/client/network/src/config.rs
@@ -528,6 +528,8 @@ pub struct NonDefaultSetConfig {
 	/// > **Note**: This field isn't present for the default set, as this is handled internally
 	/// >           by the networking code.
 	pub notifications_protocol: Cow<'static, str>,
+	/// Maximum allowed size of single notifications.
+	pub max_notification_size: u64,
 	/// Base configuration.
 	pub set_config: SetConfig,
 }
diff --git a/client/network/src/gossip/tests.rs b/client/network/src/gossip/tests.rs
index d2bf4eeca61a..e0941357e844 100644
--- a/client/network/src/gossip/tests.rs
+++ b/client/network/src/gossip/tests.rs
@@ -144,6 +144,7 @@ fn build_nodes_one_proto()
 		extra_sets: vec![
 			config::NonDefaultSetConfig {
 				notifications_protocol: PROTOCOL_NAME,
+				max_notification_size: 1024 * 1024,
 				set_config: Default::default()
 			}
 		],
@@ -157,6 +158,7 @@ fn build_nodes_one_proto()
 		extra_sets: vec![
 			config::NonDefaultSetConfig {
 				notifications_protocol: PROTOCOL_NAME,
+				max_notification_size: 1024 * 1024,
 				set_config: config::SetConfig {
 					reserved_nodes: vec![config::MultiaddrWithPeerId {
 						multiaddr: listen_addr,
diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index 0a9efbb3ba01..31ba770e932f 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -475,16 +475,19 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 				best_hash,
 				genesis_hash,
 			).encode();
+
 			GenericProto::new(
 				protocol_id.clone(),
 				versions,
 				build_status_message::<B>(&config, best_number, best_hash, genesis_hash),
 				peerset,
-				iter::once((block_announces_protocol, block_announces_handshake))
-					.chain(iter::once((transactions_protocol, vec![])))
-					.chain(network_config.extra_sets.iter()
-						.map(|s| (s.notifications_protocol.clone(), handshake_message.clone()))
-					),
+				iter::once((block_announces_protocol, block_announces_handshake, 1024 * 1024))
+					.chain(iter::once((transactions_protocol, vec![], 1024 * 1024)))
+					.chain(network_config.extra_sets.iter().map(|s| (
+						s.notifications_protocol.clone(),
+						handshake_message.clone(),
+						s.max_notification_size
+					))),
 			)
 		};
 
diff --git a/client/network/src/protocol/generic_proto/behaviour.rs b/client/network/src/protocol/generic_proto/behaviour.rs
index 0547f96a311d..000d334d1847 100644
--- a/client/network/src/protocol/generic_proto/behaviour.rs
+++ b/client/network/src/protocol/generic_proto/behaviour.rs
@@ -103,7 +103,7 @@ pub struct GenericProto {
 	/// Notification protocols. Entries are only ever added and not removed.
 	/// Contains, for each protocol, the protocol name and the message to send as part of the
 	/// initial handshake.
-	notif_protocols: Vec<(Cow<'static, str>, Arc<RwLock<Vec<u8>>>)>,
+	notif_protocols: Vec<(Cow<'static, str>, Arc<RwLock<Vec<u8>>>, u64)>,
 
 	/// Receiver for instructions about who to connect to or disconnect from.
 	peerset: sc_peerset::Peerset,
@@ -374,10 +374,10 @@ impl GenericProto {
 		versions: &[u8],
 		handshake_message: Vec<u8>,
 		peerset: sc_peerset::Peerset,
-		notif_protocols: impl Iterator<Item = (Cow<'static, str>, Vec<u8>)>,
+		notif_protocols: impl Iterator<Item = (Cow<'static, str>, Vec<u8>, u64)>,
 	) -> Self {
 		let notif_protocols = notif_protocols
-			.map(|(n, hs)| (n, Arc::new(RwLock::new(hs))))
+			.map(|(n, hs, sz)| (n, Arc::new(RwLock::new(hs)), sz))
 			.collect::<Vec<_>>();
 
 		assert!(!notif_protocols.is_empty());
diff --git a/client/network/src/protocol/generic_proto/handler.rs b/client/network/src/protocol/generic_proto/handler.rs
index 6d7e8b145a63..6fdcef1d7a2a 100644
--- a/client/network/src/protocol/generic_proto/handler.rs
+++ b/client/network/src/protocol/generic_proto/handler.rs
@@ -113,7 +113,7 @@ const INITIAL_KEEPALIVE_TIME: Duration = Duration::from_secs(5);
 pub struct NotifsHandlerProto {
 	/// Name of protocols, prototypes for upgrades for inbound substreams, and the message we
 	/// send or respond with in the handshake.
-	protocols: Vec<(Cow<'static, str>, NotificationsIn, Arc<RwLock<Vec<u8>>>)>,
+	protocols: Vec<(Cow<'static, str>, NotificationsIn, Arc<RwLock<Vec<u8>>>, u64)>,
 
 	/// Configuration for the legacy protocol upgrade.
 	legacy_protocol: RegisteredProtocol,
@@ -161,6 +161,9 @@ struct Protocol {
 	/// Handshake to send when opening a substream or receiving an open request.
 	handshake: Arc<RwLock<Vec<u8>>>,
 
+	/// Maximum allowed size of individual notifications.
+	max_notification_size: u64,
+
 	/// Current state of the substreams for this protocol.
 	state: State,
 }
@@ -226,7 +229,7 @@ impl IntoProtocolsHandler for NotifsHandlerProto {
 
 	fn inbound_protocol(&self) -> SelectUpgrade<UpgradeCollec<NotificationsIn>, RegisteredProtocol> {
 		let protocols = self.protocols.iter()
-			.map(|(_, p, _)| p.clone())
+			.map(|(_, p, _, _)| p.clone())
 			.collect::<UpgradeCollec<_>>();
 
 		SelectUpgrade::new(protocols, self.legacy_protocol.clone())
@@ -234,14 +237,15 @@ impl IntoProtocolsHandler for NotifsHandlerProto {
 
 	fn into_handler(self, peer_id: &PeerId, connected_point: &ConnectedPoint) -> Self::Handler {
 		NotifsHandler {
-			protocols: self.protocols.into_iter().map(|(name, in_upgrade, handshake)| {
+			protocols: self.protocols.into_iter().map(|(name, in_upgrade, handshake, max_size)| {
 				Protocol {
 					name,
 					in_upgrade,
 					handshake,
 					state: State::Closed {
 						pending_opening: false,
-					}
+					},
+					max_notification_size: max_size,
 				}
 			}).collect(),
 			peer_id: peer_id.clone(),
@@ -467,18 +471,19 @@ pub enum NotifsHandlerError {
 impl NotifsHandlerProto {
 	/// Builds a new handler.
 	///
-	/// `list` is a list of notification protocols names, and the message to send as part of the
-	/// handshake. At the moment, the message is always the same whether we open a substream
-	/// ourselves or respond to handshake from the remote.
+	/// `list` is a list of notification protocols names, the message to send as part of the
+	/// handshake, and the maximum allowed size of a notification. At the moment, the message
+	/// is always the same whether we open a substream ourselves or respond to handshake from
+	/// the remote.
 	pub fn new(
 		legacy_protocol: RegisteredProtocol,
-		list: impl Into<Vec<(Cow<'static, str>, Arc<RwLock<Vec<u8>>>)>>,
+		list: impl Into<Vec<(Cow<'static, str>, Arc<RwLock<Vec<u8>>>, u64)>>,
 	) -> Self {
 		let protocols =	list
 			.into()
 			.into_iter()
-			.map(|(proto_name, msg)| {
-				(proto_name.clone(), NotificationsIn::new(proto_name), msg)
+			.map(|(proto_name, msg, max_notif_size)| {
+				(proto_name.clone(), NotificationsIn::new(proto_name, max_notif_size), msg, max_notif_size)
 			})
 			.collect();
 
@@ -624,7 +629,8 @@ impl ProtocolsHandler for NotifsHandler {
 						if !*pending_opening {
 							let proto = NotificationsOut::new(
 								protocol_info.name.clone(),
-								protocol_info.handshake.read().clone()
+								protocol_info.handshake.read().clone(),
+								protocol_info.max_notification_size
 							);
 
 							self.events_queue.push_back(ProtocolsHandlerEvent::OutboundSubstreamRequest {
@@ -643,7 +649,8 @@ impl ProtocolsHandler for NotifsHandler {
 						if !*pending_opening {
 							let proto = NotificationsOut::new(
 								protocol_info.name.clone(),
-								handshake_message.clone()
+								handshake_message.clone(),
+								protocol_info.max_notification_size,
 							);
 
 							self.events_queue.push_back(ProtocolsHandlerEvent::OutboundSubstreamRequest {
diff --git a/client/network/src/protocol/generic_proto/tests.rs b/client/network/src/protocol/generic_proto/tests.rs
index 7f8de599ed72..967c0e9f8dfb 100644
--- a/client/network/src/protocol/generic_proto/tests.rs
+++ b/client/network/src/protocol/generic_proto/tests.rs
@@ -82,7 +82,7 @@ fn build_nodes() -> (Swarm<CustomProtoWithAddr>, Swarm<CustomProtoWithAddr>) {
 		let behaviour = CustomProtoWithAddr {
 			inner: GenericProto::new(
 				"test", &[1], vec![], peerset,
-				iter::once(("/foo".into(), Vec::new()))
+				iter::once(("/foo".into(), Vec::new(), 1024 * 1024))
 			),
 			addrs: addrs
 				.iter()
diff --git a/client/network/src/protocol/generic_proto/upgrade/notifications.rs b/client/network/src/protocol/generic_proto/upgrade/notifications.rs
index 29561bafd7a6..eba96441bcfd 100644
--- a/client/network/src/protocol/generic_proto/upgrade/notifications.rs
+++ b/client/network/src/protocol/generic_proto/upgrade/notifications.rs
@@ -41,7 +41,7 @@ use futures::prelude::*;
 use asynchronous_codec::Framed;
 use libp2p::core::{UpgradeInfo, InboundUpgrade, OutboundUpgrade, upgrade};
 use log::error;
-use std::{borrow::Cow, convert::Infallible, io, iter, mem, pin::Pin, task::{Context, Poll}};
+use std::{borrow::Cow, convert::{Infallible, TryFrom as _}, io, iter, mem, pin::Pin, task::{Context, Poll}};
 use unsigned_varint::codec::UviBytes;
 
 /// Maximum allowed size of the two handshake messages, in bytes.
@@ -53,6 +53,8 @@ const MAX_HANDSHAKE_SIZE: usize = 1024;
 pub struct NotificationsIn {
 	/// Protocol name to use when negotiating the substream.
 	protocol_name: Cow<'static, str>,
+	/// Maximum allowed size for a single notification.
+	max_notification_size: u64,
 }
 
 /// Upgrade that opens a substream, waits for the remote to accept by sending back a status
@@ -63,6 +65,8 @@ pub struct NotificationsOut {
 	protocol_name: Cow<'static, str>,
 	/// Message to send when we start the handshake.
 	initial_message: Vec<u8>,
+	/// Maximum allowed size for a single notification.
+	max_notification_size: u64,
 }
 
 /// A substream for incoming notification messages.
@@ -102,9 +106,10 @@ pub struct NotificationsOutSubstream<TSubstream> {
 
 impl NotificationsIn {
 	/// Builds a new potential upgrade.
-	pub fn new(protocol_name: impl Into<Cow<'static, str>>) -> Self {
+	pub fn new(protocol_name: impl Into<Cow<'static, str>>, max_notification_size: u64) -> Self {
 		NotificationsIn {
 			protocol_name: protocol_name.into(),
+			max_notification_size,
 		}
 	}
 }
@@ -148,8 +153,11 @@ where TSubstream: AsyncRead + AsyncWrite + Unpin + Send + 'static,
 				socket.read_exact(&mut initial_message).await?;
 			}
 
+			let mut codec = UviBytes::default();
+			codec.set_max_len(usize::try_from(self.max_notification_size).unwrap_or(usize::max_value()));
+
 			let substream = NotificationsInSubstream {
-				socket: Framed::new(socket, UviBytes::default()),
+				socket: Framed::new(socket, codec),
 				handshake: NotificationsInSubstreamHandshake::NotSent,
 			};
 
@@ -287,7 +295,11 @@ where TSubstream: AsyncRead + AsyncWrite + Unpin,
 
 impl NotificationsOut {
 	/// Builds a new potential upgrade.
-	pub fn new(protocol_name: impl Into<Cow<'static, str>>, initial_message: impl Into<Vec<u8>>) -> Self {
+	pub fn new(
+		protocol_name: impl Into<Cow<'static, str>>,
+		initial_message: impl Into<Vec<u8>>,
+		max_notification_size: u64,
+	) -> Self {
 		let initial_message = initial_message.into();
 		if initial_message.len() > MAX_HANDSHAKE_SIZE {
 			error!(target: "sub-libp2p", "Outbound networking handshake is above allowed protocol limit");
@@ -296,6 +308,7 @@ impl NotificationsOut {
 		NotificationsOut {
 			protocol_name: protocol_name.into(),
 			initial_message,
+			max_notification_size,
 		}
 	}
 }
@@ -342,8 +355,11 @@ where TSubstream: AsyncRead + AsyncWrite + Unpin + Send + 'static,
 				socket.read_exact(&mut handshake).await?;
 			}
 
+			let mut codec = UviBytes::default();
+			codec.set_max_len(usize::try_from(self.max_notification_size).unwrap_or(usize::max_value()));
+
 			Ok((handshake, NotificationsOutSubstream {
-				socket: Framed::new(socket, UviBytes::default()),
+				socket: Framed::new(socket, codec),
 			}))
 		})
 	}
@@ -436,7 +452,7 @@ mod tests {
 			let socket = TcpStream::connect(listener_addr_rx.await.unwrap()).await.unwrap();
 			let (handshake, mut substream) = upgrade::apply_outbound(
 				socket,
-				NotificationsOut::new(PROTO_NAME, &b"initial message"[..]),
+				NotificationsOut::new(PROTO_NAME, &b"initial message"[..], 1024 * 1024),
 				upgrade::Version::V1
 			).await.unwrap();
 
@@ -451,7 +467,7 @@ mod tests {
 			let (socket, _) = listener.accept().await.unwrap();
 			let (initial_message, mut substream) = upgrade::apply_inbound(
 				socket,
-				NotificationsIn::new(PROTO_NAME)
+				NotificationsIn::new(PROTO_NAME, 1024 * 1024)
 			).await.unwrap();
 
 			assert_eq!(initial_message, b"initial message");
@@ -475,7 +491,7 @@ mod tests {
 			let socket = TcpStream::connect(listener_addr_rx.await.unwrap()).await.unwrap();
 			let (handshake, mut substream) = upgrade::apply_outbound(
 				socket,
-				NotificationsOut::new(PROTO_NAME, vec![]),
+				NotificationsOut::new(PROTO_NAME, vec![], 1024 * 1024),
 				upgrade::Version::V1
 			).await.unwrap();
 
@@ -490,7 +506,7 @@ mod tests {
 			let (socket, _) = listener.accept().await.unwrap();
 			let (initial_message, mut substream) = upgrade::apply_inbound(
 				socket,
-				NotificationsIn::new(PROTO_NAME)
+				NotificationsIn::new(PROTO_NAME, 1024 * 1024)
 			).await.unwrap();
 
 			assert!(initial_message.is_empty());
@@ -512,7 +528,7 @@ mod tests {
 			let socket = TcpStream::connect(listener_addr_rx.await.unwrap()).await.unwrap();
 			let outcome = upgrade::apply_outbound(
 				socket,
-				NotificationsOut::new(PROTO_NAME, &b"hello"[..]),
+				NotificationsOut::new(PROTO_NAME, &b"hello"[..], 1024 * 1024),
 				upgrade::Version::V1
 			).await;
 
@@ -529,7 +545,7 @@ mod tests {
 			let (socket, _) = listener.accept().await.unwrap();
 			let (initial_msg, substream) = upgrade::apply_inbound(
 				socket,
-				NotificationsIn::new(PROTO_NAME)
+				NotificationsIn::new(PROTO_NAME, 1024 * 1024)
 			).await.unwrap();
 
 			assert_eq!(initial_msg, b"hello");
@@ -551,7 +567,7 @@ mod tests {
 			let ret = upgrade::apply_outbound(
 				socket,
 				// We check that an initial message that is too large gets refused.
-				NotificationsOut::new(PROTO_NAME, (0..32768).map(|_| 0).collect::<Vec<_>>()),
+				NotificationsOut::new(PROTO_NAME, (0..32768).map(|_| 0).collect::<Vec<_>>(), 1024 * 1024),
 				upgrade::Version::V1
 			).await;
 			assert!(ret.is_err());
@@ -564,7 +580,7 @@ mod tests {
 			let (socket, _) = listener.accept().await.unwrap();
 			let ret = upgrade::apply_inbound(
 				socket,
-				NotificationsIn::new(PROTO_NAME)
+				NotificationsIn::new(PROTO_NAME, 1024 * 1024)
 			).await;
 			assert!(ret.is_err());
 		});
@@ -581,7 +597,7 @@ mod tests {
 			let socket = TcpStream::connect(listener_addr_rx.await.unwrap()).await.unwrap();
 			let ret = upgrade::apply_outbound(
 				socket,
-				NotificationsOut::new(PROTO_NAME, &b"initial message"[..]),
+				NotificationsOut::new(PROTO_NAME, &b"initial message"[..], 1024 * 1024),
 				upgrade::Version::V1
 			).await;
 			assert!(ret.is_err());
@@ -594,7 +610,7 @@ mod tests {
 			let (socket, _) = listener.accept().await.unwrap();
 			let (initial_message, mut substream) = upgrade::apply_inbound(
 				socket,
-				NotificationsIn::new(PROTO_NAME)
+				NotificationsIn::new(PROTO_NAME, 1024 * 1024)
 			).await.unwrap();
 			assert_eq!(initial_message, b"initial message");
 
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index fec444846a3f..3d05d578bf6c 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -83,7 +83,9 @@ use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnbound
 use std::{
 	borrow::Cow,
 	collections::{HashMap, HashSet},
+	convert::TryFrom as _,
 	fs,
+	iter,
 	marker::PhantomData,
 	num:: NonZeroUsize,
 	pin::Pin,
@@ -283,6 +285,48 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 				config
 			};
 
+			let (transport, bandwidth) = {
+				let (config_mem, config_wasm) = match params.network_config.transport {
+					TransportConfig::MemoryOnly => (true, None),
+					TransportConfig::Normal { wasm_external_transport, .. } =>
+						(false, wasm_external_transport)
+				};
+
+				// The yamux buffer size limit is configured to be equal to the maximum frame size
+				// of all protocols. 10 bytes are added to each limit for the length prefix that
+				// is not included in the upper layer protocols limit but is still present in the
+				// yamux buffer. These 10 bytes correspond to the maximum size required to encode
+				// a variable-length-encoding 64bits number. In other words, we make the
+				// assumption that no notification larger than 2^64 will ever be sent.
+				let yamux_maximum_buffer_size = {
+					let requests_max = params.network_config
+						.request_response_protocols.iter()
+						.map(|cfg| usize::try_from(cfg.max_request_size).unwrap_or(usize::max_value()));
+					let responses_max = params.network_config
+						.request_response_protocols.iter()
+						.map(|cfg| usize::try_from(cfg.max_response_size).unwrap_or(usize::max_value()));
+					let notifs_max = params.network_config
+						.extra_sets.iter()
+						.map(|cfg| usize::try_from(cfg.max_notification_size).unwrap_or(usize::max_value()));
+
+					// A "default" max is added to cover all the other protocols: ping, identify,
+					// kademlia.
+					let default_max = 1024 * 1024;
+					iter::once(default_max)
+						.chain(requests_max).chain(responses_max).chain(notifs_max)
+						.max().expect("iterator known to always yield at least one element; qed")
+						.saturating_add(10)
+				};
+
+				transport::build_transport(
+					local_identity,
+					config_mem,
+					config_wasm,
+					params.network_config.yamux_window_size,
+					yamux_maximum_buffer_size
+				)
+			};
+
 			let behaviour = {
 				let result = Behaviour::new(
 					protocol,
@@ -305,20 +349,6 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 				}
 			};
 
-			let (transport, bandwidth) = {
-				let (config_mem, config_wasm) = match params.network_config.transport {
-					TransportConfig::MemoryOnly => (true, None),
-					TransportConfig::Normal { wasm_external_transport, .. } =>
-						(false, wasm_external_transport)
-				};
-
-				transport::build_transport(
-					local_identity,
-					config_mem,
-					config_wasm,
-					params.network_config.yamux_window_size
-				)
-			};
 			let mut builder = SwarmBuilder::new(transport, behaviour, local_peer_id.clone())
 				.connection_limits(ConnectionLimits::default()
 					.with_max_established_per_peer(Some(crate::MAX_CONNECTIONS_PER_PEER as u32))
diff --git a/client/network/src/service/tests.rs b/client/network/src/service/tests.rs
index e31158a99265..8f16040aee3b 100644
--- a/client/network/src/service/tests.rs
+++ b/client/network/src/service/tests.rs
@@ -144,6 +144,7 @@ fn build_nodes_one_proto()
 		extra_sets: vec![
 			config::NonDefaultSetConfig {
 				notifications_protocol: PROTOCOL_NAME,
+				max_notification_size: 1024 * 1024,
 				set_config: Default::default()
 			}
 		],
@@ -156,6 +157,7 @@ fn build_nodes_one_proto()
 		extra_sets: vec![
 			config::NonDefaultSetConfig {
 				notifications_protocol: PROTOCOL_NAME,
+				max_notification_size: 1024 * 1024,
 				set_config: config::SetConfig {
 					reserved_nodes: vec![config::MultiaddrWithPeerId {
 						multiaddr: listen_addr,
@@ -311,6 +313,7 @@ fn lots_of_incoming_peers_works() {
 		extra_sets: vec![
 			config::NonDefaultSetConfig {
 				notifications_protocol: PROTOCOL_NAME,
+				max_notification_size: 1024 * 1024,
 				set_config: config::SetConfig {
 					in_peers: u32::max_value(),
 					.. Default::default()
@@ -335,6 +338,7 @@ fn lots_of_incoming_peers_works() {
 			extra_sets: vec![
 				config::NonDefaultSetConfig {
 					notifications_protocol: PROTOCOL_NAME,
+					max_notification_size: 1024 * 1024,
 					set_config: config::SetConfig {
 						reserved_nodes: vec![config::MultiaddrWithPeerId {
 							multiaddr: listen_addr.clone(),
diff --git a/client/network/src/transport.rs b/client/network/src/transport.rs
index da0e5aa059b6..483cf47037fc 100644
--- a/client/network/src/transport.rs
+++ b/client/network/src/transport.rs
@@ -35,9 +35,14 @@ pub use self::bandwidth::BandwidthSinks;
 /// If `memory_only` is true, then only communication within the same process are allowed. Only
 /// addresses with the format `/memory/...` are allowed.
 ///
-///`yamux_window_size` is the maximum size of the Yamux receive windows. `None` to leave the
+/// `yamux_window_size` is the maximum size of the Yamux receive windows. `None` to leave the
 /// default (256kiB).
 ///
+/// `yamux_maximum_buffer_size` is the maximum allowed size of the Yamux buffer. This should be
+/// set either to the maximum of all the maximum allowed sizes of messages frames of all
+/// high-level protocols combined, or to some generously high value if you are sure that a maximum
+/// size is enforced on all high-level protocols.
+///
 /// Returns a `BandwidthSinks` object that allows querying the average bandwidth produced by all
 /// the connections spawned with this transport.
 pub fn build_transport(
@@ -45,6 +50,7 @@ pub fn build_transport(
 	memory_only: bool,
 	wasm_external_transport: Option<wasm_ext::ExtTransport>,
 	yamux_window_size: Option<u32>,
+	yamux_maximum_buffer_size: usize,
 ) -> (Boxed<(PeerId, StreamMuxerBox)>, Arc<BandwidthSinks>) {
 	// Build the base layer of the transport.
 	let transport = if let Some(t) = wasm_external_transport {
@@ -101,6 +107,7 @@ pub fn build_transport(
 		// Enable proper flow-control: window updates are only sent when
 		// buffered data has been consumed.
 		yamux_config.set_window_update_mode(libp2p::yamux::WindowUpdateMode::on_read());
+		yamux_config.set_max_buffer_size(yamux_maximum_buffer_size);
 
 		if let Some(yamux_window_size) = yamux_window_size {
 			yamux_config.set_receive_window_size(yamux_window_size);
diff --git a/client/network/test/src/lib.rs b/client/network/test/src/lib.rs
index 86cc7a547385..ec5ab5e88d6d 100644
--- a/client/network/test/src/lib.rs
+++ b/client/network/test/src/lib.rs
@@ -685,6 +685,7 @@ pub trait TestNetFactory: Sized {
 		network_config.extra_sets = config.notifications_protocols.into_iter().map(|p| {
 			NonDefaultSetConfig {
 				notifications_protocol: p,
+				max_notification_size: 1024 * 1024,
 				set_config: Default::default()
 			}
 		}).collect();

From e813f62d94431fb220bc9f984ca12fe01c1650b2 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Tue, 19 Jan 2021 07:14:32 -0400
Subject: [PATCH 0294/1194] Freeze Assets and Asset Metadata (#7346)

* Features needed for reserve-backed stablecoins

* Builds & tests.

* Double map for an efficient destroy.

* Update frame/assets/src/lib.rs

Co-authored-by: Nikolay Volf <nikvolf@gmail.com>

* ED/zombie-count/refs

Feature: ED/minimum balance enforcement
Feature: enforce zombie count
Feature: allow system-alive accounts to exist, but add reference

* Update frame/assets/src/lib.rs

Co-authored-by: Nikolay Volf <nikvolf@gmail.com>

* Update frame/assets/Cargo.toml

Co-authored-by: Niklas Adolfsson <niklasadolfsson1@gmail.com>

* Docs

* Some tests

* More tests

* Allow for max_zombies to be adjusted

* Test for set_max_zombies

* Tests and a couple of fixes

* First few benchmarks

* Benchmarks.

* Fix error message in test

* Fixes

* Fixes

* Fixes

* cargo run --release --features runtime-benchmarks --manifest-path bin/node/cli/Cargo.toml -- benchmark --chain dev --steps 50 --repeat 20 --extrinsic * --execution=wasm --wasm-execution=compiled --output ./bin/node/runtime/src/weights --header ./HEADER --pallet pallet_assets

* Update frame/assets/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Fixes

* Fixes

* Fixes

* cargo run --release --features runtime-benchmarks --manifest-path bin/node/cli/Cargo.toml -- benchmark --chain dev --steps 50 --repeat 20 --extrinsic * --execution=wasm --wasm-execution=compiled --output ./bin/node/runtime/src/weights --header ./HEADER --pallet pallet_assets

* Fixes

* Update default weight

* Add proper verification to benchmarks

* minor improvements to tests

* Add `freeze_asset` and `thaw_asset`

* Add metadata

* fix build

* Update benchmarks

* fix line width

* cargo run --release --features runtime-benchmarks --manifest-path bin/node/cli/Cargo.toml -- benchmark --chain dev --steps 50 --repeat 20 --extrinsic * --execution=wasm --wasm-execution=compiled --output ./bin/node/runtime/src/weights --header ./HEADER --pallet pallet_assets

* update default weights

* destroy cleans up metadata

* more comprehensive lifecycle test

* update docs

* Update frame/assets/src/benchmarking.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Fix

* New weights system

* fix compile

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_assets --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/assets/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* fix compile

* fix up

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_assets --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/assets/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* fixes to pallet compile

* fix node build

* remote diff artifacts

* less diff

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_assets --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/assets/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Update frame/assets/src/lib.rs

* Update frame/assets/src/lib.rs

* usize to u32

* missed some usize

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_assets --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/assets/src/weights.rs --template=./.maintain/frame-weight-template.hbs

Co-authored-by: Gav Wood <gavin@parity.io>
Co-authored-by: Nikolay Volf <nikvolf@gmail.com>
Co-authored-by: Niklas Adolfsson <niklasadolfsson1@gmail.com>
Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
---
 bin/node/runtime/src/lib.rs      |   6 +
 frame/assets/src/benchmarking.rs |  61 ++++++-
 frame/assets/src/lib.rs          | 279 ++++++++++++++++++++++++++++++-
 frame/assets/src/weights.rs      | 111 ++++++++----
 4 files changed, 416 insertions(+), 41 deletions(-)

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index e88484e47295..92e5dfa7830a 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -979,6 +979,9 @@ impl pallet_lottery::Config for Runtime {
 parameter_types! {
 	pub const AssetDepositBase: Balance = 100 * DOLLARS;
 	pub const AssetDepositPerZombie: Balance = 1 * DOLLARS;
+	pub const StringLimit: u32 = 50;
+	pub const MetadataDepositBase: Balance = 10 * DOLLARS;
+	pub const MetadataDepositPerByte: Balance = 1 * DOLLARS;
 }
 
 impl pallet_assets::Config for Runtime {
@@ -989,6 +992,9 @@ impl pallet_assets::Config for Runtime {
 	type ForceOrigin = EnsureRoot<AccountId>;
 	type AssetDepositBase = AssetDepositBase;
 	type AssetDepositPerZombie = AssetDepositPerZombie;
+	type StringLimit = StringLimit;
+	type MetadataDepositBase = MetadataDepositBase;
+	type MetadataDepositPerByte = MetadataDepositPerByte;
 	type WeightInfo = pallet_assets::weights::SubstrateWeight<Runtime>;
 }
 
diff --git a/frame/assets/src/benchmarking.rs b/frame/assets/src/benchmarking.rs
index 63258c2f591b..90b6f65b3989 100644
--- a/frame/assets/src/benchmarking.rs
+++ b/frame/assets/src/benchmarking.rs
@@ -18,7 +18,6 @@
 //! Assets pallet benchmarking.
 
 use super::*;
-use sp_std::prelude::*;
 use sp_runtime::traits::Bounded;
 use frame_system::RawOrigin as SystemOrigin;
 use frame_benchmarking::{benchmarks, account, whitelisted_caller};
@@ -154,16 +153,34 @@ benchmarks! {
 
 	thaw {
 		let (caller, caller_lookup) = create_default_minted_asset::<T>(10, 100u32.into());
-		assert!(Assets::<T>::freeze(
+		Assets::<T>::freeze(
 			SystemOrigin::Signed(caller.clone()).into(),
 			Default::default(),
-			caller_lookup.clone()
-		).is_ok());
+			caller_lookup.clone(),
+		)?;
 	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup)
 	verify {
 		assert_last_event::<T>(RawEvent::Thawed(Default::default(), caller).into());
 	}
 
+	freeze_asset {
+		let (caller, caller_lookup) = create_default_minted_asset::<T>(10, 100u32.into());
+	}: _(SystemOrigin::Signed(caller.clone()), Default::default())
+	verify {
+		assert_last_event::<T>(RawEvent::AssetFrozen(Default::default()).into());
+	}
+
+	thaw_asset {
+		let (caller, caller_lookup) = create_default_minted_asset::<T>(10, 100u32.into());
+		Assets::<T>::freeze_asset(
+			SystemOrigin::Signed(caller.clone()).into(),
+			Default::default(),
+		)?;
+	}: _(SystemOrigin::Signed(caller.clone()), Default::default())
+	verify {
+		assert_last_event::<T>(RawEvent::AssetThawed(Default::default()).into());
+	}
+
 	transfer_ownership {
 		let (caller, _) = create_default_asset::<T>(10);
 		let target: T::AccountId = account("target", 0, SEED);
@@ -196,6 +213,21 @@ benchmarks! {
 	verify {
 		assert_last_event::<T>(RawEvent::MaxZombiesChanged(Default::default(), max_zombies).into());
 	}
+
+	set_metadata {
+		let n in 0 .. T::StringLimit::get();
+		let s in 0 .. T::StringLimit::get();
+
+		let name = vec![0u8; n as usize];
+		let symbol = vec![0u8; s as usize];
+		let decimals = 12;
+
+		let (caller, _) = create_default_asset::<T>(10);
+		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
+	}: _(SystemOrigin::Signed(caller), Default::default(), name.clone(), symbol.clone(), decimals)
+	verify {
+		assert_last_event::<T>(RawEvent::MetadataSet(Default::default(), name, symbol, decimals).into());
+	}
 }
 
 #[cfg(test)]
@@ -273,6 +305,20 @@ mod tests {
 		});
 	}
 
+	#[test]
+	fn freeze_asset() {
+		new_test_ext().execute_with(|| {
+			assert!(test_benchmark_freeze_asset::<Test>().is_ok());
+		});
+	}
+
+	#[test]
+	fn thaw_asset() {
+		new_test_ext().execute_with(|| {
+			assert!(test_benchmark_thaw_asset::<Test>().is_ok());
+		});
+	}
+
 	#[test]
 	fn transfer_ownership() {
 		new_test_ext().execute_with(|| {
@@ -293,4 +339,11 @@ mod tests {
 			assert!(test_benchmark_set_max_zombies::<Test>().is_ok());
 		});
 	}
+
+	#[test]
+	fn set_metadata() {
+		new_test_ext().execute_with(|| {
+			assert!(test_benchmark_set_metadata::<Test>().is_ok());
+		});
+	}
 }
diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index dcb77cc6ebfd..8f1ad02c08bb 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -113,7 +113,7 @@
 mod benchmarking;
 pub mod weights;
 
-use sp_std::{fmt::Debug};
+use sp_std::{fmt::Debug, prelude::*};
 use sp_runtime::{RuntimeDebug, traits::{
 	Member, AtLeast32BitUnsigned, Zero, StaticLookup, Saturating, CheckedSub, CheckedAdd
 }};
@@ -151,6 +151,16 @@ pub trait Config: frame_system::Config {
 	/// supports.
 	type AssetDepositPerZombie: Get<BalanceOf<Self>>;
 
+	/// The maximum length of a name or symbol stored on-chain.
+	type StringLimit: Get<u32>;
+
+	/// The basic amount of funds that must be reserved when adding metadata to your asset.
+	type MetadataDepositBase: Get<BalanceOf<Self>>;
+
+	/// The additional funds that must be reserved for the number of bytes you store in your
+	/// metadata.
+	type MetadataDepositPerByte: Get<BalanceOf<Self>>;
+
 	/// Weight information for extrinsics in this pallet.
 	type WeightInfo: WeightInfo;
 }
@@ -184,6 +194,8 @@ pub struct AssetDetails<
 	zombies: u32,
 	/// The total number of accounts.
 	accounts: u32,
+	/// Whether the asset is frozen for permissionless transfers.
+	is_frozen: bool,
 }
 
 #[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default)]
@@ -198,6 +210,20 @@ pub struct AssetBalance<
 	is_zombie: bool,
 }
 
+#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default)]
+pub struct AssetMetadata<DepositBalance> {
+	/// The balance deposited for this metadata.
+	///
+	/// This pays for the data stored in this struct.
+	deposit: DepositBalance,
+	/// The user friendly name of this asset. Limited in length by `StringLimit`.
+	name: Vec<u8>,
+	/// The ticker symbol for this asset. Limited in length by `StringLimit`.
+	symbol: Vec<u8>,
+	/// The number of decimals this asset uses to represent one unit.
+	decimals: u8,
+}
+
 decl_storage! {
 	trait Store for Module<T: Config> as Assets {
 		/// Details of an asset.
@@ -212,6 +238,9 @@ decl_storage! {
 			hasher(blake2_128_concat) T::AssetId,
 			hasher(blake2_128_concat) T::AccountId
 			=> AssetBalance<T::Balance>;
+
+		/// Metadata of an asset.
+		Metadata: map hasher(blake2_128_concat) T::AssetId => AssetMetadata<BalanceOf<T>>;
 	}
 }
 
@@ -239,12 +268,18 @@ decl_event! {
 		Frozen(AssetId, AccountId),
 		/// Some account `who` was thawed. \[asset_id, who\]
 		Thawed(AssetId, AccountId),
+		/// Some asset `asset_id` was frozen. \[asset_id\]
+		AssetFrozen(AssetId),
+		/// Some asset `asset_id` was thawed. \[asset_id\]
+		AssetThawed(AssetId),
 		/// An asset class was destroyed.
 		Destroyed(AssetId),
 		/// Some asset class was force-created. \[asset_id, owner\]
 		ForceCreated(AssetId, AccountId),
 		/// The maximum amount of zombies allowed has changed. \[asset_id, max_zombies\]
 		MaxZombiesChanged(AssetId, u32),
+		/// New metadata has been set for an asset. \[asset_id, name, symbol, decimals\]
+		MetadataSet(AssetId, Vec<u8>, Vec<u8>, u8),
 	}
 }
 
@@ -276,6 +311,8 @@ decl_error! {
 		Overflow,
 		/// Some internal state is broken.
 		BadState,
+		/// Invalid metadata given.
+		BadMetadata,
 	}
 }
 
@@ -337,6 +374,7 @@ decl_module! {
 				min_balance,
 				zombies: Zero::zero(),
 				accounts: Zero::zero(),
+				is_frozen: false,
 			});
 			Self::deposit_event(RawEvent::Created(id, owner, admin));
 		}
@@ -386,6 +424,7 @@ decl_module! {
 				min_balance,
 				zombies: Zero::zero(),
 				accounts: Zero::zero(),
+				is_frozen: false,
 			});
 			Self::deposit_event(RawEvent::ForceCreated(id, owner));
 		}
@@ -412,7 +451,9 @@ decl_module! {
 				ensure!(details.owner == origin, Error::<T>::NoPermission);
 				ensure!(details.accounts == details.zombies, Error::<T>::RefsLeft);
 				ensure!(details.zombies <= zombies_witness, Error::<T>::BadWitness);
-				T::Currency::unreserve(&details.owner, details.deposit);
+
+				let metadata = Metadata::<T>::take(&id);
+				T::Currency::unreserve(&details.owner, details.deposit.saturating_add(metadata.deposit));
 
 				*maybe_details = None;
 				Account::<T>::remove_prefix(&id);
@@ -442,7 +483,9 @@ decl_module! {
 				let details = maybe_details.take().ok_or(Error::<T>::Unknown)?;
 				ensure!(details.accounts == details.zombies, Error::<T>::RefsLeft);
 				ensure!(details.zombies <= zombies_witness, Error::<T>::BadWitness);
-				T::Currency::unreserve(&details.owner, details.deposit);
+
+				let metadata = Metadata::<T>::take(&id);
+				T::Currency::unreserve(&details.owner, details.deposit.saturating_add(metadata.deposit));
 
 				*maybe_details = None;
 				Account::<T>::remove_prefix(&id);
@@ -580,6 +623,7 @@ decl_module! {
 			let dest = T::Lookup::lookup(target)?;
 			Asset::<T>::try_mutate(id, |maybe_details| {
 				let details = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
+				ensure!(!details.is_frozen, Error::<T>::Frozen);
 
 				if dest == origin {
 					return Ok(())
@@ -739,6 +783,54 @@ decl_module! {
 			Self::deposit_event(Event::<T>::Thawed(id, who));
 		}
 
+		/// Disallow further unprivileged transfers for the asset class.
+		///
+		/// Origin must be Signed and the sender should be the Freezer of the asset `id`.
+		///
+		/// - `id`: The identifier of the asset to be frozen.
+		///
+		/// Emits `Frozen`.
+		///
+		/// Weight: `O(1)`
+		#[weight = T::WeightInfo::freeze_asset()]
+		fn freeze_asset(origin, #[compact] id: T::AssetId) -> DispatchResult {
+			let origin = ensure_signed(origin)?;
+
+			Asset::<T>::try_mutate(id, |maybe_details| {
+				let d = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
+				ensure!(&origin == &d.freezer, Error::<T>::NoPermission);
+
+				d.is_frozen = true;
+
+				Self::deposit_event(Event::<T>::AssetFrozen(id));
+				Ok(())
+			})
+		}
+
+		/// Allow unprivileged transfers for the asset again.
+		///
+		/// Origin must be Signed and the sender should be the Admin of the asset `id`.
+		///
+		/// - `id`: The identifier of the asset to be frozen.
+		///
+		/// Emits `Thawed`.
+		///
+		/// Weight: `O(1)`
+		#[weight = T::WeightInfo::thaw_asset()]
+		fn thaw_asset(origin, #[compact] id: T::AssetId) -> DispatchResult {
+			let origin = ensure_signed(origin)?;
+
+			Asset::<T>::try_mutate(id, |maybe_details| {
+				let d = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
+				ensure!(&origin == &d.admin, Error::<T>::NoPermission);
+
+				d.is_frozen = false;
+
+				Self::deposit_event(Event::<T>::AssetThawed(id));
+				Ok(())
+			})
+		}
+
 		/// Change the Owner of an asset.
 		///
 		/// Origin must be Signed and the sender should be the Owner of the asset `id`.
@@ -809,6 +901,20 @@ decl_module! {
 			})
 		}
 
+		/// Set the maximum number of zombie accounts for an asset.
+		///
+		/// Origin must be Signed and the sender should be the Owner of the asset `id`.
+		///
+		/// Funds of sender are reserved according to the formula:
+		/// `AssetDepositBase + AssetDepositPerZombie * max_zombies` taking into account
+		/// any already reserved funds.
+		///
+		/// - `id`: The identifier of the asset to update zombie count.
+		/// - `max_zombies`: The new number of zombies allowed for this asset.
+		///
+		/// Emits `MaxZombiesChanged`.
+		///
+		/// Weight: `O(1)`
 		#[weight = T::WeightInfo::set_max_zombies()]
 		fn set_max_zombies(origin,
 			#[compact] id: T::AssetId,
@@ -837,6 +943,76 @@ decl_module! {
 				Ok(())
 			})
 		}
+
+		/// Set the metadata for an asset.
+		///
+		/// NOTE: There is no `unset_metadata` call. Simply pass an empty name, symbol,
+		/// and 0 decimals to this function to remove the metadata of an asset and
+		/// return your deposit.
+		///
+		/// Origin must be Signed and the sender should be the Owner of the asset `id`.
+		///
+		/// Funds of sender are reserved according to the formula:
+		/// `MetadataDepositBase + MetadataDepositPerByte * (name.len + symbol.len)` taking into
+		/// account any already reserved funds.
+		///
+		/// - `id`: The identifier of the asset to update.
+		/// - `name`: The user friendly name of this asset. Limited in length by `StringLimit`.
+		/// - `symbol`: The exchange symbol for this asset. Limited in length by `StringLimit`.
+		/// - `decimals`: The number of decimals this asset uses to represent one unit.
+		///
+		/// Emits `MaxZombiesChanged`.
+		///
+		/// Weight: `O(1)`
+		#[weight = T::WeightInfo::set_metadata(name.len() as u32, symbol.len() as u32)]
+		fn set_metadata(origin,
+			#[compact] id: T::AssetId,
+			name: Vec<u8>,
+			symbol: Vec<u8>,
+			decimals: u8,
+		) -> DispatchResult {
+			let origin = ensure_signed(origin)?;
+
+			ensure!(name.len() <= T::StringLimit::get() as usize, Error::<T>::BadMetadata);
+			ensure!(symbol.len() <= T::StringLimit::get() as usize, Error::<T>::BadMetadata);
+
+			let d = Asset::<T>::get(id).ok_or(Error::<T>::Unknown)?;
+			ensure!(&origin == &d.owner, Error::<T>::NoPermission);
+
+			Metadata::<T>::try_mutate_exists(id, |metadata| {
+				let bytes_used = name.len() + symbol.len();
+				let old_deposit = match metadata {
+					Some(m) => m.deposit,
+					None => Default::default()
+				};
+
+				// Metadata is being removed
+				if bytes_used.is_zero() && decimals.is_zero() {
+					T::Currency::unreserve(&origin, old_deposit);
+					*metadata = None;
+				} else {
+					let new_deposit = T::MetadataDepositPerByte::get()
+						.saturating_mul(((name.len() + symbol.len()) as u32).into())
+						.saturating_add(T::MetadataDepositBase::get());
+
+					if new_deposit > old_deposit {
+						T::Currency::reserve(&origin, new_deposit - old_deposit)?;
+					} else {
+						T::Currency::unreserve(&origin, old_deposit - new_deposit);
+					}
+
+					*metadata = Some(AssetMetadata {
+						deposit: new_deposit,
+						name: name.clone(),
+						symbol: symbol.clone(),
+						decimals,
+					})
+				}
+
+				Self::deposit_event(RawEvent::MetadataSet(id, name, symbol, decimals));
+				Ok(())
+			})
+		}
 	}
 }
 
@@ -912,6 +1088,7 @@ mod tests {
 	use frame_support::{impl_outer_origin, assert_ok, assert_noop, parameter_types, impl_outer_event};
 	use sp_core::H256;
 	use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
+	use pallet_balances::Error as BalancesError;
 
 	mod pallet_assets {
 		pub use crate::Event;
@@ -976,6 +1153,9 @@ mod tests {
 	parameter_types! {
 		pub const AssetDepositBase: u64 = 1;
 		pub const AssetDepositPerZombie: u64 = 1;
+		pub const StringLimit: u32 = 50;
+		pub const MetadataDepositBase: u64 = 1;
+		pub const MetadataDepositPerByte: u64 = 1;
 	}
 
 	impl Config for Test {
@@ -986,6 +1166,9 @@ mod tests {
 		type ForceOrigin = frame_system::EnsureRoot<u64>;
 		type AssetDepositBase = AssetDepositBase;
 		type AssetDepositPerZombie = AssetDepositPerZombie;
+		type StringLimit = StringLimit;
+		type MetadataDepositBase = MetadataDepositBase;
+		type MetadataDepositPerByte = MetadataDepositPerByte;
 		type WeightInfo = ();
 	}
 	type System = frame_system::Module<Test>;
@@ -1013,15 +1196,41 @@ mod tests {
 			Balances::make_free_balance_be(&1, 100);
 			assert_ok!(Assets::create(Origin::signed(1), 0, 1, 10, 1));
 			assert_eq!(Balances::reserved_balance(&1), 11);
+			assert!(Asset::<Test>::contains_key(0));
+
+			assert_ok!(Assets::set_metadata(Origin::signed(1), 0, vec![0], vec![0], 12));
+			assert_eq!(Balances::reserved_balance(&1), 14);
+			assert!(Metadata::<Test>::contains_key(0));
+
+			assert_ok!(Assets::mint(Origin::signed(1), 0, 10, 100));
+			assert_ok!(Assets::mint(Origin::signed(1), 0, 20, 100));
+			assert_eq!(Account::<Test>::iter_prefix(0).count(), 2);
 
 			assert_ok!(Assets::destroy(Origin::signed(1), 0, 100));
 			assert_eq!(Balances::reserved_balance(&1), 0);
 
+			assert!(!Asset::<Test>::contains_key(0));
+			assert!(!Metadata::<Test>::contains_key(0));
+			assert_eq!(Account::<Test>::iter_prefix(0).count(), 0);
+
 			assert_ok!(Assets::create(Origin::signed(1), 0, 1, 10, 1));
 			assert_eq!(Balances::reserved_balance(&1), 11);
+			assert!(Asset::<Test>::contains_key(0));
+
+			assert_ok!(Assets::set_metadata(Origin::signed(1), 0, vec![0], vec![0], 12));
+			assert_eq!(Balances::reserved_balance(&1), 14);
+			assert!(Metadata::<Test>::contains_key(0));
+
+			assert_ok!(Assets::mint(Origin::signed(1), 0, 10, 100));
+			assert_ok!(Assets::mint(Origin::signed(1), 0, 20, 100));
+			assert_eq!(Account::<Test>::iter_prefix(0).count(), 2);
 
 			assert_ok!(Assets::force_destroy(Origin::root(), 0, 100));
 			assert_eq!(Balances::reserved_balance(&1), 0);
+
+			assert!(!Asset::<Test>::contains_key(0));
+			assert!(!Metadata::<Test>::contains_key(0));
+			assert_eq!(Account::<Test>::iter_prefix(0).count(), 0);
 		});
 	}
 
@@ -1172,7 +1381,7 @@ mod tests {
 	}
 
 	#[test]
-	fn transferring_frozen_balance_should_not_work() {
+	fn transferring_frozen_user_should_not_work() {
 		new_test_ext().execute_with(|| {
 			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 1));
 			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
@@ -1184,6 +1393,19 @@ mod tests {
 		});
 	}
 
+	#[test]
+	fn transferring_frozen_asset_should_not_work() {
+		new_test_ext().execute_with(|| {
+			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 1));
+			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
+			assert_eq!(Assets::balance(0, 1), 100);
+			assert_ok!(Assets::freeze_asset(Origin::signed(1), 0));
+			assert_noop!(Assets::transfer(Origin::signed(1), 0, 2, 50), Error::<Test>::Frozen);
+			assert_ok!(Assets::thaw_asset(Origin::signed(1), 0));
+			assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 50));
+		});
+	}
+
 	#[test]
 	fn origin_guards_should_work() {
 		new_test_ext().execute_with(|| {
@@ -1306,4 +1528,53 @@ mod tests {
 			assert_noop!(Assets::burn(Origin::signed(1), 0, 2, u64::max_value()), Error::<Test>::BalanceZero);
 		});
 	}
+
+	#[test]
+	fn set_metadata_should_work() {
+		new_test_ext().execute_with(|| {
+			// Cannot add metadata to unknown asset
+			assert_noop!(
+				Assets::set_metadata(Origin::signed(1), 0, vec![0u8; 10], vec![0u8; 10], 12),
+				Error::<Test>::Unknown,
+			);
+			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 1));
+			// Cannot add metadata to unowned asset
+			assert_noop!(
+				Assets::set_metadata(Origin::signed(2), 0, vec![0u8; 10], vec![0u8; 10], 12),
+				Error::<Test>::NoPermission,
+			);
+
+			// Cannot add oversized metadata
+			assert_noop!(
+				Assets::set_metadata(Origin::signed(1), 0, vec![0u8; 100], vec![0u8; 10], 12),
+				Error::<Test>::BadMetadata,
+			);
+			assert_noop!(
+				Assets::set_metadata(Origin::signed(1), 0, vec![0u8; 10], vec![0u8; 100], 12),
+				Error::<Test>::BadMetadata,
+			);
+
+			// Successfully add metadata and take deposit
+			Balances::make_free_balance_be(&1, 30);
+			assert_ok!(Assets::set_metadata(Origin::signed(1), 0, vec![0u8; 10], vec![0u8; 10], 12));
+			assert_eq!(Balances::free_balance(&1), 9);
+
+			// Update deposit
+			assert_ok!(Assets::set_metadata(Origin::signed(1), 0, vec![0u8; 10], vec![0u8; 5], 12));
+			assert_eq!(Balances::free_balance(&1), 14);
+			assert_ok!(Assets::set_metadata(Origin::signed(1), 0, vec![0u8; 10], vec![0u8; 15], 12));
+			assert_eq!(Balances::free_balance(&1), 4);
+
+			// Cannot over-reserve
+			assert_noop!(
+				Assets::set_metadata(Origin::signed(1), 0, vec![0u8; 20], vec![0u8; 20], 12),
+				BalancesError::<Test, _>::InsufficientBalance,
+			);
+
+			// Clear Metadata
+			assert!(Metadata::<Test>::contains_key(0));
+			assert_ok!(Assets::set_metadata(Origin::signed(1), 0, vec![], vec![], 0));
+			assert!(!Metadata::<Test>::contains_key(0));
+		});
+	}
 }
diff --git a/frame/assets/src/weights.rs b/frame/assets/src/weights.rs
index a8e17615d282..1858fe708e14 100644
--- a/frame/assets/src/weights.rs
+++ b/frame/assets/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_assets
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-12-03, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.1
+//! DATE: 2021-01-18, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -54,154 +54,199 @@ pub trait WeightInfo {
 	fn force_transfer() -> Weight;
 	fn freeze() -> Weight;
 	fn thaw() -> Weight;
+	fn freeze_asset() -> Weight;
+	fn thaw_asset() -> Weight;
 	fn transfer_ownership() -> Weight;
 	fn set_team() -> Weight;
 	fn set_max_zombies() -> Weight;
+	fn set_metadata(n: u32, s: u32, ) -> Weight;
 }
 
 /// Weights for pallet_assets using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn create() -> Weight {
-		(58_077_000 as Weight)
+		(44_459_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_create() -> Weight {
-		(30_497_000 as Weight)
+		(21_480_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn destroy(z: u32, ) -> Weight {
 		(0 as Weight)
-			.saturating_add((1_153_000 as Weight).saturating_mul(z as Weight))
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			// Standard Error: 2_000
+			.saturating_add((1_149_000 as Weight).saturating_mul(z as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(z as Weight)))
 	}
 	fn force_destroy(z: u32, ) -> Weight {
 		(0 as Weight)
-			.saturating_add((1_153_000 as Weight).saturating_mul(z as Weight))
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			// Standard Error: 2_000
+			.saturating_add((1_146_000 as Weight).saturating_mul(z as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(z as Weight)))
 	}
 	fn mint() -> Weight {
-		(45_600_000 as Weight)
+		(32_995_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn burn() -> Weight {
-		(40_143_000 as Weight)
+		(29_245_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn transfer() -> Weight {
-		(58_903_000 as Weight)
+		(42_211_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn force_transfer() -> Weight {
-		(59_025_000 as Weight)
+		(42_218_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn freeze() -> Weight {
-		(43_308_000 as Weight)
+		(31_079_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn thaw() -> Weight {
-		(43_383_000 as Weight)
+		(30_853_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	fn freeze_asset() -> Weight {
+		(22_383_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn thaw_asset() -> Weight {
+		(22_341_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
 	fn transfer_ownership() -> Weight {
-		(31_380_000 as Weight)
+		(22_782_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_team() -> Weight {
-		(32_049_000 as Weight)
+		(23_293_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_max_zombies() -> Weight {
-		(57_745_000 as Weight)
+		(44_525_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	fn set_metadata(n: u32, s: u32, ) -> Weight {
+		(49_456_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((1_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 0
+			.saturating_add((6_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn create() -> Weight {
-		(58_077_000 as Weight)
+		(44_459_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_create() -> Weight {
-		(30_497_000 as Weight)
+		(21_480_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn destroy(z: u32, ) -> Weight {
 		(0 as Weight)
-			.saturating_add((1_153_000 as Weight).saturating_mul(z as Weight))
-			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			// Standard Error: 2_000
+			.saturating_add((1_149_000 as Weight).saturating_mul(z as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(z as Weight)))
 	}
 	fn force_destroy(z: u32, ) -> Weight {
 		(0 as Weight)
-			.saturating_add((1_153_000 as Weight).saturating_mul(z as Weight))
-			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			// Standard Error: 2_000
+			.saturating_add((1_146_000 as Weight).saturating_mul(z as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(z as Weight)))
 	}
 	fn mint() -> Weight {
-		(45_600_000 as Weight)
+		(32_995_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn burn() -> Weight {
-		(40_143_000 as Weight)
+		(29_245_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn transfer() -> Weight {
-		(58_903_000 as Weight)
+		(42_211_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn force_transfer() -> Weight {
-		(59_025_000 as Weight)
+		(42_218_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn freeze() -> Weight {
-		(43_308_000 as Weight)
+		(31_079_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn thaw() -> Weight {
-		(43_383_000 as Weight)
+		(30_853_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	fn freeze_asset() -> Weight {
+		(22_383_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn thaw_asset() -> Weight {
+		(22_341_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
 	fn transfer_ownership() -> Weight {
-		(31_380_000 as Weight)
+		(22_782_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_team() -> Weight {
-		(32_049_000 as Weight)
+		(23_293_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_max_zombies() -> Weight {
-		(57_745_000 as Weight)
+		(44_525_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	fn set_metadata(n: u32, s: u32, ) -> Weight {
+		(49_456_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((1_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 0
+			.saturating_add((6_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
 }

From 61fa64104abe4667f9a3209967e57faa89205d54 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Tue, 19 Jan 2021 15:33:38 +0100
Subject: [PATCH 0295/1194] Increase UnboundedChannelVeryLarge threshold from
 5k to 15k (#7931)

---
 .maintain/monitoring/alerting-rules/alerting-rules.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.maintain/monitoring/alerting-rules/alerting-rules.yaml b/.maintain/monitoring/alerting-rules/alerting-rules.yaml
index deb454c462bd..cf00d7e2b90f 100644
--- a/.maintain/monitoring/alerting-rules/alerting-rules.yaml
+++ b/.maintain/monitoring/alerting-rules/alerting-rules.yaml
@@ -166,9 +166,9 @@ groups:
         (polkadot_unbounded_channel_len{action = "send"} -
             ignoring(action) polkadot_unbounded_channel_len{action = "received"})
         or on(instance) polkadot_unbounded_channel_len{action = "send"}
-    ) > 5000'
+    ) > 15000'
     labels:
       severity: warning
     annotations:
       message: 'Channel {{ $labels.entity }} on node {{ $labels.instance }} contains more than
-      5000 items.'
+      15000 items.'

From 2d5a75d762c0408e4c341fd55f0d55e20dc6c017 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 19 Jan 2021 17:01:11 +0100
Subject: [PATCH 0296/1194] Sync: Propagate block announcement data (#7903)

* Sync: Propagate block announcement data

This pr adds a feature to the sync protocol to propagate the data that
we received alongside a block announcement. This is done by adding a
cache that caches the last X block announcement data where X is set to
the number of `in_peers` (giving every peer the chance to send us a
different block). This will be required by parachains to ensure that
even peers who are not connected to a collator receive the data
alongside the block announcement to properly validate it and request the
block.

* Review comment

* Bring back the code and add new variant to ensure we don't insert block
announce data when something wasn't checked

* Also use out_peers
---
 Cargo.lock                                    |  7 +-
 .../finality-grandpa/src/communication/mod.rs |  2 +-
 .../src/communication/tests.rs                |  2 +-
 client/network-gossip/src/bridge.rs           |  4 +-
 client/network-gossip/src/lib.rs              |  4 +-
 client/network-gossip/src/state_machine.rs    |  2 +-
 client/network/Cargo.toml                     |  1 +
 client/network/src/protocol.rs                | 35 +++++++--
 client/network/src/protocol/sync.rs           | 78 ++++++++++---------
 client/network/src/service.rs                 |  4 +-
 client/network/test/src/lib.rs                | 60 +++++++++++---
 client/network/test/src/sync.rs               | 69 ++++++++++++++--
 client/service/src/lib.rs                     |  2 +-
 13 files changed, 198 insertions(+), 72 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3a68eb4b1dd9..96a4e67505e0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3366,9 +3366,9 @@ dependencies = [
 
 [[package]]
 name = "lru"
-version = "0.6.1"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be716eb6878ca2263eb5d00a781aa13264a794f519fe6af4fbb2668b2d5441c0"
+checksum = "3aae342b73d57ad0b8b364bd12584819f2c1fe9114285dfcf8b0722607671635"
 dependencies = [
  "hashbrown",
 ]
@@ -7153,6 +7153,7 @@ dependencies = [
  "linked-hash-map",
  "linked_hash_set",
  "log",
+ "lru",
  "nohash-hasher",
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -9811,7 +9812,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04f8ab788026715fa63b31960869617cba39117e520eb415b0139543e325ab59"
 dependencies = [
  "cfg-if 0.1.10",
- "rand 0.3.23",
+ "rand 0.7.3",
  "static_assertions",
 ]
 
diff --git a/client/finality-grandpa/src/communication/mod.rs b/client/finality-grandpa/src/communication/mod.rs
index 66b7f004895f..d502741465d2 100644
--- a/client/finality-grandpa/src/communication/mod.rs
+++ b/client/finality-grandpa/src/communication/mod.rs
@@ -722,7 +722,7 @@ impl<Block: BlockT> Sink<Message<Block>> for OutgoingMessages<Block>
 			);
 
 			// announce the block we voted on to our peers.
-			self.network.lock().announce(target_hash, Vec::new());
+			self.network.lock().announce(target_hash, None);
 
 			// propagate the message to peers
 			let topic = round_topic::<Block>(self.round, self.set_id);
diff --git a/client/finality-grandpa/src/communication/tests.rs b/client/finality-grandpa/src/communication/tests.rs
index b2e4c405b4f7..4abea991cec3 100644
--- a/client/finality-grandpa/src/communication/tests.rs
+++ b/client/finality-grandpa/src/communication/tests.rs
@@ -68,7 +68,7 @@ impl sc_network_gossip::Network<Block> for TestNetwork {
 		let _ = self.sender.unbounded_send(Event::WriteNotification(who, message));
 	}
 
-	fn announce(&self, block: Hash, _associated_data: Vec<u8>) {
+	fn announce(&self, block: Hash, _associated_data: Option<Vec<u8>>) {
 		let _ = self.sender.unbounded_send(Event::Announce(block));
 	}
 }
diff --git a/client/network-gossip/src/bridge.rs b/client/network-gossip/src/bridge.rs
index 4e8ebfda20c2..15451ec3cd57 100644
--- a/client/network-gossip/src/bridge.rs
+++ b/client/network-gossip/src/bridge.rs
@@ -166,7 +166,7 @@ impl<B: BlockT> GossipEngine<B> {
 	///
 	/// Note: this method isn't strictly related to gossiping and should eventually be moved
 	/// somewhere else.
-	pub fn announce(&self, block: B::Hash, associated_data: Vec<u8>) {
+	pub fn announce(&self, block: B::Hash, associated_data: Option<Vec<u8>>) {
 		self.network.announce(block, associated_data);
 	}
 }
@@ -347,7 +347,7 @@ mod tests {
 			unimplemented!();
 		}
 
-		fn announce(&self, _: B::Hash, _: Vec<u8>) {
+		fn announce(&self, _: B::Hash, _: Option<Vec<u8>>) {
 			unimplemented!();
 		}
 	}
diff --git a/client/network-gossip/src/lib.rs b/client/network-gossip/src/lib.rs
index 59c99088bdf2..7205533c81b2 100644
--- a/client/network-gossip/src/lib.rs
+++ b/client/network-gossip/src/lib.rs
@@ -98,7 +98,7 @@ pub trait Network<B: BlockT> {
 	///
 	/// Note: this method isn't strictly related to gossiping and should eventually be moved
 	/// somewhere else.
-	fn announce(&self, block: B::Hash, associated_data: Vec<u8>);
+	fn announce(&self, block: B::Hash, associated_data: Option<Vec<u8>>);
 }
 
 impl<B: BlockT, H: ExHashT> Network<B> for Arc<NetworkService<B, H>> {
@@ -136,7 +136,7 @@ impl<B: BlockT, H: ExHashT> Network<B> for Arc<NetworkService<B, H>> {
 		NetworkService::write_notification(self, who, protocol, message)
 	}
 
-	fn announce(&self, block: B::Hash, associated_data: Vec<u8>) {
+	fn announce(&self, block: B::Hash, associated_data: Option<Vec<u8>>) {
 		NetworkService::announce_block(self, block, associated_data)
 	}
 }
diff --git a/client/network-gossip/src/state_machine.rs b/client/network-gossip/src/state_machine.rs
index 805f2e82ea25..a58432d8c247 100644
--- a/client/network-gossip/src/state_machine.rs
+++ b/client/network-gossip/src/state_machine.rs
@@ -570,7 +570,7 @@ mod tests {
 			unimplemented!();
 		}
 
-		fn announce(&self, _: B::Hash, _: Vec<u8>) {
+		fn announce(&self, _: B::Hash, _: Option<Vec<u8>>) {
 			unimplemented!();
 		}
 	}
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index 9c0fab84a87d..64213b3f73be 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -35,6 +35,7 @@ hex = "0.4.0"
 ip_network = "0.3.4"
 linked-hash-map = "0.5.2"
 linked_hash_set = "0.1.3"
+lru = "0.6.3"
 log = "0.4.8"
 nohash-hasher = "0.2.0"
 parking_lot = "0.11.1"
diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index 31ba770e932f..6af5e1285497 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -230,6 +230,8 @@ pub struct Protocol<B: BlockT, H: ExHashT> {
 	metrics: Option<Metrics>,
 	/// The `PeerId`'s of all boot nodes.
 	boot_node_ids: HashSet<PeerId>,
+	/// A cache for the data that was associated to a block announcement.
+	block_announce_data_cache: lru::LruCache<B::Hash, Vec<u8>>,
 }
 
 /// Peer information
@@ -491,6 +493,11 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 			)
 		};
 
+		let block_announce_data_cache = lru::LruCache::new(
+			network_config.default_peers_set.in_peers as usize
+				+ network_config.default_peers_set.out_peers as usize,
+		);
+
 		let protocol = Protocol {
 			tick_timeout: Box::pin(interval(TICK_TIMEOUT)),
 			propagate_timeout: Box::pin(interval(PROPAGATE_TIMEOUT)),
@@ -514,6 +521,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 				None
 			},
 			boot_node_ids,
+			block_announce_data_cache,
 		};
 
 		Ok((protocol, peerset_handle, known_addresses))
@@ -1069,7 +1077,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 	///
 	/// In chain-based consensus, we often need to make sure non-best forks are
 	/// at least temporarily synced.
-	pub fn announce_block(&mut self, hash: B::Hash, data: Vec<u8>) {
+	pub fn announce_block(&mut self, hash: B::Hash, data: Option<Vec<u8>>) {
 		let header = match self.chain.header(BlockId::Hash(hash)) {
 			Ok(Some(header)) => header,
 			Ok(None) => {
@@ -1090,6 +1098,8 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 		let is_best = self.chain.info().best_hash == hash;
 		debug!(target: "sync", "Reannouncing block {:?} is_best: {}", hash, is_best);
 
+		let data = data.or_else(|| self.block_announce_data_cache.get(&hash).cloned()).unwrap_or_default();
+
 		for (who, ref mut peer) in self.peers.iter_mut() {
 			let inserted = peer.known_blocks.insert(hash);
 			if inserted {
@@ -1160,9 +1170,17 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 		validation_result: sync::PollBlockAnnounceValidation<B::Header>,
 	) -> CustomMessageOutcome<B> {
 		let (header, is_best, who) = match validation_result {
-			sync::PollBlockAnnounceValidation::Nothing { is_best, who, header } => {
+			sync::PollBlockAnnounceValidation::Skip =>
+				return CustomMessageOutcome::None,
+			sync::PollBlockAnnounceValidation::Nothing { is_best, who, announce } => {
 				self.update_peer_info(&who);
 
+				if let Some(data) = announce.data {
+					if !data.is_empty() {
+						self.block_announce_data_cache.put(announce.header.hash(), data);
+					}
+				}
+
 				// `on_block_announce` returns `OnBlockAnnounce::ImportHeader`
 				// when we have all data required to import the block
 				// in the BlockAnnounce message. This is only when:
@@ -1170,14 +1188,21 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 				// AND
 				// 2) parent block is already imported and not pruned.
 				if is_best {
-					return CustomMessageOutcome::PeerNewBest(who, *header.number())
+					return CustomMessageOutcome::PeerNewBest(who, *announce.header.number())
 				} else {
 					return CustomMessageOutcome::None
 				}
 			}
-			sync::PollBlockAnnounceValidation::ImportHeader { header, is_best, who } => {
+			sync::PollBlockAnnounceValidation::ImportHeader { announce, is_best, who } => {
 				self.update_peer_info(&who);
-				(header, is_best, who)
+
+				if let Some(data) = announce.data {
+					if !data.is_empty() {
+						self.block_announce_data_cache.put(announce.header.hash(), data);
+					}
+				}
+
+				(announce.header, is_best, who)
 			}
 			sync::PollBlockAnnounceValidation::Failure { who, disconnect } => {
 				if disconnect {
diff --git a/client/network/src/protocol/sync.rs b/client/network/src/protocol/sync.rs
index 70f860bdcb33..03d5b6434828 100644
--- a/client/network/src/protocol/sync.rs
+++ b/client/network/src/protocol/sync.rs
@@ -362,8 +362,8 @@ pub enum PollBlockAnnounceValidation<H> {
 		who: PeerId,
 		/// Was this their new best block?
 		is_best: bool,
-		/// The header of the announcement.
-		header: H,
+		/// The announcement.
+		announce: BlockAnnounce<H>,
 	},
 	/// The announcement header should be imported.
 	ImportHeader {
@@ -371,9 +371,11 @@ pub enum PollBlockAnnounceValidation<H> {
 		who: PeerId,
 		/// Was this their new best block?
 		is_best: bool,
-		/// The header of the announcement.
-		header: H,
+		/// The announcement.
+		announce: BlockAnnounce<H>,
 	},
+	/// The block announcement should be skipped.
+	Skip,
 }
 
 /// Result of [`ChainSync::block_announce_validation`].
@@ -388,15 +390,6 @@ enum PreValidateBlockAnnounce<H> {
 		/// Should the peer be disconnected?
 		disconnect: bool,
 	},
-	/// The announcement does not require further handling.
-	Nothing {
-		/// Who sent the processed block announcement?
-		who: PeerId,
-		/// Was this their new best block?
-		is_best: bool,
-		/// The announcement.
-		announce: BlockAnnounce<H>,
-	},
 	/// The pre-validation was sucessful and the announcement should be
 	/// further processed.
 	Process {
@@ -407,6 +400,8 @@ enum PreValidateBlockAnnounce<H> {
 		/// The announcement.
 		announce: BlockAnnounce<H>,
 	},
+	/// The block announcement should be skipped.
+	Skip,
 }
 
 /// Result of [`ChainSync::on_block_justification`].
@@ -1278,7 +1273,7 @@ impl<B: BlockT> ChainSync<B> {
 					who,
 					hash,
 				);
-				PreValidateBlockAnnounce::Nothing { is_best, who, announce }
+				PreValidateBlockAnnounce::Skip
 			}.boxed());
 			return
 		}
@@ -1295,7 +1290,7 @@ impl<B: BlockT> ChainSync<B> {
 						hash,
 						who,
 					);
-					PreValidateBlockAnnounce::Nothing { is_best, who, announce }
+					PreValidateBlockAnnounce::Skip
 				}.boxed());
 				return
 			}
@@ -1308,7 +1303,7 @@ impl<B: BlockT> ChainSync<B> {
 						hash,
 						who,
 					);
-					PreValidateBlockAnnounce::Nothing { is_best, who, announce }
+					PreValidateBlockAnnounce::Skip
 				}.boxed());
 				return
 			}
@@ -1337,7 +1332,7 @@ impl<B: BlockT> ChainSync<B> {
 				}
 				Err(e) => {
 					error!(target: "sync", "💔 Block announcement validation errored: {}", e);
-					PreValidateBlockAnnounce::Nothing { is_best, who, announce }
+					PreValidateBlockAnnounce::Skip
 				}
 			}
 		}.boxed());
@@ -1393,10 +1388,6 @@ impl<B: BlockT> ChainSync<B> {
 		);
 
 		let (announce, is_best, who) = match pre_validation_result {
-			PreValidateBlockAnnounce::Nothing { is_best, who, announce } => {
-				self.peer_block_announce_validation_finished(&who);
-				return PollBlockAnnounceValidation::Nothing { is_best, who, header: announce.header }
-			},
 			PreValidateBlockAnnounce::Failure { who, disconnect } => {
 				self.peer_block_announce_validation_finished(&who);
 				return PollBlockAnnounceValidation::Failure { who, disconnect }
@@ -1405,12 +1396,12 @@ impl<B: BlockT> ChainSync<B> {
 				self.peer_block_announce_validation_finished(&who);
 				(announce, is_new_best, who)
 			},
+			PreValidateBlockAnnounce::Skip => return PollBlockAnnounceValidation::Skip,
 		};
 
-		let header = announce.header;
-		let number = *header.number();
-		let hash = header.hash();
-		let parent_status = self.block_status(header.parent_hash()).unwrap_or(BlockStatus::Unknown);
+		let number = *announce.header.number();
+		let hash = announce.header.hash();
+		let parent_status = self.block_status(announce.header.parent_hash()).unwrap_or(BlockStatus::Unknown);
 		let known_parent = parent_status != BlockStatus::Unknown;
 		let ancient_parent = parent_status == BlockStatus::InChainPruned;
 
@@ -1419,7 +1410,7 @@ impl<B: BlockT> ChainSync<B> {
 			peer
 		} else {
 			error!(target: "sync", "💔 Called on_block_announce with a bad peer ID");
-			return PollBlockAnnounceValidation::Nothing { is_best, who, header }
+			return PollBlockAnnounceValidation::Nothing { is_best, who, announce }
 		};
 
 		if is_best {
@@ -1430,7 +1421,7 @@ impl<B: BlockT> ChainSync<B> {
 
 		if let PeerSyncState::AncestorSearch {..} = peer.state {
 			trace!(target: "sync", "Peer state is ancestor search.");
-			return PollBlockAnnounceValidation::Nothing { is_best, who, header }
+			return PollBlockAnnounceValidation::Nothing { is_best, who, announce }
 		}
 
 		// If the announced block is the best they have and is not ahead of us, our common number
@@ -1438,7 +1429,7 @@ impl<B: BlockT> ChainSync<B> {
 		if is_best {
 			if known && self.best_queued_number >= number {
 				peer.update_common_number(number);
-			} else if header.parent_hash() == &self.best_queued_hash
+			} else if announce.header.parent_hash() == &self.best_queued_hash
 				|| known_parent && self.best_queued_number >= number
 			{
 				peer.update_common_number(number - One::one());
@@ -1452,37 +1443,52 @@ impl<B: BlockT> ChainSync<B> {
 			if let Some(target) = self.fork_targets.get_mut(&hash) {
 				target.peers.insert(who.clone());
 			}
-			return PollBlockAnnounceValidation::Nothing { is_best, who, header }
+			return PollBlockAnnounceValidation::Nothing { is_best, who, announce }
 		}
 
 		if ancient_parent {
-			trace!(target: "sync", "Ignored ancient block announced from {}: {} {:?}", who, hash, header);
-			return PollBlockAnnounceValidation::Nothing { is_best, who, header }
+			trace!(
+				target: "sync",
+				"Ignored ancient block announced from {}: {} {:?}",
+				who,
+				hash,
+				announce.header,
+			);
+			return PollBlockAnnounceValidation::Nothing { is_best, who, announce }
 		}
 
 		let requires_additional_data = !self.role.is_light() || !known_parent;
 		if !requires_additional_data {
-			trace!(target: "sync", "Importing new header announced from {}: {} {:?}", who, hash, header);
-			return PollBlockAnnounceValidation::ImportHeader { is_best, header, who }
+			trace!(
+				target: "sync",
+				"Importing new header announced from {}: {} {:?}",
+				who,
+				hash,
+				announce.header,
+			);
+			return PollBlockAnnounceValidation::ImportHeader { is_best, announce, who }
 		}
 
 		if number <= self.best_queued_number {
 			trace!(
 				target: "sync",
-				"Added sync target for block announced from {}: {} {:?}", who, hash, header
+				"Added sync target for block announced from {}: {} {:?}",
+				who,
+				hash,
+				announce.header,
 			);
 			self.fork_targets
 				.entry(hash.clone())
 				.or_insert_with(|| ForkTarget {
 					number,
-					parent_hash: Some(*header.parent_hash()),
+					parent_hash: Some(*announce.header.parent_hash()),
 					peers: Default::default(),
 				})
 				.peers.insert(who.clone());
 		}
 
 		trace!(target: "sync", "Announce validation result is nothing");
-		PollBlockAnnounceValidation::Nothing { is_best, who, header }
+		PollBlockAnnounceValidation::Nothing { is_best, who, announce }
 	}
 
 	/// Call when a peer has disconnected.
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 3d05d578bf6c..09acef62e778 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -858,7 +858,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	///
 	/// In chain-based consensus, we often need to make sure non-best forks are
 	/// at least temporarily synced. This function forces such an announcement.
-	pub fn announce_block(&self, hash: B::Hash, data: Vec<u8>) {
+	pub fn announce_block(&self, hash: B::Hash, data: Option<Vec<u8>>) {
 		let _ = self.to_worker.unbounded_send(ServiceToWorkerMsg::AnnounceBlock(hash, data));
 	}
 
@@ -1236,7 +1236,7 @@ enum ServiceToWorkerMsg<B: BlockT, H: ExHashT> {
 	PropagateTransaction(H),
 	PropagateTransactions,
 	RequestJustification(B::Hash, NumberFor<B>),
-	AnnounceBlock(B::Hash, Vec<u8>),
+	AnnounceBlock(B::Hash, Option<Vec<u8>>),
 	GetValue(record::Key),
 	PutValue(record::Key, Vec<u8>),
 	AddKnownAddress(PeerId, Multiaddr),
diff --git a/client/network/test/src/lib.rs b/client/network/test/src/lib.rs
index ec5ab5e88d6d..786fddeed555 100644
--- a/client/network/test/src/lib.rs
+++ b/client/network/test/src/lib.rs
@@ -51,7 +51,10 @@ use sp_consensus::Error as ConsensusError;
 use sp_consensus::{BlockOrigin, ForkChoiceStrategy, BlockImportParams, BlockCheckParams, JustificationImport};
 use futures::prelude::*;
 use futures::future::BoxFuture;
-use sc_network::{NetworkWorker, NetworkService, config::ProtocolId};
+use sc_network::{
+	NetworkWorker, NetworkService, config::{ProtocolId, MultiaddrWithPeerId, NonReservedPeerMode},
+	Multiaddr,
+};
 use sc_network::config::{NetworkConfiguration, NonDefaultSetConfig, TransportConfig};
 use libp2p::PeerId;
 use parking_lot::Mutex;
@@ -228,6 +231,7 @@ pub struct Peer<D> {
 	network: NetworkWorker<Block, <Block as BlockT>::Hash>,
 	imported_blocks_stream: Pin<Box<dyn Stream<Item = BlockImportNotification<Block>> + Send>>,
 	finality_notification_stream: Pin<Box<dyn Stream<Item = FinalityNotification<Block>> + Send>>,
+	listen_addr: Multiaddr,
 }
 
 impl<D> Peer<D> {
@@ -267,7 +271,7 @@ impl<D> Peer<D> {
 	}
 
 	/// Announces an important block on the network.
-	pub fn announce_block(&self, hash: <Block as BlockT>::Hash, data: Vec<u8>) {
+	pub fn announce_block(&self, hash: <Block as BlockT>::Hash, data: Option<Vec<u8>>) {
 		self.network.service().announce_block(hash, data);
 	}
 
@@ -281,7 +285,7 @@ impl<D> Peer<D> {
 		where F: FnMut(BlockBuilder<Block, PeersFullClient, substrate_test_runtime_client::Backend>) -> Block
 	{
 		let best_hash = self.client.info().best_hash;
-		self.generate_blocks_at(BlockId::Hash(best_hash), count, origin, edit_block, false, true)
+		self.generate_blocks_at(BlockId::Hash(best_hash), count, origin, edit_block, false, true, true)
 	}
 
 	/// Add blocks to the peer -- edit the block before adding. The chain will
@@ -294,6 +298,7 @@ impl<D> Peer<D> {
 		mut edit_block: F,
 		headers_only: bool,
 		inform_sync_about_new_best_block: bool,
+		announce_block: bool,
 	) -> H256 where F: FnMut(BlockBuilder<Block, PeersFullClient, substrate_test_runtime_client::Backend>) -> Block {
 		let full_client = self.client.as_full()
 			.expect("blocks could only be generated by full clients");
@@ -327,7 +332,9 @@ impl<D> Peer<D> {
 			};
 
 			self.block_import.import_block(import_block, cache).expect("block_import failed");
-			self.network.service().announce_block(hash, Vec::new());
+			if announce_block {
+				self.network.service().announce_block(hash, None);
+			}
 			at = hash;
 		}
 
@@ -337,7 +344,6 @@ impl<D> Peer<D> {
 				full_client.header(&BlockId::Hash(at)).ok().flatten().unwrap().number().clone(),
 			);
 		}
-		self.network.service().announce_block(at.clone(), Vec::new());
 		at
 	}
 
@@ -350,13 +356,13 @@ impl<D> Peer<D> {
 	/// Push blocks to the peer (simplified: with or without a TX)
 	pub fn push_headers(&mut self, count: usize) -> H256 {
 		let best_hash = self.client.info().best_hash;
-		self.generate_tx_blocks_at(BlockId::Hash(best_hash), count, false, true, true)
+		self.generate_tx_blocks_at(BlockId::Hash(best_hash), count, false, true, true, true)
 	}
 
 	/// Push blocks to the peer (simplified: with or without a TX) starting from
 	/// given hash.
 	pub fn push_blocks_at(&mut self, at: BlockId<Block>, count: usize, with_tx: bool) -> H256 {
-		self.generate_tx_blocks_at(at, count, with_tx, false, true)
+		self.generate_tx_blocks_at(at, count, with_tx, false, true, true)
 	}
 
 	/// Push blocks to the peer (simplified: with or without a TX) starting from
@@ -367,7 +373,18 @@ impl<D> Peer<D> {
 		count: usize,
 		with_tx: bool,
 	) -> H256 {
-		self.generate_tx_blocks_at(at, count, with_tx, false, false)
+		self.generate_tx_blocks_at(at, count, with_tx, false, false, true)
+	}
+
+	/// Push blocks to the peer (simplified: with or without a TX) starting from
+	/// given hash without announcing the block.
+	pub fn push_blocks_at_without_announcing(
+		&mut self,
+		at: BlockId<Block>,
+		count: usize,
+		with_tx: bool,
+	) -> H256 {
+		self.generate_tx_blocks_at(at, count, with_tx, false, true, false)
 	}
 
 	/// Push blocks/headers to the peer (simplified: with or without a TX) starting from
@@ -379,6 +396,7 @@ impl<D> Peer<D> {
 		with_tx: bool,
 		headers_only: bool,
 		inform_sync_about_new_best_block: bool,
+		announce_block: bool,
 	) -> H256 {
 		let mut nonce = 0;
 		if with_tx {
@@ -398,6 +416,7 @@ impl<D> Peer<D> {
 				},
 				headers_only,
 				inform_sync_about_new_best_block,
+				announce_block,
 			)
 		} else {
 			self.generate_blocks_at(
@@ -407,6 +426,7 @@ impl<D> Peer<D> {
 				|builder| builder.build().unwrap().block,
 				headers_only,
 				inform_sync_about_new_best_block,
+				announce_block,
 			)
 		}
 	}
@@ -585,6 +605,10 @@ pub struct FullPeerConfig {
 	pub block_announce_validator: Option<Box<dyn BlockAnnounceValidator<Block> + Send + Sync>>,
 	/// List of notification protocols that the network must support.
 	pub notifications_protocols: Vec<Cow<'static, str>>,
+	/// The indices of the peers the peer should be connected to.
+	///
+	/// If `None`, it will be connected to all other peers.
+	pub connect_to_peers: Option<Vec<usize>>,
 }
 
 pub trait TestNetFactory: Sized {
@@ -689,6 +713,15 @@ pub trait TestNetFactory: Sized {
 				set_config: Default::default()
 			}
 		}).collect();
+		if let Some(connect_to) = config.connect_to_peers {
+			let addrs = connect_to.iter().map(|v| {
+				let peer_id = self.peer(*v).network_service().local_peer_id().clone();
+				let multiaddr = self.peer(*v).listen_addr.clone();
+				MultiaddrWithPeerId { peer_id, multiaddr }
+			}).collect();
+			network_config.default_peers_set.reserved_nodes = addrs;
+			network_config.default_peers_set.non_reserved_mode = NonReservedPeerMode::Deny;
+		}
 
 		let protocol_id = ProtocolId::from("test-protocol-name");
 
@@ -715,9 +748,12 @@ pub trait TestNetFactory: Sized {
 
 		trace!(target: "test_network", "Peer identifier: {}", network.service().local_peer_id());
 
-		self.mut_peers(|peers| {
+		self.mut_peers(move |peers| {
 			for peer in peers.iter_mut() {
-				peer.network.add_known_address(network.service().local_peer_id().clone(), listen_addr.clone());
+				peer.network.add_known_address(
+					network.service().local_peer_id().clone(),
+					listen_addr.clone(),
+				);
 			}
 
 			let imported_blocks_stream = Box::pin(client.import_notification_stream().fuse());
@@ -733,6 +769,7 @@ pub trait TestNetFactory: Sized {
 				block_import,
 				verifier,
 				network,
+				listen_addr,
 			});
 		});
 	}
@@ -813,6 +850,7 @@ pub trait TestNetFactory: Sized {
 				imported_blocks_stream,
 				finality_notification_stream,
 				network,
+				listen_addr,
 			});
 		});
 	}
@@ -912,7 +950,7 @@ pub trait TestNetFactory: Sized {
 
 				// We poll `imported_blocks_stream`.
 				while let Poll::Ready(Some(notification)) = peer.imported_blocks_stream.as_mut().poll_next(cx) {
-					peer.network.service().announce_block(notification.hash, Vec::new());
+					peer.network.service().announce_block(notification.hash, None);
 				}
 
 				// We poll `finality_notification_stream`, but we only take the last event.
diff --git a/client/network/test/src/sync.rs b/client/network/test/src/sync.rs
index 999f9fe1ee3a..582634fea209 100644
--- a/client/network/test/src/sync.rs
+++ b/client/network/test/src/sync.rs
@@ -436,7 +436,7 @@ fn can_sync_small_non_best_forks() {
 	assert!(net.peer(0).client().header(&BlockId::Hash(small_hash)).unwrap().is_some());
 	assert!(!net.peer(1).client().header(&BlockId::Hash(small_hash)).unwrap().is_some());
 
-	net.peer(0).announce_block(small_hash, Vec::new());
+	net.peer(0).announce_block(small_hash, None);
 
 	// after announcing, peer 1 downloads the block.
 
@@ -452,7 +452,7 @@ fn can_sync_small_non_best_forks() {
 	net.block_until_sync();
 
 	let another_fork = net.peer(0).push_blocks_at(BlockId::Number(35), 2, true);
-	net.peer(0).announce_block(another_fork, Vec::new());
+	net.peer(0).announce_block(another_fork, None);
 	block_on(futures::future::poll_fn::<(), _>(|cx| {
 		net.poll(cx);
 		if net.peer(1).client().header(&BlockId::Hash(another_fork)).unwrap().is_none() {
@@ -500,7 +500,7 @@ fn light_peer_imports_header_from_announce() {
 	sp_tracing::try_init_simple();
 
 	fn import_with_announce(net: &mut TestNet, hash: H256) {
-		net.peer(0).announce_block(hash, Vec::new());
+		net.peer(0).announce_block(hash, None);
 
 		block_on(futures::future::poll_fn::<(), _>(|cx| {
 			net.poll(cx);
@@ -610,7 +610,7 @@ fn does_not_sync_announced_old_best_block() {
 	net.peer(0).push_blocks(18, true);
 	net.peer(1).push_blocks(20, true);
 
-	net.peer(0).announce_block(old_hash, Vec::new());
+	net.peer(0).announce_block(old_hash, None);
 	block_on(futures::future::poll_fn::<(), _>(|cx| {
 		// poll once to import announcement
 		net.poll(cx);
@@ -618,7 +618,7 @@ fn does_not_sync_announced_old_best_block() {
 	}));
 	assert!(!net.peer(1).is_major_syncing());
 
-	net.peer(0).announce_block(old_hash_with_parent, Vec::new());
+	net.peer(0).announce_block(old_hash_with_parent, None);
 	block_on(futures::future::poll_fn::<(), _>(|cx| {
 		// poll once to import announcement
 		net.poll(cx);
@@ -653,8 +653,8 @@ fn imports_stale_once() {
 
 	fn import_with_announce(net: &mut TestNet, hash: H256) {
 		// Announce twice
-		net.peer(0).announce_block(hash, Vec::new());
-		net.peer(0).announce_block(hash, Vec::new());
+		net.peer(0).announce_block(hash, None);
+		net.peer(0).announce_block(hash, None);
 
 		block_on(futures::future::poll_fn::<(), _>(|cx| {
 			net.poll(cx);
@@ -842,3 +842,58 @@ fn sync_to_tip_when_we_sync_together_with_multiple_peers() {
 		net.block_until_idle();
 	}
 }
+
+/// Ensures that when we receive a block announcement with some data attached, that we propagate
+/// this data when reannouncing the block.
+#[test]
+fn block_announce_data_is_propagated() {
+	struct TestBlockAnnounceValidator;
+
+	impl BlockAnnounceValidator<Block> for TestBlockAnnounceValidator {
+		fn validate(
+			&mut self,
+			_: &Header,
+			data: &[u8],
+		) -> Pin<Box<dyn Future<Output = Result<Validation, Box<dyn std::error::Error + Send>>> + Send>> {
+			let correct = data.get(0) == Some(&137);
+			async move {
+				if correct {
+					Ok(Validation::Success { is_new_best: true })
+				} else {
+					Ok(Validation::Failure { disconnect: false })
+				}
+			}.boxed()
+		}
+	}
+
+	sp_tracing::try_init_simple();
+	let mut net = TestNet::new(1);
+
+	net.add_full_peer_with_config(FullPeerConfig {
+		block_announce_validator: Some(Box::new(TestBlockAnnounceValidator)),
+		..Default::default()
+	});
+
+	net.add_full_peer_with_config(FullPeerConfig {
+		block_announce_validator: Some(Box::new(TestBlockAnnounceValidator)),
+		connect_to_peers: Some(vec![1]),
+		..Default::default()
+	});
+
+	// Wait until peer 1 is connected to both nodes.
+	block_on(futures::future::poll_fn::<(), _>(|cx| {
+		net.poll(cx);
+		if net.peer(1).num_peers() == 2 {
+			Poll::Ready(())
+		} else {
+			Poll::Pending
+		}
+	}));
+
+	let block_hash = net.peer(0).push_blocks_at_without_announcing(BlockId::Number(0), 1, true);
+	net.peer(0).announce_block(block_hash, Some(vec![137]));
+
+	while !net.peer(1).has_block(&block_hash) || !net.peer(2).has_block(&block_hash) {
+		net.block_until_idle();
+	}
+}
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index df1cd47db0f7..3033b1d09dd3 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -248,7 +248,7 @@ async fn build_network_future<
 				};
 
 				if announce_imported_blocks {
-					network.service().announce_block(notification.hash, Vec::new());
+					network.service().announce_block(notification.hash, None);
 				}
 
 				if notification.is_new_best {

From a9ed67eff2dac2ecf5a15b7f3292606172c8743d Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Wed, 20 Jan 2021 11:14:24 +0100
Subject: [PATCH 0297/1194] Disable Nagle algorithm (#7932)

* Disable Nagle algorithm

* Oops, didn't compile
---
 client/network/src/transport.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/network/src/transport.rs b/client/network/src/transport.rs
index 483cf47037fc..12c82c0fcefd 100644
--- a/client/network/src/transport.rs
+++ b/client/network/src/transport.rs
@@ -60,7 +60,7 @@ pub fn build_transport(
 	};
 	#[cfg(not(target_os = "unknown"))]
 	let transport = transport.or_transport(if !memory_only {
-		let desktop_trans = tcp::TcpConfig::new();
+		let desktop_trans = tcp::TcpConfig::new().nodelay(true);
 		let desktop_trans = websocket::WsConfig::new(desktop_trans.clone())
 			.or_transport(desktop_trans);
 		OptionalTransport::some(if let Ok(dns) = dns::DnsConfig::new(desktop_trans.clone()) {

From 486863052317548871957bd17712012768882f5b Mon Sep 17 00:00:00 2001
From: Andrew Jones <ascjones@gmail.com>
Date: Wed, 20 Jan 2021 10:48:19 +0000
Subject: [PATCH 0298/1194] Migrate frame-system to pallet attribute macro
 (#7898)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* PRINT_PALLET_UPGRADE=1 cargo check -p frame-system

* Copy attributes, imports, mods and type defs

* Copy Config trait

* Annotate constants

* Tabify

* Migrate hooks

* Upgrade template rename interface to hooks

* Migrate pallet call

* Migrate Event

* Migrate Error

* Migrate Origin

* Remove optional validate_unsigned

* Remove remaining TODO_MAYBE_WHERE_CLAUSE

* Overwrite original lib.rs with migrated lib2.rs.

* Add required Event IsType constraint

* Add disable supertrait check

* Fix leftover Trait trait

* Add missing pallet prefix for weight attributes

* Add missing Error type parameter

* Add missing Hooks type parameter

* Private call visibility, restore original helper types and helpers etc

* Fix hooks type parameter

* Rename RawEvent to Event

* Add missing storage type annotations

* Remove unused imports

* Add GenesisConfig helpers for compat

* Fix unused import warnings

* Update frame/support/procedural/src/storage/print_pallet_upgrade.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Fix test errors and warnings

* Fix remaining errors and warnings

* Apply review suggestion: fix formatting

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Apply review suggestion: annotate BlockLength as constant

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Apply review suggestion: add triling comma

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Apply review suggestion: add triling comma

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Apply review suggestion: add trailing comma

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Apply review suggestion: fix storage type indentation

* Apply review suggestion: remove redundant Origin type alias

* Add missing codec derives for BlockLength

* Restore module docs

* Module -> Pallet renamel

* Revert "Update frame/support/procedural/src/storage/print_pallet_upgrade.rs"

This reverts commit d2a2d5b6

* Apply review suggestion: merge crate imports

Co-authored-by: Alexander Theißen <alex.theissen@me.com>

* Revert "Upgrade template rename interface to hooks"

This reverts commit 306f0239

* Single line import

* Refactor generated genesis build

* Import sp_io::storage

* Revert previous, fully qualify sp_io::storage

* Fix ui tests

* Fix errors after merge, missing changes

* Set UpgradedToDualRefCount to true in genesis build

* Annotated Runtime version with constant, exposing it via metadata

* Add metadata attribute

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Alexander Theißen <alex.theissen@me.com>
---
 bin/node/executor/tests/basic.rs              |  10 +-
 bin/node/executor/tests/fees.rs               |   2 +-
 bin/node/executor/tests/submit_transaction.rs |   1 -
 frame/balances/src/tests.rs                   |   8 +-
 frame/balances/src/tests_local.rs             |   4 +-
 frame/contracts/src/tests.rs                  |  14 +-
 frame/executive/src/lib.rs                    |  16 +-
 frame/session/benchmarking/src/lib.rs         |   2 +-
 .../system/src/extensions/check_mortality.rs  |   1 -
 frame/system/src/extensions/check_nonce.rs    |   5 +-
 frame/system/src/extensions/check_weight.rs   |  27 +-
 frame/system/src/lib.rs                       | 990 +++++++++---------
 frame/system/src/limits.rs                    |   2 +-
 frame/system/src/offchain.rs                  |   2 +-
 frame/system/src/tests.rs                     |  11 +-
 frame/transaction-payment/src/lib.rs          |   2 +-
 16 files changed, 575 insertions(+), 522 deletions(-)

diff --git a/bin/node/executor/tests/basic.rs b/bin/node/executor/tests/basic.rs
index 26c04efe4999..f007ba41ccc6 100644
--- a/bin/node/executor/tests/basic.rs
+++ b/bin/node/executor/tests/basic.rs
@@ -329,7 +329,7 @@ fn full_native_block_import_works() {
 		let events = vec![
 			EventRecord {
 				phase: Phase::ApplyExtrinsic(0),
-				event: Event::frame_system(frame_system::RawEvent::ExtrinsicSuccess(
+				event: Event::frame_system(frame_system::Event::ExtrinsicSuccess(
 					DispatchInfo { weight: timestamp_weight, class: DispatchClass::Mandatory, ..Default::default() }
 				)),
 				topics: vec![],
@@ -350,7 +350,7 @@ fn full_native_block_import_works() {
 			},
 			EventRecord {
 				phase: Phase::ApplyExtrinsic(1),
-				event: Event::frame_system(frame_system::RawEvent::ExtrinsicSuccess(
+				event: Event::frame_system(frame_system::Event::ExtrinsicSuccess(
 					DispatchInfo { weight: transfer_weight, ..Default::default() }
 				)),
 				topics: vec![],
@@ -381,7 +381,7 @@ fn full_native_block_import_works() {
 		let events = vec![
 			EventRecord {
 				phase: Phase::ApplyExtrinsic(0),
-				event: Event::frame_system(frame_system::RawEvent::ExtrinsicSuccess(
+				event: Event::frame_system(frame_system::Event::ExtrinsicSuccess(
 					DispatchInfo { weight: timestamp_weight, class: DispatchClass::Mandatory, ..Default::default() }
 				)),
 				topics: vec![],
@@ -404,7 +404,7 @@ fn full_native_block_import_works() {
 			},
 			EventRecord {
 				phase: Phase::ApplyExtrinsic(1),
-				event: Event::frame_system(frame_system::RawEvent::ExtrinsicSuccess(
+				event: Event::frame_system(frame_system::Event::ExtrinsicSuccess(
 					DispatchInfo { weight: transfer_weight, ..Default::default() }
 				)),
 				topics: vec![],
@@ -427,7 +427,7 @@ fn full_native_block_import_works() {
 			},
 			EventRecord {
 				phase: Phase::ApplyExtrinsic(2),
-				event: Event::frame_system(frame_system::RawEvent::ExtrinsicSuccess(
+				event: Event::frame_system(frame_system::Event::ExtrinsicSuccess(
 					DispatchInfo { weight: transfer_weight, ..Default::default() }
 				)),
 				topics: vec![],
diff --git a/bin/node/executor/tests/fees.rs b/bin/node/executor/tests/fees.rs
index ed354d553448..9d83610b689d 100644
--- a/bin/node/executor/tests/fees.rs
+++ b/bin/node/executor/tests/fees.rs
@@ -17,7 +17,7 @@
 
 use codec::{Encode, Joiner};
 use frame_support::{
-	StorageValue, StorageMap,
+	StorageValue,
 	traits::Currency,
 	weights::{GetDispatchInfo, constants::ExtrinsicBaseWeight, IdentityFee, WeightToFeePolynomial},
 };
diff --git a/bin/node/executor/tests/submit_transaction.rs b/bin/node/executor/tests/submit_transaction.rs
index c628826c62be..ff483d9ecd8c 100644
--- a/bin/node/executor/tests/submit_transaction.rs
+++ b/bin/node/executor/tests/submit_transaction.rs
@@ -217,7 +217,6 @@ fn should_submit_signed_twice_from_all_accounts() {
 #[test]
 fn submitted_transaction_should_be_valid() {
 	use codec::Encode;
-	use frame_support::storage::StorageMap;
 	use sp_runtime::transaction_validity::{TransactionSource, TransactionTag};
 	use sp_runtime::traits::StaticLookup;
 
diff --git a/frame/balances/src/tests.rs b/frame/balances/src/tests.rs
index 90e8e0d7cbdc..7a1b57a7b4db 100644
--- a/frame/balances/src/tests.rs
+++ b/frame/balances/src/tests.rs
@@ -737,7 +737,7 @@ macro_rules! decl_tests {
 					assert_eq!(
 						events(),
 						[
-							Event::system(system::RawEvent::NewAccount(1)),
+							Event::system(system::Event::NewAccount(1)),
 							Event::balances(RawEvent::Endowed(1, 100)),
 							Event::balances(RawEvent::BalanceSet(1, 100, 0)),
 						]
@@ -749,7 +749,7 @@ macro_rules! decl_tests {
 						events(),
 						[
 							Event::balances(RawEvent::DustLost(1, 99)),
-							Event::system(system::RawEvent::KilledAccount(1))
+							Event::system(system::Event::KilledAccount(1))
 						]
 					);
 				});
@@ -766,7 +766,7 @@ macro_rules! decl_tests {
 					assert_eq!(
 						events(),
 						[
-							Event::system(system::RawEvent::NewAccount(1)),
+							Event::system(system::Event::NewAccount(1)),
 							Event::balances(RawEvent::Endowed(1, 100)),
 							Event::balances(RawEvent::BalanceSet(1, 100, 0)),
 						]
@@ -777,7 +777,7 @@ macro_rules! decl_tests {
 					assert_eq!(
 						events(),
 						[
-							Event::system(system::RawEvent::KilledAccount(1))
+							Event::system(system::Event::KilledAccount(1))
 						]
 					);
 				});
diff --git a/frame/balances/src/tests_local.rs b/frame/balances/src/tests_local.rs
index 2cbf46709275..762ebe871b3e 100644
--- a/frame/balances/src/tests_local.rs
+++ b/frame/balances/src/tests_local.rs
@@ -170,7 +170,7 @@ fn emit_events_with_no_existential_deposit_suicide_with_dust() {
 			assert_eq!(
 				events(),
 				[
-					Event::system(system::RawEvent::NewAccount(1)),
+					Event::system(system::Event::NewAccount(1)),
 					Event::balances(RawEvent::Endowed(1, 100)),
 					Event::balances(RawEvent::BalanceSet(1, 100, 0)),
 				]
@@ -187,7 +187,7 @@ fn emit_events_with_no_existential_deposit_suicide_with_dust() {
 				events(),
 				[
 					Event::balances(RawEvent::DustLost(1, 1)),
-					Event::system(system::RawEvent::KilledAccount(1))
+					Event::system(system::Event::KilledAccount(1))
 				]
 			);
 		});
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index 965cb7e49a0a..96bcf99bf8e8 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -475,7 +475,7 @@ fn instantiate_and_call_and_deposit_event() {
 			pretty_assertions::assert_eq!(System::events(), vec![
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::system(frame_system::RawEvent::NewAccount(ALICE.clone())),
+					event: MetaEvent::system(frame_system::Event::NewAccount(ALICE.clone())),
 					topics: vec![],
 				},
 				EventRecord {
@@ -492,7 +492,7 @@ fn instantiate_and_call_and_deposit_event() {
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::system(frame_system::RawEvent::NewAccount(addr.clone())),
+					event: MetaEvent::system(frame_system::Event::NewAccount(addr.clone())),
 					topics: vec![],
 				},
 				EventRecord {
@@ -653,7 +653,7 @@ fn test_set_rent_code_and_hash() {
 			assert_eq!(System::events(), vec![
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::system(frame_system::RawEvent::NewAccount(ALICE)),
+					event: MetaEvent::system(frame_system::Event::NewAccount(ALICE)),
 					topics: vec![],
 				},
 				EventRecord {
@@ -1235,7 +1235,7 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 			assert_eq!(System::events(), vec![
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::system(frame_system::RawEvent::NewAccount(ALICE)),
+					event: MetaEvent::system(frame_system::Event::NewAccount(ALICE)),
 					topics: vec![],
 				},
 				EventRecord {
@@ -1390,7 +1390,7 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 							},
 							EventRecord {
 								phase: Phase::Initialization,
-								event: MetaEvent::system(frame_system::RawEvent::NewAccount(CHARLIE)),
+								event: MetaEvent::system(frame_system::Event::NewAccount(CHARLIE)),
 								topics: vec![],
 							},
 							EventRecord {
@@ -1400,7 +1400,7 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 							},
 							EventRecord {
 								phase: Phase::Initialization,
-								event: MetaEvent::system(frame_system::RawEvent::NewAccount(addr_django.clone())),
+								event: MetaEvent::system(frame_system::Event::NewAccount(addr_django.clone())),
 								topics: vec![],
 							},
 							EventRecord {
@@ -1440,7 +1440,7 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 				assert_eq!(System::events(), vec![
 					EventRecord {
 						phase: Phase::Initialization,
-						event: MetaEvent::system(system::RawEvent::KilledAccount(addr_django.clone())),
+						event: MetaEvent::system(system::Event::KilledAccount(addr_django.clone())),
 						topics: vec![],
 					},
 					EventRecord {
diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index 05b4b0f982a0..df1ae17df613 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -117,7 +117,7 @@
 
 use sp_std::{prelude::*, marker::PhantomData};
 use frame_support::{
-	StorageValue, StorageMap, weights::{GetDispatchInfo, DispatchInfo, DispatchClass},
+	weights::{GetDispatchInfo, DispatchInfo, DispatchClass},
 	traits::{OnInitialize, OnFinalize, OnRuntimeUpgrade, OffchainWorker},
 	dispatch::PostDispatchInfo,
 };
@@ -261,11 +261,11 @@ where
 
 	/// Returns if the runtime was upgraded since the last time this function was called.
 	fn runtime_upgraded() -> bool {
-		let last = frame_system::LastRuntimeUpgrade::get();
+		let last = frame_system::LastRuntimeUpgrade::<System>::get();
 		let current = <System::Version as frame_support::traits::Get<_>>::get();
 
 		if last.map(|v| v.was_upgraded(&current)).unwrap_or(true) {
-			frame_system::LastRuntimeUpgrade::put(
+			frame_system::LastRuntimeUpgrade::<System>::put(
 				frame_system::LastRuntimeUpgradeInfo::from(current),
 			);
 			true
@@ -998,7 +998,7 @@ mod tests {
 		new_test_ext(1).execute_with(|| {
 			RUNTIME_VERSION.with(|v| *v.borrow_mut() = Default::default());
 			// It should be added at genesis
-			assert!(frame_system::LastRuntimeUpgrade::exists());
+			assert!(frame_system::LastRuntimeUpgrade::<Runtime>::exists());
 			assert!(!Executive::runtime_upgraded());
 
 			RUNTIME_VERSION.with(|v| *v.borrow_mut() = sp_version::RuntimeVersion {
@@ -1008,7 +1008,7 @@ mod tests {
 			assert!(Executive::runtime_upgraded());
 			assert_eq!(
 				Some(LastRuntimeUpgradeInfo { spec_version: 1.into(), spec_name: "".into() }),
-				frame_system::LastRuntimeUpgrade::get(),
+				frame_system::LastRuntimeUpgrade::<Runtime>::get(),
 			);
 
 			RUNTIME_VERSION.with(|v| *v.borrow_mut() = sp_version::RuntimeVersion {
@@ -1019,7 +1019,7 @@ mod tests {
 			assert!(Executive::runtime_upgraded());
 			assert_eq!(
 				Some(LastRuntimeUpgradeInfo { spec_version: 1.into(), spec_name: "test".into() }),
-				frame_system::LastRuntimeUpgrade::get(),
+				frame_system::LastRuntimeUpgrade::<Runtime>::get(),
 			);
 
 			RUNTIME_VERSION.with(|v| *v.borrow_mut() = sp_version::RuntimeVersion {
@@ -1030,11 +1030,11 @@ mod tests {
 			});
 			assert!(!Executive::runtime_upgraded());
 
-			frame_system::LastRuntimeUpgrade::take();
+			frame_system::LastRuntimeUpgrade::<Runtime>::take();
 			assert!(Executive::runtime_upgraded());
 			assert_eq!(
 				Some(LastRuntimeUpgradeInfo { spec_version: 1.into(), spec_name: "test".into() }),
-				frame_system::LastRuntimeUpgrade::get(),
+				frame_system::LastRuntimeUpgrade::<Runtime>::get(),
 			);
 		})
 	}
diff --git a/frame/session/benchmarking/src/lib.rs b/frame/session/benchmarking/src/lib.rs
index 8f1911c125b8..06dfa3da3494 100644
--- a/frame/session/benchmarking/src/lib.rs
+++ b/frame/session/benchmarking/src/lib.rs
@@ -28,7 +28,7 @@ use sp_std::vec;
 use frame_benchmarking::benchmarks;
 use frame_support::{
 	codec::Decode,
-	storage::{StorageValue, StorageMap},
+	storage::StorageValue,
 	traits::{KeyOwnerProofSystem, OnInitialize},
 };
 use frame_system::RawOrigin;
diff --git a/frame/system/src/extensions/check_mortality.rs b/frame/system/src/extensions/check_mortality.rs
index 8e5fd36e6217..f1951baba5d5 100644
--- a/frame/system/src/extensions/check_mortality.rs
+++ b/frame/system/src/extensions/check_mortality.rs
@@ -17,7 +17,6 @@
 
 use codec::{Encode, Decode};
 use crate::{Config, Module, BlockHash};
-use frame_support::StorageMap;
 use sp_runtime::{
 	generic::Era,
 	traits::{SignedExtension, DispatchInfoOf, SaturatedConversion},
diff --git a/frame/system/src/extensions/check_nonce.rs b/frame/system/src/extensions/check_nonce.rs
index c5d0e5242b48..bc48be925bc0 100644
--- a/frame/system/src/extensions/check_nonce.rs
+++ b/frame/system/src/extensions/check_nonce.rs
@@ -17,10 +17,7 @@
 
 use codec::{Encode, Decode};
 use crate::Config;
-use frame_support::{
-	weights::DispatchInfo,
-	StorageMap,
-};
+use frame_support::weights::DispatchInfo;
 use sp_runtime::{
 	traits::{SignedExtension, DispatchInfoOf, Dispatchable, One},
 	transaction_validity::{
diff --git a/frame/system/src/extensions/check_weight.rs b/frame/system/src/extensions/check_weight.rs
index c84c29518593..70116f4b6524 100644
--- a/frame/system/src/extensions/check_weight.rs
+++ b/frame/system/src/extensions/check_weight.rs
@@ -28,7 +28,6 @@ use sp_runtime::{
 use frame_support::{
 	traits::{Get},
 	weights::{PostDispatchInfo, DispatchInfo, DispatchClass, priority::FrameTransactionPriority},
-	StorageValue,
 };
 
 /// Block resource (weight) limit check.
@@ -115,8 +114,8 @@ impl<T: Config + Send + Sync> CheckWeight<T> where
 		let next_weight = Self::check_block_weight(info)?;
 		Self::check_extrinsic_weight(info)?;
 
-		crate::AllExtrinsicsLen::put(next_len);
-		crate::BlockWeight::put(next_weight);
+		crate::AllExtrinsicsLen::<T>::put(next_len);
+		crate::BlockWeight::<T>::put(next_weight);
 		Ok(())
 	}
 
@@ -257,7 +256,7 @@ impl<T: Config + Send + Sync> SignedExtension for CheckWeight<T> where
 
 		let unspent = post_info.calc_unspent(info);
 		if unspent > 0 {
-			crate::BlockWeight::mutate(|current_weight| {
+			crate::BlockWeight::<T>::mutate(|current_weight| {
 				current_weight.sub(unspent, info.class);
 			})
 		}
@@ -465,7 +464,7 @@ mod tests {
 			let normal_limit = normal_weight_limit();
 
 			// given almost full block
-			BlockWeight::mutate(|current_weight| {
+			BlockWeight::<Test>::mutate(|current_weight| {
 				current_weight.set(normal_limit, DispatchClass::Normal)
 			});
 			// will not fit.
@@ -475,7 +474,7 @@ mod tests {
 
 			// likewise for length limit.
 			let len = 100_usize;
-			AllExtrinsicsLen::put(normal_length_limit());
+			AllExtrinsicsLen::<Test>::put(normal_length_limit());
 			assert!(CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &normal, len).is_err());
 			assert!(CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &op, len).is_ok());
 		})
@@ -508,7 +507,7 @@ mod tests {
 			let normal = DispatchInfo::default();
 			let normal_limit = normal_weight_limit() as usize;
 			let reset_check_weight = |tx, s, f| {
-				AllExtrinsicsLen::put(0);
+				AllExtrinsicsLen::<Test>::put(0);
 				let r = CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, tx, s);
 				if f { assert!(r.is_err()) } else { assert!(r.is_ok()) }
 			};
@@ -544,7 +543,7 @@ mod tests {
 			let len = 0_usize;
 
 			let reset_check_weight = |i, f, s| {
-				BlockWeight::mutate(|current_weight| {
+				BlockWeight::<Test>::mutate(|current_weight| {
 					current_weight.set(s, DispatchClass::Normal)
 				});
 				let r = CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, i, len);
@@ -570,20 +569,20 @@ mod tests {
 			let base_extrinsic = block_weights().get(DispatchClass::Normal).base_extrinsic;
 
 			// We allow 75% for normal transaction, so we put 25% - extrinsic base weight
-			BlockWeight::mutate(|current_weight| {
+			BlockWeight::<Test>::mutate(|current_weight| {
 				current_weight.set(0, DispatchClass::Mandatory);
 				current_weight.set(256 - base_extrinsic, DispatchClass::Normal);
 			});
 
 			let pre = CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &info, len).unwrap();
-			assert_eq!(BlockWeight::get().total(), info.weight + 256);
+			assert_eq!(BlockWeight::<Test>::get().total(), info.weight + 256);
 
 			assert!(
 				CheckWeight::<Test>::post_dispatch(pre, &info, &post_info, len, &Ok(()))
 				.is_ok()
 			);
 			assert_eq!(
-				BlockWeight::get().total(),
+				BlockWeight::<Test>::get().total(),
 				post_info.actual_weight.unwrap() + 256,
 			);
 		})
@@ -599,14 +598,14 @@ mod tests {
 			};
 			let len = 0_usize;
 
-			BlockWeight::mutate(|current_weight| {
+			BlockWeight::<Test>::mutate(|current_weight| {
 				current_weight.set(0, DispatchClass::Mandatory);
 				current_weight.set(128, DispatchClass::Normal);
 			});
 
 			let pre = CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &info, len).unwrap();
 			assert_eq!(
-				BlockWeight::get().total(),
+				BlockWeight::<Test>::get().total(),
 				info.weight + 128 + block_weights().get(DispatchClass::Normal).base_extrinsic,
 			);
 
@@ -615,7 +614,7 @@ mod tests {
 				.is_ok()
 			);
 			assert_eq!(
-				BlockWeight::get().total(),
+				BlockWeight::<Test>::get().total(),
 				info.weight + 128 + block_weights().get(DispatchClass::Normal).base_extrinsic,
 			);
 		})
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index 0efa511e99b5..cdb26623734f 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -15,17 +15,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! # System Module
+//! # System Pallet
 //!
-//! The System module provides low-level access to core types and cross-cutting utilities.
+//! The System pallet provides low-level access to core types and cross-cutting utilities.
 //! It acts as the base layer for other pallets to interact with the Substrate framework components.
 //!
-//! - [`system::Config`](./trait.Config.html)
+//! - [`Config`]
 //!
 //! ## Overview
 //!
-//! The System module defines the core data types used in a Substrate runtime.
-//! It also provides several utility functions (see [`Module`](./struct.Module.html)) for other FRAME pallets.
+//! The System pallet defines the core data types used in a Substrate runtime.
+//! It also provides several utility functions (see [`Pallet`]) for other FRAME pallets.
 //!
 //! In addition, it manages the storage items for extrinsics data, indexes, event records, and digest items,
 //! among other things that support the execution of the current block.
@@ -37,15 +37,15 @@
 //!
 //! ### Dispatchable Functions
 //!
-//! The System module does not implement any dispatchable functions.
+//! The System pallet does not implement any dispatchable functions.
 //!
 //! ### Public Functions
 //!
-//! See the [`Module`](./struct.Module.html) struct for details of publicly available functions.
+//! See the [`Pallet`] struct for details of publicly available functions.
 //!
 //! ### Signed Extensions
 //!
-//! The System module defines the following extensions:
+//! The System pallet defines the following extensions:
 //!
 //!   - [`CheckWeight`]: Checks the weight and length of the block and ensure that it does not
 //!     exceed the limits.
@@ -61,34 +61,6 @@
 //!
 //! Lookup the runtime aggregator file (e.g. `node/runtime`) to see the full list of signed
 //! extensions included in a chain.
-//!
-//! ## Usage
-//!
-//! ### Prerequisites
-//!
-//! Import the System module and derive your module's configuration trait from the system trait.
-//!
-//! ### Example - Get extrinsic count and parent hash for the current block
-//!
-//! ```
-//! use frame_support::{decl_module, dispatch};
-//! use frame_system::{self as system, ensure_signed};
-//!
-//! pub trait Config: system::Config {}
-//!
-//! decl_module! {
-//! 	pub struct Module<T: Config> for enum Call where origin: T::Origin {
-//! 		#[weight = 0]
-//! 		pub fn system_module_example(origin) -> dispatch::DispatchResult {
-//! 			let _sender = ensure_signed(origin)?;
-//! 			let _extrinsic_count = <system::Module<T>>::extrinsic_count();
-//! 			let _parent_hash = <system::Module<T>>::parent_hash();
-//! 			Ok(())
-//! 		}
-//! 	}
-//! }
-//! # fn main() { }
-//! ```
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
@@ -113,7 +85,7 @@ use sp_runtime::{
 
 use sp_core::{ChangesTrieConfiguration, storage::well_known_keys};
 use frame_support::{
-	decl_module, decl_event, decl_storage, decl_error, Parameter, debug, storage,
+	Parameter, debug, storage,
 	traits::{
 		Contains, Get, PalletInfo, OnNewAccount, OnKilledAccount, HandleLifetime,
 		StoredMap, EnsureOrigin, OriginTrait, Filter,
@@ -126,6 +98,8 @@ use frame_support::{
 };
 use codec::{Encode, Decode, FullCodec, EncodeLike};
 
+#[cfg(feature = "std")]
+use frame_support::traits::GenesisBuild;
 #[cfg(any(feature = "std", test))]
 use sp_io::TestExternalities;
 
@@ -162,401 +136,132 @@ pub fn extrinsics_data_root<H: Hash>(xts: Vec<Vec<u8>>) -> H::Output {
 /// An object to track the currently used extrinsic weight in a block.
 pub type ConsumedWeight = PerDispatchClass<Weight>;
 
-/// System configuration trait. Implemented by runtime.
-pub trait Config: 'static + Eq + Clone {
-	/// The basic call filter to use in Origin. All origins are built with this filter as base,
-	/// except Root.
-	type BaseCallFilter: Filter<Self::Call>;
-
-	/// Block & extrinsics weights: base values and limits.
-	type BlockWeights: Get<limits::BlockWeights>;
-
-	/// The maximum length of a block (in bytes).
-	type BlockLength: Get<limits::BlockLength>;
-
-	/// The `Origin` type used by dispatchable calls.
-	type Origin:
-		Into<Result<RawOrigin<Self::AccountId>, Self::Origin>>
-		+ From<RawOrigin<Self::AccountId>>
-		+ Clone
-		+ OriginTrait<Call = Self::Call>;
-
-	/// The aggregated `Call` type.
-	type Call: Dispatchable + Debug;
-
-	/// Account index (aka nonce) type. This stores the number of previous transactions associated
-	/// with a sender account.
-	type Index:
-		Parameter + Member + MaybeSerialize + Debug + Default + MaybeDisplay + AtLeast32Bit
-		+ Copy;
-
-	/// The block number type used by the runtime.
-	type BlockNumber:
-		Parameter + Member + MaybeSerializeDeserialize + Debug + MaybeDisplay +
-		AtLeast32BitUnsigned + Default + Bounded + Copy + sp_std::hash::Hash +
-		sp_std::str::FromStr + MaybeMallocSizeOf;
-
-	/// The output of the `Hashing` function.
-	type Hash:
-		Parameter + Member + MaybeSerializeDeserialize + Debug + MaybeDisplay + SimpleBitOps + Ord
-		+ Default + Copy + CheckEqual + sp_std::hash::Hash + AsRef<[u8]> + AsMut<[u8]> + MaybeMallocSizeOf;
-
-	/// The hashing system (algorithm) being used in the runtime (e.g. Blake2).
-	type Hashing: Hash<Output = Self::Hash>;
-
-	/// The user account identifier type for the runtime.
-	type AccountId: Parameter + Member + MaybeSerializeDeserialize + Debug + MaybeDisplay + Ord
-		+ Default;
-
-	/// Converting trait to take a source type and convert to `AccountId`.
-	///
-	/// Used to define the type and conversion mechanism for referencing accounts in transactions.
-	/// It's perfectly reasonable for this to be an identity conversion (with the source type being
-	/// `AccountId`), but other modules (e.g. Indices module) may provide more functional/efficient
-	/// alternatives.
-	type Lookup: StaticLookup<Target = Self::AccountId>;
-
-	/// The block header.
-	type Header: Parameter + traits::Header<
-		Number = Self::BlockNumber,
-		Hash = Self::Hash,
-	>;
-
-	/// The aggregated event type of the runtime.
-	type Event: Parameter + Member + From<Event<Self>> + Debug;
-
-	/// Maximum number of block number to block hash mappings to keep (oldest pruned first).
-	type BlockHashCount: Get<Self::BlockNumber>;
-
-	/// The weight of runtime database operations the runtime can invoke.
-	type DbWeight: Get<RuntimeDbWeight>;
-
-	/// Get the chain's current version.
-	type Version: Get<RuntimeVersion>;
-
-	/// Provides information about the pallet setup in the runtime.
-	///
-	/// Expects the `PalletInfo` type that is being generated by `construct_runtime!` in the
-	/// runtime.
-	///
-	/// For tests it is okay to use `()` as type, however it will provide "useless" data.
-	type PalletInfo: PalletInfo;
-
-	/// Data to be associated with an account (other than nonce/transaction counter, which this
-	/// module does regardless).
-	type AccountData: Member + FullCodec + Clone + Default;
-
-	/// Handler for when a new account has just been created.
-	type OnNewAccount: OnNewAccount<Self::AccountId>;
-
-	/// A function that is invoked when an account has been determined to be dead.
-	///
-	/// All resources should be cleaned up associated with the given account.
-	type OnKilledAccount: OnKilledAccount<Self::AccountId>;
-
-	type SystemWeightInfo: WeightInfo;
-
-	/// The designated SS85 prefix of this chain.
-	///
-	/// This replaces the "ss58Format" property declared in the chain spec. Reason is
-	/// that the runtime should know about the prefix in order to make use of it as
-	/// an identifier of the chain.
-	type SS58Prefix: Get<u8>;
-}
-
-pub type DigestOf<T> = generic::Digest<<T as Config>::Hash>;
-pub type DigestItemOf<T> = generic::DigestItem<<T as Config>::Hash>;
-
-pub type Key = Vec<u8>;
-pub type KeyValue = (Vec<u8>, Vec<u8>);
-
-/// A phase of a block's execution.
-#[derive(Encode, Decode, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Serialize, PartialEq, Eq, Clone))]
-pub enum Phase {
-	/// Applying an extrinsic.
-	ApplyExtrinsic(u32),
-	/// Finalizing the block.
-	Finalization,
-	/// Initializing the block.
-	Initialization,
-}
-
-impl Default for Phase {
-	fn default() -> Self {
-		Self::Initialization
-	}
-}
-
-/// Record of an event happening.
-#[derive(Encode, Decode, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Serialize, PartialEq, Eq, Clone))]
-pub struct EventRecord<E: Parameter + Member, T> {
-	/// The phase of the block it happened in.
-	pub phase: Phase,
-	/// The event itself.
-	pub event: E,
-	/// The list of the topics this event has.
-	pub topics: Vec<T>,
-}
-
-/// Origin for the System module.
-#[derive(PartialEq, Eq, Clone, RuntimeDebug, Encode, Decode)]
-pub enum RawOrigin<AccountId> {
-	/// The system itself ordained this dispatch to happen: this is the highest privilege level.
-	Root,
-	/// It is signed by some public key and we provide the `AccountId`.
-	Signed(AccountId),
-	/// It is signed by nobody, can be either:
-	/// * included and agreed upon by the validators anyway,
-	/// * or unsigned transaction validated by a module.
-	None,
-}
-
-impl<AccountId> From<Option<AccountId>> for RawOrigin<AccountId> {
-	fn from(s: Option<AccountId>) -> RawOrigin<AccountId> {
-		match s {
-			Some(who) => RawOrigin::Signed(who),
-			None => RawOrigin::None,
-		}
-	}
-}
-
-/// Exposed trait-generic origin type.
-pub type Origin<T> = RawOrigin<<T as Config>::AccountId>;
-
-// Create a Hash with 69 for each byte,
-// only used to build genesis config.
-#[cfg(feature = "std")]
-fn hash69<T: AsMut<[u8]> + Default>() -> T {
-	let mut h = T::default();
-	h.as_mut().iter_mut().for_each(|byte| *byte = 69);
-	h
-}
-
-/// This type alias represents an index of an event.
-///
-/// We use `u32` here because this index is used as index for `Events<T>`
-/// which can't contain more than `u32::max_value()` items.
-type EventIndex = u32;
-
-/// Type used to encode the number of references an account has.
-pub type RefCount = u32;
-
-/// Information of an account.
-#[derive(Clone, Eq, PartialEq, Default, RuntimeDebug, Encode, Decode)]
-pub struct AccountInfo<Index, AccountData> {
-	/// The number of transactions this account has sent.
-	pub nonce: Index,
-	/// The number of other modules that currently depend on this account's existence. The account
-	/// cannot be reaped until this is zero.
-	pub consumers: RefCount,
-	/// The number of other modules that allow this account to exist. The account may not be reaped
-	/// until this is zero.
-	pub providers: RefCount,
-	/// The additional data that belongs to this account. Used to store the balance(s) in a lot of
-	/// chains.
-	pub data: AccountData,
-}
-
-/// Stores the `spec_version` and `spec_name` of when the last runtime upgrade
-/// happened.
-#[derive(sp_runtime::RuntimeDebug, Encode, Decode)]
-#[cfg_attr(feature = "std", derive(PartialEq))]
-pub struct LastRuntimeUpgradeInfo {
-	pub spec_version: codec::Compact<u32>,
-	pub spec_name: sp_runtime::RuntimeString,
-}
-
-impl LastRuntimeUpgradeInfo {
-	/// Returns if the runtime was upgraded in comparison of `self` and `current`.
-	///
-	/// Checks if either the `spec_version` increased or the `spec_name` changed.
-	pub fn was_upgraded(&self, current: &sp_version::RuntimeVersion) -> bool {
-		current.spec_version > self.spec_version.0 || current.spec_name != self.spec_name
-	}
-}
-
-impl From<sp_version::RuntimeVersion> for LastRuntimeUpgradeInfo {
-	fn from(version: sp_version::RuntimeVersion) -> Self {
-		Self {
-			spec_version: version.spec_version.into(),
-			spec_name: version.spec_name,
-		}
-	}
-}
-
-decl_storage! {
-	trait Store for Module<T: Config> as System {
-		/// The full account information for a particular account ID.
-		pub Account get(fn account):
-			map hasher(blake2_128_concat) T::AccountId => AccountInfo<T::Index, T::AccountData>;
-
-		/// Total extrinsics count for the current block.
-		ExtrinsicCount: Option<u32>;
-
-		/// The current weight for the block.
-		BlockWeight get(fn block_weight): ConsumedWeight;
-
-		/// Total length (in bytes) for all extrinsics put together, for the current block.
-		AllExtrinsicsLen: Option<u32>;
-
-		/// Map of block numbers to block hashes.
-		pub BlockHash get(fn block_hash) build(|_| vec![(T::BlockNumber::zero(), hash69())]):
-			map hasher(twox_64_concat) T::BlockNumber => T::Hash;
-
-		/// Extrinsics data for the current block (maps an extrinsic's index to its data).
-		ExtrinsicData get(fn extrinsic_data): map hasher(twox_64_concat) u32 => Vec<u8>;
-
-		/// The current block number being processed. Set by `execute_block`.
-		Number get(fn block_number): T::BlockNumber;
+pub use pallet::*;
+
+#[frame_support::pallet]
+pub mod pallet {
+	use crate::{*, pallet_prelude::*, self as frame_system};
+	use frame_support::pallet_prelude::*;
+
+	/// System configuration trait. Implemented by runtime.
+	#[pallet::config]
+	#[pallet::disable_frame_system_supertrait_check]
+	pub trait Config: 'static + Eq + Clone {
+		/// The basic call filter to use in Origin. All origins are built with this filter as base,
+		/// except Root.
+		type BaseCallFilter: Filter<Self::Call>;
+
+		/// Block & extrinsics weights: base values and limits.
+		#[pallet::constant]
+		type BlockWeights: Get<limits::BlockWeights>;
+
+		/// The maximum length of a block (in bytes).
+		#[pallet::constant]
+		type BlockLength: Get<limits::BlockLength>;
+
+		/// The `Origin` type used by dispatchable calls.
+		type Origin:
+			Into<Result<RawOrigin<Self::AccountId>, Self::Origin>>
+			+ From<RawOrigin<Self::AccountId>>
+			+ Clone
+			+ OriginTrait<Call=Self::Call>;
+
+		/// The aggregated `Call` type.
+		type Call: Dispatchable + Debug;
+
+		/// Account index (aka nonce) type. This stores the number of previous transactions associated
+		/// with a sender account.
+		type Index:
+			Parameter + Member + MaybeSerialize + Debug + Default + MaybeDisplay + AtLeast32Bit
+			+ Copy;
+
+		/// The block number type used by the runtime.
+		type BlockNumber:
+			Parameter + Member + MaybeSerializeDeserialize + Debug + MaybeDisplay +
+			AtLeast32BitUnsigned + Default + Bounded + Copy + sp_std::hash::Hash +
+			sp_std::str::FromStr + MaybeMallocSizeOf;
+
+		/// The output of the `Hashing` function.
+		type Hash:
+			Parameter + Member + MaybeSerializeDeserialize + Debug + MaybeDisplay + SimpleBitOps + Ord
+			+ Default + Copy + CheckEqual + sp_std::hash::Hash + AsRef<[u8]> + AsMut<[u8]> + MaybeMallocSizeOf;
+
+		/// The hashing system (algorithm) being used in the runtime (e.g. Blake2).
+		type Hashing: Hash<Output=Self::Hash>;
+
+		/// The user account identifier type for the runtime.
+		type AccountId: Parameter + Member + MaybeSerializeDeserialize + Debug + MaybeDisplay + Ord
+			+ Default;
+
+		/// Converting trait to take a source type and convert to `AccountId`.
+		///
+		/// Used to define the type and conversion mechanism for referencing accounts in transactions.
+		/// It's perfectly reasonable for this to be an identity conversion (with the source type being
+		/// `AccountId`), but other pallets (e.g. Indices pallet) may provide more functional/efficient
+		/// alternatives.
+		type Lookup: StaticLookup<Target=Self::AccountId>;
 
-		/// Hash of the previous block.
-		ParentHash get(fn parent_hash) build(|_| hash69()): T::Hash;
+		/// The block header.
+		type Header: Parameter + traits::Header<
+			Number=Self::BlockNumber,
+			Hash=Self::Hash,
+		>;
 
-		/// Digest of the current block, also part of the block header.
-		Digest get(fn digest): DigestOf<T>;
+		/// The aggregated event type of the runtime.
+		type Event: Parameter + Member + From<Event<Self>> + Debug + IsType<<Self as frame_system::Config>::Event>;
 
-		/// Events deposited for the current block.
-		Events get(fn events): Vec<EventRecord<T::Event, T::Hash>>;
+		/// Maximum number of block number to block hash mappings to keep (oldest pruned first).
+		#[pallet::constant]
+		type BlockHashCount: Get<Self::BlockNumber>;
 
-		/// The number of events in the `Events<T>` list.
-		EventCount get(fn event_count): EventIndex;
+		/// The weight of runtime database operations the runtime can invoke.
+		#[pallet::constant]
+		type DbWeight: Get<RuntimeDbWeight>;
 
-		// TODO: https://github.com/paritytech/substrate/issues/2553
-		// Possibly, we can improve it by using something like:
-		// `Option<(BlockNumber, Vec<EventIndex>)>`, however in this case we won't be able to use
-		// `EventTopics::append`.
+		/// Get the chain's current version.
+		#[pallet::constant]
+		type Version: Get<RuntimeVersion>;
 
-		/// Mapping between a topic (represented by T::Hash) and a vector of indexes
-		/// of events in the `<Events<T>>` list.
+		/// Provides information about the pallet setup in the runtime.
 		///
-		/// All topic vectors have deterministic storage locations depending on the topic. This
-		/// allows light-clients to leverage the changes trie storage tracking mechanism and
-		/// in case of changes fetch the list of events of interest.
+		/// Expects the `PalletInfo` type that is being generated by `construct_runtime!` in the
+		/// runtime.
 		///
-		/// The value has the type `(T::BlockNumber, EventIndex)` because if we used only just
-		/// the `EventIndex` then in case if the topic has the same contents on the next block
-		/// no notification will be triggered thus the event might be lost.
-		EventTopics get(fn event_topics): map hasher(blake2_128_concat) T::Hash => Vec<(T::BlockNumber, EventIndex)>;
-
-		/// Stores the `spec_version` and `spec_name` of when the last runtime upgrade happened.
-		pub LastRuntimeUpgrade build(|_| Some(LastRuntimeUpgradeInfo::from(T::Version::get()))): Option<LastRuntimeUpgradeInfo>;
+		/// For tests it is okay to use `()` as type, however it will provide "useless" data.
+		type PalletInfo: PalletInfo;
 
-		/// True if we have upgraded so that `type RefCount` is `u32`. False (default) if not.
-		UpgradedToU32RefCount build(|_| true): bool;
+		/// Data to be associated with an account (other than nonce/transaction counter, which this
+		/// pallet does regardless).
+		type AccountData: Member + FullCodec + Clone + Default;
 
-		/// True if we have upgraded so that AccountInfo contains two types of `RefCount`. False
-		/// (default) if not.
-		UpgradedToDualRefCount build(|_| true): bool;
+		/// Handler for when a new account has just been created.
+		type OnNewAccount: OnNewAccount<Self::AccountId>;
 
-		/// The execution phase of the block.
-		ExecutionPhase: Option<Phase>;
-	}
-	add_extra_genesis {
-		config(changes_trie_config): Option<ChangesTrieConfiguration>;
-		#[serde(with = "sp_core::bytes")]
-		config(code): Vec<u8>;
-
-		build(|config: &GenesisConfig| {
-			use codec::Encode;
-
-			sp_io::storage::set(well_known_keys::CODE, &config.code);
-			sp_io::storage::set(well_known_keys::EXTRINSIC_INDEX, &0u32.encode());
-
-			if let Some(ref changes_trie_config) = config.changes_trie_config {
-				sp_io::storage::set(
-					well_known_keys::CHANGES_TRIE_CONFIG,
-					&changes_trie_config.encode(),
-				);
-			}
-		});
-	}
-}
-
-decl_event!(
-	/// Event for the System module.
-	pub enum Event<T> where AccountId = <T as Config>::AccountId {
-		/// An extrinsic completed successfully. \[info\]
-		ExtrinsicSuccess(DispatchInfo),
-		/// An extrinsic failed. \[error, info\]
-		ExtrinsicFailed(DispatchError, DispatchInfo),
-		/// `:code` was updated.
-		CodeUpdated,
-		/// A new \[account\] was created.
-		NewAccount(AccountId),
-		/// An \[account\] was reaped.
-		KilledAccount(AccountId),
-	}
-);
-
-decl_error! {
-	/// Error for the System module
-	pub enum Error for Module<T: Config> {
-		/// The name of specification does not match between the current runtime
-		/// and the new runtime.
-		InvalidSpecName,
-		/// The specification version is not allowed to decrease between the current runtime
-		/// and the new runtime.
-		SpecVersionNeedsToIncrease,
-		/// Failed to extract the runtime version from the new runtime.
+		/// A function that is invoked when an account has been determined to be dead.
 		///
-		/// Either calling `Core_version` or decoding `RuntimeVersion` failed.
-		FailedToExtractRuntimeVersion,
-		/// Suicide called when the account has non-default composite data.
-		NonDefaultComposite,
-		/// There is a non-zero reference count preventing the account from being purged.
-		NonZeroRefCount,
-	}
-}
-
-mod migrations {
-	use super::*;
-
-	#[allow(dead_code)]
-	pub fn migrate_all<T: Config>() -> frame_support::weights::Weight {
-		Account::<T>::translate::<(T::Index, u8, T::AccountData), _>(|_key, (nonce, rc, data)|
-			Some(AccountInfo { nonce, consumers: rc as RefCount, providers: 1, data })
-		);
-		T::BlockWeights::get().max_block
-	}
-
-	pub fn migrate_to_dual_ref_count<T: Config>() -> frame_support::weights::Weight {
-		Account::<T>::translate::<(T::Index, RefCount, T::AccountData), _>(|_key, (nonce, rc, data)|
-			Some(AccountInfo { nonce, consumers: rc as RefCount, providers: 1, data })
-		);
-		T::BlockWeights::get().max_block
-	}
-}
+		/// All resources should be cleaned up associated with the given account.
+		type OnKilledAccount: OnKilledAccount<Self::AccountId>;
 
-/// Pallet struct placeholder on which is implemented the pallet logic.
-///
-/// It is currently an alias for `Module` as old macros still generate/use old name.
-pub type Pallet<T> = Module<T>;
-
-decl_module! {
-	pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {
-		type Error = Error<T>;
-
-		/// The maximum number of blocks to allow in mortal eras.
-		const BlockHashCount: T::BlockNumber = T::BlockHashCount::get();
-
-		/// The weight of runtime database operations the runtime can invoke.
-		const DbWeight: RuntimeDbWeight = T::DbWeight::get();
-
-		/// The weight configuration (limits & base values) for each class of extrinsics and block.
-		const BlockWeights: limits::BlockWeights = T::BlockWeights::get();
+		type SystemWeightInfo: WeightInfo;
 
 		/// The designated SS85 prefix of this chain.
 		///
 		/// This replaces the "ss58Format" property declared in the chain spec. Reason is
 		/// that the runtime should know about the prefix in order to make use of it as
 		/// an identifier of the chain.
-		const SS58Prefix: u8 = T::SS58Prefix::get();
+		#[pallet::constant]
+		type SS58Prefix: Get<u8>;
+	}
 
+	#[pallet::pallet]
+	#[pallet::generate_store(pub (super) trait Store)]
+	pub struct Pallet<T>(PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
 		fn on_runtime_upgrade() -> frame_support::weights::Weight {
-			if !UpgradedToDualRefCount::get() {
-				UpgradedToDualRefCount::put(true);
+			if !UpgradedToDualRefCount::<T>::get() {
+				UpgradedToDualRefCount::<T>::put(true);
 				migrations::migrate_to_dual_ref_count::<T>()
 			} else {
 				0
@@ -568,13 +273,17 @@ decl_module! {
 				.validate()
 				.expect("The weights are invalid.");
 		}
+	}
 
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
 		/// A dispatch that will fill the block weight up to the given ratio.
 		// TODO: This should only be available for testing, rather than in general usage, but
-		// that's not possible at present (since it's within the decl_module macro).
-		#[weight = *_ratio * T::BlockWeights::get().max_block]
-		fn fill_block(origin, _ratio: Perbill) {
+		// that's not possible at present (since it's within the pallet macro).
+		#[pallet::weight(*_ratio * T::BlockWeights::get().max_block)]
+		pub(crate) fn fill_block(origin: OriginFor<T>, _ratio: Perbill) -> DispatchResultWithPostInfo {
 			ensure_root(origin)?;
+			Ok(().into())
 		}
 
 		/// Make some on-chain remark.
@@ -584,9 +293,10 @@ decl_module! {
 		/// - Base Weight: 0.665 µs, independent of remark length.
 		/// - No DB operations.
 		/// # </weight>
-		#[weight = T::SystemWeightInfo::remark(_remark.len() as u32)]
-		fn remark(origin, _remark: Vec<u8>) {
+		#[pallet::weight(T::SystemWeightInfo::remark(_remark.len() as u32))]
+		pub(crate) fn remark(origin: OriginFor<T>, _remark: Vec<u8>) -> DispatchResultWithPostInfo {
 			ensure_signed(origin)?;
+			Ok(().into())
 		}
 
 		/// Set the number of pages in the WebAssembly environment's heap.
@@ -597,10 +307,11 @@ decl_module! {
 		/// - Base Weight: 1.405 µs
 		/// - 1 write to HEAP_PAGES
 		/// # </weight>
-		#[weight = (T::SystemWeightInfo::set_heap_pages(), DispatchClass::Operational)]
-		fn set_heap_pages(origin, pages: u64) {
+		#[pallet::weight((T::SystemWeightInfo::set_heap_pages(), DispatchClass::Operational))]
+		pub(crate) fn set_heap_pages(origin: OriginFor<T>, pages: u64) -> DispatchResultWithPostInfo {
 			ensure_root(origin)?;
 			storage::unhashed::put_raw(well_known_keys::HEAP_PAGES, &pages.encode());
+			Ok(().into())
 		}
 
 		/// Set the new runtime code.
@@ -613,13 +324,14 @@ decl_module! {
 		/// The weight of this function is dependent on the runtime, but generally this is very expensive.
 		/// We will treat this as a full block.
 		/// # </weight>
-		#[weight = (T::BlockWeights::get().max_block, DispatchClass::Operational)]
-		pub fn set_code(origin, code: Vec<u8>) {
+		#[pallet::weight((T::BlockWeights::get().max_block, DispatchClass::Operational))]
+		pub fn set_code(origin: OriginFor<T>, code: Vec<u8>) -> DispatchResultWithPostInfo {
 			ensure_root(origin)?;
 			Self::can_set_code(&code)?;
 
 			storage::unhashed::put_raw(well_known_keys::CODE, &code);
-			Self::deposit_event(RawEvent::CodeUpdated);
+			Self::deposit_event(Event::CodeUpdated);
+			Ok(().into())
 		}
 
 		/// Set the new runtime code without doing any checks of the given `code`.
@@ -630,11 +342,15 @@ decl_module! {
 		/// - 1 event.
 		/// The weight of this function is dependent on the runtime. We will treat this as a full block.
 		/// # </weight>
-		#[weight = (T::BlockWeights::get().max_block, DispatchClass::Operational)]
-		pub fn set_code_without_checks(origin, code: Vec<u8>) {
+		#[pallet::weight((T::BlockWeights::get().max_block, DispatchClass::Operational))]
+		pub fn set_code_without_checks(
+			origin: OriginFor<T>,
+			code: Vec<u8>,
+		) -> DispatchResultWithPostInfo {
 			ensure_root(origin)?;
 			storage::unhashed::put_raw(well_known_keys::CODE, &code);
-			Self::deposit_event(RawEvent::CodeUpdated);
+			Self::deposit_event(Event::CodeUpdated);
+			Ok(().into())
 		}
 
 		/// Set the new changes trie configuration.
@@ -647,8 +363,11 @@ decl_module! {
 		/// - DB Weight:
 		///     - Writes: Changes Trie, System Digest
 		/// # </weight>
-		#[weight = (T::SystemWeightInfo::set_changes_trie_config(), DispatchClass::Operational)]
-		pub fn set_changes_trie_config(origin, changes_trie_config: Option<ChangesTrieConfiguration>) {
+		#[pallet::weight((T::SystemWeightInfo::set_changes_trie_config(), DispatchClass::Operational))]
+		pub fn set_changes_trie_config(
+			origin: OriginFor<T>,
+			changes_trie_config: Option<ChangesTrieConfiguration>,
+		) -> DispatchResultWithPostInfo {
 			ensure_root(origin)?;
 			match changes_trie_config.clone() {
 				Some(changes_trie_config) => storage::unhashed::put_raw(
@@ -662,6 +381,7 @@ decl_module! {
 				generic::ChangesTrieSignal::NewConfiguration(changes_trie_config),
 			);
 			Self::deposit_log(log.into());
+			Ok(().into())
 		}
 
 		/// Set some items of storage.
@@ -672,15 +392,16 @@ decl_module! {
 		/// - Base Weight: 0.568 * i µs
 		/// - Writes: Number of items
 		/// # </weight>
-		#[weight = (
+		#[pallet::weight((
 			T::SystemWeightInfo::set_storage(items.len() as u32),
 			DispatchClass::Operational,
-		)]
-		fn set_storage(origin, items: Vec<KeyValue>) {
+		))]
+		pub(crate) fn set_storage(origin: OriginFor<T>, items: Vec<KeyValue>) -> DispatchResultWithPostInfo {
 			ensure_root(origin)?;
 			for i in &items {
 				storage::unhashed::put_raw(&i.0, &i.1);
 			}
+			Ok(().into())
 		}
 
 		/// Kill some items from storage.
@@ -691,15 +412,16 @@ decl_module! {
 		/// - Base Weight: .378 * i µs
 		/// - Writes: Number of items
 		/// # </weight>
-		#[weight = (
+		#[pallet::weight((
 			T::SystemWeightInfo::kill_storage(keys.len() as u32),
 			DispatchClass::Operational,
-		)]
-		fn kill_storage(origin, keys: Vec<Key>) {
+		))]
+		pub(crate) fn kill_storage(origin: OriginFor<T>, keys: Vec<Key>) -> DispatchResultWithPostInfo {
 			ensure_root(origin)?;
 			for key in &keys {
 				storage::unhashed::kill(&key);
 			}
+			Ok(().into())
 		}
 
 		/// Kill all storage items with a key that starts with the given prefix.
@@ -713,13 +435,347 @@ decl_module! {
 		/// - Base Weight: 0.834 * P µs
 		/// - Writes: Number of subkeys + 1
 		/// # </weight>
-		#[weight = (
+		#[pallet::weight((
 			T::SystemWeightInfo::kill_prefix(_subkeys.saturating_add(1)),
 			DispatchClass::Operational,
-		)]
-		fn kill_prefix(origin, prefix: Key, _subkeys: u32) {
+		))]
+		pub(crate) fn kill_prefix(
+			origin: OriginFor<T>,
+			prefix: Key,
+			_subkeys: u32,
+		) -> DispatchResultWithPostInfo {
 			ensure_root(origin)?;
 			storage::unhashed::kill_prefix(&prefix);
+			Ok(().into())
+		}
+	}
+
+	/// Event for the System pallet.
+	#[pallet::event]
+	#[pallet::metadata(T::AccountId = "AccountId")]
+	pub enum Event<T: Config> {
+		/// An extrinsic completed successfully. \[info\]
+		ExtrinsicSuccess(DispatchInfo),
+		/// An extrinsic failed. \[error, info\]
+		ExtrinsicFailed(DispatchError, DispatchInfo),
+		/// `:code` was updated.
+		CodeUpdated,
+		/// A new \[account\] was created.
+		NewAccount(T::AccountId),
+		/// An \[account\] was reaped.
+		KilledAccount(T::AccountId),
+	}
+
+	/// Old name generated by `decl_event`.
+	#[deprecated(note = "use `Event` instead")]
+	pub type RawEvent<T> = Event<T>;
+
+	/// Error for the System pallet
+	#[pallet::error]
+	pub enum Error<T> {
+		/// The name of specification does not match between the current runtime
+		/// and the new runtime.
+		InvalidSpecName,
+		/// The specification version is not allowed to decrease between the current runtime
+		/// and the new runtime.
+		SpecVersionNeedsToIncrease,
+		/// Failed to extract the runtime version from the new runtime.
+		///
+		/// Either calling `Core_version` or decoding `RuntimeVersion` failed.
+		FailedToExtractRuntimeVersion,
+		/// Suicide called when the account has non-default composite data.
+		NonDefaultComposite,
+		/// There is a non-zero reference count preventing the account from being purged.
+		NonZeroRefCount,
+	}
+
+	/// Exposed trait-generic origin type.
+	#[pallet::origin]
+	pub type Origin<T> = RawOrigin<<T as Config>::AccountId>;
+
+	/// The full account information for a particular account ID.
+	#[pallet::storage]
+	#[pallet::getter(fn account)]
+	pub type Account<T: Config> = StorageMap<
+		_,
+		Blake2_128Concat,
+		T::AccountId,
+		AccountInfo<T::Index, T::AccountData>,
+		ValueQuery,
+	>;
+
+	/// Total extrinsics count for the current block.
+	#[pallet::storage]
+	pub(super) type ExtrinsicCount<T: Config> = StorageValue<_, u32>;
+
+	/// The current weight for the block.
+	#[pallet::storage]
+	#[pallet::getter(fn block_weight)]
+	pub(super) type BlockWeight<T: Config> = StorageValue<_, ConsumedWeight, ValueQuery>;
+
+	/// Total length (in bytes) for all extrinsics put together, for the current block.
+	#[pallet::storage]
+	pub(super) type AllExtrinsicsLen<T: Config> = StorageValue<_, u32>;
+
+	/// Map of block numbers to block hashes.
+	#[pallet::storage]
+	#[pallet::getter(fn block_hash)]
+	pub type BlockHash<T: Config> =
+		StorageMap<_, Twox64Concat, T::BlockNumber, T::Hash, ValueQuery>;
+
+	/// Extrinsics data for the current block (maps an extrinsic's index to its data).
+	#[pallet::storage]
+	#[pallet::getter(fn extrinsic_data)]
+	pub(super) type ExtrinsicData<T: Config> =
+		StorageMap<_, Twox64Concat, u32, Vec<u8>, ValueQuery>;
+
+	/// The current block number being processed. Set by `execute_block`.
+	#[pallet::storage]
+	#[pallet::getter(fn block_number)]
+	pub(super) type Number<T: Config> = StorageValue<_, T::BlockNumber, ValueQuery>;
+
+	/// Hash of the previous block.
+	#[pallet::storage]
+	#[pallet::getter(fn parent_hash)]
+	pub(super) type ParentHash<T: Config> = StorageValue<_, T::Hash, ValueQuery>;
+
+	/// Digest of the current block, also part of the block header.
+	#[pallet::storage]
+	#[pallet::getter(fn digest)]
+	pub(super) type Digest<T: Config> = StorageValue<_, DigestOf<T>, ValueQuery>;
+
+	/// Events deposited for the current block.
+	#[pallet::storage]
+	#[pallet::getter(fn events)]
+	pub(super) type Events<T: Config> =
+		StorageValue<_, Vec<EventRecord<T::Event, T::Hash>>, ValueQuery>;
+
+	/// The number of events in the `Events<T>` list.
+	#[pallet::storage]
+	#[pallet::getter(fn event_count)]
+	pub(super) type EventCount<T: Config> = StorageValue<_, EventIndex, ValueQuery>;
+
+	/// Mapping between a topic (represented by T::Hash) and a vector of indexes
+	/// of events in the `<Events<T>>` list.
+	///
+	/// All topic vectors have deterministic storage locations depending on the topic. This
+	/// allows light-clients to leverage the changes trie storage tracking mechanism and
+	/// in case of changes fetch the list of events of interest.
+	///
+	/// The value has the type `(T::BlockNumber, EventIndex)` because if we used only just
+	/// the `EventIndex` then in case if the topic has the same contents on the next block
+	/// no notification will be triggered thus the event might be lost.
+	#[pallet::storage]
+	#[pallet::getter(fn event_topics)]
+	pub(super) type EventTopics<T: Config> =
+		StorageMap<_, Blake2_128Concat, T::Hash, Vec<(T::BlockNumber, EventIndex)>, ValueQuery>;
+
+	/// Stores the `spec_version` and `spec_name` of when the last runtime upgrade happened.
+	#[pallet::storage]
+	pub type LastRuntimeUpgrade<T: Config> = StorageValue<_, LastRuntimeUpgradeInfo>;
+
+	/// True if we have upgraded so that `type RefCount` is `u32`. False (default) if not.
+	#[pallet::storage]
+	pub(super) type UpgradedToU32RefCount<T: Config> = StorageValue<_, bool, ValueQuery>;
+
+	/// True if we have upgraded so that AccountInfo contains two types of `RefCount`. False
+	/// (default) if not.
+	#[pallet::storage]
+	pub(super) type UpgradedToDualRefCount<T: Config> = StorageValue<_, bool, ValueQuery>;
+
+	/// The execution phase of the block.
+	#[pallet::storage]
+	pub(super) type ExecutionPhase<T: Config> = StorageValue<_, Phase>;
+
+	#[pallet::genesis_config]
+	pub struct GenesisConfig {
+		pub changes_trie_config: Option<ChangesTrieConfiguration>,
+		#[serde(with = "sp_core::bytes")]
+		pub code: Vec<u8>,
+	}
+
+	#[cfg(feature = "std")]
+	impl Default for GenesisConfig {
+		fn default() -> Self {
+			Self {
+				changes_trie_config: Default::default(),
+				code: Default::default(),
+			}
+		}
+	}
+
+	#[pallet::genesis_build]
+	impl<T: Config> GenesisBuild<T> for GenesisConfig {
+		fn build(&self) {
+			<BlockHash<T>>::insert::<_, T::Hash>(T::BlockNumber::zero(), hash69());
+			<ParentHash<T>>::put::<T::Hash>(hash69());
+			<LastRuntimeUpgrade<T>>::put(LastRuntimeUpgradeInfo::from(T::Version::get()));
+			<UpgradedToU32RefCount<T>>::put(true);
+			<UpgradedToDualRefCount<T>>::put(true);
+
+			sp_io::storage::set(well_known_keys::CODE, &self.code);
+			sp_io::storage::set(well_known_keys::EXTRINSIC_INDEX, &0u32.encode());
+			if let Some(ref changes_trie_config) = self.changes_trie_config {
+				sp_io::storage::set(well_known_keys::CHANGES_TRIE_CONFIG, &changes_trie_config.encode());
+			}
+		}
+	}
+}
+
+mod migrations {
+	use super::*;
+
+	#[allow(dead_code)]
+	pub fn migrate_all<T: Config>() -> frame_support::weights::Weight {
+		Account::<T>::translate::<(T::Index, u8, T::AccountData), _>(|_key, (nonce, rc, data)|
+			Some(AccountInfo { nonce, consumers: rc as RefCount, providers: 1, data })
+		);
+		T::BlockWeights::get().max_block
+	}
+
+	pub fn migrate_to_dual_ref_count<T: Config>() -> frame_support::weights::Weight {
+		Account::<T>::translate::<(T::Index, RefCount, T::AccountData), _>(|_key, (nonce, rc, data)|
+			Some(AccountInfo { nonce, consumers: rc as RefCount, providers: 1, data })
+		);
+		T::BlockWeights::get().max_block
+	}
+}
+
+#[cfg(feature = "std")]
+impl GenesisConfig {
+	/// Direct implementation of `GenesisBuild::build_storage`.
+	///
+	/// Kept in order not to break dependency.
+	pub fn build_storage<T: Config>(&self) -> Result<sp_runtime::Storage, String> {
+		<Self as GenesisBuild<T>>::build_storage(self)
+	}
+
+	/// Direct implementation of `GenesisBuild::assimilate_storage`.
+	///
+	/// Kept in order not to break dependency.
+	pub fn assimilate_storage<T: Config>(
+		&self,
+		storage: &mut sp_runtime::Storage
+	) -> Result<(), String> {
+		<Self as GenesisBuild<T>>::assimilate_storage(self, storage)
+	}
+}
+
+pub type DigestOf<T> = generic::Digest<<T as Config>::Hash>;
+pub type DigestItemOf<T> = generic::DigestItem<<T as Config>::Hash>;
+
+pub type Key = Vec<u8>;
+pub type KeyValue = (Vec<u8>, Vec<u8>);
+
+/// A phase of a block's execution.
+#[derive(Encode, Decode, RuntimeDebug)]
+#[cfg_attr(feature = "std", derive(Serialize, PartialEq, Eq, Clone))]
+pub enum Phase {
+	/// Applying an extrinsic.
+	ApplyExtrinsic(u32),
+	/// Finalizing the block.
+	Finalization,
+	/// Initializing the block.
+	Initialization,
+}
+
+impl Default for Phase {
+	fn default() -> Self {
+		Self::Initialization
+	}
+}
+
+/// Record of an event happening.
+#[derive(Encode, Decode, RuntimeDebug)]
+#[cfg_attr(feature = "std", derive(Serialize, PartialEq, Eq, Clone))]
+pub struct EventRecord<E: Parameter + Member, T> {
+	/// The phase of the block it happened in.
+	pub phase: Phase,
+	/// The event itself.
+	pub event: E,
+	/// The list of the topics this event has.
+	pub topics: Vec<T>,
+}
+
+/// Origin for the System pallet.
+#[derive(PartialEq, Eq, Clone, RuntimeDebug, Encode, Decode)]
+pub enum RawOrigin<AccountId> {
+	/// The system itself ordained this dispatch to happen: this is the highest privilege level.
+	Root,
+	/// It is signed by some public key and we provide the `AccountId`.
+	Signed(AccountId),
+	/// It is signed by nobody, can be either:
+	/// * included and agreed upon by the validators anyway,
+	/// * or unsigned transaction validated by a pallet.
+	None,
+}
+
+impl<AccountId> From<Option<AccountId>> for RawOrigin<AccountId> {
+	fn from(s: Option<AccountId>) -> RawOrigin<AccountId> {
+		match s {
+			Some(who) => RawOrigin::Signed(who),
+			None => RawOrigin::None,
+		}
+	}
+}
+
+// Create a Hash with 69 for each byte,
+// only used to build genesis config.
+#[cfg(feature = "std")]
+fn hash69<T: AsMut<[u8]> + Default>() -> T {
+	let mut h = T::default();
+	h.as_mut().iter_mut().for_each(|byte| *byte = 69);
+	h
+}
+
+/// This type alias represents an index of an event.
+///
+/// We use `u32` here because this index is used as index for `Events<T>`
+/// which can't contain more than `u32::max_value()` items.
+type EventIndex = u32;
+
+/// Type used to encode the number of references an account has.
+pub type RefCount = u32;
+
+/// Information of an account.
+#[derive(Clone, Eq, PartialEq, Default, RuntimeDebug, Encode, Decode)]
+pub struct AccountInfo<Index, AccountData> {
+	/// The number of transactions this account has sent.
+	pub nonce: Index,
+	/// The number of other modules that currently depend on this account's existence. The account
+	/// cannot be reaped until this is zero.
+	pub consumers: RefCount,
+	/// The number of other modules that allow this account to exist. The account may not be reaped
+	/// until this is zero.
+	pub providers: RefCount,
+	/// The additional data that belongs to this account. Used to store the balance(s) in a lot of
+	/// chains.
+	pub data: AccountData,
+}
+
+/// Stores the `spec_version` and `spec_name` of when the last runtime upgrade
+/// happened.
+#[derive(sp_runtime::RuntimeDebug, Encode, Decode)]
+#[cfg_attr(feature = "std", derive(PartialEq))]
+pub struct LastRuntimeUpgradeInfo {
+	pub spec_version: codec::Compact<u32>,
+	pub spec_name: sp_runtime::RuntimeString,
+}
+
+impl LastRuntimeUpgradeInfo {
+	/// Returns if the runtime was upgraded in comparison of `self` and `current`.
+	///
+	/// Checks if either the `spec_version` increased or the `spec_name` changed.
+	pub fn was_upgraded(&self, current: &sp_version::RuntimeVersion) -> bool {
+		current.spec_version > self.spec_version.0 || current.spec_name != self.spec_name
+	}
+}
+
+impl From<sp_version::RuntimeVersion> for LastRuntimeUpgradeInfo {
+	fn from(version: sp_version::RuntimeVersion) -> Self {
+		Self {
+			spec_version: version.spec_version.into(),
+			spec_name: version.spec_name,
 		}
 	}
 }
@@ -1064,7 +1120,7 @@ impl<T: Config> Module<T> {
 		// Don't populate events on genesis.
 		if block_number.is_zero() { return }
 
-		let phase = ExecutionPhase::get().unwrap_or_default();
+		let phase = ExecutionPhase::<T>::get().unwrap_or_default();
 		let event = EventRecord {
 			phase,
 			event,
@@ -1073,14 +1129,14 @@ impl<T: Config> Module<T> {
 
 		// Index of the to be added event.
 		let event_idx = {
-			let old_event_count = EventCount::get();
+			let old_event_count = EventCount::<T>::get();
 			let new_event_count = match old_event_count.checked_add(1) {
 				// We've reached the maximum number of events at this block, just
 				// don't do anything and leave the event_count unaltered.
 				None => return,
 				Some(nc) => nc,
 			};
-			EventCount::put(new_event_count);
+			EventCount::<T>::put(new_event_count);
 			old_event_count
 		};
 
@@ -1098,17 +1154,17 @@ impl<T: Config> Module<T> {
 
 	/// Gets extrinsics count.
 	pub fn extrinsic_count() -> u32 {
-		ExtrinsicCount::get().unwrap_or_default()
+		ExtrinsicCount::<T>::get().unwrap_or_default()
 	}
 
 	pub fn all_extrinsics_len() -> u32 {
-		AllExtrinsicsLen::get().unwrap_or_default()
+		AllExtrinsicsLen::<T>::get().unwrap_or_default()
 	}
 
-	/// Inform the system module of some additional weight that should be accounted for, in the
+	/// Inform the system pallet of some additional weight that should be accounted for, in the
 	/// current block.
 	///
-	/// NOTE: use with extra care; this function is made public only be used for certain modules
+	/// NOTE: use with extra care; this function is made public only be used for certain pallets
 	/// that need it. A runtime that does not have dynamic calls should never need this and should
 	/// stick to static weights. A typical use case for this is inner calls or smart contract calls.
 	/// Furthermore, it only makes sense to use this when it is presumably  _cheap_ to provide the
@@ -1121,7 +1177,7 @@ impl<T: Config> Module<T> {
 	///
 	/// Another potential use-case could be for the `on_initialize` and `on_finalize` hooks.
 	pub fn register_extra_weight_unchecked(weight: Weight, class: DispatchClass) {
-		BlockWeight::mutate(|current_weight| {
+		BlockWeight::<T>::mutate(|current_weight| {
 			current_weight.add(weight, class);
 		});
 	}
@@ -1134,7 +1190,7 @@ impl<T: Config> Module<T> {
 		kind: InitKind,
 	) {
 		// populate environment
-		ExecutionPhase::put(Phase::Initialization);
+		ExecutionPhase::<T>::put(Phase::Initialization);
 		storage::unhashed::put(well_known_keys::EXTRINSIC_INDEX, &0u32);
 		<Number<T>>::put(number);
 		<Digest<T>>::put(digest);
@@ -1142,12 +1198,12 @@ impl<T: Config> Module<T> {
 		<BlockHash<T>>::insert(*number - One::one(), parent_hash);
 
 		// Remove previous block data from storage
-		BlockWeight::kill();
+		BlockWeight::<T>::kill();
 
 		// Kill inspectable storage entries in state when `InitKind::Full`.
 		if let InitKind::Full = kind {
 			<Events<T>>::kill();
-			EventCount::kill();
+			EventCount::<T>::kill();
 			<EventTopics<T>>::remove_all();
 		}
 	}
@@ -1155,8 +1211,8 @@ impl<T: Config> Module<T> {
 	/// Remove temporary "environment" entries in storage, compute the storage root and return the
 	/// resulting header for this block.
 	pub fn finalize() -> T::Header {
-		ExecutionPhase::kill();
-		AllExtrinsicsLen::kill();
+		ExecutionPhase::<T>::kill();
+		AllExtrinsicsLen::<T>::kill();
 
 		// The following fields
 		//
@@ -1172,8 +1228,8 @@ impl<T: Config> Module<T> {
 		let parent_hash = <ParentHash<T>>::get();
 		let mut digest = <Digest<T>>::get();
 
-		let extrinsics = (0..ExtrinsicCount::take().unwrap_or_default())
-			.map(ExtrinsicData::take)
+		let extrinsics = (0..ExtrinsicCount::<T>::take().unwrap_or_default())
+			.map(ExtrinsicData::<T>::take)
 			.collect();
 		let extrinsics_root = extrinsics_data_root::<T::Hashing>(extrinsics);
 
@@ -1213,7 +1269,7 @@ impl<T: Config> Module<T> {
 		<Digest<T>>::append(item);
 	}
 
-	/// Get the basic externalities for this module, useful for tests.
+	/// Get the basic externalities for this pallet, useful for tests.
 	#[cfg(any(feature = "std", test))]
 	pub fn externalities() -> TestExternalities {
 		TestExternalities::new(sp_core::storage::Storage {
@@ -1249,10 +1305,10 @@ impl<T: Config> Module<T> {
 	/// Set the current block weight. This should only be used in some integration tests.
 	#[cfg(any(feature = "std", test))]
 	pub fn set_block_consumed_resources(weight: Weight, len: usize) {
-		BlockWeight::mutate(|current_weight| {
+		BlockWeight::<T>::mutate(|current_weight| {
 			current_weight.set(weight, DispatchClass::Normal)
 		});
-		AllExtrinsicsLen::put(len as u32);
+		AllExtrinsicsLen::<T>::put(len as u32);
 	}
 
 	/// Reset events. Can be used as an alternative to
@@ -1260,7 +1316,7 @@ impl<T: Config> Module<T> {
 	#[cfg(any(feature = "std", feature = "runtime-benchmarks", test))]
 	pub fn reset_events() {
 		<Events<T>>::kill();
-		EventCount::kill();
+		EventCount::<T>::kill();
 		<EventTopics<T>>::remove_all();
 	}
 
@@ -1282,7 +1338,7 @@ impl<T: Config> Module<T> {
 	/// This is required to be called before applying an extrinsic. The data will used
 	/// in [`Self::finalize`] to calculate the correct extrinsics root.
 	pub fn note_extrinsic(encoded_xt: Vec<u8>) {
-		ExtrinsicData::insert(Self::extrinsic_index().unwrap_or_default(), encoded_xt);
+		ExtrinsicData::<T>::insert(Self::extrinsic_index().unwrap_or_default(), encoded_xt);
 	}
 
 	/// To be called immediately after an extrinsic has been applied.
@@ -1290,10 +1346,10 @@ impl<T: Config> Module<T> {
 		info.weight = extract_actual_weight(r, &info);
 		Self::deposit_event(
 			match r {
-				Ok(_) => RawEvent::ExtrinsicSuccess(info),
+				Ok(_) => Event::ExtrinsicSuccess(info),
 				Err(err) => {
 					sp_runtime::print(err);
-					RawEvent::ExtrinsicFailed(err.error, info)
+					Event::ExtrinsicFailed(err.error, info)
 				},
 			}
 		);
@@ -1301,7 +1357,7 @@ impl<T: Config> Module<T> {
 		let next_extrinsic_index = Self::extrinsic_index().unwrap_or_default() + 1u32;
 
 		storage::unhashed::put(well_known_keys::EXTRINSIC_INDEX, &next_extrinsic_index);
-		ExecutionPhase::put(Phase::ApplyExtrinsic(next_extrinsic_index));
+		ExecutionPhase::<T>::put(Phase::ApplyExtrinsic(next_extrinsic_index));
 	}
 
 	/// To be called immediately after `note_applied_extrinsic` of the last extrinsic of the block
@@ -1309,26 +1365,26 @@ impl<T: Config> Module<T> {
 	pub fn note_finished_extrinsics() {
 		let extrinsic_index: u32 = storage::unhashed::take(well_known_keys::EXTRINSIC_INDEX)
 			.unwrap_or_default();
-		ExtrinsicCount::put(extrinsic_index);
-		ExecutionPhase::put(Phase::Finalization);
+		ExtrinsicCount::<T>::put(extrinsic_index);
+		ExecutionPhase::<T>::put(Phase::Finalization);
 	}
 
 	/// To be called immediately after finishing the initialization of the block
-	/// (e.g., called `on_initialize` for all modules).
+	/// (e.g., called `on_initialize` for all pallets).
 	pub fn note_finished_initialize() {
-		ExecutionPhase::put(Phase::ApplyExtrinsic(0))
+		ExecutionPhase::<T>::put(Phase::ApplyExtrinsic(0))
 	}
 
 	/// An account is being created.
 	pub fn on_created_account(who: T::AccountId, _a: &mut AccountInfo<T::Index, T::AccountData>) {
 		T::OnNewAccount::on_new_account(&who);
-		Self::deposit_event(RawEvent::NewAccount(who));
+		Self::deposit_event(Event::NewAccount(who));
 	}
 
 	/// Do anything that needs to be done after an account has been killed.
 	fn on_killed_account(who: T::AccountId) {
 		T::OnKilledAccount::on_killed_account(&who);
-		Self::deposit_event(RawEvent::KilledAccount(who));
+		Self::deposit_event(Event::KilledAccount(who));
 	}
 
 	/// Determine whether or not it is possible to update the code.
@@ -1385,12 +1441,12 @@ impl<T: Config> HandleLifetime<T::AccountId> for Consumer<T> {
 	}
 }
 
-impl<T: Config> BlockNumberProvider for Module<T>
+impl<T: Config> BlockNumberProvider for Pallet<T>
 {
 	type BlockNumber = <T as Config>::BlockNumber;
 
 	fn current_block_number() -> Self::BlockNumber {
-		Module::<T>::block_number()
+		Pallet::<T>::block_number()
 	}
 }
 
@@ -1403,7 +1459,7 @@ fn is_providing<T: Default + Eq>(d: &T) -> bool {
 /// empty/default.
 ///
 /// Anything more complex will need more sophisticated logic.
-impl<T: Config> StoredMap<T::AccountId, T::AccountData> for Module<T> {
+impl<T: Config> StoredMap<T::AccountId, T::AccountData> for Pallet<T> {
 	fn get(k: &T::AccountId) -> T::AccountData {
 		Account::<T>::get(k).data
 	}
diff --git a/frame/system/src/limits.rs b/frame/system/src/limits.rs
index 3d59bd2b7fa2..c24d671cdd7a 100644
--- a/frame/system/src/limits.rs
+++ b/frame/system/src/limits.rs
@@ -29,7 +29,7 @@ use frame_support::weights::{Weight, DispatchClass, constants, PerDispatchClass,
 use sp_runtime::{RuntimeDebug, Perbill};
 
 /// Block length limit configuration.
-#[derive(RuntimeDebug, Clone)]
+#[derive(RuntimeDebug, Clone, codec::Encode, codec::Decode)]
 pub struct BlockLength {
 	/// Maximal total length in bytes for each extrinsic class.
 	///
diff --git a/frame/system/src/offchain.rs b/frame/system/src/offchain.rs
index db417c028675..05a5882ee398 100644
--- a/frame/system/src/offchain.rs
+++ b/frame/system/src/offchain.rs
@@ -63,7 +63,7 @@ use sp_std::convert::{TryInto, TryFrom};
 use sp_std::prelude::{Box, Vec};
 use sp_runtime::app_crypto::RuntimeAppPublic;
 use sp_runtime::traits::{Extrinsic as ExtrinsicT, IdentifyAccount, One};
-use frame_support::{debug, storage::StorageMap, RuntimeDebug};
+use frame_support::{debug, RuntimeDebug};
 
 /// Marker struct used to flag using all supported keys to sign a payload.
 pub struct ForAll {}
diff --git a/frame/system/src/tests.rs b/frame/system/src/tests.rs
index 89b84a2cc7ed..d1992a14e06a 100644
--- a/frame/system/src/tests.rs
+++ b/frame/system/src/tests.rs
@@ -18,8 +18,11 @@
 use crate::*;
 use mock::{*, Origin};
 use sp_core::H256;
-use sp_runtime::{DispatchError, traits::{Header, BlakeTwo256}};
-use frame_support::weights::WithPostDispatchInfo;
+use sp_runtime::{DispatchError, DispatchErrorWithPostInfo, traits::{Header, BlakeTwo256}};
+use frame_support::{
+	weights::WithPostDispatchInfo,
+	dispatch::PostDispatchInfo,
+};
 
 #[test]
 fn origin_works() {
@@ -329,7 +332,7 @@ fn set_code_checks_works() {
 		("test", 1, 2, Err(Error::<Test>::SpecVersionNeedsToIncrease)),
 		("test", 1, 1, Err(Error::<Test>::SpecVersionNeedsToIncrease)),
 		("test2", 1, 1, Err(Error::<Test>::InvalidSpecName)),
-		("test", 2, 1, Ok(())),
+		("test", 2, 1, Ok(PostDispatchInfo::default())),
 		("test", 0, 1, Err(Error::<Test>::SpecVersionNeedsToIncrease)),
 		("test", 1, 0, Err(Error::<Test>::SpecVersionNeedsToIncrease)),
 	];
@@ -351,7 +354,7 @@ fn set_code_checks_works() {
 				vec![1, 2, 3, 4],
 			);
 
-			assert_eq!(expected.map_err(DispatchError::from), res);
+			assert_eq!(expected.map_err(DispatchErrorWithPostInfo::from), res);
 		});
 	}
 }
diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
index c55eb333237c..7521fcd80bf0 100644
--- a/frame/transaction-payment/src/lib.rs
+++ b/frame/transaction-payment/src/lib.rs
@@ -1169,7 +1169,7 @@ mod tests {
 			}));
 			// Killed Event
 			assert!(System::events().iter().any(|event| {
-				event.event == Event::system(system::RawEvent::KilledAccount(2))
+				event.event == Event::system(system::Event::KilledAccount(2))
 			}));
 		});
 	}

From 8f43280b6e57b372147188684f77a78db755dfd9 Mon Sep 17 00:00:00 2001
From: Cecile Tonglet <cecile@parity.io>
Date: Wed, 20 Jan 2021 12:28:56 +0100
Subject: [PATCH 0299/1194] Telemetry per node (#7463)

---
 Cargo.lock                                    | 109 +--
 Cargo.toml                                    |   2 +-
 bin/node-template/node/Cargo.toml             |   1 +
 bin/node-template/node/src/service.rs         |  72 +-
 bin/node/cli/Cargo.toml                       |   1 -
 bin/node/cli/browser-demo/build.sh            |   1 +
 bin/node/cli/src/browser.rs                   |  22 +-
 bin/node/cli/src/chain_spec.rs                |   2 +-
 bin/node/cli/src/service.rs                   |  86 ++-
 client/cli/Cargo.toml                         |   6 -
 client/cli/src/commands/insert_key.rs         |   2 +-
 client/cli/src/config.rs                      |  46 +-
 client/cli/src/error.rs                       |   3 +
 client/cli/src/lib.rs                         | 393 +---------
 client/cli/src/runner.rs                      |  25 +-
 client/network/Cargo.toml                     |   2 -
 client/network/src/network_state.rs           |   3 +-
 client/network/src/request_responses.rs       |   3 +-
 client/rpc/src/system/mod.rs                  |   7 +-
 client/rpc/src/system/tests.rs                |   4 +-
 client/service/Cargo.toml                     |   1 -
 client/service/src/builder.rs                 | 155 ++--
 client/service/src/config.rs                  |  20 +-
 client/service/src/lib.rs                     |  18 +-
 client/service/src/task_manager/mod.rs        |  16 +-
 client/service/src/task_manager/tests.rs      |  34 +-
 client/service/test/src/lib.rs                |   1 +
 client/telemetry/Cargo.toml                   |   9 +-
 client/telemetry/README.md                    |  56 +-
 client/telemetry/src/async_record.rs          | 155 ----
 client/telemetry/src/endpoints.rs             | 125 ++++
 client/telemetry/src/layer.rs                 | 149 ++++
 client/telemetry/src/lib.rs                   | 703 +++++++++++-------
 client/telemetry/src/node.rs                  | 286 +++++++
 client/telemetry/src/transport.rs             | 163 ++++
 client/telemetry/src/worker.rs                | 263 -------
 client/telemetry/src/worker/node.rs           | 305 --------
 client/tracing/Cargo.toml                     |  10 +-
 client/{cli => tracing}/proc-macro/Cargo.toml |   2 +-
 client/{cli => tracing}/proc-macro/src/lib.rs |  10 +-
 client/tracing/src/lib.rs                     | 132 +---
 client/tracing/src/logging/directives.rs      | 123 +++
 .../{logging.rs => logging/event_format.rs}   | 250 ++++---
 .../tracing/src/logging/layers/console_log.rs | 120 +++
 client/tracing/src/logging/layers/mod.rs      |  25 +
 .../src/logging/layers/prefix_layer.rs        |  86 +++
 client/tracing/src/logging/mod.rs             | 531 +++++++++++++
 utils/browser/Cargo.toml                      |   3 +-
 utils/browser/src/lib.rs                      |  22 +-
 49 files changed, 2566 insertions(+), 1997 deletions(-)
 delete mode 100644 client/telemetry/src/async_record.rs
 create mode 100644 client/telemetry/src/endpoints.rs
 create mode 100644 client/telemetry/src/layer.rs
 create mode 100644 client/telemetry/src/node.rs
 create mode 100644 client/telemetry/src/transport.rs
 delete mode 100644 client/telemetry/src/worker.rs
 delete mode 100644 client/telemetry/src/worker/node.rs
 rename client/{cli => tracing}/proc-macro/Cargo.toml (94%)
 rename client/{cli => tracing}/proc-macro/src/lib.rs (96%)
 create mode 100644 client/tracing/src/logging/directives.rs
 rename client/tracing/src/{logging.rs => logging/event_format.rs} (73%)
 create mode 100644 client/tracing/src/logging/layers/console_log.rs
 create mode 100644 client/tracing/src/logging/layers/mod.rs
 create mode 100644 client/tracing/src/logging/layers/prefix_layer.rs
 create mode 100644 client/tracing/src/logging/mod.rs

diff --git a/Cargo.lock b/Cargo.lock
index 96a4e67505e0..ffc0f5b940a9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -133,12 +133,6 @@ version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "db55d72333851e17d572bec876e390cd3b11eb1ef53ae821dd9f3b653d2b4569"
 
-[[package]]
-name = "arc-swap"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d25d88fd6b8041580a654f9d0c581a047baee2b3efee13275f2fc392fc75034"
-
 [[package]]
 name = "arrayref"
 version = "0.3.6"
@@ -797,16 +791,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "console_log"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501a375961cef1a0d44767200e66e4a559283097e91d0730b1d75dfb2f8a1494"
-dependencies = [
- "log",
- "web-sys",
-]
-
 [[package]]
 name = "const_fn"
 version = "0.4.3"
@@ -3818,7 +3802,6 @@ dependencies = [
  "substrate-build-script-utils",
  "substrate-frame-cli",
  "tempfile",
- "tracing",
  "wasm-bindgen",
  "wasm-bindgen-futures",
 ]
@@ -4023,6 +4006,7 @@ dependencies = [
  "sc-rpc",
  "sc-rpc-api",
  "sc-service",
+ "sc-telemetry",
  "sc-transaction-pool",
  "sp-api",
  "sp-block-builder",
@@ -6547,8 +6531,6 @@ dependencies = [
 name = "sc-cli"
 version = "0.8.1"
 dependencies = [
- "ansi_term 0.12.1",
- "atty",
  "chrono",
  "fdlimit",
  "futures 0.3.9",
@@ -6560,7 +6542,6 @@ dependencies = [
  "rand 0.7.3",
  "regex",
  "rpassword",
- "sc-cli-proc-macro",
  "sc-client-api",
  "sc-keystore",
  "sc-network",
@@ -6582,19 +6563,6 @@ dependencies = [
  "thiserror",
  "tiny-bip39",
  "tokio 0.2.23",
- "tracing",
- "tracing-log",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "sc-cli-proc-macro"
-version = "2.0.0"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
 ]
 
 [[package]]
@@ -7167,8 +7135,6 @@ dependencies = [
  "sc-peerset",
  "serde",
  "serde_json",
- "slog",
- "slog_derive",
  "smallvec 1.5.0",
  "sp-arithmetic",
  "sp-blockchain",
@@ -7424,7 +7390,6 @@ dependencies = [
  "sc-transaction-pool",
  "serde",
  "serde_json",
- "slog",
  "sp-api",
  "sp-application-crypto",
  "sp-block-builder",
@@ -7529,18 +7494,19 @@ dependencies = [
 name = "sc-telemetry"
 version = "2.0.1"
 dependencies = [
+ "chrono",
  "futures 0.3.9",
- "futures-timer 3.0.2",
  "libp2p",
  "log",
  "parking_lot 0.11.1",
  "pin-project 0.4.27",
  "rand 0.7.3",
  "serde",
- "slog",
- "slog-json",
- "slog-scope",
+ "serde_json",
+ "sp-utils",
  "take_mut",
+ "tracing",
+ "tracing-subscriber",
  "void",
  "wasm-timer",
 ]
@@ -7550,6 +7516,7 @@ name = "sc-tracing"
 version = "2.0.1"
 dependencies = [
  "ansi_term 0.12.1",
+ "atty",
  "erased-serde",
  "lazy_static",
  "log",
@@ -7558,14 +7525,27 @@ dependencies = [
  "regex",
  "rustc-hash",
  "sc-telemetry",
+ "sc-tracing-proc-macro",
  "serde",
  "serde_json",
- "slog",
  "sp-tracing",
+ "thiserror",
  "tracing",
  "tracing-core",
  "tracing-log",
  "tracing-subscriber",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "sc-tracing-proc-macro"
+version = "2.0.0"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
@@ -7935,50 +7915,6 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 
-[[package]]
-name = "slog"
-version = "2.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cc9c640a4adbfbcc11ffb95efe5aa7af7309e002adab54b185507dbf2377b99"
-dependencies = [
- "erased-serde",
-]
-
-[[package]]
-name = "slog-json"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddc0d2aff1f8f325ef660d9a0eb6e6dcd20b30b3f581a5897f58bf42d061c37a"
-dependencies = [
- "chrono",
- "erased-serde",
- "serde",
- "serde_json",
- "slog",
-]
-
-[[package]]
-name = "slog-scope"
-version = "4.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c44c89dd8b0ae4537d1ae318353eaf7840b4869c536e31c41e963d1ea523ee6"
-dependencies = [
- "arc-swap",
- "lazy_static",
- "slog",
-]
-
-[[package]]
-name = "slog_derive"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a945ec7f7ce853e89ffa36be1e27dce9a43e82ff9093bf3461c30d5da74ed11b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "smallvec"
 version = "0.6.13"
@@ -8935,7 +8871,6 @@ version = "0.8.1"
 dependencies = [
  "chrono",
  "console_error_panic_hook",
- "console_log",
  "futures 0.1.30",
  "futures 0.3.9",
  "futures-timer 3.0.2",
@@ -8949,6 +8884,8 @@ dependencies = [
  "sc-informant",
  "sc-network",
  "sc-service",
+ "sc-telemetry",
+ "sc-tracing",
  "sp-database",
  "wasm-bindgen",
  "wasm-bindgen-futures",
diff --git a/Cargo.toml b/Cargo.toml
index 1754f896c884..2a0db9b385a6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,7 +21,6 @@ members = [
 	"client/chain-spec",
 	"client/chain-spec/derive",
 	"client/cli",
-	"client/cli/proc-macro",
 	"client/consensus/aura",
 	"client/consensus/babe",
 	"client/consensus/babe/rpc",
@@ -56,6 +55,7 @@ members = [
 	"client/sync-state-rpc",
 	"client/telemetry",
 	"client/tracing",
+	"client/tracing/proc-macro",
 	"client/transaction-pool",
 	"client/transaction-pool/graph",
 	"frame/assets",
diff --git a/bin/node-template/node/Cargo.toml b/bin/node-template/node/Cargo.toml
index 38cdaa1eea48..878e49fe9b1f 100644
--- a/bin/node-template/node/Cargo.toml
+++ b/bin/node-template/node/Cargo.toml
@@ -22,6 +22,7 @@ sc-cli = { version = "0.8.0", path = "../../../client/cli", features = ["wasmtim
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
 sc-executor = { version = "0.8.0", path = "../../../client/executor", features = ["wasmtime"] }
 sc-service = { version = "0.8.0", path = "../../../client/service", features = ["wasmtime"] }
+sc-telemetry = { version = "2.0.0", path = "../../../client/telemetry" }
 sc-keystore = { version = "2.0.0", path = "../../../client/keystore" }
 sp-inherents = { version = "2.0.0", path = "../../../primitives/inherents" }
 sc-transaction-pool = { version = "2.0.0", path = "../../../client/transaction-pool" }
diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
index 92dfc8f1887c..b9e5705333e7 100644
--- a/bin/node-template/node/src/service.rs
+++ b/bin/node-template/node/src/service.rs
@@ -11,6 +11,7 @@ pub use sc_executor::NativeExecutor;
 use sp_consensus_aura::sr25519::{AuthorityPair as AuraPair};
 use sc_finality_grandpa::SharedVoterState;
 use sc_keystore::LocalKeystore;
+use sc_telemetry::TelemetrySpan;
 
 // Our native executor instance.
 native_executor_instance!(
@@ -35,7 +36,8 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 			sc_finality_grandpa::GrandpaBlockImport<FullBackend, Block, FullClient, FullSelectChain>,
 			AuraPair
 		>,
-		sc_finality_grandpa::LinkHalf<Block, FullClient, FullSelectChain>
+		sc_finality_grandpa::LinkHalf<Block, FullClient, FullSelectChain>,
+		Option<TelemetrySpan>,
 	)
 >, ServiceError> {
 	if config.keystore_remote.is_some() {
@@ -44,7 +46,7 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 	}
 	let inherent_data_providers = sp_inherents::InherentDataProviders::new();
 
-	let (client, backend, keystore_container, task_manager) =
+	let (client, backend, keystore_container, task_manager, telemetry_span) =
 		sc_service::new_full_parts::<Block, RuntimeApi, Executor>(&config)?;
 	let client = Arc::new(client);
 
@@ -77,9 +79,15 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 	)?;
 
 	Ok(sc_service::PartialComponents {
-		client, backend, task_manager, import_queue, keystore_container,
-		select_chain, transaction_pool,inherent_data_providers,
-		other: (aura_block_import, grandpa_link),
+		client,
+		backend,
+		task_manager,
+		import_queue,
+		keystore_container,
+		select_chain,
+		transaction_pool,
+		inherent_data_providers,
+		other: (aura_block_import, grandpa_link, telemetry_span),
 	})
 }
 
@@ -93,9 +101,15 @@ fn remote_keystore(_url: &String) -> Result<Arc<LocalKeystore>, &'static str> {
 /// Builds a new service for a full client.
 pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError> {
 	let sc_service::PartialComponents {
-		client, backend, mut task_manager, import_queue, mut keystore_container,
-		select_chain, transaction_pool, inherent_data_providers,
-		other: (block_import, grandpa_link),
+		client,
+		backend,
+		mut task_manager,
+		import_queue,
+		mut keystore_container,
+		select_chain,
+		transaction_pool,
+		inherent_data_providers,
+		other: (block_import, grandpa_link, telemetry_span),
 	} = new_partial(&config)?;
 
 	if let Some(url) = &config.keystore_remote {
@@ -133,7 +147,6 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 	let name = config.network.node_name.clone();
 	let enable_grandpa = !config.disable_grandpa;
 	let prometheus_registry = config.prometheus_registry().cloned();
-	let telemetry_connection_sinks = sc_service::TelemetryConnectionSinks::default();
 
 	let rpc_extensions_builder = {
 		let client = client.clone();
@@ -150,18 +163,23 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		})
 	};
 
-	sc_service::spawn_tasks(sc_service::SpawnTasksParams {
-		network: network.clone(),
-		client: client.clone(),
-		keystore: keystore_container.sync_keystore(),
-		task_manager: &mut task_manager,
-		transaction_pool: transaction_pool.clone(),
-		telemetry_connection_sinks: telemetry_connection_sinks.clone(),
-		rpc_extensions_builder,
-		on_demand: None,
-		remote_blockchain: None,
-		backend, network_status_sinks, system_rpc_tx, config,
-	})?;
+	let (_rpc_handlers, telemetry_connection_notifier) = sc_service::spawn_tasks(
+		sc_service::SpawnTasksParams {
+			network: network.clone(),
+			client: client.clone(),
+			keystore: keystore_container.sync_keystore(),
+			task_manager: &mut task_manager,
+			transaction_pool: transaction_pool.clone(),
+			rpc_extensions_builder,
+			on_demand: None,
+			remote_blockchain: None,
+			backend,
+			network_status_sinks,
+			system_rpc_tx,
+			config,
+			telemetry_span,
+		},
+	)?;
 
 	if role.is_authority() {
 		let proposer = sc_basic_authorship::ProposerFactory::new(
@@ -222,7 +240,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 			config: grandpa_config,
 			link: grandpa_link,
 			network,
-			telemetry_on_connect: Some(telemetry_connection_sinks.on_connect_stream()),
+			telemetry_on_connect: telemetry_connection_notifier.map(|x| x.on_connect_stream()),
 			voting_rule: sc_finality_grandpa::VotingRulesBuilder::default().build(),
 			prometheus_registry,
 			shared_voter_state: SharedVoterState::empty(),
@@ -242,7 +260,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 
 /// Builds a new service for a light client.
 pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError> {
-	let (client, backend, keystore_container, mut task_manager, on_demand) =
+	let (client, backend, keystore_container, mut task_manager, on_demand, telemetry_span) =
 		sc_service::new_light_parts::<Block, RuntimeApi, Executor>(&config)?;
 
 	config.network.extra_sets.push(sc_finality_grandpa::grandpa_peers_set_config());
@@ -302,7 +320,6 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		task_manager: &mut task_manager,
 		on_demand: Some(on_demand),
 		rpc_extensions_builder: Box::new(|_, _| ()),
-		telemetry_connection_sinks: sc_service::TelemetryConnectionSinks::default(),
 		config,
 		client,
 		keystore: keystore_container.sync_keystore(),
@@ -310,9 +327,10 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		network,
 		network_status_sinks,
 		system_rpc_tx,
-	 })?;
+		telemetry_span,
+	})?;
 
-	 network_starter.start_network();
+	network_starter.start_network();
 
-	 Ok(task_manager)
+	Ok(task_manager)
 }
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index 5c84f4cab7d6..aaee37311959 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -41,7 +41,6 @@ hex-literal = "0.3.1"
 log = "0.4.8"
 rand = "0.7.2"
 structopt = { version = "0.3.8", optional = true }
-tracing = "0.1.22"
 parking_lot = "0.11.1"
 
 # primitives
diff --git a/bin/node/cli/browser-demo/build.sh b/bin/node/cli/browser-demo/build.sh
index be52b7a523f0..8840106daeb5 100755
--- a/bin/node/cli/browser-demo/build.sh
+++ b/bin/node/cli/browser-demo/build.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env sh
+set -e -x
 cargo +nightly build --release -p node-cli --target wasm32-unknown-unknown --no-default-features --features browser -Z features=itarget
 wasm-bindgen ../../../../target/wasm32-unknown-unknown/release/node_cli.wasm --out-dir pkg --target web
 python -m http.server 8000
diff --git a/bin/node/cli/src/browser.rs b/bin/node/cli/src/browser.rs
index 42886a668d34..6c0a2f10d95e 100644
--- a/bin/node/cli/src/browser.rs
+++ b/bin/node/cli/src/browser.rs
@@ -21,9 +21,8 @@ use log::info;
 use wasm_bindgen::prelude::*;
 use browser_utils::{
 	Client,
-	browser_configuration, set_console_error_panic_hook, init_console_log,
+	browser_configuration, init_logging_and_telemetry, set_console_error_panic_hook,
 };
-use std::str::FromStr;
 
 /// Starts the client.
 #[wasm_bindgen]
@@ -33,20 +32,27 @@ pub async fn start_client(chain_spec: Option<String>, log_level: String) -> Resu
 		.map_err(|err| JsValue::from_str(&err.to_string()))
 }
 
-async fn start_inner(chain_spec: Option<String>, log_level: String) -> Result<Client, Box<dyn std::error::Error>> {
+async fn start_inner(
+	chain_spec: Option<String>,
+	log_directives: String,
+) -> Result<Client, Box<dyn std::error::Error>> {
 	set_console_error_panic_hook();
-	init_console_log(log::Level::from_str(&log_level)?)?;
+	let telemetry_worker = init_logging_and_telemetry(&log_directives)?;
 	let chain_spec = match chain_spec {
 		Some(chain_spec) => ChainSpec::from_json_bytes(chain_spec.as_bytes().to_vec())
 			.map_err(|e| format!("{:?}", e))?,
 		None => crate::chain_spec::development_config(),
 	};
 
-	let config = browser_configuration(chain_spec).await?;
+	let telemetry_handle = telemetry_worker.handle();
+	let config = browser_configuration(
+		chain_spec,
+		Some(telemetry_handle),
+	).await?;
 
 	info!("Substrate browser node");
 	info!("✌️  version {}", config.impl_version);
-	info!("❤️  by Parity Technologies, 2017-2020");
+	info!("❤️  by Parity Technologies, 2017-2021");
 	info!("📋 Chain specification: {}", config.chain_spec.name());
 	info!("🏷 Node name: {}", config.network.node_name);
 	info!("👤 Role: {:?}", config.role);
@@ -54,8 +60,10 @@ async fn start_inner(chain_spec: Option<String>, log_level: String) -> Result<Cl
 	// Create the service. This is the most heavy initialization step.
 	let (task_manager, rpc_handlers) =
 		crate::service::new_light_base(config)
-			.map(|(components, rpc_handlers, _, _, _)| (components, rpc_handlers))
+			.map(|(components, rpc_handlers, _, _, _, _)| (components, rpc_handlers))
 			.map_err(|e| format!("{:?}", e))?;
 
+	task_manager.spawn_handle().spawn("telemetry", telemetry_worker.run());
+
 	Ok(browser_utils::start_client(task_manager, rpc_handlers))
 }
diff --git a/bin/node/cli/src/chain_spec.rs b/bin/node/cli/src/chain_spec.rs
index 7bee74d6c677..7de9cfd0b6aa 100644
--- a/bin/node/cli/src/chain_spec.rs
+++ b/bin/node/cli/src/chain_spec.rs
@@ -441,7 +441,7 @@ pub(crate) mod tests {
 				Ok(sc_service_test::TestNetComponents::new(task_manager, client, network, transaction_pool))
 			},
 			|config| {
-				let (keep_alive, _, client, network, transaction_pool) = new_light_base(config)?;
+				let (keep_alive, _, _, client, network, transaction_pool) = new_light_base(config)?;
 				Ok(sc_service_test::TestNetComponents::new(keep_alive, client, network, transaction_pool))
 			}
 		);
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index 84d931b2a1e2..c3061b88709a 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -34,6 +34,7 @@ use sp_runtime::traits::Block as BlockT;
 use futures::prelude::*;
 use sc_client_api::{ExecutorProvider, RemoteBackend};
 use node_executor::Executor;
+use sc_telemetry::{TelemetryConnectionNotifier, TelemetrySpan};
 
 type FullClient = sc_service::TFullClient<Block, RuntimeApi, Executor>;
 type FullBackend = sc_service::TFullBackend<Block>;
@@ -57,9 +58,10 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 			sc_consensus_babe::BabeLink<Block>,
 		),
 		grandpa::SharedVoterState,
+		Option<TelemetrySpan>,
 	)
 >, ServiceError> {
-	let (client, backend, keystore_container, task_manager) =
+	let (client, backend, keystore_container, task_manager, telemetry_span) =
 		sc_service::new_full_parts::<Block, RuntimeApi, Executor>(&config)?;
 	let client = Arc::new(client);
 
@@ -147,9 +149,15 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 	};
 
 	Ok(sc_service::PartialComponents {
-		client, backend, task_manager, keystore_container,
-		select_chain, import_queue, transaction_pool, inherent_data_providers,
-		other: (rpc_extensions_builder, import_setup, rpc_setup)
+		client,
+		backend,
+		task_manager,
+		keystore_container,
+		select_chain,
+		import_queue,
+		transaction_pool,
+		inherent_data_providers,
+		other: (rpc_extensions_builder, import_setup, rpc_setup, telemetry_span),
 	})
 }
 
@@ -171,9 +179,15 @@ pub fn new_full_base(
 	)
 ) -> Result<NewFullBase, ServiceError> {
 	let sc_service::PartialComponents {
-		client, backend, mut task_manager, import_queue, keystore_container,
-		select_chain, transaction_pool, inherent_data_providers,
-		other: (rpc_extensions_builder, import_setup, rpc_setup),
+		client,
+		backend,
+		mut task_manager,
+		import_queue,
+		keystore_container,
+		select_chain,
+		transaction_pool,
+		inherent_data_providers,
+		other: (rpc_extensions_builder, import_setup, rpc_setup, telemetry_span),
 	} = new_partial(&config)?;
 
 	let shared_voter_state = rpc_setup;
@@ -204,23 +218,24 @@ pub fn new_full_base(
 	let name = config.network.node_name.clone();
 	let enable_grandpa = !config.disable_grandpa;
 	let prometheus_registry = config.prometheus_registry().cloned();
-	let telemetry_connection_sinks = sc_service::TelemetryConnectionSinks::default();
 
-	sc_service::spawn_tasks(sc_service::SpawnTasksParams {
-		config,
-		backend: backend.clone(),
-		client: client.clone(),
-		keystore: keystore_container.sync_keystore(),
-		network: network.clone(),
-		rpc_extensions_builder: Box::new(rpc_extensions_builder),
-		transaction_pool: transaction_pool.clone(),
-		task_manager: &mut task_manager,
-		on_demand: None,
-		remote_blockchain: None,
-		telemetry_connection_sinks: telemetry_connection_sinks.clone(),
-		network_status_sinks: network_status_sinks.clone(),
-		system_rpc_tx,
-	})?;
+	let (_rpc_handlers, telemetry_connection_notifier) = sc_service::spawn_tasks(
+		sc_service::SpawnTasksParams {
+			config,
+			backend: backend.clone(),
+			client: client.clone(),
+			keystore: keystore_container.sync_keystore(),
+			network: network.clone(),
+			rpc_extensions_builder: Box::new(rpc_extensions_builder),
+			transaction_pool: transaction_pool.clone(),
+			task_manager: &mut task_manager,
+			on_demand: None,
+			remote_blockchain: None,
+			network_status_sinks: network_status_sinks.clone(),
+			system_rpc_tx,
+			telemetry_span,
+		},
+	)?;
 
 	let (block_import, grandpa_link, babe_link) = import_setup;
 
@@ -305,7 +320,7 @@ pub fn new_full_base(
 			config,
 			link: grandpa_link,
 			network: network.clone(),
-			telemetry_on_connect: Some(telemetry_connection_sinks.on_connect_stream()),
+			telemetry_on_connect: telemetry_connection_notifier.map(|x| x.on_connect_stream()),
 			voting_rule: grandpa::VotingRulesBuilder::default().build(),
 			prometheus_registry,
 			shared_voter_state,
@@ -339,11 +354,11 @@ pub fn new_full(config: Configuration)
 }
 
 pub fn new_light_base(mut config: Configuration) -> Result<(
-	TaskManager, RpcHandlers, Arc<LightClient>,
+	TaskManager, RpcHandlers, Option<TelemetryConnectionNotifier>, Arc<LightClient>,
 	Arc<NetworkService<Block, <Block as BlockT>::Hash>>,
 	Arc<sc_transaction_pool::LightPool<Block, LightClient, sc_network::config::OnDemand<Block>>>
 ), ServiceError> {
-	let (client, backend, keystore_container, mut task_manager, on_demand) =
+	let (client, backend, keystore_container, mut task_manager, on_demand, telemetry_span) =
 		sc_service::new_light_parts::<Block, RuntimeApi, Executor>(&config)?;
 
 	config.network.extra_sets.push(grandpa::grandpa_peers_set_config());
@@ -412,7 +427,7 @@ pub fn new_light_base(mut config: Configuration) -> Result<(
 
 	let rpc_extensions = node_rpc::create_light(light_deps);
 
-	let rpc_handlers =
+	let (rpc_handlers, telemetry_connection_notifier) =
 		sc_service::spawn_tasks(sc_service::SpawnTasksParams {
 			on_demand: Some(on_demand),
 			remote_blockchain: Some(backend.remote_blockchain()),
@@ -422,16 +437,23 @@ pub fn new_light_base(mut config: Configuration) -> Result<(
 			keystore: keystore_container.sync_keystore(),
 			config, backend, network_status_sinks, system_rpc_tx,
 			network: network.clone(),
-			telemetry_connection_sinks: sc_service::TelemetryConnectionSinks::default(),
 			task_manager: &mut task_manager,
+			telemetry_span,
 		})?;
 
-	Ok((task_manager, rpc_handlers, client, network, transaction_pool))
+	Ok((
+		task_manager,
+		rpc_handlers,
+		telemetry_connection_notifier,
+		client,
+		network,
+		transaction_pool,
+	))
 }
 
 /// Builds a new service for a light client.
 pub fn new_light(config: Configuration) -> Result<TaskManager, ServiceError> {
-	new_light_base(config).map(|(task_manager, _, _, _, _)| {
+	new_light_base(config).map(|(task_manager, _, _, _, _, _)| {
 		task_manager
 	})
 }
@@ -513,7 +535,7 @@ mod tests {
 				Ok((node, (inherent_data_providers, setup_handles.unwrap())))
 			},
 			|config| {
-				let (keep_alive, _, client, network, transaction_pool) = new_light_base(config)?;
+				let (keep_alive, _, _, client, network, transaction_pool) = new_light_base(config)?;
 				Ok(sc_service_test::TestNetComponents::new(keep_alive, client, network, transaction_pool))
 			},
 			|service, &mut (ref inherent_data_providers, (ref mut block_import, ref babe_link))| {
@@ -671,7 +693,7 @@ mod tests {
 				Ok(sc_service_test::TestNetComponents::new(task_manager, client, network, transaction_pool))
 			},
 			|config| {
-				let (keep_alive, _, client, network, transaction_pool) = new_light_base(config)?;
+				let (keep_alive, _, _, client, network, transaction_pool) = new_light_base(config)?;
 				Ok(sc_service_test::TestNetComponents::new(keep_alive, client, network, transaction_pool))
 			},
 			vec![
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index 32299e6e5f69..17390a5f225c 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -14,7 +14,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 log = "0.4.11"
-atty = "0.2.13"
 regex = "1.4.2"
 tokio = { version = "0.2.21", features = [ "signal", "rt-core", "rt-threaded", "blocking" ] }
 futures = "0.3.9"
@@ -43,10 +42,6 @@ structopt = "0.3.8"
 sc-tracing = { version = "2.0.0", path = "../tracing" }
 chrono = "0.4.10"
 serde = "1.0.111"
-tracing = "0.1.22"
-tracing-log = "0.1.1"
-tracing-subscriber = "0.2.15"
-sc-cli-proc-macro = { version = "2.0.0", path = "./proc-macro" }
 thiserror = "1.0.21"
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
@@ -54,7 +49,6 @@ rpassword = "5.0.0"
 
 [dev-dependencies]
 tempfile = "3.1.0"
-ansi_term = "0.12.1"
 
 [features]
 wasmtime = [
diff --git a/client/cli/src/commands/insert_key.rs b/client/cli/src/commands/insert_key.rs
index 90588f96d20b..6e4324deed04 100644
--- a/client/cli/src/commands/insert_key.rs
+++ b/client/cli/src/commands/insert_key.rs
@@ -123,7 +123,7 @@ mod tests {
 		}
 
 		fn copyright_start_year() -> i32 {
-			2020
+			2021
 		}
 
 		fn author() -> String {
diff --git a/client/cli/src/config.rs b/client/cli/src/config.rs
index 854e73ae7812..ae43e8f334c6 100644
--- a/client/cli/src/config.rs
+++ b/client/cli/src/config.rs
@@ -21,8 +21,8 @@
 use crate::arg_enums::Database;
 use crate::error::Result;
 use crate::{
-	init_logger, DatabaseParams, ImportParams, KeystoreParams, NetworkParams, NodeKeyParams,
-	OffchainWorkerParams, PruningParams, SharedParams, SubstrateCli, InitLoggerParams,
+	DatabaseParams, ImportParams, KeystoreParams, NetworkParams, NodeKeyParams,
+	OffchainWorkerParams, PruningParams, SharedParams, SubstrateCli,
 };
 use log::warn;
 use names::{Generator, Name};
@@ -32,7 +32,9 @@ use sc_service::config::{
 	NodeKeyConfig, OffchainWorkerConfig, PrometheusConfig, PruningMode, Role, RpcMethods,
 	TaskExecutor, TelemetryEndpoints, TransactionPoolOptions, WasmExecutionMethod,
 };
-use sc_service::{ChainSpec, TracingReceiver, KeepBlocks, TransactionStorageMode };
+use sc_service::{ChainSpec, TracingReceiver, KeepBlocks, TransactionStorageMode};
+use sc_telemetry::TelemetryHandle;
+use sc_tracing::logging::GlobalLoggerBuilder;
 use std::net::SocketAddr;
 use std::path::PathBuf;
 
@@ -468,6 +470,7 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 		&self,
 		cli: &C,
 		task_executor: TaskExecutor,
+		telemetry_handle: Option<TelemetryHandle>,
 	) -> Result<Configuration> {
 		let is_dev = self.is_dev()?;
 		let chain_id = self.chain_id(is_dev)?;
@@ -539,6 +542,7 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 			role,
 			base_path: Some(base_path),
 			informant_output_format: Default::default(),
+			telemetry_handle,
 		})
 	}
 
@@ -569,34 +573,38 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 	/// 1. Sets the panic handler
 	/// 2. Initializes the logger
 	/// 3. Raises the FD limit
-	fn init<C: SubstrateCli>(&self) -> Result<()> {
-		let logger_pattern = self.log_filters()?;
-		let tracing_receiver = self.tracing_receiver()?;
-		let tracing_targets = self.tracing_targets()?;
-		let disable_log_reloading = self.is_log_filter_reloading_disabled()?;
-		let disable_log_color = self.disable_log_color()?;
-
+	fn init<C: SubstrateCli>(&self) -> Result<sc_telemetry::TelemetryWorker> {
 		sp_panic_handler::set(&C::support_url(), &C::impl_version());
 
-		init_logger(InitLoggerParams {
-			pattern: logger_pattern,
-			tracing_receiver,
-			tracing_targets,
-			disable_log_reloading,
-			disable_log_color,
-		})?;
+		let mut logger = GlobalLoggerBuilder::new(self.log_filters()?);
+		logger.with_log_reloading(!self.is_log_filter_reloading_disabled()?);
+
+		if let Some(transport) = self.telemetry_external_transport()? {
+			logger.with_transport(transport);
+		}
+
+		if let Some(tracing_targets) = self.tracing_targets()? {
+			let tracing_receiver = self.tracing_receiver()?;
+			logger.with_profiling(tracing_receiver, tracing_targets);
+		}
+
+		if self.disable_log_color()? {
+			logger.with_colors(false);
+		}
+
+		let telemetry_worker = logger.init()?;
 
 		if let Some(new_limit) = fdlimit::raise_fd_limit() {
 			if new_limit < RECOMMENDED_OPEN_FILE_DESCRIPTOR_LIMIT {
 				warn!(
 					"Low open file descriptor limit configured for the process. \
-					 Current value: {:?}, recommended value: {:?}.",
+					Current value: {:?}, recommended value: {:?}.",
 					new_limit, RECOMMENDED_OPEN_FILE_DESCRIPTOR_LIMIT,
 				);
 			}
 		}
 
-		Ok(())
+		Ok(telemetry_worker)
 	}
 }
 
diff --git a/client/cli/src/error.rs b/client/cli/src/error.rs
index 75867e2f76b2..c5784b201817 100644
--- a/client/cli/src/error.rs
+++ b/client/cli/src/error.rs
@@ -77,6 +77,9 @@ pub enum Error {
 	/// Application specific error chain sequence forwarder.
 	#[error(transparent)]
 	Application(#[from] Box<dyn std::error::Error + Send + Sync + 'static>),
+
+	#[error(transparent)]
+	GlobalLoggerError(#[from] sc_tracing::logging::Error),
 }
 
 impl std::convert::From<&str> for Error {
diff --git a/client/cli/src/lib.rs b/client/cli/src/lib.rs
index bf8be8a4e77b..a4b0bd45727e 100644
--- a/client/cli/src/lib.rs
+++ b/client/cli/src/lib.rs
@@ -21,7 +21,6 @@
 #![warn(missing_docs)]
 #![warn(unused_extern_crates)]
 #![warn(unused_imports)]
-#![warn(unused_crate_dependencies)]
 
 pub mod arg_enums;
 mod commands;
@@ -36,9 +35,10 @@ pub use config::*;
 pub use error::*;
 pub use params::*;
 pub use runner::*;
-pub use sc_cli_proc_macro::*;
 pub use sc_service::{ChainSpec, Role};
 use sc_service::{Configuration, TaskExecutor};
+use sc_telemetry::TelemetryHandle;
+pub use sc_tracing::logging::GlobalLoggerBuilder;
 pub use sp_version::RuntimeVersion;
 use std::io::Write;
 pub use structopt;
@@ -46,18 +46,6 @@ use structopt::{
 	clap::{self, AppSettings},
 	StructOpt,
 };
-use tracing_subscriber::{
-	fmt::time::ChronoLocal,
-	EnvFilter,
-	FmtSubscriber,
-	Layer,
-	layer::SubscriberExt,
-};
-pub use sc_tracing::logging;
-
-pub use logging::PREFIX_LOG_SPAN;
-#[doc(hidden)]
-pub use tracing;
 
 /// Substrate client CLI
 ///
@@ -82,7 +70,8 @@ pub trait SubstrateCli: Sized {
 	/// Extracts the file name from `std::env::current_exe()`.
 	/// Resorts to the env var `CARGO_PKG_NAME` in case of Error.
 	fn executable_name() -> String {
-		std::env::current_exe().ok()
+		std::env::current_exe()
+			.ok()
 			.and_then(|e| e.file_name().map(|s| s.to_os_string()))
 			.and_then(|w| w.into_string().ok())
 			.unwrap_or_else(|| env!("CARGO_PKG_NAME").into())
@@ -112,7 +101,10 @@ pub trait SubstrateCli: Sized {
 	///
 	/// Gets the struct from the command line arguments. Print the
 	/// error message and quit the program in case of failure.
-	fn from_args() -> Self where Self: StructOpt + Sized {
+	fn from_args() -> Self
+	where
+		Self: StructOpt + Sized,
+	{
 		<Self as SubstrateCli>::from_iter(&mut std::env::args_os())
 	}
 
@@ -167,7 +159,7 @@ pub trait SubstrateCli: Sized {
 					let _ = std::io::stdout().write_all(e.message.as_bytes());
 					std::process::exit(0);
 				}
-			},
+			}
 		};
 
 		<Self as StructOpt>::from_clap(&matches)
@@ -222,377 +214,18 @@ pub trait SubstrateCli: Sized {
 		&self,
 		command: &T,
 		task_executor: TaskExecutor,
+		telemetry_handle: Option<TelemetryHandle>,
 	) -> error::Result<Configuration> {
-		command.create_configuration(self, task_executor)
+		command.create_configuration(self, task_executor, telemetry_handle)
 	}
 
 	/// Create a runner for the command provided in argument. This will create a Configuration and
 	/// a tokio runtime
 	fn create_runner<T: CliConfiguration>(&self, command: &T) -> error::Result<Runner<Self>> {
-		command.init::<Self>()?;
-		Runner::new(self, command)
+		let telemetry_worker = command.init::<Self>()?;
+		Runner::new(self, command, telemetry_worker)
 	}
 
 	/// Native runtime version.
 	fn native_runtime_version(chain_spec: &Box<dyn ChainSpec>) -> &'static RuntimeVersion;
 }
-
-/// The parameters for [`init_logger`].
-#[derive(Default)]
-pub struct InitLoggerParams {
-	/// A comma seperated list of logging patterns.
-	///
-	/// E.g.: `test-crate=debug`
-	pub pattern: String,
-	/// The tracing receiver.
-	pub tracing_receiver: sc_tracing::TracingReceiver,
-	/// Optional comma seperated list of tracing targets.
-	pub tracing_targets: Option<String>,
-	/// Should log reloading be disabled?
-	pub disable_log_reloading: bool,
-	/// Should the log color output be disabled?
-	pub disable_log_color: bool,
-}
-
-/// Initialize the global logger
-///
-/// This sets various global logging and tracing instances and thus may only be called once.
-pub fn init_logger(
-	InitLoggerParams {
-		pattern,
-		tracing_receiver,
-		tracing_targets,
-		disable_log_reloading,
-		disable_log_color,
-	}: InitLoggerParams,
-) -> std::result::Result<(), String> {
-	use sc_tracing::parse_default_directive;
-
-	// Accept all valid directives and print invalid ones
-	fn parse_user_directives(
-		mut env_filter: EnvFilter,
-		dirs: &str,
-	) -> std::result::Result<EnvFilter, String> {
-		for dir in dirs.split(',') {
-			env_filter = env_filter.add_directive(parse_default_directive(&dir)?);
-		}
-		Ok(env_filter)
-	}
-
-	// Initialize filter - ensure to use `parse_default_directive` for any defaults to persist
-	// after log filter reloading by RPC
-	let mut env_filter = EnvFilter::default()
-		// Enable info
-		.add_directive(parse_default_directive("info")
-			.expect("provided directive is valid"))
-		// Disable info logging by default for some modules.
-		.add_directive(parse_default_directive("ws=off")
-			.expect("provided directive is valid"))
-		.add_directive(parse_default_directive("yamux=off")
-			.expect("provided directive is valid"))
-		.add_directive(parse_default_directive("cranelift_codegen=off")
-			.expect("provided directive is valid"))
-		// Set warn logging by default for some modules.
-		.add_directive(parse_default_directive("cranelift_wasm=warn")
-			.expect("provided directive is valid"))
-		.add_directive(parse_default_directive("hyper=warn")
-			.expect("provided directive is valid"));
-
-	if let Ok(lvl) = std::env::var("RUST_LOG") {
-		if lvl != "" {
-			env_filter = parse_user_directives(env_filter, &lvl)?;
-		}
-	}
-
-	if pattern != "" {
-		// We're not sure if log or tracing is available at this moment, so silently ignore the
-		// parse error.
-		env_filter = parse_user_directives(env_filter, &pattern)?;
-	}
-
-	let max_level_hint = Layer::<FmtSubscriber>::max_level_hint(&env_filter);
-
-	let max_level = if tracing_targets.is_some() {
-		// If profiling is activated, we require `trace` logging.
-		log::LevelFilter::Trace
-	} else {
-		match max_level_hint {
-			Some(tracing_subscriber::filter::LevelFilter::INFO) | None => log::LevelFilter::Info,
-			Some(tracing_subscriber::filter::LevelFilter::TRACE) => log::LevelFilter::Trace,
-			Some(tracing_subscriber::filter::LevelFilter::WARN) => log::LevelFilter::Warn,
-			Some(tracing_subscriber::filter::LevelFilter::ERROR) => log::LevelFilter::Error,
-			Some(tracing_subscriber::filter::LevelFilter::DEBUG) => log::LevelFilter::Debug,
-			Some(tracing_subscriber::filter::LevelFilter::OFF) => log::LevelFilter::Off,
-		}
-	};
-
-	tracing_log::LogTracer::builder()
-		.with_max_level(max_level)
-		.init()
-		.map_err(|e| format!("Registering Substrate logger failed: {:}!", e))?;
-
-	// If we're only logging `INFO` entries then we'll use a simplified logging format.
-	let simple = match max_level_hint {
-		Some(level) if level <= tracing_subscriber::filter::LevelFilter::INFO => true,
-		_ => false,
-	};
-
-	// Make sure to include profiling targets in the filter
-	if let Some(tracing_targets) = tracing_targets.clone() {
-		// Always log the special target `sc_tracing`, overrides global level.
-		// Required because profiling traces are emitted via `sc_tracing`
-		// NOTE: this must be done after we check the `max_level_hint` otherwise
-		// it is always raised to `TRACE`.
-		env_filter = env_filter.add_directive(
-			parse_default_directive("sc_tracing=trace").expect("provided directive is valid")
-		);
-
-		env_filter = parse_user_directives(env_filter, &tracing_targets)?;
-	}
-
-	let enable_color = atty::is(atty::Stream::Stderr) && !disable_log_color;
-	let timer = ChronoLocal::with_format(if simple {
-		"%Y-%m-%d %H:%M:%S".to_string()
-	} else {
-		"%Y-%m-%d %H:%M:%S%.3f".to_string()
-	});
-
-	let subscriber_builder = FmtSubscriber::builder()
-		.with_env_filter(env_filter)
-		.with_writer(std::io::stderr as _)
-		.event_format(logging::EventFormat {
-			timer,
-			enable_color,
-			display_target: !simple,
-			display_level: !simple,
-			display_thread_name: !simple,
-		});
-	if disable_log_reloading {
-		let subscriber = subscriber_builder
-			.finish()
-			.with(logging::NodeNameLayer);
-		initialize_tracing(subscriber, tracing_receiver, tracing_targets)
-	} else {
-		let subscriber_builder = subscriber_builder.with_filter_reloading();
-		let handle = subscriber_builder.reload_handle();
-		sc_tracing::set_reload_handle(handle);
-		let subscriber = subscriber_builder
-			.finish()
-			.with(logging::NodeNameLayer);
-		initialize_tracing(subscriber, tracing_receiver, tracing_targets)
-	}
-}
-
-fn initialize_tracing<S>(
-	subscriber: S,
-	tracing_receiver: sc_tracing::TracingReceiver,
-	profiling_targets: Option<String>,
-) -> std::result::Result<(), String>
-where
-	S: tracing::Subscriber + Send + Sync + 'static,
-{
-	if let Some(profiling_targets) = profiling_targets {
-		let profiling = sc_tracing::ProfilingLayer::new(tracing_receiver, &profiling_targets);
-		if let Err(e) = tracing::subscriber::set_global_default(subscriber.with(profiling)) {
-			return Err(format!(
-				"Registering Substrate tracing subscriber failed: {:}!", e
-			))
-		}
-	} else {
-		if let Err(e) = tracing::subscriber::set_global_default(subscriber) {
-			return Err(format!(
-				"Registering Substrate tracing subscriber failed: {:}!", e
-			))
-		}
-	}
-	Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate as sc_cli;
-	use std::{env, process::Command};
-	use tracing::{metadata::Kind, subscriber::Interest, Callsite, Level, Metadata};
-
-	#[test]
-	fn test_logger_filters() {
-		let test_pattern = "afg=debug,sync=trace,client=warn,telemetry,something-with-dash=error";
-		init_logger(
-			InitLoggerParams { pattern: test_pattern.into(), ..Default::default() },
-		).unwrap();
-
-		tracing::dispatcher::get_default(|dispatcher| {
-			let test_filter = |target, level| {
-				struct DummyCallSite;
-				impl Callsite for DummyCallSite {
-					fn set_interest(&self, _: Interest) {}
-					fn metadata(&self) -> &Metadata<'_> {
-						unreachable!();
-					}
-				}
-
-				let metadata = tracing::metadata!(
-					name: "",
-					target: target,
-					level: level,
-					fields: &[],
-					callsite: &DummyCallSite,
-					kind: Kind::SPAN,
-				);
-
-				dispatcher.enabled(&metadata)
-			};
-
-			assert!(test_filter("afg", Level::INFO));
-			assert!(test_filter("afg", Level::DEBUG));
-			assert!(!test_filter("afg", Level::TRACE));
-
-			assert!(test_filter("sync", Level::TRACE));
-			assert!(test_filter("client", Level::WARN));
-
-			assert!(test_filter("telemetry", Level::TRACE));
-			assert!(test_filter("something-with-dash", Level::ERROR));
-		});
-	}
-
-	const EXPECTED_LOG_MESSAGE: &'static str = "yeah logging works as expected";
-
-	#[test]
-	fn dash_in_target_name_works() {
-		let executable = env::current_exe().unwrap();
-		let output = Command::new(executable)
-			.env("ENABLE_LOGGING", "1")
-			.args(&["--nocapture", "log_something_with_dash_target_name"])
-			.output()
-			.unwrap();
-
-		let output = String::from_utf8(output.stderr).unwrap();
-		assert!(output.contains(EXPECTED_LOG_MESSAGE));
-	}
-
-	/// This is no actual test, it will be used by the `dash_in_target_name_works` test.
-	/// The given test will call the test executable to only execute this test that
-	/// will only print `EXPECTED_LOG_MESSAGE` through logging while using a target
-	/// name that contains a dash. This ensures that targets names with dashes work.
-	#[test]
-	fn log_something_with_dash_target_name() {
-		if env::var("ENABLE_LOGGING").is_ok() {
-			let test_pattern = "test-target=info";
-			init_logger(
-				InitLoggerParams { pattern: test_pattern.into(), ..Default::default() },
-			).unwrap();
-
-			log::info!(target: "test-target", "{}", EXPECTED_LOG_MESSAGE);
-		}
-	}
-
-	const EXPECTED_NODE_NAME: &'static str = "THE_NODE";
-
-	#[test]
-	fn prefix_in_log_lines() {
-		let re = regex::Regex::new(&format!(
-			r"^\d{{4}}-\d{{2}}-\d{{2}} \d{{2}}:\d{{2}}:\d{{2}}  \[{}\] {}$",
-			EXPECTED_NODE_NAME,
-			EXPECTED_LOG_MESSAGE,
-		)).unwrap();
-		let executable = env::current_exe().unwrap();
-		let output = Command::new(executable)
-			.env("ENABLE_LOGGING", "1")
-			.args(&["--nocapture", "prefix_in_log_lines_entrypoint"])
-			.output()
-			.unwrap();
-
-		let output = String::from_utf8(output.stderr).unwrap();
-		assert!(
-			re.is_match(output.trim()),
-			format!("Expected:\n{}\nGot:\n{}", re, output),
-		);
-	}
-
-	/// This is no actual test, it will be used by the `prefix_in_log_lines` test.
-	/// The given test will call the test executable to only execute this test that
-	/// will only print a log line prefixed by the node name `EXPECTED_NODE_NAME`.
-	#[test]
-	fn prefix_in_log_lines_entrypoint() {
-		if env::var("ENABLE_LOGGING").is_ok() {
-			let test_pattern = "test-target=info";
-			init_logger(
-				InitLoggerParams { pattern: test_pattern.into(), ..Default::default() },
-			).unwrap();
-			prefix_in_log_lines_process();
-		}
-	}
-
-	#[crate::prefix_logs_with(EXPECTED_NODE_NAME)]
-	fn prefix_in_log_lines_process() {
-		log::info!("{}", EXPECTED_LOG_MESSAGE);
-	}
-
-	/// This is no actual test, it will be used by the `do_not_write_with_colors_on_tty` test.
-	/// The given test will call the test executable to only execute this test that
-	/// will only print a log line with some colors in it.
-	#[test]
-	fn do_not_write_with_colors_on_tty_entrypoint() {
-		if env::var("ENABLE_LOGGING").is_ok() {
-			init_logger(InitLoggerParams::default()).unwrap();
-			log::info!("{}", ansi_term::Colour::Yellow.paint(EXPECTED_LOG_MESSAGE));
-		}
-	}
-
-	#[test]
-	fn do_not_write_with_colors_on_tty() {
-		let re = regex::Regex::new(&format!(
-			r"^\d{{4}}-\d{{2}}-\d{{2}} \d{{2}}:\d{{2}}:\d{{2}}  {}$",
-			EXPECTED_LOG_MESSAGE,
-		)).unwrap();
-		let executable = env::current_exe().unwrap();
-		let output = Command::new(executable)
-			.env("ENABLE_LOGGING", "1")
-			.args(&["--nocapture", "do_not_write_with_colors_on_tty_entrypoint"])
-			.output()
-			.unwrap();
-
-		let output = String::from_utf8(output.stderr).unwrap();
-		assert!(
-			re.is_match(output.trim()),
-			format!("Expected:\n{}\nGot:\n{}", re, output),
-		);
-	}
-
-	#[test]
-	fn log_max_level_is_set_properly() {
-		fn run_test(rust_log: Option<String>, tracing_targets: Option<String>) -> String {
-			let executable = env::current_exe().unwrap();
-			let mut command = Command::new(executable);
-
-			command.env("PRINT_MAX_LOG_LEVEL", "1")
-				.args(&["--nocapture", "log_max_level_is_set_properly"]);
-
-			if let Some(rust_log) = rust_log {
-				command.env("RUST_LOG", rust_log);
-			}
-
-			if let Some(tracing_targets) = tracing_targets {
-				command.env("TRACING_TARGETS", tracing_targets);
-			}
-
-			let output = command.output().unwrap();
-
-			String::from_utf8(output.stderr).unwrap()
-		}
-
-		if env::var("PRINT_MAX_LOG_LEVEL").is_ok() {
-			init_logger(InitLoggerParams {
-				tracing_targets: env::var("TRACING_TARGETS").ok(),
-				..Default::default()
-			}).unwrap();
-			eprint!("MAX_LOG_LEVEL={:?}", log::max_level());
-		} else {
-			assert_eq!("MAX_LOG_LEVEL=Info", run_test(None, None));
-			assert_eq!("MAX_LOG_LEVEL=Trace", run_test(Some("test=trace".into()), None));
-			assert_eq!("MAX_LOG_LEVEL=Debug", run_test(Some("test=debug".into()), None));
-			assert_eq!("MAX_LOG_LEVEL=Trace", run_test(None, Some("test=info".into())));
-		}
-	}
-}
diff --git a/client/cli/src/runner.rs b/client/cli/src/runner.rs
index 74ac9e5bc7f6..06676655581b 100644
--- a/client/cli/src/runner.rs
+++ b/client/cli/src/runner.rs
@@ -25,6 +25,7 @@ use futures::select;
 use futures::{future, future::FutureExt, Future};
 use log::info;
 use sc_service::{Configuration, TaskType, TaskManager};
+use sc_telemetry::{TelemetryHandle, TelemetryWorker};
 use sp_utils::metrics::{TOKIO_THREADS_ALIVE, TOKIO_THREADS_TOTAL};
 use std::marker::PhantomData;
 use sc_service::Error as ServiceError;
@@ -114,12 +115,17 @@ where
 pub struct Runner<C: SubstrateCli> {
 	config: Configuration,
 	tokio_runtime: tokio::runtime::Runtime,
+	telemetry_worker: TelemetryWorker,
 	phantom: PhantomData<C>,
 }
 
 impl<C: SubstrateCli> Runner<C> {
 	/// Create a new runtime with the command provided in argument
-	pub fn new<T: CliConfiguration>(cli: &C, command: &T) -> Result<Runner<C>> {
+	pub fn new<T: CliConfiguration>(
+		cli: &C,
+		command: &T,
+		telemetry_worker: TelemetryWorker,
+	) -> Result<Runner<C>> {
 		let tokio_runtime = build_runtime()?;
 		let runtime_handle = tokio_runtime.handle().clone();
 
@@ -132,9 +138,16 @@ impl<C: SubstrateCli> Runner<C> {
 			}
 		};
 
+		let telemetry_handle = telemetry_worker.handle();
+
 		Ok(Runner {
-			config: command.create_configuration(cli, task_executor.into())?,
+			config: command.create_configuration(
+				cli,
+				task_executor.into(),
+				Some(telemetry_handle),
+			)?,
 			tokio_runtime,
+			telemetry_worker,
 			phantom: PhantomData,
 		})
 	}
@@ -184,6 +197,7 @@ impl<C: SubstrateCli> Runner<C> {
 	{
 		self.print_node_infos();
 		let mut task_manager = self.tokio_runtime.block_on(initialize(self.config))?;
+		task_manager.spawn_handle().spawn("telemetry_worker", self.telemetry_worker.run());
 		let res = self.tokio_runtime.block_on(main(task_manager.future().fuse()));
 		self.tokio_runtime.block_on(task_manager.clean_shutdown());
 		Ok(res?)
@@ -222,4 +236,11 @@ impl<C: SubstrateCli> Runner<C> {
 	pub fn config_mut(&mut self) -> &mut Configuration {
 		&mut self.config
 	}
+
+	/// Get a new [`TelemetryHandle`].
+	///
+	/// This is used when you want to register a new telemetry for a Substrate node.
+	pub fn telemetry_handle(&self) -> TelemetryHandle {
+		self.telemetry_worker.handle()
+	}
 }
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index 64213b3f73be..bf948ff4dd37 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -48,8 +48,6 @@ sc-client-api = { version = "2.0.0", path = "../api" }
 sc-peerset = { version = "2.0.0", path = "../peerset" }
 serde = { version = "1.0.101", features = ["derive"] }
 serde_json = "1.0.41"
-slog = { version = "2.5.2", features = ["nested-values"] }
-slog_derive = "0.2.0"
 smallvec = "1.5.0"
 sp-arithmetic = { version = "2.0.0", path = "../../primitives/arithmetic" }
 sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
diff --git a/client/network/src/network_state.rs b/client/network/src/network_state.rs
index fe612dcccf91..4ddfadda172e 100644
--- a/client/network/src/network_state.rs
+++ b/client/network/src/network_state.rs
@@ -22,7 +22,6 @@
 
 use libp2p::{core::ConnectedPoint, Multiaddr};
 use serde::{Deserialize, Serialize};
-use slog_derive::SerdeValue;
 use std::{collections::{HashMap, HashSet}, time::Duration};
 
 /// Returns general information about the networking.
@@ -30,7 +29,7 @@ use std::{collections::{HashMap, HashSet}, time::Duration};
 /// Meant for general diagnostic purposes.
 ///
 /// **Warning**: This API is not stable.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, SerdeValue)]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct NetworkState {
 	/// PeerId of the local node.
diff --git a/client/network/src/request_responses.rs b/client/network/src/request_responses.rs
index fbdb1432379e..d30e39891641 100644
--- a/client/network/src/request_responses.rs
+++ b/client/network/src/request_responses.rs
@@ -52,8 +52,9 @@ use libp2p::{
 };
 use std::{
 	borrow::Cow, collections::{hash_map::Entry, HashMap}, convert::TryFrom as _, io, iter,
-	pin::Pin, task::{Context, Poll}, time::{Duration, Instant},
+	pin::Pin, task::{Context, Poll}, time::Duration,
 };
+use wasm_timer::Instant;
 
 pub use libp2p::request_response::{InboundFailure, OutboundFailure, RequestId};
 
diff --git a/client/rpc/src/system/mod.rs b/client/rpc/src/system/mod.rs
index 60a410b80568..240de6c62876 100644
--- a/client/rpc/src/system/mod.rs
+++ b/client/rpc/src/system/mod.rs
@@ -24,6 +24,7 @@ mod tests;
 use futures::{future::BoxFuture, FutureExt, TryFutureExt};
 use futures::{channel::oneshot, compat::Compat};
 use sc_rpc_api::{DenyUnsafe, Receiver};
+use sc_tracing::logging;
 use sp_utils::mpsc::TracingUnboundedSender;
 use sp_runtime::traits::{self, Header as HeaderT};
 
@@ -200,12 +201,12 @@ impl<B: traits::Block> SystemApi<B::Hash, <B::Header as HeaderT>::Number> for Sy
 
 	fn system_add_log_filter(&self, directives: String) -> std::result::Result<(), rpc::Error> {
 		self.deny_unsafe.check_if_safe()?;
-		sc_tracing::add_directives(&directives);
-		sc_tracing::reload_filter().map_err(|_e| rpc::Error::internal_error())
+		logging::add_directives(&directives);
+		logging::reload_filter().map_err(|_e| rpc::Error::internal_error())
 	}
 
 	fn system_reset_log_filter(&self)-> std::result::Result<(), rpc::Error> {
 		self.deny_unsafe.check_if_safe()?;
-		sc_tracing::reset_log_filter().map_err(|_e| rpc::Error::internal_error())
+		logging::reset_log_filter().map_err(|_e| rpc::Error::internal_error())
 	}
 }
diff --git a/client/rpc/src/system/tests.rs b/client/rpc/src/system/tests.rs
index c24c7a3faa6e..89676acae26b 100644
--- a/client/rpc/src/system/tests.rs
+++ b/client/rpc/src/system/tests.rs
@@ -344,9 +344,7 @@ fn test_add_reset_log_filter() {
 
 	// Enter log generation / filter reload
 	if std::env::var("TEST_LOG_FILTER").is_ok() {
-		sc_cli::init_logger(
-			sc_cli::InitLoggerParams { pattern: "test_before_add=debug".into(), ..Default::default() },
-		).unwrap();
+		sc_tracing::logging::GlobalLoggerBuilder::new("test_before_add=debug").init().unwrap();
 		for line in std::io::stdin().lock().lines() {
 			let line = line.expect("Failed to read bytes");
 			if line.contains("add_reload") {
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index 9d040802e66a..95ce02e195f1 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -33,7 +33,6 @@ rand = "0.7.3"
 parking_lot = "0.11.1"
 lazy_static = "1.4.0"
 log = "0.4.11"
-slog = { version = "2.5.2", features = ["nested-values"] }
 futures-timer = "3.0.1"
 wasm-timer = "0.2"
 exit-future = "0.2.0"
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index bac5191f0cca..a155899fbd99 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -17,8 +17,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{
-	error::Error, DEFAULT_PROTOCOL_ID, MallocSizeOfWasm,
-	TelemetryConnectionSinks, RpcHandlers, NetworkStatusSinks,
+	error::Error, DEFAULT_PROTOCOL_ID, MallocSizeOfWasm, RpcHandlers, NetworkStatusSinks,
 	start_rpc_servers, build_network_future, TransactionPoolAdapter, TaskManager, SpawnTaskHandle,
 	metrics::MetricsService,
 	client::{light, Client, ClientConfig},
@@ -46,13 +45,19 @@ use sc_network::NetworkService;
 use sc_network::block_request_handler::{self, BlockRequestHandler};
 use sp_runtime::generic::BlockId;
 use sp_runtime::traits::{
-	Block as BlockT, SaturatedConversion, HashFor, Zero, BlockIdTo,
+	Block as BlockT, HashFor, Zero, BlockIdTo,
 };
 use sp_api::{ProvideRuntimeApi, CallApiAt};
 use sc_executor::{NativeExecutor, NativeExecutionDispatch, RuntimeInfo};
 use std::sync::Arc;
 use wasm_timer::SystemTime;
-use sc_telemetry::{telemetry, SUBSTRATE_INFO};
+use sc_telemetry::{
+	telemetry,
+	ConnectionMessage,
+	TelemetryConnectionNotifier,
+	TelemetrySpan,
+	SUBSTRATE_INFO,
+};
 use sp_transaction_pool::MaintainedTransactionPool;
 use prometheus_endpoint::Registry;
 use sc_client_db::{Backend, DatabaseSettings};
@@ -179,6 +184,7 @@ type TFullParts<TBl, TRtApi, TExecDisp> = (
 	Arc<TFullBackend<TBl>>,
 	KeystoreContainer,
 	TaskManager,
+	Option<TelemetrySpan>,
 );
 
 type TLightParts<TBl, TRtApi, TExecDisp> = (
@@ -187,6 +193,7 @@ type TLightParts<TBl, TRtApi, TExecDisp> = (
 	KeystoreContainer,
 	TaskManager,
 	Arc<OnDemand<TBl>>,
+	Option<TelemetrySpan>,
 );
 
 /// Light client backend type with a specific hash type.
@@ -301,9 +308,14 @@ pub fn new_full_parts<TBl, TRtApi, TExecDisp>(
 {
 	let keystore_container = KeystoreContainer::new(&config.keystore)?;
 
+	let telemetry_span = if config.telemetry_endpoints.is_some() {
+		Some(TelemetrySpan::new())
+	} else {
+		None
+	};
 	let task_manager = {
 		let registry = config.prometheus_config.as_ref().map(|cfg| &cfg.registry);
-		TaskManager::new(config.task_executor.clone(), registry)?
+		TaskManager::new(config.task_executor.clone(), registry, telemetry_span.clone())?
 	};
 
 	let executor = NativeExecutor::<TExecDisp>::new(
@@ -359,20 +371,26 @@ pub fn new_full_parts<TBl, TRtApi, TExecDisp>(
 		backend,
 		keystore_container,
 		task_manager,
+		telemetry_span,
 	))
 }
 
 /// Create the initial parts of a light node.
 pub fn new_light_parts<TBl, TRtApi, TExecDisp>(
-	config: &Configuration
+	config: &Configuration,
 ) -> Result<TLightParts<TBl, TRtApi, TExecDisp>, Error> where
 	TBl: BlockT,
 	TExecDisp: NativeExecutionDispatch + 'static,
 {
 	let keystore_container = KeystoreContainer::new(&config.keystore)?;
+	let telemetry_span = if config.telemetry_endpoints.is_some() {
+		Some(TelemetrySpan::new())
+	} else {
+		None
+	};
 	let task_manager = {
 		let registry = config.prometheus_config.as_ref().map(|cfg| &cfg.registry);
-		TaskManager::new(config.task_executor.clone(), registry)?
+		TaskManager::new(config.task_executor.clone(), registry, telemetry_span.clone())?
 	};
 
 	let executor = NativeExecutor::<TExecDisp>::new(
@@ -411,7 +429,7 @@ pub fn new_light_parts<TBl, TRtApi, TExecDisp>(
 		config.prometheus_config.as_ref().map(|config| config.registry.clone()),
 	)?);
 
-	Ok((client, backend, keystore_container, task_manager, on_demand))
+	Ok((client, backend, keystore_container, task_manager, on_demand, telemetry_span))
 }
 
 /// Create an instance of db-backed client.
@@ -463,6 +481,8 @@ pub fn new_client<E, Block, RA>(
 pub struct SpawnTasksParams<'a, TBl: BlockT, TCl, TExPool, TRpc, Backend> {
 	/// The service configuration.
 	pub config: Configuration,
+	/// Telemetry span, if any.
+	pub telemetry_span: Option<TelemetrySpan>,
 	/// A shared client returned by `new_full_parts`/`new_light_parts`.
 	pub client: Arc<TCl>,
 	/// A shared backend returned by `new_full_parts`/`new_light_parts`.
@@ -486,8 +506,6 @@ pub struct SpawnTasksParams<'a, TBl: BlockT, TCl, TExPool, TRpc, Backend> {
 	pub network_status_sinks: NetworkStatusSinks<TBl>,
 	/// A Sender for RPC requests.
 	pub system_rpc_tx: TracingUnboundedSender<sc_rpc::system::Request<TBl>>,
-	/// Shared Telemetry connection sinks,
-	pub telemetry_connection_sinks: TelemetryConnectionSinks,
 }
 
 /// Build a shared offchain workers instance.
@@ -534,7 +552,7 @@ pub fn build_offchain_workers<TBl, TBackend, TCl>(
 /// Spawn the tasks that are required to run a node.
 pub fn spawn_tasks<TBl, TBackend, TExPool, TRpc, TCl>(
 	params: SpawnTasksParams<TBl, TCl, TExPool, TRpc, TBackend>,
-) -> Result<RpcHandlers, Error>
+) -> Result<(RpcHandlers, Option<TelemetryConnectionNotifier>), Error>
 	where
 		TCl: ProvideRuntimeApi<TBl> + HeaderMetadata<TBl, Error=sp_blockchain::Error> + Chain<TBl> +
 		BlockBackend<TBl> + BlockIdTo<TBl, Error=sp_blockchain::Error> + ProofProvider<TBl> +
@@ -557,6 +575,7 @@ pub fn spawn_tasks<TBl, TBackend, TExPool, TRpc, TCl>(
 	let SpawnTasksParams {
 		mut config,
 		task_manager,
+		telemetry_span,
 		client,
 		on_demand,
 		backend,
@@ -567,7 +586,6 @@ pub fn spawn_tasks<TBl, TBackend, TExPool, TRpc, TCl>(
 		network,
 		network_status_sinks,
 		system_rpc_tx,
-		telemetry_connection_sinks,
 	} = params;
 
 	let chain_info = client.usage_info().chain;
@@ -578,13 +596,15 @@ pub fn spawn_tasks<TBl, TBackend, TExPool, TRpc, TCl>(
 		config.dev_key_seed.clone().map(|s| vec![s]).unwrap_or_default(),
 	)?;
 
+	let telemetry_connection_notifier = telemetry_span
+		.and_then(|span| init_telemetry(
+			&mut config,
+			span,
+			network.clone(),
+			client.clone(),
+		));
+
 	info!("📦 Highest known block at #{}", chain_info.best_number);
-	telemetry!(
-		SUBSTRATE_INFO;
-		"node.start";
-		"height" => chain_info.best_number.saturated_into::<u64>(),
-		"best" => ?chain_info.best_hash
-	);
 
 	let spawn_handle = task_manager.spawn_handle();
 
@@ -642,24 +662,6 @@ pub fn spawn_tasks<TBl, TBackend, TExPool, TRpc, TCl>(
 		sc_rpc_server::RpcMiddleware::new(rpc_metrics, "inbrowser")
 	).into()));
 
-	// Telemetry
-	let telemetry = config.telemetry_endpoints.clone().and_then(|endpoints| {
-		if endpoints.is_empty() {
-			// we don't want the telemetry to be initialized if telemetry_endpoints == Some([])
-			return None;
-		}
-
-		let genesis_hash = match client.block_hash(Zero::zero()) {
-			Ok(Some(hash)) => hash,
-			_ => Default::default(),
-		};
-
-		Some(build_telemetry(
-			&mut config, endpoints, telemetry_connection_sinks.clone(), network.clone(),
-			task_manager.spawn_handle(), genesis_hash,
-		))
-	});
-
 	// Spawn informant task
 	spawn_handle.spawn("informant", sc_informant::build(
 		client.clone(),
@@ -668,21 +670,22 @@ pub fn spawn_tasks<TBl, TBackend, TExPool, TRpc, TCl>(
 		config.informant_output_format,
 	));
 
-	task_manager.keep_alive((telemetry, config.base_path, rpc, rpc_handlers.clone()));
+	task_manager.keep_alive((config.base_path, rpc, rpc_handlers.clone()));
 
-	Ok(rpc_handlers)
+	Ok((rpc_handlers, telemetry_connection_notifier))
 }
 
 async fn transaction_notifications<TBl, TExPool>(
 	transaction_pool: Arc<TExPool>,
-	network: Arc<NetworkService<TBl, <TBl as BlockT>::Hash>>
+	network: Arc<NetworkService<TBl, <TBl as BlockT>::Hash>>,
 )
 	where
 		TBl: BlockT,
 		TExPool: MaintainedTransactionPool<Block=TBl, Hash = <TBl as BlockT>::Hash>,
 {
 	// transaction notifications
-	transaction_pool.import_notification_stream()
+	transaction_pool
+		.import_notification_stream()
 		.for_each(move |hash| {
 			network.propagate_transaction(hash);
 			let status = transaction_pool.status();
@@ -695,55 +698,35 @@ async fn transaction_notifications<TBl, TExPool>(
 		.await;
 }
 
-fn build_telemetry<TBl: BlockT>(
+fn init_telemetry<TBl: BlockT, TCl: BlockBackend<TBl>>(
 	config: &mut Configuration,
-	endpoints: sc_telemetry::TelemetryEndpoints,
-	telemetry_connection_sinks: TelemetryConnectionSinks,
+	telemetry_span: TelemetrySpan,
 	network: Arc<NetworkService<TBl, <TBl as BlockT>::Hash>>,
-	spawn_handle: SpawnTaskHandle,
-	genesis_hash: <TBl as BlockT>::Hash,
-) -> sc_telemetry::Telemetry {
-	let is_authority = config.role.is_authority();
-	let network_id = network.local_peer_id().to_base58();
-	let name = config.network.node_name.clone();
-	let impl_name = config.impl_name.clone();
-	let impl_version = config.impl_version.clone();
-	let chain_name = config.chain_spec.name().to_owned();
-	let telemetry = sc_telemetry::init_telemetry(sc_telemetry::TelemetryConfig {
-		endpoints,
-		wasm_external_transport: config.telemetry_external_transport.take(),
-	});
-	let startup_time = SystemTime::UNIX_EPOCH.elapsed()
-		.map(|dur| dur.as_millis())
-		.unwrap_or(0);
-
-	spawn_handle.spawn(
-		"telemetry-worker",
-		telemetry.clone()
-			.for_each(move |event| {
-				// Safe-guard in case we add more events in the future.
-				let sc_telemetry::TelemetryEvent::Connected = event;
-
-				telemetry!(SUBSTRATE_INFO; "system.connected";
-					"name" => name.clone(),
-					"implementation" => impl_name.clone(),
-					"version" => impl_version.clone(),
-					"config" => "",
-					"chain" => chain_name.clone(),
-					"genesis_hash" => ?genesis_hash,
-					"authority" => is_authority,
-					"startup_time" => startup_time,
-					"network_id" => network_id.clone()
-				);
-
-				telemetry_connection_sinks.0.lock().retain(|sink| {
-					sink.unbounded_send(()).is_ok()
-				});
-				ready(())
-			})
-	);
+	client: Arc<TCl>,
+) -> Option<TelemetryConnectionNotifier> {
+	let endpoints = config.telemetry_endpoints()?.clone();
+	let genesis_hash = client.block_hash(Zero::zero()).ok().flatten().unwrap_or_default();
+	let connection_message = ConnectionMessage {
+		name: config.network.node_name.to_owned(),
+		implementation: config.impl_name.to_owned(),
+		version: config.impl_version.to_owned(),
+		config: String::new(),
+		chain: config.chain_spec.name().to_owned(),
+		genesis_hash: format!("{:?}", genesis_hash),
+		authority: config.role.is_authority(),
+		startup_time: SystemTime::UNIX_EPOCH.elapsed()
+			.map(|dur| dur.as_millis())
+			.unwrap_or(0).to_string(),
+		network_id: network.local_peer_id().to_base58(),
+	};
 
-	telemetry
+	config.telemetry_handle
+		.as_mut()
+		.map(|handle| handle.start_telemetry(
+			telemetry_span,
+			endpoints,
+			connection_message,
+		))
 }
 
 fn gen_handler<TBl, TBackend, TExPool, TRpc, TCl>(
diff --git a/client/service/src/config.rs b/client/service/src/config.rs
index 5197aa655b24..c3be40e08397 100644
--- a/client/service/src/config.rs
+++ b/client/service/src/config.rs
@@ -96,6 +96,11 @@ pub struct Configuration {
 	/// External WASM transport for the telemetry. If `Some`, when connection to a telemetry
 	/// endpoint, this transport will be tried in priority before all others.
 	pub telemetry_external_transport: Option<ExtTransport>,
+	/// Telemetry handle.
+	///
+	/// This is a handle to a `TelemetryWorker` instance. It is used to initialize the telemetry for
+	/// a substrate node.
+	pub telemetry_handle: Option<sc_telemetry::TelemetryHandle>,
 	/// The default number of 64KB pages to allocate for Wasm execution
 	pub default_heap_pages: Option<u64>,
 	/// Should offchain workers be executed.
@@ -198,9 +203,22 @@ impl Configuration {
 	}
 
 	/// Returns the prometheus metrics registry, if available.
-	pub fn prometheus_registry<'a>(&'a self) -> Option<&'a Registry> {
+	pub fn prometheus_registry(&self) -> Option<&Registry> {
 		self.prometheus_config.as_ref().map(|config| &config.registry)
 	}
+
+	/// Returns the telemetry endpoints if any and if the telemetry handle exists.
+	pub(crate) fn telemetry_endpoints(&self) -> Option<&TelemetryEndpoints> {
+		if self.telemetry_handle.is_none() {
+			return None;
+		}
+
+		match self.telemetry_endpoints.as_ref() {
+			// Don't initialise telemetry if `telemetry_endpoints` == Some([])
+			Some(endpoints) if !endpoints.is_empty() => Some(endpoints),
+			_ => None,
+		}
+	}
 }
 
 /// Available RPC methods.
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index 3033b1d09dd3..170b7f79d197 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -39,7 +39,6 @@ use std::net::SocketAddr;
 use std::collections::HashMap;
 use std::time::Duration;
 use std::task::Poll;
-use parking_lot::Mutex;
 
 use futures::{Future, FutureExt, Stream, StreamExt, stream, compat::*};
 use sc_network::{NetworkStatus, network_state::NetworkState, PeerId};
@@ -48,7 +47,7 @@ use codec::{Encode, Decode};
 use sp_runtime::generic::BlockId;
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT};
 use parity_util_mem::MallocSizeOf;
-use sp_utils::{status_sinks, mpsc::{tracing_unbounded, TracingUnboundedReceiver,  TracingUnboundedSender}};
+use sp_utils::{status_sinks, mpsc::{tracing_unbounded, TracingUnboundedReceiver}};
 
 pub use self::error::Error;
 pub use self::builder::{
@@ -161,20 +160,7 @@ impl<Block: BlockT> NetworkStatusSinks<Block> {
 
 }
 
-/// Sinks to propagate telemetry connection established events.
-#[derive(Default, Clone)]
-pub struct TelemetryConnectionSinks(Arc<Mutex<Vec<TracingUnboundedSender<()>>>>);
-
-impl TelemetryConnectionSinks {
-	/// Get event stream for telemetry connection established events.
-	pub fn on_connect_stream(&self) -> TracingUnboundedReceiver<()> {
-		let (sink, stream) =tracing_unbounded("mpsc_telemetry_on_connect");
-		self.0.lock().push(sink);
-		stream
-	}
-}
-
-/// An imcomplete set of chain components, but enough to run the chain ops subcommands.
+/// An incomplete set of chain components, but enough to run the chain ops subcommands.
 pub struct PartialComponents<Client, Backend, SelectChain, ImportQueue, TransactionPool, Other> {
 	/// A shared client instance.
 	pub client: Arc<Client>,
diff --git a/client/service/src/task_manager/mod.rs b/client/service/src/task_manager/mod.rs
index d1ab8c9c2a7e..4d9e16d90032 100644
--- a/client/service/src/task_manager/mod.rs
+++ b/client/service/src/task_manager/mod.rs
@@ -34,6 +34,7 @@ use prometheus_endpoint::{
 use sp_utils::mpsc::{TracingUnboundedSender, TracingUnboundedReceiver, tracing_unbounded};
 use tracing_futures::Instrument;
 use crate::{config::{TaskExecutor, TaskType, JoinFuture}, Error};
+use sc_telemetry::TelemetrySpan;
 
 mod prometheus_future;
 #[cfg(test)]
@@ -46,6 +47,7 @@ pub struct SpawnTaskHandle {
 	executor: TaskExecutor,
 	metrics: Option<Metrics>,
 	task_notifier: TracingUnboundedSender<JoinFuture>,
+	telemetry_span: Option<TelemetrySpan>,
 }
 
 impl SpawnTaskHandle {
@@ -89,7 +91,10 @@ impl SpawnTaskHandle {
 			metrics.tasks_ended.with_label_values(&[name, "finished"]).inc_by(0);
 		}
 
+		let telemetry_span = self.telemetry_span.clone();
 		let future = async move {
+			let _telemetry_entered = telemetry_span.as_ref().map(|x| x.enter());
+
 			if let Some(metrics) = metrics {
 				// Add some wrappers around `task`.
 				let task = {
@@ -228,14 +233,17 @@ pub struct TaskManager {
 	/// terminates and gracefully shutdown. Also ends the parent `future()` if a child's essential
 	/// task fails.
 	children: Vec<TaskManager>,
+	/// A telemetry handle used to enter the telemetry span when a task is spawned.
+	telemetry_span: Option<TelemetrySpan>,
 }
 
 impl TaskManager {
- 	/// If a Prometheus registry is passed, it will be used to report statistics about the
- 	/// service tasks.
+	/// If a Prometheus registry is passed, it will be used to report statistics about the
+	/// service tasks.
 	pub(super) fn new(
 		executor: TaskExecutor,
-		prometheus_registry: Option<&Registry>
+		prometheus_registry: Option<&Registry>,
+		telemetry_span: Option<TelemetrySpan>,
 	) -> Result<Self, PrometheusError> {
 		let (signal, on_exit) = exit_future::signal();
 
@@ -264,6 +272,7 @@ impl TaskManager {
 			task_notifier,
 			completion_future,
 			children: Vec::new(),
+			telemetry_span,
 		})
 	}
 
@@ -274,6 +283,7 @@ impl TaskManager {
 			executor: self.executor.clone(),
 			metrics: self.metrics.clone(),
 			task_notifier: self.task_notifier.clone(),
+			telemetry_span: self.telemetry_span.clone(),
 		}
 	}
 
diff --git a/client/service/src/task_manager/tests.rs b/client/service/src/task_manager/tests.rs
index 0509392ce388..f0ede1fc389a 100644
--- a/client/service/src/task_manager/tests.rs
+++ b/client/service/src/task_manager/tests.rs
@@ -81,13 +81,17 @@ async fn run_background_task_blocking(duration: Duration, _keep_alive: impl Any)
 	}
 }
 
+fn new_task_manager(task_executor: TaskExecutor) -> TaskManager {
+	TaskManager::new(task_executor, None, None).unwrap()
+}
+
 #[test]
 fn ensure_tasks_are_awaited_on_shutdown() {
 	let mut runtime = tokio::runtime::Runtime::new().unwrap();
 	let handle = runtime.handle().clone();
 	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
-	let task_manager = TaskManager::new(task_executor, None).unwrap();
+	let task_manager = new_task_manager(task_executor);
 	let spawn_handle = task_manager.spawn_handle();
 	let drop_tester = DropTester::new();
 	spawn_handle.spawn("task1", run_background_task(drop_tester.new_ref()));
@@ -106,7 +110,7 @@ fn ensure_keep_alive_during_shutdown() {
 	let handle = runtime.handle().clone();
 	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
-	let mut task_manager = TaskManager::new(task_executor, None).unwrap();
+	let mut task_manager = new_task_manager(task_executor);
 	let spawn_handle = task_manager.spawn_handle();
 	let drop_tester = DropTester::new();
 	task_manager.keep_alive(drop_tester.new_ref());
@@ -125,7 +129,7 @@ fn ensure_blocking_futures_are_awaited_on_shutdown() {
 	let handle = runtime.handle().clone();
 	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
-	let task_manager = TaskManager::new(task_executor, None).unwrap();
+	let task_manager = new_task_manager(task_executor);
 	let spawn_handle = task_manager.spawn_handle();
 	let drop_tester = DropTester::new();
 	spawn_handle.spawn(
@@ -150,7 +154,7 @@ fn ensure_no_task_can_be_spawn_after_terminate() {
 	let handle = runtime.handle().clone();
 	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
-	let mut task_manager = TaskManager::new(task_executor, None).unwrap();
+	let mut task_manager = new_task_manager(task_executor);
 	let spawn_handle = task_manager.spawn_handle();
 	let drop_tester = DropTester::new();
 	spawn_handle.spawn("task1", run_background_task(drop_tester.new_ref()));
@@ -171,7 +175,7 @@ fn ensure_task_manager_future_ends_when_task_manager_terminated() {
 	let handle = runtime.handle().clone();
 	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
-	let mut task_manager = TaskManager::new(task_executor, None).unwrap();
+	let mut task_manager = new_task_manager(task_executor);
 	let spawn_handle = task_manager.spawn_handle();
 	let drop_tester = DropTester::new();
 	spawn_handle.spawn("task1", run_background_task(drop_tester.new_ref()));
@@ -192,7 +196,7 @@ fn ensure_task_manager_future_ends_with_error_when_essential_task_fails() {
 	let handle = runtime.handle().clone();
 	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
-	let mut task_manager = TaskManager::new(task_executor, None).unwrap();
+	let mut task_manager = new_task_manager(task_executor);
 	let spawn_handle = task_manager.spawn_handle();
 	let spawn_essential_handle = task_manager.spawn_essential_handle();
 	let drop_tester = DropTester::new();
@@ -215,10 +219,10 @@ fn ensure_children_tasks_ends_when_task_manager_terminated() {
 	let handle = runtime.handle().clone();
 	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
-	let mut task_manager = TaskManager::new(task_executor.clone(), None).unwrap();
-	let child_1 = TaskManager::new(task_executor.clone(), None).unwrap();
+	let mut task_manager = new_task_manager(task_executor.clone());
+	let child_1 = new_task_manager(task_executor.clone());
 	let spawn_handle_child_1 = child_1.spawn_handle();
-	let child_2 = TaskManager::new(task_executor.clone(), None).unwrap();
+	let child_2 = new_task_manager(task_executor.clone());
 	let spawn_handle_child_2 = child_2.spawn_handle();
 	task_manager.add_child(child_1);
 	task_manager.add_child(child_2);
@@ -244,11 +248,11 @@ fn ensure_task_manager_future_ends_with_error_when_childs_essential_task_fails()
 	let handle = runtime.handle().clone();
 	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
-	let mut task_manager = TaskManager::new(task_executor.clone(), None).unwrap();
-	let child_1 = TaskManager::new(task_executor.clone(), None).unwrap();
+	let mut task_manager = new_task_manager(task_executor.clone());
+	let child_1 = new_task_manager(task_executor.clone());
 	let spawn_handle_child_1 = child_1.spawn_handle();
 	let spawn_essential_handle_child_1 = child_1.spawn_essential_handle();
-	let child_2 = TaskManager::new(task_executor.clone(), None).unwrap();
+	let child_2 = new_task_manager(task_executor.clone());
 	let spawn_handle_child_2 = child_2.spawn_handle();
 	task_manager.add_child(child_1);
 	task_manager.add_child(child_2);
@@ -275,10 +279,10 @@ fn ensure_task_manager_future_continues_when_childs_not_essential_task_fails() {
 	let handle = runtime.handle().clone();
 	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
-	let mut task_manager = TaskManager::new(task_executor.clone(), None).unwrap();
-	let child_1 = TaskManager::new(task_executor.clone(), None).unwrap();
+	let mut task_manager = new_task_manager(task_executor.clone());
+	let child_1 = new_task_manager(task_executor.clone());
 	let spawn_handle_child_1 = child_1.spawn_handle();
-	let child_2 = TaskManager::new(task_executor.clone(), None).unwrap();
+	let child_2 = new_task_manager(task_executor.clone());
 	let spawn_handle_child_2 = child_2.spawn_handle();
 	task_manager.add_child(child_1);
 	task_manager.add_child(child_2);
diff --git a/client/service/test/src/lib.rs b/client/service/test/src/lib.rs
index bd4f325908b0..f1d5c6a86b06 100644
--- a/client/service/test/src/lib.rs
+++ b/client/service/test/src/lib.rs
@@ -267,6 +267,7 @@ fn node_config<G: RuntimeGenesis + 'static, E: ChainSpecExtension + Clone + 'sta
 		prometheus_config: None,
 		telemetry_endpoints: None,
 		telemetry_external_transport: None,
+		telemetry_handle: None,
 		default_heap_pages: None,
 		offchain_worker: Default::default(),
 		force_authoring: false,
diff --git a/client/telemetry/Cargo.toml b/client/telemetry/Cargo.toml
index 8c517574fffb..f6e249c786a9 100644
--- a/client/telemetry/Cargo.toml
+++ b/client/telemetry/Cargo.toml
@@ -17,15 +17,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 parking_lot = "0.11.1"
 futures = "0.3.9"
-futures-timer = "3.0.1"
 wasm-timer = "0.2.5"
 libp2p = { version = "0.34.0", default-features = false, features = ["dns", "tcp-async-io", "wasm-ext", "websocket"] }
 log = "0.4.8"
 pin-project = "0.4.6"
 rand = "0.7.2"
 serde = { version = "1.0.101", features = ["derive"] }
-slog = { version = "2.5.2", features = ["nested-values"] }
-slog-json = { version = "2.3.0", features = ["nested-values"] }
-slog-scope = "4.1.2"
 take_mut = "0.2.2"
 void = "1.0.2"
+tracing = "0.1.10"
+tracing-subscriber = "0.2.13"
+serde_json = "1.0.41"
+sp-utils = { version = "2.0.0", path = "../../primitives/utils" }
+chrono = "0.4.19"
diff --git a/client/telemetry/README.md b/client/telemetry/README.md
index 8fdf9e500722..a6b7b654508a 100644
--- a/client/telemetry/README.md
+++ b/client/telemetry/README.md
@@ -1,45 +1,21 @@
-Telemetry utilities.
+# sc-telemetry
 
-Calling `init_telemetry` registers a global `slog` logger using `slog_scope::set_global_logger`.
-After that, calling `slog_scope::with_logger` will return a logger that sends information to
-the telemetry endpoints. The `telemetry!` macro is a short-cut for calling
-`slog_scope::with_logger` followed with `slog_log!`.
+Substrate's client telemetry is a part of substrate that allows logging telemetry information
+with a [Polkadot telemetry](https://github.com/paritytech/substrate-telemetry).
 
-Note that you are supposed to only ever use `telemetry!` and not `slog_scope::with_logger` at
-the moment. Substrate may eventually be reworked to get proper `slog` support, including sending
-information to the telemetry.
+It works using Tokio's [tracing](https://github.com/tokio-rs/tracing/). The telemetry
+information uses tracing's logging to report the telemetry which is then retrieved by a
+tracing's `Layer`. This layer will then send the data through an asynchronous channel and to a
+background task called [`TelemetryWorker`] which will send the information to the telemetry
+server.
 
-The [`Telemetry`] struct implements `Stream` and must be polled regularly (or sent to a
-background thread/task) in order for the telemetry to properly function. Dropping the object
-will also deregister the global logger and replace it with a logger that discards messages.
-The `Stream` generates [`TelemetryEvent`]s.
+If multiple substrate nodes are running, it uses a tracing's `Span` to identify which substrate
+node is reporting the telemetry. Every task spawned using sc-service's `TaskManager`
+automatically inherit this span.
 
-> **Note**: Cloning the [`Telemetry`] and polling from multiple clones has an unspecified behaviour.
+Substrate's nodes initialize/register to the [`TelemetryWorker`] using a [`TelemetryHandle`].
+This handle can be cloned and passed around. It uses an asynchronous channel to communicate with
+the running [`TelemetryWorker`] dedicated to registration. Registering a telemetry can happen at
+any point in time during the execution.
 
-# Example
-
-```rust
-use futures::prelude::*;
-
-let telemetry = sc_telemetry::init_telemetry(sc_telemetry::TelemetryConfig {
-	endpoints: sc_telemetry::TelemetryEndpoints::new(vec![
-		// The `0` is the maximum verbosity level of messages to send to this endpoint.
-		("wss://example.com".into(), 0)
-	]).expect("Invalid URL or multiaddr provided"),
-	// Can be used to pass an external implementation of WebSockets.
-	wasm_external_transport: None,
-});
-
-// The `telemetry` object implements `Stream` and must be processed.
-std::thread::spawn(move || {
-	futures::executor::block_on(telemetry.for_each(|_| future::ready(())));
-});
-
-// Sends a message on the telemetry.
-sc_telemetry::telemetry!(sc_telemetry::SUBSTRATE_INFO; "test";
-	"foo" => "bar",
-)
-```
-
-
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/client/telemetry/src/async_record.rs b/client/telemetry/src/async_record.rs
deleted file mode 100644
index 06650a54defd..000000000000
--- a/client/telemetry/src/async_record.rs
+++ /dev/null
@@ -1,155 +0,0 @@
-//! # Internal types to ssync drain slog
-//! FIXME: REMOVE THIS ONCE THE PR WAS MERGE
-//! <https://github.com/slog-rs/async/pull/14>
-
-use slog::{Record, RecordStatic, Level, SingleKV, KV, BorrowedKV};
-use slog::{Serializer, OwnedKVList, Key};
-
-use std::fmt;
-use take_mut::take;
-
-struct ToSendSerializer {
-	kv: Box<dyn KV + Send>,
-}
-
-impl ToSendSerializer {
-	fn new() -> Self {
-		ToSendSerializer { kv: Box::new(()) }
-	}
-
-	fn finish(self) -> Box<dyn KV + Send> {
-		self.kv
-	}
-}
-
-impl Serializer for ToSendSerializer {
-	fn emit_bool(&mut self, key: Key, val: bool) -> slog::Result {
-		take(&mut self.kv, |kv| Box::new((kv, SingleKV(key, val))));
-		Ok(())
-	}
-	fn emit_unit(&mut self, key: Key) -> slog::Result {
-		take(&mut self.kv, |kv| Box::new((kv, SingleKV(key, ()))));
-		Ok(())
-	}
-	fn emit_none(&mut self, key: Key) -> slog::Result {
-		let val: Option<()> = None;
-		take(&mut self.kv, |kv| Box::new((kv, SingleKV(key, val))));
-		Ok(())
-	}
-	fn emit_char(&mut self, key: Key, val: char) -> slog::Result {
-		take(&mut self.kv, |kv| Box::new((kv, SingleKV(key, val))));
-		Ok(())
-	}
-	fn emit_u8(&mut self, key: Key, val: u8) -> slog::Result {
-		take(&mut self.kv, |kv| Box::new((kv, SingleKV(key, val))));
-		Ok(())
-	}
-	fn emit_i8(&mut self, key: Key, val: i8) -> slog::Result {
-		take(&mut self.kv, |kv| Box::new((kv, SingleKV(key, val))));
-		Ok(())
-	}
-	fn emit_u16(&mut self, key: Key, val: u16) -> slog::Result {
-		take(&mut self.kv, |kv| Box::new((kv, SingleKV(key, val))));
-		Ok(())
-	}
-	fn emit_i16(&mut self, key: Key, val: i16) -> slog::Result {
-		take(&mut self.kv, |kv| Box::new((kv, SingleKV(key, val))));
-		Ok(())
-	}
-	fn emit_u32(&mut self, key: Key, val: u32) -> slog::Result {
-		take(&mut self.kv, |kv| Box::new((kv, SingleKV(key, val))));
-		Ok(())
-	}
-	fn emit_i32(&mut self, key: Key, val: i32) -> slog::Result {
-		take(&mut self.kv, |kv| Box::new((kv, SingleKV(key, val))));
-		Ok(())
-	}
-	fn emit_f32(&mut self, key: Key, val: f32) -> slog::Result {
-		take(&mut self.kv, |kv| Box::new((kv, SingleKV(key, val))));
-		Ok(())
-	}
-	fn emit_u64(&mut self, key: Key, val: u64) -> slog::Result {
-		take(&mut self.kv, |kv| Box::new((kv, SingleKV(key, val))));
-		Ok(())
-	}
-	fn emit_i64(&mut self, key: Key, val: i64) -> slog::Result {
-		take(&mut self.kv, |kv| Box::new((kv, SingleKV(key, val))));
-		Ok(())
-	}
-	fn emit_f64(&mut self, key: Key, val: f64) -> slog::Result {
-		take(&mut self.kv, |kv| Box::new((kv, SingleKV(key, val))));
-		Ok(())
-	}
-	fn emit_usize(&mut self, key: Key, val: usize) -> slog::Result {
-		take(&mut self.kv, |kv| Box::new((kv, SingleKV(key, val))));
-		Ok(())
-	}
-	fn emit_isize(&mut self, key: Key, val: isize) -> slog::Result {
-		take(&mut self.kv, |kv| Box::new((kv, SingleKV(key, val))));
-		Ok(())
-	}
-	fn emit_str(&mut self, key: Key, val: &str) -> slog::Result {
-		let val = val.to_owned();
-		take(&mut self.kv, |kv| Box::new((kv, SingleKV(key, val))));
-		Ok(())
-	}
-	fn emit_arguments(
-		&mut self,
-		key: Key,
-		val: &fmt::Arguments,
-	) -> slog::Result {
-		let val = fmt::format(*val);
-		take(&mut self.kv, |kv| Box::new((kv, SingleKV(key, val))));
-		Ok(())
-	}
-
-	fn emit_serde(&mut self, key: Key, value: &dyn slog::SerdeValue) -> slog::Result {
-		let val = value.to_sendable();
-		take(&mut self.kv, |kv| Box::new((kv, SingleKV(key, val))));
-		Ok(())
-	}
-}
-
-pub(crate) struct AsyncRecord {
-	msg: String,
-	level: Level,
-	location: Box<slog::RecordLocation>,
-	tag: String,
-	logger_values: OwnedKVList,
-	kv: Box<dyn KV + Send>,
-}
-
-impl AsyncRecord {
-	/// Serializes a `Record` and an `OwnedKVList`.
-	pub fn from(record: &Record, logger_values: &OwnedKVList) -> Self {
-		let mut ser = ToSendSerializer::new();
-		record
-			.kv()
-			.serialize(record, &mut ser)
-			.expect("`ToSendSerializer` can't fail");
-
-		AsyncRecord {
-			msg: fmt::format(*record.msg()),
-			level: record.level(),
-			location: Box::new(*record.location()),
-			tag: String::from(record.tag()),
-			logger_values: logger_values.clone(),
-			kv: ser.finish(),
-		}
-	}
-
-	/// Deconstruct this `AsyncRecord` into a record and `OwnedKVList`.
-	pub fn as_record_values(&self, mut f: impl FnMut(&Record, &OwnedKVList)) {
-		let rs = RecordStatic {
-			location: &*self.location,
-			level: self.level,
-			tag: &self.tag,
-		};
-
-		f(&Record::new(
-			&rs,
-			&format_args!("{}", self.msg),
-			BorrowedKV(&self.kv),
-		), &self.logger_values)
-	}
-}
diff --git a/client/telemetry/src/endpoints.rs b/client/telemetry/src/endpoints.rs
new file mode 100644
index 000000000000..7d0338fb18e3
--- /dev/null
+++ b/client/telemetry/src/endpoints.rs
@@ -0,0 +1,125 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+use libp2p::Multiaddr;
+use serde::{Deserialize, Deserializer, Serialize};
+
+/// List of telemetry servers we want to talk to. Contains the URL of the server, and the
+/// maximum verbosity level.
+///
+/// The URL string can be either a URL or a multiaddress.
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Hash)]
+pub struct TelemetryEndpoints(
+	#[serde(deserialize_with = "url_or_multiaddr_deser")] pub(crate) Vec<(Multiaddr, u8)>,
+);
+
+/// Custom deserializer for TelemetryEndpoints, used to convert urls or multiaddr to multiaddr.
+fn url_or_multiaddr_deser<'de, D>(deserializer: D) -> Result<Vec<(Multiaddr, u8)>, D::Error>
+where
+	D: Deserializer<'de>,
+{
+	Vec::<(String, u8)>::deserialize(deserializer)?
+		.iter()
+		.map(|e| {
+			url_to_multiaddr(&e.0)
+				.map_err(serde::de::Error::custom)
+				.map(|m| (m, e.1))
+		})
+		.collect()
+}
+
+impl TelemetryEndpoints {
+	/// Create a `TelemetryEndpoints` based on a list of `(String, u8)`.
+	pub fn new(endpoints: Vec<(String, u8)>) -> Result<Self, libp2p::multiaddr::Error> {
+		let endpoints: Result<Vec<(Multiaddr, u8)>, libp2p::multiaddr::Error> = endpoints
+			.iter()
+			.map(|e| Ok((url_to_multiaddr(&e.0)?, e.1)))
+			.collect();
+		endpoints.map(Self)
+	}
+}
+
+impl TelemetryEndpoints {
+	/// Return `true` if there are no telemetry endpoints, `false` otherwise.
+	pub fn is_empty(&self) -> bool {
+		self.0.is_empty()
+	}
+}
+
+/// Parses a WebSocket URL into a libp2p `Multiaddr`.
+fn url_to_multiaddr(url: &str) -> Result<Multiaddr, libp2p::multiaddr::Error> {
+	// First, assume that we have a `Multiaddr`.
+	let parse_error = match url.parse() {
+		Ok(ma) => return Ok(ma),
+		Err(err) => err,
+	};
+
+	// If not, try the `ws://path/url` format.
+	if let Ok(ma) = libp2p::multiaddr::from_url(url) {
+		return Ok(ma);
+	}
+
+	// If we have no clue about the format of that string, assume that we were expecting a
+	// `Multiaddr`.
+	Err(parse_error)
+}
+
+#[cfg(test)]
+mod tests {
+	use super::url_to_multiaddr;
+	use super::TelemetryEndpoints;
+	use libp2p::Multiaddr;
+
+	#[test]
+	fn valid_endpoints() {
+		let endp = vec![
+			("wss://telemetry.polkadot.io/submit/".into(), 3),
+			("/ip4/80.123.90.4/tcp/5432".into(), 4),
+		];
+		let telem =
+			TelemetryEndpoints::new(endp.clone()).expect("Telemetry endpoint should be valid");
+		let mut res: Vec<(Multiaddr, u8)> = vec![];
+		for (a, b) in endp.iter() {
+			res.push((
+				url_to_multiaddr(a).expect("provided url should be valid"),
+				*b,
+			))
+		}
+		assert_eq!(telem.0, res);
+	}
+
+	#[test]
+	fn invalid_endpoints() {
+		let endp = vec![
+			("/ip4/...80.123.90.4/tcp/5432".into(), 3),
+			("/ip4/no:!?;rlkqre;;::::///tcp/5432".into(), 4),
+		];
+		let telem = TelemetryEndpoints::new(endp);
+		assert!(telem.is_err());
+	}
+
+	#[test]
+	fn valid_and_invalid_endpoints() {
+		let endp = vec![
+			("/ip4/80.123.90.4/tcp/5432".into(), 3),
+			("/ip4/no:!?;rlkqre;;::::///tcp/5432".into(), 4),
+		];
+		let telem = TelemetryEndpoints::new(endp);
+		assert!(telem.is_err());
+	}
+}
diff --git a/client/telemetry/src/layer.rs b/client/telemetry/src/layer.rs
new file mode 100644
index 000000000000..eb5eee197770
--- /dev/null
+++ b/client/telemetry/src/layer.rs
@@ -0,0 +1,149 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+use crate::{initialize_transport, TelemetryWorker};
+use futures::channel::mpsc;
+use libp2p::wasm_ext::ExtTransport;
+use parking_lot::Mutex;
+use std::convert::TryInto;
+use std::io;
+use tracing::{Event, Id, Subscriber};
+use tracing_subscriber::{layer::Context, registry::LookupSpan, Layer};
+
+/// Span name used to report the telemetry.
+pub const TELEMETRY_LOG_SPAN: &str = "telemetry-logger";
+
+/// `Layer` that handles the logs for telemetries.
+#[derive(Debug)]
+pub struct TelemetryLayer(Mutex<mpsc::Sender<(Id, u8, String)>>);
+
+impl TelemetryLayer {
+	/// Create a new [`TelemetryLayer`] and [`TelemetryWorker`].
+	///
+	/// If not provided, the `buffer_size` will be 16 by default.
+	///
+	/// The [`ExtTransport`] is used in WASM contexts where we need some binding between the
+	/// networking provided by the operating system or environment and libp2p.
+	///
+	/// > **Important**: Each individual call to `write` corresponds to one message. There is no
+	/// >                internal buffering going on. In the context of WebSockets, each `write`
+	/// >                must be one individual WebSockets frame.
+	pub fn new(
+		buffer_size: Option<usize>,
+		telemetry_external_transport: Option<ExtTransport>,
+	) -> io::Result<(Self, TelemetryWorker)> {
+		let transport = initialize_transport(telemetry_external_transport)?;
+		let worker = TelemetryWorker::new(buffer_size.unwrap_or(16), transport);
+		let sender = worker.message_sender();
+		Ok((Self(Mutex::new(sender)), worker))
+	}
+}
+
+impl<S> Layer<S> for TelemetryLayer
+where
+	S: Subscriber + for<'a> LookupSpan<'a>,
+{
+	fn on_event(&self, event: &Event<'_>, ctx: Context<S>) {
+		if event.metadata().target() != TELEMETRY_LOG_SPAN {
+			return;
+		}
+
+		if let Some(span) = ctx.lookup_current() {
+			let parents = span.parents();
+
+			if let Some(span) = std::iter::once(span)
+				.chain(parents)
+				.find(|x| x.name() == TELEMETRY_LOG_SPAN)
+			{
+				let id = span.id();
+				let mut attrs = TelemetryAttrs::new(id.clone());
+				let mut vis = TelemetryAttrsVisitor(&mut attrs);
+				event.record(&mut vis);
+
+				if let TelemetryAttrs {
+					verbosity: Some(verbosity),
+					json: Some(json),
+					..
+				} = attrs
+				{
+					match self.0.lock().try_send((
+						id,
+						verbosity
+							.try_into()
+							.expect("telemetry log message verbosity are u8; qed"),
+						json,
+					)) {
+						Err(err) if err.is_full() => eprintln!("Telemetry buffer overflowed!"),
+						_ => {}
+					}
+				} else {
+					// NOTE: logging in this function doesn't work
+					eprintln!(
+						"missing fields in telemetry log: {:?}. This can happen if \
+						`tracing::info_span!` is (mis-)used with the telemetry target \
+						directly; you should use the `telemetry!` macro.",
+						event,
+					);
+				}
+			}
+		}
+	}
+}
+
+#[derive(Debug)]
+struct TelemetryAttrs {
+	verbosity: Option<u64>,
+	json: Option<String>,
+	id: Id,
+}
+
+impl TelemetryAttrs {
+	fn new(id: Id) -> Self {
+		Self {
+			verbosity: None,
+			json: None,
+			id,
+		}
+	}
+}
+
+#[derive(Debug)]
+struct TelemetryAttrsVisitor<'a>(&'a mut TelemetryAttrs);
+
+impl<'a> tracing::field::Visit for TelemetryAttrsVisitor<'a> {
+	fn record_debug(&mut self, _field: &tracing::field::Field, _value: &dyn std::fmt::Debug) {
+		// noop
+	}
+
+	fn record_u64(&mut self, field: &tracing::field::Field, value: u64) {
+		if field.name() == "verbosity" {
+			(*self.0).verbosity = Some(value);
+		}
+	}
+
+	fn record_str(&mut self, field: &tracing::field::Field, value: &str) {
+		if field.name() == "json" {
+			(*self.0).json = Some(format!(
+				r#"{{"id":{},"ts":{:?},"payload":{}}}"#,
+				self.0.id.into_u64(),
+				chrono::Local::now().to_rfc3339().to_string(),
+				value,
+			));
+		}
+	}
+}
diff --git a/client/telemetry/src/lib.rs b/client/telemetry/src/lib.rs
index 58c9fe73b28c..6a4533bb7bc4 100644
--- a/client/telemetry/src/lib.rs
+++ b/client/telemetry/src/lib.rs
@@ -16,339 +16,472 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-//! Telemetry utilities.
+//! Substrate's client telemetry is a part of substrate that allows logging telemetry information
+//! with a [Polkadot telemetry](https://github.com/paritytech/substrate-telemetry).
 //!
-//! Calling `init_telemetry` registers a global `slog` logger using `slog_scope::set_global_logger`.
-//! After that, calling `slog_scope::with_logger` will return a logger that sends information to
-//! the telemetry endpoints. The `telemetry!` macro is a short-cut for calling
-//! `slog_scope::with_logger` followed with `slog_log!`.
+//! It works using Tokio's [tracing](https://github.com/tokio-rs/tracing/). The telemetry
+//! information uses tracing's logging to report the telemetry which is then retrieved by a
+//! tracing's `Layer`. This layer will then send the data through an asynchronous channel and to a
+//! background task called [`TelemetryWorker`] which will send the information to the telemetry
+//! server.
 //!
-//! Note that you are supposed to only ever use `telemetry!` and not `slog_scope::with_logger` at
-//! the moment. Substrate may eventually be reworked to get proper `slog` support, including sending
-//! information to the telemetry.
-//!
-//! The [`Telemetry`] struct implements `Stream` and must be polled regularly (or sent to a
-//! background thread/task) in order for the telemetry to properly function. Dropping the object
-//! will also deregister the global logger and replace it with a logger that discards messages.
-//! The `Stream` generates [`TelemetryEvent`]s.
-//!
-//! > **Note**: Cloning the [`Telemetry`] and polling from multiple clones has an unspecified behaviour.
-//!
-//! # Example
-//!
-//! ```no_run
-//! use futures::prelude::*;
-//!
-//! let telemetry = sc_telemetry::init_telemetry(sc_telemetry::TelemetryConfig {
-//! 	endpoints: sc_telemetry::TelemetryEndpoints::new(vec![
-//! 		// The `0` is the maximum verbosity level of messages to send to this endpoint.
-//! 		("wss://example.com".into(), 0)
-//! 	]).expect("Invalid URL or multiaddr provided"),
-//! 	// Can be used to pass an external implementation of WebSockets.
-//! 	wasm_external_transport: None,
-//! });
-//!
-//! // The `telemetry` object implements `Stream` and must be processed.
-//! std::thread::spawn(move || {
-//! 	futures::executor::block_on(telemetry.for_each(|_| future::ready(())));
-//! });
-//!
-//! // Sends a message on the telemetry.
-//! sc_telemetry::telemetry!(sc_telemetry::SUBSTRATE_INFO; "test";
-//! 	"foo" => "bar",
-//! )
-//! ```
+//! If multiple substrate nodes are running, it uses a tracing's `Span` to identify which substrate
+//! node is reporting the telemetry. Every task spawned using sc-service's `TaskManager`
+//! automatically inherit this span.
 //!
+//! Substrate's nodes initialize/register to the [`TelemetryWorker`] using a [`TelemetryHandle`].
+//! This handle can be cloned and passed around. It uses an asynchronous channel to communicate with
+//! the running [`TelemetryWorker`] dedicated to registration. Registering a telemetry can happen at
+//! any point in time during the execution.
+
+#![warn(missing_docs)]
 
-use futures::{prelude::*, channel::mpsc};
-use libp2p::{Multiaddr, wasm_ext};
+use futures::{channel::mpsc, prelude::*};
+use libp2p::Multiaddr;
 use log::{error, warn};
-use parking_lot::Mutex;
-use serde::{Serialize, Deserialize, Deserializer};
-use std::{pin::Pin, sync::Arc, task::{Context, Poll}, time::Duration};
-use wasm_timer::Instant;
+use serde::Serialize;
+use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver};
+use std::collections::HashMap;
+use tracing::Id;
 
 pub use libp2p::wasm_ext::ExtTransport;
-pub use slog_scope::with_logger;
-pub use slog;
-
-mod async_record;
-mod worker;
-
-/// Configuration for telemetry.
-pub struct TelemetryConfig {
-	/// Collection of telemetry WebSocket servers with a corresponding verbosity level.
-	pub endpoints: TelemetryEndpoints,
-
-	/// Optional external implementation of a libp2p transport. Used in WASM contexts where we need
-	/// some binding between the networking provided by the operating system or environment and
-	/// libp2p.
-	///
-	/// This parameter exists whatever the target platform is, but it is expected to be set to
-	/// `Some` only when compiling for WASM.
-	///
-	/// > **Important**: Each individual call to `write` corresponds to one message. There is no
-	/// >                internal buffering going on. In the context of WebSockets, each `write`
-	/// >                must be one individual WebSockets frame.
-	pub wasm_external_transport: Option<wasm_ext::ExtTransport>,
-}
-
-/// List of telemetry servers we want to talk to. Contains the URL of the server, and the
-/// maximum verbosity level.
-///
-/// The URL string can be either a URL or a multiaddress.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-pub struct TelemetryEndpoints(
-	#[serde(deserialize_with = "url_or_multiaddr_deser")]
-	Vec<(Multiaddr, u8)>
-);
-
-/// Custom deserializer for TelemetryEndpoints, used to convert urls or multiaddr to multiaddr.
-fn url_or_multiaddr_deser<'de, D>(deserializer: D) -> Result<Vec<(Multiaddr, u8)>, D::Error>
-	where D: Deserializer<'de>
-{
-	Vec::<(String, u8)>::deserialize(deserializer)?
-		.iter()
-		.map(|e| Ok((url_to_multiaddr(&e.0)
-		.map_err(serde::de::Error::custom)?, e.1)))
-		.collect()
-}
-
-impl TelemetryEndpoints {
-	pub fn new(endpoints: Vec<(String, u8)>) -> Result<Self, libp2p::multiaddr::Error> {
-		let endpoints: Result<Vec<(Multiaddr, u8)>, libp2p::multiaddr::Error> = endpoints.iter()
-			.map(|e| Ok((url_to_multiaddr(&e.0)?, e.1)))
-			.collect();
-		endpoints.map(Self)
+pub use serde_json;
+pub use tracing;
+
+mod endpoints;
+mod layer;
+mod node;
+mod transport;
+
+pub use endpoints::*;
+pub use layer::*;
+use node::*;
+use transport::*;
+
+/// Substrate DEBUG log level.
+pub const SUBSTRATE_DEBUG: u8 = 9;
+/// Substrate INFO log level.
+pub const SUBSTRATE_INFO: u8 = 0;
+
+/// Consensus TRACE log level.
+pub const CONSENSUS_TRACE: u8 = 9;
+/// Consensus DEBUG log level.
+pub const CONSENSUS_DEBUG: u8 = 5;
+/// Consensus WARN log level.
+pub const CONSENSUS_WARN: u8 = 4;
+/// Consensus INFO log level.
+pub const CONSENSUS_INFO: u8 = 1;
+
+pub(crate) type TelemetryMessage = (Id, u8, String);
+
+/// A handle representing a telemetry span, with the capability to enter the span if it exists.
+#[derive(Debug, Clone)]
+pub struct TelemetrySpan(tracing::Span);
+
+impl TelemetrySpan {
+	/// Enters this span, returning a guard that will exit the span when dropped.
+	pub fn enter(&self) -> tracing::span::Entered {
+		self.0.enter()
 	}
-}
 
-impl TelemetryEndpoints {
-	/// Return `true` if there are no telemetry endpoints, `false` otherwise.
-	pub fn is_empty(&self) -> bool {
-		self.0.is_empty()
+	/// Constructs a new [`TelemetrySpan`].
+	pub fn new() -> Self {
+		Self(tracing::info_span!(TELEMETRY_LOG_SPAN))
 	}
 }
 
-/// Parses a WebSocket URL into a libp2p `Multiaddr`.
-fn url_to_multiaddr(url: &str) -> Result<Multiaddr, libp2p::multiaddr::Error> {
-	// First, assume that we have a `Multiaddr`.
-	let parse_error = match url.parse() {
-		Ok(ma) => return Ok(ma),
-		Err(err) => err,
-	};
-
-	// If not, try the `ws://path/url` format.
-	if let Ok(ma) = libp2p::multiaddr::from_url(url) {
-		return Ok(ma)
-	}
-
-	// If we have no clue about the format of that string, assume that we were expecting a
-	// `Multiaddr`.
-	Err(parse_error)
+/// Message sent when the connection (re-)establishes.
+#[derive(Debug, Serialize)]
+pub struct ConnectionMessage {
+	/// Node's name.
+	pub name: String,
+	/// Node's implementation.
+	pub implementation: String,
+	/// Node's version.
+	pub version: String,
+	/// Node's configuration.
+	pub config: String,
+	/// Node's chain.
+	pub chain: String,
+	/// Node's genesis hash.
+	pub genesis_hash: String,
+	/// Node is an authority.
+	pub authority: bool,
+	/// Node's startup time.
+	pub startup_time: String,
+	/// Node's network ID.
+	pub network_id: String,
 }
 
-/// Log levels.
-pub const SUBSTRATE_DEBUG: &str = "9";
-pub const SUBSTRATE_INFO: &str = "0";
-
-pub const CONSENSUS_TRACE: &str = "9";
-pub const CONSENSUS_DEBUG: &str = "5";
-pub const CONSENSUS_WARN: &str = "4";
-pub const CONSENSUS_INFO: &str = "1";
-
-/// Telemetry object. Implements `Future` and must be polled regularly.
-/// Contains an `Arc` and can be cloned and pass around. Only one clone needs to be polled
-/// regularly and should be polled regularly.
-/// Dropping all the clones unregisters the telemetry.
-#[derive(Clone)]
-pub struct Telemetry {
-	inner: Arc<Mutex<TelemetryInner>>,
-	/// Slog guard so that we don't get deregistered.
-	_guard: Arc<slog_scope::GlobalLoggerGuard>,
-}
-
-/// Behind the `Mutex` in `Telemetry`.
+/// Telemetry worker.
 ///
-/// Note that ideally we wouldn't have to make the `Telemetry` cloneable, as that would remove the
-/// need for a `Mutex`. However there is currently a weird hack in place in `sc-service`
-/// where we extract the telemetry registration so that it continues running during the shutdown
-/// process.
-struct TelemetryInner {
-	/// Worker for the telemetry. `None` if it failed to initialize.
-	worker: Option<worker::TelemetryWorker>,
-	/// Receives log entries for them to be dispatched to the worker.
-	receiver: mpsc::Receiver<async_record::AsyncRecord>,
+/// It should be ran as a background task using the [`TelemetryWorker::run`] method. This method
+/// will consume the object and any further attempts of initializing a new telemetry through its
+/// handle will fail (without being fatal).
+#[derive(Debug)]
+pub struct TelemetryWorker {
+	message_receiver: mpsc::Receiver<TelemetryMessage>,
+	message_sender: mpsc::Sender<TelemetryMessage>,
+	register_receiver: mpsc::UnboundedReceiver<Register>,
+	register_sender: mpsc::UnboundedSender<Register>,
+	transport: WsTrans,
 }
 
-/// Implements `slog::Drain`.
-struct TelemetryDrain {
-	/// Sends log entries.
-	sender: std::panic::AssertUnwindSafe<mpsc::Sender<async_record::AsyncRecord>>,
-}
+impl TelemetryWorker {
+	pub(crate) fn new(buffer_size: usize, transport: WsTrans) -> Self {
+		let (message_sender, message_receiver) = mpsc::channel(buffer_size);
+		let (register_sender, register_receiver) = mpsc::unbounded();
+
+		Self {
+			message_receiver,
+			message_sender,
+			register_receiver,
+			register_sender,
+			transport,
+		}
+	}
 
-/// Initializes the telemetry. See the crate root documentation for more information.
-///
-/// Please be careful to not call this function twice in the same program. The `slog` crate
-/// doesn't provide any way of knowing whether a global logger has already been registered.
-pub fn init_telemetry(config: TelemetryConfig) -> Telemetry {
-	// Build the list of telemetry endpoints.
-	let (endpoints, wasm_external_transport) = (config.endpoints.0, config.wasm_external_transport);
-
-	let (sender, receiver) = mpsc::channel(16);
-	let guard = {
-		let logger = TelemetryDrain { sender: std::panic::AssertUnwindSafe(sender) };
-		let root = slog::Logger::root(slog::Drain::fuse(logger), slog::o!());
-		slog_scope::set_global_logger(root)
-	};
-
-	let worker = match worker::TelemetryWorker::new(endpoints, wasm_external_transport) {
-		Ok(w) => Some(w),
-		Err(err) => {
-			error!(target: "telemetry", "Failed to initialize telemetry worker: {:?}", err);
-			None
+	/// Get a new [`TelemetryHandle`].
+	///
+	/// This is used when you want to register a new telemetry for a Substrate node.
+	pub fn handle(&self) -> TelemetryHandle {
+		TelemetryHandle {
+			message_sender: self.register_sender.clone(),
 		}
-	};
+	}
 
-	Telemetry {
-		inner: Arc::new(Mutex::new(TelemetryInner {
-			worker,
-			receiver,
-		})),
-		_guard: Arc::new(guard),
+	/// Get a clone of the channel's `Sender` used to send telemetry events.
+	pub(crate) fn message_sender(&self) -> mpsc::Sender<TelemetryMessage> {
+		self.message_sender.clone()
 	}
-}
 
-/// Event generated when polling the worker.
-#[derive(Debug)]
-pub enum TelemetryEvent {
-	/// We have established a connection to one of the telemetry endpoint, either for the first
-	/// time or after having been disconnected earlier.
-	Connected,
-}
+	/// Run the telemetry worker.
+	///
+	/// This should be run in a background task.
+	pub async fn run(self) {
+		let Self {
+			mut message_receiver,
+			message_sender: _,
+			mut register_receiver,
+			register_sender: _,
+			transport,
+		} = self;
+
+		let mut node_map: HashMap<Id, Vec<(u8, Multiaddr)>> = HashMap::new();
+		let mut node_pool: HashMap<Multiaddr, _> = HashMap::new();
 
-impl Stream for Telemetry {
-	type Item = TelemetryEvent;
-
-	fn poll_next(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Option<Self::Item>> {
-		let before = Instant::now();
-
-		// Because the `Telemetry` is cloneable, we need to put the actual fields behind a `Mutex`.
-		// However, the user is only ever supposed to poll from one instance of `Telemetry`, while
-		// the other instances are used only for RAII purposes.
-		// We assume that the user is following this advice and therefore that the `Mutex` is only
-		// ever locked once at a time.
-		let mut inner = match self.inner.try_lock() {
-			Some(l) => l,
-			None => {
-				warn!(
-					target: "telemetry",
-					"The telemetry seems to be polled multiple times simultaneously"
-				);
-				// Returning `Pending` here means that we may never get polled again, but this is
-				// ok because we're in a situation where something else is actually currently doing
-				// the polling.
-				return Poll::Pending;
+		loop {
+			futures::select! {
+				message = message_receiver.next() => Self::process_message(
+					message,
+					&mut node_pool,
+					&node_map,
+				).await,
+				init_payload = register_receiver.next() => Self::process_register(
+					init_payload,
+					&mut node_pool,
+					&mut node_map,
+					transport.clone(),
+				).await,
 			}
-		};
-
-		let mut has_connected = false;
+		}
+	}
 
-		// The polling pattern is: poll the worker so that it processes its queue, then add one
-		// message from the receiver (if possible), then poll the worker again, and so on.
-		loop {
-			if let Some(worker) = inner.worker.as_mut() {
-				while let Poll::Ready(event) = worker.poll(cx) {
-					// Right now we only have one possible event. This line is here in order to not
-					// forget to handle any possible new event type.
-					let worker::TelemetryWorkerEvent::Connected = event;
-					has_connected = true;
+	async fn process_register(
+		input: Option<Register>,
+		node_pool: &mut HashMap<Multiaddr, Node<WsTrans>>,
+		node_map: &mut HashMap<Id, Vec<(u8, Multiaddr)>>,
+		transport: WsTrans,
+	) {
+		let input = input.expect("the stream is never closed; qed");
+
+		match input {
+			Register::Telemetry {
+				id,
+				endpoints,
+				connection_message,
+			} => {
+				let endpoints = endpoints.0;
+
+				let connection_message = match serde_json::to_value(&connection_message) {
+					Ok(serde_json::Value::Object(mut value)) => {
+						value.insert("msg".into(), "system.connected".into());
+						let mut obj = serde_json::Map::new();
+						obj.insert("id".to_string(), id.into_u64().into());
+						obj.insert("payload".to_string(), value.into());
+						Some(obj)
+					}
+					Ok(_) => {
+						unreachable!("ConnectionMessage always serialize to an object; qed")
+					}
+					Err(err) => {
+						log::error!(
+							target: "telemetry",
+							"Could not serialize connection message: {}",
+							err,
+						);
+						None
+					}
+				};
+
+				for (addr, verbosity) in endpoints {
+					node_map
+						.entry(id.clone())
+						.or_default()
+						.push((verbosity, addr.clone()));
+
+					let node = node_pool.entry(addr.clone()).or_insert_with(|| {
+						Node::new(transport.clone(), addr.clone(), Vec::new(), Vec::new())
+					});
+
+					node.connection_messages.extend(connection_message.clone());
 				}
 			}
-
-			if let Poll::Ready(Some(log_entry)) = Stream::poll_next(Pin::new(&mut inner.receiver), cx) {
-				if let Some(worker) = inner.worker.as_mut() {
-					log_entry.as_record_values(|rec, val| { let _ = worker.log(rec, val); });
+			Register::Notifier {
+				addresses,
+				connection_notifier,
+			} => {
+				for addr in addresses {
+					if let Some(node) = node_pool.get_mut(&addr) {
+						node.telemetry_connection_notifier
+							.push(connection_notifier.clone());
+					} else {
+						log::error!(
+							target: "telemetry",
+							"Received connection notifier for unknown node ({}). This is a bug.",
+							addr,
+						);
+					}
 				}
-			} else {
-				break;
 			}
 		}
+	}
 
-		if before.elapsed() > Duration::from_millis(200) {
-			warn!(target: "telemetry", "Polling the telemetry took more than 200ms");
-		}
+	// dispatch messages to the telemetry nodes
+	async fn process_message(
+		input: Option<TelemetryMessage>,
+		node_pool: &mut HashMap<Multiaddr, Node<WsTrans>>,
+		node_map: &HashMap<Id, Vec<(u8, Multiaddr)>>,
+	) {
+		let (id, verbosity, message) = input.expect("the stream is never closed; qed");
 
-		if has_connected {
-			Poll::Ready(Some(TelemetryEvent::Connected))
+		let nodes = if let Some(nodes) = node_map.get(&id) {
+			nodes
 		} else {
-			Poll::Pending
+			// This is a normal error because the telemetry span is entered before the telemetry
+			// is initialized so it is possible that some messages in the beginning don't get
+			// through.
+			log::trace!(
+				target: "telemetry",
+				"Received telemetry log for unknown id ({:?}): {}",
+				id,
+				message,
+			);
+			return;
+		};
+
+		for (node_max_verbosity, addr) in nodes {
+			if verbosity > *node_max_verbosity {
+				log::trace!(
+					target: "telemetry",
+					"Skipping {} for log entry with verbosity {:?}",
+					addr,
+					verbosity,
+				);
+				continue;
+			}
+
+			if let Some(node) = node_pool.get_mut(&addr) {
+				let _ = node.send(message.clone()).await;
+			} else {
+				log::error!(
+					target: "telemetry",
+					"Received message for unknown node ({}). This is a bug. \
+					Message sent: {}",
+					addr,
+					message,
+				);
+			}
 		}
 	}
 }
 
-impl slog::Drain for TelemetryDrain {
-	type Ok = ();
-	type Err = ();
-
-	fn log(&self, record: &slog::Record, values: &slog::OwnedKVList) -> Result<Self::Ok, Self::Err> {
-		let before = Instant::now();
+/// Handle to the [`TelemetryWorker`] thats allows initializing the telemetry for a Substrate node.
+#[derive(Debug, Clone)]
+pub struct TelemetryHandle {
+	message_sender: mpsc::UnboundedSender<Register>,
+}
 
-		let serialized = async_record::AsyncRecord::from(record, values);
-		// Note: interestingly, `try_send` requires a `&mut` because it modifies some internal value, while `clone()`
-		// is lock-free.
-		if let Err(err) = self.sender.clone().try_send(serialized) {
-			warn!(target: "telemetry", "Ignored telemetry message because of error on channel: {:?}", err);
-		}
+impl TelemetryHandle {
+	/// Initialize the telemetry with the endpoints provided in argument for the current substrate
+	/// node.
+	///
+	/// This method must be called during the substrate node initialization.
+	///
+	/// The `endpoints` argument is a collection of telemetry WebSocket servers with a corresponding
+	/// verbosity level.
+	///
+	/// The `connection_message` argument is a JSON object that is sent every time the connection
+	/// (re-)establishes.
+	pub fn start_telemetry(
+		&mut self,
+		span: TelemetrySpan,
+		endpoints: TelemetryEndpoints,
+		connection_message: ConnectionMessage,
+	) -> TelemetryConnectionNotifier {
+		let Self { message_sender } = self;
+
+		let connection_notifier = TelemetryConnectionNotifier {
+			message_sender: message_sender.clone(),
+			addresses: endpoints.0.iter().map(|(addr, _)| addr.clone()).collect(),
+		};
 
-		if before.elapsed() > Duration::from_millis(50) {
-			warn!(target: "telemetry", "Writing a telemetry log took more than 50ms");
+		match span.0.id() {
+			Some(id) => {
+				match message_sender.unbounded_send(Register::Telemetry {
+					id,
+					endpoints,
+					connection_message,
+				}) {
+					Ok(()) => {}
+					Err(err) => error!(
+						target: "telemetry",
+						"Could not initialize telemetry: \
+						the telemetry is probably already running: {}",
+						err,
+					),
+				}
+			}
+			None => error!(
+				target: "telemetry",
+				"Could not initialize telemetry: the span could not be entered",
+			),
 		}
 
-		Ok(())
+		connection_notifier
 	}
 }
 
-/// Translates to `slog_scope::info`, but contains an additional verbosity
-/// parameter which the log record is tagged with. Additionally the verbosity
-/// parameter is added to the record as a key-value pair.
-#[macro_export]
-macro_rules! telemetry {
-	 ( $a:expr; $b:expr; $( $t:tt )* ) => {
-		$crate::with_logger(|l| {
-			$crate::slog::slog_info!(l, #$a, $b; $($t)* )
-		})
-	}
+/// Used to create a stream of events with only one event: when a telemetry connection
+/// (re-)establishes.
+#[derive(Clone, Debug)]
+pub struct TelemetryConnectionNotifier {
+	message_sender: mpsc::UnboundedSender<Register>,
+	addresses: Vec<Multiaddr>,
 }
 
-#[cfg(test)]
-mod telemetry_endpoints_tests {
-	use libp2p::Multiaddr;
-	use super::TelemetryEndpoints;
-	use super::url_to_multiaddr;
-
-	#[test]
-	fn valid_endpoints() {
-		let endp = vec![("wss://telemetry.polkadot.io/submit/".into(), 3), ("/ip4/80.123.90.4/tcp/5432".into(), 4)];
-		let telem = TelemetryEndpoints::new(endp.clone()).expect("Telemetry endpoint should be valid");
-		let mut res: Vec<(Multiaddr, u8)> = vec![];
-		for (a, b) in endp.iter() {
-			res.push((url_to_multiaddr(a).expect("provided url should be valid"), *b))
+impl TelemetryConnectionNotifier {
+	/// Get event stream for telemetry connection established events.
+	///
+	/// This function will return an error if the telemetry has already been started by
+	/// [`TelemetryHandle::start_telemetry`].
+	pub fn on_connect_stream(&self) -> TracingUnboundedReceiver<()> {
+		let (message_sender, message_receiver) = tracing_unbounded("mpsc_telemetry_on_connect");
+		if let Err(err) = self.message_sender.unbounded_send(Register::Notifier {
+			addresses: self.addresses.clone(),
+			connection_notifier: message_sender,
+		}) {
+			error!(
+				target: "telemetry",
+				"Could not create a telemetry connection notifier: \
+				the telemetry is probably already running: {}",
+				err,
+			);
 		}
-		assert_eq!(telem.0, res);
+		message_receiver
 	}
+}
 
-	#[test]
-	fn invalid_endpoints() {
-		let endp = vec![("/ip4/...80.123.90.4/tcp/5432".into(), 3), ("/ip4/no:!?;rlkqre;;::::///tcp/5432".into(), 4)];
-		let telem = TelemetryEndpoints::new(endp);
-		assert!(telem.is_err());
-	}
+#[derive(Debug)]
+enum Register {
+	Telemetry {
+		id: Id,
+		endpoints: TelemetryEndpoints,
+		connection_message: ConnectionMessage,
+	},
+	Notifier {
+		addresses: Vec<Multiaddr>,
+		connection_notifier: ConnectionNotifierSender,
+	},
+}
 
-	#[test]
-	fn valid_and_invalid_endpoints() {
-		let endp = vec![("/ip4/80.123.90.4/tcp/5432".into(), 3), ("/ip4/no:!?;rlkqre;;::::///tcp/5432".into(), 4)];
-		let telem = TelemetryEndpoints::new(endp);
-		assert!(telem.is_err());
-	}
+/// Report a telemetry.
+///
+/// Translates to [`tracing::info`], but contains an additional verbosity parameter which the log
+/// record is tagged with. Additionally the verbosity parameter is added to the record as a
+/// key-value pair.
+///
+/// # Example
+///
+/// ```no_run
+/// # use sc_telemetry::*;
+/// # let authority_id = 42_u64;
+/// # let set_id = (43_u64, 44_u64);
+/// # let authorities = vec![45_u64];
+/// telemetry!(CONSENSUS_INFO; "afg.authority_set";
+/// 	"authority_id" => authority_id.to_string(),
+/// 	"authority_set_id" => ?set_id,
+/// 	"authorities" => authorities,
+/// );
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! telemetry {
+	( $verbosity:expr; $msg:expr; $( $t:tt )* ) => {{
+		let verbosity: u8 = $verbosity;
+		match format_fields_to_json!($($t)*) {
+			Err(err) => {
+				$crate::tracing::error!(
+					target: "telemetry",
+					"Could not serialize value for telemetry: {}",
+					err,
+				);
+			},
+			Ok(mut json) => {
+				// NOTE: the span id will be added later in the JSON for the greater good
+				json.insert("msg".into(), $msg.into());
+				let serialized_json = $crate::serde_json::to_string(&json)
+					.expect("contains only string keys; qed");
+				$crate::tracing::info!(target: $crate::TELEMETRY_LOG_SPAN,
+					verbosity,
+					json = serialized_json.as_str(),
+				);
+			},
+		}
+	}};
+}
+
+#[macro_export(local_inner_macros)]
+#[doc(hidden)]
+macro_rules! format_fields_to_json {
+	( $k:literal => $v:expr $(,)? $(, $($t:tt)+ )? ) => {{
+		$crate::serde_json::to_value(&$v)
+			.map(|value| {
+				let mut map = $crate::serde_json::Map::new();
+				map.insert($k.into(), value);
+				map
+			})
+			$(
+				.and_then(|mut prev_map| {
+					format_fields_to_json!($($t)*)
+						.map(move |mut other_map| {
+							prev_map.append(&mut other_map);
+							prev_map
+						})
+				})
+			)*
+	}};
+	( $k:literal => ? $v:expr $(,)? $(, $($t:tt)+ )? ) => {{
+		let mut map = $crate::serde_json::Map::new();
+		map.insert($k.into(), std::format!("{:?}", &$v).into());
+		$crate::serde_json::Result::Ok(map)
+		$(
+			.and_then(|mut prev_map| {
+				format_fields_to_json!($($t)*)
+					.map(move |mut other_map| {
+						prev_map.append(&mut other_map);
+						prev_map
+					})
+			})
+		)*
+	}};
 }
diff --git a/client/telemetry/src/node.rs b/client/telemetry/src/node.rs
new file mode 100644
index 000000000000..e47bc2f9634f
--- /dev/null
+++ b/client/telemetry/src/node.rs
@@ -0,0 +1,286 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+use futures::prelude::*;
+use libp2p::core::transport::Transport;
+use libp2p::Multiaddr;
+use rand::Rng as _;
+use std::{fmt, mem, pin::Pin, task::Context, task::Poll, time::Duration};
+use wasm_timer::Delay;
+
+pub(crate) type ConnectionNotifierSender = sp_utils::mpsc::TracingUnboundedSender<()>;
+
+/// Handler for a single telemetry node.
+///
+/// This is a wrapper `Sink` around a network `Sink` with 3 particularities:
+///  -  It is infallible: if the connection stops, it will reconnect automatically when the server
+///     becomes available again.
+///  -  It holds a list of "connection messages" which are sent automatically when the connection is
+///     (re-)established. This is used for the "system.connected" message that needs to be send for
+///     every substrate node that connects.
+///  -  It doesn't stay in pending while waiting for connection. Instead, it moves data into the
+///     void if the connection could not be established. This is important for the `Dispatcher`
+///     `Sink` which we don't want to block if one connection is broken.
+#[derive(Debug)]
+pub(crate) struct Node<TTrans: Transport> {
+	/// Address of the node.
+	addr: Multiaddr,
+	/// State of the connection.
+	socket: NodeSocket<TTrans>,
+	/// Transport used to establish new connections.
+	transport: TTrans,
+	/// Messages that are sent when the connection (re-)establishes.
+	pub(crate) connection_messages: Vec<serde_json::Map<String, serde_json::Value>>,
+	/// Notifier for when the connection (re-)establishes.
+	pub(crate) telemetry_connection_notifier: Vec<ConnectionNotifierSender>,
+}
+
+enum NodeSocket<TTrans: Transport> {
+	/// We're connected to the node. This is the normal state.
+	Connected(NodeSocketConnected<TTrans>),
+	/// We are currently dialing the node.
+	Dialing(TTrans::Dial),
+	/// A new connection should be started as soon as possible.
+	ReconnectNow,
+	/// Waiting before attempting to dial again.
+	WaitingReconnect(Delay),
+	/// Temporary transition state.
+	Poisoned,
+}
+
+impl<TTrans: Transport> NodeSocket<TTrans> {
+	fn wait_reconnect() -> NodeSocket<TTrans> {
+		let random_delay = rand::thread_rng().gen_range(5, 10);
+		let delay = Delay::new(Duration::from_secs(random_delay));
+		NodeSocket::WaitingReconnect(delay)
+	}
+}
+
+struct NodeSocketConnected<TTrans: Transport> {
+	/// Where to send data.
+	sink: TTrans::Output,
+	/// Queue of packets to send before accepting new packets.
+	buf: Vec<Vec<u8>>,
+}
+
+impl<TTrans: Transport> Node<TTrans> {
+	/// Builds a new node handler.
+	pub(crate) fn new(
+		transport: TTrans,
+		addr: Multiaddr,
+		connection_messages: Vec<serde_json::Map<String, serde_json::Value>>,
+		telemetry_connection_notifier: Vec<ConnectionNotifierSender>,
+	) -> Self {
+		Node {
+			addr,
+			socket: NodeSocket::ReconnectNow,
+			transport,
+			connection_messages,
+			telemetry_connection_notifier,
+		}
+	}
+}
+
+impl<TTrans: Transport, TSinkErr> Node<TTrans>
+where
+	TTrans: Clone + Unpin,
+	TTrans::Dial: Unpin,
+	TTrans::Output:
+		Sink<Vec<u8>, Error = TSinkErr> + Stream<Item = Result<Vec<u8>, TSinkErr>> + Unpin,
+	TSinkErr: fmt::Debug,
+{
+	// NOTE: this code has been inspired from `Buffer` (`futures_util::sink::Buffer`).
+	//       https://docs.rs/futures-util/0.3.8/src/futures_util/sink/buffer.rs.html#32
+	fn try_send_connection_messages(
+		self: Pin<&mut Self>,
+		cx: &mut Context<'_>,
+		conn: &mut NodeSocketConnected<TTrans>,
+	) -> Poll<Result<(), TSinkErr>> {
+		while let Some(item) = conn.buf.pop() {
+			if let Err(e) = conn.sink.start_send_unpin(item) {
+				return Poll::Ready(Err(e));
+			}
+			futures::ready!(conn.sink.poll_ready_unpin(cx))?;
+		}
+		Poll::Ready(Ok(()))
+	}
+}
+
+pub(crate) enum Infallible {}
+
+impl<TTrans: Transport, TSinkErr> Sink<String> for Node<TTrans>
+where
+	TTrans: Clone + Unpin,
+	TTrans::Dial: Unpin,
+	TTrans::Output:
+		Sink<Vec<u8>, Error = TSinkErr> + Stream<Item = Result<Vec<u8>, TSinkErr>> + Unpin,
+	TSinkErr: fmt::Debug,
+{
+	type Error = Infallible;
+
+	fn poll_ready(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Result<(), Self::Error>> {
+		let mut socket = mem::replace(&mut self.socket, NodeSocket::Poisoned);
+		self.socket = loop {
+			match socket {
+				NodeSocket::Connected(mut conn) => match conn.sink.poll_ready_unpin(cx) {
+					Poll::Ready(Ok(())) => {
+						match self.as_mut().try_send_connection_messages(cx, &mut conn) {
+							Poll::Ready(Err(err)) => {
+								log::warn!(target: "telemetry", "⚠️  Disconnected from {}: {:?}", self.addr, err);
+								socket = NodeSocket::wait_reconnect();
+							}
+							Poll::Ready(Ok(())) => {
+								self.socket = NodeSocket::Connected(conn);
+								return Poll::Ready(Ok(()));
+							}
+							Poll::Pending => {
+								self.socket = NodeSocket::Connected(conn);
+								return Poll::Pending;
+							}
+						}
+					}
+					Poll::Ready(Err(err)) => {
+						log::warn!(target: "telemetry", "⚠️  Disconnected from {}: {:?}", self.addr, err);
+						socket = NodeSocket::wait_reconnect();
+					}
+					Poll::Pending => {
+						self.socket = NodeSocket::Connected(conn);
+						return Poll::Pending;
+					}
+				},
+				NodeSocket::Dialing(mut s) => match Future::poll(Pin::new(&mut s), cx) {
+					Poll::Ready(Ok(sink)) => {
+						log::debug!(target: "telemetry", "✅ Connected to {}", self.addr);
+
+						for sender in self.telemetry_connection_notifier.iter_mut() {
+							let _ = sender.send(());
+						}
+
+						let buf = self
+							.connection_messages
+							.iter()
+							.map(|json| {
+								let mut json = json.clone();
+								json.insert(
+									"ts".to_string(),
+									chrono::Local::now().to_rfc3339().into(),
+								);
+								json
+							})
+							.filter_map(|json| match serde_json::to_vec(&json) {
+								Ok(message) => Some(message),
+								Err(err) => {
+									log::error!(
+										target: "telemetry",
+										"An error occurred while generating new connection \
+										messages: {}",
+										err,
+									);
+									None
+								}
+							})
+							.collect();
+
+						socket = NodeSocket::Connected(NodeSocketConnected { sink, buf });
+					}
+					Poll::Pending => break NodeSocket::Dialing(s),
+					Poll::Ready(Err(err)) => {
+						log::warn!(target: "telemetry", "❌ Error while dialing {}: {:?}", self.addr, err);
+						socket = NodeSocket::wait_reconnect();
+					}
+				},
+				NodeSocket::ReconnectNow => match self.transport.clone().dial(self.addr.clone()) {
+					Ok(d) => {
+						log::debug!(target: "telemetry", "Started dialing {}", self.addr);
+						socket = NodeSocket::Dialing(d);
+					}
+					Err(err) => {
+						log::warn!(target: "telemetry", "❌ Error while dialing {}: {:?}", self.addr, err);
+						socket = NodeSocket::wait_reconnect();
+					}
+				},
+				NodeSocket::WaitingReconnect(mut s) => {
+					if let Poll::Ready(_) = Future::poll(Pin::new(&mut s), cx) {
+						socket = NodeSocket::ReconnectNow;
+					} else {
+						break NodeSocket::WaitingReconnect(s);
+					}
+				}
+				NodeSocket::Poisoned => {
+					log::error!(target: "telemetry", "‼️ Poisoned connection with {}", self.addr);
+					break NodeSocket::Poisoned;
+				}
+			}
+		};
+
+		// The Dispatcher blocks when the Node sinks blocks. This is why it is important that the
+		// Node sinks doesn't go into "Pending" state while waiting for reconnection but rather
+		// discard the excess of telemetry messages.
+		Poll::Ready(Ok(()))
+	}
+
+	fn start_send(mut self: Pin<&mut Self>, item: String) -> Result<(), Self::Error> {
+		match &mut self.socket {
+			NodeSocket::Connected(conn) => {
+				let _ = conn.sink.start_send_unpin(item.into()).expect("boo");
+			}
+			_socket => {
+				log::trace!(
+					target: "telemetry",
+					"Message has been discarded: {}",
+					item,
+				);
+			}
+		}
+		Ok(())
+	}
+
+	fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+		match &mut self.socket {
+			NodeSocket::Connected(conn) => match conn.sink.poll_flush_unpin(cx) {
+				Poll::Ready(Err(_)) => {
+					self.socket = NodeSocket::wait_reconnect();
+					Poll::Ready(Ok(()))
+				}
+				Poll::Ready(Ok(())) => Poll::Ready(Ok(())),
+				Poll::Pending => Poll::Pending,
+			},
+			_ => Poll::Ready(Ok(())),
+		}
+	}
+
+	fn poll_close(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+		match &mut self.socket {
+			NodeSocket::Connected(conn) => conn.sink.poll_close_unpin(cx).map(|_| Ok(())),
+			_ => Poll::Ready(Ok(())),
+		}
+	}
+}
+
+impl<TTrans: Transport> fmt::Debug for NodeSocket<TTrans> {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+		use NodeSocket::*;
+		f.write_str(match self {
+			Connected(_) => "Connected",
+			Dialing(_) => "Dialing",
+			ReconnectNow => "ReconnectNow",
+			WaitingReconnect(_) => "WaitingReconnect",
+			Poisoned => "Poisoned",
+		})
+	}
+}
diff --git a/client/telemetry/src/transport.rs b/client/telemetry/src/transport.rs
new file mode 100644
index 000000000000..e32a29d9a950
--- /dev/null
+++ b/client/telemetry/src/transport.rs
@@ -0,0 +1,163 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+use futures::{
+	prelude::*,
+	ready,
+	task::{Context, Poll},
+};
+use libp2p::{
+	core::transport::{timeout::TransportTimeout, OptionalTransport},
+	wasm_ext, Transport,
+};
+use std::io;
+use std::pin::Pin;
+use std::time::Duration;
+
+/// Timeout after which a connection attempt is considered failed. Includes the WebSocket HTTP
+/// upgrading.
+const CONNECT_TIMEOUT: Duration = Duration::from_secs(20);
+
+pub(crate) fn initialize_transport(
+	wasm_external_transport: Option<wasm_ext::ExtTransport>,
+) -> Result<WsTrans, io::Error> {
+	let transport = match wasm_external_transport.clone() {
+		Some(t) => OptionalTransport::some(t),
+		None => OptionalTransport::none(),
+	}
+	.map((|inner, _| StreamSink::from(inner)) as fn(_, _) -> _);
+
+	// The main transport is the `wasm_external_transport`, but if we're on desktop we add
+	// support for TCP+WebSocket+DNS as a fallback. In practice, you're not expected to pass
+	// an external transport on desktop and the fallback is used all the time.
+	#[cfg(not(target_os = "unknown"))]
+	let transport = transport.or_transport({
+		let inner = libp2p::dns::DnsConfig::new(libp2p::tcp::TcpConfig::new())?;
+		libp2p::websocket::framed::WsConfig::new(inner).and_then(|connec, _| {
+			let connec = connec
+				.with(|item| {
+					let item = libp2p::websocket::framed::OutgoingData::Binary(item);
+					future::ready(Ok::<_, io::Error>(item))
+				})
+				.try_filter(|item| future::ready(item.is_data()))
+				.map_ok(|data| data.into_bytes());
+			future::ready(Ok::<_, io::Error>(connec))
+		})
+	});
+
+	Ok(TransportTimeout::new(
+		transport.map(|out, _| {
+			let out = out
+				.map_err(|err| io::Error::new(io::ErrorKind::Other, err))
+				.sink_map_err(|err| io::Error::new(io::ErrorKind::Other, err));
+			Box::pin(out) as Pin<Box<_>>
+		}),
+		CONNECT_TIMEOUT,
+	)
+	.boxed())
+}
+
+/// A trait that implements `Stream` and `Sink`.
+pub(crate) trait StreamAndSink<I>: Stream + Sink<I> {}
+impl<T: ?Sized + Stream + Sink<I>, I> StreamAndSink<I> for T {}
+
+/// A type alias for the WebSocket transport.
+pub(crate) type WsTrans = libp2p::core::transport::Boxed<
+	Pin<
+		Box<
+			dyn StreamAndSink<Vec<u8>, Item = Result<Vec<u8>, io::Error>, Error = io::Error> + Send,
+		>,
+	>,
+>;
+
+/// Wraps around an `AsyncWrite` and implements `Sink`. Guarantees that each item being sent maps
+/// to one call of `write`.
+///
+/// For some context, we put this object around the `wasm_ext::ExtTransport` in order to make sure
+/// that each telemetry message maps to one single call to `write` in the WASM FFI.
+#[pin_project::pin_project]
+pub(crate) struct StreamSink<T>(#[pin] T, Option<Vec<u8>>);
+
+impl<T> From<T> for StreamSink<T> {
+	fn from(inner: T) -> StreamSink<T> {
+		StreamSink(inner, None)
+	}
+}
+
+impl<T: AsyncRead> Stream for StreamSink<T> {
+	type Item = Result<Vec<u8>, io::Error>;
+
+	fn poll_next(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Option<Self::Item>> {
+		let this = self.project();
+		let mut buf = vec![0; 128];
+		match ready!(AsyncRead::poll_read(this.0, cx, &mut buf)) {
+			Ok(0) => Poll::Ready(None),
+			Ok(n) => {
+				buf.truncate(n);
+				Poll::Ready(Some(Ok(buf)))
+			}
+			Err(err) => Poll::Ready(Some(Err(err))),
+		}
+	}
+}
+
+impl<T: AsyncWrite> StreamSink<T> {
+	fn poll_flush_buffer(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Result<(), io::Error>> {
+		let this = self.project();
+
+		if let Some(buffer) = this.1 {
+			if ready!(this.0.poll_write(cx, &buffer[..]))? != buffer.len() {
+				log::error!(target: "telemetry",
+					"Detected some internal buffering happening in the telemetry");
+				let err = io::Error::new(io::ErrorKind::Other, "Internal buffering detected");
+				return Poll::Ready(Err(err));
+			}
+		}
+
+		*this.1 = None;
+		Poll::Ready(Ok(()))
+	}
+}
+
+impl<T: AsyncWrite> Sink<Vec<u8>> for StreamSink<T> {
+	type Error = io::Error;
+
+	fn poll_ready(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Result<(), Self::Error>> {
+		ready!(StreamSink::poll_flush_buffer(self, cx))?;
+		Poll::Ready(Ok(()))
+	}
+
+	fn start_send(self: Pin<&mut Self>, item: Vec<u8>) -> Result<(), Self::Error> {
+		let this = self.project();
+		debug_assert!(this.1.is_none());
+		*this.1 = Some(item);
+		Ok(())
+	}
+
+	fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Result<(), Self::Error>> {
+		ready!(self.as_mut().poll_flush_buffer(cx))?;
+		let this = self.project();
+		AsyncWrite::poll_flush(this.0, cx)
+	}
+
+	fn poll_close(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Result<(), Self::Error>> {
+		ready!(self.as_mut().poll_flush_buffer(cx))?;
+		let this = self.project();
+		AsyncWrite::poll_close(this.0, cx)
+	}
+}
diff --git a/client/telemetry/src/worker.rs b/client/telemetry/src/worker.rs
deleted file mode 100644
index 158781f04335..000000000000
--- a/client/telemetry/src/worker.rs
+++ /dev/null
@@ -1,263 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-//! Contains the object that makes the telemetry work.
-//!
-//! # Usage
-//!
-//! - Create a `TelemetryWorker` with `TelemetryWorker::new`.
-//! - Send messages to the telemetry with `TelemetryWorker::send_message`. Messages will only be
-//!   sent to the appropriate targets. Messages may be ignored if the target happens to be
-//!   temporarily unreachable.
-//! - You must appropriately poll the worker with `TelemetryWorker::poll`. Polling will/may produce
-//!   events indicating what happened since the latest polling.
-//!
-
-use futures::{prelude::*, ready};
-use libp2p::{
-	core::transport::{OptionalTransport, timeout::TransportTimeout},
-	Multiaddr,
-	Transport,
-	wasm_ext
-};
-use log::{trace, warn, error};
-use slog::Drain;
-use std::{io, pin::Pin, task::Context, task::Poll, time};
-
-mod node;
-
-/// Timeout after which a connection attempt is considered failed. Includes the WebSocket HTTP
-/// upgrading.
-const CONNECT_TIMEOUT: time::Duration = time::Duration::from_secs(20);
-
-/// Event generated when polling the worker.
-#[derive(Debug)]
-pub enum TelemetryWorkerEvent {
-	/// We have established a connection to one of the telemetry endpoint, either for the first
-	/// time or after having been disconnected earlier.
-	Connected,
-}
-
-/// Telemetry processing machine.
-#[derive(Debug)]
-pub struct TelemetryWorker {
-	/// List of nodes with their maximum verbosity level.
-	nodes: Vec<(node::Node<WsTrans>, u8)>,
-}
-
-trait StreamAndSink<I>: Stream + Sink<I> {}
-impl<T: ?Sized + Stream + Sink<I>, I> StreamAndSink<I> for T {}
-
-type WsTrans = libp2p::core::transport::Boxed<
-	Pin<Box<dyn StreamAndSink<
-		Vec<u8>,
-		Item = Result<Vec<u8>, io::Error>,
-		Error = io::Error
-	> + Send>>
->;
-
-impl TelemetryWorker {
-	/// Builds a new `TelemetryWorker`.
-	///
-	/// The endpoints must be a list of targets, plus a verbosity level. When you send a message
-	/// to the telemetry, only the targets whose verbosity is higher than the verbosity of the
-	/// message will receive it.
-	pub fn new(
-		endpoints: impl IntoIterator<Item = (Multiaddr, u8)>,
-		wasm_external_transport: impl Into<Option<wasm_ext::ExtTransport>>
-	) -> Result<Self, io::Error> {
-		let transport = match wasm_external_transport.into() {
-			Some(t) => OptionalTransport::some(t),
-			None => OptionalTransport::none()
-		}.map((|inner, _| StreamSink::from(inner)) as fn(_, _) -> _);
-
-		// The main transport is the `wasm_external_transport`, but if we're on desktop we add
-		// support for TCP+WebSocket+DNS as a fallback. In practice, you're not expected to pass
-		// an external transport on desktop and the fallback is used all the time.
-		#[cfg(not(target_os = "unknown"))]
-		let transport = transport.or_transport({
-			let inner = libp2p::dns::DnsConfig::new(libp2p::tcp::TcpConfig::new())?;
-			libp2p::websocket::framed::WsConfig::new(inner)
-				.and_then(|connec, _| {
-					let connec = connec
-						.with(|item| {
-							let item = libp2p::websocket::framed::OutgoingData::Binary(item);
-							future::ready(Ok::<_, io::Error>(item))
-						})
-						.try_filter(|item| future::ready(item.is_data()))
-						.map_ok(|data| data.into_bytes());
-					future::ready(Ok::<_, io::Error>(connec))
-				})
-		});
-
-		let transport = TransportTimeout::new(
-			transport.map(|out, _| {
-				let out = out
-					.map_err(|err| io::Error::new(io::ErrorKind::Other, err))
-					.sink_map_err(|err| io::Error::new(io::ErrorKind::Other, err));
-				Box::pin(out) as Pin<Box<_>>
-			}),
-			CONNECT_TIMEOUT
-		).boxed();
-
-		Ok(TelemetryWorker {
-			nodes: endpoints.into_iter().map(|(addr, verbosity)| {
-				let node = node::Node::new(transport.clone(), addr);
-				(node, verbosity)
-			}).collect()
-		})
-	}
-
-	/// Polls the worker for events that happened.
-	pub fn poll(&mut self, cx: &mut Context) -> Poll<TelemetryWorkerEvent> {
-		for (node, _) in &mut self.nodes {
-			loop {
-				match node::Node::poll(Pin::new(node), cx) {
-					Poll::Ready(node::NodeEvent::Connected) =>
-						return Poll::Ready(TelemetryWorkerEvent::Connected),
-					Poll::Ready(node::NodeEvent::Disconnected(_)) => continue,
-					Poll::Pending => break,
-				}
-			}
-		}
-
-		Poll::Pending
-	}
-
-	/// Equivalent to `slog::Drain::log`, but takes `self` by `&mut` instead, which is more convenient.
-	///
-	/// Keep in mind that you should call `TelemetryWorker::poll` in order to process the messages.
-	/// You should call this function right after calling `slog::Drain::log`.
-	pub fn log(&mut self, record: &slog::Record, values: &slog::OwnedKVList) -> Result<(), ()> {
-		let msg_verbosity = match record.tag().parse::<u8>() {
-			Ok(v) => v,
-			Err(err) => {
-				warn!(target: "telemetry", "Failed to parse telemetry tag {:?}: {:?}",
-					record.tag(), err);
-				return Err(())
-			}
-		};
-
-		// None of the nodes want that verbosity, so just return without doing any serialization.
-		if self.nodes.iter().all(|(_, node_max_verbosity)| msg_verbosity > *node_max_verbosity) {
-			trace!(
-				target: "telemetry",
-				"Skipping log entry because verbosity {:?} is too high for all endpoints",
-				msg_verbosity
-			);
-			return Ok(())
-		}
-
-		// Turn the message into JSON.
-		let serialized = {
-			let mut out = Vec::new();
-			slog_json::Json::default(&mut out).log(record, values).map_err(|_| ())?;
-			out
-		};
-
-		for (node, node_max_verbosity) in &mut self.nodes {
-			if msg_verbosity > *node_max_verbosity {
-				trace!(target: "telemetry", "Skipping {:?} for log entry with verbosity {:?}",
-					node.addr(), msg_verbosity);
-				continue;
-			}
-
-			// `send_message` returns an error if we're not connected, which we silently ignore.
-			let _ = node.send_message(&serialized.clone()[..]);
-		}
-
-		Ok(())
-	}
-}
-
-/// Wraps around an `AsyncWrite` and implements `Sink`. Guarantees that each item being sent maps
-/// to one call of `write`.
-///
-/// For some context, we put this object around the `wasm_ext::ExtTransport` in order to make sure
-/// that each telemetry message maps to one single call to `write` in the WASM FFI.
-#[pin_project::pin_project]
-struct StreamSink<T>(#[pin] T, Option<Vec<u8>>);
-
-impl<T> From<T> for StreamSink<T> {
-	fn from(inner: T) -> StreamSink<T> {
-		StreamSink(inner, None)
-	}
-}
-
-impl<T: AsyncRead> Stream for StreamSink<T> {
-	type Item = Result<Vec<u8>, io::Error>;
-
-	fn poll_next(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Option<Self::Item>> {
-		let this = self.project();
-		let mut buf = vec![0; 128];
-		match ready!(AsyncRead::poll_read(this.0, cx, &mut buf)) {
-			Ok(0) => Poll::Ready(None),
-			Ok(n) => {
-				buf.truncate(n);
-				Poll::Ready(Some(Ok(buf)))
-			},
-			Err(err) => Poll::Ready(Some(Err(err))),
-		}
-	}
-}
-
-impl<T: AsyncWrite> StreamSink<T> {
-	fn poll_flush_buffer(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Result<(), io::Error>> {
-		let this = self.project();
-
-		if let Some(buffer) = this.1 {
-			if ready!(this.0.poll_write(cx, &buffer[..]))? != buffer.len() {
-				error!(target: "telemetry",
-					"Detected some internal buffering happening in the telemetry");
-				let err = io::Error::new(io::ErrorKind::Other, "Internal buffering detected");
-				return Poll::Ready(Err(err));
-			}
-		}
-
-		*this.1 = None;
-		Poll::Ready(Ok(()))
-	}
-}
-
-impl<T: AsyncWrite> Sink<Vec<u8>> for StreamSink<T> {
-	type Error = io::Error;
-
-	fn poll_ready(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Result<(), Self::Error>> {
-		ready!(StreamSink::poll_flush_buffer(self, cx))?;
-		Poll::Ready(Ok(()))
-	}
-
-	fn start_send(self: Pin<&mut Self>, item: Vec<u8>) -> Result<(), Self::Error> {
-		let this = self.project();
-		debug_assert!(this.1.is_none());
-		*this.1 = Some(item);
-		Ok(())
-	}
-
-	fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Result<(), Self::Error>> {
-		ready!(self.as_mut().poll_flush_buffer(cx))?;
-		let this = self.project();
-		AsyncWrite::poll_flush(this.0, cx)
-	}
-
-	fn poll_close(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Result<(), Self::Error>> {
-		ready!(self.as_mut().poll_flush_buffer(cx))?;
-		let this = self.project();
-		AsyncWrite::poll_close(this.0, cx)
-	}
-}
diff --git a/client/telemetry/src/worker/node.rs b/client/telemetry/src/worker/node.rs
deleted file mode 100644
index 5fbafde8c941..000000000000
--- a/client/telemetry/src/worker/node.rs
+++ /dev/null
@@ -1,305 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-//! Contains the `Node` struct, which handles communications with a single telemetry endpoint.
-
-use futures::prelude::*;
-use futures_timer::Delay;
-use libp2p::Multiaddr;
-use libp2p::core::transport::Transport;
-use log::{trace, debug, warn, error};
-use rand::Rng as _;
-use std::{collections::VecDeque, fmt, mem, pin::Pin, task::Context, task::Poll, time::Duration};
-
-/// Maximum number of pending telemetry messages.
-const MAX_PENDING: usize = 10;
-
-/// Handler for a single telemetry node.
-pub struct Node<TTrans: Transport> {
-	/// Address of the node.
-	addr: Multiaddr,
-	/// State of the connection.
-	socket: NodeSocket<TTrans>,
-	/// Transport used to establish new connections.
-	transport: TTrans,
-}
-
-enum NodeSocket<TTrans: Transport> {
-	/// We're connected to the node. This is the normal state.
-	Connected(NodeSocketConnected<TTrans>),
-	/// We are currently dialing the node.
-	Dialing(TTrans::Dial),
-	/// A new connection should be started as soon as possible.
-	ReconnectNow,
-	/// Waiting before attempting to dial again.
-	WaitingReconnect(Delay),
-	/// Temporary transition state.
-	Poisoned,
-}
-
-struct NodeSocketConnected<TTrans: Transport> {
-	/// Where to send data.
-	sink: TTrans::Output,
-	/// Queue of packets to send.
-	pending: VecDeque<Vec<u8>>,
-	/// If true, we need to flush the sink.
-	need_flush: bool,
-	/// A timeout for the socket to write data.
-	timeout: Option<Delay>,
-}
-
-/// Event that can happen with this node.
-#[derive(Debug)]
-pub enum NodeEvent<TSinkErr> {
-	/// We are now connected to this node.
-	Connected,
-	/// We are now disconnected from this node.
-	Disconnected(ConnectionError<TSinkErr>),
-}
-
-/// Reason for disconnecting from a node.
-#[derive(Debug)]
-pub enum ConnectionError<TSinkErr> {
-	/// The connection timed-out.
-	Timeout,
-	/// Reading from the socket returned and end-of-file, indicating that the socket has been
-	/// closed.
-	Closed,
-	/// The sink errored.
-	Sink(TSinkErr),
-}
-
-impl<TTrans: Transport> Node<TTrans> {
-	/// Builds a new node handler.
-	pub fn new(transport: TTrans, addr: Multiaddr) -> Self {
-		Node {
-			addr,
-			socket: NodeSocket::ReconnectNow,
-			transport,
-		}
-	}
-
-	/// Returns the address that was passed to `new`.
-	pub fn addr(&self) -> &Multiaddr {
-		&self.addr
-	}
-}
-
-impl<TTrans: Transport, TSinkErr> Node<TTrans>
-where TTrans: Clone + Unpin, TTrans::Dial: Unpin,
-	TTrans::Output: Sink<Vec<u8>, Error = TSinkErr>
-		+ Stream<Item=Result<Vec<u8>, TSinkErr>>
-		+ Unpin,
-	TSinkErr: fmt::Debug
-{
-	/// Sends a WebSocket frame to the node. Returns an error if we are not connected to the node.
-	///
-	/// After calling this method, you should call `poll` in order for it to be properly processed.
-	pub fn send_message(&mut self, payload: impl Into<Vec<u8>>) -> Result<(), ()> {
-		if let NodeSocket::Connected(NodeSocketConnected { pending, .. }) = &mut self.socket {
-			if pending.len() <= MAX_PENDING {
-				trace!(target: "telemetry", "Adding log entry to queue for {:?}", self.addr);
-				pending.push_back(payload.into());
-				Ok(())
-			} else {
-				warn!(target: "telemetry", "⚠️  Rejected log entry because queue is full for {:?}",
-					self.addr);
-				Err(())
-			}
-		} else {
-			Err(())
-		}
-	}
-
-	/// Polls the node for updates. Must be performed regularly.
-	pub fn poll(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<NodeEvent<TSinkErr>> {
-		let mut socket = mem::replace(&mut self.socket, NodeSocket::Poisoned);
-		self.socket = loop {
-			match socket {
-				NodeSocket::Connected(mut conn) => {
-					match NodeSocketConnected::poll(Pin::new(&mut conn), cx, &self.addr) {
-						Poll::Ready(Ok(v)) => match v {},
-						Poll::Pending => {
-							break NodeSocket::Connected(conn)
-						},
-						Poll::Ready(Err(err)) => {
-							warn!(target: "telemetry", "⚠️  Disconnected from {}: {:?}", self.addr, err);
-							let timeout = gen_rand_reconnect_delay();
-							self.socket = NodeSocket::WaitingReconnect(timeout);
-							return Poll::Ready(NodeEvent::Disconnected(err))
-						}
-					}
-				}
-				NodeSocket::Dialing(mut s) => match Future::poll(Pin::new(&mut s), cx) {
-					Poll::Ready(Ok(sink)) => {
-						debug!(target: "telemetry", "✅ Connected to {}", self.addr);
-						let conn = NodeSocketConnected {
-							sink,
-							pending: VecDeque::new(),
-							need_flush: false,
-							timeout: None,
-						};
-						self.socket = NodeSocket::Connected(conn);
-						return Poll::Ready(NodeEvent::Connected)
-					},
-					Poll::Pending => break NodeSocket::Dialing(s),
-					Poll::Ready(Err(err)) => {
-						warn!(target: "telemetry", "❌ Error while dialing {}: {:?}", self.addr, err);
-						let timeout = gen_rand_reconnect_delay();
-						socket = NodeSocket::WaitingReconnect(timeout);
-					}
-				}
-				NodeSocket::ReconnectNow => match self.transport.clone().dial(self.addr.clone()) {
-					Ok(d) => {
-						debug!(target: "telemetry", "Started dialing {}", self.addr);
-						socket = NodeSocket::Dialing(d);
-					}
-					Err(err) => {
-						warn!(target: "telemetry", "❌ Error while dialing {}: {:?}", self.addr, err);
-						let timeout = gen_rand_reconnect_delay();
-						socket = NodeSocket::WaitingReconnect(timeout);
-					}
-				}
-				NodeSocket::WaitingReconnect(mut s) =>
-					if let Poll::Ready(_) = Future::poll(Pin::new(&mut s), cx) {
-						socket = NodeSocket::ReconnectNow;
-					} else {
-						break NodeSocket::WaitingReconnect(s)
-					}
-				NodeSocket::Poisoned => {
-					error!(target: "telemetry", "‼️ Poisoned connection with {}", self.addr);
-					break NodeSocket::Poisoned
-				}
-			}
-		};
-
-		Poll::Pending
-	}
-}
-
-/// Generates a `Delay` object with a random timeout.
-///
-/// If there are general connection issues, not all endpoints should be synchronized in their
-/// re-connection time.
-fn gen_rand_reconnect_delay() -> Delay {
-	let random_delay = rand::thread_rng().gen_range(5, 10);
-	Delay::new(Duration::from_secs(random_delay))
-}
-
-impl<TTrans: Transport, TSinkErr> NodeSocketConnected<TTrans>
-where TTrans::Output: Sink<Vec<u8>, Error = TSinkErr>
-	+ Stream<Item=Result<Vec<u8>, TSinkErr>>
-	+ Unpin
-{
-	/// Processes the queue of messages for the connected socket.
-	///
-	/// The address is passed for logging purposes only.
-	fn poll(
-		mut self: Pin<&mut Self>,
-		cx: &mut Context,
-		my_addr: &Multiaddr,
-	) -> Poll<Result<futures::never::Never, ConnectionError<TSinkErr>>> {
-
-		while let Some(item) = self.pending.pop_front() {
-			if let Poll::Ready(result) = Sink::poll_ready(Pin::new(&mut self.sink), cx) {
-				if let Err(err) = result {
-					return Poll::Ready(Err(ConnectionError::Sink(err)))
-				}
-
-				let item_len = item.len();
-				if let Err(err) = Sink::start_send(Pin::new(&mut self.sink), item) {
-					return Poll::Ready(Err(ConnectionError::Sink(err)))
-				}
-				trace!(
-					target: "telemetry", "Successfully sent {:?} bytes message to {}",
-					item_len, my_addr
-				);
-				self.need_flush = true;
-
-			} else {
-				self.pending.push_front(item);
-				if self.timeout.is_none() {
-					self.timeout = Some(Delay::new(Duration::from_secs(10)));
-				}
-				break;
-			}
-		}
-
-		if self.need_flush {
-			match Sink::poll_flush(Pin::new(&mut self.sink), cx) {
-				Poll::Pending => {
-					if self.timeout.is_none() {
-						self.timeout = Some(Delay::new(Duration::from_secs(10)));
-					}
-				},
-				Poll::Ready(Err(err)) => {
-					self.timeout = None;
-					return Poll::Ready(Err(ConnectionError::Sink(err)))
-				},
-				Poll::Ready(Ok(())) => {
-					self.timeout = None;
-					self.need_flush = false;
-				},
-			}
-		}
-
-		if let Some(timeout) = self.timeout.as_mut() {
-			match Future::poll(Pin::new(timeout), cx) {
-				Poll::Pending => {},
-				Poll::Ready(()) => {
-					self.timeout = None;
-					return Poll::Ready(Err(ConnectionError::Timeout))
-				}
-			}
-		}
-
-		match Stream::poll_next(Pin::new(&mut self.sink), cx) {
-			Poll::Ready(Some(Ok(_))) => {
-				// We poll the telemetry `Stream` because the underlying implementation relies on
-				// this in order to answer PINGs.
-				// We don't do anything with incoming messages, however.
-			},
-			Poll::Ready(Some(Err(err))) => {
-				return Poll::Ready(Err(ConnectionError::Sink(err)))
-			},
-			Poll::Ready(None) => {
-				return Poll::Ready(Err(ConnectionError::Closed))
-			},
-			Poll::Pending => {},
-		}
-
-		Poll::Pending
-	}
-}
-
-impl<TTrans: Transport> fmt::Debug for Node<TTrans> {
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		let state = match self.socket {
-			NodeSocket::Connected(_) => "Connected",
-			NodeSocket::Dialing(_) => "Dialing",
-			NodeSocket::ReconnectNow => "Pending reconnect",
-			NodeSocket::WaitingReconnect(_) => "Pending reconnect",
-			NodeSocket::Poisoned => "Poisoned",
-		};
-
-		f.debug_struct("Node")
-			.field("addr", &self.addr)
-			.field("state", &state)
-			.finish()
-	}
-}
diff --git a/client/tracing/Cargo.toml b/client/tracing/Cargo.toml
index f5cb577a193b..6a49c92b0f87 100644
--- a/client/tracing/Cargo.toml
+++ b/client/tracing/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 ansi_term = "0.12.1"
-tracing-log = "0.1.1"
+atty = "0.2.13"
 erased-serde = "0.3.9"
 lazy_static = "1.4.0"
 log = { version = "0.4.8" }
@@ -24,9 +24,15 @@ regex = "1.4.2"
 rustc-hash = "1.1.0"
 serde = "1.0.101"
 serde_json = "1.0.41"
-slog = { version = "2.5.2", features = ["nested-values"] }
+thiserror = "1.0.21"
 tracing = "0.1.22"
 tracing-core = "0.1.17"
+tracing-log = "0.1.1"
 tracing-subscriber = "0.2.15"
 sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
 sc-telemetry = { version = "2.0.0", path = "../telemetry" }
+sc-tracing-proc-macro = { version = "2.0.0", path = "./proc-macro" }
+
+[target.'cfg(target_os = "unknown")'.dependencies]
+wasm-bindgen = "0.2.67"
+web-sys = { version = "0.3.44", features = ["console"] }
diff --git a/client/cli/proc-macro/Cargo.toml b/client/tracing/proc-macro/Cargo.toml
similarity index 94%
rename from client/cli/proc-macro/Cargo.toml
rename to client/tracing/proc-macro/Cargo.toml
index 9805d87cb30e..e2f4cf14435b 100644
--- a/client/cli/proc-macro/Cargo.toml
+++ b/client/tracing/proc-macro/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "sc-cli-proc-macro"
+name = "sc-tracing-proc-macro"
 version = "2.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
diff --git a/client/cli/proc-macro/src/lib.rs b/client/tracing/proc-macro/src/lib.rs
similarity index 96%
rename from client/cli/proc-macro/src/lib.rs
rename to client/tracing/proc-macro/src/lib.rs
index 0e2466ec3ae7..6164977f07c1 100644
--- a/client/cli/proc-macro/src/lib.rs
+++ b/client/tracing/proc-macro/src/lib.rs
@@ -120,16 +120,16 @@ pub fn prefix_logs_with(arg: TokenStream, item: TokenStream) -> TokenStream {
 
 	let crate_name = if std::env::var("CARGO_PKG_NAME")
 		.expect("cargo env var always there when compiling; qed")
-		== "sc-cli"
+		== "sc-tracing"
 	{
-		Ident::new("sc_cli", Span::call_site().into())
+		Ident::from(Ident::new("sc_tracing", Span::call_site()))
 	} else {
-		let crate_name = match crate_name("sc-cli") {
+		let crate_name = match crate_name("sc-tracing") {
 			Ok(x) => x,
 			Err(err) => return Error::new(Span::call_site(), err).to_compile_error().into(),
 		};
 
-		Ident::new(&crate_name, Span::call_site().into())
+		Ident::new(&crate_name, Span::call_site())
 	};
 
 	let ItemFn {
@@ -143,7 +143,7 @@ pub fn prefix_logs_with(arg: TokenStream, item: TokenStream) -> TokenStream {
 		#(#attrs)*
 		#vis #sig {
 			let span = #crate_name::tracing::info_span!(
-				#crate_name::PREFIX_LOG_SPAN,
+				#crate_name::logging::PREFIX_LOG_SPAN,
 				name = #name,
 			);
 			let _enter = span.enter();
diff --git a/client/tracing/src/lib.rs b/client/tracing/src/lib.rs
index 639ba56b12e5..ebec8f2a8716 100644
--- a/client/tracing/src/lib.rs
+++ b/client/tracing/src/lib.rs
@@ -26,12 +26,13 @@
 //!
 //! Currently we provide `Log` (default), `Telemetry` variants for `Receiver`
 
+#![warn(missing_docs)]
+
 pub mod logging;
 
 use rustc_hash::FxHashMap;
 use std::fmt;
 use std::time::{Duration, Instant};
-
 use parking_lot::Mutex;
 use serde::ser::{Serialize, Serializer, SerializeMap};
 use tracing::{
@@ -42,107 +43,16 @@ use tracing::{
 	subscriber::Subscriber,
 };
 use tracing_subscriber::{
-	fmt::time::ChronoLocal,
 	CurrentSpan,
-	EnvFilter,
-	layer::{self, Layer, Context},
-	fmt as tracing_fmt,
-	Registry,
+	layer::{Layer, Context},
 };
-
 use sc_telemetry::{telemetry, SUBSTRATE_INFO};
 use sp_tracing::{WASM_NAME_KEY, WASM_TARGET_KEY, WASM_TRACE_IDENTIFIER};
-use tracing_subscriber::reload::Handle;
-use once_cell::sync::OnceCell;
-use tracing_subscriber::filter::Directive;
-
-const ZERO_DURATION: Duration = Duration::from_nanos(0);
-
-// The layered Subscriber as built up in `init_logger()`.
-// Used in the reload `Handle`.
-type SCSubscriber<
-	N = tracing_fmt::format::DefaultFields,
-	E = logging::EventFormat<ChronoLocal>,
-	W = fn() -> std::io::Stderr
-> = layer::Layered<tracing_fmt::Layer<Registry, N, E, W>, Registry>;
-
-// Handle to reload the tracing log filter
-static FILTER_RELOAD_HANDLE: OnceCell<Handle<EnvFilter, SCSubscriber>> = OnceCell::new();
-// Directives that are defaulted to when resetting the log filter
-static DEFAULT_DIRECTIVES: OnceCell<Mutex<Vec<String>>> = OnceCell::new();
-// Current state of log filter
-static CURRENT_DIRECTIVES: OnceCell<Mutex<Vec<String>>> = OnceCell::new();
-
-/// Initialize FILTER_RELOAD_HANDLE, only possible once
-pub fn set_reload_handle(handle: Handle<EnvFilter, SCSubscriber>) {
-	let _ = FILTER_RELOAD_HANDLE.set(handle);
-}
-
-/// Add log filter directive(s) to the defaults
-///
-/// The syntax is identical to the CLI `<target>=<level>`:
-///
-/// `sync=debug,state=trace`
-pub fn add_default_directives(directives: &str) {
-	DEFAULT_DIRECTIVES.get_or_init(|| Mutex::new(Vec::new())).lock().push(directives.to_owned());
-	add_directives(directives);
-}
-
-/// Add directives to current directives
-pub fn add_directives(directives: &str) {
-	CURRENT_DIRECTIVES.get_or_init(|| Mutex::new(Vec::new())).lock().push(directives.to_owned());
-}
-
-/// Reload the logging filter with the supplied directives added to the existing directives
-pub fn reload_filter() -> Result<(), String> {
-	let mut env_filter = EnvFilter::default();
-	if let Some(current_directives) = CURRENT_DIRECTIVES.get() {
-		// Use join and then split in case any directives added together
-		for directive in current_directives.lock().join(",").split(',').map(|d| d.parse()) {
-			match directive {
-				Ok(dir) => env_filter = env_filter.add_directive(dir),
-				Err(invalid_directive) => {
-					log::warn!(
-						target: "tracing",
-						"Unable to parse directive while setting log filter: {:?}",
-						invalid_directive,
-					);
-				}
-			}
-		}
-	}
-	env_filter = env_filter.add_directive(
-		"sc_tracing=trace"
-			.parse()
-			.expect("provided directive is valid"),
-	);
-	log::debug!(target: "tracing", "Reloading log filter with: {}", env_filter);
-	FILTER_RELOAD_HANDLE.get()
-		.ok_or("No reload handle present".to_string())?
-		.reload(env_filter)
-		.map_err(|e| format!("{}", e))
-}
 
-/// Resets the log filter back to the original state when the node was started.
-///
-/// Includes substrate defaults and CLI supplied directives.
-pub fn reset_log_filter() -> Result<(), String> {
-	*CURRENT_DIRECTIVES
-		.get_or_init(|| Mutex::new(Vec::new())).lock() =
-		DEFAULT_DIRECTIVES.get_or_init(|| Mutex::new(Vec::new())).lock().clone();
-	reload_filter()
-}
+#[doc(hidden)]
+pub use tracing;
 
-/// Parse `Directive` and add to default directives if successful. 
-///
-/// Ensures the supplied directive will be restored when resetting the log filter.
-pub fn parse_default_directive(directive: &str) -> Result<Directive, String> {
-	let dir = directive
-		.parse()
-		.map_err(|_| format!("Unable to parse directive: {}", directive))?;
-	add_default_directives(directive);
-	Ok(dir)
-}
+const ZERO_DURATION: Duration = Duration::from_nanos(0);
 
 /// Responsible for assigning ids to new spans, which are not re-used.
 pub struct ProfilingLayer {
@@ -178,10 +88,15 @@ pub trait TraceHandler: Send + Sync {
 /// Represents a tracing event, complete with values
 #[derive(Debug)]
 pub struct TraceEvent {
+	/// Name of the event.
 	pub name: &'static str,
+	/// Target of the event.
 	pub target: String,
+	/// Level of the event.
 	pub level: Level,
+	/// Values for this event.
 	pub values: Values,
+	/// Id of the parent tracing event, if any.
 	pub parent_id: Option<Id>,
 }
 
@@ -291,27 +206,6 @@ impl fmt::Display for Values {
 	}
 }
 
-impl slog::SerdeValue for Values {
-	fn as_serde(&self) -> &dyn erased_serde::Serialize {
-		self
-	}
-
-	fn to_sendable(&self) -> Box<dyn slog::SerdeValue + Send + 'static> {
-		Box::new(self.clone())
-	}
-}
-
-impl slog::Value for Values {
-	fn serialize(
-		&self,
-		_record: &slog::Record,
-		key: slog::Key,
-		ser: &mut dyn slog::Serializer,
-	) -> slog::Result {
-		ser.emit_serde(key, self)
-	}
-}
-
 impl ProfilingLayer {
 	/// Takes a `TracingReceiver` and a comma separated list of targets,
 	/// either with a level: "pallet=trace,frame=debug"
@@ -510,7 +404,7 @@ impl TraceHandler for TelemetryTraceHandler {
 			"target" => span_datum.target,
 			"time" => span_datum.overall_time.as_nanos(),
 			"id" => span_datum.id.into_u64(),
-			"parent_id" => span_datum.parent_id.map(|i| i.into_u64()),
+			"parent_id" => span_datum.parent_id.as_ref().map(|i| i.into_u64()),
 			"values" => span_datum.values
 		);
 	}
@@ -519,7 +413,7 @@ impl TraceHandler for TelemetryTraceHandler {
 		telemetry!(SUBSTRATE_INFO; "tracing.event";
 			"name" => event.name,
 			"target" => event.target,
-			"parent_id" => event.parent_id.map(|i| i.into_u64()),
+			"parent_id" => event.parent_id.as_ref().map(|i| i.into_u64()),
 			"values" => event.values
 		);
 	}
diff --git a/client/tracing/src/logging/directives.rs b/client/tracing/src/logging/directives.rs
new file mode 100644
index 000000000000..b108566bf2bc
--- /dev/null
+++ b/client/tracing/src/logging/directives.rs
@@ -0,0 +1,123 @@
+// Copyright 2021 Parity Technologies (UK) Ltd.
+// This file is part of Substrate.
+
+// Substrate is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Substrate is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+
+use once_cell::sync::OnceCell;
+use parking_lot::Mutex;
+use tracing_subscriber::{
+	filter::Directive, fmt as tracing_fmt, fmt::time::ChronoLocal, layer, reload::Handle,
+	EnvFilter, Registry,
+};
+
+// Handle to reload the tracing log filter
+static FILTER_RELOAD_HANDLE: OnceCell<Handle<EnvFilter, SCSubscriber>> = OnceCell::new();
+// Directives that are defaulted to when resetting the log filter
+static DEFAULT_DIRECTIVES: OnceCell<Mutex<Vec<String>>> = OnceCell::new();
+// Current state of log filter
+static CURRENT_DIRECTIVES: OnceCell<Mutex<Vec<String>>> = OnceCell::new();
+
+/// Add log filter directive(s) to the defaults
+///
+/// The syntax is identical to the CLI `<target>=<level>`:
+///
+/// `sync=debug,state=trace`
+pub(crate) fn add_default_directives(directives: &str) {
+	DEFAULT_DIRECTIVES
+		.get_or_init(|| Mutex::new(Vec::new()))
+		.lock()
+		.push(directives.to_owned());
+	add_directives(directives);
+}
+
+/// Add directives to current directives
+pub fn add_directives(directives: &str) {
+	CURRENT_DIRECTIVES
+		.get_or_init(|| Mutex::new(Vec::new()))
+		.lock()
+		.push(directives.to_owned());
+}
+
+/// Parse `Directive` and add to default directives if successful.
+///
+/// Ensures the supplied directive will be restored when resetting the log filter.
+pub(crate) fn parse_default_directive(directive: &str) -> super::Result<Directive> {
+	let dir = directive.parse()?;
+	add_default_directives(directive);
+	Ok(dir)
+}
+
+/// Reload the logging filter with the supplied directives added to the existing directives
+pub fn reload_filter() -> Result<(), String> {
+	let mut env_filter = EnvFilter::default();
+	if let Some(current_directives) = CURRENT_DIRECTIVES.get() {
+		// Use join and then split in case any directives added together
+		for directive in current_directives
+			.lock()
+			.join(",")
+			.split(',')
+			.map(|d| d.parse())
+		{
+			match directive {
+				Ok(dir) => env_filter = env_filter.add_directive(dir),
+				Err(invalid_directive) => {
+					log::warn!(
+						target: "tracing",
+						"Unable to parse directive while setting log filter: {:?}",
+						invalid_directive,
+					);
+				}
+			}
+		}
+	}
+	env_filter = env_filter.add_directive(
+		"sc_tracing=trace"
+			.parse()
+			.expect("provided directive is valid"),
+	);
+	log::debug!(target: "tracing", "Reloading log filter with: {}", env_filter);
+	FILTER_RELOAD_HANDLE
+		.get()
+		.ok_or("No reload handle present".to_string())?
+		.reload(env_filter)
+		.map_err(|e| format!("{}", e))
+}
+
+/// Resets the log filter back to the original state when the node was started.
+///
+/// Includes substrate defaults and CLI supplied directives.
+pub fn reset_log_filter() -> Result<(), String> {
+	let directive = DEFAULT_DIRECTIVES
+		.get_or_init(|| Mutex::new(Vec::new()))
+		.lock()
+		.clone();
+
+	*CURRENT_DIRECTIVES
+		.get_or_init(|| Mutex::new(Vec::new()))
+		.lock() = directive;
+	reload_filter()
+}
+
+/// Initialize FILTER_RELOAD_HANDLE, only possible once
+pub(crate) fn set_reload_handle(handle: Handle<EnvFilter, SCSubscriber>) {
+	let _ = FILTER_RELOAD_HANDLE.set(handle);
+}
+
+// The layered Subscriber as built up in `init_logger()`.
+// Used in the reload `Handle`.
+type SCSubscriber<
+	N = tracing_fmt::format::DefaultFields,
+	E = crate::logging::EventFormat<ChronoLocal>,
+	W = fn() -> std::io::Stderr,
+> = layer::Layered<tracing_fmt::Layer<Registry, N, E, W>, Registry>;
diff --git a/client/tracing/src/logging.rs b/client/tracing/src/logging/event_format.rs
similarity index 73%
rename from client/tracing/src/logging.rs
rename to client/tracing/src/logging/event_format.rs
index c552d64bc7fb..37f9ed16ead7 100644
--- a/client/tracing/src/logging.rs
+++ b/client/tracing/src/logging/event_format.rs
@@ -16,92 +16,56 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use std::fmt::{self, Write};
 use ansi_term::Colour;
-use tracing::{span::Attributes, Event, Id, Level, Subscriber};
+use regex::Regex;
+use std::fmt::{self, Write};
+use tracing::{Event, Level, Subscriber};
 use tracing_log::NormalizeEvent;
 use tracing_subscriber::{
+	field::RecordFields,
 	fmt::{
 		time::{FormatTime, SystemTime},
 		FmtContext, FormatEvent, FormatFields,
 	},
 	layer::Context,
-	registry::LookupSpan,
-	Layer,
+	registry::{LookupSpan, SpanRef},
 };
-use regex::Regex;
-
-/// Span name used for the logging prefix. See macro `sc_cli::prefix_logs_with!`
-pub const PREFIX_LOG_SPAN: &str = "substrate-log-prefix";
-
-/// A writer that may write to `inner_writer` with colors.
-///
-/// This is used by [`EventFormat`] to kill colors when `enable_color` is `false`.
-///
-/// It is required to call [`MaybeColorWriter::write`] after all writes are done,
-/// because the content of these writes is buffered and will only be written to the
-/// `inner_writer` at that point.
-struct MaybeColorWriter<'a> {
-	enable_color: bool,
-	buffer: String,
-	inner_writer: &'a mut dyn fmt::Write,
-}
-
-impl<'a> fmt::Write for MaybeColorWriter<'a> {
-	fn write_str(&mut self, buf: &str) -> fmt::Result {
-		self.buffer.push_str(buf);
-		Ok(())
-	}
-}
-
-impl<'a> MaybeColorWriter<'a> {
-	/// Creates a new instance.
-	fn new(enable_color: bool, inner_writer: &'a mut dyn fmt::Write) -> Self {
-		Self {
-			enable_color,
-			inner_writer,
-			buffer: String::new(),
-		}
-	}
-
-	/// Write the buffered content to the `inner_writer`.
-	fn write(&mut self) -> fmt::Result {
-		lazy_static::lazy_static! {
-			static ref RE: Regex = Regex::new("\x1b\\[[^m]+m").expect("Error initializing color regex");
-		}
-
-		if !self.enable_color {
-			let replaced = RE.replace_all(&self.buffer, "");
-			self.inner_writer.write_str(&replaced)
-		} else {
-			self.inner_writer.write_str(&self.buffer)
-		}
-	}
-}
 
+/// A pre-configured event formatter.
 pub struct EventFormat<T = SystemTime> {
+	/// Use the given timer for log message timestamps.
 	pub timer: T,
+	/// Sets whether or not an event's target is displayed.
 	pub display_target: bool,
+	/// Sets whether or not an event's level is displayed.
 	pub display_level: bool,
+	/// Sets whether or not the name of the current thread is displayed when formatting events.
 	pub display_thread_name: bool,
+	/// Enable ANSI terminal colors for formatted output.
 	pub enable_color: bool,
 }
 
-// NOTE: the following code took inspiration from tracing-subscriber
-//
-//       https://github.com/tokio-rs/tracing/blob/2f59b32/tracing-subscriber/src/fmt/format/mod.rs#L449
-impl<S, N, T> FormatEvent<S, N> for EventFormat<T>
+impl<T> EventFormat<T>
 where
-	S: Subscriber + for<'a> LookupSpan<'a>,
-	N: for<'a> FormatFields<'a> + 'static,
 	T: FormatTime,
 {
-	fn format_event(
+	// NOTE: the following code took inspiration from tracing-subscriber
+	//
+	//       https://github.com/tokio-rs/tracing/blob/2f59b32/tracing-subscriber/src/fmt/format/mod.rs#L449
+	pub(crate) fn format_event_custom<'b, S, N>(
 		&self,
-		ctx: &FmtContext<S, N>,
+		ctx: CustomFmtContext<'b, S, N>,
 		writer: &mut dyn fmt::Write,
 		event: &Event,
-	) -> fmt::Result {
+	) -> fmt::Result
+	where
+		S: Subscriber + for<'a> LookupSpan<'a>,
+		N: for<'a> FormatFields<'a> + 'static,
+	{
+		if event.metadata().target() == sc_telemetry::TELEMETRY_LOG_SPAN {
+			return Ok(());
+		}
+
 		let writer = &mut MaybeColorWriter::new(self.enable_color, writer);
 		let normalized_meta = event.normalized_metadata();
 		let meta = normalized_meta.as_ref().unwrap_or_else(|| event.metadata());
@@ -134,8 +98,8 @@ where
 			let parents = span.parents();
 			for span in std::iter::once(span).chain(parents) {
 				let exts = span.extensions();
-				if let Some(node_name) = exts.get::<NodeName>() {
-					write!(writer, "{}", node_name.as_str())?;
+				if let Some(prefix) = exts.get::<super::layers::Prefix>() {
+					write!(writer, "{}", prefix.as_str())?;
 					break;
 				}
 			}
@@ -148,62 +112,22 @@ where
 	}
 }
 
-pub struct NodeNameLayer;
-
-impl<S> Layer<S> for NodeNameLayer
+// NOTE: the following code took inspiration from tracing-subscriber
+//
+//       https://github.com/tokio-rs/tracing/blob/2f59b32/tracing-subscriber/src/fmt/format/mod.rs#L449
+impl<S, N, T> FormatEvent<S, N> for EventFormat<T>
 where
 	S: Subscriber + for<'a> LookupSpan<'a>,
+	N: for<'a> FormatFields<'a> + 'static,
+	T: FormatTime,
 {
-	fn new_span(&self, attrs: &Attributes<'_>, id: &Id, ctx: Context<'_, S>) {
-		let span = ctx
-			.span(id)
-			.expect("new_span has been called for this span; qed");
-
-		if span.name() != PREFIX_LOG_SPAN {
-			return;
-		}
-
-		let mut extensions = span.extensions_mut();
-
-		if extensions.get_mut::<NodeName>().is_none() {
-			let mut s = String::new();
-			let mut v = NodeNameVisitor(&mut s);
-			attrs.record(&mut v);
-
-			if !s.is_empty() {
-				let fmt_fields = NodeName(s);
-				extensions.insert(fmt_fields);
-			}
-		}
-	}
-}
-
-struct NodeNameVisitor<'a, W: std::fmt::Write>(&'a mut W);
-
-macro_rules! write_node_name {
-	($method:ident, $type:ty, $format:expr) => {
-		fn $method(&mut self, field: &tracing::field::Field, value: $type) {
-			if field.name() == "name" {
-				write!(self.0, $format, value).expect("no way to return the err; qed");
-			}
-		}
-	};
-}
-
-impl<'a, W: std::fmt::Write> tracing::field::Visit for NodeNameVisitor<'a, W> {
-	write_node_name!(record_debug, &dyn std::fmt::Debug, "[{:?}] ");
-	write_node_name!(record_str, &str, "[{}] ");
-	write_node_name!(record_i64, i64, "[{}] ");
-	write_node_name!(record_u64, u64, "[{}] ");
-	write_node_name!(record_bool, bool, "[{}] ");
-}
-
-#[derive(Debug)]
-struct NodeName(String);
-
-impl NodeName {
-	fn as_str(&self) -> &str {
-		self.0.as_str()
+	fn format_event(
+		&self,
+		ctx: &FmtContext<S, N>,
+		writer: &mut dyn fmt::Write,
+		event: &Event,
+	) -> fmt::Result {
+		self.format_event_custom(CustomFmtContext::FmtContext(ctx), writer, event)
 	}
 }
 
@@ -316,3 +240,95 @@ mod time {
 		Ok(())
 	}
 }
+
+// NOTE: `FmtContext`'s fields are private. This enum allows us to make a `format_event` function
+//       that works with `FmtContext` or `Context` with `FormatFields`
+#[allow(dead_code)]
+pub(crate) enum CustomFmtContext<'a, S, N> {
+	FmtContext(&'a FmtContext<'a, S, N>),
+	ContextWithFormatFields(&'a Context<'a, S>, &'a N),
+}
+
+impl<'a, S, N> FormatFields<'a> for CustomFmtContext<'a, S, N>
+where
+	S: Subscriber + for<'lookup> LookupSpan<'lookup>,
+	N: for<'writer> FormatFields<'writer> + 'static,
+{
+	fn format_fields<R: RecordFields>(
+		&self,
+		writer: &'a mut dyn fmt::Write,
+		fields: R,
+	) -> fmt::Result {
+		match self {
+			CustomFmtContext::FmtContext(fmt_ctx) => fmt_ctx.format_fields(writer, fields),
+			CustomFmtContext::ContextWithFormatFields(_ctx, fmt_fields) => {
+				fmt_fields.format_fields(writer, fields)
+			}
+		}
+	}
+}
+
+// NOTE: the following code has been duplicated from tracing-subscriber
+//
+//       https://github.com/tokio-rs/tracing/blob/2f59b32/tracing-subscriber/src/fmt/fmt_layer.rs#L788
+impl<'a, S, N> CustomFmtContext<'a, S, N>
+where
+	S: Subscriber + for<'lookup> LookupSpan<'lookup>,
+	N: for<'writer> FormatFields<'writer> + 'static,
+{
+	#[inline]
+	pub fn lookup_current(&self) -> Option<SpanRef<'_, S>>
+	where
+		S: for<'lookup> LookupSpan<'lookup>,
+	{
+		match self {
+			CustomFmtContext::FmtContext(fmt_ctx) => fmt_ctx.lookup_current(),
+			CustomFmtContext::ContextWithFormatFields(ctx, _) => ctx.lookup_current(),
+		}
+	}
+}
+
+/// A writer that may write to `inner_writer` with colors.
+///
+/// This is used by [`EventFormat`] to kill colors when `enable_color` is `false`.
+///
+/// It is required to call [`MaybeColorWriter::write`] after all writes are done,
+/// because the content of these writes is buffered and will only be written to the
+/// `inner_writer` at that point.
+struct MaybeColorWriter<'a> {
+	enable_color: bool,
+	buffer: String,
+	inner_writer: &'a mut dyn fmt::Write,
+}
+
+impl<'a> fmt::Write for MaybeColorWriter<'a> {
+	fn write_str(&mut self, buf: &str) -> fmt::Result {
+		self.buffer.push_str(buf);
+		Ok(())
+	}
+}
+
+impl<'a> MaybeColorWriter<'a> {
+	/// Creates a new instance.
+	fn new(enable_color: bool, inner_writer: &'a mut dyn fmt::Write) -> Self {
+		Self {
+			enable_color,
+			inner_writer,
+			buffer: String::new(),
+		}
+	}
+
+	/// Write the buffered content to the `inner_writer`.
+	fn write(&mut self) -> fmt::Result {
+		lazy_static::lazy_static! {
+			static ref RE: Regex = Regex::new("\x1b\\[[^m]+m").expect("Error initializing color regex");
+		}
+
+		if !self.enable_color {
+			let replaced = RE.replace_all(&self.buffer, "");
+			self.inner_writer.write_str(&replaced)
+		} else {
+			self.inner_writer.write_str(&self.buffer)
+		}
+	}
+}
diff --git a/client/tracing/src/logging/layers/console_log.rs b/client/tracing/src/logging/layers/console_log.rs
new file mode 100644
index 000000000000..be992ae81423
--- /dev/null
+++ b/client/tracing/src/logging/layers/console_log.rs
@@ -0,0 +1,120 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+use crate::logging::event_format::{CustomFmtContext, EventFormat};
+use std::fmt;
+use tracing::{Event, Level, Subscriber};
+use tracing_subscriber::{
+	fmt::{
+		time::{FormatTime, SystemTime},
+		FormatFields,
+	},
+	layer::Context,
+	registry::LookupSpan,
+	Layer,
+};
+use wasm_bindgen::prelude::*;
+
+/// A `Layer` that display logs in the browser's console.
+pub struct ConsoleLogLayer<S, N = tracing_subscriber::fmt::format::DefaultFields, T = SystemTime> {
+	event_format: EventFormat<T>,
+	fmt_fields: N,
+	_inner: std::marker::PhantomData<S>,
+}
+
+impl<S, T> ConsoleLogLayer<S, tracing_subscriber::fmt::format::DefaultFields, T> {
+	/// Create a new [`ConsoleLogLayer`] using the `EventFormat` provided in argument.
+	pub fn new(event_format: EventFormat<T>) -> Self {
+		Self {
+			event_format,
+			fmt_fields: Default::default(),
+			_inner: std::marker::PhantomData,
+		}
+	}
+}
+
+// NOTE: the following code took inspiration from `EventFormat` (in this file)
+impl<S, N, T: FormatTime> ConsoleLogLayer<S, N, T>
+where
+	S: Subscriber + for<'a> LookupSpan<'a>,
+	N: for<'writer> FormatFields<'writer> + 'static,
+{
+	fn format_event(
+		&self,
+		ctx: &Context<'_, S>,
+		writer: &mut dyn fmt::Write,
+		event: &Event,
+	) -> fmt::Result {
+		self.event_format.format_event_custom(
+			CustomFmtContext::ContextWithFormatFields(ctx, &self.fmt_fields),
+			writer,
+			event,
+		)
+	}
+}
+
+// NOTE: the following code took inspiration from tracing-subscriber
+//
+//       https://github.com/tokio-rs/tracing/blob/2f59b32/tracing-subscriber/src/fmt/fmt_layer.rs#L717
+impl<S, N, T> Layer<S> for ConsoleLogLayer<S, N, T>
+where
+	S: Subscriber + for<'a> LookupSpan<'a>,
+	N: for<'writer> FormatFields<'writer> + 'static,
+	T: FormatTime + 'static,
+{
+	fn on_event(&self, event: &Event<'_>, ctx: Context<'_, S>) {
+		thread_local! {
+			static BUF: std::cell::RefCell<String> = std::cell::RefCell::new(String::new());
+		}
+
+		BUF.with(|buf| {
+			let borrow = buf.try_borrow_mut();
+			let mut a;
+			let mut b;
+			let mut buf = match borrow {
+				Ok(buf) => {
+					a = buf;
+					&mut *a
+				}
+				_ => {
+					b = String::new();
+					&mut b
+				}
+			};
+
+			if self.format_event(&ctx, &mut buf, event).is_ok() {
+				if !buf.is_empty() {
+					let meta = event.metadata();
+					let level = meta.level();
+					// NOTE: the following code took inspiration from tracing-subscriber
+					//
+					//       https://github.com/iamcodemaker/console_log/blob/f13b5d6755/src/lib.rs#L149
+					match *level {
+						Level::ERROR => web_sys::console::error_1(&JsValue::from(buf.as_str())),
+						Level::WARN => web_sys::console::warn_1(&JsValue::from(buf.as_str())),
+						Level::INFO => web_sys::console::info_1(&JsValue::from(buf.as_str())),
+						Level::DEBUG => web_sys::console::log_1(&JsValue::from(buf.as_str())),
+						Level::TRACE => web_sys::console::debug_1(&JsValue::from(buf.as_str())),
+					}
+				}
+			}
+
+			buf.clear();
+		});
+	}
+}
diff --git a/client/tracing/src/logging/layers/mod.rs b/client/tracing/src/logging/layers/mod.rs
new file mode 100644
index 000000000000..8bda65f4c99b
--- /dev/null
+++ b/client/tracing/src/logging/layers/mod.rs
@@ -0,0 +1,25 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+#[cfg(target_os = "unknown")]
+mod console_log;
+mod prefix_layer;
+
+#[cfg(target_os = "unknown")]
+pub use console_log::*;
+pub use prefix_layer::*;
diff --git a/client/tracing/src/logging/layers/prefix_layer.rs b/client/tracing/src/logging/layers/prefix_layer.rs
new file mode 100644
index 000000000000..6aa7e6d436e1
--- /dev/null
+++ b/client/tracing/src/logging/layers/prefix_layer.rs
@@ -0,0 +1,86 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+use tracing::{span::Attributes, Id, Subscriber};
+use tracing_subscriber::{layer::Context, registry::LookupSpan, Layer};
+
+/// Span name used for the logging prefix. See macro `sc_tracing::logging::prefix_logs_with!`
+pub const PREFIX_LOG_SPAN: &str = "substrate-log-prefix";
+
+/// A `Layer` that captures the prefix span ([`PREFIX_LOG_SPAN`]) which is then used by
+/// [`EventFormat`] to prefix the log lines by customizable string.
+///
+/// See the macro `sc_cli::prefix_logs_with!` for more details.
+pub struct PrefixLayer;
+
+impl<S> Layer<S> for PrefixLayer
+where
+	S: Subscriber + for<'a> LookupSpan<'a>,
+{
+	fn new_span(&self, attrs: &Attributes<'_>, id: &Id, ctx: Context<'_, S>) {
+		let span = ctx
+			.span(id)
+			.expect("new_span has been called for this span; qed");
+
+		if span.name() != PREFIX_LOG_SPAN {
+			return;
+		}
+
+		let mut extensions = span.extensions_mut();
+
+		if extensions.get_mut::<Prefix>().is_none() {
+			let mut s = String::new();
+			let mut v = PrefixVisitor(&mut s);
+			attrs.record(&mut v);
+
+			if !s.is_empty() {
+				let fmt_fields = Prefix(s);
+				extensions.insert(fmt_fields);
+			}
+		}
+	}
+}
+
+struct PrefixVisitor<'a, W: std::fmt::Write>(&'a mut W);
+
+macro_rules! write_node_name {
+	($method:ident, $type:ty, $format:expr) => {
+		fn $method(&mut self, field: &tracing::field::Field, value: $type) {
+			if field.name() == "name" {
+				let _ = write!(self.0, $format, value);
+			}
+		}
+	};
+}
+
+impl<'a, W: std::fmt::Write> tracing::field::Visit for PrefixVisitor<'a, W> {
+	write_node_name!(record_debug, &dyn std::fmt::Debug, "[{:?}] ");
+	write_node_name!(record_str, &str, "[{}] ");
+	write_node_name!(record_i64, i64, "[{}] ");
+	write_node_name!(record_u64, u64, "[{}] ");
+	write_node_name!(record_bool, bool, "[{}] ");
+}
+
+#[derive(Debug)]
+pub(crate) struct Prefix(String);
+
+impl Prefix {
+	pub(crate) fn as_str(&self) -> &str {
+		self.0.as_str()
+	}
+}
diff --git a/client/tracing/src/logging/mod.rs b/client/tracing/src/logging/mod.rs
new file mode 100644
index 000000000000..ca4f74194bcc
--- /dev/null
+++ b/client/tracing/src/logging/mod.rs
@@ -0,0 +1,531 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! Substrate logging library.
+//!
+//! This crate uses tokio's [tracing](https://github.com/tokio-rs/tracing/) library for logging.
+
+#![warn(missing_docs)]
+
+mod directives;
+mod event_format;
+mod layers;
+
+pub use directives::*;
+pub use sc_tracing_proc_macro::*;
+
+use sc_telemetry::{ExtTransport, TelemetryWorker};
+use std::io;
+use tracing::Subscriber;
+use tracing_subscriber::{
+	fmt::time::ChronoLocal,
+	fmt::{
+		format, FormatEvent, FormatFields, Formatter, Layer as FmtLayer, MakeWriter,
+		SubscriberBuilder,
+	},
+	layer::{self, SubscriberExt},
+	registry::LookupSpan,
+	EnvFilter, FmtSubscriber, Layer, Registry,
+};
+
+pub use event_format::*;
+pub use layers::*;
+
+/// Logging Result typedef.
+pub type Result<T> = std::result::Result<T, Error>;
+
+/// Logging errors.
+#[derive(Debug, thiserror::Error)]
+#[allow(missing_docs)]
+#[non_exhaustive]
+pub enum Error {
+	#[error(transparent)]
+	IoError(#[from] io::Error),
+
+	#[error(transparent)]
+	SetGlobalDefaultError(#[from] tracing::subscriber::SetGlobalDefaultError),
+
+	#[error(transparent)]
+	DirectiveParseError(#[from] tracing_subscriber::filter::ParseError),
+
+	#[error(transparent)]
+	SetLoggerError(#[from] tracing_log::log_tracer::SetLoggerError),
+}
+
+macro_rules! disable_log_reloading {
+	($builder:expr) => {{
+		let builder = $builder.with_filter_reloading();
+		let handle = builder.reload_handle();
+		set_reload_handle(handle);
+		builder
+	}};
+}
+
+/// Common implementation to get the subscriber.
+fn get_subscriber_internal<N, E, F, W>(
+	pattern: &str,
+	max_level: Option<log::LevelFilter>,
+	force_colors: Option<bool>,
+	telemetry_buffer_size: Option<usize>,
+	telemetry_external_transport: Option<ExtTransport>,
+	builder_hook: impl Fn(
+		SubscriberBuilder<
+			format::DefaultFields,
+			EventFormat<ChronoLocal>,
+			EnvFilter,
+			fn() -> std::io::Stderr,
+		>,
+	) -> SubscriberBuilder<N, E, F, W>,
+) -> Result<(impl Subscriber + for<'a> LookupSpan<'a>, TelemetryWorker)>
+where
+	N: for<'writer> FormatFields<'writer> + 'static,
+	E: FormatEvent<Registry, N> + 'static,
+	W: MakeWriter + 'static,
+	F: layer::Layer<Formatter<N, E, W>> + Send + Sync + 'static,
+	FmtLayer<Registry, N, E, W>: layer::Layer<Registry> + Send + Sync + 'static,
+{
+	// Accept all valid directives and print invalid ones
+	fn parse_user_directives(mut env_filter: EnvFilter, dirs: &str) -> Result<EnvFilter> {
+		for dir in dirs.split(',') {
+			env_filter = env_filter.add_directive(parse_default_directive(&dir)?);
+		}
+		Ok(env_filter)
+	}
+
+	// Initialize filter - ensure to use `parse_default_directive` for any defaults to persist
+	// after log filter reloading by RPC
+	let mut env_filter = EnvFilter::default()
+		// Enable info
+		.add_directive(parse_default_directive("info").expect("provided directive is valid"))
+		// Disable info logging by default for some modules.
+		.add_directive(parse_default_directive("ws=off").expect("provided directive is valid"))
+		.add_directive(parse_default_directive("yamux=off").expect("provided directive is valid"))
+		.add_directive(
+			parse_default_directive("cranelift_codegen=off").expect("provided directive is valid"),
+		)
+		// Set warn logging by default for some modules.
+		.add_directive(
+			parse_default_directive("cranelift_wasm=warn").expect("provided directive is valid"),
+		)
+		.add_directive(parse_default_directive("hyper=warn").expect("provided directive is valid"));
+
+	if let Ok(lvl) = std::env::var("RUST_LOG") {
+		if lvl != "" {
+			env_filter = parse_user_directives(env_filter, &lvl)?;
+		}
+	}
+
+	if pattern != "" {
+		// We're not sure if log or tracing is available at this moment, so silently ignore the
+		// parse error.
+		env_filter = parse_user_directives(env_filter, pattern)?;
+	}
+
+	let max_level_hint = Layer::<FmtSubscriber>::max_level_hint(&env_filter);
+
+	let max_level = max_level.unwrap_or_else(|| match max_level_hint {
+		Some(tracing_subscriber::filter::LevelFilter::INFO) | None => log::LevelFilter::Info,
+		Some(tracing_subscriber::filter::LevelFilter::TRACE) => log::LevelFilter::Trace,
+		Some(tracing_subscriber::filter::LevelFilter::WARN) => log::LevelFilter::Warn,
+		Some(tracing_subscriber::filter::LevelFilter::ERROR) => log::LevelFilter::Error,
+		Some(tracing_subscriber::filter::LevelFilter::DEBUG) => log::LevelFilter::Debug,
+		Some(tracing_subscriber::filter::LevelFilter::OFF) => log::LevelFilter::Off,
+	});
+
+	tracing_log::LogTracer::builder()
+		.with_max_level(max_level)
+		.init()?;
+
+	// If we're only logging `INFO` entries then we'll use a simplified logging format.
+	let simple = match max_level_hint {
+		Some(level) if level <= tracing_subscriber::filter::LevelFilter::INFO => true,
+		_ => false,
+	};
+
+	let enable_color = force_colors.unwrap_or_else(|| atty::is(atty::Stream::Stderr));
+	let timer = ChronoLocal::with_format(if simple {
+		"%Y-%m-%d %H:%M:%S".to_string()
+	} else {
+		"%Y-%m-%d %H:%M:%S%.3f".to_string()
+	});
+
+	let (telemetry_layer, telemetry_worker) =
+		sc_telemetry::TelemetryLayer::new(telemetry_buffer_size, telemetry_external_transport)?;
+	let event_format = EventFormat {
+		timer,
+		display_target: !simple,
+		display_level: !simple,
+		display_thread_name: !simple,
+		enable_color,
+	};
+	let builder = FmtSubscriber::builder().with_env_filter(env_filter);
+
+	#[cfg(not(target_os = "unknown"))]
+	let builder = builder.with_writer(std::io::stderr as _);
+
+	#[cfg(target_os = "unknown")]
+	let builder = builder.with_writer(std::io::sink);
+
+	#[cfg(not(target_os = "unknown"))]
+	let builder = builder.event_format(event_format);
+
+	#[cfg(not(target_os = "unknown"))]
+	let builder = builder_hook(builder);
+
+	let subscriber = builder.finish().with(PrefixLayer).with(telemetry_layer);
+
+	#[cfg(target_os = "unknown")]
+	let subscriber = subscriber.with(ConsoleLogLayer::new(event_format));
+
+	Ok((subscriber, telemetry_worker))
+}
+
+/// A builder that is used to initialize the global logger.
+pub struct GlobalLoggerBuilder {
+	pattern: String,
+	profiling: Option<(crate::TracingReceiver, String)>,
+	telemetry_buffer_size: Option<usize>,
+	telemetry_external_transport: Option<ExtTransport>,
+	disable_log_reloading: bool,
+	force_colors: Option<bool>,
+}
+
+impl GlobalLoggerBuilder {
+	/// Create a new [`GlobalLoggerBuilder`] which can be used to initialize the global logger.
+	pub fn new<S: Into<String>>(pattern: S) -> Self {
+		Self {
+			pattern: pattern.into(),
+			profiling: None,
+			telemetry_buffer_size: None,
+			telemetry_external_transport: None,
+			disable_log_reloading: false,
+			force_colors: None,
+		}
+	}
+
+	/// Set up the profiling.
+	pub fn with_profiling<S: Into<String>>(
+		&mut self,
+		tracing_receiver: crate::TracingReceiver,
+		profiling_targets: S,
+	) -> &mut Self {
+		self.profiling = Some((tracing_receiver, profiling_targets.into()));
+		self
+	}
+
+	/// Wether or not to disable log reloading.
+	pub fn with_log_reloading(&mut self, enabled: bool) -> &mut Self {
+		self.disable_log_reloading = !enabled;
+		self
+	}
+
+	/// Set a custom buffer size for the telemetry.
+	pub fn with_telemetry_buffer_size(&mut self, buffer_size: usize) -> &mut Self {
+		self.telemetry_buffer_size = Some(buffer_size);
+		self
+	}
+
+	/// Set a custom network transport (used for the telemetry).
+	pub fn with_transport(&mut self, transport: ExtTransport) -> &mut Self {
+		self.telemetry_external_transport = Some(transport);
+		self
+	}
+
+	/// Force enable/disable colors.
+	pub fn with_colors(&mut self, enable: bool) -> &mut Self {
+		self.force_colors = Some(enable);
+		self
+	}
+
+	/// Initialize the global logger
+	///
+	/// This sets various global logging and tracing instances and thus may only be called once.
+	pub fn init(self) -> Result<TelemetryWorker> {
+		if let Some((tracing_receiver, profiling_targets)) = self.profiling {
+			// If profiling is activated, we require `trace` logging.
+			let max_level = Some(log::LevelFilter::Trace);
+
+			if self.disable_log_reloading {
+				let (subscriber, telemetry_worker) = get_subscriber_internal(
+					&format!("{},{},sc_tracing=trace", self.pattern, profiling_targets),
+					max_level,
+					self.force_colors,
+					self.telemetry_buffer_size,
+					self.telemetry_external_transport,
+					|builder| builder,
+				)?;
+				let profiling = crate::ProfilingLayer::new(tracing_receiver, &profiling_targets);
+
+				tracing::subscriber::set_global_default(subscriber.with(profiling))?;
+
+				Ok(telemetry_worker)
+			} else {
+				let (subscriber, telemetry_worker) = get_subscriber_internal(
+					&format!("{},{},sc_tracing=trace", self.pattern, profiling_targets),
+					max_level,
+					self.force_colors,
+					self.telemetry_buffer_size,
+					self.telemetry_external_transport,
+					|builder| disable_log_reloading!(builder),
+				)?;
+				let profiling = crate::ProfilingLayer::new(tracing_receiver, &profiling_targets);
+
+				tracing::subscriber::set_global_default(subscriber.with(profiling))?;
+
+				Ok(telemetry_worker)
+			}
+		} else {
+			if self.disable_log_reloading {
+				let (subscriber, telemetry_worker) = get_subscriber_internal(
+					&self.pattern,
+					None,
+					self.force_colors,
+					self.telemetry_buffer_size,
+					self.telemetry_external_transport,
+					|builder| builder,
+				)?;
+
+				tracing::subscriber::set_global_default(subscriber)?;
+
+				Ok(telemetry_worker)
+			} else {
+				let (subscriber, telemetry_worker) = get_subscriber_internal(
+					&self.pattern,
+					None,
+					self.force_colors,
+					self.telemetry_buffer_size,
+					self.telemetry_external_transport,
+					|builder| disable_log_reloading!(builder),
+				)?;
+
+				tracing::subscriber::set_global_default(subscriber)?;
+
+				Ok(telemetry_worker)
+			}
+		}
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use crate as sc_tracing;
+	use std::{env, process::Command};
+	use tracing::{metadata::Kind, subscriber::Interest, Callsite, Level, Metadata};
+
+	const EXPECTED_LOG_MESSAGE: &'static str = "yeah logging works as expected";
+	const EXPECTED_NODE_NAME: &'static str = "THE_NODE";
+
+	fn init_logger(pattern: &str) {
+		let _ = GlobalLoggerBuilder::new(pattern).init().unwrap();
+	}
+
+	fn run_in_process(test_name: &str) {
+		if env::var("RUN_IN_PROCESS").is_err() {
+			let status = Command::new(env::current_exe().unwrap())
+				.arg(test_name)
+				.env("RUN_IN_PROCESS", "true")
+				.status()
+				.unwrap();
+			assert!(status.success(), "process did not ended successfully");
+			std::process::exit(0);
+		}
+	}
+
+	#[test]
+	fn test_logger_filters() {
+		run_in_process("test_logger_filters");
+
+		let test_pattern = "afg=debug,sync=trace,client=warn,telemetry,something-with-dash=error";
+		init_logger(&test_pattern);
+
+		tracing::dispatcher::get_default(|dispatcher| {
+			let test_filter = |target, level| {
+				struct DummyCallSite;
+				impl Callsite for DummyCallSite {
+					fn set_interest(&self, _: Interest) {}
+					fn metadata(&self) -> &Metadata<'_> {
+						unreachable!();
+					}
+				}
+
+				let metadata = tracing::metadata!(
+					name: "",
+					target: target,
+					level: level,
+					fields: &[],
+					callsite: &DummyCallSite,
+					kind: Kind::SPAN,
+				);
+
+				dispatcher.enabled(&metadata)
+			};
+
+			assert!(test_filter("afg", Level::INFO));
+			assert!(test_filter("afg", Level::DEBUG));
+			assert!(!test_filter("afg", Level::TRACE));
+
+			assert!(test_filter("sync", Level::TRACE));
+			assert!(test_filter("client", Level::WARN));
+
+			assert!(test_filter("telemetry", Level::TRACE));
+			assert!(test_filter("something-with-dash", Level::ERROR));
+		});
+	}
+
+	/// This test ensures that using dash (`-`) in the target name in logs and directives actually
+	/// work.
+	#[test]
+	fn dash_in_target_name_works() {
+		let executable = env::current_exe().unwrap();
+		let output = Command::new(executable)
+			.env("ENABLE_LOGGING", "1")
+			.args(&["--nocapture", "log_something_with_dash_target_name"])
+			.output()
+			.unwrap();
+
+		let output = String::from_utf8(output.stderr).unwrap();
+		assert!(output.contains(EXPECTED_LOG_MESSAGE));
+	}
+
+	/// This is not an actual test, it is used by the `dash_in_target_name_works` test.
+	/// The given test will call the test executable and only execute this one test that
+	/// only prints `EXPECTED_LOG_MESSAGE` through logging while using a target
+	/// name that contains a dash. This ensures that target names with dashes work.
+	#[test]
+	fn log_something_with_dash_target_name() {
+		if env::var("ENABLE_LOGGING").is_ok() {
+			let test_pattern = "test-target=info";
+			let _guard = init_logger(&test_pattern);
+
+			log::info!(target: "test-target", "{}", EXPECTED_LOG_MESSAGE);
+		}
+	}
+
+	#[test]
+	fn prefix_in_log_lines() {
+		let re = regex::Regex::new(&format!(
+			r"^\d{{4}}-\d{{2}}-\d{{2}} \d{{2}}:\d{{2}}:\d{{2}}  \[{}\] {}$",
+			EXPECTED_NODE_NAME, EXPECTED_LOG_MESSAGE,
+		))
+		.unwrap();
+		let executable = env::current_exe().unwrap();
+		let output = Command::new(executable)
+			.env("ENABLE_LOGGING", "1")
+			.args(&["--nocapture", "prefix_in_log_lines_entrypoint"])
+			.output()
+			.unwrap();
+
+		let output = String::from_utf8(output.stderr).unwrap();
+		assert!(
+			re.is_match(output.trim()),
+			format!("Expected:\n{}\nGot:\n{}", re, output),
+		);
+	}
+
+	/// This is not an actual test, it is used by the `prefix_in_log_lines` test.
+	/// The given test will call the test executable and only execute this one test that
+	/// only prints a log line prefixed by the node name `EXPECTED_NODE_NAME`.
+	#[test]
+	fn prefix_in_log_lines_entrypoint() {
+		if env::var("ENABLE_LOGGING").is_ok() {
+			let _guard = init_logger("");
+			prefix_in_log_lines_process();
+		}
+	}
+
+	#[crate::logging::prefix_logs_with(EXPECTED_NODE_NAME)]
+	fn prefix_in_log_lines_process() {
+		log::info!("{}", EXPECTED_LOG_MESSAGE);
+	}
+
+	/// This is not an actual test, it is used by the `do_not_write_with_colors_on_tty` test.
+	/// The given test will call the test executable and only execute this one test that
+	/// only prints a log line with some colors in it.
+	#[test]
+	fn do_not_write_with_colors_on_tty_entrypoint() {
+		if env::var("ENABLE_LOGGING").is_ok() {
+			let _guard = init_logger("");
+			log::info!("{}", ansi_term::Colour::Yellow.paint(EXPECTED_LOG_MESSAGE));
+		}
+	}
+
+	#[test]
+	fn do_not_write_with_colors_on_tty() {
+		let re = regex::Regex::new(&format!(
+			r"^\d{{4}}-\d{{2}}-\d{{2}} \d{{2}}:\d{{2}}:\d{{2}}  {}$",
+			EXPECTED_LOG_MESSAGE,
+		))
+		.unwrap();
+		let executable = env::current_exe().unwrap();
+		let output = Command::new(executable)
+			.env("ENABLE_LOGGING", "1")
+			.args(&["--nocapture", "do_not_write_with_colors_on_tty_entrypoint"])
+			.output()
+			.unwrap();
+
+		let output = String::from_utf8(output.stderr).unwrap();
+		assert!(
+			re.is_match(output.trim()),
+			format!("Expected:\n{}\nGot:\n{}", re, output),
+		);
+	}
+
+	#[test]
+	fn log_max_level_is_set_properly() {
+		fn run_test(rust_log: Option<String>, tracing_targets: Option<String>) -> String {
+			let executable = env::current_exe().unwrap();
+			let mut command = Command::new(executable);
+
+			command
+				.env("PRINT_MAX_LOG_LEVEL", "1")
+				.args(&["--nocapture", "log_max_level_is_set_properly"]);
+
+			if let Some(rust_log) = rust_log {
+				command.env("RUST_LOG", rust_log);
+			}
+
+			if let Some(tracing_targets) = tracing_targets {
+				command.env("TRACING_TARGETS", tracing_targets);
+			}
+
+			let output = command.output().unwrap();
+
+			String::from_utf8(output.stderr).unwrap()
+		}
+
+		if env::var("PRINT_MAX_LOG_LEVEL").is_ok() {
+			init_logger(&env::var("TRACING_TARGETS").unwrap_or_default());
+			eprint!("MAX_LOG_LEVEL={:?}", log::max_level());
+		} else {
+			assert_eq!("MAX_LOG_LEVEL=Info", run_test(None, None));
+			assert_eq!(
+				"MAX_LOG_LEVEL=Trace",
+				run_test(Some("test=trace".into()), None)
+			);
+			assert_eq!(
+				"MAX_LOG_LEVEL=Debug",
+				run_test(Some("test=debug".into()), None)
+			);
+			assert_eq!(
+				"MAX_LOG_LEVEL=Trace",
+				run_test(None, Some("test=info".into()))
+			);
+		}
+	}
+}
diff --git a/utils/browser/Cargo.toml b/utils/browser/Cargo.toml
index 7380a308180f..3137c2698ec3 100644
--- a/utils/browser/Cargo.toml
+++ b/utils/browser/Cargo.toml
@@ -18,7 +18,6 @@ futures01 = { package = "futures", version = "0.1.29" }
 log = "0.4.8"
 libp2p-wasm-ext = { version = "0.27", features = ["websocket"] }
 console_error_panic_hook = "0.1.6"
-console_log = "0.2.0"
 js-sys = "0.3.34"
 wasm-bindgen = "0.2.57"
 wasm-bindgen-futures = "0.4.18"
@@ -28,6 +27,8 @@ sc-informant = { version = "0.8.0", path = "../../client/informant" }
 sc-service = { version = "0.8.0", path = "../../client/service", default-features = false }
 sc-network = { path = "../../client/network", version = "0.8.0"}
 sc-chain-spec = { path = "../../client/chain-spec", version = "2.0.0"}
+sc-telemetry = { path = "../../client/telemetry", version = "2.0.0"}
+sc-tracing = { path = "../../client/tracing", version = "2.0.0"}
 
 # Imported just for the `wasm-bindgen` feature
 getrandom = { version = "0.2", features = ["js"] }
diff --git a/utils/browser/src/lib.rs b/utils/browser/src/lib.rs
index c59fbb991bee..5e1e8db31668 100644
--- a/utils/browser/src/lib.rs
+++ b/utils/browser/src/lib.rs
@@ -24,6 +24,8 @@ use sc_service::{
 	GenericChainSpec, RuntimeGenesis,
 	KeepBlocks, TransactionStorageMode,
 };
+use sc_telemetry::TelemetryHandle;
+use sc_tracing::logging::GlobalLoggerBuilder;
 use wasm_bindgen::prelude::*;
 use futures::{
 	prelude::*, channel::{oneshot, mpsc}, compat::*, future::{ready, ok, select}
@@ -33,20 +35,31 @@ use sc_chain_spec::Extension;
 use libp2p_wasm_ext::{ExtTransport, ffi};
 
 pub use console_error_panic_hook::set_once as set_console_error_panic_hook;
-pub use console_log::init_with_level as init_console_log;
+
+/// Initialize the logger and return a `TelemetryWorker` and a wasm `ExtTransport`.
+pub fn init_logging_and_telemetry(
+	pattern: &str,
+) -> Result<sc_telemetry::TelemetryWorker, sc_tracing::logging::Error> {
+	let transport = ExtTransport::new(ffi::websocket_transport());
+	let mut logger = GlobalLoggerBuilder::new(pattern);
+	logger.with_transport(transport);
+	logger.init()
+}
 
 /// Create a service configuration from a chain spec.
 ///
 /// This configuration contains good defaults for a browser light client.
-pub async fn browser_configuration<G, E>(chain_spec: GenericChainSpec<G, E>)
-	-> Result<Configuration, Box<dyn std::error::Error>>
+pub async fn browser_configuration<G, E>(
+	chain_spec: GenericChainSpec<G, E>,
+	telemetry_handle: Option<TelemetryHandle>,
+) -> Result<Configuration, Box<dyn std::error::Error>>
 where
 	G: RuntimeGenesis + 'static,
 	E: Extension + 'static + Send + Sync,
 {
 	let name = chain_spec.name().to_string();
-
 	let transport = ExtTransport::new(ffi::websocket_transport());
+
 	let mut network = NetworkConfiguration::new(
 		format!("{} (Browser)", name),
 		"unknown",
@@ -69,6 +82,7 @@ where
 			async {}
 		}).into(),
 		telemetry_external_transport: Some(transport),
+		telemetry_handle,
 		role: Role::Light,
 		database: {
 			info!("Opening Indexed DB database '{}'...", name);

From 2a5e10a8e53faae2ed41d820c08fb8dfb066d09f Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Wed, 20 Jan 2021 12:29:10 +0100
Subject: [PATCH 0300/1194] Allow validators to block and kick their nominator
 set. (#7930)

* Allow validators to block and kick their nominator set.

* migration

* Test

* Better migration

* Fixes

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Update frame/staking/src/lib.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 frame/offences/benchmarking/src/lib.rs |   1 +
 frame/staking/src/benchmarking.rs      |  57 +++++
 frame/staking/src/lib.rs               |  98 ++++++++-
 frame/staking/src/offchain_election.rs |   3 +
 frame/staking/src/testing_utils.rs     |   2 +
 frame/staking/src/tests.rs             |  27 ++-
 frame/staking/src/weights.rs           | 281 +++++++++++++------------
 7 files changed, 331 insertions(+), 138 deletions(-)

diff --git a/frame/offences/benchmarking/src/lib.rs b/frame/offences/benchmarking/src/lib.rs
index f2807ba6c7a8..1151bfea4807 100644
--- a/frame/offences/benchmarking/src/lib.rs
+++ b/frame/offences/benchmarking/src/lib.rs
@@ -109,6 +109,7 @@ fn create_offender<T: Config>(n: u32, nominators: u32) -> Result<Offender<T>, &'
 
 	let validator_prefs = ValidatorPrefs {
 		commission: Perbill::from_percent(50),
+		.. Default::default()
 	};
 	Staking::<T>::validate(RawOrigin::Signed(controller.clone()).into(), validator_prefs)?;
 
diff --git a/frame/staking/src/benchmarking.rs b/frame/staking/src/benchmarking.rs
index 6009761f365d..beddc326b510 100644
--- a/frame/staking/src/benchmarking.rs
+++ b/frame/staking/src/benchmarking.rs
@@ -63,6 +63,7 @@ pub fn create_validator_with_nominators<T: Config>(
 	let (v_stash, v_controller) = create_stash_controller::<T>(0, 100, destination.clone())?;
 	let validator_prefs = ValidatorPrefs {
 		commission: Perbill::from_percent(50),
+		.. Default::default()
 	};
 	Staking::<T>::validate(RawOrigin::Signed(v_controller).into(), validator_prefs)?;
 	let stash_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(v_stash.clone());
@@ -198,6 +199,61 @@ benchmarks! {
 		assert!(Validators::<T>::contains_key(stash));
 	}
 
+	kick {
+		// scenario: we want to kick `k` nominators from nominating us (we are a validator).
+		// we'll assume that `k` is under 128 for the purposes of determining the slope.
+		// each nominator should have `MAX_NOMINATIONS` validators nominated, and our validator
+		// should be somewhere in there.
+		let k in 1 .. 128;
+
+		// these are the other validators; there are `MAX_NOMINATIONS - 1` of them, so there are a
+		// total of `MAX_NOMINATIONS` validators in the system.
+		let rest_of_validators = create_validators::<T>(MAX_NOMINATIONS as u32 - 1, 100)?;
+
+		// this is the validator that will be kicking.
+		let (stash, controller) = create_stash_controller::<T>(MAX_NOMINATIONS as u32 - 1, 100, Default::default())?;
+		let stash_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(stash.clone());
+
+		// they start validating.
+		Staking::<T>::validate(RawOrigin::Signed(controller.clone()).into(), Default::default())?;
+
+		// we now create the nominators. there will be `k` of them; each will nominate all
+		// validators. we will then kick each of the `k` nominators from the main validator.
+		let mut nominator_stashes = Vec::with_capacity(k as usize);
+		for i in 0 .. k {
+			// create a nominator stash.
+			let (n_stash, n_controller) = create_stash_controller::<T>(MAX_NOMINATIONS as u32 + i, 100, Default::default())?;
+
+			// bake the nominations; we first clone them from the rest of the validators.
+			let mut nominations = rest_of_validators.clone();
+			// then insert "our" validator somewhere in there (we vary it) to avoid accidental
+			// optimisations/pessimisations.
+			nominations.insert(i as usize % (nominations.len() + 1), stash_lookup.clone());
+			// then we nominate.
+			Staking::<T>::nominate(RawOrigin::Signed(n_controller.clone()).into(), nominations)?;
+
+			nominator_stashes.push(n_stash);
+		}
+
+		// all nominators now should be nominating our validator...
+		for n in nominator_stashes.iter() {
+			assert!(Nominators::<T>::get(n).unwrap().targets.contains(&stash));
+		}
+
+		// we need the unlookuped version of the nominator stash for the kick.
+		let kicks = nominator_stashes.iter()
+			.map(|n| T::Lookup::unlookup(n.clone()))
+			.collect::<Vec<_>>();
+
+		whitelist_account!(controller);
+	}: _(RawOrigin::Signed(controller), kicks)
+	verify {
+		// all nominators now should *not* be nominating our validator...
+		for n in nominator_stashes.iter() {
+			assert!(!Nominators::<T>::get(n).unwrap().targets.contains(&stash));
+		}
+	}
+
 	// Worst case scenario, MAX_NOMINATIONS
 	nominate {
 		let n in 1 .. MAX_NOMINATIONS as u32;
@@ -814,6 +870,7 @@ mod tests {
 			assert_ok!(test_benchmark_withdraw_unbonded_update::<Test>());
 			assert_ok!(test_benchmark_withdraw_unbonded_kill::<Test>());
 			assert_ok!(test_benchmark_validate::<Test>());
+			assert_ok!(test_benchmark_kick::<Test>());
 			assert_ok!(test_benchmark_nominate::<Test>());
 			assert_ok!(test_benchmark_chill::<Test>());
 			assert_ok!(test_benchmark_set_payee::<Test>());
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index c3aeaada421b..6c0bbc33a4e3 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -454,12 +454,17 @@ pub struct ValidatorPrefs {
 	/// nominators.
 	#[codec(compact)]
 	pub commission: Perbill,
+	/// Whether or not this validator is accepting more nominations. If `true`, then no nominator
+	/// who is not already nominating this validator may nominate them. By default, validators
+	/// are accepting nominations.
+	pub blocked: bool,
 }
 
 impl Default for ValidatorPrefs {
 	fn default() -> Self {
 		ValidatorPrefs {
 			commission: Default::default(),
+			blocked: false,
 		}
 	}
 }
@@ -896,11 +901,12 @@ enum Releases {
 	V2_0_0,
 	V3_0_0,
 	V4_0_0,
+	V5_0_0,
 }
 
 impl Default for Releases {
 	fn default() -> Self {
-		Releases::V4_0_0
+		Releases::V5_0_0
 	}
 }
 
@@ -1087,8 +1093,8 @@ decl_storage! {
 		/// True if network has been upgraded to this version.
 		/// Storage version of the pallet.
 		///
-		/// This is set to v3.0.0 for new networks.
-		StorageVersion build(|_: &GenesisConfig<T>| Releases::V4_0_0): Releases;
+		/// This is set to v5.0.0 for new networks.
+		StorageVersion build(|_: &GenesisConfig<T>| Releases::V5_0_0): Releases;
 	}
 	add_extra_genesis {
 		config(stakers):
@@ -1124,6 +1130,29 @@ decl_storage! {
 	}
 }
 
+pub mod migrations {
+	use super::*;
+
+	#[derive(Decode)]
+	struct OldValidatorPrefs {
+		#[codec(compact)]
+		pub commission: Perbill
+	}
+	impl OldValidatorPrefs {
+		fn upgraded(self) -> ValidatorPrefs {
+			ValidatorPrefs {
+				commission: self.commission,
+				.. Default::default()
+			}
+		}
+	}
+	pub fn migrate_to_blockable<T: Config>() -> frame_support::weights::Weight {
+		Validators::<T>::translate::<OldValidatorPrefs, _>(|_, p| Some(p.upgraded()));
+		ErasValidatorPrefs::<T>::translate::<OldValidatorPrefs, _>(|_, _, p| Some(p.upgraded()));
+		T::BlockWeights::get().max_block
+	}
+}
+
 decl_event!(
 	pub enum Event<T> where Balance = BalanceOf<T>, <T as frame_system::Config>::AccountId {
 		/// The era payout has been set; the first balance is the validator-payout; the second is
@@ -1152,6 +1181,8 @@ decl_event!(
 		/// An account has called `withdraw_unbonded` and removed unbonding chunks worth `Balance`
 		/// from the unlocking queue. \[stash, amount\]
 		Withdrawn(AccountId, Balance),
+		/// A nominator has been kicked from a validator. \[nominator, stash\]
+		Kicked(AccountId, AccountId),
 	}
 );
 
@@ -1225,6 +1256,10 @@ decl_error! {
 		IncorrectSlashingSpans,
 		/// Internal state has become somehow corrupted and the operation cannot continue.
 		BadState,
+		/// Too many nomination targets supplied.
+		TooManyTargets,
+		/// A nomination target was supplied that was blocked or otherwise not a validator.
+		BadTarget,
 	}
 }
 
@@ -1270,6 +1305,15 @@ decl_module! {
 
 		fn deposit_event() = default;
 
+		fn on_runtime_upgrade() -> frame_support::weights::Weight {
+			if StorageVersion::get() == Releases::V4_0_0 {
+				StorageVersion::put(Releases::V5_0_0);
+				migrations::migrate_to_blockable::<T>()
+			} else {
+				0
+			}
+		}
+
 		/// sets `ElectionStatus` to `Open(now)` where `now` is the block number at which the
 		/// election window has opened, if we are at the last session and less blocks than
 		/// `T::ElectionLookahead` is remaining until the next new session schedule. The offchain
@@ -1675,9 +1719,17 @@ decl_module! {
 			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
 			let stash = &ledger.stash;
 			ensure!(!targets.is_empty(), Error::<T>::EmptyTargets);
+			ensure!(targets.len() <= MAX_NOMINATIONS, Error::<T>::TooManyTargets);
+
+			let old = Nominators::<T>::get(stash).map_or_else(Vec::new, |x| x.targets);
+
 			let targets = targets.into_iter()
-				.take(MAX_NOMINATIONS)
-				.map(|t| T::Lookup::lookup(t))
+				.map(|t| T::Lookup::lookup(t).map_err(DispatchError::from))
+				.map(|n| n.and_then(|n| if old.contains(&n) || !Validators::<T>::get(&n).blocked {
+					Ok(n)
+				} else {
+					Err(Error::<T>::BadTarget.into())
+				}))
 				.collect::<result::Result<Vec<T::AccountId>, _>>()?;
 
 			let nominations = Nominations {
@@ -2168,6 +2220,42 @@ decl_module! {
 
 			Ok(adjustments)
 		}
+
+		/// Remove the given nominations from the calling validator.
+		///
+		/// Effects will be felt at the beginning of the next era.
+		///
+		/// The dispatch origin for this call must be _Signed_ by the controller, not the stash.
+		/// And, it can be only called when [`EraElectionStatus`] is `Closed`. The controller
+		/// account should represent a validator.
+		///
+		/// - `who`: A list of nominator stash accounts who are nominating this validator which
+		///   should no longer be nominating this validator.
+		///
+		/// Note: Making this call only makes sense if you first set the validator preferences to
+		/// block any further nominations.
+		#[weight = T::WeightInfo::kick(who.len() as u32)]
+		pub fn kick(origin, who: Vec<<T::Lookup as StaticLookup>::Source>) -> DispatchResult {
+			let controller = ensure_signed(origin)?;
+			ensure!(Self::era_election_status().is_closed(), Error::<T>::CallNotAllowed);
+			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
+			let stash = &ledger.stash;
+
+			for nom_stash in who.into_iter()
+				.map(T::Lookup::lookup)
+				.collect::<Result<Vec<T::AccountId>, _>>()?
+				.into_iter()
+			{
+				Nominators::<T>::mutate(&nom_stash, |maybe_nom| if let Some(ref mut nom) = maybe_nom {
+					if let Some(pos) = nom.targets.iter().position(|v| v == stash) {
+						nom.targets.swap_remove(pos);
+						Self::deposit_event(RawEvent::Kicked(nom_stash.clone(), stash.clone()));
+					}
+				});
+			}
+
+			Ok(())
+		}
 	}
 }
 
diff --git a/frame/staking/src/offchain_election.rs b/frame/staking/src/offchain_election.rs
index 5b1fe44d7e2c..2ab29b7105d9 100644
--- a/frame/staking/src/offchain_election.rs
+++ b/frame/staking/src/offchain_election.rs
@@ -520,6 +520,9 @@ mod test {
 		fn submit_solution_better(v: u32, n: u32, a: u32, w: u32) -> Weight {
 			(0 * v + 0 * n + 1000 * a + 0 * w) as Weight
 		}
+		fn kick(w: u32) -> Weight {
+			unimplemented!()
+		}
 	}
 
 	#[test]
diff --git a/frame/staking/src/testing_utils.rs b/frame/staking/src/testing_utils.rs
index c8d8cb28e2b2..a30c0136550b 100644
--- a/frame/staking/src/testing_utils.rs
+++ b/frame/staking/src/testing_utils.rs
@@ -92,6 +92,7 @@ pub fn create_validators<T: Config>(
 		let (stash, controller) = create_stash_controller::<T>(i, balance_factor, RewardDestination::Staked)?;
 		let validator_prefs = ValidatorPrefs {
 			commission: Perbill::from_percent(50),
+			.. Default::default()
 		};
 		Staking::<T>::validate(RawOrigin::Signed(controller).into(), validator_prefs)?;
 		let stash_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(stash);
@@ -134,6 +135,7 @@ pub fn create_validators_with_nominators_for_era<T: Config>(
 		let (v_stash, v_controller) = create_stash_controller::<T>(i, balance_factor, RewardDestination::Staked)?;
 		let validator_prefs = ValidatorPrefs {
 			commission: Perbill::from_percent(50),
+			.. Default::default()
 		};
 		Staking::<T>::validate(RawOrigin::Signed(v_controller.clone()).into(), validator_prefs)?;
 		let stash_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(v_stash.clone());
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index 914aff9c4524..a10c95d0f24d 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -364,6 +364,30 @@ fn staking_should_work() {
 		});
 }
 
+#[test]
+fn blocking_and_kicking_works() {
+	ExtBuilder::default()
+		.minimum_validator_count(1)
+		.validator_count(4)
+		.nominate(true)
+		.num_validators(3)
+		.build()
+		.execute_with(|| {
+			// block validator 10/11
+			assert_ok!(Staking::validate(Origin::signed(10), ValidatorPrefs { blocked: true, .. Default::default() }));
+			// attempt to nominate from 100/101...
+			assert_ok!(Staking::nominate(Origin::signed(100), vec![11]));
+			// should have worked since we're already nominated them
+			assert_eq!(Nominators::<Test>::get(&101).unwrap().targets, vec![11]);
+			// kick the nominator
+			assert_ok!(Staking::kick(Origin::signed(10), vec![101]));
+			// should have been kicked now
+			assert!(Nominators::<Test>::get(&101).unwrap().targets.is_empty());
+			// attempt to nominate from 100/101...
+			assert_noop!(Staking::nominate(Origin::signed(100), vec![11]), Error::<Test>::BadTarget);
+		});
+}
+
 #[test]
 fn less_than_needed_candidates_works() {
 	ExtBuilder::default()
@@ -403,7 +427,7 @@ fn no_candidate_emergency_condition() {
 		.execute_with(|| {
 			// initial validators
 			assert_eq_uvec!(validator_controllers(), vec![10, 20, 30, 40]);
-			let prefs = ValidatorPrefs { commission: Perbill::one() };
+			let prefs = ValidatorPrefs { commission: Perbill::one(), .. Default::default() };
 			<Staking as crate::Store>::Validators::insert(11, prefs.clone());
 
 			// set the minimum validator count.
@@ -971,6 +995,7 @@ fn validator_payment_prefs_work() {
 		let commission = Perbill::from_percent(40);
 		<Validators<Test>>::insert(&11, ValidatorPrefs {
 			commission: commission.clone(),
+			.. Default::default()
 		});
 
 		// Reward controller so staked ratio doesn't change.
diff --git a/frame/staking/src/weights.rs b/frame/staking/src/weights.rs
index c0099f637850..b70563ccf41b 100644
--- a/frame/staking/src/weights.rs
+++ b/frame/staking/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Weights for pallet_staking
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! Autogenerated weights for pallet_staking
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.1
+//! DATE: 2021-01-19, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -46,10 +47,11 @@ pub trait WeightInfo {
 	fn bond() -> Weight;
 	fn bond_extra() -> Weight;
 	fn unbond() -> Weight;
-	fn withdraw_unbonded_update(_s: u32, ) -> Weight;
-	fn withdraw_unbonded_kill(_s: u32, ) -> Weight;
+	fn withdraw_unbonded_update(s: u32, ) -> Weight;
+	fn withdraw_unbonded_kill(s: u32, ) -> Weight;
 	fn validate() -> Weight;
-	fn nominate(_n: u32, ) -> Weight;
+	fn kick(k: u32, ) -> Weight;
+	fn nominate(n: u32, ) -> Weight;
 	fn chill() -> Weight;
 	fn set_payee() -> Weight;
 	fn set_controller() -> Weight;
@@ -57,167 +59,172 @@ pub trait WeightInfo {
 	fn force_no_eras() -> Weight;
 	fn force_new_era() -> Weight;
 	fn force_new_era_always() -> Weight;
-	fn set_invulnerables(_v: u32, ) -> Weight;
-	fn force_unstake(_s: u32, ) -> Weight;
-	fn cancel_deferred_slash(_s: u32, ) -> Weight;
-	fn payout_stakers_dead_controller(_n: u32, ) -> Weight;
-	fn payout_stakers_alive_staked(_n: u32, ) -> Weight;
-	fn rebond(_l: u32, ) -> Weight;
-	fn set_history_depth(_e: u32, ) -> Weight;
-	fn reap_stash(_s: u32, ) -> Weight;
-	fn new_era(_v: u32, _n: u32, ) -> Weight;
-	fn submit_solution_better(_v: u32, _n: u32, _a: u32, _w: u32, ) -> Weight;
-
+	fn set_invulnerables(v: u32, ) -> Weight;
+	fn force_unstake(s: u32, ) -> Weight;
+	fn cancel_deferred_slash(s: u32, ) -> Weight;
+	fn payout_stakers_dead_controller(n: u32, ) -> Weight;
+	fn payout_stakers_alive_staked(n: u32, ) -> Weight;
+	fn rebond(l: u32, ) -> Weight;
+	fn set_history_depth(e: u32, ) -> Weight;
+	fn reap_stash(s: u32, ) -> Weight;
+	fn new_era(v: u32, n: u32, ) -> Weight;
+	fn submit_solution_better(v: u32, n: u32, a: u32, w: u32, ) -> Weight;
 }
 
 /// Weights for pallet_staking using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn bond() -> Weight {
-		(99_659_000 as Weight)
+		(76_281_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
-
 	}
 	fn bond_extra() -> Weight {
-		(79_045_000 as Weight)
+		(62_062_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-
 	}
 	fn unbond() -> Weight {
-		(71_716_000 as Weight)
+		(57_195_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-
 	}
 	fn withdraw_unbonded_update(s: u32, ) -> Weight {
-		(72_835_000 as Weight)
-			.saturating_add((63_000 as Weight).saturating_mul(s as Weight))
+		(58_043_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((52_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-
 	}
 	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
-		(118_239_000 as Weight)
-			.saturating_add((3_910_000 as Weight).saturating_mul(s as Weight))
+		(89_920_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((2_526_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes(8 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn validate() -> Weight {
-		(25_691_000 as Weight)
+		(20_228_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-
+	}
+	fn kick(k: u32, ) -> Weight {
+		(31_066_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((17_754_000 as Weight).saturating_mul(k as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(k as Weight)))
+			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn nominate(n: u32, ) -> Weight {
-		(35_374_000 as Weight)
-			.saturating_add((203_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+		(33_494_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((5_253_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-
 	}
 	fn chill() -> Weight {
-		(25_227_000 as Weight)
+		(19_396_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-
 	}
 	fn set_payee() -> Weight {
-		(17_601_000 as Weight)
+		(13_449_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-
 	}
 	fn set_controller() -> Weight {
-		(37_514_000 as Weight)
+		(29_184_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-
 	}
 	fn set_validator_count() -> Weight {
-		(3_338_000 as Weight)
+		(2_266_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-
 	}
 	fn force_no_eras() -> Weight {
-		(3_869_000 as Weight)
+		(2_462_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-
 	}
 	fn force_new_era() -> Weight {
-		(3_795_000 as Weight)
+		(2_483_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-
 	}
 	fn force_new_era_always() -> Weight {
-		(3_829_000 as Weight)
+		(2_495_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-
 	}
 	fn set_invulnerables(v: u32, ) -> Weight {
-		(4_087_000 as Weight)
+		(2_712_000 as Weight)
+			// Standard Error: 0
 			.saturating_add((9_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-
 	}
 	fn force_unstake(s: u32, ) -> Weight {
-		(81_063_000 as Weight)
-			.saturating_add((3_872_000 as Weight).saturating_mul(s as Weight))
+		(60_508_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((2_525_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(8 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn cancel_deferred_slash(s: u32, ) -> Weight {
-		(5_840_640_000 as Weight)
-			.saturating_add((34_806_000 as Weight).saturating_mul(s as Weight))
+		(5_886_772_000 as Weight)
+			// Standard Error: 393_000
+			.saturating_add((34_849_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-
 	}
 	fn payout_stakers_dead_controller(n: u32, ) -> Weight {
-		(153_024_000 as Weight)
-			.saturating_add((59_909_000 as Weight).saturating_mul(n as Weight))
+		(127_627_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((49_354_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(11 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(n as Weight)))
 	}
 	fn payout_stakers_alive_staked(n: u32, ) -> Weight {
-		(196_058_000 as Weight)
-			.saturating_add((78_955_000 as Weight).saturating_mul(n as Weight))
+		(156_838_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((62_653_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(12 as Weight))
 			.saturating_add(T::DbWeight::get().reads((5 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(n as Weight)))
 	}
 	fn rebond(l: u32, ) -> Weight {
-		(49_966_000 as Weight)
-			.saturating_add((92_000 as Weight).saturating_mul(l as Weight))
+		(40_110_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((78_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-
 	}
 	fn set_history_depth(e: u32, ) -> Weight {
 		(0 as Weight)
-			.saturating_add((38_529_000 as Weight).saturating_mul(e as Weight))
+			// Standard Error: 70_000
+			.saturating_add((32_883_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes((7 as Weight).saturating_mul(e as Weight)))
 	}
 	fn reap_stash(s: u32, ) -> Weight {
-		(101_457_000 as Weight)
-			.saturating_add((3_914_000 as Weight).saturating_mul(s as Weight))
+		(64_605_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((2_506_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(8 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn new_era(v: u32, n: u32, ) -> Weight {
 		(0 as Weight)
-			.saturating_add((948_467_000 as Weight).saturating_mul(v as Weight))
-			.saturating_add((117_579_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(10 as Weight))
+			// Standard Error: 926_000
+			.saturating_add((548_212_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 46_000
+			.saturating_add((78_343_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(8 as Weight))
@@ -225,166 +232,174 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	}
 	fn submit_solution_better(v: u32, n: u32, a: u32, w: u32, ) -> Weight {
 		(0 as Weight)
-			.saturating_add((1_728_000 as Weight).saturating_mul(v as Weight))
-			.saturating_add((907_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add((99_762_000 as Weight).saturating_mul(a as Weight))
-			.saturating_add((9_017_000 as Weight).saturating_mul(w as Weight))
+			// Standard Error: 48_000
+			.saturating_add((937_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 19_000
+			.saturating_add((657_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 48_000
+			.saturating_add((70_669_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 101_000
+			.saturating_add((7_658_000 as Weight).saturating_mul(w as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(a as Weight)))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(w as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-
 	}
-
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn bond() -> Weight {
-		(99_659_000 as Weight)
+		(76_281_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
-
 	}
 	fn bond_extra() -> Weight {
-		(79_045_000 as Weight)
+		(62_062_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-
 	}
 	fn unbond() -> Weight {
-		(71_716_000 as Weight)
+		(57_195_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
-
 	}
 	fn withdraw_unbonded_update(s: u32, ) -> Weight {
-		(72_835_000 as Weight)
-			.saturating_add((63_000 as Weight).saturating_mul(s as Weight))
+		(58_043_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((52_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
-
 	}
 	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
-		(118_239_000 as Weight)
-			.saturating_add((3_910_000 as Weight).saturating_mul(s as Weight))
+		(89_920_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((2_526_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn validate() -> Weight {
-		(25_691_000 as Weight)
+		(20_228_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-
+	}
+	fn kick(k: u32, ) -> Weight {
+		(31_066_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((17_754_000 as Weight).saturating_mul(k as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(k as Weight)))
+			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn nominate(n: u32, ) -> Weight {
-		(35_374_000 as Weight)
-			.saturating_add((203_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+		(33_494_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((5_253_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-
 	}
 	fn chill() -> Weight {
-		(25_227_000 as Weight)
+		(19_396_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-
 	}
 	fn set_payee() -> Weight {
-		(17_601_000 as Weight)
+		(13_449_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-
 	}
 	fn set_controller() -> Weight {
-		(37_514_000 as Weight)
+		(29_184_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
-
 	}
 	fn set_validator_count() -> Weight {
-		(3_338_000 as Weight)
+		(2_266_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-
 	}
 	fn force_no_eras() -> Weight {
-		(3_869_000 as Weight)
+		(2_462_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-
 	}
 	fn force_new_era() -> Weight {
-		(3_795_000 as Weight)
+		(2_483_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-
 	}
 	fn force_new_era_always() -> Weight {
-		(3_829_000 as Weight)
+		(2_495_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-
 	}
 	fn set_invulnerables(v: u32, ) -> Weight {
-		(4_087_000 as Weight)
+		(2_712_000 as Weight)
+			// Standard Error: 0
 			.saturating_add((9_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-
 	}
 	fn force_unstake(s: u32, ) -> Weight {
-		(81_063_000 as Weight)
-			.saturating_add((3_872_000 as Weight).saturating_mul(s as Weight))
+		(60_508_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((2_525_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn cancel_deferred_slash(s: u32, ) -> Weight {
-		(5_840_640_000 as Weight)
-			.saturating_add((34_806_000 as Weight).saturating_mul(s as Weight))
+		(5_886_772_000 as Weight)
+			// Standard Error: 393_000
+			.saturating_add((34_849_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-
 	}
 	fn payout_stakers_dead_controller(n: u32, ) -> Weight {
-		(153_024_000 as Weight)
-			.saturating_add((59_909_000 as Weight).saturating_mul(n as Weight))
+		(127_627_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((49_354_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(11 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(n as Weight)))
 	}
 	fn payout_stakers_alive_staked(n: u32, ) -> Weight {
-		(196_058_000 as Weight)
-			.saturating_add((78_955_000 as Weight).saturating_mul(n as Weight))
+		(156_838_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((62_653_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(12 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((5 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(n as Weight)))
 	}
 	fn rebond(l: u32, ) -> Weight {
-		(49_966_000 as Weight)
-			.saturating_add((92_000 as Weight).saturating_mul(l as Weight))
+		(40_110_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((78_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
-
 	}
 	fn set_history_depth(e: u32, ) -> Weight {
 		(0 as Weight)
-			.saturating_add((38_529_000 as Weight).saturating_mul(e as Weight))
+			// Standard Error: 70_000
+			.saturating_add((32_883_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((7 as Weight).saturating_mul(e as Weight)))
 	}
 	fn reap_stash(s: u32, ) -> Weight {
-		(101_457_000 as Weight)
-			.saturating_add((3_914_000 as Weight).saturating_mul(s as Weight))
+		(64_605_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((2_506_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn new_era(v: u32, n: u32, ) -> Weight {
 		(0 as Weight)
-			.saturating_add((948_467_000 as Weight).saturating_mul(v as Weight))
-			.saturating_add((117_579_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
+			// Standard Error: 926_000
+			.saturating_add((548_212_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 46_000
+			.saturating_add((78_343_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((4 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
@@ -392,15 +407,17 @@ impl WeightInfo for () {
 	}
 	fn submit_solution_better(v: u32, n: u32, a: u32, w: u32, ) -> Weight {
 		(0 as Weight)
-			.saturating_add((1_728_000 as Weight).saturating_mul(v as Weight))
-			.saturating_add((907_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add((99_762_000 as Weight).saturating_mul(a as Weight))
-			.saturating_add((9_017_000 as Weight).saturating_mul(w as Weight))
+			// Standard Error: 48_000
+			.saturating_add((937_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 19_000
+			.saturating_add((657_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 48_000
+			.saturating_add((70_669_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 101_000
+			.saturating_add((7_658_000 as Weight).saturating_mul(w as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((4 as Weight).saturating_mul(a as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(w as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-
 	}
-
 }

From d5bdd81de1af28250f4bef32a06a6e2dfd80c800 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Wed, 20 Jan 2021 14:19:49 +0000
Subject: [PATCH 0301/1194] Fix elections-phragmen and proxy issue (#7040)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix elections-phragmen and proxy issue

* remove TODO

* Update bond to be per-vote

* Update frame/elections-phragmen/src/lib.rs

* Fix benchmakrs

* Fix weight as well.

* Add license

* Make weight interpreted wasm! 🤦🏻‍♂️

* Remove a bunch of TODOs

* Add migration

* Better storage version.

* Functionify.

* Fix deposit scheme.

* remove legacy bond.

* Master.into()

* better logging.

* Fix benchmarking test

* Fix confused deposit collection.

* Add fine

* Better name for storage item

* Fix name again.

* remove unused

* Update frame/elections-phragmen/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Update frame/elections-phragmen/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* cargo run --release --features runtime-benchmarks --manifest-path bin/node/cli/Cargo.toml -- benchmark --chain dev --steps 50 --repeat 20 --extrinsic * --execution=wasm --wasm-execution=compiled --output ./bin/node/runtime/src/weights --header ./HEADER --pallet pallet_elections_phragmen

* new weight fns

* Fix build

* Fix line width

* fix benchmakrs

* fix warning

* cargo run --release --features runtime-benchmarks --manifest-path bin/node/cli/Cargo.toml -- benchmark --chain dev --steps 50 --repeat 20 --extrinsic * --execution=wasm --wasm-execution=compiled --output ./bin/node/runtime/src/weights --header ./HEADER --pallet pallet_elections_phragmen

* Tune the stake again

* cargo run --release --features runtime-benchmarks --manifest-path bin/node/cli/Cargo.toml -- benchmark --chain dev --steps 50 --repeat 20 --extrinsic * --execution=wasm --wasm-execution=compiled --output ./bin/node/runtime/src/weights --header ./HEADER --pallet pallet_elections_phragmen

* All tests work again.

* A large number of fixes.

* more fixes.

* Fix node build

* Some fixes to benchmarks

* Fix some warnings.

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_elections_phragmen --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/elections-phragmen/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_elections_phragmen --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/elections-phragmen/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Update frame/elections-phragmen/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* a batch of review comments.

* Fix a test.

* Fix some more tests.

* do migration with pallet version???

* Final touches.

* Remove unused storage.

* another rounds of changes and fixes.

* Update frame/elections-phragmen/src/lib.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Update frame/elections-phragmen/src/lib.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Review grumbles.

* Fix a bit more.

* Fix build

* Experimental: independent migration.

* WIP: isolated migration logics

* clean up.

* make migration struct private and move migration to own file

* add doc

* fix StorageInstance new syntax

* Update frame/elections-phragmen/src/migrations_3_0_0.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* another round of self-review.

* bit better formatting

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_elections_phragmen --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/elections-phragmen/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Fix tests.

* Round of self-review

* Clean migrations

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_elections_phragmen --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/elections-phragmen/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Revert unwanted change to construct-runtime

Co-authored-by: Gavin Wood <gavin@parity.io>
Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
---
 Cargo.lock                                    |    2 +-
 bin/node/runtime/Cargo.toml                   |    2 +-
 bin/node/runtime/src/lib.rs                   |    9 +-
 frame/collective/src/lib.rs                   |    6 +-
 frame/elections-phragmen/CHANGELOG.md         |   24 +
 frame/elections-phragmen/Cargo.toml           |    2 +-
 frame/elections-phragmen/src/benchmarking.rs  |  326 ++-
 frame/elections-phragmen/src/lib.rs           | 2183 +++++++++--------
 .../src/migrations_3_0_0.rs                   |  195 ++
 frame/elections-phragmen/src/weights.rs       |  209 +-
 frame/support/src/traits.rs                   |   11 +-
 11 files changed, 1672 insertions(+), 1297 deletions(-)
 create mode 100644 frame/elections-phragmen/CHANGELOG.md
 create mode 100644 frame/elections-phragmen/src/migrations_3_0_0.rs

diff --git a/Cargo.lock b/Cargo.lock
index ffc0f5b940a9..1930628146ce 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4547,7 +4547,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-elections-phragmen"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index d3cc0101e082..6ff98e5b3aa2 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -54,7 +54,7 @@ pallet-contracts = { version = "2.0.0", default-features = false, path = "../../
 pallet-contracts-primitives = { version = "2.0.0", default-features = false, path = "../../../frame/contracts/common/" }
 pallet-contracts-rpc-runtime-api = { version = "0.8.0", default-features = false, path = "../../../frame/contracts/rpc/runtime-api/" }
 pallet-democracy = { version = "2.0.0", default-features = false, path = "../../../frame/democracy" }
-pallet-elections-phragmen = { version = "2.0.0", default-features = false, path = "../../../frame/elections-phragmen" }
+pallet-elections-phragmen = { version = "3.0.0", default-features = false, path = "../../../frame/elections-phragmen" }
 pallet-grandpa = { version = "2.0.0", default-features = false, path = "../../../frame/grandpa" }
 pallet-im-online = { version = "2.0.0", default-features = false, path = "../../../frame/im-online" }
 pallet-indices = { version = "2.0.0", default-features = false, path = "../../../frame/indices" }
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 92e5dfa7830a..e74c61a9c0eb 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -579,7 +579,10 @@ impl pallet_collective::Config<CouncilCollective> for Runtime {
 
 parameter_types! {
 	pub const CandidacyBond: Balance = 10 * DOLLARS;
-	pub const VotingBond: Balance = 1 * DOLLARS;
+	// 1 storage item created, key size is 32 bytes, value size is 16+16.
+	pub const VotingBondBase: Balance = deposit(1, 64);
+	// additional data per vote is 32 bytes (account id).
+	pub const VotingBondFactor: Balance = deposit(0, 32);
 	pub const TermDuration: BlockNumber = 7 * DAYS;
 	pub const DesiredMembers: u32 = 13;
 	pub const DesiredRunnersUp: u32 = 7;
@@ -599,9 +602,9 @@ impl pallet_elections_phragmen::Config for Runtime {
 	type InitializeMembers = Council;
 	type CurrencyToVote = U128CurrencyToVote;
 	type CandidacyBond = CandidacyBond;
-	type VotingBond = VotingBond;
+	type VotingBondBase = VotingBondBase;
+	type VotingBondFactor = VotingBondFactor;
 	type LoserCandidate = ();
-	type BadReport = ();
 	type KickedMember = ();
 	type DesiredMembers = DesiredMembers;
 	type DesiredRunnersUp = DesiredRunnersUp;
diff --git a/frame/collective/src/lib.rs b/frame/collective/src/lib.rs
index 7c41b97996a6..b2993fd45eb3 100644
--- a/frame/collective/src/lib.rs
+++ b/frame/collective/src/lib.rs
@@ -40,7 +40,7 @@
 //! If there are not, or if no prime is set, then the motion is dropped without being executed.
 
 #![cfg_attr(not(feature = "std"), no_std)]
-#![recursion_limit="128"]
+#![recursion_limit = "128"]
 
 use sp_std::{prelude::*, result};
 use sp_core::u32_trait::Value as U32;
@@ -840,6 +840,10 @@ impl<T: Config<I>, I: Instance> ChangeMembers<T::AccountId> for Module<T, I> {
 	fn set_prime(prime: Option<T::AccountId>) {
 		Prime::<T, I>::set(prime);
 	}
+
+	fn get_prime() -> Option<T::AccountId> {
+		Prime::<T, I>::get()
+	}
 }
 
 impl<T: Config<I>, I: Instance> InitializeMembers<T::AccountId> for Module<T, I> {
diff --git a/frame/elections-phragmen/CHANGELOG.md b/frame/elections-phragmen/CHANGELOG.md
new file mode 100644
index 000000000000..3d48448fa55e
--- /dev/null
+++ b/frame/elections-phragmen/CHANGELOG.md
@@ -0,0 +1,24 @@
+# Changelog
+All notable changes to this crate will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this crate adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [3.0.0] - UNRELEASED
+
+### Added
+[Add slashing events to elections-phragmen](https://github.com/paritytech/substrate/pull/7543)
+
+### Changed
+
+### Fixed
+[Don't slash all outgoing members](https://github.com/paritytech/substrate/pull/7394)
+[Fix wrong outgoing calculation in election](https://github.com/paritytech/substrate/pull/7384)
+
+### Security
+\[**Needs Migration**\] [Fix elections-phragmen and proxy issue + Record deposits on-chain](https://github.com/paritytech/substrate/pull/7040)
+
+## [2.0.0] - 2020-09-2020
+
+Initial version from which version tracking has begun.
+
diff --git a/frame/elections-phragmen/Cargo.toml b/frame/elections-phragmen/Cargo.toml
index 55cbcfe985d5..2571dff7c890 100644
--- a/frame/elections-phragmen/Cargo.toml
+++ b/frame/elections-phragmen/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-elections-phragmen"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/elections-phragmen/src/benchmarking.rs b/frame/elections-phragmen/src/benchmarking.rs
index 3ed4af2487df..511d2751a5d7 100644
--- a/frame/elections-phragmen/src/benchmarking.rs
+++ b/frame/elections-phragmen/src/benchmarking.rs
@@ -69,20 +69,6 @@ fn candidate_count<T: Config>() -> u32 {
 	<Candidates<T>>::decode_len().unwrap_or(0usize) as u32
 }
 
-/// Get the number of votes of a voter.
-fn vote_count_of<T: Config>(who: &T::AccountId) -> u32 {
-	<Voting<T>>::get(who).1.len() as u32
-}
-
-/// A `DefunctVoter` struct with correct value
-fn defunct_for<T: Config>(who: T::AccountId) -> DefunctVoter<Lookup<T>> {
-	DefunctVoter {
-		who: as_lookup::<T>(who.clone()),
-		candidate_count: candidate_count::<T>(),
-		vote_count: vote_count_of::<T>(&who),
-	}
-}
-
 /// Add `c` new candidates.
 fn submit_candidates<T: Config>(c: u32, prefix: &'static str)
 	-> Result<Vec<T::AccountId>, &'static str>
@@ -104,7 +90,7 @@ fn submit_candidates_with_self_vote<T: Config>(c: u32, prefix: &'static str)
 	let candidates = submit_candidates::<T>(c, prefix)?;
 	let stake = default_stake::<T>(BALANCE_FACTOR);
 	let _ = candidates.iter().map(|c|
-		submit_voter::<T>(c.clone(), vec![c.clone()], stake)
+		submit_voter::<T>(c.clone(), vec![c.clone()], stake).map(|_| ())
 	).collect::<Result<_, _>>()?;
 	Ok(candidates)
 }
@@ -112,7 +98,7 @@ fn submit_candidates_with_self_vote<T: Config>(c: u32, prefix: &'static str)
 
 /// Submit one voter.
 fn submit_voter<T: Config>(caller: T::AccountId, votes: Vec<T::AccountId>, stake: BalanceOf<T>)
-	-> Result<(), sp_runtime::DispatchError>
+	-> frame_support::dispatch::DispatchResult
 {
 	<Elections<T>>::vote(RawOrigin::Signed(caller).into(), votes, stake)
 }
@@ -152,8 +138,8 @@ fn fill_seats_up_to<T: Config>(m: u32) -> Result<Vec<T::AccountId>, &'static str
 	Ok(
 		<Elections<T>>::members()
 			.into_iter()
-			.map(|(x, _)| x)
-			.chain(<Elections<T>>::runners_up().into_iter().map(|(x, _)| x))
+			.map(|m| m.who)
+			.chain(<Elections<T>>::runners_up().into_iter().map(|r| r.who))
 			.collect()
 	)
 }
@@ -163,12 +149,12 @@ fn clean<T: Config>() {
 	<Members<T>>::kill();
 	<Candidates<T>>::kill();
 	<RunnersUp<T>>::kill();
-	let _ = <Voting<T>>::drain();
+	<Voting<T>>::remove_all();
 }
 
 benchmarks! {
 	// -- Signed ones
-	vote {
+	vote_equal {
 		let v in 1 .. (MAXIMUM_VOTE as u32);
 		clean::<T>();
 
@@ -178,14 +164,39 @@ benchmarks! {
 		let caller = endowed_account::<T>("caller", 0);
 		let stake = default_stake::<T>(BALANCE_FACTOR);
 
-		// vote for all of them.
-		let votes = all_candidates;
+		// original votes.
+		let mut votes = all_candidates;
+		submit_voter::<T>(caller.clone(), votes.clone(), stake)?;
+
+		// new votes.
+		votes.rotate_left(1);
 
 		whitelist!(caller);
-	}: _(RawOrigin::Signed(caller), votes, stake)
+	}: vote(RawOrigin::Signed(caller), votes, stake)
 
-	vote_update {
-		let v in 1 .. (MAXIMUM_VOTE as u32);
+	vote_more {
+		let v in 2 .. (MAXIMUM_VOTE  as u32);
+		clean::<T>();
+
+		// create a bunch of candidates.
+		let all_candidates = submit_candidates::<T>(v, "candidates")?;
+
+		let caller = endowed_account::<T>("caller", 0);
+		let stake = default_stake::<T>(BALANCE_FACTOR);
+
+		// original votes.
+		let mut votes = all_candidates.iter().skip(1).cloned().collect::<Vec<_>>();
+		submit_voter::<T>(caller.clone(), votes.clone(), stake / <BalanceOf<T>>::from(10u32))?;
+
+		// new votes.
+		votes = all_candidates;
+		assert!(votes.len() > <Voting<T>>::get(caller.clone()).votes.len());
+
+		whitelist!(caller);
+	}: vote(RawOrigin::Signed(caller), votes, stake / <BalanceOf<T>>::from(10u32))
+
+	vote_less {
+		let v in 2 .. (MAXIMUM_VOTE  as u32);
 		clean::<T>();
 
 		// create a bunch of candidates.
@@ -199,7 +210,8 @@ benchmarks! {
 		submit_voter::<T>(caller.clone(), votes.clone(), stake)?;
 
 		// new votes.
-		votes.rotate_left(1);
+		votes = votes.into_iter().skip(1).collect::<Vec<_>>();
+		assert!(votes.len() < <Voting<T>>::get(caller.clone()).votes.len());
 
 		whitelist!(caller);
 	}: vote(RawOrigin::Signed(caller), votes, stake)
@@ -220,123 +232,6 @@ benchmarks! {
 		whitelist!(caller);
 	}: _(RawOrigin::Signed(caller))
 
-	report_defunct_voter_correct {
-		// number of already existing candidates that may or may not be voted by the reported
-		// account.
-		let c in 1 .. MAX_CANDIDATES;
-		// number of candidates that the reported voter voted for. The worse case of search here is
-		// basically `c * v`.
-		let v in 1 .. (MAXIMUM_VOTE as u32);
-		// we fix the number of members to the number of desired members and runners-up. We'll be in
-		// this state almost always.
-		let m = T::DesiredMembers::get() + T::DesiredRunnersUp::get();
-
-		clean::<T>();
-		let stake = default_stake::<T>(BALANCE_FACTOR);
-
-		// create m members and runners combined.
-		let _ = fill_seats_up_to::<T>(m)?;
-
-		// create a bunch of candidates as well.
-		let bailing_candidates = submit_candidates::<T>(v, "bailing_candidates")?;
-		let all_candidates = submit_candidates::<T>(c, "all_candidates")?;
-
-		// account 1 is the reporter and must be whitelisted, and a voter.
-		let account_1 = endowed_account::<T>("caller", 0);
-		submit_voter::<T>(
-			account_1.clone(),
-			all_candidates.iter().take(1).cloned().collect(),
-			stake,
-		)?;
-
-		// account 2 votes for all of the mentioned candidates.
-		let account_2 = endowed_account::<T>("caller_2", 1);
-		submit_voter::<T>(
-			account_2.clone(),
-			bailing_candidates.clone(),
-			stake,
-		)?;
-
-		// all the bailers go away. NOTE: we can simplify this. There's no need to create all these
-		// candidates and remove them. The defunct voter can just vote for random accounts as long
-		// as there are enough members (potential candidates).
-		bailing_candidates.into_iter().for_each(|b| {
-			let count = candidate_count::<T>();
-			assert!(<Elections<T>>::renounce_candidacy(
-				RawOrigin::Signed(b).into(),
-				Renouncing::Candidate(count),
-			).is_ok());
-		});
-
-		let defunct_info = defunct_for::<T>(account_2.clone());
-		whitelist!(account_1);
-
-		assert!(<Elections<T>>::is_voter(&account_2));
-	}: report_defunct_voter(RawOrigin::Signed(account_1.clone()), defunct_info)
-	verify {
-		assert!(!<Elections<T>>::is_voter(&account_2));
-		#[cfg(test)]
-		{
-			// reset members in between benchmark tests.
-			use crate::tests::MEMBERS;
-			MEMBERS.with(|m| *m.borrow_mut() = vec![]);
-		}
-	}
-
-	report_defunct_voter_incorrect {
-		// number of already existing candidates that may or may not be voted by the reported
-		// account.
-		let c in 1 .. MAX_CANDIDATES;
-		// number of candidates that the reported voter voted for. The worse case of search here is
-		// basically `c * v`.
-		let v in 1 .. (MAXIMUM_VOTE as u32);
-		// we fix the number of members to the number of desired members and runners-up. We'll be in
-		// this state almost always.
-		let m = T::DesiredMembers::get() + T::DesiredRunnersUp::get();
-
-		clean::<T>();
-		let stake = default_stake::<T>(BALANCE_FACTOR);
-
-		// create m members and runners combined.
-		let _ = fill_seats_up_to::<T>(m)?;
-
-		// create a bunch of candidates as well.
-		let all_candidates = submit_candidates::<T>(c, "candidates")?;
-
-		// account 1 is the reporter and need to be whitelisted, and a voter.
-		let account_1 = endowed_account::<T>("caller", 0);
-		submit_voter::<T>(
-			account_1.clone(),
-			all_candidates.iter().take(1).cloned().collect(),
-			stake,
-		)?;
-
-		// account 2 votes for a bunch of crap, and finally a correct candidate.
-		let account_2 = endowed_account::<T>("caller_2", 1);
-		let mut invalid: Vec<T::AccountId> = (0..(v-1))
-			.map(|seed| account::<T::AccountId>("invalid", 0, seed).clone())
-			.collect();
-		invalid.push(all_candidates.last().unwrap().clone());
-		submit_voter::<T>(
-			account_2.clone(),
-			invalid,
-			stake,
-		)?;
-
-		let defunct_info = defunct_for::<T>(account_2.clone());
-		whitelist!(account_1);
-	}: report_defunct_voter(RawOrigin::Signed(account_1.clone()), defunct_info)
-	verify {
-		// account 2 is still a voter.
-		assert!(<Elections<T>>::is_voter(&account_2));
-		#[cfg(test)]
-		{
-			// reset members in between benchmark tests.
-			use crate::tests::MEMBERS;
-			MEMBERS.with(|m| *m.borrow_mut() = vec![]);
-		}
-	}
-
 	submit_candidacy {
 		// number of already existing candidates.
 		let c in 1 .. MAX_CANDIDATES;
@@ -519,20 +414,52 @@ benchmarks! {
 		}
 	}
 
-	#[extra]
-	on_initialize {
-		// if n % TermDuration is zero, then we run phragmen. The weight function must and should
-		// check this as it is cheap to do so. TermDuration is not a storage item, it is a constant
-		// encoded in the runtime.
+	clean_defunct_voters {
+		// total number of voters.
+		let v in (MAX_VOTERS / 2) .. MAX_VOTERS;
+		// those that are defunct and need removal.
+		let d in 1 .. (MAX_VOTERS / 2);
+
+		// remove any previous stuff.
+		clean::<T>();
+
+		let all_candidates = submit_candidates::<T>(v, "candidates")?;
+		distribute_voters::<T>(all_candidates, v, MAXIMUM_VOTE)?;
+
+		// all candidates leave.
+		<Candidates<T>>::kill();
+
+		// now everyone is defunct
+		assert!(<Voting<T>>::iter().all(|(_, v)| <Elections<T>>::is_defunct_voter(&v.votes)));
+		assert_eq!(<Voting<T>>::iter().count() as u32, v);
+		let root = RawOrigin::Root;
+	}: _(root, v, d)
+	verify {
+		assert_eq!(<Voting<T>>::iter().count() as u32, 0);
+	}
+
+	election_phragmen {
+		// This is just to focus on phragmen in the context of this module. We always select 20
+		// members, this is hard-coded in the runtime and cannot be trivially changed at this stage.
+		// Yet, change the number of voters, candidates and edge per voter to see the impact. Note
+		// that we give all candidates a self vote to make sure they are all considered.
 		let c in 1 .. MAX_CANDIDATES;
+		let v in 1 .. MAX_VOTERS;
+		let e in MAX_VOTERS .. MAX_VOTERS * MAXIMUM_VOTE as u32;
 		clean::<T>();
 
-		// create c candidates.
+		// so we have a situation with v and e. we want e to basically always be in the range of `e
+		// -> e * MAXIMUM_VOTE`, but we cannot express that now with the benchmarks. So what we do
+		// is: when c is being iterated, v, and e are max and fine. when v is being iterated, e is
+		// being set to max and this is a problem. In these cases, we cap e to a lower value, namely
+		// v * MAXIMUM_VOTE. when e is being iterated, v is at max, and again fine. all in all,
+		// votes_per_voter can never be more than MAXIMUM_VOTE. Note that this might cause `v` to be
+		// an overestimate.
+		let votes_per_voter = (e / v).min(MAXIMUM_VOTE as u32);
+
 		let all_candidates = submit_candidates_with_self_vote::<T>(c, "candidates")?;
-		// create 500 voters, each voting the maximum 16
-		distribute_voters::<T>(all_candidates, MAX_VOTERS, MAXIMUM_VOTE)?;
+		let _ = distribute_voters::<T>(all_candidates, v, votes_per_voter as usize)?;
 	}: {
-		// elect
 		<Elections<T>>::on_initialize(T::TermDuration::get());
 	}
 	verify {
@@ -551,18 +478,16 @@ benchmarks! {
 	}
 
 	#[extra]
-	phragmen {
-		// This is just to focus on phragmen in the context of this module. We always select 20
-		// members, this is hard-coded in the runtime and cannot be trivially changed at this stage.
-		// Yet, change the number of voters, candidates and edge per voter to see the impact. Note
-		// that we give all candidates a self vote to make sure they are all considered.
+	election_phragmen_c_e {
 		let c in 1 .. MAX_CANDIDATES;
-		let v in 1 .. MAX_VOTERS;
-		let e in 1 .. (MAXIMUM_VOTE as u32);
+		let e in MAX_VOTERS .. MAX_VOTERS * MAXIMUM_VOTE as u32;
+		let fixed_v = MAX_VOTERS;
 		clean::<T>();
 
+		let votes_per_voter = e / fixed_v;
+
 		let all_candidates = submit_candidates_with_self_vote::<T>(c, "candidates")?;
-		let _ = distribute_voters::<T>(all_candidates, v, e as usize)?;
+		let _ = distribute_voters::<T>(all_candidates, fixed_v, votes_per_voter as usize)?;
 	}: {
 		<Elections<T>>::on_initialize(T::TermDuration::get());
 	}
@@ -580,6 +505,35 @@ benchmarks! {
 			MEMBERS.with(|m| *m.borrow_mut() = vec![]);
 		}
 	}
+
+	#[extra]
+	election_phragmen_v {
+		let v in 4 .. 16;
+		let fixed_c = MAX_CANDIDATES;
+		let fixed_e = 64;
+		clean::<T>();
+
+		let votes_per_voter = fixed_e / v;
+
+		let all_candidates = submit_candidates_with_self_vote::<T>(fixed_c, "candidates")?;
+		let _ = distribute_voters::<T>(all_candidates, v, votes_per_voter as usize)?;
+	}: {
+		<Elections<T>>::on_initialize(T::TermDuration::get());
+	}
+	verify {
+		assert_eq!(<Elections<T>>::members().len() as u32, T::DesiredMembers::get().min(fixed_c));
+		assert_eq!(
+			<Elections<T>>::runners_up().len() as u32,
+			T::DesiredRunnersUp::get().min(fixed_c.saturating_sub(T::DesiredMembers::get())),
+		);
+
+		#[cfg(test)]
+		{
+			// reset members in between benchmark tests.
+			use crate::tests::MEMBERS;
+			MEMBERS.with(|m| *m.borrow_mut() = vec![]);
+		}
+	}
 }
 
 #[cfg(test)]
@@ -590,52 +544,76 @@ mod tests {
 
 	#[test]
 	fn test_benchmarks_elections_phragmen() {
-		ExtBuilder::default().desired_members(13).desired_runners_up(7).build_and_execute(|| {
-			assert_ok!(test_benchmark_vote::<Test>());
-		});
+		ExtBuilder::default()
+			.desired_members(13)
+			.desired_runners_up(7)
+			.build_and_execute(|| {
+				assert_ok!(test_benchmark_vote_equal::<Test>());
+			});
+
+		ExtBuilder::default()
+			.desired_members(13)
+			.desired_runners_up(7)
+			.build_and_execute(|| {
+				assert_ok!(test_benchmark_vote_more::<Test>());
+			});
+
+		ExtBuilder::default()
+			.desired_members(13)
+			.desired_runners_up(7)
+			.build_and_execute(|| {
+				assert_ok!(test_benchmark_vote_less::<Test>());
+			});
+
+		ExtBuilder::default()
+			.desired_members(13)
+			.desired_runners_up(7)
+			.build_and_execute(|| {
+				assert_ok!(test_benchmark_remove_voter::<Test>());
+			});
 
 		ExtBuilder::default().desired_members(13).desired_runners_up(7).build_and_execute(|| {
-			assert_ok!(test_benchmark_remove_voter::<Test>());
+			assert_ok!(test_benchmark_submit_candidacy::<Test>());
 		});
 
 		ExtBuilder::default().desired_members(13).desired_runners_up(7).build_and_execute(|| {
-			assert_ok!(test_benchmark_report_defunct_voter_correct::<Test>());
+			assert_ok!(test_benchmark_renounce_candidacy_candidate::<Test>());
 		});
 
 		ExtBuilder::default().desired_members(13).desired_runners_up(7).build_and_execute(|| {
-			assert_ok!(test_benchmark_report_defunct_voter_incorrect::<Test>());
+			assert_ok!(test_benchmark_renounce_candidacy_runners_up::<Test>());
 		});
 
 		ExtBuilder::default().desired_members(13).desired_runners_up(7).build_and_execute(|| {
-			assert_ok!(test_benchmark_submit_candidacy::<Test>());
+			assert_ok!(test_benchmark_renounce_candidacy_members::<Test>());
 		});
 
 		ExtBuilder::default().desired_members(13).desired_runners_up(7).build_and_execute(|| {
-			assert_ok!(test_benchmark_renounce_candidacy_candidate::<Test>());
+			assert_ok!(test_benchmark_remove_member_without_replacement::<Test>());
 		});
 
 		ExtBuilder::default().desired_members(13).desired_runners_up(7).build_and_execute(|| {
-			assert_ok!(test_benchmark_renounce_candidacy_runners_up::<Test>());
+			assert_ok!(test_benchmark_remove_member_with_replacement::<Test>());
 		});
 
 		ExtBuilder::default().desired_members(13).desired_runners_up(7).build_and_execute(|| {
-			assert_ok!(test_benchmark_renounce_candidacy_members::<Test>());
+			assert_ok!(test_benchmark_clean_defunct_voters::<Test>());
 		});
 
 		ExtBuilder::default().desired_members(13).desired_runners_up(7).build_and_execute(|| {
-			assert_ok!(test_benchmark_remove_member_without_replacement::<Test>());
+			assert_ok!(test_benchmark_election_phragmen::<Test>());
 		});
 
 		ExtBuilder::default().desired_members(13).desired_runners_up(7).build_and_execute(|| {
-			assert_ok!(test_benchmark_remove_member_with_replacement::<Test>());
+			assert_ok!(test_benchmark_election_phragmen::<Test>());
 		});
 
 		ExtBuilder::default().desired_members(13).desired_runners_up(7).build_and_execute(|| {
-			assert_ok!(test_benchmark_on_initialize::<Test>());
+			assert_ok!(test_benchmark_election_phragmen_c_e::<Test>());
 		});
 
 		ExtBuilder::default().desired_members(13).desired_runners_up(7).build_and_execute(|| {
-			assert_ok!(test_benchmark_phragmen::<Test>());
+			assert_ok!(test_benchmark_election_phragmen_v::<Test>());
 		});
 	}
 }
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index 5027840aef3c..1bef73831e65 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -23,51 +23,66 @@
 //!
 //! The election happens in _rounds_: every `N` blocks, all previous members are retired and a new
 //! set is elected (which may or may not have an intersection with the previous set). Each round
-//! lasts for some number of blocks defined by `TermDuration` storage item. The words _term_ and
+//! lasts for some number of blocks defined by [`Config::TermDuration`]. The words _term_ and
 //! _round_ can be used interchangeably in this context.
 //!
-//! `TermDuration` might change during a round. This can shorten or extend the length of the round.
-//! The next election round's block number is never stored but rather always checked on the fly.
-//! Based on the current block number and `TermDuration`, the condition `BlockNumber % TermDuration
-//! == 0` being satisfied will always trigger a new election round.
+//! [`Config::TermDuration`] might change during a round. This can shorten or extend the length of
+//! the round. The next election round's block number is never stored but rather always checked on
+//! the fly. Based on the current block number and [`Config::TermDuration`], the condition
+//! `BlockNumber % TermDuration == 0` being satisfied will always trigger a new election round.
+//!
+//! ### Bonds and Deposits
+//!
+//! Both voting and being a candidate requires deposits to be taken, in exchange for the data that
+//! needs to be kept on-chain. The terms *bond* and *deposit* can be used interchangeably in this
+//! context.
+//!
+//! Bonds will be unreserved only upon adhering to the protocol laws. Failing to do so will cause in
+//! the bond to slashed.
 //!
 //! ### Voting
 //!
-//! Voters can vote for any set of the candidates by providing a list of account ids. Invalid votes
-//! (voting for non-candidates) are ignored during election. Yet, a voter _might_ vote for a future
-//! candidate. Voters reserve a bond as they vote. Each vote defines a `value`. This amount is
-//! locked from the account of the voter and indicates the weight of the vote. Voters can update
-//! their votes at any time by calling `vote()` again. This keeps the bond untouched but can
-//! optionally change the locked `value`. After a round, votes are kept and might still be valid for
+//! Voters can vote for a limited number of the candidates by providing a list of account ids,
+//! bounded by [`MAXIMUM_VOTE`]. Invalid votes (voting for non-candidates) and duplicate votes are
+//! ignored during election. Yet, a voter _might_ vote for a future candidate. Voters reserve a bond
+//! as they vote. Each vote defines a `value`. This amount is locked from the account of the voter
+//! and indicates the weight of the vote. Voters can update their votes at any time by calling
+//! `vote()` again. This can update the vote targets (which might update the deposit) or update the
+//! vote's stake ([`Voter::stake`]). After a round, votes are kept and might still be valid for
 //! further rounds. A voter is responsible for calling `remove_voter` once they are done to have
 //! their bond back and remove the lock.
 //!
-//! Voters also report other voters as being defunct to earn their bond. A voter is defunct once all
-//! of the candidates that they have voted for are neither a valid candidate anymore nor a member.
-//! Upon reporting, if the target voter is actually defunct, the reporter will be rewarded by the
-//! voting bond of the target. The target will lose their bond and get removed. If the target is not
-//! defunct, the reporter is slashed and removed. To prevent being reported, voters should manually
-//! submit a `remove_voter()` as soon as they are in the defunct state.
+//! See [`Call::vote`], [`Call::remove_voter`].
+//!
+//! ### Defunct Voter
+//!
+//! A voter is defunct once all of the candidates that they have voted for are not a valid candidate
+//! (as seen further below, members and runners-up are also always candidates). Defunct voters can
+//! be removed via a root call ([`Call::clean_defunct_voters`]). Upon being removed, their bond is
+//! returned. This is an administrative operation and can be called only by the root origin in the
+//! case of state bloat.
 //!
 //! ### Candidacy and Members
 //!
-//! Candidates also reserve a bond as they submit candidacy. A candidate cannot take their candidacy
-//! back. A candidate can end up in one of the below situations:
-//!   - **Winner**: A winner is kept as a _member_. They must still have a bond in reserve and they
-//!     are automatically counted as a candidate for the next election.
+//! Candidates also reserve a bond as they submit candidacy. A candidate can end up in one of the
+//! below situations:
+//!   - **Members**: A winner is kept as a _member_. They must still have a bond in reserve and they
+//!     are automatically counted as a candidate for the next election. The number of desired
+//!     members is set by [`Config::DesiredMembers`].
 //!   - **Runner-up**: Runners-up are the best candidates immediately after the winners. The number
-//!     of runners_up to keep is configurable. Runners-up are used, in order that they are elected,
-//!     as replacements when a candidate is kicked by `[remove_member]`, or when an active member
-//!     renounces their candidacy. Runners are automatically counted as a candidate for the next
-//!     election.
-//!   - **Loser**: Any of the candidate who are not a winner are left as losers. A loser might be an
-//!     _outgoing member or runner_, meaning that they are an active member who failed to keep their
-//!     spot. An outgoing will always lose their bond.
+//!     of runners up to keep is set by [`Config::DesiredRunnersUp`]. Runners-up are used, in the
+//!     same order as they are elected, as replacements when a candidate is kicked by
+//!     [`Call::remove_member`], or when an active member renounces their candidacy. Runners are
+//!     automatically counted as a candidate for the next election.
+//!   - **Loser**: Any of the candidate who are not member/runner-up are left as losers. A loser
+//!     might be an _outgoing member or runner-up_, meaning that they are an active member who
+//!     failed to keep their spot. **An outgoing candidate/member/runner-up will always lose their
+//!     bond**.
 //!
-//! ##### Renouncing candidacy.
+//! #### Renouncing candidacy.
 //!
-//! All candidates, elected or not, can renounce their candidacy. A call to [`Module::renounce_candidacy`]
-//! will always cause the candidacy bond to be refunded.
+//! All candidates, elected or not, can renounce their candidacy. A call to
+//! [`Call::renounce_candidacy`] will always cause the candidacy bond to be refunded.
 //!
 //! Note that with the members being the default candidates for the next round and votes persisting
 //! in storage, the election system is entirely stable given no further input. This means that if
@@ -90,7 +105,7 @@ use frame_support::{
 	ensure,
 	storage::{IterableStorageMap, StorageMap},
 	traits::{
-		BalanceStatus, ChangeMembers, Contains, ContainsLengthBound, Currency, CurrencyToVote, Get,
+		ChangeMembers, Contains, ContainsLengthBound, Currency, CurrencyToVote, Get,
 		InitializeMembers, LockIdentifier, LockableCurrency, OnUnbalanced, ReservableCurrency,
 		WithdrawReasons,
 	},
@@ -102,12 +117,14 @@ use sp_runtime::{
 	traits::{Saturating, StaticLookup, Zero},
 	DispatchError, Perbill, RuntimeDebug,
 };
-use sp_std::prelude::*;
+use sp_std::{prelude::*, cmp::Ordering};
 
 mod benchmarking;
 pub mod weights;
 pub use weights::WeightInfo;
 
+pub mod migrations_3_0_0;
+
 /// The maximum votes allowed per voter.
 pub const MAXIMUM_VOTE: usize = 16;
 
@@ -127,17 +144,30 @@ pub enum Renouncing {
 	Candidate(#[codec(compact)] u32),
 }
 
-/// Information needed to prove the defunct-ness of a voter.
-#[derive(Encode, Decode, Clone, PartialEq, RuntimeDebug)]
-pub struct DefunctVoter<AccountId> {
-	/// the voter's who's being challenged for being defunct
+/// An active voter.
+#[derive(Encode, Decode, Clone, Default, RuntimeDebug, PartialEq)]
+pub struct Voter<AccountId, Balance> {
+	/// The members being backed.
+	pub votes: Vec<AccountId>,
+	/// The amount of stake placed on this vote.
+	pub stake: Balance,
+	/// The amount of deposit reserved for this vote.
+	///
+	/// To be unreserved upon removal.
+	pub deposit: Balance,
+}
+
+/// A holder of a seat as either a member or a runner-up.
+#[derive(Encode, Decode, Clone, Default, RuntimeDebug, PartialEq)]
+pub struct SeatHolder<AccountId, Balance> {
+	/// The holder.
 	pub who: AccountId,
-	/// The number of votes that `who` has placed.
-	#[codec(compact)]
-	pub vote_count: u32,
-	/// The number of current active candidates.
-	#[codec(compact)]
-	pub candidate_count: u32
+	/// The total backing stake.
+	pub stake: Balance,
+	/// The amount of deposit held on-chain.
+	///
+	/// To be unreserved upon renouncing, or slashed upon being a loser.
+	pub deposit: Balance,
 }
 
 pub trait Config: frame_system::Config {
@@ -165,15 +195,18 @@ pub trait Config: frame_system::Config {
 	/// How much should be locked up in order to submit one's candidacy.
 	type CandidacyBond: Get<BalanceOf<Self>>;
 
-	/// How much should be locked up in order to be able to submit votes.
-	type VotingBond: Get<BalanceOf<Self>>;
+	/// Base deposit associated with voting.
+	///
+	/// This should be sensibly high to economically ensure the pallet cannot be attacked by
+	/// creating a gigantic number of votes.
+	type VotingBondBase: Get<BalanceOf<Self>>;
+
+	/// The amount of bond that need to be locked for each vote (32 bytes).
+	type VotingBondFactor: Get<BalanceOf<Self>>;
 
 	/// Handler for the unbalanced reduction when a candidate has lost (and is not a runner-up)
 	type LoserCandidate: OnUnbalanced<NegativeImbalanceOf<Self>>;
 
-	/// Handler for the unbalanced reduction when a reporter has submitted a bad defunct report.
-	type BadReport: OnUnbalanced<NegativeImbalanceOf<Self>>;
-
 	/// Handler for the unbalanced reduction when a member has been kicked.
 	type KickedMember: OnUnbalanced<NegativeImbalanceOf<Self>>;
 
@@ -194,22 +227,32 @@ pub trait Config: frame_system::Config {
 
 decl_storage! {
 	trait Store for Module<T: Config> as PhragmenElection {
-		// ---- State
-		/// The current elected membership. Sorted based on account id.
-		pub Members get(fn members): Vec<(T::AccountId, BalanceOf<T>)>;
-		/// The current runners_up. Sorted based on low to high merit (worse to best).
-		pub RunnersUp get(fn runners_up): Vec<(T::AccountId, BalanceOf<T>)>;
+		/// The current elected members.
+		///
+		/// Invariant: Always sorted based on account id.
+		pub Members get(fn members): Vec<SeatHolder<T::AccountId, BalanceOf<T>>>;
+
+		/// The current reserved runners-up.
+		///
+		/// Invariant: Always sorted based on rank (worse to best). Upon removal of a member, the
+		/// last (i.e. _best_) runner-up will be replaced.
+		pub RunnersUp get(fn runners_up): Vec<SeatHolder<T::AccountId, BalanceOf<T>>>;
+
+		/// The present candidate list. A current member or runner-up can never enter this vector
+		/// and is always implicitly assumed to be a candidate.
+		///
+		/// Second element is the deposit.
+		///
+		/// Invariant: Always sorted based on account id.
+		pub Candidates get(fn candidates): Vec<(T::AccountId, BalanceOf<T>)>;
+
 		/// The total number of vote rounds that have happened, excluding the upcoming one.
 		pub ElectionRounds get(fn election_rounds): u32 = Zero::zero();
 
 		/// Votes and locked stake of a particular voter.
 		///
-		/// TWOX-NOTE: SAFE as `AccountId` is a crypto hash
-		pub Voting get(fn voting): map hasher(twox_64_concat) T::AccountId => (BalanceOf<T>, Vec<T::AccountId>);
-
-		/// The present candidate list. Sorted based on account-id. A current member or runner-up
-		/// can never enter this vector and is always implicitly assumed to be a candidate.
-		pub Candidates get(fn candidates): Vec<T::AccountId>;
+		/// TWOX-NOTE: SAFE as `AccountId` is a crypto hash.
+		pub Voting get(fn voting): map hasher(twox_64_concat) T::AccountId => Voter<T::AccountId, BalanceOf<T>>;
 	} add_extra_genesis {
 		config(members): Vec<(T::AccountId, BalanceOf<T>)>;
 		build(|config: &GenesisConfig<T>| {
@@ -218,32 +261,33 @@ decl_storage! {
 				"Cannot accept more than DesiredMembers genesis member",
 			);
 			let members = config.members.iter().map(|(ref member, ref stake)| {
-				// make sure they have enough stake
+				// make sure they have enough stake.
 				assert!(
 					T::Currency::free_balance(member) >= *stake,
-					"Genesis member does not have enough stake",
+					"Genesis member does not have enough stake.",
 				);
 
-				// reserve candidacy bond and set as members.
-				T::Currency::reserve(&member, T::CandidacyBond::get())
-					.expect("Genesis member does not have enough balance to be a candidate");
-
 				// Note: all members will only vote for themselves, hence they must be given exactly
 				// their own stake as total backing. Any sane election should behave as such.
 				// Nonetheless, stakes will be updated for term 1 onwards according to the election.
 				Members::<T>::mutate(|members| {
-					match members.binary_search_by(|(a, _b)| a.cmp(member)) {
-						Ok(_) => panic!("Duplicate member in elections phragmen genesis: {}", member),
-						Err(pos) => members.insert(pos, (member.clone(), *stake)),
+					match members.binary_search_by(|m| m.who.cmp(member)) {
+						Ok(_) => panic!("Duplicate member in elections-phragmen genesis: {}", member),
+						Err(pos) => members.insert(
+							pos,
+							SeatHolder { who: member.clone(), stake: *stake, deposit: Zero::zero() },
+						),
 					}
 				});
 
-				// set self-votes to make persistent.
-				<Module<T>>::vote(
-					T::Origin::from(Some(member.clone()).into()),
-					vec![member.clone()],
-					*stake,
-				).expect("Genesis member could not vote.");
+				// set self-votes to make persistent. Genesis voters don't have any bond, nor do
+				// they have any lock. NOTE: this means that we will still try to remove a lock once
+				// this genesis voter is removed, and for now it is okay because remove_lock is noop
+				// if lock is not there.
+				<Voting<T>>::insert(
+					&member,
+					Voter { votes: vec![member.clone()], stake: *stake, deposit: Zero::zero() },
+				);
 
 				member.clone()
 			}).collect::<Vec<T::AccountId>>();
@@ -277,13 +321,13 @@ decl_error! {
 		/// Member cannot re-submit candidacy.
 		MemberSubmit,
 		/// Runner cannot re-submit candidacy.
-		RunnerSubmit,
+		RunnerUpSubmit,
 		/// Candidate does not have enough funds.
 		InsufficientCandidateFunds,
 		/// Not a member.
 		NotMember,
 		/// The provided count of number of candidates is incorrect.
-		InvalidCandidateCount,
+		InvalidWitnessData,
 		/// The provided count of number of votes is incorrect.
 		InvalidVoteCount,
 		/// The renouncing origin presented a wrong `Renouncing` parameter.
@@ -293,46 +337,74 @@ decl_error! {
 	}
 }
 
+decl_event!(
+	pub enum Event<T> where Balance = BalanceOf<T>, <T as frame_system::Config>::AccountId {
+		/// A new term with \[new_members\]. This indicates that enough candidates existed to run the
+		/// election, not that enough have has been elected. The inner value must be examined for
+		/// this purpose. A `NewTerm(\[\])` indicates that some candidates got their bond slashed and
+		/// none were elected, whilst `EmptyTerm` means that no candidates existed to begin with.
+		NewTerm(Vec<(AccountId, Balance)>),
+		/// No (or not enough) candidates existed for this round. This is different from
+		/// `NewTerm(\[\])`. See the description of `NewTerm`.
+		EmptyTerm,
+		/// Internal error happened while trying to perform election.
+		ElectionError,
+		/// A \[member\] has been removed. This should always be followed by either `NewTerm` or
+		/// `EmptyTerm`.
+		MemberKicked(AccountId),
+		/// Someone has renounced their candidacy.
+		Renounced(AccountId),
+		/// A \[candidate\] was slashed by \[amount\] due to failing to obtain a seat as member or
+		/// runner-up.
+		///
+		/// Note that old members and runners-up are also candidates.
+		CandidateSlashed(AccountId, Balance),
+		/// A \[seat holder\] was slashed by \[amount\] by being forcefully removed from the set.
+		SeatHolderSlashed(AccountId, Balance),
+	}
+);
+
 decl_module! {
 	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		type Error = Error<T>;
-
 		fn deposit_event() = default;
 
 		const CandidacyBond: BalanceOf<T> = T::CandidacyBond::get();
-		const VotingBond: BalanceOf<T> = T::VotingBond::get();
+		const VotingBondBase: BalanceOf<T> = T::VotingBondBase::get();
+		const VotingBondFactor: BalanceOf<T> = T::VotingBondFactor::get();
 		const DesiredMembers: u32 = T::DesiredMembers::get();
 		const DesiredRunnersUp: u32 = T::DesiredRunnersUp::get();
 		const TermDuration: T::BlockNumber = T::TermDuration::get();
-		const ModuleId: LockIdentifier  = T::ModuleId::get();
+		const ModuleId: LockIdentifier = T::ModuleId::get();
 
 		/// Vote for a set of candidates for the upcoming round of election. This can be called to
 		/// set the initial votes, or update already existing votes.
 		///
-		/// Upon initial voting, `value` units of `who`'s balance is locked and a bond amount is
-		/// reserved.
+		/// Upon initial voting, `value` units of `who`'s balance is locked and a deposit amount is
+		/// reserved. The deposit is based on the number of votes and can be updated over time.
 		///
 		/// The `votes` should:
 		///   - not be empty.
 		///   - be less than the number of possible candidates. Note that all current members and
 		///     runners-up are also automatically candidates for the next round.
 		///
-		/// It is the responsibility of the caller to not place all of their balance into the lock
-		/// and keep some for further transactions.
+		/// If `value` is more than `who`'s total balance, then the maximum of the two is used.
+		///
+		/// The dispatch origin of this call must be signed.
+		///
+		/// ### Warning
+		///
+		/// It is the responsibility of the caller to **NOT** place all of their balance into the
+		/// lock and keep some for further operations.
 		///
 		/// # <weight>
-		/// Base weight: 47.93 µs
-		/// State reads:
-		/// 	- Candidates.len() + Members.len() + RunnersUp.len()
-		/// 	- Voting (is_voter)
-		/// 	- Lock
-		/// 	- [AccountBalance(who) (unreserve + total_balance)]
-		/// State writes:
-		/// 	- Voting
-		/// 	- Lock
-		/// 	- [AccountBalance(who) (unreserve -- only when creating a new voter)]
+		/// We assume the maximum weight among all 3 cases: vote_equal, vote_more and vote_less.
 		/// # </weight>
-		#[weight = T::WeightInfo::vote(votes.len() as u32)]
+		#[weight =
+			T::WeightInfo::vote_more(votes.len() as u32)
+			.max(T::WeightInfo::vote_less(votes.len() as u32))
+			.max(T::WeightInfo::vote_equal(votes.len() as u32))
+		]
 		fn vote(
 			origin,
 			votes: Vec<T::AccountId>,
@@ -340,6 +412,7 @@ decl_module! {
 		) {
 			let who = ensure_signed(origin)?;
 
+			// votes should not be empty and more than `MAXIMUM_VOTE` in any case.
 			ensure!(votes.len() <= MAXIMUM_VOTE, Error::<T>::MaximumVotesExceeded);
 			ensure!(!votes.is_empty(), Error::<T>::NoVotes);
 
@@ -347,156 +420,73 @@ decl_module! {
 			let members_count = <Members<T>>::decode_len().unwrap_or(0);
 			let runners_up_count = <RunnersUp<T>>::decode_len().unwrap_or(0);
 
+			// can never submit a vote of there are no members, and cannot submit more votes than
+			// all potential vote targets.
 			// addition is valid: candidates, members and runners-up will never overlap.
-			let allowed_votes = candidates_count + members_count + runners_up_count;
-
+			let allowed_votes = candidates_count
+				.saturating_add(members_count)
+				.saturating_add(runners_up_count);
 			ensure!(!allowed_votes.is_zero(), Error::<T>::UnableToVote);
 			ensure!(votes.len() <= allowed_votes, Error::<T>::TooManyVotes);
 
 			ensure!(value > T::Currency::minimum_balance(), Error::<T>::LowBalance);
 
-			// first time voter. Reserve bond.
-			if !Self::is_voter(&who) {
-				T::Currency::reserve(&who, T::VotingBond::get())
-					.map_err(|_| Error::<T>::UnableToPayBond)?;
-			}
+			// Reserve bond.
+			let new_deposit = Self::deposit_of(votes.len());
+			let Voter { deposit: old_deposit, .. } = <Voting<T>>::get(&who);
+			match new_deposit.cmp(&old_deposit) {
+				Ordering::Greater => {
+					// Must reserve a bit more.
+					let to_reserve = new_deposit - old_deposit;
+					T::Currency::reserve(&who, to_reserve).map_err(|_| Error::<T>::UnableToPayBond)?;
+				},
+				Ordering::Equal => {},
+				Ordering::Less => {
+					// Must unreserve a bit.
+					let to_unreserve = old_deposit - new_deposit;
+					let _remainder = T::Currency::unreserve(&who, to_unreserve);
+					debug_assert!(_remainder.is_zero());
+				},
+			};
 
 			// Amount to be locked up.
-			let locked_balance = value.min(T::Currency::total_balance(&who));
-
-			// lock
+			let locked_stake = value.min(T::Currency::total_balance(&who));
 			T::Currency::set_lock(
 				T::ModuleId::get(),
 				&who,
-				locked_balance,
-				WithdrawReasons::except(WithdrawReasons::TRANSACTION_PAYMENT),
+				locked_stake,
+				WithdrawReasons::all(),
 			);
 
-			Voting::<T>::insert(&who, (locked_balance, votes));
+			Voting::<T>::insert(&who, Voter { votes, deposit: new_deposit, stake: locked_stake });
 		}
 
-		/// Remove `origin` as a voter. This removes the lock and returns the bond.
+		/// Remove `origin` as a voter.
 		///
-		/// # <weight>
-		/// Base weight: 36.8 µs
-		/// All state access is from do_remove_voter.
-		/// State reads:
-		/// 	- Voting
-		/// 	- [AccountData(who)]
-		/// State writes:
-		/// 	- Voting
-		/// 	- Locks
-		/// 	- [AccountData(who)]
-		/// # </weight>
+		/// This removes the lock and returns the deposit.
+		///
+		/// The dispatch origin of this call must be signed and be a voter.
 		#[weight = T::WeightInfo::remove_voter()]
 		fn remove_voter(origin) {
 			let who = ensure_signed(origin)?;
 			ensure!(Self::is_voter(&who), Error::<T>::MustBeVoter);
-
-			Self::do_remove_voter(&who, true);
+			Self::do_remove_voter(&who);
 		}
 
-		/// Report `target` for being an defunct voter. In case of a valid report, the reporter is
-		/// rewarded by the bond amount of `target`. Otherwise, the reporter itself is removed and
-		/// their bond is slashed.
+		/// Submit oneself for candidacy. A fixed amount of deposit is recorded.
 		///
-		/// A defunct voter is defined to be:
-		///   - a voter whose current submitted votes are all invalid. i.e. all of them are no
-		///     longer a candidate nor an active member or a runner-up.
+		/// All candidates are wiped at the end of the term. They either become a member/runner-up,
+		/// or leave the system while their deposit is slashed.
 		///
+		/// The dispatch origin of this call must be signed.
 		///
-		/// The origin must provide the number of current candidates and votes of the reported target
-		/// for the purpose of accurate weight calculation.
-		///
-		/// # <weight>
-		/// No Base weight based on min square analysis.
-		/// Complexity of candidate_count: 1.755 µs
-		/// Complexity of vote_count: 18.51 µs
-		/// State reads:
-		///  	- Voting(reporter)
-		///  	- Candidate.len()
-		///  	- Voting(Target)
-		///  	- Candidates, Members, RunnersUp (is_defunct_voter)
-		/// State writes:
-		/// 	- Lock(reporter || target)
-		/// 	- [AccountBalance(reporter)] + AccountBalance(target)
-		/// 	- Voting(reporter || target)
-		/// Note: the db access is worse with respect to db, which is when the report is correct.
-		/// # </weight>
-		#[weight = T::WeightInfo::report_defunct_voter_correct(
-			defunct.candidate_count,
-			defunct.vote_count,
-		)]
-		fn report_defunct_voter(
-			origin,
-			defunct: DefunctVoter<<T::Lookup as StaticLookup>::Source>,
-		) -> DispatchResultWithPostInfo {
-			let reporter = ensure_signed(origin)?;
-			let target = T::Lookup::lookup(defunct.who)?;
-
-			ensure!(reporter != target, Error::<T>::ReportSelf);
-			ensure!(Self::is_voter(&reporter), Error::<T>::MustBeVoter);
-
-			let DefunctVoter { candidate_count, vote_count, .. }  = defunct;
-
-			ensure!(
-				<Candidates<T>>::decode_len().unwrap_or(0) as u32 <= candidate_count,
-				Error::<T>::InvalidCandidateCount,
-			);
-
-			let (_, votes) = <Voting<T>>::get(&target);
-			// indirect way to ensure target is a voter. We could call into `::contains()`, but it
-			// would have the same effect with one extra db access. Note that votes cannot be
-			// submitted with length 0. Hence, a non-zero length means that the target is a voter.
-			ensure!(votes.len() > 0, Error::<T>::MustBeVoter);
-
-			// ensure that the size of votes that need to be searched is correct.
-			ensure!(
-				votes.len() as u32 <= vote_count,
-				Error::<T>::InvalidVoteCount,
-			);
-
-			let valid = Self::is_defunct_voter(&votes);
-			let maybe_refund = if valid {
-				// reporter will get the voting bond of the target
-				T::Currency::repatriate_reserved(&target, &reporter, T::VotingBond::get(), BalanceStatus::Free)?;
-				// remove the target. They are defunct.
-				Self::do_remove_voter(&target, false);
-				None
-			} else {
-				// slash the bond of the reporter.
-				let imbalance = T::Currency::slash_reserved(&reporter, T::VotingBond::get()).0;
-				T::BadReport::on_unbalanced(imbalance);
-				// remove the reporter.
-				Self::do_remove_voter(&reporter, false);
-				Some(T::WeightInfo::report_defunct_voter_incorrect(
-					defunct.candidate_count,
-					defunct.vote_count,
-				))
-			};
-			Self::deposit_event(RawEvent::VoterReported(target, reporter, valid));
-			Ok(maybe_refund.into())
-		}
-
-		/// Submit oneself for candidacy.
+		/// ### Warning
 		///
-		/// A candidate will either:
-		///   - Lose at the end of the term and forfeit their deposit.
-		///   - Win and become a member. Members will eventually get their stash back.
-		///   - Become a runner-up. Runners-ups are reserved members in case one gets forcefully
-		///     removed.
+		/// Even if a candidate ends up being a member, they must call [`Call::renounce_candidacy`]
+		/// to get their deposit back. Losing the spot in an election will always lead to a slash.
 		///
 		/// # <weight>
-		/// Base weight = 33.33 µs
-		/// Complexity of candidate_count: 0.375 µs
-		/// State reads:
-		/// 	- Candidates
-		/// 	- Members
-		/// 	- RunnersUp
-		/// 	- [AccountBalance(who)]
-		/// State writes:
-		/// 	- [AccountBalance(who)]
-		/// 	- Candidates
+		/// The number of current candidates must be provided as witness data.
 		/// # </weight>
 		#[weight = T::WeightInfo::submit_candidacy(*candidate_count)]
 		fn submit_candidacy(origin, #[compact] candidate_count: u32) {
@@ -505,60 +495,37 @@ decl_module! {
 			let actual_count = <Candidates<T>>::decode_len().unwrap_or(0);
 			ensure!(
 				actual_count as u32 <= candidate_count,
-				Error::<T>::InvalidCandidateCount,
+				Error::<T>::InvalidWitnessData,
 			);
 
-			let is_candidate = Self::is_candidate(&who);
-			ensure!(is_candidate.is_err(), Error::<T>::DuplicatedCandidate);
-
-			// assured to be an error, error always contains the index.
-			let index = is_candidate.unwrap_err();
+			let index = Self::is_candidate(&who).err().ok_or(Error::<T>::DuplicatedCandidate)?;
 
 			ensure!(!Self::is_member(&who), Error::<T>::MemberSubmit);
-			ensure!(!Self::is_runner_up(&who), Error::<T>::RunnerSubmit);
+			ensure!(!Self::is_runner_up(&who), Error::<T>::RunnerUpSubmit);
 
 			T::Currency::reserve(&who, T::CandidacyBond::get())
 				.map_err(|_| Error::<T>::InsufficientCandidateFunds)?;
 
-			<Candidates<T>>::mutate(|c| c.insert(index, who));
+			<Candidates<T>>::mutate(|c| c.insert(index, (who, T::CandidacyBond::get())));
 		}
 
 		/// Renounce one's intention to be a candidate for the next election round. 3 potential
 		/// outcomes exist:
-		/// - `origin` is a candidate and not elected in any set. In this case, the bond is
+		///
+		/// - `origin` is a candidate and not elected in any set. In this case, the deposit is
 		///   unreserved, returned and origin is removed as a candidate.
-		/// - `origin` is a current runner-up. In this case, the bond is unreserved, returned and
+		/// - `origin` is a current runner-up. In this case, the deposit is unreserved, returned and
 		///   origin is removed as a runner-up.
-		/// - `origin` is a current member. In this case, the bond is unreserved and origin is
+		/// - `origin` is a current member. In this case, the deposit is unreserved and origin is
 		///   removed as a member, consequently not being a candidate for the next round anymore.
-		///   Similar to [`remove_voter`], if replacement runners exists, they are immediately used.
-		/// <weight>
-		/// If a candidate is renouncing:
-		/// 	Base weight: 17.28 µs
-		/// 	Complexity of candidate_count: 0.235 µs
-		/// 	State reads:
-		/// 		- Candidates
-		/// 		- [AccountBalance(who) (unreserve)]
-		/// 	State writes:
-		/// 		- Candidates
-		/// 		- [AccountBalance(who) (unreserve)]
-		/// If member is renouncing:
-		/// 	Base weight: 46.25 µs
-		/// 	State reads:
-		/// 		- Members, RunnersUp (remove_and_replace_member),
-		/// 		- [AccountData(who) (unreserve)]
-		/// 	State writes:
-		/// 		- Members, RunnersUp (remove_and_replace_member),
-		/// 		- [AccountData(who) (unreserve)]
-		/// If runner is renouncing:
-		/// 	Base weight: 46.25 µs
-		/// 	State reads:
-		/// 		- RunnersUp (remove_and_replace_member),
-		/// 		- [AccountData(who) (unreserve)]
-		/// 	State writes:
-		/// 		- RunnersUp (remove_and_replace_member),
-		/// 		- [AccountData(who) (unreserve)]
-		/// </weight>
+		///   Similar to [`remove_members`], if replacement runners exists, they are immediately used.
+		///   If the prime is renouncing, then no prime will exist until the next round.
+		///
+		/// The dispatch origin of this call must be signed, and have one of the above roles.
+		///
+		/// # <weight>
+		/// The type of renouncing must be provided as witness data.
+		/// # </weight>
 		#[weight =  match *renouncing {
 			Renouncing::Candidate(count) => T::WeightInfo::renounce_candidacy_candidate(count),
 			Renouncing::Member => T::WeightInfo::renounce_candidacy_members(),
@@ -568,38 +535,36 @@ decl_module! {
 			let who = ensure_signed(origin)?;
 			match renouncing {
 				Renouncing::Member => {
-					// returns NoMember error in case of error.
-					let _ = Self::remove_and_replace_member(&who)?;
-					T::Currency::unreserve(&who, T::CandidacyBond::get());
-					Self::deposit_event(RawEvent::MemberRenounced(who));
+					let _ = Self::remove_and_replace_member(&who, false)
+						.map_err(|_| Error::<T>::InvalidRenouncing)?;
+					Self::deposit_event(RawEvent::Renounced(who));
 				},
 				Renouncing::RunnerUp => {
-					let mut runners_up_with_stake = Self::runners_up();
-					if let Some(index) = runners_up_with_stake
-						.iter()
-						.position(|(ref r, ref _s)| r == &who)
-					{
-						runners_up_with_stake.remove(index);
-						// unreserve the bond
-						T::Currency::unreserve(&who, T::CandidacyBond::get());
-						// update storage.
-						<RunnersUp<T>>::put(runners_up_with_stake);
-					} else {
-						Err(Error::<T>::InvalidRenouncing)?;
-					}
+					<RunnersUp<T>>::try_mutate::<_, Error<T>, _>(|runners_up| {
+						let index = runners_up
+							.iter()
+							.position(|SeatHolder { who: r, .. }| r == &who)
+							.ok_or(Error::<T>::InvalidRenouncing)?;
+						// can't fail anymore.
+						let SeatHolder { deposit, .. } = runners_up.remove(index);
+						let _remainder = T::Currency::unreserve(&who, deposit);
+						debug_assert!(_remainder.is_zero());
+						Self::deposit_event(RawEvent::Renounced(who));
+						Ok(())
+					})?;
 				}
 				Renouncing::Candidate(count) => {
-					let mut candidates = Self::candidates();
-					ensure!(count >= candidates.len() as u32, Error::<T>::InvalidRenouncing);
-					if let Some(index) = candidates.iter().position(|x| *x == who) {
-						candidates.remove(index);
-						// unreserve the bond
-						T::Currency::unreserve(&who, T::CandidacyBond::get());
-						// update storage.
-						<Candidates<T>>::put(candidates);
-					} else {
-						Err(Error::<T>::InvalidRenouncing)?;
-					}
+					<Candidates<T>>::try_mutate::<_, Error<T>, _>(|candidates| {
+						ensure!(count >= candidates.len() as u32, Error::<T>::InvalidWitnessData);
+						let index = candidates
+							.binary_search_by(|(c, _)| c.cmp(&who))
+							.map_err(|_| Error::<T>::InvalidRenouncing)?;
+						let (_removed, deposit) = candidates.remove(index);
+						let _remainder = T::Currency::unreserve(&who, deposit);
+						debug_assert!(_remainder.is_zero());
+						Self::deposit_event(RawEvent::Renounced(who));
+						Ok(())
+					})?;
 				}
 			};
 		}
@@ -610,17 +575,13 @@ decl_module! {
 		/// If a runner-up is available, then the best runner-up will be removed and replaces the
 		/// outgoing member. Otherwise, a new phragmen election is started.
 		///
+		/// The dispatch origin of this call must be root.
+		///
 		/// Note that this does not affect the designated block number of the next election.
 		///
 		/// # <weight>
-		/// If we have a replacement:
-		/// 	- Base weight: 50.93 µs
-		/// 	- State reads:
-		/// 		- RunnersUp.len()
-		/// 		- Members, RunnersUp (remove_and_replace_member)
-		/// 	- State writes:
-		/// 		- Members, RunnersUp (remove_and_replace_member)
-		/// Else, since this is a root call and will go into phragmen, we assume full block for now.
+		/// If we have a replacement, we use a small weight. Else, since this is a root call and
+		/// will go into phragmen, we assume full block for now.
 		/// # </weight>
 		#[weight = if *has_replacement {
 			T::WeightInfo::remove_member_with_replacement()
@@ -635,164 +596,196 @@ decl_module! {
 			ensure_root(origin)?;
 			let who = T::Lookup::lookup(who)?;
 
-			let will_have_replacement = <RunnersUp<T>>::decode_len().unwrap_or(0) > 0;
+			let will_have_replacement = <RunnersUp<T>>::decode_len().map_or(false, |l| l > 0);
 			if will_have_replacement != has_replacement {
-				// In both cases, we will change more weight than neede. Refund and abort.
+				// In both cases, we will change more weight than need. Refund and abort.
 				return Err(Error::<T>::InvalidReplacement.with_weight(
 					// refund. The weight value comes from a benchmark which is special to this.
-					//  5.751 µs
 					T::WeightInfo::remove_member_wrong_refund()
 				));
-			} // else, prediction was correct.
+			}
 
-			Self::remove_and_replace_member(&who).map(|had_replacement| {
-				let (imbalance, _) = T::Currency::slash_reserved(&who, T::CandidacyBond::get());
-				T::KickedMember::on_unbalanced(imbalance);
-				Self::deposit_event(RawEvent::MemberKicked(who.clone()));
+			let had_replacement = Self::remove_and_replace_member(&who, true)?;
+			debug_assert_eq!(has_replacement, had_replacement);
+			Self::deposit_event(RawEvent::MemberKicked(who.clone()));
 
-				if !had_replacement {
-					// if we end up here, we will charge a full block weight.
-					Self::do_phragmen();
-				}
+			if !had_replacement {
+				Self::do_phragmen();
+			}
 
-				// no refund needed.
-				None.into()
-			}).map_err(|e| e.into())
+			// no refund needed.
+			Ok(None.into())
 		}
 
-		/// What to do at the end of each block. Checks if an election needs to happen or not.
+		/// Clean all voters who are defunct (i.e. they do not serve any purpose at all). The
+		/// deposit of the removed voters are returned.
+		///
+		/// This is an root function to be used only for cleaning the state.
+		///
+		/// The dispatch origin of this call must be root.
+		///
+		/// # <weight>
+		/// The total number of voters and those that are defunct must be provided as witness data.
+		/// # </weight>
+		#[weight = T::WeightInfo::clean_defunct_voters(*_num_voters, *_num_defunct)]
+		fn clean_defunct_voters(origin, _num_voters: u32, _num_defunct: u32) {
+			let _ = ensure_root(origin)?;
+			<Voting<T>>::iter()
+				.filter(|(_, x)| Self::is_defunct_voter(&x.votes))
+				.for_each(|(dv, _)| {
+					Self::do_remove_voter(&dv)
+				})
+		}
+
+		/// What to do at the end of each block.
+		///
+		/// Checks if an election needs to happen or not.
 		fn on_initialize(n: T::BlockNumber) -> Weight {
-			// returns the correct weight.
-			Self::end_block(n)
+			let term_duration = T::TermDuration::get();
+			if !term_duration.is_zero() && (n % term_duration).is_zero() {
+				Self::do_phragmen()
+			} else {
+				0
+			}
 		}
 	}
 }
 
-decl_event!(
-	pub enum Event<T> where
-		Balance = BalanceOf<T>,
-		<T as frame_system::Config>::AccountId,
-	{
-		/// A new term with \[new_members\]. This indicates that enough candidates existed to run the
-		/// election, not that enough have has been elected. The inner value must be examined for
-		/// this purpose. A `NewTerm(\[\])` indicates that some candidates got their bond slashed and
-		/// none were elected, whilst `EmptyTerm` means that no candidates existed to begin with.
-		NewTerm(Vec<(AccountId, Balance)>),
-		/// No (or not enough) candidates existed for this round. This is different from
-		/// `NewTerm(\[\])`. See the description of `NewTerm`.
-		EmptyTerm,
-		/// Internal error happened while trying to perform election.
-		ElectionError,
-		/// A \[member\] has been removed. This should always be followed by either `NewTerm` or
-		/// `EmptyTerm`.
-		MemberKicked(AccountId),
-		/// A candidate was slashed due to failing to obtain a seat as member or runner-up
-		CandidateSlashed(AccountId, Balance),
-		/// A seat holder (member or runner-up) was slashed due to failing to retaining their position.
-		SeatHolderSlashed(AccountId, Balance),
-		/// A \[member\] has renounced their candidacy.
-		MemberRenounced(AccountId),
-		/// A voter was reported with the the report being successful or not.
-		/// \[voter, reporter, success\]
-		VoterReported(AccountId, AccountId, bool),
+impl<T: Config> Module<T> {
+	/// The deposit value of `count` votes.
+	fn deposit_of(count: usize) -> BalanceOf<T> {
+		T::VotingBondBase::get().saturating_add(
+			T::VotingBondFactor::get().saturating_mul((count as u32).into())
+		)
 	}
-);
 
-impl<T: Config> Module<T> {
-	/// Attempts to remove a member `who`. If a runner-up exists, it is used as the replacement and
-	/// Ok(true). is returned.
+	/// Attempts to remove a member `who`. If a runner-up exists, it is used as the replacement.
 	///
-	/// Otherwise, `Ok(false)` is returned to signal the caller.
+	/// Returns:
 	///
-	/// If a replacement exists, `Members` and `RunnersUp` storage is updated, where the first
-	/// element of `RunnersUp` is used as the replacement and `Ok(true)` is returned. Else,
-	/// `Ok(false)` is returned with no storage updated.
+	/// - `Ok(true)` if the member was removed and a replacement was found.
+	/// - `Ok(false)` if the member was removed and but no replacement was found.
+	/// - `Err(_)` if the member was no found.
 	///
-	/// Note that this function _will_ call into `T::ChangeMembers` in case any change happens
-	/// (`Ok(true)`).
+	/// Both `Members` and `RunnersUp` storage is updated accordingly. `T::ChangeMember` is called
+	/// if needed. If `slash` is true, the deposit of the potentially removed member is slashed,
+	/// else, it is unreserved.
 	///
-	/// If replacement exists, this will read and write from/into both `Members` and `RunnersUp`.
-	fn remove_and_replace_member(who: &T::AccountId) -> Result<bool, DispatchError> {
-		let mut members_with_stake = Self::members();
-		if let Ok(index) = members_with_stake.binary_search_by(|(ref m, ref _s)| m.cmp(who)) {
-			members_with_stake.remove(index);
-
-			let next_up = <RunnersUp<T>>::mutate(|runners_up| runners_up.pop());
-			let maybe_replacement = next_up.and_then(|(replacement, stake)|
-				members_with_stake.binary_search_by(|(ref m, ref _s)| m.cmp(&replacement))
-					.err()
-					.map(|index| {
-						members_with_stake.insert(index, (replacement.clone(), stake));
-						replacement
-					})
-			);
+	/// ### Note: Prime preservation
+	///
+	/// This function attempts to preserve the prime. If the removed members is not the prime, it is
+	/// set again via [`Config::ChangeMembers`].
+	fn remove_and_replace_member(who: &T::AccountId, slash: bool) -> Result<bool, DispatchError> {
+		// closure will return:
+		// - `Ok(Option(replacement))` if member was removed and replacement was replaced.
+		// - `Ok(None)` if member was removed but no replacement was found
+		// - `Err(_)` if who is not a member.
+		let maybe_replacement = <Members<T>>::try_mutate::<_, Error<T>, _>(|members| {
+			let remove_index =
+				members.binary_search_by(|m| m.who.cmp(who)).map_err(|_| Error::<T>::NotMember)?;
+			// we remove the member anyhow, regardless of having a runner-up or not.
+			let removed = members.remove(remove_index);
+
+			// slash or unreserve
+			if slash {
+				let (imbalance, _remainder) = T::Currency::slash_reserved(who, removed.deposit);
+				debug_assert!(_remainder.is_zero());
+				T::LoserCandidate::on_unbalanced(imbalance);
+				Self::deposit_event(RawEvent::SeatHolderSlashed(who.clone(), removed.deposit));
+			} else {
+				T::Currency::unreserve(who, removed.deposit);
+			}
 
-			<Members<T>>::put(&members_with_stake);
-			let members = members_with_stake.into_iter().map(|m| m.0).collect::<Vec<_>>();
-			let result = Ok(maybe_replacement.is_some());
-			let old = [who.clone()];
-			match maybe_replacement {
-				Some(new) => T::ChangeMembers::change_members_sorted(&[new], &old, &members),
-				None => T::ChangeMembers::change_members_sorted(&[], &old, &members),
+			let maybe_next_best = <RunnersUp<T>>::mutate(|r| r.pop()).map(|next_best| {
+				// defensive-only: Members and runners-up are disjoint. This will always be err and
+				// give us an index to insert.
+				if let Err(index) = members.binary_search_by(|m| m.who.cmp(&next_best.who)) {
+					members.insert(index, next_best.clone());
+				} else {
+					// overlap. This can never happen. If so, it seems like our intended replacement
+					// is already a member, so not much more to do.
+					frame_support::debug::error!(
+						"pallet-elections-phragmen: a member seems to also be a runner-up."
+					);
+				}
+				next_best
+			});
+			Ok(maybe_next_best)
+		})?;
+
+		let remaining_member_ids_sorted = Self::members()
+			.into_iter()
+			.map(|x| x.who.clone())
+			.collect::<Vec<_>>();
+		let outgoing = &[who.clone()];
+		let maybe_current_prime = T::ChangeMembers::get_prime();
+		let return_value = match maybe_replacement {
+			// member ids are already sorted, other two elements have one item.
+			Some(incoming) => {
+				T::ChangeMembers::change_members_sorted(
+					&[incoming.who],
+					outgoing,
+					&remaining_member_ids_sorted[..]
+				);
+				true
+			}
+			None => {
+				T::ChangeMembers::change_members_sorted(
+					&[],
+					outgoing,
+					&remaining_member_ids_sorted[..]
+				);
+				false
+			}
+		};
+
+		// if there was a prime before and they are not the one being removed, then set them
+		// again.
+		if let Some(current_prime) = maybe_current_prime {
+			if &current_prime != who {
+				T::ChangeMembers::set_prime(Some(current_prime));
 			}
-			result
-		} else {
-			Err(Error::<T>::NotMember)?
 		}
+
+		Ok(return_value)
 	}
 
 	/// Check if `who` is a candidate. It returns the insert index if the element does not exists as
 	/// an error.
-	///
-	/// O(LogN) given N candidates.
 	fn is_candidate(who: &T::AccountId) -> Result<(), usize> {
-		Self::candidates().binary_search(who).map(|_| ())
+		Self::candidates().binary_search_by(|c| c.0.cmp(who)).map(|_| ())
 	}
 
 	/// Check if `who` is a voter. It may or may not be a _current_ one.
-	///
-	/// State: O(1).
 	fn is_voter(who: &T::AccountId) -> bool {
 		Voting::<T>::contains_key(who)
 	}
 
 	/// Check if `who` is currently an active member.
-	///
-	/// O(LogN) given N members. Since members are limited, O(1).
 	fn is_member(who: &T::AccountId) -> bool {
-		Self::members().binary_search_by(|(a, _b)| a.cmp(who)).is_ok()
+		Self::members().binary_search_by(|m| m.who.cmp(who)).is_ok()
 	}
 
 	/// Check if `who` is currently an active runner-up.
-	///
-	/// O(LogN) given N runners-up. Since runners-up are limited, O(1).
 	fn is_runner_up(who: &T::AccountId) -> bool {
-		Self::runners_up().iter().position(|(a, _b)| a == who).is_some()
-	}
-
-	/// Returns number of desired members.
-	fn desired_members() -> u32 {
-		T::DesiredMembers::get()
-	}
-
-	/// Returns number of desired runners up.
-	fn desired_runners_up() -> u32 {
-		T::DesiredRunnersUp::get()
-	}
-
-	/// Returns the term duration
-	fn term_duration() -> T::BlockNumber {
-		T::TermDuration::get()
+		Self::runners_up().iter().position(|r| &r.who == who).is_some()
 	}
 
 	/// Get the members' account ids.
 	fn members_ids() -> Vec<T::AccountId> {
-		Self::members().into_iter().map(|(m, _)| m).collect::<Vec<T::AccountId>>()
+		Self::members().into_iter().map(|m| m.who).collect::<Vec<T::AccountId>>()
 	}
 
-	/// The the runners' up account ids.
-	fn runners_up_ids() -> Vec<T::AccountId> {
-		Self::runners_up().into_iter().map(|(r, _)| r).collect::<Vec<T::AccountId>>()
+	/// Get a concatenation of previous members and runners-up and their deposits.
+	///
+	/// These accounts are essentially treated as candidates.
+	fn implicit_candidates_with_deposit() -> Vec<(T::AccountId, BalanceOf<T>)> {
+		// invariant: these two are always without duplicates.
+		Self::members()
+			.into_iter()
+			.map(|m| (m.who, m.deposit))
+			.chain(Self::runners_up().into_iter().map(|r| (r.who, r.deposit)))
+			.collect::<Vec<_>>()
 	}
 
 	/// Check if `votes` will correspond to a defunct voter. As no origin is part of the inputs,
@@ -809,118 +802,115 @@ impl<T: Config> Module<T> {
 	}
 
 	/// Remove a certain someone as a voter.
-	///
-	/// This will clean always clean the storage associated with the voter, and remove the balance
-	/// lock. Optionally, it would also return the reserved voting bond if indicated by `unreserve`.
-	/// If unreserve is true, has 3 storage reads and 1 reads.
-	///
-	/// DB access: Voting and Lock are always written to, if unreserve, then 1 read and write added.
-	fn do_remove_voter(who: &T::AccountId, unreserve: bool) {
-		// remove storage and lock.
-		Voting::<T>::remove(who);
+	fn do_remove_voter(who: &T::AccountId) {
+		let Voter { deposit, .. } = <Voting<T>>::take(who);
+
+		// remove storage, lock and unreserve.
 		T::Currency::remove_lock(T::ModuleId::get(), who);
 
-		if unreserve {
-			T::Currency::unreserve(who, T::VotingBond::get());
-		}
-	}
-
-	/// Check there's nothing to do this block.
-	///
-	/// Runs phragmen election and cleans all the previous candidate state. The voter state is NOT
-	/// cleaned and voters must themselves submit a transaction to retract.
-	fn end_block(block_number: T::BlockNumber) -> Weight {
-		if !Self::term_duration().is_zero() {
-			if (block_number % Self::term_duration()).is_zero() {
-				Self::do_phragmen();
-				return T::BlockWeights::get().max_block;
-			}
-		}
-		0
+		// NOTE: we could check the deposit amount before removing and skip if zero, but it will be
+		// a noop anyhow.
+		let _remainder = T::Currency::unreserve(who, deposit);
+		debug_assert!(_remainder.is_zero());
 	}
 
 	/// Run the phragmen election with all required side processes and state updates, if election
 	/// succeeds. Else, it will emit an `ElectionError` event.
 	///
 	/// Calls the appropriate [`ChangeMembers`] function variant internally.
-	///
-	/// Reads: O(C + V*E) where C = candidates, V voters and E votes per voter exits.
-	/// Writes: O(M + R) with M desired members and R runners_up.
-	fn do_phragmen() {
-		let desired_seats = Self::desired_members() as usize;
-		let desired_runners_up = Self::desired_runners_up() as usize;
+	fn do_phragmen() -> Weight {
+		let desired_seats = T::DesiredMembers::get() as usize;
+		let desired_runners_up = T::DesiredRunnersUp::get() as usize;
 		let num_to_elect = desired_runners_up + desired_seats;
 
-		let mut candidates = Self::candidates();
-		// candidates who explicitly called `submit_candidacy`. Only these folks are at risk of
-		// losing their bond.
-		let exposed_candidates = candidates.clone();
-		// current members are always a candidate for the next round as well.
-		// this is guaranteed to not create any duplicates.
-		candidates.append(&mut Self::members_ids());
-		// previous runners_up are also always candidates for the next round.
-		candidates.append(&mut Self::runners_up_ids());
-
-		if candidates.len().is_zero() {
+		let mut candidates_and_deposit = Self::candidates();
+		// add all the previous members and runners-up as candidates as well.
+		candidates_and_deposit.append(&mut Self::implicit_candidates_with_deposit());
+
+		if candidates_and_deposit.len().is_zero() {
 			Self::deposit_event(RawEvent::EmptyTerm);
-			return;
+			return T::DbWeight::get().reads(5);
 		}
 
+		// All of the new winners that come out of phragmen will thus have a deposit recorded.
+		let candidate_ids = candidates_and_deposit
+			.iter()
+			.map(|(x, _)| x)
+			.cloned()
+			.collect::<Vec<_>>();
+
 		// helper closures to deal with balance/stake.
 		let total_issuance = T::Currency::total_issuance();
 		let to_votes = |b: BalanceOf<T>| T::CurrencyToVote::to_vote(b, total_issuance);
 		let to_balance = |e: ExtendedBalance| T::CurrencyToVote::to_currency(e, total_issuance);
 
+		let mut num_edges: u32 = 0;
 		// used for prime election.
 		let voters_and_stakes = Voting::<T>::iter()
-			.map(|(voter, (stake, votes))| (voter, stake, votes))
+			.map(|(voter, Voter { stake, votes, .. })| { (voter, stake, votes) })
 			.collect::<Vec<_>>();
 		// used for phragmen.
 		let voters_and_votes = voters_and_stakes.iter()
 			.cloned()
-			.map(|(voter, stake, votes)| { (voter, to_votes(stake), votes)} )
+			.map(|(voter, stake, votes)| {
+				num_edges = num_edges.saturating_add(votes.len() as u32);
+				(voter, to_votes(stake), votes)
+			})
 			.collect::<Vec<_>>();
 
+		let weight_candidates = candidates_and_deposit.len() as u32;
+		let weight_voters = voters_and_votes.len() as u32;
+		let weight_edges = num_edges;
 		let _ = sp_npos_elections::seq_phragmen::<T::AccountId, Perbill>(
 			num_to_elect,
-			candidates,
+			candidate_ids,
 			voters_and_votes.clone(),
 			None,
-		).map(|ElectionResult { winners, assignments: _ }| {
+		).map(|ElectionResult { winners, assignments: _, }| {
 			// this is already sorted by id.
 			let old_members_ids_sorted = <Members<T>>::take().into_iter()
-				.map(|(m, _)| m)
+				.map(|m| m.who)
 				.collect::<Vec<T::AccountId>>();
 			// this one needs a sort by id.
 			let mut old_runners_up_ids_sorted = <RunnersUp<T>>::take().into_iter()
-				.map(|(r, _)| r)
+				.map(|r| r.who)
 				.collect::<Vec<T::AccountId>>();
 			old_runners_up_ids_sorted.sort();
 
 			// filter out those who end up with no backing stake.
-			let new_set_with_stake = winners
+			let mut new_set_with_stake = winners
 				.into_iter()
 				.filter_map(|(m, b)| if b.is_zero() { None } else { Some((m, to_balance(b))) })
 				.collect::<Vec<(T::AccountId, BalanceOf<T>)>>();
 
-			// OPTIMISATION NOTE: we could bail out here if `new_set.len() == 0`. There isn't much
-			// left to do. Yet, re-arranging the code would require duplicating the slashing of
-			// exposed candidates, cleaning any previous members, and so on. For now, in favour of
-			// readability and veracity, we keep it simple.
+			// OPTIMIZATION NOTE: we could bail out here if `new_set.len() == 0`. There isn't
+			// much left to do. Yet, re-arranging the code would require duplicating the
+			// slashing of exposed candidates, cleaning any previous members, and so on. For
+			// now, in favor of readability and veracity, we keep it simple.
 
 			// split new set into winners and runners up.
 			let split_point = desired_seats.min(new_set_with_stake.len());
-			let mut new_members_sorted_by_id = (&new_set_with_stake[..split_point]).to_vec();
-
-			// save the runners up as-is. They are sorted based on desirability.
-			// save the members, sorted based on account id.
+			let mut new_members_sorted_by_id = new_set_with_stake.drain(..split_point).collect::<Vec<_>>();
 			new_members_sorted_by_id.sort_by(|i, j| i.0.cmp(&j.0));
 
-			// Now we select a prime member using a [Borda count](https://en.wikipedia.org/wiki/Borda_count).
-			// We weigh everyone's vote for that new member by a multiplier based on the order
-			// of the votes. i.e. the first person a voter votes for gets a 16x multiplier,
-			// the next person gets a 15x multiplier, an so on... (assuming `MAXIMUM_VOTE` = 16)
-			let mut prime_votes: Vec<_> = new_members_sorted_by_id.iter().map(|c| (&c.0, BalanceOf::<T>::zero())).collect();
+			// all the rest will be runners-up
+			new_set_with_stake.reverse();
+			let new_runners_up_sorted_by_rank = new_set_with_stake;
+			let mut new_runners_up_ids_sorted = new_runners_up_sorted_by_rank
+				.iter()
+				.map(|(r, _)| r.clone())
+				.collect::<Vec<_>>();
+			new_runners_up_ids_sorted.sort();
+
+			// Now we select a prime member using a [Borda
+			// count](https://en.wikipedia.org/wiki/Borda_count). We weigh everyone's vote for
+			// that new member by a multiplier based on the order of the votes. i.e. the first
+			// person a voter votes for gets a 16x multiplier, the next person gets a 15x
+			// multiplier, an so on... (assuming `MAXIMUM_VOTE` = 16)
+			let mut prime_votes = new_members_sorted_by_id
+				.iter()
+				.map(|c| (&c.0, BalanceOf::<T>::zero()))
+				.collect::<Vec<_>>();
 			for (_, stake, votes) in voters_and_stakes.into_iter() {
 				for (vote_multiplier, who) in votes.iter()
 					.enumerate()
@@ -933,9 +923,9 @@ impl<T: Config> Module<T> {
 					}
 				}
 			}
-			// We then select the new member with the highest weighted stake. In the case of
-			// a tie, the last person in the list with the tied score is selected. This is
-			// the person with the "highest" account id based on the sort above.
+			// We then select the new member with the highest weighted stake. In the case of a tie,
+			// the last person in the list with the tied score is selected. This is the person with
+			// the "highest" account id based on the sort above.
 			let prime = prime_votes.into_iter().max_by_key(|x| x.1).map(|x| x.0.clone());
 
 			// new_members_sorted_by_id is sorted by account id.
@@ -944,20 +934,8 @@ impl<T: Config> Module<T> {
 				.map(|(m, _)| m.clone())
 				.collect::<Vec<T::AccountId>>();
 
-			let new_runners_up_sorted_by_rank = &new_set_with_stake[split_point..]
-				.into_iter()
-				.cloned()
-				.rev()
-				.collect::<Vec<(T::AccountId, BalanceOf<T>)>>();
-			// new_runners_up remains sorted by desirability.
-			let mut new_runners_up_ids_sorted = new_runners_up_sorted_by_rank
-				.iter()
-				.map(|(r, _)| r.clone())
-				.collect::<Vec<T::AccountId>>();
-			new_runners_up_ids_sorted.sort();
-
 			// report member changes. We compute diff because we need the outgoing list.
-			let (incoming, outgoing) = T::ChangeMembers::compute_members_diff(
+			let (incoming, outgoing) = T::ChangeMembers::compute_members_diff_sorted(
 				&new_members_ids_sorted,
 				&old_members_ids_sorted,
 			);
@@ -968,66 +946,63 @@ impl<T: Config> Module<T> {
 			);
 			T::ChangeMembers::set_prime(prime);
 
-			// outgoing members who are no longer a runner-up lose their bond.
-			let mut to_burn_bond = outgoing
-				.iter()
-				.filter(|o| new_runners_up_ids_sorted.binary_search(o).is_err())
-				.cloned()
-				.collect::<Vec<_>>();
-
-			// compute the outgoing of runners up as well and append them to the `to_burn_bond`, if
-			// they are not members.
-			{
-				let (_, outgoing) = T::ChangeMembers::compute_members_diff(
-					&new_runners_up_ids_sorted,
-					&old_runners_up_ids_sorted,
-				);
-				// none of the ones computed to be outgoing must still be in the list.
-				debug_assert!(outgoing.iter().all(|o| !new_runners_up_ids_sorted.contains(o)));
-				to_burn_bond.extend(
-					outgoing
-						.iter()
-						.filter(|o| new_members_ids_sorted.binary_search(o).is_err())
-						.cloned()
-						.collect::<Vec<_>>()
-				);
-			}
-
-			// Burn loser bond. members list is sorted. O(NLogM) (N candidates, M members)
-			// runner up list is also sorted. O(NLogK) given K runner ups. Overall: O(NLogM + N*K)
-			// both the member and runner counts are bounded.
-			exposed_candidates.into_iter().for_each(|c| {
-				// any candidate who is not a member and not a runner up.
+			// All candidates/members/runners-up who are no longer retaining a position as a
+			// seat holder will lose their bond.
+			candidates_and_deposit.iter().for_each(|(c, d)| {
 				if
-					new_members_ids_sorted.binary_search(&c).is_err() &&
-					new_runners_up_ids_sorted.binary_search(&c).is_err()
+					new_members_ids_sorted.binary_search(c).is_err() &&
+					new_runners_up_ids_sorted.binary_search(c).is_err()
 				{
-					let (imbalance, _) = T::Currency::slash_reserved(&c, T::CandidacyBond::get());
-					Self::deposit_event(RawEvent::CandidateSlashed(c, T::CandidacyBond::get()));
+					let (imbalance, _) = T::Currency::slash_reserved(c, *d);
 					T::LoserCandidate::on_unbalanced(imbalance);
+					Self::deposit_event(RawEvent::CandidateSlashed(c.clone(), *d));
 				}
 			});
 
-			// Burn outgoing bonds
-			to_burn_bond.into_iter().for_each(|x| {
-				let (imbalance, _) = T::Currency::slash_reserved(&x, T::CandidacyBond::get());
-				Self::deposit_event(RawEvent::SeatHolderSlashed(x, T::CandidacyBond::get()));
-				T::LoserCandidate::on_unbalanced(imbalance);
-			});
-
-			<Members<T>>::put(&new_members_sorted_by_id);
-			<RunnersUp<T>>::put(new_runners_up_sorted_by_rank);
-
-			Self::deposit_event(RawEvent::NewTerm(new_members_sorted_by_id.clone().to_vec()));
+			// write final values to storage.
+			let deposit_of_candidate = |x: &T::AccountId| -> BalanceOf<T> {
+				// defensive-only. This closure is used against the new members and new runners-up,
+				// both of which are phragmen winners and thus must have deposit.
+				candidates_and_deposit
+					.iter()
+					.find_map(|(c, d)| if c == x { Some(*d) } else { None })
+					.unwrap_or_default()
+			};
+			// fetch deposits from the one recorded one. This will make sure that a candidate who
+			// submitted candidacy before a change to candidacy deposit will have the correct amount
+			// recorded.
+			<Members<T>>::put(
+				new_members_sorted_by_id
+					.iter()
+					.map(|(who, stake)| SeatHolder {
+						deposit: deposit_of_candidate(&who),
+						who: who.clone(),
+						stake: stake.clone(),
+					})
+					.collect::<Vec<_>>(),
+			);
+			<RunnersUp<T>>::put(
+				new_runners_up_sorted_by_rank
+					.into_iter()
+					.map(|(who, stake)| SeatHolder {
+						deposit: deposit_of_candidate(&who),
+						who,
+						stake,
+					})
+					.collect::<Vec<_>>(),
+			);
 
 			// clean candidates.
 			<Candidates<T>>::kill();
 
+			Self::deposit_event(RawEvent::NewTerm(new_members_sorted_by_id));
 			ElectionRounds::mutate(|v| *v += 1);
 		}).map_err(|e| {
 			frame_support::debug::error!("elections-phragmen: failed to run election [{:?}].", e);
 			Self::deposit_event(RawEvent::ElectionError);
 		});
+
+		T::WeightInfo::election_phragmen(weight_candidates, weight_voters, weight_edges)
 	}
 }
 
@@ -1035,16 +1010,19 @@ impl<T: Config> Contains<T::AccountId> for Module<T> {
 	fn contains(who: &T::AccountId) -> bool {
 		Self::is_member(who)
 	}
-	fn sorted_members() -> Vec<T::AccountId> { Self::members_ids() }
+
+	fn sorted_members() -> Vec<T::AccountId> {
+		Self::members_ids()
+	}
 
 	// A special function to populate members in this pallet for passing Origin
 	// checks in runtime benchmarking.
 	#[cfg(feature = "runtime-benchmarks")]
 	fn add(who: &T::AccountId) {
 		Members::<T>::mutate(|members| {
-			match members.binary_search_by(|(a, _b)| a.cmp(who)) {
+			match members.binary_search_by(|m| m.who.cmp(who)) {
 				Ok(_) => (),
-				Err(pos) => members.insert(pos, (who.clone(), BalanceOf::<T>::default())),
+				Err(pos) => members.insert(pos, SeatHolder { who: who.clone(), ..Default::default() }),
 			}
 		})
 	}
@@ -1055,14 +1033,16 @@ impl<T: Config> ContainsLengthBound for Module<T> {
 
 	/// Implementation uses a parameter type so calling is cost-free.
 	fn max_len() -> usize {
-		Self::desired_members() as usize
+		T::DesiredMembers::get() as usize
 	}
 }
 
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use frame_support::{assert_ok, assert_noop, assert_err_with_weight, parameter_types};
+	use frame_support::{assert_ok, assert_noop, parameter_types,
+		traits::OnInitialize,
+	};
 	use substrate_test_utils::assert_eq_uvec;
 	use sp_core::H256;
 	use sp_runtime::{
@@ -1079,7 +1059,7 @@ mod tests {
 
 	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
-		type BlockWeights = ();
+		type BlockWeights = BlockWeights;
 		type BlockLength = ();
 		type DbWeight = ();
 		type Origin = Origin;
@@ -1116,14 +1096,12 @@ mod tests {
 		type WeightInfo = ();
 	}
 
-	parameter_types! {
-		pub const CandidacyBond: u64 = 3;
-	}
-
 	frame_support::parameter_types! {
-		pub static VotingBond: u64 = 2;
+		pub static VotingBondBase: u64 = 2;
+		pub static VotingBondFactor: u64 = 0;
+		pub static CandidacyBond: u64 = 3;
 		pub static DesiredMembers: u32 = 2;
-		pub static DesiredRunnersUp: u32 = 2;
+		pub static DesiredRunnersUp: u32 = 0;
 		pub static TermDuration: u64 = 5;
 		pub static Members: Vec<u64> = vec![];
 		pub static Prime: Option<u64> = None;
@@ -1167,9 +1145,13 @@ mod tests {
 		fn set_prime(who: Option<u64>) {
 			PRIME.with(|p| *p.borrow_mut() = who);
 		}
+
+		fn get_prime() -> Option<u64> {
+			PRIME.with(|p| *p.borrow())
+		}
 	}
 
-	parameter_types!{
+	parameter_types! {
 		pub const ElectionsPhragmenModuleId: LockIdentifier = *b"phrelect";
 	}
 
@@ -1181,13 +1163,13 @@ mod tests {
 		type ChangeMembers = TestChangeMembers;
 		type InitializeMembers = ();
 		type CandidacyBond = CandidacyBond;
-		type VotingBond = VotingBond;
+		type VotingBondBase = VotingBondBase;
+		type VotingBondFactor = VotingBondFactor;
 		type TermDuration = TermDuration;
 		type DesiredMembers = DesiredMembers;
 		type DesiredRunnersUp = DesiredRunnersUp;
 		type LoserCandidate = ();
 		type KickedMember = ();
-		type BadReport = ();
 		type WeightInfo = ();
 	}
 
@@ -1207,61 +1189,56 @@ mod tests {
 	);
 
 	pub struct ExtBuilder {
-		genesis_members: Vec<(u64, u64)>,
 		balance_factor: u64,
-		voter_bond: u64,
-		term_duration: u64,
-		desired_runners_up: u32,
-		desired_members: u32,
+		genesis_members: Vec<(u64, u64)>,
 	}
 
 	impl Default for ExtBuilder {
 		fn default() -> Self {
 			Self {
-				genesis_members: vec![],
 				balance_factor: 1,
-				voter_bond: 2,
-				term_duration: 5,
-				desired_runners_up: 0,
-				desired_members: 2,
+				genesis_members: vec![],
 			}
 		}
 	}
 
 	impl ExtBuilder {
-		pub fn voter_bond(mut self, fee: u64) -> Self {
-			self.voter_bond = fee;
+		pub fn voter_bond(self, bond: u64) -> Self {
+			VOTING_BOND_BASE.with(|v| *v.borrow_mut() = bond);
+			self
+		}
+		pub fn voter_bond_factor(self, bond: u64) -> Self {
+			VOTING_BOND_FACTOR.with(|v| *v.borrow_mut() = bond);
 			self
 		}
-		pub fn desired_runners_up(mut self, count: u32) -> Self {
-			self.desired_runners_up = count;
+		pub fn desired_runners_up(self, count: u32) -> Self {
+			DESIRED_RUNNERS_UP.with(|v| *v.borrow_mut() = count);
 			self
 		}
-		pub fn term_duration(mut self, duration: u64) -> Self {
-			self.term_duration = duration;
+		pub fn term_duration(self, duration: u64) -> Self {
+			TERM_DURATION.with(|v| *v.borrow_mut() = duration);
 			self
 		}
 		pub fn genesis_members(mut self, members: Vec<(u64, u64)>) -> Self {
+			MEMBERS.with(|m| {
+				*m.borrow_mut() = members
+					.iter()
+					.map(|(m, _)| m.clone())
+					.collect::<Vec<_>>()
+			});
 			self.genesis_members = members;
 			self
 		}
-		pub fn desired_members(mut self, count: u32) -> Self {
-			self.desired_members = count;
+		pub fn desired_members(self, count: u32) -> Self {
+			DESIRED_MEMBERS.with(|m| *m.borrow_mut() = count);
 			self
 		}
 		pub fn balance_factor(mut self, factor: u64) -> Self {
 			self.balance_factor = factor;
 			self
 		}
-		fn set_constants(&self) {
-			VOTING_BOND.with(|v| *v.borrow_mut() = self.voter_bond);
-			TERM_DURATION.with(|v| *v.borrow_mut() = self.term_duration);
-			DESIRED_RUNNERS_UP.with(|v| *v.borrow_mut() = self.desired_runners_up);
-			DESIRED_MEMBERS.with(|m| *m.borrow_mut() = self.desired_members);
-			MEMBERS.with(|m| *m.borrow_mut() = self.genesis_members.iter().map(|(m, _)| m.clone()).collect::<Vec<_>>());
-		}
 		pub fn build_and_execute(self, test: impl FnOnce() -> ()) {
-			self.set_constants();
+			MEMBERS.with(|m| *m.borrow_mut() = self.genesis_members.iter().map(|(m, _)| m.clone()).collect::<Vec<_>>());
 			let mut ext: sp_io::TestExternalities = GenesisConfig {
 				pallet_balances: Some(pallet_balances::GenesisConfig::<Test>{
 					balances: vec![
@@ -1283,6 +1260,40 @@ mod tests {
 		}
 	}
 
+	fn candidate_ids() -> Vec<u64> {
+		Elections::candidates()
+			.into_iter()
+			.map(|(c, _)| c)
+			.collect::<Vec<_>>()
+	}
+
+	fn candidate_deposit(who: &u64) -> u64 {
+		Elections::candidates()
+			.into_iter()
+			.find_map(|(c, d)| if c == *who { Some(d) } else { None })
+			.unwrap_or_default()
+	}
+
+	fn voter_deposit(who: &u64) -> u64 {
+		Elections::voting(who).deposit
+	}
+
+	fn runners_up_ids() -> Vec<u64> {
+		Elections::runners_up().into_iter().map(|r| r.who).collect::<Vec<_>>()
+	}
+
+	fn members_ids() -> Vec<u64> {
+		Elections::members_ids()
+	}
+
+	fn members_and_stake() -> Vec<(u64, u64)> {
+		Elections::members().into_iter().map(|m| (m.who, m.stake)).collect::<Vec<_>>()
+	}
+
+	fn runners_up_and_stake() -> Vec<(u64, u64)> {
+		Elections::runners_up().into_iter().map(|r| (r.who, r.stake)).collect::<Vec<_>>()
+	}
+
 	fn all_voters() -> Vec<u64> {
 		Voting::<Test>::iter().map(|(v, _)| v).collect::<Vec<u64>>()
 	}
@@ -1292,9 +1303,15 @@ mod tests {
 	}
 
 	fn has_lock(who: &u64) -> u64 {
-		let lock = Balances::locks(who)[0].clone();
-		assert_eq!(lock.id, ElectionsPhragmenModuleId::get());
-		lock.amount
+		dbg!(Balances::locks(who));
+		Balances::locks(who)
+			.get(0)
+			.cloned()
+			.map(|lock| {
+				assert_eq!(lock.id, ElectionsPhragmenModuleId::get());
+				lock.amount
+			})
+			.unwrap_or_default()
 	}
 
 	fn intersects<T: PartialEq>(a: &[T], b: &[T]) -> bool {
@@ -1303,41 +1320,41 @@ mod tests {
 
 	fn ensure_members_sorted() {
 		let mut members = Elections::members().clone();
-		members.sort();
+		members.sort_by_key(|m| m.who);
 		assert_eq!(Elections::members(), members);
 	}
 
 	fn ensure_candidates_sorted() {
 		let mut candidates = Elections::candidates().clone();
-		candidates.sort();
+		candidates.sort_by_key(|(c, _)| *c);
 		assert_eq!(Elections::candidates(), candidates);
 	}
 
 	fn locked_stake_of(who: &u64) -> u64 {
-		Voting::<Test>::get(who).0
+		Voting::<Test>::get(who).stake
 	}
 
 	fn ensure_members_has_approval_stake() {
 		// we filter members that have no approval state. This means that even we have more seats
 		// than candidates, we will never ever chose a member with no votes.
-		assert!(
-			Elections::members().iter().chain(
-				Elections::runners_up().iter()
-			).all(|(_, s)| *s != u64::zero())
-		);
+		assert!(Elections::members()
+			.iter()
+			.chain(Elections::runners_up().iter())
+			.all(|s| s.stake != u64::zero()));
 	}
 
 	fn ensure_member_candidates_runners_up_disjoint() {
 		// members, candidates and runners-up must always be disjoint sets.
-		assert!(!intersects(&Elections::members_ids(), &Elections::candidates()));
-		assert!(!intersects(&Elections::members_ids(), &Elections::runners_up_ids()));
-		assert!(!intersects(&Elections::candidates(), &Elections::runners_up_ids()));
+		assert!(!intersects(&members_ids(), &candidate_ids()));
+		assert!(!intersects(&members_ids(), &runners_up_ids()));
+		assert!(!intersects(&candidate_ids(), &runners_up_ids()));
 	}
 
 	fn pre_conditions() {
 		System::set_block_number(1);
 		ensure_members_sorted();
 		ensure_candidates_sorted();
+		ensure_member_candidates_runners_up_disjoint();
 	}
 
 	fn post_conditions() {
@@ -1360,28 +1377,24 @@ mod tests {
 	}
 
 	fn votes_of(who: &u64) -> Vec<u64> {
-		Voting::<Test>::get(who).1
-	}
-
-	fn defunct_for(who: u64) -> DefunctVoter<u64> {
-		DefunctVoter {
-			who,
-			candidate_count: Elections::candidates().len() as u32,
-			vote_count: votes_of(&who).len() as u32
-		}
+		Voting::<Test>::get(who).votes
 	}
 
 	#[test]
 	fn params_should_work() {
 		ExtBuilder::default().build_and_execute(|| {
-			assert_eq!(Elections::desired_members(), 2);
-			assert_eq!(Elections::term_duration(), 5);
+			assert_eq!(<Test as Config>::DesiredMembers::get(), 2);
+			assert_eq!(<Test as Config>::DesiredRunnersUp::get(), 0);
+			assert_eq!(<Test as Config>::VotingBondBase::get(), 2);
+			assert_eq!(<Test as Config>::VotingBondFactor::get(), 0);
+			assert_eq!(<Test as Config>::CandidacyBond::get(), 3);
+			assert_eq!(<Test as Config>::TermDuration::get(), 5);
 			assert_eq!(Elections::election_rounds(), 0);
 
 			assert!(Elections::members().is_empty());
 			assert!(Elections::runners_up().is_empty());
 
-			assert!(Elections::candidates().is_empty());
+			assert!(candidate_ids().is_empty());
 			assert_eq!(<Candidates<Test>>::decode_len(), None);
 			assert!(Elections::is_candidate(&1).is_err());
 
@@ -1394,16 +1407,38 @@ mod tests {
 	fn genesis_members_should_work() {
 		ExtBuilder::default().genesis_members(vec![(1, 10), (2, 20)]).build_and_execute(|| {
 			System::set_block_number(1);
-			assert_eq!(Elections::members(), vec![(1, 10), (2, 20)]);
+			assert_eq!(
+				Elections::members(),
+				vec![
+					SeatHolder { who: 1, stake: 10, deposit: 0 },
+					SeatHolder { who: 2, stake: 20, deposit: 0 }
+				]
+			);
 
-			assert_eq!(Elections::voting(1), (10, vec![1]));
-			assert_eq!(Elections::voting(2), (20, vec![2]));
+			assert_eq!(Elections::voting(1), Voter { stake: 10u64, votes: vec![1], deposit: 0 });
+			assert_eq!(Elections::voting(2), Voter { stake: 20u64, votes: vec![2], deposit: 0 });
 
 			// they will persist since they have self vote.
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
+
+			assert_eq!(members_ids(), vec![1, 2]);
+		})
+	}
+
+	#[test]
+	fn genesis_voters_can_remove_lock() {
+		ExtBuilder::default().genesis_members(vec![(1, 10), (2, 20)]).build_and_execute(|| {
+			System::set_block_number(1);
+
+			assert_eq!(Elections::voting(1), Voter { stake: 10u64, votes: vec![1], deposit: 0 });
+			assert_eq!(Elections::voting(2), Voter { stake: 20u64, votes: vec![2], deposit: 0 });
+
+			assert_ok!(Elections::remove_voter(Origin::signed(1)));
+			assert_ok!(Elections::remove_voter(Origin::signed(2)));
 
-			assert_eq!(Elections::members_ids(), vec![1, 2]);
+			assert_eq!(Elections::voting(1), Default::default());
+			assert_eq!(Elections::voting(2), Default::default());
 		})
 	}
 
@@ -1411,16 +1446,22 @@ mod tests {
 	fn genesis_members_unsorted_should_work() {
 		ExtBuilder::default().genesis_members(vec![(2, 20), (1, 10)]).build_and_execute(|| {
 			System::set_block_number(1);
-			assert_eq!(Elections::members(), vec![(1, 10), (2, 20)]);
+			assert_eq!(
+				Elections::members(),
+				vec![
+					SeatHolder { who: 1, stake: 10, deposit: 0 },
+					SeatHolder { who: 2, stake: 20, deposit: 0 },
+				]
+			);
 
-			assert_eq!(Elections::voting(1), (10, vec![1]));
-			assert_eq!(Elections::voting(2), (20, vec![2]));
+			assert_eq!(Elections::voting(1), Voter { stake: 10u64, votes: vec![1], deposit: 0 });
+			assert_eq!(Elections::voting(2), Voter { stake: 20u64, votes: vec![2], deposit: 0 });
 
 			// they will persist since they have self vote.
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
-			assert_eq!(Elections::members_ids(), vec![1, 2]);
+			assert_eq!(members_ids(), vec![1, 2]);
 		})
 	}
 
@@ -1434,17 +1475,7 @@ mod tests {
 	}
 
 	#[test]
-	#[should_panic]
-	fn genesis_members_cannot_over_stake_1() {
-		// 10 cannot reserve 20 as voting bond and extra genesis will panic.
-		ExtBuilder::default()
-			.voter_bond(20)
-			.genesis_members(vec![(1, 10), (2, 20)])
-			.build_and_execute(|| {});
-	}
-
-	#[test]
-	#[should_panic = "Duplicate member in elections phragmen genesis: 2"]
+	#[should_panic = "Duplicate member in elections-phragmen genesis: 2"]
 	fn genesis_members_cannot_be_duplicate() {
 		ExtBuilder::default()
 			.desired_members(3)
@@ -1467,27 +1498,27 @@ mod tests {
 			.term_duration(0)
 			.build_and_execute(||
 		{
-			assert_eq!(Elections::term_duration(), 0);
-			assert_eq!(Elections::desired_members(), 2);
+			assert_eq!(<Test as Config>::TermDuration::get(), 0);
+			assert_eq!(<Test as Config>::DesiredMembers::get(), 2);
 			assert_eq!(Elections::election_rounds(), 0);
 
-			assert!(Elections::members_ids().is_empty());
+			assert!(members_ids().is_empty());
 			assert!(Elections::runners_up().is_empty());
-			assert!(Elections::candidates().is_empty());
+			assert!(candidate_ids().is_empty());
 
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
-			assert!(Elections::members_ids().is_empty());
+			assert!(members_ids().is_empty());
 			assert!(Elections::runners_up().is_empty());
-			assert!(Elections::candidates().is_empty());
+			assert!(candidate_ids().is_empty());
 		});
 	}
 
 	#[test]
 	fn simple_candidate_submission_should_work() {
 		ExtBuilder::default().build_and_execute(|| {
-			assert_eq!(Elections::candidates(), Vec::<u64>::new());
+			assert_eq!(candidate_ids(), Vec::<u64>::new());
 			assert!(Elections::is_candidate(&1).is_err());
 			assert!(Elections::is_candidate(&2).is_err());
 
@@ -1495,7 +1526,7 @@ mod tests {
 			assert_ok!(submit_candidacy(Origin::signed(1)));
 			assert_eq!(balances(&1), (7, 3));
 
-			assert_eq!(Elections::candidates(), vec![1]);
+			assert_eq!(candidate_ids(), vec![1]);
 
 			assert!(Elections::is_candidate(&1).is_ok());
 			assert!(Elections::is_candidate(&2).is_err());
@@ -1504,46 +1535,67 @@ mod tests {
 			assert_ok!(submit_candidacy(Origin::signed(2)));
 			assert_eq!(balances(&2), (17, 3));
 
-			assert_eq!(Elections::candidates(), vec![1, 2]);
+			assert_eq!(candidate_ids(), vec![1, 2]);
 
 			assert!(Elections::is_candidate(&1).is_ok());
 			assert!(Elections::is_candidate(&2).is_ok());
+
+			assert_eq!(candidate_deposit(&1), 3);
+			assert_eq!(candidate_deposit(&2), 3);
+			assert_eq!(candidate_deposit(&3), 0);
 		});
 	}
 
 	#[test]
-	fn simple_candidate_submission_with_no_votes_should_work() {
+	fn updating_candidacy_bond_works() {
 		ExtBuilder::default().build_and_execute(|| {
-			assert_eq!(Elections::candidates(), Vec::<u64>::new());
-
-			assert_ok!(submit_candidacy(Origin::signed(1)));
-			assert_ok!(submit_candidacy(Origin::signed(2)));
+			assert_ok!(submit_candidacy(Origin::signed(5)));
+			assert_ok!(vote(Origin::signed(5), vec![5], 50));
+			assert_eq!(Elections::candidates(), vec![(5, 3)]);
 
-			assert!(Elections::is_candidate(&1).is_ok());
-			assert!(Elections::is_candidate(&2).is_ok());
-			assert_eq!(Elections::candidates(), vec![1, 2]);
+			// a runtime upgrade changes the bond.
+			CANDIDACY_BOND.with(|v| *v.borrow_mut() = 4);
 
-			assert!(Elections::members_ids().is_empty());
-			assert!(Elections::runners_up().is_empty());
+			assert_ok!(submit_candidacy(Origin::signed(4)));
+			assert_ok!(vote(Origin::signed(4), vec![4], 40));
+			assert_eq!(Elections::candidates(), vec![(4, 4), (5, 3)]);
 
+			// once elected, they each hold their candidacy bond, no more.
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
-			assert!(Elections::is_candidate(&1).is_err());
-			assert!(Elections::is_candidate(&2).is_err());
-			assert!(Elections::candidates().is_empty());
+			assert_eq!(
+				Elections::members(),
+				vec![
+					SeatHolder { who: 4, stake: 40, deposit: 4 },
+					SeatHolder { who: 5, stake: 50, deposit: 3 },
+				]
+			);
+		})
+	}
 
-			assert!(Elections::members_ids().is_empty());
-			assert!(Elections::runners_up().is_empty());
+	#[test]
+	fn candidates_are_always_sorted() {
+		ExtBuilder::default().build_and_execute(|| {
+			assert_eq!(candidate_ids(), Vec::<u64>::new());
+
+			assert_ok!(submit_candidacy(Origin::signed(3)));
+			assert_eq!(candidate_ids(), vec![3]);
+			assert_ok!(submit_candidacy(Origin::signed(1)));
+			assert_eq!(candidate_ids(), vec![1, 3]);
+			assert_ok!(submit_candidacy(Origin::signed(2)));
+			assert_eq!(candidate_ids(), vec![1, 2, 3]);
+			assert_ok!(submit_candidacy(Origin::signed(4)));
+			assert_eq!(candidate_ids(), vec![1, 2, 3, 4]);
 		});
 	}
 
 	#[test]
 	fn dupe_candidate_submission_should_not_work() {
 		ExtBuilder::default().build_and_execute(|| {
-			assert_eq!(Elections::candidates(), Vec::<u64>::new());
+			assert_eq!(candidate_ids(), Vec::<u64>::new());
 			assert_ok!(submit_candidacy(Origin::signed(1)));
-			assert_eq!(Elections::candidates(), vec![1]);
+			assert_eq!(candidate_ids(), vec![1]);
 			assert_noop!(
 				submit_candidacy(Origin::signed(1)),
 				Error::<Test>::DuplicatedCandidate,
@@ -1559,11 +1611,11 @@ mod tests {
 			assert_ok!(vote(Origin::signed(2), vec![5], 20));
 
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
-			assert_eq!(Elections::members_ids(), vec![5]);
+			assert_eq!(members_ids(), vec![5]);
 			assert!(Elections::runners_up().is_empty());
-			assert!(Elections::candidates().is_empty());
+			assert!(candidate_ids().is_empty());
 
 			assert_noop!(
 				submit_candidacy(Origin::signed(5)),
@@ -1583,14 +1635,14 @@ mod tests {
 			assert_ok!(vote(Origin::signed(1), vec![3], 10));
 
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
-			assert_eq!(Elections::members_ids(), vec![4, 5]);
-			assert_eq!(Elections::runners_up_ids(), vec![3]);
+			assert_eq!(members_ids(), vec![4, 5]);
+			assert_eq!(runners_up_ids(), vec![3]);
 
 			assert_noop!(
 				submit_candidacy(Origin::signed(3)),
-				Error::<Test>::RunnerSubmit,
+				Error::<Test>::RunnerUpSubmit,
 			);
 		});
 	}
@@ -1598,7 +1650,7 @@ mod tests {
 	#[test]
 	fn poor_candidate_submission_should_not_work() {
 		ExtBuilder::default().build_and_execute(|| {
-			assert_eq!(Elections::candidates(), Vec::<u64>::new());
+			assert_eq!(candidate_ids(), Vec::<u64>::new());
 			assert_noop!(
 				submit_candidacy(Origin::signed(7)),
 				Error::<Test>::InsufficientCandidateFunds,
@@ -1609,7 +1661,7 @@ mod tests {
 	#[test]
 	fn simple_voting_should_work() {
 		ExtBuilder::default().build_and_execute(|| {
-			assert_eq!(Elections::candidates(), Vec::<u64>::new());
+			assert_eq!(candidate_ids(), Vec::<u64>::new());
 			assert_eq!(balances(&2), (20, 0));
 
 			assert_ok!(submit_candidacy(Origin::signed(5)));
@@ -1623,7 +1675,7 @@ mod tests {
 	#[test]
 	fn can_vote_with_custom_stake() {
 		ExtBuilder::default().build_and_execute(|| {
-			assert_eq!(Elections::candidates(), Vec::<u64>::new());
+			assert_eq!(candidate_ids(), Vec::<u64>::new());
 			assert_eq!(balances(&2), (20, 0));
 
 			assert_ok!(submit_candidacy(Origin::signed(5)));
@@ -1655,6 +1707,74 @@ mod tests {
 		});
 	}
 
+	#[test]
+	fn updated_voting_bond_works() {
+		ExtBuilder::default().build_and_execute(|| {
+			assert_ok!(submit_candidacy(Origin::signed(5)));
+
+			assert_eq!(balances(&2), (20, 0));
+			assert_ok!(vote(Origin::signed(2), vec![5], 5));
+			assert_eq!(balances(&2), (18, 2));
+			assert_eq!(voter_deposit(&2), 2);
+
+			// a runtime upgrade lowers the voting bond to 1. This guy still un-reserves 2 when
+			// leaving.
+			VOTING_BOND_BASE.with(|v| *v.borrow_mut() = 1);
+
+			// proof that bond changed.
+			assert_eq!(balances(&1), (10, 0));
+			assert_ok!(vote(Origin::signed(1), vec![5], 5));
+			assert_eq!(balances(&1), (9, 1));
+			assert_eq!(voter_deposit(&1), 1);
+
+			assert_ok!(Elections::remove_voter(Origin::signed(2)));
+			assert_eq!(balances(&2), (20, 0));
+		})
+	}
+
+	#[test]
+	fn voting_reserves_bond_per_vote() {
+		ExtBuilder::default().voter_bond_factor(1).build_and_execute(|| {
+			assert_eq!(balances(&2), (20, 0));
+
+			assert_ok!(submit_candidacy(Origin::signed(5)));
+			assert_ok!(submit_candidacy(Origin::signed(4)));
+
+			// initial vote.
+			assert_ok!(vote(Origin::signed(2), vec![5], 10));
+
+			// 2 + 1
+			assert_eq!(balances(&2), (17, 3));
+			assert_eq!(Elections::voting(&2).deposit, 3);
+			assert_eq!(has_lock(&2), 10);
+			assert_eq!(locked_stake_of(&2), 10);
+
+			// can update; different stake; different lock and reserve.
+			assert_ok!(vote(Origin::signed(2), vec![5, 4], 15));
+			// 2 + 2
+			assert_eq!(balances(&2), (16, 4));
+			assert_eq!(Elections::voting(&2).deposit, 4);
+			assert_eq!(has_lock(&2), 15);
+			assert_eq!(locked_stake_of(&2), 15);
+
+			// stay at two votes with different stake.
+			assert_ok!(vote(Origin::signed(2), vec![5, 3], 18));
+			// 2 + 2
+			assert_eq!(balances(&2), (16, 4));
+			assert_eq!(Elections::voting(&2).deposit, 4);
+			assert_eq!(has_lock(&2), 18);
+			assert_eq!(locked_stake_of(&2), 18);
+
+			// back to 1 vote.
+			assert_ok!(vote(Origin::signed(2), vec![4], 12));
+			// 2 + 1
+			assert_eq!(balances(&2), (17, 3));
+			assert_eq!(Elections::voting(&2).deposit, 3);
+			assert_eq!(has_lock(&2), 12);
+			assert_eq!(locked_stake_of(&2), 12);
+		});
+	}
+
 	#[test]
 	fn cannot_vote_for_no_candidate() {
 		ExtBuilder::default().build_and_execute(|| {
@@ -1674,10 +1794,10 @@ mod tests {
 			assert_ok!(vote(Origin::signed(2), vec![4, 5], 20));
 
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
-			assert_eq!(Elections::members_ids(), vec![4, 5]);
-			assert!(Elections::candidates().is_empty());
+			assert_eq!(members_ids(), vec![4, 5]);
+			assert!(candidate_ids().is_empty());
 
 			assert_ok!(vote(Origin::signed(3), vec![4, 5], 10));
 		});
@@ -1697,10 +1817,10 @@ mod tests {
 			assert_ok!(vote(Origin::signed(5), vec![5], 50));
 
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
-			assert_eq!(Elections::members_ids(), vec![4, 5]);
-			assert!(Elections::candidates().is_empty());
+			assert_eq!(members_ids(), vec![4, 5]);
+			assert!(candidate_ids().is_empty());
 
 			assert_ok!(vote(Origin::signed(3), vec![4, 5], 10));
 			assert_eq!(PRIME.with(|p| *p.borrow()), Some(4));
@@ -1708,28 +1828,73 @@ mod tests {
 	}
 
 	#[test]
-	fn prime_votes_for_exiting_members_are_removed() {
+	fn prime_votes_for_exiting_members_are_removed() {
+		ExtBuilder::default().build_and_execute(|| {
+			assert_ok!(submit_candidacy(Origin::signed(3)));
+			assert_ok!(submit_candidacy(Origin::signed(4)));
+			assert_ok!(submit_candidacy(Origin::signed(5)));
+
+			assert_ok!(vote(Origin::signed(1), vec![4, 3], 10));
+			assert_ok!(vote(Origin::signed(2), vec![4], 20));
+			assert_ok!(vote(Origin::signed(3), vec![3], 30));
+			assert_ok!(vote(Origin::signed(4), vec![4], 40));
+			assert_ok!(vote(Origin::signed(5), vec![5], 50));
+
+			assert_ok!(Elections::renounce_candidacy(Origin::signed(4), Renouncing::Candidate(3)));
+
+			System::set_block_number(5);
+			Elections::on_initialize(System::block_number());
+
+			assert_eq!(members_ids(), vec![3, 5]);
+			assert!(candidate_ids().is_empty());
+
+			assert_eq!(PRIME.with(|p| *p.borrow()), Some(5));
+		});
+	}
+
+	#[test]
+	fn prime_is_kept_if_other_members_leave() {
+		ExtBuilder::default().build_and_execute(|| {
+			assert_ok!(submit_candidacy(Origin::signed(4)));
+			assert_ok!(submit_candidacy(Origin::signed(5)));
+
+			assert_ok!(vote(Origin::signed(4), vec![4], 40));
+			assert_ok!(vote(Origin::signed(5), vec![5], 50));
+
+			System::set_block_number(5);
+			Elections::on_initialize(System::block_number());
+
+			assert_eq!(members_ids(), vec![4, 5]);
+			assert_eq!(PRIME.with(|p| *p.borrow()), Some(5));
+			assert_ok!(Elections::renounce_candidacy(
+				Origin::signed(4),
+				Renouncing::Member
+			));
+
+			assert_eq!(members_ids(), vec![5]);
+			assert_eq!(PRIME.with(|p| *p.borrow()), Some(5));
+		})
+	}
+
+	#[test]
+	fn prime_is_gone_if_renouncing() {
 		ExtBuilder::default().build_and_execute(|| {
-			assert_ok!(submit_candidacy(Origin::signed(3)));
 			assert_ok!(submit_candidacy(Origin::signed(4)));
 			assert_ok!(submit_candidacy(Origin::signed(5)));
 
-			assert_ok!(vote(Origin::signed(1), vec![4, 3], 10));
-			assert_ok!(vote(Origin::signed(2), vec![4], 20));
-			assert_ok!(vote(Origin::signed(3), vec![3], 30));
 			assert_ok!(vote(Origin::signed(4), vec![4], 40));
 			assert_ok!(vote(Origin::signed(5), vec![5], 50));
 
-			assert_ok!(Elections::renounce_candidacy(Origin::signed(4), Renouncing::Candidate(3)));
-
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
-
-			assert_eq!(Elections::members_ids(), vec![3, 5]);
-			assert!(Elections::candidates().is_empty());
+			Elections::on_initialize(System::block_number());
 
+			assert_eq!(members_ids(), vec![4, 5]);
 			assert_eq!(PRIME.with(|p| *p.borrow()), Some(5));
-		});
+			assert_ok!(Elections::renounce_candidacy(Origin::signed(5), Renouncing::Member));
+
+			assert_eq!(members_ids(), vec![4]);
+			assert_eq!(PRIME.with(|p| *p.borrow()), None);
+		})
 	}
 
 	#[test]
@@ -1755,7 +1920,7 @@ mod tests {
 			assert_ok!(vote(Origin::signed(5), vec![5], 50));
 
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
 			// now we have 2 members, 1 runner-up, and 1 new candidate
 			assert_ok!(submit_candidacy(Origin::signed(2)));
@@ -1853,172 +2018,9 @@ mod tests {
 			assert_ok!(Elections::remove_voter(Origin::signed(4)));
 
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
-
-			assert_eq!(Elections::members_ids(), vec![3, 5]);
-		});
-	}
-
-	#[test]
-	fn reporter_must_be_voter() {
-		ExtBuilder::default().build_and_execute(|| {
-			assert_noop!(
-				Elections::report_defunct_voter(Origin::signed(1), defunct_for(2)),
-				Error::<Test>::MustBeVoter,
-			);
-		});
-	}
-
-	#[test]
-	fn reporter_must_provide_lengths() {
-		ExtBuilder::default().build_and_execute(|| {
-			assert_ok!(submit_candidacy(Origin::signed(5)));
-			assert_ok!(submit_candidacy(Origin::signed(4)));
-			assert_ok!(submit_candidacy(Origin::signed(3)));
-
-			// both are defunct.
-			assert_ok!(vote(Origin::signed(5), vec![99, 999, 9999], 50));
-			assert_ok!(vote(Origin::signed(4), vec![999], 40));
-
-			// 3 candidates! incorrect candidate length.
-			assert_noop!(
-				Elections::report_defunct_voter(Origin::signed(4), DefunctVoter {
-					who: 5,
-					candidate_count: 2,
-					vote_count: 3,
-				}),
-				Error::<Test>::InvalidCandidateCount,
-			);
-
-			// 3 votes! incorrect vote length
-			assert_noop!(
-				Elections::report_defunct_voter(Origin::signed(4), DefunctVoter {
-					who: 5,
-					candidate_count: 3,
-					vote_count: 2,
-				}),
-				Error::<Test>::InvalidVoteCount,
-			);
-
-			// correct.
-			assert_ok!(Elections::report_defunct_voter(Origin::signed(4), DefunctVoter {
-				who: 5,
-				candidate_count: 3,
-				vote_count: 3,
-			}));
-		});
-	}
-
-	#[test]
-	fn reporter_can_overestimate_length() {
-		ExtBuilder::default().build_and_execute(|| {
-			assert_ok!(submit_candidacy(Origin::signed(5)));
-			assert_ok!(submit_candidacy(Origin::signed(4)));
-
-			// both are defunct.
-			assert_ok!(vote(Origin::signed(5), vec![99], 50));
-			assert_ok!(vote(Origin::signed(4), vec![999], 40));
-
-			// 2 candidates! overestimation is okay.
-			assert_ok!(Elections::report_defunct_voter(Origin::signed(4), defunct_for(5)));
-		});
-	}
-
-	#[test]
-	fn can_detect_defunct_voter() {
-		ExtBuilder::default().desired_runners_up(2).build_and_execute(|| {
-			assert_ok!(submit_candidacy(Origin::signed(4)));
-			assert_ok!(submit_candidacy(Origin::signed(5)));
-			assert_ok!(submit_candidacy(Origin::signed(6)));
-
-			assert_ok!(vote(Origin::signed(5), vec![5], 50));
-			assert_ok!(vote(Origin::signed(4), vec![4], 40));
-			assert_ok!(vote(Origin::signed(2), vec![4, 5], 20));
-			assert_ok!(vote(Origin::signed(6), vec![6], 30));
-			// will be soon a defunct voter.
-			assert_ok!(vote(Origin::signed(3), vec![3], 30));
-
-			System::set_block_number(5);
-			Elections::end_block(System::block_number());
-
-			assert_eq!(Elections::members_ids(), vec![4, 5]);
-			assert_eq!(Elections::runners_up_ids(), vec![6]);
-			assert!(Elections::candidates().is_empty());
-
-			// all of them have a member or runner-up that they voted for.
-			assert_eq!(Elections::is_defunct_voter(&votes_of(&5)), false);
-			assert_eq!(Elections::is_defunct_voter(&votes_of(&4)), false);
-			assert_eq!(Elections::is_defunct_voter(&votes_of(&2)), false);
-			assert_eq!(Elections::is_defunct_voter(&votes_of(&6)), false);
-
-			// defunct
-			assert_eq!(Elections::is_defunct_voter(&votes_of(&3)), true);
-
-			assert_ok!(submit_candidacy(Origin::signed(1)));
-			assert_ok!(vote(Origin::signed(1), vec![1], 10));
-
-			// has a candidate voted for.
-			assert_eq!(Elections::is_defunct_voter(&votes_of(&1)), false);
-
-		});
-	}
-
-	#[test]
-	fn report_voter_should_work_and_earn_reward() {
-		ExtBuilder::default().build_and_execute(|| {
-			assert_ok!(submit_candidacy(Origin::signed(5)));
-			assert_ok!(submit_candidacy(Origin::signed(4)));
-
-			assert_ok!(vote(Origin::signed(5), vec![5], 50));
-			assert_ok!(vote(Origin::signed(4), vec![4], 40));
-			assert_ok!(vote(Origin::signed(2), vec![4, 5], 20));
-			// will be soon a defunct voter.
-			assert_ok!(vote(Origin::signed(3), vec![3], 30));
-
-			System::set_block_number(5);
-			Elections::end_block(System::block_number());
-
-			assert_eq!(Elections::members_ids(), vec![4, 5]);
-			assert!(Elections::candidates().is_empty());
-
-			assert_eq!(balances(&3), (28, 2));
-			assert_eq!(balances(&5), (45, 5));
-
-			assert_ok!(Elections::report_defunct_voter(Origin::signed(5), defunct_for(3)));
-			assert!(System::events().iter().any(|event| {
-				event.event == Event::elections_phragmen(RawEvent::VoterReported(3, 5, true))
-			}));
-
-			assert_eq!(balances(&3), (28, 0));
-			assert_eq!(balances(&5), (47, 5));
-		});
-	}
-
-	#[test]
-	fn report_voter_should_slash_when_bad_report() {
-		ExtBuilder::default().build_and_execute(|| {
-			assert_ok!(submit_candidacy(Origin::signed(5)));
-			assert_ok!(submit_candidacy(Origin::signed(4)));
-
-			assert_ok!(vote(Origin::signed(5), vec![5], 50));
-			assert_ok!(vote(Origin::signed(4), vec![4], 40));
-
-			System::set_block_number(5);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
-			assert_eq!(Elections::members_ids(), vec![4, 5]);
-			assert!(Elections::candidates().is_empty());
-
-			assert_eq!(balances(&4), (35, 5));
-			assert_eq!(balances(&5), (45, 5));
-
-			assert_ok!(Elections::report_defunct_voter(Origin::signed(5), defunct_for(4)));
-			assert!(System::events().iter().any(|event| {
-				event.event == Event::elections_phragmen(RawEvent::VoterReported(4, 5, false))
-			}));
-
-			assert_eq!(balances(&4), (35, 5));
-			assert_eq!(balances(&5), (45, 3));
+			assert_eq!(members_ids(), vec![3, 5]);
 		});
 	}
 
@@ -2039,18 +2041,19 @@ mod tests {
 			assert_eq!(votes_of(&3), vec![3]);
 			assert_eq!(votes_of(&4), vec![4]);
 
-			assert_eq!(Elections::candidates(), vec![3, 4, 5]);
+			assert_eq!(candidate_ids(), vec![3, 4, 5]);
 			assert_eq!(<Candidates<Test>>::decode_len().unwrap(), 3);
 
 			assert_eq!(Elections::election_rounds(), 0);
 
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
-			assert_eq!(Elections::members(), vec![(3, 30), (5, 20)]);
+			assert_eq!(members_and_stake(), vec![(3, 30), (5, 20)]);
 			assert!(Elections::runners_up().is_empty());
+
 			assert_eq_uvec!(all_voters(), vec![2, 3, 4]);
-			assert!(Elections::candidates().is_empty());
+			assert!(candidate_ids().is_empty());
 			assert_eq!(<Candidates<Test>>::decode_len(), None);
 
 			assert_eq!(Elections::election_rounds(), 1);
@@ -2062,7 +2065,7 @@ mod tests {
 		ExtBuilder::default().build_and_execute(|| {
 			// no candidates, no nothing.
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
 			assert_eq!(
 				System::events().iter().last().unwrap().event,
@@ -2081,21 +2084,21 @@ mod tests {
 			assert_ok!(vote(Origin::signed(4), vec![4], 40));
 
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
 			assert_eq!(
 				System::events().iter().last().unwrap().event,
 				Event::elections_phragmen(RawEvent::NewTerm(vec![(4, 40), (5, 50)])),
 			);
 
-			assert_eq!(Elections::members(), vec![(4, 40), (5, 50)]);
-			assert_eq!(Elections::runners_up(), vec![]);
+			assert_eq!(members_and_stake(), vec![(4, 40), (5, 50)]);
+			assert_eq!(runners_up_and_stake(), vec![]);
 
 			assert_ok!(Elections::remove_voter(Origin::signed(5)));
 			assert_ok!(Elections::remove_voter(Origin::signed(4)));
 
 			System::set_block_number(10);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
 			assert_eq!(
 				System::events().iter().last().unwrap().event,
@@ -2118,19 +2121,19 @@ mod tests {
 			assert_ok!(vote(Origin::signed(5), vec![5], 50));
 
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
-			assert_eq!(Elections::members(), vec![(5, 50)]);
+			assert_eq!(members_and_stake(), vec![(5, 50)]);
 			assert_eq!(Elections::election_rounds(), 1);
 
 			// but now it has a valid target.
 			assert_ok!(submit_candidacy(Origin::signed(4)));
 
 			System::set_block_number(10);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
 			// candidate 4 is affected by an old vote.
-			assert_eq!(Elections::members(), vec![(4, 30), (5, 50)]);
+			assert_eq!(members_and_stake(), vec![(4, 30), (5, 50)]);
 			assert_eq!(Elections::election_rounds(), 2);
 			assert_eq_uvec!(all_voters(), vec![3, 5]);
 		});
@@ -2150,10 +2153,10 @@ mod tests {
 			assert_ok!(vote(Origin::signed(5), vec![5], 50));
 
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
 			assert_eq!(Elections::election_rounds(), 1);
-			assert_eq!(Elections::members_ids(), vec![4, 5]);
+			assert_eq!(members_ids(), vec![4, 5]);
 		});
 	}
 
@@ -2164,11 +2167,11 @@ mod tests {
 			assert_ok!(submit_candidacy(Origin::signed(4)));
 
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
-			assert!(Elections::candidates().is_empty());
+			assert!(candidate_ids().is_empty());
 			assert_eq!(Elections::election_rounds(), 1);
-			assert!(Elections::members_ids().is_empty());
+			assert!(members_ids().is_empty());
 
 			assert_eq!(
 				System::events().iter().last().unwrap().event,
@@ -2191,11 +2194,11 @@ mod tests {
 			assert_ok!(vote(Origin::signed(5), vec![4], 50));
 
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 			// sorted based on account id.
-			assert_eq!(Elections::members_ids(), vec![4, 5]);
+			assert_eq!(members_ids(), vec![4, 5]);
 			// sorted based on merit (least -> most)
-			assert_eq!(Elections::runners_up_ids(), vec![3, 2]);
+			assert_eq!(runners_up_ids(), vec![3, 2]);
 
 			// runner ups are still locked.
 			assert_eq!(balances(&4), (35, 5));
@@ -2218,16 +2221,17 @@ mod tests {
 			assert_ok!(vote(Origin::signed(5), vec![5], 50));
 
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
-			assert_eq!(Elections::members(), vec![(4, 40), (5, 50)]);
-			assert_eq!(Elections::runners_up(), vec![(2, 20), (3, 30)]);
+			Elections::on_initialize(System::block_number());
+			assert_eq!(members_and_stake(), vec![(4, 40), (5, 50)]);
+			assert_eq!(runners_up_and_stake(), vec![(2, 20), (3, 30)]);
 
 			assert_ok!(vote(Origin::signed(5), vec![5], 15));
 
 			System::set_block_number(10);
-			Elections::end_block(System::block_number());
-			assert_eq!(Elections::members(), vec![(3, 30), (4, 40)]);
-			assert_eq!(Elections::runners_up(), vec![(5, 15), (2, 20)]);
+			Elections::on_initialize(System::block_number());
+
+			assert_eq!(members_and_stake(), vec![(3, 30), (4, 40)]);
+			assert_eq!(runners_up_and_stake(), vec![(5, 15), (2, 20)]);
 		});
 	}
 
@@ -2243,18 +2247,18 @@ mod tests {
 			assert_ok!(vote(Origin::signed(5), vec![5], 50));
 
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
-			assert_eq!(Elections::members_ids(), vec![4, 5]);
-			assert_eq!(Elections::runners_up_ids(), vec![2]);
+			Elections::on_initialize(System::block_number());
+			assert_eq!(members_ids(), vec![4, 5]);
+			assert_eq!(runners_up_ids(), vec![2]);
 			assert_eq!(balances(&2), (15, 5));
 
 			assert_ok!(submit_candidacy(Origin::signed(3)));
 			assert_ok!(vote(Origin::signed(3), vec![3], 30));
 
 			System::set_block_number(10);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
-			assert_eq!(Elections::runners_up_ids(), vec![3]);
+			assert_eq!(runners_up_ids(), vec![3]);
 			assert_eq!(balances(&2), (15, 2));
 		});
 	}
@@ -2271,22 +2275,22 @@ mod tests {
 			assert_eq!(balances(&5), (45, 5));
 
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
-			assert_eq!(Elections::members_ids(), vec![5]);
+			Elections::on_initialize(System::block_number());
+			assert_eq!(members_ids(), vec![5]);
 
 			assert_ok!(Elections::remove_voter(Origin::signed(5)));
 			assert_eq!(balances(&5), (47, 3));
 
 			System::set_block_number(10);
-			Elections::end_block(System::block_number());
-			assert!(Elections::members_ids().is_empty());
+			Elections::on_initialize(System::block_number());
+			assert!(members_ids().is_empty());
 
 			assert_eq!(balances(&5), (47, 0));
 		});
 	}
 
 	#[test]
-	fn losers_will_lose_the_bond() {
+	fn candidates_lose_the_bond_when_outgoing() {
 		ExtBuilder::default().build_and_execute(|| {
 			assert_ok!(submit_candidacy(Origin::signed(5)));
 			assert_ok!(submit_candidacy(Origin::signed(3)));
@@ -2297,9 +2301,9 @@ mod tests {
 			assert_eq!(balances(&3), (27, 3));
 
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
-			assert_eq!(Elections::members_ids(), vec![5]);
+			assert_eq!(members_ids(), vec![5]);
 
 			// winner
 			assert_eq!(balances(&5), (47, 3));
@@ -2318,9 +2322,9 @@ mod tests {
 			assert_ok!(vote(Origin::signed(5), vec![5], 50));
 
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
-			assert_eq!(Elections::members_ids(), vec![4, 5]);
+			assert_eq!(members_ids(), vec![4, 5]);
 			assert_eq!(Elections::election_rounds(), 1);
 
 			assert_ok!(submit_candidacy(Origin::signed(2)));
@@ -2332,13 +2336,13 @@ mod tests {
 			assert_ok!(Elections::remove_voter(Origin::signed(4)));
 
 			// 5 will persist as candidates despite not being in the list.
-			assert_eq!(Elections::candidates(), vec![2, 3]);
+			assert_eq!(candidate_ids(), vec![2, 3]);
 
 			System::set_block_number(10);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
 			// 4 removed; 5 and 3 are the new best.
-			assert_eq!(Elections::members_ids(), vec![3, 5]);
+			assert_eq!(members_ids(), vec![3, 5]);
 		});
 	}
 
@@ -2359,12 +2363,12 @@ mod tests {
 
 			let check_at_block = |b: u32| {
 				System::set_block_number(b.into());
-				Elections::end_block(System::block_number());
+				Elections::on_initialize(System::block_number());
 				// we keep re-electing the same folks.
-				assert_eq!(Elections::members(), vec![(4, 40), (5, 50)]);
-				assert_eq!(Elections::runners_up(), vec![(2, 20), (3, 30)]);
+				assert_eq!(members_and_stake(), vec![(4, 40), (5, 50)]);
+				assert_eq!(runners_up_and_stake(), vec![(2, 20), (3, 30)]);
 				// no new candidates but old members and runners-up are always added.
-				assert!(Elections::candidates().is_empty());
+				assert!(candidate_ids().is_empty());
 				assert_eq!(Elections::election_rounds(), b / 5);
 				assert_eq_uvec!(all_voters(), vec![2, 3, 4, 5]);
 			};
@@ -2387,8 +2391,8 @@ mod tests {
 			assert_ok!(vote(Origin::signed(5), vec![5], 50));
 
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
-			assert_eq!(Elections::members_ids(), vec![4, 5]);
+			Elections::on_initialize(System::block_number());
+			assert_eq!(members_ids(), vec![4, 5]);
 			assert_eq!(Elections::election_rounds(), 1);
 
 			// a new candidate
@@ -2399,7 +2403,7 @@ mod tests {
 
 			assert_eq!(balances(&4), (35, 2)); // slashed
 			assert_eq!(Elections::election_rounds(), 2); // new election round
-			assert_eq!(Elections::members_ids(), vec![3, 5]); // new members
+			assert_eq!(members_ids(), vec![3, 5]); // new members
 		});
 	}
 
@@ -2413,14 +2417,21 @@ mod tests {
 			assert_ok!(vote(Origin::signed(5), vec![5], 50));
 
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
-			assert_eq!(Elections::members_ids(), vec![4, 5]);
+			Elections::on_initialize(System::block_number());
+			assert_eq!(members_ids(), vec![4, 5]);
 
 			// no replacement yet.
-			assert_err_with_weight!(
-				Elections::remove_member(Origin::root(), 4, true),
-				Error::<Test>::InvalidReplacement,
-				Some(33489000), // only thing that matters for now is that it is NOT the full block.
+			let unwrapped_error = Elections::remove_member(Origin::root(), 4, true).unwrap_err();
+			matches!(
+				unwrapped_error.error,
+				DispatchError::Module {
+					message: Some("InvalidReplacement"),
+					..
+				}
+			);
+			matches!(
+				unwrapped_error.post_info.actual_weight,
+				Some(x) if x < <Test as frame_system::Config>::BlockWeights::get().max_block
 			);
 		});
 
@@ -2434,15 +2445,22 @@ mod tests {
 			assert_ok!(vote(Origin::signed(5), vec![5], 50));
 
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
-			assert_eq!(Elections::members_ids(), vec![4, 5]);
-			assert_eq!(Elections::runners_up_ids(), vec![3]);
+			Elections::on_initialize(System::block_number());
+			assert_eq!(members_ids(), vec![4, 5]);
+			assert_eq!(runners_up_ids(), vec![3]);
 
 			// there is a replacement! and this one needs a weight refund.
-			assert_err_with_weight!(
-				Elections::remove_member(Origin::root(), 4, false),
-				Error::<Test>::InvalidReplacement,
-				Some(33489000) // only thing that matters for now is that it is NOT the full block.
+			let unwrapped_error = Elections::remove_member(Origin::root(), 4, false).unwrap_err();
+			matches!(
+				unwrapped_error.error,
+				DispatchError::Module {
+					message: Some("InvalidReplacement"),
+					..
+				}
+			);
+			matches!(
+				unwrapped_error.post_info.actual_weight,
+				Some(x) if x < <Test as frame_system::Config>::BlockWeights::get().max_block
 			);
 		});
 	}
@@ -2464,8 +2482,8 @@ mod tests {
 			assert_eq!(Elections::election_rounds(), 0);
 
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
-			assert_eq!(Elections::members_ids(), vec![3, 5]);
+			Elections::on_initialize(System::block_number());
+			assert_eq!(members_ids(), vec![3, 5]);
 			assert_eq!(Elections::election_rounds(), 1);
 
 			assert_ok!(Elections::remove_voter(Origin::signed(2)));
@@ -2475,8 +2493,8 @@ mod tests {
 
 			// meanwhile, no one cares to become a candidate again.
 			System::set_block_number(10);
-			Elections::end_block(System::block_number());
-			assert!(Elections::members_ids().is_empty());
+			Elections::on_initialize(System::block_number());
+			assert!(members_ids().is_empty());
 			assert_eq!(Elections::election_rounds(), 2);
 		});
 	}
@@ -2491,8 +2509,8 @@ mod tests {
 			assert_ok!(vote(Origin::signed(5), vec![5], 50));
 
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
-			assert_eq!(Elections::members_ids(), vec![4, 5]);
+			Elections::on_initialize(System::block_number());
+			assert_eq!(members_ids(), vec![4, 5]);
 
 			assert_ok!(submit_candidacy(Origin::signed(1)));
 			assert_ok!(submit_candidacy(Origin::signed(2)));
@@ -2509,10 +2527,10 @@ mod tests {
 			assert_ok!(vote(Origin::signed(1), vec![1], 10));
 
 			System::set_block_number(10);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
 			// 3, 4 are new members, must still be bonded, nothing slashed.
-			assert_eq!(Elections::members(), vec![(3, 30), (4, 48)]);
+			assert_eq!(members_and_stake(), vec![(3, 30), (4, 48)]);
 			assert_eq!(balances(&3), (25, 5));
 			assert_eq!(balances(&4), (35, 5));
 
@@ -2539,9 +2557,9 @@ mod tests {
 			assert_ok!(vote(Origin::signed(5), vec![10], 50));
 
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
-			assert_eq_uvec!(Elections::members_ids(), vec![3, 4]);
+			assert_eq_uvec!(members_ids(), vec![3, 4]);
 			assert_eq!(Elections::election_rounds(), 1);
 		});
 	}
@@ -2560,48 +2578,34 @@ mod tests {
 			assert_ok!(vote(Origin::signed(5), vec![4], 50));
 
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 			// id: low -> high.
-			assert_eq!(Elections::members(), vec![(4, 50), (5, 40)]);
+			assert_eq!(members_and_stake(), vec![(4, 50), (5, 40)]);
 			// merit: low -> high.
-			assert_eq!(Elections::runners_up(), vec![(3, 20), (2, 30)]);
+			assert_eq!(runners_up_and_stake(), vec![(3, 20), (2, 30)]);
 		});
 	}
 
-	#[test]
-	fn candidates_are_sorted() {
-		ExtBuilder::default().build_and_execute(|| {
-			assert_ok!(submit_candidacy(Origin::signed(5)));
-			assert_ok!(submit_candidacy(Origin::signed(3)));
-
-			assert_eq!(Elections::candidates(), vec![3, 5]);
-
-			assert_ok!(submit_candidacy(Origin::signed(2)));
-			assert_ok!(submit_candidacy(Origin::signed(4)));
-			assert_ok!(Elections::renounce_candidacy(Origin::signed(3), Renouncing::Candidate(4)));
-
-			assert_eq!(Elections::candidates(), vec![2, 4, 5]);
-		})
-	}
-
 	#[test]
 	fn runner_up_replacement_maintains_members_order() {
-		ExtBuilder::default().desired_runners_up(2).build_and_execute(|| {
-			assert_ok!(submit_candidacy(Origin::signed(5)));
-			assert_ok!(submit_candidacy(Origin::signed(4)));
+		ExtBuilder::default()
+			.desired_runners_up(2)
+			.build_and_execute(|| {
+				assert_ok!(submit_candidacy(Origin::signed(5)));
+				assert_ok!(submit_candidacy(Origin::signed(4)));
 			assert_ok!(submit_candidacy(Origin::signed(2)));
 
 			assert_ok!(vote(Origin::signed(2), vec![5], 20));
 			assert_ok!(vote(Origin::signed(4), vec![4], 40));
 			assert_ok!(vote(Origin::signed(5), vec![2], 50));
 
-			System::set_block_number(5);
-			Elections::end_block(System::block_number());
+				System::set_block_number(5);
+				Elections::on_initialize(System::block_number());
 
-			assert_eq!(Elections::members_ids(), vec![2, 4]);
-			assert_ok!(Elections::remove_member(Origin::root(), 2, true));
-			assert_eq!(Elections::members_ids(), vec![4, 5]);
-		});
+				assert_eq!(members_ids(), vec![2, 4]);
+				assert_ok!(Elections::remove_member(Origin::root(), 2, true));
+				assert_eq!(members_ids(), vec![4, 5]);
+			});
 	}
 
 	#[test]
@@ -2618,16 +2622,16 @@ mod tests {
 			assert_ok!(vote(Origin::signed(2), vec![2], 20));
 
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
-			assert_eq!(Elections::members_ids(), vec![4, 5]);
-			assert_eq!(Elections::runners_up_ids(), vec![2, 3]);
+			assert_eq!(members_ids(), vec![4, 5]);
+			assert_eq!(runners_up_ids(), vec![2, 3]);
 
 			assert_ok!(Elections::renounce_candidacy(Origin::signed(4), Renouncing::Member));
 			assert_eq!(balances(&4), (38, 2)); // 2 is voting bond.
 
-			assert_eq!(Elections::members_ids(), vec![3, 5]);
-			assert_eq!(Elections::runners_up_ids(), vec![2]);
+			assert_eq!(members_ids(), vec![3, 5]);
+			assert_eq!(runners_up_ids(), vec![2]);
 		})
 	}
 
@@ -2641,26 +2645,28 @@ mod tests {
 			assert_ok!(vote(Origin::signed(4), vec![4], 40));
 
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
-			assert_eq!(Elections::members_ids(), vec![4, 5]);
-			assert!(Elections::runners_up_ids().is_empty());
+			assert_eq!(members_ids(), vec![4, 5]);
+			assert!(runners_up_ids().is_empty());
 
 			assert_ok!(Elections::renounce_candidacy(Origin::signed(4), Renouncing::Member));
 			assert_eq!(balances(&4), (38, 2)); // 2 is voting bond.
 
 			// no replacement
-			assert_eq!(Elections::members_ids(), vec![5]);
-			assert!(Elections::runners_up_ids().is_empty());
+			assert_eq!(members_ids(), vec![5]);
+			assert!(runners_up_ids().is_empty());
 		})
 	}
 
 	#[test]
-	fn can_renounce_candidacy_runner() {
-		ExtBuilder::default().desired_runners_up(2).build_and_execute(|| {
-			assert_ok!(submit_candidacy(Origin::signed(5)));
-			assert_ok!(submit_candidacy(Origin::signed(4)));
-			assert_ok!(submit_candidacy(Origin::signed(3)));
+	fn can_renounce_candidacy_runner_up() {
+		ExtBuilder::default()
+			.desired_runners_up(2)
+			.build_and_execute(|| {
+				assert_ok!(submit_candidacy(Origin::signed(5)));
+				assert_ok!(submit_candidacy(Origin::signed(4)));
+				assert_ok!(submit_candidacy(Origin::signed(3)));
 			assert_ok!(submit_candidacy(Origin::signed(2)));
 
 			assert_ok!(vote(Origin::signed(5), vec![4], 50));
@@ -2668,18 +2674,21 @@ mod tests {
 			assert_ok!(vote(Origin::signed(3), vec![3], 30));
 			assert_ok!(vote(Origin::signed(2), vec![2], 20));
 
-			System::set_block_number(5);
-			Elections::end_block(System::block_number());
+				System::set_block_number(5);
+				Elections::on_initialize(System::block_number());
 
-			assert_eq!(Elections::members_ids(), vec![4, 5]);
-			assert_eq!(Elections::runners_up_ids(), vec![2, 3]);
+				assert_eq!(members_ids(), vec![4, 5]);
+				assert_eq!(runners_up_ids(), vec![2, 3]);
 
-			assert_ok!(Elections::renounce_candidacy(Origin::signed(3), Renouncing::RunnerUp));
-			assert_eq!(balances(&3), (28, 2)); // 2 is voting bond.
+				assert_ok!(Elections::renounce_candidacy(
+					Origin::signed(3),
+					Renouncing::RunnerUp
+				));
+				assert_eq!(balances(&3), (28, 2)); // 2 is voting bond.
 
-			assert_eq!(Elections::members_ids(), vec![4, 5]);
-			assert_eq!(Elections::runners_up_ids(), vec![2]);
-		})
+				assert_eq!(members_ids(), vec![4, 5]);
+				assert_eq!(runners_up_ids(), vec![2]);
+			})
 	}
 
 	#[test]
@@ -2696,13 +2705,13 @@ mod tests {
 			assert_ok!(vote(Origin::signed(5), vec![2], 50));
 
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
-			assert_eq!(Elections::members_ids(), vec![2, 4]);
-			assert_eq!(Elections::runners_up_ids(), vec![5, 3]);
+			assert_eq!(members_ids(), vec![2, 4]);
+			assert_eq!(runners_up_ids(), vec![5, 3]);
 			assert_ok!(Elections::renounce_candidacy(Origin::signed(3), Renouncing::RunnerUp));
-			assert_eq!(Elections::members_ids(), vec![2, 4]);
-			assert_eq!(Elections::runners_up_ids(), vec![5]);
+			assert_eq!(members_ids(), vec![2, 4]);
+			assert_eq!(runners_up_ids(), vec![5]);
 		});
 	}
 
@@ -2711,11 +2720,11 @@ mod tests {
 		ExtBuilder::default().build_and_execute(|| {
 			assert_ok!(submit_candidacy(Origin::signed(5)));
 			assert_eq!(balances(&5), (47, 3));
-			assert_eq!(Elections::candidates(), vec![5]);
+			assert_eq!(candidate_ids(), vec![5]);
 
 			assert_ok!(Elections::renounce_candidacy(Origin::signed(5), Renouncing::Candidate(1)));
 			assert_eq!(balances(&5), (50, 0));
-			assert!(Elections::candidates().is_empty());
+			assert!(candidate_ids().is_empty());
 		})
 	}
 
@@ -2728,7 +2737,7 @@ mod tests {
 			);
 			assert_noop!(
 				Elections::renounce_candidacy(Origin::signed(5), Renouncing::Member),
-				Error::<Test>::NotMember,
+				Error::<Test>::InvalidRenouncing,
 			);
 			assert_noop!(
 				Elections::renounce_candidacy(Origin::signed(5), Renouncing::RunnerUp),
@@ -2749,14 +2758,14 @@ mod tests {
 			assert_ok!(vote(Origin::signed(3), vec![3], 30));
 
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
-			assert_eq!(Elections::members_ids(), vec![4, 5]);
-			assert_eq!(Elections::runners_up_ids(), vec![3]);
+			assert_eq!(members_ids(), vec![4, 5]);
+			assert_eq!(runners_up_ids(), vec![3]);
 
 			assert_noop!(
 				Elections::renounce_candidacy(Origin::signed(3), Renouncing::Member),
-				Error::<Test>::NotMember,
+				Error::<Test>::InvalidRenouncing,
 			);
 		})
 	}
@@ -2773,10 +2782,10 @@ mod tests {
 			assert_ok!(vote(Origin::signed(3), vec![3], 30));
 
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
-			assert_eq!(Elections::members_ids(), vec![4, 5]);
-			assert_eq!(Elections::runners_up_ids(), vec![3]);
+			assert_eq!(members_ids(), vec![4, 5]);
+			assert_eq!(runners_up_ids(), vec![3]);
 
 			assert_noop!(
 				Elections::renounce_candidacy(Origin::signed(4), Renouncing::RunnerUp),
@@ -2794,7 +2803,7 @@ mod tests {
 
 			assert_noop!(
 				Elections::renounce_candidacy(Origin::signed(4), Renouncing::Candidate(2)),
-				Error::<Test>::InvalidRenouncing,
+				Error::<Test>::InvalidWitnessData,
 			);
 
 			assert_ok!(Elections::renounce_candidacy(Origin::signed(4), Renouncing::Candidate(3)));
@@ -2812,25 +2821,6 @@ mod tests {
 		})
 	}
 
-	#[test]
-	fn behavior_with_dupe_candidate() {
-		ExtBuilder::default().desired_runners_up(2).build_and_execute(|| {
-			<Candidates<Test>>::put(vec![1, 1, 2, 3, 4]);
-
-			assert_ok!(vote(Origin::signed(5), vec![1], 50));
-			assert_ok!(vote(Origin::signed(4), vec![4], 40));
-			assert_ok!(vote(Origin::signed(3), vec![3], 30));
-			assert_ok!(vote(Origin::signed(2), vec![2], 20));
-
-			System::set_block_number(5);
-			Elections::end_block(System::block_number());
-
-			assert_eq!(Elections::members_ids(), vec![1, 4]);
-			assert_eq!(Elections::runners_up_ids(), vec![2, 3]);
-			assert!(Elections::candidates().is_empty());
-		})
-	}
-
 	#[test]
 	fn unsorted_runners_up_are_detected() {
 		ExtBuilder::default().desired_runners_up(2).desired_members(1).build_and_execute(|| {
@@ -2838,25 +2828,24 @@ mod tests {
 			assert_ok!(submit_candidacy(Origin::signed(4)));
 			assert_ok!(submit_candidacy(Origin::signed(3)));
 
-
 			assert_ok!(vote(Origin::signed(5), vec![5], 50));
 			assert_ok!(vote(Origin::signed(4), vec![4], 5));
 			assert_ok!(vote(Origin::signed(3), vec![3], 15));
 
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
-			assert_eq!(Elections::members_ids(), vec![5]);
-			assert_eq!(Elections::runners_up_ids(), vec![4, 3]);
+			assert_eq!(members_ids(), vec![5]);
+			assert_eq!(runners_up_ids(), vec![4, 3]);
 
 			assert_ok!(submit_candidacy(Origin::signed(2)));
 			assert_ok!(vote(Origin::signed(2), vec![2], 10));
 
 			System::set_block_number(10);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
-			assert_eq!(Elections::members_ids(), vec![5]);
-			assert_eq!(Elections::runners_up_ids(), vec![2, 3]);
+			assert_eq!(members_ids(), vec![5]);
+			assert_eq!(runners_up_ids(), vec![2, 3]);
 
 			// 4 is outgoing runner-up. Slash candidacy bond.
 			assert_eq!(balances(&4), (35, 2));
@@ -2878,10 +2867,10 @@ mod tests {
 			assert_ok!(vote(Origin::signed(2), vec![2], 20));
 
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
-			assert_eq!(Elections::members_ids(), vec![4]);
-			assert_eq!(Elections::runners_up_ids(), vec![2, 3]);
+			assert_eq!(members_ids(), vec![4]);
+			assert_eq!(runners_up_ids(), vec![2, 3]);
 
 			assert_eq!(balances(&4), (35, 5));
 			assert_eq!(balances(&3), (25, 5));
@@ -2892,10 +2881,10 @@ mod tests {
 			assert_ok!(vote(Origin::signed(5), vec![5], 50));
 
 			System::set_block_number(10);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
-			assert_eq!(Elections::members_ids(), vec![5]);
-			assert_eq!(Elections::runners_up_ids(), vec![3, 4]);
+			assert_eq!(members_ids(), vec![5]);
+			assert_eq!(runners_up_ids(), vec![3, 4]);
 
 			// 4 went from member to runner-up -- don't slash.
 			assert_eq!(balances(&4), (35, 5));
@@ -2919,10 +2908,10 @@ mod tests {
 			assert_ok!(vote(Origin::signed(2), vec![2], 20));
 
 			System::set_block_number(5);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
-			assert_eq!(Elections::members_ids(), vec![4]);
-			assert_eq!(Elections::runners_up_ids(), vec![2, 3]);
+			assert_eq!(members_ids(), vec![4]);
+			assert_eq!(runners_up_ids(), vec![2, 3]);
 
 			assert_eq!(balances(&4), (35, 5));
 			assert_eq!(balances(&3), (25, 5));
@@ -2933,10 +2922,10 @@ mod tests {
 			assert_ok!(vote(Origin::signed(2), vec![4], 20));
 
 			System::set_block_number(10);
-			Elections::end_block(System::block_number());
+			Elections::on_initialize(System::block_number());
 
-			assert_eq!(Elections::members_ids(), vec![2]);
-			assert_eq!(Elections::runners_up_ids(), vec![4, 3]);
+			assert_eq!(members_ids(), vec![2]);
+			assert_eq!(runners_up_ids(), vec![4, 3]);
 
 			// 2 went from runner to member, don't slash
 			assert_eq!(balances(&2), (15, 5));
@@ -2946,4 +2935,166 @@ mod tests {
 			assert_eq!(balances(&3), (25, 5));
 		});
 	}
+
+	#[test]
+	fn remove_and_replace_member_works() {
+		let setup = || {
+			assert_ok!(submit_candidacy(Origin::signed(5)));
+			assert_ok!(submit_candidacy(Origin::signed(4)));
+			assert_ok!(submit_candidacy(Origin::signed(3)));
+
+			assert_ok!(vote(Origin::signed(5), vec![5], 50));
+			assert_ok!(vote(Origin::signed(4), vec![4], 40));
+			assert_ok!(vote(Origin::signed(3), vec![3], 30));
+
+			System::set_block_number(5);
+			Elections::on_initialize(System::block_number());
+
+			assert_eq!(members_ids(), vec![4, 5]);
+			assert_eq!(runners_up_ids(), vec![3]);
+		};
+
+		// member removed, replacement found.
+		ExtBuilder::default().desired_runners_up(1).build_and_execute(|| {
+			setup();
+			assert_eq!(Elections::remove_and_replace_member(&4, false), Ok(true));
+
+			assert_eq!(members_ids(), vec![3, 5]);
+			assert_eq!(runners_up_ids().len(), 0);
+		});
+
+		// member removed, no replacement found.
+		ExtBuilder::default().desired_runners_up(1).build_and_execute(|| {
+			setup();
+			assert_ok!(Elections::renounce_candidacy(Origin::signed(3), Renouncing::RunnerUp));
+			assert_eq!(Elections::remove_and_replace_member(&4, false), Ok(false));
+
+			assert_eq!(members_ids(), vec![5]);
+			assert_eq!(runners_up_ids().len(), 0);
+		});
+
+		// wrong member to remove.
+		ExtBuilder::default().desired_runners_up(1).build_and_execute(|| {
+			setup();
+			assert!(matches!(Elections::remove_and_replace_member(&2, false), Err(_)));
+		});
+	}
+
+	#[test]
+	fn no_desired_members() {
+		// not interested in anything
+		ExtBuilder::default().desired_members(0).desired_runners_up(0).build_and_execute(|| {
+			assert_eq!(Elections::candidates().len(), 0);
+
+			assert_ok!(submit_candidacy(Origin::signed(4)));
+			assert_ok!(submit_candidacy(Origin::signed(3)));
+			assert_ok!(submit_candidacy(Origin::signed(2)));
+
+			assert_eq!(Elections::candidates().len(), 3);
+
+				assert_ok!(vote(Origin::signed(4), vec![4], 40));
+				assert_ok!(vote(Origin::signed(3), vec![3], 30));
+				assert_ok!(vote(Origin::signed(2), vec![2], 20));
+
+				System::set_block_number(5);
+				Elections::on_initialize(System::block_number());
+
+				assert_eq!(members_ids().len(), 0);
+			assert_eq!(runners_up_ids().len(), 0);
+			assert_eq!(all_voters().len(), 3);
+			assert_eq!(Elections::candidates().len(), 0);
+		});
+
+		// not interested in members
+		ExtBuilder::default().desired_members(0).desired_runners_up(2).build_and_execute(|| {
+			assert_eq!(Elections::candidates().len(), 0);
+
+			assert_ok!(submit_candidacy(Origin::signed(4)));
+			assert_ok!(submit_candidacy(Origin::signed(3)));
+			assert_ok!(submit_candidacy(Origin::signed(2)));
+
+			assert_eq!(Elections::candidates().len(), 3);
+
+			assert_ok!(vote(Origin::signed(4), vec![4], 40));
+			assert_ok!(vote(Origin::signed(3), vec![3], 30));
+			assert_ok!(vote(Origin::signed(2), vec![2], 20));
+
+			System::set_block_number(5);
+			Elections::on_initialize(System::block_number());
+
+			assert_eq!(members_ids().len(), 0);
+			assert_eq!(runners_up_ids(), vec![3, 4]);
+			assert_eq!(all_voters().len(), 3);
+			assert_eq!(Elections::candidates().len(), 0);
+		});
+
+		// not interested in runners-up
+		ExtBuilder::default().desired_members(2).desired_runners_up(0).build_and_execute(|| {
+			assert_eq!(Elections::candidates().len(), 0);
+
+			assert_ok!(submit_candidacy(Origin::signed(4)));
+			assert_ok!(submit_candidacy(Origin::signed(3)));
+			assert_ok!(submit_candidacy(Origin::signed(2)));
+
+			assert_eq!(Elections::candidates().len(), 3);
+
+			assert_ok!(vote(Origin::signed(4), vec![4], 40));
+			assert_ok!(vote(Origin::signed(3), vec![3], 30));
+			assert_ok!(vote(Origin::signed(2), vec![2], 20));
+
+			System::set_block_number(5);
+			Elections::on_initialize(System::block_number());
+
+			assert_eq!(members_ids(), vec![3, 4]);
+			assert_eq!(runners_up_ids().len(), 0);
+			assert_eq!(all_voters().len(), 3);
+			assert_eq!(Elections::candidates().len(), 0);
+		});
+	}
+
+	#[test]
+	fn dupe_vote_is_moot() {
+		ExtBuilder::default().desired_members(1).build_and_execute(|| {
+			assert_ok!(submit_candidacy(Origin::signed(5)));
+			assert_ok!(submit_candidacy(Origin::signed(4)));
+			assert_ok!(submit_candidacy(Origin::signed(3)));
+			assert_ok!(submit_candidacy(Origin::signed(2)));
+			assert_ok!(submit_candidacy(Origin::signed(1)));
+
+			// all these duplicate votes will not cause 2 to win.
+			assert_ok!(vote(Origin::signed(1), vec![2, 2, 2, 2], 5));
+			assert_ok!(vote(Origin::signed(2), vec![2, 2, 2, 2], 20));
+
+			assert_ok!(vote(Origin::signed(3), vec![3], 30));
+
+			System::set_block_number(5);
+			Elections::on_initialize(System::block_number());
+
+			assert_eq!(members_ids(), vec![3]);
+		})
+	}
+
+	#[test]
+	fn remove_defunct_voter_works() {
+		ExtBuilder::default().build_and_execute(|| {
+			assert_ok!(submit_candidacy(Origin::signed(5)));
+			assert_ok!(submit_candidacy(Origin::signed(4)));
+			assert_ok!(submit_candidacy(Origin::signed(3)));
+
+			// defunct
+			assert_ok!(vote(Origin::signed(5), vec![5, 4], 5));
+			// defunct
+			assert_ok!(vote(Origin::signed(4), vec![4], 5));
+			// ok
+			assert_ok!(vote(Origin::signed(3), vec![3], 5));
+			// ok
+			assert_ok!(vote(Origin::signed(2), vec![3, 4], 5));
+
+			assert_ok!(Elections::renounce_candidacy(Origin::signed(5), Renouncing::Candidate(3)));
+			assert_ok!(Elections::renounce_candidacy(Origin::signed(4), Renouncing::Candidate(2)));
+			assert_ok!(Elections::renounce_candidacy(Origin::signed(3), Renouncing::Candidate(1)));
+
+			assert_ok!(Elections::clean_defunct_voters(Origin::root(), 4, 2));
+		})
+	}
 }
diff --git a/frame/elections-phragmen/src/migrations_3_0_0.rs b/frame/elections-phragmen/src/migrations_3_0_0.rs
new file mode 100644
index 000000000000..0737a12207c1
--- /dev/null
+++ b/frame/elections-phragmen/src/migrations_3_0_0.rs
@@ -0,0 +1,195 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Migrations to version [`3.0.0`], as denoted by the changelog.
+
+use codec::{Encode, Decode, FullCodec};
+use sp_std::prelude::*;
+use frame_support::{
+	RuntimeDebug, weights::Weight, Twox64Concat,
+	storage::types::{StorageMap, StorageValue},
+	traits::{GetPalletVersion, PalletVersion},
+};
+
+#[derive(Encode, Decode, Clone, Default, RuntimeDebug, PartialEq)]
+struct SeatHolder<AccountId, Balance> {
+	who: AccountId,
+	stake: Balance,
+	deposit: Balance,
+}
+
+#[derive(Encode, Decode, Clone, Default, RuntimeDebug, PartialEq)]
+struct Voter<AccountId, Balance> {
+	votes: Vec<AccountId>,
+	stake: Balance,
+	deposit: Balance,
+}
+
+/// Trait to implement to give information about types used for migration
+pub trait V2ToV3 {
+	/// elections-phragmen module, used to check storage version.
+	type Module: GetPalletVersion;
+
+	/// System config account id
+	type AccountId: 'static + FullCodec;
+
+	/// Elections-phragmen currency balance.
+	type Balance: 'static + FullCodec + Copy;
+}
+
+struct __Candidates;
+impl frame_support::traits::StorageInstance for __Candidates {
+	fn pallet_prefix() -> &'static str { "PhragmenElection" }
+	const STORAGE_PREFIX: &'static str = "Candidates";
+}
+
+#[allow(type_alias_bounds)]
+type Candidates<T: V2ToV3> = StorageValue<__Candidates, Vec<(T::AccountId, T::Balance)>>;
+
+struct __Members;
+impl frame_support::traits::StorageInstance for __Members {
+	fn pallet_prefix() -> &'static str { "PhragmenElection" }
+	const STORAGE_PREFIX: &'static str = "Members";
+}
+#[allow(type_alias_bounds)]
+type Members<T: V2ToV3> = StorageValue<__Members, Vec<SeatHolder<T::AccountId, T::Balance>>>;
+
+struct __RunnersUp;
+impl frame_support::traits::StorageInstance for __RunnersUp {
+	fn pallet_prefix() -> &'static str { "PhragmenElection" }
+	const STORAGE_PREFIX: &'static str = "RunnersUp";
+}
+#[allow(type_alias_bounds)]
+type RunnersUp<T: V2ToV3> = StorageValue<__RunnersUp, Vec<SeatHolder<T::AccountId, T::Balance>>>;
+
+struct __Voting;
+impl frame_support::traits::StorageInstance for __Voting {
+	fn pallet_prefix() -> &'static str { "PhragmenElection" }
+	const STORAGE_PREFIX: &'static str = "Voting";
+}
+#[allow(type_alias_bounds)]
+type Voting<T: V2ToV3> = StorageMap<__Voting, Twox64Concat, T::AccountId, Voter<T::AccountId, T::Balance>>;
+
+/// Apply all of the migrations from 2_0_0 to 3_0_0.
+///
+/// ### Warning
+///
+/// This code will **ONLY** check that the storage version is less than or equal to 2_0_0.
+/// Further check might be needed at the user runtime.
+///
+/// Be aware that this migration is intended to be used only for the mentioned versions. Use
+/// with care and run at your own risk.
+pub fn apply<T: V2ToV3>(old_voter_bond: T::Balance, old_candidacy_bond: T::Balance) -> Weight {
+	let maybe_storage_version = <T::Module as GetPalletVersion>::storage_version();
+	frame_support::debug::info!(
+		"Running migration for elections-phragmen with storage version {:?}",
+		maybe_storage_version
+	);
+	match maybe_storage_version {
+		Some(storage_version) if storage_version <= PalletVersion::new(2, 0, 0) => {
+			migrate_voters_to_recorded_deposit::<T>(old_voter_bond);
+			migrate_candidates_to_recorded_deposit::<T>(old_candidacy_bond);
+			migrate_runners_up_to_recorded_deposit::<T>(old_candidacy_bond);
+			migrate_members_to_recorded_deposit::<T>(old_candidacy_bond);
+			Weight::max_value()
+		}
+		_ => {
+			frame_support::debug::warn!(
+				"Attempted to apply migration to V3 but failed because storage version is {:?}",
+				maybe_storage_version
+			);
+			0
+		},
+	}
+}
+
+/// Migrate from the old legacy voting bond (fixed) to the new one (per-vote dynamic).
+pub fn migrate_voters_to_recorded_deposit<T: V2ToV3>(old_deposit: T::Balance) {
+	<Voting<T>>::translate::<(T::Balance, Vec<T::AccountId>), _>(
+		|_who, (stake, votes)| {
+			Some(Voter {
+				votes,
+				stake,
+				deposit: old_deposit,
+			})
+		},
+	);
+
+	frame_support::debug::info!(
+		"migrated {} voter accounts.",
+		<Voting<T>>::iter().count(),
+	);
+}
+
+/// Migrate all candidates to recorded deposit.
+pub fn migrate_candidates_to_recorded_deposit<T: V2ToV3>(old_deposit: T::Balance) {
+	let _ = <Candidates<T>>::translate::<Vec<T::AccountId>, _>(
+		|maybe_old_candidates| {
+			maybe_old_candidates.map(|old_candidates| {
+				frame_support::debug::info!(
+					"migrated {} candidate accounts.",
+					old_candidates.len()
+				);
+				old_candidates
+					.into_iter()
+					.map(|c| (c, old_deposit))
+					.collect::<Vec<_>>()
+			})
+		},
+	);
+}
+
+/// Migrate all members to recorded deposit.
+pub fn migrate_members_to_recorded_deposit<T: V2ToV3>(old_deposit: T::Balance) {
+	let _ = <Members<T>>::translate::<Vec<(T::AccountId, T::Balance)>, _>(
+		|maybe_old_members| {
+			maybe_old_members.map(|old_members| {
+				frame_support::debug::info!("migrated {} member accounts.", old_members.len());
+				old_members
+					.into_iter()
+					.map(|(who, stake)| SeatHolder {
+						who,
+						stake,
+						deposit: old_deposit,
+					})
+					.collect::<Vec<_>>()
+			})
+		},
+	);
+}
+
+/// Migrate all runners-up to recorded deposit.
+pub fn migrate_runners_up_to_recorded_deposit<T: V2ToV3>(old_deposit: T::Balance) {
+	let _ = <RunnersUp<T>>::translate::<Vec<(T::AccountId, T::Balance)>, _>(
+		|maybe_old_runners_up| {
+			maybe_old_runners_up.map(|old_runners_up| {
+				frame_support::debug::info!(
+					"migrated {} runner-up accounts.",
+					old_runners_up.len()
+				);
+				old_runners_up
+					.into_iter()
+					.map(|(who, stake)| SeatHolder {
+						who,
+						stake,
+						deposit: old_deposit,
+					})
+					.collect::<Vec<_>>()
+			})
+		},
+	);
+}
diff --git a/frame/elections-phragmen/src/weights.rs b/frame/elections-phragmen/src/weights.rs
index baecda618006..25c209140836 100644
--- a/frame/elections-phragmen/src/weights.rs
+++ b/frame/elections-phragmen/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Weights for pallet_elections_phragmen
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! Autogenerated weights for pallet_elections_phragmen
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.1
+//! DATE: 2021-01-20, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -43,173 +44,187 @@ use sp_std::marker::PhantomData;
 
 /// Weight functions needed for pallet_elections_phragmen.
 pub trait WeightInfo {
-	fn vote(_v: u32, ) -> Weight;
-	fn vote_update(_v: u32, ) -> Weight;
+	fn vote_equal(v: u32, ) -> Weight;
+	fn vote_more(v: u32, ) -> Weight;
+	fn vote_less(v: u32, ) -> Weight;
 	fn remove_voter() -> Weight;
-	fn report_defunct_voter_correct(_c: u32, _v: u32, ) -> Weight;
-	fn report_defunct_voter_incorrect(_c: u32, _v: u32, ) -> Weight;
-	fn submit_candidacy(_c: u32, ) -> Weight;
-	fn renounce_candidacy_candidate(_c: u32, ) -> Weight;
+	fn submit_candidacy(c: u32, ) -> Weight;
+	fn renounce_candidacy_candidate(c: u32, ) -> Weight;
 	fn renounce_candidacy_members() -> Weight;
 	fn renounce_candidacy_runners_up() -> Weight;
 	fn remove_member_with_replacement() -> Weight;
 	fn remove_member_wrong_refund() -> Weight;
-	
+	fn clean_defunct_voters(v: u32, d: u32, ) -> Weight;
+	fn election_phragmen(c: u32, v: u32, e: u32, ) -> Weight;
 }
 
 /// Weights for pallet_elections_phragmen using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
-	fn vote(v: u32, ) -> Weight {
-		(89_627_000 as Weight)
-			.saturating_add((197_000 as Weight).saturating_mul(v as Weight))
+	fn vote_equal(v: u32, ) -> Weight {
+		(45_157_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((399_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
-	fn vote_update(v: u32, ) -> Weight {
-		(54_724_000 as Weight)
-			.saturating_add((213_000 as Weight).saturating_mul(v as Weight))
+	fn vote_more(v: u32, ) -> Weight {
+		(69_738_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((450_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
-	fn remove_voter() -> Weight {
-		(73_774_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+	fn vote_less(v: u32, ) -> Weight {
+		(73_955_000 as Weight)
+			// Standard Error: 38_000
+			.saturating_add((227_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
-	}
-	fn report_defunct_voter_correct(c: u32, v: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((1_746_000 as Weight).saturating_mul(c as Weight))
-			.saturating_add((31_383_000 as Weight).saturating_mul(v as Weight))
-			.saturating_add(T::DbWeight::get().reads(7 as Weight))
-			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-			
 	}
-	fn report_defunct_voter_incorrect(c: u32, v: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((1_725_000 as Weight).saturating_mul(c as Weight))
-			.saturating_add((31_293_000 as Weight).saturating_mul(v as Weight))
-			.saturating_add(T::DbWeight::get().reads(6 as Weight))
+	fn remove_voter() -> Weight {
+		(68_398_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
 	fn submit_candidacy(c: u32, ) -> Weight {
-		(73_403_000 as Weight)
-			.saturating_add((314_000 as Weight).saturating_mul(c as Weight))
+		(59_291_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((412_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn renounce_candidacy_candidate(c: u32, ) -> Weight {
-		(48_834_000 as Weight)
-			.saturating_add((187_000 as Weight).saturating_mul(c as Weight))
+		(55_026_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((207_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn renounce_candidacy_members() -> Weight {
-		(78_402_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+		(77_840_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
-			
 	}
 	fn renounce_candidacy_runners_up() -> Weight {
-		(49_054_000 as Weight)
+		(54_559_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn remove_member_with_replacement() -> Weight {
-		(75_421_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(84_311_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
-			
 	}
 	fn remove_member_wrong_refund() -> Weight {
-		(8_489_000 as Weight)
+		(7_677_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			
 	}
-	
+	fn clean_defunct_voters(v: u32, d: u32, ) -> Weight {
+		(0 as Weight)
+			// Standard Error: 55_000
+			.saturating_add((114_815_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 53_000
+			.saturating_add((49_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
+			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(v as Weight)))
+	}
+	fn election_phragmen(c: u32, v: u32, e: u32, ) -> Weight {
+		(0 as Weight)
+			// Standard Error: 1_940_000
+			.saturating_add((43_557_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 807_000
+			.saturating_add((65_849_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 55_000
+			.saturating_add((4_206_000 as Weight).saturating_mul(e as Weight))
+			.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(c as Weight)))
+			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(v as Weight)))
+			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(c as Weight)))
+	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
-	fn vote(v: u32, ) -> Weight {
-		(89_627_000 as Weight)
-			.saturating_add((197_000 as Weight).saturating_mul(v as Weight))
+	fn vote_equal(v: u32, ) -> Weight {
+		(45_157_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((399_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
-	fn vote_update(v: u32, ) -> Weight {
-		(54_724_000 as Weight)
-			.saturating_add((213_000 as Weight).saturating_mul(v as Weight))
+	fn vote_more(v: u32, ) -> Weight {
+		(69_738_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((450_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
-	fn remove_voter() -> Weight {
-		(73_774_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+	fn vote_less(v: u32, ) -> Weight {
+		(73_955_000 as Weight)
+			// Standard Error: 38_000
+			.saturating_add((227_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
-	}
-	fn report_defunct_voter_correct(c: u32, v: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((1_746_000 as Weight).saturating_mul(c as Weight))
-			.saturating_add((31_383_000 as Weight).saturating_mul(v as Weight))
-			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
-			
 	}
-	fn report_defunct_voter_incorrect(c: u32, v: u32, ) -> Weight {
-		(0 as Weight)
-			.saturating_add((1_725_000 as Weight).saturating_mul(c as Weight))
-			.saturating_add((31_293_000 as Weight).saturating_mul(v as Weight))
-			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
+	fn remove_voter() -> Weight {
+		(68_398_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
 	fn submit_candidacy(c: u32, ) -> Weight {
-		(73_403_000 as Weight)
-			.saturating_add((314_000 as Weight).saturating_mul(c as Weight))
+		(59_291_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((412_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn renounce_candidacy_candidate(c: u32, ) -> Weight {
-		(48_834_000 as Weight)
-			.saturating_add((187_000 as Weight).saturating_mul(c as Weight))
+		(55_026_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((207_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn renounce_candidacy_members() -> Weight {
-		(78_402_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+		(77_840_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
-			
 	}
 	fn renounce_candidacy_runners_up() -> Weight {
-		(49_054_000 as Weight)
+		(54_559_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn remove_member_with_replacement() -> Weight {
-		(75_421_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(84_311_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
-			
 	}
 	fn remove_member_wrong_refund() -> Weight {
-		(8_489_000 as Weight)
+		(7_677_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
-			
 	}
-	
+	fn clean_defunct_voters(v: u32, d: u32, ) -> Weight {
+		(0 as Weight)
+			// Standard Error: 55_000
+			.saturating_add((114_815_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 53_000
+			.saturating_add((49_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
+			.saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(v as Weight)))
+	}
+	fn election_phragmen(c: u32, v: u32, e: u32, ) -> Weight {
+		(0 as Weight)
+			// Standard Error: 1_940_000
+			.saturating_add((43_557_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 807_000
+			.saturating_add((65_849_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 55_000
+			.saturating_add((4_206_000 as Weight).saturating_mul(e as Weight))
+			.saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(c as Weight)))
+			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(v as Weight)))
+			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(c as Weight)))
+	}
 }
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index 1d3048cc9c0b..2888abc306b3 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -1263,16 +1263,16 @@ pub trait ChangeMembers<AccountId: Clone + Ord> {
 	///
 	/// This resets any previous value of prime.
 	fn set_members_sorted(new_members: &[AccountId], old_members: &[AccountId]) {
-		let (incoming, outgoing) = Self::compute_members_diff(new_members, old_members);
+		let (incoming, outgoing) = Self::compute_members_diff_sorted(new_members, old_members);
 		Self::change_members_sorted(&incoming[..], &outgoing[..], &new_members);
 	}
 
 	/// Compute diff between new and old members; they **must already be sorted**.
 	///
 	/// Returns incoming and outgoing members.
-	fn compute_members_diff(
+	fn compute_members_diff_sorted(
 		new_members: &[AccountId],
-		old_members: &[AccountId]
+		old_members: &[AccountId],
 	) -> (Vec<AccountId>, Vec<AccountId>) {
 		let mut old_iter = old_members.iter();
 		let mut new_iter = new_members.iter();
@@ -1306,6 +1306,11 @@ pub trait ChangeMembers<AccountId: Clone + Ord> {
 
 	/// Set the prime member.
 	fn set_prime(_prime: Option<AccountId>) {}
+
+	/// Get the current prime.
+	fn get_prime() -> Option<AccountId> {
+		None
+	}
 }
 
 impl<T: Clone + Ord> ChangeMembers<T> for () {

From 1baeefafc2bc53066b58a65dfed7758aea55cbdc Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Thu, 21 Jan 2021 10:29:50 +0100
Subject: [PATCH 0302/1194] .maintain: Replace sentry-node with
 local-docker-test-network (#7943)

Sentry nodes are deprecated. Thus there is no need for
`.maintain/sentry-node` to spin up a sentry node test environment.
Instead this commit rewrites the setup to contain two full-connected
validators and one light client.

With the steps below one can now spin up a local test network with
two validators, one light-client, Prometheus and Grafana.

- cargo build --release
- sudo docker-compose -f .maintain/local-docker-test-network/docker-compose.yml up
---
 .../docker-compose.yml                        | 81 ++++++++-----------
 .../provisioning/dashboards/dashboards.yml    |  0
 .../provisioning/datasources/datasource.yml   |  0
 .../prometheus/prometheus.yml                 |  4 +-
 4 files changed, 36 insertions(+), 49 deletions(-)
 rename .maintain/{sentry-node => local-docker-test-network}/docker-compose.yml (66%)
 rename .maintain/{sentry-node => local-docker-test-network}/grafana/provisioning/dashboards/dashboards.yml (100%)
 rename .maintain/{sentry-node => local-docker-test-network}/grafana/provisioning/datasources/datasource.yml (100%)
 rename .maintain/{sentry-node => local-docker-test-network}/prometheus/prometheus.yml (89%)

diff --git a/.maintain/sentry-node/docker-compose.yml b/.maintain/local-docker-test-network/docker-compose.yml
similarity index 66%
rename from .maintain/sentry-node/docker-compose.yml
rename to .maintain/local-docker-test-network/docker-compose.yml
index a4cc8f1ebb92..53e2a2913f38 100644
--- a/.maintain/sentry-node/docker-compose.yml
+++ b/.maintain/local-docker-test-network/docker-compose.yml
@@ -1,24 +1,26 @@
-# Docker compose file to simulate a sentry node setup.
+# Docker compose file to start a multi node local test network.
 #
+# # Nodes
 #
-# Setup:
+# - Validator node A
+# - Validator node B
+# - Light client C
 #
-# Validator A is not supposed to be connected to the public internet. Instead it
-# connects to a sentry node (sentry-a) which connects to the public internet.
-# Validator B can reach validator A via sentry node A and vice versa.
+# # Auxiliary nodes
 #
+# - Prometheus monitoring each node.
+# - Grafana pointed at the Prometheus node, configured with all dashboards.
 #
-# Usage:
+# # Usage
 #
 # 1. Build `target/release/substrate` binary: `cargo build --release`
-#
-# 2. Start networks and containers: `sudo docker-compose -f .maintain/sentry-node/docker-compose.yml up`
-#
-# 3. Reach:
-#   - polkadot/apps on localhost:3000
+# 2. Start networks and containers:
+#    `sudo docker-compose -f .maintain/sentry-node/docker-compose.yml up`
+# 3. Connect to nodes:
 #   - validator-a: localhost:9944
 #   - validator-b: localhost:9945
-#   - sentry-a: localhost:9946
+#   - light-c: localhost:9946
+#   - via polkadot.js/apps: https://polkadot.js.org/apps/?rpc=ws%3A%2F%2Flocalhost%3A<NODE_PORT>#/explorer
 #   - grafana: localhost:3001
 #   - prometheus: localhost:9090
 
@@ -34,9 +36,8 @@ services:
       - ../../target/release/substrate:/usr/local/bin/substrate
     image: parity/substrate
     networks:
-      - network-a
+      - internet
     command:
-      # Local node id: QmRpheLN4JWdAnY7HGJfWFNbfkQCb6tFf4vvA6hgjMZKrR
       - "--node-key"
       - "0000000000000000000000000000000000000000000000000000000000000001"
       - "--base-path"
@@ -46,48 +47,38 @@ services:
       - "30333"
       - "--validator"
       - "--alice"
-      - "--sentry-nodes"
-      - "/dns/sentry-a/tcp/30333/p2p/12D3KooWSCufgHzV4fCwRijfH2k3abrpAJxTKxEvN1FDuRXA2U9x"
-      - "--reserved-nodes"
-      - "/dns/sentry-a/tcp/30333/p2p/12D3KooWSCufgHzV4fCwRijfH2k3abrpAJxTKxEvN1FDuRXA2U9x"
+      - "--bootnodes"
+      - "/dns/validator-b/tcp/30333/p2p/12D3KooWHdiAxVd8uMQR1hGWXccidmfCwLqcMpGwR6QcTP6QRMuD"
       # Not only bind to localhost.
       - "--unsafe-ws-external"
       - "--unsafe-rpc-external"
-      # - "--log"
-      # - "sub-libp2p=trace"
-      # - "--log"
-      # - "afg=trace"
       - "--log"
-      - "sub-authority-discovery=trace"
+      - "sub-libp2p=trace"
       - "--no-telemetry"
       - "--rpc-cors"
       - "all"
       - "--prometheus-external"
 
-  sentry-a:
+  validator-b:
     image: parity/substrate
     ports:
-      - "9946:9944"
+      - "9945:9944"
     volumes:
       - ../../target/release/substrate:/usr/local/bin/substrate
     networks:
-      - network-a
       - internet
     command:
-      # Local node id: QmV7EhW6J6KgmNdr558RH1mPx2xGGznW7At4BhXzntRFsi
       - "--node-key"
-      - "0000000000000000000000000000000000000000000000000000000000000003"
+      - "0000000000000000000000000000000000000000000000000000000000000002"
       - "--base-path"
-      - "/tmp/sentry"
+      - "/tmp/bob"
       - "--chain=local"
       - "--port"
       - "30333"
-      - "--sentry"
-      - "/dns/validator-a/tcp/30333/p2p/12D3KooWEyoppNCUx8Yx66oV9fJnriXwCcXwDDUA2kj6vnc6iDEp"
-      - "--reserved-nodes"
-      - "/dns/validator-a/tcp/30333/p2p/12D3KooWEyoppNCUx8Yx66oV9fJnriXwCcXwDDUA2kj6vnc6iDEp"
+      - "--validator"
+      - "--bob"
       - "--bootnodes"
-      - "/dns/validator-b/tcp/30333/p2p/12D3KooWHdiAxVd8uMQR1hGWXccidmfCwLqcMpGwR6QcTP6QRMuD"
+      - "/dns/validator-a/tcp/30333/p2p/12D3KooWEyoppNCUx8Yx66oV9fJnriXwCcXwDDUA2kj6vnc6iDEp"
       - "--no-telemetry"
       - "--rpc-cors"
       - "all"
@@ -95,32 +86,30 @@ services:
       - "--unsafe-ws-external"
       - "--unsafe-rpc-external"
       - "--log"
-      - "sub-authority-discovery=trace"
+      - "sub-libp2p=trace"
       - "--prometheus-external"
 
-  validator-b:
+  light-c:
     image: parity/substrate
     ports:
-      - "9945:9944"
+      - "9946:9944"
     volumes:
       - ../../target/release/substrate:/usr/local/bin/substrate
     networks:
       - internet
     command:
-      # Local node id: QmSVnNf9HwVMT1Y4cK1P6aoJcEZjmoTXpjKBmAABLMnZEk
       - "--node-key"
-      - "0000000000000000000000000000000000000000000000000000000000000002"
+      - "0000000000000000000000000000000000000000000000000000000000000003"
       - "--base-path"
-      - "/tmp/bob"
+      - "/tmp/light"
       - "--chain=local"
       - "--port"
       - "30333"
-      - "--validator"
-      - "--bob"
+      - "--light"
       - "--bootnodes"
       - "/dns/validator-a/tcp/30333/p2p/12D3KooWEyoppNCUx8Yx66oV9fJnriXwCcXwDDUA2kj6vnc6iDEp"
       - "--bootnodes"
-      - "/dns/sentry-a/tcp/30333/p2p/12D3KooWSCufgHzV4fCwRijfH2k3abrpAJxTKxEvN1FDuRXA2U9x"
+      - "/dns/validator-b/tcp/30333/p2p/12D3KooWHdiAxVd8uMQR1hGWXccidmfCwLqcMpGwR6QcTP6QRMuD"
       - "--no-telemetry"
       - "--rpc-cors"
       - "all"
@@ -128,20 +117,19 @@ services:
       - "--unsafe-ws-external"
       - "--unsafe-rpc-external"
       - "--log"
-      - "sub-authority-discovery=trace"
+      - "sub-libp2p=trace"
       - "--prometheus-external"
 
   prometheus:
     image: prom/prometheus
     networks:
-      - network-a
       - internet
     ports:
       - "9090:9090"
     links:
       - validator-a:validator-a
-      - sentry-a:sentry-a
       - validator-b:validator-b
+      - light-c:light-c
     volumes:
       - ./prometheus/:/etc/prometheus/
     restart: always
@@ -152,7 +140,6 @@ services:
     depends_on:
       - prometheus
     networks:
-      - network-a
       - internet
     ports:
       - 3001:3000
diff --git a/.maintain/sentry-node/grafana/provisioning/dashboards/dashboards.yml b/.maintain/local-docker-test-network/grafana/provisioning/dashboards/dashboards.yml
similarity index 100%
rename from .maintain/sentry-node/grafana/provisioning/dashboards/dashboards.yml
rename to .maintain/local-docker-test-network/grafana/provisioning/dashboards/dashboards.yml
diff --git a/.maintain/sentry-node/grafana/provisioning/datasources/datasource.yml b/.maintain/local-docker-test-network/grafana/provisioning/datasources/datasource.yml
similarity index 100%
rename from .maintain/sentry-node/grafana/provisioning/datasources/datasource.yml
rename to .maintain/local-docker-test-network/grafana/provisioning/datasources/datasource.yml
diff --git a/.maintain/sentry-node/prometheus/prometheus.yml b/.maintain/local-docker-test-network/prometheus/prometheus.yml
similarity index 89%
rename from .maintain/sentry-node/prometheus/prometheus.yml
rename to .maintain/local-docker-test-network/prometheus/prometheus.yml
index 547d4bea57ae..f8acb7c0b8cc 100644
--- a/.maintain/sentry-node/prometheus/prometheus.yml
+++ b/.maintain/local-docker-test-network/prometheus/prometheus.yml
@@ -7,9 +7,9 @@ scrape_configs:
       - targets: ['validator-a:9615']
         labels:
           network: dev
-      - targets: ['sentry-a:9615']
+      - targets: ['validator-b:9615']
         labels:
           network: dev
-      - targets: ['validator-b:9615']
+      - targets: ['light-c:9615']
         labels:
           network: dev

From a7fd1e5d59b12d0166da54d545e7e5826bc6f518 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Thu, 21 Jan 2021 09:39:30 +0000
Subject: [PATCH 0303/1194] Attempt to remove the `where` bounds in arithmetic.
 (#7933)

* Attempt to remove the where bounds.

* Fix further and further.

* Format better.

* Update primitives/npos-elections/src/lib.rs

* fix build

* remove unused
---
 frame/staking/src/lib.rs                      |   7 +-
 frame/staking/src/offchain_election.rs        |   7 +-
 primitives/arithmetic/src/lib.rs              |  23 ++-
 primitives/arithmetic/src/per_things.rs       | 155 ++++++++++--------
 primitives/election-providers/src/onchain.rs  |   6 +-
 primitives/npos-elections/benches/phragmen.rs |   1 -
 primitives/npos-elections/src/helpers.rs      |  26 +--
 primitives/npos-elections/src/lib.rs          |  21 +--
 primitives/npos-elections/src/mock.rs         |   6 +-
 primitives/npos-elections/src/phragmen.rs     |   7 +-
 primitives/npos-elections/src/phragmms.rs     |   9 +-
 11 files changed, 127 insertions(+), 141 deletions(-)

diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 6c0bbc33a4e3..3ea66e937e83 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -305,7 +305,7 @@ use frame_support::{
 };
 use pallet_session::historical;
 use sp_runtime::{
-	Percent, Perbill, PerU16, InnerOf, RuntimeDebug, DispatchError,
+	Percent, Perbill, PerU16, RuntimeDebug, DispatchError,
 	curve::PiecewiseLinear,
 	traits::{
 		Convert, Zero, StaticLookup, CheckedSub, Saturating, SaturatedConversion,
@@ -2991,10 +2991,7 @@ impl<T: Config> Module<T> {
 	/// No storage item is updated.
 	pub fn do_phragmen<Accuracy: PerThing128>(
 		iterations: usize,
-	) -> Option<PrimitiveElectionResult<T::AccountId, Accuracy>>
-	where
-		ExtendedBalance: From<InnerOf<Accuracy>>,
-	{
+	) -> Option<PrimitiveElectionResult<T::AccountId, Accuracy>> {
 		let weight_of = Self::slashable_balance_of_fn();
 		let mut all_nominators: Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)> = Vec::new();
 		let mut all_validators = Vec::new();
diff --git a/frame/staking/src/offchain_election.rs b/frame/staking/src/offchain_election.rs
index 2ab29b7105d9..4f80d75086e7 100644
--- a/frame/staking/src/offchain_election.rs
+++ b/frame/staking/src/offchain_election.rs
@@ -29,7 +29,7 @@ use sp_npos_elections::{
 	ExtendedBalance, CompactSolution,
 };
 use sp_runtime::{
-	offchain::storage::StorageValueRef, traits::TrailingZeroInput, PerThing, RuntimeDebug,
+	offchain::storage::StorageValueRef, traits::TrailingZeroInput, RuntimeDebug,
 };
 use sp_std::{convert::TryInto, prelude::*};
 
@@ -326,10 +326,7 @@ pub fn prepare_submission<T: Config>(
 ) -> Result<
 	(Vec<ValidatorIndex>, CompactAssignments, ElectionScore, ElectionSize),
 	OffchainElectionError,
->
-where
-	ExtendedBalance: From<<OffchainAccuracy as PerThing>::Inner>,
-{
+> {
 	// make sure that the snapshot is available.
 	let snapshot_validators =
 		<Module<T>>::snapshot_validators().ok_or(OffchainElectionError::SnapshotUnavailable)?;
diff --git a/primitives/arithmetic/src/lib.rs b/primitives/arithmetic/src/lib.rs
index ca02df0d1d4b..9b1e8711da8c 100644
--- a/primitives/arithmetic/src/lib.rs
+++ b/primitives/arithmetic/src/lib.rs
@@ -114,19 +114,16 @@ impl_normalize_for_numeric!(u8, u16, u32, u64, u128);
 
 impl<P: PerThing> Normalizable<P> for Vec<P> {
 	fn normalize(&self, targeted_sum: P) -> Result<Vec<P>, &'static str> {
-		let inners = self
-			.iter()
-			.map(|p| p.clone().deconstruct().into())
-			.collect::<Vec<_>>();
-
-		let normalized = normalize(inners.as_ref(), targeted_sum.deconstruct().into())?;
-
-		Ok(
-			normalized
-				.into_iter()
-				.map(|i: UpperOf<P>| P::from_parts(i.saturated_into()))
-				.collect()
-		)
+		let uppers =
+			self.iter().map(|p| <UpperOf<P>>::from(p.clone().deconstruct())).collect::<Vec<_>>();
+
+		let normalized =
+			normalize(uppers.as_ref(), <UpperOf<P>>::from(targeted_sum.deconstruct()))?;
+
+		Ok(normalized
+			.into_iter()
+			.map(|i: UpperOf<P>| P::from_parts(i.saturated_into::<P::Inner>()))
+			.collect())
 	}
 }
 
diff --git a/primitives/arithmetic/src/per_things.rs b/primitives/arithmetic/src/per_things.rs
index c6a31a0ffe86..5c86e55c2f4e 100644
--- a/primitives/arithmetic/src/per_things.rs
+++ b/primitives/arithmetic/src/per_things.rs
@@ -22,6 +22,7 @@ use sp_std::{ops, fmt, prelude::*, convert::TryInto};
 use codec::{Encode, CompactAs};
 use crate::traits::{
 	SaturatedConversion, UniqueSaturatedInto, Saturating, BaseArithmetic, Bounded, Zero, Unsigned,
+	One,
 };
 use sp_debug_derive::RuntimeDebug;
 
@@ -37,13 +38,17 @@ pub trait PerThing:
 	Sized + Saturating + Copy + Default + Eq + PartialEq + Ord + PartialOrd + Bounded + fmt::Debug
 {
 	/// The data type used to build this per-thingy.
-	type Inner: BaseArithmetic + Unsigned + Copy + fmt::Debug;
+	type Inner: BaseArithmetic + Unsigned + Copy + Into<u128> + fmt::Debug;
 
 	/// A data type larger than `Self::Inner`, used to avoid overflow in some computations.
 	/// It must be able to compute `ACCURACY^2`.
-	type Upper:
-		BaseArithmetic + Copy + From<Self::Inner> + TryInto<Self::Inner> +
-		UniqueSaturatedInto<Self::Inner> + Unsigned + fmt::Debug;
+	type Upper: BaseArithmetic
+		+ Copy
+		+ From<Self::Inner>
+		+ TryInto<Self::Inner>
+		+ UniqueSaturatedInto<Self::Inner>
+		+ Unsigned
+		+ fmt::Debug;
 
 	/// The accuracy of this type.
 	const ACCURACY: Self::Inner;
@@ -65,14 +70,14 @@ pub trait PerThing:
 	fn from_percent(x: Self::Inner) -> Self {
 		let a: Self::Inner = x.min(100.into());
 		let b: Self::Inner = 100.into();
-		Self::from_rational_approximation(a, b)
+		Self::from_rational_approximation::<Self::Inner>(a, b)
 	}
 
 	/// Return the product of multiplication of this value by itself.
 	fn square(self) -> Self {
 		let p = Self::Upper::from(self.deconstruct());
 		let q = Self::Upper::from(Self::ACCURACY);
-		Self::from_rational_approximation(p * p, q * q)
+		Self::from_rational_approximation::<Self::Upper>(p * p, q * q)
 	}
 
 	/// Multiplication that always rounds down to a whole number. The standard `Mul` rounds to the
@@ -91,8 +96,10 @@ pub trait PerThing:
 	/// # }
 	/// ```
 	fn mul_floor<N>(self, b: N) -> N
-	where N: Clone + From<Self::Inner> + UniqueSaturatedInto<Self::Inner> + ops::Rem<N, Output=N> +
-		ops::Div<N, Output=N> + ops::Mul<N, Output=N> + ops::Add<N, Output=N> + Unsigned
+	where
+		N: Clone + UniqueSaturatedInto<Self::Inner> + ops::Rem<N, Output=N> +
+			ops::Div<N, Output=N> + ops::Mul<N, Output=N> + ops::Add<N, Output=N> + Unsigned,
+		Self::Inner: Into<N>,
 	{
 		overflow_prune_mul::<N, Self>(b, self.deconstruct(), Rounding::Down)
 	}
@@ -113,8 +120,10 @@ pub trait PerThing:
 	/// # }
 	/// ```
 	fn mul_ceil<N>(self, b: N) -> N
-	where N: Clone + From<Self::Inner> + UniqueSaturatedInto<Self::Inner> + ops::Rem<N, Output=N> +
-		ops::Div<N, Output=N> + ops::Mul<N, Output=N> + ops::Add<N, Output=N> + Unsigned
+	where
+		N: Clone + UniqueSaturatedInto<Self::Inner> + ops::Rem<N, Output=N> +
+			ops::Div<N, Output=N> + ops::Mul<N, Output=N> + ops::Add<N, Output=N> + Unsigned,
+		Self::Inner: Into<N>
 	{
 		overflow_prune_mul::<N, Self>(b, self.deconstruct(), Rounding::Up)
 	}
@@ -129,9 +138,11 @@ pub trait PerThing:
 	/// # }
 	/// ```
 	fn saturating_reciprocal_mul<N>(self, b: N) -> N
-	where N: Clone + From<Self::Inner> + UniqueSaturatedInto<Self::Inner> + ops::Rem<N, Output=N> +
-		ops::Div<N, Output=N> + ops::Mul<N, Output=N> + ops::Add<N, Output=N> + Saturating +
-		Unsigned
+	where
+		N: Clone + UniqueSaturatedInto<Self::Inner> + ops::Rem<N, Output=N> +
+			ops::Div<N, Output=N> + ops::Mul<N, Output=N> + ops::Add<N, Output=N> + Saturating +
+			Unsigned,
+		Self::Inner: Into<N>,
 	{
 		saturating_reciprocal_mul::<N, Self>(b, self.deconstruct(), Rounding::Nearest)
 	}
@@ -149,9 +160,11 @@ pub trait PerThing:
 	/// # }
 	/// ```
 	fn saturating_reciprocal_mul_floor<N>(self, b: N) -> N
-	where N: Clone + From<Self::Inner> + UniqueSaturatedInto<Self::Inner> + ops::Rem<N, Output=N> +
-		ops::Div<N, Output=N> + ops::Mul<N, Output=N> + ops::Add<N, Output=N> + Saturating +
-		Unsigned
+	where
+		N: Clone + UniqueSaturatedInto<Self::Inner> + ops::Rem<N, Output=N> +
+			ops::Div<N, Output=N> + ops::Mul<N, Output=N> + ops::Add<N, Output=N> + Saturating +
+			Unsigned,
+		Self::Inner: Into<N>,
 	{
 		saturating_reciprocal_mul::<N, Self>(b, self.deconstruct(), Rounding::Down)
 	}
@@ -169,9 +182,11 @@ pub trait PerThing:
 	/// # }
 	/// ```
 	fn saturating_reciprocal_mul_ceil<N>(self, b: N) -> N
-	where N: Clone + From<Self::Inner> + UniqueSaturatedInto<Self::Inner> + ops::Rem<N, Output=N> +
-		ops::Div<N, Output=N> + ops::Mul<N, Output=N> + ops::Add<N, Output=N> + Saturating +
-		Unsigned
+	where
+		N: Clone + UniqueSaturatedInto<Self::Inner> + ops::Rem<N, Output=N> +
+			ops::Div<N, Output=N> + ops::Mul<N, Output=N> + ops::Add<N, Output=N> + Saturating +
+			Unsigned,
+		Self::Inner: Into<N>,
 	{
 		saturating_reciprocal_mul::<N, Self>(b, self.deconstruct(), Rounding::Up)
 	}
@@ -199,14 +214,16 @@ pub trait PerThing:
 	/// # fn main () {
 	/// // 989/100 is technically closer to 99%.
 	/// assert_eq!(
-	///		Percent::from_rational_approximation(989u64, 1000),
-	///		Percent::from_parts(98),
-	///	);
+	/// 		Percent::from_rational_approximation(989u64, 1000),
+	/// 		Percent::from_parts(98),
+	/// 	);
 	/// # }
 	/// ```
 	fn from_rational_approximation<N>(p: N, q: N) -> Self
-	where N: Clone + Ord + From<Self::Inner> + TryInto<Self::Inner> + TryInto<Self::Upper> +
-		ops::Div<N, Output=N> + ops::Rem<N, Output=N> + ops::Add<N, Output=N> + Unsigned;
+	where
+		N: Clone + Ord + TryInto<Self::Inner> + TryInto<Self::Upper> +
+			ops::Div<N, Output=N> + ops::Rem<N, Output=N> + ops::Add<N, Output=N> + Unsigned,
+		Self::Inner: Into<N>;
 }
 
 /// The rounding method to use.
@@ -221,15 +238,12 @@ enum Rounding {
 
 /// Saturating reciprocal multiplication. Compute `x / self`, saturating at the numeric
 /// bounds instead of overflowing.
-fn saturating_reciprocal_mul<N, P>(
-	x: N,
-	part: P::Inner,
-	rounding: Rounding,
-) -> N
+fn saturating_reciprocal_mul<N, P>(x: N, part: P::Inner, rounding: Rounding) -> N
 where
-	N: Clone + From<P::Inner> + UniqueSaturatedInto<P::Inner> + ops::Div<N, Output=N> + ops::Mul<N,
+	N: Clone + UniqueSaturatedInto<P::Inner> + ops::Div<N, Output=N> + ops::Mul<N,
 	Output=N> + ops::Add<N, Output=N> + ops::Rem<N, Output=N> + Saturating + Unsigned,
 	P: PerThing,
+	P::Inner: Into<N>,
 {
 	let maximum: N = P::ACCURACY.into();
 	let c = rational_mul_correction::<N, P>(
@@ -242,15 +256,12 @@ where
 }
 
 /// Overflow-prune multiplication. Accurately multiply a value by `self` without overflowing.
-fn overflow_prune_mul<N, P>(
-	x: N,
-	part: P::Inner,
-	rounding: Rounding,
-) -> N
+fn overflow_prune_mul<N, P>(x: N, part: P::Inner, rounding: Rounding) -> N
 where
-	N: Clone + From<P::Inner> + UniqueSaturatedInto<P::Inner> + ops::Div<N, Output=N> + ops::Mul<N,
+	N: Clone + UniqueSaturatedInto<P::Inner> + ops::Div<N, Output=N> + ops::Mul<N,
 	Output=N> + ops::Add<N, Output=N> + ops::Rem<N, Output=N> + Unsigned,
 	P: PerThing,
+	P::Inner: Into<N>,
 {
 	let maximum: N = P::ACCURACY.into();
 	let part_n: N = part.into();
@@ -267,19 +278,15 @@ where
 ///
 /// Take the remainder of `x / denom` and multiply by  `numer / denom`. The result can be added
 /// to `x / denom * numer` for an accurate result.
-fn rational_mul_correction<N, P>(
-	x: N,
-	numer: P::Inner,
-	denom: P::Inner,
-	rounding: Rounding,
-) -> N
+fn rational_mul_correction<N, P>(x: N, numer: P::Inner, denom: P::Inner, rounding: Rounding) -> N
 where
-	N: From<P::Inner> + UniqueSaturatedInto<P::Inner> + ops::Div<N, Output=N> + ops::Mul<N,
+	N: UniqueSaturatedInto<P::Inner> + ops::Div<N, Output=N> + ops::Mul<N,
 	Output=N> + ops::Add<N, Output=N> + ops::Rem<N, Output=N> + Unsigned,
 	P: PerThing,
+	P::Inner: Into<N>
 {
 	let numer_upper = P::Upper::from(numer);
-	let denom_n = N::from(denom);
+	let denom_n: N = denom.into();
 	let denom_upper = P::Upper::from(denom);
 	let rem = x.rem(denom_n);
 	// `rem` is less than `denom`, which fits in `P::Inner`.
@@ -362,14 +369,17 @@ macro_rules! implement_per_thing {
 			}
 
 			fn from_rational_approximation<N>(p: N, q: N) -> Self
-			where N: Clone + Ord + From<Self::Inner> + TryInto<Self::Inner> + TryInto<Self::Upper>
-				+ ops::Div<N, Output=N> + ops::Rem<N, Output=N> + ops::Add<N, Output=N> + Unsigned
+			where
+				N: Clone + Ord + TryInto<Self::Inner> + TryInto<Self::Upper>
+				 + ops::Div<N, Output=N> + ops::Rem<N, Output=N> + ops::Add<N, Output=N> + Unsigned
+				 + Zero + One,
+				Self::Inner: Into<N>,
 			{
 				let div_ceil = |x: N, f: N| -> N {
 					let mut o = x.clone() / f.clone();
 					let r = x.rem(f.clone());
-					if r > N::from(0) {
-						o = o + N::from(1);
+					if r > N::zero() {
+						o = o + N::one();
 					}
 					o
 				};
@@ -464,54 +474,66 @@ macro_rules! implement_per_thing {
 
 			/// See [`PerThing::from_rational_approximation`].
 			pub fn from_rational_approximation<N>(p: N, q: N) -> Self
-				where N: Clone + Ord + From<$type> + TryInto<$type> +
+				where N: Clone + Ord + TryInto<$type> +
 					TryInto<$upper_type> + ops::Div<N, Output=N> + ops::Rem<N, Output=N> +
-					ops::Add<N, Output=N> + Unsigned
+					ops::Add<N, Output=N> + Unsigned,
+					$type: Into<N>,
 			{
 				<Self as PerThing>::from_rational_approximation(p, q)
 			}
 
 			/// See [`PerThing::mul_floor`].
 			pub fn mul_floor<N>(self, b: N) -> N
-				where N: Clone + From<$type> + UniqueSaturatedInto<$type> +
-					ops::Rem<N, Output=N> + ops::Div<N, Output=N> + ops::Mul<N, Output=N> +
-					ops::Add<N, Output=N> + Unsigned
+				where
+					N: Clone + UniqueSaturatedInto<$type> +
+						ops::Rem<N, Output=N> + ops::Div<N, Output=N> + ops::Mul<N, Output=N> +
+						ops::Add<N, Output=N> + Unsigned,
+					$type: Into<N>,
+
 			{
 				PerThing::mul_floor(self, b)
 			}
 
 			/// See [`PerThing::mul_ceil`].
 			pub fn mul_ceil<N>(self, b: N) -> N
-				where N: Clone + From<$type> + UniqueSaturatedInto<$type> +
-					ops::Rem<N, Output=N> + ops::Div<N, Output=N> + ops::Mul<N, Output=N> +
-					ops::Add<N, Output=N> + Unsigned
+				where
+					N: Clone + UniqueSaturatedInto<$type> +
+						ops::Rem<N, Output=N> + ops::Div<N, Output=N> + ops::Mul<N, Output=N> +
+						ops::Add<N, Output=N> + Unsigned,
+					$type: Into<N>,
 			{
 				PerThing::mul_ceil(self, b)
 			}
 
 			/// See [`PerThing::saturating_reciprocal_mul`].
 			pub fn saturating_reciprocal_mul<N>(self, b: N) -> N
-				where N: Clone + From<$type> + UniqueSaturatedInto<$type> + ops::Rem<N, Output=N> +
-					ops::Div<N, Output=N> + ops::Mul<N, Output=N> + ops::Add<N, Output=N> +
-					Saturating + Unsigned
+				where
+					N: Clone + UniqueSaturatedInto<$type> + ops::Rem<N, Output=N> +
+						ops::Div<N, Output=N> + ops::Mul<N, Output=N> + ops::Add<N, Output=N> +
+						Saturating + Unsigned,
+					$type: Into<N>,
 			{
 				PerThing::saturating_reciprocal_mul(self, b)
 			}
 
 			/// See [`PerThing::saturating_reciprocal_mul_floor`].
 			pub fn saturating_reciprocal_mul_floor<N>(self, b: N) -> N
-				where N: Clone + From<$type> + UniqueSaturatedInto<$type> + ops::Rem<N, Output=N> +
-					ops::Div<N, Output=N> + ops::Mul<N, Output=N> + ops::Add<N, Output=N> +
-					Saturating + Unsigned
+				where
+					N: Clone + UniqueSaturatedInto<$type> + ops::Rem<N, Output=N> +
+						ops::Div<N, Output=N> + ops::Mul<N, Output=N> + ops::Add<N, Output=N> +
+						Saturating + Unsigned,
+					$type: Into<N>,
 			{
 				PerThing::saturating_reciprocal_mul_floor(self, b)
 			}
 
 			/// See [`PerThing::saturating_reciprocal_mul_ceil`].
 			pub fn saturating_reciprocal_mul_ceil<N>(self, b: N) -> N
-				where N: Clone + From<$type> + UniqueSaturatedInto<$type> + ops::Rem<N, Output=N> +
-					ops::Div<N, Output=N> + ops::Mul<N, Output=N> + ops::Add<N, Output=N> +
-					Saturating + Unsigned
+				where
+					N: Clone + UniqueSaturatedInto<$type> + ops::Rem<N, Output=N> +
+						ops::Div<N, Output=N> + ops::Mul<N, Output=N> + ops::Add<N, Output=N> +
+						Saturating + Unsigned,
+					$type: Into<N>,
 			{
 				PerThing::saturating_reciprocal_mul_ceil(self, b)
 			}
@@ -611,8 +633,9 @@ macro_rules! implement_per_thing {
 		/// This is tailored to be used with a balance type.
 		impl<N> ops::Mul<N> for $name
 		where
-			N: Clone + From<$type> + UniqueSaturatedInto<$type> + ops::Rem<N, Output=N>
+			N: Clone + UniqueSaturatedInto<$type> + ops::Rem<N, Output=N>
 				+ ops::Div<N, Output=N> + ops::Mul<N, Output=N> + ops::Add<N, Output=N> + Unsigned,
+			$type: Into<N>,
 		{
 			type Output = N;
 			fn mul(self, b: N) -> Self::Output {
diff --git a/primitives/election-providers/src/onchain.rs b/primitives/election-providers/src/onchain.rs
index 496ba7fda47e..b50dff2ff17d 100644
--- a/primitives/election-providers/src/onchain.rs
+++ b/primitives/election-providers/src/onchain.rs
@@ -17,7 +17,6 @@
 
 //! An implementation of [`ElectionProvider`] that does an on-chain sequential phragmen.
 
-use sp_arithmetic::InnerOf;
 use crate::{ElectionDataProvider, ElectionProvider};
 use sp_npos_elections::*;
 use sp_std::{collections::btree_map::BTreeMap, marker::PhantomData, prelude::*};
@@ -58,10 +57,7 @@ pub trait Config {
 	type DataProvider: ElectionDataProvider<Self::AccountId, Self::BlockNumber>;
 }
 
-impl<T: Config> ElectionProvider<T::AccountId, T::BlockNumber> for OnChainSequentialPhragmen<T>
-where
-	ExtendedBalance: From<InnerOf<T::Accuracy>>,
-{
+impl<T: Config> ElectionProvider<T::AccountId, T::BlockNumber> for OnChainSequentialPhragmen<T> {
 	type Error = Error;
 	type DataProvider = T::DataProvider;
 
diff --git a/primitives/npos-elections/benches/phragmen.rs b/primitives/npos-elections/benches/phragmen.rs
index 07d07658a46a..d48c24655884 100644
--- a/primitives/npos-elections/benches/phragmen.rs
+++ b/primitives/npos-elections/benches/phragmen.rs
@@ -65,7 +65,6 @@ mod bench_closure_and_slice {
 	) -> Vec<StakedAssignment<A>>
 	where
 		T: sp_std::ops::Mul<ExtendedBalance, Output = ExtendedBalance>,
-		ExtendedBalance: From<<T as PerThing>::Inner>,
 	{
 		ratio
 			.into_iter()
diff --git a/primitives/npos-elections/src/helpers.rs b/primitives/npos-elections/src/helpers.rs
index 4a2099947ea1..10a49a084f10 100644
--- a/primitives/npos-elections/src/helpers.rs
+++ b/primitives/npos-elections/src/helpers.rs
@@ -17,11 +17,8 @@
 
 //! Helper methods for npos-elections.
 
-use crate::{
-	Assignment, Error, ExtendedBalance, IdentifierT, PerThing128, StakedAssignment, VoteWeight,
-	WithApprovalOf,
-};
-use sp_arithmetic::{InnerOf, PerThing};
+use crate::{Assignment, Error, IdentifierT, PerThing128, StakedAssignment, VoteWeight, WithApprovalOf};
+use sp_arithmetic::PerThing;
 use sp_std::prelude::*;
 
 /// Converts a vector of ratio assignments into ones with absolute budget value.
@@ -33,7 +30,6 @@ pub fn assignment_ratio_to_staked<A: IdentifierT, P: PerThing128, FS>(
 ) -> Vec<StakedAssignment<A>>
 where
 	for<'r> FS: Fn(&'r A) -> VoteWeight,
-	ExtendedBalance: From<InnerOf<P>>,
 {
 	ratios
 		.into_iter()
@@ -51,7 +47,6 @@ pub fn assignment_ratio_to_staked_normalized<A: IdentifierT, P: PerThing128, FS>
 ) -> Result<Vec<StakedAssignment<A>>, Error>
 where
 	for<'r> FS: Fn(&'r A) -> VoteWeight,
-	ExtendedBalance: From<InnerOf<P>>,
 {
 	let mut staked = assignment_ratio_to_staked(ratio, &stake_of);
 	staked
@@ -68,24 +63,19 @@ where
 /// Note that this will NOT attempt at normalizing the result.
 pub fn assignment_staked_to_ratio<A: IdentifierT, P: PerThing>(
 	staked: Vec<StakedAssignment<A>>,
-) -> Vec<Assignment<A, P>>
-where
-	ExtendedBalance: From<InnerOf<P>>,
-{
+) -> Vec<Assignment<A, P>> {
 	staked.into_iter().map(|a| a.into_assignment()).collect()
 }
 
 /// Same as [`assignment_staked_to_ratio`] and try and do normalization.
 pub fn assignment_staked_to_ratio_normalized<A: IdentifierT, P: PerThing128>(
 	staked: Vec<StakedAssignment<A>>,
-) -> Result<Vec<Assignment<A, P>>, Error>
-where
-	ExtendedBalance: From<InnerOf<P>>,
-{
+) -> Result<Vec<Assignment<A, P>>, Error> {
 	let mut ratio = staked.into_iter().map(|a| a.into_assignment()).collect::<Vec<_>>();
-	ratio.iter_mut().map(|a|
-		a.try_normalize().map_err(|err| Error::ArithmeticError(err))
-	).collect::<Result<_, _>>()?;
+	ratio
+		.iter_mut()
+		.map(|a| a.try_normalize().map_err(|err| Error::ArithmeticError(err)))
+		.collect::<Result<_, _>>()?;
 	Ok(ratio)
 }
 
diff --git a/primitives/npos-elections/src/lib.rs b/primitives/npos-elections/src/lib.rs
index 2f6e133f1dc7..d45698e1747b 100644
--- a/primitives/npos-elections/src/lib.rs
+++ b/primitives/npos-elections/src/lib.rs
@@ -75,7 +75,7 @@
 
 use sp_arithmetic::{
 	traits::{Bounded, UniqueSaturatedInto, Zero},
-	InnerOf, Normalizable, PerThing, Rational128, ThresholdOrd,
+	Normalizable, PerThing, Rational128, ThresholdOrd,
 };
 use sp_std::{
 	cell::RefCell,
@@ -209,7 +209,6 @@ pub trait CompactSolution: Sized {
 	where
 		for<'r> FS: Fn(&'r A) -> VoteWeight,
 		A: IdentifierT,
-		ExtendedBalance: From<InnerOf<Self::Accuracy>>,
 	{
 		let ratio = self.into_assignment(voter_at, target_at)?;
 		let staked = helpers::assignment_ratio_to_staked_normalized(ratio, stake_of)?;
@@ -332,14 +331,14 @@ impl<AccountId: IdentifierT> Voter<AccountId> {
 	/// Note that this might create _un-normalized_ assignments, due to accuracy loss of `P`. Call
 	/// site might compensate by calling `normalize()` on the returned `Assignment` as a
 	/// post-precessing.
-	pub fn into_assignment<P: PerThing>(self) -> Option<Assignment<AccountId, P>>
-	where
-		ExtendedBalance: From<InnerOf<P>>,
-	{
+	pub fn into_assignment<P: PerThing>(self) -> Option<Assignment<AccountId, P>> {
 		let who = self.who;
 		let budget = self.budget;
-		let distribution = self.edges.into_iter().filter_map(|e| {
-			let per_thing = P::from_rational_approximation(e.weight, budget);
+		let distribution = self
+			.edges
+			.into_iter()
+			.filter_map(|e| {
+				let per_thing = P::from_rational_approximation(e.weight, budget);
 			// trim zero edges.
 			if per_thing.is_zero() { None } else { Some((e.who, per_thing)) }
 		}).collect::<Vec<_>>();
@@ -507,7 +506,6 @@ impl<AccountId> StakedAssignment<AccountId> {
 	/// can never be re-created and does not mean anything useful anymore.
 	pub fn into_assignment<P: PerThing>(self) -> Assignment<AccountId, P>
 	where
-		ExtendedBalance: From<InnerOf<P>>,
 		AccountId: IdentifierT,
 	{
 		let stake = self.total();
@@ -706,10 +704,7 @@ where
 /// greater or less than `that`.
 ///
 /// Note that the third component should be minimized.
-pub fn is_score_better<P: PerThing>(this: ElectionScore, that: ElectionScore, epsilon: P) -> bool
-where
-	ExtendedBalance: From<InnerOf<P>>,
-{
+pub fn is_score_better<P: PerThing>(this: ElectionScore, that: ElectionScore, epsilon: P) -> bool {
 	match this
 		.iter()
 		.zip(that.iter())
diff --git a/primitives/npos-elections/src/mock.rs b/primitives/npos-elections/src/mock.rs
index 57b2204a72b4..ea8f3780e0e6 100644
--- a/primitives/npos-elections/src/mock.rs
+++ b/primitives/npos-elections/src/mock.rs
@@ -22,7 +22,7 @@
 use crate::*;
 use sp_arithmetic::{
 	traits::{One, SaturatedConversion, Zero},
-	InnerOf, PerThing,
+	PerThing,
 };
 use sp_runtime::assert_eq_error_rate;
 use sp_std::collections::btree_map::BTreeMap;
@@ -321,9 +321,7 @@ pub(crate) fn run_and_compare<Output: PerThing128>(
 	voters: Vec<(AccountId, Vec<AccountId>)>,
 	stake_of: &Box<dyn Fn(&AccountId) -> VoteWeight>,
 	to_elect: usize,
-) where
-	ExtendedBalance: From<InnerOf<Output>>,
-{
+) {
 	// run fixed point code.
 	let ElectionResult { winners, assignments } = seq_phragmen::<_, Output>(
 		to_elect,
diff --git a/primitives/npos-elections/src/phragmen.rs b/primitives/npos-elections/src/phragmen.rs
index 24a6b81af31a..dad65666738c 100644
--- a/primitives/npos-elections/src/phragmen.rs
+++ b/primitives/npos-elections/src/phragmen.rs
@@ -27,7 +27,7 @@ use crate::{
 use sp_arithmetic::{
 	helpers_128bit::multiply_by_rational,
 	traits::{Bounded, Zero},
-	InnerOf, Rational128,
+	Rational128,
 };
 use sp_std::prelude::*;
 
@@ -68,10 +68,7 @@ pub fn seq_phragmen<AccountId: IdentifierT, P: PerThing128>(
 	initial_candidates: Vec<AccountId>,
 	initial_voters: Vec<(AccountId, VoteWeight, Vec<AccountId>)>,
 	balance: Option<(usize, ExtendedBalance)>,
-) -> Result<ElectionResult<AccountId, P>, crate::Error>
-where
-	ExtendedBalance: From<InnerOf<P>>,
-{
+) -> Result<ElectionResult<AccountId, P>, crate::Error> {
 	let (candidates, voters) = setup_inputs(initial_candidates, initial_voters);
 
 	let (candidates, mut voters) = seq_phragmen_core::<AccountId>(
diff --git a/primitives/npos-elections/src/phragmms.rs b/primitives/npos-elections/src/phragmms.rs
index b37d3432f9d7..ad93d2f18ef9 100644
--- a/primitives/npos-elections/src/phragmms.rs
+++ b/primitives/npos-elections/src/phragmms.rs
@@ -25,7 +25,7 @@ use crate::{
 	IdentifierT, ElectionResult, ExtendedBalance, setup_inputs, VoteWeight, Voter, CandidatePtr,
 	balance, PerThing128,
 };
-use sp_arithmetic::{PerThing, InnerOf, Rational128, traits::Bounded};
+use sp_arithmetic::{PerThing, Rational128, traits::Bounded};
 use sp_std::{prelude::*, rc::Rc};
 
 /// Execute the phragmms method.
@@ -46,10 +46,7 @@ pub fn phragmms<AccountId: IdentifierT, P: PerThing128>(
 	initial_candidates: Vec<AccountId>,
 	initial_voters: Vec<(AccountId, VoteWeight, Vec<AccountId>)>,
 	balancing_config: Option<(usize, ExtendedBalance)>,
-) -> Result<ElectionResult<AccountId, P>, &'static str>
-where
-	ExtendedBalance: From<InnerOf<P>>,
-{
+) -> Result<ElectionResult<AccountId, P>, &'static str> {
 	let (candidates, mut voters) = setup_inputs(initial_candidates, initial_voters);
 
 	let mut winners = vec![];
@@ -89,7 +86,7 @@ where
 pub(crate) fn calculate_max_score<AccountId: IdentifierT, P: PerThing>(
 	candidates: &[CandidatePtr<AccountId>],
 	voters: &[Voter<AccountId>],
-) -> Option<CandidatePtr<AccountId>> where ExtendedBalance: From<InnerOf<P>> {
+) -> Option<CandidatePtr<AccountId>> {
 	for c_ptr in candidates.iter() {
 		let mut candidate = c_ptr.borrow_mut();
 		if !candidate.elected {

From 3e870d12ab8f55792340ba221ae660a4cfabb6d9 Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann <ben@gnunicorn.org>
Date: Thu, 21 Jan 2021 13:04:11 +0100
Subject: [PATCH 0304/1194] Minor contributor docs update (#7948)

- Fixing Link
- Clarify that no-force-push applies to Pull Requests, too.
---
 docs/CONTRIBUTING.adoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/CONTRIBUTING.adoc b/docs/CONTRIBUTING.adoc
index 3e1ca7f5a326..6262ed9086a5 100644
--- a/docs/CONTRIBUTING.adoc
+++ b/docs/CONTRIBUTING.adoc
@@ -10,11 +10,11 @@ Individuals making significant and valuable contributions are given commit-acces
 
 There are a few basic ground-rules for contributors (including the maintainer(s) of the project):
 
-. **No `--force` pushes** or modifying the master branch history in any way. If you need to rebase, ensure you do it in your own repo.
+. **No `--force` pushes** or modifying the master branch history in any way. If you need to rebase, ensure you do it in your own repo. No rewriting of the history after the code has been shared (e.g. through a Pull-Request).
 . **Non-master branches**, prefixed with a short name moniker (e.g. `gav-my-feature`) must be used for ongoing work.
 . **All modifications** must be made in a **pull-request** to solicit feedback from other contributors.
 . A pull-request *must not be merged until CI* has finished successfully.
-. Contributors should adhere to the ./STYLE_GUIDE.md[house coding style].
+. Contributors should adhere to the link:STYLE_GUIDE.md[house coding style].
 
 
 == Merge Process

From d9e56efe6ada3fdd3b7bb9098a5edbc5c086cf90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Thu, 21 Jan 2021 13:12:42 +0100
Subject: [PATCH 0305/1194] Make offchain indexing work (#7940)

* Make offchain indexing work

This fixes some bugs with offchain indexing to make it actually working ;)

* Fix tests

* Fix browser build

* Update client/db/src/offchain.rs

Co-authored-by: cheme <emericchevalier.pro@gmail.com>

* Remove seperation between prefix and key

Co-authored-by: cheme <emericchevalier.pro@gmail.com>
---
 Cargo.lock                                    |   2 +
 client/api/src/call_executor.rs               |   3 +-
 client/db/src/lib.rs                          |  12 +-
 client/db/src/offchain.rs                     |  27 +--
 client/executor/src/integration_tests/mod.rs  |   4 +-
 client/light/src/call_executor.rs             |   3 -
 client/offchain/Cargo.toml                    |   4 +-
 client/offchain/src/lib.rs                    |  47 +++++-
 client/service/src/client/call_executor.rs    |  14 --
 client/service/src/client/client.rs           |   1 -
 client/service/test/src/client/light.rs       |   3 +-
 client/service/test/src/client/mod.rs         |  12 +-
 .../api/proc-macro/src/decl_runtime_apis.rs   |   3 -
 .../api/proc-macro/src/impl_runtime_apis.rs   |   6 -
 primitives/api/src/lib.rs                     |   4 -
 primitives/core/src/offchain/storage.rs       | 155 +++---------------
 primitives/state-machine/src/ext.rs           |  62 +++----
 primitives/state-machine/src/lib.rs           |  39 -----
 .../src/overlayed_changes/mod.rs              |  43 ++++-
 primitives/state-machine/src/testing.rs       |  17 +-
 test-utils/client/src/lib.rs                  |  13 +-
 test-utils/runtime/src/lib.rs                 |  10 +-
 test-utils/runtime/src/system.rs              |   8 +
 utils/frame/benchmarking-cli/src/command.rs   |   2 -
 24 files changed, 188 insertions(+), 306 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1930628146ce..2bec30fdd8ec 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7218,12 +7218,14 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.11.1",
  "rand 0.7.3",
+ "sc-block-builder",
  "sc-client-api",
  "sc-client-db",
  "sc-keystore",
  "sc-network",
  "sc-transaction-pool",
  "sp-api",
+ "sp-consensus",
  "sp-core",
  "sp-offchain",
  "sp-runtime",
diff --git a/client/api/src/call_executor.rs b/client/api/src/call_executor.rs
index 9c0ea87ea718..5f1e0134a5ca 100644
--- a/client/api/src/call_executor.rs
+++ b/client/api/src/call_executor.rs
@@ -28,7 +28,7 @@ use sp_state_machine::{
 };
 use sc_executor::{RuntimeVersion, NativeVersion};
 use sp_externalities::Extensions;
-use sp_core::{NativeOrEncoded,offchain::storage::OffchainOverlayedChanges};
+use sp_core::NativeOrEncoded;
 
 use sp_api::{ProofRecorder, InitializeBlock, StorageTransactionCache};
 use crate::execution_extensions::ExecutionExtensions;
@@ -86,7 +86,6 @@ pub trait CallExecutor<B: BlockT> {
 		method: &str,
 		call_data: &[u8],
 		changes: &RefCell<OverlayedChanges>,
-		offchain_changes: &RefCell<OffchainOverlayedChanges>,
 		storage_transaction_cache: Option<&RefCell<
 			StorageTransactionCache<B, <Self::Backend as crate::backend::Backend<B>>::State>,
 		>>,
diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index 3fc95d5cdf97..a2c8b5612599 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -681,14 +681,12 @@ pub struct BlockImportOperation<Block: BlockT> {
 impl<Block: BlockT> BlockImportOperation<Block> {
 	fn apply_offchain(&mut self, transaction: &mut Transaction<DbHash>) {
 		for ((prefix, key), value_operation) in self.offchain_storage_updates.drain() {
-			let key: Vec<u8> = prefix
-				.into_iter()
-				.chain(sp_core::sp_std::iter::once(b'/'))
-				.chain(key.into_iter())
-				.collect();
+			let key = crate::offchain::concatenate_prefix_and_key(&prefix, &key);
 			match value_operation {
-				OffchainOverlayedChange::SetValue(val) => transaction.set_from_vec(columns::OFFCHAIN, &key, val),
-				OffchainOverlayedChange::Remove => transaction.remove(columns::OFFCHAIN, &key),
+				OffchainOverlayedChange::SetValue(val) =>
+					transaction.set_from_vec(columns::OFFCHAIN, &key, val),
+				OffchainOverlayedChange::Remove =>
+					transaction.remove(columns::OFFCHAIN, &key),
 			}
 		}
 	}
diff --git a/client/db/src/offchain.rs b/client/db/src/offchain.rs
index aead4397343e..df45c4946e62 100644
--- a/client/db/src/offchain.rs
+++ b/client/db/src/offchain.rs
@@ -18,10 +18,7 @@
 
 //! RocksDB-based offchain workers local storage.
 
-use std::{
-	collections::HashMap,
-	sync::Arc,
-};
+use std::{collections::HashMap, sync::Arc};
 
 use crate::{columns, Database, DbHash, Transaction};
 use parking_lot::Mutex;
@@ -43,7 +40,7 @@ impl std::fmt::Debug for LocalStorage {
 
 impl LocalStorage {
 	/// Create new offchain storage for tests (backed by memorydb)
-	#[cfg(any(test, feature = "test-helpers"))]
+	#[cfg(any(feature = "test-helpers", test))]
 	pub fn new_test() -> Self {
 		let db = kvdb_memorydb::create(crate::utils::NUM_COLUMNS);
 		let db = sp_database::as_database(db);
@@ -61,9 +58,8 @@ impl LocalStorage {
 
 impl sp_core::offchain::OffchainStorage for LocalStorage {
 	fn set(&mut self, prefix: &[u8], key: &[u8], value: &[u8]) {
-		let key: Vec<u8> = prefix.iter().chain(key).cloned().collect();
 		let mut tx = Transaction::new();
-		tx.set(columns::OFFCHAIN, &key, value);
+		tx.set(columns::OFFCHAIN, &concatenate_prefix_and_key(prefix, key), value);
 
 		if let Err(err) = self.db.commit(tx) {
 			error!("Error setting on local storage: {}", err)
@@ -71,9 +67,8 @@ impl sp_core::offchain::OffchainStorage for LocalStorage {
 	}
 
 	fn remove(&mut self, prefix: &[u8], key: &[u8]) {
-		let key: Vec<u8> = prefix.iter().chain(key).cloned().collect();
 		let mut tx = Transaction::new();
-		tx.remove(columns::OFFCHAIN, &key);
+		tx.remove(columns::OFFCHAIN, &concatenate_prefix_and_key(prefix, key));
 
 		if let Err(err) = self.db.commit(tx) {
 			error!("Error removing on local storage: {}", err)
@@ -81,8 +76,7 @@ impl sp_core::offchain::OffchainStorage for LocalStorage {
 	}
 
 	fn get(&self, prefix: &[u8], key: &[u8]) -> Option<Vec<u8>> {
-		let key: Vec<u8> = prefix.iter().chain(key).cloned().collect();
-		self.db.get(columns::OFFCHAIN, &key)
+		self.db.get(columns::OFFCHAIN, &concatenate_prefix_and_key(prefix, key))
 	}
 
 	fn compare_and_set(
@@ -92,7 +86,7 @@ impl sp_core::offchain::OffchainStorage for LocalStorage {
 		old_value: Option<&[u8]>,
 		new_value: &[u8],
 	) -> bool {
-		let key: Vec<u8> = prefix.iter().chain(item_key).cloned().collect();
+		let key = concatenate_prefix_and_key(prefix, item_key);
 		let key_lock = {
 			let mut locks = self.locks.lock();
 			locks.entry(key.clone()).or_default().clone()
@@ -122,6 +116,15 @@ impl sp_core::offchain::OffchainStorage for LocalStorage {
 	}
 }
 
+/// Concatenate the prefix and key to create an offchain key in the db.
+pub(crate) fn concatenate_prefix_and_key(prefix: &[u8], key: &[u8]) -> Vec<u8> {
+	prefix
+		.iter()
+		.chain(key.into_iter())
+		.cloned()
+		.collect()
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;
diff --git a/client/executor/src/integration_tests/mod.rs b/client/executor/src/integration_tests/mod.rs
index 661d2c5d3d35..e4339a9ff84e 100644
--- a/client/executor/src/integration_tests/mod.rs
+++ b/client/executor/src/integration_tests/mod.rs
@@ -477,8 +477,8 @@ fn offchain_index(wasm_method: WasmExecutionMethod) {
 
 	use sp_core::offchain::storage::OffchainOverlayedChange;
 	assert_eq!(
-		ext.ext()
-			.get_offchain_storage_changes()
+		ext.overlayed_changes()
+			.offchain_overlay()
 			.get(sp_core::offchain::STORAGE_PREFIX, b"k"),
 		Some(OffchainOverlayedChange::SetValue(b"v".to_vec()))
 	);
diff --git a/client/light/src/call_executor.rs b/client/light/src/call_executor.rs
index 7115f24a77d6..8b403823b0ee 100644
--- a/client/light/src/call_executor.rs
+++ b/client/light/src/call_executor.rs
@@ -25,7 +25,6 @@ use std::{
 use codec::{Encode, Decode};
 use sp_core::{
 	convert_hash, NativeOrEncoded, traits::{CodeExecutor, SpawnNamed},
-	offchain::storage::OffchainOverlayedChanges,
 };
 use sp_runtime::{
 	generic::BlockId, traits::{One, Block as BlockT, Header as HeaderT, HashFor},
@@ -113,7 +112,6 @@ impl<Block, B, Local> CallExecutor<Block> for
 		method: &str,
 		call_data: &[u8],
 		changes: &RefCell<OverlayedChanges>,
-		offchain_changes: &RefCell<OffchainOverlayedChanges>,
 		_: Option<&RefCell<StorageTransactionCache<Block, B::State>>>,
 		initialize_block: InitializeBlock<'a, Block>,
 		_manager: ExecutionManager<EM>,
@@ -140,7 +138,6 @@ impl<Block, B, Local> CallExecutor<Block> for
 				method,
 				call_data,
 				changes,
-				offchain_changes,
 				None,
 				initialize_block,
 				ExecutionManager::NativeWhenPossible,
diff --git a/client/offchain/Cargo.toml b/client/offchain/Cargo.toml
index 0f19caf7395b..7d0f01a0c7ed 100644
--- a/client/offchain/Cargo.toml
+++ b/client/offchain/Cargo.toml
@@ -37,10 +37,12 @@ hyper = "0.13.9"
 hyper-rustls = "0.21.0"
 
 [dev-dependencies]
-sc-client-db = { version = "0.8.0", default-features = true, path = "../db/" }
+sc-client-db = { version = "0.8.0", default-features = true, path = "../db" }
+sc-block-builder = { version = "0.8.0", path = "../block-builder" }
 sc-transaction-pool = { version = "2.0.0", path = "../transaction-pool" }
 sp-transaction-pool = { version = "2.0.0", path = "../../primitives/transaction-pool" }
 sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
+sp-consensus = { version = "0.8.1", path = "../../primitives/consensus/common" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 tokio = "0.2"
 lazy_static = "1.4.0"
diff --git a/client/offchain/src/lib.rs b/client/offchain/src/lib.rs
index 767d2ac5a12d..12b5093d476b 100644
--- a/client/offchain/src/lib.rs
+++ b/client/offchain/src/lib.rs
@@ -60,7 +60,7 @@ pub use sp_offchain::{OffchainWorkerApi, STORAGE_PREFIX};
 pub trait NetworkProvider: NetworkStateInfo {
 	/// Set the authorized peers.
 	fn set_authorized_peers(&self, peers: HashSet<PeerId>);
-	
+
 	/// Set the authorized only flag.
 	fn set_authorized_only(&self, reserved_only: bool);
 }
@@ -238,9 +238,15 @@ mod tests {
 	use super::*;
 	use std::sync::Arc;
 	use sc_network::{Multiaddr, PeerId};
-	use substrate_test_runtime_client::{TestClient, runtime::Block};
+	use substrate_test_runtime_client::{
+		TestClient, runtime::Block, TestClientBuilderExt,
+		DefaultTestClientBuilderExt, ClientBlockImportExt,
+	};
 	use sc_transaction_pool::{BasicPool, FullChainApi};
 	use sp_transaction_pool::{TransactionPool, InPoolTransaction};
+	use sp_consensus::BlockOrigin;
+	use sc_client_api::Backend as _;
+	use sc_block_builder::BlockBuilderProvider as _;
 
 	struct TestNetwork();
 
@@ -307,4 +313,41 @@ mod tests {
 		assert_eq!(pool.0.status().ready, 1);
 		assert_eq!(pool.0.ready().next().unwrap().is_propagable(), false);
 	}
+
+	#[test]
+	fn offchain_index_set_and_clear_works() {
+		sp_tracing::try_init_simple();
+
+		let (client, backend) =
+			substrate_test_runtime_client::TestClientBuilder::new()
+				.enable_offchain_indexing_api()
+				.build_with_backend();
+		let mut client = Arc::new(client);
+		let offchain_db = backend.offchain_storage().unwrap();
+
+		let key = &b"hello"[..];
+		let value = &b"world"[..];
+		let mut block_builder = client.new_block(Default::default()).unwrap();
+		block_builder.push(
+			substrate_test_runtime_client::runtime::Extrinsic::OffchainIndexSet(
+				key.to_vec(),
+				value.to_vec(),
+			),
+		).unwrap();
+
+		let block = block_builder.build().unwrap().block;
+		client.import(BlockOrigin::Own, block).unwrap();
+
+		assert_eq!(value, &offchain_db.get(sp_offchain::STORAGE_PREFIX, &key).unwrap());
+
+		let mut block_builder = client.new_block(Default::default()).unwrap();
+		block_builder.push(
+			substrate_test_runtime_client::runtime::Extrinsic::OffchainIndexClear(key.to_vec()),
+		).unwrap();
+
+		let block = block_builder.build().unwrap().block;
+		client.import(BlockOrigin::Own, block).unwrap();
+
+		assert!(offchain_db.get(sp_offchain::STORAGE_PREFIX, &key).is_none());
+	}
 }
diff --git a/client/service/src/client/call_executor.rs b/client/service/src/client/call_executor.rs
index d6f04d702704..cc196f67a37a 100644
--- a/client/service/src/client/call_executor.rs
+++ b/client/service/src/client/call_executor.rs
@@ -29,7 +29,6 @@ use sc_executor::{RuntimeVersion, RuntimeInfo, NativeVersion};
 use sp_externalities::Extensions;
 use sp_core::{
 	NativeOrEncoded, NeverNativeValue, traits::{CodeExecutor, SpawnNamed, RuntimeCode},
-	offchain::storage::OffchainOverlayedChanges,
 };
 use sp_api::{ProofRecorder, InitializeBlock, StorageTransactionCache};
 use sc_client_api::{backend, call_executor::CallExecutor};
@@ -127,11 +126,6 @@ where
 		extensions: Option<Extensions>,
 	) -> sp_blockchain::Result<Vec<u8>> {
 		let mut changes = OverlayedChanges::default();
-		let mut offchain_changes = if self.client_config.offchain_indexing_api {
-			OffchainOverlayedChanges::enabled()
-		} else {
-			OffchainOverlayedChanges::disabled()
-		};
 		let changes_trie = backend::changes_tries_state_at_block(
 			id, self.backend.changes_trie_storage()
 		)?;
@@ -145,7 +139,6 @@ where
 			&state,
 			changes_trie,
 			&mut changes,
-			&mut offchain_changes,
 			&self.executor,
 			method,
 			call_data,
@@ -176,7 +169,6 @@ where
 		method: &str,
 		call_data: &[u8],
 		changes: &RefCell<OverlayedChanges>,
-		offchain_changes: &RefCell<OffchainOverlayedChanges>,
 		storage_transaction_cache: Option<&RefCell<
 			StorageTransactionCache<Block, B::State>
 		>>,
@@ -201,7 +193,6 @@ where
 		let mut state = self.backend.state_at(*at)?;
 
 		let changes = &mut *changes.borrow_mut();
-		let offchain_changes = &mut *offchain_changes.borrow_mut();
 
 		match recorder {
 			Some(recorder) => {
@@ -213,7 +204,6 @@ where
 				let state_runtime_code = sp_state_machine::backend::BackendRuntimeCode::new(&trie_state);
 				// It is important to extract the runtime code here before we create the proof
 				// recorder.
-				
 				let runtime_code = state_runtime_code.runtime_code()
 					.map_err(sp_blockchain::Error::RuntimeCode)?;
 				let runtime_code = self.check_override(runtime_code, at)?;
@@ -227,7 +217,6 @@ where
 					&backend,
 					changes_trie_state,
 					changes,
-					offchain_changes,
 					&self.executor,
 					method,
 					call_data,
@@ -249,7 +238,6 @@ where
 					&state,
 					changes_trie_state,
 					changes,
-					offchain_changes,
 					&self.executor,
 					method,
 					call_data,
@@ -264,7 +252,6 @@ where
 
 	fn runtime_version(&self, id: &BlockId<Block>) -> sp_blockchain::Result<RuntimeVersion> {
 		let mut overlay = OverlayedChanges::default();
-		let mut offchain_overlay = OffchainOverlayedChanges::default();
 		let changes_trie_state = backend::changes_tries_state_at_block(
 			id,
 			self.backend.changes_trie_storage(),
@@ -273,7 +260,6 @@ where
 		let mut cache = StorageTransactionCache::<Block, B::State>::default();
 		let mut ext = Ext::new(
 			&mut overlay,
-			&mut offchain_overlay,
 			&mut cache,
 			&state,
 			changes_trie_state,
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index d52a3666db85..f337452e9dc8 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -1654,7 +1654,6 @@ impl<B, E, Block, RA> CallApiAt<Block> for Client<B, E, Block, RA> where
 			params.function,
 			&params.arguments,
 			params.overlayed_changes,
-			params.offchain_changes,
 			Some(params.storage_transaction_cache),
 			params.initialize_block,
 			manager,
diff --git a/client/service/test/src/client/light.rs b/client/service/test/src/client/light.rs
index 201b24a6efa2..b6287741fdf3 100644
--- a/client/service/test/src/client/light.rs
+++ b/client/service/test/src/client/light.rs
@@ -36,7 +36,7 @@ use parking_lot::Mutex;
 use substrate_test_runtime_client::{
 	runtime::{Hash, Block, Header}, TestClient, ClientBlockImportExt,
 };
-use sp_api::{InitializeBlock, StorageTransactionCache, ProofRecorder, OffchainOverlayedChanges};
+use sp_api::{InitializeBlock, StorageTransactionCache, ProofRecorder};
 use sp_consensus::BlockOrigin;
 use sc_executor::{NativeExecutor, WasmExecutionMethod, RuntimeVersion, NativeVersion};
 use sp_core::{H256, NativeOrEncoded, testing::TaskExecutor};
@@ -223,7 +223,6 @@ impl CallExecutor<Block> for DummyCallExecutor {
 		_method: &str,
 		_call_data: &[u8],
 		_changes: &RefCell<OverlayedChanges>,
-		_offchain_changes: &RefCell<OffchainOverlayedChanges>,
 		_storage_transaction_cache: Option<&RefCell<
 			StorageTransactionCache<
 				Block,
diff --git a/client/service/test/src/client/mod.rs b/client/service/test/src/client/mod.rs
index 9712e84e6049..7498289c7be1 100644
--- a/client/service/test/src/client/mod.rs
+++ b/client/service/test/src/client/mod.rs
@@ -41,7 +41,7 @@ use sp_runtime::traits::{
 };
 use substrate_test_runtime::TestAPI;
 use sp_state_machine::backend::Backend as _;
-use sp_api::{ProvideRuntimeApi, OffchainOverlayedChanges};
+use sp_api::ProvideRuntimeApi;
 use sp_core::{H256, ChangesTrieConfiguration, blake2_256, testing::TaskExecutor};
 use std::collections::{HashMap, HashSet};
 use std::sync::Arc;
@@ -163,7 +163,6 @@ fn construct_block(
 	};
 	let hash = header.hash();
 	let mut overlay = OverlayedChanges::default();
-	let mut offchain_overlay = OffchainOverlayedChanges::default();
 	let backend_runtime_code = sp_state_machine::backend::BackendRuntimeCode::new(&backend);
 	let runtime_code = backend_runtime_code.runtime_code().expect("Code is part of the backend");
 	let task_executor = Box::new(TaskExecutor::new());
@@ -172,7 +171,6 @@ fn construct_block(
 		backend,
 		sp_state_machine::disabled_changes_trie_state::<_, u64>(),
 		&mut overlay,
-		&mut offchain_overlay,
 		&executor(),
 		"Core_initialize_block",
 		&header.encode(),
@@ -188,7 +186,6 @@ fn construct_block(
 			backend,
 			sp_state_machine::disabled_changes_trie_state::<_, u64>(),
 			&mut overlay,
-			&mut offchain_overlay,
 			&executor(),
 			"BlockBuilder_apply_extrinsic",
 			&tx.encode(),
@@ -204,7 +201,6 @@ fn construct_block(
 		backend,
 		sp_state_machine::disabled_changes_trie_state::<_, u64>(),
 		&mut overlay,
-		&mut offchain_overlay,
 		&executor(),
 		"BlockBuilder_finalize_block",
 		&[],
@@ -252,13 +248,11 @@ fn construct_genesis_should_work_with_native() {
 	let runtime_code = backend_runtime_code.runtime_code().expect("Code is part of the backend");
 
 	let mut overlay = OverlayedChanges::default();
-	let mut offchain_overlay = OffchainOverlayedChanges::default();
 
 	let _ = StateMachine::new(
 		&backend,
 		sp_state_machine::disabled_changes_trie_state::<_, u64>(),
 		&mut overlay,
-		&mut offchain_overlay,
 		&executor(),
 		"Core_execute_block",
 		&b1data,
@@ -288,13 +282,11 @@ fn construct_genesis_should_work_with_wasm() {
 	let runtime_code = backend_runtime_code.runtime_code().expect("Code is part of the backend");
 
 	let mut overlay = OverlayedChanges::default();
-	let mut offchain_overlay = OffchainOverlayedChanges::default();
 
 	let _ = StateMachine::new(
 		&backend,
 		sp_state_machine::disabled_changes_trie_state::<_, u64>(),
 		&mut overlay,
-		&mut offchain_overlay,
 		&executor(),
 		"Core_execute_block",
 		&b1data,
@@ -324,13 +316,11 @@ fn construct_genesis_with_bad_transaction_should_panic() {
 	let runtime_code = backend_runtime_code.runtime_code().expect("Code is part of the backend");
 
 	let mut overlay = OverlayedChanges::default();
-	let mut offchain_overlay = OffchainOverlayedChanges::default();
 
 	let r = StateMachine::new(
 		&backend,
 		sp_state_machine::disabled_changes_trie_state::<_, u64>(),
 		&mut overlay,
-		&mut offchain_overlay,
 		&executor(),
 		"Core_execute_block",
 		&b1data,
diff --git a/primitives/api/proc-macro/src/decl_runtime_apis.rs b/primitives/api/proc-macro/src/decl_runtime_apis.rs
index 7c6f95c926dc..62ea5ed32b5b 100644
--- a/primitives/api/proc-macro/src/decl_runtime_apis.rs
+++ b/primitives/api/proc-macro/src/decl_runtime_apis.rs
@@ -409,7 +409,6 @@ fn generate_call_api_at_calls(decl: &ItemTrait) -> Result<TokenStream> {
 				at: &#crate_::BlockId<Block>,
 				args: Vec<u8>,
 				changes: &std::cell::RefCell<#crate_::OverlayedChanges>,
-				offchain_changes: &std::cell::RefCell<#crate_::OffchainOverlayedChanges>,
 				storage_transaction_cache: &std::cell::RefCell<
 					#crate_::StorageTransactionCache<Block, T::StateBackend>
 				>,
@@ -439,7 +438,6 @@ fn generate_call_api_at_calls(decl: &ItemTrait) -> Result<TokenStream> {
 							native_call: None,
 							arguments: args,
 							overlayed_changes: changes,
-							offchain_changes,
 							storage_transaction_cache,
 							initialize_block,
 							context,
@@ -460,7 +458,6 @@ fn generate_call_api_at_calls(decl: &ItemTrait) -> Result<TokenStream> {
 					native_call,
 					arguments: args,
 					overlayed_changes: changes,
-					offchain_changes,
 					storage_transaction_cache,
 					initialize_block,
 					context,
diff --git a/primitives/api/proc-macro/src/impl_runtime_apis.rs b/primitives/api/proc-macro/src/impl_runtime_apis.rs
index d44792ef7737..8a057383efaa 100644
--- a/primitives/api/proc-macro/src/impl_runtime_apis.rs
+++ b/primitives/api/proc-macro/src/impl_runtime_apis.rs
@@ -208,7 +208,6 @@ fn generate_runtime_api_base_structures() -> Result<TokenStream> {
 			commit_on_success: std::cell::RefCell<bool>,
 			initialized_block: std::cell::RefCell<Option<#crate_::BlockId<Block>>>,
 			changes: std::cell::RefCell<#crate_::OverlayedChanges>,
-			offchain_changes: std::cell::RefCell<#crate_::OffchainOverlayedChanges>,
 			storage_transaction_cache: std::cell::RefCell<
 				#crate_::StorageTransactionCache<Block, C::StateBackend>
 			>,
@@ -338,7 +337,6 @@ fn generate_runtime_api_base_structures() -> Result<TokenStream> {
 					commit_on_success: true.into(),
 					initialized_block: None.into(),
 					changes: Default::default(),
-					offchain_changes: Default::default(),
 					recorder: Default::default(),
 					storage_transaction_cache: Default::default(),
 				}.into()
@@ -357,7 +355,6 @@ fn generate_runtime_api_base_structures() -> Result<TokenStream> {
 					&C,
 					&Self,
 					&std::cell::RefCell<#crate_::OverlayedChanges>,
-					&std::cell::RefCell<#crate_::OffchainOverlayedChanges>,
 					&std::cell::RefCell<#crate_::StorageTransactionCache<Block, C::StateBackend>>,
 					&std::cell::RefCell<Option<#crate_::BlockId<Block>>>,
 					&Option<#crate_::ProofRecorder<Block>>,
@@ -374,7 +371,6 @@ fn generate_runtime_api_base_structures() -> Result<TokenStream> {
 					&self.call,
 					self,
 					&self.changes,
-					&self.offchain_changes,
 					&self.storage_transaction_cache,
 					&self.initialized_block,
 					&self.recorder,
@@ -531,7 +527,6 @@ impl<'a> Fold for ApiRuntimeImplToApiRuntimeApiImpl<'a> {
 							call_runtime_at,
 							core_api,
 							changes,
-							offchain_changes,
 							storage_transaction_cache,
 							initialized_block,
 							recorder
@@ -542,7 +537,6 @@ impl<'a> Fold for ApiRuntimeImplToApiRuntimeApiImpl<'a> {
 								at,
 								params_encoded,
 								changes,
-								offchain_changes,
 								storage_transaction_cache,
 								initialized_block,
 								params.map(|p| {
diff --git a/primitives/api/src/lib.rs b/primitives/api/src/lib.rs
index 265439bf37ad..8ce447c0d366 100644
--- a/primitives/api/src/lib.rs
+++ b/primitives/api/src/lib.rs
@@ -47,8 +47,6 @@ pub use sp_core::NativeOrEncoded;
 #[doc(hidden)]
 #[cfg(feature = "std")]
 pub use hash_db::Hasher;
-#[cfg(feature = "std")]
-pub use sp_core::offchain::storage::OffchainOverlayedChanges;
 #[doc(hidden)]
 #[cfg(not(feature = "std"))]
 pub use sp_core::to_substrate_wasm_fn_return_value;
@@ -521,8 +519,6 @@ pub struct CallApiAtParams<'a, Block: BlockT, C, NC, Backend: StateBackend<HashF
 	pub arguments: Vec<u8>,
 	/// The overlayed changes that are on top of the state.
 	pub overlayed_changes: &'a RefCell<OverlayedChanges>,
-	/// The overlayed changes to be applied to the offchain worker database.
-	pub offchain_changes: &'a RefCell<OffchainOverlayedChanges>,
 	/// The cache for storage transactions.
 	pub storage_transaction_cache: &'a RefCell<StorageTransactionCache<Block, Backend>>,
 	/// Determines if the function requires that `initialize_block` should be called before calling
diff --git a/primitives/core/src/offchain/storage.rs b/primitives/core/src/offchain/storage.rs
index ec6f91e6a5ae..a47361d88e76 100644
--- a/primitives/core/src/offchain/storage.rs
+++ b/primitives/core/src/offchain/storage.rs
@@ -41,7 +41,7 @@ impl InMemOffchainStorage {
 	/// Remove a key and its associated value from the offchain database.
 	pub fn remove(&mut self, prefix: &[u8], key: &[u8]) {
 		let key: Vec<u8> = prefix.iter().chain(key).cloned().collect();
-		let _ = self.storage.remove(&key);
+		self.storage.remove(&key);
 	}
 }
 
@@ -84,9 +84,6 @@ impl OffchainStorage for InMemOffchainStorage {
 	}
 }
 
-
-
-
 /// Change to be applied to the offchain worker db in regards to a key.
 #[derive(Debug,Clone,Hash,Eq,PartialEq)]
 pub enum OffchainOverlayedChange {
@@ -97,161 +94,47 @@ pub enum OffchainOverlayedChange {
 }
 
 /// In-memory storage for offchain workers recoding changes for the actual offchain storage implementation.
-#[derive(Debug, Clone)]
-pub enum OffchainOverlayedChanges {
-	/// Writing overlay changes to the offchain worker database is disabled by configuration.
-	Disabled,
-	/// Overlay changes can be recorded using the inner collection of this variant,
-	/// where the identifier is the tuple of `(prefix, key)`.
-	Enabled(HashMap<(Vec<u8>, Vec<u8>), OffchainOverlayedChange>),
-}
-
-impl Default for OffchainOverlayedChanges {
-	fn default() -> Self {
-		Self::Disabled
-	}
+#[derive(Debug, Clone, Default)]
+pub struct OffchainOverlayedChanges {
+	changes: HashMap<(Vec<u8>, Vec<u8>), OffchainOverlayedChange>,
 }
 
 impl OffchainOverlayedChanges {
-	/// Create the disabled variant.
-	pub fn disabled() -> Self {
-		Self::Disabled
-	}
-
-	/// Create the enabled variant.
-	pub fn enabled() -> Self {
-		Self::Enabled(HashMap::new())
-	}
-
 	/// Consume the offchain storage and iterate over all key value pairs.
-	pub fn into_iter(self) -> OffchainOverlayedChangesIntoIter {
-		OffchainOverlayedChangesIntoIter::new(self)
+	pub fn into_iter(self) -> impl Iterator<Item = ((Vec<u8>, Vec<u8>), OffchainOverlayedChange)> {
+		self.changes.into_iter()
 	}
 
 	/// Iterate over all key value pairs by reference.
-	pub fn iter<'a>(&'a self) -> OffchainOverlayedChangesIter {
-		OffchainOverlayedChangesIter::new(&self)
+	pub fn iter(&self) -> impl Iterator<Item = (&(Vec<u8>, Vec<u8>), &OffchainOverlayedChange)> {
+		self.changes.iter()
 	}
 
 	/// Drain all elements of changeset.
-	pub fn drain<'a, 'd>(&'a mut self) -> OffchainOverlayedChangesDrain<'d> where 'a: 'd {
-		OffchainOverlayedChangesDrain::new(self)
+	pub fn drain(&mut self) -> impl Iterator<Item = ((Vec<u8>, Vec<u8>), OffchainOverlayedChange)> + '_ {
+		self.changes.drain()
 	}
 
 	/// Remove a key and its associated value from the offchain database.
 	pub fn remove(&mut self, prefix: &[u8], key: &[u8]) {
-		if let Self::Enabled(ref mut storage) = self {
-			let _ = storage.insert((prefix.to_vec(), key.to_vec()), OffchainOverlayedChange::Remove);
-		}
+		self.changes.insert((prefix.to_vec(), key.to_vec()), OffchainOverlayedChange::Remove);
 	}
 
 	/// Set the value associated with a key under a prefix to the value provided.
 	pub fn set(&mut self, prefix: &[u8], key: &[u8], value: &[u8]) {
-		if let Self::Enabled(ref mut storage) = self {
-			let _ = storage.insert((prefix.to_vec(), key.to_vec()), OffchainOverlayedChange::SetValue(value.to_vec()));
-		}
+		self.changes.insert(
+			(prefix.to_vec(), key.to_vec()),
+			OffchainOverlayedChange::SetValue(value.to_vec()),
+		);
 	}
 
 	/// Obtain a associated value to the given key in storage with prefix.
 	pub fn get(&self, prefix: &[u8], key: &[u8]) -> Option<OffchainOverlayedChange> {
-		if let Self::Enabled(ref storage) = self {
-			let key = (prefix.to_vec(), key.to_vec());
-			storage.get(&key).cloned()
-		} else {
-			None
-		}
-	}
-}
-
-use std::collections::hash_map;
-
-/// Iterate by reference over the prepared offchain worker storage changes.
-pub struct OffchainOverlayedChangesIter<'i> {
-	inner: Option<hash_map::Iter<'i, (Vec<u8>, Vec<u8>), OffchainOverlayedChange>>,
-}
-
-impl<'i> Iterator for OffchainOverlayedChangesIter<'i> {
-	type Item = (&'i (Vec<u8>, Vec<u8>), &'i OffchainOverlayedChange);
-	fn next(&mut self) -> Option<Self::Item> {
-		if let Some(ref mut iter) = self.inner {
-			iter.next()
-		} else {
-			None
-		}
-	}
-}
-
-impl<'i> OffchainOverlayedChangesIter<'i> {
-	/// Create a new iterator based on a refernce to the parent container.
-	pub fn new(container: &'i OffchainOverlayedChanges) -> Self {
-		match container {
-			OffchainOverlayedChanges::Enabled(inner) => Self {
-				inner: Some(inner.iter())
-			},
-			OffchainOverlayedChanges::Disabled => Self { inner: None, },
-		}
-	}
-}
-
-
-/// Iterate by value over the prepared offchain worker storage changes.
-pub struct OffchainOverlayedChangesIntoIter {
-	inner: Option<hash_map::IntoIter<(Vec<u8>,Vec<u8>),OffchainOverlayedChange>>,
-}
-
-impl Iterator for OffchainOverlayedChangesIntoIter {
-	type Item = ((Vec<u8>, Vec<u8>), OffchainOverlayedChange);
-	fn next(&mut self) -> Option<Self::Item> {
-		if let Some(ref mut iter) = self.inner {
-			iter.next()
-		} else {
-			None
-		}
-	}
-}
-
-impl OffchainOverlayedChangesIntoIter {
-	/// Create a new iterator by consuming the collection.
-	pub fn new(container: OffchainOverlayedChanges) -> Self {
-		match container {
-			OffchainOverlayedChanges::Enabled(inner) => Self {
-				inner: Some(inner.into_iter())
-			},
-			OffchainOverlayedChanges::Disabled => Self { inner: None, },
-		}
-	}
-}
-
-/// Iterate over all items while draining them from the collection.
-pub struct OffchainOverlayedChangesDrain<'d> {
-	inner: Option<hash_map::Drain<'d, (Vec<u8>, Vec<u8>), OffchainOverlayedChange>>,
-}
-
-impl<'d> Iterator for OffchainOverlayedChangesDrain<'d> {
-	type Item = ((Vec<u8>, Vec<u8>), OffchainOverlayedChange);
-	fn next(&mut self) -> Option<Self::Item> {
-		if let Some(ref mut iter) = self.inner {
-			iter.next()
-		} else {
-			None
-		}
+		let key = (prefix.to_vec(), key.to_vec());
+		self.changes.get(&key).cloned()
 	}
 }
 
-impl<'d> OffchainOverlayedChangesDrain<'d> {
-	/// Create a new iterator by taking a mut reference to the collection,
-	/// for the lifetime of the created drain iterator.
-	pub fn new(container: &'d mut OffchainOverlayedChanges) -> Self {
-		match container {
-			OffchainOverlayedChanges::Enabled(ref mut inner) => Self {
-				inner: Some(inner.drain())
-			},
-			OffchainOverlayedChanges::Disabled => Self { inner: None, },
-		}
-	}
-}
-
-
 #[cfg(test)]
 mod test {
 	use super::*;
@@ -259,7 +142,7 @@ mod test {
 
 	#[test]
 	fn test_drain() {
-		let mut ooc = OffchainOverlayedChanges::enabled();
+		let mut ooc = OffchainOverlayedChanges::default();
 		ooc.set(STORAGE_PREFIX,b"kkk", b"vvv");
 		let drained = ooc.drain().count();
 		assert_eq!(drained, 1);
@@ -276,7 +159,7 @@ mod test {
 
 	#[test]
 	fn test_accumulated_set_remove_set() {
-		let mut ooc = OffchainOverlayedChanges::enabled();
+		let mut ooc = OffchainOverlayedChanges::default();
 		ooc.set(STORAGE_PREFIX, b"ppp", b"qqq");
 		ooc.remove(STORAGE_PREFIX, b"ppp");
 		// keys are equiv, so it will overwrite the value and the overlay will contain
diff --git a/primitives/state-machine/src/ext.rs b/primitives/state-machine/src/ext.rs
index 3321f0561fa1..c872b4eaf746 100644
--- a/primitives/state-machine/src/ext.rs
+++ b/primitives/state-machine/src/ext.rs
@@ -35,8 +35,6 @@ use codec::{Decode, Encode, EncodeAppend};
 use sp_std::{fmt, any::{Any, TypeId}, vec::Vec, vec, boxed::Box};
 use crate::{warn, trace, log_error};
 #[cfg(feature = "std")]
-use sp_core::offchain::storage::OffchainOverlayedChanges;
-#[cfg(feature = "std")]
 use crate::changes_trie::State as ChangesTrieState;
 use crate::StorageTransactionCache;
 #[cfg(feature = "std")]
@@ -100,9 +98,6 @@ pub struct Ext<'a, H, N, B>
 {
 	/// The overlayed changes to write to.
 	overlay: &'a mut OverlayedChanges,
-	/// The overlayed changes destined for the Offchain DB.
-	#[cfg(feature = "std")]
-	offchain_overlay: &'a mut OffchainOverlayedChanges,
 	/// The storage backend to read from.
 	backend: &'a B,
 	/// The cache for the storage transactions.
@@ -146,7 +141,6 @@ impl<'a, H, N, B> Ext<'a, H, N, B>
 	#[cfg(feature = "std")]
 	pub fn new(
 		overlay: &'a mut OverlayedChanges,
-		offchain_overlay: &'a mut OffchainOverlayedChanges,
 		storage_transaction_cache: &'a mut StorageTransactionCache<B::Transaction, H, N>,
 		backend: &'a B,
 		changes_trie_state: Option<ChangesTrieState<'a, H, N>>,
@@ -154,7 +148,6 @@ impl<'a, H, N, B> Ext<'a, H, N, B>
 	) -> Self {
 		Self {
 			overlay,
-			offchain_overlay,
 			backend,
 			changes_trie_state,
 			storage_transaction_cache,
@@ -170,12 +163,6 @@ impl<'a, H, N, B> Ext<'a, H, N, B>
 	fn mark_dirty(&mut self) {
 		self.storage_transaction_cache.reset();
 	}
-
-	/// Read only accessor for the scheduled overlay changes.
-	#[cfg(feature = "std")]
-	pub fn get_offchain_storage_changes(&self) -> &OffchainOverlayedChanges {
-		&*self.offchain_overlay
-	}
 }
 
 #[cfg(test)]
@@ -208,10 +195,10 @@ where
 {
 	#[cfg(feature = "std")]
 	fn set_offchain_storage(&mut self, key: &[u8], value: Option<&[u8]>) {
-		use ::sp_core::offchain::STORAGE_PREFIX;
+		use sp_core::offchain::STORAGE_PREFIX;
 		match value {
-			Some(value) => self.offchain_overlay.set(STORAGE_PREFIX, key, value),
-			None => self.offchain_overlay.remove(STORAGE_PREFIX, key),
+			Some(value) => self.overlay.offchain_set_storage(STORAGE_PREFIX, key, value),
+			None => self.overlay.offchain_remove_storage(STORAGE_PREFIX, key),
 		}
 	}
 
@@ -829,11 +816,9 @@ mod tests {
 		changes
 	}
 
-	fn prepare_offchain_overlay_with_changes() -> OffchainOverlayedChanges {
-		let mut ooc = OffchainOverlayedChanges::enabled();
-		ooc.set(offchain::STORAGE_PREFIX, b"k1", b"v1");
-		ooc.set(offchain::STORAGE_PREFIX, b"k2", b"v2");
-		ooc
+	fn prepare_offchain_overlay_with_changes(overlay: &mut OverlayedChanges) {
+		overlay.offchain_set_storage(offchain::STORAGE_PREFIX, b"k1", b"v1");
+		overlay.offchain_set_storage(offchain::STORAGE_PREFIX, b"k2", b"v2");
 	}
 
 	fn changes_trie_config() -> ChangesTrieConfiguration {
@@ -846,32 +831,30 @@ mod tests {
 	#[test]
 	fn storage_changes_root_is_none_when_storage_is_not_provided() {
 		let mut overlay = prepare_overlay_with_changes();
-		let mut offchain_overlay = prepare_offchain_overlay_with_changes();
 		let mut cache = StorageTransactionCache::default();
 		let backend = TestBackend::default();
-		let mut ext = TestExt::new(&mut overlay, &mut offchain_overlay, &mut cache, &backend, None, None);
+		let mut ext = TestExt::new(&mut overlay, &mut cache, &backend, None, None);
 		assert_eq!(ext.storage_changes_root(&H256::default().encode()).unwrap(), None);
 	}
 
 	#[test]
 	fn storage_changes_root_is_none_when_state_is_not_provided() {
 		let mut overlay = prepare_overlay_with_changes();
-		let mut offchain_overlay = prepare_offchain_overlay_with_changes();
 		let mut cache = StorageTransactionCache::default();
 		let backend = TestBackend::default();
-		let mut ext = TestExt::new(&mut overlay, &mut offchain_overlay, &mut cache, &backend, None, None);
+		let mut ext = TestExt::new(&mut overlay, &mut cache, &backend, None, None);
 		assert_eq!(ext.storage_changes_root(&H256::default().encode()).unwrap(), None);
 	}
 
 	#[test]
 	fn storage_changes_root_is_some_when_extrinsic_changes_are_non_empty() {
 		let mut overlay = prepare_overlay_with_changes();
-		let mut offchain_overlay = prepare_offchain_overlay_with_changes();
+		prepare_offchain_overlay_with_changes(&mut overlay);
 		let mut cache = StorageTransactionCache::default();
 		let storage = TestChangesTrieStorage::with_blocks(vec![(99, Default::default())]);
 		let state = Some(ChangesTrieState::new(changes_trie_config(), Zero::zero(), &storage));
 		let backend = TestBackend::default();
-		let mut ext = TestExt::new(&mut overlay, &mut offchain_overlay, &mut cache, &backend, state, None);
+		let mut ext = TestExt::new(&mut overlay, &mut cache, &backend, state, None);
 		assert_eq!(
 			ext.storage_changes_root(&H256::default().encode()).unwrap(),
 			Some(hex!("bb0c2ef6e1d36d5490f9766cfcc7dfe2a6ca804504c3bb206053890d6dd02376").to_vec()),
@@ -881,14 +864,14 @@ mod tests {
 	#[test]
 	fn storage_changes_root_is_some_when_extrinsic_changes_are_empty() {
 		let mut overlay = prepare_overlay_with_changes();
-		let mut offchain_overlay = prepare_offchain_overlay_with_changes();
+		prepare_offchain_overlay_with_changes(&mut overlay);
 		let mut cache = StorageTransactionCache::default();
 		overlay.set_collect_extrinsics(false);
 		overlay.set_storage(vec![1], None);
 		let storage = TestChangesTrieStorage::with_blocks(vec![(99, Default::default())]);
 		let state = Some(ChangesTrieState::new(changes_trie_config(), Zero::zero(), &storage));
 		let backend = TestBackend::default();
-		let mut ext = TestExt::new(&mut overlay, &mut offchain_overlay, &mut cache, &backend, state, None);
+		let mut ext = TestExt::new(&mut overlay, &mut cache, &backend, state, None);
 		assert_eq!(
 			ext.storage_changes_root(&H256::default().encode()).unwrap(),
 			Some(hex!("96f5aae4690e7302737b6f9b7f8567d5bbb9eac1c315f80101235a92d9ec27f4").to_vec()),
@@ -901,7 +884,7 @@ mod tests {
 		let mut overlay = OverlayedChanges::default();
 		overlay.set_storage(vec![20], None);
 		overlay.set_storage(vec![30], Some(vec![31]));
-		let mut offchain_overlay = prepare_offchain_overlay_with_changes();
+		prepare_offchain_overlay_with_changes(&mut overlay);
 		let backend = Storage {
 			top: map![
 				vec![10] => vec![10],
@@ -911,7 +894,7 @@ mod tests {
 			children_default: map![]
 		}.into();
 
-		let ext = TestExt::new(&mut overlay, &mut offchain_overlay, &mut cache, &backend, None, None);
+		let ext = TestExt::new(&mut overlay, &mut cache, &backend, None, None);
 
 		// next_backend < next_overlay
 		assert_eq!(ext.next_storage_key(&[5]), Some(vec![10]));
@@ -927,7 +910,7 @@ mod tests {
 
 		drop(ext);
 		overlay.set_storage(vec![50], Some(vec![50]));
-		let ext = TestExt::new(&mut overlay, &mut offchain_overlay, &mut cache, &backend, None, None);
+		let ext = TestExt::new(&mut overlay, &mut cache, &backend, None, None);
 
 		// next_overlay exist but next_backend doesn't exist
 		assert_eq!(ext.next_storage_key(&[40]), Some(vec![50]));
@@ -956,10 +939,9 @@ mod tests {
 			],
 		}.into();
 
+		prepare_offchain_overlay_with_changes(&mut overlay);
 
-		let mut offchain_overlay = prepare_offchain_overlay_with_changes();
-
-		let ext = TestExt::new(&mut overlay, &mut offchain_overlay, &mut cache, &backend, None, None);
+		let ext = TestExt::new(&mut overlay, &mut cache, &backend, None, None);
 
 		// next_backend < next_overlay
 		assert_eq!(ext.next_child_storage_key(child_info, &[5]), Some(vec![10]));
@@ -975,7 +957,7 @@ mod tests {
 
 		drop(ext);
 		overlay.set_child_storage(child_info, vec![50], Some(vec![50]));
-		let ext = TestExt::new(&mut overlay, &mut offchain_overlay, &mut cache, &backend, None, None);
+		let ext = TestExt::new(&mut overlay, &mut cache, &backend, None, None);
 
 		// next_overlay exist but next_backend doesn't exist
 		assert_eq!(ext.next_child_storage_key(child_info, &[40]), Some(vec![50]));
@@ -989,7 +971,7 @@ mod tests {
 		let mut overlay = OverlayedChanges::default();
 		overlay.set_child_storage(child_info, vec![20], None);
 		overlay.set_child_storage(child_info, vec![30], Some(vec![31]));
-		let mut offchain_overlay = prepare_offchain_overlay_with_changes();
+		prepare_offchain_overlay_with_changes(&mut overlay);
 		let backend = Storage {
 			top: map![],
 			children_default: map![
@@ -1004,7 +986,7 @@ mod tests {
 			],
 		}.into();
 
-		let ext = TestExt::new(&mut overlay, &mut offchain_overlay, &mut cache, &backend, None, None);
+		let ext = TestExt::new(&mut overlay, &mut cache, &backend, None, None);
 
 		assert_eq!(ext.child_storage(child_info, &[10]), Some(vec![10]));
 		assert_eq!(
@@ -1031,7 +1013,7 @@ mod tests {
 		let child_info = &child_info;
 		let mut cache = StorageTransactionCache::default();
 		let mut overlay = OverlayedChanges::default();
-		let mut offchain_overlay = prepare_offchain_overlay_with_changes();
+		prepare_offchain_overlay_with_changes(&mut overlay);
 		let backend = Storage {
 			top: map![],
 			children_default: map![
@@ -1044,7 +1026,7 @@ mod tests {
 			],
 		}.into();
 
-		let ext = TestExt::new(&mut overlay, &mut offchain_overlay, &mut cache, &backend, None, None);
+		let ext = TestExt::new(&mut overlay, &mut cache, &backend, None, None);
 
 		use sp_core::storage::well_known_keys;
 		let mut ext = ext;
diff --git a/primitives/state-machine/src/lib.rs b/primitives/state-machine/src/lib.rs
index 6d85b56f8aae..c8b4703755cb 100644
--- a/primitives/state-machine/src/lib.rs
+++ b/primitives/state-machine/src/lib.rs
@@ -172,7 +172,6 @@ mod execution {
 	use hash_db::Hasher;
 	use codec::{Decode, Encode, Codec};
 	use sp_core::{
-		offchain::storage::OffchainOverlayedChanges,
 		storage::ChildInfo, NativeOrEncoded, NeverNativeValue, hexdisplay::HexDisplay,
 		traits::{CodeExecutor, CallInWasmExt, RuntimeCode, SpawnNamed},
 	};
@@ -299,7 +298,6 @@ mod execution {
 		method: &'a str,
 		call_data: &'a [u8],
 		overlay: &'a mut OverlayedChanges,
-		offchain_overlay: &'a mut OffchainOverlayedChanges,
 		extensions: Extensions,
 		changes_trie_state: Option<ChangesTrieState<'a, H, N>>,
 		storage_transaction_cache: Option<&'a mut StorageTransactionCache<B::Transaction, H, N>>,
@@ -329,7 +327,6 @@ mod execution {
 			backend: &'a B,
 			changes_trie_state: Option<ChangesTrieState<'a, H, N>>,
 			overlay: &'a mut OverlayedChanges,
-			offchain_overlay: &'a mut OffchainOverlayedChanges,
 			exec: &'a Exec,
 			method: &'a str,
 			call_data: &'a [u8],
@@ -347,7 +344,6 @@ mod execution {
 				call_data,
 				extensions,
 				overlay,
-				offchain_overlay,
 				changes_trie_state,
 				storage_transaction_cache: None,
 				runtime_code,
@@ -407,7 +403,6 @@ mod execution {
 
 			let mut ext = Ext::new(
 				self.overlay,
-				self.offchain_overlay,
 				cache,
 				self.backend,
 				self.changes_trie_state.clone(),
@@ -621,13 +616,11 @@ mod execution {
 		N: crate::changes_trie::BlockNumber,
 		Spawn: SpawnNamed + Send + 'static,
 	{
-		let mut offchain_overlay = OffchainOverlayedChanges::default();
 		let proving_backend = proving_backend::ProvingBackend::new(trie_backend);
 		let mut sm = StateMachine::<_, H, N, Exec>::new(
 			&proving_backend,
 			None,
 			overlay,
-			&mut offchain_overlay,
 			exec,
 			method,
 			call_data,
@@ -691,12 +684,10 @@ mod execution {
 		N: crate::changes_trie::BlockNumber,
 		Spawn: SpawnNamed + Send + 'static,
 	{
-		let mut offchain_overlay = OffchainOverlayedChanges::default();
 		let mut sm = StateMachine::<_, H, N, Exec>::new(
 			trie_backend,
 			None,
 			overlay,
-			&mut offchain_overlay,
 			exec,
 			method,
 			call_data,
@@ -879,7 +870,6 @@ mod tests {
 	use std::{result, collections::HashMap};
 	use codec::Decode;
 	use sp_core::{
-		offchain::storage::OffchainOverlayedChanges,
 		storage::ChildInfo, NativeOrEncoded, NeverNativeValue,
 		traits::CodeExecutor,
 	};
@@ -966,14 +956,12 @@ mod tests {
 	fn execute_works() {
 		let backend = trie_backend::tests::test_trie();
 		let mut overlayed_changes = Default::default();
-		let mut offchain_overlayed_changes = Default::default();
 		let wasm_code = RuntimeCode::empty();
 
 		let mut state_machine = StateMachine::new(
 			&backend,
 			changes_trie::disabled_state::<_, u64>(),
 			&mut overlayed_changes,
-			&mut offchain_overlayed_changes,
 			&DummyCodeExecutor {
 				change_changes_trie_config: false,
 				native_available: true,
@@ -998,14 +986,12 @@ mod tests {
 	fn execute_works_with_native_else_wasm() {
 		let backend = trie_backend::tests::test_trie();
 		let mut overlayed_changes = Default::default();
-		let mut offchain_overlayed_changes = Default::default();
 		let wasm_code = RuntimeCode::empty();
 
 		let mut state_machine = StateMachine::new(
 			&backend,
 			changes_trie::disabled_state::<_, u64>(),
 			&mut overlayed_changes,
-			&mut offchain_overlayed_changes,
 			&DummyCodeExecutor {
 				change_changes_trie_config: false,
 				native_available: true,
@@ -1027,14 +1013,12 @@ mod tests {
 		let mut consensus_failed = false;
 		let backend = trie_backend::tests::test_trie();
 		let mut overlayed_changes = Default::default();
-		let mut offchain_overlayed_changes = Default::default();
 		let wasm_code = RuntimeCode::empty();
 
 		let mut state_machine = StateMachine::new(
 			&backend,
 			changes_trie::disabled_state::<_, u64>(),
 			&mut overlayed_changes,
-			&mut offchain_overlayed_changes,
 			&DummyCodeExecutor {
 				change_changes_trie_config: false,
 				native_available: true,
@@ -1118,11 +1102,9 @@ mod tests {
 		overlay.set_storage(b"bbd".to_vec(), Some(b"42".to_vec()));
 
 		{
-			let mut offchain_overlay = Default::default();
 			let mut cache = StorageTransactionCache::default();
 			let mut ext = Ext::new(
 				&mut overlay,
-				&mut offchain_overlay,
 				&mut cache,
 				backend,
 				changes_trie::disabled_state::<_, u64>(),
@@ -1167,11 +1149,9 @@ mod tests {
 		overlay.set_child_storage(&child_info, b"4".to_vec(), Some(b"1312".to_vec()));
 
 		{
-			let mut offchain_overlay = Default::default();
 			let mut cache = StorageTransactionCache::default();
 			let mut ext = Ext::new(
 				&mut overlay,
-				&mut offchain_overlay,
 				&mut cache,
 				&backend,
 				changes_trie::disabled_state::<_, u64>(),
@@ -1209,11 +1189,9 @@ mod tests {
 		];
 		let backend = InMemoryBackend::<BlakeTwo256>::from(initial);
 		let mut overlay = OverlayedChanges::default();
-		let mut offchain_overlay = Default::default();
 		let mut cache = StorageTransactionCache::default();
 		let mut ext = Ext::new(
 			&mut overlay,
-			&mut offchain_overlay,
 			&mut cache,
 			&backend,
 			changes_trie::disabled_state::<_, u64>(),
@@ -1234,11 +1212,9 @@ mod tests {
 		let mut state = new_in_mem::<BlakeTwo256>();
 		let backend = state.as_trie_backend().unwrap();
 		let mut overlay = OverlayedChanges::default();
-		let mut offchain_overlay = OffchainOverlayedChanges::default();
 		let mut cache = StorageTransactionCache::default();
 		let mut ext = Ext::new(
 			&mut overlay,
-			&mut offchain_overlay,
 			&mut cache,
 			backend,
 			changes_trie::disabled_state::<_, u64>(),
@@ -1282,12 +1258,10 @@ mod tests {
 		let mut state = new_in_mem::<BlakeTwo256>();
 		let backend = state.as_trie_backend().unwrap();
 		let mut overlay = OverlayedChanges::default();
-		let mut offchain_overlay = OffchainOverlayedChanges::default();
 		let mut cache = StorageTransactionCache::default();
 		{
 			let mut ext = Ext::new(
 				&mut overlay,
-				&mut offchain_overlay,
 				&mut cache,
 				backend,
 				changes_trie::disabled_state::<_, u64>(),
@@ -1304,7 +1278,6 @@ mod tests {
 		{
 			let mut ext = Ext::new(
 				&mut overlay,
-				&mut offchain_overlay,
 				&mut cache,
 				backend,
 				changes_trie::disabled_state::<_, u64>(),
@@ -1323,7 +1296,6 @@ mod tests {
 		{
 			let ext = Ext::new(
 				&mut overlay,
-				&mut offchain_overlay,
 				&mut cache,
 				backend,
 				changes_trie::disabled_state::<_, u64>(),
@@ -1346,14 +1318,12 @@ mod tests {
 		let mut cache = StorageTransactionCache::default();
 		let mut state = new_in_mem::<BlakeTwo256>();
 		let backend = state.as_trie_backend().unwrap();
-		let mut offchain_overlay = OffchainOverlayedChanges::default();
 		let mut overlay = OverlayedChanges::default();
 
 		// For example, block initialization with event.
 		{
 			let mut ext = Ext::new(
 				&mut overlay,
-				&mut offchain_overlay,
 				&mut cache,
 				backend,
 				changes_trie::disabled_state::<_, u64>(),
@@ -1368,7 +1338,6 @@ mod tests {
 		{
 			let mut ext = Ext::new(
 				&mut overlay,
-				&mut offchain_overlay,
 				&mut cache,
 				backend,
 				changes_trie::disabled_state::<_, u64>(),
@@ -1393,7 +1362,6 @@ mod tests {
 		{
 			let mut ext = Ext::new(
 				&mut overlay,
-				&mut offchain_overlay,
 				&mut cache,
 				backend,
 				changes_trie::disabled_state::<_, u64>(),
@@ -1419,7 +1387,6 @@ mod tests {
 		{
 			let ext = Ext::new(
 				&mut overlay,
-				&mut offchain_overlay,
 				&mut cache,
 				backend,
 				changes_trie::disabled_state::<_, u64>(),
@@ -1495,14 +1462,12 @@ mod tests {
 
 		use crate::trie_backend::tests::test_trie;
 		let mut overlay = OverlayedChanges::default();
-		let mut offchain_overlay = OffchainOverlayedChanges::default();
 
 		let mut transaction = {
 			let backend = test_trie();
 			let mut cache = StorageTransactionCache::default();
 			let mut ext = Ext::new(
 				&mut overlay,
-				&mut offchain_overlay,
 				&mut cache,
 				&backend,
 				changes_trie::disabled_state::<_, u64>(),
@@ -1543,11 +1508,9 @@ mod tests {
 		assert_eq!(overlay.storage(b"bbb"), None);
 
 		{
-			let mut offchain_overlay = Default::default();
 			let mut cache = StorageTransactionCache::default();
 			let mut ext = Ext::new(
 				&mut overlay,
-				&mut offchain_overlay,
 				&mut cache,
 				backend,
 				changes_trie::disabled_state::<_, u64>(),
@@ -1571,14 +1534,12 @@ mod tests {
 
 		let backend = trie_backend::tests::test_trie();
 		let mut overlayed_changes = Default::default();
-		let mut offchain_overlayed_changes = Default::default();
 		let wasm_code = RuntimeCode::empty();
 
 		let mut state_machine = StateMachine::new(
 			&backend,
 			changes_trie::disabled_state::<_, u64>(),
 			&mut overlayed_changes,
-			&mut offchain_overlayed_changes,
 			&DummyCodeExecutor {
 				change_changes_trie_config: false,
 				native_available: true,
diff --git a/primitives/state-machine/src/overlayed_changes/mod.rs b/primitives/state-machine/src/overlayed_changes/mod.rs
index edf4c2e88e84..97d7a4f057bb 100644
--- a/primitives/state-machine/src/overlayed_changes/mod.rs
+++ b/primitives/state-machine/src/overlayed_changes/mod.rs
@@ -43,7 +43,7 @@ use sp_std::collections::btree_set::BTreeSet;
 use codec::{Decode, Encode};
 use sp_core::storage::{well_known_keys::EXTRINSIC_INDEX, ChildInfo};
 #[cfg(feature = "std")]
-use sp_core::offchain::storage::OffchainOverlayedChanges;
+use sp_core::offchain::storage::{OffchainOverlayedChanges, OffchainOverlayedChange};
 use hash_db::Hasher;
 use crate::DefaultError;
 use sp_externalities::{Extensions, Extension};
@@ -101,6 +101,9 @@ pub struct OverlayedChanges {
 	collect_extrinsics: bool,
 	/// Collect statistic on this execution.
 	stats: StateMachineStats,
+	/// Offchain related changes.
+	#[cfg(feature = "std")]
+	offchain: OffchainOverlayedChanges,
 }
 
 /// A storage changes structure that can be generated by the data collected in [`OverlayedChanges`].
@@ -523,7 +526,7 @@ impl OverlayedChanges {
 			main_storage_changes: main_storage_changes.collect(),
 			child_storage_changes: child_storage_changes.map(|(sk, it)| (sk, it.0.collect())).collect(),
 			#[cfg(feature = "std")]
-			offchain_storage_changes: Default::default(),
+			offchain_storage_changes: std::mem::take(&mut self.offchain),
 			transaction,
 			transaction_storage_root,
 			#[cfg(feature = "std")]
@@ -629,6 +632,40 @@ impl OverlayedChanges {
 				overlay.next_change(key)
 			)
 	}
+
+	/// Set a value in the offchain storage.
+	#[cfg(feature = "std")]
+	pub fn offchain_set_storage(&mut self, prefix: &[u8], key: &[u8], value: &[u8]) {
+		self.offchain.set(prefix, key, value);
+	}
+
+	/// Clear a value in the offchain storage.
+	#[cfg(feature = "std")]
+	pub fn offchain_remove_storage(&mut self, prefix: &[u8], key: &[u8]) {
+		self.offchain.remove(prefix, key);
+	}
+
+	/// Get a value in the offchain storage.
+	#[cfg(feature = "std")]
+	pub fn offchain_get_storage(
+		&mut self,
+		prefix: &[u8],
+		key: &[u8],
+	) -> Option<OffchainOverlayedChange> {
+		self.offchain.get(prefix, key)
+	}
+
+	/// Returns a reference to the offchain overlay.
+	#[cfg(feature = "std")]
+	pub fn offchain_overlay(&self) -> &OffchainOverlayedChanges {
+		&self.offchain
+	}
+
+	/// Returns a mutable reference to the offchain overlay.
+	#[cfg(feature = "std")]
+	pub fn offchain_overlay_mut(&mut self) -> &mut OffchainOverlayedChanges {
+		&mut self.offchain
+	}
 }
 
 #[cfg(feature = "std")]
@@ -789,11 +826,9 @@ mod tests {
 		overlay.set_storage(b"dogglesworth".to_vec(), Some(b"cat".to_vec()));
 		overlay.set_storage(b"doug".to_vec(), None);
 
-		let mut offchain_overlay = Default::default();
 		let mut cache = StorageTransactionCache::default();
 		let mut ext = Ext::new(
 			&mut overlay,
-			&mut offchain_overlay,
 			&mut cache,
 			&backend,
 			crate::changes_trie::disabled_state::<_, u64>(),
diff --git a/primitives/state-machine/src/testing.rs b/primitives/state-machine/src/testing.rs
index 40e37f2116c7..3ef1ff09b13a 100644
--- a/primitives/state-machine/src/testing.rs
+++ b/primitives/state-machine/src/testing.rs
@@ -33,10 +33,7 @@ use crate::{
 use codec::{Decode, Encode};
 use hash_db::Hasher;
 use sp_core::{
-	offchain::{
-		testing::TestPersistentOffchainDB,
-		storage::OffchainOverlayedChanges
-	},
+	offchain::testing::TestPersistentOffchainDB,
 	storage::{
 		well_known_keys::{CHANGES_TRIE_CONFIG, CODE, HEAP_PAGES, is_child_storage_key},
 		Storage,
@@ -52,7 +49,6 @@ where
 	H::Out: codec::Codec + Ord,
 {
 	overlay: OverlayedChanges,
-	offchain_overlay: OffchainOverlayedChanges,
 	offchain_db: TestPersistentOffchainDB,
 	storage_transaction_cache: StorageTransactionCache<
 		<InMemoryBackend<H> as Backend<H>>::Transaction, H, N
@@ -71,7 +67,6 @@ impl<H: Hasher, N: ChangesTrieBlockNumber> TestExternalities<H, N>
 	pub fn ext(&mut self) -> Ext<H, N, InMemoryBackend<H>> {
 		Ext::new(
 			&mut self.overlay,
-			&mut self.offchain_overlay,
 			&mut self.storage_transaction_cache,
 			&self.backend,
 			match self.changes_trie_config.clone() {
@@ -109,8 +104,6 @@ impl<H: Hasher, N: ChangesTrieBlockNumber> TestExternalities<H, N>
 		storage.top.insert(HEAP_PAGES.to_vec(), 8u64.encode());
 		storage.top.insert(CODE.to_vec(), code.to_vec());
 
-		let offchain_overlay = OffchainOverlayedChanges::enabled();
-
 		let mut extensions = Extensions::default();
 		extensions.register(TaskExecutorExt::new(TaskExecutor::new()));
 
@@ -118,7 +111,6 @@ impl<H: Hasher, N: ChangesTrieBlockNumber> TestExternalities<H, N>
 
 		TestExternalities {
 			overlay,
-			offchain_overlay,
 			offchain_db,
 			changes_trie_config,
 			extensions,
@@ -128,9 +120,14 @@ impl<H: Hasher, N: ChangesTrieBlockNumber> TestExternalities<H, N>
 		}
 	}
 
+	/// Returns the overlayed changes.
+	pub fn overlayed_changes(&self) -> &OverlayedChanges {
+		&self.overlay
+	}
+
 	/// Move offchain changes from overlay to the persistent store.
 	pub fn persist_offchain_overlay(&mut self) {
-		self.offchain_db.apply_offchain_changes(&mut self.offchain_overlay);
+		self.offchain_db.apply_offchain_changes(self.overlay.offchain_overlay_mut());
 	}
 
 	/// A shared reference type around the offchain worker storage.
diff --git a/test-utils/client/src/lib.rs b/test-utils/client/src/lib.rs
index 487be14a7896..bf5b2b6a0414 100644
--- a/test-utils/client/src/lib.rs
+++ b/test-utils/client/src/lib.rs
@@ -79,6 +79,7 @@ pub struct TestClientBuilder<Block: BlockT, Executor, Backend, G: GenesisInit> {
 	keystore: Option<SyncCryptoStorePtr>,
 	fork_blocks: ForkBlocks<Block>,
 	bad_blocks: BadBlocks<Block>,
+	enable_offchain_indexing_api: bool,
 }
 
 impl<Block: BlockT, Executor, G: GenesisInit> Default
@@ -114,6 +115,7 @@ impl<Block: BlockT, Executor, Backend, G: GenesisInit> TestClientBuilder<Block,
 			keystore: None,
 			fork_blocks: None,
 			bad_blocks: None,
+			enable_offchain_indexing_api: false,
 		}
 	}
 
@@ -175,6 +177,12 @@ impl<Block: BlockT, Executor, Backend, G: GenesisInit> TestClientBuilder<Block,
 		self
 	}
 
+	/// Enable the offchain indexing api.
+	pub fn enable_offchain_indexing_api(mut self) -> Self {
+		self.enable_offchain_indexing_api = true;
+		self
+	}
+
 	/// Build the test client with the given native executor.
 	pub fn build_with_executor<RuntimeApi>(
 		self,
@@ -219,7 +227,10 @@ impl<Block: BlockT, Executor, Backend, G: GenesisInit> TestClientBuilder<Block,
 				self.keystore,
 			),
 			None,
-			ClientConfig::default(),
+			ClientConfig {
+				offchain_indexing_api: self.enable_offchain_indexing_api,
+				..Default::default()
+			},
 		).expect("Creates new client");
 
 		let longest_chain = sc_consensus::LongestChain::new(self.backend);
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index 115083d90cc6..3dc514953b66 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -149,6 +149,8 @@ pub enum Extrinsic {
 	IncludeData(Vec<u8>),
 	StorageChange(Vec<u8>, Option<Vec<u8>>),
 	ChangesTrieConfigUpdate(Option<ChangesTrieConfiguration>),
+	OffchainIndexSet(Vec<u8>, Vec<u8>),
+	OffchainIndexClear(Vec<u8>),
 }
 
 parity_util_mem::malloc_size_of_is_0!(Extrinsic); // non-opaque extrinsic does not need this
@@ -177,6 +179,10 @@ impl BlindCheckable for Extrinsic {
 			Extrinsic::StorageChange(key, value) => Ok(Extrinsic::StorageChange(key, value)),
 			Extrinsic::ChangesTrieConfigUpdate(new_config) =>
 				Ok(Extrinsic::ChangesTrieConfigUpdate(new_config)),
+			Extrinsic::OffchainIndexSet(key, value) =>
+				Ok(Extrinsic::OffchainIndexSet(key, value)),
+			Extrinsic::OffchainIndexClear(key) =>
+				Ok(Extrinsic::OffchainIndexClear(key)),
 		}
 	}
 }
@@ -1148,13 +1154,9 @@ fn test_witness(proof: StorageProof, root: crate::Hash) {
 		root,
 	);
 	let mut overlay = sp_state_machine::OverlayedChanges::default();
-	#[cfg(feature = "std")]
-	let mut offchain_overlay = Default::default();
 	let mut cache = sp_state_machine::StorageTransactionCache::<_, _, BlockNumber>::default();
 	let mut ext = sp_state_machine::Ext::new(
 		&mut overlay,
-		#[cfg(feature = "std")]
-		&mut offchain_overlay,
 		&mut cache,
 		&backend,
 		#[cfg(feature = "std")]
diff --git a/test-utils/runtime/src/system.rs b/test-utils/runtime/src/system.rs
index 9fcb81b7b092..c379ec5de5ec 100644
--- a/test-utils/runtime/src/system.rs
+++ b/test-utils/runtime/src/system.rs
@@ -261,6 +261,14 @@ fn execute_transaction_backend(utx: &Extrinsic, extrinsic_index: u32) -> ApplyEx
 			execute_storage_change(key, value.as_ref().map(|v| &**v)),
 		Extrinsic::ChangesTrieConfigUpdate(ref new_config) =>
 			execute_changes_trie_config_update(new_config.clone()),
+		Extrinsic::OffchainIndexSet(key, value) => {
+			sp_io::offchain_index::set(&key, &value);
+			Ok(Ok(()))
+		},
+		Extrinsic::OffchainIndexClear(key) => {
+			sp_io::offchain_index::clear(&key);
+			Ok(Ok(()))
+		}
 	}
 }
 
diff --git a/utils/frame/benchmarking-cli/src/command.rs b/utils/frame/benchmarking-cli/src/command.rs
index 57b9a592f07d..da8a1d98f09a 100644
--- a/utils/frame/benchmarking-cli/src/command.rs
+++ b/utils/frame/benchmarking-cli/src/command.rs
@@ -62,7 +62,6 @@ impl BenchmarkCmd {
 
 		let genesis_storage = spec.build_storage()?;
 		let mut changes = Default::default();
-		let mut offchain_changes = Default::default();
 		let cache_size = Some(self.database_cache_size as usize);
 		let state = BenchmarkingState::<BB>::new(genesis_storage, cache_size)?;
 		let executor = NativeExecutor::<ExecDispatch>::new(
@@ -80,7 +79,6 @@ impl BenchmarkCmd {
 			&state,
 			None,
 			&mut changes,
-			&mut offchain_changes,
 			&executor,
 			"Benchmark_dispatch_benchmark",
 			&(

From 4b687dfb4def2b5eee9f5a20629e3fc3563587ee Mon Sep 17 00:00:00 2001
From: Ashley <ashley.ruglys@gmail.com>
Date: Thu, 21 Jan 2021 18:14:07 +0100
Subject: [PATCH 0306/1194] Grandpa warp sync request-response protocol (#7711)

* Made a start

* So the proof between authority set is phragmen one, this is crazy big,
or is there some signing of the result : that is the storage key, damn?

* ok getting from header digest seems doable.

* for testing

* get set id from storage directly (should use runtime to handler change).

* move test to init

* correct auth key

* fix iteration

* Correct proof content

* actually update block number.

* actually check last justif against its header

* justification relation to new authorities through header hash check is
needed here. This assumes the hash from header is calculated.

* Few changes

* Connected up cheme's branch

* Clean up

* Move things around a bit so that adding the grandpa warp sync request response protocol happens in the node code

* Nits

* Changes to comments

* Cheme changes

* Remove todos and test compile.

* Rename _authority_ related proof function to _warp_sync_ .

* Update client/grandpa-warp-sync/src/lib.rs

quick fix

* Put the warp sync request response protocol behind a feature flag because we dont' need it on a light client.

* Update client/grandpa-warp-sync/src/lib.rs

Quick fix

* Update Cargo.lock

* Adding test, comment on limitation related to 'delay', this could
be implemented but with a cost.

* Set between a delay override last fragment.

* Check for pending authority set change at start.

* adjust index

* custom cache is not a good idea.

* Use a simple cache instead.

* restore broken indentation

* Address crate rename

* Merge conflict badly resolved, sorry

Co-authored-by: cheme <emericchevalier.pro@gmail.com>
Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
---
 Cargo.lock                                    |  87 +++-
 Cargo.toml                                    |   1 +
 bin/node/cli/Cargo.toml                       |   2 +
 bin/node/cli/src/service.rs                   |   5 +
 client/finality-grandpa-warp-sync/Cargo.toml  |  28 +
 client/finality-grandpa-warp-sync/src/lib.rs  | 161 ++++++
 client/finality-grandpa/Cargo.toml            |   1 +
 client/finality-grandpa/src/finality_proof.rs | 484 +++++++++++++++++-
 client/finality-grandpa/src/import.rs         |   4 +-
 client/finality-grandpa/src/lib.rs            |   1 +
 client/service/src/builder.rs                 |  15 +-
 client/service/src/config.rs                  |  14 +
 12 files changed, 770 insertions(+), 33 deletions(-)
 create mode 100644 client/finality-grandpa-warp-sync/Cargo.toml
 create mode 100644 client/finality-grandpa-warp-sync/src/lib.rs

diff --git a/Cargo.lock b/Cargo.lock
index 2bec30fdd8ec..32159c693666 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -937,7 +937,7 @@ dependencies = [
  "clap",
  "criterion-plot",
  "csv",
- "itertools",
+ "itertools 0.9.0",
  "lazy_static",
  "num-traits",
  "oorandom",
@@ -959,7 +959,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d"
 dependencies = [
  "cast",
- "itertools",
+ "itertools 0.9.0",
 ]
 
 [[package]]
@@ -2530,6 +2530,15 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135"
 
+[[package]]
+name = "itertools"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itertools"
 version = "0.9.0"
@@ -2878,7 +2887,7 @@ dependencies = [
  "parity-multiaddr",
  "parking_lot 0.11.1",
  "pin-project 1.0.2",
- "prost",
+ "prost 0.7.0",
  "prost-build",
  "rand 0.7.3",
  "ring",
@@ -2935,7 +2944,7 @@ dependencies = [
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "prost",
+ "prost 0.7.0",
  "prost-build",
  "rand 0.7.3",
  "smallvec 1.5.0",
@@ -2957,7 +2966,7 @@ dependencies = [
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "prost",
+ "prost 0.7.0",
  "prost-build",
  "rand 0.7.3",
  "regex",
@@ -2977,7 +2986,7 @@ dependencies = [
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "prost",
+ "prost 0.7.0",
  "prost-build",
  "smallvec 1.5.0",
  "wasm-timer",
@@ -2998,7 +3007,7 @@ dependencies = [
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "prost",
+ "prost 0.7.0",
  "prost-build",
  "rand 0.7.3",
  "sha2 0.9.2",
@@ -3060,7 +3069,7 @@ dependencies = [
  "lazy_static",
  "libp2p-core",
  "log",
- "prost",
+ "prost 0.7.0",
  "prost-build",
  "rand 0.7.3",
  "sha2 0.9.2",
@@ -3096,7 +3105,7 @@ dependencies = [
  "futures 0.3.9",
  "libp2p-core",
  "log",
- "prost",
+ "prost 0.7.0",
  "prost-build",
  "unsigned-varint 0.6.0",
  "void",
@@ -3773,6 +3782,7 @@ dependencies = [
  "sc-consensus-epochs",
  "sc-consensus-slots",
  "sc-finality-grandpa",
+ "sc-finality-grandpa-warp-sync",
  "sc-keystore",
  "sc-network",
  "sc-offchain",
@@ -5765,6 +5775,16 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "prost"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce49aefe0a6144a45de32927c77bd2859a5f7677b55f220ae5b744e87389c212"
+dependencies = [
+ "bytes 0.5.6",
+ "prost-derive 0.6.1",
+]
+
 [[package]]
 name = "prost"
 version = "0.7.0"
@@ -5772,7 +5792,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e6984d2f1a23009bd270b8bb56d0926810a3d483f59c987d77969e9d8e840b2"
 dependencies = [
  "bytes 1.0.1",
- "prost-derive",
+ "prost-derive 0.7.0",
 ]
 
 [[package]]
@@ -5783,16 +5803,29 @@ checksum = "32d3ebd75ac2679c2af3a92246639f9fcc8a442ee420719cc4fe195b98dd5fa3"
 dependencies = [
  "bytes 1.0.1",
  "heck",
- "itertools",
+ "itertools 0.9.0",
  "log",
  "multimap",
  "petgraph",
- "prost",
+ "prost 0.7.0",
  "prost-types",
  "tempfile",
  "which 4.0.2",
 ]
 
+[[package]]
+name = "prost-derive"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "537aa19b95acde10a12fec4301466386f757403de4cd4e5b4fa78fb5ecb18f72"
+dependencies = [
+ "anyhow",
+ "itertools 0.8.2",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "prost-derive"
 version = "0.7.0"
@@ -5800,7 +5833,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "169a15f3008ecb5160cba7d37bcd690a7601b6d30cfb87a117d45e59d52af5d4"
 dependencies = [
  "anyhow",
- "itertools",
+ "itertools 0.9.0",
  "proc-macro2",
  "quote",
  "syn",
@@ -5813,7 +5846,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b518d7cdd93dab1d1122cf07fa9a60771836c668dde9d9e2a139f957f0d9f1bb"
 dependencies = [
  "bytes 1.0.1",
- "prost",
+ "prost 0.7.0",
 ]
 
 [[package]]
@@ -6435,7 +6468,7 @@ dependencies = [
  "libp2p",
  "log",
  "parity-scale-codec",
- "prost",
+ "prost 0.7.0",
  "prost-build",
  "quickcheck",
  "rand 0.7.3",
@@ -6977,6 +7010,7 @@ dependencies = [
  "fork-tree",
  "futures 0.3.9",
  "futures-timer 3.0.2",
+ "linked-hash-map",
  "log",
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -7042,6 +7076,25 @@ dependencies = [
  "substrate-test-runtime-client",
 ]
 
+[[package]]
+name = "sc-finality-grandpa-warp-sync"
+version = "0.8.0"
+dependencies = [
+ "derive_more",
+ "futures 0.3.9",
+ "log",
+ "num-traits",
+ "parity-scale-codec",
+ "parking_lot 0.11.1",
+ "prost 0.6.1",
+ "sc-client-api",
+ "sc-finality-grandpa",
+ "sc-network",
+ "sc-service",
+ "sp-blockchain",
+ "sp-runtime",
+]
+
 [[package]]
 name = "sc-informant"
 version = "0.8.1"
@@ -7126,7 +7179,7 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.11.1",
  "pin-project 0.4.27",
- "prost",
+ "prost 0.7.0",
  "prost-build",
  "quickcheck",
  "rand 0.7.3",
@@ -10480,6 +10533,6 @@ checksum = "b89249644df056b522696b1bb9e7c18c87e8ffa3e2f0dc3b0155875d6498f01b"
 dependencies = [
  "cc",
  "glob",
- "itertools",
+ "itertools 0.9.0",
  "libc",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 2a0db9b385a6..fc22f440ca7f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,6 +37,7 @@ members = [
 	"client/executor/wasmi",
 	"client/executor/wasmtime",
 	"client/finality-grandpa",
+	"client/finality-grandpa-warp-sync",
 	"client/informant",
 	"client/keystore",
 	"client/light",
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index aaee37311959..4c245dcf629f 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -74,6 +74,7 @@ sc-service = { version = "0.8.0", default-features = false, path = "../../../cli
 sc-tracing = { version = "2.0.0", path = "../../../client/tracing" }
 sc-telemetry = { version = "2.0.0", path = "../../../client/telemetry" }
 sc-authority-discovery = { version = "0.8.0",  path = "../../../client/authority-discovery" }
+sc-finality-grandpa-warp-sync = { version = "0.8.0", path = "../../../client/finality-grandpa-warp-sync", optional = true }
 
 # frame dependencies
 pallet-indices = { version = "2.0.0", path = "../../../frame/indices" }
@@ -151,6 +152,7 @@ cli = [
 	"frame-benchmarking-cli",
 	"substrate-frame-cli",
 	"sc-service/db",
+	"sc-finality-grandpa-warp-sync",
 	"structopt",
 	"substrate-build-script-utils",
 ]
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index c3061b88709a..217914d2b3b0 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -194,6 +194,11 @@ pub fn new_full_base(
 
 	config.network.extra_sets.push(grandpa::grandpa_peers_set_config());
 
+	#[cfg(feature = "cli")]
+	config.network.request_response_protocols.push(sc_finality_grandpa_warp_sync::request_response_config_for_chain(
+		&config, task_manager.spawn_handle(), backend.clone(),
+	));
+
 	let (network, network_status_sinks, system_rpc_tx, network_starter) =
 		sc_service::build_network(sc_service::BuildNetworkParams {
 			config: &config,
diff --git a/client/finality-grandpa-warp-sync/Cargo.toml b/client/finality-grandpa-warp-sync/Cargo.toml
new file mode 100644
index 000000000000..4f7ee0301f41
--- /dev/null
+++ b/client/finality-grandpa-warp-sync/Cargo.toml
@@ -0,0 +1,28 @@
+[package]
+description = "A request-response protocol for handling grandpa warp sync requests"
+name = "sc-finality-grandpa-warp-sync"
+version = "0.8.0"
+license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
+publish = false
+homepage = "https://substrate.dev"
+repository = "https://github.com/paritytech/substrate/"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+sc-network = { version = "0.8.0", path = "../network" }
+sc-finality-grandpa = { version = "0.8.0", path = "../finality-grandpa" }
+sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
+sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
+sc-client-api = { version = "2.0.0", path = "../api" }
+sc-service = { version = "0.8.0", path = "../service" }
+futures = "0.3.8"
+log = "0.4.11"
+derive_more = "0.99.11"
+codec = { package = "parity-scale-codec", version = "1.3.5" }
+prost = "0.6.1"
+num-traits = "0.2.14"
+parking_lot = "0.11.1"
diff --git a/client/finality-grandpa-warp-sync/src/lib.rs b/client/finality-grandpa-warp-sync/src/lib.rs
new file mode 100644
index 000000000000..d22d74c2faee
--- /dev/null
+++ b/client/finality-grandpa-warp-sync/src/lib.rs
@@ -0,0 +1,161 @@
+// Copyright 2021 Parity Technologies (UK) Ltd.
+// This file is part of Substrate.
+
+// Substrate is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Substrate is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Helper for handling (i.e. answering) grandpa warp sync requests from a remote peer via the
+//! [`crate::request_responses::RequestResponsesBehaviour`].
+
+use codec::Decode;
+use sc_network::config::{ProtocolId, IncomingRequest, RequestResponseConfig};
+use sc_client_api::Backend;
+use sp_runtime::traits::NumberFor;
+use futures::channel::{mpsc, oneshot};
+use futures::stream::StreamExt;
+use log::debug;
+use sp_runtime::traits::Block as BlockT;
+use std::time::Duration;
+use std::sync::Arc;
+use sc_service::{SpawnTaskHandle, config::{Configuration, Role}};
+use sc_finality_grandpa::WarpSyncFragmentCache;
+
+/// Generates the appropriate [`RequestResponseConfig`] for a given chain configuration.
+pub fn request_response_config_for_chain<TBlock: BlockT, TBackend: Backend<TBlock> + 'static>(
+	config: &Configuration,
+	spawn_handle: SpawnTaskHandle,
+	backend: Arc<TBackend>,
+) -> RequestResponseConfig
+	where NumberFor<TBlock>: sc_finality_grandpa::BlockNumberOps,
+{
+	let protocol_id = config.protocol_id();
+
+	if matches!(config.role, Role::Light) {
+		// Allow outgoing requests but deny incoming requests.
+		generate_request_response_config(protocol_id.clone())
+	} else {
+		// Allow both outgoing and incoming requests.
+		let (handler, request_response_config) = GrandpaWarpSyncRequestHandler::new(
+			protocol_id.clone(),
+			backend.clone(),
+		);
+		spawn_handle.spawn("grandpa_warp_sync_request_handler", handler.run());
+		request_response_config
+	}
+}
+
+const LOG_TARGET: &str = "finality-grandpa-warp-sync-request-handler";
+
+/// Generates a [`RequestResponseConfig`] for the grandpa warp sync request protocol, refusing incoming requests.
+pub fn generate_request_response_config(protocol_id: ProtocolId) -> RequestResponseConfig {
+	RequestResponseConfig {
+		name: generate_protocol_name(protocol_id).into(),
+		max_request_size: 32,
+		max_response_size: 16 * 1024 * 1024,
+		request_timeout: Duration::from_secs(10),
+		inbound_queue: None,
+	}
+}
+
+/// Generate the grandpa warp sync protocol name from chain specific protocol identifier.
+fn generate_protocol_name(protocol_id: ProtocolId) -> String {
+	let mut s = String::new();
+	s.push_str("/");
+	s.push_str(protocol_id.as_ref());
+	s.push_str("/sync/warp");
+	s
+}
+
+#[derive(codec::Decode)]
+struct Request<B: BlockT> {
+	begin: B::Hash
+}
+
+/// Setting a large fragment limit, allowing client
+/// to define it is possible.
+const WARP_SYNC_FRAGMENTS_LIMIT: usize = 100;
+
+/// Number of item with justification in warp sync cache.
+/// This should be customizable, setting a low number
+/// until then.
+const WARP_SYNC_CACHE_SIZE: usize = 20;
+
+/// Handler for incoming grandpa warp sync requests from a remote peer.
+pub struct GrandpaWarpSyncRequestHandler<TBackend, TBlock: BlockT> {
+	backend: Arc<TBackend>,
+	cache: Arc<parking_lot::RwLock<WarpSyncFragmentCache<TBlock::Header>>>,
+	request_receiver: mpsc::Receiver<IncomingRequest>,
+	_phantom: std::marker::PhantomData<TBlock>
+}
+
+impl<TBlock: BlockT, TBackend: Backend<TBlock>> GrandpaWarpSyncRequestHandler<TBackend, TBlock> {
+	/// Create a new [`GrandpaWarpSyncRequestHandler`].
+	pub fn new(protocol_id: ProtocolId, backend: Arc<TBackend>) -> (Self, RequestResponseConfig) {
+		let (tx, request_receiver) = mpsc::channel(20);
+
+		let mut request_response_config = generate_request_response_config(protocol_id);
+		request_response_config.inbound_queue = Some(tx);
+		let cache = Arc::new(parking_lot::RwLock::new(WarpSyncFragmentCache::new(WARP_SYNC_CACHE_SIZE)));
+
+		(Self { backend, request_receiver, cache, _phantom: std::marker::PhantomData }, request_response_config)
+	}
+
+	fn handle_request(
+		&self,
+		payload: Vec<u8>,
+		pending_response: oneshot::Sender<Vec<u8>>
+	) -> Result<(), HandleRequestError>
+		where NumberFor<TBlock>: sc_finality_grandpa::BlockNumberOps,
+	{
+		let request = Request::<TBlock>::decode(&mut &payload[..])?;
+
+		let mut cache = self.cache.write();
+		let response = sc_finality_grandpa::prove_warp_sync(
+			self.backend.blockchain(), request.begin, Some(WARP_SYNC_FRAGMENTS_LIMIT), Some(&mut cache)
+		)?;
+
+		pending_response.send(response)
+			.map_err(|_| HandleRequestError::SendResponse)
+	}
+
+	/// Run [`GrandpaWarpSyncRequestHandler`].
+	pub async fn run(mut self)
+		where NumberFor<TBlock>: sc_finality_grandpa::BlockNumberOps,
+	{
+		while let Some(request) = self.request_receiver.next().await {
+			let IncomingRequest { peer, payload, pending_response } = request;
+
+			match self.handle_request(payload, pending_response) {
+				Ok(()) => debug!(target: LOG_TARGET, "Handled grandpa warp sync request from {}.", peer),
+				Err(e) => debug!(
+					target: LOG_TARGET,
+					"Failed to handle grandpa warp sync request from {}: {}",
+					peer, e,
+				),
+			}
+		}
+	}
+}
+
+#[derive(derive_more::Display, derive_more::From)]
+enum HandleRequestError {
+	#[display(fmt = "Failed to decode request: {}.", _0)]
+	DecodeProto(prost::DecodeError),
+	#[display(fmt = "Failed to encode response: {}.", _0)]
+	EncodeProto(prost::EncodeError),
+	#[display(fmt = "Failed to decode block hash: {}.", _0)]
+	DecodeScale(codec::Error),
+	Client(sp_blockchain::Error),
+	#[display(fmt = "Failed to send response.")]
+	SendResponse,
+}
diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml
index 1309cbb316b6..1b410b32013a 100644
--- a/client/finality-grandpa/Cargo.toml
+++ b/client/finality-grandpa/Cargo.toml
@@ -45,6 +45,7 @@ prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../..
 sc-block-builder = { version = "0.8.0", path = "../block-builder" }
 finality-grandpa = { version = "0.12.3", features = ["derive-codec"] }
 pin-project = "0.4.6"
+linked-hash-map = "0.5.2"
 
 [dev-dependencies]
 assert_matches = "1.3.0"
diff --git a/client/finality-grandpa/src/finality_proof.rs b/client/finality-grandpa/src/finality_proof.rs
index bd29b18bae12..a0fad2f92c88 100644
--- a/client/finality-grandpa/src/finality_proof.rs
+++ b/client/finality-grandpa/src/finality_proof.rs
@@ -52,7 +52,7 @@ use parity_scale_codec::{Encode, Decode};
 use finality_grandpa::BlockNumberOps;
 use sp_runtime::{
 	Justification, generic::BlockId,
-	traits::{NumberFor, Block as BlockT, Header as HeaderT, One},
+	traits::{NumberFor, Block as BlockT, Header as HeaderT, Zero, One},
 };
 use sp_core::storage::StorageKey;
 use sc_telemetry::{telemetry, CONSENSUS_INFO};
@@ -247,6 +247,23 @@ pub struct FinalityProofFragment<Header: HeaderT> {
 /// - all other fragments provide justifications for GRANDPA authorities set changes within requested range.
 type FinalityProof<Header> = Vec<FinalityProofFragment<Header>>;
 
+/// Single fragment of authority set proof.
+///
+/// Finality for block B is proved by providing:
+/// 1) headers of this block;
+/// 2) the justification for the block containing a authority set change digest;
+#[derive(Debug, PartialEq, Clone, Encode, Decode)]
+pub(crate) struct AuthoritySetProofFragment<Header: HeaderT> {
+	/// The header of the given block.
+	pub header: Header,
+	/// Justification of the block F.
+	pub justification: Vec<u8>,
+}
+
+/// Proof of authority set is the ordered set of authority set fragments, where:
+/// - last fragment match target block.
+type AuthoritySetProof<Header> = Vec<AuthoritySetProofFragment<Header>>;
+
 /// Finality proof request data.
 #[derive(Debug, Encode, Decode)]
 enum FinalityProofRequest<H: Encode + Decode> {
@@ -425,6 +442,133 @@ pub(crate) fn prove_finality<Block: BlockT, B: BlockchainBackend<Block>, J>(
 	}
 }
 
+/// Prepare authority proof for the best possible block starting at a given trusted block.
+///
+/// Started block should be in range of bonding duration.
+/// We only return proof for finalized blocks (with justification).
+///
+/// It is assumed that the caller already have a proof-of-finality for the block 'begin'.
+pub fn prove_warp_sync<Block: BlockT, B: BlockchainBackend<Block>>(
+	blockchain: &B,
+	begin: Block::Hash,
+	max_fragment_limit: Option<usize>,
+	mut cache: Option<&mut WarpSyncFragmentCache<Block::Header>>,
+) -> ::sp_blockchain::Result<Vec<u8>> {
+
+	let begin = BlockId::Hash(begin);
+	let begin_number = blockchain.block_number_from_id(&begin)?
+		.ok_or_else(|| ClientError::Backend("Missing start block".to_string()))?;
+	let end = BlockId::Hash(blockchain.last_finalized()?);
+	let end_number = blockchain.block_number_from_id(&end)?
+		// This error should not happen, we could also panic.
+		.ok_or_else(|| ClientError::Backend("Missing last finalized block".to_string()))?;
+
+	if begin_number > end_number {
+		return Err(ClientError::Backend("Unfinalized start for authority proof".to_string()));
+	}
+
+	let mut result = Vec::new();
+	let mut last_apply = None;
+
+	let header = blockchain.expect_header(begin)?;
+	let mut index = *header.number();
+
+	// Find previous change in case there is a delay.
+	// This operation is a costy and only for the delay corner case.
+	while index > Zero::zero() {
+		index = index - One::one();
+		if let Some((fragement, apply_block)) = get_warp_sync_proof_fragment(blockchain, index, &mut cache)? {
+			if last_apply.map(|next| &next > header.number()).unwrap_or(false) {
+				result.push(fragement);
+				last_apply = Some(apply_block);
+			} else {
+				break;
+			}
+		}
+	}
+
+	let mut index = *header.number();
+	while index <= end_number {
+		if max_fragment_limit.map(|limit| result.len() <= limit).unwrap_or(false) {
+			break;
+		}
+
+		if let Some((fragement, apply_block)) = get_warp_sync_proof_fragment(blockchain, index, &mut cache)? {
+			if last_apply.map(|next| apply_block < next).unwrap_or(false) {
+				// Previous delayed will not apply, do not include it.
+				result.pop();
+			}
+			result.push(fragement);
+			last_apply = Some(apply_block);
+		}
+
+		index = index + One::one();
+	}
+
+	if result.last().as_ref().map(|head| head.header.number()) != Some(&end_number) {
+		let header = blockchain.expect_header(end)?;
+		if let Some(justification) = blockchain.justification(BlockId::Number(end_number.clone()))? {
+			result.push(AuthoritySetProofFragment {
+				header: header.clone(),
+				justification,
+			});
+		} else {
+			// no justification, don't include it.
+		}
+	}
+
+	Ok(result.encode())
+}
+
+/// Try get a warp sync proof fragment a a given finalized block.
+fn get_warp_sync_proof_fragment<Block: BlockT, B: BlockchainBackend<Block>>(
+	blockchain: &B,
+	index: NumberFor<Block>,
+	cache: &mut Option<&mut WarpSyncFragmentCache<Block::Header>>,
+) -> sp_blockchain::Result<Option<(AuthoritySetProofFragment<Block::Header>, NumberFor<Block>)>> {
+	if let Some(cache) = cache.as_mut() {
+		if let Some(result) = cache.get_item(index) {
+			return Ok(result.clone());
+		}
+	}
+
+	let mut result = None;
+	let header = blockchain.expect_header(BlockId::number(index))?;
+
+	if let Some((block_number, sp_finality_grandpa::ScheduledChange {
+		next_authorities: _,
+		delay,
+	})) = crate::import::find_forced_change::<Block>(&header) {
+		let dest = block_number + delay;
+		if let Some(justification) = blockchain.justification(BlockId::Number(index.clone()))? {
+			result = Some((AuthoritySetProofFragment {
+				header: header.clone(),
+				justification,
+			}, dest));
+		} else {
+			return Err(ClientError::Backend("Unjustified block with authority set change".to_string()));
+		}
+	}
+
+	if let Some(sp_finality_grandpa::ScheduledChange {
+		next_authorities: _,
+		delay,
+	}) = crate::import::find_scheduled_change::<Block>(&header) {
+		let dest = index + delay;
+		if let Some(justification) = blockchain.justification(BlockId::Number(index.clone()))? {
+			result = Some((AuthoritySetProofFragment {
+				header: header.clone(),
+				justification,
+			}, dest));
+		} else {
+			return Err(ClientError::Backend("Unjustified block with authority set change".to_string()));
+		}
+	}
+
+	cache.as_mut().map(|cache| cache.new_item(index, result.clone()));
+	Ok(result)
+}
+
 /// Check GRANDPA proof-of-finality for the given block.
 ///
 /// Returns the vector of headers that MUST be validated + imported
@@ -483,6 +627,98 @@ pub(crate) fn check_finality_proof<Block: BlockT, B, J>(
 	Ok(effects)
 }
 
+/// Check GRANDPA authority change sequence to assert finality of a target block.
+///
+/// Returns the header of the target block.
+pub(crate) fn check_warp_sync_proof<Block: BlockT, J>(
+	current_set_id: u64,
+	current_authorities: AuthorityList,
+	remote_proof: Vec<u8>,
+) -> ClientResult<(Block::Header, u64, AuthorityList)>
+where
+		NumberFor<Block>: BlockNumberOps,
+		J: Decode + ProvableJustification<Block::Header> + BlockJustification<Block::Header>,
+{
+	// decode finality proof
+	let proof = AuthoritySetProof::<Block::Header>::decode(&mut &remote_proof[..])
+		.map_err(|_| ClientError::BadJustification("failed to decode authority proof".into()))?;
+
+		let last = proof.len() - 1;
+
+		let mut result = (current_set_id, current_authorities, NumberFor::<Block>::zero());
+
+		for (ix, fragment) in proof.into_iter().enumerate() {
+			let is_last = ix == last;
+			result = check_warp_sync_proof_fragment::<Block, J>(
+				result.0,
+				&result.1,
+				&result.2,
+				is_last,
+				&fragment,
+			)?;
+
+			if is_last {
+				return Ok((fragment.header, result.0, result.1))
+			}
+		}
+
+		// empty proof can't prove anything
+		return Err(ClientError::BadJustification("empty proof of authority".into()));
+}
+
+/// Check finality authority set sequence.
+fn check_warp_sync_proof_fragment<Block: BlockT, J>(
+	current_set_id: u64,
+	current_authorities: &AuthorityList,
+	previous_checked_block: &NumberFor<Block>,
+	is_last: bool,
+	authorities_proof: &AuthoritySetProofFragment<Block::Header>,
+) -> ClientResult<(u64, AuthorityList, NumberFor<Block>)>
+where
+		NumberFor<Block>: BlockNumberOps,
+		J: Decode + ProvableJustification<Block::Header> + BlockJustification<Block::Header>,
+{
+	let justification: J = Decode::decode(&mut authorities_proof.justification.as_slice())
+		.map_err(|_| ClientError::JustificationDecode)?;
+		justification.verify(current_set_id, &current_authorities)?;
+
+		// assert justification is for this header
+		if &justification.number() != authorities_proof.header.number()
+			|| justification.hash().as_ref() != authorities_proof.header.hash().as_ref() {
+				return Err(ClientError::Backend("Invalid authority warp proof, justification do not match header".to_string()));
+		}
+
+		if authorities_proof.header.number() <= previous_checked_block {
+			return Err(ClientError::Backend("Invalid authority warp proof".to_string()));
+		}
+		let current_block = authorities_proof.header.number();
+		let mut at_block = None;
+		if let Some(sp_finality_grandpa::ScheduledChange {
+			next_authorities,
+			delay,
+		}) = crate::import::find_scheduled_change::<Block>(&authorities_proof.header) {
+			let dest = *current_block + delay;
+			at_block = Some((dest, next_authorities));
+		}
+		if let Some((block_number, sp_finality_grandpa::ScheduledChange {
+			next_authorities,
+			delay,
+		})) = crate::import::find_forced_change::<Block>(&authorities_proof.header) {
+			let dest = block_number + delay;
+			at_block = Some((dest, next_authorities));
+		}
+
+		// Fragment without change only allowed for proof last block.
+		if at_block.is_none() && !is_last {
+			return Err(ClientError::Backend("Invalid authority warp proof".to_string()));
+		}
+		if let Some((at_block, next_authorities)) = at_block {
+			Ok((current_set_id + 1, next_authorities, at_block))
+		} else {
+			Ok((current_set_id, current_authorities.clone(), current_block.clone()))
+		}
+}
+
 /// Check finality proof for the single block.
 fn check_finality_proof_fragment<Block: BlockT, B, J>(
 	blockchain: &B,
@@ -551,6 +787,15 @@ impl<Header: HeaderT> AuthoritiesOrEffects<Header> {
 	}
 }
 
+/// Block info extracted from the justification.
+pub(crate) trait BlockJustification<Header: HeaderT> {
+	/// Block number justified.
+	fn number(&self) -> Header::Number;
+
+	/// Block hash justified.
+	fn hash(&self) -> Header::Hash;
+}
+
 /// Justification used to prove block finality.
 pub(crate) trait ProvableJustification<Header: HeaderT>: Encode + Decode {
 	/// Verify justification with respect to authorities set and authorities set id.
@@ -582,6 +827,68 @@ impl<Block: BlockT> ProvableJustification<Block::Header> for GrandpaJustificatio
 	}
 }
 
+impl<Block: BlockT> BlockJustification<Block::Header> for GrandpaJustification<Block> {
+	fn number(&self) -> NumberFor<Block> {
+		self.commit.target_number.clone()
+	}
+	fn hash(&self) -> Block::Hash {
+		self.commit.target_hash.clone()
+	}
+}
+
+/// Simple cache for warp sync queries.
+pub struct WarpSyncFragmentCache<Header: HeaderT> {
+	cache: linked_hash_map::LinkedHashMap<
+		Header::Number,
+		Option<(AuthoritySetProofFragment<Header>, Header::Number)>,
+		>,
+	headers_with_justification: usize,
+	limit: usize,
+}
+
+impl<Header: HeaderT> WarpSyncFragmentCache<Header> {
+	/// Instantiate a new cache for the warp sync prover.
+	pub fn new(size: usize) -> Self {
+		WarpSyncFragmentCache {
+			cache: Default::default(),
+			headers_with_justification: 0,
+			limit: size,
+		}
+	}
+
+	fn new_item(
+		&mut self,
+		at: Header::Number,
+		item: Option<(AuthoritySetProofFragment<Header>, Header::Number)>,
+	) {
+		if self.cache.len() == self.limit {
+			self.pop_one();
+		}
+		if item.is_some() {
+			// we do not check previous value as cached value is always supposed to
+			// be queried before calling 'new_item'.
+			self.headers_with_justification += 1;
+		}
+		self.cache.insert(at, item);
+	}
+
+	fn pop_one(&mut self) {
+		while let Some(v) = self.cache.pop_front() {
+			if v.1.is_some() {
+				self.headers_with_justification -= 1;
+				break;
+			}
+		}
+	}
+
+	fn get_item(
+		&mut self,
+		block: Header::Number,
+	) -> Option<&mut Option<(AuthoritySetProofFragment<Header>, Header::Number)>> {
+		self.cache.get_refresh(&block)
+	}
+}
+
 #[cfg(test)]
 pub(crate) mod tests {
 	use substrate_test_runtime_client::runtime::{Block, Header, H256};
@@ -635,6 +942,24 @@ pub(crate) mod tests {
 		}
 	}
 
+	#[derive(Debug, PartialEq, Encode, Decode)]
+	pub struct TestBlockJustification(TestJustification, u64, H256);
+
+	impl BlockJustification<Header> for TestBlockJustification {
+		fn number(&self) -> <Header as HeaderT>::Number {
+			self.1
+		}
+		fn hash(&self) -> <Header as HeaderT>::Hash {
+			self.2.clone()
+		}
+	}
+
+	impl ProvableJustification<Header> for TestBlockJustification {
+		fn verify(&self, set_id: u64, authorities: &[(AuthorityId, u64)]) -> ClientResult<()> {
+			self.0.verify(set_id, authorities)
+		}
+	}
+
 	fn header(number: u64) -> Header {
 		let parent_hash = match number {
 			0 => Default::default(),
@@ -1027,4 +1352,161 @@ pub(crate) mod tests {
 		).unwrap();
 		assert!(proof_of_4.is_none());
 	}
+
+	#[test]
+	fn warp_sync_proof_encoding_decoding() {
+		fn test_blockchain(
+			nb_blocks: u64,
+			mut set_change: &[(u64, Vec<u8>)],
+			mut justifications: &[(u64, Vec<u8>)],
+		) -> (InMemoryBlockchain<Block>, Vec<H256>) {
+			let blockchain = InMemoryBlockchain::<Block>::new();
+			let mut hashes = Vec::<H256>::new();
+			let mut set_id = 0;
+			for i in 0..nb_blocks {
+				let mut set_id_next = set_id;
+				let mut header = header(i);
+				set_change.first()
+					.map(|j| if i == j.0 {
+						set_change = &set_change[1..];
+						let next_authorities: Vec<_> = j.1.iter().map(|i| (AuthorityId::from_slice(&[*i; 32]), 1u64)).collect();
+						set_id_next += 1;
+						header.digest_mut().logs.push(
+							sp_runtime::generic::DigestItem::Consensus(
+								sp_finality_grandpa::GRANDPA_ENGINE_ID,
+								sp_finality_grandpa::ConsensusLog::ScheduledChange(
+									sp_finality_grandpa::ScheduledChange { delay: 0u64, next_authorities }
+								).encode(),
+							));
+					});
+
+				if let Some(parent) = hashes.last() {
+					header.set_parent_hash(parent.clone());
+				}
+				let header_hash = header.hash();
+
+				let justification = justifications.first()
+					.and_then(|j| if i == j.0 {
+						justifications = &justifications[1..];
+
+						let authority = j.1.iter().map(|j|
+							(AuthorityId::from_slice(&[*j; 32]), 1u64)
+						).collect();
+						let justification = TestBlockJustification(
+							TestJustification((set_id, authority), vec![i as u8]),
+							i,
+							header_hash,
+						);
+						Some(justification.encode())
+					} else {
+						None
+					});
+				hashes.push(header_hash.clone());
+				set_id = set_id_next;
+
+				blockchain.insert(header_hash, header, justification, None, NewBlockState::Final)
+					.unwrap();
+					}
+			(blockchain, hashes)
+		}
+
+		let (blockchain, hashes) = test_blockchain(
+			7,
+			vec![(3, vec![9])].as_slice(),
+			vec![
+			(1, vec![1, 2, 3]),
+			(2, vec![1, 2, 3]),
+			(3, vec![1, 2, 3]),
+			(4, vec![9]),
+			(6, vec![9]),
+			].as_slice(),
+		);
+
+		// proof after set change
+		let mut cache = WarpSyncFragmentCache::new(5);
+		let proof_no_cache = prove_warp_sync(&blockchain, hashes[6], None, Some(&mut cache)).unwrap();
+		let proof = prove_warp_sync(&blockchain, hashes[6], None, Some(&mut cache)).unwrap();
+		assert_eq!(proof_no_cache, proof);
+
+		let initial_authorities: Vec<_> = [1u8, 2, 3].iter().map(|i|
+			(AuthorityId::from_slice(&[*i; 32]), 1u64)
+		).collect();
+
+		let authorities_next: Vec<_> = [9u8].iter().map(|i|
+			(AuthorityId::from_slice(&[*i; 32]), 1u64)
+		).collect();
+
+		assert!(check_warp_sync_proof::<Block, TestBlockJustification>(
+				0,
+				initial_authorities.clone(),
+				proof.clone(),
+		).is_err());
+		assert!(check_warp_sync_proof::<Block, TestBlockJustification>(
+				0,
+				authorities_next.clone(),
+				proof.clone(),
+		).is_err());
+		assert!(check_warp_sync_proof::<Block, TestBlockJustification>(
+				1,
+				initial_authorities.clone(),
+				proof.clone(),
+		).is_err());
+		let (
+			_header,
+			current_set_id,
+			current_set,
+		) = check_warp_sync_proof::<Block, TestBlockJustification>(
+		1,
+		authorities_next.clone(),
+		proof.clone(),
+		).unwrap();
+
+		assert_eq!(current_set_id, 1);
+		assert_eq!(current_set, authorities_next);
+
+		// proof before set change
+		let proof = prove_warp_sync(&blockchain, hashes[1], None, None).unwrap();
+		let (
+			_header,
+			current_set_id,
+			current_set,
+		) = check_warp_sync_proof::<Block, TestBlockJustification>(
+		0,
+		initial_authorities.clone(),
+		proof.clone(),
+		).unwrap();
+
+		assert_eq!(current_set_id, 1);
+		assert_eq!(current_set, authorities_next);
+
+		// two changes
+		let (blockchain, hashes) = test_blockchain(
+			13,
+			vec![(3, vec![7]), (8, vec![9])].as_slice(),
+			vec![
+			(1, vec![1, 2, 3]),
+			(2, vec![1, 2, 3]),
+			(3, vec![1, 2, 3]),
+			(4, vec![7]),
+			(6, vec![7]),
+			(8, vec![7]), // warning, requires a justification on change set
+			(10, vec![9]),
+			].as_slice(),
+		);
+
+		// proof before set change
+		let proof = prove_warp_sync(&blockchain, hashes[1], None, None).unwrap();
+		let (
+			_header,
+			current_set_id,
+			current_set,
+		) = check_warp_sync_proof::<Block, TestBlockJustification>(
+		0,
+		initial_authorities.clone(),
+		proof.clone(),
+		).unwrap();
+
+		assert_eq!(current_set_id, 2);
+		assert_eq!(current_set, authorities_next);
+	}
 }
diff --git a/client/finality-grandpa/src/import.rs b/client/finality-grandpa/src/import.rs
index d9630e272ef9..2eef13d58360 100644
--- a/client/finality-grandpa/src/import.rs
+++ b/client/finality-grandpa/src/import.rs
@@ -182,7 +182,7 @@ impl<'a, Block: 'a + BlockT> Drop for PendingSetChanges<'a, Block> {
 	}
 }
 
-fn find_scheduled_change<B: BlockT>(header: &B::Header)
+pub(crate) fn find_scheduled_change<B: BlockT>(header: &B::Header)
 	-> Option<ScheduledChange<NumberFor<B>>>
 {
 	let id = OpaqueDigestItemId::Consensus(&GRANDPA_ENGINE_ID);
@@ -197,7 +197,7 @@ fn find_scheduled_change<B: BlockT>(header: &B::Header)
 	header.digest().convert_first(|l| l.try_to(id).and_then(filter_log))
 }
 
-fn find_forced_change<B: BlockT>(header: &B::Header)
+pub(crate) fn find_forced_change<B: BlockT>(header: &B::Header)
 	-> Option<(NumberFor<B>, ScheduledChange<NumberFor<B>>)>
 {
 	let id = OpaqueDigestItemId::Consensus(&GRANDPA_ENGINE_ID);
diff --git a/client/finality-grandpa/src/lib.rs b/client/finality-grandpa/src/lib.rs
index 040748448de6..d556ae089b61 100644
--- a/client/finality-grandpa/src/lib.rs
+++ b/client/finality-grandpa/src/lib.rs
@@ -130,6 +130,7 @@ pub use voting_rule::{
 	BeforeBestBlockBy, ThreeQuartersOfTheUnfinalizedChain, VotingRule, VotingRulesBuilder
 };
 pub use finality_grandpa::voter::report;
+pub use finality_proof::{prove_warp_sync, WarpSyncFragmentCache};
 
 use aux_schema::PersistentData;
 use environment::{Environment, VoterSetState};
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index a155899fbd99..3dc716b4e1c9 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -17,7 +17,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{
-	error::Error, DEFAULT_PROTOCOL_ID, MallocSizeOfWasm, RpcHandlers, NetworkStatusSinks,
+	error::Error, MallocSizeOfWasm, RpcHandlers, NetworkStatusSinks,
 	start_rpc_servers, build_network_future, TransactionPoolAdapter, TaskManager, SpawnTaskHandle,
 	metrics::MetricsService,
 	client::{light, Client, ClientConfig},
@@ -877,18 +877,7 @@ pub fn build_network<TBl, TExPool, TImpQu, TCl>(
 		client: client.clone(),
 	});
 
-	let protocol_id = {
-		let protocol_id_full = match config.chain_spec.protocol_id() {
-			Some(pid) => pid,
-			None => {
-				warn!("Using default protocol ID {:?} because none is configured in the \
-					chain specs", DEFAULT_PROTOCOL_ID
-				);
-				DEFAULT_PROTOCOL_ID
-			}
-		};
-		sc_network::config::ProtocolId::from(protocol_id_full)
-	};
+	let protocol_id = config.protocol_id();
 
 	let block_announce_validator = if let Some(f) = block_announce_validator_builder {
 		f(client.clone())
diff --git a/client/service/src/config.rs b/client/service/src/config.rs
index c3be40e08397..74d15cb3fb92 100644
--- a/client/service/src/config.rs
+++ b/client/service/src/config.rs
@@ -219,6 +219,20 @@ impl Configuration {
 			_ => None,
 		}
 	}
+
+	/// Returns the network protocol id from the chain spec, or the default.
+	pub fn protocol_id(&self) -> sc_network::config::ProtocolId {
+		let protocol_id_full = match self.chain_spec.protocol_id() {
+			Some(pid) => pid,
+			None => {
+				log::warn!("Using default protocol ID {:?} because none is configured in the \
+					chain specs", crate::DEFAULT_PROTOCOL_ID
+				);
+				crate::DEFAULT_PROTOCOL_ID
+			}
+		};
+		sc_network::config::ProtocolId::from(protocol_id_full)
+	}
 }
 
 /// Available RPC methods.

From bd5c9a646896b11061a6ff92af3c673958e238eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= <jon.haggblad@gmail.com>
Date: Thu, 21 Jan 2021 23:06:40 +0100
Subject: [PATCH 0307/1194] Cleaner GRANDPA RPC API for proving finality
 (#7339)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* grandpa: persist block number for last block of authority set

* grandpa: fix authority_set_changes field in tests

* grandpa: fix date on copyright notice

* grandpa-rpc: implement cleaner api for prove finality rpc

* grandpa-rpc: replace the old prove_finality with the new one

* grandpa: undo accidental whitespace change

* grandpa-rpc: start work on redo of the finality_proof RPC API

* grandpa: manual impl of Decode for AuthoritySet

* grandpa: add comment about appending changes for forced changes

* grandpa: flip order in set changes, tidy up some comments

* grandpa: update some of the doc comments

* grandpa: store authority set changes when applying forced changes

* grandpa: simplify finality_proof.rs

* grandpa: move checks and extend tests in finality_proof

* grandpa: address first set of review comments

* grandpa: check that set changes have well-defined start

* grandpa: rework prove_finality and assocated tests

* grandpa: make AuthoritySetChanges tuple struct

* grandpa: add assertions for tracking auth set changes

* grandpa: remove StorageAndProofProvider trait

* grandpa: return more informative results for unexpected input to RPC

* grandpa: tiny tweak to error msg

* grandpa: fix tests

* grandpa: add error specific to finality_proof

* grandpa: fix review comments

* grandpa: proper migration to new AuthoritySet

* grandpa: fix long lines

* grandpa: fix unused warning after merge

Co-authored-by: André Silva <andrerfosilva@gmail.com>
---
 bin/node/cli/src/service.rs                   |    7 +-
 client/finality-grandpa/rpc/src/error.rs      |    2 +-
 client/finality-grandpa/rpc/src/finality.rs   |   22 +-
 client/finality-grandpa/rpc/src/lib.rs        |   75 +-
 client/finality-grandpa/src/authorities.rs    |  121 +-
 client/finality-grandpa/src/aux_schema.rs     |  267 +++-
 client/finality-grandpa/src/finality_proof.rs | 1190 ++++++-----------
 client/finality-grandpa/src/lib.rs            |    2 +-
 client/finality-grandpa/src/tests.rs          |   46 +-
 9 files changed, 831 insertions(+), 901 deletions(-)

diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index 217914d2b3b0..838a6fb90219 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -109,8 +109,11 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 		let shared_voter_state = grandpa::SharedVoterState::empty();
 		let rpc_setup = shared_voter_state.clone();
 
-		let finality_proof_provider =
-			grandpa::FinalityProofProvider::new_for_service(backend.clone(), client.clone());
+		let finality_proof_provider = grandpa::FinalityProofProvider::new_for_service(
+			backend.clone(),
+			client.clone(),
+			Some(shared_authority_set.clone()),
+		);
 
 		let babe_config = babe_link.config().clone();
 		let shared_epoch_changes = babe_link.epoch_changes().clone();
diff --git a/client/finality-grandpa/rpc/src/error.rs b/client/finality-grandpa/rpc/src/error.rs
index 6122db03f880..c812b78f3fd8 100644
--- a/client/finality-grandpa/rpc/src/error.rs
+++ b/client/finality-grandpa/rpc/src/error.rs
@@ -30,7 +30,7 @@ pub enum Error {
 	VoterStateReportsUnreasonablyLargeNumbers,
 	/// GRANDPA prove finality failed.
 	#[display(fmt = "GRANDPA prove finality rpc failed: {}", _0)]
-	ProveFinalityFailed(sp_blockchain::Error),
+	ProveFinalityFailed(sc_finality_grandpa::FinalityProofError),
 }
 
 /// The error codes returned by jsonrpc.
diff --git a/client/finality-grandpa/rpc/src/finality.rs b/client/finality-grandpa/rpc/src/finality.rs
index 9272edb39b64..cfd8f68e5ce6 100644
--- a/client/finality-grandpa/rpc/src/finality.rs
+++ b/client/finality-grandpa/rpc/src/finality.rs
@@ -22,18 +22,16 @@ use sc_finality_grandpa::FinalityProofProvider;
 use sp_runtime::traits::{Block as BlockT, NumberFor};
 
 #[derive(Serialize, Deserialize)]
-pub struct EncodedFinalityProofs(pub sp_core::Bytes);
+pub struct EncodedFinalityProof(pub sp_core::Bytes);
 
 /// Local trait mainly to allow mocking in tests.
 pub trait RpcFinalityProofProvider<Block: BlockT> {
-	/// Return finality proofs for the given authorities set id, if it is provided, otherwise the
-	/// current one will be used.
+	/// Prove finality for the given block number by returning a Justification for the last block of
+	/// the authority set.
 	fn rpc_prove_finality(
 		&self,
-		begin: Block::Hash,
-		end: Block::Hash,
-		authorities_set_id: u64,
-	) -> Result<Option<EncodedFinalityProofs>, sp_blockchain::Error>;
+		block: NumberFor<Block>,
+	) -> Result<Option<EncodedFinalityProof>, sc_finality_grandpa::FinalityProofError>;
 }
 
 impl<B, Block> RpcFinalityProofProvider<Block> for FinalityProofProvider<B, Block>
@@ -44,11 +42,9 @@ where
 {
 	fn rpc_prove_finality(
 		&self,
-		begin: Block::Hash,
-		end: Block::Hash,
-		authorities_set_id: u64,
-	) -> Result<Option<EncodedFinalityProofs>, sp_blockchain::Error> {
-		self.prove_finality(begin, end, authorities_set_id)
-			.map(|x| x.map(|y| EncodedFinalityProofs(y.into())))
+		block: NumberFor<Block>,
+	) -> Result<Option<EncodedFinalityProof>, sc_finality_grandpa::FinalityProofError> {
+		self.prove_finality(block)
+			.map(|x| x.map(|y| EncodedFinalityProof(y.into())))
 	}
 }
diff --git a/client/finality-grandpa/rpc/src/lib.rs b/client/finality-grandpa/rpc/src/lib.rs
index c6e4613c4f51..204bea4c18e2 100644
--- a/client/finality-grandpa/rpc/src/lib.rs
+++ b/client/finality-grandpa/rpc/src/lib.rs
@@ -37,9 +37,9 @@ mod notification;
 mod report;
 
 use sc_finality_grandpa::GrandpaJustificationStream;
-use sp_runtime::traits::Block as BlockT;
+use sp_runtime::traits::{Block as BlockT, NumberFor};
 
-use finality::{EncodedFinalityProofs, RpcFinalityProofProvider};
+use finality::{EncodedFinalityProof, RpcFinalityProofProvider};
 use report::{ReportAuthoritySet, ReportVoterState, ReportedRoundStates};
 use notification::JustificationNotification;
 
@@ -48,7 +48,7 @@ type FutureResult<T> =
 
 /// Provides RPC methods for interacting with GRANDPA.
 #[rpc]
-pub trait GrandpaApi<Notification, Hash> {
+pub trait GrandpaApi<Notification, Hash, Number> {
 	/// RPC Metadata
 	type Metadata;
 
@@ -82,15 +82,13 @@ pub trait GrandpaApi<Notification, Hash> {
 		id: SubscriptionId
 	) -> jsonrpc_core::Result<bool>;
 
-	/// Prove finality for the range (begin; end] hash. Returns None if there are no finalized blocks
-	/// unknown in the range. If no authorities set is provided, the current one will be attempted.
+	/// Prove finality for the given block number by returning the Justification for the last block
+	/// in the set and all the intermediary headers to link them together.
 	#[rpc(name = "grandpa_proveFinality")]
 	fn prove_finality(
 		&self,
-		begin: Hash,
-		end: Hash,
-		authorities_set_id: Option<u64>,
-	) -> FutureResult<Option<EncodedFinalityProofs>>;
+		block: Number,
+	) -> FutureResult<Option<EncodedFinalityProof>>;
 }
 
 /// Implements the GrandpaApi RPC trait for interacting with GRANDPA.
@@ -127,7 +125,8 @@ impl<AuthoritySet, VoterState, Block: BlockT, ProofProvider>
 	}
 }
 
-impl<AuthoritySet, VoterState, Block, ProofProvider> GrandpaApi<JustificationNotification, Block::Hash>
+impl<AuthoritySet, VoterState, Block, ProofProvider>
+	GrandpaApi<JustificationNotification, Block::Hash, NumberFor<Block>>
 	for GrandpaRpcHandler<AuthoritySet, VoterState, Block, ProofProvider>
 where
 	VoterState: ReportVoterState + Send + Sync + 'static,
@@ -171,16 +170,9 @@ where
 
 	fn prove_finality(
 		&self,
-		begin: Block::Hash,
-		end: Block::Hash,
-		authorities_set_id: Option<u64>,
-	) -> FutureResult<Option<EncodedFinalityProofs>> {
-		// If we are not provided a set_id, try with the current one.
-		let authorities_set_id = authorities_set_id
-			.unwrap_or_else(|| self.authority_set.get().0);
-		let result = self
-			.finality_proof_provider
-			.rpc_prove_finality(begin, end, authorities_set_id);
+		block: NumberFor<Block>,
+	) -> FutureResult<Option<EncodedFinalityProof>> {
+		let result = self.finality_proof_provider.rpc_prove_finality(block);
 		let future = async move { result }.boxed();
 		Box::new(
 			future
@@ -204,7 +196,7 @@ mod tests {
 	use sc_block_builder::BlockBuilder;
 	use sc_finality_grandpa::{
 		report, AuthorityId, GrandpaJustificationSender, GrandpaJustification,
-		FinalityProofFragment,
+		FinalityProof,
 	};
 	use sp_blockchain::HeaderBackend;
 	use sp_consensus::RecordProof;
@@ -223,7 +215,7 @@ mod tests {
 	struct EmptyVoterState;
 
 	struct TestFinalityProofProvider {
-		finality_proofs: Vec<FinalityProofFragment<Header>>,
+		finality_proof: Option<FinalityProof<Header>>,
 	}
 
 	fn voters() -> HashSet<AuthorityId> {
@@ -262,11 +254,15 @@ mod tests {
 	impl<Block: BlockT> RpcFinalityProofProvider<Block> for TestFinalityProofProvider {
 		fn rpc_prove_finality(
 			&self,
-			_begin: Block::Hash,
-			_end: Block::Hash,
-			_authoritites_set_id: u64,
-		) -> Result<Option<EncodedFinalityProofs>, sp_blockchain::Error> {
-			Ok(Some(EncodedFinalityProofs(self.finality_proofs.encode().into())))
+			_block: NumberFor<Block>
+		) -> Result<Option<EncodedFinalityProof>, sc_finality_grandpa::FinalityProofError> {
+			Ok(Some(EncodedFinalityProof(
+				self.finality_proof
+					.as_ref()
+					.expect("Don't call rpc_prove_finality without setting the FinalityProof")
+					.encode()
+					.into()
+			)))
 		}
 	}
 
@@ -308,12 +304,12 @@ mod tests {
 	) where
 		VoterState: ReportVoterState + Send + Sync + 'static,
 	{
-		setup_io_handler_with_finality_proofs(voter_state, Default::default())
+		setup_io_handler_with_finality_proofs(voter_state, None)
 	}
 
 	fn setup_io_handler_with_finality_proofs<VoterState>(
 		voter_state: VoterState,
-		finality_proofs: Vec<FinalityProofFragment<Header>>,
+		finality_proof: Option<FinalityProof<Header>>,
 	) -> (
 		jsonrpc_core::MetaIoHandler<sc_rpc::Metadata>,
 		GrandpaJustificationSender<Block>,
@@ -321,7 +317,7 @@ mod tests {
 		VoterState: ReportVoterState + Send + Sync + 'static,
 	{
 		let (justification_sender, justification_stream) = GrandpaJustificationStream::channel();
-		let finality_proof_provider = Arc::new(TestFinalityProofProvider { finality_proofs });
+		let finality_proof_provider = Arc::new(TestFinalityProofProvider { finality_proof });
 
 		let handler = GrandpaRpcHandler::new(
 			TestAuthoritySet,
@@ -520,29 +516,24 @@ mod tests {
 
 	#[test]
 	fn prove_finality_with_test_finality_proof_provider() {
-		let finality_proofs = vec![FinalityProofFragment {
+		let finality_proof = FinalityProof {
 			block: header(42).hash(),
 			justification: create_justification().encode(),
 			unknown_headers: vec![header(2)],
-			authorities_proof: None,
-		}];
+		};
 		let (io,  _) = setup_io_handler_with_finality_proofs(
 			TestVoterState,
-			finality_proofs.clone(),
+			Some(finality_proof.clone()),
 		);
 
-		let request = "{\"jsonrpc\":\"2.0\",\"method\":\"grandpa_proveFinality\",\"params\":[\
-			\"0x0000000000000000000000000000000000000000000000000000000000000000\",\
-			\"0x0000000000000000000000000000000000000000000000000000000000000001\",\
-			42\
-		],\"id\":1}";
+		let request =
+			"{\"jsonrpc\":\"2.0\",\"method\":\"grandpa_proveFinality\",\"params\":[42],\"id\":1}";
 
 		let meta = sc_rpc::Metadata::default();
 		let resp = io.handle_request_sync(request, meta);
 		let mut resp: serde_json::Value = serde_json::from_str(&resp.unwrap()).unwrap();
 		let result: sp_core::Bytes = serde_json::from_value(resp["result"].take()).unwrap();
-		let fragments: Vec<FinalityProofFragment<Header>> =
-			Decode::decode(&mut &result[..]).unwrap();
-		assert_eq!(fragments, finality_proofs);
+		let finality_proof_rpc: FinalityProof<Header> = Decode::decode(&mut &result[..]).unwrap();
+		assert_eq!(finality_proof_rpc, finality_proof);
 	}
 }
diff --git a/client/finality-grandpa/src/authorities.rs b/client/finality-grandpa/src/authorities.rs
index 62a23a7ceab8..067f6dfc1ae6 100644
--- a/client/finality-grandpa/src/authorities.rs
+++ b/client/finality-grandpa/src/authorities.rs
@@ -114,6 +114,11 @@ where N: Add<Output=N> + Ord + Clone + Debug,
 	pub fn clone_inner(&self) -> AuthoritySet<H, N> {
 		self.inner.read().clone()
 	}
+
+	/// Clone the inner `AuthoritySetChanges`.
+	pub fn authority_set_changes(&self) -> AuthoritySetChanges<N> {
+		self.inner.read().authority_set_changes.clone()
+	}
 }
 
 impl<H, N> From<AuthoritySet<H, N>> for SharedAuthoritySet<H, N> {
@@ -152,12 +157,16 @@ pub struct AuthoritySet<H, N> {
 	/// is lower than the last finalized block (as signaled in the forced
 	/// change) must be applied beforehand.
 	pending_forced_changes: Vec<PendingChange<H, N>>,
+	/// Track at which blocks the set id changed. This is useful when we need to prove finality for a
+	/// given block since we can figure out what set the block belongs to and when the set
+	/// started/ended.
+	authority_set_changes: AuthoritySetChanges<N>,
 }
 
 impl<H, N> AuthoritySet<H, N>
 where
 	H: PartialEq,
-	N: Ord,
+	N: Ord + Clone,
 {
 	// authority sets must be non-empty and all weights must be greater than 0
 	fn invalid_authority_list(authorities: &AuthorityList) -> bool {
@@ -175,6 +184,7 @@ where
 			set_id: 0,
 			pending_standard_changes: ForkTree::new(),
 			pending_forced_changes: Vec::new(),
+			authority_set_changes: AuthoritySetChanges::empty(),
 		})
 	}
 
@@ -184,6 +194,7 @@ where
 		set_id: u64,
 		pending_standard_changes: ForkTree<H, N, PendingChange<H, N>>,
 		pending_forced_changes: Vec<PendingChange<H, N>>,
+		authority_set_changes: AuthoritySetChanges<N>,
 	) -> Option<Self> {
 		if Self::invalid_authority_list(&authorities) {
 			return None;
@@ -194,6 +205,7 @@ where
 			set_id,
 			pending_standard_changes,
 			pending_forced_changes,
+			authority_set_changes,
 		})
 	}
 
@@ -454,6 +466,9 @@ where
 					"block" => ?change.canon_height
 				);
 
+				let mut authority_set_changes = self.authority_set_changes.clone();
+				authority_set_changes.append(self.set_id, median_last_finalized.clone());
+
 				new_set = Some((
 					median_last_finalized,
 					AuthoritySet {
@@ -461,6 +476,7 @@ where
 						set_id: self.set_id + 1,
 						pending_standard_changes: ForkTree::new(), // new set, new changes.
 						pending_forced_changes: Vec::new(),
+						authority_set_changes,
 					},
 				));
 
@@ -532,6 +548,9 @@ where
 						"block" => ?change.canon_height
 					);
 
+					// Store the set_id together with the last block_number for the set
+					self.authority_set_changes.append(self.set_id, finalized_number.clone());
+
 					self.current_authorities = change.next_authorities;
 					self.set_id += 1;
 
@@ -631,6 +650,45 @@ impl<H, N: Add<Output=N> + Clone> PendingChange<H, N> {
 	}
 }
 
+// Tracks historical authority set changes. We store the block numbers for the first block of each
+// authority set, once they have been finalized.
+#[derive(Debug, Encode, Decode, Clone, PartialEq)]
+pub struct AuthoritySetChanges<N>(pub Vec<(u64, N)>);
+
+impl<N: Ord + Clone> AuthoritySetChanges<N> {
+	pub(crate) fn empty() -> Self {
+		Self(Default::default())
+	}
+
+	pub(crate) fn append(&mut self, set_id: u64, block_number: N) {
+		self.0.push((set_id, block_number));
+	}
+
+	pub(crate) fn get_set_id(&self, block_number: N) -> Option<(u64, N)> {
+		let idx = self.0
+			.binary_search_by_key(&block_number, |(_, n)| n.clone())
+			.unwrap_or_else(|b| b);
+		if idx < self.0.len() {
+			let (set_id, block_number) = self.0[idx].clone();
+			// To make sure we have the right set we need to check that the one before it also exists.
+			if idx > 0 {
+				let (prev_set_id, _) = self.0[idx - 1usize];
+				if set_id != prev_set_id + 1u64 {
+					// Without the preceding set_id we don't have a well-defined start.
+					return None;
+				}
+			} else if set_id != 0 {
+				// If this is the first index, yet not the first set id then it's not well-defined
+				// that we are in the right set id.
+				return None;
+			}
+			Some((set_id, block_number))
+		} else {
+			None
+		}
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;
@@ -657,6 +715,7 @@ mod tests {
 			set_id: 0,
 			pending_standard_changes: ForkTree::new(),
 			pending_forced_changes: Vec::new(),
+			authority_set_changes: AuthoritySetChanges::empty(),
 		};
 
 		let change = |height| {
@@ -704,6 +763,7 @@ mod tests {
 			set_id: 0,
 			pending_standard_changes: ForkTree::new(),
 			pending_forced_changes: Vec::new(),
+			authority_set_changes: AuthoritySetChanges::empty(),
 		};
 
 		let change_a = PendingChange {
@@ -772,6 +832,7 @@ mod tests {
 			set_id: 0,
 			pending_standard_changes: ForkTree::new(),
 			pending_forced_changes: Vec::new(),
+			authority_set_changes: AuthoritySetChanges::empty(),
 		};
 
 		let set_a = vec![(AuthorityId::from_slice(&[1; 32]), 5)];
@@ -820,6 +881,7 @@ mod tests {
 			authorities.pending_changes().collect::<Vec<_>>(),
 			vec![&change_a],
 		);
+		assert_eq!(authorities.authority_set_changes, AuthoritySetChanges::empty());
 
 		// finalizing "hash_d" will enact the change signaled at "hash_a"
 		let status = authorities.apply_standard_changes(
@@ -838,6 +900,7 @@ mod tests {
 		assert_eq!(authorities.current_authorities, set_a);
 		assert_eq!(authorities.set_id, 1);
 		assert_eq!(authorities.pending_changes().count(), 0);
+		assert_eq!(authorities.authority_set_changes, AuthoritySetChanges(vec![(0, 15)]));
 	}
 
 	#[test]
@@ -847,6 +910,7 @@ mod tests {
 			set_id: 0,
 			pending_standard_changes: ForkTree::new(),
 			pending_forced_changes: Vec::new(),
+			authority_set_changes: AuthoritySetChanges::empty(),
 		};
 
 		let set_a = vec![(AuthorityId::from_slice(&[1; 32]), 5)];
@@ -889,6 +953,7 @@ mod tests {
 			authorities.apply_standard_changes("hash_d", 40, &is_descendent_of, false),
 			Err(Error::ForkTree(fork_tree::Error::UnfinalizedAncestor))
 		));
+		assert_eq!(authorities.authority_set_changes, AuthoritySetChanges::empty());
 
 		let status = authorities.apply_standard_changes(
 			"hash_b",
@@ -902,6 +967,7 @@ mod tests {
 
 		assert_eq!(authorities.current_authorities, set_a);
 		assert_eq!(authorities.set_id, 1);
+		assert_eq!(authorities.authority_set_changes, AuthoritySetChanges(vec![(0, 15)]));
 
 		// after finalizing `change_a` it should be possible to finalize `change_c`
 		let status = authorities.apply_standard_changes(
@@ -916,6 +982,7 @@ mod tests {
 
 		assert_eq!(authorities.current_authorities, set_c);
 		assert_eq!(authorities.set_id, 2);
+		assert_eq!(authorities.authority_set_changes, AuthoritySetChanges(vec![(0, 15), (1, 40)]));
 	}
 
 	#[test]
@@ -925,6 +992,7 @@ mod tests {
 			set_id: 0,
 			pending_standard_changes: ForkTree::new(),
 			pending_forced_changes: Vec::new(),
+			authority_set_changes: AuthoritySetChanges::empty(),
 		};
 
 		let set_a = vec![(AuthorityId::from_slice(&[1; 32]), 5)];
@@ -991,6 +1059,7 @@ mod tests {
 			set_id: 0,
 			pending_standard_changes: ForkTree::new(),
 			pending_forced_changes: Vec::new(),
+			authority_set_changes: AuthoritySetChanges::empty(),
 		};
 
 		let set_a = vec![(AuthorityId::from_slice(&[1; 32]), 5)];
@@ -1074,6 +1143,7 @@ mod tests {
 					set_id: 1,
 					pending_standard_changes: ForkTree::new(),
 					pending_forced_changes: Vec::new(),
+					authority_set_changes: AuthoritySetChanges(vec![(0, 42)]),
 				},
 			)
 		);
@@ -1087,6 +1157,7 @@ mod tests {
 			set_id: 0,
 			pending_standard_changes: ForkTree::new(),
 			pending_forced_changes: Vec::new(),
+			authority_set_changes: AuthoritySetChanges::empty(),
 		};
 
 		let set_a = vec![(AuthorityId::from_slice(&[1; 32]), 5)];
@@ -1125,6 +1196,7 @@ mod tests {
 			set_id: 0,
 			pending_standard_changes: ForkTree::new(),
 			pending_forced_changes: Vec::new(),
+			authority_set_changes: AuthoritySetChanges::empty(),
 		};
 
 		// effective at #15
@@ -1179,22 +1251,26 @@ mod tests {
 			authorities.apply_forced_changes("hash_d45", 45, &static_is_descendent_of(true), false),
 			Err(Error::ForcedAuthoritySetChangeDependencyUnsatisfied(15))
 		));
+		assert_eq!(authorities.authority_set_changes, AuthoritySetChanges::empty());
 
 		// we apply the first pending standard change at #15
 		authorities
 			.apply_standard_changes("hash_a15", 15, &static_is_descendent_of(true), false)
 			.unwrap();
+		assert_eq!(authorities.authority_set_changes, AuthoritySetChanges(vec![(0, 15)]));
 
 		// but the forced change still depends on the next standard change
 		assert!(matches!(
 			authorities.apply_forced_changes("hash_d", 45, &static_is_descendent_of(true), false),
 			Err(Error::ForcedAuthoritySetChangeDependencyUnsatisfied(20))
 		));
+		assert_eq!(authorities.authority_set_changes, AuthoritySetChanges(vec![(0, 15)]));
 
 		// we apply the pending standard change at #20
 		authorities
 			.apply_standard_changes("hash_b", 20, &static_is_descendent_of(true), false)
 			.unwrap();
+		assert_eq!(authorities.authority_set_changes, AuthoritySetChanges(vec![(0, 15), (1, 20)]));
 
 		// afterwards the forced change at #45 can already be applied since it signals
 		// that finality stalled at #31, and the next pending standard change is effective
@@ -1211,9 +1287,11 @@ mod tests {
 					set_id: 3,
 					pending_standard_changes: ForkTree::new(),
 					pending_forced_changes: Vec::new(),
+					authority_set_changes: AuthoritySetChanges(vec![(0, 15), (1, 20), (2, 31)]),
 				}
 			),
 		);
+		assert_eq!(authorities.authority_set_changes, AuthoritySetChanges(vec![(0, 15), (1, 20)]));
 	}
 
 	#[test]
@@ -1225,6 +1303,7 @@ mod tests {
 			set_id: 0,
 			pending_standard_changes: ForkTree::new(),
 			pending_forced_changes: Vec::new(),
+			authority_set_changes: AuthoritySetChanges::empty(),
 		};
 
 		let new_set = current_authorities.clone();
@@ -1343,7 +1422,13 @@ mod tests {
 		// empty authority lists are invalid
 		assert_eq!(AuthoritySet::<(), ()>::genesis(vec![]), None);
 		assert_eq!(
-			AuthoritySet::<(), ()>::new(vec![], 0, ForkTree::new(), Vec::new()),
+			AuthoritySet::<(), ()>::new(
+				vec![],
+				0,
+				ForkTree::new(),
+				Vec::new(),
+				AuthoritySetChanges::empty(),
+			),
 			None,
 		);
 
@@ -1362,7 +1447,8 @@ mod tests {
 				invalid_authorities_weight.clone(),
 				0,
 				ForkTree::new(),
-				Vec::new()
+				Vec::new(),
+				AuthoritySetChanges::empty(),
 			),
 			None,
 		);
@@ -1417,6 +1503,7 @@ mod tests {
 			set_id: 0,
 			pending_standard_changes: ForkTree::new(),
 			pending_forced_changes: Vec::new(),
+			authority_set_changes: AuthoritySetChanges::empty(),
 		};
 
 		let new_set = current_authorities.clone();
@@ -1512,4 +1599,32 @@ mod tests {
 			"D"
 		);
 	}
+
+	#[test]
+	fn authority_set_changes_for_complete_data() {
+		let mut authority_set_changes = AuthoritySetChanges::empty();
+		authority_set_changes.append(0, 41);
+		authority_set_changes.append(1, 81);
+		authority_set_changes.append(2, 121);
+
+		assert_eq!(authority_set_changes.get_set_id(20), Some((0, 41)));
+		assert_eq!(authority_set_changes.get_set_id(40), Some((0, 41)));
+		assert_eq!(authority_set_changes.get_set_id(41), Some((0, 41)));
+		assert_eq!(authority_set_changes.get_set_id(42), Some((1, 81)));
+		assert_eq!(authority_set_changes.get_set_id(141), None);
+	}
+
+	#[test]
+	fn authority_set_changes_for_incomplete_data() {
+		let mut authority_set_changes = AuthoritySetChanges::empty();
+		authority_set_changes.append(2, 41);
+		authority_set_changes.append(3, 81);
+		authority_set_changes.append(4, 121);
+
+		assert_eq!(authority_set_changes.get_set_id(20), None);
+		assert_eq!(authority_set_changes.get_set_id(40), None);
+		assert_eq!(authority_set_changes.get_set_id(41), None);
+		assert_eq!(authority_set_changes.get_set_id(42), Some((3, 81)));
+		assert_eq!(authority_set_changes.get_set_id(141), None);
+	}
 }
diff --git a/client/finality-grandpa/src/aux_schema.rs b/client/finality-grandpa/src/aux_schema.rs
index 0146269c8f71..a5092334b99f 100644
--- a/client/finality-grandpa/src/aux_schema.rs
+++ b/client/finality-grandpa/src/aux_schema.rs
@@ -28,7 +28,9 @@ use sp_runtime::traits::{Block as BlockT, NumberFor};
 use log::{info, warn};
 use sp_finality_grandpa::{AuthorityList, SetId, RoundNumber};
 
-use crate::authorities::{AuthoritySet, SharedAuthoritySet, PendingChange, DelayKind};
+use crate::authorities::{
+	AuthoritySet, AuthoritySetChanges, SharedAuthoritySet, PendingChange, DelayKind,
+};
 use crate::environment::{
 	CompletedRound, CompletedRounds, CurrentRounds, HasVoted, SharedVoterSetState, VoterSetState,
 };
@@ -39,7 +41,7 @@ const SET_STATE_KEY: &[u8] = b"grandpa_completed_round";
 const CONCLUDED_ROUNDS: &[u8] = b"grandpa_concluded_rounds";
 const AUTHORITY_SET_KEY: &[u8] = b"grandpa_voters";
 
-const CURRENT_VERSION: u32 = 2;
+const CURRENT_VERSION: u32 = 3;
 
 /// The voter set state.
 #[derive(Debug, Clone, Encode, Decode)]
@@ -69,8 +71,9 @@ struct V0AuthoritySet<H, N> {
 }
 
 impl<H, N> Into<AuthoritySet<H, N>> for V0AuthoritySet<H, N>
-where H: Clone + Debug + PartialEq,
-	  N: Clone + Debug + Ord,
+where
+	H: Clone + Debug + PartialEq,
+	N: Clone + Debug + Ord,
 {
 	fn into(self) -> AuthoritySet<H, N> {
 		let mut pending_standard_changes = ForkTree::new();
@@ -101,19 +104,46 @@ where H: Clone + Debug + PartialEq,
 			self.set_id,
 			pending_standard_changes,
 			Vec::new(),
+			AuthoritySetChanges::empty(),
 		);
 
 		authority_set.expect("current_authorities is non-empty and weights are non-zero; qed.")
 	}
 }
 
-pub(crate) fn load_decode<B: AuxStore, T: Decode>(backend: &B, key: &[u8]) -> ClientResult<Option<T>> {
+impl<H, N> Into<AuthoritySet<H, N>> for V2AuthoritySet<H, N>
+where
+	H: Clone + Debug + PartialEq,
+	N: Clone + Debug + Ord,
+{
+	fn into(self) -> AuthoritySet<H, N> {
+		AuthoritySet::new(
+			self.current_authorities,
+			self.set_id,
+			self.pending_standard_changes,
+			self.pending_forced_changes,
+			AuthoritySetChanges::empty(),
+		)
+		.expect("current_authorities is non-empty and weights are non-zero; qed.")
+	}
+}
+
+#[derive(Debug, Clone, Encode, Decode, PartialEq)]
+struct V2AuthoritySet<H, N> {
+	current_authorities: AuthorityList,
+	set_id: u64,
+	pending_standard_changes: ForkTree<H, N, PendingChange<H, N>>,
+	pending_forced_changes: Vec<PendingChange<H, N>>,
+}
+
+pub(crate) fn load_decode<B: AuxStore, T: Decode>(
+	backend: &B, 
+	key: &[u8]
+) -> ClientResult<Option<T>> {
 	match backend.get_aux(key)? {
 		None => Ok(None),
 		Some(t) => T::decode(&mut &t[..])
-			.map_err(
-				|e| ClientError::Backend(format!("GRANDPA DB is corrupted: {}", e.what())),
-			)
+			.map_err(|e| ClientError::Backend(format!("GRANDPA DB is corrupted: {}", e.what())))
 			.map(Some)
 	}
 }
@@ -127,11 +157,15 @@ pub(crate) struct PersistentData<Block: BlockT> {
 fn migrate_from_version0<Block: BlockT, B, G>(
 	backend: &B,
 	genesis_round: &G,
-) -> ClientResult<Option<(
-	AuthoritySet<Block::Hash, NumberFor<Block>>,
-	VoterSetState<Block>,
-)>> where B: AuxStore,
-		  G: Fn() -> RoundState<Block::Hash, NumberFor<Block>>,
+) -> ClientResult<
+	Option<(
+		AuthoritySet<Block::Hash, NumberFor<Block>>,
+		VoterSetState<Block>,
+	)>,
+>
+where
+	B: AuxStore,
+	G: Fn() -> RoundState<Block::Hash, NumberFor<Block>>,
 {
 	CURRENT_VERSION.using_encoded(|s|
 		backend.insert_aux(&[(VERSION_KEY, s)], &[])
@@ -144,18 +178,20 @@ fn migrate_from_version0<Block: BlockT, B, G>(
 		let new_set: AuthoritySet<Block::Hash, NumberFor<Block>> = old_set.into();
 		backend.insert_aux(&[(AUTHORITY_SET_KEY, new_set.encode().as_slice())], &[])?;
 
-		let (last_round_number, last_round_state) = match load_decode::<_, V0VoterSetState<Block::Hash, NumberFor<Block>>>(
-			backend,
-			SET_STATE_KEY,
-		)? {
+		let (last_round_number, last_round_state) = match load_decode::<
+			_,
+			V0VoterSetState<Block::Hash, NumberFor<Block>>,
+		>(backend, SET_STATE_KEY)?
+		{
 			Some((number, state)) => (number, state),
 			None => (0, genesis_round()),
 		};
 
 		let set_id = new_set.set_id;
 
-		let base = last_round_state.prevote_ghost
-			.expect("state is for completed round; completed rounds must have a prevote ghost; qed.");
+		let base = last_round_state.prevote_ghost.expect(
+			"state is for completed round; completed rounds must have a prevote ghost; qed."
+		);
 
 		let mut current_rounds = CurrentRounds::new();
 		current_rounds.insert(last_round_number + 1, HasVoted::No);
@@ -185,11 +221,15 @@ fn migrate_from_version0<Block: BlockT, B, G>(
 fn migrate_from_version1<Block: BlockT, B, G>(
 	backend: &B,
 	genesis_round: &G,
-) -> ClientResult<Option<(
-	AuthoritySet<Block::Hash, NumberFor<Block>>,
-	VoterSetState<Block>,
-)>> where B: AuxStore,
-		  G: Fn() -> RoundState<Block::Hash, NumberFor<Block>>,
+) -> ClientResult<
+	Option<(
+		AuthoritySet<Block::Hash, NumberFor<Block>>,
+		VoterSetState<Block>,
+	)>,
+>
+where
+	B: AuxStore,
+	G: Fn() -> RoundState<Block::Hash, NumberFor<Block>>,
 {
 	CURRENT_VERSION.using_encoded(|s|
 		backend.insert_aux(&[(VERSION_KEY, s)], &[])
@@ -257,17 +297,64 @@ fn migrate_from_version1<Block: BlockT, B, G>(
 	Ok(None)
 }
 
+fn migrate_from_version2<Block: BlockT, B, G>(
+	backend: &B,
+	genesis_round: &G,
+) -> ClientResult<
+	Option<(
+		AuthoritySet<Block::Hash, NumberFor<Block>>,
+		VoterSetState<Block>,
+	)>,
+>
+where
+	B: AuxStore,
+	G: Fn() -> RoundState<Block::Hash, NumberFor<Block>>,
+{
+	CURRENT_VERSION.using_encoded(|s|
+		backend.insert_aux(&[(VERSION_KEY, s)], &[])
+	)?;
+
+	if let Some(old_set) = load_decode::<_, V2AuthoritySet<Block::Hash, NumberFor<Block>>>(
+		backend,
+		AUTHORITY_SET_KEY,
+	)? {
+		let new_set: AuthoritySet<Block::Hash, NumberFor<Block>> = old_set.into();
+		backend.insert_aux(&[(AUTHORITY_SET_KEY, new_set.encode().as_slice())], &[])?;
+
+		let set_state = match load_decode::<_, VoterSetState<Block>>(
+			backend,
+			SET_STATE_KEY,
+		)? {
+			Some(state) => state,
+			None => {
+				let state = genesis_round();
+				let base = state.prevote_ghost
+					.expect("state is for completed round; completed rounds must have a prevote ghost; qed.");
+
+				VoterSetState::live(
+					new_set.set_id,
+					&new_set,
+					base,
+				)
+			}
+		};
+
+		return Ok(Some((new_set, set_state)));
+	}
+
+	Ok(None)
+}
+
 /// Load or initialize persistent data from backend.
 pub(crate) fn load_persistent<Block: BlockT, B, G>(
 	backend: &B,
 	genesis_hash: Block::Hash,
 	genesis_number: NumberFor<Block>,
 	genesis_authorities: G,
-)
-	-> ClientResult<PersistentData<Block>>
-	where
-		B: AuxStore,
-		G: FnOnce() -> ClientResult<AuthorityList>,
+) -> ClientResult<PersistentData<Block>>
+where
+	B: AuxStore,
+	G: FnOnce() -> ClientResult<AuthorityList>,
 {
 	let version: Option<u32> = load_decode(backend, VERSION_KEY)?;
 
@@ -275,7 +362,9 @@ pub(crate) fn load_persistent<Block: BlockT, B, G>(
 
 	match version {
 		None => {
-			if let Some((new_set, set_state)) = migrate_from_version0::<Block, _, _>(backend, &make_genesis_round)? {
+			if let Some((new_set, set_state)) =
+				migrate_from_version0::<Block, _, _>(backend, &make_genesis_round)?
+			{
 				return Ok(PersistentData {
 					authority_set: new_set.into(),
 					set_state: set_state.into(),
@@ -283,7 +372,9 @@ pub(crate) fn load_persistent<Block: BlockT, B, G>(
 			}
 		},
 		Some(1) => {
-			if let Some((new_set, set_state)) = migrate_from_version1::<Block, _, _>(backend, &make_genesis_round)? {
+			if let Some((new_set, set_state)) =
+				migrate_from_version1::<Block, _, _>(backend, &make_genesis_round)?
+			{
 				return Ok(PersistentData {
 					authority_set: new_set.into(),
 					set_state: set_state.into(),
@@ -291,6 +382,16 @@ pub(crate) fn load_persistent<Block: BlockT, B, G>(
 			}
 		},
 		Some(2) => {
+			if let Some((new_set, set_state)) =
+				migrate_from_version2::<Block, _, _>(backend, &make_genesis_round)?
+			{
+				return Ok(PersistentData {
+					authority_set: new_set.into(),
+					set_state: set_state.into(),
+				});
+			}
+		}
+		Some(3) => {
 			if let Some(set) = load_decode::<_, AuthoritySet<Block::Hash, NumberFor<Block>>>(
 				backend,
 				AUTHORITY_SET_KEY,
@@ -364,7 +465,8 @@ pub(crate) fn update_authority_set<Block: BlockT, F, R>(
 	set: &AuthoritySet<Block::Hash, NumberFor<Block>>,
 	new_set: Option<&NewAuthoritySet<Block::Hash, NumberFor<Block>>>,
 	write_aux: F
-) -> R where
+) -> R
+where
 	F: FnOnce(&[(&'static [u8], &[u8])]) -> R,
 {
 	// write new authority set state to disk.
@@ -414,8 +516,9 @@ pub(crate) fn write_concluded_round<Block: BlockT, B: AuxStore>(
 }
 
 #[cfg(test)]
-pub(crate) fn load_authorities<B: AuxStore, H: Decode, N: Decode>(backend: &B)
-	-> Option<AuthoritySet<H, N>> {
+pub(crate) fn load_authorities<B: AuxStore, H: Decode, N: Decode + Clone + Ord>(
+	backend: &B
+) -> Option<AuthoritySet<H, N>> {
 	load_decode::<_, AuthoritySet<H, N>>(backend, AUTHORITY_SET_KEY)
 		.expect("backend error")
 }
@@ -474,10 +577,14 @@ mod test {
 
 		assert_eq!(
 			load_decode::<_, u32>(&client, VERSION_KEY).unwrap(),
-			Some(2),
+			Some(3),
 		);
 
-		let PersistentData { authority_set, set_state, .. } = load_persistent::<substrate_test_runtime_client::runtime::Block, _, _>(
+		let PersistentData {
+			authority_set,
+			set_state,
+			..
+		} = load_persistent::<substrate_test_runtime_client::runtime::Block, _, _>(
 			&client,
 			H256::random(),
 			0,
@@ -491,6 +598,7 @@ mod test {
 				set_id,
 				ForkTree::new(),
 				Vec::new(),
+				AuthoritySetChanges::empty(),
 			).unwrap(),
 		);
 
@@ -535,6 +643,7 @@ mod test {
 				set_id,
 				ForkTree::new(),
 				Vec::new(),
+				AuthoritySetChanges::empty(),
 			).unwrap();
 
 			let voter_set_state = V1VoterSetState::Live(round_number, round_state.clone());
@@ -564,10 +673,14 @@ mod test {
 
 		assert_eq!(
 			load_decode::<_, u32>(&client, VERSION_KEY).unwrap(),
-			Some(2),
+			Some(3),
 		);
 
-		let PersistentData { authority_set, set_state, .. } = load_persistent::<substrate_test_runtime_client::runtime::Block, _, _>(
+		let PersistentData {
+			authority_set,
+			set_state,
+			..
+		} = load_persistent::<substrate_test_runtime_client::runtime::Block, _, _>(
 			&client,
 			H256::random(),
 			0,
@@ -581,6 +694,7 @@ mod test {
 				set_id,
 				ForkTree::new(),
 				Vec::new(),
+				AuthoritySetChanges::empty(),
 			).unwrap(),
 		);
 
@@ -605,6 +719,79 @@ mod test {
 		);
 	}
 
+	#[test]
+	fn load_decode_from_v2_migrates_data_format() {
+		let client = substrate_test_runtime_client::new();
+
+		let authorities = vec![(AuthorityId::default(), 100)];
+		let set_id = 3;
+
+		{
+			let authority_set = V2AuthoritySet::<H256, u64> {
+				current_authorities: authorities.clone(),
+				set_id,
+				pending_standard_changes: ForkTree::new(),
+				pending_forced_changes: Vec::new(),
+			};
+
+			let genesis_state = (H256::random(), 32);
+			let voter_set_state: VoterSetState<substrate_test_runtime_client::runtime::Block> =
+				VoterSetState::live(
+					set_id,
+					&authority_set.clone().into(), // Note the conversion!
+					genesis_state
+				);
+
+			client.insert_aux(
+				&[
+					(AUTHORITY_SET_KEY, authority_set.encode().as_slice()),
+					(SET_STATE_KEY, voter_set_state.encode().as_slice()),
+					(VERSION_KEY, 2u32.encode().as_slice()),
+				],
+				&[],
+			).unwrap();
+		}
+
+		assert_eq!(
+			load_decode::<_, u32>(&client, VERSION_KEY).unwrap(),
+			Some(2),
+		);
+
+		// should perform the migration
+		load_persistent::<substrate_test_runtime_client::runtime::Block, _, _>(
+			&client,
+			H256::random(),
+			0,
+			|| unreachable!(),
+		).unwrap();
+
+		assert_eq!(
+			load_decode::<_, u32>(&client, VERSION_KEY).unwrap(),
+			Some(3),
+		);
+
+		let PersistentData {
+			authority_set,
+			..
+		 } = load_persistent::<substrate_test_runtime_client::runtime::Block, _, _>(
+			&client,
+			H256::random(),
+			0,
+			|| unreachable!(),
+		).unwrap();
+
+		assert_eq!(
+			*authority_set.inner().read(),
+			AuthoritySet::new(
+				authorities.clone(),
+				set_id,
+				ForkTree::new(),
+				Vec::new(),
+				AuthoritySetChanges::empty(),
+			).unwrap(),
+		);
+	}
+
 	#[test]
 	fn write_read_concluded_rounds() {
 		let client = substrate_test_runtime_client::new();
@@ -625,7 +812,9 @@ mod test {
 		round_number.using_encoded(|n| key.extend(n));
 
 		assert_eq!(
-			load_decode::<_, CompletedRound::<substrate_test_runtime_client::runtime::Block>>(&client, &key).unwrap(),
+			load_decode::<_, CompletedRound::<substrate_test_runtime_client::runtime::Block>>(
+				&client, &key
+			).unwrap(),
 			Some(completed_round),
 		);
 	}
diff --git a/client/finality-grandpa/src/finality_proof.rs b/client/finality-grandpa/src/finality_proof.rs
index a0fad2f92c88..73726146af4e 100644
--- a/client/finality-grandpa/src/finality_proof.rs
+++ b/client/finality-grandpa/src/finality_proof.rs
@@ -16,9 +16,6 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-// NOTE: should be removed with: https://github.com/paritytech/substrate/pull/7339
-#![allow(dead_code)]
-
 //! GRANDPA block finality proof generation and check.
 //!
 //! Finality of block B is proved by providing:
@@ -42,12 +39,10 @@
 use std::sync::Arc;
 use log::trace;
 
-use sp_blockchain::{Backend as BlockchainBackend, Error as ClientError, Result as ClientResult};
-use sc_client_api::{
-	backend::Backend, StorageProof,
-	light::{FetchChecker, RemoteReadRequest},
-	StorageProvider, ProofProvider,
+use sp_blockchain::{
+	Backend as BlockchainBackend, Error as ClientError, Result as ClientResult,
 };
+use sc_client_api::{backend::Backend, StorageProvider};
 use parity_scale_codec::{Encode, Decode};
 use finality_grandpa::BlockNumberOps;
 use sp_runtime::{
@@ -55,42 +50,25 @@ use sp_runtime::{
 	traits::{NumberFor, Block as BlockT, Header as HeaderT, Zero, One},
 };
 use sp_core::storage::StorageKey;
-use sc_telemetry::{telemetry, CONSENSUS_INFO};
 use sp_finality_grandpa::{AuthorityId, AuthorityList, VersionedAuthorityList, GRANDPA_AUTHORITIES_KEY};
 
 use crate::justification::GrandpaJustification;
 use crate::VoterSet;
+use crate::SharedAuthoritySet;
+use crate::authorities::AuthoritySetChanges;
 
-/// Maximum number of fragments that we want to return in a single prove_finality call.
-const MAX_FRAGMENTS_IN_PROOF: usize = 8;
+const MAX_UNKNOWN_HEADERS: usize = 100_000;
 
-/// GRANDPA authority set related methods for the finality proof provider.
 pub trait AuthoritySetForFinalityProver<Block: BlockT>: Send + Sync {
 	/// Read GRANDPA_AUTHORITIES_KEY from storage at given block.
 	fn authorities(&self, block: &BlockId<Block>) -> ClientResult<AuthorityList>;
-	/// Prove storage read of GRANDPA_AUTHORITIES_KEY at given block.
-	fn prove_authorities(&self, block: &BlockId<Block>) -> ClientResult<StorageProof>;
 }
 
-/// Trait that combines `StorageProvider` and `ProofProvider`
-pub trait StorageAndProofProvider<Block, BE>: StorageProvider<Block, BE> + ProofProvider<Block> + Send + Sync
-	where
-		Block: BlockT,
-		BE: Backend<Block> + Send + Sync,
-{}
-
-/// Blanket implementation.
-impl<Block, BE, P> StorageAndProofProvider<Block, BE> for P
-	where
-		Block: BlockT,
-		BE: Backend<Block> + Send + Sync,
-		P: StorageProvider<Block, BE> + ProofProvider<Block> + Send + Sync,
-{}
-
 /// Implementation of AuthoritySetForFinalityProver.
-impl<BE, Block: BlockT> AuthoritySetForFinalityProver<Block> for Arc<dyn StorageAndProofProvider<Block, BE>>
-	where
-		BE: Backend<Block> + Send + Sync + 'static,
+impl<BE, Block: BlockT> AuthoritySetForFinalityProver<Block>
+	for Arc<dyn StorageProvider<Block, BE> + Send + Sync>
+where
+	BE: Backend<Block> + Send + Sync + 'static,
 {
 	fn authorities(&self, block: &BlockId<Block>) -> ClientResult<AuthorityList> {
 		let storage_key = StorageKey(GRANDPA_AUTHORITIES_KEY.to_vec());
@@ -99,153 +77,113 @@ impl<BE, Block: BlockT> AuthoritySetForFinalityProver<Block> for Arc<dyn Storage
 			.map(|versioned| versioned.into())
 			.ok_or(ClientError::InvalidAuthoritiesSet)
 	}
-
-	fn prove_authorities(&self, block: &BlockId<Block>) -> ClientResult<StorageProof> {
-		self.read_proof(block, &mut std::iter::once(GRANDPA_AUTHORITIES_KEY))
-	}
-}
-
-/// GRANDPA authority set related methods for the finality proof checker.
-pub trait AuthoritySetForFinalityChecker<Block: BlockT>: Send + Sync {
-	/// Check storage read proof of GRANDPA_AUTHORITIES_KEY at given block.
-	fn check_authorities_proof(
-		&self,
-		hash: Block::Hash,
-		header: Block::Header,
-		proof: StorageProof,
-	) -> ClientResult<AuthorityList>;
-}
-
-/// FetchChecker-based implementation of AuthoritySetForFinalityChecker.
-impl<Block: BlockT> AuthoritySetForFinalityChecker<Block> for Arc<dyn FetchChecker<Block>> {
-	fn check_authorities_proof(
-		&self,
-		hash: Block::Hash,
-		header: Block::Header,
-		proof: StorageProof,
-	) -> ClientResult<AuthorityList> {
-		let storage_key = GRANDPA_AUTHORITIES_KEY.to_vec();
-		let request = RemoteReadRequest {
-			block: hash,
-			header,
-			keys: vec![storage_key.clone()],
-			retry_count: None,
-		};
-
-		self.check_read_proof(&request, proof)
-			.and_then(|results| {
-				let maybe_encoded = results.get(&storage_key)
-					.expect(
-						"storage_key is listed in the request keys; \
-						check_read_proof must return a value for each requested key;
-						qed"
-					);
-				maybe_encoded
-					.as_ref()
-					.and_then(|encoded| {
-						VersionedAuthorityList::decode(&mut encoded.as_slice()).ok()
-					})
-					.map(|versioned| versioned.into())
-					.ok_or(ClientError::InvalidAuthoritiesSet)
-			})
-	}
 }
 
 /// Finality proof provider for serving network requests.
-pub struct FinalityProofProvider<B, Block: BlockT> {
-	backend: Arc<B>,
+pub struct FinalityProofProvider<BE, Block: BlockT> {
+	backend: Arc<BE>,
 	authority_provider: Arc<dyn AuthoritySetForFinalityProver<Block>>,
+	shared_authority_set: Option<SharedAuthoritySet<Block::Hash, NumberFor<Block>>>,
 }
 
 impl<B, Block: BlockT> FinalityProofProvider<B, Block>
-	where B: Backend<Block> + Send + Sync + 'static
+where
+	B: Backend<Block> + Send + Sync + 'static,
 {
 	/// Create new finality proof provider using:
 	///
 	/// - backend for accessing blockchain data;
 	/// - authority_provider for calling and proving runtime methods.
+	/// - shared_authority_set for accessing authority set data
 	pub fn new<P>(
 		backend: Arc<B>,
 		authority_provider: P,
+		shared_authority_set: Option<SharedAuthoritySet<Block::Hash, NumberFor<Block>>>,
 	) -> Self
-		where P: AuthoritySetForFinalityProver<Block> + 'static,
+	where
+		P: AuthoritySetForFinalityProver<Block> + 'static,
 	{
-		FinalityProofProvider { backend, authority_provider: Arc::new(authority_provider) }
+		FinalityProofProvider {
+			backend,
+			authority_provider: Arc::new(authority_provider),
+			shared_authority_set,
+		}
 	}
 
 	/// Create new finality proof provider for the service using:
 	///
 	/// - backend for accessing blockchain data;
-	/// - storage_and_proof_provider, which is generally a client.
+	/// - storage_provider, which is generally a client.
+	/// - shared_authority_set for accessing authority set data
 	pub fn new_for_service(
 		backend: Arc<B>,
-		storage_and_proof_provider: Arc<dyn StorageAndProofProvider<Block, B>>,
+		storage_provider: Arc<dyn StorageProvider<Block, B> + Send + Sync>,
+		shared_authority_set: Option<SharedAuthoritySet<Block::Hash, NumberFor<Block>>>,
 	) -> Arc<Self> {
-		Arc::new(Self::new(backend, storage_and_proof_provider))
+		Arc::new(Self::new(
+			backend,
+			storage_provider,
+			shared_authority_set,
+		))
 	}
 }
 
 impl<B, Block> FinalityProofProvider<B, Block>
-	where
-		Block: BlockT,
-		NumberFor<Block>: BlockNumberOps,
-		B: Backend<Block> + Send + Sync + 'static,
+where
+	Block: BlockT,
+	NumberFor<Block>: BlockNumberOps,
+	B: Backend<Block> + Send + Sync + 'static,
 {
-	/// Prove finality for the range (begin; end] hash. Returns None if there are no finalized blocks
-	/// unknown in the range.
-	pub fn prove_finality(
-		&self,
-		begin: Block::Hash,
-		end: Block::Hash,
-		authorities_set_id: u64,
-	) -> Result<Option<Vec<u8>>, ClientError> {
+	/// Prove finality for the given block number by returning a Justification for the last block of
+	/// the authority set.
+	pub fn prove_finality(&self, block: NumberFor<Block>)
+		-> Result<Option<Vec<u8>>, FinalityProofError>
+	{
+		let authority_set_changes = if let Some(changes) = self
+			.shared_authority_set
+			.as_ref()
+			.map(SharedAuthoritySet::authority_set_changes)
+		{
+			changes
+		} else {
+			return Ok(None);
+		};
+
 		prove_finality::<_, _, GrandpaJustification<Block>>(
 			&*self.backend.blockchain(),
 			&*self.authority_provider,
-			authorities_set_id,
-			begin,
-			end,
+			authority_set_changes,
+			block,
 		)
 	}
 }
 
-/// The effects of block finality.
-#[derive(Debug, PartialEq)]
-pub struct FinalityEffects<Header: HeaderT> {
-	/// The (ordered) set of headers that could be imported.
-	pub headers_to_import: Vec<Header>,
-	/// The hash of the block that could be finalized.
-	pub block: Header::Hash,
-	/// The justification for the block.
-	pub justification: Vec<u8>,
-	/// New authorities set id that should be applied starting from block.
-	pub new_set_id: u64,
-	/// New authorities set that should be applied starting from block.
-	pub new_authorities: AuthorityList,
-}
-
-/// Single fragment of proof-of-finality.
-///
 /// Finality for block B is proved by providing:
 /// 1) the justification for the descendant block F;
 /// 2) headers sub-chain (B; F] if B != F;
-/// 3) proof of GRANDPA::authorities() if the set changes at block F.
 #[derive(Debug, PartialEq, Encode, Decode, Clone)]
-pub struct FinalityProofFragment<Header: HeaderT> {
+pub struct FinalityProof<Header: HeaderT> {
 	/// The hash of block F for which justification is provided.
 	pub block: Header::Hash,
 	/// Justification of the block F.
 	pub justification: Vec<u8>,
-	/// The set of headers in the range (U; F] that we believe are unknown to the caller. Ordered.
+	/// The set of headers in the range (B; F] that we believe are unknown to the caller. Ordered.
 	pub unknown_headers: Vec<Header>,
-	/// Optional proof of execution of GRANDPA::authorities() at the `block`.
-	pub authorities_proof: Option<StorageProof>,
 }
 
-/// Proof of finality is the ordered set of finality fragments, where:
-/// - last fragment provides justification for the best possible block from the requested range;
-/// - all other fragments provide justifications for GRANDPA authorities set changes within requested range.
-type FinalityProof<Header> = Vec<FinalityProofFragment<Header>>;
+/// Errors occurring when trying to prove finality
+#[derive(Debug, derive_more::Display, derive_more::From)]
+pub enum FinalityProofError {
+	/// The requested block has not yet been finalized.
+	#[display(fmt = "Block not yet finalized")]
+	BlockNotYetFinalized,
+	/// The requested block is not covered by authority set changes. Likely this means the block is
+	/// in the latest authority set, and the subscription API is more appropriate.
+	#[display(fmt = "Block not covered by authority set changes")]
+	BlockNotInAuthoritySetChanges,
+	/// Errors originating from the client.
+	Client(sp_blockchain::Error),
+}
 
 /// Single fragment of authority set proof.
 ///
@@ -264,182 +202,102 @@ pub(crate) struct AuthoritySetProofFragment<Header: HeaderT> {
 /// - last fragment match target block.
 type AuthoritySetProof<Header> = Vec<AuthoritySetProofFragment<Header>>;
 
-/// Finality proof request data.
-#[derive(Debug, Encode, Decode)]
-enum FinalityProofRequest<H: Encode + Decode> {
-	/// Original version of the request.
-	Original(OriginalFinalityProofRequest<H>),
-}
-
-/// Original version of finality proof request.
-#[derive(Debug, Encode, Decode)]
-struct OriginalFinalityProofRequest<H: Encode + Decode> {
-	/// The authorities set id we are waiting proof from.
-	///
-	/// The first justification in the proof must be signed by this authority set.
-	pub authorities_set_id: u64,
-	/// Hash of the last known finalized block.
-	pub last_finalized: H,
-}
-
-/// Prepare proof-of-finality for the best possible block in the range: (begin; end].
-///
-/// It is assumed that the caller already have a proof-of-finality for the block 'begin'.
-/// It is assumed that the caller already knows all blocks in the range (begin; end].
-///
-/// Returns None if there are no finalized blocks unknown to the caller.
-pub(crate) fn prove_finality<Block: BlockT, B: BlockchainBackend<Block>, J>(
+fn prove_finality<Block, B, J>(
 	blockchain: &B,
 	authorities_provider: &dyn AuthoritySetForFinalityProver<Block>,
-	authorities_set_id: u64,
-	begin: Block::Hash,
-	end: Block::Hash,
-) -> ::sp_blockchain::Result<Option<Vec<u8>>>
-	where
-		J: ProvableJustification<Block::Header>,
+	authority_set_changes: AuthoritySetChanges<NumberFor<Block>>,
+	block: NumberFor<Block>,
+) -> Result<Option<Vec<u8>>, FinalityProofError>
+where
+	Block: BlockT,
+	B: BlockchainBackend<Block>,
+	J: ProvableJustification<Block::Header>,
 {
-	let begin_id = BlockId::Hash(begin);
-	let begin_number = blockchain.expect_block_number_from_id(&begin_id)?;
-
-	// early-return if we sure that there are no blocks finalized AFTER begin block
+	// Early-return if we sure that there are no blocks finalized AFTER begin block
 	let info = blockchain.info();
-	if info.finalized_number <= begin_number {
-		trace!(
-			target: "afg",
-			"Requested finality proof for descendant of #{} while we only have finalized #{}. Returning empty proof.",
-			begin_number,
+	if info.finalized_number <= block {
+		let err = format!(
+			"Requested finality proof for descendant of #{} while we only have finalized #{}.",
+			block,
 			info.finalized_number,
 		);
-
-		return Ok(None);
+		trace!(target: "afg", "{}", &err);
+		return Err(FinalityProofError::BlockNotYetFinalized);
 	}
 
-	// check if blocks range is valid. It is the caller responsibility to ensure
-	// that it only asks peers that know about whole blocks range
-	let end_number = blockchain.expect_block_number_from_id(&BlockId::Hash(end))?;
-	if begin_number + One::one() > end_number {
-		return Err(ClientError::Backend(
-			format!("Cannot generate finality proof for invalid range: {}..{}", begin_number, end_number),
-		));
-	}
-
-	// early-return if we sure that the block is NOT a part of canonical chain
-	let canonical_begin = blockchain.expect_block_hash_from_id(&BlockId::Number(begin_number))?;
-	if begin != canonical_begin {
-		return Err(ClientError::Backend(
-			format!("Cannot generate finality proof for non-canonical block: {}", begin),
-		));
-	}
-
-	// iterate justifications && try to prove finality
-	let mut fragment_index = 0;
-	let mut current_authorities = authorities_provider.authorities(&begin_id)?;
-	let mut current_number = begin_number + One::one();
-	let mut finality_proof = Vec::new();
-	let mut unknown_headers = Vec::new();
-	let mut latest_proof_fragment = None;
-	let begin_authorities = current_authorities.clone();
-	loop {
-		let current_id = BlockId::Number(current_number);
-
-		// check if header is unknown to the caller
-		if current_number > end_number {
-			let unknown_header = blockchain.expect_header(current_id)?;
-			unknown_headers.push(unknown_header);
-		}
-
-		if let Some(justification) = blockchain.justification(current_id)? {
-			// check if the current block enacts new GRANDPA authorities set
-			let new_authorities = authorities_provider.authorities(&current_id)?;
-			let new_authorities_proof = if current_authorities != new_authorities {
-				current_authorities = new_authorities;
-				Some(authorities_provider.prove_authorities(&current_id)?)
-			} else {
-				None
-			};
-
-			// prepare finality proof for the current block
-			let current = blockchain.expect_block_hash_from_id(&BlockId::Number(current_number))?;
-			let proof_fragment = FinalityProofFragment {
-				block: current,
-				justification,
-				unknown_headers: ::std::mem::take(&mut unknown_headers),
-				authorities_proof: new_authorities_proof,
-			};
-
-			// append justification to finality proof if required
-			let justifies_end_block = current_number >= end_number;
-			let justifies_authority_set_change = proof_fragment.authorities_proof.is_some();
-			if justifies_end_block || justifies_authority_set_change {
-				// check if the proof is generated by the requested authority set
-				if finality_proof.is_empty() {
-					let justification_check_result = J::decode_and_verify(
-						&proof_fragment.justification,
-						authorities_set_id,
-						&begin_authorities,
-					);
-					if justification_check_result.is_err() {
-						trace!(
-							target: "afg",
-							"Can not provide finality proof with requested set id #{}\
-							(possible forced change?). Returning empty proof.",
-							authorities_set_id,
-						);
-
-						return Ok(None);
-					}
-				}
-
-				finality_proof.push(proof_fragment);
-				latest_proof_fragment = None;
-			} else {
-				latest_proof_fragment = Some(proof_fragment);
-			}
-
-			// we don't need to provide more justifications
-			if justifies_end_block {
-				break;
-			}
-		}
-
-		// we can't provide more justifications
-		if current_number == info.finalized_number {
-			// append last justification - even if we can't generate finality proof for
-			// the end block, we try to generate it for the latest possible block
-			if let Some(latest_proof_fragment) = latest_proof_fragment.take() {
-				finality_proof.push(latest_proof_fragment);
-
-				fragment_index += 1;
-				if fragment_index == MAX_FRAGMENTS_IN_PROOF {
-					break;
-				}
-			}
-			break;
-		}
-
-		// else search for the next justification
-		current_number += One::one();
-	}
-
-	if finality_proof.is_empty() {
+	// Get set_id the block belongs to, and the last block of the set which should contain a
+	// Justification we can use to prove the requested block.
+	let (set_id, last_block_for_set) = if let Some(id) = authority_set_changes.get_set_id(block) {
+		id
+	} else {
 		trace!(
 			target: "afg",
-			"No justifications found when making finality proof for {}. Returning empty proof.",
-			end,
+			"AuthoritySetChanges does not cover the requested block #{}. \
+			Maybe the subscription API is more appropriate.",
+			block,
 		);
+		return Err(FinalityProofError::BlockNotInAuthoritySetChanges);
+	};
+
+	// Get the Justification stored at the last block of the set
+	let last_block_for_set_id = BlockId::Number(last_block_for_set);
+	let justification =
+		if let Some(justification) = blockchain.justification(last_block_for_set_id)? {
+			justification
+		} else {
+			trace!(
+				target: "afg",
+				"No justification found when making finality proof for {}. Returning empty proof.",
+				block,
+			);
+			return Ok(None);
+		};
 
-		Ok(None)
-	} else {
+
+	// Check if the justification is generated by the requested authority set
+	let block_authorities = authorities_provider.authorities(&BlockId::Number(block))?;
+	let justification_check_result =
+		J::decode_and_verify(&justification, set_id, &block_authorities);
+	if justification_check_result.is_err() {
 		trace!(
 			target: "afg",
-			"Built finality proof for {} of {} fragments. Last fragment for {}.",
-			end,
-			finality_proof.len(),
-			finality_proof.last().expect("checked that !finality_proof.is_empty(); qed").block,
+			"Can not provide finality proof with requested set id #{}\
+			(possible forced change?). Returning empty proof.",
+			set_id,
 		);
-
-		Ok(Some(finality_proof.encode()))
+		return Ok(None);
 	}
+
+	// Collect all headers from the requested block until the last block of the set
+	let unknown_headers = {
+		let mut headers = Vec::new();
+		let mut current = block + One::one();
+		loop {
+			if current >= last_block_for_set || headers.len() >= MAX_UNKNOWN_HEADERS {
+				break;
+			}
+			if block_authorities != authorities_provider.authorities(&BlockId::Number(current))? {
+				trace!(
+					target: "afg",
+					"Encountered new authorities when collecting unknown headers. \
+					Returning empty proof",
+				);
+				return Ok(None);
+			}
+			headers.push(blockchain.expect_header(BlockId::Number(current))?);
+			current += One::one();
+		}
+		headers
+	};
+
+	Ok(Some(
+		FinalityProof {
+			block: blockchain.expect_block_hash_from_id(&last_block_for_set_id)?,
+			justification,
+			unknown_headers,
+		}
+		.encode(),
+	))
 }
 
 /// Prepare authority proof for the best possible block starting at a given trusted block.
@@ -569,67 +427,10 @@ fn get_warp_sync_proof_fragment<Block: BlockT, B: BlockchainBackend<Block>>(
 	Ok(result)
 }
 
-/// Check GRANDPA proof-of-finality for the given block.
-///
-/// Returns the vector of headers that MUST be validated + imported
-/// AND if at least one of those headers is invalid, all other MUST be considered invalid.
-pub(crate) fn check_finality_proof<Block: BlockT, B, J>(
-	blockchain: &B,
-	current_set_id: u64,
-	current_authorities: AuthorityList,
-	authorities_provider: &dyn AuthoritySetForFinalityChecker<Block>,
-	remote_proof: Vec<u8>,
-) -> ClientResult<FinalityEffects<Block::Header>>
-	where
-		NumberFor<Block>: BlockNumberOps,
-		B: BlockchainBackend<Block>,
-		J: ProvableJustification<Block::Header>,
-{
-	// decode finality proof
-	let proof = FinalityProof::<Block::Header>::decode(&mut &remote_proof[..])
-		.map_err(|_| ClientError::BadJustification("failed to decode finality proof".into()))?;
-
-	// empty proof can't prove anything
-	if proof.is_empty() {
-		return Err(ClientError::BadJustification("empty proof of finality".into()));
-	}
-
-	// iterate and verify proof fragments
-	let last_fragment_index = proof.len() - 1;
-	let mut authorities = AuthoritiesOrEffects::Authorities(current_set_id, current_authorities);
-	for (proof_fragment_index, proof_fragment) in proof.into_iter().enumerate() {
-		// check that proof is non-redundant. The proof still can be valid, but
-		// we do not want peer to spam us with redundant data
-		if proof_fragment_index != last_fragment_index {
-			let has_unknown_headers = !proof_fragment.unknown_headers.is_empty();
-			let has_new_authorities = proof_fragment.authorities_proof.is_some();
-			if has_unknown_headers || !has_new_authorities {
-				return Err(ClientError::BadJustification("redundant proof of finality".into()));
-			}
-		}
-
-		authorities = check_finality_proof_fragment::<_, _, J>(
-			blockchain,
-			authorities,
-			authorities_provider,
-			proof_fragment)?;
-	}
-
-	let effects = authorities.extract_effects().expect("at least one loop iteration is guaranteed
-			because proof is not empty;\
-			check_finality_proof_fragment is called on every iteration;\
-			check_finality_proof_fragment always returns FinalityEffects;\
-			qed");
-
-	telemetry!(CONSENSUS_INFO; "afg.finality_proof_ok";
-		"set_id" => ?effects.new_set_id, "finalized_header_hash" => ?effects.block);
-
-	Ok(effects)
-}
-
 /// Check GRANDPA authority change sequence to assert finality of a target block.
 ///
 /// Returns the header of the target block.
+#[allow(unused)]
 pub(crate) fn check_warp_sync_proof<Block: BlockT, J>(
 	current_set_id: u64,
 	current_authorities: AuthorityList,
@@ -719,74 +520,6 @@ where
 		}
 }
 
-/// Check finality proof for the single block.
-fn check_finality_proof_fragment<Block: BlockT, B, J>(
-	blockchain: &B,
-	authority_set: AuthoritiesOrEffects<Block::Header>,
-	authorities_provider: &dyn AuthoritySetForFinalityChecker<Block>,
-	proof_fragment: FinalityProofFragment<Block::Header>,
-) -> ClientResult<AuthoritiesOrEffects<Block::Header>>
-	where
-		NumberFor<Block>: BlockNumberOps,
-		B: BlockchainBackend<Block>,
-		J: Decode + ProvableJustification<Block::Header>,
-{
-	// verify justification using previous authorities set
-	let (mut current_set_id, mut current_authorities) = authority_set.extract_authorities();
-	let justification: J = Decode::decode(&mut &proof_fragment.justification[..])
-		.map_err(|_| ClientError::JustificationDecode)?;
-	justification.verify(current_set_id, &current_authorities)?;
-
-	// and now verify new authorities proof (if provided)
-	if let Some(new_authorities_proof) = proof_fragment.authorities_proof {
-		// the proof is either generated using known header and it is safe to query header
-		// here, because its non-finality proves that it can't be pruned
-		// or it is generated using last unknown header (because it is the one who has
-		// justification => we only generate proofs for headers with justifications)
-		let header = match proof_fragment.unknown_headers.iter().rev().next().cloned() {
-			Some(header) => header,
-			None => blockchain.expect_header(BlockId::Hash(proof_fragment.block))?,
-		};
-		current_authorities = authorities_provider.check_authorities_proof(
-			proof_fragment.block,
-			header,
-			new_authorities_proof,
-		)?;
-
-		current_set_id += 1;
-	}
-
-	Ok(AuthoritiesOrEffects::Effects(FinalityEffects {
-		headers_to_import: proof_fragment.unknown_headers,
-		block: proof_fragment.block,
-		justification: proof_fragment.justification,
-		new_set_id: current_set_id,
-		new_authorities: current_authorities,
-	}))
-}
-
-/// Authorities set from initial authorities set or finality effects.
-enum AuthoritiesOrEffects<Header: HeaderT> {
-	Authorities(u64, AuthorityList),
-	Effects(FinalityEffects<Header>),
-}
-
-impl<Header: HeaderT> AuthoritiesOrEffects<Header> {
-	pub fn extract_authorities(self) -> (u64, AuthorityList) {
-		match self {
-			AuthoritiesOrEffects::Authorities(set_id, authorities) => (set_id, authorities),
-			AuthoritiesOrEffects::Effects(effects) => (effects.new_set_id, effects.new_authorities),
-		}
-	}
-
-	pub fn extract_effects(self) -> Option<FinalityEffects<Header>> {
-		match self {
-			AuthoritiesOrEffects::Authorities(_, _) => None,
-			AuthoritiesOrEffects::Effects(effects) => Some(effects),
-		}
-	}
-}
-
 /// Block info extracted from the justification.
 pub(crate) trait BlockJustification<Header: HeaderT> {
 	/// Block number justified.
@@ -796,8 +529,36 @@ pub(crate) trait BlockJustification<Header: HeaderT> {
 	fn hash(&self) -> Header::Hash;
 }
 
+/// Check GRANDPA proof-of-finality for the given block.
+///
+/// Returns the vector of headers that MUST be validated + imported
+/// AND if at least one of those headers is invalid, all other MUST be considered invalid.
+///
+/// This is currently not used, and exists primarily as an example of how to check finality proofs.
+#[cfg(test)]
+fn check_finality_proof<Header: HeaderT, J>(
+	current_set_id: u64,
+	current_authorities: AuthorityList,
+	remote_proof: Vec<u8>,
+) -> ClientResult<FinalityProof<Header>>
+where
+	J: ProvableJustification<Header>,
+{
+	let proof = FinalityProof::<Header>::decode(&mut &remote_proof[..])
+		.map_err(|_| ClientError::BadJustification("failed to decode finality proof".into()))?;
+
+	let justification: J = Decode::decode(&mut &proof.justification[..])
+		.map_err(|_| ClientError::JustificationDecode)?;
+	justification.verify(current_set_id, &current_authorities)?;
+
+	use sc_telemetry::{telemetry, CONSENSUS_INFO};
+	telemetry!(CONSENSUS_INFO; "afg.finality_proof_ok";
+		"finalized_header_hash" => ?proof.block);
+	Ok(proof)
+}
+
 /// Justification used to prove block finality.
-pub(crate) trait ProvableJustification<Header: HeaderT>: Encode + Decode {
+pub trait ProvableJustification<Header: HeaderT>: Encode + Decode {
 	/// Verify justification with respect to authorities set and authorities set id.
 	fn verify(&self, set_id: u64, authorities: &[(AuthorityId, u64)]) -> ClientResult<()>;
 
@@ -807,16 +568,16 @@ pub(crate) trait ProvableJustification<Header: HeaderT>: Encode + Decode {
 		set_id: u64,
 		authorities: &[(AuthorityId, u64)],
 	) -> ClientResult<Self> {
-		let justification = Self::decode(&mut &**justification)
-			.map_err(|_| ClientError::JustificationDecode)?;
+		let justification =
+			Self::decode(&mut &**justification).map_err(|_| ClientError::JustificationDecode)?;
 		justification.verify(set_id, authorities)?;
 		Ok(justification)
 	}
 }
 
 impl<Block: BlockT> ProvableJustification<Block::Header> for GrandpaJustification<Block>
-	where
-		NumberFor<Block>: BlockNumberOps,
+where
+	NumberFor<Block>: BlockNumberOps,
 {
 	fn verify(&self, set_id: u64, authorities: &[(AuthorityId, u64)]) -> ClientResult<()> {
 		let authorities = VoterSet::new(authorities.iter().cloned()).ok_or(
@@ -891,41 +652,21 @@ impl<Header: HeaderT> WarpSyncFragmentCache<Header> {
 
 #[cfg(test)]
 pub(crate) mod tests {
+	use super::*;
 	use substrate_test_runtime_client::runtime::{Block, Header, H256};
 	use sc_client_api::NewBlockState;
 	use sc_client_api::in_mem::Blockchain as InMemoryBlockchain;
-	use super::*;
 	use sp_core::crypto::Public;
+	use crate::authorities::AuthoritySetChanges;
 
 	pub(crate) type FinalityProof = super::FinalityProof<Header>;
 
-	impl<GetAuthorities, ProveAuthorities> AuthoritySetForFinalityProver<Block> for (GetAuthorities, ProveAuthorities)
-		where
-			GetAuthorities: Send + Sync + Fn(BlockId<Block>) -> ClientResult<AuthorityList>,
-			ProveAuthorities: Send + Sync + Fn(BlockId<Block>) -> ClientResult<StorageProof>,
+	impl<GetAuthorities> AuthoritySetForFinalityProver<Block> for GetAuthorities
+	where
+		GetAuthorities: Send + Sync + Fn(BlockId<Block>) -> ClientResult<AuthorityList>,
 	{
 		fn authorities(&self, block: &BlockId<Block>) -> ClientResult<AuthorityList> {
-			self.0(*block)
-		}
-
-		fn prove_authorities(&self, block: &BlockId<Block>) -> ClientResult<StorageProof> {
-			self.1(*block)
-		}
-	}
-
-	pub(crate) struct ClosureAuthoritySetForFinalityChecker<Closure>(pub Closure);
-
-	impl<Closure> AuthoritySetForFinalityChecker<Block> for ClosureAuthoritySetForFinalityChecker<Closure>
-		where
-			Closure: Send + Sync + Fn(H256, Header, StorageProof) -> ClientResult<AuthorityList>,
-	{
-		fn check_authorities_proof(
-			&self,
-			hash: H256,
-			header: Header,
-			proof: StorageProof,
-		) -> ClientResult<AuthorityList> {
-			self.0(hash, header, proof)
+			self(*block)
 		}
 	}
 
@@ -965,392 +706,329 @@ pub(crate) mod tests {
 			0 => Default::default(),
 			_ => header(number - 1).hash(),
 		};
-		Header::new(number, H256::from_low_u64_be(0), H256::from_low_u64_be(0), parent_hash, Default::default())
-	}
-
-	fn side_header(number: u64) -> Header {
 		Header::new(
 			number,
 			H256::from_low_u64_be(0),
-			H256::from_low_u64_be(1),
-			header(number - 1).hash(),
-			Default::default(),
-		)
-	}
-
-	fn second_side_header(number: u64) -> Header {
-		Header::new(
-			number,
 			H256::from_low_u64_be(0),
-			H256::from_low_u64_be(1),
-			side_header(number - 1).hash(),
+			parent_hash,
 			Default::default(),
 		)
 	}
 
 	fn test_blockchain() -> InMemoryBlockchain<Block> {
 		let blockchain = InMemoryBlockchain::<Block>::new();
-		blockchain.insert(header(0).hash(), header(0), Some(vec![0]), None, NewBlockState::Final).unwrap();
-		blockchain.insert(header(1).hash(), header(1), Some(vec![1]), None, NewBlockState::Final).unwrap();
-		blockchain.insert(header(2).hash(), header(2), None, None, NewBlockState::Best).unwrap();
-		blockchain.insert(header(3).hash(), header(3), Some(vec![3]), None, NewBlockState::Final).unwrap();
 		blockchain
-	}
-
-	#[test]
-	fn finality_prove_fails_with_invalid_range() {
-		let blockchain = test_blockchain();
-
-		// their last finalized is: 2
-		// they request for proof-of-finality of: 2
-		// => range is invalid
-		prove_finality::<_, _, TestJustification>(
-			&blockchain,
-			&(
-				|_| unreachable!("should return before calling GetAuthorities"),
-				|_| unreachable!("should return before calling ProveAuthorities"),
-			),
-			0,
-			header(2).hash(),
-			header(2).hash(),
-		).unwrap_err();
+			.insert(header(0).hash(), header(0), Some(vec![0]), None, NewBlockState::Final)
+			.unwrap();
+		blockchain
+			.insert(header(1).hash(), header(1), Some(vec![1]), None, NewBlockState::Final)
+			.unwrap();
+		blockchain
+			.insert(header(2).hash(), header(2), None, None, NewBlockState::Best)
+			.unwrap();
+		blockchain
+			.insert(header(3).hash(), header(3), Some(vec![3]), None, NewBlockState::Final)
+			.unwrap();
+		blockchain
 	}
 
 	#[test]
 	fn finality_proof_is_none_if_no_more_last_finalized_blocks() {
 		let blockchain = test_blockchain();
-		blockchain.insert(header(4).hash(), header(4), None, None, NewBlockState::Best).unwrap();
+		blockchain
+			.insert(header(4).hash(), header(4), Some(vec![1]), None, NewBlockState::Best)
+			.unwrap();
+		blockchain
+			.insert(header(5).hash(), header(5), Some(vec![2]), None, NewBlockState::Best)
+			.unwrap();
 
-		// our last finalized is: 3
-		// their last finalized is: 3
-		// => we can't provide any additional justifications
+		let mut authority_set_changes = AuthoritySetChanges::empty();
+		authority_set_changes.append(0, 5);
+
+		// The last finalized block is 3, so we cannot provide further justifications.
 		let proof_of_4 = prove_finality::<_, _, TestJustification>(
 			&blockchain,
-			&(
-				|_| unreachable!("should return before calling GetAuthorities"),
-				|_| unreachable!("should return before calling ProveAuthorities"),
-			),
-			0,
-			header(3).hash(),
-			header(4).hash(),
-		).unwrap();
-		assert_eq!(proof_of_4, None);
+			&|_| unreachable!("Should return before calling GetAuthorities"),
+			authority_set_changes,
+			*header(4).number(),
+		);
+		assert!(matches!(proof_of_4, Err(FinalityProofError::BlockNotYetFinalized)));
 	}
 
 	#[test]
-	fn finality_proof_fails_for_non_canonical_block() {
+	fn finality_proof_is_none_if_no_justification_known() {
 		let blockchain = test_blockchain();
-		blockchain.insert(header(4).hash(), header(4), None, None, NewBlockState::Best).unwrap();
-		blockchain.insert(side_header(4).hash(), side_header(4), None, None, NewBlockState::Best).unwrap();
-		blockchain.insert(second_side_header(5).hash(), second_side_header(5), None, None, NewBlockState::Best)
+		blockchain
+			.insert(header(4).hash(), header(4), None, None, NewBlockState::Final)
 			.unwrap();
-		blockchain.insert(header(5).hash(), header(5), Some(vec![5]), None, NewBlockState::Final).unwrap();
 
-		// chain is 1 -> 2 -> 3 -> 4 -> 5
-		//                      \> 4' -> 5'
-		// and the best finalized is 5
-		// => when requesting for (4'; 5'], error is returned
-		prove_finality::<_, _, TestJustification>(
+		let mut authority_set_changes = AuthoritySetChanges::empty();
+		authority_set_changes.append(0, 4);
+
+		// Block 4 is finalized without justification
+		// => we can't prove finality of 3
+		let proof_of_3 = prove_finality::<_, _, TestJustification>(
 			&blockchain,
-			&(
-				|_| unreachable!("should return before calling GetAuthorities"),
-				|_| unreachable!("should return before calling ProveAuthorities"),
-			),
-			0,
-			side_header(4).hash(),
-			second_side_header(5).hash(),
-		).unwrap_err();
+			&|_| unreachable!("Should return before calling GetAuthorities"),
+			authority_set_changes,
+			*header(3).number(),
+		)
+		.unwrap();
+		assert_eq!(proof_of_3, None);
 	}
 
 	#[test]
-	fn finality_proof_is_none_if_no_justification_known() {
+	fn finality_proof_is_none_if_justification_is_generated_by_unknown_set() {
+		// This is the case for forced change: set_id has been forcibly increased,
+		// or when our stored authority set changes is incomplete
 		let blockchain = test_blockchain();
-		blockchain.insert(header(4).hash(), header(4), None, None, NewBlockState::Final).unwrap();
+		let auth = vec![(AuthorityId::from_slice(&[42u8; 32]), 1u64)];
+		let just4 = TestJustification((0, auth), vec![4]).encode();
+		blockchain
+			.insert(header(4).hash(), header(4), Some(just4), None, NewBlockState::Final)
+			.unwrap();
 
-		// block 4 is finalized without justification
-		// => we can't prove finality
-		let proof_of_4 = prove_finality::<_, _, TestJustification>(
-			&blockchain,
-			&(
-				|_| Ok(vec![(AuthorityId::from_slice(&[1u8; 32]), 1u64)]),
-				|_| unreachable!("authorities didn't change => ProveAuthorities won't be called"),
-			),
-			0,
-			header(3).hash(),
-			header(4).hash(),
-		).unwrap();
-		assert_eq!(proof_of_4, None);
-	}
+		let mut authority_set_changes = AuthoritySetChanges::empty();
+		authority_set_changes.append(0, 4);
 
-	#[test]
-	fn finality_proof_works_without_authorities_change() {
-		let blockchain = test_blockchain();
-		let authorities = vec![(AuthorityId::from_slice(&[1u8; 32]), 1u64)];
-		let just4 = TestJustification((0, authorities.clone()), vec![4]).encode();
-		let just5 = TestJustification((0, authorities.clone()), vec![5]).encode();
-		blockchain.insert(header(4).hash(), header(4), Some(just4), None, NewBlockState::Final).unwrap();
-		blockchain.insert(header(5).hash(), header(5), Some(just5.clone()), None, NewBlockState::Final).unwrap();
-
-		// blocks 4 && 5 are finalized with justification
-		// => since authorities are the same, we only need justification for 5
-		let proof_of_5: FinalityProof = Decode::decode(&mut &prove_finality::<_, _, TestJustification>(
+		let proof_of_3 = prove_finality::<_, _, TestJustification>(
 			&blockchain,
-			&(
-				|_| Ok(authorities.clone()),
-				|_| unreachable!("should return before calling ProveAuthorities"),
-			),
-			0,
-			header(3).hash(),
-			header(5).hash(),
-		).unwrap().unwrap()[..]).unwrap();
-		assert_eq!(proof_of_5, vec![FinalityProofFragment {
-			block: header(5).hash(),
-			justification: just5,
-			unknown_headers: Vec::new(),
-			authorities_proof: None,
-		}]);
+			&|_| Ok(vec![(AuthorityId::from_slice(&[1u8; 32]), 1u64)]),
+			authority_set_changes,
+			*header(3).number(),
+		)
+		.unwrap();
+		assert!(proof_of_3.is_none());
 	}
 
 	#[test]
-	fn finality_proof_finalized_earlier_block_if_no_justification_for_target_is_known() {
+	fn finality_proof_is_none_if_authority_set_id_is_incorrect() {
 		let blockchain = test_blockchain();
-		blockchain.insert(header(4).hash(), header(4), Some(vec![4]), None, NewBlockState::Final).unwrap();
-		blockchain.insert(header(5).hash(), header(5), None, None, NewBlockState::Final).unwrap();
+		let auth = vec![(AuthorityId::from_slice(&[1u8; 32]), 1u64)];
+		let just4 = TestJustification((0, auth.clone()), vec![4]).encode();
+		blockchain
+			.insert(header(4).hash(), header(4), Some(just4), None, NewBlockState::Final)
+			.unwrap();
 
-		// block 4 is finalized with justification + we request for finality of 5
-		// => we can't prove finality of 5, but providing finality for 4 is still useful for requester
-		let proof_of_5: FinalityProof = Decode::decode(&mut &prove_finality::<_, _, TestJustification>(
+		let mut authority_set_changes = AuthoritySetChanges::empty();
+		authority_set_changes.append(0, 1);
+		authority_set_changes.append(1, 4);
+
+		// We call `prove_finality` with the wrong `authorities_set_id`, since the Justification for
+		// block 4 contains set id 0.
+		let proof_of_3 = prove_finality::<_, _, TestJustification>(
 			&blockchain,
-			&(
-				|_| Ok(vec![(AuthorityId::from_slice(&[1u8; 32]), 1u64)]),
-				|_| unreachable!("should return before calling ProveAuthorities"),
-			),
-			0,
-			header(3).hash(),
-			header(5).hash(),
-		).unwrap().unwrap()[..]).unwrap();
-		assert_eq!(proof_of_5, vec![FinalityProofFragment {
-			block: header(4).hash(),
-			justification: vec![4],
-			unknown_headers: Vec::new(),
-			authorities_proof: None,
-		}]);
+			&|_| Ok(auth.clone()),
+			authority_set_changes,
+			*header(3).number(),
+		)
+		.unwrap();
+		assert!(proof_of_3.is_none());
 	}
 
 	#[test]
-	fn finality_proof_works_with_authorities_change() {
+	fn finality_proof_is_none_for_next_set_id_with_new_the_authority_set() {
 		let blockchain = test_blockchain();
-		let auth3 = vec![(AuthorityId::from_slice(&[3u8; 32]), 1u64)];
-		let auth5 = vec![(AuthorityId::from_slice(&[5u8; 32]), 1u64)];
-		let auth7 = vec![(AuthorityId::from_slice(&[7u8; 32]), 1u64)];
-		let just4 = TestJustification((0, auth3.clone()), vec![4]).encode();
-		let just5 = TestJustification((0, auth3.clone()), vec![5]).encode();
-		let just7 = TestJustification((1, auth5.clone()), vec![7]).encode();
-		blockchain.insert(header(4).hash(), header(4), Some(just4), None, NewBlockState::Final).unwrap();
-		blockchain.insert(header(5).hash(), header(5), Some(just5.clone()), None, NewBlockState::Final).unwrap();
-		blockchain.insert(header(6).hash(), header(6), None, None, NewBlockState::Final).unwrap();
-		blockchain.insert(header(7).hash(), header(7), Some(just7.clone()), None, NewBlockState::Final).unwrap();
-
-		// when querying for finality of 6, we assume that the #3 is the last block known to the requester
-		// => since we only have justification for #7, we provide #7
-		let proof_of_6: FinalityProof = Decode::decode(&mut &prove_finality::<_, _, TestJustification>(
+		let auth1 = vec![(AuthorityId::from_slice(&[1u8; 32]), 1u64)];
+		let auth2 = vec![(AuthorityId::from_slice(&[2u8; 32]), 1u64)];
+		let just5 = TestJustification((0, auth1.clone()), vec![5]).encode();
+		let just6 = TestJustification((1, auth2.clone()), vec![6]).encode();
+		blockchain
+			.insert(header(4).hash(), header(4), None, None, NewBlockState::Final)
+			.unwrap();
+		blockchain
+			.insert(header(5).hash(), header(5), Some(just5), None, NewBlockState::Final)
+			.unwrap();
+		blockchain
+			.insert(header(6).hash(), header(6), Some(just6), None, NewBlockState::Final)
+			.unwrap();
+
+		let mut authority_set_changes = AuthoritySetChanges::empty();
+		authority_set_changes.append(0, 1);
+		authority_set_changes.append(1, 6);
+
+		// Trying to prove block 4 using block 6 fails as the authority set has changed
+		let proof_of_4 = prove_finality::<_, _, TestJustification>(
 			&blockchain,
-			&(
-				|block_id| match block_id {
-					BlockId::Hash(h) if h == header(3).hash() => Ok(auth3.clone()),
-					BlockId::Number(4) => Ok(auth3.clone()),
-					BlockId::Number(5) => Ok(auth5.clone()),
-					BlockId::Number(7) => Ok(auth7.clone()),
-					_ => unreachable!("no other authorities should be fetched: {:?}", block_id),
-				},
-				|block_id| match block_id {
-					BlockId::Number(5) => Ok(StorageProof::new(vec![vec![50]])),
-					BlockId::Number(7) => Ok(StorageProof::new(vec![vec![70]])),
-					_ => unreachable!("no other authorities should be proved: {:?}", block_id),
-				},
-			),
-			0,
-			header(3).hash(),
-			header(6).hash(),
-		).unwrap().unwrap()[..]).unwrap();
-		// initial authorities set (which start acting from #0) is [3; 32]
-		assert_eq!(proof_of_6, vec![
-			// new authorities set starts acting from #5 => we do not provide fragment for #4
-			// first fragment provides justification for #5 && authorities set that starts acting from #5
-			FinalityProofFragment {
-				block: header(5).hash(),
-				justification: just5,
-				unknown_headers: Vec::new(),
-				authorities_proof: Some(StorageProof::new(vec![vec![50]])),
+			&|block_id| match block_id {
+				BlockId::Number(4) => Ok(auth1.clone()),
+				_ => unimplemented!("No other authorities should be proved: {:?}", block_id),
 			},
-			// last fragment provides justification for #7 && unknown#7
-			FinalityProofFragment {
-				block: header(7).hash(),
-				justification: just7.clone(),
-				unknown_headers: vec![header(7)],
-				authorities_proof: Some(StorageProof::new(vec![vec![70]])),
-			},
-		]);
+			authority_set_changes,
+			*header(4).number(),
+		)
+		.unwrap();
+		assert!(proof_of_4.is_none());
+	}
 
-		// now let's verify finality proof
+	#[test]
+	fn finality_proof_is_none_if_the_authority_set_changes_and_changes_back() {
 		let blockchain = test_blockchain();
-		blockchain.insert(header(4).hash(), header(4), None, None, NewBlockState::Final).unwrap();
-		blockchain.insert(header(5).hash(), header(5), None, None, NewBlockState::Final).unwrap();
-		blockchain.insert(header(6).hash(), header(6), None, None, NewBlockState::Final).unwrap();
-		let effects = check_finality_proof::<_, _, TestJustification>(
-			&blockchain,
-			0,
-			auth3,
-			&ClosureAuthoritySetForFinalityChecker(
-				|hash, _header, proof: StorageProof| match proof.clone().iter_nodes().next().map(|x| x[0]) {
-					Some(50) => Ok(auth5.clone()),
-					Some(70) => Ok(auth7.clone()),
-					_ => unreachable!("no other proofs should be checked: {}", hash),
-				}
-			),
-			proof_of_6.encode(),
-		).unwrap();
+		let auth1 = vec![(AuthorityId::from_slice(&[1u8; 32]), 1u64)];
+		let auth2 = vec![(AuthorityId::from_slice(&[2u8; 32]), 1u64)];
+		let just5 = TestJustification((0, auth1.clone()), vec![5]).encode();
+		let just6 = TestJustification((1, auth2.clone()), vec![6]).encode();
+		let just7 = TestJustification((2, auth1.clone()), vec![7]).encode();
+		blockchain
+			.insert(header(4).hash(), header(4), None, None, NewBlockState::Final)
+			.unwrap();
+		blockchain
+			.insert(header(5).hash(), header(5), Some(just5), None, NewBlockState::Final)
+			.unwrap();
+		blockchain
+			.insert(header(6).hash(), header(6), Some(just6), None, NewBlockState::Final)
+			.unwrap();
+		blockchain
+			.insert(header(7).hash(), header(7), Some(just7), None, NewBlockState::Final)
+			.unwrap();
 
-		assert_eq!(effects, FinalityEffects {
-			headers_to_import: vec![header(7)],
-			block: header(7).hash(),
-			justification: TestJustification((1, auth5.clone()), vec![7]).encode(),
-			new_set_id: 2,
-			new_authorities: auth7,
-		});
+		// Set authority set changes so that they don't contain the switch, and switch back, of the
+		// authorities. As well as incorrect set_id to avoid the guard against that.
+		// This should trigger the check for walking through the headers and checking for authority
+		// set changes that are missed.
+		let mut authority_set_changes = AuthoritySetChanges::empty();
+		authority_set_changes.append(0, 1);
+		authority_set_changes.append(1, 2);
+		authority_set_changes.append(2, 7);
+
+		let proof_of_4 =
+			prove_finality::<_, _, TestJustification>(
+				&blockchain,
+				&|block_id| match block_id {
+					BlockId::Number(4) => Ok(auth1.clone()),
+					BlockId::Number(5) => Ok(auth1.clone()),
+					BlockId::Number(6) => Ok(auth2.clone()),
+					_ => unimplemented!("No other authorities should be proved: {:?}", block_id),
+				},
+				authority_set_changes,
+				*header(4).number(),
+			)
+		.unwrap();
+		assert!(proof_of_4.is_none());
 	}
 
 	#[test]
 	fn finality_proof_check_fails_when_proof_decode_fails() {
-		let blockchain = test_blockchain();
-
-		// when we can't decode proof from Vec<u8>
-		check_finality_proof::<_, _, TestJustification>(
-			&blockchain,
+		// When we can't decode proof from Vec<u8>
+		check_finality_proof::<_, TestJustification>(
 			1,
 			vec![(AuthorityId::from_slice(&[3u8; 32]), 1u64)],
-			&ClosureAuthoritySetForFinalityChecker(|_, _, _| unreachable!("returns before CheckAuthoritiesProof")),
 			vec![42],
-		).unwrap_err();
+		)
+		.unwrap_err();
 	}
 
 	#[test]
 	fn finality_proof_check_fails_when_proof_is_empty() {
-		let blockchain = test_blockchain();
-
-		// when decoded proof has zero length
-		check_finality_proof::<_, _, TestJustification>(
-			&blockchain,
+		// When decoded proof has zero length
+		check_finality_proof::<_, TestJustification>(
 			1,
 			vec![(AuthorityId::from_slice(&[3u8; 32]), 1u64)],
-			&ClosureAuthoritySetForFinalityChecker(|_, _, _| unreachable!("returns before CheckAuthoritiesProof")),
 			Vec::<TestJustification>::new().encode(),
-		).unwrap_err();
+		)
+		.unwrap_err();
 	}
 
 	#[test]
-	fn finality_proof_check_fails_when_intermediate_fragment_has_unknown_headers() {
-		let blockchain = test_blockchain();
-
-		// when intermediate (#0) fragment has non-empty unknown headers
-		let authorities = vec![(AuthorityId::from_slice(&[3u8; 32]), 1u64)];
-		check_finality_proof::<_, _, TestJustification>(
-			&blockchain,
+	fn finality_proof_check_works() {
+		let auth = vec![(AuthorityId::from_slice(&[3u8; 32]), 1u64)];
+		let finality_proof = FinalityProof {
+			block: header(2).hash(),
+			justification: TestJustification((1, auth.clone()), vec![7]).encode(),
+			unknown_headers: Vec::new(),
+		};
+		let proof = check_finality_proof::<_, TestJustification>(
 			1,
-			authorities.clone(),
-			&ClosureAuthoritySetForFinalityChecker(|_, _, _| unreachable!("returns before CheckAuthoritiesProof")),
-			vec![FinalityProofFragment {
-				block: header(4).hash(),
-				justification: TestJustification((0, authorities.clone()), vec![7]).encode(),
-				unknown_headers: vec![header(4)],
-				authorities_proof: Some(StorageProof::new(vec![vec![42]])),
-			}, FinalityProofFragment {
-				block: header(5).hash(),
-				justification: TestJustification((0, authorities), vec![8]).encode(),
-				unknown_headers: vec![header(5)],
-				authorities_proof: None,
-			}].encode(),
-		).unwrap_err();
+			auth.clone(),
+			finality_proof.encode(),
+		)
+		.unwrap();
+		assert_eq!(proof, finality_proof);
 	}
 
 	#[test]
-	fn finality_proof_check_fails_when_intermediate_fragment_has_no_authorities_proof() {
+	fn finality_proof_using_authority_set_changes_is_none_with_undefined_start() {
 		let blockchain = test_blockchain();
+		let auth = vec![(AuthorityId::from_slice(&[1u8; 32]), 1u64)];
+		let just4 = TestJustification((0, auth.clone()), vec![4]).encode();
+		let just7 = TestJustification((1, auth.clone()), vec![7]).encode();
+		blockchain
+			.insert(header(4).hash(), header(4), Some(just4), None, NewBlockState::Final)
+			.unwrap();
+		blockchain
+			.insert(header(5).hash(), header(5), None, None, NewBlockState::Final)
+			.unwrap();
+		blockchain
+			.insert(header(6).hash(), header(6), None, None, NewBlockState::Final)
+			.unwrap();
+		blockchain
+			.insert(header(7).hash(), header(7), Some(just7.clone()), None, NewBlockState::Final)
+			.unwrap();
 
-		// when intermediate (#0) fragment has empty authorities proof
-		let authorities = vec![(AuthorityId::from_slice(&[3u8; 32]), 1u64)];
-		check_finality_proof::<_, _, TestJustification>(
-			&blockchain,
-			1,
-			authorities.clone(),
-			&ClosureAuthoritySetForFinalityChecker(|_, _, _| unreachable!("returns before CheckAuthoritiesProof")),
-			vec![FinalityProofFragment {
-				block: header(4).hash(),
-				justification: TestJustification((0, authorities.clone()), vec![7]).encode(),
-				unknown_headers: Vec::new(),
-				authorities_proof: None,
-			}, FinalityProofFragment {
-				block: header(5).hash(),
-				justification: TestJustification((0, authorities), vec![8]).encode(),
-				unknown_headers: vec![header(5)],
-				authorities_proof: None,
-			}].encode(),
-		).unwrap_err();
-	}
-
-	#[test]
-	fn finality_proof_check_works() {
-		let blockchain = test_blockchain();
+		// We have stored the correct block number for the relevant set, but as we are missing the
+		// block for the preceding set the start is not well-defined.
+		let mut authority_set_changes = AuthoritySetChanges::empty();
+		authority_set_changes.append(1, 7);
 
-		let initial_authorities = vec![(AuthorityId::from_slice(&[3u8; 32]), 1u64)];
-		let next_authorities = vec![(AuthorityId::from_slice(&[4u8; 32]), 1u64)];
-		let effects = check_finality_proof::<_, _, TestJustification>(
+		let proof_of_5 = prove_finality::<_, _, TestJustification>(
 			&blockchain,
-			1,
-			initial_authorities.clone(),
-			&ClosureAuthoritySetForFinalityChecker(|_, _, _| Ok(next_authorities.clone())),
-			vec![FinalityProofFragment {
-				block: header(2).hash(),
-				justification: TestJustification((1, initial_authorities.clone()), vec![7]).encode(),
-				unknown_headers: Vec::new(),
-				authorities_proof: Some(StorageProof::new(vec![vec![42]])),
-			}, FinalityProofFragment {
-				block: header(4).hash(),
-				justification: TestJustification((2, next_authorities.clone()), vec![8]).encode(),
-				unknown_headers: vec![header(4)],
-				authorities_proof: None,
-			}].encode(),
-		).unwrap();
-		assert_eq!(effects, FinalityEffects {
-			headers_to_import: vec![header(4)],
-			block: header(4).hash(),
-			justification: TestJustification((2, next_authorities.clone()), vec![8]).encode(),
-			new_set_id: 2,
-			new_authorities: vec![(AuthorityId::from_slice(&[4u8; 32]), 1u64)],
-		});
+			&|block_id| match block_id {
+				BlockId::Number(5) => Ok(auth.clone()),
+				BlockId::Number(6) => Ok(auth.clone()),
+				_ => unimplemented!("No other authorities should be proved: {:?}", block_id),
+			},
+			authority_set_changes,
+			*header(5).number(),
+		);
+		assert!(matches!(proof_of_5, Err(FinalityProofError::BlockNotInAuthoritySetChanges)));
 	}
 
 	#[test]
-	fn finality_proof_is_none_if_first_justification_is_generated_by_unknown_set() {
-		// this is the case for forced change: set_id has been forcibly increased on full node
-		// and light node missed that
-		// => justification verification will fail on light node anyways, so we do not return
-		// finality proof at all
+	fn finality_proof_using_authority_set_changes_works() {
 		let blockchain = test_blockchain();
-		let just4 = TestJustification((0, vec![(AuthorityId::from_slice(&[42u8; 32]), 1u64)]), vec![4]).encode();
-		blockchain.insert(header(4).hash(), header(4), Some(just4), None, NewBlockState::Final).unwrap();
+		let auth = vec![(AuthorityId::from_slice(&[1u8; 32]), 1u64)];
+		let just4 = TestJustification((0, auth.clone()), vec![4]).encode();
+		let just7 = TestJustification((1, auth.clone()), vec![7]).encode();
+		blockchain
+			.insert(header(4).hash(), header(4), Some(just4), None, NewBlockState::Final)
+			.unwrap();
+		blockchain
+			.insert(header(5).hash(), header(5), None, None, NewBlockState::Final)
+			.unwrap();
+		blockchain
+			.insert(header(6).hash(), header(6), None, None, NewBlockState::Final)
+			.unwrap();
+		blockchain
+			.insert(header(7).hash(), header(7), Some(just7.clone()), None, NewBlockState::Final)
+			.unwrap();
 
-		let proof_of_4 = prove_finality::<_, _, TestJustification>(
-			&blockchain,
-			&(
-				|_| Ok(vec![(AuthorityId::from_slice(&[1u8; 32]), 1u64)]),
-				|_| unreachable!("should return before calling ProveAuthorities"),
-			),
-			0,
-			header(3).hash(),
-			header(4).hash(),
-		).unwrap();
-		assert!(proof_of_4.is_none());
+		let mut authority_set_changes = AuthoritySetChanges::empty();
+		authority_set_changes.append(0, 4);
+		authority_set_changes.append(1, 7);
+
+		let proof_of_5: FinalityProof = Decode::decode(
+			&mut &prove_finality::<_, _, TestJustification>(
+				&blockchain,
+				&|block_id| match block_id {
+					BlockId::Number(5) => Ok(auth.clone()),
+					BlockId::Number(6) => Ok(auth.clone()),
+					_ => unimplemented!("No other authorities should be proved: {:?}", block_id),
+				},
+				authority_set_changes,
+				*header(5).number(),
+			)
+			.unwrap()
+			.unwrap()[..],
+		)
+		.unwrap();
+		assert_eq!(
+			proof_of_5,
+			FinalityProof {
+				block: header(7).hash(),
+				justification: just7,
+				unknown_headers: vec![header(6)],
+			}
+		);
 	}
 
 	#[test]
diff --git a/client/finality-grandpa/src/lib.rs b/client/finality-grandpa/src/lib.rs
index d556ae089b61..c7f7c8517b95 100644
--- a/client/finality-grandpa/src/lib.rs
+++ b/client/finality-grandpa/src/lib.rs
@@ -122,7 +122,7 @@ mod until_imported;
 mod voting_rule;
 
 pub use authorities::{SharedAuthoritySet, AuthoritySet};
-pub use finality_proof::{FinalityProofFragment, FinalityProofProvider, StorageAndProofProvider};
+pub use finality_proof::{FinalityProof, FinalityProofProvider, FinalityProofError};
 pub use notification::{GrandpaJustificationSender, GrandpaJustificationStream};
 pub use import::GrandpaBlockImport;
 pub use justification::GrandpaJustification;
diff --git a/client/finality-grandpa/src/tests.rs b/client/finality-grandpa/src/tests.rs
index 1ee71dddc4d4..b94981838138 100644
--- a/client/finality-grandpa/src/tests.rs
+++ b/client/finality-grandpa/src/tests.rs
@@ -32,25 +32,20 @@ use tokio::runtime::{Runtime, Handle};
 use sp_keyring::Ed25519Keyring;
 use sc_client_api::backend::TransactionFor;
 use sp_blockchain::Result;
-use sp_api::{ApiRef, StorageProof, ProvideRuntimeApi};
+use sp_api::{ApiRef, ProvideRuntimeApi};
 use substrate_test_runtime_client::runtime::BlockNumber;
 use sp_consensus::{
 	BlockOrigin, ForkChoiceStrategy, ImportedAux, BlockImportParams, ImportResult, BlockImport,
 	import_queue::BoxJustificationImport,
 };
 use std::{collections::{HashMap, HashSet}, pin::Pin};
-use parity_scale_codec::Decode;
-use sp_runtime::traits::{Block as BlockT, Header as HeaderT, HashFor};
+use sp_runtime::traits::{Block as BlockT, Header as HeaderT};
 use sp_runtime::generic::{BlockId, DigestItem};
 use sp_core::H256;
 use sp_keystore::{SyncCryptoStorePtr, SyncCryptoStore};
 use sp_finality_grandpa::{GRANDPA_ENGINE_ID, AuthorityList, EquivocationProof, GrandpaApi, OpaqueKeyOwnershipProof};
-use sp_state_machine::{InMemoryBackend, prove_read, read_proof_check};
 
 use authorities::AuthoritySet;
-use finality_proof::{
-	AuthoritySetForFinalityProver, AuthoritySetForFinalityChecker,
-};
 use sc_block_builder::BlockBuilderProvider;
 use sc_consensus::LongestChain;
 use sc_keystore::LocalKeystore;
@@ -207,43 +202,6 @@ impl GenesisAuthoritySetProvider<Block> for TestApi {
 	}
 }
 
-impl AuthoritySetForFinalityProver<Block> for TestApi {
-	fn authorities(&self, _block: &BlockId<Block>) -> Result<AuthorityList> {
-		Ok(self.genesis_authorities.clone())
-	}
-
-	fn prove_authorities(&self, block: &BlockId<Block>) -> Result<StorageProof> {
-		let authorities = self.authorities(block)?;
-		let backend = <InMemoryBackend<HashFor<Block>>>::from(vec![
-			(None, vec![(b"authorities".to_vec(), Some(authorities.encode()))])
-		]);
-		let proof = prove_read(backend, vec![b"authorities"])
-			.expect("failure proving read from in-memory storage backend");
-		Ok(proof)
-	}
-}
-
-impl AuthoritySetForFinalityChecker<Block> for TestApi {
-	fn check_authorities_proof(
-		&self,
-		_hash: <Block as BlockT>::Hash,
-		header: <Block as BlockT>::Header,
-		proof: StorageProof,
-	) -> Result<AuthorityList> {
-		let results = read_proof_check::<HashFor<Block>, _>(
-			*header.state_root(), proof, vec![b"authorities"]
-		)
-			.expect("failure checking read proof for authorities");
-		let encoded = results.get(&b"authorities"[..])
-			.expect("returned map must contain all proof keys")
-			.as_ref()
-			.expect("authorities in proof is None");
-		let authorities = Decode::decode(&mut &encoded[..])
-			.expect("failure decoding authorities read from proof");
-		Ok(authorities)
-	}
-}
-
 const TEST_GOSSIP_DURATION: Duration = Duration::from_millis(500);
 
 fn make_ids(keys: &[Ed25519Keyring]) -> AuthorityList {

From 947a6bc1cc8919d382c193893308ba46e6d6cba7 Mon Sep 17 00:00:00 2001
From: cheme <emericchevalier.pro@gmail.com>
Date: Fri, 22 Jan 2021 13:27:43 +0100
Subject: [PATCH 0308/1194] Allow transaction for offchain indexing (#7290)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Moving offchain change set to state machine overlay change set,
preparing use of change set internally.

* Make change set generic over key and value, and use it for offchain
indexing.

* test ui change

* remaining delta

* generating with standard method

* Remove 'drain_committed' function, and documentation.

* Default constructor for enabling offchain indexing.

* Remove offchain change specific iterators.

* remove pub accessor

* keep previous hierarchy, just expose iterator instead.

* Update primitives/state-machine/src/overlayed_changes/mod.rs

Co-authored-by: Tomasz Drwięga <tomusdrw@users.noreply.github.com>

* fix line break

* missing renamings

* fix import

* fix new state-machine tests.

* Don't expose InnerValue type.

* Add test similar to set_storage.

* Remove conditional offchain storage (hard to instantiate correctly).

* fix

* offchain as children cannot fail if top doesn't

Co-authored-by: Addie Wagenknecht <addie@nortd.com>
Co-authored-by: Tomasz Drwięga <tomusdrw@users.noreply.github.com>
---
 client/api/src/backend.rs                     |   6 +-
 client/db/src/lib.rs                          |  10 +-
 client/executor/src/integration_tests/mod.rs  |  12 +-
 primitives/core/src/offchain/mod.rs           |   8 +
 primitives/core/src/offchain/storage.rs       |  95 ---------
 primitives/core/src/offchain/testing.rs       |  10 +-
 primitives/offchain/src/lib.rs                |   2 +-
 primitives/state-machine/src/ext.rs           |  25 +--
 primitives/state-machine/src/lib.rs           |   2 +
 .../src/overlayed_changes/changeset.rs        | 194 +++++++++++-------
 .../src/overlayed_changes/mod.rs              | 135 ++++++++----
 .../src/overlayed_changes/offchain.rs         | 130 ++++++++++++
 primitives/state-machine/src/testing.rs       |   2 +-
 13 files changed, 382 insertions(+), 249 deletions(-)
 create mode 100644 primitives/state-machine/src/overlayed_changes/offchain.rs

diff --git a/client/api/src/backend.rs b/client/api/src/backend.rs
index c2b42d1b3444..e41b250269a1 100644
--- a/client/api/src/backend.rs
+++ b/client/api/src/backend.rs
@@ -21,12 +21,12 @@
 use std::sync::Arc;
 use std::collections::{HashMap, HashSet};
 use sp_core::ChangesTrieConfigurationRange;
-use sp_core::offchain::{OffchainStorage,storage::OffchainOverlayedChanges};
+use sp_core::offchain::OffchainStorage;
 use sp_runtime::{generic::BlockId, Justification, Storage};
 use sp_runtime::traits::{Block as BlockT, NumberFor, HashFor};
 use sp_state_machine::{
 	ChangesTrieState, ChangesTrieStorage as StateChangesTrieStorage, ChangesTrieTransaction,
-	StorageCollection, ChildStorageCollection,
+	StorageCollection, ChildStorageCollection, OffchainChangesCollection,
 };
 use sp_storage::{StorageData, StorageKey, PrefixedStorageKey, ChildInfo};
 use crate::{
@@ -174,7 +174,7 @@ pub trait BlockImportOperation<Block: BlockT> {
 	/// Write offchain storage changes to the database.
 	fn update_offchain_storage(
 		&mut self,
-		_offchain_update: OffchainOverlayedChanges,
+		_offchain_update: OffchainChangesCollection,
 	) -> sp_blockchain::Result<()> {
 		 Ok(())
 	}
diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index a2c8b5612599..a976cbc2ce8d 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -67,7 +67,7 @@ use hash_db::Prefix;
 use sp_trie::{MemoryDB, PrefixedMemoryDB, prefixed_key};
 use sp_database::Transaction;
 use sp_core::{Hasher, ChangesTrieConfiguration};
-use sp_core::offchain::storage::{OffchainOverlayedChange, OffchainOverlayedChanges};
+use sp_core::offchain::OffchainOverlayedChange;
 use sp_core::storage::{well_known_keys, ChildInfo};
 use sp_arithmetic::traits::Saturating;
 use sp_runtime::{generic::{DigestItem, BlockId}, Justification, Storage};
@@ -76,7 +76,7 @@ use sp_runtime::traits::{
 };
 use sp_state_machine::{
 	DBValue, ChangesTrieTransaction, ChangesTrieCacheAction, UsageInfo as StateUsageInfo,
-	StorageCollection, ChildStorageCollection,
+	StorageCollection, ChildStorageCollection, OffchainChangesCollection,
 	backend::Backend as StateBackend, StateMachineStats,
 };
 use crate::utils::{DatabaseType, Meta, meta_keys, read_db, read_meta};
@@ -667,7 +667,7 @@ pub struct BlockImportOperation<Block: BlockT> {
 	db_updates: PrefixedMemoryDB<HashFor<Block>>,
 	storage_updates: StorageCollection,
 	child_storage_updates: ChildStorageCollection,
-	offchain_storage_updates: OffchainOverlayedChanges,
+	offchain_storage_updates: OffchainChangesCollection,
 	changes_trie_updates: MemoryDB<HashFor<Block>>,
 	changes_trie_build_cache_update: Option<ChangesTrieCacheAction<Block::Hash, NumberFor<Block>>>,
 	changes_trie_config_update: Option<Option<ChangesTrieConfiguration>>,
@@ -680,7 +680,7 @@ pub struct BlockImportOperation<Block: BlockT> {
 
 impl<Block: BlockT> BlockImportOperation<Block> {
 	fn apply_offchain(&mut self, transaction: &mut Transaction<DbHash>) {
-		for ((prefix, key), value_operation) in self.offchain_storage_updates.drain() {
+		for ((prefix, key), value_operation) in self.offchain_storage_updates.drain(..) {
 			let key = crate::offchain::concatenate_prefix_and_key(&prefix, &key);
 			match value_operation {
 				OffchainOverlayedChange::SetValue(val) =>
@@ -798,7 +798,7 @@ impl<Block: BlockT> sc_client_api::backend::BlockImportOperation<Block> for Bloc
 
 	fn update_offchain_storage(
 		&mut self,
-		offchain_update: OffchainOverlayedChanges,
+		offchain_update: OffchainChangesCollection,
 	) -> ClientResult<()> {
 		self.offchain_storage_updates = offchain_update;
 		Ok(())
diff --git a/client/executor/src/integration_tests/mod.rs b/client/executor/src/integration_tests/mod.rs
index e4339a9ff84e..1f14678c7a4d 100644
--- a/client/executor/src/integration_tests/mod.rs
+++ b/client/executor/src/integration_tests/mod.rs
@@ -475,13 +475,11 @@ fn offchain_index(wasm_method: WasmExecutionMethod) {
 		&mut ext.ext(),
 	).unwrap();
 
-	use sp_core::offchain::storage::OffchainOverlayedChange;
-	assert_eq!(
-		ext.overlayed_changes()
-			.offchain_overlay()
-			.get(sp_core::offchain::STORAGE_PREFIX, b"k"),
-		Some(OffchainOverlayedChange::SetValue(b"v".to_vec()))
-	);
+	use sp_core::offchain::OffchainOverlayedChange;
+	let data = ext.overlayed_changes().clone().offchain_drain_committed().find(|(k, _v)| {
+		k == &(sp_core::offchain::STORAGE_PREFIX.to_vec(), b"k".to_vec())
+	});
+	assert_eq!(data.map(|data| data.1), Some(OffchainOverlayedChange::SetValue(b"v".to_vec())));
 }
 
 test_wasm_execution!(offchain_local_storage_should_work);
diff --git a/primitives/core/src/offchain/mod.rs b/primitives/core/src/offchain/mod.rs
index 002e35400481..ef6c38a7d6fd 100644
--- a/primitives/core/src/offchain/mod.rs
+++ b/primitives/core/src/offchain/mod.rs
@@ -746,6 +746,14 @@ impl TransactionPoolExt {
 	}
 }
 
+/// Change to be applied to the offchain worker db in regards to a key.
+#[derive(Debug, Clone, Hash, Eq, PartialEq)]
+pub enum OffchainOverlayedChange {
+	/// Remove the data associated with the key
+	Remove,
+	/// Overwrite the value of an associated key
+	SetValue(Vec<u8>),
+}
 
 #[cfg(test)]
 mod tests {
diff --git a/primitives/core/src/offchain/storage.rs b/primitives/core/src/offchain/storage.rs
index a47361d88e76..f114c102fb82 100644
--- a/primitives/core/src/offchain/storage.rs
+++ b/primitives/core/src/offchain/storage.rs
@@ -83,98 +83,3 @@ impl OffchainStorage for InMemOffchainStorage {
 		}
 	}
 }
-
-/// Change to be applied to the offchain worker db in regards to a key.
-#[derive(Debug,Clone,Hash,Eq,PartialEq)]
-pub enum OffchainOverlayedChange {
-	/// Remove the data associated with the key
-	Remove,
-	/// Overwrite the value of an associated key
-	SetValue(Vec<u8>),
-}
-
-/// In-memory storage for offchain workers recoding changes for the actual offchain storage implementation.
-#[derive(Debug, Clone, Default)]
-pub struct OffchainOverlayedChanges {
-	changes: HashMap<(Vec<u8>, Vec<u8>), OffchainOverlayedChange>,
-}
-
-impl OffchainOverlayedChanges {
-	/// Consume the offchain storage and iterate over all key value pairs.
-	pub fn into_iter(self) -> impl Iterator<Item = ((Vec<u8>, Vec<u8>), OffchainOverlayedChange)> {
-		self.changes.into_iter()
-	}
-
-	/// Iterate over all key value pairs by reference.
-	pub fn iter(&self) -> impl Iterator<Item = (&(Vec<u8>, Vec<u8>), &OffchainOverlayedChange)> {
-		self.changes.iter()
-	}
-
-	/// Drain all elements of changeset.
-	pub fn drain(&mut self) -> impl Iterator<Item = ((Vec<u8>, Vec<u8>), OffchainOverlayedChange)> + '_ {
-		self.changes.drain()
-	}
-
-	/// Remove a key and its associated value from the offchain database.
-	pub fn remove(&mut self, prefix: &[u8], key: &[u8]) {
-		self.changes.insert((prefix.to_vec(), key.to_vec()), OffchainOverlayedChange::Remove);
-	}
-
-	/// Set the value associated with a key under a prefix to the value provided.
-	pub fn set(&mut self, prefix: &[u8], key: &[u8], value: &[u8]) {
-		self.changes.insert(
-			(prefix.to_vec(), key.to_vec()),
-			OffchainOverlayedChange::SetValue(value.to_vec()),
-		);
-	}
-
-	/// Obtain a associated value to the given key in storage with prefix.
-	pub fn get(&self, prefix: &[u8], key: &[u8]) -> Option<OffchainOverlayedChange> {
-		let key = (prefix.to_vec(), key.to_vec());
-		self.changes.get(&key).cloned()
-	}
-}
-
-#[cfg(test)]
-mod test {
-	use super::*;
-	use super::super::STORAGE_PREFIX;
-
-	#[test]
-	fn test_drain() {
-		let mut ooc = OffchainOverlayedChanges::default();
-		ooc.set(STORAGE_PREFIX,b"kkk", b"vvv");
-		let drained = ooc.drain().count();
-		assert_eq!(drained, 1);
-		let leftover = ooc.iter().count();
-		assert_eq!(leftover, 0);
-
-		ooc.set(STORAGE_PREFIX, b"a", b"v");
-		ooc.set(STORAGE_PREFIX, b"b", b"v");
-		ooc.set(STORAGE_PREFIX, b"c", b"v");
-		ooc.set(STORAGE_PREFIX, b"d", b"v");
-		ooc.set(STORAGE_PREFIX, b"e", b"v");
-		assert_eq!(ooc.iter().count(), 5);
-	}
-
-	#[test]
-	fn test_accumulated_set_remove_set() {
-		let mut ooc = OffchainOverlayedChanges::default();
-		ooc.set(STORAGE_PREFIX, b"ppp", b"qqq");
-		ooc.remove(STORAGE_PREFIX, b"ppp");
-		// keys are equiv, so it will overwrite the value and the overlay will contain
-		// one item
-		assert_eq!(ooc.iter().count(), 1);
-
-		ooc.set(STORAGE_PREFIX, b"ppp", b"rrr");
-		let mut iter = ooc.into_iter();
-		assert_eq!(
-			iter.next(),
-			Some(
-				((STORAGE_PREFIX.to_vec(), b"ppp".to_vec()),
-				OffchainOverlayedChange::SetValue(b"rrr".to_vec()))
-			)
-		);
-		assert_eq!(iter.next(), None);
-	}
-}
diff --git a/primitives/core/src/offchain/testing.rs b/primitives/core/src/offchain/testing.rs
index 773f74b7379c..da486a3d03b1 100644
--- a/primitives/core/src/offchain/testing.rs
+++ b/primitives/core/src/offchain/testing.rs
@@ -27,7 +27,8 @@ use std::{
 use crate::OpaquePeerId;
 use crate::offchain::{
 	self,
-	storage::{InMemOffchainStorage, OffchainOverlayedChange, OffchainOverlayedChanges},
+	OffchainOverlayedChange,
+	storage::InMemOffchainStorage,
 	HttpError,
 	HttpRequestId as RequestId,
 	HttpRequestStatus as RequestStatus,
@@ -80,9 +81,12 @@ impl TestPersistentOffchainDB {
 	}
 
 	/// Apply a set of off-chain changes directly to the test backend
-	pub fn apply_offchain_changes(&mut self, changes: &mut OffchainOverlayedChanges) {
+	pub fn apply_offchain_changes(
+		&mut self,
+		changes: impl Iterator<Item = ((Vec<u8>, Vec<u8>), OffchainOverlayedChange)>,
+	) {
 		let mut me = self.persistent.write();
-		for ((_prefix, key), value_operation) in changes.drain() {
+		for ((_prefix, key), value_operation) in changes {
 			match value_operation {
 				OffchainOverlayedChange::SetValue(val) => me.set(Self::PREFIX, key.as_slice(), val.as_slice()),
 				OffchainOverlayedChange::Remove => me.remove(Self::PREFIX, key.as_slice()),
diff --git a/primitives/offchain/src/lib.rs b/primitives/offchain/src/lib.rs
index fbbcdcd9b83d..ffdc2bfcc3a6 100644
--- a/primitives/offchain/src/lib.rs
+++ b/primitives/offchain/src/lib.rs
@@ -21,7 +21,7 @@
 #![warn(missing_docs)]
 
 /// Re-export of parent module scope storage prefix.
-pub use sp_core::offchain::STORAGE_PREFIX as STORAGE_PREFIX;
+pub use sp_core::offchain::STORAGE_PREFIX;
 
 sp_api::decl_runtime_apis! {
 	/// The offchain worker api.
diff --git a/primitives/state-machine/src/ext.rs b/primitives/state-machine/src/ext.rs
index c872b4eaf746..1e64cd74bc1b 100644
--- a/primitives/state-machine/src/ext.rs
+++ b/primitives/state-machine/src/ext.rs
@@ -193,18 +193,10 @@ where
 	B: Backend<H>,
 	N: crate::changes_trie::BlockNumber,
 {
-	#[cfg(feature = "std")]
 	fn set_offchain_storage(&mut self, key: &[u8], value: Option<&[u8]>) {
-		use sp_core::offchain::STORAGE_PREFIX;
-		match value {
-			Some(value) => self.overlay.offchain_set_storage(STORAGE_PREFIX, key, value),
-			None => self.overlay.offchain_remove_storage(STORAGE_PREFIX, key),
-		}
+		self.overlay.set_offchain_storage(key, value)
 	}
 
-	#[cfg(not(feature = "std"))]
-	fn set_offchain_storage(&mut self, _key: &[u8], _value: Option<&[u8]>) {}
-
 	fn storage(&self, key: &[u8]) -> Option<StorageValue> {
 		let _guard = guard();
 		let result = self.overlay.storage(key).map(|x| x.map(|x| x.to_vec())).unwrap_or_else(||
@@ -790,7 +782,6 @@ mod tests {
 		H256,
 		Blake2Hasher,
 		map,
-		offchain,
 		storage::{
 			Storage,
 			StorageChild,
@@ -813,14 +804,11 @@ mod tests {
 		changes.set_extrinsic_index(1);
 		changes.set_storage(vec![1], Some(vec![100]));
 		changes.set_storage(EXTRINSIC_INDEX.to_vec(), Some(3u32.encode()));
+		changes.set_offchain_storage(b"k1", Some(b"v1"));
+		changes.set_offchain_storage(b"k2", Some(b"v2"));
 		changes
 	}
 
-	fn prepare_offchain_overlay_with_changes(overlay: &mut OverlayedChanges) {
-		overlay.offchain_set_storage(offchain::STORAGE_PREFIX, b"k1", b"v1");
-		overlay.offchain_set_storage(offchain::STORAGE_PREFIX, b"k2", b"v2");
-	}
-
 	fn changes_trie_config() -> ChangesTrieConfiguration {
 		ChangesTrieConfiguration {
 			digest_interval: 0,
@@ -849,7 +837,6 @@ mod tests {
 	#[test]
 	fn storage_changes_root_is_some_when_extrinsic_changes_are_non_empty() {
 		let mut overlay = prepare_overlay_with_changes();
-		prepare_offchain_overlay_with_changes(&mut overlay);
 		let mut cache = StorageTransactionCache::default();
 		let storage = TestChangesTrieStorage::with_blocks(vec![(99, Default::default())]);
 		let state = Some(ChangesTrieState::new(changes_trie_config(), Zero::zero(), &storage));
@@ -864,7 +851,6 @@ mod tests {
 	#[test]
 	fn storage_changes_root_is_some_when_extrinsic_changes_are_empty() {
 		let mut overlay = prepare_overlay_with_changes();
-		prepare_offchain_overlay_with_changes(&mut overlay);
 		let mut cache = StorageTransactionCache::default();
 		overlay.set_collect_extrinsics(false);
 		overlay.set_storage(vec![1], None);
@@ -884,7 +870,6 @@ mod tests {
 		let mut overlay = OverlayedChanges::default();
 		overlay.set_storage(vec![20], None);
 		overlay.set_storage(vec![30], Some(vec![31]));
-		prepare_offchain_overlay_with_changes(&mut overlay);
 		let backend = Storage {
 			top: map![
 				vec![10] => vec![10],
@@ -939,8 +924,6 @@ mod tests {
 			],
 		}.into();
 
-		prepare_offchain_overlay_with_changes(&mut overlay);
-
 		let ext = TestExt::new(&mut overlay, &mut cache, &backend, None, None);
 
 		// next_backend < next_overlay
@@ -971,7 +954,6 @@ mod tests {
 		let mut overlay = OverlayedChanges::default();
 		overlay.set_child_storage(child_info, vec![20], None);
 		overlay.set_child_storage(child_info, vec![30], Some(vec![31]));
-		prepare_offchain_overlay_with_changes(&mut overlay);
 		let backend = Storage {
 			top: map![],
 			children_default: map![
@@ -1013,7 +995,6 @@ mod tests {
 		let child_info = &child_info;
 		let mut cache = StorageTransactionCache::default();
 		let mut overlay = OverlayedChanges::default();
-		prepare_offchain_overlay_with_changes(&mut overlay);
 		let backend = Storage {
 			top: map![],
 			children_default: map![
diff --git a/primitives/state-machine/src/lib.rs b/primitives/state-machine/src/lib.rs
index c8b4703755cb..31d4eacc4e58 100644
--- a/primitives/state-machine/src/lib.rs
+++ b/primitives/state-machine/src/lib.rs
@@ -119,6 +119,8 @@ pub use crate::overlayed_changes::{
 	OverlayedChanges, StorageKey, StorageValue,
 	StorageCollection, ChildStorageCollection,
 	StorageChanges, StorageTransactionCache,
+	OffchainChangesCollection,
+	OffchainOverlayedChanges,
 };
 pub use crate::backend::Backend;
 pub use crate::trie_backend_essence::{TrieBackendStorage, Storage};
diff --git a/primitives/state-machine/src/overlayed_changes/changeset.rs b/primitives/state-machine/src/overlayed_changes/changeset.rs
index 311af042177b..d25f4807aa97 100644
--- a/primitives/state-machine/src/overlayed_changes/changeset.rs
+++ b/primitives/state-machine/src/overlayed_changes/changeset.rs
@@ -25,6 +25,7 @@ use std::collections::HashSet as Set;
 use sp_std::collections::btree_set::BTreeSet as Set;
 
 use sp_std::collections::{btree_map::BTreeMap, btree_set::BTreeSet};
+use sp_std::hash::Hash;
 use smallvec::SmallVec;
 use crate::warn;
 
@@ -32,8 +33,8 @@ const PROOF_OVERLAY_NON_EMPTY: &str = "\
 	An OverlayValue is always created with at least one transaction and dropped as soon
 	as the last transaction is removed; qed";
 
-type DirtyKeysSets = SmallVec<[Set<StorageKey>; 5]>;
-type Transactions = SmallVec<[InnerValue; 5]>;
+type DirtyKeysSets<K> = SmallVec<[Set<K>; 5]>;
+type Transactions<V> = SmallVec<[InnerValue<V>; 5]>;
 
 /// Error returned when trying to commit or rollback while no transaction is open or
 /// when the runtime is trying to close a transaction started by the client.
@@ -62,32 +63,46 @@ pub enum ExecutionMode {
 
 #[derive(Debug, Default, Clone)]
 #[cfg_attr(test, derive(PartialEq))]
-struct InnerValue {
+struct InnerValue<V> {
 	/// Current value. None if value has been deleted.
-	value: Option<StorageValue>,
+	value: V,
 	/// The set of extrinsic indices where the values has been changed.
 	/// Is filled only if runtime has announced changes trie support.
 	extrinsics: Extrinsics,
 }
 
 /// An overlay that contains all versions of a value for a specific key.
-#[derive(Debug, Default, Clone)]
+#[derive(Debug, Clone)]
 #[cfg_attr(test, derive(PartialEq))]
-pub struct OverlayedValue {
+pub struct OverlayedEntry<V> {
 	/// The individual versions of that value.
 	/// One entry per transactions during that the value was actually written.
-	transactions: Transactions,
+	transactions: Transactions<V>,
+}
+
+impl<V> Default for OverlayedEntry<V> {
+	fn default() -> Self {
+		Self {
+			transactions: SmallVec::new(),
+		}
+	}
 }
 
+/// History of value, with removal support.
+pub type OverlayedValue = OverlayedEntry<Option<StorageValue>>;
+
+/// Change set for basic key value with extrinsics index recording and removal support.
+pub type OverlayedChangeSet = OverlayedMap<StorageKey, Option<StorageValue>>;
+
 /// Holds a set of changes with the ability modify them using nested transactions.
-#[derive(Debug, Default, Clone)]
-pub struct OverlayedChangeSet {
+#[derive(Debug, Clone)]
+pub struct OverlayedMap<K: Ord + Hash, V> {
 	/// Stores the changes that this overlay constitutes.
-	changes: BTreeMap<StorageKey, OverlayedValue>,
+	changes: BTreeMap<K, OverlayedEntry<V>>,
 	/// Stores which keys are dirty per transaction. Needed in order to determine which
 	/// values to merge into the parent transaction on commit. The length of this vector
 	/// therefore determines how many nested transactions are currently open (depth).
-	dirty_keys: DirtyKeysSets,
+	dirty_keys: DirtyKeysSets<K>,
 	/// The number of how many transactions beginning from the first transactions are started
 	/// by the client. Those transactions are protected against close (commit, rollback)
 	/// when in runtime mode.
@@ -96,16 +111,32 @@ pub struct OverlayedChangeSet {
 	execution_mode: ExecutionMode,
 }
 
+impl<K: Ord + Hash, V> Default for OverlayedMap<K, V> {
+	fn default() -> Self {
+		Self {
+			changes: BTreeMap::new(),
+			dirty_keys: SmallVec::new(),
+			num_client_transactions: Default::default(),
+			execution_mode: Default::default(),
+		}
+	}
+}
+
 impl Default for ExecutionMode {
 	fn default() -> Self {
 		Self::Client
 	}
 }
 
-impl OverlayedValue {
+impl<V> OverlayedEntry<V> {
 	/// The value as seen by the current transaction.
-	pub fn value(&self) -> Option<&StorageValue> {
-		self.transactions.last().expect(PROOF_OVERLAY_NON_EMPTY).value.as_ref()
+	pub fn value_ref(&self) -> &V {
+		&self.transactions.last().expect(PROOF_OVERLAY_NON_EMPTY).value
+	}
+
+	/// The value as seen by the current transaction.
+	pub fn into_value(mut self) -> V {
+		self.transactions.pop().expect(PROOF_OVERLAY_NON_EMPTY).value
 	}
 
 	/// Unique list of extrinsic indices which modified the value.
@@ -116,12 +147,12 @@ impl OverlayedValue {
 	}
 
 	/// Mutable reference to the most recent version.
-	fn value_mut(&mut self) -> &mut Option<StorageValue> {
+	fn value_mut(&mut self) -> &mut V {
 		&mut self.transactions.last_mut().expect(PROOF_OVERLAY_NON_EMPTY).value
 	}
 
 	/// Remove the last version and return it.
-	fn pop_transaction(&mut self) -> InnerValue {
+	fn pop_transaction(&mut self) -> InnerValue<V> {
 		self.transactions.pop().expect(PROOF_OVERLAY_NON_EMPTY)
 	}
 
@@ -136,14 +167,14 @@ impl OverlayedValue {
 	/// rolled back when required.
 	fn set(
 		&mut self,
-		value: Option<StorageValue>,
+		value: V,
 		first_write_in_tx: bool,
 		at_extrinsic: Option<u32>,
 	) {
 		if first_write_in_tx || self.transactions.is_empty() {
 			self.transactions.push(InnerValue {
 				value,
-				.. Default::default()
+				extrinsics: Default::default(),
 			});
 		} else {
 			*self.value_mut() = value;
@@ -155,15 +186,22 @@ impl OverlayedValue {
 	}
 }
 
+impl OverlayedEntry<Option<StorageValue>> {
+	/// The value as seen by the current transaction.
+	pub fn value(&self) -> Option<&StorageValue> {
+		self.value_ref().as_ref()
+	}
+}
+
 /// Inserts a key into the dirty set.
 ///
 /// Returns true iff we are currently have at least one open transaction and if this
 /// is the first write to the given key that transaction.
-fn insert_dirty(set: &mut DirtyKeysSets, key: StorageKey) -> bool {
+fn insert_dirty<K: Ord + Hash>(set: &mut DirtyKeysSets<K>, key: K) -> bool {
 	set.last_mut().map(|dk| dk.insert(key)).unwrap_or_default()
 }
 
-impl OverlayedChangeSet {
+impl<K: Ord + Hash + Clone, V> OverlayedMap<K, V> {
 	/// Create a new changeset at the same transaction state but without any contents.
 	///
 	/// This changeset might be created when there are already open transactions.
@@ -171,10 +209,10 @@ impl OverlayedChangeSet {
 	pub fn spawn_child(&self) -> Self {
 		use sp_std::iter::repeat;
 		Self {
+			changes: Default::default(),
 			dirty_keys: repeat(Set::new()).take(self.transaction_depth()).collect(),
 			num_client_transactions: self.num_client_transactions,
 			execution_mode: self.execution_mode,
-			.. Default::default()
 		}
 	}
 
@@ -184,7 +222,11 @@ impl OverlayedChangeSet {
 	}
 
 	/// Get an optional reference to the value stored for the specified key.
-	pub fn get(&self, key: &[u8]) -> Option<&OverlayedValue> {
+	pub fn get<Q>(&self, key: &Q) -> Option<&OverlayedEntry<V>>
+		where
+			K: sp_std::borrow::Borrow<Q>,
+			Q: Ord + ?Sized, 
+	{
 		self.changes.get(key)
 	}
 
@@ -193,72 +235,30 @@ impl OverlayedChangeSet {
 	/// Can be rolled back or committed when called inside a transaction.
 	pub fn set(
 		&mut self,
-		key: StorageKey,
-		value: Option<StorageValue>,
+		key: K,
+		value: V,
 		at_extrinsic: Option<u32>,
 	) {
 		let overlayed = self.changes.entry(key.clone()).or_default();
 		overlayed.set(value, insert_dirty(&mut self.dirty_keys, key), at_extrinsic);
 	}
 
-	/// Get a mutable reference for a value.
-	///
-	/// Can be rolled back or committed when called inside a transaction.
-	#[must_use = "A change was registered, so this value MUST be modified."]
-	pub fn modify(
-		&mut self,
-		key: StorageKey,
-		init: impl Fn() -> StorageValue,
-		at_extrinsic: Option<u32>,
-	) -> &mut Option<StorageValue> {
-		let overlayed = self.changes.entry(key.clone()).or_default();
-		let first_write_in_tx = insert_dirty(&mut self.dirty_keys, key);
-		let clone_into_new_tx = if let Some(tx) = overlayed.transactions.last() {
-			if first_write_in_tx {
-				Some(tx.value.clone())
-			} else {
-				None
-			}
-		} else {
-			Some(Some(init()))
-		};
-
-		if let Some(cloned) = clone_into_new_tx {
-			overlayed.set(cloned, first_write_in_tx, at_extrinsic);
-		}
-		overlayed.value_mut()
-	}
-
-	/// Set all values to deleted which are matched by the predicate.
-	///
-	/// Can be rolled back or committed when called inside a transaction.
-	pub fn clear_where(
-		&mut self,
-		predicate: impl Fn(&[u8], &OverlayedValue) -> bool,
-		at_extrinsic: Option<u32>,
-	) {
-		for (key, val) in self.changes.iter_mut().filter(|(k, v)| predicate(k, v)) {
-			val.set(None, insert_dirty(&mut self.dirty_keys, key.clone()), at_extrinsic);
-		}
-	}
-
 	/// Get a list of all changes as seen by current transaction.
-	pub fn changes(&self) -> impl Iterator<Item=(&StorageKey, &OverlayedValue)> {
+	pub fn changes(&self) -> impl Iterator<Item=(&K, &OverlayedEntry<V>)> {
 		self.changes.iter()
 	}
 
-	/// Get the change that is next to the supplied key.
-	pub fn next_change(&self, key: &[u8]) -> Option<(&[u8], &OverlayedValue)> {
-		use sp_std::ops::Bound;
-		let range = (Bound::Excluded(key), Bound::Unbounded);
-		self.changes.range::<[u8], _>(range).next().map(|(k, v)| (&k[..], v))
+	/// Get a list of all changes as seen by current transaction, consumes
+	/// the overlay.
+	pub fn into_changes(self) -> impl Iterator<Item=(K, OverlayedEntry<V>)> {
+		self.changes.into_iter()
 	}
 
 	/// Consume this changeset and return all committed changes.
 	///
 	/// Panics:
 	/// Panics if there are open transactions: `transaction_depth() > 0`
-	pub fn drain_commited(self) -> impl Iterator<Item=(StorageKey, Option<StorageValue>)> {
+	pub fn drain_commited(self) -> impl Iterator<Item=(K, V)> {
 		assert!(self.transaction_depth() == 0, "Drain is not allowed with open transactions.");
 		self.changes.into_iter().map(|(k, mut v)| (k, v.pop_transaction().value))
 	}
@@ -384,6 +384,56 @@ impl OverlayedChangeSet {
 	}
 }
 
+impl OverlayedChangeSet {
+	/// Get a mutable reference for a value.
+	///
+	/// Can be rolled back or committed when called inside a transaction.
+	#[must_use = "A change was registered, so this value MUST be modified."]
+	pub fn modify(
+		&mut self,
+		key: StorageKey,
+		init: impl Fn() -> StorageValue,
+		at_extrinsic: Option<u32>,
+	) -> &mut Option<StorageValue> {
+		let overlayed = self.changes.entry(key.clone()).or_default();
+		let first_write_in_tx = insert_dirty(&mut self.dirty_keys, key);
+		let clone_into_new_tx = if let Some(tx) = overlayed.transactions.last() {
+			if first_write_in_tx {
+				Some(tx.value.clone())
+			} else {
+				None
+			}
+		} else {
+			Some(Some(init()))
+		};
+
+		if let Some(cloned) = clone_into_new_tx {
+			overlayed.set(cloned, first_write_in_tx, at_extrinsic);
+		}
+		overlayed.value_mut()
+	}
+
+	/// Set all values to deleted which are matched by the predicate.
+	///
+	/// Can be rolled back or committed when called inside a transaction.
+	pub fn clear_where(
+		&mut self,
+		predicate: impl Fn(&[u8], &OverlayedValue) -> bool,
+		at_extrinsic: Option<u32>,
+	) {
+		for (key, val) in self.changes.iter_mut().filter(|(k, v)| predicate(k, v)) {
+			val.set(None, insert_dirty(&mut self.dirty_keys, key.clone()), at_extrinsic);
+		}
+	}
+
+	/// Get the change that is next to the supplied key.
+	pub fn next_change(&self, key: &[u8]) -> Option<(&[u8], &OverlayedValue)> {
+		use sp_std::ops::Bound;
+		let range = (Bound::Excluded(key), Bound::Unbounded);
+		self.changes.range::<[u8], _>(range).next().map(|(k, v)| (&k[..], v))
+	}
+}
+
 #[cfg(test)]
 mod test {
 	use super::*;
diff --git a/primitives/state-machine/src/overlayed_changes/mod.rs b/primitives/state-machine/src/overlayed_changes/mod.rs
index 97d7a4f057bb..b529c0ebfaee 100644
--- a/primitives/state-machine/src/overlayed_changes/mod.rs
+++ b/primitives/state-machine/src/overlayed_changes/mod.rs
@@ -18,7 +18,9 @@
 //! The overlayed changes to state.
 
 mod changeset;
+mod offchain;
 
+pub use offchain::OffchainOverlayedChanges;
 use crate::{
 	backend::Backend,
 	stats::StateMachineStats,
@@ -42,8 +44,7 @@ use sp_std::collections::btree_map::{BTreeMap as Map, Entry as MapEntry};
 use sp_std::collections::btree_set::BTreeSet;
 use codec::{Decode, Encode};
 use sp_core::storage::{well_known_keys::EXTRINSIC_INDEX, ChildInfo};
-#[cfg(feature = "std")]
-use sp_core::offchain::storage::{OffchainOverlayedChanges, OffchainOverlayedChange};
+use sp_core::offchain::OffchainOverlayedChange;
 use hash_db::Hasher;
 use crate::DefaultError;
 use sp_externalities::{Extensions, Extension};
@@ -65,6 +66,9 @@ pub type StorageCollection = Vec<(StorageKey, Option<StorageValue>)>;
 /// In memory arrays of storage values for multiple child tries.
 pub type ChildStorageCollection = Vec<(StorageKey, StorageCollection)>;
 
+/// In memory array of storage values.
+pub type OffchainChangesCollection = Vec<((Vec<u8>, Vec<u8>), OffchainOverlayedChange)>;
+
 /// Keep trace of extrinsics index for a modified value.
 #[derive(Debug, Default, Eq, PartialEq, Clone)]
 pub struct Extrinsics(Vec<u32>);
@@ -97,13 +101,12 @@ pub struct OverlayedChanges {
 	top: OverlayedChangeSet,
 	/// Child storage changes. The map key is the child storage key without the common prefix.
 	children: Map<StorageKey, (OverlayedChangeSet, ChildInfo)>,
+	/// Offchain related changes.
+	offchain: OffchainOverlayedChanges,
 	/// True if extrinsics stats must be collected.
 	collect_extrinsics: bool,
 	/// Collect statistic on this execution.
 	stats: StateMachineStats,
-	/// Offchain related changes.
-	#[cfg(feature = "std")]
-	offchain: OffchainOverlayedChanges,
 }
 
 /// A storage changes structure that can be generated by the data collected in [`OverlayedChanges`].
@@ -118,8 +121,7 @@ pub struct StorageChanges<Transaction, H: Hasher, N: BlockNumber> {
 	/// All changes to the child storages.
 	pub child_storage_changes: ChildStorageCollection,
 	/// Offchain state changes to write to the offchain database.
-	#[cfg(feature = "std")]
-	pub offchain_storage_changes: OffchainOverlayedChanges,
+	pub offchain_storage_changes: OffchainChangesCollection,
 	/// A transaction for the backend that contains all changes from
 	/// [`main_storage_changes`](StorageChanges::main_storage_changes) and from
 	/// [`child_storage_changes`](StorageChanges::child_storage_changes).
@@ -143,7 +145,7 @@ impl<Transaction, H: Hasher, N: BlockNumber> StorageChanges<Transaction, H, N> {
 	pub fn into_inner(self) -> (
 		StorageCollection,
 		ChildStorageCollection,
-		OffchainOverlayedChanges,
+		OffchainChangesCollection,
 		Transaction,
 		H::Out,
 		Option<ChangesTrieTransaction<H, N>>,
@@ -205,7 +207,6 @@ impl<Transaction: Default, H: Hasher, N: BlockNumber> Default for StorageChanges
 		Self {
 			main_storage_changes: Default::default(),
 			child_storage_changes: Default::default(),
-			#[cfg(feature = "std")]
 			offchain_storage_changes: Default::default(),
 			transaction: Default::default(),
 			transaction_storage_root: Default::default(),
@@ -375,6 +376,7 @@ impl OverlayedChanges {
 		for (_, (changeset, _)) in self.children.iter_mut() {
 			changeset.start_transaction();
 		}
+		self.offchain.overlay_mut().start_transaction();
 	}
 
 	/// Rollback the last transaction started by `start_transaction`.
@@ -388,6 +390,8 @@ impl OverlayedChanges {
 				.expect("Top and children changesets are started in lockstep; qed");
 			!changeset.is_empty()
 		});
+		self.offchain.overlay_mut().rollback_transaction()
+			.expect("Top and offchain changesets are started in lockstep; qed");
 		Ok(())
 	}
 
@@ -401,6 +405,8 @@ impl OverlayedChanges {
 			changeset.commit_transaction()
 				.expect("Top and children changesets are started in lockstep; qed");
 		}
+		self.offchain.overlay_mut().commit_transaction()
+			.expect("Top and offchain changesets are started in lockstep; qed");
 		Ok(())
 	}
 
@@ -414,6 +420,8 @@ impl OverlayedChanges {
 			changeset.enter_runtime()
 				.expect("Top and children changesets are entering runtime in lockstep; qed")
 		}
+		self.offchain.overlay_mut().enter_runtime()
+			.expect("Top and offchain changesets are started in lockstep; qed");
 		Ok(())
 	}
 
@@ -427,6 +435,8 @@ impl OverlayedChanges {
 			changeset.exit_runtime()
 				.expect("Top and children changesets are entering runtime in lockstep; qed");
 		}
+		self.offchain.overlay_mut().exit_runtime()
+			.expect("Top and offchain changesets are started in lockstep; qed");
 		Ok(())
 	}
 
@@ -452,6 +462,16 @@ impl OverlayedChanges {
 		)
 	}
 
+	/// Consume all changes (top + children) and return them.
+	///
+	/// After calling this function no more changes are contained in this changeset.
+	///
+	/// Panics:
+	/// Panics if `transaction_depth() > 0`
+	pub fn offchain_drain_committed(&mut self) -> impl Iterator<Item=((StorageKey, StorageKey), OffchainOverlayedChange)> {
+		self.offchain.drain()
+	}
+
 	/// Get an iterator over all child changes as seen by the current transaction.
 	pub fn children(&self)
 		-> impl Iterator<Item=(impl Iterator<Item=(&StorageKey, &OverlayedValue)>, &ChildInfo)> {
@@ -521,12 +541,12 @@ impl OverlayedChanges {
 			.expect("Changes trie transaction was generated by `changes_trie_root`; qed");
 
 		let (main_storage_changes, child_storage_changes) = self.drain_committed();
+		let offchain_storage_changes = self.offchain_drain_committed().collect();
 
 		Ok(StorageChanges {
 			main_storage_changes: main_storage_changes.collect(),
 			child_storage_changes: child_storage_changes.map(|(sk, it)| (sk, it.0.collect())).collect(),
-			#[cfg(feature = "std")]
-			offchain_storage_changes: std::mem::take(&mut self.offchain),
+			offchain_storage_changes,
 			transaction,
 			transaction_storage_root,
 			#[cfg(feature = "std")]
@@ -633,38 +653,18 @@ impl OverlayedChanges {
 			)
 	}
 
-	/// Set a value in the offchain storage.
-	#[cfg(feature = "std")]
-	pub fn offchain_set_storage(&mut self, prefix: &[u8], key: &[u8], value: &[u8]) {
-		self.offchain.set(prefix, key, value);
-	}
-
-	/// Clear a value in the offchain storage.
-	#[cfg(feature = "std")]
-	pub fn offchain_remove_storage(&mut self, prefix: &[u8], key: &[u8]) {
-		self.offchain.remove(prefix, key);
-	}
-
-	/// Get a value in the offchain storage.
-	#[cfg(feature = "std")]
-	pub fn offchain_get_storage(
-		&mut self,
-		prefix: &[u8],
-		key: &[u8],
-	) -> Option<OffchainOverlayedChange> {
-		self.offchain.get(prefix, key)
-	}
-
-	/// Returns a reference to the offchain overlay.
-	#[cfg(feature = "std")]
-	pub fn offchain_overlay(&self) -> &OffchainOverlayedChanges {
+	/// Read only access ot offchain overlay.
+	pub fn offchain(&self) -> &OffchainOverlayedChanges {
 		&self.offchain
 	}
 
-	/// Returns a mutable reference to the offchain overlay.
-	#[cfg(feature = "std")]
-	pub fn offchain_overlay_mut(&mut self) -> &mut OffchainOverlayedChanges {
-		&mut self.offchain
+	/// Write a key value pair to the offchain storage overlay.
+	pub fn set_offchain_storage(&mut self, key: &[u8], value: Option<&[u8]>) {
+		use sp_core::offchain::STORAGE_PREFIX;
+		match value {
+			Some(value) => self.offchain.set(STORAGE_PREFIX, key, value),
+			None => self.offchain.remove(STORAGE_PREFIX, key),
+		}
 	}
 }
 
@@ -804,6 +804,61 @@ mod tests {
 		assert!(overlayed.storage(&key).unwrap().is_none());
 	}
 
+	#[test]
+	fn offchain_overlayed_storage_transactions_works() {
+		use sp_core::offchain::STORAGE_PREFIX;
+		fn check_offchain_content(
+			state: &OverlayedChanges,
+			nb_commit: usize,
+			expected: Vec<(Vec<u8>, Option<Vec<u8>>)>,
+		) {
+			let mut state = state.clone();
+			for _ in 0..nb_commit {
+				state.commit_transaction().unwrap();
+			}
+			let offchain_data: Vec<_> = state.offchain_drain_committed().collect();
+			let expected: Vec<_> = expected.into_iter().map(|(key, value)| {
+				let change = match value {
+					Some(value) => OffchainOverlayedChange::SetValue(value),
+					None => OffchainOverlayedChange::Remove,
+				};
+				((STORAGE_PREFIX.to_vec(), key), change)
+			}).collect();
+			assert_eq!(offchain_data, expected);
+		}
+
+		let mut overlayed = OverlayedChanges::default();
+
+		let key = vec![42, 69, 169, 142];
+
+		check_offchain_content(&overlayed, 0, vec![]);
+
+		overlayed.start_transaction();
+
+		overlayed.set_offchain_storage(key.as_slice(), Some(&[1, 2, 3][..]));
+		check_offchain_content(&overlayed, 1, vec![(key.clone(), Some(vec![1, 2, 3]))]);
+
+		overlayed.commit_transaction().unwrap();
+
+		check_offchain_content(&overlayed, 0, vec![(key.clone(), Some(vec![1, 2, 3]))]);
+
+		overlayed.start_transaction();
+
+		overlayed.set_offchain_storage(key.as_slice(), Some(&[][..]));
+		check_offchain_content(&overlayed, 1, vec![(key.clone(), Some(vec![]))]);
+
+		overlayed.set_offchain_storage(key.as_slice(), None);
+		check_offchain_content(&overlayed, 1, vec![(key.clone(), None)]);
+
+		overlayed.rollback_transaction().unwrap();
+
+		check_offchain_content(&overlayed, 0, vec![(key.clone(), Some(vec![1, 2, 3]))]);
+
+		overlayed.set_offchain_storage(key.as_slice(), None);
+		check_offchain_content(&overlayed, 0, vec![(key.clone(), None)]);
+	}
+
+
 	#[test]
 	fn overlayed_storage_root_works() {
 		let initial: BTreeMap<_, _> = vec![
diff --git a/primitives/state-machine/src/overlayed_changes/offchain.rs b/primitives/state-machine/src/overlayed_changes/offchain.rs
new file mode 100644
index 000000000000..4128be24bc54
--- /dev/null
+++ b/primitives/state-machine/src/overlayed_changes/offchain.rs
@@ -0,0 +1,130 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Overlayed changes for offchain indexing.
+
+use sp_core::offchain::OffchainOverlayedChange;
+use sp_std::prelude::Vec;
+use super::changeset::OverlayedMap;
+
+/// In-memory storage for offchain workers recoding changes for the actual offchain storage implementation.
+#[derive(Debug, Clone, Default)]
+pub struct OffchainOverlayedChanges(OverlayedMap<(Vec<u8>, Vec<u8>), OffchainOverlayedChange>);
+
+/// Item for iterating over offchain changes.
+///
+/// First element i a tuple of `(prefix, key)`, second element ist the actual change
+/// (remove or set value).
+type OffchainOverlayedChangesItem<'i> = (&'i (Vec<u8>, Vec<u8>), &'i OffchainOverlayedChange);
+
+/// Iterator over offchain changes, owned memory version.
+type OffchainOverlayedChangesItemOwned = ((Vec<u8>, Vec<u8>), OffchainOverlayedChange);
+
+impl OffchainOverlayedChanges {
+	/// Consume the offchain storage and iterate over all key value pairs.
+	pub fn into_iter(self) -> impl Iterator<Item = OffchainOverlayedChangesItemOwned> {
+		self.0.into_changes().map(|kv| (kv.0, kv.1.into_value()))
+	}
+
+	/// Iterate over all key value pairs by reference.
+	pub fn iter<'a>(&'a self) -> impl Iterator<Item = OffchainOverlayedChangesItem<'a>> {
+		self.0.changes().map(|kv| (kv.0, kv.1.value_ref()))
+	}
+
+	/// Drain all elements of changeset.
+	pub fn drain(&mut self) -> impl Iterator<Item = OffchainOverlayedChangesItemOwned> {
+		sp_std::mem::take(self).into_iter()
+	}
+
+	/// Remove a key and its associated value from the offchain database.
+	pub fn remove(&mut self, prefix: &[u8], key: &[u8]) {
+		let _ = self.0.set(
+			(prefix.to_vec(), key.to_vec()),
+			OffchainOverlayedChange::Remove,
+			None,
+		);
+	}
+
+	/// Set the value associated with a key under a prefix to the value provided.
+	pub fn set(&mut self, prefix: &[u8], key: &[u8], value: &[u8]) {
+		let _ = self.0.set(
+			(prefix.to_vec(), key.to_vec()),
+			OffchainOverlayedChange::SetValue(value.to_vec()),
+			None,
+		);
+	}
+
+	/// Obtain a associated value to the given key in storage with prefix.
+	pub fn get(&self, prefix: &[u8], key: &[u8]) -> Option<OffchainOverlayedChange> {
+		let key = (prefix.to_vec(), key.to_vec());
+		self.0.get(&key).map(|entry| entry.value_ref()).cloned()
+	}
+
+	/// Reference to inner change set.
+	pub fn overlay(&self) -> &OverlayedMap<(Vec<u8>, Vec<u8>), OffchainOverlayedChange> {
+		&self.0
+	}
+
+	/// Mutable reference to inner change set.
+	pub fn overlay_mut(&mut self) -> &mut OverlayedMap<(Vec<u8>, Vec<u8>), OffchainOverlayedChange> {
+		&mut self.0
+	}
+}
+
+#[cfg(test)]
+mod test {
+	use super::*;
+	use sp_core::offchain::STORAGE_PREFIX;
+
+	#[test]
+	fn test_drain() {
+		let mut ooc = OffchainOverlayedChanges::default();
+		ooc.set(STORAGE_PREFIX, b"kkk", b"vvv");
+		let drained = ooc.drain().count();
+		assert_eq!(drained, 1);
+		let leftover = ooc.iter().count();
+		assert_eq!(leftover, 0);
+
+		ooc.set(STORAGE_PREFIX, b"a", b"v");
+		ooc.set(STORAGE_PREFIX, b"b", b"v");
+		ooc.set(STORAGE_PREFIX, b"c", b"v");
+		ooc.set(STORAGE_PREFIX, b"d", b"v");
+		ooc.set(STORAGE_PREFIX, b"e", b"v");
+		assert_eq!(ooc.iter().count(), 5);
+	}
+
+	#[test]
+	fn test_accumulated_set_remove_set() {
+		let mut ooc = OffchainOverlayedChanges::default();
+		ooc.set(STORAGE_PREFIX, b"ppp", b"qqq");
+		ooc.remove(STORAGE_PREFIX, b"ppp");
+		// keys are equiv, so it will overwrite the value and the overlay will contain
+		// one item
+		assert_eq!(ooc.iter().count(), 1);
+
+		ooc.set(STORAGE_PREFIX, b"ppp", b"rrr");
+		let mut iter = ooc.into_iter();
+		assert_eq!(
+			iter.next(),
+			Some(
+				((STORAGE_PREFIX.to_vec(), b"ppp".to_vec()),
+				OffchainOverlayedChange::SetValue(b"rrr".to_vec()))
+			)
+		);
+		assert_eq!(iter.next(), None);
+	}
+}
diff --git a/primitives/state-machine/src/testing.rs b/primitives/state-machine/src/testing.rs
index 3ef1ff09b13a..a6f9d0682464 100644
--- a/primitives/state-machine/src/testing.rs
+++ b/primitives/state-machine/src/testing.rs
@@ -127,7 +127,7 @@ impl<H: Hasher, N: ChangesTrieBlockNumber> TestExternalities<H, N>
 
 	/// Move offchain changes from overlay to the persistent store.
 	pub fn persist_offchain_overlay(&mut self) {
-		self.offchain_db.apply_offchain_changes(self.overlay.offchain_overlay_mut());
+		self.offchain_db.apply_offchain_changes(self.overlay.offchain_drain_committed());
 	}
 
 	/// A shared reference type around the offchain worker storage.

From ba50a59d902df04f81aeffbef2960ee5ce2fed40 Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Sun, 24 Jan 2021 20:45:08 +0300
Subject: [PATCH 0309/1194] Enable sync mode for paritydb (#7961)

---
 client/db/src/parity_db.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/db/src/parity_db.rs b/client/db/src/parity_db.rs
index e56ca4de6cb7..71cc5117f19e 100644
--- a/client/db/src/parity_db.rs
+++ b/client/db/src/parity_db.rs
@@ -37,6 +37,7 @@ pub fn open<H: Clone>(path: &std::path::Path, db_type: DatabaseType)
 	-> parity_db::Result<std::sync::Arc<dyn Database<H>>>
 {
 	let mut config = parity_db::Options::with_columns(path, NUM_COLUMNS as u8);
+	config.sync = true; // Flush each commit
 	if db_type == DatabaseType::Full {
 		let mut state_col = &mut config.columns[columns::STATE as usize];
 		state_col.ref_counted = true;

From aaba404aa3f14e35d9409a0a76f6b8f5a29bb862 Mon Sep 17 00:00:00 2001
From: Gerben van de Wiel <clshannon@protonmail.com>
Date: Mon, 25 Jan 2021 01:17:54 +0100
Subject: [PATCH 0310/1194] Very minor typo in the docs (#7967)

Found this very minor typo when browsing the docs.
---
 frame/support/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 1127afa9e813..bdabc75fea2a 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -1899,7 +1899,7 @@ pub mod pallet_prelude {
 /// 		use super::*;
 ///
 /// 		#[pallet::pallet]
-/// 		#[pallet::generete($visibility_of_trait_store trait Store)]
+/// 		#[pallet::generate($visibility_of_trait_store trait Store)]
 /// 		// NOTE: if the visibility of trait store is private but you want to make it available
 /// 		// in super, then use `pub(super)` or `pub(crate)` to make it available in crate.
 /// 		pub struct Pallet<T>(PhantomData<T>);

From bb0fb2965f9eb59c305ce0c294962d3317a29ece Mon Sep 17 00:00:00 2001
From: Wei Tang <wei@that.world>
Date: Mon, 25 Jan 2021 09:26:40 +0100
Subject: [PATCH 0311/1194] Remove hidden item NonExhaustive in syn crate
 (#7969)

---
 frame/support/procedural/src/pallet/parse/helper.rs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/frame/support/procedural/src/pallet/parse/helper.rs b/frame/support/procedural/src/pallet/parse/helper.rs
index 9570293cccb5..96ab33bb65ee 100644
--- a/frame/support/procedural/src/pallet/parse/helper.rs
+++ b/frame/support/procedural/src/pallet/parse/helper.rs
@@ -98,8 +98,7 @@ impl MutItemAttrs for syn::Item {
 			Self::Type(item) => Some(item.attrs.as_mut()),
 			Self::Union(item) => Some(item.attrs.as_mut()),
 			Self::Use(item) => Some(item.attrs.as_mut()),
-			Self::Verbatim(_) => None,
-			Self::__Nonexhaustive => None,
+			_ => None,
 		}
 	}
 }
@@ -112,8 +111,7 @@ impl MutItemAttrs for syn::TraitItem {
 			Self::Method(item) => Some(item.attrs.as_mut()),
 			Self::Type(item) => Some(item.attrs.as_mut()),
 			Self::Macro(item) => Some(item.attrs.as_mut()),
-			Self::Verbatim(_) => None,
-			Self::__Nonexhaustive => None,
+			_ => None,
 		}
 	}
 }

From 13c75aec0fa844f977f621d2fee3f5d03d3e3536 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Mon, 25 Jan 2021 10:37:20 +0100
Subject: [PATCH 0312/1194] Detect conflicting module names in
 `construct_runtime!` (#7968)

---
 .../procedural/src/construct_runtime/mod.rs       |  9 +++++++++
 .../conflicting_module_name.rs                    | 15 +++++++++++++++
 .../conflicting_module_name.stderr                | 11 +++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 frame/support/test/tests/construct_runtime_ui/conflicting_module_name.rs
 create mode 100644 frame/support/test/tests/construct_runtime_ui/conflicting_module_name.stderr

diff --git a/frame/support/procedural/src/construct_runtime/mod.rs b/frame/support/procedural/src/construct_runtime/mod.rs
index fc799c923b0b..4644c217cfdd 100644
--- a/frame/support/procedural/src/construct_runtime/mod.rs
+++ b/frame/support/procedural/src/construct_runtime/mod.rs
@@ -62,6 +62,7 @@ impl Module {
 fn complete_modules(decl: impl Iterator<Item = ModuleDeclaration>) -> syn::Result<Vec<Module>> {
 	let mut indices = HashMap::new();
 	let mut last_index: Option<u8> = None;
+	let mut names = HashMap::new();
 
 	decl
 		.map(|module| {
@@ -88,6 +89,14 @@ fn complete_modules(decl: impl Iterator<Item = ModuleDeclaration>) -> syn::Resul
 				return Err(err);
 			}
 
+			if let Some(used_module) = names.insert(module.name.clone(), module.name.span()) {
+				let msg = "Two modules with the same name!";
+
+				let mut err = syn::Error::new(used_module, &msg);
+				err.combine(syn::Error::new(module.name.span(), &msg));
+				return Err(err);
+			}
+
 			Ok(Module {
 				name: module.name,
 				index: final_index,
diff --git a/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.rs b/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.rs
new file mode 100644
index 000000000000..bc242a57a41e
--- /dev/null
+++ b/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.rs
@@ -0,0 +1,15 @@
+use frame_support::construct_runtime;
+
+construct_runtime! {
+	pub enum Runtime where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic
+	{
+		System: system::{Module},
+		Balance: balances::{Module},
+		Balance: balances::{Module},
+	}
+}
+
+fn main() {}
diff --git a/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.stderr b/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.stderr
new file mode 100644
index 000000000000..f5b999db66a4
--- /dev/null
+++ b/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.stderr
@@ -0,0 +1,11 @@
+error: Two modules with the same name!
+  --> $DIR/conflicting_module_name.rs:10:3
+   |
+10 |         Balance: balances::{Module},
+   |         ^^^^^^^
+
+error: Two modules with the same name!
+  --> $DIR/conflicting_module_name.rs:11:3
+   |
+11 |         Balance: balances::{Module},
+   |         ^^^^^^^

From 67e6000300b450ad027df47367a0fa189aad82ff Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Mon, 25 Jan 2021 11:10:40 +0100
Subject: [PATCH 0313/1194] pallet minor doc improvment (#7922)

* doc improvment

* additional fixes

* another fix

* better code suggestion

* Apply suggestions from code review

Co-authored-by: David <dvdplm@gmail.com>

* Apply suggestions from code review

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

* Apply suggestions from code review

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

* apply suggestion

* apply suggestion

* Update frame/support/src/lib.rs

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

* apply suggestion

* better guideline on reexport

* Update frame/support/src/lib.rs

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

* Update frame/support/src/lib.rs

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

* Update frame/support/src/lib.rs

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

* Update frame/support/src/lib.rs

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

* Update frame/support/src/lib.rs

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

* apopiak suggestion

* clearer check suggestion

* Update frame/support/src/lib.rs

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

* Update frame/support/src/lib.rs

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

* Update frame/support/src/lib.rs

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

Co-authored-by: David <dvdplm@gmail.com>
Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>
---
 frame/support/src/lib.rs | 195 ++++++++++++++++++++-------------------
 1 file changed, 101 insertions(+), 94 deletions(-)

diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index bdabc75fea2a..298fbdc321db 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -1218,7 +1218,7 @@ pub mod pallet_prelude {
 /// using `#[pallet::compact]`, function must return DispatchResultWithPostInfo.
 ///
 /// All arguments must implement `Debug`, `PartialEq`, `Eq`, `Decode`, `Encode`, `Clone`. For ease
-/// of use just bound trait `Member` available in frame_support::pallet_prelude.
+/// of use, bound the trait `Member` available in frame_support::pallet_prelude.
 ///
 /// **WARNING**: modifying dispatchables, changing their order, removing some must be done with
 /// care. Indeed this will change the outer runtime call type (which is an enum with one variant
@@ -1306,7 +1306,7 @@ pub mod pallet_prelude {
 ///
 /// Each field must implement `Clone`, `Eq`, `PartialEq`, `Encode`, `Decode`, and `Debug` (on std
 /// only).
-/// For ease of use just bound trait `Member` available in frame_support::pallet_prelude.
+/// For ease of use, bound the trait `Member` available in frame_support::pallet_prelude.
 ///
 /// Variant documentations and field types are put into metadata.
 /// The attribute `#[pallet::metadata(..)]` allows to specify the metadata to put for some types.
@@ -1377,19 +1377,27 @@ pub mod pallet_prelude {
 /// pub(super) type MyStorage<T> = StorageMap<_, Blake2_128Concat, u32, u32>;
 /// ```
 ///
-/// NOTE: if the querykind generic parameter is still generic at this stage or is using some type
-/// alias then the generation of the getter might fail. In this case getter can be implemented
+/// NOTE: If the `QueryKind` generic parameter is still generic at this stage or is using some type
+/// alias then the generation of the getter might fail. In this case the getter can be implemented
 /// manually.
 ///
+/// NOTE: The generic `Hasher` must implement the [`StorageHasher`] trait (or the type is not
+/// usable at all). We use [`StorageHasher::METADATA`] for the metadata of the hasher of the
+/// storage item. Thus generic hasher is supported.
+///
 /// ### Macro expansion
 ///
-/// For each storage the macro generate a struct named
-/// `_GeneratedPrefixForStorage$NameOfStorage`, implements `StorageInstance` on it using pallet
-/// name and storage name. And use it as first generic of the aliased type.
+/// For each storage item the macro generates a struct named
+/// `_GeneratedPrefixForStorage$NameOfStorage`, implements `StorageInstance` on it using the 
+/// pallet and storage name. It then uses it as the first generic of the aliased type.
 ///
 ///
-/// The macro implement the function `storage_metadata` on `Pallet` implementing the metadata for
-/// storages.
+/// The macro implements the function `storage_metadata` on `Pallet` implementing the metadata for
+/// all storage items based on their kind:
+/// * for a storage value, the type of the value is copied into the metadata
+/// * for a storage map, the type of the values and the key's type is copied into the metadata
+/// * for a storage double map, the type of the values, and the types of key1 and key2 are copied into
+///   the metadata.
 ///
 /// # Type value: `#[pallet::type_value]` optional
 ///
@@ -1549,18 +1557,20 @@ pub mod pallet_prelude {
 /// # Example for pallet without instance.
 ///
 /// ```
+/// pub use pallet::*; // reexport in crate namespace for `construct_runtime!`
+///
 /// #[frame_support::pallet]
-/// // NOTE: Example is name of the pallet, it will be used as unique identifier for storage
+/// // NOTE: The name of the pallet is provided by `construct_runtime` and is used as
+/// // the unique identifier for the pallet's storage. It is not defined in the pallet itself.
 /// pub mod pallet {
-/// 	use frame_support::pallet_prelude::*; // Import various types used in pallet definition
-/// 	use frame_system::pallet_prelude::*; // OriginFor helper type for implementing dispatchables.
+/// 	use frame_support::pallet_prelude::*; // Import various types used in the pallet definition
+/// 	use frame_system::pallet_prelude::*; // Import some system helper types.
 ///
 /// 	type BalanceOf<T> = <T as Config>::Balance;
 ///
 /// 	// Define the generic parameter of the pallet
-/// 	// The macro checks trait generics: is expected none or `I = ()`.
-/// 	// The macro parses `#[pallet::constant]` attributes: used to generate constant metadata,
-/// 	// expected syntax is `type $IDENT: Get<$TYPE>;`.
+/// 	// The macro parses `#[pallet::constant]` attributes and uses them to generate metadata
+/// 	// for the pallet's constants.
 /// 	#[pallet::config]
 /// 	pub trait Config: frame_system::Config {
 /// 		#[pallet::constant] // put the constant in metadata
@@ -1577,17 +1587,19 @@ pub mod pallet_prelude {
 /// 	}
 ///
 /// 	// Define the pallet struct placeholder, various pallet function are implemented on it.
-/// 	// The macro checks struct generics: is expected `T` or `T, I = DefaultInstance`
 /// 	#[pallet::pallet]
 /// 	#[pallet::generate_store(pub(super) trait Store)]
 /// 	pub struct Pallet<T>(PhantomData<T>);
 ///
-/// 	// Implement on the pallet hooks on pallet.
-/// 	// The macro checks:
-/// 	// * trait is `Hooks` (imported from pallet_prelude)
-/// 	// * struct is `Pallet<T>` or `Pallet<T, I>`
+/// 	// Implement the pallet hooks.
 /// 	#[pallet::hooks]
 /// 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+/// 		fn on_initialize(_n: BlockNumberFor<T>) -> Weight {
+/// 			unimplemented!();
+/// 		}
+///
+/// 		// can implement also: on_finalize, on_runtime_upgrade, offchain_worker, ...
+/// 		// see `Hooks` trait
 /// 	}
 ///
 /// 	// Declare Call struct and implement dispatchables.
@@ -1595,41 +1607,30 @@ pub mod pallet_prelude {
 /// 	// WARNING: Each parameter used in functions must implement: Clone, Debug, Eq, PartialEq,
 /// 	// Codec.
 /// 	//
-/// 	// The macro checks:
-/// 	// * pallet is `Pallet<T>` or `Pallet<T, I>`
-/// 	// * trait is `Call`
-/// 	// * each dispatchable functions first argument is `origin: OriginFor<T>` (OriginFor is
-/// 	//   imported from frame_system.
-/// 	//
-/// 	// The macro parse `#[pallet::compact]` attributes, function parameter with this attribute
-/// 	// will be encoded/decoded using compact codec in implementation of codec for the enum
-/// 	// `Call`.
-/// 	//
-/// 	// The macro generate the enum `Call` with a variant for each dispatchable and implements
-/// 	// codec, Eq, PartialEq, Clone and Debug.
+/// 	// The macro parses `#[pallet::compact]` attributes on function arguments and implements
+/// 	// the `Call` encoding/decoding accordingly.
 /// 	#[pallet::call]
 /// 	impl<T: Config> Pallet<T> {
 /// 		/// Doc comment put in metadata
 /// 		#[pallet::weight(0)] // Defines weight for call (function parameters are in scope)
 /// 		fn toto(
 /// 			origin: OriginFor<T>,
-/// 			#[pallet::compact] _foo: u32
+/// 			#[pallet::compact] _foo: u32,
 /// 		) -> DispatchResultWithPostInfo {
 /// 			let _ = origin;
 /// 			unimplemented!();
 /// 		}
 /// 	}
 ///
-/// 	// Declare pallet Error enum. (this is optional)
-/// 	// The macro checks enum generics and that each variant is unit.
-/// 	// The macro generate error metadata using doc comment on each variant.
+/// 	// Declare the pallet `Error` enum (this is optional).
+/// 	// The macro generates error metadata using the doc comment on each variant.
 /// 	#[pallet::error]
 /// 	pub enum Error<T> {
 /// 		/// doc comment put into metadata
 /// 		InsufficientProposersBalance,
 /// 	}
 ///
-/// 	// Declare pallet Event enum. (this is optional)
+/// 	// Declare pallet Event enum (this is optional).
 /// 	//
 /// 	// WARNING: Each type used in variants must implement: Clone, Debug, Eq, PartialEq, Codec.
 /// 	//
@@ -1651,37 +1652,38 @@ pub mod pallet_prelude {
 /// 		Something(u32),
 /// 	}
 ///
-/// 	// Define a struct which implements `frame_support::traits::Get<T::Balance>`
+/// 	// Define a struct which implements `frame_support::traits::Get<T::Balance>` (optional).
 /// 	#[pallet::type_value]
 /// 	pub(super) fn MyDefault<T: Config>() -> T::Balance { 3.into() }
 ///
-/// 	// Declare a storage, any amount of storage can be declared.
+/// 	// Declare a storage item. Any amount of storage items can be declared (optional).
 /// 	//
 /// 	// Is expected either `StorageValue`, `StorageMap` or `StorageDoubleMap`.
-/// 	// The macro generates for struct `$identP` (for storage of name `$ident`) and implement
-/// 	// storage instance on it.
-/// 	// The macro macro expand the metadata for the storage with the type used:
-/// 	// * For storage value the type for value will be copied into metadata
-/// 	// * For storage map the type for value and the type for key will be copied into metadata
-/// 	// * For storage double map the type for value, key1, and key2 will be copied into
+/// 	// The macro generates the prefix type and replaces the first generic `_`.
+/// 	//
+/// 	// The macro expands the metadata for the storage item with the type used:
+/// 	// * for a storage value the type of the value is copied into the metadata
+/// 	// * for a storage map the type of the values and the type of the key is copied into the metadata
+/// 	// * for a storage double map the types of the values and keys are copied into the
 /// 	//   metadata.
 /// 	//
-/// 	// NOTE: for storage hasher, the type is not copied because storage hasher trait already
-/// 	// implements metadata. Thus generic storage hasher is supported.
+/// 	// NOTE: The generic `Hasher` must implement the `StorageHasher` trait (or the type is not
+/// 	// usable at all). We use [`StorageHasher::METADATA`] for the metadata of the hasher of the
+/// 	// storage item. Thus generic hasher is supported.
 /// 	#[pallet::storage]
 /// 	pub(super) type MyStorageValue<T: Config> =
 /// 		StorageValue<_, T::Balance, ValueQuery, MyDefault<T>>;
 ///
-/// 	// Another declaration
+/// 	// Another storage declaration
 /// 	#[pallet::storage]
 /// 	#[pallet::getter(fn my_storage)]
 /// 	pub(super) type MyStorage<T> = StorageMap<_, Blake2_128Concat, u32, u32>;
 ///
-/// 	// Declare genesis config. (This is optional)
+/// 	// Declare the genesis config (optional).
 /// 	//
-/// 	// The macro accept either type alias or struct or enum, it checks generics are consistent.
+/// 	// The macro accepts either a struct or an enum; it checks that generics are consistent.
 /// 	//
-/// 	// Type must implement `Default` traits
+/// 	// Type must implement the `Default` trait.
 /// 	#[pallet::genesis_config]
 /// 	#[derive(Default)]
 /// 	pub struct GenesisConfig {
@@ -1694,13 +1696,13 @@ pub mod pallet_prelude {
 /// 		fn build(&self) {}
 /// 	}
 ///
-/// 	// Declare a pallet origin. (this is optional)
+/// 	// Declare a pallet origin (this is optional).
 /// 	//
 /// 	// The macro accept type alias or struct or enum, it checks generics are consistent.
 /// 	#[pallet::origin]
 /// 	pub struct Origin<T>(PhantomData<T>);
 ///
-/// 	// Declare validate_unsigned implementation.
+/// 	// Declare validate_unsigned implementation (this is optional).
 /// 	#[pallet::validate_unsigned]
 /// 	impl<T: Config> ValidateUnsigned for Pallet<T> {
 /// 		type Call = Call<T>;
@@ -1712,9 +1714,7 @@ pub mod pallet_prelude {
 /// 		}
 /// 	}
 ///
-/// 	// Declare inherent provider for pallet. (this is optional)
-/// 	//
-/// 	// The macro checks pallet is `Pallet<T>` or `Pallet<T, I>` and trait is `ProvideInherent`
+/// 	// Declare inherent provider for pallet (this is optional).
 /// 	#[pallet::inherent]
 /// 	impl<T: Config> ProvideInherent for Pallet<T> {
 /// 		type Call = Call<T>;
@@ -1747,6 +1747,8 @@ pub mod pallet_prelude {
 /// # Example for pallet with instance.
 ///
 /// ```
+/// pub use pallet::*;
+///
 /// #[frame_support::pallet]
 /// pub mod pallet {
 /// 	use frame_support::pallet_prelude::*;
@@ -1871,15 +1873,14 @@ pub mod pallet_prelude {
 ///
 /// ## Upgrade guidelines:
 ///
-/// 1. make crate compiling: rename usage of frame_system::Trait to frame_system::Config.
-/// 2. export metadata of the pallet for later checks
-/// 3. generate the template upgrade for the pallet provided by decl_storage with environment
+/// 1. export metadata of the pallet for later checks
+/// 2. generate the template upgrade for the pallet provided by decl_storage with environment
 /// 	variable `PRINT_PALLET_UPGRADE`: `PRINT_PALLET_UPGRADE=1 cargo check -p my_pallet`
 /// 	This template can be used as information it contains all information for storages, genesis
 /// 	config and genesis build.
-/// 4. reorganize pallet to have trait Trait, decl_* macros, ValidateUnsigned, ProvideInherent,
-/// 	Origin all together in one file. suggested order:
-/// 	* trait,
+/// 3. reorganize pallet to have trait `Config`, `decl_*` macros, `ValidateUnsigned`,
+/// 	`ProvideInherent`, `Origin` all together in one file. Suggested order:
+/// 	* Config,
 /// 	* decl_module,
 /// 	* decl_event,
 /// 	* decl_error,
@@ -1888,31 +1889,30 @@ pub mod pallet_prelude {
 /// 	* validate_unsigned,
 /// 	* provide_inherent,
 /// 	so far it should compile and all be correct.
-/// 5. start writing new pallet module
+/// 4. start writing the new pallet module
 /// 	```ignore
 /// 	pub use pallet::*;
 ///
 /// 	#[frame_support::pallet]
 /// 	pub mod pallet {
-/// 		pub use frame_support::pallet_prelude::*;
-/// 		pub use frame_system::pallet_prelude::*;
+/// 		use frame_support::pallet_prelude::*;
+/// 		use frame_system::pallet_prelude::*;
 /// 		use super::*;
 ///
 /// 		#[pallet::pallet]
-/// 		#[pallet::generate($visibility_of_trait_store trait Store)]
+/// 		#[pallet::generate_store($visibility_of_trait_store trait Store)]
 /// 		// NOTE: if the visibility of trait store is private but you want to make it available
 /// 		// in super, then use `pub(super)` or `pub(crate)` to make it available in crate.
 /// 		pub struct Pallet<T>(PhantomData<T>);
 /// 		// pub struct Pallet<T, I = ()>(PhantomData<T>); // for instantiable pallet
 /// 	}
 /// 	```
-/// 6. **migrate trait**: move trait into the module with
-/// 	* rename `Trait` to `Config`
+/// 5. **migrate Config**: move trait into the module with
 /// 	* all const in decl_module to `#[pallet::constant]`
-/// 7. **migrate decl_module**: write:
+/// 6. **migrate decl_module**: write:
 /// 	```ignore
 /// 	#[pallet::hooks]
-/// 	impl<T: Trait> Hooks for Pallet<T> {
+/// 	impl<T: Config> Hooks for Pallet<T> {
 /// 	}
 /// 	```
 /// 	and write inside on_initialize/on_finalize/on_runtime_upgrade/offchain_worker/integrity_test
@@ -1920,7 +1920,7 @@ pub mod pallet_prelude {
 /// 	then write:
 /// 	```ignore
 /// 	#[pallet::call]
-/// 	impl<T: Trait> Pallet<T> {
+/// 	impl<T: Config> Pallet<T> {
 /// 	}
 /// 	```
 /// 	and write inside all the call in decl_module with a few changes in the signature:
@@ -1930,12 +1930,12 @@ pub mod pallet_prelude {
 /// 	- `#[compact]` must now be written `#[pallet::compact]`
 /// 	- `#[weight = ..]` must now be written `#[pallet::weight(..)]`
 ///
-/// 8. **migrate event**:
+/// 7. **migrate event**:
 /// 	rewrite as a simple enum under with the attribute `#[pallet::event]`,
 /// 	use `#[pallet::generate_deposit($vis fn deposit_event)]` to generate deposit_event,
 /// 	use `#[pallet::metadata(...)]` to configure the metadata for types in order not to break them.
-/// 9. **migrate error**: just rewrite it with attribute `#[pallet::error]`.
-/// 10. **migrate storage**:
+/// 8. **migrate error**: rewrite it with attribute `#[pallet::error]`.
+/// 9. **migrate storage**:
 /// 	decl_storage provide an upgrade template (see 3.). All storages, genesis config, genesis
 /// 	build and default implementation of genesis config can be taken from it directly.
 ///
@@ -1981,18 +1981,18 @@ pub mod pallet_prelude {
 /// 		pub(super) type MyStorage<T> = StorageValue<u32, ValueQuery, MyStorageOnEmpty>;
 /// 		```
 ///
-/// 	NOTE: decl_storage also generates functions `assimilate_storage` and `build_storage`
+/// 	NOTE: `decl_storage` also generates functions `assimilate_storage` and `build_storage`
 /// 	directly on GenesisConfig, those are sometimes used in tests. In order not to break they
-/// 	can be implemented manually, just implement those functions by calling `GenesisBuild`
+/// 	can be implemented manually, one can implement those functions by calling `GenesisBuild`
 /// 	implementation.
 ///
-/// 11. **migrate origin**: just move the origin to the pallet module under `#[pallet::origin]`
-/// 12. **migrate validate_unsigned**: just move the ValidateUnsigned implementation to the pallet
+/// 10. **migrate origin**: move the origin to the pallet module under `#[pallet::origin]`
+/// 11. **migrate validate_unsigned**: move the ValidateUnsigned implementation to the pallet
 /// 	module under `#[pallet::validate_unsigned]`
-/// 13. **migrate provide_inherent**: just move the ValidateUnsigned implementation to the pallet
+/// 12. **migrate provide_inherent**: move the ValidateUnsigned implementation to the pallet
 /// 	module under `#[pallet::provide_inherent]`
-/// 14. rename the usage of Module to Pallet and the usage of Config to Trait inside the crate.
-/// 15. migration is done, now double check migration with the checking migration guidelines.
+/// 13. rename the usage of `Module` to `Pallet` inside the crate.
+/// 14. migration is done, now double check migration with the checking migration guidelines.
 ///
 /// ## Checking upgrade guidelines:
 ///
@@ -2003,21 +2003,28 @@ pub mod pallet_prelude {
 /// 	* storage names, hasher, prefixes, default value
 /// 	* error , error, constant,
 /// * manually check that:
-/// 	* Origin is moved inside macro unser `#[pallet::origin]` if it exists
-/// 	* ValidateUnsigned is moved inside macro under `#[pallet::validate_unsigned)]` if it exists
-/// 	* ProvideInherent is moved inside macro under `#[pallet::inherent)]` if it exists
-/// 	* on_initialize/on_finalize/on_runtime_upgrade/offchain_worker are moved to Hooks
+/// 	* `Origin` is moved inside the macro under `#[pallet::origin]` if it exists
+/// 	* `ValidateUnsigned` is moved inside the macro under `#[pallet::validate_unsigned)]` if it exists
+/// 	* `ProvideInherent` is moved inside macro under `#[pallet::inherent)]` if it exists
+/// 	* `on_initialize`/`on_finalize`/`on_runtime_upgrade`/`offchain_worker` are moved to `Hooks`
 /// 		implementation
-/// 	* storages with `config(..)` are converted to genesis_config field, and their default is
+/// 	* storages with `config(..)` are converted to `GenesisConfig` field, and their default is
 /// 		`= $expr;` if the storage have default value
-/// 	* storages with `build($expr)` or `config(..)` are built in genesis_build
-/// 	* add_extra_genesis fields are converted to genesis_config field with their correct default
-/// 		if specified
-/// 	* add_extra_genesis build is written into genesis_build
-/// * storages now use PalletInfo for module_prefix instead of the one given to decl_storage:
-/// 	Thus any use of this pallet in `construct_runtime!` should be careful to update name in
-/// 	order not to break storage or to upgrade storage (moreover for instantiable pallet).
-/// 	If pallet is published, make sure to warn about this breaking change.
+/// 	* storages with `build($expr)` or `config(..)` are built in `GenesisBuild::build`
+/// 	* `add_extra_genesis` fields are converted to `GenesisConfig` field with their correct
+/// 		default if specified
+/// 	* `add_extra_genesis` build is written into `GenesisBuild::build`
+/// * storage items defined with [`pallet`] use the name of the pallet provided by [`PalletInfo::name`]
+/// 	as `pallet_prefix` (in `decl_storage`, storage items used the `pallet_prefix` given as input of
+/// 	`decl_storage` with the syntax `as Example`).
+/// 	Thus a runtime using the pallet must be careful with this change.
+/// 	To handle this change:
+/// 	* either ensure that the name of the pallet given to `construct_runtime!` is the same
+/// 		as the name the pallet was giving to `decl_storage`,
+/// 	* or do a storage migration from the old prefix used to the new prefix used.
+///
+/// 	NOTE: The prefixes used by storage items are in the metadata. Thus, ensuring the metadata hasn't
+/// 	changed does ensure that the `pallet_prefix`s used by the storage items haven't changed.
 ///
 /// # Notes when macro fails to show proper error message spans:
 ///

From dd173ae41f73671e3d2e63eb57e906550d5247ba Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Mon, 25 Jan 2021 13:20:47 +0100
Subject: [PATCH 0314/1194] Make pallets use construct_runtime (#7950)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: David <dvdplm@gmail.com>
---
 frame/assets/Cargo.toml                       |  2 +-
 frame/assets/src/lib.rs                       | 39 ++++++++-----------
 frame/collective/src/lib.rs                   |  2 +-
 frame/elections-phragmen/src/lib.rs           |  2 +-
 frame/elections/src/mock.rs                   |  2 +-
 frame/offences/benchmarking/src/mock.rs       |  2 +-
 frame/support/procedural/src/lib.rs           |  5 +++
 frame/support/src/inherent.rs                 |  1 +
 frame/support/test/tests/construct_runtime.rs |  2 +-
 frame/support/test/tests/instance.rs          |  2 +-
 frame/support/test/tests/issue2219.rs         |  2 +-
 frame/support/test/tests/pallet.rs            |  2 +-
 .../test/tests/pallet_compatibility.rs        |  2 -
 .../tests/pallet_compatibility_instance.rs    |  2 -
 frame/support/test/tests/pallet_instance.rs   |  2 +-
 frame/support/test/tests/pallet_version.rs    |  2 +-
 .../tests/pallet_with_name_trait_is_valid.rs  |  1 -
 frame/system/src/lib.rs                       |  2 +
 frame/system/src/mocking.rs                   | 31 +++++++++++++++
 19 files changed, 67 insertions(+), 38 deletions(-)
 create mode 100644 frame/system/src/mocking.rs

diff --git a/frame/assets/Cargo.toml b/frame/assets/Cargo.toml
index fe7b30eaace8..4dddd1c59cde 100644
--- a/frame/assets/Cargo.toml
+++ b/frame/assets/Cargo.toml
@@ -28,7 +28,7 @@ frame-benchmarking = { version = "2.0.0", default-features = false, path = "../b
 sp-core = { version = "2.0.0", path = "../../primitives/core" }
 sp-std = { version = "2.0.0", path = "../../primitives/std" }
 sp-io = { version = "2.0.0", path = "../../primitives/io" }
-pallet-balances = { version = "2.0.0", default-features = false, path = "../balances" }
+pallet-balances = { version = "2.0.0", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index 8f1ad02c08bb..099361eceb95 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -1084,30 +1084,28 @@ impl<T: Config> Module<T> {
 #[cfg(test)]
 mod tests {
 	use super::*;
+	use crate as pallet_assets;
 
-	use frame_support::{impl_outer_origin, assert_ok, assert_noop, parameter_types, impl_outer_event};
+	use frame_support::{assert_ok, assert_noop, parameter_types};
 	use sp_core::H256;
 	use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
 	use pallet_balances::Error as BalancesError;
 
-	mod pallet_assets {
-		pub use crate::Event;
-	}
-
-	impl_outer_event! {
-		pub enum Event for Test {
-			frame_system<T>,
-			pallet_balances<T>,
-			pallet_assets<T>,
+	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+	type Block = frame_system::mocking::MockBlock<Test>;
+
+	frame_support::construct_runtime!(
+		pub enum Test where
+			Block = Block,
+			NodeBlock = Block,
+			UncheckedExtrinsic = UncheckedExtrinsic,
+		{
+			System: frame_system::{Module, Call, Config, Storage, Event<T>},
+			Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
+			Assets: pallet_assets::{Module, Call, Storage, Event<T>},
 		}
-	}
-
-	impl_outer_origin! {
-		pub enum Origin for Test where system = frame_system {}
-	}
+	);
 
-	#[derive(Clone, Eq, PartialEq)]
-	pub struct Test;
 	parameter_types! {
 		pub const BlockHashCount: u64 = 250;
 	}
@@ -1118,7 +1116,7 @@ mod tests {
 		type DbWeight = ();
 		type Origin = Origin;
 		type Index = u64;
-		type Call = ();
+		type Call = Call;
 		type BlockNumber = u64;
 		type Hash = H256;
 		type Hashing = BlakeTwo256;
@@ -1128,7 +1126,7 @@ mod tests {
 		type Event = Event;
 		type BlockHashCount = BlockHashCount;
 		type Version = ();
-		type PalletInfo = ();
+		type PalletInfo = PalletInfo;
 		type AccountData = pallet_balances::AccountData<u64>;
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
@@ -1171,9 +1169,6 @@ mod tests {
 		type MetadataDepositPerByte = MetadataDepositPerByte;
 		type WeightInfo = ();
 	}
-	type System = frame_system::Module<Test>;
-	type Balances = pallet_balances::Module<Test>;
-	type Assets = Module<Test>;
 
 	pub(crate) fn new_test_ext() -> sp_io::TestExternalities {
 		frame_system::GenesisConfig::default().build_storage::<Test>().unwrap().into()
diff --git a/frame/collective/src/lib.rs b/frame/collective/src/lib.rs
index b2993fd45eb3..ead9135aaa19 100644
--- a/frame/collective/src/lib.rs
+++ b/frame/collective/src/lib.rs
@@ -965,7 +965,7 @@ mod tests {
 	use hex_literal::hex;
 	use sp_core::H256;
 	use sp_runtime::{
-		traits::{BlakeTwo256, IdentityLookup, Block as BlockT}, testing::Header,
+		traits::{BlakeTwo256, IdentityLookup}, testing::Header,
 		BuildStorage,
 	};
 	use crate as collective;
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index 1bef73831e65..d566975e2e7a 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -1047,7 +1047,7 @@ mod tests {
 	use sp_core::H256;
 	use sp_runtime::{
 		testing::Header, BuildStorage, DispatchResult,
-		traits::{BlakeTwo256, IdentityLookup, Block as BlockT},
+		traits::{BlakeTwo256, IdentityLookup},
 	};
 	use crate as elections_phragmen;
 
diff --git a/frame/elections/src/mock.rs b/frame/elections/src/mock.rs
index bf3d355b6dee..b386542b2b3d 100644
--- a/frame/elections/src/mock.rs
+++ b/frame/elections/src/mock.rs
@@ -25,7 +25,7 @@ use frame_support::{
 };
 use sp_core::H256;
 use sp_runtime::{
-	BuildStorage, testing::Header, traits::{BlakeTwo256, IdentityLookup, Block as BlockT},
+	BuildStorage, testing::Header, traits::{BlakeTwo256, IdentityLookup},
 };
 use crate as elections;
 
diff --git a/frame/offences/benchmarking/src/mock.rs b/frame/offences/benchmarking/src/mock.rs
index 20fd3ba9b067..6ebb9f19e6ae 100644
--- a/frame/offences/benchmarking/src/mock.rs
+++ b/frame/offences/benchmarking/src/mock.rs
@@ -26,7 +26,7 @@ use frame_support::{
 };
 use frame_system as system;
 use sp_runtime::{
-	traits::{IdentityLookup, Block as BlockT},
+	traits::IdentityLookup,
 	testing::{Header, UintAuthorityId},
 };
 
diff --git a/frame/support/procedural/src/lib.rs b/frame/support/procedural/src/lib.rs
index 3f6afd3ff53c..2c2cdf00a045 100644
--- a/frame/support/procedural/src/lib.rs
+++ b/frame/support/procedural/src/lib.rs
@@ -302,6 +302,11 @@ pub fn decl_storage(input: TokenStream) -> TokenStream {
 /// The population of the genesis storage depends on the order of modules. So, if one of your
 /// modules depends on another module, the module that is depended upon needs to come before
 /// the module depending on it.
+///
+/// # Type definitions
+///
+/// * The macro generates a type alias for each pallet to their `Module` (or `Pallet`).
+///   E.g. `type System = frame_system::Module<Runtime>`
 #[proc_macro]
 pub fn construct_runtime(input: TokenStream) -> TokenStream {
 	construct_runtime::construct_runtime(input)
diff --git a/frame/support/src/inherent.rs b/frame/support/src/inherent.rs
index feb200dae5ba..430075d603f2 100644
--- a/frame/support/src/inherent.rs
+++ b/frame/support/src/inherent.rs
@@ -75,6 +75,7 @@ macro_rules! impl_outer_inherent {
 			fn check_extrinsics(&self, block: &$block) -> $crate::inherent::CheckInherentsResult {
 				use $crate::inherent::{ProvideInherent, IsFatalError};
 				use $crate::traits::IsSubType;
+				use $crate::sp_runtime::traits::Block as _;
 
 				let mut result = $crate::inherent::CheckInherentsResult::new();
 				for xt in block.extrinsics() {
diff --git a/frame/support/test/tests/construct_runtime.rs b/frame/support/test/tests/construct_runtime.rs
index 2b9f026487b1..8dc44c2024ad 100644
--- a/frame/support/test/tests/construct_runtime.rs
+++ b/frame/support/test/tests/construct_runtime.rs
@@ -21,7 +21,7 @@
 
 #![recursion_limit="128"]
 
-use sp_runtime::{generic, traits::{BlakeTwo256, Block as _, Verify}, DispatchError};
+use sp_runtime::{generic, traits::{BlakeTwo256, Verify}, DispatchError};
 use sp_core::{H256, sr25519};
 use sp_std::cell::RefCell;
 use frame_support::traits::PalletInfo as _;
diff --git a/frame/support/test/tests/instance.rs b/frame/support/test/tests/instance.rs
index a734363b0183..dc6c41564a75 100644
--- a/frame/support/test/tests/instance.rs
+++ b/frame/support/test/tests/instance.rs
@@ -18,7 +18,7 @@
 #![recursion_limit="128"]
 
 use codec::{Codec, EncodeLike, Encode, Decode};
-use sp_runtime::{generic, BuildStorage, traits::{BlakeTwo256, Block as _, Verify}};
+use sp_runtime::{generic, BuildStorage, traits::{BlakeTwo256, Verify}};
 use frame_support::{
 	Parameter, traits::Get, parameter_types,
 	metadata::{
diff --git a/frame/support/test/tests/issue2219.rs b/frame/support/test/tests/issue2219.rs
index 59410c6db22f..adabb2d59792 100644
--- a/frame/support/test/tests/issue2219.rs
+++ b/frame/support/test/tests/issue2219.rs
@@ -16,7 +16,7 @@
 // limitations under the License.
 
 use frame_support::sp_runtime::generic;
-use frame_support::sp_runtime::traits::{BlakeTwo256, Block as _, Verify};
+use frame_support::sp_runtime::traits::{BlakeTwo256, Verify};
 use frame_support::codec::{Encode, Decode};
 use sp_core::{H256, sr25519};
 use serde::{Serialize, Deserialize};
diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index 1e4bfa7474e6..974b90148066 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -23,7 +23,7 @@ use frame_support::{
 	dispatch::{UnfilteredDispatchable, Parameter},
 	storage::unhashed,
 };
-use sp_runtime::{traits::Block as _, DispatchError};
+use sp_runtime::DispatchError;
 use sp_io::{TestExternalities, hashing::{twox_64, twox_128, blake2_128}};
 
 pub struct SomeType1;
diff --git a/frame/support/test/tests/pallet_compatibility.rs b/frame/support/test/tests/pallet_compatibility.rs
index 7cc3392ef042..66d013441362 100644
--- a/frame/support/test/tests/pallet_compatibility.rs
+++ b/frame/support/test/tests/pallet_compatibility.rs
@@ -15,8 +15,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use sp_runtime::traits::Block as _;
-
 pub trait SomeAssociation {
 	type A: frame_support::dispatch::Parameter + Default;
 }
diff --git a/frame/support/test/tests/pallet_compatibility_instance.rs b/frame/support/test/tests/pallet_compatibility_instance.rs
index 05ad44e7a7ff..d7de03ea46cf 100644
--- a/frame/support/test/tests/pallet_compatibility_instance.rs
+++ b/frame/support/test/tests/pallet_compatibility_instance.rs
@@ -15,8 +15,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use sp_runtime::traits::Block as _;
-
 mod pallet_old {
 	use frame_support::{
 		decl_storage, decl_error, decl_event, decl_module, weights::Weight, traits::Get, Parameter
diff --git a/frame/support/test/tests/pallet_instance.rs b/frame/support/test/tests/pallet_instance.rs
index 2317fb05a2be..62654d53e19d 100644
--- a/frame/support/test/tests/pallet_instance.rs
+++ b/frame/support/test/tests/pallet_instance.rs
@@ -23,7 +23,7 @@ use frame_support::{
 	dispatch::UnfilteredDispatchable,
 	storage::unhashed,
 };
-use sp_runtime::{traits::Block as _, DispatchError};
+use sp_runtime::DispatchError;
 use sp_io::{TestExternalities, hashing::{twox_64, twox_128, blake2_128}};
 
 #[frame_support::pallet]
diff --git a/frame/support/test/tests/pallet_version.rs b/frame/support/test/tests/pallet_version.rs
index ca36ee7fc466..a86a876b48a5 100644
--- a/frame/support/test/tests/pallet_version.rs
+++ b/frame/support/test/tests/pallet_version.rs
@@ -20,7 +20,7 @@
 #![recursion_limit="128"]
 
 use codec::{Decode, Encode};
-use sp_runtime::{generic, traits::{BlakeTwo256, Block as _, Verify}, BuildStorage};
+use sp_runtime::{generic, traits::{BlakeTwo256, Verify}, BuildStorage};
 use frame_support::{
 	traits::{PALLET_VERSION_STORAGE_KEY_POSTFIX, PalletVersion, OnRuntimeUpgrade, GetPalletVersion},
 	crate_to_pallet_version, weights::Weight,
diff --git a/frame/support/test/tests/pallet_with_name_trait_is_valid.rs b/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
index 42b0ebc6e934..6247e46c85f0 100644
--- a/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
+++ b/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
@@ -88,7 +88,6 @@ mod tests {
 	use crate as pallet_test;
 
 	use frame_support::parameter_types;
-	use sp_runtime::traits::Block;
 
 	type SignedExtra = (
 		frame_system::CheckEra<Runtime>,
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index cdb26623734f..87a636b37f1c 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -112,6 +112,8 @@ mod extensions;
 pub mod weights;
 #[cfg(test)]
 mod tests;
+#[cfg(feature = "std")]
+pub mod mocking;
 
 
 pub use extensions::{
diff --git a/frame/system/src/mocking.rs b/frame/system/src/mocking.rs
new file mode 100644
index 000000000000..9f80c59a9c4d
--- /dev/null
+++ b/frame/system/src/mocking.rs
@@ -0,0 +1,31 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Provide types to help defining a mock environment when testing pallets.
+
+use sp_runtime::generic;
+
+/// An unchecked extrinsic type to be used in tests.
+pub type MockUncheckedExtrinsic<T, Signature = (), Extra = ()> = generic::UncheckedExtrinsic<
+	<T as crate::Config>::AccountId, <T as crate::Config>::Call, Signature, Extra,
+>;
+
+/// An implementation of `sp_runtime::traits::Block` to be used in tests.
+pub type MockBlock<T> = generic::Block<
+	generic::Header<<T as crate::Config>::BlockNumber, sp_runtime::traits::BlakeTwo256>,
+	MockUncheckedExtrinsic<T>,
+>;

From 38f723bf5dae257220fc25d4e86759f4a664d50f Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Mon, 25 Jan 2021 14:09:45 +0100
Subject: [PATCH 0315/1194] client/network/req-resp: Prevent request id
 collision (#7957)

* client/network/req-resp: Add unit test for request id collision

* client/network/req-resp: Prevent request id collision

`RequestId` is a monotonically increasing integer, starting at
`1`. A `RequestId` is unique for a single `RequestResponse`
behaviour, but not across multiple `RequestResponse` behaviours. Thus
when handling `RequestId` in the context of multiple
`RequestResponse` behaviours, one needs to couple the protocol name
with the `RequestId` to get a unique request identifier.

This commit ensures that pending requests (`pending_requests`) and
pending responses (`pending_response_arrival_time`) are tracked both by
their protocol name and `RequestId`.

* client/network/req-resp: Remove unused import

* client/network/req-resp: Introduce ProtocolRequestId struct

* client/network/req-resp: Update test doc comment

Treat `RequestId` as an opaque type.

* client/network/req-resp: Improve expect proof
---
 client/network/src/request_responses.rs | 341 ++++++++++++++++++------
 1 file changed, 253 insertions(+), 88 deletions(-)

diff --git a/client/network/src/request_responses.rs b/client/network/src/request_responses.rs
index d30e39891641..575f483b0966 100644
--- a/client/network/src/request_responses.rs
+++ b/client/network/src/request_responses.rs
@@ -152,6 +152,24 @@ pub enum Event {
 	},
 }
 
+/// Combination of a protocol name and a request id.
+///
+/// Uniquely identifies an inbound or outbound request among all handled protocols. Note however
+/// that uniqueness is only guaranteed between two inbound and likewise between two outbound
+/// requests. There is no uniqueness guarantee in a set of both inbound and outbound
+/// [`ProtocolRequestId`]s.
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+struct ProtocolRequestId {
+	protocol: Cow<'static, str>,
+	request_id: RequestId,
+}
+
+impl From<(Cow<'static, str>, RequestId)> for ProtocolRequestId {
+	fn from((protocol, request_id): (Cow<'static, str>, RequestId)) -> Self {
+		Self { protocol, request_id }
+	}
+}
+
 /// Implementation of `NetworkBehaviour` that provides support for request-response protocols.
 pub struct RequestResponsesBehaviour {
 	/// The multiple sub-protocols, by name.
@@ -163,7 +181,10 @@ pub struct RequestResponsesBehaviour {
 	>,
 
 	/// Pending requests, passed down to a [`RequestResponse`] behaviour, awaiting a reply.
-	pending_requests: HashMap<RequestId, (Instant, oneshot::Sender<Result<Vec<u8>, RequestFailure>>)>,
+	pending_requests: HashMap<
+			ProtocolRequestId,
+			(Instant, oneshot::Sender<Result<Vec<u8>, RequestFailure>>),
+		>,
 
 	/// Whenever an incoming request arrives, a `Future` is added to this list and will yield the
 	/// start time and the response to send back to the remote.
@@ -172,7 +193,7 @@ pub struct RequestResponsesBehaviour {
 	>,
 
 	/// Whenever an incoming request arrives, the arrival [`Instant`] is recorded here.
-	pending_responses_arrival_time: HashMap<RequestId, Instant>,
+	pending_responses_arrival_time: HashMap<ProtocolRequestId, Instant>,
 }
 
 /// Generated by the response builder and waiting to be processed.
@@ -226,14 +247,17 @@ impl RequestResponsesBehaviour {
 	pub fn send_request(
 		&mut self,
 		target: &PeerId,
-		protocol: &str,
+		protocol_name: &str,
 		request: Vec<u8>,
 		pending_response: oneshot::Sender<Result<Vec<u8>, RequestFailure>>,
 	) {
-		if let Some((protocol, _)) = self.protocols.get_mut(protocol) {
+		if let Some((protocol, _)) = self.protocols.get_mut(protocol_name) {
 			if protocol.is_connected(target) {
 				let request_id = protocol.send_request(target, request);
-				self.pending_requests.insert(request_id, (Instant::now(), pending_response));
+				self.pending_requests.insert(
+					(protocol_name.to_string().into(), request_id).into(),
+					(Instant::now(), pending_response),
+				);
 			} else {
 				if pending_response.send(Err(RequestFailure::NotConnected)).is_err() {
 					log::debug!(
@@ -250,7 +274,7 @@ impl RequestResponsesBehaviour {
 					target: "sub-libp2p",
 					"Unknown protocol {:?}. At the same time local \
 					 node is no longer interested in the result.",
-					protocol,
+					protocol_name,
 				);
 			};
 		}
@@ -453,7 +477,7 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 							message: RequestResponseMessage::Request { request_id, request, channel, .. },
 						} => {
 							self.pending_responses_arrival_time.insert(
-								request_id.clone(),
+								(protocol.clone(), request_id.clone()).into(),
 								Instant::now(),
 							);
 
@@ -502,7 +526,9 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 							},
 							..
 						} => {
-							let (started, delivered) = match self.pending_requests.remove(&request_id) {
+							let (started, delivered) = match self.pending_requests.remove(
+								&(protocol.clone(), request_id).into(),
+							) {
 								Some((started, pending_response)) => {
 									let delivered = pending_response.send(
 										response.map_err(|()| RequestFailure::Refused),
@@ -537,7 +563,7 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 							error,
 							..
 						} => {
-							let started = match self.pending_requests.remove(&request_id) {
+							let started = match self.pending_requests.remove(&(protocol.clone(), request_id).into()) {
 								Some((started, pending_response)) => {
 									if pending_response.send(
 										Err(RequestFailure::Network(error.clone())),
@@ -575,7 +601,9 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 						// An inbound request failed, either while reading the request or due to failing
 						// to send a response.
 						RequestResponseEvent::InboundFailure { request_id, peer, error, .. } => {
-							self.pending_responses_arrival_time.remove(&request_id);
+							self.pending_responses_arrival_time.remove(
+								&(protocol.clone(), request_id).into(),
+							);
 							let out = Event::InboundRequest {
 								peer,
 								protocol: protocol.clone(),
@@ -583,10 +611,20 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 							};
 							return Poll::Ready(NetworkBehaviourAction::GenerateEvent(out));
 						}
+
+						// A response to an inbound request has been sent.
 						RequestResponseEvent::ResponseSent { request_id, peer } => {
-							let arrival_time = self.pending_responses_arrival_time.remove(&request_id)
+							let arrival_time = self.pending_responses_arrival_time.remove(
+								&(protocol.clone(), request_id).into(),
+							)
 								.map(|t| t.elapsed())
-								.expect("To find request arrival time for answered request.");
+								.expect(
+									"Time is added for each inbound request on arrival and only \
+									 removed on success (`ResponseSent`) or failure \
+									 (`InboundFailure`). One can not receive a success event for a \
+									 request that either never arrived, or that has previously \
+									 failed; qed.",
+								);
 
 							let out = Event::InboundRequest {
 								peer,
@@ -765,9 +803,10 @@ impl RequestResponseCodec for GenericCodec {
 
 #[cfg(test)]
 mod tests {
+	use super::*;
+
 	use futures::channel::{mpsc, oneshot};
 	use futures::executor::LocalPool;
-	use futures::prelude::*;
 	use futures::task::Spawn;
 	use libp2p::identity::Keypair;
 	use libp2p::Multiaddr;
@@ -777,6 +816,28 @@ mod tests {
 	use libp2p::swarm::{Swarm, SwarmEvent};
 	use std::{iter, time::Duration};
 
+	fn build_swarm(list: impl Iterator<Item = ProtocolConfig>) -> (Swarm<RequestResponsesBehaviour>, Multiaddr) {
+		let keypair = Keypair::generate_ed25519();
+
+		let noise_keys = noise::Keypair::<noise::X25519Spec>::new()
+			.into_authentic(&keypair)
+			.unwrap();
+
+		let transport = MemoryTransport
+			.upgrade(upgrade::Version::V1)
+			.authenticate(noise::NoiseConfig::xx(noise_keys).into_authenticated())
+			.multiplex(libp2p::yamux::YamuxConfig::default())
+			.boxed();
+
+		let behaviour = RequestResponsesBehaviour::new(list).unwrap();
+
+		let mut swarm = Swarm::new(transport, behaviour, keypair.public().into_peer_id());
+		let listen_addr: Multiaddr = format!("/memory/{}", rand::random::<u64>()).parse().unwrap();
+
+		Swarm::listen_on(&mut swarm, listen_addr.clone()).unwrap();
+		(swarm, listen_addr)
+	}
+
 	#[test]
 	fn basic_request_response_works() {
 		let protocol_name = "/test/req-resp/1";
@@ -785,44 +846,24 @@ mod tests {
 		// Build swarms whose behaviour is `RequestResponsesBehaviour`.
 		let mut swarms = (0..2)
 			.map(|_| {
-				let keypair = Keypair::generate_ed25519();
-
-				let noise_keys = noise::Keypair::<noise::X25519Spec>::new()
-					.into_authentic(&keypair)
-					.unwrap();
-
-				let transport = MemoryTransport
-					.upgrade(upgrade::Version::V1)
-					.authenticate(noise::NoiseConfig::xx(noise_keys).into_authenticated())
-					.multiplex(libp2p::yamux::YamuxConfig::default())
-					.boxed();
-
-				let behaviour = {
-					let (tx, mut rx) = mpsc::channel(64);
-
-					let b = super::RequestResponsesBehaviour::new(iter::once(super::ProtocolConfig {
-						name: From::from(protocol_name),
-						max_request_size: 1024,
-						max_response_size: 1024 * 1024,
-						request_timeout: Duration::from_secs(30),
-						inbound_queue: Some(tx),
-					})).unwrap();
-
-					pool.spawner().spawn_obj(async move {
-						while let Some(rq) = rx.next().await {
-							assert_eq!(rq.payload, b"this is a request");
-							let _ = rq.pending_response.send(b"this is a response".to_vec());
-						}
-					}.boxed().into()).unwrap();
+				let (tx, mut rx) = mpsc::channel::<IncomingRequest>(64);
 
-					b
+				pool.spawner().spawn_obj(async move {
+					while let Some(rq) = rx.next().await {
+						assert_eq!(rq.payload, b"this is a request");
+						let _ = rq.pending_response.send(b"this is a response".to_vec());
+					}
+				}.boxed().into()).unwrap();
+
+				let protocol_config = ProtocolConfig {
+					name: From::from(protocol_name),
+					max_request_size: 1024,
+					max_response_size: 1024 * 1024,
+					request_timeout: Duration::from_secs(30),
+					inbound_queue: Some(tx),
 				};
 
-				let mut swarm = Swarm::new(transport, behaviour, keypair.public().into_peer_id());
-				let listen_addr: Multiaddr = format!("/memory/{}", rand::random::<u64>()).parse().unwrap();
-
-				Swarm::listen_on(&mut swarm, listen_addr.clone()).unwrap();
-				(swarm, listen_addr)
+				build_swarm(iter::once(protocol_config))
 			})
 			.collect::<Vec<_>>();
 
@@ -839,7 +880,7 @@ mod tests {
 			async move {
 				loop {
 					match swarm.next_event().await {
-						SwarmEvent::Behaviour(super::Event::InboundRequest { result, .. }) => {
+						SwarmEvent::Behaviour(Event::InboundRequest { result, .. }) => {
 							result.unwrap();
 						},
 						_ => {}
@@ -866,7 +907,7 @@ mod tests {
 						assert!(response_receiver.is_none());
 						response_receiver = Some(receiver);
 					}
-					SwarmEvent::Behaviour(super::Event::RequestFinished {
+					SwarmEvent::Behaviour(Event::RequestFinished {
 						result, ..
 					}) => {
 						result.unwrap();
@@ -888,44 +929,24 @@ mod tests {
 		// Build swarms whose behaviour is `RequestResponsesBehaviour`.
 		let mut swarms = (0..2)
 			.map(|_| {
-				let keypair = Keypair::generate_ed25519();
-
-				let noise_keys = noise::Keypair::<noise::X25519Spec>::new()
-					.into_authentic(&keypair)
-					.unwrap();
-
-				let transport = MemoryTransport
-					.upgrade(upgrade::Version::V1)
-					.authenticate(noise::NoiseConfig::xx(noise_keys).into_authenticated())
-					.multiplex(libp2p::yamux::YamuxConfig::default())
-					.boxed();
-
-				let behaviour = {
-					let (tx, mut rx) = mpsc::channel(64);
-
-					let b = super::RequestResponsesBehaviour::new(iter::once(super::ProtocolConfig {
-						name: From::from(protocol_name),
-						max_request_size: 1024,
-						max_response_size: 8,  // <-- important for the test
-						request_timeout: Duration::from_secs(30),
-						inbound_queue: Some(tx),
-					})).unwrap();
-
-					pool.spawner().spawn_obj(async move {
-						while let Some(rq) = rx.next().await {
-							assert_eq!(rq.payload, b"this is a request");
-							let _ = rq.pending_response.send(b"this response exceeds the limit".to_vec());
-						}
-					}.boxed().into()).unwrap();
+				let (tx, mut rx) = mpsc::channel::<IncomingRequest>(64);
 
-					b
+				pool.spawner().spawn_obj(async move {
+					while let Some(rq) = rx.next().await {
+						assert_eq!(rq.payload, b"this is a request");
+						let _ = rq.pending_response.send(b"this response exceeds the limit".to_vec());
+					}
+				}.boxed().into()).unwrap();
+
+				let protocol_config = ProtocolConfig {
+					name: From::from(protocol_name),
+					max_request_size: 1024,
+					max_response_size: 8,  // <-- important for the test
+					request_timeout: Duration::from_secs(30),
+					inbound_queue: Some(tx),
 				};
 
-				let mut swarm = Swarm::new(transport, behaviour, keypair.public().into_peer_id());
-				let listen_addr: Multiaddr = format!("/memory/{}", rand::random::<u64>()).parse().unwrap();
-
-				Swarm::listen_on(&mut swarm, listen_addr.clone()).unwrap();
-				(swarm, listen_addr)
+				build_swarm(iter::once(protocol_config))
 			})
 			.collect::<Vec<_>>();
 
@@ -943,7 +964,7 @@ mod tests {
 			async move {
 				loop {
 					match swarm.next_event().await {
-						SwarmEvent::Behaviour(super::Event::InboundRequest { result, .. }) => {
+						SwarmEvent::Behaviour(Event::InboundRequest { result, .. }) => {
 							assert!(result.is_ok());
 							break
 						},
@@ -971,7 +992,7 @@ mod tests {
 						assert!(response_receiver.is_none());
 						response_receiver = Some(receiver);
 					}
-					SwarmEvent::Behaviour(super::Event::RequestFinished {
+					SwarmEvent::Behaviour(Event::RequestFinished {
 						result, ..
 					}) => {
 						assert!(result.is_err());
@@ -982,9 +1003,153 @@ mod tests {
 			}
 
 			match response_receiver.unwrap().await.unwrap().unwrap_err() {
-				super::RequestFailure::Network(super::OutboundFailure::ConnectionClosed) => {},
+				RequestFailure::Network(OutboundFailure::ConnectionClosed) => {},
 				_ => panic!()
 			}
 		});
 	}
+
+	/// A [`RequestId`] is a unique identifier among either all inbound or all outbound requests for
+	/// a single [`RequestResponse`] behaviour. It is not guaranteed to be unique across multiple
+	/// [`RequestResponse`] behaviours. Thus when handling [`RequestId`] in the context of multiple
+	/// [`RequestResponse`] behaviours, one needs to couple the protocol name with the [`RequestId`]
+	/// to get a unique request identifier.
+	///
+	/// This test ensures that two requests on different protocols can be handled concurrently
+	/// without a [`RequestId`] collision.
+	///
+	/// See [`ProtocolRequestId`] for additional information.
+	#[test]
+	fn request_id_collision() {
+		let protocol_name_1 = "/test/req-resp-1/1";
+		let protocol_name_2 = "/test/req-resp-2/1";
+		let mut pool = LocalPool::new();
+
+		let mut swarm_1 = {
+			let protocol_configs = vec![
+				ProtocolConfig {
+					name: From::from(protocol_name_1),
+					max_request_size: 1024,
+					max_response_size: 1024 * 1024,
+					request_timeout: Duration::from_secs(30),
+					inbound_queue: None,
+				},
+				ProtocolConfig {
+					name: From::from(protocol_name_2),
+					max_request_size: 1024,
+					max_response_size: 1024 * 1024,
+					request_timeout: Duration::from_secs(30),
+					inbound_queue: None,
+				},
+			];
+
+			build_swarm(protocol_configs.into_iter()).0
+		};
+
+		let (mut swarm_2, mut swarm_2_handler_1, mut swarm_2_handler_2, listen_add_2) = {
+			let (tx_1, rx_1) = mpsc::channel(64);
+			let (tx_2, rx_2) = mpsc::channel(64);
+
+			let protocol_configs = vec![
+				ProtocolConfig {
+					name: From::from(protocol_name_1),
+					max_request_size: 1024,
+					max_response_size: 1024 * 1024,
+					request_timeout: Duration::from_secs(30),
+					inbound_queue: Some(tx_1),
+				},
+				ProtocolConfig {
+					name: From::from(protocol_name_2),
+					max_request_size: 1024,
+					max_response_size: 1024 * 1024,
+					request_timeout: Duration::from_secs(30),
+					inbound_queue: Some(tx_2),
+				},
+			];
+
+			let (swarm, listen_addr) = build_swarm(protocol_configs.into_iter());
+
+			(swarm, rx_1, rx_2, listen_addr)
+		};
+
+		// Ask swarm 1 to dial swarm 2. There isn't any discovery mechanism in place in this test,
+		// so they wouldn't connect to each other.
+		Swarm::dial_addr(&mut swarm_1, listen_add_2).unwrap();
+
+		// Run swarm 2 in the background, receiving two requests.
+		pool.spawner().spawn_obj(
+			async move {
+				loop {
+					match swarm_2.next_event().await {
+						SwarmEvent::Behaviour(Event::InboundRequest { result, .. }) => {
+							result.unwrap();
+						},
+						_ => {}
+					}
+				}
+			}.boxed().into()
+		).unwrap();
+
+		// Handle both requests sent by swarm 1 to swarm 2 in the background.
+		//
+		// Make sure both requests overlap, by answering the first only after receiving the
+		// second.
+		pool.spawner().spawn_obj(async move {
+			let protocol_1_request = swarm_2_handler_1.next().await;
+			let protocol_2_request = swarm_2_handler_2.next().await;
+
+			protocol_1_request.unwrap()
+				.pending_response
+				.send(b"this is a response".to_vec())
+				.unwrap();
+			protocol_2_request.unwrap()
+				.pending_response
+				.send(b"this is a response".to_vec())
+				.unwrap();
+		}.boxed().into()).unwrap();
+
+		// Have swarm 1 send two requests to swarm 2 and await responses.
+		pool.run_until(
+			async move {
+				let mut response_receivers = None;
+				let mut num_responses = 0;
+
+				loop {
+					match swarm_1.next_event().await {
+						SwarmEvent::ConnectionEstablished { peer_id, .. } => {
+							let (sender_1, receiver_1) = oneshot::channel();
+							let (sender_2, receiver_2) = oneshot::channel();
+							swarm_1.send_request(
+								&peer_id,
+								protocol_name_1,
+								b"this is a request".to_vec(),
+								sender_1,
+							);
+							swarm_1.send_request(
+								&peer_id,
+								protocol_name_2,
+								b"this is a request".to_vec(),
+								sender_2,
+							);
+							assert!(response_receivers.is_none());
+							response_receivers = Some((receiver_1, receiver_2));
+						}
+						SwarmEvent::Behaviour(Event::RequestFinished {
+							result, ..
+						}) => {
+							num_responses += 1;
+							result.unwrap();
+							if num_responses == 2 {
+								break;
+							}
+						}
+						_ => {}
+					}
+				}
+				let (response_receiver_1, response_receiver_2) = response_receivers.unwrap();
+				assert_eq!(response_receiver_1.await.unwrap().unwrap(), b"this is a response");
+				assert_eq!(response_receiver_2.await.unwrap().unwrap(), b"this is a response");
+			}
+		);
+	}
 }

From 2b4389592ee9b28a22720606ab13f731c3450987 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Mon, 25 Jan 2021 16:24:38 +0100
Subject: [PATCH 0316/1194] use construct_runtime for more pallet (#7974)

---
 Cargo.lock                           |  1 +
 frame/atomic-swap/src/tests.rs       | 35 ++++++++++++++++-----------
 frame/aura/src/mock.rs               | 35 +++++++++++++++------------
 frame/authority-discovery/src/lib.rs | 36 +++++++++++++++++-----------
 frame/authorship/Cargo.toml          |  1 +
 frame/authorship/src/lib.rs          | 29 ++++++++++++----------
 6 files changed, 82 insertions(+), 55 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 32159c693666..9d29777fd5bc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4351,6 +4351,7 @@ dependencies = [
  "frame-system",
  "impl-trait-for-tuples 0.2.0",
  "parity-scale-codec",
+ "serde",
  "sp-authorship",
  "sp-core",
  "sp-inherents",
diff --git a/frame/atomic-swap/src/tests.rs b/frame/atomic-swap/src/tests.rs
index 19f5fc1dff58..977b17f8710e 100644
--- a/frame/atomic-swap/src/tests.rs
+++ b/frame/atomic-swap/src/tests.rs
@@ -1,20 +1,30 @@
 #![cfg(test)]
 
 use super::*;
+use crate as pallet_atomic_swap;
 
-use frame_support::{impl_outer_origin, parameter_types};
+use frame_support::parameter_types;
 use sp_core::H256;
 use sp_runtime::{
 	testing::Header,
 	traits::{BlakeTwo256, IdentityLookup},
 };
 
-impl_outer_origin! {
-	pub enum Origin for Test where system = frame_system {}
-}
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
+		AtomicSwap: pallet_atomic_swap::{Module, Call, Event<T>},
+	}
+);
 
-#[derive(Clone, Eq, Debug, PartialEq)]
-pub struct Test;
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 	pub BlockWeights: frame_system::limits::BlockWeights =
@@ -29,15 +39,15 @@ impl frame_system::Config for Test {
 	type Index = u64;
 	type BlockNumber = u64;
 	type Hash = H256;
-	type Call = ();
+	type Call = Call;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type Header = Header;
-	type Event = ();
+	type Event = Event;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -51,7 +61,7 @@ impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u64;
 	type DustRemoval = ();
-	type Event = ();
+	type Event = Event;
 	type ExistentialDeposit = ExistentialDeposit;
 	type AccountStore = System;
 	type WeightInfo = ();
@@ -61,13 +71,10 @@ parameter_types! {
 	pub const ExpireDuration: u64 = 100;
 }
 impl Config for Test {
-	type Event = ();
+	type Event = Event;
 	type SwapAction = BalanceSwapAction<u64, Balances>;
 	type ProofLimit = ProofLimit;
 }
-type System = frame_system::Module<Test>;
-type Balances = pallet_balances::Module<Test>;
-type AtomicSwap = Module<Test>;
 
 const A: u64 = 1;
 const B: u64 = 2;
diff --git a/frame/aura/src/mock.rs b/frame/aura/src/mock.rs
index 69e914a23a10..c7c439393de9 100644
--- a/frame/aura/src/mock.rs
+++ b/frame/aura/src/mock.rs
@@ -19,23 +19,30 @@
 
 #![cfg(test)]
 
-use crate::{Config, Module, GenesisConfig};
+use crate as pallet_aura;
 use sp_consensus_aura::ed25519::AuthorityId;
 use sp_runtime::{
 	traits::IdentityLookup,
 	testing::{Header, UintAuthorityId},
 };
-use frame_support::{impl_outer_origin, parameter_types};
+use frame_support::parameter_types;
 use sp_io;
 use sp_core::H256;
 
-impl_outer_origin!{
-	pub enum Origin for Test where system = frame_system {}
-}
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
 
-// Workaround for https://github.com/rust-lang/rust/issues/26925 . Remove when sorted.
-#[derive(Clone, PartialEq, Eq, Debug)]
-pub struct Test;
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent},
+		Aura: pallet_aura::{Module, Call, Storage, Config<T>, Inherent},
+	}
+);
 
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
@@ -52,16 +59,16 @@ impl frame_system::Config for Test {
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u64;
-	type Call = ();
+	type Call = Call;
 	type Hash = H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type Header = Header;
-	type Event = ();
+	type Event = Event;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -76,16 +83,14 @@ impl pallet_timestamp::Config for Test {
 	type WeightInfo = ();
 }
 
-impl Config for Test {
+impl pallet_aura::Config for Test {
 	type AuthorityId = AuthorityId;
 }
 
 pub fn new_test_ext(authorities: Vec<u64>) -> sp_io::TestExternalities {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-	GenesisConfig::<Test>{
+	pallet_aura::GenesisConfig::<Test>{
 		authorities: authorities.into_iter().map(|a| UintAuthorityId(a).to_public_key()).collect(),
 	}.assimilate_storage(&mut t).unwrap();
 	t.into()
 }
-
-pub type Aura = Module<Test>;
diff --git a/frame/authority-discovery/src/lib.rs b/frame/authority-discovery/src/lib.rs
index 9a7c20988710..219219b9957b 100644
--- a/frame/authority-discovery/src/lib.rs
+++ b/frame/authority-discovery/src/lib.rs
@@ -115,6 +115,7 @@ impl<T: Config> pallet_session::OneSessionHandler<T::AccountId> for Module<T> {
 
 #[cfg(test)]
 mod tests {
+	use crate as pallet_authority_discovery;
 	use super::*;
 	use sp_authority_discovery::AuthorityPair;
 	use sp_application_crypto::Pair;
@@ -124,12 +125,23 @@ mod tests {
 		testing::{Header, UintAuthorityId}, traits::{ConvertInto, IdentityLookup, OpaqueKeys},
 		Perbill, KeyTypeId,
 	};
-	use frame_support::{impl_outer_origin, parameter_types};
-
-	type AuthorityDiscovery = Module<Test>;
+	use frame_support::parameter_types;
+
+	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+	type Block = frame_system::mocking::MockBlock<Test>;
+
+	frame_support::construct_runtime!(
+		pub enum Test where
+			Block = Block,
+			NodeBlock = Block,
+			UncheckedExtrinsic = UncheckedExtrinsic,
+		{
+			System: frame_system::{Module, Call, Config, Storage, Event<T>},
+			Session: pallet_session::{Module, Call, Storage, Event, Config<T>},
+			AuthorityDiscovery: pallet_authority_discovery::{Module, Call, Config},
+		}
+	);
 
-	#[derive(Clone, Eq, PartialEq)]
-	pub struct Test;
 	impl Config for Test {}
 
 	parameter_types! {
@@ -141,7 +153,7 @@ mod tests {
 		type Keys = UintAuthorityId;
 		type ShouldEndSession = pallet_session::PeriodicSessions<Period, Offset>;
 		type SessionHandler = TestSessionHandler;
-		type Event = ();
+		type Event = Event;
 		type ValidatorId = AuthorityId;
 		type ValidatorIdOf = ConvertInto;
 		type DisabledValidatorsThreshold = DisabledValidatorsThreshold;
@@ -173,16 +185,16 @@ mod tests {
 		type Origin = Origin;
 		type Index = u64;
 		type BlockNumber = BlockNumber;
-		type Call = ();
+		type Call = Call;
 		type Hash = H256;
 		type Hashing = ::sp_runtime::traits::BlakeTwo256;
 		type AccountId = AuthorityId;
 		type Lookup = IdentityLookup<Self::AccountId>;
 		type Header = Header;
-		type Event = ();
+		type Event = Event;
 		type BlockHashCount = BlockHashCount;
 		type Version = ();
-		type PalletInfo = ();
+		type PalletInfo = PalletInfo;
 		type AccountData = ();
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
@@ -190,10 +202,6 @@ mod tests {
 		type SS58Prefix = ();
 	}
 
-	impl_outer_origin! {
-		pub enum Origin for Test where system = frame_system {}
-	}
-
 	pub struct TestSessionHandler;
 	impl pallet_session::SessionHandler<AuthorityId> for TestSessionHandler {
 		const KEY_TYPE_IDS: &'static [KeyTypeId] = &[key_types::DUMMY];
@@ -247,7 +255,7 @@ mod tests {
 			.build_storage::<Test>()
 			.unwrap();
 
-		GenesisConfig {
+		pallet_authority_discovery::GenesisConfig {
 			keys: vec![],
 		}
 		.assimilate_storage::<Test>(&mut t)
diff --git a/frame/authorship/Cargo.toml b/frame/authorship/Cargo.toml
index d957fb909404..64e3fb12b0d4 100644
--- a/frame/authorship/Cargo.toml
+++ b/frame/authorship/Cargo.toml
@@ -25,6 +25,7 @@ impl-trait-for-tuples = "0.2.0"
 [dev-dependencies]
 sp-core = { version = "2.0.0", path = "../../primitives/core" }
 sp-io ={ version = "2.0.0", path = "../../primitives/io" }
+serde = { version = "1.0.101" }
 
 [features]
 default = ["std"]
diff --git a/frame/authorship/src/lib.rs b/frame/authorship/src/lib.rs
index d31d6866254d..3d89ab24d01c 100644
--- a/frame/authorship/src/lib.rs
+++ b/frame/authorship/src/lib.rs
@@ -396,19 +396,27 @@ impl<T: Config> ProvideInherent for Module<T> {
 
 #[cfg(test)]
 mod tests {
+	use crate as pallet_authorship;
 	use super::*;
 	use sp_core::H256;
 	use sp_runtime::{
 		traits::{BlakeTwo256, IdentityLookup}, testing::Header, generic::DigestItem,
 	};
-	use frame_support::{parameter_types, impl_outer_origin, ConsensusEngineId};
+	use frame_support::{parameter_types, ConsensusEngineId};
 
-	impl_outer_origin!{
-		pub enum Origin for Test where system = frame_system {}
-	}
+	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+	type Block = frame_system::mocking::MockBlock<Test>;
 
-	#[derive(Clone, Eq, PartialEq)]
-	pub struct Test;
+	frame_support::construct_runtime!(
+		pub enum Test where
+			Block = Block,
+			NodeBlock = Block,
+			UncheckedExtrinsic = UncheckedExtrinsic,
+		{
+			System: frame_system::{Module, Call, Config, Storage, Event<T>},
+			Authorship: pallet_authorship::{Module, Call, Storage, Inherent},
+		}
+	);
 
 	parameter_types! {
 		pub const BlockHashCount: u64 = 250;
@@ -424,16 +432,16 @@ mod tests {
 		type Origin = Origin;
 		type Index = u64;
 		type BlockNumber = u64;
-		type Call = ();
+		type Call = Call;
 		type Hash = H256;
 		type Hashing = BlakeTwo256;
 		type AccountId = u64;
 		type Lookup = IdentityLookup<Self::AccountId>;
 		type Header = Header;
-		type Event = ();
+		type Event = Event;
 		type BlockHashCount = BlockHashCount;
 		type Version = ();
-		type PalletInfo = ();
+		type PalletInfo = PalletInfo;
 		type AccountData = ();
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
@@ -452,9 +460,6 @@ mod tests {
 		type EventHandler = ();
 	}
 
-	type System = frame_system::Module<Test>;
-	type Authorship = Module<Test>;
-
 	const TEST_ID: ConsensusEngineId = [1, 2, 3, 4];
 
 	pub struct AuthorGiven;

From 65003c5eb6d6ecc2d7bc8a99bcfd15997ad34c1c Mon Sep 17 00:00:00 2001
From: Andrew Jones <ascjones@gmail.com>
Date: Mon, 25 Jan 2021 15:56:07 +0000
Subject: [PATCH 0317/1194] Migrate some more pallets to construct_runtime
 (#7975)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* WIP converting balances tests to construct_runtime

* Converting balances tests_local to construct_runtime

* Fix up system and balances Events

* Use static Call instance in tests

* Migrate indices to construct_runtime

* Migrate babe test to construct_runtime

* Update frame/indices/src/mock.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Update frame/babe/src/mock.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Update frame/babe/src/mock.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Remove redundant import

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 frame/babe/src/mock.rs                | 59 +++++++++++++--------------
 frame/balances/src/tests.rs           | 50 ++++++++---------------
 frame/balances/src/tests_composite.rs | 43 +++++++++----------
 frame/balances/src/tests_local.rs     | 52 ++++++++++++-----------
 frame/indices/src/mock.rs             | 46 +++++++++------------
 5 files changed, 110 insertions(+), 140 deletions(-)

diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index 0a7576aa0778..3198930ea6cc 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -18,7 +18,7 @@
 //! Test utilities
 
 use codec::Encode;
-use super::{Config, Module, CurrentSlot};
+use crate::{self as pallet_babe, Config, CurrentSlot};
 use sp_runtime::{
 	Perbill, impl_opaque_keys,
 	curve::PiecewiseLinear,
@@ -27,7 +27,7 @@ use sp_runtime::{
 };
 use frame_system::InitKind;
 use frame_support::{
-	impl_outer_dispatch, impl_outer_origin, parameter_types, StorageValue,
+	parameter_types, StorageValue,
 	traits::{KeyOwnerProofSystem, OnInitialize},
 	weights::Weight,
 };
@@ -37,23 +37,29 @@ use sp_consensus_babe::{AuthorityId, AuthorityPair, SlotNumber};
 use sp_consensus_vrf::schnorrkel::{VRFOutput, VRFProof};
 use sp_staking::SessionIndex;
 use pallet_staking::EraIndex;
-
-impl_outer_origin!{
-	pub enum Origin for Test where system = frame_system {}
-}
-
-impl_outer_dispatch! {
-	pub enum Call for Test where origin: Origin {
-		babe::Babe,
-		staking::Staking,
-	}
-}
+use pallet_session::historical as pallet_session_historical;
 
 type DummyValidatorId = u64;
 
-// Workaround for https://github.com/rust-lang/rust/issues/26925 . Remove when sorted.
-#[derive(Clone, PartialEq, Eq, Debug)]
-pub struct Test;
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
+		Historical: pallet_session_historical::{Module},
+		Offences: pallet_offences::{Module, Call, Storage, Event},
+		Babe: pallet_babe::{Module, Call, Storage, Config, Inherent, ValidateUnsigned},
+		Staking: pallet_staking::{Module, Call, Storage, Config<T>, Event<T>},
+		Session: pallet_session::{Module, Call, Storage, Event, Config<T>},
+		Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent},
+	}
+);
 
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
@@ -79,9 +85,9 @@ impl frame_system::Config for Test {
 	type AccountId = DummyValidatorId;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type Header = Header;
-	type Event = ();
+	type Event = Event;
 	type BlockHashCount = BlockHashCount;
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<u128>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -104,7 +110,7 @@ impl_opaque_keys! {
 }
 
 impl pallet_session::Config for Test {
-	type Event = ();
+	type Event = Event;
 	type ValidatorId = <Self as frame_system::Config>::AccountId;
 	type ValidatorIdOf = pallet_staking::StashOf<Self>;
 	type ShouldEndSession = Babe;
@@ -151,7 +157,7 @@ impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u128;
 	type DustRemoval = ();
-	type Event = ();
+	type Event = Event;
 	type ExistentialDeposit = ExistentialDeposit;
 	type AccountStore = System;
 	type WeightInfo = ();
@@ -182,7 +188,7 @@ parameter_types! {
 impl pallet_staking::Config for Test {
 	type RewardRemainder = ();
 	type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote;
-	type Event = ();
+	type Event = Event;
 	type Currency = Balances;
 	type Slash = ();
 	type Reward = ();
@@ -210,7 +216,7 @@ parameter_types! {
 }
 
 impl pallet_offences::Config for Test {
-	type Event = ();
+	type Event = Event;
 	type IdentificationTuple = pallet_session::historical::IdentificationTuple<Self>;
 	type OnOffenceHandler = Staking;
 	type WeightSoftLimit = OffencesWeightSoftLimit;
@@ -235,15 +241,6 @@ impl Config for Test {
 	type WeightInfo = ();
 }
 
-pub type Balances = pallet_balances::Module<Test>;
-pub type Historical = pallet_session::historical::Module<Test>;
-pub type Offences = pallet_offences::Module<Test>;
-pub type Session = pallet_session::Module<Test>;
-pub type Staking = pallet_staking::Module<Test>;
-pub type System = frame_system::Module<Test>;
-pub type Timestamp = pallet_timestamp::Module<Test>;
-pub type Babe = Module<Test>;
-
 pub fn go_to_block(n: u64, s: u64) {
 	use frame_support::traits::OnFinalize;
 
diff --git a/frame/balances/src/tests.rs b/frame/balances/src/tests.rs
index 7a1b57a7b4db..de7ccc6d239f 100644
--- a/frame/balances/src/tests.rs
+++ b/frame/balances/src/tests.rs
@@ -19,20 +19,6 @@
 
 #![cfg(test)]
 
-#[derive(Debug)]
-pub struct CallWithDispatchInfo;
-impl sp_runtime::traits::Dispatchable for CallWithDispatchInfo {
-	type Origin = ();
-	type Config = ();
-	type Info = frame_support::weights::DispatchInfo;
-	type PostInfo = frame_support::weights::PostDispatchInfo;
-
-	fn dispatch(self, _origin: Self::Origin)
-		-> sp_runtime::DispatchResultWithInfo<Self::PostInfo> {
-			panic!("Do not use dummy implementation for dispatch.");
-	}
-}
-
 #[macro_export]
 macro_rules! decl_tests {
 	($test:ty, $ext_builder:ty, $existential_deposit:expr) => {
@@ -52,10 +38,8 @@ macro_rules! decl_tests {
 		const ID_1: LockIdentifier = *b"1       ";
 		const ID_2: LockIdentifier = *b"2       ";
 
-		pub type System = frame_system::Module<$test>;
-		pub type Balances = Module<$test>;
-
-		pub const CALL: &<$test as frame_system::Config>::Call = &$crate::tests::CallWithDispatchInfo;
+		pub const CALL: &<$test as frame_system::Config>::Call =
+			&Call::Balances(pallet_balances::Call::transfer(0, 0));
 
 		/// create a transaction info struct from weight. Handy to avoid building the whole struct.
 		pub fn info_from_weight(w: Weight) -> DispatchInfo {
@@ -485,7 +469,7 @@ macro_rules! decl_tests {
 				assert_ok!(Balances::repatriate_reserved(&1, &2, 41, Status::Free), 0);
 				assert_eq!(
 					last_event(),
-					Event::balances(RawEvent::ReserveRepatriated(1, 2, 41, Status::Free)),
+					Event::pallet_balances(RawEvent::ReserveRepatriated(1, 2, 41, Status::Free)),
 				);
 				assert_eq!(Balances::reserved_balance(1), 69);
 				assert_eq!(Balances::free_balance(1), 0);
@@ -626,7 +610,7 @@ macro_rules! decl_tests {
 		fn cannot_set_genesis_value_below_ed() {
 			($existential_deposit).with(|v| *v.borrow_mut() = 11);
 			let mut t = frame_system::GenesisConfig::default().build_storage::<$test>().unwrap();
-			let _ = GenesisConfig::<$test> {
+			let _ = pallet_balances::GenesisConfig::<$test> {
 				balances: vec![(1, 10)],
 			}.assimilate_storage(&mut t).unwrap();
 		}
@@ -635,7 +619,7 @@ macro_rules! decl_tests {
 		#[should_panic = "duplicate balances in genesis."]
 		fn cannot_set_genesis_value_twice() {
 			let mut t = frame_system::GenesisConfig::default().build_storage::<$test>().unwrap();
-			let _ = GenesisConfig::<$test> {
+			let _ = pallet_balances::GenesisConfig::<$test> {
 				balances: vec![(1, 10), (2, 20), (1, 15)],
 			}.assimilate_storage(&mut t).unwrap();
 		}
@@ -704,7 +688,7 @@ macro_rules! decl_tests {
 
 					assert_eq!(
 						last_event(),
-						Event::balances(RawEvent::Reserved(1, 10)),
+						Event::pallet_balances(RawEvent::Reserved(1, 10)),
 					);
 
 					System::set_block_number(3);
@@ -712,7 +696,7 @@ macro_rules! decl_tests {
 
 					assert_eq!(
 						last_event(),
-						Event::balances(RawEvent::Unreserved(1, 5)),
+						Event::pallet_balances(RawEvent::Unreserved(1, 5)),
 					);
 
 					System::set_block_number(4);
@@ -721,7 +705,7 @@ macro_rules! decl_tests {
 					// should only unreserve 5
 					assert_eq!(
 						last_event(),
-						Event::balances(RawEvent::Unreserved(1, 5)),
+						Event::pallet_balances(RawEvent::Unreserved(1, 5)),
 					);
 				});
 		}
@@ -737,9 +721,9 @@ macro_rules! decl_tests {
 					assert_eq!(
 						events(),
 						[
-							Event::system(system::Event::NewAccount(1)),
-							Event::balances(RawEvent::Endowed(1, 100)),
-							Event::balances(RawEvent::BalanceSet(1, 100, 0)),
+							Event::frame_system(system::Event::NewAccount(1)),
+							Event::pallet_balances(RawEvent::Endowed(1, 100)),
+							Event::pallet_balances(RawEvent::BalanceSet(1, 100, 0)),
 						]
 					);
 
@@ -748,8 +732,8 @@ macro_rules! decl_tests {
 					assert_eq!(
 						events(),
 						[
-							Event::balances(RawEvent::DustLost(1, 99)),
-							Event::system(system::Event::KilledAccount(1))
+							Event::pallet_balances(RawEvent::DustLost(1, 99)),
+							Event::frame_system(system::Event::KilledAccount(1))
 						]
 					);
 				});
@@ -766,9 +750,9 @@ macro_rules! decl_tests {
 					assert_eq!(
 						events(),
 						[
-							Event::system(system::Event::NewAccount(1)),
-							Event::balances(RawEvent::Endowed(1, 100)),
-							Event::balances(RawEvent::BalanceSet(1, 100, 0)),
+							Event::frame_system(system::Event::NewAccount(1)),
+							Event::pallet_balances(RawEvent::Endowed(1, 100)),
+							Event::pallet_balances(RawEvent::BalanceSet(1, 100, 0)),
 						]
 					);
 
@@ -777,7 +761,7 @@ macro_rules! decl_tests {
 					assert_eq!(
 						events(),
 						[
-							Event::system(system::Event::KilledAccount(1))
+							Event::frame_system(system::Event::KilledAccount(1))
 						]
 					);
 				});
diff --git a/frame/balances/src/tests_composite.rs b/frame/balances/src/tests_composite.rs
index 7cb9b9d502ba..14dfd0c4b33d 100644
--- a/frame/balances/src/tests_composite.rs
+++ b/frame/balances/src/tests_composite.rs
@@ -25,30 +25,27 @@ use sp_runtime::{
 };
 use sp_core::H256;
 use sp_io;
-use frame_support::{impl_outer_origin, impl_outer_event, parameter_types};
+use frame_support::parameter_types;
 use frame_support::weights::{Weight, DispatchInfo, IdentityFee};
 use pallet_transaction_payment::CurrencyAdapter;
-use crate::{GenesisConfig, Module, Config, decl_tests, tests::CallWithDispatchInfo};
-
-use frame_system as system;
-impl_outer_origin!{
-	pub enum Origin for Test {}
-}
-
-mod balances {
-	pub use crate::Event;
-}
+use crate::{
+	self as pallet_balances,
+	Module, Config, decl_tests,
+};
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
 
-impl_outer_event! {
-	pub enum Event for Test {
-		system<T>,
-		balances<T>,
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
 	}
-}
+);
 
-// Workaround for https://github.com/rust-lang/rust/issues/26925 . Remove when sorted.
-#[derive(Clone, PartialEq, Eq, Debug)]
-pub struct Test;
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 	pub BlockWeights: frame_system::limits::BlockWeights =
@@ -63,7 +60,7 @@ impl frame_system::Config for Test {
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u64;
-	type Call = CallWithDispatchInfo;
+	type Call = Call;
 	type Hash = H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;
 	type AccountId = u64;
@@ -72,7 +69,7 @@ impl frame_system::Config for Test {
 	type Event = Event;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = super::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -94,7 +91,7 @@ impl Config for Test {
 	type DustRemoval = ();
 	type Event = Event;
 	type ExistentialDeposit = ExistentialDeposit;
-	type AccountStore = system::Module<Test>;
+	type AccountStore = frame_system::Pallet<Test>;
 	type MaxLocks = ();
 	type WeightInfo = ();
 }
@@ -126,7 +123,7 @@ impl ExtBuilder {
 	pub fn build(self) -> sp_io::TestExternalities {
 		self.set_associated_consts();
 		let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-		GenesisConfig::<Test> {
+		pallet_balances::GenesisConfig::<Test> {
 			balances: if self.monied {
 				vec![
 					(1, 10 * self.existential_deposit),
diff --git a/frame/balances/src/tests_local.rs b/frame/balances/src/tests_local.rs
index 762ebe871b3e..a072d2954bec 100644
--- a/frame/balances/src/tests_local.rs
+++ b/frame/balances/src/tests_local.rs
@@ -25,31 +25,29 @@ use sp_runtime::{
 };
 use sp_core::H256;
 use sp_io;
-use frame_support::{impl_outer_origin, impl_outer_event, parameter_types};
+use frame_support::parameter_types;
 use frame_support::traits::StorageMapShim;
 use frame_support::weights::{Weight, DispatchInfo, IdentityFee};
-use crate::{GenesisConfig, Module, Config, decl_tests, tests::CallWithDispatchInfo};
+use crate::{
+	self as pallet_balances,
+	Module, Config, decl_tests,
+};
 use pallet_transaction_payment::CurrencyAdapter;
 
-use frame_system as system;
-impl_outer_origin!{
-	pub enum Origin for Test {}
-}
-
-mod balances {
-	pub use crate::Event;
-}
-
-impl_outer_event! {
-	pub enum Event for Test {
-		system<T>,
-		balances<T>,
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
 	}
-}
+);
 
-// Workaround for https://github.com/rust-lang/rust/issues/26925 . Remove when sorted.
-#[derive(Clone, PartialEq, Eq, Debug)]
-pub struct Test;
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 	pub BlockWeights: frame_system::limits::BlockWeights =
@@ -64,7 +62,7 @@ impl frame_system::Config for Test {
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u64;
-	type Call = CallWithDispatchInfo;
+	type Call = Call;
 	type Hash = H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;
 	type AccountId = u64;
@@ -73,7 +71,7 @@ impl frame_system::Config for Test {
 	type Event = Event;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -137,7 +135,7 @@ impl ExtBuilder {
 	pub fn build(self) -> sp_io::TestExternalities {
 		self.set_associated_consts();
 		let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-		GenesisConfig::<Test> {
+		pallet_balances::GenesisConfig::<Test> {
 			balances: if self.monied {
 				vec![
 					(1, 10 * self.existential_deposit),
@@ -170,9 +168,9 @@ fn emit_events_with_no_existential_deposit_suicide_with_dust() {
 			assert_eq!(
 				events(),
 				[
-					Event::system(system::Event::NewAccount(1)),
-					Event::balances(RawEvent::Endowed(1, 100)),
-					Event::balances(RawEvent::BalanceSet(1, 100, 0)),
+					Event::frame_system(frame_system::Event::NewAccount(1)),
+					Event::pallet_balances(RawEvent::Endowed(1, 100)),
+					Event::pallet_balances(RawEvent::BalanceSet(1, 100, 0)),
 				]
 			);
 
@@ -186,8 +184,8 @@ fn emit_events_with_no_existential_deposit_suicide_with_dust() {
 			assert_eq!(
 				events(),
 				[
-					Event::balances(RawEvent::DustLost(1, 1)),
-					Event::system(system::Event::KilledAccount(1))
+					Event::pallet_balances(RawEvent::DustLost(1, 1)),
+					Event::frame_system(frame_system::Event::KilledAccount(1))
 				]
 			);
 		});
diff --git a/frame/indices/src/mock.rs b/frame/indices/src/mock.rs
index 77797213cb56..06c73b1a9bc2 100644
--- a/frame/indices/src/mock.rs
+++ b/frame/indices/src/mock.rs
@@ -21,25 +21,23 @@
 
 use sp_runtime::testing::Header;
 use sp_core::H256;
-use frame_support::{impl_outer_origin, impl_outer_event, parameter_types};
-use crate::{self as indices, Module, Config};
-use frame_system as system;
-use pallet_balances as balances;
+use frame_support::parameter_types;
+use crate::{self as pallet_indices, Config};
 
-impl_outer_origin!{
-	pub enum Origin for Test where system = frame_system {}
-}
-impl_outer_event!{
-	pub enum MetaEvent for Test {
-		system<T>,
-		balances<T>,
-		indices<T>,
-	}
-}
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
 
-// Workaround for https://github.com/rust-lang/rust/issues/26925 . Remove when sorted.
-#[derive(Clone, PartialEq, Eq, Debug)]
-pub struct Test;
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
+		Indices: pallet_indices::{Module, Call, Storage, Config<T>, Event<T>},
+	}
+);
 
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
@@ -53,7 +51,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type Origin = Origin;
-	type Call = ();
+	type Call = Call;
 	type Index = u64;
 	type BlockNumber = u64;
 	type Hash = H256;
@@ -61,10 +59,10 @@ impl frame_system::Config for Test {
 	type AccountId = u64;
 	type Lookup = Indices;
 	type Header = Header;
-	type Event = MetaEvent;
+	type Event = Event;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -80,7 +78,7 @@ impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u64;
 	type DustRemoval = ();
-	type Event = MetaEvent;
+	type Event = Event;
 	type ExistentialDeposit = ExistentialDeposit;
 	type AccountStore = System;
 	type WeightInfo = ();
@@ -94,7 +92,7 @@ impl Config for Test {
 	type AccountIndex = u64;
 	type Currency = Balances;
 	type Deposit = Deposit;
-	type Event = MetaEvent;
+	type Event = Event;
 	type WeightInfo = ();
 }
 
@@ -105,7 +103,3 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 	}.assimilate_storage(&mut t).unwrap();
 	t.into()
 }
-
-pub type System = frame_system::Module<Test>;
-pub type Balances = pallet_balances::Module<Test>;
-pub type Indices = Module<Test>;

From 51d231247c84d8cc17d970afedb377edd8a95aef Mon Sep 17 00:00:00 2001
From: Andrew Jones <ascjones@gmail.com>
Date: Mon, 25 Jan 2021 17:18:38 +0000
Subject: [PATCH 0318/1194] Pallet proc macro doc improvements (#7955)

* Fix weight syntax in comments

* Mention to add `IsType` bound

* Link to subsee

* Fix link

* Update frame/support/procedural/src/pallet/parse/call.rs

Co-authored-by: David <dvdplm@gmail.com>

* Apply review suggestion from @dvdplm, make StorageInstance doc link

* fix ui test

Co-authored-by: David <dvdplm@gmail.com>
Co-authored-by: thiolliere <gui.thiolliere@gmail.com>
---
 frame/support/procedural/src/pallet/parse/call.rs   |  4 ++--
 frame/support/src/lib.rs                            | 13 ++++++++-----
 .../test/tests/pallet_ui/call_missing_weight.stderr |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/frame/support/procedural/src/pallet/parse/call.rs b/frame/support/procedural/src/pallet/parse/call.rs
index 514dc9203e5c..880cf54f8b2c 100644
--- a/frame/support/procedural/src/pallet/parse/call.rs
+++ b/frame/support/procedural/src/pallet/parse/call.rs
@@ -57,7 +57,7 @@ pub struct CallVariantDef {
 }
 
 /// Attributes for functions in call impl block.
-/// Parse for `#[pallet::weight = expr]`
+/// Parse for `#[pallet::weight(expr)]`
 pub struct FunctionAttr {
 	weight: syn::Expr,
 }
@@ -175,7 +175,7 @@ impl CallDef {
 
 				if call_var_attrs.len() != 1 {
 					let msg = if call_var_attrs.is_empty() {
-						"Invalid pallet::call, require weight attribute i.e. `#[pallet::weight = $expr]`"
+						"Invalid pallet::call, requires weight attribute i.e. `#[pallet::weight($expr)]`"
 					} else {
 						"Invalid pallet::call, too many weight attributes given"
 					};
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 298fbdc321db..08852a7f3c1f 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -1388,8 +1388,9 @@ pub mod pallet_prelude {
 /// ### Macro expansion
 ///
 /// For each storage item the macro generates a struct named
-/// `_GeneratedPrefixForStorage$NameOfStorage`, implements `StorageInstance` on it using the 
-/// pallet and storage name. It then uses it as the first generic of the aliased type.
+/// `_GeneratedPrefixForStorage$NameOfStorage`, and implements [`StorageInstance`](traits::StorageInstance)
+/// on it using the pallet and storage name. It then uses it as the first generic of the aliased
+/// type.
 ///
 ///
 /// The macro implements the function `storage_metadata` on `Pallet` implementing the metadata for
@@ -1909,7 +1910,8 @@ pub mod pallet_prelude {
 /// 	```
 /// 5. **migrate Config**: move trait into the module with
 /// 	* all const in decl_module to `#[pallet::constant]`
-/// 6. **migrate decl_module**: write:
+/// 	* add bound `IsType<<Self as frame_system::Config>::Event>` to `type Event`
+/// 7. **migrate decl_module**: write:
 /// 	```ignore
 /// 	#[pallet::hooks]
 /// 	impl<T: Config> Hooks for Pallet<T> {
@@ -1996,8 +1998,9 @@ pub mod pallet_prelude {
 ///
 /// ## Checking upgrade guidelines:
 ///
-/// * compare metadata. This checks for:
-/// 	* call, names, signature, doc
+/// * compare metadata. Use [subsee](https://github.com/ascjones/subsee) to fetch the metadata
+/// and do a diff of the resulting json before and after migration. This checks for:
+/// 	* call, names, signature, docs
 /// 	* event names, docs
 /// 	* error names, docs
 /// 	* storage names, hasher, prefixes, default value
diff --git a/frame/support/test/tests/pallet_ui/call_missing_weight.stderr b/frame/support/test/tests/pallet_ui/call_missing_weight.stderr
index f499e8a65da2..37386d7771a7 100644
--- a/frame/support/test/tests/pallet_ui/call_missing_weight.stderr
+++ b/frame/support/test/tests/pallet_ui/call_missing_weight.stderr
@@ -1,4 +1,4 @@
-error: Invalid pallet::call, require weight attribute i.e. `#[pallet::weight = $expr]`
+error: Invalid pallet::call, requires weight attribute i.e. `#[pallet::weight($expr)]`
   --> $DIR/call_missing_weight.rs:17:3
    |
 17 |         fn foo(origin: OriginFor<T>) -> DispatchResultWithPostInfo {}

From 13cdf1c8cd2ee62d411f82b64dc7eba860c9c6c6 Mon Sep 17 00:00:00 2001
From: David <dvdplm@gmail.com>
Date: Mon, 25 Jan 2021 20:29:39 +0000
Subject: [PATCH 0319/1194] Refuse to start substrate without providing an
 explicit chain (#7977)

---
 bin/node/cli/src/command.rs | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/bin/node/cli/src/command.rs b/bin/node/cli/src/command.rs
index fcb8b6f0085e..461930a613d9 100644
--- a/bin/node/cli/src/command.rs
+++ b/bin/node/cli/src/command.rs
@@ -49,15 +49,18 @@ impl SubstrateCli for Cli {
 	}
 
 	fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {
-		Ok(match id {
-			"dev" => Box::new(chain_spec::development_config()),
-			"local" => Box::new(chain_spec::local_testnet_config()),
-			"" | "fir" | "flaming-fir" => Box::new(chain_spec::flaming_fir_config()?),
-			"staging" => Box::new(chain_spec::staging_testnet_config()),
-			path => Box::new(chain_spec::ChainSpec::from_json_file(
-				std::path::PathBuf::from(path),
-			)?),
-		})
+		let spec =
+			match id {
+				"" => return Err("Please specify which chain you want to run, e.g. --dev or --chain=local".into()),
+				"dev" => Box::new(chain_spec::development_config()),
+				"local" => Box::new(chain_spec::local_testnet_config()),
+				"fir" | "flaming-fir" => Box::new(chain_spec::flaming_fir_config()?),
+				"staging" => Box::new(chain_spec::staging_testnet_config()),
+				path => Box::new(chain_spec::ChainSpec::from_json_file(
+					std::path::PathBuf::from(path),
+				)?),
+			};
+		Ok(spec)
 	}
 
 	fn native_runtime_version(_: &Box<dyn ChainSpec>) -> &'static RuntimeVersion {

From addf20316d36110c4e035c3bb193cee52430fa02 Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Tue, 26 Jan 2021 11:45:41 +0100
Subject: [PATCH 0320/1194] client/network: Report reputation changes via
 response (#7958)

* client/network: Report reputation changes via response

When handling a request by a remote peer in a request response handler,
one might want to in- or de-crease the reputation of the peer. E.g. one
might want to decrease the reputation slightly for each request, given
that it forces the local node to do work, or one might want to issue a
larger reputation change due to a malformed request by the remote peer.

Instead of having to pass a peerset handle to each request response
handler, this commit suggests to allow handlers to isssue reputation
changes via the provided `pending_response` `oneshot` channel.

A reputation change issued by a request response handler via the
`pending_response` channel is received by the
`RequestResponsesBehaviour` which passes the reputation change up as an
event to eventually be send to a peerset via a peerset handle.

* client/network/req-resp: Use Vec::new instead of None::<Vec<_>>

* client/network: Rename Response to OutgoingResponse

Given that a request-response request is not called `Request` but
`InomingRequest`, rename a request-response response to
`OutgoingResponse`.

* client/finality-grandpa-warp: Send empty rep change via response
---
 client/finality-grandpa-warp-sync/src/lib.rs | 10 +-
 client/network/src/behaviour.rs              |  5 +
 client/network/src/block_request_handler.rs  | 10 +-
 client/network/src/config.rs                 |  6 +-
 client/network/src/request_responses.rs      | 96 +++++++++++++++-----
 5 files changed, 97 insertions(+), 30 deletions(-)

diff --git a/client/finality-grandpa-warp-sync/src/lib.rs b/client/finality-grandpa-warp-sync/src/lib.rs
index d22d74c2faee..cae28173f09e 100644
--- a/client/finality-grandpa-warp-sync/src/lib.rs
+++ b/client/finality-grandpa-warp-sync/src/lib.rs
@@ -18,7 +18,7 @@
 //! [`crate::request_responses::RequestResponsesBehaviour`].
 
 use codec::Decode;
-use sc_network::config::{ProtocolId, IncomingRequest, RequestResponseConfig};
+use sc_network::config::{IncomingRequest, OutgoingResponse, ProtocolId, RequestResponseConfig};
 use sc_client_api::Backend;
 use sp_runtime::traits::NumberFor;
 use futures::channel::{mpsc, oneshot};
@@ -113,7 +113,7 @@ impl<TBlock: BlockT, TBackend: Backend<TBlock>> GrandpaWarpSyncRequestHandler<TB
 	fn handle_request(
 		&self,
 		payload: Vec<u8>,
-		pending_response: oneshot::Sender<Vec<u8>>
+		pending_response: oneshot::Sender<OutgoingResponse>
 	) -> Result<(), HandleRequestError>
 		where NumberFor<TBlock>: sc_finality_grandpa::BlockNumberOps,
 	{
@@ -124,8 +124,10 @@ impl<TBlock: BlockT, TBackend: Backend<TBlock>> GrandpaWarpSyncRequestHandler<TB
 			self.backend.blockchain(), request.begin, Some(WARP_SYNC_FRAGMENTS_LIMIT), Some(&mut cache)
 		)?;
 
-		pending_response.send(response)
-			.map_err(|_| HandleRequestError::SendResponse)
+		pending_response.send(OutgoingResponse {
+			result: Ok(response),
+			reputation_changes: Vec::new(),
+		}).map_err(|_| HandleRequestError::SendResponse)
 	}
 
 	/// Run [`GrandpaWarpSyncRequestHandler`].
diff --git a/client/network/src/behaviour.rs b/client/network/src/behaviour.rs
index de983bd7139d..7b1a35354c91 100644
--- a/client/network/src/behaviour.rs
+++ b/client/network/src/behaviour.rs
@@ -369,6 +369,11 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviourEventProcess<request_responses::Even
 					peer, protocol, duration, result,
 				});
 			},
+			request_responses::Event::ReputationChanges { peer, changes } => {
+				for change in changes {
+					self.substrate.report_peer(peer, change);
+				}
+			}
 		}
 	}
 }
diff --git a/client/network/src/block_request_handler.rs b/client/network/src/block_request_handler.rs
index c88be52ecf0d..1a6c09eff130 100644
--- a/client/network/src/block_request_handler.rs
+++ b/client/network/src/block_request_handler.rs
@@ -21,7 +21,7 @@ use codec::{Encode, Decode};
 use crate::chain::Client;
 use crate::config::ProtocolId;
 use crate::protocol::{message::BlockAttributes};
-use crate::request_responses::{IncomingRequest, ProtocolConfig};
+use crate::request_responses::{IncomingRequest, OutgoingResponse, ProtocolConfig};
 use crate::schema::v1::block_request::FromBlock;
 use crate::schema::v1::{BlockResponse, Direction};
 use futures::channel::{mpsc, oneshot};
@@ -85,7 +85,7 @@ impl <B: BlockT> BlockRequestHandler<B> {
 	fn handle_request(
 		&self,
 		payload: Vec<u8>,
-		pending_response: oneshot::Sender<Vec<u8>>
+		pending_response: oneshot::Sender<OutgoingResponse>
 	) -> Result<(), HandleRequestError> {
 		let request = crate::schema::v1::BlockRequest::decode(&payload[..])?;
 
@@ -181,8 +181,10 @@ impl <B: BlockT> BlockRequestHandler<B> {
 		let mut data = Vec::with_capacity(res.encoded_len());
 		res.encode(&mut data)?;
 
-		pending_response.send(data)
-			.map_err(|_| HandleRequestError::SendResponse)
+		pending_response.send(OutgoingResponse {
+			result: Ok(data),
+			reputation_changes: Vec::new(),
+		}).map_err(|_| HandleRequestError::SendResponse)
 	}
 
 	/// Run [`BlockRequestHandler`].
diff --git a/client/network/src/config.rs b/client/network/src/config.rs
index c0e2c66482b9..29d238c368a7 100644
--- a/client/network/src/config.rs
+++ b/client/network/src/config.rs
@@ -23,7 +23,11 @@
 
 pub use crate::chain::Client;
 pub use crate::on_demand_layer::{AlwaysBadChecker, OnDemand};
-pub use crate::request_responses::{IncomingRequest, ProtocolConfig as RequestResponseConfig};
+pub use crate::request_responses::{
+	IncomingRequest,
+	OutgoingResponse,
+	ProtocolConfig as RequestResponseConfig,
+};
 pub use libp2p::{identity, core::PublicKey, wasm_ext::ExtTransport, build_multiaddr};
 
 // Note: this re-export shouldn't be part of the public API of the crate and will be removed in
diff --git a/client/network/src/request_responses.rs b/client/network/src/request_responses.rs
index 575f483b0966..9170644c3f40 100644
--- a/client/network/src/request_responses.rs
+++ b/client/network/src/request_responses.rs
@@ -55,6 +55,7 @@ use std::{
 	pin::Pin, task::{Context, Poll}, time::Duration,
 };
 use wasm_timer::Instant;
+use crate::ReputationChange;
 
 pub use libp2p::request_response::{InboundFailure, OutboundFailure, RequestId};
 
@@ -114,8 +115,27 @@ pub struct IncomingRequest {
 	/// [`ProtocolConfig::max_request_size`].
 	pub payload: Vec<u8>,
 
-	/// Channel to send back the response to.
-	pub pending_response: oneshot::Sender<Vec<u8>>,
+	/// Channel to send back the response.
+	///
+	/// There are two ways to indicate that handling the request failed:
+	///
+	/// 1. Drop `pending_response` and thus not changing the reputation of the peer.
+	///
+	/// 2. Sending an `Err(())` via `pending_response`, optionally including reputation changes for
+	/// the given peer.
+	pub pending_response: oneshot::Sender<OutgoingResponse>,
+}
+
+/// Response for an incoming request to be send by a request protocol handler.
+#[derive(Debug)]
+pub struct OutgoingResponse {
+	/// The payload of the response.
+	///
+	/// `Err(())` if none is available e.g. due an error while handling the request.
+	pub result: Result<Vec<u8>, ()>,
+	/// Reputation changes accrued while handling the request. To be applied to the reputation of
+	/// the peer sending the request.
+	pub reputation_changes: Vec<ReputationChange>,
 }
 
 /// Event generated by the [`RequestResponsesBehaviour`].
@@ -150,6 +170,12 @@ pub enum Event {
 		/// Result of the request.
 		result: Result<(), RequestFailure>
 	},
+
+	/// A request protocol handler issued reputation changes for the given peer.
+	ReputationChanges {
+		peer: PeerId,
+		changes: Vec<ReputationChange>,
+	}
 }
 
 /// Combination of a protocol name and a request id.
@@ -198,10 +224,11 @@ pub struct RequestResponsesBehaviour {
 
 /// Generated by the response builder and waiting to be processed.
 struct RequestProcessingOutcome {
+	peer: PeerId,
 	request_id: RequestId,
 	protocol: Cow<'static, str>,
 	inner_channel: ResponseChannel<Result<Vec<u8>, ()>>,
-	response: Vec<u8>,
+	response: OutgoingResponse,
 }
 
 impl RequestResponsesBehaviour {
@@ -406,30 +433,45 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 			// Poll to see if any response is ready to be sent back.
 			while let Poll::Ready(Some(outcome)) = self.pending_responses.poll_next_unpin(cx) {
 				let RequestProcessingOutcome {
+					peer,
 					request_id,
 					protocol: protocol_name,
 					inner_channel,
-					response
+					response: OutgoingResponse {
+						result,
+						reputation_changes,
+					},
 				} = match outcome {
 					Some(outcome) => outcome,
-					// The response builder was too busy and thus the request was dropped. This is
+					// The response builder was too busy or handling the request failed. This is
 					// later on reported as a `InboundFailure::Omission`.
 					None => continue,
 				};
 
-				if let Some((protocol, _)) = self.protocols.get_mut(&*protocol_name) {
-					if let Err(_) = protocol.send_response(inner_channel, Ok(response)) {
-						// Note: Failure is handled further below when receiving `InboundFailure`
-						// event from `RequestResponse` behaviour.
-						log::debug!(
-							target: "sub-libp2p",
-							"Failed to send response for {:?} on protocol {:?} due to a \
-							 timeout or due to the connection to the peer being closed. \
-							 Dropping response",
-							request_id, protocol_name,
-						);
+				if let Ok(payload) = result {
+					if let Some((protocol, _)) = self.protocols.get_mut(&*protocol_name) {
+						if let Err(_) = protocol.send_response(inner_channel, Ok(payload)) {
+							// Note: Failure is handled further below when receiving
+							// `InboundFailure` event from `RequestResponse` behaviour.
+							log::debug!(
+								target: "sub-libp2p",
+								"Failed to send response for {:?} on protocol {:?} due to a \
+								 timeout or due to the connection to the peer being closed. \
+								 Dropping response",
+								request_id, protocol_name,
+							);
+						}
 					}
 				}
+
+				if !reputation_changes.is_empty() {
+					return Poll::Ready(NetworkBehaviourAction::GenerateEvent(
+						Event::ReputationChanges{
+							peer,
+							changes: reputation_changes,
+						},
+					));
+				}
 			}
 
 			// Poll request-responses protocols.
@@ -505,7 +547,7 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 								// `InboundFailure::Omission` event.
 								if let Ok(response) = rx.await {
 									Some(RequestProcessingOutcome {
-										request_id, protocol, inner_channel: channel, response
+										peer, request_id, protocol, inner_channel: channel, response
 									})
 								} else {
 									None
@@ -851,7 +893,10 @@ mod tests {
 				pool.spawner().spawn_obj(async move {
 					while let Some(rq) = rx.next().await {
 						assert_eq!(rq.payload, b"this is a request");
-						let _ = rq.pending_response.send(b"this is a response".to_vec());
+						let _ = rq.pending_response.send(super::OutgoingResponse {
+							result: Ok(b"this is a response".to_vec()),
+							reputation_changes: Vec::new(),
+						});
 					}
 				}.boxed().into()).unwrap();
 
@@ -934,7 +979,10 @@ mod tests {
 				pool.spawner().spawn_obj(async move {
 					while let Some(rq) = rx.next().await {
 						assert_eq!(rq.payload, b"this is a request");
-						let _ = rq.pending_response.send(b"this response exceeds the limit".to_vec());
+						let _ = rq.pending_response.send(super::OutgoingResponse {
+							result: Ok(b"this response exceeds the limit".to_vec()),
+							reputation_changes: Vec::new(),
+						});
 					}
 				}.boxed().into()).unwrap();
 
@@ -1100,11 +1148,17 @@ mod tests {
 
 			protocol_1_request.unwrap()
 				.pending_response
-				.send(b"this is a response".to_vec())
+				.send(OutgoingResponse {
+					result: Ok(b"this is a response".to_vec()),
+					reputation_changes: Vec::new(),
+				})
 				.unwrap();
 			protocol_2_request.unwrap()
 				.pending_response
-				.send(b"this is a response".to_vec())
+				.send(OutgoingResponse {
+					result: Ok(b"this is a response".to_vec()),
+					reputation_changes: Vec::new(),
+				})
 				.unwrap();
 		}.boxed().into()).unwrap();
 

From 4888ac68c8f451b5843ff17135a34ae0f137dabc Mon Sep 17 00:00:00 2001
From: Gerben van de Wiel <clshannon@protonmail.com>
Date: Tue, 26 Jan 2021 13:29:29 +0100
Subject: [PATCH 0321/1194] Migrate pallet-template to pallet attribute macro
 (#7981)

* Converting pallet-template to Framev2 macro's

* Add newline

* Convert all indents to tabs

* Update bin/node-template/pallets/template/src/lib.rs

* Update bin/node-template/pallets/template/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
---
 bin/node-template/pallets/template/src/lib.rs | 101 +++++++++---------
 1 file changed, 51 insertions(+), 50 deletions(-)

diff --git a/bin/node-template/pallets/template/src/lib.rs b/bin/node-template/pallets/template/src/lib.rs
index 7fdf75bb25b1..5bf76624c1f1 100644
--- a/bin/node-template/pallets/template/src/lib.rs
+++ b/bin/node-template/pallets/template/src/lib.rs
@@ -4,8 +4,7 @@
 /// Learn more about FRAME and the core library of Substrate FRAME pallets:
 /// https://substrate.dev/docs/en/knowledgebase/runtime/frame
 
-use frame_support::{decl_module, decl_storage, decl_event, decl_error, dispatch, traits::Get};
-use frame_system::ensure_signed;
+pub use pallet::*;
 
 #[cfg(test)]
 mod mock;
@@ -13,89 +12,91 @@ mod mock;
 #[cfg(test)]
 mod tests;
 
-/// Configure the pallet by specifying the parameters and types on which it depends.
-pub trait Config: frame_system::Config {
-	/// Because this pallet emits events, it depends on the runtime's definition of an event.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
-}
+#[frame_support::pallet]
+pub mod pallet {
+	use frame_support::{dispatch::DispatchResultWithPostInfo, pallet_prelude::*};
+	use frame_system::pallet_prelude::*;
 
-// The pallet's runtime storage items.
-// https://substrate.dev/docs/en/knowledgebase/runtime/storage
-decl_storage! {
-	// A unique name is used to ensure that the pallet's storage items are isolated.
-	// This name may be updated, but each pallet in the runtime must use a unique name.
-	// ---------------------------------vvvvvvvvvvvvvv
-	trait Store for Module<T: Config> as TemplateModule {
-		// Learn more about declaring storage items:
-		// https://substrate.dev/docs/en/knowledgebase/runtime/storage#declaring-storage-items
-		Something get(fn something): Option<u32>;
+	/// Configure the pallet by specifying the parameters and types on which it depends.
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		/// Because this pallet emits events, it depends on the runtime's definition of an event.
+		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
 	}
-}
 
-// Pallets use events to inform users when important changes are made.
-// https://substrate.dev/docs/en/knowledgebase/runtime/events
-decl_event! {
-	pub enum Event<T> where AccountId = <T as frame_system::Config>::AccountId {
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(PhantomData<T>);
+
+	// The pallet's runtime storage items.
+	// https://substrate.dev/docs/en/knowledgebase/runtime/storage
+	#[pallet::storage]
+	#[pallet::getter(fn something)]
+	// Learn more about declaring storage items:
+	// https://substrate.dev/docs/en/knowledgebase/runtime/storage#declaring-storage-items
+	pub type Something<T> = StorageValue<_, u32>;
+
+	// Pallets use events to inform users when important changes are made.
+	// https://substrate.dev/docs/en/knowledgebase/runtime/events
+	#[pallet::event]
+	#[pallet::metadata(T::AccountId = "AccountId")]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	pub enum Event<T: Config> {
 		/// Event documentation should end with an array that provides descriptive names for event
 		/// parameters. [something, who]
-		SomethingStored(u32, AccountId),
+		SomethingStored(u32, T::AccountId),
 	}
-}
-
-// Errors inform users that something went wrong.
-decl_error! {
-	pub enum Error for Module<T: Config> {
+	
+	// Errors inform users that something went wrong.
+	#[pallet::error]
+	pub enum Error<T> {
 		/// Error names should be descriptive.
 		NoneValue,
 		/// Errors should have helpful documentation associated with them.
 		StorageOverflow,
 	}
-}
-
-// Dispatchable functions allows users to interact with the pallet and invoke state changes.
-// These functions materialize as "extrinsics", which are often compared to transactions.
-// Dispatchable functions must be annotated with a weight and must return a DispatchResult.
-decl_module! {
-	pub struct Module<T: Config> for enum Call where origin: T::Origin {
-		// Errors must be initialized if they are used by the pallet.
-		type Error = Error<T>;
 
-		// Events must be initialized if they are used by the pallet.
-		fn deposit_event() = default;
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
 
+	// Dispatchable functions allows users to interact with the pallet and invoke state changes.
+	// These functions materialize as "extrinsics", which are often compared to transactions.
+	// Dispatchable functions must be annotated with a weight and must return a DispatchResult.
+	#[pallet::call]
+	impl<T:Config> Pallet<T> {
 		/// An example dispatchable that takes a singles value as a parameter, writes the value to
 		/// storage and emits an event. This function must be dispatched by a signed extrinsic.
-		#[weight = 10_000 + T::DbWeight::get().writes(1)]
-		pub fn do_something(origin, something: u32) -> dispatch::DispatchResult {
+		#[pallet::weight(10_000 + T::DbWeight::get().writes(1))]
+		pub fn do_something(origin: OriginFor<T>, something: u32) -> DispatchResultWithPostInfo {
 			// Check that the extrinsic was signed and get the signer.
 			// This function will return an error if the extrinsic is not signed.
 			// https://substrate.dev/docs/en/knowledgebase/runtime/origin
 			let who = ensure_signed(origin)?;
 
 			// Update storage.
-			Something::put(something);
+			<Something<T>>::put(something);
 
 			// Emit an event.
-			Self::deposit_event(RawEvent::SomethingStored(something, who));
-			// Return a successful DispatchResult
-			Ok(())
+			Self::deposit_event(Event::SomethingStored(something, who));
+			// Return a successful DispatchResultWithPostInfo
+			Ok(().into())
 		}
 
 		/// An example dispatchable that may throw a custom error.
-		#[weight = 10_000 + T::DbWeight::get().reads_writes(1,1)]
-		pub fn cause_error(origin) -> dispatch::DispatchResult {
+		#[pallet::weight(10_000 + T::DbWeight::get().reads_writes(1,1))]
+		pub fn cause_error(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
 			let _who = ensure_signed(origin)?;
 
 			// Read a value from storage.
-			match Something::get() {
+			match <Something<T>>::get() {
 				// Return an error if the value has not been set.
 				None => Err(Error::<T>::NoneValue)?,
 				Some(old) => {
 					// Increment the value read from storage; will error in the event of overflow.
 					let new = old.checked_add(1).ok_or(Error::<T>::StorageOverflow)?;
 					// Update the value in storage with the incremented result.
-					Something::put(new);
-					Ok(())
+					<Something<T>>::put(new);
+					Ok(().into())
 				},
 			}
 		}

From bc3075c97b588019755c8d79ffff7b31c8bb8123 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Tue, 26 Jan 2021 15:05:56 +0100
Subject: [PATCH 0322/1194] Fix Network trait implementation not doing what
 it's supposed to do (#7985)

---
 client/network-gossip/src/lib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/network-gossip/src/lib.rs b/client/network-gossip/src/lib.rs
index 7205533c81b2..f8b6e8f0c2fd 100644
--- a/client/network-gossip/src/lib.rs
+++ b/client/network-gossip/src/lib.rs
@@ -113,7 +113,7 @@ impl<B: BlockT, H: ExHashT> Network<B> for Arc<NetworkService<B, H>> {
 	fn add_set_reserved(&self, who: PeerId, protocol: Cow<'static, str>) {
 		let addr = iter::once(multiaddr::Protocol::P2p(who.into()))
 			.collect::<multiaddr::Multiaddr>();
-		let result = NetworkService::add_to_peers_set(self, protocol, iter::once(addr).collect());
+		let result = NetworkService::add_peers_to_reserved_set(self, protocol, iter::once(addr).collect());
 		if let Err(err) = result {
 			log::error!(target: "gossip", "add_set_reserved failed: {}", err);
 		}
@@ -122,7 +122,7 @@ impl<B: BlockT, H: ExHashT> Network<B> for Arc<NetworkService<B, H>> {
 	fn remove_set_reserved(&self, who: PeerId, protocol: Cow<'static, str>) {
 		let addr = iter::once(multiaddr::Protocol::P2p(who.into()))
 			.collect::<multiaddr::Multiaddr>();
-		let result = NetworkService::remove_from_peers_set(self, protocol, iter::once(addr).collect());
+		let result = NetworkService::remove_peers_from_reserved_set(self, protocol, iter::once(addr).collect());
 		if let Err(err) = result {
 			log::error!(target: "gossip", "remove_set_reserved failed: {}", err);
 		}

From 46c510f4bde0eb4178d84adf45dc8568eb79c25d Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Tue, 26 Jan 2021 15:25:04 +0100
Subject: [PATCH 0323/1194] Make pallet use construct_runtime in tests instead
 of impl_* (#7986)

---
 Cargo.lock                                  |  1 +
 frame/randomness-collective-flip/Cargo.toml |  1 +
 frame/randomness-collective-flip/src/lib.rs | 35 ++++++-----
 frame/recovery/src/mock.rs                  | 49 ++++++---------
 frame/scheduler/src/lib.rs                  | 47 ++++++---------
 frame/scored-pool/src/mock.rs               | 37 +++++++-----
 frame/session/src/mock.rs                   | 51 +++++++++++-----
 frame/society/src/mock.rs                   | 36 ++++++-----
 frame/staking/src/mock.rs                   | 67 ++++++++-------------
 frame/staking/src/tests.rs                  | 11 ++--
 frame/sudo/src/mock.rs                      | 60 ++++++------------
 frame/sudo/src/tests.rs                     |  3 +-
 frame/timestamp/src/lib.rs                  | 28 ++++++---
 frame/tips/src/tests.rs                     | 48 ++++++---------
 frame/transaction-payment/src/lib.rs        | 43 ++++++-------
 frame/treasury/src/tests.rs                 | 47 ++++++---------
 frame/utility/src/tests.rs                  | 61 ++++++++-----------
 frame/vesting/src/lib.rs                    | 40 ++++++------
 18 files changed, 309 insertions(+), 356 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9d29777fd5bc..c938978802df 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4860,6 +4860,7 @@ dependencies = [
  "frame-system",
  "parity-scale-codec",
  "safe-mix",
+ "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
diff --git a/frame/randomness-collective-flip/Cargo.toml b/frame/randomness-collective-flip/Cargo.toml
index 0f6b48ff0757..9d2683a8a8f8 100644
--- a/frame/randomness-collective-flip/Cargo.toml
+++ b/frame/randomness-collective-flip/Cargo.toml
@@ -23,6 +23,7 @@ sp-std = { version = "2.0.0", default-features = false, path = "../../primitives
 [dev-dependencies]
 sp-core = { version = "2.0.0", path = "../../primitives/core" }
 sp-io = { version = "2.0.0", path = "../../primitives/io" }
+serde = { version = "1.0.101" }
 
 [features]
 default = ["std"]
diff --git a/frame/randomness-collective-flip/src/lib.rs b/frame/randomness-collective-flip/src/lib.rs
index b3eb64db9a0c..0dba6727da60 100644
--- a/frame/randomness-collective-flip/src/lib.rs
+++ b/frame/randomness-collective-flip/src/lib.rs
@@ -132,6 +132,7 @@ impl<T: Config> Randomness<T::Hash> for Module<T> {
 
 #[cfg(test)]
 mod tests {
+	use crate as pallet_randomness_collective_flip;
 	use super::*;
 	use sp_core::H256;
 	use sp_runtime::{
@@ -139,16 +140,21 @@ mod tests {
 		traits::{BlakeTwo256, Header as _, IdentityLookup},
 	};
 	use frame_system::limits;
-	use frame_support::{
-		impl_outer_origin, parameter_types, traits::{Randomness, OnInitialize},
-	};
-
-	#[derive(Clone, PartialEq, Eq)]
-	pub struct Test;
-
-	impl_outer_origin! {
-		pub enum Origin for Test where system = frame_system {}
-	}
+	use frame_support::{parameter_types, traits::{Randomness, OnInitialize}};
+
+	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+	type Block = frame_system::mocking::MockBlock<Test>;
+
+	frame_support::construct_runtime!(
+		pub enum Test where
+			Block = Block,
+			NodeBlock = Block,
+			UncheckedExtrinsic = UncheckedExtrinsic,
+		{
+			System: frame_system::{Module, Call, Config, Storage, Event<T>},
+			CollectiveFlip: pallet_randomness_collective_flip::{Module, Call, Storage},
+		}
+	);
 
 	parameter_types! {
 		pub const BlockHashCount: u64 = 250;
@@ -166,16 +172,16 @@ mod tests {
 		type Origin = Origin;
 		type Index = u64;
 		type BlockNumber = u64;
-		type Call = ();
+		type Call = Call;
 		type Hash = H256;
 		type Hashing = BlakeTwo256;
 		type AccountId = u64;
 		type Lookup = IdentityLookup<Self::AccountId>;
 		type Header = Header;
-		type Event = ();
+		type Event = Event;
 		type BlockHashCount = BlockHashCount;
 		type Version = ();
-		type PalletInfo = ();
+		type PalletInfo = PalletInfo;
 		type AccountData = ();
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
@@ -183,9 +189,6 @@ mod tests {
 		type SS58Prefix = ();
 	}
 
-	type System = frame_system::Module<Test>;
-	type CollectiveFlip = Module<Test>;
-
 	fn new_test_ext() -> sp_io::TestExternalities {
 		let t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
 		t.into()
diff --git a/frame/recovery/src/mock.rs b/frame/recovery/src/mock.rs
index 38b5d58ddda5..ee38b0e24cc6 100644
--- a/frame/recovery/src/mock.rs
+++ b/frame/recovery/src/mock.rs
@@ -19,36 +19,27 @@
 
 use super::*;
 
-use frame_support::{
-	impl_outer_origin, impl_outer_dispatch, impl_outer_event, parameter_types,
-	traits::{OnInitialize, OnFinalize},
-};
+use frame_support::{parameter_types, traits::{OnInitialize, OnFinalize}};
 use sp_core::H256;
 use sp_runtime::{
 	traits::{BlakeTwo256, IdentityLookup}, testing::Header,
 };
 use crate as recovery;
 
-impl_outer_origin! {
-	pub enum Origin for Test where system = frame_system {}
-}
-
-impl_outer_event! {
-	pub enum TestEvent for Test {
-		system<T>,
-		pallet_balances<T>,
-		recovery<T>,
-	}
-}
-impl_outer_dispatch! {
-	pub enum Call for Test where origin: Origin {
-		pallet_balances::Balances,
-		recovery::Recovery,
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
+		Recovery: recovery::{Module, Call, Storage, Event<T>},
 	}
-}
-
-#[derive(Clone, Eq, PartialEq)]
-pub struct Test;
+);
 
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
@@ -70,10 +61,10 @@ impl frame_system::Config for Test {
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type Header = Header;
-	type Event = TestEvent;
+	type Event = Event;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<u128>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -89,7 +80,7 @@ impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u128;
 	type DustRemoval = ();
-	type Event = TestEvent;
+	type Event = Event;
 	type ExistentialDeposit = ExistentialDeposit;
 	type AccountStore = System;
 	type WeightInfo = ();
@@ -103,7 +94,7 @@ parameter_types! {
 }
 
 impl Config for Test {
-	type Event = TestEvent;
+	type Event = Event;
 	type Call = Call;
 	type Currency = Balances;
 	type ConfigDepositBase = ConfigDepositBase;
@@ -112,10 +103,6 @@ impl Config for Test {
 	type RecoveryDeposit = RecoveryDeposit;
 }
 
-pub type Recovery = Module<Test>;
-pub type System = frame_system::Module<Test>;
-pub type Balances = pallet_balances::Module<Test>;
-
 pub type BalancesCall = pallet_balances::Call<Test>;
 pub type RecoveryCall = super::Call<Test>;
 
diff --git a/frame/scheduler/src/lib.rs b/frame/scheduler/src/lib.rs
index 9ea6c7603712..a869fae27d8b 100644
--- a/frame/scheduler/src/lib.rs
+++ b/frame/scheduler/src/lib.rs
@@ -721,7 +721,7 @@ mod tests {
 	use super::*;
 
 	use frame_support::{
-		impl_outer_event, impl_outer_origin, impl_outer_dispatch, parameter_types, assert_ok, ord_parameter_types,
+		parameter_types, assert_ok, ord_parameter_types,
 		assert_noop, assert_err, Hashable,
 		traits::{OnInitialize, OnFinalize, Filter},
 		weights::constants::RocksDbWeight,
@@ -781,24 +781,20 @@ mod tests {
 		}
 	}
 
-	impl_outer_origin! {
-		pub enum Origin for Test where system = frame_system {}
-	}
-
-	impl_outer_dispatch! {
-		pub enum Call for Test where origin: Origin {
-			system::System,
-			logger::Logger,
-		}
-	}
-
-	impl_outer_event! {
-		pub enum Event for Test {
-			system<T>,
-			logger,
-			scheduler<T>,
+	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+	type Block = frame_system::mocking::MockBlock<Test>;
+
+	frame_support::construct_runtime!(
+		pub enum Test where
+			Block = Block,
+			NodeBlock = Block,
+			UncheckedExtrinsic = UncheckedExtrinsic,
+		{
+			System: frame_system::{Module, Call, Config, Storage, Event<T>},
+			Logger: logger::{Module, Call, Event},
+			Scheduler: scheduler::{Module, Call, Storage, Event<T>},
 		}
-	}
+	);
 
 	// Scheduler must dispatch with root and no filter, this tests base filter is indeed not used.
 	pub struct BaseFilter;
@@ -808,8 +804,6 @@ mod tests {
 		}
 	}
 
-	#[derive(Clone, Eq, PartialEq)]
-	pub struct Test;
 	parameter_types! {
 		pub const BlockHashCount: u64 = 250;
 		pub BlockWeights: frame_system::limits::BlockWeights =
@@ -829,18 +823,18 @@ mod tests {
 		type AccountId = u64;
 		type Lookup = IdentityLookup<Self::AccountId>;
 		type Header = Header;
-		type Event = ();
+		type Event = Event;
 		type BlockHashCount = BlockHashCount;
 		type Version = ();
-		type PalletInfo = ();
+		type PalletInfo = PalletInfo;
 		type AccountData = ();
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
-	type SS58Prefix = ();
+		type SS58Prefix = ();
 	}
 	impl logger::Config for Test {
-		type Event = ();
+		type Event = Event;
 	}
 	parameter_types! {
 		pub MaximumSchedulerWeight: Weight = Perbill::from_percent(80) * BlockWeights::get().max_block;
@@ -851,7 +845,7 @@ mod tests {
 	}
 
 	impl Config for Test {
-		type Event = ();
+		type Event = Event;
 		type Origin = Origin;
 		type PalletsOrigin = OriginCaller;
 		type Call = Call;
@@ -860,9 +854,6 @@ mod tests {
 		type MaxScheduledPerBlock = MaxScheduledPerBlock;
 		type WeightInfo = ();
 	}
-	type System = system::Module<Test>;
-	type Logger = logger::Module<Test>;
-	type Scheduler = Module<Test>;
 
 	pub fn new_test_ext() -> sp_io::TestExternalities {
 		let t = system::GenesisConfig::default().build_storage::<Test>().unwrap();
diff --git a/frame/scored-pool/src/mock.rs b/frame/scored-pool/src/mock.rs
index e3707806e819..3c4263b813e4 100644
--- a/frame/scored-pool/src/mock.rs
+++ b/frame/scored-pool/src/mock.rs
@@ -18,21 +18,31 @@
 //! Test utilities
 
 use super::*;
+use crate as pallet_scored_pool;
 
 use std::cell::RefCell;
-use frame_support::{impl_outer_origin, parameter_types, ord_parameter_types};
+use frame_support::{parameter_types, ord_parameter_types};
 use sp_core::H256;
 use sp_runtime::{
 	traits::{BlakeTwo256, IdentityLookup}, testing::Header,
 };
 use frame_system::EnsureSignedBy;
 
-impl_outer_origin! {
-	pub enum Origin for Test where system = frame_system {}
-}
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
+		ScoredPool: pallet_scored_pool::{Module, Call, Storage, Config<T>, Event<T>},
+	}
+);
 
-#[derive(Clone, Eq, PartialEq)]
-pub struct Test;
 parameter_types! {
 	pub const CandidateDeposit: u64 = 25;
 	pub const Period: u64 = 4;
@@ -55,15 +65,15 @@ impl frame_system::Config for Test {
 	type Index = u64;
 	type BlockNumber = u64;
 	type Hash = H256;
-	type Call = ();
+	type Call = Call;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type Header = Header;
-	type Event = ();
+	type Event = Event;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -74,7 +84,7 @@ impl frame_system::Config for Test {
 impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u64;
-	type Event = ();
+	type Event = Event;
 	type DustRemoval = ();
 	type ExistentialDeposit = ExistentialDeposit;
 	type AccountStore = System;
@@ -109,7 +119,7 @@ impl InitializeMembers<u64> for TestChangeMembers {
 }
 
 impl Config for Test {
-	type Event = ();
+	type Event = Event;
 	type KickOrigin = EnsureSignedBy<KickOrigin, u64>;
 	type MembershipInitialized = TestChangeMembers;
 	type MembershipChanged = TestChangeMembers;
@@ -120,9 +130,6 @@ impl Config for Test {
 	type ScoreOrigin = EnsureSignedBy<ScoreOrigin, u64>;
 }
 
-type System = frame_system::Module<Test>;
-type Balances = pallet_balances::Module<Test>;
-
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
 	pallet_balances::GenesisConfig::<Test> {
@@ -136,7 +143,7 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 			(99, 1),
 		],
 	}.assimilate_storage(&mut t).unwrap();
-	GenesisConfig::<Test>{
+	pallet_scored_pool::GenesisConfig::<Test>{
 		pool: vec![
 			(5, None),
 			(10, Some(1)),
diff --git a/frame/session/src/mock.rs b/frame/session/src/mock.rs
index 2923530daf41..73499bf739b8 100644
--- a/frame/session/src/mock.rs
+++ b/frame/session/src/mock.rs
@@ -19,7 +19,7 @@
 
 use super::*;
 use std::cell::RefCell;
-use frame_support::{impl_outer_origin, parameter_types, BasicExternalities};
+use frame_support::{parameter_types, BasicExternalities};
 use sp_core::{crypto::key_types::DUMMY, H256};
 use sp_runtime::{
 	Perbill, impl_opaque_keys,
@@ -27,6 +27,9 @@ use sp_runtime::{
 	testing::{Header, UintAuthorityId},
 };
 use sp_staking::SessionIndex;
+use crate as pallet_session;
+#[cfg(feature = "historical")]
+use crate::historical as pallet_session_historical;
 
 impl_opaque_keys! {
 	pub struct MockSessionKeys {
@@ -65,9 +68,33 @@ impl OpaqueKeys for PreUpgradeMockSessionKeys {
 	}
 }
 
-impl_outer_origin! {
-	pub enum Origin for Test where system = frame_system {}
-}
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+#[cfg(feature = "historical")]
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Session: pallet_session::{Module, Call, Storage, Event, Config<T>},
+		Historical: pallet_session_historical::{Module},
+	}
+);
+
+#[cfg(not(feature = "historical"))]
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Session: pallet_session::{Module, Call, Storage, Event, Config<T>},
+	}
+);
 
 thread_local! {
 	pub static VALIDATORS: RefCell<Vec<u64>> = RefCell::new(vec![1, 2, 3]);
@@ -189,13 +216,10 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 		// An additional identity that we use.
 		frame_system::Module::<Test>::inc_providers(&69);
 	});
-	GenesisConfig::<Test> { keys }.assimilate_storage(&mut t).unwrap();
+	pallet_session::GenesisConfig::<Test> { keys }.assimilate_storage(&mut t).unwrap();
 	sp_io::TestExternalities::new(t)
 }
 
-#[derive(Clone, Eq, PartialEq)]
-pub struct Test;
-
 parameter_types! {
 	pub const MinimumPeriod: u64 = 5;
 	pub const BlockHashCount: u64 = 250;
@@ -211,16 +235,16 @@ impl frame_system::Config for Test {
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u64;
-	type Call = ();
+	type Call = Call;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type Header = Header;
-	type Event = ();
+	type Event = Event;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -249,7 +273,7 @@ impl Config for Test {
 	type ValidatorId = u64;
 	type ValidatorIdOf = ConvertInto;
 	type Keys = MockSessionKeys;
-	type Event = ();
+	type Event = Event;
 	type DisabledValidatorsThreshold = DisabledValidatorsThreshold;
 	type NextSessionRotation = ();
 	type WeightInfo = ();
@@ -260,6 +284,3 @@ impl crate::historical::Config for Test {
 	type FullIdentification = u64;
 	type FullIdentificationOf = sp_runtime::traits::ConvertInto;
 }
-
-pub type System = frame_system::Module<Test>;
-pub type Session = Module<Test>;
diff --git a/frame/society/src/mock.rs b/frame/society/src/mock.rs
index b7735994ec92..8c39a0bc3ea5 100644
--- a/frame/society/src/mock.rs
+++ b/frame/society/src/mock.rs
@@ -18,9 +18,10 @@
 //! Test utilities
 
 use super::*;
+use crate as pallet_society;
 
 use frame_support::{
-	impl_outer_origin, parameter_types, ord_parameter_types,
+	parameter_types, ord_parameter_types,
 	traits::{OnInitialize, OnFinalize, TestRandomness},
 };
 use sp_core::H256;
@@ -30,12 +31,21 @@ use sp_runtime::{
 };
 use frame_system::EnsureSignedBy;
 
-impl_outer_origin! {
-	pub enum Origin for Test {}
-}
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
+		Society: pallet_society::{Module, Call, Storage, Event<T>, Config<T>},
+	}
+);
 
-#[derive(Clone, Eq, PartialEq)]
-pub struct Test;
 parameter_types! {
 	pub const CandidateDeposit: u64 = 25;
 	pub const WrongSideDeduction: u64 = 2;
@@ -65,12 +75,12 @@ impl frame_system::Config for Test {
 	type Index = u64;
 	type BlockNumber = u64;
 	type Hash = H256;
-	type Call = ();
+	type Call = Call;
 	type Hashing = BlakeTwo256;
 	type AccountId = u128;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type Header = Header;
-	type Event = ();
+	type Event = Event;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
 	type PalletInfo = ();
@@ -84,7 +94,7 @@ impl frame_system::Config for Test {
 impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u64;
-	type Event = ();
+	type Event = Event;
 	type DustRemoval = ();
 	type ExistentialDeposit = ExistentialDeposit;
 	type AccountStore = System;
@@ -92,7 +102,7 @@ impl pallet_balances::Config for Test {
 }
 
 impl Config for Test {
-	type Event = ();
+	type Event = Event;
 	type Currency = pallet_balances::Module<Self>;
 	type Randomness = TestRandomness;
 	type CandidateDeposit = CandidateDeposit;
@@ -108,10 +118,6 @@ impl Config for Test {
 	type ModuleId = SocietyModuleId;
 }
 
-pub type Society = Module<Test>;
-pub type System = frame_system::Module<Test>;
-pub type Balances = pallet_balances::Module<Test>;
-
 pub struct EnvBuilder {
 	members: Vec<u128>,
 	balance: u64,
@@ -147,7 +153,7 @@ impl EnvBuilder {
 		pallet_balances::GenesisConfig::<Test> {
 			balances: self.balances,
 		}.assimilate_storage(&mut t).unwrap();
-		GenesisConfig::<Test>{
+		pallet_society::GenesisConfig::<Test>{
 			members: self.members,
 			pot: self.pot,
 			max_members: self.max_members,
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index cf1486a9b691..5c3261414d2b 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -18,8 +18,9 @@
 //! Test utilities
 
 use crate::*;
+use crate as staking;
 use frame_support::{
-	assert_ok, impl_outer_dispatch, impl_outer_event, impl_outer_origin, parameter_types,
+	assert_ok, parameter_types,
 	traits::{Currency, FindAuthor, Get, OnFinalize, OnInitialize},
 	weights::{constants::RocksDbWeight, Weight},
 	IterableStorageMap, StorageDoubleMap, StorageMap, StorageValue,
@@ -87,32 +88,22 @@ pub fn is_disabled(controller: AccountId) -> bool {
 	SESSION.with(|d| d.borrow().1.contains(&stash))
 }
 
-impl_outer_origin! {
-	pub enum Origin for Test where system = frame_system {}
-}
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
 
-impl_outer_dispatch! {
-	pub enum Call for Test where origin: Origin {
-		staking::Staking,
-	}
-}
-
-mod staking {
-	// Re-export needed for `impl_outer_event!`.
-	pub use super::super::*;
-}
-use frame_system as system;
-use pallet_balances as balances;
-use pallet_session as session;
-
-impl_outer_event! {
-	pub enum MetaEvent for Test {
-		system<T>,
-		balances<T>,
-		session,
-		staking<T>,
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent},
+		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
+		Staking: staking::{Module, Call, Config<T>, Storage, Event<T>, ValidateUnsigned},
+		Session: pallet_session::{Module, Call, Storage, Event, Config<T>},
 	}
-}
+);
 
 /// Author of block is always 11
 pub struct Author11;
@@ -124,10 +115,6 @@ impl FindAuthor<AccountId> for Author11 {
 	}
 }
 
-// Workaround for https://github.com/rust-lang/rust/issues/26925 . Remove when sorted.
-#[derive(Clone, Eq, PartialEq, Debug)]
-pub struct Test;
-
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 	pub BlockWeights: frame_system::limits::BlockWeights =
@@ -158,10 +145,10 @@ impl frame_system::Config for Test {
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type Header = Header;
-	type Event = MetaEvent;
+	type Event = Event;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -171,7 +158,7 @@ impl frame_system::Config for Test {
 impl pallet_balances::Config for Test {
 	type MaxLocks = MaxLocks;
 	type Balance = Balance;
-	type Event = MetaEvent;
+	type Event = Event;
 	type DustRemoval = ();
 	type ExistentialDeposit = ExistentialDeposit;
 	type AccountStore = System;
@@ -191,7 +178,7 @@ impl pallet_session::Config for Test {
 	type Keys = SessionKeys;
 	type ShouldEndSession = pallet_session::PeriodicSessions<Period, Offset>;
 	type SessionHandler = (OtherSessionHandler,);
-	type Event = MetaEvent;
+	type Event = Event;
 	type ValidatorId = AccountId;
 	type ValidatorIdOf = crate::StashOf<Test>;
 	type DisabledValidatorsThreshold = DisabledValidatorsThreshold;
@@ -257,7 +244,7 @@ impl Config for Test {
 	type UnixTime = Timestamp;
 	type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote;
 	type RewardRemainder = RewardRemainderMock;
-	type Event = MetaEvent;
+	type Event = Event;
 	type Slash = ();
 	type Reward = ();
 	type SessionsPerEra = SessionsPerEra;
@@ -450,7 +437,7 @@ impl ExtBuilder {
 				(101, 100, balance_factor * 500, StakerStatus::<AccountId>::Nominator(nominated))
 			];
 		}
-		let _ = GenesisConfig::<Test>{
+		let _ = staking::GenesisConfig::<Test>{
 			stakers: stakers,
 			validator_count: self.validator_count,
 			minimum_validator_count: self.minimum_validator_count,
@@ -495,12 +482,6 @@ impl ExtBuilder {
 	}
 }
 
-pub type System = frame_system::Module<Test>;
-pub type Balances = pallet_balances::Module<Test>;
-pub type Session = pallet_session::Module<Test>;
-pub type Timestamp = pallet_timestamp::Module<Test>;
-pub type Staking = Module<Test>;
-
 fn post_conditions() {
 	check_nominators();
 	check_exposures();
@@ -1016,9 +997,9 @@ macro_rules! assert_session_era {
 	};
 }
 
-pub(crate) fn staking_events() -> Vec<Event<Test>> {
+pub(crate) fn staking_events() -> Vec<staking::Event<Test>> {
 	System::events().into_iter().map(|r| r.event).filter_map(|e| {
-		if let MetaEvent::staking(inner) = e {
+		if let Event::staking(inner) = e {
 			Some(inner)
 		} else {
 			None
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index a10c95d0f24d..1f5e2a48888a 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -3181,7 +3181,7 @@ mod offchain_election {
 					.into_iter()
 					.map(|r| r.event)
 					.filter_map(|e| {
-						if let MetaEvent::staking(inner) = e {
+						if let mock::Event::staking(inner) = e {
 							Some(inner)
 						} else {
 							None
@@ -3266,7 +3266,7 @@ mod offchain_election {
 						.into_iter()
 						.map(|r| r.event)
 						.filter_map(|e| {
-							if let MetaEvent::staking(inner) = e {
+							if let mock::Event::staking(inner) = e {
 								Some(inner)
 							} else {
 								None
@@ -3285,7 +3285,7 @@ mod offchain_election {
 						.into_iter()
 						.map(|r| r.event)
 						.filter_map(|e| {
-							if let MetaEvent::staking(inner) = e {
+							if let mock::Event::staking(inner) = e {
 								Some(inner)
 							} else {
 								None
@@ -3322,7 +3322,7 @@ mod offchain_election {
 						.into_iter()
 						.map(|r| r.event)
 						.filter_map(|e| {
-							if let MetaEvent::staking(inner) = e {
+							if let mock::Event::staking(inner) = e {
 								Some(inner)
 							} else {
 								None
@@ -3458,6 +3458,7 @@ mod offchain_election {
 			let call = extrinsic.call;
 			let inner = match call {
 				mock::Call::Staking(inner) => inner,
+				_ => unreachable!(),
 			};
 
 			assert_eq!(
@@ -3501,6 +3502,7 @@ mod offchain_election {
 			let call = extrinsic.call;
 			let inner = match call {
 				mock::Call::Staking(inner) => inner,
+				_ => unreachable!(),
 			};
 
 			assert_eq!(
@@ -3548,6 +3550,7 @@ mod offchain_election {
 			let call = extrinsic.call;
 			let inner = match call {
 				mock::Call::Staking(inner) => inner,
+				_ => unreachable!(),
 			};
 
 			// pass this call to ValidateUnsigned
diff --git a/frame/sudo/src/mock.rs b/frame/sudo/src/mock.rs
index 6cb418de1325..91cd03ac4756 100644
--- a/frame/sudo/src/mock.rs
+++ b/frame/sudo/src/mock.rs
@@ -18,10 +18,7 @@
 //! Test utilities
 
 use super::*;
-use frame_support::{
-	impl_outer_origin, impl_outer_dispatch, impl_outer_event, parameter_types,
-	weights::Weight,
-};
+use frame_support::{parameter_types, weights::Weight};
 use sp_core::H256;
 use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
 use sp_io;
@@ -76,34 +73,20 @@ pub mod logger {
 	}
 }
 
-impl_outer_origin! {
-	pub enum Origin for Test where system = frame_system {}
-}
-
-mod test_events {
-	pub use crate::Event;
-}
-
-impl_outer_event! {
-	pub enum TestEvent for Test {
-		frame_system<T>,
-		sudo<T>,
-		logger<T>,
-	}
-}
-
-impl_outer_dispatch! {
-	pub enum Call for Test where origin: Origin {
-		sudo::Sudo,
-		logger::Logger,
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Sudo: sudo::{Module, Call, Config<T>, Storage, Event<T>},
+		Logger: logger::{Module, Call, Storage, Event<T>},
 	}
-}
-
-// For testing the pallet, we construct most of a mock runtime. This means
-// first constructing a configuration type (`Test`) which `impl`s each of the
-// configuration traits of pallets we want to use.
-#[derive(Clone, Eq, PartialEq)]
-pub struct Test;
+);
 
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
@@ -131,10 +114,10 @@ impl frame_system::Config for Test {
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type Header = Header;
-	type Event = TestEvent;
+	type Event = Event;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -144,20 +127,15 @@ impl frame_system::Config for Test {
 
 // Implement the logger module's `Config` on the Test runtime.
 impl logger::Config for Test {
-	type Event = TestEvent;
+	type Event = Event;
 }
 
 // Implement the sudo module's `Config` on the Test runtime.
 impl Config for Test {
-	type Event = TestEvent;
+	type Event = Event;
 	type Call = Call;
 }
 
-// Assign back to type variables in order to make dispatched calls of these modules later.
-pub type Sudo = Module<Test>;
-pub type Logger = logger::Module<Test>;
-pub type System = frame_system::Module<Test>;
-
 // New types for dispatchable functions.
 pub type SudoCall = sudo::Call<Test>;
 pub type LoggerCall = logger::Call<Test>;
@@ -165,7 +143,7 @@ pub type LoggerCall = logger::Call<Test>;
 // Build test environment by setting the root `key` for the Genesis.
 pub fn new_test_ext(root_key: u64) -> sp_io::TestExternalities {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-	GenesisConfig::<Test>{
+	sudo::GenesisConfig::<Test>{
 		key: root_key,
 	}.assimilate_storage(&mut t).unwrap();
 	t.into()
diff --git a/frame/sudo/src/tests.rs b/frame/sudo/src/tests.rs
index 1aeb9b57b616..4d2552b7b88b 100644
--- a/frame/sudo/src/tests.rs
+++ b/frame/sudo/src/tests.rs
@@ -19,7 +19,8 @@
 
 use super::*;
 use mock::{
-	Sudo, SudoCall, Origin, Call, Test, new_test_ext, LoggerCall, Logger, System, TestEvent,
+	Sudo, SudoCall, Origin, Call, Test, new_test_ext, LoggerCall, Logger, System,
+	Event as TestEvent,
 };
 use frame_support::{assert_ok, assert_noop};
 
diff --git a/frame/timestamp/src/lib.rs b/frame/timestamp/src/lib.rs
index 44f88347c08d..ae7ba4814694 100644
--- a/frame/timestamp/src/lib.rs
+++ b/frame/timestamp/src/lib.rs
@@ -290,9 +290,10 @@ impl<T: Config> UnixTime for Module<T> {
 
 #[cfg(test)]
 mod tests {
+	use crate as pallet_timestamp;
 	use super::*;
 
-	use frame_support::{impl_outer_origin, assert_ok, parameter_types};
+	use frame_support::{assert_ok, parameter_types};
 	use sp_io::TestExternalities;
 	use sp_core::H256;
 	use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
@@ -302,12 +303,20 @@ mod tests {
 		TestExternalities::new(t)
 	}
 
-	impl_outer_origin! {
-		pub enum Origin for Test where system = frame_system {}
-	}
+	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+	type Block = frame_system::mocking::MockBlock<Test>;
+
+	frame_support::construct_runtime!(
+		pub enum Test where
+			Block = Block,
+			NodeBlock = Block,
+			UncheckedExtrinsic = UncheckedExtrinsic,
+		{
+			System: frame_system::{Module, Call, Config, Storage, Event<T>},
+			Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent},
+		}
+	);
 
-	#[derive(Clone, Eq, PartialEq)]
-	pub struct Test;
 	parameter_types! {
 		pub const BlockHashCount: u64 = 250;
 		pub BlockWeights: frame_system::limits::BlockWeights =
@@ -321,16 +330,16 @@ mod tests {
 		type Origin = Origin;
 		type Index = u64;
 		type BlockNumber = u64;
-		type Call = ();
+		type Call = Call;
 		type Hash = H256;
 		type Hashing = BlakeTwo256;
 		type AccountId = u64;
 		type Lookup = IdentityLookup<Self::AccountId>;
 		type Header = Header;
-		type Event = ();
+		type Event = Event;
 		type BlockHashCount = BlockHashCount;
 		type Version = ();
-		type PalletInfo = ();
+		type PalletInfo = PalletInfo;
 		type AccountData = ();
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
@@ -346,7 +355,6 @@ mod tests {
 		type MinimumPeriod = MinimumPeriod;
 		type WeightInfo = ();
 	}
-	type Timestamp = Module<Test>;
 
 	#[test]
 	fn timestamp_works() {
diff --git a/frame/tips/src/tests.rs b/frame/tips/src/tests.rs
index ae16117d6b17..413e2dd9437e 100644
--- a/frame/tips/src/tests.rs
+++ b/frame/tips/src/tests.rs
@@ -19,13 +19,11 @@
 
 #![cfg(test)]
 
+use crate as tips;
 use super::*;
 use std::cell::RefCell;
-use frame_support::{
-	assert_noop, assert_ok, impl_outer_origin, parameter_types, weights::Weight,
-	impl_outer_event, traits::{Contains}
-};
-use sp_runtime::{Permill};
+use frame_support::{assert_noop, assert_ok, parameter_types, weights::Weight, traits::Contains};
+use sp_runtime::Permill;
 use sp_core::H256;
 use sp_runtime::{
 	Perbill, ModuleId,
@@ -33,26 +31,22 @@ use sp_runtime::{
 	traits::{BlakeTwo256, IdentityLookup, BadOrigin},
 };
 
-impl_outer_origin! {
-	pub enum Origin for Test where system = frame_system {}
-}
-
-mod tips {
-	// Re-export needed for `impl_outer_event!`.
-	pub use crate::*;
-}
-
-impl_outer_event! {
-	pub enum Event for Test {
-		system<T>,
-		pallet_balances<T>,
-		pallet_treasury<T>,
-		tips<T>,
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
+		Treasury: pallet_treasury::{Module, Call, Storage, Config, Event<T>},
+		TipsModTestInst: tips::{Module, Call, Storage, Event<T>},
 	}
-}
+);
 
-#[derive(Clone, Eq, PartialEq)]
-pub struct Test;
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 	pub const MaximumBlockWeight: Weight = 1024;
@@ -67,7 +61,7 @@ impl frame_system::Config for Test {
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u64;
-	type Call = ();
+	type Call = Call;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u128; // u64 is not enough to hold bytes used to generate bounty account
@@ -76,7 +70,7 @@ impl frame_system::Config for Test {
 	type Event = Event;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -159,10 +153,6 @@ impl Config for Test {
 	type Event = Event;
 	type WeightInfo = ();
 }
-type System = frame_system::Module<Test>;
-type Balances = pallet_balances::Module<Test>;
-type Treasury = pallet_treasury::Module<Test>;
-type TipsModTestInst = Module<Test>;
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
index 7521fcd80bf0..5f907fb91b99 100644
--- a/frame/transaction-payment/src/lib.rs
+++ b/frame/transaction-payment/src/lib.rs
@@ -600,9 +600,11 @@ impl<T: Config> SignedExtension for ChargeTransactionPayment<T> where
 #[cfg(test)]
 mod tests {
 	use super::*;
+	use crate as pallet_transaction_payment;
+	use frame_system as system;
 	use codec::Encode;
 	use frame_support::{
-		impl_outer_dispatch, impl_outer_origin, impl_outer_event, parameter_types,
+		parameter_types,
 		weights::{
 			DispatchClass, DispatchInfo, PostDispatchInfo, GetDispatchInfo, Weight,
 			WeightToFeePolynomial, WeightToFeeCoefficients, WeightToFeeCoefficient,
@@ -619,30 +621,23 @@ mod tests {
 	use std::cell::RefCell;
 	use smallvec::smallvec;
 
-	const CALL: &<Runtime as frame_system::Config>::Call =
-		&Call::Balances(BalancesCall::transfer(2, 69));
-
-	impl_outer_dispatch! {
-		pub enum Call for Runtime where origin: Origin {
-			pallet_balances::Balances,
-			frame_system::System,
-		}
-	}
+	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
+	type Block = frame_system::mocking::MockBlock<Runtime>;
 
-	impl_outer_event! {
-		pub enum Event for Runtime {
-			system<T>,
-			pallet_balances<T>,
+	frame_support::construct_runtime!(
+		pub enum Runtime where
+			Block = Block,
+			NodeBlock = Block,
+			UncheckedExtrinsic = UncheckedExtrinsic,
+		{
+			System: system::{Module, Call, Config, Storage, Event<T>},
+			Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
+			TransactionPayment: pallet_transaction_payment::{Module, Storage},
 		}
-	}
-
-	#[derive(Clone, PartialEq, Eq, Debug)]
-	pub struct Runtime;
+	);
 
-	use frame_system as system;
-	impl_outer_origin!{
-		pub enum Origin for Runtime {}
-	}
+	const CALL: &<Runtime as frame_system::Config>::Call =
+		&Call::Balances(BalancesCall::transfer(2, 69));
 
 	thread_local! {
 		static EXTRINSIC_BASE_WEIGHT: RefCell<u64> = RefCell::new(0);
@@ -728,10 +723,6 @@ mod tests {
 		type FeeMultiplierUpdate = ();
 	}
 
-	type Balances = pallet_balances::Module<Runtime>;
-	type System = frame_system::Module<Runtime>;
-	type TransactionPayment = Module<Runtime>;
-
 	pub struct ExtBuilder {
 		balance_factor: u64,
 		base_weight: u64,
diff --git a/frame/treasury/src/tests.rs b/frame/treasury/src/tests.rs
index 177c39eec244..3c70099843ea 100644
--- a/frame/treasury/src/tests.rs
+++ b/frame/treasury/src/tests.rs
@@ -19,13 +19,13 @@
 
 #![cfg(test)]
 
+use crate as treasury;
 use super::*;
 use std::cell::RefCell;
 use frame_support::{
-	assert_noop, assert_ok, impl_outer_origin, impl_outer_event, parameter_types,
-	traits::{OnInitialize}
+	assert_noop, assert_ok, parameter_types,
+	traits::OnInitialize,
 };
-use frame_system::{self as system};
 
 use sp_core::H256;
 use sp_runtime::{
@@ -34,25 +34,21 @@ use sp_runtime::{
 	traits::{BlakeTwo256, IdentityLookup},
 };
 
-impl_outer_origin! {
-	pub enum Origin for Test where system = frame_system {}
-}
-
-mod treasury {
-	// Re-export needed for `impl_outer_event!`.
-	pub use super::super::*;
-}
-
-impl_outer_event! {
-	pub enum Event for Test {
-		system<T>,
-		pallet_balances<T>,
-		treasury<T>,
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
+		Treasury: treasury::{Module, Call, Storage, Config, Event<T>},
 	}
-}
+);
 
-#[derive(Clone, Eq, PartialEq)]
-pub struct Test;
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 	pub BlockWeights: frame_system::limits::BlockWeights =
@@ -66,7 +62,7 @@ impl frame_system::Config for Test {
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u64;
-	type Call = ();
+	type Call = Call;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u128; // u64 is not enough to hold bytes used to generate bounty account
@@ -75,7 +71,7 @@ impl frame_system::Config for Test {
 	type Event = Event;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -122,9 +118,6 @@ impl Config for Test {
 	type WeightInfo = ();
 	type SpendFunds = ();
 }
-type System = frame_system::Module<Test>;
-type Balances = pallet_balances::Module<Test>;
-type Treasury = Module<Test>;
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
@@ -132,7 +125,7 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 		// Total issuance will be 200 with treasury account initialized at ED.
 		balances: vec![(0, 100), (1, 98), (2, 1)],
 	}.assimilate_storage(&mut t).unwrap();
-	GenesisConfig::default().assimilate_storage::<Test, _>(&mut t).unwrap();
+	treasury::GenesisConfig::default().assimilate_storage::<Test, _>(&mut t).unwrap();
 	t.into()
 }
 
@@ -358,7 +351,7 @@ fn genesis_funding_works() {
 		// Total issuance will be 200 with treasury account initialized with 100.
 		balances: vec![(0, 100), (Treasury::account_id(), initial_funding)],
 	}.assimilate_storage(&mut t).unwrap();
-	GenesisConfig::default().assimilate_storage::<Test, _>(&mut t).unwrap();
+	treasury::GenesisConfig::default().assimilate_storage::<Test, _>(&mut t).unwrap();
 	let mut t: sp_io::TestExternalities = t.into();
 
 	t.execute_with(|| {
diff --git a/frame/utility/src/tests.rs b/frame/utility/src/tests.rs
index 556107529e1a..b14f958bd6f8 100644
--- a/frame/utility/src/tests.rs
+++ b/frame/utility/src/tests.rs
@@ -22,8 +22,7 @@
 use super::*;
 
 use frame_support::{
-	assert_ok, assert_noop, impl_outer_origin, parameter_types, impl_outer_dispatch, impl_outer_event,
-	assert_err_ignore_postinfo,
+	assert_ok, assert_noop, parameter_types, assert_err_ignore_postinfo,
 	weights::{Weight, Pays},
 	dispatch::{DispatchError, DispatchErrorWithPostInfo, Dispatchable},
 	traits::Filter,
@@ -67,30 +66,22 @@ pub mod example {
 	}
 }
 
-impl_outer_origin! {
-	pub enum Origin for Test where system = frame_system {}
-}
-impl_outer_event! {
-	pub enum TestEvent for Test {
-		frame_system<T>,
-		pallet_balances<T>,
-		utility,
-	}
-}
-impl_outer_dispatch! {
-	pub enum Call for Test where origin: Origin {
-		frame_system::System,
-		pallet_balances::Balances,
-		utility::Utility,
-		example::Example,
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
+		Utility: utility::{Module, Call, Event},
+		Example: example::{Module, Call},
 	}
-}
+);
 
-// For testing the pallet, we construct most of a mock runtime. This means
-// first constructing a configuration type (`Test`) which `impl`s each of the
-// configuration traits of pallets we want to use.
-#[derive(Clone, Eq, PartialEq)]
-pub struct Test;
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 	pub BlockWeights: frame_system::limits::BlockWeights =
@@ -110,7 +101,7 @@ impl frame_system::Config for Test {
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type Header = Header;
-	type Event = TestEvent;
+	type Event = Event;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
 	type PalletInfo = ();
@@ -127,7 +118,7 @@ impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u64;
 	type DustRemoval = ();
-	type Event = TestEvent;
+	type Event = Event;
 	type ExistentialDeposit = ExistentialDeposit;
 	type AccountStore = System;
 	type WeightInfo = ();
@@ -156,14 +147,10 @@ impl Filter<Call> for TestBaseCallFilter {
 	}
 }
 impl Config for Test {
-	type Event = TestEvent;
+	type Event = Event;
 	type Call = Call;
 	type WeightInfo = ();
 }
-type System = frame_system::Module<Test>;
-type Balances = pallet_balances::Module<Test>;
-type Example = example::Module<Test>;
-type Utility = Module<Test>;
 
 type ExampleCall = example::Call<Test>;
 type UtilityCall = crate::Call<Test>;
@@ -182,11 +169,11 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 	ext
 }
 
-fn last_event() -> TestEvent {
+fn last_event() -> Event {
 	frame_system::Module::<Test>::events().pop().map(|e| e.event).expect("Event expected")
 }
 
-fn expect_event<E: Into<TestEvent>>(e: E) {
+fn expect_event<E: Into<Event>>(e: E) {
 	assert_eq!(last_event(), e.into());
 }
 
@@ -324,7 +311,7 @@ fn batch_with_signed_filters() {
 				Call::Balances(pallet_balances::Call::transfer_keep_alive(2, 1))
 			]),
 		);
-		expect_event(Event::BatchInterrupted(0, DispatchError::BadOrigin));
+		expect_event(utility::Event::BatchInterrupted(0, DispatchError::BadOrigin));
 	});
 }
 
@@ -398,7 +385,7 @@ fn batch_handles_weight_refund() {
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(Origin::signed(1));
 		assert_ok!(result);
-		expect_event(Event::BatchInterrupted(1, DispatchError::Other("")));
+		expect_event(utility::Event::BatchInterrupted(1, DispatchError::Other("")));
 		// No weight is refunded
 		assert_eq!(extract_actual_weight(&result, &info), info.weight);
 
@@ -411,7 +398,7 @@ fn batch_handles_weight_refund() {
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(Origin::signed(1));
 		assert_ok!(result);
-		expect_event(Event::BatchInterrupted(1, DispatchError::Other("")));
+		expect_event(utility::Event::BatchInterrupted(1, DispatchError::Other("")));
 		assert_eq!(extract_actual_weight(&result, &info), info.weight - diff * batch_len);
 
 		// Partial batch completion
@@ -422,7 +409,7 @@ fn batch_handles_weight_refund() {
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(Origin::signed(1));
 		assert_ok!(result);
-		expect_event(Event::BatchInterrupted(1, DispatchError::Other("")));
+		expect_event(utility::Event::BatchInterrupted(1, DispatchError::Other("")));
 		assert_eq!(
 			extract_actual_weight(&result, &info),
 			// Real weight is 2 calls at end_weight
diff --git a/frame/vesting/src/lib.rs b/frame/vesting/src/lib.rs
index 5e20c863c51f..9cf9166b37c0 100644
--- a/frame/vesting/src/lib.rs
+++ b/frame/vesting/src/lib.rs
@@ -389,10 +389,9 @@ impl<T: Config> VestingSchedule<T::AccountId> for Module<T> where
 #[cfg(test)]
 mod tests {
 	use super::*;
+	use crate as pallet_vesting;
 
-	use frame_support::{
-		assert_ok, assert_noop, impl_outer_origin, parameter_types,
-	};
+	use frame_support::{assert_ok, assert_noop, parameter_types};
 	use sp_core::H256;
 	use sp_runtime::{
 		testing::Header,
@@ -400,12 +399,21 @@ mod tests {
 	};
 	use frame_system::RawOrigin;
 
-	impl_outer_origin! {
-		pub enum Origin for Test where system = frame_system {}
-	}
+	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+	type Block = frame_system::mocking::MockBlock<Test>;
+
+	frame_support::construct_runtime!(
+		pub enum Test where
+			Block = Block,
+			NodeBlock = Block,
+			UncheckedExtrinsic = UncheckedExtrinsic,
+		{
+			System: frame_system::{Module, Call, Config, Storage, Event<T>},
+			Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
+			Vesting: pallet_vesting::{Module, Call, Storage, Event<T>, Config<T>},
+		}
+	);
 
-	#[derive(Clone, Eq, PartialEq)]
-	pub struct Test;
 	parameter_types! {
 		pub const BlockHashCount: u64 = 250;
 		pub BlockWeights: frame_system::limits::BlockWeights =
@@ -420,15 +428,15 @@ mod tests {
 		type Index = u64;
 		type BlockNumber = u64;
 		type Hash = H256;
-		type Call = ();
+		type Call = Call;
 		type Hashing = BlakeTwo256;
 		type AccountId = u64;
 		type Lookup = IdentityLookup<Self::AccountId>;
 		type Header = Header;
-		type Event = ();
+		type Event = Event;
 		type BlockHashCount = BlockHashCount;
 		type Version = ();
-		type PalletInfo = ();
+		type PalletInfo = PalletInfo;
 		type AccountData = pallet_balances::AccountData<u64>;
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
@@ -441,7 +449,7 @@ mod tests {
 	impl pallet_balances::Config for Test {
 		type Balance = u64;
 		type DustRemoval = ();
-		type Event = ();
+		type Event = Event;
 		type ExistentialDeposit = ExistentialDeposit;
 		type AccountStore = System;
 		type MaxLocks = MaxLocks;
@@ -452,16 +460,12 @@ mod tests {
 		pub static ExistentialDeposit: u64 = 0;
 	}
 	impl Config for Test {
-		type Event = ();
+		type Event = Event;
 		type Currency = Balances;
 		type BlockNumberToBalance = Identity;
 		type MinVestedTransfer = MinVestedTransfer;
 		type WeightInfo = ();
 	}
-	type System = frame_system::Module<Test>;
-	type Balances = pallet_balances::Module<Test>;
-	type Vesting = Module<Test>;
-
 
 	pub struct ExtBuilder {
 		existential_deposit: u64,
@@ -490,7 +494,7 @@ mod tests {
 					(12, 10 * self.existential_deposit)
 				],
 			}.assimilate_storage(&mut t).unwrap();
-			GenesisConfig::<Test> {
+			pallet_vesting::GenesisConfig::<Test> {
 				vesting: vec![
 					(1, 0, 10, 5 * self.existential_deposit),
 					(2, 10, 20, 0),

From e82518b5b270aa694ad5ff2e551c980b7a76d1ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 26 Jan 2021 16:38:57 +0100
Subject: [PATCH 0324/1194] Rewrite the async code in `BasicQueue` (#7988)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Rewrite the async code in `BasicQueue`

This is some smaller change to rewrite the async code in `BasicQueue`. I
require this for some other pr I'm working on ;)

* Update primitives/consensus/common/src/import_queue/basic_queue.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Update primitives/consensus/common/src/import_queue/basic_queue.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Update primitives/consensus/common/src/import_queue/basic_queue.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Hmm :D

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
---
 .../common/src/import_queue/basic_queue.rs    | 262 +++++++++---------
 1 file changed, 125 insertions(+), 137 deletions(-)

diff --git a/primitives/consensus/common/src/import_queue/basic_queue.rs b/primitives/consensus/common/src/import_queue/basic_queue.rs
index 03c0661f92c8..541c1ff0f4ed 100644
--- a/primitives/consensus/common/src/import_queue/basic_queue.rs
+++ b/primitives/consensus/common/src/import_queue/basic_queue.rs
@@ -15,11 +15,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::{mem, pin::Pin, time::Duration, marker::PhantomData};
+use std::{pin::Pin, time::Duration, marker::PhantomData};
 use futures::{prelude::*, task::Context, task::Poll};
 use futures_timer::Delay;
 use sp_runtime::{Justification, traits::{Block as BlockT, Header as HeaderT, NumberFor}};
-use sp_utils::mpsc::{TracingUnboundedSender, tracing_unbounded};
+use sp_utils::mpsc::{TracingUnboundedSender, tracing_unbounded, TracingUnboundedReceiver};
 use prometheus_endpoint::Registry;
 
 use crate::{
@@ -146,16 +146,48 @@ mod worker_messages {
 	pub struct ImportJustification<B: BlockT>(pub Origin, pub B::Hash, pub NumberFor<B>, pub Justification);
 }
 
-struct BlockImportWorker<B: BlockT, Transaction> {
+/// The process of importing blocks.
+///
+/// This polls the `block_import_receiver` for new blocks to import and than awaits on importing these blocks.
+/// After each block is imported, this async function yields once to give other futures the possibility
+/// to be run.
+///
+/// Returns when `block_import` ended.
+async fn block_import_process<B: BlockT, Transaction: Send>(
+	mut block_import: BoxBlockImport<B, Transaction>,
+	mut verifier: impl Verifier<B>,
+	mut result_sender: BufferedLinkSender<B>,
+	mut block_import_receiver: TracingUnboundedReceiver<worker_messages::ImportBlocks<B>>,
+	metrics: Option<Metrics>,
+	delay_between_blocks: Duration,
+) {
+	loop {
+		let worker_messages::ImportBlocks(origin, blocks) = match block_import_receiver.next().await {
+			Some(blocks) => blocks,
+			None => return,
+		};
+
+		let res = import_many_blocks(
+			&mut block_import,
+			origin,
+			blocks,
+			&mut verifier,
+			delay_between_blocks,
+			metrics.clone(),
+		).await;
+
+		result_sender.blocks_processed(res.imported, res.block_count, res.results);
+	}
+}
+
+struct BlockImportWorker<B: BlockT> {
 	result_sender: BufferedLinkSender<B>,
 	justification_import: Option<BoxJustificationImport<B>>,
-	delay_between_blocks: Duration,
 	metrics: Option<Metrics>,
-	_phantom: PhantomData<Transaction>,
 }
 
-impl<B: BlockT, Transaction: Send> BlockImportWorker<B, Transaction> {
-	fn new<V: 'static + Verifier<B>>(
+impl<B: BlockT> BlockImportWorker<B> {
+	fn new<V: 'static + Verifier<B>, Transaction: Send>(
 		result_sender: BufferedLinkSender<B>,
 		verifier: V,
 		block_import: BoxBlockImport<B, Transaction>,
@@ -171,15 +203,13 @@ impl<B: BlockT, Transaction: Send> BlockImportWorker<B, Transaction> {
 		let (justification_sender, mut justification_port) =
 			tracing_unbounded("mpsc_import_queue_worker_justification");
 
-		let (block_import_sender, mut block_import_port) =
+		let (block_import_sender, block_import_port) =
 			tracing_unbounded("mpsc_import_queue_worker_blocks");
 
 		let mut worker = BlockImportWorker {
 			result_sender,
 			justification_import,
-			delay_between_blocks: Duration::new(0, 0),
 			metrics,
-			_phantom: PhantomData,
 		};
 
 		// Let's initialize `justification_import`
@@ -189,93 +219,47 @@ impl<B: BlockT, Transaction: Send> BlockImportWorker<B, Transaction> {
 			}
 		}
 
-		// The future below has two possible states:
-		//
-		// - Currently importing many blocks, in which case `importing` is `Some` and contains a
-		//   `Future`, and `block_import` is `None`.
-		// - Something else, in which case `block_import` is `Some` and `importing` is None.
-		//
-		// Additionally, the task will prioritize processing of justification import messages over
-		// block import messages, hence why two distinct channels are used.
-		let mut block_import_verifier = Some((block_import, verifier));
-		let mut importing = None;
-
-		let future = futures::future::poll_fn(move |cx| {
+		let delay_between_blocks = Duration::default();
+
+		let future = async move {
+			let block_import_process = block_import_process(
+				block_import,
+				verifier,
+				worker.result_sender.clone(),
+				block_import_port,
+				worker.metrics.clone(),
+				delay_between_blocks,
+			);
+			futures::pin_mut!(block_import_process);
+
 			loop {
 				// If the results sender is closed, that means that the import queue is shutting
 				// down and we should end this future.
 				if worker.result_sender.is_closed() {
-					return Poll::Ready(())
+					return;
 				}
 
-				// Grab the next justification import request sent to the import queue.
-				match Stream::poll_next(Pin::new(&mut justification_port), cx) {
-					Poll::Ready(Some(ImportJustification(who, hash, number, justification))) => {
-						worker.import_justification(who, hash, number, justification);
-						continue;
-					},
-					Poll::Ready(None) => return Poll::Ready(()),
-					Poll::Pending => {},
-				};
-
-				// If we are in the process of importing a bunch of blocks, let's resume this
-				// process before doing anything more.
-				if let Some(imp_fut) = importing.as_mut() {
-					match Future::poll(Pin::new(imp_fut), cx) {
-						Poll::Pending => return Poll::Pending,
-						Poll::Ready((bi, verif)) => {
-							block_import_verifier = Some((bi, verif));
-							importing = None;
-						},
+				// Make sure to first process all justifications
+				while let Poll::Ready(justification) = futures::poll!(justification_port.next()) {
+					match justification {
+						Some(ImportJustification(who, hash, number, justification)) =>
+							worker.import_justification(who, hash, number, justification),
+						None => return,
 					}
 				}
 
-				debug_assert!(importing.is_none());
-				debug_assert!(block_import_verifier.is_some());
-
-				// Grab the next block import request sent to the import queue.
-				let ImportBlocks(origin, blocks) =
-					match Stream::poll_next(Pin::new(&mut block_import_port), cx) {
-						Poll::Ready(Some(msg)) => msg,
-						Poll::Ready(None) => return Poll::Ready(()),
-						Poll::Pending => return Poll::Pending,
-					};
-
-				// On blocks import request, we merely *start* the process and store
-				// a `Future` into `importing`.
-				let (block_import, verifier) = block_import_verifier
-					.take()
-					.expect("block_import_verifier is always Some; qed");
+				if let Poll::Ready(()) = futures::poll!(&mut block_import_process) {
+					return;
+				}
 
-				importing = Some(worker.import_batch(block_import, verifier, origin, blocks));
+				// All futures that we polled are now pending.
+				futures::pending!()
 			}
-		});
+		};
 
 		(future, justification_sender, block_import_sender)
 	}
 
-	/// Returns a `Future` that imports the given blocks and sends the results on
-	/// `self.result_sender`.
-	///
-	/// For lifetime reasons, the `BlockImport` implementation must be passed by value, and is
-	/// yielded back in the output once the import is finished.
-	fn import_batch<V: 'static + Verifier<B>>(
-		&mut self,
-		block_import: BoxBlockImport<B, Transaction>,
-		verifier: V,
-		origin: BlockOrigin,
-		blocks: Vec<IncomingBlock<B>>,
-	) -> impl Future<Output = (BoxBlockImport<B, Transaction>, V)> {
-		let mut result_sender = self.result_sender.clone();
-		let metrics = self.metrics.clone();
-
-		import_many_blocks(block_import, origin, blocks, verifier, self.delay_between_blocks, metrics)
-			.then(move |(imported, count, results, block_import, verifier)| {
-				result_sender.blocks_processed(imported, count, results);
-				future::ready((block_import, verifier))
-			})
-	}
-
 	fn import_justification(
 		&mut self,
 		who: Origin,
@@ -307,29 +291,27 @@ impl<B: BlockT, Transaction: Send> BlockImportWorker<B, Transaction> {
 	}
 }
 
+/// Result of [`import_many_blocks`].
+struct ImportManyBlocksResult<B: BlockT> {
+	/// The number of blocks imported successfully.
+	imported: usize,
+	/// The total number of blocks processed.
+	block_count: usize,
+	/// The import results for each block.
+	results: Vec<(Result<BlockImportResult<NumberFor<B>>, BlockImportError>, B::Hash)>,
+}
+
 /// Import several blocks at once, returning import result for each block.
 ///
-/// For lifetime reasons, the `BlockImport` implementation must be passed by value, and is yielded
-/// back in the output once the import is finished.
-///
-/// The returned `Future` yields at every imported block, which makes the execution more
-/// fine-grained and making it possible to interrupt the process.
-fn import_many_blocks<B: BlockT, V: Verifier<B>, Transaction>(
-	import_handle: BoxBlockImport<B, Transaction>,
+/// This will yield after each imported block once, to ensure that other futures can be called as well.
+async fn import_many_blocks<B: BlockT, V: Verifier<B>, Transaction>(
+	import_handle: &mut BoxBlockImport<B, Transaction>,
 	blocks_origin: BlockOrigin,
 	blocks: Vec<IncomingBlock<B>>,
-	verifier: V,
+	verifier: &mut V,
 	delay_between_blocks: Duration,
 	metrics: Option<Metrics>,
-) -> impl Future<
-	Output = (
-		usize,
-		usize,
-		Vec<(Result<BlockImportResult<NumberFor<B>>, BlockImportError>, B::Hash)>,
-		BoxBlockImport<B, Transaction>,
-		V,
-	),
-> {
+) -> ImportManyBlocksResult<B> {
 	let count = blocks.len();
 
 	let blocks_range = match (
@@ -347,44 +329,18 @@ fn import_many_blocks<B: BlockT, V: Verifier<B>, Transaction>(
 	let mut results = vec![];
 	let mut has_error = false;
 	let mut blocks = blocks.into_iter();
-	let mut import_handle = Some(import_handle);
-	let mut waiting = None;
-	let mut verifier = Some(verifier);
 
 	// Blocks in the response/drain should be in ascending order.
-
-	future::poll_fn(move |cx| {
-		// Handle the optional timer that makes us wait before the next import.
-		if let Some(waiting) = &mut waiting {
-			match Future::poll(Pin::new(waiting), cx) {
-				Poll::Ready(_) => {},
-				Poll::Pending => return Poll::Pending,
-			}
-		}
-		waiting = None;
-
+	loop {
 		// Is there any block left to import?
 		let block = match blocks.next() {
 			Some(b) => b,
 			None => {
 				// No block left to import, success!
-				let import_handle = import_handle.take()
-					.expect("Future polled again after it has finished (import handle is None)");
-				let verifier = verifier.take()
-					.expect("Future polled again after it has finished (verifier handle is None)");
-				let results = mem::replace(&mut results, Vec::new());
-				return Poll::Ready((imported, count, results, import_handle, verifier));
+				return ImportManyBlocksResult { block_count: count, imported, results }
 			},
 		};
 
-		// We extract the content of `import_handle` and `verifier` only when the future ends,
-		// therefore `import_handle` and `verifier` are always `Some` here. It is illegal to poll
-		// a `Future` again after it has ended.
-		let import_handle = import_handle.as_mut()
-			.expect("Future polled again after it has finished (import handle is None)");
-		let verifier = verifier.as_mut()
-			.expect("Future polled again after it has finished (verifier handle is None)");
-
 		let block_number = block.header.as_ref().map(|h| h.number().clone());
 		let block_hash = block.hash;
 		let import_result = if has_error {
@@ -392,7 +348,7 @@ fn import_many_blocks<B: BlockT, V: Verifier<B>, Transaction>(
 		} else {
 			// The actual import.
 			import_single_block_metered(
-				&mut **import_handle,
+				import_handle,
 				blocks_origin.clone(),
 				block,
 				verifier,
@@ -405,7 +361,12 @@ fn import_many_blocks<B: BlockT, V: Verifier<B>, Transaction>(
 		}
 
 		if import_result.is_ok() {
-			trace!(target: "sync", "Block imported successfully {:?} ({})", block_number, block_hash);
+			trace!(
+				target: "sync",
+				"Block imported successfully {:?} ({})",
+				block_number,
+				block_hash,
+			);
 			imported += 1;
 		} else {
 			has_error = true;
@@ -413,14 +374,40 @@ fn import_many_blocks<B: BlockT, V: Verifier<B>, Transaction>(
 
 		results.push((import_result, block_hash));
 
-		// Notifies the current task again so that we re-execute this closure again for the next
-		// block.
-		if delay_between_blocks != Duration::new(0, 0) {
-			waiting = Some(Delay::new(delay_between_blocks));
+		if delay_between_blocks != Duration::default() && !has_error {
+			Delay::new(delay_between_blocks).await;
+		} else {
+			Yield::new().await
+		}
+	}
+}
+
+/// A future that will always `yield` on the first call of `poll` but schedules the current task for
+/// re-execution.
+
+///
+/// This is done by getting the waker and calling `wake_by_ref` followed by returning `Pending`.
+/// The next time the `poll` is called, it will return `Ready`.
+struct Yield(bool);
+
+impl Yield {
+	fn new() -> Self {
+		Self(false)
+	}
+}
+
+impl Future for Yield {
+	type Output = ();
+
+	fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<()> {
+		if !self.0 {
+			self.0 = true;
+			cx.waker().wake_by_ref();
+			Poll::Pending
+		} else {
+			Poll::Ready(())
 		}
-		cx.waker().wake_by_ref();
-		Poll::Pending
-	})
+	}
 }
 
 #[cfg(test)]
@@ -517,8 +504,9 @@ mod tests {
 	fn prioritizes_finality_work_over_block_import() {
 		let (result_sender, mut result_port) = buffered_link::buffered_link();
 
-		let (mut worker, mut finality_sender, mut block_import_sender) =
+		let (worker, mut finality_sender, mut block_import_sender) =
 			BlockImportWorker::new(result_sender, (), Box::new(()), Some(Box::new(())), None);
+		futures::pin_mut!(worker);
 
 		let mut import_block = |n| {
 			let header = Header {

From 1490be7ead1d4a7668cf069f6752029b5abd1cef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= <jon.haggblad@gmail.com>
Date: Tue, 26 Jan 2021 16:40:23 +0100
Subject: [PATCH 0325/1194] grandpa: remove runtime checks in prove_finality
 (#7953)

Remove checks that involve cross checking authorities in the runtime against what we have stored in
the AuthoritySetChanges.
---
 bin/node/cli/src/service.rs                   |   1 -
 client/finality-grandpa/src/finality_proof.rs | 250 ++----------------
 2 files changed, 21 insertions(+), 230 deletions(-)

diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index 838a6fb90219..377fb3b5e5ca 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -111,7 +111,6 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 
 		let finality_proof_provider = grandpa::FinalityProofProvider::new_for_service(
 			backend.clone(),
-			client.clone(),
 			Some(shared_authority_set.clone()),
 		);
 
diff --git a/client/finality-grandpa/src/finality_proof.rs b/client/finality-grandpa/src/finality_proof.rs
index 73726146af4e..e17045349d45 100644
--- a/client/finality-grandpa/src/finality_proof.rs
+++ b/client/finality-grandpa/src/finality_proof.rs
@@ -36,53 +36,29 @@
 //! finality proof (that finalizes some block C that is ancestor of the B and descendant
 //! of the U) could be returned.
 
-use std::sync::Arc;
 use log::trace;
+use std::sync::Arc;
 
-use sp_blockchain::{
-	Backend as BlockchainBackend, Error as ClientError, Result as ClientResult,
-};
-use sc_client_api::{backend::Backend, StorageProvider};
-use parity_scale_codec::{Encode, Decode};
 use finality_grandpa::BlockNumberOps;
+use parity_scale_codec::{Encode, Decode};
+use sp_blockchain::{Backend as BlockchainBackend, Error as ClientError, Result as ClientResult};
 use sp_runtime::{
 	Justification, generic::BlockId,
 	traits::{NumberFor, Block as BlockT, Header as HeaderT, Zero, One},
 };
-use sp_core::storage::StorageKey;
-use sp_finality_grandpa::{AuthorityId, AuthorityList, VersionedAuthorityList, GRANDPA_AUTHORITIES_KEY};
+use sc_client_api::backend::Backend;
+use sp_finality_grandpa::{AuthorityId, AuthorityList};
 
+use crate::authorities::AuthoritySetChanges;
 use crate::justification::GrandpaJustification;
-use crate::VoterSet;
 use crate::SharedAuthoritySet;
-use crate::authorities::AuthoritySetChanges;
+use crate::VoterSet;
 
 const MAX_UNKNOWN_HEADERS: usize = 100_000;
 
-pub trait AuthoritySetForFinalityProver<Block: BlockT>: Send + Sync {
-	/// Read GRANDPA_AUTHORITIES_KEY from storage at given block.
-	fn authorities(&self, block: &BlockId<Block>) -> ClientResult<AuthorityList>;
-}
-
-/// Implementation of AuthoritySetForFinalityProver.
-impl<BE, Block: BlockT> AuthoritySetForFinalityProver<Block>
-	for Arc<dyn StorageProvider<Block, BE> + Send + Sync>
-where
-	BE: Backend<Block> + Send + Sync + 'static,
-{
-	fn authorities(&self, block: &BlockId<Block>) -> ClientResult<AuthorityList> {
-		let storage_key = StorageKey(GRANDPA_AUTHORITIES_KEY.to_vec());
-		self.storage(block, &storage_key)?
-			.and_then(|encoded| VersionedAuthorityList::decode(&mut encoded.0.as_slice()).ok())
-			.map(|versioned| versioned.into())
-			.ok_or(ClientError::InvalidAuthoritiesSet)
-	}
-}
-
 /// Finality proof provider for serving network requests.
 pub struct FinalityProofProvider<BE, Block: BlockT> {
 	backend: Arc<BE>,
-	authority_provider: Arc<dyn AuthoritySetForFinalityProver<Block>>,
 	shared_authority_set: Option<SharedAuthoritySet<Block::Hash, NumberFor<Block>>>,
 }
 
@@ -95,17 +71,12 @@ where
 	/// - backend for accessing blockchain data;
 	/// - authority_provider for calling and proving runtime methods.
 	/// - shared_authority_set for accessing authority set data
-	pub fn new<P>(
+	pub fn new(
 		backend: Arc<B>,
-		authority_provider: P,
 		shared_authority_set: Option<SharedAuthoritySet<Block::Hash, NumberFor<Block>>>,
-	) -> Self
-	where
-		P: AuthoritySetForFinalityProver<Block> + 'static,
-	{
+	) -> Self {
 		FinalityProofProvider {
 			backend,
-			authority_provider: Arc::new(authority_provider),
 			shared_authority_set,
 		}
 	}
@@ -117,14 +88,9 @@ where
 	/// - shared_authority_set for accessing authority set data
 	pub fn new_for_service(
 		backend: Arc<B>,
-		storage_provider: Arc<dyn StorageProvider<Block, B> + Send + Sync>,
 		shared_authority_set: Option<SharedAuthoritySet<Block::Hash, NumberFor<Block>>>,
 	) -> Arc<Self> {
-		Arc::new(Self::new(
-			backend,
-			storage_provider,
-			shared_authority_set,
-		))
+		Arc::new(Self::new(backend, shared_authority_set))
 	}
 }
 
@@ -136,9 +102,10 @@ where
 {
 	/// Prove finality for the given block number by returning a Justification for the last block of
 	/// the authority set.
-	pub fn prove_finality(&self, block: NumberFor<Block>)
-		-> Result<Option<Vec<u8>>, FinalityProofError>
-	{
+	pub fn prove_finality(
+		&self,
+		block: NumberFor<Block>
+	) -> Result<Option<Vec<u8>>, FinalityProofError> {
 		let authority_set_changes = if let Some(changes) = self
 			.shared_authority_set
 			.as_ref()
@@ -151,7 +118,6 @@ where
 
 		prove_finality::<_, _, GrandpaJustification<Block>>(
 			&*self.backend.blockchain(),
-			&*self.authority_provider,
 			authority_set_changes,
 			block,
 		)
@@ -204,7 +170,6 @@ type AuthoritySetProof<Header> = Vec<AuthoritySetProofFragment<Header>>;
 
 fn prove_finality<Block, B, J>(
 	blockchain: &B,
-	authorities_provider: &dyn AuthoritySetForFinalityProver<Block>,
 	authority_set_changes: AuthoritySetChanges<NumberFor<Block>>,
 	block: NumberFor<Block>,
 ) -> Result<Option<Vec<u8>>, FinalityProofError>
@@ -227,7 +192,7 @@ where
 
 	// Get set_id the block belongs to, and the last block of the set which should contain a
 	// Justification we can use to prove the requested block.
-	let (set_id, last_block_for_set) = if let Some(id) = authority_set_changes.get_set_id(block) {
+	let (_, last_block_for_set) = if let Some(id) = authority_set_changes.get_set_id(block) {
 		id
 	} else {
 		trace!(
@@ -253,21 +218,6 @@ where
 			return Ok(None);
 		};
 
-
-	// Check if the justification is generated by the requested authority set
-	let block_authorities = authorities_provider.authorities(&BlockId::Number(block))?;
-	let justification_check_result =
-		J::decode_and_verify(&justification, set_id, &block_authorities);
-	if justification_check_result.is_err() {
-		trace!(
-			target: "afg",
-			"Can not provide finality proof with requested set id #{}\
-			(possible forced change?). Returning empty proof.",
-			set_id,
-		);
-		return Ok(None);
-	}
-
 	// Collect all headers from the requested block until the last block of the set
 	let unknown_headers = {
 		let mut headers = Vec::new();
@@ -276,14 +226,6 @@ where
 			if current >= last_block_for_set || headers.len() >= MAX_UNKNOWN_HEADERS {
 				break;
 			}
-			if block_authorities != authorities_provider.authorities(&BlockId::Number(current))? {
-				trace!(
-					target: "afg",
-					"Encountered new authorities when collecting unknown headers. \
-					Returning empty proof",
-				);
-				return Ok(None);
-			}
 			headers.push(blockchain.expect_header(BlockId::Number(current))?);
 			current += One::one();
 		}
@@ -653,23 +595,15 @@ impl<Header: HeaderT> WarpSyncFragmentCache<Header> {
 #[cfg(test)]
 pub(crate) mod tests {
 	use super::*;
-	use substrate_test_runtime_client::runtime::{Block, Header, H256};
+	use crate::authorities::AuthoritySetChanges;
+	use sp_core::crypto::Public;
+	use sp_finality_grandpa::AuthorityList;
 	use sc_client_api::NewBlockState;
 	use sc_client_api::in_mem::Blockchain as InMemoryBlockchain;
-	use sp_core::crypto::Public;
-	use crate::authorities::AuthoritySetChanges;
+	use substrate_test_runtime_client::runtime::{Block, Header, H256};
 
 	pub(crate) type FinalityProof = super::FinalityProof<Header>;
 
-	impl<GetAuthorities> AuthoritySetForFinalityProver<Block> for GetAuthorities
-	where
-		GetAuthorities: Send + Sync + Fn(BlockId<Block>) -> ClientResult<AuthorityList>,
-	{
-		fn authorities(&self, block: &BlockId<Block>) -> ClientResult<AuthorityList> {
-			self(*block)
-		}
-	}
-
 	#[derive(Debug, PartialEq, Encode, Decode)]
 	pub struct TestJustification(pub (u64, AuthorityList), pub Vec<u8>);
 
@@ -733,7 +667,7 @@ pub(crate) mod tests {
 	}
 
 	#[test]
-	fn finality_proof_is_none_if_no_more_last_finalized_blocks() {
+	fn finality_proof_fails_if_no_more_last_finalized_blocks() {
 		let blockchain = test_blockchain();
 		blockchain
 			.insert(header(4).hash(), header(4), Some(vec![1]), None, NewBlockState::Best)
@@ -748,7 +682,6 @@ pub(crate) mod tests {
 		// The last finalized block is 3, so we cannot provide further justifications.
 		let proof_of_4 = prove_finality::<_, _, TestJustification>(
 			&blockchain,
-			&|_| unreachable!("Should return before calling GetAuthorities"),
 			authority_set_changes,
 			*header(4).number(),
 		);
@@ -769,7 +702,6 @@ pub(crate) mod tests {
 		// => we can't prove finality of 3
 		let proof_of_3 = prove_finality::<_, _, TestJustification>(
 			&blockchain,
-			&|_| unreachable!("Should return before calling GetAuthorities"),
 			authority_set_changes,
 			*header(3).number(),
 		)
@@ -777,136 +709,6 @@ pub(crate) mod tests {
 		assert_eq!(proof_of_3, None);
 	}
 
-	#[test]
-	fn finality_proof_is_none_if_justification_is_generated_by_unknown_set() {
-		// This is the case for forced change: set_id has been forcibly increased,
-		// or when our stored authority set changes is incomplete
-		let blockchain = test_blockchain();
-		let auth = vec![(AuthorityId::from_slice(&[42u8; 32]), 1u64)];
-		let just4 = TestJustification((0, auth), vec![4]).encode();
-		blockchain
-			.insert(header(4).hash(), header(4), Some(just4), None, NewBlockState::Final)
-			.unwrap();
-
-		let mut authority_set_changes = AuthoritySetChanges::empty();
-		authority_set_changes.append(0, 4);
-
-		let proof_of_3 = prove_finality::<_, _, TestJustification>(
-			&blockchain,
-			&|_| Ok(vec![(AuthorityId::from_slice(&[1u8; 32]), 1u64)]),
-			authority_set_changes,
-			*header(3).number(),
-		)
-		.unwrap();
-		assert!(proof_of_3.is_none());
-	}
-
-	#[test]
-	fn finality_proof_is_none_if_authority_set_id_is_incorrect() {
-		let blockchain = test_blockchain();
-		let auth = vec![(AuthorityId::from_slice(&[1u8; 32]), 1u64)];
-		let just4 = TestJustification((0, auth.clone()), vec![4]).encode();
-		blockchain
-			.insert(header(4).hash(), header(4), Some(just4), None, NewBlockState::Final)
-			.unwrap();
-
-		let mut authority_set_changes = AuthoritySetChanges::empty();
-		authority_set_changes.append(0, 1);
-		authority_set_changes.append(1, 4);
-
-		// We call `prove_finality` with the wrong `authorities_set_id`, since the Justification for
-		// block 4 contains set id 0.
-		let proof_of_3 = prove_finality::<_, _, TestJustification>(
-			&blockchain,
-			&|_| Ok(auth.clone()),
-			authority_set_changes,
-			*header(3).number(),
-		)
-		.unwrap();
-		assert!(proof_of_3.is_none());
-	}
-
-	#[test]
-	fn finality_proof_is_none_for_next_set_id_with_new_the_authority_set() {
-		let blockchain = test_blockchain();
-		let auth1 = vec![(AuthorityId::from_slice(&[1u8; 32]), 1u64)];
-		let auth2 = vec![(AuthorityId::from_slice(&[2u8; 32]), 1u64)];
-		let just5 = TestJustification((0, auth1.clone()), vec![5]).encode();
-		let just6 = TestJustification((1, auth2.clone()), vec![6]).encode();
-		blockchain
-			.insert(header(4).hash(), header(4), None, None, NewBlockState::Final)
-			.unwrap();
-		blockchain
-			.insert(header(5).hash(), header(5), Some(just5), None, NewBlockState::Final)
-			.unwrap();
-		blockchain
-			.insert(header(6).hash(), header(6), Some(just6), None, NewBlockState::Final)
-			.unwrap();
-
-		let mut authority_set_changes = AuthoritySetChanges::empty();
-		authority_set_changes.append(0, 1);
-		authority_set_changes.append(1, 6);
-
-		// Trying to prove block 4 using block 6 fails as the authority set has changed
-		let proof_of_4 = prove_finality::<_, _, TestJustification>(
-			&blockchain,
-			&|block_id| match block_id {
-				BlockId::Number(4) => Ok(auth1.clone()),
-				_ => unimplemented!("No other authorities should be proved: {:?}", block_id),
-			},
-			authority_set_changes,
-			*header(4).number(),
-		)
-		.unwrap();
-		assert!(proof_of_4.is_none());
-	}
-
-	#[test]
-	fn finality_proof_is_none_if_the_authority_set_changes_and_changes_back() {
-		let blockchain = test_blockchain();
-		let auth1 = vec![(AuthorityId::from_slice(&[1u8; 32]), 1u64)];
-		let auth2 = vec![(AuthorityId::from_slice(&[2u8; 32]), 1u64)];
-		let just5 = TestJustification((0, auth1.clone()), vec![5]).encode();
-		let just6 = TestJustification((1, auth2.clone()), vec![6]).encode();
-		let just7 = TestJustification((2, auth1.clone()), vec![7]).encode();
-		blockchain
-			.insert(header(4).hash(), header(4), None, None, NewBlockState::Final)
-			.unwrap();
-		blockchain
-			.insert(header(5).hash(), header(5), Some(just5), None, NewBlockState::Final)
-			.unwrap();
-		blockchain
-			.insert(header(6).hash(), header(6), Some(just6), None, NewBlockState::Final)
-			.unwrap();
-		blockchain
-			.insert(header(7).hash(), header(7), Some(just7), None, NewBlockState::Final)
-			.unwrap();
-
-		// Set authority set changes so that they don't contain the switch, and switch back, of the
-		// authorities. As well as incorrect set_id to avoid the guard against that.
-		// This should trigger the check for walking through the headers and checking for authority
-		// set changes that are missed.
-		let mut authority_set_changes = AuthoritySetChanges::empty();
-		authority_set_changes.append(0, 1);
-		authority_set_changes.append(1, 2);
-		authority_set_changes.append(2, 7);
-
-		let proof_of_4 =
-			prove_finality::<_, _, TestJustification>(
-				&blockchain,
-				&|block_id| match block_id {
-					BlockId::Number(4) => Ok(auth1.clone()),
-					BlockId::Number(5) => Ok(auth1.clone()),
-					BlockId::Number(6) => Ok(auth2.clone()),
-					_ => unimplemented!("No other authorities should be proved: {:?}", block_id),
-				},
-				authority_set_changes,
-				*header(4).number(),
-			)
-		.unwrap();
-		assert!(proof_of_4.is_none());
-	}
-
 	#[test]
 	fn finality_proof_check_fails_when_proof_decode_fails() {
 		// When we can't decode proof from Vec<u8>
@@ -947,7 +749,7 @@ pub(crate) mod tests {
 	}
 
 	#[test]
-	fn finality_proof_using_authority_set_changes_is_none_with_undefined_start() {
+	fn finality_proof_using_authority_set_changes_fails_with_undefined_start() {
 		let blockchain = test_blockchain();
 		let auth = vec![(AuthorityId::from_slice(&[1u8; 32]), 1u64)];
 		let just4 = TestJustification((0, auth.clone()), vec![4]).encode();
@@ -972,11 +774,6 @@ pub(crate) mod tests {
 
 		let proof_of_5 = prove_finality::<_, _, TestJustification>(
 			&blockchain,
-			&|block_id| match block_id {
-				BlockId::Number(5) => Ok(auth.clone()),
-				BlockId::Number(6) => Ok(auth.clone()),
-				_ => unimplemented!("No other authorities should be proved: {:?}", block_id),
-			},
 			authority_set_changes,
 			*header(5).number(),
 		);
@@ -1009,11 +806,6 @@ pub(crate) mod tests {
 		let proof_of_5: FinalityProof = Decode::decode(
 			&mut &prove_finality::<_, _, TestJustification>(
 				&blockchain,
-				&|block_id| match block_id {
-					BlockId::Number(5) => Ok(auth.clone()),
-					BlockId::Number(6) => Ok(auth.clone()),
-					_ => unimplemented!("No other authorities should be proved: {:?}", block_id),
-				},
 				authority_set_changes,
 				*header(5).number(),
 			)

From d0723f186662fd69ee37601367f51095d132df92 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Tue, 26 Jan 2021 16:42:27 +0100
Subject: [PATCH 0326/1194] Ensure transactional with ? works in frame v2
 (#7982)

---
 frame/support/test/tests/pallet.rs              | 8 ++++----
 frame/support/test/tests/storage_transaction.rs | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index 974b90148066..431377a70ee3 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -155,11 +155,11 @@ pub mod pallet {
 			#[pallet::compact] foo: u32,
 		) -> DispatchResultWithPostInfo {
 			Self::deposit_event(Event::Something(0));
-			if foo != 0 {
-				Ok(().into())
-			} else {
-				Err(Error::<T>::InsufficientProposersBalance.into())
+			if foo == 0 {
+				Err(Error::<T>::InsufficientProposersBalance)?;
 			}
+
+			Ok(().into())
 		}
 	}
 
diff --git a/frame/support/test/tests/storage_transaction.rs b/frame/support/test/tests/storage_transaction.rs
index 0c3fa2ff3649..ee6ce5869e17 100644
--- a/frame/support/test/tests/storage_transaction.rs
+++ b/frame/support/test/tests/storage_transaction.rs
@@ -195,7 +195,8 @@ fn transactional_annotation() {
 	#[transactional]
 	fn value_rollbacks(v: u32) -> result::Result<u32, &'static str> {
 		set_value(v)?;
-		Err("nah")
+		Err("nah")?;
+		Ok(v)
 	}
 
 	TestExternalities::default().execute_with(|| {

From c003a4846e398ccfae3d65b2deec7e66bdb5b1bf Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Wed, 27 Jan 2021 11:41:48 +0100
Subject: [PATCH 0327/1194] Increase maximum size of transaction notifications
 (#7993)

---
 client/network/src/protocol.rs | 19 ++++++++++++++-----
 client/network/src/service.rs  | 10 ++++++++--
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index 6af5e1285497..e0e2e63cad00 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -72,14 +72,23 @@ const TICK_TIMEOUT: time::Duration = time::Duration::from_millis(1100);
 /// Interval at which we propagate transactions;
 const PROPAGATE_TIMEOUT: time::Duration = time::Duration::from_millis(2900);
 
-/// Maximim number of known block hashes to keep for a peer.
+/// Maximum number of known block hashes to keep for a peer.
 const MAX_KNOWN_BLOCKS: usize = 1024; // ~32kb per peer + LruHashSet overhead
-/// Maximim number of known transaction hashes to keep for a peer.
+/// Maximum number of known transaction hashes to keep for a peer.
 ///
 /// This should be approx. 2 blocks full of transactions for the network to function properly.
 const MAX_KNOWN_TRANSACTIONS: usize = 10240; // ~300kb per peer + overhead.
 
-/// Maximim number of transaction validation request we keep at any moment.
+/// Maximum allowed size for a block announce.
+const MAX_BLOCK_ANNOUNCE_SIZE: u64 = 1024 * 1024;
+/// Maximum allowed size for a transactions notification.
+const MAX_TRANSACTIONS_SIZE: u64 = 16 * 1024 * 1024;
+
+/// Maximum size used for notifications in the block announce and transaction protocols.
+// Must be equal to `max(MAX_BLOCK_ANNOUNCE_SIZE, MAX_TRANSACTIONS_SIZE)`.
+pub(crate) const BLOCK_ANNOUNCES_TRANSACTIONS_SUBSTREAM_SIZE: u64 = 16 * 1024 * 1024;
+
+/// Maximum number of transaction validation request we keep at any moment.
 const MAX_PENDING_TRANSACTIONS: usize = 8192;
 
 /// Current protocol version.
@@ -483,8 +492,8 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 				versions,
 				build_status_message::<B>(&config, best_number, best_hash, genesis_hash),
 				peerset,
-				iter::once((block_announces_protocol, block_announces_handshake, 1024 * 1024))
-					.chain(iter::once((transactions_protocol, vec![], 1024 * 1024)))
+				iter::once((block_announces_protocol, block_announces_handshake, MAX_BLOCK_ANNOUNCE_SIZE))
+					.chain(iter::once((transactions_protocol, vec![], MAX_TRANSACTIONS_SIZE)))
 					.chain(network_config.extra_sets.iter().map(|s| (
 						s.notifications_protocol.clone(),
 						handshake_message.clone(),
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 09acef62e778..20968c127889 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -82,6 +82,7 @@ use sp_runtime::traits::{Block as BlockT, NumberFor};
 use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use std::{
 	borrow::Cow,
+	cmp,
 	collections::{HashMap, HashSet},
 	convert::TryFrom as _,
 	fs,
@@ -310,8 +311,13 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 						.map(|cfg| usize::try_from(cfg.max_notification_size).unwrap_or(usize::max_value()));
 
 					// A "default" max is added to cover all the other protocols: ping, identify,
-					// kademlia.
-					let default_max = 1024 * 1024;
+					// kademlia, block announces, and transactions.
+					let default_max = cmp::max(
+						1024 * 1024,
+						usize::try_from(protocol::BLOCK_ANNOUNCES_TRANSACTIONS_SUBSTREAM_SIZE)
+							.unwrap_or(usize::max_value())
+					);
+
 					iter::once(default_max)
 						.chain(requests_max).chain(responses_max).chain(notifs_max)
 						.max().expect("iterator known to always yield at least one element; qed")

From 9c0ae898d192632f206acb8d00d18ceb65b3645d Mon Sep 17 00:00:00 2001
From: Gerben van de Wiel <clshannon@protonmail.com>
Date: Wed, 27 Jan 2021 11:49:44 +0100
Subject: [PATCH 0328/1194] Let mock in pallet-template use construct_runtime
 (#7991)

---
 Cargo.lock                                    |  1 +
 bin/node-template/pallets/template/Cargo.toml |  3 ++
 .../pallets/template/src/mock.rs              | 33 +++++++++++--------
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c938978802df..19bb14e0df48 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5056,6 +5056,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "parity-scale-codec",
+ "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
diff --git a/bin/node-template/pallets/template/Cargo.toml b/bin/node-template/pallets/template/Cargo.toml
index f6d69206209e..d4e6636c64f5 100644
--- a/bin/node-template/pallets/template/Cargo.toml
+++ b/bin/node-template/pallets/template/Cargo.toml
@@ -15,6 +15,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 
+[dev-dependencies]
+serde = { version = "1.0.101" }
+
 [dependencies.frame-support]
 default-features = false
 version = "2.0.0"
diff --git a/bin/node-template/pallets/template/src/mock.rs b/bin/node-template/pallets/template/src/mock.rs
index 60d22aad7bc6..d33670f2e9cb 100644
--- a/bin/node-template/pallets/template/src/mock.rs
+++ b/bin/node-template/pallets/template/src/mock.rs
@@ -1,19 +1,26 @@
-use crate::{Module, Config};
+use crate as pallet_template;
 use sp_core::H256;
-use frame_support::{impl_outer_origin, parameter_types};
+use frame_support::parameter_types;
 use sp_runtime::{
 	traits::{BlakeTwo256, IdentityLookup}, testing::Header,
 };
 use frame_system as system;
 
-impl_outer_origin! {
-	pub enum Origin for Test {}
-}
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>; 
 
 // Configure a mock runtime to test the pallet.
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		TemplateModule: pallet_template::{Module, Call, Storage, Event<T>},
+	}
+);
 
-#[derive(Clone, Eq, PartialEq)]
-pub struct Test;
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 	pub const SS58Prefix: u8 = 42;
@@ -25,7 +32,7 @@ impl system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type Origin = Origin;
-	type Call = ();
+	type Call = Call;
 	type Index = u64;
 	type BlockNumber = u64;
 	type Hash = H256;
@@ -33,10 +40,10 @@ impl system::Config for Test {
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type Header = Header;
-	type Event = ();
+	type Event = Event;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -44,12 +51,10 @@ impl system::Config for Test {
 	type SS58Prefix = SS58Prefix;
 }
 
-impl Config for Test {
-	type Event = ();
+impl pallet_template::Config for Test {
+	type Event = Event;
 }
 
-pub type TemplateModule = Module<Test>;
-
 // Build genesis storage according to the mock runtime.
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	system::GenesisConfig::default().build_storage::<Test>().unwrap().into()

From 0b0d124d5f9be89f614f2be8e9da038fcb9f540e Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Wed, 27 Jan 2021 14:03:36 +0300
Subject: [PATCH 0329/1194] Fix state cache for cumulus (#7990)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix state cache for cumulus

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 client/db/src/storage_cache.rs | 88 ++++++++++++++++++++++++++++++++--
 1 file changed, 85 insertions(+), 3 deletions(-)

diff --git a/client/db/src/storage_cache.rs b/client/db/src/storage_cache.rs
index bbbc8413be79..317c637333d6 100644
--- a/client/db/src/storage_cache.rs
+++ b/client/db/src/storage_cache.rs
@@ -16,7 +16,9 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-//! Global cache state.
+//! Global state cache. Maintains recently queried/committed state values
+//! Tracks changes over the span of a few recent blocks and handles forks
+//! by tracking/removing cache entries for conflicting changes.
 
 use std::collections::{VecDeque, HashSet, HashMap};
 use std::sync::Arc;
@@ -343,12 +345,27 @@ impl<B: BlockT> CacheChanges<B> {
 		);
 		let cache = &mut *cache;
 		// Filter out committing block if any.
-		let enacted: Vec<_> = enacted
+		let mut enacted: Vec<_> = enacted
 			.iter()
 			.filter(|h| commit_hash.as_ref().map_or(true, |p| *h != p))
 			.cloned()
 			.collect();
-		cache.sync(&enacted, retracted);
+
+		let mut retracted = std::borrow::Cow::Borrowed(retracted);
+		if let Some(commit_hash) = &commit_hash {
+			if let Some(m) = cache.modifications.iter_mut().find(|m| &m.hash == commit_hash) {
+				if m.is_canon != is_best {
+					// Same block comitted twice with different state changes.
+					// Treat it as reenacted/retracted.
+					if is_best {
+						enacted.push(commit_hash.clone());
+					} else {
+						retracted.to_mut().push(commit_hash.clone());
+					}
+				}
+			}
+		}
+		cache.sync(&enacted, &retracted);
 		// Propagate cache only if committing on top of the latest canonical state
 		// blocks are ordered by number and only one block with a given number is marked as canonical
 		// (contributed to canonical state cache)
@@ -1316,6 +1333,71 @@ mod tests {
 		);
 		assert_eq!(s.storage(&key).unwrap(), None);
 	}
+
+	#[test]
+	fn same_block_no_changes() {
+		sp_tracing::try_init_simple();
+
+		let root_parent = H256::random();
+		let key = H256::random()[..].to_vec();
+		let h1 = H256::random();
+		let h2 = H256::random();
+
+		let shared = new_shared_cache::<Block>(256*1024, (0,1));
+
+		let mut s = CachingState::new(
+			InMemoryBackend::<BlakeTwo256>::default(),
+			shared.clone(),
+			Some(root_parent),
+		);
+		s.cache.sync_cache(
+			&[],
+			&[],
+			vec![(key.clone(), Some(vec![1]))],
+			vec![],
+			Some(h1),
+			Some(1),
+			true,
+		);
+		assert_eq!(shared.lock().lru_storage.get(&key).unwrap(), &Some(vec![1]));
+
+		let mut s = CachingState::new(
+			InMemoryBackend::<BlakeTwo256>::default(),
+			shared.clone(),
+			Some(h1),
+		);
+
+		// commit as non-best
+		s.cache.sync_cache(
+			&[],
+			&[],
+			vec![(key.clone(), Some(vec![2]))],
+			vec![],
+			Some(h2),
+			Some(2),
+			false,
+		);
+
+		assert_eq!(shared.lock().lru_storage.get(&key).unwrap(), &Some(vec![1]));
+
+		let mut s = CachingState::new(
+			InMemoryBackend::<BlakeTwo256>::default(),
+			shared.clone(),
+			Some(h1),
+		);
+
+		// commit again as best with no changes
+		s.cache.sync_cache(
+			&[],
+			&[],
+			vec![],
+			vec![],
+			Some(h2),
+			Some(2),
+			true,
+		);
+		assert_eq!(s.storage(&key).unwrap(), None);
+	}
 }
 
 #[cfg(test)]

From 2d597fc2a2ccbeae0e5b832b976d2ca9558fc2c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomusdrw@users.noreply.github.com>
Date: Thu, 28 Jan 2021 11:58:52 +0100
Subject: [PATCH 0330/1194] Merkle Mountain Range pallet improvements (#7891)

* Add stateless verification helper function.

* Split MMR primitives.

* Add RuntimeAPI

* RuntimeAPI with OpaqueLeaves

* Bump spec_version,.

* Move primitives back to frame.

* Fix OpaqueLeaf encoding.

* Add block number to frame_system implementation of LeafDataProvider.

* Relax leaf codec requirements and fix OpaqueLeaf

* Add root to debug line.

* Apply suggestions from code review

Co-authored-by: Hernando Castano <HCastano@users.noreply.github.com>

* Typo.

Co-authored-by: Hernando Castano <HCastano@users.noreply.github.com>
---
 Cargo.lock                                    |  16 ++
 Cargo.toml                                    |   1 +
 bin/node/runtime/src/lib.rs                   |  39 ++++-
 frame/merkle-mountain-range/Cargo.toml        |   2 +
 .../primitives/Cargo.toml                     |  38 ++++
 .../primitives.rs => primitives/src/lib.rs}   | 162 ++++++++++++++++--
 frame/merkle-mountain-range/src/lib.rs        |  35 +++-
 frame/merkle-mountain-range/src/mmr/mmr.rs    |  66 +++----
 frame/merkle-mountain-range/src/mmr/mod.rs    |   2 +-
 .../merkle-mountain-range/src/mmr/storage.rs  |   2 +-
 frame/merkle-mountain-range/src/mock.rs       |   2 +-
 frame/merkle-mountain-range/src/tests.rs      | 101 +++++++----
 12 files changed, 373 insertions(+), 93 deletions(-)
 create mode 100644 frame/merkle-mountain-range/primitives/Cargo.toml
 rename frame/merkle-mountain-range/{src/primitives.rs => primitives/src/lib.rs} (71%)

diff --git a/Cargo.lock b/Cargo.lock
index 19bb14e0df48..d09e873ce678 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4741,6 +4741,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "hex-literal",
+ "pallet-mmr-primitives",
  "parity-scale-codec",
  "serde",
  "sp-core",
@@ -4749,6 +4750,21 @@ dependencies = [
  "sp-std",
 ]
 
+[[package]]
+name = "pallet-mmr-primitives"
+version = "2.0.0"
+dependencies = [
+ "frame-support",
+ "frame-system",
+ "hex-literal",
+ "parity-scale-codec",
+ "serde",
+ "sp-api",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
+]
+
 [[package]]
 name = "pallet-multisig"
 version = "2.0.1"
diff --git a/Cargo.toml b/Cargo.toml
index fc22f440ca7f..38b3a2bdcf29 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -85,6 +85,7 @@ members = [
 	"frame/lottery",
 	"frame/membership",
 	"frame/merkle-mountain-range",
+	"frame/merkle-mountain-range/primitives",
 	"frame/metadata",
 	"frame/multisig",
 	"frame/nicks",
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index e74c61a9c0eb..beaef37eebd3 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -112,7 +112,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	// and set impl_version to 0. If only runtime
 	// implementation changes and behavior does not, then leave spec_version as
 	// is and increment impl_version.
-	spec_version: 261,
+	spec_version: 262,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 2,
@@ -1079,6 +1079,20 @@ pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, Call, SignedExt
 /// Executive: handles dispatch to the various modules.
 pub type Executive = frame_executive::Executive<Runtime, Block, frame_system::ChainContext<Runtime>, Runtime, AllModules>;
 
+/// MMR helper types.
+mod mmr {
+	use super::Runtime;
+	pub use pallet_mmr::primitives::*;
+
+	pub type Leaf = <
+		<Runtime as pallet_mmr::Config>::LeafData
+		as
+		LeafDataProvider
+	>::LeafData;
+	pub type Hash = <Runtime as pallet_mmr::Config>::Hash;
+	pub type Hashing = <Runtime as pallet_mmr::Config>::Hashing;
+}
+
 impl_runtime_apis! {
 	impl sp_api::Core<Block> for Runtime {
 		fn version() -> RuntimeVersion {
@@ -1273,6 +1287,29 @@ impl_runtime_apis! {
 		}
 	}
 
+	impl pallet_mmr::primitives::MmrApi<
+		Block,
+		mmr::Leaf,
+		mmr::Hash,
+	> for Runtime {
+		fn generate_proof(leaf_index: u64) -> Result<(mmr::Leaf, mmr::Proof<mmr::Hash>), mmr::Error> {
+			Mmr::generate_proof(leaf_index)
+		}
+
+		fn verify_proof(leaf: mmr::Leaf, proof: mmr::Proof<mmr::Hash>) -> Result<(), mmr::Error> {
+			Mmr::verify_leaf(leaf, proof)
+		}
+
+		fn verify_proof_stateless(
+			root: mmr::Hash,
+			leaf: Vec<u8>,
+			proof: mmr::Proof<mmr::Hash>
+		) -> Result<(), mmr::Error> {
+			let node = mmr::DataOrHash::Data(mmr::OpaqueLeaf(leaf));
+			pallet_mmr::verify_leaf_proof::<mmr::Hashing, _>(root, node, proof)
+		}
+	}
+
 	impl sp_session::SessionKeys<Block> for Runtime {
 		fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {
 			SessionKeys::generate(seed)
diff --git a/frame/merkle-mountain-range/Cargo.toml b/frame/merkle-mountain-range/Cargo.toml
index 096333680c6a..f6441b103f6d 100644
--- a/frame/merkle-mountain-range/Cargo.toml
+++ b/frame/merkle-mountain-range/Cargo.toml
@@ -17,6 +17,7 @@ frame-benchmarking = { version = "2.0.0", default-features = false, path = "../b
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
 mmr-lib = { package = "ckb-merkle-mountain-range", default-features = false, version = "0.3.1" }
+pallet-mmr-primitives = { version = "2.0.0", default-features = false, path = "./primitives" }
 serde = { version = "1.0.101", optional = true }
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
 sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
@@ -35,6 +36,7 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 	"mmr-lib/std",
+	"pallet-mmr-primitives/std",
 	"serde",
 	"sp-core/std",
 	"sp-io/std",
diff --git a/frame/merkle-mountain-range/primitives/Cargo.toml b/frame/merkle-mountain-range/primitives/Cargo.toml
new file mode 100644
index 000000000000..1db7bf2fd3f6
--- /dev/null
+++ b/frame/merkle-mountain-range/primitives/Cargo.toml
@@ -0,0 +1,38 @@
+[package]
+name = "pallet-mmr-primitives"
+version = "2.0.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
+license = "Apache-2.0"
+homepage = "https://substrate.dev"
+repository = "https://github.com/paritytech/substrate/"
+description = "FRAME Merkle Mountain Range primitives."
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
+frame-support = { version = "2.0.0", default-features = false, path = "../../support" }
+frame-system = { version = "2.0.0", default-features = false, path = "../../system" }
+serde = { version = "1.0.101", optional = true, features = ["derive"] }
+sp-api = { version = "2.0.0", default-features = false, path = "../../../primitives/api" }
+sp-core = { version = "2.0.0", default-features = false, path = "../../../primitives/core" }
+sp-runtime = { version = "2.0.0", default-features = false, path = "../../../primitives/runtime" }
+sp-std = { version = "2.0.0", default-features = false, path = "../../../primitives/std" }
+
+[dev-dependencies]
+hex-literal = "0.3"
+
+[features]
+default = ["std"]
+std = [
+	"codec/std",
+	"frame-support/std",
+	"frame-system/std",
+	"serde",
+	"sp-api/std",
+	"sp-core/std",
+	"sp-runtime/std",
+	"sp-std/std",
+]
diff --git a/frame/merkle-mountain-range/src/primitives.rs b/frame/merkle-mountain-range/primitives/src/lib.rs
similarity index 71%
rename from frame/merkle-mountain-range/src/primitives.rs
rename to frame/merkle-mountain-range/primitives/src/lib.rs
index 4d13a32c89f8..b8258d9b7373 100644
--- a/frame/merkle-mountain-range/src/primitives.rs
+++ b/frame/merkle-mountain-range/primitives/src/lib.rs
@@ -17,8 +17,11 @@
 
 //! Merkle Mountain Range primitive types.
 
-use frame_support::RuntimeDebug;
-use sp_runtime::traits;
+#![cfg_attr(not(feature = "std"), no_std)]
+#![warn(missing_docs)]
+
+use frame_support::{RuntimeDebug, debug};
+use sp_runtime::traits::{self, Saturating, One};
 use sp_std::fmt;
 #[cfg(not(feature = "std"))]
 use sp_std::prelude::Vec;
@@ -26,7 +29,7 @@ use sp_std::prelude::Vec;
 /// A provider of the MMR's leaf data.
 pub trait LeafDataProvider {
 	/// A type that should end up in the leaf of MMR.
-	type LeafData: FullLeaf;
+	type LeafData: FullLeaf + codec::Decode;
 
 	/// The method to return leaf data that should be placed
 	/// in the leaf node appended MMR at this block.
@@ -47,14 +50,21 @@ impl LeafDataProvider for () {
 /// The most common use case for MMRs is to store historical block hashes,
 /// so that any point in time in the future we can receive a proof about some past
 /// blocks without using excessive on-chain storage.
-/// Hence we implement the [LeafDataProvider] for [frame_system::Module], since the
+///
+/// Hence we implement the [LeafDataProvider] for [frame_system::Module]. Since the
 /// current block hash is not available (since the block is not finished yet),
-/// we use the `parent_hash` here.
+/// we use the `parent_hash` here along with parent block number.
 impl<T: frame_system::Config> LeafDataProvider for frame_system::Module<T> {
-	type LeafData = <T as frame_system::Config>::Hash;
+	type LeafData = (
+		<T as frame_system::Config>::BlockNumber,
+		<T as frame_system::Config>::Hash
+	);
 
 	fn leaf_data() -> Self::LeafData {
-		Self::parent_hash()
+		(
+			Self::block_number().saturating_sub(One::one()),
+			Self::parent_hash()
+		)
 	}
 }
 
@@ -70,7 +80,7 @@ impl<Hash> OnNewRoot<Hash> for () {
 }
 
 /// A full leaf content stored in the offchain-db.
-pub trait FullLeaf: Clone + PartialEq + fmt::Debug + codec::Decode {
+pub trait FullLeaf: Clone + PartialEq + fmt::Debug {
 	/// Encode the leaf either in it's full or compact form.
 	///
 	/// NOTE the encoding returned here MUST be `Decode`able into `FullLeaf`.
@@ -127,7 +137,7 @@ mod encoding {
 		}
 	}
 
-	impl<H: traits::Hash, L: FullLeaf> codec::Decode for DataOrHash<H, L> {
+	impl<H: traits::Hash, L: FullLeaf + codec::Decode> codec::Decode for DataOrHash<H, L> {
 		fn decode<I: codec::Input>(value: &mut I) -> Result<Self, codec::Error> {
 			let decoded: Either<Vec<u8>, H::Output> = Either::decode(value)?;
 			Ok(match decoded {
@@ -164,6 +174,7 @@ impl<H: traits::Hash, L: FullLeaf> DataOrHash<H, L> {
 /// you don't care about with their hashes.
 #[derive(RuntimeDebug, Clone, PartialEq)]
 pub struct Compact<H, T> {
+	/// Internal tuple representation.
 	pub tuple: T,
 	_hash: sp_std::marker::PhantomData<H>,
 }
@@ -177,6 +188,7 @@ impl<H, T> sp_std::ops::Deref for Compact<H, T> {
 }
 
 impl<H, T> Compact<H, T> {
+	/// Create a new [Compact] wrapper for a tuple.
 	pub fn new(tuple: T) -> Self {
 		Self { tuple, _hash: Default::default() }
 	}
@@ -274,15 +286,114 @@ pub struct Proof<Hash> {
 	pub items: Vec<Hash>,
 }
 
+/// Merkle Mountain Range operation error.
+#[derive(RuntimeDebug, codec::Encode, codec::Decode, PartialEq, Eq)]
+pub enum Error {
+	/// Error while pushing new node.
+	Push,
+	/// Error getting the new root.
+	GetRoot,
+	/// Error commiting changes.
+	Commit,
+	/// Error during proof generation.
+	GenerateProof,
+	/// Proof verification error.
+	Verify,
+	/// Leaf not found in the storage.
+	LeafNotFound,
+}
+
+impl Error {
+	#![allow(unused_variables)]
+	/// Consume given error `e` with `self` and generate a native log entry with error details.
+	pub fn log_error(self, e: impl fmt::Debug) -> Self {
+		debug::native::error!("[{:?}] MMR error: {:?}", self, e);
+		self
+	}
+
+	/// Consume given error `e` with `self` and generate a native log entry with error details.
+	pub fn log_debug(self, e: impl fmt::Debug) -> Self {
+		debug::native::debug!("[{:?}] MMR error: {:?}", self, e);
+		self
+	}
+}
+
+/// A helper type to allow using arbitrary SCALE-encoded leaf data in the RuntimeApi.
+///
+/// The point is to be able to verify MMR proofs from external MMRs, where we don't
+/// know the exact leaf type, but it's enough for us to have it SCALE-encoded.
+///
+/// Note the leaf type should be encoded in its compact form when passed through this type.
+/// See [FullLeaf] documentation for details.
+///
+/// This type does not implement SCALE encoding/decoding on purpose to avoid confusion,
+/// it would have to be SCALE-compatible with the concrete leaf type, but due to SCALE limitations
+/// it's not possible to know how many bytes the encoding of concrete leaf type uses.
+#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
+#[derive(RuntimeDebug, Clone, PartialEq)]
+pub struct OpaqueLeaf(
+	/// Raw bytes of the leaf type encoded in its compact form.
+	///
+	/// NOTE it DOES NOT include length prefix (like `Vec<u8>` encoding would).
+	#[cfg_attr(feature = "std", serde(with = "sp_core::bytes"))]
+	pub Vec<u8>
+);
+
+impl OpaqueLeaf {
+	/// Convert a concrete MMR leaf into an opaque type.
+	pub fn from_leaf<T: FullLeaf>(leaf: &T) -> Self {
+		let encoded_leaf = leaf.using_encoded(|d| d.to_vec(), true);
+		OpaqueLeaf::from_encoded_leaf(encoded_leaf)
+	}
+
+	/// Create a `OpaqueLeaf` given raw bytes of compact-encoded leaf.
+	pub fn from_encoded_leaf(encoded_leaf: Vec<u8>) -> Self {
+		OpaqueLeaf(encoded_leaf)
+	}
+}
+
+impl FullLeaf for OpaqueLeaf {
+	fn using_encoded<R, F: FnOnce(&[u8]) -> R>(&self, f: F, _compact: bool) -> R {
+		f(&self.0)
+	}
+}
+
+sp_api::decl_runtime_apis! {
+	/// API to interact with MMR pallet.
+	pub trait MmrApi<Leaf: codec::Codec, Hash: codec::Codec> {
+		/// Generate MMR proof for a leaf under given index.
+		fn generate_proof(leaf_index: u64) -> Result<(Leaf, Proof<Hash>), Error>;
+
+		/// Verify MMR proof against on-chain MMR.
+		///
+		/// Note this function will use on-chain MMR root hash and check if the proof
+		/// matches the hash.
+		/// See [Self::verify_proof_stateless] for a stateless verifier.
+		fn verify_proof(leaf: Leaf, proof: Proof<Hash>) -> Result<(), Error>;
+
+		/// Verify MMR proof against given root hash.
+		///
+		/// Note this function does not require any on-chain storage - the
+		/// proof is verified against given MMR root hash.
+		///
+		/// The leaf data is expected to be encoded in it's compact form.
+		fn verify_proof_stateless(root: Hash, leaf: Vec<u8>, proof: Proof<Hash>)
+			-> Result<(), Error>;
+	}
+}
 
 #[cfg(test)]
 mod tests {
 	use super::*;
 
 	use codec::Decode;
-	use crate::tests::hex;
+	use sp_core::H256;
 	use sp_runtime::traits::Keccak256;
 
+	pub(crate) fn hex(s: &str) -> H256 {
+		s.parse().unwrap()
+	}
+
 	type Test = DataOrHash<Keccak256, String>;
 	type TestCompact = Compact<Keccak256, (Test, Test)>;
 	type TestProof = Proof<<Keccak256 as traits::Hash>::Output>;
@@ -412,4 +523,35 @@ mod tests {
 
 		assert_eq!(decoded_compact, vec![Ok(d.clone()), Ok(d.clone())]);
 	}
+
+	#[test]
+	fn opaque_leaves_should_be_scale_compatible_with_concrete_ones() {
+		// given
+		let a = Test::Data("Hello World!".into());
+		let b = Test::Data("".into());
+
+		let c: TestCompact = Compact::new((a.clone(), b.clone()));
+		let d: TestCompact = Compact::new((
+			Test::Hash(a.hash()),
+			Test::Hash(b.hash()),
+		));
+		let cases = vec![c, d.clone()];
+
+		let encoded_compact = cases
+			.iter()
+			.map(|c| c.using_encoded(|x| x.to_vec(), true))
+			.map(OpaqueLeaf::from_encoded_leaf)
+			.collect::<Vec<_>>();
+
+		let opaque = cases
+			.iter()
+			.map(OpaqueLeaf::from_leaf)
+			.collect::<Vec<_>>();
+
+		// then
+		assert_eq!(
+			encoded_compact,
+			opaque,
+		);
+	}
 }
diff --git a/frame/merkle-mountain-range/src/lib.rs b/frame/merkle-mountain-range/src/lib.rs
index 85e448fd3a17..b137be7b53c1 100644
--- a/frame/merkle-mountain-range/src/lib.rs
+++ b/frame/merkle-mountain-range/src/lib.rs
@@ -73,7 +73,7 @@ mod mock;
 #[cfg(test)]
 mod tests;
 
-pub mod primitives;
+pub use pallet_mmr_primitives as primitives;
 
 pub trait WeightInfo {
 	fn on_initialize(peaks: u64) -> Weight;
@@ -118,6 +118,9 @@ pub trait Config<I = DefaultInstance>: frame_system::Config {
 	/// [LeafDataProvider](primitives::LeafDataProvider)s can be composed into tuples to put
 	/// multiple elements into the tree. In such a case it might be worth using [primitives::Compact]
 	/// to make MMR proof for one element of the tuple leaner.
+	///
+	/// Note that the leaf at each block MUST be unique. You may want to include a block hash or block
+	/// number as an easiest way to ensure that.
 	type LeafData: primitives::LeafDataProvider;
 
 	/// A hook to act on the new MMR root.
@@ -182,6 +185,28 @@ type LeafOf<T, I> = <<T as Config<I>>::LeafData as primitives::LeafDataProvider>
 /// Hashing used for the pallet.
 pub(crate) type HashingOf<T, I> = <T as Config<I>>::Hashing;
 
+/// Stateless MMR proof verification.
+///
+/// This function can be used to verify received MMR proof (`proof`)
+/// for given leaf data (`leaf`) against a known MMR root hash (`root`).
+///
+/// The verification does not require any storage access.
+pub fn verify_leaf_proof<H, L>(
+	root: H::Output,
+	leaf: mmr::Node<H, L>,
+	proof: primitives::Proof<H::Output>,
+) -> Result<(), primitives::Error> where
+	H: traits::Hash,
+	L: primitives::FullLeaf,
+{
+	let is_valid = mmr::verify_leaf_proof::<H, L>(root, leaf, proof)?;
+	if is_valid {
+		Ok(())
+	} else {
+		Err(primitives::Error::Verify.log_debug(("The proof is incorrect.", root)))
+	}
+}
+
 impl<T: Config<I>, I: Instance> Module<T, I> {
 	fn offchain_key(pos: u64) -> sp_std::prelude::Vec<u8> {
 		(T::INDEXING_PREFIX, pos).encode()
@@ -195,7 +220,7 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 	/// It may return an error or panic if used incorrectly.
 	pub fn generate_proof(leaf_index: u64) -> Result<
 		(LeafOf<T, I>, primitives::Proof<<T as Config<I>>::Hash>),
-		mmr::Error,
+		primitives::Error,
 	> {
 		let mmr: ModuleMmr<mmr::storage::OffchainStorage, T, I> = mmr::Mmr::new(Self::mmr_leaves());
 		mmr.generate_proof(leaf_index)
@@ -210,12 +235,12 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 	pub fn verify_leaf(
 		leaf: LeafOf<T, I>,
 		proof: primitives::Proof<<T as Config<I>>::Hash>,
-	) -> Result<(), mmr::Error> {
+	) -> Result<(), primitives::Error> {
 		if proof.leaf_count > Self::mmr_leaves()
 			|| proof.leaf_count == 0
 			|| proof.items.len() as u32 > mmr::utils::NodesUtils::new(proof.leaf_count).depth()
 		{
-			return Err(mmr::Error::Verify.log_debug(
+			return Err(primitives::Error::Verify.log_debug(
 				"The proof has incorrect number of leaves or proof items."
 			));
 		}
@@ -225,7 +250,7 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 		if is_valid {
 			Ok(())
 		} else {
-			Err(mmr::Error::Verify.log_debug("The proof is incorrect."))
+			Err(primitives::Error::Verify.log_debug("The proof is incorrect."))
 		}
 	}
 }
diff --git a/frame/merkle-mountain-range/src/mmr/mmr.rs b/frame/merkle-mountain-range/src/mmr/mmr.rs
index 10762d98d7e0..a3d373bfd2e9 100644
--- a/frame/merkle-mountain-range/src/mmr/mmr.rs
+++ b/frame/merkle-mountain-range/src/mmr/mmr.rs
@@ -22,12 +22,35 @@ use crate::{
 		storage::{Storage, OffchainStorage, RuntimeStorage},
 		utils::NodesUtils,
 	},
-	primitives,
+	primitives::{self, Error},
 };
-use frame_support::{debug, RuntimeDebug};
-use sp_std::fmt;
 #[cfg(not(feature = "std"))]
-use sp_std::{vec, prelude::Vec};
+use sp_std::vec;
+
+/// Stateless verification of the leaf proof.
+pub fn verify_leaf_proof<H, L>(
+	root: H::Output,
+	leaf: Node<H, L>,
+	proof: primitives::Proof<H::Output>,
+) -> Result<bool, Error> where
+	H: sp_runtime::traits::Hash,
+	L: primitives::FullLeaf,
+{
+	let size = NodesUtils::new(proof.leaf_count).size();
+	let leaf_position = mmr_lib::leaf_index_to_pos(proof.leaf_index);
+
+	let p = mmr_lib::MerkleProof::<
+		Node<H, L>,
+		Hasher<H, L>,
+	>::new(
+		size,
+		proof.items.into_iter().map(Node::Hash).collect(),
+	);
+	p.verify(
+		Node::Hash(root),
+		vec![(leaf_position, leaf)],
+	).map_err(|e| Error::Verify.log_debug(e))
+}
 
 /// A wrapper around a MMR library to expose limited functionality.
 ///
@@ -123,7 +146,7 @@ impl<T, I, L> Mmr<RuntimeStorage, T, I, L> where
 impl<T, I, L> Mmr<OffchainStorage, T, I, L> where
 	T: Config<I>,
 	I: Instance,
-	L: primitives::FullLeaf,
+	L: primitives::FullLeaf + codec::Decode,
 {
 	/// Generate a proof for given leaf index.
 	///
@@ -151,36 +174,3 @@ impl<T, I, L> Mmr<OffchainStorage, T, I, L> where
 	}
 }
 
-/// Merkle Mountain Range operation error.
-#[derive(RuntimeDebug)]
-#[cfg_attr(test, derive(PartialEq, Eq))]
-pub enum Error {
-	/// Error while pushing new node.
-	Push,
-	/// Error getting the new root.
-	GetRoot,
-	/// Error commiting changes.
-	Commit,
-	/// Error during proof generation.
-	GenerateProof,
-	/// Proof verification error.
-	Verify,
-	/// Leaf not found in the storage.
-	LeafNotFound,
-}
-
-impl Error {
-	/// Consume given error `e` with `self` and generate a native log entry with error details.
-	pub(crate) fn log_error(self, e: impl fmt::Debug) -> Self {
-		debug::native::error!("[{:?}] MMR error: {:?}", self, e);
-		self
-	}
-
-	/// Consume given error `e` with `self` and generate a native log entry with error details.
-	pub(crate) fn log_debug(self, e: impl fmt::Debug) -> Self {
-		debug::native::debug!("[{:?}] MMR error: {:?}", self, e);
-		self
-	}
-
-}
-
diff --git a/frame/merkle-mountain-range/src/mmr/mod.rs b/frame/merkle-mountain-range/src/mmr/mod.rs
index 38833af6f2f8..e705b247067e 100644
--- a/frame/merkle-mountain-range/src/mmr/mod.rs
+++ b/frame/merkle-mountain-range/src/mmr/mod.rs
@@ -22,7 +22,7 @@ mod mmr;
 use crate::primitives::FullLeaf;
 use sp_runtime::traits;
 
-pub use self::mmr::{Mmr, Error};
+pub use self::mmr::{Mmr, verify_leaf_proof};
 
 /// Node type for runtime `T`.
 pub type NodeOf<T, I, L> = Node<<T as crate::Config<I>>::Hashing, L>;
diff --git a/frame/merkle-mountain-range/src/mmr/storage.rs b/frame/merkle-mountain-range/src/mmr/storage.rs
index c8390e27047c..0bff53f2fb05 100644
--- a/frame/merkle-mountain-range/src/mmr/storage.rs
+++ b/frame/merkle-mountain-range/src/mmr/storage.rs
@@ -57,7 +57,7 @@ impl<StorageType, T, I, L> Default for Storage<StorageType, T, I, L> {
 impl<T, I, L> mmr_lib::MMRStore<NodeOf<T, I, L>> for Storage<OffchainStorage, T, I, L> where
 	T: Config<I>,
 	I: Instance,
-	L: primitives::FullLeaf,
+	L: primitives::FullLeaf + codec::Decode,
 {
 	fn get_elem(&self, pos: u64) -> mmr_lib::Result<Option<NodeOf<T, I, L>>> {
 		let key = Module::<T, I>::offchain_key(pos);
diff --git a/frame/merkle-mountain-range/src/mock.rs b/frame/merkle-mountain-range/src/mock.rs
index 153aecdbd313..2cb4e7c4dc29 100644
--- a/frame/merkle-mountain-range/src/mock.rs
+++ b/frame/merkle-mountain-range/src/mock.rs
@@ -16,12 +16,12 @@
 // limitations under the License.
 
 use crate::*;
-use crate::primitives::{LeafDataProvider, Compact};
 
 use codec::{Encode, Decode};
 use frame_support::{
 	impl_outer_origin, parameter_types,
 };
+use pallet_mmr_primitives::{LeafDataProvider, Compact};
 use sp_core::H256;
 use sp_runtime::{
 	testing::Header,
diff --git a/frame/merkle-mountain-range/src/tests.rs b/frame/merkle-mountain-range/src/tests.rs
index c279e42a8c23..63e4ec225706 100644
--- a/frame/merkle-mountain-range/src/tests.rs
+++ b/frame/merkle-mountain-range/src/tests.rs
@@ -17,7 +17,6 @@
 
 use crate::*;
 use crate::mock::*;
-use crate::primitives::{Proof, Compact};
 
 use frame_support::traits::OnInitialize;
 use sp_core::{
@@ -27,6 +26,7 @@ use sp_core::{
 		OffchainExt,
 	},
 };
+use pallet_mmr_primitives::{Proof, Compact};
 
 pub(crate) fn new_test_ext() -> sp_io::TestExternalities {
 	frame_system::GenesisConfig::default().build_storage::<Test>().unwrap().into()
@@ -55,12 +55,14 @@ pub(crate) fn hex(s: &str) -> H256 {
 	s.parse().unwrap()
 }
 
+type BlockNumber = <Test as frame_system::Config>::BlockNumber;
+
 fn decode_node(v: Vec<u8>) -> mmr::Node<
 	<Test as Config>::Hashing,
-	(H256, LeafData),
+	((BlockNumber, H256), LeafData),
 > {
 	use crate::primitives::DataOrHash;
-	type A = DataOrHash::<<Test as Config>::Hashing, H256>;
+	type A = DataOrHash::<<Test as Config>::Hashing, (BlockNumber, H256)>;
 	type B = DataOrHash::<<Test as Config>::Hashing, LeafData>;
 	type Node = mmr::Node<<Test as Config>::Hashing, (A, B)>;
 	let tuple: Node = codec::Decode::decode(&mut &v[..]).unwrap();
@@ -97,10 +99,10 @@ fn should_start_empty() {
 		// then
 		assert_eq!(crate::NumberOfLeaves::<DefaultInstance>::get(), 1);
 		assert_eq!(crate::Nodes::<Test>::get(0),
-			Some(hex("da5e6d0616e05c6a6348605a37ca33493fc1a15ad1e6a405ee05c17843fdafed")));
+			Some(hex("4320435e8c3318562dba60116bdbcc0b82ffcecb9bb39aae3300cfda3ad0b8b0")));
 		assert_eq!(
 			crate::RootHash::<Test>::get(),
-			hex("da5e6d0616e05c6a6348605a37ca33493fc1a15ad1e6a405ee05c17843fdafed")
+			hex("4320435e8c3318562dba60116bdbcc0b82ffcecb9bb39aae3300cfda3ad0b8b0")
 		);
 		assert!(weight != 0);
 	});
@@ -117,32 +119,34 @@ fn should_append_to_mmr_when_on_initialize_is_called() {
 
 		// then
 		assert_eq!(crate::NumberOfLeaves::<DefaultInstance>::get(), 2);
-		assert_eq!(crate::Nodes::<Test>::get(0),
-			Some(hex("da5e6d0616e05c6a6348605a37ca33493fc1a15ad1e6a405ee05c17843fdafed")));
-		assert_eq!(crate::Nodes::<Test>::get(1),
-			Some(hex("ff5d891b28463a3440e1b650984685efdf260e482cb3807d53c49090841e755f")));
-		assert_eq!(crate::Nodes::<Test>::get(2),
-			Some(hex("bc54778fab79f586f007bd408dca2c4aa07959b27d1f2c8f4f2549d1fcfac8f8")));
-		assert_eq!(crate::Nodes::<Test>::get(3), None);
-		assert_eq!(
+		assert_eq!((
+			crate::Nodes::<Test>::get(0),
+			crate::Nodes::<Test>::get(1),
+			crate::Nodes::<Test>::get(2),
+			crate::Nodes::<Test>::get(3),
 			crate::RootHash::<Test>::get(),
-			hex("bc54778fab79f586f007bd408dca2c4aa07959b27d1f2c8f4f2549d1fcfac8f8")
-		);
+		), (
+			Some(hex("4320435e8c3318562dba60116bdbcc0b82ffcecb9bb39aae3300cfda3ad0b8b0")),
+			Some(hex("ad4cbc033833612ccd4626d5f023b9dfc50a35e838514dd1f3c86f8506728705")),
+			Some(hex("672c04a9cd05a644789d769daa552d35d8de7c33129f8a7cbf49e595234c4854")),
+			None,
+			hex("672c04a9cd05a644789d769daa552d35d8de7c33129f8a7cbf49e595234c4854"),
+		));
 	});
 
 	// make sure the leaves end up in the offchain DB
 	ext.persist_offchain_overlay();
 	let offchain_db = ext.offchain_db();
 	assert_eq!(offchain_db.get(&MMR::offchain_key(0)).map(decode_node), Some(mmr::Node::Data((
-		H256::repeat_byte(1),
+		(0, H256::repeat_byte(1)),
 		LeafData::new(1),
 	))));
 	assert_eq!(offchain_db.get(&MMR::offchain_key(1)).map(decode_node), Some(mmr::Node::Data((
-		H256::repeat_byte(2),
+		(1, H256::repeat_byte(2)),
 		LeafData::new(2),
 	))));
 	assert_eq!(offchain_db.get(&MMR::offchain_key(2)).map(decode_node), Some(mmr::Node::Hash(
-		hex("bc54778fab79f586f007bd408dca2c4aa07959b27d1f2c8f4f2549d1fcfac8f8")
+		hex("672c04a9cd05a644789d769daa552d35d8de7c33129f8a7cbf49e595234c4854")
 	)));
 	assert_eq!(offchain_db.get(&MMR::offchain_key(3)), None);
 }
@@ -156,14 +160,15 @@ fn should_construct_larger_mmr_correctly() {
 
 		// then
 		assert_eq!(crate::NumberOfLeaves::<DefaultInstance>::get(), 7);
-		assert_eq!(crate::Nodes::<Test>::get(0),
-			Some(hex("da5e6d0616e05c6a6348605a37ca33493fc1a15ad1e6a405ee05c17843fdafed")));
-		assert_eq!(crate::Nodes::<Test>::get(10),
-			Some(hex("af3327deed0515c8d1902c9b5cd375942d42f388f3bfe3d1cd6e1b86f9cc456c")));
-		assert_eq!(
+		assert_eq!((
+			crate::Nodes::<Test>::get(0),
+			crate::Nodes::<Test>::get(10),
 			crate::RootHash::<Test>::get(),
-			hex("fc4f9042bd2f73feb26f3fc42db834c5f1943fa20070ddf106c486a478a0d561")
-		);
+		), (
+			Some(hex("4320435e8c3318562dba60116bdbcc0b82ffcecb9bb39aae3300cfda3ad0b8b0")),
+			Some(hex("611c2174c6164952a66d985cfe1ec1a623794393e3acff96b136d198f37a648c")),
+			hex("e45e25259f7930626431347fa4dd9aae7ac83b4966126d425ca70ab343709d2c"),
+		));
 	});
 }
 
@@ -187,38 +192,38 @@ fn should_generate_proofs_correctly() {
 
 		// then
 		assert_eq!(proofs[0], (Compact::new((
-			H256::repeat_byte(1).into(),
+			(0, H256::repeat_byte(1)).into(),
 			LeafData::new(1).into(),
 		)), Proof {
 			leaf_index: 0,
 			leaf_count: 7,
 			items: vec![
-				hex("ff5d891b28463a3440e1b650984685efdf260e482cb3807d53c49090841e755f"),
-				hex("00b0046bd2d63fcb760cf50a262448bb2bbf9a264b0b0950d8744044edf00dc3"),
-				hex("16de0900b57bf359a0733674ebfbba0f494e95a8391b4bfeae850019399f3ec0"),
+				hex("ad4cbc033833612ccd4626d5f023b9dfc50a35e838514dd1f3c86f8506728705"),
+				hex("cb24f4614ad5b2a5430344c99545b421d9af83c46fd632d70a332200884b4d46"),
+				hex("dca421199bdcc55bb773c6b6967e8d16675de69062b52285ca63685241fdf626"),
 			],
 		}));
 		assert_eq!(proofs[4], (Compact::new((
-			H256::repeat_byte(5).into(),
+			(4, H256::repeat_byte(5)).into(),
 			LeafData::new(5).into(),
 		)), Proof {
 			leaf_index: 4,
 			leaf_count: 7,
 			items: vec![
-				hex("e53ee36ba6c068b1a6cfef7862fed5005df55615e1c9fa6eeefe08329ac4b94b"),
-				hex("c09d4a008a0f1ef37860bef33ec3088ccd94268c0bfba7ff1b3c2a1075b0eb92"),
-				hex("af3327deed0515c8d1902c9b5cd375942d42f388f3bfe3d1cd6e1b86f9cc456c"),
+				hex("ae88a0825da50e953e7a359c55fe13c8015e48d03d301b8bdfc9193874da9252"),
+				hex("8ed25570209d8f753d02df07c1884ddb36a3d9d4770e4608b188322151c657fe"),
+				hex("611c2174c6164952a66d985cfe1ec1a623794393e3acff96b136d198f37a648c"),
 			],
 		}));
 		assert_eq!(proofs[6], (Compact::new((
-			H256::repeat_byte(7).into(),
+			(6, H256::repeat_byte(7)).into(),
 			LeafData::new(7).into(),
 		)), Proof {
 			leaf_index: 6,
 			leaf_count: 7,
 			items: vec![
-				hex("e53ee36ba6c068b1a6cfef7862fed5005df55615e1c9fa6eeefe08329ac4b94b"),
-				hex("dad09f50b41822fc5ecadc25b08c3a61531d4d60e962a5aa0b6998fad5c37c5e"),
+				hex("ae88a0825da50e953e7a359c55fe13c8015e48d03d301b8bdfc9193874da9252"),
+				hex("7e4316ae2ebf7c3b6821cb3a46ca8b7a4f9351a9b40fcf014bb0a4fd8e8f29da"),
 			],
 		}));
 	});
@@ -253,6 +258,30 @@ fn should_verify() {
 	});
 }
 
+#[test]
+fn verification_should_be_stateless() {
+	let _ = env_logger::try_init();
+
+	// Start off with chain initialisation and storing indexing data off-chain
+	// (MMR Leafs)
+	let mut ext = new_test_ext();
+	ext.execute_with(|| init_chain(7));
+	ext.persist_offchain_overlay();
+
+	// Try to generate proof now. This requires the offchain extensions to be present
+	// to retrieve full leaf data.
+	register_offchain_ext(&mut ext);
+	let (leaf, proof5) = ext.execute_with(|| {
+		// when
+		crate::Module::<Test>::generate_proof(5).unwrap()
+	});
+	let root = ext.execute_with(|| crate::Module::<Test>::mmr_root_hash());
+
+	// Verify proof without relying on any on-chain data.
+	let leaf = crate::primitives::DataOrHash::Data(leaf);
+	assert_eq!(crate::verify_leaf_proof::<<Test as Config>::Hashing, _>(root, leaf, proof5), Ok(()));
+}
+
 #[test]
 fn should_verify_on_the_next_block_since_there_is_no_pruning_yet() {
 	let _ = env_logger::try_init();

From 64df2f94803e448291bc058bd09b3b750cc5c5ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Thu, 28 Jan 2021 20:44:22 +0100
Subject: [PATCH 0331/1194] Introduce a `Slot` type (#7997)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Introduce a `Slot` type

Instead of having some type definition that only was used in half of the
code or directly using `u64`, this adds a new unit type wrapper `Slot`.
This makes it especially easy for the outside api to know what type is
expected/returned.

* Change epoch duratioC

* rename all instances of slot number to slot

* Make the constructor private

Co-authored-by: André Silva <andrerfosilva@gmail.com>
---
 Cargo.lock                                    |   5 +
 bin/node/cli/src/service.rs                   |  12 +-
 bin/node/runtime/src/lib.rs                   |   4 +-
 client/consensus/aura/Cargo.toml              |   1 +
 client/consensus/aura/src/digests.rs          |  11 +-
 client/consensus/aura/src/lib.rs              |  91 +++++++------
 client/consensus/babe/Cargo.toml              |   1 +
 client/consensus/babe/rpc/src/lib.rs          |  26 ++--
 client/consensus/babe/src/authorship.rs       |  45 +++----
 client/consensus/babe/src/aux_schema.rs       |   6 +-
 client/consensus/babe/src/lib.rs              | 110 ++++++++--------
 client/consensus/babe/src/migration.rs        |  31 ++++-
 client/consensus/babe/src/tests.rs            |  46 +++----
 client/consensus/babe/src/verification.rs     |  23 ++--
 client/consensus/epochs/src/lib.rs            |  72 +++++------
 client/consensus/manual-seal/Cargo.toml       |   3 +-
 .../manual-seal/src/consensus/babe.rs         |  35 ++---
 client/consensus/slots/src/aux_schema.rs      |  44 +++----
 client/consensus/slots/src/lib.rs             | 122 +++++++++---------
 client/consensus/slots/src/slots.rs           |  16 +--
 frame/aura/src/lib.rs                         |   6 +-
 frame/babe/src/equivocation.rs                |  18 +--
 frame/babe/src/lib.rs                         |  42 +++---
 frame/babe/src/mock.rs                        |  34 ++---
 frame/babe/src/tests.rs                       |  30 ++---
 frame/offences/benchmarking/src/lib.rs        |   4 +-
 primitives/consensus/aura/Cargo.toml          |   1 +
 primitives/consensus/aura/src/inherents.rs    |   6 +-
 primitives/consensus/babe/src/digests.rs      |  24 ++--
 primitives/consensus/babe/src/inherents.rs    |   6 +-
 primitives/consensus/babe/src/lib.rs          |  31 +++--
 primitives/consensus/slots/Cargo.toml         |   2 +
 primitives/consensus/slots/src/lib.rs         |  76 ++++++++++-
 test-utils/runtime/src/lib.rs                 |  10 +-
 34 files changed, 549 insertions(+), 445 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d09e873ce678..ea23b6391433 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6724,6 +6724,7 @@ dependencies = [
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-aura",
+ "sp-consensus-slots",
  "sp-core",
  "sp-inherents",
  "sp-io",
@@ -6776,6 +6777,7 @@ dependencies = [
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-babe",
+ "sp-consensus-slots",
  "sp-consensus-vrf",
  "sp-core",
  "sp-inherents",
@@ -6856,6 +6858,7 @@ dependencies = [
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-babe",
+ "sp-consensus-slots",
  "sp-core",
  "sp-inherents",
  "sp-keyring",
@@ -8247,6 +8250,7 @@ dependencies = [
  "parity-scale-codec",
  "sp-api",
  "sp-application-crypto",
+ "sp-consensus-slots",
  "sp-inherents",
  "sp-runtime",
  "sp-std",
@@ -8288,6 +8292,7 @@ name = "sp-consensus-slots"
 version = "0.8.1"
 dependencies = [
  "parity-scale-codec",
+ "sp-arithmetic",
  "sp-runtime",
 ]
 
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index 377fb3b5e5ca..aae16ebf0313 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -514,7 +514,7 @@ mod tests {
 		let chain_spec = crate::chain_spec::tests::integration_test_config_with_single_authority();
 
 		// For the block factory
-		let mut slot_num = 1u64;
+		let mut slot = 1u64;
 
 		// For the extrinsics factory
 		let bob = Arc::new(AccountKeyring::Bob.pair());
@@ -575,7 +575,7 @@ mod tests {
 					descendent_query(&*service.client()),
 					&parent_hash,
 					parent_number,
-					slot_num,
+					slot.into(),
 				).unwrap().unwrap();
 
 				let mut digest = Digest::<H256>::default();
@@ -583,9 +583,9 @@ mod tests {
 				// even though there's only one authority some slots might be empty,
 				// so we must keep trying the next slots until we can claim one.
 				let babe_pre_digest = loop {
-					inherent_data.replace_data(sp_timestamp::INHERENT_IDENTIFIER, &(slot_num * SLOT_DURATION));
+					inherent_data.replace_data(sp_timestamp::INHERENT_IDENTIFIER, &(slot * SLOT_DURATION));
 					if let Some(babe_pre_digest) = sc_consensus_babe::test_helpers::claim_slot(
-						slot_num,
+						slot.into(),
 						&parent_header,
 						&*service.client(),
 						keystore.clone(),
@@ -594,7 +594,7 @@ mod tests {
 						break babe_pre_digest;
 					}
 
-					slot_num += 1;
+					slot += 1;
 				};
 
 				digest.push(<DigestItem as CompatibleDigestItem>::babe_pre_digest(babe_pre_digest));
@@ -625,7 +625,7 @@ mod tests {
 				let item = <DigestItem as CompatibleDigestItem>::babe_seal(
 					signature,
 				);
-				slot_num += 1;
+				slot += 1;
 
 				let mut params = BlockImportParams::new(BlockOrigin::File, new_header);
 				params.post_digests.push(item);
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index beaef37eebd3..6a9919fcbc8b 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -1200,7 +1200,7 @@ impl_runtime_apis! {
 			}
 		}
 
-		fn current_epoch_start() -> sp_consensus_babe::SlotNumber {
+		fn current_epoch_start() -> sp_consensus_babe::Slot {
 			Babe::current_epoch_start()
 		}
 
@@ -1213,7 +1213,7 @@ impl_runtime_apis! {
 		}
 
 		fn generate_key_ownership_proof(
-			_slot_number: sp_consensus_babe::SlotNumber,
+			_slot: sp_consensus_babe::Slot,
 			authority_id: sp_consensus_babe::AuthorityId,
 		) -> Option<sp_consensus_babe::OpaqueKeyOwnershipProof> {
 			use codec::Encode;
diff --git a/client/consensus/aura/Cargo.toml b/client/consensus/aura/Cargo.toml
index b6e1ba6bc10d..3b8241480a8d 100644
--- a/client/consensus/aura/Cargo.toml
+++ b/client/consensus/aura/Cargo.toml
@@ -20,6 +20,7 @@ sc-block-builder = { version = "0.8.0", path = "../../block-builder" }
 sc-client-api = { version = "2.0.0", path = "../../api" }
 codec = { package = "parity-scale-codec", version = "1.3.6" }
 sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
+sp-consensus-slots = { version = "0.8.0", path = "../../../primitives/consensus/slots" }
 derive_more = "0.99.2"
 futures = "0.3.9"
 futures-timer = "3.0.1"
diff --git a/client/consensus/aura/src/digests.rs b/client/consensus/aura/src/digests.rs
index fec412b62d1e..bbf31136b0fc 100644
--- a/client/consensus/aura/src/digests.rs
+++ b/client/consensus/aura/src/digests.rs
@@ -24,6 +24,7 @@
 use sp_core::Pair;
 use sp_consensus_aura::AURA_ENGINE_ID;
 use sp_runtime::generic::{DigestItem, OpaqueDigestItemId};
+use sp_consensus_slots::Slot;
 use codec::{Encode, Codec};
 use std::fmt::Debug;
 
@@ -38,10 +39,10 @@ pub trait CompatibleDigestItem<P: Pair>: Sized {
 	fn as_aura_seal(&self) -> Option<Signature<P>>;
 
 	/// Construct a digest item which contains the slot number
-	fn aura_pre_digest(slot_num: u64) -> Self;
+	fn aura_pre_digest(slot: Slot) -> Self;
 
 	/// If this item is an AuRa pre-digest, return the slot number
-	fn as_aura_pre_digest(&self) -> Option<u64>;
+	fn as_aura_pre_digest(&self) -> Option<Slot>;
 }
 
 impl<P, Hash> CompatibleDigestItem<P> for DigestItem<Hash> where
@@ -57,11 +58,11 @@ impl<P, Hash> CompatibleDigestItem<P> for DigestItem<Hash> where
 		self.try_to(OpaqueDigestItemId::Seal(&AURA_ENGINE_ID))
 	}
 
-	fn aura_pre_digest(slot_num: u64) -> Self {
-		DigestItem::PreRuntime(AURA_ENGINE_ID, slot_num.encode())
+	fn aura_pre_digest(slot: Slot) -> Self {
+		DigestItem::PreRuntime(AURA_ENGINE_ID, slot.encode())
 	}
 
-	fn as_aura_pre_digest(&self) -> Option<u64> {
+	fn as_aura_pre_digest(&self) -> Option<Slot> {
 		self.try_to(OpaqueDigestItemId::PreRuntime(&AURA_ENGINE_ID))
 	}
 }
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index 84d3783927e5..5b9e7c590bde 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -43,11 +43,11 @@ use prometheus_endpoint::Registry;
 use codec::{Encode, Decode, Codec};
 
 use sp_consensus::{
-	self, BlockImport, Environment, Proposer, CanAuthorWith, ForkChoiceStrategy, BlockImportParams,
-	BlockOrigin, Error as ConsensusError, SelectChain, SlotData, BlockCheckParams, ImportResult
-};
-use sp_consensus::import_queue::{
-	Verifier, BasicQueue, DefaultImportQueue, BoxJustificationImport,
+	BlockImport, Environment, Proposer, CanAuthorWith, ForkChoiceStrategy, BlockImportParams,
+	BlockOrigin, Error as ConsensusError, SelectChain, SlotData, BlockCheckParams, ImportResult,
+	import_queue::{
+		Verifier, BasicQueue, DefaultImportQueue, BoxJustificationImport,
+	},
 };
 use sc_client_api::{backend::AuxStore, BlockOf};
 use sp_blockchain::{
@@ -57,10 +57,7 @@ use sp_blockchain::{
 use sp_block_builder::BlockBuilder as BlockBuilderApi;
 use sp_core::crypto::Public;
 use sp_application_crypto::{AppKey, AppPublic};
-use sp_runtime::{
-	generic::{BlockId, OpaqueDigestItemId},
-	traits::NumberFor, Justification,
-};
+use sp_runtime::{generic::{BlockId, OpaqueDigestItemId}, traits::NumberFor, Justification};
 use sp_runtime::traits::{Block as BlockT, Header, DigestItemFor, Zero, Member};
 use sp_api::ProvideRuntimeApi;
 use sp_core::crypto::Pair;
@@ -75,6 +72,7 @@ use sc_consensus_slots::{
 	CheckedHeader, SlotInfo, SlotCompatible, StorageChanges, check_equivocation,
 	BackoffAuthoringBlocksStrategy,
 };
+use sp_consensus_slots::Slot;
 
 use sp_api::ApiExt;
 
@@ -106,10 +104,10 @@ pub fn slot_duration<A, B, C>(client: &C) -> CResult<SlotDuration> where
 }
 
 /// Get slot author for given block along with authorities.
-fn slot_author<P: Pair>(slot_num: u64, authorities: &[AuthorityId<P>]) -> Option<&AuthorityId<P>> {
+fn slot_author<P: Pair>(slot: Slot, authorities: &[AuthorityId<P>]) -> Option<&AuthorityId<P>> {
 	if authorities.is_empty() { return None }
 
-	let idx = slot_num % (authorities.len() as u64);
+	let idx = *slot % (authorities.len() as u64);
 	assert!(
 		idx <= usize::max_value() as u64,
 		"It is impossible to have a vector with length beyond the address space; qed",
@@ -239,7 +237,7 @@ where
 	fn epoch_data(
 		&self,
 		header: &B::Header,
-		_slot_number: u64,
+		_slot: Slot,
 	) -> Result<Self::EpochData, sp_consensus::Error> {
 		authorities(self.client.as_ref(), &BlockId::Hash(header.hash()))
 	}
@@ -251,10 +249,10 @@ where
 	fn claim_slot(
 		&self,
 		_header: &B::Header,
-		slot_number: u64,
+		slot: Slot,
 		epoch_data: &Self::EpochData,
 	) -> Option<Self::Claim> {
-		let expected_author = slot_author::<P>(slot_number, epoch_data);
+		let expected_author = slot_author::<P>(slot, epoch_data);
 		expected_author.and_then(|p| {
 			if SyncCryptoStore::has_keys(
 				 &*self.keystore,
@@ -269,11 +267,11 @@ where
 
 	fn pre_digest_data(
 		&self,
-		slot_number: u64,
+		slot: Slot,
 		_claim: &Self::Claim,
 	) -> Vec<sp_runtime::DigestItem<B::Hash>> {
 		vec![
-			<DigestItemFor<B> as CompatibleDigestItem<P>>::aura_pre_digest(slot_number),
+			<DigestItemFor<B> as CompatibleDigestItem<P>>::aura_pre_digest(slot),
 		]
 	}
 
@@ -323,14 +321,14 @@ where
 		self.force_authoring
 	}
 
-	fn should_backoff(&self, slot_number: u64, chain_head: &B::Header) -> bool {
+	fn should_backoff(&self, slot: Slot, chain_head: &B::Header) -> bool {
 		if let Some(ref strategy) = self.backoff_authoring_blocks {
 			if let Ok(chain_head_slot) = find_pre_digest::<B, P>(chain_head) {
 				return strategy.should_backoff(
 					*chain_head.number(),
 					chain_head_slot,
 					self.client.info().finalized_number,
-					slot_number,
+					slot,
 					self.logging_target(),
 				);
 			}
@@ -363,9 +361,10 @@ where
 		if let Some(slot_lenience) =
 			sc_consensus_slots::slot_lenience_exponential(parent_slot, slot_info)
 		{
-			debug!(target: "aura",
+			debug!(
+				target: "aura",
 				"No block for {} slots. Applying linear lenience of {}s",
-				slot_info.number.saturating_sub(parent_slot + 1),
+				slot_info.slot.saturating_sub(parent_slot + 1),
 				slot_lenience.as_secs(),
 			);
 
@@ -401,7 +400,7 @@ enum Error<B: BlockT> {
 	DataProvider(String),
 	Runtime(String),
 	#[display(fmt = "Slot number must increase: parent slot: {}, this slot: {}", _0, _1)]
-	SlotNumberMustIncrease(u64, u64),
+	SlotMustIncrease(Slot, Slot),
 	#[display(fmt = "Parent ({}) of {} unavailable. Cannot import", _0, _1)]
 	ParentUnavailable(B::Hash, B::Hash),
 }
@@ -412,16 +411,16 @@ impl<B: BlockT> std::convert::From<Error<B>> for String {
 	}
 }
 
-fn find_pre_digest<B: BlockT, P: Pair>(header: &B::Header) -> Result<u64, Error<B>>
+fn find_pre_digest<B: BlockT, P: Pair>(header: &B::Header) -> Result<Slot, Error<B>>
 	where DigestItemFor<B>: CompatibleDigestItem<P>,
 		P::Signature: Decode,
 		P::Public: Encode + Decode + PartialEq + Clone,
 {
 	if header.number().is_zero() {
-		return Ok(0);
+		return Ok(0.into());
 	}
 
-	let mut pre_digest: Option<u64> = None;
+	let mut pre_digest: Option<Slot> = None;
 	for log in header.digest().logs() {
 		trace!(target: "aura", "Checking log {:?}", log);
 		match (log.as_aura_pre_digest(), pre_digest.is_some()) {
@@ -440,11 +439,11 @@ fn find_pre_digest<B: BlockT, P: Pair>(header: &B::Header) -> Result<u64, Error<
 //
 fn check_header<C, B: BlockT, P: Pair>(
 	client: &C,
-	slot_now: u64,
+	slot_now: Slot,
 	mut header: B::Header,
 	hash: B::Hash,
 	authorities: &[AuthorityId<P>],
-) -> Result<CheckedHeader<B::Header, (u64, DigestItemFor<B>)>, Error<B>> where
+) -> Result<CheckedHeader<B::Header, (Slot, DigestItemFor<B>)>, Error<B>> where
 	DigestItemFor<B>: CompatibleDigestItem<P>,
 	P::Signature: Decode,
 	C: sc_client_api::backend::AuxStore,
@@ -459,15 +458,15 @@ fn check_header<C, B: BlockT, P: Pair>(
 		aura_err(Error::HeaderBadSeal(hash))
 	})?;
 
-	let slot_num = find_pre_digest::<B, _>(&header)?;
+	let slot = find_pre_digest::<B, _>(&header)?;
 
-	if slot_num > slot_now {
+	if slot > slot_now {
 		header.digest_mut().push(seal);
-		Ok(CheckedHeader::Deferred(header, slot_num))
+		Ok(CheckedHeader::Deferred(header, slot))
 	} else {
 		// check the signature is valid under the expected authority and
 		// chain state.
-		let expected_author = match slot_author::<P>(slot_num, &authorities) {
+		let expected_author = match slot_author::<P>(slot, &authorities) {
 			None => return Err(Error::SlotAuthorNotFound),
 			Some(author) => author,
 		};
@@ -478,19 +477,19 @@ fn check_header<C, B: BlockT, P: Pair>(
 			if let Some(equivocation_proof) = check_equivocation(
 				client,
 				slot_now,
-				slot_num,
+				slot,
 				&header,
 				expected_author,
 			).map_err(Error::Client)? {
 				info!(
 					"Slot author is equivocating at slot {} with headers {:?} and {:?}",
-					slot_num,
+					slot,
 					equivocation_proof.first_header.hash(),
 					equivocation_proof.second_header.hash(),
 				);
 			}
 
-			Ok(CheckedHeader::Checked(header, (slot_num, seal)))
+			Ok(CheckedHeader::Checked(header, (slot, seal)))
 		} else {
 			Err(Error::BadSignature(hash))
 		}
@@ -614,12 +613,12 @@ impl<B: BlockT, C, P, CAW> Verifier<B> for AuraVerifier<C, P, CAW> where
 			&authorities[..],
 		).map_err(|e| e.to_string())?;
 		match checked_header {
-			CheckedHeader::Checked(pre_header, (slot_num, seal)) => {
+			CheckedHeader::Checked(pre_header, (slot, seal)) => {
 				// if the body is passed through, we need to use the runtime
 				// to check that the internally-set timestamp in the inherents
 				// actually matches the slot set in the seal.
 				if let Some(inner_body) = body.take() {
-					inherent_data.aura_replace_inherent_data(slot_num);
+					inherent_data.aura_replace_inherent_data(slot);
 					let block = B::new(pre_header.clone(), inner_body);
 
 					// skip the inherents verification if the runtime API is old.
@@ -803,7 +802,7 @@ impl<Block: BlockT, C, I, P> BlockImport<Block> for AuraBlockImport<Block, C, I,
 		new_cache: HashMap<CacheKeyId, Vec<u8>>,
 	) -> Result<ImportResult, Self::Error> {
 		let hash = block.post_hash();
-		let slot_number = find_pre_digest::<Block, P>(&block.header)
+		let slot = find_pre_digest::<Block, P>(&block.header)
 			.expect("valid Aura headers must contain a predigest; \
 					 header has been already verified; qed");
 
@@ -819,10 +818,10 @@ impl<Block: BlockT, C, I, P> BlockImport<Block> for AuraBlockImport<Block, C, I,
 					parent header has already been verified; qed");
 
 		// make sure that slot number is strictly increasing
-		if slot_number <= parent_slot {
+		if slot <= parent_slot {
 			return Err(
 				ConsensusError::ClientImport(aura_err(
-					Error::<Block>::SlotNumberMustIncrease(parent_slot, slot_number)
+					Error::<Block>::SlotMustIncrease(parent_slot, slot)
 				).into())
 			);
 		}
@@ -1113,13 +1112,13 @@ mod tests {
 			Default::default(),
 			Default::default()
 		);
-		assert!(worker.claim_slot(&head, 0, &authorities).is_none());
-		assert!(worker.claim_slot(&head, 1, &authorities).is_none());
-		assert!(worker.claim_slot(&head, 2, &authorities).is_none());
-		assert!(worker.claim_slot(&head, 3, &authorities).is_some());
-		assert!(worker.claim_slot(&head, 4, &authorities).is_none());
-		assert!(worker.claim_slot(&head, 5, &authorities).is_none());
-		assert!(worker.claim_slot(&head, 6, &authorities).is_none());
-		assert!(worker.claim_slot(&head, 7, &authorities).is_some());
+		assert!(worker.claim_slot(&head, 0.into(), &authorities).is_none());
+		assert!(worker.claim_slot(&head, 1.into(), &authorities).is_none());
+		assert!(worker.claim_slot(&head, 2.into(), &authorities).is_none());
+		assert!(worker.claim_slot(&head, 3.into(), &authorities).is_some());
+		assert!(worker.claim_slot(&head, 4.into(), &authorities).is_none());
+		assert!(worker.claim_slot(&head, 5.into(), &authorities).is_none());
+		assert!(worker.claim_slot(&head, 6.into(), &authorities).is_none());
+		assert!(worker.claim_slot(&head, 7.into(), &authorities).is_some());
 	}
 }
diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml
index 8104ca2047ca..52d84435407c 100644
--- a/client/consensus/babe/Cargo.toml
+++ b/client/consensus/babe/Cargo.toml
@@ -35,6 +35,7 @@ sp-api = { version = "2.0.0", path = "../../../primitives/api" }
 sp-block-builder = { version = "2.0.0", path = "../../../primitives/block-builder" }
 sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
 sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
+sp-consensus-slots = { version = "0.8.0", path = "../../../primitives/consensus/slots" }
 sp-consensus-vrf = { version = "0.8.0", path = "../../../primitives/consensus/vrf" }
 sc-consensus-uncles = { version = "0.8.0", path = "../uncles" }
 sc-consensus-slots = { version = "0.8.0", path = "../slots" }
diff --git a/client/consensus/babe/rpc/src/lib.rs b/client/consensus/babe/rpc/src/lib.rs
index 4d5c091e0cbb..ca14a764eece 100644
--- a/client/consensus/babe/rpc/src/lib.rs
+++ b/client/consensus/babe/rpc/src/lib.rs
@@ -124,7 +124,13 @@ impl<B, C, SC> BabeApi for BabeRpcHandler<B, C, SC>
 				.map_err(|err| {
 					Error::StringError(format!("{:?}", err))
 				})?;
-			let epoch = epoch_data(&shared_epoch, &client, &babe_config, epoch_start, &select_chain)?;
+			let epoch = epoch_data(
+				&shared_epoch,
+				&client,
+				&babe_config,
+				*epoch_start,
+				&select_chain,
+			)?;
 			let (epoch_start, epoch_end) = (epoch.start_slot(), epoch.end_slot());
 
 			let mut claims: HashMap<AuthorityId, EpochAuthorship> = HashMap::new();
@@ -142,19 +148,19 @@ impl<B, C, SC> BabeApi for BabeRpcHandler<B, C, SC>
 					.collect::<Vec<_>>()
 			};
 
-			for slot_number in epoch_start..epoch_end {
+			for slot in *epoch_start..*epoch_end {
 				if let Some((claim, key)) =
-					authorship::claim_slot_using_keys(slot_number, &epoch, &keystore, &keys)
+					authorship::claim_slot_using_keys(slot.into(), &epoch, &keystore, &keys)
 				{
 					match claim {
 						PreDigest::Primary { .. } => {
-							claims.entry(key).or_default().primary.push(slot_number);
+							claims.entry(key).or_default().primary.push(slot);
 						}
 						PreDigest::SecondaryPlain { .. } => {
-							claims.entry(key).or_default().secondary.push(slot_number);
+							claims.entry(key).or_default().secondary.push(slot);
 						}
 						PreDigest::SecondaryVRF { .. } => {
-							claims.entry(key).or_default().secondary_vrf.push(slot_number);
+							claims.entry(key).or_default().secondary_vrf.push(slot.into());
 						},
 					};
 				}
@@ -167,7 +173,7 @@ impl<B, C, SC> BabeApi for BabeRpcHandler<B, C, SC>
 	}
 }
 
-/// Holds information about the `slot_number`'s that can be claimed by a given key.
+/// Holds information about the `slot`'s that can be claimed by a given key.
 #[derive(Default, Debug, Deserialize, Serialize)]
 pub struct EpochAuthorship {
 	/// the array of primary slots that can be claimed
@@ -197,12 +203,12 @@ impl From<Error> for jsonrpc_core::Error {
 	}
 }
 
-/// fetches the epoch data for a given slot_number.
+/// fetches the epoch data for a given slot.
 fn epoch_data<B, C, SC>(
 	epoch_changes: &SharedEpochChanges<B, Epoch>,
 	client: &Arc<C>,
 	babe_config: &Config,
-	slot_number: u64,
+	slot: u64,
 	select_chain: &SC,
 ) -> Result<Epoch, Error>
 	where
@@ -215,7 +221,7 @@ fn epoch_data<B, C, SC>(
 		descendent_query(&**client),
 		&parent.hash(),
 		parent.number().clone(),
-		slot_number,
+		slot.into(),
 		|slot| Epoch::genesis(&babe_config, slot),
 	)
 		.map_err(|e| Error::Consensus(ConsensusError::ChainLookup(format!("{:?}", e))))?
diff --git a/client/consensus/babe/src/authorship.rs b/client/consensus/babe/src/authorship.rs
index 90ad12c4558c..1120f660613a 100644
--- a/client/consensus/babe/src/authorship.rs
+++ b/client/consensus/babe/src/authorship.rs
@@ -20,11 +20,8 @@
 
 use sp_application_crypto::AppKey;
 use sp_consensus_babe::{
-	BABE_VRF_PREFIX,
-	AuthorityId, BabeAuthorityWeight,
-	SlotNumber,
-	make_transcript,
-	make_transcript_data,
+	BABE_VRF_PREFIX, AuthorityId, BabeAuthorityWeight, make_transcript, make_transcript_data,
+	Slot,
 };
 use sp_consensus_babe::digests::{
 	PreDigest, PrimaryPreDigest, SecondaryPlainPreDigest, SecondaryVRFPreDigest,
@@ -106,7 +103,7 @@ pub(super) fn check_primary_threshold(inout: &VRFInOut, threshold: u128) -> bool
 /// authorities. This should always assign the slot to some authority unless the
 /// authorities list is empty.
 pub(super) fn secondary_slot_author(
-	slot_number: u64,
+	slot: Slot,
 	authorities: &[(AuthorityId, BabeAuthorityWeight)],
 	randomness: [u8; 32],
 ) -> Option<&AuthorityId> {
@@ -114,7 +111,7 @@ pub(super) fn secondary_slot_author(
 		return None;
 	}
 
-	let rand = U256::from((randomness, slot_number).using_encoded(blake2_256));
+	let rand = U256::from((randomness, slot).using_encoded(blake2_256));
 
 	let authorities_len = U256::from(authorities.len());
 	let idx = rand % authorities_len;
@@ -130,7 +127,7 @@ pub(super) fn secondary_slot_author(
 /// pre-digest to use when authoring the block, or `None` if it is not our turn
 /// to propose.
 fn claim_secondary_slot(
-	slot_number: SlotNumber,
+	slot: Slot,
 	epoch: &Epoch,
 	keys: &[(AuthorityId, usize)],
 	keystore: &SyncCryptoStorePtr,
@@ -143,7 +140,7 @@ fn claim_secondary_slot(
 	}
 
 	let expected_author = super::authorship::secondary_slot_author(
-		slot_number,
+		slot,
 		authorities,
 		*randomness,
 	)?;
@@ -153,7 +150,7 @@ fn claim_secondary_slot(
 			let pre_digest = if author_secondary_vrf {
 				let transcript_data = super::authorship::make_transcript_data(
 					randomness,
-					slot_number,
+					slot,
 					*epoch_index,
 				);
 				let result = SyncCryptoStore::sr25519_vrf_sign(
@@ -164,7 +161,7 @@ fn claim_secondary_slot(
 				);
 				if let Ok(signature)  = result {
 					Some(PreDigest::SecondaryVRF(SecondaryVRFPreDigest {
-						slot_number,
+						slot,
 						vrf_output: VRFOutput(signature.output),
 						vrf_proof: VRFProof(signature.proof),
 						authority_index: *authority_index as u32,
@@ -174,7 +171,7 @@ fn claim_secondary_slot(
 				}
 			} else if SyncCryptoStore::has_keys(&**keystore, &[(authority_id.to_raw_vec(), AuthorityId::ID)]) {
 				Some(PreDigest::SecondaryPlain(SecondaryPlainPreDigest {
-					slot_number,
+					slot,
 					authority_index: *authority_index as u32,
 				}))
 			} else {
@@ -195,7 +192,7 @@ fn claim_secondary_slot(
 /// secondary slots enabled for the given epoch, we will fallback to trying to
 /// claim a secondary slot.
 pub fn claim_slot(
-	slot_number: SlotNumber,
+	slot: Slot,
 	epoch: &Epoch,
 	keystore: &SyncCryptoStorePtr,
 ) -> Option<(PreDigest, AuthorityId)> {
@@ -203,24 +200,24 @@ pub fn claim_slot(
 		.enumerate()
 		.map(|(index, a)| (a.0.clone(), index))
 		.collect::<Vec<_>>();
-	claim_slot_using_keys(slot_number, epoch, keystore, &authorities)
+	claim_slot_using_keys(slot, epoch, keystore, &authorities)
 }
 
 /// Like `claim_slot`, but allows passing an explicit set of key pairs. Useful if we intend
 /// to make repeated calls for different slots using the same key pairs.
 pub fn claim_slot_using_keys(
-	slot_number: SlotNumber,
+	slot: Slot,
 	epoch: &Epoch,
 	keystore: &SyncCryptoStorePtr,
 	keys: &[(AuthorityId, usize)],
 ) -> Option<(PreDigest, AuthorityId)> {
-	claim_primary_slot(slot_number, epoch, epoch.config.c, keystore, &keys)
+	claim_primary_slot(slot, epoch, epoch.config.c, keystore, &keys)
 		.or_else(|| {
 			if epoch.config.allowed_slots.is_secondary_plain_slots_allowed() ||
 				epoch.config.allowed_slots.is_secondary_vrf_slots_allowed()
 			{
 				claim_secondary_slot(
-					slot_number,
+					slot,
 					&epoch,
 					keys,
 					&keystore,
@@ -237,7 +234,7 @@ pub fn claim_slot_using_keys(
 /// the VRF.  If the VRF produces a value less than `threshold`, it is our turn,
 /// so it returns `Some(_)`. Otherwise, it returns `None`.
 fn claim_primary_slot(
-	slot_number: SlotNumber,
+	slot: Slot,
 	epoch: &Epoch,
 	c: (u64, u64),
 	keystore: &SyncCryptoStorePtr,
@@ -248,12 +245,12 @@ fn claim_primary_slot(
 	for (authority_id, authority_index) in keys {
 		let transcript = super::authorship::make_transcript(
 			randomness,
-			slot_number,
+			slot,
 			*epoch_index
 		);
 		let transcript_data = super::authorship::make_transcript_data(
 			randomness,
-			slot_number,
+			slot,
 			*epoch_index
 		);
 		// Compute the threshold we will use.
@@ -276,7 +273,7 @@ fn claim_primary_slot(
 			};
 			if super::authorship::check_primary_threshold(&inout, threshold) {
 				let pre_digest = PreDigest::Primary(PrimaryPreDigest {
-					slot_number,
+					slot,
 					vrf_output: VRFOutput(signature.output),
 					vrf_proof: VRFProof(signature.proof),
 					authority_index: *authority_index as u32,
@@ -314,7 +311,7 @@ mod tests {
 
 		let mut epoch = Epoch {
 			epoch_index: 10,
-			start_slot: 0,
+			start_slot: 0.into(),
 			duration: 20,
 			authorities: authorities.clone(),
 			randomness: Default::default(),
@@ -324,9 +321,9 @@ mod tests {
 			},
 		};
 
-		assert!(claim_slot(10, &epoch, &keystore).is_none());
+		assert!(claim_slot(10.into(), &epoch, &keystore).is_none());
 
 		epoch.authorities.push((valid_public_key.clone().into(), 10));
-		assert_eq!(claim_slot(10, &epoch, &keystore).unwrap().1, valid_public_key.into());
+		assert_eq!(claim_slot(10.into(), &epoch, &keystore).unwrap().1, valid_public_key.into());
 	}
 }
diff --git a/client/consensus/babe/src/aux_schema.rs b/client/consensus/babe/src/aux_schema.rs
index d399a12ea8a5..acc8d57cc933 100644
--- a/client/consensus/babe/src/aux_schema.rs
+++ b/client/consensus/babe/src/aux_schema.rs
@@ -151,7 +151,7 @@ mod test {
 	#[test]
 	fn load_decode_from_v0_epoch_changes() {
 		let epoch = EpochV0 {
-			start_slot: 0,
+			start_slot: 0.into(),
 			authorities: vec![],
 			randomness: [0; 32],
 			epoch_index: 1,
@@ -195,8 +195,8 @@ mod test {
 				.map(|(_, _, epoch)| epoch.clone())
 				.collect::<Vec<_>>() ==
 				vec![PersistedEpochHeader::Regular(EpochHeader {
-					start_slot: 0,
-					end_slot: 100,
+					start_slot: 0.into(),
+					end_slot: 100.into(),
 				})],
 		); // PersistedEpochHeader does not implement Debug, so we use assert! directly.
 
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index ea3ca29dad0e..6ffa18c3cc3a 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -66,10 +66,8 @@
 #![forbid(unsafe_code)]
 #![warn(missing_docs)]
 pub use sp_consensus_babe::{
-	BabeApi, ConsensusLog, BABE_ENGINE_ID, SlotNumber,
-	BabeEpochConfiguration, BabeGenesisConfiguration,
-	AuthorityId, AuthorityPair, AuthoritySignature,
-	BabeAuthorityWeight, VRF_OUTPUT_LENGTH,
+	BabeApi, ConsensusLog, BABE_ENGINE_ID, BabeEpochConfiguration, BabeGenesisConfiguration,
+	AuthorityId, AuthorityPair, AuthoritySignature, BabeAuthorityWeight, VRF_OUTPUT_LENGTH,
 	digests::{
 		CompatibleDigestItem, NextEpochDescriptor, NextConfigDescriptor, PreDigest,
 		PrimaryPreDigest, SecondaryPlainPreDigest,
@@ -80,8 +78,7 @@ use std::{
 	collections::HashMap, sync::Arc, u64, pin::Pin, time::{Instant, Duration},
 	any::Any, borrow::Cow, convert::TryInto,
 };
-use sp_consensus::{ImportResult, CanAuthorWith};
-use sp_consensus::import_queue::BoxJustificationImport;
+use sp_consensus::{ImportResult, CanAuthorWith, import_queue::BoxJustificationImport};
 use sp_core::crypto::Public;
 use sp_application_crypto::AppKey;
 use sp_keystore::{SyncCryptoStorePtr, SyncCryptoStore};
@@ -94,16 +91,14 @@ use parking_lot::Mutex;
 use sp_inherents::{InherentDataProviders, InherentData};
 use sc_telemetry::{telemetry, CONSENSUS_TRACE, CONSENSUS_DEBUG};
 use sp_consensus::{
-	self, BlockImport, Environment, Proposer, BlockCheckParams,
+	BlockImport, Environment, Proposer, BlockCheckParams,
 	ForkChoiceStrategy, BlockImportParams, BlockOrigin, Error as ConsensusError,
-	SelectChain, SlotData,
+	SelectChain, SlotData, import_queue::{Verifier, BasicQueue, DefaultImportQueue, CacheKeyId},
 };
 use sp_consensus_babe::inherents::BabeInherentData;
 use sp_timestamp::{TimestampInherentData, InherentType as TimestampInherent};
-use sp_consensus::import_queue::{Verifier, BasicQueue, DefaultImportQueue, CacheKeyId};
 use sc_client_api::{
-	backend::AuxStore,
-	BlockchainEvents, ProvideUncles,
+	backend::AuxStore, BlockchainEvents, ProvideUncles,
 };
 use sp_block_builder::BlockBuilder as BlockBuilderApi;
 use futures::channel::mpsc::{channel, Sender, Receiver};
@@ -114,7 +109,7 @@ use log::{debug, info, log, trace, warn};
 use prometheus_endpoint::Registry;
 use sc_consensus_slots::{
 	SlotInfo, SlotCompatible, StorageChanges, CheckedHeader, check_equivocation,
-	BackoffAuthoringBlocksStrategy,
+	BackoffAuthoringBlocksStrategy
 };
 use sc_consensus_epochs::{
 	descendent_query, SharedEpochChanges, EpochChangesFor, Epoch as EpochT, ViableEpochDescriptor,
@@ -126,6 +121,7 @@ use sp_blockchain::{
 use schnorrkel::SignatureError;
 use codec::{Encode, Decode};
 use sp_api::ApiExt;
+use sp_consensus_slots::Slot;
 
 mod verification;
 mod migration;
@@ -141,9 +137,9 @@ pub struct Epoch {
 	/// The epoch index.
 	pub epoch_index: u64,
 	/// The starting slot of the epoch.
-	pub start_slot: SlotNumber,
+	pub start_slot: Slot,
 	/// The duration of this epoch.
-	pub duration: SlotNumber,
+	pub duration: u64,
 	/// The authorities and their weights.
 	pub authorities: Vec<(AuthorityId, BabeAuthorityWeight)>,
 	/// Randomness for this epoch.
@@ -154,7 +150,7 @@ pub struct Epoch {
 
 impl EpochT for Epoch {
 	type NextEpochDescriptor = (NextEpochDescriptor, BabeEpochConfiguration);
-	type SlotNumber = SlotNumber;
+	type Slot = Slot;
 
 	fn increment(
 		&self,
@@ -170,11 +166,11 @@ impl EpochT for Epoch {
 		}
 	}
 
-	fn start_slot(&self) -> SlotNumber {
+	fn start_slot(&self) -> Slot {
 		self.start_slot
 	}
 
-	fn end_slot(&self) -> SlotNumber {
+	fn end_slot(&self) -> Slot {
 		self.start_slot + self.duration
 	}
 }
@@ -184,11 +180,11 @@ impl Epoch {
 	/// the first block, so that has to be provided.
 	pub fn genesis(
 		genesis_config: &BabeGenesisConfiguration,
-		slot_number: SlotNumber
+		slot: Slot,
 	) -> Epoch {
 		Epoch {
 			epoch_index: 0,
-			start_slot: slot_number,
+			start_slot: slot,
 			duration: genesis_config.epoch_length,
 			authorities: genesis_config.genesis_authorities.clone(),
 			randomness: genesis_config.randomness,
@@ -229,7 +225,7 @@ pub enum Error<B: BlockT> {
 	ParentUnavailable(B::Hash, B::Hash),
 	/// Slot number must increase
 	#[display(fmt = "Slot number must increase: parent slot: {}, this slot: {}", _0, _1)]
-	SlotNumberMustIncrease(u64, u64),
+	SlotMustIncrease(Slot, Slot),
 	/// Header has a bad seal
 	#[display(fmt = "Header {:?} has a bad seal", _0)]
 	HeaderBadSeal(B::Hash),
@@ -262,7 +258,7 @@ pub enum Error<B: BlockT> {
 	FetchParentHeader(sp_blockchain::Error),
 	/// Expected epoch change to happen.
 	#[display(fmt = "Expected epoch change to happen at {:?}, s{}", _0, _1)]
-	ExpectedEpochChange(B::Hash, u64),
+	ExpectedEpochChange(B::Hash, Slot),
 	/// Unexpected config change.
 	#[display(fmt = "Unexpected config change")]
 	UnexpectedConfigChange,
@@ -471,7 +467,7 @@ pub fn start_babe<B, C, SC, E, I, SO, CAW, BS, Error>(BabeParams {
 #[must_use]
 pub struct BabeWorker<B: BlockT> {
 	inner: Pin<Box<dyn futures::Future<Output=()> + Send + 'static>>,
-	slot_notification_sinks: Arc<Mutex<Vec<Sender<(u64, ViableEpochDescriptor<B::Hash, NumberFor<B>, Epoch>)>>>>,
+	slot_notification_sinks: SlotNotificationSinks<B>,
 }
 
 impl<B: BlockT> BabeWorker<B> {
@@ -479,7 +475,7 @@ impl<B: BlockT> BabeWorker<B> {
 	/// epoch descriptor.
 	pub fn slot_notification_stream(
 		&self
-	) -> Receiver<(u64, ViableEpochDescriptor<B::Hash, NumberFor<B>, Epoch>)> {
+	) -> Receiver<(Slot, ViableEpochDescriptor<B::Hash, NumberFor<B>, Epoch>)> {
 		const CHANNEL_BUFFER_SIZE: usize = 1024;
 
 		let (sink, stream) = channel(CHANNEL_BUFFER_SIZE);
@@ -500,7 +496,9 @@ impl<B: BlockT> futures::Future for BabeWorker<B> {
 }
 
 /// Slot notification sinks.
-type SlotNotificationSinks<B> = Arc<Mutex<Vec<Sender<(u64, ViableEpochDescriptor<<B as BlockT>::Hash, NumberFor<B>, Epoch>)>>>>;
+type SlotNotificationSinks<B> = Arc<
+	Mutex<Vec<Sender<(Slot, ViableEpochDescriptor<<B as BlockT>::Hash, NumberFor<B>, Epoch>)>>>
+>;
 
 struct BabeSlotWorker<B: BlockT, C, E, I, SO, BS> {
 	client: Arc<C>,
@@ -551,13 +549,13 @@ where
 	fn epoch_data(
 		&self,
 		parent: &B::Header,
-		slot_number: u64,
+		slot: Slot,
 	) -> Result<Self::EpochData, ConsensusError> {
 		self.epoch_changes.lock().epoch_descriptor_for_child_of(
 			descendent_query(&*self.client),
 			&parent.hash(),
 			parent.number().clone(),
-			slot_number,
+			slot,
 		)
 			.map_err(|e| ConsensusError::ChainLookup(format!("{:?}", e)))?
 			.ok_or(sp_consensus::Error::InvalidAuthoritiesSet)
@@ -572,12 +570,12 @@ where
 	fn claim_slot(
 		&self,
 		_parent_header: &B::Header,
-		slot_number: SlotNumber,
+		slot: Slot,
 		epoch_descriptor: &ViableEpochDescriptor<B::Hash, NumberFor<B>, Epoch>,
 	) -> Option<Self::Claim> {
-		debug!(target: "babe", "Attempting to claim slot {}", slot_number);
+		debug!(target: "babe", "Attempting to claim slot {}", slot);
 		let s = authorship::claim_slot(
-			slot_number,
+			slot,
 			self.epoch_changes.lock().viable_epoch(
 				&epoch_descriptor,
 				|slot| Epoch::genesis(&self.config, slot)
@@ -586,7 +584,7 @@ where
 		);
 
 		if s.is_some() {
-			debug!(target: "babe", "Claimed slot {}", slot_number);
+			debug!(target: "babe", "Claimed slot {}", slot);
 		}
 
 		s
@@ -595,12 +593,12 @@ where
 	fn notify_slot(
 		&self,
 		_parent_header: &B::Header,
-		slot_number: SlotNumber,
+		slot: Slot,
 		epoch_descriptor: &ViableEpochDescriptor<B::Hash, NumberFor<B>, Epoch>,
 	) {
 		self.slot_notification_sinks.lock()
 			.retain_mut(|sink| {
-				match sink.try_send((slot_number, epoch_descriptor.clone())) {
+				match sink.try_send((slot, epoch_descriptor.clone())) {
 					Ok(()) => true,
 					Err(e) => {
 						if e.is_full() {
@@ -616,7 +614,7 @@ where
 
 	fn pre_digest_data(
 		&self,
-		_slot_number: u64,
+		_slot: Slot,
 		claim: &Self::Claim,
 	) -> Vec<sp_runtime::DigestItem<B::Hash>> {
 		vec![
@@ -673,16 +671,16 @@ where
 		self.force_authoring
 	}
 
-	fn should_backoff(&self, slot_number: u64, chain_head: &B::Header) -> bool {
+	fn should_backoff(&self, slot: Slot, chain_head: &B::Header) -> bool {
 		if let Some(ref strategy) = self.backoff_authoring_blocks {
 			if let Ok(chain_head_slot) = find_pre_digest::<B>(chain_head)
-				.map(|digest| digest.slot_number())
+				.map(|digest| digest.slot())
 			{
 				return strategy.should_backoff(
 					*chain_head.number(),
 					chain_head_slot,
 					self.client.info().finalized_number,
-					slot_number,
+					slot,
 					self.logging_target(),
 				);
 			}
@@ -714,7 +712,7 @@ where
 
 		let parent_slot = match find_pre_digest::<B>(parent_head) {
 			Err(_) => return Some(slot_remaining),
-			Ok(d) => d.slot_number(),
+			Ok(d) => d.slot(),
 		};
 
 		if let Some(slot_lenience) =
@@ -723,7 +721,7 @@ where
 			debug!(
 				target: "babe",
 				"No block for {} slots. Applying exponential lenience of {}s",
-				slot_info.number.saturating_sub(parent_slot + 1),
+				slot_info.slot.saturating_sub(parent_slot + 1),
 				slot_lenience.as_secs(),
 			);
 
@@ -741,7 +739,7 @@ pub fn find_pre_digest<B: BlockT>(header: &B::Header) -> Result<PreDigest, Error
 	// dummy one to not break any invariants in the rest of the code
 	if header.number().is_zero() {
 		return Ok(PreDigest::SecondaryPlain(SecondaryPlainPreDigest {
-			slot_number: 0,
+			slot: 0.into(),
 			authority_index: 0,
 		}));
 	}
@@ -803,7 +801,7 @@ impl SlotCompatible for TimeSource {
 	fn extract_timestamp_and_slot(
 		&self,
 		data: &InherentData,
-	) -> Result<(TimestampInherent, u64, std::time::Duration), sp_consensus::Error> {
+	) -> Result<(TimestampInherent, Slot, std::time::Duration), sp_consensus::Error> {
 		trace!(target: "babe", "extract timestamp");
 		data.timestamp_inherent_data()
 			.and_then(|t| data.babe_inherent_data().map(|a| (t, a)))
@@ -888,8 +886,8 @@ where
 
 	fn check_and_report_equivocation(
 		&self,
-		slot_now: SlotNumber,
-		slot: SlotNumber,
+		slot_now: Slot,
+		slot: Slot,
 		header: &Block::Header,
 		author: &AuthorityId,
 		origin: &BlockOrigin,
@@ -1014,7 +1012,7 @@ where
 			descendent_query(&*self.client),
 			&parent_hash,
 			parent_header_metadata.number,
-			pre_digest.slot_number(),
+			pre_digest.slot(),
 		)
 			.map_err(|e| Error::<Block>::ForkTree(Box::new(e)))?
 			.ok_or_else(|| Error::<Block>::FetchEpoch(parent_hash))?;
@@ -1036,14 +1034,14 @@ where
 			CheckedHeader::Checked(pre_header, verified_info) => {
 				let babe_pre_digest = verified_info.pre_digest.as_babe_pre_digest()
 					.expect("check_header always returns a pre-digest digest item; qed");
-				let slot_number = babe_pre_digest.slot_number();
+				let slot = babe_pre_digest.slot();
 
 				// the header is valid but let's check if there was something else already
 				// proposed at the same slot by the given author. if there was, we will
 				// report the equivocation to the runtime.
 				if let Err(err) = self.check_and_report_equivocation(
 					slot_now,
-					slot_number,
+					slot,
 					&header,
 					&verified_info.author,
 					&origin,
@@ -1055,7 +1053,7 @@ where
 				// to check that the internally-set timestamp in the inherents
 				// actually matches the slot set in the seal.
 				if let Some(inner_body) = body.take() {
-					inherent_data.babe_replace_inherent_data(slot_number);
+					inherent_data.babe_replace_inherent_data(slot);
 					let block = Block::new(pre_header.clone(), inner_body);
 
 					self.check_inherents(
@@ -1185,7 +1183,7 @@ impl<Block, Client, Inner> BlockImport<Block> for BabeBlockImport<Block, Client,
 		let pre_digest = find_pre_digest::<Block>(&block.header)
 			.expect("valid babe headers must contain a predigest; \
 					 header has been already verified; qed");
-		let slot_number = pre_digest.slot_number();
+		let slot = pre_digest.slot();
 
 		let parent_hash = *block.header.parent_hash();
 		let parent_header = self.client.header(BlockId::Hash(parent_hash))
@@ -1195,15 +1193,15 @@ impl<Block, Client, Inner> BlockImport<Block> for BabeBlockImport<Block, Client,
 			).into()))?;
 
 		let parent_slot = find_pre_digest::<Block>(&parent_header)
-			.map(|d| d.slot_number())
+			.map(|d| d.slot())
 			.expect("parent is non-genesis; valid BABE headers contain a pre-digest; \
 					header has already been verified; qed");
 
 		// make sure that slot number is strictly increasing
-		if slot_number <= parent_slot {
+		if slot <= parent_slot {
 			return Err(
 				ConsensusError::ClientImport(babe_err(
-					Error::<Block>::SlotNumberMustIncrease(parent_slot, slot_number)
+					Error::<Block>::SlotMustIncrease(parent_slot, slot)
 				).into())
 			);
 		}
@@ -1256,7 +1254,7 @@ impl<Block, Client, Inner> BlockImport<Block> for BabeBlockImport<Block, Client,
 			(true, false, _) => {
 				return Err(
 					ConsensusError::ClientImport(
-						babe_err(Error::<Block>::ExpectedEpochChange(hash, slot_number)).into(),
+						babe_err(Error::<Block>::ExpectedEpochChange(hash, slot)).into(),
 					)
 				)
 			},
@@ -1301,7 +1299,7 @@ impl<Block, Client, Inner> BlockImport<Block> for BabeBlockImport<Block, Client,
 				"👶 New epoch {} launching at block {} (block slot {} >= start slot {}).",
 				viable_epoch.as_ref().epoch_index,
 				hash,
-				slot_number,
+				slot,
 				viable_epoch.as_ref().start_slot,
 			);
 
@@ -1426,7 +1424,7 @@ fn prune_finalized<Block, Client>(
 		find_pre_digest::<Block>(&finalized_header)
 			.expect("finalized header must be valid; \
 					 valid blocks have a pre-digest; qed")
-			.slot_number()
+			.slot()
 	};
 
 	epoch_changes.prune_finalized(
@@ -1533,7 +1531,7 @@ pub mod test_helpers {
 	/// Try to claim the given slot and return a `BabePreDigest` if
 	/// successful.
 	pub fn claim_slot<B, C>(
-		slot_number: u64,
+		slot: Slot,
 		parent: &B::Header,
 		client: &C,
 		keystore: SyncCryptoStorePtr,
@@ -1551,12 +1549,12 @@ pub mod test_helpers {
 			descendent_query(client),
 			&parent.hash(),
 			parent.number().clone(),
-			slot_number,
+			slot,
 			|slot| Epoch::genesis(&link.config, slot),
 		).unwrap().unwrap();
 
 		authorship::claim_slot(
-			slot_number,
+			slot,
 			&epoch,
 			&keystore,
 		).map(|(digest, _)| digest)
diff --git a/client/consensus/babe/src/migration.rs b/client/consensus/babe/src/migration.rs
index 2a5a8749cc3c..fec73667da48 100644
--- a/client/consensus/babe/src/migration.rs
+++ b/client/consensus/babe/src/migration.rs
@@ -1,9 +1,28 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
 use codec::{Encode, Decode};
 use sc_consensus_epochs::Epoch as EpochT;
 use crate::{
-	Epoch, SlotNumber, AuthorityId, BabeAuthorityWeight, BabeGenesisConfiguration,
+	Epoch, AuthorityId, BabeAuthorityWeight, BabeGenesisConfiguration,
 	BabeEpochConfiguration, VRF_OUTPUT_LENGTH, NextEpochDescriptor,
 };
+use sp_consensus_slots::Slot;
 
 /// BABE epoch information, version 0.
 #[derive(Decode, Encode, PartialEq, Eq, Clone, Debug)]
@@ -11,9 +30,9 @@ pub struct EpochV0 {
 	/// The epoch index.
 	pub epoch_index: u64,
 	/// The starting slot of the epoch.
-	pub start_slot: SlotNumber,
+	pub start_slot: Slot,
 	/// The duration of this epoch.
-	pub duration: SlotNumber,
+	pub duration: u64,
 	/// The authorities and their weights.
 	pub authorities: Vec<(AuthorityId, BabeAuthorityWeight)>,
 	/// Randomness for this epoch.
@@ -22,7 +41,7 @@ pub struct EpochV0 {
 
 impl EpochT for EpochV0 {
 	type NextEpochDescriptor = NextEpochDescriptor;
-	type SlotNumber = SlotNumber;
+	type Slot = Slot;
 
 	fn increment(
 		&self,
@@ -37,11 +56,11 @@ impl EpochT for EpochV0 {
 		}
 	}
 
-	fn start_slot(&self) -> SlotNumber {
+	fn start_slot(&self) -> Slot {
 		self.start_slot
 	}
 
-	fn end_slot(&self) -> SlotNumber {
+	fn end_slot(&self) -> Slot {
 		self.start_slot + self.duration
 	}
 }
diff --git a/client/consensus/babe/src/tests.rs b/client/consensus/babe/src/tests.rs
index 82d8f9de5af0..9d03a3266d61 100644
--- a/client/consensus/babe/src/tests.rs
+++ b/client/consensus/babe/src/tests.rs
@@ -28,13 +28,7 @@ use sp_keystore::{
 	SyncCryptoStore,
 	vrf::make_transcript as transcript_from_data,
 };
-use sp_consensus_babe::{
-	AuthorityPair,
-	SlotNumber,
-	AllowedSlots,
-	make_transcript,
-	make_transcript_data,
-};
+use sp_consensus_babe::{AuthorityPair, Slot, AllowedSlots, make_transcript, make_transcript_data};
 use sc_consensus_slots::BackoffAuthoringOnFinalizedHeadLagging;
 use sc_block_builder::{BlockBuilder, BlockBuilderProvider};
 use sp_consensus::{
@@ -87,7 +81,7 @@ struct DummyProposer {
 	factory: DummyFactory,
 	parent_hash: Hash,
 	parent_number: u64,
-	parent_slot: SlotNumber,
+	parent_slot: Slot,
 }
 
 impl Environment<TestBlock> for DummyFactory {
@@ -101,7 +95,7 @@ impl Environment<TestBlock> for DummyFactory {
 
 		let parent_slot = crate::find_pre_digest::<TestBlock>(parent_header)
 			.expect("parent header has a pre-digest")
-			.slot_number();
+			.slot();
 
 		future::ready(Ok(DummyProposer {
 			factory: self.clone(),
@@ -137,7 +131,7 @@ impl DummyProposer {
 
 		let this_slot = crate::find_pre_digest::<TestBlock>(block.header())
 			.expect("baked block has valid pre-digest")
-			.slot_number();
+			.slot();
 
 		// figure out if we should add a consensus digest, since the test runtime
 		// doesn't.
@@ -529,7 +523,7 @@ fn can_author_block() {
 
 	let mut i = 0;
 	let epoch = Epoch {
-		start_slot: 0,
+		start_slot: 0.into(),
 		authorities: vec![(public.into(), 1)],
 		randomness: [0; 32],
 		epoch_index: 1,
@@ -550,7 +544,7 @@ fn can_author_block() {
 	};
 
 	// with secondary slots enabled it should never be empty
-	match claim_slot(i, &epoch, &keystore) {
+	match claim_slot(i.into(), &epoch, &keystore) {
 		None => i += 1,
 		Some(s) => debug!(target: "babe", "Authored block {:?}", s.0),
 	}
@@ -559,7 +553,7 @@ fn can_author_block() {
 	// of times.
 	config.allowed_slots = AllowedSlots::PrimarySlots;
 	loop {
-		match claim_slot(i, &epoch, &keystore) {
+		match claim_slot(i.into(), &epoch, &keystore) {
 			None => i += 1,
 			Some(s) => {
 				debug!(target: "babe", "Authored block {:?}", s.0);
@@ -572,15 +566,15 @@ fn can_author_block() {
 // Propose and import a new BABE block on top of the given parent.
 fn propose_and_import_block<Transaction>(
 	parent: &TestHeader,
-	slot_number: Option<SlotNumber>,
+	slot: Option<Slot>,
 	proposer_factory: &mut DummyFactory,
 	block_import: &mut BoxBlockImport<TestBlock, Transaction>,
 ) -> sp_core::H256 {
 	let mut proposer = futures::executor::block_on(proposer_factory.init(parent)).unwrap();
 
-	let slot_number = slot_number.unwrap_or_else(|| {
+	let slot = slot.unwrap_or_else(|| {
 		let parent_pre_digest = find_pre_digest::<TestBlock>(parent).unwrap();
-		parent_pre_digest.slot_number() + 1
+		parent_pre_digest.slot() + 1
 	});
 
 	let pre_digest = sp_runtime::generic::Digest {
@@ -588,7 +582,7 @@ fn propose_and_import_block<Transaction>(
 			Item::babe_pre_digest(
 				PreDigest::SecondaryPlain(SecondaryPlainPreDigest {
 					authority_index: 0,
-					slot_number,
+					slot,
 				}),
 			),
 		],
@@ -602,7 +596,7 @@ fn propose_and_import_block<Transaction>(
 		descendent_query(&*proposer_factory.client),
 		&parent_hash,
 		*parent.number(),
-		slot_number,
+		slot,
 	).unwrap().unwrap();
 
 	let seal = {
@@ -660,19 +654,19 @@ fn importing_block_one_sets_genesis_epoch() {
 
 	let block_hash = propose_and_import_block(
 		&genesis_header,
-		Some(999),
+		Some(999.into()),
 		&mut proposer_factory,
 		&mut block_import,
 	);
 
-	let genesis_epoch = Epoch::genesis(&data.link.config, 999);
+	let genesis_epoch = Epoch::genesis(&data.link.config, 999.into());
 
 	let epoch_changes = data.link.epoch_changes.lock();
 	let epoch_for_second_block = epoch_changes.epoch_data_for_child_of(
 		descendent_query(&*client),
 		&block_hash,
 		1,
-		1000,
+		1000.into(),
 		|slot| Epoch::genesis(&data.link.config, slot),
 	).unwrap().unwrap();
 
@@ -809,7 +803,7 @@ fn verify_slots_are_strictly_increasing() {
 	// we should have no issue importing this block
 	let b1 = propose_and_import_block(
 		&genesis_header,
-		Some(999),
+		Some(999.into()),
 		&mut proposer_factory,
 		&mut block_import,
 	);
@@ -820,7 +814,7 @@ fn verify_slots_are_strictly_increasing() {
 	// we will panic due to the `PanickingBlockImport` defined above.
 	propose_and_import_block(
 		&b1,
-		Some(999),
+		Some(999.into()),
 		&mut proposer_factory,
 		&mut block_import,
 	);
@@ -836,7 +830,7 @@ fn babe_transcript_generation_match() {
 		.expect("Generates authority pair");
 
 	let epoch = Epoch {
-		start_slot: 0,
+		start_slot: 0.into(),
 		authorities: vec![(public.into(), 1)],
 		randomness: [0; 32],
 		epoch_index: 1,
@@ -847,8 +841,8 @@ fn babe_transcript_generation_match() {
 		},
 	};
 
-	let orig_transcript = make_transcript(&epoch.randomness.clone(), 1, epoch.epoch_index);
-	let new_transcript = make_transcript_data(&epoch.randomness, 1, epoch.epoch_index);
+	let orig_transcript = make_transcript(&epoch.randomness.clone(), 1.into(), epoch.epoch_index);
+	let new_transcript = make_transcript_data(&epoch.randomness, 1.into(), epoch.epoch_index);
 
 	let test = |t: merlin::Transcript| -> [u8; 16] {
 		let mut b = [0u8; 16];
diff --git a/client/consensus/babe/src/verification.rs b/client/consensus/babe/src/verification.rs
index 5d657b8b9711..53dfd9ed10ce 100644
--- a/client/consensus/babe/src/verification.rs
+++ b/client/consensus/babe/src/verification.rs
@@ -19,12 +19,13 @@
 //! Verification for BABE headers.
 use sp_runtime::{traits::Header, traits::DigestItemFor};
 use sp_core::{Pair, Public};
-use sp_consensus_babe::{make_transcript, AuthoritySignature, SlotNumber, AuthorityPair, AuthorityId};
+use sp_consensus_babe::{make_transcript, AuthoritySignature, AuthorityPair, AuthorityId};
 use sp_consensus_babe::digests::{
 	PreDigest, PrimaryPreDigest, SecondaryPlainPreDigest, SecondaryVRFPreDigest,
 	CompatibleDigestItem
 };
 use sc_consensus_slots::CheckedHeader;
+use sp_consensus_slots::Slot;
 use log::{debug, trace};
 use super::{find_pre_digest, babe_err, Epoch, BlockT, Error};
 use super::authorship::{calculate_primary_threshold, check_primary_threshold, secondary_slot_author};
@@ -38,7 +39,7 @@ pub(super) struct VerificationParams<'a, B: 'a + BlockT> {
 	/// work.
 	pub(super) pre_digest: Option<PreDigest>,
 	/// The slot number of the current time.
-	pub(super) slot_now: SlotNumber,
+	pub(super) slot_now: Slot,
 	/// Epoch descriptor of the epoch this block _should_ be under, if it's valid.
 	pub(super) epoch: &'a Epoch,
 }
@@ -83,9 +84,9 @@ pub(super) fn check_header<B: BlockT + Sized>(
 	// and that's what we sign
 	let pre_hash = header.hash();
 
-	if pre_digest.slot_number() > slot_now {
+	if pre_digest.slot() > slot_now {
 		header.digest_mut().push(seal);
-		return Ok(CheckedHeader::Deferred(header, pre_digest.slot_number()));
+		return Ok(CheckedHeader::Deferred(header, pre_digest.slot()));
 	}
 
 	let author = match authorities.get(pre_digest.authority_index() as usize) {
@@ -98,7 +99,7 @@ pub(super) fn check_header<B: BlockT + Sized>(
 			debug!(target: "babe",
 				"Verifying primary block #{} at slot: {}",
 				header.number(),
-				primary.slot_number,
+				primary.slot,
 			);
 
 			check_primary_header::<B>(
@@ -113,7 +114,7 @@ pub(super) fn check_header<B: BlockT + Sized>(
 			debug!(target: "babe",
 				"Verifying secondary plain block #{} at slot: {}",
 				header.number(),
-				secondary.slot_number,
+				secondary.slot,
 			);
 
 			check_secondary_plain_header::<B>(
@@ -127,7 +128,7 @@ pub(super) fn check_header<B: BlockT + Sized>(
 			debug!(target: "babe",
 				"Verifying secondary VRF block #{} at slot: {}",
 				header.number(),
-				secondary.slot_number,
+				secondary.slot,
 			);
 
 			check_secondary_vrf_header::<B>(
@@ -173,7 +174,7 @@ fn check_primary_header<B: BlockT + Sized>(
 		let (inout, _) = {
 			let transcript = make_transcript(
 				&epoch.randomness,
-				pre_digest.slot_number,
+				pre_digest.slot,
 				epoch.epoch_index,
 			);
 
@@ -213,7 +214,7 @@ fn check_secondary_plain_header<B: BlockT>(
 	// check the signature is valid under the expected authority and
 	// chain state.
 	let expected_author = secondary_slot_author(
-		pre_digest.slot_number,
+		pre_digest.slot,
 		&epoch.authorities,
 		epoch.randomness,
 	).ok_or_else(|| Error::NoSecondaryAuthorExpected)?;
@@ -241,7 +242,7 @@ fn check_secondary_vrf_header<B: BlockT>(
 	// check the signature is valid under the expected authority and
 	// chain state.
 	let expected_author = secondary_slot_author(
-		pre_digest.slot_number,
+		pre_digest.slot,
 		&epoch.authorities,
 		epoch.randomness,
 	).ok_or_else(|| Error::NoSecondaryAuthorExpected)?;
@@ -255,7 +256,7 @@ fn check_secondary_vrf_header<B: BlockT>(
 	if AuthorityPair::verify(&signature, pre_hash.as_ref(), author) {
 		let transcript = make_transcript(
 			&epoch.randomness,
-			pre_digest.slot_number,
+			pre_digest.slot,
 			epoch.epoch_index,
 		);
 
diff --git a/client/consensus/epochs/src/lib.rs b/client/consensus/epochs/src/lib.rs
index 76e8c8ed5419..5c5ef446993a 100644
--- a/client/consensus/epochs/src/lib.rs
+++ b/client/consensus/epochs/src/lib.rs
@@ -78,13 +78,13 @@ pub trait Epoch {
 	/// Descriptor for the next epoch.
 	type NextEpochDescriptor;
 	/// Type of the slot number.
-	type SlotNumber: Ord + Copy;
+	type Slot: Ord + Copy;
 
 	/// The starting slot of the epoch.
-	fn start_slot(&self) -> Self::SlotNumber;
+	fn start_slot(&self) -> Self::Slot;
 	/// Produce the "end slot" of the epoch. This is NOT inclusive to the epoch,
 	/// i.e. the slots covered by the epoch are `self.start_slot() .. self.end_slot()`.
-	fn end_slot(&self) -> Self::SlotNumber;
+	fn end_slot(&self) -> Self::Slot;
 	/// Increment the epoch data, using the next epoch descriptor.
 	fn increment(&self, descriptor: Self::NextEpochDescriptor) -> Self;
 }
@@ -102,10 +102,10 @@ impl<'a, E: Epoch> From<&'a E> for EpochHeader<E> {
 #[derive(Eq, PartialEq, Encode, Decode, Debug)]
 pub struct EpochHeader<E: Epoch> {
 	/// The starting slot of the epoch.
-	pub start_slot: E::SlotNumber,
+	pub start_slot: E::Slot,
 	/// The end slot of the epoch. This is NOT inclusive to the epoch,
 	/// i.e. the slots covered by the epoch are `self.start_slot() .. self.end_slot()`.
-	pub end_slot: E::SlotNumber,
+	pub end_slot: E::Slot,
 }
 
 impl<E: Epoch> Clone for EpochHeader<E> {
@@ -215,14 +215,14 @@ impl<E, ERef> ViableEpoch<E, ERef> where
 #[derive(PartialEq, Eq, Clone, Debug)]
 pub enum ViableEpochDescriptor<Hash, Number, E: Epoch> {
 	/// The epoch is an unimported genesis, with given start slot number.
-	UnimportedGenesis(E::SlotNumber),
+	UnimportedGenesis(E::Slot),
 	/// The epoch is signaled and has been imported, with given identifier and header.
 	Signaled(EpochIdentifier<Hash, Number>, EpochHeader<E>)
 }
 
 impl<Hash, Number, E: Epoch> ViableEpochDescriptor<Hash, Number, E> {
 	/// Start slot of the descriptor.
-	pub fn start_slot(&self) -> E::SlotNumber {
+	pub fn start_slot(&self) -> E::Slot {
 		match self {
 			Self::UnimportedGenesis(start_slot) => *start_slot,
 			Self::Signaled(_, header) => header.start_slot,
@@ -339,7 +339,7 @@ impl<Hash, Number, E: Epoch> EpochChanges<Hash, Number, E> where
 
 	/// Map the epoch changes from one storing data to a different one.
 	pub fn map<B, F>(self, mut f: F) -> EpochChanges<Hash, Number, B> where
-		B: Epoch<SlotNumber=E::SlotNumber>,
+		B: Epoch<Slot=E::Slot>,
 		F: FnMut(&Hash, &Number, E) -> B,
 	{
 		EpochChanges {
@@ -394,7 +394,7 @@ impl<Hash, Number, E: Epoch> EpochChanges<Hash, Number, E> where
 		descendent_of_builder: D,
 		hash: &Hash,
 		number: Number,
-		slot: E::SlotNumber,
+		slot: E::Slot,
 	) -> Result<(), fork_tree::Error<D::Error>> {
 		let is_descendent_of = descendent_of_builder
 			.build_is_descendent_of(None);
@@ -445,11 +445,11 @@ impl<Hash, Number, E: Epoch> EpochChanges<Hash, Number, E> where
 		descriptor: &ViableEpochDescriptor<Hash, Number, E>,
 		make_genesis: G,
 	) -> Option<ViableEpoch<E, &E>> where
-		G: FnOnce(E::SlotNumber) -> E
+		G: FnOnce(E::Slot) -> E
 	{
 		match descriptor {
-			ViableEpochDescriptor::UnimportedGenesis(slot_number) => {
-				Some(ViableEpoch::UnimportedGenesis(make_genesis(*slot_number)))
+			ViableEpochDescriptor::UnimportedGenesis(slot) => {
+				Some(ViableEpoch::UnimportedGenesis(make_genesis(*slot)))
 			},
 			ViableEpochDescriptor::Signaled(identifier, _) => {
 				self.epoch(&identifier).map(ViableEpoch::Signaled)
@@ -479,11 +479,11 @@ impl<Hash, Number, E: Epoch> EpochChanges<Hash, Number, E> where
 		descriptor: &ViableEpochDescriptor<Hash, Number, E>,
 		make_genesis: G,
 	) -> Option<ViableEpoch<E, &mut E>> where
-		G: FnOnce(E::SlotNumber) -> E
+		G: FnOnce(E::Slot) -> E
 	{
 		match descriptor {
-			ViableEpochDescriptor::UnimportedGenesis(slot_number) => {
-				Some(ViableEpoch::UnimportedGenesis(make_genesis(*slot_number)))
+			ViableEpochDescriptor::UnimportedGenesis(slot) => {
+				Some(ViableEpoch::UnimportedGenesis(make_genesis(*slot)))
 			},
 			ViableEpochDescriptor::Signaled(identifier, _) => {
 				self.epoch_mut(&identifier).map(ViableEpoch::Signaled)
@@ -500,12 +500,12 @@ impl<Hash, Number, E: Epoch> EpochChanges<Hash, Number, E> where
 		descriptor: &ViableEpochDescriptor<Hash, Number, E>,
 		make_genesis: G
 	) -> Option<E> where
-		G: FnOnce(E::SlotNumber) -> E,
+		G: FnOnce(E::Slot) -> E,
 		E: Clone,
 	{
 		match descriptor {
-			ViableEpochDescriptor::UnimportedGenesis(slot_number) => {
-				Some(make_genesis(*slot_number))
+			ViableEpochDescriptor::UnimportedGenesis(slot) => {
+				Some(make_genesis(*slot))
 			},
 			ViableEpochDescriptor::Signaled(identifier, _) => {
 				self.epoch(&identifier).cloned()
@@ -523,17 +523,17 @@ impl<Hash, Number, E: Epoch> EpochChanges<Hash, Number, E> where
 		descendent_of_builder: D,
 		parent_hash: &Hash,
 		parent_number: Number,
-		slot_number: E::SlotNumber,
+		slot: E::Slot,
 		make_genesis: G,
 	) -> Result<Option<E>, fork_tree::Error<D::Error>> where
-		G: FnOnce(E::SlotNumber) -> E,
+		G: FnOnce(E::Slot) -> E,
 		E: Clone,
 	{
 		let descriptor = self.epoch_descriptor_for_child_of(
 			descendent_of_builder,
 			parent_hash,
 			parent_number,
-			slot_number
+			slot
 		)?;
 
 		Ok(descriptor.and_then(|des| self.epoch_data(&des, make_genesis)))
@@ -548,7 +548,7 @@ impl<Hash, Number, E: Epoch> EpochChanges<Hash, Number, E> where
 		descendent_of_builder: D,
 		parent_hash: &Hash,
 		parent_number: Number,
-		slot_number: E::SlotNumber,
+		slot: E::Slot,
 	) -> Result<Option<ViableEpochDescriptor<Hash, Number, E>>, fork_tree::Error<D::Error>> {
 		// find_node_where will give you the node in the fork-tree which is an ancestor
 		// of the `parent_hash` by default. if the last epoch was signalled at the parent_hash,
@@ -561,7 +561,7 @@ impl<Hash, Number, E: Epoch> EpochChanges<Hash, Number, E> where
 
 		if parent_number == Zero::zero() {
 			// need to insert the genesis epoch.
-			return Ok(Some(ViableEpochDescriptor::UnimportedGenesis(slot_number)))
+			return Ok(Some(ViableEpochDescriptor::UnimportedGenesis(slot)))
 		}
 
 		// We want to find the deepest node in the tree which is an ancestor
@@ -571,9 +571,9 @@ impl<Hash, Number, E: Epoch> EpochChanges<Hash, Number, E> where
 		// we need.
 		let predicate = |epoch: &PersistedEpochHeader<E>| match *epoch {
 			PersistedEpochHeader::Genesis(ref epoch_0, _) =>
-				epoch_0.start_slot <= slot_number,
+				epoch_0.start_slot <= slot,
 			PersistedEpochHeader::Regular(ref epoch_n) =>
-				epoch_n.start_slot <= slot_number,
+				epoch_n.start_slot <= slot,
 		};
 
 		self.inner.find_node_where(
@@ -588,7 +588,7 @@ impl<Hash, Number, E: Epoch> EpochChanges<Hash, Number, E> where
 					// and here we figure out which of the internal epochs
 					// of a genesis node to use based on their start slot.
 					PersistedEpochHeader::Genesis(ref epoch_0, ref epoch_1) =>
-						if epoch_1.start_slot <= slot_number {
+						if epoch_1.start_slot <= slot {
 							(EpochIdentifierPosition::Genesis1, epoch_1.clone())
 						} else {
 							(EpochIdentifierPosition::Genesis0, epoch_0.clone())
@@ -695,17 +695,17 @@ mod tests {
 	}
 
 	type Hash = [u8; 1];
-	type SlotNumber = u64;
+	type Slot = u64;
 
 	#[derive(Debug, Clone, Eq, PartialEq)]
 	struct Epoch {
-		start_slot: SlotNumber,
-		duration: SlotNumber,
+		start_slot: Slot,
+		duration: Slot,
 	}
 
 	impl EpochT for Epoch {
 		type NextEpochDescriptor = ();
-		type SlotNumber = SlotNumber;
+		type Slot = Slot;
 
 		fn increment(&self, _: ()) -> Self {
 			Epoch {
@@ -714,11 +714,11 @@ mod tests {
 			}
 		}
 
-		fn end_slot(&self) -> SlotNumber {
+		fn end_slot(&self) -> Slot {
 			self.start_slot + self.duration
 		}
 
-		fn start_slot(&self) -> SlotNumber {
+		fn start_slot(&self) -> Slot {
 			self.start_slot
 		}
 	}
@@ -748,8 +748,8 @@ mod tests {
 		).unwrap().unwrap();
 
 		match genesis_epoch {
-			ViableEpochDescriptor::UnimportedGenesis(slot_number) => {
-				assert_eq!(slot_number, 10101u64);
+			ViableEpochDescriptor::UnimportedGenesis(slot) => {
+				assert_eq!(slot, 10101u64);
 			},
 			_ => panic!("should be unimported genesis"),
 		};
@@ -762,8 +762,8 @@ mod tests {
 		).unwrap().unwrap();
 
 		match genesis_epoch_2 {
-			ViableEpochDescriptor::UnimportedGenesis(slot_number) => {
-				assert_eq!(slot_number, 10102u64);
+			ViableEpochDescriptor::UnimportedGenesis(slot) => {
+				assert_eq!(slot, 10102u64);
 			},
 			_ => panic!("should be unimported genesis"),
 		};
diff --git a/client/consensus/manual-seal/Cargo.toml b/client/consensus/manual-seal/Cargo.toml
index b13cbc7b5590..e725465b0428 100644
--- a/client/consensus/manual-seal/Cargo.toml
+++ b/client/consensus/manual-seal/Cargo.toml
@@ -31,7 +31,8 @@ sp-consensus-babe = { path = "../../../primitives/consensus/babe", version = "0.
 
 sc-transaction-pool = { path = "../../transaction-pool", version = "2.0.0" }
 sp-blockchain = { path = "../../../primitives/blockchain", version = "2.0.0" }
-sp-consensus = { package = "sp-consensus", path = "../../../primitives/consensus/common", version = "0.8.0" }
+sp-consensus = { path = "../../../primitives/consensus/common", version = "0.8.0" }
+sp-consensus-slots = { path = "../../../primitives/consensus/slots", version = "0.8.1" }
 sp-inherents = { path = "../../../primitives/inherents", version = "2.0.0" }
 sp-runtime = {  path = "../../../primitives/runtime", version = "2.0.0" }
 sp-core = {  path = "../../../primitives/core", version = "2.0.0" }
diff --git a/client/consensus/manual-seal/src/consensus/babe.rs b/client/consensus/manual-seal/src/consensus/babe.rs
index 1566b647f2c0..fb1ca629f693 100644
--- a/client/consensus/manual-seal/src/consensus/babe.rs
+++ b/client/consensus/manual-seal/src/consensus/babe.rs
@@ -38,6 +38,7 @@ use sp_keystore::SyncCryptoStorePtr;
 use sp_api::{ProvideRuntimeApi, TransactionFor};
 use sp_blockchain::{HeaderBackend, HeaderMetadata};
 use sp_consensus::BlockImportParams;
+use sp_consensus_slots::Slot;
 use sp_consensus_babe::{
 	BabeApi, inherents::BabeInherentData, ConsensusLog, BABE_ENGINE_ID, AuthorityId,
 	digests::{PreDigest, SecondaryPlainPreDigest, NextEpochDescriptor}, BabeAuthorityWeight,
@@ -100,14 +101,14 @@ impl<B, C> BabeConsensusDataProvider<B, C>
 		})
 	}
 
-	fn epoch(&self, parent: &B::Header, slot_number: u64) -> Result<Epoch, Error> {
+	fn epoch(&self, parent: &B::Header, slot: Slot) -> Result<Epoch, Error> {
 		let epoch_changes = self.epoch_changes.lock();
 		let epoch_descriptor = epoch_changes
 			.epoch_descriptor_for_child_of(
 				descendent_query(&*self.client),
 				&parent.hash(),
 				parent.number().clone(),
-				slot_number,
+				slot,
 			)
 			.map_err(|e| Error::StringError(format!("failed to fetch epoch_descriptor: {}", e)))?
 			.ok_or_else(|| sp_consensus::Error::InvalidAuthoritiesSet)?;
@@ -135,11 +136,15 @@ impl<B, C> ConsensusDataProvider<B> for BabeConsensusDataProvider<B, C>
 	type Transaction = TransactionFor<C, B>;
 
 	fn create_digest(&self, parent: &B::Header, inherents: &InherentData) -> Result<DigestFor<B>, Error> {
-		let slot_number = inherents.babe_inherent_data()?;
-		let epoch = self.epoch(parent, slot_number)?;
+		let slot = inherents.babe_inherent_data()?;
+		let epoch = self.epoch(parent, slot)?;
 
 		// this is a dev node environment, we should always be able to claim a slot.
-		let logs =  if let Some((predigest, _)) = authorship::claim_slot(slot_number, &epoch, &self.keystore) {
+		let logs =  if let Some((predigest, _)) = authorship::claim_slot(
+			slot,
+			&epoch,
+			&self.keystore,
+		) {
 			vec![
 				<DigestItemFor<B> as CompatibleDigestItem>::babe_pre_digest(predigest),
 			]
@@ -147,7 +152,7 @@ impl<B, C> ConsensusDataProvider<B> for BabeConsensusDataProvider<B, C>
 			// well we couldn't claim a slot because this is an existing chain and we're not in the authorities.
 			// we need to tell BabeBlockImport that the epoch has changed, and we put ourselves in the authorities.
 			let predigest = PreDigest::SecondaryPlain(SecondaryPlainPreDigest {
-				slot_number,
+				slot,
 				authority_index: 0_u32,
 			});
 
@@ -157,7 +162,7 @@ impl<B, C> ConsensusDataProvider<B> for BabeConsensusDataProvider<B, C>
 					descendent_query(&*self.client),
 					&parent.hash(),
 					parent.number().clone(),
-					slot_number,
+					slot,
 				)
 				.map_err(|e| Error::StringError(format!("failed to fetch epoch_descriptor: {}", e)))?
 				.ok_or_else(|| sp_consensus::Error::InvalidAuthoritiesSet)?;
@@ -194,21 +199,21 @@ impl<B, C> ConsensusDataProvider<B> for BabeConsensusDataProvider<B, C>
 		params: &mut BlockImportParams<B, Self::Transaction>,
 		inherents: &InherentData
 	) -> Result<(), Error> {
-		let slot_number = inherents.babe_inherent_data()?;
+		let slot = inherents.babe_inherent_data()?;
 		let epoch_changes = self.epoch_changes.lock();
 		let mut epoch_descriptor = epoch_changes
 			.epoch_descriptor_for_child_of(
 				descendent_query(&*self.client),
 				&parent.hash(),
 				parent.number().clone(),
-				slot_number,
+				slot,
 			)
 			.map_err(|e| Error::StringError(format!("failed to fetch epoch_descriptor: {}", e)))?
 			.ok_or_else(|| sp_consensus::Error::InvalidAuthoritiesSet)?;
 		// drop the lock
 		drop(epoch_changes);
 		// a quick check to see if we're in the authorities
-		let epoch = self.epoch(parent, slot_number)?;
+		let epoch = self.epoch(parent, slot)?;
 		let (authority, _) = self.authorities.first().expect("authorities is non-emptyp; qed");
 		let has_authority = epoch.authorities.iter()
 			.find(|(id, _)| *id == *authority)
@@ -216,15 +221,15 @@ impl<B, C> ConsensusDataProvider<B> for BabeConsensusDataProvider<B, C>
 
 		if !has_authority {
 			log::info!(target: "manual-seal", "authority not found");
-			let slot_number = inherents.timestamp_inherent_data()? / self.config.slot_duration;
+			let slot = inherents.timestamp_inherent_data()? / self.config.slot_duration;
 			// manually hard code epoch descriptor
 			epoch_descriptor = match epoch_descriptor {
 				ViableEpochDescriptor::Signaled(identifier, _header) => {
 					ViableEpochDescriptor::Signaled(
 						identifier,
 						EpochHeader {
-							start_slot: slot_number,
-							end_slot: slot_number * self.config.epoch_length,
+							start_slot: slot.into(),
+							end_slot: (slot * self.config.epoch_length).into(),
 						},
 					)
 				},
@@ -263,9 +268,9 @@ impl SlotTimestampProvider {
 		// otherwise we'd be producing blocks for older slots.
 		let duration = if info.best_number != Zero::zero() {
 			let header = client.header(BlockId::Hash(info.best_hash))?.unwrap();
-			let slot_number = find_pre_digest::<B>(&header).unwrap().slot_number();
+			let slot = find_pre_digest::<B>(&header).unwrap().slot();
 			// add the slot duration so there's no collision of slots
-			(slot_number * slot_duration) + slot_duration
+			(*slot * slot_duration) + slot_duration
 		} else {
 			// this is the first block, use the correct time.
 			let now = SystemTime::now();
diff --git a/client/consensus/slots/src/aux_schema.rs b/client/consensus/slots/src/aux_schema.rs
index c8095f238ec8..70a137de4330 100644
--- a/client/consensus/slots/src/aux_schema.rs
+++ b/client/consensus/slots/src/aux_schema.rs
@@ -21,7 +21,7 @@
 use codec::{Encode, Decode};
 use sc_client_api::backend::AuxStore;
 use sp_blockchain::{Result as ClientResult, Error as ClientError};
-use sp_consensus_slots::EquivocationProof;
+use sp_consensus_slots::{EquivocationProof, Slot};
 use sp_runtime::traits::Header;
 
 const SLOT_HEADER_MAP_KEY: &[u8] = b"slot_header_map";
@@ -52,8 +52,8 @@ fn load_decode<C, T>(backend: &C, key: &[u8]) -> ClientResult<Option<T>>
 /// Note: it detects equivocations only when slot_now - slot <= MAX_SLOT_CAPACITY.
 pub fn check_equivocation<C, H, P>(
 	backend: &C,
-	slot_now: u64,
-	slot: u64,
+	slot_now: Slot,
+	slot: Slot,
 	header: &H,
 	signer: &P,
 ) -> ClientResult<Option<EquivocationProof<H, P>>>
@@ -63,7 +63,7 @@ pub fn check_equivocation<C, H, P>(
 		P: Clone + Encode + Decode + PartialEq,
 {
 	// We don't check equivocations for old headers out of our capacity.
-	if slot_now.saturating_sub(slot) > MAX_SLOT_CAPACITY {
+	if slot_now.saturating_sub(*slot) > Slot::from(MAX_SLOT_CAPACITY) {
 		return Ok(None);
 	}
 
@@ -77,7 +77,7 @@ pub fn check_equivocation<C, H, P>(
 
 	// Get first slot saved.
 	let slot_header_start = SLOT_HEADER_START.to_vec();
-	let first_saved_slot = load_decode::<_, u64>(backend, &slot_header_start[..])?
+	let first_saved_slot = load_decode::<_, Slot>(backend, &slot_header_start[..])?
 		.unwrap_or(slot);
 
 	if slot_now < first_saved_slot {
@@ -92,7 +92,7 @@ pub fn check_equivocation<C, H, P>(
 			// 2) with different hash
 			if header.hash() != prev_header.hash() {
 				return Ok(Some(EquivocationProof {
-					slot_number: slot,
+					slot,
 					offender: signer.clone(),
 					first_header: prev_header.clone(),
 					second_header: header.clone(),
@@ -109,11 +109,11 @@ pub fn check_equivocation<C, H, P>(
 	let mut keys_to_delete = vec![];
 	let mut new_first_saved_slot = first_saved_slot;
 
-	if slot_now - first_saved_slot >= PRUNING_BOUND {
+	if *slot_now - *first_saved_slot >= PRUNING_BOUND {
 		let prefix = SLOT_HEADER_MAP_KEY.to_vec();
 		new_first_saved_slot = slot_now.saturating_sub(MAX_SLOT_CAPACITY);
 
-		for s in first_saved_slot..new_first_saved_slot {
+		for s in u64::from(first_saved_slot)..new_first_saved_slot.into() {
 			let mut p = prefix.clone();
 			s.using_encoded(|s| p.extend(s));
 			keys_to_delete.push(p);
@@ -174,8 +174,8 @@ mod test {
 		assert!(
 			check_equivocation(
 				&client,
-				2,
-				2,
+				2.into(),
+				2.into(),
 				&header1,
 				&public,
 			).unwrap().is_none(),
@@ -184,8 +184,8 @@ mod test {
 		assert!(
 			check_equivocation(
 				&client,
-				3,
-				2,
+				3.into(),
+				2.into(),
 				&header1,
 				&public,
 			).unwrap().is_none(),
@@ -195,8 +195,8 @@ mod test {
 		assert!(
 			check_equivocation(
 				&client,
-				4,
-				2,
+				4.into(),
+				2.into(),
 				&header2,
 				&public,
 			).unwrap().is_some(),
@@ -206,8 +206,8 @@ mod test {
 		assert!(
 			check_equivocation(
 				&client,
-				5,
-				4,
+				5.into(),
+				4.into(),
 				&header3,
 				&public,
 			).unwrap().is_none(),
@@ -217,8 +217,8 @@ mod test {
 		assert!(
 			check_equivocation(
 				&client,
-				PRUNING_BOUND + 2,
-				MAX_SLOT_CAPACITY + 4,
+				(PRUNING_BOUND + 2).into(),
+				(MAX_SLOT_CAPACITY + 4).into(),
 				&header4,
 				&public,
 			).unwrap().is_none(),
@@ -228,8 +228,8 @@ mod test {
 		assert!(
 			check_equivocation(
 				&client,
-				PRUNING_BOUND + 3,
-				MAX_SLOT_CAPACITY + 4,
+				(PRUNING_BOUND + 3).into(),
+				(MAX_SLOT_CAPACITY + 4).into(),
 				&header5,
 				&public,
 			).unwrap().is_some(),
@@ -239,8 +239,8 @@ mod test {
 		assert!(
 			check_equivocation(
 				&client,
-				PRUNING_BOUND + 4,
-				4,
+				(PRUNING_BOUND + 4).into(),
+				4.into(),
 				&header6,
 				&public,
 			).unwrap().is_none(),
diff --git a/client/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs
index 93d3614584f8..d85175392133 100644
--- a/client/consensus/slots/src/lib.rs
+++ b/client/consensus/slots/src/lib.rs
@@ -41,6 +41,7 @@ use parking_lot::Mutex;
 use sp_api::{ProvideRuntimeApi, ApiRef};
 use sp_arithmetic::traits::BaseArithmetic;
 use sp_consensus::{BlockImport, Proposer, SyncOracle, SelectChain, CanAuthorWith, SlotData, RecordProof};
+use sp_consensus_slots::Slot;
 use sp_inherents::{InherentData, InherentDataProviders};
 use sp_runtime::{
 	generic::BlockId,
@@ -115,7 +116,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 	fn epoch_data(
 		&self,
 		header: &B::Header,
-		slot_number: u64,
+		slot: Slot,
 	) -> Result<Self::EpochData, sp_consensus::Error>;
 
 	/// Returns the number of authorities given the epoch data.
@@ -126,7 +127,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 	fn claim_slot(
 		&self,
 		header: &B::Header,
-		slot_number: u64,
+		slot: Slot,
 		epoch_data: &Self::EpochData,
 	) -> Option<Self::Claim>;
 
@@ -135,14 +136,14 @@ pub trait SimpleSlotWorker<B: BlockT> {
 	fn notify_slot(
 		&self,
 		_header: &B::Header,
-		_slot_number: u64,
+		_slot: Slot,
 		_epoch_data: &Self::EpochData,
 	) {}
 
 	/// Return the pre digest data to include in a block authored with the given claim.
 	fn pre_digest_data(
 		&self,
-		slot_number: u64,
+		slot: Slot,
 		claim: &Self::Claim,
 	) -> Vec<sp_runtime::DigestItem<B::Hash>>;
 
@@ -170,7 +171,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 	///
 	/// An example strategy that back offs if the finalized head is lagging too much behind the tip
 	/// is implemented by [`BackoffAuthoringOnFinalizedHeadLagging`].
-	fn should_backoff(&self, _slot_number: u64, _chain_head: &B::Header) -> bool {
+	fn should_backoff(&self, _slot: Slot, _chain_head: &B::Header) -> bool {
 		false
 	}
 
@@ -208,7 +209,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 	where
 		<Self::Proposer as Proposer<B>>::Proposal: Unpin + Send + 'static,
 	{
-		let (timestamp, slot_number) = (slot_info.timestamp, slot_info.number);
+		let (timestamp, slot) = (slot_info.timestamp, slot_info.slot);
 
 		let slot_remaining_duration = self.slot_remaining_duration(&slot_info);
 		let proposing_remaining_duration = self.proposing_remaining_duration(&chain_head, &slot_info);
@@ -218,7 +219,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 				debug!(
 					target: self.logging_target(),
 					"Skipping proposal slot {} since there's no time left to propose",
-					slot_number,
+					slot,
 				);
 
 				return Box::pin(future::ready(None));
@@ -227,7 +228,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 			None => Box::new(future::pending()) as Box<_>,
 		};
 
-		let epoch_data = match self.epoch_data(&chain_head, slot_number) {
+		let epoch_data = match self.epoch_data(&chain_head, slot) {
 			Ok(epoch_data) => epoch_data,
 			Err(err) => {
 				warn!("Unable to fetch epoch data at block {:?}: {:?}", chain_head.hash(), err);
@@ -242,7 +243,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 			}
 		};
 
-		self.notify_slot(&chain_head, slot_number, &epoch_data);
+		self.notify_slot(&chain_head, slot, &epoch_data);
 
 		let authorities_len = self.authorities_len(&epoch_data);
 
@@ -260,38 +261,43 @@ pub trait SimpleSlotWorker<B: BlockT> {
 			return Box::pin(future::ready(None));
 		}
 
-		let claim = match self.claim_slot(&chain_head, slot_number, &epoch_data) {
+		let claim = match self.claim_slot(&chain_head, slot, &epoch_data) {
 			None => return Box::pin(future::ready(None)),
 			Some(claim) => claim,
 		};
 
-		if self.should_backoff(slot_number, &chain_head) {
+		if self.should_backoff(slot, &chain_head) {
 			return Box::pin(future::ready(None));
 		}
 
 		debug!(
 			target: self.logging_target(),
 			"Starting authorship at slot {}; timestamp = {}",
-			slot_number,
+			slot,
 			timestamp,
 		);
 
-		telemetry!(CONSENSUS_DEBUG; "slots.starting_authorship";
-			"slot_num" => slot_number,
+		telemetry!(
+			CONSENSUS_DEBUG;
+			"slots.starting_authorship";
+			"slot_num" => *slot,
 			"timestamp" => timestamp,
 		);
 
 		let awaiting_proposer = self.proposer(&chain_head).map_err(move |err| {
-			warn!("Unable to author block in slot {:?}: {:?}", slot_number, err);
+			warn!("Unable to author block in slot {:?}: {:?}", slot, err);
 
-			telemetry!(CONSENSUS_WARN; "slots.unable_authoring_block";
-				"slot" => slot_number, "err" => ?err
+			telemetry!(
+				CONSENSUS_WARN;
+				"slots.unable_authoring_block";
+				"slot" => *slot,
+				"err" => ?err
 			);
 
 			err
 		});
 
-		let logs = self.pre_digest_data(slot_number, &claim);
+		let logs = self.pre_digest_data(slot, &claim);
 
 		// deadline our production to approx. the end of the slot
 		let proposing = awaiting_proposer.and_then(move |proposer| proposer.propose(
@@ -307,12 +313,14 @@ pub trait SimpleSlotWorker<B: BlockT> {
 			futures::future::select(proposing, proposing_remaining).map(move |v| match v {
 				Either::Left((b, _)) => b.map(|b| (b, claim)),
 				Either::Right(_) => {
-					info!("⌛️ Discarding proposal for slot {}; block production took too long", slot_number);
+					info!("⌛️ Discarding proposal for slot {}; block production took too long", slot);
 					// If the node was compiled with debug, tell the user to use release optimizations.
 					#[cfg(build_type="debug")]
 					info!("👉 Recompile your node in `--release` mode to mitigate this problem.");
-					telemetry!(CONSENSUS_INFO; "slots.discarding_proposal_took_too_long";
-						"slot" => slot_number,
+					telemetry!(
+						CONSENSUS_INFO;
+						"slots.discarding_proposal_took_too_long";
+						"slot" => *slot,
 					);
 
 					Err(sp_consensus::Error::ClientImport("Timeout in the Slots proposer".into()))
@@ -388,7 +396,7 @@ pub trait SlotCompatible {
 	fn extract_timestamp_and_slot(
 		&self,
 		inherent: &InherentData,
-	) -> Result<(u64, u64, std::time::Duration), sp_consensus::Error>;
+	) -> Result<(u64, Slot, std::time::Duration), sp_consensus::Error>;
 }
 
 /// Start a new slot worker.
@@ -429,12 +437,12 @@ where
 				return Either::Right(future::ready(Ok(())));
 			}
 
-			let slot_num = slot_info.number;
+			let slot = slot_info.slot;
 			let chain_head = match client.best_chain() {
 				Ok(x) => x,
 				Err(e) => {
 					warn!(target: "slots", "Unable to author block in slot {}. \
-					no best block header: {:?}", slot_num, e);
+					no best block header: {:?}", slot, e);
 					return Either::Right(future::ready(Ok(())));
 				}
 			};
@@ -444,7 +452,7 @@ where
 					target: "slots",
 					"Unable to author block in slot {},. `can_author_with` returned: {} \
 					Probably a node update is required!",
-					slot_num,
+					slot,
 					err,
 				);
 				Either::Right(future::ready(Ok(())))
@@ -465,7 +473,7 @@ where
 pub enum CheckedHeader<H, S> {
 	/// A header which has slot in the future. this is the full header (not stripped)
 	/// and the slot in which it should be processed.
-	Deferred(H, u64),
+	Deferred(H, Slot),
 	/// A header which is fully checked, including signature. This is the pre-header
 	/// accompanied by the seal components.
 	///
@@ -473,8 +481,6 @@ pub enum CheckedHeader<H, S> {
 	Checked(H, S),
 }
 
-
-
 #[derive(Debug, thiserror::Error)]
 #[allow(missing_docs)]
 pub enum Error<T> where T: Debug {
@@ -561,7 +567,7 @@ impl<T: Clone + Send + Sync + 'static> SlotDuration<T> {
 /// to parent. If the number of skipped slots is greated than 0 this method will apply
 /// an exponential backoff of at most `2^7 * slot_duration`, if no slots were skipped
 /// this method will return `None.`
-pub fn slot_lenience_exponential(parent_slot: u64, slot_info: &SlotInfo) -> Option<Duration> {
+pub fn slot_lenience_exponential(parent_slot: Slot, slot_info: &SlotInfo) -> Option<Duration> {
 	// never give more than 2^this times the lenience.
 	const BACKOFF_CAP: u64 = 7;
 
@@ -574,7 +580,7 @@ pub fn slot_lenience_exponential(parent_slot: u64, slot_info: &SlotInfo) -> Opti
 	// exponential back-off.
 	// in normal cases we only attempt to issue blocks up to the end of the slot.
 	// when the chain has been stalled for a few slots, we give more lenience.
-	let skipped_slots = slot_info.number.saturating_sub(parent_slot + 1);
+	let skipped_slots = *slot_info.slot.saturating_sub(parent_slot + 1);
 
 	if skipped_slots == 0 {
 		None
@@ -590,7 +596,7 @@ pub fn slot_lenience_exponential(parent_slot: u64, slot_info: &SlotInfo) -> Opti
 /// to parent. If the number of skipped slots is greated than 0 this method will apply
 /// a linear backoff of at most `20 * slot_duration`, if no slots were skipped
 /// this method will return `None.`
-pub fn slot_lenience_linear(parent_slot: u64, slot_info: &SlotInfo) -> Option<Duration> {
+pub fn slot_lenience_linear(parent_slot: Slot, slot_info: &SlotInfo) -> Option<Duration> {
 	// never give more than 20 times more lenience.
 	const BACKOFF_CAP: u64 = 20;
 
@@ -600,7 +606,7 @@ pub fn slot_lenience_linear(parent_slot: u64, slot_info: &SlotInfo) -> Option<Du
 	// linear back-off.
 	// in normal cases we only attempt to issue blocks up to the end of the slot.
 	// when the chain has been stalled for a few slots, we give more lenience.
-	let skipped_slots = slot_info.number.saturating_sub(parent_slot + 1);
+	let skipped_slots = *slot_info.slot.saturating_sub(parent_slot + 1);
 
 	if skipped_slots == 0 {
 		None
@@ -616,9 +622,9 @@ pub trait BackoffAuthoringBlocksStrategy<N> {
 	fn should_backoff(
 		&self,
 		chain_head_number: N,
-		chain_head_slot: u64,
+		chain_head_slot: Slot,
 		finalized_number: N,
-		slow_now: u64,
+		slow_now: Slot,
 		logging_target: &str,
 	) -> bool;
 }
@@ -663,9 +669,9 @@ where
 	fn should_backoff(
 		&self,
 		chain_head_number: N,
-		chain_head_slot: u64,
+		chain_head_slot: Slot,
 		finalized_number: N,
-		slot_now: u64,
+		slot_now: Slot,
 		logging_target: &str,
 	) -> bool {
 		// This should not happen, but we want to keep the previous behaviour if it does.
@@ -683,7 +689,7 @@ where
 
 		// If interval is nonzero we backoff if the current slot isn't far enough ahead of the chain
 		// head.
-		if slot_now <= chain_head_slot + interval {
+		if *slot_now <= *chain_head_slot + interval {
 			info!(
 				target: logging_target,
 				"Backing off claiming new slot for block authorship: finality is lagging.",
@@ -699,9 +705,9 @@ impl<N> BackoffAuthoringBlocksStrategy<N> for () {
 	fn should_backoff(
 		&self,
 		_chain_head_number: N,
-		_chain_head_slot: u64,
+		_chain_head_slot: Slot,
 		_finalized_number: N,
-		_slot_now: u64,
+		_slot_now: Slot,
 		_logging_target: &str,
 	) -> bool {
 		false
@@ -717,9 +723,9 @@ mod test {
 
 	const SLOT_DURATION: Duration = Duration::from_millis(6000);
 
-	fn slot(n: u64) -> super::slots::SlotInfo {
+	fn slot(slot: u64) -> super::slots::SlotInfo {
 		super::slots::SlotInfo {
-			number: n,
+			slot: slot.into(),
 			duration: SLOT_DURATION.as_millis() as u64,
 			timestamp: Default::default(),
 			inherent_data: Default::default(),
@@ -730,20 +736,20 @@ mod test {
 	#[test]
 	fn linear_slot_lenience() {
 		// if no slots are skipped there should be no lenience
-		assert_eq!(super::slot_lenience_linear(1, &slot(2)), None);
+		assert_eq!(super::slot_lenience_linear(1.into(), &slot(2)), None);
 
 		// otherwise the lenience is incremented linearly with
 		// the number of skipped slots.
 		for n in 3..=22 {
 			assert_eq!(
-				super::slot_lenience_linear(1, &slot(n)),
+				super::slot_lenience_linear(1.into(), &slot(n)),
 				Some(SLOT_DURATION * (n - 2) as u32),
 			);
 		}
 
 		// but we cap it to a maximum of 20 slots
 		assert_eq!(
-			super::slot_lenience_linear(1, &slot(23)),
+			super::slot_lenience_linear(1.into(), &slot(23)),
 			Some(SLOT_DURATION * 20),
 		);
 	}
@@ -751,24 +757,24 @@ mod test {
 	#[test]
 	fn exponential_slot_lenience() {
 		// if no slots are skipped there should be no lenience
-		assert_eq!(super::slot_lenience_exponential(1, &slot(2)), None);
+		assert_eq!(super::slot_lenience_exponential(1.into(), &slot(2)), None);
 
 		// otherwise the lenience is incremented exponentially every two slots
 		for n in 3..=17 {
 			assert_eq!(
-				super::slot_lenience_exponential(1, &slot(n)),
+				super::slot_lenience_exponential(1.into(), &slot(n)),
 				Some(SLOT_DURATION * 2u32.pow((n / 2 - 1) as u32)),
 			);
 		}
 
 		// but we cap it to a maximum of 14 slots
 		assert_eq!(
-			super::slot_lenience_exponential(1, &slot(18)),
+			super::slot_lenience_exponential(1.into(), &slot(18)),
 			Some(SLOT_DURATION * 2u32.pow(7)),
 		);
 
 		assert_eq!(
-			super::slot_lenience_exponential(1, &slot(19)),
+			super::slot_lenience_exponential(1.into(), &slot(19)),
 			Some(SLOT_DURATION * 2u32.pow(7)),
 		);
 	}
@@ -808,7 +814,7 @@ mod test {
 		let slot_now = 2;
 
 		let should_backoff: Vec<bool> = (slot_now..1000)
-			.map(|s| strategy.should_backoff(head_number, head_slot, finalized_number, s, "slots"))
+			.map(|s| strategy.should_backoff(head_number, head_slot.into(), finalized_number, s.into(), "slots"))
 			.collect();
 
 		// Should always be false, since the head isn't advancing
@@ -833,9 +839,9 @@ mod test {
 			.map(move |s| {
 				let b = strategy.should_backoff(
 					head_number,
-					head_slot,
+					head_slot.into(),
 					finalized_number,
-					s,
+					s.into(),
 					"slots",
 				);
 				// Chain is still advancing (by someone else)
@@ -872,7 +878,7 @@ mod test {
 		let max_interval = strategy.max_interval;
 
 		let should_backoff: Vec<bool> = (slot_now..200)
-			.map(|s| strategy.should_backoff(head_number, head_slot, finalized_number, s, "slots"))
+			.map(|s| strategy.should_backoff(head_number, head_slot.into(), finalized_number, s.into(), "slots"))
 			.collect();
 
 		// Should backoff (true) until we are `max_interval` number of slots ahead of the chain
@@ -900,9 +906,9 @@ mod test {
 			<dyn BackoffAuthoringBlocksStrategy<NumberFor<Block>>>::should_backoff(
 				&param,
 				head_state.head_number,
-				head_state.head_slot,
+				head_state.head_slot.into(),
 				finalized_number,
-				head_state.slot_now,
+				head_state.slot_now.into(),
 				"slots",
 			)
 		};
@@ -972,9 +978,9 @@ mod test {
 			<dyn BackoffAuthoringBlocksStrategy<NumberFor<Block>>>::should_backoff(
 				&param,
 				head_state.head_number,
-				head_state.head_slot,
+				head_state.head_slot.into(),
 				finalized_number,
-				head_state.slot_now,
+				head_state.slot_now.into(),
 				"slots",
 			)
 		};
@@ -1036,9 +1042,9 @@ mod test {
 			<dyn BackoffAuthoringBlocksStrategy<NumberFor<Block>>>::should_backoff(
 				&param,
 				head_state.head_number,
-				head_state.head_slot,
+				head_state.head_slot.into(),
 				finalized_number,
-				head_state.slot_now,
+				head_state.slot_now.into(),
 				"slots",
 			)
 		};
diff --git a/client/consensus/slots/src/slots.rs b/client/consensus/slots/src/slots.rs
index 0c93e16461cc..d3bddccce0fa 100644
--- a/client/consensus/slots/src/slots.rs
+++ b/client/consensus/slots/src/slots.rs
@@ -20,7 +20,7 @@
 //!
 //! This is used instead of `futures_timer::Interval` because it was unreliable.
 
-use super::SlotCompatible;
+use super::{SlotCompatible, Slot};
 use sp_consensus::Error;
 use futures::{prelude::*, task::Context, task::Poll};
 use sp_inherents::{InherentData, InherentDataProviders};
@@ -48,7 +48,7 @@ pub fn time_until_next(now: Duration, slot_duration: u64) -> Duration {
 /// Information about a slot.
 pub struct SlotInfo {
 	/// The slot number.
-	pub number: u64,
+	pub slot: Slot,
 	/// Current timestamp.
 	pub timestamp: u64,
 	/// The instant at which the slot ends.
@@ -61,7 +61,7 @@ pub struct SlotInfo {
 
 /// A stream that returns every time there is a new slot.
 pub(crate) struct Slots<SC> {
-	last_slot: u64,
+	last_slot: Slot,
 	slot_duration: u64,
 	inner_delay: Option<Delay>,
 	inherent_data_providers: InherentDataProviders,
@@ -76,7 +76,7 @@ impl<SC> Slots<SC> {
 		timestamp_extractor: SC,
 	) -> Self {
 		Slots {
-			last_slot: 0,
+			last_slot: 0.into(),
 			slot_duration,
 			inner_delay: None,
 			inherent_data_providers,
@@ -114,7 +114,7 @@ impl<SC: SlotCompatible> Stream for Slots<SC> {
 				Err(err) => return Poll::Ready(Some(Err(sp_consensus::Error::InherentData(err)))),
 			};
 			let result = self.timestamp_extractor.extract_timestamp_and_slot(&inherent_data);
-			let (timestamp, slot_num, offset) = match result {
+			let (timestamp, slot, offset) = match result {
 				Ok(v) => v,
 				Err(err) => return Poll::Ready(Some(Err(err))),
 			};
@@ -125,11 +125,11 @@ impl<SC: SlotCompatible> Stream for Slots<SC> {
 			self.inner_delay = Some(Delay::new(ends_in));
 
 			// never yield the same slot twice.
-			if slot_num > self.last_slot {
-				self.last_slot = slot_num;
+			if slot > self.last_slot {
+				self.last_slot = slot;
 
 				break Poll::Ready(Some(Ok(SlotInfo {
-					number: slot_num,
+					slot,
 					duration: self.slot_duration,
 					timestamp,
 					ends_at,
diff --git a/frame/aura/src/lib.rs b/frame/aura/src/lib.rs
index 2e32fc61585d..65c6a4db9e5b 100644
--- a/frame/aura/src/lib.rs
+++ b/frame/aura/src/lib.rs
@@ -151,8 +151,8 @@ impl<T: Config> FindAuthor<u32> for Module<T> {
 	{
 		for (id, mut data) in digests.into_iter() {
 			if id == AURA_ENGINE_ID {
-				if let Ok(slot_num) = u64::decode(&mut data) {
-					let author_index = slot_num % Self::authorities().len() as u64;
+				if let Ok(slot) = u64::decode(&mut data) {
+					let author_index = slot % Self::authorities().len() as u64;
 					return Some(author_index as u32)
 				}
 			}
@@ -242,7 +242,7 @@ impl<T: Config> ProvideInherent for Module<T> {
 
 		let timestamp_based_slot = timestamp / Self::slot_duration();
 
-		let seal_slot = data.aura_inherent_data()?.saturated_into();
+		let seal_slot = u64::from(data.aura_inherent_data()?).saturated_into();
 
 		if timestamp_based_slot == seal_slot {
 			Ok(())
diff --git a/frame/babe/src/equivocation.rs b/frame/babe/src/equivocation.rs
index e7053f5ac0fe..9e487769aba3 100644
--- a/frame/babe/src/equivocation.rs
+++ b/frame/babe/src/equivocation.rs
@@ -36,7 +36,7 @@
 //!
 
 use frame_support::{debug, traits::KeyOwnerProofSystem};
-use sp_consensus_babe::{EquivocationProof, SlotNumber};
+use sp_consensus_babe::{EquivocationProof, Slot};
 use sp_runtime::transaction_validity::{
 	InvalidTransaction, TransactionPriority, TransactionSource, TransactionValidity,
 	TransactionValidityError, ValidTransaction,
@@ -63,7 +63,7 @@ pub trait HandleEquivocation<T: Config> {
 	) -> Result<(), OffenceError>;
 
 	/// Returns true if all of the offenders at the given time slot have already been reported.
-	fn is_known_offence(offenders: &[T::KeyOwnerIdentification], time_slot: &SlotNumber) -> bool;
+	fn is_known_offence(offenders: &[T::KeyOwnerIdentification], time_slot: &Slot) -> bool;
 
 	/// Create and dispatch an equivocation report extrinsic.
 	fn submit_unsigned_equivocation_report(
@@ -83,7 +83,7 @@ impl<T: Config> HandleEquivocation<T> for () {
 		Ok(())
 	}
 
-	fn is_known_offence(_offenders: &[T::KeyOwnerIdentification], _time_slot: &SlotNumber) -> bool {
+	fn is_known_offence(_offenders: &[T::KeyOwnerIdentification], _time_slot: &Slot) -> bool {
 		true
 	}
 
@@ -136,7 +136,7 @@ where
 		R::report_offence(reporters, offence)
 	}
 
-	fn is_known_offence(offenders: &[T::KeyOwnerIdentification], time_slot: &SlotNumber) -> bool {
+	fn is_known_offence(offenders: &[T::KeyOwnerIdentification], time_slot: &Slot) -> bool {
 		R::is_known_offence(offenders, time_slot)
 	}
 
@@ -187,7 +187,7 @@ impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
 				// Only one equivocation report for the same offender at the same slot.
 				.and_provides((
 					equivocation_proof.offender.clone(),
-					equivocation_proof.slot_number,
+					*equivocation_proof.slot,
 				))
 				// We don't propagate this. This can never be included on a remote node.
 				.propagate(false)
@@ -212,7 +212,7 @@ impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
 			// and if so then we can discard the report.
 			let is_known_offence = T::HandleEquivocation::is_known_offence(
 				&[offender],
-				&equivocation_proof.slot_number,
+				&equivocation_proof.slot,
 			);
 
 			if is_known_offence {
@@ -230,8 +230,8 @@ impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
 ///
 /// When a validator released two or more blocks at the same slot.
 pub struct BabeEquivocationOffence<FullIdentification> {
-	/// A babe slot number in which this incident happened.
-	pub slot: SlotNumber,
+	/// A babe slot in which this incident happened.
+	pub slot: Slot,
 	/// The session index in which the incident happened.
 	pub session_index: SessionIndex,
 	/// The size of the validator set at the time of the offence.
@@ -244,7 +244,7 @@ impl<FullIdentification: Clone> Offence<FullIdentification>
 	for BabeEquivocationOffence<FullIdentification>
 {
 	const ID: Kind = *b"babe:equivocatio";
-	type TimeSlot = SlotNumber;
+	type TimeSlot = Slot;
 
 	fn offenders(&self) -> Vec<FullIdentification> {
 		vec![self.offender.clone()]
diff --git a/frame/babe/src/lib.rs b/frame/babe/src/lib.rs
index d604bfd57d1a..e34de5d6c532 100644
--- a/frame/babe/src/lib.rs
+++ b/frame/babe/src/lib.rs
@@ -43,7 +43,7 @@ use sp_timestamp::OnTimestampSet;
 use sp_consensus_babe::{
 	digests::{NextConfigDescriptor, NextEpochDescriptor, PreDigest},
 	inherents::{BabeInherentData, INHERENT_IDENTIFIER},
-	BabeAuthorityWeight, ConsensusLog, Epoch, EquivocationProof, SlotNumber, BABE_ENGINE_ID,
+	BabeAuthorityWeight, ConsensusLog, Epoch, EquivocationProof, Slot, BABE_ENGINE_ID,
 };
 use sp_consensus_vrf::schnorrkel;
 use sp_inherents::{InherentData, InherentIdentifier, MakeFatalError, ProvideInherent};
@@ -66,7 +66,7 @@ pub trait Config: pallet_timestamp::Config {
 	/// The amount of time, in slots, that each epoch should last.
 	/// NOTE: Currently it is not possible to change the epoch duration after
 	/// the chain has started. Attempting to do so will brick block production.
-	type EpochDuration: Get<SlotNumber>;
+	type EpochDuration: Get<u64>;
 
 	/// The expected average block time at which BABE should be creating
 	/// blocks. Since BABE is probabilistic it is not trivial to figure out
@@ -168,10 +168,10 @@ decl_storage! {
 
 		/// The slot at which the first epoch actually started. This is 0
 		/// until the first block of the chain.
-		pub GenesisSlot get(fn genesis_slot): u64;
+		pub GenesisSlot get(fn genesis_slot): Slot;
 
 		/// Current slot number.
-		pub CurrentSlot get(fn current_slot): u64;
+		pub CurrentSlot get(fn current_slot): Slot;
 
 		/// The epoch randomness for the *current* epoch.
 		///
@@ -403,7 +403,7 @@ impl<T: Config> Module<T> {
 		// so we don't rotate the epoch.
 		now != One::one() && {
 			let diff = CurrentSlot::get().saturating_sub(Self::current_epoch_start());
-			diff >= T::EpochDuration::get()
+			*diff >= T::EpochDuration::get()
 		}
 	}
 
@@ -424,7 +424,7 @@ impl<T: Config> Module<T> {
 	pub fn next_expected_epoch_change(now: T::BlockNumber) -> Option<T::BlockNumber> {
 		let next_slot = Self::current_epoch_start().saturating_add(T::EpochDuration::get());
 		next_slot
-			.checked_sub(CurrentSlot::get())
+			.checked_sub(*CurrentSlot::get())
 			.map(|slots_remaining| {
 				// This is a best effort guess. Drifts in the slot/block ratio will cause errors here.
 				let blocks_remaining: T::BlockNumber = slots_remaining.saturated_into();
@@ -490,10 +490,10 @@ impl<T: Config> Module<T> {
 		}
 	}
 
-	// finds the start slot of the current epoch. only guaranteed to
-	// give correct results after `do_initialize` of the first block
-	// in the chain (as its result is based off of `GenesisSlot`).
-	pub fn current_epoch_start() -> SlotNumber {
+	/// Finds the start slot of the current epoch. only guaranteed to
+	/// give correct results after `do_initialize` of the first block
+	/// in the chain (as its result is based off of `GenesisSlot`).
+	pub fn current_epoch_start() -> Slot {
 		Self::epoch_start(EpochIndex::get())
 	}
 
@@ -525,7 +525,7 @@ impl<T: Config> Module<T> {
 		}
 	}
 
-	fn epoch_start(epoch_index: u64) -> SlotNumber {
+	fn epoch_start(epoch_index: u64) -> Slot {
 		// (epoch_index * epoch_duration) + genesis_slot
 
 		const PROOF: &str = "slot number is u64; it should relate in some way to wall clock time; \
@@ -535,7 +535,7 @@ impl<T: Config> Module<T> {
 			.checked_mul(T::EpochDuration::get())
 			.expect(PROOF);
 
-		epoch_start.checked_add(GenesisSlot::get()).expect(PROOF)
+		epoch_start.checked_add(*GenesisSlot::get()).expect(PROOF).into()
 	}
 
 	fn deposit_consensus<U: Encode>(new: U) {
@@ -583,9 +583,9 @@ impl<T: Config> Module<T> {
 			// on the first non-zero block (i.e. block #1)
 			// this is where the first epoch (epoch #0) actually starts.
 			// we need to adjust internal storage accordingly.
-			if GenesisSlot::get() == 0 {
-				GenesisSlot::put(digest.slot_number());
-				debug_assert_ne!(GenesisSlot::get(), 0);
+			if *GenesisSlot::get() == 0 {
+				GenesisSlot::put(digest.slot());
+				debug_assert_ne!(*GenesisSlot::get(), 0);
 
 				// deposit a log because this is the first block in epoch #0
 				// we use the same values as genesis because we haven't collected any
@@ -599,11 +599,11 @@ impl<T: Config> Module<T> {
 			}
 
 			// the slot number of the current block being initialized
-			let current_slot = digest.slot_number();
+			let current_slot = digest.slot();
 
 			// how many slots were skipped between current and last block
 			let lateness = current_slot.saturating_sub(CurrentSlot::get() + 1);
-			let lateness = T::BlockNumber::from(lateness as u32);
+			let lateness = T::BlockNumber::from(*lateness as u32);
 
 			Lateness::<T>::put(lateness);
 			CurrentSlot::put(current_slot);
@@ -684,7 +684,7 @@ impl<T: Config> Module<T> {
 		key_owner_proof: T::KeyOwnerProof,
 	) -> DispatchResultWithPostInfo {
 		let offender = equivocation_proof.offender.clone();
-		let slot_number = equivocation_proof.slot_number;
+		let slot = equivocation_proof.slot;
 
 		// validate the equivocation proof
 		if !sp_consensus_babe::check_equivocation_proof(equivocation_proof) {
@@ -694,7 +694,7 @@ impl<T: Config> Module<T> {
 		let validator_set_count = key_owner_proof.validator_count();
 		let session_index = key_owner_proof.session();
 
-		let epoch_index = (slot_number.saturating_sub(GenesisSlot::get()) / T::EpochDuration::get())
+		let epoch_index = (*slot.saturating_sub(GenesisSlot::get()) / T::EpochDuration::get())
 			.saturated_into::<u32>();
 
 		// check that the slot number is consistent with the session index
@@ -709,7 +709,7 @@ impl<T: Config> Module<T> {
 			.ok_or(Error::<T>::InvalidKeyOwnershipProof)?;
 
 		let offence = BabeEquivocationOffence {
-			slot: slot_number,
+			slot,
 			validator_set_count,
 			offender,
 			session_index,
@@ -837,7 +837,7 @@ impl<T: Config> ProvideInherent for Module<T> {
 		let timestamp_based_slot = (timestamp / Self::slot_duration()).saturated_into::<u64>();
 		let seal_slot = data.babe_inherent_data()?;
 
-		if timestamp_based_slot == seal_slot {
+		if timestamp_based_slot == *seal_slot {
 			Ok(())
 		} else {
 			Err(sp_inherents::Error::from("timestamp set in block doesn't match slot in seal").into())
diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index 3198930ea6cc..75d4703b0dd6 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -33,7 +33,7 @@ use frame_support::{
 };
 use sp_io;
 use sp_core::{H256, U256, crypto::{IsWrappedBy, KeyTypeId, Pair}};
-use sp_consensus_babe::{AuthorityId, AuthorityPair, SlotNumber};
+use sp_consensus_babe::{AuthorityId, AuthorityPair, Slot};
 use sp_consensus_vrf::schnorrkel::{VRFOutput, VRFProof};
 use sp_staking::SessionIndex;
 use pallet_staking::EraIndex;
@@ -255,14 +255,14 @@ pub fn go_to_block(n: u64, s: u64) {
 		System::parent_hash()
 	};
 
-	let pre_digest = make_secondary_plain_pre_digest(0, s);
+	let pre_digest = make_secondary_plain_pre_digest(0, s.into());
 
 	System::initialize(&n, &parent_hash, &pre_digest, InitKind::Full);
 	System::set_block_number(n);
 	Timestamp::set_timestamp(n);
 
 	if s > 1 {
-		CurrentSlot::put(s);
+		CurrentSlot::put(Slot::from(s));
 	}
 
 	System::on_initialize(n);
@@ -272,8 +272,8 @@ pub fn go_to_block(n: u64, s: u64) {
 
 /// Slots will grow accordingly to blocks
 pub fn progress_to_block(n: u64) {
-	let mut slot = Babe::current_slot() + 1;
-	for i in System::block_number()+1..=n {
+	let mut slot = u64::from(Babe::current_slot()) + 1;
+	for i in System::block_number() + 1 ..= n {
 		go_to_block(i, slot);
 		slot += 1;
 	}
@@ -294,14 +294,14 @@ pub fn start_era(era_index: EraIndex) {
 
 pub fn make_primary_pre_digest(
 	authority_index: sp_consensus_babe::AuthorityIndex,
-	slot_number: sp_consensus_babe::SlotNumber,
+	slot: sp_consensus_babe::Slot,
 	vrf_output: VRFOutput,
 	vrf_proof: VRFProof,
 ) -> Digest {
 	let digest_data = sp_consensus_babe::digests::PreDigest::Primary(
 		sp_consensus_babe::digests::PrimaryPreDigest {
 			authority_index,
-			slot_number,
+			slot,
 			vrf_output,
 			vrf_proof,
 		}
@@ -312,12 +312,12 @@ pub fn make_primary_pre_digest(
 
 pub fn make_secondary_plain_pre_digest(
 	authority_index: sp_consensus_babe::AuthorityIndex,
-	slot_number: sp_consensus_babe::SlotNumber,
+	slot: sp_consensus_babe::Slot,
 ) -> Digest {
 	let digest_data = sp_consensus_babe::digests::PreDigest::SecondaryPlain(
 		sp_consensus_babe::digests::SecondaryPlainPreDigest {
 			authority_index,
-			slot_number,
+			slot,
 		}
 	);
 	let log = DigestItem::PreRuntime(sp_consensus_babe::BABE_ENGINE_ID, digest_data.encode());
@@ -326,14 +326,14 @@ pub fn make_secondary_plain_pre_digest(
 
 pub fn make_secondary_vrf_pre_digest(
 	authority_index: sp_consensus_babe::AuthorityIndex,
-	slot_number: sp_consensus_babe::SlotNumber,
+	slot: sp_consensus_babe::Slot,
 	vrf_output: VRFOutput,
 	vrf_proof: VRFProof,
 ) -> Digest {
 	let digest_data = sp_consensus_babe::digests::PreDigest::SecondaryVRF(
 		sp_consensus_babe::digests::SecondaryVRFPreDigest {
 			authority_index,
-			slot_number,
+			slot,
 			vrf_output,
 			vrf_proof,
 		}
@@ -343,11 +343,11 @@ pub fn make_secondary_vrf_pre_digest(
 }
 
 pub fn make_vrf_output(
-	slot_number: u64,
+	slot: Slot,
 	pair: &sp_consensus_babe::AuthorityPair
 ) -> (VRFOutput, VRFProof, [u8; 32]) {
 	let pair = sp_core::sr25519::Pair::from_ref(pair).as_ref();
-	let transcript = sp_consensus_babe::make_transcript(&Babe::randomness(), slot_number, 0);
+	let transcript = sp_consensus_babe::make_transcript(&Babe::randomness(), slot, 0);
 	let vrf_inout = pair.vrf_sign(transcript);
 	let vrf_randomness: sp_consensus_vrf::schnorrkel::Randomness = vrf_inout.0
 		.make_bytes::<[u8; 32]>(&sp_consensus_babe::BABE_VRF_INOUT_CONTEXT);
@@ -435,7 +435,7 @@ pub fn new_test_ext_raw_authorities(authorities: Vec<AuthorityId>) -> sp_io::Tes
 pub fn generate_equivocation_proof(
 	offender_authority_index: u32,
 	offender_authority_pair: &AuthorityPair,
-	slot_number: SlotNumber,
+	slot: Slot,
 ) -> sp_consensus_babe::EquivocationProof<Header> {
 	use sp_consensus_babe::digests::CompatibleDigestItem;
 
@@ -444,7 +444,7 @@ pub fn generate_equivocation_proof(
 
 	let make_header = || {
 		let parent_hash = System::parent_hash();
-		let pre_digest = make_secondary_plain_pre_digest(offender_authority_index, slot_number);
+		let pre_digest = make_secondary_plain_pre_digest(offender_authority_index, slot);
 		System::initialize(&current_block, &parent_hash, &pre_digest, InitKind::Full);
 		System::set_block_number(current_block);
 		Timestamp::set_timestamp(current_block);
@@ -469,10 +469,10 @@ pub fn generate_equivocation_proof(
 	seal_header(&mut h2);
 
 	// restore previous runtime state
-	go_to_block(current_block, current_slot);
+	go_to_block(current_block, *current_slot);
 
 	sp_consensus_babe::EquivocationProof {
-		slot_number,
+		slot,
 		offender: offender_authority_pair.public(),
 		first_header: h1,
 		second_header: h2,
diff --git a/frame/babe/src/tests.rs b/frame/babe/src/tests.rs
index 23e8bc765c80..62b38896802d 100644
--- a/frame/babe/src/tests.rs
+++ b/frame/babe/src/tests.rs
@@ -25,7 +25,7 @@ use frame_support::{
 };
 use mock::*;
 use pallet_session::ShouldEndSession;
-use sp_consensus_babe::AllowedSlots;
+use sp_consensus_babe::{AllowedSlots, Slot};
 use sp_core::crypto::Pair;
 
 const EMPTY_RANDOMNESS: [u8; 32] = [
@@ -62,7 +62,7 @@ fn first_block_epoch_zero_start() {
 	let (pairs, mut ext) = new_test_ext_with_pairs(4);
 
 	ext.execute_with(|| {
-		let genesis_slot = 100;
+		let genesis_slot = Slot::from(100);
 		let (vrf_output, vrf_proof, vrf_randomness) = make_vrf_output(genesis_slot, &pairs[0]);
 
 		let first_vrf = vrf_output;
@@ -73,7 +73,7 @@ fn first_block_epoch_zero_start() {
 			vrf_proof,
 		);
 
-		assert_eq!(Babe::genesis_slot(), 0);
+		assert_eq!(Babe::genesis_slot(), Slot::from(0));
 		System::initialize(
 			&1,
 			&Default::default(),
@@ -120,7 +120,7 @@ fn author_vrf_output_for_primary() {
 	let (pairs, mut ext) = new_test_ext_with_pairs(1);
 
 	ext.execute_with(|| {
-		let genesis_slot = 10;
+		let genesis_slot = Slot::from(10);
 		let (vrf_output, vrf_proof, vrf_randomness) = make_vrf_output(genesis_slot, &pairs[0]);
 		let primary_pre_digest = make_primary_pre_digest(0, genesis_slot, vrf_output, vrf_proof);
 
@@ -146,7 +146,7 @@ fn author_vrf_output_for_secondary_vrf() {
 	let (pairs, mut ext) = new_test_ext_with_pairs(1);
 
 	ext.execute_with(|| {
-		let genesis_slot = 10;
+		let genesis_slot = Slot::from(10);
 		let (vrf_output, vrf_proof, vrf_randomness) = make_vrf_output(genesis_slot, &pairs[0]);
 		let secondary_vrf_pre_digest = make_secondary_vrf_pre_digest(0, genesis_slot, vrf_output, vrf_proof);
 
@@ -170,7 +170,7 @@ fn author_vrf_output_for_secondary_vrf() {
 #[test]
 fn no_author_vrf_output_for_secondary_plain() {
 	new_test_ext(1).execute_with(|| {
-		let genesis_slot = 10;
+		let genesis_slot = Slot::from(10);
 		let secondary_plain_pre_digest = make_secondary_plain_pre_digest(0, genesis_slot);
 
 		System::initialize(
@@ -205,17 +205,17 @@ fn can_predict_next_epoch_change() {
 		assert_eq!(<Test as Config>::EpochDuration::get(), 3);
 		// this sets the genesis slot to 6;
 		go_to_block(1, 6);
-		assert_eq!(Babe::genesis_slot(), 6);
-		assert_eq!(Babe::current_slot(), 6);
+		assert_eq!(*Babe::genesis_slot(), 6);
+		assert_eq!(*Babe::current_slot(), 6);
 		assert_eq!(Babe::epoch_index(), 0);
 
 		progress_to_block(5);
 
 		assert_eq!(Babe::epoch_index(), 5 / 3);
-		assert_eq!(Babe::current_slot(), 10);
+		assert_eq!(*Babe::current_slot(), 10);
 
 		// next epoch change will be at
-		assert_eq!(Babe::current_epoch_start(), 9); // next change will be 12, 2 slots from now
+		assert_eq!(*Babe::current_epoch_start(), 9); // next change will be 12, 2 slots from now
 		assert_eq!(Babe::next_expected_epoch_change(System::block_number()), Some(5 + 2));
 	})
 }
@@ -226,8 +226,8 @@ fn can_enact_next_config() {
 		assert_eq!(<Test as Config>::EpochDuration::get(), 3);
 		// this sets the genesis slot to 6;
 		go_to_block(1, 6);
-		assert_eq!(Babe::genesis_slot(), 6);
-		assert_eq!(Babe::current_slot(), 6);
+		assert_eq!(*Babe::genesis_slot(), 6);
+		assert_eq!(*Babe::current_slot(), 6);
 		assert_eq!(Babe::epoch_index(), 0);
 		go_to_block(2, 7);
 
@@ -269,12 +269,12 @@ fn can_fetch_current_and_next_epoch_data() {
 
 		let current_epoch = Babe::current_epoch();
 		assert_eq!(current_epoch.epoch_index, 3);
-		assert_eq!(current_epoch.start_slot, 10);
+		assert_eq!(*current_epoch.start_slot, 10);
 		assert_eq!(current_epoch.authorities.len(), 5);
 
 		let next_epoch = Babe::next_epoch();
 		assert_eq!(next_epoch.epoch_index, 4);
-		assert_eq!(next_epoch.start_slot, 13);
+		assert_eq!(*next_epoch.start_slot, 13);
 		assert_eq!(next_epoch.authorities.len(), 5);
 
 		// the on-chain randomness should always change across epochs
@@ -572,7 +572,7 @@ fn report_equivocation_invalid_equivocation_proof() {
 			&offending_authority_pair,
 			CurrentSlot::get(),
 		);
-		equivocation_proof.slot_number = 0;
+		equivocation_proof.slot = Slot::from(0);
 		assert_invalid_equivocation(equivocation_proof.clone());
 
 		// different slot numbers in headers
diff --git a/frame/offences/benchmarking/src/lib.rs b/frame/offences/benchmarking/src/lib.rs
index 1151bfea4807..06a0e33a9cf4 100644
--- a/frame/offences/benchmarking/src/lib.rs
+++ b/frame/offences/benchmarking/src/lib.rs
@@ -31,7 +31,7 @@ use frame_support::traits::{Currency, OnInitialize};
 use sp_runtime::{Perbill, traits::{Convert, StaticLookup, Saturating, UniqueSaturatedInto}};
 use sp_staking::offence::{ReportOffence, Offence, OffenceDetails};
 
-use pallet_balances::{Config as BalancesConfig};
+use pallet_balances::Config as BalancesConfig;
 use pallet_babe::BabeEquivocationOffence;
 use pallet_grandpa::{GrandpaEquivocationOffence, GrandpaTimeSlot};
 use pallet_im_online::{Config as ImOnlineConfig, Module as ImOnline, UnresponsivenessOffence};
@@ -331,7 +331,7 @@ benchmarks! {
 		let keys =  ImOnline::<T>::keys();
 
 		let offence = BabeEquivocationOffence {
-			slot: 0,
+			slot: 0u64.into(),
 			session_index: 0,
 			validator_set_count: keys.len() as u32,
 			offender: T::convert(offenders.pop().unwrap()),
diff --git a/primitives/consensus/aura/Cargo.toml b/primitives/consensus/aura/Cargo.toml
index eed368e5c1d1..782dd3bfba3e 100644
--- a/primitives/consensus/aura/Cargo.toml
+++ b/primitives/consensus/aura/Cargo.toml
@@ -20,6 +20,7 @@ sp-api = { version = "2.0.0", default-features = false, path = "../../api" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../runtime" }
 sp-inherents = { version = "2.0.0", default-features = false, path = "../../inherents" }
 sp-timestamp = { version = "2.0.0", default-features = false, path = "../../timestamp" }
+sp-consensus-slots = { version = "0.8.1", default-features = false, path = "../slots" }
 
 [features]
 default = ["std"]
diff --git a/primitives/consensus/aura/src/inherents.rs b/primitives/consensus/aura/src/inherents.rs
index e92775c501af..2b73b2229511 100644
--- a/primitives/consensus/aura/src/inherents.rs
+++ b/primitives/consensus/aura/src/inherents.rs
@@ -26,7 +26,7 @@ use sp_inherents::{InherentDataProviders, ProvideInherentData};
 pub const INHERENT_IDENTIFIER: InherentIdentifier = *b"auraslot";
 
 /// The type of the Aura inherent.
-pub type InherentType = u64;
+pub type InherentType = sp_consensus_slots::Slot;
 
 /// Auxiliary trait to extract Aura inherent data.
 pub trait AuraInherentData {
@@ -87,8 +87,8 @@ impl ProvideInherentData for InherentDataProvider {
 		use sp_timestamp::TimestampInherentData;
 
 		let timestamp = inherent_data.timestamp_inherent_data()?;
-		let slot_num = timestamp / self.slot_duration;
-		inherent_data.put_data(INHERENT_IDENTIFIER, &slot_num)
+		let slot = timestamp / self.slot_duration;
+		inherent_data.put_data(INHERENT_IDENTIFIER, &slot)
 	}
 
 	fn error_to_string(&self, error: &[u8]) -> Option<String> {
diff --git a/primitives/consensus/babe/src/digests.rs b/primitives/consensus/babe/src/digests.rs
index eeea747179a5..b5b3f6d2b7a6 100644
--- a/primitives/consensus/babe/src/digests.rs
+++ b/primitives/consensus/babe/src/digests.rs
@@ -19,7 +19,7 @@
 
 use super::{
 	AllowedSlots, AuthorityId, AuthorityIndex, AuthoritySignature, BabeAuthorityWeight,
-	BabeEpochConfiguration, SlotNumber, BABE_ENGINE_ID,
+	BabeEpochConfiguration, Slot, BABE_ENGINE_ID,
 };
 use codec::{Codec, Decode, Encode};
 use sp_std::vec::Vec;
@@ -32,8 +32,8 @@ use sp_consensus_vrf::schnorrkel::{Randomness, VRFOutput, VRFProof};
 pub struct PrimaryPreDigest {
 	/// Authority index
 	pub authority_index: super::AuthorityIndex,
-	/// Slot number
-	pub slot_number: SlotNumber,
+	/// Slot
+	pub slot: Slot,
 	/// VRF output
 	pub vrf_output: VRFOutput,
 	/// VRF proof
@@ -50,8 +50,8 @@ pub struct SecondaryPlainPreDigest {
 	/// it makes things easier for higher-level users of the chain data to
 	/// be aware of the author of a secondary-slot block.
 	pub authority_index: super::AuthorityIndex,
-	/// Slot number
-	pub slot_number: SlotNumber,
+	/// Slot
+	pub slot: Slot,
 }
 
 /// BABE secondary deterministic slot assignment with VRF outputs.
@@ -59,8 +59,8 @@ pub struct SecondaryPlainPreDigest {
 pub struct SecondaryVRFPreDigest {
 	/// Authority index
 	pub authority_index: super::AuthorityIndex,
-	/// Slot number
-	pub slot_number: SlotNumber,
+	/// Slot
+	pub slot: Slot,
 	/// VRF output
 	pub vrf_output: VRFOutput,
 	/// VRF proof
@@ -93,12 +93,12 @@ impl PreDigest {
 		}
 	}
 
-	/// Returns the slot number of the pre digest.
-	pub fn slot_number(&self) -> SlotNumber {
+	/// Returns the slot of the pre digest.
+	pub fn slot(&self) -> Slot {
 		match self {
-			PreDigest::Primary(primary) => primary.slot_number,
-			PreDigest::SecondaryPlain(secondary) => secondary.slot_number,
-			PreDigest::SecondaryVRF(secondary) => secondary.slot_number,
+			PreDigest::Primary(primary) => primary.slot,
+			PreDigest::SecondaryPlain(secondary) => secondary.slot,
+			PreDigest::SecondaryVRF(secondary) => secondary.slot,
 		}
 	}
 
diff --git a/primitives/consensus/babe/src/inherents.rs b/primitives/consensus/babe/src/inherents.rs
index 98104385c70f..b20cf45cd43a 100644
--- a/primitives/consensus/babe/src/inherents.rs
+++ b/primitives/consensus/babe/src/inherents.rs
@@ -31,7 +31,7 @@ use sp_std::result::Result;
 pub const INHERENT_IDENTIFIER: InherentIdentifier = *b"babeslot";
 
 /// The type of the BABE inherent.
-pub type InherentType = u64;
+pub type InherentType = sp_consensus_slots::Slot;
 /// Auxiliary trait to extract BABE inherent data.
 pub trait BabeInherentData {
 	/// Get BABE inherent data.
@@ -82,8 +82,8 @@ impl ProvideInherentData for InherentDataProvider {
 
 	fn provide_inherent_data(&self, inherent_data: &mut InherentData) -> Result<(), Error> {
 		let timestamp = inherent_data.timestamp_inherent_data()?;
-		let slot_number = timestamp / self.slot_duration;
-		inherent_data.put_data(INHERENT_IDENTIFIER, &slot_number)
+		let slot = timestamp / self.slot_duration;
+		inherent_data.put_data(INHERENT_IDENTIFIER, &slot)
 	}
 
 	fn error_to_string(&self, error: &[u8]) -> Option<String> {
diff --git a/primitives/consensus/babe/src/lib.rs b/primitives/consensus/babe/src/lib.rs
index 6ecc21ab7a11..5ab225812734 100644
--- a/primitives/consensus/babe/src/lib.rs
+++ b/primitives/consensus/babe/src/lib.rs
@@ -76,8 +76,7 @@ pub const MEDIAN_ALGORITHM_CARDINALITY: usize = 1200; // arbitrary suggestion by
 /// The index of an authority.
 pub type AuthorityIndex = u32;
 
-/// A slot number.
-pub use sp_consensus_slots::SlotNumber;
+pub use sp_consensus_slots::Slot;
 
 /// An equivocation proof for multiple block authorships on the same slot (i.e. double vote).
 pub type EquivocationProof<H> = sp_consensus_slots::EquivocationProof<H, AuthorityId>;
@@ -93,11 +92,11 @@ pub type BabeBlockWeight = u32;
 /// Make a VRF transcript from given randomness, slot number and epoch.
 pub fn make_transcript(
 	randomness: &Randomness,
-	slot_number: u64,
+	slot: Slot,
 	epoch: u64,
 ) -> Transcript {
 	let mut transcript = Transcript::new(&BABE_ENGINE_ID);
-	transcript.append_u64(b"slot number", slot_number);
+	transcript.append_u64(b"slot number", *slot);
 	transcript.append_u64(b"current epoch", epoch);
 	transcript.append_message(b"chain randomness", &randomness[..]);
 	transcript
@@ -107,13 +106,13 @@ pub fn make_transcript(
 #[cfg(feature = "std")]
 pub fn make_transcript_data(
 	randomness: &Randomness,
-	slot_number: u64,
+	slot: Slot,
 	epoch: u64,
 ) -> VRFTranscriptData {
 	VRFTranscriptData {
 		label: &BABE_ENGINE_ID,
 		items: vec![
-			("slot number", VRFTranscriptValue::U64(slot_number)),
+			("slot number", VRFTranscriptValue::U64(*slot)),
 			("current epoch", VRFTranscriptValue::U64(epoch)),
 			("chain randomness", VRFTranscriptValue::Bytes(randomness.to_vec())),
 		]
@@ -147,7 +146,7 @@ pub struct BabeGenesisConfigurationV1 {
 	pub slot_duration: u64,
 
 	/// The duration of epochs in slots.
-	pub epoch_length: SlotNumber,
+	pub epoch_length: u64,
 
 	/// A constant value that is used in the threshold calculation formula.
 	/// Expressed as a rational where the first member of the tuple is the
@@ -195,7 +194,7 @@ pub struct BabeGenesisConfiguration {
 	pub slot_duration: u64,
 
 	/// The duration of epochs in slots.
-	pub epoch_length: SlotNumber,
+	pub epoch_length: u64,
 
 	/// A constant value that is used in the threshold calculation formula.
 	/// Expressed as a rational where the first member of the tuple is the
@@ -303,8 +302,8 @@ where
 
 		// both headers must be targetting the same slot and it must
 		// be the same as the one in the proof.
-		if proof.slot_number != first_pre_digest.slot_number() ||
-			first_pre_digest.slot_number() != second_pre_digest.slot_number()
+		if proof.slot != first_pre_digest.slot() ||
+			first_pre_digest.slot() != second_pre_digest.slot()
 		{
 			return None;
 		}
@@ -356,9 +355,9 @@ pub struct Epoch {
 	/// The epoch index.
 	pub epoch_index: u64,
 	/// The starting slot of the epoch.
-	pub start_slot: SlotNumber,
+	pub start_slot: Slot,
 	/// The duration of this epoch.
-	pub duration: SlotNumber,
+	pub duration: u64,
 	/// The authorities and their weights.
 	pub authorities: Vec<(AuthorityId, BabeAuthorityWeight)>,
 	/// Randomness for this epoch.
@@ -376,8 +375,8 @@ sp_api::decl_runtime_apis! {
 		#[changed_in(2)]
 		fn configuration() -> BabeGenesisConfigurationV1;
 
-		/// Returns the slot number that started the current epoch.
-		fn current_epoch_start() -> SlotNumber;
+		/// Returns the slot that started the current epoch.
+		fn current_epoch_start() -> Slot;
 
 		/// Returns information regarding the current epoch.
 		fn current_epoch() -> Epoch;
@@ -391,14 +390,14 @@ sp_api::decl_runtime_apis! {
 		/// session historical module to prove that a given authority key is
 		/// tied to a given staking identity during a specific session. Proofs
 		/// of key ownership are necessary for submitting equivocation reports.
-		/// NOTE: even though the API takes a `slot_number` as parameter the current
+		/// NOTE: even though the API takes a `slot` as parameter the current
 		/// implementations ignores this parameter and instead relies on this
 		/// method being called at the correct block height, i.e. any point at
 		/// which the epoch for the given slot is live on-chain. Future
 		/// implementations will instead use indexed data through an offchain
 		/// worker, not requiring older states to be available.
 		fn generate_key_ownership_proof(
-			slot_number: SlotNumber,
+			slot: Slot,
 			authority_id: AuthorityId,
 		) -> Option<OpaqueKeyOwnershipProof>;
 
diff --git a/primitives/consensus/slots/Cargo.toml b/primitives/consensus/slots/Cargo.toml
index 11f81628b38a..73841e7eb1ba 100644
--- a/primitives/consensus/slots/Cargo.toml
+++ b/primitives/consensus/slots/Cargo.toml
@@ -15,10 +15,12 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../runtime" }
+sp-arithmetic = { version = "2.0.0", default-features = false, path = "../../arithmetic" }
 
 [features]
 default = ["std"]
 std = [
 	"codec/std",
 	"sp-runtime/std",
+	"sp-arithmetic/std",
 ]
diff --git a/primitives/consensus/slots/src/lib.rs b/primitives/consensus/slots/src/lib.rs
index 52df467c2910..545d18af1f9b 100644
--- a/primitives/consensus/slots/src/lib.rs
+++ b/primitives/consensus/slots/src/lib.rs
@@ -21,8 +21,76 @@
 
 use codec::{Decode, Encode};
 
-/// A slot number.
-pub type SlotNumber = u64;
+/// Unit type wrapper that represents a slot.
+#[derive(Debug, Encode, Decode, Eq, Clone, Copy, Default, Ord)]
+pub struct Slot(u64);
+
+impl core::ops::Deref for Slot {
+	type Target = u64;
+
+	fn deref(&self) -> &u64 {
+		&self.0
+	}
+}
+
+impl core::ops::Add for Slot {
+	type Output = Self;
+
+	fn add(self, other: Self) -> Self {
+		Self(self.0 + other.0)
+	}
+}
+
+impl core::ops::Add<u64> for Slot {
+	type Output = Self;
+
+	fn add(self, other: u64) -> Self {
+		Self(self.0 + other)
+	}
+}
+
+impl<T: Into<u64> + Copy> core::cmp::PartialEq<T> for Slot {
+	fn eq(&self, eq: &T) -> bool {
+		self.0 == (*eq).into()
+	}
+}
+
+impl<T: Into<u64> + Copy> core::cmp::PartialOrd<T> for Slot {
+	fn partial_cmp(&self, other: &T) -> Option<core::cmp::Ordering> {
+		self.0.partial_cmp(&(*other).into())
+	}
+}
+
+impl Slot {
+	/// Saturating addition.
+	pub fn saturating_add<T: Into<u64>>(self, rhs: T) -> Self {
+		Self(self.0.saturating_add(rhs.into()))
+	}
+
+	/// Saturating subtraction.
+	pub fn saturating_sub<T: Into<u64>>(self, rhs: T) -> Self {
+		Self(self.0.saturating_sub(rhs.into()))
+	}
+}
+
+#[cfg(feature = "std")]
+impl std::fmt::Display for Slot {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		write!(f, "{}", self.0)
+	}
+}
+
+impl From<u64> for Slot {
+	fn from(slot: u64) -> Slot {
+		Slot(slot)
+	}
+}
+
+impl From<Slot> for u64 {
+	fn from(slot: Slot) -> u64 {
+		slot.0
+	}
+}
 
 /// Represents an equivocation proof. An equivocation happens when a validator
 /// produces more than one block on the same slot. The proof of equivocation
@@ -32,8 +100,8 @@ pub type SlotNumber = u64;
 pub struct EquivocationProof<Header, Id> {
 	/// Returns the authority id of the equivocator.
 	pub offender: Id,
-	/// The slot number at which the equivocation happened.
-	pub slot_number: SlotNumber,
+	/// The slot at which the equivocation happened.
+	pub slot: Slot,
 	/// The first header involved in the equivocation.
 	pub first_header: Header,
 	/// The second header involved in the equivocation.
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index 3dc514953b66..d7d7ccd31b71 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -61,7 +61,7 @@ use sp_inherents::{CheckInherentsResult, InherentData};
 use cfg_if::cfg_if;
 
 // Ensure Babe and Aura use the same crypto to simplify things a bit.
-pub use sp_consensus_babe::{AuthorityId, SlotNumber, AllowedSlots};
+pub use sp_consensus_babe::{AuthorityId, Slot, AllowedSlots};
 
 pub type AuraId = sp_consensus_aura::sr25519::AuthorityId;
 
@@ -739,7 +739,7 @@ cfg_if! {
 					}
 				}
 
-				fn current_epoch_start() -> sp_consensus_babe::SlotNumber {
+				fn current_epoch_start() -> Slot {
 					<pallet_babe::Module<Runtime>>::current_epoch_start()
 				}
 
@@ -761,7 +761,7 @@ cfg_if! {
 				}
 
 				fn generate_key_ownership_proof(
-					_slot_number: sp_consensus_babe::SlotNumber,
+					_slot: sp_consensus_babe::Slot,
 					_authority_id: sp_consensus_babe::AuthorityId,
 				) -> Option<sp_consensus_babe::OpaqueKeyOwnershipProof> {
 					None
@@ -998,7 +998,7 @@ cfg_if! {
 					}
 				}
 
-				fn current_epoch_start() -> sp_consensus_babe::SlotNumber {
+				fn current_epoch_start() -> Slot {
 					<pallet_babe::Module<Runtime>>::current_epoch_start()
 				}
 
@@ -1020,7 +1020,7 @@ cfg_if! {
 				}
 
 				fn generate_key_ownership_proof(
-					_slot_number: sp_consensus_babe::SlotNumber,
+					_slot: sp_consensus_babe::Slot,
 					_authority_id: sp_consensus_babe::AuthorityId,
 				) -> Option<sp_consensus_babe::OpaqueKeyOwnershipProof> {
 					None

From 68d715719add5ed0473585f8ce38dd312a69a063 Mon Sep 17 00:00:00 2001
From: Joshy Orndorff <JoshOrndorff@users.noreply.github.com>
Date: Thu, 28 Jan 2021 14:44:56 -0500
Subject: [PATCH 0332/1194] Clarify and expand ProvideInherent docs (#7941)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Clarify and expand docs.

* clarify that a pallet can verify an inherent without providing one.

* Clarify what calls `is_inherent_required`.

* caution and link to issue

* typo

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 primitives/inherents/src/lib.rs | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/primitives/inherents/src/lib.rs b/primitives/inherents/src/lib.rs
index 8adf44cbc418..36a1b32775c3 100644
--- a/primitives/inherents/src/lib.rs
+++ b/primitives/inherents/src/lib.rs
@@ -398,9 +398,11 @@ impl<E: codec::Encode> IsFatalError for MakeFatalError<E> {
 	}
 }
 
-/// A module that provides an inherent and may also verifies it.
+/// A pallet that provides or verifies an inherent extrinsic.
+///
+/// The pallet may provide the inherent, verify an inherent, or both provide and verify.
 pub trait ProvideInherent {
-	/// The call type of the module.
+	/// The call type of the pallet.
 	type Call;
 	/// The error returned by `check_inherent`.
 	type Error: codec::Encode + IsFatalError;
@@ -410,13 +412,27 @@ pub trait ProvideInherent {
 	/// Create an inherent out of the given `InherentData`.
 	fn create_inherent(data: &InherentData) -> Option<Self::Call>;
 
-	/// If `Some`, indicates that an inherent is required. Check will return the inner error if no
-	/// inherent is found. If `Err`, indicates that the check failed and further operations should
-	/// be aborted.
+	/// Determines whether this inherent is required in this block.
+	///
+	/// - `Ok(None)` indicates that this inherent is not required in this block. The default
+	/// implementation returns this.
+	///
+	/// - `Ok(Some(e))` indicates that this inherent is required in this block. The
+	/// `impl_outer_inherent!`, will call this function from its `check_extrinsics`.
+	/// If the inherent is not present, it will return `e`.
+	///
+	/// - `Err(_)` indicates that this function failed and further operations should be aborted.
+	///
+	/// CAUTION: This check has a bug when used in pallets that also provide unsigned transactions.
+	/// See https://github.com/paritytech/substrate/issues/6243 for details.
 	fn is_inherent_required(_: &InherentData) -> Result<Option<Self::Error>, Self::Error> { Ok(None) }
 
-	/// Check the given inherent if it is valid.
-	/// Checking the inherent is optional and can be omitted.
+	/// Check whether the given inherent is valid. Checking the inherent is optional and can be
+	/// omitted by using the default implementation.
+	///
+	/// When checking an inherent, the first parameter represents the inherent that is actually
+	/// included in the block by its author. Whereas the second parameter represents the inherent
+	/// data that the verifying node calculates.
 	fn check_inherent(_: &Self::Call, _: &InherentData) -> Result<(), Self::Error> {
 		Ok(())
 	}

From ae3dabbb3651284b5b0e99c0fd97b7df26f07fa8 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Fri, 29 Jan 2021 10:33:27 +0100
Subject: [PATCH 0333/1194] Introduce sc_peerset::DropReason (#7996)

* Introduce sc_peerset::DropReason

* Fix peerset tests
---
 .../src/protocol/generic_proto/behaviour.rs    | 18 +++++++++---------
 client/peerset/src/lib.rs                      | 17 ++++++++++++++++-
 client/peerset/tests/fuzz.rs                   |  4 ++--
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/client/network/src/protocol/generic_proto/behaviour.rs b/client/network/src/protocol/generic_proto/behaviour.rs
index 000d334d1847..cd77852c9107 100644
--- a/client/network/src/protocol/generic_proto/behaviour.rs
+++ b/client/network/src/protocol/generic_proto/behaviour.rs
@@ -469,7 +469,7 @@ impl GenericProto {
 				timer: _
 			} => {
 				debug!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
-				self.peerset.dropped(set_id, peer_id.clone());
+				self.peerset.dropped(set_id, peer_id.clone(), sc_peerset::DropReason::Unknown);
 				let backoff_until = Some(if let Some(ban) = ban {
 					cmp::max(timer_deadline, Instant::now() + ban)
 				} else {
@@ -486,7 +486,7 @@ impl GenericProto {
 			// If relevant, the external API is instantly notified.
 			PeerState::Enabled { mut connections } => {
 				debug!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
-				self.peerset.dropped(set_id, peer_id.clone());
+				self.peerset.dropped(set_id, peer_id.clone(), sc_peerset::DropReason::Unknown);
 
 				if connections.iter().any(|(_, s)| matches!(s, ConnectionState::Open(_))) {
 					debug!(target: "sub-libp2p", "External API <= Closed({}, {:?})", peer_id, set_id);
@@ -942,7 +942,7 @@ impl GenericProto {
 				_ => {
 					debug!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})",
 						incoming.peer_id, incoming.set_id);
-					self.peerset.dropped(incoming.set_id, incoming.peer_id);
+					self.peerset.dropped(incoming.set_id, incoming.peer_id, sc_peerset::DropReason::Unknown);
 				},
 			}
 			return
@@ -1184,7 +1184,7 @@ impl NetworkBehaviour for GenericProto {
 
 					if connections.is_empty() {
 						debug!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
-						self.peerset.dropped(set_id, peer_id.clone());
+						self.peerset.dropped(set_id, peer_id.clone(), sc_peerset::DropReason::Unknown);
 						*entry.get_mut() = PeerState::Backoff { timer, timer_deadline };
 
 					} else {
@@ -1324,7 +1324,7 @@ impl NetworkBehaviour for GenericProto {
 
 					if connections.is_empty() {
 						debug!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
-						self.peerset.dropped(set_id, peer_id.clone());
+						self.peerset.dropped(set_id, peer_id.clone(), sc_peerset::DropReason::Unknown);
 						let ban_dur = Uniform::new(5, 10).sample(&mut rand::thread_rng());
 
 						let delay_id = self.next_delay_id;
@@ -1345,7 +1345,7 @@ impl NetworkBehaviour for GenericProto {
 						matches!(s, ConnectionState::Opening | ConnectionState::Open(_)))
 					{
 						debug!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
-						self.peerset.dropped(set_id, peer_id.clone());
+						self.peerset.dropped(set_id, peer_id.clone(), sc_peerset::DropReason::Unknown);
 
 						*entry.get_mut() = PeerState::Disabled {
 							connections,
@@ -1396,7 +1396,7 @@ impl NetworkBehaviour for GenericProto {
 					st @ PeerState::Requested |
 					st @ PeerState::PendingRequest { .. } => {
 						debug!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
-						self.peerset.dropped(set_id, peer_id.clone());
+						self.peerset.dropped(set_id, peer_id.clone(), sc_peerset::DropReason::Unknown);
 
 						let now = Instant::now();
 						let ban_duration = match st {
@@ -1682,7 +1682,7 @@ impl NetworkBehaviour for GenericProto {
 							// List of open connections wasn't empty before but now it is.
 							if !connections.iter().any(|(_, s)| matches!(s, ConnectionState::Opening)) {
 								debug!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", source, set_id);
-								self.peerset.dropped(set_id, source.clone());
+								self.peerset.dropped(set_id, source.clone(), sc_peerset::DropReason::Refused);
 								*entry.into_mut() = PeerState::Disabled {
 									connections, backoff_until: None
 								};
@@ -1846,7 +1846,7 @@ impl NetworkBehaviour for GenericProto {
 							matches!(s, ConnectionState::Opening | ConnectionState::Open(_)))
 						{
 							debug!(target: "sub-libp2p", "PSM <= Dropped({:?})", source);
-							self.peerset.dropped(set_id, source.clone());
+							self.peerset.dropped(set_id, source.clone(), sc_peerset::DropReason::Refused);
 
 							*entry.into_mut() = PeerState::Disabled {
 								connections,
diff --git a/client/peerset/src/lib.rs b/client/peerset/src/lib.rs
index 564921b1e177..31162930efc6 100644
--- a/client/peerset/src/lib.rs
+++ b/client/peerset/src/lib.rs
@@ -604,7 +604,7 @@ impl Peerset {
 	///
 	/// Must only be called after the PSM has either generated a `Connect` message with this
 	/// `PeerId`, or accepted an incoming connection with this `PeerId`.
-	pub fn dropped(&mut self, set_id: SetId, peer_id: PeerId) {
+	pub fn dropped(&mut self, set_id: SetId, peer_id: PeerId, reason: DropReason) {
 		// We want reputations to be up-to-date before adjusting them.
 		self.update_time();
 
@@ -620,6 +620,10 @@ impl Peerset {
 				error!(target: "peerset", "Received dropped() for non-connected node"),
 		}
 
+		if let DropReason::Refused = reason {
+			self.on_remove_from_peers_set(set_id, peer_id);
+		}
+
 		self.alloc_slots();
 	}
 
@@ -704,6 +708,17 @@ impl Stream for Peerset {
 	}
 }
 
+/// Reason for calling [`Peerset::dropped`].
+pub enum DropReason {
+	/// Substream or connection has been closed for an unknown reason.
+	Unknown,
+	/// Substream or connection has been explicitly refused by the target. In other words, the
+	/// peer doesn't actually belong to this set.
+	///
+	/// This has the side effect of calling [`PeersetHandle::remove_from_peers_set`].
+	Refused,
+}
+
 #[cfg(test)]
 mod tests {
 	use libp2p::PeerId;
diff --git a/client/peerset/tests/fuzz.rs b/client/peerset/tests/fuzz.rs
index 8fdd6f5f3ae4..8f6496294347 100644
--- a/client/peerset/tests/fuzz.rs
+++ b/client/peerset/tests/fuzz.rs
@@ -20,7 +20,7 @@ use futures::prelude::*;
 use libp2p::PeerId;
 use rand::distributions::{Distribution, Uniform, WeightedIndex};
 use rand::seq::IteratorRandom;
-use sc_peerset::{IncomingIndex, Message, Peerset, PeersetConfig, ReputationChange, SetConfig, SetId};
+use sc_peerset::{DropReason, IncomingIndex, Message, Peerset, PeersetConfig, ReputationChange, SetConfig, SetId};
 use std::{collections::HashMap, collections::HashSet, pin::Pin, task::Poll};
 
 #[test]
@@ -130,7 +130,7 @@ fn test_once() {
 				3 => {
 					if let Some(id) = connected_nodes.iter().choose(&mut rng).cloned() {
 						connected_nodes.remove(&id);
-						peerset.dropped(SetId::from(0), id);
+						peerset.dropped(SetId::from(0), id, DropReason::Unknown);
 					}
 				}
 

From a51a9888254c38ecf4a949e99ac31a215dc70824 Mon Sep 17 00:00:00 2001
From: Cecile Tonglet <cecile@parity.io>
Date: Fri, 29 Jan 2021 11:57:56 +0100
Subject: [PATCH 0334/1194] Doc fixes for sc-telemetry & API struct rename
 (#7934)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Doc fixes for sc-telemetry

* Fix flag to disable log reloading

* Forgot to reverse the conditions

* Apply suggestion

* Rename pattern to directives

* Rename GlobalLoggerBuilder to LoggerBuilder

* Return instead of expect

* Use transparent outside the enum

* Update client/tracing/src/logging/directives.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 client/cli/src/config.rs                      |  4 +-
 client/cli/src/lib.rs                         |  2 +-
 client/cli/src/runner.rs                      |  2 +-
 client/rpc/src/system/tests.rs                |  2 +-
 client/service/src/builder.rs                 | 12 +--
 client/service/src/config.rs                  |  7 +-
 client/service/src/task_manager/mod.rs        |  2 +-
 client/telemetry/README.md                    | 26 +++----
 client/telemetry/src/endpoints.rs             |  3 +-
 client/telemetry/src/layer.rs                 |  2 +-
 client/telemetry/src/lib.rs                   | 30 ++++----
 client/tracing/src/logging/directives.rs      |  2 +-
 .../src/logging/layers/prefix_layer.rs        | 15 +++-
 client/tracing/src/logging/mod.rs             | 76 +++++++++----------
 utils/browser/src/lib.rs                      |  4 +-
 15 files changed, 91 insertions(+), 98 deletions(-)

diff --git a/client/cli/src/config.rs b/client/cli/src/config.rs
index ae43e8f334c6..5bc14d52a5f3 100644
--- a/client/cli/src/config.rs
+++ b/client/cli/src/config.rs
@@ -34,7 +34,7 @@ use sc_service::config::{
 };
 use sc_service::{ChainSpec, TracingReceiver, KeepBlocks, TransactionStorageMode};
 use sc_telemetry::TelemetryHandle;
-use sc_tracing::logging::GlobalLoggerBuilder;
+use sc_tracing::logging::LoggerBuilder;
 use std::net::SocketAddr;
 use std::path::PathBuf;
 
@@ -576,7 +576,7 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 	fn init<C: SubstrateCli>(&self) -> Result<sc_telemetry::TelemetryWorker> {
 		sp_panic_handler::set(&C::support_url(), &C::impl_version());
 
-		let mut logger = GlobalLoggerBuilder::new(self.log_filters()?);
+		let mut logger = LoggerBuilder::new(self.log_filters()?);
 		logger.with_log_reloading(!self.is_log_filter_reloading_disabled()?);
 
 		if let Some(transport) = self.telemetry_external_transport()? {
diff --git a/client/cli/src/lib.rs b/client/cli/src/lib.rs
index a4b0bd45727e..602c53272ea5 100644
--- a/client/cli/src/lib.rs
+++ b/client/cli/src/lib.rs
@@ -38,7 +38,7 @@ pub use runner::*;
 pub use sc_service::{ChainSpec, Role};
 use sc_service::{Configuration, TaskExecutor};
 use sc_telemetry::TelemetryHandle;
-pub use sc_tracing::logging::GlobalLoggerBuilder;
+pub use sc_tracing::logging::LoggerBuilder;
 pub use sp_version::RuntimeVersion;
 use std::io::Write;
 pub use structopt;
diff --git a/client/cli/src/runner.rs b/client/cli/src/runner.rs
index 06676655581b..61a7fe9b0145 100644
--- a/client/cli/src/runner.rs
+++ b/client/cli/src/runner.rs
@@ -239,7 +239,7 @@ impl<C: SubstrateCli> Runner<C> {
 
 	/// Get a new [`TelemetryHandle`].
 	///
-	/// This is used when you want to register a new telemetry for a Substrate node.
+	/// This is used when you want to register with the [`TelemetryWorker`].
 	pub fn telemetry_handle(&self) -> TelemetryHandle {
 		self.telemetry_worker.handle()
 	}
diff --git a/client/rpc/src/system/tests.rs b/client/rpc/src/system/tests.rs
index 89676acae26b..c19640350103 100644
--- a/client/rpc/src/system/tests.rs
+++ b/client/rpc/src/system/tests.rs
@@ -344,7 +344,7 @@ fn test_add_reset_log_filter() {
 
 	// Enter log generation / filter reload
 	if std::env::var("TEST_LOG_FILTER").is_ok() {
-		sc_tracing::logging::GlobalLoggerBuilder::new("test_before_add=debug").init().unwrap();
+		sc_tracing::logging::LoggerBuilder::new("test_before_add=debug").init().unwrap();
 		for line in std::io::stdin().lock().lines() {
 			let line = line.expect("Failed to read bytes");
 			if line.contains("add_reload") {
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index 3dc716b4e1c9..63abf8ca9576 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -308,11 +308,7 @@ pub fn new_full_parts<TBl, TRtApi, TExecDisp>(
 {
 	let keystore_container = KeystoreContainer::new(&config.keystore)?;
 
-	let telemetry_span = if config.telemetry_endpoints.is_some() {
-		Some(TelemetrySpan::new())
-	} else {
-		None
-	};
+	let telemetry_span = config.telemetry_endpoints.as_ref().map(|_| TelemetrySpan::new());
 	let task_manager = {
 		let registry = config.prometheus_config.as_ref().map(|cfg| &cfg.registry);
 		TaskManager::new(config.task_executor.clone(), registry, telemetry_span.clone())?
@@ -383,11 +379,7 @@ pub fn new_light_parts<TBl, TRtApi, TExecDisp>(
 	TExecDisp: NativeExecutionDispatch + 'static,
 {
 	let keystore_container = KeystoreContainer::new(&config.keystore)?;
-	let telemetry_span = if config.telemetry_endpoints.is_some() {
-		Some(TelemetrySpan::new())
-	} else {
-		None
-	};
+	let telemetry_span = config.telemetry_endpoints.as_ref().map(|_| TelemetrySpan::new());
 	let task_manager = {
 		let registry = config.prometheus_config.as_ref().map(|cfg| &cfg.registry);
 		TaskManager::new(config.task_executor.clone(), registry, telemetry_span.clone())?
diff --git a/client/service/src/config.rs b/client/service/src/config.rs
index 74d15cb3fb92..71fbb3a2f2e4 100644
--- a/client/service/src/config.rs
+++ b/client/service/src/config.rs
@@ -213,11 +213,8 @@ impl Configuration {
 			return None;
 		}
 
-		match self.telemetry_endpoints.as_ref() {
-			// Don't initialise telemetry if `telemetry_endpoints` == Some([])
-			Some(endpoints) if !endpoints.is_empty() => Some(endpoints),
-			_ => None,
-		}
+		// Don't initialise telemetry if `telemetry_endpoints` == Some([])
+		self.telemetry_endpoints.as_ref().filter(|x| !x.is_empty())
 	}
 
 	/// Returns the network protocol id from the chain spec, or the default.
diff --git a/client/service/src/task_manager/mod.rs b/client/service/src/task_manager/mod.rs
index 4d9e16d90032..e910e2f3a32e 100644
--- a/client/service/src/task_manager/mod.rs
+++ b/client/service/src/task_manager/mod.rs
@@ -233,7 +233,7 @@ pub struct TaskManager {
 	/// terminates and gracefully shutdown. Also ends the parent `future()` if a child's essential
 	/// task fails.
 	children: Vec<TaskManager>,
-	/// A telemetry handle used to enter the telemetry span when a task is spawned.
+	/// A `TelemetrySpan` used to enter the telemetry span when a task is spawned.
 	telemetry_span: Option<TelemetrySpan>,
 }
 
diff --git a/client/telemetry/README.md b/client/telemetry/README.md
index a6b7b654508a..2e3e19bd2f62 100644
--- a/client/telemetry/README.md
+++ b/client/telemetry/README.md
@@ -1,21 +1,21 @@
 # sc-telemetry
 
-Substrate's client telemetry is a part of substrate that allows logging telemetry information
-with a [Polkadot telemetry](https://github.com/paritytech/substrate-telemetry).
+Substrate's client telemetry is a part of substrate that allows ingesting telemetry data
+with for example [Polkadot telemetry](https://github.com/paritytech/substrate-telemetry).
 
-It works using Tokio's [tracing](https://github.com/tokio-rs/tracing/). The telemetry
-information uses tracing's logging to report the telemetry which is then retrieved by a
-tracing's `Layer`. This layer will then send the data through an asynchronous channel and to a
-background task called [`TelemetryWorker`] which will send the information to the telemetry
-server.
+It works using Tokio's [tracing](https://github.com/tokio-rs/tracing/) library. The telemetry
+information uses tracing's logging to report the telemetry data which is then retrieved by a
+tracing `Layer`. This layer will then send the data through an asynchronous channel to a
+background task called [`TelemetryWorker`] which will send the information to the configured
+remote telemetry servers.
 
-If multiple substrate nodes are running, it uses a tracing's `Span` to identify which substrate
-node is reporting the telemetry. Every task spawned using sc-service's `TaskManager`
-automatically inherit this span.
+If multiple substrate nodes are running in the same process, it uses a `tracing::Span` to
+identify which substrate node is reporting the telemetry. Every task spawned using sc-service's
+`TaskManager` automatically inherit this span.
 
-Substrate's nodes initialize/register to the [`TelemetryWorker`] using a [`TelemetryHandle`].
+Substrate's nodes initialize/register with the [`TelemetryWorker`] using a [`TelemetryHandle`].
 This handle can be cloned and passed around. It uses an asynchronous channel to communicate with
-the running [`TelemetryWorker`] dedicated to registration. Registering a telemetry can happen at
-any point in time during the execution.
+the running [`TelemetryWorker`] dedicated to registration. Registering can happen at any point
+in time during the process execution.
 
 License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/client/telemetry/src/endpoints.rs b/client/telemetry/src/endpoints.rs
index 7d0338fb18e3..fe4fa23974a6 100644
--- a/client/telemetry/src/endpoints.rs
+++ b/client/telemetry/src/endpoints.rs
@@ -25,7 +25,8 @@ use serde::{Deserialize, Deserializer, Serialize};
 /// The URL string can be either a URL or a multiaddress.
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Hash)]
 pub struct TelemetryEndpoints(
-	#[serde(deserialize_with = "url_or_multiaddr_deser")] pub(crate) Vec<(Multiaddr, u8)>,
+	#[serde(deserialize_with = "url_or_multiaddr_deser")]
+	pub(crate) Vec<(Multiaddr, u8)>,
 );
 
 /// Custom deserializer for TelemetryEndpoints, used to convert urls or multiaddr to multiaddr.
diff --git a/client/telemetry/src/layer.rs b/client/telemetry/src/layer.rs
index eb5eee197770..0ce3f97620da 100644
--- a/client/telemetry/src/layer.rs
+++ b/client/telemetry/src/layer.rs
@@ -35,7 +35,7 @@ pub struct TelemetryLayer(Mutex<mpsc::Sender<(Id, u8, String)>>);
 impl TelemetryLayer {
 	/// Create a new [`TelemetryLayer`] and [`TelemetryWorker`].
 	///
-	/// If not provided, the `buffer_size` will be 16 by default.
+	/// The `buffer_size` defaults to 16.
 	///
 	/// The [`ExtTransport`] is used in WASM contexts where we need some binding between the
 	/// networking provided by the operating system or environment and libp2p.
diff --git a/client/telemetry/src/lib.rs b/client/telemetry/src/lib.rs
index 6a4533bb7bc4..7d50461bb929 100644
--- a/client/telemetry/src/lib.rs
+++ b/client/telemetry/src/lib.rs
@@ -16,23 +16,23 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-//! Substrate's client telemetry is a part of substrate that allows logging telemetry information
-//! with a [Polkadot telemetry](https://github.com/paritytech/substrate-telemetry).
+//! Substrate's client telemetry is a part of substrate that allows ingesting telemetry data
+//! with for example [Polkadot telemetry](https://github.com/paritytech/substrate-telemetry).
 //!
-//! It works using Tokio's [tracing](https://github.com/tokio-rs/tracing/). The telemetry
-//! information uses tracing's logging to report the telemetry which is then retrieved by a
-//! tracing's `Layer`. This layer will then send the data through an asynchronous channel and to a
-//! background task called [`TelemetryWorker`] which will send the information to the telemetry
-//! server.
+//! It works using Tokio's [tracing](https://github.com/tokio-rs/tracing/) library. The telemetry
+//! information uses tracing's logging to report the telemetry data which is then retrieved by a
+//! tracing `Layer`. This layer will then send the data through an asynchronous channel to a
+//! background task called [`TelemetryWorker`] which will send the information to the configured
+//! remote telemetry servers.
 //!
-//! If multiple substrate nodes are running, it uses a tracing's `Span` to identify which substrate
-//! node is reporting the telemetry. Every task spawned using sc-service's `TaskManager`
-//! automatically inherit this span.
+//! If multiple substrate nodes are running in the same process, it uses a `tracing::Span` to
+//! identify which substrate node is reporting the telemetry. Every task spawned using sc-service's
+//! `TaskManager` automatically inherit this span.
 //!
-//! Substrate's nodes initialize/register to the [`TelemetryWorker`] using a [`TelemetryHandle`].
+//! Substrate's nodes initialize/register with the [`TelemetryWorker`] using a [`TelemetryHandle`].
 //! This handle can be cloned and passed around. It uses an asynchronous channel to communicate with
-//! the running [`TelemetryWorker`] dedicated to registration. Registering a telemetry can happen at
-//! any point in time during the execution.
+//! the running [`TelemetryWorker`] dedicated to registration. Registering can happen at any point
+//! in time during the process execution.
 
 #![warn(missing_docs)]
 
@@ -115,7 +115,7 @@ pub struct ConnectionMessage {
 
 /// Telemetry worker.
 ///
-/// It should be ran as a background task using the [`TelemetryWorker::run`] method. This method
+/// It should run as a background task using the [`TelemetryWorker::run`] method. This method
 /// will consume the object and any further attempts of initializing a new telemetry through its
 /// handle will fail (without being fatal).
 #[derive(Debug)]
@@ -143,7 +143,7 @@ impl TelemetryWorker {
 
 	/// Get a new [`TelemetryHandle`].
 	///
-	/// This is used when you want to register a new telemetry for a Substrate node.
+	/// This is used when you want to register with the [`TelemetryWorker`].
 	pub fn handle(&self) -> TelemetryHandle {
 		TelemetryHandle {
 			message_sender: self.register_sender.clone(),
diff --git a/client/tracing/src/logging/directives.rs b/client/tracing/src/logging/directives.rs
index b108566bf2bc..39dee2b061f0 100644
--- a/client/tracing/src/logging/directives.rs
+++ b/client/tracing/src/logging/directives.rs
@@ -114,7 +114,7 @@ pub(crate) fn set_reload_handle(handle: Handle<EnvFilter, SCSubscriber>) {
 	let _ = FILTER_RELOAD_HANDLE.set(handle);
 }
 
-// The layered Subscriber as built up in `init_logger()`.
+// The layered Subscriber as built up in `LoggerBuilder::init()`.
 // Used in the reload `Handle`.
 type SCSubscriber<
 	N = tracing_fmt::format::DefaultFields,
diff --git a/client/tracing/src/logging/layers/prefix_layer.rs b/client/tracing/src/logging/layers/prefix_layer.rs
index 6aa7e6d436e1..0c8f25c24100 100644
--- a/client/tracing/src/logging/layers/prefix_layer.rs
+++ b/client/tracing/src/logging/layers/prefix_layer.rs
@@ -33,9 +33,18 @@ where
 	S: Subscriber + for<'a> LookupSpan<'a>,
 {
 	fn new_span(&self, attrs: &Attributes<'_>, id: &Id, ctx: Context<'_, S>) {
-		let span = ctx
-			.span(id)
-			.expect("new_span has been called for this span; qed");
+		let span = match ctx.span(id) {
+			Some(span) => span,
+			None => {
+				// this shouldn't happen!
+				debug_assert!(
+					false,
+					"newly created span with ID {:?} did not exist in the registry; this is a bug!",
+					id
+				);
+				return;
+			}
+		};
 
 		if span.name() != PREFIX_LOG_SPAN {
 			return;
diff --git a/client/tracing/src/logging/mod.rs b/client/tracing/src/logging/mod.rs
index ca4f74194bcc..f74c3e664607 100644
--- a/client/tracing/src/logging/mod.rs
+++ b/client/tracing/src/logging/mod.rs
@@ -53,21 +53,15 @@ pub type Result<T> = std::result::Result<T, Error>;
 #[derive(Debug, thiserror::Error)]
 #[allow(missing_docs)]
 #[non_exhaustive]
+#[error(transparent)]
 pub enum Error {
-	#[error(transparent)]
 	IoError(#[from] io::Error),
-
-	#[error(transparent)]
 	SetGlobalDefaultError(#[from] tracing::subscriber::SetGlobalDefaultError),
-
-	#[error(transparent)]
 	DirectiveParseError(#[from] tracing_subscriber::filter::ParseError),
-
-	#[error(transparent)]
 	SetLoggerError(#[from] tracing_log::log_tracer::SetLoggerError),
 }
 
-macro_rules! disable_log_reloading {
+macro_rules! enable_log_reloading {
 	($builder:expr) => {{
 		let builder = $builder.with_filter_reloading();
 		let handle = builder.reload_handle();
@@ -77,8 +71,8 @@ macro_rules! disable_log_reloading {
 }
 
 /// Common implementation to get the subscriber.
-fn get_subscriber_internal<N, E, F, W>(
-	pattern: &str,
+fn prepare_subscriber<N, E, F, W>(
+	directives: &str,
 	max_level: Option<log::LevelFilter>,
 	force_colors: Option<bool>,
 	telemetry_buffer_size: Option<usize>,
@@ -130,10 +124,10 @@ where
 		}
 	}
 
-	if pattern != "" {
+	if directives != "" {
 		// We're not sure if log or tracing is available at this moment, so silently ignore the
 		// parse error.
-		env_filter = parse_user_directives(env_filter, pattern)?;
+		env_filter = parse_user_directives(env_filter, directives)?;
 	}
 
 	let max_level_hint = Layer::<FmtSubscriber>::max_level_hint(&env_filter);
@@ -196,24 +190,24 @@ where
 }
 
 /// A builder that is used to initialize the global logger.
-pub struct GlobalLoggerBuilder {
-	pattern: String,
+pub struct LoggerBuilder {
+	directives: String,
 	profiling: Option<(crate::TracingReceiver, String)>,
 	telemetry_buffer_size: Option<usize>,
 	telemetry_external_transport: Option<ExtTransport>,
-	disable_log_reloading: bool,
+	log_reloading: bool,
 	force_colors: Option<bool>,
 }
 
-impl GlobalLoggerBuilder {
-	/// Create a new [`GlobalLoggerBuilder`] which can be used to initialize the global logger.
-	pub fn new<S: Into<String>>(pattern: S) -> Self {
+impl LoggerBuilder {
+	/// Create a new [`LoggerBuilder`] which can be used to initialize the global logger.
+	pub fn new<S: Into<String>>(directives: S) -> Self {
 		Self {
-			pattern: pattern.into(),
+			directives: directives.into(),
 			profiling: None,
 			telemetry_buffer_size: None,
 			telemetry_external_transport: None,
-			disable_log_reloading: false,
+			log_reloading: true,
 			force_colors: None,
 		}
 	}
@@ -230,7 +224,7 @@ impl GlobalLoggerBuilder {
 
 	/// Wether or not to disable log reloading.
 	pub fn with_log_reloading(&mut self, enabled: bool) -> &mut Self {
-		self.disable_log_reloading = !enabled;
+		self.log_reloading = enabled;
 		self
 	}
 
@@ -260,14 +254,14 @@ impl GlobalLoggerBuilder {
 			// If profiling is activated, we require `trace` logging.
 			let max_level = Some(log::LevelFilter::Trace);
 
-			if self.disable_log_reloading {
-				let (subscriber, telemetry_worker) = get_subscriber_internal(
-					&format!("{},{},sc_tracing=trace", self.pattern, profiling_targets),
+			if self.log_reloading {
+				let (subscriber, telemetry_worker) = prepare_subscriber(
+					&format!("{},{},sc_tracing=trace", self.directives, profiling_targets),
 					max_level,
 					self.force_colors,
 					self.telemetry_buffer_size,
 					self.telemetry_external_transport,
-					|builder| builder,
+					|builder| enable_log_reloading!(builder),
 				)?;
 				let profiling = crate::ProfilingLayer::new(tracing_receiver, &profiling_targets);
 
@@ -275,13 +269,13 @@ impl GlobalLoggerBuilder {
 
 				Ok(telemetry_worker)
 			} else {
-				let (subscriber, telemetry_worker) = get_subscriber_internal(
-					&format!("{},{},sc_tracing=trace", self.pattern, profiling_targets),
+				let (subscriber, telemetry_worker) = prepare_subscriber(
+					&format!("{},{},sc_tracing=trace", self.directives, profiling_targets),
 					max_level,
 					self.force_colors,
 					self.telemetry_buffer_size,
 					self.telemetry_external_transport,
-					|builder| disable_log_reloading!(builder),
+					|builder| builder,
 				)?;
 				let profiling = crate::ProfilingLayer::new(tracing_receiver, &profiling_targets);
 
@@ -290,27 +284,27 @@ impl GlobalLoggerBuilder {
 				Ok(telemetry_worker)
 			}
 		} else {
-			if self.disable_log_reloading {
-				let (subscriber, telemetry_worker) = get_subscriber_internal(
-					&self.pattern,
+			if self.log_reloading {
+				let (subscriber, telemetry_worker) = prepare_subscriber(
+					&self.directives,
 					None,
 					self.force_colors,
 					self.telemetry_buffer_size,
 					self.telemetry_external_transport,
-					|builder| builder,
+					|builder| enable_log_reloading!(builder),
 				)?;
 
 				tracing::subscriber::set_global_default(subscriber)?;
 
 				Ok(telemetry_worker)
 			} else {
-				let (subscriber, telemetry_worker) = get_subscriber_internal(
-					&self.pattern,
+				let (subscriber, telemetry_worker) = prepare_subscriber(
+					&self.directives,
 					None,
 					self.force_colors,
 					self.telemetry_buffer_size,
 					self.telemetry_external_transport,
-					|builder| disable_log_reloading!(builder),
+					|builder| builder,
 				)?;
 
 				tracing::subscriber::set_global_default(subscriber)?;
@@ -331,8 +325,8 @@ mod tests {
 	const EXPECTED_LOG_MESSAGE: &'static str = "yeah logging works as expected";
 	const EXPECTED_NODE_NAME: &'static str = "THE_NODE";
 
-	fn init_logger(pattern: &str) {
-		let _ = GlobalLoggerBuilder::new(pattern).init().unwrap();
+	fn init_logger(directives: &str) {
+		let _ = LoggerBuilder::new(directives).init().unwrap();
 	}
 
 	fn run_in_process(test_name: &str) {
@@ -351,8 +345,8 @@ mod tests {
 	fn test_logger_filters() {
 		run_in_process("test_logger_filters");
 
-		let test_pattern = "afg=debug,sync=trace,client=warn,telemetry,something-with-dash=error";
-		init_logger(&test_pattern);
+		let test_directives = "afg=debug,sync=trace,client=warn,telemetry,something-with-dash=error";
+		init_logger(&test_directives);
 
 		tracing::dispatcher::get_default(|dispatcher| {
 			let test_filter = |target, level| {
@@ -410,8 +404,8 @@ mod tests {
 	#[test]
 	fn log_something_with_dash_target_name() {
 		if env::var("ENABLE_LOGGING").is_ok() {
-			let test_pattern = "test-target=info";
-			let _guard = init_logger(&test_pattern);
+			let test_directives = "test-target=info";
+			let _guard = init_logger(&test_directives);
 
 			log::info!(target: "test-target", "{}", EXPECTED_LOG_MESSAGE);
 		}
diff --git a/utils/browser/src/lib.rs b/utils/browser/src/lib.rs
index 5e1e8db31668..b72f2e973b68 100644
--- a/utils/browser/src/lib.rs
+++ b/utils/browser/src/lib.rs
@@ -25,7 +25,7 @@ use sc_service::{
 	KeepBlocks, TransactionStorageMode,
 };
 use sc_telemetry::TelemetryHandle;
-use sc_tracing::logging::GlobalLoggerBuilder;
+use sc_tracing::logging::LoggerBuilder;
 use wasm_bindgen::prelude::*;
 use futures::{
 	prelude::*, channel::{oneshot, mpsc}, compat::*, future::{ready, ok, select}
@@ -41,7 +41,7 @@ pub fn init_logging_and_telemetry(
 	pattern: &str,
 ) -> Result<sc_telemetry::TelemetryWorker, sc_tracing::logging::Error> {
 	let transport = ExtTransport::new(ffi::websocket_transport());
-	let mut logger = GlobalLoggerBuilder::new(pattern);
+	let mut logger = LoggerBuilder::new(pattern);
 	logger.with_transport(transport);
 	logger.init()
 }

From 1d5d13a8260e2f090592dfd3c94117c83e7d8332 Mon Sep 17 00:00:00 2001
From: Cecile Tonglet <cecile@parity.io>
Date: Fri, 29 Jan 2021 13:03:21 +0100
Subject: [PATCH 0335/1194] Fix telemetry span not entering properly & enter
 span in sc-cli (#7951)

* WIP

* WIP

* Test

* bug fix

* WIP

* Revert "WIP"

This reverts commit 4e51e9adfdf0dc7cf37b562b60a0e83ca1d0b00d.

* doc

* Improve comment on why all spans are preserved

* Added missing suggestion from previous PR

* Use BoxFuture

* Move TelemetrySpan creation to sc-cli, need to test...

* Test code

* Adapt user code

* Revert "Test code"

This reverts commit 333806b2fe1626efaa2691f9f44d0b4dd979bc36.

* Update client/service/src/task_manager/mod.rs

Co-authored-by: David <dvdplm@gmail.com>

* Better & simpler solution

Co-authored-by: David <dvdplm@gmail.com>
---
 bin/node-template/node/src/service.rs  | 12 ++++------
 bin/node/cli/src/service.rs            | 13 +++++------
 client/cli/src/config.rs               | 12 ++++++++--
 client/service/src/builder.rs          | 31 +++++++++-----------------
 client/service/src/config.rs           | 14 ++++--------
 client/service/src/task_manager/mod.rs |  9 ++++----
 client/service/test/src/lib.rs         |  1 +
 client/telemetry/src/lib.rs            |  5 +++++
 utils/browser/src/lib.rs               |  4 +++-
 9 files changed, 47 insertions(+), 54 deletions(-)

diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
index b9e5705333e7..a3aca89ef746 100644
--- a/bin/node-template/node/src/service.rs
+++ b/bin/node-template/node/src/service.rs
@@ -11,7 +11,6 @@ pub use sc_executor::NativeExecutor;
 use sp_consensus_aura::sr25519::{AuthorityPair as AuraPair};
 use sc_finality_grandpa::SharedVoterState;
 use sc_keystore::LocalKeystore;
-use sc_telemetry::TelemetrySpan;
 
 // Our native executor instance.
 native_executor_instance!(
@@ -37,7 +36,6 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 			AuraPair
 		>,
 		sc_finality_grandpa::LinkHalf<Block, FullClient, FullSelectChain>,
-		Option<TelemetrySpan>,
 	)
 >, ServiceError> {
 	if config.keystore_remote.is_some() {
@@ -46,7 +44,7 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 	}
 	let inherent_data_providers = sp_inherents::InherentDataProviders::new();
 
-	let (client, backend, keystore_container, task_manager, telemetry_span) =
+	let (client, backend, keystore_container, task_manager) =
 		sc_service::new_full_parts::<Block, RuntimeApi, Executor>(&config)?;
 	let client = Arc::new(client);
 
@@ -87,7 +85,7 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 		select_chain,
 		transaction_pool,
 		inherent_data_providers,
-		other: (aura_block_import, grandpa_link, telemetry_span),
+		other: (aura_block_import, grandpa_link),
 	})
 }
 
@@ -109,7 +107,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		select_chain,
 		transaction_pool,
 		inherent_data_providers,
-		other: (block_import, grandpa_link, telemetry_span),
+		other: (block_import, grandpa_link),
 	} = new_partial(&config)?;
 
 	if let Some(url) = &config.keystore_remote {
@@ -177,7 +175,6 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 			network_status_sinks,
 			system_rpc_tx,
 			config,
-			telemetry_span,
 		},
 	)?;
 
@@ -260,7 +257,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 
 /// Builds a new service for a light client.
 pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError> {
-	let (client, backend, keystore_container, mut task_manager, on_demand, telemetry_span) =
+	let (client, backend, keystore_container, mut task_manager, on_demand) =
 		sc_service::new_light_parts::<Block, RuntimeApi, Executor>(&config)?;
 
 	config.network.extra_sets.push(sc_finality_grandpa::grandpa_peers_set_config());
@@ -327,7 +324,6 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		network,
 		network_status_sinks,
 		system_rpc_tx,
-		telemetry_span,
 	})?;
 
 	network_starter.start_network();
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index aae16ebf0313..55c046a9a636 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -34,7 +34,7 @@ use sp_runtime::traits::Block as BlockT;
 use futures::prelude::*;
 use sc_client_api::{ExecutorProvider, RemoteBackend};
 use node_executor::Executor;
-use sc_telemetry::{TelemetryConnectionNotifier, TelemetrySpan};
+use sc_telemetry::TelemetryConnectionNotifier;
 
 type FullClient = sc_service::TFullClient<Block, RuntimeApi, Executor>;
 type FullBackend = sc_service::TFullBackend<Block>;
@@ -58,10 +58,9 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 			sc_consensus_babe::BabeLink<Block>,
 		),
 		grandpa::SharedVoterState,
-		Option<TelemetrySpan>,
 	)
 >, ServiceError> {
-	let (client, backend, keystore_container, task_manager, telemetry_span) =
+	let (client, backend, keystore_container, task_manager) =
 		sc_service::new_full_parts::<Block, RuntimeApi, Executor>(&config)?;
 	let client = Arc::new(client);
 
@@ -159,7 +158,7 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 		import_queue,
 		transaction_pool,
 		inherent_data_providers,
-		other: (rpc_extensions_builder, import_setup, rpc_setup, telemetry_span),
+		other: (rpc_extensions_builder, import_setup, rpc_setup),
 	})
 }
 
@@ -189,7 +188,7 @@ pub fn new_full_base(
 		select_chain,
 		transaction_pool,
 		inherent_data_providers,
-		other: (rpc_extensions_builder, import_setup, rpc_setup, telemetry_span),
+		other: (rpc_extensions_builder, import_setup, rpc_setup),
 	} = new_partial(&config)?;
 
 	let shared_voter_state = rpc_setup;
@@ -240,7 +239,6 @@ pub fn new_full_base(
 			remote_blockchain: None,
 			network_status_sinks: network_status_sinks.clone(),
 			system_rpc_tx,
-			telemetry_span,
 		},
 	)?;
 
@@ -365,7 +363,7 @@ pub fn new_light_base(mut config: Configuration) -> Result<(
 	Arc<NetworkService<Block, <Block as BlockT>::Hash>>,
 	Arc<sc_transaction_pool::LightPool<Block, LightClient, sc_network::config::OnDemand<Block>>>
 ), ServiceError> {
-	let (client, backend, keystore_container, mut task_manager, on_demand, telemetry_span) =
+	let (client, backend, keystore_container, mut task_manager, on_demand) =
 		sc_service::new_light_parts::<Block, RuntimeApi, Executor>(&config)?;
 
 	config.network.extra_sets.push(grandpa::grandpa_peers_set_config());
@@ -445,7 +443,6 @@ pub fn new_light_base(mut config: Configuration) -> Result<(
 			config, backend, network_status_sinks, system_rpc_tx,
 			network: network.clone(),
 			task_manager: &mut task_manager,
-			telemetry_span,
 		})?;
 
 	Ok((
diff --git a/client/cli/src/config.rs b/client/cli/src/config.rs
index 5bc14d52a5f3..247f6d2fddb3 100644
--- a/client/cli/src/config.rs
+++ b/client/cli/src/config.rs
@@ -33,7 +33,7 @@ use sc_service::config::{
 	TaskExecutor, TelemetryEndpoints, TransactionPoolOptions, WasmExecutionMethod,
 };
 use sc_service::{ChainSpec, TracingReceiver, KeepBlocks, TransactionStorageMode};
-use sc_telemetry::TelemetryHandle;
+use sc_telemetry::{TelemetryHandle, TelemetrySpan};
 use sc_tracing::logging::LoggerBuilder;
 use std::net::SocketAddr;
 use std::path::PathBuf;
@@ -488,6 +488,13 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 		let max_runtime_instances = self.max_runtime_instances()?.unwrap_or(8);
 		let is_validator = role.is_network_authority();
 		let (keystore_remote, keystore) = self.keystore_config(&config_dir)?;
+		let telemetry_endpoints = telemetry_handle
+			.as_ref()
+			.and_then(|_| self.telemetry_endpoints(&chain_spec).transpose())
+			.transpose()?
+			// Don't initialise telemetry if `telemetry_endpoints` == Some([])
+			.filter(|x| !x.is_empty());
+		let telemetry_span = telemetry_endpoints.as_ref().map(|_| TelemetrySpan::new());
 
 		let unsafe_pruning = self
 			.import_params()
@@ -526,7 +533,8 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 			rpc_ws_max_connections: self.rpc_ws_max_connections()?,
 			rpc_cors: self.rpc_cors(is_dev)?,
 			prometheus_config: self.prometheus_config(DCV::prometheus_listen_port())?,
-			telemetry_endpoints: self.telemetry_endpoints(&chain_spec)?,
+			telemetry_endpoints,
+			telemetry_span,
 			telemetry_external_transport: self.telemetry_external_transport()?,
 			default_heap_pages: self.default_heap_pages()?,
 			offchain_worker: self.offchain_worker(&role)?,
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index 63abf8ca9576..2ee95bd24d32 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -55,7 +55,6 @@ use sc_telemetry::{
 	telemetry,
 	ConnectionMessage,
 	TelemetryConnectionNotifier,
-	TelemetrySpan,
 	SUBSTRATE_INFO,
 };
 use sp_transaction_pool::MaintainedTransactionPool;
@@ -184,7 +183,6 @@ type TFullParts<TBl, TRtApi, TExecDisp> = (
 	Arc<TFullBackend<TBl>>,
 	KeystoreContainer,
 	TaskManager,
-	Option<TelemetrySpan>,
 );
 
 type TLightParts<TBl, TRtApi, TExecDisp> = (
@@ -193,7 +191,6 @@ type TLightParts<TBl, TRtApi, TExecDisp> = (
 	KeystoreContainer,
 	TaskManager,
 	Arc<OnDemand<TBl>>,
-	Option<TelemetrySpan>,
 );
 
 /// Light client backend type with a specific hash type.
@@ -308,10 +305,9 @@ pub fn new_full_parts<TBl, TRtApi, TExecDisp>(
 {
 	let keystore_container = KeystoreContainer::new(&config.keystore)?;
 
-	let telemetry_span = config.telemetry_endpoints.as_ref().map(|_| TelemetrySpan::new());
 	let task_manager = {
 		let registry = config.prometheus_config.as_ref().map(|cfg| &cfg.registry);
-		TaskManager::new(config.task_executor.clone(), registry, telemetry_span.clone())?
+		TaskManager::new(config.task_executor.clone(), registry, config.telemetry_span.clone())?
 	};
 
 	let executor = NativeExecutor::<TExecDisp>::new(
@@ -367,7 +363,6 @@ pub fn new_full_parts<TBl, TRtApi, TExecDisp>(
 		backend,
 		keystore_container,
 		task_manager,
-		telemetry_span,
 	))
 }
 
@@ -379,10 +374,9 @@ pub fn new_light_parts<TBl, TRtApi, TExecDisp>(
 	TExecDisp: NativeExecutionDispatch + 'static,
 {
 	let keystore_container = KeystoreContainer::new(&config.keystore)?;
-	let telemetry_span = config.telemetry_endpoints.as_ref().map(|_| TelemetrySpan::new());
 	let task_manager = {
 		let registry = config.prometheus_config.as_ref().map(|cfg| &cfg.registry);
-		TaskManager::new(config.task_executor.clone(), registry, telemetry_span.clone())?
+		TaskManager::new(config.task_executor.clone(), registry, config.telemetry_span.clone())?
 	};
 
 	let executor = NativeExecutor::<TExecDisp>::new(
@@ -421,7 +415,7 @@ pub fn new_light_parts<TBl, TRtApi, TExecDisp>(
 		config.prometheus_config.as_ref().map(|config| config.registry.clone()),
 	)?);
 
-	Ok((client, backend, keystore_container, task_manager, on_demand, telemetry_span))
+	Ok((client, backend, keystore_container, task_manager, on_demand))
 }
 
 /// Create an instance of db-backed client.
@@ -473,8 +467,6 @@ pub fn new_client<E, Block, RA>(
 pub struct SpawnTasksParams<'a, TBl: BlockT, TCl, TExPool, TRpc, Backend> {
 	/// The service configuration.
 	pub config: Configuration,
-	/// Telemetry span, if any.
-	pub telemetry_span: Option<TelemetrySpan>,
 	/// A shared client returned by `new_full_parts`/`new_light_parts`.
 	pub client: Arc<TCl>,
 	/// A shared backend returned by `new_full_parts`/`new_light_parts`.
@@ -567,7 +559,6 @@ pub fn spawn_tasks<TBl, TBackend, TExPool, TRpc, TCl>(
 	let SpawnTasksParams {
 		mut config,
 		task_manager,
-		telemetry_span,
 		client,
 		on_demand,
 		backend,
@@ -588,13 +579,11 @@ pub fn spawn_tasks<TBl, TBackend, TExPool, TRpc, TCl>(
 		config.dev_key_seed.clone().map(|s| vec![s]).unwrap_or_default(),
 	)?;
 
-	let telemetry_connection_notifier = telemetry_span
-		.and_then(|span| init_telemetry(
-			&mut config,
-			span,
-			network.clone(),
-			client.clone(),
-		));
+	let telemetry_connection_notifier = init_telemetry(
+		&mut config,
+		network.clone(),
+		client.clone(),
+	);
 
 	info!("📦 Highest known block at #{}", chain_info.best_number);
 
@@ -692,11 +681,11 @@ async fn transaction_notifications<TBl, TExPool>(
 
 fn init_telemetry<TBl: BlockT, TCl: BlockBackend<TBl>>(
 	config: &mut Configuration,
-	telemetry_span: TelemetrySpan,
 	network: Arc<NetworkService<TBl, <TBl as BlockT>::Hash>>,
 	client: Arc<TCl>,
 ) -> Option<TelemetryConnectionNotifier> {
-	let endpoints = config.telemetry_endpoints()?.clone();
+	let telemetry_span = config.telemetry_span.clone()?;
+	let endpoints = config.telemetry_endpoints.clone()?;
 	let genesis_hash = client.block_hash(Zero::zero()).ok().flatten().unwrap_or_default();
 	let connection_message = ConnectionMessage {
 		name: config.network.node_name.to_owned(),
diff --git a/client/service/src/config.rs b/client/service/src/config.rs
index 71fbb3a2f2e4..1e316c37dc9a 100644
--- a/client/service/src/config.rs
+++ b/client/service/src/config.rs
@@ -101,6 +101,10 @@ pub struct Configuration {
 	/// This is a handle to a `TelemetryWorker` instance. It is used to initialize the telemetry for
 	/// a substrate node.
 	pub telemetry_handle: Option<sc_telemetry::TelemetryHandle>,
+	/// Telemetry span.
+	///
+	/// This span is entered for every background task spawned using the TaskManager.
+	pub telemetry_span: Option<sc_telemetry::TelemetrySpan>,
 	/// The default number of 64KB pages to allocate for Wasm execution
 	pub default_heap_pages: Option<u64>,
 	/// Should offchain workers be executed.
@@ -207,16 +211,6 @@ impl Configuration {
 		self.prometheus_config.as_ref().map(|config| &config.registry)
 	}
 
-	/// Returns the telemetry endpoints if any and if the telemetry handle exists.
-	pub(crate) fn telemetry_endpoints(&self) -> Option<&TelemetryEndpoints> {
-		if self.telemetry_handle.is_none() {
-			return None;
-		}
-
-		// Don't initialise telemetry if `telemetry_endpoints` == Some([])
-		self.telemetry_endpoints.as_ref().filter(|x| !x.is_empty())
-	}
-
 	/// Returns the network protocol id from the chain spec, or the default.
 	pub fn protocol_id(&self) -> sc_network::config::ProtocolId {
 		let protocol_id_full = match self.chain_spec.protocol_id() {
diff --git a/client/service/src/task_manager/mod.rs b/client/service/src/task_manager/mod.rs
index e910e2f3a32e..6b14fbeec2c6 100644
--- a/client/service/src/task_manager/mod.rs
+++ b/client/service/src/task_manager/mod.rs
@@ -91,10 +91,7 @@ impl SpawnTaskHandle {
 			metrics.tasks_ended.with_label_values(&[name, "finished"]).inc_by(0);
 		}
 
-		let telemetry_span = self.telemetry_span.clone();
 		let future = async move {
-			let _telemetry_entered = telemetry_span.as_ref().map(|x| x.enter());
-
 			if let Some(metrics) = metrics {
 				// Add some wrappers around `task`.
 				let task = {
@@ -127,7 +124,11 @@ impl SpawnTaskHandle {
 			}
 		};
 
-		let join_handle = self.executor.spawn(Box::pin(future.in_current_span()), task_type);
+		let join_handle = {
+			let _span = self.telemetry_span.as_ref().map(|s| s.enter());
+			self.executor.spawn(Box::pin(future.in_current_span()), task_type)
+		};
+
 		let mut task_notifier = self.task_notifier.clone();
 		self.executor.spawn(
 			Box::pin(async move {
diff --git a/client/service/test/src/lib.rs b/client/service/test/src/lib.rs
index f1d5c6a86b06..a42dba84dfea 100644
--- a/client/service/test/src/lib.rs
+++ b/client/service/test/src/lib.rs
@@ -268,6 +268,7 @@ fn node_config<G: RuntimeGenesis + 'static, E: ChainSpecExtension + Clone + 'sta
 		telemetry_endpoints: None,
 		telemetry_external_transport: None,
 		telemetry_handle: None,
+		telemetry_span: None,
 		default_heap_pages: None,
 		offchain_worker: Default::default(),
 		force_authoring: false,
diff --git a/client/telemetry/src/lib.rs b/client/telemetry/src/lib.rs
index 7d50461bb929..f1038456fc35 100644
--- a/client/telemetry/src/lib.rs
+++ b/client/telemetry/src/lib.rs
@@ -88,6 +88,11 @@ impl TelemetrySpan {
 	pub fn new() -> Self {
 		Self(tracing::info_span!(TELEMETRY_LOG_SPAN))
 	}
+
+	/// Return a clone of the underlying `tracing::Span` instance.
+	pub fn span(&self) -> tracing::Span {
+		self.0.clone()
+	}
 }
 
 /// Message sent when the connection (re-)establishes.
diff --git a/utils/browser/src/lib.rs b/utils/browser/src/lib.rs
index b72f2e973b68..ea9dfc9674f7 100644
--- a/utils/browser/src/lib.rs
+++ b/utils/browser/src/lib.rs
@@ -24,7 +24,7 @@ use sc_service::{
 	GenericChainSpec, RuntimeGenesis,
 	KeepBlocks, TransactionStorageMode,
 };
-use sc_telemetry::TelemetryHandle;
+use sc_telemetry::{TelemetryHandle, TelemetrySpan};
 use sc_tracing::logging::LoggerBuilder;
 use wasm_bindgen::prelude::*;
 use futures::{
@@ -72,6 +72,7 @@ where
 		allow_private_ipv4: true,
 		enable_mdns: false,
 	};
+	let telemetry_span = telemetry_handle.as_ref().map(|_| TelemetrySpan::new());
 
 	let config = Configuration {
 		network,
@@ -83,6 +84,7 @@ where
 		}).into(),
 		telemetry_external_transport: Some(transport),
 		telemetry_handle,
+		telemetry_span,
 		role: Role::Light,
 		database: {
 			info!("Opening Indexed DB database '{}'...", name);

From 93b231e79f5b4e551c34234e89fa4a2e5e9c1510 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Fri, 29 Jan 2021 13:22:45 +0100
Subject: [PATCH 0336/1194] Update parity-scale-codec to 2.0 (#7994)

* update cargo.toml

* use 2.0 in mmmr
---
 Cargo.lock                                    | 219 ++++++------------
 bin/node-template/pallets/template/Cargo.toml |   2 +-
 bin/node-template/runtime/Cargo.toml          |   2 +-
 bin/node/bench/Cargo.toml                     |   6 +-
 bin/node/cli/Cargo.toml                       |   2 +-
 bin/node/executor/Cargo.toml                  |   2 +-
 bin/node/inspect/Cargo.toml                   |   2 +-
 bin/node/primitives/Cargo.toml                |   2 +-
 bin/node/runtime/Cargo.toml                   |   2 +-
 bin/node/testing/Cargo.toml                   |   2 +-
 client/api/Cargo.toml                         |   6 +-
 client/api/src/execution_extensions.rs        |   2 +-
 client/authority-discovery/Cargo.toml         |   2 +-
 client/basic-authorship/Cargo.toml            |   2 +-
 client/block-builder/Cargo.toml               |   2 +-
 client/chain-spec/Cargo.toml                  |   2 +-
 client/cli/Cargo.toml                         |   2 +-
 client/consensus/aura/Cargo.toml              |   2 +-
 client/consensus/babe/Cargo.toml              |   2 +-
 client/consensus/babe/src/aux_schema.rs       |   2 +-
 client/consensus/epochs/Cargo.toml            |   2 +-
 client/consensus/manual-seal/Cargo.toml       |   2 +-
 client/consensus/pow/Cargo.toml               |   2 +-
 client/consensus/slots/Cargo.toml             |   2 +-
 client/consensus/slots/src/aux_schema.rs      |   2 +-
 client/db/Cargo.toml                          |  12 +-
 client/executor/Cargo.toml                    |   2 +-
 client/executor/common/Cargo.toml             |   2 +-
 client/executor/wasmi/Cargo.toml              |   2 +-
 client/executor/wasmtime/Cargo.toml           |   2 +-
 client/finality-grandpa-warp-sync/Cargo.toml  |   2 +-
 client/finality-grandpa/Cargo.toml            |   6 +-
 client/finality-grandpa/rpc/Cargo.toml        |   4 +-
 client/finality-grandpa/src/aux_schema.rs     |   2 +-
 .../src/communication/gossip.rs               |   4 +-
 client/informant/Cargo.toml                   |   2 +-
 client/light/Cargo.toml                       |   2 +-
 client/network/Cargo.toml                     |   2 +-
 client/network/src/protocol.rs                |   4 +-
 client/network/src/protocol/message.rs        |   8 +-
 client/offchain/Cargo.toml                    |   2 +-
 client/rpc-api/Cargo.toml                     |   2 +-
 client/rpc/Cargo.toml                         |   2 +-
 client/rpc/src/state/state_light.rs           |   2 +-
 client/service/Cargo.toml                     |   4 +-
 client/service/test/Cargo.toml                |   2 +-
 client/state-db/Cargo.toml                    |   4 +-
 client/state-db/src/lib.rs                    |   2 +-
 client/transaction-pool/Cargo.toml            |   4 +-
 client/transaction-pool/graph/Cargo.toml      |   4 +-
 frame/assets/Cargo.toml                       |   2 +-
 frame/atomic-swap/Cargo.toml                  |   2 +-
 frame/aura/Cargo.toml                         |   2 +-
 frame/authority-discovery/Cargo.toml          |   2 +-
 frame/authorship/Cargo.toml                   |   2 +-
 frame/babe/Cargo.toml                         |   2 +-
 frame/balances/Cargo.toml                     |   2 +-
 frame/benchmarking/Cargo.toml                 |   2 +-
 frame/bounties/Cargo.toml                     |   2 +-
 frame/collective/Cargo.toml                   |   2 +-
 frame/contracts/Cargo.toml                    |   2 +-
 frame/contracts/common/Cargo.toml             |   2 +-
 frame/contracts/rpc/Cargo.toml                |   2 +-
 frame/contracts/rpc/runtime-api/Cargo.toml    |   2 +-
 frame/democracy/Cargo.toml                    |   2 +-
 frame/democracy/src/vote.rs                   |   2 +-
 frame/elections-phragmen/Cargo.toml           |   2 +-
 frame/elections/Cargo.toml                    |   2 +-
 frame/example-offchain-worker/Cargo.toml      |   2 +-
 frame/example-parallel/Cargo.toml             |   2 +-
 frame/example/Cargo.toml                      |   2 +-
 frame/executive/Cargo.toml                    |   2 +-
 frame/grandpa/Cargo.toml                      |   4 +-
 frame/identity/Cargo.toml                     |   2 +-
 frame/im-online/Cargo.toml                    |   2 +-
 frame/indices/Cargo.toml                      |   2 +-
 frame/lottery/Cargo.toml                      |   2 +-
 frame/membership/Cargo.toml                   |   2 +-
 frame/merkle-mountain-range/Cargo.toml        |   2 +-
 .../primitives/Cargo.toml                     |   2 +-
 .../primitives/src/lib.rs                     |   2 +-
 frame/metadata/Cargo.toml                     |   2 +-
 frame/metadata/src/lib.rs                     |   8 +-
 frame/multisig/Cargo.toml                     |   2 +-
 frame/nicks/Cargo.toml                        |   2 +-
 frame/node-authorization/Cargo.toml           |   2 +-
 frame/offences/Cargo.toml                     |   2 +-
 frame/offences/benchmarking/Cargo.toml        |   2 +-
 frame/proxy/Cargo.toml                        |   2 +-
 frame/randomness-collective-flip/Cargo.toml   |   2 +-
 frame/recovery/Cargo.toml                     |   2 +-
 frame/scheduler/Cargo.toml                    |   2 +-
 frame/scored-pool/Cargo.toml                  |   2 +-
 frame/session/Cargo.toml                      |   2 +-
 frame/session/benchmarking/Cargo.toml         |   2 +-
 frame/society/Cargo.toml                      |   2 +-
 frame/staking/Cargo.toml                      |   2 +-
 frame/staking/fuzzer/Cargo.toml               |   2 +-
 frame/sudo/Cargo.toml                         |   2 +-
 frame/support/Cargo.toml                      |   4 +-
 .../procedural/src/construct_runtime/mod.rs   |   8 +-
 frame/support/src/event.rs                    |   2 +-
 frame/support/src/origin.rs                   |   4 +-
 frame/support/test/Cargo.toml                 |   2 +-
 frame/system/Cargo.toml                       |   2 +-
 frame/system/benchmarking/Cargo.toml          |   2 +-
 frame/system/rpc/runtime-api/Cargo.toml       |   2 +-
 frame/timestamp/Cargo.toml                    |   2 +-
 frame/tips/Cargo.toml                         |   2 +-
 frame/transaction-payment/Cargo.toml          |   2 +-
 frame/transaction-payment/rpc/Cargo.toml      |   2 +-
 .../rpc/runtime-api/Cargo.toml                |   2 +-
 frame/treasury/Cargo.toml                     |   2 +-
 frame/utility/Cargo.toml                      |   2 +-
 frame/vesting/Cargo.toml                      |   2 +-
 primitives/api/Cargo.toml                     |   2 +-
 .../api/proc-macro/src/decl_runtime_apis.rs   |   2 +-
 .../api/proc-macro/src/impl_runtime_apis.rs   |   2 +-
 primitives/api/test/Cargo.toml                |   2 +-
 primitives/application-crypto/Cargo.toml      |   2 +-
 primitives/arithmetic/Cargo.toml              |   4 +-
 primitives/arithmetic/fuzzer/Cargo.toml       |   2 +-
 primitives/arithmetic/src/per_things.rs       |   4 +-
 primitives/authority-discovery/Cargo.toml     |   2 +-
 primitives/authorship/Cargo.toml              |   2 +-
 primitives/block-builder/Cargo.toml           |   2 +-
 primitives/blockchain/Cargo.toml              |   2 +-
 primitives/consensus/aura/Cargo.toml          |   2 +-
 primitives/consensus/aura/src/lib.rs          |   4 +-
 primitives/consensus/babe/Cargo.toml          |   2 +-
 primitives/consensus/babe/src/digests.rs      |   8 +-
 primitives/consensus/babe/src/lib.rs          |   6 +-
 primitives/consensus/common/Cargo.toml        |   2 +-
 primitives/consensus/pow/Cargo.toml           |   2 +-
 primitives/consensus/slots/Cargo.toml         |   2 +-
 primitives/consensus/vrf/Cargo.toml           |   2 +-
 primitives/core/Cargo.toml                    |   6 +-
 primitives/core/src/sandbox.rs                |   4 +-
 primitives/database/Cargo.toml                |   2 +-
 primitives/election-providers/Cargo.toml      |   2 +-
 primitives/externalities/Cargo.toml           |   2 +-
 primitives/finality-grandpa/Cargo.toml        |   4 +-
 primitives/finality-grandpa/src/lib.rs        |  10 +-
 primitives/inherents/Cargo.toml               |   2 +-
 primitives/io/Cargo.toml                      |   2 +-
 primitives/keystore/Cargo.toml                |   2 +-
 primitives/npos-elections/Cargo.toml          |   2 +-
 primitives/npos-elections/fuzzer/Cargo.toml   |   2 +-
 primitives/runtime-interface/Cargo.toml       |   4 +-
 primitives/runtime-interface/src/pass_by.rs   |   2 +-
 primitives/runtime/Cargo.toml                 |   4 +-
 primitives/runtime/src/generic/era.rs         |   4 +-
 primitives/runtime/src/generic/header.rs      |  12 +-
 primitives/runtime/src/testing.rs             |   2 +-
 primitives/sandbox/Cargo.toml                 |   2 +-
 primitives/session/Cargo.toml                 |   2 +-
 primitives/staking/Cargo.toml                 |   2 +-
 primitives/state-machine/Cargo.toml           |   2 +-
 .../state-machine/src/changes_trie/input.rs   |   6 +-
 primitives/storage/Cargo.toml                 |   2 +-
 primitives/tasks/Cargo.toml                   |   2 +-
 primitives/test-primitives/Cargo.toml         |   4 +-
 primitives/timestamp/Cargo.toml               |   2 +-
 primitives/tracing/Cargo.toml                 |   2 +-
 primitives/transaction-pool/Cargo.toml        |   2 +-
 primitives/trie/Cargo.toml                    |   6 +-
 primitives/trie/src/error.rs                  |   2 +-
 primitives/trie/src/node_header.rs            |   4 +-
 primitives/version/Cargo.toml                 |   2 +-
 primitives/wasm-interface/Cargo.toml          |   2 +-
 test-utils/client/Cargo.toml                  |   2 +-
 test-utils/runtime/Cargo.toml                 |   6 +-
 test-utils/runtime/client/Cargo.toml          |   2 +-
 .../runtime/transaction-pool/Cargo.toml       |   2 +-
 utils/browser/Cargo.toml                      |   2 +-
 utils/fork-tree/Cargo.toml                    |   2 +-
 utils/frame/benchmarking-cli/Cargo.toml       |   2 +-
 utils/frame/rpc/support/Cargo.toml            |   2 +-
 utils/frame/rpc/system/Cargo.toml             |   2 +-
 179 files changed, 316 insertions(+), 383 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ea23b6391433..a68f014e98ea 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -322,7 +322,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3410529e8288c463bedb5930f82833bc0c90e5d2fe639a56582a4d09220b281"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg",
 ]
 
 [[package]]
@@ -342,12 +342,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "autocfg"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
-
 [[package]]
 name = "autocfg"
 version = "1.0.1"
@@ -428,12 +422,14 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
 
 [[package]]
 name = "bitvec"
-version = "0.17.4"
+version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41262f11d771fd4a61aa3ce019fca363b4b6c282fca9da2a31186d3965a47a5c"
+checksum = "f5011ffc90248764d7005b0e10c7294f5aa1bd87d9dd7248f4ad475b347c294d"
 dependencies = [
- "either",
+ "funty",
  "radium",
+ "tap",
+ "wyz",
 ]
 
 [[package]]
@@ -563,9 +559,9 @@ checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820"
 
 [[package]]
 name = "byte-slice-cast"
-version = "0.3.5"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3"
+checksum = "65c1bf4a04a88c54f589125563643d773f3254b5c38571395e2b591c693bbc81"
 
 [[package]]
 name = "byte-tools"
@@ -575,9 +571,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
 
 [[package]]
 name = "byteorder"
-version = "1.3.4"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
+checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b"
 
 [[package]]
 name = "bytes"
@@ -1000,7 +996,7 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg",
  "cfg-if 0.1.10",
  "crossbeam-utils 0.7.2",
  "lazy_static",
@@ -1040,7 +1036,7 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg",
  "cfg-if 0.1.10",
  "lazy_static",
 ]
@@ -1051,7 +1047,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec91540d98355f690a86367e566ecad2e9e579f230230eb7c21398372be73ea5"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg",
  "cfg-if 1.0.0",
  "const_fn",
  "lazy_static",
@@ -1471,18 +1467,18 @@ dependencies = [
 
 [[package]]
 name = "finality-grandpa"
-version = "0.12.3"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8feb87a63249689640ac9c011742c33139204e3c134293d3054022276869133b"
+checksum = "2cd795898c348a8ec9edc66ec9e014031c764d4c88cc26d09b492cd93eb41339"
 dependencies = [
  "either",
  "futures 0.3.9",
- "futures-timer 2.0.2",
+ "futures-timer 3.0.2",
  "log",
  "num-traits",
  "parity-scale-codec",
- "parking_lot 0.9.0",
- "rand 0.6.5",
+ "parking_lot 0.11.1",
+ "rand 0.8.1",
 ]
 
 [[package]]
@@ -1770,6 +1766,12 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
 
+[[package]]
+name = "funty"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
+
 [[package]]
 name = "futures"
 version = "0.1.30"
@@ -2429,9 +2431,9 @@ dependencies = [
 
 [[package]]
 name = "impl-codec"
-version = "0.4.2"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1be51a921b067b0eaca2fad532d9400041561aa922221cc65f95a85641c6bf53"
+checksum = "df170efa359aebdd5cb7fe78edcc67107748e4737bdca8a8fb40d15ea7a877ed"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -2473,7 +2475,7 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55e2e4c765aa53a0424761bf9f41aa7a6ac1efa87238f59560640e27fca028f2"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg",
  "hashbrown",
  "serde",
 ]
@@ -2733,9 +2735,9 @@ dependencies = [
 
 [[package]]
 name = "kvdb"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92312348daade49976a6dc59263ad39ed54f840aacb5664874f7c9aa16e5f848"
+checksum = "8891bd853eff90e33024195d79d578dc984c82f9e0715fcd2b525a0c19d52811"
 dependencies = [
  "parity-util-mem",
  "smallvec 1.5.0",
@@ -2743,9 +2745,9 @@ dependencies = [
 
 [[package]]
 name = "kvdb-memorydb"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "986052a8d16c692eaebe775391f9a3ac26714f3907132658500b601dec94c8c2"
+checksum = "30a0da8e08caf08d384a620ec19bb6c9b85c84137248e202617fb91881f25912"
 dependencies = [
  "kvdb",
  "parity-util-mem",
@@ -2754,9 +2756,9 @@ dependencies = [
 
 [[package]]
 name = "kvdb-rocksdb"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d92c36be64baba5ea549116ff0d7ffd445456a7be8aaee21ec05882b980cd11"
+checksum = "34446c373ccc494c2124439281c198c7636ccdc2752c06722bbffd56d459c1e4"
 dependencies = [
  "fs-swap",
  "kvdb",
@@ -2772,9 +2774,9 @@ dependencies = [
 
 [[package]]
 name = "kvdb-web"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7bfe11b3202691673766b1224c432996f6b8047db17ceb743675bef3404e714"
+checksum = "eb1e98ba343d0b35f9009a8844cd2b87fa3192f7e79033ac05b00aeae0f3b0b5"
 dependencies = [
  "futures 0.3.9",
  "js-sys",
@@ -3433,14 +3435,14 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg",
 ]
 
 [[package]]
 name = "memory-db"
-version = "0.25.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cbd2a22f201c03cc1706a727842490abfea17b7b53260358239828208daba3c"
+checksum = "814bbecfc0451fc314eeea34f05bbcd5b98a7ad7af37faee088b86a1e633f1d4"
 dependencies = [
  "hash-db",
  "hashbrown",
@@ -3492,7 +3494,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d"
 dependencies = [
  "adler",
- "autocfg 1.0.1",
+ "autocfg",
 ]
 
 [[package]]
@@ -4141,7 +4143,7 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg",
  "num-integer",
  "num-traits",
 ]
@@ -4152,7 +4154,7 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg",
  "num-traits",
 ]
 
@@ -4162,7 +4164,7 @@ version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg",
  "num-traits",
 ]
 
@@ -4172,7 +4174,7 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg",
  "num-bigint",
  "num-integer",
  "num-traits",
@@ -4184,7 +4186,7 @@ version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg",
  "libm",
 ]
 
@@ -4460,7 +4462,7 @@ dependencies = [
  "pretty_assertions",
  "pwasm-utils 0.16.0",
  "rand 0.7.3",
- "rand_pcg 0.2.1",
+ "rand_pcg",
  "serde",
  "sp-core",
  "sp-io",
@@ -5245,9 +5247,9 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec"
-version = "1.3.6"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79602888a81ace83e3d1d4b2873286c1f5f906c84db667594e8db8da3506c383"
+checksum = "75c823fdae1bb5ff5708ee61a62697e6296175dc671710876871c853f48592b3"
 dependencies = [
  "arrayvec 0.5.2",
  "bitvec",
@@ -5258,9 +5260,9 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec-derive"
-version = "1.2.2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "198db82bb1c18fc00176004462dd809b2a6d851669550aa17af6dacd21ae0c14"
+checksum = "9029e65297c7fd6d7013f0579e193ec2b34ae78eabca854c9417504ad8a2d214"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -5295,9 +5297,9 @@ dependencies = [
 
 [[package]]
 name = "parity-util-mem"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f17f15cb05897127bf36a240085a1f0bbef7bce3024849eccf7f93f6171bc27"
+checksum = "664a8c6b8e62d8f9f2f937e391982eb433ab285b4cd9545b342441e04a906e42"
 dependencies = [
  "cfg-if 1.0.0",
  "hashbrown",
@@ -5716,9 +5718,9 @@ dependencies = [
 
 [[package]]
 name = "primitive-types"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3824ae2c5e27160113b9e029a10ec9e3f0237bad8029f69c7724393c9fdefd8"
+checksum = "2415937401cb030a2a0a4d922483f945fa068f52a7dbb22ce0fe5f2b6f6adace"
 dependencies = [
  "fixed-hash",
  "impl-codec",
@@ -5936,9 +5938,9 @@ dependencies = [
 
 [[package]]
 name = "radium"
-version = "0.3.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac"
+checksum = "e9e006811e1fdd12672b0820a7f44c18dde429f367d50cec003d22aa9b3c8ddc"
 
 [[package]]
 name = "rand"
@@ -5963,25 +5965,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "rand"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
-dependencies = [
- "autocfg 0.1.7",
- "libc",
- "rand_chacha 0.1.1",
- "rand_core 0.4.2",
- "rand_hc 0.1.0",
- "rand_isaac",
- "rand_jitter",
- "rand_os",
- "rand_pcg 0.1.2",
- "rand_xorshift",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "rand"
 version = "0.7.3"
@@ -5993,7 +5976,7 @@ dependencies = [
  "rand_chacha 0.2.2",
  "rand_core 0.5.1",
  "rand_hc 0.2.0",
- "rand_pcg 0.2.1",
+ "rand_pcg",
 ]
 
 [[package]]
@@ -6005,16 +5988,7 @@ dependencies = [
  "libc",
  "rand_chacha 0.3.0",
  "rand_core 0.6.1",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
-dependencies = [
- "autocfg 0.1.7",
- "rand_core 0.3.1",
+ "rand_hc 0.3.0",
 ]
 
 [[package]]
@@ -6079,15 +6053,6 @@ dependencies = [
  "rand 0.7.3",
 ]
 
-[[package]]
-name = "rand_hc"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
-dependencies = [
- "rand_core 0.3.1",
-]
-
 [[package]]
 name = "rand_hc"
 version = "0.2.0"
@@ -6098,47 +6063,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "rand_isaac"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rand_jitter"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
-dependencies = [
- "libc",
- "rand_core 0.4.2",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "rand_os"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
-dependencies = [
- "cloudabi 0.0.3",
- "fuchsia-cprng",
- "libc",
- "rand_core 0.4.2",
- "rdrand",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "rand_pcg"
-version = "0.1.2"
+name = "rand_hc"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
+checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
 dependencies = [
- "autocfg 0.1.7",
- "rand_core 0.4.2",
+ "rand_core 0.6.1",
 ]
 
 [[package]]
@@ -6150,15 +6080,6 @@ dependencies = [
  "rand_core 0.5.1",
 ]
 
-[[package]]
-name = "rand_xorshift"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
-dependencies = [
- "rand_core 0.3.1",
-]
-
 [[package]]
 name = "raw-cpuid"
 version = "7.0.3"
@@ -6182,7 +6103,7 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg",
  "crossbeam-deque 0.8.0",
  "either",
  "rayon-core",
@@ -9231,6 +9152,12 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
 
+[[package]]
+name = "tap"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36474e732d1affd3a6ed582781b3683df3d0563714c59c39591e8ff707cf078e"
+
 [[package]]
 name = "target-lexicon"
 version = "0.10.0"
@@ -9754,9 +9681,9 @@ checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41"
 
 [[package]]
 name = "trie-bench"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92d03b477b8837fd2e6bd17df374e5de60959c54058208de98833347c02b778c"
+checksum = "568257edb909a5c532b1f4ab38ee6b5dedfbf8775be6a55a29020513ebe3e072"
 dependencies = [
  "criterion",
  "hash-db",
@@ -10484,6 +10411,12 @@ dependencies = [
  "winapi-build",
 ]
 
+[[package]]
+name = "wyz"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
+
 [[package]]
 name = "x25519-dalek"
 version = "1.1.0"
diff --git a/bin/node-template/pallets/template/Cargo.toml b/bin/node-template/pallets/template/Cargo.toml
index d4e6636c64f5..a2f0011b5422 100644
--- a/bin/node-template/pallets/template/Cargo.toml
+++ b/bin/node-template/pallets/template/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 
 [dev-dependencies]
 serde = { version = "1.0.101" }
diff --git a/bin/node-template/runtime/Cargo.toml b/bin/node-template/runtime/Cargo.toml
index 7cf1519941dc..3f860655cb5f 100644
--- a/bin/node-template/runtime/Cargo.toml
+++ b/bin/node-template/runtime/Cargo.toml
@@ -11,7 +11,7 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 
 pallet-aura = { version = "2.0.0", default-features = false, path = "../../../frame/aura" }
 pallet-balances = { version = "2.0.0", default-features = false, path = "../../../frame/balances" }
diff --git a/bin/node/bench/Cargo.toml b/bin/node/bench/Cargo.toml
index 06d89ff7d0d5..a9c52324a047 100644
--- a/bin/node/bench/Cargo.toml
+++ b/bin/node/bench/Cargo.toml
@@ -21,8 +21,8 @@ serde = "1.0.101"
 serde_json = "1.0.41"
 structopt = "0.3"
 derive_more = "0.99.2"
-kvdb = "0.8.0"
-kvdb-rocksdb = "0.10.0"
+kvdb = "0.9.0"
+kvdb-rocksdb = "0.11.0"
 sp-trie = { version = "2.0.0", path = "../../../primitives/trie" }
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
 sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
@@ -37,7 +37,7 @@ fs_extra = "1"
 hex = "0.4.0"
 rand = { version = "0.7.2", features = ["small_rng"] }
 lazy_static = "1.4.0"
-parity-util-mem = { version = "0.8.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
 parity-db = { version = "0.1.2" }
 sc-transaction-pool = { version = "2.0.0", path = "../../../client/transaction-pool" }
 futures = { version = "0.3.4", features = ["thread-pool"] }
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index 4c245dcf629f..af27b52377a4 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -34,7 +34,7 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 # third-party dependencies
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 serde = { version = "1.0.102", features = ["derive"] }
 futures = { version = "0.3.9", features = ["compat"] }
 hex-literal = "0.3.1"
diff --git a/bin/node/executor/Cargo.toml b/bin/node/executor/Cargo.toml
index a2177ac9cd79..36af51bd80fd 100644
--- a/bin/node/executor/Cargo.toml
+++ b/bin/node/executor/Cargo.toml
@@ -12,7 +12,7 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 node-primitives = { version = "2.0.0", path = "../primitives" }
 node-runtime = { version = "2.0.0", path = "../runtime" }
 sc-executor = { version = "0.8.0", path = "../../../client/executor" }
diff --git a/bin/node/inspect/Cargo.toml b/bin/node/inspect/Cargo.toml
index 7f94e15bb8fc..14acb1895601 100644
--- a/bin/node/inspect/Cargo.toml
+++ b/bin/node/inspect/Cargo.toml
@@ -11,7 +11,7 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 derive_more = "0.99"
 log = "0.4.8"
 sc-cli = { version = "0.8.0", path = "../../../client/cli" }
diff --git a/bin/node/primitives/Cargo.toml b/bin/node/primitives/Cargo.toml
index db28472087fe..7a4b29cacea3 100644
--- a/bin/node/primitives/Cargo.toml
+++ b/bin/node/primitives/Cargo.toml
@@ -11,7 +11,7 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 frame-system = { version = "2.0.0", default-features = false, path = "../../../frame/system" }
 sp-application-crypto = { version = "2.0.0", default-features = false, path = "../../../primitives/application-crypto" }
 sp-core = { version = "2.0.0", default-features = false, path = "../../../primitives/core" }
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index 6ff98e5b3aa2..d6b38802fe69 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 
 # third-party dependencies
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.102", optional = true }
 static_assertions = "1.1.0"
 hex-literal = { version = "0.3.1", optional = true }
diff --git a/bin/node/testing/Cargo.toml b/bin/node/testing/Cargo.toml
index f6cf92d77e8e..e92e475952df 100644
--- a/bin/node/testing/Cargo.toml
+++ b/bin/node/testing/Cargo.toml
@@ -17,7 +17,7 @@ pallet-balances = { version = "2.0.0", path = "../../../frame/balances" }
 sc-service = { version = "0.8.0", features = ["test-helpers", "db"],  path = "../../../client/service" }
 sc-client-db = { version = "0.8.0", path = "../../../client/db/", features = ["kvdb-rocksdb", "parity-db"] }
 sc-client-api = { version = "2.0.0", path = "../../../client/api/" }
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 pallet-contracts = { version = "2.0.0", path = "../../../frame/contracts" }
 pallet-grandpa = { version = "2.0.0", path = "../../../frame/grandpa" }
 pallet-indices = { version = "2.0.0", path = "../../../frame/indices" }
diff --git a/client/api/Cargo.toml b/client/api/Cargo.toml
index 205d5a51cde3..4ccdbc541563 100644
--- a/client/api/Cargo.toml
+++ b/client/api/Cargo.toml
@@ -14,7 +14,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-consensus = { version = "0.8.0", path = "../../primitives/consensus/common" }
 derive_more = "0.99.2"
 sc-executor = { version = "0.8.0", path = "../executor" }
@@ -24,7 +24,7 @@ futures = "0.3.1"
 hash-db = { version = "0.15.2", default-features = false }
 sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
 sp-inherents = { version = "2.0.0", default-features = false, path = "../../primitives/inherents" }
-kvdb = "0.8.0"
+kvdb = "0.9.0"
 log = "0.4.8"
 parking_lot = "0.11.1"
 lazy_static =  "1.4.0"
@@ -43,7 +43,7 @@ sp-transaction-pool = { version = "2.0.0", path = "../../primitives/transaction-
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.8.0", path = "../../utils/prometheus" }
 
 [dev-dependencies]
-kvdb-memorydb = "0.8.0"
+kvdb-memorydb = "0.9.0"
 sp-test-primitives = { version = "2.0.0", path = "../../primitives/test-primitives" }
 substrate-test-runtime = { version = "2.0.0", path = "../../test-utils/runtime"  }
 thiserror = "1.0.21"
diff --git a/client/api/src/execution_extensions.rs b/client/api/src/execution_extensions.rs
index 68b412a0d778..1b13f2c6cffd 100644
--- a/client/api/src/execution_extensions.rs
+++ b/client/api/src/execution_extensions.rs
@@ -213,7 +213,7 @@ impl<Block: traits::Block> offchain::TransactionPool for TransactionPoolAdapter<
 		let xt = match Block::Extrinsic::decode(&mut &*data) {
 			Ok(xt) => xt,
 			Err(e) => {
-				log::warn!("Unable to decode extrinsic: {:?}: {}", data, e.what());
+				log::warn!("Unable to decode extrinsic: {:?}: {}", data, e);
 				return Err(());
 			},
 		};
diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml
index d2ba2cf4152f..d4b82f323806 100644
--- a/client/authority-discovery/Cargo.toml
+++ b/client/authority-discovery/Cargo.toml
@@ -18,7 +18,7 @@ prost-build = "0.7"
 
 [dependencies]
 async-trait = "0.1"
-codec = { package = "parity-scale-codec", default-features = false, version = "1.3.6" }
+codec = { package = "parity-scale-codec", default-features = false, version = "2.0.0" }
 derive_more = "0.99.2"
 either = "1.5.3"
 futures = "0.3.9"
diff --git a/client/basic-authorship/Cargo.toml b/client/basic-authorship/Cargo.toml
index c1df76253a46..2c0e8a2d1c5e 100644
--- a/client/basic-authorship/Cargo.toml
+++ b/client/basic-authorship/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 futures = "0.3.9"
 futures-timer = "3.0.1"
 log = "0.4.8"
diff --git a/client/block-builder/Cargo.toml b/client/block-builder/Cargo.toml
index 64a82505a9fa..b0a20857b86d 100644
--- a/client/block-builder/Cargo.toml
+++ b/client/block-builder/Cargo.toml
@@ -23,7 +23,7 @@ sp-core = { version = "2.0.0", path = "../../primitives/core" }
 sp-block-builder = { version = "2.0.0", path = "../../primitives/block-builder" }
 sp-inherents = { version = "2.0.0", path = "../../primitives/inherents" }
 sc-client-api = { version = "2.0.0", path = "../api" }
-codec = { package = "parity-scale-codec", version = "1.3.6", features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 
 [dev-dependencies]
 substrate-test-runtime-client = { path = "../../test-utils/runtime/client" }
diff --git a/client/chain-spec/Cargo.toml b/client/chain-spec/Cargo.toml
index e7144d330c69..3903ebf21d5d 100644
--- a/client/chain-spec/Cargo.toml
+++ b/client/chain-spec/Cargo.toml
@@ -22,7 +22,7 @@ serde_json = "1.0.41"
 sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
 sp-chain-spec = { version = "2.0.0", path = "../../primitives/chain-spec" }
 sc-telemetry = { version = "2.0.0", path = "../telemetry" }
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 sc-consensus-babe = { version = "0.8.0-rc6", path = "../consensus/babe" }
 sp-consensus-babe = { version = "0.8.0-rc6", path = "../../primitives/consensus/babe" }
 sc-consensus-epochs = { version = "0.8.0-rc6", path = "../consensus/epochs" }
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index 17390a5f225c..48b038981d93 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -19,7 +19,7 @@ tokio = { version = "0.2.21", features = [ "signal", "rt-core", "rt-threaded", "
 futures = "0.3.9"
 fdlimit = "0.2.1"
 libp2p = "0.34.0"
-parity-scale-codec = "1.3.6"
+parity-scale-codec = "2.0.0"
 hex = "0.4.2"
 rand = "0.7.3"
 tiny-bip39 = "0.8.0"
diff --git a/client/consensus/aura/Cargo.toml b/client/consensus/aura/Cargo.toml
index 3b8241480a8d..55b6bb5e0660 100644
--- a/client/consensus/aura/Cargo.toml
+++ b/client/consensus/aura/Cargo.toml
@@ -18,7 +18,7 @@ sp-consensus-aura = { version = "0.8.0", path = "../../../primitives/consensus/a
 sp-block-builder = { version = "2.0.0", path = "../../../primitives/block-builder" }
 sc-block-builder = { version = "0.8.0", path = "../../block-builder" }
 sc-client-api = { version = "2.0.0", path = "../../api" }
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
 sp-consensus-slots = { version = "0.8.0", path = "../../../primitives/consensus/slots" }
 derive_more = "0.99.2"
diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml
index 52d84435407c..de73d869fe70 100644
--- a/client/consensus/babe/Cargo.toml
+++ b/client/consensus/babe/Cargo.toml
@@ -14,7 +14,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 sp-consensus-babe = { version = "0.8.0", path = "../../../primitives/consensus/babe" }
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
 sp-application-crypto = { version = "2.0.0", path = "../../../primitives/application-crypto" }
diff --git a/client/consensus/babe/src/aux_schema.rs b/client/consensus/babe/src/aux_schema.rs
index acc8d57cc933..7d5df77c9217 100644
--- a/client/consensus/babe/src/aux_schema.rs
+++ b/client/consensus/babe/src/aux_schema.rs
@@ -44,7 +44,7 @@ fn load_decode<B, T>(backend: &B, key: &[u8]) -> ClientResult<Option<T>>
 		T: Decode,
 {
 	let corrupt = |e: codec::Error| {
-		ClientError::Backend(format!("BABE DB is corrupted. Decode error: {}", e.what()))
+		ClientError::Backend(format!("BABE DB is corrupted. Decode error: {}", e))
 	};
 	match backend.get_aux(key)? {
 		None => Ok(None),
diff --git a/client/consensus/epochs/Cargo.toml b/client/consensus/epochs/Cargo.toml
index 752280e3547d..7d1f74ab76d6 100644
--- a/client/consensus/epochs/Cargo.toml
+++ b/client/consensus/epochs/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 parking_lot = "0.11.1"
 fork-tree = { version = "2.0.0", path = "../../../utils/fork-tree" }
 sp-runtime = {  path = "../../../primitives/runtime" , version = "2.0.0"}
diff --git a/client/consensus/manual-seal/Cargo.toml b/client/consensus/manual-seal/Cargo.toml
index e725465b0428..737e4c4ff24c 100644
--- a/client/consensus/manual-seal/Cargo.toml
+++ b/client/consensus/manual-seal/Cargo.toml
@@ -20,7 +20,7 @@ jsonrpc-core-client = "15.1.0"
 jsonrpc-derive = "15.1.0"
 log = "0.4.8"
 parking_lot = "0.11.1"
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 serde = { version = "1.0", features=["derive"] }
 assert_matches = "1.3.0"
 
diff --git a/client/consensus/pow/Cargo.toml b/client/consensus/pow/Cargo.toml
index b5112f9fa628..2aae25ef931f 100644
--- a/client/consensus/pow/Cargo.toml
+++ b/client/consensus/pow/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
 sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
 sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
diff --git a/client/consensus/slots/Cargo.toml b/client/consensus/slots/Cargo.toml
index bdf28f35236b..03bf48bd6246 100644
--- a/client/consensus/slots/Cargo.toml
+++ b/client/consensus/slots/Cargo.toml
@@ -14,7 +14,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 sc-client-api = { version = "2.0.0", path = "../../api" }
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
 sp-trie = { version = "2.0.0", path = "../../../primitives/trie" }
diff --git a/client/consensus/slots/src/aux_schema.rs b/client/consensus/slots/src/aux_schema.rs
index 70a137de4330..db94ec48855e 100644
--- a/client/consensus/slots/src/aux_schema.rs
+++ b/client/consensus/slots/src/aux_schema.rs
@@ -41,7 +41,7 @@ fn load_decode<C, T>(backend: &C, key: &[u8]) -> ClientResult<Option<T>>
 		None => Ok(None),
 		Some(t) => T::decode(&mut &t[..])
 			.map_err(
-				|e| ClientError::Backend(format!("Slots DB is corrupted. Decode error: {}", e.what())),
+				|e| ClientError::Backend(format!("Slots DB is corrupted. Decode error: {}", e)),
 			)
 			.map(Some)
 	}
diff --git a/client/db/Cargo.toml b/client/db/Cargo.toml
index 23f6fa9b1f62..33c70894c433 100644
--- a/client/db/Cargo.toml
+++ b/client/db/Cargo.toml
@@ -15,13 +15,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 parking_lot = "0.11.1"
 log = "0.4.8"
-kvdb = "0.8.0"
-kvdb-rocksdb = { version = "0.10.0", optional = true }
-kvdb-memorydb = "0.8.0"
+kvdb = "0.9.0"
+kvdb-rocksdb = { version = "0.11.0", optional = true }
+kvdb-memorydb = "0.9.0"
 linked-hash-map = "0.5.2"
 hash-db = "0.15.2"
-parity-util-mem = { version = "0.8.0", default-features = false, features = ["std"] }
-codec = { package = "parity-scale-codec", version = "1.3.6", features = ["derive"] }
+parity-util-mem = { version = "0.9.0", default-features = false, features = ["std"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 blake2-rfc = "0.2.18"
 
 sc-client-api = { version = "2.0.0", path = "../api" }
@@ -43,7 +43,7 @@ sp-keyring = { version = "2.0.0", path = "../../primitives/keyring" }
 sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 quickcheck = "0.9"
-kvdb-rocksdb = "0.10.0"
+kvdb-rocksdb = "0.11.0"
 tempfile = "3"
 
 [features]
diff --git a/client/executor/Cargo.toml b/client/executor/Cargo.toml
index 8cfbe8d600d4..bfa50518aeeb 100644
--- a/client/executor/Cargo.toml
+++ b/client/executor/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 derive_more = "0.99.2"
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 sp-io = { version = "2.0.0", path = "../../primitives/io" }
 sp-core = { version = "2.0.0", path = "../../primitives/core" }
 sp-tasks = { version = "2.0.0", path = "../../primitives/tasks" }
diff --git a/client/executor/common/Cargo.toml b/client/executor/common/Cargo.toml
index a479f4e1f4dd..b8f735f0c179 100644
--- a/client/executor/common/Cargo.toml
+++ b/client/executor/common/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 derive_more = "0.99.2"
 parity-wasm = "0.41.0"
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 wasmi = "0.6.2"
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
 sp-allocator = { version = "2.0.0", path = "../../../primitives/allocator" }
diff --git a/client/executor/wasmi/Cargo.toml b/client/executor/wasmi/Cargo.toml
index 38d1cf3072a1..ea571b91f12b 100644
--- a/client/executor/wasmi/Cargo.toml
+++ b/client/executor/wasmi/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 log = "0.4.8"
 wasmi = "0.6.2"
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 sc-executor-common = { version = "0.8.0", path = "../common" }
 sp-wasm-interface = { version = "2.0.0", path = "../../../primitives/wasm-interface" }
 sp-runtime-interface = { version = "2.0.0", path = "../../../primitives/runtime-interface" }
diff --git a/client/executor/wasmtime/Cargo.toml b/client/executor/wasmtime/Cargo.toml
index 071cbc66001d..dcd162c900fb 100644
--- a/client/executor/wasmtime/Cargo.toml
+++ b/client/executor/wasmtime/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 log = "0.4.8"
 scoped-tls = "1.0"
 parity-wasm = "0.41.0"
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 sc-executor-common = { version = "0.8.0", path = "../common" }
 sp-wasm-interface = { version = "2.0.0", path = "../../../primitives/wasm-interface" }
 sp-runtime-interface = { version = "2.0.0", path = "../../../primitives/runtime-interface" }
diff --git a/client/finality-grandpa-warp-sync/Cargo.toml b/client/finality-grandpa-warp-sync/Cargo.toml
index 4f7ee0301f41..38aa08f4a2bb 100644
--- a/client/finality-grandpa-warp-sync/Cargo.toml
+++ b/client/finality-grandpa-warp-sync/Cargo.toml
@@ -22,7 +22,7 @@ sc-service = { version = "0.8.0", path = "../service" }
 futures = "0.3.8"
 log = "0.4.11"
 derive_more = "0.99.11"
-codec = { package = "parity-scale-codec", version = "1.3.5" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 prost = "0.6.1"
 num-traits = "0.2.14"
 parking_lot = "0.11.1"
diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml
index 1b410b32013a..951c6f93b5a7 100644
--- a/client/finality-grandpa/Cargo.toml
+++ b/client/finality-grandpa/Cargo.toml
@@ -22,7 +22,7 @@ futures-timer = "3.0.1"
 log = "0.4.8"
 parking_lot = "0.11.1"
 rand = "0.7.2"
-parity-scale-codec = { version = "1.3.6", features = ["derive"] }
+parity-scale-codec = { version = "2.0.0", features = ["derive"] }
 sp-application-crypto = { version = "2.0.0", path = "../../primitives/application-crypto" }
 sp-arithmetic = { version = "2.0.0", path = "../../primitives/arithmetic" }
 sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
@@ -43,13 +43,13 @@ sc-network-gossip = { version = "0.8.0", path = "../network-gossip" }
 sp-finality-grandpa = { version = "2.0.0", path = "../../primitives/finality-grandpa" }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.8.0"}
 sc-block-builder = { version = "0.8.0", path = "../block-builder" }
-finality-grandpa = { version = "0.12.3", features = ["derive-codec"] }
+finality-grandpa = { version = "0.13.0", features = ["derive-codec"] }
 pin-project = "0.4.6"
 linked-hash-map = "0.5.2"
 
 [dev-dependencies]
 assert_matches = "1.3.0"
-finality-grandpa = { version = "0.12.3", features = ["derive-codec", "test-helpers"] }
+finality-grandpa = { version = "0.13.0", features = ["derive-codec", "test-helpers"] }
 sc-network = { version = "0.8.0", path = "../network" }
 sc-network-test = { version = "0.8.0", path = "../network/test" }
 sp-keyring = { version = "2.0.0", path = "../../primitives/keyring" }
diff --git a/client/finality-grandpa/rpc/Cargo.toml b/client/finality-grandpa/rpc/Cargo.toml
index 52f6b094a8dd..c8d18d6595c1 100644
--- a/client/finality-grandpa/rpc/Cargo.toml
+++ b/client/finality-grandpa/rpc/Cargo.toml
@@ -14,7 +14,7 @@ sc-rpc = { version = "2.0.0", path = "../../rpc" }
 sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
 sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
-finality-grandpa = { version = "0.12.3", features = ["derive-codec"] }
+finality-grandpa = { version = "0.13.0", features = ["derive-codec"] }
 jsonrpc-core = "15.1.0"
 jsonrpc-core-client = "15.1.0"
 jsonrpc-derive = "15.1.0"
@@ -24,7 +24,7 @@ serde = { version = "1.0.105", features = ["derive"] }
 serde_json = "1.0.50"
 log = "0.4.8"
 derive_more = "0.99.2"
-parity-scale-codec = { version = "1.3.6", features = ["derive"] }
+parity-scale-codec = { version = "2.0.0", features = ["derive"] }
 sc-client-api = { version = "2.0.0", path = "../../api" }
 
 [dev-dependencies]
diff --git a/client/finality-grandpa/src/aux_schema.rs b/client/finality-grandpa/src/aux_schema.rs
index a5092334b99f..1ce3c7999f24 100644
--- a/client/finality-grandpa/src/aux_schema.rs
+++ b/client/finality-grandpa/src/aux_schema.rs
@@ -143,7 +143,7 @@ pub(crate) fn load_decode<B: AuxStore, T: Decode>(
 	match backend.get_aux(key)? {
 		None => Ok(None),
 		Some(t) => T::decode(&mut &t[..])
-			.map_err(|e| ClientError::Backend(format!("GRANDPA DB is corrupted: {}", e.what())))
+			.map_err(|e| ClientError::Backend(format!("GRANDPA DB is corrupted: {}", e)))
 			.map(Some)
 	}
 }
diff --git a/client/finality-grandpa/src/communication/gossip.rs b/client/finality-grandpa/src/communication/gossip.rs
index c217218aecc4..1e616f3fa3f1 100644
--- a/client/finality-grandpa/src/communication/gossip.rs
+++ b/client/finality-grandpa/src/communication/gossip.rs
@@ -370,7 +370,7 @@ pub(super) struct NeighborPacket<N> {
 /// A versioned neighbor packet.
 #[derive(Debug, Encode, Decode)]
 pub(super) enum VersionedNeighborPacket<N> {
-	#[codec(index = "1")]
+	#[codec(index = 1)]
 	V1(NeighborPacket<N>),
 }
 
@@ -1415,7 +1415,7 @@ impl<Block: BlockT> GossipValidator<Block> {
 				}
 				Err(e) => {
 					message_name = None;
-					debug!(target: "afg", "Error decoding message: {}", e.what());
+					debug!(target: "afg", "Error decoding message: {}", e);
 					telemetry!(CONSENSUS_DEBUG; "afg.err_decoding_msg"; "" => "");
 
 					let len = std::cmp::min(i32::max_value() as usize, data.len()) as i32;
diff --git a/client/informant/Cargo.toml b/client/informant/Cargo.toml
index fe5ae3857f09..9b58b036f054 100644
--- a/client/informant/Cargo.toml
+++ b/client/informant/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 ansi_term = "0.12.1"
 futures = "0.3.9"
 log = "0.4.8"
-parity-util-mem = { version = "0.8.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
 sc-client-api = { version = "2.0.0", path = "../api" }
 sc-network = { version = "0.8.0", path = "../network" }
 sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
diff --git a/client/light/Cargo.toml b/client/light/Cargo.toml
index 60d16ff0359c..5ec87419332f 100644
--- a/client/light/Cargo.toml
+++ b/client/light/Cargo.toml
@@ -21,7 +21,7 @@ sp-core = { version = "2.0.0", path = "../../primitives/core" }
 sp-state-machine = { version = "0.8.0", path = "../../primitives/state-machine" }
 sc-client-api = { version = "2.0.0", path = "../api" }
 sp-api = { version = "2.0.0", path = "../../primitives/api" }
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 sc-executor = { version = "0.8.0", path = "../executor" }
 
 [features]
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index bf948ff4dd37..8c6fc4e668d0 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -22,7 +22,7 @@ async-std = "1.6.5"
 bitflags = "1.2.0"
 bs58 = "0.4.0"
 bytes = "1"
-codec = { package = "parity-scale-codec", version = "1.3.6", features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 derive_more = "0.99.2"
 either = "1.5.3"
 erased-serde = "0.3.9"
diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index e0e2e63cad00..60b6a02cc7ba 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -656,7 +656,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 					"Couldn't decode packet sent by {}: {:?}: {}",
 					who,
 					data,
-					err.what(),
+					err,
 				);
 				self.peerset_handle.report_peer(who, rep::BAD_MESSAGE);
 				return CustomMessageOutcome::None;
@@ -1737,7 +1737,7 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 										"Couldn't decode handshake sent by {}: {:?}: {} & {}",
 										peer_id,
 										received_handshake,
-										err.what(),
+										err,
 										err2,
 									);
 									self.peerset_handle.report_peer(peer_id, rep::BAD_MESSAGE);
diff --git a/client/network/src/protocol/message.rs b/client/network/src/protocol/message.rs
index 3aa1e2cf34a7..3161f91e533c 100644
--- a/client/network/src/protocol/message.rs
+++ b/client/network/src/protocol/message.rs
@@ -95,7 +95,7 @@ impl BlockAttributes {
 }
 
 impl Encode for BlockAttributes {
-	fn encode_to<T: Output>(&self, dest: &mut T) {
+	fn encode_to<T: Output + ?Sized>(&self, dest: &mut T) {
 		dest.push_byte(self.bits())
 	}
 }
@@ -198,7 +198,7 @@ pub mod generic {
 	}
 
 	impl codec::Encode for Roles {
-		fn encode_to<T: codec::Output>(&self, dest: &mut T) {
+		fn encode_to<T: codec::Output + ?Sized>(&self, dest: &mut T) {
 			dest.push_byte(self.bits())
 		}
 	}
@@ -282,7 +282,7 @@ pub mod generic {
 		/// Batch of consensus protocol messages.
 		// NOTE: index is incremented by 2 due to finality proof related
 		// messages that were removed.
-		#[codec(index = "17")]
+		#[codec(index = 17)]
 		ConsensusBatch(Vec<ConsensusMessage>),
 	}
 
@@ -402,7 +402,7 @@ pub mod generic {
 	// This assumes that the packet contains nothing but the announcement message.
 	// TODO: Get rid of it once protocol v4 is common.
 	impl<H: Encode> Encode for BlockAnnounce<H> {
-		fn encode_to<T: Output>(&self, dest: &mut T) {
+		fn encode_to<T: Output + ?Sized>(&self, dest: &mut T) {
 			self.header.encode_to(dest);
 			if let Some(state) = &self.state {
 				state.encode_to(dest);
diff --git a/client/offchain/Cargo.toml b/client/offchain/Cargo.toml
index 7d0f01a0c7ed..b53ff5616db4 100644
--- a/client/offchain/Cargo.toml
+++ b/client/offchain/Cargo.toml
@@ -23,7 +23,7 @@ log = "0.4.8"
 threadpool = "1.7"
 num_cpus = "1.10"
 sp-offchain = { version = "2.0.0", path = "../../primitives/offchain" }
-codec = { package = "parity-scale-codec", version = "1.3.6", features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 parking_lot = "0.11.1"
 sp-core = { version = "2.0.0", path = "../../primitives/core" }
 rand = "0.7.2"
diff --git a/client/rpc-api/Cargo.toml b/client/rpc-api/Cargo.toml
index 546deb1283c5..9e51b8ce6b5e 100644
--- a/client/rpc-api/Cargo.toml
+++ b/client/rpc-api/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 derive_more = "0.99.2"
 futures = { version = "0.3.1", features = ["compat"] }
 jsonrpc-core = "15.1.0"
diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml
index bab436c93a7f..54f0aa78e5c8 100644
--- a/client/rpc/Cargo.toml
+++ b/client/rpc/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 sc-rpc-api = { version = "0.8.0", path = "../rpc-api" }
 sc-client-api = { version = "2.0.0", path = "../api" }
 sp-api = { version = "2.0.0", path = "../../primitives/api" }
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 futures = { version = "0.3.1", features = ["compat"] }
 jsonrpc-pubsub = "15.1.0"
 log = "0.4.8"
diff --git a/client/rpc/src/state/state_light.rs b/client/rpc/src/state/state_light.rs
index c1294dd27b08..c8c921345877 100644
--- a/client/rpc/src/state/state_light.rs
+++ b/client/rpc/src/state/state_light.rs
@@ -590,7 +590,7 @@ fn runtime_version<Block: BlockT, F: Fetcher<Block>>(
 	)
 	.then(|version| ready(version.and_then(|version|
 		Decode::decode(&mut &version.0[..])
-			.map_err(|e| client_err(ClientError::VersionInvalid(e.what().into())))
+			.map_err(|e| client_err(ClientError::VersionInvalid(e.to_string())))
 	)))
 }
 
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index 95ce02e195f1..10caca86e621 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -61,7 +61,7 @@ sc-light = { version = "2.0.0", path = "../light" }
 sc-client-api = { version = "2.0.0", path = "../api" }
 sp-api = { version = "2.0.0", path = "../../primitives/api" }
 sc-client-db = { version = "0.8.0", default-features = false, path = "../db" }
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 sc-executor = { version = "0.8.0", path = "../executor" }
 sc-transaction-pool = { version = "2.0.0", path = "../transaction-pool" }
 sp-transaction-pool = { version = "2.0.0", path = "../../primitives/transaction-pool" }
@@ -77,7 +77,7 @@ sc-tracing = { version = "2.0.0", path = "../tracing" }
 sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
 tracing = "0.1.22"
 tracing-futures = { version = "0.2.4" }
-parity-util-mem = { version = "0.8.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
 tempfile = "3.1.0"
diff --git a/client/service/test/Cargo.toml b/client/service/test/Cargo.toml
index 8fcd09b8298d..d1347fa9d3cc 100644
--- a/client/service/test/Cargo.toml
+++ b/client/service/test/Cargo.toml
@@ -40,5 +40,5 @@ sc-client-api = { version = "2.0.0", path = "../../api" }
 sc-block-builder = { version = "0.8.0", path = "../../block-builder" }
 sc-executor = { version = "0.8.0", path = "../../executor" }
 sp-panic-handler = { version = "2.0.0", path = "../../../primitives/panic-handler" }
-parity-scale-codec = "1.3.6"
+parity-scale-codec = "2.0.0"
 sp-tracing = { version = "2.0.0", path = "../../../primitives/tracing" }
diff --git a/client/state-db/Cargo.toml b/client/state-db/Cargo.toml
index 26939b769b8a..d8c022aa4887 100644
--- a/client/state-db/Cargo.toml
+++ b/client/state-db/Cargo.toml
@@ -18,6 +18,6 @@ parking_lot = "0.11.1"
 log = "0.4.11"
 sc-client-api = { version = "2.0.0", path = "../api" }
 sp-core = { version = "2.0.0", path = "../../primitives/core" }
-codec = { package = "parity-scale-codec", version = "1.3.6", features = ["derive"] }
-parity-util-mem = { version = "0.8.0", default-features = false, features = ["primitive-types"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
+parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
 parity-util-mem-derive = "0.1.0"
diff --git a/client/state-db/src/lib.rs b/client/state-db/src/lib.rs
index 8fd02ee17b99..dd2baf9d18ac 100644
--- a/client/state-db/src/lib.rs
+++ b/client/state-db/src/lib.rs
@@ -107,7 +107,7 @@ impl<E: fmt::Debug> fmt::Debug for Error<E> {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		match self {
 			Error::Db(e) => e.fmt(f),
-			Error::Decoding(e) => write!(f, "Error decoding sliceable value: {}", e.what()),
+			Error::Decoding(e) => write!(f, "Error decoding sliceable value: {}", e),
 			Error::InvalidBlock => write!(f, "Trying to canonicalize invalid block"),
 			Error::InvalidBlockNumber => write!(f, "Trying to insert block with invalid number"),
 			Error::InvalidParent => write!(f, "Trying to insert block with unknown parent"),
diff --git a/client/transaction-pool/Cargo.toml b/client/transaction-pool/Cargo.toml
index e68e39f5542d..f424f1777d09 100644
--- a/client/transaction-pool/Cargo.toml
+++ b/client/transaction-pool/Cargo.toml
@@ -13,13 +13,13 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 thiserror = "1.0.21"
 futures = { version = "0.3.1", features = ["compat"] }
 futures-diagnose = "1.0"
 intervalier = "0.4.0"
 log = "0.4.8"
-parity-util-mem = { version = "0.8.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
 parking_lot = "0.11.1"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.8.0"}
 sc-client-api = { version = "2.0.0", path = "../api" }
diff --git a/client/transaction-pool/graph/Cargo.toml b/client/transaction-pool/graph/Cargo.toml
index f6143f8837bf..97b35a070676 100644
--- a/client/transaction-pool/graph/Cargo.toml
+++ b/client/transaction-pool/graph/Cargo.toml
@@ -25,13 +25,13 @@ sp-utils = { version = "2.0.0", path = "../../../primitives/utils" }
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
 sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
 sp-transaction-pool = { version = "2.0.0", path = "../../../primitives/transaction-pool" }
-parity-util-mem = { version = "0.8.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
 linked-hash-map = "0.5.2"
 retain_mut = "0.1.2"
 
 [dev-dependencies]
 assert_matches = "1.3.0"
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 substrate-test-runtime = { version = "2.0.0", path = "../../../test-utils/runtime" }
 criterion = "0.3"
 
diff --git a/frame/assets/Cargo.toml b/frame/assets/Cargo.toml
index 4dddd1c59cde..8c6c55b2d07e 100644
--- a/frame/assets/Cargo.toml
+++ b/frame/assets/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 # Needed for various traits. In our case, `OnFinalize`.
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
diff --git a/frame/atomic-swap/Cargo.toml b/frame/atomic-swap/Cargo.toml
index 55d8de86582a..0f166c9be791 100644
--- a/frame/atomic-swap/Cargo.toml
+++ b/frame/atomic-swap/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
diff --git a/frame/aura/Cargo.toml b/frame/aura/Cargo.toml
index cc8e678fb559..467f684af594 100644
--- a/frame/aura/Cargo.toml
+++ b/frame/aura/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 sp-application-crypto = { version = "2.0.0", default-features = false, path = "../../primitives/application-crypto" }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-inherents = { version = "2.0.0", default-features = false, path = "../../primitives/inherents" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 serde = { version = "1.0.101", optional = true }
diff --git a/frame/authority-discovery/Cargo.toml b/frame/authority-discovery/Cargo.toml
index 3538d8a5f81c..5b83de19a515 100644
--- a/frame/authority-discovery/Cargo.toml
+++ b/frame/authority-discovery/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 sp-authority-discovery = { version = "2.0.0", default-features = false, path = "../../primitives/authority-discovery" }
 sp-application-crypto = { version = "2.0.0", default-features = false, path = "../../primitives/application-crypto" }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 serde = { version = "1.0.101", optional = true }
 pallet-session = { version = "2.0.0", features = ["historical" ], path = "../session", default-features = false }
diff --git a/frame/authorship/Cargo.toml b/frame/authorship/Cargo.toml
index 64e3fb12b0d4..04c95d02a643 100644
--- a/frame/authorship/Cargo.toml
+++ b/frame/authorship/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-inherents = { version = "2.0.0", default-features = false, path = "../../primitives/inherents" }
 sp-authorship = { version = "2.0.0", default-features = false, path = "../../primitives/authorship" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
diff --git a/frame/babe/Cargo.toml b/frame/babe/Cargo.toml
index 13ac2e4034c9..787835e33fe0 100644
--- a/frame/babe/Cargo.toml
+++ b/frame/babe/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
diff --git a/frame/balances/Cargo.toml b/frame/balances/Cargo.toml
index 82f0e3f6b075..1105950ccfda 100644
--- a/frame/balances/Cargo.toml
+++ b/frame/balances/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
 frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
diff --git a/frame/benchmarking/Cargo.toml b/frame/benchmarking/Cargo.toml
index e045f259be77..960c7d731f0b 100644
--- a/frame/benchmarking/Cargo.toml
+++ b/frame/benchmarking/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 linregress = { version = "0.4.0", optional = true }
 paste = "0.1"
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 sp-api = { version = "2.0.0", path = "../../primitives/api", default-features = false }
 sp-runtime-interface = { version = "2.0.0", path = "../../primitives/runtime-interface", default-features = false }
 sp-runtime = { version = "2.0.0", path = "../../primitives/runtime", default-features = false }
diff --git a/frame/bounties/Cargo.toml b/frame/bounties/Cargo.toml
index 0e37e3b9d4a5..83a47087db49 100644
--- a/frame/bounties/Cargo.toml
+++ b/frame/bounties/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
diff --git a/frame/collective/Cargo.toml b/frame/collective/Cargo.toml
index 47f8414ef4bb..400321d7c70f 100644
--- a/frame/collective/Cargo.toml
+++ b/frame/collective/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
diff --git a/frame/contracts/Cargo.toml b/frame/contracts/Cargo.toml
index 710258037e7a..d9e4f0d0e7ed 100644
--- a/frame/contracts/Cargo.toml
+++ b/frame/contracts/Cargo.toml
@@ -16,7 +16,7 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
diff --git a/frame/contracts/common/Cargo.toml b/frame/contracts/common/Cargo.toml
index ff5f38637765..8ef6022db9f0 100644
--- a/frame/contracts/common/Cargo.toml
+++ b/frame/contracts/common/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 # This crate should not rely on any of the frame primitives.
 bitflags = "1.0"
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../../../primitives/std" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../../primitives/runtime" }
 
diff --git a/frame/contracts/rpc/Cargo.toml b/frame/contracts/rpc/Cargo.toml
index 39c3b373c8cf..c714f0002a82 100644
--- a/frame/contracts/rpc/Cargo.toml
+++ b/frame/contracts/rpc/Cargo.toml
@@ -14,7 +14,7 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 jsonrpc-core = "15.1.0"
 jsonrpc-core-client = "15.1.0"
 jsonrpc-derive = "15.1.0"
diff --git a/frame/contracts/rpc/runtime-api/Cargo.toml b/frame/contracts/rpc/runtime-api/Cargo.toml
index fe1cb91b8453..7d7c7bd4f5ed 100644
--- a/frame/contracts/rpc/runtime-api/Cargo.toml
+++ b/frame/contracts/rpc/runtime-api/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 sp-api = { version = "2.0.0", default-features = false, path = "../../../../primitives/api" }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../../../../primitives/std" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../../../primitives/runtime" }
 pallet-contracts-primitives = { version = "2.0.0", default-features = false, path = "../../common" }
diff --git a/frame/democracy/Cargo.toml b/frame/democracy/Cargo.toml
index a63382922545..6a67b9545185 100644
--- a/frame/democracy/Cargo.toml
+++ b/frame/democracy/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
diff --git a/frame/democracy/src/vote.rs b/frame/democracy/src/vote.rs
index fdf13b944d62..5adc76f4ae00 100644
--- a/frame/democracy/src/vote.rs
+++ b/frame/democracy/src/vote.rs
@@ -30,7 +30,7 @@ pub struct Vote {
 }
 
 impl Encode for Vote {
-	fn encode_to<T: Output>(&self, output: &mut T) {
+	fn encode_to<T: Output + ?Sized>(&self, output: &mut T) {
 		output.push_byte(u8::from(self.conviction) | if self.aye { 0b1000_0000 } else { 0 });
 	}
 }
diff --git a/frame/elections-phragmen/Cargo.toml b/frame/elections-phragmen/Cargo.toml
index 2571dff7c890..2103196ce558 100644
--- a/frame/elections-phragmen/Cargo.toml
+++ b/frame/elections-phragmen/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.101", optional = true }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
 sp-npos-elections = { version = "2.0.0", default-features = false, path = "../../primitives/npos-elections" }
diff --git a/frame/elections/Cargo.toml b/frame/elections/Cargo.toml
index 90e69ea21275..becb519be0a9 100644
--- a/frame/elections/Cargo.toml
+++ b/frame/elections/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
diff --git a/frame/example-offchain-worker/Cargo.toml b/frame/example-offchain-worker/Cargo.toml
index be3c03e4c454..db52d4760670 100644
--- a/frame/example-offchain-worker/Cargo.toml
+++ b/frame/example-offchain-worker/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
 serde = { version = "1.0.101", optional = true }
diff --git a/frame/example-parallel/Cargo.toml b/frame/example-parallel/Cargo.toml
index ee816d963be9..359a295b1687 100644
--- a/frame/example-parallel/Cargo.toml
+++ b/frame/example-parallel/Cargo.toml
@@ -12,7 +12,7 @@ description = "FRAME example pallet using runtime worker threads"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
diff --git a/frame/example/Cargo.toml b/frame/example/Cargo.toml
index e805a27a96b8..59828c3eae83 100644
--- a/frame/example/Cargo.toml
+++ b/frame/example/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
 pallet-balances = { version = "2.0.0", default-features = false, path = "../balances" }
diff --git a/frame/executive/Cargo.toml b/frame/executive/Cargo.toml
index 3f9820b5f3f5..6ee378b222ca 100644
--- a/frame/executive/Cargo.toml
+++ b/frame/executive/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
 serde = { version = "1.0.101", optional = true }
diff --git a/frame/grandpa/Cargo.toml b/frame/grandpa/Cargo.toml
index c6a76de23e45..f4d11543797c 100644
--- a/frame/grandpa/Cargo.toml
+++ b/frame/grandpa/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-application-crypto = { version = "2.0.0", default-features = false, path = "../../primitives/application-crypto" }
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
 sp-finality-grandpa = { version = "2.0.0", default-features = false, path = "../../primitives/finality-grandpa" }
@@ -30,7 +30,7 @@ pallet-session = { version = "2.0.0", default-features = false, path = "../sessi
 
 [dev-dependencies]
 frame-benchmarking = { version = "2.0.0", path = "../benchmarking" }
-grandpa = { package = "finality-grandpa", version = "0.12.3", features = ["derive-codec"] }
+grandpa = { package = "finality-grandpa", version = "0.13.0", features = ["derive-codec"] }
 sp-io = { version = "2.0.0", path = "../../primitives/io" }
 sp-keyring = { version = "2.0.0", path = "../../primitives/keyring" }
 pallet-balances = { version = "2.0.0", path = "../balances" }
diff --git a/frame/identity/Cargo.toml b/frame/identity/Cargo.toml
index 124ac4f00644..982df0a0e5ed 100644
--- a/frame/identity/Cargo.toml
+++ b/frame/identity/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 enumflags2 = { version = "0.6.2" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
diff --git a/frame/im-online/Cargo.toml b/frame/im-online/Cargo.toml
index 95948c86de49..fc84a8d8cb1b 100644
--- a/frame/im-online/Cargo.toml
+++ b/frame/im-online/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 sp-application-crypto = { version = "2.0.0", default-features = false, path = "../../primitives/application-crypto" }
 pallet-authorship = { version = "2.0.0", default-features = false, path = "../authorship" }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 serde = { version = "1.0.101", optional = true }
diff --git a/frame/indices/Cargo.toml b/frame/indices/Cargo.toml
index afe315cfaa6b..cc5bc67c35dc 100644
--- a/frame/indices/Cargo.toml
+++ b/frame/indices/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-keyring = { version = "2.0.0", optional = true, path = "../../primitives/keyring" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
diff --git a/frame/lottery/Cargo.toml b/frame/lottery/Cargo.toml
index b223625c87a0..49ae53ff1dfd 100644
--- a/frame/lottery/Cargo.toml
+++ b/frame/lottery/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
diff --git a/frame/membership/Cargo.toml b/frame/membership/Cargo.toml
index f1ce20df17ed..ba46b555afac 100644
--- a/frame/membership/Cargo.toml
+++ b/frame/membership/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
diff --git a/frame/merkle-mountain-range/Cargo.toml b/frame/merkle-mountain-range/Cargo.toml
index f6441b103f6d..60fba2de97c5 100644
--- a/frame/merkle-mountain-range/Cargo.toml
+++ b/frame/merkle-mountain-range/Cargo.toml
@@ -12,7 +12,7 @@ description = "FRAME Merkle Mountain Range pallet."
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
diff --git a/frame/merkle-mountain-range/primitives/Cargo.toml b/frame/merkle-mountain-range/primitives/Cargo.toml
index 1db7bf2fd3f6..9f8eb9a1c2d8 100644
--- a/frame/merkle-mountain-range/primitives/Cargo.toml
+++ b/frame/merkle-mountain-range/primitives/Cargo.toml
@@ -12,7 +12,7 @@ description = "FRAME Merkle Mountain Range primitives."
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 frame-support = { version = "2.0.0", default-features = false, path = "../../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../../system" }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
diff --git a/frame/merkle-mountain-range/primitives/src/lib.rs b/frame/merkle-mountain-range/primitives/src/lib.rs
index b8258d9b7373..d57f8565b608 100644
--- a/frame/merkle-mountain-range/primitives/src/lib.rs
+++ b/frame/merkle-mountain-range/primitives/src/lib.rs
@@ -127,7 +127,7 @@ mod encoding {
 	}
 
 	impl<H: traits::Hash, L: FullLeaf> codec::Encode for DataOrHash<H, L> {
-		fn encode_to<T: codec::Output>(&self, dest: &mut T) {
+		fn encode_to<T: codec::Output + ?Sized>(&self, dest: &mut T) {
 			match self {
 				Self::Data(l) => l.using_encoded(
 					|data| Either::<&[u8], &H::Output>::Left(data).encode_to(dest), false
diff --git a/frame/metadata/Cargo.toml b/frame/metadata/Cargo.toml
index c809b3d1fcbd..3965e581b378 100644
--- a/frame/metadata/Cargo.toml
+++ b/frame/metadata/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
diff --git a/frame/metadata/src/lib.rs b/frame/metadata/src/lib.rs
index 8e6b8b6bd796..a63da82ca00d 100644
--- a/frame/metadata/src/lib.rs
+++ b/frame/metadata/src/lib.rs
@@ -53,7 +53,7 @@ pub enum DecodeDifferent<B, O> where B: 'static, O: 'static {
 }
 
 impl<B, O> Encode for DecodeDifferent<B, O> where B: Encode + 'static, O: Encode + 'static {
-	fn encode_to<W: Output>(&self, dest: &mut W) {
+	fn encode_to<W: Output + ?Sized>(&self, dest: &mut W) {
 		match self {
 			DecodeDifferent::Encode(b) => b.encode_to(dest),
 			DecodeDifferent::Decoded(o) => o.encode_to(dest),
@@ -139,7 +139,7 @@ pub struct FunctionArgumentMetadata {
 pub struct FnEncode<E>(pub fn() -> E) where E: Encode + 'static;
 
 impl<E: Encode> Encode for FnEncode<E> {
-	fn encode_to<W: Output>(&self, dest: &mut W) {
+	fn encode_to<W: Output + ?Sized>(&self, dest: &mut W) {
 		self.0().encode_to(dest);
 	}
 }
@@ -238,7 +238,7 @@ pub struct DefaultByteGetter(pub &'static dyn DefaultByte);
 pub type ByteGetter = DecodeDifferent<DefaultByteGetter, Vec<u8>>;
 
 impl Encode for DefaultByteGetter {
-	fn encode_to<W: Output>(&self, dest: &mut W) {
+	fn encode_to<W: Output + ?Sized>(&self, dest: &mut W) {
 		self.0.default_byte().encode_to(dest)
 	}
 }
@@ -374,7 +374,7 @@ pub enum RuntimeMetadata {
 pub enum RuntimeMetadataDeprecated { }
 
 impl Encode for RuntimeMetadataDeprecated {
-	fn encode_to<W: Output>(&self, _dest: &mut W) {}
+	fn encode_to<W: Output + ?Sized>(&self, _dest: &mut W) {}
 }
 
 impl codec::EncodeLike for RuntimeMetadataDeprecated {}
diff --git a/frame/multisig/Cargo.toml b/frame/multisig/Cargo.toml
index 70412fa6de0a..33289f98ec14 100644
--- a/frame/multisig/Cargo.toml
+++ b/frame/multisig/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
diff --git a/frame/nicks/Cargo.toml b/frame/nicks/Cargo.toml
index 3e1ddf897d34..aaba763e4d12 100644
--- a/frame/nicks/Cargo.toml
+++ b/frame/nicks/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
diff --git a/frame/node-authorization/Cargo.toml b/frame/node-authorization/Cargo.toml
index d78ffd13fd57..b0a7eefc6c64 100644
--- a/frame/node-authorization/Cargo.toml
+++ b/frame/node-authorization/Cargo.toml
@@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
diff --git a/frame/offences/Cargo.toml b/frame/offences/Cargo.toml
index 2860e3ef8ee2..17df3d0a2b4a 100644
--- a/frame/offences/Cargo.toml
+++ b/frame/offences/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 pallet-balances = { version = "2.0.0", default-features = false, path = "../balances" }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 serde = { version = "1.0.101", optional = true }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
diff --git a/frame/offences/benchmarking/Cargo.toml b/frame/offences/benchmarking/Cargo.toml
index 80492288d74b..0199d23d3858 100644
--- a/frame/offences/benchmarking/Cargo.toml
+++ b/frame/offences/benchmarking/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 frame-benchmarking = { version = "2.0.0", default-features = false, path = "../../benchmarking" }
 frame-support = { version = "2.0.0", default-features = false, path = "../../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../../system" }
diff --git a/frame/proxy/Cargo.toml b/frame/proxy/Cargo.toml
index da3d50ab2234..fff6aab6abfd 100644
--- a/frame/proxy/Cargo.toml
+++ b/frame/proxy/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
diff --git a/frame/randomness-collective-flip/Cargo.toml b/frame/randomness-collective-flip/Cargo.toml
index 9d2683a8a8f8..d4b516c32ecf 100644
--- a/frame/randomness-collective-flip/Cargo.toml
+++ b/frame/randomness-collective-flip/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 safe-mix = { version = "1.0", default-features = false }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
diff --git a/frame/recovery/Cargo.toml b/frame/recovery/Cargo.toml
index a0d4c0f14df5..c333e6ea9957 100644
--- a/frame/recovery/Cargo.toml
+++ b/frame/recovery/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 enumflags2 = { version = "0.6.2" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
diff --git a/frame/scheduler/Cargo.toml b/frame/scheduler/Cargo.toml
index 7d21b125e6e6..90c3799d1cd3 100644
--- a/frame/scheduler/Cargo.toml
+++ b/frame/scheduler/Cargo.toml
@@ -11,7 +11,7 @@ readme = "README.md"
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
diff --git a/frame/scored-pool/Cargo.toml b/frame/scored-pool/Cargo.toml
index 6c9bceb32e00..33588230adda 100644
--- a/frame/scored-pool/Cargo.toml
+++ b/frame/scored-pool/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.101", optional = true }
 sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
diff --git a/frame/session/Cargo.toml b/frame/session/Cargo.toml
index 3a9f4609a2e2..8a13f905f0dc 100644
--- a/frame/session/Cargo.toml
+++ b/frame/session/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
diff --git a/frame/session/benchmarking/Cargo.toml b/frame/session/benchmarking/Cargo.toml
index fc3099e1b95c..5404cea88baa 100644
--- a/frame/session/benchmarking/Cargo.toml
+++ b/frame/session/benchmarking/Cargo.toml
@@ -25,7 +25,7 @@ rand = { version = "0.7.2", default-features = false }
 
 [dev-dependencies]
 serde = { version = "1.0.101" }
-codec = { package = "parity-scale-codec", version = "1.3.6", features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
 pallet-staking-reward-curve = { version = "2.0.0", path = "../../staking/reward-curve" }
 sp-io ={ version = "2.0.0", path = "../../../primitives/io" }
diff --git a/frame/society/Cargo.toml b/frame/society/Cargo.toml
index fce6ebe51bb3..9f49b29bf3d5 100644
--- a/frame/society/Cargo.toml
+++ b/frame/society/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
diff --git a/frame/staking/Cargo.toml b/frame/staking/Cargo.toml
index 7c2fc21fde54..2cd25daa8094 100644
--- a/frame/staking/Cargo.toml
+++ b/frame/staking/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 static_assertions = "1.1.0"
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-npos-elections = { version = "2.0.0", default-features = false, path = "../../primitives/npos-elections" }
 sp-io ={ version = "2.0.0", default-features = false, path = "../../primitives/io" }
diff --git a/frame/staking/fuzzer/Cargo.toml b/frame/staking/fuzzer/Cargo.toml
index db65e347d8e2..920f53c86939 100644
--- a/frame/staking/fuzzer/Cargo.toml
+++ b/frame/staking/fuzzer/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 honggfuzz = "0.5"
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 pallet-staking = { version = "2.0.0", path = "..", features = ["runtime-benchmarks"] }
 pallet-staking-reward-curve = { version = "2.0.0",  path = "../reward-curve" }
 pallet-session = { version = "2.0.0", path = "../../session" }
diff --git a/frame/sudo/Cargo.toml b/frame/sudo/Cargo.toml
index a566cd2a9f06..cae9615cdabb 100644
--- a/frame/sudo/Cargo.toml
+++ b/frame/sudo/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
diff --git a/frame/support/Cargo.toml b/frame/support/Cargo.toml
index 9353dc6e121d..3354f17d27c9 100644
--- a/frame/support/Cargo.toml
+++ b/frame/support/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 log = "0.4"
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 frame-metadata = { version = "12.0.0", default-features = false, path = "../metadata" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
@@ -35,7 +35,7 @@ smallvec = "1.4.1"
 [dev-dependencies]
 pretty_assertions = "0.6.1"
 frame-system = { version = "2.0.0", path = "../system" }
-parity-util-mem = { version = "0.8.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 sp-api = { version = "2.0.0", default-features = false, path = "../../primitives/api" }
 
diff --git a/frame/support/procedural/src/construct_runtime/mod.rs b/frame/support/procedural/src/construct_runtime/mod.rs
index 4644c217cfdd..705c2cfcb44c 100644
--- a/frame/support/procedural/src/construct_runtime/mod.rs
+++ b/frame/support/procedural/src/construct_runtime/mod.rs
@@ -348,7 +348,7 @@ fn decl_outer_dispatch<'a>(
 		.map(|module_declaration| {
 			let module = &module_declaration.module;
 			let name = &module_declaration.name;
-			let index = module_declaration.index.to_string();
+			let index = module_declaration.index;
 			quote!(#[codec(index = #index)] #module::#name)
 		});
 
@@ -381,14 +381,14 @@ fn decl_outer_origin<'a>(
 				);
 				return Err(syn::Error::new(module_declaration.name.span(), msg));
 			}
-			let index = module_declaration.index.to_string();
+			let index = module_declaration.index;
 			let tokens = quote!(#[codec(index = #index)] #module #instance #generics,);
 			modules_tokens.extend(tokens);
 		}
 	}
 
 	let system_name = &system_module.module;
-	let system_index = system_module.index.to_string();
+	let system_index = system_module.index;
 
 	Ok(quote!(
 		#scrate::impl_outer_origin! {
@@ -422,7 +422,7 @@ fn decl_outer_event<'a>(
 				return Err(syn::Error::new(module_declaration.name.span(), msg));
 			}
 
-			let index = module_declaration.index.to_string();
+			let index = module_declaration.index;
 			let tokens = quote!(#[codec(index = #index)] #module #instance #generics,);
 			modules_tokens.extend(tokens);
 		}
diff --git a/frame/support/src/event.rs b/frame/support/src/event.rs
index b55f5d7e0b2a..39baee29bc0c 100644
--- a/frame/support/src/event.rs
+++ b/frame/support/src/event.rs
@@ -713,7 +713,7 @@ mod tests {
 		pub enum TestEventSystemRenamed for TestRuntime2 {
 			system_renamed,
 			event_module<T>,
-			#[codec(index = "5")] event_module2<T>,
+			#[codec(index = 5)] event_module2<T>,
 			event_module3,
 		}
 	}
diff --git a/frame/support/src/origin.rs b/frame/support/src/origin.rs
index c17c617b86b7..19b24fb84bb1 100644
--- a/frame/support/src/origin.rs
+++ b/frame/support/src/origin.rs
@@ -478,9 +478,9 @@ mod tests {
 	);
 
 	impl_outer_origin!(
-		pub enum OriginIndices for TestRuntime where system = frame_system, system_index = "11" {
+		pub enum OriginIndices for TestRuntime where system = frame_system, system_index = 11 {
 			origin_with_generic<T>,
-			#[codec(index = "10")] origin_without_generic,
+			#[codec(index = 10)] origin_without_generic,
 		}
 	);
 
diff --git a/frame/support/test/Cargo.toml b/frame/support/test/Cargo.toml
index ef66bd190215..a34ba3e45ef9 100644
--- a/frame/support/test/Cargo.toml
+++ b/frame/support/test/Cargo.toml
@@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", default-features = false, features = ["derive"] }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-io = { version = "2.0.0", path = "../../../primitives/io", default-features = false }
 sp-state-machine = { version = "0.8.0", optional = true, path = "../../../primitives/state-machine" }
 frame-support = { version = "2.0.0", default-features = false, path = "../" }
diff --git a/frame/system/Cargo.toml b/frame/system/Cargo.toml
index 49f3056aff2f..0866a0c1d0b6 100644
--- a/frame/system/Cargo.toml
+++ b/frame/system/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "2.0.0", path = "../../primitives/io", default-features = false }
diff --git a/frame/system/benchmarking/Cargo.toml b/frame/system/benchmarking/Cargo.toml
index e164a0d62e0f..0569ba1f84e3 100644
--- a/frame/system/benchmarking/Cargo.toml
+++ b/frame/system/benchmarking/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 sp-std = { version = "2.0.0", default-features = false, path = "../../../primitives/std" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../../primitives/runtime" }
 frame-benchmarking = { version = "2.0.0", default-features = false, path = "../../benchmarking" }
diff --git a/frame/system/rpc/runtime-api/Cargo.toml b/frame/system/rpc/runtime-api/Cargo.toml
index 4820df10fe16..77421fd1fa3c 100644
--- a/frame/system/rpc/runtime-api/Cargo.toml
+++ b/frame/system/rpc/runtime-api/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 sp-api = { version = "2.0.0", default-features = false, path = "../../../../primitives/api" }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 
 [features]
 default = ["std"]
diff --git a/frame/timestamp/Cargo.toml b/frame/timestamp/Cargo.toml
index 79d8e30935f7..2e71d09f2c20 100644
--- a/frame/timestamp/Cargo.toml
+++ b/frame/timestamp/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io", optional = true }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
diff --git a/frame/tips/Cargo.toml b/frame/tips/Cargo.toml
index 0ce81a6d5d1b..dde071d585f5 100644
--- a/frame/tips/Cargo.toml
+++ b/frame/tips/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
diff --git a/frame/transaction-payment/Cargo.toml b/frame/transaction-payment/Cargo.toml
index 1f64ae03995b..e9741fbbb05c 100644
--- a/frame/transaction-payment/Cargo.toml
+++ b/frame/transaction-payment/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.101", optional = true }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
diff --git a/frame/transaction-payment/rpc/Cargo.toml b/frame/transaction-payment/rpc/Cargo.toml
index 410827d0efb5..167fe56ff049 100644
--- a/frame/transaction-payment/rpc/Cargo.toml
+++ b/frame/transaction-payment/rpc/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 jsonrpc-core = "15.1.0"
 jsonrpc-core-client = "15.1.0"
 jsonrpc-derive = "15.1.0"
diff --git a/frame/transaction-payment/rpc/runtime-api/Cargo.toml b/frame/transaction-payment/rpc/runtime-api/Cargo.toml
index 64c082b420c9..1a1980a91b31 100644
--- a/frame/transaction-payment/rpc/runtime-api/Cargo.toml
+++ b/frame/transaction-payment/rpc/runtime-api/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 sp-api = { version = "2.0.0", default-features = false, path = "../../../../primitives/api" }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../../../primitives/runtime" }
 pallet-transaction-payment = { version = "2.0.0", default-features = false, path = "../../../transaction-payment" }
 
diff --git a/frame/treasury/Cargo.toml b/frame/treasury/Cargo.toml
index 07b22002ee38..dd3bd9bb1090 100644
--- a/frame/treasury/Cargo.toml
+++ b/frame/treasury/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
diff --git a/frame/utility/Cargo.toml b/frame/utility/Cargo.toml
index ea8dc1ac015c..5b800ab6495f 100644
--- a/frame/utility/Cargo.toml
+++ b/frame/utility/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
diff --git a/frame/vesting/Cargo.toml b/frame/vesting/Cargo.toml
index a15121950155..af48fdace81a 100644
--- a/frame/vesting/Cargo.toml
+++ b/frame/vesting/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 enumflags2 = { version = "0.6.2" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
diff --git a/primitives/api/Cargo.toml b/primitives/api/Cargo.toml
index c1effc523fcb..1a66d460023d 100644
--- a/primitives/api/Cargo.toml
+++ b/primitives/api/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 sp-api-proc-macro = { version = "2.0.0", path = "proc-macro" }
 sp-core = { version = "2.0.0", default-features = false, path = "../core" }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
diff --git a/primitives/api/proc-macro/src/decl_runtime_apis.rs b/primitives/api/proc-macro/src/decl_runtime_apis.rs
index 62ea5ed32b5b..ed5f33ef603e 100644
--- a/primitives/api/proc-macro/src/decl_runtime_apis.rs
+++ b/primitives/api/proc-macro/src/decl_runtime_apis.rs
@@ -194,7 +194,7 @@ fn generate_native_call_generators(decl: &ItemTrait) -> Result<TokenStream> {
 			<R as #crate_::DecodeLimit>::decode_with_depth_limit(
 				#crate_::MAX_EXTRINSIC_DEPTH,
 				&mut &#crate_::Encode::encode(input)[..],
-			).map_err(|e| format!("{} {}", error_desc, e.what()))
+			).map_err(|e| format!("{} {}", error_desc, e))
 		}
 	));
 
diff --git a/primitives/api/proc-macro/src/impl_runtime_apis.rs b/primitives/api/proc-macro/src/impl_runtime_apis.rs
index 8a057383efaa..f8d7c74b9738 100644
--- a/primitives/api/proc-macro/src/impl_runtime_apis.rs
+++ b/primitives/api/proc-macro/src/impl_runtime_apis.rs
@@ -86,7 +86,7 @@ fn generate_impl_call(
 					&#input,
 				) {
 					Ok(res) => res,
-					Err(e) => panic!("Bad input data provided to {}: {}", #fn_name_str, e.what()),
+					Err(e) => panic!("Bad input data provided to {}: {}", #fn_name_str, e),
 				};
 
 			#[allow(deprecated)]
diff --git a/primitives/api/test/Cargo.toml b/primitives/api/test/Cargo.toml
index 310840d1ca9c..458a805c7552 100644
--- a/primitives/api/test/Cargo.toml
+++ b/primitives/api/test/Cargo.toml
@@ -19,7 +19,7 @@ sp-runtime = { version = "2.0.0", path = "../../runtime" }
 sp-blockchain = { version = "2.0.0", path = "../../blockchain" }
 sp-consensus = { version = "0.8.0", path = "../../consensus/common" }
 sc-block-builder = { version = "0.8.0", path = "../../../client/block-builder" }
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 sp-state-machine = { version = "0.8.0", path = "../../state-machine" }
 trybuild = "1.0.38"
 rustversion = "1.0.0"
diff --git a/primitives/application-crypto/Cargo.toml b/primitives/application-crypto/Cargo.toml
index 8791ce4174bb..9709ed9fc18a 100644
--- a/primitives/application-crypto/Cargo.toml
+++ b/primitives/application-crypto/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 sp-core = { version = "2.0.0", default-features = false, path = "../core" }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 sp-io = { version = "2.0.0", default-features = false, path = "../io" }
diff --git a/primitives/arithmetic/Cargo.toml b/primitives/arithmetic/Cargo.toml
index 5f951d8d248d..0e8dd2be5295 100644
--- a/primitives/arithmetic/Cargo.toml
+++ b/primitives/arithmetic/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 integer-sqrt = "0.1.2"
 num-traits = { version = "0.2.8", default-features = false }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
@@ -26,7 +26,7 @@ sp-debug-derive = { version = "2.0.0", default-features = false, path = "../debu
 rand = "0.7.2"
 criterion = "0.3"
 serde_json = "1.0"
-primitive-types = "0.8.0"
+primitive-types = "0.9.0"
 
 [features]
 default = ["std"]
diff --git a/primitives/arithmetic/fuzzer/Cargo.toml b/primitives/arithmetic/fuzzer/Cargo.toml
index 74b9d782ef89..1026db92d06d 100644
--- a/primitives/arithmetic/fuzzer/Cargo.toml
+++ b/primitives/arithmetic/fuzzer/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 sp-arithmetic = { version = "2.0.0", path = ".." }
 honggfuzz = "0.5.49"
-primitive-types = "0.8.0"
+primitive-types = "0.9.0"
 num-bigint = "0.2"
 num-traits = "0.2"
 
diff --git a/primitives/arithmetic/src/per_things.rs b/primitives/arithmetic/src/per_things.rs
index 5c86e55c2f4e..caaa4c33cd43 100644
--- a/primitives/arithmetic/src/per_things.rs
+++ b/primitives/arithmetic/src/per_things.rs
@@ -338,9 +338,9 @@ macro_rules! implement_per_thing {
 			fn encode_as(&self) -> &Self::As {
 				&self.0
 			}
-			fn decode_from(x: Self::As) -> Self {
+			fn decode_from(x: Self::As) -> Result<Self, codec::Error> {
 				// Saturates if `x` is more than `$max` internally.
-				Self::from_parts(x)
+				Ok(Self::from_parts(x))
 			}
 		}
 
diff --git a/primitives/authority-discovery/Cargo.toml b/primitives/authority-discovery/Cargo.toml
index 917f3eb024ae..ff469b22797a 100644
--- a/primitives/authority-discovery/Cargo.toml
+++ b/primitives/authority-discovery/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 sp-application-crypto = { version = "2.0.0", default-features = false, path = "../application-crypto" }
-codec = { package = "parity-scale-codec", default-features = false, version = "1.3.6" }
+codec = { package = "parity-scale-codec", default-features = false, version = "2.0.0" }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 sp-api = { version = "2.0.0", default-features = false, path = "../api" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../runtime" }
diff --git a/primitives/authorship/Cargo.toml b/primitives/authorship/Cargo.toml
index a63f75467ebf..e37994b73a9f 100644
--- a/primitives/authorship/Cargo.toml
+++ b/primitives/authorship/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 sp-inherents = { version = "2.0.0", default-features = false, path = "../inherents" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../runtime" }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 
 [features]
 default = [ "std" ]
diff --git a/primitives/block-builder/Cargo.toml b/primitives/block-builder/Cargo.toml
index 5c6dad5ab767..87246f4d9e67 100644
--- a/primitives/block-builder/Cargo.toml
+++ b/primitives/block-builder/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 sp-runtime = { version = "2.0.0", default-features = false, path = "../runtime" }
 sp-api = { version = "2.0.0", default-features = false, path = "../api" }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 sp-inherents = { version = "2.0.0", default-features = false, path = "../inherents" }
 
 [features]
diff --git a/primitives/blockchain/Cargo.toml b/primitives/blockchain/Cargo.toml
index 7d2d64de85e7..fea84adc819c 100644
--- a/primitives/blockchain/Cargo.toml
+++ b/primitives/blockchain/Cargo.toml
@@ -19,7 +19,7 @@ lru = "0.6.1"
 parking_lot = "0.11.1"
 thiserror = "1.0.21"
 futures = "0.3.9"
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-consensus = { version = "0.8.0", path = "../consensus/common" }
 sp-runtime = { version = "2.0.0", path = "../runtime" }
 sp-state-machine = { version = "0.8.0", path = "../state-machine" }
diff --git a/primitives/consensus/aura/Cargo.toml b/primitives/consensus/aura/Cargo.toml
index 782dd3bfba3e..d587f1d72504 100644
--- a/primitives/consensus/aura/Cargo.toml
+++ b/primitives/consensus/aura/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 sp-application-crypto = { version = "2.0.0", default-features = false, path = "../../application-crypto" }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 sp-std = { version = "2.0.0", default-features = false, path = "../../std" }
 sp-api = { version = "2.0.0", default-features = false, path = "../../api" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../runtime" }
diff --git a/primitives/consensus/aura/src/lib.rs b/primitives/consensus/aura/src/lib.rs
index f3de26da90d3..428a3c2f6f45 100644
--- a/primitives/consensus/aura/src/lib.rs
+++ b/primitives/consensus/aura/src/lib.rs
@@ -71,10 +71,10 @@ pub type AuthorityIndex = u32;
 #[derive(Decode, Encode)]
 pub enum ConsensusLog<AuthorityId: Codec> {
 	/// The authorities have changed.
-	#[codec(index = "1")]
+	#[codec(index = 1)]
 	AuthoritiesChange(Vec<AuthorityId>),
 	/// Disable the authority with given index.
-	#[codec(index = "2")]
+	#[codec(index = 2)]
 	OnDisabled(AuthorityIndex),
 }
 
diff --git a/primitives/consensus/babe/Cargo.toml b/primitives/consensus/babe/Cargo.toml
index 65321d324a69..83f62d8643ca 100644
--- a/primitives/consensus/babe/Cargo.toml
+++ b/primitives/consensus/babe/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 sp-application-crypto = { version = "2.0.0", default-features = false, path = "../../application-crypto" }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 merlin = { version = "2.0", default-features = false }
 sp-std = { version = "2.0.0", default-features = false, path = "../../std" }
 sp-api = { version = "2.0.0", default-features = false, path = "../../api" }
diff --git a/primitives/consensus/babe/src/digests.rs b/primitives/consensus/babe/src/digests.rs
index b5b3f6d2b7a6..5a89e1fbc015 100644
--- a/primitives/consensus/babe/src/digests.rs
+++ b/primitives/consensus/babe/src/digests.rs
@@ -73,13 +73,13 @@ pub struct SecondaryVRFPreDigest {
 #[derive(Clone, RuntimeDebug, Encode, Decode)]
 pub enum PreDigest {
 	/// A primary VRF-based slot assignment.
-	#[codec(index = "1")]
+	#[codec(index = 1)]
 	Primary(PrimaryPreDigest),
 	/// A secondary deterministic slot assignment.
-	#[codec(index = "2")]
+	#[codec(index = 2)]
 	SecondaryPlain(SecondaryPlainPreDigest),
 	/// A secondary deterministic slot assignment with VRF outputs.
-	#[codec(index = "3")]
+	#[codec(index = 3)]
 	SecondaryVRF(SecondaryVRFPreDigest),
 }
 
@@ -137,7 +137,7 @@ pub struct NextEpochDescriptor {
 #[derive(Decode, Encode, PartialEq, Eq, Clone, RuntimeDebug)]
 pub enum NextConfigDescriptor {
 	/// Version 1.
-	#[codec(index = "1")]
+	#[codec(index = 1)]
 	V1 {
 		/// Value of `c` in `BabeEpochConfiguration`.
 		c: (u64, u64),
diff --git a/primitives/consensus/babe/src/lib.rs b/primitives/consensus/babe/src/lib.rs
index 5ab225812734..6987796c114a 100644
--- a/primitives/consensus/babe/src/lib.rs
+++ b/primitives/consensus/babe/src/lib.rs
@@ -125,14 +125,14 @@ pub enum ConsensusLog {
 	/// The epoch has changed. This provides information about the _next_
 	/// epoch - information about the _current_ epoch (i.e. the one we've just
 	/// entered) should already be available earlier in the chain.
-	#[codec(index = "1")]
+	#[codec(index = 1)]
 	NextEpochData(NextEpochDescriptor),
 	/// Disable the authority with given index.
-	#[codec(index = "2")]
+	#[codec(index = 2)]
 	OnDisabled(AuthorityIndex),
 	/// The epoch has changed, and the epoch after the current one will
 	/// enact different epoch configurations.
-	#[codec(index = "3")]
+	#[codec(index = 3)]
 	NextConfigData(NextConfigDescriptor),
 }
 
diff --git a/primitives/consensus/common/Cargo.toml b/primitives/consensus/common/Cargo.toml
index a9d2d92998a6..aa9c14ae94c9 100644
--- a/primitives/consensus/common/Cargo.toml
+++ b/primitives/consensus/common/Cargo.toml
@@ -29,7 +29,7 @@ sp-runtime = { version = "2.0.0", path = "../../runtime" }
 sp-utils = { version = "2.0.0", path = "../../utils" }
 sp-trie = { version = "2.0.0", path = "../../trie" }
 sp-api = { version = "2.0.0", path = "../../api" }
-codec = { package = "parity-scale-codec", version = "1.3.6", features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 parking_lot = "0.11.1"
 serde = { version = "1.0", features = ["derive"] }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.8.0"}
diff --git a/primitives/consensus/pow/Cargo.toml b/primitives/consensus/pow/Cargo.toml
index 15b37d6690ba..e4a7963131b2 100644
--- a/primitives/consensus/pow/Cargo.toml
+++ b/primitives/consensus/pow/Cargo.toml
@@ -17,7 +17,7 @@ sp-api = { version = "2.0.0", default-features = false, path = "../../api" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../std" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../runtime" }
 sp-core = { version = "2.0.0", default-features = false, path = "../../core" }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 
 [features]
 default = ["std"]
diff --git a/primitives/consensus/slots/Cargo.toml b/primitives/consensus/slots/Cargo.toml
index 73841e7eb1ba..f2e036626315 100644
--- a/primitives/consensus/slots/Cargo.toml
+++ b/primitives/consensus/slots/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../runtime" }
 sp-arithmetic = { version = "2.0.0", default-features = false, path = "../../arithmetic" }
 
diff --git a/primitives/consensus/vrf/Cargo.toml b/primitives/consensus/vrf/Cargo.toml
index 58daab488c39..87636d831257 100644
--- a/primitives/consensus/vrf/Cargo.toml
+++ b/primitives/consensus/vrf/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { version = "1.0.0", package = "parity-scale-codec", default-features = false }
+codec = { version = "2.0.0", package = "parity-scale-codec", default-features = false }
 schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated", "u64_backend"], default-features = false }
 sp-std = { version = "2.0.0", path = "../../std", default-features = false }
 sp-core = { version = "2.0.0", path = "../../core", default-features = false }
diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml
index 2b27161b0751..36c980676827 100644
--- a/primitives/core/Cargo.toml
+++ b/primitives/core/Cargo.toml
@@ -14,11 +14,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 log = { version = "0.4.11", default-features = false }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 byteorder = { version = "1.3.2", default-features = false }
-primitive-types = { version = "0.8.0", default-features = false, features = ["codec"] }
+primitive-types = { version = "0.9.0", default-features = false, features = ["codec"] }
 impl-serde = { version = "0.3.0", optional = true }
 wasmi = { version = "0.6.2", optional = true }
 hash-db = { version = "0.15.2", default-features = false }
@@ -36,7 +36,7 @@ parking_lot = { version = "0.11.1", optional = true }
 sp-debug-derive = { version = "2.0.0", path = "../debug-derive" }
 sp-externalities = { version = "0.8.0", optional = true, path = "../externalities" }
 sp-storage = { version = "2.0.0", default-features = false, path = "../storage" }
-parity-util-mem = { version = "0.8.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
 futures = { version = "0.3.1", optional = true }
 dyn-clonable = { version = "0.9.0", optional = true }
 thiserror = { version = "1.0.21", optional = true }
diff --git a/primitives/core/src/sandbox.rs b/primitives/core/src/sandbox.rs
index 330ea7eb92e1..a15a7af41831 100644
--- a/primitives/core/src/sandbox.rs
+++ b/primitives/core/src/sandbox.rs
@@ -31,12 +31,12 @@ pub struct HostError;
 pub enum ExternEntity {
 	/// Function that is specified by an index in a default table of
 	/// a module that creates the sandbox.
-	#[codec(index = "1")]
+	#[codec(index = 1)]
 	Function(u32),
 
 	/// Linear memory that is specified by some identifier returned by sandbox
 	/// module upon creation new sandboxed memory.
-	#[codec(index = "2")]
+	#[codec(index = 2)]
 	Memory(u32),
 }
 
diff --git a/primitives/database/Cargo.toml b/primitives/database/Cargo.toml
index 728396aea74c..2bb53e98085a 100644
--- a/primitives/database/Cargo.toml
+++ b/primitives/database/Cargo.toml
@@ -12,4 +12,4 @@ readme = "README.md"
 
 [dependencies]
 parking_lot = "0.11.1"
-kvdb = "0.8.0"
+kvdb = "0.9.0"
diff --git a/primitives/election-providers/Cargo.toml b/primitives/election-providers/Cargo.toml
index f017a3763720..7210b8f854bd 100644
--- a/primitives/election-providers/Cargo.toml
+++ b/primitives/election-providers/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.1", default-features = false, path = "../std" }
 sp-arithmetic = { version = "2.0.1", default-features = false, path = "../arithmetic" }
 sp-npos-elections = { version = "2.0.1", default-features = false, path = "../npos-elections" }
diff --git a/primitives/externalities/Cargo.toml b/primitives/externalities/Cargo.toml
index f1990e89d757..6586d91808f7 100644
--- a/primitives/externalities/Cargo.toml
+++ b/primitives/externalities/Cargo.toml
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 sp-storage = { version = "2.0.0", path = "../storage", default-features = false }
 sp-std = { version = "2.0.0", path = "../std", default-features = false }
 environmental = { version = "1.1.2", default-features = false }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 
 [features]
 default = ["std"]
diff --git a/primitives/finality-grandpa/Cargo.toml b/primitives/finality-grandpa/Cargo.toml
index f96196bdb190..a9a6d4856109 100644
--- a/primitives/finality-grandpa/Cargo.toml
+++ b/primitives/finality-grandpa/Cargo.toml
@@ -15,8 +15,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
-grandpa = { package = "finality-grandpa", version = "0.12.3", default-features = false, features = ["derive-codec"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+grandpa = { package = "finality-grandpa", version = "0.13.0", default-features = false, features = ["derive-codec"] }
 log = { version = "0.4.8", optional = true }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 sp-api = { version = "2.0.0", default-features = false, path = "../api" }
diff --git a/primitives/finality-grandpa/src/lib.rs b/primitives/finality-grandpa/src/lib.rs
index 5a5468aff560..383e4fe37134 100644
--- a/primitives/finality-grandpa/src/lib.rs
+++ b/primitives/finality-grandpa/src/lib.rs
@@ -102,7 +102,7 @@ pub enum ConsensusLog<N: Codec> {
 	/// This should be a pure function: i.e. as long as the runtime can interpret
 	/// the digest type it should return the same result regardless of the current
 	/// state.
-	#[codec(index = "1")]
+	#[codec(index = 1)]
 	ScheduledChange(ScheduledChange<N>),
 	/// Force an authority set change.
 	///
@@ -118,18 +118,18 @@ pub enum ConsensusLog<N: Codec> {
 	/// This should be a pure function: i.e. as long as the runtime can interpret
 	/// the digest type it should return the same result regardless of the current
 	/// state.
-	#[codec(index = "2")]
+	#[codec(index = 2)]
 	ForcedChange(N, ScheduledChange<N>),
 	/// Note that the authority with given index is disabled until the next change.
-	#[codec(index = "3")]
+	#[codec(index = 3)]
 	OnDisabled(AuthorityIndex),
 	/// A signal to pause the current authority set after the given delay.
 	/// After finalizing the block at _delay_ the authorities should stop voting.
-	#[codec(index = "4")]
+	#[codec(index = 4)]
 	Pause(N),
 	/// A signal to resume the current authority set after the given delay.
 	/// After authoring the block at _delay_ the authorities should resume voting.
-	#[codec(index = "5")]
+	#[codec(index = 5)]
 	Resume(N),
 }
 
diff --git a/primitives/inherents/Cargo.toml b/primitives/inherents/Cargo.toml
index f73bd97bf4b0..e1577a6a1b67 100644
--- a/primitives/inherents/Cargo.toml
+++ b/primitives/inherents/Cargo.toml
@@ -18,7 +18,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 parking_lot = { version = "0.11.1", optional = true }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 sp-core = { version = "2.0.0", default-features = false, path = "../core" }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.21", optional = true }
 
 [features]
diff --git a/primitives/io/Cargo.toml b/primitives/io/Cargo.toml
index 01ea58e87e3e..1f509f7f9f21 100644
--- a/primitives/io/Cargo.toml
+++ b/primitives/io/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 hash-db = { version = "0.15.2", default-features = false }
 sp-core = { version = "2.0.0", default-features = false, path = "../core" }
 sp-keystore = { version = "0.8.0", default-features = false, optional = true, path = "../keystore" }
diff --git a/primitives/keystore/Cargo.toml b/primitives/keystore/Cargo.toml
index 7fb6b4b93fc2..186b569a96b8 100644
--- a/primitives/keystore/Cargo.toml
+++ b/primitives/keystore/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 async-trait = "0.1.30"
 derive_more = "0.99.2"
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 futures = { version = "0.3.1" }
 schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated", "u64_backend"], default-features = false }
 merlin = { version = "2.0", default-features = false }
diff --git a/primitives/npos-elections/Cargo.toml b/primitives/npos-elections/Cargo.toml
index 82ce6b005a95..f9b0c260676b 100644
--- a/primitives/npos-elections/Cargo.toml
+++ b/primitives/npos-elections/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 sp-npos-elections-compact = { version = "2.0.0", path = "./compact" }
diff --git a/primitives/npos-elections/fuzzer/Cargo.toml b/primitives/npos-elections/fuzzer/Cargo.toml
index a1fa4a2f4ca4..690896f0152e 100644
--- a/primitives/npos-elections/fuzzer/Cargo.toml
+++ b/primitives/npos-elections/fuzzer/Cargo.toml
@@ -19,7 +19,7 @@ sp-std = { version = "2.0.0", path = "../../std" }
 sp-runtime = { version = "2.0.0", path = "../../runtime" }
 honggfuzz = "0.5"
 rand = { version = "0.7.3", features = ["std", "small_rng"] }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 
 [[bin]]
 name = "reduce"
diff --git a/primitives/runtime-interface/Cargo.toml b/primitives/runtime-interface/Cargo.toml
index bbf02578848e..bbd33d344fbd 100644
--- a/primitives/runtime-interface/Cargo.toml
+++ b/primitives/runtime-interface/Cargo.toml
@@ -19,9 +19,9 @@ sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 sp-tracing = { version = "2.0.0", default-features = false, path = "../tracing" }
 sp-runtime-interface-proc-macro = { version = "2.0.0", path = "proc-macro" }
 sp-externalities = { version = "0.8.0", optional = true, path = "../externalities" }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 static_assertions = "1.0.0"
-primitive-types = { version = "0.8.0", default-features = false }
+primitive-types = { version = "0.9.0", default-features = false }
 sp-storage = { version = "2.0.0", default-features = false, path = "../storage" }
 impl-trait-for-tuples = "0.2.0"
 
diff --git a/primitives/runtime-interface/src/pass_by.rs b/primitives/runtime-interface/src/pass_by.rs
index e2a9b4ed4274..69485a1a2873 100644
--- a/primitives/runtime-interface/src/pass_by.rs
+++ b/primitives/runtime-interface/src/pass_by.rs
@@ -238,7 +238,7 @@ impl<T: codec::Codec> PassByImpl<T> for Codec<T> {
 		let (ptr, len) = unpack_ptr_and_len(arg);
 		let vec = context.read_memory(Pointer::new(ptr), len)?;
 		T::decode(&mut &vec[..])
-			.map_err(|e| format!("Could not decode value from wasm: {}", e.what()))
+			.map_err(|e| format!("Could not decode value from wasm: {}", e))
 	}
 }
 
diff --git a/primitives/runtime/Cargo.toml b/primitives/runtime/Cargo.toml
index 9ce6a95c0c87..6d35fbd35227 100644
--- a/primitives/runtime/Cargo.toml
+++ b/primitives/runtime/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-core = { version = "2.0.0", default-features = false, path = "../core" }
 sp-application-crypto = { version = "2.0.0", default-features = false, path = "../application-crypto" }
 sp-arithmetic = { version = "2.0.0", default-features = false, path = "../arithmetic" }
@@ -26,7 +26,7 @@ log = { version = "0.4.8", optional = true }
 paste = "0.1.6"
 rand = { version = "0.7.2", optional = true }
 impl-trait-for-tuples = "0.2.0"
-parity-util-mem = { version = "0.8.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
 hash256-std-hasher = { version = "0.15.2", default-features = false }
 either = { version = "1.5", default-features = false }
 
diff --git a/primitives/runtime/src/generic/era.rs b/primitives/runtime/src/generic/era.rs
index 381c34ef419d..5bee170048b5 100644
--- a/primitives/runtime/src/generic/era.rs
+++ b/primitives/runtime/src/generic/era.rs
@@ -107,13 +107,13 @@ impl Era {
 }
 
 impl Encode for Era {
-	fn encode_to<T: Output>(&self, output: &mut T) {
+	fn encode_to<T: Output + ?Sized>(&self, output: &mut T) {
 		match self {
 			Era::Immortal => output.push_byte(0),
 			Era::Mortal(period, phase) => {
 				let quantize_factor = (*period as u64 >> 12).max(1);
 				let encoded = (period.trailing_zeros() - 1).max(1).min(15) as u16 | ((phase / quantize_factor) << 4) as u16;
-				output.push(&encoded);
+				encoded.encode_to(output);
 			}
 		}
 	}
diff --git a/primitives/runtime/src/generic/header.rs b/primitives/runtime/src/generic/header.rs
index 09f473e7d819..62f9908fbe58 100644
--- a/primitives/runtime/src/generic/header.rs
+++ b/primitives/runtime/src/generic/header.rs
@@ -106,12 +106,12 @@ impl<Number, Hash> Encode for Header<Number, Hash> where
 	Hash: HashT,
 	Hash::Output: Encode,
 {
-	fn encode_to<T: Output>(&self, dest: &mut T) {
-		dest.push(&self.parent_hash);
-		dest.push(&<<<Number as HasCompact>::Type as EncodeAsRef<_>>::RefType>::from(&self.number));
-		dest.push(&self.state_root);
-		dest.push(&self.extrinsics_root);
-		dest.push(&self.digest);
+	fn encode_to<T: Output + ?Sized>(&self, dest: &mut T) {
+		self.parent_hash.encode_to(dest);
+		<<<Number as HasCompact>::Type as EncodeAsRef<_>>::RefType>::from(&self.number).encode_to(dest);
+		self.state_root.encode_to(dest);
+		self.extrinsics_root.encode_to(dest);
+		self.digest.encode_to(dest);
 	}
 }
 
diff --git a/primitives/runtime/src/testing.rs b/primitives/runtime/src/testing.rs
index 3e72c25af9e9..b6d2641f0108 100644
--- a/primitives/runtime/src/testing.rs
+++ b/primitives/runtime/src/testing.rs
@@ -247,7 +247,7 @@ impl<'a, Xt> Deserialize<'a> for Block<Xt> where Block<Xt>: Decode {
 	fn deserialize<D: Deserializer<'a>>(de: D) -> Result<Self, D::Error> {
 		let r = <Vec<u8>>::deserialize(de)?;
 		Decode::decode(&mut &r[..])
-			.map_err(|e| DeError::custom(format!("Invalid value passed into decode: {}", e.what())))
+			.map_err(|e| DeError::custom(format!("Invalid value passed into decode: {}", e)))
 	}
 }
 
diff --git a/primitives/sandbox/Cargo.toml b/primitives/sandbox/Cargo.toml
index 5ec8c203b54d..44b52c388143 100755
--- a/primitives/sandbox/Cargo.toml
+++ b/primitives/sandbox/Cargo.toml
@@ -18,7 +18,7 @@ sp-core = { version = "2.0.0", default-features = false, path = "../core" }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 sp-io = { version = "2.0.0", default-features = false, path = "../io" }
 sp-wasm-interface = { version = "2.0.0", default-features = false, path = "../wasm-interface" }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 
 [dev-dependencies]
 wat = "1.0"
diff --git a/primitives/session/Cargo.toml b/primitives/session/Cargo.toml
index d47a8062ef1a..5b83e88c44fa 100644
--- a/primitives/session/Cargo.toml
+++ b/primitives/session/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-api = { version = "2.0.0", default-features = false, path = "../api" }
 sp-core = { version = "2.0.0", default-features = false, path = "../core" }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
diff --git a/primitives/staking/Cargo.toml b/primitives/staking/Cargo.toml
index fbe4b30f00b8..f8203c130d47 100644
--- a/primitives/staking/Cargo.toml
+++ b/primitives/staking/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../runtime" }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 
diff --git a/primitives/state-machine/Cargo.toml b/primitives/state-machine/Cargo.toml
index c594c27fc7a2..0c1a2a558f25 100644
--- a/primitives/state-machine/Cargo.toml
+++ b/primitives/state-machine/Cargo.toml
@@ -23,7 +23,7 @@ trie-root = { version = "0.16.0", default-features = false }
 sp-trie = { version = "2.0.0", path = "../trie", default-features = false }
 sp-core = { version = "2.0.0", path = "../core", default-features = false }
 sp-panic-handler = { version = "2.0.0", path = "../panic-handler", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 num-traits = { version = "0.2.8", default-features = false }
 rand = { version = "0.7.2", optional = true }
 sp-externalities = { version = "0.8.0", path = "../externalities", default-features = false }
diff --git a/primitives/state-machine/src/changes_trie/input.rs b/primitives/state-machine/src/changes_trie/input.rs
index 3702eefb9964..85a8de0b78d8 100644
--- a/primitives/state-machine/src/changes_trie/input.rs
+++ b/primitives/state-machine/src/changes_trie/input.rs
@@ -123,7 +123,7 @@ impl<Number: BlockNumber> ExtrinsicIndex<Number> {
 }
 
 impl<Number: BlockNumber> Encode for ExtrinsicIndex<Number> {
-	fn encode_to<W: Output>(&self, dest: &mut W) {
+	fn encode_to<W: Output + ?Sized>(&self, dest: &mut W) {
 		dest.push_byte(1);
 		self.block.encode_to(dest);
 		self.key.encode_to(dest);
@@ -142,7 +142,7 @@ impl<Number: BlockNumber> DigestIndex<Number> {
 
 
 impl<Number: BlockNumber> Encode for DigestIndex<Number> {
-	fn encode_to<W: Output>(&self, dest: &mut W) {
+	fn encode_to<W: Output + ?Sized>(&self, dest: &mut W) {
 		dest.push_byte(2);
 		self.block.encode_to(dest);
 		self.key.encode_to(dest);
@@ -158,7 +158,7 @@ impl<Number: BlockNumber> ChildIndex<Number> {
 }
 
 impl<Number: BlockNumber> Encode for ChildIndex<Number> {
-	fn encode_to<W: Output>(&self, dest: &mut W) {
+	fn encode_to<W: Output + ?Sized>(&self, dest: &mut W) {
 		dest.push_byte(3);
 		self.block.encode_to(dest);
 		self.storage_key.encode_to(dest);
diff --git a/primitives/storage/Cargo.toml b/primitives/storage/Cargo.toml
index b025b5a10671..88580efb164e 100644
--- a/primitives/storage/Cargo.toml
+++ b/primitives/storage/Cargo.toml
@@ -19,7 +19,7 @@ serde = { version = "1.0.101", optional = true, features = ["derive"] }
 impl-serde = { version = "0.3.1", optional = true }
 ref-cast = "1.0.0"
 sp-debug-derive = { version = "2.0.0", path = "../debug-derive" }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 
 [features]
 default = [ "std" ]
diff --git a/primitives/tasks/Cargo.toml b/primitives/tasks/Cargo.toml
index 7ad5e6dd5139..1a655082a1e9 100644
--- a/primitives/tasks/Cargo.toml
+++ b/primitives/tasks/Cargo.toml
@@ -22,7 +22,7 @@ sp-runtime-interface = { version = "2.0.0", default-features = false, path = "..
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 
 [dev-dependencies]
-codec = { package = "parity-scale-codec", default-features = false, version = "1.3.6" }
+codec = { package = "parity-scale-codec", default-features = false, version = "2.0.0" }
 
 [features]
 default = ["std"]
diff --git a/primitives/test-primitives/Cargo.toml b/primitives/test-primitives/Cargo.toml
index 1bfb793610b6..0cd36afd950b 100644
--- a/primitives/test-primitives/Cargo.toml
+++ b/primitives/test-primitives/Cargo.toml
@@ -13,11 +13,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 sp-application-crypto = { version = "2.0.0", default-features = false, path = "../application-crypto" }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-core = { version = "2.0.0", default-features = false, path = "../core" }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../runtime" }
-parity-util-mem = { version = "0.8.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
 
 [features]
 default = [
diff --git a/primitives/timestamp/Cargo.toml b/primitives/timestamp/Cargo.toml
index de1271b0dd02..dc9f1fae9256 100644
--- a/primitives/timestamp/Cargo.toml
+++ b/primitives/timestamp/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 sp-api = { version = "2.0.0", default-features = false, path = "../api" }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../runtime" }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-inherents = { version = "2.0.0", default-features = false, path = "../inherents" }
 impl-trait-for-tuples = "0.2.0"
 wasm-timer = { version = "0.2", optional = true }
diff --git a/primitives/tracing/Cargo.toml b/primitives/tracing/Cargo.toml
index 31527b204963..909641ca1270 100644
--- a/primitives/tracing/Cargo.toml
+++ b/primitives/tracing/Cargo.toml
@@ -19,7 +19,7 @@ targets = ["x86_64-unknown-linux-gnu", "wasm32-unknown-unknown"]
 
 [dependencies]
 sp-std = { version = "2.0.0", path = "../std", default-features = false}
-codec = { version = "1.3.1", package = "parity-scale-codec", default-features = false, features = ["derive"]}
+codec = { version = "2.0.0", package = "parity-scale-codec", default-features = false, features = ["derive"]}
 tracing = { version = "0.1.22", default-features = false }
 tracing-core = { version = "0.1.17", default-features = false }
 log = { version = "0.4.8", optional = true }
diff --git a/primitives/transaction-pool/Cargo.toml b/primitives/transaction-pool/Cargo.toml
index 675987e3a127..6454ff509fda 100644
--- a/primitives/transaction-pool/Cargo.toml
+++ b/primitives/transaction-pool/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 thiserror = { version = "1.0.21", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.6", optional = true }
+codec = { package = "parity-scale-codec", version = "2.0.0", optional = true }
 derive_more = { version = "0.99.11", optional = true }
 futures = { version = "0.3.1", optional = true }
 log = { version = "0.4.8", optional = true }
diff --git a/primitives/trie/Cargo.toml b/primitives/trie/Cargo.toml
index 4392f01d222a..c7f80480a321 100644
--- a/primitives/trie/Cargo.toml
+++ b/primitives/trie/Cargo.toml
@@ -18,16 +18,16 @@ name = "bench"
 harness = false
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 hash-db = { version = "0.15.2", default-features = false }
 trie-db = { version = "0.22.2", default-features = false }
 trie-root = { version = "0.16.0", default-features = false }
-memory-db = { version = "0.25.0", default-features = false }
+memory-db = { version = "0.26.0", default-features = false }
 sp-core = { version = "2.0.0", default-features = false, path = "../core" }
 
 [dev-dependencies]
-trie-bench = "0.26.0"
+trie-bench = "0.27.0"
 trie-standardmap = "0.15.2"
 criterion = "0.3.3"
 hex-literal = "0.3.1"
diff --git a/primitives/trie/src/error.rs b/primitives/trie/src/error.rs
index 453f74afeb81..8e1d9b974ffd 100644
--- a/primitives/trie/src/error.rs
+++ b/primitives/trie/src/error.rs
@@ -49,7 +49,7 @@ impl StdError for Error {
 impl fmt::Display for Error {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		match self {
-			Error::Decode(e) => write!(f, "Decode error: {}", e.what()),
+			Error::Decode(e) => write!(f, "Decode error: {}", e),
 			Error::BadFormat => write!(f, "Bad format"),
 		}
 	}
diff --git a/primitives/trie/src/node_header.rs b/primitives/trie/src/node_header.rs
index 14a998903d69..0fdf6fefbd0b 100644
--- a/primitives/trie/src/node_header.rs
+++ b/primitives/trie/src/node_header.rs
@@ -38,7 +38,7 @@ pub(crate) enum NodeKind {
 }
 
 impl Encode for NodeHeader {
-	fn encode_to<T: Output>(&self, output: &mut T) {
+	fn encode_to<T: Output + ?Sized>(&self, output: &mut T) {
 		match self {
 			NodeHeader::Null => output.push_byte(trie_constants::EMPTY_TRIE),
 			NodeHeader::Branch(true, nibble_count)	=>
@@ -99,7 +99,7 @@ pub(crate) fn size_and_prefix_iterator(size: usize, prefix: u8) -> impl Iterator
 }
 
 /// Encodes size and prefix to a stream output.
-fn encode_size_and_prefix(size: usize, prefix: u8, out: &mut impl Output) {
+fn encode_size_and_prefix<W: Output + ?Sized>(size: usize, prefix: u8, out: &mut W) {
 	for b in size_and_prefix_iterator(size, prefix) {
 		out.push_byte(b)
 	}
diff --git a/primitives/version/Cargo.toml b/primitives/version/Cargo.toml
index 113639434d5b..0c38e8a74184 100644
--- a/primitives/version/Cargo.toml
+++ b/primitives/version/Cargo.toml
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 impl-serde = { version = "0.3.1", optional = true }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../runtime" }
 
diff --git a/primitives/wasm-interface/Cargo.toml b/primitives/wasm-interface/Cargo.toml
index 32c283a8527f..21d2fc4f214a 100644
--- a/primitives/wasm-interface/Cargo.toml
+++ b/primitives/wasm-interface/Cargo.toml
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 wasmi = { version = "0.6.2", optional = true }
 impl-trait-for-tuples = "0.2.0"
 sp-std = { version = "2.0.0", path = "../std", default-features = false }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 
 [features]
 default = [ "std" ]
diff --git a/test-utils/client/Cargo.toml b/test-utils/client/Cargo.toml
index fad66c5a6708..0b5fba78c114 100644
--- a/test-utils/client/Cargo.toml
+++ b/test-utils/client/Cargo.toml
@@ -12,7 +12,7 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 futures = "0.3.9"
 futures01 = { package = "futures", version = "0.1.29" }
 hash-db = "0.15.2"
diff --git a/test-utils/runtime/Cargo.toml b/test-utils/runtime/Cargo.toml
index c99ec9a05e7c..b4a860403d46 100644
--- a/test-utils/runtime/Cargo.toml
+++ b/test-utils/runtime/Cargo.toml
@@ -17,11 +17,11 @@ sp-application-crypto = { version = "2.0.0", default-features = false, path = ".
 sp-consensus-aura = { version = "0.8.0", default-features = false, path = "../../primitives/consensus/aura" }
 sp-consensus-babe = { version = "0.8.0", default-features = false, path = "../../primitives/consensus/babe" }
 sp-block-builder = { version = "2.0.0", default-features = false, path = "../../primitives/block-builder" }
-codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 frame-executive = { version = "2.0.0", default-features = false, path = "../../frame/executive" }
 sp-inherents = { version = "2.0.0", default-features = false, path = "../../primitives/inherents" }
 sp-keyring = { version = "2.0.0", optional = true, path = "../../primitives/keyring" }
-memory-db = { version = "0.25.0", default-features = false }
+memory-db = { version = "0.26.0", default-features = false }
 sp-offchain = { path = "../../primitives/offchain", default-features = false, version = "2.0.0"}
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
@@ -40,7 +40,7 @@ sp-finality-grandpa = { version = "2.0.0", default-features = false, path = "../
 sp-trie = { version = "2.0.0", default-features = false, path = "../../primitives/trie" }
 sp-transaction-pool = { version = "2.0.0", default-features = false, path = "../../primitives/transaction-pool" }
 trie-db = { version = "0.22.2", default-features = false }
-parity-util-mem = { version = "0.8.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
 sc-service = { version = "0.8.0", default-features = false, optional = true, features = ["test-helpers"], path = "../../client/service" }
 sp-state-machine = { version = "0.8.0", default-features = false, path = "../../primitives/state-machine" }
 sp-externalities = { version = "0.8.0", default-features = false, path = "../../primitives/externalities" }
diff --git a/test-utils/runtime/client/Cargo.toml b/test-utils/runtime/client/Cargo.toml
index 2540e29c8b0e..9a6a4fb60b07 100644
--- a/test-utils/runtime/client/Cargo.toml
+++ b/test-utils/runtime/client/Cargo.toml
@@ -21,7 +21,7 @@ substrate-test-runtime = { version = "2.0.0", path = "../../runtime" }
 sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
 sp-api = { version = "2.0.0", path = "../../../primitives/api" }
 sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 sc-client-api = { version = "2.0.0", path = "../../../client/api" }
 sc-consensus = { version = "0.8.0", path = "../../../client/consensus/common" }
 sc-service = { version = "0.8.0", default-features = false, path = "../../../client/service" }
diff --git a/test-utils/runtime/transaction-pool/Cargo.toml b/test-utils/runtime/transaction-pool/Cargo.toml
index 7fbea1e3c0ed..1e254a4c2450 100644
--- a/test-utils/runtime/transaction-pool/Cargo.toml
+++ b/test-utils/runtime/transaction-pool/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 substrate-test-runtime-client = { version = "2.0.0", path = "../client" }
 parking_lot = "0.11.1"
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
 sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
 sp-transaction-pool = { version = "2.0.0", path = "../../../primitives/transaction-pool" }
diff --git a/utils/browser/Cargo.toml b/utils/browser/Cargo.toml
index 3137c2698ec3..26688610af19 100644
--- a/utils/browser/Cargo.toml
+++ b/utils/browser/Cargo.toml
@@ -21,7 +21,7 @@ console_error_panic_hook = "0.1.6"
 js-sys = "0.3.34"
 wasm-bindgen = "0.2.57"
 wasm-bindgen-futures = "0.4.18"
-kvdb-web = "0.8.0"
+kvdb-web = "0.9.0"
 sp-database = { version = "2.0.0", path = "../../primitives/database" }
 sc-informant = { version = "0.8.0", path = "../../client/informant" }
 sc-service = { version = "0.8.0", path = "../../client/service", default-features = false }
diff --git a/utils/fork-tree/Cargo.toml b/utils/fork-tree/Cargo.toml
index 292d1a83b7e5..73dc3aa1e6bd 100644
--- a/utils/fork-tree/Cargo.toml
+++ b/utils/fork-tree/Cargo.toml
@@ -14,4 +14,4 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.6", features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
diff --git a/utils/frame/benchmarking-cli/Cargo.toml b/utils/frame/benchmarking-cli/Cargo.toml
index 717224f787f5..2e951e1e828c 100644
--- a/utils/frame/benchmarking-cli/Cargo.toml
+++ b/utils/frame/benchmarking-cli/Cargo.toml
@@ -23,7 +23,7 @@ sp-externalities = { version = "0.8.0", path = "../../../primitives/externalitie
 sp-keystore = { version = "0.8.0", path = "../../../primitives/keystore" }
 sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
 sp-state-machine = { version = "0.8.0", path = "../../../primitives/state-machine" }
-codec = { version = "1.3.1", package = "parity-scale-codec" }
+codec = { version = "2.0.0", package = "parity-scale-codec" }
 structopt = "0.3.8"
 chrono = "0.4"
 serde = "1.0.116"
diff --git a/utils/frame/rpc/support/Cargo.toml b/utils/frame/rpc/support/Cargo.toml
index b9ee76b846e0..a9c55132e240 100644
--- a/utils/frame/rpc/support/Cargo.toml
+++ b/utils/frame/rpc/support/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 futures = { version = "0.3.0", features = ["compat"] }
 jsonrpc-client-transports = { version = "15.1.0", default-features = false, features = ["http"] }
 jsonrpc-core = "15.1.0"
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 serde = "1"
 frame-support = { version = "2.0.0", path = "../../../../frame/support" }
 sp-storage = { version = "2.0.0", path = "../../../../primitives/storage" }
diff --git a/utils/frame/rpc/system/Cargo.toml b/utils/frame/rpc/system/Cargo.toml
index 03016462cbea..5a75d01c4d47 100644
--- a/utils/frame/rpc/system/Cargo.toml
+++ b/utils/frame/rpc/system/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 sc-client-api = { version = "2.0.0", path = "../../../../client/api" }
-codec = { package = "parity-scale-codec", version = "1.3.6" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 futures = { version = "0.3.4", features = ["compat"] }
 jsonrpc-core = "15.1.0"
 jsonrpc-core-client = "15.1.0"

From caff191bc1bfa48688037c6024ee3a2a1cbeb084 Mon Sep 17 00:00:00 2001
From: Amar Singh <asinghchrony@protonmail.com>
Date: Fri, 29 Jan 2021 07:40:46 -0800
Subject: [PATCH 0337/1194] Test is_inherent_required (#8002)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ()

* master.into()

* Update frame/support/src/inherent.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* address comment

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 frame/support/src/inherent.rs | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/frame/support/src/inherent.rs b/frame/support/src/inherent.rs
index 430075d603f2..3c201dff29c2 100644
--- a/frame/support/src/inherent.rs
+++ b/frame/support/src/inherent.rs
@@ -218,6 +218,10 @@ mod tests {
 		fn create_inherent(_: &InherentData) -> Option<Self::Call> {
 			Some(CallTest2::Something)
 		}
+
+		fn is_inherent_required(_: &InherentData) -> Result<Option<Self::Error>, Self::Error> { 
+			Ok(Some(().into()))
+		}
 	}
 
 	type Block = testing::Block<Extrinsic>;
@@ -260,14 +264,30 @@ mod tests {
 	fn check_inherents_works() {
 		let block = Block::new(
 			Header::new_from_number(1),
-			vec![Extrinsic { function: Call::Test(CallTest::Something) }],
+			vec![
+				Extrinsic { function: Call::Test2(CallTest2::Something) },
+				Extrinsic { function: Call::Test(CallTest::Something) },
+			],
 		);
 
 		assert!(InherentData::new().check_extrinsics(&block).ok());
 
 		let block = Block::new(
 			Header::new_from_number(1),
-			vec![Extrinsic { function: Call::Test(CallTest::SomethingElse) }],
+			vec![
+				Extrinsic { function: Call::Test2(CallTest2::Something) },
+				Extrinsic { function: Call::Test(CallTest::SomethingElse) },
+			],
+		);
+
+		assert!(InherentData::new().check_extrinsics(&block).fatal_error());
+	}
+
+	#[test]
+	fn required_inherents_enforced() {
+		let block = Block::new(
+			Header::new_from_number(1),
+			vec![Extrinsic { function: Call::Test(CallTest::Something) }],
 		);
 
 		assert!(InherentData::new().check_extrinsics(&block).fatal_error());

From 965950969f3fca2d9e225e4988afbc0a6b851a56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Fri, 29 Jan 2021 17:29:25 +0100
Subject: [PATCH 0338/1194] Sync: Fix issue of not freeing a block announcement
 slot (#8006)

* Sync: Fix issue of not freeing a block announcement slot

There was a bug that when the block announcement validation returned an
error, the slot reserved for this validation wasn't freed. This could
lead to a situation where we rejected any block announcement from such a
peer for that the block announcement returned an error multiple times.

* Better logging

* Fuck I'm dumb

* :facepalm:
---
 client/network/src/protocol/sync.rs           | 56 +++++++++++++++----
 client/network/test/src/sync.rs               | 38 +++++++++++++
 .../consensus/common/src/block_validation.rs  |  4 ++
 3 files changed, 87 insertions(+), 11 deletions(-)

diff --git a/client/network/src/protocol/sync.rs b/client/network/src/protocol/sync.rs
index 03d5b6434828..35f840152217 100644
--- a/client/network/src/protocol/sync.rs
+++ b/client/network/src/protocol/sync.rs
@@ -400,7 +400,18 @@ enum PreValidateBlockAnnounce<H> {
 		/// The announcement.
 		announce: BlockAnnounce<H>,
 	},
+	/// The announcement validation returned an error.
+	///
+	/// An error means that *this* node failed to validate it because some internal error happened.
+	/// If the block announcement was invalid, [`Self::Failure`] is the correct variant to express
+	/// this.
+	Error {
+		who: PeerId,
+	},
 	/// The block announcement should be skipped.
+	///
+	/// This should *only* be returned when there wasn't a slot registered
+	/// for this block announcement validation.
 	Skip,
 }
 
@@ -1223,6 +1234,11 @@ impl<B: BlockT> ChainSync<B> {
 	/// is capped.
 	///
 	/// Returns [`HasSlotForBlockAnnounceValidation`] to inform about the result.
+	///
+	/// # Note
+	///
+	/// It is *required* to call [`Self::peer_block_announce_validation_finished`] when the
+	/// validation is finished to clear the slot.
 	fn has_slot_for_block_announce_validation(&mut self, peer: &PeerId) -> HasSlotForBlockAnnounceValidation {
 		if self.block_announce_validation.len() >= MAX_CONCURRENT_BLOCK_ANNOUNCE_VALIDATIONS {
 			return HasSlotForBlockAnnounceValidation::TotalMaximumSlotsReached
@@ -1324,15 +1340,20 @@ impl<B: BlockT> ChainSync<B> {
 				Ok(Validation::Failure { disconnect }) => {
 					debug!(
 						target: "sync",
-						"Block announcement validation of block {} from {} failed",
+						"Block announcement validation of block {:?} from {} failed",
 						hash,
 						who,
 					);
 					PreValidateBlockAnnounce::Failure { who, disconnect }
 				}
 				Err(e) => {
-					error!(target: "sync", "💔 Block announcement validation errored: {}", e);
-					PreValidateBlockAnnounce::Skip
+					error!(
+						target: "sync",
+						"💔 Block announcement validation of block {:?} errored: {}",
+						hash,
+						e,
+					);
+					PreValidateBlockAnnounce::Error { who }
 				}
 			}
 		}.boxed());
@@ -1352,14 +1373,27 @@ impl<B: BlockT> ChainSync<B> {
 		cx: &mut std::task::Context,
 	) -> Poll<PollBlockAnnounceValidation<B::Header>> {
 		match self.block_announce_validation.poll_next_unpin(cx) {
-			Poll::Ready(Some(res)) => Poll::Ready(self.finish_block_announce_validation(res)),
+			Poll::Ready(Some(res)) => {
+				self.peer_block_announce_validation_finished(&res);
+				Poll::Ready(self.finish_block_announce_validation(res))
+			},
 			_ => Poll::Pending,
 		}
 	}
 
-	/// Should be called when a block announce validation was finished, to update the stats
-	/// of the given peer.
-	fn peer_block_announce_validation_finished(&mut self, peer: &PeerId) {
+	/// Should be called when a block announce validation is finished, to update the slots
+	/// of the peer that send the block announce.
+	fn peer_block_announce_validation_finished(
+		&mut self,
+		res: &PreValidateBlockAnnounce<B::Header>,
+	) {
+		let peer = match res {
+			PreValidateBlockAnnounce::Failure { who, .. } |
+			PreValidateBlockAnnounce::Process { who, .. } |
+			PreValidateBlockAnnounce::Error { who } => who,
+			PreValidateBlockAnnounce::Skip => return,
+		};
+
 		match self.block_announce_validation_per_peer_stats.entry(peer.clone()) {
 			Entry::Vacant(_) => {
 				error!(
@@ -1369,7 +1403,8 @@ impl<B: BlockT> ChainSync<B> {
 				);
 			},
 			Entry::Occupied(mut entry) => {
-				if entry.get_mut().saturating_sub(1) == 0 {
+				*entry.get_mut() = entry.get().saturating_sub(1);
+				if *entry.get() == 0 {
 					entry.remove();
 				}
 			}
@@ -1389,14 +1424,13 @@ impl<B: BlockT> ChainSync<B> {
 
 		let (announce, is_best, who) = match pre_validation_result {
 			PreValidateBlockAnnounce::Failure { who, disconnect } => {
-				self.peer_block_announce_validation_finished(&who);
 				return PollBlockAnnounceValidation::Failure { who, disconnect }
 			},
 			PreValidateBlockAnnounce::Process { announce, is_new_best, who } => {
-				self.peer_block_announce_validation_finished(&who);
 				(announce, is_new_best, who)
 			},
-			PreValidateBlockAnnounce::Skip => return PollBlockAnnounceValidation::Skip,
+			PreValidateBlockAnnounce::Error { .. } | PreValidateBlockAnnounce::Skip =>
+				return PollBlockAnnounceValidation::Skip,
 		};
 
 		let number = *announce.header.number();
diff --git a/client/network/test/src/sync.rs b/client/network/test/src/sync.rs
index 582634fea209..46fbb8f82d47 100644
--- a/client/network/test/src/sync.rs
+++ b/client/network/test/src/sync.rs
@@ -897,3 +897,41 @@ fn block_announce_data_is_propagated() {
 		net.block_until_idle();
 	}
 }
+
+#[test]
+fn continue_to_sync_after_some_block_announcement_verifications_failed() {
+	struct TestBlockAnnounceValidator;
+
+	impl BlockAnnounceValidator<Block> for TestBlockAnnounceValidator {
+		fn validate(
+			&mut self,
+			header: &Header,
+			_: &[u8],
+		) -> Pin<Box<dyn Future<Output = Result<Validation, Box<dyn std::error::Error + Send>>> + Send>> {
+			let number = *header.number();
+			async move {
+				if number < 100 {
+					Err(Box::<dyn std::error::Error + Send + Sync>::from(String::from("error")) as Box<_>)
+				} else {
+					Ok(Validation::Success { is_new_best: false })
+				}
+			}.boxed()
+		}
+	}
+
+	sp_tracing::try_init_simple();
+	let mut net = TestNet::new(1);
+
+	net.add_full_peer_with_config(FullPeerConfig {
+		block_announce_validator: Some(Box::new(TestBlockAnnounceValidator)),
+		..Default::default()
+	});
+
+	net.block_until_connected();
+	net.block_until_idle();
+
+	let block_hash = net.peer(0).push_blocks(500, true);
+
+	net.block_until_sync();
+	assert!(net.peer(1).has_block(&block_hash));
+}
diff --git a/primitives/consensus/common/src/block_validation.rs b/primitives/consensus/common/src/block_validation.rs
index 8ae832ad27ca..fb0846fe9901 100644
--- a/primitives/consensus/common/src/block_validation.rs
+++ b/primitives/consensus/common/src/block_validation.rs
@@ -59,6 +59,10 @@ pub trait BlockAnnounceValidator<B: Block> {
 	///
 	/// Returning [`Validation::Failure`] will lead to a decrease of the
 	/// peers reputation as it sent us invalid data.
+	///
+	/// The returned future should only resolve to an error iff there was an internal error validating
+	/// the block announcement. If the block announcement itself is invalid, this should *always*
+	/// return [`Validation::Failure`].
 	fn validate(
 		&mut self,
 		header: &B::Header,

From a45e3f20f6e999e5516070feccd442eb005c2cce Mon Sep 17 00:00:00 2001
From: Denis Pisarev <denis.pisarev@parity.io>
Date: Fri, 29 Jan 2021 19:07:26 +0100
Subject: [PATCH 0339/1194] CI: return flaming fir deployment (#8007)

* CI: return flaming-fir deployment jobs

* CI: no need in manual jobs; 'updated image'
---
 .gitlab-ci.yml                 | 35 ++++++++++++++++++++++++++++++++++
 .maintain/flamingfir-deploy.sh | 35 ++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100755 .maintain/flamingfir-deploy.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b643489d9009..de1655c39d59 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -653,6 +653,41 @@ trigger-simnet:
     branch:                        master
     strategy:                      depend
 
+.validator-deploy:                 &validator-deploy
+  stage:                           deploy
+  rules:
+    # this job runs only on nightly pipeline with the mentioned variable, against `master` branch
+    - if: $CI_COMMIT_REF_NAME == "master" && $CI_PIPELINE_SOURCE == "schedule" && $PIPELINE == "nightly"
+  needs:
+    # script will fail if there is no artifacts/substrate/VERSION
+    - job:                         publish-docker-substrate
+      artifacts:                   true
+  image:                           parity/azure-ansible:v2
+  allow_failure:                   true
+  interruptible:                   true
+  tags:
+    - linux-docker
+
+validator 1 4:
+  <<:                              *validator-deploy
+  script:
+    - ./.maintain/flamingfir-deploy.sh flamingfir-validator1
+
+validator 2 4:
+  <<:                              *validator-deploy
+  script:
+    - ./.maintain/flamingfir-deploy.sh flamingfir-validator2
+
+validator 3 4:
+  <<:                              *validator-deploy
+  script:
+    - ./.maintain/flamingfir-deploy.sh flamingfir-validator3
+
+validator 4 4:
+  <<:                              *validator-deploy
+  script:
+    - ./.maintain/flamingfir-deploy.sh flamingfir-validator4
+
 #### stage:                        .post
 
 check-labels:
diff --git a/.maintain/flamingfir-deploy.sh b/.maintain/flamingfir-deploy.sh
new file mode 100755
index 000000000000..8f0fb3a2bc01
--- /dev/null
+++ b/.maintain/flamingfir-deploy.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+RETRY_COUNT=10
+RETRY_ATTEMPT=0
+SLEEP_TIME=15
+TARGET_HOST="$1"
+COMMIT=$(cat artifacts/substrate/VERSION)
+DOWNLOAD_URL="https://releases.parity.io/substrate/x86_64-debian:stretch/${COMMIT}/substrate/substrate"
+POST_DATA='{"extra_vars":{"artifact_path":"'${DOWNLOAD_URL}'","target_host":"'${TARGET_HOST}'"}}'
+
+JOB_ID=$(wget -O - --header "Authorization: Bearer ${AWX_TOKEN}" --header "Content-type: application/json" --post-data "${POST_DATA}" https://ansible-awx.parity.io/api/v2/job_templates/32/launch/ | jq .job)
+
+echo "Launched job: $JOB_ID"
+
+
+while [ ${RETRY_ATTEMPT} -le ${RETRY_COUNT} ] ; do
+	export RETRY_RESULT=$(wget -O - --header "Authorization: Bearer ${AWX_TOKEN}"  https://ansible-awx.parity.io/api/v2/jobs/${JOB_ID}/ | jq .status)
+	RETRY_ATTEMPT=$(( $RETRY_ATTEMPT +1 ))
+	sleep $SLEEP_TIME
+	if [ $(echo $RETRY_RESULT | egrep  -e successful -e failed) ] ; then
+            break
+        fi
+done
+
+AWX_OUTPUT=$(wget -O - --header "Authorization: Bearer ${AWX_TOKEN}"  https://ansible-awx.parity.io/api/v2/jobs/${JOB_ID}/stdout?format=txt_download)
+
+echo "AWX job log:"
+echo "${AWX_OUTPUT}"
+
+
+JOB_STATUS=$(wget -O - --header "Authorization: Bearer ${AWX_TOKEN}"  https://ansible-awx.parity.io/api/v2/jobs/${JOB_ID}/ | jq .status )
+
+echo "==================================="
+echo -e "Ansible AWX Remote Job: ${JOB_ID} \x1B[31mStatus: ${JOB_STATUS}\x1B[0m"
+echo "==================================="

From 30ec0bedf7b902b10188e9da8650c688aad23e1f Mon Sep 17 00:00:00 2001
From: yjh <465402634@qq.com>
Date: Mon, 1 Feb 2021 18:54:13 +0800
Subject: [PATCH 0340/1194] chore: fix typos (#8013)

---
 frame/contracts/src/chain_extension.rs                |  2 +-
 frame/contracts/src/lib.rs                            |  6 +++---
 frame/contracts/src/storage.rs                        |  2 +-
 frame/contracts/src/tests.rs                          | 10 +++++-----
 primitives/state-machine/src/overlayed_changes/mod.rs |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/frame/contracts/src/chain_extension.rs b/frame/contracts/src/chain_extension.rs
index 662cfb2053e6..c664b82fe64c 100644
--- a/frame/contracts/src/chain_extension.rs
+++ b/frame/contracts/src/chain_extension.rs
@@ -88,7 +88,7 @@ pub trait ChainExtension {
 	///
 	/// # Return
 	///
-	/// In case of `Err` the contract execution is immediatly suspended and the passed error
+	/// In case of `Err` the contract execution is immediately suspended and the passed error
 	/// is returned to the caller. Otherwise the value of [`RetVal`] determines the exit
 	/// behaviour.
 	fn call<E: Ext>(func_id: u32, env: Environment<E, InitState>) -> Result<RetVal>
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index d585ac4f7fab..43566bc547c4 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -667,7 +667,7 @@ where
 	/// This function is similar to `Self::call`, but doesn't perform any address lookups and better
 	/// suitable for calling directly from Rust.
 	///
-	/// It returns the exection result and the amount of used weight.
+	/// It returns the execution result and the amount of used weight.
 	pub fn bare_call(
 		origin: T::AccountId,
 		dest: T::AccountId,
@@ -711,9 +711,9 @@ where
 
 	/// Determine the address of a contract,
 	///
-	/// This is the address generation function used by contract instantation. Its result
+	/// This is the address generation function used by contract instantiation. Its result
 	/// is only dependend on its inputs. It can therefore be used to reliably predict the
-	/// address of a contract. This is akin to the formular of eth's CRATE2 opcode. There
+	/// address of a contract. This is akin to the formular of eth's CREATE2 opcode. There
 	/// is no CREATE equivalent because CREATE2 is strictly more powerful.
 	///
 	/// Formula: `hash(deploying_address ++ code_hash ++ salt)`
diff --git a/frame/contracts/src/storage.rs b/frame/contracts/src/storage.rs
index 030f62fc4088..5259b2a47126 100644
--- a/frame/contracts/src/storage.rs
+++ b/frame/contracts/src/storage.rs
@@ -178,7 +178,7 @@ where
 					deduct_block:
 						// We want to charge rent for the first block in advance. Therefore we
 						// treat the contract as if it was created in the last block and then
-						// charge rent for it during instantation.
+						// charge rent for it during instantiation.
 						<frame_system::Module<T>>::block_number().saturating_sub(1u32.into()),
 					rent_allowance: <BalanceOf<T>>::max_value(),
 					rent_payed: <BalanceOf<T>>::zero(),
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index 96bcf99bf8e8..a2916ff833b4 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -549,7 +549,7 @@ fn deposit_event_max_value_limit() {
 			));
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
-			// The instantation deducted the rent for one block immediatly
+			// The instantiation deducted the rent for one block immediately
 			let first_rent = <Test as Config>::RentFraction::get()
 				// base_deposit - free_balance
 				.mul_ceil(80_000 - 30_000)
@@ -812,7 +812,7 @@ fn deduct_blocks() {
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 			ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
 
-			// The instantation deducted the rent for one block immediatly
+			// The instantiation deducted the rent for one block immediately
 			let rent0 = <Test as Config>::RentFraction::get()
 				// base_deposit + deploy_set_storage (4 bytes in 1 item) - free_balance
 				.mul_ceil(80_000 + 40_000 + 10_000 - 30_000)
@@ -1173,7 +1173,7 @@ fn default_rent_allowance_on_instantiate() {
 			));
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
-			// The instantation deducted the rent for one block immediatly
+			// The instantiation deducted the rent for one block immediately
 			let first_rent = <Test as Config>::RentFraction::get()
 				// base_deposit - free_balance
 				.mul_ceil(80_000 - 30_000)
@@ -2501,7 +2501,7 @@ fn deletion_queue_full() {
 fn not_deployed_if_endowment_too_low_for_first_rent() {
 	let (wasm, code_hash) = compile_module::<Test>("set_rent").unwrap();
 
-	// The instantation deducted the rent for one block immediatly
+	// The instantiation deducted the rent for one block immediately
 	let first_rent = <Test as Config>::RentFraction::get()
 		// base_deposit + deploy_set_storage (4 bytes in 1 item) - free_balance
 		.mul_ceil(80_000u32 + 40_000 + 10_000 - 30_000)
@@ -2546,7 +2546,7 @@ fn surcharge_reward_is_capped() {
 		let balance = Balances::free_balance(&ALICE);
 		let reward = <Test as Config>::SurchargeReward::get();
 
-		// some rent should have payed due to instantation
+		// some rent should have payed due to instantiation
 		assert_ne!(contract.rent_payed, 0);
 
 		// the reward should be parameterized sufficiently high to make this test useful
diff --git a/primitives/state-machine/src/overlayed_changes/mod.rs b/primitives/state-machine/src/overlayed_changes/mod.rs
index b529c0ebfaee..285bf2a73a14 100644
--- a/primitives/state-machine/src/overlayed_changes/mod.rs
+++ b/primitives/state-machine/src/overlayed_changes/mod.rs
@@ -370,7 +370,7 @@ impl OverlayedChanges {
 	/// transaction was open. Any transaction must be closed by either `rollback_transaction` or
 	/// `commit_transaction` before this overlay can be converted into storage changes.
 	///
-	/// Changes made without any open transaction are committed immediatly.
+	/// Changes made without any open transaction are committed immediately.
 	pub fn start_transaction(&mut self) {
 		self.top.start_transaction();
 		for (_, (changeset, _)) in self.children.iter_mut() {

From 017a9a06b44c191d98ab76ccd4e021aea2d16e79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Mon, 1 Feb 2021 15:54:21 +0100
Subject: [PATCH 0341/1194] Fix tracing spans are not being forwarded to
 spawned task (#8009)

* Fix tracing spans are not being forwarded to spawned task

There is a bug that tracing spans are not forwarded to spawned task. The
problem was that only the telemetry span was forwarded. The solution to
this is to use the tracing provided `in_current_span` to capture the
current active span and pass the telemetry span explictely. We will now
always enter the span when the future is polled. This is essentially the
same strategy as tracing is doing with its `Instrumented`, but now
extended for our use case with having multiple spans active.

* More tests
---
 Cargo.lock                               | 47 ++++++------
 client/service/Cargo.toml                |  3 +-
 client/service/src/task_manager/mod.rs   | 42 ++++++++--
 client/service/src/task_manager/tests.rs | 98 +++++++++++++++++++++++-
 4 files changed, 158 insertions(+), 32 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a68f014e98ea..d8f52aa141a9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2105,7 +2105,7 @@ dependencies = [
  "http 0.2.1",
  "indexmap",
  "slab",
- "tokio 0.2.23",
+ "tokio 0.2.25",
  "tokio-util",
  "tracing",
  "tracing-futures",
@@ -2346,7 +2346,7 @@ dependencies = [
  "itoa",
  "pin-project 1.0.2",
  "socket2",
- "tokio 0.2.23",
+ "tokio 0.2.25",
  "tower-service",
  "tracing",
  "want 0.3.0",
@@ -2365,7 +2365,7 @@ dependencies = [
  "log",
  "rustls 0.18.1",
  "rustls-native-certs",
- "tokio 0.2.23",
+ "tokio 0.2.25",
  "tokio-rustls",
  "webpki",
 ]
@@ -3499,9 +3499,9 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.6.22"
+version = "0.6.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430"
+checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4"
 dependencies = [
  "cfg-if 0.1.10",
  "fuchsia-zircon",
@@ -3510,7 +3510,7 @@ dependencies = [
  "kernel32-sys",
  "libc",
  "log",
- "miow 0.2.1",
+ "miow 0.2.2",
  "net2",
  "slab",
  "winapi 0.2.8",
@@ -3553,9 +3553,9 @@ dependencies = [
 
 [[package]]
 name = "miow"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
+checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d"
 dependencies = [
  "kernel32-sys",
  "net2",
@@ -3665,9 +3665,9 @@ dependencies = [
 
 [[package]]
 name = "net2"
-version = "0.2.35"
+version = "0.2.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ebc3ec692ed7c9a255596c67808dee269f64655d8baf7b4f0638e51ba1d6853"
+checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
 dependencies = [
  "cfg-if 0.1.10",
  "libc",
@@ -6535,7 +6535,7 @@ dependencies = [
  "tempfile",
  "thiserror",
  "tiny-bip39",
- "tokio 0.2.23",
+ "tokio 0.2.25",
 ]
 
 [[package]]
@@ -6791,7 +6791,7 @@ dependencies = [
  "substrate-test-runtime-client",
  "substrate-test-runtime-transaction-pool",
  "tempfile",
- "tokio 0.2.23",
+ "tokio 0.2.25",
 ]
 
 [[package]]
@@ -6986,7 +6986,7 @@ dependencies = [
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
  "tempfile",
- "tokio 0.2.23",
+ "tokio 0.2.25",
 ]
 
 [[package]]
@@ -7230,7 +7230,7 @@ dependencies = [
  "sp-utils",
  "substrate-test-runtime-client",
  "threadpool",
- "tokio 0.2.23",
+ "tokio 0.2.25",
 ]
 
 [[package]]
@@ -7413,9 +7413,10 @@ dependencies = [
  "substrate-test-runtime-client",
  "tempfile",
  "thiserror",
- "tokio 0.2.23",
+ "tokio 0.2.25",
  "tracing",
  "tracing-futures",
+ "tracing-subscriber",
  "wasm-timer",
 ]
 
@@ -8922,7 +8923,7 @@ dependencies = [
  "sc-rpc-api",
  "serde",
  "sp-storage",
- "tokio 0.2.23",
+ "tokio 0.2.25",
 ]
 
 [[package]]
@@ -8960,7 +8961,7 @@ dependencies = [
  "hyper 0.13.9",
  "log",
  "prometheus",
- "tokio 0.2.23",
+ "tokio 0.2.25",
 ]
 
 [[package]]
@@ -9075,7 +9076,7 @@ dependencies = [
  "futures 0.3.9",
  "sc-service",
  "substrate-test-utils-derive",
- "tokio 0.2.23",
+ "tokio 0.2.25",
  "trybuild",
 ]
 
@@ -9094,7 +9095,7 @@ version = "0.1.0"
 dependencies = [
  "sc-service",
  "substrate-test-utils",
- "tokio 0.2.23",
+ "tokio 0.2.25",
 ]
 
 [[package]]
@@ -9323,9 +9324,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "0.2.23"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6d7ad61edd59bfcc7e80dababf0f4aed2e6d5e0ba1659356ae889752dfc12ff"
+checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
@@ -9459,7 +9460,7 @@ checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a"
 dependencies = [
  "futures-core",
  "rustls 0.18.1",
- "tokio 0.2.23",
+ "tokio 0.2.25",
  "webpki",
 ]
 
@@ -9569,7 +9570,7 @@ dependencies = [
  "futures-sink",
  "log",
  "pin-project-lite 0.1.11",
- "tokio 0.2.23",
+ "tokio 0.2.25",
 ]
 
 [[package]]
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index 10caca86e621..78c5f94baf66 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -89,5 +89,6 @@ substrate-test-runtime = { version = "2.0.0", path = "../../test-utils/runtime/"
 sp-consensus-babe = { version = "0.8.0", path = "../../primitives/consensus/babe" }
 grandpa = { version = "0.8.0", package = "sc-finality-grandpa", path = "../finality-grandpa" }
 grandpa-primitives = { version = "2.0.0", package = "sp-finality-grandpa", path = "../../primitives/finality-grandpa" }
-tokio = { version = "0.2", default-features = false }
+tokio = { version = "0.2.25", default-features = false }
 async-std = { version = "1.6.5", default-features = false }
+tracing-subscriber = "0.2.15"
diff --git a/client/service/src/task_manager/mod.rs b/client/service/src/task_manager/mod.rs
index 6b14fbeec2c6..9a1fd15952e1 100644
--- a/client/service/src/task_manager/mod.rs
+++ b/client/service/src/task_manager/mod.rs
@@ -24,7 +24,7 @@ use log::{debug, error};
 use futures::{
 	Future, FutureExt, StreamExt,
 	future::{select, Either, BoxFuture, join_all, try_join_all, pending},
-	sink::SinkExt,
+	sink::SinkExt, task::{Context, Poll},
 };
 use prometheus_endpoint::{
 	exponential_buckets, register,
@@ -40,6 +40,37 @@ mod prometheus_future;
 #[cfg(test)]
 mod tests;
 
+/// A wrapper around a `[Option<TelemetrySpan>]` and a [`Future`].
+///
+/// The telemetry in Substrate uses a span to identify the telemetry context. The span "infrastructure"
+/// is provided by the tracing-crate. Now it is possible to have your own spans as well. To support
+/// this with the [`TaskManager`] we have this wrapper. This wrapper enters the telemetry span every
+/// time the future is polled and polls the inner future. So, the inner future can still have its
+/// own span attached and we get our telemetry span ;)
+struct WithTelemetrySpan<T> {
+	span: Option<TelemetrySpan>,
+	inner: T,
+}
+
+impl<T> WithTelemetrySpan<T> {
+	fn new(span: Option<TelemetrySpan>, inner: T) -> Self {
+		Self {
+			span,
+			inner,
+		}
+	}
+}
+
+impl<T: Future<Output = ()> + Unpin> Future for WithTelemetrySpan<T> {
+	type Output = ();
+
+	fn poll(mut self: Pin<&mut Self>, ctx: &mut Context) -> Poll<Self::Output> {
+		let span = self.span.clone();
+		let _enter = span.as_ref().map(|s| s.enter());
+		Pin::new(&mut self.inner).poll(ctx)
+	}
+}
+
 /// An handle for spawning tasks in the service.
 #[derive(Clone)]
 pub struct SpawnTaskHandle {
@@ -124,10 +155,11 @@ impl SpawnTaskHandle {
 			}
 		};
 
-		let join_handle = {
-			let _span = self.telemetry_span.as_ref().map(|s| s.enter());
-			self.executor.spawn(Box::pin(future.in_current_span()), task_type)
-		};
+		let future = future.in_current_span().boxed();
+		let join_handle = self.executor.spawn(
+			WithTelemetrySpan::new(self.telemetry_span.clone(), future).boxed(),
+			task_type,
+		);
 
 		let mut task_notifier = self.task_notifier.clone();
 		self.executor.spawn(
diff --git a/client/service/src/task_manager/tests.rs b/client/service/src/task_manager/tests.rs
index f0ede1fc389a..257f7db19870 100644
--- a/client/service/src/task_manager/tests.rs
+++ b/client/service/src/task_manager/tests.rs
@@ -20,9 +20,10 @@ use crate::config::TaskExecutor;
 use crate::task_manager::TaskManager;
 use futures::{future::FutureExt, pin_mut, select};
 use parking_lot::Mutex;
-use std::any::Any;
-use std::sync::Arc;
-use std::time::Duration;
+use std::{any::Any, sync::Arc, time::Duration};
+use tracing_subscriber::{layer::{SubscriberExt, Context}, Layer};
+use tracing::{subscriber::Subscriber, span::{Attributes, Id, Record, Span}, event::Event};
+use sc_telemetry::TelemetrySpan;
 
 #[derive(Clone, Debug)]
 struct DropTester(Arc<Mutex<usize>>);
@@ -312,3 +313,94 @@ fn ensure_task_manager_future_continues_when_childs_not_essential_task_fails() {
 	runtime.block_on(task_manager.clean_shutdown());
 	assert_eq!(drop_tester, 0);
 }
+
+struct TestLayer {
+	spans_entered: Arc<Mutex<Vec<String>>>,
+	spans: Arc<Mutex<std::collections::HashMap<Id, String>>>,
+}
+
+impl<S: Subscriber> Layer<S> for TestLayer {
+	fn new_span(&self, attrs: &Attributes<'_>, id: &Id, _ctx: Context<S>) {
+		self.spans.lock().insert(id.clone(), attrs.metadata().name().to_string());
+	}
+
+	fn on_record(&self, _: &Id, _: &Record<'_>, _: Context<S>) {}
+
+	fn on_event(&self, _: &Event<'_>, _: Context<S>) {}
+
+	fn on_enter(&self, span: &Id, _: Context<S>) {
+		let name = self.spans.lock().get(span).unwrap().clone();
+		self.spans_entered.lock().push(name);
+	}
+
+	fn on_exit(&self, _: &Id, _: Context<S>) {}
+
+	fn on_close(&self, _: Id, _: Context<S>) {}
+}
+
+type TestSubscriber = tracing_subscriber::layer::Layered<
+	TestLayer,
+	tracing_subscriber::fmt::Subscriber
+>;
+
+fn setup_subscriber() -> (
+	TestSubscriber,
+	Arc<Mutex<Vec<String>>>,
+) {
+	let spans_entered = Arc::new(Mutex::new(Default::default()));
+	let layer = TestLayer {
+		spans: Arc::new(Mutex::new(Default::default())),
+		spans_entered: spans_entered.clone(),
+	};
+	let subscriber = tracing_subscriber::fmt().finish().with(layer);
+	(subscriber, spans_entered)
+}
+
+#[test]
+fn telemetry_span_is_forwarded_to_task() {
+	let (subscriber, spans_entered) = setup_subscriber();
+	let _sub_guard = tracing::subscriber::set_global_default(subscriber);
+
+	let telemetry_span = TelemetrySpan::new();
+
+	let span = tracing::info_span!("test");
+	let _enter = span.enter();
+
+	let mut runtime = tokio::runtime::Runtime::new().unwrap();
+	let handle = runtime.handle().clone();
+	let task_executor = TaskExecutor::from(move |fut, _| handle.spawn(fut).map(|_| ()));
+	let task_manager = TaskManager::new(task_executor, None, Some(telemetry_span.clone())).unwrap();
+
+	let (sender, receiver) = futures::channel::oneshot::channel();
+	let spawn_handle = task_manager.spawn_handle();
+
+	let span = span.clone();
+	task_manager.spawn_handle().spawn(
+		"test",
+		async move {
+			assert_eq!(span, Span::current());
+			spawn_handle.spawn("test-nested", async move {
+				assert_eq!(span, Span::current());
+				sender.send(()).unwrap();
+			}.boxed());
+		}.boxed(),
+	);
+
+	// We need to leave exit the span here. If tokio is not running with multithreading, this
+	// would lead to duplicate spans being "active" and forwarding the wrong one.
+	drop(_enter);
+	runtime.block_on(receiver).unwrap();
+	runtime.block_on(task_manager.clean_shutdown());
+	drop(runtime);
+
+	let spans = spans_entered.lock();
+	// We entered the telemetry span and the "test" in the future, the nested future and
+	// the "test" span outside of the future. So, we should have recorded 3 spans.
+	assert_eq!(5, spans.len());
+
+	assert_eq!(spans[0], "test");
+	assert_eq!(spans[1], telemetry_span.span().metadata().unwrap().name());
+	assert_eq!(spans[2], "test");
+	assert_eq!(spans[3], telemetry_span.span().metadata().unwrap().name());
+	assert_eq!(spans[4], "test");
+}

From 043cb0a4bfc574c59021a90d84f268bc44280201 Mon Sep 17 00:00:00 2001
From: Alexander Popiak <alexander.popiak@parity.io>
Date: Mon, 1 Feb 2021 16:55:44 +0100
Subject: [PATCH 0342/1194] make AllModules public (#8017)

* make AllModules public

* add doc comments for AllModules
---
 frame/support/procedural/src/construct_runtime/mod.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/frame/support/procedural/src/construct_runtime/mod.rs b/frame/support/procedural/src/construct_runtime/mod.rs
index 705c2cfcb44c..abd68e4425d8 100644
--- a/frame/support/procedural/src/construct_runtime/mod.rs
+++ b/frame/support/procedural/src/construct_runtime/mod.rs
@@ -470,8 +470,11 @@ fn decl_all_modules<'a>(
 
 	quote!(
 		#types
-		type AllModules = ( #all_modules );
-		type AllModulesWithSystem = ( #all_modules_with_system );
+		/// All pallets included in the runtime as a nested tuple of types.
+		/// Excludes the System pallet.
+		pub type AllModules = ( #all_modules );
+		/// All pallets included in the runtime as a nested tuple of types.
+		pub type AllModulesWithSystem = ( #all_modules_with_system );
 	)
 }
 

From 5a5f06e8b6e68ba8431ba68aa9935a29b566ce64 Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Mon, 1 Feb 2021 16:59:47 +0100
Subject: [PATCH 0343/1194] client/network: Use request response for light
 client requests (#7895)

* client/network: Re-enable light_client_handler.rs unit tests

* client/network: Add scaffolding for light client using req-resp

* client/network: Make it compile

* client/network: Rename OutEvent SendRequest

* client/network: Restructure light client request client and handler

* client/network: Rename light client request client to sender

* client/network: Remove light client prepare_request

* client/network/src/light: Rework configuration

* client/network: Formatting

* client/network/light: Remove RequestId

* client/network/light: Make request functions methods

* client/network/light: Refactor request wrapping

* client/network/light: Fix warnings

* client/network/light: Serialize request in method

* client/network/light: Make returning response a method

* client/network/light: Depend on request response to timeout requests

* client/network: Fix test compilation

* client/network/light: Re-enable connection test

* client/network/light: Re-enable timeout test

* client/network/light: Re-enable incorrect_response test

* client/network/light: Re-enable wrong_response_type test

* client/network/light: Re-enable retry_count_failures test

* client/network/light: Re-enable issue_request tests

* client/network/light: Re-enable send_receive tests

* client/network/light: Deduplicate test logic

* client/network/light: Remove unused imports

* client/network/light: Handle request failure

* client/network/light: Move generate_protocol_config

* client/network: Fix test compilation

* client/network: Rename light client request client to sender

* client/network: Handle too-many-requests error

* client/network: Update outdated comments

* client/network/light: Choose any peer if none has best block defined

* .maintain: Replace sentry-node with local-docker-test-network

Sentry nodes are deprecated. Thus there is no need for
`.maintain/sentry-node` to spin up a sentry node test environment.
Instead this commit rewrites the setup to contain two full-connected
validators and one light client.

With the steps below one can now spin up a local test network with
two validators, one light-client, Prometheus and Grafana.

- cargo build --release
- sudo docker-compose -f .maintain/local-docker-test-network/docker-compose.yml up

* client/network/light: Handle oneshot cancellation

* client/network/light: Do not reduce retry count on missing peer

* client/network/request-response: Assert in debug request id to be unique

* client/network/light: Choose same limit as block request protocol

* client/network: Report reputation changes via response

Allow request response protocol handlers to issue reputation changes, by
sending them back along with the response payload.

* client/network: Remove resolved TODOs
---
 client/network/src/behaviour.rs               |   62 +-
 client/network/src/block_request_handler.rs   |   41 +-
 client/network/src/config.rs                  |    8 +
 client/network/src/gossip/tests.rs            |   13 +-
 client/network/src/lib.rs                     |    2 +-
 client/network/src/light_client_handler.rs    | 2061 -----------------
 client/network/src/light_client_requests.rs   |  334 +++
 .../src/light_client_requests/handler.rs      |  399 ++++
 .../src/light_client_requests/sender.rs       | 1343 +++++++++++
 client/network/src/on_demand_layer.rs         |   20 +-
 client/network/src/request_responses.rs       |    3 +-
 client/network/src/service.rs                 |   34 +-
 client/network/src/service/tests.rs           |   13 +-
 client/network/test/src/lib.rs                |   17 +-
 client/service/src/builder.rs                 |   21 +-
 15 files changed, 2235 insertions(+), 2136 deletions(-)
 delete mode 100644 client/network/src/light_client_handler.rs
 create mode 100644 client/network/src/light_client_requests.rs
 create mode 100644 client/network/src/light_client_requests/handler.rs
 create mode 100644 client/network/src/light_client_requests/sender.rs

diff --git a/client/network/src/behaviour.rs b/client/network/src/behaviour.rs
index 7b1a35354c91..a34f6e0960c4 100644
--- a/client/network/src/behaviour.rs
+++ b/client/network/src/behaviour.rs
@@ -17,14 +17,15 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{
-	config::{ProtocolId, Role}, light_client_handler, peer_info, request_responses,
+	config::{ProtocolId, Role},
 	discovery::{DiscoveryBehaviour, DiscoveryConfig, DiscoveryOut},
 	protocol::{message::Roles, CustomMessageOutcome, NotificationsSink, Protocol},
+	peer_info, request_responses, light_client_requests,
 	ObservedRole, DhtEvent, ExHashT,
 };
 
 use bytes::Bytes;
-use futures::channel::oneshot;
+use futures::{channel::oneshot, stream::StreamExt};
 use libp2p::NetworkBehaviour;
 use libp2p::core::{Multiaddr, PeerId, PublicKey};
 use libp2p::identify::IdentifyInfo;
@@ -59,8 +60,6 @@ pub struct Behaviour<B: BlockT, H: ExHashT> {
 	discovery: DiscoveryBehaviour,
 	/// Generic request-reponse protocols.
 	request_responses: request_responses::RequestResponsesBehaviour,
-	/// Light client request handling.
-	light_client_handler: light_client_handler::LightClientHandler<B>,
 
 	/// Queue of events to produce for the outside.
 	#[behaviour(ignore)]
@@ -70,6 +69,10 @@ pub struct Behaviour<B: BlockT, H: ExHashT> {
 	#[behaviour(ignore)]
 	role: Role,
 
+	/// Light client request handling.
+	#[behaviour(ignore)]
+	light_client_request_sender: light_client_requests::sender::LightClientRequestSender<B>,
+
 	/// Protocol name used to send out block requests via
 	/// [`request_responses::RequestResponsesBehaviour`].
 	#[behaviour(ignore)]
@@ -174,10 +177,10 @@ impl<B: BlockT, H: ExHashT> Behaviour<B, H> {
 		role: Role,
 		user_agent: String,
 		local_public_key: PublicKey,
-		light_client_handler: light_client_handler::LightClientHandler<B>,
+		light_client_request_sender: light_client_requests::sender::LightClientRequestSender<B>,
 		disco_config: DiscoveryConfig,
-		// Block request protocol config.
 		block_request_protocol_config: request_responses::ProtocolConfig,
+		light_client_request_protocol_config: request_responses::ProtocolConfig,
 		// All remaining request protocol configs.
 		mut request_response_protocols: Vec<request_responses::ProtocolConfig>,
 	) -> Result<Self, request_responses::RegisterError> {
@@ -185,13 +188,15 @@ impl<B: BlockT, H: ExHashT> Behaviour<B, H> {
 		let block_request_protocol_name = block_request_protocol_config.name.to_string();
 		request_response_protocols.push(block_request_protocol_config);
 
+		request_response_protocols.push(light_client_request_protocol_config);
+
 		Ok(Behaviour {
 			substrate,
 			peer_info: peer_info::PeerInfoBehaviour::new(user_agent, local_public_key),
 			discovery: disco_config.finish(),
 			request_responses:
 				request_responses::RequestResponsesBehaviour::new(request_response_protocols.into_iter())?,
-			light_client_handler,
+			light_client_request_sender,
 			events: VecDeque::new(),
 			role,
 
@@ -268,8 +273,11 @@ impl<B: BlockT, H: ExHashT> Behaviour<B, H> {
 	}
 
 	/// Issue a light client request.
-	pub fn light_client_request(&mut self, r: light_client_handler::Request<B>) -> Result<(), light_client_handler::Error> {
-		self.light_client_handler.request(r)
+	pub fn light_client_request(
+		&mut self,
+		r: light_client_requests::sender::Request<B>,
+	) -> Result<(), light_client_requests::sender::SendRequestError> {
+		self.light_client_request_sender.request(r)
 	}
 }
 
@@ -289,13 +297,6 @@ fn reported_roles_to_observed_role(local_role: &Role, remote: &PeerId, roles: Ro
 	}
 }
 
-impl<B: BlockT, H: ExHashT> NetworkBehaviourEventProcess<void::Void> for
-Behaviour<B, H> {
-	fn inject_event(&mut self, event: void::Void) {
-		void::unreachable(event)
-	}
-}
-
 impl<B: BlockT, H: ExHashT> NetworkBehaviourEventProcess<CustomMessageOutcome<B>> for
 Behaviour<B, H> {
 	fn inject_event(&mut self, event: CustomMessageOutcome<B>) {
@@ -343,12 +344,16 @@ Behaviour<B, H> {
 				self.events.push_back(BehaviourOut::NotificationsReceived { remote, messages });
 			},
 			CustomMessageOutcome::PeerNewBest(peer_id, number) => {
-				self.light_client_handler.update_best_block(&peer_id, number);
+				self.light_client_request_sender.update_best_block(&peer_id, number);
+			}
+			CustomMessageOutcome::SyncConnected(peer_id) => {
+				self.light_client_request_sender.inject_connected(peer_id);
+				self.events.push_back(BehaviourOut::SyncConnected(peer_id))
+			}
+			CustomMessageOutcome::SyncDisconnected(peer_id) => {
+				self.light_client_request_sender.inject_disconnected(peer_id);
+				self.events.push_back(BehaviourOut::SyncDisconnected(peer_id))
 			}
-			CustomMessageOutcome::SyncConnected(peer_id) =>
-				self.events.push_back(BehaviourOut::SyncConnected(peer_id)),
-			CustomMessageOutcome::SyncDisconnected(peer_id) =>
-				self.events.push_back(BehaviourOut::SyncDisconnected(peer_id)),
 			CustomMessageOutcome::None => {}
 		}
 	}
@@ -443,7 +448,20 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviourEventProcess<DiscoveryOut>
 }
 
 impl<B: BlockT, H: ExHashT> Behaviour<B, H> {
-	fn poll<TEv>(&mut self, _: &mut Context, _: &mut impl PollParameters) -> Poll<NetworkBehaviourAction<TEv, BehaviourOut<B>>> {
+	fn poll<TEv>(
+		&mut self,
+		cx: &mut Context,
+		_: &mut impl PollParameters,
+	) -> Poll<NetworkBehaviourAction<TEv, BehaviourOut<B>>> {
+		use light_client_requests::sender::OutEvent;
+		while let Poll::Ready(Some(event)) = self.light_client_request_sender.poll_next_unpin(cx) {
+			match event {
+				OutEvent::SendRequest { target, request, pending_response, protocol_name } => {
+					self.request_responses.send_request(&target, &protocol_name, request, pending_response)
+				}
+			}
+		}
+
 		if let Some(event) = self.events.pop_front() {
 			return Poll::Ready(NetworkBehaviourAction::GenerateEvent(event))
 		}
diff --git a/client/network/src/block_request_handler.rs b/client/network/src/block_request_handler.rs
index 1a6c09eff130..92f21f44f9d1 100644
--- a/client/network/src/block_request_handler.rs
+++ b/client/network/src/block_request_handler.rs
@@ -39,7 +39,7 @@ const MAX_BLOCKS_IN_RESPONSE: usize = 128;
 const MAX_BODY_BYTES: usize = 8 * 1024 * 1024;
 
 /// Generates a [`ProtocolConfig`] for the block request protocol, refusing incoming requests.
-pub fn generate_protocol_config(protocol_id: ProtocolId) -> ProtocolConfig {
+pub fn generate_protocol_config(protocol_id: &ProtocolId) -> ProtocolConfig {
 	ProtocolConfig {
 		name: generate_protocol_name(protocol_id).into(),
 		max_request_size: 1024 * 1024,
@@ -50,7 +50,10 @@ pub fn generate_protocol_config(protocol_id: ProtocolId) -> ProtocolConfig {
 }
 
 /// Generate the block protocol name from chain specific protocol identifier.
-fn generate_protocol_name(protocol_id: ProtocolId) -> String {
+//
+// Visibility `pub(crate)` to allow `crate::light_client_requests::sender` to generate block request
+// protocol name and send block requests.
+pub(crate) fn generate_protocol_name(protocol_id: &ProtocolId) -> String {
 	let mut s = String::new();
 	s.push_str("/");
 	s.push_str(protocol_id.as_ref());
@@ -66,7 +69,7 @@ pub struct BlockRequestHandler<B> {
 
 impl <B: BlockT> BlockRequestHandler<B> {
 	/// Create a new [`BlockRequestHandler`].
-	pub fn new(protocol_id: ProtocolId, client: Arc<dyn Client<B>>) -> (Self, ProtocolConfig) {
+	pub fn new(protocol_id: &ProtocolId, client: Arc<dyn Client<B>>) -> (Self, ProtocolConfig) {
 		// Rate of arrival multiplied with the waiting time in the queue equals the queue length.
 		//
 		// An average Polkadot sentry node serves less than 5 requests per second. The 95th percentile
@@ -82,6 +85,22 @@ impl <B: BlockT> BlockRequestHandler<B> {
 		(Self { client, request_receiver }, protocol_config)
 	}
 
+	/// Run [`BlockRequestHandler`].
+	pub async fn run(mut self) {
+		while let Some(request) = self.request_receiver.next().await {
+			let IncomingRequest { peer, payload, pending_response } = request;
+
+			match self.handle_request(payload, pending_response) {
+				Ok(()) => debug!(target: LOG_TARGET, "Handled block request from {}.", peer),
+				Err(e) => debug!(
+					target: LOG_TARGET,
+					"Failed to handle block request from {}: {}",
+					peer, e,
+				),
+			}
+		}
+	}
+
 	fn handle_request(
 		&self,
 		payload: Vec<u8>,
@@ -186,22 +205,6 @@ impl <B: BlockT> BlockRequestHandler<B> {
 			reputation_changes: Vec::new(),
 		}).map_err(|_| HandleRequestError::SendResponse)
 	}
-
-	/// Run [`BlockRequestHandler`].
-	pub async fn run(mut self) {
-		while let Some(request) = self.request_receiver.next().await {
-			let IncomingRequest { peer, payload, pending_response } = request;
-
-			match self.handle_request(payload, pending_response) {
-				Ok(()) => debug!(target: LOG_TARGET, "Handled block request from {}.", peer),
-				Err(e) => debug!(
-					target: LOG_TARGET,
-					"Failed to handle block request from {}: {}",
-					peer, e,
-				),
-			}
-		}
-	}
 }
 
 #[derive(derive_more::Display, derive_more::From)]
diff --git a/client/network/src/config.rs b/client/network/src/config.rs
index 29d238c368a7..3eb53dabf045 100644
--- a/client/network/src/config.rs
+++ b/client/network/src/config.rs
@@ -111,6 +111,14 @@ pub struct Params<B: BlockT, H: ExHashT> {
 	/// [`block_request_handler::BlockRequestHandler::new`] allowing both outgoing and incoming
 	/// requests.
 	pub block_request_protocol_config: RequestResponseConfig,
+
+	/// Request response configuration for the light client request protocol.
+	///
+	/// Can be constructed either via [`light_client_requests::generate_protocol_config`] allowing
+	/// outgoing but not incoming requests, or constructed via
+	/// [`light_client_requests::handler::LightClientRequestHandler::new`] allowing both outgoing
+	/// and incoming requests.
+	pub light_client_request_protocol_config: RequestResponseConfig,
 }
 
 /// Role of the local node.
diff --git a/client/network/src/gossip/tests.rs b/client/network/src/gossip/tests.rs
index e0941357e844..c0b8c5e730a1 100644
--- a/client/network/src/gossip/tests.rs
+++ b/client/network/src/gossip/tests.rs
@@ -17,6 +17,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::block_request_handler::BlockRequestHandler;
+use crate::light_client_requests::handler::LightClientRequestHandler;
 use crate::gossip::QueuedSender;
 use crate::{config,  Event, NetworkService, NetworkWorker};
 
@@ -96,7 +97,16 @@ fn build_test_full_node(network_config: config::NetworkConfiguration)
 
 	let block_request_protocol_config = {
 		let (handler, protocol_config) = BlockRequestHandler::new(
-			protocol_id.clone(),
+			&protocol_id,
+			client.clone(),
+		);
+		async_std::task::spawn(handler.run().boxed());
+		protocol_config
+	};
+
+	let light_client_request_protocol_config = {
+		let (handler, protocol_config) = LightClientRequestHandler::new(
+			&protocol_id,
 			client.clone(),
 		);
 		async_std::task::spawn(handler.run().boxed());
@@ -117,6 +127,7 @@ fn build_test_full_node(network_config: config::NetworkConfiguration)
 		),
 		metrics_registry: None,
 		block_request_protocol_config,
+		light_client_request_protocol_config,
 	})
 	.unwrap();
 
diff --git a/client/network/src/lib.rs b/client/network/src/lib.rs
index ab7625ff9fe8..007928ad425f 100644
--- a/client/network/src/lib.rs
+++ b/client/network/src/lib.rs
@@ -249,7 +249,6 @@ mod behaviour;
 mod chain;
 mod peer_info;
 mod discovery;
-mod light_client_handler;
 mod on_demand_layer;
 mod protocol;
 mod request_responses;
@@ -259,6 +258,7 @@ mod transport;
 mod utils;
 
 pub mod block_request_handler;
+pub mod light_client_requests;
 pub mod config;
 pub mod error;
 pub mod gossip;
diff --git a/client/network/src/light_client_handler.rs b/client/network/src/light_client_handler.rs
deleted file mode 100644
index 1062236e25eb..000000000000
--- a/client/network/src/light_client_handler.rs
+++ /dev/null
@@ -1,2061 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-//! [`NetworkBehaviour`] implementation which handles light client requests.
-//!
-//! Every request is coming in on a separate connection substream which gets
-//! closed after we have sent the response back. Requests and responses are
-//! encoded as protocol buffers (cf. `api.v1.proto`).
-//!
-//! For every outgoing request we likewise open a separate substream.
-
-#![allow(unused)]
-
-use bytes::Bytes;
-use codec::{self, Encode, Decode};
-use crate::{
-	chain::Client,
-	config::ProtocolId,
-	protocol::message::{BlockAttributes, Direction, FromBlock},
-	schema,
-};
-use futures::{channel::oneshot, future::BoxFuture, prelude::*, stream::FuturesUnordered};
-use libp2p::{
-	core::{
-		ConnectedPoint,
-		Multiaddr,
-		PeerId,
-		connection::ConnectionId,
-		upgrade::{InboundUpgrade, ReadOneError, UpgradeInfo, Negotiated},
-		upgrade::{OutboundUpgrade, read_one, write_one}
-	},
-	swarm::{
-		AddressRecord,
-		NegotiatedSubstream,
-		NetworkBehaviour,
-		NetworkBehaviourAction,
-		NotifyHandler,
-		OneShotHandler,
-		OneShotHandlerConfig,
-		PollParameters,
-		SubstreamProtocol,
-	}
-};
-use nohash_hasher::IntMap;
-use prost::Message;
-use sc_client_api::{
-	StorageProof,
-	light::{
-		self, RemoteReadRequest, RemoteBodyRequest, ChangesProof,
-		RemoteCallRequest, RemoteChangesRequest, RemoteHeaderRequest,
-	}
-};
-use sc_peerset::ReputationChange;
-use sp_core::{
-	storage::{ChildInfo, ChildType,StorageKey, PrefixedStorageKey},
-	hexdisplay::HexDisplay,
-};
-use smallvec::SmallVec;
-use sp_blockchain::{Error as ClientError};
-use sp_runtime::{
-	traits::{Block, Header, NumberFor, Zero},
-	generic::BlockId,
-};
-use std::{
-	collections::{BTreeMap, VecDeque, HashMap},
-	iter,
-	io,
-	sync::Arc,
-	time::Duration,
-	task::{Context, Poll}
-};
-use void::Void;
-use wasm_timer::Instant;
-
-/// Reputation change for a peer when a request timed out.
-pub(crate) const TIMEOUT_REPUTATION_CHANGE: i32 = -(1 << 8);
-
-/// Configuration options for `LightClientHandler` behaviour.
-#[derive(Debug, Clone)]
-pub struct Config {
-	max_request_size: usize,
-	max_response_size: usize,
-	max_pending_requests: usize,
-	inactivity_timeout: Duration,
-	request_timeout: Duration,
-	light_protocol: Bytes,
-	block_protocol: Bytes,
-}
-
-impl Config {
-	/// Create a fresh configuration with the following options:
-	///
-	/// - max. request size = 1 MiB
-	/// - max. response size = 16 MiB
-	/// - max. pending requests = 128
-	/// - inactivity timeout = 15s
-	/// - request timeout = 15s
-	pub fn new(id: &ProtocolId) -> Self {
-		let mut c = Config {
-			max_request_size: 1 * 1024 * 1024,
-			max_response_size: 16 * 1024 * 1024,
-			max_pending_requests: 128,
-			inactivity_timeout: Duration::from_secs(15),
-			request_timeout: Duration::from_secs(15),
-			light_protocol: Bytes::new(),
-			block_protocol: Bytes::new(),
-		};
-		c.set_protocol(id);
-		c
-	}
-
-	/// Limit the max. length in bytes of a request.
-	pub fn set_max_request_size(&mut self, v: usize) -> &mut Self {
-		self.max_request_size = v;
-		self
-	}
-
-	/// Limit the max. length in bytes of a response.
-	pub fn set_max_response_size(&mut self, v: usize) -> &mut Self {
-		self.max_response_size = v;
-		self
-	}
-
-	/// Limit the max. number of pending requests.
-	pub fn set_max_pending_requests(&mut self, v: usize) -> &mut Self {
-		self.max_pending_requests = v;
-		self
-	}
-
-	/// Limit the max. duration the connection may remain inactive before closing it.
-	pub fn set_inactivity_timeout(&mut self, v: Duration) -> &mut Self {
-		self.inactivity_timeout = v;
-		self
-	}
-
-	/// Limit the max. request duration.
-	pub fn set_request_timeout(&mut self, v: Duration) -> &mut Self {
-		self.request_timeout = v;
-		self
-	}
-
-	/// Set protocol to use for upgrade negotiation.
-	pub fn set_protocol(&mut self, id: &ProtocolId) -> &mut Self {
-		let mut vl = Vec::new();
-		vl.extend_from_slice(b"/");
-		vl.extend_from_slice(id.as_ref().as_bytes());
-		vl.extend_from_slice(b"/light/2");
-		self.light_protocol = vl.into();
-
-		let mut vb = Vec::new();
-		vb.extend_from_slice(b"/");
-		vb.extend_from_slice(id.as_ref().as_bytes());
-		vb.extend_from_slice(b"/sync/2");
-		self.block_protocol = vb.into();
-
-		self
-	}
-}
-
-/// Possible errors while handling light clients.
-#[derive(Debug, thiserror::Error)]
-pub enum Error {
-	/// There are currently too many pending request.
-	#[error("too many pending requests")]
-	TooManyRequests,
-	/// The response type does not correspond to the issued request.
-	#[error("unexpected response")]
-	UnexpectedResponse,
-	/// A bad request has been received.
-	#[error("bad request: {0}")]
-	BadRequest(&'static str),
-	/// The chain client errored.
-	#[error("client error: {0}")]
-	Client(#[from] ClientError),
-	/// Encoding or decoding of some data failed.
-	#[error("codec error: {0}")]
-	Codec(#[from] codec::Error),
-}
-
-/// The possible light client requests we support.
-///
-/// The associated `oneshot::Sender` will be used to convey the result of
-/// their request back to them (cf. `Reply`).
-//
-// This is modeled after light_dispatch.rs's `RequestData` which is not
-// used because we currently only support a subset of those.
-#[derive(Debug)]
-pub enum Request<B: Block> {
-	Body {
-		request: RemoteBodyRequest<B::Header>,
-		sender: oneshot::Sender<Result<Vec<B::Extrinsic>, ClientError>>
-	},
-	Header {
-		request: light::RemoteHeaderRequest<B::Header>,
-		sender: oneshot::Sender<Result<B::Header, ClientError>>
-	},
-	Read {
-		request: light::RemoteReadRequest<B::Header>,
-		sender: oneshot::Sender<Result<HashMap<Vec<u8>, Option<Vec<u8>>>, ClientError>>
-	},
-	ReadChild {
-		request: light::RemoteReadChildRequest<B::Header>,
-		sender: oneshot::Sender<Result<HashMap<Vec<u8>, Option<Vec<u8>>>, ClientError>>
-	},
-	Call {
-		request: light::RemoteCallRequest<B::Header>,
-		sender: oneshot::Sender<Result<Vec<u8>, ClientError>>
-	},
-	Changes {
-		request: light::RemoteChangesRequest<B::Header>,
-		sender: oneshot::Sender<Result<Vec<(NumberFor<B>, u32)>, ClientError>>
-	}
-}
-
-/// The data to send back to the light client over the oneshot channel.
-//
-// It is unified here in order to be able to return it as a function
-// result instead of delivering it to the client as a side effect of
-// response processing.
-#[derive(Debug)]
-enum Reply<B: Block> {
-	VecU8(Vec<u8>),
-	VecNumberU32(Vec<(<B::Header as Header>::Number, u32)>),
-	MapVecU8OptVecU8(HashMap<Vec<u8>, Option<Vec<u8>>>),
-	Header(B::Header),
-	Extrinsics(Vec<B::Extrinsic>),
-}
-
-/// Augments a light client request with metadata.
-#[derive(Debug)]
-struct RequestWrapper<B: Block, P> {
-	/// Time when this value was created.
-	timestamp: Instant,
-	/// Remaining retries.
-	retries: usize,
-	/// The actual request.
-	request: Request<B>,
-	/// The peer to send the request to, e.g. `PeerId`.
-	peer: P,
-	/// The connection to use for sending the request.
-	connection: Option<ConnectionId>,
-}
-
-/// Information we have about some peer.
-#[derive(Debug)]
-struct PeerInfo<B: Block> {
-	connections: SmallVec<[(ConnectionId, Multiaddr); crate::MAX_CONNECTIONS_PER_PEER]>,
-	best_block: Option<NumberFor<B>>,
-	status: PeerStatus,
-}
-
-impl<B: Block> Default for PeerInfo<B> {
-	fn default() -> Self {
-		PeerInfo {
-			connections: SmallVec::new(),
-			best_block: None,
-			status: PeerStatus::Idle,
-		}
-	}
-}
-
-type RequestId = u64;
-
-/// A peer is either idle or busy processing a request from us.
-#[derive(Debug, Clone, PartialEq, Eq)]
-enum PeerStatus {
-	/// The peer is available.
-	Idle,
-	/// We wait for the peer to return us a response for the given request ID.
-	BusyWith(RequestId),
-}
-
-/// The light client handler behaviour.
-pub struct LightClientHandler<B: Block> {
-	/// This behaviour's configuration.
-	config: Config,
-	/// Blockchain client.
-	chain: Arc<dyn Client<B>>,
-	/// Verifies that received responses are correct.
-	checker: Arc<dyn light::FetchChecker<B>>,
-	/// Peer information (addresses, their best block, etc.)
-	peers: HashMap<PeerId, PeerInfo<B>>,
-	/// Futures sending back response to remote clients.
-	responses: FuturesUnordered<BoxFuture<'static, ()>>,
-	/// Pending (local) requests.
-	pending_requests: VecDeque<RequestWrapper<B, ()>>,
-	/// Requests on their way to remote peers.
-	outstanding: IntMap<RequestId, RequestWrapper<B, PeerId>>,
-	/// (Local) Request ID counter
-	next_request_id: RequestId,
-	/// Handle to use for reporting misbehaviour of peers.
-	peerset: sc_peerset::PeersetHandle,
-}
-
-impl<B> LightClientHandler<B>
-where
-	B: Block,
-{
-	/// Construct a new light client handler.
-	pub fn new(
-		cfg: Config,
-		chain: Arc<dyn Client<B>>,
-		checker: Arc<dyn light::FetchChecker<B>>,
-		peerset: sc_peerset::PeersetHandle,
-	) -> Self {
-		LightClientHandler {
-			config: cfg,
-			chain,
-			checker,
-			peers: HashMap::new(),
-			responses: FuturesUnordered::new(),
-			pending_requests: VecDeque::new(),
-			outstanding: IntMap::default(),
-			next_request_id: 1,
-			peerset,
-		}
-	}
-
-	/// We rely on external information about peers best blocks as we lack the
-	/// means to determine it ourselves.
-	pub fn update_best_block(&mut self, peer: &PeerId, num: NumberFor<B>) {
-		if let Some(info) = self.peers.get_mut(peer) {
-			log::trace!("new best block for {:?}: {:?}", peer, num);
-			info.best_block = Some(num)
-		}
-	}
-
-	/// Issue a new light client request.
-	pub fn request(&mut self, req: Request<B>) -> Result<(), Error> {
-		if self.pending_requests.len() >= self.config.max_pending_requests {
-			return Err(Error::TooManyRequests)
-		}
-		let rw = RequestWrapper {
-			timestamp: Instant::now(),
-			retries: retries(&req),
-			request: req,
-			peer: (), // we do not know the peer yet
-			connection: None,
-		};
-		self.pending_requests.push_back(rw);
-		Ok(())
-	}
-
-	fn next_request_id(&mut self) -> RequestId {
-		let id = self.next_request_id;
-		self.next_request_id += 1;
-		id
-	}
-
-	/// Remove the given peer.
-	///
-	/// If we have a request to this peer in flight, we move it back to
-	/// the pending requests queue.
-	fn remove_peer(&mut self, peer: &PeerId) {
-		if let Some(id) = self.outstanding.iter().find(|(_, rw)| &rw.peer == peer).map(|(k, _)| *k) {
-			let rw = self.outstanding.remove(&id).expect("key belongs to entry in this map");
-			let rw = RequestWrapper {
-				timestamp: rw.timestamp,
-				retries: rw.retries,
-				request: rw.request,
-				peer: (), // need to find another peer
-				connection: None,
-			};
-			self.pending_requests.push_back(rw);
-		}
-		self.peers.remove(peer);
-	}
-
-	/// Prepares a request by selecting a suitable peer and connection to send it to.
-	///
-	/// If there is currently no suitable peer for the request, the given request
-	/// is returned as `Err`.
-	fn prepare_request(&self, req: RequestWrapper<B, ()>)
-		-> Result<(PeerId, RequestWrapper<B, PeerId>), RequestWrapper<B, ()>>
-	{
-		let number = required_block(&req.request);
-
-		let mut peer = None;
-		for (peer_id, peer_info) in self.peers.iter() {
-			if peer_info.status == PeerStatus::Idle {
-				match peer_info.best_block {
-					Some(n) => if n >= number {
-						peer = Some((peer_id, peer_info));
-						break
-					},
-					None => peer = Some((peer_id, peer_info))
-				}
-			}
-		}
-
-		if let Some((peer_id, peer_info)) = peer {
-			let connection = peer_info.connections.iter().next().map(|(id, _)| *id);
-			let rw = RequestWrapper {
-				timestamp: req.timestamp,
-				retries: req.retries,
-				request: req.request,
-				peer: peer_id.clone(),
-				connection,
-			};
-			Ok((peer_id.clone(), rw))
-		} else {
-			Err(req)
-		}
-	}
-
-	/// Process a local request's response from remote.
-	///
-	/// If successful, this will give us the actual, checked data we should be
-	/// sending back to the client, otherwise an error.
-	fn on_response
-		( &mut self
-		, peer: &PeerId
-		, request: &Request<B>
-		, response: Response
-		) -> Result<Reply<B>, Error>
-	{
-		log::trace!("response from {}", peer);
-		match response {
-			Response::Light(r) => self.on_response_light(peer, request, r),
-			Response::Block(r) => self.on_response_block(peer, request, r),
-		}
-	}
-
-	fn on_response_light
-		( &mut self
-		, peer: &PeerId
-		, request: &Request<B>
-		, response: schema::v1::light::Response
-		) -> Result<Reply<B>, Error>
-	{
-		use schema::v1::light::response::Response;
-		match response.response {
-			Some(Response::RemoteCallResponse(response)) =>
-				if let Request::Call { request , .. } = request {
-					let proof = Decode::decode(&mut response.proof.as_ref())?;
-					let reply = self.checker.check_execution_proof(request, proof)?;
-					Ok(Reply::VecU8(reply))
-				} else {
-					Err(Error::UnexpectedResponse)
-				}
-			Some(Response::RemoteReadResponse(response)) =>
-				match request {
-					Request::Read { request, .. } => {
-						let proof = Decode::decode(&mut response.proof.as_ref())?;
-						let reply = self.checker.check_read_proof(&request, proof)?;
-						Ok(Reply::MapVecU8OptVecU8(reply))
-					}
-					Request::ReadChild { request, .. } => {
-						let proof = Decode::decode(&mut response.proof.as_ref())?;
-						let reply = self.checker.check_read_child_proof(&request, proof)?;
-						Ok(Reply::MapVecU8OptVecU8(reply))
-					}
-					_ => Err(Error::UnexpectedResponse)
-				}
-			Some(Response::RemoteChangesResponse(response)) =>
-				if let Request::Changes { request, .. } = request {
-					let max_block = Decode::decode(&mut response.max.as_ref())?;
-					let roots_proof = Decode::decode(&mut response.roots_proof.as_ref())?;
-					let roots = {
-						let mut r = BTreeMap::new();
-						for pair in response.roots {
-							let k = Decode::decode(&mut pair.fst.as_ref())?;
-							let v = Decode::decode(&mut pair.snd.as_ref())?;
-							r.insert(k, v);
-						}
-						r
-					};
-					let reply = self.checker.check_changes_proof(&request, light::ChangesProof {
-						max_block,
-						proof: response.proof,
-						roots,
-						roots_proof,
-					})?;
-					Ok(Reply::VecNumberU32(reply))
-				} else {
-					Err(Error::UnexpectedResponse)
-				}
-			Some(Response::RemoteHeaderResponse(response)) =>
-				if let Request::Header { request, .. } = request {
-					let header =
-						if response.header.is_empty() {
-							None
-						} else {
-							Some(Decode::decode(&mut response.header.as_ref())?)
-						};
-					let proof = Decode::decode(&mut response.proof.as_ref())?;
-					let reply = self.checker.check_header_proof(&request, header, proof)?;
-					Ok(Reply::Header(reply))
-				} else {
-					Err(Error::UnexpectedResponse)
-				}
-			None => Err(Error::UnexpectedResponse)
-		}
-	}
-
-	fn on_response_block
-		( &mut self
-		, peer: &PeerId
-		, request: &Request<B>
-		, response: schema::v1::BlockResponse
-		) -> Result<Reply<B>, Error>
-	{
-		let request = if let Request::Body { request , .. } = &request {
-			request
-		} else {
-			return Err(Error::UnexpectedResponse);
-		};
-
-		let body: Vec<_> = match response.blocks.into_iter().next() {
-			Some(b) => b.body,
-			None => return Err(Error::UnexpectedResponse),
-		};
-
-		let body = body.into_iter()
-			.map(|mut extrinsic| B::Extrinsic::decode(&mut &extrinsic[..]))
-			.collect::<Result<_, _>>()?;
-
-		let body = self.checker.check_body_proof(&request, body)?;
-		Ok(Reply::Extrinsics(body))
-	}
-
-	fn on_remote_call_request
-		( &mut self
-		, peer: &PeerId
-		, request: &schema::v1::light::RemoteCallRequest
-		) -> Result<schema::v1::light::Response, Error>
-	{
-		log::trace!("remote call request from {} ({} at {:?})",
-			peer,
-			request.method,
-			request.block,
-		);
-
-		let block = Decode::decode(&mut request.block.as_ref())?;
-
-		let proof = match self.chain.execution_proof(&BlockId::Hash(block), &request.method, &request.data) {
-			Ok((_, proof)) => proof,
-			Err(e) => {
-				log::trace!("remote call request from {} ({} at {:?}) failed with: {}",
-					peer,
-					request.method,
-					request.block,
-					e,
-				);
-				StorageProof::empty()
-			}
-		};
-
-		let response = {
-			let r = schema::v1::light::RemoteCallResponse { proof: proof.encode() };
-			schema::v1::light::response::Response::RemoteCallResponse(r)
-		};
-
-		Ok(schema::v1::light::Response { response: Some(response) })
-	}
-
-	fn on_remote_read_request
-		( &mut self
-		, peer: &PeerId
-		, request: &schema::v1::light::RemoteReadRequest
-		) -> Result<schema::v1::light::Response, Error>
-	{
-		if request.keys.is_empty() {
-			log::debug!("invalid remote read request sent by {}", peer);
-			return Err(Error::BadRequest("remote read request without keys"))
-		}
-
-		log::trace!("remote read request from {} ({} at {:?})",
-			peer,
-			fmt_keys(request.keys.first(), request.keys.last()),
-			request.block);
-
-		let block = Decode::decode(&mut request.block.as_ref())?;
-
-		let proof = match self.chain.read_proof(&BlockId::Hash(block), &mut request.keys.iter().map(AsRef::as_ref)) {
-			Ok(proof) => proof,
-			Err(error) => {
-				log::trace!("remote read request from {} ({} at {:?}) failed with: {}",
-					peer,
-					fmt_keys(request.keys.first(), request.keys.last()),
-					request.block,
-					error);
-				StorageProof::empty()
-			}
-		};
-
-		let response = {
-			let r = schema::v1::light::RemoteReadResponse { proof: proof.encode() };
-			schema::v1::light::response::Response::RemoteReadResponse(r)
-		};
-
-		Ok(schema::v1::light::Response { response: Some(response) })
-	}
-
-	fn on_remote_read_child_request
-		( &mut self
-		, peer: &PeerId
-		, request: &schema::v1::light::RemoteReadChildRequest
-		) -> Result<schema::v1::light::Response, Error>
-	{
-		if request.keys.is_empty() {
-			log::debug!("invalid remote child read request sent by {}", peer);
-			return Err(Error::BadRequest("remove read child request without keys"))
-		}
-
-		log::trace!("remote read child request from {} ({} {} at {:?})",
-			peer,
-			HexDisplay::from(&request.storage_key),
-			fmt_keys(request.keys.first(), request.keys.last()),
-			request.block);
-
-		let block = Decode::decode(&mut request.block.as_ref())?;
-
-		let prefixed_key = PrefixedStorageKey::new_ref(&request.storage_key);
-		let child_info = match ChildType::from_prefixed_key(prefixed_key) {
-			Some((ChildType::ParentKeyId, storage_key)) => Ok(ChildInfo::new_default(storage_key)),
-			None => Err(sp_blockchain::Error::InvalidChildStorageKey),
-		};
-		let proof = match child_info.and_then(|child_info| self.chain.read_child_proof(
-			&BlockId::Hash(block),
-			&child_info,
-			&mut request.keys.iter().map(AsRef::as_ref)
-		)) {
-			Ok(proof) => proof,
-			Err(error) => {
-				log::trace!("remote read child request from {} ({} {} at {:?}) failed with: {}",
-					peer,
-					HexDisplay::from(&request.storage_key),
-					fmt_keys(request.keys.first(), request.keys.last()),
-					request.block,
-					error);
-				StorageProof::empty()
-			}
-		};
-
-		let response = {
-			let r = schema::v1::light::RemoteReadResponse { proof: proof.encode() };
-			schema::v1::light::response::Response::RemoteReadResponse(r)
-		};
-
-		Ok(schema::v1::light::Response { response: Some(response) })
-	}
-
-	fn on_remote_header_request
-		( &mut self
-		, peer: &PeerId
-		, request: &schema::v1::light::RemoteHeaderRequest
-		) -> Result<schema::v1::light::Response, Error>
-	{
-		log::trace!("remote header proof request from {} ({:?})", peer, request.block);
-
-		let block = Decode::decode(&mut request.block.as_ref())?;
-		let (header, proof) = match self.chain.header_proof(&BlockId::Number(block)) {
-			Ok((header, proof)) => (header.encode(), proof),
-			Err(error) => {
-				log::trace!("remote header proof request from {} ({:?}) failed with: {}",
-					peer,
-					request.block,
-					error);
-				(Default::default(), StorageProof::empty())
-			}
-		};
-
-		let response = {
-			let r = schema::v1::light::RemoteHeaderResponse { header, proof: proof.encode() };
-			schema::v1::light::response::Response::RemoteHeaderResponse(r)
-		};
-
-		Ok(schema::v1::light::Response { response: Some(response) })
-	}
-
-	fn on_remote_changes_request
-		( &mut self
-		, peer: &PeerId
-		, request: &schema::v1::light::RemoteChangesRequest
-		) -> Result<schema::v1::light::Response, Error>
-	{
-		log::trace!("remote changes proof request from {} for key {} ({:?}..{:?})",
-			peer,
-			if !request.storage_key.is_empty() {
-				format!("{} : {}", HexDisplay::from(&request.storage_key), HexDisplay::from(&request.key))
-			} else {
-				HexDisplay::from(&request.key).to_string()
-			},
-			request.first,
-			request.last);
-
-		let first = Decode::decode(&mut request.first.as_ref())?;
-		let last = Decode::decode(&mut request.last.as_ref())?;
-		let min = Decode::decode(&mut request.min.as_ref())?;
-		let max = Decode::decode(&mut request.max.as_ref())?;
-		let key = StorageKey(request.key.clone());
-		let storage_key = if request.storage_key.is_empty() {
-			None
-		} else {
-			Some(PrefixedStorageKey::new_ref(&request.storage_key))
-		};
-
-		let proof = match self.chain.key_changes_proof(first, last, min, max, storage_key, &key) {
-			Ok(proof) => proof,
-			Err(error) => {
-				log::trace!("remote changes proof request from {} for key {} ({:?}..{:?}) failed with: {}",
-					peer,
-					format!("{} : {}", HexDisplay::from(&request.storage_key), HexDisplay::from(&key.0)),
-					request.first,
-					request.last,
-					error);
-
-				light::ChangesProof::<B::Header> {
-					max_block: Zero::zero(),
-					proof: Vec::new(),
-					roots: BTreeMap::new(),
-					roots_proof: StorageProof::empty(),
-				}
-			}
-		};
-
-		let response = {
-			let r = schema::v1::light::RemoteChangesResponse {
-				max: proof.max_block.encode(),
-				proof: proof.proof,
-				roots: proof.roots.into_iter()
-					.map(|(k, v)| schema::v1::light::Pair { fst: k.encode(), snd: v.encode() })
-					.collect(),
-				roots_proof: proof.roots_proof.encode(),
-			};
-			schema::v1::light::response::Response::RemoteChangesResponse(r)
-		};
-
-		Ok(schema::v1::light::Response { response: Some(response) })
-	}
-}
-
-impl<B> NetworkBehaviour for LightClientHandler<B>
-where
-	B: Block
-{
-	type ProtocolsHandler = OneShotHandler<InboundProtocol, OutboundProtocol, Event<NegotiatedSubstream>>;
-	type OutEvent = Void;
-
-	fn new_handler(&mut self) -> Self::ProtocolsHandler {
-		let p = InboundProtocol {
-			max_request_size: self.config.max_request_size,
-			protocol: self.config.light_protocol.clone(),
-		};
-		let mut cfg = OneShotHandlerConfig::default();
-		cfg.keep_alive_timeout = self.config.inactivity_timeout;
-		OneShotHandler::new(SubstreamProtocol::new(p, ()), cfg)
-	}
-
-	fn addresses_of_peer(&mut self, peer: &PeerId) -> Vec<Multiaddr> {
-		self.peers.get(peer)
-			.map(|info| info.connections.iter().map(|(_, a)| a.clone()).collect())
-			.unwrap_or_default()
-	}
-
-	fn inject_connected(&mut self, peer: &PeerId) {
-	}
-
-	fn inject_connection_established(&mut self, peer: &PeerId, conn: &ConnectionId, info: &ConnectedPoint) {
-		let peer_address = match info {
-			ConnectedPoint::Listener { send_back_addr, .. } => send_back_addr.clone(),
-			ConnectedPoint::Dialer { address } => address.clone()
-		};
-
-		log::trace!("peer {} connected with address {}", peer, peer_address);
-
-		let entry = self.peers.entry(peer.clone()).or_default();
-		entry.connections.push((*conn, peer_address));
-	}
-
-	fn inject_disconnected(&mut self, peer: &PeerId) {
-		log::trace!("peer {} disconnected", peer);
-		self.remove_peer(peer)
-	}
-
-	fn inject_connection_closed(&mut self, peer: &PeerId, conn: &ConnectionId, info: &ConnectedPoint) {
-		let peer_address = match info {
-			ConnectedPoint::Listener { send_back_addr, .. } => send_back_addr,
-			ConnectedPoint::Dialer { address } => address
-		};
-
-		log::trace!("connection to peer {} closed: {}", peer, peer_address);
-
-		if let Some(info) = self.peers.get_mut(peer) {
-			info.connections.retain(|(c, _)| c != conn)
-		}
-
-		// Add any outstanding requests on the closed connection back to the
-		// pending requests.
-		if let Some(id) = self.outstanding.iter()
-			.find(|(_, rw)| &rw.peer == peer && rw.connection == Some(*conn)) // (*)
-			.map(|(id, _)| *id)
-		{
-			let rw = self.outstanding.remove(&id).expect("by (*)");
-			let rw = RequestWrapper {
-				timestamp: rw.timestamp,
-				retries: rw.retries,
-				request: rw.request,
-				peer: (), // need to find another peer
-				connection: None,
-			};
-			self.pending_requests.push_back(rw);
-		}
-	}
-
-	fn inject_event(&mut self, peer: PeerId, conn: ConnectionId, event: Event<NegotiatedSubstream>) {
-		match event {
-			// An incoming request from remote has been received.
-			Event::Request(request, mut stream) => {
-				log::trace!("incoming request from {}", peer);
-				let result = match &request.request {
-					Some(schema::v1::light::request::Request::RemoteCallRequest(r)) =>
-						self.on_remote_call_request(&peer, r),
-					Some(schema::v1::light::request::Request::RemoteReadRequest(r)) =>
-						self.on_remote_read_request(&peer, r),
-					Some(schema::v1::light::request::Request::RemoteHeaderRequest(r)) =>
-						self.on_remote_header_request(&peer, r),
-					Some(schema::v1::light::request::Request::RemoteReadChildRequest(r)) =>
-						self.on_remote_read_child_request(&peer, r),
-					Some(schema::v1::light::request::Request::RemoteChangesRequest(r)) =>
-						self.on_remote_changes_request(&peer, r),
-					None => {
-						log::debug!("ignoring request without request data from peer {}", peer);
-						return
-					}
-				};
-				match result {
-					Ok(response) => {
-						log::trace!("enqueueing response for peer {}", peer);
-						let mut data = Vec::new();
-						if let Err(e) = response.encode(&mut data) {
-							log::debug!("error encoding response for peer {}: {}", peer, e)
-						} else {
-							let future = async move {
-								if let Err(e) = write_one(&mut stream, data).await {
-									log::debug!("error writing response: {}", e)
-								}
-							};
-							self.responses.push(future.boxed())
-						}
-					}
-					Err(Error::BadRequest(_)) => {
-						self.remove_peer(&peer);
-						self.peerset.report_peer(peer, ReputationChange::new(-(1 << 12), "bad request"))
-					}
-					Err(e) => log::debug!("error handling request from peer {}: {}", peer, e)
-				}
-			}
-			// A response to one of our own requests has been received.
-			Event::Response(id, response) => {
-				if let Some(request) = self.outstanding.remove(&id) {
-					// We first just check if the response originates from the expected peer
-					// and connection.
-					if request.peer != peer {
-						log::debug!("Expected response from {} instead of {}.", request.peer, peer);
-						self.outstanding.insert(id, request);
-						self.remove_peer(&peer);
-						self.peerset.report_peer(peer, ReputationChange::new_fatal("response from unexpected peer"));
-						return
-					}
-
-					if let Some(info) = self.peers.get_mut(&peer) {
-						if info.status != PeerStatus::BusyWith(id) {
-							// If we get here, something is wrong with our internal handling of peer
-							// status information. At any time, a single peer processes at most one
-							// request from us and its status should contain the request ID we are
-							// expecting a response for. If a peer would send us a response with a
-							// random ID, we should not have an entry for it with this peer ID in
-							// our `outstanding` map, so a malicious peer should not be able to get
-							// us here. It is our own fault and must be fixed!
-							panic!("unexpected peer status {:?} for {}", info.status, peer);
-						}
-
-						info.status = PeerStatus::Idle; // Make peer available again.
-
-						match self.on_response(&peer, &request.request, response) {
-							Ok(reply) => send_reply(Ok(reply), request.request),
-							Err(Error::UnexpectedResponse) => {
-								log::debug!("unexpected response {} from peer {}", id, peer);
-								self.remove_peer(&peer);
-								self.peerset.report_peer(peer, ReputationChange::new_fatal("unexpected response from peer"));
-								let rw = RequestWrapper {
-									timestamp: request.timestamp,
-									retries: request.retries,
-									request: request.request,
-									peer: (),
-									connection: None,
-								};
-								self.pending_requests.push_back(rw);
-							}
-							Err(other) => {
-								log::debug!("error handling response {} from peer {}: {}", id, peer, other);
-								self.remove_peer(&peer);
-								self.peerset.report_peer(peer, ReputationChange::new_fatal("invalid response from peer"));
-								if request.retries > 0 {
-									let rw = RequestWrapper {
-										timestamp: request.timestamp,
-										retries: request.retries - 1,
-										request: request.request,
-										peer: (),
-										connection: None,
-									};
-									self.pending_requests.push_back(rw)
-								} else {
-									send_reply(Err(ClientError::RemoteFetchFailed), request.request)
-								}
-							}
-						}
-					} else {
-						// If we get here, something is wrong with our internal handling of peers.
-						// We apparently have an entry in our `outstanding` map and the peer is the one we
-						// expected. So, if we can not find an entry for it in our peer information table,
-						// then these two collections are out of sync which must not happen and is a clear
-						// programmer error that must be fixed!
-						panic!("missing peer information for {}; response {}", peer, id);
-					}
-				} else {
-					log::debug!("unexpected response {} from peer {}", id, peer);
-					self.remove_peer(&peer);
-					self.peerset.report_peer(peer, ReputationChange::new_fatal("response from unexpected peer"));
-				}
-			}
-		}
-	}
-
-	fn poll(&mut self, cx: &mut Context, _: &mut impl PollParameters) -> Poll<NetworkBehaviourAction<OutboundProtocol, Void>> {
-		// Process response sending futures.
-		while let Poll::Ready(Some(_)) = self.responses.poll_next_unpin(cx) {}
-
-		// If we have a pending request to send, try to find an available peer and send it.
-		let now = Instant::now();
-		while let Some(mut request) = self.pending_requests.pop_front() {
-			if now > request.timestamp + self.config.request_timeout {
-				if request.retries == 0 {
-					send_reply(Err(ClientError::RemoteFetchFailed), request.request);
-					continue
-				}
-				request.timestamp = Instant::now();
-				request.retries -= 1
-			}
-
-
-			match self.prepare_request(request) {
-				Err(request) => {
-					self.pending_requests.push_front(request);
-					log::debug!("no peer available to send request to");
-					break
-				}
-				Ok((peer, request)) => {
-					let request_bytes = match serialize_request(&request.request) {
-						Ok(bytes) => bytes,
-						Err(error) => {
-							log::debug!("failed to serialize request: {}", error);
-							send_reply(Err(ClientError::RemoteFetchFailed), request.request);
-							continue
-						}
-					};
-
-					let (expected, protocol) = match request.request {
-						Request::Body { .. } =>
-							(ExpectedResponseTy::Block, self.config.block_protocol.clone()),
-						_ =>
-							(ExpectedResponseTy::Light, self.config.light_protocol.clone()),
-					};
-
-					let peer_id = peer.clone();
-					let handler = request.connection.map_or(NotifyHandler::Any, NotifyHandler::One);
-
-					let request_id = self.next_request_id();
-					if let Some(p) = self.peers.get_mut(&peer) {
-						p.status = PeerStatus::BusyWith(request_id);
-					}
-					self.outstanding.insert(request_id, request);
-
-					let event = OutboundProtocol {
-						request_id,
-						request: request_bytes,
-						expected,
-						max_response_size: self.config.max_response_size,
-						protocol,
-					};
-
-					log::trace!("sending request {} to peer {}", request_id, peer_id);
-
-					return Poll::Ready(NetworkBehaviourAction::NotifyHandler {
-						peer_id,
-						handler,
-						event,
-					})
-				}
-			}
-		}
-
-		// Look for ongoing requests that have timed out.
-		let mut expired = Vec::new();
-		for (id, rw) in &self.outstanding {
-			if now > rw.timestamp + self.config.request_timeout {
-				log::debug!("request {} timed out", id);
-				expired.push(*id)
-			}
-		}
-		for id in expired {
-			if let Some(rw) = self.outstanding.remove(&id) {
-				self.remove_peer(&rw.peer);
-				self.peerset.report_peer(rw.peer.clone(),
-					ReputationChange::new(TIMEOUT_REPUTATION_CHANGE, "light request timeout"));
-				if rw.retries == 0 {
-					send_reply(Err(ClientError::RemoteFetchFailed), rw.request);
-					continue
-				}
-				let rw = RequestWrapper {
-					timestamp: Instant::now(),
-					retries: rw.retries - 1,
-					request: rw.request,
-					peer: (),
-					connection: None,
-				};
-				self.pending_requests.push_back(rw)
-			}
-		}
-
-		Poll::Pending
-	}
-}
-
-fn required_block<B: Block>(request: &Request<B>) -> NumberFor<B> {
-	match request {
-		Request::Body { request, .. } => *request.header.number(),
-		Request::Header { request, .. } => request.block,
-		Request::Read { request, .. } => *request.header.number(),
-		Request::ReadChild { request, .. } => *request.header.number(),
-		Request::Call { request, .. } => *request.header.number(),
-		Request::Changes { request, .. } => request.max_block.0,
-	}
-}
-
-fn retries<B: Block>(request: &Request<B>) -> usize {
-	let rc = match request {
-		Request::Body { request, .. } => request.retry_count,
-		Request::Header { request, .. } => request.retry_count,
-		Request::Read { request, .. } => request.retry_count,
-		Request::ReadChild { request, .. } => request.retry_count,
-		Request::Call { request, .. } => request.retry_count,
-		Request::Changes { request, .. } => request.retry_count,
-	};
-	rc.unwrap_or(0)
-}
-
-fn serialize_request<B: Block>(request: &Request<B>) -> Result<Vec<u8>, prost::EncodeError> {
-	let request = match request {
-		Request::Body { request, .. } => {
-			let rq = schema::v1::BlockRequest {
-				fields: BlockAttributes::BODY.to_be_u32(),
-				from_block: Some(schema::v1::block_request::FromBlock::Hash(
-					request.header.hash().encode(),
-				)),
-				to_block: Default::default(),
-				direction: schema::v1::Direction::Ascending as i32,
-				max_blocks: 1,
-			};
-
-			let mut buf = Vec::with_capacity(rq.encoded_len());
-			rq.encode(&mut buf)?;
-			return Ok(buf);
-		}
-		Request::Header { request, .. } => {
-			let r = schema::v1::light::RemoteHeaderRequest { block: request.block.encode() };
-			schema::v1::light::request::Request::RemoteHeaderRequest(r)
-		}
-		Request::Read { request, .. } => {
-			let r = schema::v1::light::RemoteReadRequest {
-				block: request.block.encode(),
-				keys: request.keys.clone(),
-			};
-			schema::v1::light::request::Request::RemoteReadRequest(r)
-		}
-		Request::ReadChild { request, .. } => {
-			let r = schema::v1::light::RemoteReadChildRequest {
-				block: request.block.encode(),
-				storage_key: request.storage_key.clone().into_inner(),
-				keys: request.keys.clone(),
-			};
-			schema::v1::light::request::Request::RemoteReadChildRequest(r)
-		}
-		Request::Call { request, .. } => {
-			let r = schema::v1::light::RemoteCallRequest {
-				block: request.block.encode(),
-				method: request.method.clone(),
-				data: request.call_data.clone(),
-			};
-			schema::v1::light::request::Request::RemoteCallRequest(r)
-		}
-		Request::Changes { request, .. } => {
-			let r = schema::v1::light::RemoteChangesRequest {
-				first: request.first_block.1.encode(),
-				last: request.last_block.1.encode(),
-				min: request.tries_roots.1.encode(),
-				max: request.max_block.1.encode(),
-				storage_key: request.storage_key.clone().map(|s| s.into_inner())
-					.unwrap_or_default(),
-				key: request.key.clone(),
-			};
-			schema::v1::light::request::Request::RemoteChangesRequest(r)
-		}
-	};
-
-	let rq = schema::v1::light::Request { request: Some(request) };
-	let mut buf = Vec::with_capacity(rq.encoded_len());
-	rq.encode(&mut buf)?;
-	Ok(buf)
-}
-
-fn send_reply<B: Block>(result: Result<Reply<B>, ClientError>, request: Request<B>) {
-	fn send<T>(item: T, sender: oneshot::Sender<T>) {
-		let _ = sender.send(item); // It is okay if the other end already hung up.
-	}
-	match request {
-		Request::Body { request, sender } => match result {
-			Err(e) => send(Err(e), sender),
-			Ok(Reply::Extrinsics(x)) => send(Ok(x), sender),
-			reply => log::error!("invalid reply for body request: {:?}, {:?}", reply, request),
-		}
-		Request::Header { request, sender } => match result {
-			Err(e) => send(Err(e), sender),
-			Ok(Reply::Header(x)) => send(Ok(x), sender),
-			reply => log::error!("invalid reply for header request: {:?}, {:?}", reply, request),
-		}
-		Request::Read { request, sender } => match result {
-			Err(e) => send(Err(e), sender),
-			Ok(Reply::MapVecU8OptVecU8(x)) => send(Ok(x), sender),
-			reply => log::error!("invalid reply for read request: {:?}, {:?}", reply, request),
-		}
-		Request::ReadChild { request, sender } => match result {
-			Err(e) => send(Err(e), sender),
-			Ok(Reply::MapVecU8OptVecU8(x)) => send(Ok(x), sender),
-			reply => log::error!("invalid reply for read child request: {:?}, {:?}", reply, request),
-		}
-		Request::Call { request, sender } => match result {
-			Err(e) => send(Err(e), sender),
-			Ok(Reply::VecU8(x)) => send(Ok(x), sender),
-			reply => log::error!("invalid reply for call request: {:?}, {:?}", reply, request),
-		}
-		Request::Changes { request, sender } => match result {
-			Err(e) => send(Err(e), sender),
-			Ok(Reply::VecNumberU32(x)) => send(Ok(x), sender),
-			reply => log::error!("invalid reply for changes request: {:?}, {:?}", reply, request),
-		}
-	}
-}
-
-/// Output type of inbound and outbound substream upgrades.
-#[derive(Debug)]
-pub enum Event<T> {
-	/// Incoming request from remote and substream to use for the response.
-	Request(schema::v1::light::Request, T),
-	/// Incoming response from remote.
-	Response(RequestId, Response),
-}
-
-/// Incoming response from remote.
-#[derive(Debug, Clone)]
-pub enum Response {
-	/// Incoming light response from remote.
-	Light(schema::v1::light::Response),
-	/// Incoming block response from remote.
-	Block(schema::v1::BlockResponse),
-}
-
-/// Substream upgrade protocol.
-///
-/// Reads incoming requests from remote.
-#[derive(Debug, Clone)]
-pub struct InboundProtocol {
-	/// The max. request length in bytes.
-	max_request_size: usize,
-	/// The protocol to use for upgrade negotiation.
-	protocol: Bytes,
-}
-
-impl UpgradeInfo for InboundProtocol {
-	type Info = Bytes;
-	type InfoIter = iter::Once<Self::Info>;
-
-	fn protocol_info(&self) -> Self::InfoIter {
-		iter::once(self.protocol.clone())
-	}
-}
-
-impl<T> InboundUpgrade<T> for InboundProtocol
-where
-	T: AsyncRead + AsyncWrite + Unpin + Send + 'static
-{
-	type Output = Event<T>;
-	type Error = ReadOneError;
-	type Future = BoxFuture<'static, Result<Self::Output, Self::Error>>;
-
-	fn upgrade_inbound(self, mut s: T, _: Self::Info) -> Self::Future {
-		let future = async move {
-			let vec = read_one(&mut s, self.max_request_size).await?;
-			match schema::v1::light::Request::decode(&vec[..]) {
-				Ok(r) => Ok(Event::Request(r, s)),
-				Err(e) => Err(ReadOneError::Io(io::Error::new(io::ErrorKind::Other, e)))
-			}
-		};
-		future.boxed()
-	}
-}
-
-/// Substream upgrade protocol.
-///
-/// Sends a request to remote and awaits the response.
-#[derive(Debug, Clone)]
-pub struct OutboundProtocol {
-	/// The serialized protobuf request.
-	request: Vec<u8>,
-	/// Local identifier for the request. Used to associate it with a response.
-	request_id: RequestId,
-	/// Kind of response expected for this request.
-	expected: ExpectedResponseTy,
-	/// The max. response length in bytes.
-	max_response_size: usize,
-	/// The protocol to use for upgrade negotiation.
-	protocol: Bytes,
-}
-
-/// Type of response expected from the remote for this request.
-#[derive(Debug, Clone)]
-enum ExpectedResponseTy {
-	Light,
-	Block,
-}
-
-impl UpgradeInfo for OutboundProtocol {
-	type Info = Bytes;
-	type InfoIter = iter::Once<Self::Info>;
-
-	fn protocol_info(&self) -> Self::InfoIter {
-		iter::once(self.protocol.clone())
-	}
-}
-
-impl<T> OutboundUpgrade<T> for OutboundProtocol
-where
-	T: AsyncRead + AsyncWrite + Unpin + Send + 'static
-{
-	type Output = Event<T>;
-	type Error = ReadOneError;
-	type Future = BoxFuture<'static, Result<Self::Output, Self::Error>>;
-
-	fn upgrade_outbound(self, mut s: T, _: Self::Info) -> Self::Future {
-		let future = async move {
-			write_one(&mut s, &self.request).await?;
-			let vec = read_one(&mut s, self.max_response_size).await?;
-
-			match self.expected {
-				ExpectedResponseTy::Light => {
-					schema::v1::light::Response::decode(&vec[..])
-						.map(|r| Event::Response(self.request_id, Response::Light(r)))
-						.map_err(|e| {
-							ReadOneError::Io(io::Error::new(io::ErrorKind::Other, e))
-						})
-				},
-				ExpectedResponseTy::Block => {
-					schema::v1::BlockResponse::decode(&vec[..])
-						.map(|r| Event::Response(self.request_id, Response::Block(r)))
-						.map_err(|e| {
-							ReadOneError::Io(io::Error::new(io::ErrorKind::Other, e))
-						})
-				}
-			}
-		};
-		future.boxed()
-	}
-}
-
-fn fmt_keys(first: Option<&Vec<u8>>, last: Option<&Vec<u8>>) -> String {
-	if let (Some(first), Some(last)) = (first, last) {
-		if first == last {
-			HexDisplay::from(first).to_string()
-		} else {
-			format!("{}..{}", HexDisplay::from(first), HexDisplay::from(last))
-		}
-	} else {
-		String::from("n/a")
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use async_std::task;
-	use assert_matches::assert_matches;
-	use codec::Encode;
-	use crate::{
-		chain::Client,
-		config::ProtocolId,
-		schema,
-	};
-	use futures::{channel::oneshot, prelude::*};
-	use libp2p::{
-		PeerId,
-		Multiaddr,
-		core::{
-			ConnectedPoint,
-			connection::ConnectionId,
-			identity,
-			muxing::{StreamMuxerBox, SubstreamRef},
-			transport::{Transport, Boxed, memory::MemoryTransport},
-			upgrade
-		},
-		noise::{self, Keypair, X25519, NoiseConfig},
-		swarm::{NetworkBehaviour, NetworkBehaviourAction, PollParameters},
-		yamux
-	};
-	use sc_client_api::{StorageProof, RemoteReadChildRequest, FetchChecker};
-	use sp_blockchain::{Error as ClientError};
-	use sp_core::storage::ChildInfo;
-	use std::{
-		collections::{HashMap, HashSet},
-		io,
-		iter::{self, FromIterator},
-		pin::Pin,
-		sync::Arc,
-		task::{Context, Poll}
-	};
-	use sp_runtime::{generic::Header, traits::{BlakeTwo256, Block as BlockT, NumberFor}};
-	use super::{Event, LightClientHandler, Request, Response, OutboundProtocol, PeerStatus};
-	use void::Void;
-
-	type Block = sp_runtime::generic::Block<Header<u64, BlakeTwo256>, substrate_test_runtime::Extrinsic>;
-	type Handler = LightClientHandler<Block>;
-	type Swarm = libp2p::swarm::Swarm<Handler>;
-
-	fn empty_proof() -> Vec<u8> {
-		StorageProof::empty().encode()
-	}
-
-	fn make_swarm(ok: bool, ps: sc_peerset::PeersetHandle, cf: super::Config) -> Swarm {
-		let client = Arc::new(substrate_test_runtime_client::new());
-		let checker = Arc::new(DummyFetchChecker { ok, _mark: std::marker::PhantomData });
-		let id_key = identity::Keypair::generate_ed25519();
-		let dh_key = Keypair::<X25519>::new().into_authentic(&id_key).unwrap();
-		let local_peer = id_key.public().into_peer_id();
-		let transport = MemoryTransport::default()
-			.upgrade(upgrade::Version::V1)
-			.authenticate(NoiseConfig::xx(dh_key).into_authenticated())
-			.multiplex(yamux::YamuxConfig::default())
-			.boxed();
-		Swarm::new(transport, LightClientHandler::new(cf, client, checker, ps), local_peer)
-	}
-
-	struct DummyFetchChecker<B> {
-		ok: bool,
-		_mark: std::marker::PhantomData<B>
-	}
-
-	impl<B: BlockT> light::FetchChecker<B> for DummyFetchChecker<B> {
-		fn check_header_proof(
-			&self,
-			_request: &RemoteHeaderRequest<B::Header>,
-			header: Option<B::Header>,
-			_remote_proof: StorageProof,
-		) -> Result<B::Header, ClientError> {
-			match self.ok {
-				true if header.is_some() => Ok(header.unwrap()),
-				_ => Err(ClientError::Backend("Test error".into())),
-			}
-		}
-
-		fn check_read_proof(
-			&self,
-			request: &RemoteReadRequest<B::Header>,
-			_: StorageProof,
-		) -> Result<HashMap<Vec<u8>, Option<Vec<u8>>>, ClientError> {
-			match self.ok {
-				true => Ok(request.keys
-					.iter()
-					.cloned()
-					.map(|k| (k, Some(vec![42])))
-					.collect()
-				),
-				false => Err(ClientError::Backend("Test error".into())),
-			}
-		}
-
-		fn check_read_child_proof(
-			&self,
-			request: &RemoteReadChildRequest<B::Header>,
-			_: StorageProof,
-		) -> Result<HashMap<Vec<u8>, Option<Vec<u8>>>, ClientError> {
-			match self.ok {
-				true => Ok(request.keys
-					.iter()
-					.cloned()
-					.map(|k| (k, Some(vec![42])))
-					.collect()
-				),
-				false => Err(ClientError::Backend("Test error".into())),
-			}
-		}
-
-		fn check_execution_proof(
-			&self,
-			_: &RemoteCallRequest<B::Header>,
-			_: StorageProof,
-		) -> Result<Vec<u8>, ClientError> {
-			match self.ok {
-				true => Ok(vec![42]),
-				false => Err(ClientError::Backend("Test error".into())),
-			}
-		}
-
-		fn check_changes_proof(
-			&self,
-			_: &RemoteChangesRequest<B::Header>,
-			_: ChangesProof<B::Header>
-		) -> Result<Vec<(NumberFor<B>, u32)>, ClientError> {
-			match self.ok {
-				true => Ok(vec![(100u32.into(), 2)]),
-				false => Err(ClientError::Backend("Test error".into())),
-			}
-		}
-
-		fn check_body_proof(
-			&self,
-			_: &RemoteBodyRequest<B::Header>,
-			body: Vec<B::Extrinsic>
-		) -> Result<Vec<B::Extrinsic>, ClientError> {
-			match self.ok {
-				true => Ok(body),
-				false => Err(ClientError::Backend("Test error".into())),
-			}
-		}
-	}
-
-	fn make_config() -> super::Config {
-		super::Config::new(&ProtocolId::from("foo"))
-	}
-
-	fn dummy_header() -> sp_test_primitives::Header {
-		sp_test_primitives::Header {
-			parent_hash: Default::default(),
-			number: 0,
-			state_root: Default::default(),
-			extrinsics_root: Default::default(),
-			digest: Default::default(),
-		}
-	}
-
-	struct EmptyPollParams(PeerId);
-
-	impl PollParameters for EmptyPollParams {
-		type SupportedProtocolsIter = iter::Empty<Vec<u8>>;
-		type ListenedAddressesIter = iter::Empty<Multiaddr>;
-		type ExternalAddressesIter = iter::Empty<AddressRecord>;
-
-		fn supported_protocols(&self) -> Self::SupportedProtocolsIter {
-			iter::empty()
-		}
-
-		fn listened_addresses(&self) -> Self::ListenedAddressesIter {
-			iter::empty()
-		}
-
-		fn external_addresses(&self) -> Self::ExternalAddressesIter {
-			iter::empty()
-		}
-
-		fn local_peer_id(&self) -> &PeerId {
-			&self.0
-		}
-	}
-
-	fn peerset() -> (sc_peerset::Peerset, sc_peerset::PeersetHandle) {
-		let cfg = sc_peerset::SetConfig {
-			in_peers: 128,
-			out_peers: 128,
-			bootnodes: Default::default(),
-			reserved_only: false,
-			reserved_nodes: Default::default(),
-		};
-		sc_peerset::Peerset::from_config(sc_peerset::PeersetConfig{ sets: vec![cfg] })
-	}
-
-	fn make_behaviour
-		( ok: bool
-		, ps: sc_peerset::PeersetHandle
-		, cf: super::Config
-		) -> LightClientHandler<Block>
-	{
-		let client = Arc::new(substrate_test_runtime_client::new());
-		let checker = Arc::new(DummyFetchChecker { ok, _mark: std::marker::PhantomData });
-		LightClientHandler::new(cf, client, checker, ps)
-	}
-
-	fn empty_dialer() -> ConnectedPoint {
-		ConnectedPoint::Dialer { address: Multiaddr::empty() }
-	}
-
-	fn poll(mut b: &mut LightClientHandler<Block>) -> Poll<NetworkBehaviourAction<OutboundProtocol, Void>> {
-		let mut p = EmptyPollParams(PeerId::random());
-		match future::poll_fn(|cx| Pin::new(&mut b).poll(cx, &mut p)).now_or_never() {
-			Some(a) => Poll::Ready(a),
-			None    => Poll::Pending
-		}
-	}
-
-	#[test]
-	fn disconnects_from_peer_if_told() {
-		let peer = PeerId::random();
-		let pset = peerset();
-		let mut behaviour = make_behaviour(true, pset.1, make_config());
-
-		behaviour.inject_connection_established(&peer, &ConnectionId::new(1), &empty_dialer());
-		behaviour.inject_connected(&peer);
-		assert_eq!(1, behaviour.peers.len());
-
-		behaviour.inject_connection_closed(&peer, &ConnectionId::new(1), &empty_dialer());
-		behaviour.inject_disconnected(&peer);
-		assert_eq!(0, behaviour.peers.len())
-	}
-
-	#[test]
-	fn disconnects_from_peer_if_request_times_out() {
-		let peer0 = PeerId::random();
-		let peer1 = PeerId::random();
-		let pset = peerset();
-		let mut behaviour = make_behaviour(true, pset.1, make_config());
-
-		behaviour.inject_connection_established(&peer0, &ConnectionId::new(1), &empty_dialer());
-		behaviour.inject_connected(&peer0);
-		behaviour.inject_connection_established(&peer1, &ConnectionId::new(2), &empty_dialer());
-		behaviour.inject_connected(&peer1);
-
-		// We now know about two peers.
-		assert_eq!(HashSet::from_iter(&[peer0.clone(), peer1.clone()]), behaviour.peers.keys().collect::<HashSet<_>>());
-
-		// No requests have been made yet.
-		assert!(behaviour.pending_requests.is_empty());
-		assert!(behaviour.outstanding.is_empty());
-
-		// Issue our first request!
-		let chan = oneshot::channel();
-		let request = light::RemoteCallRequest {
-			block: Default::default(),
-			header: dummy_header(),
-			method: "test".into(),
-			call_data: vec![],
-			retry_count: Some(1),
-		};
-		behaviour.request(Request::Call { request, sender: chan.0 }).unwrap();
-		assert_eq!(1, behaviour.pending_requests.len());
-
-		// The behaviour should now attempt to send the request.
-		assert_matches!(poll(&mut behaviour), Poll::Ready(NetworkBehaviourAction::NotifyHandler { peer_id, .. }) => {
-			assert!(peer_id == peer0 || peer_id == peer1)
-		});
-
-		// And we should have one busy peer.
-		assert!({
-			let (idle, busy): (Vec<_>, Vec<_>) =
-				behaviour.peers.iter().partition(|(_, info)| info.status == PeerStatus::Idle);
-
-			idle.len() == 1 && busy.len() == 1
-				&& (idle[0].0 == &peer0 || busy[0].0 == &peer0)
-				&& (idle[0].0 == &peer1 || busy[0].0 == &peer1)
-		});
-
-		// No more pending requests, but one should be outstanding.
-		assert_eq!(0, behaviour.pending_requests.len());
-		assert_eq!(1, behaviour.outstanding.len());
-
-		// We now set back the timestamp of the outstanding request to make it expire.
-		let request = behaviour.outstanding.values_mut().next().unwrap();
-		request.timestamp -= make_config().request_timeout;
-
-		// Make progress, but do not expect some action.
-		assert_matches!(poll(&mut behaviour), Poll::Pending);
-
-		// The request should have timed out by now and the corresponding peer be removed.
-		assert_eq!(1, behaviour.peers.len());
-		// Since we asked for one retry, the request should be back in the pending queue.
-		assert_eq!(1, behaviour.pending_requests.len());
-		// No other request should be ongoing.
-		assert_eq!(0, behaviour.outstanding.len());
-	}
-
-	#[test]
-	fn disconnects_from_peer_on_incorrect_response() {
-		let peer = PeerId::random();
-		let pset = peerset();
-		let mut behaviour = make_behaviour(false, pset.1, make_config());
-		//                                 ^--- Making sure the response data check fails.
-
-		let conn = ConnectionId::new(1);
-		behaviour.inject_connection_established(&peer, &conn, &empty_dialer());
-		behaviour.inject_connected(&peer);
-		assert_eq!(1, behaviour.peers.len());
-
-		let chan = oneshot::channel();
-		let request = light::RemoteCallRequest {
-			block: Default::default(),
-			header: dummy_header(),
-			method: "test".into(),
-			call_data: vec![],
-			retry_count: Some(1),
-		};
-		behaviour.request(Request::Call { request, sender: chan.0 }).unwrap();
-
-		assert_eq!(1, behaviour.pending_requests.len());
-		assert_eq!(0, behaviour.outstanding.len());
-		poll(&mut behaviour); // Make progress
-		assert_eq!(0, behaviour.pending_requests.len());
-		assert_eq!(1, behaviour.outstanding.len());
-
-		let request_id = *behaviour.outstanding.keys().next().unwrap();
-
-		let response = {
-			let r = schema::v1::light::RemoteCallResponse { proof: empty_proof() };
-			schema::v1::light::Response {
-				response: Some(schema::v1::light::response::Response::RemoteCallResponse(r)),
-			}
-		};
-
-		behaviour.inject_event(peer.clone(), conn, Event::Response(request_id, Response::Light(response)));
-		assert!(behaviour.peers.is_empty());
-
-		poll(&mut behaviour); // More progress
-
-		// The request should be back in the pending queue
-		assert_eq!(1, behaviour.pending_requests.len());
-		assert_eq!(0, behaviour.outstanding.len());
-	}
-
-	#[test]
-	fn disconnects_from_peer_on_unexpected_response() {
-		let peer = PeerId::random();
-		let pset = peerset();
-		let mut behaviour = make_behaviour(true, pset.1, make_config());
-
-		let conn = ConnectionId::new(1);
-		behaviour.inject_connection_established(&peer, &conn, &empty_dialer());
-		behaviour.inject_connected(&peer);
-		assert_eq!(1, behaviour.peers.len());
-		assert_eq!(0, behaviour.pending_requests.len());
-		assert_eq!(0, behaviour.outstanding.len());
-
-		// Some unsolicited response
-		let response = {
-			let r = schema::v1::light::RemoteCallResponse { proof: empty_proof() };
-			schema::v1::light::Response {
-				response: Some(schema::v1::light::response::Response::RemoteCallResponse(r)),
-			}
-		};
-
-		behaviour.inject_event(peer.clone(), conn, Event::Response(2347895932, Response::Light(response)));
-
-		assert!(behaviour.peers.is_empty());
-		poll(&mut behaviour);
-		assert_eq!(0, behaviour.pending_requests.len());
-		assert_eq!(0, behaviour.outstanding.len());
-	}
-
-	#[test]
-	fn disconnects_from_peer_on_wrong_response_type() {
-		let peer = PeerId::random();
-		let pset = peerset();
-		let mut behaviour = make_behaviour(true, pset.1, make_config());
-
-		let conn = ConnectionId::new(1);
-		behaviour.inject_connection_established(&peer, &conn, &empty_dialer());
-		behaviour.inject_connected(&peer);
-		assert_eq!(1, behaviour.peers.len());
-
-		let chan = oneshot::channel();
-		let request = light::RemoteCallRequest {
-			block: Default::default(),
-			header: dummy_header(),
-			method: "test".into(),
-			call_data: vec![],
-			retry_count: Some(1),
-		};
-		behaviour.request(Request::Call { request, sender: chan.0 }).unwrap();
-
-		assert_eq!(1, behaviour.pending_requests.len());
-		assert_eq!(0, behaviour.outstanding.len());
-		poll(&mut behaviour); // Make progress
-		assert_eq!(0, behaviour.pending_requests.len());
-		assert_eq!(1, behaviour.outstanding.len());
-
-		let request_id = *behaviour.outstanding.keys().next().unwrap();
-
-		let response = {
-			let r = schema::v1::light::RemoteReadResponse { proof: empty_proof() }; // Not a RemoteCallResponse!
-			schema::v1::light::Response {
-				response: Some(schema::v1::light::response::Response::RemoteReadResponse(r)),
-			}
-		};
-
-		behaviour.inject_event(peer.clone(), conn, Event::Response(request_id, Response::Light(response)));
-		assert!(behaviour.peers.is_empty());
-
-		poll(&mut behaviour); // More progress
-
-		// The request should be back in the pending queue
-		assert_eq!(1, behaviour.pending_requests.len());
-		assert_eq!(0, behaviour.outstanding.len());
-	}
-
-	#[test]
-	fn receives_remote_failure_after_retry_count_failures() {
-		let peer1 = PeerId::random();
-		let peer2 = PeerId::random();
-		let peer3 = PeerId::random();
-		let peer4 = PeerId::random();
-		let pset = peerset();
-		let mut behaviour = make_behaviour(false, pset.1, make_config());
-		//                                 ^--- Making sure the response data check fails.
-
-		let conn1 = ConnectionId::new(1);
-		behaviour.inject_connection_established(&peer1, &conn1, &empty_dialer());
-		behaviour.inject_connected(&peer1);
-		let conn2 = ConnectionId::new(2);
-		behaviour.inject_connection_established(&peer2, &conn2, &empty_dialer());
-		behaviour.inject_connected(&peer2);
-		let conn3 = ConnectionId::new(3);
-		behaviour.inject_connection_established(&peer3, &conn3, &empty_dialer());
-		behaviour.inject_connected(&peer3);
-		let conn4 = ConnectionId::new(3);
-		behaviour.inject_connection_established(&peer4, &conn4, &empty_dialer());
-		behaviour.inject_connected(&peer4);
-		assert_eq!(4, behaviour.peers.len());
-
-		let mut chan = oneshot::channel();
-		let request = light::RemoteCallRequest {
-			block: Default::default(),
-			header: dummy_header(),
-			method: "test".into(),
-			call_data: vec![],
-			retry_count: Some(3), // Attempt up to three retries.
-		};
-		behaviour.request(Request::Call { request, sender: chan.0 }).unwrap();
-
-		assert_eq!(1, behaviour.pending_requests.len());
-		assert_eq!(0, behaviour.outstanding.len());
-		assert_matches!(poll(&mut behaviour), Poll::Ready(NetworkBehaviourAction::NotifyHandler { .. }));
-		assert_eq!(0, behaviour.pending_requests.len());
-		assert_eq!(1, behaviour.outstanding.len());
-
-		for i in 1 ..= 3 {
-			// Construct an invalid response
-			let request_id = *behaviour.outstanding.keys().next().unwrap();
-			let responding_peer = behaviour.outstanding.values().next().unwrap().peer.clone();
-			let response = {
-				let r = schema::v1::light::RemoteCallResponse { proof: empty_proof() };
-				schema::v1::light::Response {
-					response: Some(schema::v1::light::response::Response::RemoteCallResponse(r))
-				}
-			};
-			let conn = ConnectionId::new(i);
-			behaviour.inject_event(responding_peer, conn, Event::Response(request_id, Response::Light(response.clone())));
-			assert_matches!(poll(&mut behaviour), Poll::Ready(NetworkBehaviourAction::NotifyHandler { .. }));
-			assert_matches!(chan.1.try_recv(), Ok(None))
-		}
-		// Final invalid response
-		let request_id = *behaviour.outstanding.keys().next().unwrap();
-		let responding_peer = behaviour.outstanding.values().next().unwrap().peer.clone();
-		let response = {
-			let r = schema::v1::light::RemoteCallResponse { proof: empty_proof() };
-			schema::v1::light::Response {
-				response: Some(schema::v1::light::response::Response::RemoteCallResponse(r)),
-			}
-		};
-		behaviour.inject_event(responding_peer, conn4, Event::Response(request_id, Response::Light(response)));
-		assert_matches!(poll(&mut behaviour), Poll::Pending);
-		assert_matches!(chan.1.try_recv(), Ok(Some(Err(ClientError::RemoteFetchFailed))))
-	}
-
-	fn issue_request(request: Request<Block>) {
-		let peer = PeerId::random();
-		let pset = peerset();
-		let mut behaviour = make_behaviour(true, pset.1, make_config());
-
-		let conn = ConnectionId::new(1);
-		behaviour.inject_connection_established(&peer, &conn, &empty_dialer());
-		behaviour.inject_connected(&peer);
-		assert_eq!(1, behaviour.peers.len());
-
-		let response = match request {
-			Request::Body { .. } => unimplemented!(),
-			Request::Header{..} => {
-				let r = schema::v1::light::RemoteHeaderResponse {
-					header: dummy_header().encode(),
-					proof: empty_proof()
-				};
-				schema::v1::light::Response {
-					response: Some(schema::v1::light::response::Response::RemoteHeaderResponse(r)),
-				}
-			}
-			Request::Read{..} => {
-				let r = schema::v1::light::RemoteReadResponse { proof: empty_proof() };
-				schema::v1::light::Response {
-					response: Some(schema::v1::light::response::Response::RemoteReadResponse(r)),
-				}
-			}
-			Request::ReadChild{..} => {
-				let r = schema::v1::light::RemoteReadResponse { proof: empty_proof() };
-				schema::v1::light::Response {
-					response: Some(schema::v1::light::response::Response::RemoteReadResponse(r)),
-				}
-			}
-			Request::Call{..} => {
-				let r = schema::v1::light::RemoteCallResponse { proof: empty_proof() };
-				schema::v1::light::Response {
-					response: Some(schema::v1::light::response::Response::RemoteCallResponse(r)),
-				}
-			}
-			Request::Changes{..} => {
-				let r = schema::v1::light::RemoteChangesResponse {
-					max: iter::repeat(1).take(32).collect(),
-					proof: Vec::new(),
-					roots: Vec::new(),
-					roots_proof: empty_proof()
-				};
-				schema::v1::light::Response {
-					response: Some(schema::v1::light::response::Response::RemoteChangesResponse(r)),
-				}
-			}
-		};
-
-		behaviour.request(request).unwrap();
-
-		assert_eq!(1, behaviour.pending_requests.len());
-		assert_eq!(0, behaviour.outstanding.len());
-		assert_matches!(poll(&mut behaviour), Poll::Ready(NetworkBehaviourAction::NotifyHandler { .. }));
-		assert_eq!(0, behaviour.pending_requests.len());
-		assert_eq!(1, behaviour.outstanding.len());
-		assert_eq!(1, *behaviour.outstanding.keys().next().unwrap());
-
-		behaviour.inject_event(peer.clone(), conn, Event::Response(1, Response::Light(response)));
-
-		poll(&mut behaviour);
-
-		assert_eq!(0, behaviour.pending_requests.len());
-		assert_eq!(0, behaviour.outstanding.len())
-	}
-
-	#[test]
-	fn receives_remote_call_response() {
-		let mut chan = oneshot::channel();
-		let request = light::RemoteCallRequest {
-			block: Default::default(),
-			header: dummy_header(),
-			method: "test".into(),
-			call_data: vec![],
-			retry_count: None,
-		};
-		issue_request(Request::Call { request, sender: chan.0 });
-		assert_matches!(chan.1.try_recv(), Ok(Some(Ok(_))))
-	}
-
-	#[test]
-	fn receives_remote_read_response() {
-		let mut chan = oneshot::channel();
-		let request = light::RemoteReadRequest {
-			header: dummy_header(),
-			block: Default::default(),
-			keys: vec![b":key".to_vec()],
-			retry_count: None,
-		};
-		issue_request(Request::Read { request, sender: chan.0 });
-		assert_matches!(chan.1.try_recv(), Ok(Some(Ok(_))))
-	}
-
-	#[test]
-	fn receives_remote_read_child_response() {
-		let mut chan = oneshot::channel();
-		let child_info = ChildInfo::new_default(&b":child_storage:default:sub"[..]);
-		let request = light::RemoteReadChildRequest {
-			header: dummy_header(),
-			block: Default::default(),
-			storage_key: child_info.prefixed_storage_key(),
-			keys: vec![b":key".to_vec()],
-			retry_count: None,
-		};
-		issue_request(Request::ReadChild { request, sender: chan.0 });
-		assert_matches!(chan.1.try_recv(), Ok(Some(Ok(_))))
-	}
-
-	#[test]
-	fn receives_remote_header_response() {
-		let mut chan = oneshot::channel();
-		let request = light::RemoteHeaderRequest {
-			cht_root: Default::default(),
-			block: 1,
-			retry_count: None,
-		};
-		issue_request(Request::Header { request, sender: chan.0 });
-		assert_matches!(chan.1.try_recv(), Ok(Some(Ok(_))))
-	}
-
-	#[test]
-	fn receives_remote_changes_response() {
-		let mut chan = oneshot::channel();
-		let request = light::RemoteChangesRequest {
-			changes_trie_configs: vec![sp_core::ChangesTrieConfigurationRange {
-				zero: (0, Default::default()),
-				end: None,
-				config: Some(sp_core::ChangesTrieConfiguration::new(4, 2)),
-			}],
-			first_block: (1, Default::default()),
-			last_block: (100, Default::default()),
-			max_block: (100, Default::default()),
-			tries_roots: (1, Default::default(), Vec::new()),
-			key: Vec::new(),
-			storage_key: None,
-			retry_count: None,
-		};
-		issue_request(Request::Changes { request, sender: chan.0 });
-		assert_matches!(chan.1.try_recv(), Ok(Some(Ok(_))))
-	}
-
-	fn send_receive(request: Request<Block>) {
-		// We start a swarm on the listening side which awaits incoming requests and answers them:
-		let local_pset = peerset();
-		let local_listen_addr: libp2p::Multiaddr = libp2p::multiaddr::Protocol::Memory(rand::random()).into();
-		let mut local_swarm = make_swarm(true, local_pset.1, make_config());
-		Swarm::listen_on(&mut local_swarm, local_listen_addr.clone()).unwrap();
-
-		// We also start a swarm that makes requests and awaits responses:
-		let remote_pset = peerset();
-		let mut remote_swarm = make_swarm(true, remote_pset.1, make_config());
-
-		// We now schedule a request, dial the remote and let the two swarm work it out:
-		remote_swarm.request(request).unwrap();
-		Swarm::dial_addr(&mut remote_swarm, local_listen_addr).unwrap();
-
-		let future = {
-			let a = local_swarm.for_each(|_| future::ready(()));
-			let b = remote_swarm.for_each(|_| future::ready(()));
-			future::join(a, b).map(|_| ())
-		};
-
-		task::spawn(future);
-	}
-
-	#[test]
-	fn send_receive_call() {
-		let chan = oneshot::channel();
-		let request = light::RemoteCallRequest {
-			block: Default::default(),
-			header: dummy_header(),
-			method: "test".into(),
-			call_data: vec![],
-			retry_count: None,
-		};
-		send_receive(Request::Call { request, sender: chan.0 });
-		assert_eq!(vec![42], task::block_on(chan.1).unwrap().unwrap());
-		//              ^--- from `DummyFetchChecker::check_execution_proof`
-	}
-
-	#[test]
-	fn send_receive_read() {
-		let chan = oneshot::channel();
-		let request = light::RemoteReadRequest {
-			header: dummy_header(),
-			block: Default::default(),
-			keys: vec![b":key".to_vec()],
-			retry_count: None
-		};
-		send_receive(Request::Read { request, sender: chan.0 });
-		assert_eq!(Some(vec![42]), task::block_on(chan.1).unwrap().unwrap().remove(&b":key"[..]).unwrap());
-		//                   ^--- from `DummyFetchChecker::check_read_proof`
-	}
-
-	#[test]
-	fn send_receive_read_child() {
-		let chan = oneshot::channel();
-		let child_info = ChildInfo::new_default(&b":child_storage:default:sub"[..]);
-		let request = light::RemoteReadChildRequest {
-			header: dummy_header(),
-			block: Default::default(),
-			storage_key: child_info.prefixed_storage_key(),
-			keys: vec![b":key".to_vec()],
-			retry_count: None,
-		};
-		send_receive(Request::ReadChild { request, sender: chan.0 });
-		assert_eq!(Some(vec![42]), task::block_on(chan.1).unwrap().unwrap().remove(&b":key"[..]).unwrap());
-		//                   ^--- from `DummyFetchChecker::check_read_child_proof`
-	}
-
-	#[test]
-	fn send_receive_header() {
-		sp_tracing::try_init_simple();
-		let chan = oneshot::channel();
-		let request = light::RemoteHeaderRequest {
-			cht_root: Default::default(),
-			block: 1,
-			retry_count: None,
-		};
-		send_receive(Request::Header { request, sender: chan.0 });
-		// The remote does not know block 1:
-		assert_matches!(task::block_on(chan.1).unwrap(), Err(ClientError::RemoteFetchFailed));
-	}
-
-	#[test]
-	fn send_receive_changes() {
-		let chan = oneshot::channel();
-		let request = light::RemoteChangesRequest {
-			changes_trie_configs: vec![sp_core::ChangesTrieConfigurationRange {
-				zero: (0, Default::default()),
-				end: None,
-				config: Some(sp_core::ChangesTrieConfiguration::new(4, 2)),
-			}],
-			first_block: (1, Default::default()),
-			last_block: (100, Default::default()),
-			max_block: (100, Default::default()),
-			tries_roots: (1, Default::default(), Vec::new()),
-			key: Vec::new(),
-			storage_key: None,
-			retry_count: None,
-		};
-		send_receive(Request::Changes { request, sender: chan.0 });
-		assert_eq!(vec![(100, 2)], task::block_on(chan.1).unwrap().unwrap());
-		//              ^--- from `DummyFetchChecker::check_changes_proof`
-	}
-
-	#[test]
-	fn body_request_fields_encoded_properly() {
-		let (sender, _) = oneshot::channel();
-		let serialized_request = serialize_request::<Block>(&Request::Body {
-			request: RemoteBodyRequest {
-				header: dummy_header(),
-				retry_count: None,
-			},
-			sender,
-		}).unwrap();
-		let deserialized_request = schema::v1::BlockRequest::decode(&serialized_request[..]).unwrap();
-		assert!(
-			BlockAttributes::from_be_u32(deserialized_request.fields)
-				.unwrap()
-				.contains(BlockAttributes::BODY)
-		);
-	}
-}
diff --git a/client/network/src/light_client_requests.rs b/client/network/src/light_client_requests.rs
new file mode 100644
index 000000000000..f859a35f45b2
--- /dev/null
+++ b/client/network/src/light_client_requests.rs
@@ -0,0 +1,334 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! Helpers for outgoing and incoming light client requests.
+
+/// For outgoing light client requests.
+pub mod sender;
+/// For incoming light client requests.
+pub mod handler;
+
+use crate::config::ProtocolId;
+use crate::request_responses::ProtocolConfig;
+
+use std::time::Duration;
+
+/// Generate the light client protocol name from chain specific protocol identifier.
+fn generate_protocol_name(protocol_id: &ProtocolId) -> String {
+	let mut s = String::new();
+	s.push_str("/");
+	s.push_str(protocol_id.as_ref());
+	s.push_str("/light/2");
+	s
+}
+
+/// Generates a [`ProtocolConfig`] for the light client request protocol, refusing incoming requests.
+pub fn generate_protocol_config(protocol_id: &ProtocolId) -> ProtocolConfig {
+	ProtocolConfig {
+		name: generate_protocol_name(protocol_id).into(),
+		max_request_size: 1 * 1024 * 1024,
+		max_response_size: 16 * 1024 * 1024,
+		request_timeout: Duration::from_secs(15),
+		inbound_queue: None,
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use crate::request_responses::IncomingRequest;
+	use crate::config::ProtocolId;
+
+	use assert_matches::assert_matches;
+	use futures::executor::{block_on, LocalPool};
+	use futures::task::Spawn;
+	use futures::{channel::oneshot, prelude::*};
+	use libp2p::PeerId;
+	use sc_client_api::StorageProof;
+	use sc_client_api::light::{RemoteCallRequest, RemoteChangesRequest, RemoteHeaderRequest};
+	use sc_client_api::light::{self, RemoteReadRequest, RemoteBodyRequest, ChangesProof};
+	use sc_client_api::{FetchChecker, RemoteReadChildRequest};
+	use sp_blockchain::Error as ClientError;
+	use sp_core::storage::ChildInfo;
+	use sp_runtime::generic::Header;
+	use sp_runtime::traits::{BlakeTwo256, Block as BlockT, NumberFor};
+	use std::collections::HashMap;
+	use std::sync::Arc;
+
+	pub struct DummyFetchChecker<B> {
+		pub ok: bool,
+		pub _mark: std::marker::PhantomData<B>,
+	}
+
+	impl<B: BlockT> FetchChecker<B> for DummyFetchChecker<B> {
+		fn check_header_proof(
+			&self,
+			_request: &RemoteHeaderRequest<B::Header>,
+			header: Option<B::Header>,
+			_remote_proof: StorageProof,
+		) -> Result<B::Header, ClientError> {
+			match self.ok {
+				true if header.is_some() => Ok(header.unwrap()),
+				_ => Err(ClientError::Backend("Test error".into())),
+			}
+		}
+
+		fn check_read_proof(
+			&self,
+			request: &RemoteReadRequest<B::Header>,
+			_: StorageProof,
+		) -> Result<HashMap<Vec<u8>, Option<Vec<u8>>>, ClientError> {
+			match self.ok {
+				true => Ok(request
+					.keys
+					.iter()
+					.cloned()
+					.map(|k| (k, Some(vec![42])))
+					.collect()),
+				false => Err(ClientError::Backend("Test error".into())),
+			}
+		}
+
+		fn check_read_child_proof(
+			&self,
+			request: &RemoteReadChildRequest<B::Header>,
+			_: StorageProof,
+		) -> Result<HashMap<Vec<u8>, Option<Vec<u8>>>, ClientError> {
+			match self.ok {
+				true => Ok(request
+					.keys
+					.iter()
+					.cloned()
+					.map(|k| (k, Some(vec![42])))
+					.collect()),
+				false => Err(ClientError::Backend("Test error".into())),
+			}
+		}
+
+		fn check_execution_proof(
+			&self,
+			_: &RemoteCallRequest<B::Header>,
+			_: StorageProof,
+		) -> Result<Vec<u8>, ClientError> {
+			match self.ok {
+				true => Ok(vec![42]),
+				false => Err(ClientError::Backend("Test error".into())),
+			}
+		}
+
+		fn check_changes_proof(
+			&self,
+			_: &RemoteChangesRequest<B::Header>,
+			_: ChangesProof<B::Header>,
+		) -> Result<Vec<(NumberFor<B>, u32)>, ClientError> {
+			match self.ok {
+				true => Ok(vec![(100u32.into(), 2)]),
+				false => Err(ClientError::Backend("Test error".into())),
+			}
+		}
+
+		fn check_body_proof(
+			&self,
+			_: &RemoteBodyRequest<B::Header>,
+			body: Vec<B::Extrinsic>,
+		) -> Result<Vec<B::Extrinsic>, ClientError> {
+			match self.ok {
+				true => Ok(body),
+				false => Err(ClientError::Backend("Test error".into())),
+			}
+		}
+	}
+
+	pub fn protocol_id() -> ProtocolId {
+		ProtocolId::from("test")
+	}
+
+	pub fn peerset() -> (sc_peerset::Peerset, sc_peerset::PeersetHandle) {
+		let cfg = sc_peerset::SetConfig {
+			in_peers: 128,
+			out_peers: 128,
+			bootnodes: Default::default(),
+			reserved_only: false,
+			reserved_nodes: Default::default(),
+		};
+		sc_peerset::Peerset::from_config(sc_peerset::PeersetConfig { sets: vec![cfg] })
+	}
+
+	pub fn dummy_header() -> sp_test_primitives::Header {
+		sp_test_primitives::Header {
+			parent_hash: Default::default(),
+			number: 0,
+			state_root: Default::default(),
+			extrinsics_root: Default::default(),
+			digest: Default::default(),
+		}
+	}
+
+	type Block =
+		sp_runtime::generic::Block<Header<u64, BlakeTwo256>, substrate_test_runtime::Extrinsic>;
+
+	fn send_receive(request: sender::Request<Block>, pool: &LocalPool) {
+		let client = Arc::new(substrate_test_runtime_client::new());
+		let (handler, protocol_config) = handler::LightClientRequestHandler::new(&protocol_id(), client);
+		pool.spawner().spawn_obj(handler.run().boxed().into()).unwrap();
+
+		let (_peer_set, peer_set_handle) = peerset();
+		let mut sender = sender::LightClientRequestSender::<Block>::new(
+			&protocol_id(),
+			Arc::new(crate::light_client_requests::tests::DummyFetchChecker {
+				ok: true,
+				_mark: std::marker::PhantomData,
+			}),
+			peer_set_handle,
+		);
+		sender.inject_connected(PeerId::random());
+
+		sender.request(request).unwrap();
+		let sender::OutEvent::SendRequest { pending_response, request, .. } = block_on(sender.next()).unwrap();
+		let (tx, rx) = oneshot::channel();
+		block_on(protocol_config.inbound_queue.unwrap().send(IncomingRequest {
+			peer: PeerId::random(),
+			payload: request,
+			pending_response: tx,
+		})).unwrap();
+		pool.spawner().spawn_obj(async move {
+			pending_response.send(Ok(rx.await.unwrap().result.unwrap())).unwrap();
+		}.boxed().into()).unwrap();
+
+		pool.spawner().spawn_obj(sender.for_each(|_| future::ready(())).boxed().into()).unwrap();
+	}
+
+	#[test]
+	fn send_receive_call() {
+		let chan = oneshot::channel();
+		let request = light::RemoteCallRequest {
+			block: Default::default(),
+			header: dummy_header(),
+			method: "test".into(),
+			call_data: vec![],
+			retry_count: None,
+		};
+
+		let mut pool = LocalPool::new();
+		send_receive(sender::Request::Call {
+			request,
+			sender: chan.0,
+		}, &pool);
+		assert_eq!(vec![42], pool.run_until(chan.1).unwrap().unwrap());
+		//              ^--- from `DummyFetchChecker::check_execution_proof`
+	}
+
+	#[test]
+	fn send_receive_read() {
+		let chan = oneshot::channel();
+		let request = light::RemoteReadRequest {
+			header: dummy_header(),
+			block: Default::default(),
+			keys: vec![b":key".to_vec()],
+			retry_count: None,
+		};
+		let mut pool = LocalPool::new();
+		send_receive(sender::Request::Read {
+			request,
+			sender: chan.0,
+		}, &pool);
+		assert_eq!(
+			Some(vec![42]),
+			pool.run_until(chan.1)
+				.unwrap()
+				.unwrap()
+				.remove(&b":key"[..])
+				.unwrap()
+		);
+		//                   ^--- from `DummyFetchChecker::check_read_proof`
+	}
+
+	#[test]
+	fn send_receive_read_child() {
+		let chan = oneshot::channel();
+		let child_info = ChildInfo::new_default(&b":child_storage:default:sub"[..]);
+		let request = light::RemoteReadChildRequest {
+			header: dummy_header(),
+			block: Default::default(),
+			storage_key: child_info.prefixed_storage_key(),
+			keys: vec![b":key".to_vec()],
+			retry_count: None,
+		};
+		let mut pool = LocalPool::new();
+		send_receive(sender::Request::ReadChild {
+			request,
+			sender: chan.0,
+		}, &pool);
+		assert_eq!(
+			Some(vec![42]),
+			pool.run_until(chan.1)
+				.unwrap()
+				.unwrap()
+				.remove(&b":key"[..])
+				.unwrap()
+		);
+		//                   ^--- from `DummyFetchChecker::check_read_child_proof`
+	}
+
+	#[test]
+	fn send_receive_header() {
+		sp_tracing::try_init_simple();
+		let chan = oneshot::channel();
+		let request = light::RemoteHeaderRequest {
+			cht_root: Default::default(),
+			block: 1,
+			retry_count: None,
+		};
+		let mut pool = LocalPool::new();
+		send_receive(sender::Request::Header {
+			request,
+			sender: chan.0,
+		}, &pool);
+		// The remote does not know block 1:
+		assert_matches!(
+			pool.run_until(chan.1).unwrap(),
+			Err(ClientError::RemoteFetchFailed)
+		);
+	}
+
+	#[test]
+	fn send_receive_changes() {
+		let chan = oneshot::channel();
+		let request = light::RemoteChangesRequest {
+			changes_trie_configs: vec![sp_core::ChangesTrieConfigurationRange {
+				zero: (0, Default::default()),
+				end: None,
+				config: Some(sp_core::ChangesTrieConfiguration::new(4, 2)),
+			}],
+			first_block: (1, Default::default()),
+			last_block: (100, Default::default()),
+			max_block: (100, Default::default()),
+			tries_roots: (1, Default::default(), Vec::new()),
+			key: Vec::new(),
+			storage_key: None,
+			retry_count: None,
+		};
+		let mut pool = LocalPool::new();
+		send_receive(sender::Request::Changes {
+			request,
+			sender: chan.0,
+		}, &pool);
+		assert_eq!(vec![(100, 2)], pool.run_until(chan.1).unwrap().unwrap());
+		//              ^--- from `DummyFetchChecker::check_changes_proof`
+	}
+}
diff --git a/client/network/src/light_client_requests/handler.rs b/client/network/src/light_client_requests/handler.rs
new file mode 100644
index 000000000000..08de99a0a5de
--- /dev/null
+++ b/client/network/src/light_client_requests/handler.rs
@@ -0,0 +1,399 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! Helper for incoming light client requests.
+//!
+//! Handle (i.e. answer) incoming light client requests from a remote peer received via
+//! [`crate::request_responses::RequestResponsesBehaviour`] with [`LightClientRequestHandler`].
+
+use codec::{self, Encode, Decode};
+use crate::{
+	chain::Client,
+	config::ProtocolId,
+	schema,
+	PeerId,
+};
+use crate::request_responses::{IncomingRequest, OutgoingResponse, ProtocolConfig};
+use futures::{channel::mpsc,  prelude::*};
+use prost::Message;
+use sc_client_api::{
+	StorageProof,
+	light
+};
+use sc_peerset::ReputationChange;
+use sp_core::{
+	storage::{ChildInfo, ChildType,StorageKey, PrefixedStorageKey},
+	hexdisplay::HexDisplay,
+};
+use sp_runtime::{
+	traits::{Block, Zero},
+	generic::BlockId,
+};
+use std::{
+	collections::{BTreeMap},
+	sync::Arc,
+};
+use log::debug;
+
+const LOG_TARGET: &str = "light-client-request-handler";
+
+/// Handler for incoming light client requests from a remote peer.
+pub struct LightClientRequestHandler<B: Block> {
+	request_receiver: mpsc::Receiver<IncomingRequest>,
+	/// Blockchain client.
+	client: Arc<dyn Client<B>>,
+}
+
+impl<B: Block> LightClientRequestHandler<B> {
+	/// Create a new [`BlockRequestHandler`].
+	pub fn new(
+		protocol_id: &ProtocolId,
+		client: Arc<dyn Client<B>>,
+	) -> (Self, ProtocolConfig) {
+		// For now due to lack of data on light client request handling in production systems, this
+		// value is chosen to match the block request limit.
+		let (tx, request_receiver) = mpsc::channel(20);
+
+		let mut protocol_config = super::generate_protocol_config(protocol_id);
+		protocol_config.inbound_queue = Some(tx);
+
+		(Self { client, request_receiver }, protocol_config)
+	}
+
+	/// Run [`LightClientRequestHandler`].
+	pub async fn run(mut self) {
+		while let Some(request) = self.request_receiver.next().await {
+			let IncomingRequest { peer, payload, pending_response } = request;
+
+			match self.handle_request(peer, payload) {
+				Ok(response_data) => {
+					let response = OutgoingResponse { result: Ok(response_data), reputation_changes: Vec::new() };
+					match pending_response.send(response) {
+						Ok(()) => debug!(
+							target: LOG_TARGET,
+							"Handled light client request from {}.",
+							peer,
+						),
+						Err(_) => debug!(
+							target: LOG_TARGET,
+							"Failed to handle light client request from {}: {}",
+							peer, HandleRequestError::SendResponse,
+						),
+					};
+				} ,
+				Err(e) => {
+					debug!(
+						target: LOG_TARGET,
+						"Failed to handle light client request from {}: {}",
+						peer, e,
+					);
+
+					let reputation_changes = match e {
+						HandleRequestError::BadRequest(_) => {
+							vec![ReputationChange::new(-(1 << 12), "bad request")]
+						}
+						_ => Vec::new(),
+					};
+
+					let response = OutgoingResponse { result: Err(()), reputation_changes };
+					if pending_response.send(response).is_err() {
+						debug!(
+							target: LOG_TARGET,
+							"Failed to handle light client request from {}: {}",
+							peer, HandleRequestError::SendResponse,
+						);
+					};
+				},
+			}
+		}
+	}
+
+
+	fn handle_request(
+		&mut self,
+		peer: PeerId,
+		payload: Vec<u8>,
+	) -> Result<Vec<u8>, HandleRequestError> {
+		let request = schema::v1::light::Request::decode(&payload[..])?;
+
+		let response = match &request.request {
+			Some(schema::v1::light::request::Request::RemoteCallRequest(r)) =>
+				self.on_remote_call_request(&peer, r)?,
+			Some(schema::v1::light::request::Request::RemoteReadRequest(r)) =>
+				self.on_remote_read_request(&peer, r)?,
+			Some(schema::v1::light::request::Request::RemoteHeaderRequest(r)) =>
+				self.on_remote_header_request(&peer, r)?,
+			Some(schema::v1::light::request::Request::RemoteReadChildRequest(r)) =>
+				self.on_remote_read_child_request(&peer, r)?,
+			Some(schema::v1::light::request::Request::RemoteChangesRequest(r)) =>
+				self.on_remote_changes_request(&peer, r)?,
+			None => {
+				return Err(HandleRequestError::BadRequest("Remote request without request data."));
+			}
+		};
+
+		let mut data = Vec::new();
+		response.encode(&mut data)?;
+
+		Ok(data)
+	}
+
+	fn on_remote_call_request(
+		&mut self,
+		peer: &PeerId,
+		request: &schema::v1::light::RemoteCallRequest,
+	) -> Result<schema::v1::light::Response, HandleRequestError> {
+		log::trace!(
+			"Remote call request from {} ({} at {:?}).",
+			peer, request.method, request.block,
+		);
+
+		let block = Decode::decode(&mut request.block.as_ref())?;
+
+		let proof = match self.client.execution_proof(
+			&BlockId::Hash(block),
+			&request.method, &request.data,
+		) {
+			Ok((_, proof)) => proof,
+			Err(e) => {
+				log::trace!(
+					"remote call request from {} ({} at {:?}) failed with: {}",
+					peer, request.method, request.block, e,
+				);
+				StorageProof::empty()
+			}
+		};
+
+		let response = {
+			let r = schema::v1::light::RemoteCallResponse { proof: proof.encode() };
+			schema::v1::light::response::Response::RemoteCallResponse(r)
+		};
+
+		Ok(schema::v1::light::Response { response: Some(response) })
+	}
+
+	fn on_remote_read_request(
+		&mut self,
+		peer: &PeerId,
+		request: &schema::v1::light::RemoteReadRequest,
+	) -> Result<schema::v1::light::Response, HandleRequestError> {
+		if request.keys.is_empty() {
+			log::debug!("Invalid remote read request sent by {}.", peer);
+			return Err(HandleRequestError::BadRequest("Remote read request without keys."))
+		}
+
+		log::trace!(
+			"Remote read request from {} ({} at {:?}).",
+			peer, fmt_keys(request.keys.first(), request.keys.last()), request.block,
+		);
+
+		let block = Decode::decode(&mut request.block.as_ref())?;
+
+		let proof = match self.client.read_proof(
+			&BlockId::Hash(block),
+			&mut request.keys.iter().map(AsRef::as_ref),
+		) {
+			Ok(proof) => proof,
+			Err(error) => {
+				log::trace!(
+					"remote read request from {} ({} at {:?}) failed with: {}",
+					peer, fmt_keys(request.keys.first(), request.keys.last()), request.block, error,
+				);
+				StorageProof::empty()
+			}
+		};
+
+		let response = {
+			let r = schema::v1::light::RemoteReadResponse { proof: proof.encode() };
+			schema::v1::light::response::Response::RemoteReadResponse(r)
+		};
+
+		Ok(schema::v1::light::Response { response: Some(response) })
+	}
+
+	fn on_remote_read_child_request(
+		&mut self,
+		peer: &PeerId,
+		request: &schema::v1::light::RemoteReadChildRequest,
+	) -> Result<schema::v1::light::Response, HandleRequestError> {
+		if request.keys.is_empty() {
+			log::debug!("Invalid remote child read request sent by {}.", peer);
+			return Err(HandleRequestError::BadRequest("Remove read child request without keys."))
+		}
+
+		log::trace!(
+			"Remote read child request from {} ({} {} at {:?}).",
+			peer,
+			HexDisplay::from(&request.storage_key),
+			fmt_keys(request.keys.first(), request.keys.last()),
+			request.block,
+		);
+
+		let block = Decode::decode(&mut request.block.as_ref())?;
+
+		let prefixed_key = PrefixedStorageKey::new_ref(&request.storage_key);
+		let child_info = match ChildType::from_prefixed_key(prefixed_key) {
+			Some((ChildType::ParentKeyId, storage_key)) => Ok(ChildInfo::new_default(storage_key)),
+			None => Err(sp_blockchain::Error::InvalidChildStorageKey),
+		};
+		let proof = match child_info.and_then(|child_info| self.client.read_child_proof(
+			&BlockId::Hash(block),
+			&child_info,
+			&mut request.keys.iter().map(AsRef::as_ref)
+		)) {
+			Ok(proof) => proof,
+			Err(error) => {
+				log::trace!(
+					"remote read child request from {} ({} {} at {:?}) failed with: {}",
+					peer,
+					HexDisplay::from(&request.storage_key),
+					fmt_keys(request.keys.first(), request.keys.last()),
+					request.block,
+					error,
+				);
+				StorageProof::empty()
+			}
+		};
+
+		let response = {
+			let r = schema::v1::light::RemoteReadResponse { proof: proof.encode() };
+			schema::v1::light::response::Response::RemoteReadResponse(r)
+		};
+
+		Ok(schema::v1::light::Response { response: Some(response) })
+	}
+
+	fn on_remote_header_request(
+		&mut self,
+		peer: &PeerId,
+		request: &schema::v1::light::RemoteHeaderRequest,
+	) -> Result<schema::v1::light::Response, HandleRequestError> {
+		log::trace!("Remote header proof request from {} ({:?}).", peer, request.block);
+
+		let block = Decode::decode(&mut request.block.as_ref())?;
+		let (header, proof) = match self.client.header_proof(&BlockId::Number(block)) {
+			Ok((header, proof)) => (header.encode(), proof),
+			Err(error) => {
+				log::trace!(
+					"Remote header proof request from {} ({:?}) failed with: {}.",
+					peer, request.block, error
+				);
+				(Default::default(), StorageProof::empty())
+			}
+		};
+
+		let response = {
+			let r = schema::v1::light::RemoteHeaderResponse { header, proof: proof.encode() };
+			schema::v1::light::response::Response::RemoteHeaderResponse(r)
+		};
+
+		Ok(schema::v1::light::Response { response: Some(response) })
+	}
+
+	fn on_remote_changes_request(
+		&mut self,
+		peer: &PeerId,
+		request: &schema::v1::light::RemoteChangesRequest,
+	) -> Result<schema::v1::light::Response, HandleRequestError> {
+		log::trace!(
+			"Remote changes proof request from {} for key {} ({:?}..{:?}).",
+			peer,
+			if !request.storage_key.is_empty() {
+				format!("{} : {}", HexDisplay::from(&request.storage_key), HexDisplay::from(&request.key))
+			} else {
+				HexDisplay::from(&request.key).to_string()
+			},
+			request.first,
+			request.last,
+		);
+
+		let first = Decode::decode(&mut request.first.as_ref())?;
+		let last = Decode::decode(&mut request.last.as_ref())?;
+		let min = Decode::decode(&mut request.min.as_ref())?;
+		let max = Decode::decode(&mut request.max.as_ref())?;
+		let key = StorageKey(request.key.clone());
+		let storage_key = if request.storage_key.is_empty() {
+			None
+		} else {
+			Some(PrefixedStorageKey::new_ref(&request.storage_key))
+		};
+
+		let proof = match self.client.key_changes_proof(first, last, min, max, storage_key, &key) {
+			Ok(proof) => proof,
+			Err(error) => {
+				log::trace!(
+					"Remote changes proof request from {} for key {} ({:?}..{:?}) failed with: {}.",
+					peer,
+					format!("{} : {}", HexDisplay::from(&request.storage_key), HexDisplay::from(&key.0)),
+					request.first,
+					request.last,
+					error,
+				);
+
+				light::ChangesProof::<B::Header> {
+					max_block: Zero::zero(),
+					proof: Vec::new(),
+					roots: BTreeMap::new(),
+					roots_proof: StorageProof::empty(),
+				}
+			}
+		};
+
+		let response = {
+			let r = schema::v1::light::RemoteChangesResponse {
+				max: proof.max_block.encode(),
+				proof: proof.proof,
+				roots: proof.roots.into_iter()
+					.map(|(k, v)| schema::v1::light::Pair { fst: k.encode(), snd: v.encode() })
+					.collect(),
+				roots_proof: proof.roots_proof.encode(),
+			};
+			schema::v1::light::response::Response::RemoteChangesResponse(r)
+		};
+
+		Ok(schema::v1::light::Response { response: Some(response) })
+	}
+}
+
+#[derive(derive_more::Display, derive_more::From)]
+enum HandleRequestError {
+	#[display(fmt = "Failed to decode request: {}.", _0)]
+	DecodeProto(prost::DecodeError),
+	#[display(fmt = "Failed to encode response: {}.", _0)]
+	EncodeProto(prost::EncodeError),
+	#[display(fmt = "Failed to send response.")]
+	SendResponse,
+	/// A bad request has been received.
+	#[display(fmt = "bad request: {}", _0)]
+	BadRequest(&'static str),
+	/// Encoding or decoding of some data failed.
+	#[display(fmt = "codec error: {}", _0)]
+	Codec(codec::Error),
+}
+
+fn fmt_keys(first: Option<&Vec<u8>>, last: Option<&Vec<u8>>) -> String {
+	if let (Some(first), Some(last)) = (first, last) {
+		if first == last {
+			HexDisplay::from(first).to_string()
+		} else {
+			format!("{}..{}", HexDisplay::from(first), HexDisplay::from(last))
+		}
+	} else {
+		String::from("n/a")
+	}
+}
diff --git a/client/network/src/light_client_requests/sender.rs b/client/network/src/light_client_requests/sender.rs
new file mode 100644
index 000000000000..652f465d6f25
--- /dev/null
+++ b/client/network/src/light_client_requests/sender.rs
@@ -0,0 +1,1343 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! Helper for outgoing light client requests.
+//!
+//! Call [`LightClientRequestSender::send_request`] to send out light client requests. It will:
+//!
+//! 1. Build the request.
+//!
+//! 2. Forward the request to [`crate::request_responses::RequestResponsesBehaviour`] via
+//! [`OutEvent::SendRequest`].
+//!
+//! 3. Wait for the response and forward the response via the [`oneshot::Sender`] provided earlier
+//! with [`LightClientRequestSender::send_request`].
+
+use codec::{self, Encode, Decode};
+use crate::{
+	config::ProtocolId,
+	protocol::message::{BlockAttributes},
+	schema,
+	PeerId,
+};
+use crate::request_responses::{RequestFailure, OutboundFailure};
+use futures::{channel::{oneshot}, future::BoxFuture, prelude::*, stream::FuturesUnordered};
+use prost::Message;
+use sc_client_api::{
+	light::{
+		self, RemoteBodyRequest,
+	}
+};
+use sc_peerset::ReputationChange;
+use sp_blockchain::{Error as ClientError};
+use sp_runtime::{
+	traits::{Block, Header, NumberFor},
+};
+use std::{
+	collections::{BTreeMap, VecDeque, HashMap},
+	pin::Pin,
+	sync::Arc,
+	task::{Context, Poll},
+};
+
+mod rep {
+	use super::*;
+
+	/// Reputation change for a peer when a request timed out.
+	pub const TIMEOUT: ReputationChange = ReputationChange::new(-(1 << 8), "light client request timeout");
+	/// Reputation change for a peer when a request is refused.
+	pub const REFUSED: ReputationChange = ReputationChange::new(-(1 << 8), "light client request refused");
+}
+
+/// Configuration options for [`LightClientRequestSender`].
+#[derive(Debug, Clone)]
+struct Config {
+	max_pending_requests: usize,
+	light_protocol: String,
+	block_protocol: String,
+}
+
+impl Config {
+	/// Create a new [`LightClientRequestSender`] configuration.
+	pub fn new(id: &ProtocolId) -> Self {
+		Config {
+			max_pending_requests: 128,
+			light_protocol: super::generate_protocol_name(id),
+			block_protocol: crate::block_request_handler::generate_protocol_name(id),
+		}
+	}
+}
+
+/// State machine helping to send out light client requests.
+pub struct LightClientRequestSender<B: Block> {
+	/// This behaviour's configuration.
+	config: Config,
+	/// Verifies that received responses are correct.
+	checker: Arc<dyn light::FetchChecker<B>>,
+	/// Peer information (addresses, their best block, etc.)
+	peers: HashMap<PeerId, PeerInfo<B>>,
+	/// Pending (local) requests.
+	pending_requests: VecDeque<PendingRequest<B>>,
+	/// Requests on their way to remote peers.
+	sent_requests: FuturesUnordered<BoxFuture<
+			'static, (SentRequest<B>, Result<Result<Vec<u8>, RequestFailure>, oneshot::Canceled>),
+		>>,
+	/// Handle to use for reporting misbehaviour of peers.
+	peerset: sc_peerset::PeersetHandle,
+}
+
+/// Augments a pending light client request with metadata.
+#[derive(Debug)]
+struct PendingRequest<B: Block> {
+	/// Remaining attempts.
+	attempts_left: usize,
+	/// The actual request.
+	request: Request<B>,
+}
+
+impl<B: Block> PendingRequest<B> {
+	fn new(req: Request<B>) -> Self {
+		PendingRequest {
+			// Number of retries + one for the initial attempt.
+			attempts_left: req.retries() + 1,
+			request: req,
+		}
+	}
+
+	fn into_sent(self, peer_id: PeerId) -> SentRequest<B> {
+		SentRequest {
+			attempts_left: self.attempts_left,
+			request: self.request,
+			peer: peer_id,
+		}
+	}
+}
+
+/// Augments a light client request with metadata that is currently being send to a remote.
+#[derive(Debug)]
+struct SentRequest<B: Block> {
+	/// Remaining attempts.
+	attempts_left: usize,
+	/// The actual request.
+	request: Request<B>,
+	/// The peer that the request is send to.
+	peer: PeerId,
+}
+
+impl<B: Block> SentRequest<B> {
+	fn into_pending(self) -> PendingRequest<B> {
+		PendingRequest {
+			attempts_left: self.attempts_left,
+			request: self.request,
+		}
+	}
+}
+
+impl<B: Block> Unpin for LightClientRequestSender<B> {}
+
+impl<B> LightClientRequestSender<B>
+where
+	B: Block,
+{
+	/// Construct a new light client handler.
+	pub fn new(
+		id: &ProtocolId,
+		checker: Arc<dyn light::FetchChecker<B>>,
+		peerset: sc_peerset::PeersetHandle,
+	) -> Self {
+		LightClientRequestSender {
+			config: Config::new(id),
+			checker,
+			peers: Default::default(),
+			pending_requests: Default::default(),
+			sent_requests: Default::default(),
+			peerset,
+		}
+	}
+
+	/// We rely on external information about peers best blocks as we lack the
+	/// means to determine it ourselves.
+	pub fn update_best_block(&mut self, peer: &PeerId, num: NumberFor<B>) {
+		if let Some(info) = self.peers.get_mut(peer) {
+			log::trace!("new best block for {:?}: {:?}", peer, num);
+			info.best_block = Some(num)
+		}
+	}
+
+	/// Issue a new light client request.
+	pub fn request(&mut self, req: Request<B>) -> Result<(), SendRequestError> {
+		if self.pending_requests.len() >= self.config.max_pending_requests {
+			return Err(SendRequestError::TooManyRequests)
+		}
+		self.pending_requests.push_back(PendingRequest::new(req));
+		Ok(())
+	}
+
+	/// Remove the given peer.
+	///
+	/// In-flight requests to the given peer might fail and be retried. See
+	/// [`<LightClientRequestSender as Stream>::poll_next`].
+	fn remove_peer(&mut self, peer: PeerId) {
+		self.peers.remove(&peer);
+	}
+
+	/// Process a local request's response from remote.
+	///
+	/// If successful, this will give us the actual, checked data we should be
+	/// sending back to the client, otherwise an error.
+	fn on_response(
+		&mut self,
+		peer: PeerId,
+		request: &Request<B>,
+		response: Response,
+	) -> Result<Reply<B>, Error>	{
+		log::trace!("response from {}", peer);
+		match response {
+			Response::Light(r) => self.on_response_light(request, r),
+			Response::Block(r) => self.on_response_block(request, r),
+		}
+	}
+
+	fn on_response_light(
+		&mut self,
+		request: &Request<B>,
+		response: schema::v1::light::Response,
+	) -> Result<Reply<B>, Error> {
+		use schema::v1::light::response::Response;
+		match response.response {
+			Some(Response::RemoteCallResponse(response)) =>
+				if let Request::Call { request , .. } = request {
+					let proof = Decode::decode(&mut response.proof.as_ref())?;
+					let reply = self.checker.check_execution_proof(request, proof)?;
+					Ok(Reply::VecU8(reply))
+				} else {
+					Err(Error::UnexpectedResponse)
+				}
+			Some(Response::RemoteReadResponse(response)) =>
+				match request {
+					Request::Read { request, .. } => {
+						let proof = Decode::decode(&mut response.proof.as_ref())?;
+						let reply = self.checker.check_read_proof(&request, proof)?;
+						Ok(Reply::MapVecU8OptVecU8(reply))
+					}
+					Request::ReadChild { request, .. } => {
+						let proof = Decode::decode(&mut response.proof.as_ref())?;
+						let reply = self.checker.check_read_child_proof(&request, proof)?;
+						Ok(Reply::MapVecU8OptVecU8(reply))
+					}
+					_ => Err(Error::UnexpectedResponse)
+				}
+			Some(Response::RemoteChangesResponse(response)) =>
+				if let Request::Changes { request, .. } = request {
+					let max_block = Decode::decode(&mut response.max.as_ref())?;
+					let roots_proof = Decode::decode(&mut response.roots_proof.as_ref())?;
+					let roots = {
+						let mut r = BTreeMap::new();
+						for pair in response.roots {
+							let k = Decode::decode(&mut pair.fst.as_ref())?;
+							let v = Decode::decode(&mut pair.snd.as_ref())?;
+							r.insert(k, v);
+						}
+						r
+					};
+					let reply = self.checker.check_changes_proof(&request, light::ChangesProof {
+						max_block,
+						proof: response.proof,
+						roots,
+						roots_proof,
+					})?;
+					Ok(Reply::VecNumberU32(reply))
+				} else {
+					Err(Error::UnexpectedResponse)
+				}
+			Some(Response::RemoteHeaderResponse(response)) =>
+				if let Request::Header { request, .. } = request {
+					let header =
+						if response.header.is_empty() {
+							None
+						} else {
+							Some(Decode::decode(&mut response.header.as_ref())?)
+						};
+					let proof = Decode::decode(&mut response.proof.as_ref())?;
+					let reply = self.checker.check_header_proof(&request, header, proof)?;
+					Ok(Reply::Header(reply))
+				} else {
+					Err(Error::UnexpectedResponse)
+				}
+			None => Err(Error::UnexpectedResponse)
+		}
+	}
+
+	fn on_response_block(
+		&mut self,
+		request: &Request<B>,
+		response: schema::v1::BlockResponse,
+	) -> Result<Reply<B>, Error> {
+		let request = if let Request::Body { request , .. } = &request {
+			request
+		} else {
+			return Err(Error::UnexpectedResponse);
+		};
+
+		let body: Vec<_> = match response.blocks.into_iter().next() {
+			Some(b) => b.body,
+			None => return Err(Error::UnexpectedResponse),
+		};
+
+		let body = body.into_iter()
+			.map(|extrinsic| B::Extrinsic::decode(&mut &extrinsic[..]))
+			.collect::<Result<_, _>>()?;
+
+		let body = self.checker.check_body_proof(&request, body)?;
+		Ok(Reply::Extrinsics(body))
+	}
+
+	/// Signal that the node is connected to the given peer.
+	pub fn inject_connected(&mut self, peer: PeerId) {
+		let prev_entry = self.peers.insert(peer, Default::default());
+		debug_assert!(
+			prev_entry.is_none(),
+			"Expect `inject_connected` to be called for disconnected peer.",
+		);
+	}
+
+	/// Signal that the node disconnected from the given peer.
+	pub fn inject_disconnected(&mut self, peer: PeerId) {
+		self.remove_peer(peer)
+	}
+}
+
+
+impl<B: Block> Stream for LightClientRequestSender<B> {
+	type Item = OutEvent;
+
+	fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Option<Self::Item>> {
+		// If we have received responses to previously sent requests, check them and pass them on.
+		while let Poll::Ready(Some((sent_request, request_result))) = self.sent_requests.poll_next_unpin(cx) {
+			if let Some(info) = self.peers.get_mut(&sent_request.peer) {
+				if info.status != PeerStatus::Busy {
+					// If we get here, something is wrong with our internal handling of peer status
+					// information. At any time, a single peer processes at most one request from
+					// us. A malicious peer should not be able to get us here. It is our own fault
+					// and must be fixed!
+					panic!("unexpected peer status {:?} for {}", info.status, sent_request.peer);
+				}
+
+				info.status = PeerStatus::Idle; // Make peer available again.
+			}
+
+			let request_result = match request_result {
+				Ok(r) => r,
+				Err(oneshot::Canceled) => {
+					log::debug!("Oneshot for request to peer {} was canceled.", sent_request.peer);
+					self.remove_peer(sent_request.peer);
+					self.peerset.report_peer(sent_request.peer, ReputationChange::new_fatal("no response from peer"));
+					self.pending_requests.push_back(sent_request.into_pending());
+					continue;
+				}
+			};
+
+			let decoded_request_result = request_result.map(|response| {
+				if sent_request.request.is_block_request() {
+					schema::v1::BlockResponse::decode(&response[..])
+						.map(|r| Response::Block(r))
+				} else {
+					schema::v1::light::Response::decode(&response[..])
+						.map(|r| Response::Light(r))
+				}
+			});
+
+			let response = match decoded_request_result {
+				Ok(Ok(response)) => response,
+				Ok(Err(e)) => {
+					log::debug!("Failed to decode response from peer {}: {:?}.", sent_request.peer, e);
+					self.remove_peer(sent_request.peer);
+					self.peerset.report_peer(sent_request.peer, ReputationChange::new_fatal("invalid response from peer"));
+					self.pending_requests.push_back(sent_request.into_pending());
+					continue;
+				},
+				Err(e) => {
+					log::debug!("Request to peer {} failed with {:?}.", sent_request.peer, e);
+
+					match e {
+						RequestFailure::NotConnected => {
+							self.remove_peer(sent_request.peer);
+							self.pending_requests.push_back(sent_request.into_pending());
+						}
+						RequestFailure::UnknownProtocol => {
+							debug_assert!(
+								false,
+								"Light client and block request protocol should be known when \
+								 sending requests.",
+							);
+						}
+						RequestFailure::Refused => {
+							self.remove_peer(sent_request.peer);
+							self.peerset.report_peer(
+								sent_request.peer,
+								rep::REFUSED,
+							);
+							self.pending_requests.push_back(sent_request.into_pending());
+						}
+						RequestFailure::Obsolete => {
+							debug_assert!(
+								false,
+								"Can not receive `RequestFailure::Obsolete` after dropping the \
+								 response receiver.",
+							);
+							self.pending_requests.push_back(sent_request.into_pending());
+						}
+						RequestFailure::Network(OutboundFailure::Timeout) => {
+							self.remove_peer(sent_request.peer);
+							self.peerset.report_peer(
+								sent_request.peer,
+								rep::TIMEOUT,
+							);
+							self.pending_requests.push_back(sent_request.into_pending());
+						},
+						RequestFailure::Network(OutboundFailure::UnsupportedProtocols) => {
+							self.remove_peer(sent_request.peer);
+							self.peerset.report_peer(
+								sent_request.peer,
+								ReputationChange::new_fatal(
+									"peer does not support light client or block request protocol",
+								),
+							);
+							self.pending_requests.push_back(sent_request.into_pending());
+						}
+						RequestFailure::Network(OutboundFailure::DialFailure) => {
+							self.remove_peer(sent_request.peer);
+							self.peerset.report_peer(
+								sent_request.peer,
+								ReputationChange::new_fatal(
+									"failed to dial peer",
+								),
+							);
+							self.pending_requests.push_back(sent_request.into_pending());
+						}
+						RequestFailure::Network(OutboundFailure::ConnectionClosed) => {
+							self.remove_peer(sent_request.peer);
+							self.peerset.report_peer(
+								sent_request.peer,
+								ReputationChange::new_fatal(
+									"connection to peer closed",
+								),
+							);
+							self.pending_requests.push_back(sent_request.into_pending());
+						}
+					}
+
+					continue;
+				}
+			};
+
+			match self.on_response(sent_request.peer, &sent_request.request, response) {
+				Ok(reply) => sent_request.request.return_reply(Ok(reply)),
+				Err(Error::UnexpectedResponse) => {
+					log::debug!("Unexpected response from peer {}.", sent_request.peer);
+					self.remove_peer(sent_request.peer);
+					self.peerset.report_peer(
+						sent_request.peer,
+						ReputationChange::new_fatal(
+							"unexpected response from peer",
+						),
+					);
+					self.pending_requests.push_back(sent_request.into_pending());
+				}
+				Err(other) => {
+					log::debug!("error handling response from peer {}: {}", sent_request.peer, other);
+					self.remove_peer(sent_request.peer);
+					self.peerset.report_peer(
+						sent_request.peer,
+						ReputationChange::new_fatal(
+							"invalid response from peer",
+						),
+					);
+					self.pending_requests.push_back(sent_request.into_pending())
+				}
+			}
+		}
+
+		// If we have a pending request to send, try to find an available peer and send it.
+		while let Some(mut pending_request) = self.pending_requests.pop_front() {
+			if pending_request.attempts_left == 0 {
+				pending_request.request.return_reply(Err(ClientError::RemoteFetchFailed));
+				continue
+			}
+
+			let protocol = if pending_request.request.is_block_request() {
+				self.config.block_protocol.clone()
+			} else {
+				self.config.light_protocol.clone()
+			};
+
+			// Out of all idle peers, find one who's best block is high enough, choose any idle peer
+			// if none exists.
+			let mut peer = None;
+			for (peer_id, peer_info) in self.peers.iter_mut() {
+				if peer_info.status == PeerStatus::Idle {
+					match peer_info.best_block {
+						Some(n) if n >= pending_request.request.required_block() => {
+							peer = Some((*peer_id, peer_info));
+							break
+						},
+						_ => peer = Some((*peer_id, peer_info))
+					}
+				}
+			}
+
+			// Break in case there is no idle peer.
+			let (peer_id, peer_info) = match peer {
+				Some((peer_id, peer_info)) => (peer_id, peer_info),
+				None => {
+					self.pending_requests.push_front(pending_request);
+					log::debug!("No peer available to send request to.");
+
+					break;
+				}
+			};
+
+			let request_bytes = match pending_request.request.serialize_request() {
+				Ok(bytes) => bytes,
+				Err(error) => {
+					log::debug!("failed to serialize request: {}", error);
+					pending_request.request.return_reply(Err(ClientError::RemoteFetchFailed));
+					continue
+				}
+			};
+
+			let (tx, rx) = oneshot::channel();
+
+			peer_info.status = PeerStatus::Busy;
+
+			pending_request.attempts_left -= 1;
+
+			self.sent_requests.push(async move {
+				(pending_request.into_sent(peer_id), rx.await)
+			}.boxed());
+
+			return Poll::Ready(Some(OutEvent::SendRequest {
+				target: peer_id,
+				request: request_bytes,
+				pending_response: tx,
+				protocol_name: protocol,
+			}));
+		}
+
+		Poll::Pending
+	}
+}
+
+/// Events returned by [`LightClientRequestSender`].
+#[derive(Debug)]
+pub enum OutEvent {
+	/// Emit a request to be send out on the network e.g. via [`crate::request_responses`].
+	SendRequest {
+		/// The remote peer to send the request to.
+		target: PeerId,
+		/// The encoded request.
+		request: Vec<u8>,
+		/// The [`onehsot::Sender`] channel to pass the response to.
+		pending_response: oneshot::Sender<Result<Vec<u8>, RequestFailure>>,
+		/// The name of the protocol to use to send the request.
+		protocol_name: String,
+	}
+}
+
+/// Incoming response from remote.
+#[derive(Debug, Clone)]
+pub enum Response {
+	/// Incoming light response from remote.
+	Light(schema::v1::light::Response),
+	/// Incoming block response from remote.
+	Block(schema::v1::BlockResponse),
+}
+
+/// Error returned by [`LightClientRequestSender::request`].
+#[derive(Debug, derive_more::Display, derive_more::From)]
+pub enum SendRequestError {
+	/// There are currently too many pending request.
+	#[display(fmt = "too many pending requests")]
+	TooManyRequests,
+}
+
+/// Error type to propagate errors internally.
+#[derive(Debug, derive_more::Display, derive_more::From)]
+enum Error {
+	/// The response type does not correspond to the issued request.
+	#[display(fmt = "unexpected response")]
+	UnexpectedResponse,
+	/// Encoding or decoding of some data failed.
+	#[display(fmt = "codec error: {}", _0)]
+	Codec(codec::Error),
+	/// The chain client errored.
+	#[display(fmt = "client error: {}", _0)]
+	Client(ClientError),
+}
+
+/// The data to send back to the light client over the oneshot channel.
+//
+// It is unified here in order to be able to return it as a function
+// result instead of delivering it to the client as a side effect of
+// response processing.
+#[derive(Debug)]
+enum Reply<B: Block> {
+	VecU8(Vec<u8>),
+	VecNumberU32(Vec<(<B::Header as Header>::Number, u32)>),
+	MapVecU8OptVecU8(HashMap<Vec<u8>, Option<Vec<u8>>>),
+	Header(B::Header),
+	Extrinsics(Vec<B::Extrinsic>),
+}
+
+
+/// Information we have about some peer.
+#[derive(Debug)]
+struct PeerInfo<B: Block> {
+	best_block: Option<NumberFor<B>>,
+	status: PeerStatus,
+}
+
+impl<B: Block> Default for PeerInfo<B> {
+	fn default() -> Self {
+		PeerInfo {
+			best_block: None,
+			status: PeerStatus::Idle,
+		}
+	}
+}
+
+/// A peer is either idle or busy processing a request from us.
+#[derive(Debug, Clone, PartialEq, Eq)]
+enum PeerStatus {
+	/// The peer is available.
+	Idle,
+	/// We wait for the peer to return us a response for the given request ID.
+	Busy,
+}
+
+/// The possible light client requests we support.
+///
+/// The associated `oneshot::Sender` will be used to convey the result of
+/// their request back to them (cf. `Reply`).
+//
+// This is modeled after light_dispatch.rs's `RequestData` which is not
+// used because we currently only support a subset of those.
+#[derive(Debug)]
+pub enum Request<B: Block> {
+	/// Remote body request.
+	Body {
+		/// Request.
+		request: RemoteBodyRequest<B::Header>,
+		/// [`oneshot::Sender`] to return response.
+		sender: oneshot::Sender<Result<Vec<B::Extrinsic>, ClientError>>
+	},
+	/// Remote header request.
+	Header {
+		/// Request.
+		request: light::RemoteHeaderRequest<B::Header>,
+		/// [`oneshot::Sender`] to return response.
+		sender: oneshot::Sender<Result<B::Header, ClientError>>
+	},
+	/// Remote read request.
+	Read {
+		/// Request.
+		request: light::RemoteReadRequest<B::Header>,
+		/// [`oneshot::Sender`] to return response.
+		sender: oneshot::Sender<Result<HashMap<Vec<u8>, Option<Vec<u8>>>, ClientError>>
+	},
+	/// Remote read child request.
+	ReadChild {
+		/// Request.
+		request: light::RemoteReadChildRequest<B::Header>,
+		/// [`oneshot::Sender`] to return response.
+		sender: oneshot::Sender<Result<HashMap<Vec<u8>, Option<Vec<u8>>>, ClientError>>
+	},
+	/// Remote call request.
+	Call {
+		/// Request.
+		request: light::RemoteCallRequest<B::Header>,
+		/// [`oneshot::Sender`] to return response.
+		sender: oneshot::Sender<Result<Vec<u8>, ClientError>>
+	},
+	/// Remote changes request.
+	Changes {
+		/// Request.
+		request: light::RemoteChangesRequest<B::Header>,
+		/// [`oneshot::Sender`] to return response.
+		sender: oneshot::Sender<Result<Vec<(NumberFor<B>, u32)>, ClientError>>
+	}
+}
+
+impl<B: Block> Request<B> {
+	fn is_block_request(&self) -> bool {
+		matches!(self, Request::Body { .. })
+	}
+
+	fn required_block(&self) -> NumberFor<B> {
+		match self {
+			Request::Body { request, .. } => *request.header.number(),
+			Request::Header { request, .. } => request.block,
+			Request::Read { request, .. } => *request.header.number(),
+			Request::ReadChild { request, .. } => *request.header.number(),
+			Request::Call { request, .. } => *request.header.number(),
+			Request::Changes { request, .. } => request.max_block.0,
+		}
+	}
+
+	fn retries(&self) -> usize {
+		let rc = match self {
+			Request::Body { request, .. } => request.retry_count,
+			Request::Header { request, .. } => request.retry_count,
+			Request::Read { request, .. } => request.retry_count,
+			Request::ReadChild { request, .. } => request.retry_count,
+			Request::Call { request, .. } => request.retry_count,
+			Request::Changes { request, .. } => request.retry_count,
+		};
+		rc.unwrap_or(0)
+	}
+
+	fn serialize_request(&self) -> Result<Vec<u8>, prost::EncodeError> {
+		let request = match self {
+			Request::Body { request, .. } => {
+				let rq = schema::v1::BlockRequest {
+					fields: BlockAttributes::BODY.to_be_u32(),
+					from_block: Some(schema::v1::block_request::FromBlock::Hash(
+						request.header.hash().encode(),
+					)),
+					to_block: Default::default(),
+					direction: schema::v1::Direction::Ascending as i32,
+					max_blocks: 1,
+				};
+
+				let mut buf = Vec::with_capacity(rq.encoded_len());
+				rq.encode(&mut buf)?;
+				return Ok(buf);
+			}
+			Request::Header { request, .. } => {
+				let r = schema::v1::light::RemoteHeaderRequest { block: request.block.encode() };
+				schema::v1::light::request::Request::RemoteHeaderRequest(r)
+			}
+			Request::Read { request, .. } => {
+				let r = schema::v1::light::RemoteReadRequest {
+					block: request.block.encode(),
+					keys: request.keys.clone(),
+				};
+				schema::v1::light::request::Request::RemoteReadRequest(r)
+			}
+			Request::ReadChild { request, .. } => {
+				let r = schema::v1::light::RemoteReadChildRequest {
+					block: request.block.encode(),
+					storage_key: request.storage_key.clone().into_inner(),
+					keys: request.keys.clone(),
+				};
+				schema::v1::light::request::Request::RemoteReadChildRequest(r)
+			}
+			Request::Call { request, .. } => {
+				let r = schema::v1::light::RemoteCallRequest {
+					block: request.block.encode(),
+					method: request.method.clone(),
+					data: request.call_data.clone(),
+				};
+				schema::v1::light::request::Request::RemoteCallRequest(r)
+			}
+			Request::Changes { request, .. } => {
+				let r = schema::v1::light::RemoteChangesRequest {
+					first: request.first_block.1.encode(),
+					last: request.last_block.1.encode(),
+					min: request.tries_roots.1.encode(),
+					max: request.max_block.1.encode(),
+					storage_key: request.storage_key.clone().map(|s| s.into_inner())
+						.unwrap_or_default(),
+					key: request.key.clone(),
+				};
+				schema::v1::light::request::Request::RemoteChangesRequest(r)
+			}
+		};
+
+		let rq = schema::v1::light::Request { request: Some(request) };
+		let mut buf = Vec::with_capacity(rq.encoded_len());
+		rq.encode(&mut buf)?;
+		Ok(buf)
+	}
+
+	fn return_reply(self, result: Result<Reply<B>, ClientError>) {
+		fn send<T>(item: T, sender: oneshot::Sender<T>) {
+			let _ = sender.send(item); // It is okay if the other end already hung up.
+		}
+		match self {
+			Request::Body { request, sender } => match result {
+				Err(e) => send(Err(e), sender),
+				Ok(Reply::Extrinsics(x)) => send(Ok(x), sender),
+				reply => log::error!("invalid reply for body request: {:?}, {:?}", reply, request),
+			}
+			Request::Header { request, sender } => match result {
+				Err(e) => send(Err(e), sender),
+				Ok(Reply::Header(x)) => send(Ok(x), sender),
+				reply => log::error!("invalid reply for header request: {:?}, {:?}", reply, request),
+			}
+			Request::Read { request, sender } => match result {
+				Err(e) => send(Err(e), sender),
+				Ok(Reply::MapVecU8OptVecU8(x)) => send(Ok(x), sender),
+				reply => log::error!("invalid reply for read request: {:?}, {:?}", reply, request),
+			}
+			Request::ReadChild { request, sender } => match result {
+				Err(e) => send(Err(e), sender),
+				Ok(Reply::MapVecU8OptVecU8(x)) => send(Ok(x), sender),
+				reply => log::error!("invalid reply for read child request: {:?}, {:?}", reply, request),
+			}
+			Request::Call { request, sender } => match result {
+				Err(e) => send(Err(e), sender),
+				Ok(Reply::VecU8(x)) => send(Ok(x), sender),
+				reply => log::error!("invalid reply for call request: {:?}, {:?}", reply, request),
+			}
+			Request::Changes { request, sender } => match result {
+				Err(e) => send(Err(e), sender),
+				Ok(Reply::VecNumberU32(x)) => send(Ok(x), sender),
+				reply => log::error!("invalid reply for changes request: {:?}, {:?}", reply, request),
+			}
+		}
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use crate::light_client_requests::tests::{DummyFetchChecker, protocol_id, peerset, dummy_header};
+	use crate::request_responses::OutboundFailure;
+
+	use assert_matches::assert_matches;
+	use futures::channel::oneshot;
+	use futures::executor::block_on;
+	use futures::poll;
+	use sc_client_api::StorageProof;
+	use sp_core::storage::ChildInfo;
+	use sp_runtime::generic::Header;
+	use sp_runtime::traits::BlakeTwo256;
+	use std::collections::HashSet;
+	use std::iter::FromIterator;
+
+	fn empty_proof() -> Vec<u8> {
+		StorageProof::empty().encode()
+	}
+
+	#[test]
+	fn removes_peer_if_told() {
+		let peer = PeerId::random();
+		let (_peer_set, peer_set_handle) = peerset();
+		let mut sender = LightClientRequestSender::<Block>::new(
+			&protocol_id(),
+			Arc::new(DummyFetchChecker {
+				ok: true,
+				_mark: std::marker::PhantomData,
+			}),
+			peer_set_handle,
+		);
+
+		sender.inject_connected(peer);
+		assert_eq!(1, sender.peers.len());
+
+		sender.inject_disconnected(peer);
+		assert_eq!(0, sender.peers.len());
+	}
+
+	type Block =
+		sp_runtime::generic::Block<Header<u64, BlakeTwo256>, substrate_test_runtime::Extrinsic>;
+
+	#[test]
+	fn body_request_fields_encoded_properly() {
+		let (sender, _receiver) = oneshot::channel();
+		let request = Request::<Block>::Body {
+			request: RemoteBodyRequest {
+				header: dummy_header(),
+				retry_count: None,
+			},
+			sender,
+		};
+		let serialized_request = request.serialize_request().unwrap();
+		let deserialized_request = schema::v1::BlockRequest::decode(&serialized_request[..]).unwrap();
+		assert!(BlockAttributes::from_be_u32(deserialized_request.fields)
+				.unwrap()
+				.contains(BlockAttributes::BODY));
+	}
+
+	#[test]
+	fn disconnects_from_peer_if_request_times_out() {
+		let peer0 = PeerId::random();
+		let peer1 = PeerId::random();
+
+		let (_peer_set, peer_set_handle) = peerset();
+		let mut sender = LightClientRequestSender::<Block>::new(
+			&protocol_id(),
+			Arc::new(crate::light_client_requests::tests::DummyFetchChecker {
+				ok: true,
+				_mark: std::marker::PhantomData,
+			}),
+			peer_set_handle,
+		);
+
+		sender.inject_connected(peer0);
+		sender.inject_connected(peer1);
+
+		assert_eq!(
+			HashSet::from_iter(&[peer0.clone(), peer1.clone()]),
+			sender.peers.keys().collect::<HashSet<_>>(),
+			"Expect knowledge of two peers."
+		);
+
+		assert!(sender.pending_requests.is_empty(), "Expect no pending request.");
+		assert!(sender.sent_requests.is_empty(), "Expect no sent request.");
+
+		// Issue a request!
+		let chan = oneshot::channel();
+		let request = light::RemoteCallRequest {
+			block: Default::default(),
+			header: dummy_header(),
+			method: "test".into(),
+			call_data: vec![],
+			retry_count: Some(1),
+		};
+		sender.request(Request::Call { request, sender: chan.0 }).unwrap();
+		assert_eq!(1, sender.pending_requests.len(), "Expect one pending request.");
+
+		let OutEvent::SendRequest { target, pending_response, .. } = block_on(sender.next()).unwrap();
+		assert!(
+			target == peer0 || target == peer1,
+			"Expect request to originate from known peer.",
+		);
+
+		// And we should have one busy peer.
+		assert!({
+			let (idle, busy): (Vec<_>, Vec<_>) = sender
+				.peers
+				.iter()
+				.partition(|(_, info)| info.status == PeerStatus::Idle);
+			idle.len() == 1
+				&& busy.len() == 1
+				&& (idle[0].0 == &peer0 || busy[0].0 == &peer0)
+				&& (idle[0].0 == &peer1 || busy[0].0 == &peer1)
+		});
+
+		assert_eq!(0, sender.pending_requests.len(), "Expect no pending request.");
+		assert_eq!(1, sender.sent_requests.len(), "Expect one request to be sent.");
+
+		// Report first attempt as timed out.
+		pending_response.send(Err(RequestFailure::Network(OutboundFailure::Timeout))).unwrap();
+
+		// Expect a new request to be issued.
+		let OutEvent::SendRequest { pending_response, .. } = block_on(sender.next()).unwrap();
+
+		assert_eq!(1, sender.peers.len(), "Expect peer to be removed.");
+		assert_eq!(0, sender.pending_requests.len(), "Expect no request to be pending.");
+		assert_eq!(1, sender.sent_requests.len(), "Expect new request to be issued.");
+
+		// Report second attempt as timed out.
+		pending_response.send(Err(RequestFailure::Network(OutboundFailure::Timeout))).unwrap();
+		assert_matches!(
+			block_on(async { poll!(sender.next()) }), Poll::Pending,
+			"Expect sender to not issue another attempt.",
+		);
+		assert_matches!(
+			block_on(chan.1).unwrap(), Err(ClientError::RemoteFetchFailed),
+			"Expect request failure to be reported.",
+		);
+		assert_eq!(0, sender.peers.len(), "Expect no peer to be left");
+		assert_eq!(0, sender.pending_requests.len(), "Expect no request to be pending.");
+		assert_eq!(0, sender.sent_requests.len(), "Expect no other request to be in progress.");
+	}
+
+	#[test]
+	fn disconnects_from_peer_on_incorrect_response() {
+		let peer = PeerId::random();
+
+		let (_peer_set, peer_set_handle) = peerset();
+		let mut sender = LightClientRequestSender::<Block>::new(
+			&protocol_id(),
+			Arc::new(crate::light_client_requests::tests::DummyFetchChecker {
+				ok: false,
+				//  ^--- Making sure the response data check fails.
+				_mark: std::marker::PhantomData,
+			}),
+			peer_set_handle,
+		);
+
+		sender.inject_connected(peer);
+		assert_eq!(1, sender.peers.len(), "Expect one peer.");
+
+		let chan = oneshot::channel();
+		let request = light::RemoteCallRequest {
+			block: Default::default(),
+			header: dummy_header(),
+			method: "test".into(),
+			call_data: vec![],
+			retry_count: Some(1),
+		};
+		sender
+			.request(Request::Call {
+				request,
+				sender: chan.0,
+			})
+			.unwrap();
+
+		assert_eq!(1, sender.pending_requests.len(), "Expect one pending request.");
+		assert_eq!(0, sender.sent_requests.len(), "Expect zero sent requests.");
+
+		let OutEvent::SendRequest { pending_response, .. } = block_on(sender.next()).unwrap();
+		assert_eq!(0, sender.pending_requests.len(), "Expect zero pending requests.");
+		assert_eq!(1, sender.sent_requests.len(), "Expect one sent request.");
+
+		let response = {
+			let r = schema::v1::light::RemoteCallResponse {
+				proof: empty_proof(),
+			};
+			let response = schema::v1::light::Response {
+				response: Some(schema::v1::light::response::Response::RemoteCallResponse(r)),
+			};
+			let mut data = Vec::new();
+			response.encode(&mut data).unwrap();
+			data
+		};
+
+		pending_response.send(Ok(response)).unwrap();
+
+		assert_matches!(
+			block_on(async { poll!(sender.next()) }), Poll::Pending,
+			"Expect sender to not issue another attempt, given that there is no peer left.",
+		);
+
+		assert!(sender.peers.is_empty(), "Expect no peers to be left.");
+		assert_eq!(1, sender.pending_requests.len(), "Expect request to be pending again.");
+		assert_eq!(0, sender.sent_requests.len(), "Expect no request to be sent.");
+	}
+
+	#[test]
+	fn disconnects_from_peer_on_wrong_response_type() {
+		let peer = PeerId::random();
+		let (_peer_set, peer_set_handle) = peerset();
+		let mut sender = LightClientRequestSender::<Block>::new(
+			&protocol_id(),
+			Arc::new(crate::light_client_requests::tests::DummyFetchChecker {
+				ok: true,
+				_mark: std::marker::PhantomData,
+			}),
+			peer_set_handle,
+		);
+
+		sender.inject_connected(peer);
+		assert_eq!(1, sender.peers.len(), "Expect one peer.");
+
+		let chan = oneshot::channel();
+		let request = light::RemoteCallRequest {
+			block: Default::default(),
+			header: dummy_header(),
+			method: "test".into(),
+			call_data: vec![],
+			retry_count: Some(1),
+		};
+		sender
+			.request(Request::Call {
+				request,
+				sender: chan.0,
+			})
+			.unwrap();
+
+		assert_eq!(1, sender.pending_requests.len());
+		assert_eq!(0, sender.sent_requests.len());
+		let OutEvent::SendRequest { pending_response, .. } = block_on(sender.next()).unwrap();
+		assert_eq!(0, sender.pending_requests.len(), "Expect zero pending requests.");
+		assert_eq!(1, sender.sent_requests.len(), "Expect one sent request.");
+
+		let response = {
+			let r = schema::v1::light::RemoteReadResponse {
+				proof: empty_proof(),
+			}; // Not a RemoteCallResponse!
+			let response = schema::v1::light::Response {
+				response: Some(schema::v1::light::response::Response::RemoteReadResponse(r)),
+			};
+			let mut data = Vec::new();
+			response.encode(&mut data).unwrap();
+			data
+		};
+
+		pending_response.send(Ok(response)).unwrap();
+		assert_matches!(
+			block_on(async { poll!(sender.next()) }), Poll::Pending,
+			"Expect sender to not issue another attempt, given that there is no peer left.",
+		);
+
+		assert!(sender.peers.is_empty(), "Expect no peers to be left.");
+		assert_eq!(1, sender.pending_requests.len(), "Expect request to be pending again.");
+		assert_eq!(0, sender.sent_requests.len(), "Expect no request to be sent.");
+	}
+
+	#[test]
+	fn receives_remote_failure_after_retry_count_failures() {
+		let peers = (0..4).map(|_| PeerId::random()).collect::<Vec<_>>();
+
+		let (_peer_set, peer_set_handle) = peerset();
+		let mut sender = LightClientRequestSender::<Block>::new(
+			&protocol_id(),
+			Arc::new(crate::light_client_requests::tests::DummyFetchChecker {
+				ok: false,
+				//  ^--- Making sure the response data check fails.
+				_mark: std::marker::PhantomData,
+			}),
+			peer_set_handle,
+		);
+
+		for peer in &peers {
+			sender.inject_connected(*peer);
+		}
+		assert_eq!(4, sender.peers.len(), "Expect four peers.");
+
+		let mut chan = oneshot::channel();
+		let request = light::RemoteCallRequest {
+			block: Default::default(),
+			header: dummy_header(),
+			method: "test".into(),
+			call_data: vec![],
+			retry_count: Some(3), // Attempt up to three retries.
+		};
+		sender
+			.request(Request::Call {
+				request,
+				sender: chan.0,
+			})
+			.unwrap();
+
+		assert_eq!(1, sender.pending_requests.len());
+		assert_eq!(0, sender.sent_requests.len());
+		let mut pending_response = match block_on(sender.next()).unwrap() {
+			OutEvent::SendRequest { pending_response, .. } => Some(pending_response),
+		};
+		assert_eq!(0, sender.pending_requests.len(), "Expect zero pending requests.");
+		assert_eq!(1, sender.sent_requests.len(), "Expect one sent request.");
+
+		for (i, _peer) in peers.iter().enumerate() {
+			// Construct an invalid response
+			let response = {
+				let r = schema::v1::light::RemoteCallResponse {
+					proof: empty_proof(),
+				};
+				let response = schema::v1::light::Response {
+					response: Some(schema::v1::light::response::Response::RemoteCallResponse(r)),
+				};
+				let mut data = Vec::new();
+				response.encode(&mut data).unwrap();
+				data
+			};
+			pending_response.take().unwrap().send(Ok(response)).unwrap();
+
+			if i < 3 {
+				pending_response = match block_on(sender.next()).unwrap() {
+					OutEvent::SendRequest { pending_response, .. } => Some(pending_response),
+				};
+				assert_matches!(chan.1.try_recv(), Ok(None))
+			} else {
+				// Last peer and last attempt.
+				assert_matches!(
+					block_on(async { poll!(sender.next()) }), Poll::Pending,
+					"Expect sender to not issue another attempt, given that there is no peer left.",
+				);
+				assert_matches!(
+					chan.1.try_recv(),
+					Ok(Some(Err(ClientError::RemoteFetchFailed)))
+				)
+			}
+		}
+	}
+
+	fn issue_request(request: Request<Block>) {
+		let peer = PeerId::random();
+
+		let (_peer_set, peer_set_handle) = peerset();
+		let mut sender = LightClientRequestSender::<Block>::new(
+			&protocol_id(),
+			Arc::new(crate::light_client_requests::tests::DummyFetchChecker {
+				ok: true,
+				_mark: std::marker::PhantomData,
+			}),
+			peer_set_handle,
+		);
+
+		sender.inject_connected(peer);
+		assert_eq!(1, sender.peers.len(), "Expect one peer.");
+
+		let response = match request {
+			Request::Body { .. } => unimplemented!(),
+			Request::Header { .. } => {
+				let r = schema::v1::light::RemoteHeaderResponse {
+					header: dummy_header().encode(),
+					proof: empty_proof(),
+				};
+				schema::v1::light::Response {
+					response: Some(schema::v1::light::response::Response::RemoteHeaderResponse(
+						r,
+					)),
+				}
+			}
+			Request::Read { .. } => {
+				let r = schema::v1::light::RemoteReadResponse {
+					proof: empty_proof(),
+				};
+				schema::v1::light::Response {
+					response: Some(schema::v1::light::response::Response::RemoteReadResponse(r)),
+				}
+			}
+			Request::ReadChild { .. } => {
+				let r = schema::v1::light::RemoteReadResponse {
+					proof: empty_proof(),
+				};
+				schema::v1::light::Response {
+					response: Some(schema::v1::light::response::Response::RemoteReadResponse(r)),
+				}
+			}
+			Request::Call { .. } => {
+				let r = schema::v1::light::RemoteCallResponse {
+					proof: empty_proof(),
+				};
+				schema::v1::light::Response {
+					response: Some(schema::v1::light::response::Response::RemoteCallResponse(r)),
+				}
+			}
+			Request::Changes { .. } => {
+				let r = schema::v1::light::RemoteChangesResponse {
+					max: std::iter::repeat(1).take(32).collect(),
+					proof: Vec::new(),
+					roots: Vec::new(),
+					roots_proof: empty_proof(),
+				};
+				schema::v1::light::Response {
+					response: Some(schema::v1::light::response::Response::RemoteChangesResponse(r)),
+				}
+			}
+		};
+
+		let response = {
+			let mut data = Vec::new();
+			response.encode(&mut data).unwrap();
+			data
+		};
+
+		sender.request(request).unwrap();
+
+		assert_eq!(1, sender.pending_requests.len());
+		assert_eq!(0, sender.sent_requests.len());
+		let OutEvent::SendRequest { pending_response, .. } = block_on(sender.next()).unwrap();
+		assert_eq!(0, sender.pending_requests.len());
+		assert_eq!(1, sender.sent_requests.len());
+
+		pending_response.send(Ok(response)).unwrap();
+		assert_matches!(
+			block_on(async { poll!(sender.next()) }), Poll::Pending,
+			"Expect sender to not issue another attempt, given that there is no peer left.",
+		);
+
+		assert_eq!(0, sender.pending_requests.len());
+		assert_eq!(0, sender.sent_requests.len())
+	}
+
+	#[test]
+	fn receives_remote_call_response() {
+		let mut chan = oneshot::channel();
+		let request = light::RemoteCallRequest {
+			block: Default::default(),
+			header: dummy_header(),
+			method: "test".into(),
+			call_data: vec![],
+			retry_count: None,
+		};
+		issue_request(Request::Call {
+			request,
+			sender: chan.0,
+		});
+		assert_matches!(chan.1.try_recv(), Ok(Some(Ok(_))))
+	}
+
+	#[test]
+	fn receives_remote_read_response() {
+		let mut chan = oneshot::channel();
+		let request = light::RemoteReadRequest {
+			header: dummy_header(),
+			block: Default::default(),
+			keys: vec![b":key".to_vec()],
+			retry_count: None,
+		};
+		issue_request(Request::Read {
+			request,
+			sender: chan.0,
+		});
+		assert_matches!(chan.1.try_recv(), Ok(Some(Ok(_))))
+	}
+
+	#[test]
+	fn receives_remote_read_child_response() {
+		let mut chan = oneshot::channel();
+		let child_info = ChildInfo::new_default(&b":child_storage:default:sub"[..]);
+		let request = light::RemoteReadChildRequest {
+			header: dummy_header(),
+			block: Default::default(),
+			storage_key: child_info.prefixed_storage_key(),
+			keys: vec![b":key".to_vec()],
+			retry_count: None,
+		};
+		issue_request(Request::ReadChild {
+			request,
+			sender: chan.0,
+		});
+		assert_matches!(chan.1.try_recv(), Ok(Some(Ok(_))))
+	}
+
+	#[test]
+	fn receives_remote_header_response() {
+		let mut chan = oneshot::channel();
+		let request = light::RemoteHeaderRequest {
+			cht_root: Default::default(),
+			block: 1,
+			retry_count: None,
+		};
+		issue_request(Request::Header {
+			request,
+			sender: chan.0,
+		});
+		assert_matches!(chan.1.try_recv(), Ok(Some(Ok(_))))
+	}
+
+	#[test]
+	fn receives_remote_changes_response() {
+		let mut chan = oneshot::channel();
+		let request = light::RemoteChangesRequest {
+			changes_trie_configs: vec![sp_core::ChangesTrieConfigurationRange {
+				zero: (0, Default::default()),
+				end: None,
+				config: Some(sp_core::ChangesTrieConfiguration::new(4, 2)),
+			}],
+			first_block: (1, Default::default()),
+			last_block: (100, Default::default()),
+			max_block: (100, Default::default()),
+			tries_roots: (1, Default::default(), Vec::new()),
+			key: Vec::new(),
+			storage_key: None,
+			retry_count: None,
+		};
+		issue_request(Request::Changes {
+			request,
+			sender: chan.0,
+		});
+		assert_matches!(chan.1.try_recv(), Ok(Some(Ok(_))))
+	}
+}
diff --git a/client/network/src/on_demand_layer.rs b/client/network/src/on_demand_layer.rs
index 9ec1fb7508c3..ef8076e8cbed 100644
--- a/client/network/src/on_demand_layer.rs
+++ b/client/network/src/on_demand_layer.rs
@@ -18,7 +18,7 @@
 
 //! On-demand requests service.
 
-use crate::light_client_handler;
+use crate::light_client_requests;
 
 use futures::{channel::oneshot, prelude::*};
 use parking_lot::Mutex;
@@ -45,10 +45,10 @@ pub struct OnDemand<B: BlockT> {
 	/// Note that a better alternative would be to use a MPMC queue here, and add a `poll` method
 	/// from the `OnDemand`. However there exists no popular implementation of MPMC channels in
 	/// asynchronous Rust at the moment
-	requests_queue: Mutex<Option<TracingUnboundedReceiver<light_client_handler::Request<B>>>>,
+	requests_queue: Mutex<Option<TracingUnboundedReceiver<light_client_requests::sender::Request<B>>>>,
 
 	/// Sending side of `requests_queue`.
-	requests_send: TracingUnboundedSender<light_client_handler::Request<B>>,
+	requests_send: TracingUnboundedSender<light_client_requests::sender::Request<B>>,
 }
 
 
@@ -149,7 +149,7 @@ where
 	/// If this function returns `None`, that means that the receiver has already been extracted in
 	/// the past, and therefore that something already handles the requests.
 	pub(crate) fn extract_receiver(&self)
-		-> Option<TracingUnboundedReceiver<light_client_handler::Request<B>>>
+		-> Option<TracingUnboundedReceiver<light_client_requests::sender::Request<B>>>
 	{
 		self.requests_queue.lock().take()
 	}
@@ -170,7 +170,7 @@ where
 		let (sender, receiver) = oneshot::channel();
 		let _ = self
 			.requests_send
-			.unbounded_send(light_client_handler::Request::Header { request, sender });
+			.unbounded_send(light_client_requests::sender::Request::Header { request, sender });
 		RemoteResponse { receiver }
 	}
 
@@ -178,7 +178,7 @@ where
 		let (sender, receiver) = oneshot::channel();
 		let _ = self
 			.requests_send
-			.unbounded_send(light_client_handler::Request::Read { request, sender });
+			.unbounded_send(light_client_requests::sender::Request::Read { request, sender });
 		RemoteResponse { receiver }
 	}
 
@@ -189,7 +189,7 @@ where
 		let (sender, receiver) = oneshot::channel();
 		let _ = self
 			.requests_send
-			.unbounded_send(light_client_handler::Request::ReadChild { request, sender });
+			.unbounded_send(light_client_requests::sender::Request::ReadChild { request, sender });
 		RemoteResponse { receiver }
 	}
 
@@ -197,7 +197,7 @@ where
 		let (sender, receiver) = oneshot::channel();
 		let _ = self
 			.requests_send
-			.unbounded_send(light_client_handler::Request::Call { request, sender });
+			.unbounded_send(light_client_requests::sender::Request::Call { request, sender });
 		RemoteResponse { receiver }
 	}
 
@@ -208,7 +208,7 @@ where
 		let (sender, receiver) = oneshot::channel();
 		let _ = self
 			.requests_send
-			.unbounded_send(light_client_handler::Request::Changes { request, sender });
+			.unbounded_send(light_client_requests::sender::Request::Changes { request, sender });
 		RemoteResponse { receiver }
 	}
 
@@ -216,7 +216,7 @@ where
 		let (sender, receiver) = oneshot::channel();
 		let _ = self
 			.requests_send
-			.unbounded_send(light_client_handler::Request::Body { request, sender });
+			.unbounded_send(light_client_requests::sender::Request::Body { request, sender });
 		RemoteResponse { receiver }
 	}
 }
diff --git a/client/network/src/request_responses.rs b/client/network/src/request_responses.rs
index 9170644c3f40..4ac6ffe67f90 100644
--- a/client/network/src/request_responses.rs
+++ b/client/network/src/request_responses.rs
@@ -281,10 +281,11 @@ impl RequestResponsesBehaviour {
 		if let Some((protocol, _)) = self.protocols.get_mut(protocol_name) {
 			if protocol.is_connected(target) {
 				let request_id = protocol.send_request(target, request);
-				self.pending_requests.insert(
+				let prev_req_id = self.pending_requests.insert(
 					(protocol_name.to_string().into(), request_id).into(),
 					(Instant::now(), pending_response),
 				);
+				debug_assert!(prev_req_id.is_none(), "Expect request id to be unique.");
 			} else {
 				if pending_response.send(Err(RequestFailure::NotConnected)).is_err() {
 					log::debug!(
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 20968c127889..58c623a8f5f1 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -38,7 +38,7 @@ use crate::{
 		NetworkState, NotConnectedPeer as NetworkStateNotConnectedPeer, Peer as NetworkStatePeer,
 	},
 	on_demand_layer::AlwaysBadChecker,
-	light_client_handler,
+	light_client_requests,
 	protocol::{
 		self,
 		NotifsHandlerError,
@@ -254,11 +254,10 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 				params.network_config.client_version,
 				params.network_config.node_name
 			);
-			let light_client_handler = {
-				let config = light_client_handler::Config::new(&params.protocol_id);
-				light_client_handler::LightClientHandler::new(
-					config,
-					params.chain,
+
+			let light_client_request_sender = {
+				light_client_requests::sender::LightClientRequestSender::new(
+					&params.protocol_id,
 					checker,
 					peerset_handle.clone(),
 				)
@@ -339,9 +338,10 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 					params.role,
 					user_agent,
 					local_public,
-					light_client_handler,
+					light_client_request_sender,
 					discovery_config,
 					params.block_request_protocol_config,
+					params.light_client_request_protocol_config,
 					params.network_config.request_response_protocols,
 				);
 
@@ -1286,7 +1286,7 @@ pub struct NetworkWorker<B: BlockT + 'static, H: ExHashT> {
 	/// Messages from the [`NetworkService`] that must be processed.
 	from_service: TracingUnboundedReceiver<ServiceToWorkerMsg<B, H>>,
 	/// Receiver for queries from the light client that must be processed.
-	light_client_rqs: Option<TracingUnboundedReceiver<light_client_handler::Request<B>>>,
+	light_client_rqs: Option<TracingUnboundedReceiver<light_client_requests::sender::Request<B>>>,
 	/// Senders for events that happen on the network.
 	event_streams: out_events::OutChannels,
 	/// Prometheus network metrics.
@@ -1312,10 +1312,14 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 		// Check for new incoming light client requests.
 		if let Some(light_client_rqs) = this.light_client_rqs.as_mut() {
 			while let Poll::Ready(Some(rq)) = light_client_rqs.poll_next_unpin(cx) {
-				// This can error if there are too many queued requests already.
-				if this.network_service.light_client_request(rq).is_err() {
-					log::warn!("Couldn't start light client request: too many pending requests");
+				let result = this.network_service.light_client_request(rq);
+				match result {
+					Ok(()) => {},
+					Err(light_client_requests::sender::SendRequestError::TooManyRequests) => {
+						log::warn!("Couldn't start light client request: too many pending requests");
+					}
 				}
+
 				if let Some(metrics) = this.metrics.as_ref() {
 					metrics.issued_light_requests.inc();
 				}
@@ -1608,11 +1612,11 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 						let reason = match cause {
 							Some(ConnectionError::IO(_)) => "transport-error",
 							Some(ConnectionError::Handler(NodeHandlerWrapperError::Handler(EitherError::A(EitherError::A(
-								EitherError::A(EitherError::B(EitherError::A(
-								PingFailure::Timeout)))))))) => "ping-timeout",
+								EitherError::B(EitherError::A(
+								PingFailure::Timeout))))))) => "ping-timeout",
 							Some(ConnectionError::Handler(NodeHandlerWrapperError::Handler(EitherError::A(EitherError::A(
-								EitherError::A(EitherError::A(
-								NotifsHandlerError::SyncNotificationsClogged))))))) => "sync-notifications-clogged",
+								EitherError::A(
+								NotifsHandlerError::SyncNotificationsClogged)))))) => "sync-notifications-clogged",
 							Some(ConnectionError::Handler(NodeHandlerWrapperError::Handler(_))) => "protocol-error",
 							Some(ConnectionError::Handler(NodeHandlerWrapperError::KeepAliveTimeout)) => "keep-alive-timeout",
 							None => "actively-closed",
diff --git a/client/network/src/service/tests.rs b/client/network/src/service/tests.rs
index 8f16040aee3b..f88854963fb9 100644
--- a/client/network/src/service/tests.rs
+++ b/client/network/src/service/tests.rs
@@ -18,6 +18,7 @@
 
 use crate::{config, Event, NetworkService, NetworkWorker};
 use crate::block_request_handler::BlockRequestHandler;
+use crate::light_client_requests::handler::LightClientRequestHandler;
 
 use libp2p::PeerId;
 use futures::prelude::*;
@@ -96,7 +97,16 @@ fn build_test_full_node(config: config::NetworkConfiguration)
 
 	let block_request_protocol_config = {
 		let (handler, protocol_config) = BlockRequestHandler::new(
-			protocol_id.clone(),
+			&protocol_id,
+			client.clone(),
+		);
+		async_std::task::spawn(handler.run().boxed());
+		protocol_config
+	};
+
+	let light_client_request_protocol_config = {
+		let (handler, protocol_config) = LightClientRequestHandler::new(
+			&protocol_id,
 			client.clone(),
 		);
 		async_std::task::spawn(handler.run().boxed());
@@ -117,6 +127,7 @@ fn build_test_full_node(config: config::NetworkConfiguration)
 		),
 		metrics_registry: None,
 		block_request_protocol_config,
+		light_client_request_protocol_config,
 	})
 	.unwrap();
 
diff --git a/client/network/test/src/lib.rs b/client/network/test/src/lib.rs
index 786fddeed555..f523be857507 100644
--- a/client/network/test/src/lib.rs
+++ b/client/network/test/src/lib.rs
@@ -30,6 +30,7 @@ use std::{
 use libp2p::build_multiaddr;
 use log::trace;
 use sc_network::block_request_handler::{self, BlockRequestHandler};
+use sc_network::light_client_requests::{self, handler::LightClientRequestHandler};
 use sp_blockchain::{
 	HeaderBackend, Result as ClientResult,
 	well_known_cache_keys::{self, Id as CacheKeyId},
@@ -726,7 +727,13 @@ pub trait TestNetFactory: Sized {
 		let protocol_id = ProtocolId::from("test-protocol-name");
 
 		let block_request_protocol_config = {
-			let (handler, protocol_config) = BlockRequestHandler::new(protocol_id.clone(), client.clone());
+			let (handler, protocol_config) = BlockRequestHandler::new(&protocol_id, client.clone());
+			self.spawn_task(handler.run().boxed());
+			protocol_config
+		};
+
+		let light_client_request_protocol_config = {
+			let (handler, protocol_config) = LightClientRequestHandler::new(&protocol_id, client.clone());
 			self.spawn_task(handler.run().boxed());
 			protocol_config
 		};
@@ -744,6 +751,7 @@ pub trait TestNetFactory: Sized {
 				.unwrap_or_else(|| Box::new(DefaultBlockAnnounceValidator)),
 			metrics_registry: None,
 			block_request_protocol_config,
+			light_client_request_protocol_config,
 		}).unwrap();
 
 		trace!(target: "test_network", "Peer identifier: {}", network.service().local_peer_id());
@@ -813,11 +821,13 @@ pub trait TestNetFactory: Sized {
 
 		let protocol_id = ProtocolId::from("test-protocol-name");
 
-		// Add block request handler.
 		let block_request_protocol_config = block_request_handler::generate_protocol_config(
-			protocol_id.clone(),
+			&protocol_id,
 		);
 
+		let light_client_request_protocol_config =
+			light_client_requests::generate_protocol_config(&protocol_id);
+
 		let network = NetworkWorker::new(sc_network::config::Params {
 			role: Role::Light,
 			executor: None,
@@ -830,6 +840,7 @@ pub trait TestNetFactory: Sized {
 			block_announce_validator: Box::new(DefaultBlockAnnounceValidator),
 			metrics_registry: None,
 			block_request_protocol_config,
+			light_client_request_protocol_config,
 		}).unwrap();
 
 		self.mut_peers(|peers| {
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index 2ee95bd24d32..882a6c406265 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -43,6 +43,7 @@ use log::{info, warn};
 use sc_network::config::{Role, OnDemand};
 use sc_network::NetworkService;
 use sc_network::block_request_handler::{self, BlockRequestHandler};
+use sc_network::light_client_requests::{self, handler::LightClientRequestHandler};
 use sp_runtime::generic::BlockId;
 use sp_runtime::traits::{
 	Block as BlockT, HashFor, Zero, BlockIdTo,
@@ -869,11 +870,11 @@ pub fn build_network<TBl, TExPool, TImpQu, TCl>(
 	let block_request_protocol_config = {
 		if matches!(config.role, Role::Light) {
 			// Allow outgoing requests but deny incoming requests.
-			block_request_handler::generate_protocol_config(protocol_id.clone())
+			block_request_handler::generate_protocol_config(&protocol_id)
 		} else {
 			// Allow both outgoing and incoming requests.
 			let (handler, protocol_config) = BlockRequestHandler::new(
-				protocol_id.clone(),
+				&protocol_id,
 				client.clone(),
 			);
 			spawn_handle.spawn("block_request_handler", handler.run());
@@ -881,6 +882,21 @@ pub fn build_network<TBl, TExPool, TImpQu, TCl>(
 		}
 	};
 
+	let light_client_request_protocol_config = {
+		if matches!(config.role, Role::Light) {
+			// Allow outgoing requests but deny incoming requests.
+			light_client_requests::generate_protocol_config(&protocol_id)
+		} else {
+			// Allow both outgoing and incoming requests.
+			let (handler, protocol_config) = LightClientRequestHandler::new(
+				&protocol_id,
+				client.clone(),
+			);
+			spawn_handle.spawn("light_client_request_handler", handler.run());
+			protocol_config
+		}
+	};
+
 	let network_params = sc_network::config::Params {
 		role: config.role.clone(),
 		executor: {
@@ -898,6 +914,7 @@ pub fn build_network<TBl, TExPool, TImpQu, TCl>(
 		block_announce_validator,
 		metrics_registry: config.prometheus_config.as_ref().map(|config| config.registry.clone()),
 		block_request_protocol_config,
+		light_client_request_protocol_config,
 	};
 
 	let has_bootnodes = !network_params.network_config.boot_nodes.is_empty();

From b7fc46ddaeabbac7c387ba4714a78c961cc0d4f8 Mon Sep 17 00:00:00 2001
From: Alexander Popiak <alexander.popiak@parity.io>
Date: Mon, 1 Feb 2021 17:09:54 +0100
Subject: [PATCH 0344/1194] relax translate closure to FnMut (#8019)

---
 frame/support/src/storage/generator/double_map.rs | 2 +-
 frame/support/src/storage/generator/map.rs        | 2 +-
 frame/support/src/storage/mod.rs                  | 6 +++---
 frame/support/src/storage/types/double_map.rs     | 4 ++--
 frame/support/src/storage/types/map.rs            | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/frame/support/src/storage/generator/double_map.rs b/frame/support/src/storage/generator/double_map.rs
index e5ee7ec45b13..7e1a2456e453 100644
--- a/frame/support/src/storage/generator/double_map.rs
+++ b/frame/support/src/storage/generator/double_map.rs
@@ -383,7 +383,7 @@ impl<
 		iterator
 	}
 
-	fn translate<O: Decode, F: Fn(K1, K2, O) -> Option<V>>(f: F) {
+	fn translate<O: Decode, F: FnMut(K1, K2, O) -> Option<V>>(mut f: F) {
 		let prefix = G::prefix_hash();
 		let mut previous_key = prefix.clone();
 		while let Some(next) = sp_io::storage::next_key(&previous_key)
diff --git a/frame/support/src/storage/generator/map.rs b/frame/support/src/storage/generator/map.rs
index 198fad08dc73..7f6eb2a518f5 100644
--- a/frame/support/src/storage/generator/map.rs
+++ b/frame/support/src/storage/generator/map.rs
@@ -162,7 +162,7 @@ impl<
 		iterator
 	}
 
-	fn translate<O: Decode, F: Fn(K, O) -> Option<V>>(f: F) {
+	fn translate<O: Decode, F: FnMut(K, O) -> Option<V>>(mut f: F) {
 		let prefix = G::prefix_hash();
 		let mut previous_key = prefix.clone();
 		while let Some(next) = sp_io::storage::next_key(&previous_key)
diff --git a/frame/support/src/storage/mod.rs b/frame/support/src/storage/mod.rs
index dbb1062c2463..93cf7c663906 100644
--- a/frame/support/src/storage/mod.rs
+++ b/frame/support/src/storage/mod.rs
@@ -315,7 +315,7 @@ pub trait IterableStorageMap<K: FullEncode, V: FullCodec>: StorageMap<K, V> {
 	/// By returning `None` from `f` for an element, you'll remove it from the map.
 	///
 	/// NOTE: If a value fail to decode because storage is corrupted then it is skipped.
-	fn translate<O: Decode, F: Fn(K, O) -> Option<V>>(f: F);
+	fn translate<O: Decode, F: FnMut(K, O) -> Option<V>>(f: F);
 }
 
 /// A strongly-typed double map in storage whose secondary keys and values can be iterated over.
@@ -352,7 +352,7 @@ pub trait IterableStorageDoubleMap<
 	/// By returning `None` from `f` for an element, you'll remove it from the map.
 	///
 	/// NOTE: If a value fail to decode because storage is corrupted then it is skipped.
-	fn translate<O: Decode, F: Fn(K1, K2, O) -> Option<V>>(f: F);
+	fn translate<O: Decode, F: FnMut(K1, K2, O) -> Option<V>>(f: F);
 }
 
 /// An implementation of a map with a two keys.
@@ -614,7 +614,7 @@ pub trait StoragePrefixedMap<Value: FullCodec> {
 	/// # Usage
 	///
 	/// This would typically be called inside the module implementation of on_runtime_upgrade.
-	fn translate_values<OldValue: Decode, F: Fn(OldValue) -> Option<Value>>(f: F) {
+	fn translate_values<OldValue: Decode, F: FnMut(OldValue) -> Option<Value>>(mut f: F) {
 		let prefix = Self::final_prefix();
 		let mut previous_key = prefix.clone().to_vec();
 		while let Some(next) = sp_io::storage::next_key(&previous_key)
diff --git a/frame/support/src/storage/types/double_map.rs b/frame/support/src/storage/types/double_map.rs
index 93f40b660f7b..f0b5f66eff05 100644
--- a/frame/support/src/storage/types/double_map.rs
+++ b/frame/support/src/storage/types/double_map.rs
@@ -326,7 +326,7 @@ where
 	/// # Usage
 	///
 	/// This would typically be called inside the module implementation of on_runtime_upgrade.
-	pub fn translate_values<OldValue: Decode, F: Fn(OldValue) -> Option<Value>>(f: F) {
+	pub fn translate_values<OldValue: Decode, F: FnMut(OldValue) -> Option<Value>>(f: F) {
 		<Self as crate::storage::StoragePrefixedMap<Value>>::translate_values(f)
 	}
 }
@@ -379,7 +379,7 @@ where
 	/// By returning `None` from `f` for an element, you'll remove it from the map.
 	///
 	/// NOTE: If a value fail to decode because storage is corrupted then it is skipped.
-	pub fn translate<O: Decode, F: Fn(Key1, Key2, O) -> Option<Value>>(f: F) {
+	pub fn translate<O: Decode, F: FnMut(Key1, Key2, O) -> Option<Value>>(f: F) {
 		<Self as crate::storage::IterableStorageDoubleMap<Key1, Key2, Value>>::translate(f)
 	}
 }
diff --git a/frame/support/src/storage/types/map.rs b/frame/support/src/storage/types/map.rs
index 5c236e7f6b59..4af28a77cf2b 100644
--- a/frame/support/src/storage/types/map.rs
+++ b/frame/support/src/storage/types/map.rs
@@ -249,7 +249,7 @@ where
 	/// # Usage
 	///
 	/// This would typically be called inside the module implementation of on_runtime_upgrade.
-	pub fn translate_values<OldValue: Decode, F: Fn(OldValue) -> Option<Value>>(f: F) {
+	pub fn translate_values<OldValue: Decode, F: FnMut(OldValue) -> Option<Value>>(f: F) {
 		<Self as crate::storage::StoragePrefixedMap<Value>>::translate_values(f)
 	}
 }
@@ -283,7 +283,7 @@ where
 	/// By returning `None` from `f` for an element, you'll remove it from the map.
 	///
 	/// NOTE: If a value fail to decode because storage is corrupted then it is skipped.
-	pub fn translate<O: Decode, F: Fn(Key, O) -> Option<Value>>(f: F) {
+	pub fn translate<O: Decode, F: FnMut(Key, O) -> Option<Value>>(f: F) {
 		<Self as crate::storage::IterableStorageMap<Key, Value>>::translate(f)
 	}
 }

From 26f3d6826a181674257b8e9fc708aa04b49dc73c Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Mon, 1 Feb 2021 17:17:44 +0100
Subject: [PATCH 0345/1194] Remove outdated Grafana information (#8012)

---
 .../grafana-dashboards/README_dashboard.md    |    7 -
 .../substrate-dashboard.json                  | 1548 -----------------
 2 files changed, 1555 deletions(-)
 delete mode 100644 .maintain/monitoring/grafana-dashboards/substrate-dashboard.json

diff --git a/.maintain/monitoring/grafana-dashboards/README_dashboard.md b/.maintain/monitoring/grafana-dashboards/README_dashboard.md
index 37bebc6f8eaa..e00b89449cfa 100644
--- a/.maintain/monitoring/grafana-dashboards/README_dashboard.md
+++ b/.maintain/monitoring/grafana-dashboards/README_dashboard.md
@@ -5,10 +5,3 @@ Shared templated Grafana dashboards.
 To import the dashboards follow the [Grafana
 documentation](https://grafana.com/docs/grafana/latest/reference/export_import/).
 You can see an example setup [here](../../../.maintain/sentry-node).
-
-#### Required labels on Prometheus metrics
-
-- `instance` referring to a single scrape target (see [Prometheus docs for
-  details](https://prometheus.io/docs/concepts/jobs_instances/)).
-
-- `network` referring to the Blockchain network e.g. Kusama.
diff --git a/.maintain/monitoring/grafana-dashboards/substrate-dashboard.json b/.maintain/monitoring/grafana-dashboards/substrate-dashboard.json
deleted file mode 100644
index a61e8a49bade..000000000000
--- a/.maintain/monitoring/grafana-dashboards/substrate-dashboard.json
+++ /dev/null
@@ -1,1548 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "$$hashKey": "object:15",
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
-  "iteration": 1586424254170,
-  "links": [
-    {
-      "icon": "external link",
-      "tags": [],
-      "targetBlank": true,
-      "title": "With love from ColmenaLabs",
-      "tooltip": "",
-      "type": "link",
-      "url": "https://colmenalabs.org"
-    },
-    {
-      "icon": "external link",
-      "tags": [],
-      "targetBlank": true,
-      "title": "Polkastats.io",
-      "tooltip": "",
-      "type": "link",
-      "url": "https://polkastats.io"
-    }
-  ],
-  "panels": [
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "description": "",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 0,
-        "y": 0
-      },
-      "hiddenSeries": false,
-      "id": 8,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "rate([[metric_namespace]]_block_height{status=\"finalized\",instance=\"[[instance]]\",network=\"[[network]]\"}[10m])/rate([[metric_namespace]]_block_height{status=\"finalized\",instance=\"[[instance]]\",network=\"[[network]]\"}[1m])",
-          "intervalFactor": 1,
-          "legendFormat": "rate[10m] / rate[1m]",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Relative Block Production Speed",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "description": "",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 6,
-        "y": 0
-      },
-      "hiddenSeries": false,
-      "id": 15,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "[[metric_namespace]]_sub_libp2p_peers_count{instance=\"[[instance]]\",network=\"[[network]]\"}",
-          "legendFormat": "{{instance}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Peers count",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "cacheTimeout": null,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "description": "",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 12,
-        "y": 0
-      },
-      "hiddenSeries": false,
-      "id": 17,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pluginVersion": "6.4.1",
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "scalar([[metric_namespace]]_block_height{status=\"best\",instance=\"[[instance]]\",network=\"[[network]]\"})-scalar([[metric_namespace]]_block_height{status=\"finalized\",instance=\"[[instance]]\",network=\"[[network]]\"})",
-          "intervalFactor": 2,
-          "legendFormat": "[[hostname]]",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Diff -> ( Best Block - Finalized )",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "cacheTimeout": null,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "description": "",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 18,
-        "y": 0
-      },
-      "hiddenSeries": false,
-      "id": 18,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "rate([[metric_namespace]]_block_height{status=\"finalized\",instance=\"[[instance]]\",network=\"[[network]]\"}[10m])*60",
-          "intervalFactor": 10,
-          "legendFormat": "{{instance}}  Blocks / minute",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Block rate",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "description": "",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 0,
-        "y": 6
-      },
-      "hiddenSeries": false,
-      "id": 10,
-      "interval": "",
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "increase([[metric_namespace]]_block_height{instance=\"[[instance]]\",network=\"[[network]]\",status=~\"finalized|sync_target\"}[1m])",
-          "intervalFactor": 5,
-          "legendFormat": "{{status}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Blocks Av per min",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "description": "",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 6,
-        "y": 6
-      },
-      "hiddenSeries": false,
-      "id": 14,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "[[metric_namespace]]_block_height{instance=\"[[instance]]\",network=\"[[network]]\",status=~\"finalized|sync_target\"}",
-          "legendFormat": "{{instance}} {{status}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Block Finalized",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "description": "",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 12,
-        "y": 6
-      },
-      "hiddenSeries": false,
-      "id": 13,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "[[metric_namespace]]_block_height{status=\"best\",instance=\"[[instance]]\",network=\"[[network]]\"}",
-          "legendFormat": "{{instance}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Block height",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "Prometheus",
-      "description": "",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 18,
-        "y": 6
-      },
-      "hiddenSeries": false,
-      "id": 20,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "data": "",
-          "expr": "[[metric_namespace]]_ready_transactions_number{instance=\"[[instance]]\",network=\"[[network]]\"}",
-          "hide": false,
-          "legendFormat": "{{instance}}",
-          "refId": "A",
-          "target": "txcount",
-          "type": "timeseries"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "TXs Count",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 6,
-        "y": 12
-      },
-      "hiddenSeries": false,
-      "id": 22,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "[[metric_namespace]]_sync_extra_justifications_active{instance=\"[[instance]]\",network=\"[[network]]\"}",
-          "legendFormat": "{{instance}} active",
-          "refId": "A"
-        },
-        {
-          "expr": "[[metric_namespace]]_sync_extra_justifications_failed{instance=\"[[instance]]\",network=\"[[network]]\"}",
-          "legendFormat": "{{instance}} failed",
-          "refId": "B"
-        },
-        {
-          "expr": "[[metric_namespace]]_sync_extra_justifications_importing{instance=\"[[instance]]\",network=\"[[network]]\"}",
-          "legendFormat": "{{instance}} importing",
-          "refId": "C"
-        },
-        {
-          "expr": "[[metric_namespace]]_sync_extra_justifications_pending{instance=\"[[instance]]\",network=\"[[network]]\"}",
-          "legendFormat": "{{instance}} pending",
-          "refId": "D"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Sync justifications",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "description": "",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 12,
-        "y": 12
-      },
-      "hiddenSeries": false,
-      "id": 24,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "[[metric_namespace]]_sub_libp2p_connections{instance=\"[[instance]]\",network=\"[[network]]\"}",
-          "hide": false,
-          "legendFormat": "{{instance}} connections",
-          "refId": "A"
-        },
-        {
-          "expr": "[[metric_namespace]]_sub_libp2p_is_major_syncing{instance=\"[[instance]]\",network=\"[[network]]\"}",
-          "hide": false,
-          "legendFormat": "{{instance}} syncing",
-          "refId": "B"
-        },
-        {
-          "expr": "[[metric_namespace]]_sub_libp2p_kbuckets_num_nodes{instance=\"[[instance]]\",network=\"[[network]]\"}",
-          "hide": false,
-          "legendFormat": "{{instance}} num_nodes",
-          "refId": "C"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "sub_libp2p",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "description": "",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 18,
-        "y": 12
-      },
-      "hiddenSeries": false,
-      "id": 26,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "[[metric_namespace]]_sub_libp2p_notifications_total{instance=\"[[instance]]\",network=\"[[network]]\",protocol=\"FRNK\",direction=\"in\"}",
-          "hide": false,
-          "legendFormat": "{{instance}} FRNK in",
-          "refId": "A"
-        },
-        {
-          "expr": "[[metric_namespace]]_sub_libp2p_notifications_total{instance=\"[[instance]]\",network=\"[[network]]\",protocol=\"FRNK\",direction=\"out\"}",
-          "hide": false,
-          "legendFormat": "{{instance}} FRNK out",
-          "refId": "B"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "libp2p_notifications",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "description": "",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 0,
-        "y": 18
-      },
-      "hiddenSeries": false,
-      "id": 28,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "[[metric_namespace]]_cpu_usage_percentage{instance=\"[[instance]]\",network=\"[[network]]\"}",
-          "legendFormat": "{{instance}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "CPU usage %",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 6,
-        "y": 18
-      },
-      "hiddenSeries": false,
-      "id": 27,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "[[metric_namespace]]_memory_usage_bytes{instance=\"[[instance]]\",network=\"[[network]]\"}",
-          "legendFormat": "{{instance}} Mem bytes",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Memory",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "decimals": 2,
-          "format": "bytes",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": false
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "description": "",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 12,
-        "y": 18
-      },
-      "hiddenSeries": false,
-      "id": 25,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "[[metric_namespace]]_sub_libp2p_network_per_sec_bytes",
-          "hide": false,
-          "legendFormat": "{{instance}}",
-          "refId": "A"
-        },
-        {
-          "expr": "[[metric_namespace]]_sub_libp2p_notifications_total",
-          "hide": true,
-          "legendFormat": "{{instance}}",
-          "refId": "B"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "libp2p_network_per_sec_bytes",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "cacheTimeout": null,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "description": "",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 18,
-        "y": 18
-      },
-      "hiddenSeries": false,
-      "id": 29,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pluginVersion": "6.5.2",
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "[[metric_namespace]]_sub_libp2p_notifications_total{instance=\"[[instance]]\",network=\"[[network]]\",protocol=\"dot1\",direction=\"in\"}",
-          "hide": false,
-          "legendFormat": "{{instance}} dot1 in",
-          "refId": "B"
-        },
-        {
-          "expr": "[[metric_namespace]]_sub_libp2p_notifications_total{instance=\"[[instance]]\",network=\"[[network]]\",protocol=\"dot2\",direction=\"in\"}",
-          "hide": false,
-          "legendFormat": "{{instance}} dot2 in",
-          "refId": "C"
-        },
-        {
-          "expr": "[[metric_namespace]]_sub_libp2p_notifications_total{instance=\"[[instance]]\",network=\"[[network]]\",protocol=\"dot2\",direction=\"out\"}",
-          "hide": false,
-          "legendFormat": "{{instance}} dot2 out",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "libp2p_notifications",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    }
-  ],
-  "refresh": "5s",
-  "schemaVersion": 22,
-  "style": "dark",
-  "tags": [],
-  "templating": {
-    "list": [
-      {
-        "allValue": null,
-        "current": {
-          "selected": true,
-          "text": "substrate",
-          "value": "substrate"
-        },
-        "hide": 0,
-        "includeAll": false,
-        "label": null,
-        "multi": false,
-        "name": "metric_namespace",
-        "options": [
-          {
-            "selected": true,
-            "text": "substrate",
-            "value": "substrate"
-          },
-          {
-            "selected": false,
-            "text": "polkadot",
-            "value": "polkadot"
-          }
-        ],
-        "query": "substrate, polkadot",
-        "skipUrlSync": false,
-        "type": "custom"
-      },
-      {
-        "allValue": null,
-        "current": {
-          "selected": true,
-          "text": "dev",
-          "value": "dev"
-        },
-        "datasource": "Prometheus",
-        "definition": "label_values(network)",
-        "hide": 0,
-        "includeAll": false,
-        "index": -1,
-        "label": null,
-        "multi": false,
-        "name": "network",
-        "options": [],
-        "query": "label_values(network)",
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "tagValuesQuery": "",
-        "tags": [],
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
-      },
-      {
-        "allValue": null,
-        "current": {
-          "selected": false,
-          "text": "validator-a:9615",
-          "value": "validator-a:9615"
-        },
-        "datasource": "Prometheus",
-        "definition": "label_values(instance)",
-        "hide": 0,
-        "includeAll": false,
-        "index": -1,
-        "label": null,
-        "multi": false,
-        "name": "instance",
-        "options": [],
-        "query": "label_values(instance)",
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "tagValuesQuery": "",
-        "tags": [],
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
-      }
-    ]
-  },
-  "time": {
-    "from": "now-1h",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": [
-      "5s",
-      "10s",
-      "30s",
-      "1m",
-      "5m",
-      "15m",
-      "30m",
-      "1h",
-      "2h",
-      "1d"
-    ]
-  },
-  "timezone": "",
-  "title": "Substrate Dashboard",
-  "uid": "ColmenaLabs",
-  "variables": {
-    "list": []
-  },
-  "version": 2
-}

From b201d7c8ac9bd913508acd14f24c3af47be4bf46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Tue, 2 Feb 2021 11:48:35 +0100
Subject: [PATCH 0346/1194] contracts: Emit event on contract termination
 (#8014)

* contracts: Remove redundant bool argument from the eviction event

* contracts: Improve event documentation

* contracts: Emit event on contract termination
---
 frame/contracts/src/exec.rs  |  3 +-
 frame/contracts/src/lib.rs   | 54 ++++++++++++++++++++++++------------
 frame/contracts/src/rent.rs  |  2 +-
 frame/contracts/src/tests.rs | 36 +++++++++++++++++++++---
 4 files changed, 71 insertions(+), 24 deletions(-)

diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index 05eaf52c1bc9..c2ad48ca981a 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -582,6 +582,7 @@ where
 		)?;
 		if let Some(ContractInfo::Alive(info)) = ContractInfoOf::<T>::take(&self_id) {
 			Storage::<T>::queue_trie_for_deletion(&info)?;
+			Contracts::<T>::deposit_event(RawEvent::Terminated(self_id, beneficiary.clone()));
 			Ok(())
 		} else {
 			panic!(
@@ -671,7 +672,7 @@ where
 	fn deposit_event(&mut self, topics: Vec<T::Hash>, data: Vec<u8>) {
 		deposit_event::<Self::T>(
 			topics,
-			RawEvent::ContractExecution(self.ctx.self_account.clone(), data)
+			RawEvent::ContractEmitted(self.ctx.self_account.clone(), data)
 		);
 	}
 
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index 43566bc547c4..9c810faad965 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -756,39 +756,57 @@ decl_event! {
 		<T as frame_system::Config>::AccountId,
 		<T as frame_system::Config>::Hash
 	{
-		/// Contract deployed by address at the specified address. \[owner, contract\]
+		/// Contract deployed by address at the specified address. \[deployer, contract\]
 		Instantiated(AccountId, AccountId),
 
-		/// Contract has been evicted and is now in tombstone state.
-		/// \[contract, tombstone\]
+		/// Contract has been evicted and is now in tombstone state. \[contract\]
+		Evicted(AccountId),
+
+		/// Contract has been terminated without leaving a tombstone.
+		/// \[contract, beneficiary\]
 		///
 		/// # Params
 		///
-		/// - `contract`: `AccountId`: The account ID of the evicted contract.
-		/// - `tombstone`: `bool`: True if the evicted contract left behind a tombstone.
-		Evicted(AccountId, bool),
+		/// - `contract`: The contract that was terminated.
+		/// - `beneficiary`: The account that received the contracts remaining balance.
+		///
+		/// # Note
+		///
+		/// The only way for a contract to be removed without a tombstone and emitting
+		/// this event is by calling `seal_terminate`.
+		Terminated(AccountId, AccountId),
 
-		/// Restoration for a contract has been successful.
-		/// \[donor, dest, code_hash, rent_allowance\]
+		/// Restoration of a contract has been successful.
+		/// \[restorer, dest, code_hash, rent_allowance\]
 		///
 		/// # Params
 		///
-		/// - `donor`: `AccountId`: Account ID of the restoring contract
-		/// - `dest`: `AccountId`: Account ID of the restored contract
-		/// - `code_hash`: `Hash`: Code hash of the restored contract
-		/// - `rent_allowance: `Balance`: Rent allowance of the restored contract
+		/// - `restorer`: Account ID of the restoring contract.
+		/// - `dest`: Account ID of the restored contract.
+		/// - `code_hash`: Code hash of the restored contract.
+		/// - `rent_allowance`: Rent allowance of the restored contract.
 		Restored(AccountId, AccountId, Hash, Balance),
 
-		/// Code with the specified hash has been stored.
-		/// \[code_hash\]
+		/// Code with the specified hash has been stored. \[code_hash\]
 		CodeStored(Hash),
 
-		/// Triggered when the current \[schedule\] is updated.
+		/// Triggered when the current schedule is updated.
+		/// \[version\]
+		///
+		/// # Params
+		///
+		/// - `version`: The version of the newly set schedule.
 		ScheduleUpdated(u32),
 
-		/// An event deposited upon execution of a contract from the account.
-		/// \[account, data\]
-		ContractExecution(AccountId, Vec<u8>),
+		/// A custom event emitted by the contract.
+		/// \[contract, data\]
+		///
+		/// # Params
+		///
+		/// - `contract`: The contract that emitted the event.
+		/// - `data`: Data supplied by the contract. Metadata generated during contract
+		///           compilation is needed to decode it.
+		ContractEmitted(AccountId, Vec<u8>),
 	}
 }
 
diff --git a/frame/contracts/src/rent.rs b/frame/contracts/src/rent.rs
index 0bf229d49469..2075f6f757de 100644
--- a/frame/contracts/src/rent.rs
+++ b/frame/contracts/src/rent.rs
@@ -261,7 +261,7 @@ where
 				);
 				let tombstone_info = ContractInfo::Tombstone(tombstone);
 				<ContractInfoOf<T>>::insert(account, &tombstone_info);
-				<Module<T>>::deposit_event(RawEvent::Evicted(account.clone(), true));
+				<Module<T>>::deposit_event(RawEvent::Evicted(account.clone()));
 				Ok(Some(tombstone_info))
 			}
 			Verdict::Charge { amount } => {
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index a2916ff833b4..a8bf80213a17 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -512,7 +512,7 @@ fn instantiate_and_call_and_deposit_event() {
 				EventRecord {
 					phase: Phase::Initialization,
 					event: MetaEvent::contracts(
-						RawEvent::ContractExecution(addr.clone(), vec![1, 2, 3, 4])
+						RawEvent::ContractEmitted(addr.clone(), vec![1, 2, 3, 4])
 					),
 					topics: vec![],
 				},
@@ -1300,7 +1300,7 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 				EventRecord {
 					phase: Phase::Initialization,
 					event: MetaEvent::contracts(
-						RawEvent::Evicted(addr_bob.clone(), true)
+						RawEvent::Evicted(addr_bob.clone())
 					),
 					topics: vec![],
 				},
@@ -1385,7 +1385,7 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 						pretty_assertions::assert_eq!(System::events(), vec![
 							EventRecord {
 								phase: Phase::Initialization,
-								event: MetaEvent::contracts(RawEvent::Evicted(addr_bob, true)),
+								event: MetaEvent::contracts(RawEvent::Evicted(addr_bob)),
 								topics: vec![],
 							},
 							EventRecord {
@@ -1633,6 +1633,7 @@ fn self_destruct_works() {
 		.build()
 		.execute_with(|| {
 			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
+			let _ = Balances::deposit_creating(&DJANGO, 1_000_000);
 			assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm));
 
 			// Instantiate the BOB contract.
@@ -1652,6 +1653,9 @@ fn self_destruct_works() {
 				Some(ContractInfo::Alive(_))
 			);
 
+			// Drop all previous events
+			initialize_block(2);
+
 			// Call BOB without input data which triggers termination.
 			assert_matches!(
 				Contracts::call(
@@ -1664,11 +1668,35 @@ fn self_destruct_works() {
 				Ok(_)
 			);
 
+			pretty_assertions::assert_eq!(System::events(), vec![
+				EventRecord {
+					phase: Phase::Initialization,
+					event: MetaEvent::system(
+						frame_system::Event::KilledAccount(addr.clone())
+					),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: MetaEvent::balances(
+						pallet_balances::RawEvent::Transfer(addr.clone(), DJANGO, 100_000)
+					),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: MetaEvent::contracts(
+						RawEvent::Terminated(addr.clone(), DJANGO)
+					),
+					topics: vec![],
+				},
+			]);
+
 			// Check that account is gone
 			assert!(ContractInfoOf::<Test>::get(&addr).is_none());
 
 			// check that the beneficiary (django) got remaining balance
-			assert_eq!(Balances::free_balance(DJANGO), 100_000);
+			assert_eq!(Balances::free_balance(DJANGO), 1_100_000);
 		});
 }
 

From 7cb5eede24bc589578e9a570333b45a1a2d3262a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 2 Feb 2021 12:19:35 +0100
Subject: [PATCH 0347/1194] Fix tracing tests (#8022)

* Fix tracing tests

The tests were not working properly.

1. Some test was setting a global subscriber, this could lead to racy
conditions with other tests.

2. A logging test called `process::exit` which is completly wrong.

* Update client/tracing/src/lib.rs

Co-authored-by: David <dvdplm@gmail.com>

* Review comments

Co-authored-by: David <dvdplm@gmail.com>
---
 client/tracing/src/lib.rs         | 131 ++++++++++++++-------------
 client/tracing/src/logging/mod.rs | 144 ++++++++++++++++--------------
 2 files changed, 146 insertions(+), 129 deletions(-)

diff --git a/client/tracing/src/lib.rs b/client/tracing/src/lib.rs
index ebec8f2a8716..2b0044a6f25b 100644
--- a/client/tracing/src/lib.rs
+++ b/client/tracing/src/lib.rs
@@ -440,12 +440,11 @@ mod tests {
 		}
 	}
 
-	type TestSubscriber = tracing_subscriber::layer::Layered<
-		ProfilingLayer,
-		tracing_subscriber::fmt::Subscriber
-	>;
-
-	fn setup_subscriber() -> (TestSubscriber, Arc<Mutex<Vec<SpanDatum>>>, Arc<Mutex<Vec<TraceEvent>>>) {
+	fn setup_subscriber() -> (
+		impl tracing::Subscriber + Send + Sync,
+		Arc<Mutex<Vec<SpanDatum>>>,
+		Arc<Mutex<Vec<TraceEvent>>>
+	) {
 		let spans = Arc::new(Mutex::new(Vec::new()));
 		let events = Arc::new(Mutex::new(Vec::new()));
 		let handler = TestTraceHandler {
@@ -456,7 +455,7 @@ mod tests {
 			Box::new(handler),
 			"test_target",
 		);
-		let subscriber = tracing_subscriber::fmt().finish().with(layer);
+		let subscriber = tracing_subscriber::fmt().with_writer(std::io::sink).finish().with(layer);
 		(subscriber, spans, events)
 	}
 
@@ -560,64 +559,76 @@ mod tests {
 
 	#[test]
 	fn test_parent_id_with_threads() {
-		use std::sync::mpsc;
-		use std::thread;
-
-		let (sub, spans, events) = setup_subscriber();
-		let _sub_guard = tracing::subscriber::set_global_default(sub);
-		let span1 = tracing::info_span!(target: "test_target", "test_span1");
-		let _guard1 = span1.enter();
-
-		let (tx, rx) = mpsc::channel();
-		let handle = thread::spawn(move || {
-			let span2 = tracing::info_span!(target: "test_target", "test_span2");
-			let _guard2 = span2.enter();
-			// emit event
-			tracing::event!(target: "test_target", tracing::Level::INFO, "test_event1");
-			for msg in rx.recv() {
-				if msg == false {
-					break;
+		use std::{sync::mpsc, thread};
+
+		if std::env::var("RUN_TEST_PARENT_ID_WITH_THREADS").is_err() {
+			let executable = std::env::current_exe().unwrap();
+			let mut command = std::process::Command::new(executable);
+
+			let res = command
+				.env("RUN_TEST_PARENT_ID_WITH_THREADS", "1")
+				.args(&["--nocapture", "test_parent_id_with_threads"])
+				.output()
+				.unwrap()
+				.status;
+			assert!(res.success());
+		} else {
+			let (sub, spans, events) = setup_subscriber();
+			let _sub_guard = tracing::subscriber::set_global_default(sub);
+			let span1 = tracing::info_span!(target: "test_target", "test_span1");
+			let _guard1 = span1.enter();
+
+			let (tx, rx) = mpsc::channel();
+			let handle = thread::spawn(move || {
+				let span2 = tracing::info_span!(target: "test_target", "test_span2");
+				let _guard2 = span2.enter();
+				// emit event
+				tracing::event!(target: "test_target", tracing::Level::INFO, "test_event1");
+				for msg in rx.recv() {
+					if msg == false {
+						break;
+					}
 				}
-			}
-			// gard2 and span2 dropped / exited
-		});
+				// gard2 and span2 dropped / exited
+			});
 
-		// wait for Event to be dispatched and stored
-		while events.lock().is_empty() {
-			thread::sleep(Duration::from_millis(1));
-		}
+			// wait for Event to be dispatched and stored
+			while events.lock().is_empty() {
+				thread::sleep(Duration::from_millis(1));
+			}
 
-		// emit new event (will be second item in Vec) while span2 still active in other thread
-		tracing::event!(target: "test_target", tracing::Level::INFO, "test_event2");
+			// emit new event (will be second item in Vec) while span2 still active in other thread
+			tracing::event!(target: "test_target", tracing::Level::INFO, "test_event2");
 
-		// stop thread and drop span
-		let _ = tx.send(false);
-		let _ = handle.join();
+			// stop thread and drop span
+			let _ = tx.send(false);
+			let _ = handle.join();
 
-		// wait for Span to be dispatched and stored
-		while spans.lock().is_empty() {
-			thread::sleep(Duration::from_millis(1));
+			// wait for Span to be dispatched and stored
+			while spans.lock().is_empty() {
+				thread::sleep(Duration::from_millis(1));
+			}
+			let span2 = spans.lock().remove(0);
+			let event1 = events.lock().remove(0);
+			drop(_guard1);
+			drop(span1);
+
+			// emit event with no parent
+			tracing::event!(target: "test_target", tracing::Level::INFO, "test_event3");
+
+			let span1 = spans.lock().remove(0);
+			let event2 = events.lock().remove(0);
+
+			assert_eq!(event1.values.string_values.get("message").unwrap(), "test_event1");
+			assert_eq!(event2.values.string_values.get("message").unwrap(), "test_event2");
+			assert!(span1.parent_id.is_none());
+			assert!(span2.parent_id.is_none());
+			assert_eq!(span2.id, event1.parent_id.unwrap());
+			assert_eq!(span1.id, event2.parent_id.unwrap());
+			assert_ne!(span2.id, span1.id);
+
+			let event3 = events.lock().remove(0);
+			assert!(event3.parent_id.is_none());
 		}
-		let span2 = spans.lock().remove(0);
-		let event1 = events.lock().remove(0);
-		drop(_guard1);
-		drop(span1);
-
-		// emit event with no parent
-		tracing::event!(target: "test_target", tracing::Level::INFO, "test_event3");
-
-		let span1 = spans.lock().remove(0);
-		let event2 = events.lock().remove(0);
-
-		assert_eq!(event1.values.string_values.get("message").unwrap(), "test_event1");
-		assert_eq!(event2.values.string_values.get("message").unwrap(), "test_event2");
-		assert!(span1.parent_id.is_none());
-		assert!(span2.parent_id.is_none());
-		assert_eq!(span2.id, event1.parent_id.unwrap());
-		assert_eq!(span1.id, event2.parent_id.unwrap());
-		assert_ne!(span2.id, span1.id);
-
-		let event3 = events.lock().remove(0);
-		assert!(event3.parent_id.is_none());
 	}
 }
diff --git a/client/tracing/src/logging/mod.rs b/client/tracing/src/logging/mod.rs
index f74c3e664607..5674b50cb98e 100644
--- a/client/tracing/src/logging/mod.rs
+++ b/client/tracing/src/logging/mod.rs
@@ -38,7 +38,7 @@ use tracing_subscriber::{
 		format, FormatEvent, FormatFields, Formatter, Layer as FmtLayer, MakeWriter,
 		SubscriberBuilder,
 	},
-	layer::{self, SubscriberExt},
+	layer::{self, SubscriberExt}, filter::LevelFilter,
 	registry::LookupSpan,
 	EnvFilter, FmtSubscriber, Layer, Registry,
 };
@@ -73,7 +73,7 @@ macro_rules! enable_log_reloading {
 /// Common implementation to get the subscriber.
 fn prepare_subscriber<N, E, F, W>(
 	directives: &str,
-	max_level: Option<log::LevelFilter>,
+	profiling_targets: Option<&str>,
 	force_colors: Option<bool>,
 	telemetry_buffer_size: Option<usize>,
 	telemetry_external_transport: Option<ExtTransport>,
@@ -125,21 +125,27 @@ where
 	}
 
 	if directives != "" {
-		// We're not sure if log or tracing is available at this moment, so silently ignore the
-		// parse error.
 		env_filter = parse_user_directives(env_filter, directives)?;
 	}
 
+	if let Some(profiling_targets) = profiling_targets {
+		env_filter = parse_user_directives(env_filter, profiling_targets)?;
+		env_filter = env_filter
+			.add_directive(
+				parse_default_directive("sc_tracing=trace").expect("provided directive is valid")
+			);
+	}
+
 	let max_level_hint = Layer::<FmtSubscriber>::max_level_hint(&env_filter);
 
-	let max_level = max_level.unwrap_or_else(|| match max_level_hint {
-		Some(tracing_subscriber::filter::LevelFilter::INFO) | None => log::LevelFilter::Info,
-		Some(tracing_subscriber::filter::LevelFilter::TRACE) => log::LevelFilter::Trace,
-		Some(tracing_subscriber::filter::LevelFilter::WARN) => log::LevelFilter::Warn,
-		Some(tracing_subscriber::filter::LevelFilter::ERROR) => log::LevelFilter::Error,
-		Some(tracing_subscriber::filter::LevelFilter::DEBUG) => log::LevelFilter::Debug,
-		Some(tracing_subscriber::filter::LevelFilter::OFF) => log::LevelFilter::Off,
-	});
+	let max_level = match max_level_hint {
+		Some(LevelFilter::INFO) | None => log::LevelFilter::Info,
+		Some(LevelFilter::TRACE) => log::LevelFilter::Trace,
+		Some(LevelFilter::WARN) => log::LevelFilter::Warn,
+		Some(LevelFilter::ERROR) => log::LevelFilter::Error,
+		Some(LevelFilter::DEBUG) => log::LevelFilter::Debug,
+		Some(LevelFilter::OFF) => log::LevelFilter::Off,
+	};
 
 	tracing_log::LogTracer::builder()
 		.with_max_level(max_level)
@@ -251,13 +257,10 @@ impl LoggerBuilder {
 	/// This sets various global logging and tracing instances and thus may only be called once.
 	pub fn init(self) -> Result<TelemetryWorker> {
 		if let Some((tracing_receiver, profiling_targets)) = self.profiling {
-			// If profiling is activated, we require `trace` logging.
-			let max_level = Some(log::LevelFilter::Trace);
-
 			if self.log_reloading {
 				let (subscriber, telemetry_worker) = prepare_subscriber(
-					&format!("{},{},sc_tracing=trace", self.directives, profiling_targets),
-					max_level,
+					&self.directives,
+					Some(&profiling_targets),
 					self.force_colors,
 					self.telemetry_buffer_size,
 					self.telemetry_external_transport,
@@ -270,8 +273,8 @@ impl LoggerBuilder {
 				Ok(telemetry_worker)
 			} else {
 				let (subscriber, telemetry_worker) = prepare_subscriber(
-					&format!("{},{},sc_tracing=trace", self.directives, profiling_targets),
-					max_level,
+					&self.directives,
+					Some(&profiling_targets),
 					self.force_colors,
 					self.telemetry_buffer_size,
 					self.telemetry_external_transport,
@@ -329,57 +332,53 @@ mod tests {
 		let _ = LoggerBuilder::new(directives).init().unwrap();
 	}
 
-	fn run_in_process(test_name: &str) {
-		if env::var("RUN_IN_PROCESS").is_err() {
-			let status = Command::new(env::current_exe().unwrap())
-				.arg(test_name)
-				.env("RUN_IN_PROCESS", "true")
-				.status()
-				.unwrap();
-			assert!(status.success(), "process did not ended successfully");
-			std::process::exit(0);
-		}
-	}
-
 	#[test]
 	fn test_logger_filters() {
-		run_in_process("test_logger_filters");
-
-		let test_directives = "afg=debug,sync=trace,client=warn,telemetry,something-with-dash=error";
-		init_logger(&test_directives);
-
-		tracing::dispatcher::get_default(|dispatcher| {
-			let test_filter = |target, level| {
-				struct DummyCallSite;
-				impl Callsite for DummyCallSite {
-					fn set_interest(&self, _: Interest) {}
-					fn metadata(&self) -> &Metadata<'_> {
-						unreachable!();
+		if env::var("RUN_TEST_LOGGER_FILTERS").is_ok() {
+			let test_directives = "afg=debug,sync=trace,client=warn,telemetry,something-with-dash=error";
+			init_logger(&test_directives);
+
+			tracing::dispatcher::get_default(|dispatcher| {
+				let test_filter = |target, level| {
+					struct DummyCallSite;
+					impl Callsite for DummyCallSite {
+						fn set_interest(&self, _: Interest) {}
+						fn metadata(&self) -> &Metadata<'_> {
+							unreachable!();
+						}
 					}
-				}
-
-				let metadata = tracing::metadata!(
-					name: "",
-					target: target,
-					level: level,
-					fields: &[],
-					callsite: &DummyCallSite,
-					kind: Kind::SPAN,
-				);
-
-				dispatcher.enabled(&metadata)
-			};
-
-			assert!(test_filter("afg", Level::INFO));
-			assert!(test_filter("afg", Level::DEBUG));
-			assert!(!test_filter("afg", Level::TRACE));
-
-			assert!(test_filter("sync", Level::TRACE));
-			assert!(test_filter("client", Level::WARN));
-
-			assert!(test_filter("telemetry", Level::TRACE));
-			assert!(test_filter("something-with-dash", Level::ERROR));
-		});
+
+					let metadata = tracing::metadata!(
+						name: "",
+						target: target,
+						level: level,
+						fields: &[],
+						callsite: &DummyCallSite,
+						kind: Kind::SPAN,
+					);
+
+					dispatcher.enabled(&metadata)
+				};
+
+				assert!(test_filter("afg", Level::INFO));
+				assert!(test_filter("afg", Level::DEBUG));
+				assert!(!test_filter("afg", Level::TRACE));
+
+				assert!(test_filter("sync", Level::TRACE));
+				assert!(test_filter("client", Level::WARN));
+
+				assert!(test_filter("telemetry", Level::TRACE));
+				assert!(test_filter("something-with-dash", Level::ERROR));
+			});
+		} else {
+			let status = Command::new(env::current_exe().unwrap())
+				.arg("test_logger_filters")
+				.env("RUN_TEST_LOGGER_FILTERS", "1")
+				.output()
+				.unwrap()
+				.status;
+			assert!(status.success());
+		}
 	}
 
 	/// This test ensures that using dash (`-`) in the target name in logs and directives actually
@@ -500,11 +499,18 @@ mod tests {
 
 			let output = command.output().unwrap();
 
-			String::from_utf8(output.stderr).unwrap()
+			dbg!(String::from_utf8(output.stderr)).unwrap()
 		}
 
 		if env::var("PRINT_MAX_LOG_LEVEL").is_ok() {
-			init_logger(&env::var("TRACING_TARGETS").unwrap_or_default());
+			let mut builder = LoggerBuilder::new("");
+
+			if let Ok(targets) = env::var("TRACING_TARGETS") {
+				builder.with_profiling(crate::TracingReceiver::Log, targets);
+			}
+
+			builder.init().unwrap();
+
 			eprint!("MAX_LOG_LEVEL={:?}", log::max_level());
 		} else {
 			assert_eq!("MAX_LOG_LEVEL=Info", run_test(None, None));

From aaf659825af78ed768bb512c184b0ba4f4bf16bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Tue, 2 Feb 2021 13:09:11 +0100
Subject: [PATCH 0348/1194] contracts: Improve documentation (#8018)

* contracts: Document seal_input

* contracts: Improve `ReturnCode` docs.

* contracts: Improve seal_restore_to docs

* review: Improved wording
---
 frame/contracts/src/wasm/runtime.rs | 54 ++++++++++++++++++++---------
 1 file changed, 38 insertions(+), 16 deletions(-)

diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index 6b459f05193c..bab347b30cfd 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -38,6 +38,13 @@ use sp_io::hashing::{
 use pallet_contracts_primitives::{ExecResult, ExecReturnValue, ReturnFlags, ExecError};
 
 /// Every error that can be returned to a contract when it calls any of the host functions.
+///
+/// # Note
+///
+/// This enum can be extended in the future: New codes can be added but existing codes
+/// will not be changed or removed. This means that any contract **must not** exhaustively
+/// match return codes. Instead, contracts should prepare for unknown variants and deal with
+/// those errors gracefuly in order to be forward compatible.
 #[repr(u32)]
 pub enum ReturnCode {
 	/// API call successful.
@@ -935,10 +942,20 @@ define_env!(Env, <E: Ext>,
 		Err(TrapReason::Termination)
 	},
 
-	seal_input(ctx, buf_ptr: u32, buf_len_ptr: u32) => {
+	// Stores the input passed by the caller into the supplied buffer.
+	//
+	// The value is stored to linear memory at the address pointed to by `out_ptr`.
+	// `out_len_ptr` must point to a u32 value that describes the available space at
+	// `out_ptr`. This call overwrites it with the size of the value. If the available
+	// space at `out_ptr` is less than the size of the value a trap is triggered.
+	//
+	// # Note
+	//
+	// This function can only be called once. Calling it multiple times will trigger a trap.
+	seal_input(ctx, out_ptr: u32, out_len_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::InputBase)?;
 		if let Some(input) = ctx.input_data.take() {
-			ctx.write_sandbox_output(buf_ptr, buf_len_ptr, &input, false, |len| {
+			ctx.write_sandbox_output(out_ptr, out_len_ptr, &input, false, |len| {
 				Some(RuntimeToken::InputCopyOut(len))
 			})?;
 			Ok(())
@@ -1138,25 +1155,30 @@ define_env!(Env, <E: Ext>,
 	// the caller contract and restore the destination contract and set the specified `rent_allowance`.
 	// All caller's funds are transfered to the destination.
 	//
-	// If there is no tombstone at the destination address, the hashes don't match or this contract
-	// instance is already present on the contract call stack, a trap is generated.
+	// The tombstone hash is derived as `hash(code_hash, storage_root_hash)`. In order to match
+	// this hash to its own hash the restorer must make its storage equal to the one of the
+	// evicted destination contract. In order to allow for additional storage items in the
+	// restoring contract a delta can be specified to this function. All keys specified as
+	// delta are disregarded when calculating the storage root hash.
 	//
-	// Otherwise, the destination contract is restored. This function is diverging and stops execution
-	// even on success.
+	// On success, the destination contract is restored. This function is diverging and
+	// stops execution even on success.
 	//
-	// `dest_ptr`, `dest_len` - the pointer and the length of a buffer that encodes `T::AccountId`
-	// with the address of the to be restored contract.
-	// `code_hash_ptr`, `code_hash_len` - the pointer and the length of a buffer that encodes
-	// a code hash of the to be restored contract.
-	// `rent_allowance_ptr`, `rent_allowance_len` - the pointer and the length of a buffer that
-	// encodes the rent allowance that must be set in the case of successful restoration.
-	// `delta_ptr` is the pointer to the start of a buffer that has `delta_count` storage keys
-	// laid out sequentially.
+	// - `dest_ptr`, `dest_len` - the pointer and the length of a buffer that encodes `T::AccountId`
+	//    with the address of the to be restored contract.
+	// - `code_hash_ptr`, `code_hash_len` - the pointer and the length of a buffer that encodes
+	//    a code hash of the to be restored contract.
+	// - `rent_allowance_ptr`, `rent_allowance_len` - the pointer and the length of a buffer that
+	//    encodes the rent allowance that must be set in the case of successful restoration.
+	// - `delta_ptr` is the pointer to the start of a buffer that has `delta_count` storage keys
+	//    laid out sequentially.
 	//
 	// # Traps
 	//
-	// - Tombstone hashes do not match
-	// - Calling cantract is live i.e is already on the call stack.
+	// - There is no tombstone at the destination address.
+	// - Tombstone hashes do not match.
+	// - The calling contract is already present on the call stack.
+	// - The supplied code_hash does not exist on-chain.
 	seal_restore_to(
 		ctx,
 		dest_ptr: u32,

From d5b0856e51707a6016e8d67841d36e41ef348187 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Tue, 2 Feb 2021 14:52:09 +0100
Subject: [PATCH 0349/1194] Disable Kademlia random walk when --reserved-nodes
 is passed (#7999)

* Disable Kademlia random walk when --reserved-nodes is passed

* Update client/network/src/discovery.rs

Co-authored-by: Roman Borschel <romanb@users.noreply.github.com>

Co-authored-by: Roman Borschel <romanb@users.noreply.github.com>
---
 client/cli/src/params/network_params.rs | 11 +++-
 client/network/src/config.rs            | 12 +++-
 client/network/src/discovery.rs         | 79 +++++++++++++++----------
 client/network/src/service.rs           |  1 +
 4 files changed, 68 insertions(+), 35 deletions(-)

diff --git a/client/cli/src/params/network_params.rs b/client/cli/src/params/network_params.rs
index 0b53616b9ed1..4a926fdce8bb 100644
--- a/client/cli/src/params/network_params.rs
+++ b/client/cli/src/params/network_params.rs
@@ -36,10 +36,14 @@ pub struct NetworkParams {
 	#[structopt(long = "reserved-nodes", value_name = "ADDR")]
 	pub reserved_nodes: Vec<MultiaddrWithPeerId>,
 
-	/// Whether to only allow connections to/from reserved nodes.
+	/// Whether to only synchronize the chain with reserved nodes.
 	///
-	/// If you are a validator your node might still connect to other validator
-	/// nodes regardless of whether they are defined as reserved nodes.
+	/// Also disables automatic peer discovery.
+	///
+	/// TCP connections might still be established with non-reserved nodes.
+	/// In particular, if you are a validator your node might still connect to other
+	/// validator nodes and collator nodes regardless of whether they are defined as
+	/// reserved nodes.
 	#[structopt(long = "reserved-only")]
 	pub reserved_only: bool,
 
@@ -173,6 +177,7 @@ impl NetworkParams {
 				wasm_external_transport: None,
 			},
 			max_parallel_downloads: self.max_parallel_downloads,
+			enable_dht_random_walk: !self.reserved_only,
 			allow_non_globals_in_dht,
 			kademlia_disjoint_query_paths: self.kademlia_disjoint_query_paths,
 			yamux_window_size: None,
diff --git a/client/network/src/config.rs b/client/network/src/config.rs
index 3eb53dabf045..29a0128b87ea 100644
--- a/client/network/src/config.rs
+++ b/client/network/src/config.rs
@@ -408,10 +408,17 @@ pub struct NetworkConfiguration {
 	pub transport: TransportConfig,
 	/// Maximum number of peers to ask the same blocks in parallel.
 	pub max_parallel_downloads: u32,
+
+	/// True if Kademlia random discovery should be enabled.
+	///
+	/// If true, the node will automatically randomly walk the DHT in order to find new peers.
+	pub enable_dht_random_walk: bool,
+
 	/// Should we insert non-global addresses into the DHT?
 	pub allow_non_globals_in_dht: bool,
-	/// Require iterative Kademlia DHT queries to use disjoint paths for increased resiliency in the
-	/// presence of potentially adversarial nodes.
+
+	/// Require iterative Kademlia DHT queries to use disjoint paths for increased resiliency in
+	/// the presence of potentially adversarial nodes.
 	pub kademlia_disjoint_query_paths: bool,
 
 	/// Size of Yamux receive window of all substreams. `None` for the default (256kiB).
@@ -461,6 +468,7 @@ impl NetworkConfiguration {
 				wasm_external_transport: None,
 			},
 			max_parallel_downloads: 5,
+			enable_dht_random_walk: true,
 			allow_non_globals_in_dht: false,
 			kademlia_disjoint_query_paths: false,
 			yamux_window_size: None,
diff --git a/client/network/src/discovery.rs b/client/network/src/discovery.rs
index d9d28569ad30..87b533ef77dc 100644
--- a/client/network/src/discovery.rs
+++ b/client/network/src/discovery.rs
@@ -80,6 +80,7 @@ const MAX_KNOWN_EXTERNAL_ADDRESSES: usize = 32;
 pub struct DiscoveryConfig {
 	local_peer_id: PeerId,
 	user_defined: Vec<(PeerId, Multiaddr)>,
+	dht_random_walk: bool,
 	allow_private_ipv4: bool,
 	allow_non_globals_in_dht: bool,
 	discovery_only_if_under_num: u64,
@@ -94,6 +95,7 @@ impl DiscoveryConfig {
 		DiscoveryConfig {
 			local_peer_id: local_public_key.into_peer_id(),
 			user_defined: Vec::new(),
+			dht_random_walk: true,
 			allow_private_ipv4: true,
 			allow_non_globals_in_dht: false,
 			discovery_only_if_under_num: std::u64::MAX,
@@ -118,6 +120,13 @@ impl DiscoveryConfig {
 		self
 	}
 
+	/// Whether the discovery behaviour should periodically perform a random
+	/// walk on the DHT to discover peers.
+	pub fn with_dht_random_walk(&mut self, value: bool) -> &mut Self {
+		self.dht_random_walk = value;
+		self
+	}
+
 	/// Should private IPv4 addresses be reported?
 	pub fn allow_private_ipv4(&mut self, value: bool) -> &mut Self {
 		self.allow_private_ipv4 = value;
@@ -163,6 +172,7 @@ impl DiscoveryConfig {
 		let DiscoveryConfig {
 			local_peer_id,
 			user_defined,
+			dht_random_walk,
 			allow_private_ipv4,
 			allow_non_globals_in_dht,
 			discovery_only_if_under_num,
@@ -197,7 +207,11 @@ impl DiscoveryConfig {
 		DiscoveryBehaviour {
 			user_defined,
 			kademlias,
-			next_kad_random_query: Delay::new(Duration::new(0, 0)),
+			next_kad_random_query: if dht_random_walk {
+				Some(Delay::new(Duration::new(0, 0)))
+			} else {
+				None
+			},
 			duration_to_next_kad: Duration::from_secs(1),
 			pending_events: VecDeque::new(),
 			local_peer_id,
@@ -229,8 +243,9 @@ pub struct DiscoveryBehaviour {
 	/// Discovers nodes on the local network.
 	#[cfg(not(target_os = "unknown"))]
 	mdns: MdnsWrapper,
-	/// Stream that fires when we need to perform the next random Kademlia query.
-	next_kad_random_query: Delay,
+	/// Stream that fires when we need to perform the next random Kademlia query. `None` if
+	/// random walking is disabled.
+	next_kad_random_query: Option<Delay>,
 	/// After `next_kad_random_query` triggers, the next one triggers after this duration.
 	duration_to_next_kad: Duration,
 	/// Events to return in priority when polled.
@@ -434,6 +449,8 @@ pub enum DiscoveryOut {
 	ValuePutFailed(record::Key, Duration),
 
 	/// Started a random Kademlia query for each DHT identified by the given `ProtocolId`s.
+	///
+	/// Only happens if [`DiscoveryConfig::with_dht_random_walk`] has been configured to `true`.
 	RandomKademliaStarted(Vec<ProtocolId>),
 }
 
@@ -602,34 +619,36 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 		}
 
 		// Poll the stream that fires when we need to start a random Kademlia query.
-		while let Poll::Ready(_) = self.next_kad_random_query.poll_unpin(cx) {
-			let actually_started = if self.num_connections < self.discovery_only_if_under_num {
-				let random_peer_id = PeerId::random();
-				debug!(target: "sub-libp2p",
-					"Libp2p <= Starting random Kademlia request for {:?}",
-					random_peer_id);
-				for k in self.kademlias.values_mut() {
-					k.get_closest_peers(random_peer_id.clone());
+		if let Some(next_kad_random_query) = self.next_kad_random_query.as_mut() {
+			while let Poll::Ready(_) = next_kad_random_query.poll_unpin(cx) {
+				let actually_started = if self.num_connections < self.discovery_only_if_under_num {
+					let random_peer_id = PeerId::random();
+					debug!(target: "sub-libp2p",
+						"Libp2p <= Starting random Kademlia request for {:?}",
+						random_peer_id);
+					for k in self.kademlias.values_mut() {
+						k.get_closest_peers(random_peer_id.clone());
+					}
+					true
+				} else {
+					debug!(
+						target: "sub-libp2p",
+						"Kademlia paused due to high number of connections ({})",
+						self.num_connections
+					);
+					false
+				};
+
+				// Schedule the next random query with exponentially increasing delay,
+				// capped at 60 seconds.
+				*next_kad_random_query = Delay::new(self.duration_to_next_kad);
+				self.duration_to_next_kad = cmp::min(self.duration_to_next_kad * 2,
+					Duration::from_secs(60));
+
+				if actually_started {
+					let ev = DiscoveryOut::RandomKademliaStarted(self.kademlias.keys().cloned().collect());
+					return Poll::Ready(NetworkBehaviourAction::GenerateEvent(ev));
 				}
-				true
-			} else {
-				debug!(
-					target: "sub-libp2p",
-					"Kademlia paused due to high number of connections ({})",
-					self.num_connections
-				);
-				false
-			};
-
-			// Schedule the next random query with exponentially increasing delay,
-			// capped at 60 seconds.
-			self.next_kad_random_query = Delay::new(self.duration_to_next_kad);
-			self.duration_to_next_kad = cmp::min(self.duration_to_next_kad * 2,
-				Duration::from_secs(60));
-
-			if actually_started {
-				let ev = DiscoveryOut::RandomKademliaStarted(self.kademlias.keys().cloned().collect());
-				return Poll::Ready(NetworkBehaviourAction::GenerateEvent(ev));
 			}
 		}
 
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 58c623a8f5f1..cb1cc4f3b77a 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -268,6 +268,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 				config.with_user_defined(known_addresses);
 				config.discovery_limit(u64::from(params.network_config.default_peers_set.out_peers) + 15);
 				config.add_protocol(params.protocol_id.clone());
+				config.with_dht_random_walk(params.network_config.enable_dht_random_walk);
 				config.allow_non_globals_in_dht(params.network_config.allow_non_globals_in_dht);
 				config.use_kademlia_disjoint_query_paths(params.network_config.kademlia_disjoint_query_paths);
 

From 81ca765646c35c7676ec2f86e718bf1f6a5cc274 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 2 Feb 2021 15:19:40 +0100
Subject: [PATCH 0350/1194] Convert AURA to new pallet macro (#8020)

---
 frame/aura/Cargo.toml                |   1 -
 frame/aura/src/lib.rs                | 129 +++++++++++++++------------
 frame/aura/src/mock.rs               |   2 +-
 frame/aura/src/tests.rs              |   2 +-
 primitives/consensus/aura/src/lib.rs |   2 +
 5 files changed, 78 insertions(+), 58 deletions(-)

diff --git a/frame/aura/Cargo.toml b/frame/aura/Cargo.toml
index 467f684af594..2cd7e5c15f5c 100644
--- a/frame/aura/Cargo.toml
+++ b/frame/aura/Cargo.toml
@@ -26,7 +26,6 @@ frame-system = { version = "2.0.0", default-features = false, path = "../system"
 sp-timestamp = { version = "2.0.0", default-features = false, path = "../../primitives/timestamp" }
 pallet-timestamp = { version = "2.0.0", default-features = false, path = "../timestamp" }
 
-
 [dev-dependencies]
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
 sp-io ={ version = "2.0.0", path = "../../primitives/io" }
diff --git a/frame/aura/src/lib.rs b/frame/aura/src/lib.rs
index 65c6a4db9e5b..7e43f49c4dd7 100644
--- a/frame/aura/src/lib.rs
+++ b/frame/aura/src/lib.rs
@@ -44,14 +44,9 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use pallet_timestamp;
-
 use sp_std::{result, prelude::*};
 use codec::{Encode, Decode};
-use frame_support::{
-	decl_storage, decl_module, Parameter, traits::{Get, FindAuthor},
-	ConsensusEngineId,
-};
+use frame_support::{Parameter, traits::{Get, FindAuthor}, ConsensusEngineId};
 use sp_runtime::{
 	RuntimeAppPublic,
 	traits::{SaturatedConversion, Saturating, Zero, Member, IsMember}, generic::DigestItem,
@@ -59,37 +54,67 @@ use sp_runtime::{
 use sp_timestamp::OnTimestampSet;
 use sp_inherents::{InherentIdentifier, InherentData, ProvideInherent, MakeFatalError};
 use sp_consensus_aura::{
-	AURA_ENGINE_ID, ConsensusLog, AuthorityIndex,
+	AURA_ENGINE_ID, ConsensusLog, AuthorityIndex, Slot,
 	inherents::{INHERENT_IDENTIFIER, AuraInherentData},
 };
 
 mod mock;
 mod tests;
 
-pub trait Config: pallet_timestamp::Config {
-	/// The identifier type for an authority.
-	type AuthorityId: Member + Parameter + RuntimeAppPublic + Default;
-}
+pub use pallet::*;
 
-decl_storage! {
-	trait Store for Module<T: Config> as Aura {
-		/// The last timestamp.
-		LastTimestamp get(fn last): T::Moment;
+#[frame_support::pallet]
+pub mod pallet {
+	use super::*;
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
 
-		/// The current authorities
-		pub Authorities get(fn authorities): Vec<T::AuthorityId>;
+	#[pallet::config]
+	pub trait Config: pallet_timestamp::Config + frame_system::Config {
+		/// The identifier type for an authority.
+		type AuthorityId: Member + Parameter + RuntimeAppPublic + Default + MaybeSerializeDeserialize;
 	}
-	add_extra_genesis {
-		config(authorities): Vec<T::AuthorityId>;
-		build(|config| Module::<T>::initialize_authorities(&config.authorities))
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(sp_std::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	/// The current authority set.
+	#[pallet::storage]
+	#[pallet::getter(fn authorities)]
+	pub(super) type Authorities<T: Config> = StorageValue<_, Vec<T::AuthorityId>, ValueQuery>;
+
+	/// The last timestamp we have been notified of.
+	#[pallet::storage]
+	#[pallet::getter(fn last_timestamp)]
+	pub(super) type LastTimestamp<T: Config> = StorageValue<_, T::Moment, ValueQuery>;
+
+	#[pallet::genesis_config]
+	pub struct GenesisConfig<T: Config> {
+		pub authorities: Vec<T::AuthorityId>,
+	}
+
+	#[cfg(feature = "std")]
+	impl<T: Config> Default for GenesisConfig<T> {
+		fn default() -> Self {
+			Self { authorities: Vec::new() }
+		}
 	}
-}
 
-decl_module! {
-	pub struct Module<T: Config> for enum Call where origin: T::Origin { }
+	#[pallet::genesis_build]
+	impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+		fn build(&self) {
+			Pallet::<T>::initialize_authorities(&self.authorities);
+		}
+	}
 }
 
-impl<T: Config> Module<T> {
+impl<T: Config> Pallet<T> {
 	fn change_authorities(new: Vec<T::AuthorityId>) {
 		<Authorities<T>>::put(&new);
 
@@ -106,13 +131,20 @@ impl<T: Config> Module<T> {
 			<Authorities<T>>::put(authorities);
 		}
 	}
+
+	/// Determine the Aura slot-duration based on the Timestamp module configuration.
+	pub fn slot_duration() -> T::Moment {
+		// we double the minimum block-period so each author can always propose within
+		// the majority of its slot.
+		<T as pallet_timestamp::Config>::MinimumPeriod::get().saturating_mul(2u32.into())
+	}
 }
 
-impl<T: Config> sp_runtime::BoundToRuntimeAppPublic for Module<T> {
+impl<T: Config> sp_runtime::BoundToRuntimeAppPublic for Pallet<T> {
 	type Public = T::AuthorityId;
 }
 
-impl<T: Config> pallet_session::OneSessionHandler<T::AccountId> for Module<T> {
+impl<T: Config> pallet_session::OneSessionHandler<T::AccountId> for Pallet<T> {
 	type Key = T::AuthorityId;
 
 	fn on_genesis_session<'a, I: 'a>(validators: I)
@@ -128,7 +160,7 @@ impl<T: Config> pallet_session::OneSessionHandler<T::AccountId> for Module<T> {
 		// instant changes
 		if changed {
 			let next_authorities = validators.map(|(_, k)| k).collect::<Vec<_>>();
-			let last_authorities = <Module<T>>::authorities();
+			let last_authorities = Self::authorities();
 			if next_authorities != last_authorities {
 				Self::change_authorities(next_authorities);
 			}
@@ -145,16 +177,15 @@ impl<T: Config> pallet_session::OneSessionHandler<T::AccountId> for Module<T> {
 	}
 }
 
-impl<T: Config> FindAuthor<u32> for Module<T> {
+impl<T: Config> FindAuthor<u32> for Pallet<T> {
 	fn find_author<'a, I>(digests: I) -> Option<u32> where
 		I: 'a + IntoIterator<Item=(ConsensusEngineId, &'a [u8])>
 	{
 		for (id, mut data) in digests.into_iter() {
 			if id == AURA_ENGINE_ID {
-				if let Ok(slot) = u64::decode(&mut data) {
-					let author_index = slot % Self::authorities().len() as u64;
-					return Some(author_index as u32)
-				}
+				let slot = Slot::decode(&mut data).ok()?;
+				let author_index = *slot % Self::authorities().len() as u64;
+				return Some(author_index as u32)
 			}
 		}
 
@@ -162,7 +193,7 @@ impl<T: Config> FindAuthor<u32> for Module<T> {
 	}
 }
 
-/// We can not implement `FindAuthor` twice, because the compiler does not know if 
+/// We can not implement `FindAuthor` twice, because the compiler does not know if
 /// `u32 == T::AuthorityId` and thus, prevents us to implement the trait twice.
 #[doc(hidden)]
 pub struct FindAccountFromAuthorIndex<T, Inner>(sp_std::marker::PhantomData<(T, Inner)>);
@@ -175,15 +206,15 @@ impl<T: Config, Inner: FindAuthor<u32>> FindAuthor<T::AuthorityId>
 	{
 		let i = Inner::find_author(digests)?;
 
-		let validators = <Module<T>>::authorities();
+		let validators = <Pallet<T>>::authorities();
 		validators.get(i as usize).map(|k| k.clone())
 	}
 }
 
 /// Find the authority ID of the Aura authority who authored the current block.
-pub type AuraAuthorId<T> = FindAccountFromAuthorIndex<T, Module<T>>;
+pub type AuraAuthorId<T> = FindAccountFromAuthorIndex<T, Pallet<T>>;
 
-impl<T: Config> IsMember<T::AuthorityId> for Module<T> {
+impl<T: Config> IsMember<T::AuthorityId> for Pallet<T> {
 	fn is_member(authority_id: &T::AuthorityId) -> bool {
 		Self::authorities()
 			.iter()
@@ -191,26 +222,20 @@ impl<T: Config> IsMember<T::AuthorityId> for Module<T> {
 	}
 }
 
-impl<T: Config> Module<T> {
-	/// Determine the Aura slot-duration based on the Timestamp module configuration.
-	pub fn slot_duration() -> T::Moment {
-		// we double the minimum block-period so each author can always propose within
-		// the majority of its slot.
-		<T as pallet_timestamp::Config>::MinimumPeriod::get().saturating_mul(2u32.into())
-	}
-
-	fn on_timestamp_set(now: T::Moment, slot_duration: T::Moment) {
-		let last = Self::last();
-		<Self as Store>::LastTimestamp::put(now);
+impl<T: Config> OnTimestampSet<T::Moment> for Pallet<T> {
+	fn on_timestamp_set(moment: T::Moment) {
+		let last = Self::last_timestamp();
+		LastTimestamp::<T>::put(moment);
 
 		if last.is_zero() {
 			return;
 		}
 
+		let slot_duration = Self::slot_duration();
 		assert!(!slot_duration.is_zero(), "Aura slot duration cannot be zero.");
 
 		let last_slot = last / slot_duration;
-		let cur_slot = now / slot_duration;
+		let cur_slot = moment / slot_duration;
 
 		assert!(last_slot < cur_slot, "Only one block may be authored per slot.");
 
@@ -218,13 +243,7 @@ impl<T: Config> Module<T> {
 	}
 }
 
-impl<T: Config> OnTimestampSet<T::Moment> for Module<T> {
-	fn on_timestamp_set(moment: T::Moment) {
-		Self::on_timestamp_set(moment, Self::slot_duration())
-	}
-}
-
-impl<T: Config> ProvideInherent for Module<T> {
+impl<T: Config> ProvideInherent for Pallet<T> {
 	type Call = pallet_timestamp::Call<T>;
 	type Error = MakeFatalError<sp_inherents::Error>;
 	const INHERENT_IDENTIFIER: InherentIdentifier = INHERENT_IDENTIFIER;
diff --git a/frame/aura/src/mock.rs b/frame/aura/src/mock.rs
index c7c439393de9..8eef18448d0c 100644
--- a/frame/aura/src/mock.rs
+++ b/frame/aura/src/mock.rs
@@ -25,7 +25,7 @@ use sp_runtime::{
 	traits::IdentityLookup,
 	testing::{Header, UintAuthorityId},
 };
-use frame_support::parameter_types;
+use frame_support::{parameter_types, traits::GenesisBuild};
 use sp_io;
 use sp_core::H256;
 
diff --git a/frame/aura/src/tests.rs b/frame/aura/src/tests.rs
index b198308282c4..00b792c300a5 100644
--- a/frame/aura/src/tests.rs
+++ b/frame/aura/src/tests.rs
@@ -24,7 +24,7 @@ use crate::mock::{Aura, new_test_ext};
 #[test]
 fn initial_values() {
 	new_test_ext(vec![0, 1, 2, 3]).execute_with(|| {
-		assert_eq!(Aura::last(), 0u64);
+		assert_eq!(Aura::last_timestamp(), 0u64);
 		assert_eq!(Aura::authorities().len(), 4);
 	});
 }
diff --git a/primitives/consensus/aura/src/lib.rs b/primitives/consensus/aura/src/lib.rs
index 428a3c2f6f45..95630fa7b5c6 100644
--- a/primitives/consensus/aura/src/lib.rs
+++ b/primitives/consensus/aura/src/lib.rs
@@ -61,6 +61,8 @@ pub mod ed25519 {
 	pub type AuthorityId = app_ed25519::Public;
 }
 
+pub use sp_consensus_slots::Slot;
+
 /// The `ConsensusEngineId` of AuRa.
 pub const AURA_ENGINE_ID: ConsensusEngineId = [b'a', b'u', b'r', b'a'];
 

From bc69520ae4abb78ca89a57ff9af8887d598ce048 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Tue, 2 Feb 2021 15:58:29 +0100
Subject: [PATCH 0351/1194] Rename system_networkState to
 system_unstable_networkState (#8001)

---
 bin/node/cli/browser-demo/index.html | 4 ++--
 client/rpc-api/src/system/mod.rs     | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/bin/node/cli/browser-demo/index.html b/bin/node/cli/browser-demo/index.html
index 60acfde39f55..4a706906ab10 100644
--- a/bin/node/cli/browser-demo/index.html
+++ b/bin/node/cli/browser-demo/index.html
@@ -27,8 +27,8 @@
 
 	setInterval(() => {
 		client
-			.rpcSend('{"method":"system_networkState","params":[],"id":1,"jsonrpc":"2.0"}')
-			.then((r) => log("Network state: " + r));
+			.rpcSend('{"method":"system_localPeerId","params":[],"id":1,"jsonrpc":"2.0"}')
+			.then((r) => log("Local PeerId: " + r));
 	}, 20000);
 }
 
diff --git a/client/rpc-api/src/system/mod.rs b/client/rpc-api/src/system/mod.rs
index 2cf22b980299..2e8a7aa12633 100644
--- a/client/rpc-api/src/system/mod.rs
+++ b/client/rpc-api/src/system/mod.rs
@@ -79,9 +79,11 @@ pub trait SystemApi<Hash, Number> {
 
 	/// Returns current state of the network.
 	///
-	/// **Warning**: This API is not stable.
-	// TODO: make this stable and move structs https://github.com/paritytech/substrate/issues/1890
-	#[rpc(name = "system_networkState", returns = "jsonrpc_core::Value")]
+	/// **Warning**: This API is not stable. Please do not programmatically interpret its output,
+	/// as its format might change at any time.
+	// TODO: the future of this call is uncertain: https://github.com/paritytech/substrate/issues/1890
+	// https://github.com/paritytech/substrate/issues/5541
+	#[rpc(name = "system_unstable_networkState", returns = "jsonrpc_core::Value")]
 	fn system_network_state(&self)
 		-> Compat<BoxFuture<'static, jsonrpc_core::Result<jsonrpc_core::Value>>>;
 

From 075796f75f754a712ebb417c8b17633f7b88adf1 Mon Sep 17 00:00:00 2001
From: Liu-Cheng Xu <xuliuchengxlc@gmail.com>
Date: Wed, 3 Feb 2021 00:38:37 +0800
Subject: [PATCH 0352/1194] Decouple the session validators from im-online
 (#7127)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Decouple the session validators from im-online

* .

* Add SessionInterface trait in im-online

Add ValidatorId in im-online Trait

Make im-online compile

Make substrate binary compile

* Fix merging issue

* Make all compile

* Fix tests

* Avoid using frame dep in primitives via pallet-session-common

* Merge ValidatorSet into SessionInterface trait

Wrap a few too long lines

Add some docs

* Move pallet-sesion-common into pallet-session

* Move SessionInterface to sp-session and impl it in session pallet

Ref https://github.com/paritytech/substrate/pull/7127#discussion_r494892472

* Split put historical::FullValidatorIdentification trait

* Fix line width

* Fix staking mock

* Fix session doc test

* Simplify <T as ValidatorIdentification<AccountId>>::ValidatorId as ValidatorId<T>

* Nits

* Clean up.

* Make it compile by commenting out report_offence_im_online bench

* Tests

* Nits

* Move OneSessionHandler to sp-session

* Fix tests

* Add some docs

* .

* Fix typo

* Rename to ValidatorSet::session_index()

* Add some more docs

* .

* Remove extra empty line

* Fix line width check

.

* Apply suggestions from code review

* Cleaup Cargo.toml

* Aura has migrated to Pallet now

Co-authored-by: Tomasz Drwięga <tomasz@parity.io>
---
 Cargo.lock                              |  1 +
 bin/node/runtime/src/lib.rs             |  1 +
 frame/aura/src/lib.rs                   |  4 +-
 frame/authority-discovery/src/lib.rs    |  6 +--
 frame/babe/src/lib.rs                   |  4 +-
 frame/grandpa/src/lib.rs                |  4 +-
 frame/grandpa/src/tests.rs              |  3 +-
 frame/im-online/Cargo.toml              |  7 +--
 frame/im-online/src/lib.rs              | 67 ++++++++++++++---------
 frame/im-online/src/mock.rs             |  2 +
 frame/offences/benchmarking/src/lib.rs  | 32 ++++++++++-
 frame/offences/benchmarking/src/mock.rs |  5 +-
 frame/session/src/historical/mod.rs     | 24 ++++++++-
 frame/session/src/lib.rs                | 50 ++++++-----------
 frame/session/src/tests.rs              |  1 +
 frame/staking/src/mock.rs               |  4 +-
 frame/support/Cargo.toml                |  2 +
 frame/support/src/traits.rs             | 71 +++++++++++++++++++++++--
 18 files changed, 204 insertions(+), 84 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d8f52aa141a9..d5197ba4ea65 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1628,6 +1628,7 @@ dependencies = [
  "sp-inherents",
  "sp-io",
  "sp-runtime",
+ "sp-staking",
  "sp-state-machine",
  "sp-std",
  "sp-tracing",
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 6a9919fcbc8b..c2a2542b5588 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -830,6 +830,7 @@ impl<C> frame_system::offchain::SendTransactionTypes<C> for Runtime where
 impl pallet_im_online::Config for Runtime {
 	type AuthorityId = ImOnlineId;
 	type Event = Event;
+	type ValidatorSet = Historical;
 	type SessionDuration = SessionDuration;
 	type ReportUnresponsiveness = Offences;
 	type UnsignedPriority = ImOnlineUnsignedPriority;
diff --git a/frame/aura/src/lib.rs b/frame/aura/src/lib.rs
index 7e43f49c4dd7..61937da286ad 100644
--- a/frame/aura/src/lib.rs
+++ b/frame/aura/src/lib.rs
@@ -46,7 +46,7 @@
 
 use sp_std::{result, prelude::*};
 use codec::{Encode, Decode};
-use frame_support::{Parameter, traits::{Get, FindAuthor}, ConsensusEngineId};
+use frame_support::{Parameter, traits::{Get, FindAuthor, OneSessionHandler}, ConsensusEngineId};
 use sp_runtime::{
 	RuntimeAppPublic,
 	traits::{SaturatedConversion, Saturating, Zero, Member, IsMember}, generic::DigestItem,
@@ -144,7 +144,7 @@ impl<T: Config> sp_runtime::BoundToRuntimeAppPublic for Pallet<T> {
 	type Public = T::AuthorityId;
 }
 
-impl<T: Config> pallet_session::OneSessionHandler<T::AccountId> for Pallet<T> {
+impl<T: Config> OneSessionHandler<T::AccountId> for Pallet<T> {
 	type Key = T::AuthorityId;
 
 	fn on_genesis_session<'a, I: 'a>(validators: I)
diff --git a/frame/authority-discovery/src/lib.rs b/frame/authority-discovery/src/lib.rs
index 219219b9957b..cc3f41f59ed8 100644
--- a/frame/authority-discovery/src/lib.rs
+++ b/frame/authority-discovery/src/lib.rs
@@ -24,7 +24,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use sp_std::prelude::*;
-use frame_support::{decl_module, decl_storage};
+use frame_support::{decl_module, decl_storage, traits::OneSessionHandler};
 use sp_authority_discovery::AuthorityId;
 
 /// The module's config trait.
@@ -85,7 +85,7 @@ impl<T: Config> sp_runtime::BoundToRuntimeAppPublic for Module<T> {
 	type Public = AuthorityId;
 }
 
-impl<T: Config> pallet_session::OneSessionHandler<T::AccountId> for Module<T> {
+impl<T: Config> OneSessionHandler<T::AccountId> for Module<T> {
 	type Key = AuthorityId;
 
 	fn on_genesis_session<'a, I: 'a>(authorities: I)
@@ -265,7 +265,7 @@ mod tests {
 		let mut externalities = TestExternalities::new(t);
 
 		externalities.execute_with(|| {
-			use pallet_session::OneSessionHandler;
+			use frame_support::traits::OneSessionHandler;
 
 			AuthorityDiscovery::on_genesis_session(
 				first_authorities.iter().map(|id| (id, id.clone()))
diff --git a/frame/babe/src/lib.rs b/frame/babe/src/lib.rs
index e34de5d6c532..0afa0e1d0980 100644
--- a/frame/babe/src/lib.rs
+++ b/frame/babe/src/lib.rs
@@ -25,7 +25,7 @@ use codec::{Decode, Encode};
 use frame_support::{
 	decl_error, decl_module, decl_storage,
 	dispatch::DispatchResultWithPostInfo,
-	traits::{FindAuthor, Get, KeyOwnerProofSystem, Randomness as RandomnessT},
+	traits::{FindAuthor, Get, KeyOwnerProofSystem, OneSessionHandler, Randomness as RandomnessT},
 	weights::{Pays, Weight},
 	Parameter,
 };
@@ -769,7 +769,7 @@ impl<T: Config> sp_runtime::BoundToRuntimeAppPublic for Module<T> {
 	type Public = AuthorityId;
 }
 
-impl<T: Config> pallet_session::OneSessionHandler<T::AccountId> for Module<T> {
+impl<T: Config> OneSessionHandler<T::AccountId> for Module<T> {
 	type Key = AuthorityId;
 
 	fn on_genesis_session<'a, I: 'a>(validators: I)
diff --git a/frame/grandpa/src/lib.rs b/frame/grandpa/src/lib.rs
index 078acbaa5756..b68624df7b5d 100644
--- a/frame/grandpa/src/lib.rs
+++ b/frame/grandpa/src/lib.rs
@@ -41,7 +41,7 @@ use fg_primitives::{
 };
 use frame_support::{
 	decl_error, decl_event, decl_module, decl_storage, dispatch::DispatchResultWithPostInfo,
-	storage, traits::KeyOwnerProofSystem, weights::{Pays, Weight}, Parameter,
+	storage, traits::{OneSessionHandler, KeyOwnerProofSystem}, weights::{Pays, Weight}, Parameter,
 };
 use frame_system::{ensure_none, ensure_root, ensure_signed};
 use sp_runtime::{
@@ -587,7 +587,7 @@ impl<T: Config> sp_runtime::BoundToRuntimeAppPublic for Module<T> {
 	type Public = AuthorityId;
 }
 
-impl<T: Config> pallet_session::OneSessionHandler<T::AccountId> for Module<T>
+impl<T: Config> OneSessionHandler<T::AccountId> for Module<T>
 	where T: pallet_session::Config
 {
 	type Key = AuthorityId;
diff --git a/frame/grandpa/src/tests.rs b/frame/grandpa/src/tests.rs
index 0e2a458a3dfe..4870bf606286 100644
--- a/frame/grandpa/src/tests.rs
+++ b/frame/grandpa/src/tests.rs
@@ -25,11 +25,10 @@ use codec::{Decode, Encode};
 use fg_primitives::ScheduledChange;
 use frame_support::{
 	assert_err, assert_ok,
-	traits::{Currency, OnFinalize},
+	traits::{Currency, OnFinalize, OneSessionHandler},
 	weights::{GetDispatchInfo, Pays},
 };
 use frame_system::{EventRecord, Phase};
-use pallet_session::OneSessionHandler;
 use sp_core::H256;
 use sp_keyring::Ed25519Keyring;
 use sp_runtime::testing::Digest;
diff --git a/frame/im-online/Cargo.toml b/frame/im-online/Cargo.toml
index fc84a8d8cb1b..41eb433478d4 100644
--- a/frame/im-online/Cargo.toml
+++ b/frame/im-online/Cargo.toml
@@ -19,7 +19,6 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 serde = { version = "1.0.101", optional = true }
-pallet-session = { version = "2.0.0", default-features = false, path = "../session" }
 sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
 sp-staking = { version = "2.0.0", default-features = false, path = "../../primitives/staking" }
@@ -28,8 +27,11 @@ frame-system = { version = "2.0.0", default-features = false, path = "../system"
 
 frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
 
+[dev-dependencies]
+pallet-session = { version = "2.0.0", path = "../session" }
+
 [features]
-default = ["std", "pallet-session/historical"]
+default = ["std"]
 std = [
 	"sp-application-crypto/std",
 	"pallet-authorship/std",
@@ -37,7 +39,6 @@ std = [
 	"sp-core/std",
 	"sp-std/std",
 	"serde",
-	"pallet-session/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-staking/std",
diff --git a/frame/im-online/src/lib.rs b/frame/im-online/src/lib.rs
index 71ee25d779bd..bd597acfb1ed 100644
--- a/frame/im-online/src/lib.rs
+++ b/frame/im-online/src/lib.rs
@@ -79,7 +79,6 @@ use codec::{Encode, Decode};
 use sp_core::offchain::OpaqueNetworkState;
 use sp_std::prelude::*;
 use sp_std::convert::TryInto;
-use pallet_session::historical::IdentificationTuple;
 use sp_runtime::{
 	offchain::storage::StorageValueRef,
 	RuntimeDebug,
@@ -95,7 +94,7 @@ use sp_staking::{
 };
 use frame_support::{
 	decl_module, decl_event, decl_storage, Parameter, debug, decl_error,
-	traits::Get,
+	traits::{Get, ValidatorSet, ValidatorSetWithIdentification, OneSessionHandler},
 };
 use frame_system::ensure_none;
 use frame_system::offchain::{
@@ -227,7 +226,19 @@ pub struct Heartbeat<BlockNumber>
 	pub validators_len: u32,
 }
 
-pub trait Config: SendTransactionTypes<Call<Self>> + pallet_session::historical::Config {
+/// A type for representing the validator id in a session.
+pub type ValidatorId<T> = <
+	<T as Config>::ValidatorSet as ValidatorSet<<T as frame_system::Config>::AccountId>
+>::ValidatorId;
+
+/// A tuple of (ValidatorId, Identification) where `Identification` is the full identification of `ValidatorId`.
+pub type IdentificationTuple<T> = (
+	ValidatorId<T>,
+	<<T as Config>::ValidatorSet as
+		ValidatorSetWithIdentification<<T as frame_system::Config>::AccountId>>::Identification,
+);
+
+pub trait Config: SendTransactionTypes<Call<Self>> + frame_system::Config {
 	/// The identifier type for an authority.
 	type AuthorityId: Member + Parameter + RuntimeAppPublic + Default + Ord;
 
@@ -242,6 +253,9 @@ pub trait Config: SendTransactionTypes<Call<Self>> + pallet_session::historical:
 	/// there is a chance the authority will produce a block and they won't be necessary.
 	type SessionDuration: Get<Self::BlockNumber>;
 
+	/// A type for retrieving the validators supposed to be online in a session.
+	type ValidatorSet: ValidatorSetWithIdentification<Self::AccountId>;
+
 	/// A type that gives us the ability to submit unresponsiveness offence reports.
 	type ReportUnresponsiveness:
 		ReportOffence<
@@ -293,10 +307,10 @@ decl_storage! {
 			double_map hasher(twox_64_concat) SessionIndex, hasher(twox_64_concat) AuthIndex
 			=> Option<Vec<u8>>;
 
-		/// For each session index, we keep a mapping of `T::ValidatorId` to the
+		/// For each session index, we keep a mapping of `ValidatorId<T>` to the
 		/// number of blocks authored by the given authority.
 		AuthoredBlocks get(fn authored_blocks):
-			double_map hasher(twox_64_concat) SessionIndex, hasher(twox_64_concat) T::ValidatorId
+			double_map hasher(twox_64_concat) SessionIndex, hasher(twox_64_concat) ValidatorId<T>
 			=> u32;
 	}
 	add_extra_genesis {
@@ -345,7 +359,7 @@ decl_module! {
 		) {
 			ensure_none(origin)?;
 
-			let current_session = <pallet_session::Module<T>>::current_index();
+			let current_session = T::ValidatorSet::session_index();
 			let exists = <ReceivedHeartbeats>::contains_key(
 				&current_session,
 				&heartbeat.authority_index
@@ -397,12 +411,15 @@ type OffchainResult<T, A> = Result<A, OffchainErr<<T as frame_system::Config>::B
 
 /// Keep track of number of authored blocks per authority, uncles are counted as
 /// well since they're a valid proof of being online.
-impl<T: Config + pallet_authorship::Config> pallet_authorship::EventHandler<T::ValidatorId, T::BlockNumber> for Module<T> {
-	fn note_author(author: T::ValidatorId) {
+impl<
+	T: Config + pallet_authorship::Config,
+> pallet_authorship::EventHandler<ValidatorId<T>, T::BlockNumber> for Module<T>
+{
+	fn note_author(author: ValidatorId<T>) {
 		Self::note_authorship(author);
 	}
 
-	fn note_uncle(author: T::ValidatorId, _age: T::BlockNumber) {
+	fn note_uncle(author: ValidatorId<T>, _age: T::BlockNumber) {
 		Self::note_authorship(author);
 	}
 }
@@ -413,7 +430,7 @@ impl<T: Config> Module<T> {
 	/// authored at least one block, during the current session. Otherwise
 	/// `false`.
 	pub fn is_online(authority_index: AuthIndex) -> bool {
-		let current_validators = <pallet_session::Module<T>>::validators();
+		let current_validators = T::ValidatorSet::validators();
 
 		if authority_index >= current_validators.len() as u32 {
 			return false;
@@ -424,8 +441,8 @@ impl<T: Config> Module<T> {
 		Self::is_online_aux(authority_index, authority)
 	}
 
-	fn is_online_aux(authority_index: AuthIndex, authority: &T::ValidatorId) -> bool {
-		let current_session = <pallet_session::Module<T>>::current_index();
+	fn is_online_aux(authority_index: AuthIndex, authority: &ValidatorId<T>) -> bool {
+		let current_session = T::ValidatorSet::session_index();
 
 		<ReceivedHeartbeats>::contains_key(&current_session, &authority_index) ||
 			<AuthoredBlocks<T>>::get(
@@ -437,13 +454,13 @@ impl<T: Config> Module<T> {
 	/// Returns `true` if a heartbeat has been received for the authority at `authority_index` in
 	/// the authorities series, during the current session. Otherwise `false`.
 	pub fn received_heartbeat_in_current_session(authority_index: AuthIndex) -> bool {
-		let current_session = <pallet_session::Module<T>>::current_index();
+		let current_session = T::ValidatorSet::session_index();
 		<ReceivedHeartbeats>::contains_key(&current_session, &authority_index)
 	}
 
 	/// Note that the given authority has authored a block in the current session.
-	fn note_authorship(author: T::ValidatorId) {
-		let current_session = <pallet_session::Module<T>>::current_index();
+	fn note_authorship(author: ValidatorId<T>) {
+		let current_session = T::ValidatorSet::session_index();
 
 		<AuthoredBlocks<T>>::mutate(
 			&current_session,
@@ -460,8 +477,8 @@ impl<T: Config> Module<T> {
 			return Err(OffchainErr::TooEarly(heartbeat_after))
 		}
 
-		let session_index = <pallet_session::Module<T>>::current_index();
-		let validators_len = <pallet_session::Module<T>>::validators().len() as u32;
+		let session_index = T::ValidatorSet::session_index();
+		let validators_len = Keys::<T>::decode_len().unwrap_or_default() as u32;
 
 		Ok(Self::local_authority_keys()
 			.map(move |(authority_index, key)|
@@ -614,7 +631,7 @@ impl<T: Config> sp_runtime::BoundToRuntimeAppPublic for Module<T> {
 	type Public = T::AuthorityId;
 }
 
-impl<T: Config> pallet_session::OneSessionHandler<T::AccountId> for Module<T> {
+impl<T: Config> OneSessionHandler<T::AccountId> for Module<T> {
 	type Key = T::AuthorityId;
 
 	fn on_genesis_session<'a, I: 'a>(validators: I)
@@ -639,22 +656,24 @@ impl<T: Config> pallet_session::OneSessionHandler<T::AccountId> for Module<T> {
 	}
 
 	fn on_before_session_ending() {
-		let session_index = <pallet_session::Module<T>>::current_index();
+		let session_index = T::ValidatorSet::session_index();
 		let keys = Keys::<T>::get();
-		let current_validators = <pallet_session::Module<T>>::validators();
+		let current_validators = T::ValidatorSet::validators();
 
 		let offenders = current_validators.into_iter().enumerate()
 			.filter(|(index, id)|
 				!Self::is_online_aux(*index as u32, id)
 			).filter_map(|(_, id)|
-				T::FullIdentificationOf::convert(id.clone()).map(|full_id| (id, full_id))
+				<T::ValidatorSet as ValidatorSetWithIdentification<T::AccountId>>::IdentificationOf::convert(
+					id.clone()
+				).map(|full_id| (id, full_id))
 			).collect::<Vec<IdentificationTuple<T>>>();
 
 		// Remove all received heartbeats and number of authored blocks from the
 		// current session, they have already been processed and won't be needed
 		// anymore.
-		<ReceivedHeartbeats>::remove_prefix(&<pallet_session::Module<T>>::current_index());
-		<AuthoredBlocks<T>>::remove_prefix(&<pallet_session::Module<T>>::current_index());
+		<ReceivedHeartbeats>::remove_prefix(&T::ValidatorSet::session_index());
+		<AuthoredBlocks<T>>::remove_prefix(&T::ValidatorSet::session_index());
 
 		if offenders.is_empty() {
 			Self::deposit_event(RawEvent::AllGood);
@@ -691,7 +710,7 @@ impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
 			}
 
 			// check if session index from heartbeat is recent
-			let current_session = <pallet_session::Module<T>>::current_index();
+			let current_session = T::ValidatorSet::session_index();
 			if heartbeat.session_index != current_session {
 				return InvalidTransaction::Stale.into();
 			}
diff --git a/frame/im-online/src/mock.rs b/frame/im-online/src/mock.rs
index 624014cd55f7..cf2138e941d0 100644
--- a/frame/im-online/src/mock.rs
+++ b/frame/im-online/src/mock.rs
@@ -179,6 +179,7 @@ impl Config for Runtime {
 	type AuthorityId = UintAuthorityId;
 	type Event = ();
 	type ReportUnresponsiveness = OffenceHandler;
+	type ValidatorSet = Historical;
 	type SessionDuration = Period;
 	type UnsignedPriority = UnsignedPriority;
 	type WeightInfo = ();
@@ -195,6 +196,7 @@ impl<LocalCall> frame_system::offchain::SendTransactionTypes<LocalCall> for Runt
 pub type ImOnline = Module<Runtime>;
 pub type System = frame_system::Module<Runtime>;
 pub type Session = pallet_session::Module<Runtime>;
+pub type Historical = pallet_session::historical::Module<Runtime>;
 
 pub fn advance_session() {
 	let now = System::block_number().max(1);
diff --git a/frame/offences/benchmarking/src/lib.rs b/frame/offences/benchmarking/src/lib.rs
index 06a0e33a9cf4..57672f13ed71 100644
--- a/frame/offences/benchmarking/src/lib.rs
+++ b/frame/offences/benchmarking/src/lib.rs
@@ -26,7 +26,7 @@ use sp_std::vec;
 
 use frame_system::{RawOrigin, Module as System, Config as SystemConfig};
 use frame_benchmarking::{benchmarks, account};
-use frame_support::traits::{Currency, OnInitialize};
+use frame_support::traits::{Currency, OnInitialize, ValidatorSet, ValidatorSetWithIdentification};
 
 use sp_runtime::{Perbill, traits::{Convert, StaticLookup, Saturating, UniqueSaturatedInto}};
 use sp_staking::offence::{ReportOffence, Offence, OffenceDetails};
@@ -176,6 +176,34 @@ fn make_offenders<T: Config>(num_offenders: u32, num_nominators: u32) -> Result<
 	Ok((id_tuples, offenders))
 }
 
+fn make_offenders_im_online<T: Config>(num_offenders: u32, num_nominators: u32) -> Result<
+	(Vec<pallet_im_online::IdentificationTuple<T>>, Vec<Offender<T>>),
+	&'static str
+> {
+	Staking::<T>::new_session(0);
+
+	let mut offenders = vec![];
+	for i in 0 .. num_offenders {
+		let offender = create_offender::<T>(i + 1, num_nominators)?;
+		offenders.push(offender);
+	}
+
+	Staking::<T>::start_session(0);
+
+	let id_tuples = offenders.iter()
+		.map(|offender| <
+				<T as ImOnlineConfig>::ValidatorSet as ValidatorSet<T::AccountId>
+			>::ValidatorIdOf::convert(offender.controller.clone())
+			.expect("failed to get validator id from account id"))
+		.map(|validator_id| <
+				<T as ImOnlineConfig>::ValidatorSet as ValidatorSetWithIdentification<T::AccountId>
+			>::IdentificationOf::convert(validator_id.clone())
+			.map(|full_id| (validator_id, full_id))
+			.expect("failed to convert validator id to full identification"))
+		.collect::<Vec<pallet_im_online::IdentificationTuple<T>>>();
+	Ok((id_tuples, offenders))
+}
+
 #[cfg(test)]
 fn check_events<T: Config, I: Iterator<Item = <T as SystemConfig>::Event>>(expected: I) {
 	let events = System::<T>::events() .into_iter()
@@ -220,7 +248,7 @@ benchmarks! {
 		// make sure reporters actually get rewarded
 		Staking::<T>::set_slash_reward_fraction(Perbill::one());
 
-		let (offenders, raw_offenders) = make_offenders::<T>(o, n)?;
+		let (offenders, raw_offenders) = make_offenders_im_online::<T>(o, n)?;
 		let keys =  ImOnline::<T>::keys();
 		let validator_set_count = keys.len() as u32;
 
diff --git a/frame/offences/benchmarking/src/mock.rs b/frame/offences/benchmarking/src/mock.rs
index 6ebb9f19e6ae..5d6d13aa3091 100644
--- a/frame/offences/benchmarking/src/mock.rs
+++ b/frame/offences/benchmarking/src/mock.rs
@@ -29,7 +29,7 @@ use sp_runtime::{
 	traits::IdentityLookup,
 	testing::{Header, UintAuthorityId},
 };
-
+use pallet_session::historical as pallet_session_historical;
 
 type AccountId = u64;
 type AccountIndex = u32;
@@ -130,6 +130,7 @@ impl pallet_session::Config for Test {
 	type DisabledValidatorsThreshold = ();
 	type WeightInfo = ();
 }
+
 pallet_staking_reward_curve::build! {
 	const I_NPOS: sp_runtime::curve::PiecewiseLinear<'static> = curve!(
 		min_inflation: 0_025_000,
@@ -175,6 +176,7 @@ impl pallet_staking::Config for Test {
 impl pallet_im_online::Config for Test {
 	type AuthorityId = UintAuthorityId;
 	type Event = Event;
+	type ValidatorSet = Historical;
 	type SessionDuration = Period;
 	type ReportUnresponsiveness = Offences;
 	type UnsignedPriority = ();
@@ -214,6 +216,7 @@ frame_support::construct_runtime!(
 		Session: pallet_session::{Module, Call, Storage, Event, Config<T>},
 		ImOnline: pallet_im_online::{Module, Call, Storage, Event<T>, ValidateUnsigned, Config<T>},
 		Offences: pallet_offences::{Module, Call, Storage, Event},
+		Historical: pallet_session_historical::{Module},
 	}
 );
 
diff --git a/frame/session/src/historical/mod.rs b/frame/session/src/historical/mod.rs
index 48f32af7b474..9b4d2704cf45 100644
--- a/frame/session/src/historical/mod.rs
+++ b/frame/session/src/historical/mod.rs
@@ -31,8 +31,10 @@ use codec::{Encode, Decode};
 use sp_runtime::KeyTypeId;
 use sp_runtime::traits::{Convert, OpaqueKeys};
 use sp_session::{MembershipProof, ValidatorCount};
-use frame_support::{decl_module, decl_storage};
-use frame_support::{Parameter, print};
+use frame_support::{
+	decl_module, decl_storage, Parameter, print,
+	traits::{ValidatorSet, ValidatorSetWithIdentification},
+};
 use sp_trie::{MemoryDB, Trie, TrieMut, Recorder, EMPTY_PREFIX};
 use sp_trie::trie_types::{TrieDBMut, TrieDB};
 use super::{SessionIndex, Module as SessionModule};
@@ -102,6 +104,24 @@ impl<T: Config> Module<T> {
 	}
 }
 
+impl<T: Config> ValidatorSet<T::AccountId> for Module<T> {
+	type ValidatorId = T::ValidatorId;
+	type ValidatorIdOf = T::ValidatorIdOf;
+
+	fn session_index() -> sp_staking::SessionIndex {
+		super::Module::<T>::current_index()
+	}
+
+	fn validators() -> Vec<Self::ValidatorId> {
+		super::Module::<T>::validators()
+	}
+}
+
+impl<T: Config> ValidatorSetWithIdentification<T::AccountId> for Module<T> {
+	type Identification = T::FullIdentification;
+	type IdentificationOf = T::FullIdentificationOf;
+}
+
 /// Specialization of the crate-level `SessionManager` which returns the set of full identification
 /// when creating a new session.
 pub trait SessionManager<ValidatorId, FullIdentification>: crate::SessionManager<ValidatorId> {
diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs
index 74105ade15f1..0793d5e74b98 100644
--- a/frame/session/src/lib.rs
+++ b/frame/session/src/lib.rs
@@ -116,13 +116,14 @@ pub mod weights;
 
 use sp_std::{prelude::*, marker::PhantomData, ops::{Sub, Rem}};
 use codec::Decode;
-use sp_runtime::{KeyTypeId, Perbill, RuntimeAppPublic, BoundToRuntimeAppPublic};
+use sp_runtime::{KeyTypeId, Perbill, RuntimeAppPublic};
 use sp_runtime::traits::{Convert, Zero, Member, OpaqueKeys, Saturating};
 use sp_staking::SessionIndex;
 use frame_support::{
 	ensure, decl_module, decl_event, decl_storage, decl_error, ConsensusEngineId, Parameter,
 	traits::{
 		Get, FindAuthor, ValidatorRegistration, EstimateNextSessionRotation, EstimateNextNewSession,
+		OneSessionHandler, ValidatorSet,
 	},
 	dispatch::{self, DispatchResult, DispatchError},
 	weights::Weight,
@@ -256,40 +257,6 @@ pub trait SessionHandler<ValidatorId> {
 	fn on_disabled(validator_index: usize);
 }
 
-/// A session handler for specific key type.
-pub trait OneSessionHandler<ValidatorId>: BoundToRuntimeAppPublic {
-	/// The key type expected.
-	type Key: Decode + Default + RuntimeAppPublic;
-
-	fn on_genesis_session<'a, I: 'a>(validators: I)
-		where I: Iterator<Item=(&'a ValidatorId, Self::Key)>, ValidatorId: 'a;
-
-	/// Session set has changed; act appropriately. Note that this can be called
-	/// before initialization of your module.
-	///
-	/// `changed` is true when at least one of the session keys
-	/// or the underlying economic identities/distribution behind one the
-	/// session keys has changed, false otherwise.
-	///
-	/// The `validators` are the validators of the incoming session, and `queued_validators`
-	/// will follow.
-	fn on_new_session<'a, I: 'a>(
-		changed: bool,
-		validators: I,
-		queued_validators: I,
-	) where I: Iterator<Item=(&'a ValidatorId, Self::Key)>, ValidatorId: 'a;
-
-
-	/// A notification for end of the session.
-	///
-	/// Note it is triggered before any `SessionManager::end_session` handlers,
-	/// so we can still affect the validator set.
-	fn on_before_session_ending() {}
-
-	/// A validator got disabled. Act accordingly until a new session begins.
-	fn on_disabled(_validator_index: usize);
-}
-
 #[impl_trait_for_tuples::impl_for_tuples(1, 30)]
 #[tuple_types_no_default_trait_bound]
 impl<AId> SessionHandler<AId> for Tuple {
@@ -830,6 +797,19 @@ impl<T: Config> Module<T> {
 	}
 }
 
+impl<T: Config> ValidatorSet<T::AccountId> for Module<T> {
+	type ValidatorId = T::ValidatorId;
+	type ValidatorIdOf = T::ValidatorIdOf;
+
+	fn session_index() -> sp_staking::SessionIndex {
+		Module::<T>::current_index()
+	}
+
+	fn validators() -> Vec<Self::ValidatorId> {
+		Module::<T>::validators()
+	}
+}
+
 /// Wraps the author-scraping logic for consensus engines that can recover
 /// the canonical index of an author. This then transforms it into the
 /// registering account-ID of that session key index.
diff --git a/frame/session/src/tests.rs b/frame/session/src/tests.rs
index 7c1d3c9dcdd2..c876770c74bc 100644
--- a/frame/session/src/tests.rs
+++ b/frame/session/src/tests.rs
@@ -18,6 +18,7 @@
 // Tests for the Session Pallet
 
 use super::*;
+use codec::Decode;
 use frame_support::{traits::OnInitialize, assert_ok};
 use sp_core::crypto::key_types::DUMMY;
 use sp_runtime::testing::UintAuthorityId;
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index 5c3261414d2b..0eb77e7c14ac 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -21,7 +21,7 @@ use crate::*;
 use crate as staking;
 use frame_support::{
 	assert_ok, parameter_types,
-	traits::{Currency, FindAuthor, Get, OnFinalize, OnInitialize},
+	traits::{Currency, FindAuthor, Get, OnFinalize, OnInitialize, OneSessionHandler},
 	weights::{constants::RocksDbWeight, Weight},
 	IterableStorageMap, StorageDoubleMap, StorageMap, StorageValue,
 };
@@ -53,7 +53,7 @@ thread_local! {
 
 /// Another session handler struct to test on_disabled.
 pub struct OtherSessionHandler;
-impl pallet_session::OneSessionHandler<AccountId> for OtherSessionHandler {
+impl OneSessionHandler<AccountId> for OtherSessionHandler {
 	type Key = UintAuthorityId;
 
 	fn on_genesis_session<'a, I: 'a>(_: I)
diff --git a/frame/support/Cargo.toml b/frame/support/Cargo.toml
index 3354f17d27c9..294e4c1574a3 100644
--- a/frame/support/Cargo.toml
+++ b/frame/support/Cargo.toml
@@ -24,6 +24,7 @@ sp-tracing = { version = "2.0.0", default-features = false, path = "../../primit
 sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
 sp-arithmetic = { version = "2.0.0", default-features = false, path = "../../primitives/arithmetic" }
 sp-inherents = { version = "2.0.0", default-features = false, path = "../../primitives/inherents" }
+sp-staking = { version = "2.0.0", default-features = false, path = "../../primitives/staking" }
 frame-support-procedural = { version = "2.0.1", default-features = false, path = "./procedural" }
 paste = "0.1.6"
 once_cell = { version = "1", default-features = false, optional = true }
@@ -52,6 +53,7 @@ std = [
 	"sp-arithmetic/std",
 	"frame-metadata/std",
 	"sp-inherents/std",
+	"sp-staking/std",
 	"sp-state-machine",
 	"frame-support-procedural/std",
 ]
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index 2888abc306b3..c52aa60c20b1 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -23,13 +23,15 @@ use sp_std::{prelude::*, result, marker::PhantomData, ops::Div, fmt::Debug};
 use codec::{FullCodec, Codec, Encode, Decode, EncodeLike};
 use sp_core::u32_trait::Value as U32;
 use sp_runtime::{
-	RuntimeDebug, ConsensusEngineId, DispatchResult, DispatchError,
+	RuntimeAppPublic, RuntimeDebug, BoundToRuntimeAppPublic,
+	ConsensusEngineId, DispatchResult, DispatchError,
 	traits::{
-		MaybeSerializeDeserialize, AtLeast32Bit, Saturating, TrailingZeroInput, Bounded, Zero,
-		BadOrigin, AtLeast32BitUnsigned, UniqueSaturatedFrom, UniqueSaturatedInto,
-		SaturatedConversion, StoredMapError,
+	MaybeSerializeDeserialize, AtLeast32Bit, Saturating, TrailingZeroInput, Bounded, Zero,
+	BadOrigin, AtLeast32BitUnsigned, Convert, UniqueSaturatedFrom, UniqueSaturatedInto,
+	SaturatedConversion, StoredMapError,
 	},
 };
+use sp_staking::SessionIndex;
 use crate::dispatch::Parameter;
 use crate::storage::StorageMap;
 use crate::weights::Weight;
@@ -40,6 +42,67 @@ use impl_trait_for_tuples::impl_for_tuples;
 #[doc(hidden)]
 pub use sp_std::{mem::{swap, take}, cell::RefCell, vec::Vec, boxed::Box};
 
+/// A trait for online node inspection in a session.
+///
+/// Something that can give information about the current validator set.
+pub trait ValidatorSet<AccountId> {
+	/// Type for representing validator id in a session.
+	type ValidatorId: Parameter;
+	/// A type for converting `AccountId` to `ValidatorId`.
+	type ValidatorIdOf: Convert<AccountId, Option<Self::ValidatorId>>;
+
+	/// Returns current session index.
+	fn session_index() -> SessionIndex;
+
+	/// Returns the active set of validators.
+	fn validators() -> Vec<Self::ValidatorId>;
+}
+
+/// [`ValidatorSet`] combined with an identification.
+pub trait ValidatorSetWithIdentification<AccountId>: ValidatorSet<AccountId> {
+	/// Full identification of `ValidatorId`.
+	type Identification: Parameter;
+	/// A type for converting `ValidatorId` to `Identification`.
+	type IdentificationOf: Convert<Self::ValidatorId, Option<Self::Identification>>;
+}
+
+/// A session handler for specific key type.
+pub trait OneSessionHandler<ValidatorId>: BoundToRuntimeAppPublic {
+	/// The key type expected.
+	type Key: Decode + Default + RuntimeAppPublic;
+
+	/// The given validator set will be used for the genesis session.
+	/// It is guaranteed that the given validator set will also be used
+	/// for the second session, therefore the first call to `on_new_session`
+	/// should provide the same validator set.
+	fn on_genesis_session<'a, I: 'a>(validators: I)
+		where I: Iterator<Item=(&'a ValidatorId, Self::Key)>, ValidatorId: 'a;
+
+	/// Session set has changed; act appropriately. Note that this can be called
+	/// before initialization of your module.
+	///
+	/// `changed` is true when at least one of the session keys
+	/// or the underlying economic identities/distribution behind one the
+	/// session keys has changed, false otherwise.
+	///
+	/// The `validators` are the validators of the incoming session, and `queued_validators`
+	/// will follow.
+	fn on_new_session<'a, I: 'a>(
+		changed: bool,
+		validators: I,
+		queued_validators: I,
+	) where I: Iterator<Item=(&'a ValidatorId, Self::Key)>, ValidatorId: 'a;
+
+	/// A notification for end of the session.
+	///
+	/// Note it is triggered before any `SessionManager::end_session` handlers,
+	/// so we can still affect the validator set.
+	fn on_before_session_ending() {}
+
+	/// A validator got disabled. Act accordingly until a new session begins.
+	fn on_disabled(_validator_index: usize);
+}
+
 /// Simple trait for providing a filter over a reference to some type.
 pub trait Filter<T> {
 	/// Determine if a given value should be allowed through the filter (returns `true`) or not.

From c7f52d184727b11171eea458c4f277bc6b37df02 Mon Sep 17 00:00:00 2001
From: Joshy Orndorff <JoshOrndorff@users.noreply.github.com>
Date: Tue, 2 Feb 2021 11:57:31 -0500
Subject: [PATCH 0353/1194] better formatting for doc comments (#8030)

---
 primitives/debug-derive/src/lib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/primitives/debug-derive/src/lib.rs b/primitives/debug-derive/src/lib.rs
index 74907b13874a..ebfbd614d9c8 100644
--- a/primitives/debug-derive/src/lib.rs
+++ b/primitives/debug-derive/src/lib.rs
@@ -27,9 +27,9 @@
 //!
 //! ```rust
 //! #[derive(sp_debug_derive::RuntimeDebug)]
-//!	struct MyStruct;
+//! struct MyStruct;
 //!
-//!	assert_eq!(format!("{:?}", MyStruct), "MyStruct");
+//! assert_eq!(format!("{:?}", MyStruct), "MyStruct");
 //! ```
 
 mod impls;

From 5a94966e91fcd20d5a7981ae8186090221d8f096 Mon Sep 17 00:00:00 2001
From: Robert Klotzner <eskimor@users.noreply.github.com>
Date: Tue, 2 Feb 2021 20:52:12 +0100
Subject: [PATCH 0354/1194] Add a send_request function to NetworkService
 (#8008)

* Add a `send_request` to `NetworkService`.

This function delivers responses via a provided sender and also allows
for sending requests to currently not connected peers.

* Document caveats of send_request better.

* Fix compilation in certain cases.

* Update docs + introduce IfDisconnected enum

for more readable function calls.

* Doc fix.

* Rename send_request to detached_request.

* Whitespace fix - arrrgh

* Update client/network/src/service.rs

spaces/tabs

Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>

* Update client/network/src/request_responses.rs

Documentation fix

Co-authored-by: Roman Borschel <romanb@users.noreply.github.com>

* Update client/network/src/service.rs

Typo.

Co-authored-by: Roman Borschel <romanb@users.noreply.github.com>

* Update client/network/src/service.rs

Better docs.

Co-authored-by: Roman Borschel <romanb@users.noreply.github.com>

* Update client/network/src/service.rs

Typo.

Co-authored-by: Roman Borschel <romanb@users.noreply.github.com>

* Update client/network/src/service.rs

Doc improvements.

Co-authored-by: Roman Borschel <romanb@users.noreply.github.com>

* Remove error in logs on dialing a peer.

This is now valid behaviour.

* Rename detached_request to start_request.

As suggested by @romanb.

* Fix merged master.

* Fix too long lines.

Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
Co-authored-by: Roman Borschel <romanb@users.noreply.github.com>
---
 client/network/src/behaviour.rs         | 25 +++++++++---
 client/network/src/request_responses.rs | 32 ++++++++++++++--
 client/network/src/service.rs           | 51 ++++++++++++++++++-------
 3 files changed, 85 insertions(+), 23 deletions(-)

diff --git a/client/network/src/behaviour.rs b/client/network/src/behaviour.rs
index a34f6e0960c4..7e134f8e6991 100644
--- a/client/network/src/behaviour.rs
+++ b/client/network/src/behaviour.rs
@@ -45,6 +45,7 @@ use std::{
 
 pub use crate::request_responses::{
 	ResponseFailure, InboundFailure, RequestFailure, OutboundFailure, RequestId,
+	IfDisconnected
 };
 
 /// General behaviour of the network. Combines all protocols together.
@@ -248,8 +249,9 @@ impl<B: BlockT, H: ExHashT> Behaviour<B, H> {
 		protocol: &str,
 		request: Vec<u8>,
 		pending_response: oneshot::Sender<Result<Vec<u8>, RequestFailure>>,
+		connect: IfDisconnected,
 	) {
-		self.request_responses.send_request(target, protocol, request, pending_response)
+		self.request_responses.send_request(target, protocol, request, pending_response, connect)
 	}
 
 	/// Returns a shared reference to the user protocol.
@@ -317,7 +319,7 @@ Behaviour<B, H> {
 				}
 
 				self.request_responses.send_request(
-					&target, &self.block_request_protocol_name, buf, pending_response,
+					&target, &self.block_request_protocol_name, buf, pending_response, IfDisconnected::ImmediateError,
 				);
 			},
 			CustomMessageOutcome::NotificationStreamOpened { remote, protocol, roles, notifications_sink } => {
@@ -454,11 +456,22 @@ impl<B: BlockT, H: ExHashT> Behaviour<B, H> {
 		_: &mut impl PollParameters,
 	) -> Poll<NetworkBehaviourAction<TEv, BehaviourOut<B>>> {
 		use light_client_requests::sender::OutEvent;
-		while let Poll::Ready(Some(event)) = self.light_client_request_sender.poll_next_unpin(cx) {
+		while let Poll::Ready(Some(event)) =
+			self.light_client_request_sender.poll_next_unpin(cx)
+		{
 			match event {
-				OutEvent::SendRequest { target, request, pending_response, protocol_name } => {
-					self.request_responses.send_request(&target, &protocol_name, request, pending_response)
-				}
+				OutEvent::SendRequest {
+					target,
+					request,
+					pending_response,
+					protocol_name,
+				} => self.request_responses.send_request(
+					&target,
+					&protocol_name,
+					request,
+					pending_response,
+					IfDisconnected::ImmediateError,
+				),
 			}
 		}
 
diff --git a/client/network/src/request_responses.rs b/client/network/src/request_responses.rs
index 4ac6ffe67f90..4d478ea7afd6 100644
--- a/client/network/src/request_responses.rs
+++ b/client/network/src/request_responses.rs
@@ -196,6 +196,25 @@ impl From<(Cow<'static, str>, RequestId)> for ProtocolRequestId {
 	}
 }
 
+/// When sending a request, what to do on a disconnected recipient.
+pub enum IfDisconnected {
+	/// Try to connect to the peer.
+	TryConnect,
+	/// Just fail if the destination is not yet connected.
+	ImmediateError,
+}
+
+/// Convenience functions for `IfDisconnected`.
+impl IfDisconnected {
+	/// Shall we connect to a disconnected peer?
+	pub fn should_connect(self) -> bool {
+		match self {
+			Self::TryConnect => true,
+			Self::ImmediateError => false,
+		}
+	}
+}
+
 /// Implementation of `NetworkBehaviour` that provides support for request-response protocols.
 pub struct RequestResponsesBehaviour {
 	/// The multiple sub-protocols, by name.
@@ -269,17 +288,19 @@ impl RequestResponsesBehaviour {
 
 	/// Initiates sending a request.
 	///
-	/// An error is returned if we are not connected to the target peer or if the protocol doesn't
-	/// match one that has been registered.
+	/// If there is no established connection to the target peer, the behavior is determined by the choice of `connect`.
+	///
+	/// An error is returned if the protocol doesn't match one that has been registered.
 	pub fn send_request(
 		&mut self,
 		target: &PeerId,
 		protocol_name: &str,
 		request: Vec<u8>,
 		pending_response: oneshot::Sender<Result<Vec<u8>, RequestFailure>>,
+		connect: IfDisconnected,
 	) {
 		if let Some((protocol, _)) = self.protocols.get_mut(protocol_name) {
-			if protocol.is_connected(target) {
+			if protocol.is_connected(target) || connect.should_connect() {
 				let request_id = protocol.send_request(target, request);
 				let prev_req_id = self.pending_requests.insert(
 					(protocol_name.to_string().into(), request_id).into(),
@@ -489,7 +510,6 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 							return Poll::Ready(NetworkBehaviourAction::DialAddress { address })
 						}
 						NetworkBehaviourAction::DialPeer { peer_id, condition } => {
-							log::error!("The request-response isn't supposed to start dialing peers");
 							return Poll::Ready(NetworkBehaviourAction::DialPeer {
 								peer_id,
 								condition,
@@ -949,6 +969,7 @@ mod tests {
 							protocol_name,
 							b"this is a request".to_vec(),
 							sender,
+							IfDisconnected::ImmediateError,
 						);
 						assert!(response_receiver.is_none());
 						response_receiver = Some(receiver);
@@ -1037,6 +1058,7 @@ mod tests {
 							protocol_name,
 							b"this is a request".to_vec(),
 							sender,
+							IfDisconnected::ImmediateError,
 						);
 						assert!(response_receiver.is_none());
 						response_receiver = Some(receiver);
@@ -1179,12 +1201,14 @@ mod tests {
 								protocol_name_1,
 								b"this is a request".to_vec(),
 								sender_1,
+								IfDisconnected::ImmediateError,
 							);
 							swarm_1.send_request(
 								&peer_id,
 								protocol_name_2,
 								b"this is a request".to_vec(),
 								sender_2,
+								IfDisconnected::ImmediateError,
 							);
 							assert!(response_receivers.is_none());
 							response_receivers = Some((receiver_1, receiver_2));
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index cb1cc4f3b77a..46d36aff902c 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -98,7 +98,7 @@ use std::{
 	task::Poll,
 };
 
-pub use behaviour::{ResponseFailure, InboundFailure, RequestFailure, OutboundFailure};
+pub use behaviour::{ResponseFailure, InboundFailure, RequestFailure, OutboundFailure, IfDisconnected};
 
 mod metrics;
 mod out_events;
@@ -812,9 +812,10 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	/// notifications should remain the default ways of communicating information. For example, a
 	/// peer can announce something through a notification, after which the recipient can obtain
 	/// more information by performing a request.
-	/// As such, this function is meant to be called only with peers we are already connected to.
-	/// Calling this method with a `target` we are not connected to will *not* attempt to connect
-	/// to said peer.
+	/// As such, call this function with `IfDisconnected::ImmediateError` for `connect`. This way you
+	/// will get an error immediately for disconnected peers, instead of waiting for a potentially very
+	/// long connection attempt, which would suggest that something is wrong anyway, as you are
+	/// supposed to be connected because of the notification protocol.
 	///
 	/// No limit or throttling of concurrent outbound requests per peer and protocol are enforced.
 	/// Such restrictions, if desired, need to be enforced at the call site(s).
@@ -826,15 +827,12 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 		&self,
 		target: PeerId,
 		protocol: impl Into<Cow<'static, str>>,
-		request: Vec<u8>
+		request: Vec<u8>,
+		connect: IfDisconnected,
 	) -> Result<Vec<u8>, RequestFailure> {
 		let (tx, rx) = oneshot::channel();
-		let _ = self.to_worker.unbounded_send(ServiceToWorkerMsg::Request {
-			target,
-			protocol: protocol.into(),
-			request,
-			pending_response: tx
-		});
+
+		self.start_request(target, protocol, request, tx, connect);
 
 		match rx.await {
 			Ok(v) => v,
@@ -845,6 +843,32 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 		}
 	}
 
+	/// Variation of `request` which starts a request whose response is delivered on a provided channel.
+	///
+	/// Instead of blocking and waiting for a reply, this function returns immediately, sending
+	/// responses via the passed in sender. This alternative API exists to make it easier to
+	/// integrate with message passing APIs.
+	///
+	/// Keep in mind that the connected receiver might receive a `Canceled` event in case of a
+	/// closing connection. This is expected behaviour. With `request` you would get a
+	/// `RequestFailure::Network(OutboundFailure::ConnectionClosed)` in that case.
+	pub fn start_request(
+		&self,
+		target: PeerId,
+		protocol: impl Into<Cow<'static, str>>,
+		request: Vec<u8>,
+		tx: oneshot::Sender<Result<Vec<u8>, RequestFailure>>,
+		connect: IfDisconnected,
+	) {
+		let _ = self.to_worker.unbounded_send(ServiceToWorkerMsg::Request {
+			target,
+			protocol: protocol.into(),
+			request,
+			pending_response: tx,
+			connect,
+		});
+	}
+
 	/// You may call this when new transactons are imported by the transaction pool.
 	///
 	/// All transactions will be fetched from the `TransactionPool` that was passed at
@@ -1262,6 +1286,7 @@ enum ServiceToWorkerMsg<B: BlockT, H: ExHashT> {
 		protocol: Cow<'static, str>,
 		request: Vec<u8>,
 		pending_response: oneshot::Sender<Result<Vec<u8>, RequestFailure>>,
+		connect: IfDisconnected,
 	},
 	DisconnectPeer(PeerId, Cow<'static, str>),
 	NewBestBlockImported(B::Hash, NumberFor<B>),
@@ -1385,8 +1410,8 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 					this.network_service.user_protocol_mut().set_sync_fork_request(peer_ids, &hash, number),
 				ServiceToWorkerMsg::EventStream(sender) =>
 					this.event_streams.push(sender),
-				ServiceToWorkerMsg::Request { target, protocol, request, pending_response } => {
-					this.network_service.send_request(&target, &protocol, request, pending_response);
+				ServiceToWorkerMsg::Request { target, protocol, request, pending_response, connect } => {
+					this.network_service.send_request(&target, &protocol, request, pending_response, connect);
 				},
 				ServiceToWorkerMsg::DisconnectPeer(who, protocol_name) =>
 					this.network_service.user_protocol_mut().disconnect_peer(&who, &protocol_name),

From 56c64cf728278ca9f16308f7ffb1959dd89332af Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Wed, 3 Feb 2021 08:14:23 +0100
Subject: [PATCH 0355/1194] Storage chains: serve transactions over
 IPFS/bitswap (#7963)

* IPFS server for transactions

* Style

* Indent

* Log message

* CLI option

* Apply suggestions from code review

Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>

* Style

* Style

* Minor fixes

Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
---
 Cargo.lock                                    |  79 ++++
 client/api/src/client.rs                      |  11 +
 client/api/src/in_mem.rs                      |   7 +
 client/cli/src/params/network_params.rs       |   5 +
 client/db/src/lib.rs                          |  34 +-
 client/db/src/utils.rs                        |   8 +-
 client/light/src/blockchain.rs                |   7 +
 client/network/Cargo.toml                     |   1 +
 client/network/build.rs                       |   3 +-
 client/network/src/behaviour.rs               |  16 +-
 client/network/src/bitswap.rs                 | 338 ++++++++++++++++++
 client/network/src/config.rs                  |   3 +
 client/network/src/lib.rs                     |   1 +
 client/network/src/schema.rs                  |   4 +
 .../network/src/schema/bitswap.v1.2.0.proto   |  43 +++
 client/network/src/service.rs                 |  12 +-
 client/service/src/client/client.rs           |   8 +
 primitives/blockchain/src/backend.rs          |  11 +
 primitives/database/src/lib.rs                |   5 +
 19 files changed, 574 insertions(+), 22 deletions(-)
 create mode 100644 client/network/src/bitswap.rs
 create mode 100644 client/network/src/schema/bitswap.v1.2.0.proto

diff --git a/Cargo.lock b/Cargo.lock
index d5197ba4ea65..7340f35ca0d0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -362,6 +362,12 @@ dependencies = [
  "rustc-demangle",
 ]
 
+[[package]]
+name = "base-x"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b"
+
 [[package]]
 name = "base58"
 version = "0.1.0"
@@ -464,6 +470,32 @@ dependencies = [
  "constant_time_eq",
 ]
 
+[[package]]
+name = "blake2s_simd"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e461a7034e85b211a4acb57ee2e6730b32912b06c08cc242243c39fc21ae6a2"
+dependencies = [
+ "arrayref",
+ "arrayvec 0.5.2",
+ "constant_time_eq",
+]
+
+[[package]]
+name = "blake3"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9ff35b701f3914bdb8fad3368d822c766ef2858b2583198e41639b936f09d3f"
+dependencies = [
+ "arrayref",
+ "arrayvec 0.5.2",
+ "cc",
+ "cfg-if 0.1.10",
+ "constant_time_eq",
+ "crypto-mac 0.8.0",
+ "digest 0.9.0",
+]
+
 [[package]]
 name = "block-buffer"
 version = "0.7.3"
@@ -706,6 +738,17 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "cid"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d88f30b1e74e7063df5711496f3ee6e74a9735d62062242d70cddf77717f18e"
+dependencies = [
+ "multibase",
+ "multihash",
+ "unsigned-varint 0.5.1",
+]
+
 [[package]]
 name = "cipher"
 version = "0.2.5"
@@ -1163,6 +1206,26 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "993a608597367c6377b258c25d7120740f00ed23a2252b729b1932dd7866f908"
 
+[[package]]
+name = "data-encoding-macro"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a94feec3d2ba66c0b6621bca8bc6f68415b1e5c69af3586fdd0af9fd9f29b17"
+dependencies = [
+ "data-encoding",
+ "data-encoding-macro-internal",
+]
+
+[[package]]
+name = "data-encoding-macro-internal"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f83e699727abca3c56e187945f303389590305ab2f0185ea445aa66e8d5f2a"
+dependencies = [
+ "data-encoding",
+ "syn",
+]
+
 [[package]]
 name = "derive_more"
 version = "0.99.11"
@@ -3580,16 +3643,31 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0debeb9fcf88823ea64d64e4a815ab1643f33127d995978e099942ce38f25238"
 
+[[package]]
+name = "multibase"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b78c60039650ff12e140ae867ef5299a58e19dded4d334c849dc7177083667e2"
+dependencies = [
+ "base-x",
+ "data-encoding",
+ "data-encoding-macro",
+]
+
 [[package]]
 name = "multihash"
 version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb63389ee5fcd4df3f8727600f4a0c3df53c541f0ed4e8b50a9ae51a80fc1efe"
 dependencies = [
+ "blake2b_simd",
+ "blake2s_simd",
+ "blake3",
  "digest 0.9.0",
  "generic-array 0.14.4",
  "multihash-derive",
  "sha2 0.9.2",
+ "sha3",
  "unsigned-varint 0.5.1",
 ]
 
@@ -7105,6 +7183,7 @@ dependencies = [
  "bitflags",
  "bs58",
  "bytes 1.0.1",
+ "cid",
  "derive_more",
  "either",
  "erased-serde",
diff --git a/client/api/src/client.rs b/client/api/src/client.rs
index 4dc2b6bb524e..990a7908b62b 100644
--- a/client/api/src/client.rs
+++ b/client/api/src/client.rs
@@ -95,6 +95,17 @@ pub trait BlockBackend<Block: BlockT> {
 
 	/// Get block hash by number.
 	fn block_hash(&self, number: NumberFor<Block>) -> sp_blockchain::Result<Option<Block::Hash>>;
+
+	/// Get single extrinsic by hash.
+	fn extrinsic(
+		&self,
+		hash: &Block::Hash,
+	) -> sp_blockchain::Result<Option<<Block as BlockT>::Extrinsic>>;
+
+	/// Check if extrinsic exists.
+	fn have_extrinsic(&self, hash: &Block::Hash) -> sp_blockchain::Result<bool> {
+		Ok(self.extrinsic(hash)?.is_some())
+	}
 }
 
 /// Provide a list of potential uncle headers for a given block.
diff --git a/client/api/src/in_mem.rs b/client/api/src/in_mem.rs
index cef52982f167..c108acc7b43b 100644
--- a/client/api/src/in_mem.rs
+++ b/client/api/src/in_mem.rs
@@ -386,6 +386,13 @@ impl<Block: BlockT> blockchain::Backend<Block> for Blockchain<Block> {
 	fn children(&self, _parent_hash: Block::Hash) -> sp_blockchain::Result<Vec<Block::Hash>> {
 		unimplemented!()
 	}
+
+	fn extrinsic(
+		&self,
+		_hash: &Block::Hash,
+	) -> sp_blockchain::Result<Option<<Block as BlockT>::Extrinsic>> {
+		unimplemented!("Not supported by the in-mem backend.")
+	}
 }
 
 impl<Block: BlockT> blockchain::ProvideCache<Block> for Blockchain<Block> {
diff --git a/client/cli/src/params/network_params.rs b/client/cli/src/params/network_params.rs
index 4a926fdce8bb..f4a6e8d3982b 100644
--- a/client/cli/src/params/network_params.rs
+++ b/client/cli/src/params/network_params.rs
@@ -110,6 +110,10 @@ pub struct NetworkParams {
 	/// security improvements.
 	#[structopt(long)]
 	pub kademlia_disjoint_query_paths: bool,
+
+	/// Join the IPFS network and serve transactions over bitswap protocol.
+	#[structopt(long)]
+	pub ipfs_server: bool,
 }
 
 impl NetworkParams {
@@ -181,6 +185,7 @@ impl NetworkParams {
 			allow_non_globals_in_dht,
 			kademlia_disjoint_query_paths: self.kademlia_disjoint_query_paths,
 			yamux_window_size: None,
+			ipfs_server: self.ipfs_server,
 		}
 	}
 }
diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index a976cbc2ce8d..6654083939da 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -448,20 +448,6 @@ impl<Block: BlockT> BlockchainDb<Block> {
 				header.digest().log(DigestItem::as_changes_trie_root)
 					.cloned()))
 	}
-
-	fn extrinsic(&self, hash: &Block::Hash) -> ClientResult<Option<Block::Extrinsic>> {
-		match self.db.get(columns::TRANSACTION, hash.as_ref()) {
-			Some(ex) => {
-				match Decode::decode(&mut &ex[..]) {
-					Ok(ex) => Ok(Some(ex)),
-					Err(err) => Err(sp_blockchain::Error::Backend(
-						format!("Error decoding extrinsic {}: {}", hash, err)
-					)),
-				}
-			},
-			None => Ok(None),
-		}
-	}
 }
 
 impl<Block: BlockT> sc_client_api::blockchain::HeaderBackend<Block> for BlockchainDb<Block> {
@@ -532,7 +518,7 @@ impl<Block: BlockT> sc_client_api::blockchain::Backend<Block> for BlockchainDb<B
 						match Vec::<Block::Hash>::decode(&mut &body[..]) {
 							Ok(hashes) => {
 								let extrinsics: ClientResult<Vec<Block::Extrinsic>> = hashes.into_iter().map(
-									|h| self.extrinsic(&h) .and_then(|maybe_ex| maybe_ex.ok_or_else(
+									|h| self.extrinsic(&h).and_then(|maybe_ex| maybe_ex.ok_or_else(
 										|| sp_blockchain::Error::Backend(
 											format!("Missing transaction: {}", h))))
 								).collect();
@@ -576,6 +562,24 @@ impl<Block: BlockT> sc_client_api::blockchain::Backend<Block> for BlockchainDb<B
 	fn children(&self, parent_hash: Block::Hash) -> ClientResult<Vec<Block::Hash>> {
 		children::read_children(&*self.db, columns::META, meta_keys::CHILDREN_PREFIX, parent_hash)
 	}
+
+	fn extrinsic(&self, hash: &Block::Hash) -> ClientResult<Option<Block::Extrinsic>> {
+		match self.db.get(columns::TRANSACTION, hash.as_ref()) {
+			Some(ex) => {
+				match Decode::decode(&mut &ex[..]) {
+					Ok(ex) => Ok(Some(ex)),
+					Err(err) => Err(sp_blockchain::Error::Backend(
+							format!("Error decoding extrinsic {}: {}", hash, err)
+					)),
+				}
+			},
+			None => Ok(None),
+		}
+	}
+
+	fn have_extrinsic(&self, hash: &Block::Hash) -> ClientResult<bool> {
+		Ok(self.db.contains(columns::TRANSACTION, hash.as_ref()))
+	}
 }
 
 impl<Block: BlockT> sc_client_api::blockchain::ProvideCache<Block> for BlockchainDb<Block> {
diff --git a/client/db/src/utils.rs b/client/db/src/utils.rs
index baea6aab69fa..cd9b2a6f56d4 100644
--- a/client/db/src/utils.rs
+++ b/client/db/src/utils.rs
@@ -401,7 +401,13 @@ pub fn read_meta<Block>(db: &dyn Database<DbHash>, col_header: u32) -> Result<
 			}
 		{
 			let hash = header.hash();
-			debug!("DB Opened blockchain db, fetched {} = {:?} ({})", desc, hash, header.number());
+			debug!(
+				target: "db",
+				"Opened blockchain db, fetched {} = {:?} ({})",
+				desc,
+				hash,
+				header.number()
+			);
 			Ok((hash, *header.number()))
 		} else {
 			Ok((genesis_hash.clone(), Zero::zero()))
diff --git a/client/light/src/blockchain.rs b/client/light/src/blockchain.rs
index f682e6e35b3d..bcabc365676a 100644
--- a/client/light/src/blockchain.rs
+++ b/client/light/src/blockchain.rs
@@ -128,6 +128,13 @@ impl<S, Block> BlockchainBackend<Block> for Blockchain<S> where Block: BlockT, S
 	fn children(&self, _parent_hash: Block::Hash) -> ClientResult<Vec<Block::Hash>> {
 		Err(ClientError::NotAvailableOnLightClient)
 	}
+
+	fn extrinsic(
+		&self,
+		_hash: &Block::Hash,
+	) -> ClientResult<Option<<Block as BlockT>::Extrinsic>> {
+		Err(ClientError::NotAvailableOnLightClient)
+	}
 }
 
 impl<S: Storage<Block>, Block: BlockT> ProvideCache<Block> for Blockchain<S> {
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index 8c6fc4e668d0..d6cb9bcb0eb8 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -21,6 +21,7 @@ async-trait = "0.1"
 async-std = "1.6.5"
 bitflags = "1.2.0"
 bs58 = "0.4.0"
+cid = "0.6.0"
 bytes = "1"
 codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 derive_more = "0.99.2"
diff --git a/client/network/build.rs b/client/network/build.rs
index 2ccc72d99df9..0eea622e8757 100644
--- a/client/network/build.rs
+++ b/client/network/build.rs
@@ -1,6 +1,7 @@
 const PROTOS: &[&str] = &[
 	"src/schema/api.v1.proto",
-	"src/schema/light.v1.proto"
+	"src/schema/light.v1.proto",
+	"src/schema/bitswap.v1.2.0.proto",
 ];
 
 fn main() {
diff --git a/client/network/src/behaviour.rs b/client/network/src/behaviour.rs
index 7e134f8e6991..06c91de88687 100644
--- a/client/network/src/behaviour.rs
+++ b/client/network/src/behaviour.rs
@@ -18,6 +18,7 @@
 
 use crate::{
 	config::{ProtocolId, Role},
+	bitswap::Bitswap,
 	discovery::{DiscoveryBehaviour, DiscoveryConfig, DiscoveryOut},
 	protocol::{message::Roles, CustomMessageOutcome, NotificationsSink, Protocol},
 	peer_info, request_responses, light_client_requests,
@@ -30,7 +31,9 @@ use libp2p::NetworkBehaviour;
 use libp2p::core::{Multiaddr, PeerId, PublicKey};
 use libp2p::identify::IdentifyInfo;
 use libp2p::kad::record;
-use libp2p::swarm::{NetworkBehaviourAction, NetworkBehaviourEventProcess, PollParameters};
+use libp2p::swarm::{
+	NetworkBehaviourAction, NetworkBehaviourEventProcess, PollParameters, toggle::Toggle
+};
 use log::debug;
 use prost::Message;
 use sp_consensus::{BlockOrigin, import_queue::{IncomingBlock, Origin}};
@@ -59,6 +62,8 @@ pub struct Behaviour<B: BlockT, H: ExHashT> {
 	peer_info: peer_info::PeerInfoBehaviour,
 	/// Discovers nodes of the network.
 	discovery: DiscoveryBehaviour,
+	/// Bitswap server for blockchain data.
+	bitswap: Toggle<Bitswap<B>>,
 	/// Generic request-reponse protocols.
 	request_responses: request_responses::RequestResponsesBehaviour,
 
@@ -181,6 +186,7 @@ impl<B: BlockT, H: ExHashT> Behaviour<B, H> {
 		light_client_request_sender: light_client_requests::sender::LightClientRequestSender<B>,
 		disco_config: DiscoveryConfig,
 		block_request_protocol_config: request_responses::ProtocolConfig,
+		bitswap: Option<Bitswap<B>>,
 		light_client_request_protocol_config: request_responses::ProtocolConfig,
 		// All remaining request protocol configs.
 		mut request_response_protocols: Vec<request_responses::ProtocolConfig>,
@@ -195,6 +201,7 @@ impl<B: BlockT, H: ExHashT> Behaviour<B, H> {
 			substrate,
 			peer_info: peer_info::PeerInfoBehaviour::new(user_agent, local_public_key),
 			discovery: disco_config.finish(),
+			bitswap: bitswap.into(),
 			request_responses:
 				request_responses::RequestResponsesBehaviour::new(request_response_protocols.into_iter())?,
 			light_client_request_sender,
@@ -299,6 +306,13 @@ fn reported_roles_to_observed_role(local_role: &Role, remote: &PeerId, roles: Ro
 	}
 }
 
+impl<B: BlockT, H: ExHashT> NetworkBehaviourEventProcess<void::Void> for
+Behaviour<B, H> {
+	fn inject_event(&mut self, event: void::Void) {
+		void::unreachable(event)
+	}
+}
+
 impl<B: BlockT, H: ExHashT> NetworkBehaviourEventProcess<CustomMessageOutcome<B>> for
 Behaviour<B, H> {
 	fn inject_event(&mut self, event: CustomMessageOutcome<B>) {
diff --git a/client/network/src/bitswap.rs b/client/network/src/bitswap.rs
new file mode 100644
index 000000000000..7129f3dbe07b
--- /dev/null
+++ b/client/network/src/bitswap.rs
@@ -0,0 +1,338 @@
+// Copyright 2021 Parity Technologies (UK) Ltd.
+// This file is part of Substrate.
+
+// Substrate is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Substrate is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Bitswap server for substrate.
+//!
+//! Allows querying transactions by hash over standard bitswap protocol
+//! Only supports bitswap 1.2.0.
+//! CID is expected to reference 256-bit Blake2b transaction hash.
+
+use std::collections::VecDeque;
+use std::io;
+use std::sync::Arc;
+use std::task::{Context, Poll};
+use cid::Version;
+use codec::Encode;
+use core::pin::Pin;
+use futures::Future;
+use futures::io::{AsyncRead, AsyncWrite};
+use libp2p::core::{
+	connection::ConnectionId, Multiaddr, PeerId,
+	upgrade, InboundUpgrade, OutboundUpgrade, UpgradeInfo,
+};
+use libp2p::swarm::{
+	NetworkBehaviour, NetworkBehaviourAction, NotifyHandler, PollParameters,
+	ProtocolsHandler, IntoProtocolsHandler, OneShotHandler,
+};
+use log::{error, debug, trace};
+use prost::Message;
+use sp_runtime::traits::{Block as BlockT};
+use unsigned_varint::{encode as varint_encode};
+use crate::chain::Client;
+use crate::schema::bitswap::{
+	Message as BitswapMessage,
+	message::{wantlist::WantType, Block as MessageBlock, BlockPresenceType, BlockPresence},
+};
+
+const LOG_TARGET: &str = "bitswap";
+
+// Undocumented, but according to JS the bitswap messages have a max size of 512*1024 bytes
+// https://github.com/ipfs/js-ipfs-bitswap/blob/
+// d8f80408aadab94c962f6b88f343eb9f39fa0fcc/src/decision-engine/index.js#L16
+// We set it to the same value as max substrate protocol message
+const MAX_PACKET_SIZE: usize = 16 * 1024 * 1024;
+
+// Max number of queued responses before denying requests.
+const MAX_RESPONSE_QUEUE: usize = 20;
+// Max number of blocks per wantlist
+const MAX_WANTED_BLOCKS: usize = 16;
+
+const PROTOCOL_NAME: &'static [u8] = b"/ipfs/bitswap/1.2.0";
+
+type FutureResult<T, E> = Pin<Box<dyn Future<Output = Result<T, E>> + Send>>;
+
+/// Bitswap protocol config
+#[derive(Clone, Copy, Debug, Default)]
+pub struct BitswapConfig;
+
+impl UpgradeInfo for BitswapConfig {
+	type Info = &'static [u8];
+	type InfoIter = std::iter::Once<Self::Info>;
+
+	fn protocol_info(&self) -> Self::InfoIter {
+		std::iter::once(PROTOCOL_NAME)
+	}
+}
+
+impl<TSocket> InboundUpgrade<TSocket> for BitswapConfig
+where
+	TSocket: AsyncRead + AsyncWrite + Send + Unpin + 'static,
+{
+	type Output = BitswapMessage;
+	type Error = BitswapError;
+	type Future = FutureResult<Self::Output, Self::Error>;
+
+	fn upgrade_inbound(self, mut socket: TSocket, _info: Self::Info) -> Self::Future {
+		Box::pin(async move {
+			let packet = upgrade::read_one(&mut socket, MAX_PACKET_SIZE).await?;
+			let message: BitswapMessage = Message::decode(packet.as_slice())?;
+			Ok(message)
+		})
+	}
+}
+
+impl UpgradeInfo for BitswapMessage {
+	type Info = &'static [u8];
+	type InfoIter = std::iter::Once<Self::Info>;
+
+	fn protocol_info(&self) -> Self::InfoIter {
+		std::iter::once(PROTOCOL_NAME)
+	}
+}
+
+impl<TSocket> OutboundUpgrade<TSocket> for BitswapMessage
+where
+	TSocket: AsyncRead + AsyncWrite + Send + Unpin + 'static,
+{
+	type Output = ();
+	type Error = io::Error;
+	type Future = FutureResult<Self::Output, Self::Error>;
+
+	fn upgrade_outbound(self, mut socket: TSocket, _info: Self::Info) -> Self::Future {
+		Box::pin(async move {
+			let mut data = Vec::with_capacity(self.encoded_len());
+			self.encode(&mut data)?;
+			upgrade::write_one(&mut socket, data).await
+		})
+	}
+}
+
+/// Internal protocol handler event.
+#[derive(Debug)]
+pub enum HandlerEvent {
+	/// We received a `BitswapMessage` from a remote.
+	Request(BitswapMessage),
+	/// We successfully sent a `BitswapMessage`.
+	ResponseSent,
+}
+
+impl From<BitswapMessage> for HandlerEvent {
+	fn from(message: BitswapMessage) -> Self {
+		Self::Request(message)
+	}
+}
+
+impl From<()> for HandlerEvent {
+	fn from(_: ()) -> Self {
+		Self::ResponseSent
+	}
+}
+
+/// Prefix represents all metadata of a CID, without the actual content.
+#[derive(PartialEq, Eq, Clone, Debug)]
+struct Prefix {
+	/// The version of CID.
+	pub version: Version,
+	/// The codec of CID.
+	pub codec: u64,
+	/// The multihash type of CID.
+	pub mh_type: u64,
+	/// The multihash length of CID.
+	pub mh_len: u8,
+}
+
+impl Prefix {
+	/// Convert the prefix to encoded bytes.
+	pub fn to_bytes(&self) -> Vec<u8> {
+		let mut res = Vec::with_capacity(4);
+		let mut buf = varint_encode::u64_buffer();
+		let version = varint_encode::u64(self.version.into(), &mut buf);
+		res.extend_from_slice(version);
+		let mut buf = varint_encode::u64_buffer();
+		let codec = varint_encode::u64(self.codec.into(), &mut buf);
+		res.extend_from_slice(codec);
+		let mut buf = varint_encode::u64_buffer();
+		let mh_type = varint_encode::u64(self.mh_type.into(), &mut buf);
+		res.extend_from_slice(mh_type);
+		let mut buf = varint_encode::u64_buffer();
+		let mh_len = varint_encode::u64(self.mh_len as u64, &mut buf);
+		res.extend_from_slice(mh_len);
+		res
+	}
+}
+
+/// Network behaviour that handles sending and receiving IPFS blocks.
+pub struct Bitswap<B> {
+	client: Arc<dyn Client<B>>,
+	ready_blocks: VecDeque<(PeerId, BitswapMessage)>,
+}
+
+impl<B: BlockT> Bitswap<B> {
+	/// Create a new instance of the bitswap protocol handler.
+	pub fn new(client: Arc<dyn Client<B>>) -> Self {
+		Bitswap {
+			client,
+			ready_blocks: Default::default(),
+		}
+	}
+}
+
+impl<B: BlockT> NetworkBehaviour for Bitswap<B> {
+	type ProtocolsHandler = OneShotHandler<BitswapConfig, BitswapMessage, HandlerEvent>;
+	type OutEvent = void::Void;
+
+	fn new_handler(&mut self) -> Self::ProtocolsHandler {
+		Default::default()
+	}
+
+	fn addresses_of_peer(&mut self, _peer: &PeerId) -> Vec<Multiaddr> {
+		Vec::new()
+	}
+
+	fn inject_connected(&mut self, _peer: &PeerId) {
+	}
+
+	fn inject_disconnected(&mut self, _peer: &PeerId) {
+	}
+
+	fn inject_event(&mut self, peer: PeerId, _connection: ConnectionId, message: HandlerEvent) {
+		let request = match message {
+			HandlerEvent::ResponseSent => return,
+			HandlerEvent::Request(msg) => msg,
+		};
+		trace!(target: LOG_TARGET, "Received request: {:?} from {}", request, peer);
+		if self.ready_blocks.len() > MAX_RESPONSE_QUEUE {
+			debug!(target: LOG_TARGET, "Ignored request: queue is full");
+			return;
+		}
+		let mut response = BitswapMessage {
+			wantlist: None,
+			blocks: Default::default(),
+			payload: Default::default(),
+			block_presences: Default::default(),
+			pending_bytes: 0,
+		};
+		let wantlist = match request.wantlist {
+			Some(wantlist) => wantlist,
+			None => {
+				debug!(
+					target: LOG_TARGET,
+					"Unexpected bitswap message from {}",
+					peer,
+				);
+				return;
+			}
+		};
+		if wantlist.entries.len() > MAX_WANTED_BLOCKS {
+			trace!(target: LOG_TARGET, "Ignored request: too many entries");
+			return;
+		}
+		for entry in wantlist.entries {
+			let cid = match cid::Cid::read_bytes(entry.block.as_slice()) {
+				Ok(cid) => cid,
+				Err(e) => {
+					trace!(target: LOG_TARGET, "Bad CID {:?}: {:?}", entry.block, e);
+					continue;
+				}
+			};
+			if cid.version() != cid::Version::V1
+				|| cid.hash().code() != u64::from(cid::multihash::Code::Blake2b256)
+				|| cid.hash().size() != 32
+			{
+				debug!(target: LOG_TARGET, "Ignoring unsupported CID {}: {}", peer, cid);
+				continue
+			}
+			let mut hash = B::Hash::default();
+			hash.as_mut().copy_from_slice(&cid.hash().digest()[0..32]);
+			let extrinsic = match self.client.extrinsic(&hash) {
+				Ok(ex) => ex,
+				Err(e) => {
+					error!(target: LOG_TARGET, "Error retrieving extrinsic {}: {}", hash, e);
+					None
+				}
+			};
+			match extrinsic {
+				Some(extrinsic) => {
+					trace!(target: LOG_TARGET, "Found CID {:?}, hash {:?}", cid, hash);
+					if entry.want_type == WantType::Block as i32 {
+						let prefix = Prefix {
+							version: cid.version(),
+							codec: cid.codec(),
+							mh_type: cid.hash().code(),
+							mh_len: cid.hash().size(),
+						};
+						response.payload.push(MessageBlock {
+							prefix: prefix.to_bytes(),
+							data: extrinsic.encode(),
+						});
+					} else {
+						response.block_presences.push(BlockPresence {
+							r#type: BlockPresenceType::Have as i32,
+							cid: cid.to_bytes(),
+						});
+					}
+				},
+				None => {
+					trace!(target: LOG_TARGET, "Missing CID {:?}, hash {:?}", cid, hash);
+					if entry.send_dont_have {
+						response.block_presences.push(BlockPresence {
+							r#type: BlockPresenceType::DontHave as i32,
+							cid: cid.to_bytes(),
+						});
+					}
+				}
+			}
+		}
+		trace!(target: LOG_TARGET, "Response: {:?}", response);
+		self.ready_blocks.push_back((peer, response));
+	}
+
+	fn poll(&mut self, _ctx: &mut Context, _: &mut impl PollParameters) -> Poll<
+		NetworkBehaviourAction<
+			<<Self::ProtocolsHandler as IntoProtocolsHandler>::Handler as ProtocolsHandler>::InEvent,
+			Self::OutEvent,
+		>,
+	> {
+		if let Some((peer_id, message)) = self.ready_blocks.pop_front() {
+			return Poll::Ready(NetworkBehaviourAction::NotifyHandler {
+				peer_id: peer_id.clone(),
+				handler: NotifyHandler::Any,
+				event: message,
+			})
+		}
+		Poll::Pending
+	}
+}
+
+/// Bitswap protocol error.
+#[derive(derive_more::Display, derive_more::From)]
+pub enum BitswapError {
+	/// Protobuf decoding error.
+	#[display(fmt = "Failed to decode request: {}.", _0)]
+	DecodeProto(prost::DecodeError),
+	/// Protobuf encoding error.
+	#[display(fmt = "Failed to encode response: {}.", _0)]
+	EncodeProto(prost::EncodeError),
+	/// Client backend error.
+	Client(sp_blockchain::Error),
+	/// Error parsing CID
+	BadCid(cid::Error),
+	/// Packet read error.
+	Read(upgrade::ReadOneError),
+	/// Error sending response.
+	#[display(fmt = "Failed to send response.")]
+	SendResponse,
+}
diff --git a/client/network/src/config.rs b/client/network/src/config.rs
index 29a0128b87ea..5a2327dda130 100644
--- a/client/network/src/config.rs
+++ b/client/network/src/config.rs
@@ -420,6 +420,8 @@ pub struct NetworkConfiguration {
 	/// Require iterative Kademlia DHT queries to use disjoint paths for increased resiliency in
 	/// the presence of potentially adversarial nodes.
 	pub kademlia_disjoint_query_paths: bool,
+	/// Enable serving block data over IPFS bitswap.
+	pub ipfs_server: bool,
 
 	/// Size of Yamux receive window of all substreams. `None` for the default (256kiB).
 	/// Any value less than 256kiB is invalid.
@@ -472,6 +474,7 @@ impl NetworkConfiguration {
 			allow_non_globals_in_dht: false,
 			kademlia_disjoint_query_paths: false,
 			yamux_window_size: None,
+			ipfs_server: false,
 		}
 	}
 
diff --git a/client/network/src/lib.rs b/client/network/src/lib.rs
index 007928ad425f..a64be19d8767 100644
--- a/client/network/src/lib.rs
+++ b/client/network/src/lib.rs
@@ -258,6 +258,7 @@ mod transport;
 mod utils;
 
 pub mod block_request_handler;
+pub mod bitswap;
 pub mod light_client_requests;
 pub mod config;
 pub mod error;
diff --git a/client/network/src/schema.rs b/client/network/src/schema.rs
index 5b9a70b0cd5d..d4572fca7594 100644
--- a/client/network/src/schema.rs
+++ b/client/network/src/schema.rs
@@ -24,3 +24,7 @@ pub mod v1 {
 		include!(concat!(env!("OUT_DIR"), "/api.v1.light.rs"));
 	}
 }
+
+pub mod bitswap {
+	include!(concat!(env!("OUT_DIR"), "/bitswap.message.rs"));
+}
diff --git a/client/network/src/schema/bitswap.v1.2.0.proto b/client/network/src/schema/bitswap.v1.2.0.proto
new file mode 100644
index 000000000000..a4138b516d63
--- /dev/null
+++ b/client/network/src/schema/bitswap.v1.2.0.proto
@@ -0,0 +1,43 @@
+syntax = "proto3";
+
+package bitswap.message;
+
+message Message {
+	message Wantlist {
+		enum WantType {
+			Block = 0;
+			Have = 1;
+		}
+
+		message Entry {
+			bytes block = 1; 	// the block cid (cidV0 in bitswap 1.0.0, cidV1 in bitswap 1.1.0)
+			int32 priority = 2;	// the priority (normalized). default to 1
+			bool cancel = 3;		// whether this revokes an entry
+			WantType wantType = 4; // Note: defaults to enum 0, ie Block
+			bool sendDontHave = 5; // Note: defaults to false
+		}
+
+		repeated Entry entries = 1; // a list of wantlist entries
+		bool full = 2;							// whether this is the full wantlist. default to false
+	}
+
+	message Block {
+		bytes prefix = 1;		// CID prefix (cid version, multicodec and multihash prefix (type + length)
+		bytes data = 2;
+	}
+
+	enum BlockPresenceType {
+		Have = 0;
+		DontHave = 1;
+	}
+	message BlockPresence {
+		bytes cid = 1;
+		BlockPresenceType type = 2;
+	}
+
+	Wantlist wantlist = 1;
+	repeated bytes blocks = 2;		// used to send Blocks in bitswap 1.0.0
+	repeated Block payload = 3;		// used to send Blocks in bitswap 1.1.0
+	repeated BlockPresence blockPresences = 4;
+	int32 pendingBytes = 5;
+}
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 46d36aff902c..3d87ddcf1f5c 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -50,6 +50,7 @@ use crate::{
 		sync::SyncState,
 	},
 	transport, ReputationChange,
+	bitswap::Bitswap,
 };
 use futures::{channel::oneshot, prelude::*};
 use libp2p::{PeerId, multiaddr, Multiaddr};
@@ -248,6 +249,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 		let is_major_syncing = Arc::new(AtomicBool::new(false));
 
 		// Build the swarm.
+		let client = params.chain.clone();
 		let (mut swarm, bandwidth): (Swarm<B, H>, _) = {
 			let user_agent = format!(
 				"{} ({})",
@@ -334,6 +336,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 			};
 
 			let behaviour = {
+				let bitswap = if params.network_config.ipfs_server { Some(Bitswap::new(client)) } else { None };
 				let result = Behaviour::new(
 					protocol,
 					params.role,
@@ -342,6 +345,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 					light_client_request_sender,
 					discovery_config,
 					params.block_request_protocol_config,
+					bitswap,
 					params.light_client_request_protocol_config,
 					params.network_config.request_response_protocols,
 				);
@@ -1638,11 +1642,11 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 						let reason = match cause {
 							Some(ConnectionError::IO(_)) => "transport-error",
 							Some(ConnectionError::Handler(NodeHandlerWrapperError::Handler(EitherError::A(EitherError::A(
-								EitherError::B(EitherError::A(
-								PingFailure::Timeout))))))) => "ping-timeout",
+								EitherError::A(EitherError::B(EitherError::A(
+								PingFailure::Timeout)))))))) => "ping-timeout",
 							Some(ConnectionError::Handler(NodeHandlerWrapperError::Handler(EitherError::A(EitherError::A(
-								EitherError::A(
-								NotifsHandlerError::SyncNotificationsClogged)))))) => "sync-notifications-clogged",
+								EitherError::A(EitherError::A(
+								NotifsHandlerError::SyncNotificationsClogged))))))) => "sync-notifications-clogged",
 							Some(ConnectionError::Handler(NodeHandlerWrapperError::Handler(_))) => "protocol-error",
 							Some(ConnectionError::Handler(NodeHandlerWrapperError::KeepAliveTimeout)) => "keep-alive-timeout",
 							None => "actively-closed",
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index f337452e9dc8..8cb0e304cdad 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -1919,6 +1919,14 @@ impl<B, E, Block, RA> BlockBackend<Block> for Client<B, E, Block, RA>
 	fn block_hash(&self, number: NumberFor<Block>) -> sp_blockchain::Result<Option<Block::Hash>> {
 		self.backend.blockchain().hash(number)
 	}
+
+	fn extrinsic(&self, hash: &Block::Hash) -> sp_blockchain::Result<Option<Block::Extrinsic>> {
+		self.backend.blockchain().extrinsic(hash)
+	}
+
+	fn have_extrinsic(&self, hash: &Block::Hash) -> sp_blockchain::Result<bool> {
+		self.backend.blockchain().have_extrinsic(hash)
+	}
 }
 
 impl<B, E, Block, RA> backend::AuxStore for Client<B, E, Block, RA>
diff --git a/primitives/blockchain/src/backend.rs b/primitives/blockchain/src/backend.rs
index b50545b1a20a..b5efcfb02198 100644
--- a/primitives/blockchain/src/backend.rs
+++ b/primitives/blockchain/src/backend.rs
@@ -215,6 +215,17 @@ pub trait Backend<Block: BlockT>: HeaderBackend<Block> + HeaderMetadata<Block, E
 
 		Ok(None)
 	}
+
+	/// Get single extrinsic by hash.
+	fn extrinsic(
+		&self,
+		hash: &Block::Hash,
+	) -> Result<Option<<Block as BlockT>::Extrinsic>>;
+
+	/// Check if extrinsic exists.
+	fn have_extrinsic(&self, hash: &Block::Hash) -> Result<bool> {
+		Ok(self.extrinsic(hash)?.is_some())
+	}
 }
 
 /// Provides access to the optional cache.
diff --git a/primitives/database/src/lib.rs b/primitives/database/src/lib.rs
index 94fe16ce01db..7107ea25c02c 100644
--- a/primitives/database/src/lib.rs
+++ b/primitives/database/src/lib.rs
@@ -115,6 +115,11 @@ pub trait Database<H: Clone>: Send + Sync {
 	/// `key` is not currently in the database.
 	fn get(&self, col: ColumnId, key: &[u8]) -> Option<Vec<u8>>;
 
+	/// Check if the value exists in the database without retrieving it.
+	fn contains(&self, col: ColumnId, key: &[u8]) -> bool {
+		self.get(col, key).is_some()
+	}
+
 	/// Call `f` with the value previously stored against `key`.
 	///
 	/// This may be faster than `get` since it doesn't allocate.

From 9d7b88492bc376ae963eb3d0a00f2773484569db Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Wed, 3 Feb 2021 09:24:23 +0100
Subject: [PATCH 0356/1194] Improve log line (#8032)

Co-authored-by: parity-processbot <>
---
 client/network/src/service.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 3d87ddcf1f5c..39eaa606d006 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -675,8 +675,8 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 				// Notification silently discarded, as documented.
 				log::debug!(
 					target: "sub-libp2p",
-					"Attempted to send notification on missing or closed substream: {:?}",
-					protocol,
+					"Attempted to send notification on missing or closed substream: {}, {:?}",
+					target, protocol,
 				);
 				return;
 			}

From 2fb45347dfb0965339638a06390a33738e1dcae9 Mon Sep 17 00:00:00 2001
From: Robert Klotzner <eskimor@users.noreply.github.com>
Date: Wed, 3 Feb 2021 09:39:39 +0100
Subject: [PATCH 0357/1194] Export `IfDisconnected` in public module. (#8034)

---
 client/network/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/network/src/lib.rs b/client/network/src/lib.rs
index a64be19d8767..5bd20927869e 100644
--- a/client/network/src/lib.rs
+++ b/client/network/src/lib.rs
@@ -270,7 +270,7 @@ pub use libp2p::{multiaddr, Multiaddr, PeerId};
 pub use protocol::{event::{DhtEvent, Event, ObservedRole}, sync::SyncState, PeerInfo};
 pub use service::{
 	NetworkService, NetworkWorker, RequestFailure, OutboundFailure, NotificationSender,
-	NotificationSenderReady,
+	NotificationSenderReady, IfDisconnected,
 };
 
 pub use sc_peerset::ReputationChange;

From 9b40d500519b784c1394ac5e40d4a374aeaaec72 Mon Sep 17 00:00:00 2001
From: Shaopeng Wang <spxwang@gmail.com>
Date: Wed, 3 Feb 2021 23:45:52 +1300
Subject: [PATCH 0358/1194] frame-system: Index type
 'MaybeSerializeDeserialize' bound. (#8035)

---
 frame/system/src/lib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index 87a636b37f1c..012185386bcf 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -77,7 +77,7 @@ use sp_runtime::{
 	traits::{
 		self, CheckEqual, AtLeast32Bit, Zero, Lookup, LookupError,
 		SimpleBitOps, Hash, Member, MaybeDisplay, BadOrigin,
-		MaybeSerialize, MaybeSerializeDeserialize, MaybeMallocSizeOf, StaticLookup, One, Bounded,
+		MaybeSerializeDeserialize, MaybeMallocSizeOf, StaticLookup, One, Bounded,
 		Dispatchable, AtLeast32BitUnsigned, Saturating, StoredMapError,
 	},
 	offchain::storage_lock::BlockNumberProvider,
@@ -174,7 +174,7 @@ pub mod pallet {
 		/// Account index (aka nonce) type. This stores the number of previous transactions associated
 		/// with a sender account.
 		type Index:
-			Parameter + Member + MaybeSerialize + Debug + Default + MaybeDisplay + AtLeast32Bit
+			Parameter + Member + MaybeSerializeDeserialize + Debug + Default + MaybeDisplay + AtLeast32Bit
 			+ Copy;
 
 		/// The block number type used by the runtime.

From f80d23bfbe797e326e77df400bbe06cd53eeae79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Wed, 3 Feb 2021 12:29:18 +0100
Subject: [PATCH 0359/1194] contracts: Make ChainExtension trait generic over
 the runtime (#8003)

---
 frame/contracts/src/chain_extension.rs | 12 +++++++-----
 frame/contracts/src/lib.rs             |  2 +-
 frame/contracts/src/tests.rs           |  5 +++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/frame/contracts/src/chain_extension.rs b/frame/contracts/src/chain_extension.rs
index c664b82fe64c..ef6e03479175 100644
--- a/frame/contracts/src/chain_extension.rs
+++ b/frame/contracts/src/chain_extension.rs
@@ -63,7 +63,7 @@ use sp_std::{
 pub use frame_system::Config as SysConfig;
 pub use pallet_contracts_primitives::ReturnFlags;
 pub use sp_core::crypto::UncheckedFrom;
-pub use crate::exec::Ext;
+pub use crate::{Config, exec::Ext};
 pub use state::Init as InitState;
 
 /// Result that returns a [`DispatchError`] on error.
@@ -74,7 +74,7 @@ pub type Result<T> = sp_std::result::Result<T, DispatchError>;
 /// In order to create a custom chain extension this trait must be implemented and supplied
 /// to the pallet contracts configuration trait as the associated type of the same name.
 /// Consult the [module documentation](self) for a general explanation of chain extensions.
-pub trait ChainExtension {
+pub trait ChainExtension<C: Config> {
 	/// Call the chain extension logic.
 	///
 	/// This is the only function that needs to be implemented in order to write a
@@ -91,8 +91,9 @@ pub trait ChainExtension {
 	/// In case of `Err` the contract execution is immediately suspended and the passed error
 	/// is returned to the caller. Otherwise the value of [`RetVal`] determines the exit
 	/// behaviour.
-	fn call<E: Ext>(func_id: u32, env: Environment<E, InitState>) -> Result<RetVal>
+	fn call<E>(func_id: u32, env: Environment<E, InitState>) -> Result<RetVal>
 	where
+		E: Ext<T = C>,
 		<E::T as SysConfig>::AccountId: UncheckedFrom<<E::T as SysConfig>::Hash> + AsRef<[u8]>;
 
 	/// Determines whether chain extensions are enabled for this chain.
@@ -108,9 +109,10 @@ pub trait ChainExtension {
 }
 
 /// Implementation that indicates that no chain extension is available.
-impl ChainExtension for () {
-	fn call<E: Ext>(_func_id: u32, mut _env: Environment<E, InitState>) -> Result<RetVal>
+impl<C: Config> ChainExtension<C> for () {
+	fn call<E>(_func_id: u32, mut _env: Environment<E, InitState>) -> Result<RetVal>
 	where
+		E: Ext<T = C>,
 		<E::T as SysConfig>::AccountId: UncheckedFrom<<E::T as SysConfig>::Hash> + AsRef<[u8]>,
 	{
 		// Never called since [`Self::enabled()`] is set to `false`. Because we want to
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index 9c810faad965..96ba7b32e259 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -337,7 +337,7 @@ pub trait Config: frame_system::Config {
 	type WeightInfo: WeightInfo;
 
 	/// Type that allows the runtime authors to add new host functions for a contract to call.
-	type ChainExtension: chain_extension::ChainExtension;
+	type ChainExtension: chain_extension::ChainExtension<Self>;
 
 	/// The maximum number of tries that can be queued for deletion.
 	type DeletionQueueDepth: Get<u32>;
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index a8bf80213a17..448df5b0de0f 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -143,9 +143,10 @@ impl Default for TestExtension {
 	}
 }
 
-impl ChainExtension for TestExtension {
-	fn call<E: Ext>(func_id: u32, env: Environment<E, InitState>) -> ExtensionResult<RetVal>
+impl ChainExtension<Test> for TestExtension {
+	fn call<E>(func_id: u32, env: Environment<E, InitState>) -> ExtensionResult<RetVal>
 	where
+		E: Ext<T = Test>,
 		<E::T as SysConfig>::AccountId: UncheckedFrom<<E::T as SysConfig>::Hash> + AsRef<[u8]>,
 	{
 		match func_id {

From 840478ae83d02561dca72b5556807894ef6fb74a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Wed, 3 Feb 2021 13:47:13 +0100
Subject: [PATCH 0360/1194] AURA: Switch to `CurrentSlot` instead of
 `LastTimestamp` (#8023)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Convert AURA to new pallet macro

* AURA: Switch to `CurrentSlot` instead of `LastTimestamp`

This switches AURA to use `CurrentSlot` instead of `LastTimestamp`.

* Add missing file

* Update frame/aura/src/migrations.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Remove the runtime side provide inherent code

* Use correct weight

* Add TODO

* Remove the Inherent from AURA

* :facepalm:

* Remove unused stuff

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
---
 Cargo.lock                                 |  1 -
 bin/node-template/runtime/src/lib.rs       |  2 +-
 frame/aura/Cargo.toml                      |  2 -
 frame/aura/src/lib.rs                      | 97 +++++++++-------------
 frame/aura/src/migrations.rs               | 43 ++++++++++
 frame/aura/src/mock.rs                     |  8 +-
 frame/aura/src/tests.rs                    |  2 +-
 primitives/consensus/aura/src/inherents.rs |  1 +
 8 files changed, 88 insertions(+), 68 deletions(-)
 create mode 100644 frame/aura/src/migrations.rs

diff --git a/Cargo.lock b/Cargo.lock
index 7340f35ca0d0..1b77246031f7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4399,7 +4399,6 @@ dependencies = [
  "sp-application-crypto",
  "sp-consensus-aura",
  "sp-core",
- "sp-inherents",
  "sp-io",
  "sp-runtime",
  "sp-std",
diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index 5efe5492b92d..8d68dbdc9686 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -273,7 +273,7 @@ construct_runtime!(
 		System: frame_system::{Module, Call, Config, Storage, Event<T>},
 		RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Module, Call, Storage},
 		Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent},
-		Aura: pallet_aura::{Module, Config<T>, Inherent},
+		Aura: pallet_aura::{Module, Config<T>},
 		Grandpa: pallet_grandpa::{Module, Call, Storage, Config, Event},
 		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
 		TransactionPayment: pallet_transaction_payment::{Module, Storage},
diff --git a/frame/aura/Cargo.toml b/frame/aura/Cargo.toml
index 2cd7e5c15f5c..9034e483f3d6 100644
--- a/frame/aura/Cargo.toml
+++ b/frame/aura/Cargo.toml
@@ -15,7 +15,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 sp-application-crypto = { version = "2.0.0", default-features = false, path = "../../primitives/application-crypto" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-inherents = { version = "2.0.0", default-features = false, path = "../../primitives/inherents" }
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 serde = { version = "1.0.101", optional = true }
 pallet-session = { version = "2.0.0", default-features = false, path = "../session" }
@@ -37,7 +36,6 @@ default = ["std"]
 std = [
 	"sp-application-crypto/std",
 	"codec/std",
-	"sp-inherents/std",
 	"sp-std/std",
 	"serde",
 	"sp-runtime/std",
diff --git a/frame/aura/src/lib.rs b/frame/aura/src/lib.rs
index 61937da286ad..db639a4499be 100644
--- a/frame/aura/src/lib.rs
+++ b/frame/aura/src/lib.rs
@@ -34,17 +34,10 @@
 //!
 //! - [Timestamp](../pallet_timestamp/index.html): The Timestamp module is used in Aura to track
 //! consensus rounds (via `slots`).
-//!
-//! ## References
-//!
-//! If you're interested in hacking on this module, it is useful to understand the interaction with
-//! `substrate/primitives/inherents/src/lib.rs` and, specifically, the required implementation of
-//! [`ProvideInherent`](../sp_inherents/trait.ProvideInherent.html) and
-//! [`ProvideInherentData`](../sp_inherents/trait.ProvideInherentData.html) to create and check inherents.
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use sp_std::{result, prelude::*};
+use sp_std::prelude::*;
 use codec::{Encode, Decode};
 use frame_support::{Parameter, traits::{Get, FindAuthor, OneSessionHandler}, ConsensusEngineId};
 use sp_runtime::{
@@ -52,14 +45,11 @@ use sp_runtime::{
 	traits::{SaturatedConversion, Saturating, Zero, Member, IsMember}, generic::DigestItem,
 };
 use sp_timestamp::OnTimestampSet;
-use sp_inherents::{InherentIdentifier, InherentData, ProvideInherent, MakeFatalError};
-use sp_consensus_aura::{
-	AURA_ENGINE_ID, ConsensusLog, AuthorityIndex, Slot,
-	inherents::{INHERENT_IDENTIFIER, AuraInherentData},
-};
+use sp_consensus_aura::{AURA_ENGINE_ID, ConsensusLog, AuthorityIndex, Slot};
 
 mod mock;
 mod tests;
+pub mod migrations;
 
 pub use pallet::*;
 
@@ -79,7 +69,22 @@ pub mod pallet {
 	pub struct Pallet<T>(sp_std::marker::PhantomData<T>);
 
 	#[pallet::hooks]
-	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+		fn on_initialize(_: T::BlockNumber) -> Weight {
+			if let Some(new_slot) = Self::current_slot_from_digests() {
+				let current_slot = CurrentSlot::<T>::get();
+
+				assert!(current_slot < new_slot, "Slot must increase");
+				CurrentSlot::<T>::put(new_slot);
+
+				// TODO [#3398] Generate offence report for all authorities that skipped their slots.
+
+				T::DbWeight::get().reads_writes(2, 1)
+			} else {
+				T::DbWeight::get().reads(1)
+			}
+		}
+	}
 
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {}
@@ -89,10 +94,12 @@ pub mod pallet {
 	#[pallet::getter(fn authorities)]
 	pub(super) type Authorities<T: Config> = StorageValue<_, Vec<T::AuthorityId>, ValueQuery>;
 
-	/// The last timestamp we have been notified of.
+	/// The current slot of this block.
+	///
+	/// This will be set in `on_initialize`.
 	#[pallet::storage]
-	#[pallet::getter(fn last_timestamp)]
-	pub(super) type LastTimestamp<T: Config> = StorageValue<_, T::Moment, ValueQuery>;
+	#[pallet::getter(fn current_slot)]
+	pub(super) type CurrentSlot<T: Config> = StorageValue<_, Slot, ValueQuery>;
 
 	#[pallet::genesis_config]
 	pub struct GenesisConfig<T: Config> {
@@ -132,6 +139,19 @@ impl<T: Config> Pallet<T> {
 		}
 	}
 
+	/// Get the current slot from the pre-runtime digests.
+	fn current_slot_from_digests() -> Option<Slot> {
+		let digest = frame_system::Pallet::<T>::digest();
+		let pre_runtime_digests = digest.logs.iter().filter_map(|d| d.as_pre_runtime());
+		for (id, mut data) in pre_runtime_digests {
+			if id == AURA_ENGINE_ID {
+				return Slot::decode(&mut data).ok();
+			}
+		}
+
+		None
+	}
+
 	/// Determine the Aura slot-duration based on the Timestamp module configuration.
 	pub fn slot_duration() -> T::Moment {
 		// we double the minimum block-period so each author can always propose within
@@ -224,49 +244,12 @@ impl<T: Config> IsMember<T::AuthorityId> for Pallet<T> {
 
 impl<T: Config> OnTimestampSet<T::Moment> for Pallet<T> {
 	fn on_timestamp_set(moment: T::Moment) {
-		let last = Self::last_timestamp();
-		LastTimestamp::<T>::put(moment);
-
-		if last.is_zero() {
-			return;
-		}
-
 		let slot_duration = Self::slot_duration();
 		assert!(!slot_duration.is_zero(), "Aura slot duration cannot be zero.");
 
-		let last_slot = last / slot_duration;
-		let cur_slot = moment / slot_duration;
-
-		assert!(last_slot < cur_slot, "Only one block may be authored per slot.");
-
-		// TODO [#3398] Generate offence report for all authorities that skipped their slots.
-	}
-}
-
-impl<T: Config> ProvideInherent for Pallet<T> {
-	type Call = pallet_timestamp::Call<T>;
-	type Error = MakeFatalError<sp_inherents::Error>;
-	const INHERENT_IDENTIFIER: InherentIdentifier = INHERENT_IDENTIFIER;
+		let timestamp_slot = moment / slot_duration;
+		let timestamp_slot = Slot::from(timestamp_slot.saturated_into::<u64>());
 
-	fn create_inherent(_: &InherentData) -> Option<Self::Call> {
-		None
-	}
-
-	/// Verify the validity of the inherent using the timestamp.
-	fn check_inherent(call: &Self::Call, data: &InherentData) -> result::Result<(), Self::Error> {
-		let timestamp = match call {
-			pallet_timestamp::Call::set(ref timestamp) => timestamp.clone(),
-			_ => return Ok(()),
-		};
-
-		let timestamp_based_slot = timestamp / Self::slot_duration();
-
-		let seal_slot = u64::from(data.aura_inherent_data()?).saturated_into();
-
-		if timestamp_based_slot == seal_slot {
-			Ok(())
-		} else {
-			Err(sp_inherents::Error::from("timestamp set in block doesn't match slot in seal").into())
-		}
+		assert!(CurrentSlot::<T>::get() == timestamp_slot, "Timestamp slot must match `CurrentSlot`");
 	}
 }
diff --git a/frame/aura/src/migrations.rs b/frame/aura/src/migrations.rs
new file mode 100644
index 000000000000..038c5b3f3f18
--- /dev/null
+++ b/frame/aura/src/migrations.rs
@@ -0,0 +1,43 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Migrations for the AURA pallet.
+
+use frame_support::{traits::Get, weights::Weight, pallet_prelude::*};
+
+struct __LastTimestamp<T>(sp_std::marker::PhantomData<T>);
+impl<T: RemoveLastTimestamp> frame_support::traits::StorageInstance for __LastTimestamp<T> {
+	fn pallet_prefix() -> &'static str { T::PalletPrefix::get() }
+	const STORAGE_PREFIX: &'static str = "LastTimestamp";
+}
+
+type LastTimestamp<T> = StorageValue<__LastTimestamp<T>, (), ValueQuery>;
+
+pub trait RemoveLastTimestamp: super::Config {
+	type PalletPrefix: Get<&'static str>;
+}
+
+/// Remove the `LastTimestamp` storage value.
+///
+/// This storage value was removed and replaced by `CurrentSlot`. As we only remove this storage
+/// value, it is safe to call this method multiple times.
+///
+/// This migration requires a type `T` that implements [`RemoveLastTimestamp`].
+pub fn remove_last_timestamp<T: RemoveLastTimestamp>() -> Weight {
+	LastTimestamp::<T>::kill();
+	T::DbWeight::get().writes(1)
+}
diff --git a/frame/aura/src/mock.rs b/frame/aura/src/mock.rs
index 8eef18448d0c..a5ef12f5935f 100644
--- a/frame/aura/src/mock.rs
+++ b/frame/aura/src/mock.rs
@@ -21,12 +21,8 @@
 
 use crate as pallet_aura;
 use sp_consensus_aura::ed25519::AuthorityId;
-use sp_runtime::{
-	traits::IdentityLookup,
-	testing::{Header, UintAuthorityId},
-};
+use sp_runtime::{traits::IdentityLookup, testing::{Header, UintAuthorityId}};
 use frame_support::{parameter_types, traits::GenesisBuild};
-use sp_io;
 use sp_core::H256;
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
@@ -40,7 +36,7 @@ frame_support::construct_runtime!(
 	{
 		System: frame_system::{Module, Call, Config, Storage, Event<T>},
 		Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent},
-		Aura: pallet_aura::{Module, Call, Storage, Config<T>, Inherent},
+		Aura: pallet_aura::{Module, Call, Storage, Config<T>},
 	}
 );
 
diff --git a/frame/aura/src/tests.rs b/frame/aura/src/tests.rs
index 00b792c300a5..18e14e802bd3 100644
--- a/frame/aura/src/tests.rs
+++ b/frame/aura/src/tests.rs
@@ -24,7 +24,7 @@ use crate::mock::{Aura, new_test_ext};
 #[test]
 fn initial_values() {
 	new_test_ext(vec![0, 1, 2, 3]).execute_with(|| {
-		assert_eq!(Aura::last_timestamp(), 0u64);
+		assert_eq!(Aura::current_slot(), 0u64);
 		assert_eq!(Aura::authorities().len(), 4);
 	});
 }
diff --git a/primitives/consensus/aura/src/inherents.rs b/primitives/consensus/aura/src/inherents.rs
index 2b73b2229511..35f686d93450 100644
--- a/primitives/consensus/aura/src/inherents.rs
+++ b/primitives/consensus/aura/src/inherents.rs
@@ -48,6 +48,7 @@ impl AuraInherentData for InherentData {
 }
 
 /// Provides the slot duration inherent data for `Aura`.
+// TODO: Remove in the future. https://github.com/paritytech/substrate/issues/8029
 #[cfg(feature = "std")]
 pub struct InherentDataProvider {
 	slot_duration: u64,

From dc02c65a5c0001c2d87452cbdac47451f2c52eac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Thu, 4 Feb 2021 12:01:34 +0100
Subject: [PATCH 0361/1194] contracts: Charge rent for code storage (#7935)

* contracts: Implement refcounting for wasm code

* contracts: Charge rent for code storage

* contracts: Fix dispatchables erroneously refunding base costs

* Fixed typos in comments.

Co-authored-by: Andrew Jones <ascjones@gmail.com>

* Remove awkward empty line

* Fix more typos in docs

* Fix typos in docs

Co-authored-by: Andrew Jones <ascjones@gmail.com>

* Split up complicated expression

Co-authored-by: Andrew Jones <ascjones@gmail.com>

* review: Remove unused return value

* Fix typos

Co-authored-by: Andrew Jones <ascjones@gmail.com>

* review: Fix refcount being reset to one on re-instrumentation

* Document evictable_code parameter

* Make Executable::execute consume and store itself

* Added comments about stale values

* Disregard struct size in occupied_storage()

Co-authored-by: Andrew Jones <ascjones@gmail.com>
---
 bin/node/executor/tests/basic.rs              |   14 +-
 frame/contracts/README.md                     |   10 +-
 .../fixtures/instantiate_return_code.wat      |    4 +-
 frame/contracts/src/benchmarking/code.rs      |   11 +-
 frame/contracts/src/benchmarking/mod.rs       |   48 +-
 frame/contracts/src/exec.rs                   |  525 +++----
 frame/contracts/src/gas.rs                    |   14 +-
 frame/contracts/src/lib.rs                    |  145 +-
 frame/contracts/src/rent.rs                   |   95 +-
 frame/contracts/src/schedule.rs               |    2 +-
 frame/contracts/src/storage.rs                |   41 +-
 frame/contracts/src/tests.rs                  |  763 +++++-----
 frame/contracts/src/wasm/code_cache.rs        |  160 ++-
 frame/contracts/src/wasm/mod.rs               |  224 +--
 frame/contracts/src/wasm/prepare.rs           |   95 +-
 frame/contracts/src/wasm/runtime.rs           |   17 +-
 frame/contracts/src/weights.rs                | 1226 ++++++++---------
 17 files changed, 1884 insertions(+), 1510 deletions(-)

diff --git a/bin/node/executor/tests/basic.rs b/bin/node/executor/tests/basic.rs
index f007ba41ccc6..b38400318756 100644
--- a/bin/node/executor/tests/basic.rs
+++ b/bin/node/executor/tests/basic.rs
@@ -602,23 +602,17 @@ fn deploying_wasm_contract_should_work() {
 			CheckedExtrinsic {
 				signed: Some((charlie(), signed_extra(0, 0))),
 				function: Call::Contracts(
-					pallet_contracts::Call::put_code::<Runtime>(transfer_code)
-				),
-			},
-			CheckedExtrinsic {
-				signed: Some((charlie(), signed_extra(1, 0))),
-				function: Call::Contracts(
-					pallet_contracts::Call::instantiate::<Runtime>(
-						1 * DOLLARS + subsistence,
+					pallet_contracts::Call::instantiate_with_code::<Runtime>(
+						1000 * DOLLARS + subsistence,
 						500_000_000,
-						transfer_ch,
+						transfer_code,
 						Vec::new(),
 						Vec::new(),
 					)
 				),
 			},
 			CheckedExtrinsic {
-				signed: Some((charlie(), signed_extra(2, 0))),
+				signed: Some((charlie(), signed_extra(1, 0))),
 				function: Call::Contracts(
 					pallet_contracts::Call::call::<Runtime>(
 						sp_runtime::MultiAddress::Id(addr.clone()),
diff --git a/frame/contracts/README.md b/frame/contracts/README.md
index 4252bfc1d843..8397d2f6bf00 100644
--- a/frame/contracts/README.md
+++ b/frame/contracts/README.md
@@ -42,23 +42,19 @@ fails, A can decide how to handle that failure, either proceeding or reverting A
 
 ### Dispatchable functions
 
-* `put_code` - Stores the given binary Wasm code into the chain's storage and returns its `code_hash`.
-* `instantiate` - Deploys a new contract from the given `code_hash`, optionally transferring some balance.
-This instantiates a new smart contract account and calls its contract deploy handler to
-initialize the contract.
-* `call` - Makes a call to an account, optionally transferring some balance.
+Those are documented in the reference documentation of the `Module`.
 
 ## Usage
 
 The Contract module is a work in progress. The following examples show how this Contract module
 can be used to instantiate and call contracts.
 
-* [`ink`](https://github.com/paritytech/ink) is
+- [`ink`](https://github.com/paritytech/ink) is
 an [`eDSL`](https://wiki.haskell.org/Embedded_domain_specific_language) that enables writing
 WebAssembly based smart contracts in the Rust programming language. This is a work in progress.
 
 ## Related Modules
 
-* [Balances](https://docs.rs/pallet-balances/latest/pallet_balances/)
+- [Balances](https://docs.rs/pallet-balances/latest/pallet_balances/)
 
 License: Apache-2.0
diff --git a/frame/contracts/fixtures/instantiate_return_code.wat b/frame/contracts/fixtures/instantiate_return_code.wat
index cead1f1c9fa4..544489329cfa 100644
--- a/frame/contracts/fixtures/instantiate_return_code.wat
+++ b/frame/contracts/fixtures/instantiate_return_code.wat
@@ -10,8 +10,8 @@
 	(import "seal0" "seal_return" (func $seal_return (param i32 i32 i32)))
 	(import "env" "memory" (memory 1 1))
 
-	;; [0, 8) 100 balance
-	(data (i32.const 0) "\64\00\00\00\00\00\00\00")
+	;; [0, 8) 10_000 balance
+	(data (i32.const 0) "\10\27\00\00\00\00\00\00")
 
 	;; [8, 12) here we store the return code of the transfer
 
diff --git a/frame/contracts/src/benchmarking/code.rs b/frame/contracts/src/benchmarking/code.rs
index 88e8b265a57e..01ca7d3aac22 100644
--- a/frame/contracts/src/benchmarking/code.rs
+++ b/frame/contracts/src/benchmarking/code.rs
@@ -103,7 +103,7 @@ pub struct ImportedFunction {
 	pub return_type: Option<ValueType>,
 }
 
-/// A wasm module ready to be put on chain with `put_code`.
+/// A wasm module ready to be put on chain.
 #[derive(Clone)]
 pub struct WasmModule<T:Config> {
 	pub code: Vec<u8>,
@@ -245,16 +245,16 @@ where
 	}
 
 	/// Creates a wasm module of `target_bytes` size. Used to benchmark the performance of
-	/// `put_code` for different sizes of wasm modules. The generated module maximizes
+	/// `instantiate_with_code` for different sizes of wasm modules. The generated module maximizes
 	/// instrumentation runtime by nesting blocks as deeply as possible given the byte budget.
 	pub fn sized(target_bytes: u32) -> Self {
 		use parity_wasm::elements::Instruction::{If, I32Const, Return, End};
-		// Base size of a contract is 47 bytes and each expansion adds 6 bytes.
+		// Base size of a contract is 63 bytes and each expansion adds 6 bytes.
 		// We do one expansion less to account for the code section and function body
 		// size fields inside the binary wasm module representation which are leb128 encoded
 		// and therefore grow in size when the contract grows. We are not allowed to overshoot
-		// because of the maximum code size that is enforced by `put_code`.
-		let expansions = (target_bytes.saturating_sub(47) / 6).saturating_sub(1);
+		// because of the maximum code size that is enforced by `instantiate_with_code`.
+		let expansions = (target_bytes.saturating_sub(63) / 6).saturating_sub(1);
 		const EXPANSION: [Instruction; 4] = [
 			I32Const(0),
 			If(BlockType::NoResult),
@@ -263,6 +263,7 @@ where
 		];
 		ModuleDefinition {
 			call_body: Some(body::repeated(expansions, &EXPANSION)),
+			memory: Some(ImportedMemory::max::<T>()),
 			.. Default::default()
 		}
 		.into()
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index 649d09188032..2034a17e922a 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -137,7 +137,7 @@ where
 		// same block number.
 		System::<T>::set_block_number(1u32.into());
 
-		Contracts::<T>::put_code_raw(module.code)?;
+		Contracts::<T>::store_code_raw(module.code)?;
 		Contracts::<T>::instantiate(
 			RawOrigin::Signed(caller.clone()).into(),
 			endowment,
@@ -198,7 +198,7 @@ where
 	/// Get the block number when this contract will be evicted. Returns an error when
 	/// the rent collection won't happen because the contract has to much endowment.
 	fn eviction_at(&self) -> Result<T::BlockNumber, &'static str> {
-		let projection = Rent::<T>::compute_projection(&self.account_id)
+		let projection = Rent::<T, PrefabWasmModule<T>>::compute_projection(&self.account_id)
 			.map_err(|_| "Invalid acc for rent")?;
 		match projection {
 			RentProjection::EvictionAt(at) => Ok(at),
@@ -250,7 +250,7 @@ where
 	/// Evict this contract.
 	fn evict(&mut self) -> Result<(), &'static str> {
 		self.set_block_num_for_eviction()?;
-		Rent::<T>::try_eviction(&self.contract.account_id, Zero::zero())?;
+		Rent::<T, PrefabWasmModule<T>>::try_eviction(&self.contract.account_id, Zero::zero())?;
 		self.contract.ensure_tombstone()
 	}
 }
@@ -314,24 +314,34 @@ benchmarks! {
 
 	// This constructs a contract that is maximal expensive to instrument.
 	// It creates a maximum number of metering blocks per byte.
-	// `n`: Size of the code in kilobytes.
-	put_code {
-		let n in 0 .. Contracts::<T>::current_schedule().limits.code_size / 1024;
+	// The size of the salt influences the runtime because is is hashed in order to
+	// determine the contract address.
+	// `c`: Size of the code in kilobytes.
+	// `s`: Size of the salt in kilobytes.
+	instantiate_with_code {
+		let c in 0 .. Contracts::<T>::current_schedule().limits.code_size / 1024;
+		let s in 0 .. code::max_pages::<T>() * 64;
+		let salt = vec![42u8; (s * 1024) as usize];
+		let endowment = caller_funding::<T>() / 3u32.into();
 		let caller = whitelisted_caller();
 		T::Currency::make_free_balance_be(&caller, caller_funding::<T>());
-		let module = WasmModule::<T>::sized(n * 1024);
-		let origin = RawOrigin::Signed(caller);
-	}: _(origin, module.code)
+		let WasmModule { code, hash, .. } = WasmModule::<T>::sized(c * 1024);
+		let origin = RawOrigin::Signed(caller.clone());
+		let addr = Contracts::<T>::contract_address(&caller, &hash, &salt);
+	}: _(origin, endowment, Weight::max_value(), code, vec![], salt)
+	verify {
+		// endowment was removed from the caller
+		assert_eq!(T::Currency::free_balance(&caller), caller_funding::<T>() - endowment);
+		// contract has the full endowment because no rent collection happended
+		assert_eq!(T::Currency::free_balance(&addr), endowment);
+		// instantiate should leave a alive contract
+		Contract::<T>::address_alive_info(&addr)?;
+	}
 
 	// Instantiate uses a dummy contract constructor to measure the overhead of the instantiate.
-	// The size of the input data influences the runtime because it is hashed in order to determine
-	// the contract address.
-	// `n`: Size of the data passed to constructor in kilobytes.
 	// `s`: Size of the salt in kilobytes.
 	instantiate {
-		let n in 0 .. code::max_pages::<T>() * 64;
 		let s in 0 .. code::max_pages::<T>() * 64;
-		let data = vec![42u8; (n * 1024) as usize];
 		let salt = vec![42u8; (s * 1024) as usize];
 		let endowment = caller_funding::<T>() / 3u32.into();
 		let caller = whitelisted_caller();
@@ -339,8 +349,8 @@ benchmarks! {
 		let WasmModule { code, hash, .. } = WasmModule::<T>::dummy_with_mem();
 		let origin = RawOrigin::Signed(caller.clone());
 		let addr = Contracts::<T>::contract_address(&caller, &hash, &salt);
-		Contracts::<T>::put_code_raw(code)?;
-	}: _(origin, endowment, Weight::max_value(), hash, data, salt)
+		Contracts::<T>::store_code_raw(code)?;
+	}: _(origin, endowment, Weight::max_value(), hash, vec![], salt)
 	verify {
 		// endowment was removed from the caller
 		assert_eq!(T::Currency::free_balance(&caller), caller_funding::<T>() - endowment);
@@ -1369,7 +1379,7 @@ benchmarks! {
 					])),
 					.. Default::default()
 				});
-				Contracts::<T>::put_code_raw(code.code)?;
+				Contracts::<T>::store_code_raw(code.code)?;
 				Ok(code.hash)
 			})
 			.collect::<Result<Vec<_>, &'static str>>()?;
@@ -1492,7 +1502,7 @@ benchmarks! {
 		let hash = callee_code.hash.clone();
 		let hash_bytes = callee_code.hash.encode();
 		let hash_len = hash_bytes.len();
-		Contracts::<T>::put_code_raw(callee_code.code)?;
+		Contracts::<T>::store_code_raw(callee_code.code)?;
 		let inputs = (0..API_BENCHMARK_BATCH_SIZE).map(|x| x.encode()).collect::<Vec<_>>();
 		let input_len = inputs.get(0).map(|x| x.len()).unwrap_or(0);
 		let input_bytes = inputs.iter().cloned().flatten().collect::<Vec<_>>();
@@ -2455,7 +2465,7 @@ mod tests {
 	create_test!(on_initialize_per_queue_item);
 
 	create_test!(update_schedule);
-	create_test!(put_code);
+	create_test!(instantiate_with_code);
 	create_test!(instantiate);
 	create_test!(call);
 	create_test!(claim_surcharge);
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index c2ad48ca981a..047d7aba192f 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -18,13 +18,16 @@
 use crate::{
 	CodeHash, ConfigCache, Event, RawEvent, Config, Module as Contracts,
 	TrieId, BalanceOf, ContractInfo, gas::GasMeter, rent::Rent, storage::{self, Storage},
-	Error, ContractInfoOf
+	Error, ContractInfoOf, Schedule,
 };
 use sp_core::crypto::UncheckedFrom;
-use sp_std::prelude::*;
+use sp_std::{
+	prelude::*,
+	marker::PhantomData,
+};
 use sp_runtime::traits::{Bounded, Zero, Convert, Saturating};
 use frame_support::{
-	dispatch::DispatchResult,
+	dispatch::{DispatchResult, DispatchError},
 	traits::{ExistenceRequirement, Currency, Time, Randomness},
 	weights::Weight,
 	ensure, StorageMap,
@@ -73,7 +76,7 @@ pub trait Ext {
 	/// transferred from this to the newly created account (also known as endowment).
 	fn instantiate(
 		&mut self,
-		code: &CodeHash<Self::T>,
+		code: CodeHash<Self::T>,
 		value: BalanceOf<Self::T>,
 		gas_meter: &mut GasMeter<Self::T>,
 		input_data: Vec<u8>,
@@ -168,80 +171,111 @@ pub trait Ext {
 
 	/// Returns the price for the specified amount of weight.
 	fn get_weight_price(&self, weight: Weight) -> BalanceOf<Self::T>;
+
+	/// Get a reference to the schedule used by the current call.
+	fn schedule(&self) -> &Schedule<Self::T>;
 }
 
-/// Loader is a companion of the `Vm` trait. It loads an appropriate abstract
-/// executable to be executed by an accompanying `Vm` implementation.
-pub trait Loader<T: Config> {
-	type Executable;
-
-	/// Load the initializer portion of the code specified by the `code_hash`. This
-	/// executable is called upon instantiation.
-	fn load_init(&self, code_hash: &CodeHash<T>) -> Result<Self::Executable, &'static str>;
-	/// Load the main portion of the code specified by the `code_hash`. This executable
-	/// is called for each call to a contract.
-	fn load_main(&self, code_hash: &CodeHash<T>) -> Result<Self::Executable, &'static str>;
+/// Describes the different functions that can be exported by an [`Executable`].
+pub enum ExportedFunction {
+	/// The constructor function which is executed on deployment of a contract.
+	Constructor,
+	/// The function which is executed when a contract is called.
+	Call,
 }
 
-/// A trait that represent a virtual machine.
+/// A trait that represents something that can be executed.
 ///
-/// You can view a virtual machine as something that takes code, an input data buffer,
-/// queries it and/or performs actions on the given `Ext` and optionally
-/// returns an output data buffer. The type of code depends on the particular virtual machine.
-///
-/// Execution of code can end by either implicit termination (that is, reached the end of
-/// executable), explicit termination via returning a buffer or termination due to a trap.
-pub trait Vm<T: Config> {
-	type Executable;
+/// In the on-chain environment this would be represented by a wasm module. This trait exists in
+/// order to be able to mock the wasm logic for testing.
+pub trait Executable<T: Config>: Sized {
+	/// Load the executable from storage.
+	fn from_storage(code_hash: CodeHash<T>, schedule: &Schedule<T>) -> Result<Self, DispatchError>;
+
+	/// Load the module from storage without re-instrumenting it.
+	///
+	/// A code module is re-instrumented on-load when it was originally instrumented with
+	/// an older schedule. This skips this step for cases where the code storage is
+	/// queried for purposes other than execution.
+	fn from_storage_noinstr(code_hash: CodeHash<T>) -> Result<Self, DispatchError>;
+
+	/// Decrements the refcount by one and deletes the code if it drops to zero.
+	fn drop_from_storage(self);
+
+	/// Increment the refcount by one. Fails if the code does not exist on-chain.
+	fn add_user(code_hash: CodeHash<T>) -> DispatchResult;
 
+	/// Decrement the refcount by one and remove the code when it drops to zero.
+	fn remove_user(code_hash: CodeHash<T>);
+
+	/// Execute the specified exported function and return the result.
+	///
+	/// When the specified function is `Constructor` the executable is stored and its
+	/// refcount incremented.
+	///
+	/// # Note
+	///
+	/// This functions expects to be executed in a storage transaction that rolls back
+	/// all of its emitted storage changes.
 	fn execute<E: Ext<T = T>>(
-		&self,
-		exec: &Self::Executable,
+		self,
 		ext: E,
+		function: &ExportedFunction,
 		input_data: Vec<u8>,
 		gas_meter: &mut GasMeter<T>,
 	) -> ExecResult;
+
+	/// The code hash of the executable.
+	fn code_hash(&self) -> &CodeHash<T>;
+
+	/// The storage that is occupied by the instrumented executable and its pristine source.
+	///
+	/// The returned size is already divided by the number of users who share the code.
+	///
+	/// # Note
+	///
+	/// This works with the current in-memory value of refcount. When calling any contract
+	/// without refetching this from storage the result can be inaccurate as it might be
+	/// working with a stale value. Usually this inaccuracy is tolerable.
+	fn occupied_storage(&self) -> u32;
 }
 
-pub struct ExecutionContext<'a, T: Config + 'a, V, L> {
-	pub caller: Option<&'a ExecutionContext<'a, T, V, L>>,
+pub struct ExecutionContext<'a, T: Config + 'a, E> {
+	pub caller: Option<&'a ExecutionContext<'a, T, E>>,
 	pub self_account: T::AccountId,
 	pub self_trie_id: Option<TrieId>,
 	pub depth: usize,
 	pub config: &'a ConfigCache<T>,
-	pub vm: &'a V,
-	pub loader: &'a L,
 	pub timestamp: MomentOf<T>,
 	pub block_number: T::BlockNumber,
+	_phantom: PhantomData<E>,
 }
 
-impl<'a, T, E, V, L> ExecutionContext<'a, T, V, L>
+impl<'a, T, E> ExecutionContext<'a, T, E>
 where
 	T: Config,
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
-	L: Loader<T, Executable = E>,
-	V: Vm<T, Executable = E>,
+	E: Executable<T>,
 {
 	/// Create the top level execution context.
 	///
 	/// The specified `origin` address will be used as `sender` for. The `origin` must be a regular
 	/// account (not a contract).
-	pub fn top_level(origin: T::AccountId, cfg: &'a ConfigCache<T>, vm: &'a V, loader: &'a L) -> Self {
+	pub fn top_level(origin: T::AccountId, cfg: &'a ConfigCache<T>) -> Self {
 		ExecutionContext {
 			caller: None,
 			self_trie_id: None,
 			self_account: origin,
 			depth: 0,
 			config: &cfg,
-			vm: &vm,
-			loader: &loader,
 			timestamp: T::Time::now(),
 			block_number: <frame_system::Module<T>>::block_number(),
+			_phantom: Default::default(),
 		}
 	}
 
 	fn nested<'b, 'c: 'b>(&'c self, dest: T::AccountId, trie_id: TrieId)
-		-> ExecutionContext<'b, T, V, L>
+		-> ExecutionContext<'b, T, E>
 	{
 		ExecutionContext {
 			caller: Some(self),
@@ -249,10 +283,9 @@ where
 			self_account: dest,
 			depth: self.depth + 1,
 			config: self.config,
-			vm: self.vm,
-			loader: self.loader,
 			timestamp: self.timestamp.clone(),
 			block_number: self.block_number.clone(),
+			_phantom: Default::default(),
 		}
 	}
 
@@ -268,16 +301,19 @@ where
 			Err(Error::<T>::MaxCallDepthReached)?
 		}
 
+		let contract = <ContractInfoOf<T>>::get(&dest)
+			.and_then(|contract| contract.get_alive())
+			.ok_or(Error::<T>::NotCallable)?;
+
+		let executable = E::from_storage(contract.code_hash, &self.config.schedule)?;
+
 		// This charges the rent and denies access to a contract that is in need of
 		// eviction by returning `None`. We cannot evict eagerly here because those
 		// changes would be rolled back in case this contract is called by another
 		// contract.
 		// See: https://github.com/paritytech/substrate/issues/6439#issuecomment-648754324
-		let contract = if let Ok(Some(ContractInfo::Alive(info))) = Rent::<T>::charge(&dest) {
-			info
-		} else {
-			Err(Error::<T>::NotCallable)?
-		};
+		let contract = Rent::<T, E>::charge(&dest, contract, executable.occupied_storage())?
+			.ok_or(Error::<T>::NotCallable)?;
 
 		let transactor_kind = self.transactor_kind();
 		let caller = self.self_account.clone();
@@ -294,11 +330,9 @@ where
 				)?
 			}
 
-			let executable = nested.loader.load_main(&contract.code_hash)
-				.map_err(|_| Error::<T>::CodeNotFound)?;
-			let output = nested.vm.execute(
-				&executable,
+			let output = executable.execute(
 				nested.new_call_context(caller, value),
+				&ExportedFunction::Call,
 				input_data,
 				gas_meter,
 			).map_err(|e| ExecError { error: e.error, origin: ErrorOrigin::Callee })?;
@@ -310,7 +344,7 @@ where
 		&mut self,
 		endowment: BalanceOf<T>,
 		gas_meter: &mut GasMeter<T>,
-		code_hash: &CodeHash<T>,
+		executable: E,
 		input_data: Vec<u8>,
 		salt: &[u8],
 	) -> Result<(T::AccountId, ExecReturnValue), ExecError> {
@@ -320,7 +354,7 @@ where
 
 		let transactor_kind = self.transactor_kind();
 		let caller = self.self_account.clone();
-		let dest = Contracts::<T>::contract_address(&caller, code_hash, salt);
+		let dest = Contracts::<T>::contract_address(&caller, executable.code_hash(), salt);
 
 		let output = frame_support::storage::with_transaction(|| {
 			// Generate the trie id in a new transaction to only increment the counter on success.
@@ -333,7 +367,7 @@ where
 						.self_trie_id
 						.clone()
 						.expect("the nested context always has to have self_trie_id"),
-					code_hash.clone()
+					executable.code_hash().clone()
 				)?;
 
 				// Send funds unconditionally here. If the `endowment` is below existential_deposit
@@ -347,25 +381,32 @@ where
 					nested,
 				)?;
 
-				let executable = nested.loader.load_init(&code_hash)
-					.map_err(|_| Error::<T>::CodeNotFound)?;
-				let output = nested.vm
-					.execute(
-						&executable,
-						nested.new_call_context(caller.clone(), endowment),
-						input_data,
-						gas_meter,
-					).map_err(|e| ExecError { error: e.error, origin: ErrorOrigin::Callee })?;
-
+				// Cache the value before calling into the constructor because that
+				// consumes the value. If the constructor creates additional contracts using
+				// the same code hash we still charge the "1 block rent" as if they weren't
+				// spawned. This is OK as overcharging is always safe.
+				let occupied_storage = executable.occupied_storage();
+
+				let output = executable.execute(
+					nested.new_call_context(caller.clone(), endowment),
+					&ExportedFunction::Constructor,
+					input_data,
+					gas_meter,
+				).map_err(|e| ExecError { error: e.error, origin: ErrorOrigin::Callee })?;
+
+				// We need to re-fetch the contract because changes are written to storage
+				// eagerly during execution.
+				let contract = <ContractInfoOf<T>>::get(&dest)
+					.and_then(|contract| contract.get_alive())
+					.ok_or(Error::<T>::NotCallable)?;
 
 				// Collect the rent for the first block to prevent the creation of very large
 				// contracts that never intended to pay for even one block.
 				// This also makes sure that it is above the subsistence threshold
 				// in order to keep up the guarantuee that we always leave a tombstone behind
 				// with the exception of a contract that called `seal_terminate`.
-				Rent::<T>::charge(&dest)?
-					.and_then(|c| c.get_alive())
-					.ok_or_else(|| Error::<T>::NewContractNotFunded)?;
+				Rent::<T, E>::charge(&dest, contract, occupied_storage)?
+					.ok_or(Error::<T>::NewContractNotFunded)?;
 
 				// Deposit an instantiation event.
 				deposit_event::<T>(vec![], RawEvent::Instantiated(caller.clone(), dest.clone()));
@@ -387,7 +428,7 @@ where
 		&'b mut self,
 		caller: T::AccountId,
 		value: BalanceOf<T>,
-	) -> CallContext<'b, 'a, T, V, L> {
+	) -> CallContext<'b, 'a, T, E> {
 		let timestamp = self.timestamp.clone();
 		let block_number = self.block_number.clone();
 		CallContext {
@@ -396,13 +437,14 @@ where
 			value_transferred: value,
 			timestamp,
 			block_number,
+			_phantom: Default::default(),
 		}
 	}
 
 	/// Execute the given closure within a nested execution context.
 	fn with_nested_context<F>(&mut self, dest: T::AccountId, trie_id: TrieId, func: F)
 		-> ExecResult
-		where F: FnOnce(&mut ExecutionContext<T, V, L>) -> ExecResult
+		where F: FnOnce(&mut ExecutionContext<T, E>) -> ExecResult
 	{
 		use frame_support::storage::TransactionOutcome::*;
 		let mut nested = self.nested(dest, trie_id);
@@ -447,16 +489,17 @@ enum TransferCause {
 /// is specified as `Terminate`. Otherwise, any transfer that would bring the sender below the
 /// subsistence threshold (for contracts) or the existential deposit (for plain accounts)
 /// results in an error.
-fn transfer<'a, T: Config, V: Vm<T>, L: Loader<T>>(
+fn transfer<'a, T: Config, E>(
 	cause: TransferCause,
 	origin: TransactorKind,
 	transactor: &T::AccountId,
 	dest: &T::AccountId,
 	value: BalanceOf<T>,
-	ctx: &mut ExecutionContext<'a, T, V, L>,
+	ctx: &mut ExecutionContext<'a, T, E>,
 ) -> DispatchResult
 where
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
+	E: Executable<T>,
 {
 	use self::TransferCause::*;
 	use self::TransactorKind::*;
@@ -493,20 +536,20 @@ where
 /// implies that the control won't be returned to the contract anymore, but there is still some code
 /// on the path of the return from that call context. Therefore, care must be taken in these
 /// situations.
-struct CallContext<'a, 'b: 'a, T: Config + 'b, V: Vm<T> + 'b, L: Loader<T>> {
-	ctx: &'a mut ExecutionContext<'b, T, V, L>,
+struct CallContext<'a, 'b: 'a, T: Config + 'b, E> {
+	ctx: &'a mut ExecutionContext<'b, T, E>,
 	caller: T::AccountId,
 	value_transferred: BalanceOf<T>,
 	timestamp: MomentOf<T>,
 	block_number: T::BlockNumber,
+	_phantom: PhantomData<E>,
 }
 
-impl<'a, 'b: 'a, T, E, V, L> Ext for CallContext<'a, 'b, T, V, L>
+impl<'a, 'b: 'a, T, E> Ext for CallContext<'a, 'b, T, E>
 where
 	T: Config + 'b,
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
-	V: Vm<T, Executable = E>,
-	L: Loader<T, Executable = E>,
+	E: Executable<T>,
 {
 	type T = T;
 
@@ -537,13 +580,15 @@ where
 
 	fn instantiate(
 		&mut self,
-		code_hash: &CodeHash<T>,
+		code_hash: CodeHash<T>,
 		endowment: BalanceOf<T>,
 		gas_meter: &mut GasMeter<T>,
 		input_data: Vec<u8>,
 		salt: &[u8],
 	) -> Result<(AccountIdOf<T>, ExecReturnValue), ExecError> {
-		self.ctx.instantiate(endowment, gas_meter, code_hash, input_data, salt)
+		let executable = E::from_storage(code_hash, &self.ctx.config.schedule)?;
+		let result = self.ctx.instantiate(endowment, gas_meter, executable, input_data, salt)?;
+		Ok(result)
 	}
 
 	fn transfer(
@@ -582,6 +627,7 @@ where
 		)?;
 		if let Some(ContractInfo::Alive(info)) = ContractInfoOf::<T>::take(&self_id) {
 			Storage::<T>::queue_trie_for_deletion(&info)?;
+			E::remove_user(info.code_hash);
 			Contracts::<T>::deposit_event(RawEvent::Terminated(self_id, beneficiary.clone()));
 			Ok(())
 		} else {
@@ -616,7 +662,7 @@ where
 			}
 		}
 
-		let result = Rent::<T>::restore_to(
+		let result = Rent::<T, E>::restore_to(
 			self.ctx.self_account.clone(),
 			dest.clone(),
 			code_hash.clone(),
@@ -701,6 +747,10 @@ where
 	fn get_weight_price(&self, weight: Weight) -> BalanceOf<Self::T> {
 		T::WeightPrice::convert(weight)
 	}
+
+	fn schedule(&self) -> &Schedule<Self::T> {
+		&self.ctx.config.schedule
+	}
 }
 
 fn deposit_event<T: Config>(
@@ -720,25 +770,29 @@ fn deposit_event<T: Config>(
 /// wasm VM code.
 #[cfg(test)]
 mod tests {
-	use super::{
-		BalanceOf, Event, ExecResult, ExecutionContext, Ext, Loader,
-		RawEvent, Vm, ReturnFlags, ExecError, ErrorOrigin, AccountIdOf,
-	};
+	use super::*;
 	use crate::{
 		gas::GasMeter, tests::{ExtBuilder, Test, MetaEvent},
-		exec::ExecReturnValue, CodeHash, ConfigCache,
 		gas::Gas,
 		storage::Storage,
-		tests::{ALICE, BOB, CHARLIE},
+		tests::{
+			ALICE, BOB, CHARLIE,
+			test_utils::{place_contract, set_balance, get_balance},
+		},
 		Error,
 	};
-	use crate::tests::test_utils::{place_contract, set_balance, get_balance};
 	use sp_runtime::DispatchError;
 	use assert_matches::assert_matches;
-	use std::{cell::RefCell, collections::HashMap, marker::PhantomData, rc::Rc};
+	use std::{cell::RefCell, collections::HashMap, rc::Rc};
+
+	type MockContext<'a> = ExecutionContext<'a, Test, MockExecutable>;
 
 	const GAS_LIMIT: Gas = 10_000_000_000;
 
+	thread_local! {
+		static LOADER: RefCell<MockLoader> = RefCell::new(MockLoader::default());
+	}
+
 	fn events() -> Vec<Event<Test>> {
 		<frame_system::Module<Test>>::events()
 			.into_iter()
@@ -756,80 +810,74 @@ mod tests {
 	}
 
 	#[derive(Clone)]
-	struct MockExecutable<'a>(Rc<dyn Fn(MockCtx) -> ExecResult + 'a>);
+	struct MockExecutable(Rc<dyn Fn(MockCtx) -> ExecResult + 'static>, CodeHash<Test>);
 
-	impl<'a> MockExecutable<'a> {
-		fn new(f: impl Fn(MockCtx) -> ExecResult + 'a) -> Self {
-			MockExecutable(Rc::new(f))
-		}
-	}
-
-	struct MockLoader<'a> {
-		map: HashMap<CodeHash<Test>, MockExecutable<'a>>,
+	#[derive(Default)]
+	struct MockLoader {
+		map: HashMap<CodeHash<Test>, MockExecutable>,
 		counter: u64,
 	}
 
-	impl<'a> MockLoader<'a> {
-		fn empty() -> Self {
-			MockLoader {
-				map: HashMap::new(),
-				counter: 0,
-			}
-		}
-
-		fn insert(&mut self, f: impl Fn(MockCtx) -> ExecResult + 'a) -> CodeHash<Test> {
-			// Generate code hashes as monotonically increasing values.
-			let code_hash = <Test as frame_system::Config>::Hash::from_low_u64_be(self.counter);
-
-			self.counter += 1;
-			self.map.insert(code_hash, MockExecutable::new(f));
-			code_hash
+	impl MockLoader {
+		fn insert(f: impl Fn(MockCtx) -> ExecResult + 'static) -> CodeHash<Test> {
+			LOADER.with(|loader| {
+				let mut loader = loader.borrow_mut();
+				// Generate code hashes as monotonically increasing values.
+				let hash = <Test as frame_system::Config>::Hash::from_low_u64_be(loader.counter);
+				loader.counter += 1;
+				loader.map.insert(hash, MockExecutable (Rc::new(f), hash.clone()));
+				hash
+			})
 		}
 	}
 
-	struct MockVm<'a> {
-		_marker: PhantomData<&'a ()>,
-	}
+	impl Executable<Test> for MockExecutable {
+		fn from_storage(
+			code_hash: CodeHash<Test>,
+			_schedule: &Schedule<Test>
+		) -> Result<Self, DispatchError> {
+			Self::from_storage_noinstr(code_hash)
+		}
 
-	impl<'a> MockVm<'a> {
-		fn new() -> Self {
-			MockVm { _marker: PhantomData }
+		fn from_storage_noinstr(code_hash: CodeHash<Test>) -> Result<Self, DispatchError> {
+			LOADER.with(|loader| {
+				loader.borrow_mut()
+					.map
+					.get(&code_hash)
+					.cloned()
+					.ok_or(Error::<Test>::CodeNotFound.into())
+			})
 		}
-	}
 
-	impl<'a> Loader<Test> for MockLoader<'a> {
-		type Executable = MockExecutable<'a>;
+		fn drop_from_storage(self) {}
 
-		fn load_init(&self, code_hash: &CodeHash<Test>) -> Result<Self::Executable, &'static str> {
-			self.map
-				.get(code_hash)
-				.cloned()
-				.ok_or_else(|| "code not found")
-		}
-		fn load_main(&self, code_hash: &CodeHash<Test>) -> Result<Self::Executable, &'static str> {
-			self.map
-				.get(code_hash)
-				.cloned()
-				.ok_or_else(|| "code not found")
+		fn add_user(_code_hash: CodeHash<Test>) -> DispatchResult {
+			Ok(())
 		}
-	}
 
-	impl<'a> Vm<Test> for MockVm<'a> {
-		type Executable = MockExecutable<'a>;
+		fn remove_user(_code_hash: CodeHash<Test>) {}
 
 		fn execute<E: Ext<T = Test>>(
-			&self,
-			exec: &MockExecutable,
+			self,
 			mut ext: E,
+			_function: &ExportedFunction,
 			input_data: Vec<u8>,
 			gas_meter: &mut GasMeter<Test>,
 		) -> ExecResult {
-			(exec.0)(MockCtx {
+			(self.0)(MockCtx {
 				ext: &mut ext,
 				input_data,
 				gas_meter,
 			})
 		}
+
+		fn code_hash(&self) -> &CodeHash<Test> {
+			&self.1
+		}
+
+		fn occupied_storage(&self) -> u32 {
+			0
+		}
 	}
 
 	fn exec_success() -> ExecResult {
@@ -838,32 +886,29 @@ mod tests {
 
 	#[test]
 	fn it_works() {
+		thread_local! {
+			static TEST_DATA: RefCell<Vec<usize>> = RefCell::new(vec![0]);
+		}
+
 		let value = Default::default();
 		let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
-		let data = vec![];
-
-		let vm = MockVm::new();
-
-		let test_data = Rc::new(RefCell::new(vec![0usize]));
-
-		let mut loader = MockLoader::empty();
-		let exec_ch = loader.insert(|_ctx| {
-			test_data.borrow_mut().push(1);
+		let exec_ch = MockLoader::insert(|_ctx| {
+			TEST_DATA.with(|data| data.borrow_mut().push(1));
 			exec_success()
 		});
 
 		ExtBuilder::default().build().execute_with(|| {
 			let cfg = ConfigCache::preload();
-			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
+			let mut ctx = MockContext::top_level(ALICE, &cfg);
 			place_contract(&BOB, exec_ch);
 
 			assert_matches!(
-				ctx.call(BOB, value, &mut gas_meter, data),
+				ctx.call(BOB, value, &mut gas_meter, vec![]),
 				Ok(_)
 			);
 		});
 
-		assert_eq!(&*test_data.borrow(), &vec![0, 1]);
+		TEST_DATA.with(|data| assert_eq!(*data.borrow(), vec![0, 1]));
 	}
 
 	#[test]
@@ -873,12 +918,9 @@ mod tests {
 		let origin = ALICE;
 		let dest = BOB;
 
-		let vm = MockVm::new();
-		let loader = MockLoader::empty();
-
 		ExtBuilder::default().build().execute_with(|| {
 			let cfg = ConfigCache::preload();
-			let mut ctx = ExecutionContext::top_level(origin.clone(), &cfg, &vm, &loader);
+			let mut ctx = MockContext::top_level(origin.clone(), &cfg);
 			set_balance(&origin, 100);
 			set_balance(&dest, 0);
 
@@ -903,15 +945,13 @@ mod tests {
 		let origin = ALICE;
 		let dest = BOB;
 
-		let vm = MockVm::new();
-		let mut loader = MockLoader::empty();
-		let return_ch = loader.insert(
+		let return_ch = MockLoader::insert(
 			|_| Ok(ExecReturnValue { flags: ReturnFlags::REVERT, data: Vec::new() })
 		);
 
 		ExtBuilder::default().build().execute_with(|| {
 			let cfg = ConfigCache::preload();
-			let mut ctx = ExecutionContext::top_level(origin.clone(), &cfg, &vm, &loader);
+			let mut ctx = MockContext::top_level(origin.clone(), &cfg);
 			place_contract(&BOB, return_ch);
 			set_balance(&origin, 100);
 			let balance = get_balance(&dest);
@@ -938,12 +978,9 @@ mod tests {
 		let origin = ALICE;
 		let dest = BOB;
 
-		let vm = MockVm::new();
-		let loader = MockLoader::empty();
-
 		ExtBuilder::default().build().execute_with(|| {
 			let cfg = ConfigCache::preload();
-			let mut ctx = ExecutionContext::top_level(origin.clone(), &cfg, &vm, &loader);
+			let mut ctx = MockContext::top_level(origin.clone(), &cfg);
 			set_balance(&origin, 0);
 
 			let result = super::transfer(
@@ -970,16 +1007,13 @@ mod tests {
 		// is returned from the execution context.
 		let origin = ALICE;
 		let dest = BOB;
-
-		let vm = MockVm::new();
-		let mut loader = MockLoader::empty();
-		let return_ch = loader.insert(
+		let return_ch = MockLoader::insert(
 			|_| Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: vec![1, 2, 3, 4] })
 		);
 
 		ExtBuilder::default().build().execute_with(|| {
 			let cfg = ConfigCache::preload();
-			let mut ctx = ExecutionContext::top_level(origin, &cfg, &vm, &loader);
+			let mut ctx = MockContext::top_level(origin, &cfg);
 			place_contract(&BOB, return_ch);
 
 			let result = ctx.call(
@@ -1001,16 +1035,13 @@ mod tests {
 		// is returned from the execution context.
 		let origin = ALICE;
 		let dest = BOB;
-
-		let vm = MockVm::new();
-		let mut loader = MockLoader::empty();
-		let return_ch = loader.insert(
+		let return_ch = MockLoader::insert(
 			|_| Ok(ExecReturnValue { flags: ReturnFlags::REVERT, data: vec![1, 2, 3, 4] })
 		);
 
 		ExtBuilder::default().build().execute_with(|| {
 			let cfg = ConfigCache::preload();
-			let mut ctx = ExecutionContext::top_level(origin, &cfg, &vm, &loader);
+			let mut ctx = MockContext::top_level(origin, &cfg);
 			place_contract(&BOB, return_ch);
 
 			let result = ctx.call(
@@ -1028,9 +1059,7 @@ mod tests {
 
 	#[test]
 	fn input_data_to_call() {
-		let vm = MockVm::new();
-		let mut loader = MockLoader::empty();
-		let input_data_ch = loader.insert(|ctx| {
+		let input_data_ch = MockLoader::insert(|ctx| {
 			assert_eq!(ctx.input_data, &[1, 2, 3, 4]);
 			exec_success()
 		});
@@ -1038,7 +1067,7 @@ mod tests {
 		// This one tests passing the input data into a contract via call.
 		ExtBuilder::default().build().execute_with(|| {
 			let cfg = ConfigCache::preload();
-			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
+			let mut ctx = MockContext::top_level(ALICE, &cfg);
 			place_contract(&BOB, input_data_ch);
 
 			let result = ctx.call(
@@ -1053,9 +1082,7 @@ mod tests {
 
 	#[test]
 	fn input_data_to_instantiate() {
-		let vm = MockVm::new();
-		let mut loader = MockLoader::empty();
-		let input_data_ch = loader.insert(|ctx| {
+		let input_data_ch = MockLoader::insert(|ctx| {
 			assert_eq!(ctx.input_data, &[1, 2, 3, 4]);
 			exec_success()
 		});
@@ -1063,14 +1090,14 @@ mod tests {
 		// This one tests passing the input data into a contract via instantiate.
 		ExtBuilder::default().build().execute_with(|| {
 			let cfg = ConfigCache::preload();
-			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
+			let mut ctx = MockContext::top_level(ALICE, &cfg);
 
 			set_balance(&ALICE, cfg.subsistence_threshold() * 10);
 
 			let result = ctx.instantiate(
 				cfg.subsistence_threshold() * 3,
 				&mut GasMeter::<Test>::new(GAS_LIMIT),
-				&input_data_ch,
+				MockExecutable::from_storage(input_data_ch, &cfg.schedule).unwrap(),
 				vec![1, 2, 3, 4],
 				&[],
 			);
@@ -1082,35 +1109,36 @@ mod tests {
 	fn max_depth() {
 		// This test verifies that when we reach the maximal depth creation of an
 		// yet another context fails.
+		thread_local! {
+			static REACHED_BOTTOM: RefCell<bool> = RefCell::new(false);
+		}
 		let value = Default::default();
-		let reached_bottom = RefCell::new(false);
-
-		let vm = MockVm::new();
-		let mut loader = MockLoader::empty();
-		let recurse_ch = loader.insert(|ctx| {
+		let recurse_ch = MockLoader::insert(|ctx| {
 			// Try to call into yourself.
 			let r = ctx.ext.call(&BOB, 0, ctx.gas_meter, vec![]);
 
-			let mut reached_bottom = reached_bottom.borrow_mut();
-			if !*reached_bottom {
-				// We are first time here, it means we just reached bottom.
-				// Verify that we've got proper error and set `reached_bottom`.
-				assert_eq!(
-					r,
-					Err(Error::<Test>::MaxCallDepthReached.into())
-				);
-				*reached_bottom = true;
-			} else {
-				// We just unwinding stack here.
-				assert_matches!(r, Ok(_));
-			}
+			REACHED_BOTTOM.with(|reached_bottom| {
+				let mut reached_bottom = reached_bottom.borrow_mut();
+				if !*reached_bottom {
+					// We are first time here, it means we just reached bottom.
+					// Verify that we've got proper error and set `reached_bottom`.
+					assert_eq!(
+						r,
+						Err(Error::<Test>::MaxCallDepthReached.into())
+					);
+					*reached_bottom = true;
+				} else {
+					// We just unwinding stack here.
+					assert_matches!(r, Ok(_));
+				}
+			});
 
 			exec_success()
 		});
 
 		ExtBuilder::default().build().execute_with(|| {
 			let cfg = ConfigCache::preload();
-			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
+			let mut ctx = MockContext::top_level(ALICE, &cfg);
 			set_balance(&BOB, 1);
 			place_contract(&BOB, recurse_ch);
 
@@ -1130,15 +1158,16 @@ mod tests {
 		let origin = ALICE;
 		let dest = BOB;
 
-		let vm = MockVm::new();
-
-		let witnessed_caller_bob = RefCell::new(None::<AccountIdOf<Test>>);
-		let witnessed_caller_charlie = RefCell::new(None::<AccountIdOf<Test>>);
+		thread_local! {
+			static WITNESSED_CALLER_BOB: RefCell<Option<AccountIdOf<Test>>> = RefCell::new(None);
+			static WITNESSED_CALLER_CHARLIE: RefCell<Option<AccountIdOf<Test>>> = RefCell::new(None);
+		}
 
-		let mut loader = MockLoader::empty();
-		let bob_ch = loader.insert(|ctx| {
+		let bob_ch = MockLoader::insert(|ctx| {
 			// Record the caller for bob.
-			*witnessed_caller_bob.borrow_mut() = Some(ctx.ext.caller().clone());
+			WITNESSED_CALLER_BOB.with(|caller|
+				*caller.borrow_mut() = Some(ctx.ext.caller().clone())
+			);
 
 			// Call into CHARLIE contract.
 			assert_matches!(
@@ -1147,16 +1176,18 @@ mod tests {
 			);
 			exec_success()
 		});
-		let charlie_ch = loader.insert(|ctx| {
+		let charlie_ch = MockLoader::insert(|ctx| {
 			// Record the caller for charlie.
-			*witnessed_caller_charlie.borrow_mut() = Some(ctx.ext.caller().clone());
+			WITNESSED_CALLER_CHARLIE.with(|caller|
+				*caller.borrow_mut() = Some(ctx.ext.caller().clone())
+			);
 			exec_success()
 		});
 
 		ExtBuilder::default().build().execute_with(|| {
 			let cfg = ConfigCache::preload();
 
-			let mut ctx = ExecutionContext::top_level(origin.clone(), &cfg, &vm, &loader);
+			let mut ctx = MockContext::top_level(origin.clone(), &cfg);
 			place_contract(&dest, bob_ch);
 			place_contract(&CHARLIE, charlie_ch);
 
@@ -1170,16 +1201,13 @@ mod tests {
 			assert_matches!(result, Ok(_));
 		});
 
-		assert_eq!(&*witnessed_caller_bob.borrow(), &Some(origin));
-		assert_eq!(&*witnessed_caller_charlie.borrow(), &Some(dest));
+		WITNESSED_CALLER_BOB.with(|caller| assert_eq!(*caller.borrow(), Some(origin)));
+		WITNESSED_CALLER_CHARLIE.with(|caller| assert_eq!(*caller.borrow(), Some(dest)));
 	}
 
 	#[test]
 	fn address_returns_proper_values() {
-		let vm = MockVm::new();
-
-		let mut loader = MockLoader::empty();
-		let bob_ch = loader.insert(|ctx| {
+		let bob_ch = MockLoader::insert(|ctx| {
 			// Verify that address matches BOB.
 			assert_eq!(*ctx.ext.address(), BOB);
 
@@ -1190,14 +1218,14 @@ mod tests {
 			);
 			exec_success()
 		});
-		let charlie_ch = loader.insert(|ctx| {
+		let charlie_ch = MockLoader::insert(|ctx| {
 			assert_eq!(*ctx.ext.address(), CHARLIE);
 			exec_success()
 		});
 
 		ExtBuilder::default().build().execute_with(|| {
 			let cfg = ConfigCache::preload();
-			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
+			let mut ctx = MockContext::top_level(ALICE, &cfg);
 			place_contract(&BOB, bob_ch);
 			place_contract(&CHARLIE, charlie_ch);
 
@@ -1214,20 +1242,17 @@ mod tests {
 
 	#[test]
 	fn refuse_instantiate_with_value_below_existential_deposit() {
-		let vm = MockVm::new();
-
-		let mut loader = MockLoader::empty();
-		let dummy_ch = loader.insert(|_| exec_success());
+		let dummy_ch = MockLoader::insert(|_| exec_success());
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
 			let cfg = ConfigCache::preload();
-			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
+			let mut ctx = MockContext::top_level(ALICE, &cfg);
 
 			assert_matches!(
 				ctx.instantiate(
 					0, // <- zero endowment
 					&mut GasMeter::<Test>::new(GAS_LIMIT),
-					&dummy_ch,
+					MockExecutable::from_storage(dummy_ch, &cfg.schedule).unwrap(),
 					vec![],
 					&[],
 				),
@@ -1238,23 +1263,20 @@ mod tests {
 
 	#[test]
 	fn instantiation_work_with_success_output() {
-		let vm = MockVm::new();
-
-		let mut loader = MockLoader::empty();
-		let dummy_ch = loader.insert(
+		let dummy_ch = MockLoader::insert(
 			|_| Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: vec![80, 65, 83, 83] })
 		);
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
 			let cfg = ConfigCache::preload();
-			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
+			let mut ctx = MockContext::top_level(ALICE, &cfg);
 			set_balance(&ALICE, 1000);
 
 			let instantiated_contract_address = assert_matches!(
 				ctx.instantiate(
 					100,
 					&mut GasMeter::<Test>::new(GAS_LIMIT),
-					&dummy_ch,
+					MockExecutable::from_storage(dummy_ch, &cfg.schedule).unwrap(),
 					vec![],
 					&[],
 				),
@@ -1272,23 +1294,20 @@ mod tests {
 
 	#[test]
 	fn instantiation_fails_with_failing_output() {
-		let vm = MockVm::new();
-
-		let mut loader = MockLoader::empty();
-		let dummy_ch = loader.insert(
+		let dummy_ch = MockLoader::insert(
 			|_| Ok(ExecReturnValue { flags: ReturnFlags::REVERT, data: vec![70, 65, 73, 76] })
 		);
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
 			let cfg = ConfigCache::preload();
-			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
+			let mut ctx = MockContext::top_level(ALICE, &cfg);
 			set_balance(&ALICE, 1000);
 
 			let instantiated_contract_address = assert_matches!(
 				ctx.instantiate(
 					100,
 					&mut GasMeter::<Test>::new(GAS_LIMIT),
-					&dummy_ch,
+					MockExecutable::from_storage(dummy_ch, &cfg.schedule).unwrap(),
 					vec![],
 					&[],
 				),
@@ -1303,18 +1322,15 @@ mod tests {
 
 	#[test]
 	fn instantiation_from_contract() {
-		let vm = MockVm::new();
-
-		let mut loader = MockLoader::empty();
-		let dummy_ch = loader.insert(|_| exec_success());
+		let dummy_ch = MockLoader::insert(|_| exec_success());
 		let instantiated_contract_address = Rc::new(RefCell::new(None::<AccountIdOf<Test>>));
-		let instantiator_ch = loader.insert({
+		let instantiator_ch = MockLoader::insert({
 			let dummy_ch = dummy_ch.clone();
 			let instantiated_contract_address = Rc::clone(&instantiated_contract_address);
 			move |ctx| {
 				// Instantiate a contract and save it's address in `instantiated_contract_address`.
 				let (address, output) = ctx.ext.instantiate(
-					&dummy_ch,
+					dummy_ch,
 					ConfigCache::<Test>::subsistence_threshold_uncached() * 3,
 					ctx.gas_meter,
 					vec![],
@@ -1328,7 +1344,7 @@ mod tests {
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
 			let cfg = ConfigCache::preload();
-			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
+			let mut ctx = MockContext::top_level(ALICE, &cfg);
 			set_balance(&ALICE, cfg.subsistence_threshold() * 100);
 			place_contract(&BOB, instantiator_ch);
 
@@ -1350,19 +1366,16 @@ mod tests {
 
 	#[test]
 	fn instantiation_traps() {
-		let vm = MockVm::new();
-
-		let mut loader = MockLoader::empty();
-		let dummy_ch = loader.insert(
+		let dummy_ch = MockLoader::insert(
 			|_| Err("It's a trap!".into())
 		);
-		let instantiator_ch = loader.insert({
+		let instantiator_ch = MockLoader::insert({
 			let dummy_ch = dummy_ch.clone();
 			move |ctx| {
 				// Instantiate a contract and save it's address in `instantiated_contract_address`.
 				assert_matches!(
 					ctx.ext.instantiate(
-						&dummy_ch,
+						dummy_ch,
 						15u64,
 						ctx.gas_meter,
 						vec![],
@@ -1380,7 +1393,7 @@ mod tests {
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
 			let cfg = ConfigCache::preload();
-			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
+			let mut ctx = MockContext::top_level(ALICE, &cfg);
 			set_balance(&ALICE, 1000);
 			set_balance(&BOB, 100);
 			place_contract(&BOB, instantiator_ch);
@@ -1398,11 +1411,7 @@ mod tests {
 
 	#[test]
 	fn termination_from_instantiate_fails() {
-		let vm = MockVm::new();
-
-		let mut loader = MockLoader::empty();
-
-		let terminate_ch = loader.insert(|ctx| {
+		let terminate_ch = MockLoader::insert(|ctx| {
 			ctx.ext.terminate(&ALICE).unwrap();
 			exec_success()
 		});
@@ -1412,18 +1421,18 @@ mod tests {
 			.build()
 			.execute_with(|| {
 				let cfg = ConfigCache::preload();
-				let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
+				let mut ctx = MockContext::top_level(ALICE, &cfg);
 				set_balance(&ALICE, 1000);
 
 				assert_eq!(
 					ctx.instantiate(
 						100,
 						&mut GasMeter::<Test>::new(GAS_LIMIT),
-						&terminate_ch,
+						MockExecutable::from_storage(terminate_ch, &cfg.schedule).unwrap(),
 						vec![],
 						&[],
 					),
-					Err(Error::<Test>::NewContractNotFunded.into())
+					Err(Error::<Test>::NotCallable.into())
 				);
 
 				assert_eq!(
@@ -1435,9 +1444,7 @@ mod tests {
 
 	#[test]
 	fn rent_allowance() {
-		let vm = MockVm::new();
-		let mut loader = MockLoader::empty();
-		let rent_allowance_ch = loader.insert(|ctx| {
+		let rent_allowance_ch = MockLoader::insert(|ctx| {
 			let allowance = ConfigCache::<Test>::subsistence_threshold_uncached() * 3;
 			assert_eq!(ctx.ext.rent_allowance(), <BalanceOf<Test>>::max_value());
 			ctx.ext.set_rent_allowance(allowance);
@@ -1447,13 +1454,13 @@ mod tests {
 
 		ExtBuilder::default().build().execute_with(|| {
 			let cfg = ConfigCache::preload();
-			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
+			let mut ctx = MockContext::top_level(ALICE, &cfg);
 			set_balance(&ALICE, cfg.subsistence_threshold() * 10);
 
 			let result = ctx.instantiate(
 				cfg.subsistence_threshold() * 5,
 				&mut GasMeter::<Test>::new(GAS_LIMIT),
-				&rent_allowance_ch,
+				MockExecutable::from_storage(rent_allowance_ch, &cfg.schedule).unwrap(),
 				vec![],
 				&[],
 			);
diff --git a/frame/contracts/src/gas.rs b/frame/contracts/src/gas.rs
index 9bb6185e558a..4bdfcdd57711 100644
--- a/frame/contracts/src/gas.rs
+++ b/frame/contracts/src/gas.rs
@@ -18,8 +18,9 @@
 use crate::Config;
 use sp_std::marker::PhantomData;
 use sp_runtime::traits::Zero;
-use frame_support::dispatch::{
-	DispatchResultWithPostInfo, PostDispatchInfo, DispatchErrorWithPostInfo,
+use frame_support::{
+	dispatch::{DispatchResultWithPostInfo, PostDispatchInfo, DispatchErrorWithPostInfo},
+	weights::Weight,
 };
 use pallet_contracts_primitives::ExecError;
 
@@ -27,7 +28,7 @@ use pallet_contracts_primitives::ExecError;
 use std::{any::Any, fmt::Debug};
 
 // Gas is essentially the same as weight. It is a 1 to 1 correspondence.
-pub type Gas = frame_support::weights::Weight;
+pub type Gas = Weight;
 
 #[must_use]
 #[derive(Debug, PartialEq, Eq)]
@@ -201,12 +202,15 @@ impl<T: Config> GasMeter<T> {
 	}
 
 	/// Turn this GasMeter into a DispatchResult that contains the actually used gas.
-	pub fn into_dispatch_result<R, E>(self, result: Result<R, E>) -> DispatchResultWithPostInfo
+	pub fn into_dispatch_result<R, E>(
+		self, result: Result<R, E>,
+		base_weight: Weight,
+	) -> DispatchResultWithPostInfo
 	where
 		E: Into<ExecError>,
 	{
 		let post_info = PostDispatchInfo {
-			actual_weight: Some(self.gas_spent()),
+			actual_weight: Some(self.gas_spent().saturating_add(base_weight)),
 			pays_fee: Default::default(),
 		};
 
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index 96ba7b32e259..2dff15a184a6 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -59,10 +59,11 @@
 //!
 //! ### Dispatchable functions
 //!
-//! * `put_code` - Stores the given binary Wasm code into the chain's storage and returns its `code_hash`.
-//! * `instantiate` - Deploys a new contract from the given `code_hash`, optionally transferring some balance.
-//! This instantiates a new smart contract account and calls its contract deploy handler to
-//! initialize the contract.
+//! * `instantiate_with_code` - Deploys a new contract from the supplied wasm binary, optionally transferring
+//! some balance. This instantiates a new smart contract account and calls its contract deploy
+//! handler to initialize the contract.
+//! * `instantiate` - The same as `instantiate_with_code` but instead of uploading new code an
+//! existing `code_hash` is supplied.
 //! * `call` - Makes a call to an account, optionally transferring some balance.
 //!
 //! ## Usage
@@ -98,13 +99,12 @@ mod tests;
 
 pub use crate::{
 	gas::{Gas, GasMeter},
-	wasm::ReturnCode as RuntimeReturnCode,
+	wasm::{ReturnCode as RuntimeReturnCode, PrefabWasmModule},
 	weights::WeightInfo,
 	schedule::{Schedule, HostFnWeights, InstructionWeights, Limits},
 };
 use crate::{
-	exec::ExecutionContext,
-	wasm::{WasmLoader, WasmVm},
+	exec::{ExecutionContext, Executable},
 	rent::Rent,
 	storage::Storage,
 };
@@ -387,7 +387,8 @@ decl_error! {
 		/// The contract that was called is either no contract at all (a plain account)
 		/// or is a tombstone.
 		NotCallable,
-		/// The code supplied to `put_code` exceeds the limit specified in the current schedule.
+		/// The code supplied to `instantiate_with_code` exceeds the limit specified in the
+		/// current schedule.
 		CodeTooLarge,
 		/// No code could be found at the supplied code hash.
 		CodeNotFound,
@@ -431,6 +432,8 @@ decl_error! {
 		/// This can either happen when the accumulated storage in bytes is too large or
 		/// when number of storage items is too large.
 		StorageExhausted,
+		/// A contract with the same AccountId already exists.
+		DuplicateContract,
 	}
 }
 
@@ -528,23 +531,6 @@ decl_module! {
 			Ok(())
 		}
 
-		/// Stores the given binary Wasm code into the chain's storage and returns its `codehash`.
-		/// You can instantiate contracts only with stored code.
-		#[weight = T::WeightInfo::put_code(code.len() as u32 / 1024)]
-		pub fn put_code(
-			origin,
-			code: Vec<u8>
-		) -> DispatchResult {
-			ensure_signed(origin)?;
-			let schedule = <Module<T>>::current_schedule();
-			ensure!(code.len() as u32 <= schedule.limits.code_size, Error::<T>::CodeTooLarge);
-			let result = wasm::save_code::<T>(code, &schedule);
-			if let Ok(code_hash) = result {
-				Self::deposit_event(RawEvent::CodeStored(code_hash));
-			}
-			result.map(|_| ()).map_err(Into::into)
-		}
-
 		/// Makes a call to an account, optionally transferring some balance.
 		///
 		/// * If the account is a smart-contract account, the associated code will be
@@ -563,31 +549,73 @@ decl_module! {
 			let origin = ensure_signed(origin)?;
 			let dest = T::Lookup::lookup(dest)?;
 			let mut gas_meter = GasMeter::new(gas_limit);
-
 			let result = Self::execute_wasm(origin, &mut gas_meter, |ctx, gas_meter| {
 				ctx.call(dest, value, gas_meter, data)
 			});
-			gas_meter.into_dispatch_result(result)
+			gas_meter.into_dispatch_result(result, T::WeightInfo::call())
 		}
 
-		/// Instantiates a new contract from the `code_hash` generated by `put_code`,
-		/// optionally transferring some balance.
+		/// Instantiates a new contract from the supplied `code` optionally transferring
+		/// some balance.
+		///
+		/// This is the only function that can deploy new code to the chain.
 		///
-		/// The supplied `salt` is used for contract address deriviation. See `fn contract_address`.
+		/// # Parameters
+		///
+		/// * `endowment`: The balance to transfer from the `origin` to the newly created contract.
+		/// * `gas_limit`: The gas limit enforced when executing the constructor.
+		/// * `code`: The contract code to deploy in raw bytes.
+		/// * `data`: The input data to pass to the contract constructor.
+		/// * `salt`: Used for the address derivation. See [`Self::contract_address`].
 		///
 		/// Instantiation is executed as follows:
 		///
+		/// - The supplied `code` is instrumented, deployed, and a `code_hash` is created for that code.
+		/// - If the `code_hash` already exists on the chain the underlying `code` will be shared.
 		/// - The destination address is computed based on the sender, code_hash and the salt.
 		/// - The smart-contract account is created at the computed address.
-		/// - The `ctor_code` is executed in the context of the newly-created account. Buffer returned
-		///   after the execution is saved as the `code` of the account. That code will be invoked
-		///   upon any call received by this account.
-		/// - The contract is initialized.
+		/// - The `endowment` is transferred to the new account.
+		/// - The `deploy` function is executed in the context of the newly-created account.
 		#[weight =
-			T::WeightInfo::instantiate(
-				data.len() as u32 / 1024,
+			T::WeightInfo::instantiate_with_code(
+				code.len() as u32 / 1024,
 				salt.len() as u32 / 1024,
-			).saturating_add(*gas_limit)
+			)
+			.saturating_add(*gas_limit)
+		]
+		pub fn instantiate_with_code(
+			origin,
+			#[compact] endowment: BalanceOf<T>,
+			#[compact] gas_limit: Gas,
+			code: Vec<u8>,
+			data: Vec<u8>,
+			salt: Vec<u8>,
+		) -> DispatchResultWithPostInfo {
+			let origin = ensure_signed(origin)?;
+			let schedule = <Module<T>>::current_schedule();
+			let code_len = code.len() as u32;
+			ensure!(code_len <= schedule.limits.code_size, Error::<T>::CodeTooLarge);
+			let mut gas_meter = GasMeter::new(gas_limit);
+			let result = Self::execute_wasm(origin, &mut gas_meter, |ctx, gas_meter| {
+				let executable = PrefabWasmModule::from_code(code, &schedule)?;
+				let result = ctx.instantiate(endowment, gas_meter, executable, data, &salt)
+					.map(|(_address, output)| output)?;
+				Ok(result)
+			});
+			gas_meter.into_dispatch_result(
+				result,
+				T::WeightInfo::instantiate_with_code(code_len / 1024, salt.len() as u32 / 1024)
+			)
+		}
+
+		/// Instantiates a contract from a previously deployed wasm binary.
+		///
+		/// This function is identical to [`Self::instantiate_with_code`] but without the
+		/// code deployment step. Instead, the `code_hash` of an on-chain deployed wasm binary
+		/// must be supplied.
+		#[weight =
+			T::WeightInfo::instantiate(salt.len() as u32 / 1024)
+			.saturating_add(*gas_limit)
 		]
 		pub fn instantiate(
 			origin,
@@ -599,12 +627,16 @@ decl_module! {
 		) -> DispatchResultWithPostInfo {
 			let origin = ensure_signed(origin)?;
 			let mut gas_meter = GasMeter::new(gas_limit);
-
 			let result = Self::execute_wasm(origin, &mut gas_meter, |ctx, gas_meter| {
-				ctx.instantiate(endowment, gas_meter, &code_hash, data, &salt)
-					.map(|(_address, output)| output)
+				let executable = PrefabWasmModule::from_storage(code_hash, &ctx.config.schedule)?;
+				let result = ctx.instantiate(endowment, gas_meter, executable, data, &salt)
+					.map(|(_address, output)| output)?;
+				Ok(result)
 			});
-			gas_meter.into_dispatch_result(result)
+			gas_meter.into_dispatch_result(
+				result,
+				T::WeightInfo::instantiate(salt.len() as u32 / 1024)
+			)
 		}
 
 		/// Allows block producers to claim a small reward for evicting a contract. If a block
@@ -643,7 +675,9 @@ decl_module! {
 			};
 
 			// If poking the contract has lead to eviction of the contract, give out the rewards.
-			if let Some(rent_payed) = Rent::<T>::try_eviction(&dest, handicap)? {
+			if let Some(rent_payed) =
+				Rent::<T, PrefabWasmModule<T>>::try_eviction(&dest, handicap)?
+			{
 				T::Currency::deposit_into_existing(
 					&rewarded,
 					T::SurchargeReward::get().min(rent_payed),
@@ -698,15 +732,15 @@ where
 	}
 
 	pub fn rent_projection(address: T::AccountId) -> RentProjectionResult<T::BlockNumber> {
-		Rent::<T>::compute_projection(&address)
+		Rent::<T, PrefabWasmModule<T>>::compute_projection(&address)
 	}
 
-	/// Put code for benchmarks which does not check or instrument the code.
+	/// Store code for benchmarks which does not check nor instrument the code.
 	#[cfg(feature = "runtime-benchmarks")]
-	pub fn put_code_raw(code: Vec<u8>) -> DispatchResult {
+	pub fn store_code_raw(code: Vec<u8>) -> DispatchResult {
 		let schedule = <Module<T>>::current_schedule();
-		let result = wasm::save_code_raw::<T>(code, &schedule);
-		result.map(|_| ()).map_err(Into::into)
+		PrefabWasmModule::store_code_unchecked(code, &schedule)?;
+		Ok(())
 	}
 
 	/// Determine the address of a contract,
@@ -739,12 +773,13 @@ where
 	fn execute_wasm(
 		origin: T::AccountId,
 		gas_meter: &mut GasMeter<T>,
-		func: impl FnOnce(&mut ExecutionContext<T, WasmVm<T>, WasmLoader<T>>, &mut GasMeter<T>) -> ExecResult,
+		func: impl FnOnce(
+			&mut ExecutionContext<T, PrefabWasmModule<T>>,
+			&mut GasMeter<T>,
+		) -> ExecResult,
 	) -> ExecResult {
 		let cfg = ConfigCache::preload();
-		let vm = WasmVm::new(&cfg.schedule);
-		let loader = WasmLoader::new(&cfg.schedule);
-		let mut ctx = ExecutionContext::top_level(origin, &cfg, &vm, &loader);
+		let mut ctx = ExecutionContext::top_level(origin, &cfg);
 		func(&mut ctx, gas_meter)
 	}
 }
@@ -807,6 +842,12 @@ decl_event! {
 		/// - `data`: Data supplied by the contract. Metadata generated during contract
 		///           compilation is needed to decode it.
 		ContractEmitted(AccountId, Vec<u8>),
+
+		/// A code with the specified hash was removed.
+		/// \[code_hash\]
+		///
+		/// This happens when the last contract that uses this code hash was removed or evicted.
+		CodeRemoved(Hash),
 	}
 }
 
@@ -820,7 +861,7 @@ decl_storage! {
 		/// A mapping from an original code hash to the original code, untouched by instrumentation.
 		pub PristineCode: map hasher(identity) CodeHash<T> => Option<Vec<u8>>;
 		/// A mapping between an original code hash and instrumented wasm code, ready for execution.
-		pub CodeStorage: map hasher(identity) CodeHash<T> => Option<wasm::PrefabWasmModule>;
+		pub CodeStorage: map hasher(identity) CodeHash<T> => Option<PrefabWasmModule<T>>;
 		/// The subtrie counter.
 		pub AccountCounter: u64 = 0;
 		/// The code associated with a given account.
diff --git a/frame/contracts/src/rent.rs b/frame/contracts/src/rent.rs
index 2075f6f757de..145e6639c608 100644
--- a/frame/contracts/src/rent.rs
+++ b/frame/contracts/src/rent.rs
@@ -20,7 +20,7 @@
 use crate::{
 	AliveContractInfo, BalanceOf, ContractInfo, ContractInfoOf, Module, RawEvent,
 	TombstoneContractInfo, Config, CodeHash, ConfigCache, Error,
-	storage::Storage,
+	storage::Storage, wasm::PrefabWasmModule, exec::Executable,
 };
 use sp_std::prelude::*;
 use sp_io::hashing::blake2_256;
@@ -86,12 +86,13 @@ enum Verdict<T: Config> {
 	Charge { amount: OutstandingAmount<T> },
 }
 
-pub struct Rent<T>(sp_std::marker::PhantomData<T>);
+pub struct Rent<T, E>(sp_std::marker::PhantomData<(T, E)>);
 
-impl<T> Rent<T>
+impl<T, E> Rent<T, E>
 where
 	T: Config,
-	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
+	E: Executable<T>,
 {
 	/// Returns a fee charged per block from the contract.
 	///
@@ -99,10 +100,11 @@ where
 	/// then the fee can drop to zero.
 	fn compute_fee_per_block(
 		free_balance: &BalanceOf<T>,
-		contract: &AliveContractInfo<T>
+		contract: &AliveContractInfo<T>,
+		code_size_share: u32,
 	) -> BalanceOf<T> {
 		let uncovered_by_balance = T::DepositPerStorageByte::get()
-			.saturating_mul(contract.storage_size.into())
+			.saturating_mul(contract.storage_size.saturating_add(code_size_share).into())
 			.saturating_add(
 				T::DepositPerStorageItem::get()
 					.saturating_mul(contract.pair_count.into())
@@ -148,6 +150,7 @@ where
 		current_block_number: T::BlockNumber,
 		handicap: T::BlockNumber,
 		contract: &AliveContractInfo<T>,
+		code_size: u32,
 	) -> Verdict<T> {
 		// How much block has passed since the last deduction for the contract.
 		let blocks_passed = {
@@ -164,7 +167,7 @@ where
 		let free_balance = T::Currency::free_balance(account);
 
 		// An amount of funds to charge per block for storage taken up by the contract.
-		let fee_per_block = Self::compute_fee_per_block(&free_balance, contract);
+		let fee_per_block = Self::compute_fee_per_block(&free_balance, contract, code_size);
 		if fee_per_block.is_zero() {
 			// The rent deposit offset reduced the fee to 0. This means that the contract
 			// gets the rent for free.
@@ -228,19 +231,22 @@ where
 	/// Enacts the given verdict and returns the updated `ContractInfo`.
 	///
 	/// `alive_contract_info` should be from the same address as `account`.
+	///
+	/// # Note
+	///
+	/// if `evictable_code` is `None` an `Evict` verdict will not be enacted. This is for
+	/// when calling this function during a `call` where access to the soon to be evicted
+	/// contract should be denied but storage should be left unmodified.
 	fn enact_verdict(
 		account: &T::AccountId,
 		alive_contract_info: AliveContractInfo<T>,
 		current_block_number: T::BlockNumber,
 		verdict: Verdict<T>,
-		allow_eviction: bool,
-	) -> Result<Option<ContractInfo<T>>, DispatchError> {
-		match verdict {
-			Verdict::Exempt => return Ok(Some(ContractInfo::Alive(alive_contract_info))),
-			Verdict::Evict { amount: _ } if !allow_eviction => {
-				Ok(None)
-			}
-			Verdict::Evict { amount } => {
+		evictable_code: Option<PrefabWasmModule<T>>,
+	) -> Result<Option<AliveContractInfo<T>>, DispatchError> {
+		match (verdict, evictable_code) {
+			(Verdict::Exempt, _) => return Ok(Some(alive_contract_info)),
+			(Verdict::Evict { amount }, Some(code)) => {
 				// We need to remove the trie first because it is the only operation
 				// that can fail and this function is called without a storage
 				// transaction when called through `claim_surcharge`.
@@ -261,19 +267,23 @@ where
 				);
 				let tombstone_info = ContractInfo::Tombstone(tombstone);
 				<ContractInfoOf<T>>::insert(account, &tombstone_info);
+				code.drop_from_storage();
 				<Module<T>>::deposit_event(RawEvent::Evicted(account.clone()));
-				Ok(Some(tombstone_info))
+				Ok(None)
+			}
+			(Verdict::Evict { amount: _ }, None) => {
+				Ok(None)
 			}
-			Verdict::Charge { amount } => {
-				let contract_info = ContractInfo::Alive(AliveContractInfo::<T> {
+			(Verdict::Charge { amount }, _) => {
+				let contract = ContractInfo::Alive(AliveContractInfo::<T> {
 					rent_allowance: alive_contract_info.rent_allowance - amount.peek(),
 					deduct_block: current_block_number,
 					rent_payed: alive_contract_info.rent_payed.saturating_add(amount.peek()),
 					..alive_contract_info
 				});
-				<ContractInfoOf<T>>::insert(account, &contract_info);
+				<ContractInfoOf<T>>::insert(account, &contract);
 				amount.withdraw(account);
-				Ok(Some(contract_info))
+				Ok(Some(contract.get_alive().expect("We just constructed it as alive. qed")))
 			}
 		}
 	}
@@ -283,21 +293,20 @@ where
 	/// This functions does **not** evict the contract. It returns `None` in case the
 	/// contract is in need of eviction. [`try_eviction`] must
 	/// be called to perform the eviction.
-	pub fn charge(account: &T::AccountId) -> Result<Option<ContractInfo<T>>, DispatchError> {
-		let contract_info = <ContractInfoOf<T>>::get(account);
-		let alive_contract_info = match contract_info {
-			None | Some(ContractInfo::Tombstone(_)) => return Ok(contract_info),
-			Some(ContractInfo::Alive(contract)) => contract,
-		};
-
+	pub fn charge(
+		account: &T::AccountId,
+		contract: AliveContractInfo<T>,
+		code_size: u32,
+	) -> Result<Option<AliveContractInfo<T>>, DispatchError> {
 		let current_block_number = <frame_system::Module<T>>::block_number();
 		let verdict = Self::consider_case(
 			account,
 			current_block_number,
 			Zero::zero(),
-			&alive_contract_info,
+			&contract,
+			code_size,
 		);
-		Self::enact_verdict(account, alive_contract_info, current_block_number, verdict, false)
+		Self::enact_verdict(account, contract, current_block_number, verdict, None)
 	}
 
 	/// Process a report that a contract under the given address should be evicted.
@@ -322,12 +331,14 @@ where
 			None | Some(ContractInfo::Tombstone(_)) => return Ok(None),
 			Some(ContractInfo::Alive(contract)) => contract,
 		};
+		let module = PrefabWasmModule::<T>::from_storage_noinstr(contract.code_hash)?;
 		let current_block_number = <frame_system::Module<T>>::block_number();
 		let verdict = Self::consider_case(
 			account,
 			current_block_number,
 			handicap,
 			&contract,
+			module.occupied_storage(),
 		);
 
 		// Enact the verdict only if the contract gets removed.
@@ -339,7 +350,9 @@ where
 					.map(|a| a.peek())
 					.unwrap_or_else(|| <BalanceOf<T>>::zero())
 					.saturating_add(contract.rent_payed);
-				Self::enact_verdict(account, contract, current_block_number, verdict, true)?;
+				Self::enact_verdict(
+					account, contract, current_block_number, verdict, Some(module),
+				)?;
 				Ok(Some(rent_payed))
 			}
 			_ => Ok(None),
@@ -367,26 +380,33 @@ where
 			None | Some(ContractInfo::Tombstone(_)) => return Err(IsTombstone),
 			Some(ContractInfo::Alive(contract)) => contract,
 		};
+		let module = PrefabWasmModule::from_storage_noinstr(alive_contract_info.code_hash)
+			.map_err(|_| IsTombstone)?;
+		let code_size = module.occupied_storage();
 		let current_block_number = <frame_system::Module<T>>::block_number();
 		let verdict = Self::consider_case(
 			account,
 			current_block_number,
 			Zero::zero(),
 			&alive_contract_info,
+			code_size,
+		);
+		let new_contract_info = Self::enact_verdict(
+			account, alive_contract_info, current_block_number, verdict, Some(module),
 		);
-		let new_contract_info =
-			Self::enact_verdict(account, alive_contract_info, current_block_number, verdict, false);
 
 		// Check what happened after enaction of the verdict.
 		let alive_contract_info = match new_contract_info.map_err(|_| IsTombstone)? {
-			None | Some(ContractInfo::Tombstone(_)) => return Err(IsTombstone),
-			Some(ContractInfo::Alive(contract)) => contract,
+			None => return Err(IsTombstone),
+			Some(contract) => contract,
 		};
 
 		// Compute how much would the fee per block be with the *updated* balance.
 		let total_balance = T::Currency::total_balance(account);
 		let free_balance = T::Currency::free_balance(account);
-		let fee_per_block = Self::compute_fee_per_block(&free_balance, &alive_contract_info);
+		let fee_per_block = Self::compute_fee_per_block(
+			&free_balance, &alive_contract_info, code_size,
+		);
 		if fee_per_block.is_zero() {
 			return Ok(RentProjection::NoEviction);
 		}
@@ -418,6 +438,7 @@ where
 	/// Restores the destination account using the origin as prototype.
 	///
 	/// The restoration will be performed iff:
+	/// - the supplied code_hash does still exist on-chain
 	/// - origin exists and is alive,
 	/// - the origin's storage is not written in the current block
 	/// - the restored account has tombstone
@@ -455,6 +476,9 @@ where
 			origin_contract.last_write
 		};
 
+		// Fails if the code hash does not exist on chain
+		E::add_user(code_hash)?;
+
 		// We are allowed to eagerly modify storage even though the function can
 		// fail later due to tombstones not matching. This is because the restoration
 		// is always called from a contract and therefore in a storage transaction.
@@ -483,6 +507,7 @@ where
 		origin_contract.storage_size -= bytes_taken;
 
 		<ContractInfoOf<T>>::remove(&origin);
+		E::remove_user(origin_contract.code_hash);
 		<ContractInfoOf<T>>::insert(&dest, ContractInfo::Alive(AliveContractInfo::<T> {
 			trie_id: origin_contract.trie_id,
 			storage_size: origin_contract.storage_size,
diff --git a/frame/contracts/src/schedule.rs b/frame/contracts/src/schedule.rs
index 63e3f3c28589..3580fa2aae20 100644
--- a/frame/contracts/src/schedule.rs
+++ b/frame/contracts/src/schedule.rs
@@ -106,7 +106,7 @@ pub struct Limits {
 	pub subject_len: u32,
 
 	/// The maximum length of a contract code in bytes. This limit applies to the uninstrumented
-	/// and pristine form of the code as supplied to `put_code`.
+	/// and pristine form of the code as supplied to `instantiate_with_code`.
 	pub code_size: u32,
 }
 
diff --git a/frame/contracts/src/storage.rs b/frame/contracts/src/storage.rs
index 5259b2a47126..2a2d5da225d6 100644
--- a/frame/contracts/src/storage.rs
+++ b/frame/contracts/src/storage.rs
@@ -164,29 +164,28 @@ where
 		account: &AccountIdOf<T>,
 		trie_id: TrieId,
 		ch: CodeHash<T>,
-	) -> Result<(), &'static str> {
-		<ContractInfoOf<T>>::mutate(account, |maybe_contract_info| {
-			if maybe_contract_info.is_some() {
-				return Err("Alive contract or tombstone already exists");
+	) -> DispatchResult {
+		<ContractInfoOf<T>>::try_mutate(account, |existing| {
+			if existing.is_some() {
+				return Err(Error::<T>::DuplicateContract.into());
 			}
 
-			*maybe_contract_info = Some(
-				AliveContractInfo::<T> {
-					code_hash: ch,
-					storage_size: 0,
-					trie_id,
-					deduct_block:
-						// We want to charge rent for the first block in advance. Therefore we
-						// treat the contract as if it was created in the last block and then
-						// charge rent for it during instantiation.
-						<frame_system::Module<T>>::block_number().saturating_sub(1u32.into()),
-					rent_allowance: <BalanceOf<T>>::max_value(),
-					rent_payed: <BalanceOf<T>>::zero(),
-					pair_count: 0,
-					last_write: None,
-				}
-				.into(),
-			);
+			let contract = AliveContractInfo::<T> {
+				code_hash: ch,
+				storage_size: 0,
+				trie_id,
+				deduct_block:
+					// We want to charge rent for the first block in advance. Therefore we
+					// treat the contract as if it was created in the last block and then
+					// charge rent for it during instantiation.
+					<frame_system::Module<T>>::block_number().saturating_sub(1u32.into()),
+				rent_allowance: <BalanceOf<T>>::max_value(),
+				rent_payed: <BalanceOf<T>>::zero(),
+				pair_count: 0,
+				last_write: None,
+			};
+
+			*existing = Some(contract.into());
 
 			Ok(())
 		})
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index 448df5b0de0f..d80de6a5116c 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -23,7 +23,7 @@ use crate::{
 		Result as ExtensionResult, Environment, ChainExtension, Ext, SysConfig, RetVal,
 		UncheckedFrom, InitState, ReturnFlags,
 	},
-	exec::AccountIdOf,
+	exec::{AccountIdOf, Executable}, wasm::PrefabWasmModule,
 };
 use assert_matches::assert_matches;
 use codec::Encode;
@@ -42,6 +42,7 @@ use frame_support::{
 	storage::child,
 };
 use frame_system::{self as system, EventRecord, Phase};
+use pretty_assertions::assert_eq;
 
 mod contracts {
 	// Re-export contents of the root. This basically
@@ -92,7 +93,7 @@ pub mod test_utils {
 	pub fn place_contract(address: &AccountIdOf<Test>, code_hash: CodeHash<Test>) {
 		let trie_id = Storage::<Test>::generate_trie_id(address);
 		set_balance(address, ConfigCache::<Test>::subsistence_threshold_uncached() * 10);
-		Storage::<Test>::place_contract(&address, trie_id, code_hash).unwrap()
+		Storage::<Test>::place_contract(&address, trie_id, code_hash).unwrap();
 	}
 	pub fn set_balance(who: &AccountIdOf<Test>, amount: u64) {
 		let imbalance = Balances::deposit_creating(who, amount);
@@ -107,6 +108,14 @@ pub mod test_utils {
 			assert_eq!(u32::from_le_bytes($x.data[..].try_into().unwrap()), $y as u32);
 		}}
 	}
+	macro_rules! assert_refcount {
+		( $code_hash:expr , $should:expr $(,)? ) => {{
+			let is = crate::CodeStorage::<Test>::get($code_hash)
+				.map(|m| m.refcount())
+				.unwrap_or(0);
+			assert_eq!(is, $should);
+		}}
+	}
 }
 
 thread_local! {
@@ -352,12 +361,12 @@ where
 
 // Perform a call to a plain account.
 // The actual transfer fails because we can only call contracts.
-// Then we check that no gas was used because the base costs for calling are either charged
-// as part of the `call` extrinsic or by `seal_call`.
+// Then we check that at least the base costs where charged (no runtime gas costs.)
 #[test]
 fn calling_plain_account_fails() {
 	ExtBuilder::default().build().execute_with(|| {
 		let _ = Balances::deposit_creating(&ALICE, 100_000_000);
+		let base_cost = <<Test as crate::Config>::WeightInfo as crate::WeightInfo>::call();
 
 		assert_eq!(
 			Contracts::call(Origin::signed(ALICE), BOB, 0, GAS_LIMIT, Vec::new()),
@@ -365,7 +374,7 @@ fn calling_plain_account_fails() {
 				DispatchErrorWithPostInfo {
 					error: Error::<Test>::NotCallable.into(),
 					post_info: PostDispatchInfo {
-						actual_weight: Some(0),
+						actual_weight: Some(base_cost),
 						pays_fee: Default::default(),
 					},
 				}
@@ -460,20 +469,18 @@ fn instantiate_and_call_and_deposit_event() {
 			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
 			let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
 
-			assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm));
-
 			// Check at the end to get hash on error easily
-			let creation = Contracts::instantiate(
+			let creation = Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
-				subsistence * 3,
+				subsistence * 100,
 				GAS_LIMIT,
-				code_hash.into(),
+				wasm,
 				vec![],
 				vec![],
 			);
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
-			pretty_assertions::assert_eq!(System::events(), vec![
+			assert_eq!(System::events(), vec![
 				EventRecord {
 					phase: Phase::Initialization,
 					event: MetaEvent::system(frame_system::Event::NewAccount(ALICE.clone())),
@@ -488,26 +495,26 @@ fn instantiate_and_call_and_deposit_event() {
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::contracts(RawEvent::CodeStored(code_hash.into())),
+					event: MetaEvent::system(frame_system::Event::NewAccount(addr.clone())),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::system(frame_system::Event::NewAccount(addr.clone())),
+					event: MetaEvent::balances(
+						pallet_balances::RawEvent::Endowed(addr.clone(), subsistence * 100)
+					),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
 					event: MetaEvent::balances(
-						pallet_balances::RawEvent::Endowed(addr.clone(), subsistence * 3)
+						pallet_balances::RawEvent::Transfer(ALICE, addr.clone(), subsistence * 100)
 					),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::balances(
-						pallet_balances::RawEvent::Transfer(ALICE, addr.clone(), subsistence * 3)
-					),
+					event: MetaEvent::contracts(RawEvent::CodeStored(code_hash.into())),
 					topics: vec![],
 				},
 				EventRecord {
@@ -521,7 +528,7 @@ fn instantiate_and_call_and_deposit_event() {
 					phase: Phase::Initialization,
 					event: MetaEvent::contracts(RawEvent::Instantiated(ALICE, addr.clone())),
 					topics: vec![],
-				}
+				},
 			]);
 
 			assert_ok!(creation);
@@ -539,31 +546,16 @@ fn deposit_event_max_value_limit() {
 		.execute_with(|| {
 			// Create
 			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm));
-			assert_ok!(Contracts::instantiate(
+			assert_ok!(Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
 				30_000,
 				GAS_LIMIT,
-				code_hash.into(),
+				wasm,
 				vec![],
 				vec![],
 			));
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
-			// The instantiation deducted the rent for one block immediately
-			let first_rent = <Test as Config>::RentFraction::get()
-				// base_deposit - free_balance
-				.mul_ceil(80_000 - 30_000)
-				// blocks to rent
-				* 1;
-
-			// Check creation
-			let bob_contract = ContractInfoOf::<Test>::get(addr.clone())
-				.unwrap()
-				.get_alive()
-				.unwrap();
-			assert_eq!(bob_contract.rent_allowance, <BalanceOf<Test>>::max_value() - first_rent);
-
 			// Call contract with allowed storage value.
 			assert_ok!(Contracts::call(
 				Origin::signed(ALICE),
@@ -590,6 +582,7 @@ fn deposit_event_max_value_limit() {
 #[test]
 fn run_out_of_gas() {
 	let (wasm, code_hash) = compile_module::<Test>("run_out_of_gas").unwrap();
+	let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
 
 	ExtBuilder::default()
 		.existential_deposit(50)
@@ -597,13 +590,11 @@ fn run_out_of_gas() {
 		.execute_with(|| {
 			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
 
-			assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm));
-
-			assert_ok!(Contracts::instantiate(
+			assert_ok!(Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
-				100,
+				100 * subsistence,
 				GAS_LIMIT,
-				code_hash.into(),
+				wasm,
 				vec![],
 				vec![],
 			));
@@ -636,43 +627,6 @@ mod call {
 	pub fn null() -> Vec<u8> { 3u32.to_le_bytes().to_vec() }
 }
 
-/// Test correspondence of set_rent code and its hash.
-/// Also test that encoded extrinsic in code correspond to the correct transfer
-#[test]
-fn test_set_rent_code_and_hash() {
-	let (wasm, code_hash) = compile_module::<Test>("set_rent").unwrap();
-
-	ExtBuilder::default()
-		.existential_deposit(50)
-		.build()
-		.execute_with(|| {
-			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm));
-
-			// If you ever need to update the wasm source this test will fail
-			// and will show you the actual hash.
-			assert_eq!(System::events(), vec![
-				EventRecord {
-					phase: Phase::Initialization,
-					event: MetaEvent::system(frame_system::Event::NewAccount(ALICE)),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: MetaEvent::balances(pallet_balances::RawEvent::Endowed(
-						ALICE, 1_000_000
-					)),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: MetaEvent::contracts(RawEvent::CodeStored(code_hash.into())),
-					topics: vec![],
-				},
-			]);
-		});
-}
-
 #[test]
 fn storage_size() {
 	let (wasm, code_hash) = compile_module::<Test>("set_rent").unwrap();
@@ -684,13 +638,13 @@ fn storage_size() {
 		.execute_with(|| {
 			// Create
 			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm));
-			assert_ok!(Contracts::instantiate(
+			assert_ok!(Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
 				30_000,
 				GAS_LIMIT,
-				code_hash.into(),
-				<Test as pallet_balances::Config>::Balance::from(1_000u32).encode(), // rent allowance
+				wasm,
+				// rent_allowance
+				<Test as pallet_balances::Config>::Balance::from(10_000u32).encode(),
 				vec![],
 			));
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
@@ -757,12 +711,11 @@ fn empty_kv_pairs() {
 		.build()
 		.execute_with(|| {
 			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm));
-			assert_ok!(Contracts::instantiate(
+			assert_ok!(Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
 				30_000,
 				GAS_LIMIT,
-				code_hash.into(),
+				wasm,
 				vec![],
 				vec![],
 			));
@@ -795,6 +748,8 @@ fn initialize_block(number: u64) {
 #[test]
 fn deduct_blocks() {
 	let (wasm, code_hash) = compile_module::<Test>("set_rent").unwrap();
+	let endowment: BalanceOf<Test> = 100_000;
+	let allowance: BalanceOf<Test> = 70_000;
 
 	ExtBuilder::default()
 		.existential_deposit(50)
@@ -802,27 +757,33 @@ fn deduct_blocks() {
 		.execute_with(|| {
 			// Create
 			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm));
-			assert_ok!(Contracts::instantiate(
+			assert_ok!(Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
-				30_000,
-				GAS_LIMIT, code_hash.into(),
-				<Test as pallet_balances::Config>::Balance::from(1_000u32).encode(), // rent allowance
+				endowment,
+				GAS_LIMIT,
+				wasm,
+				allowance.encode(),
 				vec![],
 			));
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
-			ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
+			let contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
+			let code_len: BalanceOf<Test> =
+				PrefabWasmModule::<Test>::from_storage_noinstr(contract.code_hash)
+					.unwrap()
+					.occupied_storage()
+					.into();
 
 			// The instantiation deducted the rent for one block immediately
 			let rent0 = <Test as Config>::RentFraction::get()
-				// base_deposit + deploy_set_storage (4 bytes in 1 item) - free_balance
-				.mul_ceil(80_000 + 40_000 + 10_000 - 30_000)
+				// (base_deposit(8) + bytes in storage(4) + size of code) * byte_price
+				// + 1 storage item (10_000) - free_balance
+				.mul_ceil((8 + 4 + code_len) * 10_000 + 10_000 - endowment)
 				// blocks to rent
 				* 1;
-			let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
-			assert_eq!(bob_contract.rent_allowance, 1_000 - rent0);
-			assert_eq!(bob_contract.deduct_block, 1);
-			assert_eq!(Balances::free_balance(&addr), 30_000 - rent0);
+			assert!(rent0 > 0);
+			assert_eq!(contract.rent_allowance, allowance - rent0);
+			assert_eq!(contract.deduct_block, 1);
+			assert_eq!(Balances::free_balance(&addr), endowment - rent0);
 
 			// Advance 4 blocks
 			initialize_block(5);
@@ -834,17 +795,15 @@ fn deduct_blocks() {
 
 			// Check result
 			let rent = <Test as Config>::RentFraction::get()
-				// base_deposit + deploy_set_storage (4 bytes in 1 item) - free_balance
-				.mul_ceil(80_000 + 40_000 + 10_000 - (30_000 - rent0))
-				// blocks to rent
+				.mul_ceil((8 + 4 + code_len) * 10_000 + 10_000 - (endowment - rent0))
 				* 4;
-			let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
-			assert_eq!(bob_contract.rent_allowance, 1_000 - rent0 - rent);
-			assert_eq!(bob_contract.deduct_block, 5);
-			assert_eq!(Balances::free_balance(&addr), 30_000 - rent0 - rent);
+			let contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
+			assert_eq!(contract.rent_allowance, allowance - rent0 - rent);
+			assert_eq!(contract.deduct_block, 5);
+			assert_eq!(Balances::free_balance(&addr), endowment - rent0 - rent);
 
-			// Advance 7 blocks more
-			initialize_block(12);
+			// Advance 2 blocks more
+			initialize_block(7);
 
 			// Trigger rent through call
 			assert_ok!(
@@ -853,23 +812,21 @@ fn deduct_blocks() {
 
 			// Check result
 			let rent_2 = <Test as Config>::RentFraction::get()
-				// base_deposit + deploy_set_storage (4 bytes in 1 item) - free_balance
-				.mul_ceil(80_000 + 40_000 + 10_000 - (30_000 - rent0 - rent))
-				// blocks to rent
-				* 7;
-			let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
-			assert_eq!(bob_contract.rent_allowance, 1_000 - rent0 - rent - rent_2);
-			assert_eq!(bob_contract.deduct_block, 12);
-			assert_eq!(Balances::free_balance(&addr), 30_000 - rent0 - rent - rent_2);
+				.mul_ceil((8 + 4 + code_len) * 10_000 + 10_000 - (endowment - rent0 - rent))
+				* 2;
+			let contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
+			assert_eq!(contract.rent_allowance, allowance - rent0 - rent - rent_2);
+			assert_eq!(contract.deduct_block, 7);
+			assert_eq!(Balances::free_balance(&addr), endowment - rent0 - rent - rent_2);
 
 			// Second call on same block should have no effect on rent
 			assert_ok!(
 				Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, call::null())
 			);
-			let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
-			assert_eq!(bob_contract.rent_allowance, 1_000 - rent0 - rent - rent_2);
-			assert_eq!(bob_contract.deduct_block, 12);
-			assert_eq!(Balances::free_balance(&addr), 30_000 - rent0 - rent - rent_2)
+			let contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
+			assert_eq!(contract.rent_allowance, allowance - rent0 - rent - rent_2);
+			assert_eq!(contract.deduct_block, 7);
+			assert_eq!(Balances::free_balance(&addr), endowment - rent0 - rent - rent_2)
 		});
 }
 
@@ -886,16 +843,16 @@ fn signed_claim_surcharge_contract_removals() {
 #[test]
 fn claim_surcharge_malus() {
 	// Test surcharge malus for inherent
-	claim_surcharge(27, |addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(), true);
-	claim_surcharge(26, |addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(), true);
-	claim_surcharge(25, |addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(), true);
-	claim_surcharge(24, |addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(), false);
+	claim_surcharge(9, |addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(), true);
+	claim_surcharge(8, |addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(), true);
+	claim_surcharge(7, |addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(), true);
+	claim_surcharge(6, |addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(), false);
 
 	// Test surcharge malus for signed
-	claim_surcharge(27, |addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(), true);
-	claim_surcharge(26, |addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(), false);
-	claim_surcharge(25, |addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(), false);
-	claim_surcharge(24, |addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(), false);
+	claim_surcharge(9, |addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(), true);
+	claim_surcharge(8, |addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(), false);
+	claim_surcharge(7, |addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(), false);
+	claim_surcharge(6, |addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(), false);
 }
 
 /// Claim surcharge with the given trigger_call at the given blocks.
@@ -909,12 +866,12 @@ fn claim_surcharge(blocks: u64, trigger_call: impl Fn(AccountIdOf<Test>) -> bool
 		.execute_with(|| {
 			// Create
 			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm));
-			assert_ok!(Contracts::instantiate(
+			assert_ok!(Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
-				30_000,
-				GAS_LIMIT, code_hash.into(),
-				<Test as pallet_balances::Config>::Balance::from(1_000u32).encode(), // rent allowance
+				100_000,
+				GAS_LIMIT,
+				wasm,
+				<Test as pallet_balances::Config>::Balance::from(30_000u32).encode(), // rent allowance
 				vec![],
 			));
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
@@ -948,12 +905,12 @@ fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
 		.execute_with(|| {
 			// Create
 			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm.clone()));
-			assert_ok!(Contracts::instantiate(
+			assert_ok!(Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
-				500,
-				GAS_LIMIT, code_hash.into(),
-				<Test as pallet_balances::Config>::Balance::from(1_000u32).encode(), // rent allowance
+				70_000,
+				GAS_LIMIT,
+				wasm.clone(),
+				<Test as pallet_balances::Config>::Balance::from(100_000u32).encode(), // rent allowance
 				vec![],
 			));
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
@@ -995,13 +952,12 @@ fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
 		.execute_with(|| {
 			// Create
 			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm.clone()));
-			assert_ok!(Contracts::instantiate(
+			assert_ok!(Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
-				30_000,
+				100_000,
 				GAS_LIMIT,
-				code_hash.into(),
-				<Test as pallet_balances::Config>::Balance::from(1000u32).encode(), // rent allowance
+				wasm.clone(),
+				<Test as pallet_balances::Config>::Balance::from(70_000u32).encode(), // rent allowance
 				vec![],
 			));
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
@@ -1031,7 +987,7 @@ fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
 				.get_tombstone()
 				.is_some());
 			// Balance should be initial balance - initial rent_allowance
-			assert_eq!(Balances::free_balance(&addr), 29000);
+			assert_eq!(Balances::free_balance(&addr), 30_000);
 
 			// Advance blocks
 			initialize_block(20);
@@ -1042,7 +998,7 @@ fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
 				.unwrap()
 				.get_tombstone()
 				.is_some());
-			assert_eq!(Balances::free_balance(&addr), 29000);
+			assert_eq!(Balances::free_balance(&addr), 30_000);
 		});
 
 	// Balance reached and inferior to subsistence threshold
@@ -1051,15 +1007,14 @@ fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
 		.build()
 		.execute_with(|| {
 			// Create
-			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
 			let subsistence_threshold = ConfigCache::<Test>::subsistence_threshold_uncached();
-			assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm.clone()));
-			assert_ok!(Contracts::instantiate(
+			let _ = Balances::deposit_creating(&ALICE, subsistence_threshold * 1000);
+			assert_ok!(Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
-				subsistence_threshold * 3,
+				subsistence_threshold * 100,
 				GAS_LIMIT,
-				code_hash.into(),
-				<Test as pallet_balances::Config>::Balance::from(1_000u32).encode(), // rent allowance
+				wasm,
+				(subsistence_threshold * 100).encode(), // rent allowance
 				vec![],
 			));
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
@@ -1082,7 +1037,7 @@ fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
 				balance,
 			);
 
-			// Make contract have exactly the subsitence threshold
+			// Make contract have exactly the subsistence threshold
 			Balances::make_free_balance_be(&addr, subsistence_threshold);
 			assert_eq!(Balances::free_balance(&addr), subsistence_threshold);
 
@@ -1115,12 +1070,13 @@ fn call_removed_contract() {
 		.execute_with(|| {
 			// Create
 			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm.clone()));
-			assert_ok!(Contracts::instantiate(
+			assert_ok!(Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
 				30_000,
-				GAS_LIMIT, code_hash.into(),
-				<Test as pallet_balances::Config>::Balance::from(1_000u32).encode(), // rent allowance
+				GAS_LIMIT,
+				wasm,
+				// rent allowance
+				<Test as pallet_balances::Config>::Balance::from(10_000u32).encode(),
 				vec![],
 			));
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
@@ -1163,27 +1119,29 @@ fn default_rent_allowance_on_instantiate() {
 		.execute_with(|| {
 			// Create
 			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm));
-			assert_ok!(Contracts::instantiate(
+			assert_ok!(Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
 				30_000,
 				GAS_LIMIT,
-				code_hash.into(),
+				wasm,
 				vec![],
 				vec![],
 			));
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+			let contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
+			let code_len: BalanceOf<Test> =
+			PrefabWasmModule::<Test>::from_storage_noinstr(contract.code_hash)
+				.unwrap()
+				.occupied_storage()
+				.into();
 
 			// The instantiation deducted the rent for one block immediately
 			let first_rent = <Test as Config>::RentFraction::get()
-				// base_deposit - free_balance
-				.mul_ceil(80_000 - 30_000)
+				// (base_deposit(8) + code_len) * byte_price - free_balance
+				.mul_ceil((8 + code_len) * 10_000 - 30_000)
 				// blocks to rent
 				* 1;
-
-			// Check creation
-			let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
-			assert_eq!(bob_contract.rent_allowance, <BalanceOf<Test>>::max_value() - first_rent);
+			assert_eq!(contract.rent_allowance, <BalanceOf<Test>>::max_value() - first_rent);
 
 			// Advance blocks
 			initialize_block(5);
@@ -1194,46 +1152,64 @@ fn default_rent_allowance_on_instantiate() {
 			);
 
 			// Check contract is still alive
-			let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive();
-			assert!(bob_contract.is_some())
+			let contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive();
+			assert!(contract.is_some())
 		});
 }
 
 #[test]
 fn restorations_dirty_storage_and_different_storage() {
-	restoration(true, true);
+	restoration(true, true, false);
 }
 
 #[test]
 fn restorations_dirty_storage() {
-	restoration(false, true);
+	restoration(false, true, false);
 }
 
 #[test]
 fn restoration_different_storage() {
-	restoration(true, false);
+	restoration(true, false, false);
+}
+
+#[test]
+fn restoration_code_evicted() {
+	restoration(false, false, true);
 }
 
 #[test]
 fn restoration_success() {
-	restoration(false, false);
+	restoration(false, false, false);
 }
 
-fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage: bool) {
+fn restoration(
+	test_different_storage: bool,
+	test_restore_to_with_dirty_storage: bool,
+	test_code_evicted: bool
+) {
 	let (set_rent_wasm, set_rent_code_hash) = compile_module::<Test>("set_rent").unwrap();
 	let (restoration_wasm, restoration_code_hash) = compile_module::<Test>("restoration").unwrap();
+	let allowance: <Test as pallet_balances::Config>::Balance = 10_000;
 
 	ExtBuilder::default()
 		.existential_deposit(50)
 		.build()
 		.execute_with(|| {
 			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			assert_ok!(Contracts::put_code(Origin::signed(ALICE), restoration_wasm));
-			assert_ok!(Contracts::put_code(Origin::signed(ALICE), set_rent_wasm));
 
-			// If you ever need to update the wasm source this test will fail
-			// and will show you the actual hash.
-			assert_eq!(System::events(), vec![
+			// Create an account with address `BOB` with code `CODE_SET_RENT`.
+			// The input parameter sets the rent allowance to 0.
+			assert_ok!(Contracts::instantiate_with_code(
+				Origin::signed(ALICE),
+				30_000,
+				GAS_LIMIT,
+				set_rent_wasm.clone(),
+				allowance.encode(),
+				vec![],
+			));
+			let addr_bob = Contracts::contract_address(&ALICE, &set_rent_code_hash, &[]);
+
+			let mut events = vec![
 				EventRecord {
 					phase: Phase::Initialization,
 					event: MetaEvent::system(frame_system::Event::NewAccount(ALICE)),
@@ -1241,12 +1217,28 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::balances(pallet_balances::RawEvent::Endowed(ALICE, 1_000_000)),
+					event: MetaEvent::balances(
+						pallet_balances::RawEvent::Endowed(ALICE, 1_000_000)
+					),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::contracts(RawEvent::CodeStored(restoration_code_hash.into())),
+					event: MetaEvent::system(frame_system::Event::NewAccount(addr_bob.clone())),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: MetaEvent::balances(
+						pallet_balances::RawEvent::Endowed(addr_bob.clone(), 30_000)
+					),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: MetaEvent::balances(
+						pallet_balances::RawEvent::Transfer(ALICE, addr_bob.clone(), 30_000)
+					),
 					topics: vec![],
 				},
 				EventRecord {
@@ -1254,24 +1246,60 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 					event: MetaEvent::contracts(RawEvent::CodeStored(set_rent_code_hash.into())),
 					topics: vec![],
 				},
-			]);
+				EventRecord {
+					phase: Phase::Initialization,
+					event: MetaEvent::contracts(RawEvent::Instantiated(ALICE, addr_bob.clone())),
+					topics: vec![],
+				},
+			];
 
-			// Create an account with address `BOB` with code `CODE_SET_RENT`.
-			// The input parameter sets the rent allowance to 0.
-			assert_ok!(Contracts::instantiate(
-				Origin::signed(ALICE),
-				30_000,
-				GAS_LIMIT,
-				set_rent_code_hash.into(),
-				<Test as pallet_balances::Config>::Balance::from(1_000u32).encode(),
-				vec![],
-			));
-			let addr_bob = Contracts::contract_address(&ALICE, &set_rent_code_hash, &[]);
+			// Create another contract from the same code in order to increment the codes
+			// refcounter so that it stays on chain.
+			if !test_code_evicted {
+				assert_ok!(Contracts::instantiate_with_code(
+					Origin::signed(ALICE),
+					20_000,
+					GAS_LIMIT,
+					set_rent_wasm,
+					allowance.encode(),
+					vec![1],
+				));
+				assert_refcount!(set_rent_code_hash, 2);
+				let addr_dummy = Contracts::contract_address(&ALICE, &set_rent_code_hash, &[1]);
+				events.extend([
+					EventRecord {
+						phase: Phase::Initialization,
+						event: MetaEvent::system(frame_system::Event::NewAccount(addr_dummy.clone())),
+						topics: vec![],
+					},
+					EventRecord {
+						phase: Phase::Initialization,
+						event: MetaEvent::balances(
+							pallet_balances::RawEvent::Endowed(addr_dummy.clone(), 20_000)
+						),
+						topics: vec![],
+					},
+					EventRecord {
+						phase: Phase::Initialization,
+						event: MetaEvent::balances(
+							pallet_balances::RawEvent::Transfer(ALICE, addr_dummy.clone(), 20_000)
+						),
+						topics: vec![],
+					},
+					EventRecord {
+						phase: Phase::Initialization,
+						event: MetaEvent::contracts(RawEvent::Instantiated(ALICE, addr_dummy.clone())),
+						topics: vec![],
+					},
+				].iter().cloned());
+			}
+
+			assert_eq!(System::events(), events);
 
 			// Check if `BOB` was created successfully and that the rent allowance is below what
 			// we specified as the first rent was already collected.
 			let bob_contract = ContractInfoOf::<Test>::get(&addr_bob).unwrap().get_alive().unwrap();
-			assert!(bob_contract.rent_allowance < 5_000);
+			assert!(bob_contract.rent_allowance < allowance);
 
 			if test_different_storage {
 				assert_ok!(Contracts::call(
@@ -1297,26 +1325,22 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 			assert!(ContractInfoOf::<Test>::get(&addr_bob).unwrap().get_alive().is_some());
 			assert_ok!(Contracts::claim_surcharge(Origin::none(), addr_bob.clone(), Some(ALICE)));
 			assert!(ContractInfoOf::<Test>::get(&addr_bob).unwrap().get_tombstone().is_some());
-			assert_eq!(System::events(), vec![
-				EventRecord {
-					phase: Phase::Initialization,
-					event: MetaEvent::contracts(
-						RawEvent::Evicted(addr_bob.clone())
-					),
-					topics: vec![],
-				},
-			]);
+			if test_code_evicted {
+				assert_refcount!(set_rent_code_hash, 0);
+			} else {
+				assert_refcount!(set_rent_code_hash, 1);
+			}
 
 			// Create another account with the address `DJANGO` with `CODE_RESTORATION`.
 			//
 			// Note that we can't use `ALICE` for creating `DJANGO` so we create yet another
 			// account `CHARLIE` and create `DJANGO` with it.
 			let _ = Balances::deposit_creating(&CHARLIE, 1_000_000);
-			assert_ok!(Contracts::instantiate(
+			assert_ok!(Contracts::instantiate_with_code(
 				Origin::signed(CHARLIE),
 				30_000,
 				GAS_LIMIT,
-				restoration_code_hash.into(),
+				restoration_wasm,
 				vec![],
 				vec![],
 			));
@@ -1358,7 +1382,7 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 				key
 			};
 
-			if test_different_storage || test_restore_to_with_dirty_storage {
+			if test_different_storage || test_restore_to_with_dirty_storage || test_code_evicted {
 				// Parametrization of the test imply restoration failure. Check that `DJANGO` aka
 				// restoration contract is still in place and also that `BOB` doesn't exist.
 				let result = perform_the_restoration();
@@ -1372,18 +1396,22 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 					Storage::<Test>::read(&django_trie_id, &delta_key),
 					Some(vec![40, 0, 0, 0]),
 				);
-				match (test_different_storage, test_restore_to_with_dirty_storage) {
-					(true, false) => {
+				match (
+					test_different_storage,
+					test_restore_to_with_dirty_storage,
+					test_code_evicted
+				) {
+					(true, false, false) => {
 						assert_err_ignore_postinfo!(
 							result, Error::<Test>::InvalidTombstone,
 						);
 						assert_eq!(System::events(), vec![]);
 					}
-					(_, true) => {
+					(_, true, false) => {
 						assert_err_ignore_postinfo!(
 							result, Error::<Test>::InvalidContractOrigin,
 						);
-						pretty_assertions::assert_eq!(System::events(), vec![
+						assert_eq!(System::events(), vec![
 							EventRecord {
 								phase: Phase::Initialization,
 								event: MetaEvent::contracts(RawEvent::Evicted(addr_bob)),
@@ -1416,17 +1444,31 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 								),
 								topics: vec![],
 							},
+							EventRecord {
+								phase: Phase::Initialization,
+								event: MetaEvent::contracts(RawEvent::CodeStored(restoration_code_hash)),
+								topics: vec![],
+							},
 							EventRecord {
 								phase: Phase::Initialization,
 								event: MetaEvent::contracts(RawEvent::Instantiated(CHARLIE, addr_django.clone())),
 								topics: vec![],
 							},
+
 						]);
-					}
+					},
+					(false, false, true) => {
+						assert_err_ignore_postinfo!(
+							result, Error::<Test>::CodeNotFound,
+						);
+						assert_refcount!(set_rent_code_hash, 0);
+						assert_eq!(System::events(), vec![]);
+					},
 					_ => unreachable!(),
 				}
 			} else {
 				assert_ok!(perform_the_restoration());
+				assert_refcount!(set_rent_code_hash, 2);
 
 				// Here we expect that the restoration is succeeded. Check that the restoration
 				// contract `DJANGO` ceased to exist and that `BOB` returned back.
@@ -1439,6 +1481,11 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 				assert!(ContractInfoOf::<Test>::get(&addr_django).is_none());
 				assert_matches!(Storage::<Test>::read(&django_trie_id, &delta_key), None);
 				assert_eq!(System::events(), vec![
+					EventRecord {
+						phase: Phase::Initialization,
+						event: MetaEvent::contracts(RawEvent::CodeRemoved(restoration_code_hash)),
+						topics: vec![],
+					},
 					EventRecord {
 						phase: Phase::Initialization,
 						event: MetaEvent::system(system::Event::KilledAccount(addr_django.clone())),
@@ -1466,12 +1513,11 @@ fn storage_max_value_limit() {
 		.execute_with(|| {
 			// Create
 			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm));
-			assert_ok!(Contracts::instantiate(
+			assert_ok!(Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
 				30_000,
 				GAS_LIMIT,
-				code_hash.into(),
+				wasm,
 				vec![],
 				vec![],
 			));
@@ -1512,24 +1558,28 @@ fn deploy_and_call_other_contract() {
 		.execute_with(|| {
 			// Create
 			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			assert_ok!(Contracts::put_code(Origin::signed(ALICE), callee_wasm));
-			assert_ok!(Contracts::put_code(Origin::signed(ALICE), caller_wasm));
-
-			assert_ok!(Contracts::instantiate(
+			assert_ok!(Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
 				100_000,
 				GAS_LIMIT,
-				caller_code_hash.into(),
+				caller_wasm,
 				vec![],
 				vec![],
 			));
-			let addr = Contracts::contract_address(&ALICE, &caller_code_hash, &[]);
+			assert_ok!(Contracts::instantiate_with_code(
+				Origin::signed(ALICE),
+				100_000,
+				GAS_LIMIT,
+				callee_wasm,
+				0u32.to_le_bytes().encode(),
+				vec![42],
+			));
 
 			// Call BOB contract, which attempts to instantiate and call the callee contract and
 			// makes various assertions on the results from those calls.
 			assert_ok!(Contracts::call(
 				Origin::signed(ALICE),
-				addr,
+				Contracts::contract_address(&ALICE, &caller_code_hash, &[]),
 				0,
 				GAS_LIMIT,
 				callee_code_hash.as_ref().to_vec(),
@@ -1545,14 +1595,13 @@ fn cannot_self_destruct_through_draning() {
 		.build()
 		.execute_with(|| {
 			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm));
 
 			// Instantiate the BOB contract.
-			assert_ok!(Contracts::instantiate(
+			assert_ok!(Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
 				100_000,
 				GAS_LIMIT,
-				code_hash.into(),
+				wasm,
 				vec![],
 				vec![],
 			));
@@ -1586,14 +1635,13 @@ fn cannot_self_destruct_while_live() {
 		.build()
 		.execute_with(|| {
 			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm));
 
 			// Instantiate the BOB contract.
-			assert_ok!(Contracts::instantiate(
+			assert_ok!(Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
 				100_000,
 				GAS_LIMIT,
-				code_hash.into(),
+				wasm,
 				vec![],
 				vec![],
 			));
@@ -1635,14 +1683,13 @@ fn self_destruct_works() {
 		.execute_with(|| {
 			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
 			let _ = Balances::deposit_creating(&DJANGO, 1_000_000);
-			assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm));
 
 			// Instantiate the BOB contract.
-			assert_ok!(Contracts::instantiate(
+			assert_ok!(Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
 				100_000,
 				GAS_LIMIT,
-				code_hash.into(),
+				wasm,
 				vec![],
 				vec![],
 			));
@@ -1680,10 +1727,15 @@ fn self_destruct_works() {
 				EventRecord {
 					phase: Phase::Initialization,
 					event: MetaEvent::balances(
-						pallet_balances::RawEvent::Transfer(addr.clone(), DJANGO, 100_000)
+						pallet_balances::RawEvent::Transfer(addr.clone(), DJANGO, 93_654)
 					),
 					topics: vec![],
 				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: MetaEvent::contracts(RawEvent::CodeRemoved(code_hash)),
+					topics: vec![],
+				},
 				EventRecord {
 					phase: Phase::Initialization,
 					event: MetaEvent::contracts(
@@ -1697,7 +1749,8 @@ fn self_destruct_works() {
 			assert!(ContractInfoOf::<Test>::get(&addr).is_none());
 
 			// check that the beneficiary (django) got remaining balance
-			assert_eq!(Balances::free_balance(DJANGO), 1_100_000);
+			// some rent was deducted before termination
+			assert_eq!(Balances::free_balance(DJANGO), 1_093_654);
 		});
 }
 
@@ -1714,16 +1767,22 @@ fn destroy_contract_and_transfer_funds() {
 		.execute_with(|| {
 			// Create
 			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			assert_ok!(Contracts::put_code(Origin::signed(ALICE), callee_wasm));
-			assert_ok!(Contracts::put_code(Origin::signed(ALICE), caller_wasm));
+			assert_ok!(Contracts::instantiate_with_code(
+				Origin::signed(ALICE),
+				200_000,
+				GAS_LIMIT,
+				callee_wasm,
+				vec![],
+				vec![42]
+			));
 
 			// This deploys the BOB contract, which in turn deploys the CHARLIE contract during
 			// construction.
-			assert_ok!(Contracts::instantiate(
+			assert_ok!(Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
 				200_000,
 				GAS_LIMIT,
-				caller_code_hash.into(),
+				caller_wasm,
 				callee_code_hash.as_ref().to_vec(),
 				vec![],
 			));
@@ -1754,25 +1813,24 @@ fn destroy_contract_and_transfer_funds() {
 
 #[test]
 fn cannot_self_destruct_in_constructor() {
-	let (wasm, code_hash) = compile_module::<Test>("self_destructing_constructor").unwrap();
+	let (wasm, _) = compile_module::<Test>("self_destructing_constructor").unwrap();
 	ExtBuilder::default()
 		.existential_deposit(50)
 		.build()
 		.execute_with(|| {
 			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm));
 
 			// Fail to instantiate the BOB because the contructor calls seal_terminate.
 			assert_err_ignore_postinfo!(
-				Contracts::instantiate(
+				Contracts::instantiate_with_code(
 					Origin::signed(ALICE),
 					100_000,
 					GAS_LIMIT,
-					code_hash.into(),
+					wasm,
 					vec![],
 					vec![],
 				),
-				Error::<Test>::NewContractNotFunded,
+				Error::<Test>::NotCallable,
 			);
 		});
 }
@@ -1786,14 +1844,13 @@ fn crypto_hashes() {
 		.build()
 		.execute_with(|| {
 			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm));
 
 			// Instantiate the CRYPTO_HASHES contract.
-			assert_ok!(Contracts::instantiate(
+			assert_ok!(Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
 				100_000,
 				GAS_LIMIT,
-				code_hash.into(),
+				wasm,
 				vec![],
 				vec![],
 			));
@@ -1838,15 +1895,14 @@ fn transfer_return_code() {
 	let (wasm, code_hash) = compile_module::<Test>("transfer_return_code").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
 		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
-		let _ = Balances::deposit_creating(&ALICE, 10 * subsistence);
-		assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm));
+		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 
 		assert_ok!(
-			Contracts::instantiate(
+			Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
-				subsistence * 3,
+				subsistence * 100,
 				GAS_LIMIT,
-				code_hash.into(),
+				wasm,
 				vec![],
 				vec![],
 			),
@@ -1886,17 +1942,15 @@ fn call_return_code() {
 	let (callee_code, callee_hash) = compile_module::<Test>("ok_trap_revert").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
 		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
-		let _ = Balances::deposit_creating(&ALICE, 10 * subsistence);
-		let _ = Balances::deposit_creating(&CHARLIE, 10 * subsistence);
-		assert_ok!(Contracts::put_code(Origin::signed(ALICE), caller_code));
-		assert_ok!(Contracts::put_code(Origin::signed(ALICE), callee_code));
+		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
+		let _ = Balances::deposit_creating(&CHARLIE, 1000 * subsistence);
 
 		assert_ok!(
-			Contracts::instantiate(
+			Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
-				subsistence * 3,
+				subsistence * 100,
 				GAS_LIMIT,
-				caller_hash.into(),
+				caller_code,
 				vec![0],
 				vec![],
 			),
@@ -1915,11 +1969,11 @@ fn call_return_code() {
 		assert_return_code!(result, RuntimeReturnCode::NotCallable);
 
 		assert_ok!(
-			Contracts::instantiate(
+			Contracts::instantiate_with_code(
 				Origin::signed(CHARLIE),
-				subsistence * 3,
+				subsistence * 100,
 				GAS_LIMIT,
-				callee_hash.into(),
+				callee_code,
 				vec![0],
 				vec![],
 			),
@@ -1981,18 +2035,27 @@ fn instantiate_return_code() {
 	let (callee_code, callee_hash) = compile_module::<Test>("ok_trap_revert").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
 		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
-		let _ = Balances::deposit_creating(&ALICE, 10 * subsistence);
-		let _ = Balances::deposit_creating(&CHARLIE, 10 * subsistence);
-		assert_ok!(Contracts::put_code(Origin::signed(ALICE), caller_code));
-		assert_ok!(Contracts::put_code(Origin::signed(ALICE), callee_code));
+		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
+		let _ = Balances::deposit_creating(&CHARLIE, 1000 * subsistence);
 		let callee_hash = callee_hash.as_ref().to_vec();
 
 		assert_ok!(
-			Contracts::instantiate(
+			Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
-				subsistence * 3,
+				subsistence * 100,
 				GAS_LIMIT,
-				caller_hash.into(),
+				callee_code,
+				vec![],
+				vec![],
+			),
+		);
+
+		assert_ok!(
+			Contracts::instantiate_with_code(
+				Origin::signed(ALICE),
+				subsistence * 100,
+				GAS_LIMIT,
+				caller_code,
 				vec![],
 				vec![],
 			),
@@ -2006,26 +2069,26 @@ fn instantiate_return_code() {
 			addr.clone(),
 			0,
 			GAS_LIMIT,
-			vec![0; 33],
+			callee_hash.clone(),
 		).exec_result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::BelowSubsistenceThreshold);
 
 		// Contract has enough total balance in order to not go below the subsistence
-		// threshold when transfering 100 balance but this balance is reserved so
+		// threshold when transfering the balance but this balance is reserved so
 		// the transfer still fails but with another return code.
-		Balances::make_free_balance_be(&addr, subsistence + 100);
-		Balances::reserve(&addr, subsistence + 100).unwrap();
+		Balances::make_free_balance_be(&addr, subsistence + 10_000);
+		Balances::reserve(&addr, subsistence + 10_000).unwrap();
 		let result = Contracts::bare_call(
 			ALICE,
 			addr.clone(),
 			0,
 			GAS_LIMIT,
-			vec![0; 33],
+			callee_hash.clone(),
 		).exec_result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::TransferFailed);
 
 		// Contract has enough balance but the passed code hash is invalid
-		Balances::make_free_balance_be(&addr, subsistence + 1000);
+		Balances::make_free_balance_be(&addr, subsistence + 10_000);
 		let result = Contracts::bare_call(
 			ALICE,
 			addr.clone(),
@@ -2063,11 +2126,18 @@ fn disabled_chain_extension_wont_deploy() {
 	let (code, _hash) = compile_module::<Test>("chain_extension").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
 		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
-		let _ = Balances::deposit_creating(&ALICE, 10 * subsistence);
+		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 		TestExtension::disable();
-		assert_eq!(
-			Contracts::put_code(Origin::signed(ALICE), code),
-			Err("module uses chain extensions but chain extensions are disabled".into()),
+		assert_err_ignore_postinfo!(
+			Contracts::instantiate_with_code(
+				Origin::signed(ALICE),
+				3 * subsistence,
+				GAS_LIMIT,
+				code,
+				vec![],
+				vec![],
+			),
+			"module uses chain extensions but chain extensions are disabled",
 		);
 	});
 }
@@ -2077,20 +2147,19 @@ fn disabled_chain_extension_errors_on_call() {
 	let (code, hash) = compile_module::<Test>("chain_extension").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
 		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
-		let _ = Balances::deposit_creating(&ALICE, 10 * subsistence);
-		assert_ok!(Contracts::put_code(Origin::signed(ALICE), code));
-		TestExtension::disable();
+		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 		assert_ok!(
-			Contracts::instantiate(
+			Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
-				subsistence * 3,
+				subsistence * 100,
 				GAS_LIMIT,
-				hash.into(),
+				code,
 				vec![],
 				vec![],
 			),
 		);
 		let addr = Contracts::contract_address(&ALICE, &hash, &[]);
+		TestExtension::disable();
 		assert_err_ignore_postinfo!(
 			Contracts::call(
 				Origin::signed(ALICE),
@@ -2109,14 +2178,13 @@ fn chain_extension_works() {
 	let (code, hash) = compile_module::<Test>("chain_extension").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
 		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
-		let _ = Balances::deposit_creating(&ALICE, 10 * subsistence);
-		assert_ok!(Contracts::put_code(Origin::signed(ALICE), code));
+		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 		assert_ok!(
-			Contracts::instantiate(
+			Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
-				subsistence * 3,
+				subsistence * 100,
 				GAS_LIMIT,
-				hash.into(),
+				code,
 				vec![],
 				vec![],
 			),
@@ -2179,15 +2247,14 @@ fn lazy_removal_works() {
 	let (code, hash) = compile_module::<Test>("self_destruct").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
 		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
-		let _ = Balances::deposit_creating(&ALICE, 10 * subsistence);
-		assert_ok!(Contracts::put_code(Origin::signed(ALICE), code));
+		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 
 		assert_ok!(
-			Contracts::instantiate(
+			Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
-				subsistence * 3,
+				subsistence * 100,
 				GAS_LIMIT,
-				hash.into(),
+				code,
 				vec![],
 				vec![],
 			),
@@ -2240,15 +2307,14 @@ fn lazy_removal_partial_remove_works() {
 
 	let trie = ext.execute_with(|| {
 		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
-		let _ = Balances::deposit_creating(&ALICE, 10 * subsistence);
-		assert_ok!(Contracts::put_code(Origin::signed(ALICE), code));
+		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 
 		assert_ok!(
-			Contracts::instantiate(
+			Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
-				subsistence * 3,
+				subsistence * 100,
 				GAS_LIMIT,
-				hash.into(),
+				code,
 				vec![],
 				vec![],
 			),
@@ -2322,15 +2388,14 @@ fn lazy_removal_does_no_run_on_full_block() {
 	let (code, hash) = compile_module::<Test>("self_destruct").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
 		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
-		let _ = Balances::deposit_creating(&ALICE, 10 * subsistence);
-		assert_ok!(Contracts::put_code(Origin::signed(ALICE), code));
+		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 
 		assert_ok!(
-			Contracts::instantiate(
+			Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
-				subsistence * 3,
+				subsistence * 100,
 				GAS_LIMIT,
-				hash.into(),
+				code,
 				vec![],
 				vec![],
 			),
@@ -2407,15 +2472,14 @@ fn lazy_removal_does_not_use_all_weight() {
 	let (code, hash) = compile_module::<Test>("self_destruct").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
 		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
-		let _ = Balances::deposit_creating(&ALICE, 10 * subsistence);
-		assert_ok!(Contracts::put_code(Origin::signed(ALICE), code));
+		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 
 		assert_ok!(
-			Contracts::instantiate(
+			Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
-				subsistence * 3,
+				subsistence * 100,
 				GAS_LIMIT,
-				hash.into(),
+				code,
 				vec![],
 				vec![],
 			),
@@ -2478,15 +2542,14 @@ fn deletion_queue_full() {
 	let (code, hash) = compile_module::<Test>("self_destruct").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
 		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
-		let _ = Balances::deposit_creating(&ALICE, 10 * subsistence);
-		assert_ok!(Contracts::put_code(Origin::signed(ALICE), code));
+		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 
 		assert_ok!(
-			Contracts::instantiate(
+			Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
-				subsistence * 3,
+				subsistence * 100,
 				GAS_LIMIT,
-				hash.into(),
+				code,
 				vec![],
 				vec![],
 			),
@@ -2540,12 +2603,12 @@ fn not_deployed_if_endowment_too_low_for_first_rent() {
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
 		// Create
 		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-		assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm));
 		assert_storage_noop!(assert_err_ignore_postinfo!(
-			Contracts::instantiate(
+			Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
 				30_000,
-				GAS_LIMIT, code_hash.into(),
+				GAS_LIMIT,
+				wasm,
 				(BalanceOf::<Test>::from(first_rent) - BalanceOf::<Test>::from(1u32))
 					.encode(), // rent allowance
 				vec![],
@@ -2562,12 +2625,12 @@ fn surcharge_reward_is_capped() {
 	let (wasm, code_hash) = compile_module::<Test>("set_rent").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
 		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-		assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm));
-		assert_ok!(Contracts::instantiate(
+		assert_ok!(Contracts::instantiate_with_code(
 			Origin::signed(ALICE),
 			30_000,
-			GAS_LIMIT, code_hash.into(),
-			<BalanceOf<Test>>::from(1_000u32).encode(), // rent allowance
+			GAS_LIMIT,
+			wasm,
+			<BalanceOf<Test>>::from(10_000u32).encode(), // rent allowance
 			vec![],
 		));
 		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
@@ -2598,3 +2661,75 @@ fn surcharge_reward_is_capped() {
 		assert!(Balances::free_balance(&ALICE) < balance + reward);
 	});
 }
+
+#[test]
+fn refcounter() {
+	let (wasm, code_hash) = compile_module::<Test>("self_destruct").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
+		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
+
+		// Create two contracts with the same code and check that they do in fact share it.
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			subsistence * 100,
+			GAS_LIMIT,
+			wasm.clone(),
+			vec![],
+			vec![0],
+		));
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			subsistence * 100,
+			GAS_LIMIT,
+			wasm.clone(),
+			vec![],
+			vec![1],
+		));
+		assert_refcount!(code_hash, 2);
+
+		// Sharing should also work with the usual instantiate call
+		assert_ok!(Contracts::instantiate(
+			Origin::signed(ALICE),
+			subsistence * 100,
+			GAS_LIMIT,
+			code_hash,
+			vec![],
+			vec![2],
+		));
+		assert_refcount!(code_hash, 3);
+
+		// addresses of all three existing contracts
+		let addr0 = Contracts::contract_address(&ALICE, &code_hash, &[0]);
+		let addr1 = Contracts::contract_address(&ALICE, &code_hash, &[1]);
+		let addr2 = Contracts::contract_address(&ALICE, &code_hash, &[2]);
+
+		// Terminating one contract should decrement the refcount
+		assert_ok!(Contracts::call(
+			Origin::signed(ALICE),
+			addr0,
+			0,
+			GAS_LIMIT,
+			vec![],
+		));
+		assert_refcount!(code_hash, 2);
+
+		// make remaining contracts eligible for eviction
+		initialize_block(40);
+
+		// remove one of them
+		assert_ok!(Contracts::claim_surcharge(Origin::none(), addr1, Some(ALICE)));
+		assert_refcount!(code_hash, 1);
+
+		// Pristine code should still be there
+		crate::PristineCode::<Test>::get(code_hash).unwrap();
+
+		// remove the last contract
+		assert_ok!(Contracts::claim_surcharge(Origin::none(), addr2, Some(ALICE)));
+		assert_refcount!(code_hash, 0);
+
+		// all code should be gone
+		assert_matches!(crate::PristineCode::<Test>::get(code_hash), None);
+		assert_matches!(crate::CodeStorage::<Test>::get(code_hash), None);
+	});
+}
diff --git a/frame/contracts/src/wasm/code_cache.rs b/frame/contracts/src/wasm/code_cache.rs
index 3150ee4b7bde..6166918c80c9 100644
--- a/frame/contracts/src/wasm/code_cache.rs
+++ b/frame/contracts/src/wasm/code_cache.rs
@@ -27,46 +27,84 @@
 //! this guarantees that every instrumented contract code in cache cannot have the version equal to the current one.
 //! Thus, before executing a contract it should be reinstrument with new schedule.
 
-use crate::wasm::{prepare, runtime::Env, PrefabWasmModule};
-use crate::{CodeHash, CodeStorage, PristineCode, Schedule, Config};
-use sp_std::prelude::*;
-use sp_runtime::traits::Hash;
+use crate::{
+	CodeHash, CodeStorage, PristineCode, Schedule, Config, Error,
+	wasm::{prepare, PrefabWasmModule}, Module as Contracts, RawEvent,
+};
 use sp_core::crypto::UncheckedFrom;
-use frame_support::StorageMap;
+use frame_support::{StorageMap, dispatch::{DispatchError, DispatchResult}};
 
-/// Put code in the storage. The hash of code is used as a key and is returned
-/// as a result of this function.
+/// Put the instrumented module in storage.
 ///
-/// This function instruments the given code and caches it in the storage.
-pub fn save<T: Config>(
-	original_code: Vec<u8>,
-	schedule: &Schedule<T>,
-) -> Result<CodeHash<T>, &'static str> where T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]> {
-	let prefab_module = prepare::prepare_contract::<Env, T>(&original_code, schedule)?;
-	let code_hash = T::Hashing::hash(&original_code);
+/// Increments the refcount of the in-storage `prefab_module` if it already exists in storage
+/// under the specified `code_hash`.
+pub fn store<T: Config>(mut prefab_module: PrefabWasmModule<T>)
+where
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
+{
+	let code_hash = sp_std::mem::take(&mut prefab_module.code_hash);
 
-	<CodeStorage<T>>::insert(code_hash, prefab_module);
-	<PristineCode<T>>::insert(code_hash, original_code);
-
-	Ok(code_hash)
+	// original_code is only `Some` if the contract was instantiated from a new code
+	// but `None` if it was loaded from storage.
+	if let Some(code) = prefab_module.original_code.take() {
+		<PristineCode<T>>::insert(&code_hash, code);
+	}
+	<CodeStorage<T>>::mutate(&code_hash, |existing| {
+		match existing {
+			Some(module) => increment_64(&mut module.refcount),
+			None => {
+				*existing = Some(prefab_module);
+				Contracts::<T>::deposit_event(RawEvent::CodeStored(code_hash))
+			}
+		}
+	});
 }
 
-/// Version of `save` to be used in runtime benchmarks.
-//
-/// This version neither checks nor instruments the passed in code. This is useful
-/// when code needs to be benchmarked without the injected instrumentation.
-#[cfg(feature = "runtime-benchmarks")]
-pub fn save_raw<T: Config>(
-	original_code: Vec<u8>,
-	schedule: &Schedule<T>,
-) -> Result<CodeHash<T>, &'static str> where T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]> {
-	let prefab_module = prepare::benchmarking::prepare_contract::<T>(&original_code, schedule)?;
-	let code_hash = T::Hashing::hash(&original_code);
+/// Decrement the refcount and store.
+///
+/// Removes the code instead of storing it when the refcount drops to zero.
+pub fn store_decremented<T: Config>(mut prefab_module: PrefabWasmModule<T>)
+where
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
+{
+	prefab_module.refcount = prefab_module.refcount.saturating_sub(1);
+	if prefab_module.refcount > 0 {
+		<CodeStorage<T>>::insert(prefab_module.code_hash, prefab_module);
+	} else {
+		<CodeStorage<T>>::remove(prefab_module.code_hash);
+		finish_removal::<T>(prefab_module.code_hash);
+	}
+}
 
-	<CodeStorage<T>>::insert(code_hash, prefab_module);
-	<PristineCode<T>>::insert(code_hash, original_code);
+/// Increment the refcount of a code in-storage by one.
+pub fn increment_refcount<T: Config>(code_hash: CodeHash<T>) -> DispatchResult
+where
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
+{
+	<CodeStorage<T>>::mutate(code_hash, |existing| {
+		if let Some(module) = existing {
+			increment_64(&mut module.refcount);
+			Ok(())
+		} else {
+			Err(Error::<T>::CodeNotFound.into())
+		}
+	})
+}
 
-	Ok(code_hash)
+/// Decrement the refcount of a code in-storage by one and remove the code when it drops to zero.
+pub fn decrement_refcount<T: Config>(code_hash: CodeHash<T>)
+where
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
+{
+	<CodeStorage<T>>::mutate_exists(code_hash, |existing| {
+		if let Some(module) = existing {
+			module.refcount = module.refcount.saturating_sub(1);
+			if module.refcount == 0 {
+				*existing = None;
+				finish_removal::<T>(code_hash);
+			}
+		}
+	});
 }
 
 /// Load code with the given code hash.
@@ -75,21 +113,51 @@ pub fn save_raw<T: Config>(
 /// the current one given as an argument, then this function will perform
 /// re-instrumentation and update the cache in the storage.
 pub fn load<T: Config>(
-	code_hash: &CodeHash<T>,
-	schedule: &Schedule<T>,
-) -> Result<PrefabWasmModule, &'static str> where T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]> {
-	let mut prefab_module =
-		<CodeStorage<T>>::get(code_hash).ok_or_else(|| "code is not found")?;
+	code_hash: CodeHash<T>,
+	schedule: Option<&Schedule<T>>,
+) -> Result<PrefabWasmModule<T>, DispatchError>
+where
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
+{
+	let mut prefab_module = <CodeStorage<T>>::get(code_hash)
+		.ok_or_else(|| Error::<T>::CodeNotFound)?;
 
-	if prefab_module.schedule_version < schedule.version {
-		// The current schedule version is greater than the version of the one cached
-		// in the storage.
-		//
-		// We need to re-instrument the code with the latest schedule here.
-		let original_code =
-			<PristineCode<T>>::get(code_hash).ok_or_else(|| "pristine code is not found")?;
-		prefab_module = prepare::prepare_contract::<Env, T>(&original_code, schedule)?;
-		<CodeStorage<T>>::insert(&code_hash, &prefab_module);
+	if let Some(schedule) = schedule {
+		if prefab_module.schedule_version < schedule.version {
+			// The current schedule version is greater than the version of the one cached
+			// in the storage.
+			//
+			// We need to re-instrument the code with the latest schedule here.
+			let original_code = <PristineCode<T>>::get(code_hash)
+				.ok_or_else(|| Error::<T>::CodeNotFound)?;
+			prefab_module.code = prepare::reinstrument_contract::<T>(original_code, schedule)?;
+			prefab_module.schedule_version = schedule.version;
+			<CodeStorage<T>>::insert(&code_hash, &prefab_module);
+		}
 	}
+	prefab_module.code_hash = code_hash;
 	Ok(prefab_module)
 }
+
+/// Finish removal of a code by deleting the pristine code and emitting an event.
+fn finish_removal<T: Config>(code_hash: CodeHash<T>)
+where
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
+{
+	<PristineCode<T>>::remove(code_hash);
+	Contracts::<T>::deposit_event(RawEvent::CodeRemoved(code_hash))
+}
+
+/// Increment the refcount panicking if it should ever overflow (which will not happen).
+///
+/// We try hard to be infallible here because otherwise more storage transactions would be
+/// necessary to account for failures in storing code for an already instantiated contract.
+fn increment_64(refcount: &mut u64) {
+	*refcount = refcount.checked_add(1).expect("
+		refcount is 64bit. Generating this overflow would require to store
+		_at least_ 18 exabyte of data assuming that a contract consumes only
+		one byte of data. Any node would run out of storage space before hitting
+		this overflow.
+		qed
+	");
+}
diff --git a/frame/contracts/src/wasm/mod.rs b/frame/contracts/src/wasm/mod.rs
index 45c927dfaa4b..56be9f35313a 100644
--- a/frame/contracts/src/wasm/mod.rs
+++ b/frame/contracts/src/wasm/mod.rs
@@ -18,114 +18,163 @@
 //! This module provides a means for executing contracts
 //! represented in wasm.
 
+#[macro_use]
+mod env_def;
+mod code_cache;
+mod prepare;
+mod runtime;
+
 use crate::{
 	CodeHash, Schedule, Config,
 	wasm::env_def::FunctionImplProvider,
-	exec::Ext,
+	exec::{Ext, Executable, ExportedFunction},
 	gas::GasMeter,
 };
 use sp_std::prelude::*;
 use sp_core::crypto::UncheckedFrom;
 use codec::{Encode, Decode};
-
-#[macro_use]
-mod env_def;
-mod code_cache;
-mod prepare;
-mod runtime;
-
-use self::code_cache::load as load_code;
+use frame_support::dispatch::{DispatchError, DispatchResult};
 use pallet_contracts_primitives::ExecResult;
-
-pub use self::code_cache::save as save_code;
-#[cfg(feature = "runtime-benchmarks")]
-pub use self::code_cache::save_raw as save_code_raw;
 pub use self::runtime::{ReturnCode, Runtime, RuntimeToken};
 
 /// A prepared wasm module ready for execution.
+///
+/// # Note
+///
+/// This data structure is mostly immutable once created and stored. The exceptions that
+/// can be changed by calling a contract are `refcount`, `schedule_version` and `code`.
+/// `refcount` can change when a contract instantiates a new contract or self terminates.
+/// `schedule_version` and `code` when a contract with an outdated instrumention is called.
+/// Therefore one must be careful when holding any in-memory representation of this type while
+/// calling into a contract as those fields can get out of date.
 #[derive(Clone, Encode, Decode)]
-pub struct PrefabWasmModule {
+pub struct PrefabWasmModule<T: Config> {
 	/// Version of the schedule with which the code was instrumented.
 	#[codec(compact)]
 	schedule_version: u32,
+	/// Initial memory size of a contract's sandbox.
 	#[codec(compact)]
 	initial: u32,
+	/// The maximum memory size of a contract's sandbox.
 	#[codec(compact)]
 	maximum: u32,
+	/// The number of alive contracts that use this as their contract code.
+	///
+	/// If this number drops to zero this module is removed from storage.
+	#[codec(compact)]
+	refcount: u64,
 	/// This field is reserved for future evolution of format.
 	///
-	/// Basically, for now this field will be serialized as `None`. In the future
-	/// we would be able to extend this structure with.
+	/// For now this field is serialized as `None`. In the future we are able to change the
+	/// type parameter to a new struct that contains the fields that we want to add.
+	/// That new struct would also contain a reserved field for its future extensions.
+	/// This works because in SCALE `None` is encoded independently from the type parameter
+	/// of the option.
 	_reserved: Option<()>,
 	/// Code instrumented with the latest schedule.
 	code: Vec<u8>,
+	/// The size of the uninstrumented code.
+	///
+	/// We cache this value here in order to avoid the need to pull the pristine code
+	/// from storage when we only need its length for rent calculations.
+	original_code_len: u32,
+	/// The uninstrumented, pristine version of the code.
+	///
+	/// It is not stored because the pristine code has its own storage item. The value
+	/// is only `Some` when this module was created from an `original_code` and `None` if
+	/// it was loaded from storage.
+	#[codec(skip)]
+	original_code: Option<Vec<u8>>,
+	/// The code hash of the stored code which is defined as the hash over the `original_code`.
+	///
+	/// As the map key there is no need to store the hash in the value, too. It is set manually
+	/// when loading the module from storage.
+	#[codec(skip)]
+	code_hash: CodeHash<T>,
 }
 
-/// Wasm executable loaded by `WasmLoader` and executed by `WasmVm`.
-pub struct WasmExecutable {
-	entrypoint_name: &'static str,
-	prefab_module: PrefabWasmModule,
-}
-
-/// Loader which fetches `WasmExecutable` from the code cache.
-pub struct WasmLoader<'a, T: Config> {
-	schedule: &'a Schedule<T>,
-}
-
-impl<'a, T: Config> WasmLoader<'a, T> where T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]> {
-	pub fn new(schedule: &'a Schedule<T>) -> Self {
-		WasmLoader { schedule }
+impl ExportedFunction {
+	/// The wasm export name for the function.
+	fn identifier(&self) -> &str {
+		match self {
+			Self::Constructor => "deploy",
+			Self::Call => "call",
+		}
 	}
 }
 
-impl<'a, T: Config> crate::exec::Loader<T> for WasmLoader<'a, T>
+impl<T: Config> PrefabWasmModule<T>
 where
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
 {
-	type Executable = WasmExecutable;
-
-	fn load_init(&self, code_hash: &CodeHash<T>) -> Result<WasmExecutable, &'static str> {
-		let prefab_module = load_code::<T>(code_hash, self.schedule)?;
-		Ok(WasmExecutable {
-			entrypoint_name: "deploy",
-			prefab_module,
-		})
+	/// Create the module by checking and instrumenting `original_code`.
+	pub fn from_code(
+		original_code: Vec<u8>,
+		schedule: &Schedule<T>
+	) -> Result<Self, DispatchError> {
+		prepare::prepare_contract(original_code, schedule).map_err(Into::into)
 	}
-	fn load_main(&self, code_hash: &CodeHash<T>) -> Result<WasmExecutable, &'static str> {
-		let prefab_module = load_code::<T>(code_hash, self.schedule)?;
-		Ok(WasmExecutable {
-			entrypoint_name: "call",
-			prefab_module,
-		})
-	}
-}
 
-/// Implementation of `Vm` that takes `WasmExecutable` and executes it.
-pub struct WasmVm<'a, T: Config> where T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]> {
-	schedule: &'a Schedule<T>,
-}
+	/// Create and store the module without checking nor instrumenting the passed code.
+	///
+	/// # Note
+	///
+	/// This is useful for benchmarking where we don't want instrumentation to skew
+	/// our results.
+	#[cfg(feature = "runtime-benchmarks")]
+	pub fn store_code_unchecked(
+		original_code: Vec<u8>,
+		schedule: &Schedule<T>
+	) -> DispatchResult {
+		let executable = prepare::benchmarking::prepare_contract(original_code, schedule)
+			.map_err::<DispatchError, _>(Into::into)?;
+		code_cache::store(executable);
+		Ok(())
+	}
 
-impl<'a, T: Config> WasmVm<'a, T> where T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]> {
-	pub fn new(schedule: &'a Schedule<T>) -> Self {
-		WasmVm { schedule }
+	/// Return the refcount of the module.
+	#[cfg(test)]
+	pub fn refcount(&self) -> u64 {
+		self.refcount
 	}
 }
 
-impl<'a, T: Config> crate::exec::Vm<T> for WasmVm<'a, T>
+impl<T: Config> Executable<T> for PrefabWasmModule<T>
 where
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
 {
-	type Executable = WasmExecutable;
+	fn from_storage(
+		code_hash: CodeHash<T>,
+		schedule: &Schedule<T>
+	) -> Result<Self, DispatchError> {
+		code_cache::load(code_hash, Some(schedule))
+	}
+
+	fn from_storage_noinstr(code_hash: CodeHash<T>) -> Result<Self, DispatchError> {
+		code_cache::load(code_hash, None)
+	}
+
+	fn drop_from_storage(self) {
+		code_cache::store_decremented(self);
+	}
+
+	fn add_user(code_hash: CodeHash<T>) -> DispatchResult {
+		code_cache::increment_refcount::<T>(code_hash)
+	}
+
+	fn remove_user(code_hash: CodeHash<T>) {
+		code_cache::decrement_refcount::<T>(code_hash)
+	}
 
 	fn execute<E: Ext<T = T>>(
-		&self,
-		exec: &WasmExecutable,
+		self,
 		mut ext: E,
+		function: &ExportedFunction,
 		input_data: Vec<u8>,
 		gas_meter: &mut GasMeter<E::T>,
 	) -> ExecResult {
 		let memory =
-			sp_sandbox::Memory::new(exec.prefab_module.initial, Some(exec.prefab_module.maximum))
+			sp_sandbox::Memory::new(self.initial, Some(self.maximum))
 				.unwrap_or_else(|_| {
 				// unlike `.expect`, explicit panic preserves the source location.
 				// Needed as we can't use `RUST_BACKTRACE` in here.
@@ -145,17 +194,34 @@ where
 		let mut runtime = Runtime::new(
 			&mut ext,
 			input_data,
-			&self.schedule,
 			memory,
 			gas_meter,
 		);
 
+		// We store before executing so that the code hash is available in the constructor.
+		let code = self.code.clone();
+		if let &ExportedFunction::Constructor = function {
+			code_cache::store(self)
+		}
+
 		// Instantiate the instance from the instrumented module code and invoke the contract
 		// entrypoint.
-		let result = sp_sandbox::Instance::new(&exec.prefab_module.code, &imports, &mut runtime)
-			.and_then(|mut instance| instance.invoke(exec.entrypoint_name, &[], &mut runtime));
+		let result = sp_sandbox::Instance::new(&code, &imports, &mut runtime)
+			.and_then(|mut instance| instance.invoke(function.identifier(), &[], &mut runtime));
+
 		runtime.to_execution_result(result)
 	}
+
+	fn code_hash(&self) -> &CodeHash<T> {
+		&self.code_hash
+	}
+
+	fn occupied_storage(&self) -> u32 {
+		// We disregard the size of the struct itself as the size is completely
+		// dominated by the code size.
+		let len = self.original_code_len.saturating_add(self.code.len() as u32);
+		len.checked_div(self.refcount as u32).unwrap_or(len)
+	}
 }
 
 #[cfg(test)]
@@ -163,10 +229,9 @@ mod tests {
 	use super::*;
 	use crate::{
 		CodeHash, BalanceOf, Error, Module as Contracts,
-		exec::{Ext, StorageKey, AccountIdOf},
+		exec::{Ext, StorageKey, AccountIdOf, Executable},
 		gas::{Gas, GasMeter},
 		tests::{Test, Call, ALICE, BOB},
-		wasm::prepare::prepare_contract,
 	};
 	use std::collections::HashMap;
 	use sp_core::H256;
@@ -220,6 +285,7 @@ mod tests {
 		restores: Vec<RestoreEntry>,
 		// (topics, data)
 		events: Vec<(Vec<H256>, Vec<u8>)>,
+		schedule: Schedule<Test>,
 	}
 
 	impl Ext for MockExt {
@@ -234,7 +300,7 @@ mod tests {
 		}
 		fn instantiate(
 			&mut self,
-			code_hash: &CodeHash<Test>,
+			code_hash: CodeHash<Test>,
 			endowment: u64,
 			gas_meter: &mut GasMeter<Test>,
 			data: Vec<u8>,
@@ -248,7 +314,7 @@ mod tests {
 				salt: salt.to_vec(),
 			});
 			Ok((
-				Contracts::<Test>::contract_address(&ALICE, code_hash, salt),
+				Contracts::<Test>::contract_address(&ALICE, &code_hash, salt),
 				ExecReturnValue {
 					flags: ReturnFlags::empty(),
 					data: Vec::new(),
@@ -355,6 +421,10 @@ mod tests {
 		fn get_weight_price(&self, weight: Weight) -> BalanceOf<Self::T> {
 			BalanceOf::<Self::T>::from(1312_u32).saturating_mul(weight.into())
 		}
+
+		fn schedule(&self) -> &Schedule<Self::T> {
+			&self.schedule
+		}
 	}
 
 	impl Ext for &mut MockExt {
@@ -368,7 +438,7 @@ mod tests {
 		}
 		fn instantiate(
 			&mut self,
-			code: &CodeHash<Test>,
+			code: CodeHash<Test>,
 			value: u64,
 			gas_meter: &mut GasMeter<Test>,
 			input_data: Vec<u8>,
@@ -454,6 +524,9 @@ mod tests {
 		fn get_weight_price(&self, weight: Weight) -> BalanceOf<Self::T> {
 			(**self).get_weight_price(weight)
 		}
+		fn schedule(&self) -> &Schedule<Self::T> {
+			(**self).schedule()
+		}
 	}
 
 	fn execute<E: Ext>(
@@ -466,23 +539,10 @@ mod tests {
 		<E::T as frame_system::Config>::AccountId:
 			UncheckedFrom<<E::T as frame_system::Config>::Hash> + AsRef<[u8]>
 	{
-		use crate::exec::Vm;
-
 		let wasm = wat::parse_str(wat).unwrap();
 		let schedule = crate::Schedule::default();
-		let prefab_module =
-			prepare_contract::<super::runtime::Env, E::T>(&wasm, &schedule).unwrap();
-
-		let exec = WasmExecutable {
-			// Use a "call" convention.
-			entrypoint_name: "call",
-			prefab_module,
-		};
-
-		let cfg = Default::default();
-		let vm = WasmVm::new(&cfg);
-
-		vm.execute(&exec, ext, input_data, gas_meter)
+		let executable = PrefabWasmModule::<E::T>::from_code(wasm, &schedule).unwrap();
+		executable.execute(ext, &ExportedFunction::Call, input_data, gas_meter)
 	}
 
 	const CODE_TRANSFER: &str = r#"
diff --git a/frame/contracts/src/wasm/prepare.rs b/frame/contracts/src/wasm/prepare.rs
index e03eb3d39bc1..caf6ef88c1ba 100644
--- a/frame/contracts/src/wasm/prepare.rs
+++ b/frame/contracts/src/wasm/prepare.rs
@@ -25,7 +25,7 @@ use crate::{
 	wasm::{PrefabWasmModule, env_def::ImportSatisfyCheck},
 };
 use parity_wasm::elements::{self, Internal, External, MemoryType, Type, ValueType};
-use pwasm_utils;
+use sp_runtime::traits::Hash;
 use sp_std::prelude::*;
 
 /// Currently, all imported functions must be located inside this module. We might support
@@ -407,22 +407,11 @@ fn get_memory_limits<T: Config>(module: Option<&MemoryType>, schedule: &Schedule
 	}
 }
 
-/// Loads the given module given in `original_code`, performs some checks on it and
-/// does some preprocessing.
-///
-/// The checks are:
-///
-/// - provided code is a valid wasm module.
-/// - the module doesn't define an internal memory instance,
-/// - imported memory (if any) doesn't reserve more memory than permitted by the `schedule`,
-/// - all imported functions from the external environment matches defined by `env` module,
-///
-/// The preprocessing includes injecting code for gas metering and metering the height of stack.
-pub fn prepare_contract<C: ImportSatisfyCheck, T: Config>(
+fn check_and_instrument<C: ImportSatisfyCheck, T: Config>(
 	original_code: &[u8],
 	schedule: &Schedule<T>,
-) -> Result<PrefabWasmModule, &'static str> {
-	let mut contract_module = ContractModule::new(original_code, schedule)?;
+) -> Result<(Vec<u8>, (u32, u32)), &'static str> {
+	let contract_module = ContractModule::new(&original_code, schedule)?;
 	contract_module.scan_exports()?;
 	contract_module.ensure_no_internal_memory()?;
 	contract_module.ensure_table_size_limit(schedule.limits.table_size)?;
@@ -438,19 +427,65 @@ pub fn prepare_contract<C: ImportSatisfyCheck, T: Config>(
 		schedule
 	)?;
 
-	contract_module = contract_module
+	let code = contract_module
 		.inject_gas_metering()?
-		.inject_stack_height_metering()?;
+		.inject_stack_height_metering()?
+		.into_wasm_code()?;
 
+	Ok((code, memory_limits))
+}
+
+fn do_preparation<C: ImportSatisfyCheck, T: Config>(
+	original_code: Vec<u8>,
+	schedule: &Schedule<T>,
+) -> Result<PrefabWasmModule<T>, &'static str> {
+	let (code, (initial, maximum)) = check_and_instrument::<C, T>(
+		original_code.as_ref(),
+		schedule,
+	)?;
 	Ok(PrefabWasmModule {
 		schedule_version: schedule.version,
-		initial: memory_limits.0,
-		maximum: memory_limits.1,
+		initial,
+		maximum,
 		_reserved: None,
-		code: contract_module.into_wasm_code()?,
+		code,
+		original_code_len: original_code.len() as u32,
+		refcount: 1,
+		code_hash: T::Hashing::hash(&original_code),
+		original_code: Some(original_code),
 	})
 }
 
+/// Loads the given module given in `original_code`, performs some checks on it and
+/// does some preprocessing.
+///
+/// The checks are:
+///
+/// - provided code is a valid wasm module.
+/// - the module doesn't define an internal memory instance,
+/// - imported memory (if any) doesn't reserve more memory than permitted by the `schedule`,
+/// - all imported functions from the external environment matches defined by `env` module,
+///
+/// The preprocessing includes injecting code for gas metering and metering the height of stack.
+pub fn prepare_contract<T: Config>(
+	original_code: Vec<u8>,
+	schedule: &Schedule<T>,
+) -> Result<PrefabWasmModule<T>, &'static str> {
+	do_preparation::<super::runtime::Env, T>(original_code, schedule)
+}
+
+/// The same as [`prepare_contract`] but without constructing a new [`PrefabWasmModule`]
+///
+/// # Note
+///
+/// Use this when an existing contract should be re-instrumented with a newer schedule version.
+pub fn reinstrument_contract<T: Config>(
+	original_code: Vec<u8>,
+	schedule: &Schedule<T>,
+) -> Result<Vec<u8>, &'static str> {
+	Ok(check_and_instrument::<super::runtime::Env, T>(&original_code, schedule)?.0)
+}
+
 /// Alternate (possibly unsafe) preparation functions used only for benchmarking.
 ///
 /// For benchmarking we need to construct special contracts that might not pass our
@@ -459,9 +494,7 @@ pub fn prepare_contract<C: ImportSatisfyCheck, T: Config>(
 /// in production code.
 #[cfg(feature = "runtime-benchmarks")]
 pub mod benchmarking {
-	use super::{
-		Config, ContractModule, PrefabWasmModule, ImportSatisfyCheck, Schedule, get_memory_limits
-	};
+	use super::*;
 	use parity_wasm::elements::FunctionType;
 
 	impl ImportSatisfyCheck for () {
@@ -471,10 +504,10 @@ pub mod benchmarking {
 	}
 
 	/// Prepare function that neither checks nor instruments the passed in code.
-	pub fn prepare_contract<T: Config>(original_code: &[u8], schedule: &Schedule<T>)
-		-> Result<PrefabWasmModule, &'static str>
+	pub fn prepare_contract<T: Config>(original_code: Vec<u8>, schedule: &Schedule<T>)
+		-> Result<PrefabWasmModule<T>, &'static str>
 	{
-		let contract_module = ContractModule::new(original_code, schedule)?;
+		let contract_module = ContractModule::new(&original_code, schedule)?;
 		let memory_limits = get_memory_limits(contract_module.scan_imports::<()>(&[])?, schedule)?;
 		Ok(PrefabWasmModule {
 			schedule_version: schedule.version,
@@ -482,6 +515,10 @@ pub mod benchmarking {
 			maximum: memory_limits.1,
 			_reserved: None,
 			code: contract_module.into_wasm_code()?,
+			original_code_len: original_code.len() as u32,
+			refcount: 1,
+			code_hash: T::Hashing::hash(&original_code),
+			original_code: Some(original_code),
 		})
 	}
 }
@@ -493,7 +530,7 @@ mod tests {
 	use std::fmt;
 	use assert_matches::assert_matches;
 
-	impl fmt::Debug for PrefabWasmModule {
+	impl fmt::Debug for PrefabWasmModule<crate::tests::Test> {
 		fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 			write!(f, "PreparedContract {{ .. }}")
 		}
@@ -534,7 +571,7 @@ mod tests {
 					},
 					.. Default::default()
 				};
-				let r = prepare_contract::<env::Test, crate::tests::Test>(wasm.as_ref(), &schedule);
+				let r = do_preparation::<env::Test, crate::tests::Test>(wasm, &schedule);
 				assert_matches!(r, $($expected)*);
 			}
 		};
@@ -945,7 +982,7 @@ mod tests {
 			).unwrap();
 			let mut schedule = Schedule::default();
 			schedule.enable_println = true;
-			let r = prepare_contract::<env::Test, crate::tests::Test>(wasm.as_ref(), &schedule);
+			let r = do_preparation::<env::Test, crate::tests::Test>(wasm, &schedule);
 			assert_matches!(r, Ok(_));
 		}
 	}
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index bab347b30cfd..9dd098e85266 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -18,7 +18,7 @@
 //! Environment definition of the wasm smart-contract runtime.
 
 use crate::{
-	HostFnWeights, Schedule, Config, CodeHash, BalanceOf, Error,
+	HostFnWeights, Config, CodeHash, BalanceOf, Error,
 	exec::{Ext, StorageKey, TopicOf},
 	gas::{Gas, GasMeter, Token, GasMeterResult, ChargedAmount},
 	wasm::env_def::ConvertibleToWasm,
@@ -300,7 +300,6 @@ fn has_duplicates<T: PartialEq + AsRef<[u8]>>(items: &mut Vec<T>) -> bool {
 pub struct Runtime<'a, E: Ext + 'a> {
 	ext: &'a mut E,
 	input_data: Option<Vec<u8>>,
-	schedule: &'a Schedule<E::T>,
 	memory: sp_sandbox::Memory,
 	gas_meter: &'a mut GasMeter<E::T>,
 	trap_reason: Option<TrapReason>,
@@ -315,14 +314,12 @@ where
 	pub fn new(
 		ext: &'a mut E,
 		input_data: Vec<u8>,
-		schedule: &'a Schedule<E::T>,
 		memory: sp_sandbox::Memory,
 		gas_meter: &'a mut GasMeter<E::T>,
 	) -> Self {
 		Runtime {
 			ext,
 			input_data: Some(input_data),
-			schedule,
 			memory,
 			gas_meter,
 			trap_reason: None,
@@ -411,7 +408,7 @@ where
 	where
 		Tok: Token<E::T, Metadata=HostFnWeights<E::T>>,
 	{
-		match self.gas_meter.charge(&self.schedule.host_fn_weights, token) {
+		match self.gas_meter.charge(&self.ext.schedule().host_fn_weights, token) {
 			GasMeterResult::Proceed(amount) => Ok(amount),
 			GasMeterResult::OutOfGas => Err(Error::<E::T>::OutOfGas.into())
 		}
@@ -425,7 +422,7 @@ where
 	pub fn read_sandbox_memory(&self, ptr: u32, len: u32)
 	-> Result<Vec<u8>, DispatchError>
 	{
-		ensure!(len <= self.schedule.limits.max_memory_size(), Error::<E::T>::OutOfBounds);
+		ensure!(len <= self.ext.schedule().limits.max_memory_size(), Error::<E::T>::OutOfBounds);
 		let mut buf = vec![0u8; len as usize];
 		self.memory.get(ptr, buf.as_mut_slice())
 			.map_err(|_| Error::<E::T>::OutOfBounds)?;
@@ -889,7 +886,7 @@ define_env!(Env, <E: Ext>,
 			match nested_meter {
 				Some(nested_meter) => {
 					ext.instantiate(
-						&code_hash,
+						code_hash,
 						value,
 						nested_meter,
 						input_data,
@@ -1094,7 +1091,7 @@ define_env!(Env, <E: Ext>,
 	// The data is encoded as T::Hash.
 	seal_random(ctx, subject_ptr: u32, subject_len: u32, out_ptr: u32, out_len_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::Random)?;
-		if subject_len > ctx.schedule.limits.subject_len {
+		if subject_len > ctx.ext.schedule().limits.subject_len {
 			Err(Error::<E::T>::RandomSubjectTooLong)?;
 		}
 		let subject_buf = ctx.read_sandbox_memory(subject_ptr, subject_len)?;
@@ -1205,7 +1202,7 @@ define_env!(Env, <E: Ext>,
 			// allocator can handle.
 			ensure!(
 				delta_count
-					.saturating_mul(KEY_SIZE as u32) <= ctx.schedule.limits.max_memory_size(),
+					.saturating_mul(KEY_SIZE as u32) <= ctx.ext.schedule().limits.max_memory_size(),
 				Error::<E::T>::OutOfBounds,
 			);
 			let mut delta = vec![[0; KEY_SIZE]; delta_count as usize];
@@ -1253,7 +1250,7 @@ define_env!(Env, <E: Ext>,
 		};
 
 		// If there are more than `event_topics`, then trap.
-		if topics.len() > ctx.schedule.limits.event_topics as usize {
+		if topics.len() > ctx.ext.schedule().limits.event_topics as usize {
 			Err(Error::<E::T>::TooManyTopics)?;
 		}
 
diff --git a/frame/contracts/src/weights.rs b/frame/contracts/src/weights.rs
index 60d229101816..366022045182 100644
--- a/frame/contracts/src/weights.rs
+++ b/frame/contracts/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_contracts
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.1
-//! DATE: 2021-01-12, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2021-01-25, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -48,8 +48,8 @@ pub trait WeightInfo {
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight;
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight;
 	fn update_schedule() -> Weight;
-	fn put_code(n: u32, ) -> Weight;
-	fn instantiate(n: u32, s: u32, ) -> Weight;
+	fn instantiate_with_code(c: u32, s: u32, ) -> Weight;
+	fn instantiate(s: u32, ) -> Weight;
 	fn call() -> Weight;
 	fn claim_surcharge() -> Weight;
 	fn seal_caller(r: u32, ) -> Weight;
@@ -150,247 +150,247 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn on_initialize() -> Weight {
-		(3_659_000 as Weight)
+		(3_697_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 	}
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
-		(40_731_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((2_317_000 as Weight).saturating_mul(k as Weight))
+		(45_767_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((2_294_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
-		(384_459_000 as Weight)
-			// Standard Error: 45_000
-			.saturating_add((146_401_000 as Weight).saturating_mul(q as Weight))
+		(270_383_000 as Weight)
+			// Standard Error: 42_000
+			.saturating_add((146_901_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn update_schedule() -> Weight {
-		(27_803_000 as Weight)
+		(26_819_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
-	fn put_code(n: u32, ) -> Weight {
+	fn instantiate_with_code(c: u32, s: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 208_000
-			.saturating_add((110_774_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			// Standard Error: 135_000
+			.saturating_add((156_679_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 67_000
+			.saturating_add((2_794_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(6 as Weight))
+			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
-	fn instantiate(n: u32, s: u32, ) -> Weight {
-		(175_290_000 as Weight)
+	fn instantiate(s: u32, ) -> Weight {
+		(189_974_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((3_000 as Weight).saturating_mul(n as Weight))
-			// Standard Error: 1_000
-			.saturating_add((2_244_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((2_250_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
-			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn call() -> Weight {
-		(161_225_000 as Weight)
+		(168_719_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn claim_surcharge() -> Weight {
-		(283_759_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+		(294_458_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn seal_caller(r: u32, ) -> Weight {
-		(118_373_000 as Weight)
-			// Standard Error: 337_000
-			.saturating_add((250_358_000 as Weight).saturating_mul(r as Weight))
+		(123_683_000 as Weight)
+			// Standard Error: 115_000
+			.saturating_add((255_734_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_address(r: u32, ) -> Weight {
-		(125_126_000 as Weight)
-			// Standard Error: 127_000
-			.saturating_add((248_900_000 as Weight).saturating_mul(r as Weight))
+		(120_904_000 as Weight)
+			// Standard Error: 96_000
+			.saturating_add((255_431_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(127_087_000 as Weight)
-			// Standard Error: 145_000
-			.saturating_add((243_311_000 as Weight).saturating_mul(r as Weight))
+		(124_210_000 as Weight)
+			// Standard Error: 124_000
+			.saturating_add((251_138_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_balance(r: u32, ) -> Weight {
-		(123_879_000 as Weight)
-			// Standard Error: 227_000
-			.saturating_add((521_306_000 as Weight).saturating_mul(r as Weight))
+		(127_626_000 as Weight)
+			// Standard Error: 192_000
+			.saturating_add((528_716_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(121_348_000 as Weight)
-			// Standard Error: 125_000
-			.saturating_add((244_379_000 as Weight).saturating_mul(r as Weight))
+		(117_016_000 as Weight)
+			// Standard Error: 109_000
+			.saturating_add((250_620_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(120_680_000 as Weight)
-			// Standard Error: 107_000
-			.saturating_add((244_096_000 as Weight).saturating_mul(r as Weight))
+		(123_945_000 as Weight)
+			// Standard Error: 290_000
+			.saturating_add((252_225_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(117_310_000 as Weight)
-			// Standard Error: 130_000
-			.saturating_add((245_096_000 as Weight).saturating_mul(r as Weight))
+		(119_625_000 as Weight)
+			// Standard Error: 132_000
+			.saturating_add((250_486_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(131_643_000 as Weight)
-			// Standard Error: 171_000
-			.saturating_add((554_208_000 as Weight).saturating_mul(r as Weight))
+		(131_962_000 as Weight)
+			// Standard Error: 187_000
+			.saturating_add((555_772_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_block_number(r: u32, ) -> Weight {
-		(117_553_000 as Weight)
-			// Standard Error: 128_000
-			.saturating_add((244_494_000 as Weight).saturating_mul(r as Weight))
+		(120_356_000 as Weight)
+			// Standard Error: 107_000
+			.saturating_add((249_743_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_now(r: u32, ) -> Weight {
-		(123_184_000 as Weight)
-			// Standard Error: 116_000
-			.saturating_add((244_414_000 as Weight).saturating_mul(r as Weight))
+		(109_890_000 as Weight)
+			// Standard Error: 252_000
+			.saturating_add((253_638_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(132_846_000 as Weight)
-			// Standard Error: 189_000
-			.saturating_add((482_450_000 as Weight).saturating_mul(r as Weight))
+		(128_014_000 as Weight)
+			// Standard Error: 207_000
+			.saturating_add((481_167_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 	}
 	fn seal_gas(r: u32, ) -> Weight {
-		(113_681_000 as Weight)
-			// Standard Error: 116_000
-			.saturating_add((120_711_000 as Weight).saturating_mul(r as Weight))
+		(108_147_000 as Weight)
+			// Standard Error: 101_000
+			.saturating_add((122_462_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_input(r: u32, ) -> Weight {
-		(118_826_000 as Weight)
-			// Standard Error: 89_000
-			.saturating_add((6_650_000 as Weight).saturating_mul(r as Weight))
+		(117_045_000 as Weight)
+			// Standard Error: 57_000
+			.saturating_add((7_168_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(132_497_000 as Weight)
+		(127_286_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((278_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_return(r: u32, ) -> Weight {
-		(112_447_000 as Weight)
-			// Standard Error: 73_000
-			.saturating_add((4_398_000 as Weight).saturating_mul(r as Weight))
+		(111_673_000 as Weight)
+			// Standard Error: 88_000
+			.saturating_add((4_768_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(120_288_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((787_000 as Weight).saturating_mul(n as Weight))
+		(113_767_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((745_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_terminate(r: u32, ) -> Weight {
-		(118_973_000 as Weight)
-			// Standard Error: 124_000
-			.saturating_add((75_967_000 as Weight).saturating_mul(r as Weight))
+		(117_714_000 as Weight)
+			// Standard Error: 82_000
+			.saturating_add((92_096_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
-			.saturating_add(T::DbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(T::DbWeight::get().writes((5 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_restore_to(r: u32, ) -> Weight {
-		(207_295_000 as Weight)
-			// Standard Error: 385_000
-			.saturating_add((103_584_000 as Weight).saturating_mul(r as Weight))
+		(208_895_000 as Weight)
+			// Standard Error: 312_000
+			.saturating_add((125_607_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
-			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(r as Weight)))
-			.saturating_add(T::DbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(T::DbWeight::get().writes((6 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_restore_to_per_delta(d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_349_000
-			.saturating_add((3_693_440_000 as Weight).saturating_mul(d as Weight))
-			.saturating_add(T::DbWeight::get().reads(7 as Weight))
+			// Standard Error: 2_920_000
+			.saturating_add((3_575_765_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add(T::DbWeight::get().reads(8 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
-			.saturating_add(T::DbWeight::get().writes(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
 	}
 	fn seal_random(r: u32, ) -> Weight {
-		(166_160_000 as Weight)
-			// Standard Error: 237_000
-			.saturating_add((594_474_000 as Weight).saturating_mul(r as Weight))
+		(120_578_000 as Weight)
+			// Standard Error: 196_000
+			.saturating_add((604_126_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 	}
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(145_170_000 as Weight)
-			// Standard Error: 397_000
-			.saturating_add((859_096_000 as Weight).saturating_mul(r as Weight))
+		(142_228_000 as Weight)
+			// Standard Error: 476_000
+			.saturating_add((885_528_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_128_905_000 as Weight)
-			// Standard Error: 4_299_000
-			.saturating_add((559_485_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 847_000
-			.saturating_add((253_404_000 as Weight).saturating_mul(n as Weight))
+		(1_157_284_000 as Weight)
+			// Standard Error: 2_081_000
+			.saturating_add((547_132_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 410_000
+			.saturating_add((243_458_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(127_849_000 as Weight)
-			// Standard Error: 220_000
-			.saturating_add((628_543_000 as Weight).saturating_mul(r as Weight))
+		(142_691_000 as Weight)
+			// Standard Error: 237_000
+			.saturating_add((662_375_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 45_695_000
-			.saturating_add((17_015_513_000 as Weight).saturating_mul(r as Weight))
+		(1_111_700_000 as Weight)
+			// Standard Error: 15_818_000
+			.saturating_add((16_429_245_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(1_632_351_000 as Weight)
-			// Standard Error: 399_000
-			.saturating_add((73_694_000 as Weight).saturating_mul(n as Weight))
+		(1_613_716_000 as Weight)
+			// Standard Error: 339_000
+			.saturating_add((67_360_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn seal_clear_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_632_000
-			.saturating_add((2_148_012_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 2_384_000
+			.saturating_add((2_125_855_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_get_storage(r: u32, ) -> Weight {
-		(48_127_000 as Weight)
-			// Standard Error: 1_123_000
-			.saturating_add((906_947_000 as Weight).saturating_mul(r as Weight))
+		(88_908_000 as Weight)
+			// Standard Error: 657_000
+			.saturating_add((894_111_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(676_986_000 as Weight)
-			// Standard Error: 307_000
-			.saturating_add((153_667_000 as Weight).saturating_mul(n as Weight))
+		(680_626_000 as Weight)
+			// Standard Error: 256_000
+			.saturating_add((146_686_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 	}
 	fn seal_transfer(r: u32, ) -> Weight {
-		(36_730_000 as Weight)
-			// Standard Error: 1_966_000
-			.saturating_add((3_972_101_000 as Weight).saturating_mul(r as Weight))
+		(0 as Weight)
+			// Standard Error: 1_355_000
+			.saturating_add((5_086_065_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -398,591 +398,591 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	}
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 10_776_000
-			.saturating_add((9_860_978_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 8_018_000
+			.saturating_add((9_737_605_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().reads((200 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight {
-		(9_838_971_000 as Weight)
-			// Standard Error: 112_906_000
-			.saturating_add((3_413_715_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 40_000
-			.saturating_add((60_054_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 43_000
-			.saturating_add((82_629_000 as Weight).saturating_mul(o as Weight))
+		(6_776_517_000 as Weight)
+			// Standard Error: 181_875_000
+			.saturating_add((3_769_181_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 64_000
+			.saturating_add((57_763_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 69_000
+			.saturating_add((79_752_000 as Weight).saturating_mul(o as Weight))
 			.saturating_add(T::DbWeight::get().reads(206 as Weight))
 			.saturating_add(T::DbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 36_803_000
-			.saturating_add((18_211_156_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 32_551_000
+			.saturating_add((19_948_011_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes((200 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(T::DbWeight::get().writes((300 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_instantiate_per_input_output_salt_kb(i: u32, o: u32, s: u32, ) -> Weight {
-		(15_975_563_000 as Weight)
-			// Standard Error: 167_000
-			.saturating_add((60_759_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 167_000
-			.saturating_add((83_681_000 as Weight).saturating_mul(o as Weight))
-			// Standard Error: 167_000
-			.saturating_add((284_260_000 as Weight).saturating_mul(s as Weight))
+		(19_812_400_000 as Weight)
+			// Standard Error: 80_000
+			.saturating_add((53_676_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 80_000
+			.saturating_add((76_512_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 80_000
+			.saturating_add((274_518_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(207 as Weight))
-			.saturating_add(T::DbWeight::get().writes(202 as Weight))
+			.saturating_add(T::DbWeight::get().writes(203 as Weight))
 	}
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(120_795_000 as Weight)
-			// Standard Error: 115_000
-			.saturating_add((226_658_000 as Weight).saturating_mul(r as Weight))
+		(123_385_000 as Weight)
+			// Standard Error: 128_000
+			.saturating_add((231_897_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(731_640_000 as Weight)
-			// Standard Error: 56_000
-			.saturating_add((430_102_000 as Weight).saturating_mul(n as Weight))
+		(399_641_000 as Weight)
+			// Standard Error: 46_000
+			.saturating_add((427_165_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(121_490_000 as Weight)
-			// Standard Error: 144_000
-			.saturating_add((242_726_000 as Weight).saturating_mul(r as Weight))
+		(120_367_000 as Weight)
+			// Standard Error: 131_000
+			.saturating_add((247_401_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(624_029_000 as Weight)
-			// Standard Error: 36_000
-			.saturating_add((344_476_000 as Weight).saturating_mul(n as Weight))
+		(150_485_000 as Weight)
+			// Standard Error: 39_000
+			.saturating_add((337_450_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(120_959_000 as Weight)
-			// Standard Error: 103_000
-			.saturating_add((215_519_000 as Weight).saturating_mul(r as Weight))
+		(117_139_000 as Weight)
+			// Standard Error: 138_000
+			.saturating_add((221_115_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(713_448_000 as Weight)
-			// Standard Error: 47_000
-			.saturating_add((160_493_000 as Weight).saturating_mul(n as Weight))
+		(428_440_000 as Weight)
+			// Standard Error: 36_000
+			.saturating_add((153_427_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(122_428_000 as Weight)
-			// Standard Error: 111_000
-			.saturating_add((213_863_000 as Weight).saturating_mul(r as Weight))
+		(120_716_000 as Weight)
+			// Standard Error: 116_000
+			.saturating_add((218_086_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(757_838_000 as Weight)
-			// Standard Error: 47_000
-			.saturating_add((160_245_000 as Weight).saturating_mul(n as Weight))
+		(478_148_000 as Weight)
+			// Standard Error: 45_000
+			.saturating_add((153_952_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(24_075_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((3_122_000 as Weight).saturating_mul(r as Weight))
+		(23_526_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((3_125_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(26_406_000 as Weight)
-			// Standard Error: 31_000
-			.saturating_add((159_539_000 as Weight).saturating_mul(r as Weight))
+		(25_653_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((159_121_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(26_266_000 as Weight)
-			// Standard Error: 3_229_000
-			.saturating_add((238_726_000 as Weight).saturating_mul(r as Weight))
+		(25_608_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((229_680_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(27_469_000 as Weight)
-			// Standard Error: 592_000
-			.saturating_add((10_423_000 as Weight).saturating_mul(r as Weight))
+		(24_053_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((11_768_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(24_627_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((11_999_000 as Weight).saturating_mul(r as Weight))
+		(23_478_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((11_992_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(24_008_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((6_614_000 as Weight).saturating_mul(r as Weight))
+		(23_418_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((5_936_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(24_040_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((14_190_000 as Weight).saturating_mul(r as Weight))
+		(23_380_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((13_844_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(23_997_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((15_529_000 as Weight).saturating_mul(r as Weight))
+		(23_509_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((14_912_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(36_890_000 as Weight)
+		(36_616_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((112_000 as Weight).saturating_mul(e as Weight))
+			.saturating_add((104_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(24_266_000 as Weight)
-			// Standard Error: 198_000
-			.saturating_add((99_702_000 as Weight).saturating_mul(r as Weight))
+		(23_821_000 as Weight)
+			// Standard Error: 49_000
+			.saturating_add((96_843_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(31_901_000 as Weight)
-			// Standard Error: 322_000
-			.saturating_add((197_671_000 as Weight).saturating_mul(r as Weight))
+		(31_502_000 as Weight)
+			// Standard Error: 523_000
+			.saturating_add((196_243_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(239_803_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((3_474_000 as Weight).saturating_mul(p as Weight))
+		(242_403_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((3_443_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(41_697_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((3_225_000 as Weight).saturating_mul(r as Weight))
+		(40_816_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((3_178_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(41_698_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((3_458_000 as Weight).saturating_mul(r as Weight))
+		(40_778_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((3_507_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(41_715_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((4_684_000 as Weight).saturating_mul(r as Weight))
+		(40_808_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((4_775_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(27_751_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((7_980_000 as Weight).saturating_mul(r as Weight))
+		(26_983_000 as Weight)
+			// Standard Error: 32_000
+			.saturating_add((8_878_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(27_632_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((12_050_000 as Weight).saturating_mul(r as Weight))
+		(26_975_000 as Weight)
+			// Standard Error: 34_000
+			.saturating_add((12_236_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(26_302_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((3_480_000 as Weight).saturating_mul(r as Weight))
+		(25_691_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((3_577_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(24_695_000 as Weight)
-			// Standard Error: 3_876_000
-			.saturating_add((2_324_806_000 as Weight).saturating_mul(r as Weight))
+		(24_245_000 as Weight)
+			// Standard Error: 3_933_000
+			.saturating_add((2_305_850_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(24_043_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((5_187_000 as Weight).saturating_mul(r as Weight))
+		(23_495_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((5_186_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(24_040_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((5_077_000 as Weight).saturating_mul(r as Weight))
+		(23_441_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((5_224_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(23_995_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((5_801_000 as Weight).saturating_mul(r as Weight))
+		(23_507_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((5_820_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(24_010_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((5_221_000 as Weight).saturating_mul(r as Weight))
+		(23_475_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((5_244_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(24_073_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((5_205_000 as Weight).saturating_mul(r as Weight))
+		(23_437_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((5_204_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(23_993_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((5_079_000 as Weight).saturating_mul(r as Weight))
+		(23_434_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((5_211_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(24_008_000 as Weight)
+		(23_454_000 as Weight)
 			// Standard Error: 16_000
-			.saturating_add((5_077_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((5_181_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(23_991_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((7_248_000 as Weight).saturating_mul(r as Weight))
+		(23_470_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((7_257_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(23_983_000 as Weight)
+		(23_475_000 as Weight)
 			// Standard Error: 21_000
-			.saturating_add((7_303_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((7_132_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(23_991_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((7_106_000 as Weight).saturating_mul(r as Weight))
+		(23_418_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((7_199_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(24_062_000 as Weight)
+		(23_478_000 as Weight)
 			// Standard Error: 25_000
-			.saturating_add((7_168_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((7_278_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(24_028_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((7_130_000 as Weight).saturating_mul(r as Weight))
+		(23_471_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((7_134_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(23_998_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((7_279_000 as Weight).saturating_mul(r as Weight))
+		(23_448_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((7_260_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(24_010_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((7_114_000 as Weight).saturating_mul(r as Weight))
+		(23_409_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((7_064_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(24_003_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((7_052_000 as Weight).saturating_mul(r as Weight))
+		(23_433_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_088_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(23_948_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((7_236_000 as Weight).saturating_mul(r as Weight))
+		(23_425_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((7_152_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(24_042_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((7_223_000 as Weight).saturating_mul(r as Weight))
+		(23_474_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((7_204_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(23_965_000 as Weight)
-			// Standard Error: 37_000
-			.saturating_add((7_261_000 as Weight).saturating_mul(r as Weight))
+		(23_431_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((7_105_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(24_023_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((7_170_000 as Weight).saturating_mul(r as Weight))
+		(23_423_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((7_094_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(24_057_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((7_050_000 as Weight).saturating_mul(r as Weight))
+		(23_407_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((7_149_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(24_038_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((12_934_000 as Weight).saturating_mul(r as Weight))
+		(23_437_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((13_007_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(23_992_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((12_055_000 as Weight).saturating_mul(r as Weight))
+		(23_405_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((12_259_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(24_082_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((12_898_000 as Weight).saturating_mul(r as Weight))
+		(23_469_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((12_950_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(24_025_000 as Weight)
+		(23_460_000 as Weight)
 			// Standard Error: 13_000
-			.saturating_add((12_178_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((12_249_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(23_984_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((7_214_000 as Weight).saturating_mul(r as Weight))
+		(23_434_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((7_111_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(24_012_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((7_183_000 as Weight).saturating_mul(r as Weight))
+		(23_481_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((7_010_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(24_001_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((7_122_000 as Weight).saturating_mul(r as Weight))
+		(23_500_000 as Weight)
+			// Standard Error: 34_000
+			.saturating_add((7_074_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(23_973_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((7_251_000 as Weight).saturating_mul(r as Weight))
+		(23_477_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((7_220_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(23_969_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((7_289_000 as Weight).saturating_mul(r as Weight))
+		(23_433_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((7_305_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(24_008_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((7_292_000 as Weight).saturating_mul(r as Weight))
+		(23_413_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_299_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(24_010_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((7_305_000 as Weight).saturating_mul(r as Weight))
+		(23_468_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((7_204_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(24_001_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((7_299_000 as Weight).saturating_mul(r as Weight))
+		(23_434_000 as Weight)
+			// Standard Error: 32_000
+			.saturating_add((7_255_000 as Weight).saturating_mul(r as Weight))
 	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn on_initialize() -> Weight {
-		(3_659_000 as Weight)
+		(3_697_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 	}
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
-		(40_731_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((2_317_000 as Weight).saturating_mul(k as Weight))
+		(45_767_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((2_294_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
-		(384_459_000 as Weight)
-			// Standard Error: 45_000
-			.saturating_add((146_401_000 as Weight).saturating_mul(q as Weight))
+		(270_383_000 as Weight)
+			// Standard Error: 42_000
+			.saturating_add((146_901_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn update_schedule() -> Weight {
-		(27_803_000 as Weight)
+		(26_819_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
-	fn put_code(n: u32, ) -> Weight {
+	fn instantiate_with_code(c: u32, s: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 208_000
-			.saturating_add((110_774_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			// Standard Error: 135_000
+			.saturating_add((156_679_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 67_000
+			.saturating_add((2_794_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}
-	fn instantiate(n: u32, s: u32, ) -> Weight {
-		(175_290_000 as Weight)
+	fn instantiate(s: u32, ) -> Weight {
+		(189_974_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((3_000 as Weight).saturating_mul(n as Weight))
-			// Standard Error: 1_000
-			.saturating_add((2_244_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((2_250_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn call() -> Weight {
-		(161_225_000 as Weight)
+		(168_719_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn claim_surcharge() -> Weight {
-		(283_759_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+		(294_458_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn seal_caller(r: u32, ) -> Weight {
-		(118_373_000 as Weight)
-			// Standard Error: 337_000
-			.saturating_add((250_358_000 as Weight).saturating_mul(r as Weight))
+		(123_683_000 as Weight)
+			// Standard Error: 115_000
+			.saturating_add((255_734_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_address(r: u32, ) -> Weight {
-		(125_126_000 as Weight)
-			// Standard Error: 127_000
-			.saturating_add((248_900_000 as Weight).saturating_mul(r as Weight))
+		(120_904_000 as Weight)
+			// Standard Error: 96_000
+			.saturating_add((255_431_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(127_087_000 as Weight)
-			// Standard Error: 145_000
-			.saturating_add((243_311_000 as Weight).saturating_mul(r as Weight))
+		(124_210_000 as Weight)
+			// Standard Error: 124_000
+			.saturating_add((251_138_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_balance(r: u32, ) -> Weight {
-		(123_879_000 as Weight)
-			// Standard Error: 227_000
-			.saturating_add((521_306_000 as Weight).saturating_mul(r as Weight))
+		(127_626_000 as Weight)
+			// Standard Error: 192_000
+			.saturating_add((528_716_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(121_348_000 as Weight)
-			// Standard Error: 125_000
-			.saturating_add((244_379_000 as Weight).saturating_mul(r as Weight))
+		(117_016_000 as Weight)
+			// Standard Error: 109_000
+			.saturating_add((250_620_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(120_680_000 as Weight)
-			// Standard Error: 107_000
-			.saturating_add((244_096_000 as Weight).saturating_mul(r as Weight))
+		(123_945_000 as Weight)
+			// Standard Error: 290_000
+			.saturating_add((252_225_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(117_310_000 as Weight)
-			// Standard Error: 130_000
-			.saturating_add((245_096_000 as Weight).saturating_mul(r as Weight))
+		(119_625_000 as Weight)
+			// Standard Error: 132_000
+			.saturating_add((250_486_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(131_643_000 as Weight)
-			// Standard Error: 171_000
-			.saturating_add((554_208_000 as Weight).saturating_mul(r as Weight))
+		(131_962_000 as Weight)
+			// Standard Error: 187_000
+			.saturating_add((555_772_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_block_number(r: u32, ) -> Weight {
-		(117_553_000 as Weight)
-			// Standard Error: 128_000
-			.saturating_add((244_494_000 as Weight).saturating_mul(r as Weight))
+		(120_356_000 as Weight)
+			// Standard Error: 107_000
+			.saturating_add((249_743_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_now(r: u32, ) -> Weight {
-		(123_184_000 as Weight)
-			// Standard Error: 116_000
-			.saturating_add((244_414_000 as Weight).saturating_mul(r as Weight))
+		(109_890_000 as Weight)
+			// Standard Error: 252_000
+			.saturating_add((253_638_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(132_846_000 as Weight)
-			// Standard Error: 189_000
-			.saturating_add((482_450_000 as Weight).saturating_mul(r as Weight))
+		(128_014_000 as Weight)
+			// Standard Error: 207_000
+			.saturating_add((481_167_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 	}
 	fn seal_gas(r: u32, ) -> Weight {
-		(113_681_000 as Weight)
-			// Standard Error: 116_000
-			.saturating_add((120_711_000 as Weight).saturating_mul(r as Weight))
+		(108_147_000 as Weight)
+			// Standard Error: 101_000
+			.saturating_add((122_462_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_input(r: u32, ) -> Weight {
-		(118_826_000 as Weight)
-			// Standard Error: 89_000
-			.saturating_add((6_650_000 as Weight).saturating_mul(r as Weight))
+		(117_045_000 as Weight)
+			// Standard Error: 57_000
+			.saturating_add((7_168_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(132_497_000 as Weight)
+		(127_286_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((278_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_return(r: u32, ) -> Weight {
-		(112_447_000 as Weight)
-			// Standard Error: 73_000
-			.saturating_add((4_398_000 as Weight).saturating_mul(r as Weight))
+		(111_673_000 as Weight)
+			// Standard Error: 88_000
+			.saturating_add((4_768_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(120_288_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((787_000 as Weight).saturating_mul(n as Weight))
+		(113_767_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((745_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_terminate(r: u32, ) -> Weight {
-		(118_973_000 as Weight)
-			// Standard Error: 124_000
-			.saturating_add((75_967_000 as Weight).saturating_mul(r as Weight))
+		(117_714_000 as Weight)
+			// Standard Error: 82_000
+			.saturating_add((92_096_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
-			.saturating_add(RocksDbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(RocksDbWeight::get().writes((5 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_restore_to(r: u32, ) -> Weight {
-		(207_295_000 as Weight)
-			// Standard Error: 385_000
-			.saturating_add((103_584_000 as Weight).saturating_mul(r as Weight))
+		(208_895_000 as Weight)
+			// Standard Error: 312_000
+			.saturating_add((125_607_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
-			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(r as Weight)))
-			.saturating_add(RocksDbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(RocksDbWeight::get().reads((4 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(RocksDbWeight::get().writes((6 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_restore_to_per_delta(d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_349_000
-			.saturating_add((3_693_440_000 as Weight).saturating_mul(d as Weight))
-			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
+			// Standard Error: 2_920_000
+			.saturating_add((3_575_765_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add(RocksDbWeight::get().reads(8 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
-			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(7 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
 	}
 	fn seal_random(r: u32, ) -> Weight {
-		(166_160_000 as Weight)
-			// Standard Error: 237_000
-			.saturating_add((594_474_000 as Weight).saturating_mul(r as Weight))
+		(120_578_000 as Weight)
+			// Standard Error: 196_000
+			.saturating_add((604_126_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 	}
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(145_170_000 as Weight)
-			// Standard Error: 397_000
-			.saturating_add((859_096_000 as Weight).saturating_mul(r as Weight))
+		(142_228_000 as Weight)
+			// Standard Error: 476_000
+			.saturating_add((885_528_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_128_905_000 as Weight)
-			// Standard Error: 4_299_000
-			.saturating_add((559_485_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 847_000
-			.saturating_add((253_404_000 as Weight).saturating_mul(n as Weight))
+		(1_157_284_000 as Weight)
+			// Standard Error: 2_081_000
+			.saturating_add((547_132_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 410_000
+			.saturating_add((243_458_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(127_849_000 as Weight)
-			// Standard Error: 220_000
-			.saturating_add((628_543_000 as Weight).saturating_mul(r as Weight))
+		(142_691_000 as Weight)
+			// Standard Error: 237_000
+			.saturating_add((662_375_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 45_695_000
-			.saturating_add((17_015_513_000 as Weight).saturating_mul(r as Weight))
+		(1_111_700_000 as Weight)
+			// Standard Error: 15_818_000
+			.saturating_add((16_429_245_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(1_632_351_000 as Weight)
-			// Standard Error: 399_000
-			.saturating_add((73_694_000 as Weight).saturating_mul(n as Weight))
+		(1_613_716_000 as Weight)
+			// Standard Error: 339_000
+			.saturating_add((67_360_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn seal_clear_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_632_000
-			.saturating_add((2_148_012_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 2_384_000
+			.saturating_add((2_125_855_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_get_storage(r: u32, ) -> Weight {
-		(48_127_000 as Weight)
-			// Standard Error: 1_123_000
-			.saturating_add((906_947_000 as Weight).saturating_mul(r as Weight))
+		(88_908_000 as Weight)
+			// Standard Error: 657_000
+			.saturating_add((894_111_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(676_986_000 as Weight)
-			// Standard Error: 307_000
-			.saturating_add((153_667_000 as Weight).saturating_mul(n as Weight))
+		(680_626_000 as Weight)
+			// Standard Error: 256_000
+			.saturating_add((146_686_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 	}
 	fn seal_transfer(r: u32, ) -> Weight {
-		(36_730_000 as Weight)
-			// Standard Error: 1_966_000
-			.saturating_add((3_972_101_000 as Weight).saturating_mul(r as Weight))
+		(0 as Weight)
+			// Standard Error: 1_355_000
+			.saturating_add((5_086_065_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
@@ -990,343 +990,343 @@ impl WeightInfo for () {
 	}
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 10_776_000
-			.saturating_add((9_860_978_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 8_018_000
+			.saturating_add((9_737_605_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((200 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight {
-		(9_838_971_000 as Weight)
-			// Standard Error: 112_906_000
-			.saturating_add((3_413_715_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 40_000
-			.saturating_add((60_054_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 43_000
-			.saturating_add((82_629_000 as Weight).saturating_mul(o as Weight))
+		(6_776_517_000 as Weight)
+			// Standard Error: 181_875_000
+			.saturating_add((3_769_181_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 64_000
+			.saturating_add((57_763_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 69_000
+			.saturating_add((79_752_000 as Weight).saturating_mul(o as Weight))
 			.saturating_add(RocksDbWeight::get().reads(206 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 36_803_000
-			.saturating_add((18_211_156_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 32_551_000
+			.saturating_add((19_948_011_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			.saturating_add(RocksDbWeight::get().writes((200 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(RocksDbWeight::get().writes((300 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_instantiate_per_input_output_salt_kb(i: u32, o: u32, s: u32, ) -> Weight {
-		(15_975_563_000 as Weight)
-			// Standard Error: 167_000
-			.saturating_add((60_759_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 167_000
-			.saturating_add((83_681_000 as Weight).saturating_mul(o as Weight))
-			// Standard Error: 167_000
-			.saturating_add((284_260_000 as Weight).saturating_mul(s as Weight))
+		(19_812_400_000 as Weight)
+			// Standard Error: 80_000
+			.saturating_add((53_676_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 80_000
+			.saturating_add((76_512_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 80_000
+			.saturating_add((274_518_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(207 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(202 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(203 as Weight))
 	}
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(120_795_000 as Weight)
-			// Standard Error: 115_000
-			.saturating_add((226_658_000 as Weight).saturating_mul(r as Weight))
+		(123_385_000 as Weight)
+			// Standard Error: 128_000
+			.saturating_add((231_897_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(731_640_000 as Weight)
-			// Standard Error: 56_000
-			.saturating_add((430_102_000 as Weight).saturating_mul(n as Weight))
+		(399_641_000 as Weight)
+			// Standard Error: 46_000
+			.saturating_add((427_165_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(121_490_000 as Weight)
-			// Standard Error: 144_000
-			.saturating_add((242_726_000 as Weight).saturating_mul(r as Weight))
+		(120_367_000 as Weight)
+			// Standard Error: 131_000
+			.saturating_add((247_401_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(624_029_000 as Weight)
-			// Standard Error: 36_000
-			.saturating_add((344_476_000 as Weight).saturating_mul(n as Weight))
+		(150_485_000 as Weight)
+			// Standard Error: 39_000
+			.saturating_add((337_450_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(120_959_000 as Weight)
-			// Standard Error: 103_000
-			.saturating_add((215_519_000 as Weight).saturating_mul(r as Weight))
+		(117_139_000 as Weight)
+			// Standard Error: 138_000
+			.saturating_add((221_115_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(713_448_000 as Weight)
-			// Standard Error: 47_000
-			.saturating_add((160_493_000 as Weight).saturating_mul(n as Weight))
+		(428_440_000 as Weight)
+			// Standard Error: 36_000
+			.saturating_add((153_427_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(122_428_000 as Weight)
-			// Standard Error: 111_000
-			.saturating_add((213_863_000 as Weight).saturating_mul(r as Weight))
+		(120_716_000 as Weight)
+			// Standard Error: 116_000
+			.saturating_add((218_086_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(757_838_000 as Weight)
-			// Standard Error: 47_000
-			.saturating_add((160_245_000 as Weight).saturating_mul(n as Weight))
+		(478_148_000 as Weight)
+			// Standard Error: 45_000
+			.saturating_add((153_952_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(24_075_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((3_122_000 as Weight).saturating_mul(r as Weight))
+		(23_526_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((3_125_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(26_406_000 as Weight)
-			// Standard Error: 31_000
-			.saturating_add((159_539_000 as Weight).saturating_mul(r as Weight))
+		(25_653_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((159_121_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(26_266_000 as Weight)
-			// Standard Error: 3_229_000
-			.saturating_add((238_726_000 as Weight).saturating_mul(r as Weight))
+		(25_608_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((229_680_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(27_469_000 as Weight)
-			// Standard Error: 592_000
-			.saturating_add((10_423_000 as Weight).saturating_mul(r as Weight))
+		(24_053_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((11_768_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(24_627_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((11_999_000 as Weight).saturating_mul(r as Weight))
+		(23_478_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((11_992_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(24_008_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((6_614_000 as Weight).saturating_mul(r as Weight))
+		(23_418_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((5_936_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(24_040_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((14_190_000 as Weight).saturating_mul(r as Weight))
+		(23_380_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((13_844_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(23_997_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((15_529_000 as Weight).saturating_mul(r as Weight))
+		(23_509_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((14_912_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(36_890_000 as Weight)
+		(36_616_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((112_000 as Weight).saturating_mul(e as Weight))
+			.saturating_add((104_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(24_266_000 as Weight)
-			// Standard Error: 198_000
-			.saturating_add((99_702_000 as Weight).saturating_mul(r as Weight))
+		(23_821_000 as Weight)
+			// Standard Error: 49_000
+			.saturating_add((96_843_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(31_901_000 as Weight)
-			// Standard Error: 322_000
-			.saturating_add((197_671_000 as Weight).saturating_mul(r as Weight))
+		(31_502_000 as Weight)
+			// Standard Error: 523_000
+			.saturating_add((196_243_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(239_803_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((3_474_000 as Weight).saturating_mul(p as Weight))
+		(242_403_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((3_443_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(41_697_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((3_225_000 as Weight).saturating_mul(r as Weight))
+		(40_816_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((3_178_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(41_698_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((3_458_000 as Weight).saturating_mul(r as Weight))
+		(40_778_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((3_507_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(41_715_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((4_684_000 as Weight).saturating_mul(r as Weight))
+		(40_808_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((4_775_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(27_751_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((7_980_000 as Weight).saturating_mul(r as Weight))
+		(26_983_000 as Weight)
+			// Standard Error: 32_000
+			.saturating_add((8_878_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(27_632_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((12_050_000 as Weight).saturating_mul(r as Weight))
+		(26_975_000 as Weight)
+			// Standard Error: 34_000
+			.saturating_add((12_236_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(26_302_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((3_480_000 as Weight).saturating_mul(r as Weight))
+		(25_691_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((3_577_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(24_695_000 as Weight)
-			// Standard Error: 3_876_000
-			.saturating_add((2_324_806_000 as Weight).saturating_mul(r as Weight))
+		(24_245_000 as Weight)
+			// Standard Error: 3_933_000
+			.saturating_add((2_305_850_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(24_043_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((5_187_000 as Weight).saturating_mul(r as Weight))
+		(23_495_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((5_186_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(24_040_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((5_077_000 as Weight).saturating_mul(r as Weight))
+		(23_441_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((5_224_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(23_995_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((5_801_000 as Weight).saturating_mul(r as Weight))
+		(23_507_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((5_820_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(24_010_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((5_221_000 as Weight).saturating_mul(r as Weight))
+		(23_475_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((5_244_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(24_073_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((5_205_000 as Weight).saturating_mul(r as Weight))
+		(23_437_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((5_204_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(23_993_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((5_079_000 as Weight).saturating_mul(r as Weight))
+		(23_434_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((5_211_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(24_008_000 as Weight)
+		(23_454_000 as Weight)
 			// Standard Error: 16_000
-			.saturating_add((5_077_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((5_181_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(23_991_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((7_248_000 as Weight).saturating_mul(r as Weight))
+		(23_470_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((7_257_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(23_983_000 as Weight)
+		(23_475_000 as Weight)
 			// Standard Error: 21_000
-			.saturating_add((7_303_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((7_132_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(23_991_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((7_106_000 as Weight).saturating_mul(r as Weight))
+		(23_418_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((7_199_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(24_062_000 as Weight)
+		(23_478_000 as Weight)
 			// Standard Error: 25_000
-			.saturating_add((7_168_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((7_278_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(24_028_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((7_130_000 as Weight).saturating_mul(r as Weight))
+		(23_471_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((7_134_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(23_998_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((7_279_000 as Weight).saturating_mul(r as Weight))
+		(23_448_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((7_260_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(24_010_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((7_114_000 as Weight).saturating_mul(r as Weight))
+		(23_409_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((7_064_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(24_003_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((7_052_000 as Weight).saturating_mul(r as Weight))
+		(23_433_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_088_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(23_948_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((7_236_000 as Weight).saturating_mul(r as Weight))
+		(23_425_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((7_152_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(24_042_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((7_223_000 as Weight).saturating_mul(r as Weight))
+		(23_474_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((7_204_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(23_965_000 as Weight)
-			// Standard Error: 37_000
-			.saturating_add((7_261_000 as Weight).saturating_mul(r as Weight))
+		(23_431_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((7_105_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(24_023_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((7_170_000 as Weight).saturating_mul(r as Weight))
+		(23_423_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((7_094_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(24_057_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((7_050_000 as Weight).saturating_mul(r as Weight))
+		(23_407_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((7_149_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(24_038_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((12_934_000 as Weight).saturating_mul(r as Weight))
+		(23_437_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((13_007_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(23_992_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((12_055_000 as Weight).saturating_mul(r as Weight))
+		(23_405_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((12_259_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(24_082_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((12_898_000 as Weight).saturating_mul(r as Weight))
+		(23_469_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((12_950_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(24_025_000 as Weight)
+		(23_460_000 as Weight)
 			// Standard Error: 13_000
-			.saturating_add((12_178_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((12_249_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(23_984_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((7_214_000 as Weight).saturating_mul(r as Weight))
+		(23_434_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((7_111_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(24_012_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((7_183_000 as Weight).saturating_mul(r as Weight))
+		(23_481_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((7_010_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(24_001_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((7_122_000 as Weight).saturating_mul(r as Weight))
+		(23_500_000 as Weight)
+			// Standard Error: 34_000
+			.saturating_add((7_074_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(23_973_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((7_251_000 as Weight).saturating_mul(r as Weight))
+		(23_477_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((7_220_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(23_969_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((7_289_000 as Weight).saturating_mul(r as Weight))
+		(23_433_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((7_305_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(24_008_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((7_292_000 as Weight).saturating_mul(r as Weight))
+		(23_413_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_299_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(24_010_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((7_305_000 as Weight).saturating_mul(r as Weight))
+		(23_468_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((7_204_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(24_001_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((7_299_000 as Weight).saturating_mul(r as Weight))
+		(23_434_000 as Weight)
+			// Standard Error: 32_000
+			.saturating_add((7_255_000 as Weight).saturating_mul(r as Weight))
 	}
 }

From 169b16f67509366e8a0ceaf8022ec791e4b2eea7 Mon Sep 17 00:00:00 2001
From: David <dvdplm@gmail.com>
Date: Thu, 4 Feb 2021 11:23:20 +0000
Subject: [PATCH 0362/1194] Migrate assets pallet to new macros (#7984)

* Prep: move things around to suggested order

* Compiles, tests pass

* cleanup

* cleanup 2

* Fix dead doc-links

* Add back documentation for storage items

* Switch benchmarks to use `Event` rather than `RawEvent`.

* Update frame/assets/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* reviwe feedback

* Obey line length checks

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
---
 frame/assets/src/benchmarking.rs |  35 +-
 frame/assets/src/lib.rs          | 634 +++++++++++++++++--------------
 frame/support/src/lib.rs         |  16 +-
 3 files changed, 375 insertions(+), 310 deletions(-)

diff --git a/frame/assets/src/benchmarking.rs b/frame/assets/src/benchmarking.rs
index 90b6f65b3989..986eedfb6a86 100644
--- a/frame/assets/src/benchmarking.rs
+++ b/frame/assets/src/benchmarking.rs
@@ -21,6 +21,7 @@ use super::*;
 use sp_runtime::traits::Bounded;
 use frame_system::RawOrigin as SystemOrigin;
 use frame_benchmarking::{benchmarks, account, whitelisted_caller};
+use frame_support::traits::Get;
 
 use crate::Module as Assets;
 
@@ -79,7 +80,7 @@ benchmarks! {
 		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, 1, 1u32.into())
 	verify {
-		assert_last_event::<T>(RawEvent::Created(Default::default(), caller.clone(), caller).into());
+		assert_last_event::<T>(Event::Created(Default::default(), caller.clone(), caller).into());
 	}
 
 	force_create {
@@ -87,7 +88,7 @@ benchmarks! {
 		let caller_lookup = T::Lookup::unlookup(caller.clone());
 	}: _(SystemOrigin::Root, Default::default(), caller_lookup, 1, 1u32.into())
 	verify {
-		assert_last_event::<T>(RawEvent::ForceCreated(Default::default(), caller).into());
+		assert_last_event::<T>(Event::ForceCreated(Default::default(), caller).into());
 	}
 
 	destroy {
@@ -96,7 +97,7 @@ benchmarks! {
 		add_zombies::<T>(caller.clone(), z);
 	}: _(SystemOrigin::Signed(caller), Default::default(), 10_000)
 	verify {
-		assert_last_event::<T>(RawEvent::Destroyed(Default::default()).into());
+		assert_last_event::<T>(Event::Destroyed(Default::default()).into());
 	}
 
 	force_destroy {
@@ -105,7 +106,7 @@ benchmarks! {
 		add_zombies::<T>(caller.clone(), z);
 	}: _(SystemOrigin::Root, Default::default(), 10_000)
 	verify {
-		assert_last_event::<T>(RawEvent::Destroyed(Default::default()).into());
+		assert_last_event::<T>(Event::Destroyed(Default::default()).into());
 	}
 
 	mint {
@@ -113,7 +114,7 @@ benchmarks! {
 		let amount = T::Balance::from(100u32);
 	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, amount)
 	verify {
-		assert_last_event::<T>(RawEvent::Issued(Default::default(), caller, amount).into());
+		assert_last_event::<T>(Event::Issued(Default::default(), caller, amount).into());
 	}
 
 	burn {
@@ -121,7 +122,7 @@ benchmarks! {
 		let (caller, caller_lookup) = create_default_minted_asset::<T>(10, amount);
 	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, amount)
 	verify {
-		assert_last_event::<T>(RawEvent::Burned(Default::default(), caller, amount).into());
+		assert_last_event::<T>(Event::Burned(Default::default(), caller, amount).into());
 	}
 
 	transfer {
@@ -131,7 +132,7 @@ benchmarks! {
 		let target_lookup = T::Lookup::unlookup(target.clone());
 	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), target_lookup, amount)
 	verify {
-		assert_last_event::<T>(RawEvent::Transferred(Default::default(), caller, target, amount).into());
+		assert_last_event::<T>(Event::Transferred(Default::default(), caller, target, amount).into());
 	}
 
 	force_transfer {
@@ -141,14 +142,16 @@ benchmarks! {
 		let target_lookup = T::Lookup::unlookup(target.clone());
 	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, target_lookup, amount)
 	verify {
-		assert_last_event::<T>(RawEvent::ForceTransferred(Default::default(), caller, target, amount).into());
+		assert_last_event::<T>(
+			Event::ForceTransferred(Default::default(), caller, target, amount).into()
+		);
 	}
 
 	freeze {
 		let (caller, caller_lookup) = create_default_minted_asset::<T>(10, 100u32.into());
 	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup)
 	verify {
-		assert_last_event::<T>(RawEvent::Frozen(Default::default(), caller).into());
+		assert_last_event::<T>(Event::Frozen(Default::default(), caller).into());
 	}
 
 	thaw {
@@ -160,14 +163,14 @@ benchmarks! {
 		)?;
 	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup)
 	verify {
-		assert_last_event::<T>(RawEvent::Thawed(Default::default(), caller).into());
+		assert_last_event::<T>(Event::Thawed(Default::default(), caller).into());
 	}
 
 	freeze_asset {
 		let (caller, caller_lookup) = create_default_minted_asset::<T>(10, 100u32.into());
 	}: _(SystemOrigin::Signed(caller.clone()), Default::default())
 	verify {
-		assert_last_event::<T>(RawEvent::AssetFrozen(Default::default()).into());
+		assert_last_event::<T>(Event::AssetFrozen(Default::default()).into());
 	}
 
 	thaw_asset {
@@ -178,7 +181,7 @@ benchmarks! {
 		)?;
 	}: _(SystemOrigin::Signed(caller.clone()), Default::default())
 	verify {
-		assert_last_event::<T>(RawEvent::AssetThawed(Default::default()).into());
+		assert_last_event::<T>(Event::AssetThawed(Default::default()).into());
 	}
 
 	transfer_ownership {
@@ -187,7 +190,7 @@ benchmarks! {
 		let target_lookup = T::Lookup::unlookup(target.clone());
 	}: _(SystemOrigin::Signed(caller), Default::default(), target_lookup)
 	verify {
-		assert_last_event::<T>(RawEvent::OwnerChanged(Default::default(), target).into());
+		assert_last_event::<T>(Event::OwnerChanged(Default::default(), target).into());
 	}
 
 	set_team {
@@ -197,7 +200,7 @@ benchmarks! {
 		let target2 = T::Lookup::unlookup(account("target", 2, SEED));
 	}: _(SystemOrigin::Signed(caller), Default::default(), target0.clone(), target1.clone(), target2.clone())
 	verify {
-		assert_last_event::<T>(RawEvent::TeamChanged(
+		assert_last_event::<T>(Event::TeamChanged(
 			Default::default(),
 			account("target", 0, SEED),
 			account("target", 1, SEED),
@@ -211,7 +214,7 @@ benchmarks! {
 		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 	}: _(SystemOrigin::Signed(caller), Default::default(), max_zombies)
 	verify {
-		assert_last_event::<T>(RawEvent::MaxZombiesChanged(Default::default(), max_zombies).into());
+		assert_last_event::<T>(Event::MaxZombiesChanged(Default::default(), max_zombies).into());
 	}
 
 	set_metadata {
@@ -226,7 +229,7 @@ benchmarks! {
 		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 	}: _(SystemOrigin::Signed(caller), Default::default(), name.clone(), symbol.clone(), decimals)
 	verify {
-		assert_last_event::<T>(RawEvent::MetadataSet(Default::default(), name, symbol, decimals).into());
+		assert_last_event::<T>(Event::MetadataSet(Default::default(), name, symbol, decimals).into());
 	}
 }
 
diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index 099361eceb95..e5fa5f1fa5d1 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -29,9 +29,9 @@
 //! * Asset Freezing
 //! * Asset Destruction (Burning)
 //!
-//! To use it in your runtime, you need to implement the assets [`Config`](./trait.Config.html).
+//! To use it in your runtime, you need to implement the assets [`Config`].
 //!
-//! The supported dispatchable functions are documented in the [`Call`](./enum.Call.html) enum.
+//! The supported dispatchable functions are documented in the [`Call`] enum.
 //!
 //! ### Terminology
 //!
@@ -114,214 +114,81 @@ mod benchmarking;
 pub mod weights;
 
 use sp_std::{fmt::Debug, prelude::*};
-use sp_runtime::{RuntimeDebug, traits::{
-	Member, AtLeast32BitUnsigned, Zero, StaticLookup, Saturating, CheckedSub, CheckedAdd
-}};
+use sp_runtime::{
+	RuntimeDebug,
+	traits::{
+		AtLeast32BitUnsigned, Zero, StaticLookup, Saturating, CheckedSub, CheckedAdd,
+	}
+};
 use codec::{Encode, Decode, HasCompact};
-use frame_support::{Parameter, decl_module, decl_event, decl_storage, decl_error, ensure,
-	traits::{Currency, ReservableCurrency, EnsureOrigin, Get, BalanceStatus::Reserved},
-	dispatch::{DispatchResult, DispatchError},
+use frame_support::{
+	ensure,
+	traits::{Currency, ReservableCurrency, BalanceStatus::Reserved},
+	dispatch::DispatchError,
 };
-use frame_system::ensure_signed;
 pub use weights::WeightInfo;
 
-type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
-
-/// The module configuration trait.
-pub trait Config: frame_system::Config {
-	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
+pub use pallet::*;
 
-	/// The units in which we record balances.
-	type Balance: Member + Parameter + AtLeast32BitUnsigned + Default + Copy;
-
-	/// The arithmetic type of asset identifier.
-	type AssetId: Member + Parameter + Default + Copy + HasCompact;
+type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 
-	/// The currency mechanism.
-	type Currency: ReservableCurrency<Self::AccountId>;
+#[frame_support::pallet]
+pub mod pallet {
+	use frame_support::{
+		dispatch::DispatchResultWithPostInfo,
+		pallet_prelude::*,
+	};
+	use frame_system::pallet_prelude::*;
+	use super::*;
 
-	/// The origin which may forcibly create or destroy an asset.
-	type ForceOrigin: EnsureOrigin<Self::Origin>;
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(PhantomData<T>);
 
-	/// The basic amount of funds that must be reserved when creating a new asset class.
-	type AssetDepositBase: Get<BalanceOf<Self>>;
+	#[pallet::config]
+	/// The module configuration trait.
+	pub trait Config: frame_system::Config {
+		/// The overarching event type.
+		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
 
-	/// The additional funds that must be reserved for every zombie account that an asset class
-	/// supports.
-	type AssetDepositPerZombie: Get<BalanceOf<Self>>;
+		/// The units in which we record balances.
+		type Balance: Member + Parameter + AtLeast32BitUnsigned + Default + Copy;
 
-	/// The maximum length of a name or symbol stored on-chain.
-	type StringLimit: Get<u32>;
+		/// The arithmetic type of asset identifier.
+		type AssetId: Member + Parameter + Default + Copy + HasCompact;
 
-	/// The basic amount of funds that must be reserved when adding metadata to your asset.
-	type MetadataDepositBase: Get<BalanceOf<Self>>;
+		/// The currency mechanism.
+		type Currency: ReservableCurrency<Self::AccountId>;
 
-	/// The additional funds that must be reserved for the number of bytes you store in your
-	/// metadata.
-	type MetadataDepositPerByte: Get<BalanceOf<Self>>;
+		/// The origin which may forcibly create or destroy an asset.
+		type ForceOrigin: EnsureOrigin<Self::Origin>;
 
-	/// Weight information for extrinsics in this pallet.
-	type WeightInfo: WeightInfo;
-}
+		/// The basic amount of funds that must be reserved when creating a new asset class.
+		type AssetDepositBase: Get<BalanceOf<Self>>;
 
-#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug)]
-pub struct AssetDetails<
-	Balance: Encode + Decode + Clone + Debug + Eq + PartialEq,
-	AccountId: Encode + Decode + Clone + Debug + Eq + PartialEq,
-	DepositBalance: Encode + Decode + Clone + Debug + Eq + PartialEq,
-> {
-	/// Can change `owner`, `issuer`, `freezer` and `admin` accounts.
-	owner: AccountId,
-	/// Can mint tokens.
-	issuer: AccountId,
-	/// Can thaw tokens, force transfers and burn tokens from any account.
-	admin: AccountId,
-	/// Can freeze tokens.
-	freezer: AccountId,
-	/// The total supply across all accounts.
-	supply: Balance,
-	/// The balance deposited for this asset.
-	///
-	/// This pays for the data stored here together with any virtual accounts.
-	deposit: DepositBalance,
-	/// The number of balance-holding accounts that this asset may have, excluding those that were
-	/// created when they had a system-level ED.
-	max_zombies: u32,
-	/// The ED for virtual accounts.
-	min_balance: Balance,
-	/// The current number of zombie accounts.
-	zombies: u32,
-	/// The total number of accounts.
-	accounts: u32,
-	/// Whether the asset is frozen for permissionless transfers.
-	is_frozen: bool,
-}
+		/// The additional funds that must be reserved for every zombie account that an asset class
+		/// supports.
+		type AssetDepositPerZombie: Get<BalanceOf<Self>>;
 
-#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default)]
-pub struct AssetBalance<
-	Balance: Encode + Decode + Clone + Debug + Eq + PartialEq,
-> {
-	/// The balance.
-	balance: Balance,
-	/// Whether the account is frozen.
-	is_frozen: bool,
-	/// Whether the account is a zombie. If not, then it has a reference.
-	is_zombie: bool,
-}
+		/// The maximum length of a name or symbol stored on-chain.
+		type StringLimit: Get<u32>;
 
-#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default)]
-pub struct AssetMetadata<DepositBalance> {
-	/// The balance deposited for this metadata.
-	///
-	/// This pays for the data stored in this struct.
-	deposit: DepositBalance,
-	/// The user friendly name of this asset. Limited in length by `StringLimit`.
-	name: Vec<u8>,
-	/// The ticker symbol for this asset. Limited in length by `StringLimit`.
-	symbol: Vec<u8>,
-	/// The number of decimals this asset uses to represent one unit.
-	decimals: u8,
-}
+		/// The basic amount of funds that must be reserved when adding metadata to your asset.
+		type MetadataDepositBase: Get<BalanceOf<Self>>;
 
-decl_storage! {
-	trait Store for Module<T: Config> as Assets {
-		/// Details of an asset.
-		Asset: map hasher(blake2_128_concat) T::AssetId => Option<AssetDetails<
-			T::Balance,
-			T::AccountId,
-			BalanceOf<T>,
-		>>;
-
-		/// The number of units of assets held by any given account.
-		Account: double_map
-			hasher(blake2_128_concat) T::AssetId,
-			hasher(blake2_128_concat) T::AccountId
-			=> AssetBalance<T::Balance>;
-
-		/// Metadata of an asset.
-		Metadata: map hasher(blake2_128_concat) T::AssetId => AssetMetadata<BalanceOf<T>>;
-	}
-}
+		/// The additional funds that must be reserved for the number of bytes you store in your
+		/// metadata.
+		type MetadataDepositPerByte: Get<BalanceOf<Self>>;
 
-decl_event! {
-	pub enum Event<T> where
-		<T as frame_system::Config>::AccountId,
-		<T as Config>::Balance,
-		<T as Config>::AssetId,
-	{
-		/// Some asset class was created. \[asset_id, creator, owner\]
-		Created(AssetId, AccountId, AccountId),
-		/// Some assets were issued. \[asset_id, owner, total_supply\]
-		Issued(AssetId, AccountId, Balance),
-		/// Some assets were transferred. \[asset_id, from, to, amount\]
-		Transferred(AssetId, AccountId, AccountId, Balance),
-		/// Some assets were destroyed. \[asset_id, owner, balance\]
-		Burned(AssetId, AccountId, Balance),
-		/// The management team changed \[asset_id, issuer, admin, freezer\]
-		TeamChanged(AssetId, AccountId, AccountId, AccountId),
-		/// The owner changed \[asset_id, owner\]
-		OwnerChanged(AssetId, AccountId),
-		/// Some assets was transferred by an admin. \[asset_id, from, to, amount\]
-		ForceTransferred(AssetId, AccountId, AccountId, Balance),
-		/// Some account `who` was frozen. \[asset_id, who\]
-		Frozen(AssetId, AccountId),
-		/// Some account `who` was thawed. \[asset_id, who\]
-		Thawed(AssetId, AccountId),
-		/// Some asset `asset_id` was frozen. \[asset_id\]
-		AssetFrozen(AssetId),
-		/// Some asset `asset_id` was thawed. \[asset_id\]
-		AssetThawed(AssetId),
-		/// An asset class was destroyed.
-		Destroyed(AssetId),
-		/// Some asset class was force-created. \[asset_id, owner\]
-		ForceCreated(AssetId, AccountId),
-		/// The maximum amount of zombies allowed has changed. \[asset_id, max_zombies\]
-		MaxZombiesChanged(AssetId, u32),
-		/// New metadata has been set for an asset. \[asset_id, name, symbol, decimals\]
-		MetadataSet(AssetId, Vec<u8>, Vec<u8>, u8),
+		/// Weight information for extrinsics in this pallet.
+		type WeightInfo: WeightInfo;
 	}
-}
 
-decl_error! {
-	pub enum Error for Module<T: Config> {
-		/// Transfer amount should be non-zero.
-		AmountZero,
-		/// Account balance must be greater than or equal to the transfer amount.
-		BalanceLow,
-		/// Balance should be non-zero.
-		BalanceZero,
-		/// The signing account has no permission to do the operation.
-		NoPermission,
-		/// The given asset ID is unknown.
-		Unknown,
-		/// The origin account is frozen.
-		Frozen,
-		/// The asset ID is already taken.
-		InUse,
-		/// Too many zombie accounts in use.
-		TooManyZombies,
-		/// Attempt to destroy an asset class when non-zombie, reference-bearing accounts exist.
-		RefsLeft,
-		/// Invalid witness data given.
-		BadWitness,
-		/// Minimum balance should be non-zero.
-		MinBalanceZero,
-		/// A mint operation lead to an overflow.
-		Overflow,
-		/// Some internal state is broken.
-		BadState,
-		/// Invalid metadata given.
-		BadMetadata,
-	}
-}
-
-decl_module! {
-	pub struct Module<T: Config> for enum Call where origin: T::Origin {
-		type Error = Error<T>;
-
-		fn deposit_event() = default;
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
 
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
 		/// Issue a new class of fungible assets from a public origin.
 		///
 		/// This new asset class has no assets initially.
@@ -345,13 +212,14 @@ decl_module! {
 		/// Emits `Created` event when successful.
 		///
 		/// Weight: `O(1)`
-		#[weight = T::WeightInfo::create()]
-		fn create(origin,
-			#[compact] id: T::AssetId,
+		#[pallet::weight(T::WeightInfo::create())]
+		pub(super) fn create(
+			origin: OriginFor<T>,
+			#[pallet::compact] id: T::AssetId,
 			admin: <T::Lookup as StaticLookup>::Source,
 			max_zombies: u32,
 			min_balance: T::Balance,
-		) {
+		) -> DispatchResultWithPostInfo {
 			let owner = ensure_signed(origin)?;
 			let admin = T::Lookup::lookup(admin)?;
 
@@ -376,7 +244,8 @@ decl_module! {
 				accounts: Zero::zero(),
 				is_frozen: false,
 			});
-			Self::deposit_event(RawEvent::Created(id, owner, admin));
+			Self::deposit_event(Event::Created(id, owner, admin));
+			Ok(().into())
 		}
 
 		/// Issue a new class of fungible assets from a privileged origin.
@@ -400,13 +269,14 @@ decl_module! {
 		/// Emits `ForceCreated` event when successful.
 		///
 		/// Weight: `O(1)`
-		#[weight = T::WeightInfo::force_create()]
-		fn force_create(origin,
-			#[compact] id: T::AssetId,
+		#[pallet::weight(T::WeightInfo::force_create())]
+		pub(super) fn force_create(
+			origin: OriginFor<T>,
+			#[pallet::compact] id: T::AssetId,
 			owner: <T::Lookup as StaticLookup>::Source,
-			#[compact] max_zombies: u32,
-			#[compact] min_balance: T::Balance,
-		) {
+			#[pallet::compact] max_zombies: u32,
+			#[pallet::compact] min_balance: T::Balance,
+		) -> DispatchResultWithPostInfo {
 			T::ForceOrigin::ensure_origin(origin)?;
 			let owner = T::Lookup::lookup(owner)?;
 
@@ -426,7 +296,8 @@ decl_module! {
 				accounts: Zero::zero(),
 				is_frozen: false,
 			});
-			Self::deposit_event(RawEvent::ForceCreated(id, owner));
+			Self::deposit_event(Event::ForceCreated(id, owner));
+			Ok(().into())
 		}
 
 		/// Destroy a class of fungible assets owned by the sender.
@@ -439,11 +310,12 @@ decl_module! {
 		/// Emits `Destroyed` event when successful.
 		///
 		/// Weight: `O(z)` where `z` is the number of zombie accounts.
-		#[weight = T::WeightInfo::destroy(*zombies_witness)]
-		fn destroy(origin,
-			#[compact] id: T::AssetId,
-			#[compact] zombies_witness: u32,
-		) -> DispatchResult {
+		#[pallet::weight(T::WeightInfo::destroy(*zombies_witness))]
+		pub(super) fn destroy(
+			origin: OriginFor<T>,
+			#[pallet::compact] id: T::AssetId,
+			#[pallet::compact] zombies_witness: u32,
+		) -> DispatchResultWithPostInfo {
 			let origin = ensure_signed(origin)?;
 
 			Asset::<T>::try_mutate_exists(id, |maybe_details| {
@@ -457,8 +329,8 @@ decl_module! {
 
 				*maybe_details = None;
 				Account::<T>::remove_prefix(&id);
-				Self::deposit_event(RawEvent::Destroyed(id));
-				Ok(())
+				Self::deposit_event(Event::Destroyed(id));
+				Ok(().into())
 			})
 		}
 
@@ -472,11 +344,12 @@ decl_module! {
 		/// Emits `Destroyed` event when successful.
 		///
 		/// Weight: `O(1)`
-		#[weight = T::WeightInfo::force_destroy(*zombies_witness)]
-		fn force_destroy(origin,
-			#[compact] id: T::AssetId,
-			#[compact] zombies_witness: u32,
-		) -> DispatchResult {
+		#[pallet::weight(T::WeightInfo::force_destroy(*zombies_witness))]
+		pub(super) fn force_destroy(
+			origin: OriginFor<T>,
+			#[pallet::compact] id: T::AssetId,
+			#[pallet::compact] zombies_witness: u32,
+		) -> DispatchResultWithPostInfo {
 			T::ForceOrigin::ensure_origin(origin)?;
 
 			Asset::<T>::try_mutate_exists(id, |maybe_details| {
@@ -489,8 +362,8 @@ decl_module! {
 
 				*maybe_details = None;
 				Account::<T>::remove_prefix(&id);
-				Self::deposit_event(RawEvent::Destroyed(id));
-				Ok(())
+				Self::deposit_event(Event::Destroyed(id));
+				Ok(().into())
 			})
 		}
 
@@ -506,12 +379,13 @@ decl_module! {
 		///
 		/// Weight: `O(1)`
 		/// Modes: Pre-existing balance of `beneficiary`; Account pre-existence of `beneficiary`.
-		#[weight = T::WeightInfo::mint()]
-		fn mint(origin,
-			#[compact] id: T::AssetId,
+		#[pallet::weight(T::WeightInfo::mint())]
+		pub(super) fn mint(
+			origin: OriginFor<T>,
+			#[pallet::compact] id: T::AssetId,
 			beneficiary: <T::Lookup as StaticLookup>::Source,
-			#[compact] amount: T::Balance
-		) -> DispatchResult {
+			#[pallet::compact] amount: T::Balance
+		) -> DispatchResultWithPostInfo {
 			let origin = ensure_signed(origin)?;
 			let beneficiary = T::Lookup::lookup(beneficiary)?;
 
@@ -521,17 +395,17 @@ decl_module! {
 				ensure!(&origin == &details.issuer, Error::<T>::NoPermission);
 				details.supply = details.supply.checked_add(&amount).ok_or(Error::<T>::Overflow)?;
 
-				Account::<T>::try_mutate(id, &beneficiary, |t| -> DispatchResult {
+				Account::<T>::try_mutate(id, &beneficiary, |t| -> DispatchResultWithPostInfo {
 					let new_balance = t.balance.saturating_add(amount);
 					ensure!(new_balance >= details.min_balance, Error::<T>::BalanceLow);
 					if t.balance.is_zero() {
 						t.is_zombie = Self::new_account(&beneficiary, details)?;
 					}
 					t.balance = new_balance;
-					Ok(())
+					Ok(().into())
 				})?;
-				Self::deposit_event(RawEvent::Issued(id, beneficiary, amount));
-				Ok(())
+				Self::deposit_event(Event::Issued(id, beneficiary, amount));
+				Ok(().into())
 			})
 		}
 
@@ -550,12 +424,13 @@ decl_module! {
 		///
 		/// Weight: `O(1)`
 		/// Modes: Post-existence of `who`; Pre & post Zombie-status of `who`.
-		#[weight = T::WeightInfo::burn()]
-		fn burn(origin,
-			#[compact] id: T::AssetId,
+		#[pallet::weight(T::WeightInfo::burn())]
+		pub(super) fn burn(
+			origin: OriginFor<T>,
+			#[pallet::compact] id: T::AssetId,
 			who: <T::Lookup as StaticLookup>::Source,
-			#[compact] amount: T::Balance
-		) -> DispatchResult {
+			#[pallet::compact] amount: T::Balance
+		) -> DispatchResultWithPostInfo {
 			let origin = ensure_signed(origin)?;
 			let who = T::Lookup::lookup(who)?;
 
@@ -583,8 +458,8 @@ decl_module! {
 
 				d.supply = d.supply.saturating_sub(burned);
 
-				Self::deposit_event(RawEvent::Burned(id, who, burned));
-				Ok(())
+				Self::deposit_event(Event::Burned(id, who, burned));
+				Ok(().into())
 			})
 		}
 
@@ -606,12 +481,13 @@ decl_module! {
 		/// Weight: `O(1)`
 		/// Modes: Pre-existence of `target`; Post-existence of sender; Prior & post zombie-status
 		/// of sender; Account pre-existence of `target`.
-		#[weight = T::WeightInfo::transfer()]
-		fn transfer(origin,
-			#[compact] id: T::AssetId,
+		#[pallet::weight(T::WeightInfo::transfer())]
+		pub(super) fn transfer(
+			origin: OriginFor<T>,
+			#[pallet::compact] id: T::AssetId,
 			target: <T::Lookup as StaticLookup>::Source,
-			#[compact] amount: T::Balance
-		) -> DispatchResult {
+			#[pallet::compact] amount: T::Balance
+		) -> DispatchResultWithPostInfo {
 			let origin = ensure_signed(origin)?;
 			ensure!(!amount.is_zero(), Error::<T>::AmountZero);
 
@@ -626,7 +502,7 @@ decl_module! {
 				ensure!(!details.is_frozen, Error::<T>::Frozen);
 
 				if dest == origin {
-					return Ok(())
+					return Ok(().into())
 				}
 
 				let mut amount = amount;
@@ -635,14 +511,14 @@ decl_module! {
 					origin_account.balance = Zero::zero();
 				}
 
-				Account::<T>::try_mutate(id, &dest, |a| -> DispatchResult {
+				Account::<T>::try_mutate(id, &dest, |a| -> DispatchResultWithPostInfo {
 					let new_balance = a.balance.saturating_add(amount);
 					ensure!(new_balance >= details.min_balance, Error::<T>::BalanceLow);
 					if a.balance.is_zero() {
 						a.is_zombie = Self::new_account(&dest, details)?;
 					}
 					a.balance = new_balance;
-					Ok(())
+					Ok(().into())
 				})?;
 
 				match origin_account.balance.is_zero() {
@@ -656,8 +532,8 @@ decl_module! {
 					}
 				}
 
-				Self::deposit_event(RawEvent::Transferred(id, origin, dest, amount));
-				Ok(())
+				Self::deposit_event(Event::Transferred(id, origin, dest, amount));
+				Ok(().into())
 			})
 		}
 
@@ -680,13 +556,14 @@ decl_module! {
 		/// Weight: `O(1)`
 		/// Modes: Pre-existence of `dest`; Post-existence of `source`; Prior & post zombie-status
 		/// of `source`; Account pre-existence of `dest`.
-		#[weight = T::WeightInfo::force_transfer()]
-		fn force_transfer(origin,
-			#[compact] id: T::AssetId,
+		#[pallet::weight(T::WeightInfo::force_transfer())]
+		pub(super) fn force_transfer(
+			origin: OriginFor<T>,
+			#[pallet::compact] id: T::AssetId,
 			source: <T::Lookup as StaticLookup>::Source,
 			dest: <T::Lookup as StaticLookup>::Source,
-			#[compact] amount: T::Balance,
-		) -> DispatchResult {
+			#[pallet::compact] amount: T::Balance,
+		) -> DispatchResultWithPostInfo {
 			let origin = ensure_signed(origin)?;
 
 			let source = T::Lookup::lookup(source)?;
@@ -696,7 +573,7 @@ decl_module! {
 
 			let dest = T::Lookup::lookup(dest)?;
 			if dest == source {
-				return Ok(())
+				return Ok(().into())
 			}
 
 			Asset::<T>::try_mutate(id, |maybe_details| {
@@ -709,14 +586,14 @@ decl_module! {
 					source_account.balance = Zero::zero();
 				}
 
-				Account::<T>::try_mutate(id, &dest, |a| -> DispatchResult {
+				Account::<T>::try_mutate(id, &dest, |a| -> DispatchResultWithPostInfo {
 					let new_balance = a.balance.saturating_add(amount);
 					ensure!(new_balance >= details.min_balance, Error::<T>::BalanceLow);
 					if a.balance.is_zero() {
 						a.is_zombie = Self::new_account(&dest, details)?;
 					}
 					a.balance = new_balance;
-					Ok(())
+					Ok(().into())
 				})?;
 
 				match source_account.balance.is_zero() {
@@ -730,8 +607,8 @@ decl_module! {
 					}
 				}
 
-				Self::deposit_event(RawEvent::ForceTransferred(id, source, dest, amount));
-				Ok(())
+				Self::deposit_event(Event::ForceTransferred(id, source, dest, amount));
+				Ok(().into())
 			})
 		}
 
@@ -745,8 +622,12 @@ decl_module! {
 		/// Emits `Frozen`.
 		///
 		/// Weight: `O(1)`
-		#[weight = T::WeightInfo::freeze()]
-		fn freeze(origin, #[compact] id: T::AssetId, who: <T::Lookup as StaticLookup>::Source) {
+		#[pallet::weight(T::WeightInfo::freeze())]
+		pub(super) fn freeze(
+			origin: OriginFor<T>,
+			#[pallet::compact] id: T::AssetId,
+			who: <T::Lookup as StaticLookup>::Source
+		) -> DispatchResultWithPostInfo {
 			let origin = ensure_signed(origin)?;
 
 			let d = Asset::<T>::get(id).ok_or(Error::<T>::Unknown)?;
@@ -757,6 +638,7 @@ decl_module! {
 			Account::<T>::mutate(id, &who, |a| a.is_frozen = true);
 
 			Self::deposit_event(Event::<T>::Frozen(id, who));
+			Ok(().into())
 		}
 
 		/// Allow unprivileged transfers from an account again.
@@ -769,8 +651,13 @@ decl_module! {
 		/// Emits `Thawed`.
 		///
 		/// Weight: `O(1)`
-		#[weight = T::WeightInfo::thaw()]
-		fn thaw(origin, #[compact] id: T::AssetId, who: <T::Lookup as StaticLookup>::Source) {
+		#[pallet::weight(T::WeightInfo::thaw())]
+		pub(super) fn thaw(
+			origin: OriginFor<T>,
+			#[pallet::compact]
+			id: T::AssetId,
+			who: <T::Lookup as StaticLookup>::Source
+		) -> DispatchResultWithPostInfo {
 			let origin = ensure_signed(origin)?;
 
 			let details = Asset::<T>::get(id).ok_or(Error::<T>::Unknown)?;
@@ -781,6 +668,7 @@ decl_module! {
 			Account::<T>::mutate(id, &who, |a| a.is_frozen = false);
 
 			Self::deposit_event(Event::<T>::Thawed(id, who));
+			Ok(().into())
 		}
 
 		/// Disallow further unprivileged transfers for the asset class.
@@ -792,8 +680,11 @@ decl_module! {
 		/// Emits `Frozen`.
 		///
 		/// Weight: `O(1)`
-		#[weight = T::WeightInfo::freeze_asset()]
-		fn freeze_asset(origin, #[compact] id: T::AssetId) -> DispatchResult {
+		#[pallet::weight(T::WeightInfo::freeze_asset())]
+		pub(super) fn freeze_asset(
+			origin: OriginFor<T>,
+			#[pallet::compact] id: T::AssetId
+		) -> DispatchResultWithPostInfo {
 			let origin = ensure_signed(origin)?;
 
 			Asset::<T>::try_mutate(id, |maybe_details| {
@@ -803,7 +694,7 @@ decl_module! {
 				d.is_frozen = true;
 
 				Self::deposit_event(Event::<T>::AssetFrozen(id));
-				Ok(())
+				Ok(().into())
 			})
 		}
 
@@ -816,8 +707,11 @@ decl_module! {
 		/// Emits `Thawed`.
 		///
 		/// Weight: `O(1)`
-		#[weight = T::WeightInfo::thaw_asset()]
-		fn thaw_asset(origin, #[compact] id: T::AssetId) -> DispatchResult {
+		#[pallet::weight(T::WeightInfo::thaw_asset())]
+		pub(super) fn thaw_asset(
+			origin: OriginFor<T>,
+			#[pallet::compact] id: T::AssetId
+		) -> DispatchResultWithPostInfo {
 			let origin = ensure_signed(origin)?;
 
 			Asset::<T>::try_mutate(id, |maybe_details| {
@@ -827,7 +721,7 @@ decl_module! {
 				d.is_frozen = false;
 
 				Self::deposit_event(Event::<T>::AssetThawed(id));
-				Ok(())
+				Ok(().into())
 			})
 		}
 
@@ -841,26 +735,27 @@ decl_module! {
 		/// Emits `OwnerChanged`.
 		///
 		/// Weight: `O(1)`
-		#[weight = T::WeightInfo::transfer_ownership()]
-		fn transfer_ownership(origin,
-			#[compact] id: T::AssetId,
+		#[pallet::weight(T::WeightInfo::transfer_ownership())]
+		pub(super) fn transfer_ownership(
+			origin: OriginFor<T>,
+			#[pallet::compact] id: T::AssetId,
 			owner: <T::Lookup as StaticLookup>::Source,
-		) -> DispatchResult {
+		) -> DispatchResultWithPostInfo {
 			let origin = ensure_signed(origin)?;
 			let owner = T::Lookup::lookup(owner)?;
 
 			Asset::<T>::try_mutate(id, |maybe_details| {
 				let details = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
 				ensure!(&origin == &details.owner, Error::<T>::NoPermission);
-				if details.owner == owner { return Ok(()) }
+				if details.owner == owner { return Ok(().into()) }
 
 				// Move the deposit to the new owner.
 				T::Currency::repatriate_reserved(&details.owner, &owner, details.deposit, Reserved)?;
 
 				details.owner = owner.clone();
 
-				Self::deposit_event(RawEvent::OwnerChanged(id, owner));
-				Ok(())
+				Self::deposit_event(Event::OwnerChanged(id, owner));
+				Ok(().into())
 			})
 		}
 
@@ -876,13 +771,14 @@ decl_module! {
 		/// Emits `TeamChanged`.
 		///
 		/// Weight: `O(1)`
-		#[weight = T::WeightInfo::set_team()]
-		fn set_team(origin,
-			#[compact] id: T::AssetId,
+		#[pallet::weight(T::WeightInfo::set_team())]
+		pub(super) fn set_team(
+			origin: OriginFor<T>,
+			#[pallet::compact] id: T::AssetId,
 			issuer: <T::Lookup as StaticLookup>::Source,
 			admin: <T::Lookup as StaticLookup>::Source,
 			freezer: <T::Lookup as StaticLookup>::Source,
-		) -> DispatchResult {
+		) -> DispatchResultWithPostInfo {
 			let origin = ensure_signed(origin)?;
 			let issuer = T::Lookup::lookup(issuer)?;
 			let admin = T::Lookup::lookup(admin)?;
@@ -896,8 +792,8 @@ decl_module! {
 				details.admin = admin.clone();
 				details.freezer = freezer.clone();
 
-				Self::deposit_event(RawEvent::TeamChanged(id, issuer, admin, freezer));
-				Ok(())
+				Self::deposit_event(Event::TeamChanged(id, issuer, admin, freezer));
+				Ok(().into())
 			})
 		}
 
@@ -915,11 +811,12 @@ decl_module! {
 		/// Emits `MaxZombiesChanged`.
 		///
 		/// Weight: `O(1)`
-		#[weight = T::WeightInfo::set_max_zombies()]
-		fn set_max_zombies(origin,
-			#[compact] id: T::AssetId,
-			#[compact] max_zombies: u32,
-		) -> DispatchResult {
+		#[pallet::weight(T::WeightInfo::set_max_zombies())]
+		pub(super) fn set_max_zombies(
+			origin: OriginFor<T>,
+			#[pallet::compact] id: T::AssetId,
+			#[pallet::compact] max_zombies: u32,
+		) -> DispatchResultWithPostInfo {
 			let origin = ensure_signed(origin)?;
 
 			Asset::<T>::try_mutate(id, |maybe_details| {
@@ -939,8 +836,8 @@ decl_module! {
 
 				details.max_zombies = max_zombies;
 
-				Self::deposit_event(RawEvent::MaxZombiesChanged(id, max_zombies));
-				Ok(())
+				Self::deposit_event(Event::MaxZombiesChanged(id, max_zombies));
+				Ok(().into())
 			})
 		}
 
@@ -964,13 +861,14 @@ decl_module! {
 		/// Emits `MaxZombiesChanged`.
 		///
 		/// Weight: `O(1)`
-		#[weight = T::WeightInfo::set_metadata(name.len() as u32, symbol.len() as u32)]
-		fn set_metadata(origin,
-			#[compact] id: T::AssetId,
+		#[pallet::weight(T::WeightInfo::set_metadata(name.len() as u32, symbol.len() as u32))]
+		pub(super) fn set_metadata(
+			origin: OriginFor<T>,
+			#[pallet::compact] id: T::AssetId,
 			name: Vec<u8>,
 			symbol: Vec<u8>,
 			decimals: u8,
-		) -> DispatchResult {
+		) -> DispatchResultWithPostInfo {
 			let origin = ensure_signed(origin)?;
 
 			ensure!(name.len() <= T::StringLimit::get() as usize, Error::<T>::BadMetadata);
@@ -1009,15 +907,175 @@ decl_module! {
 					})
 				}
 
-				Self::deposit_event(RawEvent::MetadataSet(id, name, symbol, decimals));
-				Ok(())
+				Self::deposit_event(Event::MetadataSet(id, name, symbol, decimals));
+				Ok(().into())
 			})
 		}
+
+	}
+
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	#[pallet::metadata(T::AccountId = "AccountId", T::Balance = "Balance", T::AssetId = "AssetId")]
+	pub enum Event<T: Config> {
+		/// Some asset class was created. \[asset_id, creator, owner\]
+		Created(T::AssetId, T::AccountId, T::AccountId),
+		/// Some assets were issued. \[asset_id, owner, total_supply\]
+		Issued(T::AssetId, T::AccountId, T::Balance),
+		/// Some assets were transferred. \[asset_id, from, to, amount\]
+		Transferred(T::AssetId, T::AccountId, T::AccountId, T::Balance),
+		/// Some assets were destroyed. \[asset_id, owner, balance\]
+		Burned(T::AssetId, T::AccountId, T::Balance),
+		/// The management team changed \[asset_id, issuer, admin, freezer\]
+		TeamChanged(T::AssetId, T::AccountId, T::AccountId, T::AccountId),
+		/// The owner changed \[asset_id, owner\]
+		OwnerChanged(T::AssetId, T::AccountId),
+		/// Some assets was transferred by an admin. \[asset_id, from, to, amount\]
+		ForceTransferred(T::AssetId, T::AccountId, T::AccountId, T::Balance),
+		/// Some account `who` was frozen. \[asset_id, who\]
+		Frozen(T::AssetId, T::AccountId),
+		/// Some account `who` was thawed. \[asset_id, who\]
+		Thawed(T::AssetId, T::AccountId),
+		/// Some asset `asset_id` was frozen. \[asset_id\]
+		AssetFrozen(T::AssetId),
+		/// Some asset `asset_id` was thawed. \[asset_id\]
+		AssetThawed(T::AssetId),
+		/// An asset class was destroyed.
+		Destroyed(T::AssetId),
+		/// Some asset class was force-created. \[asset_id, owner\]
+		ForceCreated(T::AssetId, T::AccountId),
+		/// The maximum amount of zombies allowed has changed. \[asset_id, max_zombies\]
+		MaxZombiesChanged(T::AssetId, u32),
+		/// New metadata has been set for an asset. \[asset_id, name, symbol, decimals\]
+		MetadataSet(T::AssetId, Vec<u8>, Vec<u8>, u8),
+	}
+
+	#[deprecated(note = "use `Event` instead")]
+	pub type RawEvent<T> = Event<T>;
+
+	#[pallet::error]
+	pub enum Error<T> {
+		/// Transfer amount should be non-zero.
+		AmountZero,
+		/// Account balance must be greater than or equal to the transfer amount.
+		BalanceLow,
+		/// Balance should be non-zero.
+		BalanceZero,
+		/// The signing account has no permission to do the operation.
+		NoPermission,
+		/// The given asset ID is unknown.
+		Unknown,
+		/// The origin account is frozen.
+		Frozen,
+		/// The asset ID is already taken.
+		InUse,
+		/// Too many zombie accounts in use.
+		TooManyZombies,
+		/// Attempt to destroy an asset class when non-zombie, reference-bearing accounts exist.
+		RefsLeft,
+		/// Invalid witness data given.
+		BadWitness,
+		/// Minimum balance should be non-zero.
+		MinBalanceZero,
+		/// A mint operation lead to an overflow.
+		Overflow,
+		/// Some internal state is broken.
+		BadState,
+		/// Invalid metadata given.
+		BadMetadata,
 	}
+
+	#[pallet::storage]
+	/// Details of an asset.
+	pub(super) type Asset<T: Config> = StorageMap<
+		_,
+		Blake2_128Concat,
+		T::AssetId,
+		AssetDetails<T::Balance, T::AccountId, BalanceOf<T>>
+	>;
+	#[pallet::storage]
+	/// The number of units of assets held by any given account.
+	pub(super) type Account<T: Config> = StorageDoubleMap<
+		_,
+		Blake2_128Concat,
+		T::AssetId,
+		Blake2_128Concat,
+		T::AccountId,
+		AssetBalance<T::Balance>,
+		ValueQuery
+	>;
+	#[pallet::storage]
+	/// Metadata of an asset.
+	pub(super) type Metadata<T: Config> = StorageMap<
+		_,
+		Blake2_128Concat,
+		T::AssetId,
+		AssetMetadata<BalanceOf<T>>,
+		ValueQuery
+	>;
+}
+
+#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug)]
+pub struct AssetDetails<
+	Balance: Encode + Decode + Clone + Debug + Eq + PartialEq,
+	AccountId: Encode + Decode + Clone + Debug + Eq + PartialEq,
+	DepositBalance: Encode + Decode + Clone + Debug + Eq + PartialEq,
+> {
+	/// Can change `owner`, `issuer`, `freezer` and `admin` accounts.
+	owner: AccountId,
+	/// Can mint tokens.
+	issuer: AccountId,
+	/// Can thaw tokens, force transfers and burn tokens from any account.
+	admin: AccountId,
+	/// Can freeze tokens.
+	freezer: AccountId,
+	/// The total supply across all accounts.
+	supply: Balance,
+	/// The balance deposited for this asset.
+	///
+	/// This pays for the data stored here together with any virtual accounts.
+	deposit: DepositBalance,
+	/// The number of balance-holding accounts that this asset may have, excluding those that were
+	/// created when they had a system-level ED.
+	max_zombies: u32,
+	/// The ED for virtual accounts.
+	min_balance: Balance,
+	/// The current number of zombie accounts.
+	zombies: u32,
+	/// The total number of accounts.
+	accounts: u32,
+	/// Whether the asset is frozen for permissionless transfers.
+	is_frozen: bool,
+}
+
+#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default)]
+pub struct AssetBalance<
+	Balance: Encode + Decode + Clone + Debug + Eq + PartialEq,
+> {
+	/// The balance.
+	balance: Balance,
+	/// Whether the account is frozen.
+	is_frozen: bool,
+	/// Whether the account is a zombie. If not, then it has a reference.
+	is_zombie: bool,
+}
+
+#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default)]
+pub struct AssetMetadata<DepositBalance> {
+	/// The balance deposited for this metadata.
+	///
+	/// This pays for the data stored in this struct.
+	deposit: DepositBalance,
+	/// The user friendly name of this asset. Limited in length by `StringLimit`.
+	name: Vec<u8>,
+	/// The ticker symbol for this asset. Limited in length by `StringLimit`.
+	symbol: Vec<u8>,
+	/// The number of decimals this asset uses to represent one unit.
+	decimals: u8,
 }
 
 // The main implementation block for the module.
-impl<T: Config> Module<T> {
+impl<T: Config> Pallet<T> {
 	// Public immutables
 
 	/// Get the asset `id` balance of `who`.
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 08852a7f3c1f..951e12c9c7d4 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -1874,11 +1874,15 @@ pub mod pallet_prelude {
 ///
 /// ## Upgrade guidelines:
 ///
-/// 1. export metadata of the pallet for later checks
-/// 2. generate the template upgrade for the pallet provided by decl_storage with environment
-/// 	variable `PRINT_PALLET_UPGRADE`: `PRINT_PALLET_UPGRADE=1 cargo check -p my_pallet`
-/// 	This template can be used as information it contains all information for storages, genesis
-/// 	config and genesis build.
+/// 1. Export the metadata of the pallet for later checks
+///     - run your node with the pallet active
+///     - query the metadata using the `state_getMetadata` RPC and curl, or use
+///       `subsee -p <PALLET_NAME> > meta.json`
+/// 2. generate the template upgrade for the pallet provided by decl_storage
+///     with environment variable `PRINT_PALLET_UPGRADE`:
+///     `PRINT_PALLET_UPGRADE=1 cargo check -p my_pallet` This template can be
+///     used as information it contains all information for storages, genesis
+///     config and genesis build.
 /// 3. reorganize pallet to have trait `Config`, `decl_*` macros, `ValidateUnsigned`,
 /// 	`ProvideInherent`, `Origin` all together in one file. Suggested order:
 /// 	* Config,
@@ -1925,7 +1929,7 @@ pub mod pallet_prelude {
 /// 	impl<T: Config> Pallet<T> {
 /// 	}
 /// 	```
-/// 	and write inside all the call in decl_module with a few changes in the signature:
+/// 	and write inside all the calls in decl_module with a few changes in the signature:
 /// 	- origin must now be written completely, e.g. `origin: OriginFor<T>`
 /// 	- result type must be `DispatchResultWithPostInfo`, you need to write it and also you might
 /// 	need to put `Ok(().into())` at the end or the function.

From 85c479f2ed3a762de2629faffcdbb70a69e70a6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Thu, 4 Feb 2021 15:22:11 +0000
Subject: [PATCH 0363/1194] babe, grandpa: cleanup stale equivocation reports
 (#8041)

* grandpa: check equivocation report staleness on `validate_unsigned`

* babe: check equivocation report staleness on `validate_unsigned`

* node: bump spec_version

* babe, grandpa: remove duplicate call destructuring
---
 bin/node/runtime/src/lib.rs       |  2 +-
 frame/babe/src/equivocation.rs    | 49 +++++++++++++------------
 frame/babe/src/tests.rs           | 11 +++++-
 frame/grandpa/src/equivocation.rs | 59 ++++++++++++++++++-------------
 frame/grandpa/src/tests.rs        |  9 +++++
 5 files changed, 81 insertions(+), 49 deletions(-)

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index c2a2542b5588..4b0998c122c1 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -112,7 +112,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	// and set impl_version to 0. If only runtime
 	// implementation changes and behavior does not, then leave spec_version as
 	// is and increment impl_version.
-	spec_version: 262,
+	spec_version: 263,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 2,
diff --git a/frame/babe/src/equivocation.rs b/frame/babe/src/equivocation.rs
index 9e487769aba3..a0a1ff4fa0d9 100644
--- a/frame/babe/src/equivocation.rs
+++ b/frame/babe/src/equivocation.rs
@@ -167,7 +167,7 @@ where
 impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
 	type Call = Call<T>;
 	fn validate_unsigned(source: TransactionSource, call: &Self::Call) -> TransactionValidity {
-		if let Call::report_equivocation_unsigned(equivocation_proof, _) = call {
+		if let Call::report_equivocation_unsigned(equivocation_proof, key_owner_proof) = call {
 			// discard equivocation report not coming from the local node
 			match source {
 				TransactionSource::Local | TransactionSource::InBlock => { /* allowed */ }
@@ -181,6 +181,9 @@ impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
 				}
 			}
 
+			// check report staleness
+			is_known_offence::<T>(equivocation_proof, key_owner_proof)?;
+
 			ValidTransaction::with_tag_prefix("BabeEquivocation")
 				// We assign the maximum priority for any equivocation report.
 				.priority(TransactionPriority::max_value())
@@ -199,33 +202,35 @@ impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
 
 	fn pre_dispatch(call: &Self::Call) -> Result<(), TransactionValidityError> {
 		if let Call::report_equivocation_unsigned(equivocation_proof, key_owner_proof) = call {
-			// check the membership proof to extract the offender's id
-			let key = (
-				sp_consensus_babe::KEY_TYPE,
-				equivocation_proof.offender.clone(),
-			);
-
-			let offender = T::KeyOwnerProofSystem::check_proof(key, key_owner_proof.clone())
-				.ok_or(InvalidTransaction::BadProof)?;
-
-			// check if the offence has already been reported,
-			// and if so then we can discard the report.
-			let is_known_offence = T::HandleEquivocation::is_known_offence(
-				&[offender],
-				&equivocation_proof.slot,
-			);
-
-			if is_known_offence {
-				Err(InvalidTransaction::Stale.into())
-			} else {
-				Ok(())
-			}
+			is_known_offence::<T>(equivocation_proof, key_owner_proof)
 		} else {
 			Err(InvalidTransaction::Call.into())
 		}
 	}
 }
 
+fn is_known_offence<T: Config>(
+	equivocation_proof: &EquivocationProof<T::Header>,
+	key_owner_proof: &T::KeyOwnerProof,
+) -> Result<(), TransactionValidityError> {
+	// check the membership proof to extract the offender's id
+	let key = (
+		sp_consensus_babe::KEY_TYPE,
+		equivocation_proof.offender.clone(),
+	);
+
+	let offender = T::KeyOwnerProofSystem::check_proof(key, key_owner_proof.clone())
+		.ok_or(InvalidTransaction::BadProof)?;
+
+	// check if the offence has already been reported,
+	// and if so then we can discard the report.
+	if T::HandleEquivocation::is_known_offence(&[offender], &equivocation_proof.slot) {
+		Err(InvalidTransaction::Stale.into())
+	} else {
+		Ok(())
+	}
+}
+
 /// A BABE equivocation offence report.
 ///
 /// When a validator released two or more blocks at the same slot.
diff --git a/frame/babe/src/tests.rs b/frame/babe/src/tests.rs
index 62b38896802d..e4649d253c93 100644
--- a/frame/babe/src/tests.rs
+++ b/frame/babe/src/tests.rs
@@ -676,7 +676,16 @@ fn report_equivocation_validate_unsigned_prevents_duplicates() {
 		Babe::report_equivocation_unsigned(Origin::none(), equivocation_proof, key_owner_proof)
 			.unwrap();
 
-		// the report should now be considered stale and the transaction is invalid
+		// the report should now be considered stale and the transaction is invalid.
+		// the check for staleness should be done on both `validate_unsigned` and on `pre_dispatch`
+		assert_err!(
+			<Babe as sp_runtime::traits::ValidateUnsigned>::validate_unsigned(
+				TransactionSource::Local,
+				&inner,
+			),
+			InvalidTransaction::Stale,
+		);
+
 		assert_err!(
 			<Babe as sp_runtime::traits::ValidateUnsigned>::pre_dispatch(&inner),
 			InvalidTransaction::Stale,
diff --git a/frame/grandpa/src/equivocation.rs b/frame/grandpa/src/equivocation.rs
index 593ebf6ba650..bf0586848134 100644
--- a/frame/grandpa/src/equivocation.rs
+++ b/frame/grandpa/src/equivocation.rs
@@ -190,7 +190,7 @@ pub struct GrandpaTimeSlot {
 impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
 	type Call = Call<T>;
 	fn validate_unsigned(source: TransactionSource, call: &Self::Call) -> TransactionValidity {
-		if let Call::report_equivocation_unsigned(equivocation_proof, _) = call {
+		if let Call::report_equivocation_unsigned(equivocation_proof, key_owner_proof) = call {
 			// discard equivocation report not coming from the local node
 			match source {
 				TransactionSource::Local | TransactionSource::InBlock => { /* allowed */ }
@@ -204,6 +204,9 @@ impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
 				}
 			}
 
+			// check report staleness
+			is_known_offence::<T>(equivocation_proof, key_owner_proof)?;
+
 			ValidTransaction::with_tag_prefix("GrandpaEquivocation")
 				// We assign the maximum priority for any equivocation report.
 				.priority(TransactionPriority::max_value())
@@ -223,36 +226,42 @@ impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
 
 	fn pre_dispatch(call: &Self::Call) -> Result<(), TransactionValidityError> {
 		if let Call::report_equivocation_unsigned(equivocation_proof, key_owner_proof) = call {
-			// check the membership proof to extract the offender's id
-			let key = (
-				sp_finality_grandpa::KEY_TYPE,
-				equivocation_proof.offender().clone(),
-			);
-
-			let offender = T::KeyOwnerProofSystem::check_proof(key, key_owner_proof.clone())
-				.ok_or(InvalidTransaction::BadProof)?;
-
-			// check if the offence has already been reported,
-			// and if so then we can discard the report.
-			let time_slot =
-				<T::HandleEquivocation as HandleEquivocation<T>>::Offence::new_time_slot(
-					equivocation_proof.set_id(),
-					equivocation_proof.round(),
-				);
-
-			let is_known_offence = T::HandleEquivocation::is_known_offence(&[offender], &time_slot);
-
-			if is_known_offence {
-				Err(InvalidTransaction::Stale.into())
-			} else {
-				Ok(())
-			}
+			is_known_offence::<T>(equivocation_proof, key_owner_proof)
 		} else {
 			Err(InvalidTransaction::Call.into())
 		}
 	}
 }
 
+fn is_known_offence<T: Config>(
+	equivocation_proof: &EquivocationProof<T::Hash, T::BlockNumber>,
+	key_owner_proof: &T::KeyOwnerProof,
+) -> Result<(), TransactionValidityError> {
+	// check the membership proof to extract the offender's id
+	let key = (
+		sp_finality_grandpa::KEY_TYPE,
+		equivocation_proof.offender().clone(),
+	);
+
+	let offender = T::KeyOwnerProofSystem::check_proof(key, key_owner_proof.clone())
+		.ok_or(InvalidTransaction::BadProof)?;
+
+	// check if the offence has already been reported,
+	// and if so then we can discard the report.
+	let time_slot = <T::HandleEquivocation as HandleEquivocation<T>>::Offence::new_time_slot(
+		equivocation_proof.set_id(),
+		equivocation_proof.round(),
+	);
+
+	let is_known_offence = T::HandleEquivocation::is_known_offence(&[offender], &time_slot);
+
+	if is_known_offence {
+		Err(InvalidTransaction::Stale.into())
+	} else {
+		Ok(())
+	}
+}
+
 /// A grandpa equivocation offence report.
 #[allow(dead_code)]
 pub struct GrandpaEquivocationOffence<FullIdentification> {
diff --git a/frame/grandpa/src/tests.rs b/frame/grandpa/src/tests.rs
index 4870bf606286..0964be5993b0 100644
--- a/frame/grandpa/src/tests.rs
+++ b/frame/grandpa/src/tests.rs
@@ -775,6 +775,15 @@ fn report_equivocation_validate_unsigned_prevents_duplicates() {
 			.unwrap();
 
 		// the report should now be considered stale and the transaction is invalid
+		// the check for staleness should be done on both `validate_unsigned` and on `pre_dispatch`
+		assert_err!(
+			<Grandpa as sp_runtime::traits::ValidateUnsigned>::validate_unsigned(
+				TransactionSource::Local,
+				&call,
+			),
+			InvalidTransaction::Stale,
+		);
+
 		assert_err!(
 			<Grandpa as sp_runtime::traits::ValidateUnsigned>::pre_dispatch(&call),
 			InvalidTransaction::Stale,

From 05eb8d9a4de61b81800797485b56d939e4b58edf Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Thu, 4 Feb 2021 16:57:59 +0100
Subject: [PATCH 0364/1194] move some pallet test to use construct_runtime
 (#8049)

* migrate some more pallets

* revert example-offcahin-worker as not straightforward

* fix mmr
---
 Cargo.lock                              |  1 +
 frame/identity/src/tests.rs             | 38 ++++++++-------
 frame/im-online/src/mock.rs             | 47 +++++++++---------
 frame/lottery/Cargo.toml                |  1 +
 frame/lottery/src/mock.rs               | 39 ++++++++-------
 frame/membership/src/lib.rs             | 36 +++++++-------
 frame/merkle-mountain-range/src/mock.rs | 31 +++++++-----
 frame/multisig/src/tests.rs             | 57 +++++++++-------------
 frame/nicks/src/lib.rs                  | 38 ++++++++-------
 frame/node-authorization/src/lib.rs     | 39 ++++++++-------
 frame/offences/src/mock.rs              | 50 +++++++++-----------
 frame/offences/src/tests.rs             |  8 ++--
 frame/proxy/src/tests.rs                | 63 ++++++++++---------------
 13 files changed, 217 insertions(+), 231 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1b77246031f7..58c4da80d3b6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4791,6 +4791,7 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "parity-scale-codec",
+ "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
diff --git a/frame/identity/src/tests.rs b/frame/identity/src/tests.rs
index 0ac3c93a75b0..230079a21ea0 100644
--- a/frame/identity/src/tests.rs
+++ b/frame/identity/src/tests.rs
@@ -18,24 +18,31 @@
 // Tests for Identity Pallet
 
 use super::*;
+use crate as pallet_identity;
 
 use sp_runtime::traits::BadOrigin;
-use frame_support::{
-	assert_ok, assert_noop, impl_outer_origin, parameter_types,
-	ord_parameter_types,
-};
+use frame_support::{assert_ok, assert_noop, parameter_types, ord_parameter_types};
 use sp_core::H256;
 use frame_system::{EnsureSignedBy, EnsureOneOf, EnsureRoot};
 use sp_runtime::{
 	testing::Header, traits::{BlakeTwo256, IdentityLookup},
 };
 
-impl_outer_origin! {
-	pub enum Origin for Test where system = frame_system {}
-}
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
+		Identity: pallet_identity::{Module, Call, Storage, Event<T>},
+	}
+);
 
-#[derive(Clone, Eq, PartialEq)]
-pub struct Test;
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 	pub BlockWeights: frame_system::limits::BlockWeights =
@@ -49,16 +56,16 @@ impl frame_system::Config for Test {
 	type Index = u64;
 	type BlockNumber = u64;
 	type Hash = H256;
-	type Call = ();
+	type Call = Call;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type Header = Header;
-	type Event = ();
+	type Event = Event;
 	type BlockHashCount = BlockHashCount;
 	type DbWeight = ();
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -70,7 +77,7 @@ parameter_types! {
 }
 impl pallet_balances::Config for Test {
 	type Balance = u64;
-	type Event = ();
+	type Event = Event;
 	type DustRemoval = ();
 	type ExistentialDeposit = ExistentialDeposit;
 	type AccountStore = System;
@@ -100,7 +107,7 @@ type EnsureTwoOrRoot = EnsureOneOf<
 	EnsureSignedBy<Two, u64>
 >;
 impl Config for Test {
-	type Event = ();
+	type Event = Event;
 	type Currency = Balances;
 	type Slashed = ();
 	type BasicDeposit = BasicDeposit;
@@ -113,9 +120,6 @@ impl Config for Test {
 	type ForceOrigin = EnsureTwoOrRoot;
 	type WeightInfo = ();
 }
-type System = frame_system::Module<Test>;
-type Balances = pallet_balances::Module<Test>;
-type Identity = Module<Test>;
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
diff --git a/frame/im-online/src/mock.rs b/frame/im-online/src/mock.rs
index cf2138e941d0..1b80f5b12ded 100644
--- a/frame/im-online/src/mock.rs
+++ b/frame/im-online/src/mock.rs
@@ -21,23 +21,31 @@
 
 use std::cell::RefCell;
 
-use crate::{Module, Config};
+use crate::Config;
 use sp_runtime::Perbill;
 use sp_staking::{SessionIndex, offence::{ReportOffence, OffenceError}};
 use sp_runtime::testing::{Header, UintAuthorityId, TestXt};
 use sp_runtime::traits::{IdentityLookup, BlakeTwo256, ConvertInto};
 use sp_core::H256;
-use frame_support::{impl_outer_origin, impl_outer_dispatch, parameter_types};
-
-impl_outer_origin!{
-	pub enum Origin for Runtime {}
-}
-
-impl_outer_dispatch! {
-	pub enum Call for Runtime where origin: Origin {
-		imonline::ImOnline,
+use frame_support::parameter_types;
+use crate as imonline;
+use pallet_session::historical as pallet_session_historical;
+
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
+type Block = frame_system::mocking::MockBlock<Runtime>;
+
+frame_support::construct_runtime!(
+	pub enum Runtime where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Session: pallet_session::{Module, Call, Storage, Event, Config<T>},
+		ImOnline: imonline::{Module, Call, Storage, Config<T>, Event<T>},
+		Historical: pallet_session_historical::{Module},
 	}
-}
+);
 
 thread_local! {
 	pub static VALIDATORS: RefCell<Option<Vec<u64>>> = RefCell::new(Some(vec![
@@ -99,9 +107,6 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 	t.into()
 }
 
-#[derive(Clone, PartialEq, Eq, Debug)]
-pub struct Runtime;
-
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 	pub BlockWeights: frame_system::limits::BlockWeights =
@@ -122,10 +127,10 @@ impl frame_system::Config for Runtime {
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type Header = Header;
-	type Event = ();
+	type Event = Event;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -149,7 +154,7 @@ impl pallet_session::Config for Runtime {
 	type ValidatorId = u64;
 	type ValidatorIdOf = ConvertInto;
 	type Keys = UintAuthorityId;
-	type Event = ();
+	type Event = Event;
 	type DisabledValidatorsThreshold = DisabledValidatorsThreshold;
 	type NextSessionRotation = pallet_session::PeriodicSessions<Period, Offset>;
 	type WeightInfo = ();
@@ -177,7 +182,7 @@ parameter_types! {
 
 impl Config for Runtime {
 	type AuthorityId = UintAuthorityId;
-	type Event = ();
+	type Event = Event;
 	type ReportUnresponsiveness = OffenceHandler;
 	type ValidatorSet = Historical;
 	type SessionDuration = Period;
@@ -192,12 +197,6 @@ impl<LocalCall> frame_system::offchain::SendTransactionTypes<LocalCall> for Runt
 	type Extrinsic = Extrinsic;
 }
 
-/// Im Online module.
-pub type ImOnline = Module<Runtime>;
-pub type System = frame_system::Module<Runtime>;
-pub type Session = pallet_session::Module<Runtime>;
-pub type Historical = pallet_session::historical::Module<Runtime>;
-
 pub fn advance_session() {
 	let now = System::block_number().max(1);
 	System::set_block_number(now + 1);
diff --git a/frame/lottery/Cargo.toml b/frame/lottery/Cargo.toml
index 49ae53ff1dfd..e571b4f450a6 100644
--- a/frame/lottery/Cargo.toml
+++ b/frame/lottery/Cargo.toml
@@ -25,6 +25,7 @@ frame-benchmarking = { version = "2.0.0", default-features = false, path = "../b
 pallet-balances = { version = "2.0.0", path = "../balances" }
 sp-core = { version = "2.0.0", path = "../../primitives/core" }
 sp-io = { version = "2.0.0", path = "../../primitives/io" }
+serde = { version = "1.0.101" }
 
 [features]
 default = ["std"]
diff --git a/frame/lottery/src/mock.rs b/frame/lottery/src/mock.rs
index 0f25e9fc7fac..ea73ee190e6d 100644
--- a/frame/lottery/src/mock.rs
+++ b/frame/lottery/src/mock.rs
@@ -18,9 +18,10 @@
 //! Test utilities
 
 use super::*;
+use crate as pallet_lottery;
 
 use frame_support::{
-	impl_outer_origin, impl_outer_dispatch, parameter_types,
+	parameter_types,
 	traits::{OnInitialize, OnFinalize, TestRandomness},
 };
 use sp_core::H256;
@@ -31,19 +32,21 @@ use sp_runtime::{
 };
 use frame_system::EnsureRoot;
 
-impl_outer_origin! {
-	pub enum Origin for Test {}
-}
-
-impl_outer_dispatch! {
-	pub enum Call for Test where origin: Origin {
-		frame_system::System,
-		pallet_balances::Balances,
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
+		Lottery: pallet_lottery::{Module, Call, Storage, Event<T>},
 	}
-}
+);
 
-#[derive(Clone, Eq, PartialEq)]
-pub struct Test;
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 	pub const MaximumBlockWeight: u32 = 1024;
@@ -65,10 +68,10 @@ impl frame_system::Config for Test {
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type Header = Header;
-	type Event = ();
+	type Event = Event;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -83,7 +86,7 @@ parameter_types! {
 impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u64;
-	type Event = ();
+	type Event = Event;
 	type DustRemoval = ();
 	type ExistentialDeposit = ExistentialDeposit;
 	type AccountStore = System;
@@ -101,7 +104,7 @@ impl Config for Test {
 	type Call = Call;
 	type Currency = Balances;
 	type Randomness = TestRandomness;
-	type Event = ();
+	type Event = Event;
 	type ManagerOrigin = EnsureRoot<u64>;
 	type MaxCalls = MaxCalls;
 	type ValidateCall = Lottery;
@@ -109,10 +112,6 @@ impl Config for Test {
 	type WeightInfo = ();
 }
 
-pub type Lottery = Module<Test>;
-pub type System = frame_system::Module<Test>;
-pub type Balances = pallet_balances::Module<Test>;
-
 pub type SystemCall = frame_system::Call<Test>;
 pub type BalancesCall = pallet_balances::Call<Test>;
 
diff --git a/frame/membership/src/lib.rs b/frame/membership/src/lib.rs
index a43a5b4089f1..f08093809544 100644
--- a/frame/membership/src/lib.rs
+++ b/frame/membership/src/lib.rs
@@ -277,21 +277,27 @@ impl<T: Config<I>, I: Instance> Contains<T::AccountId> for Module<T, I> {
 #[cfg(test)]
 mod tests {
 	use super::*;
+	use crate as pallet_membership;
 
-	use frame_support::{
-		assert_ok, assert_noop, impl_outer_origin, parameter_types,
-		ord_parameter_types
-	};
+	use frame_support::{assert_ok, assert_noop, parameter_types, ord_parameter_types};
 	use sp_core::H256;
 	use sp_runtime::{traits::{BlakeTwo256, IdentityLookup, BadOrigin}, testing::Header};
 	use frame_system::EnsureSignedBy;
 
-	impl_outer_origin! {
-		pub enum Origin for Test where system = frame_system {}
-	}
+	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+	type Block = frame_system::mocking::MockBlock<Test>;
+
+	frame_support::construct_runtime!(
+		pub enum Test where
+			Block = Block,
+			NodeBlock = Block,
+			UncheckedExtrinsic = UncheckedExtrinsic,
+		{
+			System: frame_system::{Module, Call, Config, Storage, Event<T>},
+			Membership: pallet_membership::{Module, Call, Storage, Config<T>, Event<T>},
+		}
+	);
 
-	#[derive(Clone, Eq, PartialEq)]
-	pub struct Test;
 	parameter_types! {
 		pub const BlockHashCount: u64 = 250;
 		pub BlockWeights: frame_system::limits::BlockWeights =
@@ -308,15 +314,15 @@ mod tests {
 		type Index = u64;
 		type BlockNumber = u64;
 		type Hash = H256;
-		type Call = ();
+		type Call = Call;
 		type Hashing = BlakeTwo256;
 		type AccountId = u64;
 		type Lookup = IdentityLookup<Self::AccountId>;
 		type Header = Header;
-		type Event = ();
+		type Event = Event;
 		type BlockHashCount = BlockHashCount;
 		type Version = ();
-		type PalletInfo = ();
+		type PalletInfo = PalletInfo;
 		type AccountData = ();
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
@@ -356,7 +362,7 @@ mod tests {
 	}
 
 	impl Config for Test {
-		type Event = ();
+		type Event = Event;
 		type AddOrigin = EnsureSignedBy<One, u64>;
 		type RemoveOrigin = EnsureSignedBy<Two, u64>;
 		type SwapOrigin = EnsureSignedBy<Three, u64>;
@@ -366,12 +372,10 @@ mod tests {
 		type MembershipChanged = TestChangeMembers;
 	}
 
-	type Membership = Module<Test>;
-
 	fn new_test_ext() -> sp_io::TestExternalities {
 		let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
 		// We use default for brevity, but you can configure as desired if needed.
-		GenesisConfig::<Test>{
+		pallet_membership::GenesisConfig::<Test>{
 			members: vec![10, 20, 30],
 			.. Default::default()
 		}.assimilate_storage(&mut t).unwrap();
diff --git a/frame/merkle-mountain-range/src/mock.rs b/frame/merkle-mountain-range/src/mock.rs
index 2cb4e7c4dc29..0adb0294d508 100644
--- a/frame/merkle-mountain-range/src/mock.rs
+++ b/frame/merkle-mountain-range/src/mock.rs
@@ -16,11 +16,10 @@
 // limitations under the License.
 
 use crate::*;
+use crate as pallet_mmr;
 
 use codec::{Encode, Decode};
-use frame_support::{
-	impl_outer_origin, parameter_types,
-};
+use frame_support::parameter_types;
 use pallet_mmr_primitives::{LeafDataProvider, Compact};
 use sp_core::H256;
 use sp_runtime::{
@@ -32,19 +31,27 @@ use sp_runtime::{
 use sp_std::cell::RefCell;
 use sp_std::prelude::*;
 
-impl_outer_origin! {
-	pub enum Origin for Test where system = frame_system {}
-}
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		MMR: pallet_mmr::{Module, Call, Storage},
+	}
+);
 
-#[derive(Clone, Eq, PartialEq, Encode, Decode)]
-pub struct Test;
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 }
 impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
-	type Call = ();
+	type Call = Call;
 	type Index = u64;
 	type BlockNumber = u64;
 	type Hash = H256;
@@ -52,13 +59,13 @@ impl frame_system::Config for Test {
 	type AccountId = sp_core::sr25519::Public;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type Header = Header;
-	type Event = ();
+	type Event = Event;
 	type BlockHashCount = BlockHashCount;
 	type DbWeight = ();
 	type BlockWeights = ();
 	type BlockLength = ();
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -102,5 +109,3 @@ impl LeafDataProvider for LeafData {
 		LEAF_DATA.with(|r| r.borrow().clone())
 	}
 }
-
-pub(crate) type MMR = Module<Test>;
diff --git a/frame/multisig/src/tests.rs b/frame/multisig/src/tests.rs
index d16b0ad49556..78301b2b69f7 100644
--- a/frame/multisig/src/tests.rs
+++ b/frame/multisig/src/tests.rs
@@ -22,37 +22,27 @@
 use super::*;
 
 use frame_support::{
-	assert_ok, assert_noop, impl_outer_origin, parameter_types, impl_outer_dispatch,
-	impl_outer_event, traits::Filter,
+	assert_ok, assert_noop, parameter_types, traits::Filter,
 };
 use sp_core::H256;
 use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
-use crate as multisig;
-
-impl_outer_origin! {
-	pub enum Origin for Test where system = frame_system {}
-}
-
-impl_outer_event! {
-	pub enum TestEvent for Test {
-		system<T>,
-		pallet_balances<T>,
-		multisig<T>,
+use crate as pallet_multisig;
+
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
+		Multisig: pallet_multisig::{Module, Call, Storage, Event<T>},
 	}
-}
-impl_outer_dispatch! {
-	pub enum Call for Test where origin: Origin {
-		frame_system::System,
-		pallet_balances::Balances,
-		multisig::Multisig,
-	}
-}
+);
 
-// For testing the pallet, we construct most of a mock runtime. This means
-// first constructing a configuration type (`Test`) which `impl`s each of the
-// configuration traits of pallets we want to use.
-#[derive(Clone, Eq, PartialEq)]
-pub struct Test;
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 	pub BlockWeights: frame_system::limits::BlockWeights =
@@ -72,10 +62,10 @@ impl frame_system::Config for Test {
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type Header = Header;
-	type Event = TestEvent;
+	type Event = Event;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -88,7 +78,7 @@ parameter_types! {
 impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u64;
-	type Event = TestEvent;
+	type Event = Event;
 	type DustRemoval = ();
 	type ExistentialDeposit = ExistentialDeposit;
 	type AccountStore = System;
@@ -111,7 +101,7 @@ impl Filter<Call> for TestBaseCallFilter {
 	}
 }
 impl Config for Test {
-	type Event = TestEvent;
+	type Event = Event;
 	type Call = Call;
 	type Currency = Balances;
 	type DepositBase = DepositBase;
@@ -119,9 +109,6 @@ impl Config for Test {
 	type MaxSignatories = MaxSignatories;
 	type WeightInfo = ();
 }
-type System = frame_system::Module<Test>;
-type Balances = pallet_balances::Module<Test>;
-type Multisig = Module<Test>;
 
 use pallet_balances::Call as BalancesCall;
 use pallet_balances::Error as BalancesError;
@@ -136,11 +123,11 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 	ext
 }
 
-fn last_event() -> TestEvent {
+fn last_event() -> Event {
 	system::Module::<Test>::events().pop().map(|e| e.event).expect("Event expected")
 }
 
-fn expect_event<E: Into<TestEvent>>(e: E) {
+fn expect_event<E: Into<Event>>(e: E) {
 	assert_eq!(last_event(), e.into());
 }
 
diff --git a/frame/nicks/src/lib.rs b/frame/nicks/src/lib.rs
index 983be4056d0c..681a45626fbc 100644
--- a/frame/nicks/src/lib.rs
+++ b/frame/nicks/src/lib.rs
@@ -239,23 +239,30 @@ decl_module! {
 #[cfg(test)]
 mod tests {
 	use super::*;
+	use crate as pallet_nicks;
 
-	use frame_support::{
-		assert_ok, assert_noop, impl_outer_origin, parameter_types,
-		ord_parameter_types
-	};
+	use frame_support::{assert_ok, assert_noop, parameter_types, ord_parameter_types};
 	use sp_core::H256;
 	use frame_system::EnsureSignedBy;
 	use sp_runtime::{
 		testing::Header, traits::{BlakeTwo256, IdentityLookup, BadOrigin},
 	};
 
-	impl_outer_origin! {
-		pub enum Origin for Test where system = frame_system {}
-	}
+	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+	type Block = frame_system::mocking::MockBlock<Test>;
+
+	frame_support::construct_runtime!(
+		pub enum Test where
+			Block = Block,
+			NodeBlock = Block,
+			UncheckedExtrinsic = UncheckedExtrinsic,
+		{
+			System: frame_system::{Module, Call, Config, Storage, Event<T>},
+			Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
+			Nicks: pallet_nicks::{Module, Call, Storage, Event<T>},
+		}
+	);
 
-	#[derive(Clone, Eq, PartialEq)]
-	pub struct Test;
 	parameter_types! {
 		pub const BlockHashCount: u64 = 250;
 		pub BlockWeights: frame_system::limits::BlockWeights =
@@ -270,15 +277,15 @@ mod tests {
 		type Index = u64;
 		type BlockNumber = u64;
 		type Hash = H256;
-		type Call = ();
+		type Call = Call;
 		type Hashing = BlakeTwo256;
 		type AccountId = u64;
 		type Lookup = IdentityLookup<Self::AccountId>;
 		type Header = Header;
-		type Event = ();
+		type Event = Event;
 		type BlockHashCount = BlockHashCount;
 		type Version = ();
-		type PalletInfo = ();
+		type PalletInfo = PalletInfo;
 		type AccountData = pallet_balances::AccountData<u64>;
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
@@ -291,7 +298,7 @@ mod tests {
 	impl pallet_balances::Config for Test {
 		type MaxLocks = ();
 		type Balance = u64;
-		type Event = ();
+		type Event = Event;
 		type DustRemoval = ();
 		type ExistentialDeposit = ExistentialDeposit;
 		type AccountStore = System;
@@ -306,7 +313,7 @@ mod tests {
 		pub const One: u64 = 1;
 	}
 	impl Config for Test {
-		type Event = ();
+		type Event = Event;
 		type Currency = Balances;
 		type ReservationFee = ReservationFee;
 		type Slashed = ();
@@ -314,9 +321,6 @@ mod tests {
 		type MinLength = MinLength;
 		type MaxLength = MaxLength;
 	}
-	type System = frame_system::Module<Test>;
-	type Balances = pallet_balances::Module<Test>;
-	type Nicks = Module<Test>;
 
 	fn new_test_ext() -> sp_io::TestExternalities {
 		let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
diff --git a/frame/node-authorization/src/lib.rs b/frame/node-authorization/src/lib.rs
index 79b1d6e74c30..f1f70e9eacd4 100644
--- a/frame/node-authorization/src/lib.rs
+++ b/frame/node-authorization/src/lib.rs
@@ -431,21 +431,28 @@ impl<T: Config> Module<T> {
 #[cfg(test)]
 mod tests {
 	use super::*;
+	use crate as pallet_node_authorization;
 
-	use frame_support::{
-		assert_ok, assert_noop, impl_outer_origin,
-		parameter_types, ord_parameter_types,
-	};
+	use frame_support::{assert_ok, assert_noop, parameter_types, ord_parameter_types};
 	use frame_system::EnsureSignedBy;
 	use sp_core::H256;
 	use sp_runtime::{traits::{BlakeTwo256, IdentityLookup, BadOrigin}, testing::Header};
 
-	impl_outer_origin! {
-		pub enum Origin for Test where system = frame_system {}
-	}
-
-	#[derive(Clone, Eq, PartialEq)]
-	pub struct Test;
+	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+	type Block = frame_system::mocking::MockBlock<Test>;
+
+	frame_support::construct_runtime!(
+		pub enum Test where
+			Block = Block,
+			NodeBlock = Block,
+			UncheckedExtrinsic = UncheckedExtrinsic,
+		{
+			System: frame_system::{Module, Call, Config, Storage, Event<T>},
+			NodeAuthorization: pallet_node_authorization::{
+				Module, Call, Storage, Config<T>, Event<T>,
+			},
+		}
+	);
 
 	parameter_types! {
 		pub const BlockHashCount: u64 = 250;
@@ -459,15 +466,15 @@ mod tests {
 		type Index = u64;
 		type BlockNumber = u64;
 		type Hash = H256;
-		type Call = ();
+		type Call = Call;
 		type Hashing = BlakeTwo256;
 		type AccountId = u64;
 		type Lookup = IdentityLookup<Self::AccountId>;
 		type Header = Header;
-		type Event = ();
+		type Event = Event;
 		type BlockHashCount = BlockHashCount;
 		type Version = ();
-		type PalletInfo = ();
+		type PalletInfo = PalletInfo;
 		type AccountData = ();
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
@@ -486,7 +493,7 @@ mod tests {
 		pub const MaxPeerIdLength: u32 = 2;
 	}
 	impl Config for Test {
-		type Event = ();
+		type Event = Event;
 		type MaxWellKnownNodes = MaxWellKnownNodes;
 		type MaxPeerIdLength = MaxPeerIdLength;
 		type AddOrigin = EnsureSignedBy<One, u64>;
@@ -496,15 +503,13 @@ mod tests {
 		type WeightInfo = ();
 	}
 
-	type NodeAuthorization = Module<Test>;
-
 	fn test_node(id: u8) -> PeerId {
 		PeerId(vec![id])
 	}
 
 	fn new_test_ext() -> sp_io::TestExternalities {
 		let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-		GenesisConfig::<Test> {
+		pallet_node_authorization::GenesisConfig::<Test> {
 			nodes: vec![(test_node(10), 10), (test_node(20), 20), (test_node(30), 30)],
 		}.assimilate_storage(&mut t).unwrap();
 		t.into()
diff --git a/frame/offences/src/mock.rs b/frame/offences/src/mock.rs
index 042c0501094c..c47a9cf943c1 100644
--- a/frame/offences/src/mock.rs
+++ b/frame/offences/src/mock.rs
@@ -20,7 +20,7 @@
 #![cfg(test)]
 
 use std::cell::RefCell;
-use crate::{Module, Config};
+use crate::Config;
 use codec::Encode;
 use sp_runtime::Perbill;
 use sp_staking::{
@@ -31,14 +31,10 @@ use sp_runtime::testing::Header;
 use sp_runtime::traits::{IdentityLookup, BlakeTwo256};
 use sp_core::H256;
 use frame_support::{
-	impl_outer_origin, impl_outer_event, parameter_types, StorageMap, StorageDoubleMap,
+	parameter_types, StorageMap, StorageDoubleMap,
 	weights::{Weight, constants::{WEIGHT_PER_SECOND, RocksDbWeight}},
 };
-use frame_system as system;
-
-impl_outer_origin!{
-	pub enum Origin for Runtime {}
-}
+use crate as offences;
 
 pub struct OnOffenceHandler;
 
@@ -86,9 +82,20 @@ pub fn set_offence_weight(new: Weight) {
 	OFFENCE_WEIGHT.with(|w| *w.borrow_mut() = new);
 }
 
-// Workaround for https://github.com/rust-lang/rust/issues/26925 . Remove when sorted.
-#[derive(Clone, PartialEq, Eq, Debug)]
-pub struct Runtime;
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
+type Block = frame_system::mocking::MockBlock<Runtime>;
+
+frame_support::construct_runtime!(
+	pub enum Runtime where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Offences: offences::{Module, Call, Storage, Event},
+	}
+);
+
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 	pub BlockWeights: frame_system::limits::BlockWeights =
@@ -102,16 +109,16 @@ impl frame_system::Config for Runtime {
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u64;
-	type Call = ();
+	type Call = Call;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type Header = Header;
-	type Event = TestEvent;
+	type Event = Event;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -125,23 +132,12 @@ parameter_types! {
 }
 
 impl Config for Runtime {
-	type Event = TestEvent;
+	type Event = Event;
 	type IdentificationTuple = u64;
 	type OnOffenceHandler = OnOffenceHandler;
 	type WeightSoftLimit = OffencesWeightSoftLimit;
 }
 
-mod offences {
-	pub use crate::Event;
-}
-
-impl_outer_event! {
-	pub enum TestEvent for Runtime {
-		system<T>,
-		offences,
-	}
-}
-
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let t = frame_system::GenesisConfig::default().build_storage::<Runtime>().unwrap();
 	let mut ext = sp_io::TestExternalities::new(t);
@@ -149,10 +145,6 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 	ext
 }
 
-/// Offences module.
-pub type Offences = Module<Runtime>;
-pub type System = frame_system::Module<Runtime>;
-
 pub const KIND: [u8; 16] = *b"test_report_1234";
 
 /// Returns all offence details for the specific `kind` happened at the specific time slot.
diff --git a/frame/offences/src/tests.rs b/frame/offences/src/tests.rs
index a33ba96447a4..2b7c500dfa2d 100644
--- a/frame/offences/src/tests.rs
+++ b/frame/offences/src/tests.rs
@@ -21,7 +21,7 @@
 
 use super::*;
 use crate::mock::{
-	Offences, System, Offence, TestEvent, KIND, new_test_ext, with_on_offence_fractions,
+	Offences, System, Offence, Event, KIND, new_test_ext, with_on_offence_fractions,
 	offence_reports, set_can_report, set_offence_weight,
 };
 use sp_runtime::Perbill;
@@ -132,7 +132,7 @@ fn should_deposit_event() {
 			System::events(),
 			vec![EventRecord {
 				phase: Phase::Initialization,
-				event: TestEvent::offences(crate::Event::Offence(KIND, time_slot.encode(), true)),
+				event: Event::offences(crate::Event::Offence(KIND, time_slot.encode(), true)),
 				topics: vec![],
 			}]
 		);
@@ -167,7 +167,7 @@ fn doesnt_deposit_event_for_dups() {
 			System::events(),
 			vec![EventRecord {
 				phase: Phase::Initialization,
-				event: TestEvent::offences(crate::Event::Offence(KIND, time_slot.encode(), true)),
+				event: Event::offences(crate::Event::Offence(KIND, time_slot.encode(), true)),
 				topics: vec![],
 			}]
 		);
@@ -304,7 +304,7 @@ fn should_queue_and_resubmit_rejected_offence() {
 			System::events(),
 			vec![EventRecord {
 				phase: Phase::Initialization,
-				event: TestEvent::offences(crate::Event::Offence(KIND, 42u128.encode(), false)),
+				event: Event::offences(crate::Event::Offence(KIND, 42u128.encode(), false)),
 				topics: vec![],
 			}]
 		);
diff --git a/frame/proxy/src/tests.rs b/frame/proxy/src/tests.rs
index 3c417647c2cd..b31ef1dfdb2f 100644
--- a/frame/proxy/src/tests.rs
+++ b/frame/proxy/src/tests.rs
@@ -22,39 +22,29 @@
 use super::*;
 
 use frame_support::{
-	assert_ok, assert_noop, impl_outer_origin, parameter_types, impl_outer_dispatch,
-	impl_outer_event, RuntimeDebug, dispatch::DispatchError, traits::Filter,
+	assert_ok, assert_noop, parameter_types, RuntimeDebug, dispatch::DispatchError, traits::Filter,
 };
 use codec::{Encode, Decode};
 use sp_core::H256;
 use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
 use crate as proxy;
 
-impl_outer_origin! {
-	pub enum Origin for Test where system = frame_system {}
-}
-impl_outer_event! {
-	pub enum TestEvent for Test {
-		system<T>,
-		pallet_balances<T>,
-		proxy<T>,
-		pallet_utility,
-	}
-}
-impl_outer_dispatch! {
-	pub enum Call for Test where origin: Origin {
-		frame_system::System,
-		pallet_balances::Balances,
-		proxy::Proxy,
-		pallet_utility::Utility,
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
+		Proxy: proxy::{Module, Call, Storage, Event<T>},
+		Utility: pallet_utility::{Module, Call, Event},
 	}
-}
+);
 
-// For testing the pallet, we construct most of a mock runtime. This means
-// first constructing a configuration type (`Test`) which `impl`s each of the
-// configuration traits of pallets we want to use.
-#[derive(Clone, Eq, PartialEq)]
-pub struct Test;
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 	pub BlockWeights: frame_system::limits::BlockWeights =
@@ -74,10 +64,10 @@ impl frame_system::Config for Test {
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type Header = Header;
-	type Event = TestEvent;
+	type Event = Event;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -90,14 +80,14 @@ parameter_types! {
 impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u64;
-	type Event = TestEvent;
+	type Event = Event;
 	type DustRemoval = ();
 	type ExistentialDeposit = ExistentialDeposit;
 	type AccountStore = System;
 	type WeightInfo = ();
 }
 impl pallet_utility::Config for Test {
-	type Event = TestEvent;
+	type Event = Event;
 	type Call = Call;
 	type WeightInfo = ();
 }
@@ -140,7 +130,7 @@ impl Filter<Call> for BaseFilter {
 	}
 }
 impl Config for Test {
-	type Event = TestEvent;
+	type Event = Event;
 	type Call = Call;
 	type Currency = Balances;
 	type ProxyType = ProxyType;
@@ -154,11 +144,6 @@ impl Config for Test {
 	type AnnouncementDepositFactor = AnnouncementDepositFactor;
 }
 
-type System = frame_system::Module<Test>;
-type Balances = pallet_balances::Module<Test>;
-type Utility = pallet_utility::Module<Test>;
-type Proxy = Module<Test>;
-
 use frame_system::Call as SystemCall;
 use pallet_balances::Call as BalancesCall;
 use pallet_balances::Error as BalancesError;
@@ -177,19 +162,19 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 	ext
 }
 
-fn last_event() -> TestEvent {
+fn last_event() -> Event {
 	system::Module::<Test>::events().pop().expect("Event expected").event
 }
 
-fn expect_event<E: Into<TestEvent>>(e: E) {
+fn expect_event<E: Into<Event>>(e: E) {
 	assert_eq!(last_event(), e.into());
 }
 
-fn last_events(n: usize) -> Vec<TestEvent> {
+fn last_events(n: usize) -> Vec<Event> {
 	system::Module::<Test>::events().into_iter().rev().take(n).rev().map(|e| e.event).collect()
 }
 
-fn expect_events(e: Vec<TestEvent>) {
+fn expect_events(e: Vec<Event>) {
 	assert_eq!(last_events(e.len()), e);
 }
 

From 6105169c51344d3c1344532e2b5831804a4c7abd Mon Sep 17 00:00:00 2001
From: Andrew Jones <ascjones@gmail.com>
Date: Thu, 4 Feb 2021 16:34:15 +0000
Subject: [PATCH 0365/1194] Migrate more pallet tests to construct_runtime 
 (#8051)

* Migrate bounties tests to use construct_runtime

* Migrate contracts tests to use construct_runtime

* Migrate democracy tests to use construct_runtime

* review: rename TreasuryEvent -> TreasuryError
---
 frame/bounties/src/tests.rs  |  60 ++++++++--------
 frame/contracts/src/exec.rs  |   4 +-
 frame/contracts/src/tests.rs | 130 +++++++++++++++--------------------
 frame/democracy/src/tests.rs |  56 ++++++---------
 4 files changed, 107 insertions(+), 143 deletions(-)

diff --git a/frame/bounties/src/tests.rs b/frame/bounties/src/tests.rs
index 2f503f39b94b..cbff502daa65 100644
--- a/frame/bounties/src/tests.rs
+++ b/frame/bounties/src/tests.rs
@@ -19,12 +19,12 @@
 
 #![cfg(test)]
 
+use crate as pallet_bounties;
 use super::*;
 use std::cell::RefCell;
 
 use frame_support::{
-	assert_noop, assert_ok, impl_outer_origin, parameter_types, weights::Weight,
-	impl_outer_event, traits::{OnInitialize}
+	assert_noop, assert_ok, parameter_types, weights::Weight, traits::OnInitialize
 };
 
 use sp_core::H256;
@@ -34,32 +34,29 @@ use sp_runtime::{
 	traits::{BlakeTwo256, IdentityLookup, BadOrigin},
 };
 
-impl_outer_origin! {
-	pub enum Origin for Test where system = frame_system {}
-}
-
-mod bounties {
-	// Re-export needed for `impl_outer_event!`.
-	pub use crate::*;
-}
-
-impl_outer_event! {
-	pub enum Event for Test {
-		system<T>,
-		pallet_balances<T>,
-		pallet_treasury<T>,
-		bounties<T>,
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
+		Bounties: pallet_bounties::{Module, Call, Storage, Event<T>},
+		Treasury: pallet_treasury::{Module, Call, Storage, Config, Event<T>},
 	}
-}
+);
 
-#[derive(Clone, Eq, PartialEq)]
-pub struct Test;
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 	pub const MaximumBlockWeight: Weight = 1024;
 	pub const MaximumBlockLength: u32 = 2 * 1024;
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
+
 impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type BlockWeights = ();
@@ -68,7 +65,7 @@ impl frame_system::Config for Test {
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u64;
-	type Call = ();
+	type Call = Call;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u128; // u64 is not enough to hold bytes used to generate bounty account
@@ -77,7 +74,7 @@ impl frame_system::Config for Test {
 	type Event = Event;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -142,10 +139,8 @@ impl Config for Test {
 	type MaximumReasonLength = MaximumReasonLength;
 	type WeightInfo = ();
 }
-type System = frame_system::Module<Test>;
-type Balances = pallet_balances::Module<Test>;
-type Treasury = pallet_treasury::Module<Test>;
-type Bounties = Module<Test>;
+
+type TreasuryError = pallet_treasury::Error::<Test, pallet_treasury::DefaultInstance>;
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
@@ -160,7 +155,7 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 fn last_event() -> RawEvent<u64, u128> {
 	System::events().into_iter().map(|r| r.event)
 		.filter_map(|e| {
-			if let Event::bounties(inner) = e { Some(inner) } else { None }
+			if let Event::pallet_bounties(inner) = e { Some(inner) } else { None }
 		})
 		.last()
 		.unwrap()
@@ -206,7 +201,7 @@ fn spend_proposal_fails_when_proposer_poor() {
 	new_test_ext().execute_with(|| {
 		assert_noop!(
 			Treasury::propose_spend(Origin::signed(2), 100, 3),
-			Error::<Test>::InsufficientProposersBalance,
+			TreasuryError::InsufficientProposersBalance,
 		);
 	});
 }
@@ -259,21 +254,22 @@ fn reject_already_rejected_spend_proposal_fails() {
 
 		assert_ok!(Treasury::propose_spend(Origin::signed(0), 100, 3));
 		assert_ok!(Treasury::reject_proposal(Origin::root(), 0));
-		assert_noop!(Treasury::reject_proposal(Origin::root(), 0), Error::<Test>::InvalidIndex);
+		assert_noop!(Treasury::reject_proposal(Origin::root(), 0), TreasuryError::InvalidIndex);
 	});
 }
 
 #[test]
 fn reject_non_existent_spend_proposal_fails() {
 	new_test_ext().execute_with(|| {
-		assert_noop!(Treasury::reject_proposal(Origin::root(), 0), Error::<Test>::InvalidIndex);
+		assert_noop!(Treasury::reject_proposal(Origin::root(), 0),
+		pallet_treasury::Error::<Test, pallet_treasury::DefaultInstance>::InvalidIndex);
 	});
 }
 
 #[test]
 fn accept_non_existent_spend_proposal_fails() {
 	new_test_ext().execute_with(|| {
-		assert_noop!(Treasury::approve_proposal(Origin::root(), 0), Error::<Test>::InvalidIndex);
+		assert_noop!(Treasury::approve_proposal(Origin::root(), 0), TreasuryError::InvalidIndex);
 	});
 }
 
@@ -284,7 +280,7 @@ fn accept_already_rejected_spend_proposal_fails() {
 
 		assert_ok!(Treasury::propose_spend(Origin::signed(0), 100, 3));
 		assert_ok!(Treasury::reject_proposal(Origin::root(), 0));
-		assert_noop!(Treasury::approve_proposal(Origin::root(), 0), Error::<Test>::InvalidIndex);
+		assert_noop!(Treasury::approve_proposal(Origin::root(), 0), TreasuryError::InvalidIndex);
 	});
 }
 
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index 047d7aba192f..5eddcc41a911 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -772,7 +772,7 @@ fn deposit_event<T: Config>(
 mod tests {
 	use super::*;
 	use crate::{
-		gas::GasMeter, tests::{ExtBuilder, Test, MetaEvent},
+		gas::GasMeter, tests::{ExtBuilder, Test, Event as MetaEvent},
 		gas::Gas,
 		storage::Storage,
 		tests::{
@@ -797,7 +797,7 @@ mod tests {
 		<frame_system::Module<Test>>::events()
 			.into_iter()
 			.filter_map(|meta| match meta.event {
-				MetaEvent::contracts(contract_event) => Some(contract_event),
+				MetaEvent::pallet_contracts(contract_event) => Some(contract_event),
 				_ => None,
 			})
 			.collect()
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index d80de6a5116c..f50c4b65968e 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -16,7 +16,7 @@
 // limitations under the License.
 
 use crate::{
-	BalanceOf, ContractInfo, ContractInfoOf, GenesisConfig, Module,
+	BalanceOf, ContractInfo, ContractInfoOf, Module,
 	RawAliveContractInfo, RawEvent, Config, Schedule, gas::Gas,
 	Error, ConfigCache, RuntimeReturnCode, storage::Storage,
 	chain_extension::{
@@ -34,8 +34,8 @@ use sp_runtime::{
 };
 use sp_io::hashing::blake2_256;
 use frame_support::{
-	assert_ok, assert_err, assert_err_ignore_postinfo, impl_outer_dispatch, impl_outer_event,
-	impl_outer_origin, parameter_types, StorageMap, assert_storage_noop,
+	assert_ok, assert_err, assert_err_ignore_postinfo,
+	parameter_types, StorageMap, assert_storage_noop,
 	traits::{Currency, ReservableCurrency, OnInitialize},
 	weights::{Weight, PostDispatchInfo, DispatchClass, constants::WEIGHT_PER_SECOND},
 	dispatch::DispatchErrorWithPostInfo,
@@ -44,32 +44,24 @@ use frame_support::{
 use frame_system::{self as system, EventRecord, Phase};
 use pretty_assertions::assert_eq;
 
-mod contracts {
-	// Re-export contents of the root. This basically
-	// needs to give a name for the current crate.
-	// This hack is required for `impl_outer_event!`.
-	pub use super::super::*;
-	pub use frame_support::impl_outer_event;
-}
+use crate as pallet_contracts;
 
-use pallet_balances as balances;
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
 
-impl_outer_event! {
-	pub enum MetaEvent for Test {
-		system<T>,
-		balances<T>,
-		contracts<T>,
-	}
-}
-impl_outer_origin! {
-	pub enum Origin for Test where system = frame_system { }
-}
-impl_outer_dispatch! {
-	pub enum Call for Test where origin: Origin {
-		balances::Balances,
-		contracts::Contracts,
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
+		Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent},
+		Randomness: pallet_randomness_collective_flip::{Module, Call, Storage},
+		Contracts: pallet_contracts::{Module, Call, Config<T>, Storage, Event<T>},
 	}
-}
+);
 
 #[macro_use]
 pub mod test_utils {
@@ -198,8 +190,6 @@ impl ChainExtension<Test> for TestExtension {
 	}
 }
 
-#[derive(Clone, Eq, PartialEq, Debug)]
-pub struct Test;
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 	pub BlockWeights: frame_system::limits::BlockWeights =
@@ -220,10 +210,10 @@ impl frame_system::Config for Test {
 	type AccountId = AccountId32;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type Header = Header;
-	type Event = MetaEvent;
+	type Event = Event;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -233,7 +223,7 @@ impl frame_system::Config for Test {
 impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u64;
-	type Event = MetaEvent;
+	type Event = Event;
 	type DustRemoval = ();
 	type ExistentialDeposit = ExistentialDeposit;
 	type AccountStore = System;
@@ -276,7 +266,7 @@ impl Config for Test {
 	type Time = Timestamp;
 	type Randomness = Randomness;
 	type Currency = Balances;
-	type Event = MetaEvent;
+	type Event = Event;
 	type RentPayment = ();
 	type SignedClaimHandicap = SignedClaimHandicap;
 	type TombstoneDeposit = TombstoneDeposit;
@@ -294,12 +284,6 @@ impl Config for Test {
 	type DeletionWeightLimit = DeletionWeightLimit;
 }
 
-type Balances = pallet_balances::Module<Test>;
-type Timestamp = pallet_timestamp::Module<Test>;
-type Contracts = Module<Test>;
-type System = frame_system::Module<Test>;
-type Randomness = pallet_randomness_collective_flip::Module<Test>;
-
 pub const ALICE: AccountId32 = AccountId32::new([1u8; 32]);
 pub const BOB: AccountId32 = AccountId32::new([2u8; 32]);
 pub const CHARLIE: AccountId32 = AccountId32::new([3u8; 32]);
@@ -331,7 +315,7 @@ impl ExtBuilder {
 		pallet_balances::GenesisConfig::<Test> {
 			balances: vec![],
 		}.assimilate_storage(&mut t).unwrap();
-		GenesisConfig {
+		pallet_contracts::GenesisConfig {
 			current_schedule: Schedule::<Test> {
 				enable_println: true,
 				..Default::default()
@@ -483,50 +467,50 @@ fn instantiate_and_call_and_deposit_event() {
 			assert_eq!(System::events(), vec![
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::system(frame_system::Event::NewAccount(ALICE.clone())),
+					event: Event::frame_system(frame_system::Event::NewAccount(ALICE.clone())),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::balances(
+					event: Event::pallet_balances(
 						pallet_balances::RawEvent::Endowed(ALICE, 1_000_000)
 					),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::system(frame_system::Event::NewAccount(addr.clone())),
+					event: Event::frame_system(frame_system::Event::NewAccount(addr.clone())),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::balances(
+					event: Event::pallet_balances(
 						pallet_balances::RawEvent::Endowed(addr.clone(), subsistence * 100)
 					),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::balances(
+					event: Event::pallet_balances(
 						pallet_balances::RawEvent::Transfer(ALICE, addr.clone(), subsistence * 100)
 					),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::contracts(RawEvent::CodeStored(code_hash.into())),
+					event: Event::pallet_contracts(RawEvent::CodeStored(code_hash.into())),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::contracts(
+					event: Event::pallet_contracts(
 						RawEvent::ContractEmitted(addr.clone(), vec![1, 2, 3, 4])
 					),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::contracts(RawEvent::Instantiated(ALICE, addr.clone())),
+					event: Event::pallet_contracts(RawEvent::Instantiated(ALICE, addr.clone())),
 					topics: vec![],
 				},
 			]);
@@ -1212,43 +1196,43 @@ fn restoration(
 			let mut events = vec![
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::system(frame_system::Event::NewAccount(ALICE)),
+					event: Event::frame_system(frame_system::Event::NewAccount(ALICE)),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::balances(
+					event: Event::pallet_balances(
 						pallet_balances::RawEvent::Endowed(ALICE, 1_000_000)
 					),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::system(frame_system::Event::NewAccount(addr_bob.clone())),
+					event: Event::frame_system(frame_system::Event::NewAccount(addr_bob.clone())),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::balances(
+					event: Event::pallet_balances(
 						pallet_balances::RawEvent::Endowed(addr_bob.clone(), 30_000)
 					),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::balances(
+					event: Event::pallet_balances(
 						pallet_balances::RawEvent::Transfer(ALICE, addr_bob.clone(), 30_000)
 					),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::contracts(RawEvent::CodeStored(set_rent_code_hash.into())),
+					event: Event::pallet_contracts(RawEvent::CodeStored(set_rent_code_hash.into())),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::contracts(RawEvent::Instantiated(ALICE, addr_bob.clone())),
+					event: Event::pallet_contracts(RawEvent::Instantiated(ALICE, addr_bob.clone())),
 					topics: vec![],
 				},
 			];
@@ -1269,26 +1253,26 @@ fn restoration(
 				events.extend([
 					EventRecord {
 						phase: Phase::Initialization,
-						event: MetaEvent::system(frame_system::Event::NewAccount(addr_dummy.clone())),
+						event: Event::frame_system(frame_system::Event::NewAccount(addr_dummy.clone())),
 						topics: vec![],
 					},
 					EventRecord {
 						phase: Phase::Initialization,
-						event: MetaEvent::balances(
+						event: Event::pallet_balances(
 							pallet_balances::RawEvent::Endowed(addr_dummy.clone(), 20_000)
 						),
 						topics: vec![],
 					},
 					EventRecord {
 						phase: Phase::Initialization,
-						event: MetaEvent::balances(
+						event: Event::pallet_balances(
 							pallet_balances::RawEvent::Transfer(ALICE, addr_dummy.clone(), 20_000)
 						),
 						topics: vec![],
 					},
 					EventRecord {
 						phase: Phase::Initialization,
-						event: MetaEvent::contracts(RawEvent::Instantiated(ALICE, addr_dummy.clone())),
+						event: Event::pallet_contracts(RawEvent::Instantiated(ALICE, addr_dummy.clone())),
 						topics: vec![],
 					},
 				].iter().cloned());
@@ -1414,44 +1398,44 @@ fn restoration(
 						assert_eq!(System::events(), vec![
 							EventRecord {
 								phase: Phase::Initialization,
-								event: MetaEvent::contracts(RawEvent::Evicted(addr_bob)),
+								event: Event::pallet_contracts(RawEvent::Evicted(addr_bob)),
 								topics: vec![],
 							},
 							EventRecord {
 								phase: Phase::Initialization,
-								event: MetaEvent::system(frame_system::Event::NewAccount(CHARLIE)),
+								event: Event::frame_system(frame_system::Event::NewAccount(CHARLIE)),
 								topics: vec![],
 							},
 							EventRecord {
 								phase: Phase::Initialization,
-								event: MetaEvent::balances(pallet_balances::RawEvent::Endowed(CHARLIE, 1_000_000)),
+								event: Event::pallet_balances(pallet_balances::RawEvent::Endowed(CHARLIE, 1_000_000)),
 								topics: vec![],
 							},
 							EventRecord {
 								phase: Phase::Initialization,
-								event: MetaEvent::system(frame_system::Event::NewAccount(addr_django.clone())),
+								event: Event::frame_system(frame_system::Event::NewAccount(addr_django.clone())),
 								topics: vec![],
 							},
 							EventRecord {
 								phase: Phase::Initialization,
-								event: MetaEvent::balances(pallet_balances::RawEvent::Endowed(addr_django.clone(), 30_000)),
+								event: Event::pallet_balances(pallet_balances::RawEvent::Endowed(addr_django.clone(), 30_000)),
 								topics: vec![],
 							},
 							EventRecord {
 								phase: Phase::Initialization,
-								event: MetaEvent::balances(
+								event: Event::pallet_balances(
 									pallet_balances::RawEvent::Transfer(CHARLIE, addr_django.clone(), 30_000)
 								),
 								topics: vec![],
 							},
 							EventRecord {
 								phase: Phase::Initialization,
-								event: MetaEvent::contracts(RawEvent::CodeStored(restoration_code_hash)),
+								event: Event::pallet_contracts(RawEvent::CodeStored(restoration_code_hash)),
 								topics: vec![],
 							},
 							EventRecord {
 								phase: Phase::Initialization,
-								event: MetaEvent::contracts(RawEvent::Instantiated(CHARLIE, addr_django.clone())),
+								event: Event::pallet_contracts(RawEvent::Instantiated(CHARLIE, addr_django.clone())),
 								topics: vec![],
 							},
 
@@ -1483,17 +1467,17 @@ fn restoration(
 				assert_eq!(System::events(), vec![
 					EventRecord {
 						phase: Phase::Initialization,
-						event: MetaEvent::contracts(RawEvent::CodeRemoved(restoration_code_hash)),
+						event: Event::pallet_contracts(RawEvent::CodeRemoved(restoration_code_hash)),
 						topics: vec![],
 					},
 					EventRecord {
 						phase: Phase::Initialization,
-						event: MetaEvent::system(system::Event::KilledAccount(addr_django.clone())),
+						event: Event::frame_system(system::Event::KilledAccount(addr_django.clone())),
 						topics: vec![],
 					},
 					EventRecord {
 						phase: Phase::Initialization,
-						event: MetaEvent::contracts(
+						event: Event::pallet_contracts(
 							RawEvent::Restored(addr_django, addr_bob, bob_contract.code_hash, 50)
 						),
 						topics: vec![],
@@ -1719,26 +1703,26 @@ fn self_destruct_works() {
 			pretty_assertions::assert_eq!(System::events(), vec![
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::system(
+					event: Event::frame_system(
 						frame_system::Event::KilledAccount(addr.clone())
 					),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::balances(
+					event: Event::pallet_balances(
 						pallet_balances::RawEvent::Transfer(addr.clone(), DJANGO, 93_654)
 					),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::contracts(RawEvent::CodeRemoved(code_hash)),
+					event: Event::pallet_contracts(RawEvent::CodeRemoved(code_hash)),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: MetaEvent::contracts(
+					event: Event::pallet_contracts(
 						RawEvent::Terminated(addr.clone(), DJANGO)
 					),
 					topics: vec![],
diff --git a/frame/democracy/src/tests.rs b/frame/democracy/src/tests.rs
index 5927f1dcdd85..99f413b38928 100644
--- a/frame/democracy/src/tests.rs
+++ b/frame/democracy/src/tests.rs
@@ -17,11 +17,12 @@
 
 //! The crate's tests.
 
+use crate as pallet_democracy;
 use super::*;
 use codec::Encode;
 use frame_support::{
-	impl_outer_origin, impl_outer_dispatch, assert_noop, assert_ok, parameter_types,
-	impl_outer_event, ord_parameter_types, traits::{Contains, OnInitialize, Filter},
+	assert_noop, assert_ok, parameter_types, ord_parameter_types,
+	traits::{Contains, OnInitialize, Filter},
 	weights::Weight,
 };
 use sp_core::H256;
@@ -50,30 +51,21 @@ const BIG_NAY: Vote = Vote { aye: false, conviction: Conviction::Locked1x };
 
 const MAX_PROPOSALS: u32 = 100;
 
-impl_outer_origin! {
-	pub enum Origin for Test where system = frame_system {}
-}
-
-impl_outer_dispatch! {
-	pub enum Call for Test where origin: Origin {
-		frame_system::System,
-		pallet_balances::Balances,
-		democracy::Democracy,
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
+		Scheduler: pallet_scheduler::{Module, Call, Storage, Config, Event<T>},
+		Democracy: pallet_democracy::{Module, Call, Storage, Config, Event<T>},
 	}
-}
-
-mod democracy {
-	pub use crate::Event;
-}
-
-impl_outer_event! {
-	pub enum Event for Test {
-		system<T>,
-		pallet_balances<T>,
-		pallet_scheduler<T>,
-		democracy<T>,
-	}
-}
+);
 
 // Test that a fitlered call can be dispatched.
 pub struct BaseFilter;
@@ -83,9 +75,6 @@ impl Filter<Call> for BaseFilter {
 	}
 }
 
-// Workaround for https://github.com/rust-lang/rust/issues/26925 . Remove when sorted.
-#[derive(Clone, Eq, PartialEq, Debug)]
-pub struct Test;
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 	pub BlockWeights: frame_system::limits::BlockWeights =
@@ -108,7 +97,7 @@ impl frame_system::Config for Test {
 	type Event = Event;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -169,7 +158,7 @@ impl Contains<u64> for OneToFive {
 	fn add(_m: &u64) {}
 }
 
-impl super::Config for Test {
+impl Config for Test {
 	type Proposal = Call;
 	type Event = Event;
 	type Currency = pallet_balances::Module<Self>;
@@ -204,7 +193,7 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 	pallet_balances::GenesisConfig::<Test>{
 		balances: vec![(1, 10), (2, 20), (3, 30), (4, 40), (5, 50), (6, 60)],
 	}.assimilate_storage(&mut t).unwrap();
-	GenesisConfig::default().assimilate_storage(&mut t).unwrap();
+	pallet_democracy::GenesisConfig::default().assimilate_storage(&mut t).unwrap();
 	let mut ext = sp_io::TestExternalities::new(t);
 	ext.execute_with(|| System::set_block_number(1));
 	ext
@@ -216,11 +205,6 @@ pub fn new_test_ext_execute_with_cond(execute: impl FnOnce(bool) -> () + Clone)
 	new_test_ext().execute_with(|| execute(true));
 }
 
-type System = frame_system::Module<Test>;
-type Balances = pallet_balances::Module<Test>;
-type Scheduler = pallet_scheduler::Module<Test>;
-type Democracy = Module<Test>;
-
 #[test]
 fn params_should_work() {
 	new_test_ext().execute_with(|| {

From a675f9a1551770d45bab35bc20cfe5a2663721a0 Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann <ben@gnunicorn.org>
Date: Thu, 4 Feb 2021 19:17:42 +0100
Subject: [PATCH 0366/1194] Update dependencies ahead of next release (#8015)

Updates dependencies:
parity-db 0.2.2
paste
prometheus 0.11
cfg-if 1.0
strum 0.20
env_logger 0.8
pin-project
prost
nix
platforms
quickcheck 1.0
---
 Cargo.lock                                    | 1143 +++++++++--------
 bin/node/bench/Cargo.toml                     |    2 +-
 bin/node/cli/Cargo.toml                       |    4 +-
 client/authority-discovery/Cargo.toml         |    2 +-
 .../src/worker/addr_cache.rs                  |    9 +-
 client/db/Cargo.toml                          |    4 +-
 client/db/src/storage_cache.rs                |   32 +-
 client/executor/Cargo.toml                    |    2 +-
 client/finality-grandpa-warp-sync/Cargo.toml  |    2 +-
 client/finality-grandpa/Cargo.toml            |    2 +-
 client/network-gossip/Cargo.toml              |    2 +-
 client/network-gossip/src/bridge.rs           |   14 +-
 client/network/Cargo.toml                     |    4 +-
 .../src/protocol/sync/extra_requests.rs       |   23 +-
 client/service/Cargo.toml                     |    2 +-
 client/telemetry/Cargo.toml                   |    2 +-
 frame/benchmarking/Cargo.toml                 |    2 +-
 frame/merkle-mountain-range/Cargo.toml        |    2 +-
 frame/support/Cargo.toml                      |    2 +-
 primitives/keyring/Cargo.toml                 |    2 +-
 primitives/runtime/Cargo.toml                 |    2 +-
 primitives/utils/Cargo.toml                   |    2 +-
 test-utils/runtime/Cargo.toml                 |    2 +-
 utils/build-script-utils/Cargo.toml           |    2 +-
 utils/prometheus/Cargo.toml                   |    2 +-
 25 files changed, 660 insertions(+), 607 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 58c4da80d3b6..040510515726 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -12,9 +12,9 @@ dependencies = [
 
 [[package]]
 name = "addr2line"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c0929d69e78dd9bf5408269919fcbcaeb2e35e5d43e5815517cdc6a8e11a423"
+checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7"
 dependencies = [
  "gimli 0.23.0",
 ]
@@ -55,7 +55,7 @@ dependencies = [
  "aes",
  "block-cipher",
  "ghash",
- "subtle 2.3.0",
+ "subtle 2.4.0",
 ]
 
 [[package]]
@@ -81,9 +81,9 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6789e291be47ace86a60303502173d84af8327e3627ecf334356ee0f87a164c"
+checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e"
 
 [[package]]
 name = "aho-corasick"
@@ -114,9 +114,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.34"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf8dcb5b4bbaa28653b647d8c77bd4ed40183b48882e130c1f1ffb73de069fd7"
+checksum = "afddf7f520a80dbf76e6f50a35bca42a2331ef227a28b3b6dc5c2e2338d114b1"
 
 [[package]]
 name = "approx"
@@ -175,9 +175,9 @@ dependencies = [
 
 [[package]]
 name = "assert_cmd"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c88b9ca26f9c16ec830350d309397e74ee9abdfd8eb1f71cb6ecc71a3fc818da"
+checksum = "3dc1679af9a1ab4bea16f228b05d18f8363f8327b1fa8db00d2760cfafc6b61e"
 dependencies = [
  "doc-comment",
  "predicates",
@@ -219,12 +219,15 @@ dependencies = [
 
 [[package]]
 name = "async-global-executor"
-version = "1.4.3"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73079b49cd26b8fd5a15f68fc7707fc78698dc2a3d61430f2a7a9430230dfa04"
+checksum = "9586ec52317f36de58453159d48351bc244bc24ced3effc1fce22f3d48664af6"
 dependencies = [
+ "async-channel",
  "async-executor",
  "async-io",
+ "async-mutex",
+ "blocking",
  "futures-lite",
  "num_cpus",
  "once_cell",
@@ -250,6 +253,15 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "async-lock"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1996609732bde4a9988bc42125f55f2af5f3c36370e27c778d5191a4a1b63bfb"
+dependencies = [
+ "event-listener",
+]
+
 [[package]]
 name = "async-mutex"
 version = "1.4.0"
@@ -259,17 +271,34 @@ dependencies = [
  "event-listener",
 ]
 
+[[package]]
+name = "async-process"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c8cea09c1fb10a317d1b5af8024eeba256d6554763e85ecd90ff8df31c7bbda"
+dependencies = [
+ "async-io",
+ "blocking",
+ "cfg-if 0.1.10",
+ "event-listener",
+ "futures-lite",
+ "once_cell",
+ "signal-hook",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "async-std"
-version = "1.7.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7e82538bc65a25dbdff70e4c5439d52f068048ab97cdea0acd73f131594caa1"
+checksum = "d9f06685bad74e0570f5213741bea82158279a4103d988e57bfada11ad230341"
 dependencies = [
+ "async-channel",
  "async-global-executor",
  "async-io",
- "async-mutex",
- "blocking",
- "crossbeam-utils 0.8.0",
+ "async-lock",
+ "async-process",
+ "crossbeam-utils 0.8.1",
  "futures-channel",
  "futures-core",
  "futures-io",
@@ -280,7 +309,7 @@ dependencies = [
  "memchr",
  "num_cpus",
  "once_cell",
- "pin-project-lite 0.1.11",
+ "pin-project-lite 0.2.4",
  "pin-utils",
  "slab",
  "wasm-bindgen-futures",
@@ -294,9 +323,9 @@ checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0"
 
 [[package]]
 name = "async-trait"
-version = "0.1.41"
+version = "0.1.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b246867b8b3b6ae56035f1eb1ed557c1d8eae97f0d53696138a50fa0e3a3b8c0"
+checksum = "8d3a45e77e34375a7923b1e8febb049bb011f064714a8e17a1a616fef01da13d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -313,7 +342,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "memchr",
- "pin-project-lite 0.2.0",
+ "pin-project-lite 0.2.4",
 ]
 
 [[package]]
@@ -350,15 +379,15 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
 name = "backtrace"
-version = "0.3.54"
+version = "0.3.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2baad346b2d4e94a24347adeee9c7a93f412ee94b9cc26e5b59dea23848e9f28"
+checksum = "9d117600f438b1707d4e4ae15d3595657288f8235a0eb593e80ecc98ab34e1bc"
 dependencies = [
  "addr2line",
  "cfg-if 1.0.0",
  "libc",
  "miniz_oxide",
- "object 0.22.0",
+ "object 0.23.0",
  "rustc-demangle",
 ]
 
@@ -585,9 +614,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.4.0"
+version = "3.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820"
+checksum = "099e596ef14349721d9016f6b80dd3419ea1bf289ab9b44df8e4dfd3a005d5d9"
 
 [[package]]
 name = "byte-slice-cast"
@@ -636,13 +665,24 @@ version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"
 
+[[package]]
+name = "cargo-platform"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0226944a63d1bf35a3b5f948dd7c59e263db83695c9e8bffc4037de02e30f1d7"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "cargo_metadata"
-version = "0.12.0"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5a5f7b42f606b7f23674f6f4d877628350682bc40687d3fae65679a58d55345"
+checksum = "7714a157da7991e23d90686b9524b9e12e0407a108647f52e9328f4b3d51ac7f"
 dependencies = [
+ "cargo-platform",
  "semver 0.11.0",
+ "semver-parser 0.10.2",
  "serde",
  "serde_json",
 ]
@@ -658,9 +698,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.62"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1770ced377336a88a67c473594ccc14eca6f4559217c34f64aac8f83d641b40"
+checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"
 dependencies = [
  "jobserver",
 ]
@@ -802,15 +842,6 @@ dependencies = [
  "bitflags",
 ]
 
-[[package]]
-name = "cloudabi"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4344512281c643ae7638bbabc3af17a11307803ec8f0fcad9fae512a8bf36467"
-dependencies = [
- "bitflags",
-]
-
 [[package]]
 name = "concurrent-queue"
 version = "1.2.2"
@@ -832,9 +863,9 @@ dependencies = [
 
 [[package]]
 name = "const_fn"
-version = "0.4.3"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c478836e029dcef17fb47c89023448c64f781a046e0300e257ad8225ae59afab"
+checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6"
 
 [[package]]
 name = "constant_time_eq"
@@ -864,6 +895,12 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634"
 
+[[package]]
+name = "cpuid-bool"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba"
+
 [[package]]
 name = "cranelift-bforest"
 version = "0.66.0"
@@ -888,7 +925,7 @@ dependencies = [
  "log",
  "regalloc",
  "serde",
- "smallvec 1.5.0",
+ "smallvec 1.6.1",
  "target-lexicon",
  "thiserror",
 ]
@@ -926,7 +963,7 @@ checksum = "2ef419efb4f94ecc02e5d9fbcc910d2bb7f0040e2de570e63a454f883bc891d6"
 dependencies = [
  "cranelift-codegen",
  "log",
- "smallvec 1.5.0",
+ "smallvec 1.6.1",
  "target-lexicon",
 ]
 
@@ -967,16 +1004,16 @@ dependencies = [
 
 [[package]]
 name = "criterion"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70daa7ceec6cf143990669a04c7df13391d55fb27bd4079d252fca774ba244d8"
+checksum = "ab327ed7354547cc2ef43cbe20ef68b988e70b4b593cbd66a2a61733123a3d23"
 dependencies = [
  "atty",
  "cast",
  "clap",
  "criterion-plot",
  "csv",
- "itertools 0.9.0",
+ "itertools 0.10.0",
  "lazy_static",
  "num-traits",
  "oorandom",
@@ -1008,7 +1045,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
 dependencies = [
  "cfg-if 1.0.0",
- "crossbeam-utils 0.8.0",
+ "crossbeam-utils 0.8.1",
 ]
 
 [[package]]
@@ -1029,8 +1066,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
 dependencies = [
  "cfg-if 1.0.0",
- "crossbeam-epoch 0.9.0",
- "crossbeam-utils 0.8.0",
+ "crossbeam-epoch 0.9.1",
+ "crossbeam-utils 0.8.1",
 ]
 
 [[package]]
@@ -1044,21 +1081,21 @@ dependencies = [
  "crossbeam-utils 0.7.2",
  "lazy_static",
  "maybe-uninit",
- "memoffset",
+ "memoffset 0.5.6",
  "scopeguard",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0f606a85340376eef0d6d8fec399e6d4a544d648386c6645eb6d0653b27d9f"
+checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d"
 dependencies = [
  "cfg-if 1.0.0",
  "const_fn",
- "crossbeam-utils 0.8.0",
+ "crossbeam-utils 0.8.1",
  "lazy_static",
- "memoffset",
+ "memoffset 0.6.1",
  "scopeguard",
 ]
 
@@ -1086,13 +1123,12 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec91540d98355f690a86367e566ecad2e9e579f230230eb7c21398372be73ea5"
+checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"
 dependencies = [
  "autocfg",
  "cfg-if 1.0.0",
- "const_fn",
  "lazy_static",
 ]
 
@@ -1119,14 +1155,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
 dependencies = [
  "generic-array 0.14.4",
- "subtle 2.3.0",
+ "subtle 2.4.0",
 ]
 
 [[package]]
 name = "csv"
-version = "1.1.4"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc4666154fd004af3fd6f1da2e81a96fd5a81927fe8ddb6ecc79e2aa6e138b54"
+checksum = "f9d58633299b24b515ac72a3f869f8b91306a3cec616a602843a383acd6f9e97"
 dependencies = [
  "bstr",
  "csv-core",
@@ -1155,9 +1191,9 @@ dependencies = [
 
 [[package]]
 name = "ctor"
-version = "0.1.16"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fbaabec2c953050352311293be5c6aba8e141ba19d6811862b232d6fd020484"
+checksum = "10bcb9d7dcbf7002aaffbb53eac22906b64cdcc127971dcc387d8eb7c95d5560"
 dependencies = [
  "quote",
  "syn",
@@ -1176,35 +1212,35 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek"
-version = "2.1.0"
+version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d85653f070353a16313d0046f173f70d1aadd5b42600a14de626f0dfb3473a5"
+checksum = "434e1720189a637d44fe464f4df1e6eb900b4835255b14354497c78af37d9bb8"
 dependencies = [
  "byteorder",
  "digest 0.8.1",
  "rand_core 0.5.1",
- "subtle 2.3.0",
+ "subtle 2.4.0",
  "zeroize",
 ]
 
 [[package]]
 name = "curve25519-dalek"
-version = "3.0.0"
+version = "3.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8492de420e9e60bc9a1d66e2dbb91825390b738a388606600663fc529b4b307"
+checksum = "f627126b946c25a4638eec0ea634fc52506dea98db118aae985118ce7c3d723f"
 dependencies = [
  "byteorder",
  "digest 0.9.0",
  "rand_core 0.5.1",
- "subtle 2.3.0",
+ "subtle 2.4.0",
  "zeroize",
 ]
 
 [[package]]
 name = "data-encoding"
-version = "2.3.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "993a608597367c6377b258c25d7120740f00ed23a2252b729b1932dd7866f908"
+checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57"
 
 [[package]]
 name = "data-encoding-macro"
@@ -1336,9 +1372,9 @@ dependencies = [
 
 [[package]]
 name = "dyn-clone"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d55796afa1b20c2945ca8eabfc421839f2b766619209f1ede813cf2484f31804"
+checksum = "ee2626afccd7561a06cf1367e2950c4718ea04565e20fb5029b6c7d8ad09abcf"
 
 [[package]]
 name = "ed25519"
@@ -1355,11 +1391,11 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
 dependencies = [
- "curve25519-dalek 3.0.0",
+ "curve25519-dalek 3.0.2",
  "ed25519",
  "rand 0.7.3",
  "serde",
- "sha2 0.9.2",
+ "sha2 0.9.3",
  "zeroize",
 ]
 
@@ -1391,12 +1427,12 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.5.13"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38"
+checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
 dependencies = [
  "atty",
- "humantime",
+ "humantime 1.3.0",
  "log",
  "regex",
  "termcolor",
@@ -1404,12 +1440,12 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.7.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
+checksum = "f26ecb66b4bdca6c1409b40fb255eefc2bd4f6d135dab3c3124f80ffa2a9661e"
 dependencies = [
  "atty",
- "humantime",
+ "humantime 2.1.0",
  "log",
  "regex",
  "termcolor",
@@ -1423,9 +1459,9 @@ checksum = "6576a1755ddffd988788025e75bce9e74b018f7cc226198fe931d077911c6d7e"
 
 [[package]]
 name = "erased-serde"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ca8b296792113e1500fd935ae487be6e00ce318952a6880555554824d6ebf38"
+checksum = "0465971a8cc1fa2455c8465aaa377131e1f1cf4983280f474a13e68793aa770c"
 dependencies = [
  "serde",
 ]
@@ -1463,7 +1499,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5"
 dependencies = [
- "futures 0.3.9",
+ "futures 0.3.12",
 ]
 
 [[package]]
@@ -1535,13 +1571,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2cd795898c348a8ec9edc66ec9e014031c764d4c88cc26d09b492cd93eb41339"
 dependencies = [
  "either",
- "futures 0.3.9",
+ "futures 0.3.12",
  "futures-timer 3.0.2",
  "log",
  "num-traits",
  "parity-scale-codec",
  "parking_lot 0.11.1",
- "rand 0.8.1",
+ "rand 0.8.3",
 ]
 
 [[package]]
@@ -1551,7 +1587,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c"
 dependencies = [
  "byteorder",
- "rand 0.8.1",
+ "rand 0.8.3",
  "rustc-hex",
  "static_assertions",
 ]
@@ -1564,9 +1600,9 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
 
 [[package]]
 name = "flate2"
-version = "1.0.19"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7411863d55df97a419aa64cb4d2f167103ea9d767e2c54a1868b7ac3f6b47129"
+checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0"
 dependencies = [
  "cfg-if 1.0.0",
  "crc32fast",
@@ -1607,7 +1643,7 @@ dependencies = [
  "hex-literal",
  "linregress",
  "parity-scale-codec",
- "paste 0.1.18",
+ "paste 1.0.4",
  "sp-api",
  "sp-io",
  "sp-runtime",
@@ -1681,10 +1717,10 @@ dependencies = [
  "once_cell",
  "parity-scale-codec",
  "parity-util-mem",
- "paste 0.1.18",
+ "paste 1.0.4",
  "pretty_assertions",
  "serde",
- "smallvec 1.5.0",
+ "smallvec 1.6.1",
  "sp-api",
  "sp-arithmetic",
  "sp-core",
@@ -1844,9 +1880,9 @@ checksum = "4c7e4c2612746b0df8fed4ce0c69156021b704c9aefa360311c04e6e9e002eed"
 
 [[package]]
 name = "futures"
-version = "0.3.9"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c70be434c505aee38639abccb918163b63158a4b4bb791b45b7023044bdc3c9c"
+checksum = "da9052a1a50244d8d5aa9bf55cbc2fb6f357c86cc52e46c62ed390a7180cf150"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1859,9 +1895,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.9"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f01c61843314e95f96cc9245702248733a3a3d744e43e2e755e3c7af8348a0a9"
+checksum = "f2d31b7ec7efab6eefc7c57233bb10b847986139d88cc2f5a02a1ae6871a1846"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1869,9 +1905,9 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.9"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db8d3b0917ff63a2a96173133c02818fac4a746b0a57569d3baca9ec0e945e08"
+checksum = "79e5145dde8da7d1b3892dad07a9c98fc04bc39892b1ecc9692cf53e2b780a65"
 
 [[package]]
 name = "futures-cpupool"
@@ -1890,7 +1926,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdcef58a173af8148b182684c9f2d5250875adbcaff7b5794073894f9d8634a9"
 dependencies = [
  "futures 0.1.30",
- "futures 0.3.9",
+ "futures 0.3.12",
  "lazy_static",
  "log",
  "parking_lot 0.9.0",
@@ -1901,9 +1937,9 @@ dependencies = [
 
 [[package]]
 name = "futures-executor"
-version = "0.3.9"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ee9ca2f7eb4475772cf39dd1cd06208dce2670ad38f4d9c7262b3e15f127068"
+checksum = "e9e59fdc009a4b3096bf94f740a0f2424c082521f20a9b08c5c07c48d90fd9b9"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1913,30 +1949,30 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.9"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e37c1a51b037b80922864b8eed90692c5cd8abd4c71ce49b77146caa47f3253b"
+checksum = "28be053525281ad8259d47e4de5de657b25e7bac113458555bb4b70bc6870500"
 
 [[package]]
 name = "futures-lite"
-version = "1.11.2"
+version = "1.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e6c079abfac3ab269e2927ec048dabc89d009ebfdda6b8ee86624f30c689658"
+checksum = "b4481d0cd0de1d204a4fa55e7d45f07b1d958abcb06714b3446438e2eff695fb"
 dependencies = [
  "fastrand",
  "futures-core",
  "futures-io",
  "memchr",
  "parking",
- "pin-project-lite 0.1.11",
+ "pin-project-lite 0.2.4",
  "waker-fn",
 ]
 
 [[package]]
 name = "futures-macro"
-version = "0.3.9"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f8719ca0e1f3c5e34f3efe4570ef2c0610ca6da85ae7990d472e9cbfba13664"
+checksum = "c287d25add322d9f9abdcdc5927ca398917996600182178774032e9f8258fedd"
 dependencies = [
  "proc-macro-hack",
  "proc-macro2",
@@ -1957,15 +1993,15 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.9"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6adabac1290109cfa089f79192fb6244ad2c3f1cc2281f3e1dd987592b71feb"
+checksum = "caf5c69029bda2e743fddd0582d1083951d65cc9539aebf8812f36c3491342d6"
 
 [[package]]
 name = "futures-task"
-version = "0.3.9"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a92a0843a2ff66823a8f7c77bffe9a09be2b64e533562c412d63075643ec0038"
+checksum = "13de07eb8ea81ae445aca7b69f5f7bf15d7bf4912d8ca37d6645c77ae8a58d86"
 dependencies = [
  "once_cell",
 ]
@@ -1988,9 +2024,9 @@ dependencies = [
 
 [[package]]
 name = "futures-util"
-version = "0.3.9"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "036a2107cdeb57f6d7322f1b6c363dad67cd63ca3b7d1b925bdf75bd5d96cda9"
+checksum = "632a8cd0f2a4b3fdea1657f08bde063848c3bd00f9bbf6e256b8be78802e624b"
 dependencies = [
  "futures 0.1.30",
  "futures-channel",
@@ -2000,7 +2036,7 @@ dependencies = [
  "futures-sink",
  "futures-task",
  "memchr",
- "pin-project-lite 0.2.0",
+ "pin-project-lite 0.2.4",
  "pin-utils",
  "proc-macro-hack",
  "proc-macro-nested",
@@ -2013,19 +2049,6 @@ version = "0.3.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
 
-[[package]]
-name = "generator"
-version = "0.6.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cdc09201b2e8ca1b19290cf7e65de2246b8e91fb6874279722189c4de7b94dc"
-dependencies = [
- "cc",
- "libc",
- "log",
- "rustc_version",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "generic-array"
 version = "0.12.3"
@@ -2056,11 +2079,12 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.1.15"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
+ "js-sys",
  "libc",
  "wasi 0.9.0+wasi-snapshot-preview1",
  "wasm-bindgen",
@@ -2068,9 +2092,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4060f4657be78b8e766215b02b18a2e862d83745545de804638e2b545e81aee6"
+checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
@@ -2081,10 +2105,11 @@ dependencies = [
 
 [[package]]
 name = "ghash"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6e27f0689a6e15944bdce7e45425efb87eaa8ab0c6e87f11d0987a9133e2531"
+checksum = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375"
 dependencies = [
+ "opaque-debug 0.3.0",
  "polyval",
 ]
 
@@ -2166,7 +2191,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "futures-util",
- "http 0.2.1",
+ "http 0.2.3",
  "indexmap",
  "slab",
  "tokio 0.2.25",
@@ -2177,15 +2202,15 @@ dependencies = [
 
 [[package]]
 name = "half"
-version = "1.6.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d36fab90f82edc3c747f9d438e06cf0a491055896f2a279638bb5beed6c40177"
+checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3"
 
 [[package]]
 name = "handlebars"
-version = "3.5.1"
+version = "3.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2764f9796c0ddca4b82c07f25dd2cb3db30b9a8f47940e78e1c883d9e95c3db9"
+checksum = "964d0e99a61fe9b1b347389b77ebf8b7e1587b70293676aaca7d27e59b9073b2"
 dependencies = [
  "log",
  "pest",
@@ -2221,18 +2246,18 @@ dependencies = [
 
 [[package]]
 name = "heck"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
+checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac"
 dependencies = [
  "unicode-segmentation",
 ]
 
 [[package]]
 name = "hermit-abi"
-version = "0.1.17"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
 dependencies = [
  "libc",
 ]
@@ -2288,9 +2313,9 @@ dependencies = [
 
 [[package]]
 name = "honggfuzz"
-version = "0.5.51"
+version = "0.5.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f085725a5828d7e959f014f624773094dfe20acc91be310ef106923c30594bc"
+checksum = "ead88897bcad1c396806d6ccba260a0363e11da997472e9e19ab9889969083a2"
 dependencies = [
  "arbitrary",
  "lazy_static",
@@ -2310,11 +2335,11 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "0.2.1"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9"
+checksum = "7245cd7449cc792608c3c8a9eaf69bd4eabbabf802713748fd739c98b82f0747"
 dependencies = [
- "bytes 0.5.6",
+ "bytes 1.0.1",
  "fnv",
  "itoa",
 ]
@@ -2338,7 +2363,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
 dependencies = [
  "bytes 0.5.6",
- "http 0.2.1",
+ "http 0.2.3",
 ]
 
 [[package]]
@@ -2362,6 +2387,12 @@ dependencies = [
  "quick-error 1.2.3",
 ]
 
+[[package]]
+name = "humantime"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+
 [[package]]
 name = "hyper"
 version = "0.12.35"
@@ -2403,12 +2434,12 @@ dependencies = [
  "futures-core",
  "futures-util",
  "h2 0.2.7",
- "http 0.2.1",
+ "http 0.2.3",
  "http-body 0.3.1",
  "httparse",
  "httpdate",
  "itoa",
- "pin-project 1.0.2",
+ "pin-project 1.0.4",
  "socket2",
  "tokio 0.2.25",
  "tower-service",
@@ -2479,12 +2510,12 @@ dependencies = [
 
 [[package]]
 name = "if-watch"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16d7c5e361e6b05c882b4847dd98992534cebc6fcde7f4bc98225bcf10fd6d0d"
+checksum = "97b8538953a3f0d0d3868f0a706eb4273535e10d72acb5c82c1c23ae48835c85"
 dependencies = [
  "async-io",
- "futures 0.3.9",
+ "futures 0.3.12",
  "futures-lite",
  "if-addrs",
  "ipnet",
@@ -2535,9 +2566,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "1.6.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55e2e4c765aa53a0424761bf9f41aa7a6ac1efa87238f59560640e27fca028f2"
+checksum = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b"
 dependencies = [
  "autocfg",
  "hashbrown",
@@ -2546,9 +2577,9 @@ dependencies = [
 
 [[package]]
 name = "instant"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb1fc4429a33e1f80d41dc9fea4d108a88bec1de8053878898ae448a0b52f613"
+checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
@@ -2571,7 +2602,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64fa110ec7b8f493f416eed552740d10e7030ad5f63b2308f82c9608ec2df275"
 dependencies = [
- "futures 0.3.9",
+ "futures 0.3.12",
  "futures-timer 2.0.2",
 ]
 
@@ -2598,27 +2629,27 @@ checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135"
 
 [[package]]
 name = "itertools"
-version = "0.8.2"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484"
+checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
 dependencies = [
  "either",
 ]
 
 [[package]]
 name = "itertools"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
+checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319"
 dependencies = [
  "either",
 ]
 
 [[package]]
 name = "itoa"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
+checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
 
 [[package]]
 name = "jobserver"
@@ -2804,7 +2835,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8891bd853eff90e33024195d79d578dc984c82f9e0715fcd2b525a0c19d52811"
 dependencies = [
  "parity-util-mem",
- "smallvec 1.5.0",
+ "smallvec 1.6.1",
 ]
 
 [[package]]
@@ -2833,7 +2864,7 @@ dependencies = [
  "parking_lot 0.11.1",
  "regex",
  "rocksdb",
- "smallvec 1.5.0",
+ "smallvec 1.6.1",
 ]
 
 [[package]]
@@ -2842,7 +2873,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eb1e98ba343d0b35f9009a8844cd2b87fa3192f7e79033ac05b00aeae0f3b0b5"
 dependencies = [
- "futures 0.3.9",
+ "futures 0.3.12",
  "js-sys",
  "kvdb",
  "kvdb-memorydb",
@@ -2874,9 +2905,9 @@ checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a"
 
 [[package]]
 name = "libc"
-version = "0.2.81"
+version = "0.2.84"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
+checksum = "1cca32fa0182e8c0989459524dc356b8f2b5c10f1b9eb521b7d182c03cf8c5ff"
 
 [[package]]
 name = "libloading"
@@ -2902,7 +2933,7 @@ checksum = "d5133112ce42be9482f6a87be92a605dd6bbc9e93c297aee77d172ff06908f3a"
 dependencies = [
  "atomic",
  "bytes 1.0.1",
- "futures 0.3.9",
+ "futures 0.3.12",
  "lazy_static",
  "libp2p-core",
  "libp2p-core-derive",
@@ -2927,8 +2958,8 @@ dependencies = [
  "libp2p-yamux",
  "parity-multiaddr",
  "parking_lot 0.11.1",
- "pin-project 1.0.2",
- "smallvec 1.5.0",
+ "pin-project 1.0.4",
+ "smallvec 1.6.1",
  "wasm-timer",
 ]
 
@@ -2943,7 +2974,7 @@ dependencies = [
  "ed25519-dalek",
  "either",
  "fnv",
- "futures 0.3.9",
+ "futures 0.3.12",
  "futures-timer 3.0.2",
  "lazy_static",
  "libsecp256k1",
@@ -2952,14 +2983,14 @@ dependencies = [
  "multistream-select",
  "parity-multiaddr",
  "parking_lot 0.11.1",
- "pin-project 1.0.2",
- "prost 0.7.0",
+ "pin-project 1.0.4",
+ "prost",
  "prost-build",
  "rand 0.7.3",
  "ring",
  "rw-stream-sink",
- "sha2 0.9.2",
- "smallvec 1.5.0",
+ "sha2 0.9.3",
+ "smallvec 1.6.1",
  "thiserror",
  "unsigned-varint 0.6.0",
  "void",
@@ -2978,12 +3009,12 @@ dependencies = [
 
 [[package]]
 name = "libp2p-deflate"
-version = "0.27.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "935893c0e5b6ca6ef60d5225aab9182f97c8c5671df2fa9dee8f4ed72a90e6eb"
+checksum = "6d42eed63305f0420736fa487f9acef720c4528bd7852a6a760f5ccde4813345"
 dependencies = [
  "flate2",
- "futures 0.3.9",
+ "futures 0.3.12",
  "libp2p-core",
 ]
 
@@ -2993,7 +3024,7 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5153b6db68fd4baa3b304e377db744dd8fea8ff4e4504509ee636abcde88d3e3"
 dependencies = [
- "futures 0.3.9",
+ "futures 0.3.12",
  "libp2p-core",
  "log",
 ]
@@ -3006,14 +3037,14 @@ checksum = "b3c63dfa06581b24b1d12bf9815b43689a784424be217d6545c800c7c75a207f"
 dependencies = [
  "cuckoofilter",
  "fnv",
- "futures 0.3.9",
+ "futures 0.3.12",
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "prost 0.7.0",
+ "prost",
  "prost-build",
  "rand 0.7.3",
- "smallvec 1.5.0",
+ "smallvec 1.6.1",
 ]
 
 [[package]]
@@ -3027,17 +3058,17 @@ dependencies = [
  "byteorder",
  "bytes 1.0.1",
  "fnv",
- "futures 0.3.9",
+ "futures 0.3.12",
  "hex_fmt",
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "prost 0.7.0",
+ "prost",
  "prost-build",
  "rand 0.7.3",
  "regex",
- "sha2 0.9.2",
- "smallvec 1.5.0",
+ "sha2 0.9.3",
+ "smallvec 1.6.1",
  "unsigned-varint 0.6.0",
  "wasm-timer",
 ]
@@ -3048,13 +3079,13 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b40fb36a059b7a8cce1514bd8b546fa612e006c9937caa7f5950cb20021fe91e"
 dependencies = [
- "futures 0.3.9",
+ "futures 0.3.12",
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "prost 0.7.0",
+ "prost",
  "prost-build",
- "smallvec 1.5.0",
+ "smallvec 1.6.1",
  "wasm-timer",
 ]
 
@@ -3069,15 +3100,15 @@ dependencies = [
  "bytes 1.0.1",
  "either",
  "fnv",
- "futures 0.3.9",
+ "futures 0.3.12",
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "prost 0.7.0",
+ "prost",
  "prost-build",
  "rand 0.7.3",
- "sha2 0.9.2",
- "smallvec 1.5.0",
+ "sha2 0.9.3",
+ "smallvec 1.6.1",
  "uint",
  "unsigned-varint 0.6.0",
  "void",
@@ -3093,14 +3124,14 @@ dependencies = [
  "async-io",
  "data-encoding",
  "dns-parser",
- "futures 0.3.9",
+ "futures 0.3.12",
  "if-watch",
  "lazy_static",
  "libp2p-core",
  "libp2p-swarm",
  "log",
  "rand 0.7.3",
- "smallvec 1.5.0",
+ "smallvec 1.6.1",
  "socket2",
  "void",
 ]
@@ -3113,13 +3144,13 @@ checksum = "2705dc94b01ab9e3779b42a09bbf3712e637ed213e875c30face247291a85af0"
 dependencies = [
  "asynchronous-codec",
  "bytes 1.0.1",
- "futures 0.3.9",
+ "futures 0.3.12",
  "libp2p-core",
  "log",
  "nohash-hasher",
  "parking_lot 0.11.1",
  "rand 0.7.3",
- "smallvec 1.5.0",
+ "smallvec 1.6.1",
  "unsigned-varint 0.6.0",
 ]
 
@@ -3130,15 +3161,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4aca322b52a0c5136142a7c3971446fb1e9964923a526c9cc6ef3b7c94e57778"
 dependencies = [
  "bytes 1.0.1",
- "curve25519-dalek 3.0.0",
- "futures 0.3.9",
+ "curve25519-dalek 3.0.2",
+ "futures 0.3.12",
  "lazy_static",
  "libp2p-core",
  "log",
- "prost 0.7.0",
+ "prost",
  "prost-build",
  "rand 0.7.3",
- "sha2 0.9.2",
+ "sha2 0.9.3",
  "snow",
  "static_assertions",
  "x25519-dalek",
@@ -3151,7 +3182,7 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f3813276d0708c8db0f500d8beda1bda9ad955723b9cb272c41f4727256f73c"
 dependencies = [
- "futures 0.3.9",
+ "futures 0.3.12",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3168,10 +3199,10 @@ checksum = "48e8c1ec305c9949351925cdc7196b9570f4330477f5e47fbf5bb340b57e26ed"
 dependencies = [
  "asynchronous-codec",
  "bytes 1.0.1",
- "futures 0.3.9",
+ "futures 0.3.12",
  "libp2p-core",
  "log",
- "prost 0.7.0",
+ "prost",
  "prost-build",
  "unsigned-varint 0.6.0",
  "void",
@@ -3183,9 +3214,9 @@ version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ce3374f3b28162db9d3442c9347c4f14cb01e8290052615c7d341d40eae0599"
 dependencies = [
- "futures 0.3.9",
+ "futures 0.3.12",
  "log",
- "pin-project 1.0.2",
+ "pin-project 1.0.4",
  "rand 0.7.3",
  "salsa20",
  "sha3",
@@ -3199,30 +3230,30 @@ checksum = "d37637a4b33b5390322ccc068a33897d0aa541daf4fec99f6a7efbf37295346e"
 dependencies = [
  "async-trait",
  "bytes 1.0.1",
- "futures 0.3.9",
+ "futures 0.3.12",
  "libp2p-core",
  "libp2p-swarm",
  "log",
  "lru",
  "minicbor",
  "rand 0.7.3",
- "smallvec 1.5.0",
+ "smallvec 1.6.1",
  "unsigned-varint 0.6.0",
  "wasm-timer",
 ]
 
 [[package]]
 name = "libp2p-swarm"
-version = "0.27.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ea8c69839a0e593c8c6a24282cb234d48ac37be4153183f4914e00f5303e75"
+checksum = "d4f89ebb4d8953bda12623e9871959fe728dea3bf6eae0421dc9c42dc821e488"
 dependencies = [
  "either",
- "futures 0.3.9",
+ "futures 0.3.12",
  "libp2p-core",
  "log",
  "rand 0.7.3",
- "smallvec 1.5.0",
+ "smallvec 1.6.1",
  "void",
  "wasm-timer",
 ]
@@ -3234,7 +3265,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3dbd3d7076a478ac5a6aca55e74bdc250ac539b95de09b9d09915e0b8d01a6b2"
 dependencies = [
  "async-io",
- "futures 0.3.9",
+ "futures 0.3.12",
  "futures-timer 3.0.2",
  "if-watch",
  "ipnet",
@@ -3251,7 +3282,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "80ac51ce419f60be966e02103c17f67ff5dc4422ba83ba54d251d6c62a4ed487"
 dependencies = [
  "async-std",
- "futures 0.3.9",
+ "futures 0.3.12",
  "libp2p-core",
  "log",
 ]
@@ -3262,7 +3293,7 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6149c46cb76935c80bc8be6ec6e3ebd5f5e1679765a255fb34331d54610f15dd"
 dependencies = [
- "futures 0.3.9",
+ "futures 0.3.12",
  "js-sys",
  "libp2p-core",
  "parity-send-wrapper",
@@ -3277,7 +3308,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3b1c6a3431045da8b925ed83384e4c5163e14b990572307fca9c507435d4d22"
 dependencies = [
  "either",
- "futures 0.3.9",
+ "futures 0.3.12",
  "futures-rustls",
  "libp2p-core",
  "log",
@@ -3294,7 +3325,7 @@ version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "490b8b27fc40fe35212df1b6a3d14bffaa4117cbff956fdc2892168a371102ad"
 dependencies = [
- "futures 0.3.9",
+ "futures 0.3.12",
  "libp2p-core",
  "parking_lot 0.11.1",
  "thiserror",
@@ -3325,7 +3356,7 @@ dependencies = [
  "hmac-drbg",
  "rand 0.7.3",
  "sha2 0.8.2",
- "subtle 2.3.0",
+ "subtle 2.4.0",
  "typenum",
 ]
 
@@ -3342,9 +3373,9 @@ dependencies = [
 
 [[package]]
 name = "linked-hash-map"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a"
+checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
 
 [[package]]
 name = "linked_hash_set"
@@ -3403,24 +3434,12 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.11"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
 dependencies = [
- "cfg-if 0.1.10",
-]
-
-[[package]]
-name = "loom"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0e8460f2f2121162705187214720353c517b97bdfb3494c0b1e33d83ebe4bed"
-dependencies = [
- "cfg-if 0.1.10",
- "generator",
- "scoped-tls",
- "serde",
- "serde_json",
+ "cfg-if 1.0.0",
+ "value-bag",
 ]
 
 [[package]]
@@ -3464,9 +3483,9 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 
 [[package]]
 name = "matrixmultiply"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4f7ec66360130972f34830bfad9ef05c6610a43938a467bcc9ab9369ab3478f"
+checksum = "916806ba0031cd542105d916a97c8572e1fa6dd79c9c51e7eb43a09ec2dd84c1"
 dependencies = [
  "rawpointer",
 ]
@@ -3493,6 +3512,15 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "memmap2"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e73be3b7d04a0123e933fea1d50d126cc7196bbc0362c0ce426694f777194eee"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "memoffset"
 version = "0.5.6"
@@ -3502,6 +3530,15 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "memoffset"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "memory-db"
 version = "0.26.0"
@@ -3521,9 +3558,9 @@ checksum = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882"
 
 [[package]]
 name = "merlin"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6feca46f4fa3443a01769d768727f10c10a20fdb65e52dc16a81f0c8269bb78"
+checksum = "4e261cf0f8b3c42ded9f7d2bb59dea03aa52bc8a1cbc7482f9fc3fd1229d3b42"
 dependencies = [
  "byteorder",
  "keccak",
@@ -3533,18 +3570,18 @@ dependencies = [
 
 [[package]]
 name = "minicbor"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0164190d1771b1458c3742075b057ed55d25cd9dfb930aade99315a1eb1fe12d"
+checksum = "3265a9f5210bb726f81ef9c456ae0aff5321cd95748c0e71889b0e19d8f0332b"
 dependencies = [
  "minicbor-derive",
 ]
 
 [[package]]
 name = "minicbor-derive"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e071b3159835ee91df62dbdbfdd7ec366b7ea77c838f43aff4acda6b61bcfb9"
+checksum = "130b9455e28a3f308f6579671816a6f2621e2e0cbf55dc2f886345bef699481e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3656,9 +3693,9 @@ dependencies = [
 
 [[package]]
 name = "multihash"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb63389ee5fcd4df3f8727600f4a0c3df53c541f0ed4e8b50a9ae51a80fc1efe"
+checksum = "4dac63698b887d2d929306ea48b63760431ff8a24fac40ddb22f9c7f49fb7cab"
 dependencies = [
  "blake2b_simd",
  "blake2s_simd",
@@ -3666,16 +3703,16 @@ dependencies = [
  "digest 0.9.0",
  "generic-array 0.14.4",
  "multihash-derive",
- "sha2 0.9.2",
+ "sha2 0.9.3",
  "sha3",
  "unsigned-varint 0.5.1",
 ]
 
 [[package]]
 name = "multihash-derive"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f5653449cd45d502a53480ee08d7a599e8f4893d2bacb33c63d65bc20af6c1a"
+checksum = "85ee3c48cb9d9b275ad967a0e96715badc13c6029adb92f34fa17b9ff28fd81f"
 dependencies = [
  "proc-macro-crate",
  "proc-macro-error",
@@ -3698,10 +3735,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "10ddc0eb0117736f19d556355464fc87efc8ad98b29e3fd84f02531eb6e90840"
 dependencies = [
  "bytes 1.0.1",
- "futures 0.3.9",
+ "futures 0.3.12",
  "log",
- "pin-project 1.0.2",
- "smallvec 1.5.0",
+ "pin-project 1.0.4",
+ "smallvec 1.6.1",
  "unsigned-varint 0.6.0",
 ]
 
@@ -3755,15 +3792,14 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.17.0"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363"
+checksum = "b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2"
 dependencies = [
  "bitflags",
  "cc",
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "libc",
- "void",
 ]
 
 [[package]]
@@ -3772,7 +3808,7 @@ version = "0.8.0"
 dependencies = [
  "derive_more",
  "fs_extra",
- "futures 0.3.9",
+ "futures 0.3.12",
  "hash-db",
  "hex",
  "kvdb",
@@ -3808,7 +3844,7 @@ dependencies = [
 name = "node-browser-testing"
 version = "2.0.0"
 dependencies = [
- "futures 0.3.9",
+ "futures 0.3.12",
  "futures-timer 3.0.2",
  "jsonrpc-core",
  "libp2p",
@@ -3829,7 +3865,7 @@ dependencies = [
  "frame-benchmarking-cli",
  "frame-support",
  "frame-system",
- "futures 0.3.9",
+ "futures 0.3.12",
  "hex-literal",
  "log",
  "nix",
@@ -4158,7 +4194,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "fs_extra",
- "futures 0.3.9",
+ "futures 0.3.12",
  "log",
  "node-executor",
  "node-primitives",
@@ -4298,9 +4334,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397"
+checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4"
 
 [[package]]
 name = "once_cell"
@@ -4313,9 +4349,9 @@ dependencies = [
 
 [[package]]
 name = "oorandom"
-version = "11.1.2"
+version = "11.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a170cebd8021a008ea92e4db85a72f80b35df514ec664b296fdcbb654eac0b2c"
+checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
 
 [[package]]
 name = "opaque-debug"
@@ -4536,7 +4572,7 @@ dependencies = [
  "pallet-timestamp",
  "parity-scale-codec",
  "parity-wasm 0.41.0",
- "paste 1.0.3",
+ "paste 1.0.4",
  "pretty_assertions",
  "pwasm-utils 0.16.0",
  "rand 0.7.3",
@@ -4817,7 +4853,7 @@ name = "pallet-mmr"
 version = "2.0.1"
 dependencies = [
  "ckb-merkle-mountain-range",
- "env_logger 0.5.13",
+ "env_logger 0.8.2",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -5205,7 +5241,7 @@ dependencies = [
  "parity-scale-codec",
  "serde",
  "serde_json",
- "smallvec 1.5.0",
+ "smallvec 1.6.1",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5294,16 +5330,18 @@ dependencies = [
 
 [[package]]
 name = "parity-db"
-version = "0.1.2"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00d595e372d119261593297debbe4193811a4dc811d2a1ccbb8caaa6666ad7ab"
+checksum = "111e193c96758d476d272093a853882668da17489f76bf4361b8decae0b6c515"
 dependencies = [
  "blake2-rfc",
  "crc32fast",
+ "hex",
  "libc",
  "log",
- "memmap",
- "parking_lot 0.10.2",
+ "memmap2",
+ "parking_lot 0.11.1",
+ "rand 0.8.3",
 ]
 
 [[package]]
@@ -5386,7 +5424,7 @@ dependencies = [
  "parity-util-mem-derive",
  "parking_lot 0.11.1",
  "primitive-types",
- "smallvec 1.5.0",
+ "smallvec 1.6.1",
  "winapi 0.3.9",
 ]
 
@@ -5469,7 +5507,7 @@ checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
 dependencies = [
  "instant",
  "lock_api 0.4.2",
- "parking_lot_core 0.8.0",
+ "parking_lot_core 0.8.2",
 ]
 
 [[package]]
@@ -5479,11 +5517,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b"
 dependencies = [
  "cfg-if 0.1.10",
- "cloudabi 0.0.3",
+ "cloudabi",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.1.57",
  "rustc_version",
- "smallvec 0.6.13",
+ "smallvec 0.6.14",
  "winapi 0.3.9",
 ]
 
@@ -5494,25 +5532,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3"
 dependencies = [
  "cfg-if 0.1.10",
- "cloudabi 0.0.3",
+ "cloudabi",
  "libc",
- "redox_syscall",
- "smallvec 1.5.0",
+ "redox_syscall 0.1.57",
+ "smallvec 1.6.1",
  "winapi 0.3.9",
 ]
 
 [[package]]
 name = "parking_lot_core"
-version = "0.8.0"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b"
+checksum = "9ccb628cad4f84851442432c60ad8e1f607e29752d0bf072cbd0baf28aa34272"
 dependencies = [
- "cfg-if 0.1.10",
- "cloudabi 0.1.0",
+ "cfg-if 1.0.0",
  "instant",
  "libc",
- "redox_syscall",
- "smallvec 1.5.0",
+ "redox_syscall 0.1.57",
+ "smallvec 1.6.1",
  "winapi 0.3.9",
 ]
 
@@ -5528,9 +5565,9 @@ dependencies = [
 
 [[package]]
 name = "paste"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7151b083b0664ed58ed669fcdd92f01c3d2fdbf10af4931a301474950b52bfa9"
+checksum = "c5d65c4d95931acda4498f675e332fcbdc9a06705cd07086c510e9b6009cd1c1"
 
 [[package]]
 name = "paste-impl"
@@ -5648,11 +5685,11 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "1.0.2"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7"
+checksum = "95b70b68509f17aa2857863b6fa00bf21fc93674c7a8893de2f469f6aa7ca2f2"
 dependencies = [
- "pin-project-internal 1.0.2",
+ "pin-project-internal 1.0.4",
 ]
 
 [[package]]
@@ -5668,9 +5705,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-internal"
-version = "1.0.2"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f"
+checksum = "caa25a6393f22ce819b0f50e0be89287292fda8d425be38ee0ca14c4931d9e71"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5685,9 +5722,9 @@ checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.0"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b063f57ec186e6140e2b8b6921e5f1bd89c7356dda5b33acc5401203ca6131c"
+checksum = "439697af366c49a6d0a010c56a0d97685bc140ce0d377b13a2ea2aa42d64a827"
 
 [[package]]
 name = "pin-utils"
@@ -5703,22 +5740,38 @@ checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
 
 [[package]]
 name = "platforms"
-version = "0.2.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feb3b2b1033b8a60b4da6ee470325f887758c95d5320f52f9ce0df055a55940e"
+checksum = "989d43012e2ca1c4a02507c67282691a0a3207f9dc67cec596b43fe925b3d325"
 
 [[package]]
 name = "plotters"
-version = "0.2.15"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d1685fbe7beba33de0330629da9d955ac75bd54f33d7b79f9a895590124f6bb"
+checksum = "45ca0ae5f169d0917a7c7f5a9c1a3d3d9598f18f529dd2b8373ed988efea307a"
 dependencies = [
- "js-sys",
  "num-traits",
+ "plotters-backend",
+ "plotters-svg",
  "wasm-bindgen",
  "web-sys",
 ]
 
+[[package]]
+name = "plotters-backend"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b07fffcddc1cb3a1de753caa4e4df03b79922ba43cf882acc1bdd7e8df9f4590"
+
+[[package]]
+name = "plotters-svg"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b38a02e23bd9604b842a812063aec4ef702b57989c37b655254bb61c471ad211"
+dependencies = [
+ "plotters-backend",
+]
+
 [[package]]
 name = "polling"
 version = "2.0.2"
@@ -5734,20 +5787,22 @@ dependencies = [
 
 [[package]]
 name = "poly1305"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ce46de8e53ee414ca4d02bfefac75d8c12fba948b76622a40b4be34dfce980"
+checksum = "4b7456bc1ad2d4cf82b3a016be4c2ac48daf11bf990c1603ebd447fe6f30fca8"
 dependencies = [
+ "cpuid-bool 0.2.0",
  "universal-hash",
 ]
 
 [[package]]
 name = "polyval"
-version = "0.4.1"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5884790f1ce3553ad55fec37b5aaac5882e0e845a2612df744d6c85c9bf046c"
+checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd"
 dependencies = [
- "cfg-if 0.1.10",
+ "cpuid-bool 0.2.0",
+ "opaque-debug 0.3.0",
  "universal-hash",
 ]
 
@@ -5759,9 +5814,9 @@ checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
 
 [[package]]
 name = "predicates"
-version = "1.0.5"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96bfead12e90dccead362d62bb2c90a5f6fc4584963645bc7f71a735e0b0735a"
+checksum = "eeb433456c1a57cc93554dea3ce40b4c19c4057e41c55d4a0f3d84ea71c325aa"
 dependencies = [
  "difference",
  "predicates-core",
@@ -5769,15 +5824,15 @@ dependencies = [
 
 [[package]]
 name = "predicates-core"
-version = "1.0.0"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06075c3a3e92559ff8929e7a280684489ea27fe44805174c3ebd9328dcb37178"
+checksum = "57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451"
 
 [[package]]
 name = "predicates-tree"
-version = "1.0.0"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e63c4859013b38a76eca2414c64911fba30def9e3202ac461a2d22831220124"
+checksum = "15f553275e5721409451eb85e15fd9a860a6e5ab4496eb215987502b5f5391f2"
 dependencies = [
  "predicates-core",
  "treeline",
@@ -5848,9 +5903,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
 
 [[package]]
 name = "proc-macro-nested"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a"
+checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
 
 [[package]]
 name = "proc-macro2"
@@ -5863,11 +5918,11 @@ dependencies = [
 
 [[package]]
 name = "prometheus"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30d70cf4412832bcac9cffe27906f4a66e450d323525e977168c70d1b36120ae"
+checksum = "c8425533e7122f0c3cc7a37e6244b16ad3a2cc32ae7ac6276e2a75da0d9c200d"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "fnv",
  "lazy_static",
  "parking_lot 0.11.1",
@@ -5875,16 +5930,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "prost"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce49aefe0a6144a45de32927c77bd2859a5f7677b55f220ae5b744e87389c212"
-dependencies = [
- "bytes 0.5.6",
- "prost-derive 0.6.1",
-]
-
 [[package]]
 name = "prost"
 version = "0.7.0"
@@ -5892,7 +5937,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e6984d2f1a23009bd270b8bb56d0926810a3d483f59c987d77969e9d8e840b2"
 dependencies = [
  "bytes 1.0.1",
- "prost-derive 0.7.0",
+ "prost-derive",
 ]
 
 [[package]]
@@ -5907,25 +5952,12 @@ dependencies = [
  "log",
  "multimap",
  "petgraph",
- "prost 0.7.0",
+ "prost",
  "prost-types",
  "tempfile",
  "which 4.0.2",
 ]
 
-[[package]]
-name = "prost-derive"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "537aa19b95acde10a12fec4301466386f757403de4cd4e5b4fa78fb5ecb18f72"
-dependencies = [
- "anyhow",
- "itertools 0.8.2",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "prost-derive"
 version = "0.7.0"
@@ -5946,7 +5978,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b518d7cdd93dab1d1122cf07fa9a60771836c668dde9d9e2a139f957f0d9f1bb"
 dependencies = [
  "bytes 1.0.1",
- "prost 0.7.0",
+ "prost",
 ]
 
 [[package]]
@@ -5985,14 +6017,13 @@ checksum = "3ac73b1112776fc109b2e61909bc46c7e1bf0d7f690ffb1676553acce16d5cda"
 
 [[package]]
 name = "quickcheck"
-version = "0.9.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44883e74aa97ad63db83c4bf8ca490f02b2fc02f92575e720c8551e843c945f"
+checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6"
 dependencies = [
- "env_logger 0.7.1",
+ "env_logger 0.8.2",
  "log",
- "rand 0.7.3",
- "rand_core 0.5.1",
+ "rand 0.8.3",
 ]
 
 [[package]]
@@ -6008,18 +6039,18 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.7"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
+checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "radium"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9e006811e1fdd12672b0820a7f44c18dde429f367d50cec003d22aa9b3c8ddc"
+checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb"
 
 [[package]]
 name = "rand"
@@ -6050,7 +6081,7 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
 dependencies = [
- "getrandom 0.1.15",
+ "getrandom 0.1.16",
  "libc",
  "rand_chacha 0.2.2",
  "rand_core 0.5.1",
@@ -6060,9 +6091,9 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.8.1"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c24fcd450d3fa2b592732565aa4f17a27a61c65ece4726353e000939b0edee34"
+checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
 dependencies = [
  "libc",
  "rand_chacha 0.3.0",
@@ -6111,7 +6142,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
 dependencies = [
- "getrandom 0.1.15",
+ "getrandom 0.1.16",
 ]
 
 [[package]]
@@ -6120,7 +6151,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c026d7df8b298d90ccbbc5190bd04d85e159eaf5576caeacf8741da93ccbd2e5"
 dependencies = [
- "getrandom 0.2.1",
+ "getrandom 0.2.2",
 ]
 
 [[package]]
@@ -6161,9 +6192,9 @@ dependencies = [
 
 [[package]]
 name = "raw-cpuid"
-version = "7.0.3"
+version = "7.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4a349ca83373cfa5d6dbb66fd76e58b2cca08da71a5f6400de0a0a6a9bceeaf"
+checksum = "beb71f708fe39b2c5e98076204c3cc094ee5a4c12c4cdb119a2b72dc34164f41"
 dependencies = [
  "bitflags",
  "cc",
@@ -6196,7 +6227,7 @@ checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-deque 0.8.0",
- "crossbeam-utils 0.8.0",
+ "crossbeam-utils 0.8.1",
  "lazy_static",
  "num_cpus",
 ]
@@ -6216,31 +6247,40 @@ version = "0.1.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
 
+[[package]]
+name = "redox_syscall"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05ec8ca9416c5ea37062b502703cd7fcb207736bc294f6e0cf367ac6fc234570"
+dependencies = [
+ "bitflags",
+]
+
 [[package]]
 name = "redox_users"
 version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
 dependencies = [
- "getrandom 0.1.15",
- "redox_syscall",
+ "getrandom 0.1.16",
+ "redox_syscall 0.1.57",
  "rust-argon2",
 ]
 
 [[package]]
 name = "ref-cast"
-version = "1.0.3"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e17626b2f4bcf35b84bf379072a66e28cfe5c3c6ae58b38e4914bb8891dabece"
+checksum = "300f2a835d808734ee295d45007adacb9ebb29dd3ae2424acfa17930cae541da"
 dependencies = [
  "ref-cast-impl",
 ]
 
 [[package]]
 name = "ref-cast-impl"
-version = "1.0.3"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c523ccaed8ac4b0288948849a350b37d3035827413c458b6a40ddb614bb4f72"
+checksum = "4c38e3aecd2b21cb3959637b883bb3714bc7e43f0268b9a29d3743ee3e55cdd2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6255,14 +6295,14 @@ checksum = "b9ba8aaf5fe7cf307c6dbdaeed85478961d29e25e3bee5169e11b92fa9f027a8"
 dependencies = [
  "log",
  "rustc-hash",
- "smallvec 1.5.0",
+ "smallvec 1.6.1",
 ]
 
 [[package]]
 name = "regex"
-version = "1.4.2"
+version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c"
+checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -6282,9 +6322,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.21"
+version = "0.6.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
+checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581"
 
 [[package]]
 name = "region"
@@ -6315,9 +6355,9 @@ checksum = "53552c6c49e1e13f1a203ef0080ab3bbef0beb570a528993e83df057a9d9bba1"
 
 [[package]]
 name = "ring"
-version = "0.16.16"
+version = "0.16.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b72b84d47e8ec5a4f2872e8262b8f8256c5be1c938a7d6d3a867a3ba8f722f74"
+checksum = "024a1e66fea74c66c66624ee5622a7ff0e4b73a13b4f5c326ddb50c708944226"
 dependencies = [
  "cc",
  "libc",
@@ -6340,9 +6380,9 @@ dependencies = [
 
 [[package]]
 name = "rpassword"
-version = "5.0.0"
+version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d755237fc0f99d98641540e66abac8bc46a0652f19148ac9e21de2da06b326c9"
+checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb"
 dependencies = [
  "libc",
  "winapi 0.3.9",
@@ -6350,14 +6390,14 @@ dependencies = [
 
 [[package]]
 name = "rust-argon2"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dab61250775933275e84053ac235621dfb739556d5c54a2f2e9313b7cf43a19"
+checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb"
 dependencies = [
- "base64 0.12.3",
+ "base64 0.13.0",
  "blake2b_simd",
  "constant_time_eq",
- "crossbeam-utils 0.7.2",
+ "crossbeam-utils 0.8.1",
 ]
 
 [[package]]
@@ -6437,7 +6477,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020"
 dependencies = [
- "futures 0.3.9",
+ "futures 0.3.12",
  "pin-project 0.4.27",
  "static_assertions",
 ]
@@ -6482,12 +6522,12 @@ dependencies = [
  "async-trait",
  "derive_more",
  "either",
- "futures 0.3.9",
+ "futures 0.3.12",
  "futures-timer 3.0.2",
  "libp2p",
  "log",
  "parity-scale-codec",
- "prost 0.7.0",
+ "prost",
  "prost-build",
  "quickcheck",
  "rand 0.7.3",
@@ -6510,7 +6550,7 @@ dependencies = [
 name = "sc-basic-authorship"
 version = "0.8.1"
 dependencies = [
- "futures 0.3.9",
+ "futures 0.3.12",
  "futures-timer 3.0.2",
  "log",
  "parity-scale-codec",
@@ -6585,7 +6625,7 @@ version = "0.8.1"
 dependencies = [
  "chrono",
  "fdlimit",
- "futures 0.3.9",
+ "futures 0.3.12",
  "hex",
  "libp2p",
  "log",
@@ -6623,7 +6663,7 @@ version = "2.0.1"
 dependencies = [
  "derive_more",
  "fnv",
- "futures 0.3.9",
+ "futures 0.3.12",
  "hash-db",
  "kvdb",
  "kvdb-memorydb",
@@ -6703,9 +6743,9 @@ name = "sc-consensus-aura"
 version = "0.8.1"
 dependencies = [
  "derive_more",
- "futures 0.3.9",
+ "futures 0.3.12",
  "futures-timer 3.0.2",
- "getrandom 0.2.1",
+ "getrandom 0.2.2",
  "log",
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -6745,7 +6785,7 @@ version = "0.8.1"
 dependencies = [
  "derive_more",
  "fork-tree",
- "futures 0.3.9",
+ "futures 0.3.12",
  "futures-timer 3.0.2",
  "log",
  "merlin",
@@ -6799,7 +6839,7 @@ name = "sc-consensus-babe-rpc"
 version = "0.8.1"
 dependencies = [
  "derive_more",
- "futures 0.3.9",
+ "futures 0.3.12",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -6841,7 +6881,7 @@ version = "0.8.1"
 dependencies = [
  "assert_matches",
  "derive_more",
- "futures 0.3.9",
+ "futures 0.3.12",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -6878,7 +6918,7 @@ name = "sc-consensus-pow"
 version = "0.8.1"
 dependencies = [
  "derive_more",
- "futures 0.3.9",
+ "futures 0.3.12",
  "futures-timer 3.0.2",
  "log",
  "parity-scale-codec",
@@ -6900,7 +6940,7 @@ dependencies = [
 name = "sc-consensus-slots"
 version = "0.8.1"
 dependencies = [
- "futures 0.3.9",
+ "futures 0.3.12",
  "futures-timer 3.0.2",
  "log",
  "parity-scale-codec",
@@ -6948,7 +6988,7 @@ dependencies = [
  "parity-scale-codec",
  "parity-wasm 0.41.0",
  "parking_lot 0.11.1",
- "paste 0.1.18",
+ "paste 1.0.4",
  "sc-executor-common",
  "sc-executor-wasmi",
  "sc-executor-wasmtime",
@@ -7030,13 +7070,13 @@ dependencies = [
  "derive_more",
  "finality-grandpa",
  "fork-tree",
- "futures 0.3.9",
+ "futures 0.3.12",
  "futures-timer 3.0.2",
  "linked-hash-map",
  "log",
  "parity-scale-codec",
  "parking_lot 0.11.1",
- "pin-project 0.4.27",
+ "pin-project 1.0.4",
  "rand 0.7.3",
  "sc-block-builder",
  "sc-client-api",
@@ -7074,7 +7114,7 @@ version = "0.8.1"
 dependencies = [
  "derive_more",
  "finality-grandpa",
- "futures 0.3.9",
+ "futures 0.3.12",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -7103,12 +7143,12 @@ name = "sc-finality-grandpa-warp-sync"
 version = "0.8.0"
 dependencies = [
  "derive_more",
- "futures 0.3.9",
+ "futures 0.3.12",
  "log",
  "num-traits",
  "parity-scale-codec",
  "parking_lot 0.11.1",
- "prost 0.6.1",
+ "prost",
  "sc-client-api",
  "sc-finality-grandpa",
  "sc-network",
@@ -7122,7 +7162,7 @@ name = "sc-informant"
 version = "0.8.1"
 dependencies = [
  "ansi_term 0.12.1",
- "futures 0.3.9",
+ "futures 0.3.12",
  "log",
  "parity-util-mem",
  "sc-client-api",
@@ -7140,7 +7180,7 @@ version = "2.0.1"
 dependencies = [
  "async-trait",
  "derive_more",
- "futures 0.3.9",
+ "futures 0.3.12",
  "futures-util",
  "hex",
  "merlin",
@@ -7150,7 +7190,7 @@ dependencies = [
  "sp-application-crypto",
  "sp-core",
  "sp-keystore",
- "subtle 2.3.0",
+ "subtle 2.4.0",
  "tempfile",
 ]
 
@@ -7189,7 +7229,7 @@ dependencies = [
  "erased-serde",
  "fnv",
  "fork-tree",
- "futures 0.3.9",
+ "futures 0.3.12",
  "futures-timer 3.0.2",
  "hex",
  "ip_network",
@@ -7201,8 +7241,8 @@ dependencies = [
  "nohash-hasher",
  "parity-scale-codec",
  "parking_lot 0.11.1",
- "pin-project 0.4.27",
- "prost 0.7.0",
+ "pin-project 1.0.4",
+ "prost",
  "prost-build",
  "quickcheck",
  "rand 0.7.3",
@@ -7211,7 +7251,7 @@ dependencies = [
  "sc-peerset",
  "serde",
  "serde_json",
- "smallvec 1.5.0",
+ "smallvec 1.6.1",
  "sp-arithmetic",
  "sp-blockchain",
  "sp-consensus",
@@ -7237,7 +7277,7 @@ name = "sc-network-gossip"
 version = "0.8.1"
 dependencies = [
  "async-std",
- "futures 0.3.9",
+ "futures 0.3.12",
  "futures-timer 3.0.2",
  "libp2p",
  "log",
@@ -7256,7 +7296,7 @@ name = "sc-network-test"
 version = "0.8.0"
 dependencies = [
  "async-std",
- "futures 0.3.9",
+ "futures 0.3.12",
  "futures-timer 3.0.2",
  "libp2p",
  "log",
@@ -7284,7 +7324,7 @@ version = "2.0.1"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
- "futures 0.3.9",
+ "futures 0.3.12",
  "futures-timer 3.0.2",
  "hyper 0.13.9",
  "hyper-rustls",
@@ -7317,7 +7357,7 @@ dependencies = [
 name = "sc-peerset"
 version = "2.0.1"
 dependencies = [
- "futures 0.3.9",
+ "futures 0.3.12",
  "libp2p",
  "log",
  "rand 0.7.3",
@@ -7340,7 +7380,7 @@ version = "2.0.1"
 dependencies = [
  "assert_matches",
  "futures 0.1.30",
- "futures 0.3.9",
+ "futures 0.3.12",
  "hash-db",
  "jsonrpc-core",
  "jsonrpc-pubsub",
@@ -7381,7 +7421,7 @@ name = "sc-rpc-api"
 version = "0.8.1"
 dependencies = [
  "derive_more",
- "futures 0.3.9",
+ "futures 0.3.12",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -7438,7 +7478,7 @@ dependencies = [
  "directories 3.0.1",
  "exit-future",
  "futures 0.1.30",
- "futures 0.3.9",
+ "futures 0.3.12",
  "futures-timer 3.0.2",
  "hash-db",
  "jsonrpc-core",
@@ -7448,7 +7488,7 @@ dependencies = [
  "parity-scale-codec",
  "parity-util-mem",
  "parking_lot 0.11.1",
- "pin-project 0.4.27",
+ "pin-project 1.0.4",
  "rand 0.7.3",
  "sc-block-builder",
  "sc-chain-spec",
@@ -7506,7 +7546,7 @@ version = "2.0.0"
 dependencies = [
  "fdlimit",
  "futures 0.1.30",
- "futures 0.3.9",
+ "futures 0.3.12",
  "hex-literal",
  "log",
  "parity-scale-codec",
@@ -7574,11 +7614,11 @@ name = "sc-telemetry"
 version = "2.0.1"
 dependencies = [
  "chrono",
- "futures 0.3.9",
+ "futures 0.3.12",
  "libp2p",
  "log",
  "parking_lot 0.11.1",
- "pin-project 0.4.27",
+ "pin-project 1.0.4",
  "rand 0.7.3",
  "serde",
  "serde_json",
@@ -7634,7 +7674,7 @@ dependencies = [
  "assert_matches",
  "criterion",
  "derive_more",
- "futures 0.3.9",
+ "futures 0.3.12",
  "linked-hash-map",
  "log",
  "parity-scale-codec",
@@ -7657,7 +7697,7 @@ name = "sc-transaction-pool"
 version = "2.0.1"
 dependencies = [
  "assert_matches",
- "futures 0.3.9",
+ "futures 0.3.12",
  "futures-diagnose",
  "hex",
  "intervalier",
@@ -7702,14 +7742,14 @@ checksum = "021b403afe70d81eea68f6ea12f6b3c9588e5d536a94c3bf80f15e7faa267862"
 dependencies = [
  "arrayref",
  "arrayvec 0.5.2",
- "curve25519-dalek 2.1.0",
- "getrandom 0.1.15",
+ "curve25519-dalek 2.1.2",
+ "getrandom 0.1.16",
  "merlin",
  "rand 0.7.3",
  "rand_core 0.5.1",
  "serde",
  "sha2 0.8.2",
- "subtle 2.3.0",
+ "subtle 2.4.0",
  "zeroize",
 ]
 
@@ -7736,9 +7776,9 @@ dependencies = [
 
 [[package]]
 name = "scroll_derive"
-version = "0.10.4"
+version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b12bd20b94c7cdfda8c7ba9b92ad0d9a56e3fa018c25fca83b51aa664c9b4c0d"
+checksum = "aaaae8f38bb311444cfb7f1979af0bc9240d95795f75f9ceddf6a59b79ceffa0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7811,7 +7851,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
 dependencies = [
- "semver-parser 0.10.1",
+ "semver-parser 0.10.2",
  "serde",
 ]
 
@@ -7823,9 +7863,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "semver-parser"
-version = "0.10.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ef146c2ad5e5f4b037cd6ce2ebb775401729b19a82040c1beac9d36c7d1428"
+checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
 dependencies = [
  "pest",
 ]
@@ -7844,9 +7884,9 @@ checksum = "930c0acf610d3fdb5e2ab6213019aaa04e227ebe9547b0649ba599b16d788bd7"
 
 [[package]]
 name = "serde"
-version = "1.0.119"
+version = "1.0.123"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bdd36f49e35b61d49efd8aa7fc068fd295961fd2286d0b2ee9a4c7a14e99cc3"
+checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae"
 dependencies = [
  "serde_derive",
 ]
@@ -7863,9 +7903,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.119"
+version = "1.0.123"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "552954ce79a059ddd5fd68c271592374bd15cab2274970380c000118aeffe1cd"
+checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7874,9 +7914,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.59"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95"
+checksum = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a"
 dependencies = [
  "itoa",
  "ryu",
@@ -7903,7 +7943,7 @@ checksum = "ce3cdf1b5e620a498ee6f2a171885ac7e22f0e12089ec4b3d22b84921792507c"
 dependencies = [
  "block-buffer 0.9.0",
  "cfg-if 1.0.0",
- "cpuid-bool",
+ "cpuid-bool 0.1.2",
  "digest 0.9.0",
  "opaque-debug 0.3.0",
 ]
@@ -7922,13 +7962,13 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.9.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e7aab86fe2149bad8c507606bdb3f4ef5e7b2380eb92350f56122cca72a42a8"
+checksum = "fa827a14b29ab7f44778d14a88d3cb76e949c45083f7dbfa507d0cb699dc12de"
 dependencies = [
  "block-buffer 0.9.0",
  "cfg-if 1.0.0",
- "cpuid-bool",
+ "cpuid-bool 0.1.2",
  "digest 0.9.0",
  "opaque-debug 0.3.0",
 ]
@@ -7947,12 +7987,11 @@ dependencies = [
 
 [[package]]
 name = "sharded-slab"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b4921be914e16899a80adefb821f8ddb7974e3f1250223575a44ed994882127"
+checksum = "79c719719ee05df97490f80a45acfc99e5a30ce98a1e4fb67aee422745ae14e3"
 dependencies = [
  "lazy_static",
- "loom",
 ]
 
 [[package]]
@@ -7961,20 +8000,30 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
 
+[[package]]
+name = "signal-hook"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e31d442c16f047a671b5a71e2161d6e68814012b7f5379d269ebd915fac2729"
+dependencies = [
+ "libc",
+ "signal-hook-registry",
+]
+
 [[package]]
 name = "signal-hook-registry"
-version = "1.2.2"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce32ea0c6c56d5eacaeb814fbed9960547021d3edd010ded1425f180536b20ab"
+checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "signature"
-version = "1.2.2"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29f060a7d147e33490ec10da418795238fd7545bba241504d6b31a409f2e6210"
+checksum = "0f0242b8e50dd9accdd56170e94ca1ebd223b098eb9c83539a6e367d0f36ae68"
 
 [[package]]
 name = "simba"
@@ -7996,18 +8045,18 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 
 [[package]]
 name = "smallvec"
-version = "0.6.13"
+version = "0.6.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6"
+checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0"
 dependencies = [
  "maybe-uninit",
 ]
 
 [[package]]
 name = "smallvec"
-version = "1.5.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7acad6f34eb9e8a259d3283d1e8c1d34d7415943d4895f65cc73813c7396fc85"
+checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
 
 [[package]]
 name = "snow"
@@ -8022,20 +8071,19 @@ dependencies = [
  "rand_core 0.5.1",
  "ring",
  "rustc_version",
- "sha2 0.9.2",
- "subtle 2.3.0",
+ "sha2 0.9.3",
+ "subtle 2.4.0",
  "x25519-dalek",
 ]
 
 [[package]]
 name = "socket2"
-version = "0.3.17"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c29947abdee2a218277abeca306f25789c938e500ea5a9d4b12a5a504466902"
+checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
- "redox_syscall",
  "winapi 0.3.9",
 ]
 
@@ -8048,7 +8096,7 @@ dependencies = [
  "base64 0.12.3",
  "bytes 0.5.6",
  "flate2",
- "futures 0.3.9",
+ "futures 0.3.12",
  "httparse",
  "log",
  "rand 0.7.3",
@@ -8198,7 +8246,7 @@ dependencies = [
 name = "sp-blockchain"
 version = "2.0.1"
 dependencies = [
- "futures 0.3.9",
+ "futures 0.3.12",
  "log",
  "lru",
  "parity-scale-codec",
@@ -8223,7 +8271,7 @@ dependencies = [
 name = "sp-consensus"
 version = "0.8.1"
 dependencies = [
- "futures 0.3.9",
+ "futures 0.3.12",
  "futures-timer 3.0.2",
  "libp2p",
  "log",
@@ -8319,7 +8367,7 @@ dependencies = [
  "criterion",
  "dyn-clonable",
  "ed25519-dalek",
- "futures 0.3.9",
+ "futures 0.3.12",
  "hash-db",
  "hash256-std-hasher",
  "hex",
@@ -8342,7 +8390,7 @@ dependencies = [
  "secrecy",
  "serde",
  "serde_json",
- "sha2 0.9.2",
+ "sha2 0.9.3",
  "sp-debug-derive",
  "sp-externalities",
  "sp-runtime-interface",
@@ -8427,7 +8475,7 @@ dependencies = [
 name = "sp-io"
 version = "2.0.1"
 dependencies = [
- "futures 0.3.9",
+ "futures 0.3.12",
  "hash-db",
  "libsecp256k1",
  "log",
@@ -8462,7 +8510,7 @@ version = "0.8.0"
 dependencies = [
  "async-trait",
  "derive_more",
- "futures 0.3.9",
+ "futures 0.3.12",
  "merlin",
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -8547,7 +8595,7 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "parity-util-mem",
- "paste 0.1.18",
+ "paste 1.0.4",
  "rand 0.7.3",
  "serde",
  "serde_json",
@@ -8685,7 +8733,7 @@ dependencies = [
  "parking_lot 0.11.1",
  "pretty_assertions",
  "rand 0.7.3",
- "smallvec 1.5.0",
+ "smallvec 1.6.1",
  "sp-core",
  "sp-externalities",
  "sp-panic-handler",
@@ -8768,7 +8816,7 @@ name = "sp-transaction-pool"
 version = "2.0.1"
 dependencies = [
  "derive_more",
- "futures 0.3.9",
+ "futures 0.3.12",
  "log",
  "parity-scale-codec",
  "serde",
@@ -8800,7 +8848,7 @@ dependencies = [
 name = "sp-utils"
 version = "2.0.1"
 dependencies = [
- "futures 0.3.9",
+ "futures 0.3.12",
  "futures-core",
  "futures-timer 3.0.2",
  "lazy_static",
@@ -8882,9 +8930,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 
 [[package]]
 name = "structopt"
-version = "0.3.20"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "126d630294ec449fae0b16f964e35bf3c74f940da9dca17ee9b905f7b3112eb8"
+checksum = "5277acd7ee46e63e5168a80734c9f6ee81b1367a7d8772a2d765df2a3705d28c"
 dependencies = [
  "clap",
  "lazy_static",
@@ -8893,9 +8941,9 @@ dependencies = [
 
 [[package]]
 name = "structopt-derive"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65e51c492f9e23a220534971ff5afc14037289de430e3c83f9daf6a1b6ae91e8"
+checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -8906,18 +8954,18 @@ dependencies = [
 
 [[package]]
 name = "strum"
-version = "0.16.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6138f8f88a16d90134763314e3fc76fa3ed6a7db4725d6acf9a3ef95a3188d22"
+checksum = "7318c509b5ba57f18533982607f24070a55d353e90d4cae30c467cdb2ad5ac5c"
 dependencies = [
  "strum_macros",
 ]
 
 [[package]]
 name = "strum_macros"
-version = "0.16.0"
+version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0054a7df764039a6cd8592b9de84be4bec368ff081d203a7d5371cbfa8e65c81"
+checksum = "ee8bc6b87a5112aeeab1f4a9f7ab634fe6cbefc4850006df31267f4cfb9e3149"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -8953,9 +9001,9 @@ dependencies = [
  "chrono",
  "console_error_panic_hook",
  "futures 0.1.30",
- "futures 0.3.9",
+ "futures 0.3.12",
  "futures-timer 3.0.2",
- "getrandom 0.2.1",
+ "getrandom 0.2.2",
  "js-sys",
  "kvdb-web",
  "libp2p-wasm-ext",
@@ -8996,7 +9044,7 @@ version = "2.0.1"
 dependencies = [
  "frame-support",
  "frame-system",
- "futures 0.3.9",
+ "futures 0.3.12",
  "jsonrpc-client-transports",
  "jsonrpc-core",
  "parity-scale-codec",
@@ -9011,7 +9059,7 @@ name = "substrate-frame-rpc-system"
 version = "2.0.1"
 dependencies = [
  "frame-system-rpc-runtime-api",
- "futures 0.3.9",
+ "futures 0.3.12",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -9049,7 +9097,7 @@ name = "substrate-test-client"
 version = "2.0.1"
 dependencies = [
  "futures 0.1.30",
- "futures 0.3.9",
+ "futures 0.3.12",
  "hash-db",
  "hex",
  "parity-scale-codec",
@@ -9074,7 +9122,7 @@ dependencies = [
 name = "substrate-test-runtime"
 version = "2.0.0"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "frame-executive",
  "frame-support",
  "frame-system",
@@ -9118,7 +9166,7 @@ dependencies = [
 name = "substrate-test-runtime-client"
 version = "2.0.0"
 dependencies = [
- "futures 0.3.9",
+ "futures 0.3.12",
  "parity-scale-codec",
  "sc-block-builder",
  "sc-client-api",
@@ -9139,7 +9187,7 @@ name = "substrate-test-runtime-transaction-pool"
 version = "2.0.0"
 dependencies = [
  "derive_more",
- "futures 0.3.9",
+ "futures 0.3.12",
  "parity-scale-codec",
  "parking_lot 0.11.1",
  "sc-transaction-graph",
@@ -9153,7 +9201,7 @@ dependencies = [
 name = "substrate-test-utils"
 version = "2.0.1"
 dependencies = [
- "futures 0.3.9",
+ "futures 0.3.12",
  "sc-service",
  "substrate-test-utils-derive",
  "tokio 0.2.25",
@@ -9200,15 +9248,15 @@ checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
 
 [[package]]
 name = "subtle"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "343f3f510c2915908f155e94f17220b19ccfacf2a64a2a5d8004f2c3e311e7fd"
+checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2"
 
 [[package]]
 name = "syn"
-version = "1.0.58"
+version = "1.0.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc60a3d73ea6594cd712d830cc1f0390fd71542d8c8cd24e70cc54cdfd5e05d5"
+checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9247,23 +9295,23 @@ checksum = "ab0e7238dcc7b40a7be719a25365910f6807bd864f4cce6b2e6b873658e2b19d"
 
 [[package]]
 name = "tempfile"
-version = "3.1.0"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
+checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "libc",
- "rand 0.7.3",
- "redox_syscall",
+ "rand 0.8.3",
+ "redox_syscall 0.2.4",
  "remove_dir_all",
  "winapi 0.3.9",
 ]
 
 [[package]]
 name = "termcolor"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf11676eb135389f21fcda654382c4859bbfc1d2f36e4425a2f829bb41b1e20e"
+checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
 dependencies = [
  "winapi-util",
 ]
@@ -9279,18 +9327,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e"
+checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56"
+checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9299,11 +9347,11 @@ dependencies = [
 
 [[package]]
 name = "thread_local"
-version = "1.0.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
+checksum = "d8208a331e1cb318dd5bd76951d2b8fc48ca38a69f5f4e4af1b6a9f8c6236915"
 dependencies = [
- "lazy_static",
+ "once_cell",
 ]
 
 [[package]]
@@ -9338,7 +9386,7 @@ dependencies = [
  "pbkdf2 0.4.0",
  "rand 0.7.3",
  "rustc-hash",
- "sha2 0.9.2",
+ "sha2 0.9.3",
  "thiserror",
  "unicode-normalization",
  "zeroize",
@@ -9355,9 +9403,9 @@ dependencies = [
 
 [[package]]
 name = "tinytemplate"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d3dc76004a03cec1c5932bca4cdc2e39aaa798e3f82363dd94f9adf6098c12f"
+checksum = "a2ada8616fad06a2d0c455adc530de4ef57605a8120cc65da9653e0e9623ca74"
 dependencies = [
  "serde",
  "serde_json",
@@ -9365,9 +9413,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.0.1"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b78a366903f506d2ad52ca8dc552102ffdd3e937ba8a227f024dc1d1eae28575"
+checksum = "317cca572a0e89c3ce0ca1f1bdc9369547fe318a683418e42ac8f59d14701023"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -9655,18 +9703,18 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645"
+checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "tower-service"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
+checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
 
 [[package]]
 name = "tracing"
@@ -9676,7 +9724,7 @@ checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3"
 dependencies = [
  "cfg-if 1.0.0",
  "log",
- "pin-project-lite 0.2.0",
+ "pin-project-lite 0.2.4",
  "tracing-attributes",
  "tracing-core",
 ]
@@ -9746,7 +9794,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sharded-slab",
- "smallvec 1.5.0",
+ "smallvec 1.6.1",
  "thread_local",
  "tracing",
  "tracing-core",
@@ -9778,15 +9826,15 @@ dependencies = [
 
 [[package]]
 name = "trie-db"
-version = "0.22.2"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc176c377eb24d652c9c69c832c832019011b6106182bf84276c66b66d5c9a6"
+checksum = "ec051edf7f0fc9499a2cb0947652cab2148b9d7f61cee7605e312e9f970dacaf"
 dependencies = [
  "hash-db",
  "hashbrown",
  "log",
  "rustc-hex",
- "smallvec 1.5.0",
+ "smallvec 1.6.1",
 ]
 
 [[package]]
@@ -9816,9 +9864,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 
 [[package]]
 name = "trybuild"
-version = "1.0.38"
+version = "1.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17b06f8610494cbeb9a7665b398306f0109ab8708296d7f24b0bcd89178bb350"
+checksum = "1c9594b802f041389d2baac680663573dde3103bb4a4926d61d6aba689465978"
 dependencies = [
  "dissimilar",
  "glob",
@@ -9893,9 +9941,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.7.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db8716a166f290ff49dabc18b44aa407cb7c6dbe1aa0971b44b8a24b0ca35aae"
+checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796"
 
 [[package]]
 name = "unicode-width"
@@ -9916,7 +9964,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8326b2c654932e3e4f9196e69d08fdf7cfd718e1dc6f66b347e6024a0c961402"
 dependencies = [
  "generic-array 0.14.4",
- "subtle 2.3.0",
+ "subtle 2.4.0",
 ]
 
 [[package]]
@@ -9966,11 +10014,20 @@ dependencies = [
  "percent-encoding 2.1.0",
 ]
 
+[[package]]
+name = "value-bag"
+version = "1.0.0-alpha.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b676010e055c99033117c2343b33a40a30b91fecd6c49055ac9cd2d6c305ab1"
+dependencies = [
+ "ctor",
+]
+
 [[package]]
 name = "vcpkg"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c"
+checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb"
 
 [[package]]
 name = "vec-arena"
@@ -10084,11 +10141,11 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.18"
+version = "0.4.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7866cab0aa01de1edf8b5d7936938a7e397ee50ce24119aef3e1eaa3b6171da"
+checksum = "1fe9756085a84584ee9457a002b7cdfe0bfff169f45d2591d8be1345a6780e35"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "js-sys",
  "wasm-bindgen",
  "web-sys",
@@ -10125,9 +10182,9 @@ checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158"
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34d1cdc8b98a557f24733d50a1199c4b0635e465eecba9c45b214544da197f64"
+checksum = "0355fa0c1f9b792a09b6dcb6a8be24d51e71e6d74972f9eb4a44c4c004d24a25"
 dependencies = [
  "console_error_panic_hook",
  "js-sys",
@@ -10139,9 +10196,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8fb9c67be7439ee8ab1b7db502a49c05e51e2835b66796c705134d9b8e1a585"
+checksum = "27e07b46b98024c2ba2f9e83a10c2ef0515f057f2da299c1762a2017de80438b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10164,7 +10221,7 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f"
 dependencies = [
- "futures 0.3.9",
+ "futures 0.3.12",
  "js-sys",
  "parking_lot 0.11.1",
  "pin-utils",
@@ -10223,7 +10280,7 @@ dependencies = [
  "log",
  "region",
  "rustc-demangle",
- "smallvec 1.5.0",
+ "smallvec 1.6.1",
  "target-lexicon",
  "wasmparser 0.59.0",
  "wasmtime-environ",
@@ -10356,7 +10413,7 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
- "memoffset",
+ "memoffset 0.5.6",
  "more-asserts",
  "region",
  "thiserror",
@@ -10366,18 +10423,18 @@ dependencies = [
 
 [[package]]
 name = "wast"
-version = "27.0.0"
+version = "32.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2c3ef5f6a72dffa44c24d5811123f704e18a1dbc83637d347b1852b41d3835c"
+checksum = "c24a3ee360d01d60ed0a0f960ab76a6acce64348cdb0bf8699c2a866fad57c7c"
 dependencies = [
  "leb128",
 ]
 
 [[package]]
 name = "wat"
-version = "1.0.28"
+version = "1.0.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "835cf59c907f67e2bbc20f50157e08f35006fe2a8444d8ec9f5683e22f937045"
+checksum = "5e8f7f34773fa6318e8897283abf7941c1f250faae4e1a52f82df09c3bad7cce"
 dependencies = [
  "wast",
 ]
@@ -10394,9 +10451,9 @@ dependencies = [
 
 [[package]]
 name = "webpki"
-version = "0.21.3"
+version = "0.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab146130f5f790d45f82aeeb09e55a256573373ec64409fc19a6fb82fb1032ae"
+checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
 dependencies = [
  "ring",
  "untrusted",
@@ -10504,7 +10561,7 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc614d95359fd7afc321b66d2107ede58b246b844cf5d8a0adcca413e439f088"
 dependencies = [
- "curve25519-dalek 3.0.0",
+ "curve25519-dalek 3.0.2",
  "rand_core 0.5.1",
  "zeroize",
 ]
@@ -10515,7 +10572,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9aeb8c4043cac71c3c299dff107171c220d179492350ea198e109a414981b83c"
 dependencies = [
- "futures 0.3.9",
+ "futures 0.3.12",
  "log",
  "nohash-hasher",
  "parking_lot 0.11.1",
@@ -10546,18 +10603,18 @@ dependencies = [
 
 [[package]]
 name = "zstd"
-version = "0.5.3+zstd.1.4.5"
+version = "0.5.4+zstd.1.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01b32eaf771efa709e8308605bbf9319bf485dc1503179ec0469b611937c0cd8"
+checksum = "69996ebdb1ba8b1517f61387a883857818a66c8a295f487b1ffd8fd9d2c82910"
 dependencies = [
  "zstd-safe",
 ]
 
 [[package]]
 name = "zstd-safe"
-version = "2.0.5+zstd.1.4.5"
+version = "2.0.6+zstd.1.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cfb642e0d27f64729a639c52db457e0ae906e7bc6f5fe8f5c453230400f1055"
+checksum = "98aa931fb69ecee256d44589d19754e61851ae4769bf963b385119b1cc37a49e"
 dependencies = [
  "libc",
  "zstd-sys",
@@ -10565,9 +10622,9 @@ dependencies = [
 
 [[package]]
 name = "zstd-sys"
-version = "1.4.17+zstd.1.4.5"
+version = "1.4.18+zstd.1.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b89249644df056b522696b1bb9e7c18c87e8ffa3e2f0dc3b0155875d6498f01b"
+checksum = "a1e6e8778706838f43f771d80d37787cb2fe06dafe89dd3aebaf6721b9eaec81"
 dependencies = [
  "cc",
  "glob",
diff --git a/bin/node/bench/Cargo.toml b/bin/node/bench/Cargo.toml
index a9c52324a047..21f8cf722162 100644
--- a/bin/node/bench/Cargo.toml
+++ b/bin/node/bench/Cargo.toml
@@ -38,6 +38,6 @@ hex = "0.4.0"
 rand = { version = "0.7.2", features = ["small_rng"] }
 lazy_static = "1.4.0"
 parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
-parity-db = { version = "0.1.2" }
+parity-db = { version = "0.2.2" }
 sc-transaction-pool = { version = "2.0.0", path = "../../../client/transaction-pool" }
 futures = { version = "0.3.4", features = ["thread-pool"] }
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index af27b52377a4..5832baa9f322 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -120,10 +120,10 @@ sc-service-test = { version = "2.0.0", path = "../../../client/service/test" }
 futures = "0.3.9"
 tempfile = "3.1.0"
 assert_cmd = "1.0"
-nix = "0.17"
+nix = "0.19"
 serde_json = "1.0"
 regex = "1"
-platforms = "0.2.1"
+platforms = "1.1"
 
 [build-dependencies]
 structopt = { version = "0.3.8", optional = true }
diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml
index d4b82f323806..7f2cea233264 100644
--- a/client/authority-discovery/Cargo.toml
+++ b/client/authority-discovery/Cargo.toml
@@ -39,7 +39,7 @@ sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
 sp-api = { version = "2.0.0", path = "../../primitives/api" }
 
 [dev-dependencies]
-quickcheck = "0.9.0"
+quickcheck = "1.0.3"
 sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
 sc-peerset = { version = "2.0.0", path = "../peerset" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client"}
diff --git a/client/authority-discovery/src/worker/addr_cache.rs b/client/authority-discovery/src/worker/addr_cache.rs
index 1ad7f585e294..13b259fbbb10 100644
--- a/client/authority-discovery/src/worker/addr_cache.rs
+++ b/client/authority-discovery/src/worker/addr_cache.rs
@@ -113,7 +113,6 @@ mod tests {
 
 	use libp2p::multihash::{self, Multihash};
 	use quickcheck::{Arbitrary, Gen, QuickCheck, TestResult};
-	use rand::Rng;
 
 	use sp_authority_discovery::{AuthorityId, AuthorityPair};
 	use sp_core::crypto::Pair;
@@ -122,8 +121,8 @@ mod tests {
 	struct TestAuthorityId(AuthorityId);
 
 	impl Arbitrary for TestAuthorityId {
-		fn arbitrary<G: Gen>(g: &mut G) -> Self {
-			let seed: [u8; 32] = g.gen();
+		fn arbitrary(g: &mut Gen) -> Self {
+			let seed = (0..32).map(|_| u8::arbitrary(g)).collect::<Vec<_>>();
 			TestAuthorityId(AuthorityPair::from_seed_slice(&seed).unwrap().public())
 		}
 	}
@@ -132,8 +131,8 @@ mod tests {
 	struct TestMultiaddr(Multiaddr);
 
 	impl Arbitrary for TestMultiaddr {
-		fn arbitrary<G: Gen>(g: &mut G) -> Self {
-			let seed: [u8; 32] = g.gen();
+		fn arbitrary(g: &mut Gen) -> Self {
+			let seed = (0..32).map(|_| u8::arbitrary(g)).collect::<Vec<_>>();
 			let peer_id = PeerId::from_multihash(
 				Multihash::wrap(multihash::Code::Sha2_256.into(), &seed).unwrap()
 			).unwrap();
diff --git a/client/db/Cargo.toml b/client/db/Cargo.toml
index 33c70894c433..db3fc7eb85df 100644
--- a/client/db/Cargo.toml
+++ b/client/db/Cargo.toml
@@ -35,14 +35,14 @@ sp-trie = { version = "2.0.0", path = "../../primitives/trie" }
 sp-consensus = { version = "0.8.0", path = "../../primitives/consensus/common" }
 sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
 sp-database = { version = "2.0.0", path = "../../primitives/database" }
-parity-db = { version = "0.1.2", optional = true }
+parity-db = { version = "0.2.2", optional = true }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.8.0", path = "../../utils/prometheus" }
 
 [dev-dependencies]
 sp-keyring = { version = "2.0.0", path = "../../primitives/keyring" }
 sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
-quickcheck = "0.9"
+quickcheck = "1.0.3"
 kvdb-rocksdb = "0.11.0"
 tempfile = "3"
 
diff --git a/client/db/src/storage_cache.rs b/client/db/src/storage_cache.rs
index 317c637333d6..2dde8d505822 100644
--- a/client/db/src/storage_cache.rs
+++ b/client/db/src/storage_cache.rs
@@ -1471,50 +1471,46 @@ mod qc {
 	}
 
 	impl Arbitrary for Action {
-		fn arbitrary<G: quickcheck::Gen>(gen: &mut G) -> Self {
-			let path = gen.next_u32() as u8;
-			let mut buf = [0u8; 32];
+		fn arbitrary(gen: &mut quickcheck::Gen) -> Self {
+			let path = u8::arbitrary(gen);
+			let buf = (0..32).map(|_| u8::arbitrary(gen)).collect::<Vec<_>>();
 
 			match path {
 				0..=175 => {
-					gen.fill_bytes(&mut buf[..]);
 					Action::Next {
-						hash: H256::from(&buf),
+						hash: H256::from_slice(&buf[..]),
 						changes: {
 							let mut set = Vec::new();
-							for _ in 0..gen.next_u32()/(64*256*256*256) {
-								set.push((vec![gen.next_u32() as u8], Some(vec![gen.next_u32() as u8])));
+							for _ in 0..<u32>::arbitrary(gen)/(64*256*256*256) {
+								set.push((vec![u8::arbitrary(gen)], Some(vec![u8::arbitrary(gen)])));
 							}
 							set
 						}
 					}
 				},
 				176..=220 => {
-					gen.fill_bytes(&mut buf[..]);
 					Action::Fork {
-						hash: H256::from(&buf),
-						depth: ((gen.next_u32() as u8) / 32) as usize,
+						hash: H256::from_slice(&buf[..]),
+						depth: ((u8::arbitrary(gen)) / 32) as usize,
 						changes: {
 							let mut set = Vec::new();
-							for _ in 0..gen.next_u32()/(64*256*256*256) {
-								set.push((vec![gen.next_u32() as u8], Some(vec![gen.next_u32() as u8])));
+							for _ in 0..<u32>::arbitrary(gen)/(64*256*256*256) {
+								set.push((vec![u8::arbitrary(gen)], Some(vec![u8::arbitrary(gen)])));
 							}
 							set
 						}
 					}
 				},
 				221..=240 => {
-					gen.fill_bytes(&mut buf[..]);
 					Action::ReorgWithImport {
-						hash: H256::from(&buf),
-						depth: ((gen.next_u32() as u8) / 32) as usize, // 0-7
+						hash: H256::from_slice(&buf[..]),
+						depth: ((u8::arbitrary(gen)) / 32) as usize, // 0-7
 					}
 				},
 				_ => {
-					gen.fill_bytes(&mut buf[..]);
 					Action::FinalizationReorg {
-						fork_depth: ((gen.next_u32() as u8) / 32) as usize, // 0-7
-						depth: ((gen.next_u32() as u8) / 64) as usize, // 0-3
+						fork_depth: ((u8::arbitrary(gen)) / 32) as usize, // 0-7
+						depth: ((u8::arbitrary(gen)) / 64) as usize, // 0-3
 					}
 				},
 			}
diff --git a/client/executor/Cargo.toml b/client/executor/Cargo.toml
index bfa50518aeeb..12a45d09c0b0 100644
--- a/client/executor/Cargo.toml
+++ b/client/executor/Cargo.toml
@@ -49,7 +49,7 @@ sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
 sc-tracing = { version = "2.0.0", path = "../tracing" }
 tracing = "0.1.22"
 tracing-subscriber = "0.2.15"
-paste = "0.1.6"
+paste = "1.0"
 
 [features]
 default = [ "std" ]
diff --git a/client/finality-grandpa-warp-sync/Cargo.toml b/client/finality-grandpa-warp-sync/Cargo.toml
index 38aa08f4a2bb..4a8941a554aa 100644
--- a/client/finality-grandpa-warp-sync/Cargo.toml
+++ b/client/finality-grandpa-warp-sync/Cargo.toml
@@ -23,6 +23,6 @@ futures = "0.3.8"
 log = "0.4.11"
 derive_more = "0.99.11"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-prost = "0.6.1"
+prost = "0.7"
 num-traits = "0.2.14"
 parking_lot = "0.11.1"
diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml
index 951c6f93b5a7..5c9636b1412b 100644
--- a/client/finality-grandpa/Cargo.toml
+++ b/client/finality-grandpa/Cargo.toml
@@ -44,7 +44,7 @@ sp-finality-grandpa = { version = "2.0.0", path = "../../primitives/finality-gra
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.8.0"}
 sc-block-builder = { version = "0.8.0", path = "../block-builder" }
 finality-grandpa = { version = "0.13.0", features = ["derive-codec"] }
-pin-project = "0.4.6"
+pin-project = "1.0.4"
 linked-hash-map = "0.5.2"
 
 [dev-dependencies]
diff --git a/client/network-gossip/Cargo.toml b/client/network-gossip/Cargo.toml
index b0120e306a52..487291fd6f52 100644
--- a/client/network-gossip/Cargo.toml
+++ b/client/network-gossip/Cargo.toml
@@ -27,6 +27,6 @@ wasm-timer = "0.2"
 
 [dev-dependencies]
 async-std = "1.6.5"
-quickcheck = "0.9.0"
+quickcheck = "1.0.3"
 rand = "0.7.2"
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
diff --git a/client/network-gossip/src/bridge.rs b/client/network-gossip/src/bridge.rs
index 15451ec3cd57..235ac98dc396 100644
--- a/client/network-gossip/src/bridge.rs
+++ b/client/network-gossip/src/bridge.rs
@@ -303,7 +303,6 @@ mod tests {
 	use crate::{ValidationResult, ValidatorContext};
 	use futures::{channel::mpsc::{unbounded, UnboundedSender}, executor::{block_on, block_on_stream}, future::poll_fn};
 	use quickcheck::{Arbitrary, Gen, QuickCheck};
-	use rand::Rng;
 	use sc_network::ObservedRole;
 	use sp_runtime::{testing::H256, traits::{Block as BlockT}};
 	use std::borrow::Cow;
@@ -469,12 +468,14 @@ mod tests {
 		}
 
 		impl Arbitrary for ChannelLengthAndTopic {
-			fn arbitrary<G: Gen>(g: &mut G) -> Self {
+			fn arbitrary(g: &mut Gen) -> Self {
+				let possible_length = (0..100).collect::<Vec<usize>>();
+				let possible_topics = (0..10).collect::<Vec<u64>>();
 				Self {
-					length: g.gen_range(0, 100),
+					length: *g.choose(&possible_length).unwrap(),
 					// Make sure channel topics and message topics overlap by choosing a small
 					// range.
-					topic: H256::from_low_u64_ne(g.gen_range(0, 10)),
+					topic: H256::from_low_u64_ne(*g.choose(&possible_topics).unwrap()),
 				}
 			}
 		}
@@ -485,11 +486,12 @@ mod tests {
 		}
 
 		impl Arbitrary for Message{
-			fn arbitrary<G: Gen>(g: &mut G) -> Self {
+			fn arbitrary(g: &mut Gen) -> Self {
+				let possible_topics = (0..10).collect::<Vec<u64>>();
 				Self {
 					// Make sure channel topics and message topics overlap by choosing a small
 					// range.
-					topic: H256::from_low_u64_ne(g.gen_range(0, 10)),
+					topic: H256::from_low_u64_ne(*g.choose(&possible_topics).unwrap()),
 				}
 			}
 		}
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index d6cb9bcb0eb8..70eb60f3db1b 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -40,7 +40,7 @@ lru = "0.6.3"
 log = "0.4.8"
 nohash-hasher = "0.2.0"
 parking_lot = "0.11.1"
-pin-project = "0.4.6"
+pin-project = "1.0.4"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.8.0", path = "../../utils/prometheus" }
 prost = "0.7"
 rand = "0.7.2"
@@ -70,7 +70,7 @@ features = ["identify", "kad", "mdns", "mplex", "noise", "ping", "request-respon
 [dev-dependencies]
 assert_matches = "1.3"
 libp2p = { version = "0.34.0", default-features = false }
-quickcheck = "0.9.0"
+quickcheck = "1.0.3"
 rand = "0.7.2"
 sp-keyring = { version = "2.0.0", path = "../../primitives/keyring" }
 sp-test-primitives = { version = "2.0.0", path = "../../primitives/test-primitives" }
diff --git a/client/network/src/protocol/sync/extra_requests.rs b/client/network/src/protocol/sync/extra_requests.rs
index d0fcfb777b8b..3de79b3f4873 100644
--- a/client/network/src/protocol/sync/extra_requests.rs
+++ b/client/network/src/protocol/sync/extra_requests.rs
@@ -345,8 +345,7 @@ impl<'a, B: BlockT> Matcher<'a, B> {
 mod tests {
 	use crate::protocol::sync::PeerSync;
 	use sp_blockchain::Error as ClientError;
-	use quickcheck::{Arbitrary, Gen, QuickCheck, StdThreadGen};
-	use rand::Rng;
+	use quickcheck::{Arbitrary, Gen, QuickCheck};
 	use std::collections::{HashMap, HashSet};
 	use super::*;
 	use sp_test_primitives::{Block, BlockNumber, Hash};
@@ -373,7 +372,7 @@ mod tests {
 			}
 		}
 
-		QuickCheck::with_gen(StdThreadGen::new(19))
+		QuickCheck::new()
 			.quickcheck(property as fn(ArbitraryPeers))
 	}
 
@@ -425,7 +424,7 @@ mod tests {
 			previously_active == requests.pending_requests.iter().cloned().collect::<HashSet<_>>()
 		}
 
-		QuickCheck::with_gen(StdThreadGen::new(19))
+		QuickCheck::new()
 			.quickcheck(property as fn(ArbitraryPeers) -> bool)
 	}
 
@@ -457,7 +456,7 @@ mod tests {
 			}
 		}
 
-		QuickCheck::with_gen(StdThreadGen::new(19))
+		QuickCheck::new()
 			.quickcheck(property as fn(ArbitraryPeers))
 	}
 
@@ -527,11 +526,11 @@ mod tests {
 	struct ArbitraryPeerSyncState(PeerSyncState<Block>);
 
 	impl Arbitrary for ArbitraryPeerSyncState {
-		fn arbitrary<G: Gen>(g: &mut G) -> Self {
-			let s = match g.gen::<u8>() % 4 {
+		fn arbitrary(g: &mut Gen) -> Self {
+			let s = match u8::arbitrary(g) % 4 {
 				0 => PeerSyncState::Available,
 				// TODO: 1 => PeerSyncState::AncestorSearch(g.gen(), AncestorSearchState<B>),
-				1 => PeerSyncState::DownloadingNew(g.gen::<BlockNumber>()),
+				1 => PeerSyncState::DownloadingNew(BlockNumber::arbitrary(g)),
 				2 => PeerSyncState::DownloadingStale(Hash::random()),
 				_ => PeerSyncState::DownloadingJustification(Hash::random()),
 			};
@@ -543,12 +542,12 @@ mod tests {
 	struct ArbitraryPeerSync(PeerSync<Block>);
 
 	impl Arbitrary for ArbitraryPeerSync {
-		fn arbitrary<G: Gen>(g: &mut G) -> Self {
+		fn arbitrary(g: &mut Gen) -> Self {
 			let ps = PeerSync {
 				peer_id: PeerId::random(),
-				common_number: g.gen(),
+				common_number: u64::arbitrary(g),
 				best_hash: Hash::random(),
-				best_number: g.gen(),
+				best_number: u64::arbitrary(g),
 				state: ArbitraryPeerSyncState::arbitrary(g).0,
 			};
 			ArbitraryPeerSync(ps)
@@ -559,7 +558,7 @@ mod tests {
 	struct ArbitraryPeers(HashMap<PeerId, PeerSync<Block>>);
 
 	impl Arbitrary for ArbitraryPeers {
-		fn arbitrary<G: Gen>(g: &mut G) -> Self {
+		fn arbitrary(g: &mut Gen) -> Self {
 			let mut peers = HashMap::with_capacity(g.size());
 			for _ in 0 .. g.size() {
 				let ps = ArbitraryPeerSync::arbitrary(g).0;
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index 78c5f94baf66..8833a65190ec 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -36,7 +36,7 @@ log = "0.4.11"
 futures-timer = "3.0.1"
 wasm-timer = "0.2"
 exit-future = "0.2.0"
-pin-project = "0.4.8"
+pin-project = "1.0.4"
 hash-db = "0.15.2"
 serde = "1.0.101"
 serde_json = "1.0.41"
diff --git a/client/telemetry/Cargo.toml b/client/telemetry/Cargo.toml
index f6e249c786a9..b209755e1b61 100644
--- a/client/telemetry/Cargo.toml
+++ b/client/telemetry/Cargo.toml
@@ -20,7 +20,7 @@ futures = "0.3.9"
 wasm-timer = "0.2.5"
 libp2p = { version = "0.34.0", default-features = false, features = ["dns", "tcp-async-io", "wasm-ext", "websocket"] }
 log = "0.4.8"
-pin-project = "0.4.6"
+pin-project = "1.0.4"
 rand = "0.7.2"
 serde = { version = "1.0.101", features = ["derive"] }
 take_mut = "0.2.2"
diff --git a/frame/benchmarking/Cargo.toml b/frame/benchmarking/Cargo.toml
index 960c7d731f0b..2cec36698dd6 100644
--- a/frame/benchmarking/Cargo.toml
+++ b/frame/benchmarking/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 linregress = { version = "0.4.0", optional = true }
-paste = "0.1"
+paste = "1.0"
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 sp-api = { version = "2.0.0", path = "../../primitives/api", default-features = false }
 sp-runtime-interface = { version = "2.0.0", path = "../../primitives/runtime-interface", default-features = false }
diff --git a/frame/merkle-mountain-range/Cargo.toml b/frame/merkle-mountain-range/Cargo.toml
index 60fba2de97c5..dc71b6b412d0 100644
--- a/frame/merkle-mountain-range/Cargo.toml
+++ b/frame/merkle-mountain-range/Cargo.toml
@@ -25,7 +25,7 @@ sp-runtime = { version = "2.0.0", default-features = false, path = "../../primit
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 
 [dev-dependencies]
-env_logger = "0.5"
+env_logger = "0.8"
 hex-literal = "0.3"
 
 [features]
diff --git a/frame/support/Cargo.toml b/frame/support/Cargo.toml
index 294e4c1574a3..c37da41c3483 100644
--- a/frame/support/Cargo.toml
+++ b/frame/support/Cargo.toml
@@ -26,7 +26,7 @@ sp-arithmetic = { version = "2.0.0", default-features = false, path = "../../pri
 sp-inherents = { version = "2.0.0", default-features = false, path = "../../primitives/inherents" }
 sp-staking = { version = "2.0.0", default-features = false, path = "../../primitives/staking" }
 frame-support-procedural = { version = "2.0.1", default-features = false, path = "./procedural" }
-paste = "0.1.6"
+paste = "1.0"
 once_cell = { version = "1", default-features = false, optional = true }
 sp-state-machine = { version = "0.8.0", optional = true, path = "../../primitives/state-machine" }
 bitflags = "1.2"
diff --git a/primitives/keyring/Cargo.toml b/primitives/keyring/Cargo.toml
index e3e927f70bb8..ae874ad24f8e 100644
--- a/primitives/keyring/Cargo.toml
+++ b/primitives/keyring/Cargo.toml
@@ -18,4 +18,4 @@ targets = ["x86_64-unknown-linux-gnu"]
 sp-core = { version = "2.0.0", path = "../core" }
 sp-runtime = { version = "2.0.0", path = "../runtime" }
 lazy_static = "1.4.0"
-strum = { version = "0.16.0", features = ["derive"] }
+strum = { version = "0.20.0", features = ["derive"] }
diff --git a/primitives/runtime/Cargo.toml b/primitives/runtime/Cargo.toml
index 6d35fbd35227..7dd53c6c2e52 100644
--- a/primitives/runtime/Cargo.toml
+++ b/primitives/runtime/Cargo.toml
@@ -23,7 +23,7 @@ sp-arithmetic = { version = "2.0.0", default-features = false, path = "../arithm
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 sp-io = { version = "2.0.0", default-features = false, path = "../io" }
 log = { version = "0.4.8", optional = true }
-paste = "0.1.6"
+paste = "1.0"
 rand = { version = "0.7.2", optional = true }
 impl-trait-for-tuples = "0.2.0"
 parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
diff --git a/primitives/utils/Cargo.toml b/primitives/utils/Cargo.toml
index b42c92abad92..2a67dd858904 100644
--- a/primitives/utils/Cargo.toml
+++ b/primitives/utils/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 futures = "0.3.9"
 futures-core = "0.3.4"
 lazy_static = "1.4.0"
-prometheus = { version = "0.10.0", default-features = false }
+prometheus = { version = "0.11.0", default-features = false }
 futures-timer = "3.0.2"
 
 [features]
diff --git a/test-utils/runtime/Cargo.toml b/test-utils/runtime/Cargo.toml
index b4a860403d46..8b9dc20b5976 100644
--- a/test-utils/runtime/Cargo.toml
+++ b/test-utils/runtime/Cargo.toml
@@ -46,7 +46,7 @@ sp-state-machine = { version = "0.8.0", default-features = false, path = "../../
 sp-externalities = { version = "0.8.0", default-features = false, path = "../../primitives/externalities" }
 
 # 3rd party
-cfg-if = "0.1.10"
+cfg-if = "1.0"
 log = { version = "0.4.8", optional = true }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 
diff --git a/utils/build-script-utils/Cargo.toml b/utils/build-script-utils/Cargo.toml
index f82ee7487d9f..28e511c4ee98 100644
--- a/utils/build-script-utils/Cargo.toml
+++ b/utils/build-script-utils/Cargo.toml
@@ -13,4 +13,4 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-platforms = "0.2.1"
+platforms = "1.1"
diff --git a/utils/prometheus/Cargo.toml b/utils/prometheus/Cargo.toml
index 19df4fb8059d..ef0f6e309d3d 100644
--- a/utils/prometheus/Cargo.toml
+++ b/utils/prometheus/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 log = "0.4.8"
-prometheus = { version = "0.10.0", default-features = false }
+prometheus = { version = "0.11.0", default-features = false }
 futures-util = { version = "0.3.1", default-features = false, features = ["io"] }
 derive_more = "0.99"
 

From 3c9b031e449a6249dde07e00066848e0ee481ddf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Thu, 4 Feb 2021 19:18:44 +0000
Subject: [PATCH 0367/1194] transaction-pool: drop unpropagable txs if local
 node cant author blocks (#8048)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* transaction-pool: drop unpropagable txs if local node cant author blocks

* fix test compilation

* transaction-pool: remove unnecessary static bound on CanAuthor

Co-authored-by: Tomasz Drwięga <tomusdrw@users.noreply.github.com>

* rpc-api: add translation for PoolError::Unactionable

* transaction-pool: add test for rejecting unactionable transactions

* basic-authorship: fix doc test

* transaction-pool: fix benchmark compilation

* transaction-pool: rename CanAuthor to IsValidator

* transaction-pool: nit in error message

Co-authored-by: Tomasz Drwięga <tomusdrw@users.noreply.github.com>
---
 bin/node-template/node/src/service.rs         |   1 +
 bin/node/bench/src/txpool.rs                  |   1 +
 bin/node/cli/src/service.rs                   |   1 +
 .../basic-authorship/src/basic_authorship.rs  |   4 +
 client/basic-authorship/src/lib.rs            |   1 +
 client/consensus/manual-seal/src/lib.rs       |   6 +-
 client/offchain/src/lib.rs                    |   1 +
 client/rpc-api/src/author/error.rs            |  11 ++
 client/rpc/src/author/tests.rs                |   1 +
 client/service/src/lib.rs                     |   1 +
 .../transaction-pool/graph/benches/basics.rs  |  10 +-
 client/transaction-pool/graph/src/lib.rs      |   4 +-
 client/transaction-pool/graph/src/pool.rs     | 133 ++++++++++++------
 .../graph/src/validated_pool.rs               |  23 ++-
 client/transaction-pool/src/lib.rs            |  10 +-
 client/transaction-pool/src/revalidation.rs   |   2 +-
 client/transaction-pool/src/testing/pool.rs   |   4 +-
 primitives/transaction-pool/src/error.rs      |   3 +
 utils/frame/rpc/system/src/lib.rs             |   4 +
 19 files changed, 161 insertions(+), 60 deletions(-)

diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
index a3aca89ef746..4061dce43889 100644
--- a/bin/node-template/node/src/service.rs
+++ b/bin/node-template/node/src/service.rs
@@ -52,6 +52,7 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 
 	let transaction_pool = sc_transaction_pool::BasicPool::new_full(
 		config.transaction_pool.clone(),
+		config.role.is_authority().into(),
 		config.prometheus_registry(),
 		task_manager.spawn_handle(),
 		client.clone(),
diff --git a/bin/node/bench/src/txpool.rs b/bin/node/bench/src/txpool.rs
index ecac3827adf6..b3646a92e032 100644
--- a/bin/node/bench/src/txpool.rs
+++ b/bin/node/bench/src/txpool.rs
@@ -74,6 +74,7 @@ impl core::Benchmark for PoolBenchmark {
 		let executor = sp_core::testing::TaskExecutor::new();
 		let txpool = BasicPool::new_full(
 			Default::default(),
+			true.into(),
 			None,
 			executor,
 			context.client.clone(),
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index 55c046a9a636..dcce31bd3225 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -68,6 +68,7 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 
 	let transaction_pool = sc_transaction_pool::BasicPool::new_full(
 		config.transaction_pool.clone(),
+		config.role.is_authority().into(),
 		config.prometheus_registry(),
 		task_manager.spawn_handle(),
 		client.clone(),
diff --git a/client/basic-authorship/src/basic_authorship.rs b/client/basic-authorship/src/basic_authorship.rs
index 8a7750c69fe2..73e615661528 100644
--- a/client/basic-authorship/src/basic_authorship.rs
+++ b/client/basic-authorship/src/basic_authorship.rs
@@ -408,6 +408,7 @@ mod tests {
 		let spawner = sp_core::testing::TaskExecutor::new();
 		let txpool = BasicPool::new_full(
 			Default::default(),
+			true.into(),
 			None,
 			spawner.clone(),
 			client.clone(),
@@ -466,6 +467,7 @@ mod tests {
 		let spawner = sp_core::testing::TaskExecutor::new();
 		let txpool = BasicPool::new_full(
 			Default::default(),
+			true.into(),
 			None,
 			spawner.clone(),
 			client.clone(),
@@ -506,6 +508,7 @@ mod tests {
 		let spawner = sp_core::testing::TaskExecutor::new();
 		let txpool = BasicPool::new_full(
 			Default::default(),
+			true.into(),
 			None,
 			spawner.clone(),
 			client.clone(),
@@ -573,6 +576,7 @@ mod tests {
 		let spawner = sp_core::testing::TaskExecutor::new();
 		let txpool = BasicPool::new_full(
 			Default::default(),
+			true.into(),
 			None,
 			spawner.clone(),
 			client.clone(),
diff --git a/client/basic-authorship/src/lib.rs b/client/basic-authorship/src/lib.rs
index 3bb0a0b7e5c0..224dccd36b53 100644
--- a/client/basic-authorship/src/lib.rs
+++ b/client/basic-authorship/src/lib.rs
@@ -34,6 +34,7 @@
 //! # let spawner = sp_core::testing::TaskExecutor::new();
 //! # let txpool = BasicPool::new_full(
 //! #     Default::default(),
+//! #     true.into(),
 //! #     None,
 //! #     spawner.clone(),
 //! #     client.clone(),
diff --git a/client/consensus/manual-seal/src/lib.rs b/client/consensus/manual-seal/src/lib.rs
index 5bf08571195d..3ec68588573e 100644
--- a/client/consensus/manual-seal/src/lib.rs
+++ b/client/consensus/manual-seal/src/lib.rs
@@ -293,7 +293,7 @@ mod tests {
 		let inherent_data_providers = InherentDataProviders::new();
 		let spawner = sp_core::testing::TaskExecutor::new();
 		let pool = Arc::new(BasicPool::with_revalidation_type(
-			Options::default(), api(), None, RevalidationType::Full, spawner.clone(),
+			Options::default(), true.into(), api(), None, RevalidationType::Full, spawner.clone(),
 		));
 		let env = ProposerFactory::new(
 			spawner.clone(),
@@ -364,7 +364,7 @@ mod tests {
 		let inherent_data_providers = InherentDataProviders::new();
 		let spawner = sp_core::testing::TaskExecutor::new();
 		let pool = Arc::new(BasicPool::with_revalidation_type(
-			Options::default(), api(), None, RevalidationType::Full, spawner.clone(),
+			Options::default(), true.into(), api(), None, RevalidationType::Full, spawner.clone(),
 		));
 		let env = ProposerFactory::new(
 			spawner.clone(),
@@ -439,7 +439,7 @@ mod tests {
 		let pool_api = api();
 		let spawner = sp_core::testing::TaskExecutor::new();
 		let pool = Arc::new(BasicPool::with_revalidation_type(
-			Options::default(), pool_api.clone(), None, RevalidationType::Full, spawner.clone(),
+			Options::default(), true.into(), pool_api.clone(), None, RevalidationType::Full, spawner.clone(),
 		));
 		let env = ProposerFactory::new(
 			spawner.clone(),
diff --git a/client/offchain/src/lib.rs b/client/offchain/src/lib.rs
index 12b5093d476b..b82f89cb95d6 100644
--- a/client/offchain/src/lib.rs
+++ b/client/offchain/src/lib.rs
@@ -295,6 +295,7 @@ mod tests {
 		let spawner = sp_core::testing::TaskExecutor::new();
 		let pool = TestPool(BasicPool::new_full(
 			Default::default(),
+			true.into(),
 			None,
 			spawner,
 			client.clone(),
diff --git a/client/rpc-api/src/author/error.rs b/client/rpc-api/src/author/error.rs
index 4d3a256a1a42..7c1086ab67d1 100644
--- a/client/rpc-api/src/author/error.rs
+++ b/client/rpc-api/src/author/error.rs
@@ -99,6 +99,9 @@ const POOL_CYCLE_DETECTED: i64 = POOL_INVALID_TX + 5;
 const POOL_IMMEDIATELY_DROPPED: i64 = POOL_INVALID_TX + 6;
 /// The key type crypto is not known.
 const UNSUPPORTED_KEY_TYPE: i64 = POOL_INVALID_TX + 7;
+/// The transaction was not included to the pool since it is unactionable,
+/// it is not propagable and the local node does not author blocks.
+const POOL_UNACTIONABLE: i64 = POOL_INVALID_TX + 8;
 
 impl From<Error> for rpc::Error {
 	fn from(e: Error) -> Self {
@@ -158,6 +161,14 @@ impl From<Error> for rpc::Error {
 				message: "Immediately Dropped".into(),
 				data: Some("The transaction couldn't enter the pool because of the limit".into()),
 			},
+			Error::Pool(PoolError::Unactionable) => rpc::Error {
+				code: rpc::ErrorCode::ServerError(POOL_UNACTIONABLE),
+				message: "Unactionable".into(),
+				data: Some(
+					"The transaction is unactionable since it is not propagable and \
+					 the local node does not author blocks".into(),
+				),
+			},
 			Error::UnsupportedKeyType => rpc::Error {
 				code: rpc::ErrorCode::ServerError(UNSUPPORTED_KEY_TYPE),
 				message: "Unknown key type crypto" .into(),
diff --git a/client/rpc/src/author/tests.rs b/client/rpc/src/author/tests.rs
index 9dd4f1b143fd..0e7cb5539501 100644
--- a/client/rpc/src/author/tests.rs
+++ b/client/rpc/src/author/tests.rs
@@ -65,6 +65,7 @@ impl Default for TestSetup {
 		let spawner = sp_core::testing::TaskExecutor::new();
 		let pool = BasicPool::new_full(
 			Default::default(),
+			true.into(),
 			None,
 			spawner,
 			client.clone(),
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index 170b7f79d197..4880b8cffdaf 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -599,6 +599,7 @@ mod tests {
 		let spawner = sp_core::testing::TaskExecutor::new();
 		let pool = BasicPool::new_full(
 			Default::default(),
+			true.into(),
 			None,
 			spawner,
 			client.clone(),
diff --git a/client/transaction-pool/graph/benches/basics.rs b/client/transaction-pool/graph/benches/basics.rs
index f7096b021440..21e3d1006d5d 100644
--- a/client/transaction-pool/graph/benches/basics.rs
+++ b/client/transaction-pool/graph/benches/basics.rs
@@ -164,13 +164,19 @@ fn benchmark_main(c: &mut Criterion) {
 
 	c.bench_function("sequential 50 tx", |b| {
 		b.iter(|| {
-			bench_configured(Pool::new(Default::default(), TestApi::new_dependant().into()), 50);
+			bench_configured(
+				Pool::new(Default::default(), true.into(), TestApi::new_dependant().into()),
+				50,
+			);
 		});
 	});
 
 	c.bench_function("random 100 tx", |b| {
 		b.iter(|| {
-			bench_configured(Pool::new(Default::default(), TestApi::default().into()), 100);
+			bench_configured(
+				Pool::new(Default::default(), true.into(), TestApi::default().into()),
+				100,
+			);
 		});
 	});
 }
diff --git a/client/transaction-pool/graph/src/lib.rs b/client/transaction-pool/graph/src/lib.rs
index b8d36d0399b9..c61b05befa12 100644
--- a/client/transaction-pool/graph/src/lib.rs
+++ b/client/transaction-pool/graph/src/lib.rs
@@ -39,6 +39,6 @@ pub mod watcher;
 
 pub use self::base_pool::Transaction;
 pub use self::pool::{
-	Pool, Options, ChainApi, EventStream, ExtrinsicFor, ExtrinsicHash,
-	BlockHash, NumberFor, TransactionFor, ValidatedTransaction,
+	BlockHash, ChainApi, EventStream, ExtrinsicFor, ExtrinsicHash, IsValidator, NumberFor, Options,
+	Pool, TransactionFor, ValidatedTransaction,
 };
diff --git a/client/transaction-pool/graph/src/pool.rs b/client/transaction-pool/graph/src/pool.rs
index 8255370df55d..eee14049d41a 100644
--- a/client/transaction-pool/graph/src/pool.rs
+++ b/client/transaction-pool/graph/src/pool.rs
@@ -36,7 +36,7 @@ use wasm_timer::Instant;
 use futures::channel::mpsc::Receiver;
 
 use crate::validated_pool::ValidatedPool;
-pub use crate::validated_pool::ValidatedTransaction;
+pub use crate::validated_pool::{IsValidator, ValidatedTransaction};
 
 /// Modification notification event stream type;
 pub type EventStream<H> = Receiver<H>;
@@ -150,9 +150,9 @@ where
 
 impl<B: ChainApi> Pool<B> {
 	/// Create a new transaction pool.
-	pub fn new(options: Options, api: Arc<B>) -> Self {
+	pub fn new(options: Options, is_validator: IsValidator, api: Arc<B>) -> Self {
 		Pool {
-			validated_pool: Arc::new(ValidatedPool::new(options, api)),
+			validated_pool: Arc::new(ValidatedPool::new(options, is_validator, api)),
 		}
 	}
 
@@ -497,43 +497,58 @@ mod tests {
 		) -> Self::ValidationFuture {
 			let hash = self.hash_and_length(&uxt).0;
 			let block_number = self.block_id_to_number(at).unwrap().unwrap();
-			let nonce = uxt.transfer().nonce;
-
-			// This is used to control the test flow.
-			if nonce > 0 {
-				let opt = self.delay.lock().take();
-				if let Some(delay) = opt {
-					if delay.recv().is_err() {
-						println!("Error waiting for delay!");
-					}
-				}
-			}
-
-			if self.invalidate.lock().contains(&hash) {
-				return futures::future::ready(Ok(InvalidTransaction::Custom(0).into()));
-			}
 
-			futures::future::ready(if nonce < block_number {
-				Ok(InvalidTransaction::Stale.into())
-			} else {
-				let mut transaction = ValidTransaction {
-					priority: 4,
-					requires: if nonce > block_number { vec![vec![nonce as u8 - 1]] } else { vec![] },
-					provides: if nonce == INVALID_NONCE { vec![] } else { vec![vec![nonce as u8]] },
-					longevity: 3,
-					propagate: true,
-				};
-
-				if self.clear_requirements.lock().contains(&hash) {
-					transaction.requires.clear();
-				}
+			let res = match uxt {
+				Extrinsic::Transfer { transfer, .. } => {
+					let nonce = transfer.nonce;
+
+					// This is used to control the test flow.
+					if nonce > 0 {
+						let opt = self.delay.lock().take();
+						if let Some(delay) = opt {
+							if delay.recv().is_err() {
+								println!("Error waiting for delay!");
+							}
+						}
+					}
 
-				if self.add_requirements.lock().contains(&hash) {
-					transaction.requires.push(vec![128]);
-				}
+					if self.invalidate.lock().contains(&hash) {
+						InvalidTransaction::Custom(0).into()
+					} else if nonce < block_number {
+						InvalidTransaction::Stale.into()
+					} else {
+						let mut transaction = ValidTransaction {
+							priority: 4,
+							requires: if nonce > block_number { vec![vec![nonce as u8 - 1]] } else { vec![] },
+							provides: if nonce == INVALID_NONCE { vec![] } else { vec![vec![nonce as u8]] },
+							longevity: 3,
+							propagate: true,
+						};
+
+						if self.clear_requirements.lock().contains(&hash) {
+							transaction.requires.clear();
+						}
+
+						if self.add_requirements.lock().contains(&hash) {
+							transaction.requires.push(vec![128]);
+						}
+
+						Ok(transaction)
+					}
+				},
+				Extrinsic::IncludeData(_) => {
+					Ok(ValidTransaction {
+						priority: 9001,
+						requires: vec![],
+						provides: vec![vec![42]],
+						longevity: 9001,
+						propagate: false,
+					})
+				},
+				_ => unimplemented!(),
+			};
 
-				Ok(Ok(transaction))
-			})
+			futures::future::ready(Ok(res))
 		}
 
 		/// Returns a block number given the block id.
@@ -579,7 +594,7 @@ mod tests {
 	}
 
 	fn pool() -> Pool<TestApi> {
-		Pool::new(Default::default(), TestApi::default().into())
+		Pool::new(Default::default(), true.into(), TestApi::default().into())
 	}
 
 	#[test]
@@ -620,6 +635,26 @@ mod tests {
 		assert_matches!(res.unwrap_err(), error::Error::TemporarilyBanned);
 	}
 
+	#[test]
+	fn should_reject_unactionable_transactions() {
+		// given
+		let pool = Pool::new(
+			Default::default(),
+			// the node does not author blocks
+			false.into(),
+			TestApi::default().into(),
+		);
+
+		// after validation `IncludeData` will be set to non-propagable
+		let uxt = Extrinsic::IncludeData(vec![42]);
+
+		// when
+		let res = block_on(pool.submit_one(&BlockId::Number(0), SOURCE, uxt));
+
+		// then
+		assert_matches!(res.unwrap_err(), error::Error::Unactionable);
+	}
+
 	#[test]
 	fn should_notify_about_pool_events() {
 		let (stream, hash0, hash1) = {
@@ -722,11 +757,14 @@ mod tests {
 			count: 100,
 			total_bytes: 200,
 		};
-		let pool = Pool::new(Options {
+
+		let options = Options {
 			ready: limit.clone(),
 			future: limit.clone(),
 			..Default::default()
-		}, TestApi::default().into());
+		};
+
+		let pool = Pool::new(options, true.into(), TestApi::default().into());
 
 		let hash1 = block_on(pool.submit_one(&BlockId::Number(0), SOURCE, uxt(Transfer {
 			from: AccountId::from_h256(H256::from_low_u64_be(1)),
@@ -757,11 +795,14 @@ mod tests {
 			count: 100,
 			total_bytes: 10,
 		};
-		let pool = Pool::new(Options {
+
+		let options = Options {
 			ready: limit.clone(),
 			future: limit.clone(),
 			..Default::default()
-		}, TestApi::default().into());
+		};
+
+		let pool = Pool::new(options, true.into(), TestApi::default().into());
 
 		// when
 		block_on(pool.submit_one(&BlockId::Number(0), SOURCE, uxt(Transfer {
@@ -939,11 +980,13 @@ mod tests {
 				count: 1,
 				total_bytes: 1000,
 			};
-			let pool = Pool::new(Options {
+			let options = Options {
 				ready: limit.clone(),
 				future: limit.clone(),
 				..Default::default()
-			}, TestApi::default().into());
+			};
+
+			let pool = Pool::new(options, true.into(), TestApi::default().into());
 
 			let xt = uxt(Transfer {
 				from: AccountId::from_h256(H256::from_low_u64_be(1)),
@@ -977,7 +1020,7 @@ mod tests {
 			let (tx, rx) = std::sync::mpsc::sync_channel(1);
 			let mut api = TestApi::default();
 			api.delay = Arc::new(Mutex::new(rx.into()));
-			let pool = Arc::new(Pool::new(Default::default(), api.into()));
+			let pool = Arc::new(Pool::new(Default::default(), true.into(), api.into()));
 
 			// when
 			let xt = uxt(Transfer {
diff --git a/client/transaction-pool/graph/src/validated_pool.rs b/client/transaction-pool/graph/src/validated_pool.rs
index ef689436275a..c02aab47d880 100644
--- a/client/transaction-pool/graph/src/validated_pool.rs
+++ b/client/transaction-pool/graph/src/validated_pool.rs
@@ -90,9 +90,25 @@ pub type ValidatedTransactionFor<B> = ValidatedTransaction<
 	<B as ChainApi>::Error,
 >;
 
+/// A closure that returns true if the local node is a validator that can author blocks.
+pub struct IsValidator(Box<dyn Fn() -> bool + Send + Sync>);
+
+impl From<bool> for IsValidator {
+	fn from(is_validator: bool) -> Self {
+		IsValidator(Box::new(move || is_validator))
+	}
+}
+
+impl From<Box<dyn Fn() -> bool + Send + Sync>> for IsValidator {
+	fn from(is_validator: Box<dyn Fn() -> bool + Send + Sync>) -> Self {
+		IsValidator(is_validator)
+	}
+}
+
 /// Pool that deals with validated transactions.
 pub struct ValidatedPool<B: ChainApi> {
 	api: Arc<B>,
+	is_validator: IsValidator,
 	options: Options,
 	listener: RwLock<Listener<ExtrinsicHash<B>, B>>,
 	pool: RwLock<base::BasePool<
@@ -116,9 +132,10 @@ where
 
 impl<B: ChainApi> ValidatedPool<B> {
 	/// Create a new transaction pool.
-	pub fn new(options: Options, api: Arc<B>) -> Self {
+	pub fn new(options: Options, is_validator: IsValidator, api: Arc<B>) -> Self {
 		let base_pool = base::BasePool::new(options.reject_future_transactions);
 		ValidatedPool {
+			is_validator,
 			options,
 			listener: Default::default(),
 			api,
@@ -183,6 +200,10 @@ impl<B: ChainApi> ValidatedPool<B> {
 	fn submit_one(&self, tx: ValidatedTransactionFor<B>) -> Result<ExtrinsicHash<B>, B::Error> {
 		match tx {
 			ValidatedTransaction::Valid(tx) => {
+				if !tx.propagate && !(self.is_validator.0)() {
+					return Err(error::Error::Unactionable.into());
+				}
+
 				let imported = self.pool.write().import(tx)?;
 
 				if let base::Imported::Ready { ref hash, .. } = imported {
diff --git a/client/transaction-pool/src/lib.rs b/client/transaction-pool/src/lib.rs
index e9a1c3906f48..32525065b979 100644
--- a/client/transaction-pool/src/lib.rs
+++ b/client/transaction-pool/src/lib.rs
@@ -163,7 +163,7 @@ impl<PoolApi, Block> BasicPool<PoolApi, Block>
 	pub fn new_test(
 		pool_api: Arc<PoolApi>,
 	) -> (Self, Pin<Box<dyn Future<Output=()> + Send>>, intervalier::BackSignalControl) {
-		let pool = Arc::new(sc_transaction_graph::Pool::new(Default::default(), pool_api.clone()));
+		let pool = Arc::new(sc_transaction_graph::Pool::new(Default::default(), true.into(), pool_api.clone()));
 		let (revalidation_queue, background_task, notifier) =
 			revalidation::RevalidationQueue::new_test(pool_api.clone(), pool.clone());
 		(
@@ -184,12 +184,13 @@ impl<PoolApi, Block> BasicPool<PoolApi, Block>
 	/// revalidation type.
 	pub fn with_revalidation_type(
 		options: sc_transaction_graph::Options,
+		is_validator: txpool::IsValidator,
 		pool_api: Arc<PoolApi>,
 		prometheus: Option<&PrometheusRegistry>,
 		revalidation_type: RevalidationType,
 		spawner: impl SpawnNamed,
 	) -> Self {
-		let pool = Arc::new(sc_transaction_graph::Pool::new(options, pool_api.clone()));
+		let pool = Arc::new(sc_transaction_graph::Pool::new(options, is_validator, pool_api.clone()));
 		let (revalidation_queue, background_task) = match revalidation_type {
 			RevalidationType::Light => (revalidation::RevalidationQueue::new(pool_api.clone(), pool.clone()), None),
 			RevalidationType::Full => {
@@ -346,7 +347,7 @@ where
 	) -> Self {
 		let pool_api = Arc::new(LightChainApi::new(client, fetcher));
 		Self::with_revalidation_type(
-			options, pool_api, prometheus, RevalidationType::Light, spawner,
+			options, false.into(), pool_api, prometheus, RevalidationType::Light, spawner,
 		)
 	}
 }
@@ -364,13 +365,14 @@ where
 	/// Create new basic transaction pool for a full node with the provided api.
 	pub fn new_full(
 		options: sc_transaction_graph::Options,
+		is_validator: txpool::IsValidator,
 		prometheus: Option<&PrometheusRegistry>,
 		spawner: impl SpawnNamed,
 		client: Arc<Client>,
 	) -> Arc<Self> {
 		let pool_api = Arc::new(FullChainApi::new(client.clone(), prometheus));
 		let pool = Arc::new(Self::with_revalidation_type(
-			options, pool_api, prometheus, RevalidationType::Full, spawner
+			options, is_validator, pool_api, prometheus, RevalidationType::Full, spawner
 		));
 
 		// make transaction pool available for off-chain runtime calls.
diff --git a/client/transaction-pool/src/revalidation.rs b/client/transaction-pool/src/revalidation.rs
index 69b601484c77..fc18b0694d6e 100644
--- a/client/transaction-pool/src/revalidation.rs
+++ b/client/transaction-pool/src/revalidation.rs
@@ -370,7 +370,7 @@ mod tests {
 
 	fn setup() -> (Arc<TestApi>, Pool<TestApi>) {
 		let test_api = Arc::new(TestApi::empty());
-		let pool = Pool::new(Default::default(), test_api.clone());
+		let pool = Pool::new(Default::default(), true.into(), test_api.clone());
 		(test_api, pool)
 	}
 
diff --git a/client/transaction-pool/src/testing/pool.rs b/client/transaction-pool/src/testing/pool.rs
index 6e00af47602d..a41632ed8de8 100644
--- a/client/transaction-pool/src/testing/pool.rs
+++ b/client/transaction-pool/src/testing/pool.rs
@@ -37,7 +37,7 @@ use sc_block_builder::BlockBuilderProvider;
 use sp_consensus::BlockOrigin;
 
 fn pool() -> Pool<TestApi> {
-	Pool::new(Default::default(), TestApi::with_alice_nonce(209).into())
+	Pool::new(Default::default(), true.into(), TestApi::with_alice_nonce(209).into())
 }
 
 fn maintained_pool() -> (
@@ -161,7 +161,7 @@ fn should_correctly_prune_transactions_providing_more_than_one_tag() {
 	api.set_valid_modifier(Box::new(|v: &mut ValidTransaction| {
 		v.provides.push(vec![155]);
 	}));
-	let pool = Pool::new(Default::default(), api.clone());
+	let pool = Pool::new(Default::default(), true.into(), api.clone());
 	let xt = uxt(Alice, 209);
 	block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt.clone())).expect("1. Imported");
 	assert_eq!(pool.validated_pool().status().ready, 1);
diff --git a/primitives/transaction-pool/src/error.rs b/primitives/transaction-pool/src/error.rs
index 62d4a5281c95..dd2d6401c182 100644
--- a/primitives/transaction-pool/src/error.rs
+++ b/primitives/transaction-pool/src/error.rs
@@ -60,6 +60,9 @@ pub enum Error {
 	#[error("Transaction couldn't enter the pool because of the limit")]
 	ImmediatelyDropped,
 
+	#[error("Transaction cannot be propagated and the local node does not author blocks")]
+	Unactionable,
+
 	#[from(ignore)]
 	#[error("{0}")]
 	InvalidBlockId(String),
diff --git a/utils/frame/rpc/system/src/lib.rs b/utils/frame/rpc/system/src/lib.rs
index db19652507b9..57c0cda9cca3 100644
--- a/utils/frame/rpc/system/src/lib.rs
+++ b/utils/frame/rpc/system/src/lib.rs
@@ -301,6 +301,7 @@ mod tests {
 		let spawner = sp_core::testing::TaskExecutor::new();
 		let pool = BasicPool::new_full(
 			Default::default(),
+			true.into(),
 			None,
 			spawner,
 			client.clone(),
@@ -340,6 +341,7 @@ mod tests {
 		let spawner = sp_core::testing::TaskExecutor::new();
 		let pool = BasicPool::new_full(
 			Default::default(),
+			true.into(),
 			None,
 			spawner,
 			client.clone(),
@@ -363,6 +365,7 @@ mod tests {
 		let spawner = sp_core::testing::TaskExecutor::new();
 		let pool = BasicPool::new_full(
 			Default::default(),
+			true.into(),
 			None,
 			spawner,
 			client.clone(),
@@ -395,6 +398,7 @@ mod tests {
 		let spawner = sp_core::testing::TaskExecutor::new();
 		let pool = BasicPool::new_full(
 			Default::default(),
+			true.into(),
 			None,
 			spawner,
 			client.clone(),

From cc71cca1d3087bf62381a9d60b14ca6235b4b916 Mon Sep 17 00:00:00 2001
From: Ashley <ashley.ruglys@gmail.com>
Date: Fri, 5 Feb 2021 12:53:33 +0100
Subject: [PATCH 0368/1194] Fix some problems with `prove_warp_sync` (#8037)

* Fix some problems with prove_warp_sync

* Update client/finality-grandpa/src/finality_proof.rs

Co-authored-by: cheme <emericchevalier.pro@gmail.com>

Co-authored-by: cheme <emericchevalier.pro@gmail.com>
---
 client/finality-grandpa-warp-sync/src/lib.rs  |  6 +--
 client/finality-grandpa/src/finality_proof.rs | 50 ++++++++++---------
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/client/finality-grandpa-warp-sync/src/lib.rs b/client/finality-grandpa-warp-sync/src/lib.rs
index cae28173f09e..f7ce59b1c168 100644
--- a/client/finality-grandpa-warp-sync/src/lib.rs
+++ b/client/finality-grandpa-warp-sync/src/lib.rs
@@ -86,9 +86,9 @@ struct Request<B: BlockT> {
 const WARP_SYNC_FRAGMENTS_LIMIT: usize = 100;
 
 /// Number of item with justification in warp sync cache.
-/// This should be customizable, setting a low number
-/// until then.
-const WARP_SYNC_CACHE_SIZE: usize = 20;
+/// This should be customizable, but setting it to the max number of fragments
+/// we return seems like a good idea until then.
+const WARP_SYNC_CACHE_SIZE: usize = WARP_SYNC_FRAGMENTS_LIMIT;
 
 /// Handler for incoming grandpa warp sync requests from a remote peer.
 pub struct GrandpaWarpSyncRequestHandler<TBackend, TBlock: BlockT> {
diff --git a/client/finality-grandpa/src/finality_proof.rs b/client/finality-grandpa/src/finality_proof.rs
index e17045349d45..e1e424472ff9 100644
--- a/client/finality-grandpa/src/finality_proof.rs
+++ b/client/finality-grandpa/src/finality_proof.rs
@@ -277,9 +277,9 @@ pub fn prove_warp_sync<Block: BlockT, B: BlockchainBackend<Block>>(
 	// This operation is a costy and only for the delay corner case.
 	while index > Zero::zero() {
 		index = index - One::one();
-		if let Some((fragement, apply_block)) = get_warp_sync_proof_fragment(blockchain, index, &mut cache)? {
+		if let Some((fragment, apply_block)) = get_warp_sync_proof_fragment(blockchain, index, &mut cache)? {
 			if last_apply.map(|next| &next > header.number()).unwrap_or(false) {
-				result.push(fragement);
+				result.push(fragment);
 				last_apply = Some(apply_block);
 			} else {
 				break;
@@ -289,7 +289,7 @@ pub fn prove_warp_sync<Block: BlockT, B: BlockchainBackend<Block>>(
 
 	let mut index = *header.number();
 	while index <= end_number {
-		if max_fragment_limit.map(|limit| result.len() <= limit).unwrap_or(false) {
+		if max_fragment_limit.map(|limit| result.len() >= limit).unwrap_or(false) {
 			break;
 		}
 
@@ -305,7 +305,10 @@ pub fn prove_warp_sync<Block: BlockT, B: BlockchainBackend<Block>>(
 		index = index + One::one();
 	}
 
-	if result.last().as_ref().map(|head| head.header.number()) != Some(&end_number) {
+	let at_limit = max_fragment_limit.map(|limit| result.len() >= limit).unwrap_or(false);
+
+	// add last finalized block if reached and not already included.
+	if !at_limit && result.last().as_ref().map(|head| head.header.number()) != Some(&end_number) {
 		let header = blockchain.expect_header(end)?;
 		if let Some(justification) = blockchain.justification(BlockId::Number(end_number.clone()))? {
 			result.push(AuthoritySetProofFragment {
@@ -328,7 +331,7 @@ fn get_warp_sync_proof_fragment<Block: BlockT, B: BlockchainBackend<Block>>(
 ) -> sp_blockchain::Result<Option<(AuthoritySetProofFragment<Block::Header>, NumberFor<Block>)>> {
 	if let Some(cache) = cache.as_mut() {
 		if let Some(result) = cache.get_item(index) {
-			return Ok(result.clone());
+			return Ok(result);
 		}
 	}
 
@@ -541,11 +544,11 @@ impl<Block: BlockT> BlockJustification<Block::Header> for GrandpaJustification<B
 
 /// Simple cache for warp sync queries.
 pub struct WarpSyncFragmentCache<Header: HeaderT> {
+	header_has_proof_fragment: std::collections::HashMap<Header::Number, bool>,
 	cache: linked_hash_map::LinkedHashMap<
 		Header::Number,
-		Option<(AuthoritySetProofFragment<Header>, Header::Number)>,
+		(AuthoritySetProofFragment<Header>, Header::Number),
 		>,
-	headers_with_justification: usize,
 	limit: usize,
 }
 
@@ -553,8 +556,8 @@ impl<Header: HeaderT> WarpSyncFragmentCache<Header> {
 	/// Instantiate a new cache for the warp sync prover.
 	pub fn new(size: usize) -> Self {
 		WarpSyncFragmentCache {
+			header_has_proof_fragment: Default::default(),
 			cache: Default::default(),
-			headers_with_justification: 0,
 			limit: size,
 		}
 	}
@@ -564,31 +567,32 @@ impl<Header: HeaderT> WarpSyncFragmentCache<Header> {
 		at: Header::Number,
 		item: Option<(AuthoritySetProofFragment<Header>, Header::Number)>,
 	) {
-		if self.cache.len() == self.limit {
-			self.pop_one();
-		}
-		if item.is_some() {
-			// we do not check previous value as cached value is always supposed to
-			// be queried before calling 'new_item'.
-			self.headers_with_justification += 1;
+		self.header_has_proof_fragment.insert(at, item.is_some());
+
+		if let Some(item) = item {
+			if self.cache.len() == self.limit {
+				self.pop_one();
+			}
+
+			self.cache.insert(at, item);
 		}
-		self.cache.insert(at, item);
 	}
 
 	fn pop_one(&mut self) {
-		while let Some(v) = self.cache.pop_front() {
-			if v.1.is_some() {
-				self.headers_with_justification -= 1;
-				break;
-			}
+		if let Some((header_number, _)) = self.cache.pop_front() {
+			self.header_has_proof_fragment.remove(&header_number);
 		}
 	}
 
 	fn get_item(
 		&mut self,
 		block: Header::Number,
-	) -> Option<&mut Option<(AuthoritySetProofFragment<Header>, Header::Number)>> {
-		self.cache.get_refresh(&block)
+	) -> Option<Option<(AuthoritySetProofFragment<Header>, Header::Number)>> {
+		match self.header_has_proof_fragment.get(&block) {
+			Some(true) => Some(self.cache.get_refresh(&block).cloned()),
+			Some(false) => Some(None),
+			None => None
+		}
 	}
 }
 

From 09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92 Mon Sep 17 00:00:00 2001
From: Alejandro Martinez Andres <ama1081996@gmail.com>
Date: Fri, 5 Feb 2021 14:51:22 +0100
Subject: [PATCH 0369/1194] CheckSpecVersion reference fix (#8056)

* CheckSpecVersion reference fix

* Update frame/example/src/lib.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
---
 frame/example/src/lib.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frame/example/src/lib.rs b/frame/example/src/lib.rs
index 05526d2c7a29..cfb72a5c1560 100644
--- a/frame/example/src/lib.rs
+++ b/frame/example/src/lib.rs
@@ -577,7 +577,8 @@ impl<T: Config> Module<T> {
 //
 // Note that a signed extension can also indicate that a particular data must be present in the
 // _signing payload_ of a transaction by providing an implementation for the `additional_signed`
-// method. This example will not cover this type of extension. See `CheckRuntime` in FRAME System
+// method. This example will not cover this type of extension. See `CheckSpecVersion` in 
+// [FRAME System](https://github.com/paritytech/substrate/tree/master/frame/system#signed-extensions)
 // for an example.
 //
 // Using the extension, you can add some hooks to the life cycle of each transaction. Note that by

From f14488dfca012659297d2b4676fab91c179095dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Fri, 5 Feb 2021 16:59:23 +0100
Subject: [PATCH 0370/1194] contracts: Remove ConfigCache (#8047)

* contracts: Remove ConfigCache

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_contracts --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/contracts/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Fixup test

Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
---
 bin/node/executor/tests/basic.rs        |    2 +-
 frame/contracts/src/benchmarking/mod.rs |    2 +-
 frame/contracts/src/exec.rs             |  150 ++-
 frame/contracts/src/lib.rs              |   63 +-
 frame/contracts/src/rent.rs             |    4 +-
 frame/contracts/src/tests.rs            |   38 +-
 frame/contracts/src/weights.rs          | 1178 +++++++++++------------
 7 files changed, 696 insertions(+), 741 deletions(-)

diff --git a/bin/node/executor/tests/basic.rs b/bin/node/executor/tests/basic.rs
index b38400318756..1d49f6613db1 100644
--- a/bin/node/executor/tests/basic.rs
+++ b/bin/node/executor/tests/basic.rs
@@ -588,7 +588,7 @@ fn deploying_wasm_contract_should_work() {
 		&[],
 	);
 
-	let subsistence = pallet_contracts::ConfigCache::<Runtime>::subsistence_threshold_uncached();
+	let subsistence = pallet_contracts::Module::<Runtime>::subsistence_threshold();
 
 	let b = construct_block(
 		&mut new_test_ext(compact_code_unwrap(), false),
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index 2034a17e922a..a5dcc40d71ba 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -1179,7 +1179,7 @@ benchmarks! {
 			.collect::<Vec<_>>();
 		let account_len = accounts.get(0).map(|i| i.encode().len()).unwrap_or(0);
 		let account_bytes = accounts.iter().flat_map(|x| x.encode()).collect();
-		let value = ConfigCache::<T>::subsistence_threshold_uncached();
+		let value = Contracts::<T>::subsistence_threshold();
 		assert!(value > 0u32.into());
 		let value_bytes = value.encode();
 		let value_len = value_bytes.len();
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index 5eddcc41a911..bbb972b2ed2e 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -16,7 +16,7 @@
 // limitations under the License.
 
 use crate::{
-	CodeHash, ConfigCache, Event, RawEvent, Config, Module as Contracts,
+	CodeHash, Event, RawEvent, Config, Module as Contracts,
 	TrieId, BalanceOf, ContractInfo, gas::GasMeter, rent::Rent, storage::{self, Storage},
 	Error, ContractInfoOf, Schedule,
 };
@@ -28,7 +28,7 @@ use sp_std::{
 use sp_runtime::traits::{Bounded, Zero, Convert, Saturating};
 use frame_support::{
 	dispatch::{DispatchResult, DispatchError},
-	traits::{ExistenceRequirement, Currency, Time, Randomness},
+	traits::{ExistenceRequirement, Currency, Time, Randomness, Get},
 	weights::Weight,
 	ensure, StorageMap,
 };
@@ -245,7 +245,7 @@ pub struct ExecutionContext<'a, T: Config + 'a, E> {
 	pub self_account: T::AccountId,
 	pub self_trie_id: Option<TrieId>,
 	pub depth: usize,
-	pub config: &'a ConfigCache<T>,
+	pub schedule: &'a Schedule<T>,
 	pub timestamp: MomentOf<T>,
 	pub block_number: T::BlockNumber,
 	_phantom: PhantomData<E>,
@@ -261,13 +261,13 @@ where
 	///
 	/// The specified `origin` address will be used as `sender` for. The `origin` must be a regular
 	/// account (not a contract).
-	pub fn top_level(origin: T::AccountId, cfg: &'a ConfigCache<T>) -> Self {
+	pub fn top_level(origin: T::AccountId, schedule: &'a Schedule<T>) -> Self {
 		ExecutionContext {
 			caller: None,
 			self_trie_id: None,
 			self_account: origin,
 			depth: 0,
-			config: &cfg,
+			schedule,
 			timestamp: T::Time::now(),
 			block_number: <frame_system::Module<T>>::block_number(),
 			_phantom: Default::default(),
@@ -282,7 +282,7 @@ where
 			self_trie_id: Some(trie_id),
 			self_account: dest,
 			depth: self.depth + 1,
-			config: self.config,
+			schedule: self.schedule,
 			timestamp: self.timestamp.clone(),
 			block_number: self.block_number.clone(),
 			_phantom: Default::default(),
@@ -297,7 +297,7 @@ where
 		gas_meter: &mut GasMeter<T>,
 		input_data: Vec<u8>,
 	) -> ExecResult {
-		if self.depth == self.config.max_depth as usize {
+		if self.depth == T::MaxDepth::get() as usize {
 			Err(Error::<T>::MaxCallDepthReached)?
 		}
 
@@ -305,7 +305,7 @@ where
 			.and_then(|contract| contract.get_alive())
 			.ok_or(Error::<T>::NotCallable)?;
 
-		let executable = E::from_storage(contract.code_hash, &self.config.schedule)?;
+		let executable = E::from_storage(contract.code_hash, &self.schedule)?;
 
 		// This charges the rent and denies access to a contract that is in need of
 		// eviction by returning `None`. We cannot evict eagerly here because those
@@ -320,13 +320,12 @@ where
 
 		self.with_nested_context(dest.clone(), contract.trie_id.clone(), |nested| {
 			if value > BalanceOf::<T>::zero() {
-				transfer(
+				transfer::<T>(
 					TransferCause::Call,
 					transactor_kind,
 					&caller,
 					&dest,
 					value,
-					nested,
 				)?
 			}
 
@@ -348,7 +347,7 @@ where
 		input_data: Vec<u8>,
 		salt: &[u8],
 	) -> Result<(T::AccountId, ExecReturnValue), ExecError> {
-		if self.depth == self.config.max_depth as usize {
+		if self.depth == T::MaxDepth::get() as usize {
 			Err(Error::<T>::MaxCallDepthReached)?
 		}
 
@@ -372,13 +371,12 @@ where
 
 				// Send funds unconditionally here. If the `endowment` is below existential_deposit
 				// then error will be returned here.
-				transfer(
+				transfer::<T>(
 					TransferCause::Instantiate,
 					transactor_kind,
 					&caller,
 					&dest,
 					endowment,
-					nested,
 				)?;
 
 				// Cache the value before calling into the constructor because that
@@ -489,17 +487,15 @@ enum TransferCause {
 /// is specified as `Terminate`. Otherwise, any transfer that would bring the sender below the
 /// subsistence threshold (for contracts) or the existential deposit (for plain accounts)
 /// results in an error.
-fn transfer<'a, T: Config, E>(
+fn transfer<T: Config>(
 	cause: TransferCause,
 	origin: TransactorKind,
 	transactor: &T::AccountId,
 	dest: &T::AccountId,
 	value: BalanceOf<T>,
-	ctx: &mut ExecutionContext<'a, T, E>,
 ) -> DispatchResult
 where
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
-	E: Executable<T>,
 {
 	use self::TransferCause::*;
 	use self::TransactorKind::*;
@@ -511,7 +507,7 @@ where
 		(_, Contract) => {
 			ensure!(
 				T::Currency::total_balance(transactor).saturating_sub(value) >=
-					ctx.config.subsistence_threshold(),
+					Contracts::<T>::subsistence_threshold(),
 				Error::<T>::BelowSubsistenceThreshold,
 			);
 			ExistenceRequirement::KeepAlive
@@ -586,7 +582,7 @@ where
 		input_data: Vec<u8>,
 		salt: &[u8],
 	) -> Result<(AccountIdOf<T>, ExecReturnValue), ExecError> {
-		let executable = E::from_storage(code_hash, &self.ctx.config.schedule)?;
+		let executable = E::from_storage(code_hash, &self.ctx.schedule)?;
 		let result = self.ctx.instantiate(endowment, gas_meter, executable, input_data, salt)?;
 		Ok(result)
 	}
@@ -596,13 +592,12 @@ where
 		to: &T::AccountId,
 		value: BalanceOf<T>,
 	) -> DispatchResult {
-		transfer(
+		transfer::<T>(
 			TransferCause::Call,
 			TransactorKind::Contract,
 			&self.ctx.self_account.clone(),
 			to,
 			value,
-			self.ctx,
 		)
 	}
 
@@ -617,13 +612,12 @@ where
 				return Err(Error::<T>::ReentranceDenied.into());
 			}
 		}
-		transfer(
+		transfer::<T>(
 			TransferCause::Terminate,
 			TransactorKind::Contract,
 			&self_id,
 			beneficiary,
 			value,
-			self.ctx,
 		)?;
 		if let Some(ContractInfo::Alive(info)) = ContractInfoOf::<T>::take(&self_id) {
 			Storage::<T>::queue_trie_for_deletion(&info)?;
@@ -708,11 +702,11 @@ where
 	}
 
 	fn minimum_balance(&self) -> BalanceOf<T> {
-		self.ctx.config.existential_deposit
+		T::Currency::minimum_balance()
 	}
 
 	fn tombstone_deposit(&self) -> BalanceOf<T> {
-		self.ctx.config.tombstone_deposit
+		T::TombstoneDeposit::get()
 	}
 
 	fn deposit_event(&mut self, topics: Vec<T::Hash>, data: Vec<u8>) {
@@ -741,7 +735,7 @@ where
 	fn block_number(&self) -> T::BlockNumber { self.block_number }
 
 	fn max_value_size(&self) -> u32 {
-		self.ctx.config.max_value_size
+		T::MaxValueSize::get()
 	}
 
 	fn get_weight_price(&self, weight: Weight) -> BalanceOf<Self::T> {
@@ -749,7 +743,7 @@ where
 	}
 
 	fn schedule(&self) -> &Schedule<Self::T> {
-		&self.ctx.config.schedule
+		&self.ctx.schedule
 	}
 }
 
@@ -898,8 +892,8 @@ mod tests {
 		});
 
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = ConfigCache::preload();
-			let mut ctx = MockContext::top_level(ALICE, &cfg);
+			let schedule = Contracts::current_schedule();
+			let mut ctx = MockContext::top_level(ALICE, &schedule);
 			place_contract(&BOB, exec_ch);
 
 			assert_matches!(
@@ -919,18 +913,15 @@ mod tests {
 		let dest = BOB;
 
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = ConfigCache::preload();
-			let mut ctx = MockContext::top_level(origin.clone(), &cfg);
 			set_balance(&origin, 100);
 			set_balance(&dest, 0);
 
-			super::transfer(
+			super::transfer::<Test>(
 				super::TransferCause::Call,
 				super::TransactorKind::PlainAccount,
 				&origin,
 				&dest,
 				55,
-				&mut ctx,
 			).unwrap();
 
 			assert_eq!(get_balance(&origin), 45);
@@ -950,8 +941,8 @@ mod tests {
 		);
 
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = ConfigCache::preload();
-			let mut ctx = MockContext::top_level(origin.clone(), &cfg);
+			let schedule = Contracts::current_schedule();
+			let mut ctx = MockContext::top_level(origin.clone(), &schedule);
 			place_contract(&BOB, return_ch);
 			set_balance(&origin, 100);
 			let balance = get_balance(&dest);
@@ -979,17 +970,14 @@ mod tests {
 		let dest = BOB;
 
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = ConfigCache::preload();
-			let mut ctx = MockContext::top_level(origin.clone(), &cfg);
 			set_balance(&origin, 0);
 
-			let result = super::transfer(
+			let result = super::transfer::<Test>(
 				super::TransferCause::Call,
 				super::TransactorKind::PlainAccount,
 				&origin,
 				&dest,
 				100,
-				&mut ctx,
 			);
 
 			assert_eq!(
@@ -1012,8 +1000,8 @@ mod tests {
 		);
 
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = ConfigCache::preload();
-			let mut ctx = MockContext::top_level(origin, &cfg);
+			let schedule = Contracts::current_schedule();
+			let mut ctx = MockContext::top_level(origin, &schedule);
 			place_contract(&BOB, return_ch);
 
 			let result = ctx.call(
@@ -1040,8 +1028,8 @@ mod tests {
 		);
 
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = ConfigCache::preload();
-			let mut ctx = MockContext::top_level(origin, &cfg);
+			let schedule = Contracts::current_schedule();
+			let mut ctx = MockContext::top_level(origin, &schedule);
 			place_contract(&BOB, return_ch);
 
 			let result = ctx.call(
@@ -1066,8 +1054,8 @@ mod tests {
 
 		// This one tests passing the input data into a contract via call.
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = ConfigCache::preload();
-			let mut ctx = MockContext::top_level(ALICE, &cfg);
+			let schedule = Contracts::current_schedule();
+			let mut ctx = MockContext::top_level(ALICE, &schedule);
 			place_contract(&BOB, input_data_ch);
 
 			let result = ctx.call(
@@ -1089,15 +1077,16 @@ mod tests {
 
 		// This one tests passing the input data into a contract via instantiate.
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = ConfigCache::preload();
-			let mut ctx = MockContext::top_level(ALICE, &cfg);
+			let schedule = Contracts::current_schedule();
+			let subsistence = Contracts::<Test>::subsistence_threshold();
+			let mut ctx = MockContext::top_level(ALICE, &schedule);
 
-			set_balance(&ALICE, cfg.subsistence_threshold() * 10);
+			set_balance(&ALICE, subsistence * 10);
 
 			let result = ctx.instantiate(
-				cfg.subsistence_threshold() * 3,
+				subsistence * 3,
 				&mut GasMeter::<Test>::new(GAS_LIMIT),
-				MockExecutable::from_storage(input_data_ch, &cfg.schedule).unwrap(),
+				MockExecutable::from_storage(input_data_ch, &schedule).unwrap(),
 				vec![1, 2, 3, 4],
 				&[],
 			);
@@ -1137,8 +1126,8 @@ mod tests {
 		});
 
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = ConfigCache::preload();
-			let mut ctx = MockContext::top_level(ALICE, &cfg);
+			let schedule = Contracts::current_schedule();
+			let mut ctx = MockContext::top_level(ALICE, &schedule);
 			set_balance(&BOB, 1);
 			place_contract(&BOB, recurse_ch);
 
@@ -1185,9 +1174,8 @@ mod tests {
 		});
 
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = ConfigCache::preload();
-
-			let mut ctx = MockContext::top_level(origin.clone(), &cfg);
+			let schedule = Contracts::current_schedule();
+			let mut ctx = MockContext::top_level(origin.clone(), &schedule);
 			place_contract(&dest, bob_ch);
 			place_contract(&CHARLIE, charlie_ch);
 
@@ -1224,8 +1212,8 @@ mod tests {
 		});
 
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = ConfigCache::preload();
-			let mut ctx = MockContext::top_level(ALICE, &cfg);
+			let schedule = Contracts::current_schedule();
+			let mut ctx = MockContext::top_level(ALICE, &schedule);
 			place_contract(&BOB, bob_ch);
 			place_contract(&CHARLIE, charlie_ch);
 
@@ -1245,14 +1233,14 @@ mod tests {
 		let dummy_ch = MockLoader::insert(|_| exec_success());
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
-			let cfg = ConfigCache::preload();
-			let mut ctx = MockContext::top_level(ALICE, &cfg);
+			let schedule = Contracts::current_schedule();
+			let mut ctx = MockContext::top_level(ALICE, &schedule);
 
 			assert_matches!(
 				ctx.instantiate(
 					0, // <- zero endowment
 					&mut GasMeter::<Test>::new(GAS_LIMIT),
-					MockExecutable::from_storage(dummy_ch, &cfg.schedule).unwrap(),
+					MockExecutable::from_storage(dummy_ch, &schedule).unwrap(),
 					vec![],
 					&[],
 				),
@@ -1268,15 +1256,15 @@ mod tests {
 		);
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
-			let cfg = ConfigCache::preload();
-			let mut ctx = MockContext::top_level(ALICE, &cfg);
+			let schedule = Contracts::current_schedule();
+			let mut ctx = MockContext::top_level(ALICE, &schedule);
 			set_balance(&ALICE, 1000);
 
 			let instantiated_contract_address = assert_matches!(
 				ctx.instantiate(
 					100,
 					&mut GasMeter::<Test>::new(GAS_LIMIT),
-					MockExecutable::from_storage(dummy_ch, &cfg.schedule).unwrap(),
+					MockExecutable::from_storage(dummy_ch, &schedule).unwrap(),
 					vec![],
 					&[],
 				),
@@ -1299,15 +1287,15 @@ mod tests {
 		);
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
-			let cfg = ConfigCache::preload();
-			let mut ctx = MockContext::top_level(ALICE, &cfg);
+			let schedule = Contracts::current_schedule();
+			let mut ctx = MockContext::top_level(ALICE, &schedule);
 			set_balance(&ALICE, 1000);
 
 			let instantiated_contract_address = assert_matches!(
 				ctx.instantiate(
 					100,
 					&mut GasMeter::<Test>::new(GAS_LIMIT),
-					MockExecutable::from_storage(dummy_ch, &cfg.schedule).unwrap(),
+					MockExecutable::from_storage(dummy_ch, &schedule).unwrap(),
 					vec![],
 					&[],
 				),
@@ -1331,7 +1319,7 @@ mod tests {
 				// Instantiate a contract and save it's address in `instantiated_contract_address`.
 				let (address, output) = ctx.ext.instantiate(
 					dummy_ch,
-					ConfigCache::<Test>::subsistence_threshold_uncached() * 3,
+					Contracts::<Test>::subsistence_threshold() * 3,
 					ctx.gas_meter,
 					vec![],
 					&[48, 49, 50],
@@ -1343,9 +1331,9 @@ mod tests {
 		});
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
-			let cfg = ConfigCache::preload();
-			let mut ctx = MockContext::top_level(ALICE, &cfg);
-			set_balance(&ALICE, cfg.subsistence_threshold() * 100);
+			let schedule = Contracts::current_schedule();
+			let mut ctx = MockContext::top_level(ALICE, &schedule);
+			set_balance(&ALICE, Contracts::<Test>::subsistence_threshold() * 100);
 			place_contract(&BOB, instantiator_ch);
 
 			assert_matches!(
@@ -1392,8 +1380,8 @@ mod tests {
 		});
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
-			let cfg = ConfigCache::preload();
-			let mut ctx = MockContext::top_level(ALICE, &cfg);
+			let schedule = Contracts::current_schedule();
+			let mut ctx = MockContext::top_level(ALICE, &schedule);
 			set_balance(&ALICE, 1000);
 			set_balance(&BOB, 100);
 			place_contract(&BOB, instantiator_ch);
@@ -1420,15 +1408,15 @@ mod tests {
 			.existential_deposit(15)
 			.build()
 			.execute_with(|| {
-				let cfg = ConfigCache::preload();
-				let mut ctx = MockContext::top_level(ALICE, &cfg);
+				let schedule = Contracts::current_schedule();
+				let mut ctx = MockContext::top_level(ALICE, &schedule);
 				set_balance(&ALICE, 1000);
 
 				assert_eq!(
 					ctx.instantiate(
 						100,
 						&mut GasMeter::<Test>::new(GAS_LIMIT),
-						MockExecutable::from_storage(terminate_ch, &cfg.schedule).unwrap(),
+						MockExecutable::from_storage(terminate_ch, &schedule).unwrap(),
 						vec![],
 						&[],
 					),
@@ -1445,7 +1433,8 @@ mod tests {
 	#[test]
 	fn rent_allowance() {
 		let rent_allowance_ch = MockLoader::insert(|ctx| {
-			let allowance = ConfigCache::<Test>::subsistence_threshold_uncached() * 3;
+			let subsistence = Contracts::<Test>::subsistence_threshold();
+			let allowance = subsistence * 3;
 			assert_eq!(ctx.ext.rent_allowance(), <BalanceOf<Test>>::max_value());
 			ctx.ext.set_rent_allowance(allowance);
 			assert_eq!(ctx.ext.rent_allowance(), allowance);
@@ -1453,14 +1442,15 @@ mod tests {
 		});
 
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = ConfigCache::preload();
-			let mut ctx = MockContext::top_level(ALICE, &cfg);
-			set_balance(&ALICE, cfg.subsistence_threshold() * 10);
+			let subsistence = Contracts::<Test>::subsistence_threshold();
+			let schedule = Contracts::current_schedule();
+			let mut ctx = MockContext::top_level(ALICE, &schedule);
+			set_balance(&ALICE, subsistence * 10);
 
 			let result = ctx.instantiate(
-				cfg.subsistence_threshold() * 5,
+				subsistence * 5,
 				&mut GasMeter::<Test>::new(GAS_LIMIT),
-				MockExecutable::from_storage(rent_allowance_ch, &cfg.schedule).unwrap(),
+				MockExecutable::from_storage(rent_allowance_ch, &schedule).unwrap(),
 				vec![],
 				&[],
 			);
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index 2dff15a184a6..b20db8dd8cd8 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -628,7 +628,7 @@ decl_module! {
 			let origin = ensure_signed(origin)?;
 			let mut gas_meter = GasMeter::new(gas_limit);
 			let result = Self::execute_wasm(origin, &mut gas_meter, |ctx, gas_meter| {
-				let executable = PrefabWasmModule::from_storage(code_hash, &ctx.config.schedule)?;
+				let executable = PrefabWasmModule::from_storage(code_hash, &ctx.schedule)?;
 				let result = ctx.instantiate(endowment, gas_meter, executable, data, &salt)
 					.map(|(_address, output)| output)?;
 				Ok(result)
@@ -764,6 +764,17 @@ where
 			.collect();
 		UncheckedFrom::unchecked_from(T::Hashing::hash(&buf))
 	}
+
+	/// Subsistence threshold is the extension of the minimum balance (aka existential deposit)
+	/// by the tombstone deposit, required for leaving a tombstone.
+	///
+	/// Rent or any contract initiated balance transfer mechanism cannot make the balance lower
+	/// than the subsistence threshold in order to guarantee that a tombstone is created.
+	///
+	/// The only way to completely kill a contract without a tombstone is calling `seal_terminate`.
+	pub fn subsistence_threshold() -> BalanceOf<T> {
+		T::Currency::minimum_balance().saturating_add(T::TombstoneDeposit::get())
+	}
 }
 
 impl<T: Config> Module<T>
@@ -778,8 +789,8 @@ where
 			&mut GasMeter<T>,
 		) -> ExecResult,
 	) -> ExecResult {
-		let cfg = ConfigCache::preload();
-		let mut ctx = ExecutionContext::top_level(origin, &cfg);
+		let schedule = <Module<T>>::current_schedule();
+		let mut ctx = ExecutionContext::top_level(origin, &schedule);
 		func(&mut ctx, gas_meter)
 	}
 }
@@ -875,49 +886,3 @@ decl_storage! {
 		pub DeletionQueue: Vec<storage::DeletedContract>;
 	}
 }
-
-/// In-memory cache of configuration values.
-///
-/// We assume that these values can't be changed in the
-/// course of transaction execution.
-pub struct ConfigCache<T: Config> {
-	pub schedule: Schedule<T>,
-	pub existential_deposit: BalanceOf<T>,
-	pub tombstone_deposit: BalanceOf<T>,
-	pub max_depth: u32,
-	pub max_value_size: u32,
-}
-
-impl<T: Config> ConfigCache<T>
-where
-	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
-{
-	fn preload() -> ConfigCache<T> {
-		ConfigCache {
-			schedule: <Module<T>>::current_schedule(),
-			existential_deposit: T::Currency::minimum_balance(),
-			tombstone_deposit: T::TombstoneDeposit::get(),
-			max_depth: T::MaxDepth::get(),
-			max_value_size: T::MaxValueSize::get(),
-		}
-	}
-
-	/// Subsistence threshold is the extension of the minimum balance (aka existential deposit) by the
-	/// tombstone deposit, required for leaving a tombstone.
-	///
-	/// Rent or any contract initiated balance transfer mechanism cannot make the balance lower
-	/// than the subsistence threshold in order to guarantee that a tombstone is created.
-	///
-	/// The only way to completely kill a contract without a tombstone is calling `seal_terminate`.
-	pub fn subsistence_threshold(&self) -> BalanceOf<T> {
-		self.existential_deposit.saturating_add(self.tombstone_deposit)
-	}
-
-	/// The same as `subsistence_threshold` but without the need for a preloaded instance.
-	///
-	/// This is for cases where this value is needed in rent calculation rather than
-	/// during contract execution.
-	pub fn subsistence_threshold_uncached() -> BalanceOf<T> {
-		T::Currency::minimum_balance().saturating_add(T::TombstoneDeposit::get())
-	}
-}
diff --git a/frame/contracts/src/rent.rs b/frame/contracts/src/rent.rs
index 145e6639c608..38b1e8bd1175 100644
--- a/frame/contracts/src/rent.rs
+++ b/frame/contracts/src/rent.rs
@@ -19,7 +19,7 @@
 
 use crate::{
 	AliveContractInfo, BalanceOf, ContractInfo, ContractInfoOf, Module, RawEvent,
-	TombstoneContractInfo, Config, CodeHash, ConfigCache, Error,
+	TombstoneContractInfo, Config, CodeHash, Error,
 	storage::Storage, wasm::PrefabWasmModule, exec::Executable,
 };
 use sp_std::prelude::*;
@@ -125,7 +125,7 @@ where
 		free_balance: &BalanceOf<T>,
 		contract: &AliveContractInfo<T>,
 	) -> Option<BalanceOf<T>> {
-		let subsistence_threshold = ConfigCache::<T>::subsistence_threshold_uncached();
+		let subsistence_threshold = Module::<T>::subsistence_threshold();
 		// Reserved balance contributes towards the subsistence threshold to stay consistent
 		// with the existential deposit where the reserved balance is also counted.
 		if *total_balance < subsistence_threshold {
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index f50c4b65968e..364683a2034c 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -18,7 +18,7 @@
 use crate::{
 	BalanceOf, ContractInfo, ContractInfoOf, Module,
 	RawAliveContractInfo, RawEvent, Config, Schedule, gas::Gas,
-	Error, ConfigCache, RuntimeReturnCode, storage::Storage,
+	Error, RuntimeReturnCode, storage::Storage,
 	chain_extension::{
 		Result as ExtensionResult, Environment, ChainExtension, Ext, SysConfig, RetVal,
 		UncheckedFrom, InitState, ReturnFlags,
@@ -67,10 +67,10 @@ frame_support::construct_runtime!(
 pub mod test_utils {
 	use super::{Test, Balances};
 	use crate::{
-		ConfigCache,
 		ContractInfoOf, CodeHash,
 		storage::Storage,
 		exec::{StorageKey, AccountIdOf},
+		Module as Contracts,
 	};
 	use frame_support::{StorageMap, traits::Currency};
 
@@ -84,7 +84,7 @@ pub mod test_utils {
 	}
 	pub fn place_contract(address: &AccountIdOf<Test>, code_hash: CodeHash<Test>) {
 		let trie_id = Storage::<Test>::generate_trie_id(address);
-		set_balance(address, ConfigCache::<Test>::subsistence_threshold_uncached() * 10);
+		set_balance(address, Contracts::<Test>::subsistence_threshold() * 10);
 		Storage::<Test>::place_contract(&address, trie_id, code_hash).unwrap();
 	}
 	pub fn set_balance(who: &AccountIdOf<Test>, amount: u64) {
@@ -451,7 +451,7 @@ fn instantiate_and_call_and_deposit_event() {
 		.build()
 		.execute_with(|| {
 			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
+			let subsistence = Module::<Test>::subsistence_threshold();
 
 			// Check at the end to get hash on error easily
 			let creation = Contracts::instantiate_with_code(
@@ -566,7 +566,7 @@ fn deposit_event_max_value_limit() {
 #[test]
 fn run_out_of_gas() {
 	let (wasm, code_hash) = compile_module::<Test>("run_out_of_gas").unwrap();
-	let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
+	let subsistence = Module::<Test>::subsistence_threshold();
 
 	ExtBuilder::default()
 		.existential_deposit(50)
@@ -902,7 +902,7 @@ fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
 				.unwrap().get_alive().unwrap().rent_allowance;
 			let balance = Balances::free_balance(&addr);
 
-			let subsistence_threshold = ConfigCache::<Test>::subsistence_threshold_uncached();
+			let subsistence_threshold = Module::<Test>::subsistence_threshold();
 
 			// Trigger rent must have no effect
 			assert!(!trigger_call(addr.clone()));
@@ -991,7 +991,7 @@ fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
 		.build()
 		.execute_with(|| {
 			// Create
-			let subsistence_threshold = ConfigCache::<Test>::subsistence_threshold_uncached();
+			let subsistence_threshold = Module::<Test>::subsistence_threshold();
 			let _ = Balances::deposit_creating(&ALICE, subsistence_threshold * 1000);
 			assert_ok!(Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
@@ -1878,7 +1878,7 @@ fn crypto_hashes() {
 fn transfer_return_code() {
 	let (wasm, code_hash) = compile_module::<Test>("transfer_return_code").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
+		let subsistence = Module::<Test>::subsistence_threshold();
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 
 		assert_ok!(
@@ -1925,7 +1925,7 @@ fn call_return_code() {
 	let (caller_code, caller_hash) = compile_module::<Test>("call_return_code").unwrap();
 	let (callee_code, callee_hash) = compile_module::<Test>("ok_trap_revert").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
+		let subsistence = Module::<Test>::subsistence_threshold();
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 		let _ = Balances::deposit_creating(&CHARLIE, 1000 * subsistence);
 
@@ -2018,7 +2018,7 @@ fn instantiate_return_code() {
 	let (caller_code, caller_hash) = compile_module::<Test>("instantiate_return_code").unwrap();
 	let (callee_code, callee_hash) = compile_module::<Test>("ok_trap_revert").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
+		let subsistence = Module::<Test>::subsistence_threshold();
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 		let _ = Balances::deposit_creating(&CHARLIE, 1000 * subsistence);
 		let callee_hash = callee_hash.as_ref().to_vec();
@@ -2109,7 +2109,7 @@ fn instantiate_return_code() {
 fn disabled_chain_extension_wont_deploy() {
 	let (code, _hash) = compile_module::<Test>("chain_extension").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
+		let subsistence = Module::<Test>::subsistence_threshold();
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 		TestExtension::disable();
 		assert_err_ignore_postinfo!(
@@ -2130,7 +2130,7 @@ fn disabled_chain_extension_wont_deploy() {
 fn disabled_chain_extension_errors_on_call() {
 	let (code, hash) = compile_module::<Test>("chain_extension").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
+		let subsistence = Module::<Test>::subsistence_threshold();
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 		assert_ok!(
 			Contracts::instantiate_with_code(
@@ -2161,7 +2161,7 @@ fn disabled_chain_extension_errors_on_call() {
 fn chain_extension_works() {
 	let (code, hash) = compile_module::<Test>("chain_extension").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
+		let subsistence = Module::<Test>::subsistence_threshold();
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 		assert_ok!(
 			Contracts::instantiate_with_code(
@@ -2230,7 +2230,7 @@ fn chain_extension_works() {
 fn lazy_removal_works() {
 	let (code, hash) = compile_module::<Test>("self_destruct").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
+		let subsistence = Module::<Test>::subsistence_threshold();
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 
 		assert_ok!(
@@ -2290,7 +2290,7 @@ fn lazy_removal_partial_remove_works() {
 	let mut ext = ExtBuilder::default().existential_deposit(50).build();
 
 	let trie = ext.execute_with(|| {
-		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
+		let subsistence = Module::<Test>::subsistence_threshold();
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 
 		assert_ok!(
@@ -2371,7 +2371,7 @@ fn lazy_removal_partial_remove_works() {
 fn lazy_removal_does_no_run_on_full_block() {
 	let (code, hash) = compile_module::<Test>("self_destruct").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
+		let subsistence = Module::<Test>::subsistence_threshold();
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 
 		assert_ok!(
@@ -2455,7 +2455,7 @@ fn lazy_removal_does_no_run_on_full_block() {
 fn lazy_removal_does_not_use_all_weight() {
 	let (code, hash) = compile_module::<Test>("self_destruct").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
+		let subsistence = Module::<Test>::subsistence_threshold();
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 
 		assert_ok!(
@@ -2525,7 +2525,7 @@ fn lazy_removal_does_not_use_all_weight() {
 fn deletion_queue_full() {
 	let (code, hash) = compile_module::<Test>("self_destruct").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
+		let subsistence = Module::<Test>::subsistence_threshold();
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 
 		assert_ok!(
@@ -2651,7 +2651,7 @@ fn refcounter() {
 	let (wasm, code_hash) = compile_module::<Test>("self_destruct").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
 		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
+		let subsistence = Module::<Test>::subsistence_threshold();
 
 		// Create two contracts with the same code and check that they do in fact share it.
 		assert_ok!(Contracts::instantiate_with_code(
diff --git a/frame/contracts/src/weights.rs b/frame/contracts/src/weights.rs
index 366022045182..9c5361103873 100644
--- a/frame/contracts/src/weights.rs
+++ b/frame/contracts/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_contracts
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.1
-//! DATE: 2021-01-25, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2021-02-04, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -150,247 +150,247 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn on_initialize() -> Weight {
-		(3_697_000 as Weight)
+		(3_947_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 	}
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
-		(45_767_000 as Weight)
+		(46_644_000 as Weight)
 			// Standard Error: 5_000
-			.saturating_add((2_294_000 as Weight).saturating_mul(k as Weight))
+			.saturating_add((2_295_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
-		(270_383_000 as Weight)
-			// Standard Error: 42_000
-			.saturating_add((146_901_000 as Weight).saturating_mul(q as Weight))
+		(0 as Weight)
+			// Standard Error: 164_000
+			.saturating_add((165_220_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn update_schedule() -> Weight {
-		(26_819_000 as Weight)
+		(28_195_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 135_000
-			.saturating_add((156_679_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 67_000
-			.saturating_add((2_794_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 126_000
+			.saturating_add((154_196_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 63_000
+			.saturating_add((2_764_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
 	fn instantiate(s: u32, ) -> Weight {
-		(189_974_000 as Weight)
+		(201_407_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((2_250_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((2_247_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn call() -> Weight {
-		(168_719_000 as Weight)
+		(180_337_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn claim_surcharge() -> Weight {
-		(294_458_000 as Weight)
+		(322_371_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn seal_caller(r: u32, ) -> Weight {
-		(123_683_000 as Weight)
-			// Standard Error: 115_000
-			.saturating_add((255_734_000 as Weight).saturating_mul(r as Weight))
+		(135_499_000 as Weight)
+			// Standard Error: 296_000
+			.saturating_add((275_938_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_address(r: u32, ) -> Weight {
-		(120_904_000 as Weight)
-			// Standard Error: 96_000
-			.saturating_add((255_431_000 as Weight).saturating_mul(r as Weight))
+		(132_674_000 as Weight)
+			// Standard Error: 158_000
+			.saturating_add((273_808_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(124_210_000 as Weight)
-			// Standard Error: 124_000
-			.saturating_add((251_138_000 as Weight).saturating_mul(r as Weight))
+		(126_819_000 as Weight)
+			// Standard Error: 145_000
+			.saturating_add((269_173_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_balance(r: u32, ) -> Weight {
-		(127_626_000 as Weight)
-			// Standard Error: 192_000
-			.saturating_add((528_716_000 as Weight).saturating_mul(r as Weight))
+		(140_223_000 as Weight)
+			// Standard Error: 259_000
+			.saturating_add((581_353_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(117_016_000 as Weight)
-			// Standard Error: 109_000
-			.saturating_add((250_620_000 as Weight).saturating_mul(r as Weight))
+		(129_490_000 as Weight)
+			// Standard Error: 132_000
+			.saturating_add((269_433_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(123_945_000 as Weight)
-			// Standard Error: 290_000
-			.saturating_add((252_225_000 as Weight).saturating_mul(r as Weight))
+		(127_251_000 as Weight)
+			// Standard Error: 161_000
+			.saturating_add((268_720_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(119_625_000 as Weight)
-			// Standard Error: 132_000
-			.saturating_add((250_486_000 as Weight).saturating_mul(r as Weight))
+		(129_546_000 as Weight)
+			// Standard Error: 130_000
+			.saturating_add((268_280_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(131_962_000 as Weight)
-			// Standard Error: 187_000
-			.saturating_add((555_772_000 as Weight).saturating_mul(r as Weight))
+		(133_306_000 as Weight)
+			// Standard Error: 208_000
+			.saturating_add((604_235_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_block_number(r: u32, ) -> Weight {
-		(120_356_000 as Weight)
-			// Standard Error: 107_000
-			.saturating_add((249_743_000 as Weight).saturating_mul(r as Weight))
+		(133_689_000 as Weight)
+			// Standard Error: 115_000
+			.saturating_add((267_107_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_now(r: u32, ) -> Weight {
-		(109_890_000 as Weight)
-			// Standard Error: 252_000
-			.saturating_add((253_638_000 as Weight).saturating_mul(r as Weight))
+		(133_773_000 as Weight)
+			// Standard Error: 130_000
+			.saturating_add((268_897_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(128_014_000 as Weight)
-			// Standard Error: 207_000
-			.saturating_add((481_167_000 as Weight).saturating_mul(r as Weight))
+		(133_222_000 as Weight)
+			// Standard Error: 476_000
+			.saturating_add((514_400_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 	}
 	fn seal_gas(r: u32, ) -> Weight {
-		(108_147_000 as Weight)
-			// Standard Error: 101_000
-			.saturating_add((122_462_000 as Weight).saturating_mul(r as Weight))
+		(118_769_000 as Weight)
+			// Standard Error: 102_000
+			.saturating_add((134_134_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_input(r: u32, ) -> Weight {
-		(117_045_000 as Weight)
-			// Standard Error: 57_000
-			.saturating_add((7_168_000 as Weight).saturating_mul(r as Weight))
+		(124_719_000 as Weight)
+			// Standard Error: 93_000
+			.saturating_add((7_486_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(127_286_000 as Weight)
+		(136_348_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((278_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((274_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_return(r: u32, ) -> Weight {
-		(111_673_000 as Weight)
-			// Standard Error: 88_000
-			.saturating_add((4_768_000 as Weight).saturating_mul(r as Weight))
+		(118_710_000 as Weight)
+			// Standard Error: 77_000
+			.saturating_add((4_566_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(113_767_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((745_000 as Weight).saturating_mul(n as Weight))
+		(127_609_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((786_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_terminate(r: u32, ) -> Weight {
-		(117_714_000 as Weight)
-			// Standard Error: 82_000
-			.saturating_add((92_096_000 as Weight).saturating_mul(r as Weight))
+		(125_463_000 as Weight)
+			// Standard Error: 154_000
+			.saturating_add((106_188_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes((5 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_restore_to(r: u32, ) -> Weight {
-		(208_895_000 as Weight)
-			// Standard Error: 312_000
-			.saturating_add((125_607_000 as Weight).saturating_mul(r as Weight))
+		(219_195_000 as Weight)
+			// Standard Error: 361_000
+			.saturating_add((131_326_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes((6 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_restore_to_per_delta(d: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 2_920_000
-			.saturating_add((3_575_765_000 as Weight).saturating_mul(d as Weight))
+		(6_742_000 as Weight)
+			// Standard Error: 2_484_000
+			.saturating_add((3_747_735_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(T::DbWeight::get().reads(8 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
 			.saturating_add(T::DbWeight::get().writes(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
 	}
 	fn seal_random(r: u32, ) -> Weight {
-		(120_578_000 as Weight)
-			// Standard Error: 196_000
-			.saturating_add((604_126_000 as Weight).saturating_mul(r as Weight))
+		(137_248_000 as Weight)
+			// Standard Error: 662_000
+			.saturating_add((661_121_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 	}
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(142_228_000 as Weight)
-			// Standard Error: 476_000
-			.saturating_add((885_528_000 as Weight).saturating_mul(r as Weight))
+		(147_654_000 as Weight)
+			// Standard Error: 305_000
+			.saturating_add((935_148_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_157_284_000 as Weight)
-			// Standard Error: 2_081_000
-			.saturating_add((547_132_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 410_000
-			.saturating_add((243_458_000 as Weight).saturating_mul(n as Weight))
+		(1_246_123_000 as Weight)
+			// Standard Error: 2_807_000
+			.saturating_add((585_535_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 553_000
+			.saturating_add((249_976_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(142_691_000 as Weight)
-			// Standard Error: 237_000
-			.saturating_add((662_375_000 as Weight).saturating_mul(r as Weight))
+		(140_588_000 as Weight)
+			// Standard Error: 228_000
+			.saturating_add((707_872_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(1_111_700_000 as Weight)
-			// Standard Error: 15_818_000
-			.saturating_add((16_429_245_000 as Weight).saturating_mul(r as Weight))
+		(2_767_124_000 as Weight)
+			// Standard Error: 18_504_000
+			.saturating_add((17_507_873_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(1_613_716_000 as Weight)
-			// Standard Error: 339_000
-			.saturating_add((67_360_000 as Weight).saturating_mul(n as Weight))
+		(1_748_586_000 as Weight)
+			// Standard Error: 359_000
+			.saturating_add((75_231_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn seal_clear_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_384_000
-			.saturating_add((2_125_855_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 2_209_000
+			.saturating_add((2_261_355_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_get_storage(r: u32, ) -> Weight {
-		(88_908_000 as Weight)
-			// Standard Error: 657_000
-			.saturating_add((894_111_000 as Weight).saturating_mul(r as Weight))
+		(83_780_000 as Weight)
+			// Standard Error: 965_000
+			.saturating_add((973_164_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(680_626_000 as Weight)
-			// Standard Error: 256_000
-			.saturating_add((146_686_000 as Weight).saturating_mul(n as Weight))
+		(728_625_000 as Weight)
+			// Standard Error: 294_000
+			.saturating_add((154_625_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 	}
 	fn seal_transfer(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 1_355_000
-			.saturating_add((5_086_065_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 1_543_000
+			.saturating_add((5_467_966_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -398,591 +398,591 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	}
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 8_018_000
-			.saturating_add((9_737_605_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 9_216_000
+			.saturating_add((10_265_093_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().reads((200 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight {
-		(6_776_517_000 as Weight)
-			// Standard Error: 181_875_000
-			.saturating_add((3_769_181_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 64_000
-			.saturating_add((57_763_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 69_000
-			.saturating_add((79_752_000 as Weight).saturating_mul(o as Weight))
+		(10_426_869_000 as Weight)
+			// Standard Error: 114_622_000
+			.saturating_add((4_366_037_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 40_000
+			.saturating_add((59_741_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 43_000
+			.saturating_add((82_331_000 as Weight).saturating_mul(o as Weight))
 			.saturating_add(T::DbWeight::get().reads(206 as Weight))
 			.saturating_add(T::DbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 32_551_000
-			.saturating_add((19_948_011_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 35_927_000
+			.saturating_add((21_088_623_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes((300 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_instantiate_per_input_output_salt_kb(i: u32, o: u32, s: u32, ) -> Weight {
-		(19_812_400_000 as Weight)
-			// Standard Error: 80_000
-			.saturating_add((53_676_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 80_000
-			.saturating_add((76_512_000 as Weight).saturating_mul(o as Weight))
-			// Standard Error: 80_000
-			.saturating_add((274_518_000 as Weight).saturating_mul(s as Weight))
+		(17_200_760_000 as Weight)
+			// Standard Error: 157_000
+			.saturating_add((61_221_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 157_000
+			.saturating_add((84_149_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 157_000
+			.saturating_add((284_655_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(207 as Weight))
 			.saturating_add(T::DbWeight::get().writes(203 as Weight))
 	}
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(123_385_000 as Weight)
-			// Standard Error: 128_000
-			.saturating_add((231_897_000 as Weight).saturating_mul(r as Weight))
+		(126_005_000 as Weight)
+			// Standard Error: 133_000
+			.saturating_add((252_338_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(399_641_000 as Weight)
-			// Standard Error: 46_000
-			.saturating_add((427_165_000 as Weight).saturating_mul(n as Weight))
+		(727_930_000 as Weight)
+			// Standard Error: 57_000
+			.saturating_add((430_299_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(120_367_000 as Weight)
-			// Standard Error: 131_000
-			.saturating_add((247_401_000 as Weight).saturating_mul(r as Weight))
+		(129_778_000 as Weight)
+			// Standard Error: 146_000
+			.saturating_add((266_097_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(150_485_000 as Weight)
-			// Standard Error: 39_000
-			.saturating_add((337_450_000 as Weight).saturating_mul(n as Weight))
+		(683_078_000 as Weight)
+			// Standard Error: 42_000
+			.saturating_add((344_294_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(117_139_000 as Weight)
-			// Standard Error: 138_000
-			.saturating_add((221_115_000 as Weight).saturating_mul(r as Weight))
+		(141_731_000 as Weight)
+			// Standard Error: 251_000
+			.saturating_add((239_931_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(428_440_000 as Weight)
-			// Standard Error: 36_000
-			.saturating_add((153_427_000 as Weight).saturating_mul(n as Weight))
+		(563_895_000 as Weight)
+			// Standard Error: 51_000
+			.saturating_add((160_216_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(120_716_000 as Weight)
-			// Standard Error: 116_000
-			.saturating_add((218_086_000 as Weight).saturating_mul(r as Weight))
+		(132_587_000 as Weight)
+			// Standard Error: 159_000
+			.saturating_add((239_287_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(478_148_000 as Weight)
-			// Standard Error: 45_000
-			.saturating_add((153_952_000 as Weight).saturating_mul(n as Weight))
+		(606_572_000 as Weight)
+			// Standard Error: 34_000
+			.saturating_add((160_101_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(23_526_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((3_125_000 as Weight).saturating_mul(r as Weight))
+		(24_366_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((3_114_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(25_653_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((159_121_000 as Weight).saturating_mul(r as Weight))
+		(26_779_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((161_654_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(25_608_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((229_680_000 as Weight).saturating_mul(r as Weight))
+		(26_763_000 as Weight)
+			// Standard Error: 88_000
+			.saturating_add((232_822_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(24_053_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((11_768_000 as Weight).saturating_mul(r as Weight))
+		(24_342_000 as Weight)
+			// Standard Error: 36_000
+			.saturating_add((12_530_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(23_478_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((11_992_000 as Weight).saturating_mul(r as Weight))
+		(24_301_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((12_106_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(23_418_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((5_936_000 as Weight).saturating_mul(r as Weight))
+		(24_253_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((6_464_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(23_380_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((13_844_000 as Weight).saturating_mul(r as Weight))
+		(24_259_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((14_030_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(23_509_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((14_912_000 as Weight).saturating_mul(r as Weight))
+		(24_313_000 as Weight)
+			// Standard Error: 37_000
+			.saturating_add((15_788_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(36_616_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((104_000 as Weight).saturating_mul(e as Weight))
+		(37_991_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((138_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(23_821_000 as Weight)
-			// Standard Error: 49_000
-			.saturating_add((96_843_000 as Weight).saturating_mul(r as Weight))
+		(24_739_000 as Weight)
+			// Standard Error: 31_000
+			.saturating_add((97_567_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(31_502_000 as Weight)
-			// Standard Error: 523_000
-			.saturating_add((196_243_000 as Weight).saturating_mul(r as Weight))
+		(32_395_000 as Weight)
+			// Standard Error: 432_000
+			.saturating_add((198_972_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(242_403_000 as Weight)
-			// Standard Error: 9_000
-			.saturating_add((3_443_000 as Weight).saturating_mul(p as Weight))
+		(238_857_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((3_491_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(40_816_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((3_178_000 as Weight).saturating_mul(r as Weight))
+		(42_196_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((3_161_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(40_778_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((3_507_000 as Weight).saturating_mul(r as Weight))
+		(42_133_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((3_459_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(40_808_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((4_775_000 as Weight).saturating_mul(r as Weight))
+		(42_164_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((4_653_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(26_983_000 as Weight)
-			// Standard Error: 32_000
-			.saturating_add((8_878_000 as Weight).saturating_mul(r as Weight))
+		(27_802_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((7_780_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(26_975_000 as Weight)
-			// Standard Error: 34_000
-			.saturating_add((12_236_000 as Weight).saturating_mul(r as Weight))
+		(27_826_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((11_978_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(25_691_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((3_577_000 as Weight).saturating_mul(r as Weight))
+		(26_753_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((3_494_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(24_245_000 as Weight)
-			// Standard Error: 3_933_000
-			.saturating_add((2_305_850_000 as Weight).saturating_mul(r as Weight))
+		(25_078_000 as Weight)
+			// Standard Error: 4_213_000
+			.saturating_add((2_324_209_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(23_495_000 as Weight)
+		(24_301_000 as Weight)
 			// Standard Error: 28_000
-			.saturating_add((5_186_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((5_201_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(23_441_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((5_224_000 as Weight).saturating_mul(r as Weight))
+		(24_237_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((5_251_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(23_507_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((5_820_000 as Weight).saturating_mul(r as Weight))
+		(24_290_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((5_780_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(23_475_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((5_244_000 as Weight).saturating_mul(r as Weight))
+		(24_278_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((5_145_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(23_437_000 as Weight)
+		(24_249_000 as Weight)
 			// Standard Error: 14_000
-			.saturating_add((5_204_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((5_248_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(23_434_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((5_211_000 as Weight).saturating_mul(r as Weight))
+		(24_266_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((5_236_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(23_454_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((5_181_000 as Weight).saturating_mul(r as Weight))
+		(24_236_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((5_304_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(23_470_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((7_257_000 as Weight).saturating_mul(r as Weight))
+		(24_262_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((7_220_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(23_475_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((7_132_000 as Weight).saturating_mul(r as Weight))
+		(24_287_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((7_072_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(23_418_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((7_199_000 as Weight).saturating_mul(r as Weight))
+		(24_211_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((7_196_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(23_478_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((7_278_000 as Weight).saturating_mul(r as Weight))
+		(24_175_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((7_392_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(23_471_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((7_134_000 as Weight).saturating_mul(r as Weight))
+		(24_209_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((7_131_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(23_448_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((7_260_000 as Weight).saturating_mul(r as Weight))
+		(24_261_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((7_203_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(23_409_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((7_064_000 as Weight).saturating_mul(r as Weight))
+		(24_258_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((7_120_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(23_433_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((7_088_000 as Weight).saturating_mul(r as Weight))
+		(24_236_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((7_076_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(23_425_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((7_152_000 as Weight).saturating_mul(r as Weight))
+		(24_262_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((7_261_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(23_474_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((7_204_000 as Weight).saturating_mul(r as Weight))
+		(24_242_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((7_249_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(23_431_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((7_105_000 as Weight).saturating_mul(r as Weight))
+		(24_248_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((7_149_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(23_423_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((7_094_000 as Weight).saturating_mul(r as Weight))
+		(24_243_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((7_128_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(23_407_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((7_149_000 as Weight).saturating_mul(r as Weight))
+		(24_217_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((7_237_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(23_437_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((13_007_000 as Weight).saturating_mul(r as Weight))
+		(24_191_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((12_970_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(23_405_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((12_259_000 as Weight).saturating_mul(r as Weight))
+		(24_213_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((12_106_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(23_469_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((12_950_000 as Weight).saturating_mul(r as Weight))
+		(24_238_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((12_944_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(23_460_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((12_249_000 as Weight).saturating_mul(r as Weight))
+		(24_317_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((12_129_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(23_434_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((7_111_000 as Weight).saturating_mul(r as Weight))
+		(24_282_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((7_123_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(23_481_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((7_010_000 as Weight).saturating_mul(r as Weight))
+		(24_243_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_148_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(23_500_000 as Weight)
-			// Standard Error: 34_000
-			.saturating_add((7_074_000 as Weight).saturating_mul(r as Weight))
+		(24_239_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_157_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(23_477_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((7_220_000 as Weight).saturating_mul(r as Weight))
+		(24_279_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((7_253_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(23_433_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((7_305_000 as Weight).saturating_mul(r as Weight))
+		(24_285_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((7_333_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(23_413_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((7_299_000 as Weight).saturating_mul(r as Weight))
+		(24_298_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((7_228_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(23_468_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((7_204_000 as Weight).saturating_mul(r as Weight))
+		(24_226_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((7_269_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(23_434_000 as Weight)
-			// Standard Error: 32_000
-			.saturating_add((7_255_000 as Weight).saturating_mul(r as Weight))
+		(24_235_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((7_299_000 as Weight).saturating_mul(r as Weight))
 	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn on_initialize() -> Weight {
-		(3_697_000 as Weight)
+		(3_947_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 	}
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
-		(45_767_000 as Weight)
+		(46_644_000 as Weight)
 			// Standard Error: 5_000
-			.saturating_add((2_294_000 as Weight).saturating_mul(k as Weight))
+			.saturating_add((2_295_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
-		(270_383_000 as Weight)
-			// Standard Error: 42_000
-			.saturating_add((146_901_000 as Weight).saturating_mul(q as Weight))
+		(0 as Weight)
+			// Standard Error: 164_000
+			.saturating_add((165_220_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn update_schedule() -> Weight {
-		(26_819_000 as Weight)
+		(28_195_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 135_000
-			.saturating_add((156_679_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 67_000
-			.saturating_add((2_794_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 126_000
+			.saturating_add((154_196_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 63_000
+			.saturating_add((2_764_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}
 	fn instantiate(s: u32, ) -> Weight {
-		(189_974_000 as Weight)
+		(201_407_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((2_250_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((2_247_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn call() -> Weight {
-		(168_719_000 as Weight)
+		(180_337_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn claim_surcharge() -> Weight {
-		(294_458_000 as Weight)
+		(322_371_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn seal_caller(r: u32, ) -> Weight {
-		(123_683_000 as Weight)
-			// Standard Error: 115_000
-			.saturating_add((255_734_000 as Weight).saturating_mul(r as Weight))
+		(135_499_000 as Weight)
+			// Standard Error: 296_000
+			.saturating_add((275_938_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_address(r: u32, ) -> Weight {
-		(120_904_000 as Weight)
-			// Standard Error: 96_000
-			.saturating_add((255_431_000 as Weight).saturating_mul(r as Weight))
+		(132_674_000 as Weight)
+			// Standard Error: 158_000
+			.saturating_add((273_808_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(124_210_000 as Weight)
-			// Standard Error: 124_000
-			.saturating_add((251_138_000 as Weight).saturating_mul(r as Weight))
+		(126_819_000 as Weight)
+			// Standard Error: 145_000
+			.saturating_add((269_173_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_balance(r: u32, ) -> Weight {
-		(127_626_000 as Weight)
-			// Standard Error: 192_000
-			.saturating_add((528_716_000 as Weight).saturating_mul(r as Weight))
+		(140_223_000 as Weight)
+			// Standard Error: 259_000
+			.saturating_add((581_353_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(117_016_000 as Weight)
-			// Standard Error: 109_000
-			.saturating_add((250_620_000 as Weight).saturating_mul(r as Weight))
+		(129_490_000 as Weight)
+			// Standard Error: 132_000
+			.saturating_add((269_433_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(123_945_000 as Weight)
-			// Standard Error: 290_000
-			.saturating_add((252_225_000 as Weight).saturating_mul(r as Weight))
+		(127_251_000 as Weight)
+			// Standard Error: 161_000
+			.saturating_add((268_720_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(119_625_000 as Weight)
-			// Standard Error: 132_000
-			.saturating_add((250_486_000 as Weight).saturating_mul(r as Weight))
+		(129_546_000 as Weight)
+			// Standard Error: 130_000
+			.saturating_add((268_280_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(131_962_000 as Weight)
-			// Standard Error: 187_000
-			.saturating_add((555_772_000 as Weight).saturating_mul(r as Weight))
+		(133_306_000 as Weight)
+			// Standard Error: 208_000
+			.saturating_add((604_235_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_block_number(r: u32, ) -> Weight {
-		(120_356_000 as Weight)
-			// Standard Error: 107_000
-			.saturating_add((249_743_000 as Weight).saturating_mul(r as Weight))
+		(133_689_000 as Weight)
+			// Standard Error: 115_000
+			.saturating_add((267_107_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_now(r: u32, ) -> Weight {
-		(109_890_000 as Weight)
-			// Standard Error: 252_000
-			.saturating_add((253_638_000 as Weight).saturating_mul(r as Weight))
+		(133_773_000 as Weight)
+			// Standard Error: 130_000
+			.saturating_add((268_897_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(128_014_000 as Weight)
-			// Standard Error: 207_000
-			.saturating_add((481_167_000 as Weight).saturating_mul(r as Weight))
+		(133_222_000 as Weight)
+			// Standard Error: 476_000
+			.saturating_add((514_400_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 	}
 	fn seal_gas(r: u32, ) -> Weight {
-		(108_147_000 as Weight)
-			// Standard Error: 101_000
-			.saturating_add((122_462_000 as Weight).saturating_mul(r as Weight))
+		(118_769_000 as Weight)
+			// Standard Error: 102_000
+			.saturating_add((134_134_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_input(r: u32, ) -> Weight {
-		(117_045_000 as Weight)
-			// Standard Error: 57_000
-			.saturating_add((7_168_000 as Weight).saturating_mul(r as Weight))
+		(124_719_000 as Weight)
+			// Standard Error: 93_000
+			.saturating_add((7_486_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(127_286_000 as Weight)
+		(136_348_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((278_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((274_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_return(r: u32, ) -> Weight {
-		(111_673_000 as Weight)
-			// Standard Error: 88_000
-			.saturating_add((4_768_000 as Weight).saturating_mul(r as Weight))
+		(118_710_000 as Weight)
+			// Standard Error: 77_000
+			.saturating_add((4_566_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(113_767_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((745_000 as Weight).saturating_mul(n as Weight))
+		(127_609_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((786_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_terminate(r: u32, ) -> Weight {
-		(117_714_000 as Weight)
-			// Standard Error: 82_000
-			.saturating_add((92_096_000 as Weight).saturating_mul(r as Weight))
+		(125_463_000 as Weight)
+			// Standard Error: 154_000
+			.saturating_add((106_188_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((5 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_restore_to(r: u32, ) -> Weight {
-		(208_895_000 as Weight)
-			// Standard Error: 312_000
-			.saturating_add((125_607_000 as Weight).saturating_mul(r as Weight))
+		(219_195_000 as Weight)
+			// Standard Error: 361_000
+			.saturating_add((131_326_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((4 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((6 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_restore_to_per_delta(d: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 2_920_000
-			.saturating_add((3_575_765_000 as Weight).saturating_mul(d as Weight))
+		(6_742_000 as Weight)
+			// Standard Error: 2_484_000
+			.saturating_add((3_747_735_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(RocksDbWeight::get().reads(8 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(7 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
 	}
 	fn seal_random(r: u32, ) -> Weight {
-		(120_578_000 as Weight)
-			// Standard Error: 196_000
-			.saturating_add((604_126_000 as Weight).saturating_mul(r as Weight))
+		(137_248_000 as Weight)
+			// Standard Error: 662_000
+			.saturating_add((661_121_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 	}
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(142_228_000 as Weight)
-			// Standard Error: 476_000
-			.saturating_add((885_528_000 as Weight).saturating_mul(r as Weight))
+		(147_654_000 as Weight)
+			// Standard Error: 305_000
+			.saturating_add((935_148_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_157_284_000 as Weight)
-			// Standard Error: 2_081_000
-			.saturating_add((547_132_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 410_000
-			.saturating_add((243_458_000 as Weight).saturating_mul(n as Weight))
+		(1_246_123_000 as Weight)
+			// Standard Error: 2_807_000
+			.saturating_add((585_535_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 553_000
+			.saturating_add((249_976_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(142_691_000 as Weight)
-			// Standard Error: 237_000
-			.saturating_add((662_375_000 as Weight).saturating_mul(r as Weight))
+		(140_588_000 as Weight)
+			// Standard Error: 228_000
+			.saturating_add((707_872_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(1_111_700_000 as Weight)
-			// Standard Error: 15_818_000
-			.saturating_add((16_429_245_000 as Weight).saturating_mul(r as Weight))
+		(2_767_124_000 as Weight)
+			// Standard Error: 18_504_000
+			.saturating_add((17_507_873_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(1_613_716_000 as Weight)
-			// Standard Error: 339_000
-			.saturating_add((67_360_000 as Weight).saturating_mul(n as Weight))
+		(1_748_586_000 as Weight)
+			// Standard Error: 359_000
+			.saturating_add((75_231_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn seal_clear_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_384_000
-			.saturating_add((2_125_855_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 2_209_000
+			.saturating_add((2_261_355_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_get_storage(r: u32, ) -> Weight {
-		(88_908_000 as Weight)
-			// Standard Error: 657_000
-			.saturating_add((894_111_000 as Weight).saturating_mul(r as Weight))
+		(83_780_000 as Weight)
+			// Standard Error: 965_000
+			.saturating_add((973_164_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(680_626_000 as Weight)
-			// Standard Error: 256_000
-			.saturating_add((146_686_000 as Weight).saturating_mul(n as Weight))
+		(728_625_000 as Weight)
+			// Standard Error: 294_000
+			.saturating_add((154_625_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 	}
 	fn seal_transfer(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 1_355_000
-			.saturating_add((5_086_065_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 1_543_000
+			.saturating_add((5_467_966_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
@@ -990,343 +990,343 @@ impl WeightInfo for () {
 	}
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 8_018_000
-			.saturating_add((9_737_605_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 9_216_000
+			.saturating_add((10_265_093_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((200 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight {
-		(6_776_517_000 as Weight)
-			// Standard Error: 181_875_000
-			.saturating_add((3_769_181_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 64_000
-			.saturating_add((57_763_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 69_000
-			.saturating_add((79_752_000 as Weight).saturating_mul(o as Weight))
+		(10_426_869_000 as Weight)
+			// Standard Error: 114_622_000
+			.saturating_add((4_366_037_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 40_000
+			.saturating_add((59_741_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 43_000
+			.saturating_add((82_331_000 as Weight).saturating_mul(o as Weight))
 			.saturating_add(RocksDbWeight::get().reads(206 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 32_551_000
-			.saturating_add((19_948_011_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 35_927_000
+			.saturating_add((21_088_623_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((300 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_instantiate_per_input_output_salt_kb(i: u32, o: u32, s: u32, ) -> Weight {
-		(19_812_400_000 as Weight)
-			// Standard Error: 80_000
-			.saturating_add((53_676_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 80_000
-			.saturating_add((76_512_000 as Weight).saturating_mul(o as Weight))
-			// Standard Error: 80_000
-			.saturating_add((274_518_000 as Weight).saturating_mul(s as Weight))
+		(17_200_760_000 as Weight)
+			// Standard Error: 157_000
+			.saturating_add((61_221_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 157_000
+			.saturating_add((84_149_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 157_000
+			.saturating_add((284_655_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(207 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(203 as Weight))
 	}
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(123_385_000 as Weight)
-			// Standard Error: 128_000
-			.saturating_add((231_897_000 as Weight).saturating_mul(r as Weight))
+		(126_005_000 as Weight)
+			// Standard Error: 133_000
+			.saturating_add((252_338_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(399_641_000 as Weight)
-			// Standard Error: 46_000
-			.saturating_add((427_165_000 as Weight).saturating_mul(n as Weight))
+		(727_930_000 as Weight)
+			// Standard Error: 57_000
+			.saturating_add((430_299_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(120_367_000 as Weight)
-			// Standard Error: 131_000
-			.saturating_add((247_401_000 as Weight).saturating_mul(r as Weight))
+		(129_778_000 as Weight)
+			// Standard Error: 146_000
+			.saturating_add((266_097_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(150_485_000 as Weight)
-			// Standard Error: 39_000
-			.saturating_add((337_450_000 as Weight).saturating_mul(n as Weight))
+		(683_078_000 as Weight)
+			// Standard Error: 42_000
+			.saturating_add((344_294_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(117_139_000 as Weight)
-			// Standard Error: 138_000
-			.saturating_add((221_115_000 as Weight).saturating_mul(r as Weight))
+		(141_731_000 as Weight)
+			// Standard Error: 251_000
+			.saturating_add((239_931_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(428_440_000 as Weight)
-			// Standard Error: 36_000
-			.saturating_add((153_427_000 as Weight).saturating_mul(n as Weight))
+		(563_895_000 as Weight)
+			// Standard Error: 51_000
+			.saturating_add((160_216_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(120_716_000 as Weight)
-			// Standard Error: 116_000
-			.saturating_add((218_086_000 as Weight).saturating_mul(r as Weight))
+		(132_587_000 as Weight)
+			// Standard Error: 159_000
+			.saturating_add((239_287_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(478_148_000 as Weight)
-			// Standard Error: 45_000
-			.saturating_add((153_952_000 as Weight).saturating_mul(n as Weight))
+		(606_572_000 as Weight)
+			// Standard Error: 34_000
+			.saturating_add((160_101_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(23_526_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((3_125_000 as Weight).saturating_mul(r as Weight))
+		(24_366_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((3_114_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(25_653_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((159_121_000 as Weight).saturating_mul(r as Weight))
+		(26_779_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((161_654_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(25_608_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((229_680_000 as Weight).saturating_mul(r as Weight))
+		(26_763_000 as Weight)
+			// Standard Error: 88_000
+			.saturating_add((232_822_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(24_053_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((11_768_000 as Weight).saturating_mul(r as Weight))
+		(24_342_000 as Weight)
+			// Standard Error: 36_000
+			.saturating_add((12_530_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(23_478_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((11_992_000 as Weight).saturating_mul(r as Weight))
+		(24_301_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((12_106_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(23_418_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((5_936_000 as Weight).saturating_mul(r as Weight))
+		(24_253_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((6_464_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(23_380_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((13_844_000 as Weight).saturating_mul(r as Weight))
+		(24_259_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((14_030_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(23_509_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((14_912_000 as Weight).saturating_mul(r as Weight))
+		(24_313_000 as Weight)
+			// Standard Error: 37_000
+			.saturating_add((15_788_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(36_616_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((104_000 as Weight).saturating_mul(e as Weight))
+		(37_991_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((138_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(23_821_000 as Weight)
-			// Standard Error: 49_000
-			.saturating_add((96_843_000 as Weight).saturating_mul(r as Weight))
+		(24_739_000 as Weight)
+			// Standard Error: 31_000
+			.saturating_add((97_567_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(31_502_000 as Weight)
-			// Standard Error: 523_000
-			.saturating_add((196_243_000 as Weight).saturating_mul(r as Weight))
+		(32_395_000 as Weight)
+			// Standard Error: 432_000
+			.saturating_add((198_972_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(242_403_000 as Weight)
-			// Standard Error: 9_000
-			.saturating_add((3_443_000 as Weight).saturating_mul(p as Weight))
+		(238_857_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((3_491_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(40_816_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((3_178_000 as Weight).saturating_mul(r as Weight))
+		(42_196_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((3_161_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(40_778_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((3_507_000 as Weight).saturating_mul(r as Weight))
+		(42_133_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((3_459_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(40_808_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((4_775_000 as Weight).saturating_mul(r as Weight))
+		(42_164_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((4_653_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(26_983_000 as Weight)
-			// Standard Error: 32_000
-			.saturating_add((8_878_000 as Weight).saturating_mul(r as Weight))
+		(27_802_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((7_780_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(26_975_000 as Weight)
-			// Standard Error: 34_000
-			.saturating_add((12_236_000 as Weight).saturating_mul(r as Weight))
+		(27_826_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((11_978_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(25_691_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((3_577_000 as Weight).saturating_mul(r as Weight))
+		(26_753_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((3_494_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(24_245_000 as Weight)
-			// Standard Error: 3_933_000
-			.saturating_add((2_305_850_000 as Weight).saturating_mul(r as Weight))
+		(25_078_000 as Weight)
+			// Standard Error: 4_213_000
+			.saturating_add((2_324_209_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(23_495_000 as Weight)
+		(24_301_000 as Weight)
 			// Standard Error: 28_000
-			.saturating_add((5_186_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((5_201_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(23_441_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((5_224_000 as Weight).saturating_mul(r as Weight))
+		(24_237_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((5_251_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(23_507_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((5_820_000 as Weight).saturating_mul(r as Weight))
+		(24_290_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((5_780_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(23_475_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((5_244_000 as Weight).saturating_mul(r as Weight))
+		(24_278_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((5_145_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(23_437_000 as Weight)
+		(24_249_000 as Weight)
 			// Standard Error: 14_000
-			.saturating_add((5_204_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((5_248_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(23_434_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((5_211_000 as Weight).saturating_mul(r as Weight))
+		(24_266_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((5_236_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(23_454_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((5_181_000 as Weight).saturating_mul(r as Weight))
+		(24_236_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((5_304_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(23_470_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((7_257_000 as Weight).saturating_mul(r as Weight))
+		(24_262_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((7_220_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(23_475_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((7_132_000 as Weight).saturating_mul(r as Weight))
+		(24_287_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((7_072_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(23_418_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((7_199_000 as Weight).saturating_mul(r as Weight))
+		(24_211_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((7_196_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(23_478_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((7_278_000 as Weight).saturating_mul(r as Weight))
+		(24_175_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((7_392_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(23_471_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((7_134_000 as Weight).saturating_mul(r as Weight))
+		(24_209_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((7_131_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(23_448_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((7_260_000 as Weight).saturating_mul(r as Weight))
+		(24_261_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((7_203_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(23_409_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((7_064_000 as Weight).saturating_mul(r as Weight))
+		(24_258_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((7_120_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(23_433_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((7_088_000 as Weight).saturating_mul(r as Weight))
+		(24_236_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((7_076_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(23_425_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((7_152_000 as Weight).saturating_mul(r as Weight))
+		(24_262_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((7_261_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(23_474_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((7_204_000 as Weight).saturating_mul(r as Weight))
+		(24_242_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((7_249_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(23_431_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((7_105_000 as Weight).saturating_mul(r as Weight))
+		(24_248_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((7_149_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(23_423_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((7_094_000 as Weight).saturating_mul(r as Weight))
+		(24_243_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((7_128_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(23_407_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((7_149_000 as Weight).saturating_mul(r as Weight))
+		(24_217_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((7_237_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(23_437_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((13_007_000 as Weight).saturating_mul(r as Weight))
+		(24_191_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((12_970_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(23_405_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((12_259_000 as Weight).saturating_mul(r as Weight))
+		(24_213_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((12_106_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(23_469_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((12_950_000 as Weight).saturating_mul(r as Weight))
+		(24_238_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((12_944_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(23_460_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((12_249_000 as Weight).saturating_mul(r as Weight))
+		(24_317_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((12_129_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(23_434_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((7_111_000 as Weight).saturating_mul(r as Weight))
+		(24_282_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((7_123_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(23_481_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((7_010_000 as Weight).saturating_mul(r as Weight))
+		(24_243_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_148_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(23_500_000 as Weight)
-			// Standard Error: 34_000
-			.saturating_add((7_074_000 as Weight).saturating_mul(r as Weight))
+		(24_239_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_157_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(23_477_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((7_220_000 as Weight).saturating_mul(r as Weight))
+		(24_279_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((7_253_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(23_433_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((7_305_000 as Weight).saturating_mul(r as Weight))
+		(24_285_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((7_333_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(23_413_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((7_299_000 as Weight).saturating_mul(r as Weight))
+		(24_298_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((7_228_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(23_468_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((7_204_000 as Weight).saturating_mul(r as Weight))
+		(24_226_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((7_269_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(23_434_000 as Weight)
-			// Standard Error: 32_000
-			.saturating_add((7_255_000 as Weight).saturating_mul(r as Weight))
+		(24_235_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((7_299_000 as Weight).saturating_mul(r as Weight))
 	}
 }

From 26e9a1150dbcd8832dcc5e5c78b0c9e44d7d0410 Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Sat, 6 Feb 2021 16:00:10 +0100
Subject: [PATCH 0371/1194] Extend SS58 network identifiers (#8039)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Initial draft

* Fixes

* Fixes

* Fixes

* Fixes

* Fixes

* Improve readability, add format filter.

* Link

* Fixes

* Update primitives/core/src/crypto.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Suggestions from review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 primitives/core/src/crypto.rs | 117 +++++++++++++++++++++++-----------
 primitives/core/src/ecdsa.rs  |  33 +++++++++-
 ss58-registry.json            |  21 ++----
 3 files changed, 118 insertions(+), 53 deletions(-)

diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index 2cc2d703c617..5b7505725f31 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -210,7 +210,7 @@ pub enum PublicError {
 	BadBase58,
 	/// Bad length.
 	BadLength,
-	/// Unknown version.
+	/// Unknown identifier for the encoding.
 	UnknownVersion,
 	/// Invalid checksum.
 	InvalidChecksum,
@@ -218,11 +218,22 @@ pub enum PublicError {
 	InvalidFormat,
 	/// Invalid derivation path.
 	InvalidPath,
+	/// Disallowed SS58 Address Format for this datatype.
+	FormatNotAllowed,
 }
 
 /// Key that can be encoded to/from SS58.
+///
+/// See https://github.com/paritytech/substrate/wiki/External-Address-Format-(SS58)#address-type
+/// for information on the codec.
 #[cfg(feature = "full_crypto")]
 pub trait Ss58Codec: Sized + AsMut<[u8]> + AsRef<[u8]> + Default {
+	/// A format filterer, can be used to ensure that `from_ss58check` family only decode for
+	/// allowed identifiers. By default just refuses the two reserved identifiers.
+	fn format_is_allowed(f: Ss58AddressFormat) -> bool {
+		!matches!(f, Ss58AddressFormat::Reserved46 | Ss58AddressFormat::Reserved47)
+	}
+
 	/// Some if the string is a properly encoded SS58Check address.
 	#[cfg(feature = "std")]
 	fn from_ss58check(s: &str) -> Result<Self, PublicError> {
@@ -233,25 +244,46 @@ pub trait Ss58Codec: Sized + AsMut<[u8]> + AsRef<[u8]> + Default {
 				_ => Err(PublicError::UnknownVersion),
 			})
 	}
+
 	/// Some if the string is a properly encoded SS58Check address.
 	#[cfg(feature = "std")]
 	fn from_ss58check_with_version(s: &str) -> Result<(Self, Ss58AddressFormat), PublicError> {
+		const CHECKSUM_LEN: usize = 2;
 		let mut res = Self::default();
-		let len = res.as_mut().len();
-		let d = s.from_base58().map_err(|_| PublicError::BadBase58)?; // failure here would be invalid encoding.
-		if d.len() != len + 3 {
-			// Invalid length.
-			return Err(PublicError::BadLength);
-		}
-		let ver = d[0].try_into().map_err(|_: ()| PublicError::UnknownVersion)?;
 
-		if d[len + 1..len + 3] != ss58hash(&d[0..len + 1]).as_bytes()[0..2] {
+		// Must decode to our type.
+		let body_len = res.as_mut().len();
+
+		let data = s.from_base58().map_err(|_| PublicError::BadBase58)?;
+		if data.len() < 2 { return Err(PublicError::BadLength); }
+		let (prefix_len, ident) = match data[0] {
+			0..=63 => (1, data[0] as u16),
+			64..=127 => {
+				// weird bit manipulation owing to the combination of LE encoding and missing two bits
+				// from the left.
+				// d[0] d[1] are: 01aaaaaa bbcccccc
+				// they make the LE-encoded 16-bit value: aaaaaabb 00cccccc
+				// so the lower byte is formed of aaaaaabb and the higher byte is 00cccccc
+				let lower = (data[0] << 2) | (data[1] >> 6);
+				let upper = data[1] & 0b00111111;
+				(2, (lower as u16) | ((upper as u16) << 8))
+			}
+			_ => Err(PublicError::UnknownVersion)?,
+		};
+		if data.len() != prefix_len + body_len + CHECKSUM_LEN { return Err(PublicError::BadLength) }
+		let format = ident.try_into().map_err(|_: ()| PublicError::UnknownVersion)?;
+		if !Self::format_is_allowed(format) { return Err(PublicError::FormatNotAllowed) }
+
+		let hash = ss58hash(&data[0..body_len + prefix_len]);
+		let checksum = &hash.as_bytes()[0..CHECKSUM_LEN];
+		if data[body_len + prefix_len..body_len + prefix_len + CHECKSUM_LEN] != *checksum {
 			// Invalid checksum.
 			return Err(PublicError::InvalidChecksum);
 		}
-		res.as_mut().copy_from_slice(&d[1..len + 1]);
-		Ok((res, ver))
+		res.as_mut().copy_from_slice(&data[prefix_len..body_len + prefix_len]);
+		Ok((res, format))
 	}
+
 	/// Some if the string is a properly encoded SS58Check address, optionally with
 	/// a derivation path following.
 	#[cfg(feature = "std")]
@@ -267,7 +299,20 @@ pub trait Ss58Codec: Sized + AsMut<[u8]> + AsRef<[u8]> + Default {
 	/// Return the ss58-check string for this key.
 	#[cfg(feature = "std")]
 	fn to_ss58check_with_version(&self, version: Ss58AddressFormat) -> String {
-		let mut v = vec![version.into()];
+		// We mask out the upper two bits of the ident - SS58 Prefix currently only supports 14-bits
+		let ident: u16 = u16::from(version) & 0b00111111_11111111;
+		let mut v = match ident {
+			0..=63 => vec![ident as u8],
+			64..=16_383 => {
+				// upper six bits of the lower byte(!)
+				let first = ((ident & 0b00000000_11111100) as u8) >> 2;
+				// lower two bits of the lower byte in the high pos,
+				// lower bits of the upper byte in the low pos
+				let second = ((ident >> 8) as u8) | ((ident & 0b00000000_00000011) as u8) << 6;
+				vec![first | 0b01000000, second]
+			}
+			_ => unreachable!("masked out the upper two bits; qed"),
+		};
 		v.extend(self.as_ref());
 		let r = ss58hash(&v);
 		v.extend(&r.as_bytes()[0..2]);
@@ -321,8 +366,8 @@ macro_rules! ss58_address_format {
 		#[derive(Copy, Clone, PartialEq, Eq, crate::RuntimeDebug)]
 		pub enum Ss58AddressFormat {
 			$(#[doc = $desc] $identifier),*,
-			/// Use a manually provided numeric value.
-			Custom(u8),
+			/// Use a manually provided numeric value as a standard identifier
+			Custom(u16),
 		}
 
 		#[cfg(feature = "std")]
@@ -363,8 +408,16 @@ macro_rules! ss58_address_format {
 			}
 		}
 
-		impl From<Ss58AddressFormat> for u8 {
-			fn from(x: Ss58AddressFormat) -> u8 {
+		impl TryFrom<u8> for Ss58AddressFormat {
+			type Error = ();
+
+			fn try_from(x: u8) -> Result<Ss58AddressFormat, ()> {
+				Ss58AddressFormat::try_from(x as u16)
+			}
+		}
+
+		impl From<Ss58AddressFormat> for u16 {
+			fn from(x: Ss58AddressFormat) -> u16 {
 				match x {
 					$(Ss58AddressFormat::$identifier => $number),*,
 					Ss58AddressFormat::Custom(n) => n,
@@ -372,22 +425,13 @@ macro_rules! ss58_address_format {
 			}
 		}
 
-		impl TryFrom<u8> for Ss58AddressFormat {
+		impl TryFrom<u16> for Ss58AddressFormat {
 			type Error = ();
 
-			fn try_from(x: u8) -> Result<Ss58AddressFormat, ()> {
+			fn try_from(x: u16) -> Result<Ss58AddressFormat, ()> {
 				match x {
 					$($number => Ok(Ss58AddressFormat::$identifier)),*,
-					_ => {
-						#[cfg(feature = "std")]
-						match Ss58AddressFormat::default() {
-							Ss58AddressFormat::Custom(n) if n == x => Ok(Ss58AddressFormat::Custom(x)),
-							_ => Err(()),
-						}
-
-						#[cfg(not(feature = "std"))]
-						Err(())
-					},
+					_ => Ok(Ss58AddressFormat::Custom(x)),
 				}
 			}
 		}
@@ -403,7 +447,7 @@ macro_rules! ss58_address_format {
 			fn try_from(x: &'a str) -> Result<Ss58AddressFormat, Self::Error> {
 				match x {
 					$($name => Ok(Ss58AddressFormat::$identifier)),*,
-					a => a.parse::<u8>().map(Ss58AddressFormat::Custom).map_err(|_| ParseError),
+					a => a.parse::<u16>().map(Ss58AddressFormat::Custom).map_err(|_| ParseError),
 				}
 			}
 		}
@@ -444,12 +488,12 @@ macro_rules! ss58_address_format {
 ss58_address_format!(
 	PolkadotAccount =>
 		(0, "polkadot", "Polkadot Relay-chain, standard account (*25519).")
-	Reserved1 =>
-		(1, "reserved1", "Reserved for future use (1).")
+	BareSr25519 =>
+		(1, "sr25519", "Bare 32-bit Schnorr/Ristretto 25519 (S/R 25519) key.")
 	KusamaAccount =>
 		(2, "kusama", "Kusama Relay-chain, standard account (*25519).")
-	Reserved3 =>
-		(3, "reserved3", "Reserved for future use (3).")
+	BareEd25519 =>
+		(3, "ed25519", "Bare 32-bit Edwards Ed25519 key.")
 	KatalChainAccount =>
 		(4, "katalchain", "Katal Chain, standard account (*25519).")
 	PlasmAccount =>
@@ -501,7 +545,7 @@ ss58_address_format!(
 	SubsocialAccount =>
 		(28, "subsocial", "Subsocial network, standard account (*25519).")
 	DhiwayAccount =>
-		(29, "cord", "Dhiway CORD network, standard account (*25519).")	
+		(29, "cord", "Dhiway CORD network, standard account (*25519).")
 	PhalaAccount =>
 		(30, "phala", "Phala Network, standard account (*25519).")
 	LitentryAccount =>
@@ -522,8 +566,8 @@ ss58_address_format!(
 		(41, "poli", "Polimec Chain mainnet, standard account (*25519).")
 	SubstrateAccount =>
 		(42, "substrate", "Any Substrate network, standard account (*25519).")
-	Reserved43 =>
-		(43, "reserved43", "Reserved for future use (43).")
+	BareSecp256k1 =>
+		(43, "secp256k1", "Bare ECDSA SECP256k1 key.")
 	ChainXAccount =>
 		(44, "chainx", "ChainX mainnet, standard account (*25519).")
 	UniartsAccount =>
@@ -532,7 +576,6 @@ ss58_address_format!(
 		(46, "reserved46", "Reserved for future use (46).")
 	Reserved47 =>
 		(47, "reserved47", "Reserved for future use (47).")
-	// Note: 48 and above are reserved.
 );
 
 /// Set the default "version" (actually, this is a bit of a misnomer and the version byte is
diff --git a/primitives/core/src/ecdsa.rs b/primitives/core/src/ecdsa.rs
index 0f654f816c47..fc9b16beedd1 100644
--- a/primitives/core/src/ecdsa.rs
+++ b/primitives/core/src/ecdsa.rs
@@ -554,6 +554,7 @@ mod test {
 	use hex_literal::hex;
 	use crate::crypto::{DEV_PHRASE, set_default_ss58_version};
 	use serde_json;
+	use crate::crypto::PublicError;
 
 	#[test]
 	fn default_phrase_should_be_used() {
@@ -676,6 +677,34 @@ mod test {
 		assert_eq!(cmp, public);
 	}
 
+	#[test]
+	fn ss58check_format_check_works() {
+		use crate::crypto::Ss58AddressFormat;
+		let pair = Pair::from_seed(b"12345678901234567890123456789012");
+		let public = pair.public();
+		let format = Ss58AddressFormat::Reserved46;
+		let s = public.to_ss58check_with_version(format);
+		assert_eq!(Public::from_ss58check_with_version(&s), Err(PublicError::FormatNotAllowed));
+	}
+
+	#[test]
+	fn ss58check_full_roundtrip_works() {
+		use crate::crypto::Ss58AddressFormat;
+		let pair = Pair::from_seed(b"12345678901234567890123456789012");
+		let public = pair.public();
+		let format = Ss58AddressFormat::PolkadotAccount;
+		let s = public.to_ss58check_with_version(format);
+		let (k, f) = Public::from_ss58check_with_version(&s).unwrap();
+		assert_eq!(k, public);
+		assert_eq!(f, format);
+
+		let format = Ss58AddressFormat::Custom(64);
+		let s = public.to_ss58check_with_version(format);
+		let (k, f) = Public::from_ss58check_with_version(&s).unwrap();
+		assert_eq!(k, public);
+		assert_eq!(f, format);
+	}
+
 	#[test]
 	fn ss58check_custom_format_works() {
 		// We need to run this test in its own process to not interfere with other tests running in
@@ -685,10 +714,12 @@ mod test {
 			// temp save default format version
 			let default_format = Ss58AddressFormat::default();
 			// set current ss58 version is custom "200" `Ss58AddressFormat::Custom(200)`
+
 			set_default_ss58_version(Ss58AddressFormat::Custom(200));
 			// custom addr encoded by version 200
-			let addr = "2X64kMNEWAW5KLZMSKcGKEc96MyuaRsRUku7vomuYxKgqjVCRj";
+			let addr = "4pbsSkWcBaYoFHrKJZp5fDVUKbqSYD9dhZZGvpp3vQ5ysVs5ybV";
 			Public::from_ss58check(&addr).unwrap();
+
 			set_default_ss58_version(default_format);
 			// set current ss58 version to default version
 			let addr = "KWAfgC2aRG5UVD6CpbPQXCx4YZZUhvWqqAJE6qcYc9Rtr6g5C";
diff --git a/ss58-registry.json b/ss58-registry.json
index 4501571fa322..8db6238a9d31 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -21,8 +21,8 @@
 		},
 		{
 			"prefix": 1,
-			"network": "reserved1",
-			"displayName": "This prefix is reserved.",
+			"network": null,
+			"displayName": "Bare 32-bit Schnorr/Ristretto (S/R 25519) public key.",
 			"symbols": null,
 			"decimals": null,
 			"standardAccount": null,
@@ -39,8 +39,8 @@
 		},
 		{
 			"prefix": 3,
-			"network": "reserved3",
-			"displayName": "This prefix is reserved.",
+			"network": null,
+			"displayName": "Bare 32-bit Ed25519 public key.",
 			"symbols": null,
 			"decimals": null,
 			"standardAccount": null,
@@ -390,8 +390,8 @@
 		},
 		{
 			"prefix": 43,
-			"network": "reserved43",
-			"displayName": "This prefix is reserved.",
+			"network": null,
+			"displayName": "Bare 32-bit ECDSA SECP-256k1 public key.",
 			"symbols": null,
 			"decimals": null,
 			"standardAccount": null,
@@ -432,15 +432,6 @@
 			"decimals": null,
 			"standardAccount": null,
 			"website": null
-		},
-		{
-			"prefix": 48,
-			"network": "reserved48",
-			"displayName": "All prefixes 48 and higher are reserved and cannot be allocated.",
-			"symbols": null,
-			"decimals": null,
-			"standardAccount": null,
-			"website": null
 		}
 	]
 }

From 0b719f85222c85ff095585d128fac1979bbfdd38 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Sat, 6 Feb 2021 21:12:46 +0100
Subject: [PATCH 0372/1194] Use construct_runtime in tests (#8059)

* impl some more

* add serde

* remove unused

* fix staking fuzz

* fix system bench

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 Cargo.lock                                    |   3 +
 frame/benchmarking/Cargo.toml                 |   1 +
 frame/benchmarking/src/tests.rs               | 370 +++++++++---------
 frame/example-offchain-worker/src/tests.rs    |  61 +--
 frame/example-parallel/Cargo.toml             |   3 +
 frame/example-parallel/src/tests.rs           |  38 +-
 frame/example/src/lib.rs                      |  73 ++--
 frame/grandpa/src/mock.rs                     |  75 ++--
 frame/grandpa/src/tests.rs                    |   2 +-
 frame/session/benchmarking/src/mock.rs        |  42 +-
 frame/staking/fuzzer/Cargo.toml               |   6 +
 frame/staking/fuzzer/src/mock.rs              |  46 ++-
 frame/system/benches/bench.rs                 |  27 +-
 frame/system/benchmarking/src/mock.rs         |  36 +-
 .../system/src/extensions/check_mortality.rs  |   2 +-
 frame/system/src/mock.rs                      |  52 +--
 frame/system/src/offchain.rs                  |  10 +-
 frame/system/src/tests.rs                     |  34 +-
 18 files changed, 441 insertions(+), 440 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 040510515726..b02baa306479 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1644,6 +1644,7 @@ dependencies = [
  "linregress",
  "parity-scale-codec",
  "paste 1.0.4",
+ "serde",
  "sp-api",
  "sp-io",
  "sp-runtime",
@@ -4730,6 +4731,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "parity-scale-codec",
+ "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5150,6 +5152,7 @@ dependencies = [
  "pallet-staking-reward-curve",
  "pallet-timestamp",
  "parity-scale-codec",
+ "serde",
  "sp-core",
  "sp-io",
  "sp-npos-elections",
diff --git a/frame/benchmarking/Cargo.toml b/frame/benchmarking/Cargo.toml
index 2cec36698dd6..4fdb31dca5c6 100644
--- a/frame/benchmarking/Cargo.toml
+++ b/frame/benchmarking/Cargo.toml
@@ -27,6 +27,7 @@ frame-system = { version = "2.0.0", default-features = false, path = "../system"
 
 [dev-dependencies]
 hex-literal = "0.3.1"
+serde = "1.0.101"
 
 [features]
 default = [ "std" ]
diff --git a/frame/benchmarking/src/tests.rs b/frame/benchmarking/src/tests.rs
index 2a2daaffbadc..53093fdf062d 100644
--- a/frame/benchmarking/src/tests.rs
+++ b/frame/benchmarking/src/tests.rs
@@ -21,59 +21,65 @@
 
 use super::*;
 use sp_std::prelude::*;
-use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::{H256, Header}};
-use frame_support::{
-	dispatch::DispatchResult,
-	decl_module, decl_storage, impl_outer_origin, assert_ok, assert_err, ensure,
-	parameter_types, pallet_prelude::Get,
-};
-use frame_system::{RawOrigin, ensure_signed, ensure_none};
-
-decl_storage! {
-	trait Store for Module<T: Config> as Test where
-		<T as OtherConfig>::OtherEvent: Into<<T as Config>::Event>
-	{
-		Value get(fn value): Option<u32>;
-	}
-}
+use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::{H256, Header}, BuildStorage};
+use frame_support::parameter_types;
 
-decl_module! {
-	pub struct Module<T: Config> for enum Call where
-		origin: T::Origin, <T as OtherConfig>::OtherEvent: Into<<T as Config>::Event>
-	{
-		#[weight = 0]
-		fn set_value(origin, n: u32) -> DispatchResult {
-			let _sender = ensure_signed(origin)?;
-			Value::put(n);
-			Ok(())
+mod pallet_test {
+	use frame_support::pallet_prelude::Get;
+
+	frame_support::decl_storage! {
+		trait Store for Module<T: Config> as Test where
+			<T as OtherConfig>::OtherEvent: Into<<T as Config>::Event>
+		{
+			pub Value get(fn value): Option<u32>;
 		}
+	}
 
-		#[weight = 0]
-		fn dummy(origin, _n: u32) -> DispatchResult {
-			let _sender = ensure_none(origin)?;
-			Ok(())
+	frame_support::decl_module! {
+		pub struct Module<T: Config> for enum Call where
+			origin: T::Origin, <T as OtherConfig>::OtherEvent: Into<<T as Config>::Event>
+		{
+			#[weight = 0]
+			fn set_value(origin, n: u32) -> frame_support::dispatch::DispatchResult {
+				let _sender = frame_system::ensure_signed(origin)?;
+				Value::put(n);
+				Ok(())
+			}
+
+			#[weight = 0]
+			fn dummy(origin, _n: u32) -> frame_support::dispatch::DispatchResult {
+				let _sender = frame_system::ensure_none(origin)?;
+				Ok(())
+			}
 		}
 	}
-}
 
-impl_outer_origin! {
-	pub enum Origin for Test where system = frame_system {}
-}
+	pub trait OtherConfig {
+		type OtherEvent;
+	}
 
-pub trait OtherConfig {
-	type OtherEvent;
+	pub trait Config: frame_system::Config + OtherConfig
+		where Self::OtherEvent: Into<<Self as Config>::Event>
+	{
+		type Event;
+		type LowerBound: Get<u32>;
+		type UpperBound: Get<u32>;
+	}
 }
 
-pub trait Config: frame_system::Config + OtherConfig
-	where Self::OtherEvent: Into<<Self as Config>::Event>
-{
-	type Event;
-	type LowerBound: Get<u32>;
-	type UpperBound: Get<u32>;
-}
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
 
-#[derive(Clone, Eq, PartialEq)]
-pub struct Test;
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		TestPallet: pallet_test::{Module, Call, Storage},
+	}
+);
 
 impl frame_system::Config for Test {
 	type BaseCallFilter = ();
@@ -84,15 +90,15 @@ impl frame_system::Config for Test {
 	type Index = u64;
 	type BlockNumber = u64;
 	type Hash = H256;
-	type Call = ();
+	type Call = Call;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type Header = Header;
-	type Event = ();
+	type Event = Event;
 	type BlockHashCount = ();
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -105,163 +111,177 @@ parameter_types!{
 	pub const UpperBound: u32 = 100;
 }
 
-impl Config for Test {
-	type Event = ();
+impl pallet_test::Config for Test {
+	type Event = Event;
 	type LowerBound = LowerBound;
 	type UpperBound = UpperBound;
 }
 
-impl OtherConfig for Test {
-	type OtherEvent = ();
+impl pallet_test::OtherConfig for Test {
+	type OtherEvent = Event;
 }
 
 fn new_test_ext() -> sp_io::TestExternalities {
-	frame_system::GenesisConfig::default().build_storage::<Test>().unwrap().into()
+	GenesisConfig::default().build_storage().unwrap().into()
 }
 
-benchmarks!{
-	where_clause { where <T as OtherConfig>::OtherEvent: Into<<T as Config>::Event> }
-
-	set_value {
-		let b in 1 .. 1000;
-		let caller = account::<T::AccountId>("caller", 0, 0);
-	}: _ (RawOrigin::Signed(caller), b.into())
-	verify {
-		assert_eq!(Value::get(), Some(b));
-	}
+mod benchmarks {
+	use sp_std::prelude::*;
+	use frame_system::RawOrigin;
+	use super::{Test, pallet_test::{self, Value}, new_test_ext};
+	use frame_support::{assert_ok, assert_err, ensure, traits::Get, StorageValue};
+	use crate::{BenchmarkingSetup, BenchmarkParameter, account};
 
-	other_name {
-		let b in 1 .. 1000;
-	}: dummy (RawOrigin::None, b.into())
+	// Additional used internally by the benchmark macro.
+	use super::pallet_test::{Call, Config, Module};
 
-	sort_vector {
-		let x in 1 .. 10000;
-		let mut m = Vec::<u32>::new();
-		for i in (0..x).rev() {
-			m.push(i);
+	crate::benchmarks!{
+		where_clause {
+			where
+				<T as pallet_test::OtherConfig>::OtherEvent: Into<<T as pallet_test::Config>::Event>
 		}
-	}: {
-		m.sort();
-	} verify {
-		ensure!(m[0] == 0, "You forgot to sort!")
-	}
-
-	bad_origin {
-		let b in 1 .. 1000;
-		let caller = account::<T::AccountId>("caller", 0, 0);
-	}: dummy (RawOrigin::Signed(caller), b.into())
 
-	bad_verify {
-		let x in 1 .. 10000;
-		let mut m = Vec::<u32>::new();
-		for i in (0..x).rev() {
-			m.push(i);
+		set_value {
+			let b in 1 .. 1000;
+			let caller = account::<T::AccountId>("caller", 0, 0);
+		}: _ (RawOrigin::Signed(caller), b.into())
+		verify {
+			assert_eq!(Value::get(), Some(b));
 		}
-	}: { }
-	verify {
-		ensure!(m[0] == 0, "You forgot to sort!")
-	}
-
-	no_components {
-		let caller = account::<T::AccountId>("caller", 0, 0);
-	}: set_value(RawOrigin::Signed(caller), 0)
 
-	variable_components {
-		let b in ( T::LowerBound::get() ) .. T::UpperBound::get();
-	}: dummy (RawOrigin::None, b.into())
-}
-
-#[test]
-fn benchmarks_macro_works() {
-	// Check benchmark creation for `set_value`.
-	let selected = SelectedBenchmark::set_value;
-
-	let components = <SelectedBenchmark as BenchmarkingSetup<Test>>::components(&selected);
-	assert_eq!(components, vec![(BenchmarkParameter::b, 1, 1000)]);
+		other_name {
+			let b in 1 .. 1000;
+		}: dummy (RawOrigin::None, b.into())
+
+		sort_vector {
+			let x in 1 .. 10000;
+			let mut m = Vec::<u32>::new();
+			for i in (0..x).rev() {
+				m.push(i);
+			}
+		}: {
+			m.sort();
+		} verify {
+			ensure!(m[0] == 0, "You forgot to sort!")
+		}
 
-	let closure = <SelectedBenchmark as BenchmarkingSetup<Test>>::instance(
-		&selected,
-		&[(BenchmarkParameter::b, 1)],
-		true,
-	).expect("failed to create closure");
+		bad_origin {
+			let b in 1 .. 1000;
+			let caller = account::<T::AccountId>("caller", 0, 0);
+		}: dummy (RawOrigin::Signed(caller), b.into())
+
+		bad_verify {
+			let x in 1 .. 10000;
+			let mut m = Vec::<u32>::new();
+			for i in (0..x).rev() {
+				m.push(i);
+			}
+		}: { }
+		verify {
+			ensure!(m[0] == 0, "You forgot to sort!")
+		}
 
-	new_test_ext().execute_with(|| {
-		assert_ok!(closure());
-	});
-}
+		no_components {
+			let caller = account::<T::AccountId>("caller", 0, 0);
+		}: set_value(RawOrigin::Signed(caller), 0)
 
-#[test]
-fn benchmarks_macro_rename_works() {
-	// Check benchmark creation for `other_dummy`.
-	let selected = SelectedBenchmark::other_name;
-	let components = <SelectedBenchmark as BenchmarkingSetup<Test>>::components(&selected);
-	assert_eq!(components, vec![(BenchmarkParameter::b, 1, 1000)]);
+		variable_components {
+			let b in ( T::LowerBound::get() ) .. T::UpperBound::get();
+		}: dummy (RawOrigin::None, b.into())
+	}
 
-	let closure = <SelectedBenchmark as BenchmarkingSetup<Test>>::instance(
-		&selected,
-		&[(BenchmarkParameter::b, 1)],
-		true,
-	).expect("failed to create closure");
+	#[test]
+	fn benchmarks_macro_works() {
+		// Check benchmark creation for `set_value`.
+		let selected = SelectedBenchmark::set_value;
 
-	new_test_ext().execute_with(|| {
-		assert_ok!(closure());
-	});
-}
+		let components = <SelectedBenchmark as BenchmarkingSetup<Test>>::components(&selected);
+		assert_eq!(components, vec![(BenchmarkParameter::b, 1, 1000)]);
 
-#[test]
-fn benchmarks_macro_works_for_non_dispatchable() {
-	let selected = SelectedBenchmark::sort_vector;
+		let closure = <SelectedBenchmark as BenchmarkingSetup<Test>>::instance(
+			&selected,
+			&[(BenchmarkParameter::b, 1)],
+			true,
+		).expect("failed to create closure");
 
-	let components = <SelectedBenchmark as BenchmarkingSetup<Test>>::components(&selected);
-	assert_eq!(components, vec![(BenchmarkParameter::x, 1, 10000)]);
+		new_test_ext().execute_with(|| {
+			assert_ok!(closure());
+		});
+	}
 
-	let closure = <SelectedBenchmark as BenchmarkingSetup<Test>>::instance(
-		&selected,
-		&[(BenchmarkParameter::x, 1)],
-		true,
-	).expect("failed to create closure");
+	#[test]
+	fn benchmarks_macro_rename_works() {
+		// Check benchmark creation for `other_dummy`.
+		let selected = SelectedBenchmark::other_name;
+		let components = <SelectedBenchmark as BenchmarkingSetup<Test>>::components(&selected);
+		assert_eq!(components, vec![(BenchmarkParameter::b, 1, 1000)]);
+
+		let closure = <SelectedBenchmark as BenchmarkingSetup<Test>>::instance(
+			&selected,
+			&[(BenchmarkParameter::b, 1)],
+			true,
+		).expect("failed to create closure");
+
+		new_test_ext().execute_with(|| {
+			assert_ok!(closure());
+		});
+	}
 
-	assert_ok!(closure());
-}
+	#[test]
+	fn benchmarks_macro_works_for_non_dispatchable() {
+		let selected = SelectedBenchmark::sort_vector;
 
-#[test]
-fn benchmarks_macro_verify_works() {
-	// Check postcondition for benchmark `set_value` is valid.
-	let selected = SelectedBenchmark::set_value;
+		let components = <SelectedBenchmark as BenchmarkingSetup<Test>>::components(&selected);
+		assert_eq!(components, vec![(BenchmarkParameter::x, 1, 10000)]);
 
-	let closure = <SelectedBenchmark as BenchmarkingSetup<Test>>::instance(
-		&selected,
-		&[(BenchmarkParameter::b, 1)],
-		true,
-	).expect("failed to create closure");
+		let closure = <SelectedBenchmark as BenchmarkingSetup<Test>>::instance(
+			&selected,
+			&[(BenchmarkParameter::x, 1)],
+			true,
+		).expect("failed to create closure");
 
-	new_test_ext().execute_with(|| {
 		assert_ok!(closure());
-	});
-
-	// Check postcondition for benchmark `bad_verify` is invalid.
-	let selected = SelectedBenchmark::bad_verify;
-
-	let closure = <SelectedBenchmark as BenchmarkingSetup<Test>>::instance(
-		&selected,
-		&[(BenchmarkParameter::x, 10000)],
-		true,
-	).expect("failed to create closure");
+	}
 
-	new_test_ext().execute_with(|| {
-		assert_err!(closure(), "You forgot to sort!");
-	});
-}
+	#[test]
+	fn benchmarks_macro_verify_works() {
+		// Check postcondition for benchmark `set_value` is valid.
+		let selected = SelectedBenchmark::set_value;
+
+		let closure = <SelectedBenchmark as BenchmarkingSetup<Test>>::instance(
+			&selected,
+			&[(BenchmarkParameter::b, 1)],
+			true,
+		).expect("failed to create closure");
+
+		new_test_ext().execute_with(|| {
+			assert_ok!(closure());
+		});
+
+		// Check postcondition for benchmark `bad_verify` is invalid.
+		let selected = SelectedBenchmark::bad_verify;
+
+		let closure = <SelectedBenchmark as BenchmarkingSetup<Test>>::instance(
+			&selected,
+			&[(BenchmarkParameter::x, 10000)],
+			true,
+		).expect("failed to create closure");
+
+		new_test_ext().execute_with(|| {
+			assert_err!(closure(), "You forgot to sort!");
+		});
+	}
 
-#[test]
-fn benchmarks_generate_unit_tests() {
-	new_test_ext().execute_with(|| {
-		assert_ok!(test_benchmark_set_value::<Test>());
-		assert_ok!(test_benchmark_other_name::<Test>());
-		assert_ok!(test_benchmark_sort_vector::<Test>());
-		assert_err!(test_benchmark_bad_origin::<Test>(), "Bad origin");
-		assert_err!(test_benchmark_bad_verify::<Test>(), "You forgot to sort!");
-		assert_ok!(test_benchmark_no_components::<Test>());
-		assert_ok!(test_benchmark_variable_components::<Test>());
-	});
+	#[test]
+	fn benchmarks_generate_unit_tests() {
+		new_test_ext().execute_with(|| {
+			assert_ok!(test_benchmark_set_value::<Test>());
+			assert_ok!(test_benchmark_other_name::<Test>());
+			assert_ok!(test_benchmark_sort_vector::<Test>());
+			assert_err!(test_benchmark_bad_origin::<Test>(), "Bad origin");
+			assert_err!(test_benchmark_bad_verify::<Test>(), "You forgot to sort!");
+			assert_ok!(test_benchmark_no_components::<Test>());
+			assert_ok!(test_benchmark_variable_components::<Test>());
+		});
+	}
 }
diff --git a/frame/example-offchain-worker/src/tests.rs b/frame/example-offchain-worker/src/tests.rs
index 882c2d6057cd..6f73ffcb9e15 100644
--- a/frame/example-offchain-worker/src/tests.rs
+++ b/frame/example-offchain-worker/src/tests.rs
@@ -16,11 +16,10 @@
 // limitations under the License.
 
 use crate::*;
+use crate as example_offchain_worker;
 use std::sync::Arc;
-use codec::{Encode, Decode};
-use frame_support::{
-	assert_ok, impl_outer_origin, parameter_types,
-};
+use codec::Decode;
+use frame_support::{assert_ok, parameter_types};
 use sp_core::{
 	H256,
 	offchain::{OffchainExt, TransactionPoolExt, testing},
@@ -40,15 +39,21 @@ use sp_runtime::{
 	},
 };
 
-impl_outer_origin! {
-	pub enum Origin for Test where system = frame_system {}
-}
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+// For testing the module, we construct a mock runtime.
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Example: example_offchain_worker::{Module, Call, Storage, Event<T>, ValidateUnsigned},
+	}
+);
 
-// For testing the module, we construct most of a mock runtime. This means
-// first constructing a configuration type (`Test`) which `impl`s each of the
-// configuration traits of modules we want to use.
-#[derive(Clone, Eq, PartialEq, Encode, Decode)]
-pub struct Test;
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 	pub BlockWeights: frame_system::limits::BlockWeights =
@@ -60,7 +65,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type Origin = Origin;
-	type Call = ();
+	type Call = Call;
 	type Index = u64;
 	type BlockNumber = u64;
 	type Hash = H256;
@@ -68,10 +73,10 @@ impl frame_system::Config for Test {
 	type AccountId = sp_core::sr25519::Public;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type Header = Header;
-	type Event = ();
+	type Event = Event;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -79,7 +84,7 @@ impl frame_system::Config for Test {
 	type SS58Prefix = ();
 }
 
-type Extrinsic = TestXt<Call<Test>, ()>;
+type Extrinsic = TestXt<Call, ()>;
 type AccountId = <<Signature as Verify>::Signer as IdentifyAccount>::AccountId;
 
 impl frame_system::offchain::SigningTypes for Test {
@@ -88,21 +93,21 @@ impl frame_system::offchain::SigningTypes for Test {
 }
 
 impl<LocalCall> frame_system::offchain::SendTransactionTypes<LocalCall> for Test where
-	Call<Test>: From<LocalCall>,
+	Call: From<LocalCall>,
 {
-	type OverarchingCall = Call<Test>;
+	type OverarchingCall = Call;
 	type Extrinsic = Extrinsic;
 }
 
 impl<LocalCall> frame_system::offchain::CreateSignedTransaction<LocalCall> for Test where
-	Call<Test>: From<LocalCall>,
+	Call: From<LocalCall>,
 {
 	fn create_transaction<C: frame_system::offchain::AppCrypto<Self::Public, Self::Signature>>(
-		call: Call<Test>,
+		call: Call,
 		_public: <Signature as Verify>::Signer,
 		_account: AccountId,
 		nonce: u64,
-	) -> Option<(Call<Test>, <Extrinsic as ExtrinsicT>::SignaturePayload)> {
+	) -> Option<(Call, <Extrinsic as ExtrinsicT>::SignaturePayload)> {
 		Some((call, (nonce, ())))
 	}
 }
@@ -114,16 +119,14 @@ parameter_types! {
 }
 
 impl Config for Test {
-	type Event = ();
+	type Event = Event;
 	type AuthorityId = crypto::TestAuthId;
-	type Call = Call<Test>;
+	type Call = Call;
 	type GracePeriod = GracePeriod;
 	type UnsignedInterval = UnsignedInterval;
 	type UnsignedPriority = UnsignedPriority;
 }
 
-type Example = Module<Test>;
-
 #[test]
 fn it_aggregates_the_price() {
 	sp_io::TestExternalities::default().execute_with(|| {
@@ -228,7 +231,7 @@ fn should_submit_signed_transaction_on_chain() {
 		assert!(pool_state.read().transactions.is_empty());
 		let tx = Extrinsic::decode(&mut &*tx).unwrap();
 		assert_eq!(tx.signature.unwrap().0, 0);
-		assert_eq!(tx.call, Call::submit_price(15523));
+		assert_eq!(tx.call, Call::Example(crate::Call::submit_price(15523)));
 	});
 }
 
@@ -272,7 +275,7 @@ fn should_submit_unsigned_transaction_on_chain_for_any_account() {
 		let tx = pool_state.write().transactions.pop().unwrap();
 		let tx = Extrinsic::decode(&mut &*tx).unwrap();
 		assert_eq!(tx.signature, None);
-		if let Call::submit_price_unsigned_with_signed_payload(body, signature) = tx.call {
+		if let Call::Example(crate::Call::submit_price_unsigned_with_signed_payload(body, signature)) = tx.call {
 			assert_eq!(body, price_payload);
 
 			let signature_valid = <PricePayload<
@@ -325,7 +328,7 @@ fn should_submit_unsigned_transaction_on_chain_for_all_accounts() {
 		let tx = pool_state.write().transactions.pop().unwrap();
 		let tx = Extrinsic::decode(&mut &*tx).unwrap();
 		assert_eq!(tx.signature, None);
-		if let Call::submit_price_unsigned_with_signed_payload(body, signature) = tx.call {
+		if let Call::Example(crate::Call::submit_price_unsigned_with_signed_payload(body, signature)) = tx.call {
 			assert_eq!(body, price_payload);
 
 			let signature_valid = <PricePayload<
@@ -360,7 +363,7 @@ fn should_submit_raw_unsigned_transaction_on_chain() {
 		assert!(pool_state.read().transactions.is_empty());
 		let tx = Extrinsic::decode(&mut &*tx).unwrap();
 		assert_eq!(tx.signature, None);
-		assert_eq!(tx.call, Call::submit_price_unsigned(1, 15523));
+		assert_eq!(tx.call, Call::Example(crate::Call::submit_price_unsigned(1, 15523)));
 	});
 }
 
diff --git a/frame/example-parallel/Cargo.toml b/frame/example-parallel/Cargo.toml
index 359a295b1687..24e51ba9ed3a 100644
--- a/frame/example-parallel/Cargo.toml
+++ b/frame/example-parallel/Cargo.toml
@@ -21,6 +21,9 @@ sp-runtime = { version = "2.0.0", default-features = false, path = "../../primit
 sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
 sp-tasks = { version = "2.0.0", default-features = false, path = "../../primitives/tasks" }
 
+[dev-dependencies]
+serde = { version = "1.0.101" }
+
 [features]
 default = ["std"]
 std = [
diff --git a/frame/example-parallel/src/tests.rs b/frame/example-parallel/src/tests.rs
index 4623de196df8..9c921e0ddfa8 100644
--- a/frame/example-parallel/src/tests.rs
+++ b/frame/example-parallel/src/tests.rs
@@ -15,23 +15,29 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::*;
+use crate::{self as pallet_example_parallel, *};
 
-use codec::{Encode, Decode};
-use frame_support::{impl_outer_origin, parameter_types};
+use frame_support::parameter_types;
 use sp_core::H256;
 use sp_runtime::{
-	Perbill,
-	testing::{Header},
+	Perbill, testing::Header,
 	traits::{BlakeTwo256, IdentityLookup},
 };
 
-impl_outer_origin! {
-	pub enum Origin for Test where system = frame_system {}
-}
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Example: pallet_example_parallel::{Module, Call, Storage, Event},
+	}
+);
 
-#[derive(Clone, Eq, PartialEq, Encode, Decode)]
-pub struct Test;
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
@@ -40,8 +46,8 @@ parameter_types! {
 impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
-	type Call = ();
-	type PalletInfo = ();
+	type Call = Call;
+	type PalletInfo = PalletInfo;
 	type Index = u64;
 	type BlockNumber = u64;
 	type Hash = H256;
@@ -49,7 +55,7 @@ impl frame_system::Config for Test {
 	type AccountId = sp_core::sr25519::Public;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type Header = Header;
-	type Event = ();
+	type Event = Event;
 	type BlockHashCount = BlockHashCount;
 	type DbWeight = ();
 	type BlockWeights = ();
@@ -69,12 +75,10 @@ parameter_types! {
 }
 
 impl Config for Test {
-	type Event = ();
-	type Call = Call<Test>;
+	type Event = Event;
+	type Call = Call;
 }
 
-type Example = Module<Test>;
-
 #[test]
 fn it_can_enlist() {
 	use sp_core::Pair;
diff --git a/frame/example/src/lib.rs b/frame/example/src/lib.rs
index cfb72a5c1560..335c277b7c2a 100644
--- a/frame/example/src/lib.rs
+++ b/frame/example/src/lib.rs
@@ -707,32 +707,35 @@ mod tests {
 	use super::*;
 
 	use frame_support::{
-		assert_ok, impl_outer_origin, parameter_types, impl_outer_dispatch,
+		assert_ok, parameter_types,
 		weights::{DispatchInfo, GetDispatchInfo}, traits::{OnInitialize, OnFinalize}
 	};
 	use sp_core::H256;
 	// The testing primitives are very useful for avoiding having to work with signatures
 	// or public keys. `u64` is used as the `AccountId` and no `Signature`s are required.
 	use sp_runtime::{
-		testing::Header,
+		testing::Header, BuildStorage,
 		traits::{BlakeTwo256, IdentityLookup},
 	};
-
-	impl_outer_origin! {
-		pub enum Origin for Test where system = frame_system {}
-	}
-
-	impl_outer_dispatch! {
-		pub enum OuterCall for Test where origin: Origin {
-			self::Example,
+	// Reexport crate as its pallet name for construct_runtime.
+	use crate as pallet_example;
+
+	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+	type Block = frame_system::mocking::MockBlock<Test>;
+
+	// For testing the pallet, we construct a mock runtime.
+	frame_support::construct_runtime!(
+		pub enum Test where
+			Block = Block,
+			NodeBlock = Block,
+			UncheckedExtrinsic = UncheckedExtrinsic,
+		{
+			System: frame_system::{Module, Call, Config, Storage, Event<T>},
+			Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
+			Example: pallet_example::{Module, Call, Storage, Config<T>, Event<T>},
 		}
-	}
+	);
 
-	// For testing the pallet, we construct most of a mock runtime. This means
-	// first constructing a configuration type (`Test`) which `impl`s each of the
-	// configuration traits of pallets we want to use.
-	#[derive(Clone, Eq, PartialEq)]
-	pub struct Test;
 	parameter_types! {
 		pub const BlockHashCount: u64 = 250;
 		pub BlockWeights: frame_system::limits::BlockWeights =
@@ -747,15 +750,15 @@ mod tests {
 		type Index = u64;
 		type BlockNumber = u64;
 		type Hash = H256;
-		type Call = OuterCall;
+		type Call = Call;
 		type Hashing = BlakeTwo256;
 		type AccountId = u64;
 		type Lookup = IdentityLookup<Self::AccountId>;
 		type Header = Header;
-		type Event = ();
+		type Event = Event;
 		type BlockHashCount = BlockHashCount;
 		type Version = ();
-		type PalletInfo = ();
+		type PalletInfo = PalletInfo;
 		type AccountData = pallet_balances::AccountData<u64>;
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
@@ -769,29 +772,29 @@ mod tests {
 		type MaxLocks = ();
 		type Balance = u64;
 		type DustRemoval = ();
-		type Event = ();
+		type Event = Event;
 		type ExistentialDeposit = ExistentialDeposit;
 		type AccountStore = System;
 		type WeightInfo = ();
 	}
 	impl Config for Test {
-		type Event = ();
+		type Event = Event;
 	}
-	type System = frame_system::Module<Test>;
-	type Example = Module<Test>;
 
 	// This function basically just builds a genesis storage key/value store according to
 	// our desired mockup.
 	pub fn new_test_ext() -> sp_io::TestExternalities {
-		let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-		// We use default for brevity, but you can configure as desired if needed.
-		pallet_balances::GenesisConfig::<Test>::default().assimilate_storage(&mut t).unwrap();
-		GenesisConfig::<Test>{
-			dummy: 42,
-			// we configure the map with (key, value) pairs.
-			bar: vec![(1, 2), (2, 3)],
-			foo: 24,
-		}.assimilate_storage(&mut t).unwrap();
+		let t = GenesisConfig {
+			// We use default for brevity, but you can configure as desired if needed.
+			frame_system: Some(Default::default()),
+			pallet_balances: Some(Default::default()),
+			pallet_example: Some(pallet_example::GenesisConfig {
+				dummy: 42,
+				// we configure the map with (key, value) pairs.
+				bar: vec![(1, 2), (2, 3)],
+				foo: 24,
+			}),
+		}.build_storage().unwrap();
 		t.into()
 	}
 
@@ -828,7 +831,7 @@ mod tests {
 	#[test]
 	fn signed_ext_watch_dummy_works() {
 		new_test_ext().execute_with(|| {
-			let call = <Call<Test>>::set_dummy(10).into();
+			let call = <pallet_example::Call<Test>>::set_dummy(10).into();
 			let info = DispatchInfo::default();
 
 			assert_eq!(
@@ -847,13 +850,13 @@ mod tests {
 	#[test]
 	fn weights_work() {
 		// must have a defined weight.
-		let default_call = <Call<Test>>::accumulate_dummy(10);
+		let default_call = <pallet_example::Call<Test>>::accumulate_dummy(10);
 		let info = default_call.get_dispatch_info();
 		// aka. `let info = <Call<Test> as GetDispatchInfo>::get_dispatch_info(&default_call);`
 		assert_eq!(info.weight, 0);
 
 		// must have a custom weight of `100 * arg = 2000`
-		let custom_call = <Call<Test>>::set_dummy(20);
+		let custom_call = <pallet_example::Call<Test>>::set_dummy(20);
 		let info = custom_call.get_dispatch_info();
 		assert_eq!(info.weight, 2000);
 	}
diff --git a/frame/grandpa/src/mock.rs b/frame/grandpa/src/mock.rs
index fd7230fd9ceb..4aeaa5a237a5 100644
--- a/frame/grandpa/src/mock.rs
+++ b/frame/grandpa/src/mock.rs
@@ -19,11 +19,11 @@
 
 #![cfg(test)]
 
-use crate::{AuthorityId, AuthorityList, ConsensusLog, Module, Config};
+use crate::{AuthorityId, AuthorityList, ConsensusLog, Config, self as pallet_grandpa};
 use ::grandpa as finality_grandpa;
 use codec::Encode;
 use frame_support::{
-	impl_outer_dispatch, impl_outer_event, impl_outer_origin, parameter_types,
+	parameter_types,
 	traits::{KeyOwnerProofSystem, OnFinalize, OnInitialize},
 	weights::Weight,
 };
@@ -40,17 +40,27 @@ use sp_runtime::{
 	DigestItem, Perbill,
 };
 use sp_staking::SessionIndex;
-
-impl_outer_origin! {
-	pub enum Origin for Test {}
-}
-
-impl_outer_dispatch! {
-	pub enum Call for Test where origin: Origin {
-		pallet_grandpa::Grandpa,
-		pallet_staking::Staking,
+use pallet_session::historical as pallet_session_historical;
+
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent},
+		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
+		Staking: pallet_staking::{Module, Call, Config<T>, Storage, Event<T>, ValidateUnsigned},
+		Session: pallet_session::{Module, Call, Storage, Event, Config<T>},
+		Grandpa: pallet_grandpa::{Module, Call, Storage, Config, Event, ValidateUnsigned},
+		Offences: pallet_offences::{Module, Call, Storage, Event},
+		Historical: pallet_session_historical::{Module},
 	}
-}
+);
 
 impl_opaque_keys! {
 	pub struct TestSessionKeys {
@@ -58,20 +68,6 @@ impl_opaque_keys! {
 	}
 }
 
-impl_outer_event! {
-	pub enum TestEvent for Test {
-		frame_system<T>,
-		pallet_balances<T>,
-		pallet_grandpa,
-		pallet_offences,
-		pallet_session,
-		pallet_staking<T>,
-	}
-}
-
-#[derive(Clone, Eq, PartialEq)]
-pub struct Test;
-
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 	pub BlockWeights: frame_system::limits::BlockWeights =
@@ -92,10 +88,10 @@ impl frame_system::Config for Test {
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type Header = Header;
-	type Event = TestEvent;
+	type Event = Event;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<u128>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -119,7 +115,7 @@ parameter_types! {
 
 /// Custom `SessionHandler` since we use `TestSessionKeys` as `Keys`.
 impl pallet_session::Config for Test {
-	type Event = TestEvent;
+	type Event = Event;
 	type ValidatorId = u64;
 	type ValidatorIdOf = pallet_staking::StashOf<Self>;
 	type ShouldEndSession = pallet_session::PeriodicSessions<Period, Offset>;
@@ -155,7 +151,7 @@ impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u128;
 	type DustRemoval = ();
-	type Event = TestEvent;
+	type Event = Event;
 	type ExistentialDeposit = ExistentialDeposit;
 	type AccountStore = System;
 	type WeightInfo = ();
@@ -197,7 +193,7 @@ parameter_types! {
 impl pallet_staking::Config for Test {
 	type RewardRemainder = ();
 	type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote;
-	type Event = TestEvent;
+	type Event = Event;
 	type Currency = Balances;
 	type Slash = ();
 	type Reward = ();
@@ -224,14 +220,14 @@ parameter_types! {
 }
 
 impl pallet_offences::Config for Test {
-	type Event = TestEvent;
+	type Event = Event;
 	type IdentificationTuple = pallet_session::historical::IdentificationTuple<Self>;
 	type OnOffenceHandler = Staking;
 	type WeightSoftLimit = OffencesWeightSoftLimit;
 }
 
 impl Config for Test {
-	type Event = TestEvent;
+	type Event = Event;
 	type Call = Call;
 
 	type KeyOwnerProofSystem = Historical;
@@ -249,19 +245,6 @@ impl Config for Test {
 	type WeightInfo = ();
 }
 
-mod pallet_grandpa {
-	pub use crate::Event;
-}
-
-pub type Balances = pallet_balances::Module<Test>;
-pub type Historical = pallet_session::historical::Module<Test>;
-pub type Offences = pallet_offences::Module<Test>;
-pub type Session = pallet_session::Module<Test>;
-pub type Staking = pallet_staking::Module<Test>;
-pub type System = frame_system::Module<Test>;
-pub type Timestamp = pallet_timestamp::Module<Test>;
-pub type Grandpa = Module<Test>;
-
 pub fn grandpa_log(log: ConsensusLog<u64>) -> DigestItem<H256> {
 	DigestItem::Consensus(GRANDPA_ENGINE_ID, log.encode())
 }
diff --git a/frame/grandpa/src/tests.rs b/frame/grandpa/src/tests.rs
index 0964be5993b0..cd5e0c3563bc 100644
--- a/frame/grandpa/src/tests.rs
+++ b/frame/grandpa/src/tests.rs
@@ -19,7 +19,7 @@
 
 #![cfg(test)]
 
-use super::{Call, *};
+use super::{Call, Event, *};
 use crate::mock::*;
 use codec::{Decode, Encode};
 use fg_primitives::ScheduledChange;
diff --git a/frame/session/benchmarking/src/mock.rs b/frame/session/benchmarking/src/mock.rs
index 711cde8e8ecf..b25b169c82ed 100644
--- a/frame/session/benchmarking/src/mock.rs
+++ b/frame/session/benchmarking/src/mock.rs
@@ -20,30 +20,28 @@
 #![cfg(test)]
 
 use sp_runtime::traits::IdentityLookup;
-use frame_support::{impl_outer_origin, impl_outer_dispatch, parameter_types};
+use frame_support::parameter_types;
 
 type AccountId = u64;
 type AccountIndex = u32;
 type BlockNumber = u64;
 type Balance = u64;
 
-type System = frame_system::Module<Test>;
-type Balances = pallet_balances::Module<Test>;
-type Staking = pallet_staking::Module<Test>;
-type Session = pallet_session::Module<Test>;
-
-impl_outer_origin! {
-	pub enum Origin for Test where system = frame_system {}
-}
-
-impl_outer_dispatch! {
-	pub enum Call for Test where origin: Origin {
-		pallet_staking::Staking,
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
+		Staking: pallet_staking::{Module, Call, Config<T>, Storage, Event<T>, ValidateUnsigned},
+		Session: pallet_session::{Module, Call, Storage, Event, Config<T>},
 	}
-}
-
-#[derive(Clone, Eq, PartialEq, Debug)]
-pub struct Test;
+);
 
 impl frame_system::Config for Test {
 	type BaseCallFilter = ();
@@ -59,10 +57,10 @@ impl frame_system::Config for Test {
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type Header = sp_runtime::testing::Header;
-	type Event = ();
+	type Event = Event;
 	type BlockHashCount = ();
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -75,7 +73,7 @@ parameter_types! {
 impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = Balance;
-	type Event = ();
+	type Event = Event;
 	type DustRemoval = ();
 	type ExistentialDeposit = ExistentialDeposit;
 	type AccountStore = System;
@@ -123,7 +121,7 @@ impl pallet_session::Config for Test {
 	type ShouldEndSession = pallet_session::PeriodicSessions<(), ()>;
 	type NextSessionRotation = pallet_session::PeriodicSessions<(), ()>;
 	type SessionHandler = TestSessionHandler;
-	type Event = ();
+	type Event = Event;
 	type ValidatorId = AccountId;
 	type ValidatorIdOf = pallet_staking::StashOf<Test>;
 	type DisabledValidatorsThreshold = ();
@@ -159,7 +157,7 @@ impl pallet_staking::Config for Test {
 	type UnixTime = pallet_timestamp::Module<Self>;
 	type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote;
 	type RewardRemainder = ();
-	type Event = ();
+	type Event = Event;
 	type Slash = ();
 	type Reward = ();
 	type SessionsPerEra = ();
diff --git a/frame/staking/fuzzer/Cargo.toml b/frame/staking/fuzzer/Cargo.toml
index 920f53c86939..9940adaa00fc 100644
--- a/frame/staking/fuzzer/Cargo.toml
+++ b/frame/staking/fuzzer/Cargo.toml
@@ -28,6 +28,12 @@ sp-io ={ version = "2.0.0", path = "../../../primitives/io" }
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
 sp-npos-elections = { version = "2.0.0", path = "../../../primitives/npos-elections" }
 sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
+serde = "1.0.101"
+
+[features]
+# Note feature std is required so that impl_opaque_keys derive serde.
+default = ["std"]
+std = []
 
 [[bin]]
 name = "submit_solution"
diff --git a/frame/staking/fuzzer/src/mock.rs b/frame/staking/fuzzer/src/mock.rs
index 75e67fa36518..88b001c7e69e 100644
--- a/frame/staking/fuzzer/src/mock.rs
+++ b/frame/staking/fuzzer/src/mock.rs
@@ -17,31 +17,29 @@
 
 //! Mock file for staking fuzzing.
 
-use frame_support::{impl_outer_origin, impl_outer_dispatch, parameter_types};
+use frame_support::parameter_types;
 
 type AccountId = u64;
 type AccountIndex = u32;
 type BlockNumber = u64;
 type Balance = u64;
 
-pub type System = frame_system::Module<Test>;
-pub type Balances = pallet_balances::Module<Test>;
-pub type Staking = pallet_staking::Module<Test>;
-pub type Indices = pallet_indices::Module<Test>;
-pub type Session = pallet_session::Module<Test>;
-
-impl_outer_origin! {
-	pub enum Origin for Test where system = frame_system {}
-}
-
-impl_outer_dispatch! {
-	pub enum Call for Test where origin: Origin {
-		staking::Staking,
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
+		Staking: pallet_staking::{Module, Call, Config<T>, Storage, Event<T>, ValidateUnsigned},
+		Indices: pallet_indices::{Module, Call, Storage, Config<T>, Event<T>},
+		Session: pallet_session::{Module, Call, Storage, Event, Config<T>},
 	}
-}
-
-#[derive(Clone, Eq, PartialEq, Debug)]
-pub struct Test;
+);
 
 impl frame_system::Config for Test {
 	type BaseCallFilter = ();
@@ -57,10 +55,10 @@ impl frame_system::Config for Test {
 	type AccountId = AccountId;
 	type Lookup = Indices;
 	type Header = sp_runtime::testing::Header;
-	type Event = ();
+	type Event = Event;
 	type BlockHashCount = ();
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
@@ -73,7 +71,7 @@ parameter_types! {
 impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = Balance;
-	type Event = ();
+	type Event = Event;
 	type DustRemoval = ();
 	type ExistentialDeposit = ExistentialDeposit;
 	type AccountStore = System;
@@ -81,7 +79,7 @@ impl pallet_balances::Config for Test {
 }
 impl pallet_indices::Config for Test {
 	type AccountIndex = AccountIndex;
-	type Event = ();
+	type Event = Event;
 	type Currency = Balances;
 	type Deposit = ();
 	type WeightInfo = ();
@@ -127,7 +125,7 @@ impl pallet_session::Config for Test {
 	type ShouldEndSession = pallet_session::PeriodicSessions<(), ()>;
 	type NextSessionRotation = pallet_session::PeriodicSessions<(), ()>;
 	type SessionHandler = TestSessionHandler;
-	type Event = ();
+	type Event = Event;
 	type ValidatorId = AccountId;
 	type ValidatorIdOf = pallet_staking::StashOf<Test>;
 	type DisabledValidatorsThreshold = ();
@@ -163,7 +161,7 @@ impl pallet_staking::Config for Test {
 	type UnixTime = pallet_timestamp::Module<Self>;
 	type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote;
 	type RewardRemainder = ();
-	type Event = ();
+	type Event = Event;
 	type Slash = ();
 	type Reward = ();
 	type SessionsPerEra = ();
diff --git a/frame/system/benches/bench.rs b/frame/system/benches/bench.rs
index 5bebeaf932b9..6ed3d456826c 100644
--- a/frame/system/benches/bench.rs
+++ b/frame/system/benches/bench.rs
@@ -17,7 +17,7 @@
 
 use criterion::{Criterion, criterion_group, criterion_main, black_box};
 use frame_system as system;
-use frame_support::{decl_module, decl_event, impl_outer_origin, impl_outer_event};
+use frame_support::{decl_module, decl_event};
 use sp_core::H256;
 use sp_runtime::{Perbill, traits::{BlakeTwo256, IdentityLookup}, testing::Header};
 
@@ -41,16 +41,19 @@ mod module {
 	);
 }
 
-impl_outer_origin!{
-	pub enum Origin for Runtime {}
-}
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
+type Block = frame_system::mocking::MockBlock<Runtime>;
 
-impl_outer_event! {
-	pub enum Event for Runtime {
-		system<T>,
-		module,
+frame_support::construct_runtime!(
+	pub enum Runtime where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Module: module::{Module, Call, Event},
 	}
-}
+);
 
 frame_support::parameter_types! {
 	pub const BlockHashCount: u64 = 250;
@@ -63,8 +66,6 @@ frame_support::parameter_types! {
 			4 * 1024 * 1024, Perbill::from_percent(75),
 		);
 }
-#[derive(Clone, Eq, PartialEq)]
-pub struct Runtime;
 impl system::Config for Runtime {
 	type BaseCallFilter = ();
 	type BlockWeights = ();
@@ -73,7 +74,7 @@ impl system::Config for Runtime {
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u64;
-	type Call = ();
+	type Call = Call;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
@@ -82,7 +83,7 @@ impl system::Config for Runtime {
 	type Event = Event;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
diff --git a/frame/system/benchmarking/src/mock.rs b/frame/system/benchmarking/src/mock.rs
index 87f9113a4931..edc5dfebbd10 100644
--- a/frame/system/benchmarking/src/mock.rs
+++ b/frame/system/benchmarking/src/mock.rs
@@ -20,35 +20,23 @@
 #![cfg(test)]
 
 use sp_runtime::traits::IdentityLookup;
-use frame_support::{
-	impl_outer_origin,
-	dispatch::{Dispatchable, DispatchInfo, PostDispatchInfo},
-};
 
 type AccountId = u64;
 type AccountIndex = u32;
 type BlockNumber = u64;
 
-impl_outer_origin! {
-	pub enum Origin for Test where system = frame_system {}
-}
-
-#[derive(Debug, codec::Encode, codec::Decode)]
-pub struct Call;
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
 
-impl Dispatchable for Call {
-	type Origin = ();
-	type Config = ();
-	type Info = DispatchInfo;
-	type PostInfo = PostDispatchInfo;
-	fn dispatch(self, _origin: Self::Origin)
-		-> sp_runtime::DispatchResultWithInfo<Self::PostInfo> {
-			panic!("Do not use dummy implementation for dispatch.");
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
 	}
-}
-
-#[derive(Clone, Eq, PartialEq, Debug)]
-pub struct Test;
+);
 
 impl frame_system::Config for Test {
 	type BaseCallFilter = ();
@@ -64,10 +52,10 @@ impl frame_system::Config for Test {
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type Header = sp_runtime::testing::Header;
-	type Event = ();
+	type Event = Event;
 	type BlockHashCount = ();
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
diff --git a/frame/system/src/extensions/check_mortality.rs b/frame/system/src/extensions/check_mortality.rs
index f1951baba5d5..1e8eb32a3d3c 100644
--- a/frame/system/src/extensions/check_mortality.rs
+++ b/frame/system/src/extensions/check_mortality.rs
@@ -110,7 +110,7 @@ mod tests {
 			let normal = DispatchInfo { weight: 100, class: DispatchClass::Normal, pays_fee: Pays::Yes };
 			let len = 0_usize;
 			let ext = (
-				crate::CheckWeight::<Test>::default(),
+				crate::CheckWeight::<Test>::new(),
 				CheckMortality::<Test>::from(Era::mortal(16, 256)),
 			);
 			System::set_block_number(17);
diff --git a/frame/system/src/mock.rs b/frame/system/src/mock.rs
index d67f00917fd0..2b31929b5da8 100644
--- a/frame/system/src/mock.rs
+++ b/frame/system/src/mock.rs
@@ -15,24 +15,27 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::*;
+use crate::{self as frame_system, *};
 use sp_std::cell::RefCell;
 use sp_core::H256;
 use sp_runtime::{
 	traits::{BlakeTwo256, IdentityLookup},
-	testing::Header,
-};
-use frame_support::{
-	impl_outer_origin, parameter_types,
-	weights::PostDispatchInfo,
+	testing::Header, BuildStorage,
 };
+use frame_support::parameter_types;
 
-impl_outer_origin! {
-	pub enum Origin for Test where system = super {}
-}
+type UncheckedExtrinsic = mocking::MockUncheckedExtrinsic<Test>;
+type Block = mocking::MockBlock<Test>;
 
-#[derive(Clone, Eq, PartialEq, Debug, Default)]
-pub struct Test;
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+	}
+);
 
 const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);
 const MAX_BLOCK_WEIGHT: Weight = 1024;
@@ -81,20 +84,6 @@ impl OnKilledAccount<u64> for RecordKilled {
 	fn on_killed_account(who: &u64) { KILLED.with(|r| r.borrow_mut().push(*who)) }
 }
 
-#[derive(Debug, codec::Encode, codec::Decode)]
-pub struct Call;
-
-impl Dispatchable for Call {
-	type Origin = Origin;
-	type Config = ();
-	type Info = DispatchInfo;
-	type PostInfo = PostDispatchInfo;
-	fn dispatch(self, _origin: Self::Origin)
-		-> sp_runtime::DispatchResultWithInfo<Self::PostInfo> {
-			panic!("Do not use dummy implementation for dispatch.");
-	}
-}
-
 impl Config for Test {
 	type BaseCallFilter = ();
 	type BlockWeights = RuntimeBlockWeights;
@@ -108,11 +97,11 @@ impl Config for Test {
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type Header = Header;
-	type Event = Event<Self>;
+	type Event = Event;
 	type BlockHashCount = BlockHashCount;
 	type DbWeight = DbWeight;
 	type Version = Version;
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = u32;
 	type OnNewAccount = ();
 	type OnKilledAccount = RecordKilled;
@@ -120,14 +109,15 @@ impl Config for Test {
 	type SS58Prefix = ();
 }
 
-pub type System = Module<Test>;
-pub type SysEvent = <Test as Config>::Event;
+pub type SysEvent = frame_system::Event<Test>;
 
-pub const CALL: &<Test as Config>::Call = &Call;
+/// A simple call, which one doesn't matter.
+pub const CALL: &<Test as Config>::Call = &Call::System(frame_system::Call::set_heap_pages(0u64));
 
 /// Create new externalities for `System` module tests.
 pub fn new_test_ext() -> sp_io::TestExternalities {
-	let mut ext: sp_io::TestExternalities = GenesisConfig::default().build_storage::<Test>().unwrap().into();
+	let mut ext: sp_io::TestExternalities = GenesisConfig::default()
+		.build_storage().unwrap().into();
 	// Add to each test the initial weight of a block
 	ext.execute_with(|| System::register_extra_weight_unchecked(
 		<Test as crate::Config>::BlockWeights::get().base_block,
diff --git a/frame/system/src/offchain.rs b/frame/system/src/offchain.rs
index 05a5882ee398..f2f446913c47 100644
--- a/frame/system/src/offchain.rs
+++ b/frame/system/src/offchain.rs
@@ -637,7 +637,7 @@ pub trait SignedPayload<T: SigningTypes>: Encode {
 mod tests {
 	use super::*;
 	use codec::Decode;
-	use crate::mock::{Test as TestRuntime, Call};
+	use crate::mock::{Test as TestRuntime, Call, CALL};
 	use sp_core::offchain::{testing, TransactionPoolExt};
 	use sp_runtime::testing::{UintAuthorityId, TestSignature, TestXt};
 
@@ -708,7 +708,7 @@ mod tests {
 						public: account.public.clone()
 					},
 					|_payload, _signature| {
-						Call
+						CALL.clone()
 					}
 				);
 
@@ -749,7 +749,7 @@ mod tests {
 						public: account.public.clone()
 					},
 					|_payload, _signature| {
-						Call
+						CALL.clone()
 					}
 				);
 
@@ -787,7 +787,7 @@ mod tests {
 						public: account.public.clone()
 					},
 					|_payload, _signature| {
-						Call
+						CALL.clone()
 					}
 				);
 
@@ -827,7 +827,7 @@ mod tests {
 						public: account.public.clone()
 					},
 					|_payload, _signature| {
-						Call
+						CALL.clone()
 					}
 				);
 
diff --git a/frame/system/src/tests.rs b/frame/system/src/tests.rs
index d1992a14e06a..ca17edcf4b22 100644
--- a/frame/system/src/tests.rs
+++ b/frame/system/src/tests.rs
@@ -71,7 +71,7 @@ fn deposit_event_should_work() {
 			vec![
 				EventRecord {
 					phase: Phase::Finalization,
-					event: SysEvent::CodeUpdated,
+					event: SysEvent::CodeUpdated.into(),
 					topics: vec![],
 				}
 			]
@@ -99,17 +99,17 @@ fn deposit_event_should_work() {
 			vec![
 				EventRecord {
 					phase: Phase::Initialization,
-					event: SysEvent::NewAccount(32),
+					event: SysEvent::NewAccount(32).into(),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::ApplyExtrinsic(0),
-					event: SysEvent::KilledAccount(42),
+					event: SysEvent::KilledAccount(42).into(),
 					topics: vec![]
 				},
 				EventRecord {
 					phase: Phase::ApplyExtrinsic(0),
-					event: SysEvent::ExtrinsicSuccess(Default::default()),
+					event: SysEvent::ExtrinsicSuccess(Default::default()).into(),
 					topics: vec![]
 				},
 				EventRecord {
@@ -117,12 +117,12 @@ fn deposit_event_should_work() {
 					event: SysEvent::ExtrinsicFailed(
 						DispatchError::BadOrigin.into(),
 						Default::default()
-					),
+					).into(),
 					topics: vec![]
 				},
 				EventRecord {
 					phase: Phase::Finalization,
-					event: SysEvent::NewAccount(3),
+					event: SysEvent::NewAccount(3).into(),
 					topics: vec![]
 				},
 			]
@@ -173,7 +173,7 @@ fn deposit_event_uses_actual_weight() {
 							weight: 300,
 							.. Default::default()
 						},
-					),
+					).into(),
 					topics: vec![]
 				},
 				EventRecord {
@@ -183,7 +183,7 @@ fn deposit_event_uses_actual_weight() {
 							weight: 1000,
 							.. Default::default()
 						},
-					),
+					).into(),
 					topics: vec![]
 				},
 				EventRecord {
@@ -193,7 +193,7 @@ fn deposit_event_uses_actual_weight() {
 							weight: 1000,
 							.. Default::default()
 						},
-					),
+					).into(),
 					topics: vec![]
 				},
 				EventRecord {
@@ -204,7 +204,7 @@ fn deposit_event_uses_actual_weight() {
 							weight: 999,
 							.. Default::default()
 						},
-					),
+					).into(),
 					topics: vec![]
 				},
 			]
@@ -232,9 +232,9 @@ fn deposit_event_topics() {
 		];
 
 		// We deposit a few events with different sets of topics.
-		System::deposit_event_indexed(&topics[0..3], SysEvent::NewAccount(1));
-		System::deposit_event_indexed(&topics[0..1], SysEvent::NewAccount(2));
-		System::deposit_event_indexed(&topics[1..2], SysEvent::NewAccount(3));
+		System::deposit_event_indexed(&topics[0..3], SysEvent::NewAccount(1).into());
+		System::deposit_event_indexed(&topics[0..1], SysEvent::NewAccount(2).into());
+		System::deposit_event_indexed(&topics[1..2], SysEvent::NewAccount(3).into());
 
 		System::finalize();
 
@@ -244,17 +244,17 @@ fn deposit_event_topics() {
 			vec![
 				EventRecord {
 					phase: Phase::Finalization,
-					event: SysEvent::NewAccount(1),
+					event: SysEvent::NewAccount(1).into(),
 					topics: topics[0..3].to_vec(),
 				},
 				EventRecord {
 					phase: Phase::Finalization,
-					event: SysEvent::NewAccount(2),
+					event: SysEvent::NewAccount(2).into(),
 					topics: topics[0..1].to_vec(),
 				},
 				EventRecord {
 					phase: Phase::Finalization,
-					event: SysEvent::NewAccount(3),
+					event: SysEvent::NewAccount(3).into(),
 					topics: topics[1..2].to_vec(),
 				}
 			]
@@ -375,7 +375,7 @@ fn set_code_with_real_wasm_blob() {
 			System::events(),
 			vec![EventRecord {
 				phase: Phase::Initialization,
-				event: SysEvent::CodeUpdated,
+				event: SysEvent::CodeUpdated.into(),
 				topics: vec![],
 			}],
 		);

From bbc7b0ec209c2db87d6d9ef500169a28a0f17f3e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Feb 2021 13:03:05 +0000
Subject: [PATCH 0373/1194] Bump wasmtime from 0.19.0 to 0.22.0 (#7865)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Bump wasmtime from 0.19.0 to 0.22.0

Bumps [wasmtime](https://github.com/bytecodealliance/wasmtime) from 0.19.0 to 0.22.0.
- [Release notes](https://github.com/bytecodealliance/wasmtime/releases)
- [Changelog](https://github.com/bytecodealliance/wasmtime/blob/main/docs/WASI-some-possible-changes.md)
- [Commits](https://github.com/bytecodealliance/wasmtime/compare/v0.19.0...v0.22.0)

Signed-off-by: dependabot[bot] <support@github.com>

* Account for ImportType::name() being an Optional

* Account for parameters being a impl Iterator now

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alexander Theißen <alex.theissen@me.com>
Co-authored-by: Bastian Köcher <info@kchr.de>
---
 Cargo.lock                                    | 261 +++++++++++-------
 client/executor/wasmtime/Cargo.toml           |   2 +-
 client/executor/wasmtime/src/imports.rs       |  60 ++--
 .../executor/wasmtime/src/instance_wrapper.rs |  37 +--
 4 files changed, 210 insertions(+), 150 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b02baa306479..d4bafddb7bd9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -16,7 +16,7 @@ version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7"
 dependencies = [
- "gimli 0.23.0",
+ "gimli",
 ]
 
 [[package]]
@@ -889,6 +889,16 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
 
+[[package]]
+name = "cpp_demangle"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44919ecaf6f99e8e737bc239408931c9a01e9a6c74814fee8242dd2506b65390"
+dependencies = [
+ "cfg-if 1.0.0",
+ "glob",
+]
+
 [[package]]
 name = "cpuid-bool"
 version = "0.1.2"
@@ -903,25 +913,25 @@ checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba"
 
 [[package]]
 name = "cranelift-bforest"
-version = "0.66.0"
+version = "0.69.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dcc286b052ee24a1e5a222e7c1125e6010ad35b0f248709b9b3737a8fedcfdf"
+checksum = "4066fd63b502d73eb8c5fa6bcab9c7962b05cd580f6b149ee83a8e730d8ce7fb"
 dependencies = [
  "cranelift-entity",
 ]
 
 [[package]]
 name = "cranelift-codegen"
-version = "0.66.0"
+version = "0.69.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d9badfe36176cb653506091693bc2bb1970c9bddfcd6ec7fac404f7eaec6f38"
+checksum = "1a54e4beb833a3c873a18a8fe735d73d732044004c7539a072c8faa35ccb0c60"
 dependencies = [
  "byteorder",
  "cranelift-bforest",
  "cranelift-codegen-meta",
  "cranelift-codegen-shared",
  "cranelift-entity",
- "gimli 0.21.0",
+ "gimli",
  "log",
  "regalloc",
  "serde",
@@ -932,9 +942,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-codegen-meta"
-version = "0.66.0"
+version = "0.69.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c3f460031861e4f4ad510be62b2ae50bba6cc886b598a36f9c0a970feab9598"
+checksum = "c54cac7cacb443658d8f0ff36a3545822613fa202c946c0891897843bc933810"
 dependencies = [
  "cranelift-codegen-shared",
  "cranelift-entity",
@@ -942,24 +952,24 @@ dependencies = [
 
 [[package]]
 name = "cranelift-codegen-shared"
-version = "0.66.0"
+version = "0.69.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76ad12409e922e7697cd0bdc7dc26992f64a77c31880dfe5e3c7722f4710206d"
+checksum = "a109760aff76788b2cdaeefad6875a73c2b450be13906524f6c2a81e05b8d83c"
 
 [[package]]
 name = "cranelift-entity"
-version = "0.66.0"
+version = "0.69.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d97cdc58972ea065d107872cfb9079f4c92ade78a8af85aaff519a65b5d13f71"
+checksum = "3b044234aa32531f89a08b487630ddc6744696ec04c8123a1ad388de837f5de3"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "cranelift-frontend"
-version = "0.66.0"
+version = "0.69.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ef419efb4f94ecc02e5d9fbcc910d2bb7f0040e2de570e63a454f883bc891d6"
+checksum = "5452b3e4e97538ee5ef2cc071301c69a86c7adf2770916b9d04e9727096abd93"
 dependencies = [
  "cranelift-codegen",
  "log",
@@ -969,9 +979,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-native"
-version = "0.66.0"
+version = "0.69.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e69d44d59826eef6794066ac2c0f4ad3975f02d97030c60dbc04e3886adf36e"
+checksum = "f68035c10b2e80f26cc29c32fa824380877f38483504c2a47b54e7da311caaf3"
 dependencies = [
  "cranelift-codegen",
  "raw-cpuid",
@@ -980,17 +990,19 @@ dependencies = [
 
 [[package]]
 name = "cranelift-wasm"
-version = "0.66.0"
+version = "0.69.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "979df666b1304624abe99738e9e0e7c7479ee5523ba4b8b237df9ff49996acbb"
+checksum = "a530eb9d1c95b3309deb24c3d179d8b0ba5837ed98914a429787c395f614949d"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
  "cranelift-frontend",
+ "itertools 0.9.0",
  "log",
  "serde",
+ "smallvec 1.6.1",
  "thiserror",
- "wasmparser 0.59.0",
+ "wasmparser",
 ]
 
 [[package]]
@@ -1299,21 +1311,21 @@ dependencies = [
 
 [[package]]
 name = "directories"
-version = "2.0.2"
+version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c"
+checksum = "f8fed639d60b58d0f53498ab13d26f621fd77569cc6edb031f4cc36a2ad9da0f"
 dependencies = [
- "cfg-if 0.1.10",
  "dirs-sys",
 ]
 
 [[package]]
-name = "directories"
-version = "3.0.1"
+name = "directories-next"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8fed639d60b58d0f53498ab13d26f621fd77569cc6edb031f4cc36a2ad9da0f"
+checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc"
 dependencies = [
- "dirs-sys",
+ "cfg-if 1.0.0",
+ "dirs-sys-next",
 ]
 
 [[package]]
@@ -1323,7 +1335,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a"
 dependencies = [
  "libc",
- "redox_users",
+ "redox_users 0.3.5",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "dirs-sys-next"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
+dependencies = [
+ "libc",
+ "redox_users 0.4.0",
  "winapi 0.3.9",
 ]
 
@@ -2116,21 +2139,15 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.21.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcc8e0c9bce37868955864dbecd2b1ab2bdf967e6f28066d65aaac620444b65c"
+checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
 dependencies = [
  "fallible-iterator",
  "indexmap",
  "stable_deref_trait",
 ]
 
-[[package]]
-name = "gimli"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
-
 [[package]]
 name = "glob"
 version = "0.3.0"
@@ -4318,19 +4335,12 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cbca9424c482ee628fa549d9c812e2cd22f1180b9222c9200fdfa6eb31aecb2"
-
-[[package]]
-name = "object"
-version = "0.20.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5"
+checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397"
 dependencies = [
  "crc32fast",
  "indexmap",
- "wasmparser 0.57.0",
 ]
 
 [[package]]
@@ -5984,6 +5994,15 @@ dependencies = [
  "prost",
 ]
 
+[[package]]
+name = "psm"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3abf49e5417290756acfd26501536358560c4a5cc4a0934d390939acb3e7083a"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "pwasm-utils"
 version = "0.14.0"
@@ -6195,9 +6214,9 @@ dependencies = [
 
 [[package]]
 name = "raw-cpuid"
-version = "7.0.4"
+version = "8.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "beb71f708fe39b2c5e98076204c3cc094ee5a4c12c4cdb119a2b72dc34164f41"
+checksum = "1fdf7d9dbd43f3d81d94a49c1c3df73cc2b3827995147e6cf7f89d4ec5483e73"
 dependencies = [
  "bitflags",
  "cc",
@@ -6270,6 +6289,16 @@ dependencies = [
  "rust-argon2",
 ]
 
+[[package]]
+name = "redox_users"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
+dependencies = [
+ "getrandom 0.2.2",
+ "redox_syscall 0.2.4",
+]
+
 [[package]]
 name = "ref-cast"
 version = "1.0.6"
@@ -6292,9 +6321,9 @@ dependencies = [
 
 [[package]]
 name = "regalloc"
-version = "0.0.27"
+version = "0.0.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9ba8aaf5fe7cf307c6dbdaeed85478961d29e25e3bee5169e11b92fa9f027a8"
+checksum = "571f7f397d61c4755285cd37853fe8e03271c243424a907415909379659381c5"
 dependencies = [
  "log",
  "rustc-hash",
@@ -7478,7 +7507,7 @@ name = "sc-service"
 version = "0.8.1"
 dependencies = [
  "async-std",
- "directories 3.0.1",
+ "directories",
  "exit-future",
  "futures 0.1.30",
  "futures 0.3.12",
@@ -9292,9 +9321,9 @@ checksum = "36474e732d1affd3a6ed582781b3683df3d0563714c59c39591e8ff707cf078e"
 
 [[package]]
 name = "target-lexicon"
-version = "0.10.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab0e7238dcc7b40a7be719a25365910f6807bd864f4cce6b2e6b873658e2b19d"
+checksum = "4ee5a98e506fb7231a304c3a1bd7c132a55016cf65001e0282480665870dfcb9"
 
 [[package]]
 name = "tempfile"
@@ -10259,33 +10288,31 @@ dependencies = [
 
 [[package]]
 name = "wasmparser"
-version = "0.57.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32fddd575d477c6e9702484139cf9f23dcd554b06d185ed0f56c857dd3a47aa6"
-
-[[package]]
-name = "wasmparser"
-version = "0.59.0"
+version = "0.71.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a950e6a618f62147fd514ff445b2a0b53120d382751960797f85f058c7eda9b9"
+checksum = "89a30c99437829ede826802bfcf28500cf58df00e66cb9114df98813bc145ff1"
 
 [[package]]
 name = "wasmtime"
-version = "0.19.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd3c4f449382779ef6e0a7c3ec6752ae614e20a42e4100000c3efdc973100e2"
+checksum = "7426055cb92bd9a1e9469b48154d8d6119cd8c498c8b70284e420342c05dc45d"
 dependencies = [
  "anyhow",
  "backtrace",
- "cfg-if 0.1.10",
- "lazy_static",
+ "bincode",
+ "cfg-if 1.0.0",
+ "cpp_demangle",
+ "indexmap",
  "libc",
  "log",
  "region",
  "rustc-demangle",
+ "serde",
  "smallvec 1.6.1",
  "target-lexicon",
- "wasmparser 0.59.0",
+ "wasmparser",
+ "wasmtime-cache",
  "wasmtime-environ",
  "wasmtime-jit",
  "wasmtime-profiling",
@@ -10294,74 +10321,101 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "wasmtime-cache"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c01d9287e36921e46f5887a47007824ae5dbb9b7517a2d565660ab4471478709"
+dependencies = [
+ "anyhow",
+ "base64 0.13.0",
+ "bincode",
+ "directories-next",
+ "errno",
+ "file-per-thread-logger",
+ "libc",
+ "log",
+ "serde",
+ "sha2 0.9.3",
+ "toml",
+ "winapi 0.3.9",
+ "zstd",
+]
+
+[[package]]
+name = "wasmtime-cranelift"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4134ed3a4316cd0de0e546c6004850afe472b0fa3fcdc2f2c15f8d449562d962"
+dependencies = [
+ "cranelift-codegen",
+ "cranelift-entity",
+ "cranelift-frontend",
+ "cranelift-wasm",
+ "wasmtime-environ",
+]
+
 [[package]]
 name = "wasmtime-debug"
-version = "0.19.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e634af9067a3af6cf2c7d33dc3b84767ddaf5d010ba68e80eecbcea73d4a349"
+checksum = "e91fa931df6dd8af2b02606307674d3bad23f55473d5f4c809dddf7e4c4dc411"
 dependencies = [
  "anyhow",
- "gimli 0.21.0",
+ "gimli",
  "more-asserts",
- "object 0.20.0",
+ "object 0.22.0",
  "target-lexicon",
  "thiserror",
- "wasmparser 0.59.0",
+ "wasmparser",
  "wasmtime-environ",
 ]
 
 [[package]]
 name = "wasmtime-environ"
-version = "0.19.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f85619a94ee4034bd5bb87fc3dcf71fd2237b81c840809da1201061eec9ab3"
+checksum = "a1098871dc3120aaf8190d79153e470658bb79f63ee9ca31716711e123c28220"
 dependencies = [
  "anyhow",
- "base64 0.12.3",
- "bincode",
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "cranelift-codegen",
  "cranelift-entity",
- "cranelift-frontend",
  "cranelift-wasm",
- "directories 2.0.2",
- "errno",
- "file-per-thread-logger",
+ "gimli",
  "indexmap",
- "libc",
  "log",
  "more-asserts",
- "rayon",
  "serde",
- "sha2 0.8.2",
  "thiserror",
- "toml",
- "wasmparser 0.59.0",
- "winapi 0.3.9",
- "zstd",
+ "wasmparser",
 ]
 
 [[package]]
 name = "wasmtime-jit"
-version = "0.19.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e914c013c7a9f15f4e429d5431f2830fb8adb56e40567661b69c5ec1d645be23"
+checksum = "738bfcd1561ede8bb174215776fd7d9a95d5f0a47ca3deabe0282c55f9a89f68"
 dependencies = [
+ "addr2line",
  "anyhow",
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "cranelift-codegen",
  "cranelift-entity",
  "cranelift-frontend",
  "cranelift-native",
  "cranelift-wasm",
- "gimli 0.21.0",
+ "gimli",
  "log",
  "more-asserts",
- "object 0.20.0",
+ "object 0.22.0",
+ "rayon",
  "region",
+ "serde",
  "target-lexicon",
  "thiserror",
- "wasmparser 0.59.0",
+ "wasmparser",
+ "wasmtime-cranelift",
  "wasmtime-debug",
  "wasmtime-environ",
  "wasmtime-obj",
@@ -10372,13 +10426,13 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-obj"
-version = "0.19.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e81d8e02e9bc9fe2da9b6d48bbc217f96e089f7df613f11a28a3958abc44641e"
+checksum = "3e96d77f1801131c5e86d93e42a3cf8a35402107332c202c245c83f34888a906"
 dependencies = [
  "anyhow",
  "more-asserts",
- "object 0.20.0",
+ "object 0.22.0",
  "target-lexicon",
  "wasmtime-debug",
  "wasmtime-environ",
@@ -10386,16 +10440,16 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-profiling"
-version = "0.19.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e8d4d1af8dd5f7096cfcc89dd668d358e52980c38cce199643372ffd6590e27"
+checksum = "60bb672c9d894776d7b9250dd9b4fe890f8760201ee4f53e5f2da772b6c4debb"
 dependencies = [
  "anyhow",
- "cfg-if 0.1.10",
- "gimli 0.21.0",
+ "cfg-if 1.0.0",
+ "gimli",
  "lazy_static",
  "libc",
- "object 0.19.0",
+ "object 0.22.0",
  "scroll",
  "serde",
  "target-lexicon",
@@ -10405,19 +10459,20 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-runtime"
-version = "0.19.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a25f140bbbaadb07c531cba99ce1a966dba216138dc1b2a0ddecec851a01a93"
+checksum = "a978086740949eeedfefcee667b57a9e98d9a7fc0de382fcfa0da30369e3530d"
 dependencies = [
  "backtrace",
  "cc",
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "indexmap",
  "lazy_static",
  "libc",
  "log",
- "memoffset 0.5.6",
+ "memoffset 0.6.1",
  "more-asserts",
+ "psm",
  "region",
  "thiserror",
  "wasmtime-environ",
diff --git a/client/executor/wasmtime/Cargo.toml b/client/executor/wasmtime/Cargo.toml
index dcd162c900fb..0ffed7ade7e4 100644
--- a/client/executor/wasmtime/Cargo.toml
+++ b/client/executor/wasmtime/Cargo.toml
@@ -22,7 +22,7 @@ sp-wasm-interface = { version = "2.0.0", path = "../../../primitives/wasm-interf
 sp-runtime-interface = { version = "2.0.0", path = "../../../primitives/runtime-interface" }
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
 sp-allocator = { version = "2.0.0", path = "../../../primitives/allocator" }
-wasmtime = "0.19"
+wasmtime = "0.22"
 pwasm-utils = "0.14.0"
 
 [dev-dependencies]
diff --git a/client/executor/wasmtime/src/imports.rs b/client/executor/wasmtime/src/imports.rs
index b5eaeae5e66c..08cedd434e36 100644
--- a/client/executor/wasmtime/src/imports.rs
+++ b/client/executor/wasmtime/src/imports.rs
@@ -44,15 +44,17 @@ pub fn resolve_imports(
 	let mut externs = vec![];
 	let mut memory_import_index = None;
 	for import_ty in module.imports() {
+		let name = import_name(&import_ty)?;
+
 		if import_ty.module() != "env" {
 			return Err(WasmError::Other(format!(
 				"host doesn't provide any imports from non-env module: {}:{}",
 				import_ty.module(),
-				import_ty.name()
+				name,
 			)));
 		}
 
-		let resolved = match import_ty.name() {
+		let resolved = match name {
 			"memory" => {
 				memory_import_index = Some(externs.len());
 				resolve_memory_import(store, &import_ty, heap_pages)?
@@ -72,6 +74,16 @@ pub fn resolve_imports(
 	})
 }
 
+/// When the module linking proposal is supported the import's name can be `None`.
+/// Because we are not using this proposal we could safely unwrap the name.
+/// However, we opt for an error in order to avoid panics at all costs.
+fn import_name<'a, 'b: 'a>(import: &'a ImportType<'b>) -> Result<&'a str, WasmError> {
+	let name = import.name().ok_or_else(||
+		WasmError::Other("The module linking proposal is not supported.".to_owned())
+	)?;
+	Ok(name)
+}
+
 fn resolve_memory_import(
 	store: &Store,
 	import_ty: &ImportType,
@@ -83,7 +95,7 @@ fn resolve_memory_import(
 			return Err(WasmError::Other(format!(
 				"this import must be of memory type: {}:{}",
 				import_ty.module(),
-				import_ty.name()
+				import_name(&import_ty)?,
 			)))
 		}
 	};
@@ -116,49 +128,46 @@ fn resolve_func_import(
 	host_functions: &[&'static dyn Function],
 	allow_missing_func_imports: bool,
 ) -> Result<Extern, WasmError> {
+	let name = import_name(&import_ty)?;
+
 	let func_ty = match import_ty.ty() {
 		ExternType::Func(func_ty) => func_ty,
 		_ => {
 			return Err(WasmError::Other(format!(
 				"host doesn't provide any non function imports besides 'memory': {}:{}",
 				import_ty.module(),
-				import_ty.name()
+				name,
 			)));
 		}
 	};
 
 	let host_func = match host_functions
 		.iter()
-		.find(|host_func| host_func.name() == import_ty.name())
+		.find(|host_func| host_func.name() == name)
 	{
 		Some(host_func) => host_func,
 		None if allow_missing_func_imports => {
-			return Ok(MissingHostFuncHandler::new(import_ty).into_extern(store, &func_ty));
+			return Ok(MissingHostFuncHandler::new(import_ty)?.into_extern(store, &func_ty));
 		}
 		None => {
 			return Err(WasmError::Other(format!(
 				"host doesn't provide such function: {}:{}",
 				import_ty.module(),
-				import_ty.name()
+				name,
 			)));
 		}
 	};
-	if !signature_matches(&func_ty, &wasmtime_func_sig(*host_func)) {
+	if &func_ty != &wasmtime_func_sig(*host_func) {
 		return Err(WasmError::Other(format!(
 			"signature mismatch for: {}:{}",
 			import_ty.module(),
-			import_ty.name()
+			name,
 		)));
 	}
 
 	Ok(HostFuncHandler::new(*host_func).into_extern(store))
 }
 
-/// Returns `true` if `lhs` and `rhs` represent the same signature.
-fn signature_matches(lhs: &wasmtime::FuncType, rhs: &wasmtime::FuncType) -> bool {
-	lhs.params() == rhs.params() && lhs.results() == rhs.results()
-}
-
 /// This structure implements `Callable` and acts as a bridge between wasmtime and
 /// substrate host functions.
 struct HostFuncHandler {
@@ -243,11 +252,11 @@ struct MissingHostFuncHandler {
 }
 
 impl MissingHostFuncHandler {
-	fn new(import_ty: &ImportType) -> Self {
-		Self {
+	fn new(import_ty: &ImportType) -> Result<Self, WasmError> {
+		Ok(Self {
 			module: import_ty.module().to_string(),
-			name: import_ty.name().to_string(),
-		}
+			name: import_name(import_ty)?.to_string(),
+		})
 	}
 
 	fn into_extern(self, store: &Store, func_ty: &FuncType) -> Extern {
@@ -263,22 +272,17 @@ impl MissingHostFuncHandler {
 }
 
 fn wasmtime_func_sig(func: &dyn Function) -> wasmtime::FuncType {
-	let params = func
-		.signature()
+	let signature = func.signature();
+	let params = signature
 		.args
 		.iter()
 		.cloned()
-		.map(into_wasmtime_val_type)
-		.collect::<Vec<_>>()
-		.into_boxed_slice();
-	let results = func
-		.signature()
+		.map(into_wasmtime_val_type);
+	let results = signature
 		.return_value
 		.iter()
 		.cloned()
-		.map(into_wasmtime_val_type)
-		.collect::<Vec<_>>()
-		.into_boxed_slice();
+		.map(into_wasmtime_val_type);
 	wasmtime::FuncType::new(params, results)
 }
 
diff --git a/client/executor/wasmtime/src/instance_wrapper.rs b/client/executor/wasmtime/src/instance_wrapper.rs
index 2103ab9b7b98..f0543a7ef950 100644
--- a/client/executor/wasmtime/src/instance_wrapper.rs
+++ b/client/executor/wasmtime/src/instance_wrapper.rs
@@ -113,7 +113,7 @@ impl EntryPoint {
 				])
 			},
 		})
-			.map(|results| 
+			.map(|results|
 				// the signature is checked to have i64 return type
 				results[0].unwrap_i64() as u64
 			)
@@ -124,27 +124,28 @@ impl EntryPoint {
 	}
 
 	pub fn direct(func: wasmtime::Func) -> std::result::Result<Self, &'static str> {
-		match (func.ty().params(), func.ty().results()) {
-			(&[wasmtime::ValType::I32, wasmtime::ValType::I32], &[wasmtime::ValType::I64]) => {
-				Ok(Self { func, call_type: EntryPointType::Direct })
-			}
-			_ => {
-				Err("Invalid signature for direct entry point")
-			}
+		use wasmtime::ValType;
+		let entry_point = wasmtime::FuncType::new(
+			[ValType::I32, ValType::I32].iter().cloned(),
+			[ValType::I64].iter().cloned(),
+		);
+		if func.ty() == entry_point {
+			Ok(Self { func, call_type: EntryPointType::Direct })
+		} else {
+			Err("Invalid signature for direct entry point")
 		}
 	}
 
 	pub fn wrapped(dispatcher: wasmtime::Func, func: u32) -> std::result::Result<Self, &'static str> {
-		match (dispatcher.ty().params(), dispatcher.ty().results()) {
-			(
-				&[wasmtime::ValType::I32, wasmtime::ValType::I32, wasmtime::ValType::I32],
-				&[wasmtime::ValType::I64],
-			) => {
-				Ok(Self { func: dispatcher, call_type: EntryPointType::Wrapped(func) })
-			},
-			_ => {
-				Err("Invalid signature for wrapped entry point")
-			}
+		use wasmtime::ValType;
+		let entry_point = wasmtime::FuncType::new(
+			[ValType::I32, ValType::I32, ValType::I32].iter().cloned(),
+			[ValType::I64].iter().cloned(),
+		);
+		if dispatcher.ty() == entry_point {
+			Ok(Self { func: dispatcher, call_type: EntryPointType::Wrapped(func) })
+		} else {
+			Err("Invalid signature for wrapped entry point")
 		}
 	}
 }

From 29aca981db5e8bf8b5538e6c7920ded917013ef3 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Mon, 8 Feb 2021 14:44:34 +0100
Subject: [PATCH 0374/1194] Remove backwards-compatibility networking hack
 (#8068)

* Remove backwards-compatibility networking hack

* Fix compilation

* Try fix
---
 client/finality-grandpa/src/lib.rs |  6 +++---
 client/network/src/protocol.rs     | 13 ++++++-------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/client/finality-grandpa/src/lib.rs b/client/finality-grandpa/src/lib.rs
index c7f7c8517b95..c5ac1189e943 100644
--- a/client/finality-grandpa/src/lib.rs
+++ b/client/finality-grandpa/src/lib.rs
@@ -676,10 +676,10 @@ pub fn grandpa_peers_set_config() -> sc_network::config::NonDefaultSetConfig {
 		// Notifications reach ~256kiB in size at the time of writing on Kusama and Polkadot.
 		max_notification_size: 1024 * 1024,
 		set_config: sc_network::config::SetConfig {
-			in_peers: 25,
-			out_peers: 25,
+			in_peers: 0,
+			out_peers: 0,
 			reserved_nodes: Vec::new(),
-			non_reserved_mode: sc_network::config::NonReservedPeerMode::Accept,
+			non_reserved_mode: sc_network::config::NonReservedPeerMode::Deny,
 		},
 	}
 }
diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index 60b6a02cc7ba..4997bc36e53e 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -424,12 +424,11 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 			// The `reserved_nodes` of this set are later kept in sync with the peers we connect
 			// to through set 0.
 			sets.push(sc_peerset::SetConfig {
-				in_peers: network_config.default_peers_set.in_peers,
-				out_peers: network_config.default_peers_set.out_peers,
+				in_peers: 0,
+				out_peers: 0,
 				bootnodes: Vec::new(),
-				reserved_nodes: default_sets_reserved,
-				reserved_only: network_config.default_peers_set.non_reserved_mode
-					== config::NonReservedPeerMode::Deny,
+				reserved_nodes: HashSet::new(),
+				reserved_only: true,
 			});
 
 			for set_cfg in &network_config.extra_sets {
@@ -1698,7 +1697,7 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 
 							if self.on_sync_peer_connected(peer_id.clone(), handshake).is_ok() {
 								// Set 1 is kept in sync with the connected peers of set 0.
-								self.peerset_handle.add_to_peers_set(
+								self.peerset_handle.add_reserved_peer(
 									HARDCODED_PEERSETS_TX,
 									peer_id.clone()
 								);
@@ -1722,7 +1721,7 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 								Ok(handshake) => {
 									if self.on_sync_peer_connected(peer_id.clone(), handshake).is_ok() {
 										// Set 1 is kept in sync with the connected peers of set 0.
-										self.peerset_handle.add_to_peers_set(
+										self.peerset_handle.add_reserved_peer(
 											HARDCODED_PEERSETS_TX,
 											peer_id.clone()
 										);

From 07a5f2984654a5b8050ec0c0df69b8f081aa75e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 9 Feb 2021 13:31:44 +0100
Subject: [PATCH 0375/1194] Switch to latest `impl-trait-for-tuples` (#8082)

Switches to the latest version everywhere now, as I fixed the problems
in the crate ;)
---
 Cargo.lock                              | 39 +++++++++----------------
 client/chain-spec/Cargo.toml            |  2 +-
 frame/authorship/Cargo.toml             |  2 +-
 frame/session/Cargo.toml                |  2 +-
 frame/session/src/lib.rs                |  4 +--
 frame/support/Cargo.toml                |  2 +-
 frame/system/Cargo.toml                 |  2 +-
 frame/timestamp/Cargo.toml              |  2 +-
 frame/treasury/Cargo.toml               |  2 +-
 primitives/runtime-interface/Cargo.toml |  2 +-
 primitives/runtime/Cargo.toml           |  2 +-
 primitives/timestamp/Cargo.toml         |  2 +-
 primitives/wasm-interface/Cargo.toml    |  2 +-
 13 files changed, 26 insertions(+), 39 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d4bafddb7bd9..587d9af1a213 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1736,7 +1736,7 @@ dependencies = [
  "frame-metadata",
  "frame-support-procedural",
  "frame-system",
- "impl-trait-for-tuples 0.2.0",
+ "impl-trait-for-tuples",
  "log",
  "once_cell",
  "parity-scale-codec",
@@ -1815,7 +1815,7 @@ version = "2.0.1"
 dependencies = [
  "criterion",
  "frame-support",
- "impl-trait-for-tuples 0.2.0",
+ "impl-trait-for-tuples",
  "parity-scale-codec",
  "serde",
  "sp-core",
@@ -2562,20 +2562,9 @@ dependencies = [
 
 [[package]]
 name = "impl-trait-for-tuples"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef5550a42e3740a0e71f909d4c861056a284060af885ae7aa6242820f920d9d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "impl-trait-for-tuples"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f65a8ecf74feeacdab8d38cb129e550ca871cccaa7d1921d8636ecd75534903"
+checksum = "d5dacb10c5b3bb92d46ba347505a9041e676bb20ad220101326bffb0c93031ee"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4476,7 +4465,7 @@ version = "2.0.1"
 dependencies = [
  "frame-support",
  "frame-system",
- "impl-trait-for-tuples 0.2.0",
+ "impl-trait-for-tuples",
  "parity-scale-codec",
  "serde",
  "sp-authorship",
@@ -5065,7 +5054,7 @@ version = "2.0.1"
 dependencies = [
  "frame-support",
  "frame-system",
- "impl-trait-for-tuples 0.1.3",
+ "impl-trait-for-tuples",
  "lazy_static",
  "pallet-timestamp",
  "parity-scale-codec",
@@ -5215,7 +5204,7 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "impl-trait-for-tuples 0.2.0",
+ "impl-trait-for-tuples",
  "parity-scale-codec",
  "serde",
  "sp-core",
@@ -5295,7 +5284,7 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "impl-trait-for-tuples 0.2.0",
+ "impl-trait-for-tuples",
  "pallet-balances",
  "parity-scale-codec",
  "serde",
@@ -5433,7 +5422,7 @@ checksum = "664a8c6b8e62d8f9f2f937e391982eb433ab285b4cd9545b342441e04a906e42"
 dependencies = [
  "cfg-if 1.0.0",
  "hashbrown",
- "impl-trait-for-tuples 0.2.0",
+ "impl-trait-for-tuples",
  "parity-util-mem-derive",
  "parking_lot 0.11.1",
  "primitive-types",
@@ -6625,7 +6614,7 @@ dependencies = [
 name = "sc-chain-spec"
 version = "2.0.1"
 dependencies = [
- "impl-trait-for-tuples 0.2.0",
+ "impl-trait-for-tuples",
  "parity-scale-codec",
  "sc-chain-spec-derive",
  "sc-consensus-babe",
@@ -8623,7 +8612,7 @@ version = "2.0.1"
 dependencies = [
  "either",
  "hash256-std-hasher",
- "impl-trait-for-tuples 0.2.0",
+ "impl-trait-for-tuples",
  "log",
  "parity-scale-codec",
  "parity-util-mem",
@@ -8643,7 +8632,7 @@ dependencies = [
 name = "sp-runtime-interface"
 version = "2.0.1"
 dependencies = [
- "impl-trait-for-tuples 0.2.0",
+ "impl-trait-for-tuples",
  "parity-scale-codec",
  "primitive-types",
  "rustversion",
@@ -8822,7 +8811,7 @@ dependencies = [
 name = "sp-timestamp"
 version = "2.0.1"
 dependencies = [
- "impl-trait-for-tuples 0.2.0",
+ "impl-trait-for-tuples",
  "parity-scale-codec",
  "sp-api",
  "sp-inherents",
@@ -8902,7 +8891,7 @@ dependencies = [
 name = "sp-wasm-interface"
 version = "2.0.1"
 dependencies = [
- "impl-trait-for-tuples 0.2.0",
+ "impl-trait-for-tuples",
  "parity-scale-codec",
  "sp-std",
  "wasmi",
diff --git a/client/chain-spec/Cargo.toml b/client/chain-spec/Cargo.toml
index 3903ebf21d5d..0b482bb2ed3f 100644
--- a/client/chain-spec/Cargo.toml
+++ b/client/chain-spec/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 sc-chain-spec-derive = { version = "2.0.0", path = "./derive" }
-impl-trait-for-tuples = "0.2.0"
+impl-trait-for-tuples = "0.2.1"
 sc-network = { version = "0.8.0", path = "../network" }
 sp-core = { version = "2.0.0", path = "../../primitives/core" }
 serde = { version = "1.0.101", features = ["derive"] }
diff --git a/frame/authorship/Cargo.toml b/frame/authorship/Cargo.toml
index 04c95d02a643..4489ee739103 100644
--- a/frame/authorship/Cargo.toml
+++ b/frame/authorship/Cargo.toml
@@ -20,7 +20,7 @@ sp-std = { version = "2.0.0", default-features = false, path = "../../primitives
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
-impl-trait-for-tuples = "0.2.0"
+impl-trait-for-tuples = "0.2.1"
 
 [dev-dependencies]
 sp-core = { version = "2.0.0", path = "../../primitives/core" }
diff --git a/frame/session/Cargo.toml b/frame/session/Cargo.toml
index 8a13f905f0dc..6f42663ecd1c 100644
--- a/frame/session/Cargo.toml
+++ b/frame/session/Cargo.toml
@@ -25,7 +25,7 @@ frame-support = { version = "2.0.0", default-features = false, path = "../suppor
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
 pallet-timestamp = { version = "2.0.0", default-features = false, path = "../timestamp" }
 sp-trie = { version = "2.0.0", optional = true, default-features = false, path = "../../primitives/trie" }
-impl-trait-for-tuples = "0.1"
+impl-trait-for-tuples = "0.2.1"
 
 [dev-dependencies]
 sp-application-crypto = { version = "2.0.0", path = "../../primitives/application-crypto" }
diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs
index 0793d5e74b98..64ec31ad99d0 100644
--- a/frame/session/src/lib.rs
+++ b/frame/session/src/lib.rs
@@ -258,10 +258,8 @@ pub trait SessionHandler<ValidatorId> {
 }
 
 #[impl_trait_for_tuples::impl_for_tuples(1, 30)]
-#[tuple_types_no_default_trait_bound]
+#[tuple_types_custom_trait_bound(OneSessionHandler<AId>)]
 impl<AId> SessionHandler<AId> for Tuple {
-	for_tuples!( where #( Tuple: OneSessionHandler<AId> )* );
-
 	for_tuples!(
 		const KEY_TYPE_IDS: &'static [KeyTypeId] = &[ #( <Tuple::Key as RuntimeAppPublic>::ID ),* ];
 	);
diff --git a/frame/support/Cargo.toml b/frame/support/Cargo.toml
index c37da41c3483..7e9de8587c62 100644
--- a/frame/support/Cargo.toml
+++ b/frame/support/Cargo.toml
@@ -30,7 +30,7 @@ paste = "1.0"
 once_cell = { version = "1", default-features = false, optional = true }
 sp-state-machine = { version = "0.8.0", optional = true, path = "../../primitives/state-machine" }
 bitflags = "1.2"
-impl-trait-for-tuples = "0.2.0"
+impl-trait-for-tuples = "0.2.1"
 smallvec = "1.4.1"
 
 [dev-dependencies]
diff --git a/frame/system/Cargo.toml b/frame/system/Cargo.toml
index 0866a0c1d0b6..60ef5a27f487 100644
--- a/frame/system/Cargo.toml
+++ b/frame/system/Cargo.toml
@@ -21,7 +21,7 @@ sp-io = { version = "2.0.0", path = "../../primitives/io", default-features = fa
 sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
 sp-version = { version = "2.0.0", default-features = false, path = "../../primitives/version" }
 frame-support = { version = "2.0.1", default-features = false, path = "../support" }
-impl-trait-for-tuples = "0.2.0"
+impl-trait-for-tuples = "0.2.1"
 
 [dev-dependencies]
 criterion = "0.3.3"
diff --git a/frame/timestamp/Cargo.toml b/frame/timestamp/Cargo.toml
index 2e71d09f2c20..93dc4b4d41ca 100644
--- a/frame/timestamp/Cargo.toml
+++ b/frame/timestamp/Cargo.toml
@@ -25,7 +25,7 @@ frame-benchmarking = { version = "2.0.0", default-features = false, path = "../b
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
 sp-timestamp = { version = "2.0.0", default-features = false, path = "../../primitives/timestamp" }
-impl-trait-for-tuples = "0.2.0"
+impl-trait-for-tuples = "0.2.1"
 
 [dev-dependencies]
 sp-io ={ version = "2.0.0", path = "../../primitives/io" }
diff --git a/frame/treasury/Cargo.toml b/frame/treasury/Cargo.toml
index dd3bd9bb1090..556d77418da6 100644
--- a/frame/treasury/Cargo.toml
+++ b/frame/treasury/Cargo.toml
@@ -20,7 +20,7 @@ sp-runtime = { version = "2.0.0", default-features = false, path = "../../primit
 frame-support = { version = "2.0.0", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0", default-features = false, path = "../system" }
 pallet-balances = { version = "2.0.0", default-features = false, path = "../balances" }
-impl-trait-for-tuples = "0.2.0"
+impl-trait-for-tuples = "0.2.1"
 
 frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
 
diff --git a/primitives/runtime-interface/Cargo.toml b/primitives/runtime-interface/Cargo.toml
index bbd33d344fbd..ccbcd470998b 100644
--- a/primitives/runtime-interface/Cargo.toml
+++ b/primitives/runtime-interface/Cargo.toml
@@ -23,7 +23,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
 static_assertions = "1.0.0"
 primitive-types = { version = "0.9.0", default-features = false }
 sp-storage = { version = "2.0.0", default-features = false, path = "../storage" }
-impl-trait-for-tuples = "0.2.0"
+impl-trait-for-tuples = "0.2.1"
 
 [dev-dependencies]
 sp-runtime-interface-test-wasm = { version = "2.0.0", path = "test-wasm" }
diff --git a/primitives/runtime/Cargo.toml b/primitives/runtime/Cargo.toml
index 7dd53c6c2e52..1ce71ff72bbb 100644
--- a/primitives/runtime/Cargo.toml
+++ b/primitives/runtime/Cargo.toml
@@ -25,7 +25,7 @@ sp-io = { version = "2.0.0", default-features = false, path = "../io" }
 log = { version = "0.4.8", optional = true }
 paste = "1.0"
 rand = { version = "0.7.2", optional = true }
-impl-trait-for-tuples = "0.2.0"
+impl-trait-for-tuples = "0.2.1"
 parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
 hash256-std-hasher = { version = "0.15.2", default-features = false }
 either = { version = "1.5", default-features = false }
diff --git a/primitives/timestamp/Cargo.toml b/primitives/timestamp/Cargo.toml
index dc9f1fae9256..915c589ecc16 100644
--- a/primitives/timestamp/Cargo.toml
+++ b/primitives/timestamp/Cargo.toml
@@ -18,7 +18,7 @@ sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../runtime" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-inherents = { version = "2.0.0", default-features = false, path = "../inherents" }
-impl-trait-for-tuples = "0.2.0"
+impl-trait-for-tuples = "0.2.1"
 wasm-timer = { version = "0.2", optional = true }
 
 [features]
diff --git a/primitives/wasm-interface/Cargo.toml b/primitives/wasm-interface/Cargo.toml
index 21d2fc4f214a..a788d6ac92ae 100644
--- a/primitives/wasm-interface/Cargo.toml
+++ b/primitives/wasm-interface/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 wasmi = { version = "0.6.2", optional = true }
-impl-trait-for-tuples = "0.2.0"
+impl-trait-for-tuples = "0.2.1"
 sp-std = { version = "2.0.0", path = "../std", default-features = false }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 

From 66cfa925dddb6883079e12bf31064ebc893300e0 Mon Sep 17 00:00:00 2001
From: Kun <zikunvan@gmail.com>
Date: Tue, 9 Feb 2021 21:53:01 +0800
Subject: [PATCH 0376/1194] Add Crust Network SS58 Address (#8064)

* Add Crust Address Format

* Add Crust Address Format

* Delete extra ss58 json info
---
 primitives/core/src/crypto.rs | 3 +++
 ss58-registry.json            | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index 5b7505725f31..2bd9f5f52e2a 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -576,6 +576,9 @@ ss58_address_format!(
 		(46, "reserved46", "Reserved for future use (46).")
 	Reserved47 =>
 		(47, "reserved47", "Reserved for future use (47).")
+	CrustAccount =>
+		(66, "crust", "Crust Network, standard account (*25519).")
+	// Note: 48 and above are reserved.
 );
 
 /// Set the default "version" (actually, this is a bit of a misnomer and the version byte is
diff --git a/ss58-registry.json b/ss58-registry.json
index 8db6238a9d31..1acf35803783 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -432,6 +432,15 @@
 			"decimals": null,
 			"standardAccount": null,
 			"website": null
+		},
+		{
+			"prefix": 66,
+			"network": "crust",
+			"displayName": "Crust Network",
+			"symbols": ["CRU"],
+			"decimals": [12],
+			"standardAccount": "*25519",
+			"website": "https://crust.network"
 		}
 	]
 }

From 077c48030feae184e5cb23605ee80704ca1269fe Mon Sep 17 00:00:00 2001
From: frank <450595468@qq.com>
Date: Tue, 9 Feb 2021 21:57:41 +0800
Subject: [PATCH 0377/1194] Add Ares SS58 address type (#8061)

---
 primitives/core/src/crypto.rs | 2 ++
 ss58-registry.json            | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index 2bd9f5f52e2a..7608b295e33f 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -554,6 +554,8 @@ ss58_address_format!(
 		(32, "robonomics", "Any Robonomics network standard account (*25519).")
 	DataHighwayAccount =>
 		(33, "datahighway", "DataHighway mainnet, standard account (*25519).")
+	AresAccount =>
+		(34, "ares", "Ares Protocol, standard account (*25519).")
 	ValiuAccount =>
 		(35, "vln", "Valiu Liquidity Network mainnet, standard account (*25519).")
 	CentrifugeAccount =>
diff --git a/ss58-registry.json b/ss58-registry.json
index 1acf35803783..bb11a51b4358 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -316,6 +316,15 @@
 			"standardAccount": "*25519",
 			"website": null
 		},
+		{
+			"prefix": 34,
+			"network": "ares",
+			"displayName": "Ares Protocol",
+			"symbols": ["ARES"],
+			"decimals": [12],
+			"standardAccount": "*25519",
+			"website": "https://www.aresprotocol.com/"
+		},
 		{
 			"prefix": 35,
 			"network": "vln",

From 273bc7b95911d144d18a6e1e5d4a749b3f554262 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Tue, 9 Feb 2021 16:28:34 +0100
Subject: [PATCH 0378/1194] Replace last usages of `<() as PalletInfo>` in
 substrate (#8080)

* replace last occurences

* Update frame/support/src/traits.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Update frame/support/test/src/lib.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* fix dispatch test

* move PanicPalletInfo to tests module

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
---
 frame/collective/src/lib.rs                   |  2 +-
 frame/elections-phragmen/src/lib.rs           |  2 +-
 frame/elections/src/mock.rs                   |  2 +-
 frame/offences/benchmarking/src/mock.rs       |  2 +-
 frame/society/src/mock.rs                     |  2 +-
 frame/support/src/dispatch.rs                 | 23 ++++++++++-
 frame/support/src/event.rs                    |  6 +--
 frame/support/src/lib.rs                      | 16 +++++++-
 frame/support/src/metadata.rs                 | 39 ++++++++++++++++++-
 frame/support/src/storage/generator/mod.rs    |  2 +-
 frame/support/src/weights.rs                  |  2 +-
 frame/support/test/src/lib.rs                 | 12 ++++++
 frame/support/test/tests/decl_storage.rs      |  8 ++--
 frame/support/test/tests/genesisconfig.rs     |  2 +-
 frame/support/test/tests/instance.rs          |  2 +-
 frame/support/test/tests/issue2219.rs         |  2 +-
 .../tests/pallet_with_name_trait_is_valid.rs  |  2 +-
 .../support/test/tests/storage_transaction.rs |  2 +-
 frame/transaction-payment/src/lib.rs          |  2 +-
 frame/utility/src/tests.rs                    |  2 +-
 test-utils/runtime/src/lib.rs                 | 33 +++++++++++++++-
 21 files changed, 137 insertions(+), 28 deletions(-)

diff --git a/frame/collective/src/lib.rs b/frame/collective/src/lib.rs
index ead9135aaa19..50beb8607d61 100644
--- a/frame/collective/src/lib.rs
+++ b/frame/collective/src/lib.rs
@@ -995,7 +995,7 @@ mod tests {
 		type Event = Event;
 		type BlockHashCount = BlockHashCount;
 		type Version = ();
-		type PalletInfo = ();
+		type PalletInfo = PalletInfo;
 		type AccountData = ();
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index d566975e2e7a..057e9f181c7a 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -1074,7 +1074,7 @@ mod tests {
 		type Event = Event;
 		type BlockHashCount = BlockHashCount;
 		type Version = ();
-		type PalletInfo = ();
+		type PalletInfo = PalletInfo;
 		type AccountData = pallet_balances::AccountData<u64>;
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
diff --git a/frame/elections/src/mock.rs b/frame/elections/src/mock.rs
index b386542b2b3d..7c9bc9bfaf8b 100644
--- a/frame/elections/src/mock.rs
+++ b/frame/elections/src/mock.rs
@@ -52,7 +52,7 @@ impl frame_system::Config for Test {
 	type Event = Event;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
diff --git a/frame/offences/benchmarking/src/mock.rs b/frame/offences/benchmarking/src/mock.rs
index 5d6d13aa3091..e4ec32d0bc3b 100644
--- a/frame/offences/benchmarking/src/mock.rs
+++ b/frame/offences/benchmarking/src/mock.rs
@@ -58,7 +58,7 @@ impl frame_system::Config for Test {
 	type Event = Event;
 	type BlockHashCount = ();
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
diff --git a/frame/society/src/mock.rs b/frame/society/src/mock.rs
index 8c39a0bc3ea5..4b1bb21dd18d 100644
--- a/frame/society/src/mock.rs
+++ b/frame/society/src/mock.rs
@@ -83,7 +83,7 @@ impl frame_system::Config for Test {
 	type Event = Event;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type AccountData = pallet_balances::AccountData<u64>;
diff --git a/frame/support/src/dispatch.rs b/frame/support/src/dispatch.rs
index 03cda0e4d40e..7927ccd014bd 100644
--- a/frame/support/src/dispatch.rs
+++ b/frame/support/src/dispatch.rs
@@ -2409,7 +2409,7 @@ mod tests {
 	use crate::weights::{DispatchInfo, DispatchClass, Pays, RuntimeDbWeight};
 	use crate::traits::{
 		CallMetadata, GetCallMetadata, GetCallName, OnInitialize, OnFinalize, OnRuntimeUpgrade,
-		IntegrityTest, Get,
+		IntegrityTest, Get, PalletInfo,
 	};
 
 	pub trait Config: system::Config + Sized where Self::AccountId: From<u32> { }
@@ -2562,13 +2562,32 @@ mod tests {
 		}
 	}
 
+	impl PalletInfo for TraitImpl {
+		fn index<P: 'static>() -> Option<usize> {
+			let type_id = sp_std::any::TypeId::of::<P>();
+			if type_id == sp_std::any::TypeId::of::<Test>() {
+				return Some(0)
+			}
+
+			None
+		}
+		fn name<P: 'static>() -> Option<&'static str> {
+			let type_id = sp_std::any::TypeId::of::<P>();
+			if type_id == sp_std::any::TypeId::of::<Test>() {
+				return Some("Test")
+			}
+
+			None
+		}
+	}
+
 	impl system::Config for TraitImpl {
 		type Origin = OuterOrigin;
 		type AccountId = u32;
 		type Call = OuterCall;
 		type BaseCallFilter = ();
 		type BlockNumber = u32;
-		type PalletInfo = ();
+		type PalletInfo = Self;
 		type DbWeight = ();
 	}
 
diff --git a/frame/support/src/event.rs b/frame/support/src/event.rs
index 39baee29bc0c..eb666b6f028a 100644
--- a/frame/support/src/event.rs
+++ b/frame/support/src/event.rs
@@ -729,7 +729,7 @@ mod tests {
 	impl system::Config for TestRuntime {
 		type Origin = u32;
 		type BlockNumber = u32;
-		type PalletInfo = ();
+		type PalletInfo = crate::tests::PanicPalletInfo;
 		type DbWeight = ();
 	}
 
@@ -744,14 +744,14 @@ mod tests {
 	impl system_renamed::Config for TestRuntime2 {
 		type Origin = u32;
 		type BlockNumber = u32;
-		type PalletInfo = ();
+		type PalletInfo = crate::tests::PanicPalletInfo;
 		type DbWeight = ();
 	}
 
 	impl system::Config for TestRuntime2 {
 		type Origin = u32;
 		type BlockNumber = u32;
-		type PalletInfo = ();
+		type PalletInfo = crate::tests::PanicPalletInfo;
 		type DbWeight = ();
 	}
 
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 951e12c9c7d4..940e70852af5 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -571,7 +571,7 @@ macro_rules! assert_ok {
 pub use serde::{Serialize, Deserialize};
 
 #[cfg(test)]
-mod tests {
+pub mod tests {
 	use super::*;
 	use codec::{Codec, EncodeLike};
 	use frame_metadata::{
@@ -581,6 +581,18 @@ mod tests {
 	use sp_std::{marker::PhantomData, result};
 	use sp_io::TestExternalities;
 
+	/// A PalletInfo implementation which just panics.
+	pub struct PanicPalletInfo;
+
+	impl crate::traits::PalletInfo for PanicPalletInfo {
+		fn index<P: 'static>() -> Option<usize> {
+			unimplemented!("PanicPalletInfo mustn't be triggered by tests");
+		}
+		fn name<P: 'static>() -> Option<&'static str> {
+			unimplemented!("PanicPalletInfo mustn't be triggered by tests");
+		}
+	}
+
 	pub trait Config: 'static {
 		type BlockNumber: Codec + EncodeLike + Default;
 		type Origin;
@@ -625,7 +637,7 @@ mod tests {
 	impl Config for Test {
 		type BlockNumber = u32;
 		type Origin = u32;
-		type PalletInfo = ();
+		type PalletInfo = PanicPalletInfo;
 		type DbWeight = ();
 	}
 
diff --git a/frame/support/src/metadata.rs b/frame/support/src/metadata.rs
index a60481933701..2edaba1cb47e 100644
--- a/frame/support/src/metadata.rs
+++ b/frame/support/src/metadata.rs
@@ -43,10 +43,14 @@ pub use frame_metadata::{
 ///# }
 ///# use module0 as module1;
 ///# use module0 as module2;
+///# impl frame_support::traits::PalletInfo for Runtime {
+///#     fn index<P: 'static>() -> Option<usize> { unimplemented!() }
+///#     fn name<P: 'static>() -> Option<&'static str> { unimplemented!() }
+///# }
 ///# impl module0::Config for Runtime {
 ///#     type Origin = u32;
 ///#     type BlockNumber = u32;
-///#     type PalletInfo = ();
+///#     type PalletInfo = Self;
 ///#     type DbWeight = ();
 ///# }
 ///#
@@ -414,6 +418,37 @@ mod tests {
 	#[derive(Debug, Clone, PartialEq, Eq, Encode, Decode)]
 	pub struct TestRuntime;
 
+	impl crate::traits::PalletInfo for TestRuntime {
+		fn index<P: 'static>() -> Option<usize> {
+			let type_id = sp_std::any::TypeId::of::<P>();
+			if type_id == sp_std::any::TypeId::of::<system::Module<TestRuntime>>() {
+				return Some(0)
+			}
+			if type_id == sp_std::any::TypeId::of::<EventModule>() {
+				return Some(1)
+			}
+			if type_id == sp_std::any::TypeId::of::<EventModule2>() {
+				return Some(2)
+			}
+
+			None
+		}
+		fn name<P: 'static>() -> Option<&'static str> {
+			let type_id = sp_std::any::TypeId::of::<P>();
+			if type_id == sp_std::any::TypeId::of::<system::Module<TestRuntime>>() {
+				return Some("System")
+			}
+			if type_id == sp_std::any::TypeId::of::<EventModule>() {
+				return Some("EventModule")
+			}
+			if type_id == sp_std::any::TypeId::of::<EventModule2>() {
+				return Some("EventModule2")
+			}
+
+			None
+		}
+	}
+
 	impl_outer_event! {
 		pub enum TestEvent for TestRuntime {
 			system,
@@ -451,7 +486,7 @@ mod tests {
 		type AccountId = u32;
 		type BlockNumber = u32;
 		type SomeValue = SystemValue;
-		type PalletInfo = ();
+		type PalletInfo = Self;
 		type DbWeight = ();
 		type Call = Call;
 	}
diff --git a/frame/support/src/storage/generator/mod.rs b/frame/support/src/storage/generator/mod.rs
index a9e5665c544d..fc2a21ff7251 100644
--- a/frame/support/src/storage/generator/mod.rs
+++ b/frame/support/src/storage/generator/mod.rs
@@ -52,7 +52,7 @@ mod tests {
 	impl Config for Runtime {
 		type Origin = u32;
 		type BlockNumber = u32;
-		type PalletInfo = ();
+		type PalletInfo = crate::tests::PanicPalletInfo;
 		type DbWeight = ();
 	}
 
diff --git a/frame/support/src/weights.rs b/frame/support/src/weights.rs
index 32dc9e1f2529..abd54994bc9e 100644
--- a/frame/support/src/weights.rs
+++ b/frame/support/src/weights.rs
@@ -841,7 +841,7 @@ mod tests {
 		type BlockNumber = u32;
 		type Balance = u32;
 		type DbWeight = DbWeight;
-		type PalletInfo = ();
+		type PalletInfo = crate::tests::PanicPalletInfo;
 	}
 
 	decl_module! {
diff --git a/frame/support/test/src/lib.rs b/frame/support/test/src/lib.rs
index d837056fe6ab..4b1510bf81f4 100644
--- a/frame/support/test/src/lib.rs
+++ b/frame/support/test/src/lib.rs
@@ -41,3 +41,15 @@ frame_support::decl_module! {
 	/// Some test module
 	pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {}
 }
+
+/// A PalletInfo implementation which just panics.
+pub struct PanicPalletInfo;
+
+impl frame_support::traits::PalletInfo for PanicPalletInfo {
+	fn index<P: 'static>() -> Option<usize> {
+		unimplemented!("PanicPalletInfo mustn't be triggered by tests");
+	}
+	fn name<P: 'static>() -> Option<&'static str> {
+		unimplemented!("PanicPalletInfo mustn't be triggered by tests");
+	}
+}
diff --git a/frame/support/test/tests/decl_storage.rs b/frame/support/test/tests/decl_storage.rs
index 99697393785f..a2690b1379db 100644
--- a/frame/support/test/tests/decl_storage.rs
+++ b/frame/support/test/tests/decl_storage.rs
@@ -84,7 +84,7 @@ mod tests {
 	impl frame_support_test::Config for TraitImpl {
 		type Origin = u32;
 		type BlockNumber = u32;
-		type PalletInfo = ();
+		type PalletInfo = frame_support_test::PanicPalletInfo;
 		type DbWeight = ();
 	}
 
@@ -441,7 +441,7 @@ mod test2 {
 	impl frame_support_test::Config for TraitImpl {
 		type Origin = u32;
 		type BlockNumber = u32;
-		type PalletInfo = ();
+		type PalletInfo = frame_support_test::PanicPalletInfo;
 		type DbWeight = ();
 	}
 
@@ -469,7 +469,7 @@ mod test3 {
 	impl frame_support_test::Config for TraitImpl {
 		type Origin = u32;
 		type BlockNumber = u32;
-		type PalletInfo = ();
+		type PalletInfo = frame_support_test::PanicPalletInfo;
 		type DbWeight = ();
 	}
 
@@ -514,7 +514,7 @@ mod test_append_and_len {
 	impl frame_support_test::Config for Test {
 		type Origin = u32;
 		type BlockNumber = u32;
-		type PalletInfo = ();
+		type PalletInfo = frame_support_test::PanicPalletInfo;
 		type DbWeight = ();
 	}
 
diff --git a/frame/support/test/tests/genesisconfig.rs b/frame/support/test/tests/genesisconfig.rs
index dd98fca8c953..a30b021d13e5 100644
--- a/frame/support/test/tests/genesisconfig.rs
+++ b/frame/support/test/tests/genesisconfig.rs
@@ -32,7 +32,7 @@ struct Test;
 impl frame_support_test::Config for Test {
 	type BlockNumber = u32;
 	type Origin = ();
-	type PalletInfo = ();
+	type PalletInfo = frame_support_test::PanicPalletInfo;
 	type DbWeight = ();
 }
 
diff --git a/frame/support/test/tests/instance.rs b/frame/support/test/tests/instance.rs
index dc6c41564a75..f7d79b7d4bf6 100644
--- a/frame/support/test/tests/instance.rs
+++ b/frame/support/test/tests/instance.rs
@@ -253,7 +253,7 @@ impl system::Config for Runtime {
 	type BlockNumber = BlockNumber;
 	type AccountId = AccountId;
 	type Event = Event;
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type Call = Call;
 	type DbWeight = ();
 }
diff --git a/frame/support/test/tests/issue2219.rs b/frame/support/test/tests/issue2219.rs
index adabb2d59792..4eacca9daca0 100644
--- a/frame/support/test/tests/issue2219.rs
+++ b/frame/support/test/tests/issue2219.rs
@@ -164,7 +164,7 @@ impl system::Config for Runtime {
 	type BlockNumber = BlockNumber;
 	type AccountId = AccountId;
 	type Event = Event;
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type Call = Call;
 	type DbWeight = ();
 }
diff --git a/frame/support/test/tests/pallet_with_name_trait_is_valid.rs b/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
index 6247e46c85f0..b09beb04cd17 100644
--- a/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
+++ b/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
@@ -135,7 +135,7 @@ mod tests {
 		type BlockWeights = ();
 		type BlockLength = ();
 		type Version = ();
-		type PalletInfo = ();
+		type PalletInfo = PalletInfo;
 		type AccountData = ();
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
diff --git a/frame/support/test/tests/storage_transaction.rs b/frame/support/test/tests/storage_transaction.rs
index ee6ce5869e17..b518c60e957c 100644
--- a/frame/support/test/tests/storage_transaction.rs
+++ b/frame/support/test/tests/storage_transaction.rs
@@ -53,7 +53,7 @@ struct Runtime;
 impl frame_support_test::Config for Runtime {
 	type Origin = u32;
 	type BlockNumber = u32;
-	type PalletInfo = ();
+	type PalletInfo = frame_support_test::PanicPalletInfo;
 	type DbWeight = ();
 }
 
diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
index 5f907fb91b99..c460fcba3a59 100644
--- a/frame/transaction-payment/src/lib.rs
+++ b/frame/transaction-payment/src/lib.rs
@@ -681,7 +681,7 @@ mod tests {
 		type Event = Event;
 		type BlockHashCount = BlockHashCount;
 		type Version = ();
-		type PalletInfo = ();
+		type PalletInfo = PalletInfo;
 		type AccountData = pallet_balances::AccountData<u64>;
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
diff --git a/frame/utility/src/tests.rs b/frame/utility/src/tests.rs
index b14f958bd6f8..af31bbe96cbc 100644
--- a/frame/utility/src/tests.rs
+++ b/frame/utility/src/tests.rs
@@ -104,7 +104,7 @@ impl frame_system::Config for Test {
 	type Event = Event;
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index d7d7ccd31b71..b349d1266b03 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -433,6 +433,37 @@ impl From<frame_system::Event<Runtime>> for Event {
 	}
 }
 
+impl frame_support::traits::PalletInfo for Runtime {
+	fn index<P: 'static>() -> Option<usize> {
+		let type_id = sp_std::any::TypeId::of::<P>();
+		if type_id == sp_std::any::TypeId::of::<system::Module<Runtime>>() {
+			return Some(0)
+		}
+		if type_id == sp_std::any::TypeId::of::<pallet_timestamp::Module<Runtime>>() {
+			return Some(1)
+		}
+		if type_id == sp_std::any::TypeId::of::<pallet_babe::Module<Runtime>>() {
+			return Some(2)
+		}
+
+		None
+	}
+	fn name<P: 'static>() -> Option<&'static str> {
+		let type_id = sp_std::any::TypeId::of::<P>();
+		if type_id == sp_std::any::TypeId::of::<system::Module<Runtime>>() {
+			return Some("System")
+		}
+		if type_id == sp_std::any::TypeId::of::<pallet_timestamp::Module<Runtime>>() {
+			return Some("Timestamp")
+		}
+		if type_id == sp_std::any::TypeId::of::<pallet_babe::Module<Runtime>>() {
+			return Some("Babe")
+		}
+
+		None
+	}
+}
+
 parameter_types! {
 	pub const BlockHashCount: BlockNumber = 2400;
 	pub const MinimumPeriod: u64 = 5;
@@ -463,7 +494,7 @@ impl frame_system::Config for Runtime {
 	type BlockHashCount = BlockHashCount;
 	type DbWeight = ();
 	type Version = ();
-	type PalletInfo = ();
+	type PalletInfo = Self;
 	type AccountData = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();

From 4777aba89b53e10057bc618088cc03b8eb2712ae Mon Sep 17 00:00:00 2001
From: Andrew Jones <ascjones@gmail.com>
Date: Tue, 9 Feb 2021 16:45:59 +0000
Subject: [PATCH 0379/1194] Remove PalletInfo impl for () (#8090)

---
 frame/support/src/traits.rs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index c52aa60c20b1..106ec10c6c4e 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -1459,11 +1459,6 @@ pub trait PalletInfo {
 	fn name<P: 'static>() -> Option<&'static str>;
 }
 
-impl PalletInfo for () {
-	fn index<P: 'static>() -> Option<usize> { Some(0) }
-	fn name<P: 'static>() -> Option<&'static str> { Some("test") }
-}
-
 /// The function and pallet name of the Call.
 #[derive(Clone, Eq, PartialEq, Default, RuntimeDebug)]
 pub struct CallMetadata {

From 48e9d49789b3e779b6016933b28c29bf56a2246d Mon Sep 17 00:00:00 2001
From: Sergei Shulepov <sergei@parity.io>
Date: Tue, 9 Feb 2021 17:48:29 +0100
Subject: [PATCH 0380/1194] WasmExecutor takes a cache directory (#8057)

That is useful for executors like wasmtime which produces compiled code
and can actually benefit from caching under some circumstances
---
 client/executor/src/integration_tests/mod.rs |  6 +++
 client/executor/src/lib.rs                   |  1 +
 client/executor/src/native_executor.rs       | 21 +++++++-
 client/executor/src/wasm_runtime.rs          | 32 ++++++++++--
 client/executor/wasmtime/src/runtime.rs      | 51 +++++++++++++++++++-
 primitives/runtime-interface/test/src/lib.rs |  1 +
 6 files changed, 104 insertions(+), 8 deletions(-)

diff --git a/client/executor/src/integration_tests/mod.rs b/client/executor/src/integration_tests/mod.rs
index 1f14678c7a4d..b28e3ca2436b 100644
--- a/client/executor/src/integration_tests/mod.rs
+++ b/client/executor/src/integration_tests/mod.rs
@@ -75,6 +75,7 @@ fn call_in_wasm<E: Externalities>(
 		Some(1024),
 		HostFunctions::host_functions(),
 		8,
+		None,
 	);
 	executor.call_in_wasm(
 		&wasm_binary_unwrap()[..],
@@ -536,6 +537,7 @@ fn should_trap_when_heap_exhausted(wasm_method: WasmExecutionMethod) {
 		Some(17),  // `17` is the initial number of pages compiled into the binary.
 		HostFunctions::host_functions(),
 		8,
+		None,
 	);
 
 	let err = executor.call_in_wasm(
@@ -558,6 +560,7 @@ fn returns_mutable_static(wasm_method: WasmExecutionMethod) {
 		&wasm_binary_unwrap()[..],
 		HostFunctions::host_functions(),
 		true,
+		None,
 	).expect("Creates runtime");
 
 	let instance = runtime.new_instance().unwrap();
@@ -591,6 +594,7 @@ fn restoration_of_globals(wasm_method: WasmExecutionMethod) {
 		&wasm_binary_unwrap()[..],
 		HostFunctions::host_functions(),
 		true,
+		None,
 	).expect("Creates runtime");
 	let instance = runtime.new_instance().unwrap();
 
@@ -611,6 +615,7 @@ fn heap_is_reset_between_calls(wasm_method: WasmExecutionMethod) {
 		&wasm_binary_unwrap()[..],
 		HostFunctions::host_functions(),
 		true,
+		None,
 	).expect("Creates runtime");
 	let instance = runtime.new_instance().unwrap();
 
@@ -634,6 +639,7 @@ fn parallel_execution(wasm_method: WasmExecutionMethod) {
 		Some(1024),
 		HostFunctions::host_functions(),
 		8,
+		None,
 	));
 	let code_hash = blake2_256(wasm_binary_unwrap()).to_vec();
 	let threads: Vec<_> = (0..8).map(|_|
diff --git a/client/executor/src/lib.rs b/client/executor/src/lib.rs
index ccb7aa1b445b..c30015a86b20 100644
--- a/client/executor/src/lib.rs
+++ b/client/executor/src/lib.rs
@@ -80,6 +80,7 @@ mod tests {
 			Some(8),
 			sp_io::SubstrateHostFunctions::host_functions(),
 			8,
+			None,
 		);
 		let res = executor.call_in_wasm(
 			&wasm_binary_unwrap()[..],
diff --git a/client/executor/src/native_executor.rs b/client/executor/src/native_executor.rs
index 766dada331cd..cdfe349edabd 100644
--- a/client/executor/src/native_executor.rs
+++ b/client/executor/src/native_executor.rs
@@ -26,6 +26,7 @@ use std::{
 	panic::{UnwindSafe, AssertUnwindSafe},
 	result,
 	sync::{Arc, atomic::{AtomicU64, Ordering}, mpsc},
+	path::PathBuf,
 };
 
 use sp_version::{NativeVersion, RuntimeVersion};
@@ -102,6 +103,9 @@ pub struct WasmExecutor {
 	cache: Arc<RuntimeCache>,
 	/// The size of the instances cache.
 	max_runtime_instances: usize,
+	/// The path to a directory which the executor can leverage for a file cache, e.g. put there
+	/// compiled artifacts.
+	cache_path: Option<PathBuf>,
 }
 
 impl WasmExecutor {
@@ -112,19 +116,30 @@ impl WasmExecutor {
 	/// `method` - Method used to execute Wasm code.
 	///
 	/// `default_heap_pages` - Number of 64KB pages to allocate for Wasm execution.
-	/// 	Defaults to `DEFAULT_HEAP_PAGES` if `None` is provided.
+	///   Defaults to `DEFAULT_HEAP_PAGES` if `None` is provided.
+	///
+	/// `host_functions` - The set of host functions to be available for import provided by this
+	///   executor.
+	///
+	/// `max_runtime_instances` - The number of runtime instances to keep in memory ready for reuse.
+	///
+	/// `cache_path` - A path to a directory where the executor can place its files for purposes of
+	///   caching. This may be important in cases when there are many different modules with the
+	///   compiled execution method is used.
 	pub fn new(
 		method: WasmExecutionMethod,
 		default_heap_pages: Option<u64>,
 		host_functions: Vec<&'static dyn Function>,
 		max_runtime_instances: usize,
+		cache_path: Option<PathBuf>,
 	) -> Self {
 		WasmExecutor {
 			method,
 			default_heap_pages: default_heap_pages.unwrap_or(DEFAULT_HEAP_PAGES),
 			host_functions: Arc::new(host_functions),
-			cache: Arc::new(RuntimeCache::new(max_runtime_instances)),
+			cache: Arc::new(RuntimeCache::new(max_runtime_instances, cache_path.clone())),
 			max_runtime_instances,
+			cache_path,
 		}
 	}
 
@@ -210,6 +225,7 @@ impl sp_core::traits::CallInWasm for WasmExecutor {
 				&wasm_code,
 				self.host_functions.to_vec(),
 				allow_missing_host_functions,
+				self.cache_path.as_deref(),
 			)
 				.map_err(|e| format!("Failed to create module: {:?}", e))?;
 
@@ -267,6 +283,7 @@ impl<D: NativeExecutionDispatch> NativeExecutor<D> {
 			default_heap_pages,
 			host_functions,
 			max_runtime_instances,
+			None,
 		);
 
 		NativeExecutor {
diff --git a/client/executor/src/wasm_runtime.rs b/client/executor/src/wasm_runtime.rs
index a7d8b0ce2387..477247104970 100644
--- a/client/executor/src/wasm_runtime.rs
+++ b/client/executor/src/wasm_runtime.rs
@@ -28,6 +28,7 @@ use codec::Decode;
 use sp_core::traits::{Externalities, RuntimeCode, FetchRuntimeCode};
 use sp_version::RuntimeVersion;
 use std::panic::AssertUnwindSafe;
+use std::path::{Path, PathBuf};
 use sc_executor_common::wasm_runtime::{WasmModule, WasmInstance};
 
 use sp_wasm_interface::Function;
@@ -152,14 +153,22 @@ pub struct RuntimeCache {
 	runtimes: Mutex<[Option<Arc<VersionedRuntime>>; MAX_RUNTIMES]>,
 	/// The size of the instances cache for each runtime.
 	max_runtime_instances: usize,
+	cache_path: Option<PathBuf>,
 }
 
 impl RuntimeCache {
 	/// Creates a new instance of a runtimes cache.
-	pub fn new(max_runtime_instances: usize) -> RuntimeCache {
+	///
+	/// `max_runtime_instances` specifies the number of runtime instances preserved in an in-memory
+	/// cache.
+	///
+	/// `cache_path` allows to specify an optional directory where the executor can store files
+	/// for caching.
+	pub fn new(max_runtime_instances: usize, cache_path: Option<PathBuf>) -> RuntimeCache {
 		RuntimeCache {
 			runtimes: Default::default(),
 			max_runtime_instances,
+			cache_path,
 		}
 	}
 
@@ -235,6 +244,7 @@ impl RuntimeCache {
 					host_functions.into(),
 					allow_missing_func_imports,
 					self.max_runtime_instances,
+					self.cache_path.as_deref(),
 				);
 				if let Err(ref err) = result {
 					log::warn!(target: "wasm-runtime", "Cannot create a runtime: {:?}", err);
@@ -271,22 +281,32 @@ pub fn create_wasm_runtime_with_code(
 	code: &[u8],
 	host_functions: Vec<&'static dyn Function>,
 	allow_missing_func_imports: bool,
+	cache_path: Option<&Path>,
 ) -> Result<Arc<dyn WasmModule>, WasmError> {
 	match wasm_method {
-		WasmExecutionMethod::Interpreted =>
+		WasmExecutionMethod::Interpreted => {
+			// Wasmi doesn't have any need in a cache directory.
+			//
+			// We drop the cache_path here to silence warnings that cache_path is not used if compiling
+			// without the `wasmtime` flag.
+			drop(cache_path);
+
 			sc_executor_wasmi::create_runtime(
 				code,
 				heap_pages,
 				host_functions,
-				allow_missing_func_imports
-			).map(|runtime| -> Arc<dyn WasmModule> { Arc::new(runtime) }),
+				allow_missing_func_imports,
+			)
+			.map(|runtime| -> Arc<dyn WasmModule> { Arc::new(runtime) })
+		}
 		#[cfg(feature = "wasmtime")]
 		WasmExecutionMethod::Compiled =>
 			sc_executor_wasmtime::create_runtime(
 				code,
 				heap_pages,
 				host_functions,
-				allow_missing_func_imports
+				allow_missing_func_imports,
+				cache_path,
 			).map(|runtime| -> Arc<dyn WasmModule> { Arc::new(runtime) }),
 	}
 }
@@ -319,6 +339,7 @@ fn create_versioned_wasm_runtime(
 	host_functions: Vec<&'static dyn Function>,
 	allow_missing_func_imports: bool,
 	max_instances: usize,
+	cache_path: Option<&Path>,
 ) -> Result<VersionedRuntime, WasmError> {
 	#[cfg(not(target_os = "unknown"))]
 	let time = std::time::Instant::now();
@@ -328,6 +349,7 @@ fn create_versioned_wasm_runtime(
 		&code,
 		host_functions,
 		allow_missing_func_imports,
+		cache_path,
 	)?;
 
 	// Call to determine runtime version.
diff --git a/client/executor/wasmtime/src/runtime.rs b/client/executor/wasmtime/src/runtime.rs
index a17a034918db..64ad5a1f4e49 100644
--- a/client/executor/wasmtime/src/runtime.rs
+++ b/client/executor/wasmtime/src/runtime.rs
@@ -25,6 +25,7 @@ use crate::state_holder;
 
 use std::rc::Rc;
 use std::sync::Arc;
+use std::path::Path;
 use sc_executor_common::{
 	error::{Result, WasmError},
 	wasm_runtime::{WasmModule, WasmInstance, InvokeMethod},
@@ -119,20 +120,68 @@ impl WasmInstance for WasmtimeInstance {
 	}
 }
 
+/// Prepare a directory structure and a config file to enable wasmtime caching.
+///
+/// In case of an error the caching will not be enabled.
+fn setup_wasmtime_caching(
+	cache_path: &Path,
+	config: &mut Config,
+) -> std::result::Result<(), String> {
+	use std::fs;
+
+	let wasmtime_cache_root = cache_path.join("wasmtime");
+	fs::create_dir_all(&wasmtime_cache_root)
+		.map_err(|err| format!("cannot create the dirs to cache: {:?}", err))?;
+
+	// Canonicalize the path after creating the directories.
+	let wasmtime_cache_root = wasmtime_cache_root
+		.canonicalize()
+		.map_err(|err| format!("failed to canonicalize the path: {:?}", err))?;
+
+	// Write the cache config file
+	let cache_config_path = wasmtime_cache_root.join("cache-config.toml");
+	let config_content = format!(
+		"\
+[cache]
+enabled = true
+directory = \"{cache_dir}\"
+",
+		cache_dir = wasmtime_cache_root.display()
+	);
+	fs::write(&cache_config_path, config_content)
+		.map_err(|err| format!("cannot write the cache config: {:?}", err))?;
+
+	config
+		.cache_config_load(cache_config_path)
+		.map_err(|err| format!("failed to parse the config: {:?}", err))?;
+
+	Ok(())
+}
+
 /// Create a new `WasmtimeRuntime` given the code. This function performs translation from Wasm to
 /// machine code, which can be computationally heavy.
+///
+/// The `cache_path` designates where this executor implementation can put compiled artifacts.
 pub fn create_runtime(
 	code: &[u8],
 	heap_pages: u64,
 	host_functions: Vec<&'static dyn Function>,
 	allow_missing_func_imports: bool,
+	cache_path: Option<&Path>,
 ) -> std::result::Result<WasmtimeRuntime, WasmError> {
 	// Create the engine, store and finally the module from the given code.
 	let mut config = Config::new();
 	config.cranelift_opt_level(wasmtime::OptLevel::SpeedAndSize);
+	if let Some(cache_path) = cache_path {
+		if let Err(reason) = setup_wasmtime_caching(cache_path, &mut config) {
+			log::warn!(
+				"failed to setup wasmtime cache. Performance may degrade significantly: {}.",
+				reason,
+			);
+		}
+	}
 
 	let engine = Engine::new(&config);
-
 	let module_wrapper = ModuleWrapper::new(&engine, code)
 		.map_err(|e| WasmError::Other(format!("cannot create module: {}", e)))?;
 
diff --git a/primitives/runtime-interface/test/src/lib.rs b/primitives/runtime-interface/test/src/lib.rs
index 75aebf1caef7..442699766348 100644
--- a/primitives/runtime-interface/test/src/lib.rs
+++ b/primitives/runtime-interface/test/src/lib.rs
@@ -44,6 +44,7 @@ fn call_wasm_method_with_result<HF: HostFunctionsT>(
 		Some(8),
 		host_functions,
 		8,
+		None,
 	);
 	executor.call_in_wasm(
 		binary,

From 9c5da5cc68e710d4d44b6bbeea6fb5a5e49b7134 Mon Sep 17 00:00:00 2001
From: nahuseyoum <39748285+nahuseyoum@users.noreply.github.com>
Date: Tue, 9 Feb 2021 20:30:16 +0000
Subject: [PATCH 0381/1194] Add Aventus ss58 address (#8050)

* Update crypto.rs

* Update ss58-registry.json

* quote fields

* Update ss58-registry.json

* Update crypto.rs

* Update ss58-registry.json

* Update ss58-registry.json

* Update ss58-registry.json

* Update crypto.rs

* Update ss58-registry.json
---
 primitives/core/src/crypto.rs | 2 ++
 ss58-registry.json            | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index 7608b295e33f..2c375f68eb68 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -578,6 +578,8 @@ ss58_address_format!(
 		(46, "reserved46", "Reserved for future use (46).")
 	Reserved47 =>
 		(47, "reserved47", "Reserved for future use (47).")
+	AventusAccount =>
+		(65, "aventus", "Aventus Chain mainnet, standard account (*25519).")
 	CrustAccount =>
 		(66, "crust", "Crust Network, standard account (*25519).")
 	// Note: 48 and above are reserved.
diff --git a/ss58-registry.json b/ss58-registry.json
index bb11a51b4358..cae6577e2157 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -442,6 +442,15 @@
 			"standardAccount": null,
 			"website": null
 		},
+		{
+			"prefix": 65,
+			"network": "aventus",
+			"displayName": "AvN Mainnet",
+			"symbols": ["AVT"],
+			"decimals": [18],
+			"standardAccount": "*25519",
+			"website": "https://aventus.io"
+		},
 		{
 			"prefix": 66,
 			"network": "crust",

From 28b950e7b55f44625d7b62ba78ee0c044a39fb03 Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann <ben@gnunicorn.org>
Date: Wed, 10 Feb 2021 09:42:37 +0100
Subject: [PATCH 0382/1194] sc-network: switch on default features for libp2p
 on non-wasm-builds (#8088)

---
 client/network/Cargo.toml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index 70eb60f3db1b..20ba3c6e20dc 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -64,9 +64,13 @@ zeroize = "1.2.0"
 
 [dependencies.libp2p]
 version = "0.34.0"
+
+[target.'cfg(target_os = "unknown")'.dependencies.libp2p]
+version = "0.34.0"
 default-features = false
 features = ["identify", "kad", "mdns", "mplex", "noise", "ping", "request-response", "tcp-async-io", "websocket", "yamux"]
 
+
 [dev-dependencies]
 assert_matches = "1.3"
 libp2p = { version = "0.34.0", default-features = false }

From 91a7418f33377e64b2a0dec47b4f9ef4376f1757 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Wed, 10 Feb 2021 10:27:05 +0100
Subject: [PATCH 0383/1194] pallet macro: easier syntax for `#[pallet::pallet]`
 with `struct Pallet<T>(_)` (#8091)

---
 bin/node-template/pallets/template/src/lib.rs          |  2 +-
 frame/assets/src/lib.rs                                |  2 +-
 .../procedural/src/pallet/expand/pallet_struct.rs      | 10 ++++++++++
 frame/support/src/lib.rs                               |  9 +++++----
 frame/support/test/tests/pallet.rs                     |  4 ++--
 frame/support/test/tests/pallet_compatibility.rs       |  2 +-
 .../support/test/tests/pallet_ui/hooks_invalid_item.rs |  4 ++--
 .../test/tests/pallet_ui/type_value_error_in_block.rs  |  4 ++--
 .../pallet_ui/type_value_forgotten_where_clause.rs     |  4 ++--
 .../test/tests/pallet_ui/type_value_invalid_item.rs    |  2 +-
 .../test/tests/pallet_ui/type_value_no_return.rs       |  2 +-
 frame/support/test/tests/pallet_version.rs             |  2 +-
 frame/system/src/lib.rs                                |  2 +-
 13 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/bin/node-template/pallets/template/src/lib.rs b/bin/node-template/pallets/template/src/lib.rs
index 5bf76624c1f1..52d9e8111d13 100644
--- a/bin/node-template/pallets/template/src/lib.rs
+++ b/bin/node-template/pallets/template/src/lib.rs
@@ -26,7 +26,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
-	pub struct Pallet<T>(PhantomData<T>);
+	pub struct Pallet<T>(_);
 
 	// The pallet's runtime storage items.
 	// https://substrate.dev/docs/en/knowledgebase/runtime/storage
diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index e5fa5f1fa5d1..7b04ea11bafe 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -143,7 +143,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
-	pub struct Pallet<T>(PhantomData<T>);
+	pub struct Pallet<T>(_);
 
 	#[pallet::config]
 	/// The module configuration trait.
diff --git a/frame/support/procedural/src/pallet/expand/pallet_struct.rs b/frame/support/procedural/src/pallet/expand/pallet_struct.rs
index aff7af4afb5e..6e456695d9a4 100644
--- a/frame/support/procedural/src/pallet/expand/pallet_struct.rs
+++ b/frame/support/procedural/src/pallet/expand/pallet_struct.rs
@@ -22,6 +22,7 @@ use crate::pallet::Def;
 /// * Implement OnGenesis on Pallet
 /// * Implement ModuleErrorMetadata on Pallet
 /// * declare Module type alias for construct_runtime
+/// * replace the first field type of `struct Pallet` with `PhantomData` if it is `_`
 pub fn expand_pallet_struct(def: &mut Def) -> proc_macro2::TokenStream {
 	let frame_support = &def.frame_support;
 	let frame_system = &def.frame_system;
@@ -41,6 +42,15 @@ pub fn expand_pallet_struct(def: &mut Def) -> proc_macro2::TokenStream {
 		}
 	};
 
+	// If the first field type is `_` then we replace with `PhantomData`
+	if let Some(field) = pallet_item.fields.iter_mut().next() {
+		if field.ty == syn::parse_quote!(_) {
+			field.ty = syn::parse_quote!(
+				#frame_support::sp_std::marker::PhantomData<(#type_use_gen)>
+			);
+		}
+	}
+
 	pallet_item.attrs.push(syn::parse_quote!(
 		#[derive(
 			#frame_support::CloneNoBound,
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 940e70852af5..8e4a635c2a48 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -1141,7 +1141,7 @@ pub mod pallet_prelude {
 /// Item must be defined as followed:
 /// ```ignore
 /// #[pallet::pallet]
-/// pub struct Pallet<T>(PhantomData<T>);
+/// pub struct Pallet<T>(_);
 /// ```
 /// I.e. a regular struct definition named `Pallet`, with generic T and no where clause.
 ///
@@ -1150,7 +1150,7 @@ pub mod pallet_prelude {
 /// ```ignore
 /// #[pallet::pallet]
 /// #[pallet::generate_store(pub(super) trait Store)]
-/// pub struct Pallet<T>(PhantomData<T>);
+/// pub struct Pallet<T>(_);
 /// ```
 /// More precisely the store trait contains an associated type for each storage. It is implemented
 /// for `Pallet` allowing to access the storage from pallet struct.
@@ -1169,6 +1169,7 @@ pub mod pallet_prelude {
 /// 	frame_support::RuntimeDebugNoBound,
 /// )]
 /// ```
+/// and replace the type `_` by `PhantomData<T>`.
 ///
 /// It implements on pallet:
 /// * [`traits::GetPalletVersion`]
@@ -1602,7 +1603,7 @@ pub mod pallet_prelude {
 /// 	// Define the pallet struct placeholder, various pallet function are implemented on it.
 /// 	#[pallet::pallet]
 /// 	#[pallet::generate_store(pub(super) trait Store)]
-/// 	pub struct Pallet<T>(PhantomData<T>);
+/// 	pub struct Pallet<T>(_);
 ///
 /// 	// Implement the pallet hooks.
 /// 	#[pallet::hooks]
@@ -1920,7 +1921,7 @@ pub mod pallet_prelude {
 /// 		#[pallet::generate_store($visibility_of_trait_store trait Store)]
 /// 		// NOTE: if the visibility of trait store is private but you want to make it available
 /// 		// in super, then use `pub(super)` or `pub(crate)` to make it available in crate.
-/// 		pub struct Pallet<T>(PhantomData<T>);
+/// 		pub struct Pallet<T>(_);
 /// 		// pub struct Pallet<T, I = ()>(PhantomData<T>); // for instantiable pallet
 /// 	}
 /// 	```
diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index 431377a70ee3..8e0bacb9aa4a 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -100,7 +100,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(crate) trait Store)]
-	pub struct Pallet<T>(PhantomData<T>);
+	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T>
@@ -290,7 +290,7 @@ pub mod pallet2 {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(crate) trait Store)]
-	pub struct Pallet<T>(PhantomData<T>);
+	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T>
diff --git a/frame/support/test/tests/pallet_compatibility.rs b/frame/support/test/tests/pallet_compatibility.rs
index 66d013441362..5b9001e0475f 100644
--- a/frame/support/test/tests/pallet_compatibility.rs
+++ b/frame/support/test/tests/pallet_compatibility.rs
@@ -106,7 +106,7 @@ pub mod pallet {
 	}
 
 	#[pallet::pallet]
-	pub struct Pallet<T>(PhantomData<T>);
+	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
 	impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {
diff --git a/frame/support/test/tests/pallet_ui/hooks_invalid_item.rs b/frame/support/test/tests/pallet_ui/hooks_invalid_item.rs
index fae12f133b6a..7c66b3e6cecc 100644
--- a/frame/support/test/tests/pallet_ui/hooks_invalid_item.rs
+++ b/frame/support/test/tests/pallet_ui/hooks_invalid_item.rs
@@ -1,12 +1,12 @@
 #[frame_support::pallet]
 mod pallet {
-	use frame_support::pallet_prelude::{Hooks, PhantomData};
+	use frame_support::pallet_prelude::Hooks;
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {}
 
 	#[pallet::pallet]
-	pub struct Pallet<T>(PhantomData<T>);
+	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
 	impl<T: Config> Hooks for Pallet<T> {}
diff --git a/frame/support/test/tests/pallet_ui/type_value_error_in_block.rs b/frame/support/test/tests/pallet_ui/type_value_error_in_block.rs
index 1a1c451ac39f..a13e1c7c5c2d 100644
--- a/frame/support/test/tests/pallet_ui/type_value_error_in_block.rs
+++ b/frame/support/test/tests/pallet_ui/type_value_error_in_block.rs
@@ -1,13 +1,13 @@
 #[frame_support::pallet]
 mod pallet {
-	use frame_support::pallet_prelude::{Hooks, PhantomData};
+	use frame_support::pallet_prelude::Hooks;
 	use frame_system::pallet_prelude::BlockNumberFor;
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {}
 
 	#[pallet::pallet]
-	pub struct Pallet<T>(PhantomData<T>);
+	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
diff --git a/frame/support/test/tests/pallet_ui/type_value_forgotten_where_clause.rs b/frame/support/test/tests/pallet_ui/type_value_forgotten_where_clause.rs
index 9c0662e3f77c..b04d8b894676 100644
--- a/frame/support/test/tests/pallet_ui/type_value_forgotten_where_clause.rs
+++ b/frame/support/test/tests/pallet_ui/type_value_forgotten_where_clause.rs
@@ -1,6 +1,6 @@
 #[frame_support::pallet]
 mod pallet {
-	use frame_support::pallet_prelude::{Hooks, PhantomData};
+	use frame_support::pallet_prelude::Hooks;
 	use frame_system::pallet_prelude::BlockNumberFor;
 
 	#[pallet::config]
@@ -9,7 +9,7 @@ mod pallet {
 	{}
 
 	#[pallet::pallet]
-	pub struct Pallet<T>(PhantomData<T>);
+	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T>
diff --git a/frame/support/test/tests/pallet_ui/type_value_invalid_item.rs b/frame/support/test/tests/pallet_ui/type_value_invalid_item.rs
index 476a4a8e1e78..1b6c975b09ed 100644
--- a/frame/support/test/tests/pallet_ui/type_value_invalid_item.rs
+++ b/frame/support/test/tests/pallet_ui/type_value_invalid_item.rs
@@ -7,7 +7,7 @@ mod pallet {
 	pub trait Config: frame_system::Config {}
 
 	#[pallet::pallet]
-	pub struct Pallet<T>(PhantomData<T>);
+	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
diff --git a/frame/support/test/tests/pallet_ui/type_value_no_return.rs b/frame/support/test/tests/pallet_ui/type_value_no_return.rs
index eb13436cac7c..82eb3b17d039 100644
--- a/frame/support/test/tests/pallet_ui/type_value_no_return.rs
+++ b/frame/support/test/tests/pallet_ui/type_value_no_return.rs
@@ -7,7 +7,7 @@ mod pallet {
 	pub trait Config: frame_system::Config {}
 
 	#[pallet::pallet]
-	pub struct Pallet<T>(PhantomData<T>);
+	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
diff --git a/frame/support/test/tests/pallet_version.rs b/frame/support/test/tests/pallet_version.rs
index a86a876b48a5..4cc93d395db2 100644
--- a/frame/support/test/tests/pallet_version.rs
+++ b/frame/support/test/tests/pallet_version.rs
@@ -86,7 +86,7 @@ mod pallet3 {
 	}
 
 	#[pallet::pallet]
-	pub struct Pallet<T>(PhantomData<T>);
+	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index 012185386bcf..e521a082a91c 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -257,7 +257,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub (super) trait Store)]
-	pub struct Pallet<T>(PhantomData<T>);
+	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {

From 90c97068fb2b58c41591ed27e00a2397309bb9c0 Mon Sep 17 00:00:00 2001
From: Shaun Wang <spxwang@gmail.com>
Date: Thu, 11 Feb 2021 00:22:39 +1300
Subject: [PATCH 0384/1194] Pallet attribute macro migrate guidelines minor
 fixes (#8094)

* Fix pallet attribute macro guidelines.

* Typo fixes.
---
 frame/support/src/lib.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 8e4a635c2a48..fc7939fe3010 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -1307,7 +1307,7 @@ pub mod pallet_prelude {
 /// ```ignore
 /// #[pallet::event]
 /// #[pallet::metadata($SomeType = "$Metadata", $SomeOtherType = "$Metadata", ..)] // Optional
-/// #[pallet::generate_deposit($visbility fn deposit_event)] // Optional
+/// #[pallet::generate_deposit($visibility fn deposit_event)] // Optional
 /// pub enum Event<$some_generic> $optional_where_clause {
 /// 	/// Some doc
 /// 	$SomeName($SomeType, $YetanotherType, ...),
@@ -1338,7 +1338,7 @@ pub mod pallet_prelude {
 /// ```
 /// will write in event variant metadata `"SpecialU32"` and `"T::AccountId"`.
 ///
-/// The attribute `#[pallet::generate_deposit($visbility fn deposit_event)]` generate a helper
+/// The attribute `#[pallet::generate_deposit($visibility fn deposit_event)]` generate a helper
 /// function on `Pallet` to deposit event.
 ///
 /// NOTE: For instantiable pallet, event must be generic over T and I.
@@ -2006,10 +2006,10 @@ pub mod pallet_prelude {
 /// 	implementation.
 ///
 /// 10. **migrate origin**: move the origin to the pallet module under `#[pallet::origin]`
-/// 11. **migrate validate_unsigned**: move the ValidateUnsigned implementation to the pallet
+/// 11. **migrate validate_unsigned**: move the `ValidateUnsigned` implementation to the pallet
 /// 	module under `#[pallet::validate_unsigned]`
-/// 12. **migrate provide_inherent**: move the ValidateUnsigned implementation to the pallet
-/// 	module under `#[pallet::provide_inherent]`
+/// 12. **migrate provide_inherent**: move the `ProvideInherent` implementation to the pallet
+/// 	module under `#[pallet::inherent]`
 /// 13. rename the usage of `Module` to `Pallet` inside the crate.
 /// 14. migration is done, now double check migration with the checking migration guidelines.
 ///

From 90bb153ae3722307966c02f0416ea280f8c2b2b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Wed, 10 Feb 2021 12:38:29 +0100
Subject: [PATCH 0385/1194] Switch to use `diener patch` for companion build
 (#8073)

This switch to the new `diener patch` command to patch all Substrate
crates in Polkadot. This should remove the requirement to manually merge
Substrate master to make the companion build, as we now would use the
already with master merged code from this build job local checkout.
---
 .maintain/gitlab/check_polkadot_companion_build.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.maintain/gitlab/check_polkadot_companion_build.sh b/.maintain/gitlab/check_polkadot_companion_build.sh
index 90354f809d4a..e5b308d038e2 100755
--- a/.maintain/gitlab/check_polkadot_companion_build.sh
+++ b/.maintain/gitlab/check_polkadot_companion_build.sh
@@ -51,6 +51,8 @@ git merge origin/master
 # ancestor for successfully performing merges below.
 git clone --depth 20 https://github.com/paritytech/polkadot.git
 
+cargo install -f diener
+
 cd polkadot
 
 # either it's a pull request then check for a companion otherwise use
@@ -85,9 +87,8 @@ else
   boldprint "this is not a pull request - building polkadot:master"
 fi
 
-cd ..
-diener --substrate --branch $CI_COMMIT_REF_NAME --git https://gitlab.parity.io/parity/substrate.git --path polkadot
-cd polkadot
+# Patch all Substrate crates in Polkadot
+diener patch --crates-to-patch ../ --substrate
 
 # Test Polkadot pr or master branch with this Substrate commit.
 cargo update -p sp-io

From 22441aa4bc40200cbd98503e6f44769dd39f7031 Mon Sep 17 00:00:00 2001
From: Andrew Jones <ascjones@gmail.com>
Date: Wed, 10 Feb 2021 12:33:25 +0000
Subject: [PATCH 0386/1194] Migrate pallet-balances to pallet attribute macro
 (#7936)

* Initial migration of balances pallet

* Fix some errors

* Remove unused imports

* Formatting and removing some todos

* Delete Subtrait

* Add genesis builder impls for tests

* Fix GenesisConfig impl

* Make set_balance visible to tests, rename RawEvent to Event

* Fix tests with Event rename etc.

* More test RawEvent renames

* Even more RawEvent renames

* Rename module to pallet in comments

* Add PalletInfo impl to avid storage collision, fixes tests

* Apply review suggestion: remove trailing a

Co-authored-by: David <dvdplm@gmail.com>

* BalancesEvent alias

* Remove BalancesEvent alias

* Review suggestion: remove redundant comment

* Apply review suggestion: make vis super

* Fis doc links

* Add RawEvent alias

* Add missing Instance parameter to deprecated RawEvent alias

* Fix RawEvent deprecation warnings

Co-authored-by: David <dvdplm@gmail.com>
---
 bin/node/executor/tests/basic.rs     |   8 +-
 bin/node/executor/tests/fees.rs      |   1 -
 frame/balances/src/lib.rs            | 637 ++++++++++++++-------------
 frame/balances/src/tests.rs          |  20 +-
 frame/balances/src/tests_local.rs    |  10 +-
 frame/contracts/src/tests.rs         |  24 +-
 frame/transaction-payment/src/lib.rs |   2 +-
 7 files changed, 373 insertions(+), 329 deletions(-)

diff --git a/bin/node/executor/tests/basic.rs b/bin/node/executor/tests/basic.rs
index 1d49f6613db1..d27954d3a721 100644
--- a/bin/node/executor/tests/basic.rs
+++ b/bin/node/executor/tests/basic.rs
@@ -17,7 +17,7 @@
 
 use codec::{Encode, Decode, Joiner};
 use frame_support::{
-	StorageValue, StorageMap,
+	StorageMap,
 	traits::Currency,
 	weights::{GetDispatchInfo, DispatchInfo, DispatchClass},
 };
@@ -336,7 +336,7 @@ fn full_native_block_import_works() {
 			},
 			EventRecord {
 				phase: Phase::ApplyExtrinsic(1),
-				event: Event::pallet_balances(pallet_balances::RawEvent::Transfer(
+				event: Event::pallet_balances(pallet_balances::Event::Transfer(
 					alice().into(),
 					bob().into(),
 					69 * DOLLARS,
@@ -389,7 +389,7 @@ fn full_native_block_import_works() {
 			EventRecord {
 				phase: Phase::ApplyExtrinsic(1),
 				event: Event::pallet_balances(
-					pallet_balances::RawEvent::Transfer(
+					pallet_balances::Event::Transfer(
 						bob().into(),
 						alice().into(),
 						5 * DOLLARS,
@@ -412,7 +412,7 @@ fn full_native_block_import_works() {
 			EventRecord {
 				phase: Phase::ApplyExtrinsic(2),
 				event: Event::pallet_balances(
-					pallet_balances::RawEvent::Transfer(
+					pallet_balances::Event::Transfer(
 						alice().into(),
 						bob().into(),
 						15 * DOLLARS,
diff --git a/bin/node/executor/tests/fees.rs b/bin/node/executor/tests/fees.rs
index 9d83610b689d..2e92077c4ada 100644
--- a/bin/node/executor/tests/fees.rs
+++ b/bin/node/executor/tests/fees.rs
@@ -17,7 +17,6 @@
 
 use codec::{Encode, Joiner};
 use frame_support::{
-	StorageValue,
 	traits::Currency,
 	weights::{GetDispatchInfo, constants::ExtrinsicBaseWeight, IdentityFee, WeightToFeePolynomial},
 };
diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index ef069455bbab..e3eb9478b649 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -15,17 +15,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! # Balances Module
+//! # Balances Pallet
 //!
-//! The Balances module provides functionality for handling accounts and balances.
+//! The Balances pallet provides functionality for handling accounts and balances.
 //!
-//! - [`balances::Config`](./trait.Config.html)
-//! - [`Call`](./enum.Call.html)
-//! - [`Module`](./struct.Module.html)
+//! - [`Config`]
+//! - [`Call`]
+//! - [`Pallet`]
 //!
 //! ## Overview
 //!
-//! The Balances module provides functions for:
+//! The Balances pallet provides functions for:
 //!
 //! - Getting and setting free balances.
 //! - Retrieving total, reserved and unreserved balances.
@@ -43,7 +43,7 @@
 //!   fall below this, then the account is said to be dead; and it loses its functionality as well as any
 //!   prior history and all information on it is removed from the chain's state.
 //!   No account should ever have a total balance that is strictly between 0 and the existential
-//!   deposit (exclusive). If this ever happens, it indicates either a bug in this module or an
+//!   deposit (exclusive). If this ever happens, it indicates either a bug in this pallet or an
 //!   erroneous raw mutation of storage.
 //!
 //! - **Total Issuance:** The total number of units in existence in a system.
@@ -67,20 +67,18 @@
 //!
 //! ### Implementations
 //!
-//! The Balances module provides implementations for the following traits. If these traits provide the functionality
-//! that you need, then you can avoid coupling with the Balances module.
+//! The Balances pallet provides implementations for the following traits. If these traits provide the functionality
+//! that you need, then you can avoid coupling with the Balances pallet.
 //!
-//! - [`Currency`](../frame_support/traits/trait.Currency.html): Functions for dealing with a
+//! - [`Currency`](frame_support::traits::Currency): Functions for dealing with a
 //! fungible assets system.
-//! - [`ReservableCurrency`](../frame_support/traits/trait.ReservableCurrency.html):
+//! - [`ReservableCurrency`](frame_support::traits::ReservableCurrency):
 //! Functions for dealing with assets that can be reserved from an account.
-//! - [`LockableCurrency`](../frame_support/traits/trait.LockableCurrency.html): Functions for
+//! - [`LockableCurrency`](frame_support::traits::LockableCurrency): Functions for
 //! dealing with accounts that allow liquidity restrictions.
-//! - [`Imbalance`](../frame_support/traits/trait.Imbalance.html): Functions for handling
+//! - [`Imbalance`](frame_support::traits::Imbalance): Functions for handling
 //! imbalances between total issuance in the system and account balances. Must be used when a function
 //! creates new funds (e.g. a reward) or destroys some funds (e.g. a system fee).
-//! - [`IsDeadAccount`](../frame_support/traits/trait.IsDeadAccount.html): Determiner to say whether a
-//! given account is unused.
 //!
 //! ## Interface
 //!
@@ -91,11 +89,11 @@
 //!
 //! ## Usage
 //!
-//! The following examples show how to use the Balances module in your custom module.
+//! The following examples show how to use the Balances pallet in your custom pallet.
 //!
 //! ### Examples from the FRAME
 //!
-//! The Contract module uses the `Currency` trait to handle gas payment, and its types inherit from `Currency`:
+//! The Contract pallet uses the `Currency` trait to handle gas payment, and its types inherit from `Currency`:
 //!
 //! ```
 //! use frame_support::traits::Currency;
@@ -109,7 +107,7 @@
 //! # fn main() {}
 //! ```
 //!
-//! The Staking module uses the `LockableCurrency` trait to lock a stash account's funds:
+//! The Staking pallet uses the `LockableCurrency` trait to lock a stash account's funds:
 //!
 //! ```
 //! use frame_support::traits::{WithdrawReasons, LockableCurrency};
@@ -141,7 +139,7 @@
 //!
 //! ## Genesis config
 //!
-//! The Balances module depends on the [`GenesisConfig`](./struct.GenesisConfig.html).
+//! The Balances pallet depends on the [`GenesisConfig`].
 //!
 //! ## Assumptions
 //!
@@ -160,7 +158,7 @@ use sp_std::prelude::*;
 use sp_std::{cmp, result, mem, fmt::Debug, ops::BitOr};
 use codec::{Codec, Encode, Decode};
 use frame_support::{
-	StorageValue, Parameter, decl_event, decl_storage, decl_module, decl_error, ensure,
+	ensure,
 	traits::{
 		Currency, OnUnbalanced, TryDrop, StoredMap,
 		WithdrawReasons, LockIdentifier, LockableCurrency, ExistenceRequirement,
@@ -168,98 +166,236 @@ use frame_support::{
 		ExistenceRequirement::AllowDeath, BalanceStatus as Status,
 	}
 };
+#[cfg(feature = "std")]
+use frame_support::traits::GenesisBuild;
 use sp_runtime::{
 	RuntimeDebug, DispatchResult, DispatchError,
 	traits::{
-		Zero, AtLeast32BitUnsigned, StaticLookup, Member, CheckedAdd, CheckedSub,
+		Zero, AtLeast32BitUnsigned, StaticLookup, CheckedAdd, CheckedSub,
 		MaybeSerializeDeserialize, Saturating, Bounded, StoredMapError,
 	},
 };
-use frame_system::{self as system, ensure_signed, ensure_root};
+use frame_system as system;
 pub use self::imbalances::{PositiveImbalance, NegativeImbalance};
 pub use weights::WeightInfo;
 
-pub trait Subtrait<I: Instance = DefaultInstance>: frame_system::Config {
-	/// The balance of an account.
-	type Balance: Parameter + Member + AtLeast32BitUnsigned + Codec + Default + Copy +
-		MaybeSerializeDeserialize + Debug;
+pub use pallet::*;
 
-	/// The minimum amount required to keep an account open.
-	type ExistentialDeposit: Get<Self::Balance>;
+#[frame_support::pallet]
+pub mod pallet {
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+	use super::*;
 
-	/// The means of storing the balances of an account.
-	type AccountStore: StoredMap<Self::AccountId, AccountData<Self::Balance>>;
+	#[pallet::config]
+	pub trait Config<I: 'static = ()>: frame_system::Config {
+		/// The balance of an account.
+		type Balance: Parameter + Member + AtLeast32BitUnsigned + Codec + Default + Copy +
+			MaybeSerializeDeserialize + Debug;
 
-	/// Weight information for the extrinsics in this pallet.
-	type WeightInfo: WeightInfo;
+		/// Handler for the unbalanced reduction when removing a dust account.
+		type DustRemoval: OnUnbalanced<NegativeImbalance<Self, I>>;
 
-	/// The maximum number of locks that should exist on an account.
-	/// Not strictly enforced, but used for weight estimation.
-	type MaxLocks: Get<u32>;
-}
+		/// The overarching event type.
+		type Event: From<Event<Self, I>> + IsType<<Self as frame_system::Config>::Event>;
 
-pub trait Config<I: Instance = DefaultInstance>: frame_system::Config {
-	/// The balance of an account.
-	type Balance: Parameter + Member + AtLeast32BitUnsigned + Codec + Default + Copy +
-		MaybeSerializeDeserialize + Debug;
+		/// The minimum amount required to keep an account open.
+		#[pallet::constant]
+		type ExistentialDeposit: Get<Self::Balance>;
 
-	/// Handler for the unbalanced reduction when removing a dust account.
-	type DustRemoval: OnUnbalanced<NegativeImbalance<Self, I>>;
+		/// The means of storing the balances of an account.
+		type AccountStore: StoredMap<Self::AccountId, AccountData<Self::Balance>>;
 
-	/// The overarching event type.
-	type Event: From<Event<Self, I>> + Into<<Self as frame_system::Config>::Event>;
+		/// Weight information for extrinsics in this pallet.
+		type WeightInfo: WeightInfo;
 
-	/// The minimum amount required to keep an account open.
-	type ExistentialDeposit: Get<Self::Balance>;
+		/// The maximum number of locks that should exist on an account.
+		/// Not strictly enforced, but used for weight estimation.
+		type MaxLocks: Get<u32>;
+	}
 
-	/// The means of storing the balances of an account.
-	type AccountStore: StoredMap<Self::AccountId, AccountData<Self::Balance>>;
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T, I=()>(PhantomData<(T, I)>);
 
-	/// Weight information for extrinsics in this pallet.
-	type WeightInfo: WeightInfo;
+	#[pallet::hooks]
+	impl<T: Config<I>, I: 'static> Hooks<BlockNumberFor<T>> for Pallet<T, I> {
+	}
 
-	/// The maximum number of locks that should exist on an account.
-	/// Not strictly enforced, but used for weight estimation.
-	type MaxLocks: Get<u32>;
-}
+	#[pallet::call]
+	impl<T: Config<I>, I: 'static> Pallet<T, I> {
+		/// Transfer some liquid free balance to another account.
+		///
+		/// `transfer` will set the `FreeBalance` of the sender and receiver.
+		/// It will decrease the total issuance of the system by the `TransferFee`.
+		/// If the sender's account is below the existential deposit as a result
+		/// of the transfer, the account will be reaped.
+		///
+		/// The dispatch origin for this call must be `Signed` by the transactor.
+		///
+		/// # <weight>
+		/// - Dependent on arguments but not critical, given proper implementations for
+		///   input config types. See related functions below.
+		/// - It contains a limited number of reads and writes internally and no complex computation.
+		///
+		/// Related functions:
+		///
+		///   - `ensure_can_withdraw` is always called internally but has a bounded complexity.
+		///   - Transferring balances to accounts that did not exist before will cause
+		///      `T::OnNewAccount::on_new_account` to be called.
+		///   - Removing enough funds from an account will trigger `T::DustRemoval::on_unbalanced`.
+		///   - `transfer_keep_alive` works the same way as `transfer`, but has an additional
+		///     check that the transfer will not kill the origin account.
+		/// ---------------------------------
+		/// - Base Weight: 73.64 µs, worst case scenario (account created, account removed)
+		/// - DB Weight: 1 Read and 1 Write to destination account
+		/// - Origin account is already in memory, so no DB operations for them.
+		/// # </weight>
+		#[pallet::weight(T::WeightInfo::transfer())]
+		pub fn transfer(
+			origin: OriginFor<T>,
+			dest: <T::Lookup as StaticLookup>::Source,
+			#[pallet::compact] value: T::Balance,
+		) -> DispatchResultWithPostInfo {
+			let transactor = ensure_signed(origin)?;
+			let dest = T::Lookup::lookup(dest)?;
+			<Self as Currency<_>>::transfer(&transactor, &dest, value, ExistenceRequirement::AllowDeath)?;
+			Ok(().into())
+		}
 
-impl<T: Config<I>, I: Instance> Subtrait<I> for T {
-	type Balance = T::Balance;
-	type ExistentialDeposit = T::ExistentialDeposit;
-	type AccountStore = T::AccountStore;
-	type WeightInfo = <T as Config<I>>::WeightInfo;
-	type MaxLocks = T::MaxLocks;
-}
+		/// Set the balances of a given account.
+		///
+		/// This will alter `FreeBalance` and `ReservedBalance` in storage. it will
+		/// also decrease the total issuance of the system (`TotalIssuance`).
+		/// If the new free or reserved balance is below the existential deposit,
+		/// it will reset the account nonce (`frame_system::AccountNonce`).
+		///
+		/// The dispatch origin for this call is `root`.
+		///
+		/// # <weight>
+		/// - Independent of the arguments.
+		/// - Contains a limited number of reads and writes.
+		/// ---------------------
+		/// - Base Weight:
+		///     - Creating: 27.56 µs
+		///     - Killing: 35.11 µs
+		/// - DB Weight: 1 Read, 1 Write to `who`
+		/// # </weight>
+		#[pallet::weight(
+			T::WeightInfo::set_balance_creating() // Creates a new account.
+				.max(T::WeightInfo::set_balance_killing()) // Kills an existing account.
+		)]
+		pub(super) fn set_balance(
+			origin: OriginFor<T>,
+			who: <T::Lookup as StaticLookup>::Source,
+			#[pallet::compact] new_free: T::Balance,
+			#[pallet::compact] new_reserved: T::Balance,
+		) -> DispatchResultWithPostInfo {
+			ensure_root(origin)?;
+			let who = T::Lookup::lookup(who)?;
+			let existential_deposit = T::ExistentialDeposit::get();
 
-decl_event!(
-	pub enum Event<T, I: Instance = DefaultInstance> where
-		<T as frame_system::Config>::AccountId,
-		<T as Config<I>>::Balance
-	{
+			let wipeout = new_free + new_reserved < existential_deposit;
+			let new_free = if wipeout { Zero::zero() } else { new_free };
+			let new_reserved = if wipeout { Zero::zero() } else { new_reserved };
+
+			let (free, reserved) = Self::mutate_account(&who, |account| {
+				if new_free > account.free {
+					mem::drop(PositiveImbalance::<T, I>::new(new_free - account.free));
+				} else if new_free < account.free {
+					mem::drop(NegativeImbalance::<T, I>::new(account.free - new_free));
+				}
+
+				if new_reserved > account.reserved {
+					mem::drop(PositiveImbalance::<T, I>::new(new_reserved - account.reserved));
+				} else if new_reserved < account.reserved {
+					mem::drop(NegativeImbalance::<T, I>::new(account.reserved - new_reserved));
+				}
+
+				account.free = new_free;
+				account.reserved = new_reserved;
+
+				(account.free, account.reserved)
+			})?;
+			Self::deposit_event(Event::BalanceSet(who, free, reserved));
+			Ok(().into())
+		}
+
+		/// Exactly as `transfer`, except the origin must be root and the source account may be
+		/// specified.
+		/// # <weight>
+		/// - Same as transfer, but additional read and write because the source account is
+		///   not assumed to be in the overlay.
+		/// # </weight>
+		#[pallet::weight(T::WeightInfo::force_transfer())]
+		pub fn force_transfer(
+			origin: OriginFor<T>,
+			source: <T::Lookup as StaticLookup>::Source,
+			dest: <T::Lookup as StaticLookup>::Source,
+			#[pallet::compact] value: T::Balance,
+		) -> DispatchResultWithPostInfo {
+			ensure_root(origin)?;
+			let source = T::Lookup::lookup(source)?;
+			let dest = T::Lookup::lookup(dest)?;
+			<Self as Currency<_>>::transfer(&source, &dest, value, ExistenceRequirement::AllowDeath)?;
+			Ok(().into())
+		}
+
+		/// Same as the [`transfer`] call, but with a check that the transfer will not kill the
+		/// origin account.
+		///
+		/// 99% of the time you want [`transfer`] instead.
+		///
+		/// [`transfer`]: struct.Pallet.html#method.transfer
+		/// # <weight>
+		/// - Cheaper than transfer because account cannot be killed.
+		/// - Base Weight: 51.4 µs
+		/// - DB Weight: 1 Read and 1 Write to dest (sender is in overlay already)
+		/// #</weight>
+		#[pallet::weight(T::WeightInfo::transfer_keep_alive())]
+		pub fn transfer_keep_alive(
+			origin: OriginFor<T>,
+			dest: <T::Lookup as StaticLookup>::Source,
+			#[pallet::compact] value: T::Balance,
+		) -> DispatchResultWithPostInfo {
+			let transactor = ensure_signed(origin)?;
+			let dest = T::Lookup::lookup(dest)?;
+			<Self as Currency<_>>::transfer(&transactor, &dest, value, KeepAlive)?;
+			Ok(().into())
+		}
+	}
+
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	#[pallet::metadata(T::AccountId = "AccountId", T::Balance = "Balance")]
+	pub enum Event<T: Config<I>, I: 'static = ()> {
 		/// An account was created with some free balance. \[account, free_balance\]
-		Endowed(AccountId, Balance),
+		Endowed(T::AccountId, T::Balance),
 		/// An account was removed whose balance was non-zero but below ExistentialDeposit,
 		/// resulting in an outright loss. \[account, balance\]
-		DustLost(AccountId, Balance),
+		DustLost(T::AccountId, T::Balance),
 		/// Transfer succeeded. \[from, to, value\]
-		Transfer(AccountId, AccountId, Balance),
+		Transfer(T::AccountId, T::AccountId, T::Balance),
 		/// A balance was set by root. \[who, free, reserved\]
-		BalanceSet(AccountId, Balance, Balance),
+		BalanceSet(T::AccountId, T::Balance, T::Balance),
 		/// Some amount was deposited (e.g. for transaction fees). \[who, deposit\]
-		Deposit(AccountId, Balance),
+		Deposit(T::AccountId, T::Balance),
 		/// Some balance was reserved (moved from free to reserved). \[who, value\]
-		Reserved(AccountId, Balance),
+		Reserved(T::AccountId, T::Balance),
 		/// Some balance was unreserved (moved from reserved to free). \[who, value\]
-		Unreserved(AccountId, Balance),
+		Unreserved(T::AccountId, T::Balance),
 		/// Some balance was moved from the reserve of the first account to the second account.
 		/// Final argument indicates the destination balance type.
 		/// \[from, to, balance, destination_status\]
-		ReserveRepatriated(AccountId, AccountId, Balance, Status),
+		ReserveRepatriated(T::AccountId, T::AccountId, T::Balance, Status),
 	}
-);
 
-decl_error! {
-	pub enum Error for Module<T: Config<I>, I: Instance> {
+	/// Old name generated by `decl_event`.
+	#[deprecated(note = "use `Event` instead")]
+	pub type RawEvent<T, I = ()> = Event<T, I>;
+
+	#[pallet::error]
+	pub enum Error<T, I = ()> {
 		/// Vesting balance too high to send value
 		VestingBalance,
 		/// Account liquidity restrictions prevent withdrawal
@@ -277,6 +413,107 @@ decl_error! {
 		/// Beneficiary account must pre-exist
 		DeadAccount,
 	}
+
+	/// The total units issued in the system.
+	#[pallet::storage]
+	#[pallet::getter(fn total_issuance)]
+	pub type TotalIssuance<T: Config<I>, I: 'static = ()> = StorageValue<_, T::Balance, ValueQuery>;
+
+	/// The balance of an account.
+	///
+	/// NOTE: This is only used in the case that this pallet is used to store balances.
+	#[pallet::storage]
+	pub type Account<T: Config<I>, I: 'static = ()> = StorageMap<
+		_,
+		Blake2_128Concat,
+		T::AccountId,
+		AccountData<T::Balance>,
+		ValueQuery
+	>;
+
+	/// Any liquidity locks on some account balances.
+	/// NOTE: Should only be accessed when setting, changing and freeing a lock.
+	#[pallet::storage]
+	#[pallet::getter(fn locks)]
+	pub type Locks<T: Config<I>, I: 'static = ()> = StorageMap<
+		_,
+		Blake2_128Concat,
+		T::AccountId,
+		Vec<BalanceLock<T::Balance>>,
+		ValueQuery
+	>;
+
+	/// Storage version of the pallet.
+	///
+	/// This is set to v2.0.0 for new networks.
+	#[pallet::storage]
+	pub(super) type StorageVersion<T: Config<I>, I: 'static = ()> = StorageValue<
+		_,
+		Releases,
+		ValueQuery
+	>;
+
+	#[pallet::genesis_config]
+	pub struct GenesisConfig<T: Config<I>, I: 'static = ()> {
+		pub balances: Vec<(T::AccountId, T::Balance)>,
+	}
+
+	#[cfg(feature = "std")]
+	impl<T: Config<I>, I: 'static> Default for GenesisConfig<T, I> {
+		fn default() -> Self {
+			Self {
+				balances: Default::default(),
+			}
+		}
+	}
+
+	#[pallet::genesis_build]
+	impl<T: Config<I>, I: 'static> GenesisBuild<T, I> for GenesisConfig<T, I> {
+		fn build(&self) {
+			let total = self.balances
+				.iter()
+				.fold(Zero::zero(), |acc: T::Balance, &(_, n)| acc + n);
+			<TotalIssuance<T, I>>::put(total);
+
+			<StorageVersion<T, I>>::put(Releases::V2_0_0);
+
+			for (_, balance) in &self.balances {
+				assert!(
+					*balance >= <T as Config<I>>::ExistentialDeposit::get(),
+					"the balance of any account should always be at least the existential deposit.",
+				)
+			}
+
+			// ensure no duplicates exist.
+			let endowed_accounts = self.balances.iter().map(|(x, _)| x).cloned().collect::<std::collections::BTreeSet<_>>();
+
+			assert!(endowed_accounts.len() == self.balances.len(), "duplicate balances in genesis.");
+
+			for &(ref who, free) in self.balances.iter() {
+				assert!(T::AccountStore::insert(who, AccountData { free, ..Default::default() }).is_ok());
+			}
+		}
+	}
+}
+
+#[cfg(feature = "std")]
+impl<T: Config<I>, I: 'static> GenesisConfig<T, I> {
+	/// Direct implementation of `GenesisBuild::build_storage`.
+	///
+	/// Kept in order not to break dependency.
+	pub fn build_storage(&self) -> Result<sp_runtime::Storage, String> {
+		<Self as GenesisBuild<T, I>>::build_storage(self)
+	}
+
+	/// Direct implementation of `GenesisBuild::assimilate_storage`.
+	///
+	/// Kept in order not to break dependency.
+	pub fn assimilate_storage(
+		&self,
+		storage: &mut sp_runtime::Storage
+	) -> Result<(), String> {
+		<Self as GenesisBuild<T, I>>::assimilate_storage(self, storage)
+	}
 }
 
 /// Simplified reasons for withdrawing balance.
@@ -381,199 +618,7 @@ impl Default for Releases {
 	}
 }
 
-decl_storage! {
-	trait Store for Module<T: Config<I>, I: Instance=DefaultInstance> as Balances {
-		/// The total units issued in the system.
-		pub TotalIssuance get(fn total_issuance) build(|config: &GenesisConfig<T, I>| {
-			config.balances.iter().fold(Zero::zero(), |acc: T::Balance, &(_, n)| acc + n)
-		}): T::Balance;
-
-		/// The balance of an account.
-		///
-		/// NOTE: This is only used in the case that this module is used to store balances.
-		pub Account: map hasher(blake2_128_concat) T::AccountId => AccountData<T::Balance>;
-
-		/// Any liquidity locks on some account balances.
-		/// NOTE: Should only be accessed when setting, changing and freeing a lock.
-		pub Locks get(fn locks): map hasher(blake2_128_concat) T::AccountId => Vec<BalanceLock<T::Balance>>;
-
-		/// Storage version of the pallet.
-		///
-		/// This is set to v2.0.0 for new networks.
-		StorageVersion build(|_: &GenesisConfig<T, I>| Releases::V2_0_0): Releases;
-	}
-	add_extra_genesis {
-		config(balances): Vec<(T::AccountId, T::Balance)>;
-		// ^^ begin, length, amount liquid at genesis
-		build(|config: &GenesisConfig<T, I>| {
-			for (_, balance) in &config.balances {
-				assert!(
-					*balance >= <T as Config<I>>::ExistentialDeposit::get(),
-					"the balance of any account should always be at least the existential deposit.",
-				)
-			}
-
-			// ensure no duplicates exist.
-			let endowed_accounts = config.balances.iter().map(|(x, _)| x).cloned().collect::<std::collections::BTreeSet<_>>();
-
-			assert!(endowed_accounts.len() == config.balances.len(), "duplicate balances in genesis.");
-
-			for &(ref who, free) in config.balances.iter() {
-				assert!(T::AccountStore::insert(who, AccountData { free, .. Default::default() }).is_ok());
-			}
-		});
-	}
-}
-
-decl_module! {
-	pub struct Module<T: Config<I>, I: Instance = DefaultInstance> for enum Call where origin: T::Origin {
-		type Error = Error<T, I>;
-
-		/// The minimum amount required to keep an account open.
-		const ExistentialDeposit: T::Balance = T::ExistentialDeposit::get();
-
-		fn deposit_event() = default;
-
-		/// Transfer some liquid free balance to another account.
-		///
-		/// `transfer` will set the `FreeBalance` of the sender and receiver.
-		/// It will decrease the total issuance of the system by the `TransferFee`.
-		/// If the sender's account is below the existential deposit as a result
-		/// of the transfer, the account will be reaped.
-		///
-		/// The dispatch origin for this call must be `Signed` by the transactor.
-		///
-		/// # <weight>
-		/// - Dependent on arguments but not critical, given proper implementations for
-		///   input config types. See related functions below.
-		/// - It contains a limited number of reads and writes internally and no complex computation.
-		///
-		/// Related functions:
-		///
-		///   - `ensure_can_withdraw` is always called internally but has a bounded complexity.
-		///   - Transferring balances to accounts that did not exist before will cause
-		///      `T::OnNewAccount::on_new_account` to be called.
-		///   - Removing enough funds from an account will trigger `T::DustRemoval::on_unbalanced`.
-		///   - `transfer_keep_alive` works the same way as `transfer`, but has an additional
-		///     check that the transfer will not kill the origin account.
-		/// ---------------------------------
-		/// - Base Weight: 73.64 µs, worst case scenario (account created, account removed)
-		/// - DB Weight: 1 Read and 1 Write to destination account
-		/// - Origin account is already in memory, so no DB operations for them.
-		/// # </weight>
-		#[weight = T::WeightInfo::transfer()]
-		pub fn transfer(
-			origin,
-			dest: <T::Lookup as StaticLookup>::Source,
-			#[compact] value: T::Balance
-		) {
-			let transactor = ensure_signed(origin)?;
-			let dest = T::Lookup::lookup(dest)?;
-			<Self as Currency<_>>::transfer(&transactor, &dest, value, ExistenceRequirement::AllowDeath)?;
-		}
-
-		/// Set the balances of a given account.
-		///
-		/// This will alter `FreeBalance` and `ReservedBalance` in storage. it will
-		/// also decrease the total issuance of the system (`TotalIssuance`).
-		/// If the new free or reserved balance is below the existential deposit,
-		/// it will reset the account nonce (`frame_system::AccountNonce`).
-		///
-		/// The dispatch origin for this call is `root`.
-		///
-		/// # <weight>
-		/// - Independent of the arguments.
-		/// - Contains a limited number of reads and writes.
-		/// ---------------------
-		/// - Base Weight:
-		///     - Creating: 27.56 µs
-		///     - Killing: 35.11 µs
-		/// - DB Weight: 1 Read, 1 Write to `who`
-		/// # </weight>
-		#[weight = T::WeightInfo::set_balance_creating() // Creates a new account.
-			.max(T::WeightInfo::set_balance_killing()) // Kills an existing account.
-		]
-		fn set_balance(
-			origin,
-			who: <T::Lookup as StaticLookup>::Source,
-			#[compact] new_free: T::Balance,
-			#[compact] new_reserved: T::Balance
-		) {
-			ensure_root(origin)?;
-			let who = T::Lookup::lookup(who)?;
-			let existential_deposit = T::ExistentialDeposit::get();
-
-			let wipeout = new_free + new_reserved < existential_deposit;
-			let new_free = if wipeout { Zero::zero() } else { new_free };
-			let new_reserved = if wipeout { Zero::zero() } else { new_reserved };
-
-			let (free, reserved) = Self::mutate_account(&who, |account| {
-				if new_free > account.free {
-					mem::drop(PositiveImbalance::<T, I>::new(new_free - account.free));
-				} else if new_free < account.free {
-					mem::drop(NegativeImbalance::<T, I>::new(account.free - new_free));
-				}
-
-				if new_reserved > account.reserved {
-					mem::drop(PositiveImbalance::<T, I>::new(new_reserved - account.reserved));
-				} else if new_reserved < account.reserved {
-					mem::drop(NegativeImbalance::<T, I>::new(account.reserved - new_reserved));
-				}
-
-				account.free = new_free;
-				account.reserved = new_reserved;
-
-				(account.free, account.reserved)
-			})?;
-			Self::deposit_event(RawEvent::BalanceSet(who, free, reserved));
-		}
-
-		/// Exactly as `transfer`, except the origin must be root and the source account may be
-		/// specified.
-		/// # <weight>
-		/// - Same as transfer, but additional read and write because the source account is
-		///   not assumed to be in the overlay.
-		/// # </weight>
-		#[weight = T::WeightInfo::force_transfer()]
-		pub fn force_transfer(
-			origin,
-			source: <T::Lookup as StaticLookup>::Source,
-			dest: <T::Lookup as StaticLookup>::Source,
-			#[compact] value: T::Balance
-		) {
-			ensure_root(origin)?;
-			let source = T::Lookup::lookup(source)?;
-			let dest = T::Lookup::lookup(dest)?;
-			<Self as Currency<_>>::transfer(&source, &dest, value, ExistenceRequirement::AllowDeath)?;
-		}
-
-		/// Same as the [`transfer`] call, but with a check that the transfer will not kill the
-		/// origin account.
-		///
-		/// 99% of the time you want [`transfer`] instead.
-		///
-		/// [`transfer`]: struct.Module.html#method.transfer
-		/// # <weight>
-		/// - Cheaper than transfer because account cannot be killed.
-		/// - Base Weight: 51.4 µs
-		/// - DB Weight: 1 Read and 1 Write to dest (sender is in overlay already)
-		/// #</weight>
-		#[weight = T::WeightInfo::transfer_keep_alive()]
-		pub fn transfer_keep_alive(
-			origin,
-			dest: <T::Lookup as StaticLookup>::Source,
-			#[compact] value: T::Balance
-		) {
-			let transactor = ensure_signed(origin)?;
-			let dest = T::Lookup::lookup(dest)?;
-			<Self as Currency<_>>::transfer(&transactor, &dest, value, KeepAlive)?;
-		}
-	}
-}
-
-impl<T: Config<I>, I: Instance> Module<T, I> {
-	// PRIVATE MUTABLES
-
+impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	/// Get the free balance of an account.
 	pub fn free_balance(who: impl sp_std::borrow::Borrow<T::AccountId>) -> T::Balance {
 		Self::account(who.borrow()).free
@@ -615,7 +660,7 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 		if total < T::ExistentialDeposit::get() {
 			if !total.is_zero() {
 				T::DustRemoval::on_unbalanced(NegativeImbalance::new(total));
-				Self::deposit_event(RawEvent::DustLost(who.clone(), total));
+				Self::deposit_event(Event::DustLost(who.clone(), total));
 			}
 			None
 		} else {
@@ -661,7 +706,7 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 			})
 		}).map(|(maybe_endowed, result)| {
 			if let Some(endowed) = maybe_endowed {
-				Self::deposit_event(RawEvent::Endowed(who.clone(), endowed));
+				Self::deposit_event(Event::Endowed(who.clone(), endowed));
 			}
 			result
 		})
@@ -695,12 +740,12 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 			if existed {
 				// TODO: use Locks::<T, I>::hashed_key
 				// https://github.com/paritytech/substrate/issues/4969
-				system::Module::<T>::dec_consumers(who);
+				system::Pallet::<T>::dec_consumers(who);
 			}
 		} else {
 			Locks::<T, I>::insert(who, locks);
 			if !existed {
-				if system::Module::<T>::inc_consumers(who).is_err() {
+				if system::Pallet::<T>::inc_consumers(who).is_err() {
 					// No providers for the locks. This is impossible under normal circumstances
 					// since the funds that are under the lock will themselves be stored in the
 					// account and therefore will need a reference.
@@ -718,8 +763,8 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 // of the inner member.
 mod imbalances {
 	use super::{
-		result, DefaultInstance, Imbalance, Config, Zero, Instance, Saturating,
-		StorageValue, TryDrop, RuntimeDebug,
+		result, Imbalance, Config, Zero, Saturating,
+		TryDrop, RuntimeDebug,
 	};
 	use sp_std::mem;
 
@@ -727,9 +772,9 @@ mod imbalances {
 	/// funds have been created without any equal and opposite accounting.
 	#[must_use]
 	#[derive(RuntimeDebug, PartialEq, Eq)]
-	pub struct PositiveImbalance<T: Config<I>, I: Instance=DefaultInstance>(T::Balance);
+	pub struct PositiveImbalance<T: Config<I>, I: 'static>(T::Balance);
 
-	impl<T: Config<I>, I: Instance> PositiveImbalance<T, I> {
+	impl<T: Config<I>, I: 'static> PositiveImbalance<T, I> {
 		/// Create a new positive imbalance from a balance.
 		pub fn new(amount: T::Balance) -> Self {
 			PositiveImbalance(amount)
@@ -740,22 +785,22 @@ mod imbalances {
 	/// funds have been destroyed without any equal and opposite accounting.
 	#[must_use]
 	#[derive(RuntimeDebug, PartialEq, Eq)]
-	pub struct NegativeImbalance<T: Config<I>, I: Instance=DefaultInstance>(T::Balance);
+	pub struct NegativeImbalance<T: Config<I>, I: 'static>(T::Balance);
 
-	impl<T: Config<I>, I: Instance> NegativeImbalance<T, I> {
+	impl<T: Config<I>, I: 'static> NegativeImbalance<T, I> {
 		/// Create a new negative imbalance from a balance.
 		pub fn new(amount: T::Balance) -> Self {
 			NegativeImbalance(amount)
 		}
 	}
 
-	impl<T: Config<I>, I: Instance> TryDrop for PositiveImbalance<T, I> {
+	impl<T: Config<I>, I: 'static> TryDrop for PositiveImbalance<T, I> {
 		fn try_drop(self) -> result::Result<(), Self> {
 			self.drop_zero()
 		}
 	}
 
-	impl<T: Config<I>, I: Instance> Imbalance<T::Balance> for PositiveImbalance<T, I> {
+	impl<T: Config<I>, I: 'static> Imbalance<T::Balance> for PositiveImbalance<T, I> {
 		type Opposite = NegativeImbalance<T, I>;
 
 		fn zero() -> Self {
@@ -800,13 +845,13 @@ mod imbalances {
 		}
 	}
 
-	impl<T: Config<I>, I: Instance> TryDrop for NegativeImbalance<T, I> {
+	impl<T: Config<I>, I: 'static> TryDrop for NegativeImbalance<T, I> {
 		fn try_drop(self) -> result::Result<(), Self> {
 			self.drop_zero()
 		}
 	}
 
-	impl<T: Config<I>, I: Instance> Imbalance<T::Balance> for NegativeImbalance<T, I> {
+	impl<T: Config<I>, I: 'static> Imbalance<T::Balance> for NegativeImbalance<T, I> {
 		type Opposite = PositiveImbalance<T, I>;
 
 		fn zero() -> Self {
@@ -851,7 +896,7 @@ mod imbalances {
 		}
 	}
 
-	impl<T: Config<I>, I: Instance> Drop for PositiveImbalance<T, I> {
+	impl<T: Config<I>, I: 'static> Drop for PositiveImbalance<T, I> {
 		/// Basic drop handler will just square up the total issuance.
 		fn drop(&mut self) {
 			<super::TotalIssuance<T, I>>::mutate(
@@ -860,7 +905,7 @@ mod imbalances {
 		}
 	}
 
-	impl<T: Config<I>, I: Instance> Drop for NegativeImbalance<T, I> {
+	impl<T: Config<I>, I: 'static> Drop for NegativeImbalance<T, I> {
 		/// Basic drop handler will just square up the total issuance.
 		fn drop(&mut self) {
 			<super::TotalIssuance<T, I>>::mutate(
@@ -870,7 +915,7 @@ mod imbalances {
 	}
 }
 
-impl<T: Config<I>, I: Instance> Currency<T::AccountId> for Module<T, I> where
+impl<T: Config<I>, I: 'static> Currency<T::AccountId> for Pallet<T, I> where
 	T::Balance: MaybeSerializeDeserialize + Debug
 {
 	type Balance = T::Balance;
@@ -932,7 +977,7 @@ impl<T: Config<I>, I: Instance> Currency<T::AccountId> for Module<T, I> where
 	//
 	// # <weight>
 	// Despite iterating over a list of locks, they are limited by the number of
-	// lock IDs, which means the number of runtime modules that intend to use and create locks.
+	// lock IDs, which means the number of runtime pallets that intend to use and create locks.
 	// # </weight>
 	fn ensure_can_withdraw(
 		who: &T::AccountId,
@@ -975,10 +1020,10 @@ impl<T: Config<I>, I: Instance> Currency<T::AccountId> for Module<T, I> where
 					from_account.free,
 				).map_err(|_| Error::<T, I>::LiquidityRestrictions)?;
 
-				// TODO: This is over-conservative. There may now be other providers, and this module
+				// TODO: This is over-conservative. There may now be other providers, and this pallet
 				//   may not even be a provider.
 				let allow_death = existence_requirement == ExistenceRequirement::AllowDeath;
-				let allow_death = allow_death && !system::Module::<T>::is_provider_required(transactor);
+				let allow_death = allow_death && !system::Pallet::<T>::is_provider_required(transactor);
 				ensure!(allow_death || from_account.free >= ed, Error::<T, I>::KeepAlive);
 
 				Ok(())
@@ -986,7 +1031,7 @@ impl<T: Config<I>, I: Instance> Currency<T::AccountId> for Module<T, I> where
 		})?;
 
 		// Emit transfer event.
-		Self::deposit_event(RawEvent::Transfer(transactor.clone(), dest.clone(), value));
+		Self::deposit_event(Event::Transfer(transactor.clone(), dest.clone(), value));
 
 		Ok(())
 	}
@@ -1156,7 +1201,7 @@ impl<T: Config<I>, I: Instance> Currency<T::AccountId> for Module<T, I> where
 	}
 }
 
-impl<T: Config<I>, I: Instance> ReservableCurrency<T::AccountId> for Module<T, I>  where
+impl<T: Config<I>, I: 'static> ReservableCurrency<T::AccountId> for Pallet<T, I>  where
 	T::Balance: MaybeSerializeDeserialize + Debug
 {
 	/// Check if `who` can reserve `value` from their free balance.
@@ -1187,7 +1232,7 @@ impl<T: Config<I>, I: Instance> ReservableCurrency<T::AccountId> for Module<T, I
 			Self::ensure_can_withdraw(&who, value.clone(), WithdrawReasons::RESERVE, account.free)
 		})?;
 
-		Self::deposit_event(RawEvent::Reserved(who.clone(), value));
+		Self::deposit_event(Event::Reserved(who.clone(), value));
 		Ok(())
 	}
 
@@ -1215,7 +1260,7 @@ impl<T: Config<I>, I: Instance> ReservableCurrency<T::AccountId> for Module<T, I
 			}
 		};
 
-		Self::deposit_event(RawEvent::Unreserved(who.clone(), actual.clone()));
+		Self::deposit_event(Event::Unreserved(who.clone(), actual.clone()));
 		value - actual
 	}
 
@@ -1290,12 +1335,12 @@ impl<T: Config<I>, I: Instance> ReservableCurrency<T::AccountId> for Module<T, I
 			})
 		})?;
 
-		Self::deposit_event(RawEvent::ReserveRepatriated(slashed.clone(), beneficiary.clone(), actual, status));
+		Self::deposit_event(Event::ReserveRepatriated(slashed.clone(), beneficiary.clone(), actual, status));
 		Ok(value - actual)
 	}
 }
 
-impl<T: Config<I>, I: Instance> LockableCurrency<T::AccountId> for Module<T, I>
+impl<T: Config<I>, I: 'static> LockableCurrency<T::AccountId> for Pallet<T, I>
 where
 	T::Balance: MaybeSerializeDeserialize + Debug
 {
diff --git a/frame/balances/src/tests.rs b/frame/balances/src/tests.rs
index de7ccc6d239f..c860a0364d4b 100644
--- a/frame/balances/src/tests.rs
+++ b/frame/balances/src/tests.rs
@@ -26,7 +26,7 @@ macro_rules! decl_tests {
 		use crate::*;
 		use sp_runtime::{FixedPointNumber, traits::{SignedExtension, BadOrigin}};
 		use frame_support::{
-			assert_noop, assert_storage_noop, assert_ok, assert_err,
+			assert_noop, assert_storage_noop, assert_ok, assert_err, StorageValue,
 			traits::{
 				LockableCurrency, LockIdentifier, WithdrawReasons,
 				Currency, ReservableCurrency, ExistenceRequirement::AllowDeath
@@ -469,7 +469,7 @@ macro_rules! decl_tests {
 				assert_ok!(Balances::repatriate_reserved(&1, &2, 41, Status::Free), 0);
 				assert_eq!(
 					last_event(),
-					Event::pallet_balances(RawEvent::ReserveRepatriated(1, 2, 41, Status::Free)),
+					Event::pallet_balances(crate::Event::ReserveRepatriated(1, 2, 41, Status::Free)),
 				);
 				assert_eq!(Balances::reserved_balance(1), 69);
 				assert_eq!(Balances::free_balance(1), 0);
@@ -688,7 +688,7 @@ macro_rules! decl_tests {
 
 					assert_eq!(
 						last_event(),
-						Event::pallet_balances(RawEvent::Reserved(1, 10)),
+						Event::pallet_balances(crate::Event::Reserved(1, 10)),
 					);
 
 					System::set_block_number(3);
@@ -696,7 +696,7 @@ macro_rules! decl_tests {
 
 					assert_eq!(
 						last_event(),
-						Event::pallet_balances(RawEvent::Unreserved(1, 5)),
+						Event::pallet_balances(crate::Event::Unreserved(1, 5)),
 					);
 
 					System::set_block_number(4);
@@ -705,7 +705,7 @@ macro_rules! decl_tests {
 					// should only unreserve 5
 					assert_eq!(
 						last_event(),
-						Event::pallet_balances(RawEvent::Unreserved(1, 5)),
+						Event::pallet_balances(crate::Event::Unreserved(1, 5)),
 					);
 				});
 		}
@@ -722,8 +722,8 @@ macro_rules! decl_tests {
 						events(),
 						[
 							Event::frame_system(system::Event::NewAccount(1)),
-							Event::pallet_balances(RawEvent::Endowed(1, 100)),
-							Event::pallet_balances(RawEvent::BalanceSet(1, 100, 0)),
+							Event::pallet_balances(crate::Event::Endowed(1, 100)),
+							Event::pallet_balances(crate::Event::BalanceSet(1, 100, 0)),
 						]
 					);
 
@@ -732,7 +732,7 @@ macro_rules! decl_tests {
 					assert_eq!(
 						events(),
 						[
-							Event::pallet_balances(RawEvent::DustLost(1, 99)),
+							Event::pallet_balances(crate::Event::DustLost(1, 99)),
 							Event::frame_system(system::Event::KilledAccount(1))
 						]
 					);
@@ -751,8 +751,8 @@ macro_rules! decl_tests {
 						events(),
 						[
 							Event::frame_system(system::Event::NewAccount(1)),
-							Event::pallet_balances(RawEvent::Endowed(1, 100)),
-							Event::pallet_balances(RawEvent::BalanceSet(1, 100, 0)),
+							Event::pallet_balances(crate::Event::Endowed(1, 100)),
+							Event::pallet_balances(crate::Event::BalanceSet(1, 100, 0)),
 						]
 					);
 
diff --git a/frame/balances/src/tests_local.rs b/frame/balances/src/tests_local.rs
index a072d2954bec..ffefc6c4d88f 100644
--- a/frame/balances/src/tests_local.rs
+++ b/frame/balances/src/tests_local.rs
@@ -168,9 +168,9 @@ fn emit_events_with_no_existential_deposit_suicide_with_dust() {
 			assert_eq!(
 				events(),
 				[
-					Event::frame_system(frame_system::Event::NewAccount(1)),
-					Event::pallet_balances(RawEvent::Endowed(1, 100)),
-					Event::pallet_balances(RawEvent::BalanceSet(1, 100, 0)),
+					Event::frame_system(system::Event::NewAccount(1)),
+					Event::pallet_balances(crate::Event::Endowed(1, 100)),
+					Event::pallet_balances(crate::Event::BalanceSet(1, 100, 0)),
 				]
 			);
 
@@ -184,8 +184,8 @@ fn emit_events_with_no_existential_deposit_suicide_with_dust() {
 			assert_eq!(
 				events(),
 				[
-					Event::pallet_balances(RawEvent::DustLost(1, 1)),
-					Event::frame_system(frame_system::Event::KilledAccount(1))
+					Event::pallet_balances(crate::Event::DustLost(1, 1)),
+					Event::frame_system(system::Event::KilledAccount(1))
 				]
 			);
 		});
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index 364683a2034c..62768641ac16 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -473,7 +473,7 @@ fn instantiate_and_call_and_deposit_event() {
 				EventRecord {
 					phase: Phase::Initialization,
 					event: Event::pallet_balances(
-						pallet_balances::RawEvent::Endowed(ALICE, 1_000_000)
+						pallet_balances::Event::Endowed(ALICE, 1_000_000)
 					),
 					topics: vec![],
 				},
@@ -485,14 +485,14 @@ fn instantiate_and_call_and_deposit_event() {
 				EventRecord {
 					phase: Phase::Initialization,
 					event: Event::pallet_balances(
-						pallet_balances::RawEvent::Endowed(addr.clone(), subsistence * 100)
+						pallet_balances::Event::Endowed(addr.clone(), subsistence * 100)
 					),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
 					event: Event::pallet_balances(
-						pallet_balances::RawEvent::Transfer(ALICE, addr.clone(), subsistence * 100)
+						pallet_balances::Event::Transfer(ALICE, addr.clone(), subsistence * 100)
 					),
 					topics: vec![],
 				},
@@ -1202,7 +1202,7 @@ fn restoration(
 				EventRecord {
 					phase: Phase::Initialization,
 					event: Event::pallet_balances(
-						pallet_balances::RawEvent::Endowed(ALICE, 1_000_000)
+						pallet_balances::Event::Endowed(ALICE, 1_000_000)
 					),
 					topics: vec![],
 				},
@@ -1214,14 +1214,14 @@ fn restoration(
 				EventRecord {
 					phase: Phase::Initialization,
 					event: Event::pallet_balances(
-						pallet_balances::RawEvent::Endowed(addr_bob.clone(), 30_000)
+						pallet_balances::Event::Endowed(addr_bob.clone(), 30_000)
 					),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
 					event: Event::pallet_balances(
-						pallet_balances::RawEvent::Transfer(ALICE, addr_bob.clone(), 30_000)
+						pallet_balances::Event::Transfer(ALICE, addr_bob.clone(), 30_000)
 					),
 					topics: vec![],
 				},
@@ -1259,14 +1259,14 @@ fn restoration(
 					EventRecord {
 						phase: Phase::Initialization,
 						event: Event::pallet_balances(
-							pallet_balances::RawEvent::Endowed(addr_dummy.clone(), 20_000)
+							pallet_balances::Event::Endowed(addr_dummy.clone(), 20_000)
 						),
 						topics: vec![],
 					},
 					EventRecord {
 						phase: Phase::Initialization,
 						event: Event::pallet_balances(
-							pallet_balances::RawEvent::Transfer(ALICE, addr_dummy.clone(), 20_000)
+							pallet_balances::Event::Transfer(ALICE, addr_dummy.clone(), 20_000)
 						),
 						topics: vec![],
 					},
@@ -1408,7 +1408,7 @@ fn restoration(
 							},
 							EventRecord {
 								phase: Phase::Initialization,
-								event: Event::pallet_balances(pallet_balances::RawEvent::Endowed(CHARLIE, 1_000_000)),
+								event: Event::pallet_balances(pallet_balances::Event::Endowed(CHARLIE, 1_000_000)),
 								topics: vec![],
 							},
 							EventRecord {
@@ -1418,13 +1418,13 @@ fn restoration(
 							},
 							EventRecord {
 								phase: Phase::Initialization,
-								event: Event::pallet_balances(pallet_balances::RawEvent::Endowed(addr_django.clone(), 30_000)),
+								event: Event::pallet_balances(pallet_balances::Event::Endowed(addr_django.clone(), 30_000)),
 								topics: vec![],
 							},
 							EventRecord {
 								phase: Phase::Initialization,
 								event: Event::pallet_balances(
-									pallet_balances::RawEvent::Transfer(CHARLIE, addr_django.clone(), 30_000)
+									pallet_balances::Event::Transfer(CHARLIE, addr_django.clone(), 30_000)
 								),
 								topics: vec![],
 							},
@@ -1711,7 +1711,7 @@ fn self_destruct_works() {
 				EventRecord {
 					phase: Phase::Initialization,
 					event: Event::pallet_balances(
-						pallet_balances::RawEvent::Transfer(addr.clone(), DJANGO, 93_654)
+						pallet_balances::Event::Transfer(addr.clone(), DJANGO, 93_654)
 					),
 					topics: vec![],
 				},
diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
index c460fcba3a59..709a8f69a487 100644
--- a/frame/transaction-payment/src/lib.rs
+++ b/frame/transaction-payment/src/lib.rs
@@ -1156,7 +1156,7 @@ mod tests {
 			assert_eq!(Balances::free_balance(2), 0);
 			// Transfer Event
 			assert!(System::events().iter().any(|event| {
-				event.event == Event::pallet_balances(pallet_balances::RawEvent::Transfer(2, 3, 80))
+				event.event == Event::pallet_balances(pallet_balances::Event::Transfer(2, 3, 80))
 			}));
 			// Killed Event
 			assert!(System::events().iter().any(|event| {

From ce018b80002a228e23b7da7b86432ecefd0f8f67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Wed, 10 Feb 2021 13:51:36 +0000
Subject: [PATCH 0387/1194] babe, grandpa: set longevity for equivocation
 report transactions (#8076)

* babe: set longevity for equivocation report transactions

* grandpa: set longevity for equivocation report transaction

* babe, grandpa: fix tests

* node: add ReportLongevity to babe and grandpa modules

* node: bump spec_version
---
 bin/node/runtime/src/lib.rs       |  8 +++++---
 frame/babe/src/equivocation.rs    | 27 ++++++++++++++++++++++-----
 frame/babe/src/mock.rs            | 13 ++++++++++---
 frame/babe/src/tests.rs           |  6 +++---
 frame/grandpa/src/equivocation.rs | 25 ++++++++++++++++++++-----
 frame/grandpa/src/mock.rs         |  8 +++++++-
 frame/grandpa/src/tests.rs        |  6 +++---
 7 files changed, 70 insertions(+), 23 deletions(-)

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 4b0998c122c1..58c98e529c31 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -112,7 +112,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	// and set impl_version to 0. If only runtime
 	// implementation changes and behavior does not, then leave spec_version as
 	// is and increment impl_version.
-	spec_version: 263,
+	spec_version: 264,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 2,
@@ -319,6 +319,8 @@ impl pallet_scheduler::Config for Runtime {
 parameter_types! {
 	pub const EpochDuration: u64 = EPOCH_DURATION_IN_SLOTS;
 	pub const ExpectedBlockTime: Moment = MILLISECS_PER_BLOCK;
+	pub const ReportLongevity: u64 =
+		BondingDuration::get() as u64 * SessionsPerEra::get() as u64 * EpochDuration::get();
 }
 
 impl pallet_babe::Config for Runtime {
@@ -339,7 +341,7 @@ impl pallet_babe::Config for Runtime {
 	)>>::IdentificationTuple;
 
 	type HandleEquivocation =
-		pallet_babe::EquivocationHandler<Self::KeyOwnerIdentification, Offences>;
+		pallet_babe::EquivocationHandler<Self::KeyOwnerIdentification, Offences, ReportLongevity>;
 
 	type WeightInfo = ();
 }
@@ -866,7 +868,7 @@ impl pallet_grandpa::Config for Runtime {
 	)>>::IdentificationTuple;
 
 	type HandleEquivocation =
-		pallet_grandpa::EquivocationHandler<Self::KeyOwnerIdentification, Offences>;
+		pallet_grandpa::EquivocationHandler<Self::KeyOwnerIdentification, Offences, ReportLongevity>;
 
 	type WeightInfo = ();
 }
diff --git a/frame/babe/src/equivocation.rs b/frame/babe/src/equivocation.rs
index a0a1ff4fa0d9..b7275d04734e 100644
--- a/frame/babe/src/equivocation.rs
+++ b/frame/babe/src/equivocation.rs
@@ -35,7 +35,10 @@
 //! definition.
 //!
 
-use frame_support::{debug, traits::KeyOwnerProofSystem};
+use frame_support::{
+	debug,
+	traits::{Get, KeyOwnerProofSystem},
+};
 use sp_consensus_babe::{EquivocationProof, Slot};
 use sp_runtime::transaction_validity::{
 	InvalidTransaction, TransactionPriority, TransactionSource, TransactionValidity,
@@ -56,6 +59,10 @@ use crate::{Call, Module, Config};
 /// reporter), and also for creating and submitting equivocation report
 /// extrinsics (useful only in offchain context).
 pub trait HandleEquivocation<T: Config> {
+	/// The longevity, in blocks, that the equivocation report is valid for. When using the staking
+	/// pallet this should be equal to the bonding duration (in blocks, not eras).
+	type ReportLongevity: Get<u64>;
+
 	/// Report an offence proved by the given reporters.
 	fn report_offence(
 		reporters: Vec<T::AccountId>,
@@ -76,6 +83,8 @@ pub trait HandleEquivocation<T: Config> {
 }
 
 impl<T: Config> HandleEquivocation<T> for () {
+	type ReportLongevity = ();
+
 	fn report_offence(
 		_reporters: Vec<T::AccountId>,
 		_offence: BabeEquivocationOffence<T::KeyOwnerIdentification>,
@@ -103,11 +112,11 @@ impl<T: Config> HandleEquivocation<T> for () {
 /// using existing subsystems that are part of frame (type bounds described
 /// below) and will dispatch to them directly, it's only purpose is to wire all
 /// subsystems together.
-pub struct EquivocationHandler<I, R> {
-	_phantom: sp_std::marker::PhantomData<(I, R)>,
+pub struct EquivocationHandler<I, R, L> {
+	_phantom: sp_std::marker::PhantomData<(I, R, L)>,
 }
 
-impl<I, R> Default for EquivocationHandler<I, R> {
+impl<I, R, L> Default for EquivocationHandler<I, R, L> {
 	fn default() -> Self {
 		Self {
 			_phantom: Default::default(),
@@ -115,7 +124,7 @@ impl<I, R> Default for EquivocationHandler<I, R> {
 	}
 }
 
-impl<T, R> HandleEquivocation<T> for EquivocationHandler<T::KeyOwnerIdentification, R>
+impl<T, R, L> HandleEquivocation<T> for EquivocationHandler<T::KeyOwnerIdentification, R, L>
 where
 	// We use the authorship pallet to fetch the current block author and use
 	// `offchain::SendTransactionTypes` for unsigned extrinsic creation and
@@ -128,7 +137,12 @@ where
 		T::KeyOwnerIdentification,
 		BabeEquivocationOffence<T::KeyOwnerIdentification>,
 	>,
+	// The longevity (in blocks) that the equivocation report is valid for. When using the staking
+	// pallet this should be the bonding duration.
+	L: Get<u64>,
 {
+	type ReportLongevity = L;
+
 	fn report_offence(
 		reporters: Vec<T::AccountId>,
 		offence: BabeEquivocationOffence<T::KeyOwnerIdentification>,
@@ -184,6 +198,8 @@ impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
 			// check report staleness
 			is_known_offence::<T>(equivocation_proof, key_owner_proof)?;
 
+			let longevity = <T::HandleEquivocation as HandleEquivocation<T>>::ReportLongevity::get();
+
 			ValidTransaction::with_tag_prefix("BabeEquivocation")
 				// We assign the maximum priority for any equivocation report.
 				.priority(TransactionPriority::max_value())
@@ -192,6 +208,7 @@ impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
 					equivocation_proof.offender.clone(),
 					*equivocation_proof.slot,
 				))
+				.longevity(longevity)
 				// We don't propagate this. This can never be included on a remote node.
 				.propagate(false)
 				.build()
diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index 75d4703b0dd6..e3d2eb19ef26 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -63,8 +63,6 @@ frame_support::construct_runtime!(
 
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
-	pub const EpochDuration: u64 = 3;
-	pub const ExpectedBlockTime: u64 = 1;
 	pub const DisabledValidatorsThreshold: Perbill = Perbill::from_percent(16);
 	pub BlockWeights: frame_system::limits::BlockWeights =
 		frame_system::limits::BlockWeights::simple_max(1024);
@@ -222,6 +220,13 @@ impl pallet_offences::Config for Test {
 	type WeightSoftLimit = OffencesWeightSoftLimit;
 }
 
+parameter_types! {
+	pub const EpochDuration: u64 = 3;
+	pub const ExpectedBlockTime: u64 = 1;
+	pub const ReportLongevity: u64 =
+		BondingDuration::get() as u64 * SessionsPerEra::get() as u64 * EpochDuration::get();
+}
+
 impl Config for Test {
 	type EpochDuration = EpochDuration;
 	type ExpectedBlockTime = ExpectedBlockTime;
@@ -237,7 +242,9 @@ impl Config for Test {
 		AuthorityId,
 	)>>::IdentificationTuple;
 
-	type HandleEquivocation = super::EquivocationHandler<Self::KeyOwnerIdentification, Offences>;
+	type HandleEquivocation =
+		super::EquivocationHandler<Self::KeyOwnerIdentification, Offences, ReportLongevity>;
+
 	type WeightInfo = ();
 }
 
diff --git a/frame/babe/src/tests.rs b/frame/babe/src/tests.rs
index e4649d253c93..8576389af31f 100644
--- a/frame/babe/src/tests.rs
+++ b/frame/babe/src/tests.rs
@@ -611,8 +611,8 @@ fn report_equivocation_invalid_equivocation_proof() {
 #[test]
 fn report_equivocation_validate_unsigned_prevents_duplicates() {
 	use sp_runtime::transaction_validity::{
-		InvalidTransaction, TransactionLongevity, TransactionPriority, TransactionSource,
-		TransactionValidity, ValidTransaction,
+		InvalidTransaction, TransactionPriority, TransactionSource, TransactionValidity,
+		ValidTransaction,
 	};
 
 	let (pairs, mut ext) = new_test_ext_with_pairs(3);
@@ -664,7 +664,7 @@ fn report_equivocation_validate_unsigned_prevents_duplicates() {
 				priority: TransactionPriority::max_value(),
 				requires: vec![],
 				provides: vec![("BabeEquivocation", tx_tag).encode()],
-				longevity: TransactionLongevity::max_value(),
+				longevity: ReportLongevity::get(),
 				propagate: false,
 			})
 		);
diff --git a/frame/grandpa/src/equivocation.rs b/frame/grandpa/src/equivocation.rs
index bf0586848134..b8bff59d3920 100644
--- a/frame/grandpa/src/equivocation.rs
+++ b/frame/grandpa/src/equivocation.rs
@@ -40,7 +40,10 @@
 use sp_std::prelude::*;
 
 use codec::{self as codec, Decode, Encode};
-use frame_support::{debug, traits::KeyOwnerProofSystem};
+use frame_support::{
+	debug,
+	traits::{Get, KeyOwnerProofSystem},
+};
 use sp_finality_grandpa::{EquivocationProof, RoundNumber, SetId};
 use sp_runtime::{
 	transaction_validity::{
@@ -64,6 +67,10 @@ pub trait HandleEquivocation<T: Config> {
 	/// The offence type used for reporting offences on valid equivocation reports.
 	type Offence: GrandpaOffence<T::KeyOwnerIdentification>;
 
+	/// The longevity, in blocks, that the equivocation report is valid for. When using the staking
+	/// pallet this should be equal to the bonding duration (in blocks, not eras).
+	type ReportLongevity: Get<u64>;
+
 	/// Report an offence proved by the given reporters.
 	fn report_offence(
 		reporters: Vec<T::AccountId>,
@@ -88,6 +95,7 @@ pub trait HandleEquivocation<T: Config> {
 
 impl<T: Config> HandleEquivocation<T> for () {
 	type Offence = GrandpaEquivocationOffence<T::KeyOwnerIdentification>;
+	type ReportLongevity = ();
 
 	fn report_offence(
 		_reporters: Vec<T::AccountId>,
@@ -119,11 +127,11 @@ impl<T: Config> HandleEquivocation<T> for () {
 /// using existing subsystems that are part of frame (type bounds described
 /// below) and will dispatch to them directly, it's only purpose is to wire all
 /// subsystems together.
-pub struct EquivocationHandler<I, R, O = GrandpaEquivocationOffence<I>> {
-	_phantom: sp_std::marker::PhantomData<(I, R, O)>,
+pub struct EquivocationHandler<I, R, L, O = GrandpaEquivocationOffence<I>> {
+	_phantom: sp_std::marker::PhantomData<(I, R, L, O)>,
 }
 
-impl<I, R, O> Default for EquivocationHandler<I, R, O> {
+impl<I, R, L, O> Default for EquivocationHandler<I, R, L, O> {
 	fn default() -> Self {
 		Self {
 			_phantom: Default::default(),
@@ -131,7 +139,7 @@ impl<I, R, O> Default for EquivocationHandler<I, R, O> {
 	}
 }
 
-impl<T, R, O> HandleEquivocation<T> for EquivocationHandler<T::KeyOwnerIdentification, R, O>
+impl<T, R, L, O> HandleEquivocation<T> for EquivocationHandler<T::KeyOwnerIdentification, R, L, O>
 where
 	// We use the authorship pallet to fetch the current block author and use
 	// `offchain::SendTransactionTypes` for unsigned extrinsic creation and
@@ -140,10 +148,14 @@ where
 	// A system for reporting offences after valid equivocation reports are
 	// processed.
 	R: ReportOffence<T::AccountId, T::KeyOwnerIdentification, O>,
+	// The longevity (in blocks) that the equivocation report is valid for. When using the staking
+	// pallet this should be the bonding duration.
+	L: Get<u64>,
 	// The offence type that should be used when reporting.
 	O: GrandpaOffence<T::KeyOwnerIdentification>,
 {
 	type Offence = O;
+	type ReportLongevity = L;
 
 	fn report_offence(reporters: Vec<T::AccountId>, offence: O) -> Result<(), OffenceError> {
 		R::report_offence(reporters, offence)
@@ -207,6 +219,8 @@ impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
 			// check report staleness
 			is_known_offence::<T>(equivocation_proof, key_owner_proof)?;
 
+			let longevity = <T::HandleEquivocation as HandleEquivocation<T>>::ReportLongevity::get();
+
 			ValidTransaction::with_tag_prefix("GrandpaEquivocation")
 				// We assign the maximum priority for any equivocation report.
 				.priority(TransactionPriority::max_value())
@@ -216,6 +230,7 @@ impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
 					equivocation_proof.set_id(),
 					equivocation_proof.round(),
 				))
+				.longevity(longevity)
 				// We don't propagate this. This can never be included on a remote node.
 				.propagate(false)
 				.build()
diff --git a/frame/grandpa/src/mock.rs b/frame/grandpa/src/mock.rs
index 4aeaa5a237a5..e8703dba50ae 100644
--- a/frame/grandpa/src/mock.rs
+++ b/frame/grandpa/src/mock.rs
@@ -226,6 +226,11 @@ impl pallet_offences::Config for Test {
 	type WeightSoftLimit = OffencesWeightSoftLimit;
 }
 
+parameter_types! {
+	pub const ReportLongevity: u64 =
+		BondingDuration::get() as u64 * SessionsPerEra::get() as u64 * Period::get();
+}
+
 impl Config for Test {
 	type Event = Event;
 	type Call = Call;
@@ -240,7 +245,8 @@ impl Config for Test {
 		AuthorityId,
 	)>>::IdentificationTuple;
 
-	type HandleEquivocation = super::EquivocationHandler<Self::KeyOwnerIdentification, Offences>;
+	type HandleEquivocation =
+		super::EquivocationHandler<Self::KeyOwnerIdentification, Offences, ReportLongevity>;
 
 	type WeightInfo = ();
 }
diff --git a/frame/grandpa/src/tests.rs b/frame/grandpa/src/tests.rs
index cd5e0c3563bc..50462d33472a 100644
--- a/frame/grandpa/src/tests.rs
+++ b/frame/grandpa/src/tests.rs
@@ -706,8 +706,8 @@ fn report_equivocation_invalid_equivocation_proof() {
 #[test]
 fn report_equivocation_validate_unsigned_prevents_duplicates() {
 	use sp_runtime::transaction_validity::{
-		InvalidTransaction, TransactionLongevity, TransactionPriority, TransactionSource,
-		TransactionValidity, ValidTransaction,
+		InvalidTransaction, TransactionPriority, TransactionSource, TransactionValidity,
+		ValidTransaction,
 	};
 
 	let authorities = test_authorities();
@@ -762,7 +762,7 @@ fn report_equivocation_validate_unsigned_prevents_duplicates() {
 				priority: TransactionPriority::max_value(),
 				requires: vec![],
 				provides: vec![("GrandpaEquivocation", tx_tag).encode()],
-				longevity: TransactionLongevity::max_value(),
+				longevity: ReportLongevity::get(),
 				propagate: false,
 			})
 		);

From ba290e0c8b55d6312ffe7c6c180e22618fa9b6f0 Mon Sep 17 00:00:00 2001
From: Shaun Wang <spxwang@gmail.com>
Date: Thu, 11 Feb 2021 03:00:41 +1300
Subject: [PATCH 0388/1194] Migrate pallet-timestamp to pallet attribute macro.
 (#8078)

* Migrate pallet-timestamp to pallet attribute macro.

* Migrate inherent.

* Unify private visbility.

* Update benchmarking.

* Update storage usages.
---
 frame/timestamp/src/benchmarking.rs |   8 +-
 frame/timestamp/src/lib.rs          | 206 +++++++++++++++-------------
 2 files changed, 111 insertions(+), 103 deletions(-)

diff --git a/frame/timestamp/src/benchmarking.rs b/frame/timestamp/src/benchmarking.rs
index 024e6967826c..ad249cbae69f 100644
--- a/frame/timestamp/src/benchmarking.rs
+++ b/frame/timestamp/src/benchmarking.rs
@@ -33,7 +33,7 @@ benchmarks! {
 	set {
 		let t = MAX_TIME;
 		// Ignore write to `DidUpdate` since it transient.
-		let did_update_key = crate::DidUpdate::hashed_key().to_vec();
+		let did_update_key = crate::DidUpdate::<T>::hashed_key().to_vec();
 		frame_benchmarking::benchmarking::add_to_whitelist(TrackedStorageKey {
 			key: did_update_key,
 			has_been_read: false,
@@ -47,13 +47,13 @@ benchmarks! {
 	on_finalize {
 		let t = MAX_TIME;
 		Timestamp::<T>::set(RawOrigin::None.into(), t.into())?;
-		ensure!(DidUpdate::exists(), "Time was not set.");
+		ensure!(DidUpdate::<T>::exists(), "Time was not set.");
 		// Ignore read/write to `DidUpdate` since it is transient.
-		let did_update_key = crate::DidUpdate::hashed_key().to_vec();
+		let did_update_key = crate::DidUpdate::<T>::hashed_key().to_vec();
 		frame_benchmarking::benchmarking::add_to_whitelist(did_update_key.into());
 	}: { Timestamp::<T>::on_finalize(t.into()); }
 	verify {
-		ensure!(!DidUpdate::exists(), "Time was not removed.");
+		ensure!(!DidUpdate::<T>::exists(), "Time was not removed.");
 	}
 }
 
diff --git a/frame/timestamp/src/lib.rs b/frame/timestamp/src/lib.rs
index ae7ba4814694..86ca0c11a70c 100644
--- a/frame/timestamp/src/lib.rs
+++ b/frame/timestamp/src/lib.rs
@@ -15,23 +15,23 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! # Timestamp Module
+//! # Timestamp Pallet
 //!
-//! The Timestamp module provides functionality to get and set the on-chain time.
+//! The Timestamp pallet provides functionality to get and set the on-chain time.
 //!
 //! - [`timestamp::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
-//! - [`Module`](./struct.Module.html)
+//! - [`Pallet`](./struct.Pallet.html)
 //!
 //! ## Overview
 //!
-//! The Timestamp module allows the validators to set and validate a timestamp with each block.
+//! The Timestamp pallet allows the validators to set and validate a timestamp with each block.
 //!
 //! It uses inherents for timestamp data, which is provided by the block author and validated/verified
 //! by other validators. The timestamp can be set only once per block and must be set each block.
 //! There could be a constraint on how much time must pass before setting the new timestamp.
 //!
-//! **NOTE:** The Timestamp module is the recommended way to query the on-chain time instead of using
+//! **NOTE:** The Timestamp pallet is the recommended way to query the on-chain time instead of using
 //! an approach based on block numbers. The block number based time measurement can cause issues
 //! because of cumulative calculation errors and hence should be avoided.
 //!
@@ -52,11 +52,11 @@
 //!
 //! ## Usage
 //!
-//! The following example shows how to use the Timestamp module in your custom module to query the current timestamp.
+//! The following example shows how to use the Timestamp pallet in your custom pallet to query the current timestamp.
 //!
 //! ### Prerequisites
 //!
-//! Import the Timestamp module into your custom module and derive the module configuration
+//! Import the Timestamp pallet into your custom pallet and derive the pallet configuration
 //! trait from the timestamp trait.
 //!
 //! ### Get current timestamp
@@ -83,10 +83,10 @@
 //!
 //! ### Example from the FRAME
 //!
-//! The [Session module](https://github.com/paritytech/substrate/blob/master/frame/session/src/lib.rs) uses
-//! the Timestamp module for session management.
+//! The [Session pallet](https://github.com/paritytech/substrate/blob/master/frame/session/src/lib.rs) uses
+//! the Timestamp pallet for session management.
 //!
-//! ## Related Modules
+//! ## Related Pallets
 //!
 //! * [Session](../pallet_session/index.html)
 
@@ -96,54 +96,83 @@ mod benchmarking;
 pub mod weights;
 
 use sp_std::{result, cmp};
-use sp_inherents::{ProvideInherent, InherentData, InherentIdentifier};
+use sp_inherents::InherentData;
 #[cfg(feature = "std")]
 use frame_support::debug;
-use frame_support::{
-	Parameter, decl_storage, decl_module,
-	traits::{Time, UnixTime, Get},
-	weights::{DispatchClass, Weight},
-};
+use frame_support::traits::{Time, UnixTime};
 use sp_runtime::{
 	RuntimeString,
 	traits::{
 		AtLeast32Bit, Zero, SaturatedConversion, Scale,
 	}
 };
-use frame_system::ensure_none;
 use sp_timestamp::{
 	InherentError, INHERENT_IDENTIFIER, InherentType,
 	OnTimestampSet,
 };
 pub use weights::WeightInfo;
 
-/// The module configuration trait
-pub trait Config: frame_system::Config {
-	/// Type used for expressing timestamp.
-	type Moment: Parameter + Default + AtLeast32Bit
-		+ Scale<Self::BlockNumber, Output = Self::Moment> + Copy;
+pub use pallet::*;
 
-	/// Something which can be notified when the timestamp is set. Set this to `()` if not needed.
-	type OnTimestampSet: OnTimestampSet<Self::Moment>;
+#[frame_support::pallet]
+pub mod pallet {
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+	use super::*;
 
-	/// The minimum period between blocks. Beware that this is different to the *expected* period
-	/// that the block production apparatus provides. Your chosen consensus system will generally
-	/// work with this to determine a sensible block time. e.g. For Aura, it will be double this
-	/// period on default settings.
-	type MinimumPeriod: Get<Self::Moment>;
+	/// The pallet configuration trait
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		/// Type used for expressing timestamp.
+		type Moment: Parameter + Default + AtLeast32Bit
+			+ Scale<Self::BlockNumber, Output = Self::Moment> + Copy;
 
-	/// Weight information for extrinsics in this pallet.
-	type WeightInfo: WeightInfo;
-}
+		/// Something which can be notified when the timestamp is set. Set this to `()` if not needed.
+		type OnTimestampSet: OnTimestampSet<Self::Moment>;
 
-decl_module! {
-	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		/// The minimum period between blocks. Beware that this is different to the *expected* period
 		/// that the block production apparatus provides. Your chosen consensus system will generally
 		/// work with this to determine a sensible block time. e.g. For Aura, it will be double this
 		/// period on default settings.
-		const MinimumPeriod: T::Moment = T::MinimumPeriod::get();
+		#[pallet::constant]
+		type MinimumPeriod: Get<Self::Moment>;
+
+		/// Weight information for extrinsics in this pallet.
+		type WeightInfo: WeightInfo;
+	}
+
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(PhantomData<T>);
+
+	/// Current time for the current block.
+	#[pallet::storage]
+	#[pallet::getter(fn now)]
+	pub type Now<T: Config> = StorageValue<_, T::Moment, ValueQuery>;
+
+	/// Did the timestamp get updated in this block?
+	#[pallet::storage]
+	pub(super) type DidUpdate<T: Config> = StorageValue<_, bool, ValueQuery>;
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+		/// dummy `on_initialize` to return the weight used in `on_finalize`.
+		fn on_initialize(_n: BlockNumberFor<T>) -> Weight {
+			// weight of `on_finalize`
+			T::WeightInfo::on_finalize()
+		}
+
+		/// # <weight>
+		/// - `O(1)`
+		/// - 1 storage deletion (codec `O(1)`).
+		/// # </weight>
+		fn on_finalize(_n: BlockNumberFor<T>) {
+			assert!(DidUpdate::<T>::take(), "Timestamp must be updated once in the block");
+		}
+	}
 
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
 		/// Set the current time.
 		///
 		/// This call should be invoked exactly once per block. It will panic at the finalization
@@ -159,51 +188,65 @@ decl_module! {
 		/// - 1 storage read and 1 storage mutation (codec `O(1)`). (because of `DidUpdate::take` in `on_finalize`)
 		/// - 1 event handler `on_timestamp_set`. Must be `O(1)`.
 		/// # </weight>
-		#[weight = (
+		#[pallet::weight((
 			T::WeightInfo::set(),
 			DispatchClass::Mandatory
-		)]
-		fn set(origin, #[compact] now: T::Moment) {
+		))]
+		pub(super) fn set(origin: OriginFor<T>, #[pallet::compact] now: T::Moment) -> DispatchResultWithPostInfo {
 			ensure_none(origin)?;
-			assert!(!<Self as Store>::DidUpdate::exists(), "Timestamp must be updated only once in the block");
+			assert!(!DidUpdate::<T>::exists(), "Timestamp must be updated only once in the block");
 			let prev = Self::now();
 			assert!(
 				prev.is_zero() || now >= prev + T::MinimumPeriod::get(),
 				"Timestamp must increment by at least <MinimumPeriod> between sequential blocks"
 			);
-			<Self as Store>::Now::put(now);
-			<Self as Store>::DidUpdate::put(true);
+			Now::<T>::put(now);
+			DidUpdate::<T>::put(true);
 
 			<T::OnTimestampSet as OnTimestampSet<_>>::on_timestamp_set(now);
-		}
 
-		/// dummy `on_initialize` to return the weight used in `on_finalize`.
-		fn on_initialize() -> Weight {
-			// weight of `on_finalize`
-			T::WeightInfo::on_finalize()
+			Ok(().into())
 		}
+	}
 
-		/// # <weight>
-		/// - `O(1)`
-		/// - 1 storage deletion (codec `O(1)`).
-		/// # </weight>
-		fn on_finalize() {
-			assert!(<Self as Store>::DidUpdate::take(), "Timestamp must be updated once in the block");
+	#[pallet::inherent]
+	impl<T: Config> ProvideInherent for Pallet<T> {
+		type Call = Call<T>;
+		type Error = InherentError;
+		const INHERENT_IDENTIFIER: InherentIdentifier = INHERENT_IDENTIFIER;
+
+		fn create_inherent(data: &InherentData) -> Option<Self::Call> {
+			let data: T::Moment = extract_inherent_data(data)
+				.expect("Gets and decodes timestamp inherent data")
+				.saturated_into();
+
+			let next_time = cmp::max(data, Self::now() + T::MinimumPeriod::get());
+			Some(Call::set(next_time.into()))
 		}
-	}
-}
 
-decl_storage! {
-	trait Store for Module<T: Config> as Timestamp {
-		/// Current time for the current block.
-		pub Now get(fn now): T::Moment;
+		fn check_inherent(call: &Self::Call, data: &InherentData) -> result::Result<(), Self::Error> {
+			const MAX_TIMESTAMP_DRIFT_MILLIS: u64 = 30 * 1000;
 
-		/// Did the timestamp get updated in this block?
-		DidUpdate: bool;
+			let t: u64 = match call {
+				Call::set(ref t) => t.clone().saturated_into::<u64>(),
+				_ => return Ok(()),
+			};
+
+			let data = extract_inherent_data(data).map_err(|e| InherentError::Other(e))?;
+
+			let minimum = (Self::now() + T::MinimumPeriod::get()).saturated_into::<u64>();
+			if t > data + MAX_TIMESTAMP_DRIFT_MILLIS {
+				Err(InherentError::Other("Timestamp too far in future to accept".into()))
+			} else if t < minimum {
+				Err(InherentError::ValidAtTimestamp(minimum))
+			} else {
+				Ok(())
+			}
+		}
 	}
 }
 
-impl<T: Config> Module<T> {
+impl<T: Config> Pallet<T> {
 	/// Get the current time for the current block.
 	///
 	/// NOTE: if this function is called prior to setting the timestamp,
@@ -215,7 +258,7 @@ impl<T: Config> Module<T> {
 	/// Set the timestamp to something in particular. Only used for tests.
 	#[cfg(feature = "std")]
 	pub fn set_timestamp(now: T::Moment) {
-		<Self as Store>::Now::put(now);
+		Now::<T>::put(now);
 	}
 }
 
@@ -225,42 +268,7 @@ fn extract_inherent_data(data: &InherentData) -> Result<InherentType, RuntimeStr
 		.ok_or_else(|| "Timestamp inherent data is not provided.".into())
 }
 
-impl<T: Config> ProvideInherent for Module<T> {
-	type Call = Call<T>;
-	type Error = InherentError;
-	const INHERENT_IDENTIFIER: InherentIdentifier = INHERENT_IDENTIFIER;
-
-	fn create_inherent(data: &InherentData) -> Option<Self::Call> {
-		let data: T::Moment = extract_inherent_data(data)
-			.expect("Gets and decodes timestamp inherent data")
-			.saturated_into();
-
-		let next_time = cmp::max(data, Self::now() + T::MinimumPeriod::get());
-		Some(Call::set(next_time.into()))
-	}
-
-	fn check_inherent(call: &Self::Call, data: &InherentData) -> result::Result<(), Self::Error> {
-		const MAX_TIMESTAMP_DRIFT_MILLIS: u64 = 30 * 1000;
-
-		let t: u64 = match call {
-			Call::set(ref t) => t.clone().saturated_into::<u64>(),
-			_ => return Ok(()),
-		};
-
-		let data = extract_inherent_data(data).map_err(|e| InherentError::Other(e))?;
-
-		let minimum = (Self::now() + T::MinimumPeriod::get()).saturated_into::<u64>();
-		if t > data + MAX_TIMESTAMP_DRIFT_MILLIS {
-			Err(InherentError::Other("Timestamp too far in future to accept".into()))
-		} else if t < minimum {
-			Err(InherentError::ValidAtTimestamp(minimum))
-		} else {
-			Ok(())
-		}
-	}
-}
-
-impl<T: Config> Time for Module<T> {
+impl<T: Config> Time for Pallet<T> {
 	type Moment = T::Moment;
 
 	/// Before the first set of now with inherent the value returned is zero.
@@ -272,7 +280,7 @@ impl<T: Config> Time for Module<T> {
 /// Before the timestamp inherent is applied, it returns the time of previous block.
 ///
 /// On genesis the time returned is not valid.
-impl<T: Config> UnixTime for Module<T> {
+impl<T: Config> UnixTime for Pallet<T> {
 	fn now() -> core::time::Duration {
 		// now is duration since unix epoch in millisecond as documented in
 		// `sp_timestamp::InherentDataProvider`.

From 12562bb3c4fff6954816d2bbb12e2e25273daa62 Mon Sep 17 00:00:00 2001
From: Cecile Tonglet <cecile@parity.io>
Date: Wed, 10 Feb 2021 16:30:22 +0100
Subject: [PATCH 0389/1194] Use log level error to report telemetry (#8097)

This fix the issue when running the node with -lwarn, the telemetry cannot be initialized properly.
---
 client/telemetry/src/lib.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/client/telemetry/src/lib.rs b/client/telemetry/src/lib.rs
index f1038456fc35..b398ee86de4e 100644
--- a/client/telemetry/src/lib.rs
+++ b/client/telemetry/src/lib.rs
@@ -86,7 +86,7 @@ impl TelemetrySpan {
 
 	/// Constructs a new [`TelemetrySpan`].
 	pub fn new() -> Self {
-		Self(tracing::info_span!(TELEMETRY_LOG_SPAN))
+		Self(tracing::error_span!(TELEMETRY_LOG_SPAN))
 	}
 
 	/// Return a clone of the underlying `tracing::Span` instance.
@@ -230,6 +230,11 @@ impl TelemetryWorker {
 				};
 
 				for (addr, verbosity) in endpoints {
+					log::trace!(
+						target: "telemetry",
+						"Initializing telemetry for: {:?}",
+						addr,
+					);
 					node_map
 						.entry(id.clone())
 						.or_default()

From 49a4103f4bfef55be20a5c6d26e18ff3003c3353 Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann <ben@gnunicorn.org>
Date: Wed, 10 Feb 2021 19:23:18 +0100
Subject: [PATCH 0390/1194] Releasing 3.0 (#8098)

* bumping version for next release
* add changelog
* add guide
---
 Cargo.lock                                    |  308 ++---
 bin/node-template/node/Cargo.toml             |   56 +-
 bin/node-template/pallets/template/Cargo.toml |   16 +-
 bin/node-template/runtime/Cargo.toml          |   52 +-
 bin/node/bench/Cargo.toml                     |   26 +-
 bin/node/browser-testing/Cargo.toml           |    2 +-
 bin/node/cli/Cargo.toml                       |  104 +-
 bin/node/executor/Cargo.toml                  |   40 +-
 bin/node/inspect/Cargo.toml                   |   12 +-
 bin/node/primitives/Cargo.toml                |   10 +-
 bin/node/rpc-client/Cargo.toml                |    4 +-
 bin/node/rpc/Cargo.toml                       |   42 +-
 bin/node/runtime/Cargo.toml                   |  114 +-
 bin/node/testing/Cargo.toml                   |   54 +-
 bin/utils/chain-spec-builder/Cargo.toml       |    8 +-
 bin/utils/subkey/Cargo.toml                   |    8 +-
 client/api/Cargo.toml                         |   38 +-
 client/authority-discovery/Cargo.toml         |   24 +-
 client/basic-authorship/Cargo.toml            |   28 +-
 client/block-builder/Cargo.toml               |   22 +-
 client/chain-spec/Cargo.toml                  |   22 +-
 client/chain-spec/derive/Cargo.toml           |    2 +-
 client/cli/Cargo.toml                         |   30 +-
 client/consensus/aura/Cargo.toml              |   52 +-
 client/consensus/babe/Cargo.toml              |   62 +-
 client/consensus/babe/rpc/Cargo.toml          |   30 +-
 client/consensus/common/Cargo.toml            |   10 +-
 client/consensus/epochs/Cargo.toml            |   10 +-
 client/consensus/manual-seal/Cargo.toml       |   38 +-
 client/consensus/pow/Cargo.toml               |   24 +-
 client/consensus/slots/Cargo.toml             |   28 +-
 client/consensus/uncles/Cargo.toml            |   14 +-
 client/db/Cargo.toml                          |   30 +-
 client/executor/Cargo.toml                    |   38 +-
 client/executor/common/Cargo.toml             |   10 +-
 client/executor/runtime-test/Cargo.toml       |   16 +-
 client/executor/wasmi/Cargo.toml              |   12 +-
 client/executor/wasmtime/Cargo.toml           |   12 +-
 client/finality-grandpa-warp-sync/Cargo.toml  |   12 +-
 client/finality-grandpa/Cargo.toml            |   54 +-
 client/finality-grandpa/rpc/Cargo.toml        |   26 +-
 client/informant/Cargo.toml                   |   14 +-
 client/keystore/Cargo.toml                    |    8 +-
 client/light/Cargo.toml                       |   18 +-
 client/network-gossip/Cargo.toml              |    8 +-
 client/network/Cargo.toml                     |   28 +-
 client/network/test/Cargo.toml                |   22 +-
 client/offchain/Cargo.toml                    |   30 +-
 client/peerset/Cargo.toml                     |    4 +-
 client/proposer-metrics/Cargo.toml            |    4 +-
 client/rpc-api/Cargo.toml                     |   14 +-
 client/rpc-servers/Cargo.toml                 |    6 +-
 client/rpc/Cargo.toml                         |   48 +-
 client/service/Cargo.toml                     |   76 +-
 client/service/test/Cargo.toml                |   38 +-
 client/state-db/Cargo.toml                    |    6 +-
 client/sync-state-rpc/Cargo.toml              |   18 +-
 client/telemetry/Cargo.toml                   |    4 +-
 client/tracing/Cargo.toml                     |    8 +-
 client/tracing/proc-macro/Cargo.toml          |    2 +-
 client/transaction-pool/Cargo.toml            |   28 +-
 client/transaction-pool/graph/Cargo.toml      |   12 +-
 docs/CHANGELOG.md                             |  141 +++
 docs/Upgrading-2.0-to-3.0.md                  | 1120 +++++++++++++++++
 frame/assets/Cargo.toml                       |   20 +-
 frame/atomic-swap/Cargo.toml                  |   16 +-
 frame/aura/Cargo.toml                         |   24 +-
 frame/authority-discovery/Cargo.toml          |   22 +-
 frame/authorship/Cargo.toml                   |   18 +-
 frame/babe/Cargo.toml                         |   46 +-
 frame/balances/Cargo.toml                     |   18 +-
 frame/benchmarking/Cargo.toml                 |   18 +-
 frame/bounties/Cargo.toml                     |   22 +-
 frame/collective/Cargo.toml                   |   18 +-
 frame/contracts/Cargo.toml                    |   22 +-
 frame/contracts/common/Cargo.toml             |    4 +-
 frame/contracts/rpc/Cargo.toml                |   10 +-
 frame/contracts/rpc/runtime-api/Cargo.toml    |    6 +-
 frame/democracy/Cargo.toml                    |   24 +-
 frame/elections-phragmen/Cargo.toml           |   20 +-
 frame/elections/Cargo.toml                    |   16 +-
 frame/example-offchain-worker/Cargo.toml      |   14 +-
 frame/example-parallel/Cargo.toml             |   14 +-
 frame/example/Cargo.toml                      |   16 +-
 frame/executive/Cargo.toml                    |   28 +-
 frame/grandpa/Cargo.toml                      |   42 +-
 frame/identity/Cargo.toml                     |   18 +-
 frame/im-online/Cargo.toml                    |   24 +-
 frame/indices/Cargo.toml                      |   20 +-
 frame/lottery/Cargo.toml                      |   18 +-
 frame/membership/Cargo.toml                   |   14 +-
 frame/merkle-mountain-range/Cargo.toml        |   18 +-
 .../primitives/Cargo.toml                     |   14 +-
 frame/metadata/Cargo.toml                     |    6 +-
 frame/multisig/Cargo.toml                     |   20 +-
 frame/nicks/Cargo.toml                        |   16 +-
 frame/node-authorization/Cargo.toml           |   12 +-
 frame/offences/Cargo.toml                     |   18 +-
 frame/offences/benchmarking/Cargo.toml        |   36 +-
 frame/proxy/Cargo.toml                        |   22 +-
 frame/randomness-collective-flip/Cargo.toml   |   14 +-
 frame/recovery/Cargo.toml                     |   16 +-
 frame/scheduler/Cargo.toml                    |   18 +-
 frame/scored-pool/Cargo.toml                  |   16 +-
 frame/session/Cargo.toml                      |   24 +-
 frame/session/benchmarking/Cargo.toml         |   28 +-
 frame/society/Cargo.toml                      |   16 +-
 frame/staking/Cargo.toml                      |   40 +-
 frame/staking/fuzzer/Cargo.toml               |   26 +-
 frame/staking/reward-curve/Cargo.toml         |    4 +-
 frame/sudo/Cargo.toml                         |   14 +-
 frame/support/Cargo.toml                      |   28 +-
 frame/support/procedural/Cargo.toml           |    4 +-
 frame/support/procedural/tools/Cargo.toml     |    4 +-
 .../procedural/tools/derive/Cargo.toml        |    2 +-
 frame/support/test/Cargo.toml                 |   18 +-
 frame/system/Cargo.toml                       |   16 +-
 frame/system/benchmarking/Cargo.toml          |   16 +-
 frame/system/rpc/runtime-api/Cargo.toml       |    4 +-
 frame/timestamp/Cargo.toml                    |   22 +-
 frame/tips/Cargo.toml                         |   22 +-
 frame/transaction-payment/Cargo.toml          |   18 +-
 frame/transaction-payment/rpc/Cargo.toml      |   14 +-
 .../rpc/runtime-api/Cargo.toml                |    8 +-
 frame/treasury/Cargo.toml                     |   20 +-
 frame/utility/Cargo.toml                      |   20 +-
 frame/vesting/Cargo.toml                      |   20 +-
 primitives/allocator/Cargo.toml               |    8 +-
 primitives/api/Cargo.toml                     |   14 +-
 primitives/api/proc-macro/Cargo.toml          |    2 +-
 primitives/api/test/Cargo.toml                |   16 +-
 primitives/application-crypto/Cargo.toml      |    8 +-
 primitives/application-crypto/test/Cargo.toml |   10 +-
 primitives/arithmetic/Cargo.toml              |    6 +-
 primitives/arithmetic/fuzzer/Cargo.toml       |    2 +-
 primitives/authority-discovery/Cargo.toml     |   10 +-
 primitives/authorship/Cargo.toml              |    8 +-
 primitives/block-builder/Cargo.toml           |   10 +-
 primitives/blockchain/Cargo.toml              |   12 +-
 primitives/chain-spec/Cargo.toml              |    2 +-
 primitives/consensus/aura/Cargo.toml          |   16 +-
 primitives/consensus/babe/Cargo.toml          |   24 +-
 primitives/consensus/common/Cargo.toml        |   22 +-
 primitives/consensus/pow/Cargo.toml           |   10 +-
 primitives/consensus/slots/Cargo.toml         |    6 +-
 primitives/consensus/vrf/Cargo.toml           |    8 +-
 primitives/core/Cargo.toml                    |   14 +-
 primitives/database/Cargo.toml                |    2 +-
 primitives/debug-derive/Cargo.toml            |    2 +-
 primitives/election-providers/Cargo.toml      |   12 +-
 primitives/externalities/Cargo.toml           |    6 +-
 primitives/finality-grandpa/Cargo.toml        |   14 +-
 primitives/inherents/Cargo.toml               |    6 +-
 primitives/io/Cargo.toml                      |   20 +-
 primitives/keyring/Cargo.toml                 |    6 +-
 primitives/keystore/Cargo.toml                |    6 +-
 primitives/npos-elections/Cargo.toml          |   14 +-
 primitives/npos-elections/compact/Cargo.toml  |    2 +-
 primitives/npos-elections/fuzzer/Cargo.toml   |    6 +-
 primitives/offchain/Cargo.toml                |   10 +-
 primitives/panic-handler/Cargo.toml           |    2 +-
 primitives/rpc/Cargo.toml                     |    4 +-
 primitives/runtime-interface/Cargo.toml       |   20 +-
 .../runtime-interface/proc-macro/Cargo.toml   |    2 +-
 .../test-wasm-deprecated/Cargo.toml           |   10 +-
 .../runtime-interface/test-wasm/Cargo.toml    |   10 +-
 primitives/runtime-interface/test/Cargo.toml  |   12 +-
 primitives/runtime/Cargo.toml                 |   14 +-
 primitives/sandbox/Cargo.toml                 |   10 +-
 primitives/serializer/Cargo.toml              |    2 +-
 primitives/session/Cargo.toml                 |   12 +-
 primitives/staking/Cargo.toml                 |    6 +-
 primitives/state-machine/Cargo.toml           |   14 +-
 primitives/std/Cargo.toml                     |    2 +-
 primitives/storage/Cargo.toml                 |    6 +-
 primitives/tasks/Cargo.toml                   |   12 +-
 primitives/test-primitives/Cargo.toml         |    6 +-
 primitives/timestamp/Cargo.toml               |   10 +-
 primitives/tracing/Cargo.toml                 |    4 +-
 primitives/transaction-pool/Cargo.toml        |    8 +-
 primitives/trie/Cargo.toml                    |    8 +-
 primitives/utils/Cargo.toml                   |    2 +-
 primitives/version/Cargo.toml                 |    6 +-
 primitives/wasm-interface/Cargo.toml          |    4 +-
 test-utils/Cargo.toml                         |    6 +-
 test-utils/client/Cargo.toml                  |   26 +-
 test-utils/derive/Cargo.toml                  |    2 +-
 test-utils/runtime/Cargo.toml                 |   60 +-
 test-utils/runtime/client/Cargo.toml          |   20 +-
 .../runtime/transaction-pool/Cargo.toml       |    8 +-
 test-utils/test-crate/Cargo.toml              |    4 +-
 utils/browser/Cargo.toml                      |   16 +-
 utils/build-script-utils/Cargo.toml           |    2 +-
 utils/fork-tree/Cargo.toml                    |    2 +-
 utils/frame/benchmarking-cli/Cargo.toml       |   22 +-
 utils/frame/frame-utilities-cli/Cargo.toml    |   10 +-
 utils/frame/rpc/support/Cargo.toml            |   10 +-
 utils/frame/rpc/system/Cargo.toml             |   24 +-
 utils/prometheus/Cargo.toml                   |    2 +-
 utils/wasm-builder/Cargo.toml                 |    2 +-
 200 files changed, 3140 insertions(+), 1879 deletions(-)
 create mode 100644 docs/Upgrading-2.0-to-3.0.md

diff --git a/Cargo.lock b/Cargo.lock
index 587d9af1a213..eb55f6db2d7c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1642,7 +1642,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "fork-tree"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -1659,7 +1659,7 @@ dependencies = [
 
 [[package]]
 name = "frame-benchmarking"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1678,7 +1678,7 @@ dependencies = [
 
 [[package]]
 name = "frame-benchmarking-cli"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "Inflector",
  "chrono",
@@ -1700,7 +1700,7 @@ dependencies = [
 
 [[package]]
 name = "frame-executive"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1720,7 +1720,7 @@ dependencies = [
 
 [[package]]
 name = "frame-metadata"
-version = "12.0.1"
+version = "13.0.0"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -1730,7 +1730,7 @@ dependencies = [
 
 [[package]]
 name = "frame-support"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -1760,7 +1760,7 @@ dependencies = [
 
 [[package]]
 name = "frame-support-procedural"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "Inflector",
  "frame-support-procedural-tools",
@@ -1771,7 +1771,7 @@ dependencies = [
 
 [[package]]
 name = "frame-support-procedural-tools"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -1782,7 +1782,7 @@ dependencies = [
 
 [[package]]
 name = "frame-support-procedural-tools-derive"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1811,7 +1811,7 @@ dependencies = [
 
 [[package]]
 name = "frame-system"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "criterion",
  "frame-support",
@@ -1829,7 +1829,7 @@ dependencies = [
 
 [[package]]
 name = "frame-system-benchmarking"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -1844,7 +1844,7 @@ dependencies = [
 
 [[package]]
 name = "frame-system-rpc-runtime-api"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -4391,7 +4391,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-assets"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4407,7 +4407,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-atomic-swap"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4422,7 +4422,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-aura"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4443,7 +4443,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-authority-discovery"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4461,7 +4461,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-authorship"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4478,7 +4478,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-babe"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4507,7 +4507,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-balances"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4523,7 +4523,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-bounties"
-version = "2.0.0"
+version = "3.0.0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4541,7 +4541,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-collective"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4638,7 +4638,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-democracy"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4658,7 +4658,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-elections"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4740,7 +4740,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-grandpa"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "finality-grandpa",
  "frame-benchmarking",
@@ -4768,7 +4768,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-identity"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -4785,7 +4785,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-im-online"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4804,7 +4804,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-indices"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4821,7 +4821,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-lottery"
-version = "2.0.0"
+version = "3.0.0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4837,7 +4837,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-membership"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4851,7 +4851,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-mmr"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "ckb-merkle-mountain-range",
  "env_logger 0.8.2",
@@ -4870,7 +4870,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-mmr-primitives"
-version = "2.0.0"
+version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4885,7 +4885,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-multisig"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4901,7 +4901,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-nicks"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4930,7 +4930,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-offences"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4946,7 +4946,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-offences-benchmarking"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4971,7 +4971,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-proxy"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4988,7 +4988,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-randomness-collective-flip"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5003,7 +5003,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-recovery"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -5019,7 +5019,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-scheduler"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5035,7 +5035,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-scored-pool"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5050,7 +5050,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-session"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5071,7 +5071,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-session-benchmarking"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5093,7 +5093,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-society"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5109,7 +5109,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-staking"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5161,7 +5161,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-staking-reward-curve"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -5172,7 +5172,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-sudo"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5199,7 +5199,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-timestamp"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5217,7 +5217,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-tips"
-version = "2.0.0"
+version = "3.0.0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5235,7 +5235,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-transaction-payment"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5253,7 +5253,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-transaction-payment-rpc"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -5269,7 +5269,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -5279,7 +5279,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-treasury"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5297,7 +5297,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-utility"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5313,7 +5313,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-vesting"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -6538,7 +6538,7 @@ dependencies = [
 
 [[package]]
 name = "sc-authority-discovery"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -6569,7 +6569,7 @@ dependencies = [
 
 [[package]]
 name = "sc-basic-authorship"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "futures 0.3.12",
  "futures-timer 3.0.2",
@@ -6594,7 +6594,7 @@ dependencies = [
 
 [[package]]
 name = "sc-block-builder"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -6612,7 +6612,7 @@ dependencies = [
 
 [[package]]
 name = "sc-chain-spec"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -6632,7 +6632,7 @@ dependencies = [
 
 [[package]]
 name = "sc-chain-spec-derive"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -6642,7 +6642,7 @@ dependencies = [
 
 [[package]]
 name = "sc-cli"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "chrono",
  "fdlimit",
@@ -6680,7 +6680,7 @@ dependencies = [
 
 [[package]]
 name = "sc-client-api"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "derive_more",
  "fnv",
@@ -6717,7 +6717,7 @@ dependencies = [
 
 [[package]]
 name = "sc-client-db"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -6751,7 +6751,7 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "sc-client-api",
  "sp-blockchain",
@@ -6761,7 +6761,7 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-aura"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "derive_more",
  "futures 0.3.12",
@@ -6802,7 +6802,7 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-babe"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "derive_more",
  "fork-tree",
@@ -6857,7 +6857,7 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-babe-rpc"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "derive_more",
  "futures 0.3.12",
@@ -6886,7 +6886,7 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-epochs"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -6898,7 +6898,7 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-manual-seal"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "assert_matches",
  "derive_more",
@@ -6936,7 +6936,7 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-pow"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "derive_more",
  "futures 0.3.12",
@@ -6959,7 +6959,7 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-slots"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "futures 0.3.12",
  "futures-timer 3.0.2",
@@ -6985,7 +6985,7 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-uncles"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "log",
  "sc-client-api",
@@ -6998,7 +6998,7 @@ dependencies = [
 
 [[package]]
 name = "sc-executor"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "assert_matches",
  "derive_more",
@@ -7038,7 +7038,7 @@ dependencies = [
 
 [[package]]
 name = "sc-executor-common"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "derive_more",
  "parity-scale-codec",
@@ -7053,7 +7053,7 @@ dependencies = [
 
 [[package]]
 name = "sc-executor-wasmi"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7067,7 +7067,7 @@ dependencies = [
 
 [[package]]
 name = "sc-executor-wasmtime"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "assert_matches",
  "log",
@@ -7085,7 +7085,7 @@ dependencies = [
 
 [[package]]
 name = "sc-finality-grandpa"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "assert_matches",
  "derive_more",
@@ -7131,7 +7131,7 @@ dependencies = [
 
 [[package]]
 name = "sc-finality-grandpa-rpc"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "derive_more",
  "finality-grandpa",
@@ -7180,7 +7180,7 @@ dependencies = [
 
 [[package]]
 name = "sc-informant"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.12",
@@ -7197,7 +7197,7 @@ dependencies = [
 
 [[package]]
 name = "sc-keystore"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7217,7 +7217,7 @@ dependencies = [
 
 [[package]]
 name = "sc-light"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "hash-db",
  "lazy_static",
@@ -7235,7 +7235,7 @@ dependencies = [
 
 [[package]]
 name = "sc-network"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "assert_matches",
  "async-std",
@@ -7295,7 +7295,7 @@ dependencies = [
 
 [[package]]
 name = "sc-network-gossip"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "async-std",
  "futures 0.3.12",
@@ -7341,7 +7341,7 @@ dependencies = [
 
 [[package]]
 name = "sc-offchain"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
@@ -7376,7 +7376,7 @@ dependencies = [
 
 [[package]]
 name = "sc-peerset"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "futures 0.3.12",
  "libp2p",
@@ -7389,7 +7389,7 @@ dependencies = [
 
 [[package]]
 name = "sc-proposer-metrics"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -7397,7 +7397,7 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "assert_matches",
  "futures 0.1.30",
@@ -7439,7 +7439,7 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc-api"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "derive_more",
  "futures 0.3.12",
@@ -7462,7 +7462,7 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc-server"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "futures 0.1.30",
  "jsonrpc-core",
@@ -7493,7 +7493,7 @@ dependencies = [
 
 [[package]]
 name = "sc-service"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "async-std",
  "directories",
@@ -7599,7 +7599,7 @@ dependencies = [
 
 [[package]]
 name = "sc-state-db"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7613,7 +7613,7 @@ dependencies = [
 
 [[package]]
 name = "sc-sync-state-rpc"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -7632,7 +7632,7 @@ dependencies = [
 
 [[package]]
 name = "sc-telemetry"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "chrono",
  "futures 0.3.12",
@@ -7653,7 +7653,7 @@ dependencies = [
 
 [[package]]
 name = "sc-tracing"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -7680,7 +7680,7 @@ dependencies = [
 
 [[package]]
 name = "sc-tracing-proc-macro"
-version = "2.0.0"
+version = "3.0.0"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -7690,7 +7690,7 @@ dependencies = [
 
 [[package]]
 name = "sc-transaction-graph"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "assert_matches",
  "criterion",
@@ -7715,7 +7715,7 @@ dependencies = [
 
 [[package]]
 name = "sc-transaction-pool"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "assert_matches",
  "futures 0.3.12",
@@ -8126,7 +8126,7 @@ dependencies = [
 
 [[package]]
 name = "sp-allocator"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "log",
  "sp-core",
@@ -8137,7 +8137,7 @@ dependencies = [
 
 [[package]]
 name = "sp-api"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "hash-db",
  "parity-scale-codec",
@@ -8153,7 +8153,7 @@ dependencies = [
 
 [[package]]
 name = "sp-api-proc-macro"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate",
@@ -8183,7 +8183,7 @@ dependencies = [
 
 [[package]]
 name = "sp-application-crypto"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -8206,7 +8206,7 @@ dependencies = [
 
 [[package]]
 name = "sp-arithmetic"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "criterion",
  "integer-sqrt",
@@ -8233,7 +8233,7 @@ dependencies = [
 
 [[package]]
 name = "sp-authority-discovery"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8244,7 +8244,7 @@ dependencies = [
 
 [[package]]
 name = "sp-authorship"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -8254,7 +8254,7 @@ dependencies = [
 
 [[package]]
 name = "sp-block-builder"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8265,7 +8265,7 @@ dependencies = [
 
 [[package]]
 name = "sp-blockchain"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "futures 0.3.12",
  "log",
@@ -8282,7 +8282,7 @@ dependencies = [
 
 [[package]]
 name = "sp-chain-spec"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "serde",
  "serde_json",
@@ -8290,7 +8290,7 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "futures 0.3.12",
  "futures-timer 3.0.2",
@@ -8316,7 +8316,7 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-aura"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8330,7 +8330,7 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-babe"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "merlin",
  "parity-scale-codec",
@@ -8349,7 +8349,7 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-pow"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8360,7 +8360,7 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-slots"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "parity-scale-codec",
  "sp-arithmetic",
@@ -8369,7 +8369,7 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-vrf"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -8380,7 +8380,7 @@ dependencies = [
 
 [[package]]
 name = "sp-core"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -8429,7 +8429,7 @@ dependencies = [
 
 [[package]]
 name = "sp-database"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "kvdb",
  "parking_lot 0.11.1",
@@ -8437,7 +8437,7 @@ dependencies = [
 
 [[package]]
 name = "sp-debug-derive"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8446,7 +8446,7 @@ dependencies = [
 
 [[package]]
 name = "sp-election-providers"
-version = "2.0.0"
+version = "3.0.0"
 dependencies = [
  "parity-scale-codec",
  "sp-arithmetic",
@@ -8457,7 +8457,7 @@ dependencies = [
 
 [[package]]
 name = "sp-externalities"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -8467,7 +8467,7 @@ dependencies = [
 
 [[package]]
 name = "sp-finality-grandpa"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -8483,7 +8483,7 @@ dependencies = [
 
 [[package]]
 name = "sp-inherents"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -8494,7 +8494,7 @@ dependencies = [
 
 [[package]]
 name = "sp-io"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "futures 0.3.12",
  "hash-db",
@@ -8517,7 +8517,7 @@ dependencies = [
 
 [[package]]
 name = "sp-keyring"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -8527,7 +8527,7 @@ dependencies = [
 
 [[package]]
 name = "sp-keystore"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -8545,7 +8545,7 @@ dependencies = [
 
 [[package]]
 name = "sp-npos-elections"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "parity-scale-codec",
  "rand 0.7.3",
@@ -8560,7 +8560,7 @@ dependencies = [
 
 [[package]]
 name = "sp-npos-elections-compact"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -8582,7 +8582,7 @@ dependencies = [
 
 [[package]]
 name = "sp-offchain"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -8592,14 +8592,14 @@ dependencies = [
 
 [[package]]
 name = "sp-panic-handler"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "backtrace",
 ]
 
 [[package]]
 name = "sp-rpc"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "serde",
  "serde_json",
@@ -8608,7 +8608,7 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -8630,7 +8630,7 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime-interface"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -8652,7 +8652,7 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime-interface-proc-macro"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -8701,7 +8701,7 @@ dependencies = [
 
 [[package]]
 name = "sp-sandbox"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "assert_matches",
  "parity-scale-codec",
@@ -8715,7 +8715,7 @@ dependencies = [
 
 [[package]]
 name = "sp-serializer"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "serde",
  "serde_json",
@@ -8723,7 +8723,7 @@ dependencies = [
 
 [[package]]
 name = "sp-session"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8735,7 +8735,7 @@ dependencies = [
 
 [[package]]
 name = "sp-staking"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -8744,7 +8744,7 @@ dependencies = [
 
 [[package]]
 name = "sp-state-machine"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "hash-db",
  "hex-literal",
@@ -8768,11 +8768,11 @@ dependencies = [
 
 [[package]]
 name = "sp-std"
-version = "2.0.1"
+version = "3.0.0"
 
 [[package]]
 name = "sp-storage"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -8784,7 +8784,7 @@ dependencies = [
 
 [[package]]
 name = "sp-tasks"
-version = "2.0.0"
+version = "3.0.0"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -8809,7 +8809,7 @@ dependencies = [
 
 [[package]]
 name = "sp-timestamp"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -8822,7 +8822,7 @@ dependencies = [
 
 [[package]]
 name = "sp-tracing"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -8834,7 +8834,7 @@ dependencies = [
 
 [[package]]
 name = "sp-transaction-pool"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "derive_more",
  "futures 0.3.12",
@@ -8849,7 +8849,7 @@ dependencies = [
 
 [[package]]
 name = "sp-trie"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "criterion",
  "hash-db",
@@ -8867,7 +8867,7 @@ dependencies = [
 
 [[package]]
 name = "sp-utils"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "futures 0.3.12",
  "futures-core",
@@ -8878,7 +8878,7 @@ dependencies = [
 
 [[package]]
 name = "sp-version"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -8889,7 +8889,7 @@ dependencies = [
 
 [[package]]
 name = "sp-wasm-interface"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -9017,7 +9017,7 @@ dependencies = [
 
 [[package]]
 name = "substrate-browser-utils"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "chrono",
  "console_error_panic_hook",
@@ -9043,14 +9043,14 @@ dependencies = [
 
 [[package]]
 name = "substrate-build-script-utils"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "platforms",
 ]
 
 [[package]]
 name = "substrate-frame-cli"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-system",
  "sc-cli",
@@ -9061,7 +9061,7 @@ dependencies = [
 
 [[package]]
 name = "substrate-frame-rpc-support"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -9077,7 +9077,7 @@ dependencies = [
 
 [[package]]
 name = "substrate-frame-rpc-system"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.12",
@@ -9102,7 +9102,7 @@ dependencies = [
 
 [[package]]
 name = "substrate-prometheus-endpoint"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "async-std",
  "derive_more",
@@ -9220,7 +9220,7 @@ dependencies = [
 
 [[package]]
 name = "substrate-test-utils"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "futures 0.3.12",
  "sc-service",
@@ -9231,7 +9231,7 @@ dependencies = [
 
 [[package]]
 name = "substrate-test-utils-derive"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
  "proc-macro-crate",
  "quote",
@@ -9249,7 +9249,7 @@ dependencies = [
 
 [[package]]
 name = "substrate-wasm-builder"
-version = "3.0.0"
+version = "4.0.0"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
diff --git a/bin/node-template/node/Cargo.toml b/bin/node-template/node/Cargo.toml
index 878e49fe9b1f..464b07cb98f0 100644
--- a/bin/node-template/node/Cargo.toml
+++ b/bin/node-template/node/Cargo.toml
@@ -18,43 +18,43 @@ name = "node-template"
 [dependencies]
 structopt = "0.3.8"
 
-sc-cli = { version = "0.8.0", path = "../../../client/cli", features = ["wasmtime"] }
-sp-core = { version = "2.0.0", path = "../../../primitives/core" }
-sc-executor = { version = "0.8.0", path = "../../../client/executor", features = ["wasmtime"] }
-sc-service = { version = "0.8.0", path = "../../../client/service", features = ["wasmtime"] }
-sc-telemetry = { version = "2.0.0", path = "../../../client/telemetry" }
-sc-keystore = { version = "2.0.0", path = "../../../client/keystore" }
-sp-inherents = { version = "2.0.0", path = "../../../primitives/inherents" }
-sc-transaction-pool = { version = "2.0.0", path = "../../../client/transaction-pool" }
-sp-transaction-pool = { version = "2.0.0", path = "../../../primitives/transaction-pool" }
-sc-consensus-aura = { version = "0.8.0", path = "../../../client/consensus/aura" }
-sp-consensus-aura = { version = "0.8.0", path = "../../../primitives/consensus/aura" }
-sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
-sc-consensus = { version = "0.8.0", path = "../../../client/consensus/common" }
-sc-finality-grandpa = { version = "0.8.0", path = "../../../client/finality-grandpa" }
-sp-finality-grandpa = { version = "2.0.0", path = "../../../primitives/finality-grandpa" }
-sc-client-api = { version = "2.0.0", path = "../../../client/api" }
-sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
+sc-cli = { version = "0.9.0", path = "../../../client/cli", features = ["wasmtime"] }
+sp-core = { version = "3.0.0", path = "../../../primitives/core" }
+sc-executor = { version = "0.9.0", path = "../../../client/executor", features = ["wasmtime"] }
+sc-service = { version = "0.9.0", path = "../../../client/service", features = ["wasmtime"] }
+sc-telemetry = { version = "3.0.0", path = "../../../client/telemetry" }
+sc-keystore = { version = "3.0.0", path = "../../../client/keystore" }
+sp-inherents = { version = "3.0.0", path = "../../../primitives/inherents" }
+sc-transaction-pool = { version = "3.0.0", path = "../../../client/transaction-pool" }
+sp-transaction-pool = { version = "3.0.0", path = "../../../primitives/transaction-pool" }
+sc-consensus-aura = { version = "0.9.0", path = "../../../client/consensus/aura" }
+sp-consensus-aura = { version = "0.9.0", path = "../../../primitives/consensus/aura" }
+sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
+sc-consensus = { version = "0.9.0", path = "../../../client/consensus/common" }
+sc-finality-grandpa = { version = "0.9.0", path = "../../../client/finality-grandpa" }
+sp-finality-grandpa = { version = "3.0.0", path = "../../../primitives/finality-grandpa" }
+sc-client-api = { version = "3.0.0", path = "../../../client/api" }
+sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
 
 # These dependencies are used for the node template's RPCs
 jsonrpc-core = "15.1.0"
-sc-rpc = { version = "2.0.0", path = "../../../client/rpc" }
-sp-api = { version = "2.0.0", path = "../../../primitives/api" }
-sc-rpc-api = { version = "0.8.0", path = "../../../client/rpc-api" }
-sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
-sp-block-builder = { version = "2.0.0", path = "../../../primitives/block-builder" }
-sc-basic-authorship = { version = "0.8.0", path = "../../../client/basic-authorship" }
-substrate-frame-rpc-system = { version = "2.0.0", path = "../../../utils/frame/rpc/system" }
-pallet-transaction-payment-rpc = { version = "2.0.0", path = "../../../frame/transaction-payment/rpc/" }
+sc-rpc = { version = "3.0.0", path = "../../../client/rpc" }
+sp-api = { version = "3.0.0", path = "../../../primitives/api" }
+sc-rpc-api = { version = "0.9.0", path = "../../../client/rpc-api" }
+sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
+sp-block-builder = { version = "3.0.0", path = "../../../primitives/block-builder" }
+sc-basic-authorship = { version = "0.9.0", path = "../../../client/basic-authorship" }
+substrate-frame-rpc-system = { version = "3.0.0", path = "../../../utils/frame/rpc/system" }
+pallet-transaction-payment-rpc = { version = "3.0.0", path = "../../../frame/transaction-payment/rpc/" }
 
 # These dependencies are used for runtime benchmarking
-frame-benchmarking = { version = "2.0.0", path = "../../../frame/benchmarking" }
-frame-benchmarking-cli = { version = "2.0.0", path = "../../../utils/frame/benchmarking-cli" }
+frame-benchmarking = { version = "3.0.0", path = "../../../frame/benchmarking" }
+frame-benchmarking-cli = { version = "3.0.0", path = "../../../utils/frame/benchmarking-cli" }
 
 node-template-runtime = { version = "2.0.0", path = "../runtime" }
 
 [build-dependencies]
-substrate-build-script-utils = { version = "2.0.0", path = "../../../utils/build-script-utils" }
+substrate-build-script-utils = { version = "3.0.0", path = "../../../utils/build-script-utils" }
 
 [features]
 default = []
diff --git a/bin/node-template/pallets/template/Cargo.toml b/bin/node-template/pallets/template/Cargo.toml
index a2f0011b5422..a13d05082b01 100644
--- a/bin/node-template/pallets/template/Cargo.toml
+++ b/bin/node-template/pallets/template/Cargo.toml
@@ -15,32 +15,32 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 
-[dev-dependencies]
-serde = { version = "1.0.101" }
-
 [dependencies.frame-support]
 default-features = false
-version = "2.0.0"
+version = "3.0.0"
 path = "../../../../frame/support"
 
 [dependencies.frame-system]
 default-features = false
-version = "2.0.0"
+version = "3.0.0"
 path = "../../../../frame/system"
 
+[dev-dependencies]
+serde = { version = "1.0.101" }
+
 [dev-dependencies.sp-core]
 default-features = false
-version = "2.0.0"
+version = "3.0.0"
 path = "../../../../primitives/core"
 
 [dev-dependencies.sp-io]
 default-features = false
-version = "2.0.0"
+version = "3.0.0"
 path = "../../../../primitives/io"
 
 [dev-dependencies.sp-runtime]
 default-features = false
-version = "2.0.0"
+version = "3.0.0"
 path = "../../../../primitives/runtime"
 
 
diff --git a/bin/node-template/runtime/Cargo.toml b/bin/node-template/runtime/Cargo.toml
index 3f860655cb5f..dd907f55fbbb 100644
--- a/bin/node-template/runtime/Cargo.toml
+++ b/bin/node-template/runtime/Cargo.toml
@@ -13,42 +13,42 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 
-pallet-aura = { version = "2.0.0", default-features = false, path = "../../../frame/aura" }
-pallet-balances = { version = "2.0.0", default-features = false, path = "../../../frame/balances" }
-frame-support = { version = "2.0.0", default-features = false, path = "../../../frame/support" }
-pallet-grandpa = { version = "2.0.0", default-features = false, path = "../../../frame/grandpa" }
-pallet-randomness-collective-flip = { version = "2.0.0", default-features = false, path = "../../../frame/randomness-collective-flip" }
-pallet-sudo = { version = "2.0.0", default-features = false, path = "../../../frame/sudo" }
-frame-system = { version = "2.0.0", default-features = false, path = "../../../frame/system" }
-pallet-timestamp = { version = "2.0.0", default-features = false, path = "../../../frame/timestamp" }
-pallet-transaction-payment = { version = "2.0.0", default-features = false, path = "../../../frame/transaction-payment" }
-frame-executive = { version = "2.0.0", default-features = false, path = "../../../frame/executive" }
+pallet-aura = { version = "3.0.0", default-features = false, path = "../../../frame/aura" }
+pallet-balances = { version = "3.0.0", default-features = false, path = "../../../frame/balances" }
+frame-support = { version = "3.0.0", default-features = false, path = "../../../frame/support" }
+pallet-grandpa = { version = "3.0.0", default-features = false, path = "../../../frame/grandpa" }
+pallet-randomness-collective-flip = { version = "3.0.0", default-features = false, path = "../../../frame/randomness-collective-flip" }
+pallet-sudo = { version = "3.0.0", default-features = false, path = "../../../frame/sudo" }
+frame-system = { version = "3.0.0", default-features = false, path = "../../../frame/system" }
+pallet-timestamp = { version = "3.0.0", default-features = false, path = "../../../frame/timestamp" }
+pallet-transaction-payment = { version = "3.0.0", default-features = false, path = "../../../frame/transaction-payment" }
+frame-executive = { version = "3.0.0", default-features = false, path = "../../../frame/executive" }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-sp-api = { version = "2.0.0", default-features = false, path = "../../../primitives/api" }
-sp-block-builder = { path = "../../../primitives/block-builder", default-features = false, version = "2.0.0"}
-sp-consensus-aura = { version = "0.8.0", default-features = false, path = "../../../primitives/consensus/aura" }
-sp-core = { version = "2.0.0", default-features = false, path = "../../../primitives/core" }
-sp-inherents = { path = "../../../primitives/inherents", default-features = false, version = "2.0.0"}
-sp-offchain = { version = "2.0.0", default-features = false, path = "../../../primitives/offchain" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../../primitives/runtime" }
-sp-session = { version = "2.0.0", default-features = false, path = "../../../primitives/session" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../../primitives/std" }
-sp-transaction-pool = { version = "2.0.0", default-features = false, path = "../../../primitives/transaction-pool" }
-sp-version = { version = "2.0.0", default-features = false, path = "../../../primitives/version" }
+sp-api = { version = "3.0.0", default-features = false, path = "../../../primitives/api" }
+sp-block-builder = { path = "../../../primitives/block-builder", default-features = false, version = "3.0.0"}
+sp-consensus-aura = { version = "0.9.0", default-features = false, path = "../../../primitives/consensus/aura" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../../primitives/core" }
+sp-inherents = { path = "../../../primitives/inherents", default-features = false, version = "3.0.0"}
+sp-offchain = { version = "3.0.0", default-features = false, path = "../../../primitives/offchain" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
+sp-session = { version = "3.0.0", default-features = false, path = "../../../primitives/session" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../../primitives/std" }
+sp-transaction-pool = { version = "3.0.0", default-features = false, path = "../../../primitives/transaction-pool" }
+sp-version = { version = "3.0.0", default-features = false, path = "../../../primitives/version" }
 
 # Used for the node template's RPCs
-frame-system-rpc-runtime-api = { version = "2.0.0", default-features = false, path = "../../../frame/system/rpc/runtime-api/" }
-pallet-transaction-payment-rpc-runtime-api = { version = "2.0.0", default-features = false, path = "../../../frame/transaction-payment/rpc/runtime-api/" }
+frame-system-rpc-runtime-api = { version = "3.0.0", default-features = false, path = "../../../frame/system/rpc/runtime-api/" }
+pallet-transaction-payment-rpc-runtime-api = { version = "3.0.0", default-features = false, path = "../../../frame/transaction-payment/rpc/runtime-api/" }
 
 # Used for runtime benchmarking
-frame-benchmarking = { version = "2.0.0", default-features = false, path = "../../../frame/benchmarking", optional = true }
-frame-system-benchmarking = { version = "2.0.0", default-features = false, path = "../../../frame/system/benchmarking", optional = true }
+frame-benchmarking = { version = "3.0.0", default-features = false, path = "../../../frame/benchmarking", optional = true }
+frame-system-benchmarking = { version = "3.0.0", default-features = false, path = "../../../frame/system/benchmarking", optional = true }
 hex-literal = { version = "0.3.1", optional = true }
 
 template = { version = "2.0.0", default-features = false, path = "../pallets/template", package = "pallet-template" }
 
 [build-dependencies]
-substrate-wasm-builder = { version = "3.0.0", path = "../../../utils/wasm-builder" }
+substrate-wasm-builder = { version = "4.0.0", path = "../../../utils/wasm-builder" }
 
 [features]
 default = ["std"]
diff --git a/bin/node/bench/Cargo.toml b/bin/node/bench/Cargo.toml
index 21f8cf722162..728eb8d6093c 100644
--- a/bin/node/bench/Cargo.toml
+++ b/bin/node/bench/Cargo.toml
@@ -13,24 +13,24 @@ log = "0.4.8"
 node-primitives = { version = "2.0.0", path = "../primitives" }
 node-testing = { version = "2.0.0", path = "../testing" }
 node-runtime = { version = "2.0.0", path = "../runtime" }
-sc-cli = { version = "0.8.0", path = "../../../client/cli" }
-sc-client-api = { version = "2.0.0", path = "../../../client/api/" }
-sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
-sp-state-machine = { version = "0.8.0", path = "../../../primitives/state-machine" }
+sc-cli = { version = "0.9.0", path = "../../../client/cli" }
+sc-client-api = { version = "3.0.0", path = "../../../client/api/" }
+sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
+sp-state-machine = { version = "0.9.0", path = "../../../primitives/state-machine" }
 serde = "1.0.101"
 serde_json = "1.0.41"
 structopt = "0.3"
 derive_more = "0.99.2"
 kvdb = "0.9.0"
 kvdb-rocksdb = "0.11.0"
-sp-trie = { version = "2.0.0", path = "../../../primitives/trie" }
-sp-core = { version = "2.0.0", path = "../../../primitives/core" }
-sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
-sp-transaction-pool = { version = "2.0.0", path = "../../../primitives/transaction-pool" }
-sc-basic-authorship = { version = "0.8.0", path = "../../../client/basic-authorship" }
-sp-inherents = { version = "2.0.0", path = "../../../primitives/inherents" }
-sp-timestamp = { version = "2.0.0", default-features = false, path = "../../../primitives/timestamp" }
-sp-tracing = { version = "2.0.0", path = "../../../primitives/tracing" }
+sp-trie = { version = "3.0.0", path = "../../../primitives/trie" }
+sp-core = { version = "3.0.0", path = "../../../primitives/core" }
+sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
+sp-transaction-pool = { version = "3.0.0", path = "../../../primitives/transaction-pool" }
+sc-basic-authorship = { version = "0.9.0", path = "../../../client/basic-authorship" }
+sp-inherents = { version = "3.0.0", path = "../../../primitives/inherents" }
+sp-timestamp = { version = "3.0.0", default-features = false, path = "../../../primitives/timestamp" }
+sp-tracing = { version = "3.0.0", path = "../../../primitives/tracing" }
 hash-db = "0.15.2"
 tempfile = "3.1.0"
 fs_extra = "1"
@@ -39,5 +39,5 @@ rand = { version = "0.7.2", features = ["small_rng"] }
 lazy_static = "1.4.0"
 parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
 parity-db = { version = "0.2.2" }
-sc-transaction-pool = { version = "2.0.0", path = "../../../client/transaction-pool" }
+sc-transaction-pool = { version = "3.0.0", path = "../../../client/transaction-pool" }
 futures = { version = "0.3.4", features = ["thread-pool"] }
diff --git a/bin/node/browser-testing/Cargo.toml b/bin/node/browser-testing/Cargo.toml
index e098ea3e6463..66e7b398dd16 100644
--- a/bin/node/browser-testing/Cargo.toml
+++ b/bin/node/browser-testing/Cargo.toml
@@ -18,4 +18,4 @@ wasm-bindgen-test = "0.3.18"
 futures = "0.3.9"
 
 node-cli = { path = "../cli", default-features = false, features = ["browser"] , version = "2.0.0"}
-sc-rpc-api = { path = "../../../client/rpc-api" , version = "0.8.0"}
+sc-rpc-api = { path = "../../../client/rpc-api" , version = "0.9.0"}
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index 5832baa9f322..99d6f5216d21 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -44,50 +44,50 @@ structopt = { version = "0.3.8", optional = true }
 parking_lot = "0.11.1"
 
 # primitives
-sp-authority-discovery = { version = "2.0.0",  path = "../../../primitives/authority-discovery" }
-sp-consensus-babe = { version = "0.8.0", path = "../../../primitives/consensus/babe" }
-grandpa-primitives = { version = "2.0.0", package = "sp-finality-grandpa", path = "../../../primitives/finality-grandpa" }
-sp-core = { version = "2.0.0", path = "../../../primitives/core" }
-sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
-sp-timestamp = { version = "2.0.0", default-features = false, path = "../../../primitives/timestamp" }
-sp-inherents = { version = "2.0.0", path = "../../../primitives/inherents" }
-sp-keyring = { version = "2.0.0", path = "../../../primitives/keyring" }
-sp-keystore = { version = "0.8.0", path = "../../../primitives/keystore" }
-sp-io = { version = "2.0.0", path = "../../../primitives/io" }
-sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
-sp-transaction-pool = { version = "2.0.0", path = "../../../primitives/transaction-pool" }
+sp-authority-discovery = { version = "3.0.0",  path = "../../../primitives/authority-discovery" }
+sp-consensus-babe = { version = "0.9.0", path = "../../../primitives/consensus/babe" }
+grandpa-primitives = { version = "3.0.0", package = "sp-finality-grandpa", path = "../../../primitives/finality-grandpa" }
+sp-core = { version = "3.0.0", path = "../../../primitives/core" }
+sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
+sp-timestamp = { version = "3.0.0", default-features = false, path = "../../../primitives/timestamp" }
+sp-inherents = { version = "3.0.0", path = "../../../primitives/inherents" }
+sp-keyring = { version = "3.0.0", path = "../../../primitives/keyring" }
+sp-keystore = { version = "0.9.0", path = "../../../primitives/keystore" }
+sp-io = { version = "3.0.0", path = "../../../primitives/io" }
+sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
+sp-transaction-pool = { version = "3.0.0", path = "../../../primitives/transaction-pool" }
 
 # client dependencies
-sc-client-api = { version = "2.0.0", path = "../../../client/api" }
-sc-chain-spec = { version = "2.0.0", path = "../../../client/chain-spec" }
-sc-consensus = { version = "0.8.0", path = "../../../client/consensus/common" }
-sc-transaction-pool = { version = "2.0.0", path = "../../../client/transaction-pool" }
-sc-network = { version = "0.8.0", path = "../../../client/network" }
-sc-consensus-slots = { version = "0.8.0", path = "../../../client/consensus/slots" }
-sc-consensus-babe = { version = "0.8.0", path = "../../../client/consensus/babe" }
-grandpa = { version = "0.8.0", package = "sc-finality-grandpa", path = "../../../client/finality-grandpa" }
-sc-client-db = { version = "0.8.0", default-features = false, path = "../../../client/db" }
-sc-offchain = { version = "2.0.0", path = "../../../client/offchain" }
-sc-rpc = { version = "2.0.0", path = "../../../client/rpc" }
-sc-basic-authorship = { version = "0.8.0", path = "../../../client/basic-authorship" }
-sc-service = { version = "0.8.0", default-features = false, path = "../../../client/service" }
-sc-tracing = { version = "2.0.0", path = "../../../client/tracing" }
-sc-telemetry = { version = "2.0.0", path = "../../../client/telemetry" }
-sc-authority-discovery = { version = "0.8.0",  path = "../../../client/authority-discovery" }
+sc-client-api = { version = "3.0.0", path = "../../../client/api" }
+sc-chain-spec = { version = "3.0.0", path = "../../../client/chain-spec" }
+sc-consensus = { version = "0.9.0", path = "../../../client/consensus/common" }
+sc-transaction-pool = { version = "3.0.0", path = "../../../client/transaction-pool" }
+sc-network = { version = "0.9.0", path = "../../../client/network" }
+sc-consensus-slots = { version = "0.9.0", path = "../../../client/consensus/slots" }
+sc-consensus-babe = { version = "0.9.0", path = "../../../client/consensus/babe" }
+grandpa = { version = "0.9.0", package = "sc-finality-grandpa", path = "../../../client/finality-grandpa" }
+sc-client-db = { version = "0.9.0", default-features = false, path = "../../../client/db" }
+sc-offchain = { version = "3.0.0", path = "../../../client/offchain" }
+sc-rpc = { version = "3.0.0", path = "../../../client/rpc" }
+sc-basic-authorship = { version = "0.9.0", path = "../../../client/basic-authorship" }
+sc-service = { version = "0.9.0", default-features = false, path = "../../../client/service" }
+sc-tracing = { version = "3.0.0", path = "../../../client/tracing" }
+sc-telemetry = { version = "3.0.0", path = "../../../client/telemetry" }
+sc-authority-discovery = { version = "0.9.0",  path = "../../../client/authority-discovery" }
 sc-finality-grandpa-warp-sync = { version = "0.8.0", path = "../../../client/finality-grandpa-warp-sync", optional = true }
 
 # frame dependencies
-pallet-indices = { version = "2.0.0", path = "../../../frame/indices" }
-pallet-timestamp = { version = "2.0.0", default-features = false, path = "../../../frame/timestamp" }
+pallet-indices = { version = "3.0.0", path = "../../../frame/indices" }
+pallet-timestamp = { version = "3.0.0", default-features = false, path = "../../../frame/timestamp" }
 pallet-contracts = { version = "2.0.0", path = "../../../frame/contracts" }
-frame-system = { version = "2.0.0", path = "../../../frame/system" }
-pallet-balances = { version = "2.0.0", path = "../../../frame/balances" }
-pallet-transaction-payment = { version = "2.0.0", path = "../../../frame/transaction-payment" }
-frame-support = { version = "2.0.0", default-features = false, path = "../../../frame/support" }
-pallet-im-online = { version = "2.0.0", default-features = false, path = "../../../frame/im-online" }
-pallet-authority-discovery = { version = "2.0.0", path = "../../../frame/authority-discovery" }
-pallet-staking = { version = "2.0.0", path = "../../../frame/staking" }
-pallet-grandpa = { version = "2.0.0", path = "../../../frame/grandpa" }
+frame-system = { version = "3.0.0", path = "../../../frame/system" }
+pallet-balances = { version = "3.0.0", path = "../../../frame/balances" }
+pallet-transaction-payment = { version = "3.0.0", path = "../../../frame/transaction-payment" }
+frame-support = { version = "3.0.0", default-features = false, path = "../../../frame/support" }
+pallet-im-online = { version = "3.0.0", default-features = false, path = "../../../frame/im-online" }
+pallet-authority-discovery = { version = "3.0.0", path = "../../../frame/authority-discovery" }
+pallet-staking = { version = "3.0.0", path = "../../../frame/staking" }
+pallet-grandpa = { version = "3.0.0", path = "../../../frame/grandpa" }
 
 # node-specific dependencies
 node-runtime = { version = "2.0.0", path = "../runtime" }
@@ -96,26 +96,26 @@ node-primitives = { version = "2.0.0", path = "../primitives" }
 node-executor = { version = "2.0.0", path = "../executor" }
 
 # CLI-specific dependencies
-sc-cli = { version = "0.8.0", optional = true, path = "../../../client/cli" }
-frame-benchmarking-cli = { version = "2.0.0", optional = true, path = "../../../utils/frame/benchmarking-cli" }
+sc-cli = { version = "0.9.0", optional = true, path = "../../../client/cli" }
+frame-benchmarking-cli = { version = "3.0.0", optional = true, path = "../../../utils/frame/benchmarking-cli" }
 node-inspect = { version = "0.8.0", optional = true, path = "../inspect" }
 
 # WASM-specific dependencies
 wasm-bindgen = { version = "0.2.57", optional = true }
 wasm-bindgen-futures = { version = "0.4.18", optional = true }
-browser-utils = { package = "substrate-browser-utils", path = "../../../utils/browser", optional = true, version = "0.8.0"}
+browser-utils = { package = "substrate-browser-utils", path = "../../../utils/browser", optional = true, version = "0.9.0"}
 
 [target.'cfg(target_arch="x86_64")'.dependencies]
 node-executor = { version = "2.0.0", path = "../executor", features = [ "wasmtime" ] }
-sc-cli = { version = "0.8.0", optional = true, path = "../../../client/cli", features = [ "wasmtime" ] }
-sc-service = { version = "0.8.0", default-features = false, path = "../../../client/service", features = [ "wasmtime" ] }
-sp-trie = { version = "2.0.0", default-features = false, path = "../../../primitives/trie", features = ["memory-tracker"] }
+sc-cli = { version = "0.9.0", optional = true, path = "../../../client/cli", features = [ "wasmtime" ] }
+sc-service = { version = "0.9.0", default-features = false, path = "../../../client/service", features = [ "wasmtime" ] }
+sp-trie = { version = "3.0.0", default-features = false, path = "../../../primitives/trie", features = ["memory-tracker"] }
 
 [dev-dependencies]
-sc-keystore = { version = "2.0.0", path = "../../../client/keystore" }
-sc-consensus = { version = "0.8.0", path = "../../../client/consensus/common" }
-sc-consensus-babe = { version = "0.8.0", features = ["test-helpers"], path = "../../../client/consensus/babe" }
-sc-consensus-epochs = { version = "0.8.0", path = "../../../client/consensus/epochs" }
+sc-keystore = { version = "3.0.0", path = "../../../client/keystore" }
+sc-consensus = { version = "0.9.0", path = "../../../client/consensus/common" }
+sc-consensus-babe = { version = "0.9.0", features = ["test-helpers"], path = "../../../client/consensus/babe" }
+sc-consensus-epochs = { version = "0.9.0", path = "../../../client/consensus/epochs" }
 sc-service-test = { version = "2.0.0", path = "../../../client/service/test" }
 futures = "0.3.9"
 tempfile = "3.1.0"
@@ -128,12 +128,12 @@ platforms = "1.1"
 [build-dependencies]
 structopt = { version = "0.3.8", optional = true }
 node-inspect = { version = "0.8.0", optional = true, path = "../inspect" }
-frame-benchmarking-cli = { version = "2.0.0", optional = true, path = "../../../utils/frame/benchmarking-cli" }
-substrate-build-script-utils = { version = "2.0.0", optional = true, path = "../../../utils/build-script-utils" }
-substrate-frame-cli = { version = "2.0.0", optional = true, path = "../../../utils/frame/frame-utilities-cli" }
+frame-benchmarking-cli = { version = "3.0.0", optional = true, path = "../../../utils/frame/benchmarking-cli" }
+substrate-build-script-utils = { version = "3.0.0", optional = true, path = "../../../utils/build-script-utils" }
+substrate-frame-cli = { version = "3.0.0", optional = true, path = "../../../utils/frame/frame-utilities-cli" }
 
 [build-dependencies.sc-cli]
-version = "0.8.0"
+version = "0.9.0"
 package = "sc-cli"
 path = "../../../client/cli"
 optional = true
diff --git a/bin/node/executor/Cargo.toml b/bin/node/executor/Cargo.toml
index 36af51bd80fd..b67c29889d30 100644
--- a/bin/node/executor/Cargo.toml
+++ b/bin/node/executor/Cargo.toml
@@ -15,32 +15,32 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 node-primitives = { version = "2.0.0", path = "../primitives" }
 node-runtime = { version = "2.0.0", path = "../runtime" }
-sc-executor = { version = "0.8.0", path = "../../../client/executor" }
-sp-core = { version = "2.0.0", path = "../../../primitives/core" }
-sp-keystore = { version = "0.8.0", path = "../../../primitives/keystore" }
-sp-io = { version = "2.0.0", path = "../../../primitives/io" }
-sp-state-machine = { version = "0.8.0", path = "../../../primitives/state-machine" }
-sp-trie = { version = "2.0.0", path = "../../../primitives/trie" }
+sc-executor = { version = "0.9.0", path = "../../../client/executor" }
+sp-core = { version = "3.0.0", path = "../../../primitives/core" }
+sp-keystore = { version = "0.9.0", path = "../../../primitives/keystore" }
+sp-io = { version = "3.0.0", path = "../../../primitives/io" }
+sp-state-machine = { version = "0.9.0", path = "../../../primitives/state-machine" }
+sp-trie = { version = "3.0.0", path = "../../../primitives/trie" }
 trie-root = "0.16.0"
-frame-benchmarking = { version = "2.0.0", path = "../../../frame/benchmarking" }
+frame-benchmarking = { version = "3.0.0", path = "../../../frame/benchmarking" }
 
 [dev-dependencies]
 criterion = "0.3.0"
-frame-support = { version = "2.0.0", path = "../../../frame/support" }
-frame-system = { version = "2.0.0", path = "../../../frame/system" }
+frame-support = { version = "3.0.0", path = "../../../frame/support" }
+frame-system = { version = "3.0.0", path = "../../../frame/system" }
 node-testing = { version = "2.0.0", path = "../testing" }
-pallet-balances = { version = "2.0.0", path = "../../../frame/balances" }
+pallet-balances = { version = "3.0.0", path = "../../../frame/balances" }
 pallet-contracts = { version = "2.0.0", path = "../../../frame/contracts" }
-pallet-grandpa = { version = "2.0.0", path = "../../../frame/grandpa" }
-pallet-im-online = { version = "2.0.0", path = "../../../frame/im-online" }
-pallet-indices = { version = "2.0.0", path = "../../../frame/indices" }
-pallet-session = { version = "2.0.0", path = "../../../frame/session" }
-pallet-timestamp = { version = "2.0.0", path = "../../../frame/timestamp" }
-pallet-transaction-payment = { version = "2.0.0", path = "../../../frame/transaction-payment" }
-pallet-treasury = { version = "2.0.0", path = "../../../frame/treasury" }
-sp-application-crypto = { version = "2.0.0", path = "../../../primitives/application-crypto" }
-sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
-sp-externalities = { version = "0.8.0", path = "../../../primitives/externalities" }
+pallet-grandpa = { version = "3.0.0", path = "../../../frame/grandpa" }
+pallet-im-online = { version = "3.0.0", path = "../../../frame/im-online" }
+pallet-indices = { version = "3.0.0", path = "../../../frame/indices" }
+pallet-session = { version = "3.0.0", path = "../../../frame/session" }
+pallet-timestamp = { version = "3.0.0", path = "../../../frame/timestamp" }
+pallet-transaction-payment = { version = "3.0.0", path = "../../../frame/transaction-payment" }
+pallet-treasury = { version = "3.0.0", path = "../../../frame/treasury" }
+sp-application-crypto = { version = "3.0.0", path = "../../../primitives/application-crypto" }
+sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
+sp-externalities = { version = "0.9.0", path = "../../../primitives/externalities" }
 substrate-test-client = { version = "2.0.0", path = "../../../test-utils/client" }
 wat = "1.0"
 
diff --git a/bin/node/inspect/Cargo.toml b/bin/node/inspect/Cargo.toml
index 14acb1895601..3d89a68aed30 100644
--- a/bin/node/inspect/Cargo.toml
+++ b/bin/node/inspect/Cargo.toml
@@ -14,10 +14,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 derive_more = "0.99"
 log = "0.4.8"
-sc-cli = { version = "0.8.0", path = "../../../client/cli" }
-sc-client-api = { version = "2.0.0", path = "../../../client/api" }
-sc-service = { version = "0.8.0", default-features = false, path = "../../../client/service" }
-sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
-sp-core = { version = "2.0.0", path = "../../../primitives/core" }
-sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
+sc-cli = { version = "0.9.0", path = "../../../client/cli" }
+sc-client-api = { version = "3.0.0", path = "../../../client/api" }
+sc-service = { version = "0.9.0", default-features = false, path = "../../../client/service" }
+sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
+sp-core = { version = "3.0.0", path = "../../../primitives/core" }
+sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
 structopt = "0.3.8"
diff --git a/bin/node/primitives/Cargo.toml b/bin/node/primitives/Cargo.toml
index 7a4b29cacea3..043ec5ab21ce 100644
--- a/bin/node/primitives/Cargo.toml
+++ b/bin/node/primitives/Cargo.toml
@@ -12,13 +12,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-frame-system = { version = "2.0.0", default-features = false, path = "../../../frame/system" }
-sp-application-crypto = { version = "2.0.0", default-features = false, path = "../../../primitives/application-crypto" }
-sp-core = { version = "2.0.0", default-features = false, path = "../../../primitives/core" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../../primitives/runtime" }
+frame-system = { version = "3.0.0", default-features = false, path = "../../../frame/system" }
+sp-application-crypto = { version = "3.0.0", default-features = false, path = "../../../primitives/application-crypto" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../../primitives/core" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
 
 [dev-dependencies]
-sp-serializer = { version = "2.0.0", path = "../../../primitives/serializer" }
+sp-serializer = { version = "3.0.0", path = "../../../primitives/serializer" }
 pretty_assertions = "0.6.1"
 
 [features]
diff --git a/bin/node/rpc-client/Cargo.toml b/bin/node/rpc-client/Cargo.toml
index e88a18032698..1d9819de24b6 100644
--- a/bin/node/rpc-client/Cargo.toml
+++ b/bin/node/rpc-client/Cargo.toml
@@ -16,5 +16,5 @@ hyper = "~0.12.35"
 jsonrpc-core-client = { version = "15.1.0", default-features = false, features = ["http"] }
 log = "0.4.8"
 node-primitives = { version = "2.0.0", path = "../primitives" }
-sp-tracing = { version = "2.0.0", path = "../../../primitives/tracing" }
-sc-rpc = { version = "2.0.0", path = "../../../client/rpc" }
+sp-tracing = { version = "3.0.0", path = "../../../primitives/tracing" }
+sc-rpc = { version = "3.0.0", path = "../../../client/rpc" }
diff --git a/bin/node/rpc/Cargo.toml b/bin/node/rpc/Cargo.toml
index 10d7fe80d7ce..3e0e77e030f1 100644
--- a/bin/node/rpc/Cargo.toml
+++ b/bin/node/rpc/Cargo.toml
@@ -15,24 +15,24 @@ jsonrpc-core = "15.1.0"
 node-primitives = { version = "2.0.0", path = "../primitives" }
 node-runtime = { version = "2.0.0", path = "../runtime" }
 pallet-contracts-rpc = { version = "0.8.0", path = "../../../frame/contracts/rpc/" }
-pallet-transaction-payment-rpc = { version = "2.0.0", path = "../../../frame/transaction-payment/rpc/" }
-sc-client-api = { version = "2.0.0", path = "../../../client/api" }
-sc-consensus-babe = { version = "0.8.0", path = "../../../client/consensus/babe" }
-sc-consensus-babe-rpc = { version = "0.8.0", path = "../../../client/consensus/babe/rpc" }
-sc-consensus-epochs = { version = "0.8.0", path = "../../../client/consensus/epochs" }
-sc-chain-spec = { version = "2.0.0", path = "../../../client/chain-spec" }
-sc-finality-grandpa = { version = "0.8.0", path = "../../../client/finality-grandpa" }
-sc-finality-grandpa-rpc = { version = "0.8.0", path = "../../../client/finality-grandpa/rpc" }
-sc-keystore = { version = "2.0.0", path = "../../../client/keystore" }
-sc-rpc-api = { version = "0.8.0", path = "../../../client/rpc-api" }
-sc-rpc = { version = "2.0.0", path = "../../../client/rpc" }
-sc-sync-state-rpc = { version = "0.8.0", path = "../../../client/sync-state-rpc" }
-sp-api = { version = "2.0.0", path = "../../../primitives/api" }
-sp-block-builder = { version = "2.0.0", path = "../../../primitives/block-builder" }
-sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
-sp-keystore = { version = "0.8.0", path = "../../../primitives/keystore" }
-sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
-sp-consensus-babe = { version = "0.8.0", path = "../../../primitives/consensus/babe" }
-sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
-sp-transaction-pool = { version = "2.0.0", path = "../../../primitives/transaction-pool" }
-substrate-frame-rpc-system = { version = "2.0.0", path = "../../../utils/frame/rpc/system" }
+pallet-transaction-payment-rpc = { version = "3.0.0", path = "../../../frame/transaction-payment/rpc/" }
+sc-client-api = { version = "3.0.0", path = "../../../client/api" }
+sc-consensus-babe = { version = "0.9.0", path = "../../../client/consensus/babe" }
+sc-consensus-babe-rpc = { version = "0.9.0", path = "../../../client/consensus/babe/rpc" }
+sc-consensus-epochs = { version = "0.9.0", path = "../../../client/consensus/epochs" }
+sc-chain-spec = { version = "3.0.0", path = "../../../client/chain-spec" }
+sc-finality-grandpa = { version = "0.9.0", path = "../../../client/finality-grandpa" }
+sc-finality-grandpa-rpc = { version = "0.9.0", path = "../../../client/finality-grandpa/rpc" }
+sc-keystore = { version = "3.0.0", path = "../../../client/keystore" }
+sc-rpc-api = { version = "0.9.0", path = "../../../client/rpc-api" }
+sc-rpc = { version = "3.0.0", path = "../../../client/rpc" }
+sc-sync-state-rpc = { version = "0.9.0", path = "../../../client/sync-state-rpc" }
+sp-api = { version = "3.0.0", path = "../../../primitives/api" }
+sp-block-builder = { version = "3.0.0", path = "../../../primitives/block-builder" }
+sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
+sp-keystore = { version = "0.9.0", path = "../../../primitives/keystore" }
+sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
+sp-consensus-babe = { version = "0.9.0", path = "../../../primitives/consensus/babe" }
+sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
+sp-transaction-pool = { version = "3.0.0", path = "../../../primitives/transaction-pool" }
+substrate-frame-rpc-system = { version = "3.0.0", path = "../../../utils/frame/rpc/system" }
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index d6b38802fe69..f77a16a10f4c 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -20,74 +20,74 @@ static_assertions = "1.1.0"
 hex-literal = { version = "0.3.1", optional = true }
 
 # primitives
-sp-authority-discovery = { version = "2.0.0", default-features = false, path = "../../../primitives/authority-discovery" }
-sp-consensus-babe = { version = "0.8.0", default-features = false, path = "../../../primitives/consensus/babe" }
-sp-block-builder = { path = "../../../primitives/block-builder", default-features = false, version = "2.0.0"}
-sp-inherents = { version = "2.0.0", default-features = false, path = "../../../primitives/inherents" }
+sp-authority-discovery = { version = "3.0.0", default-features = false, path = "../../../primitives/authority-discovery" }
+sp-consensus-babe = { version = "0.9.0", default-features = false, path = "../../../primitives/consensus/babe" }
+sp-block-builder = { path = "../../../primitives/block-builder", default-features = false, version = "3.0.0"}
+sp-inherents = { version = "3.0.0", default-features = false, path = "../../../primitives/inherents" }
 node-primitives = { version = "2.0.0", default-features = false, path = "../primitives" }
-sp-offchain = { version = "2.0.0", default-features = false, path = "../../../primitives/offchain" }
-sp-core = { version = "2.0.0", default-features = false, path = "../../../primitives/core" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../../primitives/std" }
-sp-api = { version = "2.0.0", default-features = false, path = "../../../primitives/api" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../../primitives/runtime" }
-sp-staking = { version = "2.0.0", default-features = false, path = "../../../primitives/staking" }
-sp-keyring = { version = "2.0.0", optional = true, path = "../../../primitives/keyring" }
-sp-session = { version = "2.0.0", default-features = false, path = "../../../primitives/session" }
-sp-transaction-pool = { version = "2.0.0", default-features = false, path = "../../../primitives/transaction-pool" }
-sp-version = { version = "2.0.0", default-features = false, path = "../../../primitives/version" }
+sp-offchain = { version = "3.0.0", default-features = false, path = "../../../primitives/offchain" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../../primitives/core" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../../primitives/std" }
+sp-api = { version = "3.0.0", default-features = false, path = "../../../primitives/api" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
+sp-staking = { version = "3.0.0", default-features = false, path = "../../../primitives/staking" }
+sp-keyring = { version = "3.0.0", optional = true, path = "../../../primitives/keyring" }
+sp-session = { version = "3.0.0", default-features = false, path = "../../../primitives/session" }
+sp-transaction-pool = { version = "3.0.0", default-features = false, path = "../../../primitives/transaction-pool" }
+sp-version = { version = "3.0.0", default-features = false, path = "../../../primitives/version" }
 
 # frame dependencies
-frame-executive = { version = "2.0.0", default-features = false, path = "../../../frame/executive" }
-frame-benchmarking = { version = "2.0.0", default-features = false, path = "../../../frame/benchmarking", optional = true }
-frame-support = { version = "2.0.0", default-features = false, path = "../../../frame/support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../../../frame/system" }
-frame-system-benchmarking = { version = "2.0.0", default-features = false, path = "../../../frame/system/benchmarking", optional = true }
-frame-system-rpc-runtime-api = { version = "2.0.0", default-features = false, path = "../../../frame/system/rpc/runtime-api/" }
-pallet-assets = { version = "2.0.0", default-features = false, path = "../../../frame/assets" }
-pallet-authority-discovery = { version = "2.0.0", default-features = false, path = "../../../frame/authority-discovery" }
-pallet-authorship = { version = "2.0.0", default-features = false, path = "../../../frame/authorship" }
-pallet-babe = { version = "2.0.0", default-features = false, path = "../../../frame/babe" }
-pallet-balances = { version = "2.0.0", default-features = false, path = "../../../frame/balances" }
-pallet-bounties = { version = "2.0.0", default-features = false, path = "../../../frame/bounties" }
-pallet-collective = { version = "2.0.0", default-features = false, path = "../../../frame/collective" }
+frame-executive = { version = "3.0.0", default-features = false, path = "../../../frame/executive" }
+frame-benchmarking = { version = "3.0.0", default-features = false, path = "../../../frame/benchmarking", optional = true }
+frame-support = { version = "3.0.0", default-features = false, path = "../../../frame/support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../../../frame/system" }
+frame-system-benchmarking = { version = "3.0.0", default-features = false, path = "../../../frame/system/benchmarking", optional = true }
+frame-system-rpc-runtime-api = { version = "3.0.0", default-features = false, path = "../../../frame/system/rpc/runtime-api/" }
+pallet-assets = { version = "3.0.0", default-features = false, path = "../../../frame/assets" }
+pallet-authority-discovery = { version = "3.0.0", default-features = false, path = "../../../frame/authority-discovery" }
+pallet-authorship = { version = "3.0.0", default-features = false, path = "../../../frame/authorship" }
+pallet-babe = { version = "3.0.0", default-features = false, path = "../../../frame/babe" }
+pallet-balances = { version = "3.0.0", default-features = false, path = "../../../frame/balances" }
+pallet-bounties = { version = "3.0.0", default-features = false, path = "../../../frame/bounties" }
+pallet-collective = { version = "3.0.0", default-features = false, path = "../../../frame/collective" }
 pallet-contracts = { version = "2.0.0", default-features = false, path = "../../../frame/contracts" }
 pallet-contracts-primitives = { version = "2.0.0", default-features = false, path = "../../../frame/contracts/common/" }
 pallet-contracts-rpc-runtime-api = { version = "0.8.0", default-features = false, path = "../../../frame/contracts/rpc/runtime-api/" }
-pallet-democracy = { version = "2.0.0", default-features = false, path = "../../../frame/democracy" }
+pallet-democracy = { version = "3.0.0", default-features = false, path = "../../../frame/democracy" }
 pallet-elections-phragmen = { version = "3.0.0", default-features = false, path = "../../../frame/elections-phragmen" }
-pallet-grandpa = { version = "2.0.0", default-features = false, path = "../../../frame/grandpa" }
-pallet-im-online = { version = "2.0.0", default-features = false, path = "../../../frame/im-online" }
-pallet-indices = { version = "2.0.0", default-features = false, path = "../../../frame/indices" }
-pallet-identity = { version = "2.0.0", default-features = false, path = "../../../frame/identity" }
-pallet-lottery = { version = "2.0.0", default-features = false, path = "../../../frame/lottery" }
-pallet-membership = { version = "2.0.0", default-features = false, path = "../../../frame/membership" }
-pallet-mmr = { version = "2.0.0", default-features = false, path = "../../../frame/merkle-mountain-range" }
-pallet-multisig = { version = "2.0.0", default-features = false, path = "../../../frame/multisig" }
-pallet-offences = { version = "2.0.0", default-features = false, path = "../../../frame/offences" }
-pallet-offences-benchmarking = { version = "2.0.0", path = "../../../frame/offences/benchmarking", default-features = false, optional = true }
-pallet-proxy = { version = "2.0.0", default-features = false, path = "../../../frame/proxy" }
-pallet-randomness-collective-flip = { version = "2.0.0", default-features = false, path = "../../../frame/randomness-collective-flip" }
-pallet-recovery = { version = "2.0.0", default-features = false, path = "../../../frame/recovery" }
-pallet-session = { version = "2.0.0", features = ["historical"], path = "../../../frame/session", default-features = false }
-pallet-session-benchmarking = { version = "2.0.0", path = "../../../frame/session/benchmarking", default-features = false, optional = true }
-pallet-staking = { version = "2.0.0", default-features = false, path = "../../../frame/staking" }
-pallet-staking-reward-curve = { version = "2.0.0", default-features = false, path = "../../../frame/staking/reward-curve" }
-pallet-scheduler = { version = "2.0.0", default-features = false, path = "../../../frame/scheduler" }
-pallet-society = { version = "2.0.0", default-features = false, path = "../../../frame/society" }
-pallet-sudo = { version = "2.0.0", default-features = false, path = "../../../frame/sudo" }
-pallet-timestamp = { version = "2.0.0", default-features = false, path = "../../../frame/timestamp" }
-pallet-tips = { version = "2.0.0", default-features = false, path = "../../../frame/tips" }
-pallet-treasury = { version = "2.0.0", default-features = false, path = "../../../frame/treasury" }
-pallet-utility = { version = "2.0.0", default-features = false, path = "../../../frame/utility" }
-pallet-transaction-payment = { version = "2.0.0", default-features = false, path = "../../../frame/transaction-payment" }
-pallet-transaction-payment-rpc-runtime-api = { version = "2.0.0", default-features = false, path = "../../../frame/transaction-payment/rpc/runtime-api/" }
-pallet-vesting = { version = "2.0.0", default-features = false, path = "../../../frame/vesting" }
+pallet-grandpa = { version = "3.0.0", default-features = false, path = "../../../frame/grandpa" }
+pallet-im-online = { version = "3.0.0", default-features = false, path = "../../../frame/im-online" }
+pallet-indices = { version = "3.0.0", default-features = false, path = "../../../frame/indices" }
+pallet-identity = { version = "3.0.0", default-features = false, path = "../../../frame/identity" }
+pallet-lottery = { version = "3.0.0", default-features = false, path = "../../../frame/lottery" }
+pallet-membership = { version = "3.0.0", default-features = false, path = "../../../frame/membership" }
+pallet-mmr = { version = "3.0.0", default-features = false, path = "../../../frame/merkle-mountain-range" }
+pallet-multisig = { version = "3.0.0", default-features = false, path = "../../../frame/multisig" }
+pallet-offences = { version = "3.0.0", default-features = false, path = "../../../frame/offences" }
+pallet-offences-benchmarking = { version = "3.0.0", path = "../../../frame/offences/benchmarking", default-features = false, optional = true }
+pallet-proxy = { version = "3.0.0", default-features = false, path = "../../../frame/proxy" }
+pallet-randomness-collective-flip = { version = "3.0.0", default-features = false, path = "../../../frame/randomness-collective-flip" }
+pallet-recovery = { version = "3.0.0", default-features = false, path = "../../../frame/recovery" }
+pallet-session = { version = "3.0.0", features = ["historical"], path = "../../../frame/session", default-features = false }
+pallet-session-benchmarking = { version = "3.0.0", path = "../../../frame/session/benchmarking", default-features = false, optional = true }
+pallet-staking = { version = "3.0.0", default-features = false, path = "../../../frame/staking" }
+pallet-staking-reward-curve = { version = "3.0.0", default-features = false, path = "../../../frame/staking/reward-curve" }
+pallet-scheduler = { version = "3.0.0", default-features = false, path = "../../../frame/scheduler" }
+pallet-society = { version = "3.0.0", default-features = false, path = "../../../frame/society" }
+pallet-sudo = { version = "3.0.0", default-features = false, path = "../../../frame/sudo" }
+pallet-timestamp = { version = "3.0.0", default-features = false, path = "../../../frame/timestamp" }
+pallet-tips = { version = "3.0.0", default-features = false, path = "../../../frame/tips" }
+pallet-treasury = { version = "3.0.0", default-features = false, path = "../../../frame/treasury" }
+pallet-utility = { version = "3.0.0", default-features = false, path = "../../../frame/utility" }
+pallet-transaction-payment = { version = "3.0.0", default-features = false, path = "../../../frame/transaction-payment" }
+pallet-transaction-payment-rpc-runtime-api = { version = "3.0.0", default-features = false, path = "../../../frame/transaction-payment/rpc/runtime-api/" }
+pallet-vesting = { version = "3.0.0", default-features = false, path = "../../../frame/vesting" }
 
 [build-dependencies]
-substrate-wasm-builder = { version = "3.0.0", path = "../../../utils/wasm-builder" }
+substrate-wasm-builder = { version = "4.0.0", path = "../../../utils/wasm-builder" }
 
 [dev-dependencies]
-sp-io = { version = "2.0.0", path = "../../../primitives/io" }
+sp-io = { version = "3.0.0", path = "../../../primitives/io" }
 
 [features]
 default = ["std"]
diff --git a/bin/node/testing/Cargo.toml b/bin/node/testing/Cargo.toml
index e92e475952df..95bc8abef6fc 100644
--- a/bin/node/testing/Cargo.toml
+++ b/bin/node/testing/Cargo.toml
@@ -13,38 +13,38 @@ publish = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-pallet-balances = { version = "2.0.0", path = "../../../frame/balances" }
-sc-service = { version = "0.8.0", features = ["test-helpers", "db"],  path = "../../../client/service" }
-sc-client-db = { version = "0.8.0", path = "../../../client/db/", features = ["kvdb-rocksdb", "parity-db"] }
-sc-client-api = { version = "2.0.0", path = "../../../client/api/" }
+pallet-balances = { version = "3.0.0", path = "../../../frame/balances" }
+sc-service = { version = "0.9.0", features = ["test-helpers", "db"],  path = "../../../client/service" }
+sc-client-db = { version = "0.9.0", path = "../../../client/db/", features = ["kvdb-rocksdb", "parity-db"] }
+sc-client-api = { version = "3.0.0", path = "../../../client/api/" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 pallet-contracts = { version = "2.0.0", path = "../../../frame/contracts" }
-pallet-grandpa = { version = "2.0.0", path = "../../../frame/grandpa" }
-pallet-indices = { version = "2.0.0", path = "../../../frame/indices" }
-sp-keyring = { version = "2.0.0", path = "../../../primitives/keyring" }
+pallet-grandpa = { version = "3.0.0", path = "../../../frame/grandpa" }
+pallet-indices = { version = "3.0.0", path = "../../../frame/indices" }
+sp-keyring = { version = "3.0.0", path = "../../../primitives/keyring" }
 node-executor = { version = "2.0.0", path = "../executor" }
 node-primitives = { version = "2.0.0", path = "../primitives" }
 node-runtime = { version = "2.0.0", path = "../runtime" }
-sp-core = { version = "2.0.0", path = "../../../primitives/core" }
-sp-io = { version = "2.0.0", path = "../../../primitives/io" }
-frame-support = { version = "2.0.0", path = "../../../frame/support" }
-pallet-session = { version = "2.0.0", path = "../../../frame/session" }
-pallet-society = { version = "2.0.0", path = "../../../frame/society" }
-sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
-pallet-staking = { version = "2.0.0", path = "../../../frame/staking" }
-sc-executor = { version = "0.8.0", path = "../../../client/executor", features = ["wasmtime"] }
-sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
-frame-system = { version = "2.0.0", path = "../../../frame/system" }
+sp-core = { version = "3.0.0", path = "../../../primitives/core" }
+sp-io = { version = "3.0.0", path = "../../../primitives/io" }
+frame-support = { version = "3.0.0", path = "../../../frame/support" }
+pallet-session = { version = "3.0.0", path = "../../../frame/session" }
+pallet-society = { version = "3.0.0", path = "../../../frame/society" }
+sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
+pallet-staking = { version = "3.0.0", path = "../../../frame/staking" }
+sc-executor = { version = "0.9.0", path = "../../../client/executor", features = ["wasmtime"] }
+sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
+frame-system = { version = "3.0.0", path = "../../../frame/system" }
 substrate-test-client = { version = "2.0.0", path = "../../../test-utils/client" }
-pallet-timestamp = { version = "2.0.0", path = "../../../frame/timestamp" }
-pallet-transaction-payment = { version = "2.0.0", path = "../../../frame/transaction-payment" }
-pallet-treasury = { version = "2.0.0", path = "../../../frame/treasury" }
-sp-api = { version = "2.0.0", path = "../../../primitives/api" }
-sp-timestamp = { version = "2.0.0", default-features = false, path = "../../../primitives/timestamp" }
-sp-block-builder = { version = "2.0.0", path = "../../../primitives/block-builder" }
-sc-block-builder = { version = "0.8.0", path = "../../../client/block-builder" }
-sp-inherents = { version = "2.0.0", path = "../../../primitives/inherents" }
-sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
+pallet-timestamp = { version = "3.0.0", path = "../../../frame/timestamp" }
+pallet-transaction-payment = { version = "3.0.0", path = "../../../frame/transaction-payment" }
+pallet-treasury = { version = "3.0.0", path = "../../../frame/treasury" }
+sp-api = { version = "3.0.0", path = "../../../primitives/api" }
+sp-timestamp = { version = "3.0.0", default-features = false, path = "../../../primitives/timestamp" }
+sp-block-builder = { version = "3.0.0", path = "../../../primitives/block-builder" }
+sc-block-builder = { version = "0.9.0", path = "../../../client/block-builder" }
+sp-inherents = { version = "3.0.0", path = "../../../primitives/inherents" }
+sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
 log = "0.4.8"
 tempfile = "3.1.0"
 fs_extra = "1"
@@ -52,4 +52,4 @@ futures = "0.3.1"
 
 [dev-dependencies]
 criterion = "0.3.0"
-sc-cli = { version = "0.8.0", path = "../../../client/cli" }
+sc-cli = { version = "0.9.0", path = "../../../client/cli" }
diff --git a/bin/utils/chain-spec-builder/Cargo.toml b/bin/utils/chain-spec-builder/Cargo.toml
index a57dadd26bda..3c60d654db94 100644
--- a/bin/utils/chain-spec-builder/Cargo.toml
+++ b/bin/utils/chain-spec-builder/Cargo.toml
@@ -14,10 +14,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 ansi_term = "0.12.1"
-sc-keystore = { version = "2.0.0", path = "../../../client/keystore" }
-sc-chain-spec = { version = "2.0.0", path = "../../../client/chain-spec" }
+sc-keystore = { version = "3.0.0", path = "../../../client/keystore" }
+sc-chain-spec = { version = "3.0.0", path = "../../../client/chain-spec" }
 node-cli = { version = "2.0.0", path = "../../node/cli" }
-sp-core = { version = "2.0.0", path = "../../../primitives/core" }
-sp-keystore = { version = "0.8.0", path = "../../../primitives/keystore" }
+sp-core = { version = "3.0.0", path = "../../../primitives/core" }
+sp-keystore = { version = "0.9.0", path = "../../../primitives/keystore" }
 rand = "0.7.2"
 structopt = "0.3.8"
diff --git a/bin/utils/subkey/Cargo.toml b/bin/utils/subkey/Cargo.toml
index e445749c2c2e..b0c71a4fc332 100644
--- a/bin/utils/subkey/Cargo.toml
+++ b/bin/utils/subkey/Cargo.toml
@@ -8,13 +8,13 @@ homepage = "https://substrate.dev"
 repository = "https://github.com/paritytech/substrate/"
 readme = "README.md"
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [[bin]]
 path = "src/main.rs"
 name = "subkey"
 
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
 [dependencies]
-sc-cli = { version = "0.8.0", path = "../../../client/cli" }
+sc-cli = { version = "0.9.0", path = "../../../client/cli" }
 structopt = "0.3.14"
diff --git a/client/api/Cargo.toml b/client/api/Cargo.toml
index 4ccdbc541563..637dae4a29ab 100644
--- a/client/api/Cargo.toml
+++ b/client/api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-client-api"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -15,32 +15,32 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-consensus = { version = "0.8.0", path = "../../primitives/consensus/common" }
+sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
 derive_more = "0.99.2"
-sc-executor = { version = "0.8.0", path = "../executor" }
-sp-externalities = { version = "0.8.0", path = "../../primitives/externalities" }
+sc-executor = { version = "0.9.0", path = "../executor" }
+sp-externalities = { version = "0.9.0", path = "../../primitives/externalities" }
 fnv = "1.0.6"
 futures = "0.3.1"
 hash-db = { version = "0.15.2", default-features = false }
-sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
-sp-inherents = { version = "2.0.0", default-features = false, path = "../../primitives/inherents" }
+sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
+sp-inherents = { version = "3.0.0", default-features = false, path = "../../primitives/inherents" }
 kvdb = "0.9.0"
 log = "0.4.8"
 parking_lot = "0.11.1"
 lazy_static =  "1.4.0"
-sp-database = { version = "2.0.0", path = "../../primitives/database" }
-sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
-sp-keystore = { version = "0.8.0", default-features = false, path = "../../primitives/keystore" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-version = { version = "2.0.0", default-features = false, path = "../../primitives/version" }
-sp-api = { version = "2.0.0", path = "../../primitives/api" }
-sp-utils = { version = "2.0.0", path = "../../primitives/utils" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-state-machine = { version = "0.8.0", path = "../../primitives/state-machine" }
-sp-trie = { version = "2.0.0", path = "../../primitives/trie" }
-sp-storage = { version = "2.0.0", path = "../../primitives/storage" }
-sp-transaction-pool = { version = "2.0.0", path = "../../primitives/transaction-pool" }
-prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.8.0", path = "../../utils/prometheus" }
+sp-database = { version = "3.0.0", path = "../../primitives/database" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
+sp-keystore = { version = "0.9.0", default-features = false, path = "../../primitives/keystore" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-version = { version = "3.0.0", default-features = false, path = "../../primitives/version" }
+sp-api = { version = "3.0.0", path = "../../primitives/api" }
+sp-utils = { version = "3.0.0", path = "../../primitives/utils" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-state-machine = { version = "0.9.0", path = "../../primitives/state-machine" }
+sp-trie = { version = "3.0.0", path = "../../primitives/trie" }
+sp-storage = { version = "3.0.0", path = "../../primitives/storage" }
+sp-transaction-pool = { version = "3.0.0", path = "../../primitives/transaction-pool" }
+prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.9.0", path = "../../utils/prometheus" }
 
 [dev-dependencies]
 kvdb-memorydb = "0.9.0"
diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml
index 7f2cea233264..9a1b8c8dab50 100644
--- a/client/authority-discovery/Cargo.toml
+++ b/client/authority-discovery/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-authority-discovery"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 build = "build.rs"
@@ -25,21 +25,21 @@ futures = "0.3.9"
 futures-timer = "3.0.1"
 libp2p = { version = "0.34.0", default-features = false, features = ["kad"] }
 log = "0.4.8"
-prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.8.0"}
+prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
 prost = "0.7"
 rand = "0.7.2"
-sc-client-api = { version = "2.0.0", path = "../api" }
-sc-network = { version = "0.8.0", path = "../network" }
+sc-client-api = { version = "3.0.0", path = "../api" }
+sc-network = { version = "0.9.0", path = "../network" }
 serde_json = "1.0.41"
-sp-authority-discovery = { version = "2.0.0", path = "../../primitives/authority-discovery" }
-sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-sp-keystore = { version = "0.8.0", path = "../../primitives/keystore" }
-sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
-sp-api = { version = "2.0.0", path = "../../primitives/api" }
+sp-authority-discovery = { version = "3.0.0", path = "../../primitives/authority-discovery" }
+sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-keystore = { version = "0.9.0", path = "../../primitives/keystore" }
+sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
+sp-api = { version = "3.0.0", path = "../../primitives/api" }
 
 [dev-dependencies]
 quickcheck = "1.0.3"
-sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
-sc-peerset = { version = "2.0.0", path = "../peerset" }
+sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
+sc-peerset = { version = "3.0.0", path = "../peerset" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client"}
diff --git a/client/basic-authorship/Cargo.toml b/client/basic-authorship/Cargo.toml
index 2c0e8a2d1c5e..2047c85b0c87 100644
--- a/client/basic-authorship/Cargo.toml
+++ b/client/basic-authorship/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-basic-authorship"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -17,20 +17,20 @@ codec = { package = "parity-scale-codec", version = "2.0.0" }
 futures = "0.3.9"
 futures-timer = "3.0.1"
 log = "0.4.8"
-prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.8.0"}
-sp-api = { version = "2.0.0", path = "../../primitives/api" }
-sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
-sc-client-api = { version = "2.0.0", path = "../api" }
-sp-consensus = { version = "0.8.0", path = "../../primitives/consensus/common" }
-sp-inherents = { version = "2.0.0", path = "../../primitives/inherents" }
-sc-telemetry = { version = "2.0.0", path = "../telemetry" }
-sp-transaction-pool = { version = "2.0.0", path = "../../primitives/transaction-pool" }
-sc-block-builder = { version = "0.8.0", path = "../block-builder" }
-sc-proposer-metrics = { version = "0.8.0", path = "../proposer-metrics" }
+prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
+sp-api = { version = "3.0.0", path = "../../primitives/api" }
+sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
+sc-client-api = { version = "3.0.0", path = "../api" }
+sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
+sp-inherents = { version = "3.0.0", path = "../../primitives/inherents" }
+sc-telemetry = { version = "3.0.0", path = "../telemetry" }
+sp-transaction-pool = { version = "3.0.0", path = "../../primitives/transaction-pool" }
+sc-block-builder = { version = "0.9.0", path = "../block-builder" }
+sc-proposer-metrics = { version = "0.9.0", path = "../proposer-metrics" }
 
 [dev-dependencies]
-sc-transaction-pool = { version = "2.0.0", path = "../transaction-pool" }
+sc-transaction-pool = { version = "3.0.0", path = "../transaction-pool" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 parking_lot = "0.11.1"
diff --git a/client/block-builder/Cargo.toml b/client/block-builder/Cargo.toml
index b0a20857b86d..dda5edde36db 100644
--- a/client/block-builder/Cargo.toml
+++ b/client/block-builder/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-block-builder"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -14,17 +14,17 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 
 [dependencies]
-sp-state-machine = { version = "0.8.0", path = "../../primitives/state-machine" }
-sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
-sp-api = { version = "2.0.0", path = "../../primitives/api" }
-sp-consensus = { version = "0.8.0", path = "../../primitives/consensus/common" }
-sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-sp-block-builder = { version = "2.0.0", path = "../../primitives/block-builder" }
-sp-inherents = { version = "2.0.0", path = "../../primitives/inherents" }
-sc-client-api = { version = "2.0.0", path = "../api" }
+sp-state-machine = { version = "0.9.0", path = "../../primitives/state-machine" }
+sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
+sp-api = { version = "3.0.0", path = "../../primitives/api" }
+sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
+sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-block-builder = { version = "3.0.0", path = "../../primitives/block-builder" }
+sp-inherents = { version = "3.0.0", path = "../../primitives/inherents" }
+sc-client-api = { version = "3.0.0", path = "../api" }
 codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 
 [dev-dependencies]
 substrate-test-runtime-client = { path = "../../test-utils/runtime/client" }
-sp-trie = { version = "2.0.0", path = "../../primitives/trie" }
+sp-trie = { version = "3.0.0", path = "../../primitives/trie" }
diff --git a/client/chain-spec/Cargo.toml b/client/chain-spec/Cargo.toml
index 0b482bb2ed3f..27850cc8400b 100644
--- a/client/chain-spec/Cargo.toml
+++ b/client/chain-spec/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-chain-spec"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -13,17 +13,17 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sc-chain-spec-derive = { version = "2.0.0", path = "./derive" }
+sc-chain-spec-derive = { version = "3.0.0", path = "./derive" }
 impl-trait-for-tuples = "0.2.1"
-sc-network = { version = "0.8.0", path = "../network" }
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
+sc-network = { version = "0.9.0", path = "../network" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
 serde = { version = "1.0.101", features = ["derive"] }
 serde_json = "1.0.41"
-sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
-sp-chain-spec = { version = "2.0.0", path = "../../primitives/chain-spec" }
-sc-telemetry = { version = "2.0.0", path = "../telemetry" }
+sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
+sp-chain-spec = { version = "3.0.0", path = "../../primitives/chain-spec" }
+sc-telemetry = { version = "3.0.0", path = "../telemetry" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-sc-consensus-babe = { version = "0.8.0-rc6", path = "../consensus/babe" }
-sp-consensus-babe = { version = "0.8.0-rc6", path = "../../primitives/consensus/babe" }
-sc-consensus-epochs = { version = "0.8.0-rc6", path = "../consensus/epochs" }
-sc-finality-grandpa = { version = "0.8.0-rc6", path = "../finality-grandpa" }
+sc-consensus-babe = { version = "0.9.0", path = "../consensus/babe" }
+sp-consensus-babe = { version = "0.9.0", path = "../../primitives/consensus/babe" }
+sc-consensus-epochs = { version = "0.9.0", path = "../consensus/epochs" }
+sc-finality-grandpa = { version = "0.9.0", path = "../finality-grandpa" }
diff --git a/client/chain-spec/derive/Cargo.toml b/client/chain-spec/derive/Cargo.toml
index 09196c125b7d..4f3484df31cb 100644
--- a/client/chain-spec/derive/Cargo.toml
+++ b/client/chain-spec/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-chain-spec-derive"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index 48b038981d93..03d23c5aec3e 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-cli"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Substrate CLI interface."
 edition = "2018"
@@ -24,22 +24,22 @@ hex = "0.4.2"
 rand = "0.7.3"
 tiny-bip39 = "0.8.0"
 serde_json = "1.0.41"
-sc-keystore = { version = "2.0.0", path = "../keystore" }
-sp-panic-handler = { version = "2.0.0", path = "../../primitives/panic-handler" }
-sc-client-api = { version = "2.0.0", path = "../api" }
-sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
-sc-network = { version = "0.8.0", path = "../network" }
-sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
-sp-utils = { version = "2.0.0", path = "../../primitives/utils" }
-sp-version = { version = "2.0.0", path = "../../primitives/version" }
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-sp-keystore = { version = "0.8.0", path = "../../primitives/keystore" }
-sc-service = { version = "0.8.0", default-features = false, path = "../service" }
-sc-telemetry = { version = "2.0.0", path = "../telemetry" }
-sp-keyring = { version = "2.0.0", path = "../../primitives/keyring" }
+sc-keystore = { version = "3.0.0", path = "../keystore" }
+sp-panic-handler = { version = "3.0.0", path = "../../primitives/panic-handler" }
+sc-client-api = { version = "3.0.0", path = "../api" }
+sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
+sc-network = { version = "0.9.0", path = "../network" }
+sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
+sp-utils = { version = "3.0.0", path = "../../primitives/utils" }
+sp-version = { version = "3.0.0", path = "../../primitives/version" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-keystore = { version = "0.9.0", path = "../../primitives/keystore" }
+sc-service = { version = "0.9.0", default-features = false, path = "../service" }
+sc-telemetry = { version = "3.0.0", path = "../telemetry" }
+sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
 names = "0.11.0"
 structopt = "0.3.8"
-sc-tracing = { version = "2.0.0", path = "../tracing" }
+sc-tracing = { version = "3.0.0", path = "../tracing" }
 chrono = "0.4.10"
 serde = "1.0.111"
 thiserror = "1.0.21"
diff --git a/client/consensus/aura/Cargo.toml b/client/consensus/aura/Cargo.toml
index 55b6bb5e0660..1465119c81d0 100644
--- a/client/consensus/aura/Cargo.toml
+++ b/client/consensus/aura/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-consensus-aura"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Aura consensus algorithm for substrate"
 edition = "2018"
@@ -13,42 +13,42 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-application-crypto = { version = "2.0.0", path = "../../../primitives/application-crypto" }
-sp-consensus-aura = { version = "0.8.0", path = "../../../primitives/consensus/aura" }
-sp-block-builder = { version = "2.0.0", path = "../../../primitives/block-builder" }
-sc-block-builder = { version = "0.8.0", path = "../../block-builder" }
-sc-client-api = { version = "2.0.0", path = "../../api" }
+sp-application-crypto = { version = "3.0.0", path = "../../../primitives/application-crypto" }
+sp-consensus-aura = { version = "0.9.0", path = "../../../primitives/consensus/aura" }
+sp-block-builder = { version = "3.0.0", path = "../../../primitives/block-builder" }
+sc-block-builder = { version = "0.9.0", path = "../../block-builder" }
+sc-client-api = { version = "3.0.0", path = "../../api" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
-sp-consensus-slots = { version = "0.8.0", path = "../../../primitives/consensus/slots" }
+sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
+sp-consensus-slots = { version = "0.9.0", path = "../../../primitives/consensus/slots" }
 derive_more = "0.99.2"
 futures = "0.3.9"
 futures-timer = "3.0.1"
-sp-inherents = { version = "2.0.0", path = "../../../primitives/inherents" }
+sp-inherents = { version = "3.0.0", path = "../../../primitives/inherents" }
 log = "0.4.8"
 parking_lot = "0.11.1"
-sp-core = { version = "2.0.0", path = "../../../primitives/core" }
-sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
-sp-io = { version = "2.0.0", path = "../../../primitives/io" }
-sp-version = { version = "2.0.0", path = "../../../primitives/version" }
-sc-consensus-slots = { version = "0.8.0", path = "../slots" }
-sp-api = { version = "2.0.0", path = "../../../primitives/api" }
-sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
-sp-timestamp = { version = "2.0.0", path = "../../../primitives/timestamp" }
-sp-keystore = { version = "0.8.0", path = "../../../primitives/keystore" }
-sc-telemetry = { version = "2.0.0", path = "../../telemetry" }
-prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.8.0"}
+sp-core = { version = "3.0.0", path = "../../../primitives/core" }
+sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
+sp-io = { version = "3.0.0", path = "../../../primitives/io" }
+sp-version = { version = "3.0.0", path = "../../../primitives/version" }
+sc-consensus-slots = { version = "0.9.0", path = "../slots" }
+sp-api = { version = "3.0.0", path = "../../../primitives/api" }
+sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
+sp-timestamp = { version = "3.0.0", path = "../../../primitives/timestamp" }
+sp-keystore = { version = "0.9.0", path = "../../../primitives/keystore" }
+sc-telemetry = { version = "3.0.0", path = "../../telemetry" }
+prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0"}
 # We enable it only for web-wasm check
 # See https://docs.rs/getrandom/0.2.1/getrandom/#webassembly-support
 getrandom = { version = "0.2", features = ["js"], optional = true }
 
 [dev-dependencies]
-sp-keyring = { version = "2.0.0", path = "../../../primitives/keyring" }
-sp-tracing = { version = "2.0.0", path = "../../../primitives/tracing" }
-sc-executor = { version = "0.8.0", path = "../../executor" }
-sc-keystore = { version = "2.0.0", path = "../../keystore" }
-sc-network = { version = "0.8.0", path = "../../network" }
+sp-keyring = { version = "3.0.0", path = "../../../primitives/keyring" }
+sp-tracing = { version = "3.0.0", path = "../../../primitives/tracing" }
+sc-executor = { version = "0.9.0", path = "../../executor" }
+sc-keystore = { version = "3.0.0", path = "../../keystore" }
+sc-network = { version = "0.9.0", path = "../../network" }
 sc-network-test = { version = "0.8.0", path = "../../network/test" }
-sc-service = { version = "0.8.0", default-features = false, path = "../../service" }
+sc-service = { version = "0.9.0", default-features = false, path = "../../service" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
 tempfile = "3.1.0"
diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml
index de73d869fe70..14d48fba1bb5 100644
--- a/client/consensus/babe/Cargo.toml
+++ b/client/consensus/babe/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-consensus-babe"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "BABE consensus algorithm for substrate"
 edition = "2018"
@@ -15,34 +15,34 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
-sp-consensus-babe = { version = "0.8.0", path = "../../../primitives/consensus/babe" }
-sp-core = { version = "2.0.0", path = "../../../primitives/core" }
-sp-application-crypto = { version = "2.0.0", path = "../../../primitives/application-crypto" }
-sp-keystore = { version = "0.8.0", path = "../../../primitives/keystore" }
+sp-consensus-babe = { version = "0.9.0", path = "../../../primitives/consensus/babe" }
+sp-core = { version = "3.0.0", path = "../../../primitives/core" }
+sp-application-crypto = { version = "3.0.0", path = "../../../primitives/application-crypto" }
+sp-keystore = { version = "0.9.0", path = "../../../primitives/keystore" }
 num-bigint = "0.2.3"
 num-rational = "0.2.2"
 num-traits = "0.2.8"
 serde = { version = "1.0.104", features = ["derive"] }
-sp-version = { version = "2.0.0", path = "../../../primitives/version" }
-sp-io = { version = "2.0.0", path = "../../../primitives/io" }
-sp-inherents = { version = "2.0.0", path = "../../../primitives/inherents" }
-sp-timestamp = { version = "2.0.0", path = "../../../primitives/timestamp" }
-sc-telemetry = { version = "2.0.0", path = "../../telemetry" }
-sc-keystore = { version = "2.0.0", path = "../../keystore" }
-sc-client-api = { version = "2.0.0", path = "../../api" }
-sc-consensus-epochs = { version = "0.8.0", path = "../epochs" }
-sp-api = { version = "2.0.0", path = "../../../primitives/api" }
-sp-block-builder = { version = "2.0.0", path = "../../../primitives/block-builder" }
-sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
-sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
-sp-consensus-slots = { version = "0.8.0", path = "../../../primitives/consensus/slots" }
-sp-consensus-vrf = { version = "0.8.0", path = "../../../primitives/consensus/vrf" }
-sc-consensus-uncles = { version = "0.8.0", path = "../uncles" }
-sc-consensus-slots = { version = "0.8.0", path = "../slots" }
-sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
-sp-utils = { version = "2.0.0", path = "../../../primitives/utils" }
-fork-tree = { version = "2.0.0", path = "../../../utils/fork-tree" }
-prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.8.0"}
+sp-version = { version = "3.0.0", path = "../../../primitives/version" }
+sp-io = { version = "3.0.0", path = "../../../primitives/io" }
+sp-inherents = { version = "3.0.0", path = "../../../primitives/inherents" }
+sp-timestamp = { version = "3.0.0", path = "../../../primitives/timestamp" }
+sc-telemetry = { version = "3.0.0", path = "../../telemetry" }
+sc-keystore = { version = "3.0.0", path = "../../keystore" }
+sc-client-api = { version = "3.0.0", path = "../../api" }
+sc-consensus-epochs = { version = "0.9.0", path = "../epochs" }
+sp-api = { version = "3.0.0", path = "../../../primitives/api" }
+sp-block-builder = { version = "3.0.0", path = "../../../primitives/block-builder" }
+sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
+sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
+sp-consensus-slots = { version = "0.9.0", path = "../../../primitives/consensus/slots" }
+sp-consensus-vrf = { version = "0.9.0", path = "../../../primitives/consensus/vrf" }
+sc-consensus-uncles = { version = "0.9.0", path = "../uncles" }
+sc-consensus-slots = { version = "0.9.0", path = "../slots" }
+sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
+sp-utils = { version = "3.0.0", path = "../../../primitives/utils" }
+fork-tree = { version = "3.0.0", path = "../../../utils/fork-tree" }
+prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0"}
 futures = "0.3.9"
 futures-timer = "3.0.1"
 parking_lot = "0.11.1"
@@ -55,14 +55,14 @@ derive_more = "0.99.2"
 retain_mut = "0.1.2"
 
 [dev-dependencies]
-sp-keyring = { version = "2.0.0", path = "../../../primitives/keyring" }
-sp-tracing = { version = "2.0.0", path = "../../../primitives/tracing" }
-sc-executor = { version = "0.8.0", path = "../../executor" }
-sc-network = { version = "0.8.0", path = "../../network" }
+sp-keyring = { version = "3.0.0", path = "../../../primitives/keyring" }
+sp-tracing = { version = "3.0.0", path = "../../../primitives/tracing" }
+sc-executor = { version = "0.9.0", path = "../../executor" }
+sc-network = { version = "0.9.0", path = "../../network" }
 sc-network-test = { version = "0.8.0", path = "../../network/test" }
-sc-service = { version = "0.8.0", default-features = false, path = "../../service" }
+sc-service = { version = "0.9.0", default-features = false, path = "../../service" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
-sc-block-builder = { version = "0.8.0", path = "../../block-builder" }
+sc-block-builder = { version = "0.9.0", path = "../../block-builder" }
 rand_chacha = "0.2.2"
 tempfile = "3.1.0"
 
diff --git a/client/consensus/babe/rpc/Cargo.toml b/client/consensus/babe/rpc/Cargo.toml
index adebccdfa742..71a1205e3c7a 100644
--- a/client/consensus/babe/rpc/Cargo.toml
+++ b/client/consensus/babe/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-consensus-babe-rpc"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "RPC extensions for the BABE consensus algorithm"
 edition = "2018"
@@ -13,28 +13,28 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sc-consensus-babe = { version = "0.8.0", path = "../" }
-sc-rpc-api = { version = "0.8.0", path = "../../../rpc-api" }
+sc-consensus-babe = { version = "0.9.0", path = "../" }
+sc-rpc-api = { version = "0.9.0", path = "../../../rpc-api" }
 jsonrpc-core = "15.1.0"
 jsonrpc-core-client = "15.1.0"
 jsonrpc-derive = "15.1.0"
-sp-consensus-babe = { version = "0.8.0", path = "../../../../primitives/consensus/babe" }
+sp-consensus-babe = { version = "0.9.0", path = "../../../../primitives/consensus/babe" }
 serde = { version = "1.0.104", features=["derive"] }
-sp-blockchain = { version = "2.0.0", path = "../../../../primitives/blockchain" }
-sp-runtime = { version = "2.0.0", path = "../../../../primitives/runtime" }
-sc-consensus-epochs = { version = "0.8.0", path = "../../epochs" }
+sp-blockchain = { version = "3.0.0", path = "../../../../primitives/blockchain" }
+sp-runtime = { version = "3.0.0", path = "../../../../primitives/runtime" }
+sc-consensus-epochs = { version = "0.9.0", path = "../../epochs" }
 futures = { version = "0.3.4", features = ["compat"] }
 derive_more = "0.99.2"
-sp-api = { version = "2.0.0", path = "../../../../primitives/api" }
-sp-consensus = { version = "0.8.0", path = "../../../../primitives/consensus/common" }
-sp-core = { version = "2.0.0", path = "../../../../primitives/core" }
-sp-application-crypto = { version = "2.0.0", path = "../../../../primitives/application-crypto" }
-sp-keystore = { version = "0.8.0", path = "../../../../primitives/keystore" }
+sp-api = { version = "3.0.0", path = "../../../../primitives/api" }
+sp-consensus = { version = "0.9.0", path = "../../../../primitives/consensus/common" }
+sp-core = { version = "3.0.0", path = "../../../../primitives/core" }
+sp-application-crypto = { version = "3.0.0", path = "../../../../primitives/application-crypto" }
+sp-keystore = { version = "0.9.0", path = "../../../../primitives/keystore" }
 
 [dev-dependencies]
-sc-consensus = { version = "0.8.0", path = "../../../consensus/common" }
+sc-consensus = { version = "0.9.0", path = "../../../consensus/common" }
 serde_json = "1.0.50"
-sp-keyring = { version = "2.0.0", path = "../../../../primitives/keyring" }
-sc-keystore = { version = "2.0.0", path = "../../../keystore" }
+sp-keyring = { version = "3.0.0", path = "../../../../primitives/keyring" }
+sc-keystore = { version = "3.0.0", path = "../../../keystore" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../../../test-utils/runtime/client" }
 tempfile = "3.1.0"
diff --git a/client/consensus/common/Cargo.toml b/client/consensus/common/Cargo.toml
index 6587553a7370..41c42866e727 100644
--- a/client/consensus/common/Cargo.toml
+++ b/client/consensus/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-consensus"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sc-client-api = { version = "2.0.0", path = "../../api" }
-sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
-sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
-sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
+sc-client-api = { version = "3.0.0", path = "../../api" }
+sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
+sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
+sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
diff --git a/client/consensus/epochs/Cargo.toml b/client/consensus/epochs/Cargo.toml
index 7d1f74ab76d6..bebe6979e694 100644
--- a/client/consensus/epochs/Cargo.toml
+++ b/client/consensus/epochs/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-consensus-epochs"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Generic epochs-based utilities for consensus"
 edition = "2018"
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 parking_lot = "0.11.1"
-fork-tree = { version = "2.0.0", path = "../../../utils/fork-tree" }
-sp-runtime = {  path = "../../../primitives/runtime" , version = "2.0.0"}
-sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
-sc-client-api = { path = "../../api" , version = "2.0.0"}
+fork-tree = { version = "3.0.0", path = "../../../utils/fork-tree" }
+sp-runtime = {  path = "../../../primitives/runtime" , version = "3.0.0"}
+sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
+sc-client-api = { path = "../../api" , version = "3.0.0"}
diff --git a/client/consensus/manual-seal/Cargo.toml b/client/consensus/manual-seal/Cargo.toml
index 737e4c4ff24c..679fd5a3eb38 100644
--- a/client/consensus/manual-seal/Cargo.toml
+++ b/client/consensus/manual-seal/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-consensus-manual-seal"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Manual sealing engine for Substrate"
 edition = "2018"
@@ -24,29 +24,29 @@ codec = { package = "parity-scale-codec", version = "2.0.0" }
 serde = { version = "1.0", features=["derive"] }
 assert_matches = "1.3.0"
 
-sc-client-api = { path = "../../api", version = "2.0.0" }
-sc-consensus-babe = { path = "../../consensus/babe", version = "0.8.0" }
-sc-consensus-epochs = { path = "../../consensus/epochs", version = "0.8.0" }
-sp-consensus-babe = { path = "../../../primitives/consensus/babe", version = "0.8.0" }
+sc-client-api = { path = "../../api", version = "3.0.0"}
+sc-consensus-babe = { path = "../../consensus/babe", version = "0.9.0"}
+sc-consensus-epochs = { path = "../../consensus/epochs", version = "0.9.0"}
+sp-consensus-babe = { path = "../../../primitives/consensus/babe", version = "0.9.0"}
 
-sc-transaction-pool = { path = "../../transaction-pool", version = "2.0.0" }
-sp-blockchain = { path = "../../../primitives/blockchain", version = "2.0.0" }
-sp-consensus = { path = "../../../primitives/consensus/common", version = "0.8.0" }
-sp-consensus-slots = { path = "../../../primitives/consensus/slots", version = "0.8.1" }
-sp-inherents = { path = "../../../primitives/inherents", version = "2.0.0" }
-sp-runtime = {  path = "../../../primitives/runtime", version = "2.0.0" }
-sp-core = {  path = "../../../primitives/core", version = "2.0.0" }
-sp-keystore = {  path = "../../../primitives/keystore", version = "0.8.0" }
-sp-keyring = {  path = "../../../primitives/keyring", version = "2.0.0" }
-sp-api = {  path = "../../../primitives/api", version = "2.0.0" }
-sp-transaction-pool = { path = "../../../primitives/transaction-pool", version = "2.0.0" }
-sp-timestamp = { path = "../../../primitives/timestamp", version = "2.0.0" }
+sc-transaction-pool = { path = "../../transaction-pool", version = "3.0.0"}
+sp-blockchain = { path = "../../../primitives/blockchain", version = "3.0.0"}
+sp-consensus = { path = "../../../primitives/consensus/common", version = "0.9.0"}
+sp-consensus-slots = { path = "../../../primitives/consensus/slots", version = "0.9.0"}
+sp-inherents = { path = "../../../primitives/inherents", version = "3.0.0"}
+sp-runtime = {  path = "../../../primitives/runtime", version = "3.0.0"}
+sp-core = {  path = "../../../primitives/core", version = "3.0.0"}
+sp-keystore = {  path = "../../../primitives/keystore", version = "0.9.0"}
+sp-keyring = {  path = "../../../primitives/keyring", version = "3.0.0"}
+sp-api = {  path = "../../../primitives/api", version = "3.0.0"}
+sp-transaction-pool = { path = "../../../primitives/transaction-pool", version = "3.0.0"}
+sp-timestamp = { path = "../../../primitives/timestamp", version = "3.0.0"}
 
-prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.8.0" }
+prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0"}
 
 [dev-dependencies]
 tokio = { version = "0.2", features = ["rt-core", "macros"] }
-sc-basic-authorship = { path = "../../basic-authorship", version = "0.8.0" }
+sc-basic-authorship = { path = "../../basic-authorship", version = "0.9.0"}
 substrate-test-runtime-client = { path = "../../../test-utils/runtime/client", version = "2.0.0" }
 substrate-test-runtime-transaction-pool = { path = "../../../test-utils/runtime/transaction-pool", version = "2.0.0" }
 tempfile = "3.1.0"
diff --git a/client/consensus/pow/Cargo.toml b/client/consensus/pow/Cargo.toml
index 2aae25ef931f..8be43a8fa04b 100644
--- a/client/consensus/pow/Cargo.toml
+++ b/client/consensus/pow/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-consensus-pow"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "PoW consensus algorithm for substrate"
 edition = "2018"
@@ -14,19 +14,19 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
-sp-core = { version = "2.0.0", path = "../../../primitives/core" }
-sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
-sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
-sp-api = { version = "2.0.0", path = "../../../primitives/api" }
-sc-client-api = { version = "2.0.0", path = "../../api" }
-sp-block-builder = { version = "2.0.0", path = "../../../primitives/block-builder" }
-sp-inherents = { version = "2.0.0", path = "../../../primitives/inherents" }
-sp-consensus-pow = { version = "0.8.0", path = "../../../primitives/consensus/pow" }
-sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
+sp-core = { version = "3.0.0", path = "../../../primitives/core" }
+sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
+sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
+sp-api = { version = "3.0.0", path = "../../../primitives/api" }
+sc-client-api = { version = "3.0.0", path = "../../api" }
+sp-block-builder = { version = "3.0.0", path = "../../../primitives/block-builder" }
+sp-inherents = { version = "3.0.0", path = "../../../primitives/inherents" }
+sp-consensus-pow = { version = "0.9.0", path = "../../../primitives/consensus/pow" }
+sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
 log = "0.4.8"
 futures = { version = "0.3.1", features = ["compat"] }
 futures-timer = "3.0.1"
 parking_lot = "0.11.1"
-sp-timestamp = { version = "2.0.0", path = "../../../primitives/timestamp" }
+sp-timestamp = { version = "3.0.0", path = "../../../primitives/timestamp" }
 derive_more = "0.99.2"
-prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.8.0"}
+prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0"}
diff --git a/client/consensus/slots/Cargo.toml b/client/consensus/slots/Cargo.toml
index 03bf48bd6246..7ca413630e26 100644
--- a/client/consensus/slots/Cargo.toml
+++ b/client/consensus/slots/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-consensus-slots"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Generic slots-based utilities for consensus"
 edition = "2018"
@@ -15,19 +15,19 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-sc-client-api = { version = "2.0.0", path = "../../api" }
-sp-core = { version = "2.0.0", path = "../../../primitives/core" }
-sp-trie = { version = "2.0.0", path = "../../../primitives/trie" }
-sp-application-crypto = { version = "2.0.0", path = "../../../primitives/application-crypto" }
-sp-arithmetic = { version = "2.0.0", path = "../../../primitives/arithmetic" }
-sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
-sp-consensus-slots = { version = "0.8.0", path = "../../../primitives/consensus/slots" }
-sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
-sp-state-machine = { version = "0.8.0", path = "../../../primitives/state-machine" }
-sp-api = { version = "2.0.0", path = "../../../primitives/api" }
-sc-telemetry = { version = "2.0.0", path = "../../telemetry" }
-sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
-sp-inherents = { version = "2.0.0", path = "../../../primitives/inherents" }
+sc-client-api = { version = "3.0.0", path = "../../api" }
+sp-core = { version = "3.0.0", path = "../../../primitives/core" }
+sp-trie = { version = "3.0.0", path = "../../../primitives/trie" }
+sp-application-crypto = { version = "3.0.0", path = "../../../primitives/application-crypto" }
+sp-arithmetic = { version = "3.0.0", path = "../../../primitives/arithmetic" }
+sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
+sp-consensus-slots = { version = "0.9.0", path = "../../../primitives/consensus/slots" }
+sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
+sp-state-machine = { version = "0.9.0", path = "../../../primitives/state-machine" }
+sp-api = { version = "3.0.0", path = "../../../primitives/api" }
+sc-telemetry = { version = "3.0.0", path = "../../telemetry" }
+sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
+sp-inherents = { version = "3.0.0", path = "../../../primitives/inherents" }
 futures = "0.3.9"
 futures-timer = "3.0.1"
 parking_lot = "0.11.1"
diff --git a/client/consensus/uncles/Cargo.toml b/client/consensus/uncles/Cargo.toml
index 0bdb25b1220a..14a8c850562c 100644
--- a/client/consensus/uncles/Cargo.toml
+++ b/client/consensus/uncles/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-consensus-uncles"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Generic uncle inclusion utilities for consensus"
 edition = "2018"
@@ -13,10 +13,10 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sc-client-api = { version = "2.0.0", path = "../../api" }
-sp-core = { version = "2.0.0", path = "../../../primitives/core" }
-sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
-sp-authorship = { version = "2.0.0", path = "../../../primitives/authorship" }
-sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
-sp-inherents = { version = "2.0.0", path = "../../../primitives/inherents" }
+sc-client-api = { version = "3.0.0", path = "../../api" }
+sp-core = { version = "3.0.0", path = "../../../primitives/core" }
+sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
+sp-authorship = { version = "3.0.0", path = "../../../primitives/authorship" }
+sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
+sp-inherents = { version = "3.0.0", path = "../../../primitives/inherents" }
 log = "0.4.8"
diff --git a/client/db/Cargo.toml b/client/db/Cargo.toml
index db3fc7eb85df..72c26fead1c1 100644
--- a/client/db/Cargo.toml
+++ b/client/db/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-client-db"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -24,23 +24,23 @@ parity-util-mem = { version = "0.9.0", default-features = false, features = ["st
 codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 blake2-rfc = "0.2.18"
 
-sc-client-api = { version = "2.0.0", path = "../api" }
-sp-arithmetic = { version = "2.0.0", path = "../../primitives/arithmetic" }
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
-sp-state-machine = { version = "0.8.0", path = "../../primitives/state-machine" }
-sc-executor = { version = "0.8.0", path = "../executor" }
-sc-state-db = { version = "0.8.0", path = "../state-db" }
-sp-trie = { version = "2.0.0", path = "../../primitives/trie" }
-sp-consensus = { version = "0.8.0", path = "../../primitives/consensus/common" }
-sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
-sp-database = { version = "2.0.0", path = "../../primitives/database" }
+sc-client-api = { version = "3.0.0", path = "../api" }
+sp-arithmetic = { version = "3.0.0", path = "../../primitives/arithmetic" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
+sp-state-machine = { version = "0.9.0", path = "../../primitives/state-machine" }
+sc-executor = { version = "0.9.0", path = "../executor" }
+sc-state-db = { version = "0.9.0", path = "../state-db" }
+sp-trie = { version = "3.0.0", path = "../../primitives/trie" }
+sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
+sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
+sp-database = { version = "3.0.0", path = "../../primitives/database" }
 parity-db = { version = "0.2.2", optional = true }
-prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.8.0", path = "../../utils/prometheus" }
+prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.9.0", path = "../../utils/prometheus" }
 
 [dev-dependencies]
-sp-keyring = { version = "2.0.0", path = "../../primitives/keyring" }
-sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
+sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
+sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 quickcheck = "1.0.3"
 kvdb-rocksdb = "0.11.0"
diff --git a/client/executor/Cargo.toml b/client/executor/Cargo.toml
index 12a45d09c0b0..e0b21b7fb665 100644
--- a/client/executor/Cargo.toml
+++ b/client/executor/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-executor"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -16,23 +16,23 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 derive_more = "0.99.2"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-sp-io = { version = "2.0.0", path = "../../primitives/io" }
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-sp-tasks = { version = "2.0.0", path = "../../primitives/tasks" }
-sp-trie = { version = "2.0.0", path = "../../primitives/trie" }
-sp-serializer = { version = "2.0.0", path = "../../primitives/serializer" }
-sp-version = { version = "2.0.0", path = "../../primitives/version" }
-sp-panic-handler = { version = "2.0.0", path = "../../primitives/panic-handler" }
+sp-io = { version = "3.0.0", path = "../../primitives/io" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-tasks = { version = "3.0.0", path = "../../primitives/tasks" }
+sp-trie = { version = "3.0.0", path = "../../primitives/trie" }
+sp-serializer = { version = "3.0.0", path = "../../primitives/serializer" }
+sp-version = { version = "3.0.0", path = "../../primitives/version" }
+sp-panic-handler = { version = "3.0.0", path = "../../primitives/panic-handler" }
 wasmi = "0.6.2"
 parity-wasm = "0.41.0"
 lazy_static = "1.4.0"
-sp-api = { version = "2.0.0", path = "../../primitives/api" }
-sp-wasm-interface = { version = "2.0.0", path = "../../primitives/wasm-interface" }
-sp-runtime-interface = { version = "2.0.0", path = "../../primitives/runtime-interface" }
-sp-externalities = { version = "0.8.0", path = "../../primitives/externalities" }
-sc-executor-common = { version = "0.8.0", path = "common" }
-sc-executor-wasmi = { version = "0.8.0", path = "wasmi" }
-sc-executor-wasmtime = { version = "0.8.0", path = "wasmtime", optional = true }
+sp-api = { version = "3.0.0", path = "../../primitives/api" }
+sp-wasm-interface = { version = "3.0.0", path = "../../primitives/wasm-interface" }
+sp-runtime-interface = { version = "3.0.0", path = "../../primitives/runtime-interface" }
+sp-externalities = { version = "0.9.0", path = "../../primitives/externalities" }
+sc-executor-common = { version = "0.9.0", path = "common" }
+sc-executor-wasmi = { version = "0.9.0", path = "wasmi" }
+sc-executor-wasmtime = { version = "0.9.0", path = "wasmtime", optional = true }
 parking_lot = "0.11.1"
 log = "0.4.8"
 libsecp256k1 = "0.3.4"
@@ -43,10 +43,10 @@ wat = "1.0"
 hex-literal = "0.3.1"
 sc-runtime-test = { version = "2.0.0", path = "runtime-test" }
 substrate-test-runtime = { version = "2.0.0", path = "../../test-utils/runtime" }
-sp-state-machine = { version = "0.8.0", path = "../../primitives/state-machine" }
-sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
-sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
-sc-tracing = { version = "2.0.0", path = "../tracing" }
+sp-state-machine = { version = "0.9.0", path = "../../primitives/state-machine" }
+sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
+sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
+sc-tracing = { version = "3.0.0", path = "../tracing" }
 tracing = "0.1.22"
 tracing-subscriber = "0.2.15"
 paste = "1.0"
diff --git a/client/executor/common/Cargo.toml b/client/executor/common/Cargo.toml
index b8f735f0c179..7e13e37d33fb 100644
--- a/client/executor/common/Cargo.toml
+++ b/client/executor/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-executor-common"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -18,10 +18,10 @@ derive_more = "0.99.2"
 parity-wasm = "0.41.0"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 wasmi = "0.6.2"
-sp-core = { version = "2.0.0", path = "../../../primitives/core" }
-sp-allocator = { version = "2.0.0", path = "../../../primitives/allocator" }
-sp-wasm-interface = { version = "2.0.0", path = "../../../primitives/wasm-interface" }
-sp-serializer = { version = "2.0.0", path = "../../../primitives/serializer" }
+sp-core = { version = "3.0.0", path = "../../../primitives/core" }
+sp-allocator = { version = "3.0.0", path = "../../../primitives/allocator" }
+sp-wasm-interface = { version = "3.0.0", path = "../../../primitives/wasm-interface" }
+sp-serializer = { version = "3.0.0", path = "../../../primitives/serializer" }
 thiserror = "1.0.21"
 
 [features]
diff --git a/client/executor/runtime-test/Cargo.toml b/client/executor/runtime-test/Cargo.toml
index 1a898b92ca9a..93ad463be16c 100644
--- a/client/executor/runtime-test/Cargo.toml
+++ b/client/executor/runtime-test/Cargo.toml
@@ -13,16 +13,16 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-allocator = { version = "2.0.0", default-features = false, path = "../../../primitives/allocator" }
-sp-core = { version = "2.0.0", default-features = false, path = "../../../primitives/core" }
-sp-io = { version = "2.0.0", default-features = false, path = "../../../primitives/io" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../../primitives/runtime" }
-sp-sandbox = { version = "0.8.0", default-features = false, path = "../../../primitives/sandbox" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../../primitives/std" }
-sp-tasks = { version = "2.0.0", default-features = false, path = "../../../primitives/tasks" }
+sp-allocator = { version = "3.0.0", default-features = false, path = "../../../primitives/allocator" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../../primitives/core" }
+sp-io = { version = "3.0.0", default-features = false, path = "../../../primitives/io" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
+sp-sandbox = { version = "0.9.0", default-features = false, path = "../../../primitives/sandbox" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../../primitives/std" }
+sp-tasks = { version = "3.0.0", default-features = false, path = "../../../primitives/tasks" }
 
 [build-dependencies]
-substrate-wasm-builder = { version = "3.0.0", path = "../../../utils/wasm-builder" }
+substrate-wasm-builder = { version = "4.0.0", path = "../../../utils/wasm-builder" }
 
 [features]
 default = [ "std" ]
diff --git a/client/executor/wasmi/Cargo.toml b/client/executor/wasmi/Cargo.toml
index ea571b91f12b..cfe9dd7108cf 100644
--- a/client/executor/wasmi/Cargo.toml
+++ b/client/executor/wasmi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-executor-wasmi"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -17,8 +17,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 log = "0.4.8"
 wasmi = "0.6.2"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-sc-executor-common = { version = "0.8.0", path = "../common" }
-sp-wasm-interface = { version = "2.0.0", path = "../../../primitives/wasm-interface" }
-sp-runtime-interface = { version = "2.0.0", path = "../../../primitives/runtime-interface" }
-sp-core = { version = "2.0.0", path = "../../../primitives/core" }
-sp-allocator = { version = "2.0.0", path = "../../../primitives/allocator" }
+sc-executor-common = { version = "0.9.0", path = "../common" }
+sp-wasm-interface = { version = "3.0.0", path = "../../../primitives/wasm-interface" }
+sp-runtime-interface = { version = "3.0.0", path = "../../../primitives/runtime-interface" }
+sp-core = { version = "3.0.0", path = "../../../primitives/core" }
+sp-allocator = { version = "3.0.0", path = "../../../primitives/allocator" }
diff --git a/client/executor/wasmtime/Cargo.toml b/client/executor/wasmtime/Cargo.toml
index 0ffed7ade7e4..051b314e4498 100644
--- a/client/executor/wasmtime/Cargo.toml
+++ b/client/executor/wasmtime/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-executor-wasmtime"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -17,11 +17,11 @@ log = "0.4.8"
 scoped-tls = "1.0"
 parity-wasm = "0.41.0"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-sc-executor-common = { version = "0.8.0", path = "../common" }
-sp-wasm-interface = { version = "2.0.0", path = "../../../primitives/wasm-interface" }
-sp-runtime-interface = { version = "2.0.0", path = "../../../primitives/runtime-interface" }
-sp-core = { version = "2.0.0", path = "../../../primitives/core" }
-sp-allocator = { version = "2.0.0", path = "../../../primitives/allocator" }
+sc-executor-common = { version = "0.9.0", path = "../common" }
+sp-wasm-interface = { version = "3.0.0", path = "../../../primitives/wasm-interface" }
+sp-runtime-interface = { version = "3.0.0", path = "../../../primitives/runtime-interface" }
+sp-core = { version = "3.0.0", path = "../../../primitives/core" }
+sp-allocator = { version = "3.0.0", path = "../../../primitives/allocator" }
 wasmtime = "0.22"
 pwasm-utils = "0.14.0"
 
diff --git a/client/finality-grandpa-warp-sync/Cargo.toml b/client/finality-grandpa-warp-sync/Cargo.toml
index 4a8941a554aa..ca3ea94f38e8 100644
--- a/client/finality-grandpa-warp-sync/Cargo.toml
+++ b/client/finality-grandpa-warp-sync/Cargo.toml
@@ -13,12 +13,12 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sc-network = { version = "0.8.0", path = "../network" }
-sc-finality-grandpa = { version = "0.8.0", path = "../finality-grandpa" }
-sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
-sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
-sc-client-api = { version = "2.0.0", path = "../api" }
-sc-service = { version = "0.8.0", path = "../service" }
+sc-network = { version = "0.9.0", path = "../network" }
+sc-finality-grandpa = { version = "0.9.0", path = "../finality-grandpa" }
+sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
+sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
+sc-client-api = { version = "3.0.0", path = "../api" }
+sc-service = { version = "0.9.0", path = "../service" }
 futures = "0.3.8"
 log = "0.4.11"
 derive_more = "0.99.11"
diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml
index 5c9636b1412b..38f6acda0548 100644
--- a/client/finality-grandpa/Cargo.toml
+++ b/client/finality-grandpa/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-finality-grandpa"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -16,33 +16,33 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 derive_more = "0.99.2"
-fork-tree = { version = "2.0.0", path = "../../utils/fork-tree" }
+fork-tree = { version = "3.0.0", path = "../../utils/fork-tree" }
 futures = "0.3.9"
 futures-timer = "3.0.1"
 log = "0.4.8"
 parking_lot = "0.11.1"
 rand = "0.7.2"
 parity-scale-codec = { version = "2.0.0", features = ["derive"] }
-sp-application-crypto = { version = "2.0.0", path = "../../primitives/application-crypto" }
-sp-arithmetic = { version = "2.0.0", path = "../../primitives/arithmetic" }
-sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
-sp-utils = { version = "2.0.0", path = "../../primitives/utils" }
-sp-consensus = { version = "0.8.0", path = "../../primitives/consensus/common" }
-sc-consensus = { version = "0.8.0", path = "../consensus/common" }
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-sp-keystore = { version = "0.8.0", path = "../../primitives/keystore" }
-sp-api = { version = "2.0.0", path = "../../primitives/api" }
-sc-telemetry = { version = "2.0.0", path = "../telemetry" }
-sc-keystore = { version = "2.0.0", path = "../keystore" }
+sp-application-crypto = { version = "3.0.0", path = "../../primitives/application-crypto" }
+sp-arithmetic = { version = "3.0.0", path = "../../primitives/arithmetic" }
+sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
+sp-utils = { version = "3.0.0", path = "../../primitives/utils" }
+sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
+sc-consensus = { version = "0.9.0", path = "../consensus/common" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-keystore = { version = "0.9.0", path = "../../primitives/keystore" }
+sp-api = { version = "3.0.0", path = "../../primitives/api" }
+sc-telemetry = { version = "3.0.0", path = "../telemetry" }
+sc-keystore = { version = "3.0.0", path = "../keystore" }
 serde_json = "1.0.41"
-sc-client-api = { version = "2.0.0", path = "../api" }
-sp-inherents = { version = "2.0.0", path = "../../primitives/inherents" }
-sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
-sc-network = { version = "0.8.0", path = "../network" }
-sc-network-gossip = { version = "0.8.0", path = "../network-gossip" }
-sp-finality-grandpa = { version = "2.0.0", path = "../../primitives/finality-grandpa" }
-prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.8.0"}
-sc-block-builder = { version = "0.8.0", path = "../block-builder" }
+sc-client-api = { version = "3.0.0", path = "../api" }
+sp-inherents = { version = "3.0.0", path = "../../primitives/inherents" }
+sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
+sc-network = { version = "0.9.0", path = "../network" }
+sc-network-gossip = { version = "0.9.0", path = "../network-gossip" }
+sp-finality-grandpa = { version = "3.0.0", path = "../../primitives/finality-grandpa" }
+prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
+sc-block-builder = { version = "0.9.0", path = "../block-builder" }
 finality-grandpa = { version = "0.13.0", features = ["derive-codec"] }
 pin-project = "1.0.4"
 linked-hash-map = "0.5.2"
@@ -50,13 +50,13 @@ linked-hash-map = "0.5.2"
 [dev-dependencies]
 assert_matches = "1.3.0"
 finality-grandpa = { version = "0.13.0", features = ["derive-codec", "test-helpers"] }
-sc-network = { version = "0.8.0", path = "../network" }
+sc-network = { version = "0.9.0", path = "../network" }
 sc-network-test = { version = "0.8.0", path = "../network/test" }
-sp-keyring = { version = "2.0.0", path = "../../primitives/keyring" }
+sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
 substrate-test-runtime-client = { version = "2.0.0",  path = "../../test-utils/runtime/client" }
-sp-consensus-babe = { version = "0.8.0", path = "../../primitives/consensus/babe" }
-sp-state-machine = { version = "0.8.0", path = "../../primitives/state-machine" }
-sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
+sp-consensus-babe = { version = "0.9.0", path = "../../primitives/consensus/babe" }
+sp-state-machine = { version = "0.9.0", path = "../../primitives/state-machine" }
+sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
 tokio = { version = "0.2", features = ["rt-core"] }
 tempfile = "3.1.0"
-sp-api = { version = "2.0.0", path = "../../primitives/api" }
+sp-api = { version = "3.0.0", path = "../../primitives/api" }
diff --git a/client/finality-grandpa/rpc/Cargo.toml b/client/finality-grandpa/rpc/Cargo.toml
index c8d18d6595c1..58aa78a38b10 100644
--- a/client/finality-grandpa/rpc/Cargo.toml
+++ b/client/finality-grandpa/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-finality-grandpa-rpc"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "RPC extensions for the GRANDPA finality gadget"
 repository = "https://github.com/paritytech/substrate/"
@@ -9,11 +9,11 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 readme = "README.md"
 
 [dependencies]
-sc-finality-grandpa = { version = "0.8.0", path = "../" }
-sc-rpc = { version = "2.0.0", path = "../../rpc" }
-sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
-sp-core = { version = "2.0.0", path = "../../../primitives/core" }
-sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
+sc-finality-grandpa = { version = "0.9.0", path = "../" }
+sc-rpc = { version = "3.0.0", path = "../../rpc" }
+sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
+sp-core = { version = "3.0.0", path = "../../../primitives/core" }
+sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
 finality-grandpa = { version = "0.13.0", features = ["derive-codec"] }
 jsonrpc-core = "15.1.0"
 jsonrpc-core-client = "15.1.0"
@@ -25,15 +25,15 @@ serde_json = "1.0.50"
 log = "0.4.8"
 derive_more = "0.99.2"
 parity-scale-codec = { version = "2.0.0", features = ["derive"] }
-sc-client-api = { version = "2.0.0", path = "../../api" }
+sc-client-api = { version = "3.0.0", path = "../../api" }
 
 [dev-dependencies]
-sc-block-builder = { version = "0.8.0", path = "../../block-builder" }
+sc-block-builder = { version = "0.9.0", path = "../../block-builder" }
 sc-network-test = { version = "0.8.0", path = "../../network/test" }
-sc-rpc = { version = "2.0.0", path = "../../rpc", features = ["test-helpers"] }
-sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
-sp-core = { version = "2.0.0", path = "../../../primitives/core" }
-sp-finality-grandpa = { version = "2.0.0", path = "../../../primitives/finality-grandpa" }
-sp-keyring = { version = "2.0.0", path = "../../../primitives/keyring" }
+sc-rpc = { version = "3.0.0", path = "../../rpc", features = ["test-helpers"] }
+sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
+sp-core = { version = "3.0.0", path = "../../../primitives/core" }
+sp-finality-grandpa = { version = "3.0.0", path = "../../../primitives/finality-grandpa" }
+sp-keyring = { version = "3.0.0", path = "../../../primitives/keyring" }
 substrate-test-runtime-client = { version = "2.0.0",  path = "../../../test-utils/runtime/client" }
 lazy_static = "1.4"
diff --git a/client/informant/Cargo.toml b/client/informant/Cargo.toml
index 9b58b036f054..d552a123c378 100644
--- a/client/informant/Cargo.toml
+++ b/client/informant/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-informant"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Substrate informant."
 edition = "2018"
@@ -17,10 +17,10 @@ ansi_term = "0.12.1"
 futures = "0.3.9"
 log = "0.4.8"
 parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
-sc-client-api = { version = "2.0.0", path = "../api" }
-sc-network = { version = "0.8.0", path = "../network" }
-sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
-sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
-sp-utils = { version = "2.0.0", path = "../../primitives/utils" }
-sp-transaction-pool = { version = "2.0.0", path = "../../primitives/transaction-pool" }
+sc-client-api = { version = "3.0.0", path = "../api" }
+sc-network = { version = "0.9.0", path = "../network" }
+sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
+sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
+sp-utils = { version = "3.0.0", path = "../../primitives/utils" }
+sp-transaction-pool = { version = "3.0.0", path = "../../primitives/transaction-pool" }
 wasm-timer = "0.2"
diff --git a/client/keystore/Cargo.toml b/client/keystore/Cargo.toml
index 29cbfea3acfd..fd9fd162e617 100644
--- a/client/keystore/Cargo.toml
+++ b/client/keystore/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-keystore"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -19,9 +19,9 @@ async-trait = "0.1.30"
 derive_more = "0.99.2"
 futures = "0.3.9"
 futures-util = "0.3.4"
-sp-application-crypto = { version = "2.0.0", path = "../../primitives/application-crypto" }
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-sp-keystore = { version = "0.8.0", path = "../../primitives/keystore" }
+sp-application-crypto = { version = "3.0.0", path = "../../primitives/application-crypto" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-keystore = { version = "0.9.0", path = "../../primitives/keystore" }
 hex = "0.4.0"
 merlin = { version = "2.0", default-features = false }
 parking_lot = "0.11.1"
diff --git a/client/light/Cargo.toml b/client/light/Cargo.toml
index 5ec87419332f..1b45dbf5c0c5 100644
--- a/client/light/Cargo.toml
+++ b/client/light/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "components for a light client"
 name = "sc-light"
-version = "2.0.1"
+version = "3.0.0"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -14,15 +14,15 @@ readme = "README.md"
 parking_lot = "0.11.1"
 lazy_static = "1.4.0"
 hash-db = "0.15.2"
-sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
-sp-externalities = { version = "0.8.0", path = "../../primitives/externalities" }
-sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-sp-state-machine = { version = "0.8.0", path = "../../primitives/state-machine" }
-sc-client-api = { version = "2.0.0", path = "../api" }
-sp-api = { version = "2.0.0", path = "../../primitives/api" }
+sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
+sp-externalities = { version = "0.9.0", path = "../../primitives/externalities" }
+sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-state-machine = { version = "0.9.0", path = "../../primitives/state-machine" }
+sc-client-api = { version = "3.0.0", path = "../api" }
+sp-api = { version = "3.0.0", path = "../../primitives/api" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-sc-executor = { version = "0.8.0", path = "../executor" }
+sc-executor = { version = "0.9.0", path = "../executor" }
 
 [features]
 default = []
diff --git a/client/network-gossip/Cargo.toml b/client/network-gossip/Cargo.toml
index 487291fd6f52..4da356f92d68 100644
--- a/client/network-gossip/Cargo.toml
+++ b/client/network-gossip/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "Gossiping for the Substrate network protocol"
 name = "sc-network-gossip"
-version = "0.8.1"
+version = "0.9.0"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -20,9 +20,9 @@ futures-timer = "3.0.1"
 libp2p = { version = "0.34.0", default-features = false }
 log = "0.4.8"
 lru = "0.6.1"
-prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.8.0", path = "../../utils/prometheus" }
-sc-network = { version = "0.8.0", path = "../network" }
-sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
+prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.9.0", path = "../../utils/prometheus" }
+sc-network = { version = "0.9.0", path = "../network" }
+sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
 wasm-timer = "0.2"
 
 [dev-dependencies]
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index 20ba3c6e20dc..87e960fb6426 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "Substrate network protocol"
 name = "sc-network"
-version = "0.8.1"
+version = "0.9.0"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -28,7 +28,7 @@ derive_more = "0.99.2"
 either = "1.5.3"
 erased-serde = "0.3.9"
 fnv = "1.0.6"
-fork-tree = { version = "2.0.0", path = "../../utils/fork-tree" }
+fork-tree = { version = "3.0.0", path = "../../utils/fork-tree" }
 futures = "0.3.9"
 futures-timer = "3.0.2"
 asynchronous-codec = "0.5"
@@ -41,21 +41,21 @@ log = "0.4.8"
 nohash-hasher = "0.2.0"
 parking_lot = "0.11.1"
 pin-project = "1.0.4"
-prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.8.0", path = "../../utils/prometheus" }
+prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.9.0", path = "../../utils/prometheus" }
 prost = "0.7"
 rand = "0.7.2"
-sc-block-builder = { version = "0.8.0", path = "../block-builder" }
-sc-client-api = { version = "2.0.0", path = "../api" }
-sc-peerset = { version = "2.0.0", path = "../peerset" }
+sc-block-builder = { version = "0.9.0", path = "../block-builder" }
+sc-client-api = { version = "3.0.0", path = "../api" }
+sc-peerset = { version = "3.0.0", path = "../peerset" }
 serde = { version = "1.0.101", features = ["derive"] }
 serde_json = "1.0.41"
 smallvec = "1.5.0"
-sp-arithmetic = { version = "2.0.0", path = "../../primitives/arithmetic" }
-sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
-sp-consensus = { version = "0.8.0", path = "../../primitives/consensus/common" }
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
-sp-utils = { version = "2.0.0", path = "../../primitives/utils" }
+sp-arithmetic = { version = "3.0.0", path = "../../primitives/arithmetic" }
+sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
+sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
+sp-utils = { version = "3.0.0", path = "../../primitives/utils" }
 thiserror = "1"
 unsigned-varint = { version = "0.6.0", features = ["futures", "asynchronous_codec"] }
 void = "1.0.2"
@@ -76,9 +76,9 @@ assert_matches = "1.3"
 libp2p = { version = "0.34.0", default-features = false }
 quickcheck = "1.0.3"
 rand = "0.7.2"
-sp-keyring = { version = "2.0.0", path = "../../primitives/keyring" }
+sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
 sp-test-primitives = { version = "2.0.0", path = "../../primitives/test-primitives" }
-sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
+sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
 substrate-test-runtime = { version = "2.0.0", path = "../../test-utils/runtime" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 tempfile = "3.1.0"
diff --git a/client/network/test/Cargo.toml b/client/network/test/Cargo.toml
index 20265f7680a9..5a799ad82941 100644
--- a/client/network/test/Cargo.toml
+++ b/client/network/test/Cargo.toml
@@ -14,23 +14,23 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 async-std = "1.6.5"
-sc-network = { version = "0.8.0", path = "../" }
+sc-network = { version = "0.9.0", path = "../" }
 log = "0.4.8"
 parking_lot = "0.11.1"
 futures = "0.3.9"
 futures-timer = "3.0.1"
 rand = "0.7.2"
 libp2p = { version = "0.34.0", default-features = false }
-sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
-sc-consensus = { version = "0.8.0", path = "../../consensus/common" }
-sc-client-api = { version = "2.0.0", path = "../../api" }
-sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
-sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
-sp-core = { version = "2.0.0", path = "../../../primitives/core" }
-sc-block-builder = { version = "0.8.0", path = "../../block-builder" }
-sp-consensus-babe = { version = "0.8.0", path = "../../../primitives/consensus/babe" }
+sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
+sc-consensus = { version = "0.9.0", path = "../../consensus/common" }
+sc-client-api = { version = "3.0.0", path = "../../api" }
+sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
+sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
+sp-core = { version = "3.0.0", path = "../../../primitives/core" }
+sc-block-builder = { version = "0.9.0", path = "../../block-builder" }
+sp-consensus-babe = { version = "0.9.0", path = "../../../primitives/consensus/babe" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
 substrate-test-runtime = { version = "2.0.0", path = "../../../test-utils/runtime" }
 tempfile = "3.1.0"
-sp-tracing = { version = "2.0.0", path = "../../../primitives/tracing" }
-sc-service = { version = "0.8.0", default-features = false, features = ["test-helpers"],  path = "../../service" }
+sp-tracing = { version = "3.0.0", path = "../../../primitives/tracing" }
+sc-service = { version = "0.9.0", default-features = false, features = ["test-helpers"],  path = "../../service" }
diff --git a/client/offchain/Cargo.toml b/client/offchain/Cargo.toml
index b53ff5616db4..5671affb6fb7 100644
--- a/client/offchain/Cargo.toml
+++ b/client/offchain/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "Substrate offchain workers"
 name = "sc-offchain"
-version = "2.0.1"
+version = "3.0.0"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -14,35 +14,35 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 bytes = "0.5"
-sc-client-api = { version = "2.0.0", path = "../api" }
-sp-api = { version = "2.0.0", path = "../../primitives/api" }
+sc-client-api = { version = "3.0.0", path = "../api" }
+sp-api = { version = "3.0.0", path = "../../primitives/api" }
 fnv = "1.0.6"
 futures = "0.3.9"
 futures-timer = "3.0.1"
 log = "0.4.8"
 threadpool = "1.7"
 num_cpus = "1.10"
-sp-offchain = { version = "2.0.0", path = "../../primitives/offchain" }
+sp-offchain = { version = "3.0.0", path = "../../primitives/offchain" }
 codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 parking_lot = "0.11.1"
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
 rand = "0.7.2"
-sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
-sp-utils = { version = "2.0.0", path = "../../primitives/utils" }
-sc-network = { version = "0.8.0", path = "../network" }
-sc-keystore = { version = "2.0.0", path = "../keystore" }
+sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
+sp-utils = { version = "3.0.0", path = "../../primitives/utils" }
+sc-network = { version = "0.9.0", path = "../network" }
+sc-keystore = { version = "3.0.0", path = "../keystore" }
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
 hyper = "0.13.9"
 hyper-rustls = "0.21.0"
 
 [dev-dependencies]
-sc-client-db = { version = "0.8.0", default-features = true, path = "../db" }
-sc-block-builder = { version = "0.8.0", path = "../block-builder" }
-sc-transaction-pool = { version = "2.0.0", path = "../transaction-pool" }
-sp-transaction-pool = { version = "2.0.0", path = "../../primitives/transaction-pool" }
-sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
-sp-consensus = { version = "0.8.1", path = "../../primitives/consensus/common" }
+sc-client-db = { version = "0.9.0", default-features = true, path = "../db" }
+sc-block-builder = { version = "0.9.0", path = "../block-builder" }
+sc-transaction-pool = { version = "3.0.0", path = "../transaction-pool" }
+sp-transaction-pool = { version = "3.0.0", path = "../../primitives/transaction-pool" }
+sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
+sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 tokio = "0.2"
 lazy_static = "1.4.0"
diff --git a/client/peerset/Cargo.toml b/client/peerset/Cargo.toml
index 1ebb6bde52a6..90f7820017e2 100644
--- a/client/peerset/Cargo.toml
+++ b/client/peerset/Cargo.toml
@@ -3,7 +3,7 @@ description = "Connectivity manager based on reputation"
 homepage = "http://parity.io"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 name = "sc-peerset"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 repository = "https://github.com/paritytech/substrate/"
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 futures = "0.3.9"
 libp2p = { version = "0.34.0", default-features = false }
-sp-utils = { version = "2.0.0", path = "../../primitives/utils"}
+sp-utils = { version = "3.0.0", path = "../../primitives/utils"}
 log = "0.4.8"
 serde_json = "1.0.41"
 wasm-timer = "0.2"
diff --git a/client/proposer-metrics/Cargo.toml b/client/proposer-metrics/Cargo.toml
index 29a5701bc9e4..ffe5045461f7 100644
--- a/client/proposer-metrics/Cargo.toml
+++ b/client/proposer-metrics/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-proposer-metrics"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -14,4 +14,4 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 log = "0.4.8"
-prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.8.0"}
+prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
diff --git a/client/rpc-api/Cargo.toml b/client/rpc-api/Cargo.toml
index 9e51b8ce6b5e..d213decdbc77 100644
--- a/client/rpc-api/Cargo.toml
+++ b/client/rpc-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-rpc-api"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -22,11 +22,11 @@ jsonrpc-derive = "15.1.0"
 jsonrpc-pubsub = "15.1.0"
 log = "0.4.8"
 parking_lot = "0.11.1"
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-sp-version = { version = "2.0.0", path = "../../primitives/version" }
-sp-runtime = { path = "../../primitives/runtime" , version = "2.0.0"}
-sp-chain-spec = { path = "../../primitives/chain-spec" , version = "2.0.0"}
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-version = { version = "3.0.0", path = "../../primitives/version" }
+sp-runtime = { path = "../../primitives/runtime" , version = "3.0.0"}
+sp-chain-spec = { path = "../../primitives/chain-spec" , version = "3.0.0"}
 serde = { version = "1.0.101", features = ["derive"] }
 serde_json = "1.0.41"
-sp-transaction-pool = { version = "2.0.0", path = "../../primitives/transaction-pool" }
-sp-rpc = { version = "2.0.0", path = "../../primitives/rpc" }
+sp-transaction-pool = { version = "3.0.0", path = "../../primitives/transaction-pool" }
+sp-rpc = { version = "3.0.0", path = "../../primitives/rpc" }
diff --git a/client/rpc-servers/Cargo.toml b/client/rpc-servers/Cargo.toml
index 0ee186923e8f..95c3e4194cd5 100644
--- a/client/rpc-servers/Cargo.toml
+++ b/client/rpc-servers/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-rpc-server"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -17,10 +17,10 @@ futures = "0.1.6"
 jsonrpc-core = "15.1.0"
 pubsub = { package = "jsonrpc-pubsub", version = "15.1.0" }
 log = "0.4.8"
-prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.8.0"}
+prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
 serde = "1.0.101"
 serde_json = "1.0.41"
-sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
+sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
 http = { package = "jsonrpc-http-server", version = "15.1.0" }
diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml
index 54f0aa78e5c8..203bb0e525d8 100644
--- a/client/rpc/Cargo.toml
+++ b/client/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-rpc"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -13,31 +13,31 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sc-rpc-api = { version = "0.8.0", path = "../rpc-api" }
-sc-client-api = { version = "2.0.0", path = "../api" }
-sp-api = { version = "2.0.0", path = "../../primitives/api" }
+sc-rpc-api = { version = "0.9.0", path = "../rpc-api" }
+sc-client-api = { version = "3.0.0", path = "../api" }
+sp-api = { version = "3.0.0", path = "../../primitives/api" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 futures = { version = "0.3.1", features = ["compat"] }
 jsonrpc-pubsub = "15.1.0"
 log = "0.4.8"
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
 rpc = { package = "jsonrpc-core", version = "15.1.0" }
-sp-version = { version = "2.0.0", path = "../../primitives/version" }
+sp-version = { version = "3.0.0", path = "../../primitives/version" }
 serde_json = "1.0.41"
-sp-session = { version = "2.0.0", path = "../../primitives/session" }
-sp-offchain = { version = "2.0.0", path = "../../primitives/offchain" }
-sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
-sp-utils = { version = "2.0.0", path = "../../primitives/utils" }
-sp-rpc = { version = "2.0.0", path = "../../primitives/rpc" }
-sp-keystore = { version = "0.8.0", path = "../../primitives/keystore" }
-sp-state-machine = { version = "0.8.0", path = "../../primitives/state-machine" }
-sp-chain-spec = { version = "2.0.0", path = "../../primitives/chain-spec" }
-sc-executor = { version = "0.8.0", path = "../executor" }
-sc-block-builder = { version = "0.8.0", path = "../block-builder" }
-sc-keystore = { version = "2.0.0", path = "../keystore" }
-sp-transaction-pool = { version = "2.0.0", path = "../../primitives/transaction-pool" }
-sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
-sc-tracing = { version = "2.0.0", path = "../tracing" }
+sp-session = { version = "3.0.0", path = "../../primitives/session" }
+sp-offchain = { version = "3.0.0", path = "../../primitives/offchain" }
+sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
+sp-utils = { version = "3.0.0", path = "../../primitives/utils" }
+sp-rpc = { version = "3.0.0", path = "../../primitives/rpc" }
+sp-keystore = { version = "0.9.0", path = "../../primitives/keystore" }
+sp-state-machine = { version = "0.9.0", path = "../../primitives/state-machine" }
+sp-chain-spec = { version = "3.0.0", path = "../../primitives/chain-spec" }
+sc-executor = { version = "0.9.0", path = "../executor" }
+sc-block-builder = { version = "0.9.0", path = "../block-builder" }
+sc-keystore = { version = "3.0.0", path = "../keystore" }
+sp-transaction-pool = { version = "3.0.0", path = "../../primitives/transaction-pool" }
+sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
+sc-tracing = { version = "3.0.0", path = "../tracing" }
 hash-db = { version = "0.15.2", default-features = false }
 parking_lot = "0.11.1"
 lazy_static = { version = "1.4.0", optional = true }
@@ -46,12 +46,12 @@ lazy_static = { version = "1.4.0", optional = true }
 assert_matches = "1.3.0"
 futures01 = { package = "futures", version = "0.1.29" }
 lazy_static = "1.4.0"
-sc-network = { version = "0.8.0", path = "../network" }
-sp-io = { version = "2.0.0", path = "../../primitives/io" }
+sc-network = { version = "0.9.0", path = "../network" }
+sp-io = { version = "3.0.0", path = "../../primitives/io" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 tokio = "0.1.22"
-sc-transaction-pool = { version = "2.0.0", path = "../transaction-pool" }
-sc-cli = { version = "0.8.0", path = "../cli" }
+sc-transaction-pool = { version = "3.0.0", path = "../transaction-pool" }
+sc-cli = { version = "0.9.0", path = "../cli" }
 
 [features]
 test-helpers = ["lazy_static"]
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index 8833a65190ec..0a9be763b240 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-service"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -40,41 +40,41 @@ pin-project = "1.0.4"
 hash-db = "0.15.2"
 serde = "1.0.101"
 serde_json = "1.0.41"
-sc-keystore = { version = "2.0.0", path = "../keystore" }
-sp-io = { version = "2.0.0", path = "../../primitives/io" }
-sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
-sp-trie = { version = "2.0.0", path = "../../primitives/trie" }
-sp-externalities = { version = "0.8.0", path = "../../primitives/externalities" }
-sp-utils = { version = "2.0.0", path = "../../primitives/utils" }
-sp-version = { version = "2.0.0", path = "../../primitives/version" }
-sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-sp-keystore = { version = "0.8.0", path = "../../primitives/keystore" }
-sp-session = { version = "2.0.0", path = "../../primitives/session" }
-sp-state-machine = { version = "0.8.0", path = "../../primitives/state-machine" }
-sp-application-crypto = { version = "2.0.0", path = "../../primitives/application-crypto" }
-sp-consensus = { version = "0.8.0", path = "../../primitives/consensus/common" }
-sp-inherents = { version = "2.0.0", path = "../../primitives/inherents" }
-sc-network = { version = "0.8.0", path = "../network" }
-sc-chain-spec = { version = "2.0.0", path = "../chain-spec" }
-sc-light = { version = "2.0.0", path = "../light" }
-sc-client-api = { version = "2.0.0", path = "../api" }
-sp-api = { version = "2.0.0", path = "../../primitives/api" }
-sc-client-db = { version = "0.8.0", default-features = false, path = "../db" }
+sc-keystore = { version = "3.0.0", path = "../keystore" }
+sp-io = { version = "3.0.0", path = "../../primitives/io" }
+sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
+sp-trie = { version = "3.0.0", path = "../../primitives/trie" }
+sp-externalities = { version = "0.9.0", path = "../../primitives/externalities" }
+sp-utils = { version = "3.0.0", path = "../../primitives/utils" }
+sp-version = { version = "3.0.0", path = "../../primitives/version" }
+sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-keystore = { version = "0.9.0", path = "../../primitives/keystore" }
+sp-session = { version = "3.0.0", path = "../../primitives/session" }
+sp-state-machine = { version = "0.9.0", path = "../../primitives/state-machine" }
+sp-application-crypto = { version = "3.0.0", path = "../../primitives/application-crypto" }
+sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
+sp-inherents = { version = "3.0.0", path = "../../primitives/inherents" }
+sc-network = { version = "0.9.0", path = "../network" }
+sc-chain-spec = { version = "3.0.0", path = "../chain-spec" }
+sc-light = { version = "3.0.0", path = "../light" }
+sc-client-api = { version = "3.0.0", path = "../api" }
+sp-api = { version = "3.0.0", path = "../../primitives/api" }
+sc-client-db = { version = "0.9.0", default-features = false, path = "../db" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-sc-executor = { version = "0.8.0", path = "../executor" }
-sc-transaction-pool = { version = "2.0.0", path = "../transaction-pool" }
-sp-transaction-pool = { version = "2.0.0", path = "../../primitives/transaction-pool" }
-sc-rpc-server = { version = "2.0.0", path = "../rpc-servers" }
-sc-rpc = { version = "2.0.0", path = "../rpc" }
-sc-block-builder = { version = "0.8.0", path = "../block-builder" }
-sp-block-builder = { version = "2.0.0", path = "../../primitives/block-builder" }
-sc-informant = { version = "0.8.0", path = "../informant" }
-sc-telemetry = { version = "2.0.0", path = "../telemetry" }
-sc-offchain = { version = "2.0.0", path = "../offchain" }
-prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.8.0"}
-sc-tracing = { version = "2.0.0", path = "../tracing" }
-sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
+sc-executor = { version = "0.9.0", path = "../executor" }
+sc-transaction-pool = { version = "3.0.0", path = "../transaction-pool" }
+sp-transaction-pool = { version = "3.0.0", path = "../../primitives/transaction-pool" }
+sc-rpc-server = { version = "3.0.0", path = "../rpc-servers" }
+sc-rpc = { version = "3.0.0", path = "../rpc" }
+sc-block-builder = { version = "0.9.0", path = "../block-builder" }
+sp-block-builder = { version = "3.0.0", path = "../../primitives/block-builder" }
+sc-informant = { version = "0.9.0", path = "../informant" }
+sc-telemetry = { version = "3.0.0", path = "../telemetry" }
+sc-offchain = { version = "3.0.0", path = "../offchain" }
+prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
+sc-tracing = { version = "3.0.0", path = "../tracing" }
+sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
 tracing = "0.1.22"
 tracing-futures = { version = "0.2.4" }
 parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
@@ -86,9 +86,9 @@ directories = "3.0.1"
 [dev-dependencies]
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 substrate-test-runtime = { version = "2.0.0", path = "../../test-utils/runtime/" }
-sp-consensus-babe = { version = "0.8.0", path = "../../primitives/consensus/babe" }
-grandpa = { version = "0.8.0", package = "sc-finality-grandpa", path = "../finality-grandpa" }
-grandpa-primitives = { version = "2.0.0", package = "sp-finality-grandpa", path = "../../primitives/finality-grandpa" }
+sp-consensus-babe = { version = "0.9.0", path = "../../primitives/consensus/babe" }
+grandpa = { version = "0.9.0", package = "sc-finality-grandpa", path = "../finality-grandpa" }
+grandpa-primitives = { version = "3.0.0", package = "sp-finality-grandpa", path = "../../primitives/finality-grandpa" }
 tokio = { version = "0.2.25", default-features = false }
 async-std = { version = "1.6.5", default-features = false }
 tracing-subscriber = "0.2.15"
diff --git a/client/service/test/Cargo.toml b/client/service/test/Cargo.toml
index d1347fa9d3cc..e55320d6c5fb 100644
--- a/client/service/test/Cargo.toml
+++ b/client/service/test/Cargo.toml
@@ -19,26 +19,26 @@ futures01 = { package = "futures", version = "0.1.29" }
 log = "0.4.8"
 fdlimit = "0.2.1"
 parking_lot = "0.11.1"
-sc-light = { version = "2.0.0", path = "../../light" }
-sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
-sp-api = { version = "2.0.0", path = "../../../primitives/api" }
-sp-state-machine = { version = "0.8.0", path = "../../../primitives/state-machine" }
-sp-externalities = { version = "0.8.0", path = "../../../primitives/externalities" }
-sp-trie = { version = "2.0.0", path = "../../../primitives/trie" }
-sp-storage = { version = "2.0.0", path = "../../../primitives/storage" }
-sc-client-db = { version = "0.8.0", default-features = false, path = "../../db" }
+sc-light = { version = "3.0.0", path = "../../light" }
+sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
+sp-api = { version = "3.0.0", path = "../../../primitives/api" }
+sp-state-machine = { version = "0.9.0", path = "../../../primitives/state-machine" }
+sp-externalities = { version = "0.9.0", path = "../../../primitives/externalities" }
+sp-trie = { version = "3.0.0", path = "../../../primitives/trie" }
+sp-storage = { version = "3.0.0", path = "../../../primitives/storage" }
+sc-client-db = { version = "0.9.0", default-features = false, path = "../../db" }
 futures = { version = "0.3.1", features = ["compat"] }
-sc-service = { version = "0.8.0", default-features = false, features = ["test-helpers"], path = "../../service" }
-sc-network = { version = "0.8.0", path = "../../network" }
-sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
-sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
-sp-core = { version = "2.0.0", path = "../../../primitives/core" }
-sp-transaction-pool = { version = "2.0.0", path = "../../../primitives/transaction-pool" }
+sc-service = { version = "0.9.0", default-features = false, features = ["test-helpers"], path = "../../service" }
+sc-network = { version = "0.9.0", path = "../../network" }
+sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
+sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
+sp-core = { version = "3.0.0", path = "../../../primitives/core" }
+sp-transaction-pool = { version = "3.0.0", path = "../../../primitives/transaction-pool" }
 substrate-test-runtime = { version = "2.0.0", path = "../../../test-utils/runtime" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
-sc-client-api = { version = "2.0.0", path = "../../api" }
-sc-block-builder = { version = "0.8.0", path = "../../block-builder" }
-sc-executor = { version = "0.8.0", path = "../../executor" }
-sp-panic-handler = { version = "2.0.0", path = "../../../primitives/panic-handler" }
+sc-client-api = { version = "3.0.0", path = "../../api" }
+sc-block-builder = { version = "0.9.0", path = "../../block-builder" }
+sc-executor = { version = "0.9.0", path = "../../executor" }
+sp-panic-handler = { version = "3.0.0", path = "../../../primitives/panic-handler" }
 parity-scale-codec = "2.0.0"
-sp-tracing = { version = "2.0.0", path = "../../../primitives/tracing" }
+sp-tracing = { version = "3.0.0", path = "../../../primitives/tracing" }
diff --git a/client/state-db/Cargo.toml b/client/state-db/Cargo.toml
index d8c022aa4887..d61dd7fc125a 100644
--- a/client/state-db/Cargo.toml
+++ b/client/state-db/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-state-db"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -16,8 +16,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 thiserror = "1.0.21"
 parking_lot = "0.11.1"
 log = "0.4.11"
-sc-client-api = { version = "2.0.0", path = "../api" }
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
+sc-client-api = { version = "3.0.0", path = "../api" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
 codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
 parity-util-mem-derive = "0.1.0"
diff --git a/client/sync-state-rpc/Cargo.toml b/client/sync-state-rpc/Cargo.toml
index 81204365d082..3ec48ac9ec57 100644
--- a/client/sync-state-rpc/Cargo.toml
+++ b/client/sync-state-rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-sync-state-rpc"
-version = "0.8.0"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "A RPC handler to create sync states for light clients."
 edition = "2018"
@@ -17,12 +17,12 @@ thiserror = "1.0.21"
 jsonrpc-core = "15.0"
 jsonrpc-core-client = "15.0"
 jsonrpc-derive = "15.0"
-sc-chain-spec = { version = "2.0.0", path = "../chain-spec" }
-sc-client-api = { version = "2.0.0", path = "../api" }
-sc-consensus-babe = { version = "0.8.0", path = "../consensus/babe" }
-sc-consensus-epochs = { version = "0.8.0", path = "../consensus/epochs" }
-sc-finality-grandpa = { version = "0.8.0", path = "../finality-grandpa" }
-sc-rpc-api = { version = "0.8.0", path = "../rpc-api" }
+sc-chain-spec = { version = "3.0.0", path = "../chain-spec" }
+sc-client-api = { version = "3.0.0", path = "../api" }
+sc-consensus-babe = { version = "0.9.0", path = "../consensus/babe" }
+sc-consensus-epochs = { version = "0.9.0", path = "../consensus/epochs" }
+sc-finality-grandpa = { version = "0.9.0", path = "../finality-grandpa" }
+sc-rpc-api = { version = "0.9.0", path = "../rpc-api" }
 serde_json = "1.0.58"
-sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
-sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
+sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
+sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
diff --git a/client/telemetry/Cargo.toml b/client/telemetry/Cargo.toml
index b209755e1b61..23b6936ff405 100644
--- a/client/telemetry/Cargo.toml
+++ b/client/telemetry/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-telemetry"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Telemetry utils"
 edition = "2018"
@@ -28,5 +28,5 @@ void = "1.0.2"
 tracing = "0.1.10"
 tracing-subscriber = "0.2.13"
 serde_json = "1.0.41"
-sp-utils = { version = "2.0.0", path = "../../primitives/utils" }
+sp-utils = { version = "3.0.0", path = "../../primitives/utils" }
 chrono = "0.4.19"
diff --git a/client/tracing/Cargo.toml b/client/tracing/Cargo.toml
index 6a49c92b0f87..34aa9d9d4e7f 100644
--- a/client/tracing/Cargo.toml
+++ b/client/tracing/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-tracing"
-version = "2.0.1"
+version = "3.0.0"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -29,9 +29,9 @@ tracing = "0.1.22"
 tracing-core = "0.1.17"
 tracing-log = "0.1.1"
 tracing-subscriber = "0.2.15"
-sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
-sc-telemetry = { version = "2.0.0", path = "../telemetry" }
-sc-tracing-proc-macro = { version = "2.0.0", path = "./proc-macro" }
+sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
+sc-telemetry = { version = "3.0.0", path = "../telemetry" }
+sc-tracing-proc-macro = { version = "3.0.0", path = "./proc-macro" }
 
 [target.'cfg(target_os = "unknown")'.dependencies]
 wasm-bindgen = "0.2.67"
diff --git a/client/tracing/proc-macro/Cargo.toml b/client/tracing/proc-macro/Cargo.toml
index e2f4cf14435b..ac06dc45a9c4 100644
--- a/client/tracing/proc-macro/Cargo.toml
+++ b/client/tracing/proc-macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-tracing-proc-macro"
-version = "2.0.0"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/client/transaction-pool/Cargo.toml b/client/transaction-pool/Cargo.toml
index f424f1777d09..d457d709d122 100644
--- a/client/transaction-pool/Cargo.toml
+++ b/client/transaction-pool/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-transaction-pool"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -21,23 +21,23 @@ intervalier = "0.4.0"
 log = "0.4.8"
 parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
 parking_lot = "0.11.1"
-prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.8.0"}
-sc-client-api = { version = "2.0.0", path = "../api" }
-sc-transaction-graph = { version = "2.0.0", path = "./graph" }
-sp-api = { version = "2.0.0", path = "../../primitives/api" }
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
-sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
-sp-transaction-pool = { version = "2.0.0", path = "../../primitives/transaction-pool" }
-sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
-sp-utils = { version = "2.0.0", path = "../../primitives/utils" }
+prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
+sc-client-api = { version = "3.0.0", path = "../api" }
+sc-transaction-graph = { version = "3.0.0", path = "./graph" }
+sp-api = { version = "3.0.0", path = "../../primitives/api" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
+sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
+sp-transaction-pool = { version = "3.0.0", path = "../../primitives/transaction-pool" }
+sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
+sp-utils = { version = "3.0.0", path = "../../primitives/utils" }
 wasm-timer = "0.2"
 
 [dev-dependencies]
 assert_matches = "1.3.0"
 hex = "0.4"
-sp-keyring = { version = "2.0.0", path = "../../primitives/keyring" }
-sp-consensus = { version = "0.8.0", path = "../../primitives/consensus/common" }
+sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
+sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
 substrate-test-runtime-transaction-pool = { version = "2.0.0", path = "../../test-utils/runtime/transaction-pool" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
-sc-block-builder = { version = "0.8.0", path = "../block-builder" }
+sc-block-builder = { version = "0.9.0", path = "../block-builder" }
diff --git a/client/transaction-pool/graph/Cargo.toml b/client/transaction-pool/graph/Cargo.toml
index 97b35a070676..7ed455f9370c 100644
--- a/client/transaction-pool/graph/Cargo.toml
+++ b/client/transaction-pool/graph/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-transaction-graph"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -20,11 +20,11 @@ log = "0.4.8"
 parking_lot = "0.11.1"
 serde = { version = "1.0.101", features = ["derive"] }
 wasm-timer = "0.2"
-sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
-sp-utils = { version = "2.0.0", path = "../../../primitives/utils" }
-sp-core = { version = "2.0.0", path = "../../../primitives/core" }
-sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
-sp-transaction-pool = { version = "2.0.0", path = "../../../primitives/transaction-pool" }
+sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
+sp-utils = { version = "3.0.0", path = "../../../primitives/utils" }
+sp-core = { version = "3.0.0", path = "../../../primitives/core" }
+sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
+sp-transaction-pool = { version = "3.0.0", path = "../../../primitives/transaction-pool" }
 parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
 linked-hash-map = "0.5.2"
 retain_mut = "0.1.2"
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 1dbe447d6267..a918ef5d554c 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -6,6 +6,147 @@ The format is based on [Keep a Changelog].
 
 ## Unreleased
 
+## 2.0.1-> 3.0.0 - Apollo 14
+
+Most notably, this is the first release of the new FRAME (2.0) with its new macro-syntax and some changes in types, and pallet versioning. This release also incorporates the faster and improve version 2.0 of the parity-scale-codec and upgraded dependencies all-around. While the `FinalityTracker` pallet has been dropped, this release marks the first public appereance of a few new pallets, too;Bounties, Lottery, Tips (extracted from the `Treasury`-pallet, see #7536) and Merkle-Mountain-Ranges (MMR).
+
+On the client side, the most notable changes are around the keystore, making it async and switching to a different signing model allowing for remote-signing to be implemented; and various changes to improve networking and light-client support, like adding the Grandpa warp sync request-response protocol (#7711).
+
+_Contracts_: Please note that the contracts pallet _is not part_ of this release. The pallet is not yet ready and will be released separately in the coming weeks. The currently released contracts pallet _is not compatible_ with the new FRAME, thus if you need the contracts pallet, we recommend you wait with the upgrade until it has been released, too.
+### Upgrade instructions
+
+Not too much has changed on the top and API level for developing Substrate betweeen 2.0 and 3.0. The easiest and quickest path for upgading is just to take the latest node-template and try applying your changes to it:
+1. take a diff between 2.0 and your changes
+2. store that diff
+3. remove everything, copy over the 3.0 node-template
+4. try re-applying your diff, manually, a hunk at a time.
+
+If that doesn't work for you, we are working on an in-depth-guide for all major changes that took place and how you need to adapt your code for it. [You can find the upgrade guide under `docs/` in the repo](https://github.com/paritytech/substrate/blob/master/docs/Upgrading-2.0-to-3.0.md), if you have further questions or problem, please [feel free to ask in the github discussion board](https://github.com/paritytech/substrate/discussions).
+
+
+Runtime
+-------
+
+* contracts: Charge rent for code storage (#7935)
+* contracts: Emit event on contract termination (#8014)
+* Fix elections-phragmen and proxy issue (#7040)
+* Allow validators to block and kick their nominator set. (#7930)
+* Decouple Stkaing and Election - Part1: Support traits (#7908)
+* Introduces account existence providers reference counting (#7363)
+* contracts: Cap the surcharge reward by the amount of rent that way payed by a contract (#7870)
+* Use checked math when calculating storage size (#7885)
+* Fix clear prefix check to avoid erasing child trie roots. (#7848)
+* contracts: Collect rent for the first block during deployment (#7847)
+* contracts: Add configurable per-storage item cost (#7819)
+* babe: expose next epoch data (#7829)
+* fix : remove `_{ }` syntax from benchmark macro (#7822)
+* Define ss58 prefix inside the runtime (#7810)
+* Allow council to slash treasury tip (#7753)
+* Don't allow self proxies (#7803)
+* add a `current_epoch` to BabeApi (#7789)
+* Add `pallet` attribute macro to declare pallets (#6877)
+* Make it possible to calculate the storage root as often as you want (#7714)
+* Issue 7143 | Refactor Treasury Pallet into Bounties, Tips, and Proposals (#7536)
+* Participating in Council Governance is Free for First Time Voters and Successful Closing (#7661)
+* Streamline frame_system weight parametrization (#6629)
+* Features needed for reserve-backed stablecoins (#7152)
+* `sudo_as` should return a result (#7620)
+* More Extensible Multiaddress Format (#7380)
+* Fix `on_runtime_upgrade` weight recording (#7480)
+* Implement batch_all and update Utility pallet for weight refunds (#7188)
+* Fix wrong outgoing calculation in election (#7384)
+* Implements pallet versioning (#7208)
+* Runtime worker threads (#7089)
+* Allow `schedule_after(0, ...)` to work (#7284)
+* Fix offchain election to respect the weight (#7215)
+* Fix weight for inner call with new origin (#7196)
+* Move proxies migration (#7205)
+* Introduce `cancel_proposal` to rid us of those pesky proposals (#7111)
+
+Client
+------
+
+* Remove backwards-compatibility networking hack (#8068)
+* Extend SS58 network identifiers (#8039)
+* Update dependencies ahead of next release (#8015)
+* Storage chains: serve transactions over IPFS/bitswap (#7963)
+* Add a send_request function to NetworkService (#8008)
+* Rename system_networkState to system_unstable_networkState (#8001)
+* Allow transaction for offchain indexing (#7290)
+* Grandpa warp sync request-response protocol (#7711)
+* Add explicit limits to notifications sizes and adjust yamux buffer size (#7925)
+* Rework priority groups, take 2 (#7700)
+* Define ss58 prefix inside the runtime (#7810)
+* Expand remote keystore interface to allow for hybrid mode (#7628)
+* Allow capping the amount of work performed when deleting a child trie (#7671)
+* RPC to allow setting the log filter (#7474)
+* Remove sc_network::NetworkService::register_notifications_protocol and partially refactor Grandpa tests (#7646)
+* minor fix and improvements on localkeystore (#7626)
+* contracts: Add `salt` argument to contract instantiation (#7482)
+* contracts: Rework contracts_call RPC (#7468)
+* Make sure to use the optimized method instead of reading the storage. (#7445)
+* WASM Local-blob override (#7317)
+* client/network: Allow configuring Kademlia's disjoint query paths (#7356)
+* client/network: Remove option to disable yamux flow control (#7358)
+* Make `queryStorage` and `storagePairs` unsafe RPC functions (#7342)
+* No longer actively open legacy substreams (#7076)
+* Make `run_node_until_exit` take a future (#7318)
+* Add an system_syncState RPC method (#7315)
+* Async keystore + Authority-Discovery async/await (#7000)
+* Fixes logging of target names with dashes (#7281)
+* Refactor CurrencyToVote (#6896)
+* client/network: Stop sending noise legacy handshake (#7211)
+
+API
+---
+
+* pallet macro: easier syntax for `#[pallet::pallet]` with `struct Pallet<T>(_)` (#8091)
+* WasmExecutor takes a cache directory (#8057)
+* Remove PalletInfo impl for () (#8090)
+* Migrate assets pallet to new macros (#7984)
+* contracts: Make ChainExtension trait generic over the runtime (#8003)
+* Decouple the session validators from im-online (#7127)
+* Update parity-scale-codec to 2.0 (#7994)
+* Merkle Mountain Range pallet improvements (#7891)
+* Cleaner GRANDPA RPC API for proving finality (#7339)
+* Migrate frame-system to pallet attribute macro (#7898)
+* Introduces account existence providers reference counting (#7363)
+* contracts: Lazy storage removal (#7740)
+* contracts: Allow runtime authors to define a chain extension (#7548)
+* Define ss58 prefix inside the runtime (#7810)
+* Add `pallet` attribute macro to declare pallets (#6877)
+* Add keccak-512 to host functions. (#7531)
+* Merkle Mountain Range pallet (#7312)
+* Allow capping the amount of work performed when deleting a child trie (#7671)
+* add an upgrade_keys method for pallet-session (#7688)
+* Streamline frame_system weight parametrization (#6629)
+* Rename pallet trait `Trait` to `Config` (#7599)
+* contracts: Add `salt` argument to contract instantiation (#7482)
+* pallet-evm: move to Frontier (Part IV) (#7573)
+* refactor subtrait/elevated trait as not needed (#7497)
+* Allow BabeConsensusDataProvider fork existing chain (#7078)
+* decouple transaction payment and currency (#6912)
+* contracts: Refactor the runtime API in order to simplify node integration (#7409)
+* client/authority-discovery: Remove sentry node logic (#7368)
+* client/network: Make NetworkService::set_priority_group async (#7352)
+* *: Bump async-std to v1.6.5 (#7306)
+* babe: make secondary slot randomness available on-chain (#7053)
+* allow where clause in decl_error (#7324)
+* reschedule (#6860)
+* SystemOrigin trait (#7226)
+* permit setting treasury pallet initial funding through genesis (#7214)
+
+Runtime Migrations
+------------------
+
+* Migrate assets pallet to new macros (#7984)
+* Fix elections-phragmen and proxy issue (#7040)
+* Allow validators to block and kick their nominator set. (#7930)
+* Migrate frame-system to pallet attribute macro (#7898)
+* Implements pallet versioning (#7208)
+* Move proxies migration (#7205)
+
+
 ## 2.0.0-> 2.0.1
 
 Patch release with backports to fix broken nightly builds.
diff --git a/docs/Upgrading-2.0-to-3.0.md b/docs/Upgrading-2.0-to-3.0.md
new file mode 100644
index 000000000000..bc4a15eb15f2
--- /dev/null
+++ b/docs/Upgrading-2.0-to-3.0.md
@@ -0,0 +1,1120 @@
+# Upgrading from Substrate 2.0 to 3.0
+
+An incomplete guide.
+
+## Refreshing the node-template
+
+Not much has changed on the top and API level for developing Substrate betweeen 2.0 and 3.0. If you've made only small changes to the node-template, we recommend to do the following - it is easiest and quickest path forward:
+1. take a diff between 2.0 and your changes
+2. store that diff
+3. remove everything, copy over the 3.0 node-template
+4. try re-applying your diff, manually, a hunk at a time.
+
+## In-Depth guide on the changes
+
+If you've made significant changes or diverted from the node-template a lot, starting out with that is probably not helping. For that case, we'll take a look at all changes between 2.0 and 3.0 to the fully-implemented node and explain them one by one, so you can follow up, what needs to be changing for your node.
+
+_Note_: Of course, step 1 is to upgrade your `Cargo.toml`'s to use the latest version of Substrate and all dependencies.
+
+We'll be taking the diff from 2.0.1 to 3.0.0 on `bin/node` as the baseline of what has changed between these two versions in terms of adapting ones code base. We will not be covering the changes made on the tests and bench-marking as they are mostly reactions to the other changes.
+
+### Versions upgrade
+
+First and foremost you have to upgrade the version pf the dependencies of course, that's `0.8.x -> 0.9.0` and `2.0.x -> 3.0.0` for all `sc-`, `sp-`, `frame-`, and `pallet-` coming from Parity. Further more this release also upgraded its own dependencies, most notably, we are now using `parity-scale-codec 2.0`, `parking_lot 0.11` and `substrate-wasm-builder 3.0.0` (as build dependency). All other dependency upgrades should resolve automatically or are just internal. However you might see some error that another dependency/type you have as a dependency and one of our upgraded crates don't match up, if so please check the version of said dependency - we've probably ugraded it.
+
+### WASM-Builder
+
+The new version of wasm-builder has gotten a bit smarter and a lot faster (you should definitly switch). Once you've upgraded the dependency, in most cases you just have to remove the now obsolete `with_wasm_builder_from_crates_or_path`-function and you are good to go:
+
+```diff: rust
+--- a/bin/node/runtime/build.rs
++++ b/bin/node/runtime/build.rs
+@@ -15,12 +15,11 @@
+ // See the License for the specific language governing permissions and
+ // limitations under the License.
+
+-use wasm_builder_runner::WasmBuilder;
++use substrate_wasm_builder::WasmBuilder;
+
+ fn main() {
+ 	WasmBuilder::new()
+ 		.with_current_project()
+-		.with_wasm_builder_from_crates_or_path("2.0.0", "../../../utils/wasm-builder")
+ 		.export_heap_base()
+ 		.import_memory()
+ 		.build()
+```
+
+### Runtime
+
+#### FRAME 2.0
+
+The new FRAME 2.0 macros are a lot nicer to use and easier to read. While we were on that change though, we also cleaned up some mainly internal names and traits. The old `macro`'s still work and also produce the new structure, however, when plugging all that together as a Runtime, there's some things we have to adapt now:
+
+##### `::Trait for Runtime` becomes `::Config for Runtime`
+
+The most visible and significant change is that the macros no longer generate the `$pallet::Trait` but now a much more aptly named `$pallet::Config`. Thus, we need to rename all `::Trait for Runtime` into`::Config for Runtime`, e.g. for the `sudo` pallet we must do:
+
+```diff
+-impl pallet_sudo::Trait for Runtime {
++impl pallet_sudo::Config for Runtime {
+```
+
+The same goes for all `<Self as frame_system::Trait>` and alike, which simply becomes `<Self as frame_system::Config>`.
+
+#### SS58 Prefix is now a runtime param
+
+
+Since [#7810](https://github.com/paritytech/substrate/pull/7810) we don't define the ss58 prefix in the chainspec anymore but moved it into the runtime. Namely, `frame_system` now needs a new `SS58Prefix`, which in substrate node we have defined for ourselves as: `pub const SS58Prefix: u8 = 42;`. Use your own chain-specific value there.
+
+#### Weight Definition
+
+`type WeightInfo` has changed and instead on `weights::pallet_$name::WeightInfo` is now bound to the Runtime as `pallet_$name::weights::SubstrateWeight<Runtime>`. As a result we have to the change the type definitions everywhere in our Runtime accordingly:
+
+```diff
+-	type WeightInfo = weights::pallet_$name::WeightInfo;
++	type WeightInfo = pallet_$name::weights::SubstrateWeight<Runtime>;
+```
+
+e.g.
+```diff
+-	type WeightInfo = weights::pallet_collective::WeightInfo;
++	type WeightInfo = pallet_collective::weights::SubstrateWeight<Runtime>;
+```
+and
+
+```diff
+-	type WeightInfo = weights::pallet_proxy::WeightInfo;
++	type WeightInfo = pallet_proxy::weights::SubstrateWeight<Runtime>;
+```
+
+And update the overall definition for weights on frame and a few related types and runtime parameters:
+
+```diff=
+
+-const AVERAGE_ON_INITIALIZE_WEIGHT: Perbill = Perbill::from_percent(10);
++/// We assume that ~10% of the block weight is consumed by `on_initalize` handlers.
++/// This is used to limit the maximal weight of a single extrinsic.
++const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10);
++/// We allow `Normal` extrinsics to fill up the block up to 75%, the rest can be used
++/// by  Operational  extrinsics.
++const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);
++/// We allow for 2 seconds of compute with a 6 second average block time.
++const MAXIMUM_BLOCK_WEIGHT: Weight = 2 * WEIGHT_PER_SECOND;
++
+ parameter_types! {
+ 	pub const BlockHashCount: BlockNumber = 2400;
+-	/// We allow for 2 seconds of compute with a 6 second average block time.
+-	pub const MaximumBlockWeight: Weight = 2 * WEIGHT_PER_SECOND;
+-	pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);
+-	/// Assume 10% of weight for average on_initialize calls.
+-	pub MaximumExtrinsicWeight: Weight =
+-		AvailableBlockRatio::get().saturating_sub(AVERAGE_ON_INITIALIZE_WEIGHT)
+-		* MaximumBlockWeight::get();
+-	pub const MaximumBlockLength: u32 = 5 * 1024 * 1024;
+ 	pub const Version: RuntimeVersion = VERSION;
+-}
+-
+-const_assert!(AvailableBlockRatio::get().deconstruct() >= AVERAGE_ON_INITIALIZE_WEIGHT.deconstruct());
+-
+-impl frame_system::Trait for Runtime {
++	pub RuntimeBlockLength: BlockLength =
++		BlockLength::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO);
++	pub RuntimeBlockWeights: BlockWeights = BlockWeights::builder()
++		.base_block(BlockExecutionWeight::get())
++		.for_class(DispatchClass::all(), |weights| {
++			weights.base_extrinsic = ExtrinsicBaseWeight::get();
++		})
++		.for_class(DispatchClass::Normal, |weights| {
++			weights.max_total = Some(NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT);
++		})
++		.for_class(DispatchClass::Operational, |weights| {
++			weights.max_total = Some(MAXIMUM_BLOCK_WEIGHT);
++			// Operational transactions have some extra reserved space, so that they
++			// are included even if block reached `MAXIMUM_BLOCK_WEIGHT`.
++			weights.reserved = Some(
++				MAXIMUM_BLOCK_WEIGHT - NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT
++			);
++		})
++		.avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)
++		.build_or_panic();
++}
++
++const_assert!(NORMAL_DISPATCH_RATIO.deconstruct() >= AVERAGE_ON_INITIALIZE_RATIO.deconstruct());
++
++impl frame_system::Config for Runtime {
+ 	type BaseCallFilter = ();
++	type BlockWeights = RuntimeBlockWeights;
++	type BlockLength = RuntimeBlockLength;
++	type DbWeight = RocksDbWeight;
+ 	type Origin = Origin;
+ 	type Call = Call;
+ 	type Index = Index;
+@@ -171,25 +198,19 @@ impl frame_system::Trait for Runtime {
+ 	type Header = generic::Header<BlockNumber, BlakeTwo256>;
+ 	type Event = Event;
+ 	type BlockHashCount = BlockHashCount;
+-	type MaximumBlockWeight = MaximumBlockWeight;
+-	type DbWeight = RocksDbWeight;
+-	type BlockExecutionWeight = BlockExecutionWeight;
+-	type ExtrinsicBaseWeight = ExtrinsicBaseWeight;
+-	type MaximumExtrinsicWeight = MaximumExtrinsicWeight;
+-	type MaximumBlockLength = MaximumBlockLength;
+-	type AvailableBlockRatio = AvailableBlockRatio;
+ 	type Version = Version;
+ 	type PalletInfo = PalletInfo;
+ 	type AccountData = pallet_balances::AccountData<Balance>;
+ 	type OnNewAccount = ();
+ 	type OnKilledAccount = ();
+-	type SystemWeightInfo = weights::frame_system::WeightInfo;
++	type SystemWeightInfo = frame_system::weights::SubstrateWeight<Runtime>;
+```
+
+#### Pallets:
+
+##### Assets
+
+The assets pallet has seen a variety of changes:
+- [Features needed for reserve-backed stablecoins #7152 ](https://github.com/paritytech/substrate/pull/7152)
+- [Freeze Assets and Asset Metadata #7346 ](https://github.com/paritytech/substrate/pull/7346)
+- [Introduces account existence providers reference counting #7363 ]((https://github.com/paritytech/substrate/pull/7363))
+
+have all altered the feature set and changed the concepts. However, it has some of the best documentation and explains the current state very well. If you are using the assets pallet and need to upgrade from an earlier version, we recommend you use the current docs to guide your way!
+
+##### Contracts
+
+As noted in the changelog, the `contracts`-pallet is still undergoing massive changes and is not yet part of this release. We are expecting for it to be released a few weeks after. If your chain is dependent on this pallet, we recommend to wait until it has been released as the currently released version is not compatible with FRAME 2.0.
+
+#### (changes) Treasury
+
+As mentioned above, Bounties, Tips and Lottery have been extracted out of treasury into their own pallets - removing these options here. Secondly we must now specify the `BurnDestination`  and `SpendFunds`, which now go the `Bounties`.
+
+```diff
+-	type Tippers = Elections;
+-	type TipCountdown = TipCountdown;
+-	type TipFindersFee = TipFindersFee;
+-	type TipReportDepositBase = TipReportDepositBase;
+-	type DataDepositPerByte = DataDepositPerByte;
+ 	type Event = Event;
+ 	type OnSlash = ();
+ 	type ProposalBond = ProposalBond;
+ 	type ProposalBondMinimum = ProposalBondMinimum;
+ 	type SpendPeriod = SpendPeriod;
+ 	type Burn = Burn;
++	type BurnDestination = ();
++	type SpendFunds = Bounties;
+```
+
+Factoring out Bounties and Tips means most of these definitions have now moved there, while the parameter types can be left as they were:
+
+###### 🆕 Bounties
+
+```rust=
+impl pallet_bounties::Config for Runtime {
+	type Event = Event;
+ 	type BountyDepositBase = BountyDepositBase;
+ 	type BountyDepositPayoutDelay = BountyDepositPayoutDelay;
+ 	type BountyUpdatePeriod = BountyUpdatePeriod;
+ 	type BountyCuratorDeposit = BountyCuratorDeposit;
+ 	type BountyValueMinimum = BountyValueMinimum;
+	type DataDepositPerByte = DataDepositPerByte;
+ 	type MaximumReasonLength = MaximumReasonLength;
+	type WeightInfo = pallet_bounties::weights::SubstrateWeight<Runtime>;
+ }
+```
+
+###### 🆕 Tips
+
+```rust=
+impl pallet_tips::Config for Runtime {
+	type Event = Event;
+	type DataDepositPerByte = DataDepositPerByte;
+	type MaximumReasonLength = MaximumReasonLength;
+	type Tippers = Elections;
+	type TipCountdown = TipCountdown;
+	type TipFindersFee = TipFindersFee;
+	type TipReportDepositBase = TipReportDepositBase;
+	type WeightInfo = pallet_tips::weights::SubstrateWeight<Runtime>;
+ }
+```
+
+#### `FinalityTracker` removed
+
+Finality Tracker has been removed in favor of a different approach to handle the issue in GRANDPA, [see #7228 for details](https://github.com/paritytech/substrate/pull/7228). With latest GRANDPA this is not needed anymore and can be removed without worry.
+
+#### (changes) Elections Phragmen
+
+The pallet has been moved to a new system in which the exact amount of deposit for each voter, candidate, member, or runner-up is now deposited on-chain. Moreover, the concept of a `defunct_voter` is removed, since votes now have adequet deposit associated with them. A number of configuration parameters has changed to reflect this, as shown below:
+
+```diff=
+ parameter_types! {
+ 	pub const CandidacyBond: Balance = 10 * DOLLARS;
+-	pub const VotingBond: Balance = 1 * DOLLARS;
++	// 1 storage item created, key size is 32 bytes, value size is 16+16.
++	pub const VotingBondBase: Balance = deposit(1, 64);
++	// additional data per vote is 32 bytes (account id).
++	pub const VotingBondFactor: Balance = deposit(0, 32);
+ 	pub const TermDuration: BlockNumber = 7 * DAYS;
+ 	pub const DesiredMembers: u32 = 13;
+ 	pub const DesiredRunnersUp: u32 = 7;
+
+@@ -559,16 +600,16 @@ impl pallet_elections_phragmen::Trait for Runtime {
+ 	// NOTE: this implies that council's genesis members cannot be set directly and must come from
+ 	// this module.
+ 	type InitializeMembers = Council;
+-	type CurrencyToVote = CurrencyToVoteHandler;
++	type CurrencyToVote = U128CurrencyToVote;
+ 	type CandidacyBond = CandidacyBond;
+-	type VotingBond = VotingBond;
++	type VotingBondBase = VotingBondBase;
++	type VotingBondFactor = VotingBondFactor;
+ 	type LoserCandidate = ();
+-	type BadReport = ();
+ 	type KickedMember = ();
+ 	type DesiredMembers = DesiredMembers;
+ 	type DesiredRunnersUp = DesiredRunnersUp;
+ 	type TermDuration = TermDuration;
+ ```
+
+ **This upgrade requires storage [migration](https://github.com/paritytech/substrate/blob/master/frame/elections-phragmen/src/migrations_3_0_0.rs)**. Further details can be found in the [pallet-specific changelog](https://github.com/paritytech/substrate/blob/master/frame/elections-phragmen/CHANGELOG.md#security).
+
+#### (changes) Democracy
+
+Democracy brings three new settings with this release, all to allow for better influx- and spam-control. Namely these allow to specify the maximum number of proposals at a time, who can blacklist and who can cancel proposals. This diff acts as a good starting point:
+
+```diff=
+@@ -508,6 +537,14 @@ impl pallet_democracy::Trait for Runtime {
+ 	type FastTrackVotingPeriod = FastTrackVotingPeriod;
+ 	// To cancel a proposal which has been passed, 2/3 of the council must agree to it.
+ 	type CancellationOrigin = pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, CouncilCollective>;
++	// To cancel a proposal before it has been passed, the technical committee must be unanimous or
++	// Root must agree.
++	type CancelProposalOrigin = EnsureOneOf<
++		AccountId,
++		EnsureRoot<AccountId>,
++		pallet_collective::EnsureProportionAtLeast<_1, _1, AccountId, TechnicalCollective>,
++	>;
++	type BlacklistOrigin = EnsureRoot<AccountId>;
+ 	// Any single technical committee member may veto a coming council proposal, however they can
+ 	// only do it once and it lasts only for the cooloff period.
+ 	type VetoOrigin = pallet_collective::EnsureMember<AccountId, TechnicalCollective>;
+@@ -518,7 +555,8 @@ impl pallet_democracy::Trait for Runtime {
+ 	type Scheduler = Scheduler;
+ 	type PalletsOrigin = OriginCaller;
+ 	type MaxVotes = MaxVotes;
++	type MaxProposals = MaxProposals;
+ }
+```
+
+----
+
+### Primitives
+
+The shared primitives define the API between Client and Runtime. Usually, you don't have to touch nor directly interact with them, unless you created your own client or frame-less runtime. Therefore we'd expect you to understand whether you are effected by changes and how to update your code yourself.
+
+----
+
+### Client
+
+#### CLI
+
+A few minor things have changed in the `cli` (compared to 2.0.1):
+
+1. we've [replaced the newly added `BuildSyncSpec` subcommand with an RPC API](https://github.com/paritytech/substrate/commit/65cc9af9b8df8d36928f6144ee7474cefbd70454#diff-c57da6fbeff8c46ce15f55ea42fedaa5a4684d79578006ce4af01ae04fd6b8f8) in an on-going effort to make light-client-support smoother, see below
+2. we've [removed double accounts from our chainspec-builder](https://github.com/paritytech/substrate/commit/31499cd29ed30df932fb71b7459796f7160d0272)
+3. we [don't fallback to `--chain flaming-fir` anymore](https://github.com/paritytech/substrate/commit/13cdf1c8cd2ee62d411f82b64dc7eba860c9c6c6), if no chain is given our substrate-node will error.
+4. [the `subkey`-integration has seen a fix to the `insert`-command](https://github.com/paritytech/substrate/commit/54bde60cfd2c544c54e9e8623b6b8725b99557f8) that requires you to now add the `&cli` as a param.
+    ```diff=
+    --- a/bin/node/cli/src/command.rs
+    +++ b/bin/node/cli/src/command.rs
+    @@ -92,7 +97,7 @@ pub fn run() -> Result<()> {
+                    You can enable it with `--features runtime-benchmarks`.".into())
+                }
+            }
+    -		Some(Subcommand::Key(cmd)) => cmd.run(),
+    +		Some(Subcommand::Key(cmd)) => cmd.run(&cli),
+            Some(Subcommand::Sign(cmd)) => cmd.run(),
+            Some(Subcommand::Verify(cmd)) => cmd.run(),
+            Some(Subcommand::Vanity(cmd)) => cmd.run(),
+    ```
+
+
+#### Service Builder Upgrades
+
+##### Light client support
+
+As said, we've added a new optional RPC service for improved light client support. For that to work, we need to pass the `chain_spec` and give access  to the `AuxStore` to our `rpc`:
+
+
+```diff=
+
+--- a/bin/node/rpc/src/lib.rs
++++ b/bin/node/rpc/src/lib.rs
+@@ -49,6 +49,7 @@ use sp_consensus::SelectChain;
+ use sp_consensus_babe::BabeApi;
+ use sc_rpc::SubscriptionTaskExecutor;
+ use sp_transaction_pool::TransactionPool;
++use sc_client_api::AuxStore;
+
+ /// Light client extra dependencies.
+ pub struct LightDeps<C, F, P> {
+@@ -94,6 +95,8 @@ pub struct FullDeps<C, P, SC, B> {
+ 	pub pool: Arc<P>,
+ 	/// The SelectChain Strategy
+ 	pub select_chain: SC,
++	/// A copy of the chain spec.
++	pub chain_spec: Box<dyn sc_chain_spec::ChainSpec>,
+ 	/// Whether to deny unsafe calls
+ 	pub deny_unsafe: DenyUnsafe,
+ 	/// BABE specific dependencies.
+@@ -109,9 +112,8 @@ pub type IoHandler = jsonrpc_core::IoHandler<sc_rpc::Metadata>;
+ pub fn create_full<C, P, SC, B>(
+ 	deps: FullDeps<C, P, SC, B>,
+ ) -> jsonrpc_core::IoHandler<sc_rpc_api::Metadata> where
+-	C: ProvideRuntimeApi<Block>,
+-	C: HeaderBackend<Block> + HeaderMetadata<Block, Error=BlockChainError> + 'static,
+-	C: Send + Sync + 'static,
++	C: ProvideRuntimeApi<Block> + HeaderBackend<Block> + AuxStore +
++		HeaderMetadata<Block, Error=BlockChainError> + Sync + Send + 'static,
+ 	C::Api: substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>,
+ 	C::Api: pallet_contracts_rpc::ContractsRuntimeApi<Block, AccountId, Balance, BlockNumber>,
+ 	C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance>,
+@@ -131,6 +133,7 @@ pub fn create_full<C, P, SC, B>(
+ 		client,
+ 		pool,
+ 		select_chain,
++		chain_spec,
+ 		deny_unsafe,
+ 		babe,
+ 		grandpa,
+@@ -164,8 +167,8 @@ pub fn create_full<C, P, SC, B>(
+ 	io.extend_with(
+ 		sc_consensus_babe_rpc::BabeApi::to_delegate(
+ 			BabeRpcHandler::new(
+-				client,
+-				shared_epoch_changes,
++				client.clone(),
++				shared_epoch_changes.clone(),
+ 				keystore,
+ 				babe_config,
+ 				select_chain,
+@@ -176,7 +179,7 @@ pub fn create_full<C, P, SC, B>(
+ 	io.extend_with(
+ 		sc_finality_grandpa_rpc::GrandpaApi::to_delegate(
+ 			GrandpaRpcHandler::new(
+-				shared_authority_set,
++				shared_authority_set.clone(),
+ 				shared_voter_state,
+ 				justification_stream,
+ 				subscription_executor,
+
+```
+
+and add the new service:
+
+```diff=
+--- a/bin/node/rpc/src/lib.rs
++++ b/bin/node/rpc/src/lib.rs
+@@ -185,6 +188,18 @@ pub fn create_full<C, P, SC, B>(
+ 		)
+ 	);
+
++	io.extend_with(
++		sc_sync_state_rpc::SyncStateRpcApi::to_delegate(
++			sc_sync_state_rpc::SyncStateRpcHandler::new(
++				chain_spec,
++				client,
++				shared_authority_set,
++				shared_epoch_changes,
++				deny_unsafe,
++			)
++		)
++	);
++
+ 	io
+ }
+```
+
+##### Telemetry
+
+The telemetry subsystem has seen a few fixes and refactorings to allow for a more flexible handling, in particular in regards to parachains. Most notably `sc_service::spawn_tasks` now returns the `telemetry_connection_notifier` as the second member of the tuple, (`let (_rpc_handlers, telemetry_connection_notifier) = sc_service::spawn_tasks(`), which should be passed to `telemetry_on_connect` of `new_full_base` now: `telemetry_on_connect: telemetry_connection_notifier.map(|x| x.on_connect_stream()),` (see the service-section below for a full diff).
+
+On the browser-side, this complicates setup a tiny bit, yet not terribly. Instead of `init_console_log`,  we now use `init_logging_and_telemetry` and need to make sure we spawn the runner for its handleat the end (the other changes are formatting and cosmetics):
+
+```diff
+--- a/bin/node/cli/src/browser.rs
++++ b/bin/node/cli/src/browser.rs
+@@ -21,9 +21,8 @@ use log::info;
+ use wasm_bindgen::prelude::*;
+ use browser_utils::{
+ 	Client,
+-	browser_configuration, set_console_error_panic_hook, init_console_log,
++	browser_configuration, init_logging_and_telemetry, set_console_error_panic_hook,
+ };
+-use std::str::FromStr;
+
+ /// Starts the client.
+ #[wasm_bindgen]
+@@ -33,29 +32,38 @@ pub async fn start_client(chain_spec: Option<String>, log_level: String) -> Resu
+ 		.map_err(|err| JsValue::from_str(&err.to_string()))
+ }
+
+-async fn start_inner(chain_spec: Option<String>, log_level: String) -> Result<Client, Box<dyn std::error::Error>> {
++async fn start_inner(
++	chain_spec: Option<String>,
++	log_directives: String,
++) -> Result<Client, Box<dyn std::error::Error>> {
+ 	set_console_error_panic_hook();
+-	init_console_log(log::Level::from_str(&log_level)?)?;
++	let telemetry_worker = init_logging_and_telemetry(&log_directives)?;
+ 	let chain_spec = match chain_spec {
+ 		Some(chain_spec) => ChainSpec::from_json_bytes(chain_spec.as_bytes().to_vec())
+ 			.map_err(|e| format!("{:?}", e))?,
+ 		None => crate::chain_spec::development_config(),
+ 	};
+
+-	let config = browser_configuration(chain_spec).await?;
++	let telemetry_handle = telemetry_worker.handle();
++	let config = browser_configuration(
++		chain_spec,
++		Some(telemetry_handle),
++	).await?;
+
+ 	info!("Substrate browser node");
+ 	info!("✌️  version {}", config.impl_version);
+-	info!("❤️  by Parity Technologies, 2017-2020");
++	info!("❤️  by Parity Technologies, 2017-2021");
+ 	info!("📋 Chain specification: {}", config.chain_spec.name());
+-	info!("🏷  Node name: {}", config.network.node_name);
++	info!("🏷 Node name: {}", config.network.node_name);
+ 	info!("👤 Role: {:?}", config.role);
+
+ 	// Create the service. This is the most heavy initialization step.
+ 	let (task_manager, rpc_handlers) =
+ 		crate::service::new_light_base(config)
+-			.map(|(components, rpc_handlers, _, _, _)| (components, rpc_handlers))
++			.map(|(components, rpc_handlers, _, _, _, _)| (components, rpc_handlers))
+ 			.map_err(|e| format!("{:?}", e))?;
+
++	task_manager.spawn_handle().spawn("telemetry", telemetry_worker.run());
++
+ 	Ok(browser_utils::start_client(task_manager, rpc_handlers))
+ }
+ ```
+
+##### Async & Remote Keystore support
+
+In order to allow for remote-keystores, the keystore-subsystem has been reworked to support async operations and generally refactored to not provide the keys itself but only sign on request. This allows for remote-keystore to never hand out keys and thus to operate any substrate-based node in a manner without ever having the private keys in the local system memory.
+
+There are some operations, however, that the keystore must be local for performance reasons and for which a remote keystore won't work (in particular around parachains). As such, the keystore has both a slot for remote but also always a local instance, where some operations hard bind to the local variant, while most subsystems just ask the generic keystore which prefers a remote signer if given. To reflect this change, `sc_service::new_full_parts` now returns a `KeystoreContainer` rather than the keystore, and the other subsystems (e.g. `sc_service::PartialComponents`) expect to be given that.
+
+###### on RPC:
+
+This has most visible changes for the rpc, where we are switching from the previous `KeyStorePtr` to the new `SyncCryptoStorePtr`:
+
+```diff
+
+--- a/bin/node/rpc/src/lib.rs
++++ b/bin/node/rpc/src/lib.rs
+@@ -32,6 +32,7 @@
+
+ use std::sync::Arc;
+
++use sp_keystore::SyncCryptoStorePtr;
+ use node_primitives::{Block, BlockNumber, AccountId, Index, Balance, Hash};
+ use sc_consensus_babe::{Config, Epoch};
+ use sc_consensus_babe_rpc::BabeRpcHandler;
+@@ -40,7 +41,6 @@ use sc_finality_grandpa::{
+ 	SharedVoterState, SharedAuthoritySet, FinalityProofProvider, GrandpaJustificationStream
+ };
+ use sc_finality_grandpa_rpc::GrandpaRpcHandler;
+-use sc_keystore::KeyStorePtr;
+ pub use sc_rpc_api::DenyUnsafe;
+ use sp_api::ProvideRuntimeApi;
+ use sp_block_builder::BlockBuilder;
+ pub struct LightDeps<C, F, P> {
+@@ -69,7 +70,7 @@ pub struct BabeDeps {
+ 	/// BABE pending epoch changes.
+ 	pub shared_epoch_changes: SharedEpochChanges<Block, Epoch>,
+ 	/// The keystore that manages the keys of the node.
+-	pub keystore: KeyStorePtr,
++	pub keystore: SyncCryptoStorePtr,
+ }
+
+```
+
+##### GRANDPA
+
+As already in the changelog, a few things significant things have changed in regards to GRANDPA: the finality tracker has been replaced, an RPC command has been added and WARP-sync-support for faster light client startup has been implemented. All this means we have to do a few changes to our GRANDPA setup procedures in the client.
+
+First and foremost, grandpa internalised a few aspects, and thus `new_partial` doesn't expect a tuple but only the `grandpa::SharedVoterState` as input now, and unpacking that again later is not needed anymore either. On the opposite side `grandpa::FinalityProofProvider::new_for_service` now requires the `Some(shared_authority_set)` to be passed as a new third parameter. This set also becomes relevant when adding warp-sync-support, which is added as an extra-protocol-layer to the networking as:
+```diff=
+
++	config.network.extra_sets.push(grandpa::grandpa_peers_set_config());
++
++	#[cfg(feature = "cli")]
++	config.network.request_response_protocols.push(sc_finality_grandpa_warp_sync::request_response_config_for_chain(
++		&config, task_manager.spawn_handle(), backend.clone(),
++	));
+```
+
+As these changes pull through the enitrety of `cli/src/service.rs`, we recommend looking at the final diff below for guidance.
+
+##### In a nutshell
+
+Altogether this accumulates to the following diff for `node/cli/src/service.rs`. If you want these features and have modified your chain you should probably try to apply these patches:
+
+
+```diff=
+--- a/bin/node/cli/src/service.rs
++++ b/bin/node/cli/src/service.rs
+@@ -22,11 +22,10 @@
+
+ use std::sync::Arc;
+ use sc_consensus_babe;
+-use grandpa::{self, FinalityProofProvider as GrandpaFinalityProofProvider};
+ use node_primitives::Block;
+ use node_runtime::RuntimeApi;
+ use sc_service::{
+-	config::{Role, Configuration}, error::{Error as ServiceError},
++	config::{Configuration}, error::{Error as ServiceError},
+ 	RpcHandlers, TaskManager,
+ };
+ use sp_inherents::InherentDataProviders;
+@@ -34,8 +33,8 @@ use sc_network::{Event, NetworkService};
+ use sp_runtime::traits::Block as BlockT;
+ use futures::prelude::*;
+ use sc_client_api::{ExecutorProvider, RemoteBackend};
+-use sp_core::traits::BareCryptoStorePtr;
+ use node_executor::Executor;
++use sc_telemetry::TelemetryConnectionNotifier;
+
+ type FullClient = sc_service::TFullClient<Block, RuntimeApi, Executor>;
+ type FullBackend = sc_service::TFullBackend<Block>;
+@@ -58,13 +57,10 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
+ 			grandpa::LinkHalf<Block, FullClient, FullSelectChain>,
+ 			sc_consensus_babe::BabeLink<Block>,
+ 		),
+-		(
+-			grandpa::SharedVoterState,
+-			Arc<GrandpaFinalityProofProvider<FullBackend, Block>>,
+-		),
++		grandpa::SharedVoterState,
+ 	)
+ >, ServiceError> {
+-	let (client, backend, keystore, task_manager) =
++	let (client, backend, keystore_container, task_manager) =
+ 		sc_service::new_full_parts::<Block, RuntimeApi, Executor>(&config)?;
+ 	let client = Arc::new(client);
+
+@@ -94,7 +90,6 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
+ 		babe_link.clone(),
+ 		block_import.clone(),
+ 		Some(Box::new(justification_import)),
+-		None,
+ 		client.clone(),
+ 		select_chain.clone(),
+ 		inherent_data_providers.clone(),
+@@ -111,10 +106,12 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
+ 		let justification_stream = grandpa_link.justification_stream();
+ 		let shared_authority_set = grandpa_link.shared_authority_set().clone();
+ 		let shared_voter_state = grandpa::SharedVoterState::empty();
+-		let finality_proof_provider =
+-			GrandpaFinalityProofProvider::new_for_service(backend.clone(), client.clone());
++		let rpc_setup = shared_voter_state.clone();
+
+-		let rpc_setup = (shared_voter_state.clone(), finality_proof_provider.clone());
++		let finality_proof_provider = grandpa::FinalityProofProvider::new_for_service(
++			backend.clone(),
++			Some(shared_authority_set.clone()),
++		);
+
+ 		let babe_config = babe_link.config().clone();
+ 		let shared_epoch_changes = babe_link.epoch_changes().clone();
+@@ -122,13 +119,15 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
+ 		let client = client.clone();
+ 		let pool = transaction_pool.clone();
+ 		let select_chain = select_chain.clone();
+-		let keystore = keystore.clone();
++		let keystore = keystore_container.sync_keystore();
++		let chain_spec = config.chain_spec.cloned_box();
+
+ 		let rpc_extensions_builder = move |deny_unsafe, subscription_executor| {
+ 			let deps = node_rpc::FullDeps {
+ 				client: client.clone(),
+ 				pool: pool.clone(),
+ 				select_chain: select_chain.clone(),
++				chain_spec: chain_spec.cloned_box(),
+ 				deny_unsafe,
+ 				babe: node_rpc::BabeDeps {
+ 					babe_config: babe_config.clone(),
+@@ -151,9 +150,15 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
+ 	};
+
+ 	Ok(sc_service::PartialComponents {
+-		client, backend, task_manager, keystore, select_chain, import_queue, transaction_pool,
++		client,
++		backend,
++		task_manager,
++		keystore_container,
++		select_chain,
++		import_queue,
++		transaction_pool,
+ 		inherent_data_providers,
+-		other: (rpc_extensions_builder, import_setup, rpc_setup)
++		other: (rpc_extensions_builder, import_setup, rpc_setup),
+ 	})
+ }
+
+@@ -168,19 +173,32 @@ pub struct NewFullBase {
+
+ /// Creates a full service from the configuration.
+ pub fn new_full_base(
+-	config: Configuration,
++	mut config: Configuration,
+ 	with_startup_data: impl FnOnce(
+ 		&sc_consensus_babe::BabeBlockImport<Block, FullClient, FullGrandpaBlockImport>,
+ 		&sc_consensus_babe::BabeLink<Block>,
+ 	)
+ ) -> Result<NewFullBase, ServiceError> {
+ 	let sc_service::PartialComponents {
+-		client, backend, mut task_manager, import_queue, keystore, select_chain, transaction_pool,
++		client,
++		backend,
++		mut task_manager,
++		import_queue,
++		keystore_container,
++		select_chain,
++		transaction_pool,
+ 		inherent_data_providers,
+ 		other: (rpc_extensions_builder, import_setup, rpc_setup),
+ 	} = new_partial(&config)?;
+
+-	let (shared_voter_state, finality_proof_provider) = rpc_setup;
++	let shared_voter_state = rpc_setup;
++
++	config.network.extra_sets.push(grandpa::grandpa_peers_set_config());
++
++	#[cfg(feature = "cli")]
++	config.network.request_response_protocols.push(sc_finality_grandpa_warp_sync::request_response_config_for_chain(
++		&config, task_manager.spawn_handle(), backend.clone(),
++	));
+
+ 	let (network, network_status_sinks, system_rpc_tx, network_starter) =
+ 		sc_service::build_network(sc_service::BuildNetworkParams {
+@@ -191,8 +209,6 @@ pub fn new_full_base(
+ 			import_queue,
+ 			on_demand: None,
+ 			block_announce_validator_builder: None,
+-			finality_proof_request_builder: None,
+-			finality_proof_provider: Some(finality_proof_provider.clone()),
+ 		})?;
+
+ 	if config.offchain_worker.enabled {
+@@ -203,26 +219,28 @@ pub fn new_full_base(
+
+ 	let role = config.role.clone();
+ 	let force_authoring = config.force_authoring;
++	let backoff_authoring_blocks =
++		Some(sc_consensus_slots::BackoffAuthoringOnFinalizedHeadLagging::default());
+ 	let name = config.network.node_name.clone();
+ 	let enable_grandpa = !config.disable_grandpa;
+ 	let prometheus_registry = config.prometheus_registry().cloned();
+-	let telemetry_connection_sinks = sc_service::TelemetryConnectionSinks::default();
+
+-	sc_service::spawn_tasks(sc_service::SpawnTasksParams {
+-		config,
+-		backend: backend.clone(),
+-		client: client.clone(),
+-		keystore: keystore.clone(),
+-		network: network.clone(),
+-		rpc_extensions_builder: Box::new(rpc_extensions_builder),
+-		transaction_pool: transaction_pool.clone(),
+-		task_manager: &mut task_manager,
+-		on_demand: None,
+-		remote_blockchain: None,
+-		telemetry_connection_sinks: telemetry_connection_sinks.clone(),
+-		network_status_sinks: network_status_sinks.clone(),
+-		system_rpc_tx,
+-	})?;
++	let (_rpc_handlers, telemetry_connection_notifier) = sc_service::spawn_tasks(
++		sc_service::SpawnTasksParams {
++			config,
++			backend: backend.clone(),
++			client: client.clone(),
++			keystore: keystore_container.sync_keystore(),
++			network: network.clone(),
++			rpc_extensions_builder: Box::new(rpc_extensions_builder),
++			transaction_pool: transaction_pool.clone(),
++			task_manager: &mut task_manager,
++			on_demand: None,
++			remote_blockchain: None,
++			network_status_sinks: network_status_sinks.clone(),
++			system_rpc_tx,
++		},
++	)?;
+
+ 	let (block_import, grandpa_link, babe_link) = import_setup;
+
+@@ -230,6 +248,7 @@ pub fn new_full_base(
+
+ 	if let sc_service::config::Role::Authority { .. } = &role {
+ 		let proposer = sc_basic_authorship::ProposerFactory::new(
++			task_manager.spawn_handle(),
+ 			client.clone(),
+ 			transaction_pool.clone(),
+ 			prometheus_registry.as_ref(),
+@@ -239,7 +258,7 @@ pub fn new_full_base(
+ 			sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone());
+
+ 		let babe_config = sc_consensus_babe::BabeParams {
+-			keystore: keystore.clone(),
++			keystore: keystore_container.sync_keystore(),
+ 			client: client.clone(),
+ 			select_chain,
+ 			env: proposer,
+@@ -247,6 +266,7 @@ pub fn new_full_base(
+ 			sync_oracle: network.clone(),
+ 			inherent_data_providers: inherent_data_providers.clone(),
+ 			force_authoring,
++			backoff_authoring_blocks,
+ 			babe_link,
+ 			can_author_with,
+ 		};
+@@ -256,42 +276,30 @@ pub fn new_full_base(
+ 	}
+
+ 	// Spawn authority discovery module.
+-	if matches!(role, Role::Authority{..} | Role::Sentry {..}) {
+-		let (sentries, authority_discovery_role) = match role {
+-			sc_service::config::Role::Authority { ref sentry_nodes } => (
+-				sentry_nodes.clone(),
+-				sc_authority_discovery::Role::Authority (
+-					keystore.clone(),
+-				),
+-			),
+-			sc_service::config::Role::Sentry {..} => (
+-				vec![],
+-				sc_authority_discovery::Role::Sentry,
+-			),
+-			_ => unreachable!("Due to outer matches! constraint; qed.")
+-		};
+-
++	if role.is_authority() {
++		let authority_discovery_role = sc_authority_discovery::Role::PublishAndDiscover(
++			keystore_container.keystore(),
++		);
+ 		let dht_event_stream = network.event_stream("authority-discovery")
+ 			.filter_map(|e| async move { match e {
+ 				Event::Dht(e) => Some(e),
+ 				_ => None,
+-			}}).boxed();
++			}});
+ 		let (authority_discovery_worker, _service) = sc_authority_discovery::new_worker_and_service(
+ 			client.clone(),
+ 			network.clone(),
+-			sentries,
+-			dht_event_stream,
++			Box::pin(dht_event_stream),
+ 			authority_discovery_role,
+ 			prometheus_registry.clone(),
+ 		);
+
+-		task_manager.spawn_handle().spawn("authority-discovery-worker", authority_discovery_worker);
++		task_manager.spawn_handle().spawn("authority-discovery-worker", authority_discovery_worker.run());
+ 	}
+
+ 	// 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 role.is_authority() {
+-		Some(keystore as BareCryptoStorePtr)
++		Some(keystore_container.sync_keystore())
+ 	} else {
+ 		None
+ 	};
+@@ -317,8 +325,7 @@ pub fn new_full_base(
+ 			config,
+ 			link: grandpa_link,
+ 			network: network.clone(),
+-			inherent_data_providers: inherent_data_providers.clone(),
+-			telemetry_on_connect: Some(telemetry_connection_sinks.on_connect_stream()),
++			telemetry_on_connect: telemetry_connection_notifier.map(|x| x.on_connect_stream()),
+ 			voting_rule: grandpa::VotingRulesBuilder::default().build(),
+ 			prometheus_registry,
+ 			shared_voter_state,
+@@ -330,17 +337,15 @@ pub fn new_full_base(
+ 			"grandpa-voter",
+ 			grandpa::run_grandpa_voter(grandpa_config)?
+ 		);
+-	} else {
+-		grandpa::setup_disabled_grandpa(
+-			client.clone(),
+-			&inherent_data_providers,
+-			network.clone(),
+-		)?;
+ 	}
+
+ 	network_starter.start_network();
+ 	Ok(NewFullBase {
+-		task_manager, inherent_data_providers, client, network, network_status_sinks,
++		task_manager,
++		inherent_data_providers,
++		client,
++		network,
++		network_status_sinks,
+ 		transaction_pool,
+ 	})
+ }
+@@ -353,14 +358,16 @@ pub fn new_full(config: Configuration)
+ 	})
+ }
+
+-pub fn new_light_base(config: Configuration) -> Result<(
+-	TaskManager, RpcHandlers, Arc<LightClient>,
++pub fn new_light_base(mut config: Configuration) -> Result<(
++	TaskManager, RpcHandlers, Option<TelemetryConnectionNotifier>, Arc<LightClient>,
+ 	Arc<NetworkService<Block, <Block as BlockT>::Hash>>,
+ 	Arc<sc_transaction_pool::LightPool<Block, LightClient, sc_network::config::OnDemand<Block>>>
+ ), ServiceError> {
+-	let (client, backend, keystore, mut task_manager, on_demand) =
++	let (client, backend, keystore_container, mut task_manager, on_demand) =
+ 		sc_service::new_light_parts::<Block, RuntimeApi, Executor>(&config)?;
+
++	config.network.extra_sets.push(grandpa::grandpa_peers_set_config());
++
+ 	let select_chain = sc_consensus::LongestChain::new(backend.clone());
+
+ 	let transaction_pool = Arc::new(sc_transaction_pool::BasicPool::new_light(
+@@ -371,14 +378,12 @@ pub fn new_light_base(config: Configuration) -> Result<(
+ 		on_demand.clone(),
+ 	));
+
+-	let grandpa_block_import = grandpa::light_block_import(
+-		client.clone(), backend.clone(), &(client.clone() as Arc<_>),
+-		Arc::new(on_demand.checker().clone()),
++	let (grandpa_block_import, _) = grandpa::block_import(
++		client.clone(),
++		&(client.clone() as Arc<_>),
++		select_chain.clone(),
+ 	)?;
+-
+-	let finality_proof_import = grandpa_block_import.clone();
+-	let finality_proof_request_builder =
+-		finality_proof_import.create_finality_proof_request_builder();
++	let justification_import = grandpa_block_import.clone();
+
+ 	let (babe_block_import, babe_link) = sc_consensus_babe::block_import(
+ 		sc_consensus_babe::Config::get_or_compute(&*client)?,
+@@ -391,8 +396,7 @@ pub fn new_light_base(config: Configuration) -> Result<(
+ 	let import_queue = sc_consensus_babe::import_queue(
+ 		babe_link,
+ 		babe_block_import,
+-		None,
+-		Some(Box::new(finality_proof_import)),
++		Some(Box::new(justification_import)),
+ 		client.clone(),
+ 		select_chain.clone(),
+ 		inherent_data_providers.clone(),
+@@ -401,9 +405,6 @@ pub fn new_light_base(config: Configuration) -> Result<(
+ 		sp_consensus::NeverCanAuthor,
+ 	)?;
+
+-	let finality_proof_provider =
+-		GrandpaFinalityProofProvider::new_for_service(backend.clone(), client.clone());
+-
+ 	let (network, network_status_sinks, system_rpc_tx, network_starter) =
+ 		sc_service::build_network(sc_service::BuildNetworkParams {
+ 			config: &config,
+@@ -413,8 +414,6 @@ pub fn new_light_base(config: Configuration) -> Result<(
+ 			import_queue,
+ 			on_demand: Some(on_demand.clone()),
+ 			block_announce_validator_builder: None,
+-			finality_proof_request_builder: Some(finality_proof_request_builder),
+-			finality_proof_provider: Some(finality_proof_provider),
+ 		})?;
+ 	network_starter.start_network();
+
+@@ -433,32 +432,39 @@ pub fn new_light_base(config: Configuration) -> Result<(
+
+ 	let rpc_extensions = node_rpc::create_light(light_deps);
+
+-	let rpc_handlers =
++	let (rpc_handlers, telemetry_connection_notifier) =
+ 		sc_service::spawn_tasks(sc_service::SpawnTasksParams {
+ 			on_demand: Some(on_demand),
+ 			remote_blockchain: Some(backend.remote_blockchain()),
+ 			rpc_extensions_builder: Box::new(sc_service::NoopRpcExtensionBuilder(rpc_extensions)),
+ 			client: client.clone(),
+ 			transaction_pool: transaction_pool.clone(),
+-			config, keystore, backend, network_status_sinks, system_rpc_tx,
++			keystore: keystore_container.sync_keystore(),
++			config, backend, network_status_sinks, system_rpc_tx,
+ 			network: network.clone(),
+-			telemetry_connection_sinks: sc_service::TelemetryConnectionSinks::default(),
+ 			task_manager: &mut task_manager,
+ 		})?;
+
+-	Ok((task_manager, rpc_handlers, client, network, transaction_pool))
++	Ok((
++		task_manager,
++		rpc_handlers,
++		telemetry_connection_notifier,
++		client,
++		network,
++		transaction_pool,
++	))
+ }
+
+ /// Builds a new service for a light client.
+ pub fn new_light(config: Configuration) -> Result<TaskManager, ServiceError> {
+-	new_light_base(config).map(|(task_manager, _, _, _, _)| {
++	new_light_base(config).map(|(task_manager, _, _, _, _, _)| {
+ 		task_manager
+ 	})
+ }
+
+ #[cfg(test)]
+ mod tests {
+-	use std::{sync::Arc, borrow::Cow, any::Any};
++	use std::{sync::Arc, borrow::Cow, any::Any, convert::TryInto};
+ 	use sc_consensus_babe::{CompatibleDigestItem, BabeIntermediate, INTERMEDIATE_KEY};
+ 	use sc_consensus_epochs::descendent_query;
+ 	use sp_consensus::{
+@@ -469,20 +475,25 @@ mod tests {
+ 	use node_runtime::{BalancesCall, Call, UncheckedExtrinsic, Address};
+ 	use node_runtime::constants::{currency::CENTS, time::SLOT_DURATION};
+ 	use codec::Encode;
+-	use sp_core::{crypto::Pair as CryptoPair, H256};
++	use sp_core::{
++		crypto::Pair as CryptoPair,
++		H256,
++		Public
++	};
++	use sp_keystore::{SyncCryptoStorePtr, SyncCryptoStore};
+ 	use sp_runtime::{
+ 		generic::{BlockId, Era, Digest, SignedPayload},
+ 		traits::{Block as BlockT, Header as HeaderT},
+ 		traits::Verify,
+ 	};
+ 	use sp_timestamp;
+-	use sp_finality_tracker;
+ 	use sp_keyring::AccountKeyring;
+ 	use sc_service_test::TestNetNode;
+ 	use crate::service::{new_full_base, new_light_base, NewFullBase};
+-	use sp_runtime::traits::IdentifyAccount;
++	use sp_runtime::{key_types::BABE, traits::IdentifyAccount, RuntimeAppPublic};
+ 	use sp_transaction_pool::{MaintainedTransactionPool, ChainEvent};
+ 	use sc_client_api::BlockBackend;
++	use sc_keystore::LocalKeystore;
+
+ 	type AccountPublic = <Signature as Verify>::Signer;
+
+@@ -492,15 +503,15 @@ mod tests {
+ 	#[ignore]
+ 	fn test_sync() {
+ 		let keystore_path = tempfile::tempdir().expect("Creates keystore path");
+-		let keystore = sc_keystore::Store::open(keystore_path.path(), None)
+-			.expect("Creates keystore");
+-		let alice = keystore.write().insert_ephemeral_from_seed::<sc_consensus_babe::AuthorityPair>("//Alice")
+-			.expect("Creates authority pair");
++		let keystore: SyncCryptoStorePtr = Arc::new(LocalKeystore::open(keystore_path.path(), None)
++			.expect("Creates keystore"));
++		let alice: sp_consensus_babe::AuthorityId = SyncCryptoStore::sr25519_generate_new(&*keystore, BABE, Some("//Alice"))
++			.expect("Creates authority pair").into();
+
+ 		let chain_spec = crate::chain_spec::tests::integration_test_config_with_single_authority();
+
+ 		// For the block factory
+-		let mut slot_num = 1u64;
++		let mut slot = 1u64;
+
+ 		// For the extrinsics factory
+ 		let bob = Arc::new(AccountKeyring::Bob.pair());
+@@ -528,14 +539,13 @@ mod tests {
+ 				Ok((node, (inherent_data_providers, setup_handles.unwrap())))
+ 			},
+ 			|config| {
+-				let (keep_alive, _, client, network, transaction_pool) = new_light_base(config)?;
++				let (keep_alive, _, _, client, network, transaction_pool) = new_light_base(config)?;
+ 				Ok(sc_service_test::TestNetComponents::new(keep_alive, client, network, transaction_pool))
+ 			},
+ 			|service, &mut (ref inherent_data_providers, (ref mut block_import, ref babe_link))| {
+ 				let mut inherent_data = inherent_data_providers
+ 					.create_inherent_data()
+ 					.expect("Creates inherent data.");
+-				inherent_data.replace_data(sp_finality_tracker::INHERENT_IDENTIFIER, &1u64);
+
+ 				let parent_id = BlockId::number(service.client().chain_info().best_number);
+ 				let parent_header = service.client().header(&parent_id).unwrap().unwrap();
+@@ -552,6 +562,7 @@ mod tests {
+ 				);
+
+ 				let mut proposer_factory = sc_basic_authorship::ProposerFactory::new(
++					service.spawn_handle(),
+ 					service.client(),
+ 					service.transaction_pool(),
+ 					None,
+@@ -561,7 +572,7 @@ mod tests {
+ 					descendent_query(&*service.client()),
+ 					&parent_hash,
+ 					parent_number,
+-					slot_num,
++					slot.into(),
+ 				).unwrap().unwrap();
+
+ 				let mut digest = Digest::<H256>::default();
+@@ -569,18 +580,18 @@ mod tests {
+ 				// even though there's only one authority some slots might be empty,
+ 				// so we must keep trying the next slots until we can claim one.
+ 				let babe_pre_digest = loop {
+-					inherent_data.replace_data(sp_timestamp::INHERENT_IDENTIFIER, &(slot_num * SLOT_DURATION));
++					inherent_data.replace_data(sp_timestamp::INHERENT_IDENTIFIER, &(slot * SLOT_DURATION));
+ 					if let Some(babe_pre_digest) = sc_consensus_babe::test_helpers::claim_slot(
+-						slot_num,
++						slot.into(),
+ 						&parent_header,
+ 						&*service.client(),
+-						&keystore,
++						keystore.clone(),
+ 						&babe_link,
+ 					) {
+ 						break babe_pre_digest;
+ 					}
+
+-					slot_num += 1;
++					slot += 1;
+ 				};
+
+ 				digest.push(<DigestItem as CompatibleDigestItem>::babe_pre_digest(babe_pre_digest));
+@@ -600,11 +611,18 @@ mod tests {
+ 				// sign the pre-sealed hash of the block and then
+ 				// add it to a digest item.
+ 				let to_sign = pre_hash.encode();
+-				let signature = alice.sign(&to_sign[..]);
++				let signature = SyncCryptoStore::sign_with(
++					&*keystore,
++					sp_consensus_babe::AuthorityId::ID,
++					&alice.to_public_crypto_pair(),
++					&to_sign,
++				).unwrap()
++				 .try_into()
++				 .unwrap();
+ 				let item = <DigestItem as CompatibleDigestItem>::babe_seal(
+-					signature.into(),
++					signature,
+ 				);
+-				slot_num += 1;
++				slot += 1;
+
+ 				let mut params = BlockImportParams::new(BlockOrigin::File, new_header);
+ 				params.post_digests.push(item);
+@@ -679,7 +697,7 @@ mod tests {
+ 				Ok(sc_service_test::TestNetComponents::new(task_manager, client, network, transaction_pool))
+ 			},
+ 			|config| {
+-				let (keep_alive, _, client, network, transaction_pool) = new_light_base(config)?;
++				let (keep_alive, _, _, client, network, transaction_pool) = new_light_base(config)?;
+ 				Ok(sc_service_test::TestNetComponents::new(keep_alive, client, network, transaction_pool))
+ 			},
+ 			vec![
+```
diff --git a/frame/assets/Cargo.toml b/frame/assets/Cargo.toml
index 8c6c55b2d07e..67fa0af3d63b 100644
--- a/frame/assets/Cargo.toml
+++ b/frame/assets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-assets"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,20 +15,20 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 # Needed for various traits. In our case, `OnFinalize`.
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
 # Needed for type-safe access to storage DB.
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 # `system` module provides us with all sorts of useful stuff and macros depend on it being around.
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
-frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-sp-std = { version = "2.0.0", path = "../../primitives/std" }
-sp-io = { version = "2.0.0", path = "../../primitives/io" }
-pallet-balances = { version = "2.0.0", path = "../balances" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-std = { version = "3.0.0", path = "../../primitives/std" }
+sp-io = { version = "3.0.0", path = "../../primitives/io" }
+pallet-balances = { version = "3.0.0", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/frame/atomic-swap/Cargo.toml b/frame/atomic-swap/Cargo.toml
index 0f166c9be791..99ce41f39939 100644
--- a/frame/atomic-swap/Cargo.toml
+++ b/frame/atomic-swap/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-atomic-swap"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,15 +15,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
-sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
 
 [dev-dependencies]
-pallet-balances = { version = "2.0.0", path = "../balances" }
+pallet-balances = { version = "3.0.0", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/frame/aura/Cargo.toml b/frame/aura/Cargo.toml
index 9034e483f3d6..80ea164cf0f5 100644
--- a/frame/aura/Cargo.toml
+++ b/frame/aura/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-aura"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -13,21 +13,21 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-application-crypto = { version = "2.0.0", default-features = false, path = "../../primitives/application-crypto" }
+sp-application-crypto = { version = "3.0.0", default-features = false, path = "../../primitives/application-crypto" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 serde = { version = "1.0.101", optional = true }
-pallet-session = { version = "2.0.0", default-features = false, path = "../session" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-sp-consensus-aura = { version = "0.8.0", path = "../../primitives/consensus/aura", default-features = false }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
-sp-timestamp = { version = "2.0.0", default-features = false, path = "../../primitives/timestamp" }
-pallet-timestamp = { version = "2.0.0", default-features = false, path = "../timestamp" }
+pallet-session = { version = "3.0.0", default-features = false, path = "../session" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+sp-consensus-aura = { version = "0.9.0", path = "../../primitives/consensus/aura", default-features = false }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+sp-timestamp = { version = "3.0.0", default-features = false, path = "../../primitives/timestamp" }
+pallet-timestamp = { version = "3.0.0", default-features = false, path = "../timestamp" }
 
 [dev-dependencies]
-sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
-sp-io ={ version = "2.0.0", path = "../../primitives/io" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
+sp-io ={ version = "3.0.0", path = "../../primitives/io" }
 lazy_static = "1.4.0"
 parking_lot = "0.11.1"
 
diff --git a/frame/authority-discovery/Cargo.toml b/frame/authority-discovery/Cargo.toml
index 5b83de19a515..43a09b01fd45 100644
--- a/frame/authority-discovery/Cargo.toml
+++ b/frame/authority-discovery/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-authority-discovery"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -13,20 +13,20 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-authority-discovery = { version = "2.0.0", default-features = false, path = "../../primitives/authority-discovery" }
-sp-application-crypto = { version = "2.0.0", default-features = false, path = "../../primitives/application-crypto" }
+sp-authority-discovery = { version = "3.0.0", default-features = false, path = "../../primitives/authority-discovery" }
+sp-application-crypto = { version = "3.0.0", default-features = false, path = "../../primitives/application-crypto" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 serde = { version = "1.0.101", optional = true }
-pallet-session = { version = "2.0.0", features = ["historical" ], path = "../session", default-features = false }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
+pallet-session = { version = "3.0.0", features = ["historical" ], path = "../session", default-features = false }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 
 [dev-dependencies]
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-sp-io = { version = "2.0.0", path = "../../primitives/io" }
-sp-staking = { version = "2.0.0", default-features = false, path = "../../primitives/staking" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-io = { version = "3.0.0", path = "../../primitives/io" }
+sp-staking = { version = "3.0.0", default-features = false, path = "../../primitives/staking" }
 
 [features]
 default = ["std"]
diff --git a/frame/authorship/Cargo.toml b/frame/authorship/Cargo.toml
index 4489ee739103..ab48fbec8f50 100644
--- a/frame/authorship/Cargo.toml
+++ b/frame/authorship/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-authorship"
-version = "2.0.1"
+version = "3.0.0"
 description = "Block and Uncle Author tracking for the FRAME"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -14,17 +14,17 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-inherents = { version = "2.0.0", default-features = false, path = "../../primitives/inherents" }
-sp-authorship = { version = "2.0.0", default-features = false, path = "../../primitives/authorship" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
+sp-inherents = { version = "3.0.0", default-features = false, path = "../../primitives/inherents" }
+sp-authorship = { version = "3.0.0", default-features = false, path = "../../primitives/authorship" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 impl-trait-for-tuples = "0.2.1"
 
 [dev-dependencies]
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-sp-io ={ version = "2.0.0", path = "../../primitives/io" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-io ={ version = "3.0.0", path = "../../primitives/io" }
 serde = { version = "1.0.101" }
 
 [features]
diff --git a/frame/babe/Cargo.toml b/frame/babe/Cargo.toml
index 787835e33fe0..9bde93506241 100644
--- a/frame/babe/Cargo.toml
+++ b/frame/babe/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-babe"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,31 +14,31 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
-pallet-authorship = { version = "2.0.0", default-features = false, path = "../authorship" }
-pallet-session = { version = "2.0.0", default-features = false, path = "../session" }
-pallet-timestamp = { version = "2.0.0", default-features = false, path = "../timestamp" }
+frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+pallet-authorship = { version = "3.0.0", default-features = false, path = "../authorship" }
+pallet-session = { version = "3.0.0", default-features = false, path = "../session" }
+pallet-timestamp = { version = "3.0.0", default-features = false, path = "../timestamp" }
 serde = { version = "1.0.101", optional = true }
-sp-application-crypto = { version = "2.0.0", default-features = false, path = "../../primitives/application-crypto" }
-sp-consensus-babe = { version = "0.8.0", default-features = false, path = "../../primitives/consensus/babe" }
-sp-consensus-vrf = { version = "0.8.0", default-features = false, path = "../../primitives/consensus/vrf" }
-sp-inherents = { version = "2.0.0", default-features = false, path = "../../primitives/inherents" }
-sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-session = { version = "2.0.0", default-features = false, path = "../../primitives/session" }
-sp-staking = { version = "2.0.0", default-features = false, path = "../../primitives/staking" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-timestamp = { version = "2.0.0", default-features = false, path = "../../primitives/timestamp" }
+sp-application-crypto = { version = "3.0.0", default-features = false, path = "../../primitives/application-crypto" }
+sp-consensus-babe = { version = "0.9.0", default-features = false, path = "../../primitives/consensus/babe" }
+sp-consensus-vrf = { version = "0.9.0", default-features = false, path = "../../primitives/consensus/vrf" }
+sp-inherents = { version = "3.0.0", default-features = false, path = "../../primitives/inherents" }
+sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-session = { version = "3.0.0", default-features = false, path = "../../primitives/session" }
+sp-staking = { version = "3.0.0", default-features = false, path = "../../primitives/staking" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-timestamp = { version = "3.0.0", default-features = false, path = "../../primitives/timestamp" }
 
 [dev-dependencies]
-frame-benchmarking = { version = "2.0.0", path = "../benchmarking" }
-pallet-balances = { version = "2.0.0", path = "../balances" }
-pallet-offences = { version = "2.0.0", path = "../offences" }
-pallet-staking = { version = "2.0.0", path = "../staking" }
-pallet-staking-reward-curve = { version = "2.0.0", path = "../staking/reward-curve" }
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
+frame-benchmarking = { version = "3.0.0", path = "../benchmarking" }
+pallet-balances = { version = "3.0.0", path = "../balances" }
+pallet-offences = { version = "3.0.0", path = "../offences" }
+pallet-staking = { version = "3.0.0", path = "../staking" }
+pallet-staking-reward-curve = { version = "3.0.0", path = "../staking/reward-curve" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
 
 [features]
 default = ["std"]
diff --git a/frame/balances/Cargo.toml b/frame/balances/Cargo.toml
index 1105950ccfda..39b7fda77fef 100644
--- a/frame/balances/Cargo.toml
+++ b/frame/balances/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-balances"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,16 +15,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 
 [dev-dependencies]
-sp-io = { version = "2.0.0", path = "../../primitives/io" }
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-pallet-transaction-payment = { version = "2.0.0", path = "../transaction-payment" }
+sp-io = { version = "3.0.0", path = "../../primitives/io" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+pallet-transaction-payment = { version = "3.0.0", path = "../transaction-payment" }
 
 [features]
 default = ["std"]
diff --git a/frame/benchmarking/Cargo.toml b/frame/benchmarking/Cargo.toml
index 4fdb31dca5c6..41ab9efeced0 100644
--- a/frame/benchmarking/Cargo.toml
+++ b/frame/benchmarking/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-benchmarking"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -16,14 +16,14 @@ targets = ["x86_64-unknown-linux-gnu"]
 linregress = { version = "0.4.0", optional = true }
 paste = "1.0"
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-api = { version = "2.0.0", path = "../../primitives/api", default-features = false }
-sp-runtime-interface = { version = "2.0.0", path = "../../primitives/runtime-interface", default-features = false }
-sp-runtime = { version = "2.0.0", path = "../../primitives/runtime", default-features = false }
-sp-std = { version = "2.0.0", path = "../../primitives/std", default-features = false }
-sp-io = { version = "2.0.0", path = "../../primitives/io", default-features = false }
-sp-storage = { version = "2.0.0", path = "../../primitives/storage", default-features = false }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
+sp-api = { version = "3.0.0", path = "../../primitives/api", default-features = false }
+sp-runtime-interface = { version = "3.0.0", path = "../../primitives/runtime-interface", default-features = false }
+sp-runtime = { version = "3.0.0", path = "../../primitives/runtime", default-features = false }
+sp-std = { version = "3.0.0", path = "../../primitives/std", default-features = false }
+sp-io = { version = "3.0.0", path = "../../primitives/io", default-features = false }
+sp-storage = { version = "3.0.0", path = "../../primitives/storage", default-features = false }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 
 [dev-dependencies]
 hex-literal = "0.3.1"
diff --git a/frame/bounties/Cargo.toml b/frame/bounties/Cargo.toml
index 83a47087db49..ec4f1b94cd62 100644
--- a/frame/bounties/Cargo.toml
+++ b/frame/bounties/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-bounties"
-version = "2.0.0"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,19 +15,19 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
-pallet-treasury = { version = "2.0.0", default-features = false, path = "../treasury" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+pallet-treasury = { version = "3.0.0", default-features = false, path = "../treasury" }
 
-frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
-sp-io ={ version = "2.0.0", path = "../../primitives/io" }
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-sp-storage = { version = "2.0.0", path = "../../primitives/storage" }
-pallet-balances = { version = "2.0.0", path = "../balances" }
+sp-io ={ version = "3.0.0", path = "../../primitives/io" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-storage = { version = "3.0.0", path = "../../primitives/storage" }
+pallet-balances = { version = "3.0.0", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/frame/collective/Cargo.toml b/frame/collective/Cargo.toml
index 400321d7c70f..0c58f4164010 100644
--- a/frame/collective/Cargo.toml
+++ b/frame/collective/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-collective"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,17 +15,17 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 
 [dev-dependencies]
 hex-literal = "0.3.1"
-pallet-balances = { version = "2.0.0", path = "../balances" }
+pallet-balances = { version = "3.0.0", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/frame/contracts/Cargo.toml b/frame/contracts/Cargo.toml
index d9e4f0d0e7ed..c5ba615504c6 100644
--- a/frame/contracts/Cargo.toml
+++ b/frame/contracts/Cargo.toml
@@ -17,19 +17,19 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
+frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 pallet-contracts-primitives = { version = "2.0.0", default-features = false, path = "common" }
 pallet-contracts-proc-macro = { version = "0.1.0", path = "proc-macro" }
 parity-wasm = { version = "0.41.0", default-features = false }
 pwasm-utils = { version = "0.16", default-features = false }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-sandbox = { version = "0.8.0", default-features = false, path = "../../primitives/sandbox" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-sandbox = { version = "0.9.0", default-features = false, path = "../../primitives/sandbox" }
 wasmi-validation = { version = "0.3.0", default-features = false }
 
 # Only used in benchmarking to generate random contract code
@@ -39,9 +39,9 @@ rand_pcg = { version = "0.2.1", optional = true }
 [dev-dependencies]
 assert_matches = "1.3.0"
 hex-literal = "0.3.1"
-pallet-balances = { version = "2.0.0", path = "../balances" }
-pallet-timestamp = { version = "2.0.0", path = "../timestamp" }
-pallet-randomness-collective-flip = { version = "2.0.0", path = "../randomness-collective-flip" }
+pallet-balances = { version = "3.0.0", path = "../balances" }
+pallet-timestamp = { version = "3.0.0", path = "../timestamp" }
+pallet-randomness-collective-flip = { version = "3.0.0", path = "../randomness-collective-flip" }
 paste = "1.0"
 pretty_assertions = "0.6.1"
 wat = "1.0"
diff --git a/frame/contracts/common/Cargo.toml b/frame/contracts/common/Cargo.toml
index 8ef6022db9f0..f385a7ae9f2f 100644
--- a/frame/contracts/common/Cargo.toml
+++ b/frame/contracts/common/Cargo.toml
@@ -17,8 +17,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 # This crate should not rely on any of the frame primitives.
 bitflags = "1.0"
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "2.0.0", default-features = false, path = "../../../primitives/std" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../../primitives/runtime" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../../primitives/std" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
 
 [features]
 default = ["std"]
diff --git a/frame/contracts/rpc/Cargo.toml b/frame/contracts/rpc/Cargo.toml
index c714f0002a82..06c3c7d243e0 100644
--- a/frame/contracts/rpc/Cargo.toml
+++ b/frame/contracts/rpc/Cargo.toml
@@ -18,12 +18,12 @@ codec = { package = "parity-scale-codec", version = "2.0.0" }
 jsonrpc-core = "15.1.0"
 jsonrpc-core-client = "15.1.0"
 jsonrpc-derive = "15.1.0"
-sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
-sp-core = { version = "2.0.0", path = "../../../primitives/core" }
-sp-rpc = { version = "2.0.0", path = "../../../primitives/rpc" }
+sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
+sp-core = { version = "3.0.0", path = "../../../primitives/core" }
+sp-rpc = { version = "3.0.0", path = "../../../primitives/rpc" }
 serde = { version = "1.0.101", features = ["derive"] }
-sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
-sp-api = { version = "2.0.0", path = "../../../primitives/api" }
+sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
+sp-api = { version = "3.0.0", path = "../../../primitives/api" }
 pallet-contracts-primitives = { version = "2.0.0", path = "../common" }
 pallet-contracts-rpc-runtime-api = { version = "0.8.0", path = "./runtime-api" }
 
diff --git a/frame/contracts/rpc/runtime-api/Cargo.toml b/frame/contracts/rpc/runtime-api/Cargo.toml
index 7d7c7bd4f5ed..0794fee29284 100644
--- a/frame/contracts/rpc/runtime-api/Cargo.toml
+++ b/frame/contracts/rpc/runtime-api/Cargo.toml
@@ -14,10 +14,10 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-api = { version = "2.0.0", default-features = false, path = "../../../../primitives/api" }
+sp-api = { version = "3.0.0", default-features = false, path = "../../../../primitives/api" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "2.0.0", default-features = false, path = "../../../../primitives/std" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../../../primitives/runtime" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../../../primitives/std" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../../../primitives/runtime" }
 pallet-contracts-primitives = { version = "2.0.0", default-features = false, path = "../../common" }
 
 [features]
diff --git a/frame/democracy/Cargo.toml b/frame/democracy/Cargo.toml
index 6a67b9545185..2e675dd25188 100644
--- a/frame/democracy/Cargo.toml
+++ b/frame/democracy/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-democracy"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,19 +15,19 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 
 [dev-dependencies]
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-pallet-balances = { version = "2.0.0", path = "../balances" }
-pallet-scheduler = { version = "2.0.0", path = "../scheduler" }
-sp-storage = { version = "2.0.0", path = "../../primitives/storage" }
-substrate-test-utils = { version = "2.0.0", path = "../../test-utils" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+pallet-balances = { version = "3.0.0", path = "../balances" }
+pallet-scheduler = { version = "3.0.0", path = "../scheduler" }
+sp-storage = { version = "3.0.0", path = "../../primitives/storage" }
+substrate-test-utils = { version = "3.0.0", path = "../../test-utils" }
 hex-literal = "0.3.1"
 
 [features]
diff --git a/frame/elections-phragmen/Cargo.toml b/frame/elections-phragmen/Cargo.toml
index 2103196ce558..bdb301c73ec3 100644
--- a/frame/elections-phragmen/Cargo.toml
+++ b/frame/elections-phragmen/Cargo.toml
@@ -15,19 +15,19 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.101", optional = true }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-npos-elections = { version = "2.0.0", default-features = false, path = "../../primitives/npos-elections" }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-npos-elections = { version = "3.0.0", default-features = false, path = "../../primitives/npos-elections" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
-sp-io = { version = "2.0.0", path = "../../primitives/io" }
+sp-io = { version = "3.0.0", path = "../../primitives/io" }
 hex-literal = "0.3.1"
-pallet-balances = { version = "2.0.0", path = "../balances" }
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-substrate-test-utils = { version = "2.0.0", path = "../../test-utils" }
+pallet-balances = { version = "3.0.0", path = "../balances" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+substrate-test-utils = { version = "3.0.0", path = "../../test-utils" }
 
 [features]
 default = ["std"]
diff --git a/frame/elections/Cargo.toml b/frame/elections/Cargo.toml
index becb519be0a9..a13c6d7567f0 100644
--- a/frame/elections/Cargo.toml
+++ b/frame/elections/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-elections"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,16 +15,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 
 [dev-dependencies]
 hex-literal = "0.3.1"
-pallet-balances = { version = "2.0.0", path = "../balances" }
+pallet-balances = { version = "3.0.0", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/frame/example-offchain-worker/Cargo.toml b/frame/example-offchain-worker/Cargo.toml
index db52d4760670..5a2db258f8a1 100644
--- a/frame/example-offchain-worker/Cargo.toml
+++ b/frame/example-offchain-worker/Cargo.toml
@@ -14,14 +14,14 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 serde = { version = "1.0.101", optional = true }
-sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
-sp-keystore = { version = "0.8.0", path = "../../primitives/keystore", optional = true }
-sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
+sp-keystore = { version = "0.9.0", path = "../../primitives/keystore", optional = true }
+sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 lite-json = { version = "0.1", default-features = false }
 
 [features]
diff --git a/frame/example-parallel/Cargo.toml b/frame/example-parallel/Cargo.toml
index 24e51ba9ed3a..b2f28887cec0 100644
--- a/frame/example-parallel/Cargo.toml
+++ b/frame/example-parallel/Cargo.toml
@@ -13,13 +13,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
-sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
-sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-tasks = { version = "2.0.0", default-features = false, path = "../../primitives/tasks" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
+sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-tasks = { version = "3.0.0", default-features = false, path = "../../primitives/tasks" }
 
 [dev-dependencies]
 serde = { version = "1.0.101" }
diff --git a/frame/example/Cargo.toml b/frame/example/Cargo.toml
index 59828c3eae83..c6dfc018b3f5 100644
--- a/frame/example/Cargo.toml
+++ b/frame/example/Cargo.toml
@@ -15,17 +15,17 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
-pallet-balances = { version = "2.0.0", default-features = false, path = "../balances" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+pallet-balances = { version = "3.0.0", default-features = false, path = "../balances" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
 
-frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
-sp-core = { version = "2.0.0", path = "../../primitives/core", default-features = false }
+sp-core = { version = "3.0.0", path = "../../primitives/core", default-features = false }
 
 [features]
 default = ["std"]
diff --git a/frame/executive/Cargo.toml b/frame/executive/Cargo.toml
index 6ee378b222ca..31f1f34174ed 100644
--- a/frame/executive/Cargo.toml
+++ b/frame/executive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-executive"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,23 +14,23 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 serde = { version = "1.0.101", optional = true }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-tracing = { version = "2.0.0", default-features = false, path = "../../primitives/tracing" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
-sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-tracing = { version = "3.0.0", default-features = false, path = "../../primitives/tracing" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
 
 [dev-dependencies]
 hex-literal = "0.3.1"
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-sp-io ={ version = "2.0.0", path = "../../primitives/io" }
-pallet-indices = { version = "2.0.0", path = "../indices" }
-pallet-balances = { version = "2.0.0", path = "../balances" }
-pallet-transaction-payment = { version = "2.0.0", path = "../transaction-payment" }
-sp-version = { version = "2.0.0", path = "../../primitives/version" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-io ={ version = "3.0.0", path = "../../primitives/io" }
+pallet-indices = { version = "3.0.0", path = "../indices" }
+pallet-balances = { version = "3.0.0", path = "../balances" }
+pallet-transaction-payment = { version = "3.0.0", path = "../transaction-payment" }
+sp-version = { version = "3.0.0", path = "../../primitives/version" }
 
 [features]
 default = ["std"]
diff --git a/frame/grandpa/Cargo.toml b/frame/grandpa/Cargo.toml
index f4d11543797c..a9ba0ccc56f3 100644
--- a/frame/grandpa/Cargo.toml
+++ b/frame/grandpa/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-grandpa"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,29 +15,29 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-application-crypto = { version = "2.0.0", default-features = false, path = "../../primitives/application-crypto" }
-sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
-sp-finality-grandpa = { version = "2.0.0", default-features = false, path = "../../primitives/finality-grandpa" }
-sp-session = { version = "2.0.0", default-features = false, path = "../../primitives/session" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-staking = { version = "2.0.0", default-features = false, path = "../../primitives/staking" }
-frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
-pallet-authorship = { version = "2.0.0", default-features = false, path = "../authorship" }
-pallet-session = { version = "2.0.0", default-features = false, path = "../session" }
+sp-application-crypto = { version = "3.0.0", default-features = false, path = "../../primitives/application-crypto" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
+sp-finality-grandpa = { version = "3.0.0", default-features = false, path = "../../primitives/finality-grandpa" }
+sp-session = { version = "3.0.0", default-features = false, path = "../../primitives/session" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-staking = { version = "3.0.0", default-features = false, path = "../../primitives/staking" }
+frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+pallet-authorship = { version = "3.0.0", default-features = false, path = "../authorship" }
+pallet-session = { version = "3.0.0", default-features = false, path = "../session" }
 
 [dev-dependencies]
-frame-benchmarking = { version = "2.0.0", path = "../benchmarking" }
+frame-benchmarking = { version = "3.0.0", path = "../benchmarking" }
 grandpa = { package = "finality-grandpa", version = "0.13.0", features = ["derive-codec"] }
-sp-io = { version = "2.0.0", path = "../../primitives/io" }
-sp-keyring = { version = "2.0.0", path = "../../primitives/keyring" }
-pallet-balances = { version = "2.0.0", path = "../balances" }
-pallet-offences = { version = "2.0.0", path = "../offences" }
-pallet-staking = { version = "2.0.0", path = "../staking" }
-pallet-staking-reward-curve = { version = "2.0.0", path = "../staking/reward-curve" }
-pallet-timestamp = { version = "2.0.0", path = "../timestamp" }
+sp-io = { version = "3.0.0", path = "../../primitives/io" }
+sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
+pallet-balances = { version = "3.0.0", path = "../balances" }
+pallet-offences = { version = "3.0.0", path = "../offences" }
+pallet-staking = { version = "3.0.0", path = "../staking" }
+pallet-staking-reward-curve = { version = "3.0.0", path = "../staking/reward-curve" }
+pallet-timestamp = { version = "3.0.0", path = "../timestamp" }
 
 [features]
 default = ["std"]
diff --git a/frame/identity/Cargo.toml b/frame/identity/Cargo.toml
index 982df0a0e5ed..3fd0c30a0f83 100644
--- a/frame/identity/Cargo.toml
+++ b/frame/identity/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-identity"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -16,16 +16,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 enumflags2 = { version = "0.6.2" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 
 [dev-dependencies]
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-pallet-balances = { version = "2.0.0", path = "../balances" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+pallet-balances = { version = "3.0.0", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/frame/im-online/Cargo.toml b/frame/im-online/Cargo.toml
index 41eb433478d4..bde041c43764 100644
--- a/frame/im-online/Cargo.toml
+++ b/frame/im-online/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-im-online"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -13,22 +13,22 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-application-crypto = { version = "2.0.0", default-features = false, path = "../../primitives/application-crypto" }
-pallet-authorship = { version = "2.0.0", default-features = false, path = "../authorship" }
+sp-application-crypto = { version = "3.0.0", default-features = false, path = "../../primitives/application-crypto" }
+pallet-authorship = { version = "3.0.0", default-features = false, path = "../authorship" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 serde = { version = "1.0.101", optional = true }
-sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-staking = { version = "2.0.0", default-features = false, path = "../../primitives/staking" }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
+sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-staking = { version = "3.0.0", default-features = false, path = "../../primitives/staking" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 
-frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
-pallet-session = { version = "2.0.0", path = "../session" }
+pallet-session = { version = "3.0.0", path = "../session" }
 
 [features]
 default = ["std"]
diff --git a/frame/indices/Cargo.toml b/frame/indices/Cargo.toml
index cc5bc67c35dc..cde3cdeeecba 100644
--- a/frame/indices/Cargo.toml
+++ b/frame/indices/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-indices"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,18 +15,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-keyring = { version = "2.0.0", optional = true, path = "../../primitives/keyring" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
+sp-keyring = { version = "3.0.0", optional = true, path = "../../primitives/keyring" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 
-frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
-pallet-balances = { version = "2.0.0", path = "../balances" }
+pallet-balances = { version = "3.0.0", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/frame/lottery/Cargo.toml b/frame/lottery/Cargo.toml
index e571b4f450a6..05bb7e385f5d 100644
--- a/frame/lottery/Cargo.toml
+++ b/frame/lottery/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-lottery"
-version = "2.0.0"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,17 +14,17 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 
-frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
-pallet-balances = { version = "2.0.0", path = "../balances" }
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-sp-io = { version = "2.0.0", path = "../../primitives/io" }
+pallet-balances = { version = "3.0.0", path = "../balances" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-io = { version = "3.0.0", path = "../../primitives/io" }
 serde = { version = "1.0.101" }
 
 [features]
diff --git a/frame/membership/Cargo.toml b/frame/membership/Cargo.toml
index ba46b555afac..98987e6fe901 100644
--- a/frame/membership/Cargo.toml
+++ b/frame/membership/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-membership"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,14 +15,14 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
 
 [dev-dependencies]
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
 
 [features]
 default = ["std"]
diff --git a/frame/merkle-mountain-range/Cargo.toml b/frame/merkle-mountain-range/Cargo.toml
index dc71b6b412d0..eea3845ae16d 100644
--- a/frame/merkle-mountain-range/Cargo.toml
+++ b/frame/merkle-mountain-range/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-mmr"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -13,16 +13,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
+frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 mmr-lib = { package = "ckb-merkle-mountain-range", default-features = false, version = "0.3.1" }
-pallet-mmr-primitives = { version = "2.0.0", default-features = false, path = "./primitives" }
+pallet-mmr-primitives = { version = "3.0.0", default-features = false, path = "./primitives" }
 serde = { version = "1.0.101", optional = true }
-sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
-sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
+sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 
 [dev-dependencies]
 env_logger = "0.8"
diff --git a/frame/merkle-mountain-range/primitives/Cargo.toml b/frame/merkle-mountain-range/primitives/Cargo.toml
index 9f8eb9a1c2d8..be0a8bdc3a2b 100644
--- a/frame/merkle-mountain-range/primitives/Cargo.toml
+++ b/frame/merkle-mountain-range/primitives/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-mmr-primitives"
-version = "2.0.0"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -13,13 +13,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-frame-support = { version = "2.0.0", default-features = false, path = "../../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../../system" }
+frame-support = { version = "3.0.0", default-features = false, path = "../../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../../system" }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-sp-api = { version = "2.0.0", default-features = false, path = "../../../primitives/api" }
-sp-core = { version = "2.0.0", default-features = false, path = "../../../primitives/core" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../../primitives/runtime" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../../primitives/std" }
+sp-api = { version = "3.0.0", default-features = false, path = "../../../primitives/api" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../../primitives/core" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../../primitives/std" }
 
 [dev-dependencies]
 hex-literal = "0.3"
diff --git a/frame/metadata/Cargo.toml b/frame/metadata/Cargo.toml
index 3965e581b378..cede8a836123 100644
--- a/frame/metadata/Cargo.toml
+++ b/frame/metadata/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-metadata"
-version = "12.0.1"
+version = "13.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,8 +15,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
 
 [features]
 default = ["std"]
diff --git a/frame/multisig/Cargo.toml b/frame/multisig/Cargo.toml
index 33289f98ec14..e8d625138371 100644
--- a/frame/multisig/Cargo.toml
+++ b/frame/multisig/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-multisig"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,18 +15,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
-sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
 
-frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-pallet-balances = { version = "2.0.0", path = "../balances" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+pallet-balances = { version = "3.0.0", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/frame/nicks/Cargo.toml b/frame/nicks/Cargo.toml
index aaba763e4d12..611f492b81f2 100644
--- a/frame/nicks/Cargo.toml
+++ b/frame/nicks/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-nicks"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,15 +15,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 
 [dev-dependencies]
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-pallet-balances = { version = "2.0.0", path = "../balances" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+pallet-balances = { version = "3.0.0", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/frame/node-authorization/Cargo.toml b/frame/node-authorization/Cargo.toml
index b0a7eefc6c64..db77f25c1887 100644
--- a/frame/node-authorization/Cargo.toml
+++ b/frame/node-authorization/Cargo.toml
@@ -14,12 +14,12 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
-sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
-sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
+sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 
 [features]
 default = ["std"]
diff --git a/frame/offences/Cargo.toml b/frame/offences/Cargo.toml
index 17df3d0a2b4a..3232d5f3ae5d 100644
--- a/frame/offences/Cargo.toml
+++ b/frame/offences/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-offences"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -13,18 +13,18 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-pallet-balances = { version = "2.0.0", default-features = false, path = "../balances" }
+pallet-balances = { version = "3.0.0", default-features = false, path = "../balances" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 serde = { version = "1.0.101", optional = true }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-staking = { version = "2.0.0", default-features = false, path = "../../primitives/staking" }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-staking = { version = "3.0.0", default-features = false, path = "../../primitives/staking" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 
 [dev-dependencies]
-sp-io = { version = "2.0.0", path = "../../primitives/io" }
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
+sp-io = { version = "3.0.0", path = "../../primitives/io" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
 
 [features]
 default = ["std"]
diff --git a/frame/offences/benchmarking/Cargo.toml b/frame/offences/benchmarking/Cargo.toml
index 0199d23d3858..a27b6c3012e3 100644
--- a/frame/offences/benchmarking/Cargo.toml
+++ b/frame/offences/benchmarking/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-offences-benchmarking"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,26 +14,26 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-frame-benchmarking = { version = "2.0.0", default-features = false, path = "../../benchmarking" }
-frame-support = { version = "2.0.0", default-features = false, path = "../../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../../system" }
-pallet-babe = { version = "2.0.0", default-features = false, path = "../../babe" }
-pallet-balances = { version = "2.0.0", default-features = false, path = "../../balances" }
-pallet-grandpa = { version = "2.0.0", default-features = false, path = "../../grandpa" }
-pallet-im-online = { version = "2.0.0", default-features = false, path = "../../im-online" }
-pallet-offences = { version = "2.0.0", default-features = false, features = ["runtime-benchmarks"], path = "../../offences" }
-pallet-session = { version = "2.0.0", default-features = false, path = "../../session" }
-pallet-staking = { version = "2.0.0", default-features = false, features = ["runtime-benchmarks"], path = "../../staking" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../../primitives/runtime" }
-sp-staking = { version = "2.0.0", default-features = false, path = "../../../primitives/staking" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../../primitives/std" }
+frame-benchmarking = { version = "3.0.0", default-features = false, path = "../../benchmarking" }
+frame-support = { version = "3.0.0", default-features = false, path = "../../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../../system" }
+pallet-babe = { version = "3.0.0", default-features = false, path = "../../babe" }
+pallet-balances = { version = "3.0.0", default-features = false, path = "../../balances" }
+pallet-grandpa = { version = "3.0.0", default-features = false, path = "../../grandpa" }
+pallet-im-online = { version = "3.0.0", default-features = false, path = "../../im-online" }
+pallet-offences = { version = "3.0.0", default-features = false, features = ["runtime-benchmarks"], path = "../../offences" }
+pallet-session = { version = "3.0.0", default-features = false, path = "../../session" }
+pallet-staking = { version = "3.0.0", default-features = false, features = ["runtime-benchmarks"], path = "../../staking" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
+sp-staking = { version = "3.0.0", default-features = false, path = "../../../primitives/staking" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../../primitives/std" }
 
 [dev-dependencies]
-pallet-staking-reward-curve = { version = "2.0.0", path = "../../staking/reward-curve" }
-pallet-timestamp = { version = "2.0.0", path = "../../timestamp" }
+pallet-staking-reward-curve = { version = "3.0.0", path = "../../staking/reward-curve" }
+pallet-timestamp = { version = "3.0.0", path = "../../timestamp" }
 serde = { version = "1.0.101" }
-sp-core = { version = "2.0.0", path = "../../../primitives/core" }
-sp-io = { version = "2.0.0", path = "../../../primitives/io" }
+sp-core = { version = "3.0.0", path = "../../../primitives/core" }
+sp-io = { version = "3.0.0", path = "../../../primitives/io" }
 
 [features]
 default = ["std"]
diff --git a/frame/proxy/Cargo.toml b/frame/proxy/Cargo.toml
index fff6aab6abfd..9490364abd87 100644
--- a/frame/proxy/Cargo.toml
+++ b/frame/proxy/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-proxy"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,19 +15,19 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
-sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
-sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
+sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 
-frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-pallet-balances = { version = "2.0.0", path = "../balances" }
-pallet-utility = { version = "2.0.0", path = "../utility" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+pallet-balances = { version = "3.0.0", path = "../balances" }
+pallet-utility = { version = "3.0.0", path = "../utility" }
 
 [features]
 default = ["std"]
diff --git a/frame/randomness-collective-flip/Cargo.toml b/frame/randomness-collective-flip/Cargo.toml
index d4b516c32ecf..285326ef1e9a 100644
--- a/frame/randomness-collective-flip/Cargo.toml
+++ b/frame/randomness-collective-flip/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-randomness-collective-flip"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,14 +15,14 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 safe-mix = { version = "1.0", default-features = false }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 
 [dev-dependencies]
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-sp-io = { version = "2.0.0", path = "../../primitives/io" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-io = { version = "3.0.0", path = "../../primitives/io" }
 serde = { version = "1.0.101" }
 
 [features]
diff --git a/frame/recovery/Cargo.toml b/frame/recovery/Cargo.toml
index c333e6ea9957..80450db0bd39 100644
--- a/frame/recovery/Cargo.toml
+++ b/frame/recovery/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-recovery"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -16,15 +16,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 enumflags2 = { version = "0.6.2" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 
 [dev-dependencies]
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-pallet-balances = { version = "2.0.0", path = "../balances" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+pallet-balances = { version = "3.0.0", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/frame/scheduler/Cargo.toml b/frame/scheduler/Cargo.toml
index 90c3799d1cd3..eef287d86771 100644
--- a/frame/scheduler/Cargo.toml
+++ b/frame/scheduler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-scheduler"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Unlicense"
@@ -12,17 +12,17 @@ readme = "README.md"
 [dependencies]
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
 
-frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
-sp-core = { version = "2.0.0", path = "../../primitives/core", default-features = false }
-substrate-test-utils = { version = "2.0.0", path = "../../test-utils" }
+sp-core = { version = "3.0.0", path = "../../primitives/core", default-features = false }
+substrate-test-utils = { version = "3.0.0", path = "../../test-utils" }
 
 [features]
 default = ["std"]
diff --git a/frame/scored-pool/Cargo.toml b/frame/scored-pool/Cargo.toml
index 33588230adda..e5e71dba6888 100644
--- a/frame/scored-pool/Cargo.toml
+++ b/frame/scored-pool/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-scored-pool"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,15 +15,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.101", optional = true }
-sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
+sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 
 [dev-dependencies]
-pallet-balances = { version = "2.0.0", path = "../balances" }
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
+pallet-balances = { version = "3.0.0", path = "../balances" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
 
 [features]
 default = ["std"]
diff --git a/frame/session/Cargo.toml b/frame/session/Cargo.toml
index 6f42663ecd1c..5b8fe6e2d137 100644
--- a/frame/session/Cargo.toml
+++ b/frame/session/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-session"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,20 +15,20 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-session = { version = "2.0.0", default-features = false, path = "../../primitives/session" }
-sp-staking = { version = "2.0.0", default-features = false, path = "../../primitives/staking" }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
-pallet-timestamp = { version = "2.0.0", default-features = false, path = "../timestamp" }
-sp-trie = { version = "2.0.0", optional = true, default-features = false, path = "../../primitives/trie" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-session = { version = "3.0.0", default-features = false, path = "../../primitives/session" }
+sp-staking = { version = "3.0.0", default-features = false, path = "../../primitives/staking" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+pallet-timestamp = { version = "3.0.0", default-features = false, path = "../timestamp" }
+sp-trie = { version = "3.0.0", optional = true, default-features = false, path = "../../primitives/trie" }
 impl-trait-for-tuples = "0.2.1"
 
 [dev-dependencies]
-sp-application-crypto = { version = "2.0.0", path = "../../primitives/application-crypto" }
+sp-application-crypto = { version = "3.0.0", path = "../../primitives/application-crypto" }
 lazy_static = "1.4.0"
 
 [features]
diff --git a/frame/session/benchmarking/Cargo.toml b/frame/session/benchmarking/Cargo.toml
index 5404cea88baa..bf5a9a9617b1 100644
--- a/frame/session/benchmarking/Cargo.toml
+++ b/frame/session/benchmarking/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-session-benchmarking"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -13,24 +13,24 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-std = { version = "2.0.0", default-features = false, path = "../../../primitives/std" }
-sp-session = { version = "2.0.0", default-features = false, path = "../../../primitives/session" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../../primitives/runtime" }
-frame-system = { version = "2.0.0", default-features = false, path = "../../system" }
-frame-benchmarking = { version = "2.0.0", default-features = false, path = "../../benchmarking" }
-frame-support = { version = "2.0.0", default-features = false, path = "../../support" }
-pallet-staking = { version = "2.0.0", default-features = false, features = ["runtime-benchmarks"], path = "../../staking" }
-pallet-session = { version = "2.0.0", default-features = false, path = "../../session" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../../primitives/std" }
+sp-session = { version = "3.0.0", default-features = false, path = "../../../primitives/session" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
+frame-system = { version = "3.0.0", default-features = false, path = "../../system" }
+frame-benchmarking = { version = "3.0.0", default-features = false, path = "../../benchmarking" }
+frame-support = { version = "3.0.0", default-features = false, path = "../../support" }
+pallet-staking = { version = "3.0.0", default-features = false, features = ["runtime-benchmarks"], path = "../../staking" }
+pallet-session = { version = "3.0.0", default-features = false, path = "../../session" }
 rand = { version = "0.7.2", default-features = false }
 
 [dev-dependencies]
 serde = { version = "1.0.101" }
 codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
-sp-core = { version = "2.0.0", path = "../../../primitives/core" }
-pallet-staking-reward-curve = { version = "2.0.0", path = "../../staking/reward-curve" }
-sp-io ={ version = "2.0.0", path = "../../../primitives/io" }
-pallet-timestamp = { version = "2.0.0", path = "../../timestamp" }
-pallet-balances = { version = "2.0.0", path = "../../balances" }
+sp-core = { version = "3.0.0", path = "../../../primitives/core" }
+pallet-staking-reward-curve = { version = "3.0.0", path = "../../staking/reward-curve" }
+sp-io ={ version = "3.0.0", path = "../../../primitives/io" }
+pallet-timestamp = { version = "3.0.0", path = "../../timestamp" }
+pallet-balances = { version = "3.0.0", path = "../../balances" }
 
 [features]
 default = ["std"]
diff --git a/frame/society/Cargo.toml b/frame/society/Cargo.toml
index 9f49b29bf3d5..5ddebeb9f579 100644
--- a/frame/society/Cargo.toml
+++ b/frame/society/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-society"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,16 +15,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 rand_chacha = { version = "0.2", default-features = false }
 
 [dev-dependencies]
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-sp-io ={ version = "2.0.0", path = "../../primitives/io" }
-pallet-balances = { version = "2.0.0", path = "../balances" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-io ={ version = "3.0.0", path = "../../primitives/io" }
+pallet-balances = { version = "3.0.0", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/frame/staking/Cargo.toml b/frame/staking/Cargo.toml
index 2cd25daa8094..c5f7dba07545 100644
--- a/frame/staking/Cargo.toml
+++ b/frame/staking/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-staking"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -16,30 +16,30 @@ targets = ["x86_64-unknown-linux-gnu"]
 static_assertions = "1.1.0"
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-npos-elections = { version = "2.0.0", default-features = false, path = "../../primitives/npos-elections" }
-sp-io ={ version = "2.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-staking = { version = "2.0.0", default-features = false, path = "../../primitives/staking" }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
-pallet-session = { version = "2.0.0", default-features = false, features = ["historical"], path = "../session" }
-pallet-authorship = { version = "2.0.0", default-features = false, path = "../authorship" }
-sp-application-crypto = { version = "2.0.0", default-features = false, path = "../../primitives/application-crypto" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-npos-elections = { version = "3.0.0", default-features = false, path = "../../primitives/npos-elections" }
+sp-io ={ version = "3.0.0", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-staking = { version = "3.0.0", default-features = false, path = "../../primitives/staking" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+pallet-session = { version = "3.0.0", default-features = false, features = ["historical"], path = "../session" }
+pallet-authorship = { version = "3.0.0", default-features = false, path = "../authorship" }
+sp-application-crypto = { version = "3.0.0", default-features = false, path = "../../primitives/application-crypto" }
 
 # Optional imports for benchmarking
-frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
 rand_chacha = { version = "0.2", default-features = false, optional = true }
 
 [dev-dependencies]
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-sp-storage = { version = "2.0.0", path = "../../primitives/storage" }
-sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
-pallet-balances = { version = "2.0.0", path = "../balances" }
-pallet-timestamp = { version = "2.0.0", path = "../timestamp" }
-pallet-staking-reward-curve = { version = "2.0.0",  path = "../staking/reward-curve" }
-substrate-test-utils = { version = "2.0.0", path = "../../test-utils" }
-frame-benchmarking = { version = "2.0.0", path = "../benchmarking" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-storage = { version = "3.0.0", path = "../../primitives/storage" }
+sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
+pallet-balances = { version = "3.0.0", path = "../balances" }
+pallet-timestamp = { version = "3.0.0", path = "../timestamp" }
+pallet-staking-reward-curve = { version = "3.0.0",  path = "../staking/reward-curve" }
+substrate-test-utils = { version = "3.0.0", path = "../../test-utils" }
+frame-benchmarking = { version = "3.0.0", path = "../benchmarking" }
 rand_chacha = { version = "0.2" }
 parking_lot = "0.11.1"
 hex = "0.4"
diff --git a/frame/staking/fuzzer/Cargo.toml b/frame/staking/fuzzer/Cargo.toml
index 9940adaa00fc..a88e9619174c 100644
--- a/frame/staking/fuzzer/Cargo.toml
+++ b/frame/staking/fuzzer/Cargo.toml
@@ -15,19 +15,19 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 honggfuzz = "0.5"
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-pallet-staking = { version = "2.0.0", path = "..", features = ["runtime-benchmarks"] }
-pallet-staking-reward-curve = { version = "2.0.0",  path = "../reward-curve" }
-pallet-session = { version = "2.0.0", path = "../../session" }
-pallet-indices = { version = "2.0.0", path = "../../indices" }
-pallet-balances = { version = "2.0.0", path = "../../balances" }
-pallet-timestamp = { version = "2.0.0", path = "../../timestamp" }
-frame-system = { version = "2.0.0", path = "../../system" }
-frame-support = { version = "2.0.0", path = "../../support" }
-sp-std = { version = "2.0.0", path = "../../../primitives/std" }
-sp-io ={ version = "2.0.0", path = "../../../primitives/io" }
-sp-core = { version = "2.0.0", path = "../../../primitives/core" }
-sp-npos-elections = { version = "2.0.0", path = "../../../primitives/npos-elections" }
-sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
+pallet-staking = { version = "3.0.0", path = "..", features = ["runtime-benchmarks"] }
+pallet-staking-reward-curve = { version = "3.0.0",  path = "../reward-curve" }
+pallet-session = { version = "3.0.0", path = "../../session" }
+pallet-indices = { version = "3.0.0", path = "../../indices" }
+pallet-balances = { version = "3.0.0", path = "../../balances" }
+pallet-timestamp = { version = "3.0.0", path = "../../timestamp" }
+frame-system = { version = "3.0.0", path = "../../system" }
+frame-support = { version = "3.0.0", path = "../../support" }
+sp-std = { version = "3.0.0", path = "../../../primitives/std" }
+sp-io ={ version = "3.0.0", path = "../../../primitives/io" }
+sp-core = { version = "3.0.0", path = "../../../primitives/core" }
+sp-npos-elections = { version = "3.0.0", path = "../../../primitives/npos-elections" }
+sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
 serde = "1.0.101"
 
 [features]
diff --git a/frame/staking/reward-curve/Cargo.toml b/frame/staking/reward-curve/Cargo.toml
index 9d2564522cd9..8713f5e1001c 100644
--- a/frame/staking/reward-curve/Cargo.toml
+++ b/frame/staking/reward-curve/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-staking-reward-curve"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -21,4 +21,4 @@ proc-macro2 = "1.0.6"
 proc-macro-crate = "0.1.4"
 
 [dev-dependencies]
-sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
+sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
diff --git a/frame/sudo/Cargo.toml b/frame/sudo/Cargo.toml
index cae9615cdabb..ed19d2e16535 100644
--- a/frame/sudo/Cargo.toml
+++ b/frame/sudo/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-sudo"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,14 +15,14 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 
 [dev-dependencies]
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
 
 [features]
 default = ["std"]
diff --git a/frame/support/Cargo.toml b/frame/support/Cargo.toml
index 7e9de8587c62..8edf1ff6ddad 100644
--- a/frame/support/Cargo.toml
+++ b/frame/support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-support"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -16,29 +16,29 @@ targets = ["x86_64-unknown-linux-gnu"]
 log = "0.4"
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-frame-metadata = { version = "12.0.0", default-features = false, path = "../metadata" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-tracing = { version = "2.0.0", default-features = false, path = "../../primitives/tracing" }
-sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
-sp-arithmetic = { version = "2.0.0", default-features = false, path = "../../primitives/arithmetic" }
-sp-inherents = { version = "2.0.0", default-features = false, path = "../../primitives/inherents" }
-sp-staking = { version = "2.0.0", default-features = false, path = "../../primitives/staking" }
-frame-support-procedural = { version = "2.0.1", default-features = false, path = "./procedural" }
+frame-metadata = { version = "13.0.0", default-features = false, path = "../metadata" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-tracing = { version = "3.0.0", default-features = false, path = "../../primitives/tracing" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
+sp-arithmetic = { version = "3.0.0", default-features = false, path = "../../primitives/arithmetic" }
+sp-inherents = { version = "3.0.0", default-features = false, path = "../../primitives/inherents" }
+sp-staking = { version = "3.0.0", default-features = false, path = "../../primitives/staking" }
+frame-support-procedural = { version = "3.0.0", default-features = false, path = "./procedural" }
 paste = "1.0"
 once_cell = { version = "1", default-features = false, optional = true }
-sp-state-machine = { version = "0.8.0", optional = true, path = "../../primitives/state-machine" }
+sp-state-machine = { version = "0.9.0", optional = true, path = "../../primitives/state-machine" }
 bitflags = "1.2"
 impl-trait-for-tuples = "0.2.1"
 smallvec = "1.4.1"
 
 [dev-dependencies]
 pretty_assertions = "0.6.1"
-frame-system = { version = "2.0.0", path = "../system" }
+frame-system = { version = "3.0.0", path = "../system" }
 parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
-sp-api = { version = "2.0.0", default-features = false, path = "../../primitives/api" }
+sp-api = { version = "3.0.0", default-features = false, path = "../../primitives/api" }
 
 [features]
 default = ["std"]
diff --git a/frame/support/procedural/Cargo.toml b/frame/support/procedural/Cargo.toml
index 3d829afb0ca3..4a00a24e3849 100644
--- a/frame/support/procedural/Cargo.toml
+++ b/frame/support/procedural/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-support-procedural"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 proc-macro = true
 
 [dependencies]
-frame-support-procedural-tools = { version = "2.0.0", path = "./tools" }
+frame-support-procedural-tools = { version = "3.0.0", path = "./tools" }
 proc-macro2 = "1.0.6"
 quote = "1.0.3"
 Inflector = "0.11.4"
diff --git a/frame/support/procedural/tools/Cargo.toml b/frame/support/procedural/tools/Cargo.toml
index 0c8b9249b5ca..4165cb32c3a5 100644
--- a/frame/support/procedural/tools/Cargo.toml
+++ b/frame/support/procedural/tools/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-support-procedural-tools"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -12,7 +12,7 @@ description = "Proc macro helpers for procedural macros"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-frame-support-procedural-tools-derive = { version = "2.0.0", path = "./derive" }
+frame-support-procedural-tools-derive = { version = "3.0.0", path = "./derive" }
 proc-macro2 = "1.0.6"
 quote = "1.0.3"
 syn = { version = "1.0.58", features = ["full", "visit"] }
diff --git a/frame/support/procedural/tools/derive/Cargo.toml b/frame/support/procedural/tools/derive/Cargo.toml
index 0ec72f1388e0..c377680af16f 100644
--- a/frame/support/procedural/tools/derive/Cargo.toml
+++ b/frame/support/procedural/tools/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-support-procedural-tools-derive"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/support/test/Cargo.toml b/frame/support/test/Cargo.toml
index a34ba3e45ef9..67cf668f7f4c 100644
--- a/frame/support/test/Cargo.toml
+++ b/frame/support/test/Cargo.toml
@@ -14,18 +14,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", default-features = false, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-io = { version = "2.0.0", path = "../../../primitives/io", default-features = false }
-sp-state-machine = { version = "0.8.0", optional = true, path = "../../../primitives/state-machine" }
-frame-support = { version = "2.0.0", default-features = false, path = "../" }
-sp-inherents = { version = "2.0.0", default-features = false, path = "../../../primitives/inherents" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../../primitives/runtime" }
-sp-core = { version = "2.0.0", default-features = false, path = "../../../primitives/core" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../../primitives/std" }
+sp-io = { version = "3.0.0", path = "../../../primitives/io", default-features = false }
+sp-state-machine = { version = "0.9.0", optional = true, path = "../../../primitives/state-machine" }
+frame-support = { version = "3.0.0", default-features = false, path = "../" }
+sp-inherents = { version = "3.0.0", default-features = false, path = "../../../primitives/inherents" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../../primitives/core" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../../primitives/std" }
 trybuild = "1.0.38"
 pretty_assertions = "0.6.1"
 rustversion = "1.0.0"
-frame-metadata = { version = "12.0.0", default-features = false, path = "../../metadata" }
-frame-system = { version = "2.0.0", default-features = false, path = "../../system" }
+frame-metadata = { version = "13.0.0", default-features = false, path = "../../metadata" }
+frame-system = { version = "3.0.0", default-features = false, path = "../../system" }
 
 [features]
 default = ["std"]
diff --git a/frame/system/Cargo.toml b/frame/system/Cargo.toml
index 60ef5a27f487..c4530e9dfd09 100644
--- a/frame/system/Cargo.toml
+++ b/frame/system/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-system"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,17 +15,17 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "2.0.0", path = "../../primitives/io", default-features = false }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-version = { version = "2.0.0", default-features = false, path = "../../primitives/version" }
-frame-support = { version = "2.0.1", default-features = false, path = "../support" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "3.0.0", path = "../../primitives/io", default-features = false }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-version = { version = "3.0.0", default-features = false, path = "../../primitives/version" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 impl-trait-for-tuples = "0.2.1"
 
 [dev-dependencies]
 criterion = "0.3.3"
-sp-externalities = { version = "0.8.0", path = "../../primitives/externalities" }
+sp-externalities = { version = "0.9.0", path = "../../primitives/externalities" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 
 [features]
diff --git a/frame/system/benchmarking/Cargo.toml b/frame/system/benchmarking/Cargo.toml
index 0569ba1f84e3..ddf52c96effe 100644
--- a/frame/system/benchmarking/Cargo.toml
+++ b/frame/system/benchmarking/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-system-benchmarking"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,16 +14,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-std = { version = "2.0.0", default-features = false, path = "../../../primitives/std" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../../primitives/runtime" }
-frame-benchmarking = { version = "2.0.0", default-features = false, path = "../../benchmarking" }
-frame-system = { version = "2.0.0", default-features = false, path = "../../system" }
-frame-support = { version = "2.0.0", default-features = false, path = "../../support" }
-sp-core = { version = "2.0.0", default-features = false, path = "../../../primitives/core" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../../primitives/std" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
+frame-benchmarking = { version = "3.0.0", default-features = false, path = "../../benchmarking" }
+frame-system = { version = "3.0.0", default-features = false, path = "../../system" }
+frame-support = { version = "3.0.0", default-features = false, path = "../../support" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../../primitives/core" }
 
 [dev-dependencies]
 serde = { version = "1.0.101" }
-sp-io ={ version = "2.0.0", path = "../../../primitives/io" }
+sp-io ={ version = "3.0.0", path = "../../../primitives/io" }
 
 [features]
 default = ["std"]
diff --git a/frame/system/rpc/runtime-api/Cargo.toml b/frame/system/rpc/runtime-api/Cargo.toml
index 77421fd1fa3c..56619d59ddca 100644
--- a/frame/system/rpc/runtime-api/Cargo.toml
+++ b/frame/system/rpc/runtime-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-system-rpc-runtime-api"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-api = { version = "2.0.0", default-features = false, path = "../../../../primitives/api" }
+sp-api = { version = "3.0.0", default-features = false, path = "../../../../primitives/api" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 
 [features]
diff --git a/frame/timestamp/Cargo.toml b/frame/timestamp/Cargo.toml
index 93dc4b4d41ca..f4f7bbda0f88 100644
--- a/frame/timestamp/Cargo.toml
+++ b/frame/timestamp/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-timestamp"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -17,19 +17,19 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io", optional = true }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-inherents = { version = "2.0.0", default-features = false, path = "../../primitives/inherents" }
-frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
-sp-timestamp = { version = "2.0.0", default-features = false, path = "../../primitives/timestamp" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io", optional = true }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-inherents = { version = "3.0.0", default-features = false, path = "../../primitives/inherents" }
+frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+sp-timestamp = { version = "3.0.0", default-features = false, path = "../../primitives/timestamp" }
 impl-trait-for-tuples = "0.2.1"
 
 [dev-dependencies]
-sp-io ={ version = "2.0.0", path = "../../primitives/io" }
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
+sp-io ={ version = "3.0.0", path = "../../primitives/io" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
 
 [features]
 default = ["std"]
diff --git a/frame/tips/Cargo.toml b/frame/tips/Cargo.toml
index dde071d585f5..92af65ce0765 100644
--- a/frame/tips/Cargo.toml
+++ b/frame/tips/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-tips"
-version = "2.0.0"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,19 +15,19 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
-pallet-treasury = { version = "2.0.0", default-features = false, path = "../treasury" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+pallet-treasury = { version = "3.0.0", default-features = false, path = "../treasury" }
 
-frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
-sp-io ={ version = "2.0.0", path = "../../primitives/io" }
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-sp-storage = { version = "2.0.0", path = "../../primitives/storage" }
-pallet-balances = { version = "2.0.0", path = "../balances" }
+sp-io ={ version = "3.0.0", path = "../../primitives/io" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-storage = { version = "3.0.0", path = "../../primitives/storage" }
+pallet-balances = { version = "3.0.0", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/frame/transaction-payment/Cargo.toml b/frame/transaction-payment/Cargo.toml
index e9741fbbb05c..7a713ab1cfbd 100644
--- a/frame/transaction-payment/Cargo.toml
+++ b/frame/transaction-payment/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-transaction-payment"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,18 +15,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.101", optional = true }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 smallvec = "1.4.1"
-sp-io = { version = "2.0.0", path = "../../primitives/io", default-features = false }
-sp-core = { version = "2.0.0", path = "../../primitives/core", default-features = false }
+sp-io = { version = "3.0.0", path = "../../primitives/io", default-features = false }
+sp-core = { version = "3.0.0", path = "../../primitives/core", default-features = false }
 
 [dev-dependencies]
 serde_json = "1.0.41"
-pallet-balances = { version = "2.0.0", path = "../balances" }
-sp-storage = { version = "2.0.0", path = "../../primitives/storage" }
+pallet-balances = { version = "3.0.0", path = "../balances" }
+sp-storage = { version = "3.0.0", path = "../../primitives/storage" }
 
 [features]
 default = ["std"]
diff --git a/frame/transaction-payment/rpc/Cargo.toml b/frame/transaction-payment/rpc/Cargo.toml
index 167fe56ff049..102f91dcc2c0 100644
--- a/frame/transaction-payment/rpc/Cargo.toml
+++ b/frame/transaction-payment/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-transaction-payment-rpc"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -17,9 +17,9 @@ codec = { package = "parity-scale-codec", version = "2.0.0" }
 jsonrpc-core = "15.1.0"
 jsonrpc-core-client = "15.1.0"
 jsonrpc-derive = "15.1.0"
-sp-core = { version = "2.0.0", path = "../../../primitives/core" }
-sp-rpc = { version = "2.0.0", path = "../../../primitives/rpc" }
-sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
-sp-api = { version = "2.0.0", path = "../../../primitives/api" }
-sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
-pallet-transaction-payment-rpc-runtime-api = { version = "2.0.0", path = "./runtime-api" }
+sp-core = { version = "3.0.0", path = "../../../primitives/core" }
+sp-rpc = { version = "3.0.0", path = "../../../primitives/rpc" }
+sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
+sp-api = { version = "3.0.0", path = "../../../primitives/api" }
+sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
+pallet-transaction-payment-rpc-runtime-api = { version = "3.0.0", path = "./runtime-api" }
diff --git a/frame/transaction-payment/rpc/runtime-api/Cargo.toml b/frame/transaction-payment/rpc/runtime-api/Cargo.toml
index 1a1980a91b31..fede9f9dd026 100644
--- a/frame/transaction-payment/rpc/runtime-api/Cargo.toml
+++ b/frame/transaction-payment/rpc/runtime-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-transaction-payment-rpc-runtime-api"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -13,10 +13,10 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-api = { version = "2.0.0", default-features = false, path = "../../../../primitives/api" }
+sp-api = { version = "3.0.0", default-features = false, path = "../../../../primitives/api" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../../../primitives/runtime" }
-pallet-transaction-payment = { version = "2.0.0", default-features = false, path = "../../../transaction-payment" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../../../primitives/runtime" }
+pallet-transaction-payment = { version = "3.0.0", default-features = false, path = "../../../transaction-payment" }
 
 [features]
 default = ["std"]
diff --git a/frame/treasury/Cargo.toml b/frame/treasury/Cargo.toml
index 556d77418da6..461dc9122394 100644
--- a/frame/treasury/Cargo.toml
+++ b/frame/treasury/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-treasury"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,19 +15,19 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
-pallet-balances = { version = "2.0.0", default-features = false, path = "../balances" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+pallet-balances = { version = "3.0.0", default-features = false, path = "../balances" }
 impl-trait-for-tuples = "0.2.1"
 
-frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
-sp-io ={ version = "2.0.0", path = "../../primitives/io" }
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-sp-storage = { version = "2.0.0", path = "../../primitives/storage" }
+sp-io ={ version = "3.0.0", path = "../../primitives/io" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-storage = { version = "3.0.0", path = "../../primitives/storage" }
 
 [features]
 default = ["std"]
diff --git a/frame/utility/Cargo.toml b/frame/utility/Cargo.toml
index 5b800ab6495f..edb930231e17 100644
--- a/frame/utility/Cargo.toml
+++ b/frame/utility/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-utility"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,18 +15,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
-sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
 
-frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-pallet-balances = { version = "2.0.0", path = "../balances" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+pallet-balances = { version = "3.0.0", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/frame/vesting/Cargo.toml b/frame/vesting/Cargo.toml
index af48fdace81a..dc42fbcbab10 100644
--- a/frame/vesting/Cargo.toml
+++ b/frame/vesting/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-vesting"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -16,17 +16,17 @@ targets = ["x86_64-unknown-linux-gnu"]
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 enumflags2 = { version = "0.6.2" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-support = { version = "2.0.0", default-features = false, path = "../support" }
-frame-system = { version = "2.0.0", default-features = false, path = "../system" }
-frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
-sp-io = { version = "2.0.0", path = "../../primitives/io" }
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-pallet-balances = { version = "2.0.0", path = "../balances" }
-sp-storage = { version = "2.0.0", path = "../../primitives/storage" }
+sp-io = { version = "3.0.0", path = "../../primitives/io" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+pallet-balances = { version = "3.0.0", path = "../balances" }
+sp-storage = { version = "3.0.0", path = "../../primitives/storage" }
 hex-literal = "0.3.1"
 
 [features]
diff --git a/primitives/allocator/Cargo.toml b/primitives/allocator/Cargo.toml
index 4fef71db7540..1c38cbbb9c26 100644
--- a/primitives/allocator/Cargo.toml
+++ b/primitives/allocator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-allocator"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,9 +14,9 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-std = { version = "2.0.0", path = "../std", default-features = false }
-sp-core = { version = "2.0.0", path = "../core", default-features = false }
-sp-wasm-interface = { version = "2.0.0", path = "../wasm-interface", default-features = false }
+sp-std = { version = "3.0.0", path = "../std", default-features = false }
+sp-core = { version = "3.0.0", path = "../core", default-features = false }
+sp-wasm-interface = { version = "3.0.0", path = "../wasm-interface", default-features = false }
 log = { version = "0.4.11", optional = true }
 thiserror = { version = "1.0.21", optional = true }
 
diff --git a/primitives/api/Cargo.toml b/primitives/api/Cargo.toml
index 1a66d460023d..20987035ef2f 100644
--- a/primitives/api/Cargo.toml
+++ b/primitives/api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-api"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,12 +14,12 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-api-proc-macro = { version = "2.0.0", path = "proc-macro" }
-sp-core = { version = "2.0.0", default-features = false, path = "../core" }
-sp-std = { version = "2.0.0", default-features = false, path = "../std" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../runtime" }
-sp-version = { version = "2.0.0", default-features = false, path = "../version" }
-sp-state-machine = { version = "0.8.0", optional = true, path = "../state-machine" }
+sp-api-proc-macro = { version = "3.0.0", path = "proc-macro" }
+sp-core = { version = "3.0.0", default-features = false, path = "../core" }
+sp-std = { version = "3.0.0", default-features = false, path = "../std" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../runtime" }
+sp-version = { version = "3.0.0", default-features = false, path = "../version" }
+sp-state-machine = { version = "0.9.0", optional = true, path = "../state-machine" }
 hash-db = { version = "0.15.2", optional = true }
 thiserror = { version = "1.0.21", optional = true }
 
diff --git a/primitives/api/proc-macro/Cargo.toml b/primitives/api/proc-macro/Cargo.toml
index 98ca45081c1e..450ce64b2b6c 100644
--- a/primitives/api/proc-macro/Cargo.toml
+++ b/primitives/api/proc-macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-api-proc-macro"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/api/test/Cargo.toml b/primitives/api/test/Cargo.toml
index 458a805c7552..e8f06aaf20e1 100644
--- a/primitives/api/test/Cargo.toml
+++ b/primitives/api/test/Cargo.toml
@@ -12,22 +12,22 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-api = { version = "2.0.0", path = "../" }
+sp-api = { version = "3.0.0", path = "../" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
-sp-version = { version = "2.0.0", path = "../../version" }
-sp-runtime = { version = "2.0.0", path = "../../runtime" }
-sp-blockchain = { version = "2.0.0", path = "../../blockchain" }
-sp-consensus = { version = "0.8.0", path = "../../consensus/common" }
-sc-block-builder = { version = "0.8.0", path = "../../../client/block-builder" }
+sp-version = { version = "3.0.0", path = "../../version" }
+sp-runtime = { version = "3.0.0", path = "../../runtime" }
+sp-blockchain = { version = "3.0.0", path = "../../blockchain" }
+sp-consensus = { version = "0.9.0", path = "../../consensus/common" }
+sc-block-builder = { version = "0.9.0", path = "../../../client/block-builder" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-sp-state-machine = { version = "0.8.0", path = "../../state-machine" }
+sp-state-machine = { version = "0.9.0", path = "../../state-machine" }
 trybuild = "1.0.38"
 rustversion = "1.0.0"
 
 [dev-dependencies]
 criterion = "0.3.0"
 substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
-sp-core = { version = "2.0.0", path = "../../core" }
+sp-core = { version = "3.0.0", path = "../../core" }
 
 [[bench]]
 name = "bench"
diff --git a/primitives/application-crypto/Cargo.toml b/primitives/application-crypto/Cargo.toml
index 9709ed9fc18a..fff289e9a1d8 100644
--- a/primitives/application-crypto/Cargo.toml
+++ b/primitives/application-crypto/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-application-crypto"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 description = "Provides facilities for generating application specific crypto wrapper types."
@@ -15,11 +15,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 
 [dependencies]
-sp-core = { version = "2.0.0", default-features = false, path = "../core" }
+sp-core = { version = "3.0.0", default-features = false, path = "../core" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-sp-std = { version = "2.0.0", default-features = false, path = "../std" }
-sp-io = { version = "2.0.0", default-features = false, path = "../io" }
+sp-std = { version = "3.0.0", default-features = false, path = "../std" }
+sp-io = { version = "3.0.0", default-features = false, path = "../io" }
 
 [features]
 default = [ "std" ]
diff --git a/primitives/application-crypto/test/Cargo.toml b/primitives/application-crypto/test/Cargo.toml
index f132e04deaa0..92a2ea8f3b8c 100644
--- a/primitives/application-crypto/test/Cargo.toml
+++ b/primitives/application-crypto/test/Cargo.toml
@@ -13,9 +13,9 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-core = { version = "2.0.0", default-features = false, path = "../../core" }
-sp-keystore = { version = "0.8.0", path = "../../keystore", default-features = false }
+sp-core = { version = "3.0.0", default-features = false, path = "../../core" }
+sp-keystore = { version = "0.9.0", path = "../../keystore", default-features = false }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
-sp-runtime = { version = "2.0.0", path = "../../runtime" }
-sp-api = { version = "2.0.0", path = "../../api" }
-sp-application-crypto = { version = "2.0.0", path = "../" }
+sp-runtime = { version = "3.0.0", path = "../../runtime" }
+sp-api = { version = "3.0.0", path = "../../api" }
+sp-application-crypto = { version = "3.0.0", path = "../" }
diff --git a/primitives/arithmetic/Cargo.toml b/primitives/arithmetic/Cargo.toml
index 0e8dd2be5295..76751cdee81b 100644
--- a/primitives/arithmetic/Cargo.toml
+++ b/primitives/arithmetic/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-arithmetic"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -18,9 +18,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 integer-sqrt = "0.1.2"
 num-traits = { version = "0.2.8", default-features = false }
-sp-std = { version = "2.0.0", default-features = false, path = "../std" }
+sp-std = { version = "3.0.0", default-features = false, path = "../std" }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-sp-debug-derive = { version = "2.0.0", default-features = false, path = "../debug-derive" }
+sp-debug-derive = { version = "3.0.0", default-features = false, path = "../debug-derive" }
 
 [dev-dependencies]
 rand = "0.7.2"
diff --git a/primitives/arithmetic/fuzzer/Cargo.toml b/primitives/arithmetic/fuzzer/Cargo.toml
index 1026db92d06d..2666dde9016a 100644
--- a/primitives/arithmetic/fuzzer/Cargo.toml
+++ b/primitives/arithmetic/fuzzer/Cargo.toml
@@ -14,7 +14,7 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-arithmetic = { version = "2.0.0", path = ".." }
+sp-arithmetic = { version = "3.0.0", path = ".." }
 honggfuzz = "0.5.49"
 primitive-types = "0.9.0"
 num-bigint = "0.2"
diff --git a/primitives/authority-discovery/Cargo.toml b/primitives/authority-discovery/Cargo.toml
index ff469b22797a..a32b13ca728d 100644
--- a/primitives/authority-discovery/Cargo.toml
+++ b/primitives/authority-discovery/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-authority-discovery"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Authority discovery primitives"
 edition = "2018"
@@ -13,11 +13,11 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-application-crypto = { version = "2.0.0", default-features = false, path = "../application-crypto" }
+sp-application-crypto = { version = "3.0.0", default-features = false, path = "../application-crypto" }
 codec = { package = "parity-scale-codec", default-features = false, version = "2.0.0" }
-sp-std = { version = "2.0.0", default-features = false, path = "../std" }
-sp-api = { version = "2.0.0", default-features = false, path = "../api" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../runtime" }
+sp-std = { version = "3.0.0", default-features = false, path = "../std" }
+sp-api = { version = "3.0.0", default-features = false, path = "../api" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../runtime" }
 
 [features]
 default = ["std"]
diff --git a/primitives/authorship/Cargo.toml b/primitives/authorship/Cargo.toml
index e37994b73a9f..5455902fddc3 100644
--- a/primitives/authorship/Cargo.toml
+++ b/primitives/authorship/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-authorship"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Authorship primitives"
 edition = "2018"
@@ -13,9 +13,9 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-inherents = { version = "2.0.0", default-features = false, path = "../inherents" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../runtime" }
-sp-std = { version = "2.0.0", default-features = false, path = "../std" }
+sp-inherents = { version = "3.0.0", default-features = false, path = "../inherents" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../runtime" }
+sp-std = { version = "3.0.0", default-features = false, path = "../std" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 
 [features]
diff --git a/primitives/block-builder/Cargo.toml b/primitives/block-builder/Cargo.toml
index 87246f4d9e67..6081e872786e 100644
--- a/primitives/block-builder/Cargo.toml
+++ b/primitives/block-builder/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-block-builder"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -13,11 +13,11 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-runtime = { version = "2.0.0", default-features = false, path = "../runtime" }
-sp-api = { version = "2.0.0", default-features = false, path = "../api" }
-sp-std = { version = "2.0.0", default-features = false, path = "../std" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../runtime" }
+sp-api = { version = "3.0.0", default-features = false, path = "../api" }
+sp-std = { version = "3.0.0", default-features = false, path = "../std" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-inherents = { version = "2.0.0", default-features = false, path = "../inherents" }
+sp-inherents = { version = "3.0.0", default-features = false, path = "../inherents" }
 
 [features]
 default = [ "std" ]
diff --git a/primitives/blockchain/Cargo.toml b/primitives/blockchain/Cargo.toml
index fea84adc819c..092d96116236 100644
--- a/primitives/blockchain/Cargo.toml
+++ b/primitives/blockchain/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-blockchain"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -20,8 +20,8 @@ parking_lot = "0.11.1"
 thiserror = "1.0.21"
 futures = "0.3.9"
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-consensus = { version = "0.8.0", path = "../consensus/common" }
-sp-runtime = { version = "2.0.0", path = "../runtime" }
-sp-state-machine = { version = "0.8.0", path = "../state-machine" }
-sp-database = { version = "2.0.0", path = "../database" }
-sp-api = { version = "2.0.0", path = "../api" }
+sp-consensus = { version = "0.9.0", path = "../consensus/common" }
+sp-runtime = { version = "3.0.0", path = "../runtime" }
+sp-state-machine = { version = "0.9.0", path = "../state-machine" }
+sp-database = { version = "3.0.0", path = "../database" }
+sp-api = { version = "3.0.0", path = "../api" }
diff --git a/primitives/chain-spec/Cargo.toml b/primitives/chain-spec/Cargo.toml
index 52747dca94c9..ec3e731bb0e9 100644
--- a/primitives/chain-spec/Cargo.toml
+++ b/primitives/chain-spec/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-chain-spec"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/consensus/aura/Cargo.toml b/primitives/consensus/aura/Cargo.toml
index d587f1d72504..100c32302495 100644
--- a/primitives/consensus/aura/Cargo.toml
+++ b/primitives/consensus/aura/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-consensus-aura"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Primitives for Aura consensus"
 edition = "2018"
@@ -13,14 +13,14 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-application-crypto = { version = "2.0.0", default-features = false, path = "../../application-crypto" }
+sp-application-crypto = { version = "3.0.0", default-features = false, path = "../../application-crypto" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-std = { version = "2.0.0", default-features = false, path = "../../std" }
-sp-api = { version = "2.0.0", default-features = false, path = "../../api" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../runtime" }
-sp-inherents = { version = "2.0.0", default-features = false, path = "../../inherents" }
-sp-timestamp = { version = "2.0.0", default-features = false, path = "../../timestamp" }
-sp-consensus-slots = { version = "0.8.1", default-features = false, path = "../slots" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../std" }
+sp-api = { version = "3.0.0", default-features = false, path = "../../api" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../runtime" }
+sp-inherents = { version = "3.0.0", default-features = false, path = "../../inherents" }
+sp-timestamp = { version = "3.0.0", default-features = false, path = "../../timestamp" }
+sp-consensus-slots = { version = "0.9.0", default-features = false, path = "../slots" }
 
 [features]
 default = ["std"]
diff --git a/primitives/consensus/babe/Cargo.toml b/primitives/consensus/babe/Cargo.toml
index 83f62d8643ca..fb02014eeef5 100644
--- a/primitives/consensus/babe/Cargo.toml
+++ b/primitives/consensus/babe/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-consensus-babe"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Primitives for BABE consensus"
 edition = "2018"
@@ -13,19 +13,19 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-application-crypto = { version = "2.0.0", default-features = false, path = "../../application-crypto" }
+sp-application-crypto = { version = "3.0.0", default-features = false, path = "../../application-crypto" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 merlin = { version = "2.0", default-features = false }
-sp-std = { version = "2.0.0", default-features = false, path = "../../std" }
-sp-api = { version = "2.0.0", default-features = false, path = "../../api" }
-sp-consensus = { version = "0.8.0", optional = true, path = "../common" }
-sp-consensus-slots = { version = "0.8.0", default-features = false, path = "../slots" }
-sp-consensus-vrf = { version = "0.8.0", path = "../vrf", default-features = false }
-sp-core = { version = "2.0.0", default-features = false, path = "../../core" }
-sp-inherents = { version = "2.0.0", default-features = false, path = "../../inherents" }
-sp-keystore = { version = "0.8.0", default-features = false, path = "../../keystore", optional = true }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../runtime" }
-sp-timestamp = { version = "2.0.0", default-features = false, path = "../../timestamp" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../std" }
+sp-api = { version = "3.0.0", default-features = false, path = "../../api" }
+sp-consensus = { version = "0.9.0", optional = true, path = "../common" }
+sp-consensus-slots = { version = "0.9.0", default-features = false, path = "../slots" }
+sp-consensus-vrf = { version = "0.9.0", path = "../vrf", default-features = false }
+sp-core = { version = "3.0.0", default-features = false, path = "../../core" }
+sp-inherents = { version = "3.0.0", default-features = false, path = "../../inherents" }
+sp-keystore = { version = "0.9.0", default-features = false, path = "../../keystore", optional = true }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../runtime" }
+sp-timestamp = { version = "3.0.0", default-features = false, path = "../../timestamp" }
 
 [features]
 default = ["std"]
diff --git a/primitives/consensus/common/Cargo.toml b/primitives/consensus/common/Cargo.toml
index aa9c14ae94c9..44202678990f 100644
--- a/primitives/consensus/common/Cargo.toml
+++ b/primitives/consensus/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-consensus"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -18,21 +18,21 @@ targets = ["x86_64-unknown-linux-gnu"]
 thiserror = "1.0.21"
 libp2p = { version = "0.34.0", default-features = false }
 log = "0.4.8"
-sp-core = { path= "../../core", version = "2.0.0"}
-sp-inherents = { version = "2.0.0", path = "../../inherents" }
-sp-state-machine = { version = "0.8.0", path = "../../state-machine" }
+sp-core = { path= "../../core", version = "3.0.0"}
+sp-inherents = { version = "3.0.0", path = "../../inherents" }
+sp-state-machine = { version = "0.9.0", path = "../../state-machine" }
 futures = { version = "0.3.1", features = ["thread-pool"] }
 futures-timer = "3.0.1"
-sp-std = { version = "2.0.0", path = "../../std" }
-sp-version = { version = "2.0.0", path = "../../version" }
-sp-runtime = { version = "2.0.0", path = "../../runtime" }
-sp-utils = { version = "2.0.0", path = "../../utils" }
-sp-trie = { version = "2.0.0", path = "../../trie" }
-sp-api = { version = "2.0.0", path = "../../api" }
+sp-std = { version = "3.0.0", path = "../../std" }
+sp-version = { version = "3.0.0", path = "../../version" }
+sp-runtime = { version = "3.0.0", path = "../../runtime" }
+sp-utils = { version = "3.0.0", path = "../../utils" }
+sp-trie = { version = "3.0.0", path = "../../trie" }
+sp-api = { version = "3.0.0", path = "../../api" }
 codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 parking_lot = "0.11.1"
 serde = { version = "1.0", features = ["derive"] }
-prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.8.0"}
+prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0"}
 wasm-timer = "0.2.5"
 
 [dev-dependencies]
diff --git a/primitives/consensus/pow/Cargo.toml b/primitives/consensus/pow/Cargo.toml
index e4a7963131b2..850f0efe47ed 100644
--- a/primitives/consensus/pow/Cargo.toml
+++ b/primitives/consensus/pow/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-consensus-pow"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Primitives for Aura consensus"
 edition = "2018"
@@ -13,10 +13,10 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-api = { version = "2.0.0", default-features = false, path = "../../api" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../std" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../runtime" }
-sp-core = { version = "2.0.0", default-features = false, path = "../../core" }
+sp-api = { version = "3.0.0", default-features = false, path = "../../api" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../std" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../runtime" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../core" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 
 [features]
diff --git a/primitives/consensus/slots/Cargo.toml b/primitives/consensus/slots/Cargo.toml
index f2e036626315..46dbaca1a6ad 100644
--- a/primitives/consensus/slots/Cargo.toml
+++ b/primitives/consensus/slots/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-consensus-slots"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Primitives for slots-based consensus"
 edition = "2018"
@@ -14,8 +14,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../runtime" }
-sp-arithmetic = { version = "2.0.0", default-features = false, path = "../../arithmetic" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../runtime" }
+sp-arithmetic = { version = "3.0.0", default-features = false, path = "../../arithmetic" }
 
 [features]
 default = ["std"]
diff --git a/primitives/consensus/vrf/Cargo.toml b/primitives/consensus/vrf/Cargo.toml
index 87636d831257..15a9318cd446 100644
--- a/primitives/consensus/vrf/Cargo.toml
+++ b/primitives/consensus/vrf/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-consensus-vrf"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Primitives for VRF based consensus"
 edition = "2018"
@@ -15,9 +15,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { version = "2.0.0", package = "parity-scale-codec", default-features = false }
 schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated", "u64_backend"], default-features = false }
-sp-std = { version = "2.0.0", path = "../../std", default-features = false }
-sp-core = { version = "2.0.0", path = "../../core", default-features = false }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../runtime" }
+sp-std = { version = "3.0.0", path = "../../std", default-features = false }
+sp-core = { version = "3.0.0", path = "../../core", default-features = false }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../runtime" }
 
 [features]
 default = ["std"]
diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml
index 36c980676827..3d9cf1287e05 100644
--- a/primitives/core/Cargo.toml
+++ b/primitives/core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-core"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -13,7 +13,7 @@ documentation = "https://docs.rs/sp-core"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-std = { version = "2.0.0", default-features = false, path = "../std" }
+sp-std = { version = "3.0.0", default-features = false, path = "../std" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 log = { version = "0.4.11", default-features = false }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
@@ -33,9 +33,9 @@ zeroize = { version = "1.2.0", default-features = false }
 secrecy = { version = "0.7.0", default-features = false }
 lazy_static = { version = "1.4.0", default-features = false, optional = true }
 parking_lot = { version = "0.11.1", optional = true }
-sp-debug-derive = { version = "2.0.0", path = "../debug-derive" }
-sp-externalities = { version = "0.8.0", optional = true, path = "../externalities" }
-sp-storage = { version = "2.0.0", default-features = false, path = "../storage" }
+sp-debug-derive = { version = "3.0.0", path = "../debug-derive" }
+sp-externalities = { version = "0.9.0", optional = true, path = "../externalities" }
+sp-storage = { version = "3.0.0", default-features = false, path = "../storage" }
 parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
 futures = { version = "0.3.1", optional = true }
 dyn-clonable = { version = "0.9.0", optional = true }
@@ -52,10 +52,10 @@ twox-hash = { version = "1.5.0", default-features = false, optional = true }
 libsecp256k1 = { version = "0.3.2", default-features = false, features = ["hmac"], optional = true }
 merlin = { version = "2.0", default-features = false, optional = true }
 
-sp-runtime-interface = { version = "2.0.0", default-features = false, path = "../runtime-interface" }
+sp-runtime-interface = { version = "3.0.0", default-features = false, path = "../runtime-interface" }
 
 [dev-dependencies]
-sp-serializer = { version = "2.0.0", path = "../serializer" }
+sp-serializer = { version = "3.0.0", path = "../serializer" }
 pretty_assertions = "0.6.1"
 hex-literal = "0.3.1"
 rand = "0.7.2"
diff --git a/primitives/database/Cargo.toml b/primitives/database/Cargo.toml
index 2bb53e98085a..4062ba292352 100644
--- a/primitives/database/Cargo.toml
+++ b/primitives/database/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-database"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/debug-derive/Cargo.toml b/primitives/debug-derive/Cargo.toml
index f72842b19615..0d3ba805100c 100644
--- a/primitives/debug-derive/Cargo.toml
+++ b/primitives/debug-derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-debug-derive"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/election-providers/Cargo.toml b/primitives/election-providers/Cargo.toml
index 7210b8f854bd..cf12dce8098d 100644
--- a/primitives/election-providers/Cargo.toml
+++ b/primitives/election-providers/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-election-providers"
-version = "2.0.0"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,13 +14,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "2.0.1", default-features = false, path = "../std" }
-sp-arithmetic = { version = "2.0.1", default-features = false, path = "../arithmetic" }
-sp-npos-elections = { version = "2.0.1", default-features = false, path = "../npos-elections" }
+sp-std = { version = "3.0.0", default-features = false, path = "../std" }
+sp-arithmetic = { version = "3.0.0", default-features = false, path = "../arithmetic" }
+sp-npos-elections = { version = "3.0.0", default-features = false, path = "../npos-elections" }
 
 [dev-dependencies]
-sp-npos-elections = { version = "2.0.1", path = "../npos-elections" }
-sp-runtime = { version = "2.0.1", path = "../runtime" }
+sp-npos-elections = { version = "3.0.0", path = "../npos-elections" }
+sp-runtime = { version = "3.0.0", path = "../runtime" }
 
 [features]
 default = ["std"]
diff --git a/primitives/externalities/Cargo.toml b/primitives/externalities/Cargo.toml
index 6586d91808f7..05de1837dc1d 100644
--- a/primitives/externalities/Cargo.toml
+++ b/primitives/externalities/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-externalities"
-version = "0.8.1"
+version = "0.9.0"
 license = "Apache-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -14,8 +14,8 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-storage = { version = "2.0.0", path = "../storage", default-features = false }
-sp-std = { version = "2.0.0", path = "../std", default-features = false }
+sp-storage = { version = "3.0.0", path = "../storage", default-features = false }
+sp-std = { version = "3.0.0", path = "../std", default-features = false }
 environmental = { version = "1.1.2", default-features = false }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 
diff --git a/primitives/finality-grandpa/Cargo.toml b/primitives/finality-grandpa/Cargo.toml
index a9a6d4856109..c8ff2fc0a2e6 100644
--- a/primitives/finality-grandpa/Cargo.toml
+++ b/primitives/finality-grandpa/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-finality-grandpa"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -19,12 +19,12 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
 grandpa = { package = "finality-grandpa", version = "0.13.0", default-features = false, features = ["derive-codec"] }
 log = { version = "0.4.8", optional = true }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-sp-api = { version = "2.0.0", default-features = false, path = "../api" }
-sp-application-crypto = { version = "2.0.0", default-features = false, path = "../application-crypto" }
-sp-core = { version = "2.0.0", default-features = false, path = "../core" }
-sp-keystore = { version = "0.8.0", default-features = false, path = "../keystore", optional = true }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../runtime" }
-sp-std = { version = "2.0.0", default-features = false, path = "../std" }
+sp-api = { version = "3.0.0", default-features = false, path = "../api" }
+sp-application-crypto = { version = "3.0.0", default-features = false, path = "../application-crypto" }
+sp-core = { version = "3.0.0", default-features = false, path = "../core" }
+sp-keystore = { version = "0.9.0", default-features = false, path = "../keystore", optional = true }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../runtime" }
+sp-std = { version = "3.0.0", default-features = false, path = "../std" }
 
 [features]
 default = ["std"]
diff --git a/primitives/inherents/Cargo.toml b/primitives/inherents/Cargo.toml
index e1577a6a1b67..c0e74c0fb99f 100644
--- a/primitives/inherents/Cargo.toml
+++ b/primitives/inherents/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-inherents"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -16,8 +16,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 parking_lot = { version = "0.11.1", optional = true }
-sp-std = { version = "2.0.0", default-features = false, path = "../std" }
-sp-core = { version = "2.0.0", default-features = false, path = "../core" }
+sp-std = { version = "3.0.0", default-features = false, path = "../std" }
+sp-core = { version = "3.0.0", default-features = false, path = "../core" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.21", optional = true }
 
diff --git a/primitives/io/Cargo.toml b/primitives/io/Cargo.toml
index 1f509f7f9f21..f87711b17234 100644
--- a/primitives/io/Cargo.toml
+++ b/primitives/io/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-io"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -17,16 +17,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 hash-db = { version = "0.15.2", default-features = false }
-sp-core = { version = "2.0.0", default-features = false, path = "../core" }
-sp-keystore = { version = "0.8.0", default-features = false, optional = true, path = "../keystore" }
-sp-std = { version = "2.0.0", default-features = false, path = "../std" }
+sp-core = { version = "3.0.0", default-features = false, path = "../core" }
+sp-keystore = { version = "0.9.0", default-features = false, optional = true, path = "../keystore" }
+sp-std = { version = "3.0.0", default-features = false, path = "../std" }
 libsecp256k1 = { version = "0.3.4", optional = true }
-sp-state-machine = { version = "0.8.0", optional = true, path = "../state-machine" }
-sp-wasm-interface = { version = "2.0.0", path = "../wasm-interface", default-features = false }
-sp-runtime-interface = { version = "2.0.0", default-features = false, path = "../runtime-interface" }
-sp-trie = { version = "2.0.0", optional = true, path = "../trie" }
-sp-externalities = { version = "0.8.0", optional = true, path = "../externalities" }
-sp-tracing = { version = "2.0.0", default-features = false, path = "../tracing" }
+sp-state-machine = { version = "0.9.0", optional = true, path = "../state-machine" }
+sp-wasm-interface = { version = "3.0.0", path = "../wasm-interface", default-features = false }
+sp-runtime-interface = { version = "3.0.0", default-features = false, path = "../runtime-interface" }
+sp-trie = { version = "3.0.0", optional = true, path = "../trie" }
+sp-externalities = { version = "0.9.0", optional = true, path = "../externalities" }
+sp-tracing = { version = "3.0.0", default-features = false, path = "../tracing" }
 log = { version = "0.4.8", optional = true }
 futures = { version = "0.3.1", features = ["thread-pool"], optional = true }
 parking_lot = { version = "0.11.1", optional = true }
diff --git a/primitives/keyring/Cargo.toml b/primitives/keyring/Cargo.toml
index ae874ad24f8e..ee71687f1ef7 100644
--- a/primitives/keyring/Cargo.toml
+++ b/primitives/keyring/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-keyring"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 
 [dependencies]
-sp-core = { version = "2.0.0", path = "../core" }
-sp-runtime = { version = "2.0.0", path = "../runtime" }
+sp-core = { version = "3.0.0", path = "../core" }
+sp-runtime = { version = "3.0.0", path = "../runtime" }
 lazy_static = "1.4.0"
 strum = { version = "0.20.0", features = ["derive"] }
diff --git a/primitives/keystore/Cargo.toml b/primitives/keystore/Cargo.toml
index 186b569a96b8..81404ce344a2 100644
--- a/primitives/keystore/Cargo.toml
+++ b/primitives/keystore/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-keystore"
-version = "0.8.0"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -21,8 +21,8 @@ schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated", "u64_backen
 merlin = { version = "2.0", default-features = false }
 parking_lot = { version = "0.11.1", default-features = false }
 serde = { version = "1.0", optional = true}
-sp-core = { version = "2.0.0", path = "../core" }
-sp-externalities = { version = "0.8.0", path = "../externalities", default-features = false }
+sp-core = { version = "3.0.0", path = "../core" }
+sp-externalities = { version = "0.9.0", path = "../externalities", default-features = false }
 
 [dev-dependencies]
 rand = "0.7.2"
diff --git a/primitives/npos-elections/Cargo.toml b/primitives/npos-elections/Cargo.toml
index f9b0c260676b..79d46743cd75 100644
--- a/primitives/npos-elections/Cargo.toml
+++ b/primitives/npos-elections/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-npos-elections"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,15 +15,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-sp-std = { version = "2.0.0", default-features = false, path = "../std" }
-sp-npos-elections-compact = { version = "2.0.0", path = "./compact" }
-sp-arithmetic = { version = "2.0.0", default-features = false, path = "../arithmetic" }
-sp-core = { version = "2.0.0", default-features = false, path = "../core" }
+sp-std = { version = "3.0.0", default-features = false, path = "../std" }
+sp-npos-elections-compact = { version = "3.0.0", path = "./compact" }
+sp-arithmetic = { version = "3.0.0", default-features = false, path = "../arithmetic" }
+sp-core = { version = "3.0.0", default-features = false, path = "../core" }
 
 [dev-dependencies]
-substrate-test-utils = { version = "2.0.0", path = "../../test-utils" }
+substrate-test-utils = { version = "3.0.0", path = "../../test-utils" }
 rand = "0.7.3"
-sp-runtime = { version = "2.0.0", path = "../runtime" }
+sp-runtime = { version = "3.0.0", path = "../runtime" }
 
 [features]
 default = ["std"]
diff --git a/primitives/npos-elections/compact/Cargo.toml b/primitives/npos-elections/compact/Cargo.toml
index 7383dd67d593..57cb6dc1c4f2 100644
--- a/primitives/npos-elections/compact/Cargo.toml
+++ b/primitives/npos-elections/compact/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-npos-elections-compact"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/npos-elections/fuzzer/Cargo.toml b/primitives/npos-elections/fuzzer/Cargo.toml
index 690896f0152e..bac8a165f394 100644
--- a/primitives/npos-elections/fuzzer/Cargo.toml
+++ b/primitives/npos-elections/fuzzer/Cargo.toml
@@ -14,9 +14,9 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-npos-elections = { version = "2.0.0", path = ".." }
-sp-std = { version = "2.0.0", path = "../../std" }
-sp-runtime = { version = "2.0.0", path = "../../runtime" }
+sp-npos-elections = { version = "3.0.0", path = ".." }
+sp-std = { version = "3.0.0", path = "../../std" }
+sp-runtime = { version = "3.0.0", path = "../../runtime" }
 honggfuzz = "0.5"
 rand = { version = "0.7.3", features = ["std", "small_rng"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
diff --git a/primitives/offchain/Cargo.toml b/primitives/offchain/Cargo.toml
index 6678ac32ea67..1e3d0a34b26b 100644
--- a/primitives/offchain/Cargo.toml
+++ b/primitives/offchain/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "Substrate offchain workers primitives"
 name = "sp-offchain"
-version = "2.0.1"
+version = "3.0.0"
 license = "Apache-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -13,12 +13,12 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-core = { version = "2.0.0", default-features = false, path = "../core" }
-sp-api = { version = "2.0.0", default-features = false, path = "../api" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../runtime" }
+sp-core = { version = "3.0.0", default-features = false, path = "../core" }
+sp-api = { version = "3.0.0", default-features = false, path = "../api" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../runtime" }
 
 [dev-dependencies]
-sp-state-machine = { version = "0.8.0", default-features = false, path = "../state-machine" }
+sp-state-machine = { version = "0.9.0", default-features = false, path = "../state-machine" }
 
 [features]
 default = ["std"]
diff --git a/primitives/panic-handler/Cargo.toml b/primitives/panic-handler/Cargo.toml
index 5ec47423c014..ad03baca24eb 100644
--- a/primitives/panic-handler/Cargo.toml
+++ b/primitives/panic-handler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-panic-handler"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/rpc/Cargo.toml b/primitives/rpc/Cargo.toml
index 364489436278..de7e2bd882e7 100644
--- a/primitives/rpc/Cargo.toml
+++ b/primitives/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-rpc"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", features = ["derive"] }
-sp-core = { version = "2.0.0", path = "../core" }
+sp-core = { version = "3.0.0", path = "../core" }
 
 [dev-dependencies]
 serde_json = "1.0.41"
diff --git a/primitives/runtime-interface/Cargo.toml b/primitives/runtime-interface/Cargo.toml
index ccbcd470998b..c4eb084f685c 100644
--- a/primitives/runtime-interface/Cargo.toml
+++ b/primitives/runtime-interface/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-runtime-interface"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,22 +14,22 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-wasm-interface = { version = "2.0.0", path = "../wasm-interface", default-features = false }
-sp-std = { version = "2.0.0", default-features = false, path = "../std" }
-sp-tracing = { version = "2.0.0", default-features = false, path = "../tracing" }
-sp-runtime-interface-proc-macro = { version = "2.0.0", path = "proc-macro" }
-sp-externalities = { version = "0.8.0", optional = true, path = "../externalities" }
+sp-wasm-interface = { version = "3.0.0", path = "../wasm-interface", default-features = false }
+sp-std = { version = "3.0.0", default-features = false, path = "../std" }
+sp-tracing = { version = "3.0.0", default-features = false, path = "../tracing" }
+sp-runtime-interface-proc-macro = { version = "3.0.0", path = "proc-macro" }
+sp-externalities = { version = "0.9.0", optional = true, path = "../externalities" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 static_assertions = "1.0.0"
 primitive-types = { version = "0.9.0", default-features = false }
-sp-storage = { version = "2.0.0", default-features = false, path = "../storage" }
+sp-storage = { version = "3.0.0", default-features = false, path = "../storage" }
 impl-trait-for-tuples = "0.2.1"
 
 [dev-dependencies]
 sp-runtime-interface-test-wasm = { version = "2.0.0", path = "test-wasm" }
-sp-state-machine = { version = "0.8.0", path = "../state-machine" }
-sp-core = { version = "2.0.0", path = "../core" }
-sp-io = { version = "2.0.0", path = "../io" }
+sp-state-machine = { version = "0.9.0", path = "../state-machine" }
+sp-core = { version = "3.0.0", path = "../core" }
+sp-io = { version = "3.0.0", path = "../io" }
 rustversion = "1.0.0"
 trybuild = "1.0.38"
 
diff --git a/primitives/runtime-interface/proc-macro/Cargo.toml b/primitives/runtime-interface/proc-macro/Cargo.toml
index a63247758c3a..51732ac63181 100644
--- a/primitives/runtime-interface/proc-macro/Cargo.toml
+++ b/primitives/runtime-interface/proc-macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-runtime-interface-proc-macro"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/runtime-interface/test-wasm-deprecated/Cargo.toml b/primitives/runtime-interface/test-wasm-deprecated/Cargo.toml
index eba557de5dba..91febf68ed28 100644
--- a/primitives/runtime-interface/test-wasm-deprecated/Cargo.toml
+++ b/primitives/runtime-interface/test-wasm-deprecated/Cargo.toml
@@ -13,13 +13,13 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-runtime-interface = { version = "2.0.0", default-features = false, path = "../" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../std" }
-sp-io = { version = "2.0.0", default-features = false, path = "../../io" }
-sp-core = { version = "2.0.0", default-features = false, path = "../../core" }
+sp-runtime-interface = { version = "3.0.0", default-features = false, path = "../" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../std" }
+sp-io = { version = "3.0.0", default-features = false, path = "../../io" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../core" }
 
 [build-dependencies]
-substrate-wasm-builder = { version = "3.0.0", path = "../../../utils/wasm-builder" }
+substrate-wasm-builder = { version = "4.0.0", path = "../../../utils/wasm-builder" }
 
 [features]
 default = [ "std" ]
diff --git a/primitives/runtime-interface/test-wasm/Cargo.toml b/primitives/runtime-interface/test-wasm/Cargo.toml
index 3cf36f95145e..d0a61c5b920f 100644
--- a/primitives/runtime-interface/test-wasm/Cargo.toml
+++ b/primitives/runtime-interface/test-wasm/Cargo.toml
@@ -13,13 +13,13 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-runtime-interface = { version = "2.0.0", default-features = false, path = "../" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../std" }
-sp-io = { version = "2.0.0", default-features = false, path = "../../io" }
-sp-core = { version = "2.0.0", default-features = false, path = "../../core" }
+sp-runtime-interface = { version = "3.0.0", default-features = false, path = "../" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../std" }
+sp-io = { version = "3.0.0", default-features = false, path = "../../io" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../core" }
 
 [build-dependencies]
-substrate-wasm-builder = { version = "3.0.0", path = "../../../utils/wasm-builder" }
+substrate-wasm-builder = { version = "4.0.0", path = "../../../utils/wasm-builder" }
 
 [features]
 default = [ "std" ]
diff --git a/primitives/runtime-interface/test/Cargo.toml b/primitives/runtime-interface/test/Cargo.toml
index fb000166ac5b..f25183f02122 100644
--- a/primitives/runtime-interface/test/Cargo.toml
+++ b/primitives/runtime-interface/test/Cargo.toml
@@ -12,13 +12,13 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-runtime-interface = { version = "2.0.0", path = "../" }
-sc-executor = { version = "0.8.0", path = "../../../client/executor" }
+sp-runtime-interface = { version = "3.0.0", path = "../" }
+sc-executor = { version = "0.9.0", path = "../../../client/executor" }
 sp-runtime-interface-test-wasm = { version = "2.0.0", path = "../test-wasm" }
 sp-runtime-interface-test-wasm-deprecated = { version = "2.0.0", path = "../test-wasm-deprecated" }
-sp-state-machine = { version = "0.8.0", path = "../../state-machine" }
-sp-runtime = { version = "2.0.0", path = "../../runtime" }
-sp-core = { version = "2.0.0", path = "../../core" }
-sp-io = { version = "2.0.0", path = "../../io" }
+sp-state-machine = { version = "0.9.0", path = "../../state-machine" }
+sp-runtime = { version = "3.0.0", path = "../../runtime" }
+sp-core = { version = "3.0.0", path = "../../core" }
+sp-io = { version = "3.0.0", path = "../../io" }
 tracing = "0.1.22"
 tracing-core = "0.1.17"
diff --git a/primitives/runtime/Cargo.toml b/primitives/runtime/Cargo.toml
index 1ce71ff72bbb..0e4f6168ba11 100644
--- a/primitives/runtime/Cargo.toml
+++ b/primitives/runtime/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-runtime"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -17,11 +17,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-core = { version = "2.0.0", default-features = false, path = "../core" }
-sp-application-crypto = { version = "2.0.0", default-features = false, path = "../application-crypto" }
-sp-arithmetic = { version = "2.0.0", default-features = false, path = "../arithmetic" }
-sp-std = { version = "2.0.0", default-features = false, path = "../std" }
-sp-io = { version = "2.0.0", default-features = false, path = "../io" }
+sp-core = { version = "3.0.0", default-features = false, path = "../core" }
+sp-application-crypto = { version = "3.0.0", default-features = false, path = "../application-crypto" }
+sp-arithmetic = { version = "3.0.0", default-features = false, path = "../arithmetic" }
+sp-std = { version = "3.0.0", default-features = false, path = "../std" }
+sp-io = { version = "3.0.0", default-features = false, path = "../io" }
 log = { version = "0.4.8", optional = true }
 paste = "1.0"
 rand = { version = "0.7.2", optional = true }
@@ -33,7 +33,7 @@ either = { version = "1.5", default-features = false }
 [dev-dependencies]
 serde_json = "1.0.41"
 rand = "0.7.2"
-sp-state-machine = { version = "0.8.0", path = "../state-machine" }
+sp-state-machine = { version = "0.9.0", path = "../state-machine" }
 
 [features]
 bench = []
diff --git a/primitives/sandbox/Cargo.toml b/primitives/sandbox/Cargo.toml
index 44b52c388143..9efe5cde7a42 100755
--- a/primitives/sandbox/Cargo.toml
+++ b/primitives/sandbox/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-sandbox"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,10 +14,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 wasmi = { version = "0.6.2", optional = true }
-sp-core = { version = "2.0.0", default-features = false, path = "../core" }
-sp-std = { version = "2.0.0", default-features = false, path = "../std" }
-sp-io = { version = "2.0.0", default-features = false, path = "../io" }
-sp-wasm-interface = { version = "2.0.0", default-features = false, path = "../wasm-interface" }
+sp-core = { version = "3.0.0", default-features = false, path = "../core" }
+sp-std = { version = "3.0.0", default-features = false, path = "../std" }
+sp-io = { version = "3.0.0", default-features = false, path = "../io" }
+sp-wasm-interface = { version = "3.0.0", default-features = false, path = "../wasm-interface" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 
 [dev-dependencies]
diff --git a/primitives/serializer/Cargo.toml b/primitives/serializer/Cargo.toml
index 670d8736400b..51b53b43a40b 100644
--- a/primitives/serializer/Cargo.toml
+++ b/primitives/serializer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-serializer"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/session/Cargo.toml b/primitives/session/Cargo.toml
index 5b83e88c44fa..c04b271bc037 100644
--- a/primitives/session/Cargo.toml
+++ b/primitives/session/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-session"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,11 +14,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-api = { version = "2.0.0", default-features = false, path = "../api" }
-sp-core = { version = "2.0.0", default-features = false, path = "../core" }
-sp-std = { version = "2.0.0", default-features = false, path = "../std" }
-sp-staking = { version = "2.0.0", default-features = false, path = "../staking" }
-sp-runtime = { version = "2.0.0", optional = true, path = "../runtime" }
+sp-api = { version = "3.0.0", default-features = false, path = "../api" }
+sp-core = { version = "3.0.0", default-features = false, path = "../core" }
+sp-std = { version = "3.0.0", default-features = false, path = "../std" }
+sp-staking = { version = "3.0.0", default-features = false, path = "../staking" }
+sp-runtime = { version = "3.0.0", optional = true, path = "../runtime" }
 
 [features]
 default = [ "std" ]
diff --git a/primitives/staking/Cargo.toml b/primitives/staking/Cargo.toml
index f8203c130d47..cf2347082a88 100644
--- a/primitives/staking/Cargo.toml
+++ b/primitives/staking/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-staking"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,8 +14,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../runtime" }
-sp-std = { version = "2.0.0", default-features = false, path = "../std" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../runtime" }
+sp-std = { version = "3.0.0", default-features = false, path = "../std" }
 
 [features]
 default = ["std"]
diff --git a/primitives/state-machine/Cargo.toml b/primitives/state-machine/Cargo.toml
index 0c1a2a558f25..9db850cfe0b9 100644
--- a/primitives/state-machine/Cargo.toml
+++ b/primitives/state-machine/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-state-machine"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Substrate State Machine"
 edition = "2018"
@@ -20,19 +20,19 @@ parking_lot = { version = "0.11.1", optional = true }
 hash-db = { version = "0.15.2", default-features = false }
 trie-db = { version = "0.22.2", default-features = false }
 trie-root = { version = "0.16.0", default-features = false }
-sp-trie = { version = "2.0.0", path = "../trie", default-features = false }
-sp-core = { version = "2.0.0", path = "../core", default-features = false }
-sp-panic-handler = { version = "2.0.0", path = "../panic-handler", optional = true }
+sp-trie = { version = "3.0.0", path = "../trie", default-features = false }
+sp-core = { version = "3.0.0", path = "../core", default-features = false }
+sp-panic-handler = { version = "3.0.0", path = "../panic-handler", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 num-traits = { version = "0.2.8", default-features = false }
 rand = { version = "0.7.2", optional = true }
-sp-externalities = { version = "0.8.0", path = "../externalities", default-features = false }
+sp-externalities = { version = "0.9.0", path = "../externalities", default-features = false }
 smallvec = "1.4.1"
-sp-std = { version = "2.0.0", default-features = false, path = "../std" }
+sp-std = { version = "3.0.0", default-features = false, path = "../std" }
 
 [dev-dependencies]
 hex-literal = "0.3.1"
-sp-runtime = { version = "2.0.0", path = "../runtime" }
+sp-runtime = { version = "3.0.0", path = "../runtime" }
 pretty_assertions = "0.6.1"
 
 [features]
diff --git a/primitives/std/Cargo.toml b/primitives/std/Cargo.toml
index 91edfc973263..bafa1ea7ef41 100644
--- a/primitives/std/Cargo.toml
+++ b/primitives/std/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-std"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/storage/Cargo.toml b/primitives/storage/Cargo.toml
index 88580efb164e..7a984d920569 100644
--- a/primitives/storage/Cargo.toml
+++ b/primitives/storage/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-storage"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 description = "Storage related primitives"
@@ -14,11 +14,11 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-std = { version = "2.0.0", default-features = false, path = "../std" }
+sp-std = { version = "3.0.0", default-features = false, path = "../std" }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 impl-serde = { version = "0.3.1", optional = true }
 ref-cast = "1.0.0"
-sp-debug-derive = { version = "2.0.0", path = "../debug-derive" }
+sp-debug-derive = { version = "3.0.0", path = "../debug-derive" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 
 [features]
diff --git a/primitives/tasks/Cargo.toml b/primitives/tasks/Cargo.toml
index 1a655082a1e9..0a361b6c8dbb 100644
--- a/primitives/tasks/Cargo.toml
+++ b/primitives/tasks/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-tasks"
-version = "2.0.0"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,11 +15,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 log = { version = "0.4.8", optional = true }
-sp-core = { version = "2.0.0", default-features = false, path = "../core" }
-sp-externalities = { version = "0.8.0", optional = true, path = "../externalities" }
-sp-io = { version = "2.0.0", default-features = false, path = "../io" }
-sp-runtime-interface = { version = "2.0.0", default-features = false, path = "../runtime-interface" }
-sp-std = { version = "2.0.0", default-features = false, path = "../std" }
+sp-core = { version = "3.0.0", default-features = false, path = "../core" }
+sp-externalities = { version = "0.9.0", optional = true, path = "../externalities" }
+sp-io = { version = "3.0.0", default-features = false, path = "../io" }
+sp-runtime-interface = { version = "3.0.0", default-features = false, path = "../runtime-interface" }
+sp-std = { version = "3.0.0", default-features = false, path = "../std" }
 
 [dev-dependencies]
 codec = { package = "parity-scale-codec", default-features = false, version = "2.0.0" }
diff --git a/primitives/test-primitives/Cargo.toml b/primitives/test-primitives/Cargo.toml
index 0cd36afd950b..fbf29db96fa4 100644
--- a/primitives/test-primitives/Cargo.toml
+++ b/primitives/test-primitives/Cargo.toml
@@ -12,11 +12,11 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-application-crypto = { version = "2.0.0", default-features = false, path = "../application-crypto" }
+sp-application-crypto = { version = "3.0.0", default-features = false, path = "../application-crypto" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-core = { version = "2.0.0", default-features = false, path = "../core" }
+sp-core = { version = "3.0.0", default-features = false, path = "../core" }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../runtime" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../runtime" }
 parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
 
 [features]
diff --git a/primitives/timestamp/Cargo.toml b/primitives/timestamp/Cargo.toml
index 915c589ecc16..53fb37d4deb4 100644
--- a/primitives/timestamp/Cargo.toml
+++ b/primitives/timestamp/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-timestamp"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -13,11 +13,11 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-api = { version = "2.0.0", default-features = false, path = "../api" }
-sp-std = { version = "2.0.0", default-features = false, path = "../std" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../runtime" }
+sp-api = { version = "3.0.0", default-features = false, path = "../api" }
+sp-std = { version = "3.0.0", default-features = false, path = "../std" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../runtime" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-inherents = { version = "2.0.0", default-features = false, path = "../inherents" }
+sp-inherents = { version = "3.0.0", default-features = false, path = "../inherents" }
 impl-trait-for-tuples = "0.2.1"
 wasm-timer = { version = "0.2", optional = true }
 
diff --git a/primitives/tracing/Cargo.toml b/primitives/tracing/Cargo.toml
index 909641ca1270..13804353eca7 100644
--- a/primitives/tracing/Cargo.toml
+++ b/primitives/tracing/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-tracing"
-version = "2.0.1"
+version = "3.0.0"
 license = "Apache-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -18,7 +18,7 @@ features = ["with-tracing"]
 targets = ["x86_64-unknown-linux-gnu", "wasm32-unknown-unknown"]
 
 [dependencies]
-sp-std = { version = "2.0.0", path = "../std", default-features = false}
+sp-std = { version = "3.0.0", path = "../std", default-features = false}
 codec = { version = "2.0.0", package = "parity-scale-codec", default-features = false, features = ["derive"]}
 tracing = { version = "0.1.22", default-features = false }
 tracing-core = { version = "0.1.17", default-features = false }
diff --git a/primitives/transaction-pool/Cargo.toml b/primitives/transaction-pool/Cargo.toml
index 6454ff509fda..d431e444d457 100644
--- a/primitives/transaction-pool/Cargo.toml
+++ b/primitives/transaction-pool/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-transaction-pool"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -20,9 +20,9 @@ derive_more = { version = "0.99.11", optional = true }
 futures = { version = "0.3.1", optional = true }
 log = { version = "0.4.8", optional = true }
 serde = { version = "1.0.101", features = ["derive"], optional = true}
-sp-api = { version = "2.0.0", default-features = false, path = "../api" }
-sp-blockchain = { version = "2.0.0", optional = true, path = "../blockchain" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../runtime" }
+sp-api = { version = "3.0.0", default-features = false, path = "../api" }
+sp-blockchain = { version = "3.0.0", optional = true, path = "../blockchain" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../runtime" }
 
 [features]
 default = [ "std" ]
diff --git a/primitives/trie/Cargo.toml b/primitives/trie/Cargo.toml
index c7f80480a321..4396550a48a8 100644
--- a/primitives/trie/Cargo.toml
+++ b/primitives/trie/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-trie"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Patricia trie stuff using a parity-scale-codec node format"
 repository = "https://github.com/paritytech/substrate/"
@@ -19,19 +19,19 @@ harness = false
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-std = { version = "2.0.0", default-features = false, path = "../std" }
+sp-std = { version = "3.0.0", default-features = false, path = "../std" }
 hash-db = { version = "0.15.2", default-features = false }
 trie-db = { version = "0.22.2", default-features = false }
 trie-root = { version = "0.16.0", default-features = false }
 memory-db = { version = "0.26.0", default-features = false }
-sp-core = { version = "2.0.0", default-features = false, path = "../core" }
+sp-core = { version = "3.0.0", default-features = false, path = "../core" }
 
 [dev-dependencies]
 trie-bench = "0.27.0"
 trie-standardmap = "0.15.2"
 criterion = "0.3.3"
 hex-literal = "0.3.1"
-sp-runtime = { version = "2.0.0", path = "../runtime" }
+sp-runtime = { version = "3.0.0", path = "../runtime" }
 
 [features]
 default = ["std"]
diff --git a/primitives/utils/Cargo.toml b/primitives/utils/Cargo.toml
index 2a67dd858904..7669cee346d0 100644
--- a/primitives/utils/Cargo.toml
+++ b/primitives/utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-utils"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/version/Cargo.toml b/primitives/version/Cargo.toml
index 0c38e8a74184..bfb9a742c868 100644
--- a/primitives/version/Cargo.toml
+++ b/primitives/version/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-version"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -18,8 +18,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 impl-serde = { version = "0.3.1", optional = true }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "2.0.0", default-features = false, path = "../std" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../runtime" }
+sp-std = { version = "3.0.0", default-features = false, path = "../std" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../runtime" }
 
 [features]
 default = ["std"]
diff --git a/primitives/wasm-interface/Cargo.toml b/primitives/wasm-interface/Cargo.toml
index a788d6ac92ae..1721df4a8668 100644
--- a/primitives/wasm-interface/Cargo.toml
+++ b/primitives/wasm-interface/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-wasm-interface"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 wasmi = { version = "0.6.2", optional = true }
 impl-trait-for-tuples = "0.2.1"
-sp-std = { version = "2.0.0", path = "../std", default-features = false }
+sp-std = { version = "3.0.0", path = "../std", default-features = false }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 
 [features]
diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml
index 1b15c34401fe..0a8849fe98a7 100644
--- a/test-utils/Cargo.toml
+++ b/test-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-test-utils"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -13,9 +13,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 futures = { version = "0.3.1", features = ["compat"] }
-substrate-test-utils-derive = { version = "0.8.0", path = "./derive" }
+substrate-test-utils-derive = { version = "0.9.0", path = "./derive" }
 tokio = { version = "0.2.13", features = ["macros"] }
 
 [dev-dependencies]
-sc-service = { version = "0.8.0", path = "../client/service" }
+sc-service = { version = "0.9.0", path = "../client/service" }
 trybuild = { version = "1.0.38", features = [ "diff" ] }
diff --git a/test-utils/client/Cargo.toml b/test-utils/client/Cargo.toml
index 0b5fba78c114..1f62e32ddf59 100644
--- a/test-utils/client/Cargo.toml
+++ b/test-utils/client/Cargo.toml
@@ -19,16 +19,16 @@ hash-db = "0.15.2"
 hex = "0.4"
 serde = "1.0.55"
 serde_json = "1.0.55"
-sc-client-api = { version = "2.0.0", path = "../../client/api" }
-sc-client-db = { version = "0.8.0", features = ["test-helpers"], path = "../../client/db" }
-sc-consensus = { version = "0.8.0", path = "../../client/consensus/common" }
-sc-executor = { version = "0.8.0", path = "../../client/executor" }
-sc-light = { version = "2.0.0", path = "../../client/light" }
-sc-service = { version = "0.8.0", default-features = false, features = ["test-helpers"],  path = "../../client/service" }
-sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
-sp-consensus = { version = "0.8.0", path = "../../primitives/consensus/common" }
-sp-core = { version = "2.0.0", path = "../../primitives/core" }
-sp-keystore = { version = "0.8.0", path = "../../primitives/keystore" }
-sp-keyring = { version = "2.0.0", path = "../../primitives/keyring" }
-sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
-sp-state-machine = { version = "0.8.0", path = "../../primitives/state-machine" }
+sc-client-api = { version = "3.0.0", path = "../../client/api" }
+sc-client-db = { version = "0.9.0", features = ["test-helpers"], path = "../../client/db" }
+sc-consensus = { version = "0.9.0", path = "../../client/consensus/common" }
+sc-executor = { version = "0.9.0", path = "../../client/executor" }
+sc-light = { version = "3.0.0", path = "../../client/light" }
+sc-service = { version = "0.9.0", default-features = false, features = ["test-helpers"],  path = "../../client/service" }
+sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
+sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-keystore = { version = "0.9.0", path = "../../primitives/keystore" }
+sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
+sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
+sp-state-machine = { version = "0.9.0", path = "../../primitives/state-machine" }
diff --git a/test-utils/derive/Cargo.toml b/test-utils/derive/Cargo.toml
index 1fb1db555f49..8f9a37f8dba6 100644
--- a/test-utils/derive/Cargo.toml
+++ b/test-utils/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-test-utils-derive"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/test-utils/runtime/Cargo.toml b/test-utils/runtime/Cargo.toml
index 8b9dc20b5976..1a841ac0755a 100644
--- a/test-utils/runtime/Cargo.toml
+++ b/test-utils/runtime/Cargo.toml
@@ -13,37 +13,37 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-application-crypto = { version = "2.0.0", default-features = false, path = "../../primitives/application-crypto" }
-sp-consensus-aura = { version = "0.8.0", default-features = false, path = "../../primitives/consensus/aura" }
-sp-consensus-babe = { version = "0.8.0", default-features = false, path = "../../primitives/consensus/babe" }
-sp-block-builder = { version = "2.0.0", default-features = false, path = "../../primitives/block-builder" }
+sp-application-crypto = { version = "3.0.0", default-features = false, path = "../../primitives/application-crypto" }
+sp-consensus-aura = { version = "0.9.0", default-features = false, path = "../../primitives/consensus/aura" }
+sp-consensus-babe = { version = "0.9.0", default-features = false, path = "../../primitives/consensus/babe" }
+sp-block-builder = { version = "3.0.0", default-features = false, path = "../../primitives/block-builder" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-frame-executive = { version = "2.0.0", default-features = false, path = "../../frame/executive" }
-sp-inherents = { version = "2.0.0", default-features = false, path = "../../primitives/inherents" }
-sp-keyring = { version = "2.0.0", optional = true, path = "../../primitives/keyring" }
+frame-executive = { version = "3.0.0", default-features = false, path = "../../frame/executive" }
+sp-inherents = { version = "3.0.0", default-features = false, path = "../../primitives/inherents" }
+sp-keyring = { version = "3.0.0", optional = true, path = "../../primitives/keyring" }
 memory-db = { version = "0.26.0", default-features = false }
-sp-offchain = { path = "../../primitives/offchain", default-features = false, version = "2.0.0"}
-sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
-sp-runtime-interface = { path = "../../primitives/runtime-interface", default-features = false, version = "2.0.0"}
-sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
-frame-support = { version = "2.0.0", default-features = false, path = "../../frame/support" }
-sp-version = { version = "2.0.0", default-features = false, path = "../../primitives/version" }
-sp-session = { version = "2.0.0", default-features = false, path = "../../primitives/session" }
-sp-api = { version = "2.0.0", default-features = false, path = "../../primitives/api" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
-pallet-babe = { version = "2.0.0", default-features = false, path = "../../frame/babe" }
-frame-system = { version = "2.0.0", default-features = false, path = "../../frame/system" }
-frame-system-rpc-runtime-api = { version = "2.0.0", default-features = false, path = "../../frame/system/rpc/runtime-api" }
-pallet-timestamp = { version = "2.0.0", default-features = false, path = "../../frame/timestamp" }
-sp-finality-grandpa = { version = "2.0.0", default-features = false, path = "../../primitives/finality-grandpa" }
-sp-trie = { version = "2.0.0", default-features = false, path = "../../primitives/trie" }
-sp-transaction-pool = { version = "2.0.0", default-features = false, path = "../../primitives/transaction-pool" }
+sp-offchain = { path = "../../primitives/offchain", default-features = false, version = "3.0.0"}
+sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-runtime-interface = { path = "../../primitives/runtime-interface", default-features = false, version = "3.0.0"}
+sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
+frame-support = { version = "3.0.0", default-features = false, path = "../../frame/support" }
+sp-version = { version = "3.0.0", default-features = false, path = "../../primitives/version" }
+sp-session = { version = "3.0.0", default-features = false, path = "../../primitives/session" }
+sp-api = { version = "3.0.0", default-features = false, path = "../../primitives/api" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+pallet-babe = { version = "3.0.0", default-features = false, path = "../../frame/babe" }
+frame-system = { version = "3.0.0", default-features = false, path = "../../frame/system" }
+frame-system-rpc-runtime-api = { version = "3.0.0", default-features = false, path = "../../frame/system/rpc/runtime-api" }
+pallet-timestamp = { version = "3.0.0", default-features = false, path = "../../frame/timestamp" }
+sp-finality-grandpa = { version = "3.0.0", default-features = false, path = "../../primitives/finality-grandpa" }
+sp-trie = { version = "3.0.0", default-features = false, path = "../../primitives/trie" }
+sp-transaction-pool = { version = "3.0.0", default-features = false, path = "../../primitives/transaction-pool" }
 trie-db = { version = "0.22.2", default-features = false }
 parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
-sc-service = { version = "0.8.0", default-features = false, optional = true, features = ["test-helpers"], path = "../../client/service" }
-sp-state-machine = { version = "0.8.0", default-features = false, path = "../../primitives/state-machine" }
-sp-externalities = { version = "0.8.0", default-features = false, path = "../../primitives/externalities" }
+sc-service = { version = "0.9.0", default-features = false, optional = true, features = ["test-helpers"], path = "../../client/service" }
+sp-state-machine = { version = "0.9.0", default-features = false, path = "../../primitives/state-machine" }
+sp-externalities = { version = "0.9.0", default-features = false, path = "../../primitives/externalities" }
 
 # 3rd party
 cfg-if = "1.0"
@@ -51,12 +51,12 @@ log = { version = "0.4.8", optional = true }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 
 [dev-dependencies]
-sc-block-builder = { version = "0.8.0", path = "../../client/block-builder" }
-sc-executor = { version = "0.8.0", path = "../../client/executor" }
+sc-block-builder = { version = "0.9.0", path = "../../client/block-builder" }
+sc-executor = { version = "0.9.0", path = "../../client/executor" }
 substrate-test-runtime-client = { version = "2.0.0", path = "./client" }
 
 [build-dependencies]
-substrate-wasm-builder = { version = "3.0.0", path = "../../utils/wasm-builder" }
+substrate-wasm-builder = { version = "4.0.0", path = "../../utils/wasm-builder" }
 
 [features]
 default = [
diff --git a/test-utils/runtime/client/Cargo.toml b/test-utils/runtime/client/Cargo.toml
index 9a6a4fb60b07..0c822f0cdff8 100644
--- a/test-utils/runtime/client/Cargo.toml
+++ b/test-utils/runtime/client/Cargo.toml
@@ -12,17 +12,17 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sc-light = { version = "2.0.0", path = "../../../client/light" }
-sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
-sc-block-builder = { version = "0.8.0", path = "../../../client/block-builder" }
+sc-light = { version = "3.0.0", path = "../../../client/light" }
+sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
+sc-block-builder = { version = "0.9.0", path = "../../../client/block-builder" }
 substrate-test-client = { version = "2.0.0", path = "../../client" }
-sp-core = { version = "2.0.0", path = "../../../primitives/core" }
+sp-core = { version = "3.0.0", path = "../../../primitives/core" }
 substrate-test-runtime = { version = "2.0.0", path = "../../runtime" }
-sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
-sp-api = { version = "2.0.0", path = "../../../primitives/api" }
-sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
+sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
+sp-api = { version = "3.0.0", path = "../../../primitives/api" }
+sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-sc-client-api = { version = "2.0.0", path = "../../../client/api" }
-sc-consensus = { version = "0.8.0", path = "../../../client/consensus/common" }
-sc-service = { version = "0.8.0", default-features = false, path = "../../../client/service" }
+sc-client-api = { version = "3.0.0", path = "../../../client/api" }
+sc-consensus = { version = "0.9.0", path = "../../../client/consensus/common" }
+sc-service = { version = "0.9.0", default-features = false, path = "../../../client/service" }
 futures = "0.3.9"
diff --git a/test-utils/runtime/transaction-pool/Cargo.toml b/test-utils/runtime/transaction-pool/Cargo.toml
index 1e254a4c2450..6e4e6524c369 100644
--- a/test-utils/runtime/transaction-pool/Cargo.toml
+++ b/test-utils/runtime/transaction-pool/Cargo.toml
@@ -15,9 +15,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 substrate-test-runtime-client = { version = "2.0.0", path = "../client" }
 parking_lot = "0.11.1"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
-sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
-sp-transaction-pool = { version = "2.0.0", path = "../../../primitives/transaction-pool" }
-sc-transaction-graph = { version = "2.0.0", path = "../../../client/transaction-pool/graph" }
+sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
+sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
+sp-transaction-pool = { version = "3.0.0", path = "../../../primitives/transaction-pool" }
+sc-transaction-graph = { version = "3.0.0", path = "../../../client/transaction-pool/graph" }
 futures = { version = "0.3.1", features = ["compat"] }
 derive_more = "0.99.2"
diff --git a/test-utils/test-crate/Cargo.toml b/test-utils/test-crate/Cargo.toml
index 4e1273b25c99..846b14fe0774 100644
--- a/test-utils/test-crate/Cargo.toml
+++ b/test-utils/test-crate/Cargo.toml
@@ -13,5 +13,5 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dev-dependencies]
 tokio = { version = "0.2.13", features = ["macros"] }
-test-utils = { version = "2.0.0", path = "..", package = "substrate-test-utils" }
-sc-service = { version = "0.8.0", path = "../../client/service" }
+test-utils = { version = "3.0.0", path = "..", package = "substrate-test-utils" }
+sc-service = { version = "0.9.0", path = "../../client/service" }
diff --git a/utils/browser/Cargo.toml b/utils/browser/Cargo.toml
index 26688610af19..d7051620fcfd 100644
--- a/utils/browser/Cargo.toml
+++ b/utils/browser/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-browser-utils"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Utilities for creating a browser light-client."
 edition = "2018"
@@ -22,13 +22,13 @@ js-sys = "0.3.34"
 wasm-bindgen = "0.2.57"
 wasm-bindgen-futures = "0.4.18"
 kvdb-web = "0.9.0"
-sp-database = { version = "2.0.0", path = "../../primitives/database" }
-sc-informant = { version = "0.8.0", path = "../../client/informant" }
-sc-service = { version = "0.8.0", path = "../../client/service", default-features = false }
-sc-network = { path = "../../client/network", version = "0.8.0"}
-sc-chain-spec = { path = "../../client/chain-spec", version = "2.0.0"}
-sc-telemetry = { path = "../../client/telemetry", version = "2.0.0"}
-sc-tracing = { path = "../../client/tracing", version = "2.0.0"}
+sp-database = { version = "3.0.0", path = "../../primitives/database" }
+sc-informant = { version = "0.9.0", path = "../../client/informant" }
+sc-service = { version = "0.9.0", path = "../../client/service", default-features = false }
+sc-network = { path = "../../client/network", version = "0.9.0"}
+sc-chain-spec = { path = "../../client/chain-spec", version = "3.0.0"}
+sc-telemetry = { path = "../../client/telemetry", version = "3.0.0"}
+sc-tracing = { path = "../../client/tracing", version = "3.0.0"}
 
 # Imported just for the `wasm-bindgen` feature
 getrandom = { version = "0.2", features = ["js"] }
diff --git a/utils/build-script-utils/Cargo.toml b/utils/build-script-utils/Cargo.toml
index 28e511c4ee98..fbef70db93bf 100644
--- a/utils/build-script-utils/Cargo.toml
+++ b/utils/build-script-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-build-script-utils"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/utils/fork-tree/Cargo.toml b/utils/fork-tree/Cargo.toml
index 73dc3aa1e6bd..11c269bc3cba 100644
--- a/utils/fork-tree/Cargo.toml
+++ b/utils/fork-tree/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fork-tree"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/utils/frame/benchmarking-cli/Cargo.toml b/utils/frame/benchmarking-cli/Cargo.toml
index 2e951e1e828c..c810bd4d57d7 100644
--- a/utils/frame/benchmarking-cli/Cargo.toml
+++ b/utils/frame/benchmarking-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-benchmarking-cli"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -13,16 +13,16 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-frame-benchmarking = { version = "2.0.0", path = "../../../frame/benchmarking" }
-sp-core = { version = "2.0.0", path = "../../../primitives/core" }
-sc-service = { version = "0.8.0", default-features = false, path = "../../../client/service" }
-sc-cli = { version = "0.8.0", path = "../../../client/cli" }
-sc-client-db = { version = "0.8.0", path = "../../../client/db" }
-sc-executor = { version = "0.8.0", path = "../../../client/executor" }
-sp-externalities = { version = "0.8.0", path = "../../../primitives/externalities" }
-sp-keystore = { version = "0.8.0", path = "../../../primitives/keystore" }
-sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
-sp-state-machine = { version = "0.8.0", path = "../../../primitives/state-machine" }
+frame-benchmarking = { version = "3.0.0", path = "../../../frame/benchmarking" }
+sp-core = { version = "3.0.0", path = "../../../primitives/core" }
+sc-service = { version = "0.9.0", default-features = false, path = "../../../client/service" }
+sc-cli = { version = "0.9.0", path = "../../../client/cli" }
+sc-client-db = { version = "0.9.0", path = "../../../client/db" }
+sc-executor = { version = "0.9.0", path = "../../../client/executor" }
+sp-externalities = { version = "0.9.0", path = "../../../primitives/externalities" }
+sp-keystore = { version = "0.9.0", path = "../../../primitives/keystore" }
+sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
+sp-state-machine = { version = "0.9.0", path = "../../../primitives/state-machine" }
 codec = { version = "2.0.0", package = "parity-scale-codec" }
 structopt = "0.3.8"
 chrono = "0.4"
diff --git a/utils/frame/frame-utilities-cli/Cargo.toml b/utils/frame/frame-utilities-cli/Cargo.toml
index 4f0030b02182..cb37119edf0b 100644
--- a/utils/frame/frame-utilities-cli/Cargo.toml
+++ b/utils/frame/frame-utilities-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-frame-cli"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -11,11 +11,11 @@ documentation = "https://docs.rs/substrate-frame-cli"
 readme = "README.md"
 
 [dependencies]
-sp-core = { version = "2.0.0", path = "../../../primitives/core" }
-sc-cli = { version = "0.8.0", path = "../../../client/cli" }
-sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
+sp-core = { version = "3.0.0", path = "../../../primitives/core" }
+sc-cli = { version = "0.9.0", path = "../../../client/cli" }
+sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
 structopt = "0.3.8"
-frame-system = { version = "2.0.0", path = "../../../frame/system" }
+frame-system = { version = "3.0.0", path = "../../../frame/system" }
 
 [dev-dependencies]
 
diff --git a/utils/frame/rpc/support/Cargo.toml b/utils/frame/rpc/support/Cargo.toml
index a9c55132e240..ca3705b499a2 100644
--- a/utils/frame/rpc/support/Cargo.toml
+++ b/utils/frame/rpc/support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-frame-rpc-support"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>", "Andrew Dirksen <andrew@dirksen.com>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -17,10 +17,10 @@ jsonrpc-client-transports = { version = "15.1.0", default-features = false, feat
 jsonrpc-core = "15.1.0"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 serde = "1"
-frame-support = { version = "2.0.0", path = "../../../../frame/support" }
-sp-storage = { version = "2.0.0", path = "../../../../primitives/storage" }
-sc-rpc-api = { version = "0.8.0", path = "../../../../client/rpc-api" }
+frame-support = { version = "3.0.0", path = "../../../../frame/support" }
+sp-storage = { version = "3.0.0", path = "../../../../primitives/storage" }
+sc-rpc-api = { version = "0.9.0", path = "../../../../client/rpc-api" }
 
 [dev-dependencies]
-frame-system = { version = "2.0.0", path = "../../../../frame/system" }
+frame-system = { version = "3.0.0", path = "../../../../frame/system" }
 tokio = "0.2"
diff --git a/utils/frame/rpc/system/Cargo.toml b/utils/frame/rpc/system/Cargo.toml
index 5a75d01c4d47..ea8d97a82ad3 100644
--- a/utils/frame/rpc/system/Cargo.toml
+++ b/utils/frame/rpc/system/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-frame-rpc-system"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sc-client-api = { version = "2.0.0", path = "../../../../client/api" }
+sc-client-api = { version = "3.0.0", path = "../../../../client/api" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 futures = { version = "0.3.4", features = ["compat"] }
 jsonrpc-core = "15.1.0"
@@ -21,16 +21,16 @@ jsonrpc-core-client = "15.1.0"
 jsonrpc-derive = "15.1.0"
 log = "0.4.8"
 serde = { version = "1.0.101", features = ["derive"] }
-sp-runtime = { version = "2.0.0", path = "../../../../primitives/runtime" }
-sp-api = { version = "2.0.0", path = "../../../../primitives/api" }
-frame-system-rpc-runtime-api = { version = "2.0.0", path = "../../../../frame/system/rpc/runtime-api" }
-sp-core = { version = "2.0.0", path = "../../../../primitives/core" }
-sp-blockchain = { version = "2.0.0", path = "../../../../primitives/blockchain" }
-sp-transaction-pool = { version = "2.0.0", path = "../../../../primitives/transaction-pool" }
-sp-block-builder = { version = "2.0.0", path = "../../../../primitives/block-builder" }
-sc-rpc-api = { version = "0.8.0", path = "../../../../client/rpc-api" }
+sp-runtime = { version = "3.0.0", path = "../../../../primitives/runtime" }
+sp-api = { version = "3.0.0", path = "../../../../primitives/api" }
+frame-system-rpc-runtime-api = { version = "3.0.0", path = "../../../../frame/system/rpc/runtime-api" }
+sp-core = { version = "3.0.0", path = "../../../../primitives/core" }
+sp-blockchain = { version = "3.0.0", path = "../../../../primitives/blockchain" }
+sp-transaction-pool = { version = "3.0.0", path = "../../../../primitives/transaction-pool" }
+sp-block-builder = { version = "3.0.0", path = "../../../../primitives/block-builder" }
+sc-rpc-api = { version = "0.9.0", path = "../../../../client/rpc-api" }
 
 [dev-dependencies]
 substrate-test-runtime-client = { version = "2.0.0", path = "../../../../test-utils/runtime/client" }
-sp-tracing = { version = "2.0.0", path = "../../../../primitives/tracing" }
-sc-transaction-pool = { version = "2.0.0", path = "../../../../client/transaction-pool" }
+sp-tracing = { version = "3.0.0", path = "../../../../primitives/tracing" }
+sc-transaction-pool = { version = "3.0.0", path = "../../../../client/transaction-pool" }
diff --git a/utils/prometheus/Cargo.toml b/utils/prometheus/Cargo.toml
index ef0f6e309d3d..a7f90e831620 100644
--- a/utils/prometheus/Cargo.toml
+++ b/utils/prometheus/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "Endpoint to expose Prometheus metrics"
 name = "substrate-prometheus-endpoint"
-version = "0.8.1"
+version = "0.9.0"
 license = "Apache-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
diff --git a/utils/wasm-builder/Cargo.toml b/utils/wasm-builder/Cargo.toml
index 199e26b509e2..c9d165ce8a14 100644
--- a/utils/wasm-builder/Cargo.toml
+++ b/utils/wasm-builder/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-wasm-builder"
-version = "3.0.0"
+version = "4.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Utility for building WASM binaries"
 edition = "2018"

From 3957f43912e43fd28b624bb0736141ac24b51615 Mon Sep 17 00:00:00 2001
From: Martin Pugh <pugh@s3kr.it>
Date: Thu, 11 Feb 2021 13:34:43 +0100
Subject: [PATCH 0391/1194] [CI] Move check_labels to github actions (#8099)

* move lib.sh to common dir

* make check-labels a github action workflow
---
 .github/workflows/check-labels.yml           | 16 ++++++++++++++++
 .gitlab-ci.yml                               | 11 -----------
 .maintain/{gitlab => common}/lib.sh          | 12 +++++++++---
 .maintain/{gitlab => github}/check_labels.sh | 13 ++++++++-----
 .maintain/gitlab/check_signed.sh             |  4 ++--
 .maintain/gitlab/generate_changelog.sh       |  4 ++--
 .maintain/gitlab/publish_draft_release.sh    |  4 ++--
 7 files changed, 39 insertions(+), 25 deletions(-)
 create mode 100644 .github/workflows/check-labels.yml
 rename .maintain/{gitlab => common}/lib.sh (89%)
 rename .maintain/{gitlab => github}/check_labels.sh (76%)

diff --git a/.github/workflows/check-labels.yml b/.github/workflows/check-labels.yml
new file mode 100644
index 000000000000..ee0307517699
--- /dev/null
+++ b/.github/workflows/check-labels.yml
@@ -0,0 +1,16 @@
+name: Check labels
+
+on:
+  pull_request:
+    types: [labeled, opened, synchronize, unlabeled]
+
+jobs:
+  check-labels:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Check labels
+        run: bash ${{ github.workspace }}/.maintain/github/check_labels.sh
+        env:
+          GITHUB_PR: ${{ github.event.pull_request.number }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index de1655c39d59..4a410cf3e5df 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -687,14 +687,3 @@ validator 4 4:
   <<:                              *validator-deploy
   script:
     - ./.maintain/flamingfir-deploy.sh flamingfir-validator4
-
-#### stage:                        .post
-
-check-labels:
-  stage:                           .post
-  image:                           paritytech/tools:latest
-  <<:                              *kubernetes-build
-  rules:
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
-  script:
-    - ./.maintain/gitlab/check_labels.sh
diff --git a/.maintain/gitlab/lib.sh b/.maintain/common/lib.sh
similarity index 89%
rename from .maintain/gitlab/lib.sh
rename to .maintain/common/lib.sh
index 33477b52f589..1d4be0ecc729 100755
--- a/.maintain/gitlab/lib.sh
+++ b/.maintain/common/lib.sh
@@ -66,11 +66,17 @@ has_label(){
   repo="$1"
   pr_id="$2"
   label="$3"
+
+  # These will exist if the function is called in Gitlab.
+  # If the function's called in Github, we should have GITHUB_ACCESS_TOKEN set
+  # already.
   if [ -n "$GITHUB_RELEASE_TOKEN" ]; then
-    out=$(curl -H "Authorization: token $GITHUB_RELEASE_TOKEN" -s "$api_base/$repo/pulls/$pr_id")
-  else
-    out=$(curl -H "Authorization: token $GITHUB_PR_TOKEN" -s "$api_base/$repo/pulls/$pr_id")
+    GITHUB_TOKEN="$GITHUB_RELEASE_TOKEN"
+  elif [ -n "$GITHUB_PR_TOKEN" ]; then
+    GITHUB_TOKEN="$GITHUB_PR_TOKEN"
   fi
+
+  out=$(curl -H "Authorization: token $GITHUB_TOKEN" -s "$api_base/$repo/pulls/$pr_id")
   [ -n "$(echo "$out" | tr -d '\r\n' | jq ".labels | .[] | select(.name==\"$label\")")" ]
 }
 
diff --git a/.maintain/gitlab/check_labels.sh b/.maintain/github/check_labels.sh
similarity index 76%
rename from .maintain/gitlab/check_labels.sh
rename to .maintain/github/check_labels.sh
index 5ab099b38291..75190db6683f 100755
--- a/.maintain/gitlab/check_labels.sh
+++ b/.maintain/github/check_labels.sh
@@ -1,11 +1,14 @@
 #!/usr/bin/env bash
 
-#shellcheck source=lib.sh
-source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )/lib.sh"
+#shellcheck source=../common/lib.sh
+source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )/../common/lib.sh"
+
+repo="$GITHUB_REPOSITORY"
+pr="$GITHUB_PR"
 
 ensure_labels() {
   for label in "$@"; do
-    if has_label 'paritytech/substrate' "$CI_COMMIT_BRANCH" "$label"; then
+    if has_label "$repo" "$pr" "$label"; then
       return 0
     fi
   done
@@ -27,7 +30,7 @@ criticality_labels=(
   'C9-critical'
 )
 
-echo "[+] Checking release notes (B) labels for $CI_COMMIT_BRANCH"
+echo "[+] Checking release notes (B) labels"
 if ensure_labels "${releasenotes_labels[@]}";  then
   echo "[+] Release notes label detected. All is well."
 else
@@ -35,7 +38,7 @@ else
   exit 1
 fi
 
-echo "[+] Checking release criticality (C) labels for $CI_COMMIT_BRANCH"
+echo "[+] Checking release criticality (C) labels"
 if ensure_labels "${criticality_labels[@]}";  then
   echo "[+] Release criticality label detected. All is well."
 else
diff --git a/.maintain/gitlab/check_signed.sh b/.maintain/gitlab/check_signed.sh
index 7c4cc47baba3..20d47c230476 100755
--- a/.maintain/gitlab/check_signed.sh
+++ b/.maintain/gitlab/check_signed.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-# shellcheck source=lib.sh
-source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )/lib.sh"
+# shellcheck source=../common/lib.sh
+source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )/../common/lib.sh"
 
 version="$CI_COMMIT_TAG"
 
diff --git a/.maintain/gitlab/generate_changelog.sh b/.maintain/gitlab/generate_changelog.sh
index c13871f50ee4..a1190f2bf0bc 100755
--- a/.maintain/gitlab/generate_changelog.sh
+++ b/.maintain/gitlab/generate_changelog.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-# shellcheck source=lib.sh
-source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )/lib.sh"
+# shellcheck source=../common/lib.sh
+source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )/../common/lib.sh"
 
 version="$2"
 last_version="$1"
diff --git a/.maintain/gitlab/publish_draft_release.sh b/.maintain/gitlab/publish_draft_release.sh
index c5813718a69f..36ee0d63e78f 100755
--- a/.maintain/gitlab/publish_draft_release.sh
+++ b/.maintain/gitlab/publish_draft_release.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-# shellcheck source=lib.sh
-source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )/lib.sh"
+# shellcheck source=../common/lib.sh
+source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )/../common/lib.sh"
 
 version="$CI_COMMIT_TAG"
 

From 27c03f245e97d24cf33d57740d4111dd28731012 Mon Sep 17 00:00:00 2001
From: Ashley <ashley.ruglys@gmail.com>
Date: Fri, 12 Feb 2021 18:08:55 +0100
Subject: [PATCH 0392/1194] Update sc-finality-grandp-warp-sync to 0.9.0 and
 remove 'publish = false' (#8109)

---
 Cargo.lock                                   | 2 +-
 bin/node/cli/Cargo.toml                      | 2 +-
 client/finality-grandpa-warp-sync/Cargo.toml | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index eb55f6db2d7c..64949da009e2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7161,7 +7161,7 @@ dependencies = [
 
 [[package]]
 name = "sc-finality-grandpa-warp-sync"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
  "derive_more",
  "futures 0.3.12",
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index 99d6f5216d21..112c87457393 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -74,7 +74,7 @@ sc-service = { version = "0.9.0", default-features = false, path = "../../../cli
 sc-tracing = { version = "3.0.0", path = "../../../client/tracing" }
 sc-telemetry = { version = "3.0.0", path = "../../../client/telemetry" }
 sc-authority-discovery = { version = "0.9.0",  path = "../../../client/authority-discovery" }
-sc-finality-grandpa-warp-sync = { version = "0.8.0", path = "../../../client/finality-grandpa-warp-sync", optional = true }
+sc-finality-grandpa-warp-sync = { version = "0.9.0", path = "../../../client/finality-grandpa-warp-sync", optional = true }
 
 # frame dependencies
 pallet-indices = { version = "3.0.0", path = "../../../frame/indices" }
diff --git a/client/finality-grandpa-warp-sync/Cargo.toml b/client/finality-grandpa-warp-sync/Cargo.toml
index ca3ea94f38e8..740c85940e77 100644
--- a/client/finality-grandpa-warp-sync/Cargo.toml
+++ b/client/finality-grandpa-warp-sync/Cargo.toml
@@ -1,11 +1,10 @@
 [package]
 description = "A request-response protocol for handling grandpa warp sync requests"
 name = "sc-finality-grandpa-warp-sync"
-version = "0.8.0"
+version = "0.9.0"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
-publish = false
 homepage = "https://substrate.dev"
 repository = "https://github.com/paritytech/substrate/"
 

From 4e502384b70a0156c1f15f15626e1d9936d557d6 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Mon, 15 Feb 2021 09:45:03 +0100
Subject: [PATCH 0393/1194] Remove all code related to sentry nodes (#8079)

* Remove all code related to sentry nodes

* More fixing
---
 bin/node-template/node/src/service.rs         |  2 +-
 bin/node/cli/src/service.rs                   |  2 +-
 client/cli/src/commands/run_cmd.rs            | 42 ++-----------------
 client/cli/src/config.rs                      |  2 +-
 client/cli/src/params/pruning_params.rs       |  4 +-
 .../src/communication/gossip.rs               |  7 +---
 client/network/src/behaviour.rs               | 21 ++--------
 client/network/src/block_request_handler.rs   |  2 +-
 client/network/src/config.rs                  | 19 +--------
 client/network/src/protocol.rs                | 15 -------
 client/network/src/protocol/event.rs          |  8 ++--
 client/network/src/protocol/message.rs        |  1 -
 client/network/src/service.rs                 | 19 +--------
 client/rpc-api/src/system/helpers.rs          |  2 -
 client/service/src/lib.rs                     |  1 -
 client/service/src/metrics.rs                 |  1 -
 client/service/test/src/lib.rs                |  2 +-
 17 files changed, 22 insertions(+), 128 deletions(-)

diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
index 4061dce43889..f565156a64a8 100644
--- a/bin/node-template/node/src/service.rs
+++ b/bin/node-template/node/src/service.rs
@@ -224,7 +224,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		name: Some(name),
 		observer_enabled: false,
 		keystore,
-		is_authority: role.is_network_authority(),
+		is_authority: role.is_authority(),
 	};
 
 	if enable_grandpa {
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index dcce31bd3225..ca647c583446 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -312,7 +312,7 @@ pub fn new_full_base(
 		name: Some(name),
 		observer_enabled: false,
 		keystore,
-		is_authority: role.is_network_authority(),
+		is_authority: role.is_authority(),
 	};
 
 	if enable_grandpa {
diff --git a/client/cli/src/commands/run_cmd.rs b/client/cli/src/commands/run_cmd.rs
index bbb8d6f68d7f..bb6f77819d7a 100644
--- a/client/cli/src/commands/run_cmd.rs
+++ b/client/cli/src/commands/run_cmd.rs
@@ -27,7 +27,7 @@ use crate::params::TransactionPoolParams;
 use crate::CliConfiguration;
 use regex::Regex;
 use sc_service::{
-	config::{BasePath, MultiaddrWithPeerId, PrometheusConfig, TransactionPoolOptions},
+	config::{BasePath, PrometheusConfig, TransactionPoolOptions},
 	ChainSpec, Role,
 };
 use sc_telemetry::TelemetryEndpoints;
@@ -43,33 +43,16 @@ pub struct RunCmd {
 	/// participate in any consensus task that it can (e.g. depending on
 	/// availability of local keys).
 	#[structopt(
-		long = "validator",
-		conflicts_with_all = &[ "sentry" ]
+		long = "validator"
 	)]
 	pub validator: bool,
 
-	/// Enable sentry mode.
-	///
-	/// The node will be started with the authority role and participate in
-	/// consensus tasks as an "observer", it will never actively participate
-	/// regardless of whether it could (e.g. keys are available locally). This
-	/// mode is useful as a secure proxy for validators (which would run
-	/// detached from the network), since we want this node to participate in
-	/// the full consensus protocols in order to have all needed consensus data
-	/// available to relay to private nodes.
-	#[structopt(
-		long = "sentry",
-		conflicts_with_all = &[ "validator", "light" ],
-		parse(try_from_str)
-	)]
-	pub sentry: Vec<MultiaddrWithPeerId>,
-
 	/// Disable GRANDPA voter when running in validator mode, otherwise disable the GRANDPA observer.
 	#[structopt(long)]
 	pub no_grandpa: bool,
 
 	/// Experimental: Run in light client mode.
-	#[structopt(long = "light", conflicts_with = "sentry")]
+	#[structopt(long = "light")]
 	pub light: bool,
 
 	/// Listen to all RPC interfaces.
@@ -245,17 +228,6 @@ pub struct RunCmd {
 	#[structopt(long)]
 	pub max_runtime_instances: Option<usize>,
 
-	/// Specify a list of sentry node public addresses.
-	///
-	/// Can't be used with --public-addr as the sentry node would take precedence over the public address
-	/// specified there.
-	#[structopt(
-		long = "sentry-nodes",
-		value_name = "ADDR",
-		conflicts_with_all = &[ "sentry", "public-addr" ]
-	)]
-	pub sentry_nodes: Vec<MultiaddrWithPeerId>,
-
 	/// Run a temporary node.
 	///
 	/// A temporary directory will be created to store the configuration and will be deleted
@@ -366,13 +338,7 @@ impl CliConfiguration for RunCmd {
 		Ok(if is_light {
 			sc_service::Role::Light
 		} else if is_authority {
-			sc_service::Role::Authority {
-				sentry_nodes: self.sentry_nodes.clone(),
-			}
-		} else if !self.sentry.is_empty() {
-			sc_service::Role::Sentry {
-				validators: self.sentry.clone(),
-			}
+			sc_service::Role::Authority
 		} else {
 			sc_service::Role::Full
 		})
diff --git a/client/cli/src/config.rs b/client/cli/src/config.rs
index 247f6d2fddb3..f81a64bf155a 100644
--- a/client/cli/src/config.rs
+++ b/client/cli/src/config.rs
@@ -486,7 +486,7 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 		let node_key = self.node_key(&net_config_dir)?;
 		let role = self.role(is_dev)?;
 		let max_runtime_instances = self.max_runtime_instances()?.unwrap_or(8);
-		let is_validator = role.is_network_authority();
+		let is_validator = role.is_authority();
 		let (keystore_remote, keystore) = self.keystore_config(&config_dir)?;
 		let telemetry_endpoints = telemetry_handle
 			.as_ref()
diff --git a/client/cli/src/params/pruning_params.rs b/client/cli/src/params/pruning_params.rs
index 467ca253531f..987b8527e6fa 100644
--- a/client/cli/src/params/pruning_params.rs
+++ b/client/cli/src/params/pruning_params.rs
@@ -46,10 +46,10 @@ impl PruningParams {
 		// unless `unsafe_pruning` is set.
 		Ok(match &self.pruning {
 			Some(ref s) if s == "archive" => PruningMode::ArchiveAll,
-			None if role.is_network_authority() => PruningMode::ArchiveAll,
+			None if role.is_authority() => PruningMode::ArchiveAll,
 			None => PruningMode::default(),
 			Some(s) => {
-				if role.is_network_authority() && !unsafe_pruning {
+				if role.is_authority() && !unsafe_pruning {
 					return Err(error::Error::Input(
 						"Validators should run with state pruning disabled (i.e. archive). \
 						You can ignore this check with `--unsafe-pruning`."
diff --git a/client/finality-grandpa/src/communication/gossip.rs b/client/finality-grandpa/src/communication/gossip.rs
index 1e616f3fa3f1..9f5582e5cea6 100644
--- a/client/finality-grandpa/src/communication/gossip.rs
+++ b/client/finality-grandpa/src/communication/gossip.rs
@@ -563,12 +563,10 @@ impl<N: Ord> Peers<N> {
 	}
 
 	fn authorities(&self) -> usize {
-		// Note that our sentry and our validator are neither authorities nor non-authorities.
 		self.inner.iter().filter(|(_, info)| matches!(info.roles, ObservedRole::Authority)).count()
 	}
 
 	fn non_authorities(&self) -> usize {
-		// Note that our sentry and our validator are neither authorities nor non-authorities.
 		self.inner
 			.iter()
 			.filter(|(_, info)| matches!(info.roles, ObservedRole::Full | ObservedRole::Light))
@@ -665,8 +663,7 @@ impl CatchUpConfig {
 		match self {
 			CatchUpConfig::Disabled => false,
 			CatchUpConfig::Enabled { only_from_authorities, .. } => match peer.roles {
-				ObservedRole::Authority | ObservedRole::OurSentry |
-				ObservedRole::OurGuardedAuthority => true,
+				ObservedRole::Authority => true,
 				_ => !only_from_authorities
 			}
 		}
@@ -1158,7 +1155,6 @@ impl<Block: BlockT> Inner<Block> {
 		}
 
 		match peer.roles {
-			ObservedRole::OurGuardedAuthority | ObservedRole::OurSentry => true,
 			ObservedRole::Authority => {
 				let authorities = self.peers.authorities();
 
@@ -1214,7 +1210,6 @@ impl<Block: BlockT> Inner<Block> {
 		};
 
 		match peer.roles {
-			ObservedRole::OurSentry | ObservedRole::OurGuardedAuthority => true,
 			ObservedRole::Authority => {
 				let authorities = self.peers.authorities();
 
diff --git a/client/network/src/behaviour.rs b/client/network/src/behaviour.rs
index 06c91de88687..4a183e219fb8 100644
--- a/client/network/src/behaviour.rs
+++ b/client/network/src/behaviour.rs
@@ -17,7 +17,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{
-	config::{ProtocolId, Role},
+	config::ProtocolId,
 	bitswap::Bitswap,
 	discovery::{DiscoveryBehaviour, DiscoveryConfig, DiscoveryOut},
 	protocol::{message::Roles, CustomMessageOutcome, NotificationsSink, Protocol},
@@ -71,10 +71,6 @@ pub struct Behaviour<B: BlockT, H: ExHashT> {
 	#[behaviour(ignore)]
 	events: VecDeque<BehaviourOut<B>>,
 
-	/// Role of our local node, as originally passed from the configuration.
-	#[behaviour(ignore)]
-	role: Role,
-
 	/// Light client request handling.
 	#[behaviour(ignore)]
 	light_client_request_sender: light_client_requests::sender::LightClientRequestSender<B>,
@@ -180,7 +176,6 @@ impl<B: BlockT, H: ExHashT> Behaviour<B, H> {
 	/// Builds a new `Behaviour`.
 	pub fn new(
 		substrate: Protocol<B, H>,
-		role: Role,
 		user_agent: String,
 		local_public_key: PublicKey,
 		light_client_request_sender: light_client_requests::sender::LightClientRequestSender<B>,
@@ -206,7 +201,6 @@ impl<B: BlockT, H: ExHashT> Behaviour<B, H> {
 				request_responses::RequestResponsesBehaviour::new(request_response_protocols.into_iter())?,
 			light_client_request_sender,
 			events: VecDeque::new(),
-			role,
 
 			block_request_protocol_name,
 		})
@@ -290,15 +284,9 @@ impl<B: BlockT, H: ExHashT> Behaviour<B, H> {
 	}
 }
 
-fn reported_roles_to_observed_role(local_role: &Role, remote: &PeerId, roles: Roles) -> ObservedRole {
+fn reported_roles_to_observed_role(roles: Roles) -> ObservedRole {
 	if roles.is_authority() {
-		match local_role {
-			Role::Authority { sentry_nodes }
-				if sentry_nodes.iter().any(|s| s.peer_id == *remote) => ObservedRole::OurSentry,
-			Role::Sentry { validators }
-				if validators.iter().any(|s| s.peer_id == *remote) => ObservedRole::OurGuardedAuthority,
-			_ => ObservedRole::Authority
-		}
+		ObservedRole::Authority
 	} else if roles.is_full() {
 		ObservedRole::Full
 	} else {
@@ -337,11 +325,10 @@ Behaviour<B, H> {
 				);
 			},
 			CustomMessageOutcome::NotificationStreamOpened { remote, protocol, roles, notifications_sink } => {
-				let role = reported_roles_to_observed_role(&self.role, &remote, roles);
 				self.events.push_back(BehaviourOut::NotificationStreamOpened {
 					remote,
 					protocol,
-					role: role.clone(),
+					role: reported_roles_to_observed_role(roles),
 					notifications_sink: notifications_sink.clone(),
 				});
 			},
diff --git a/client/network/src/block_request_handler.rs b/client/network/src/block_request_handler.rs
index 92f21f44f9d1..8faa6a7f6c11 100644
--- a/client/network/src/block_request_handler.rs
+++ b/client/network/src/block_request_handler.rs
@@ -72,7 +72,7 @@ impl <B: BlockT> BlockRequestHandler<B> {
 	pub fn new(protocol_id: &ProtocolId, client: Arc<dyn Client<B>>) -> (Self, ProtocolConfig) {
 		// Rate of arrival multiplied with the waiting time in the queue equals the queue length.
 		//
-		// An average Polkadot sentry node serves less than 5 requests per second. The 95th percentile
+		// An average Polkadot node serves less than 5 requests per second. The 95th percentile
 		// serving a request is less than 2 second. Thus one would estimate the queue length to be
 		// below 10.
 		//
diff --git a/client/network/src/config.rs b/client/network/src/config.rs
index 5a2327dda130..7f8cac95f9d5 100644
--- a/client/network/src/config.rs
+++ b/client/network/src/config.rs
@@ -128,18 +128,8 @@ pub enum Role {
 	Full,
 	/// Regular light node.
 	Light,
-	/// Sentry node that guards an authority. Will be reported as "authority" on the wire protocol.
-	Sentry {
-		/// Address and identity of the validator nodes that we're guarding.
-		///
-		/// The nodes will be granted some priviledged status.
-		validators: Vec<MultiaddrWithPeerId>,
-	},
 	/// Actual authority.
-	Authority {
-		/// List of public addresses and identities of our sentry nodes.
-		sentry_nodes: Vec<MultiaddrWithPeerId>,
-	}
+	Authority,
 }
 
 impl Role {
@@ -147,12 +137,6 @@ impl Role {
 	pub fn is_authority(&self) -> bool {
 		matches!(self, Role::Authority { .. })
 	}
-
-	/// True for `Role::Authority` and `Role::Sentry` since they're both
-	/// announced as having the authority role to the network.
-	pub fn is_network_authority(&self) -> bool {
-		matches!(self, Role::Authority { .. } | Role::Sentry { .. })
-	}
 }
 
 impl fmt::Display for Role {
@@ -160,7 +144,6 @@ impl fmt::Display for Role {
 		match self {
 			Role::Full => write!(f, "FULL"),
 			Role::Light => write!(f, "LIGHT"),
-			Role::Sentry { .. } => write!(f, "SENTRY"),
 			Role::Authority { .. } => write!(f, "AUTHORITY"),
 		}
 	}
diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index 4997bc36e53e..acb5d9101eac 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -384,21 +384,6 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 			let mut sets = Vec::with_capacity(NUM_HARDCODED_PEERSETS + network_config.extra_sets.len());
 
 			let mut default_sets_reserved = HashSet::new();
-			match config_role {
-				config::Role::Sentry { validators } => {
-					for validator in validators {
-						default_sets_reserved.insert(validator.peer_id.clone());
-						known_addresses.push((validator.peer_id.clone(), validator.multiaddr.clone()));
-					}
-				}
-				config::Role::Authority { sentry_nodes } => {
-					for sentry_node in sentry_nodes {
-						default_sets_reserved.insert(sentry_node.peer_id.clone());
-						known_addresses.push((sentry_node.peer_id.clone(), sentry_node.multiaddr.clone()));
-					}
-				}
-				_ => {}
-			};
 			for reserved in network_config.default_peers_set.reserved_nodes.iter() {
 				default_sets_reserved.insert(reserved.peer_id.clone());
 				known_addresses.push((reserved.peer_id.clone(), reserved.multiaddr.clone()));
diff --git a/client/network/src/protocol/event.rs b/client/network/src/protocol/event.rs
index e20dbcb9ee27..fb2e3b33dd68 100644
--- a/client/network/src/protocol/event.rs
+++ b/client/network/src/protocol/event.rs
@@ -92,16 +92,16 @@ pub enum Event {
 
 /// Role that the peer sent to us during the handshake, with the addition of what our local node
 /// knows about that peer.
+///
+/// > **Note**: This enum is different from the `Role` enum. The `Role` enum indicates what a
+/// >			node says about itself, while `ObservedRole` is a `Role` merged with the
+/// >			information known locally about that node.
 #[derive(Debug, Clone)]
 pub enum ObservedRole {
 	/// Full node.
 	Full,
 	/// Light node.
 	Light,
-	/// When we are a validator node, this is a sentry that protects us.
-	OurSentry,
-	/// When we are a sentry node, this is the authority we are protecting.
-	OurGuardedAuthority,
 	/// Third-party authority.
 	Authority,
 }
diff --git a/client/network/src/protocol/message.rs b/client/network/src/protocol/message.rs
index 3161f91e533c..ed2721032801 100644
--- a/client/network/src/protocol/message.rs
+++ b/client/network/src/protocol/message.rs
@@ -191,7 +191,6 @@ pub mod generic {
 			match roles {
 				crate::config::Role::Full => Roles::FULL,
 				crate::config::Role::Light => Roles::LIGHT,
-				crate::config::Role::Sentry { .. } => Roles::AUTHORITY,
 				crate::config::Role::Authority { .. } => Roles::AUTHORITY,
 			}
 		}
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 39eaa606d006..9ac7483467b4 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -30,7 +30,7 @@
 use crate::{
 	ExHashT, NetworkStateInfo, NetworkStatus,
 	behaviour::{self, Behaviour, BehaviourOut},
-	config::{parse_str_addr, Params, Role, TransportConfig},
+	config::{parse_str_addr, Params, TransportConfig},
 	DhtEvent,
 	discovery::DiscoveryConfig,
 	error::Error,
@@ -225,22 +225,6 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 				}
 			)?;
 
-		// Print a message about the deprecation of sentry nodes.
-		let print_deprecated_message = match &params.role {
-			Role::Sentry { .. } => true,
-			Role::Authority { sentry_nodes } if !sentry_nodes.is_empty() => true,
-			_ => false,
-		};
-		if print_deprecated_message {
-			log::warn!(
-				"🙇 Sentry nodes are deprecated, and the `--sentry` and  `--sentry-nodes` \
-				CLI options will eventually be removed in a future version. The Substrate \
-				and Polkadot networking protocol require validators to be \
-				publicly-accessible. Please do not block access to your validator nodes. \
-				For details, see https://github.com/paritytech/substrate/issues/6845."
-			);
-		}
-
 		let checker = params.on_demand.as_ref()
 			.map(|od| od.checker().clone())
 			.unwrap_or_else(|| Arc::new(AlwaysBadChecker));
@@ -339,7 +323,6 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 				let bitswap = if params.network_config.ipfs_server { Some(Bitswap::new(client)) } else { None };
 				let result = Behaviour::new(
 					protocol,
-					params.role,
 					user_agent,
 					local_public,
 					light_client_request_sender,
diff --git a/client/rpc-api/src/system/helpers.rs b/client/rpc-api/src/system/helpers.rs
index b2b793a8ee40..c2fc807471f3 100644
--- a/client/rpc-api/src/system/helpers.rs
+++ b/client/rpc-api/src/system/helpers.rs
@@ -82,8 +82,6 @@ pub enum NodeRole {
 	LightClient,
 	/// The node is an authority
 	Authority,
-	/// The node is a sentry
-	Sentry,
 }
 
 /// The state of the syncing of the node.
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index 4880b8cffdaf..39bad8f2f36e 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -309,7 +309,6 @@ async fn build_network_future<
 							Role::Authority { .. } => NodeRole::Authority,
 							Role::Light => NodeRole::LightClient,
 							Role::Full => NodeRole::Full,
-							Role::Sentry { .. } => NodeRole::Sentry,
 						};
 
 						let _ = sender.send(vec![node_role]);
diff --git a/client/service/src/metrics.rs b/client/service/src/metrics.rs
index 446cce952741..4fbfa4d77f08 100644
--- a/client/service/src/metrics.rs
+++ b/client/service/src/metrics.rs
@@ -135,7 +135,6 @@ impl MetricsService {
 		let role_bits = match config.role {
 			Role::Full => 1u64,
 			Role::Light => 2u64,
-			Role::Sentry { .. } => 3u64,
 			Role::Authority { .. } => 4u64,
 		};
 
diff --git a/client/service/test/src/lib.rs b/client/service/test/src/lib.rs
index a42dba84dfea..d286c945f06c 100644
--- a/client/service/test/src/lib.rs
+++ b/client/service/test/src/lib.rs
@@ -337,7 +337,7 @@ impl<G, E, F, L, U> TestNet<G, E, F, L, U> where
 			let node_config = node_config(
 				self.nodes,
 				&self.chain_spec,
-				Role::Authority { sentry_nodes: Vec::new() },
+				Role::Authority,
 				task_executor.clone(),
 				Some(key),
 				self.base_port,

From 386914e158b51ee7730e8a83c68e39d88c791b40 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Mon, 15 Feb 2021 07:10:30 -0400
Subject: [PATCH 0394/1194] Add code blocks to doc diagrams (#8118)

---
 frame/system/src/limits.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/frame/system/src/limits.rs b/frame/system/src/limits.rs
index c24d671cdd7a..95452bcf51e3 100644
--- a/frame/system/src/limits.rs
+++ b/frame/system/src/limits.rs
@@ -129,6 +129,7 @@ pub struct WeightsPerClass {
 /// `on_initialize` pallet callbacks are invoked and their cost is added before any extrinsic
 /// is executed. This cost is tracked as `Mandatory` dispatch class.
 ///
+/// ```ignore
 /// |   | `max_block`    |   |
 /// |   |                |   |
 /// |   |                |   |
@@ -139,12 +140,15 @@ pub struct WeightsPerClass {
 ///  ||\_ Mandatory
 ///  |\__ Operational
 ///  \___ Normal
+/// ```
 ///
 /// The remaining capacity can be used to dispatch extrinsics. Note that each dispatch class
 /// is being tracked separately, but the sum can't exceed `max_block` (except for `reserved`).
 /// Below you can see a picture representing full block with 3 extrinsics (two `Operational` and
 /// one `Normal`). Each class has it's own limit `max_total`, but also the sum cannot exceed
 /// `max_block` value.
+///
+/// ```ignore
 ///                          -- `Mandatory` limit (unlimited)
 /// | # |                 |   |
 /// | # | `Ext3`          | - - `Operational` limit
@@ -153,6 +157,7 @@ pub struct WeightsPerClass {
 /// |  #| `on_initialize` | ##|
 /// |  #| `base_block`    |###|
 /// |NOM|                 |NOM|
+/// ```
 ///
 /// It should be obvious now that it's possible for one class to reach it's limit (say `Normal`),
 /// while the block has still capacity to process more transactions (`max_block` not reached,
@@ -164,6 +169,8 @@ pub struct WeightsPerClass {
 /// full. For instance one might want to prevent high-priority `Normal` transactions from pushing
 /// out lower-priority `Operational` transactions. In such cases you might add a `reserved` capacity
 /// for given class.
+///
+/// ```ignore
 ///              _
 ///   #           \
 ///   #   `Ext8`   - `reserved`
@@ -175,6 +182,7 @@ pub struct WeightsPerClass {
 /// |  #| `on_initialize`       |###|
 /// |  #| `base_block`          |###|
 /// |NOM|                       |NOM|
+/// ```
 ///
 /// In the above example, `Ext4-6` fill up the block almost up to `max_block`. `Ext7` would not fit
 /// if there wasn't the extra `reserved` space for `Operational` transactions. Note that `max_total`

From 13b699868330fe60c272eeda1c9b326b0e222173 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Mon, 15 Feb 2021 12:55:40 +0100
Subject: [PATCH 0395/1194] Simplify runtime api error handling (#8114)

* Ahh

* Work work work

* Fix all the compilation errors

* Fix test

* More fixes...
---
 bin/node/executor/tests/common.rs             |   2 +-
 client/api/src/call_executor.rs               |   2 +-
 client/authority-discovery/src/lib.rs         |   4 +-
 client/authority-discovery/src/worker.rs      |   6 +-
 .../authority-discovery/src/worker/tests.rs   |   2 -
 .../basic-authorship/src/basic_authorship.rs  |   8 +-
 client/block-builder/src/lib.rs               |  21 ++--
 client/consensus/aura/src/lib.rs              |  14 +--
 client/consensus/babe/src/lib.rs              |  23 ++--
 .../manual-seal/src/consensus/babe.rs         |   6 +-
 client/consensus/pow/src/lib.rs               |   6 +-
 client/executor/common/src/error.rs           |  12 +--
 client/executor/src/native_executor.rs        |   4 +-
 client/executor/src/wasm_runtime.rs           |   6 +-
 client/finality-grandpa/Cargo.toml            |   1 -
 client/finality-grandpa/src/environment.rs    |   8 +-
 client/finality-grandpa/src/import.rs         |   1 +
 client/finality-grandpa/src/lib.rs            |   8 +-
 client/finality-grandpa/src/tests.rs          |   2 -
 client/light/src/call_executor.rs             |   2 +-
 client/offchain/src/lib.rs                    |   4 +-
 client/rpc/src/author/mod.rs                  |   9 +-
 client/rpc/src/state/mod.rs                   |   5 +-
 client/rpc/src/state/state_full.rs            |  26 +++--
 client/service/src/builder.rs                 |   9 +-
 client/service/src/client/call_executor.rs    |  12 ++-
 client/service/src/client/client.rs           |  36 ++++---
 client/service/src/error.rs                   |   6 +-
 client/service/test/src/client/light.rs       |   2 +-
 client/service/test/src/client/mod.rs         |   4 +-
 client/transaction-pool/src/api.rs            |   5 +-
 client/transaction-pool/src/lib.rs            |   2 -
 .../api/proc-macro/src/decl_runtime_apis.rs   |  54 ++++++----
 .../api/proc-macro/src/impl_runtime_apis.rs   |  28 ++---
 .../proc-macro/src/mock_impl_runtime_apis.rs  |  80 ++------------
 primitives/api/proc-macro/src/utils.rs        |   3 +-
 primitives/api/src/lib.rs                     | 102 ++++++++----------
 primitives/api/test/tests/decl_and_impl.rs    |  39 ++++---
 primitives/api/test/tests/runtime_calls.rs    |   7 +-
 .../ui/mock_only_error_associated_type.rs     |  19 ----
 .../ui/mock_only_error_associated_type.stderr |   5 -
 .../test/tests/ui/mock_only_one_error_type.rs |  29 -----
 .../tests/ui/mock_only_one_error_type.stderr  |  29 -----
 primitives/blockchain/src/error.rs            |  14 ++-
 primitives/core/src/traits.rs                 |   2 +-
 primitives/session/src/lib.rs                 |   2 +-
 primitives/state-machine/src/lib.rs           |  12 +--
 .../runtime/client/src/block_builder_ext.rs   |   2 +-
 48 files changed, 270 insertions(+), 415 deletions(-)
 delete mode 100644 primitives/api/test/tests/ui/mock_only_error_associated_type.rs
 delete mode 100644 primitives/api/test/tests/ui/mock_only_error_associated_type.stderr
 delete mode 100644 primitives/api/test/tests/ui/mock_only_one_error_type.rs
 delete mode 100644 primitives/api/test/tests/ui/mock_only_one_error_type.stderr

diff --git a/bin/node/executor/tests/common.rs b/bin/node/executor/tests/common.rs
index b376ebc35bae..8f8db9f72bb5 100644
--- a/bin/node/executor/tests/common.rs
+++ b/bin/node/executor/tests/common.rs
@@ -99,7 +99,7 @@ pub fn executor() -> NativeExecutor<Executor> {
 
 pub fn executor_call<
 	R:Decode + Encode + PartialEq,
-	NC: FnOnce() -> std::result::Result<R, String> + std::panic::UnwindSafe
+	NC: FnOnce() -> std::result::Result<R, Box<dyn std::error::Error + Send + Sync>> + std::panic::UnwindSafe
 >(
 	t: &mut TestExternalities<BlakeTwo256>,
 	method: &str,
diff --git a/client/api/src/call_executor.rs b/client/api/src/call_executor.rs
index 5f1e0134a5ca..3b725bf8773a 100644
--- a/client/api/src/call_executor.rs
+++ b/client/api/src/call_executor.rs
@@ -78,7 +78,7 @@ pub trait CallExecutor<B: BlockT> {
 			Result<NativeOrEncoded<R>, Self::Error>
 		) -> Result<NativeOrEncoded<R>, Self::Error>,
 		R: Encode + Decode + PartialEq,
-		NC: FnOnce() -> result::Result<R, String> + UnwindSafe,
+		NC: FnOnce() -> result::Result<R, sp_api::ApiError> + UnwindSafe,
 	>(
 		&self,
 		initialize_block_fn: IB,
diff --git a/client/authority-discovery/src/lib.rs b/client/authority-discovery/src/lib.rs
index 26d4396ca883..818eb1beb3ff 100644
--- a/client/authority-discovery/src/lib.rs
+++ b/client/authority-discovery/src/lib.rs
@@ -93,7 +93,7 @@ where
 	Block: BlockT + Unpin + 'static,
 	Network: NetworkProvider,
 	Client: ProvideRuntimeApi<Block> + Send + Sync + 'static + HeaderBackend<Block>,
-	<Client as ProvideRuntimeApi<Block>>::Api: AuthorityDiscoveryApi<Block, Error = sp_blockchain::Error>,
+	<Client as ProvideRuntimeApi<Block>>::Api: AuthorityDiscoveryApi<Block>,
 	DhtEventStream: Stream<Item = DhtEvent> + Unpin,
 {
 	new_worker_and_service_with_config(
@@ -121,7 +121,7 @@ where
 	Block: BlockT + Unpin + 'static,
 	Network: NetworkProvider,
 	Client: ProvideRuntimeApi<Block> + Send + Sync + 'static + HeaderBackend<Block>,
-	<Client as ProvideRuntimeApi<Block>>::Api: AuthorityDiscoveryApi<Block, Error = sp_blockchain::Error>,
+	<Client as ProvideRuntimeApi<Block>>::Api: AuthorityDiscoveryApi<Block>,
 	DhtEventStream: Stream<Item = DhtEvent> + Unpin,
 {
 	let (to_worker, from_service) = mpsc::channel(0);
diff --git a/client/authority-discovery/src/worker.rs b/client/authority-discovery/src/worker.rs
index e47f42a445ee..dac7a97746b7 100644
--- a/client/authority-discovery/src/worker.rs
+++ b/client/authority-discovery/src/worker.rs
@@ -132,7 +132,7 @@ where
 	Network: NetworkProvider,
 	Client: ProvideRuntimeApi<Block> + Send + Sync + 'static + HeaderBackend<Block>,
 	<Client as ProvideRuntimeApi<Block>>::Api:
-		AuthorityDiscoveryApi<Block, Error = sp_blockchain::Error>,
+		AuthorityDiscoveryApi<Block>,
 	DhtEventStream: Stream<Item = DhtEvent> + Unpin,
 {
 	/// Construct a [`Worker`].
@@ -332,7 +332,7 @@ where
 			.client
 			.runtime_api()
 			.authorities(&id)
-			.map_err(Error::CallingRuntime)?
+			.map_err(|e| Error::CallingRuntime(e.into()))?
 			.into_iter()
 			.filter(|id| !local_keys.contains(id.as_ref()))
 			.collect();
@@ -546,7 +546,7 @@ where
 		let id = BlockId::hash(client.info().best_hash);
 		let authorities = client.runtime_api()
 			.authorities(&id)
-			.map_err(Error::CallingRuntime)?
+			.map_err(|e| Error::CallingRuntime(e.into()))?
 			.into_iter()
 			.map(std::convert::Into::into)
 			.collect::<HashSet<_>>();
diff --git a/client/authority-discovery/src/worker/tests.rs b/client/authority-discovery/src/worker/tests.rs
index 20c4c937096a..a994e08691b5 100644
--- a/client/authority-discovery/src/worker/tests.rs
+++ b/client/authority-discovery/src/worker/tests.rs
@@ -100,8 +100,6 @@ pub(crate) struct RuntimeApi {
 
 sp_api::mock_impl_runtime_apis! {
 	impl AuthorityDiscoveryApi<Block> for RuntimeApi {
-		type Error = sp_blockchain::Error;
-
 		fn authorities(&self) -> Vec<AuthorityId> {
 			self.authorities.clone()
 		}
diff --git a/client/basic-authorship/src/basic_authorship.rs b/client/basic-authorship/src/basic_authorship.rs
index 73e615661528..067695e5a84d 100644
--- a/client/basic-authorship/src/basic_authorship.rs
+++ b/client/basic-authorship/src/basic_authorship.rs
@@ -99,7 +99,7 @@ impl<B, Block, C, A> ProposerFactory<A, B, C>
 		C: BlockBuilderProvider<B, Block, C> + HeaderBackend<Block> + ProvideRuntimeApi<Block>
 			+ Send + Sync + 'static,
 		C::Api: ApiExt<Block, StateBackend = backend::StateBackendFor<B, Block>>
-			+ BlockBuilderApi<Block, Error = sp_blockchain::Error>,
+			+ BlockBuilderApi<Block>,
 {
 	pub fn init_with_now(
 		&mut self,
@@ -138,7 +138,7 @@ impl<A, B, Block, C> sp_consensus::Environment<Block> for
 			C: BlockBuilderProvider<B, Block, C> + HeaderBackend<Block> + ProvideRuntimeApi<Block>
 				+ Send + Sync + 'static,
 			C::Api: ApiExt<Block, StateBackend = backend::StateBackendFor<B, Block>>
-				+ BlockBuilderApi<Block, Error = sp_blockchain::Error>,
+				+ BlockBuilderApi<Block>,
 {
 	type CreateProposer = future::Ready<Result<Self::Proposer, Self::Error>>;
 	type Proposer = Proposer<B, Block, C, A>;
@@ -175,7 +175,7 @@ impl<A, B, Block, C> sp_consensus::Proposer<Block> for
 			C: BlockBuilderProvider<B, Block, C> + HeaderBackend<Block> + ProvideRuntimeApi<Block>
 				+ Send + Sync + 'static,
 			C::Api: ApiExt<Block, StateBackend = backend::StateBackendFor<B, Block>>
-				+ BlockBuilderApi<Block, Error = sp_blockchain::Error>,
+				+ BlockBuilderApi<Block>,
 {
 	type Transaction = backend::TransactionFor<B, Block>;
 	type Proposal = Pin<Box<dyn Future<
@@ -221,7 +221,7 @@ impl<A, B, Block, C> Proposer<B, Block, C, A>
 		C: BlockBuilderProvider<B, Block, C> + HeaderBackend<Block> + ProvideRuntimeApi<Block>
 			+ Send + Sync + 'static,
 		C::Api: ApiExt<Block, StateBackend = backend::StateBackendFor<B, Block>>
-			+ BlockBuilderApi<Block, Error = sp_blockchain::Error>,
+			+ BlockBuilderApi<Block>,
 {
 	async fn propose_with(
 		self,
diff --git a/client/block-builder/src/lib.rs b/client/block-builder/src/lib.rs
index 5a7e0277d9e8..5f700da8914a 100644
--- a/client/block-builder/src/lib.rs
+++ b/client/block-builder/src/lib.rs
@@ -35,8 +35,7 @@ use sp_runtime::{
 use sp_blockchain::{ApplyExtrinsicFailed, Error};
 use sp_core::ExecutionContext;
 use sp_api::{
-	Core, ApiExt, ApiErrorFor, ApiRef, ProvideRuntimeApi, StorageChanges, StorageProof,
-	TransactionOutcome,
+	Core, ApiExt, ApiRef, ProvideRuntimeApi, StorageChanges, StorageProof, TransactionOutcome,
 };
 use sp_consensus::RecordProof;
 
@@ -106,8 +105,7 @@ impl<'a, Block, A, B> BlockBuilder<'a, Block, A, B>
 where
 	Block: BlockT,
 	A: ProvideRuntimeApi<Block> + 'a,
-	A::Api: BlockBuilderApi<Block, Error = Error> +
-		ApiExt<Block, StateBackend = backend::StateBackendFor<B, Block>>,
+	A::Api: BlockBuilderApi<Block> + ApiExt<Block, StateBackend = backend::StateBackendFor<B, Block>>,
 	B: backend::Backend<Block>,
 {
 	/// Create a new instance of builder based on the given `parent_hash` and `parent_number`.
@@ -122,7 +120,7 @@ where
 		record_proof: RecordProof,
 		inherent_digests: DigestFor<Block>,
 		backend: &'a B,
-	) -> Result<Self, ApiErrorFor<A, Block>> {
+	) -> Result<Self, Error> {
 		let header = <<Block as BlockT>::Header as HeaderT>::new(
 			parent_number + One::one(),
 			Default::default(),
@@ -155,7 +153,7 @@ where
 	/// Push onto the block's list of extrinsics.
 	///
 	/// This will ensure the extrinsic can be validly executed (by executing it).
-	pub fn push(&mut self, xt: <Block as BlockT>::Extrinsic) -> Result<(), ApiErrorFor<A, Block>> {
+	pub fn push(&mut self, xt: <Block as BlockT>::Extrinsic) -> Result<(), Error> {
 		let block_id = &self.block_id;
 		let extrinsics = &mut self.extrinsics;
 
@@ -174,7 +172,7 @@ where
 						Err(ApplyExtrinsicFailed::Validity(tx_validity).into()),
 					)
 				},
-				Err(e) => TransactionOutcome::Rollback(Err(e)),
+				Err(e) => TransactionOutcome::Rollback(Err(Error::from(e))),
 			}
 		})
 	}
@@ -184,10 +182,7 @@ where
 	/// Returns the build `Block`, the changes to the storage and an optional `StorageProof`
 	/// supplied by `self.api`, combined as [`BuiltBlock`].
 	/// The storage proof will be `Some(_)` when proof recording was enabled.
-	pub fn build(mut self) -> Result<
-		BuiltBlock<Block, backend::StateBackendFor<B, Block>>,
-		ApiErrorFor<A, Block>
-	> {
+	pub fn build(mut self) -> Result<BuiltBlock<Block, backend::StateBackendFor<B, Block>>, Error> {
 		let header = self.api.finalize_block_with_context(
 			&self.block_id, ExecutionContext::BlockConstruction
 		)?;
@@ -227,7 +222,7 @@ where
 	pub fn create_inherents(
 		&mut self,
 		inherent_data: sp_inherents::InherentData,
-	) -> Result<Vec<Block::Extrinsic>, ApiErrorFor<A, Block>> {
+	) -> Result<Vec<Block::Extrinsic>, Error> {
 		let block_id = self.block_id;
 		self.api.execute_in_transaction(move |api| {
 			// `create_inherents` should not change any state, to ensure this we always rollback
@@ -237,7 +232,7 @@ where
 				ExecutionContext::BlockConstruction,
 				inherent_data
 			))
-		})
+		}).map_err(|e| Error::Application(Box::new(e)))
 	}
 }
 
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index 5b9e7c590bde..eb3c2e93e704 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -98,9 +98,9 @@ pub fn slot_duration<A, B, C>(client: &C) -> CResult<SlotDuration> where
 	A: Codec,
 	B: BlockT,
 	C: AuxStore + ProvideRuntimeApi<B>,
-	C::Api: AuraApi<B, A, Error = sp_blockchain::Error>,
+	C::Api: AuraApi<B, A>,
 {
-	SlotDuration::get_or_compute(client, |a, b| a.slot_duration(b))
+	SlotDuration::get_or_compute(client, |a, b| a.slot_duration(b).map_err(Into::into))
 }
 
 /// Get slot author for given block along with authorities.
@@ -515,7 +515,7 @@ impl<C, P, CAW> AuraVerifier<C, P, CAW> where
 		inherent_data: InherentData,
 		timestamp_now: u64,
 	) -> Result<(), Error<B>> where
-		C: ProvideRuntimeApi<B>, C::Api: BlockBuilderApi<B, Error = sp_blockchain::Error>,
+		C: ProvideRuntimeApi<B>, C::Api: BlockBuilderApi<B>,
 		CAW: CanAuthorWith<B>,
 	{
 		const MAX_TIMESTAMP_DRIFT_SECS: u64 = 60;
@@ -534,7 +534,7 @@ impl<C, P, CAW> AuraVerifier<C, P, CAW> where
 			&block_id,
 			block,
 			inherent_data,
-		).map_err(Error::Client)?;
+		).map_err(|e| Error::Client(e.into()))?;
 
 		if !inherent_res.ok() {
 			inherent_res
@@ -578,7 +578,7 @@ impl<B: BlockT, C, P, CAW> Verifier<B> for AuraVerifier<C, P, CAW> where
 		sc_client_api::backend::AuxStore +
 		ProvideCache<B> +
 		BlockOf,
-	C::Api: BlockBuilderApi<B> + AuraApi<B, AuthorityId<P>> + ApiExt<B, Error = sp_blockchain::Error>,
+	C::Api: BlockBuilderApi<B> + AuraApi<B, AuthorityId<P>> + ApiExt<B>,
 	DigestItemFor<B>: CompatibleDigestItem<P>,
 	P: Pair + Send + Sync + 'static,
 	P::Public: Send + Sync + Hash + Eq + Clone + Decode + Encode + Debug + 'static,
@@ -624,7 +624,7 @@ impl<B: BlockT, C, P, CAW> Verifier<B> for AuraVerifier<C, P, CAW> where
 					// skip the inherents verification if the runtime API is old.
 					if self.client
 						.runtime_api()
-						.has_api_with::<dyn BlockBuilderApi<B, Error = ()>, _>(
+						.has_api_with::<dyn BlockBuilderApi<B>, _>(
 							&BlockId::Hash(parent_hash),
 							|v| v >= 2,
 						)
@@ -842,7 +842,7 @@ pub fn import_queue<B, I, C, P, S, CAW>(
 	can_author_with: CAW,
 ) -> Result<DefaultImportQueue<B, C>, sp_consensus::Error> where
 	B: BlockT,
-	C::Api: BlockBuilderApi<B> + AuraApi<B, AuthorityId<P>> + ApiExt<B, Error = sp_blockchain::Error>,
+	C::Api: BlockBuilderApi<B> + AuraApi<B, AuthorityId<P>> + ApiExt<B>,
 	C: 'static + ProvideRuntimeApi<B> + BlockOf + ProvideCache<B> + Send + Sync + AuxStore + HeaderBackend<B>,
 	I: BlockImport<B, Error=ConsensusError, Transaction = sp_api::TransactionFor<C, B>> + Send + Sync + 'static,
 	DigestItemFor<B>: CompatibleDigestItem<P>,
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index 6ffa18c3cc3a..61be3a2f5e5b 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -273,6 +273,8 @@ pub enum Error<B: BlockT> {
 	CheckInherents(String),
 	/// Client error
 	Client(sp_blockchain::Error),
+	/// Runtime Api error.
+	RuntimeApi(sp_api::ApiError),
 	/// Runtime error
 	Runtime(sp_inherents::Error),
 	/// Fork tree error
@@ -310,14 +312,14 @@ impl Config {
 	/// Either fetch the slot duration from disk or compute it from the genesis
 	/// state.
 	pub fn get_or_compute<B: BlockT, C>(client: &C) -> ClientResult<Self> where
-		C: AuxStore + ProvideRuntimeApi<B>, C::Api: BabeApi<B, Error = sp_blockchain::Error>,
+		C: AuxStore + ProvideRuntimeApi<B>, C::Api: BabeApi<B>,
 	{
 		trace!(target: "babe", "Getting slot duration");
 		match sc_consensus_slots::SlotDuration::get_or_compute(client, |a, b| {
-			let has_api_v1 = a.has_api_with::<dyn BabeApi<B, Error = sp_blockchain::Error>, _>(
+			let has_api_v1 = a.has_api_with::<dyn BabeApi<B>, _>(
 				&b, |v| v == 1,
 			)?;
-			let has_api_v2 = a.has_api_with::<dyn BabeApi<B, Error = sp_blockchain::Error>, _>(
+			let has_api_v2 = a.has_api_with::<dyn BabeApi<B>, _>(
 				&b, |v| v == 2,
 			)?;
 
@@ -326,7 +328,7 @@ impl Config {
 					Ok(a.configuration_before_version_2(b)?.into())
 				}
 			} else if has_api_v2 {
-				a.configuration(b)
+				a.configuration(b).map_err(Into::into)
 			} else {
 				Err(sp_blockchain::Error::VersionInvalid(
 					"Unsupported or invalid BabeApi version".to_string()
@@ -846,8 +848,7 @@ impl<Block, Client, SelectChain, CAW> BabeVerifier<Block, Client, SelectChain, C
 where
 	Block: BlockT,
 	Client: AuxStore + HeaderBackend<Block> + HeaderMetadata<Block> + ProvideRuntimeApi<Block>,
-	Client::Api: BlockBuilderApi<Block, Error = sp_blockchain::Error>
-		+ BabeApi<Block, Error = sp_blockchain::Error>,
+	Client::Api: BlockBuilderApi<Block> + BabeApi<Block>,
 	SelectChain: sp_consensus::SelectChain<Block>,
 	CAW: CanAuthorWith<Block>,
 {
@@ -871,7 +872,7 @@ where
 			&block_id,
 			block,
 			inherent_data,
-		).map_err(Error::Client)?;
+		).map_err(Error::RuntimeApi)?;
 
 		if !inherent_res.ok() {
 			inherent_res
@@ -934,7 +935,7 @@ where
 			self.client
 				.runtime_api()
 				.generate_key_ownership_proof(block_id, slot, equivocation_proof.offender.clone())
-				.map_err(Error::Client)
+				.map_err(Error::RuntimeApi)
 		};
 
 		let parent_id = BlockId::Hash(*header.parent_hash());
@@ -957,7 +958,7 @@ where
 				equivocation_proof,
 				key_owner_proof,
 			)
-			.map_err(Error::Client)?;
+			.map_err(Error::RuntimeApi)?;
 
 		info!(target: "babe", "Submitted equivocation report for author {:?}", author);
 
@@ -971,7 +972,7 @@ where
 	Block: BlockT,
 	Client: HeaderMetadata<Block, Error = sp_blockchain::Error> + HeaderBackend<Block> + ProvideRuntimeApi<Block>
 		+ Send + Sync + AuxStore + ProvideCache<Block>,
-	Client::Api: BlockBuilderApi<Block, Error = sp_blockchain::Error> + BabeApi<Block, Error = sp_blockchain::Error>,
+	Client::Api: BlockBuilderApi<Block> + BabeApi<Block>,
 	SelectChain: sp_consensus::SelectChain<Block>,
 	CAW: CanAuthorWith<Block> + Send + Sync,
 {
@@ -1498,7 +1499,7 @@ pub fn import_queue<Block: BlockT, Client, SelectChain, Inner, CAW>(
 		+ Send + Sync + 'static,
 	Client: ProvideRuntimeApi<Block> + ProvideCache<Block> + Send + Sync + AuxStore + 'static,
 	Client: HeaderBackend<Block> + HeaderMetadata<Block, Error = sp_blockchain::Error>,
-	Client::Api: BlockBuilderApi<Block> + BabeApi<Block> + ApiExt<Block, Error = sp_blockchain::Error>,
+	Client::Api: BlockBuilderApi<Block> + BabeApi<Block> + ApiExt<Block>,
 	SelectChain: sp_consensus::SelectChain<Block> + 'static,
 	CAW: CanAuthorWith<Block> + Send + Sync + 'static,
 {
diff --git a/client/consensus/manual-seal/src/consensus/babe.rs b/client/consensus/manual-seal/src/consensus/babe.rs
index fb1ca629f693..247a8d9091a6 100644
--- a/client/consensus/manual-seal/src/consensus/babe.rs
+++ b/client/consensus/manual-seal/src/consensus/babe.rs
@@ -73,7 +73,7 @@ impl<B, C> BabeConsensusDataProvider<B, C>
 	where
 		B: BlockT,
 		C: AuxStore + HeaderBackend<B> + ProvideRuntimeApi<B> + HeaderMetadata<B, Error = sp_blockchain::Error>,
-		C::Api: BabeApi<B, Error = sp_blockchain::Error>,
+		C::Api: BabeApi<B>,
 {
 	pub fn new(
 		client: Arc<C>,
@@ -131,7 +131,7 @@ impl<B, C> ConsensusDataProvider<B> for BabeConsensusDataProvider<B, C>
 	where
 		B: BlockT,
 		C: AuxStore + HeaderBackend<B> + HeaderMetadata<B, Error = sp_blockchain::Error> + ProvideRuntimeApi<B>,
-		C::Api: BabeApi<B, Error = sp_blockchain::Error>,
+		C::Api: BabeApi<B>,
 {
 	type Transaction = TransactionFor<C, B>;
 
@@ -259,7 +259,7 @@ impl SlotTimestampProvider {
 		where
 			B: BlockT,
 			C: AuxStore + HeaderBackend<B> + ProvideRuntimeApi<B>,
-			C::Api: BabeApi<B, Error = sp_blockchain::Error>,
+			C::Api: BabeApi<B>,
 	{
 		let slot_duration = Config::get_or_compute(&*client)?.slot_duration;
 		let info = client.info();
diff --git a/client/consensus/pow/src/lib.rs b/client/consensus/pow/src/lib.rs
index 975a6f17e795..5ac8a41417a8 100644
--- a/client/consensus/pow/src/lib.rs
+++ b/client/consensus/pow/src/lib.rs
@@ -232,7 +232,7 @@ impl<B, I, C, S, Algorithm, CAW> PowBlockImport<B, I, C, S, Algorithm, CAW> wher
 	I: BlockImport<B, Transaction = sp_api::TransactionFor<C, B>> + Send + Sync,
 	I::Error: Into<ConsensusError>,
 	C: ProvideRuntimeApi<B> + Send + Sync + HeaderBackend<B> + AuxStore + ProvideCache<B> + BlockOf,
-	C::Api: BlockBuilderApi<B, Error = sp_blockchain::Error>,
+	C::Api: BlockBuilderApi<B>,
 	Algorithm: PowAlgorithm<B>,
 	CAW: CanAuthorWith<B>,
 {
@@ -284,7 +284,7 @@ impl<B, I, C, S, Algorithm, CAW> PowBlockImport<B, I, C, S, Algorithm, CAW> wher
 			&block_id,
 			block,
 			inherent_data,
-		).map_err(Error::Client)?;
+		).map_err(|e| Error::Client(e.into()))?;
 
 		if !inherent_res.ok() {
 			inherent_res
@@ -314,7 +314,7 @@ impl<B, I, C, S, Algorithm, CAW> BlockImport<B> for PowBlockImport<B, I, C, S, A
 	I::Error: Into<ConsensusError>,
 	S: SelectChain<B>,
 	C: ProvideRuntimeApi<B> + Send + Sync + HeaderBackend<B> + AuxStore + ProvideCache<B> + BlockOf,
-	C::Api: BlockBuilderApi<B, Error = sp_blockchain::Error>,
+	C::Api: BlockBuilderApi<B>,
 	Algorithm: PowAlgorithm<B>,
 	Algorithm::Difficulty: 'static,
 	CAW: CanAuthorWith<B>,
diff --git a/client/executor/common/src/error.rs b/client/executor/common/src/error.rs
index 0af148fd9580..96329d168030 100644
--- a/client/executor/common/src/error.rs
+++ b/client/executor/common/src/error.rs
@@ -37,8 +37,8 @@ pub enum Error {
 	#[error(transparent)]
 	Wasmi(#[from] wasmi::Error),
 
-	#[error("API Error: {0}")]
-	ApiError(String),
+	#[error("Error calling api function: {0}")]
+	ApiError(Box<dyn std::error::Error + Send + Sync>),
 
 	#[error("Method not found: '{0}'")]
 	MethodNotFound(String),
@@ -96,16 +96,16 @@ pub enum Error {
 
 	#[error(transparent)]
 	RuntimeConstruction(#[from] WasmError),
-	
+
 	#[error("Shared memory is not supported")]
 	SharedMemUnsupported,
-	
+
 	#[error("Imported globals are not supported yet")]
 	ImportedGlobalsUnsupported,
-	
+
 	#[error("initializer expression can have only up to 2 expressions in wasm 1.0")]
 	InitializerHasTooManyExpressions,
-	
+
 	#[error("Invalid initializer expression provided {0}")]
 	InvalidInitializerExpression(String),
 }
diff --git a/client/executor/src/native_executor.rs b/client/executor/src/native_executor.rs
index cdfe349edabd..42a7950593cc 100644
--- a/client/executor/src/native_executor.rs
+++ b/client/executor/src/native_executor.rs
@@ -456,7 +456,7 @@ impl<D: NativeExecutionDispatch + 'static> CodeExecutor for NativeExecutor<D> {
 
 	fn call<
 		R: Decode + Encode + PartialEq,
-		NC: FnOnce() -> result::Result<R, String> + UnwindSafe,
+		NC: FnOnce() -> result::Result<R, Box<dyn std::error::Error + Send + Sync>> + UnwindSafe,
 	>(
 		&self,
 		ext: &mut dyn Externalities,
@@ -514,7 +514,7 @@ impl<D: NativeExecutionDispatch + 'static> CodeExecutor for NativeExecutor<D> {
 						let res = with_externalities_safe(&mut **ext, move || (call)())
 							.and_then(|r| r
 								.map(NativeOrEncoded::Native)
-								.map_err(|s| Error::ApiError(s))
+								.map_err(Error::ApiError)
 							);
 
 						Ok(res)
diff --git a/client/executor/src/wasm_runtime.rs b/client/executor/src/wasm_runtime.rs
index 477247104970..351a2b5f40f0 100644
--- a/client/executor/src/wasm_runtime.rs
+++ b/client/executor/src/wasm_runtime.rs
@@ -414,7 +414,7 @@ mod tests {
 			authoring_version: 1,
 			spec_version: 1,
 			impl_version: 1,
-			apis: sp_api::create_apis_vec!([(Core::<Block, Error = ()>::ID, 1)]),
+			apis: sp_api::create_apis_vec!([(Core::<Block>::ID, 1)]),
 		};
 
 		let version = decode_version(&old_runtime_version.encode()).unwrap();
@@ -429,7 +429,7 @@ mod tests {
 			authoring_version: 1,
 			spec_version: 1,
 			impl_version: 1,
-			apis: sp_api::create_apis_vec!([(Core::<Block, Error = ()>::ID, 3)]),
+			apis: sp_api::create_apis_vec!([(Core::<Block>::ID, 3)]),
 		};
 
 		decode_version(&old_runtime_version.encode()).unwrap_err();
@@ -443,7 +443,7 @@ mod tests {
 			authoring_version: 1,
 			spec_version: 1,
 			impl_version: 1,
-			apis: sp_api::create_apis_vec!([(Core::<Block, Error = ()>::ID, 3)]),
+			apis: sp_api::create_apis_vec!([(Core::<Block>::ID, 3)]),
 			transaction_version: 3,
 		};
 
diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml
index 38f6acda0548..d1ee2fe6b452 100644
--- a/client/finality-grandpa/Cargo.toml
+++ b/client/finality-grandpa/Cargo.toml
@@ -59,4 +59,3 @@ sp-state-machine = { version = "0.9.0", path = "../../primitives/state-machine"
 sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
 tokio = { version = "0.2", features = ["rt-core"] }
 tempfile = "3.1.0"
-sp-api = { version = "3.0.0", path = "../../primitives/api" }
diff --git a/client/finality-grandpa/src/environment.rs b/client/finality-grandpa/src/environment.rs
index 5e4203b2a40f..55a60e16dfd3 100644
--- a/client/finality-grandpa/src/environment.rs
+++ b/client/finality-grandpa/src/environment.rs
@@ -480,7 +480,7 @@ where
 	Block: BlockT,
 	BE: Backend<Block>,
 	C: crate::ClientForGrandpa<Block, BE>,
-	C::Api: GrandpaApi<Block, Error = sp_blockchain::Error>,
+	C::Api: GrandpaApi<Block>,
 	N: NetworkT<Block>,
 	SC: SelectChain<Block> + 'static,
 {
@@ -549,7 +549,7 @@ where
 				authority_set.set_id,
 				equivocation.offender().clone(),
 			)
-			.map_err(Error::Client)?
+			.map_err(Error::RuntimeApi)?
 		{
 			Some(proof) => proof,
 			None => {
@@ -571,7 +571,7 @@ where
 				equivocation_proof,
 				key_owner_proof,
 			)
-			.map_err(Error::Client)?;
+			.map_err(Error::RuntimeApi)?;
 
 		Ok(())
 	}
@@ -726,7 +726,7 @@ where
 	Block: 'static,
 	B: Backend<Block>,
 	C: crate::ClientForGrandpa<Block, B> + 'static,
-	C::Api: GrandpaApi<Block, Error = sp_blockchain::Error>,
+	C::Api: GrandpaApi<Block>,
 	N: NetworkT<Block> + 'static + Send + Sync,
 	SC: SelectChain<Block> + 'static,
 	VR: VotingRule<Block, C>,
diff --git a/client/finality-grandpa/src/import.rs b/client/finality-grandpa/src/import.rs
index 2eef13d58360..d7b83b803290 100644
--- a/client/finality-grandpa/src/import.rs
+++ b/client/finality-grandpa/src/import.rs
@@ -663,6 +663,7 @@ where
 					Error::Safety(error) => ConsensusError::ClientImport(error),
 					Error::Signing(error) => ConsensusError::ClientImport(error),
 					Error::Timer(error) => ConsensusError::ClientImport(error.to_string()),
+					Error::RuntimeApi(error) => ConsensusError::ClientImport(error.to_string()),
 				});
 			},
 			Ok(_) => {
diff --git a/client/finality-grandpa/src/lib.rs b/client/finality-grandpa/src/lib.rs
index c5ac1189e943..75500a894d74 100644
--- a/client/finality-grandpa/src/lib.rs
+++ b/client/finality-grandpa/src/lib.rs
@@ -295,6 +295,8 @@ pub enum Error {
 	Safety(String),
 	/// A timer failed to fire.
 	Timer(io::Error),
+	/// A runtime api request failed.
+	RuntimeApi(sp_api::ApiError),
 }
 
 impl From<GrandpaError> for Error {
@@ -698,7 +700,7 @@ where
 	NumberFor<Block>: BlockNumberOps,
 	DigestFor<Block>: Encode,
 	C: ClientForGrandpa<Block, BE> + 'static,
-	C::Api: GrandpaApi<Block, Error = sp_blockchain::Error>,
+	C::Api: GrandpaApi<Block>,
 {
 	let GrandpaParams {
 		mut config,
@@ -824,7 +826,7 @@ where
 	Block: BlockT,
 	B: Backend<Block> + 'static,
 	C: ClientForGrandpa<Block, B> + 'static,
-	C::Api: GrandpaApi<Block, Error = sp_blockchain::Error>,
+	C::Api: GrandpaApi<Block>,
 	N: NetworkT<Block> + Sync,
 	NumberFor<Block>: BlockNumberOps,
 	SC: SelectChain<Block> + 'static,
@@ -1042,7 +1044,7 @@ where
 	NumberFor<Block>: BlockNumberOps,
 	SC: SelectChain<Block> + 'static,
 	C: ClientForGrandpa<Block, B> + 'static,
-	C::Api: GrandpaApi<Block, Error = sp_blockchain::Error>,
+	C::Api: GrandpaApi<Block>,
 	VR: VotingRule<Block, C> + Clone + 'static,
 {
 	type Output = Result<(), Error>;
diff --git a/client/finality-grandpa/src/tests.rs b/client/finality-grandpa/src/tests.rs
index b94981838138..4918255d027a 100644
--- a/client/finality-grandpa/src/tests.rs
+++ b/client/finality-grandpa/src/tests.rs
@@ -174,8 +174,6 @@ impl ProvideRuntimeApi<Block> for TestApi {
 
 sp_api::mock_impl_runtime_apis! {
 	impl GrandpaApi<Block> for RuntimeApi {
-		type Error = sp_blockchain::Error;
-
 		fn grandpa_authorities(&self) -> AuthorityList {
 			self.inner.genesis_authorities.clone()
 		}
diff --git a/client/light/src/call_executor.rs b/client/light/src/call_executor.rs
index 8b403823b0ee..ae83807dc98f 100644
--- a/client/light/src/call_executor.rs
+++ b/client/light/src/call_executor.rs
@@ -104,7 +104,7 @@ impl<Block, B, Local> CallExecutor<Block> for
 			Result<NativeOrEncoded<R>, Self::Error>
 		) -> Result<NativeOrEncoded<R>, Self::Error>,
 		R: Encode + Decode + PartialEq,
-		NC: FnOnce() -> result::Result<R, String> + UnwindSafe,
+		NC: FnOnce() -> result::Result<R, sp_api::ApiError> + UnwindSafe,
 	>(
 		&self,
 		initialize_block_fn: IB,
diff --git a/client/offchain/src/lib.rs b/client/offchain/src/lib.rs
index b82f89cb95d6..f456efb755dc 100644
--- a/client/offchain/src/lib.rs
+++ b/client/offchain/src/lib.rs
@@ -132,10 +132,10 @@ impl<Client, Storage, Block> OffchainWorkers<
 	) -> impl Future<Output = ()> {
 		let runtime = self.client.runtime_api();
 		let at = BlockId::hash(header.hash());
-		let has_api_v1 = runtime.has_api_with::<dyn OffchainWorkerApi<Block, Error = ()>, _>(
+		let has_api_v1 = runtime.has_api_with::<dyn OffchainWorkerApi<Block>, _>(
 			&at, |v| v == 1
 		);
-		let has_api_v2 = runtime.has_api_with::<dyn OffchainWorkerApi<Block, Error = ()>, _>(
+		let has_api_v2 = runtime.has_api_with::<dyn OffchainWorkerApi<Block>, _>(
 			&at, |v| v == 2
 		);
 		let version = match (has_api_v1, has_api_v2) {
diff --git a/client/rpc/src/author/mod.rs b/client/rpc/src/author/mod.rs
index 7cd980544503..4181206fdd0a 100644
--- a/client/rpc/src/author/mod.rs
+++ b/client/rpc/src/author/mod.rs
@@ -24,12 +24,9 @@ mod tests;
 use std::{sync::Arc, convert::TryInto};
 use log::warn;
 
-use sp_blockchain::{Error as ClientError, HeaderBackend};
+use sp_blockchain::HeaderBackend;
 
-use rpc::futures::{
-	Sink, Future,
-	future::result,
-};
+use rpc::futures::{Sink, Future, future::result};
 use futures::{StreamExt as _, compat::Compat};
 use futures::future::{ready, FutureExt, TryFutureExt};
 use sc_rpc_api::DenyUnsafe;
@@ -93,7 +90,7 @@ impl<P, Client> AuthorApi<TxHash<P>, BlockHash<P>> for Author<P, Client>
 	where
 		P: TransactionPool + Sync + Send + 'static,
 		Client: HeaderBackend<P::Block> + ProvideRuntimeApi<P::Block> + Send + Sync + 'static,
-		Client::Api: SessionKeys<P::Block, Error = ClientError>,
+		Client::Api: SessionKeys<P::Block>,
 {
 	type Metadata = crate::Metadata;
 
diff --git a/client/rpc/src/state/mod.rs b/client/rpc/src/state/mod.rs
index 52a4ed1d753b..a3d83ae250d0 100644
--- a/client/rpc/src/state/mod.rs
+++ b/client/rpc/src/state/mod.rs
@@ -178,9 +178,8 @@ pub fn new_full<BE, Block: BlockT, Client>(
 		BE: Backend<Block> + 'static,
 		Client: ExecutorProvider<Block> + StorageProvider<Block, BE> + ProofProvider<Block> + HeaderBackend<Block>
 			+ HeaderMetadata<Block, Error = sp_blockchain::Error> + BlockchainEvents<Block>
-			+ CallApiAt<Block, Error = sp_blockchain::Error>
-			+ ProvideRuntimeApi<Block> + Send + Sync + 'static,
-		Client::Api: Metadata<Block, Error = sp_blockchain::Error>,
+			+ CallApiAt<Block> + ProvideRuntimeApi<Block> + Send + Sync + 'static,
+		Client::Api: Metadata<Block>,
 {
 	let child_backend = Box::new(
 		self::state_full::FullState::new(client.clone(), subscriptions.clone())
diff --git a/client/rpc/src/state/state_full.rs b/client/rpc/src/state/state_full.rs
index 8d93d445b08c..a55903484adc 100644
--- a/client/rpc/src/state/state_full.rs
+++ b/client/rpc/src/state/state_full.rs
@@ -223,9 +223,9 @@ impl<BE, Block, Client> StateBackend<Block, Client> for FullState<BE, Block, Cli
 	BE: Backend<Block> + 'static,
 	Client: ExecutorProvider<Block> + StorageProvider<Block, BE> + ProofProvider<Block> + HeaderBackend<Block>
 		+ HeaderMetadata<Block, Error = sp_blockchain::Error> + BlockchainEvents<Block>
-		+ CallApiAt<Block, Error = sp_blockchain::Error> + ProvideRuntimeApi<Block>
+		+ CallApiAt<Block> + ProvideRuntimeApi<Block>
 		+ Send + Sync + 'static,
-	Client::Api: Metadata<Block, Error = sp_blockchain::Error>,
+	Client::Api: Metadata<Block>,
 {
 	fn call(
 		&self,
@@ -344,17 +344,23 @@ impl<BE, Block, Client> StateBackend<Block, Client> for FullState<BE, Block, Cli
 	fn metadata(&self, block: Option<Block::Hash>) -> FutureResult<Bytes> {
 		Box::new(result(
 			self.block_or_best(block)
+				.map_err(client_err)
 				.and_then(|block|
-					self.client.runtime_api().metadata(&BlockId::Hash(block)).map(Into::into)
-				)
-				.map_err(client_err)))
+					self.client.runtime_api().metadata(&BlockId::Hash(block))
+						.map(Into::into)
+						.map_err(|e| Error::Client(Box::new(e))))
+		))
 	}
 
 	fn runtime_version(&self, block: Option<Block::Hash>) -> FutureResult<RuntimeVersion> {
 		Box::new(result(
 			self.block_or_best(block)
-				.and_then(|block| self.client.runtime_version_at(&BlockId::Hash(block)))
-				.map_err(client_err)))
+				.map_err(client_err)
+				.and_then(|block|
+					self.client.runtime_version_at(&BlockId::Hash(block))
+						.map_err(|e| Error::Client(Box::new(e)))
+				)
+		))
 	}
 
 	fn query_storage(
@@ -432,7 +438,7 @@ impl<BE, Block, Client> StateBackend<Block, Client> for FullState<BE, Block, Cli
 					let info = client.info();
 					let version = client
 						.runtime_version_at(&BlockId::hash(info.best_hash))
-						.map_err(client_err)
+						.map_err(|e| Error::Client(Box::new(e)))
 						.map_err(Into::into);
 					if previous_version != version {
 						previous_version = version.clone();
@@ -528,9 +534,9 @@ impl<BE, Block, Client> ChildStateBackend<Block, Client> for FullState<BE, Block
 	BE: Backend<Block> + 'static,
 	Client: ExecutorProvider<Block> + StorageProvider<Block, BE> + HeaderBackend<Block>
 		+ HeaderMetadata<Block, Error = sp_blockchain::Error> + BlockchainEvents<Block>
-		+ CallApiAt<Block, Error = sp_blockchain::Error> + ProvideRuntimeApi<Block>
+		+ CallApiAt<Block> + ProvideRuntimeApi<Block>
 		+ Send + Sync + 'static,
-	Client::Api: Metadata<Block, Error = sp_blockchain::Error>,
+	Client::Api: Metadata<Block>,
 {
 	fn storage_keys(
 		&self,
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index 882a6c406265..486f81667677 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -542,14 +542,13 @@ pub fn spawn_tasks<TBl, TBackend, TExPool, TRpc, TCl>(
 		TCl: ProvideRuntimeApi<TBl> + HeaderMetadata<TBl, Error=sp_blockchain::Error> + Chain<TBl> +
 		BlockBackend<TBl> + BlockIdTo<TBl, Error=sp_blockchain::Error> + ProofProvider<TBl> +
 		HeaderBackend<TBl> + BlockchainEvents<TBl> + ExecutorProvider<TBl> + UsageProvider<TBl> +
-		StorageProvider<TBl, TBackend> + CallApiAt<TBl, Error=sp_blockchain::Error> +
+		StorageProvider<TBl, TBackend> + CallApiAt<TBl> +
 		Send + 'static,
 		<TCl as ProvideRuntimeApi<TBl>>::Api:
 			sp_api::Metadata<TBl> +
 			sc_offchain::OffchainWorkerApi<TBl> +
 			sp_transaction_pool::runtime_api::TaggedTransactionQueue<TBl> +
 			sp_session::SessionKeys<TBl> +
-			sp_api::ApiErrorExt<Error = sp_blockchain::Error> +
 			sp_api::ApiExt<TBl, StateBackend = TBackend::State>,
 		TBl: BlockT,
 		TBackend: 'static + sc_client_api::backend::Backend<TBl> + Send,
@@ -578,7 +577,7 @@ pub fn spawn_tasks<TBl, TBackend, TExPool, TRpc, TCl>(
 		client.clone(),
 		&BlockId::Hash(chain_info.best_hash),
 		config.dev_key_seed.clone().map(|s| vec![s]).unwrap_or_default(),
-	)?;
+	).map_err(|e| Error::Application(Box::new(e)))?;
 
 	let telemetry_connection_notifier = init_telemetry(
 		&mut config,
@@ -729,14 +728,14 @@ fn gen_handler<TBl, TBackend, TExPool, TRpc, TCl>(
 		TBl: BlockT,
 		TCl: ProvideRuntimeApi<TBl> + BlockchainEvents<TBl> + HeaderBackend<TBl> +
 		HeaderMetadata<TBl, Error=sp_blockchain::Error> + ExecutorProvider<TBl> +
-		CallApiAt<TBl, Error=sp_blockchain::Error> + ProofProvider<TBl> +
+		CallApiAt<TBl> + ProofProvider<TBl> +
 		StorageProvider<TBl, TBackend> + BlockBackend<TBl> + Send + Sync + 'static,
 		TExPool: MaintainedTransactionPool<Block=TBl, Hash = <TBl as BlockT>::Hash> + 'static,
 		TBackend: sc_client_api::backend::Backend<TBl> + 'static,
 		TRpc: sc_rpc::RpcExtension<sc_rpc::Metadata>,
 		<TCl as ProvideRuntimeApi<TBl>>::Api:
 			sp_session::SessionKeys<TBl> +
-			sp_api::Metadata<TBl, Error = sp_blockchain::Error>,
+			sp_api::Metadata<TBl>,
 {
 	use sc_rpc::{chain, state, author, system, offchain};
 
diff --git a/client/service/src/client/call_executor.rs b/client/service/src/client/call_executor.rs
index cc196f67a37a..8c7ca645b0ff 100644
--- a/client/service/src/client/call_executor.rs
+++ b/client/service/src/client/call_executor.rs
@@ -161,7 +161,7 @@ where
 			Result<NativeOrEncoded<R>, Self::Error>
 		) -> Result<NativeOrEncoded<R>, Self::Error>,
 		R: Encode + Decode + PartialEq,
-		NC: FnOnce() -> result::Result<R, String> + UnwindSafe,
+		NC: FnOnce() -> result::Result<R, sp_api::ApiError> + UnwindSafe,
 	>(
 		&self,
 		initialize_block_fn: IB,
@@ -226,7 +226,10 @@ where
 				);
 				// TODO: https://github.com/paritytech/substrate/issues/4455
 				// .with_storage_transaction_cache(storage_transaction_cache.as_mut().map(|c| &mut **c))
-				state_machine.execute_using_consensus_failure_handler(execution_manager, native_call)
+				state_machine.execute_using_consensus_failure_handler(
+					execution_manager,
+					native_call.map(|n| || (n)().map_err(|e| Box::new(e) as Box<_>)),
+				)
 			},
 			None => {
 				let state_runtime_code = sp_state_machine::backend::BackendRuntimeCode::new(&state);
@@ -245,7 +248,10 @@ where
 					&runtime_code,
 					self.spawn_handle.clone(),
 				).with_storage_transaction_cache(storage_transaction_cache.as_mut().map(|c| &mut **c));
-				state_machine.execute_using_consensus_failure_handler(execution_manager, native_call)
+				state_machine.execute_using_consensus_failure_handler(
+					execution_manager,
+					native_call.map(|n| || (n)().map_err(|e| Box::new(e) as Box<_>)),
+				)
 			}
 		}.map_err(Into::into)
 	}
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index 8cb0e304cdad..b1ff0678ee9a 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -604,7 +604,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		new_cache: HashMap<CacheKeyId, Vec<u8>>,
 	) -> sp_blockchain::Result<ImportResult> where
 		Self: ProvideRuntimeApi<Block>,
-		<Self as ProvideRuntimeApi<Block>>::Api: CoreApi<Block, Error = Error> +
+		<Self as ProvideRuntimeApi<Block>>::Api: CoreApi<Block> +
 			ApiExt<Block, StateBackend = B::State>,
 	{
 		let BlockImportParams {
@@ -696,7 +696,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		import_existing: bool,
 	) -> sp_blockchain::Result<ImportResult> where
 		Self: ProvideRuntimeApi<Block>,
-		<Self as ProvideRuntimeApi<Block>>::Api: CoreApi<Block, Error = Error> +
+		<Self as ProvideRuntimeApi<Block>>::Api: CoreApi<Block> +
 				ApiExt<Block, StateBackend = B::State>,
 	{
 		let parent_hash = import_headers.post().parent_hash().clone();
@@ -838,7 +838,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 	) -> sp_blockchain::Result<Option<ImportResult>>
 		where
 			Self: ProvideRuntimeApi<Block>,
-			<Self as ProvideRuntimeApi<Block>>::Api: CoreApi<Block, Error = Error> +
+			<Self as ProvideRuntimeApi<Block>>::Api: CoreApi<Block> +
 				ApiExt<Block, StateBackend = B::State>,
 	{
 		let parent_hash = import_block.header.parent_hash();
@@ -1272,7 +1272,7 @@ impl<B, E, Block, RA> BlockBuilderProvider<B, Block, Self> for Client<B, E, Bloc
 		Block: BlockT,
 		Self: ChainHeaderBackend<Block> + ProvideRuntimeApi<Block>,
 		<Self as ProvideRuntimeApi<Block>>::Api: ApiExt<Block, StateBackend = backend::StateBackendFor<B, Block>>
-			+ BlockBuilderApi<Block, Error = Error>,
+			+ BlockBuilderApi<Block>,
 {
 	fn new_block_at<R: Into<RecordProof>>(
 		&self,
@@ -1628,18 +1628,17 @@ impl<B, E, Block, RA> CallApiAt<Block> for Client<B, E, Block, RA> where
 	E: CallExecutor<Block, Backend = B> + Send + Sync,
 	Block: BlockT,
 {
-	type Error = Error;
 	type StateBackend = B::State;
 
 	fn call_api_at<
 		'a,
 		R: Encode + Decode + PartialEq,
-		NC: FnOnce() -> result::Result<R, String> + UnwindSafe,
-		C: CoreApi<Block, Error = Error>,
+		NC: FnOnce() -> result::Result<R, sp_api::ApiError> + UnwindSafe,
+		C: CoreApi<Block>,
 	>(
 		&self,
 		params: CallApiAtParams<'a, Block, C, NC, B::State>,
-	) -> sp_blockchain::Result<NativeOrEncoded<R>> {
+	) -> Result<NativeOrEncoded<R>, sp_api::ApiError> {
 		let core_api = params.core_api;
 		let at = params.at;
 
@@ -1649,7 +1648,9 @@ impl<B, E, Block, RA> CallApiAt<Block> for Client<B, E, Block, RA> where
 		);
 
 		self.executor.contextual_call::<_, fn(_,_) -> _,_,_>(
-			|| core_api.initialize_block(at, &self.prepare_environment_block(at)?),
+			|| core_api
+				.initialize_block(at, &self.prepare_environment_block(at)?)
+				.map_err(Error::RuntimeApiError),
 			at,
 			params.function,
 			&params.arguments,
@@ -1660,11 +1661,14 @@ impl<B, E, Block, RA> CallApiAt<Block> for Client<B, E, Block, RA> where
 			params.native_call,
 			params.recorder,
 			Some(extensions),
-		)
+		).map_err(Into::into)
 	}
 
-	fn runtime_version_at(&self, at: &BlockId<Block>) -> sp_blockchain::Result<RuntimeVersion> {
-		self.runtime_version_at(at)
+	fn runtime_version_at(
+		&self,
+		at: &BlockId<Block>,
+	) -> Result<RuntimeVersion, sp_api::ApiError> {
+		self.runtime_version_at(at).map_err(Into::into)
 	}
 }
 
@@ -1676,7 +1680,7 @@ impl<B, E, Block, RA> sp_consensus::BlockImport<Block> for &Client<B, E, Block,
 	E: CallExecutor<Block> + Send + Sync,
 	Block: BlockT,
 	Client<B, E, Block, RA>: ProvideRuntimeApi<Block>,
-	<Client<B, E, Block, RA> as ProvideRuntimeApi<Block>>::Api: CoreApi<Block, Error = Error> +
+	<Client<B, E, Block, RA> as ProvideRuntimeApi<Block>>::Api: CoreApi<Block> +
 		ApiExt<Block, StateBackend = B::State>,
 {
 	type Error = ConsensusError;
@@ -1776,7 +1780,7 @@ impl<B, E, Block, RA> sp_consensus::BlockImport<Block> for Client<B, E, Block, R
 	E: CallExecutor<Block> + Send + Sync,
 	Block: BlockT,
 	Self: ProvideRuntimeApi<Block>,
-	<Self as ProvideRuntimeApi<Block>>::Api: CoreApi<Block, Error = Error> +
+	<Self as ProvideRuntimeApi<Block>>::Api: CoreApi<Block> +
 		ApiExt<Block, StateBackend = B::State>,
 {
 	type Error = ConsensusError;
@@ -1935,7 +1939,7 @@ impl<B, E, Block, RA> backend::AuxStore for Client<B, E, Block, RA>
 		E: CallExecutor<Block>,
 		Block: BlockT,
 		Self: ProvideRuntimeApi<Block>,
-		<Self as ProvideRuntimeApi<Block>>::Api: CoreApi<Block, Error = Error>,
+		<Self as ProvideRuntimeApi<Block>>::Api: CoreApi<Block>,
 {
 	/// Insert auxiliary data into key-value store.
 	fn insert_aux<
@@ -1965,7 +1969,7 @@ impl<B, E, Block, RA> backend::AuxStore for &Client<B, E, Block, RA>
 		E: CallExecutor<Block>,
 		Block: BlockT,
 		Client<B, E, Block, RA>: ProvideRuntimeApi<Block>,
-		<Client<B, E, Block, RA> as ProvideRuntimeApi<Block>>::Api: CoreApi<Block, Error = Error>,
+		<Client<B, E, Block, RA> as ProvideRuntimeApi<Block>>::Api: CoreApi<Block>,
 {
 	fn insert_aux<
 		'a,
diff --git a/client/service/src/error.rs b/client/service/src/error.rs
index 31c3cea4ef43..caa54700da91 100644
--- a/client/service/src/error.rs
+++ b/client/service/src/error.rs
@@ -33,13 +33,13 @@ pub type Result<T> = std::result::Result<T, Error>;
 pub enum Error {
 	#[error(transparent)]
 	Client(#[from] sp_blockchain::Error),
-	
+
 	#[error(transparent)]
 	Io(#[from] std::io::Error),
-	
+
 	#[error(transparent)]
 	Consensus(#[from] sp_consensus::Error),
-	
+
 	#[error(transparent)]
 	Network(#[from] sc_network::error::Error),
 
diff --git a/client/service/test/src/client/light.rs b/client/service/test/src/client/light.rs
index b6287741fdf3..3b20f163871f 100644
--- a/client/service/test/src/client/light.rs
+++ b/client/service/test/src/client/light.rs
@@ -215,7 +215,7 @@ impl CallExecutor<Block> for DummyCallExecutor {
 			Result<NativeOrEncoded<R>, Self::Error>
 		) -> Result<NativeOrEncoded<R>, Self::Error>,
 		R: Encode + Decode + PartialEq,
-		NC: FnOnce() -> Result<R, String> + UnwindSafe,
+		NC: FnOnce() -> Result<R, sp_api::ApiError> + UnwindSafe,
 	>(
 		&self,
 		_initialize_block_fn: IB,
diff --git a/client/service/test/src/client/mod.rs b/client/service/test/src/client/mod.rs
index 7498289c7be1..66b6aae12c2f 100644
--- a/client/service/test/src/client/mod.rs
+++ b/client/service/test/src/client/mod.rs
@@ -1327,7 +1327,9 @@ fn doesnt_import_blocks_that_revert_finality() {
 
 	let import_err = client.import(BlockOrigin::Own, b3).err().unwrap();
 	let expected_err = ConsensusError::ClientImport(
-		sp_blockchain::Error::NotInFinalizedChain.to_string()
+		sp_blockchain::Error::RuntimeApiError(
+			sp_api::ApiError::Application(Box::new(sp_blockchain::Error::NotInFinalizedChain))
+		).to_string()
 	);
 
 	assert_eq!(
diff --git a/client/transaction-pool/src/api.rs b/client/transaction-pool/src/api.rs
index fc14a5a0cba6..2ebf038844fa 100644
--- a/client/transaction-pool/src/api.rs
+++ b/client/transaction-pool/src/api.rs
@@ -84,7 +84,6 @@ where
 	Client: ProvideRuntimeApi<Block> + BlockBackend<Block> + BlockIdTo<Block>,
 	Client: Send + Sync + 'static,
 	Client::Api: TaggedTransactionQueue<Block>,
-	sp_api::ApiErrorFor<Client, Block>: Send + std::fmt::Display,
 {
 	type Block = Block;
 	type Error = error::Error;
@@ -166,14 +165,13 @@ where
 	Client: ProvideRuntimeApi<Block> + BlockBackend<Block> + BlockIdTo<Block>,
 	Client: Send + Sync + 'static,
 	Client::Api: TaggedTransactionQueue<Block>,
-	sp_api::ApiErrorFor<Client, Block>: Send + std::fmt::Display,
 {
 	sp_tracing::within_span!(sp_tracing::Level::TRACE, "validate_transaction";
 	{
 		let runtime_api = client.runtime_api();
 		let has_v2 = sp_tracing::within_span! { sp_tracing::Level::TRACE, "check_version";
 			runtime_api
-				.has_api_with::<dyn TaggedTransactionQueue<Block, Error=()>, _>(&at, |v| v >= 2)
+				.has_api_with::<dyn TaggedTransactionQueue<Block>, _>(&at, |v| v >= 2)
 				.unwrap_or_default()
 		};
 
@@ -198,7 +196,6 @@ where
 	Client: ProvideRuntimeApi<Block> + BlockBackend<Block> + BlockIdTo<Block>,
 	Client: Send + Sync + 'static,
 	Client::Api: TaggedTransactionQueue<Block>,
-	sp_api::ApiErrorFor<Client, Block>: Send + std::fmt::Display,
 {
 	/// Validates a transaction by calling into the runtime, same as
 	/// `validate_transaction` but blocks the current thread when performing
diff --git a/client/transaction-pool/src/lib.rs b/client/transaction-pool/src/lib.rs
index 32525065b979..b6f19ba37686 100644
--- a/client/transaction-pool/src/lib.rs
+++ b/client/transaction-pool/src/lib.rs
@@ -360,7 +360,6 @@ where
 		+ sp_runtime::traits::BlockIdTo<Block>,
 	Client: sc_client_api::ExecutorProvider<Block> + Send + Sync + 'static,
 	Client::Api: sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block>,
-	sp_api::ApiErrorFor<Client, Block>: Send + std::fmt::Display,
 {
 	/// Create new basic transaction pool for a full node with the provided api.
 	pub fn new_full(
@@ -391,7 +390,6 @@ where
 		+ sp_runtime::traits::BlockIdTo<Block>,
 	Client: Send + Sync + 'static,
 	Client::Api: sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block>,
-	sp_api::ApiErrorFor<Client, Block>: Send + std::fmt::Display,
 {
 	type Block = Block;
 	type Hash = sc_transaction_graph::ExtrinsicHash<FullChainApi<Client, Block>>;
diff --git a/primitives/api/proc-macro/src/decl_runtime_apis.rs b/primitives/api/proc-macro/src/decl_runtime_apis.rs
index ed5f33ef603e..9fd5baba877d 100644
--- a/primitives/api/proc-macro/src/decl_runtime_apis.rs
+++ b/primitives/api/proc-macro/src/decl_runtime_apis.rs
@@ -187,14 +187,15 @@ fn generate_native_call_generators(decl: &ItemTrait) -> Result<TokenStream> {
 	result.push(quote!(
 		#[cfg(any(feature = "std", test))]
 		fn convert_between_block_types
-			<I: #crate_::Encode, R: #crate_::Decode>(
-				input: &I, error_desc: &'static str,
-			) -> std::result::Result<R, String>
+			<I: #crate_::Encode, R: #crate_::Decode, F: FnOnce(#crate_::codec::Error) -> #crate_::ApiError>(
+				input: &I,
+				map_error: F,
+			) -> std::result::Result<R, #crate_::ApiError>
 		{
 			<R as #crate_::DecodeLimit>::decode_with_depth_limit(
 				#crate_::MAX_EXTRINSIC_DEPTH,
 				&mut &#crate_::Encode::encode(input)[..],
-			).map_err(|e| format!("{} {}", error_desc, e))
+			).map_err(map_error)
 		}
 	));
 
@@ -202,19 +203,26 @@ fn generate_native_call_generators(decl: &ItemTrait) -> Result<TokenStream> {
 	for fn_ in fns {
 		let params = extract_parameter_names_types_and_borrows(&fn_, AllowSelfRefInParameters::No)?;
 		let trait_fn_name = &fn_.ident;
+		let function_name_str = fn_.ident.to_string();
 		let fn_name = generate_native_call_generator_fn_name(&fn_.ident);
 		let output = return_type_replace_block_with_node_block(fn_.output.clone());
 		let output_ty = return_type_extract_type(&output);
-		let output = quote!( std::result::Result<#output_ty, String> );
+		let output = quote!( std::result::Result<#output_ty, #crate_::ApiError> );
 
 		// Every type that is using the `Block` generic parameter, we need to encode/decode,
 		// to make it compatible between the runtime/node.
 		let conversions = params.iter().filter(|v| type_is_using_block(&v.1)).map(|(n, t, _)| {
-			let name_str = format!(
-				"Could not convert parameter `{}` between node and runtime:", quote!(#n)
-			);
+			let param_name = quote!(#n).to_string();
+
 			quote!(
-				let #n: #t = convert_between_block_types(&#n, #name_str)?;
+				let #n: #t = convert_between_block_types(
+					&#n,
+					|e| #crate_::ApiError::FailedToConvertParameter {
+						function: #function_name_str,
+						parameter: #param_name,
+						error: e,
+					},
+				)?;
 			)
 		});
 		// Same as for the input types, we need to check if we also need to convert the output,
@@ -223,7 +231,10 @@ fn generate_native_call_generators(decl: &ItemTrait) -> Result<TokenStream> {
 			quote!(
 				convert_between_block_types(
 					&res,
-					"Could not convert return value from runtime to node!"
+					|e| #crate_::ApiError::FailedToConvertReturnValue {
+						function: #function_name_str,
+						error: e,
+					},
 				)
 			)
 		} else {
@@ -399,10 +410,10 @@ fn generate_call_api_at_calls(decl: &ItemTrait) -> Result<TokenStream> {
 			#[cfg(any(feature = "std", test))]
 			pub fn #fn_name<
 				R: #crate_::Encode + #crate_::Decode + PartialEq,
-				NC: FnOnce() -> std::result::Result<R, String> + std::panic::UnwindSafe,
+				NC: FnOnce() -> std::result::Result<R, #crate_::ApiError> + std::panic::UnwindSafe,
 				Block: #crate_::BlockT,
 				T: #crate_::CallApiAt<Block>,
-				C: #crate_::Core<Block, Error = T::Error>,
+				C: #crate_::Core<Block>,
 			>(
 				call_runtime_at: &T,
 				core_api: &C,
@@ -416,7 +427,7 @@ fn generate_call_api_at_calls(decl: &ItemTrait) -> Result<TokenStream> {
 				native_call: Option<NC>,
 				context: #crate_::ExecutionContext,
 				recorder: &Option<#crate_::ProofRecorder<Block>>,
-			) -> std::result::Result<#crate_::NativeOrEncoded<R>, T::Error> {
+			) -> std::result::Result<#crate_::NativeOrEncoded<R>, #crate_::ApiError> {
 				let version = call_runtime_at.runtime_version_at(at)?;
 				use #crate_::InitializeBlock;
 				let initialize_block = if #skip_initialize_block {
@@ -621,7 +632,7 @@ impl<'a> ToClientSideDecl<'a> {
 					context: #crate_::ExecutionContext,
 					params: Option<( #( #param_types ),* )>,
 					params_encoded: Vec<u8>,
-				) -> std::result::Result<#crate_::NativeOrEncoded<#ret_type>, Self::Error>;
+				) -> std::result::Result<#crate_::NativeOrEncoded<#ret_type>, #crate_::ApiError>;
 			}
 		)
 	}
@@ -647,7 +658,7 @@ impl<'a> ToClientSideDecl<'a> {
 		let params2 = params.clone();
 		let ret_type = return_type_extract_type(&method.sig.output);
 
-		fold_fn_decl_for_client_side(&mut method.sig, &self.block_id);
+		fold_fn_decl_for_client_side(&mut method.sig, &self.block_id, &self.crate_);
 
 		let name_impl = generate_method_runtime_api_impl_name(&self.trait_, &method.sig.ident);
 		let crate_ = self.crate_;
@@ -705,7 +716,12 @@ impl<'a> ToClientSideDecl<'a> {
 							},
 							#crate_::NativeOrEncoded::Encoded(r) => {
 								<#ret_type as #crate_::Decode>::decode(&mut &r[..])
-									.map_err(|err| { #crate_::ApiError::new(#function_name, err).into() })
+									.map_err(|err|
+										#crate_::ApiError::FailedToDecodeReturnValue {
+											function: #function_name,
+											error: err,
+										}
+									)
 							}
 						}
 					)
@@ -728,12 +744,10 @@ impl<'a> Fold for ToClientSideDecl<'a> {
 
 		if is_core_trait {
 			// Add all the supertraits we want to have for `Core`.
-			let crate_ = &self.crate_;
 			input.supertraits = parse_quote!(
 				'static
 				+ Send
 				+ Sync
-				+ #crate_::ApiErrorExt
 			);
 		} else {
 			// Add the `Core` runtime api as super trait.
@@ -803,12 +817,12 @@ fn generate_runtime_info_impl(trait_: &ItemTrait, version: u64) -> TokenStream {
 		let bounds = &t.bounds;
 
 		quote! { #ident #colon_token #bounds }
-	}).chain(std::iter::once(quote! { __Sr_Api_Error__ }));
+	});
 
 	let ty_generics = trait_.generics.type_params().map(|t| {
 		let ident = &t.ident;
 		quote! { #ident }
-	}).chain(std::iter::once(quote! { Error = __Sr_Api_Error__ }));
+	});
 
 	quote!(
 		#[cfg(any(feature = "std", test))]
diff --git a/primitives/api/proc-macro/src/impl_runtime_apis.rs b/primitives/api/proc-macro/src/impl_runtime_apis.rs
index f8d7c74b9738..51bbe1c73ac8 100644
--- a/primitives/api/proc-macro/src/impl_runtime_apis.rs
+++ b/primitives/api/proc-macro/src/impl_runtime_apis.rs
@@ -233,16 +233,6 @@ fn generate_runtime_api_base_structures() -> Result<TokenStream> {
 					C::StateBackend: #crate_::StateBackend<#crate_::HashFor<Block>>,
 		{}
 
-		#[cfg(any(feature = "std", test))]
-		impl<Block: #crate_::BlockT, C: #crate_::CallApiAt<Block>> #crate_::ApiErrorExt
-			for RuntimeApiImpl<Block, C>
-				where
-					// Rust bug: https://github.com/rust-lang/rust/issues/24159
-					C::StateBackend: #crate_::StateBackend<#crate_::HashFor<Block>>,
-		{
-			type Error = C::Error;
-		}
-
 		#[cfg(any(feature = "std", test))]
 		impl<Block: #crate_::BlockT, C: #crate_::CallApiAt<Block>> #crate_::ApiExt<Block> for
 			RuntimeApiImpl<Block, C>
@@ -269,16 +259,20 @@ fn generate_runtime_api_base_structures() -> Result<TokenStream> {
 			fn has_api<A: #crate_::RuntimeApiInfo + ?Sized>(
 				&self,
 				at: &#crate_::BlockId<Block>,
-			) -> std::result::Result<bool, C::Error> where Self: Sized {
-				self.call.runtime_version_at(at).map(|v| v.has_api_with(&A::ID, |v| v == A::VERSION))
+			) -> std::result::Result<bool, #crate_::ApiError> where Self: Sized {
+				self.call
+					.runtime_version_at(at)
+					.map(|v| v.has_api_with(&A::ID, |v| v == A::VERSION))
 			}
 
 			fn has_api_with<A: #crate_::RuntimeApiInfo + ?Sized, P: Fn(u32) -> bool>(
 				&self,
 				at: &#crate_::BlockId<Block>,
 				pred: P,
-			) -> std::result::Result<bool, C::Error> where Self: Sized {
-				self.call.runtime_version_at(at).map(|v| v.has_api_with(&A::ID, pred))
+			) -> std::result::Result<bool, #crate_::ApiError> where Self: Sized {
+				self.call
+					.runtime_version_at(at)
+					.map(|v| v.has_api_with(&A::ID, pred))
 			}
 
 			fn record_proof(&mut self) {
@@ -306,7 +300,7 @@ fn generate_runtime_api_base_structures() -> Result<TokenStream> {
 				>>,
 				parent_hash: Block::Hash,
 			) -> std::result::Result<
-				#crate_::StorageChanges<Self::StateBackend, Block>,
+				#crate_::StorageChanges<C::StateBackend, Block>,
 				String
 			> where Self: Sized {
 				self.initialized_block.borrow_mut().take();
@@ -513,7 +507,7 @@ impl<'a> Fold for ApiRuntimeImplToApiRuntimeApiImpl<'a> {
 
 			// Generate the correct return type.
 			input.sig.output = parse_quote!(
-				-> std::result::Result<#crate_::NativeOrEncoded<#ret_type>, RuntimeApiImplCall::Error>
+				-> std::result::Result<#crate_::NativeOrEncoded<#ret_type>, #crate_::ApiError>
 			);
 
 			// Generate the new method implementation that calls into the runtime.
@@ -554,7 +548,7 @@ impl<'a> Fold for ApiRuntimeImplToApiRuntimeApiImpl<'a> {
 			)
 		};
 
-		let mut input =	fold::fold_impl_item_method(self, input);
+		let mut input = fold::fold_impl_item_method(self, input);
 		// We need to set the block, after we modified the rest of the ast, otherwise we would
 		// modify our generated block as well.
 		input.block = block;
diff --git a/primitives/api/proc-macro/src/mock_impl_runtime_apis.rs b/primitives/api/proc-macro/src/mock_impl_runtime_apis.rs
index c6ff98c0f1dc..62a03a59baac 100644
--- a/primitives/api/proc-macro/src/mock_impl_runtime_apis.rs
+++ b/primitives/api/proc-macro/src/mock_impl_runtime_apis.rs
@@ -27,7 +27,7 @@ use proc_macro2::{Span, TokenStream};
 use quote::{quote, quote_spanned};
 
 use syn::{
-	spanned::Spanned, parse_macro_input, Ident, Type, ItemImpl, ImplItem, TypePath, parse_quote,
+	spanned::Spanned, parse_macro_input, Ident, Type, ItemImpl, TypePath, parse_quote,
 	parse::{Parse, ParseStream, Result, Error}, fold::{self, Fold}, Attribute, Pat,
 };
 
@@ -61,29 +61,14 @@ impl Parse for RuntimeApiImpls {
 	}
 }
 
-/// Implement the `ApiExt` trait, `ApiErrorExt` trait and the `Core` runtime api.
+/// Implement the `ApiExt` trait and the `Core` runtime api.
 fn implement_common_api_traits(
-	error_type: Option<Type>,
 	block_type: TypePath,
 	self_ty: Type,
 ) -> Result<TokenStream> {
 	let crate_ = generate_crate_access(HIDDEN_INCLUDES_ID);
 
-	let error_type = error_type
-		.map(|e| quote!(#e))
-		.unwrap_or_else(|| quote!( #crate_::ApiError ) );
-
-	// Quote using the span from `error_type` to generate nice error messages when the type is
-	// not implementing a trait or similar.
-	let api_error_ext = quote_spanned! { error_type.span() =>
-		impl #crate_::ApiErrorExt for #self_ty {
-			type Error = #error_type;
-		}
-	};
-
 	Ok(quote!(
-		#api_error_ext
-
 		impl #crate_::ApiExt<#block_type> for #self_ty {
 			type StateBackend = #crate_::InMemoryBackend<#crate_::HashFor<#block_type>>;
 
@@ -97,7 +82,7 @@ fn implement_common_api_traits(
 			fn has_api<A: #crate_::RuntimeApiInfo + ?Sized>(
 				&self,
 				_: &#crate_::BlockId<#block_type>,
-			) -> std::result::Result<bool, #error_type> where Self: Sized {
+			) -> std::result::Result<bool, #crate_::ApiError> where Self: Sized {
 				Ok(true)
 			}
 
@@ -105,7 +90,7 @@ fn implement_common_api_traits(
 				&self,
 				_: &#crate_::BlockId<#block_type>,
 				pred: P,
-			) -> std::result::Result<bool, #error_type> where Self: Sized {
+			) -> std::result::Result<bool, #crate_::ApiError> where Self: Sized {
 				Ok(pred(A::VERSION))
 			}
 
@@ -140,7 +125,7 @@ fn implement_common_api_traits(
 				_: #crate_::ExecutionContext,
 				_: Option<()>,
 				_: Vec<u8>,
-			) -> std::result::Result<#crate_::NativeOrEncoded<#crate_::RuntimeVersion>, #error_type> {
+			) -> std::result::Result<#crate_::NativeOrEncoded<#crate_::RuntimeVersion>, #crate_::ApiError> {
 				unimplemented!("Not required for testing!")
 			}
 
@@ -150,7 +135,7 @@ fn implement_common_api_traits(
 				_: #crate_::ExecutionContext,
 				_: Option<#block_type>,
 				_: Vec<u8>,
-			) -> std::result::Result<#crate_::NativeOrEncoded<()>, #error_type> {
+			) -> std::result::Result<#crate_::NativeOrEncoded<()>, #crate_::ApiError> {
 				unimplemented!("Not required for testing!")
 			}
 
@@ -160,7 +145,7 @@ fn implement_common_api_traits(
 				_: #crate_::ExecutionContext,
 				_: Option<&<#block_type as #crate_::BlockT>::Header>,
 				_: Vec<u8>,
-			) -> std::result::Result<#crate_::NativeOrEncoded<()>, #error_type> {
+			) -> std::result::Result<#crate_::NativeOrEncoded<()>, #crate_::ApiError> {
 				unimplemented!("Not required for testing!")
 			}
 		}
@@ -230,9 +215,6 @@ struct FoldRuntimeApiImpl<'a> {
 	block_type: &'a TypePath,
 	/// The identifier of the trait being implemented.
 	impl_trait: &'a Ident,
-	/// Stores the error type that is being found in the trait implementation as associated type
-	/// with the name `Error`.
-	error_type: &'a mut Option<Type>,
 }
 
 impl<'a> Fold for FoldRuntimeApiImpl<'a> {
@@ -300,7 +282,7 @@ impl<'a> Fold for FoldRuntimeApiImpl<'a> {
 
 				// Generate the correct return type.
 				input.sig.output = parse_quote!(
-					-> std::result::Result<#crate_::NativeOrEncoded<#ret_type>, Self::Error>
+					-> std::result::Result<#crate_::NativeOrEncoded<#ret_type>, #crate_::ApiError>
 				);
 			}
 
@@ -336,51 +318,12 @@ impl<'a> Fold for FoldRuntimeApiImpl<'a> {
 		input.block = block;
 		input
 	}
-
-	fn fold_impl_item(&mut self, input: ImplItem) -> ImplItem {
-		match input {
-			ImplItem::Type(ty) => {
-				if ty.ident == "Error" {
-					if let Some(error_type) = self.error_type {
-						if *error_type != ty.ty {
-							let mut error = Error::new(
-								ty.span(),
-								"Error type can not change between runtime apis",
-							);
-							let error_first = Error::new(
-								error_type.span(),
-								"First error type was declared here."
-							);
-
-							error.combine(error_first);
-
-							ImplItem::Verbatim(error.to_compile_error())
-						} else {
-							ImplItem::Verbatim(Default::default())
-						}
-					} else {
-						*self.error_type = Some(ty.ty);
-						ImplItem::Verbatim(Default::default())
-					}
-				} else {
-					let error = Error::new(
-						ty.span(),
-						"Only associated type with name `Error` is allowed",
-					);
-					ImplItem::Verbatim(error.to_compile_error())
-				}
-			},
-			o => fold::fold_impl_item(self, o),
-		}
-	}
 }
 
 /// Result of [`generate_runtime_api_impls`].
 struct GeneratedRuntimeApiImpls {
 	/// All the runtime api implementations.
 	impls: TokenStream,
-	/// The error type that should be used by the runtime apis.
-	error_type: Option<Type>,
 	/// The block type that is being used by the runtime apis.
 	block_type: TypePath,
 	/// The type the traits are implemented for.
@@ -393,7 +336,6 @@ struct GeneratedRuntimeApiImpls {
 /// extracts the error type, self type and the block type.
 fn generate_runtime_api_impls(impls: &[ItemImpl]) -> Result<GeneratedRuntimeApiImpls> {
 	let mut result = Vec::with_capacity(impls.len());
-	let mut error_type = None;
 	let mut global_block_type: Option<TypePath> = None;
 	let mut self_ty: Option<Box<Type>> = None;
 
@@ -451,7 +393,6 @@ fn generate_runtime_api_impls(impls: &[ItemImpl]) -> Result<GeneratedRuntimeApiI
 		let mut visitor = FoldRuntimeApiImpl {
 			block_type,
 			impl_trait: &impl_trait.ident,
-			error_type: &mut error_type,
 		};
 
 		result.push(visitor.fold_item_impl(impl_.clone()));
@@ -459,7 +400,6 @@ fn generate_runtime_api_impls(impls: &[ItemImpl]) -> Result<GeneratedRuntimeApiI
 
 	Ok(GeneratedRuntimeApiImpls {
 		impls: quote!( #( #result )* ),
-		error_type,
 		block_type: global_block_type.expect("There is a least one runtime api; qed"),
 		self_ty: *self_ty.expect("There is at least one runtime api; qed"),
 	})
@@ -475,9 +415,9 @@ pub fn mock_impl_runtime_apis_impl(input: proc_macro::TokenStream) -> proc_macro
 
 fn mock_impl_runtime_apis_impl_inner(api_impls: &[ItemImpl]) -> Result<TokenStream> {
 	let hidden_includes = generate_hidden_includes(HIDDEN_INCLUDES_ID);
-	let GeneratedRuntimeApiImpls { impls, error_type, block_type, self_ty } =
+	let GeneratedRuntimeApiImpls { impls, block_type, self_ty } =
 		generate_runtime_api_impls(api_impls)?;
-	let api_traits = implement_common_api_traits(error_type, block_type, self_ty)?;
+	let api_traits = implement_common_api_traits(block_type, self_ty)?;
 
 	Ok(quote!(
 		#hidden_includes
diff --git a/primitives/api/proc-macro/src/utils.rs b/primitives/api/proc-macro/src/utils.rs
index dbe7c723af0b..a7a6d352058c 100644
--- a/primitives/api/proc-macro/src/utils.rs
+++ b/primitives/api/proc-macro/src/utils.rs
@@ -99,6 +99,7 @@ pub fn replace_wild_card_parameter_names(input: &mut Signature) {
 pub fn fold_fn_decl_for_client_side(
 	input: &mut Signature,
 	block_id: &TokenStream,
+	crate_: &TokenStream,
 ) {
 	replace_wild_card_parameter_names(input);
 
@@ -109,7 +110,7 @@ pub fn fold_fn_decl_for_client_side(
 	// Wrap the output in a `Result`
 	input.output = {
 		let ty = return_type_extract_type(&input.output);
-		parse_quote!( -> std::result::Result<#ty, Self::Error> )
+		parse_quote!( -> std::result::Result<#ty, #crate_::ApiError> )
 	};
 }
 
diff --git a/primitives/api/src/lib.rs b/primitives/api/src/lib.rs
index 8ce447c0d366..592b20b62a77 100644
--- a/primitives/api/src/lib.rs
+++ b/primitives/api/src/lib.rs
@@ -67,7 +67,7 @@ pub use sp_std::{slice, mem};
 #[cfg(feature = "std")]
 use sp_std::result;
 #[doc(hidden)]
-pub use codec::{Encode, Decode, DecodeLimit};
+pub use codec::{Encode, Decode, DecodeLimit, self};
 use sp_core::OpaqueMetadata;
 #[cfg(feature = "std")]
 use std::{panic::UnwindSafe, cell::RefCell};
@@ -246,8 +246,8 @@ pub use sp_api_proc_macro::impl_runtime_apis;
 /// and the error type can be specified as associated type. If no error type is specified [`String`]
 /// is used as error type.
 ///
-/// Besides implementing the given traits, the [`Core`](sp_api::Core), [`ApiExt`](sp_api::ApiExt)
-/// and [`ApiErrorExt`](sp_api::ApiErrorExt) are implemented automatically.
+/// Besides implementing the given traits, the [`Core`](sp_api::Core) and [`ApiExt`](sp_api::ApiExt)
+/// are implemented automatically.
 ///
 /// # Example
 ///
@@ -284,11 +284,6 @@ pub use sp_api_proc_macro::impl_runtime_apis;
 ///     }
 ///
 ///     impl BlockBuilder<Block> for MockApi {
-///         /// Sets the error type that is being used by the mock implementation.
-///         /// The error type is used by all runtime apis. It is only required to
-///         /// be specified in one trait implementation.
-///         type Error = sp_api::ApiError;
-///
 ///         fn build_block() -> Block {
 ///              unimplemented!("Not Required in tests")
 ///         }
@@ -331,15 +326,14 @@ pub use sp_api_proc_macro::impl_runtime_apis;
 ///
 /// sp_api::mock_impl_runtime_apis! {
 ///     impl Balance<Block> for MockApi {
-///         type Error = sp_api::ApiError;
 ///         #[advanced]
-///         fn get_balance(&self, at: &BlockId<Block>) -> Result<NativeOrEncoded<u64>, Self::Error> {
+///         fn get_balance(&self, at: &BlockId<Block>) -> Result<NativeOrEncoded<u64>, sp_api::ApiError> {
 ///             println!("Being called at: {}", at);
 ///
 ///             Ok(self.balance.into())
 ///         }
 ///         #[advanced]
-///         fn set_balance(at: &BlockId<Block>, val: u64) -> Result<NativeOrEncoded<()>, Self::Error> {
+///         fn set_balance(at: &BlockId<Block>, val: u64) -> Result<NativeOrEncoded<()>, sp_api::ApiError> {
 ///             if let BlockId::Number(1) = at {
 ///                 println!("Being called to set balance to: {}", val);
 ///             }
@@ -393,46 +387,35 @@ pub trait ConstructRuntimeApi<Block: BlockT, C: CallApiAt<Block>> {
 }
 
 /// An error describing which API call failed.
-#[cfg_attr(feature = "std", derive(Debug, thiserror::Error, Eq, PartialEq))]
-#[cfg_attr(feature = "std", error("Failed to execute API call {tag}"))]
-#[cfg(feature = "std")]
-pub struct ApiError {
-    tag: &'static str,
-    #[source]
-    error: codec::Error,
-}
-
 #[cfg(feature = "std")]
-impl From<(&'static str, codec::Error)> for ApiError {
-    fn from((tag, error): (&'static str, codec::Error)) -> Self {
-        Self {
-            tag,
-            error,
-        }
-    }
-}
-
-#[cfg(feature = "std")]
-impl ApiError {
-	pub fn new(tag: &'static str, error: codec::Error) -> Self {
-		Self {
-			tag,
-			error,
-		}
-	}
-}
-
-/// Extends the runtime api traits with an associated error type. This trait is given as super
-/// trait to every runtime api trait.
-#[cfg(feature = "std")]
-pub trait ApiErrorExt {
-	/// Error type used by the runtime apis.
-	type Error: std::fmt::Debug + From<ApiError>;
+#[derive(Debug, thiserror::Error)]
+pub enum ApiError {
+	#[error("Failed to decode return value of {function}")]
+	FailedToDecodeReturnValue {
+		function: &'static str,
+		#[source]
+		error: codec::Error,
+	},
+	#[error("Failed to convert return value from runtime to node of {function}")]
+	FailedToConvertReturnValue {
+		function: &'static str,
+		#[source]
+		error: codec::Error,
+	},
+	#[error("Failed to convert parameter `{parameter}` from node to runtime of {function}")]
+	FailedToConvertParameter {
+		function: &'static str,
+		parameter: &'static str,
+		#[source]
+		error: codec::Error,
+	},
+	#[error(transparent)]
+	Application(#[from] Box<dyn std::error::Error + Send + Sync>),
 }
 
 /// Extends the runtime api implementation with some common functionality.
 #[cfg(feature = "std")]
-pub trait ApiExt<Block: BlockT>: ApiErrorExt {
+pub trait ApiExt<Block: BlockT> {
 	/// The state backend that is used to store the block states.
 	type StateBackend: StateBackend<HashFor<Block>>;
 
@@ -450,14 +433,14 @@ pub trait ApiExt<Block: BlockT>: ApiErrorExt {
 	fn has_api<A: RuntimeApiInfo + ?Sized>(
 		&self,
 		at: &BlockId<Block>,
-	) -> Result<bool, Self::Error> where Self: Sized;
+	) -> Result<bool, ApiError> where Self: Sized;
 
 	/// Check if the given api is implemented and the version passes a predicate.
 	fn has_api_with<A: RuntimeApiInfo + ?Sized, P: Fn(u32) -> bool>(
 		&self,
 		at: &BlockId<Block>,
 		pred: P,
-	) -> Result<bool, Self::Error> where Self: Sized;
+	) -> Result<bool, ApiError> where Self: Sized;
 
 	/// Start recording all accessed trie nodes for generating proofs.
 	fn record_proof(&mut self);
@@ -478,7 +461,10 @@ pub trait ApiExt<Block: BlockT>: ApiErrorExt {
 		backend: &Self::StateBackend,
 		changes_trie_state: Option<&ChangesTrieState<HashFor<Block>, NumberFor<Block>>>,
 		parent_hash: Block::Hash,
-	) -> Result<StorageChanges<Self::StateBackend, Block>, String> where Self: Sized;
+	) -> Result<
+		StorageChanges<Self::StateBackend, Block>,
+		String
+	> where Self: Sized;
 }
 
 /// Before calling any runtime api function, the runtime need to be initialized
@@ -533,9 +519,6 @@ pub struct CallApiAtParams<'a, Block: BlockT, C, NC, Backend: StateBackend<HashF
 /// Something that can call into the an api at a given block.
 #[cfg(feature = "std")]
 pub trait CallApiAt<Block: BlockT> {
-	/// Error type used by the implementation.
-	type Error: std::fmt::Debug + From<ApiError>;
-
 	/// The state backend that is used to store the block states.
 	type StateBackend: StateBackend<HashFor<Block>>;
 
@@ -544,15 +527,18 @@ pub trait CallApiAt<Block: BlockT> {
 	fn call_api_at<
 		'a,
 		R: Encode + Decode + PartialEq,
-		NC: FnOnce() -> result::Result<R, String> + UnwindSafe,
-		C: Core<Block, Error = Self::Error>,
+		NC: FnOnce() -> result::Result<R, ApiError> + UnwindSafe,
+		C: Core<Block>,
 	>(
 		&self,
 		params: CallApiAtParams<'a, Block, C, NC, Self::StateBackend>,
-	) -> Result<NativeOrEncoded<R>, Self::Error>;
+	) -> Result<NativeOrEncoded<R>, ApiError>;
 
 	/// Returns the runtime version at the given block.
-	fn runtime_version_at(&self, at: &BlockId<Block>) -> Result<RuntimeVersion, Self::Error>;
+	fn runtime_version_at(
+		&self,
+		at: &BlockId<Block>,
+	) -> Result<RuntimeVersion, ApiError>;
 }
 
 /// Auxiliary wrapper that holds an api instance and binds it to the given lifetime.
@@ -605,10 +591,6 @@ pub trait RuntimeApiInfo {
 	const VERSION: u32;
 }
 
-/// Extracts the `Api::Error` for a type that provides a runtime api.
-#[cfg(feature = "std")]
-pub type ApiErrorFor<T, Block> = <<T as ProvideRuntimeApi<Block>>::Api as ApiErrorExt>::Error;
-
 #[derive(codec::Encode, codec::Decode)]
 pub struct OldRuntimeVersion {
 	pub spec_name: RuntimeString,
diff --git a/primitives/api/test/tests/decl_and_impl.rs b/primitives/api/test/tests/decl_and_impl.rs
index 134ee5085658..1f7ccf2712d6 100644
--- a/primitives/api/test/tests/decl_and_impl.rs
+++ b/primitives/api/test/tests/decl_and_impl.rs
@@ -23,7 +23,6 @@ use sp_api::{
 use sp_runtime::{traits::{GetNodeBlockType, Block as BlockT}, generic::BlockId};
 use sp_core::NativeOrEncoded;
 use substrate_test_runtime_client::runtime::Block;
-use sp_blockchain::Result;
 
 /// The declaration of the `Runtime` type and the implementation of the `GetNodeBlockType`
 /// trait are done by the `construct_runtime!` macro in a real runtime.
@@ -105,7 +104,7 @@ mock_impl_runtime_apis! {
 
 		#[advanced]
 		fn same_name(_: &BlockId<Block>) ->
-			std::result::Result<
+			Result<
 				NativeOrEncoded<()>,
 				ApiError
 			>
@@ -115,7 +114,7 @@ mock_impl_runtime_apis! {
 
 		#[advanced]
 		fn wild_card(at: &BlockId<Block>, _: u32) ->
-			std::result::Result<
+			Result<
 				NativeOrEncoded<()>,
 				ApiError
 			>
@@ -124,7 +123,7 @@ mock_impl_runtime_apis! {
 				// yeah
 				Ok(().into())
 			} else {
-				Err(ApiError::new("MockApi", codec::Error::from("Ohh noooo")))
+				Err((Box::from("Test error") as Box<dyn std::error::Error + Send + Sync>).into())
 			}
 		}
 	}
@@ -143,33 +142,33 @@ type TestClient = substrate_test_runtime_client::client::Client<
 
 #[test]
 fn test_client_side_function_signature() {
-	let _test: fn(&RuntimeApiImpl<Block, TestClient>, &BlockId<Block>, u64) -> Result<()> =
+	let _test: fn(&RuntimeApiImpl<Block, TestClient>, &BlockId<Block>, u64) -> Result<(), ApiError> =
 		RuntimeApiImpl::<Block, TestClient>::test;
 	let _something_with_block:
-		fn(&RuntimeApiImpl<Block, TestClient>, &BlockId<Block>, Block) -> Result<Block> =
+		fn(&RuntimeApiImpl<Block, TestClient>, &BlockId<Block>, Block) -> Result<Block, ApiError> =
 			RuntimeApiImpl::<Block, TestClient>::something_with_block;
 
 	#[allow(deprecated)]
 	let _same_name_before_version_2:
-		fn(&RuntimeApiImpl<Block, TestClient>, &BlockId<Block>) -> Result<String> =
+		fn(&RuntimeApiImpl<Block, TestClient>, &BlockId<Block>) -> Result<String, ApiError> =
 			RuntimeApiImpl::<Block, TestClient>::same_name_before_version_2;
 }
 
 #[test]
 fn check_runtime_api_info() {
-	assert_eq!(&Api::<Block, Error = ()>::ID, &runtime_decl_for_Api::ID);
-	assert_eq!(Api::<Block, Error = ()>::VERSION, runtime_decl_for_Api::VERSION);
-	assert_eq!(Api::<Block, Error = ()>::VERSION, 1);
+	assert_eq!(&Api::<Block>::ID, &runtime_decl_for_Api::ID);
+	assert_eq!(Api::<Block>::VERSION, runtime_decl_for_Api::VERSION);
+	assert_eq!(Api::<Block>::VERSION, 1);
 
 	assert_eq!(
-		ApiWithCustomVersion::<Block, Error = ()>::VERSION,
+		ApiWithCustomVersion::<Block>::VERSION,
 		runtime_decl_for_ApiWithCustomVersion::VERSION,
 	);
 	assert_eq!(
-		&ApiWithCustomVersion::<Block, Error = ()>::ID,
+		&ApiWithCustomVersion::<Block>::ID,
 		&runtime_decl_for_ApiWithCustomVersion::ID,
 	);
-	assert_eq!(ApiWithCustomVersion::<Block, Error = ()>::VERSION, 2);
+	assert_eq!(ApiWithCustomVersion::<Block>::VERSION, 2);
 }
 
 fn check_runtime_api_versions_contains<T: RuntimeApiInfo + ?Sized>() {
@@ -178,9 +177,9 @@ fn check_runtime_api_versions_contains<T: RuntimeApiInfo + ?Sized>() {
 
 #[test]
 fn check_runtime_api_versions() {
-	check_runtime_api_versions_contains::<dyn Api<Block, Error = ()>>();
-	check_runtime_api_versions_contains::<dyn ApiWithCustomVersion<Block, Error = ()>>();
-	check_runtime_api_versions_contains::<dyn sp_api::Core<Block, Error = ()>>();
+	check_runtime_api_versions_contains::<dyn Api<Block>>();
+	check_runtime_api_versions_contains::<dyn ApiWithCustomVersion<Block>>();
+	check_runtime_api_versions_contains::<dyn sp_api::Core<Block>>();
 }
 
 #[test]
@@ -188,9 +187,9 @@ fn mock_runtime_api_has_api() {
 	let mock = MockApi { block: None };
 
 	assert!(
-		mock.has_api::<dyn ApiWithCustomVersion<Block, Error = ()>>(&BlockId::Number(0)).unwrap(),
+		mock.has_api::<dyn ApiWithCustomVersion<Block>>(&BlockId::Number(0)).unwrap(),
 	);
-	assert!(mock.has_api::<dyn Api<Block, Error = ()>>(&BlockId::Number(0)).unwrap());
+	assert!(mock.has_api::<dyn Api<Block>>(&BlockId::Number(0)).unwrap());
 }
 
 #[test]
@@ -209,7 +208,7 @@ fn mock_runtime_api_works_with_advanced() {
 	Api::<Block>::same_name(&mock, &BlockId::Number(0)).unwrap();
 	mock.wild_card(&BlockId::Number(1337), 1).unwrap();
 	assert_eq!(
-		ApiError::new("MockApi", ::codec::Error::from("Ohh noooo")),
-		mock.wild_card(&BlockId::Number(1336), 1).unwrap_err()
+		"Test error".to_string(),
+		mock.wild_card(&BlockId::Number(1336), 1).unwrap_err().to_string(),
 	);
 }
diff --git a/primitives/api/test/tests/runtime_calls.rs b/primitives/api/test/tests/runtime_calls.rs
index ec1a86d8379f..94f419b1c44d 100644
--- a/primitives/api/test/tests/runtime_calls.rs
+++ b/primitives/api/test/tests/runtime_calls.rs
@@ -50,10 +50,7 @@ fn calling_wasm_runtime_function() {
 }
 
 #[test]
-#[should_panic(
-	expected =
-		"Could not convert parameter `param` between node and runtime: DecodeFails always fails"
-)]
+#[should_panic(expected = "FailedToConvertParameter { function: \"fail_convert_parameter\"")]
 fn calling_native_runtime_function_with_non_decodable_parameter() {
 	let client = TestClientBuilder::new().set_execution_strategy(ExecutionStrategy::NativeWhenPossible).build();
 	let runtime_api = client.runtime_api();
@@ -62,7 +59,7 @@ fn calling_native_runtime_function_with_non_decodable_parameter() {
 }
 
 #[test]
-#[should_panic(expected = "Could not convert return value from runtime to node!")]
+#[should_panic(expected = "FailedToConvertReturnValue { function: \"fail_convert_return_value\"")]
 fn calling_native_runtime_function_with_non_decodable_return_value() {
 	let client = TestClientBuilder::new().set_execution_strategy(ExecutionStrategy::NativeWhenPossible).build();
 	let runtime_api = client.runtime_api();
diff --git a/primitives/api/test/tests/ui/mock_only_error_associated_type.rs b/primitives/api/test/tests/ui/mock_only_error_associated_type.rs
deleted file mode 100644
index bbd3c71c9401..000000000000
--- a/primitives/api/test/tests/ui/mock_only_error_associated_type.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-use substrate_test_runtime_client::runtime::Block;
-
-sp_api::decl_runtime_apis! {
-	pub trait Api {
-		fn test(data: u64);
-	}
-}
-
-struct MockApi;
-
-sp_api::mock_impl_runtime_apis! {
-	impl Api<Block> for MockApi {
-		type OtherData = u32;
-
-		fn test(data: u64) {}
-	}
-}
-
-fn main() {}
diff --git a/primitives/api/test/tests/ui/mock_only_error_associated_type.stderr b/primitives/api/test/tests/ui/mock_only_error_associated_type.stderr
deleted file mode 100644
index beced70413bb..000000000000
--- a/primitives/api/test/tests/ui/mock_only_error_associated_type.stderr
+++ /dev/null
@@ -1,5 +0,0 @@
-error: Only associated type with name `Error` is allowed
-  --> $DIR/mock_only_error_associated_type.rs:13:3
-   |
-13 |         type OtherData = u32;
-   |         ^^^^
diff --git a/primitives/api/test/tests/ui/mock_only_one_error_type.rs b/primitives/api/test/tests/ui/mock_only_one_error_type.rs
deleted file mode 100644
index 1c3f13dbb9bf..000000000000
--- a/primitives/api/test/tests/ui/mock_only_one_error_type.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use substrate_test_runtime_client::runtime::Block;
-
-sp_api::decl_runtime_apis! {
-	pub trait Api {
-		fn test(data: u64);
-	}
-
-	pub trait Api2 {
-		fn test(data: u64);
-	}
-}
-
-struct MockApi;
-
-sp_api::mock_impl_runtime_apis! {
-	impl Api<Block> for MockApi {
-		type Error = u32;
-
-		fn test(data: u64) {}
-	}
-
-	impl Api2<Block> for MockApi {
-		type Error = u64;
-
-		fn test(data: u64) {}
-	}
-}
-
-fn main() {}
diff --git a/primitives/api/test/tests/ui/mock_only_one_error_type.stderr b/primitives/api/test/tests/ui/mock_only_one_error_type.stderr
deleted file mode 100644
index ab5b90af3ad1..000000000000
--- a/primitives/api/test/tests/ui/mock_only_one_error_type.stderr
+++ /dev/null
@@ -1,29 +0,0 @@
-error: Error type can not change between runtime apis
-  --> $DIR/mock_only_one_error_type.rs:23:3
-   |
-23 |         type Error = u64;
-   |         ^^^^
-
-error: First error type was declared here.
-  --> $DIR/mock_only_one_error_type.rs:17:16
-   |
-17 |         type Error = u32;
-   |                      ^^^
-
-error[E0277]: the trait bound `u32: From<sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ApiError>` is not satisfied
-   --> $DIR/mock_only_one_error_type.rs:17:16
-    |
-17  |         type Error = u32;
-    |                      ^^^ the trait `From<sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ApiError>` is not implemented for `u32`
-    |
-   ::: $WORKSPACE/primitives/api/src/lib.rs
-    |
-    |     type Error: std::fmt::Debug + From<ApiError>;
-    |                                   -------------- required by this bound in `sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ApiErrorExt::Error`
-    |
-    = help: the following implementations were found:
-              <u32 as From<HttpError>>
-              <u32 as From<HttpRequestId>>
-              <u32 as From<HttpRequestStatus>>
-              <u32 as From<Ipv4Addr>>
-            and 18 others
diff --git a/primitives/blockchain/src/error.rs b/primitives/blockchain/src/error.rs
index 6ed5fe1b335f..58d08d06f049 100644
--- a/primitives/blockchain/src/error.rs
+++ b/primitives/blockchain/src/error.rs
@@ -114,8 +114,8 @@ pub enum Error {
 	#[error("Error decoding call result of {0}")]
 	CallResultDecode(&'static str, #[source] CodecError),
 
-	#[error(transparent)]
-	RuntimeApiCodecError(#[from] ApiError),
+	#[error("Error at calling runtime api: {0}")]
+	RuntimeApiError(#[from] ApiError),
 
 	#[error("Runtime :code missing in storage")]
 	RuntimeCodeMissing,
@@ -153,7 +153,6 @@ pub enum Error {
 	#[error("Failed to get header for hash {0}")]
 	MissingHeader(String),
 
-
 	#[error("State Database error: {0}")]
 	StateDatabase(String),
 
@@ -183,6 +182,15 @@ impl From<Box<dyn sp_state_machine::Error>> for Error {
 	}
 }
 
+impl From<Error> for ApiError {
+	fn from(err: Error) -> ApiError {
+		match err {
+			Error::RuntimeApiError(err) => err,
+			e => ApiError::Application(Box::new(e)),
+		}
+	}
+}
+
 impl Error {
 	/// Chain a blockchain error.
 	pub fn from_blockchain(e: Box<Error>) -> Self {
diff --git a/primitives/core/src/traits.rs b/primitives/core/src/traits.rs
index 8488a1873cac..15c1816331d0 100644
--- a/primitives/core/src/traits.rs
+++ b/primitives/core/src/traits.rs
@@ -34,7 +34,7 @@ pub trait CodeExecutor: Sized + Send + Sync + CallInWasm + Clone + 'static {
 	/// or an execution error) together with a `bool`, which is true if native execution was used.
 	fn call<
 		R: codec::Codec + PartialEq,
-		NC: FnOnce() -> Result<R, String> + UnwindSafe,
+		NC: FnOnce() -> Result<R, Box<dyn std::error::Error + Send + Sync>> + UnwindSafe,
 	>(
 		&self,
 		ext: &mut dyn Externalities,
diff --git a/primitives/session/src/lib.rs b/primitives/session/src/lib.rs
index 8000c23dd431..9f63d64d414b 100644
--- a/primitives/session/src/lib.rs
+++ b/primitives/session/src/lib.rs
@@ -113,7 +113,7 @@ pub fn generate_initial_session_keys<Block, T>(
 	client: std::sync::Arc<T>,
 	at: &BlockId<Block>,
 	seeds: Vec<String>,
-) -> Result<(), sp_api::ApiErrorFor<T, Block>>
+) -> Result<(), sp_api::ApiError>
 where
 	Block: BlockT,
 	T: ProvideRuntimeApi<Block>,
diff --git a/primitives/state-machine/src/lib.rs b/primitives/state-machine/src/lib.rs
index 31d4eacc4e58..7b337620c213 100644
--- a/primitives/state-machine/src/lib.rs
+++ b/primitives/state-machine/src/lib.rs
@@ -392,7 +392,7 @@ mod execution {
 			bool,
 		) where
 			R: Decode + Encode + PartialEq,
-			NC: FnOnce() -> result::Result<R, String> + UnwindSafe,
+			NC: FnOnce() -> result::Result<R, Box<dyn std::error::Error + Send + Sync>> + UnwindSafe,
 		{
 			let mut cache = StorageTransactionCache::default();
 
@@ -449,7 +449,7 @@ mod execution {
 		) -> CallResult<R, Exec::Error>
 			where
 				R: Decode + Encode + PartialEq,
-				NC: FnOnce() -> result::Result<R, String> + UnwindSafe,
+				NC: FnOnce() -> result::Result<R, Box<dyn std::error::Error + Send + Sync>> + UnwindSafe,
 				Handler: FnOnce(
 					CallResult<R, Exec::Error>,
 					CallResult<R, Exec::Error>,
@@ -485,7 +485,7 @@ mod execution {
 		) -> CallResult<R, Exec::Error>
 			where
 				R: Decode + Encode + PartialEq,
-				NC: FnOnce() -> result::Result<R, String> + UnwindSafe,
+				NC: FnOnce() -> result::Result<R, Box<dyn std::error::Error + Send + Sync>> + UnwindSafe,
 		{
 			self.overlay.start_transaction();
 			let (result, was_native) = self.execute_aux(
@@ -522,7 +522,7 @@ mod execution {
 		) -> Result<NativeOrEncoded<R>, Box<dyn Error>>
 			where
 				R: Decode + Encode + PartialEq,
-				NC: FnOnce() -> result::Result<R, String> + UnwindSafe,
+				NC: FnOnce() -> result::Result<R, Box<dyn std::error::Error + Send + Sync>> + UnwindSafe,
 				Handler: FnOnce(
 					CallResult<R, Exec::Error>,
 					CallResult<R, Exec::Error>,
@@ -869,7 +869,7 @@ mod tests {
 		map, traits::{Externalities, RuntimeCode}, testing::TaskExecutor,
 	};
 	use sp_runtime::traits::BlakeTwo256;
-	use std::{result, collections::HashMap};
+	use std::{result, collections::HashMap, panic::UnwindSafe};
 	use codec::Decode;
 	use sp_core::{
 		storage::ChildInfo, NativeOrEncoded, NeverNativeValue,
@@ -891,7 +891,7 @@ mod tests {
 
 		fn call<
 			R: Encode + Decode + PartialEq,
-			NC: FnOnce() -> result::Result<R, String>,
+			NC: FnOnce() -> result::Result<R, Box<dyn std::error::Error + Send + Sync>> + UnwindSafe,
 		>(
 			&self,
 			ext: &mut dyn Externalities,
diff --git a/test-utils/runtime/client/src/block_builder_ext.rs b/test-utils/runtime/client/src/block_builder_ext.rs
index 9dc27c64143f..bb0f2d400bfc 100644
--- a/test-utils/runtime/client/src/block_builder_ext.rs
+++ b/test-utils/runtime/client/src/block_builder_ext.rs
@@ -43,7 +43,7 @@ pub trait BlockBuilderExt {
 
 impl<'a, A, B> BlockBuilderExt for sc_block_builder::BlockBuilder<'a, substrate_test_runtime::Block, A, B> where
 	A: ProvideRuntimeApi<substrate_test_runtime::Block> + 'a,
-	A::Api: BlockBuilderApi<substrate_test_runtime::Block, Error = sp_blockchain::Error> +
+	A::Api: BlockBuilderApi<substrate_test_runtime::Block> +
 		ApiExt<
 			substrate_test_runtime::Block,
 			StateBackend = backend::StateBackendFor<B, substrate_test_runtime::Block>

From 171ad2322d7561934b82f0b7e41c58d1710f8c24 Mon Sep 17 00:00:00 2001
From: Denis Pisarev <denis.pisarev@parity.io>
Date: Mon, 15 Feb 2021 13:15:58 +0100
Subject: [PATCH 0396/1194] CI: temp. allow cargo deny to fail (#8122)

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4a410cf3e5df..a237bfc49659 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -199,6 +199,8 @@ cargo-deny:
     when:                          always
     paths:
       - deny.log
+  # FIXME: Temorarily allow to fail.
+  allow_failure:                   true
 
 cargo-check-benches:
   stage:                           test

From da6b3e22f1ee87a57a3de1845592ed53e0acf418 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Mon, 15 Feb 2021 17:47:57 +0100
Subject: [PATCH 0397/1194] Update Grafana dashboards (#8127)

---
 .../substrate-networking.json                 | 100 ++++++++++--------
 .../substrate-service-tasks.json              |  43 +++++---
 2 files changed, 85 insertions(+), 58 deletions(-)

diff --git a/.maintain/monitoring/grafana-dashboards/substrate-networking.json b/.maintain/monitoring/grafana-dashboards/substrate-networking.json
index d2abfd1cb864..0b157e720583 100644
--- a/.maintain/monitoring/grafana-dashboards/substrate-networking.json
+++ b/.maintain/monitoring/grafana-dashboards/substrate-networking.json
@@ -74,7 +74,7 @@
   "gnetId": null,
   "graphTooltip": 0,
   "id": null,
-  "iteration": 1610462565248,
+  "iteration": 1613393276921,
   "links": [],
   "panels": [
     {
@@ -963,7 +963,8 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "irate(${metric_namespace}_sub_libp2p_requests_out_started_total{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])",
+          "expr": "irate(${metric_namespace}_sub_libp2p_requests_out_success_total_sum{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m]) + on(instance) sum(irate(${metric_namespace}_sub_libp2p_requests_out_failure_total{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])) by (instance)",
+          "hide": false,
           "interval": "",
           "legendFormat": "{{instance}}",
           "refId": "A"
@@ -989,6 +990,7 @@
       },
       "yaxes": [
         {
+          "$$hashKey": "object:209",
           "format": "reqps",
           "label": null,
           "logBase": 1,
@@ -997,6 +999,7 @@
           "show": true
         },
         {
+          "$$hashKey": "object:210",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -1032,7 +1035,7 @@
         "y": 51
       },
       "hiddenSeries": false,
-      "id": 151,
+      "id": 448,
       "legend": {
         "avg": false,
         "current": false,
@@ -1060,9 +1063,11 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "irate(${metric_namespace}_sub_libp2p_requests_in_success_total_count{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])",
+          "expr": "sum(irate(${metric_namespace}_sub_libp2p_requests_out_failure_total{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[$__rate_interval])) by (instance, reason)",
+          "hide": false,
           "interval": "",
-          "legendFormat": "{{instance}}",
+          "intervalFactor": 1,
+          "legendFormat": "{{reason}}",
           "refId": "A"
         }
       ],
@@ -1070,7 +1075,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Requests served per second",
+      "title": "Outbound requests failures",
       "tooltip": {
         "shared": true,
         "sort": 2,
@@ -1086,6 +1091,7 @@
       },
       "yaxes": [
         {
+          "$$hashKey": "object:209",
           "format": "reqps",
           "label": null,
           "logBase": 1,
@@ -1094,6 +1100,7 @@
           "show": true
         },
         {
+          "$$hashKey": "object:210",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -1227,7 +1234,7 @@
         "y": 59
       },
       "hiddenSeries": false,
-      "id": 258,
+      "id": 257,
       "legend": {
         "avg": false,
         "current": false,
@@ -1239,7 +1246,7 @@
       },
       "lines": true,
       "linewidth": 1,
-      "nullPointMode": "null",
+      "nullPointMode": "null as zero",
       "options": {
         "alertThreshold": true
       },
@@ -1255,7 +1262,8 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "histogram_quantile(0.5, sum(rate(${metric_namespace}_sub_libp2p_requests_in_success_total_bucket{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])) by (instance, le))",
+          "expr": "histogram_quantile(0.99, sum(rate(${metric_namespace}_sub_libp2p_requests_out_success_total_bucket{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])) by (instance, le)) > 0",
+          "instant": false,
           "interval": "",
           "legendFormat": "{{instance}}",
           "refId": "A"
@@ -1265,7 +1273,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Median request serving time",
+      "title": "99th percentile request answer time",
       "tooltip": {
         "shared": true,
         "sort": 2,
@@ -1324,7 +1332,7 @@
         "y": 63
       },
       "hiddenSeries": false,
-      "id": 257,
+      "id": 151,
       "legend": {
         "avg": false,
         "current": false,
@@ -1336,7 +1344,7 @@
       },
       "lines": true,
       "linewidth": 1,
-      "nullPointMode": "null as zero",
+      "nullPointMode": "null",
       "options": {
         "alertThreshold": true
       },
@@ -1352,8 +1360,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "histogram_quantile(0.99, sum(rate(${metric_namespace}_sub_libp2p_requests_out_success_total_bucket{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])) by (instance, le)) > 0",
-          "instant": false,
+          "expr": "irate(${metric_namespace}_sub_libp2p_requests_in_success_total_count{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])",
           "interval": "",
           "legendFormat": "{{instance}}",
           "refId": "A"
@@ -1363,7 +1370,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "99th percentile request answer time",
+      "title": "Requests served per second",
       "tooltip": {
         "shared": true,
         "sort": 2,
@@ -1379,7 +1386,7 @@
       },
       "yaxes": [
         {
-          "format": "s",
+          "format": "reqps",
           "label": null,
           "logBase": 1,
           "max": null,
@@ -1422,7 +1429,7 @@
         "y": 67
       },
       "hiddenSeries": false,
-      "id": 259,
+      "id": 449,
       "legend": {
         "avg": false,
         "current": false,
@@ -1434,7 +1441,7 @@
       },
       "lines": true,
       "linewidth": 1,
-      "nullPointMode": "null as zero",
+      "nullPointMode": "null",
       "options": {
         "alertThreshold": true
       },
@@ -1450,9 +1457,11 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "histogram_quantile(0.99, sum(rate(${metric_namespace}_sub_libp2p_requests_in_success_total_bucket{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])) by (instance, le))",
+          "expr": "sum(irate(${metric_namespace}_sub_libp2p_requests_in_failure_total{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[$__rate_interval])) by (instance, reason)",
+          "hide": false,
           "interval": "",
-          "legendFormat": "{{instance}}",
+          "intervalFactor": 1,
+          "legendFormat": "{{reason}}",
           "refId": "A"
         }
       ],
@@ -1460,9 +1469,9 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "99th percentile request serving time",
+      "title": "Inbound requests failures",
       "tooltip": {
-        "shared": false,
+        "shared": true,
         "sort": 2,
         "value_type": "individual"
       },
@@ -1476,7 +1485,8 @@
       },
       "yaxes": [
         {
-          "format": "s",
+          "$$hashKey": "object:209",
+          "format": "reqps",
           "label": null,
           "logBase": 1,
           "max": null,
@@ -1484,6 +1494,7 @@
           "show": true
         },
         {
+          "$$hashKey": "object:210",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -1519,7 +1530,7 @@
         "y": 71
       },
       "hiddenSeries": false,
-      "id": 287,
+      "id": 258,
       "legend": {
         "avg": false,
         "current": false,
@@ -1531,7 +1542,7 @@
       },
       "lines": true,
       "linewidth": 1,
-      "nullPointMode": "null as zero",
+      "nullPointMode": "null",
       "options": {
         "alertThreshold": true
       },
@@ -1547,10 +1558,9 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "avg(irate(${metric_namespace}_sub_libp2p_requests_out_failure_total{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])) by (reason)",
-          "instant": false,
+          "expr": "histogram_quantile(0.5, sum(rate(${metric_namespace}_sub_libp2p_requests_in_success_total_bucket{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])) by (instance, le))",
           "interval": "",
-          "legendFormat": "{{reason}}",
+          "legendFormat": "{{instance}}",
           "refId": "A"
         }
       ],
@@ -1558,7 +1568,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Outgoing request failures per second",
+      "title": "Median request serving time",
       "tooltip": {
         "shared": true,
         "sort": 2,
@@ -1574,7 +1584,7 @@
       },
       "yaxes": [
         {
-          "format": "short",
+          "format": "s",
           "label": null,
           "logBase": 1,
           "max": null,
@@ -1617,7 +1627,7 @@
         "y": 75
       },
       "hiddenSeries": false,
-      "id": 286,
+      "id": 259,
       "legend": {
         "avg": false,
         "current": false,
@@ -1645,10 +1655,9 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "avg(irate(${metric_namespace}_sub_libp2p_requests_in_failure_total{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])) by (reason)",
-          "instant": false,
+          "expr": "histogram_quantile(0.99, sum(rate(${metric_namespace}_sub_libp2p_requests_in_success_total_bucket{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])) by (instance, le))",
           "interval": "",
-          "legendFormat": "{{reason}}",
+          "legendFormat": "{{instance}}",
           "refId": "A"
         }
       ],
@@ -1656,9 +1665,9 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Ingoing request failures per second",
+      "title": "99th percentile request serving time",
       "tooltip": {
-        "shared": true,
+        "shared": false,
         "sort": 2,
         "value_type": "individual"
       },
@@ -1672,7 +1681,7 @@
       },
       "yaxes": [
         {
-          "format": "short",
+          "format": "s",
           "label": null,
           "logBase": 1,
           "max": null,
@@ -1845,7 +1854,7 @@
       "lines": true,
       "linewidth": 1,
       "maxPerRow": 12,
-      "nullPointMode": "null as zero",
+      "nullPointMode": "connected",
       "options": {
         "alertThreshold": true
       },
@@ -1871,7 +1880,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "avg by (direction) (irate(${metric_namespace}_sub_libp2p_notifications_sizes_count{instance=~\"${nodename}\", protocol=\"${notif_protocol}\"}[$__interval]))",
+          "expr": "avg by (direction) (irate(${metric_namespace}_sub_libp2p_notifications_sizes_count{instance=~\"${nodename}\", protocol=\"${notif_protocol}\"}[$__rate_interval]))",
           "interval": "",
           "legendFormat": "{{direction}}",
           "refId": "A"
@@ -1958,7 +1967,7 @@
       "lines": true,
       "linewidth": 1,
       "maxPerRow": 12,
-      "nullPointMode": "null as zero",
+      "nullPointMode": "connected",
       "options": {
         "alertThreshold": true
       },
@@ -1984,7 +1993,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "avg(irate(${metric_namespace}_sub_libp2p_notifications_sizes_sum{instance=~\"${nodename}\", protocol=\"${notif_protocol}\"}[$__interval])) by (direction)",
+          "expr": "avg(irate(${metric_namespace}_sub_libp2p_notifications_sizes_sum{instance=~\"${nodename}\", protocol=\"${notif_protocol}\"}[$__rate_interval])) by (direction)",
           "instant": false,
           "interval": "",
           "legendFormat": "{{direction}}",
@@ -2674,7 +2683,7 @@
         "allValue": null,
         "current": {},
         "datasource": "$data_source",
-        "definition": "${metric_namespace}_sub_libp2p_requests_out_started_total{instance=~\"${nodename}\"}",
+        "definition": "${metric_namespace}_sub_libp2p_requests_in_success_total_count{instance=~\"${nodename}\"}",
         "error": null,
         "hide": 2,
         "includeAll": true,
@@ -2682,7 +2691,7 @@
         "multi": false,
         "name": "request_protocol",
         "options": [],
-        "query": "${metric_namespace}_sub_libp2p_requests_out_started_total{instance=~\"${nodename}\"}",
+        "query": "${metric_namespace}_sub_libp2p_requests_in_success_total_count{instance=~\"${nodename}\"}",
         "refresh": 1,
         "regex": "/protocol=\"(.*?)\"/",
         "skipUrlSync": false,
@@ -2707,6 +2716,7 @@
         "name": "data_source",
         "options": [],
         "query": "prometheus",
+        "queryValue": "",
         "refresh": 1,
         "regex": "",
         "skipUrlSync": false,
@@ -2756,5 +2766,5 @@
   "timezone": "utc",
   "title": "Substrate Networking",
   "uid": "vKVuiD9Zk",
-  "version": 147
-}
+  "version": 154
+}
\ No newline at end of file
diff --git a/.maintain/monitoring/grafana-dashboards/substrate-service-tasks.json b/.maintain/monitoring/grafana-dashboards/substrate-service-tasks.json
index a3db46ec6d2a..944c9fb50c9b 100644
--- a/.maintain/monitoring/grafana-dashboards/substrate-service-tasks.json
+++ b/.maintain/monitoring/grafana-dashboards/substrate-service-tasks.json
@@ -37,6 +37,7 @@
   "annotations": {
     "list": [
       {
+        "$$hashKey": "object:326",
         "builtIn": 1,
         "datasource": "-- Grafana --",
         "enable": true,
@@ -48,6 +49,7 @@
         "type": "dashboard"
       },
       {
+        "$$hashKey": "object:327",
         "datasource": "$data_source",
         "enable": true,
         "expr": "increase(${metric_namespace}_tasks_ended_total{reason=\"panic\", instance=~\"${nodename}\"}[10m])",
@@ -64,6 +66,7 @@
         "type": "tags"
       },
       {
+        "$$hashKey": "object:621",
         "datasource": "$data_source",
         "enable": true,
         "expr": "changes(${metric_namespace}_process_start_time_seconds{instance=~\"${nodename}\"}[10m])",
@@ -81,7 +84,7 @@
   "gnetId": null,
   "graphTooltip": 0,
   "id": null,
-  "iteration": 1610462629581,
+  "iteration": 1613393319015,
   "links": [],
   "panels": [
     {
@@ -164,7 +167,7 @@
       },
       "lines": false,
       "linewidth": 1,
-      "nullPointMode": "null as zero",
+      "nullPointMode": "null",
       "options": {
         "alertThreshold": true
       },
@@ -180,7 +183,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "irate(${metric_namespace}_tasks_polling_duration_sum{instance=~\"${nodename}\"}[10m])",
+          "expr": "irate(${metric_namespace}_tasks_polling_duration_sum{instance=~\"${nodename}\"}[$__rate_interval])",
           "interval": "",
           "legendFormat": "{{task_name}}",
           "refId": "A"
@@ -206,6 +209,7 @@
       },
       "yaxes": [
         {
+          "$$hashKey": "object:2721",
           "format": "percentunit",
           "label": null,
           "logBase": 1,
@@ -214,6 +218,7 @@
           "show": true
         },
         {
+          "$$hashKey": "object:2722",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -266,7 +271,7 @@
       },
       "lines": true,
       "linewidth": 2,
-      "nullPointMode": "null",
+      "nullPointMode": "connected",
       "options": {
         "alertThreshold": true
       },
@@ -282,7 +287,7 @@
       "steppedLine": true,
       "targets": [
         {
-          "expr": "irate(${metric_namespace}_tasks_polling_duration_count{instance=~\"${nodename}\"}[10m])",
+          "expr": "irate(${metric_namespace}_tasks_polling_duration_count{instance=~\"${nodename}\"}[$__rate_interval])",
           "interval": "",
           "legendFormat": "{{task_name}}",
           "refId": "A"
@@ -308,6 +313,7 @@
       },
       "yaxes": [
         {
+          "$$hashKey": "object:2571",
           "format": "cps",
           "label": null,
           "logBase": 1,
@@ -316,6 +322,7 @@
           "show": true
         },
         {
+          "$$hashKey": "object:2572",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -382,7 +389,7 @@
       "steppedLine": true,
       "targets": [
         {
-          "expr": "irate(${metric_namespace}_tasks_spawned_total{instance=~\"${nodename}\"}[10m])",
+          "expr": "irate(${metric_namespace}_tasks_spawned_total{instance=~\"${nodename}\"}[$__rate_interval])",
           "interval": "",
           "legendFormat": "{{task_name}}",
           "refId": "A"
@@ -408,6 +415,7 @@
       },
       "yaxes": [
         {
+          "$$hashKey": "object:771",
           "format": "short",
           "label": null,
           "logBase": 10,
@@ -416,6 +424,7 @@
           "show": true
         },
         {
+          "$$hashKey": "object:772",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -466,7 +475,7 @@
       },
       "lines": true,
       "linewidth": 1,
-      "nullPointMode": "null as zero",
+      "nullPointMode": "connected",
       "options": {
         "alertThreshold": true
       },
@@ -508,6 +517,7 @@
       },
       "yaxes": [
         {
+          "$$hashKey": "object:919",
           "format": "short",
           "label": null,
           "logBase": 10,
@@ -516,6 +526,7 @@
           "show": true
         },
         {
+          "$$hashKey": "object:920",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -585,7 +596,7 @@
       "steppedLine": true,
       "targets": [
         {
-          "expr": "irate(${metric_namespace}_tasks_polling_duration_bucket{instance=~\"${nodename}\", le=\"+Inf\"}[10m])\n    - ignoring(le)\n  irate(${metric_namespace}_tasks_polling_duration_bucket{instance=~\"${nodename}\", le=\"1.024\"}[10m]) > 0",
+          "expr": "irate(${metric_namespace}_tasks_polling_duration_bucket{instance=~\"${nodename}\", le=\"+Inf\"}[$__rate_interval])\n    - ignoring(le)\n  irate(${metric_namespace}_tasks_polling_duration_bucket{instance=~\"${nodename}\", le=\"1.024\"}[$__rate_interval]) > 0",
           "interval": "",
           "legendFormat": "{{task_name}}",
           "refId": "A"
@@ -611,6 +622,7 @@
       },
       "yaxes": [
         {
+          "$$hashKey": "object:3040",
           "decimals": null,
           "format": "cps",
           "label": "Calls to `Future::poll`/second",
@@ -620,6 +632,7 @@
           "show": true
         },
         {
+          "$$hashKey": "object:3041",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -683,7 +696,7 @@
       },
       "lines": true,
       "linewidth": 1,
-      "nullPointMode": "null",
+      "nullPointMode": "connected",
       "options": {
         "alertThreshold": true
       },
@@ -725,6 +738,7 @@
       },
       "yaxes": [
         {
+          "$$hashKey": "object:626",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -733,6 +747,7 @@
           "show": true
         },
         {
+          "$$hashKey": "object:627",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -782,7 +797,7 @@
       },
       "lines": true,
       "linewidth": 1,
-      "nullPointMode": "null",
+      "nullPointMode": "connected",
       "options": {
         "alertThreshold": true
       },
@@ -798,7 +813,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "irate(${metric_namespace}_unbounded_channel_len{instance=~\"${nodename}\", action = \"send\"}[10m])",
+          "expr": "irate(${metric_namespace}_unbounded_channel_len{instance=~\"${nodename}\", action = \"send\"}[$__rate_interval])",
           "interval": "",
           "legendFormat": "{{entity}}",
           "refId": "B"
@@ -824,6 +839,7 @@
       },
       "yaxes": [
         {
+          "$$hashKey": "object:626",
           "format": "cps",
           "label": null,
           "logBase": 1,
@@ -832,6 +848,7 @@
           "show": true
         },
         {
+          "$$hashKey": "object:627",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -938,5 +955,5 @@
   "timezone": "utc",
   "title": "Substrate Service Tasks",
   "uid": "3LA6XNqZz",
-  "version": 59
-}
+  "version": 60
+}
\ No newline at end of file

From e03ca38d45f438932ec92bf69a40b6b16b6ec643 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Mon, 15 Feb 2021 18:28:04 +0000
Subject: [PATCH 0398/1194] grandpa: make the VotingRule API async (#8101)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* grandpa: make the VotingRule api async

* grandpa: add docs to VotingRuleResult

* grandpa: formatting

* grandpa: use async blocks

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* grandpa: expose VotingRuleResult

* grandpa: revert some broken changes to async syntax

* grandpa: use finality-grandpa v0.14.0

* grandpa: bump impl_version

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 Cargo.lock                                   |   5 +-
 bin/node/runtime/src/lib.rs                  |   2 +-
 client/finality-grandpa/Cargo.toml           |   5 +-
 client/finality-grandpa/rpc/Cargo.toml       |   2 +-
 client/finality-grandpa/src/environment.rs   | 215 +++++++++++--------
 client/finality-grandpa/src/justification.rs |   4 -
 client/finality-grandpa/src/lib.rs           |   3 +-
 client/finality-grandpa/src/observer.rs      |   5 -
 client/finality-grandpa/src/tests.rs         |  26 +--
 client/finality-grandpa/src/voting_rule.rs   | 113 +++++-----
 frame/grandpa/Cargo.toml                     |   2 +-
 primitives/finality-grandpa/Cargo.toml       |   2 +-
 12 files changed, 211 insertions(+), 173 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 64949da009e2..5bbe6f6f0029 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1589,9 +1589,9 @@ dependencies = [
 
 [[package]]
 name = "finality-grandpa"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cd795898c348a8ec9edc66ec9e014031c764d4c88cc26d09b492cd93eb41339"
+checksum = "c6447e2f8178843749e8c8003206def83ec124a7859475395777a28b5338647c"
 dependencies = [
  "either",
  "futures 0.3.12",
@@ -7089,6 +7089,7 @@ version = "0.9.0"
 dependencies = [
  "assert_matches",
  "derive_more",
+ "dyn-clone",
  "finality-grandpa",
  "fork-tree",
  "futures 0.3.12",
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 58c98e529c31..53cc0545e9d8 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -113,7 +113,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	// implementation changes and behavior does not, then leave spec_version as
 	// is and increment impl_version.
 	spec_version: 264,
-	impl_version: 0,
+	impl_version: 1,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 2,
 };
diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml
index d1ee2fe6b452..7ae5666c7bc8 100644
--- a/client/finality-grandpa/Cargo.toml
+++ b/client/finality-grandpa/Cargo.toml
@@ -16,6 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 derive_more = "0.99.2"
+dyn-clone = "1.0"
 fork-tree = { version = "3.0.0", path = "../../utils/fork-tree" }
 futures = "0.3.9"
 futures-timer = "3.0.1"
@@ -43,13 +44,13 @@ sc-network-gossip = { version = "0.9.0", path = "../network-gossip" }
 sp-finality-grandpa = { version = "3.0.0", path = "../../primitives/finality-grandpa" }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
 sc-block-builder = { version = "0.9.0", path = "../block-builder" }
-finality-grandpa = { version = "0.13.0", features = ["derive-codec"] }
+finality-grandpa = { version = "0.14.0", features = ["derive-codec"] }
 pin-project = "1.0.4"
 linked-hash-map = "0.5.2"
 
 [dev-dependencies]
 assert_matches = "1.3.0"
-finality-grandpa = { version = "0.13.0", features = ["derive-codec", "test-helpers"] }
+finality-grandpa = { version = "0.14.0", features = ["derive-codec", "test-helpers"] }
 sc-network = { version = "0.9.0", path = "../network" }
 sc-network-test = { version = "0.8.0", path = "../network/test" }
 sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
diff --git a/client/finality-grandpa/rpc/Cargo.toml b/client/finality-grandpa/rpc/Cargo.toml
index 58aa78a38b10..ff5b4cafdae7 100644
--- a/client/finality-grandpa/rpc/Cargo.toml
+++ b/client/finality-grandpa/rpc/Cargo.toml
@@ -14,7 +14,7 @@ sc-rpc = { version = "3.0.0", path = "../../rpc" }
 sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
 sp-core = { version = "3.0.0", path = "../../../primitives/core" }
 sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
-finality-grandpa = { version = "0.13.0", features = ["derive-codec"] }
+finality-grandpa = { version = "0.14.0", features = ["derive-codec"] }
 jsonrpc-core = "15.1.0"
 jsonrpc-core-client = "15.1.0"
 jsonrpc-derive = "15.1.0"
diff --git a/client/finality-grandpa/src/environment.rs b/client/finality-grandpa/src/environment.rs
index 55a60e16dfd3..7925a674c298 100644
--- a/client/finality-grandpa/src/environment.rs
+++ b/client/finality-grandpa/src/environment.rs
@@ -592,100 +592,6 @@ where
 	fn ancestry(&self, base: Block::Hash, block: Block::Hash) -> Result<Vec<Block::Hash>, GrandpaError> {
 		ancestry(&self.client, base, block)
 	}
-
-	fn best_chain_containing(&self, block: Block::Hash) -> Option<(Block::Hash, NumberFor<Block>)> {
-		// NOTE: when we finalize an authority set change through the sync protocol the voter is
-		//       signaled asynchronously. therefore the voter could still vote in the next round
-		//       before activating the new set. the `authority_set` is updated immediately thus we
-		//       restrict the voter based on that.
-		if self.set_id != self.authority_set.set_id() {
-			return None;
-		}
-
-		let base_header = match self.client.header(BlockId::Hash(block)).ok()? {
-			Some(h) => h,
-			None => {
-				debug!(target: "afg", "Encountered error finding best chain containing {:?}: couldn't find base block", block);
-				return None;
-			}
-		};
-
-		// we refuse to vote beyond the current limit number where transitions are scheduled to
-		// occur.
-		// once blocks are finalized that make that transition irrelevant or activate it,
-		// we will proceed onwards. most of the time there will be no pending transition.
-		// the limit, if any, is guaranteed to be higher than or equal to the given base number.
-		let limit = self.authority_set.current_limit(*base_header.number());
-		debug!(target: "afg", "Finding best chain containing block {:?} with number limit {:?}", block, limit);
-
-		match self.select_chain.finality_target(block, None) {
-			Ok(Some(best_hash)) => {
-				let best_header = self.client.header(BlockId::Hash(best_hash)).ok()?
-					.expect("Header known to exist after `finality_target` call; qed");
-
-				// check if our vote is currently being limited due to a pending change
-				let limit = limit.filter(|limit| limit < best_header.number());
-				let target;
-
-				let target_header = if let Some(target_number) = limit {
-					let mut target_header = best_header.clone();
-
-					// walk backwards until we find the target block
-					loop {
-						if *target_header.number() < target_number {
-							unreachable!(
-								"we are traversing backwards from a known block; \
-								 blocks are stored contiguously; \
-								 qed"
-							);
-						}
-
-						if *target_header.number() == target_number {
-							break;
-						}
-
-						target_header = self.client.header(BlockId::Hash(*target_header.parent_hash())).ok()?
-							.expect("Header known to exist after `finality_target` call; qed");
-					}
-
-					target = target_header;
-					&target
-				} else {
-					// otherwise just use the given best as the target
-					&best_header
-				};
-
-				// restrict vote according to the given voting rule, if the
-				// voting rule doesn't restrict the vote then we keep the
-				// previous target.
-				//
-				// note that we pass the original `best_header`, i.e. before the
-				// authority set limit filter, which can be considered a
-				// mandatory/implicit voting rule.
-				//
-				// we also make sure that the restricted vote is higher than the
-				// round base (i.e. last finalized), otherwise the value
-				// returned by the given voting rule is ignored and the original
-				// target is used instead.
-				self.voting_rule
-					.restrict_vote(&*self.client, &base_header, &best_header, target_header)
-					.filter(|(_, restricted_number)| {
-						// we can only restrict votes within the interval [base, target]
-						restricted_number >= base_header.number() &&
-							restricted_number < target_header.number()
-					})
-					.or_else(|| Some((target_header.hash(), *target_header.number())))
-			},
-			Ok(None) => {
-				debug!(target: "afg", "Encountered error finding best chain containing {:?}: couldn't find target block", block);
-				None
-			}
-			Err(e) => {
-				debug!(target: "afg", "Encountered error finding best chain containing {:?}: {:?}", block, e);
-				None
-			}
-		}
-	}
 }
 
 
@@ -733,6 +639,14 @@ where
 	NumberFor<Block>: BlockNumberOps,
 {
 	type Timer = Pin<Box<dyn Future<Output = Result<(), Self::Error>> + Send + Sync>>;
+	type BestChain = Pin<
+		Box<
+			dyn Future<Output = Result<Option<(Block::Hash, NumberFor<Block>)>, Self::Error>>
+				+ Send
+				+ Sync
+		>,
+	>;
+
 	type Id = AuthorityId;
 	type Signature = AuthoritySignature;
 
@@ -747,6 +661,119 @@ where
 
 	type Error = CommandOrError<Block::Hash, NumberFor<Block>>;
 
+	fn best_chain_containing(&self, block: Block::Hash) -> Self::BestChain {
+		let find_best_chain = || {
+			// NOTE: when we finalize an authority set change through the sync protocol the voter is
+			//       signaled asynchronously. therefore the voter could still vote in the next round
+			//       before activating the new set. the `authority_set` is updated immediately thus we
+			//       restrict the voter based on that.
+			if self.set_id != self.authority_set.set_id() {
+				return None;
+			}
+
+			let base_header = match self.client.header(BlockId::Hash(block)).ok()? {
+				Some(h) => h,
+				None => {
+					debug!(target: "afg", "Encountered error finding best chain containing {:?}: couldn't find base block", block);
+					return None;
+				}
+			};
+
+			// we refuse to vote beyond the current limit number where transitions are scheduled to
+			// occur.
+			// once blocks are finalized that make that transition irrelevant or activate it,
+			// we will proceed onwards. most of the time there will be no pending transition.
+			// the limit, if any, is guaranteed to be higher than or equal to the given base number.
+			let limit = self.authority_set.current_limit(*base_header.number());
+			debug!(target: "afg", "Finding best chain containing block {:?} with number limit {:?}", block, limit);
+
+			match self.select_chain.finality_target(block, None) {
+				Ok(Some(best_hash)) => {
+					let best_header = self
+						.client
+						.header(BlockId::Hash(best_hash))
+						.ok()?
+						.expect("Header known to exist after `finality_target` call; qed");
+
+					// check if our vote is currently being limited due to a pending change
+					let limit = limit.filter(|limit| limit < best_header.number());
+
+					if let Some(target_number) = limit {
+						let mut target_header = best_header.clone();
+
+						// walk backwards until we find the target block
+						loop {
+							if *target_header.number() < target_number {
+								unreachable!(
+									"we are traversing backwards from a known block; \
+									 blocks are stored contiguously; \
+									 qed"
+								);
+							}
+
+							if *target_header.number() == target_number {
+								break;
+							}
+
+							target_header = self
+								.client
+								.header(BlockId::Hash(*target_header.parent_hash()))
+								.ok()?
+								.expect("Header known to exist after `finality_target` call; qed");
+						}
+
+						Some((base_header, best_header, target_header))
+					} else {
+						// otherwise just use the given best as the target
+						Some((base_header, best_header.clone(), best_header))
+					}
+				}
+				Ok(None) => {
+					debug!(target: "afg", "Encountered error finding best chain containing {:?}: couldn't find target block", block);
+					None
+				}
+				Err(e) => {
+					debug!(target: "afg", "Encountered error finding best chain containing {:?}: {:?}", block, e);
+					None
+				}
+			}
+		};
+
+		if let Some((base_header, best_header, target_header)) = find_best_chain() {
+			// restrict vote according to the given voting rule, if the
+			// voting rule doesn't restrict the vote then we keep the
+			// previous target.
+			//
+			// note that we pass the original `best_header`, i.e. before the
+			// authority set limit filter, which can be considered a
+			// mandatory/implicit voting rule.
+			//
+			// we also make sure that the restricted vote is higher than the
+			// round base (i.e. last finalized), otherwise the value
+			// returned by the given voting rule is ignored and the original
+			// target is used instead.
+			let rule_fut = self.voting_rule.restrict_vote(
+				self.client.clone(),
+				&base_header,
+				&best_header,
+				&target_header,
+			);
+
+			Box::pin(async move {
+				Ok(rule_fut
+					.await
+					.filter(|(_, restricted_number)| {
+						// we can only restrict votes within the interval [base, target]
+						restricted_number >= base_header.number()
+							&& restricted_number < target_header.number()
+					})
+					.or_else(|| Some((target_header.hash(), *target_header.number()))))
+			})
+		} else {
+			Box::pin(future::ok(None))
+		}
+	}
+
 	fn round_data(
 		&self,
 		round: RoundNumber,
diff --git a/client/finality-grandpa/src/justification.rs b/client/finality-grandpa/src/justification.rs
index 9429acff06d8..eba909bad5ef 100644
--- a/client/finality-grandpa/src/justification.rs
+++ b/client/finality-grandpa/src/justification.rs
@@ -217,8 +217,4 @@ impl<Block: BlockT> finality_grandpa::Chain<Block::Hash, NumberFor<Block>> for A
 
 		Ok(route)
 	}
-
-	fn best_chain_containing(&self, _block: Block::Hash) -> Option<(Block::Hash, NumberFor<Block>)> {
-		None
-	}
 }
diff --git a/client/finality-grandpa/src/lib.rs b/client/finality-grandpa/src/lib.rs
index 75500a894d74..809e14e5c90b 100644
--- a/client/finality-grandpa/src/lib.rs
+++ b/client/finality-grandpa/src/lib.rs
@@ -127,7 +127,8 @@ pub use notification::{GrandpaJustificationSender, GrandpaJustificationStream};
 pub use import::GrandpaBlockImport;
 pub use justification::GrandpaJustification;
 pub use voting_rule::{
-	BeforeBestBlockBy, ThreeQuartersOfTheUnfinalizedChain, VotingRule, VotingRulesBuilder
+	BeforeBestBlockBy, ThreeQuartersOfTheUnfinalizedChain, VotingRule, VotingRuleResult,
+	VotingRulesBuilder,
 };
 pub use finality_grandpa::voter::report;
 pub use finality_proof::{prove_warp_sync, WarpSyncFragmentCache};
diff --git a/client/finality-grandpa/src/observer.rs b/client/finality-grandpa/src/observer.rs
index c9db917e1699..3054a9df61c5 100644
--- a/client/finality-grandpa/src/observer.rs
+++ b/client/finality-grandpa/src/observer.rs
@@ -57,11 +57,6 @@ impl<'a, Block, Client> finality_grandpa::Chain<Block::Hash, NumberFor<Block>>
 	fn ancestry(&self, base: Block::Hash, block: Block::Hash) -> Result<Vec<Block::Hash>, GrandpaError> {
 		environment::ancestry(&self.client, base, block)
 	}
-
-	fn best_chain_containing(&self, _block: Block::Hash) -> Option<(Block::Hash, NumberFor<Block>)> {
-		// only used by voter
-		None
-	}
 }
 
 fn grandpa_observer<BE, Block: BlockT, Client, S, F>(
diff --git a/client/finality-grandpa/src/tests.rs b/client/finality-grandpa/src/tests.rs
index 4918255d027a..921b49db61c2 100644
--- a/client/finality-grandpa/src/tests.rs
+++ b/client/finality-grandpa/src/tests.rs
@@ -1355,7 +1355,7 @@ where
 
 #[test]
 fn grandpa_environment_respects_voting_rules() {
-	use finality_grandpa::Chain;
+	use finality_grandpa::voter::Environment;
 
 	let peers = &[Ed25519Keyring::Alice];
 	let voters = make_ids(peers);
@@ -1390,25 +1390,25 @@ fn grandpa_environment_respects_voting_rules() {
 
 	// the unrestricted environment should just return the best block
 	assert_eq!(
-		unrestricted_env.best_chain_containing(
+		futures::executor::block_on(unrestricted_env.best_chain_containing(
 			peer.client().info().finalized_hash
-		).unwrap().1,
+		)).unwrap().unwrap().1,
 		21,
 	);
 
 	// both the other environments should return block 16, which is 3/4 of the
 	// way in the unfinalized chain
 	assert_eq!(
-		three_quarters_env.best_chain_containing(
+		futures::executor::block_on(three_quarters_env.best_chain_containing(
 			peer.client().info().finalized_hash
-		).unwrap().1,
+		)).unwrap().unwrap().1,
 		16,
 	);
 
 	assert_eq!(
-		default_env.best_chain_containing(
+		futures::executor::block_on(default_env.best_chain_containing(
 			peer.client().info().finalized_hash
-		).unwrap().1,
+		)).unwrap().unwrap().1,
 		16,
 	);
 
@@ -1417,18 +1417,18 @@ fn grandpa_environment_respects_voting_rules() {
 
 	// the 3/4 environment should propose block 21 for voting
 	assert_eq!(
-		three_quarters_env.best_chain_containing(
+		futures::executor::block_on(three_quarters_env.best_chain_containing(
 			peer.client().info().finalized_hash
-		).unwrap().1,
+		)).unwrap().unwrap().1,
 		21,
 	);
 
 	// while the default environment will always still make sure we don't vote
 	// on the best block (2 behind)
 	assert_eq!(
-		default_env.best_chain_containing(
+		futures::executor::block_on(default_env.best_chain_containing(
 			peer.client().info().finalized_hash
-		).unwrap().1,
+		)).unwrap().unwrap().1,
 		19,
 	);
 
@@ -1439,9 +1439,9 @@ fn grandpa_environment_respects_voting_rules() {
 	// best block, there's a hard rule that we can't cast any votes lower than
 	// the given base (#21).
 	assert_eq!(
-		default_env.best_chain_containing(
+		futures::executor::block_on(default_env.best_chain_containing(
 			peer.client().info().finalized_hash
-		).unwrap().1,
+		)).unwrap().unwrap().1,
 		21,
 	);
 }
diff --git a/client/finality-grandpa/src/voting_rule.rs b/client/finality-grandpa/src/voting_rule.rs
index a861e792755f..e7b74c3e3296 100644
--- a/client/finality-grandpa/src/voting_rule.rs
+++ b/client/finality-grandpa/src/voting_rule.rs
@@ -22,14 +22,22 @@
 //! restrictions that are taken into account by the GRANDPA environment when
 //! selecting a finality target to vote on.
 
+use std::future::Future;
 use std::sync::Arc;
+use std::pin::Pin;
+
+use dyn_clone::DynClone;
 
 use sc_client_api::blockchain::HeaderBackend;
 use sp_runtime::generic::BlockId;
 use sp_runtime::traits::{Block as BlockT, Header, NumberFor, One, Zero};
 
+/// A future returned by a `VotingRule` to restrict a given vote, if any restriction is necessary.
+pub type VotingRuleResult<Block> =
+	Pin<Box<dyn Future<Output = Option<(<Block as BlockT>::Hash, NumberFor<Block>)>> + Send + Sync>>;
+
 /// A trait for custom voting rules in GRANDPA.
-pub trait VotingRule<Block, B>: Send + Sync where
+pub trait VotingRule<Block, B>: DynClone + Send + Sync where
 	Block: BlockT,
 	B: HeaderBackend<Block>,
 {
@@ -47,11 +55,11 @@ pub trait VotingRule<Block, B>: Send + Sync where
 	/// execution of voting rules wherein `current_target <= best_target`.
 	fn restrict_vote(
 		&self,
-		backend: &B,
+		backend: Arc<B>,
 		base: &Block::Header,
 		best_target: &Block::Header,
 		current_target: &Block::Header,
-	) -> Option<(Block::Hash, NumberFor<Block>)>;
+	) -> VotingRuleResult<Block>;
 }
 
 impl<Block, B> VotingRule<Block, B> for () where
@@ -60,12 +68,12 @@ impl<Block, B> VotingRule<Block, B> for () where
 {
 	fn restrict_vote(
 		&self,
-		_backend: &B,
+		_backend: Arc<B>,
 		_base: &Block::Header,
 		_best_target: &Block::Header,
 		_current_target: &Block::Header,
-	) -> Option<(Block::Hash, NumberFor<Block>)> {
-		None
+	) -> VotingRuleResult<Block> {
+		Box::pin(async { None })
 	}
 }
 
@@ -80,15 +88,15 @@ impl<Block, B> VotingRule<Block, B> for BeforeBestBlockBy<NumberFor<Block>> wher
 {
 	fn restrict_vote(
 		&self,
-		backend: &B,
+		backend: Arc<B>,
 		_base: &Block::Header,
 		best_target: &Block::Header,
 		current_target: &Block::Header,
-	) -> Option<(Block::Hash, NumberFor<Block>)> {
+	) -> VotingRuleResult<Block> {
 		use sp_arithmetic::traits::Saturating;
 
 		if current_target.number().is_zero() {
-			return None;
+			return Box::pin(async { None });
 		}
 
 		// find the target number restricted by this rule
@@ -96,21 +104,24 @@ impl<Block, B> VotingRule<Block, B> for BeforeBestBlockBy<NumberFor<Block>> wher
 
 		// our current target is already lower than this rule would restrict
 		if target_number >= *current_target.number() {
-			return None;
+			return Box::pin(async { None });
 		}
 
+		let current_target = current_target.clone();
+
 		// find the block at the given target height
-		find_target(
-			backend,
-			target_number,
-			current_target,
-		)
+		Box::pin(std::future::ready(find_target(
+			&*backend,
+			target_number.clone(),
+			&current_target,
+		)))
 	}
 }
 
 /// A custom voting rule that limits votes towards 3/4 of the unfinalized chain,
 /// using the given `base` and `best_target` to figure where the 3/4 target
 /// should fall.
+#[derive(Clone)]
 pub struct ThreeQuartersOfTheUnfinalizedChain;
 
 impl<Block, B> VotingRule<Block, B> for ThreeQuartersOfTheUnfinalizedChain where
@@ -119,11 +130,11 @@ impl<Block, B> VotingRule<Block, B> for ThreeQuartersOfTheUnfinalizedChain where
 {
 	fn restrict_vote(
 		&self,
-		backend: &B,
+		backend: Arc<B>,
 		base: &Block::Header,
 		best_target: &Block::Header,
 		current_target: &Block::Header,
-	) -> Option<(Block::Hash, NumberFor<Block>)> {
+	) -> VotingRuleResult<Block> {
 		// target a vote towards 3/4 of the unfinalized chain (rounding up)
 		let target_number = {
 			let two = NumberFor::<Block>::one() + One::one();
@@ -138,15 +149,15 @@ impl<Block, B> VotingRule<Block, B> for ThreeQuartersOfTheUnfinalizedChain where
 
 		// our current target is already lower than this rule would restrict
 		if target_number >= *current_target.number() {
-			return None;
+			return Box::pin(async { None });
 		}
 
 		// find the block at the given target height
-		find_target(
-			backend,
+		Box::pin(std::future::ready(find_target(
+			&*backend,
 			target_number,
 			current_target,
-		)
+		)))
 	}
 }
 
@@ -195,37 +206,42 @@ impl<B, Block> Clone for VotingRules<B, Block> {
 
 impl<Block, B> VotingRule<Block, B> for VotingRules<Block, B> where
 	Block: BlockT,
-	B: HeaderBackend<Block>,
+	B: HeaderBackend<Block> + 'static,
 {
 	fn restrict_vote(
 		&self,
-		backend: &B,
+		backend: Arc<B>,
 		base: &Block::Header,
 		best_target: &Block::Header,
 		current_target: &Block::Header,
-	) -> Option<(Block::Hash, NumberFor<Block>)> {
-		let restricted_target = self.rules.iter().fold(
-			current_target.clone(),
-			|current_target, rule| {
-				rule.restrict_vote(
-					backend,
-					base,
-					best_target,
-					&current_target,
-				)
+	) -> VotingRuleResult<Block> {
+		let rules = self.rules.clone();
+		let base = base.clone();
+		let best_target = best_target.clone();
+		let current_target = current_target.clone();
+
+		Box::pin(async move {
+			let mut restricted_target = current_target.clone();
+
+			for rule in rules.iter() {
+				if let Some(header) = rule
+					.restrict_vote(backend.clone(), &base, &best_target, &restricted_target)
+					.await
 					.and_then(|(hash, _)| backend.header(BlockId::Hash(hash)).ok())
 					.and_then(std::convert::identity)
-					.unwrap_or(current_target)
-			},
-		);
-
-		let restricted_hash = restricted_target.hash();
-
-		if restricted_hash != current_target.hash() {
-			Some((restricted_hash, *restricted_target.number()))
-		} else {
-			None
-		}
+				{
+					restricted_target = header;
+				}
+			}
+
+			let restricted_hash = restricted_target.hash();
+
+			if restricted_hash != current_target.hash() {
+				Some((restricted_hash, *restricted_target.number()))
+			} else {
+				None
+			}
+		})
 	}
 }
 
@@ -237,7 +253,7 @@ pub struct VotingRulesBuilder<Block, B> {
 
 impl<Block, B> Default for VotingRulesBuilder<Block, B> where
 	Block: BlockT,
-	B: HeaderBackend<Block>,
+	B: HeaderBackend<Block> + 'static,
 {
 	fn default() -> Self {
 		VotingRulesBuilder::new()
@@ -248,7 +264,7 @@ impl<Block, B> Default for VotingRulesBuilder<Block, B> where
 
 impl<Block, B> VotingRulesBuilder<Block, B> where
 	Block: BlockT,
-	B: HeaderBackend<Block>,
+	B: HeaderBackend<Block> + 'static,
 {
 	/// Return a new voting rule builder using the given backend.
 	pub fn new() -> Self {
@@ -285,14 +301,15 @@ impl<Block, B> VotingRulesBuilder<Block, B> where
 impl<Block, B> VotingRule<Block, B> for Box<dyn VotingRule<Block, B>> where
 	Block: BlockT,
 	B: HeaderBackend<Block>,
+	Self: Clone,
 {
 	fn restrict_vote(
 		&self,
-		backend: &B,
+		backend: Arc<B>,
 		base: &Block::Header,
 		best_target: &Block::Header,
 		current_target: &Block::Header,
-	) -> Option<(Block::Hash, NumberFor<Block>)> {
+	) -> VotingRuleResult<Block> {
 		(**self).restrict_vote(backend, base, best_target, current_target)
 	}
 }
diff --git a/frame/grandpa/Cargo.toml b/frame/grandpa/Cargo.toml
index a9ba0ccc56f3..3e85ff50d3e1 100644
--- a/frame/grandpa/Cargo.toml
+++ b/frame/grandpa/Cargo.toml
@@ -30,7 +30,7 @@ pallet-session = { version = "3.0.0", default-features = false, path = "../sessi
 
 [dev-dependencies]
 frame-benchmarking = { version = "3.0.0", path = "../benchmarking" }
-grandpa = { package = "finality-grandpa", version = "0.13.0", features = ["derive-codec"] }
+grandpa = { package = "finality-grandpa", version = "0.14.0", features = ["derive-codec"] }
 sp-io = { version = "3.0.0", path = "../../primitives/io" }
 sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
 pallet-balances = { version = "3.0.0", path = "../balances" }
diff --git a/primitives/finality-grandpa/Cargo.toml b/primitives/finality-grandpa/Cargo.toml
index c8ff2fc0a2e6..95aa65c930f7 100644
--- a/primitives/finality-grandpa/Cargo.toml
+++ b/primitives/finality-grandpa/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-grandpa = { package = "finality-grandpa", version = "0.13.0", default-features = false, features = ["derive-codec"] }
+grandpa = { package = "finality-grandpa", version = "0.14.0", default-features = false, features = ["derive-codec"] }
 log = { version = "0.4.8", optional = true }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 sp-api = { version = "3.0.0", default-features = false, path = "../api" }

From d0545934393bff627a9963ccee2f6a50a470d082 Mon Sep 17 00:00:00 2001
From: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
Date: Tue, 16 Feb 2021 10:01:20 +0100
Subject: [PATCH 0399/1194] Create a macro which automates creation of
 benchmark test suites. (#8104)

* Create a macro which automates creation of benchmark test suites.

* bump impl_version

* allow unused on test_bench_by_name

* use proper doctest ignore attribute

* Explicitly hand the Module to the test suite

Much better practice than depending on it showing up implicitly in
the namespace.

* explicitly import what we need into `mod tests`

* bench_module is `ident` not `tt`

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* allow end users to specify arguments for new_test_ext

This turned out to be surprisingly easy. On reflection, it turns out
that of course the compiler can't eagerly evaluate the function call,
but needs to paste it in everywhere desired.

* enable explicitly specifying the path to the benchmarks invocation

also enable optional trailing commas

* Revert "bump impl_version"

This reverts commit 0209e4de33fd43873f8cfc6875815d0fd6151e63.

* list failing benchmark tests and the errors which caused the failure

* harden benchmark tests against internal panics

* suppress warning about ignored profiles

unfortunately, setting the profile here doesn't do anything; we'd
need to set it in every leaf package anyway. However, as this was
just making the default explicit anyway, I think it's safe enough
to remove entirely.

* impl_benchmark_test_suite for assets

* impl_benchmark_test_suite for balances

* impl_benchmark_test_suite for bounties

* impl_benchmark_test_suite for Collective

* impl_benchmark_test_suite for Contracts

* impl_benchmark_test_suite for Democracy

* don't impl_benchmark_test_suite for Elections-Phragmen

* impl_benchmark_test_suite for Identity

Note that Identity tests currently fail. They failed in an identical
way before this change, so as far as I'm concerned, the status quo is
good enough for now.

* impl_benchmark_test_suite for ImOnline

* impl_benchmark_test_suite for indices

For this crate also, the test suite fails identically with and without
this change, so we can say that this change is not the cause of the
tests' failure to compile.

* impl_benchmark_test_suite for lottery

* impl_benchmark_test_suite for merkle-mountain-range

* impl_benchmark_test_suite for Multisig

These tests fail identically with and without the change, so the change
seems unlikely to be the origin of the failures.

* impl_benchmark_test_suite for offences

* impl_benchmark_test_suite for Proxy

Fails identically with and without this change.

* impl_benchmark_test_suite for scheduler

* impl_benchmark_test_suite for session

It turns out to be important to be able to exclude items marked
`#[extra]` sometimes. Who knew?

* impl_benchmark_test_suite for staking

* impl_benchmark_test_suite for system

* impl_benchmark_test_suite for timestamp

* impl_benchmark_test_suite for tips

* impl_benchmark_test_suite for treasury

* impl_benchmark_test_suite for utility

Note that benchmark tests fail identically before and after this change.

* impl_benchmark_test_suite for vesting

* fix wrong module name in impl_benchmark_test_suite in Offences

* address line length nits

* enable optional keyword argument: exec_name

Took a _lot_ of macro-wrangling to get the functionality that I want,
but now you have the option to pass in

```rust
impl_benchmark_test_suite!(
	Elections,
	crate::tests::ExtBuilder::default().desired_members(13).desired_runners_up(7),
	crate::tests::Test,
	exec_name = build_and_execute,
);
```

and have it expand out properly. A selected fragment of the expansion:

```rust
        fn test_benchmarks() {
            crate::tests::ExtBuilder::default()
                .desired_members(13)
                .desired_runners_up(7)
                .build_and_execute(|| {
```

* get rid of dead code

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
---
 frame/assets/src/benchmarking.rs              | 120 +-------
 frame/balances/src/benchmarking.rs            |  55 +---
 frame/benchmarking/src/lib.rs                 | 262 +++++++++++++++++-
 frame/bounties/src/benchmarking.rs            |  30 +-
 frame/collective/src/benchmarking.rs          |  89 +-----
 frame/contracts/src/benchmarking/mod.rs       | 131 +--------
 frame/democracy/src/benchmarking.rs           |  49 +---
 frame/elections-phragmen/src/benchmarking.rs  |  89 +-----
 frame/example/src/lib.rs                      |  21 +-
 frame/identity/src/benchmarking.rs            |  35 +--
 frame/im-online/src/benchmarking.rs           |  23 +-
 frame/indices/src/benchmarking.rs             |  23 +-
 frame/lottery/src/benchmarking.rs             |  25 +-
 .../merkle-mountain-range/src/benchmarking.rs |  21 +-
 frame/multisig/src/benchmarking.rs            |  29 +-
 frame/offences/benchmarking/src/lib.rs        |  23 +-
 frame/proxy/src/benchmarking.rs               |  29 +-
 frame/scheduler/src/benchmarking.rs           |  24 +-
 frame/session/benchmarking/src/lib.rs         |  22 +-
 frame/staking/src/benchmarking.rs             |  48 +---
 frame/system/benchmarking/src/lib.rs          |  26 +-
 frame/timestamp/src/benchmarking.rs           |  21 +-
 frame/tips/src/benchmarking.rs                |  25 +-
 frame/treasury/src/benchmarking.rs            |  25 +-
 frame/utility/src/benchmarking.rs             |  22 +-
 frame/vesting/src/benchmarking.rs             |  25 +-
 26 files changed, 421 insertions(+), 871 deletions(-)

diff --git a/frame/assets/src/benchmarking.rs b/frame/assets/src/benchmarking.rs
index 986eedfb6a86..86a0c48e7973 100644
--- a/frame/assets/src/benchmarking.rs
+++ b/frame/assets/src/benchmarking.rs
@@ -20,7 +20,7 @@
 use super::*;
 use sp_runtime::traits::Bounded;
 use frame_system::RawOrigin as SystemOrigin;
-use frame_benchmarking::{benchmarks, account, whitelisted_caller};
+use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
 use frame_support::traits::Get;
 
 use crate::Module as Assets;
@@ -233,120 +233,4 @@ benchmarks! {
 	}
 }
 
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate::tests::{new_test_ext, Test};
-
-	#[test]
-	fn create() {
-		new_test_ext().execute_with(|| {
-			assert!(test_benchmark_create::<Test>().is_ok());
-		});
-	}
-
-	#[test]
-	fn force_create() {
-		new_test_ext().execute_with(|| {
-			assert!(test_benchmark_force_create::<Test>().is_ok());
-		});
-	}
-
-	#[test]
-	fn destroy() {
-		new_test_ext().execute_with(|| {
-			assert!(test_benchmark_destroy::<Test>().is_ok());
-		});
-	}
-
-	#[test]
-	fn force_destroy() {
-		new_test_ext().execute_with(|| {
-			assert!(test_benchmark_force_destroy::<Test>().is_ok());
-		});
-	}
-
-	#[test]
-	fn mint() {
-		new_test_ext().execute_with(|| {
-			assert!(test_benchmark_mint::<Test>().is_ok());
-		});
-	}
-
-	#[test]
-	fn burn() {
-		new_test_ext().execute_with(|| {
-			assert!(test_benchmark_burn::<Test>().is_ok());
-		});
-	}
-
-	#[test]
-	fn transfer() {
-		new_test_ext().execute_with(|| {
-			assert!(test_benchmark_transfer::<Test>().is_ok());
-		});
-	}
-
-	#[test]
-	fn force_transfer() {
-		new_test_ext().execute_with(|| {
-			assert!(test_benchmark_force_transfer::<Test>().is_ok());
-		});
-	}
-
-	#[test]
-	fn freeze() {
-		new_test_ext().execute_with(|| {
-			assert!(test_benchmark_freeze::<Test>().is_ok());
-		});
-	}
-
-	#[test]
-	fn thaw() {
-		new_test_ext().execute_with(|| {
-			assert!(test_benchmark_thaw::<Test>().is_ok());
-		});
-	}
-
-	#[test]
-	fn freeze_asset() {
-		new_test_ext().execute_with(|| {
-			assert!(test_benchmark_freeze_asset::<Test>().is_ok());
-		});
-	}
-
-	#[test]
-	fn thaw_asset() {
-		new_test_ext().execute_with(|| {
-			assert!(test_benchmark_thaw_asset::<Test>().is_ok());
-		});
-	}
-
-	#[test]
-	fn transfer_ownership() {
-		new_test_ext().execute_with(|| {
-			assert!(test_benchmark_transfer_ownership::<Test>().is_ok());
-		});
-	}
-
-	#[test]
-	fn set_team() {
-		new_test_ext().execute_with(|| {
-			assert!(test_benchmark_set_team::<Test>().is_ok());
-		});
-	}
-
-	#[test]
-	fn set_max_zombies() {
-		new_test_ext().execute_with(|| {
-			assert!(test_benchmark_set_max_zombies::<Test>().is_ok());
-		});
-	}
-
-	#[test]
-	fn set_metadata() {
-		new_test_ext().execute_with(|| {
-			assert!(test_benchmark_set_metadata::<Test>().is_ok());
-		});
-	}
-}
+impl_benchmark_test_suite!(Assets, crate::tests::new_test_ext(), crate::tests::Test);
diff --git a/frame/balances/src/benchmarking.rs b/frame/balances/src/benchmarking.rs
index 53cf273d850d..14732b44b4fc 100644
--- a/frame/balances/src/benchmarking.rs
+++ b/frame/balances/src/benchmarking.rs
@@ -22,7 +22,7 @@
 use super::*;
 
 use frame_system::RawOrigin;
-use frame_benchmarking::{benchmarks, account, whitelisted_caller};
+use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
 use sp_runtime::traits::Bounded;
 
 use crate::Module as Balances;
@@ -144,51 +144,8 @@ benchmarks! {
 	}
 }
 
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate::tests_composite::{ExtBuilder, Test};
-	use frame_support::assert_ok;
-
-	#[test]
-	fn transfer() {
-		ExtBuilder::default().build().execute_with(|| {
-			assert_ok!(test_benchmark_transfer::<Test>());
-		});
-	}
-
-	#[test]
-	fn transfer_best_case() {
-		ExtBuilder::default().build().execute_with(|| {
-			assert_ok!(test_benchmark_transfer_best_case::<Test>());
-		});
-	}
-
-	#[test]
-	fn transfer_keep_alive() {
-		ExtBuilder::default().build().execute_with(|| {
-			assert_ok!(test_benchmark_transfer_keep_alive::<Test>());
-		});
-	}
-
-	#[test]
-	fn transfer_set_balance_creating() {
-		ExtBuilder::default().build().execute_with(|| {
-			assert_ok!(test_benchmark_set_balance_creating::<Test>());
-		});
-	}
-
-	#[test]
-	fn transfer_set_balance_killing() {
-		ExtBuilder::default().build().execute_with(|| {
-			assert_ok!(test_benchmark_set_balance_killing::<Test>());
-		});
-	}
-
-	#[test]
-	fn force_transfer() {
-		ExtBuilder::default().build().execute_with(|| {
-			assert_ok!(test_benchmark_force_transfer::<Test>());
-		});
-	}
-}
+impl_benchmark_test_suite!(
+	Balances,
+	crate::tests_composite::ExtBuilder::default().build(),
+	crate::tests_composite::Test,
+);
diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
index d2cba9cc7097..fd9245d18fed 100644
--- a/frame/benchmarking/src/lib.rs
+++ b/frame/benchmarking/src/lib.rs
@@ -830,6 +830,31 @@ macro_rules! impl_benchmark {
 				return Ok(results);
 			}
 		}
+
+		/// Test a particular benchmark by name.
+		///
+		/// This isn't called `test_benchmark_by_name` just in case some end-user eventually
+		/// writes a benchmark, itself called `by_name`; the function would be shadowed in
+		/// that case.
+		///
+		/// This is generally intended to be used by child test modules such as those created
+		/// by the `impl_benchmark_test_suite` macro. However, it is not an error if a pallet
+		/// author chooses not to implement benchmarks.
+		#[cfg(test)]
+		#[allow(unused)]
+		fn test_bench_by_name<T>(name: &[u8]) -> Result<(), &'static str>
+		where
+			T: Config + frame_system::Config, $( $where_clause )*
+		{
+			let name = sp_std::str::from_utf8(name)
+				.map_err(|_| "`name` is not a valid utf8 string!")?;
+			match name {
+				$( stringify!($name) => {
+					$crate::paste::paste! { [< test_benchmark_ $name >]::<T>() }
+				} )*
+				_ => Err("Could not find test for requested benchmark."),
+			}
+		}
 	};
 }
 
@@ -903,6 +928,239 @@ macro_rules! impl_benchmark_test {
 	};
 }
 
+/// This creates a test suite which runs the module's benchmarks.
+///
+/// When called in [`pallet_example`] as
+///
+/// ```rust,ignore
+/// impl_benchmark_test_suite!(Module, crate::tests::new_test_ext(), crate::tests::Test);
+/// ```
+///
+/// It expands to the equivalent of:
+///
+/// ```rust,ignore
+/// #[cfg(test)]
+/// mod tests {
+/// 	use super::*;
+/// 	use crate::tests::{new_test_ext, Test};
+/// 	use frame_support::assert_ok;
+///
+/// 	#[test]
+/// 	fn test_benchmarks() {
+/// 		new_test_ext().execute_with(|| {
+/// 			assert_ok!(test_benchmark_accumulate_dummy::<Test>());
+/// 			assert_ok!(test_benchmark_set_dummy::<Test>());
+/// 			assert_ok!(test_benchmark_another_set_dummy::<Test>());
+/// 			assert_ok!(test_benchmark_sort_vector::<Test>());
+/// 		});
+/// 	}
+/// }
+/// ```
+///
+/// ## Arguments
+///
+/// The first argument, `module`, must be the path to this crate's module.
+///
+/// The second argument, `new_test_ext`, must be a function call which returns either a
+/// `sp_io::TestExternalities`, or some other type with a similar interface.
+///
+/// Note that this function call is _not_ evaluated at compile time, but is instead copied textually
+/// into each appropriate invocation site.
+///
+/// The third argument, `test`, must be the path to the runtime. The item to which this must refer
+/// will generally take the form:
+///
+/// ```rust,ignore
+/// frame_support::construct_runtime!(
+/// 	pub enum Test where ...
+/// 	{ ... }
+/// );
+/// ```
+///
+/// There is an optional fourth argument, with keyword syntax: `benchmarks_path = path_to_benchmarks_invocation`.
+/// In the typical case in which this macro is in the same module as the `benchmarks!` invocation,
+/// you don't need to supply this. However, if the `impl_benchmark_test_suite!` invocation is in a
+/// different module than the `benchmarks!` invocation, then you should provide the path to the
+/// module containing the `benchmarks!` invocation:
+///
+/// ```rust,ignore
+/// mod benches {
+/// 	benchmarks!{
+/// 		...
+/// 	}
+/// }
+///
+/// mod tests {
+/// 	// because of macro syntax limitations, neither Module nor benches can be paths, but both have
+/// 	// to be idents in the scope of `impl_benchmark_test_suite`.
+/// 	use crate::{benches, Module};
+///
+/// 	impl_benchmark_test_suite!(Module, new_test_ext(), Test, benchmarks_path = benches);
+///
+/// 	// new_test_ext and the Test item are defined later in this module
+/// }
+/// ```
+///
+/// There is an optional fifth argument, with keyword syntax: `extra = true` or `extra = false`.
+/// By default, this generates a test suite which iterates over all benchmarks, including those
+/// marked with the `#[extra]` annotation. Setting `extra = false` excludes those.
+///
+/// There is an optional sixth argument, with keyword syntax: `exec_name = custom_exec_name`.
+/// By default, this macro uses `execute_with` for this parameter. This argument, if set, is subject
+/// to these restrictions:
+///
+/// - It must be the name of a method applied to the output of the `new_test_ext` argument.
+/// - That method must have a signature capable of receiving a single argument of the form `impl FnOnce()`.
+///
+// ## Notes (not for rustdoc)
+//
+// The biggest challenge for this macro is communicating the actual test functions to be run. We
+// can't just build an array of function pointers to each test function and iterate over it, because
+// the test functions are parameterized by the `Test` type. That's incompatible with
+// monomorphization: if it were legal, then even if the compiler detected and monomorphized the
+// functions into only the types of the callers, which implementation would the function pointer
+// point to? There would need to be some kind of syntax for selecting the destination of the pointer
+// according to a generic argument, and in general it would be a huge mess and not worth it.
+//
+// Instead, we're going to steal a trick from `fn run_benchmark`: generate a function which is
+// itself parametrized by `Test`, which accepts a `&[u8]` parameter containing the name of the
+// benchmark, and dispatches based on that to the appropriate real test implementation. Then, we can
+// just iterate over the `Benchmarking::benchmarks` list to run the actual implementations.
+#[macro_export]
+macro_rules! impl_benchmark_test_suite {
+	// user might or might not have set some keyword arguments; set the defaults
+	//
+	// The weird syntax indicates that `rest` comes only after a comma, which is otherwise optional
+	(
+		$bench_module:ident,
+		$new_test_ext:expr,
+		$test:path
+		$(, $( $rest:tt )* )?
+	) => {
+		impl_benchmark_test_suite!(
+			@selected:
+				$bench_module,
+				$new_test_ext,
+				$test,
+				benchmarks_path = super,
+				extra = true,
+				exec_name = execute_with,
+			@user:
+				$( $( $rest )* )?
+		);
+	};
+	// pick off the benchmarks_path keyword argument
+	(
+		@selected:
+			$bench_module:ident,
+			$new_test_ext:expr,
+			$test:path,
+			benchmarks_path = $old:ident,
+			extra = $extra:expr,
+			exec_name = $exec_name:ident,
+		@user:
+			benchmarks_path = $benchmarks_path:ident
+			$(, $( $rest:tt )* )?
+	) => {
+		impl_benchmark_test_suite!(
+			@selected:
+				$bench_module,
+				$new_test_ext,
+				$test,
+				benchmarks_path = $benchmarks_path,
+				extra = $extra,
+				exec_name = $exec_name,
+			@user:
+				$( $( $rest )* )?
+		);
+	};
+	// pick off the extra keyword argument
+	(
+		@selected:
+			$bench_module:ident,
+			$new_test_ext:expr,
+			$test:path,
+			benchmarks_path = $benchmarks_path:ident,
+			extra = $old:expr,
+			exec_name = $exec_name:ident,
+		@user:
+			extra = $extra:expr
+			$(, $( $rest:tt )* )?
+	) => {
+		impl_benchmark_test_suite!(
+			@selected:
+				$bench_module,
+				$new_test_ext,
+				$test,
+				benchmarks_path = $benchmarks_path,
+				extra = $extra,
+				exec_name = $exec_name,
+			@user:
+				$( $( $rest )* )?
+		);
+	};
+	// pick off the exec_name keyword argument
+	(
+		@selected:
+			$bench_module:ident,
+			$new_test_ext:expr,
+			$test:path,
+			benchmarks_path = $benchmarks_path:ident,
+			extra = $extra:expr,
+			exec_name = $old:ident,
+		@user:
+			exec_name = $exec_name:ident
+			$(, $( $rest:tt )* )?
+	) => {
+		impl_benchmark_test_suite!(
+			@selected:
+				$bench_module,
+				$new_test_ext,
+				$test,
+				benchmarks_path = $benchmarks_path,
+				extra = $extra,
+				exec_name = $exec_name,
+			@user:
+				$( $( $rest )* )?
+		);
+	};
+	// all options set; nothing else in user-provided keyword arguments
+	(
+		@selected:
+			$bench_module:ident,
+			$new_test_ext:expr,
+			$test:path,
+			benchmarks_path = $path_to_benchmarks_invocation:ident,
+			extra = $extra:expr,
+			exec_name = $exec_name:ident,
+		@user:
+			$(,)?
+	) => {
+		#[cfg(test)]
+		mod benchmark_tests {
+			use $path_to_benchmarks_invocation::test_bench_by_name;
+			use super::$bench_module;
+
+			#[test]
+			fn test_benchmarks() {
+				$new_test_ext.$exec_name(|| {
+					use $crate::Benchmarking;
+
+					let mut anything_failed = false;
+					println!("failing benchmark tests:");
+					for benchmark_name in $bench_module::<$test>::benchmarks($extra) {
+						if let Err(err) = std::panic::catch_unwind(|| test_bench_by_name::<$test>(benchmark_name)) {
+							println!("{}: {:?}", String::from_utf8_lossy(benchmark_name), err);
+							anything_failed = true;
+						}
+					}
+					assert!(!anything_failed);
+				});
+			}
+		}
+	};
+}
+
 /// show error message and debugging info for the case of an error happening
 /// during a benchmark
 pub fn show_benchmark_debug_info(
@@ -1031,7 +1289,7 @@ macro_rules! add_benchmark {
 							*repeat,
 							whitelist,
 							*verify,
-						).map_err(|e| { 
+						).map_err(|e| {
 							$crate::show_benchmark_debug_info(
 								instance_string,
 								benchmark,
@@ -1058,7 +1316,7 @@ macro_rules! add_benchmark {
 						*repeat,
 						whitelist,
 						*verify,
-					).map_err(|e| { 
+					).map_err(|e| {
 						$crate::show_benchmark_debug_info(
 							instance_string,
 							benchmark,
diff --git a/frame/bounties/src/benchmarking.rs b/frame/bounties/src/benchmarking.rs
index f6fc11ad0bf0..632f951f05e1 100644
--- a/frame/bounties/src/benchmarking.rs
+++ b/frame/bounties/src/benchmarking.rs
@@ -23,7 +23,7 @@ use super::*;
 
 use sp_runtime::traits::Bounded;
 use frame_system::{EventRecord, RawOrigin};
-use frame_benchmarking::{benchmarks, account, whitelisted_caller};
+use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
 use frame_support::traits::OnInitialize;
 
 use crate::Module as Bounties;
@@ -220,26 +220,8 @@ benchmarks! {
 	}
 }
 
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate::tests::{new_test_ext, Test};
-	use frame_support::assert_ok;
-
-	#[test]
-	fn test_benchmarks() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(test_benchmark_propose_bounty::<Test>());
-			assert_ok!(test_benchmark_approve_bounty::<Test>());
-			assert_ok!(test_benchmark_propose_curator::<Test>());
-			assert_ok!(test_benchmark_unassign_curator::<Test>());
-			assert_ok!(test_benchmark_accept_curator::<Test>());
-			assert_ok!(test_benchmark_award_bounty::<Test>());
-			assert_ok!(test_benchmark_claim_bounty::<Test>());
-			assert_ok!(test_benchmark_close_bounty_proposed::<Test>());
-			assert_ok!(test_benchmark_close_bounty_active::<Test>());
-			assert_ok!(test_benchmark_extend_bounty_expiry::<Test>());
-			assert_ok!(test_benchmark_spend_funds::<Test>());
-		});
-	}
-}
+impl_benchmark_test_suite!(
+	Bounties,
+	crate::tests::new_test_ext(),
+	crate::tests::Test,
+);
diff --git a/frame/collective/src/benchmarking.rs b/frame/collective/src/benchmarking.rs
index bff7dad59d89..1afdd14b1ad3 100644
--- a/frame/collective/src/benchmarking.rs
+++ b/frame/collective/src/benchmarking.rs
@@ -21,7 +21,12 @@ use super::*;
 
 use frame_system::RawOrigin as SystemOrigin;
 use frame_system::EventRecord;
-use frame_benchmarking::{benchmarks_instance, account, whitelisted_caller};
+use frame_benchmarking::{
+	benchmarks_instance,
+	account,
+	whitelisted_caller,
+	impl_benchmark_test_suite,
+};
 use sp_runtime::traits::Bounded;
 use sp_std::mem::size_of;
 
@@ -42,7 +47,6 @@ fn assert_last_event<T: Config<I>, I: Instance>(generic_event: <T as Config<I>>:
 }
 
 benchmarks_instance! {
-	
 	set_members {
 		let m in 1 .. T::MaxMembers::get();
 		let n in 1 .. T::MaxMembers::get();
@@ -634,79 +638,8 @@ benchmarks_instance! {
 	}
 }
 
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate::tests::{new_test_ext, Test};
-	use frame_support::assert_ok;
-
-	#[test]
-	fn set_members() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(test_benchmark_set_members::<Test>());
-		});
-	}
-
-	#[test]
-	fn execute() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(test_benchmark_execute::<Test>());
-		});
-	}
-
-	#[test]
-	fn propose_execute() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(test_benchmark_propose_execute::<Test>());
-		});
-	}
-
-	#[test]
-	fn propose_proposed() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(test_benchmark_propose_proposed::<Test>());
-		});
-	}
-
-	#[test]
-	fn vote() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(test_benchmark_vote::<Test>());
-		});
-	}
-
-	#[test]
-	fn close_early_disapproved() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(test_benchmark_close_early_disapproved::<Test>());
-		});
-	}
-
-	#[test]
-	fn close_early_approved() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(test_benchmark_close_early_approved::<Test>());
-		});
-	}
-
-	#[test]
-	fn close_disapproved() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(test_benchmark_close_disapproved::<Test>());
-		});
-	}
-
-	#[test]
-	fn close_approved() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(test_benchmark_close_approved::<Test>());
-		});
-	}
-
-	#[test]
-	fn disapprove_proposal() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(test_benchmark_disapprove_proposal::<Test>());
-		});
-	}
-}
+impl_benchmark_test_suite!(
+	Collective,
+	crate::tests::new_test_ext(),
+	crate::tests::Test,
+);
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index a5dcc40d71ba..f982316e98b9 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -36,7 +36,7 @@ use self::{
 	},
 	sandbox::Sandbox,
 };
-use frame_benchmarking::{benchmarks, account, whitelisted_caller};
+use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
 use frame_system::{Module as System, RawOrigin};
 use parity_wasm::elements::{Instruction, ValueType, BlockType};
 use sp_runtime::traits::{Hash, Bounded, Zero};
@@ -2440,127 +2440,10 @@ benchmarks! {
 	}: {}
 }
 
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate::tests::{ExtBuilder, Test};
-	use frame_support::assert_ok;
-	use paste::paste;
-
-	macro_rules! create_test {
-		($name:ident) => {
-			#[test]
-			fn $name() {
-				ExtBuilder::default().build().execute_with(|| {
-					assert_ok!(paste!{
-						[<test_benchmark_ $name>]::<Test>()
-					});
-				});
-			}
-		}
-	}
 
-	create_test!(on_initialize);
-	create_test!(on_initialize_per_trie_key);
-	create_test!(on_initialize_per_queue_item);
-
-	create_test!(update_schedule);
-	create_test!(instantiate_with_code);
-	create_test!(instantiate);
-	create_test!(call);
-	create_test!(claim_surcharge);
-
-	create_test!(seal_caller);
-	create_test!(seal_address);
-	create_test!(seal_gas_left);
-	create_test!(seal_balance);
-	create_test!(seal_value_transferred);
-	create_test!(seal_minimum_balance);
-	create_test!(seal_tombstone_deposit);
-	create_test!(seal_rent_allowance);
-	create_test!(seal_block_number);
-	create_test!(seal_now);
-	create_test!(seal_weight_to_fee);
-	create_test!(seal_gas);
-	create_test!(seal_input);
-	create_test!(seal_input_per_kb);
-	create_test!(seal_return);
-	create_test!(seal_return_per_kb);
-	create_test!(seal_terminate);
-	create_test!(seal_restore_to);
-	create_test!(seal_restore_to_per_delta);
-	create_test!(seal_random);
-	create_test!(seal_deposit_event);
-	create_test!(seal_deposit_event_per_topic_and_kb);
-	create_test!(seal_set_rent_allowance);
-	create_test!(seal_set_storage);
-	create_test!(seal_set_storage_per_kb);
-	create_test!(seal_get_storage);
-	create_test!(seal_get_storage_per_kb);
-	create_test!(seal_transfer);
-	create_test!(seal_call);
-	create_test!(seal_call_per_transfer_input_output_kb);
-	create_test!(seal_instantiate);
-	create_test!(seal_instantiate_per_input_output_salt_kb);
-	create_test!(seal_clear_storage);
-	create_test!(seal_hash_sha2_256);
-	create_test!(seal_hash_sha2_256_per_kb);
-	create_test!(seal_hash_keccak_256);
-	create_test!(seal_hash_keccak_256_per_kb);
-	create_test!(seal_hash_blake2_256);
-	create_test!(seal_hash_blake2_256_per_kb);
-	create_test!(seal_hash_blake2_128);
-	create_test!(seal_hash_blake2_128_per_kb);
-
-	create_test!(instr_i64const);
-	create_test!(instr_i64load);
-	create_test!(instr_i64store);
-	create_test!(instr_select);
-	create_test!(instr_if);
-	create_test!(instr_br);
-	create_test!(instr_br_if);
-	create_test!(instr_br_table);
-	create_test!(instr_br_table_per_entry);
-	create_test!(instr_call);
-	create_test!(instr_call_indirect);
-	create_test!(instr_call_indirect_per_param);
-	create_test!(instr_local_get);
-	create_test!(instr_local_set);
-	create_test!(instr_local_tee);
-	create_test!(instr_global_get);
-	create_test!(instr_global_set);
-	create_test!(instr_memory_current);
-	create_test!(instr_memory_grow);
-	create_test!(instr_i64clz);
-	create_test!(instr_i64ctz);
-	create_test!(instr_i64popcnt);
-	create_test!(instr_i64eqz);
-	create_test!(instr_i64extendsi32);
-	create_test!(instr_i64extendui32);
-	create_test!(instr_i32wrapi64);
-	create_test!(instr_i64eq);
-	create_test!(instr_i64ne);
-	create_test!(instr_i64lts);
-	create_test!(instr_i64ltu);
-	create_test!(instr_i64gts);
-	create_test!(instr_i64gtu);
-	create_test!(instr_i64les);
-	create_test!(instr_i64leu);
-	create_test!(instr_i64ges);
-	create_test!(instr_i64geu);
-	create_test!(instr_i64add);
-	create_test!(instr_i64sub);
-	create_test!(instr_i64mul);
-	create_test!(instr_i64divs);
-	create_test!(instr_i64divu);
-	create_test!(instr_i64rems);
-	create_test!(instr_i64remu);
-	create_test!(instr_i64and);
-	create_test!(instr_i64or);
-	create_test!(instr_i64xor);
-	create_test!(instr_i64shl);
-	create_test!(instr_i64shrs);
-	create_test!(instr_i64shru);
-	create_test!(instr_i64rotl);
-	create_test!(instr_i64rotr);
-}
+
+impl_benchmark_test_suite!(
+	Contracts,
+	crate::tests::ExtBuilder::default().build(),
+	crate::tests::Test,
+);
diff --git a/frame/democracy/src/benchmarking.rs b/frame/democracy/src/benchmarking.rs
index c66ce20dab87..57447944d22a 100644
--- a/frame/democracy/src/benchmarking.rs
+++ b/frame/democracy/src/benchmarking.rs
@@ -19,7 +19,7 @@
 
 use super::*;
 
-use frame_benchmarking::{benchmarks, account, whitelist_account};
+use frame_benchmarking::{benchmarks, account, whitelist_account, impl_benchmark_test_suite};
 use frame_support::{
 	IterableStorageMap,
 	traits::{Currency, Get, EnsureOrigin, OnInitialize, UnfilteredDispatchable, schedule::DispatchTime},
@@ -781,44 +781,9 @@ benchmarks! {
 	}
 }
 
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate::tests::{new_test_ext, Test};
-	use frame_support::assert_ok;
-
-	#[test]
-	fn test_benchmarks() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(test_benchmark_propose::<Test>());
-			assert_ok!(test_benchmark_second::<Test>());
-			assert_ok!(test_benchmark_vote_new::<Test>());
-			assert_ok!(test_benchmark_vote_existing::<Test>());
-			assert_ok!(test_benchmark_emergency_cancel::<Test>());
-			assert_ok!(test_benchmark_external_propose::<Test>());
-			assert_ok!(test_benchmark_external_propose_majority::<Test>());
-			assert_ok!(test_benchmark_external_propose_default::<Test>());
-			assert_ok!(test_benchmark_fast_track::<Test>());
-			assert_ok!(test_benchmark_veto_external::<Test>());
-			assert_ok!(test_benchmark_cancel_referendum::<Test>());
-			assert_ok!(test_benchmark_cancel_queued::<Test>());
-			assert_ok!(test_benchmark_on_initialize_external::<Test>());
-			assert_ok!(test_benchmark_on_initialize_public::<Test>());
-			assert_ok!(test_benchmark_on_initialize_base::<Test>());
-			assert_ok!(test_benchmark_delegate::<Test>());
-			assert_ok!(test_benchmark_undelegate::<Test>());
-			assert_ok!(test_benchmark_clear_public_proposals::<Test>());
-			assert_ok!(test_benchmark_note_preimage::<Test>());
-			assert_ok!(test_benchmark_note_imminent_preimage::<Test>());
-			assert_ok!(test_benchmark_reap_preimage::<Test>());
-			assert_ok!(test_benchmark_unlock_remove::<Test>());
-			assert_ok!(test_benchmark_unlock_set::<Test>());
-			assert_ok!(test_benchmark_remove_vote::<Test>());
-			assert_ok!(test_benchmark_remove_other_vote::<Test>());
-			assert_ok!(test_benchmark_enact_proposal_execute::<Test>());
-			assert_ok!(test_benchmark_enact_proposal_slash::<Test>());
-			assert_ok!(test_benchmark_blacklist::<Test>());
-			assert_ok!(test_benchmark_cancel_proposal::<Test>());
-		});
-	}
-}
+
+impl_benchmark_test_suite!(
+	Democracy,
+	crate::tests::new_test_ext(),
+	crate::tests::Test,
+);
diff --git a/frame/elections-phragmen/src/benchmarking.rs b/frame/elections-phragmen/src/benchmarking.rs
index 511d2751a5d7..cfdcd8020795 100644
--- a/frame/elections-phragmen/src/benchmarking.rs
+++ b/frame/elections-phragmen/src/benchmarking.rs
@@ -22,7 +22,7 @@
 use super::*;
 
 use frame_system::RawOrigin;
-use frame_benchmarking::{benchmarks, account};
+use frame_benchmarking::{benchmarks, account, impl_benchmark_test_suite};
 use frame_support::traits::OnInitialize;
 
 use crate::Module as Elections;
@@ -536,84 +536,9 @@ benchmarks! {
 	}
 }
 
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate::tests::{ExtBuilder, Test};
-	use frame_support::assert_ok;
-
-	#[test]
-	fn test_benchmarks_elections_phragmen() {
-		ExtBuilder::default()
-			.desired_members(13)
-			.desired_runners_up(7)
-			.build_and_execute(|| {
-				assert_ok!(test_benchmark_vote_equal::<Test>());
-			});
-
-		ExtBuilder::default()
-			.desired_members(13)
-			.desired_runners_up(7)
-			.build_and_execute(|| {
-				assert_ok!(test_benchmark_vote_more::<Test>());
-			});
-
-		ExtBuilder::default()
-			.desired_members(13)
-			.desired_runners_up(7)
-			.build_and_execute(|| {
-				assert_ok!(test_benchmark_vote_less::<Test>());
-			});
-
-		ExtBuilder::default()
-			.desired_members(13)
-			.desired_runners_up(7)
-			.build_and_execute(|| {
-				assert_ok!(test_benchmark_remove_voter::<Test>());
-			});
-
-		ExtBuilder::default().desired_members(13).desired_runners_up(7).build_and_execute(|| {
-			assert_ok!(test_benchmark_submit_candidacy::<Test>());
-		});
-
-		ExtBuilder::default().desired_members(13).desired_runners_up(7).build_and_execute(|| {
-			assert_ok!(test_benchmark_renounce_candidacy_candidate::<Test>());
-		});
-
-		ExtBuilder::default().desired_members(13).desired_runners_up(7).build_and_execute(|| {
-			assert_ok!(test_benchmark_renounce_candidacy_runners_up::<Test>());
-		});
-
-		ExtBuilder::default().desired_members(13).desired_runners_up(7).build_and_execute(|| {
-			assert_ok!(test_benchmark_renounce_candidacy_members::<Test>());
-		});
-
-		ExtBuilder::default().desired_members(13).desired_runners_up(7).build_and_execute(|| {
-			assert_ok!(test_benchmark_remove_member_without_replacement::<Test>());
-		});
-
-		ExtBuilder::default().desired_members(13).desired_runners_up(7).build_and_execute(|| {
-			assert_ok!(test_benchmark_remove_member_with_replacement::<Test>());
-		});
-
-		ExtBuilder::default().desired_members(13).desired_runners_up(7).build_and_execute(|| {
-			assert_ok!(test_benchmark_clean_defunct_voters::<Test>());
-		});
-
-		ExtBuilder::default().desired_members(13).desired_runners_up(7).build_and_execute(|| {
-			assert_ok!(test_benchmark_election_phragmen::<Test>());
-		});
-
-		ExtBuilder::default().desired_members(13).desired_runners_up(7).build_and_execute(|| {
-			assert_ok!(test_benchmark_election_phragmen::<Test>());
-		});
-
-		ExtBuilder::default().desired_members(13).desired_runners_up(7).build_and_execute(|| {
-			assert_ok!(test_benchmark_election_phragmen_c_e::<Test>());
-		});
-
-		ExtBuilder::default().desired_members(13).desired_runners_up(7).build_and_execute(|| {
-			assert_ok!(test_benchmark_election_phragmen_v::<Test>());
-		});
-	}
-}
+impl_benchmark_test_suite!(
+	Elections,
+	crate::tests::ExtBuilder::default().desired_members(13).desired_runners_up(7),
+	crate::tests::Test,
+	exec_name = build_and_execute,
+);
diff --git a/frame/example/src/lib.rs b/frame/example/src/lib.rs
index 335c277b7c2a..763ec504ebc1 100644
--- a/frame/example/src/lib.rs
+++ b/frame/example/src/lib.rs
@@ -577,7 +577,7 @@ impl<T: Config> Module<T> {
 //
 // Note that a signed extension can also indicate that a particular data must be present in the
 // _signing payload_ of a transaction by providing an implementation for the `additional_signed`
-// method. This example will not cover this type of extension. See `CheckSpecVersion` in 
+// method. This example will not cover this type of extension. See `CheckSpecVersion` in
 // [FRAME System](https://github.com/paritytech/substrate/tree/master/frame/system#signed-extensions)
 // for an example.
 //
@@ -652,7 +652,7 @@ where
 #[cfg(feature = "runtime-benchmarks")]
 mod benchmarking {
 	use super::*;
-	use frame_benchmarking::{benchmarks, account};
+	use frame_benchmarking::{benchmarks, account, impl_benchmark_test_suite};
 	use frame_system::RawOrigin;
 
 	benchmarks!{
@@ -684,22 +684,7 @@ mod benchmarking {
 		}
 	}
 
-	#[cfg(test)]
-	mod tests {
-		use super::*;
-		use crate::tests::{new_test_ext, Test};
-		use frame_support::assert_ok;
-
-		#[test]
-		fn test_benchmarks() {
-			new_test_ext().execute_with(|| {
-				assert_ok!(test_benchmark_accumulate_dummy::<Test>());
-				assert_ok!(test_benchmark_set_dummy::<Test>());
-				assert_ok!(test_benchmark_another_set_dummy::<Test>());
-				assert_ok!(test_benchmark_sort_vector::<Test>());
-			});
-		}
-	}
+	impl_benchmark_test_suite!(Module, crate::tests::new_test_ext(), crate::tests::Test);
 }
 
 #[cfg(test)]
diff --git a/frame/identity/src/benchmarking.rs b/frame/identity/src/benchmarking.rs
index e916bdfa5046..645b3817d6ec 100644
--- a/frame/identity/src/benchmarking.rs
+++ b/frame/identity/src/benchmarking.rs
@@ -22,7 +22,7 @@
 use super::*;
 
 use frame_system::{EventRecord, RawOrigin};
-use frame_benchmarking::{benchmarks, account, whitelisted_caller};
+use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
 use sp_runtime::traits::Bounded;
 
 use crate::Module as Identity;
@@ -403,31 +403,8 @@ benchmarks! {
 
 }
 
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate::tests::{new_test_ext, Test};
-	use frame_support::assert_ok;
-
-	#[test]
-	fn test_benchmarks() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(test_benchmark_add_registrar::<Test>());
-			assert_ok!(test_benchmark_set_identity::<Test>());
-			assert_ok!(test_benchmark_set_subs_new::<Test>());
-			assert_ok!(test_benchmark_set_subs_old::<Test>());
-			assert_ok!(test_benchmark_clear_identity::<Test>());
-			assert_ok!(test_benchmark_request_judgement::<Test>());
-			assert_ok!(test_benchmark_cancel_request::<Test>());
-			assert_ok!(test_benchmark_set_fee::<Test>());
-			assert_ok!(test_benchmark_set_account_id::<Test>());
-			assert_ok!(test_benchmark_set_fields::<Test>());
-			assert_ok!(test_benchmark_provide_judgement::<Test>());
-			assert_ok!(test_benchmark_kill_identity::<Test>());
-			assert_ok!(test_benchmark_add_sub::<Test>());
-			assert_ok!(test_benchmark_rename_sub::<Test>());
-			assert_ok!(test_benchmark_remove_sub::<Test>());
-			assert_ok!(test_benchmark_quit_sub::<Test>());
-		});
-	}
-}
+impl_benchmark_test_suite!(
+	Identity,
+	crate::tests::new_test_ext(),
+	crate::tests::Test,
+);
diff --git a/frame/im-online/src/benchmarking.rs b/frame/im-online/src/benchmarking.rs
index ef7f66307a99..287a2c6fd3a7 100644
--- a/frame/im-online/src/benchmarking.rs
+++ b/frame/im-online/src/benchmarking.rs
@@ -22,7 +22,7 @@
 use super::*;
 
 use frame_system::RawOrigin;
-use frame_benchmarking::benchmarks;
+use frame_benchmarking::{benchmarks, impl_benchmark_test_suite};
 use sp_core::OpaquePeerId;
 use sp_core::offchain::OpaqueMultiaddr;
 use sp_runtime::traits::{ValidateUnsigned, Zero};
@@ -91,18 +91,9 @@ benchmarks! {
 	}
 }
 
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate::mock::{new_test_ext, Runtime};
-	use frame_support::assert_ok;
-
-	#[test]
-	fn test_benchmarks() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(test_benchmark_heartbeat::<Runtime>());
-			assert_ok!(test_benchmark_validate_unsigned::<Runtime>());
-			assert_ok!(test_benchmark_validate_unsigned_and_then_heartbeat::<Runtime>());
-		});
-	}
-}
+
+impl_benchmark_test_suite!(
+	ImOnline,
+	crate::mock::new_test_ext(),
+	crate::mock::Runtime,
+);
diff --git a/frame/indices/src/benchmarking.rs b/frame/indices/src/benchmarking.rs
index f83e05ee9c62..6ea39e9ccc23 100644
--- a/frame/indices/src/benchmarking.rs
+++ b/frame/indices/src/benchmarking.rs
@@ -21,7 +21,7 @@
 
 use super::*;
 use frame_system::RawOrigin;
-use frame_benchmarking::{benchmarks, account, whitelisted_caller};
+use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
 use sp_runtime::traits::Bounded;
 
 use crate::Module as Indices;
@@ -93,20 +93,9 @@ benchmarks! {
 	// TODO in another PR: lookup and unlookup trait weights (not critical)
 }
 
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate::mock::{new_test_ext, Test};
-	use frame_support::assert_ok;
 
-	#[test]
-	fn test_benchmarks() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(test_benchmark_claim::<Test>());
-			assert_ok!(test_benchmark_transfer::<Test>());
-			assert_ok!(test_benchmark_free::<Test>());
-			assert_ok!(test_benchmark_force_transfer::<Test>());
-			assert_ok!(test_benchmark_freeze::<Test>());
-		});
-	}
-}
+impl_benchmark_test_suite!(
+	Indices,
+	crate::mock::new_test_ext(),
+	crate::mock::Test,
+);
diff --git a/frame/lottery/src/benchmarking.rs b/frame/lottery/src/benchmarking.rs
index b9b0d7fd0002..a2b8946ecc49 100644
--- a/frame/lottery/src/benchmarking.rs
+++ b/frame/lottery/src/benchmarking.rs
@@ -23,7 +23,7 @@ use super::*;
 
 use frame_system::RawOrigin;
 use frame_support::traits::{OnInitialize, UnfilteredDispatchable};
-use frame_benchmarking::{benchmarks, account, whitelisted_caller};
+use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
 use sp_runtime::traits::{Bounded, Zero};
 
 use crate::Module as Lottery;
@@ -170,21 +170,8 @@ benchmarks! {
 	}
 }
 
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate::mock::{new_test_ext, Test};
-	use frame_support::assert_ok;
-
-	#[test]
-	fn test_benchmarks() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(test_benchmark_buy_ticket::<Test>());
-			assert_ok!(test_benchmark_set_calls::<Test>());
-			assert_ok!(test_benchmark_start_lottery::<Test>());
-			assert_ok!(test_benchmark_stop_repeat::<Test>());
-			assert_ok!(test_benchmark_on_initialize_end::<Test>());
-			assert_ok!(test_benchmark_on_initialize_repeat::<Test>());
-		});
-	}
-}
+impl_benchmark_test_suite!(
+	Lottery,
+	crate::mock::new_test_ext(),
+	crate::mock::Test,
+);
diff --git a/frame/merkle-mountain-range/src/benchmarking.rs b/frame/merkle-mountain-range/src/benchmarking.rs
index e6b3cf7f2172..750a140382b9 100644
--- a/frame/merkle-mountain-range/src/benchmarking.rs
+++ b/frame/merkle-mountain-range/src/benchmarking.rs
@@ -21,7 +21,7 @@
 
 use crate::*;
 use frame_support::traits::OnInitialize;
-use frame_benchmarking::benchmarks;
+use frame_benchmarking::{benchmarks, impl_benchmark_test_suite};
 use sp_std::prelude::*;
 
 benchmarks! {
@@ -38,17 +38,8 @@ benchmarks! {
 	}
 }
 
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate::mock::*;
-	use crate::tests::new_test_ext;
-	use frame_support::assert_ok;
-
-	#[test]
-	fn test_benchmarks() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(test_benchmark_on_initialize::<Test>());
-		})
-	}
-}
+impl_benchmark_test_suite!(
+	Module,
+	crate::tests::new_test_ext(),
+	crate::mock::Test,
+);
diff --git a/frame/multisig/src/benchmarking.rs b/frame/multisig/src/benchmarking.rs
index 748223072b99..b530a9639602 100644
--- a/frame/multisig/src/benchmarking.rs
+++ b/frame/multisig/src/benchmarking.rs
@@ -21,7 +21,7 @@
 
 use super::*;
 use frame_system::RawOrigin;
-use frame_benchmarking::{benchmarks, account};
+use frame_benchmarking::{benchmarks, account, impl_benchmark_test_suite};
 use sp_runtime::traits::Bounded;
 use core::convert::TryInto;
 
@@ -298,25 +298,8 @@ benchmarks! {
 	}
 }
 
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate::tests::{new_test_ext, Test};
-	use frame_support::assert_ok;
-
-	#[test]
-	fn test_benchmarks() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(test_benchmark_as_multi_threshold_1::<Test>());
-			assert_ok!(test_benchmark_as_multi_create::<Test>());
-			assert_ok!(test_benchmark_as_multi_create_store::<Test>());
-			assert_ok!(test_benchmark_as_multi_approve::<Test>());
-			assert_ok!(test_benchmark_as_multi_approve_store::<Test>());
-			assert_ok!(test_benchmark_as_multi_complete::<Test>());
-			assert_ok!(test_benchmark_approve_as_multi_create::<Test>());
-			assert_ok!(test_benchmark_approve_as_multi_approve::<Test>());
-			assert_ok!(test_benchmark_approve_as_multi_complete::<Test>());
-			assert_ok!(test_benchmark_cancel_as_multi::<Test>());
-		});
-	}
-}
+impl_benchmark_test_suite!(
+	Multisig,
+	crate::tests::new_test_ext(),
+	crate::tests::Test,
+);
diff --git a/frame/offences/benchmarking/src/lib.rs b/frame/offences/benchmarking/src/lib.rs
index 57672f13ed71..a14e4cf5d29e 100644
--- a/frame/offences/benchmarking/src/lib.rs
+++ b/frame/offences/benchmarking/src/lib.rs
@@ -25,7 +25,7 @@ use sp_std::prelude::*;
 use sp_std::vec;
 
 use frame_system::{RawOrigin, Module as System, Config as SystemConfig};
-use frame_benchmarking::{benchmarks, account};
+use frame_benchmarking::{benchmarks, account, impl_benchmark_test_suite};
 use frame_support::traits::{Currency, OnInitialize, ValidatorSet, ValidatorSetWithIdentification};
 
 use sp_runtime::{Perbill, traits::{Convert, StaticLookup, Saturating, UniqueSaturatedInto}};
@@ -420,19 +420,8 @@ benchmarks! {
 	}
 }
 
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate::mock::{new_test_ext, Test};
-	use frame_support::assert_ok;
-
-	#[test]
-	fn test_benchmarks() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(test_benchmark_report_offence_im_online::<Test>());
-			assert_ok!(test_benchmark_report_offence_grandpa::<Test>());
-			assert_ok!(test_benchmark_report_offence_babe::<Test>());
-			assert_ok!(test_benchmark_on_initialize::<Test>());
-		});
-	}
-}
+impl_benchmark_test_suite!(
+	Module,
+	crate::mock::new_test_ext(),
+	crate::mock::Test,
+);
diff --git a/frame/proxy/src/benchmarking.rs b/frame/proxy/src/benchmarking.rs
index 29c2e475c64f..130c98001187 100644
--- a/frame/proxy/src/benchmarking.rs
+++ b/frame/proxy/src/benchmarking.rs
@@ -21,7 +21,7 @@
 
 use super::*;
 use frame_system::{RawOrigin, EventRecord};
-use frame_benchmarking::{benchmarks, account, whitelisted_caller};
+use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
 use sp_runtime::traits::Bounded;
 use crate::Module as Proxy;
 
@@ -251,25 +251,8 @@ benchmarks! {
 	}
 }
 
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate::tests::{new_test_ext, Test};
-	use frame_support::assert_ok;
-
-	#[test]
-	fn test_benchmarks() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(test_benchmark_proxy::<Test>());
-			assert_ok!(test_benchmark_proxy_announced::<Test>());
-			assert_ok!(test_benchmark_remove_announcement::<Test>());
-			assert_ok!(test_benchmark_reject_announcement::<Test>());
-			assert_ok!(test_benchmark_announce::<Test>());
-			assert_ok!(test_benchmark_add_proxy::<Test>());
-			assert_ok!(test_benchmark_remove_proxy::<Test>());
-			assert_ok!(test_benchmark_remove_proxies::<Test>());
-			assert_ok!(test_benchmark_anonymous::<Test>());
-			assert_ok!(test_benchmark_kill_anonymous::<Test>());
-		});
-	}
-}
+impl_benchmark_test_suite!(
+	Proxy,
+	crate::tests::new_test_ext(),
+	crate::tests::Test,
+);
diff --git a/frame/scheduler/src/benchmarking.rs b/frame/scheduler/src/benchmarking.rs
index defc334ba736..37ccb900a824 100644
--- a/frame/scheduler/src/benchmarking.rs
+++ b/frame/scheduler/src/benchmarking.rs
@@ -23,7 +23,7 @@ use super::*;
 use sp_std::{vec, prelude::*};
 use frame_system::RawOrigin;
 use frame_support::{ensure, traits::OnInitialize};
-use frame_benchmarking::benchmarks;
+use frame_benchmarking::{benchmarks, impl_benchmark_test_suite};
 
 use crate::Module as Scheduler;
 use frame_system::Module as System;
@@ -141,20 +141,8 @@ benchmarks! {
 	}
 }
 
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate::tests::{new_test_ext, Test};
-	use frame_support::assert_ok;
-
-	#[test]
-	fn test_benchmarks() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(test_benchmark_schedule::<Test>());
-			assert_ok!(test_benchmark_cancel::<Test>());
-			assert_ok!(test_benchmark_schedule_named::<Test>());
-			assert_ok!(test_benchmark_cancel_named::<Test>());
-			assert_ok!(test_benchmark_on_initialize::<Test>());
-		});
-	}
-}
+impl_benchmark_test_suite!(
+	Scheduler,
+	crate::tests::new_test_ext(),
+	crate::tests::Test,
+);
diff --git a/frame/session/benchmarking/src/lib.rs b/frame/session/benchmarking/src/lib.rs
index 06dfa3da3494..8546800ee4fd 100644
--- a/frame/session/benchmarking/src/lib.rs
+++ b/frame/session/benchmarking/src/lib.rs
@@ -25,7 +25,7 @@ mod mock;
 use sp_std::prelude::*;
 use sp_std::vec;
 
-use frame_benchmarking::benchmarks;
+use frame_benchmarking::{benchmarks, impl_benchmark_test_suite};
 use frame_support::{
 	codec::Decode,
 	storage::StorageValue,
@@ -169,17 +169,9 @@ fn check_membership_proof_setup<T: Config>(
 	(key, Historical::<T>::prove(key).unwrap())
 }
 
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate::mock::{new_test_ext, Test};
-	use frame_support::assert_ok;
-
-	#[test]
-	fn test_benchmarks() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(test_benchmark_set_keys::<Test>());
-			assert_ok!(test_benchmark_purge_keys::<Test>());
-		});
-	}
-}
+impl_benchmark_test_suite!(
+	Module,
+	crate::mock::new_test_ext(),
+	crate::mock::Test,
+	extra = false,
+);
diff --git a/frame/staking/src/benchmarking.rs b/frame/staking/src/benchmarking.rs
index beddc326b510..ecaa9889b5fb 100644
--- a/frame/staking/src/benchmarking.rs
+++ b/frame/staking/src/benchmarking.rs
@@ -24,7 +24,13 @@ use testing_utils::*;
 use sp_npos_elections::CompactSolution;
 use sp_runtime::traits::One;
 use frame_system::RawOrigin;
-pub use frame_benchmarking::{benchmarks, account, whitelisted_caller, whitelist_account};
+pub use frame_benchmarking::{
+	benchmarks,
+	account,
+	whitelisted_caller,
+	whitelist_account,
+	impl_benchmark_test_suite,
+};
 const SEED: u32 = 0;
 const MAX_SPANS: u32 = 100;
 const MAX_VALIDATORS: u32 = 1000;
@@ -861,40 +867,6 @@ mod tests {
 		});
 	}
 
-	#[test]
-	fn test_benchmarks() {
-		ExtBuilder::default().has_stakers(true).build().execute_with(|| {
-			assert_ok!(test_benchmark_bond::<Test>());
-			assert_ok!(test_benchmark_bond_extra::<Test>());
-			assert_ok!(test_benchmark_unbond::<Test>());
-			assert_ok!(test_benchmark_withdraw_unbonded_update::<Test>());
-			assert_ok!(test_benchmark_withdraw_unbonded_kill::<Test>());
-			assert_ok!(test_benchmark_validate::<Test>());
-			assert_ok!(test_benchmark_kick::<Test>());
-			assert_ok!(test_benchmark_nominate::<Test>());
-			assert_ok!(test_benchmark_chill::<Test>());
-			assert_ok!(test_benchmark_set_payee::<Test>());
-			assert_ok!(test_benchmark_set_controller::<Test>());
-			assert_ok!(test_benchmark_set_validator_count::<Test>());
-			assert_ok!(test_benchmark_force_no_eras::<Test>());
-			assert_ok!(test_benchmark_force_new_era::<Test>());
-			assert_ok!(test_benchmark_force_new_era_always::<Test>());
-			assert_ok!(test_benchmark_set_invulnerables::<Test>());
-			assert_ok!(test_benchmark_force_unstake::<Test>());
-			assert_ok!(test_benchmark_cancel_deferred_slash::<Test>());
-			assert_ok!(test_benchmark_payout_stakers_dead_controller::<Test>());
-			assert_ok!(test_benchmark_payout_stakers_alive_staked::<Test>());
-			assert_ok!(test_benchmark_rebond::<Test>());
-			assert_ok!(test_benchmark_set_history_depth::<Test>());
-			assert_ok!(test_benchmark_reap_stash::<Test>());
-			assert_ok!(test_benchmark_new_era::<Test>());
-			assert_ok!(test_benchmark_do_slash::<Test>());
-			assert_ok!(test_benchmark_payout_all::<Test>());
-			// only run one of them to same time on the CI. ignore the other two.
-			assert_ok!(test_benchmark_submit_solution_initial::<Test>());
-		});
-	}
-
 	#[test]
 	#[ignore]
 	fn test_benchmarks_offchain() {
@@ -905,3 +877,9 @@ mod tests {
 	}
 
 }
+
+impl_benchmark_test_suite!(
+	Staking,
+	crate::mock::ExtBuilder::default().has_stakers(true).build(),
+	crate::mock::Test,
+);
diff --git a/frame/system/benchmarking/src/lib.rs b/frame/system/benchmarking/src/lib.rs
index 9ff749950ab5..a23ea07df0ea 100644
--- a/frame/system/benchmarking/src/lib.rs
+++ b/frame/system/benchmarking/src/lib.rs
@@ -24,7 +24,7 @@ use sp_std::vec;
 use sp_std::prelude::*;
 use sp_core::{ChangesTrieConfiguration, storage::well_known_keys};
 use sp_runtime::traits::Hash;
-use frame_benchmarking::{benchmarks, whitelisted_caller};
+use frame_benchmarking::{benchmarks, whitelisted_caller, impl_benchmark_test_suite};
 use frame_support::{
 	storage,
 	traits::Get,
@@ -138,22 +138,8 @@ benchmarks! {
 	}
 }
 
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate::mock::{new_test_ext, Test};
-	use frame_support::assert_ok;
-
-	#[test]
-	fn test_benchmarks() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(test_benchmark_remark::<Test>());
-			assert_ok!(test_benchmark_set_heap_pages::<Test>());
-			assert_ok!(test_benchmark_set_code_without_checks::<Test>());
-			assert_ok!(test_benchmark_set_changes_trie_config::<Test>());
-			assert_ok!(test_benchmark_set_storage::<Test>());
-			assert_ok!(test_benchmark_kill_storage::<Test>());
-			assert_ok!(test_benchmark_kill_prefix::<Test>());
-		});
-	}
-}
+impl_benchmark_test_suite!(
+	Module,
+	crate::mock::new_test_ext(),
+	crate::mock::Test,
+);
diff --git a/frame/timestamp/src/benchmarking.rs b/frame/timestamp/src/benchmarking.rs
index ad249cbae69f..57b8ce2d1b70 100644
--- a/frame/timestamp/src/benchmarking.rs
+++ b/frame/timestamp/src/benchmarking.rs
@@ -23,7 +23,7 @@ use super::*;
 use sp_std::prelude::*;
 use frame_system::RawOrigin;
 use frame_support::{ensure, traits::OnFinalize};
-use frame_benchmarking::{benchmarks, TrackedStorageKey};
+use frame_benchmarking::{benchmarks, TrackedStorageKey, impl_benchmark_test_suite};
 
 use crate::Module as Timestamp;
 
@@ -57,17 +57,8 @@ benchmarks! {
 	}
 }
 
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate::tests::{new_test_ext, Test};
-	use frame_support::assert_ok;
-
-	#[test]
-	fn test_benchmarks() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(test_benchmark_set::<Test>());
-			assert_ok!(test_benchmark_on_finalize::<Test>());
-		});
-	}
-}
+impl_benchmark_test_suite!(
+	Timestamp,
+	crate::tests::new_test_ext(),
+	crate::tests::Test,
+);
diff --git a/frame/tips/src/benchmarking.rs b/frame/tips/src/benchmarking.rs
index e05afc0b2ab2..e6a0284d8230 100644
--- a/frame/tips/src/benchmarking.rs
+++ b/frame/tips/src/benchmarking.rs
@@ -22,7 +22,7 @@
 use super::*;
 
 use frame_system::RawOrigin;
-use frame_benchmarking::{benchmarks, account, whitelisted_caller};
+use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
 use sp_runtime::{traits::{Saturating}};
 
 use crate::Module as TipsMod;
@@ -193,21 +193,8 @@ benchmarks! {
 	}: _(RawOrigin::Root, hash)
 }
 
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate::tests::{new_test_ext, Test};
-	use frame_support::assert_ok;
-
-	#[test]
-	fn test_benchmarks() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(test_benchmark_report_awesome::<Test>());
-			assert_ok!(test_benchmark_retract_tip::<Test>());
-			assert_ok!(test_benchmark_tip_new::<Test>());
-			assert_ok!(test_benchmark_tip::<Test>());
-			assert_ok!(test_benchmark_close_tip::<Test>());
-			assert_ok!(test_benchmark_slash_tip::<Test>());
-		});
-	}
-}
+impl_benchmark_test_suite!(
+	TipsMod,
+	crate::tests::new_test_ext(),
+	crate::tests::Test,
+);
diff --git a/frame/treasury/src/benchmarking.rs b/frame/treasury/src/benchmarking.rs
index 9cb214420ca4..119516fe2741 100644
--- a/frame/treasury/src/benchmarking.rs
+++ b/frame/treasury/src/benchmarking.rs
@@ -22,7 +22,7 @@
 use super::*;
 
 use frame_system::RawOrigin;
-use frame_benchmarking::{benchmarks_instance, account};
+use frame_benchmarking::{benchmarks_instance, account, impl_benchmark_test_suite};
 use frame_support::traits::OnInitialize;
 
 use crate::Module as Treasury;
@@ -66,7 +66,7 @@ fn setup_pot_account<T: Config<I>, I: Instance>() {
 }
 
 benchmarks_instance! {
-	
+
 	propose_spend {
 		let (caller, value, beneficiary_lookup) = setup_proposal::<T, _>(SEED);
 		// Whitelist caller account from further DB operations.
@@ -103,19 +103,8 @@ benchmarks_instance! {
 	}
 }
 
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate::tests::{new_test_ext, Test};
-	use frame_support::assert_ok;
-
-	#[test]
-	fn test_benchmarks() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(test_benchmark_propose_spend::<Test>());
-			assert_ok!(test_benchmark_reject_proposal::<Test>());
-			assert_ok!(test_benchmark_approve_proposal::<Test>());
-			assert_ok!(test_benchmark_on_initialize_proposals::<Test>());
-		});
-	}
-}
+impl_benchmark_test_suite!(
+	Treasury,
+	crate::tests::new_test_ext(),
+	crate::tests::Test,
+);
diff --git a/frame/utility/src/benchmarking.rs b/frame/utility/src/benchmarking.rs
index 24de60215799..79fb569c77a5 100644
--- a/frame/utility/src/benchmarking.rs
+++ b/frame/utility/src/benchmarking.rs
@@ -21,7 +21,7 @@
 
 use super::*;
 use frame_system::{RawOrigin, EventRecord};
-use frame_benchmarking::{benchmarks, account, whitelisted_caller};
+use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
 
 const SEED: u32 = 0;
 
@@ -69,18 +69,8 @@ benchmarks! {
 	}
 }
 
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate::tests::{new_test_ext, Test};
-	use frame_support::assert_ok;
-
-	#[test]
-	fn test_benchmarks() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(test_benchmark_batch::<Test>());
-			assert_ok!(test_benchmark_as_derivative::<Test>());
-			assert_ok!(test_benchmark_batch_all::<Test>());
-		});
-	}
-}
+impl_benchmark_test_suite!(
+	Module,
+	crate::tests::new_test_ext(),
+	crate::tests::Test,
+);
diff --git a/frame/vesting/src/benchmarking.rs b/frame/vesting/src/benchmarking.rs
index f65011050422..937f2b033d84 100644
--- a/frame/vesting/src/benchmarking.rs
+++ b/frame/vesting/src/benchmarking.rs
@@ -22,7 +22,7 @@
 use super::*;
 
 use frame_system::{RawOrigin, Module as System};
-use frame_benchmarking::{benchmarks, account, whitelisted_caller};
+use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
 use sp_runtime::traits::Bounded;
 
 use crate::Module as Vesting;
@@ -224,21 +224,8 @@ benchmarks! {
 	}
 }
 
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate::tests::{ExtBuilder, Test};
-	use frame_support::assert_ok;
-
-	#[test]
-	fn test_benchmarks() {
-		ExtBuilder::default().existential_deposit(256).build().execute_with(|| {
-			assert_ok!(test_benchmark_vest_locked::<Test>());
-			assert_ok!(test_benchmark_vest_unlocked::<Test>());
-			assert_ok!(test_benchmark_vest_other_locked::<Test>());
-			assert_ok!(test_benchmark_vest_other_unlocked::<Test>());
-			assert_ok!(test_benchmark_vested_transfer::<Test>());
-			assert_ok!(test_benchmark_force_vested_transfer::<Test>());
-		});
-	}
-}
+impl_benchmark_test_suite!(
+	Vesting,
+	crate::tests::ExtBuilder::default().existential_deposit(256).build(),
+	crate::tests::Test,
+);

From 5e8df3953b9f9d933b98c2c17dd856f7074bd497 Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Tue, 16 Feb 2021 14:26:53 +0100
Subject: [PATCH 0400/1194] Move dust collection hook to outside of account
 mutate (#8087)

* Move dust collection hook to outside of account mutate

* Fix dust cleanup in nested mutates.

* Fixes

* Fixes

* Apply suggestions from code review

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* dust removal reentrancy test case integration (#8133)

* dust removal reentrancy test case integration

* Update frame/balances/src/tests_reentrancy.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Update frame/balances/src/tests_reentrancy.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Update frame/balances/src/tests_reentrancy.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Update frame/balances/src/tests_reentrancy.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Update frame/balances/src/tests_reentrancy.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* dust removal reentrancy test case integration | removed dependency on tests.rs

* dust removal reentrancy test case integration | formatt correction

* dust removal reentrancy test case integration | formatt correction

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: RK <r.raajey@gmail.com>
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
---
 frame/balances/src/lib.rs              | 173 +++++++++-----
 frame/balances/src/tests.rs            |   2 +-
 frame/balances/src/tests_local.rs      |   2 +-
 frame/balances/src/tests_reentrancy.rs | 310 +++++++++++++++++++++++++
 4 files changed, 427 insertions(+), 60 deletions(-)
 create mode 100644 frame/balances/src/tests_reentrancy.rs

diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index e3eb9478b649..ddaab519fa31 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -151,6 +151,7 @@
 mod tests;
 mod tests_local;
 mod tests_composite;
+mod tests_reentrancy;
 mod benchmarking;
 pub mod weights;
 
@@ -618,6 +619,17 @@ impl Default for Releases {
 	}
 }
 
+pub struct DustCleaner<T: Config<I>, I: 'static = ()>(Option<(T::AccountId, NegativeImbalance<T, I>)>);
+
+impl<T: Config<I>, I: 'static> Drop for DustCleaner<T, I> {
+	fn drop(&mut self) {
+		if let Some((who, dust)) = self.0.take() {
+			Module::<T, I>::deposit_event(Event::DustLost(who, dust.peek()));
+			T::DustRemoval::on_unbalanced(dust);
+		}
+	}
+}
+
 impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	/// Get the free balance of an account.
 	pub fn free_balance(who: impl sp_std::borrow::Borrow<T::AccountId>) -> T::Balance {
@@ -646,25 +658,27 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		T::AccountStore::get(&who)
 	}
 
-	/// Places the `free` and `reserved` parts of `new` into `account`. Also does any steps needed
-	/// after mutating an account. This includes DustRemoval unbalancing, in the case than the `new`
-	/// account's total balance is non-zero but below ED.
+	/// Handles any steps needed after mutating an account.
+	///
+	/// This includes DustRemoval unbalancing, in the case than the `new` account's total balance
+	/// is non-zero but below ED.
 	///
-	/// Returns the final free balance, iff the account was previously of total balance zero, known
-	/// as its "endowment".
+	/// Returns two values:
+	/// - `Some` containing the the `new` account, iff the account has sufficient balance.
+	/// - `Some` containing the dust to be dropped, iff some dust should be dropped.
 	fn post_mutation(
-		who: &T::AccountId,
+		_who: &T::AccountId,
 		new: AccountData<T::Balance>,
-	) -> Option<AccountData<T::Balance>> {
+	) -> (Option<AccountData<T::Balance>>, Option<NegativeImbalance<T, I>>) {
 		let total = new.total();
 		if total < T::ExistentialDeposit::get() {
-			if !total.is_zero() {
-				T::DustRemoval::on_unbalanced(NegativeImbalance::new(total));
-				Self::deposit_event(Event::DustLost(who.clone(), total));
+			if total.is_zero() {
+				(None, None)
+			} else {
+				(None, Some(NegativeImbalance::new(total)))
 			}
-			None
 		} else {
-			Some(new)
+			(Some(new), None)
 		}
 	}
 
@@ -696,19 +710,46 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		who: &T::AccountId,
 		f: impl FnOnce(&mut AccountData<T::Balance>, bool) -> Result<R, E>
 	) -> Result<R, E> {
-		T::AccountStore::try_mutate_exists(who, |maybe_account| {
+		Self::try_mutate_account_with_dust(who, f)
+			.map(|(result, dust_cleaner)| {
+				drop(dust_cleaner);
+				result
+			})
+	}
+
+	/// Mutate an account to some new value, or delete it entirely with `None`. Will enforce
+	/// `ExistentialDeposit` law, annulling the account as needed. This will do nothing if the
+	/// result of `f` is an `Err`.
+	///
+	/// It returns both the result from the closure, and an optional `DustCleaner` instance which
+	/// should be dropped once it is known that all nested mutates that could affect storage items
+	/// what the dust handler touches have completed.
+	///
+	/// NOTE: Doesn't do any preparatory work for creating a new account, so should only be used
+	/// when it is known that the account already exists.
+	///
+	/// NOTE: LOW-LEVEL: This will not attempt to maintain total issuance. It is expected that
+	/// the caller will do this.
+	fn try_mutate_account_with_dust<R, E: From<StoredMapError>>(
+		who: &T::AccountId,
+		f: impl FnOnce(&mut AccountData<T::Balance>, bool) -> Result<R, E>
+	) -> Result<(R, DustCleaner<T, I>), E> {
+		let result = T::AccountStore::try_mutate_exists(who, |maybe_account| {
 			let is_new = maybe_account.is_none();
 			let mut account = maybe_account.take().unwrap_or_default();
 			f(&mut account, is_new).map(move |result| {
 				let maybe_endowed = if is_new { Some(account.free) } else { None };
-				*maybe_account = Self::post_mutation(who, account);
-				(maybe_endowed, result)
+				let maybe_account_maybe_dust = Self::post_mutation(who, account);
+				*maybe_account = maybe_account_maybe_dust.0;
+				(maybe_endowed, maybe_account_maybe_dust.1, result)
 			})
-		}).map(|(maybe_endowed, result)| {
+		});
+		result.map(|(maybe_endowed, maybe_dust, result)| {
 			if let Some(endowed) = maybe_endowed {
 				Self::deposit_event(Event::Endowed(who.clone(), endowed));
 			}
-			result
+			let dust_cleaner = DustCleaner(maybe_dust.map(|dust| (who.clone(), dust)));
+			(result, dust_cleaner)
 		})
 	}
 
@@ -772,7 +813,7 @@ mod imbalances {
 	/// funds have been created without any equal and opposite accounting.
 	#[must_use]
 	#[derive(RuntimeDebug, PartialEq, Eq)]
-	pub struct PositiveImbalance<T: Config<I>, I: 'static>(T::Balance);
+	pub struct PositiveImbalance<T: Config<I>, I: 'static = ()>(T::Balance);
 
 	impl<T: Config<I>, I: 'static> PositiveImbalance<T, I> {
 		/// Create a new positive imbalance from a balance.
@@ -785,7 +826,7 @@ mod imbalances {
 	/// funds have been destroyed without any equal and opposite accounting.
 	#[must_use]
 	#[derive(RuntimeDebug, PartialEq, Eq)]
-	pub struct NegativeImbalance<T: Config<I>, I: 'static>(T::Balance);
+	pub struct NegativeImbalance<T: Config<I>, I: 'static = ()>(T::Balance);
 
 	impl<T: Config<I>, I: 'static> NegativeImbalance<T, I> {
 		/// Create a new negative imbalance from a balance.
@@ -1001,34 +1042,40 @@ impl<T: Config<I>, I: 'static> Currency<T::AccountId> for Pallet<T, I> where
 	) -> DispatchResult {
 		if value.is_zero() || transactor == dest { return Ok(()) }
 
-		Self::try_mutate_account(dest, |to_account, _| -> DispatchResult {
-			Self::try_mutate_account(transactor, |from_account, _| -> DispatchResult {
-				from_account.free = from_account.free.checked_sub(&value)
-					.ok_or(Error::<T, I>::InsufficientBalance)?;
-
-				// NOTE: total stake being stored in the same type means that this could never overflow
-				// but better to be safe than sorry.
-				to_account.free = to_account.free.checked_add(&value).ok_or(Error::<T, I>::Overflow)?;
-
-				let ed = T::ExistentialDeposit::get();
-				ensure!(to_account.total() >= ed, Error::<T, I>::ExistentialDeposit);
-
-				Self::ensure_can_withdraw(
+		Self::try_mutate_account_with_dust(
+			dest,
+			|to_account, _| -> Result<DustCleaner<T, I>, DispatchError> {
+				Self::try_mutate_account_with_dust(
 					transactor,
-					value,
-					WithdrawReasons::TRANSFER,
-					from_account.free,
-				).map_err(|_| Error::<T, I>::LiquidityRestrictions)?;
-
-				// TODO: This is over-conservative. There may now be other providers, and this pallet
-				//   may not even be a provider.
-				let allow_death = existence_requirement == ExistenceRequirement::AllowDeath;
-				let allow_death = allow_death && !system::Pallet::<T>::is_provider_required(transactor);
-				ensure!(allow_death || from_account.free >= ed, Error::<T, I>::KeepAlive);
-
-				Ok(())
-			})
-		})?;
+					|from_account, _| -> DispatchResult {
+						from_account.free = from_account.free.checked_sub(&value)
+							.ok_or(Error::<T, I>::InsufficientBalance)?;
+
+						// NOTE: total stake being stored in the same type means that this could never overflow
+						// but better to be safe than sorry.
+						to_account.free = to_account.free.checked_add(&value).ok_or(Error::<T, I>::Overflow)?;
+
+						let ed = T::ExistentialDeposit::get();
+						ensure!(to_account.total() >= ed, Error::<T, I>::ExistentialDeposit);
+
+						Self::ensure_can_withdraw(
+							transactor,
+							value,
+							WithdrawReasons::TRANSFER,
+							from_account.free,
+						).map_err(|_| Error::<T, I>::LiquidityRestrictions)?;
+
+						// TODO: This is over-conservative. There may now be other providers, and this pallet
+						//   may not even be a provider.
+						let allow_death = existence_requirement == ExistenceRequirement::AllowDeath;
+						let allow_death = allow_death && !system::Pallet::<T>::is_provider_required(transactor);
+						ensure!(allow_death || from_account.free >= ed, Error::<T, I>::KeepAlive);
+
+						Ok(())
+					}
+				).map(|(_, maybe_dust_cleaner)| maybe_dust_cleaner)
+			}
+		)?;
 
 		// Emit transfer event.
 		Self::deposit_event(Event::Transfer(transactor.clone(), dest.clone(), value));
@@ -1322,18 +1369,28 @@ impl<T: Config<I>, I: 'static> ReservableCurrency<T::AccountId> for Pallet<T, I>
 			};
 		}
 
-		let actual = Self::try_mutate_account(beneficiary, |to_account, is_new|-> Result<Self::Balance, DispatchError> {
-			ensure!(!is_new, Error::<T, I>::DeadAccount);
-			Self::try_mutate_account(slashed, |from_account, _| -> Result<Self::Balance, DispatchError> {
-				let actual = cmp::min(from_account.reserved, value);
-				match status {
-					Status::Free => to_account.free = to_account.free.checked_add(&actual).ok_or(Error::<T, I>::Overflow)?,
-					Status::Reserved => to_account.reserved = to_account.reserved.checked_add(&actual).ok_or(Error::<T, I>::Overflow)?,
-				}
-				from_account.reserved -= actual;
-				Ok(actual)
-			})
-		})?;
+		let ((actual, _maybe_one_dust), _maybe_other_dust) = Self::try_mutate_account_with_dust(
+			beneficiary,
+			|to_account, is_new| -> Result<(Self::Balance, DustCleaner<T, I>), DispatchError> {
+				ensure!(!is_new, Error::<T, I>::DeadAccount);
+				Self::try_mutate_account_with_dust(
+					slashed,
+					|from_account, _| -> Result<Self::Balance, DispatchError> {
+						let actual = cmp::min(from_account.reserved, value);
+						match status {
+							Status::Free => to_account.free = to_account.free
+								.checked_add(&actual)
+								.ok_or(Error::<T, I>::Overflow)?,
+							Status::Reserved => to_account.reserved = to_account.reserved
+								.checked_add(&actual)
+								.ok_or(Error::<T, I>::Overflow)?,
+						}
+						from_account.reserved -= actual;
+						Ok(actual)
+					}
+				)
+			}
+		)?;
 
 		Self::deposit_event(Event::ReserveRepatriated(slashed.clone(), beneficiary.clone(), actual, status));
 		Ok(value - actual)
diff --git a/frame/balances/src/tests.rs b/frame/balances/src/tests.rs
index c860a0364d4b..ef5823b3bc5b 100644
--- a/frame/balances/src/tests.rs
+++ b/frame/balances/src/tests.rs
@@ -732,8 +732,8 @@ macro_rules! decl_tests {
 					assert_eq!(
 						events(),
 						[
+							Event::frame_system(system::Event::KilledAccount(1)),
 							Event::pallet_balances(crate::Event::DustLost(1, 99)),
-							Event::frame_system(system::Event::KilledAccount(1))
 						]
 					);
 				});
diff --git a/frame/balances/src/tests_local.rs b/frame/balances/src/tests_local.rs
index ffefc6c4d88f..02088e88b98e 100644
--- a/frame/balances/src/tests_local.rs
+++ b/frame/balances/src/tests_local.rs
@@ -184,8 +184,8 @@ fn emit_events_with_no_existential_deposit_suicide_with_dust() {
 			assert_eq!(
 				events(),
 				[
+					Event::frame_system(system::Event::KilledAccount(1)),
 					Event::pallet_balances(crate::Event::DustLost(1, 1)),
-					Event::frame_system(system::Event::KilledAccount(1))
 				]
 			);
 		});
diff --git a/frame/balances/src/tests_reentrancy.rs b/frame/balances/src/tests_reentrancy.rs
new file mode 100644
index 000000000000..020c514b6317
--- /dev/null
+++ b/frame/balances/src/tests_reentrancy.rs
@@ -0,0 +1,310 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Test setup for potential reentracy and lost updates of nested mutations.
+
+#![cfg(test)]
+
+use sp_runtime::{
+	traits::IdentityLookup,
+	testing::Header,
+};
+use sp_core::H256;
+use sp_io;
+use frame_support::parameter_types;
+use frame_support::traits::StorageMapShim;
+use frame_support::weights::{IdentityFee};
+use crate::{
+	self as pallet_balances,
+	Module, Config,
+};
+use pallet_transaction_payment::CurrencyAdapter;
+
+use crate::*;
+use frame_support::{
+	assert_ok,
+	traits::{
+		Currency, ReservableCurrency,
+	}
+};
+use frame_system::RawOrigin;
+
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+fn last_event() -> Event {
+	system::Module::<Test>::events().pop().expect("Event expected").event
+}
+
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
+	}
+);
+
+parameter_types! {
+	pub const BlockHashCount: u64 = 250;
+	pub BlockWeights: frame_system::limits::BlockWeights =
+		frame_system::limits::BlockWeights::simple_max(1024);
+	pub static ExistentialDeposit: u64 = 0;
+}
+impl frame_system::Config for Test {
+	type BaseCallFilter = ();
+	type BlockWeights = BlockWeights;
+	type BlockLength = ();
+	type DbWeight = ();
+	type Origin = Origin;
+	type Index = u64;
+	type BlockNumber = u64;
+	type Call = Call;
+	type Hash = H256;
+	type Hashing = ::sp_runtime::traits::BlakeTwo256;
+	type AccountId = u64;
+	type Lookup = IdentityLookup<Self::AccountId>;
+	type Header = Header;
+	type Event = Event;
+	type BlockHashCount = BlockHashCount;
+	type Version = ();
+	type PalletInfo = PalletInfo;
+	type AccountData = ();
+	type OnNewAccount = ();
+	type OnKilledAccount = ();
+	type SystemWeightInfo = ();
+	type SS58Prefix = ();
+}
+parameter_types! {
+	pub const TransactionByteFee: u64 = 1;
+}
+impl pallet_transaction_payment::Config for Test {
+	type OnChargeTransaction = CurrencyAdapter<Module<Test>, ()>;
+	type TransactionByteFee = TransactionByteFee;
+	type WeightToFee = IdentityFee<u64>;
+	type FeeMultiplierUpdate = ();
+}
+
+pub struct OnDustRemoval;
+impl OnUnbalanced<NegativeImbalance<Test>> for OnDustRemoval {
+	fn on_nonzero_unbalanced(amount: NegativeImbalance<Test>) {
+		let _ = Balances::resolve_into_existing(&1, amount);
+	}
+}
+parameter_types! {
+	pub const MaxLocks: u32 = 50;
+}
+impl Config for Test {
+	type Balance = u64;
+	type DustRemoval = OnDustRemoval;
+	type Event = Event;
+	type ExistentialDeposit = ExistentialDeposit;
+	type AccountStore = StorageMapShim<
+		super::Account<Test>,
+		system::Provider<Test>,
+		u64,
+		super::AccountData<u64>,
+	>;
+	type MaxLocks = MaxLocks;
+	type WeightInfo = ();
+}
+
+pub struct ExtBuilder {
+	existential_deposit: u64,
+}
+impl Default for ExtBuilder {
+	fn default() -> Self {
+		Self {
+			existential_deposit: 1,
+		}
+	}
+}
+impl ExtBuilder {
+
+	pub fn existential_deposit(mut self, existential_deposit: u64) -> Self {
+		self.existential_deposit = existential_deposit;
+		self
+	}
+
+	pub fn set_associated_consts(&self) {
+		EXISTENTIAL_DEPOSIT.with(|v| *v.borrow_mut() = self.existential_deposit);
+	}
+
+	pub fn build(self) -> sp_io::TestExternalities {
+		self.set_associated_consts();
+		let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+		pallet_balances::GenesisConfig::<Test> {
+			balances: vec![],
+		}.assimilate_storage(&mut t).unwrap();
+		let mut ext = sp_io::TestExternalities::new(t);
+		ext.execute_with(|| System::set_block_number(1));
+		ext
+	}
+}
+
+#[test]
+fn transfer_dust_removal_tst1_should_work() {
+	ExtBuilder::default()
+		.existential_deposit(100)
+		.build()
+		.execute_with(|| {
+			// Verification of reentrancy in dust removal
+			assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 1, 1000, 0));
+			assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 2, 500, 0));
+
+			// In this transaction, account 2 free balance
+			// drops below existential balance
+			// and dust balance is removed from account 2
+			assert_ok!(Balances::transfer(RawOrigin::Signed(2).into(), 3, 450));
+
+			// As expected dust balance is removed.
+			assert_eq!(Balances::free_balance(&2), 0);
+
+			// As expected beneficiary account 3
+			// received the transfered fund.
+			assert_eq!(Balances::free_balance(&3), 450);
+
+			// Dust balance is deposited to account 1
+			// during the process of dust removal.
+			assert_eq!(Balances::free_balance(&1), 1050);
+
+			// Verify the events
+			// Number of events expected is 8
+			assert_eq!(System::events().len(), 11);
+
+			assert!(
+				System::events().iter().any(
+					|er|
+					er.event == Event::pallet_balances(
+						crate::Event::Transfer(2, 3, 450),
+					),
+				),
+			);
+
+			assert!(
+				System::events().iter().any(
+					|er|
+					er.event == Event::pallet_balances(
+						crate::Event::DustLost(2, 50)
+					),
+				),
+			);
+		}
+	);
+}
+
+#[test]
+fn transfer_dust_removal_tst2_should_work() {
+	ExtBuilder::default()
+		.existential_deposit(100)
+		.build()
+		.execute_with(|| {
+			// Verification of reentrancy in dust removal
+			assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 1, 1000, 0));
+			assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 2, 500, 0));
+
+			// In this transaction, account 2 free balance
+			// drops below existential balance
+			// and dust balance is removed from account 2
+			assert_ok!(Balances::transfer(RawOrigin::Signed(2).into(), 1, 450));
+
+			// As expected dust balance is removed.
+			assert_eq!(Balances::free_balance(&2), 0);
+
+			// Dust balance is deposited to account 1
+			// during the process of dust removal.
+			assert_eq!(Balances::free_balance(&1), 1500);
+
+			// Verify the events
+			// Number of events expected is 8
+			assert_eq!(System::events().len(), 9);
+
+			assert!(
+				System::events().iter().any(
+					|er|
+					er.event == Event::pallet_balances(
+						crate::Event::Transfer(2, 1, 450),
+					),
+				),
+			);
+
+			assert!(
+				System::events().iter().any(
+					|er|
+					er.event == Event::pallet_balances(
+						crate::Event::DustLost(2, 50),
+					),
+				),
+			);
+		}
+	);
+}
+
+#[test]
+fn repatriating_reserved_balance_dust_removal_should_work() {
+	ExtBuilder::default()
+		.existential_deposit(100)
+		.build()
+		.execute_with(|| {
+			// Verification of reentrancy in dust removal
+			assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 1, 1000, 0));
+			assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 2, 500, 0));
+
+			// Reserve a value on account 2,
+			// Such that free balance is lower than
+			// Exestintial deposit.
+			assert_ok!(Balances::reserve(&2, 450));
+
+			// Transfer of reserved fund from slashed account 2 to
+			// beneficiary account 1
+			assert_ok!(Balances::repatriate_reserved(&2, &1, 450, Status::Free), 0);
+
+			// Since free balance of account 2 is lower than
+			// existential deposit, dust amount is
+			// removed from the account 2
+			assert_eq!(Balances::reserved_balance(2), 0);
+			assert_eq!(Balances::free_balance(2), 0);
+
+			// account 1 is credited with reserved amount
+			// together with dust balance during dust
+			// removal.
+			assert_eq!(Balances::reserved_balance(1), 0);
+			assert_eq!(Balances::free_balance(1), 1500);
+
+			// Verify the events
+			// Number of events expected is 10
+			assert_eq!(System::events().len(), 10);
+
+			assert!(
+				System::events().iter().any(
+					|er|
+					er.event == Event::pallet_balances(
+						crate::Event::ReserveRepatriated(2, 1, 450, Status::Free),
+					),
+				),
+			);
+
+			assert_eq!(
+				last_event(),
+				Event::pallet_balances(crate::Event::DustLost(2, 50)),
+			);
+
+		}
+	);
+}

From fb1b15ca8c4187f7a1766909338ba64eef6dcb7e Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Tue, 16 Feb 2021 19:02:53 +0100
Subject: [PATCH 0401/1194] fix deprecated usage of panic (#8134)

---
 frame/executive/src/lib.rs            | 2 +-
 frame/staking/reward-curve/src/lib.rs | 4 ++--
 primitives/core/src/crypto.rs         | 2 +-
 primitives/core/src/hashing.rs        | 2 +-
 primitives/inherents/src/lib.rs       | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index df1ae17df613..b31f40dc28d6 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -320,7 +320,7 @@ where
 	) {
 		extrinsics.into_iter().for_each(|e| if let Err(e) = Self::apply_extrinsic(e) {
 			let err: &'static str = e.into();
-			panic!(err)
+			panic!("{}", err)
 		});
 
 		// post-extrinsics book-keeping
diff --git a/frame/staking/reward-curve/src/lib.rs b/frame/staking/reward-curve/src/lib.rs
index 3a8d625e8357..cf7d69c24053 100644
--- a/frame/staking/reward-curve/src/lib.rs
+++ b/frame/staking/reward-curve/src/lib.rs
@@ -353,13 +353,13 @@ fn generate_piecewise_linear(points: Vec<(u32, u32)>) -> TokenStream2 {
 		.unwrap_or(1_000_000_000);
 
 	for (x, y) in points {
-		let error = || panic!(format!(
+		let error = || panic!(
 			"Generated reward curve approximation doesn't fit into [0, 1] -> [0, 1] \
 			because of point:
 			x = {:07} per million
 			y = {:07} per million",
 			x, y
-		));
+		);
 
 		let x_perbill = x.checked_mul(1_000).unwrap_or_else(error);
 		let y_perbill = y.checked_mul(1_000).unwrap_or_else(error);
diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index 2c375f68eb68..360edc0c27e6 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -224,7 +224,7 @@ pub enum PublicError {
 
 /// Key that can be encoded to/from SS58.
 ///
-/// See https://github.com/paritytech/substrate/wiki/External-Address-Format-(SS58)#address-type
+/// See <https://github.com/paritytech/substrate/wiki/External-Address-Format-(SS58)#address-type>
 /// for information on the codec.
 #[cfg(feature = "full_crypto")]
 pub trait Ss58Codec: Sized + AsMut<[u8]> + AsRef<[u8]> + Default {
diff --git a/primitives/core/src/hashing.rs b/primitives/core/src/hashing.rs
index 0b67d33235ae..ac0eedef6967 100644
--- a/primitives/core/src/hashing.rs
+++ b/primitives/core/src/hashing.rs
@@ -18,7 +18,7 @@
 //! Hashing functions.
 //!
 //! This module is gated by `full-crypto` feature. If you intend to use any of the functions
-//! defined here within your runtime, you should most likely rather use [sp_io::hashing] instead,
+//! defined here within your runtime, you should most likely rather use `sp_io::hashing` instead,
 //! unless you know what you're doing. Using `sp_io` will be more performant, since instead of
 //! computing the hash in WASM it delegates that computation to the host client.
 
diff --git a/primitives/inherents/src/lib.rs b/primitives/inherents/src/lib.rs
index 36a1b32775c3..0110db5680a1 100644
--- a/primitives/inherents/src/lib.rs
+++ b/primitives/inherents/src/lib.rs
@@ -424,7 +424,7 @@ pub trait ProvideInherent {
 	/// - `Err(_)` indicates that this function failed and further operations should be aborted.
 	///
 	/// CAUTION: This check has a bug when used in pallets that also provide unsigned transactions.
-	/// See https://github.com/paritytech/substrate/issues/6243 for details.
+	/// See <https://github.com/paritytech/substrate/issues/6243> for details.
 	fn is_inherent_required(_: &InherentData) -> Result<Option<Self::Error>, Self::Error> { Ok(None) }
 
 	/// Check whether the given inherent is valid. Checking the inherent is optional and can be

From 7d2de01cd35041cc1c9c5893ddb30126cd11accd Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Tue, 16 Feb 2021 19:03:59 +0100
Subject: [PATCH 0402/1194] Remove inherent in pallet-babe (#8124)

---
 Cargo.lock                                 |  2 +-
 bin/node/executor/Cargo.toml               |  1 +
 bin/node/executor/tests/basic.rs           | 31 ++++++++++------
 bin/node/executor/tests/common.rs          | 16 ++++++++-
 bin/node/executor/tests/fees.rs            | 24 ++++++++-----
 bin/node/runtime/src/lib.rs                |  2 +-
 frame/babe/Cargo.toml                      |  2 --
 frame/babe/src/lib.rs                      | 42 ++++++----------------
 frame/babe/src/mock.rs                     |  2 +-
 primitives/consensus/babe/src/inherents.rs |  1 +
 10 files changed, 66 insertions(+), 57 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5bbe6f6f0029..e36b8fab4879 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3963,6 +3963,7 @@ dependencies = [
  "parity-scale-codec",
  "sc-executor",
  "sp-application-crypto",
+ "sp-consensus-babe",
  "sp-core",
  "sp-externalities",
  "sp-io",
@@ -4496,7 +4497,6 @@ dependencies = [
  "sp-consensus-babe",
  "sp-consensus-vrf",
  "sp-core",
- "sp-inherents",
  "sp-io",
  "sp-runtime",
  "sp-session",
diff --git a/bin/node/executor/Cargo.toml b/bin/node/executor/Cargo.toml
index b67c29889d30..7faca59cd48c 100644
--- a/bin/node/executor/Cargo.toml
+++ b/bin/node/executor/Cargo.toml
@@ -39,6 +39,7 @@ pallet-timestamp = { version = "3.0.0", path = "../../../frame/timestamp" }
 pallet-transaction-payment = { version = "3.0.0", path = "../../../frame/transaction-payment" }
 pallet-treasury = { version = "3.0.0", path = "../../../frame/treasury" }
 sp-application-crypto = { version = "3.0.0", path = "../../../primitives/application-crypto" }
+sp-consensus-babe = { version = "0.9.0", path = "../../../primitives/consensus/babe" }
 sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
 sp-externalities = { version = "0.9.0", path = "../../../primitives/externalities" }
 substrate-test-client = { version = "2.0.0", path = "../../../test-utils/client" }
diff --git a/bin/node/executor/tests/basic.rs b/bin/node/executor/tests/basic.rs
index d27954d3a721..3e3b2d1eaaf3 100644
--- a/bin/node/executor/tests/basic.rs
+++ b/bin/node/executor/tests/basic.rs
@@ -32,7 +32,7 @@ use frame_system::{self, EventRecord, Phase};
 use node_runtime::{
 	Header, Block, UncheckedExtrinsic, CheckedExtrinsic, Call, Runtime, Balances,
 	System, TransactionPayment, Event,
-	constants::currency::*,
+	constants::{time::SLOT_DURATION, currency::*},
 };
 use node_primitives::{Balance, Hash};
 use wat;
@@ -76,6 +76,7 @@ fn set_heap_pages<E: Externalities>(ext: &mut E, heap_pages: u64) {
 }
 
 fn changes_trie_block() -> (Vec<u8>, Hash) {
+	let time = 42 * 1000;
 	construct_block(
 		&mut new_test_ext(compact_code_unwrap(), true),
 		1,
@@ -83,13 +84,14 @@ fn changes_trie_block() -> (Vec<u8>, Hash) {
 		vec![
 			CheckedExtrinsic {
 				signed: None,
-				function: Call::Timestamp(pallet_timestamp::Call::set(42 * 1000)),
+				function: Call::Timestamp(pallet_timestamp::Call::set(time)),
 			},
 			CheckedExtrinsic {
 				signed: Some((alice(), signed_extra(0, 0))),
 				function: Call::Balances(pallet_balances::Call::transfer(bob().into(), 69 * DOLLARS)),
 			},
-		]
+		],
+		(time / SLOT_DURATION).into(),
 	)
 }
 
@@ -98,6 +100,7 @@ fn changes_trie_block() -> (Vec<u8>, Hash) {
 /// from block1's execution to block2 to derive the correct storage_root.
 fn blocks() -> ((Vec<u8>, Hash), (Vec<u8>, Hash)) {
 	let mut t = new_test_ext(compact_code_unwrap(), false);
+	let time1 = 42 * 1000;
 	let block1 = construct_block(
 		&mut t,
 		1,
@@ -105,14 +108,16 @@ fn blocks() -> ((Vec<u8>, Hash), (Vec<u8>, Hash)) {
 		vec![
 			CheckedExtrinsic {
 				signed: None,
-				function: Call::Timestamp(pallet_timestamp::Call::set(42 * 1000)),
+				function: Call::Timestamp(pallet_timestamp::Call::set(time1)),
 			},
 			CheckedExtrinsic {
 				signed: Some((alice(), signed_extra(0, 0))),
 				function: Call::Balances(pallet_balances::Call::transfer(bob().into(), 69 * DOLLARS)),
 			},
-		]
+		],
+		(time1 / SLOT_DURATION).into(),
 	);
+	let time2 = 52 * 1000;
 	let block2 = construct_block(
 		&mut t,
 		2,
@@ -120,7 +125,7 @@ fn blocks() -> ((Vec<u8>, Hash), (Vec<u8>, Hash)) {
 		vec![
 			CheckedExtrinsic {
 				signed: None,
-				function: Call::Timestamp(pallet_timestamp::Call::set(52 * 1000)),
+				function: Call::Timestamp(pallet_timestamp::Call::set(time2)),
 			},
 			CheckedExtrinsic {
 				signed: Some((bob(), signed_extra(0, 0))),
@@ -130,12 +135,13 @@ fn blocks() -> ((Vec<u8>, Hash), (Vec<u8>, Hash)) {
 				signed: Some((alice(), signed_extra(1, 0))),
 				function: Call::Balances(pallet_balances::Call::transfer(bob().into(), 15 * DOLLARS)),
 			}
-		]
+		],
+		(time2 / SLOT_DURATION).into(),
 	);
 
 	// session change => consensus authorities change => authorities change digest item appears
 	let digest = Header::decode(&mut &block2.0[..]).unwrap().digest;
-	assert_eq!(digest.logs().len(), 0);
+	assert_eq!(digest.logs().len(), 1 /* Just babe slot */);
 
 	(block1, block2)
 }
@@ -154,7 +160,8 @@ fn block_with_size(time: u64, nonce: u32, size: usize) -> (Vec<u8>, Hash) {
 				signed: Some((alice(), signed_extra(nonce, 0))),
 				function: Call::System(frame_system::Call::remark(vec![0; size])),
 			}
-		]
+		],
+		(time * 1000 / SLOT_DURATION).into(),
 	)
 }
 
@@ -590,6 +597,7 @@ fn deploying_wasm_contract_should_work() {
 
 	let subsistence = pallet_contracts::Module::<Runtime>::subsistence_threshold();
 
+	let time = 42 * 1000;
 	let b = construct_block(
 		&mut new_test_ext(compact_code_unwrap(), false),
 		1,
@@ -597,7 +605,7 @@ fn deploying_wasm_contract_should_work() {
 		vec![
 			CheckedExtrinsic {
 				signed: None,
-				function: Call::Timestamp(pallet_timestamp::Call::set(42 * 1000)),
+				function: Call::Timestamp(pallet_timestamp::Call::set(time)),
 			},
 			CheckedExtrinsic {
 				signed: Some((charlie(), signed_extra(0, 0))),
@@ -622,7 +630,8 @@ fn deploying_wasm_contract_should_work() {
 					)
 				),
 			},
-		]
+		],
+		(time / SLOT_DURATION).into(),
 	);
 
 	let mut t = new_test_ext(compact_code_unwrap(), false);
diff --git a/bin/node/executor/tests/common.rs b/bin/node/executor/tests/common.rs
index 8f8db9f72bb5..635155b5d00b 100644
--- a/bin/node/executor/tests/common.rs
+++ b/bin/node/executor/tests/common.rs
@@ -19,6 +19,7 @@ use codec::{Encode, Decode};
 use frame_system::offchain::AppCrypto;
 use frame_support::Hashable;
 use sp_state_machine::TestExternalities as CoreTestExternalities;
+use sp_consensus_babe::{BABE_ENGINE_ID, Slot, digests::{PreDigest, SecondaryPlainPreDigest}};
 use sp_core::{
 	NeverNativeValue, NativeOrEncoded,
 	crypto::KeyTypeId,
@@ -29,6 +30,8 @@ use sp_runtime::{
 	ApplyExtrinsicResult,
 	MultiSigner,
 	MultiSignature,
+	Digest,
+	DigestItem,
 	traits::{Header as HeaderT, BlakeTwo256},
 };
 use sc_executor::{NativeExecutor, WasmExecutionMethod};
@@ -145,6 +148,7 @@ pub fn construct_block(
 	number: BlockNumber,
 	parent_hash: Hash,
 	extrinsics: Vec<CheckedExtrinsic>,
+	babe_slot: Slot,
 ) -> (Vec<u8>, Hash) {
 	use sp_trie::{TrieConfiguration, trie_types::Layout};
 
@@ -162,7 +166,17 @@ pub fn construct_block(
 		number,
 		extrinsics_root,
 		state_root: Default::default(),
-		digest: Default::default(),
+		digest: Digest {
+			logs: vec![
+				DigestItem::PreRuntime(
+					BABE_ENGINE_ID,
+					PreDigest::SecondaryPlain(SecondaryPlainPreDigest {
+						slot: babe_slot,
+						authority_index: 42,
+					}).encode()
+				),
+			],
+		},
 	};
 
 	// execute the block to get the real header.
diff --git a/bin/node/executor/tests/fees.rs b/bin/node/executor/tests/fees.rs
index 2e92077c4ada..90b28539f7bc 100644
--- a/bin/node/executor/tests/fees.rs
+++ b/bin/node/executor/tests/fees.rs
@@ -25,7 +25,7 @@ use sp_runtime::{Perbill, FixedPointNumber};
 use node_runtime::{
 	CheckedExtrinsic, Call, Runtime, Balances, TransactionPayment, Multiplier,
 	TransactionByteFee,
-	constants::currency::*,
+	constants::{time::SLOT_DURATION, currency::*},
 };
 use node_primitives::Balance;
 use node_testing::keyring::*;
@@ -46,6 +46,7 @@ fn fee_multiplier_increases_and_decreases_on_big_weight() {
 
 	let mut tt = new_test_ext(compact_code_unwrap(), false);
 
+	let time1 = 42 * 1000;
 	// big one in terms of weight.
 	let block1 = construct_block(
 		&mut tt,
@@ -54,15 +55,17 @@ fn fee_multiplier_increases_and_decreases_on_big_weight() {
 		vec![
 			CheckedExtrinsic {
 				signed: None,
-				function: Call::Timestamp(pallet_timestamp::Call::set(42 * 1000)),
+				function: Call::Timestamp(pallet_timestamp::Call::set(time1)),
 			},
 			CheckedExtrinsic {
 				signed: Some((charlie(), signed_extra(0, 0))),
 				function: Call::System(frame_system::Call::fill_block(Perbill::from_percent(60))),
 			}
-		]
+		],
+		(time1 / SLOT_DURATION).into(),
 	);
 
+	let time2 = 52 * 1000;
 	// small one in terms of weight.
 	let block2 = construct_block(
 		&mut tt,
@@ -71,13 +74,14 @@ fn fee_multiplier_increases_and_decreases_on_big_weight() {
 		vec![
 			CheckedExtrinsic {
 				signed: None,
-				function: Call::Timestamp(pallet_timestamp::Call::set(52 * 1000)),
+				function: Call::Timestamp(pallet_timestamp::Call::set(time2)),
 			},
 			CheckedExtrinsic {
 				signed: Some((charlie(), signed_extra(1, 0))),
 				function: Call::System(frame_system::Call::remark(vec![0; 1])),
 			}
-		]
+		],
+		(time2 / SLOT_DURATION).into(),
 	);
 
 	println!(
@@ -219,7 +223,7 @@ fn block_weight_capacity_report() {
 	let mut time = 10;
 	let mut nonce: Index = 0;
 	let mut block_number = 1;
-	let mut previous_hash: Hash = GENESIS_HASH.into();
+	let mut previous_hash: node_primitives::Hash = GENESIS_HASH.into();
 
 	loop {
 		let num_transfers = block_number * factor;
@@ -238,7 +242,8 @@ fn block_weight_capacity_report() {
 			&mut tt,
 			block_number,
 			previous_hash,
-			xts
+			xts,
+			(time * 1000 / SLOT_DURATION).into(),
 		);
 
 		let len = block.0.len();
@@ -286,7 +291,7 @@ fn block_length_capacity_report() {
 	let mut time = 10;
 	let mut nonce: Index = 0;
 	let mut block_number = 1;
-	let mut previous_hash: Hash = GENESIS_HASH.into();
+	let mut previous_hash: node_primitives::Hash = GENESIS_HASH.into();
 
 	loop {
 		// NOTE: this is super slow. Can probably be improved.
@@ -303,7 +308,8 @@ fn block_length_capacity_report() {
 					signed: Some((charlie(), signed_extra(nonce, 0))),
 					function: Call::System(frame_system::Call::remark(vec![0u8; (block_number * factor) as usize])),
 				},
-			]
+			],
+			(time * 1000 / SLOT_DURATION).into(),
 		);
 
 		let len = block.0.len();
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 53cc0545e9d8..86e3075c3ae5 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -1012,7 +1012,7 @@ construct_runtime!(
 	{
 		System: frame_system::{Module, Call, Config, Storage, Event<T>},
 		Utility: pallet_utility::{Module, Call, Event},
-		Babe: pallet_babe::{Module, Call, Storage, Config, Inherent, ValidateUnsigned},
+		Babe: pallet_babe::{Module, Call, Storage, Config, ValidateUnsigned},
 		Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent},
 		Authorship: pallet_authorship::{Module, Call, Storage, Inherent},
 		Indices: pallet_indices::{Module, Call, Storage, Config<T>, Event<T>},
diff --git a/frame/babe/Cargo.toml b/frame/babe/Cargo.toml
index 9bde93506241..7ecff2aae5d4 100644
--- a/frame/babe/Cargo.toml
+++ b/frame/babe/Cargo.toml
@@ -24,7 +24,6 @@ serde = { version = "1.0.101", optional = true }
 sp-application-crypto = { version = "3.0.0", default-features = false, path = "../../primitives/application-crypto" }
 sp-consensus-babe = { version = "0.9.0", default-features = false, path = "../../primitives/consensus/babe" }
 sp-consensus-vrf = { version = "0.9.0", default-features = false, path = "../../primitives/consensus/vrf" }
-sp-inherents = { version = "3.0.0", default-features = false, path = "../../primitives/inherents" }
 sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
 sp-session = { version = "3.0.0", default-features = false, path = "../../primitives/session" }
@@ -54,7 +53,6 @@ std = [
 	"sp-application-crypto/std",
 	"sp-consensus-babe/std",
 	"sp-consensus-vrf/std",
-	"sp-inherents/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-session/std",
diff --git a/frame/babe/src/lib.rs b/frame/babe/src/lib.rs
index 0afa0e1d0980..b42b4f177ff6 100644
--- a/frame/babe/src/lib.rs
+++ b/frame/babe/src/lib.rs
@@ -33,20 +33,18 @@ use frame_system::{ensure_none, ensure_signed};
 use sp_application_crypto::Public;
 use sp_runtime::{
 	generic::DigestItem,
-	traits::{Hash, IsMember, One, SaturatedConversion, Saturating},
+	traits::{Hash, IsMember, One, SaturatedConversion, Saturating, Zero},
 	ConsensusEngineId, KeyTypeId,
 };
 use sp_session::{GetSessionNumber, GetValidatorCount};
-use sp_std::{prelude::*, result};
+use sp_std::prelude::*;
 use sp_timestamp::OnTimestampSet;
 
 use sp_consensus_babe::{
 	digests::{NextConfigDescriptor, NextEpochDescriptor, PreDigest},
-	inherents::{BabeInherentData, INHERENT_IDENTIFIER},
 	BabeAuthorityWeight, ConsensusLog, Epoch, EquivocationProof, Slot, BABE_ENGINE_ID,
 };
 use sp_consensus_vrf::schnorrkel;
-use sp_inherents::{InherentData, InherentIdentifier, MakeFatalError, ProvideInherent};
 
 pub use sp_consensus_babe::{AuthorityId, PUBLIC_KEY_LENGTH, RANDOMNESS_LENGTH, VRF_OUTPUT_LENGTH};
 
@@ -744,7 +742,15 @@ impl<T: Config> Module<T> {
 }
 
 impl<T: Config> OnTimestampSet<T::Moment> for Module<T> {
-	fn on_timestamp_set(_moment: T::Moment) { }
+	fn on_timestamp_set(moment: T::Moment) {
+		let slot_duration = Self::slot_duration();
+		assert!(!slot_duration.is_zero(), "Babe slot duration cannot be zero.");
+
+		let timestamp_slot = moment / slot_duration;
+		let timestamp_slot = Slot::from(timestamp_slot.saturated_into::<u64>());
+
+		assert!(CurrentSlot::get() == timestamp_slot, "Timestamp slot must match `CurrentSlot`");
+	}
 }
 
 impl<T: Config> frame_support::traits::EstimateNextSessionRotation<T::BlockNumber> for Module<T> {
@@ -818,29 +824,3 @@ fn compute_randomness(
 
 	sp_io::hashing::blake2_256(&s)
 }
-
-impl<T: Config> ProvideInherent for Module<T> {
-	type Call = pallet_timestamp::Call<T>;
-	type Error = MakeFatalError<sp_inherents::Error>;
-	const INHERENT_IDENTIFIER: InherentIdentifier = INHERENT_IDENTIFIER;
-
-	fn create_inherent(_: &InherentData) -> Option<Self::Call> {
-		None
-	}
-
-	fn check_inherent(call: &Self::Call, data: &InherentData) -> result::Result<(), Self::Error> {
-		let timestamp = match call {
-			pallet_timestamp::Call::set(ref timestamp) => timestamp.clone(),
-			_ => return Ok(()),
-		};
-
-		let timestamp_based_slot = (timestamp / Self::slot_duration()).saturated_into::<u64>();
-		let seal_slot = data.babe_inherent_data()?;
-
-		if timestamp_based_slot == *seal_slot {
-			Ok(())
-		} else {
-			Err(sp_inherents::Error::from("timestamp set in block doesn't match slot in seal").into())
-		}
-	}
-}
diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index e3d2eb19ef26..cae51fb457ba 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -54,7 +54,7 @@ frame_support::construct_runtime!(
 		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
 		Historical: pallet_session_historical::{Module},
 		Offences: pallet_offences::{Module, Call, Storage, Event},
-		Babe: pallet_babe::{Module, Call, Storage, Config, Inherent, ValidateUnsigned},
+		Babe: pallet_babe::{Module, Call, Storage, Config, ValidateUnsigned},
 		Staking: pallet_staking::{Module, Call, Storage, Config<T>, Event<T>},
 		Session: pallet_session::{Module, Call, Storage, Event, Config<T>},
 		Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent},
diff --git a/primitives/consensus/babe/src/inherents.rs b/primitives/consensus/babe/src/inherents.rs
index b20cf45cd43a..2f1a716114c5 100644
--- a/primitives/consensus/babe/src/inherents.rs
+++ b/primitives/consensus/babe/src/inherents.rs
@@ -52,6 +52,7 @@ impl BabeInherentData for InherentData {
 }
 
 /// Provides the slot duration inherent data for BABE.
+// TODO: Remove in the future. https://github.com/paritytech/substrate/issues/8029
 #[cfg(feature = "std")]
 pub struct InherentDataProvider {
 	slot_duration: u64,

From 743accbe3256de2fc615adcaa3ab03ebdbbb4dbd Mon Sep 17 00:00:00 2001
From: Cecile Tonglet <cecile@parity.io>
Date: Wed, 17 Feb 2021 08:44:25 +0100
Subject: [PATCH 0403/1194] Fix telemetry span not entering properly attempt 3
 (#8043)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix tracing tests (#8022)

* Fix tracing tests

The tests were not working properly.

1. Some test was setting a global subscriber, this could lead to racy
conditions with other tests.

2. A logging test called `process::exit` which is completly wrong.

* Update client/tracing/src/lib.rs

Co-authored-by: David <dvdplm@gmail.com>

* Review comments

Co-authored-by: David <dvdplm@gmail.com>

* Fix tracing spans are not being forwarded to spawned task (#8009)

* Fix tracing spans are not being forwarded to spawned task

There is a bug that tracing spans are not forwarded to spawned task. The
problem was that only the telemetry span was forwarded. The solution to
this is to use the tracing provided `in_current_span` to capture the
current active span and pass the telemetry span explictely. We will now
always enter the span when the future is polled. This is essentially the
same strategy as tracing is doing with its `Instrumented`, but now
extended for our use case with having multiple spans active.

* More tests

* Proper test for telemetry and prefix span

* WIP

* Fix test (need to create & enter the span at the same time)

* WIP

* Remove telemtry_span from sc_service config

* CLEANUP

* Update comment

* Incorrect indent

* More meaningful name

* Dedent

* Naming XD

* Attempt to make a more complete test

* lint

* Missing licenses

* Remove user data

* CLEANUP

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* CLEANUP

* Apply suggestion

* Update bin/node/cli/tests/telemetry.rs

Co-authored-by: David <dvdplm@gmail.com>

* Wrapping lines

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: David <dvdplm@gmail.com>
---
 Cargo.lock                               |  14 ++
 bin/node-template/node/src/service.rs    |   9 +
 bin/node/cli/Cargo.toml                  |   2 +
 bin/node/cli/src/service.rs              |  10 +-
 bin/node/cli/tests/telemetry.rs          | 102 ++++++++
 bin/node/cli/tests/websocket_server.rs   | 281 +++++++++++++++++++++++
 client/cli/src/config.rs                 |   4 +-
 client/service/Cargo.toml                |   1 +
 client/service/src/builder.rs            |  14 +-
 client/service/src/config.rs             |   4 -
 client/service/src/task_manager/mod.rs   |  46 +---
 client/service/src/task_manager/tests.rs | 128 ++++++-----
 client/service/test/src/lib.rs           |   1 -
 utils/browser/src/lib.rs                 |   4 +-
 14 files changed, 499 insertions(+), 121 deletions(-)
 create mode 100644 bin/node/cli/tests/telemetry.rs
 create mode 100644 bin/node/cli/tests/websocket_server.rs

diff --git a/Cargo.lock b/Cargo.lock
index e36b8fab4879..e3c9131a86e3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -192,6 +192,16 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "695579f0f2520f3774bb40461e5adb066459d4e0af4d59d20175484fb8e9edf1"
 
+[[package]]
+name = "async-attributes"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5"
+dependencies = [
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "async-channel"
 version = "1.5.1"
@@ -293,6 +303,7 @@ version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9f06685bad74e0570f5213741bea82158279a4103d988e57bfada11ad230341"
 dependencies = [
+ "async-attributes",
  "async-channel",
  "async-global-executor",
  "async-io",
@@ -3869,6 +3880,7 @@ name = "node-cli"
 version = "2.0.0"
 dependencies = [
  "assert_cmd",
+ "async-std",
  "frame-benchmarking-cli",
  "frame-support",
  "frame-system",
@@ -3918,6 +3930,7 @@ dependencies = [
  "sc-transaction-pool",
  "serde",
  "serde_json",
+ "soketto",
  "sp-authority-discovery",
  "sp-consensus",
  "sp-consensus-babe",
@@ -7558,6 +7571,7 @@ dependencies = [
  "tokio 0.2.25",
  "tracing",
  "tracing-futures",
+ "tracing-log",
  "tracing-subscriber",
  "wasm-timer",
 ]
diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
index f565156a64a8..552705f299b8 100644
--- a/bin/node-template/node/src/service.rs
+++ b/bin/node-template/node/src/service.rs
@@ -11,6 +11,7 @@ pub use sc_executor::NativeExecutor;
 use sp_consensus_aura::sr25519::{AuthorityPair as AuraPair};
 use sc_finality_grandpa::SharedVoterState;
 use sc_keystore::LocalKeystore;
+use sc_telemetry::TelemetrySpan;
 
 // Our native executor instance.
 native_executor_instance!(
@@ -162,6 +163,9 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		})
 	};
 
+	let telemetry_span = TelemetrySpan::new();
+	let _telemetry_span_entered = telemetry_span.enter();
+
 	let (_rpc_handlers, telemetry_connection_notifier) = sc_service::spawn_tasks(
 		sc_service::SpawnTasksParams {
 			network: network.clone(),
@@ -176,6 +180,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 			network_status_sinks,
 			system_rpc_tx,
 			config,
+			telemetry_span: Some(telemetry_span.clone()),
 		},
 	)?;
 
@@ -312,6 +317,9 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		);
 	}
 
+	let telemetry_span = TelemetrySpan::new();
+	let _telemetry_span_entered = telemetry_span.enter();
+
 	sc_service::spawn_tasks(sc_service::SpawnTasksParams {
 		remote_blockchain: Some(backend.remote_blockchain()),
 		transaction_pool,
@@ -325,6 +333,7 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		network,
 		network_status_sinks,
 		system_rpc_tx,
+		telemetry_span: Some(telemetry_span.clone()),
 	})?;
 
 	network_starter.start_network();
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index 112c87457393..6162726c8947 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -124,6 +124,8 @@ nix = "0.19"
 serde_json = "1.0"
 regex = "1"
 platforms = "1.1"
+async-std = { version = "1.6.5", features = ["attributes"] }
+soketto = "0.4.2"
 
 [build-dependencies]
 structopt = { version = "0.3.8", optional = true }
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index ca647c583446..df3802d3d802 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -34,7 +34,7 @@ use sp_runtime::traits::Block as BlockT;
 use futures::prelude::*;
 use sc_client_api::{ExecutorProvider, RemoteBackend};
 use node_executor::Executor;
-use sc_telemetry::TelemetryConnectionNotifier;
+use sc_telemetry::{TelemetryConnectionNotifier, TelemetrySpan};
 
 type FullClient = sc_service::TFullClient<Block, RuntimeApi, Executor>;
 type FullBackend = sc_service::TFullBackend<Block>;
@@ -226,6 +226,9 @@ pub fn new_full_base(
 	let enable_grandpa = !config.disable_grandpa;
 	let prometheus_registry = config.prometheus_registry().cloned();
 
+	let telemetry_span = TelemetrySpan::new();
+	let _telemetry_span_entered = telemetry_span.enter();
+
 	let (_rpc_handlers, telemetry_connection_notifier) = sc_service::spawn_tasks(
 		sc_service::SpawnTasksParams {
 			config,
@@ -240,6 +243,7 @@ pub fn new_full_base(
 			remote_blockchain: None,
 			network_status_sinks: network_status_sinks.clone(),
 			system_rpc_tx,
+			telemetry_span: Some(telemetry_span.clone()),
 		},
 	)?;
 
@@ -433,6 +437,9 @@ pub fn new_light_base(mut config: Configuration) -> Result<(
 
 	let rpc_extensions = node_rpc::create_light(light_deps);
 
+	let telemetry_span = TelemetrySpan::new();
+	let _telemetry_span_entered = telemetry_span.enter();
+
 	let (rpc_handlers, telemetry_connection_notifier) =
 		sc_service::spawn_tasks(sc_service::SpawnTasksParams {
 			on_demand: Some(on_demand),
@@ -444,6 +451,7 @@ pub fn new_light_base(mut config: Configuration) -> Result<(
 			config, backend, network_status_sinks, system_rpc_tx,
 			network: network.clone(),
 			task_manager: &mut task_manager,
+			telemetry_span: Some(telemetry_span.clone()),
 		})?;
 
 	Ok((
diff --git a/bin/node/cli/tests/telemetry.rs b/bin/node/cli/tests/telemetry.rs
new file mode 100644
index 000000000000..0b90f56a0399
--- /dev/null
+++ b/bin/node/cli/tests/telemetry.rs
@@ -0,0 +1,102 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+use assert_cmd::cargo::cargo_bin;
+use nix::sys::signal::{kill, Signal::SIGINT};
+use nix::unistd::Pid;
+use std::convert::TryInto;
+use std::process;
+
+pub mod common;
+pub mod websocket_server;
+
+#[async_std::test]
+async fn telemetry_works() {
+	let config = websocket_server::Config {
+		capacity: 1,
+		max_frame_size: 1048 * 1024,
+		send_buffer_len: 32,
+		bind_address: "127.0.0.1:0".parse().unwrap(),
+	};
+	let mut server = websocket_server::WsServer::new(config).await.unwrap();
+
+	let addr = server.local_addr().unwrap();
+
+	let server_task = async_std::task::spawn(async move {
+		loop {
+			use websocket_server::Event;
+			match server.next_event().await {
+				// New connection on the listener.
+				Event::ConnectionOpen { address } => {
+					println!("New connection from {:?}", address);
+					server.accept();
+				}
+
+				// Received a message from a connection.
+				Event::BinaryFrame { message, .. } => {
+					let json: serde_json::Value = serde_json::from_slice(&message).unwrap();
+					let object = json
+						.as_object()
+						.unwrap()
+						.get("payload")
+						.unwrap()
+						.as_object()
+						.unwrap();
+					if matches!(object.get("best"), Some(serde_json::Value::String(_))) {
+						break;
+					}
+				}
+
+				Event::TextFrame { .. } => panic!("Got a TextFrame over the socket, this is a bug"),
+
+				// Connection has been closed.
+				Event::ConnectionError { .. } => {}
+			}
+		}
+	});
+
+	let mut substrate = process::Command::new(cargo_bin("substrate"));
+
+	let mut substrate = substrate
+		.args(&["--dev", "--tmp", "--telemetry-url"])
+		.arg(format!("ws://{} 10", addr))
+		.stdout(process::Stdio::piped())
+		.stderr(process::Stdio::piped())
+		.stdin(process::Stdio::null())
+		.spawn()
+		.unwrap();
+
+	server_task.await;
+
+	assert!(
+		substrate.try_wait().unwrap().is_none(),
+		"the process should still be running"
+	);
+
+	// Stop the process
+	kill(Pid::from_raw(substrate.id().try_into().unwrap()), SIGINT).unwrap();
+	assert!(common::wait_for(&mut substrate, 40)
+		.map(|x| x.success())
+		.unwrap_or_default());
+
+	let output = substrate.wait_with_output().unwrap();
+
+	println!("{}", String::from_utf8(output.stdout).unwrap());
+	eprintln!("{}", String::from_utf8(output.stderr).unwrap());
+	assert!(output.status.success());
+}
diff --git a/bin/node/cli/tests/websocket_server.rs b/bin/node/cli/tests/websocket_server.rs
new file mode 100644
index 000000000000..a8af1c359952
--- /dev/null
+++ b/bin/node/cli/tests/websocket_server.rs
@@ -0,0 +1,281 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+use async_std::net::{TcpListener, TcpStream};
+use core::pin::Pin;
+use futures::prelude::*;
+use soketto::handshake::{server::Response, Server};
+use std::{io, net::SocketAddr};
+
+/// Configuration for a [`WsServer`].
+pub struct Config {
+	/// IP address to try to bind to.
+	pub bind_address: SocketAddr,
+
+	/// Maximum size, in bytes, of a frame sent by the remote.
+	///
+	/// Since the messages are entirely buffered before being returned, a maximum value is
+	/// necessary in order to prevent malicious clients from sending huge frames that would
+	/// occupy a lot of memory.
+	pub max_frame_size: usize,
+
+	/// Number of pending messages to buffer up for sending before the socket is considered
+	/// unresponsive.
+	pub send_buffer_len: usize,
+
+	/// Pre-allocated capacity for the list of connections.
+	pub capacity: usize,
+}
+
+/// Identifier for a connection with regard to a [`WsServer`].
+///
+/// After a connection has been closed, its [`ConnectionId`] might be reused.
+#[derive(Debug, Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash)]
+pub struct ConnectionId(u64);
+
+/// A WebSocket message.
+pub enum Message {
+	Text(String),
+	Binary(Vec<u8>),
+}
+
+/// WebSockets listening socket and list of open connections.
+pub struct WsServer {
+	/// Value passed through [`Config::max_frame_size`].
+	max_frame_size: usize,
+
+	/// Endpoint for incoming TCP sockets.
+	listener: TcpListener,
+
+	/// Pending incoming connection to accept. Accepted by calling [`WsServer::accept`].
+	pending_incoming: Option<TcpStream>,
+
+	/// List of TCP connections that are currently negotiating the WebSocket handshake.
+	///
+	/// The output can be an error if the handshake fails.
+	negotiating: stream::FuturesUnordered<
+		Pin<
+			Box<
+				dyn Future<Output = Result<Server<'static, TcpStream>, Box<dyn std::error::Error>>>
+					+ Send,
+			>,
+		>,
+	>,
+
+	/// List of streams of incoming messages for all connections.
+	incoming_messages: stream::SelectAll<
+		Pin<Box<dyn Stream<Item = Result<Message, Box<dyn std::error::Error>>> + Send>>,
+	>,
+
+	/// Tasks dedicated to closing sockets that have been rejected.
+	rejected_sockets: stream::FuturesUnordered<Pin<Box<dyn Future<Output = ()> + Send>>>,
+}
+
+impl WsServer {
+	/// Try opening a TCP listening socket.
+	///
+	/// Returns an error if the listening socket fails to open.
+	pub async fn new(config: Config) -> Result<Self, io::Error> {
+		let listener = TcpListener::bind(config.bind_address).await?;
+
+		Ok(WsServer {
+			max_frame_size: config.max_frame_size,
+			listener,
+			pending_incoming: None,
+			negotiating: stream::FuturesUnordered::new(),
+			incoming_messages: stream::SelectAll::new(),
+			rejected_sockets: stream::FuturesUnordered::new(),
+		})
+	}
+
+	/// Address of the local TCP listening socket, as provided by the operating system.
+	pub fn local_addr(&self) -> Result<SocketAddr, io::Error> {
+		self.listener.local_addr()
+	}
+
+	/// Accepts the pending connection.
+	///
+	/// Either [`WsServer::accept`] or [`WsServer::reject`] must be called after a
+	/// [`Event::ConnectionOpen`] event is returned.
+	///
+	/// # Panic
+	///
+	/// Panics if no connection is pending.
+	///
+	pub fn accept(&mut self) {
+		let pending_incoming = self.pending_incoming.take().expect("no pending socket");
+
+		self.negotiating.push(Box::pin(async move {
+			let mut server = Server::new(pending_incoming);
+
+			let websocket_key = match server.receive_request().await {
+				Ok(req) => req.into_key(),
+				Err(err) => return Err(Box::new(err) as Box<_>),
+			};
+
+			match server
+				.send_response(&{
+					Response::Accept {
+						key: &websocket_key,
+						protocol: None,
+					}
+				})
+				.await
+			{
+				Ok(()) => {}
+				Err(err) => return Err(Box::new(err) as Box<_>),
+			};
+
+			Ok(server)
+		}));
+	}
+
+	/// Reject the pending connection.
+	///
+	/// Either [`WsServer::accept`] or [`WsServer::reject`] must be called after a
+	/// [`Event::ConnectionOpen`] event is returned.
+	///
+	/// # Panic
+	///
+	/// Panics if no connection is pending.
+	///
+	pub fn reject(&mut self) {
+		let _ = self.pending_incoming.take().expect("no pending socket");
+	}
+
+	/// Returns the next event happening on the server.
+	pub async fn next_event(&mut self) -> Event {
+		loop {
+			futures::select! {
+				// Only try to fetch a new incoming connection if none is pending.
+				socket = {
+					let listener = &self.listener;
+					let has_pending = self.pending_incoming.is_some();
+					async move {
+						if !has_pending {
+							listener.accept().await
+						} else {
+							loop { futures::pending!() }
+						}
+					}
+				}.fuse() => {
+					let (socket, address) = match socket {
+						Ok(s) => s,
+						Err(_) => continue,
+					};
+					debug_assert!(self.pending_incoming.is_none());
+					self.pending_incoming = Some(socket);
+					return Event::ConnectionOpen { address };
+				},
+
+				result = self.negotiating.select_next_some() => {
+					let server = match result {
+						Ok(s) => s,
+						Err(error) => return Event::ConnectionError {
+							error,
+						},
+					};
+
+					let (mut _sender, receiver) = {
+						let mut builder = server.into_builder();
+						builder.set_max_frame_size(self.max_frame_size);
+						builder.set_max_message_size(self.max_frame_size);
+						builder.finish()
+					};
+
+					// Spawn a task dedicated to receiving messages from the socket.
+					self.incoming_messages.push({
+						// Turn `receiver` into a stream of received packets.
+						let socket_packets = stream::unfold((receiver, Vec::new()), move |(mut receiver, mut buf)| async {
+							buf.clear();
+							let ret = match receiver.receive_data(&mut buf).await {
+								Ok(soketto::Data::Text(len)) => String::from_utf8(buf[..len].to_vec())
+									.map(Message::Text)
+									.map_err(|err| Box::new(err) as Box<_>),
+								Ok(soketto::Data::Binary(len)) => Ok(buf[..len].to_vec())
+									.map(Message::Binary),
+								Err(err) => Err(Box::new(err) as Box<_>),
+							};
+							Some((ret, (receiver, buf)))
+						});
+
+						Box::pin(socket_packets.map(move |msg| (msg)))
+					});
+				},
+
+				result = self.incoming_messages.select_next_some() => {
+					let message = match result {
+						Ok(m) => m,
+						Err(error) => return Event::ConnectionError {
+							error,
+						},
+					};
+
+					match message {
+						Message::Text(message) => {
+							return Event::TextFrame {
+								message,
+							}
+						}
+						Message::Binary(message) => {
+							return Event::BinaryFrame {
+								message,
+							}
+						}
+					}
+				},
+
+				_ = self.rejected_sockets.select_next_some() => {
+				}
+			}
+		}
+	}
+}
+
+/// Event that has happened on a [`WsServer`].
+#[derive(Debug)]
+pub enum Event {
+	/// A new TCP connection has arrived on the listening socket.
+	///
+	/// The connection *must* be accepted or rejected using [`WsServer::accept`] or
+	/// [`WsServer::reject`].
+	/// No other [`Event::ConnectionOpen`] event will be generated until the current pending
+	/// connection has been either accepted or rejected.
+	ConnectionOpen {
+		/// Address of the remote, as provided by the operating system.
+		address: SocketAddr,
+	},
+
+	/// An error has happened on a connection. The connection is now closed and its
+	/// [`ConnectionId`] is now invalid.
+	ConnectionError { error: Box<dyn std::error::Error> },
+
+	/// A text frame has been received on a connection.
+	TextFrame {
+		/// Message sent by the remote. Its content is entirely decided by the client, and
+		/// nothing must be assumed about the validity of this message.
+		message: String,
+	},
+
+	/// A text frame has been received on a connection.
+	BinaryFrame {
+		/// Message sent by the remote. Its content is entirely decided by the client, and
+		/// nothing must be assumed about the validity of this message.
+		message: Vec<u8>,
+	},
+}
diff --git a/client/cli/src/config.rs b/client/cli/src/config.rs
index f81a64bf155a..748e3b101269 100644
--- a/client/cli/src/config.rs
+++ b/client/cli/src/config.rs
@@ -33,7 +33,7 @@ use sc_service::config::{
 	TaskExecutor, TelemetryEndpoints, TransactionPoolOptions, WasmExecutionMethod,
 };
 use sc_service::{ChainSpec, TracingReceiver, KeepBlocks, TransactionStorageMode};
-use sc_telemetry::{TelemetryHandle, TelemetrySpan};
+use sc_telemetry::TelemetryHandle;
 use sc_tracing::logging::LoggerBuilder;
 use std::net::SocketAddr;
 use std::path::PathBuf;
@@ -494,7 +494,6 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 			.transpose()?
 			// Don't initialise telemetry if `telemetry_endpoints` == Some([])
 			.filter(|x| !x.is_empty());
-		let telemetry_span = telemetry_endpoints.as_ref().map(|_| TelemetrySpan::new());
 
 		let unsafe_pruning = self
 			.import_params()
@@ -534,7 +533,6 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 			rpc_cors: self.rpc_cors(is_dev)?,
 			prometheus_config: self.prometheus_config(DCV::prometheus_listen_port())?,
 			telemetry_endpoints,
-			telemetry_span,
 			telemetry_external_transport: self.telemetry_external_transport()?,
 			default_heap_pages: self.default_heap_pages()?,
 			offchain_worker: self.offchain_worker(&role)?,
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index 0a9be763b240..c6119695ace7 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -92,3 +92,4 @@ grandpa-primitives = { version = "3.0.0", package = "sp-finality-grandpa", path
 tokio = { version = "0.2.25", default-features = false }
 async-std = { version = "1.6.5", default-features = false }
 tracing-subscriber = "0.2.15"
+tracing-log = "0.1.1"
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index 486f81667677..916929bff65d 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -56,6 +56,7 @@ use sc_telemetry::{
 	telemetry,
 	ConnectionMessage,
 	TelemetryConnectionNotifier,
+	TelemetrySpan,
 	SUBSTRATE_INFO,
 };
 use sp_transaction_pool::MaintainedTransactionPool;
@@ -308,7 +309,7 @@ pub fn new_full_parts<TBl, TRtApi, TExecDisp>(
 
 	let task_manager = {
 		let registry = config.prometheus_config.as_ref().map(|cfg| &cfg.registry);
-		TaskManager::new(config.task_executor.clone(), registry, config.telemetry_span.clone())?
+		TaskManager::new(config.task_executor.clone(), registry)?
 	};
 
 	let executor = NativeExecutor::<TExecDisp>::new(
@@ -377,7 +378,7 @@ pub fn new_light_parts<TBl, TRtApi, TExecDisp>(
 	let keystore_container = KeystoreContainer::new(&config.keystore)?;
 	let task_manager = {
 		let registry = config.prometheus_config.as_ref().map(|cfg| &cfg.registry);
-		TaskManager::new(config.task_executor.clone(), registry, config.telemetry_span.clone())?
+		TaskManager::new(config.task_executor.clone(), registry)?
 	};
 
 	let executor = NativeExecutor::<TExecDisp>::new(
@@ -491,6 +492,10 @@ pub struct SpawnTasksParams<'a, TBl: BlockT, TCl, TExPool, TRpc, Backend> {
 	pub network_status_sinks: NetworkStatusSinks<TBl>,
 	/// A Sender for RPC requests.
 	pub system_rpc_tx: TracingUnboundedSender<sc_rpc::system::Request<TBl>>,
+	/// Telemetry span.
+	///
+	/// This span needs to be entered **before** calling [`spawn_tasks()`].
+	pub telemetry_span: Option<TelemetrySpan>,
 }
 
 /// Build a shared offchain workers instance.
@@ -569,6 +574,7 @@ pub fn spawn_tasks<TBl, TBackend, TExPool, TRpc, TCl>(
 		network,
 		network_status_sinks,
 		system_rpc_tx,
+		telemetry_span,
 	} = params;
 
 	let chain_info = client.usage_info().chain;
@@ -581,6 +587,7 @@ pub fn spawn_tasks<TBl, TBackend, TExPool, TRpc, TCl>(
 
 	let telemetry_connection_notifier = init_telemetry(
 		&mut config,
+		telemetry_span,
 		network.clone(),
 		client.clone(),
 	);
@@ -681,10 +688,11 @@ async fn transaction_notifications<TBl, TExPool>(
 
 fn init_telemetry<TBl: BlockT, TCl: BlockBackend<TBl>>(
 	config: &mut Configuration,
+	telemetry_span: Option<TelemetrySpan>,
 	network: Arc<NetworkService<TBl, <TBl as BlockT>::Hash>>,
 	client: Arc<TCl>,
 ) -> Option<TelemetryConnectionNotifier> {
-	let telemetry_span = config.telemetry_span.clone()?;
+	let telemetry_span = telemetry_span?;
 	let endpoints = config.telemetry_endpoints.clone()?;
 	let genesis_hash = client.block_hash(Zero::zero()).ok().flatten().unwrap_or_default();
 	let connection_message = ConnectionMessage {
diff --git a/client/service/src/config.rs b/client/service/src/config.rs
index 1e316c37dc9a..4f0d426bdba4 100644
--- a/client/service/src/config.rs
+++ b/client/service/src/config.rs
@@ -101,10 +101,6 @@ pub struct Configuration {
 	/// This is a handle to a `TelemetryWorker` instance. It is used to initialize the telemetry for
 	/// a substrate node.
 	pub telemetry_handle: Option<sc_telemetry::TelemetryHandle>,
-	/// Telemetry span.
-	///
-	/// This span is entered for every background task spawned using the TaskManager.
-	pub telemetry_span: Option<sc_telemetry::TelemetrySpan>,
 	/// The default number of 64KB pages to allocate for Wasm execution
 	pub default_heap_pages: Option<u64>,
 	/// Should offchain workers be executed.
diff --git a/client/service/src/task_manager/mod.rs b/client/service/src/task_manager/mod.rs
index 9a1fd15952e1..652e5d443977 100644
--- a/client/service/src/task_manager/mod.rs
+++ b/client/service/src/task_manager/mod.rs
@@ -24,7 +24,7 @@ use log::{debug, error};
 use futures::{
 	Future, FutureExt, StreamExt,
 	future::{select, Either, BoxFuture, join_all, try_join_all, pending},
-	sink::SinkExt, task::{Context, Poll},
+	sink::SinkExt,
 };
 use prometheus_endpoint::{
 	exponential_buckets, register,
@@ -34,43 +34,11 @@ use prometheus_endpoint::{
 use sp_utils::mpsc::{TracingUnboundedSender, TracingUnboundedReceiver, tracing_unbounded};
 use tracing_futures::Instrument;
 use crate::{config::{TaskExecutor, TaskType, JoinFuture}, Error};
-use sc_telemetry::TelemetrySpan;
 
 mod prometheus_future;
 #[cfg(test)]
 mod tests;
 
-/// A wrapper around a `[Option<TelemetrySpan>]` and a [`Future`].
-///
-/// The telemetry in Substrate uses a span to identify the telemetry context. The span "infrastructure"
-/// is provided by the tracing-crate. Now it is possible to have your own spans as well. To support
-/// this with the [`TaskManager`] we have this wrapper. This wrapper enters the telemetry span every
-/// time the future is polled and polls the inner future. So, the inner future can still have its
-/// own span attached and we get our telemetry span ;)
-struct WithTelemetrySpan<T> {
-	span: Option<TelemetrySpan>,
-	inner: T,
-}
-
-impl<T> WithTelemetrySpan<T> {
-	fn new(span: Option<TelemetrySpan>, inner: T) -> Self {
-		Self {
-			span,
-			inner,
-		}
-	}
-}
-
-impl<T: Future<Output = ()> + Unpin> Future for WithTelemetrySpan<T> {
-	type Output = ();
-
-	fn poll(mut self: Pin<&mut Self>, ctx: &mut Context) -> Poll<Self::Output> {
-		let span = self.span.clone();
-		let _enter = span.as_ref().map(|s| s.enter());
-		Pin::new(&mut self.inner).poll(ctx)
-	}
-}
-
 /// An handle for spawning tasks in the service.
 #[derive(Clone)]
 pub struct SpawnTaskHandle {
@@ -78,7 +46,6 @@ pub struct SpawnTaskHandle {
 	executor: TaskExecutor,
 	metrics: Option<Metrics>,
 	task_notifier: TracingUnboundedSender<JoinFuture>,
-	telemetry_span: Option<TelemetrySpan>,
 }
 
 impl SpawnTaskHandle {
@@ -155,11 +122,7 @@ impl SpawnTaskHandle {
 			}
 		};
 
-		let future = future.in_current_span().boxed();
-		let join_handle = self.executor.spawn(
-			WithTelemetrySpan::new(self.telemetry_span.clone(), future).boxed(),
-			task_type,
-		);
+		let join_handle = self.executor.spawn(future.in_current_span().boxed(), task_type);
 
 		let mut task_notifier = self.task_notifier.clone();
 		self.executor.spawn(
@@ -266,8 +229,6 @@ pub struct TaskManager {
 	/// terminates and gracefully shutdown. Also ends the parent `future()` if a child's essential
 	/// task fails.
 	children: Vec<TaskManager>,
-	/// A `TelemetrySpan` used to enter the telemetry span when a task is spawned.
-	telemetry_span: Option<TelemetrySpan>,
 }
 
 impl TaskManager {
@@ -276,7 +237,6 @@ impl TaskManager {
 	pub(super) fn new(
 		executor: TaskExecutor,
 		prometheus_registry: Option<&Registry>,
-		telemetry_span: Option<TelemetrySpan>,
 	) -> Result<Self, PrometheusError> {
 		let (signal, on_exit) = exit_future::signal();
 
@@ -305,7 +265,6 @@ impl TaskManager {
 			task_notifier,
 			completion_future,
 			children: Vec::new(),
-			telemetry_span,
 		})
 	}
 
@@ -316,7 +275,6 @@ impl TaskManager {
 			executor: self.executor.clone(),
 			metrics: self.metrics.clone(),
 			task_notifier: self.task_notifier.clone(),
-			telemetry_span: self.telemetry_span.clone(),
 		}
 	}
 
diff --git a/client/service/src/task_manager/tests.rs b/client/service/src/task_manager/tests.rs
index 257f7db19870..762348ba9fa5 100644
--- a/client/service/src/task_manager/tests.rs
+++ b/client/service/src/task_manager/tests.rs
@@ -20,10 +20,14 @@ use crate::config::TaskExecutor;
 use crate::task_manager::TaskManager;
 use futures::{future::FutureExt, pin_mut, select};
 use parking_lot::Mutex;
-use std::{any::Any, sync::Arc, time::Duration};
-use tracing_subscriber::{layer::{SubscriberExt, Context}, Layer};
-use tracing::{subscriber::Subscriber, span::{Attributes, Id, Record, Span}, event::Event};
 use sc_telemetry::TelemetrySpan;
+use std::{any::Any, env, sync::Arc, time::Duration};
+use tracing::{event::Event, span::Id, subscriber::Subscriber};
+use tracing_subscriber::{
+	layer::{Context, SubscriberExt},
+	registry::LookupSpan,
+	Layer,
+};
 
 #[derive(Clone, Debug)]
 struct DropTester(Arc<Mutex<usize>>);
@@ -83,7 +87,7 @@ async fn run_background_task_blocking(duration: Duration, _keep_alive: impl Any)
 }
 
 fn new_task_manager(task_executor: TaskExecutor) -> TaskManager {
-	TaskManager::new(task_executor, None, None).unwrap()
+	TaskManager::new(task_executor, None).unwrap()
 }
 
 #[test]
@@ -315,92 +319,92 @@ fn ensure_task_manager_future_continues_when_childs_not_essential_task_fails() {
 }
 
 struct TestLayer {
-	spans_entered: Arc<Mutex<Vec<String>>>,
-	spans: Arc<Mutex<std::collections::HashMap<Id, String>>>,
+	spans_found: Arc<Mutex<Option<Vec<Id>>>>,
 }
 
-impl<S: Subscriber> Layer<S> for TestLayer {
-	fn new_span(&self, attrs: &Attributes<'_>, id: &Id, _ctx: Context<S>) {
-		self.spans.lock().insert(id.clone(), attrs.metadata().name().to_string());
-	}
-
-	fn on_record(&self, _: &Id, _: &Record<'_>, _: Context<S>) {}
+impl<S> Layer<S> for TestLayer
+where
+	S: Subscriber + for<'a> LookupSpan<'a>,
+{
+	fn on_event(&self, _: &Event<'_>, ctx: Context<S>) {
+		let mut spans_found = self.spans_found.lock();
 
-	fn on_event(&self, _: &Event<'_>, _: Context<S>) {}
+		if spans_found.is_some() {
+			panic!("on_event called multiple times");
+		}
 
-	fn on_enter(&self, span: &Id, _: Context<S>) {
-		let name = self.spans.lock().get(span).unwrap().clone();
-		self.spans_entered.lock().push(name);
+		*spans_found = Some(ctx.scope().map(|x| x.id()).collect());
 	}
-
-	fn on_exit(&self, _: &Id, _: Context<S>) {}
-
-	fn on_close(&self, _: Id, _: Context<S>) {}
 }
 
-type TestSubscriber = tracing_subscriber::layer::Layered<
-	TestLayer,
-	tracing_subscriber::fmt::Subscriber
->;
-
 fn setup_subscriber() -> (
-	TestSubscriber,
-	Arc<Mutex<Vec<String>>>,
+	impl Subscriber + for<'a> LookupSpan<'a>,
+	Arc<Mutex<Option<Vec<Id>>>>,
 ) {
-	let spans_entered = Arc::new(Mutex::new(Default::default()));
+	let spans_found = Arc::new(Mutex::new(Default::default()));
 	let layer = TestLayer {
-		spans: Arc::new(Mutex::new(Default::default())),
-		spans_entered: spans_entered.clone(),
+		spans_found: spans_found.clone(),
 	};
 	let subscriber = tracing_subscriber::fmt().finish().with(layer);
-	(subscriber, spans_entered)
+	(subscriber, spans_found)
 }
 
+/// This is not an actual test, it is used by the `telemetry_span_is_forwarded_to_task` test.
+/// The given test will call the test executable and only execute this one test that
+/// test that the telemetry span and the prefix span are forwarded correctly. This needs to be done
+/// in a separate process to avoid interfering with the other tests.
 #[test]
-fn telemetry_span_is_forwarded_to_task() {
-	let (subscriber, spans_entered) = setup_subscriber();
+fn subprocess_telemetry_span_is_forwarded_to_task() {
+	if env::var("SUBPROCESS_TEST").is_err() {
+		return;
+	}
+
+	let (subscriber, spans_found) = setup_subscriber();
+	tracing_log::LogTracer::init().unwrap();
 	let _sub_guard = tracing::subscriber::set_global_default(subscriber);
 
-	let telemetry_span = TelemetrySpan::new();
+	let mut runtime = tokio::runtime::Runtime::new().unwrap();
 
-	let span = tracing::info_span!("test");
-	let _enter = span.enter();
+	let prefix_span = tracing::info_span!("prefix");
+	let _enter_prefix_span = prefix_span.enter();
+
+	let telemetry_span = TelemetrySpan::new();
+	let _enter_telemetry_span = telemetry_span.enter();
 
-	let mut runtime = tokio::runtime::Runtime::new().unwrap();
 	let handle = runtime.handle().clone();
 	let task_executor = TaskExecutor::from(move |fut, _| handle.spawn(fut).map(|_| ()));
-	let task_manager = TaskManager::new(task_executor, None, Some(telemetry_span.clone())).unwrap();
+	let task_manager = new_task_manager(task_executor);
 
 	let (sender, receiver) = futures::channel::oneshot::channel();
-	let spawn_handle = task_manager.spawn_handle();
 
-	let span = span.clone();
 	task_manager.spawn_handle().spawn(
-		"test",
+		"log-something",
 		async move {
-			assert_eq!(span, Span::current());
-			spawn_handle.spawn("test-nested", async move {
-				assert_eq!(span, Span::current());
-				sender.send(()).unwrap();
-			}.boxed());
-		}.boxed(),
+			log::info!("boo!");
+			sender.send(()).unwrap();
+		}
+		.boxed(),
 	);
 
-	// We need to leave exit the span here. If tokio is not running with multithreading, this
-	// would lead to duplicate spans being "active" and forwarding the wrong one.
-	drop(_enter);
 	runtime.block_on(receiver).unwrap();
 	runtime.block_on(task_manager.clean_shutdown());
-	drop(runtime);
-
-	let spans = spans_entered.lock();
-	// We entered the telemetry span and the "test" in the future, the nested future and
-	// the "test" span outside of the future. So, we should have recorded 3 spans.
-	assert_eq!(5, spans.len());
-
-	assert_eq!(spans[0], "test");
-	assert_eq!(spans[1], telemetry_span.span().metadata().unwrap().name());
-	assert_eq!(spans[2], "test");
-	assert_eq!(spans[3], telemetry_span.span().metadata().unwrap().name());
-	assert_eq!(spans[4], "test");
+
+	let spans = spans_found.lock().take().unwrap();
+	assert_eq!(2, spans.len());
+
+	assert_eq!(spans[0], prefix_span.id().unwrap());
+	assert_eq!(spans[1], telemetry_span.span().id().unwrap());
+}
+
+#[test]
+fn telemetry_span_is_forwarded_to_task() {
+	let executable = env::current_exe().unwrap();
+	let output = std::process::Command::new(executable)
+		.env("SUBPROCESS_TEST", "1")
+		.args(&["--nocapture", "subprocess_telemetry_span_is_forwarded_to_task"])
+		.output()
+		.unwrap();
+	println!("{}", String::from_utf8(output.stdout).unwrap());
+	eprintln!("{}", String::from_utf8(output.stderr).unwrap());
+	assert!(output.status.success());
 }
diff --git a/client/service/test/src/lib.rs b/client/service/test/src/lib.rs
index d286c945f06c..6c99f83d4c51 100644
--- a/client/service/test/src/lib.rs
+++ b/client/service/test/src/lib.rs
@@ -268,7 +268,6 @@ fn node_config<G: RuntimeGenesis + 'static, E: ChainSpecExtension + Clone + 'sta
 		telemetry_endpoints: None,
 		telemetry_external_transport: None,
 		telemetry_handle: None,
-		telemetry_span: None,
 		default_heap_pages: None,
 		offchain_worker: Default::default(),
 		force_authoring: false,
diff --git a/utils/browser/src/lib.rs b/utils/browser/src/lib.rs
index ea9dfc9674f7..b72f2e973b68 100644
--- a/utils/browser/src/lib.rs
+++ b/utils/browser/src/lib.rs
@@ -24,7 +24,7 @@ use sc_service::{
 	GenericChainSpec, RuntimeGenesis,
 	KeepBlocks, TransactionStorageMode,
 };
-use sc_telemetry::{TelemetryHandle, TelemetrySpan};
+use sc_telemetry::TelemetryHandle;
 use sc_tracing::logging::LoggerBuilder;
 use wasm_bindgen::prelude::*;
 use futures::{
@@ -72,7 +72,6 @@ where
 		allow_private_ipv4: true,
 		enable_mdns: false,
 	};
-	let telemetry_span = telemetry_handle.as_ref().map(|_| TelemetrySpan::new());
 
 	let config = Configuration {
 		network,
@@ -84,7 +83,6 @@ where
 		}).into(),
 		telemetry_external_transport: Some(transport),
 		telemetry_handle,
-		telemetry_span,
 		role: Role::Light,
 		database: {
 			info!("Opening Indexed DB database '{}'...", name);

From cd11670e9cadf86db2dc116c68a9a7063ba0f8ec Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Thu, 18 Feb 2021 12:43:13 +0100
Subject: [PATCH 0404/1194] Unbreak browser test CI (#8149)

---
 Cargo.lock                          | 20 ++++++++++----------
 bin/node/browser-testing/Cargo.toml |  6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e3c9131a86e3..58c6baeb2371 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10150,9 +10150,9 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.69"
+version = "0.2.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cd364751395ca0f68cafb17666eee36b63077fb5ecd972bbcd74c90c4bf736e"
+checksum = "55c0f7123de74f0dab9b7d00fd614e7b19349cd1e2f5252bbe9b1754b59433be"
 dependencies = [
  "cfg-if 1.0.0",
  "serde",
@@ -10162,9 +10162,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.69"
+version = "0.2.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1114f89ab1f4106e5b55e688b828c0ab0ea593a1ea7c094b141b14cbaaec2d62"
+checksum = "7bc45447f0d4573f3d65720f636bbcc3dd6ce920ed704670118650bcd47764c7"
 dependencies = [
  "bumpalo",
  "lazy_static",
@@ -10189,9 +10189,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.69"
+version = "0.2.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6ac8995ead1f084a8dea1e65f194d0973800c7f571f6edd70adf06ecf77084"
+checksum = "3b8853882eef39593ad4174dd26fc9865a64e84026d223f63bb2c42affcbba2c"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -10199,9 +10199,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.69"
+version = "0.2.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549"
+checksum = "4133b5e7f2a531fa413b3a1695e925038a05a71cf67e87dafa295cb645a01385"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10212,9 +10212,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.69"
+version = "0.2.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158"
+checksum = "dd4945e4943ae02d15c13962b38a5b1e81eadd4b71214eee75af64a4d6a4fd64"
 
 [[package]]
 name = "wasm-bindgen-test"
diff --git a/bin/node/browser-testing/Cargo.toml b/bin/node/browser-testing/Cargo.toml
index 66e7b398dd16..af4c69b8efe8 100644
--- a/bin/node/browser-testing/Cargo.toml
+++ b/bin/node/browser-testing/Cargo.toml
@@ -12,10 +12,10 @@ libp2p = { version = "0.34.0", default-features = false }
 jsonrpc-core = "15.0.0"
 serde = "1.0.106"
 serde_json = "1.0.48"
-wasm-bindgen = { version = "=0.2.69", features = ["serde-serialize"] }
+wasm-bindgen = { version = "=0.2.70", features = ["serde-serialize"] }
 wasm-bindgen-futures = "0.4.18"
 wasm-bindgen-test = "0.3.18"
 futures = "0.3.9"
 
-node-cli = { path = "../cli", default-features = false, features = ["browser"] , version = "2.0.0"}
-sc-rpc-api = { path = "../../../client/rpc-api" , version = "0.9.0"}
+node-cli = { path = "../cli", default-features = false, features = ["browser"], version = "2.0.0"}
+sc-rpc-api = { path = "../../../client/rpc-api", version = "0.9.0"}

From 75a2d29e2ac193ab2a0d7c38308f30411fcd9099 Mon Sep 17 00:00:00 2001
From: Albrecht <14820950+weichweich@users.noreply.github.com>
Date: Thu, 18 Feb 2021 12:47:33 +0100
Subject: [PATCH 0405/1194] Benchmark macro: Allow multiple bounds in where
 (#8116)

---
 frame/benchmarking/src/lib.rs   | 4 ++--
 frame/benchmarking/src/tests.rs | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
index fd9245d18fed..e5a8bb51a27d 100644
--- a/frame/benchmarking/src/lib.rs
+++ b/frame/benchmarking/src/lib.rs
@@ -199,12 +199,12 @@ macro_rules! benchmarks_iter {
 		{ $( $where_clause:tt )* }
 		( $( $names:tt )* )
 		( $( $names_extra:tt )* )
-		where_clause { where $( $where_ty:ty: $where_bound:path ),* $(,)? }
+		where_clause { where $( $where_bound:tt )* }
 		$( $rest:tt )*
 	) => {
 		$crate::benchmarks_iter! {
 			{ $( $instance)? }
-			{ $( $where_ty: $where_bound ),* }
+			{ $( $where_bound )* }
 			( $( $names )* )
 			( $( $names_extra )* )
 			$( $rest )*
diff --git a/frame/benchmarking/src/tests.rs b/frame/benchmarking/src/tests.rs
index 53093fdf062d..8431f3e46c27 100644
--- a/frame/benchmarking/src/tests.rs
+++ b/frame/benchmarking/src/tests.rs
@@ -138,7 +138,8 @@ mod benchmarks {
 	crate::benchmarks!{
 		where_clause {
 			where
-				<T as pallet_test::OtherConfig>::OtherEvent: Into<<T as pallet_test::Config>::Event>
+				<T as pallet_test::OtherConfig>::OtherEvent: Into<<T as pallet_test::Config>::Event> + Clone,
+				<T as pallet_test::Config>::Event: Clone,
 		}
 
 		set_value {

From ca63242fc848b9bff739c246e07310dd15ec25eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Thu, 18 Feb 2021 14:58:01 +0100
Subject: [PATCH 0406/1194] Make it clear in CLI that paritydb is experimental
 (#8152)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Make it clear in CLI that paritydb is experimental

Sadly this is a breaking change for the CLI.

* Update client/cli/src/params/database_params.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
---
 client/cli/src/arg_enums.rs              | 35 ++++++++++++++++++------
 client/cli/src/params/database_params.rs |  3 +-
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/client/cli/src/arg_enums.rs b/client/cli/src/arg_enums.rs
index 2ebfa38925e2..eb033144d747 100644
--- a/client/cli/src/arg_enums.rs
+++ b/client/cli/src/arg_enums.rs
@@ -165,18 +165,35 @@ impl Into<sc_service::config::RpcMethods> for RpcMethods {
 	}
 }
 
-arg_enum! {
-	/// Database backend
-	#[allow(missing_docs)]
-	#[derive(Debug, Clone, Copy)]
-	pub enum Database {
-		// Facebooks RocksDB
-		RocksDb,
-		// ParityDb. https://github.com/paritytech/parity-db/
-		ParityDb,
+/// Database backend
+#[derive(Debug, Clone, Copy)]
+pub enum Database {
+	/// Facebooks RocksDB
+	RocksDb,
+	/// ParityDb. https://github.com/paritytech/parity-db/
+	ParityDb,
+}
+
+impl std::str::FromStr for Database {
+	type Err = String;
+
+	fn from_str(s: &str) -> Result<Self, String> {
+		if s.eq_ignore_ascii_case("rocksdb") {
+			Ok(Self::RocksDb)
+		} else if s.eq_ignore_ascii_case("paritydb-experimental") {
+			Ok(Self::ParityDb)
+		} else {
+			Err(format!("Unknwon variant `{}`, known variants: {:?}", s, Self::variants()))
+		}
 	}
 }
 
+impl Database {
+	/// Returns all the variants of this enum to be shown in the cli.
+	pub fn variants() -> &'static [&'static str] {
+		&["rocksdb", "paritydb-experimental"]
+	}
+}
 
 arg_enum! {
 	/// Whether off-chain workers are enabled.
diff --git a/client/cli/src/params/database_params.rs b/client/cli/src/params/database_params.rs
index 23d2adc07f9d..3d5aca10d581 100644
--- a/client/cli/src/params/database_params.rs
+++ b/client/cli/src/params/database_params.rs
@@ -29,6 +29,7 @@ pub struct DatabaseParams {
 		alias = "db",
 		value_name = "DB",
 		case_insensitive = true,
+		possible_values = &Database::variants(),
 	)]
 	pub database: Option<Database>,
 
@@ -38,7 +39,7 @@ pub struct DatabaseParams {
 
 	/// Enable storage chain mode
 	///
-	/// This changes the storage format for blocks bodys. 
+	/// This changes the storage format for blocks bodies.
 	/// If this is enabled, each transaction is stored separately in the
 	/// transaction database column and is only referenced by hash
 	/// in the block body column.

From 2c99434c8bab9230040cebe727e687f5a4c6d229 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Thu, 18 Feb 2021 17:04:23 +0100
Subject: [PATCH 0407/1194] Extract transactions handling from protocol.rs
 (#8110)

* Extract transactions handling from protocol.rs

* Oops, boolean

* Do this better

* Update client/network/src/transactions.rs

Co-authored-by: Nikolay Volf <nikvolf@gmail.com>

* [WIP] Fix handshake

* Finish handshake change

* Bugfix

Co-authored-by: Nikolay Volf <nikvolf@gmail.com>
---
 client/network/src/behaviour.rs     |  34 +-
 client/network/src/config.rs        |   3 +
 client/network/src/gossip/tests.rs  |   1 +
 client/network/src/lib.rs           |   1 +
 client/network/src/protocol.rs      | 347 +++-----------------
 client/network/src/service.rs       |  62 ++--
 client/network/src/service/tests.rs |   1 +
 client/network/src/transactions.rs  | 486 ++++++++++++++++++++++++++++
 client/network/test/src/lib.rs      |   2 +
 client/service/src/builder.rs       |   6 +
 10 files changed, 599 insertions(+), 344 deletions(-)
 create mode 100644 client/network/src/transactions.rs

diff --git a/client/network/src/behaviour.rs b/client/network/src/behaviour.rs
index 4a183e219fb8..0eebd1713cc8 100644
--- a/client/network/src/behaviour.rs
+++ b/client/network/src/behaviour.rs
@@ -22,7 +22,7 @@ use crate::{
 	discovery::{DiscoveryBehaviour, DiscoveryConfig, DiscoveryOut},
 	protocol::{message::Roles, CustomMessageOutcome, NotificationsSink, Protocol},
 	peer_info, request_responses, light_client_requests,
-	ObservedRole, DhtEvent, ExHashT,
+	ObservedRole, DhtEvent,
 };
 
 use bytes::Bytes;
@@ -54,9 +54,9 @@ pub use crate::request_responses::{
 /// General behaviour of the network. Combines all protocols together.
 #[derive(NetworkBehaviour)]
 #[behaviour(out_event = "BehaviourOut<B>", poll_method = "poll")]
-pub struct Behaviour<B: BlockT, H: ExHashT> {
+pub struct Behaviour<B: BlockT> {
 	/// All the substrate-specific protocols.
-	substrate: Protocol<B, H>,
+	substrate: Protocol<B>,
 	/// Periodically pings and identifies the nodes we are connected to, and store information in a
 	/// cache.
 	peer_info: peer_info::PeerInfoBehaviour,
@@ -172,10 +172,10 @@ pub enum BehaviourOut<B: BlockT> {
 	Dht(DhtEvent, Duration),
 }
 
-impl<B: BlockT, H: ExHashT> Behaviour<B, H> {
+impl<B: BlockT> Behaviour<B> {
 	/// Builds a new `Behaviour`.
 	pub fn new(
-		substrate: Protocol<B, H>,
+		substrate: Protocol<B>,
 		user_agent: String,
 		local_public_key: PublicKey,
 		light_client_request_sender: light_client_requests::sender::LightClientRequestSender<B>,
@@ -256,12 +256,12 @@ impl<B: BlockT, H: ExHashT> Behaviour<B, H> {
 	}
 
 	/// Returns a shared reference to the user protocol.
-	pub fn user_protocol(&self) -> &Protocol<B, H> {
+	pub fn user_protocol(&self) -> &Protocol<B> {
 		&self.substrate
 	}
 
 	/// Returns a mutable reference to the user protocol.
-	pub fn user_protocol_mut(&mut self) -> &mut Protocol<B, H> {
+	pub fn user_protocol_mut(&mut self) -> &mut Protocol<B> {
 		&mut self.substrate
 	}
 
@@ -294,15 +294,15 @@ fn reported_roles_to_observed_role(roles: Roles) -> ObservedRole {
 	}
 }
 
-impl<B: BlockT, H: ExHashT> NetworkBehaviourEventProcess<void::Void> for
-Behaviour<B, H> {
+impl<B: BlockT> NetworkBehaviourEventProcess<void::Void> for
+Behaviour<B> {
 	fn inject_event(&mut self, event: void::Void) {
 		void::unreachable(event)
 	}
 }
 
-impl<B: BlockT, H: ExHashT> NetworkBehaviourEventProcess<CustomMessageOutcome<B>> for
-Behaviour<B, H> {
+impl<B: BlockT> NetworkBehaviourEventProcess<CustomMessageOutcome<B>> for
+Behaviour<B> {
 	fn inject_event(&mut self, event: CustomMessageOutcome<B>) {
 		match event {
 			CustomMessageOutcome::BlockImport(origin, blocks) =>
@@ -362,7 +362,7 @@ Behaviour<B, H> {
 	}
 }
 
-impl<B: BlockT, H: ExHashT> NetworkBehaviourEventProcess<request_responses::Event> for Behaviour<B, H> {
+impl<B: BlockT> NetworkBehaviourEventProcess<request_responses::Event> for Behaviour<B> {
 	fn inject_event(&mut self, event: request_responses::Event) {
 		match event {
 			request_responses::Event::InboundRequest { peer, protocol, result } => {
@@ -386,8 +386,8 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviourEventProcess<request_responses::Even
 	}
 }
 
-impl<B: BlockT, H: ExHashT> NetworkBehaviourEventProcess<peer_info::PeerInfoEvent>
-	for Behaviour<B, H> {
+impl<B: BlockT> NetworkBehaviourEventProcess<peer_info::PeerInfoEvent>
+	for Behaviour<B> {
 	fn inject_event(&mut self, event: peer_info::PeerInfoEvent) {
 		let peer_info::PeerInfoEvent::Identified {
 			peer_id,
@@ -416,8 +416,8 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviourEventProcess<peer_info::PeerInfoEven
 	}
 }
 
-impl<B: BlockT, H: ExHashT> NetworkBehaviourEventProcess<DiscoveryOut>
-	for Behaviour<B, H> {
+impl<B: BlockT> NetworkBehaviourEventProcess<DiscoveryOut>
+	for Behaviour<B> {
 	fn inject_event(&mut self, out: DiscoveryOut) {
 		match out {
 			DiscoveryOut::UnroutablePeer(_peer_id) => {
@@ -450,7 +450,7 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviourEventProcess<DiscoveryOut>
 	}
 }
 
-impl<B: BlockT, H: ExHashT> Behaviour<B, H> {
+impl<B: BlockT> Behaviour<B> {
 	fn poll<TEv>(
 		&mut self,
 		cx: &mut Context,
diff --git a/client/network/src/config.rs b/client/network/src/config.rs
index 7f8cac95f9d5..d6d4d9d7162f 100644
--- a/client/network/src/config.rs
+++ b/client/network/src/config.rs
@@ -68,6 +68,9 @@ pub struct Params<B: BlockT, H: ExHashT> {
 	/// default.
 	pub executor: Option<Box<dyn Fn(Pin<Box<dyn Future<Output = ()> + Send>>) + Send>>,
 
+	/// How to spawn the background task dedicated to the transactions handler.
+	pub transactions_handler_executor: Box<dyn Fn(Pin<Box<dyn Future<Output = ()> + Send>>) + Send>,
+
 	/// Network layer configuration.
 	pub network_config: NetworkConfiguration,
 
diff --git a/client/network/src/gossip/tests.rs b/client/network/src/gossip/tests.rs
index c0b8c5e730a1..c35159168d0f 100644
--- a/client/network/src/gossip/tests.rs
+++ b/client/network/src/gossip/tests.rs
@@ -116,6 +116,7 @@ fn build_test_full_node(network_config: config::NetworkConfiguration)
 	let worker = NetworkWorker::new(config::Params {
 		role: config::Role::Full,
 		executor: None,
+		transactions_handler_executor: Box::new(|task| { async_std::task::spawn(task); }),
 		network_config,
 		chain: client.clone(),
 		on_demand: None,
diff --git a/client/network/src/lib.rs b/client/network/src/lib.rs
index 5bd20927869e..556e71da2383 100644
--- a/client/network/src/lib.rs
+++ b/client/network/src/lib.rs
@@ -264,6 +264,7 @@ pub mod config;
 pub mod error;
 pub mod gossip;
 pub mod network_state;
+pub mod transactions;
 
 #[doc(inline)]
 pub use libp2p::{multiaddr, Multiaddr, PeerId};
diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index acb5d9101eac..e1a10b520ba9 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -17,9 +17,8 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{
-	ExHashT,
 	chain::Client,
-	config::{self, ProtocolId, TransactionPool, TransactionImportFuture, TransactionImport},
+	config::{self, ProtocolId},
 	error,
 	request_responses::RequestFailure,
 	utils::{interval, LruHashSet},
@@ -27,7 +26,7 @@ use crate::{
 
 use bytes::{Bytes, BytesMut};
 use codec::{Decode, DecodeAll, Encode};
-use futures::{channel::oneshot, prelude::*, stream::FuturesUnordered};
+use futures::{channel::oneshot, prelude::*};
 use generic_proto::{GenericProto, GenericProtoOut};
 use libp2p::core::{ConnectedPoint, connection::{ConnectionId, ListenerId}};
 use libp2p::request_response::OutboundFailure;
@@ -37,10 +36,7 @@ use libp2p::{Multiaddr, PeerId};
 use log::{log, Level, trace, debug, warn, error};
 use message::{BlockAnnounce, Message};
 use message::generic::{Message as GenericMessage, Roles};
-use prometheus_endpoint::{
-	Registry, Gauge, Counter, GaugeVec,
-	PrometheusError, Opts, register, U64
-};
+use prometheus_endpoint::{Registry, Gauge, GaugeVec, PrometheusError, Opts, register, U64};
 use prost::Message as _;
 use sp_consensus::{
 	BlockOrigin,
@@ -55,7 +51,7 @@ use sp_arithmetic::traits::SaturatedConversion;
 use sync::{ChainSync, SyncState};
 use std::borrow::Cow;
 use std::convert::TryFrom as _;
-use std::collections::{HashMap, HashSet, VecDeque, hash_map::Entry};
+use std::collections::{HashMap, HashSet, VecDeque};
 use std::sync::Arc;
 use std::{io, iter, num::NonZeroUsize, pin::Pin, task::Poll, time};
 
@@ -69,28 +65,16 @@ pub use generic_proto::{NotificationsSink, Ready, NotifsHandlerError};
 
 /// Interval at which we perform time based maintenance
 const TICK_TIMEOUT: time::Duration = time::Duration::from_millis(1100);
-/// Interval at which we propagate transactions;
-const PROPAGATE_TIMEOUT: time::Duration = time::Duration::from_millis(2900);
 
 /// Maximum number of known block hashes to keep for a peer.
 const MAX_KNOWN_BLOCKS: usize = 1024; // ~32kb per peer + LruHashSet overhead
-/// Maximum number of known transaction hashes to keep for a peer.
-///
-/// This should be approx. 2 blocks full of transactions for the network to function properly.
-const MAX_KNOWN_TRANSACTIONS: usize = 10240; // ~300kb per peer + overhead.
-
 /// Maximum allowed size for a block announce.
 const MAX_BLOCK_ANNOUNCE_SIZE: u64 = 1024 * 1024;
-/// Maximum allowed size for a transactions notification.
-const MAX_TRANSACTIONS_SIZE: u64 = 16 * 1024 * 1024;
 
 /// Maximum size used for notifications in the block announce and transaction protocols.
 // Must be equal to `max(MAX_BLOCK_ANNOUNCE_SIZE, MAX_TRANSACTIONS_SIZE)`.
 pub(crate) const BLOCK_ANNOUNCES_TRANSACTIONS_SUBSTREAM_SIZE: u64 = 16 * 1024 * 1024;
 
-/// Maximum number of transaction validation request we keep at any moment.
-const MAX_PENDING_TRANSACTIONS: usize = 8192;
-
 /// Current protocol version.
 pub(crate) const CURRENT_VERSION: u32 = 6;
 /// Lowest version we support
@@ -98,11 +82,9 @@ pub(crate) const MIN_VERSION: u32 = 3;
 
 /// Identifier of the peerset for the block announces protocol.
 const HARDCODED_PEERSETS_SYNC: sc_peerset::SetId = sc_peerset::SetId::from(0);
-/// Identifier of the peerset for the transactions protocol.
-const HARDCODED_PEERSETS_TX: sc_peerset::SetId = sc_peerset::SetId::from(1);
 /// Number of hardcoded peersets (the constants right above). Any set whose identifier is equal or
 /// superior to this value corresponds to a user-defined protocol.
-const NUM_HARDCODED_PEERSETS: usize = 2;
+const NUM_HARDCODED_PEERSETS: usize = 1;
 
 /// When light node connects to the full node and the full node is behind light node
 /// for at least `LIGHT_MAXIMAL_BLOCKS_DIFFERENCE` blocks, we consider it not useful
@@ -117,21 +99,8 @@ mod rep {
 	pub const REFUSED: Rep = Rep::new(-(1 << 10), "Request refused");
 	/// Reputation change when we are a light client and a peer is behind us.
 	pub const PEER_BEHIND_US_LIGHT: Rep = Rep::new(-(1 << 8), "Useless for a light peer");
-	/// Reputation change when a peer sends us any transaction.
-	///
-	/// This forces node to verify it, thus the negative value here. Once transaction is verified,
-	/// reputation change should be refunded with `ANY_TRANSACTION_REFUND`
-	pub const ANY_TRANSACTION: Rep = Rep::new(-(1 << 4), "Any transaction");
-	/// Reputation change when a peer sends us any transaction that is not invalid.
-	pub const ANY_TRANSACTION_REFUND: Rep = Rep::new(1 << 4, "Any transaction (refund)");
-	/// Reputation change when a peer sends us an transaction that we didn't know about.
-	pub const GOOD_TRANSACTION: Rep = Rep::new(1 << 7, "Good transaction");
-	/// Reputation change when a peer sends us a bad transaction.
-	pub const BAD_TRANSACTION: Rep = Rep::new(-(1 << 12), "Bad transaction");
 	/// We received a message that failed to decode.
 	pub const BAD_MESSAGE: Rep = Rep::new(-(1 << 12), "Bad message");
-	/// We received an unexpected transaction packet.
-	pub const UNEXPECTED_TRANSACTIONS: Rep = Rep::new_fatal("Unexpected transactions packet");
 	/// Peer has different genesis.
 	pub const GENESIS_MISMATCH: Rep = Rep::new_fatal("Genesis mismatch");
 	/// Peer is on unsupported protocol version.
@@ -147,7 +116,6 @@ struct Metrics {
 	queued_blocks: Gauge<U64>,
 	fork_targets: Gauge<U64>,
 	justifications: GaugeVec<U64>,
-	propagated_transactions: Counter<U64>,
 }
 
 impl Metrics {
@@ -175,62 +143,27 @@ impl Metrics {
 				)?;
 				register(g, r)?
 			},
-			propagated_transactions: register(Counter::new(
-				"sync_propagated_transactions",
-				"Number of transactions propagated to at least one peer",
-			)?, r)?,
 		})
 	}
 }
 
-#[pin_project::pin_project]
-struct PendingTransaction<H> {
-	#[pin]
-	validation: TransactionImportFuture,
-	tx_hash: H,
-}
-
-impl<H: ExHashT> Future for PendingTransaction<H> {
-	type Output = (H, TransactionImport);
-
-	fn poll(self: Pin<&mut Self>, cx: &mut std::task::Context<'_>) -> Poll<Self::Output> {
-		let mut this = self.project();
-
-		if let Poll::Ready(import_result) = Pin::new(&mut this.validation).poll_unpin(cx) {
-			return Poll::Ready((this.tx_hash.clone(), import_result));
-		}
-
-		Poll::Pending
-	}
-}
-
 // Lock must always be taken in order declared here.
-pub struct Protocol<B: BlockT, H: ExHashT> {
+pub struct Protocol<B: BlockT> {
 	/// Interval at which we call `tick`.
 	tick_timeout: Pin<Box<dyn Stream<Item = ()> + Send>>,
-	/// Interval at which we call `propagate_transactions`.
-	propagate_timeout: Pin<Box<dyn Stream<Item = ()> + Send>>,
 	/// Pending list of messages to return from `poll` as a priority.
 	pending_messages: VecDeque<CustomMessageOutcome<B>>,
-	/// Pending transactions verification tasks.
-	pending_transactions: FuturesUnordered<PendingTransaction<H>>,
-	/// As multiple peers can send us the same transaction, we group
-	/// these peers using the transaction hash while the transaction is
-	/// imported. This prevents that we import the same transaction
-	/// multiple times concurrently.
-	pending_transactions_peers: HashMap<H, Vec<PeerId>>,
 	config: ProtocolConfig,
 	genesis_hash: B::Hash,
 	sync: ChainSync<B>,
 	// All connected peers
-	peers: HashMap<PeerId, Peer<B, H>>,
+	peers: HashMap<PeerId, Peer<B>>,
 	chain: Arc<dyn Client<B>>,
 	/// List of nodes for which we perform additional logging because they are important for the
 	/// user.
 	important_peers: HashSet<PeerId>,
 	/// Used to report reputation changes.
 	peerset_handle: sc_peerset::PeersetHandle,
-	transaction_pool: Arc<dyn TransactionPool<H, B>>,
 	/// Handles opening the unique substream and sending and receiving raw messages.
 	behaviour: GenericProto,
 	/// List of notifications protocols that have been registered.
@@ -245,15 +178,13 @@ pub struct Protocol<B: BlockT, H: ExHashT> {
 
 /// Peer information
 #[derive(Debug)]
-struct Peer<B: BlockT, H: ExHashT> {
+struct Peer<B: BlockT> {
 	info: PeerInfo<B>,
 	/// Current block request, if any. Started by emitting [`CustomMessageOutcome::BlockRequest`].
 	block_request: Option<(
 		message::BlockRequest<B>,
 		oneshot::Receiver<Result<Vec<u8>, RequestFailure>>,
 	)>,
-	/// Holds a set of transactions known to this peer.
-	known_transactions: LruHashSet<H>,
 	/// Holds a set of blocks known to this peer.
 	known_blocks: LruHashSet<B::Hash>,
 }
@@ -336,18 +267,17 @@ fn build_status_message<B: BlockT>(
 	Message::<B>::Status(status).encode()
 }
 
-impl<B: BlockT, H: ExHashT> Protocol<B, H> {
+impl<B: BlockT> Protocol<B> {
 	/// Create a new instance.
 	pub fn new(
 		config: ProtocolConfig,
 		chain: Arc<dyn Client<B>>,
-		transaction_pool: Arc<dyn TransactionPool<H, B>>,
 		protocol_id: ProtocolId,
-		config_role: &config::Role,
 		network_config: &config::NetworkConfiguration,
+		notifications_protocols_handshakes: Vec<Vec<u8>>,
 		block_announce_validator: Box<dyn BlockAnnounceValidator<B> + Send>,
 		metrics_registry: Option<&Registry>,
-	) -> error::Result<(Protocol<B, H>, sc_peerset::PeersetHandle, Vec<(PeerId, Multiaddr)>)> {
+	) -> error::Result<(Protocol<B>, sc_peerset::PeersetHandle, Vec<(PeerId, Multiaddr)>)> {
 		let info = chain.info();
 		let sync = ChainSync::new(
 			config.roles,
@@ -405,17 +335,6 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 					== config::NonReservedPeerMode::Deny,
 			});
 
-			// Set number 1 is used for transactions.
-			// The `reserved_nodes` of this set are later kept in sync with the peers we connect
-			// to through set 0.
-			sets.push(sc_peerset::SetConfig {
-				in_peers: 0,
-				out_peers: 0,
-				bootnodes: Vec::new(),
-				reserved_nodes: HashSet::new(),
-				reserved_only: true,
-			});
-
 			for set_cfg in &network_config.extra_sets {
 				let mut reserved_nodes = HashSet::new();
 				for reserved in set_cfg.set_config.reserved_nodes.iter() {
@@ -440,14 +359,6 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 			})
 		};
 
-		let transactions_protocol: Cow<'static, str> = Cow::from({
-			let mut proto = String::new();
-			proto.push_str("/");
-			proto.push_str(protocol_id.as_ref());
-			proto.push_str("/transactions/1");
-			proto
-		});
-
 		let block_announces_protocol: Cow<'static, str> = Cow::from({
 			let mut proto = String::new();
 			proto.push_str("/");
@@ -458,7 +369,6 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 
 		let behaviour = {
 			let versions = &((MIN_VERSION as u8)..=(CURRENT_VERSION as u8)).collect::<Vec<u8>>();
-			let handshake_message = Roles::from(config_role).encode();
 
 			let best_number = info.best_number;
 			let best_hash = info.best_hash;
@@ -477,12 +387,10 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 				build_status_message::<B>(&config, best_number, best_hash, genesis_hash),
 				peerset,
 				iter::once((block_announces_protocol, block_announces_handshake, MAX_BLOCK_ANNOUNCE_SIZE))
-					.chain(iter::once((transactions_protocol, vec![], MAX_TRANSACTIONS_SIZE)))
-					.chain(network_config.extra_sets.iter().map(|s| (
-						s.notifications_protocol.clone(),
-						handshake_message.clone(),
-						s.max_notification_size
-					))),
+					.chain(network_config.extra_sets.iter()
+						.zip(notifications_protocols_handshakes)
+						.map(|(s, hs)| (s.notifications_protocol.clone(), hs, s.max_notification_size))
+					),
 			)
 		};
 
@@ -493,17 +401,13 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 
 		let protocol = Protocol {
 			tick_timeout: Box::pin(interval(TICK_TIMEOUT)),
-			propagate_timeout: Box::pin(interval(PROPAGATE_TIMEOUT)),
 			pending_messages: VecDeque::new(),
-			pending_transactions: FuturesUnordered::new(),
-			pending_transactions_peers: HashMap::new(),
 			config,
 			peers: HashMap::new(),
 			chain,
 			genesis_hash: info.genesis_hash,
 			sync,
 			important_peers,
-			transaction_pool,
 			peerset_handle: peerset_handle.clone(),
 			behaviour,
 			notification_protocols:
@@ -652,8 +556,8 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 				debug!(target: "sub-libp2p", "Received unexpected Status"),
 			GenericMessage::BlockAnnounce(announce) =>
 				self.push_block_announce_validation(who.clone(), announce),
-			GenericMessage::Transactions(m) =>
-				self.on_transactions(who, m),
+			GenericMessage::Transactions(_) =>
+				warn!(target: "sub-libp2p", "Received unexpected Transactions"),
 			GenericMessage::BlockResponse(_) =>
 				warn!(target: "sub-libp2p", "Received unexpected BlockResponse"),
 			GenericMessage::RemoteCallResponse(_) =>
@@ -690,7 +594,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 		who: PeerId,
 		request: message::BlockRequest<B>,
 	) -> CustomMessageOutcome<B> {
-		prepare_block_request::<B, H>(&mut self.peers, who, request)
+		prepare_block_request::<B>(&mut self.peers, who, request)
 	}
 
 	/// Called by peer when it is disconnecting.
@@ -896,8 +800,6 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 				best_number: status.best_number
 			},
 			block_request: None,
-			known_transactions: LruHashSet::new(NonZeroUsize::new(MAX_KNOWN_TRANSACTIONS)
-				.expect("Constant is nonzero")),
 			known_blocks: LruHashSet::new(NonZeroUsize::new(MAX_KNOWN_BLOCKS)
 				.expect("Constant is nonzero")),
 		};
@@ -928,144 +830,6 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 		Ok(())
 	}
 
-	/// Called when peer sends us new transactions
-	fn on_transactions(
-		&mut self,
-		who: PeerId,
-		transactions: message::Transactions<B::Extrinsic>,
-	) {
-		// sending transaction to light node is considered a bad behavior
-		if !self.config.roles.is_full() {
-			trace!(target: "sync", "Peer {} is trying to send transactions to the light node", who);
-			self.behaviour.disconnect_peer(&who, HARDCODED_PEERSETS_TX);
-			self.peerset_handle.report_peer(who, rep::UNEXPECTED_TRANSACTIONS);
-			return;
-		}
-
-		// Accept transactions only when fully synced
-		if self.sync.status().state != SyncState::Idle {
-			trace!(target: "sync", "{} Ignoring transactions while syncing", who);
-			return;
-		}
-
-		trace!(target: "sync", "Received {} transactions from {}", transactions.len(), who);
-		if let Some(ref mut peer) = self.peers.get_mut(&who) {
-			for t in transactions {
-				if self.pending_transactions.len() > MAX_PENDING_TRANSACTIONS {
-					debug!(
-						target: "sync",
-						"Ignoring any further transactions that exceed `MAX_PENDING_TRANSACTIONS`({}) limit",
-						MAX_PENDING_TRANSACTIONS,
-					);
-					break;
-				}
-
-				let hash = self.transaction_pool.hash_of(&t);
-				peer.known_transactions.insert(hash.clone());
-
-				self.peerset_handle.report_peer(who.clone(), rep::ANY_TRANSACTION);
-
-				match self.pending_transactions_peers.entry(hash.clone()) {
-					Entry::Vacant(entry) => {
-						self.pending_transactions.push(PendingTransaction {
-							validation: self.transaction_pool.import(t),
-							tx_hash: hash,
-						});
-						entry.insert(vec![who.clone()]);
-					},
-					Entry::Occupied(mut entry) => {
-						entry.get_mut().push(who.clone());
-					}
-				}
-			}
-		}
-	}
-
-	fn on_handle_transaction_import(&mut self, who: PeerId, import: TransactionImport) {
-		match import {
-			TransactionImport::KnownGood => self.peerset_handle.report_peer(who, rep::ANY_TRANSACTION_REFUND),
-			TransactionImport::NewGood => self.peerset_handle.report_peer(who, rep::GOOD_TRANSACTION),
-			TransactionImport::Bad => self.peerset_handle.report_peer(who, rep::BAD_TRANSACTION),
-			TransactionImport::None => {},
-		}
-	}
-
-	/// Propagate one transaction.
-	pub fn propagate_transaction(
-		&mut self,
-		hash: &H,
-	) {
-		debug!(target: "sync", "Propagating transaction [{:?}]", hash);
-		// Accept transactions only when fully synced
-		if self.sync.status().state != SyncState::Idle {
-			return;
-		}
-		if let Some(transaction) = self.transaction_pool.transaction(hash) {
-			let propagated_to = self.do_propagate_transactions(&[(hash.clone(), transaction)]);
-			self.transaction_pool.on_broadcasted(propagated_to);
-		}
-	}
-
-	fn do_propagate_transactions(
-		&mut self,
-		transactions: &[(H, B::Extrinsic)],
-	) -> HashMap<H, Vec<String>> {
-		let mut propagated_to = HashMap::<_, Vec<_>>::new();
-		let mut propagated_transactions = 0;
-
-		for (who, peer) in self.peers.iter_mut() {
-			// never send transactions to the light node
-			if !peer.info.roles.is_full() {
-				continue;
-			}
-
-			if !self.behaviour.is_open(who, HARDCODED_PEERSETS_TX) {
-				continue;
-			}
-
-			let (hashes, to_send): (Vec<_>, Vec<_>) = transactions
-				.iter()
-				.filter(|&(ref hash, _)| peer.known_transactions.insert(hash.clone()))
-				.cloned()
-				.unzip();
-
-			propagated_transactions += hashes.len();
-
-			if !to_send.is_empty() {
-				for hash in hashes {
-					propagated_to
-						.entry(hash)
-						.or_default()
-						.push(who.to_base58());
-				}
-				trace!(target: "sync", "Sending {} transactions to {}", to_send.len(), who);
-				self.behaviour.write_notification(
-					who,
-					HARDCODED_PEERSETS_TX,
-					to_send.encode()
-				);
-			}
-		}
-
-		if let Some(ref metrics) = self.metrics {
-			metrics.propagated_transactions.inc_by(propagated_transactions as _)
-		}
-
-		propagated_to
-	}
-
-	/// Call when we must propagate ready transactions to peers.
-	pub fn propagate_transactions(&mut self) {
-		debug!(target: "sync", "Propagating transactions");
-		// Accept transactions only when fully synced
-		if self.sync.status().state != SyncState::Idle {
-			return;
-		}
-		let transactions = self.transaction_pool.transactions();
-		let propagated_to = self.do_propagate_transactions(&transactions);
-		self.transaction_pool.on_broadcasted(propagated_to);
-	}
-
 	/// Make sure an important block is propagated to peers.
 	///
 	/// In chain-based consensus, we often need to make sure non-best forks are
@@ -1317,25 +1081,21 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 	/// Set whether the syncing peers set is in reserved-only mode.
 	pub fn set_reserved_only(&self, reserved_only: bool) {
 		self.peerset_handle.set_reserved_only(HARDCODED_PEERSETS_SYNC, reserved_only);
-		self.peerset_handle.set_reserved_only(HARDCODED_PEERSETS_TX, reserved_only);
 	}
 
 	/// Removes a `PeerId` from the list of reserved peers for syncing purposes.
 	pub fn remove_reserved_peer(&self, peer: PeerId) {
 		self.peerset_handle.remove_reserved_peer(HARDCODED_PEERSETS_SYNC, peer.clone());
-		self.peerset_handle.remove_reserved_peer(HARDCODED_PEERSETS_TX, peer);
 	}
 
 	/// Adds a `PeerId` to the list of reserved peers for syncing purposes.
 	pub fn add_reserved_peer(&self, peer: PeerId) {
 		self.peerset_handle.add_reserved_peer(HARDCODED_PEERSETS_SYNC, peer.clone());
-		self.peerset_handle.add_reserved_peer(HARDCODED_PEERSETS_TX, peer);
 	}
 
 	/// Sets the list of reserved peers for syncing purposes.
 	pub fn set_reserved_peers(&self, peers: HashSet<PeerId>) {
 		self.peerset_handle.set_reserved_peers(HARDCODED_PEERSETS_SYNC, peers.clone());
-		self.peerset_handle.set_reserved_peers(HARDCODED_PEERSETS_TX, peers);
 	}
 
 	/// Removes a `PeerId` from the list of reserved peers.
@@ -1421,8 +1181,8 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
 	}
 }
 
-fn prepare_block_request<B: BlockT, H: ExHashT>(
-	peers: &mut HashMap<PeerId, Peer<B, H>>,
+fn prepare_block_request<B: BlockT>(
+	peers: &mut HashMap<PeerId, Peer<B>>,
 	who: PeerId,
 	request: message::BlockRequest<B>,
 ) -> CustomMessageOutcome<B> {
@@ -1490,7 +1250,7 @@ pub enum CustomMessageOutcome<B: BlockT> {
 	None,
 }
 
-impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
+impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 	type ProtocolsHandler = <GenericProto as NetworkBehaviour>::ProtocolsHandler;
 	type OutEvent = CustomMessageOutcome<B>;
 
@@ -1619,10 +1379,6 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 			self.tick();
 		}
 
-		while let Poll::Ready(Some(())) = self.propagate_timeout.poll_next_unpin(cx) {
-			self.propagate_transactions();
-		}
-
 		for (id, request) in self.sync.block_requests() {
 			let event = prepare_block_request(&mut self.peers, id.clone(), request);
 			self.pending_messages.push_back(event);
@@ -1631,13 +1387,6 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 			let event = prepare_block_request(&mut self.peers, id, request);
 			self.pending_messages.push_back(event);
 		}
-		if let Poll::Ready(Some((tx_hash, result))) = self.pending_transactions.poll_next_unpin(cx) {
-			if let Some(peers) = self.pending_transactions_peers.remove(&tx_hash) {
-				peers.into_iter().for_each(|p| self.on_handle_transaction_import(p, result));
-			} else {
-				warn!(target: "sub-libp2p", "Inconsistent state, no peers for pending transaction!");
-			}
-		}
 
 		// Check if there is any block announcement validation finished.
 		while let Poll::Ready(result) = self.sync.poll_block_announce_validation(cx) {
@@ -1681,11 +1430,6 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 							};
 
 							if self.on_sync_peer_connected(peer_id.clone(), handshake).is_ok() {
-								// Set 1 is kept in sync with the connected peers of set 0.
-								self.peerset_handle.add_reserved_peer(
-									HARDCODED_PEERSETS_TX,
-									peer_id.clone()
-								);
 								CustomMessageOutcome::SyncConnected(peer_id)
 							} else {
 								CustomMessageOutcome::None
@@ -1705,11 +1449,6 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 							match <BlockAnnouncesHandshake<B> as DecodeAll>::decode_all(&mut &received_handshake[..]) {
 								Ok(handshake) => {
 									if self.on_sync_peer_connected(peer_id.clone(), handshake).is_ok() {
-										// Set 1 is kept in sync with the connected peers of set 0.
-										self.peerset_handle.add_reserved_peer(
-											HARDCODED_PEERSETS_TX,
-											peer_id.clone()
-										);
 										CustomMessageOutcome::SyncConnected(peer_id)
 									} else {
 										CustomMessageOutcome::None
@@ -1731,19 +1470,28 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 						}
 					}
 
-				} else if set_id == HARDCODED_PEERSETS_TX {
-					// Nothing to do.
-					CustomMessageOutcome::None
 				} else {
-					match message::Roles::decode_all(&received_handshake[..]) {
-						Ok(roles) =>
+					match (message::Roles::decode_all(&received_handshake[..]), self.peers.get(&peer_id)) {
+						(Ok(roles), _) =>
 							CustomMessageOutcome::NotificationStreamOpened {
 								remote: peer_id,
 								protocol: self.notification_protocols[usize::from(set_id) - NUM_HARDCODED_PEERSETS].clone(),
 								roles,
 								notifications_sink,
 							},
-						Err(err) => {
+						(Err(_), Some(peer)) if received_handshake.is_empty() => {
+							// As a convenience, we allow opening substreams for "external"
+							// notification protocols with an empty handshake. This fetches the
+							// roles from the locally-known roles.
+							// TODO: remove this after https://github.com/paritytech/substrate/issues/5685
+							CustomMessageOutcome::NotificationStreamOpened {
+								remote: peer_id,
+								protocol: self.notification_protocols[usize::from(set_id) - NUM_HARDCODED_PEERSETS].clone(),
+								roles: peer.info.roles,
+								notifications_sink,
+							}
+						},
+						(Err(err), _) => {
 							debug!(target: "sync", "Failed to parse remote handshake: {}", err);
 							self.behaviour.disconnect_peer(&peer_id, set_id);
 							self.peerset_handle.report_peer(peer_id, rep::BAD_MESSAGE);
@@ -1753,7 +1501,7 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 				}
 			}
 			GenericProtoOut::CustomProtocolReplaced { peer_id, notifications_sink, set_id } => {
-				if set_id == HARDCODED_PEERSETS_SYNC || set_id == HARDCODED_PEERSETS_TX {
+				if set_id == HARDCODED_PEERSETS_SYNC {
 					CustomMessageOutcome::None
 				} else {
 					CustomMessageOutcome::NotificationStreamReplaced {
@@ -1767,11 +1515,6 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 				// Set number 0 is hardcoded the default set of peers we sync from.
 				if set_id == HARDCODED_PEERSETS_SYNC {
 					if self.on_sync_peer_disconnected(peer_id.clone()).is_ok() {
-						// Set 1 is kept in sync with the connected peers of set 0.
-						self.peerset_handle.remove_reserved_peer(
-							HARDCODED_PEERSETS_TX,
-							peer_id.clone()
-						);
 						CustomMessageOutcome::SyncDisconnected(peer_id)
 					} else {
 						log::debug!(
@@ -1781,8 +1524,6 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 						);
 						CustomMessageOutcome::None
 					}
-				} else if set_id == HARDCODED_PEERSETS_TX {
-					CustomMessageOutcome::None
 				} else {
 					CustomMessageOutcome::NotificationStreamClosed {
 						remote: peer_id,
@@ -1815,20 +1556,10 @@ impl<B: BlockT, H: ExHashT> NetworkBehaviour for Protocol<B, H> {
 							CustomMessageOutcome::None
 						}
 					}
-					HARDCODED_PEERSETS_TX if self.peers.contains_key(&peer_id) => {
-						if let Ok(m) = <message::Transactions<B::Extrinsic> as Decode>::decode(
-							&mut message.as_ref(),
-						) {
-							self.on_transactions(peer_id, m);
-						} else {
-							warn!(target: "sub-libp2p", "Failed to decode transactions list");
-						}
-						CustomMessageOutcome::None
-					}
-					HARDCODED_PEERSETS_SYNC | HARDCODED_PEERSETS_TX => {
+					HARDCODED_PEERSETS_SYNC => {
 						debug!(
 							target: "sync",
-							"Received sync or transaction for peer earlier refused by sync layer: {}",
+							"Received sync for peer earlier refused by sync layer: {}",
 							peer_id
 						);
 						CustomMessageOutcome::None
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 9ac7483467b4..74ce9316fc41 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -41,6 +41,7 @@ use crate::{
 	light_client_requests,
 	protocol::{
 		self,
+		message::generic::Roles,
 		NotifsHandlerError,
 		NotificationsSink,
 		PeerInfo,
@@ -49,9 +50,13 @@ use crate::{
 		event::Event,
 		sync::SyncState,
 	},
+	transactions,
 	transport, ReputationChange,
+
 	bitswap::Bitswap,
 };
+
+use codec::Encode as _;
 use futures::{channel::oneshot, prelude::*};
 use libp2p::{PeerId, multiaddr, Multiaddr};
 use libp2p::core::{
@@ -140,7 +145,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 	/// Returns a `NetworkWorker` that implements `Future` and must be regularly polled in order
 	/// for the network processing to advance. From it, you can extract a `NetworkService` using
 	/// `worker.service()`. The `NetworkService` can be shared through the codebase.
-	pub fn new(params: Params<B, H>) -> Result<NetworkWorker<B, H>, Error> {
+	pub fn new(mut params: Params<B, H>) -> Result<NetworkWorker<B, H>, Error> {
 		// Ensure the listen addresses are consistent with the transport.
 		ensure_addresses_consistent_with_transport(
 			params.network_config.listen_addresses.iter(),
@@ -171,6 +176,11 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 			fs::create_dir_all(path)?;
 		}
 
+		let transactions_handler_proto = transactions::TransactionsHandlerPrototype::new(
+			params.protocol_id.clone()
+		);
+		params.network_config.extra_sets.insert(0, transactions_handler_proto.set_config());
+
 		// Private and public keys configuration.
 		let local_identity = params.network_config.node_key.clone().into_keypair()?;
 		let local_public = local_identity.public();
@@ -181,16 +191,17 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 			local_peer_id.to_base58(),
 		);
 
+		let default_notif_handshake_message = Roles::from(&params.role).encode();
 		let (protocol, peerset_handle, mut known_addresses) = Protocol::new(
 			protocol::ProtocolConfig {
 				roles: From::from(&params.role),
 				max_parallel_downloads: params.network_config.max_parallel_downloads,
 			},
 			params.chain.clone(),
-			params.transaction_pool,
 			params.protocol_id.clone(),
-			&params.role,
 			&params.network_config,
+			iter::once(Vec::new()).chain((0..params.network_config.extra_sets.len() - 1)
+				.map(|_| default_notif_handshake_message.clone())).collect(),
 			params.block_announce_validator,
 			params.metrics_registry.as_ref(),
 		)?;
@@ -234,7 +245,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 
 		// Build the swarm.
 		let client = params.chain.clone();
-		let (mut swarm, bandwidth): (Swarm<B, H>, _) = {
+		let (mut swarm, bandwidth): (Swarm<B>, _) = {
 			let user_agent = format!(
 				"{} ({})",
 				params.network_config.client_version,
@@ -377,14 +388,14 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 
 		// Listen on multiaddresses.
 		for addr in &params.network_config.listen_addresses {
-			if let Err(err) = Swarm::<B, H>::listen_on(&mut swarm, addr.clone()) {
+			if let Err(err) = Swarm::<B>::listen_on(&mut swarm, addr.clone()) {
 				warn!(target: "sub-libp2p", "Can't listen on {} because: {:?}", addr, err)
 			}
 		}
 
 		// Add external addresses.
 		for addr in &params.network_config.public_addresses {
-			Swarm::<B, H>::add_external_address(&mut swarm, addr.clone(), AddressScore::Infinite);
+			Swarm::<B>::add_external_address(&mut swarm, addr.clone(), AddressScore::Infinite);
 		}
 
 		let external_addresses = Arc::new(Mutex::new(Vec::new()));
@@ -404,6 +415,14 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 			_marker: PhantomData,
 		});
 
+		let (tx_handler, tx_handler_controller) = transactions_handler_proto.build(
+			service.clone(),
+			params.role,
+			params.transaction_pool,
+			params.metrics_registry.as_ref()
+		)?;
+		(params.transactions_handler_executor)(tx_handler.run().boxed());
+
 		Ok(NetworkWorker {
 			external_addresses,
 			num_connected,
@@ -415,6 +434,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 			light_client_rqs: params.on_demand.and_then(|od| od.extract_receiver()),
 			event_streams: out_events::OutChannels::new(params.metrics_registry.as_ref())?,
 			peers_notifications_sinks,
+			tx_handler_controller,
 			metrics,
 			boot_node_ids,
 		})
@@ -506,14 +526,14 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 
 	/// Returns the local `PeerId`.
 	pub fn local_peer_id(&self) -> &PeerId {
-		Swarm::<B, H>::local_peer_id(&self.network_service)
+		Swarm::<B>::local_peer_id(&self.network_service)
 	}
 
 	/// Returns the list of addresses we are listening on.
 	///
 	/// Does **NOT** include a trailing `/p2p/` with our `PeerId`.
 	pub fn listen_addresses(&self) -> impl Iterator<Item = &Multiaddr> {
-		Swarm::<B, H>::listeners(&self.network_service)
+		Swarm::<B>::listeners(&self.network_service)
 	}
 
 	/// Get network state.
@@ -564,9 +584,9 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 				.collect()
 		};
 
-		let peer_id = Swarm::<B, H>::local_peer_id(&swarm).to_base58();
-		let listened_addresses = Swarm::<B, H>::listeners(&swarm).cloned().collect();
-		let external_addresses = Swarm::<B, H>::external_addresses(&swarm)
+		let peer_id = Swarm::<B>::local_peer_id(&swarm).to_base58();
+		let listened_addresses = Swarm::<B>::listeners(&swarm).cloned().collect();
+		let external_addresses = Swarm::<B>::external_addresses(&swarm)
 			.map(|r| &r.addr)
 			.cloned()
 			.collect();
@@ -1293,7 +1313,7 @@ pub struct NetworkWorker<B: BlockT + 'static, H: ExHashT> {
 	/// The network service that can be extracted and shared through the codebase.
 	service: Arc<NetworkService<B, H>>,
 	/// The *actual* network.
-	network_service: Swarm<B, H>,
+	network_service: Swarm<B>,
 	/// The import queue that was passed at initialization.
 	import_queue: Box<dyn ImportQueue<B>>,
 	/// Messages from the [`NetworkService`] that must be processed.
@@ -1309,6 +1329,8 @@ pub struct NetworkWorker<B: BlockT + 'static, H: ExHashT> {
 	/// For each peer and protocol combination, an object that allows sending notifications to
 	/// that peer. Shared with the [`NetworkService`].
 	peers_notifications_sinks: Arc<Mutex<HashMap<(PeerId, Cow<'static, str>), NotificationsSink>>>,
+	/// Controller for the handler of incoming and outgoing transactions.
+	tx_handler_controller: transactions::TransactionsHandlerController<H>,
 }
 
 impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
@@ -1368,9 +1390,9 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 				ServiceToWorkerMsg::RequestJustification(hash, number) =>
 					this.network_service.user_protocol_mut().request_justification(&hash, number),
 				ServiceToWorkerMsg::PropagateTransaction(hash) =>
-					this.network_service.user_protocol_mut().propagate_transaction(&hash),
+					this.tx_handler_controller.propagate_transaction(hash),
 				ServiceToWorkerMsg::PropagateTransactions =>
-					this.network_service.user_protocol_mut().propagate_transactions(),
+					this.tx_handler_controller.propagate_transactions(),
 				ServiceToWorkerMsg::GetValue(key) =>
 					this.network_service.get_value(&key),
 				ServiceToWorkerMsg::PutValue(key, value) =>
@@ -1749,7 +1771,7 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 		// Update the variables shared with the `NetworkService`.
 		this.num_connected.store(num_connected_peers, Ordering::Relaxed);
 		{
-			let external_addresses = Swarm::<B, H>::external_addresses(&this.network_service)
+			let external_addresses = Swarm::<B>::external_addresses(&this.network_service)
 				.map(|r| &r.addr)
 				.cloned()
 				.collect();
@@ -1761,6 +1783,8 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 			SyncState::Downloading => true,
 		};
 
+		this.tx_handler_controller.set_gossip_enabled(!is_major_syncing);
+
 		this.is_major_syncing.store(is_major_syncing, Ordering::Relaxed);
 
 		if let Some(metrics) = this.metrics.as_ref() {
@@ -1792,14 +1816,14 @@ impl<B: BlockT + 'static, H: ExHashT> Unpin for NetworkWorker<B, H> {
 }
 
 /// The libp2p swarm, customized for our needs.
-type Swarm<B, H> = libp2p::swarm::Swarm<Behaviour<B, H>>;
+type Swarm<B> = libp2p::swarm::Swarm<Behaviour<B>>;
 
 // Implementation of `import_queue::Link` trait using the available local variables.
-struct NetworkLink<'a, B: BlockT, H: ExHashT> {
-	protocol: &'a mut Swarm<B, H>,
+struct NetworkLink<'a, B: BlockT> {
+	protocol: &'a mut Swarm<B>,
 }
 
-impl<'a, B: BlockT, H: ExHashT> Link<B> for NetworkLink<'a, B, H> {
+impl<'a, B: BlockT> Link<B> for NetworkLink<'a, B> {
 	fn blocks_processed(
 		&mut self,
 		imported: usize,
diff --git a/client/network/src/service/tests.rs b/client/network/src/service/tests.rs
index f88854963fb9..defb9213a349 100644
--- a/client/network/src/service/tests.rs
+++ b/client/network/src/service/tests.rs
@@ -116,6 +116,7 @@ fn build_test_full_node(config: config::NetworkConfiguration)
 	let worker = NetworkWorker::new(config::Params {
 		role: config::Role::Full,
 		executor: None,
+		transactions_handler_executor: Box::new(|task| { async_std::task::spawn(task); }),
 		network_config: config,
 		chain: client.clone(),
 		on_demand: None,
diff --git a/client/network/src/transactions.rs b/client/network/src/transactions.rs
new file mode 100644
index 000000000000..e6d807c2cb78
--- /dev/null
+++ b/client/network/src/transactions.rs
@@ -0,0 +1,486 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! Transactions handling to plug on top of the network service.
+//!
+//! Usage:
+//!
+//! - Use [`TransactionsHandlerPrototype::new`] to create a prototype.
+//! - Pass the return value of [`TransactionsHandlerPrototype::set_config`] to the network
+//! configuration as an extra peers set.
+//! - Use [`TransactionsHandlerPrototype::build`] then [`TransactionsHandler::run`] to obtain a
+//! `Future` that processes transactions.
+//!
+
+use crate::{
+	ExHashT, Event, ObservedRole,
+	config::{self, ProtocolId, TransactionPool, TransactionImportFuture, TransactionImport},
+	error, protocol::message, service::NetworkService, utils::{interval, LruHashSet},
+};
+
+use codec::{Decode, Encode};
+use futures::{channel::mpsc, prelude::*, stream::FuturesUnordered};
+use libp2p::{multiaddr, PeerId};
+use log::{trace, debug, warn};
+use prometheus_endpoint::{
+	Registry, Counter, PrometheusError, register, U64
+};
+use sp_runtime::traits::Block as BlockT;
+use std::borrow::Cow;
+use std::collections::{HashMap, hash_map::Entry};
+use std::sync::{atomic::{AtomicBool, Ordering}, Arc};
+use std::{iter, num::NonZeroUsize, pin::Pin, task::Poll, time};
+
+/// Interval at which we propagate transactions;
+const PROPAGATE_TIMEOUT: time::Duration = time::Duration::from_millis(2900);
+
+/// Maximum number of known transaction hashes to keep for a peer.
+///
+/// This should be approx. 2 blocks full of transactions for the network to function properly.
+const MAX_KNOWN_TRANSACTIONS: usize = 10240; // ~300kb per peer + overhead.
+
+/// Maximum allowed size for a transactions notification.
+const MAX_TRANSACTIONS_SIZE: u64 = 16 * 1024 * 1024;
+
+/// Maximum number of transaction validation request we keep at any moment.
+const MAX_PENDING_TRANSACTIONS: usize = 8192;
+
+mod rep {
+	use sc_peerset::ReputationChange as Rep;
+	/// Reputation change when a peer sends us any transaction.
+	///
+	/// This forces node to verify it, thus the negative value here. Once transaction is verified,
+	/// reputation change should be refunded with `ANY_TRANSACTION_REFUND`
+	pub const ANY_TRANSACTION: Rep = Rep::new(-(1 << 4), "Any transaction");
+	/// Reputation change when a peer sends us any transaction that is not invalid.
+	pub const ANY_TRANSACTION_REFUND: Rep = Rep::new(1 << 4, "Any transaction (refund)");
+	/// Reputation change when a peer sends us an transaction that we didn't know about.
+	pub const GOOD_TRANSACTION: Rep = Rep::new(1 << 7, "Good transaction");
+	/// Reputation change when a peer sends us a bad transaction.
+	pub const BAD_TRANSACTION: Rep = Rep::new(-(1 << 12), "Bad transaction");
+	/// We received an unexpected transaction packet.
+	pub const UNEXPECTED_TRANSACTIONS: Rep = Rep::new_fatal("Unexpected transactions packet");
+}
+
+struct Metrics {
+	propagated_transactions: Counter<U64>,
+}
+
+impl Metrics {
+	fn register(r: &Registry) -> Result<Self, PrometheusError> {
+		Ok(Metrics {
+			propagated_transactions: register(Counter::new(
+				"sync_propagated_transactions",
+				"Number of transactions propagated to at least one peer",
+			)?, r)?,
+		})
+	}
+}
+
+#[pin_project::pin_project]
+struct PendingTransaction<H> {
+	#[pin]
+	validation: TransactionImportFuture,
+	tx_hash: H,
+}
+
+impl<H: ExHashT> Future for PendingTransaction<H> {
+	type Output = (H, TransactionImport);
+
+	fn poll(self: Pin<&mut Self>, cx: &mut std::task::Context<'_>) -> Poll<Self::Output> {
+		let mut this = self.project();
+
+		if let Poll::Ready(import_result) = Pin::new(&mut this.validation).poll_unpin(cx) {
+			return Poll::Ready((this.tx_hash.clone(), import_result));
+		}
+
+		Poll::Pending
+	}
+}
+
+/// Prototype for a [`TransactionsHandler`].
+pub struct TransactionsHandlerPrototype {
+	protocol_name: Cow<'static, str>,
+}
+
+impl TransactionsHandlerPrototype {
+	/// Create a new instance.
+	pub fn new(protocol_id: ProtocolId) -> Self {
+		TransactionsHandlerPrototype {
+			protocol_name: Cow::from({
+				let mut proto = String::new();
+				proto.push_str("/");
+				proto.push_str(protocol_id.as_ref());
+				proto.push_str("/transactions/1");
+				proto
+			})
+		}
+	}
+
+	/// Returns the configuration of the set to put in the network configuration.
+	pub fn set_config(&self) -> config::NonDefaultSetConfig {
+		config::NonDefaultSetConfig {
+			notifications_protocol: self.protocol_name.clone(),
+			max_notification_size: MAX_TRANSACTIONS_SIZE,
+			set_config: config::SetConfig {
+				in_peers: 0,
+				out_peers: 0,
+				reserved_nodes: Vec::new(),
+				non_reserved_mode: config::NonReservedPeerMode::Deny,
+			}
+		}
+	}
+
+	/// Turns the prototype into the actual handler. Returns a controller that allows controlling
+	/// the behaviour of the handler while it's running.
+	///
+	/// Important: the transactions handler is initially disabled and doesn't gossip transactions.
+	/// You must call [`TransactionsHandlerController::set_gossip_enabled`] to enable it.
+	pub fn build<B: BlockT + 'static, H: ExHashT>(
+		self,
+		service: Arc<NetworkService<B, H>>,
+		local_role: config::Role,
+		transaction_pool: Arc<dyn TransactionPool<H, B>>,
+		metrics_registry: Option<&Registry>,
+	) -> error::Result<(TransactionsHandler<B, H>, TransactionsHandlerController<H>)> {
+		let event_stream = service.event_stream("transactions-handler").boxed();
+		let (to_handler, from_controller) = mpsc::unbounded();
+		let gossip_enabled = Arc::new(AtomicBool::new(false));
+
+		let handler = TransactionsHandler {
+			protocol_name: self.protocol_name,
+			propagate_timeout: Box::pin(interval(PROPAGATE_TIMEOUT)),
+			pending_transactions: FuturesUnordered::new(),
+			pending_transactions_peers: HashMap::new(),
+			gossip_enabled: gossip_enabled.clone(),
+			service,
+			event_stream,
+			peers: HashMap::new(),
+			transaction_pool,
+			local_role,
+			from_controller,
+			metrics: if let Some(r) = metrics_registry {
+				Some(Metrics::register(r)?)
+			} else {
+				None
+			},
+		};
+
+		let controller = TransactionsHandlerController {
+			to_handler,
+			gossip_enabled,
+		};
+
+		Ok((handler, controller))
+	}
+}
+
+/// Controls the behaviour of a [`TransactionsHandler`] it is connected to.
+pub struct TransactionsHandlerController<H: ExHashT> {
+	to_handler: mpsc::UnboundedSender<ToHandler<H>>,
+	gossip_enabled: Arc<AtomicBool>,
+}
+
+impl<H: ExHashT> TransactionsHandlerController<H> {
+	/// Controls whether transactions are being gossiped on the network.
+	pub fn set_gossip_enabled(&mut self, enabled: bool) {
+		self.gossip_enabled.store(enabled, Ordering::Relaxed);
+	}
+
+	/// You may call this when new transactions are imported by the transaction pool.
+	///
+	/// All transactions will be fetched from the `TransactionPool` that was passed at
+	/// initialization as part of the configuration and propagated to peers.
+	pub fn propagate_transactions(&self) {
+		let _ = self.to_handler.unbounded_send(ToHandler::PropagateTransactions);
+	}
+
+	/// You must call when new a transaction is imported by the transaction pool.
+	///
+	/// This transaction will be fetched from the `TransactionPool` that was passed at
+	/// initialization as part of the configuration and propagated to peers.
+	pub fn propagate_transaction(&self, hash: H) {
+		let _ = self.to_handler.unbounded_send(ToHandler::PropagateTransaction(hash));
+	}
+}
+
+enum ToHandler<H: ExHashT> {
+	PropagateTransactions,
+	PropagateTransaction(H),
+}
+
+/// Handler for transactions. Call [`TransactionsHandler::run`] to start the processing.
+pub struct TransactionsHandler<B: BlockT + 'static, H: ExHashT> {
+	protocol_name: Cow<'static, str>,
+	/// Interval at which we call `propagate_transactions`.
+	propagate_timeout: Pin<Box<dyn Stream<Item = ()> + Send>>,
+	/// Pending transactions verification tasks.
+	pending_transactions: FuturesUnordered<PendingTransaction<H>>,
+	/// As multiple peers can send us the same transaction, we group
+	/// these peers using the transaction hash while the transaction is
+	/// imported. This prevents that we import the same transaction
+	/// multiple times concurrently.
+	pending_transactions_peers: HashMap<H, Vec<PeerId>>,
+	/// Network service to use to send messages and manage peers.
+	service: Arc<NetworkService<B, H>>,
+	/// Stream of networking events.
+	event_stream: Pin<Box<dyn Stream<Item = Event> + Send>>,
+	// All connected peers
+	peers: HashMap<PeerId, Peer<H>>,
+	transaction_pool: Arc<dyn TransactionPool<H, B>>,
+	gossip_enabled: Arc<AtomicBool>,
+	local_role: config::Role,
+	from_controller: mpsc::UnboundedReceiver<ToHandler<H>>,
+	/// Prometheus metrics.
+	metrics: Option<Metrics>,
+}
+
+/// Peer information
+#[derive(Debug)]
+struct Peer<H: ExHashT> {
+	/// Holds a set of transactions known to this peer.
+	known_transactions: LruHashSet<H>,
+	role: ObservedRole,
+}
+
+impl<B: BlockT + 'static, H: ExHashT> TransactionsHandler<B, H> {
+	/// Turns the [`TransactionsHandler`] into a future that should run forever and not be
+	/// interrupted.
+	pub async fn run(mut self) {
+		loop {
+			futures::select!{
+				_ = self.propagate_timeout.next().fuse() => {
+					self.propagate_transactions();
+				},
+				(tx_hash, result) = self.pending_transactions.select_next_some() => {
+					if let Some(peers) = self.pending_transactions_peers.remove(&tx_hash) {
+						peers.into_iter().for_each(|p| self.on_handle_transaction_import(p, result));
+					} else {
+						warn!(target: "sub-libp2p", "Inconsistent state, no peers for pending transaction!");
+					}
+				},
+				network_event = self.event_stream.next().fuse() => {
+					if let Some(network_event) = network_event {
+						self.handle_network_event(network_event).await;
+					} else {
+						// Networking has seemingly closed. Closing as well.
+						return;
+					}
+				},
+				message = self.from_controller.select_next_some().fuse() => {
+					match message {
+						ToHandler::PropagateTransaction(hash) => self.propagate_transaction(&hash),
+						ToHandler::PropagateTransactions => self.propagate_transactions(),
+					}
+				},
+			}
+		}
+	}
+
+	async fn handle_network_event(&mut self, event: Event) {
+		match event {
+			Event::Dht(_) => {},
+			Event::SyncConnected { remote } => {
+				let addr = iter::once(multiaddr::Protocol::P2p(remote.into()))
+					.collect::<multiaddr::Multiaddr>();
+				let result = self.service.add_peers_to_reserved_set(
+					self.protocol_name.clone(),
+					iter::once(addr).collect()
+				);
+				if let Err(err) = result {
+					log::error!(target: "sync", "Add reserved peer failed: {}", err);
+				}
+			},
+			Event::SyncDisconnected { remote } => {
+				let addr = iter::once(multiaddr::Protocol::P2p(remote.into()))
+					.collect::<multiaddr::Multiaddr>();
+				let result = self.service.remove_peers_from_reserved_set(
+					self.protocol_name.clone(),
+					iter::once(addr).collect()
+				);
+				if let Err(err) = result {
+					log::error!(target: "sync", "Removing reserved peer failed: {}", err);
+				}
+			},
+
+			Event::NotificationStreamOpened { remote, protocol, role } if protocol == self.protocol_name => {
+				self.peers.insert(remote, Peer {
+					known_transactions: LruHashSet::new(NonZeroUsize::new(MAX_KNOWN_TRANSACTIONS)
+						.expect("Constant is nonzero")),
+					role,
+				});
+			}
+			Event::NotificationStreamClosed { remote, protocol } if protocol == self.protocol_name => {
+				self.peers.remove(&remote);
+			}
+
+			Event::NotificationsReceived { remote, messages } => {
+				for (protocol, message) in messages {
+					if protocol != self.protocol_name {
+						continue;
+					}
+
+					if let Ok(m) = <message::Transactions<B::Extrinsic> as Decode>::decode(
+						&mut message.as_ref(),
+					) {
+						self.on_transactions(remote, m);
+					} else {
+						warn!(target: "sub-libp2p", "Failed to decode transactions list");
+					}
+				}
+			},
+
+			// Not our concern.
+			Event::NotificationStreamOpened { .. } | Event::NotificationStreamClosed { .. } => {}
+		}
+	}
+
+	/// Called when peer sends us new transactions
+	fn on_transactions(
+		&mut self,
+		who: PeerId,
+		transactions: message::Transactions<B::Extrinsic>,
+	) {
+		// sending transaction to light node is considered a bad behavior
+		if matches!(self.local_role, config::Role::Light) {
+			trace!(target: "sync", "Peer {} is trying to send transactions to the light node", who);
+			self.service.disconnect_peer(who, self.protocol_name.clone());
+			self.service.report_peer(who, rep::UNEXPECTED_TRANSACTIONS);
+			return;
+		}
+
+		// Accept transactions only when enabled
+		if !self.gossip_enabled.load(Ordering::Relaxed) {
+			trace!(target: "sync", "{} Ignoring transactions while disabled", who);
+			return;
+		}
+
+		trace!(target: "sync", "Received {} transactions from {}", transactions.len(), who);
+		if let Some(ref mut peer) = self.peers.get_mut(&who) {
+			for t in transactions {
+				if self.pending_transactions.len() > MAX_PENDING_TRANSACTIONS {
+					debug!(
+						target: "sync",
+						"Ignoring any further transactions that exceed `MAX_PENDING_TRANSACTIONS`({}) limit",
+						MAX_PENDING_TRANSACTIONS,
+					);
+					break;
+				}
+
+				let hash = self.transaction_pool.hash_of(&t);
+				peer.known_transactions.insert(hash.clone());
+
+				self.service.report_peer(who.clone(), rep::ANY_TRANSACTION);
+
+				match self.pending_transactions_peers.entry(hash.clone()) {
+					Entry::Vacant(entry) => {
+						self.pending_transactions.push(PendingTransaction {
+							validation: self.transaction_pool.import(t),
+							tx_hash: hash,
+						});
+						entry.insert(vec![who.clone()]);
+					},
+					Entry::Occupied(mut entry) => {
+						entry.get_mut().push(who.clone());
+					}
+				}
+			}
+		}
+	}
+
+	fn on_handle_transaction_import(&mut self, who: PeerId, import: TransactionImport) {
+		match import {
+			TransactionImport::KnownGood => self.service.report_peer(who, rep::ANY_TRANSACTION_REFUND),
+			TransactionImport::NewGood => self.service.report_peer(who, rep::GOOD_TRANSACTION),
+			TransactionImport::Bad => self.service.report_peer(who, rep::BAD_TRANSACTION),
+			TransactionImport::None => {},
+		}
+	}
+
+	/// Propagate one transaction.
+	pub fn propagate_transaction(
+		&mut self,
+		hash: &H,
+	) {
+		debug!(target: "sync", "Propagating transaction [{:?}]", hash);
+		// Accept transactions only when enabled
+		if !self.gossip_enabled.load(Ordering::Relaxed) {
+			return;
+		}
+		if let Some(transaction) = self.transaction_pool.transaction(hash) {
+			let propagated_to = self.do_propagate_transactions(&[(hash.clone(), transaction)]);
+			self.transaction_pool.on_broadcasted(propagated_to);
+		}
+	}
+
+	fn do_propagate_transactions(
+		&mut self,
+		transactions: &[(H, B::Extrinsic)],
+	) -> HashMap<H, Vec<String>> {
+		let mut propagated_to = HashMap::<_, Vec<_>>::new();
+		let mut propagated_transactions = 0;
+
+		for (who, peer) in self.peers.iter_mut() {
+			// never send transactions to the light node
+			if !matches!(peer.role, ObservedRole::Full) {
+				continue;
+			}
+
+			let (hashes, to_send): (Vec<_>, Vec<_>) = transactions
+				.iter()
+				.filter(|&(ref hash, _)| peer.known_transactions.insert(hash.clone()))
+				.cloned()
+				.unzip();
+
+			propagated_transactions += hashes.len();
+
+			if !to_send.is_empty() {
+				for hash in hashes {
+					propagated_to
+						.entry(hash)
+						.or_default()
+						.push(who.to_base58());
+				}
+				trace!(target: "sync", "Sending {} transactions to {}", to_send.len(), who);
+				self.service.write_notification(
+					who.clone(),
+					self.protocol_name.clone(),
+					to_send.encode()
+				);
+			}
+		}
+
+		if let Some(ref metrics) = self.metrics {
+			metrics.propagated_transactions.inc_by(propagated_transactions as _)
+		}
+
+		propagated_to
+	}
+
+	/// Call when we must propagate ready transactions to peers.
+	fn propagate_transactions(&mut self) {
+		// Accept transactions only when enabled
+		if !self.gossip_enabled.load(Ordering::Relaxed) {
+			return;
+		}
+		debug!(target: "sync", "Propagating transactions");
+		let transactions = self.transaction_pool.transactions();
+		let propagated_to = self.do_propagate_transactions(&transactions);
+		self.transaction_pool.on_broadcasted(propagated_to);
+	}
+}
diff --git a/client/network/test/src/lib.rs b/client/network/test/src/lib.rs
index f523be857507..6e2380b28478 100644
--- a/client/network/test/src/lib.rs
+++ b/client/network/test/src/lib.rs
@@ -741,6 +741,7 @@ pub trait TestNetFactory: Sized {
 		let network = NetworkWorker::new(sc_network::config::Params {
 			role: Role::Full,
 			executor: None,
+			transactions_handler_executor: Box::new(|task| { async_std::task::spawn(task); }),
 			network_config,
 			chain: client.clone(),
 			on_demand: None,
@@ -831,6 +832,7 @@ pub trait TestNetFactory: Sized {
 		let network = NetworkWorker::new(sc_network::config::Params {
 			role: Role::Light,
 			executor: None,
+			transactions_handler_executor: Box::new(|task| { async_std::task::spawn(task); }),
 			network_config,
 			chain: client.clone(),
 			on_demand: None,
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index 916929bff65d..103e499a589d 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -912,6 +912,12 @@ pub fn build_network<TBl, TExPool, TImpQu, TCl>(
 				spawn_handle.spawn("libp2p-node", fut);
 			}))
 		},
+		transactions_handler_executor: {
+			let spawn_handle = Clone::clone(&spawn_handle);
+			Box::new(move |fut| {
+				spawn_handle.spawn("network-transactions-handler", fut);
+			})
+		},
 		network_config: config.network.clone(),
 		chain: client.clone(),
 		on_demand: on_demand,

From f53d72f0fdadf56c34f3199bea96c652633f82a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Fri, 19 Feb 2021 00:15:26 +0100
Subject: [PATCH 0408/1194] Remove `OnSlot` associated type (#8156)

Currently we always use a boxed future everywhere anyway. This also
enables us to use a boxed `SlotWorker` (which is required for Cumulus).
---
 client/consensus/slots/src/lib.rs | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/client/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs
index d85175392133..62b6b452eb41 100644
--- a/client/consensus/slots/src/lib.rs
+++ b/client/consensus/slots/src/lib.rs
@@ -71,14 +71,15 @@ pub struct SlotResult<Block: BlockT> {
 /// The implementation should not make any assumptions of the slot being bound to the time or
 /// similar. The only valid assumption is that the slot number is always increasing.
 pub trait SlotWorker<B: BlockT> {
-	/// The type of the future that will be returned when a new slot is triggered.
-	type OnSlot: Future<Output = Option<SlotResult<B>>>;
-
 	/// Called when a new slot is triggered.
 	///
 	/// Returns a future that resolves to a [`SlotResult`] iff a block was successfully built in
 	/// the slot. Otherwise `None` is returned.
-	fn on_slot(&mut self, chain_head: B::Header, slot_info: SlotInfo) -> Self::OnSlot;
+	fn on_slot(
+		&mut self,
+		chain_head: B::Header,
+		slot_info: SlotInfo,
+	) -> Pin<Box<dyn Future<Output = Option<SlotResult<B>>> + Send>>;
 }
 
 /// A skeleton implementation for `SlotWorker` which tries to claim a slot at
@@ -383,9 +384,11 @@ pub trait SimpleSlotWorker<B: BlockT> {
 }
 
 impl<B: BlockT, T: SimpleSlotWorker<B>> SlotWorker<B> for T {
-	type OnSlot = Pin<Box<dyn Future<Output = Option<SlotResult<B>>> + Send>>;
-
-	fn on_slot(&mut self, chain_head: B::Header, slot_info: SlotInfo) -> Self::OnSlot {
+	fn on_slot(
+		&mut self,
+		chain_head: B::Header,
+		slot_info: SlotInfo,
+	) -> Pin<Box<dyn Future<Output = Option<SlotResult<B>>> + Send>> {
 		SimpleSlotWorker::on_slot(self, chain_head, slot_info)
 	}
 }
@@ -416,7 +419,6 @@ where
 	B: BlockT,
 	C: SelectChain<B>,
 	W: SlotWorker<B>,
-	W::OnSlot: Unpin,
 	SO: SyncOracle + Send,
 	SC: SlotCompatible + Unpin,
 	T: SlotData + Clone,

From 1c842c45a1564acc1a2ba0cbd4d0467570a16d4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Fri, 19 Feb 2021 15:04:23 +0100
Subject: [PATCH 0409/1194] Fix warning in rustdoc job (#8159)

* Fix warning in rustdoc job

* More fixes

* Remove `build-rust-doc` job

Remove this job until upstream is fixed:
https://github.com/rust-lang/rust/issues/82284

* CI: temp. remove of the publishing job, no use of it w/o build

Co-authored-by: Denis P <denis.pisarev@parity.io>
---
 .gitlab-ci.yml                               | 50 -------------------
 client/api/src/in_mem.rs                     |  6 +--
 client/cli/src/arg_enums.rs                  |  2 +-
 client/finality-grandpa-warp-sync/src/lib.rs |  3 +-
 frame/system/src/limits.rs                   |  6 +--
 primitives/state-machine/src/ext.rs          | 52 +++++++++++++-------
 6 files changed, 39 insertions(+), 80 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a237bfc49659..d87f6e3e9826 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -463,30 +463,6 @@ build-macos-subkey:
   tags:
     - osx
 
-build-rust-doc:
-  stage:                           build
-  <<:                              *docker-env
-  <<:                              *test-refs
-  needs:
-    - job:                         test-linux-stable
-      artifacts:                   false
-  variables:
-    <<:                            *default-vars
-    RUSTFLAGS:                     -Dwarnings
-  artifacts:
-    name:                          "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}-doc"
-    when:                          on_success
-    expire_in:                     7 days
-    paths:
-    - ./crate-docs/
-  script:
-    - rm -f ./crate-docs/index.html # use it as an indicator if the job succeeds
-    - SKIP_WASM_BUILD=1 RUSTDOCFLAGS="--html-in-header $(pwd)/.maintain/rustdoc-header.html"
-        time cargo +nightly doc --no-deps --workspace --all-features --verbose
-    - mv ./target/doc ./crate-docs
-    - echo "<meta http-equiv=refresh content=0;url=sc_service/index.html>" > ./crate-docs/index.html
-    - sccache -s
-
 #### stage:                        publish
 
 .build-push-docker-image:          &build-push-docker-image
@@ -567,32 +543,6 @@ publish-s3-release:
     - aws s3 ls s3://${BUCKET}/${PREFIX}/latest/
         --recursive --human-readable --summarize
 
-publish-s3-doc:
-  stage:                           publish
-  image:                           paritytech/awscli:latest
-  allow_failure:                   true
-  needs:
-    - job:                         build-rust-doc
-      artifacts:                   true
-    - job:                         build-linux-substrate
-      artifacts:                   false
-  <<:                              *build-refs
-  <<:                              *kubernetes-build
-  variables:
-    GIT_STRATEGY:                  none
-    BUCKET:                        "releases.parity.io"
-    PREFIX:                        "substrate-rustdoc"
-  script:
-    - test -r ./crate-docs/index.html || (
-        echo "./crate-docs/index.html not present, build:rust:doc:release job not complete";
-        exit 1
-      )
-    - aws s3 sync --delete --size-only --only-show-errors
-        ./crate-docs/ s3://${BUCKET}/${PREFIX}/
-  after_script:
-    - aws s3 ls s3://${BUCKET}/${PREFIX}/
-        --human-readable --summarize
-
 publish-draft-release:
   stage:                           publish
   image:                           paritytech/tools:latest
diff --git a/client/api/src/in_mem.rs b/client/api/src/in_mem.rs
index c108acc7b43b..b7060cf1d9b1 100644
--- a/client/api/src/in_mem.rs
+++ b/client/api/src/in_mem.rs
@@ -488,7 +488,6 @@ impl<Block: BlockT> ProvideChtRoots<Block> for Blockchain<Block> {
 /// In-memory operation.
 pub struct BlockImportOperation<Block: BlockT> {
 	pending_block: Option<PendingBlock<Block>>,
-	pending_cache: HashMap<CacheKeyId, Vec<u8>>,
 	old_state: InMemoryBackend<HashFor<Block>>,
 	new_state: Option<<InMemoryBackend<HashFor<Block>> as StateBackend<HashFor<Block>>>::Transaction>,
 	aux: Vec<(Vec<u8>, Option<Vec<u8>>)>,
@@ -520,9 +519,7 @@ impl<Block: BlockT> backend::BlockImportOperation<Block> for BlockImportOperatio
 		Ok(())
 	}
 
-	fn update_cache(&mut self, cache: HashMap<CacheKeyId, Vec<u8>>) {
-		self.pending_cache = cache;
-	}
+	fn update_cache(&mut self, _cache: HashMap<CacheKeyId, Vec<u8>>) {}
 
 	fn update_db_storage(
 		&mut self,
@@ -637,7 +634,6 @@ impl<Block: BlockT> backend::Backend<Block> for Backend<Block> where Block::Hash
 		let old_state = self.state_at(BlockId::Hash(Default::default()))?;
 		Ok(BlockImportOperation {
 			pending_block: None,
-			pending_cache: Default::default(),
 			old_state,
 			new_state: None,
 			aux: Default::default(),
diff --git a/client/cli/src/arg_enums.rs b/client/cli/src/arg_enums.rs
index eb033144d747..4b1f197cf3ea 100644
--- a/client/cli/src/arg_enums.rs
+++ b/client/cli/src/arg_enums.rs
@@ -170,7 +170,7 @@ impl Into<sc_service::config::RpcMethods> for RpcMethods {
 pub enum Database {
 	/// Facebooks RocksDB
 	RocksDb,
-	/// ParityDb. https://github.com/paritytech/parity-db/
+	/// ParityDb. <https://github.com/paritytech/parity-db/>
 	ParityDb,
 }
 
diff --git a/client/finality-grandpa-warp-sync/src/lib.rs b/client/finality-grandpa-warp-sync/src/lib.rs
index f7ce59b1c168..e14bcfdd4f32 100644
--- a/client/finality-grandpa-warp-sync/src/lib.rs
+++ b/client/finality-grandpa-warp-sync/src/lib.rs
@@ -14,8 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Helper for handling (i.e. answering) grandpa warp sync requests from a remote peer via the
-//! [`crate::request_responses::RequestResponsesBehaviour`].
+//! Helper for handling (i.e. answering) grandpa warp sync requests from a remote peer.
 
 use codec::Decode;
 use sc_network::config::{IncomingRequest, OutgoingResponse, ProtocolId, RequestResponseConfig};
diff --git a/frame/system/src/limits.rs b/frame/system/src/limits.rs
index 95452bcf51e3..49a458224020 100644
--- a/frame/system/src/limits.rs
+++ b/frame/system/src/limits.rs
@@ -129,7 +129,7 @@ pub struct WeightsPerClass {
 /// `on_initialize` pallet callbacks are invoked and their cost is added before any extrinsic
 /// is executed. This cost is tracked as `Mandatory` dispatch class.
 ///
-/// ```ignore
+/// ```text,ignore
 /// |   | `max_block`    |   |
 /// |   |                |   |
 /// |   |                |   |
@@ -148,7 +148,7 @@ pub struct WeightsPerClass {
 /// one `Normal`). Each class has it's own limit `max_total`, but also the sum cannot exceed
 /// `max_block` value.
 ///
-/// ```ignore
+/// ```text,ignore
 ///                          -- `Mandatory` limit (unlimited)
 /// | # |                 |   |
 /// | # | `Ext3`          | - - `Operational` limit
@@ -170,7 +170,7 @@ pub struct WeightsPerClass {
 /// out lower-priority `Operational` transactions. In such cases you might add a `reserved` capacity
 /// for given class.
 ///
-/// ```ignore
+/// ```test,ignore
 ///              _
 ///   #           \
 ///   #   `Ext8`   - `reserved`
diff --git a/primitives/state-machine/src/ext.rs b/primitives/state-machine/src/ext.rs
index 1e64cd74bc1b..551f8687b421 100644
--- a/primitives/state-machine/src/ext.rs
+++ b/primitives/state-machine/src/ext.rs
@@ -575,27 +575,41 @@ where
 	#[cfg(feature = "std")]
 	fn storage_changes_root(&mut self, parent_hash: &[u8]) -> Result<Option<Vec<u8>>, ()> {
 		let _guard = guard();
-		let root = self.overlay.changes_trie_root(
-			self.backend,
-			self.changes_trie_state.as_ref(),
-			Decode::decode(&mut &parent_hash[..]).map_err(|e|
-				trace!(
-					target: "state",
-					"Failed to decode changes root parent hash: {}",
-					e,
-				)
-			)?,
-			true,
-			self.storage_transaction_cache,
-		);
+		if let Some(ref root) = self.storage_transaction_cache.changes_trie_transaction_storage_root {
+			trace!(
+				target: "state",
+				"{:04x}: ChangesRoot({})(cached) {:?}",
+				self.id,
+				HexDisplay::from(&parent_hash),
+				root,
+			);
 
-		trace!(target: "state", "{:04x}: ChangesRoot({}) {:?}",
-			self.id,
-			HexDisplay::from(&parent_hash),
-			root,
-		);
+			Ok(Some(root.encode()))
+		} else {
+			let root = self.overlay.changes_trie_root(
+				self.backend,
+				self.changes_trie_state.as_ref(),
+				Decode::decode(&mut &parent_hash[..]).map_err(|e|
+					trace!(
+						target: "state",
+						"Failed to decode changes root parent hash: {}",
+						e,
+					)
+				)?,
+				true,
+				self.storage_transaction_cache,
+			);
+
+			trace!(
+				target: "state",
+				"{:04x}: ChangesRoot({}) {:?}",
+				self.id,
+				HexDisplay::from(&parent_hash),
+				root,
+			);
 
-		root.map(|r| r.map(|o| o.encode()))
+			root.map(|r| r.map(|o| o.encode()))
+		}
 	}
 
 	fn storage_start_transaction(&mut self) {

From 9029ab04dbf062123b91b449a2e00a814df89f6f Mon Sep 17 00:00:00 2001
From: Denis Pisarev <denis.pisarev@parity.io>
Date: Fri, 19 Feb 2021 15:48:08 +0100
Subject: [PATCH 0410/1194] CI: test and update ci image, codeowners (#8142)

* CI: prep for the new ff deployment

* CI: variable for CI image

* git: add CI team and remove Max from CODEOWNERS

* CI: diener should be updated in CI image, not here.

* CI: diener should be updated in CI image, not here.

* CI: run cargo deny on changes to manifests and lock; run build jobs on schedules [skip ci]

* CI: remove flaming-fir deployment, it will be handled from s3 updates [skip ci]

* CI: trigger simnet with a certain substrate version

* CI: remove cargo-audit in favor of cargo-deny; prepare for being triggered

* CI: prepare to be triggered

* CI: chore
---
 .gitlab-ci.yml                                | 141 +++++++-----------
 .maintain/flamingfir-deploy.sh                |  35 -----
 .../gitlab/check_polkadot_companion_build.sh  |   2 -
 docs/CODEOWNERS                               |  12 +-
 4 files changed, 62 insertions(+), 128 deletions(-)
 delete mode 100755 .maintain/flamingfir-deploy.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d87f6e3e9826..9cd755bc799b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,6 +39,7 @@ variables:                         &default-vars
   CARGO_INCREMENTAL:               0
   DOCKER_OS:                       "debian:stretch"
   ARCH:                            "x86_64"
+  CI_IMAGE:                        "paritytech/ci-linux:production"
   # FIXME set to release
   CARGO_UNLEASH_INSTALL_PARAMS:    "--version 1.0.0-alpha.11"
   CARGO_UNLEASH_PKG_DEF:           "--skip node node-* pallet-template pallet-example pallet-example-* subkey chain-spec-builder"
@@ -60,7 +61,7 @@ default:
   interruptible:                   true
 
 .docker-env:                       &docker-env
-  image:                           paritytech/ci-linux:production
+  image:                           "${CI_IMAGE}"
   before_script:
     - rustup show
     - cargo --version
@@ -84,12 +85,39 @@ default:
     - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
     - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
 
+.test-refs-no-trigger:             &test-refs-no-trigger
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "pipeline"
+      when: never
+    - if: $CI_PIPELINE_SOURCE == "web"
+    - if: $CI_PIPELINE_SOURCE == "schedule"
+    - if: $CI_COMMIT_REF_NAME == "master"
+    - if: $CI_COMMIT_REF_NAME == "tags"
+    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
+    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
+
 .build-refs:                       &build-refs
   rules:
+    # .publish-refs with manual on PRs
+    - if: $CI_PIPELINE_SOURCE == "pipeline"
+      when: never
     - if: $CI_PIPELINE_SOURCE == "web"
     - if: $CI_COMMIT_REF_NAME == "master"
     - if: $CI_COMMIT_REF_NAME == "tags"
     - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
+    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
+      when: manual
+      allow_failure: true
+
+.publish-refs:                     &publish-refs
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "pipeline"
+      when: never
+    - if: $CI_PIPELINE_SOURCE == "web"
+    - if: $CI_PIPELINE_SOURCE == "schedule"
+    - if: $CI_COMMIT_REF_NAME == "master"
+    - if: $CI_COMMIT_REF_NAME == "tags"
+    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
 
 #### stage:                       .pre
 
@@ -145,6 +173,8 @@ test-dependency-rules:
   stage:                           check
   image:                           paritytech/tools:latest
   <<:                              *kubernetes-build
+  rules:
+    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
   script:
     - .maintain/ensure-deps.sh
 
@@ -153,36 +183,28 @@ test-prometheus-alerting-rules:
   image:                           paritytech/tools:latest
   <<:                              *kubernetes-build
   rules:
+    - if: $CI_PIPELINE_SOURCE == "pipeline"
+      when: never
     - if: $CI_COMMIT_BRANCH
       changes:
         - .gitlab-ci.yml
         - .maintain/monitoring/**/*
   script:
     - promtool check rules .maintain/monitoring/alerting-rules/alerting-rules.yaml
-    - cat .maintain/monitoring/alerting-rules/alerting-rules.yaml | promtool test rules .maintain/monitoring/alerting-rules/alerting-rule-tests.yaml
+    - cat .maintain/monitoring/alerting-rules/alerting-rules.yaml |
+        promtool test rules .maintain/monitoring/alerting-rules/alerting-rule-tests.yaml
 
 #### stage:                        test
 
-cargo-audit:
-  stage:                           test
-  <<:                              *docker-env
-  rules:
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
-      when: never
-    - if: $CI_PIPELINE_SOURCE == "web"
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-    - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
-  script:
-    - cargo audit
-  allow_failure:                   true
-
 cargo-deny:
   stage:                           test
   <<:                              *docker-env
   rules:
-    - if: $CI_COMMIT_MESSAGE =~ /skip-checks/
+    - if: $CI_PIPELINE_SOURCE == "pipeline"
       when: never
+    - changes:
+      - "Cargo.lock"
+      - "**/Cargo.toml"
     - if: $CI_PIPELINE_SOURCE == "web"
     - if: $CI_PIPELINE_SOURCE == "schedule"
     - if: $CI_COMMIT_REF_NAME == "master"
@@ -205,7 +227,7 @@ cargo-deny:
 cargo-check-benches:
   stage:                           test
   <<:                              *docker-env
-  <<:                              *test-refs
+  <<:                              *test-refs-no-trigger
   script:
     - SKIP_WASM_BUILD=1 time cargo +nightly check --benches --all
     - cargo run --release -p node-bench -- ::node::import::native::sr25519::transfer_keep_alive::paritydb::small
@@ -262,9 +284,8 @@ unleash-check:
   stage:                           test
   <<:                              *docker-env
   rules:
-    - if: $CI_COMMIT_MESSAGE =~ /skip-checks/
+    - if: $CI_PIPELINE_SOURCE == "pipeline"
       when: never
-      # .test-refs
     - if: $CI_COMMIT_REF_NAME == "master"
     - if: $CI_COMMIT_REF_NAME == "tags"
     - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
@@ -281,7 +302,7 @@ test-frame-examples-compile-to-wasm:
     <<:                            *default-vars
     # Enable debug assertions since we are running optimized builds for testing
     # but still want to have debug assertions.
-    RUSTFLAGS: -Cdebug-assertions=y
+    RUSTFLAGS:                     "-Cdebug-assertions=y"
     RUST_BACKTRACE: 1
   script:
     - cd frame/example-offchain-worker/
@@ -333,7 +354,7 @@ test-full-crypto-feature:
     <<:                            *default-vars
     # Enable debug assertions since we are running optimized builds for testing
     # but still want to have debug assertions.
-    RUSTFLAGS: -Cdebug-assertions=y
+    RUSTFLAGS:                     "-Cdebug-assertions=y"
     RUST_BACKTRACE: 1
   script:
     - cd primitives/core/
@@ -346,7 +367,7 @@ cargo-check-macos:
   stage:                           test
   # shell runner on mac ignores the image set in *docker-env
   <<:                              *docker-env
-  <<:                              *test-refs
+  <<:                              *test-refs-no-trigger
   script:
     - SKIP_WASM_BUILD=1 time cargo check --release
     - sccache -s
@@ -367,7 +388,7 @@ check-polkadot-companion-status:
 check-polkadot-companion-build:
   stage:                           build
   <<:                              *docker-env
-  <<:                              *test-refs
+  <<:                              *test-refs-no-trigger
   needs:
     - job:                         test-linux-stable-int
       artifacts:                   false
@@ -396,15 +417,7 @@ build-linux-substrate:             &build-binary
   stage:                           build
   <<:                              *collect-artifacts
   <<:                              *docker-env
-  rules:
-    # .build-refs with manual on PRs
-    - if: $CI_PIPELINE_SOURCE == "web"
-    - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME == "tags"
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
-      when: manual
-      allow_failure: true
+  <<:                              *build-refs
   needs:
     - job:                         test-linux-stable
       artifacts:                   false
@@ -431,15 +444,7 @@ build-linux-subkey:                &build-subkey
   stage:                           build
   <<:                              *collect-artifacts
   <<:                              *docker-env
-  rules:
-    # .build-refs with manual on PRs
-    - if: $CI_PIPELINE_SOURCE == "web"
-    - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME == "tags"
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
-      when: manual
-      allow_failure: true
+  <<:                              *build-refs
   needs:
     - job:                         cargo-check-subkey
       artifacts:                   false
@@ -466,7 +471,7 @@ build-macos-subkey:
 #### stage:                        publish
 
 .build-push-docker-image:          &build-push-docker-image
-  <<:                              *build-refs
+  <<:                              *publish-refs
   <<:                              *kubernetes-build
   image:                           quay.io/buildah/stable
   variables:                       &docker-build-vars
@@ -499,8 +504,6 @@ build-macos-subkey:
 publish-docker-substrate:
   stage:                           publish
   <<:                              *build-push-docker-image
-  # collect VERSION artifact here to pass it on to kubernetes
-  <<:                              *collect-artifacts
   needs:
     - job:                         build-linux-substrate
       artifacts:                   true
@@ -508,8 +511,12 @@ publish-docker-substrate:
     <<:                            *docker-build-vars
     PRODUCT:                       substrate
   after_script:
-    # only VERSION information is needed for the deployment
-    - find ./artifacts/ -depth -not -name VERSION -type f -delete
+    - echo "VERSION=${VERSION}" >> build.env
+  artifacts:
+    reports:
+      # this artifact is used in trigger-simnet job
+      # https://docs.gitlab.com/ee/ci/multi_project_pipelines.html#with-variable-inheritance
+      dotenv: artifacts/substrate/build.env
 
 publish-docker-subkey:
   stage:                           publish
@@ -523,7 +530,7 @@ publish-docker-subkey:
 
 publish-s3-release:
   stage:                           publish
-  <<:                              *build-refs
+  <<:                              *publish-refs
   <<:                              *kubernetes-build
   needs:
     - job:                         build-linux-substrate
@@ -587,6 +594,8 @@ deploy-prometheus-alerting-rules:
     - kubectl -n ${NAMESPACE} patch prometheusrule ${PROMETHEUSRULE}
         --type=merge --patch "$(sed 's/^/  /;1s/^/spec:\n/' ${RULES})"
   rules:
+    - if: $CI_PIPELINE_SOURCE == "pipeline"
+      when: never
     - if: $CI_COMMIT_REF_NAME == "master"
       changes:
         - .gitlab-ci.yml
@@ -599,43 +608,7 @@ trigger-simnet:
     - if: $CI_COMMIT_REF_NAME == "master" && $CI_PIPELINE_SOURCE == "schedule" && $PIPELINE == "nightly"
   needs:
     - job:                         publish-docker-substrate
-      artifacts:                   false
   trigger:
     project:                       parity/simnet
     branch:                        master
     strategy:                      depend
-
-.validator-deploy:                 &validator-deploy
-  stage:                           deploy
-  rules:
-    # this job runs only on nightly pipeline with the mentioned variable, against `master` branch
-    - if: $CI_COMMIT_REF_NAME == "master" && $CI_PIPELINE_SOURCE == "schedule" && $PIPELINE == "nightly"
-  needs:
-    # script will fail if there is no artifacts/substrate/VERSION
-    - job:                         publish-docker-substrate
-      artifacts:                   true
-  image:                           parity/azure-ansible:v2
-  allow_failure:                   true
-  interruptible:                   true
-  tags:
-    - linux-docker
-
-validator 1 4:
-  <<:                              *validator-deploy
-  script:
-    - ./.maintain/flamingfir-deploy.sh flamingfir-validator1
-
-validator 2 4:
-  <<:                              *validator-deploy
-  script:
-    - ./.maintain/flamingfir-deploy.sh flamingfir-validator2
-
-validator 3 4:
-  <<:                              *validator-deploy
-  script:
-    - ./.maintain/flamingfir-deploy.sh flamingfir-validator3
-
-validator 4 4:
-  <<:                              *validator-deploy
-  script:
-    - ./.maintain/flamingfir-deploy.sh flamingfir-validator4
diff --git a/.maintain/flamingfir-deploy.sh b/.maintain/flamingfir-deploy.sh
deleted file mode 100755
index 8f0fb3a2bc01..000000000000
--- a/.maintain/flamingfir-deploy.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-RETRY_COUNT=10
-RETRY_ATTEMPT=0
-SLEEP_TIME=15
-TARGET_HOST="$1"
-COMMIT=$(cat artifacts/substrate/VERSION)
-DOWNLOAD_URL="https://releases.parity.io/substrate/x86_64-debian:stretch/${COMMIT}/substrate/substrate"
-POST_DATA='{"extra_vars":{"artifact_path":"'${DOWNLOAD_URL}'","target_host":"'${TARGET_HOST}'"}}'
-
-JOB_ID=$(wget -O - --header "Authorization: Bearer ${AWX_TOKEN}" --header "Content-type: application/json" --post-data "${POST_DATA}" https://ansible-awx.parity.io/api/v2/job_templates/32/launch/ | jq .job)
-
-echo "Launched job: $JOB_ID"
-
-
-while [ ${RETRY_ATTEMPT} -le ${RETRY_COUNT} ] ; do
-	export RETRY_RESULT=$(wget -O - --header "Authorization: Bearer ${AWX_TOKEN}"  https://ansible-awx.parity.io/api/v2/jobs/${JOB_ID}/ | jq .status)
-	RETRY_ATTEMPT=$(( $RETRY_ATTEMPT +1 ))
-	sleep $SLEEP_TIME
-	if [ $(echo $RETRY_RESULT | egrep  -e successful -e failed) ] ; then
-            break
-        fi
-done
-
-AWX_OUTPUT=$(wget -O - --header "Authorization: Bearer ${AWX_TOKEN}"  https://ansible-awx.parity.io/api/v2/jobs/${JOB_ID}/stdout?format=txt_download)
-
-echo "AWX job log:"
-echo "${AWX_OUTPUT}"
-
-
-JOB_STATUS=$(wget -O - --header "Authorization: Bearer ${AWX_TOKEN}"  https://ansible-awx.parity.io/api/v2/jobs/${JOB_ID}/ | jq .status )
-
-echo "==================================="
-echo -e "Ansible AWX Remote Job: ${JOB_ID} \x1B[31mStatus: ${JOB_STATUS}\x1B[0m"
-echo "==================================="
diff --git a/.maintain/gitlab/check_polkadot_companion_build.sh b/.maintain/gitlab/check_polkadot_companion_build.sh
index e5b308d038e2..bf8fbf5aaf41 100755
--- a/.maintain/gitlab/check_polkadot_companion_build.sh
+++ b/.maintain/gitlab/check_polkadot_companion_build.sh
@@ -51,8 +51,6 @@ git merge origin/master
 # ancestor for successfully performing merges below.
 git clone --depth 20 https://github.com/paritytech/polkadot.git
 
-cargo install -f diener
-
 cd polkadot
 
 # either it's a pull request then check for a companion otherwise use
diff --git a/docs/CODEOWNERS b/docs/CODEOWNERS
index a3837e167786..865c8d56dff3 100644
--- a/docs/CODEOWNERS
+++ b/docs/CODEOWNERS
@@ -18,6 +18,11 @@
 #   are more recognizable on GitHub, you can use them for mentioning unlike an email.
 # - The latest matching rule, if multiple, takes precedence.
 
+# CI
+/.maintain/ @paritytech/ci
+/.github/ @paritytech/ci
+/.gitlab-ci.yml @paritytech/ci
+
 # Block production
 /client/basic-authorship/ @NikVolf
 
@@ -56,10 +61,3 @@
 
 # Transaction weight stuff
 /frame/support/src/weights.rs @shawntabrizi
-
-# Authority discovery
-/client/authority-discovery/ @mxinden
-/frame/authority-discovery/ @mxinden
-
-# Prometheus endpoint
-/utils/prometheus/ @mxinden

From 394c52eb2dec7bf237e10bde508ef3e0eb023528 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Fri, 19 Feb 2021 14:52:09 +0000
Subject: [PATCH 0411/1194] Migration testing runtime API/Bot (#8038)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* A clean new attempt

* Checkpoint to move remote.

* A lot of dependency wiring to make it feature gated.

* bad macro, bad macro.

* Undo the DB mess.

* Update frame/support/src/traits.rs

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

* Apply suggestions from code review

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

* unbreak the build

* Update frame/try-runtime/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update utils/frame/try-runtime/cli/Cargo.toml

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Update frame/try-runtime/Cargo.toml

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Address most review grumbles.

* Fix build

* Add some comments

* Remove allowing one pallet at a time.

* More grumbles.

* relocate remote-ext

* Fix build

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 .gitignore                                  |   1 +
 Cargo.lock                                  |  52 +++
 Cargo.toml                                  |   3 +
 bin/node/cli/Cargo.toml                     |   9 +
 bin/node/cli/src/cli.rs                     |   5 +
 bin/node/cli/src/command.rs                 |  15 +
 bin/node/runtime/Cargo.toml                 |   5 +
 bin/node/runtime/src/lib.rs                 |  24 +-
 client/service/src/task_manager/mod.rs      |   2 +-
 client/state-db/src/lib.rs                  |   8 +-
 frame/executive/Cargo.toml                  |   3 +
 frame/executive/src/lib.rs                  |  72 +++-
 frame/support/Cargo.toml                    |   1 +
 frame/support/src/traits.rs                 |  34 +-
 frame/try-runtime/Cargo.toml                |  31 ++
 frame/try-runtime/src/lib.rs                |  37 ++
 primitives/core/src/hexdisplay.rs           |   6 +
 primitives/state-machine/src/testing.rs     |  16 +-
 primitives/storage/src/lib.rs               |   9 +-
 utils/frame/remote-externalities/Cargo.toml |  34 ++
 utils/frame/remote-externalities/proxy_test | Bin 0 -> 26476 bytes
 utils/frame/remote-externalities/src/lib.rs | 454 ++++++++++++++++++++
 utils/frame/try-runtime/cli/Cargo.toml      |  32 ++
 utils/frame/try-runtime/cli/src/lib.rs      | 178 ++++++++
 24 files changed, 991 insertions(+), 40 deletions(-)
 create mode 100644 frame/try-runtime/Cargo.toml
 create mode 100644 frame/try-runtime/src/lib.rs
 create mode 100644 utils/frame/remote-externalities/Cargo.toml
 create mode 100644 utils/frame/remote-externalities/proxy_test
 create mode 100644 utils/frame/remote-externalities/src/lib.rs
 create mode 100644 utils/frame/try-runtime/cli/Cargo.toml
 create mode 100644 utils/frame/try-runtime/cli/src/lib.rs

diff --git a/.gitignore b/.gitignore
index c8f1ea9567bc..ce302c74e10a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ rls*.log
 **/hfuzz_workspace/
 .cargo/
 .cargo-remote.toml
+*.bin
diff --git a/Cargo.lock b/Cargo.lock
index 58c6baeb2371..dea99ed63bdc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1861,6 +1861,17 @@ dependencies = [
  "sp-api",
 ]
 
+[[package]]
+name = "frame-try-runtime"
+version = "0.9.0"
+dependencies = [
+ "frame-support",
+ "parity-scale-codec",
+ "sp-api",
+ "sp-runtime",
+ "sp-std",
+]
+
 [[package]]
 name = "fs-swap"
 version = "0.2.5"
@@ -3949,6 +3960,7 @@ dependencies = [
  "substrate-build-script-utils",
  "substrate-frame-cli",
  "tempfile",
+ "try-runtime-cli",
  "wasm-bindgen",
  "wasm-bindgen-futures",
 ]
@@ -4072,6 +4084,7 @@ dependencies = [
  "frame-system",
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
+ "frame-try-runtime",
  "hex-literal",
  "node-primitives",
  "pallet-assets",
@@ -6372,6 +6385,24 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "remote-externalities"
+version = "0.9.0"
+dependencies = [
+ "async-std",
+ "bincode",
+ "env_logger 0.8.2",
+ "futures 0.1.30",
+ "hex-literal",
+ "jsonrpc-core-client",
+ "log",
+ "sc-rpc",
+ "sc-rpc-api",
+ "sp-core",
+ "sp-io",
+ "tokio 0.1.22",
+]
+
 [[package]]
 name = "remove_dir_all"
 version = "0.5.3"
@@ -9898,6 +9929,27 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 
+[[package]]
+name = "try-runtime-cli"
+version = "0.9.0"
+dependencies = [
+ "frame-try-runtime",
+ "log",
+ "parity-scale-codec",
+ "remote-externalities",
+ "sc-cli",
+ "sc-client-api",
+ "sc-executor",
+ "sc-service",
+ "sp-api",
+ "sp-blockchain",
+ "sp-core",
+ "sp-externalities",
+ "sp-runtime",
+ "sp-state-machine",
+ "structopt",
+]
+
 [[package]]
 name = "trybuild"
 version = "1.0.39"
diff --git a/Cargo.toml b/Cargo.toml
index 38b3a2bdcf29..adc8960ffd76 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -73,6 +73,7 @@ members = [
 	"frame/contracts/rpc",
 	"frame/contracts/rpc/runtime-api",
 	"frame/democracy",
+	"frame/try-runtime",
 	"frame/elections",
 	"frame/example",
 	"frame/example-offchain-worker",
@@ -185,7 +186,9 @@ members = [
 	"utils/build-script-utils",
 	"utils/fork-tree",
 	"utils/frame/benchmarking-cli",
+	"utils/frame/remote-externalities",
 	"utils/frame/frame-utilities-cli",
+	"utils/frame/try-runtime/cli",
 	"utils/frame/rpc/support",
 	"utils/frame/rpc/system",
 	"utils/prometheus",
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index 6162726c8947..4aa73e2f7060 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -99,6 +99,7 @@ node-executor = { version = "2.0.0", path = "../executor" }
 sc-cli = { version = "0.9.0", optional = true, path = "../../../client/cli" }
 frame-benchmarking-cli = { version = "3.0.0", optional = true, path = "../../../utils/frame/benchmarking-cli" }
 node-inspect = { version = "0.8.0", optional = true, path = "../inspect" }
+try-runtime-cli = { version = "0.9.0", optional = true, path = "../../../utils/frame/try-runtime/cli" }
 
 # WASM-specific dependencies
 wasm-bindgen = { version = "0.2.57", optional = true }
@@ -133,6 +134,7 @@ node-inspect = { version = "0.8.0", optional = true, path = "../inspect" }
 frame-benchmarking-cli = { version = "3.0.0", optional = true, path = "../../../utils/frame/benchmarking-cli" }
 substrate-build-script-utils = { version = "3.0.0", optional = true, path = "../../../utils/build-script-utils" }
 substrate-frame-cli = { version = "3.0.0", optional = true, path = "../../../utils/frame/frame-utilities-cli" }
+try-runtime-cli = { version = "0.9.0", optional = true, path = "../../../utils/frame/try-runtime/cli" }
 
 [build-dependencies.sc-cli]
 version = "0.9.0"
@@ -157,8 +159,15 @@ cli = [
 	"sc-finality-grandpa-warp-sync",
 	"structopt",
 	"substrate-build-script-utils",
+	"try-runtime-cli",
 ]
 runtime-benchmarks = [
 	"node-runtime/runtime-benchmarks",
 	"frame-benchmarking-cli",
 ]
+# Enable features that allow the runtime to be tried and debugged. Name might be subject to change
+# in the near future.
+try-runtime = [
+	"node-runtime/try-runtime",
+	"try-runtime-cli",
+]
diff --git a/bin/node/cli/src/cli.rs b/bin/node/cli/src/cli.rs
index 63a07e00e219..9b80a3e34529 100644
--- a/bin/node/cli/src/cli.rs
+++ b/bin/node/cli/src/cli.rs
@@ -47,6 +47,11 @@ pub enum Subcommand {
 	#[structopt(name = "benchmark", about = "Benchmark runtime pallets.")]
 	Benchmark(frame_benchmarking_cli::BenchmarkCmd),
 
+	/// Try some experimental command on the runtime. This includes migration and runtime-upgrade
+	/// testing.
+	#[cfg(feature = "try-runtime")]
+	TryRuntime(try_runtime_cli::TryRuntimeCmd),
+
 	/// Verify a signature for a message, provided on STDIN, with a given (public or secret) key.
 	Verify(VerifyCmd),
 
diff --git a/bin/node/cli/src/command.rs b/bin/node/cli/src/command.rs
index 461930a613d9..d3689bdcd674 100644
--- a/bin/node/cli/src/command.rs
+++ b/bin/node/cli/src/command.rs
@@ -149,5 +149,20 @@ pub fn run() -> Result<()> {
 				Ok((cmd.run(client, backend), task_manager))
 			})
 		},
+		#[cfg(feature = "try-runtime")]
+		Some(Subcommand::TryRuntime(cmd)) => {
+			let runner = cli.create_runner(cmd)?;
+			runner.async_run(|config| {
+				// we don't need any of the components of new_partial, just a runtime, or a task
+				// manager to do `async_run`.
+				let registry = config.prometheus_config.as_ref().map(|cfg| &cfg.registry);
+				let task_manager = sc_service::TaskManager::new(
+					config.task_executor.clone(),
+					registry,
+				).unwrap();
+
+				Ok((cmd.run::<Block, Executor>(config), task_manager))
+			})
+		}
 	}
 }
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index f77a16a10f4c..1a55efbf8515 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -43,6 +43,7 @@ frame-support = { version = "3.0.0", default-features = false, path = "../../../
 frame-system = { version = "3.0.0", default-features = false, path = "../../../frame/system" }
 frame-system-benchmarking = { version = "3.0.0", default-features = false, path = "../../../frame/system/benchmarking", optional = true }
 frame-system-rpc-runtime-api = { version = "3.0.0", default-features = false, path = "../../../frame/system/rpc/runtime-api/" }
+frame-try-runtime = { version = "0.9.0", default-features = false, path = "../../../frame/try-runtime", optional = true }
 pallet-assets = { version = "3.0.0", default-features = false, path = "../../../frame/assets" }
 pallet-authority-discovery = { version = "3.0.0", default-features = false, path = "../../../frame/authority-discovery" }
 pallet-authorship = { version = "3.0.0", default-features = false, path = "../../../frame/authorship" }
@@ -186,3 +187,7 @@ runtime-benchmarks = [
 	"frame-system-benchmarking",
 	"hex-literal",
 ]
+try-runtime = [
+	"frame-executive/try-runtime",
+	"frame-try-runtime",
+]
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 86e3075c3ae5..fb2b189e2d37 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -1080,7 +1080,14 @@ pub type SignedPayload = generic::SignedPayload<Call, SignedExtra>;
 /// Extrinsic type that has already been checked.
 pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, Call, SignedExtra>;
 /// Executive: handles dispatch to the various modules.
-pub type Executive = frame_executive::Executive<Runtime, Block, frame_system::ChainContext<Runtime>, Runtime, AllModules>;
+pub type Executive = frame_executive::Executive<
+	Runtime,
+	Block,
+	frame_system::ChainContext<Runtime>,
+	Runtime,
+	AllModules,
+	(),
+>;
 
 /// MMR helper types.
 mod mmr {
@@ -1325,15 +1332,24 @@ impl_runtime_apis! {
 		}
 	}
 
+	#[cfg(feature = "try-runtime")]
+	impl frame_try_runtime::TryRuntime<Block> for Runtime {
+		fn on_runtime_upgrade() -> Result<(Weight, Weight), sp_runtime::RuntimeString> {
+			frame_support::debug::RuntimeLogger::init();
+			let weight = Executive::try_runtime_upgrade()?;
+			Ok((weight, RuntimeBlockWeights::get().max_block))
+		}
+	}
+
 	#[cfg(feature = "runtime-benchmarks")]
 	impl frame_benchmarking::Benchmark<Block> for Runtime {
 		fn dispatch_benchmark(
 			config: frame_benchmarking::BenchmarkConfig
 		) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {
 			use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey};
-			// Trying to add benchmarks directly to the Session Pallet caused cyclic dependency issues.
-			// To get around that, we separated the Session benchmarks into its own crate, which is why
-			// we need these two lines below.
+			// Trying to add benchmarks directly to the Session Pallet caused cyclic dependency
+			// issues. To get around that, we separated the Session benchmarks into its own crate,
+			// which is why we need these two lines below.
 			use pallet_session_benchmarking::Module as SessionBench;
 			use pallet_offences_benchmarking::Module as OffencesBench;
 			use frame_system_benchmarking::Module as SystemBench;
diff --git a/client/service/src/task_manager/mod.rs b/client/service/src/task_manager/mod.rs
index 652e5d443977..02d83e6dce7c 100644
--- a/client/service/src/task_manager/mod.rs
+++ b/client/service/src/task_manager/mod.rs
@@ -234,7 +234,7 @@ pub struct TaskManager {
 impl TaskManager {
 	/// If a Prometheus registry is passed, it will be used to report statistics about the
 	/// service tasks.
-	pub(super) fn new(
+	pub fn new(
 		executor: TaskExecutor,
 		prometheus_registry: Option<&Registry>,
 	) -> Result<Self, PrometheusError> {
diff --git a/client/state-db/src/lib.rs b/client/state-db/src/lib.rs
index dd2baf9d18ac..1f73f3cca35e 100644
--- a/client/state-db/src/lib.rs
+++ b/client/state-db/src/lib.rs
@@ -24,12 +24,12 @@
 //! Canonicalization window tracks a tree of blocks identified by header hash. The in-memory
 //! overlay allows to get any node that was inserted in any of the blocks within the window.
 //! The tree is journaled to the backing database and rebuilt on startup.
-//! Canonicalization function selects one root from the top of the tree and discards all other roots and
-//! their subtrees.
+//! Canonicalization function selects one root from the top of the tree and discards all other roots
+//! and their subtrees.
 //!
 //! # Pruning.
-//! See `RefWindow` for pruning algorithm details. `StateDb` prunes on each canonicalization until pruning
-//! constraints are satisfied.
+//! See `RefWindow` for pruning algorithm details. `StateDb` prunes on each canonicalization until
+//! pruning constraints are satisfied.
 
 mod noncanonical;
 mod pruning;
diff --git a/frame/executive/Cargo.toml b/frame/executive/Cargo.toml
index 31f1f34174ed..7ef00e7ff71c 100644
--- a/frame/executive/Cargo.toml
+++ b/frame/executive/Cargo.toml
@@ -47,3 +47,6 @@ std = [
 	"sp-tracing/std",
 	"sp-std/std",
 ]
+try-runtime = [
+	"frame-support/try-runtime"
+]
diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index b31f40dc28d6..924adea95fd0 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -44,7 +44,8 @@
 //!
 //! ## Usage
 //!
-//! The default Substrate node template declares the [`Executive`](./struct.Executive.html) type in its library.
+//! The default Substrate node template declares the [`Executive`](./struct.Executive.html) type in
+//! its library.
 //!
 //! ### Example
 //!
@@ -185,26 +186,58 @@ where
 }
 
 impl<
-	System: frame_system::Config,
-	Block: traits::Block<Header=System::Header, Hash=System::Hash>,
-	Context: Default,
-	UnsignedValidator,
-	AllModules:
-		OnRuntimeUpgrade +
-		OnInitialize<System::BlockNumber> +
-		OnFinalize<System::BlockNumber> +
-		OffchainWorker<System::BlockNumber>,
-	COnRuntimeUpgrade: OnRuntimeUpgrade,
-> Executive<System, Block, Context, UnsignedValidator, AllModules, COnRuntimeUpgrade>
+		System: frame_system::Config,
+		Block: traits::Block<Header = System::Header, Hash = System::Hash>,
+		Context: Default,
+		UnsignedValidator,
+		AllModules: OnRuntimeUpgrade
+			+ OnInitialize<System::BlockNumber>
+			+ OnFinalize<System::BlockNumber>
+			+ OffchainWorker<System::BlockNumber>,
+		COnRuntimeUpgrade: OnRuntimeUpgrade,
+	> Executive<System, Block, Context, UnsignedValidator, AllModules, COnRuntimeUpgrade>
 where
 	Block::Extrinsic: Checkable<Context> + Codec,
-	CheckedOf<Block::Extrinsic, Context>:
-		Applyable +
-		GetDispatchInfo,
-	CallOf<Block::Extrinsic, Context>: Dispatchable<Info=DispatchInfo, PostInfo=PostDispatchInfo>,
+	CheckedOf<Block::Extrinsic, Context>: Applyable + GetDispatchInfo,
+	CallOf<Block::Extrinsic, Context>:
+		Dispatchable<Info = DispatchInfo, PostInfo = PostDispatchInfo>,
 	OriginOf<Block::Extrinsic, Context>: From<Option<System::AccountId>>,
-	UnsignedValidator: ValidateUnsigned<Call=CallOf<Block::Extrinsic, Context>>,
+	UnsignedValidator: ValidateUnsigned<Call = CallOf<Block::Extrinsic, Context>>,
 {
+	/// Execute all `OnRuntimeUpgrade` of this runtime, and return the aggregate weight.
+	pub fn execute_on_runtime_upgrade() -> frame_support::weights::Weight {
+		let mut weight = 0;
+		weight = weight.saturating_add(
+			<frame_system::Module<System> as OnRuntimeUpgrade>::on_runtime_upgrade(),
+		);
+		weight = weight.saturating_add(COnRuntimeUpgrade::on_runtime_upgrade());
+		weight = weight.saturating_add(<AllModules as OnRuntimeUpgrade>::on_runtime_upgrade());
+
+		weight
+	}
+
+	/// Execute all `OnRuntimeUpgrade` of this runtime, including the pre and post migration checks.
+	///
+	/// This should only be used for testing.
+	#[cfg(feature = "try-runtime")]
+	pub fn try_runtime_upgrade() -> Result<frame_support::weights::Weight, &'static str> {
+		<
+			(frame_system::Module::<System>, COnRuntimeUpgrade, AllModules)
+			as
+			OnRuntimeUpgrade
+		>::pre_upgrade()?;
+
+		let weight = Self::execute_on_runtime_upgrade();
+
+		<
+			(frame_system::Module::<System>, COnRuntimeUpgrade, AllModules)
+			as
+			OnRuntimeUpgrade
+		>::post_upgrade()?;
+
+		Ok(weight)
+	}
+
 	/// Start the execution of a particular block.
 	pub fn initialize_block(header: &System::Header) {
 		sp_io::init_tracing();
@@ -234,10 +267,7 @@ where
 	) {
 		let mut weight = 0;
 		if Self::runtime_upgraded() {
-			// System is not part of `AllModules`, so we need to call this manually.
-			weight = weight.saturating_add(<frame_system::Module::<System> as OnRuntimeUpgrade>::on_runtime_upgrade());
-			weight = weight.saturating_add(COnRuntimeUpgrade::on_runtime_upgrade());
-			weight = weight.saturating_add(<AllModules as OnRuntimeUpgrade>::on_runtime_upgrade());
+			weight = weight.saturating_add(Self::execute_on_runtime_upgrade());
 		}
 		<frame_system::Module<System>>::initialize(
 			block_number,
diff --git a/frame/support/Cargo.toml b/frame/support/Cargo.toml
index 8edf1ff6ddad..b77907721be2 100644
--- a/frame/support/Cargo.toml
+++ b/frame/support/Cargo.toml
@@ -60,3 +60,4 @@ std = [
 nightly = []
 strict = []
 runtime-benchmarks = []
+try-runtime = []
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index 106ec10c6c4e..602bc1aa1a69 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -1547,7 +1547,25 @@ pub trait OnRuntimeUpgrade {
 	/// block local data are not accessible.
 	///
 	/// Return the non-negotiable weight consumed for runtime upgrade.
-	fn on_runtime_upgrade() -> crate::weights::Weight { 0 }
+	fn on_runtime_upgrade() -> crate::weights::Weight {
+		0
+	}
+
+	/// Execute some pre-checks prior to a runtime upgrade.
+	///
+	/// This hook is never meant to be executed on-chain but is meant to be used by testing tools.
+	#[cfg(feature = "try-runtime")]
+	fn pre_upgrade() -> Result<(), &'static str> {
+		Ok(())
+	}
+
+	/// Execute some post-checks after a runtime upgrade.
+	///
+	/// This hook is never meant to be executed on-chain but is meant to be used by testing tools.
+	#[cfg(feature = "try-runtime")]
+	fn post_upgrade() -> Result<(), &'static str> {
+		Ok(())
+	}
 }
 
 #[impl_for_tuples(30)]
@@ -1557,6 +1575,20 @@ impl OnRuntimeUpgrade for Tuple {
 		for_tuples!( #( weight = weight.saturating_add(Tuple::on_runtime_upgrade()); )* );
 		weight
 	}
+
+	#[cfg(feature = "try-runtime")]
+	fn pre_upgrade() -> Result<(), &'static str> {
+		let mut result = Ok(());
+		for_tuples!( #( result = result.and(Tuple::pre_upgrade()); )* );
+		result
+	}
+
+	#[cfg(feature = "try-runtime")]
+	fn post_upgrade() -> Result<(), &'static str> {
+		let mut result = Ok(());
+		for_tuples!( #( result = result.and(Tuple::post_upgrade()); )* );
+		result
+	}
 }
 
 /// Off-chain computation trait.
diff --git a/frame/try-runtime/Cargo.toml b/frame/try-runtime/Cargo.toml
new file mode 100644
index 000000000000..9c1919d380b8
--- /dev/null
+++ b/frame/try-runtime/Cargo.toml
@@ -0,0 +1,31 @@
+[package]
+name = "frame-try-runtime"
+version = "0.9.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
+license = "Apache-2.0"
+homepage = "https://substrate.dev"
+repository = "https://github.com/paritytech/substrate/"
+description = "FRAME pallet for democracy"
+readme = "README.md"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
+
+sp-api = { version = "3.0.0", path = "../../primitives/api", default-features = false }
+sp-std = { version = "3.0.0", path = "../../primitives/std" , default-features = false }
+sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" , default-features = false }
+
+frame-support = { version = "3.0.0", path = "../support", default-features = false }
+
+[features]
+default = [ "std" ]
+std = [
+	"sp-api/std",
+	"sp-std/std",
+	"sp-runtime/std",
+	"frame-support/std",
+]
diff --git a/frame/try-runtime/src/lib.rs b/frame/try-runtime/src/lib.rs
new file mode 100644
index 000000000000..dcd3a4787823
--- /dev/null
+++ b/frame/try-runtime/src/lib.rs
@@ -0,0 +1,37 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Supporting types for try-runtime, testing and dry-running commands.
+
+#![cfg_attr(not(feature = "std"), no_std)]
+
+use sp_std::prelude::*;
+use frame_support::weights::Weight;
+
+sp_api::decl_runtime_apis! {
+	/// Runtime api for testing the execution of a runtime upgrade.
+	pub trait TryRuntime {
+		/// dry-run runtime upgrades, returning the total weight consumed.
+		///
+		/// This should do EXACTLY the same operations as the runtime would have done in the case of
+		/// a runtime upgrade (e.g. pallet ordering must be the same)
+		///
+		/// Returns the consumed weight of the migration in case of a successful one, combined with
+		/// the total allowed block weight of the runtime.
+		fn on_runtime_upgrade() -> Result<(Weight, Weight), sp_runtime::RuntimeString>;
+	}
+}
diff --git a/primitives/core/src/hexdisplay.rs b/primitives/core/src/hexdisplay.rs
index 304b665a72c9..e590eec0e5ae 100644
--- a/primitives/core/src/hexdisplay.rs
+++ b/primitives/core/src/hexdisplay.rs
@@ -71,6 +71,12 @@ impl AsBytesRef for sp_std::vec::Vec<u8> {
 	fn as_bytes_ref(&self) -> &[u8] { &self }
 }
 
+impl AsBytesRef for sp_storage::StorageKey {
+	fn as_bytes_ref(&self) -> &[u8] {
+		self.as_ref()
+	}
+}
+
 macro_rules! impl_non_endians {
 	( $( $t:ty ),* ) => { $(
 		impl AsBytesRef for $t {
diff --git a/primitives/state-machine/src/testing.rs b/primitives/state-machine/src/testing.rs
index a6f9d0682464..5f10fc0a276c 100644
--- a/primitives/state-machine/src/testing.rs
+++ b/primitives/state-machine/src/testing.rs
@@ -48,20 +48,22 @@ pub struct TestExternalities<H: Hasher, N: ChangesTrieBlockNumber = u64>
 where
 	H::Out: codec::Codec + Ord,
 {
+	/// The overlay changed storage.
 	overlay: OverlayedChanges,
 	offchain_db: TestPersistentOffchainDB,
-	storage_transaction_cache: StorageTransactionCache<
-		<InMemoryBackend<H> as Backend<H>>::Transaction, H, N
-	>,
-	backend: InMemoryBackend<H>,
+	storage_transaction_cache:
+		StorageTransactionCache<<InMemoryBackend<H> as Backend<H>>::Transaction, H, N>,
+	/// Storage backend.
+	pub backend: InMemoryBackend<H>,
 	changes_trie_config: Option<ChangesTrieConfiguration>,
 	changes_trie_storage: ChangesTrieInMemoryStorage<H, N>,
-	extensions: Extensions,
+	/// Extensions.
+	pub extensions: Extensions,
 }
 
 impl<H: Hasher, N: ChangesTrieBlockNumber> TestExternalities<H, N>
-	where
-		H::Out: Ord + 'static + codec::Codec
+where
+	H::Out: Ord + 'static + codec::Codec,
 {
 	/// Get externalities implementation.
 	pub fn ext(&mut self) -> Ext<H, N, InMemoryBackend<H>> {
diff --git a/primitives/storage/src/lib.rs b/primitives/storage/src/lib.rs
index 1e9f9766072e..1016b73eb1e3 100644
--- a/primitives/storage/src/lib.rs
+++ b/primitives/storage/src/lib.rs
@@ -31,10 +31,15 @@ use codec::{Encode, Decode};
 #[derive(PartialEq, Eq, RuntimeDebug)]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize, Hash, PartialOrd, Ord, Clone))]
 pub struct StorageKey(
-	#[cfg_attr(feature = "std", serde(with="impl_serde::serialize"))]
-	pub Vec<u8>,
+	#[cfg_attr(feature = "std", serde(with = "impl_serde::serialize"))] pub Vec<u8>,
 );
 
+impl AsRef<[u8]> for StorageKey {
+	fn as_ref(&self) -> &[u8] {
+		self.0.as_ref()
+	}
+}
+
 /// Storage key with read/write tracking information.
 #[derive(PartialEq, Eq, RuntimeDebug, Clone, Encode, Decode)]
 #[cfg_attr(feature = "std", derive(Hash, PartialOrd, Ord))]
diff --git a/utils/frame/remote-externalities/Cargo.toml b/utils/frame/remote-externalities/Cargo.toml
new file mode 100644
index 000000000000..41a3b2621786
--- /dev/null
+++ b/utils/frame/remote-externalities/Cargo.toml
@@ -0,0 +1,34 @@
+[package]
+name = "remote-externalities"
+version = "0.9.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
+license = "Apache-2.0"
+homepage = "https://substrate.dev"
+repository = "https://github.com/paritytech/substrate/"
+description = "An externalities provided environemnt that can load itself from remote nodes or cache files"
+readme = "README.md"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+jsonrpc-core-client = { version = "15.1.0", features = ["http"] }
+sc-rpc-api = { version = "0.9.0", path = "../../../client/rpc-api" }
+sc-rpc = { version = "3.0.0", path = "../../../client/rpc" }
+futures = "0.1.29"
+
+hex-literal = "0.3.1"
+env_logger = "0.8.2"
+log = "0.4.11"
+bincode = "1.3.1"
+tokio = "0.1.22"
+
+sp-io = { version = "3.0.0", path = "../../../primitives/io" }
+sp-core = { version = "3.0.0", path = "../../../primitives/core" }
+
+[dev-dependencies]
+async-std = { version = "1.6.5", features = ["attributes"] }
+
+[features]
+remote-test = []
diff --git a/utils/frame/remote-externalities/proxy_test b/utils/frame/remote-externalities/proxy_test
new file mode 100644
index 0000000000000000000000000000000000000000..adb93f5ba270c3e3740394f183d96bc54a3211f9
GIT binary patch
literal 26476
zcmd_zJC^Q9k{n=?;%M9h7k~)F15ihx#7zVu0Fm;ngR9~4_<45aOBwPov;V3(lQZ2_
zeQ#AJ{(y(OxtY1&|Nfu;@%6v{`0Ms>>DbQIkG-^>``GTM9&>xfwqN5Jd*0JJj=JV^
z<=&rk)F-dwZh82dbDKxq`gWC^(>(kuTiV9BeX~^4IBT6fUt?|i>iNmX)9#~etIhMM
zXB$25eXKj3dwupgw$^K_?SFqf*>;qBUw51Jx{veP+B4eI%gFnE9HU;TweqBPUUxfd
zyZy`Qe$K6zQt!3Zr`}uM{`jid??1)!ls%<!9Ctt4wf27aO2s3mH1~R@dmJN|`5bMn
zeLGr7`#DN||32GRkF`qma~#p<uYUgBZ=P(fIUlLk+|OL9&%8?7&eBRR^G>O*G@mEm
z`OJISSDyLa_Uc#fR<CmQ`IPHU%UgP?m-|0IPqtho-RIn{*;=lB&9QBFO=YZS^NV-i
ze9vb;ucKZ2S&p7l-^X~oy;+`><3<1R^=!^EU!LoqejaDt_Gi1VanF^m$8(;?x>nmp
zulMtKuygtCyz+C*EAKfuul3yPIlOJ3ZyU#RU452Oa!Fs$;}|I=f!~|ku;o10b&OK>
zy{`K_i=VMp8mpdnD_bhZd7tGv_w&d#J!kQ2f5Le@dEU*t*=8%H?=3w~OG(6B=Uuk_
z+#cbbZb4LXzw0^gv7Kk%k37bC=H#GUmeO2R7x4Oe^RAIj!ElW0sQH-ZQ+JUssLIt+
zEo<F!grm*Zy03kl*Ex^gTbgTLR}rNj=P}*XnNGnv+}&#kqqVvayCj~i)K%}RUR~Ut
zxt_h&XU%ogQ8wW|+x>p7ue^Dwlzgw*`?WXsy^iOU%I4X`L_Y3%)Y6_>q@=p9L)z=l
zm1-|Xc}5jtDK$6mS}u*l-SgK-+e>luZ5``8gm1g|*{?Pn#-5In_pR-z_2wUY9+{~f
zGMDI<qGw6HxS#J|ue*6_MBSgKi+>-i_POe_rJS}V+mGI=Ozy+?>vUZ6m=fdT|E}C_
zzw81%eI~hlS3CBRwy)>$)3g1IwAY=7va(-KIp)3Ac`ffR^&=-)rXK21>-{KdpaY30
zI@WWp{ke;ZGxix(XUf@qKhvd<-no3edB0clB8JvhRL(rkJ-03Gm%=HGxB1j`s2JtA
z?`=rw+r9RyUqu<tyGq{9@~7Oqyw`0>*l>t?>{*Ze)ZF&gPld>n-yZXTQ}%s(j<wgB
zo9rXw=Q)P|PCeyW@4fj>^S=JefBr|&+x~5vzjv~#Yd)W6Ynw_SFO=zpDgv|3*4<h8
zZ|)v+QzGga$Y*csatUr#e4bw_<=Exv$Hz?VUZ?9{m0U>!`jU5Bxd(`IOC|Ty&)&1R
zntR_?5p<>8^F0@A+uRi4Gk)?vyAEfUe;jJ)waW1M>UjxnZ$^ZTTS0lwS#y*Ru<W`Z
ziFWrVKY&_yANDJCnOzB*<pAi;e@^s|v8}usoZ4KwQ{BJLp8UX;5AOx6P3mOo`5t1X
z&7|NwcLj0OA^7$4WM7B)a+B=WcBMVvb3fO81Sa#k`?eqVx~gOE0L+uFaS6Nat(=Ox
zed}|mACOBMZ8eA9&i(qDXaA0MCwnbt%6F;_I2-DqLx@uIlvAt;bUne8(|l%!GLL;<
zr`xu!dp=NN*`Hp=nCYpCS07)`qYgKB<!y&m+`qQAsN#<<=(*DaF3B)=_618yK5&-a
zL)l+j0(5%)Q|gYpmR<ZL0Uk4H4(@#%_te_Jx_RpdShqh@vWG3sqc2$5C6hF^damjo
zXm1`}*shf-_3O>s^>;q!)b~s+(2U0HnH}gYPNt~wbLP6P-U53k1<m2=k<ME|0hK?`
zqaAC^ah%@PHK!zfx62Xh6Xr|_a0F={(5jDi)pXu#<W*+&Tu=3mWs&#0_qv<s?xaUj
zzw}c{;K*Jok9(#!lGZQnmrhpO>X)^b(JLg`zVs!T-14@giKEpfz{=zP7HL!W&;}ql
zCh#2S=$3h+qbmV$%PtD_m~*?+@eEIJ$e$7yjB!Y(@23%<>Q%kg4yNn*<(*x7cu3c`
z<T91iai#_kyOsK5si$a(@&yhD4%~N#qBO$%(S3B0qosoVzn(|%2V&t!<4PJSXQAIb
zclq}&UH#B(!ifstp}RW!bGHsk-x?iFoYw3!K3;ep{qb|5ietpZd!z+;SamBS`jpl*
z;wpJw*W5td>l*5u^HFY|={{<tA~u#n<Ld6;dhtz}-<FSC990K*;AMS#%}A6}(CKTV
zXs)B^?8dzpDamhbD3<-+yLR<GLSA<s`nIc0tc(-s;}W?G2Ab~AoYC$*QS&`J^eb|D
zYy0Q{Keu&Ef1hX4abNY&ICS~^_^abI6c~8io@0mQ#++RQV_77@<YhbslD`2@SZ%l*
z{;CUKcSY7{jl0zR@%1{Kh7tf7)Pjx&5<3;|k+V*G91{2e7O4#>4_$pd+`pq#0jQ~o
zUzc|DoKPAD=)CYA`CCpa*t$#7%h-~Eo;tBFBD~9Tb#Jcr-L~tJJC&YGRc(sujd+2%
z9M^`(c|VXB#_Vx6@cd|q&FwzZPnn6YIqj$1%V$oDVw;`|fBAW@-_I)k`g{ChId^GC
zE-uGD)%546NVDX21|>0Xx%S?pZBh&6WR(qLs1^pd(e)Zzy7FlGK~W%YQvY^`tM32M
zrs#X_XTm8-7IQPUOU2yLu-h#VBuv+4t5eOpP(K?wB*@Ay==-nOwY~5TkKi|D8-!WL
zQ#UyDgvQGHM?FHxB8g6U>8yJf)3C4rKNnUQ-vA&_7ZjVNXn`2V*O)z`z0h@@K<=TU
zMM{&MQ&Dj@EgBwR)8dX>Yjhr{W!X%0=>5`ErEwtdarwGCEHE&T<%BB%130sxpla`R
z*YocM3yiMz$PyY_a-UQRy+c`7-kx)`mViycyl2?8UHu#LLXnWJ5n7-ya(5ungZe~p
z9S0I;caS^675m>WMStKa^=i4tA>WX4a1t4j4&FU8=s#iy!ljWvrrsZop0F`428`4t
zP<KsFIsypewQH>~`dG~mdq3A#a-KEUsWRw!po|-|Afg=0=X#zx^-5<t*HY;2ZC(|m
z*_IZw5JM10aQX@K41Mz>ZgNI~evP!y6`&QpD;Ywdwzfjq@XC+_8Fjojr>sug)D{T?
z3I-gd9x}|MyZJni7e<=r>Mj$qTiM5~yL{rv%fY`Cc<utk2udQ+Q9R9&>^e#49fRw-
zfrP{gw=}QO`u^=aTvLaL@j-Jtm_p<Vehz2^mFNs|;{dgD)53{dy_hp9Y0kP8AX!Ac
zpU4Z(!<E7@$VUam<~BJHK)wqLG6|`u<9i0y<-QI~6e2@~*aO4|<kQ<}vHi{5@y2wM
z`)lv{dpREZ82eIBh6Wt~LtMM5skhL7c4-0|U5*L|kVx)xe{l4nV-8A$<Ni{2Ue|j%
zSfy9HRa1l0;Ne1G!y-!^?iI=-TFun*rpN|4A^Ti3hpkF{w<MMG=8%E5AUpE6Uh8ie
zY0u;HQfCj%vC4N{*qyvEyc%y}Zxdirt3bQYiW+K4myW3sV8~m=-P~_CZ_Szz@LT<w
ziIf0Xwz!%a$&kTl8c0mALpNG65~vjnp&)mMv2m+vU{SiKTa9{ozjprmx|=6ABys|^
z49l9N$3hwJvaz(Rh}?>ERB(sX=+Y0e-^T{DWN=i5+H!aQ`r|*kcqGHu^GJub{;CQp
zzIkdEwE8$_5O34mHsy2(LMK3dqTjf;TAqxbma!zjKnQ<)z3@ExBb98PMjzSy*Q!7a
zSb$Hs9F11FOfjO+6pVOZyR>}5vdYQ1AHlvy{sMl6Cbf>QnMfDMl5hrFg^Mp+PA58b
zNhKIXsr^P-tc-Lc6C*}MWxWWP#K08L=*xLH#(j;8`Wh%1mPiOSgpMcnPm(<~{k}Cs
zC9AGrED!mURGTXPDX5e8uh(TFk4EFJI(P_uAPGgkt9WN6>B=I==UoYXui6cH6g{Jt
z1Q?vsTl?SZ)cnQ24Bi~u*N)()c;d4|`aQ*P>OqRGMt0?bXfkR?RE9tvB1&38J}ckk
zfdg<Op3{A=poXKj3F_yAseD~WATVf*if9fs$nBner7g?~3dp8zPz|CocrkH9rAg$&
zg$(xF{`uh(K~^_^1oiCP*VpL(y*dokppb`1z>i$%p@oLUXay;BZTd*mFTqIURJ7tk
z#jDzfm}#mrLhwEIUx|Rj#e(*P$onL80}G*hOZ^Z(brI6jctH}kHi@fZJ-imR9~iIW
zcy4OVP0KyV5Z+CJ_rK;@e8W1mVp!wJSQG!0I2w0P3J_OH4m%6&Rbn`Csa~HG(l@j%
z?%Mp44PKXLJ8IYKn>i#X?`nH)#5WugtWH1>-4rrU52FFaTMn-qt8_a;G@s5O(Zp$K
zVH4q$NMEzTFGkw0X|amPV7|yOhAa;X?9bUl3)cWLx<yZS^c}IiL+8rFoDV2M?AH;z
z@xLEI`@(GC)S2DLF+1U4dm1thFB|czx?CPRg^nO8WbKs>zBWO3dYh+wKt5*8;|vPV
z7{aHOuQB^~RLHt&Pg`MD*#?P<i{WPu!f)q+t7`q`VhpmB;f*92eVjPZ-0yH1qKww1
zd+m!PDFIK{TJEK0xGEpv@j~n<k33G~KDSUGn$Dq*@Kb_KgslDHe%zROM36p0-;Lc?
z9Pksaxy0?$4gF|(!Z6o#_FvBfAHo=>>>x5S7*uujfR>&YI?o`Qqu|Jcn=YnHT^6iE
z(xRex2AKP^dcH2F9ebXIF7fn?lfIUZyDLpB3tUYXOWUSEg?sMd=OA5hw0ZDdGd2Mo
zNUWnkHS9xGz%qT)ae@?5j?r@!lcC&c%Z}n0H1?z5of#lPT1C1s5rU6_1T~=<eB$5y
zQ{p4|l|`_-gar2igB!n1rzKw^7Pbw35!v7(&G57=?-+&CF~3emXARkM5Gjp2VG!N>
zH9iEIPF8`#BtQCCsyZr!5o+Z|0+59Y`k1qYNOUGy3S&TFBnf(==*mCP)eGZ;6LLQq
zz6UquatDJ!vI9$4kNBba+bEKcCh>7?+5&PBc&sJ|QjnGf+TcVKaNyD9`o{V=GePgt
zQS*4hG*(<cJ*+7rk&dEA(7i!vxOPD*sdTh}IHW#{w>M_-A35ZO=Ru|g(m)nXHeb?D
zeW73D<L{`Mh;eK$z5ao@v;I?G!~>Q(6NX+Bv?hm7@ZsUU1B~=Y1ln@D1K0?;WZeU0
zy!c#sn740ENI(O%Be&=`5f1?=UA@${?1m`U;j!S9m0kTZ*5dKKm=D5IfT<84A1dSP
z;)4%b$hLr~$a54gJ4%cI%*;CLAe>P^LU@=fpQDu|%0Ut)HFgsDfQ5P^468G!Ecx|o
ze4ykix?RsbBu~_*OU5cOM{2w$T8ZHF)LJ|(U>b@Q{2Y9Sp@1S*{|uJ&L^MoIyiW_Z
zld^W6UYf8jjl~khUE0pxOp!%Z?0z{ENn#q}N|C7CB?Jm4LY{qn-ZlT~m>Ju|<9IX#
zz`65CpaupT1fC<v)brVhNkhAXF1nRlFI}YxlM%sC_WR;(c^zhUQI4p(NFHQMs2##7
z4Q)O}n{$JjbnSE-NT0Ti@Vby^sYQcICKY87-_N~4JpOn6mg7Y-+GNMqfrf`Z?rEs0
z7^i7OB_56oD1tTkT-ZQJ@hn4#%M4^u_E5Zk!W|we@0&~K61rR+TwM(Ctiy?|liKJ?
zX-?;)t7YP!h?SvGK|X*?#r&_7ADbkoVt3L0SC3houjl4RCqPF>?~{<SSBx_Zv3at`
z1x2Cc(E?9ErE)EpgW}ac-kk3rK>l?xdui?92dWFZkKmFb@P{WK9W)8Efe?gBd?pc*
z*%4K2Tm$DQx<K%d6i~c$j!xx3EX=R0k2gv*^$myUNB_=&@9XqtE&x~%MXWJMyzV!l
z%GA|FUQUA^$P4M+V93WU<{YSwjzJa8Dnsilk%`w}*i5K;WDs;6o)I7zp>`Lvfg5sh
zItAx1Tf86b>o`xt8sfTKovy-3PF6wo0d&YTqMr+)+Ouw>*S3yHC)6T{58TEARCQHM
z*<2HbIR@bDsK1`<PrJ|0Y_QA<xPz2GqdbMWCVhh2c-mlF3*VVQfG+8^S~us4Sf=O0
zCNdl1;{9A-$){bE17RbX@)ID_lttFn%&Cx-gBUfWvG|oyz-a0^LJer(b<RbY!3FRY
z!7I`wJ?uFD>Ujk&i3S=EaB^)kk{icsEVu-u4L(fztGHfF8nkwA3Z2G0%glSlh~Ag>
z?}c7|DmH{FD#C>m&AKi_{X)=+u1e2<;<zS~OzCx~^;+9r2~KQ7u8F$Am`)@TW89+o
z+YH%%Y(E9CW0K=7YlaJ*_e^pz%z>NJLGv_R(B4vY2-2oi84CvGXFaZO4MV7Scwj(w
zQhsW_!mr5q$DQP#;2+>X*A*eiv`J-Yr-5U5ao_`tHn52@goa<8EhGS09y11oV+aVG
zXP-uGQe9vYgRR)vzkW6d%?LTr5MUHDdbauL2R-yQ*BI*LeH(oCJNT1E%QoXjk;K$d
z`?;?^GxqCH275lQ0ah?8C&pYA{2oqlswk?XFa!n(!b_onp$(@KgjFx~06q+ZSqvG3
z$p^`XhR)@Gd`w?y#(r(S;K$$T17-Z)q{5HC)5kM~pBhbwmi_EsKV#uH{h!9gkrpu9
zrBq?|F7sqZOqa_z^eQ#m-1HnV@rgL5B*;dI8H$-le+n&Db8kd;O%3XE?tk_AY<wA+
zjefi^4M_a(x5BRs0WhuB4iOpiMVMOd)ab-r-H?27`g$FF!pGMOZ)6Oj$bu~ZMNFt*
zR8Pzh>n!C4K*bIDG-3XvKp4D6Wb0hFbiy1OO7#ae#c87V2OsCxDq^O`tcu|a5|A9k
zQEIvfAzmnzn|=W&-D7kd=+!MFv+$o`qRRd*2A}^7ewGv((j0}@Fep_4_%J8w!y=(B
z(*`Reo~l!M$o8xZY>8-EqqyM_%2iXdog|#gFe2?Xe>;ypeJWCkBuL}L(wSroD`ZTZ
zJ!-UQkO$Gfi>O3!XXZpzgWXtBm&hQ`dw{%-e+vRyQ$Sb`uM%S{T}p={BElt0n1SxX
z^p7)S0Wjf4v>7pcuZo)Vq5>il5pyC;7uLS<Z@7E4$h!|o2k?Vtkr+mUaW_D_utUc&
zPeF@SzZN6mkl;=u(J*fPPvP%lsGfUL^JZ&@IY8VSLQreF8$&VC#pY#%k4nY7s28Qk
z2W87B<nTCCjY9hXfLp{2ocqliMDV~G;PcQlL1GFqE=QCWT@Zq^qXh2*&<mM~3`5l-
zaQE;{J!E1H&Bxb?wv8Uaz`tOOGo!VJca4$DwZcN_(z%V@O5-CEF%1HMw5P$<4CnR7
z*X#OZau>j&I34%~0D<M)%$q<kuN~(pD8e@sR%_at76=i1?tUj+(q?Mu8%7Cm4cOZd
z)xKt;zoXK;v`!chQ4_;YJP(cqYAf!D5!8&ojd?*?Mjbh*TEsB)qRPoMr;(rQ317eI
zCji)(;WtL+_jm(jtKm%4GA4^FLsKd?@h_^1_HI%9-h8?o4um*VCvU$2O%RY_CuTf9
z0_}x+Z}dQ>7z|Doty1y$0YvmpYFZ6G!6+p?gcU<s3$MSkhB$3A5P%$jF}WMW6aR)g
z#hdXp(&Rz|twVa`Bb72EZ_+GcKnv}OzYM=1F)lLX9#hz+6IBiScXm)Wn8Nq3*X8(|
zQwwy#OUnf&Z(XcJb}|S7sM}Fv@RIVuw*s}XE-KH)KWsn3u^S0NOxZHB@XuHxYdGrm
zm7)4Emi|CRKSsbG-|2NZE#?pSFi}j(`(X--WyZm3Hlr+f!$f+0sj=S>V`EE03RfL1
z17&j^hBsJ=!~Mf8!2SPilfi#%_QO`25YeYI<bNRdpe92kdPt$MgNv$+q`X)F`7UB|
zKm`q$b>3XPpavl3fYGlpUv2p0pVM0uJIpxliFK}!0Y){Ku8WLYD-Wg2XMpnT5yM1;
z^s#ir@iFWO5Hj(PzJLARMv&L_76t}jTJkhP(i`Af`Po*JZ+Z5vmZTkd3$KgJ8DnhB
zF3^kNSv`%+tgYeGW}&uWO0uP?OUMRlC=u@9$JYz<EPcnbAVamo#;XbI5d<~>$db42
zII~c3%bzjj3S5T~<WNW-jw!%TZZH|d5cxK`InHl0%`x^Unb7^TW&9oCexakqLNPzV
z_yJDb!WcX_dmir;?LQ2LY&RGc@&9ogyaYdUw0&v{KYiby{KN}m*63ZV6fgwET|hS?
zBUnJjng6E0T*d(@vnS_vGosFrLHa@~TC|{!+g|}MaMFa!pMlp>y{|F*ciaJYV^WRD
z7&I^(#-wCF1Q;4>q2W(uA7O`S)`3v$82G6v7!MFsAFaLD!|Uyh^>K)T@q+s6d2lHe
zi8z3LEJ{q+0WidN0&XNrJ@k%<qZskl$}st9o&!)?!3dXehkeP8FTBIxp{CE^2VujG
z6b}>}JW>**GkjKKpw0-qK3*&JmZ7XMiYjDXl#t2D4<HggymTwy{jh(>S*j<J1*^6@
zL6Fs`LW)c%?D@od*pL)%tb+lPBh6HUX*~{ND}*dHxEv33i4uZ+H1v4;`<ox-r{1_v
z{^+L@UZ3CTryG+#ztjIMr~T{4Hchzu-`$`Z!^4KJ6hJo<p5OpfENs!#6thp1fBE=M
zf8^%$|32d%jtosE^2@%)!;FXiM&jeX3FR7*h0^yUNlWl7BkoU8>3{pL@B7qru|L!b
zWo?=W511t;rUq(tOLr~-qPhij{HF#Aa80JS1gj-zaf@|3VwA(S#`s&LCvfeDGvJaL
zl!CI6L-hiTdEsd_^PoLsEz?8sGz1wK?92f!#e>HFTRD*ZIW+7)p5tfT1NH|K&ArZV
zO%9HsYls28Yv3;C%WM%u7HLOfZYMTuFlktq=b3H#z&lOw^zA%;_+ISai?F2Fqgn0B
zwS$M*k(h-#hk10`I%1uYac?rQbpZ^r=HyrqEdPv6gT$=gcrR~O^w|dG$$Td=%|xsw
zHr7hS@)c7lTstvia)<ST`eai9qj3oe+aoa@zdy&%-izZkQp!dTya^E_U{&?-e#~eq
z95D)RO5W-Un?c#4?0-Q#0vfai_7FC|H%>yF{_wpp^Z=XI0<|#J7+Zs}<4O=wtzPk?
zn&&_!BAjRiXaSZ3_lQ+%Xtl!K1nA?ae|lexPb-e|7ISYFu~;n;8yeY@jCl(Ic1C^x
zT&k_Gu_nQ!7w43CM#b|}F?am&96x(6+>^ZN3tgq5G@Of#bcd}Nj38*%DHJ>ZVvj|Y
zOpI6>-p7g<Y6=tt_XzV}IS<QsW!GNib*0u&AVa@`sfvcv(|&~ILdPCgk|?17!;Dq1
zIYHlmhPONnDf%1lMQmP&WxBTT?D7&jkfw`2BSayYgMg&tutZY_!gXRSScp!e&mprz
z2s#i6=NIBbKGiGP9)VWl^|F3r3mc)OsC>VM2K>LgB7+fU*w%PqZ|iRSKG}*r*1*0b
z{2R{!;TqM;rVGphxgTIpEDMpP{Kqx5`Z~ml(98-<YfS?&O}1yuak;ryZA9{Be|lfs
zP%SN5+yV^dUTc-O-fWXY>&2jeH7y>5FND98yV?9>R6w%2QmFWda`5O^o<rqgNXG6O
z{ECro)4Z0ZXv0~=NIHaGz?dZLfMQ~lZ##G`J#e>ZJNB%GHRb2$A!kMAieY1GvivA3
z<zog10f)iFsw=`CkuhwD5-w9}9V^>5Ex~x(n2gf=jpv9F46L1jxW`yC#AKAyt|KZd
zI|eIx2(Ai^H5}Y@0=Jt0Vt=*%5i$<Cn6~p9&p|}9b_UqicEn9Zl%S}oc&@A0q2}^T
z;tk#w0NINh3)MWC8e_Xm2vX2M#LQ3Q6ay0@OBlG=F60atyh1Zz>SV9i=Bcz?q81pk
zG6@Dm2Qpe;*)`R%ffwEP8_!|wOSCOg0I(G%+?&C`#G+YDn|r7zNe|<ta1`oB{TIWE
z?WRT^?QEYmF~=xPSf_r73jt=nd=#Y+fUM2B9W-T}A;G}5e6?f5h6MppRGAu+u(qIC
zO@y5H`uvMw8TTANto!hkYiWg`+hW+$ur1{#a#~2v2Fxt+BC5qAIz4$KPhtaLRKCmD
zBSXZsc>OodBi5;e_%Bx~Tbv-SqY(xe*;rq=Bq~P*5%p~e6I(L86fsI#wQPk=(6U0~
zgg<{Tx+de*Q7LR9W!V*~(wJeAx9nw78)xj<F7ugaHI7T?!@Tmg71!1R8dwkBNPPSd
zf50}eTh`}12xd;*Y>uC3V#lIqk%Bj|Pr-Q3TdA=h)Dcufpcw)gL_hA&E%=4=2=OcS
z0C*V|7LZ;glQ$CxW9{3j*SB3=G;Y#A3g@=f)56lQPduRu#v*^C=s$lis#Q$$$liuL
zg<uE(#-n+|$`Ki#X~LgApq-G@Lk>kmF*K9X^-~NQG<Sd0#r5;&K<v<8{c#y=El{fU
z!6EsX#<S>wJ0ez3@{3SK?VQ51R;Zod5~e>a@CbvVJM|mSVXZWdo2`iD(QKc|KQ3CH
z9A%c<4}=ctolV1J0o_B@!@{dYTALU##rwua#$PxO=o1mDoVpKh`w4&^Ym;p*pj*XG
zG(U^rLEMB-PWJb(TWa=VqCBKvT$(?j!Fv%S(7^w<H#k&f5;zwTPF52U3*>aTdVZMD
zt_m~8RLtAxf=q5+&XuO$#(*dTbqvmIv7_wg@d3){qW9SRwCvWAu}R37Kl$5ew2fUt
p#^SFqX&9c6*Bw`EWr32VKMjsu$nhNTtv|y?__%zZ{QT$N{U5`qT;l)$

literal 0
HcmV?d00001

diff --git a/utils/frame/remote-externalities/src/lib.rs b/utils/frame/remote-externalities/src/lib.rs
new file mode 100644
index 000000000000..6c8b49c7c85d
--- /dev/null
+++ b/utils/frame/remote-externalities/src/lib.rs
@@ -0,0 +1,454 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! # Remote Externalities
+//!
+//! An equivalent of `sp_io::TestExternalities` that can load its state from a remote substrate
+//! based chain, or a local cache file.
+//!
+//! #### Runtime to Test Against
+//!
+//! While not absolutely necessary, you most likely need a `Runtime` equivalent in your test setup
+//! through which you can infer storage types. There are two options here:
+//!
+//! 1. Build a mock runtime, similar how to you would build one in a pallet test (see example
+//!    below). The very important point here is that this mock needs to hold real values for types
+//!    that matter for you, based on the chain of interest. Some typical ones are:
+//!
+//! - `sp_runtime::AccountId32` as `AccountId`.
+//! - `u32` as `BlockNumber`.
+//! - `u128` as Balance.
+//!
+//! Once you have your `Runtime`, you can use it for storage type resolution and do things like
+//! `<my_pallet::Pallet<Runtime>>::storage_getter()` or `<my_pallet::StorageItem<Runtime>>::get()`.
+//!
+//! 2. Or, you can use a real runtime.
+//!
+//! ### Example
+//!
+//! With a test runtime
+//!
+//! ```ignore
+//! use remote_externalities::Builder;
+//!
+//! #[derive(Clone, Eq, PartialEq, Debug, Default)]
+//! pub struct TestRuntime;
+//!
+//! use frame_system as system;
+//! impl_outer_origin! {
+//!     pub enum Origin for TestRuntime {}
+//! }
+//!
+//! impl frame_system::Config for TestRuntime {
+//!     ..
+//!     // we only care about these two for now. The rest can be mock. The block number type of
+//!     // kusama is u32.
+//!     type BlockNumber = u32;
+//!     type Header = Header;
+//!     ..
+//! }
+//!
+//! #[test]
+//! fn test_runtime_works() {
+//!     let hash: Hash =
+//!         hex!["f9a4ce984129569f63edc01b1c13374779f9384f1befd39931ffdcc83acf63a7"].into();
+//!     let parent: Hash =
+//!         hex!["540922e96a8fcaf945ed23c6f09c3e189bd88504ec945cc2171deaebeaf2f37e"].into();
+//!     Builder::new()
+//!         .at(hash)
+//!         .module("System")
+//!         .build()
+//!         .execute_with(|| {
+//!             assert_eq!(
+//!                 // note: the hash corresponds to 3098546. We can check only the parent.
+//!                 // https://polkascan.io/kusama/block/3098546
+//!                 <frame_system::Module<Runtime>>::block_hash(3098545u32),
+//!                 parent,
+//!             )
+//!         });
+//! }
+//! ```
+//!
+//! Or with the real kusama runtime.
+//!
+//! ```ignore
+//! use remote_externalities::Builder;
+//! use kusama_runtime::Runtime;
+//!
+//! #[test]
+//! fn test_runtime_works() {
+//!     let hash: Hash =
+//!         hex!["f9a4ce984129569f63edc01b1c13374779f9384f1befd39931ffdcc83acf63a7"].into();
+//!     Builder::new()
+//!         .at(hash)
+//!         .module("Staking")
+//!         .build()
+//!         .execute_with(|| assert_eq!(<pallet_staking::Module<Runtime>>::validator_count(), 400));
+//! }
+//! ```
+
+use std::{
+	fs,
+	path::{Path, PathBuf},
+};
+use log::*;
+use sp_core::{hashing::twox_128};
+pub use sp_io::TestExternalities;
+use sp_core::{
+	hexdisplay::HexDisplay,
+	storage::{StorageKey, StorageData},
+};
+use futures::future::Future;
+
+type KeyPair = (StorageKey, StorageData);
+type Number = u32;
+type Hash = sp_core::H256;
+// TODO: make these two generic.
+
+const LOG_TARGET: &'static str = "remote-ext";
+
+/// The execution mode.
+#[derive(Clone)]
+pub enum Mode {
+	/// Online.
+	Online(OnlineConfig),
+	/// Offline. Uses a cached file and needs not any client config.
+	Offline(OfflineConfig),
+}
+
+/// configuration of the online execution.
+///
+/// A cache config must be present.
+#[derive(Clone)]
+pub struct OfflineConfig {
+	/// The configuration of the cache file to use. It must be present.
+	pub cache: CacheConfig,
+}
+
+/// Configuration of the online execution.
+///
+/// A cache config may be present and will be written to in that case.
+#[derive(Clone)]
+pub struct OnlineConfig {
+	/// The HTTP uri to use.
+	pub uri: String,
+	/// The block number at which to connect. Will be latest finalized head if not provided.
+	pub at: Option<Hash>,
+	/// An optional cache file to WRITE to, not for reading. Not cached if set to `None`.
+	pub cache: Option<CacheConfig>,
+	/// The modules to scrape. If empty, entire chain state will be scraped.
+	pub modules: Vec<String>,
+}
+
+impl Default for OnlineConfig {
+	fn default() -> Self {
+		Self {
+			uri: "http://localhost:9933".into(),
+			at: None,
+			cache: None,
+			modules: Default::default(),
+		}
+	}
+}
+
+/// Configuration of the cache.
+#[derive(Clone)]
+pub struct CacheConfig {
+	// TODO: I could mix these two into one filed, but I think separate is better bc one can be
+	// configurable while one not.
+	/// File name.
+	pub name: String,
+	/// Base directory.
+	pub directory: String,
+}
+
+impl Default for CacheConfig {
+	fn default() -> Self {
+		Self { name: "CACHE".into(), directory: ".".into() }
+	}
+}
+
+impl CacheConfig {
+	fn path(&self) -> PathBuf {
+		Path::new(&self.directory).join(self.name.clone())
+	}
+}
+
+/// Builder for remote-externalities.
+pub struct Builder {
+	inject: Vec<KeyPair>,
+	mode: Mode,
+	chain: String,
+}
+
+impl Default for Builder {
+	fn default() -> Self {
+		Self {
+			inject: Default::default(),
+			mode: Mode::Online(OnlineConfig {
+				at: None,
+				uri: "http://localhost:9933".into(),
+				cache: None,
+				modules: Default::default(),
+			}),
+			chain: "UNSET".into(),
+		}
+	}
+}
+
+// Mode methods
+impl Builder {
+	fn as_online(&self) -> &OnlineConfig {
+		match &self.mode {
+			Mode::Online(config) => &config,
+			_ => panic!("Unexpected mode: Online"),
+		}
+	}
+
+	fn as_online_mut(&mut self) -> &mut OnlineConfig {
+		match &mut self.mode {
+			Mode::Online(config) => config,
+			_ => panic!("Unexpected mode: Online"),
+		}
+	}
+}
+
+// RPC methods
+impl Builder {
+	async fn rpc_get_head(&self) -> Hash {
+		let mut rt = tokio::runtime::Runtime::new().expect("Unable to create a runtime");
+		let uri = self.as_online().uri.clone();
+		rt.block_on::<_, _, ()>(futures::lazy(move || {
+			trace!(target: LOG_TARGET, "rpc: finalized_head");
+			let client: sc_rpc_api::chain::ChainClient<Number, Hash, (), ()> =
+				jsonrpc_core_client::transports::http::connect(&uri).wait().unwrap();
+			Ok(client.finalized_head().wait().unwrap())
+		}))
+		.unwrap()
+	}
+
+	/// Relay the request to `state_getPairs` rpc endpoint.
+	///
+	/// Note that this is an unsafe RPC.
+	async fn rpc_get_pairs(&self, prefix: StorageKey, at: Hash) -> Vec<KeyPair> {
+		let mut rt = tokio::runtime::Runtime::new().expect("Unable to create a runtime");
+		let uri = self.as_online().uri.clone();
+		rt.block_on::<_, _, ()>(futures::lazy(move || {
+			trace!(target: LOG_TARGET, "rpc: storage_pairs: {:?} / {:?}", prefix, at);
+			let client: sc_rpc_api::state::StateClient<Hash> =
+				jsonrpc_core_client::transports::http::connect(&uri).wait().unwrap();
+			Ok(client.storage_pairs(prefix, Some(at)).wait().unwrap())
+		}))
+		.unwrap()
+	}
+
+	/// Get the chain name.
+	async fn chain_name(&self) -> String {
+		let mut rt = tokio::runtime::Runtime::new().expect("Unable to create a runtime");
+		let uri = self.as_online().uri.clone();
+		rt.block_on::<_, _, ()>(futures::lazy(move || {
+			trace!(target: LOG_TARGET, "rpc: system_chain");
+			let client: sc_rpc_api::system::SystemClient<(), ()> =
+				jsonrpc_core_client::transports::http::connect(&uri).wait().unwrap();
+			Ok(client.system_chain().wait().unwrap())
+		}))
+		.unwrap()
+	}
+}
+
+// Internal methods
+impl Builder {
+	/// Save the given data as cache.
+	fn save_cache(&self, data: &[KeyPair], path: &Path) {
+		let bdata = bincode::serialize(data).unwrap();
+		info!(target: LOG_TARGET, "writing to cache file {:?}", path);
+		fs::write(path, bdata).unwrap();
+	}
+
+	/// initialize `Self` from cache. Panics if the file does not exist.
+	fn load_cache(&self, path: &Path) -> Vec<KeyPair> {
+		info!(target: LOG_TARGET, "scraping keypairs from cache {:?}", path,);
+		let bytes = fs::read(path).unwrap();
+		bincode::deserialize(&bytes[..]).unwrap()
+	}
+
+	/// Build `Self` from a network node denoted by `uri`.
+	async fn load_remote(&self) -> Vec<KeyPair> {
+		let config = self.as_online();
+		let at = self.as_online().at.unwrap().clone();
+		info!(target: LOG_TARGET, "scraping keypairs from remote node {} @ {:?}", config.uri, at);
+
+		let keys_and_values = if config.modules.len() > 0 {
+			let mut filtered_kv = vec![];
+			for f in config.modules.iter() {
+				let hashed_prefix = StorageKey(twox_128(f.as_bytes()).to_vec());
+				let module_kv = self.rpc_get_pairs(hashed_prefix.clone(), at).await;
+				info!(
+					target: LOG_TARGET,
+					"downloaded data for module {} (count: {} / prefix: {:?}).",
+					f,
+					module_kv.len(),
+					HexDisplay::from(&hashed_prefix),
+				);
+				filtered_kv.extend(module_kv);
+			}
+			filtered_kv
+		} else {
+			info!(target: LOG_TARGET, "downloading data for all modules.");
+			self.rpc_get_pairs(StorageKey(vec![]), at).await.into_iter().collect::<Vec<_>>()
+		};
+
+		keys_and_values
+	}
+
+	async fn init_remote_client(&mut self) {
+		self.as_online_mut().at = Some(self.rpc_get_head().await);
+		self.chain = self.chain_name().await;
+	}
+
+	async fn pre_build(mut self) -> Vec<KeyPair> {
+		let mut base_kv = match self.mode.clone() {
+			Mode::Offline(config) => self.load_cache(&config.cache.path()),
+			Mode::Online(config) => {
+				self.init_remote_client().await;
+				let kp = self.load_remote().await;
+				if let Some(c) = config.cache {
+					self.save_cache(&kp, &c.path());
+				}
+				kp
+			}
+		};
+
+		info!(
+			target: LOG_TARGET,
+			"extending externalities with {} manually injected keys",
+			self.inject.len()
+		);
+		base_kv.extend(self.inject.clone());
+		base_kv
+	}
+}
+
+// Public methods
+impl Builder {
+	/// Create a new builder.
+	pub fn new() -> Self {
+		Default::default()
+	}
+
+	/// Inject a manual list of key and values to the storage.
+	pub fn inject(mut self, injections: &[KeyPair]) -> Self {
+		for i in injections {
+			self.inject.push(i.clone());
+		}
+		self
+	}
+
+	/// Configure a cache to be used.
+	pub fn mode(mut self, mode: Mode) -> Self {
+		self.mode = mode;
+		self
+	}
+
+	/// Build the test externalities.
+	pub async fn build(self) -> TestExternalities {
+		let kv = self.pre_build().await;
+		let mut ext = TestExternalities::new_empty();
+
+		info!(target: LOG_TARGET, "injecting a total of {} keys", kv.len());
+		for (k, v) in kv {
+			let (k, v) = (k.0, v.0);
+			ext.insert(k, v);
+		}
+		ext
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+
+	fn init_logger() {
+		let _ = env_logger::Builder::from_default_env()
+			.format_module_path(false)
+			.format_level(true)
+			.try_init();
+	}
+
+	#[async_std::test]
+	#[cfg(feature = "remote-test")]
+	async fn can_build_one_pallet() {
+		init_logger();
+		Builder::new()
+			.mode(Mode::Online(OnlineConfig {
+				modules: vec!["Proxy".into()],
+				..Default::default()
+			}))
+			.build()
+			.await
+			.execute_with(|| {});
+	}
+
+	#[async_std::test]
+	async fn can_load_cache() {
+		init_logger();
+		Builder::new()
+			.mode(Mode::Offline(OfflineConfig {
+				cache: CacheConfig { name: "proxy_test".into(), ..Default::default() },
+			}))
+			.build()
+			.await
+			.execute_with(|| {});
+	}
+
+	#[async_std::test]
+	#[cfg(feature = "remote-test")]
+	async fn can_create_cache() {
+		init_logger();
+		Builder::new()
+			.mode(Mode::Online(OnlineConfig {
+				cache: Some(CacheConfig {
+					name: "test_cache_to_remove.bin".into(),
+					..Default::default()
+				}),
+				..Default::default()
+			}))
+			.build()
+			.await
+			.execute_with(|| {});
+
+		let to_delete = std::fs::read_dir(CacheConfig::default().directory)
+			.unwrap()
+			.into_iter()
+			.map(|d| d.unwrap())
+			.filter(|p| p.path().extension().unwrap_or_default() == "bin")
+			.collect::<Vec<_>>();
+
+		assert!(to_delete.len() > 0);
+
+		for d in to_delete {
+			std::fs::remove_file(d.path()).unwrap();
+		}
+	}
+
+	#[async_std::test]
+	#[cfg(feature = "remote-test")]
+	async fn can_build_all() {
+		init_logger();
+		Builder::new().build().await.execute_with(|| {});
+	}
+}
diff --git a/utils/frame/try-runtime/cli/Cargo.toml b/utils/frame/try-runtime/cli/Cargo.toml
new file mode 100644
index 000000000000..592d0a5b99d2
--- /dev/null
+++ b/utils/frame/try-runtime/cli/Cargo.toml
@@ -0,0 +1,32 @@
+[package]
+name = "try-runtime-cli"
+version = "0.9.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
+license = "Apache-2.0"
+homepage = "https://substrate.dev"
+repository = "https://github.com/paritytech/substrate/"
+description = "Cli command runtime testing and dry-running"
+readme = "README.md"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+log = "0.4.8"
+parity-scale-codec = { version = "2.0.0" }
+
+sc-service = { version = "0.9.0", default-features = false, path = "../../../../client/service" }
+sc-cli = { version = "0.9.0", path = "../../../../client/cli" }
+sc-executor = { path = "../../../../client/executor" }
+sc-client-api = { version = "3.0.0", path = "../../../../client/api" }
+structopt = "0.3.8"
+sp-state-machine = { version = "0.9.0", path = "../../../../primitives/state-machine" }
+sp-api = { version = "3.0.0", path = "../../../../primitives/api" }
+sp-blockchain = { version = "3.0.0", path = "../../../../primitives/blockchain" }
+sp-runtime = { version = "3.0.0", path = "../../../../primitives/runtime" }
+sp-externalities = { version = "0.9.0", path = "../../../../primitives/externalities" }
+sp-core = { version = "3.0.0", path = "../../../../primitives/core" }
+frame-try-runtime = { version = "0.9.0", path = "../../../../frame/try-runtime" }
+
+remote-externalities = { path = "../../remote-externalities" }
diff --git a/utils/frame/try-runtime/cli/src/lib.rs b/utils/frame/try-runtime/cli/src/lib.rs
new file mode 100644
index 000000000000..92526379f471
--- /dev/null
+++ b/utils/frame/try-runtime/cli/src/lib.rs
@@ -0,0 +1,178 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! `Structopt`-ready struct for `try-runtime`.
+
+use parity_scale_codec::Decode;
+use std::{fmt::Debug, str::FromStr};
+use sc_service::Configuration;
+use sc_cli::{CliConfiguration, ExecutionStrategy, WasmExecutionMethod};
+use sc_executor::NativeExecutor;
+use sc_service::NativeExecutionDispatch;
+use sp_state_machine::StateMachine;
+use sp_runtime::traits::{Block as BlockT, NumberFor};
+use sp_core::storage::{StorageData, StorageKey, well_known_keys};
+
+/// Various commands to try out the new runtime, over configurable states.
+///
+/// For now this only assumes running the `on_runtime_upgrade` hooks.
+#[derive(Debug, structopt::StructOpt)]
+pub struct TryRuntimeCmd {
+	/// The shared parameters
+	#[allow(missing_docs)]
+	#[structopt(flatten)]
+	pub shared_params: sc_cli::SharedParams,
+
+	/// The state to use to run the migration. Should be a valid FILE or HTTP URI.
+	#[structopt(short, long, default_value = "http://localhost:9933")]
+	pub state: State,
+
+	/// The execution strategy that should be used for benchmarks
+	#[structopt(
+		long = "execution",
+		value_name = "STRATEGY",
+		possible_values = &ExecutionStrategy::variants(),
+		case_insensitive = true,
+		default_value = "Native",
+	)]
+	pub execution: ExecutionStrategy,
+
+	/// Method for executing Wasm runtime code.
+	#[structopt(
+		long = "wasm-execution",
+		value_name = "METHOD",
+		possible_values = &WasmExecutionMethod::enabled_variants(),
+		case_insensitive = true,
+		default_value = "Interpreted"
+	)]
+	pub wasm_method: WasmExecutionMethod,
+}
+
+/// The state to use for a migration dry-run.
+#[derive(Debug)]
+pub enum State {
+	/// A snapshot. Inner value is a file path.
+	Snap(String),
+
+	/// A live chain. Inner value is the HTTP uri.
+	Live(String),
+}
+
+impl FromStr for State {
+	type Err = &'static str;
+	fn from_str(s: &str) -> Result<Self, Self::Err> {
+		match s.get(..7) {
+			// could use Url crate as well, but lets keep it simple for now.
+			Some("http://") => Ok(State::Live(s.to_string())),
+			Some("file://") => s
+				.split("//")
+				.collect::<Vec<_>>()
+				.get(1)
+				.map(|s| State::Snap(s.to_string()))
+				.ok_or("invalid file URI"),
+			_ => Err("invalid format. Must be a valid HTTP or File URI"),
+		}
+	}
+}
+
+impl TryRuntimeCmd {
+	pub async fn run<B, ExecDispatch>(&self, config: Configuration) -> sc_cli::Result<()>
+	where
+		B: BlockT,
+		ExecDispatch: NativeExecutionDispatch + 'static,
+	{
+		let spec = config.chain_spec;
+		let genesis_storage = spec.build_storage()?;
+
+		let code = StorageData(
+			genesis_storage
+				.top
+				.get(well_known_keys::CODE)
+				.expect("code key must exist in genesis storage; qed")
+				.to_vec(),
+		);
+		let code_key = StorageKey(well_known_keys::CODE.to_vec());
+
+		let wasm_method = self.wasm_method;
+		let execution = self.execution;
+
+		let mut changes = Default::default();
+		// don't really care about these -- use the default values.
+		let max_runtime_instances = config.max_runtime_instances;
+		let heap_pages = config.default_heap_pages;
+		let executor = NativeExecutor::<ExecDispatch>::new(
+			wasm_method.into(),
+			heap_pages,
+			max_runtime_instances,
+		);
+
+		let ext = {
+			use remote_externalities::{Builder, Mode, CacheConfig, OfflineConfig, OnlineConfig};
+			let builder = match &self.state {
+				State::Snap(file_path) => Builder::new().mode(Mode::Offline(OfflineConfig {
+					cache: CacheConfig { name: file_path.into(), ..Default::default() },
+				})),
+				State::Live(http_uri) => Builder::new().mode(Mode::Online(OnlineConfig {
+					uri: http_uri.into(),
+					..Default::default()
+				})),
+			};
+
+			// inject the code into this ext.
+			builder.inject(&[(code_key, code)]).build().await
+		};
+
+		let encoded_result = StateMachine::<_, _, NumberFor<B>, _>::new(
+			&ext.backend,
+			None,
+			&mut changes,
+			&executor,
+			"TryRuntime_on_runtime_upgrade",
+			&[],
+			ext.extensions,
+			&sp_state_machine::backend::BackendRuntimeCode::new(&ext.backend)
+				.runtime_code()?,
+			sp_core::testing::TaskExecutor::new(),
+		)
+		.execute(execution.into())
+		.map_err(|e| format!("failed to execute 'TryRuntime_on_runtime_upgrade' due to {:?}", e))?;
+
+		let (weight, total_weight) = <(u64, u64) as Decode>::decode(&mut &*encoded_result)
+			.map_err(|e| format!("failed to decode output due to {:?}", e))?;
+		log::info!(
+			"try-runtime executed without errors. Consumed weight = {}, total weight = {} ({})",
+			weight,
+			total_weight,
+			weight as f64 / total_weight as f64
+		);
+
+		Ok(())
+	}
+}
+
+impl CliConfiguration for TryRuntimeCmd {
+	fn shared_params(&self) -> &sc_cli::SharedParams {
+		&self.shared_params
+	}
+
+	fn chain_id(&self, _is_dev: bool) -> sc_cli::Result<String> {
+		Ok(match self.shared_params.chain {
+			Some(ref chain) => chain.clone(),
+			None => "dev".into(),
+		})
+	}
+}

From 3c1c49e8317abfedaede198ef4aed8173eb23ef0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Fri, 19 Feb 2021 17:31:03 +0100
Subject: [PATCH 0412/1194] Ensure we spawn the block import worker as an
 essential task (#8155)

* Ensure we spawn the block import worker as an essential task

This pr ensures that we spawn the block import worker as an essential
task. This is quite important as we need to bring down the node when the
block import is done. Besides that it adds some debug output to the
block import worker.

* Don't be stupid :D
---
 bin/node-template/node/src/service.rs         |  4 +--
 bin/node/cli/src/service.rs                   |  4 +--
 client/consensus/aura/src/lib.rs              |  2 +-
 client/consensus/babe/src/lib.rs              |  2 +-
 client/consensus/manual-seal/src/lib.rs       |  2 +-
 client/consensus/pow/src/lib.rs               |  2 +-
 client/service/src/task_manager/mod.rs        | 11 ++++++++
 .../common/src/import_queue/basic_queue.rs    | 24 ++++++++++++++---
 primitives/core/src/testing.rs                | 10 +++++++
 primitives/core/src/traits.rs                 | 27 ++++++++++++++++++-
 10 files changed, 75 insertions(+), 13 deletions(-)

diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
index 552705f299b8..92518ef22dee 100644
--- a/bin/node-template/node/src/service.rs
+++ b/bin/node-template/node/src/service.rs
@@ -73,7 +73,7 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 		Some(Box::new(grandpa_block_import.clone())),
 		client.clone(),
 		inherent_data_providers.clone(),
-		&task_manager.spawn_handle(),
+		&task_manager.spawn_essential_handle(),
 		config.prometheus_registry(),
 		sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()),
 	)?;
@@ -295,7 +295,7 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		Some(Box::new(grandpa_block_import)),
 		client.clone(),
 		InherentDataProviders::new(),
-		&task_manager.spawn_handle(),
+		&task_manager.spawn_essential_handle(),
 		config.prometheus_registry(),
 		sp_consensus::NeverCanAuthor,
 	)?;
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index df3802d3d802..db4ed3f4f1dc 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -94,7 +94,7 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 		client.clone(),
 		select_chain.clone(),
 		inherent_data_providers.clone(),
-		&task_manager.spawn_handle(),
+		&task_manager.spawn_essential_handle(),
 		config.prometheus_registry(),
 		sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()),
 	)?;
@@ -405,7 +405,7 @@ pub fn new_light_base(mut config: Configuration) -> Result<(
 		client.clone(),
 		select_chain.clone(),
 		inherent_data_providers.clone(),
-		&task_manager.spawn_handle(),
+		&task_manager.spawn_essential_handle(),
 		config.prometheus_registry(),
 		sp_consensus::NeverCanAuthor,
 	)?;
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index eb3c2e93e704..0702ccd7f135 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -849,7 +849,7 @@ pub fn import_queue<B, I, C, P, S, CAW>(
 	P: Pair + Send + Sync + 'static,
 	P::Public: Clone + Eq + Send + Sync + Hash + Debug + Encode + Decode,
 	P::Signature: Encode + Decode,
-	S: sp_core::traits::SpawnNamed,
+	S: sp_core::traits::SpawnEssentialNamed,
 	CAW: CanAuthorWith<B> + Send + Sync + 'static,
 {
 	register_aura_inherent_data_provider(&inherent_data_providers, slot_duration.get())?;
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index 61be3a2f5e5b..a6530dea08dc 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -1491,7 +1491,7 @@ pub fn import_queue<Block: BlockT, Client, SelectChain, Inner, CAW>(
 	client: Arc<Client>,
 	select_chain: SelectChain,
 	inherent_data_providers: InherentDataProviders,
-	spawner: &impl sp_core::traits::SpawnNamed,
+	spawner: &impl sp_core::traits::SpawnEssentialNamed,
 	registry: Option<&Registry>,
 	can_author_with: CAW,
 ) -> ClientResult<DefaultImportQueue<Block, Client>> where
diff --git a/client/consensus/manual-seal/src/lib.rs b/client/consensus/manual-seal/src/lib.rs
index 3ec68588573e..320f196c1052 100644
--- a/client/consensus/manual-seal/src/lib.rs
+++ b/client/consensus/manual-seal/src/lib.rs
@@ -73,7 +73,7 @@ impl<B: BlockT> Verifier<B> for ManualSealVerifier {
 /// Instantiate the import queue for the manual seal consensus engine.
 pub fn import_queue<Block, Transaction>(
 	block_import: BoxBlockImport<Block, Transaction>,
-	spawner: &impl sp_core::traits::SpawnNamed,
+	spawner: &impl sp_core::traits::SpawnEssentialNamed,
 	registry: Option<&Registry>,
 ) -> BasicQueue<Block, Transaction>
 	where
diff --git a/client/consensus/pow/src/lib.rs b/client/consensus/pow/src/lib.rs
index 5ac8a41417a8..3c7f1a832d3c 100644
--- a/client/consensus/pow/src/lib.rs
+++ b/client/consensus/pow/src/lib.rs
@@ -505,7 +505,7 @@ pub fn import_queue<B, Transaction, Algorithm>(
 	justification_import: Option<BoxJustificationImport<B>>,
 	algorithm: Algorithm,
 	inherent_data_providers: InherentDataProviders,
-	spawner: &impl sp_core::traits::SpawnNamed,
+	spawner: &impl sp_core::traits::SpawnEssentialNamed,
 	registry: Option<&Registry>,
 ) -> Result<
 	PowImportQueue<B, Transaction>,
diff --git a/client/service/src/task_manager/mod.rs b/client/service/src/task_manager/mod.rs
index 02d83e6dce7c..c7254f1f894d 100644
--- a/client/service/src/task_manager/mod.rs
+++ b/client/service/src/task_manager/mod.rs
@@ -150,6 +150,7 @@ impl sp_core::traits::SpawnNamed for SpawnTaskHandle {
 /// task spawned through it fails. The service should be on the receiver side
 /// and will shut itself down whenever it receives any message, i.e. an
 /// essential task has failed.
+#[derive(Clone)]
 pub struct SpawnEssentialTaskHandle {
 	essential_failed_tx: TracingUnboundedSender<()>,
 	inner: SpawnTaskHandle,
@@ -203,6 +204,16 @@ impl SpawnEssentialTaskHandle {
 	}
 }
 
+impl sp_core::traits::SpawnEssentialNamed for SpawnEssentialTaskHandle {
+	fn spawn_essential_blocking(&self, name: &'static str, future: BoxFuture<'static, ()>) {
+		self.spawn_blocking(name, future);
+	}
+
+	fn spawn_essential(&self, name: &'static str, future: BoxFuture<'static, ()>) {
+		self.spawn(name, future);
+	}
+}
+
 /// Helper struct to manage background/async tasks in Service.
 pub struct TaskManager {
 	/// A future that resolves when the service has exited, this is useful to
diff --git a/primitives/consensus/common/src/import_queue/basic_queue.rs b/primitives/consensus/common/src/import_queue/basic_queue.rs
index 541c1ff0f4ed..f1b42e1460e5 100644
--- a/primitives/consensus/common/src/import_queue/basic_queue.rs
+++ b/primitives/consensus/common/src/import_queue/basic_queue.rs
@@ -62,7 +62,7 @@ impl<B: BlockT, Transaction: Send + 'static> BasicQueue<B, Transaction> {
 		verifier: V,
 		block_import: BoxBlockImport<B, Transaction>,
 		justification_import: Option<BoxJustificationImport<B>>,
-		spawner: &impl sp_core::traits::SpawnNamed,
+		spawner: &impl sp_core::traits::SpawnEssentialNamed,
 		prometheus_registry: Option<&Registry>,
 	) -> Self {
 		let (result_sender, result_port) = buffered_link::buffered_link();
@@ -83,7 +83,7 @@ impl<B: BlockT, Transaction: Send + 'static> BasicQueue<B, Transaction> {
 			metrics,
 		);
 
-		spawner.spawn_blocking("basic-block-import-worker", future.boxed());
+		spawner.spawn_essential_blocking("basic-block-import-worker", future.boxed());
 
 		Self {
 			justification_sender,
@@ -164,7 +164,13 @@ async fn block_import_process<B: BlockT, Transaction: Send>(
 	loop {
 		let worker_messages::ImportBlocks(origin, blocks) = match block_import_receiver.next().await {
 			Some(blocks) => blocks,
-			None => return,
+			None => {
+				log::debug!(
+					target: "block-import",
+					"Stopping block import because the import channel was closed!",
+				);
+				return
+			},
 		};
 
 		let res = import_many_blocks(
@@ -236,6 +242,10 @@ impl<B: BlockT> BlockImportWorker<B> {
 				// If the results sender is closed, that means that the import queue is shutting
 				// down and we should end this future.
 				if worker.result_sender.is_closed() {
+					log::debug!(
+						target: "block-import",
+						"Stopping block import because result channel was closed!",
+					);
 					return;
 				}
 
@@ -244,7 +254,13 @@ impl<B: BlockT> BlockImportWorker<B> {
 					match justification {
 						Some(ImportJustification(who, hash, number, justification)) =>
 							worker.import_justification(who, hash, number, justification),
-						None => return,
+						None => {
+							log::debug!(
+								target: "block-import",
+								"Stopping block import because justification channel was closed!",
+							);
+							return
+						},
 					}
 				}
 
diff --git a/primitives/core/src/testing.rs b/primitives/core/src/testing.rs
index 1506abb77f9c..b33f518c32ee 100644
--- a/primitives/core/src/testing.rs
+++ b/primitives/core/src/testing.rs
@@ -152,3 +152,13 @@ impl crate::traits::SpawnNamed for TaskExecutor {
 		self.0.spawn_ok(future);
 	}
 }
+
+#[cfg(feature = "std")]
+impl crate::traits::SpawnEssentialNamed for TaskExecutor {
+	fn spawn_essential_blocking(&self, _: &'static str, future: futures::future::BoxFuture<'static, ()>) {
+		self.0.spawn_ok(future);
+	}
+	fn spawn_essential(&self, _: &'static str, future: futures::future::BoxFuture<'static, ()>) {
+		self.0.spawn_ok(future);
+	}
+}
diff --git a/primitives/core/src/traits.rs b/primitives/core/src/traits.rs
index 15c1816331d0..90f8060f9a56 100644
--- a/primitives/core/src/traits.rs
+++ b/primitives/core/src/traits.rs
@@ -205,7 +205,7 @@ sp_externalities::decl_extension! {
 	pub struct RuntimeSpawnExt(Box<dyn RuntimeSpawn>);
 }
 
-/// Something that can spawn futures (blocking and non-blocking) with an assigned name.
+/// Something that can spawn tasks (blocking and non-blocking) with an assigned name.
 #[dyn_clonable::clonable]
 pub trait SpawnNamed: Clone + Send + Sync {
 	/// Spawn the given blocking future.
@@ -227,3 +227,28 @@ impl SpawnNamed for Box<dyn SpawnNamed> {
 		(**self).spawn(name, future)
 	}
 }
+
+/// Something that can spawn essential tasks (blocking and non-blocking) with an assigned name.
+///
+/// Essential tasks are special tasks that should take down the node when they end.
+#[dyn_clonable::clonable]
+pub trait SpawnEssentialNamed: Clone + Send + Sync {
+	/// Spawn the given blocking future.
+	///
+	/// The given `name` is used to identify the future in tracing.
+	fn spawn_essential_blocking(&self, name: &'static str, future: futures::future::BoxFuture<'static, ()>);
+	/// Spawn the given non-blocking future.
+	///
+	/// The given `name` is used to identify the future in tracing.
+	fn spawn_essential(&self, name: &'static str, future: futures::future::BoxFuture<'static, ()>);
+}
+
+impl SpawnEssentialNamed for Box<dyn SpawnEssentialNamed> {
+	fn spawn_essential_blocking(&self, name: &'static str, future: futures::future::BoxFuture<'static, ()>) {
+		(**self).spawn_essential_blocking(name, future)
+	}
+
+	fn spawn_essential(&self, name: &'static str, future: futures::future::BoxFuture<'static, ()>) {
+		(**self).spawn_essential(name, future)
+	}
+}

From e808d1472ca3b822f547f6011b7d44956619002f Mon Sep 17 00:00:00 2001
From: Roman Borschel <romanb@users.noreply.github.com>
Date: Mon, 22 Feb 2021 09:52:22 +0100
Subject: [PATCH 0413/1194] Update to libp2p-0.35.1 (#8141)

---
 Cargo.lock                             | 125 +++++++++++++++----------
 bin/node/browser-testing/Cargo.toml    |   2 +-
 client/authority-discovery/Cargo.toml  |   2 +-
 client/cli/Cargo.toml                  |   2 +-
 client/network-gossip/Cargo.toml       |   2 +-
 client/network/Cargo.toml              |   6 +-
 client/network/test/Cargo.toml         |   2 +-
 client/peerset/Cargo.toml              |   2 +-
 client/telemetry/Cargo.toml            |   2 +-
 primitives/consensus/common/Cargo.toml |   2 +-
 10 files changed, 86 insertions(+), 61 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index dea99ed63bdc..5c59e29c3ebd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -356,6 +356,19 @@ dependencies = [
  "pin-project-lite 0.2.4",
 ]
 
+[[package]]
+name = "asynchronous-codec"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0de5164e5edbf51c45fb8c2d9664ae1c095cce1b265ecf7569093c0d66ef690"
+dependencies = [
+ "bytes 1.0.1",
+ "futures-sink",
+ "futures-util",
+ "memchr",
+ "pin-project-lite 0.2.4",
+]
+
 [[package]]
 name = "atomic"
 version = "0.5.0"
@@ -2956,16 +2969,15 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
 
 [[package]]
 name = "libp2p"
-version = "0.34.0"
+version = "0.35.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5133112ce42be9482f6a87be92a605dd6bbc9e93c297aee77d172ff06908f3a"
+checksum = "adc225a49973cf9ab10d0cdd6a4b8f0cda299df9b760824bbb623f15f8f0c95a"
 dependencies = [
  "atomic",
  "bytes 1.0.1",
  "futures 0.3.12",
  "lazy_static",
  "libp2p-core",
- "libp2p-core-derive",
  "libp2p-deflate",
  "libp2p-dns",
  "libp2p-floodsub",
@@ -2980,6 +2992,7 @@ dependencies = [
  "libp2p-pnet",
  "libp2p-request-response",
  "libp2p-swarm",
+ "libp2p-swarm-derive",
  "libp2p-tcp",
  "libp2p-uds",
  "libp2p-wasm-ext",
@@ -2994,9 +3007,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-core"
-version = "0.27.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dad04d3cef6c1df366a6ab58c9cf8b06497699e335d83ac2174783946ff847d6"
+checksum = "8a2d56aadc2c2bf22cd7797f86e56a65b5b3994a0136b65be3106938acae7a26"
 dependencies = [
  "asn1_der",
  "bs58",
@@ -3021,21 +3034,11 @@ dependencies = [
  "sha2 0.9.3",
  "smallvec 1.6.1",
  "thiserror",
- "unsigned-varint 0.6.0",
+ "unsigned-varint 0.7.0",
  "void",
  "zeroize",
 ]
 
-[[package]]
-name = "libp2p-core-derive"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4bc40943156e42138d22ed3c57ff0e1a147237742715937622a99b10fbe0156"
-dependencies = [
- "quote",
- "syn",
-]
-
 [[package]]
 name = "libp2p-deflate"
 version = "0.27.1"
@@ -3078,11 +3081,11 @@ dependencies = [
 
 [[package]]
 name = "libp2p-gossipsub"
-version = "0.27.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12451ba9493e87c91baf2a6dffce9ddf1fbc807a0861532d7cf477954f8ebbee"
+checksum = "502dc5fcbfec4aa1c63ef3f7307ffe20e90c1a1387bf23ed0bec087f2dde58a1"
 dependencies = [
- "asynchronous-codec",
+ "asynchronous-codec 0.6.0",
  "base64 0.13.0",
  "byteorder",
  "bytes 1.0.1",
@@ -3098,7 +3101,7 @@ dependencies = [
  "regex",
  "sha2 0.9.3",
  "smallvec 1.6.1",
- "unsigned-varint 0.6.0",
+ "unsigned-varint 0.7.0",
  "wasm-timer",
 ]
 
@@ -3120,12 +3123,12 @@ dependencies = [
 
 [[package]]
 name = "libp2p-kad"
-version = "0.28.0"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456f5de8e283d7800ca848b9b9a4e2a578b790bd8ae582b885e831353cf0e5df"
+checksum = "cf3da6c9acbcc05f93235d201d7d45ef4e8b88a45d8836f98becd8b4d443f066"
 dependencies = [
  "arrayvec 0.5.2",
- "asynchronous-codec",
+ "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
  "either",
  "fnv",
@@ -3139,16 +3142,16 @@ dependencies = [
  "sha2 0.9.3",
  "smallvec 1.6.1",
  "uint",
- "unsigned-varint 0.6.0",
+ "unsigned-varint 0.7.0",
  "void",
  "wasm-timer",
 ]
 
 [[package]]
 name = "libp2p-mdns"
-version = "0.28.0"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b974db63233fc0e199f4ede7794294aae285c96f4b6010f853eac4099ef08590"
+checksum = "0e9e6374814d1b118d97ccabdfc975c8910bd16dc38a8bc058eeb08bf2080fe1"
 dependencies = [
  "async-io",
  "data-encoding",
@@ -3167,11 +3170,11 @@ dependencies = [
 
 [[package]]
 name = "libp2p-mplex"
-version = "0.27.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2705dc94b01ab9e3779b42a09bbf3712e637ed213e875c30face247291a85af0"
+checksum = "350ce8b3923594aedabd5d6e3f875d058435052a29c3f32df378bc70d10be464"
 dependencies = [
- "asynchronous-codec",
+ "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
  "futures 0.3.12",
  "libp2p-core",
@@ -3180,7 +3183,7 @@ dependencies = [
  "parking_lot 0.11.1",
  "rand 0.7.3",
  "smallvec 1.6.1",
- "unsigned-varint 0.6.0",
+ "unsigned-varint 0.7.0",
 ]
 
 [[package]]
@@ -3222,18 +3225,18 @@ dependencies = [
 
 [[package]]
 name = "libp2p-plaintext"
-version = "0.27.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48e8c1ec305c9949351925cdc7196b9570f4330477f5e47fbf5bb340b57e26ed"
+checksum = "9d58defcadb646ae4b033e130b48d87410bf76394dc3335496cae99dac803e61"
 dependencies = [
- "asynchronous-codec",
+ "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
  "futures 0.3.12",
  "libp2p-core",
  "log",
  "prost",
  "prost-build",
- "unsigned-varint 0.6.0",
+ "unsigned-varint 0.7.0",
  "void",
 ]
 
@@ -3253,9 +3256,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-request-response"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d37637a4b33b5390322ccc068a33897d0aa541daf4fec99f6a7efbf37295346e"
+checksum = "10e5552827c33d8326502682da73a0ba4bfa40c1b55b216af3c303f32169dd89"
 dependencies = [
  "async-trait",
  "bytes 1.0.1",
@@ -3267,15 +3270,15 @@ dependencies = [
  "minicbor",
  "rand 0.7.3",
  "smallvec 1.6.1",
- "unsigned-varint 0.6.0",
+ "unsigned-varint 0.7.0",
  "wasm-timer",
 ]
 
 [[package]]
 name = "libp2p-swarm"
-version = "0.27.1"
+version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4f89ebb4d8953bda12623e9871959fe728dea3bf6eae0421dc9c42dc821e488"
+checksum = "7955b973e1fd2bd61ffd43ce261c1223f61f4aacd5bae362a924993f9a25fd98"
 dependencies = [
  "either",
  "futures 0.3.12",
@@ -3287,11 +3290,21 @@ dependencies = [
  "wasm-timer",
 ]
 
+[[package]]
+name = "libp2p-swarm-derive"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c564ebaa36a64839f51eaddb0243aaaa29ce64affb56129193cc3248b72af273"
+dependencies = [
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "libp2p-tcp"
-version = "0.27.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dbd3d7076a478ac5a6aca55e74bdc250ac539b95de09b9d09915e0b8d01a6b2"
+checksum = "88a5aef80e519a6cb8e2663605142f97baaaea1a252eecbf8756184765f7471b"
 dependencies = [
  "async-io",
  "futures 0.3.12",
@@ -3350,9 +3363,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-yamux"
-version = "0.30.0"
+version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "490b8b27fc40fe35212df1b6a3d14bffaa4117cbff956fdc2892168a371102ad"
+checksum = "4819358c542a86ff95f6ae691efb4b94ddaf477079b01a686f5705b79bfc232a"
 dependencies = [
  "futures 0.3.12",
  "libp2p-core",
@@ -5374,9 +5387,9 @@ dependencies = [
 
 [[package]]
 name = "parity-multiaddr"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bfda2e46fc5e14122649e2645645a81ee5844e0fb2e727ef560cc71a8b2d801"
+checksum = "d2c6805f98667a3828afb2ec2c396a8d610497e8d546f5447188aae47c5a79ec"
 dependencies = [
  "arrayref",
  "bs58",
@@ -5386,7 +5399,7 @@ dependencies = [
  "percent-encoding 2.1.0",
  "serde",
  "static_assertions",
- "unsigned-varint 0.6.0",
+ "unsigned-varint 0.7.0",
  "url 2.2.0",
 ]
 
@@ -7285,7 +7298,7 @@ dependencies = [
  "assert_matches",
  "async-std",
  "async-trait",
- "asynchronous-codec",
+ "asynchronous-codec 0.5.0",
  "bitflags",
  "bs58",
  "bytes 1.0.1",
@@ -10067,7 +10080,19 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "35581ff83d4101e58b582e607120c7f5ffb17e632a980b1f38334d76b36908b2"
 dependencies = [
- "asynchronous-codec",
+ "asynchronous-codec 0.5.0",
+ "bytes 1.0.1",
+ "futures-io",
+ "futures-util",
+]
+
+[[package]]
+name = "unsigned-varint"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f8d425fafb8cd76bc3f22aace4af471d3156301d7508f2107e98fbeae10bc7f"
+dependencies = [
+ "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
  "futures-io",
  "futures-util",
@@ -10682,9 +10707,9 @@ dependencies = [
 
 [[package]]
 name = "yamux"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aeb8c4043cac71c3c299dff107171c220d179492350ea198e109a414981b83c"
+checksum = "1cc7bd8c983209ed5d527f44b01c41b7dc146fd960c61cf9e1d25399841dc271"
 dependencies = [
  "futures 0.3.12",
  "log",
diff --git a/bin/node/browser-testing/Cargo.toml b/bin/node/browser-testing/Cargo.toml
index af4c69b8efe8..fe83cc65ba63 100644
--- a/bin/node/browser-testing/Cargo.toml
+++ b/bin/node/browser-testing/Cargo.toml
@@ -8,7 +8,7 @@ license = "Apache-2.0"
 
 [dependencies]
 futures-timer = "3.0.2"
-libp2p = { version = "0.34.0", default-features = false }
+libp2p = { version = "0.35.1", default-features = false }
 jsonrpc-core = "15.0.0"
 serde = "1.0.106"
 serde_json = "1.0.48"
diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml
index 9a1b8c8dab50..4de6b5479066 100644
--- a/client/authority-discovery/Cargo.toml
+++ b/client/authority-discovery/Cargo.toml
@@ -23,7 +23,7 @@ derive_more = "0.99.2"
 either = "1.5.3"
 futures = "0.3.9"
 futures-timer = "3.0.1"
-libp2p = { version = "0.34.0", default-features = false, features = ["kad"] }
+libp2p = { version = "0.35.1", default-features = false, features = ["kad"] }
 log = "0.4.8"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
 prost = "0.7"
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index 03d23c5aec3e..4617c2d790ad 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -18,7 +18,7 @@ regex = "1.4.2"
 tokio = { version = "0.2.21", features = [ "signal", "rt-core", "rt-threaded", "blocking" ] }
 futures = "0.3.9"
 fdlimit = "0.2.1"
-libp2p = "0.34.0"
+libp2p = "0.35.1"
 parity-scale-codec = "2.0.0"
 hex = "0.4.2"
 rand = "0.7.3"
diff --git a/client/network-gossip/Cargo.toml b/client/network-gossip/Cargo.toml
index 4da356f92d68..f8737751f0d2 100644
--- a/client/network-gossip/Cargo.toml
+++ b/client/network-gossip/Cargo.toml
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 futures = "0.3.9"
 futures-timer = "3.0.1"
-libp2p = { version = "0.34.0", default-features = false }
+libp2p = { version = "0.35.1", default-features = false }
 log = "0.4.8"
 lru = "0.6.1"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.9.0", path = "../../utils/prometheus" }
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index 87e960fb6426..bed3aba46e1e 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -63,17 +63,17 @@ wasm-timer = "0.2"
 zeroize = "1.2.0"
 
 [dependencies.libp2p]
-version = "0.34.0"
+version = "0.35.1"
 
 [target.'cfg(target_os = "unknown")'.dependencies.libp2p]
-version = "0.34.0"
+version = "0.35.1"
 default-features = false
 features = ["identify", "kad", "mdns", "mplex", "noise", "ping", "request-response", "tcp-async-io", "websocket", "yamux"]
 
 
 [dev-dependencies]
 assert_matches = "1.3"
-libp2p = { version = "0.34.0", default-features = false }
+libp2p = { version = "0.35.1", default-features = false }
 quickcheck = "1.0.3"
 rand = "0.7.2"
 sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
diff --git a/client/network/test/Cargo.toml b/client/network/test/Cargo.toml
index 5a799ad82941..009315084cc3 100644
--- a/client/network/test/Cargo.toml
+++ b/client/network/test/Cargo.toml
@@ -20,7 +20,7 @@ parking_lot = "0.11.1"
 futures = "0.3.9"
 futures-timer = "3.0.1"
 rand = "0.7.2"
-libp2p = { version = "0.34.0", default-features = false }
+libp2p = { version = "0.35.1", default-features = false }
 sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
 sc-consensus = { version = "0.9.0", path = "../../consensus/common" }
 sc-client-api = { version = "3.0.0", path = "../../api" }
diff --git a/client/peerset/Cargo.toml b/client/peerset/Cargo.toml
index 90f7820017e2..536ec6b68175 100644
--- a/client/peerset/Cargo.toml
+++ b/client/peerset/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 futures = "0.3.9"
-libp2p = { version = "0.34.0", default-features = false }
+libp2p = { version = "0.35.1", default-features = false }
 sp-utils = { version = "3.0.0", path = "../../primitives/utils"}
 log = "0.4.8"
 serde_json = "1.0.41"
diff --git a/client/telemetry/Cargo.toml b/client/telemetry/Cargo.toml
index 23b6936ff405..0d29fbca6f9b 100644
--- a/client/telemetry/Cargo.toml
+++ b/client/telemetry/Cargo.toml
@@ -18,7 +18,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 parking_lot = "0.11.1"
 futures = "0.3.9"
 wasm-timer = "0.2.5"
-libp2p = { version = "0.34.0", default-features = false, features = ["dns", "tcp-async-io", "wasm-ext", "websocket"] }
+libp2p = { version = "0.35.1", default-features = false, features = ["dns", "tcp-async-io", "wasm-ext", "websocket"] }
 log = "0.4.8"
 pin-project = "1.0.4"
 rand = "0.7.2"
diff --git a/primitives/consensus/common/Cargo.toml b/primitives/consensus/common/Cargo.toml
index 44202678990f..8c5ae968158a 100644
--- a/primitives/consensus/common/Cargo.toml
+++ b/primitives/consensus/common/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 thiserror = "1.0.21"
-libp2p = { version = "0.34.0", default-features = false }
+libp2p = { version = "0.35.1", default-features = false }
 log = "0.4.8"
 sp-core = { path= "../../core", version = "3.0.0"}
 sp-inherents = { version = "3.0.0", path = "../../inherents" }

From 824adac929872d6cf8bc13b8436ed1f376553fa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Mon, 22 Feb 2021 09:52:58 +0100
Subject: [PATCH 0414/1194] contracts: Consider contract size in weights
 (#8086)

* contracts: Consider contract size in weights

* Bump spec version

* Whitespace fix

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Correct pre-charged code weight even in the error case

* Use the instrumented code size in weight calculation

* Charge the cost of re-instrumentation from the gas meter

* Fix benchmark

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_contracts --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/contracts/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Better documentation of return types

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
---
 bin/node/runtime/src/lib.rs              |    6 +-
 frame/contracts/src/benchmarking/code.rs |   24 +-
 frame/contracts/src/benchmarking/mod.rs  |   92 +-
 frame/contracts/src/exec.rs              |  177 ++-
 frame/contracts/src/gas.rs               |   63 +-
 frame/contracts/src/lib.rs               |  134 +--
 frame/contracts/src/rent.rs              |   29 +-
 frame/contracts/src/schedule.rs          |   39 +-
 frame/contracts/src/tests.rs             |   75 +-
 frame/contracts/src/wasm/code_cache.rs   |   65 +-
 frame/contracts/src/wasm/mod.rs          |   42 +-
 frame/contracts/src/wasm/runtime.rs      |   98 +-
 frame/contracts/src/weights.rs           | 1262 +++++++++++-----------
 13 files changed, 1265 insertions(+), 841 deletions(-)

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index fb2b189e2d37..b52b24ed01bc 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -112,8 +112,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	// and set impl_version to 0. If only runtime
 	// implementation changes and behavior does not, then leave spec_version as
 	// is and increment impl_version.
-	spec_version: 264,
-	impl_version: 1,
+	spec_version: 265,
+	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 2,
 };
@@ -735,6 +735,7 @@ parameter_types! {
 			<Runtime as pallet_contracts::Config>::WeightInfo::on_initialize_per_queue_item(1) -
 			<Runtime as pallet_contracts::Config>::WeightInfo::on_initialize_per_queue_item(0)
 		)) / 5) as u32;
+	pub MaxCodeSize: u32 = 128 * 1024;
 }
 
 impl pallet_contracts::Config for Runtime {
@@ -757,6 +758,7 @@ impl pallet_contracts::Config for Runtime {
 	type ChainExtension = ();
 	type DeletionQueueDepth = DeletionQueueDepth;
 	type DeletionWeightLimit = DeletionWeightLimit;
+	type MaxCodeSize = MaxCodeSize;
 }
 
 impl pallet_sudo::Config for Runtime {
diff --git a/frame/contracts/src/benchmarking/code.rs b/frame/contracts/src/benchmarking/code.rs
index 01ca7d3aac22..64d2a0cf011d 100644
--- a/frame/contracts/src/benchmarking/code.rs
+++ b/frame/contracts/src/benchmarking/code.rs
@@ -27,12 +27,14 @@
 use crate::Config;
 use crate::Module as Contracts;
 
-use parity_wasm::elements::{Instruction, Instructions, FuncBody, ValueType, BlockType};
+use parity_wasm::elements::{
+	Instruction, Instructions, FuncBody, ValueType, BlockType, Section, CustomSection,
+};
 use pwasm_utils::stack_height::inject_limiter;
 use sp_core::crypto::UncheckedFrom;
 use sp_runtime::traits::Hash;
 use sp_sandbox::{EnvironmentDefinitionBuilder, Memory};
-use sp_std::{prelude::*, convert::TryFrom};
+use sp_std::{prelude::*, convert::TryFrom, borrow::ToOwned};
 
 /// Pass to `create_code` in order to create a compiled `WasmModule`.
 ///
@@ -66,6 +68,10 @@ pub struct ModuleDefinition {
 	pub inject_stack_metering: bool,
 	/// Create a table containing function pointers.
 	pub table: Option<TableSegment>,
+	/// Create a section named "dummy" of the specified size. This is useful in order to
+	/// benchmark the overhead of loading and storing codes of specified sizes. The dummy
+	/// section only contributes to the size of the contract but does not affect execution.
+	pub dummy_section: u32,
 }
 
 pub struct TableSegment {
@@ -204,6 +210,15 @@ where
 				.build();
 		}
 
+		// Add the dummy section
+		if def.dummy_section > 0 {
+			contract = contract.with_section(
+				Section::Custom(
+					CustomSection::new("dummy".to_owned(), vec![42; def.dummy_section as usize])
+				)
+			);
+		}
+
 		let mut code = contract.build();
 
 		// Inject stack height metering
@@ -235,10 +250,11 @@ where
 		ModuleDefinition::default().into()
 	}
 
-	/// Same as `dummy` but with maximum sized linear memory.
-	pub fn dummy_with_mem() -> Self {
+	/// Same as `dummy` but with maximum sized linear memory and a dummy section of specified size.
+	pub fn dummy_with_bytes(dummy_bytes: u32) -> Self {
 		ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
+			dummy_section: dummy_bytes,
 			.. Default::default()
 		}
 		.into()
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index f982316e98b9..b6ff4c04ff7e 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -304,6 +304,19 @@ benchmarks! {
 		Storage::<T>::process_deletion_queue_batch(Weight::max_value())
 	}
 
+	// This benchmarks the additional weight that is charged when a contract is executed the
+	// first time after a new schedule was deployed: For every new schedule a contract needs
+	// to re-run the instrumentation once.
+	instrument {
+		let c in 0 .. T::MaxCodeSize::get() / 1024;
+		let WasmModule { code, hash, .. } = WasmModule::<T>::sized(c * 1024);
+		Contracts::<T>::store_code_raw(code)?;
+		let mut module = PrefabWasmModule::from_storage_noinstr(hash)?;
+		let schedule = Contracts::<T>::current_schedule();
+	}: {
+		Contracts::<T>::reinstrument_module(&mut module, &schedule)?;
+	}
+
 	// This extrinsic is pretty much constant as it is only a simple setter.
 	update_schedule {
 		let schedule = Schedule {
@@ -318,8 +331,13 @@ benchmarks! {
 	// determine the contract address.
 	// `c`: Size of the code in kilobytes.
 	// `s`: Size of the salt in kilobytes.
+	//
+	// # Note
+	//
+	// We cannot let `c` grow to the maximum code size because the code is not allowed
+	// to be larger than the maximum size **after instrumentation**.
 	instantiate_with_code {
-		let c in 0 .. Contracts::<T>::current_schedule().limits.code_size / 1024;
+		let c in 0 .. Perbill::from_percent(50).mul_ceil(T::MaxCodeSize::get() / 1024);
 		let s in 0 .. code::max_pages::<T>() * 64;
 		let salt = vec![42u8; (s * 1024) as usize];
 		let endowment = caller_funding::<T>() / 3u32.into();
@@ -339,14 +357,16 @@ benchmarks! {
 	}
 
 	// Instantiate uses a dummy contract constructor to measure the overhead of the instantiate.
+	// `c`: Size of the code in kilobytes.
 	// `s`: Size of the salt in kilobytes.
 	instantiate {
+		let c in 0 .. T::MaxCodeSize::get() / 1024;
 		let s in 0 .. code::max_pages::<T>() * 64;
 		let salt = vec![42u8; (s * 1024) as usize];
 		let endowment = caller_funding::<T>() / 3u32.into();
 		let caller = whitelisted_caller();
 		T::Currency::make_free_balance_be(&caller, caller_funding::<T>());
-		let WasmModule { code, hash, .. } = WasmModule::<T>::dummy_with_mem();
+		let WasmModule { code, hash, .. } = WasmModule::<T>::dummy_with_bytes(c * 1024);
 		let origin = RawOrigin::Signed(caller.clone());
 		let addr = Contracts::<T>::contract_address(&caller, &hash, &salt);
 		Contracts::<T>::store_code_raw(code)?;
@@ -365,10 +385,12 @@ benchmarks! {
 	// won't call `seal_input` in its constructor to copy the data to contract memory.
 	// The dummy contract used here does not do this. The costs for the data copy is billed as
 	// part of `seal_input`.
+	// `c`: Size of the code in kilobytes.
 	call {
+		let c in 0 .. T::MaxCodeSize::get() / 1024;
 		let data = vec![42u8; 1024];
 		let instance = Contract::<T>::with_caller(
-			whitelisted_caller(), WasmModule::dummy_with_mem(), vec![], Endow::CollectRent
+			whitelisted_caller(), WasmModule::dummy_with_bytes(c * 1024), vec![], Endow::CollectRent
 		)?;
 		let value = T::Currency::minimum_balance() * 100u32.into();
 		let origin = RawOrigin::Signed(instance.caller.clone());
@@ -396,9 +418,11 @@ benchmarks! {
 	// will be distributed over multiple blocks using a scheduler. Otherwise there is
 	// no incentive to remove large contracts when the removal is more expensive than
 	// the reward for removing them.
+	// `c`: Size of the code of the contract that should be evicted.
 	claim_surcharge {
+		let c in 0 .. T::MaxCodeSize::get() / 1024;
 		let instance = Contract::<T>::with_caller(
-			whitelisted_caller(), WasmModule::dummy(), vec![], Endow::CollectRent
+			whitelisted_caller(), WasmModule::dummy_with_bytes(c * 1024), vec![], Endow::CollectRent
 		)?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 		let account_id = instance.account_id.clone();
@@ -694,6 +718,42 @@ benchmarks! {
 		}
 	}
 
+	seal_terminate_per_code_kb {
+		let c in 0 .. T::MaxCodeSize::get() / 1024;
+		let beneficiary = account::<T::AccountId>("beneficiary", 0, 0);
+		let beneficiary_bytes = beneficiary.encode();
+		let beneficiary_len = beneficiary_bytes.len();
+		let code = WasmModule::<T>::from(ModuleDefinition {
+			memory: Some(ImportedMemory::max::<T>()),
+			imported_functions: vec![ImportedFunction {
+				name: "seal_terminate",
+				params: vec![ValueType::I32, ValueType::I32],
+				return_type: None,
+			}],
+			data_segments: vec![
+				DataSegment {
+					offset: 0,
+					value: beneficiary_bytes,
+				},
+			],
+			call_body: Some(body::repeated(1, &[
+				Instruction::I32Const(0), // beneficiary_ptr
+				Instruction::I32Const(beneficiary_len as i32), // beneficiary_len
+				Instruction::Call(0),
+			])),
+			dummy_section: c * 1024,
+			.. Default::default()
+		});
+		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
+		let origin = RawOrigin::Signed(instance.caller.clone());
+		assert_eq!(T::Currency::total_balance(&beneficiary), 0u32.into());
+		assert_eq!(T::Currency::total_balance(&instance.account_id), Endow::max::<T>());
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
+	verify {
+		assert_eq!(T::Currency::total_balance(&instance.account_id), 0u32.into());
+		assert_eq!(T::Currency::total_balance(&beneficiary), Endow::max::<T>());
+	}
+
 	seal_restore_to {
 		let r in 0 .. 1;
 
@@ -772,9 +832,16 @@ benchmarks! {
 		}
 	}
 
-	seal_restore_to_per_delta {
+	// `c`: Code size of caller contract
+	// `t`: Code size of tombstone contract
+	// `d`: Number of supplied delta keys
+	seal_restore_to_per_code_kb_delta {
+		let c in 0 .. T::MaxCodeSize::get() / 1024;
+		let t in 0 .. T::MaxCodeSize::get() / 1024;
 		let d in 0 .. API_BENCHMARK_BATCHES;
-		let mut tombstone = ContractWithStorage::<T>::new(0, 0)?;
+		let mut tombstone = ContractWithStorage::<T>::with_code(
+			WasmModule::<T>::dummy_with_bytes(t * 1024), 0, 0
+		)?;
 		tombstone.evict()?;
 		let delta = create_storage::<T>(d * API_BENCHMARK_BATCH_SIZE, T::MaxValueSize::get())?;
 
@@ -837,6 +904,7 @@ benchmarks! {
 				Instruction::Call(0),
 				Instruction::End,
 			])),
+			dummy_section: c * 1024,
 			.. Default::default()
 		});
 
@@ -1225,7 +1293,7 @@ benchmarks! {
 	// We call unique accounts.
 	seal_call {
 		let r in 0 .. API_BENCHMARK_BATCHES;
-		let dummy_code = WasmModule::<T>::dummy_with_mem();
+		let dummy_code = WasmModule::<T>::dummy_with_bytes(0);
 		let callees = (0..r * API_BENCHMARK_BATCH_SIZE)
 			.map(|i| Contract::with_index(i + 1, dummy_code.clone(), vec![], Endow::Max))
 			.collect::<Result<Vec<_>, _>>()?;
@@ -1280,7 +1348,8 @@ benchmarks! {
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
-	seal_call_per_transfer_input_output_kb {
+	seal_call_per_code_transfer_input_output_kb {
+		let c in 0 .. T::MaxCodeSize::get() / 1024;
 		let t in 0 .. 1;
 		let i in 0 .. code::max_pages::<T>() * 64;
 		let o in 0 .. (code::max_pages::<T>() - 1) * 64;
@@ -1302,6 +1371,7 @@ benchmarks! {
 				Instruction::Call(0),
 				Instruction::End,
 			])),
+			dummy_section: c * 1024,
 			.. Default::default()
 		});
 		let callees = (0..API_BENCHMARK_BATCH_SIZE)
@@ -1475,7 +1545,8 @@ benchmarks! {
 		}
 	}
 
-	seal_instantiate_per_input_output_salt_kb {
+	seal_instantiate_per_code_input_output_salt_kb {
+		let c in 0 .. T::MaxCodeSize::get() / 1024;
 		let i in 0 .. (code::max_pages::<T>() - 1) * 64;
 		let o in 0 .. (code::max_pages::<T>() - 1) * 64;
 		let s in 0 .. (code::max_pages::<T>() - 1) * 64;
@@ -1497,6 +1568,7 @@ benchmarks! {
 				Instruction::Call(0),
 				Instruction::End,
 			])),
+			dummy_section: c * 1024,
 			.. Default::default()
 		});
 		let hash = callee_code.hash.clone();
@@ -2440,8 +2512,6 @@ benchmarks! {
 	}: {}
 }
 
-
-
 impl_benchmark_test_suite!(
 	Contracts,
 	crate::tests::ExtBuilder::default().build(),
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index bbb972b2ed2e..bf9efddc6166 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -72,8 +72,13 @@ pub trait Ext {
 
 	/// Instantiate a contract from the given code.
 	///
+	/// Returns the original code size of the called contract.
 	/// The newly created account will be associated with `code`. `value` specifies the amount of value
 	/// transferred from this to the newly created account (also known as endowment).
+	///
+	/// # Return Value
+	///
+	/// Result<(AccountId, ExecReturnValue, CodeSize), (ExecError, CodeSize)>
 	fn instantiate(
 		&mut self,
 		code: CodeHash<Self::T>,
@@ -81,7 +86,7 @@ pub trait Ext {
 		gas_meter: &mut GasMeter<Self::T>,
 		input_data: Vec<u8>,
 		salt: &[u8],
-	) -> Result<(AccountIdOf<Self::T>, ExecReturnValue), ExecError>;
+	) -> Result<(AccountIdOf<Self::T>, ExecReturnValue, u32), (ExecError, u32)>;
 
 	/// Transfer some amount of funds into the specified account.
 	fn transfer(
@@ -92,24 +97,35 @@ pub trait Ext {
 
 	/// Transfer all funds to `beneficiary` and delete the contract.
 	///
+	/// Returns the original code size of the terminated contract.
 	/// Since this function removes the self contract eagerly, if succeeded, no further actions should
 	/// be performed on this `Ext` instance.
 	///
 	/// This function will fail if the same contract is present on the contract
 	/// call stack.
+	///
+	/// # Return Value
+	///
+	/// Result<CodeSize, (DispatchError, CodeSize)>
 	fn terminate(
 		&mut self,
 		beneficiary: &AccountIdOf<Self::T>,
-	) -> DispatchResult;
+	) -> Result<u32, (DispatchError, u32)>;
 
 	/// Call (possibly transferring some amount of funds) into the specified account.
+	///
+	/// Returns the original code size of the called contract.
+	///
+	/// # Return Value
+	///
+	/// Result<(ExecReturnValue, CodeSize), (ExecError, CodeSize)>
 	fn call(
 		&mut self,
 		to: &AccountIdOf<Self::T>,
 		value: BalanceOf<Self::T>,
 		gas_meter: &mut GasMeter<Self::T>,
 		input_data: Vec<u8>,
-	) -> ExecResult;
+	) -> Result<(ExecReturnValue, u32), (ExecError, u32)>;
 
 	/// Restores the given destination contract sacrificing the current one.
 	///
@@ -118,13 +134,17 @@ pub trait Ext {
 	///
 	/// This function will fail if the same contract is present
 	/// on the contract call stack.
+	///
+	/// # Return Value
+	///
+	/// Result<(CallerCodeSize, DestCodeSize), (DispatchError, CallerCodeSize, DestCodesize)>
 	fn restore_to(
 		&mut self,
 		dest: AccountIdOf<Self::T>,
 		code_hash: CodeHash<Self::T>,
 		rent_allowance: BalanceOf<Self::T>,
 		delta: Vec<StorageKey>,
-	) -> DispatchResult;
+	) -> Result<(u32, u32), (DispatchError, u32, u32)>;
 
 	/// Returns a reference to the account id of the caller.
 	fn caller(&self) -> &AccountIdOf<Self::T>;
@@ -190,7 +210,11 @@ pub enum ExportedFunction {
 /// order to be able to mock the wasm logic for testing.
 pub trait Executable<T: Config>: Sized {
 	/// Load the executable from storage.
-	fn from_storage(code_hash: CodeHash<T>, schedule: &Schedule<T>) -> Result<Self, DispatchError>;
+	fn from_storage(
+		code_hash: CodeHash<T>,
+		schedule: &Schedule<T>,
+		gas_meter: &mut GasMeter<T>,
+	) -> Result<Self, DispatchError>;
 
 	/// Load the module from storage without re-instrumenting it.
 	///
@@ -203,10 +227,14 @@ pub trait Executable<T: Config>: Sized {
 	fn drop_from_storage(self);
 
 	/// Increment the refcount by one. Fails if the code does not exist on-chain.
-	fn add_user(code_hash: CodeHash<T>) -> DispatchResult;
+	///
+	/// Returns the size of the original code.
+	fn add_user(code_hash: CodeHash<T>) -> Result<u32, DispatchError>;
 
 	/// Decrement the refcount by one and remove the code when it drops to zero.
-	fn remove_user(code_hash: CodeHash<T>);
+	///
+	/// Returns the size of the original code.
+	fn remove_user(code_hash: CodeHash<T>) -> u32;
 
 	/// Execute the specified exported function and return the result.
 	///
@@ -238,6 +266,9 @@ pub trait Executable<T: Config>: Sized {
 	/// without refetching this from storage the result can be inaccurate as it might be
 	/// working with a stale value. Usually this inaccuracy is tolerable.
 	fn occupied_storage(&self) -> u32;
+
+	/// Size of the instrumented code in bytes.
+	fn code_len(&self) -> u32;
 }
 
 pub struct ExecutionContext<'a, T: Config + 'a, E> {
@@ -290,35 +321,42 @@ where
 	}
 
 	/// Make a call to the specified address, optionally transferring some funds.
+	///
+	/// # Return Value
+	///
+	/// Result<(ExecReturnValue, CodeSize), (ExecError, CodeSize)>
 	pub fn call(
 		&mut self,
 		dest: T::AccountId,
 		value: BalanceOf<T>,
 		gas_meter: &mut GasMeter<T>,
 		input_data: Vec<u8>,
-	) -> ExecResult {
+	) -> Result<(ExecReturnValue, u32), (ExecError, u32)> {
 		if self.depth == T::MaxDepth::get() as usize {
-			Err(Error::<T>::MaxCallDepthReached)?
+			return Err((Error::<T>::MaxCallDepthReached.into(), 0));
 		}
 
 		let contract = <ContractInfoOf<T>>::get(&dest)
 			.and_then(|contract| contract.get_alive())
-			.ok_or(Error::<T>::NotCallable)?;
+			.ok_or((Error::<T>::NotCallable.into(), 0))?;
 
-		let executable = E::from_storage(contract.code_hash, &self.schedule)?;
+		let executable = E::from_storage(contract.code_hash, &self.schedule, gas_meter)
+			.map_err(|e| (e.into(), 0))?;
+		let code_len = executable.code_len();
 
 		// This charges the rent and denies access to a contract that is in need of
 		// eviction by returning `None`. We cannot evict eagerly here because those
 		// changes would be rolled back in case this contract is called by another
 		// contract.
 		// See: https://github.com/paritytech/substrate/issues/6439#issuecomment-648754324
-		let contract = Rent::<T, E>::charge(&dest, contract, executable.occupied_storage())?
-			.ok_or(Error::<T>::NotCallable)?;
+		let contract = Rent::<T, E>::charge(&dest, contract, executable.occupied_storage())
+			.map_err(|e| (e.into(), code_len))?
+			.ok_or((Error::<T>::NotCallable.into(), code_len))?;
 
 		let transactor_kind = self.transactor_kind();
 		let caller = self.self_account.clone();
 
-		self.with_nested_context(dest.clone(), contract.trie_id.clone(), |nested| {
+		let result = self.with_nested_context(dest.clone(), contract.trie_id.clone(), |nested| {
 			if value > BalanceOf::<T>::zero() {
 				transfer::<T>(
 					TransferCause::Call,
@@ -336,7 +374,8 @@ where
 				gas_meter,
 			).map_err(|e| ExecError { error: e.error, origin: ErrorOrigin::Callee })?;
 			Ok(output)
-		})
+		}).map_err(|e| (e, code_len))?;
+		Ok((result, code_len))
 	}
 
 	pub fn instantiate(
@@ -581,10 +620,13 @@ where
 		gas_meter: &mut GasMeter<T>,
 		input_data: Vec<u8>,
 		salt: &[u8],
-	) -> Result<(AccountIdOf<T>, ExecReturnValue), ExecError> {
-		let executable = E::from_storage(code_hash, &self.ctx.schedule)?;
-		let result = self.ctx.instantiate(endowment, gas_meter, executable, input_data, salt)?;
-		Ok(result)
+	) -> Result<(AccountIdOf<T>, ExecReturnValue, u32), (ExecError, u32)> {
+		let executable = E::from_storage(code_hash, &self.ctx.schedule, gas_meter)
+			.map_err(|e| (e.into(), 0))?;
+		let code_len = executable.code_len();
+		self.ctx.instantiate(endowment, gas_meter, executable, input_data, salt)
+			.map(|r| (r.0, r.1, code_len))
+			.map_err(|e| (e, code_len))
 	}
 
 	fn transfer(
@@ -604,12 +646,12 @@ where
 	fn terminate(
 		&mut self,
 		beneficiary: &AccountIdOf<Self::T>,
-	) -> DispatchResult {
+	) -> Result<u32, (DispatchError, u32)> {
 		let self_id = self.ctx.self_account.clone();
 		let value = T::Currency::free_balance(&self_id);
 		if let Some(caller_ctx) = self.ctx.caller {
 			if caller_ctx.is_live(&self_id) {
-				return Err(Error::<T>::ReentranceDenied.into());
+				return Err((Error::<T>::ReentranceDenied.into(), 0));
 			}
 		}
 		transfer::<T>(
@@ -618,12 +660,12 @@ where
 			&self_id,
 			beneficiary,
 			value,
-		)?;
+		).map_err(|e| (e, 0))?;
 		if let Some(ContractInfo::Alive(info)) = ContractInfoOf::<T>::take(&self_id) {
-			Storage::<T>::queue_trie_for_deletion(&info)?;
-			E::remove_user(info.code_hash);
+			Storage::<T>::queue_trie_for_deletion(&info).map_err(|e| (e, 0))?;
+			let code_len = E::remove_user(info.code_hash);
 			Contracts::<T>::deposit_event(RawEvent::Terminated(self_id, beneficiary.clone()));
-			Ok(())
+			Ok(code_len)
 		} else {
 			panic!(
 				"this function is only invoked by in the context of a contract;\
@@ -639,7 +681,7 @@ where
 		value: BalanceOf<T>,
 		gas_meter: &mut GasMeter<T>,
 		input_data: Vec<u8>,
-	) -> ExecResult {
+	) -> Result<(ExecReturnValue, u32), (ExecError, u32)> {
 		self.ctx.call(to.clone(), value, gas_meter, input_data)
 	}
 
@@ -649,10 +691,10 @@ where
 		code_hash: CodeHash<Self::T>,
 		rent_allowance: BalanceOf<Self::T>,
 		delta: Vec<StorageKey>,
-	) -> DispatchResult {
+	) -> Result<(u32, u32), (DispatchError, u32, u32)> {
 		if let Some(caller_ctx) = self.ctx.caller {
 			if caller_ctx.is_live(&self.ctx.self_account) {
-				return Err(Error::<T>::ReentranceDenied.into());
+				return Err((Error::<T>::ReentranceDenied.into(), 0, 0));
 			}
 		}
 
@@ -828,7 +870,8 @@ mod tests {
 	impl Executable<Test> for MockExecutable {
 		fn from_storage(
 			code_hash: CodeHash<Test>,
-			_schedule: &Schedule<Test>
+			_schedule: &Schedule<Test>,
+			_gas_meter: &mut GasMeter<Test>,
 		) -> Result<Self, DispatchError> {
 			Self::from_storage_noinstr(code_hash)
 		}
@@ -845,11 +888,11 @@ mod tests {
 
 		fn drop_from_storage(self) {}
 
-		fn add_user(_code_hash: CodeHash<Test>) -> DispatchResult {
-			Ok(())
+		fn add_user(_code_hash: CodeHash<Test>) -> Result<u32, DispatchError> {
+			Ok(0)
 		}
 
-		fn remove_user(_code_hash: CodeHash<Test>) {}
+		fn remove_user(_code_hash: CodeHash<Test>) -> u32 { 0 }
 
 		fn execute<E: Ext<T = Test>>(
 			self,
@@ -872,6 +915,10 @@ mod tests {
 		fn occupied_storage(&self) -> u32 {
 			0
 		}
+
+		fn code_len(&self) -> u32 {
+			0
+		}
 	}
 
 	fn exec_success() -> ExecResult {
@@ -954,7 +1001,7 @@ mod tests {
 				vec![],
 			).unwrap();
 
-			assert!(!output.is_success());
+			assert!(!output.0.is_success());
 			assert_eq!(get_balance(&origin), 100);
 
 			// the rent is still charged
@@ -1012,8 +1059,8 @@ mod tests {
 			);
 
 			let output = result.unwrap();
-			assert!(output.is_success());
-			assert_eq!(output.data, vec![1, 2, 3, 4]);
+			assert!(output.0.is_success());
+			assert_eq!(output.0.data, vec![1, 2, 3, 4]);
 		});
 	}
 
@@ -1040,8 +1087,8 @@ mod tests {
 			);
 
 			let output = result.unwrap();
-			assert!(!output.is_success());
-			assert_eq!(output.data, vec![1, 2, 3, 4]);
+			assert!(!output.0.is_success());
+			assert_eq!(output.0.data, vec![1, 2, 3, 4]);
 		});
 	}
 
@@ -1080,13 +1127,17 @@ mod tests {
 			let schedule = Contracts::current_schedule();
 			let subsistence = Contracts::<Test>::subsistence_threshold();
 			let mut ctx = MockContext::top_level(ALICE, &schedule);
+			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
+			let executable = MockExecutable::from_storage(
+				input_data_ch, &schedule, &mut gas_meter
+			).unwrap();
 
 			set_balance(&ALICE, subsistence * 10);
 
 			let result = ctx.instantiate(
 				subsistence * 3,
-				&mut GasMeter::<Test>::new(GAS_LIMIT),
-				MockExecutable::from_storage(input_data_ch, &schedule).unwrap(),
+				&mut gas_meter,
+				executable,
 				vec![1, 2, 3, 4],
 				&[],
 			);
@@ -1113,7 +1164,7 @@ mod tests {
 					// Verify that we've got proper error and set `reached_bottom`.
 					assert_eq!(
 						r,
-						Err(Error::<Test>::MaxCallDepthReached.into())
+						Err((Error::<Test>::MaxCallDepthReached.into(), 0))
 					);
 					*reached_bottom = true;
 				} else {
@@ -1235,12 +1286,16 @@ mod tests {
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
 			let schedule = Contracts::current_schedule();
 			let mut ctx = MockContext::top_level(ALICE, &schedule);
+			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
+			let executable = MockExecutable::from_storage(
+				dummy_ch, &schedule, &mut gas_meter
+			).unwrap();
 
 			assert_matches!(
 				ctx.instantiate(
 					0, // <- zero endowment
-					&mut GasMeter::<Test>::new(GAS_LIMIT),
-					MockExecutable::from_storage(dummy_ch, &schedule).unwrap(),
+					&mut gas_meter,
+					executable,
 					vec![],
 					&[],
 				),
@@ -1258,13 +1313,17 @@ mod tests {
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
 			let schedule = Contracts::current_schedule();
 			let mut ctx = MockContext::top_level(ALICE, &schedule);
+			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
+			let executable = MockExecutable::from_storage(
+				dummy_ch, &schedule, &mut gas_meter
+			).unwrap();
 			set_balance(&ALICE, 1000);
 
 			let instantiated_contract_address = assert_matches!(
 				ctx.instantiate(
 					100,
-					&mut GasMeter::<Test>::new(GAS_LIMIT),
-					MockExecutable::from_storage(dummy_ch, &schedule).unwrap(),
+					&mut gas_meter,
+					executable,
 					vec![],
 					&[],
 				),
@@ -1289,13 +1348,17 @@ mod tests {
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
 			let schedule = Contracts::current_schedule();
 			let mut ctx = MockContext::top_level(ALICE, &schedule);
+			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
+			let executable = MockExecutable::from_storage(
+				dummy_ch, &schedule, &mut gas_meter
+			).unwrap();
 			set_balance(&ALICE, 1000);
 
 			let instantiated_contract_address = assert_matches!(
 				ctx.instantiate(
 					100,
-					&mut GasMeter::<Test>::new(GAS_LIMIT),
-					MockExecutable::from_storage(dummy_ch, &schedule).unwrap(),
+					&mut gas_meter,
+					executable,
 					vec![],
 					&[],
 				),
@@ -1317,7 +1380,7 @@ mod tests {
 			let instantiated_contract_address = Rc::clone(&instantiated_contract_address);
 			move |ctx| {
 				// Instantiate a contract and save it's address in `instantiated_contract_address`.
-				let (address, output) = ctx.ext.instantiate(
+				let (address, output, _) = ctx.ext.instantiate(
 					dummy_ch,
 					Contracts::<Test>::subsistence_threshold() * 3,
 					ctx.gas_meter,
@@ -1369,10 +1432,10 @@ mod tests {
 						vec![],
 						&[],
 					),
-					Err(ExecError {
+					Err((ExecError {
 						error: DispatchError::Other("It's a trap!"),
 						origin: ErrorOrigin::Callee,
-					})
+					}, 0))
 				);
 
 				exec_success()
@@ -1410,13 +1473,17 @@ mod tests {
 			.execute_with(|| {
 				let schedule = Contracts::current_schedule();
 				let mut ctx = MockContext::top_level(ALICE, &schedule);
+				let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
+				let executable = MockExecutable::from_storage(
+					terminate_ch, &schedule, &mut gas_meter
+				).unwrap();
 				set_balance(&ALICE, 1000);
 
 				assert_eq!(
 					ctx.instantiate(
 						100,
-						&mut GasMeter::<Test>::new(GAS_LIMIT),
-						MockExecutable::from_storage(terminate_ch, &schedule).unwrap(),
+						&mut gas_meter,
+						executable,
 						vec![],
 						&[],
 					),
@@ -1445,12 +1512,16 @@ mod tests {
 			let subsistence = Contracts::<Test>::subsistence_threshold();
 			let schedule = Contracts::current_schedule();
 			let mut ctx = MockContext::top_level(ALICE, &schedule);
+			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
+			let executable = MockExecutable::from_storage(
+				rent_allowance_ch, &schedule, &mut gas_meter
+			).unwrap();
 			set_balance(&ALICE, subsistence * 10);
 
 			let result = ctx.instantiate(
 				subsistence * 5,
-				&mut GasMeter::<Test>::new(GAS_LIMIT),
-				MockExecutable::from_storage(rent_allowance_ch, &schedule).unwrap(),
+				&mut gas_meter,
+				executable,
 				vec![],
 				&[],
 			);
diff --git a/frame/contracts/src/gas.rs b/frame/contracts/src/gas.rs
index 4bdfcdd57711..2737f351a50d 100644
--- a/frame/contracts/src/gas.rs
+++ b/frame/contracts/src/gas.rs
@@ -15,14 +15,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::Config;
+use crate::{Config, Error};
 use sp_std::marker::PhantomData;
 use sp_runtime::traits::Zero;
 use frame_support::{
-	dispatch::{DispatchResultWithPostInfo, PostDispatchInfo, DispatchErrorWithPostInfo},
+	dispatch::{
+		DispatchResultWithPostInfo, PostDispatchInfo, DispatchErrorWithPostInfo, DispatchError,
+	},
 	weights::Weight,
 };
 use pallet_contracts_primitives::ExecError;
+use sp_core::crypto::UncheckedFrom;
 
 #[cfg(test)]
 use std::{any::Any, fmt::Debug};
@@ -30,22 +33,6 @@ use std::{any::Any, fmt::Debug};
 // Gas is essentially the same as weight. It is a 1 to 1 correspondence.
 pub type Gas = Weight;
 
-#[must_use]
-#[derive(Debug, PartialEq, Eq)]
-pub enum GasMeterResult {
-	Proceed(ChargedAmount),
-	OutOfGas,
-}
-
-impl GasMeterResult {
-	pub fn is_out_of_gas(&self) -> bool {
-		match *self {
-			GasMeterResult::OutOfGas => true,
-			GasMeterResult::Proceed(_) => false,
-		}
-	}
-}
-
 #[derive(Debug, PartialEq, Eq)]
 pub struct ChargedAmount(Gas);
 
@@ -103,7 +90,11 @@ pub struct GasMeter<T: Config> {
 	#[cfg(test)]
 	tokens: Vec<ErasedToken>,
 }
-impl<T: Config> GasMeter<T> {
+
+impl<T: Config> GasMeter<T>
+where
+	T::AccountId: UncheckedFrom<<T as frame_system::Config>::Hash> + AsRef<[u8]>
+{
 	pub fn new(gas_limit: Gas) -> Self {
 		GasMeter {
 			gas_limit,
@@ -128,7 +119,7 @@ impl<T: Config> GasMeter<T> {
 		&mut self,
 		metadata: &Tok::Metadata,
 		token: Tok,
-	) -> GasMeterResult {
+	) -> Result<ChargedAmount, DispatchError> {
 		#[cfg(test)]
 		{
 			// Unconditionally add the token to the storage.
@@ -149,11 +140,25 @@ impl<T: Config> GasMeter<T> {
 		self.gas_left = new_value.unwrap_or_else(Zero::zero);
 
 		match new_value {
-			Some(_) => GasMeterResult::Proceed(ChargedAmount(amount)),
-			None => GasMeterResult::OutOfGas,
+			Some(_) => Ok(ChargedAmount(amount)),
+			None => Err(Error::<T>::OutOfGas.into()),
 		}
 	}
 
+	/// Adjust a previously charged amount down to its actual amount.
+	///
+	/// This is when a maximum a priori amount was charged and then should be partially
+	/// refunded to match the actual amount.
+	pub fn adjust_gas<Tok: Token<T>>(
+		&mut self,
+		charged_amount: ChargedAmount,
+		metadata: &Tok::Metadata,
+		token: Tok,
+	) {
+		let adjustment = charged_amount.0.saturating_sub(token.calculate_amount(metadata));
+		self.gas_left = self.gas_left.saturating_add(adjustment).min(self.gas_limit);
+	}
+
 	/// Refund previously charged gas back to the gas meter.
 	///
 	/// This can be used if a gas worst case estimation must be charged before
@@ -304,7 +309,7 @@ mod tests {
 
 		let result = gas_meter
 			.charge(&MultiplierTokenMetadata { multiplier: 3 }, MultiplierToken(10));
-		assert!(!result.is_out_of_gas());
+		assert!(!result.is_err());
 
 		assert_eq!(gas_meter.gas_left(), 49_970);
 	}
@@ -312,10 +317,10 @@ mod tests {
 	#[test]
 	fn tracing() {
 		let mut gas_meter = GasMeter::<Test>::new(50000);
-		assert!(!gas_meter.charge(&(), SimpleToken(1)).is_out_of_gas());
+		assert!(!gas_meter.charge(&(), SimpleToken(1)).is_err());
 		assert!(!gas_meter
 			.charge(&MultiplierTokenMetadata { multiplier: 3 }, MultiplierToken(10))
-			.is_out_of_gas());
+			.is_err());
 
 		let mut tokens = gas_meter.tokens()[0..2].iter();
 		match_tokens!(tokens, SimpleToken(1), MultiplierToken(10),);
@@ -325,7 +330,7 @@ mod tests {
 	#[test]
 	fn refuse_to_execute_anything_if_zero() {
 		let mut gas_meter = GasMeter::<Test>::new(0);
-		assert!(gas_meter.charge(&(), SimpleToken(1)).is_out_of_gas());
+		assert!(gas_meter.charge(&(), SimpleToken(1)).is_err());
 	}
 
 	// Make sure that if the gas meter is charged by exceeding amount then not only an error
@@ -338,10 +343,10 @@ mod tests {
 		let mut gas_meter = GasMeter::<Test>::new(200);
 
 		// The first charge is should lead to OOG.
-		assert!(gas_meter.charge(&(), SimpleToken(300)).is_out_of_gas());
+		assert!(gas_meter.charge(&(), SimpleToken(300)).is_err());
 
 		// The gas meter is emptied at this moment, so this should also fail.
-		assert!(gas_meter.charge(&(), SimpleToken(1)).is_out_of_gas());
+		assert!(gas_meter.charge(&(), SimpleToken(1)).is_err());
 	}
 
 
@@ -350,6 +355,6 @@ mod tests {
 	#[test]
 	fn charge_exact_amount() {
 		let mut gas_meter = GasMeter::<Test>::new(25);
-		assert!(!gas_meter.charge(&(), SimpleToken(25)).is_out_of_gas());
+		assert!(!gas_meter.charge(&(), SimpleToken(25)).is_err());
 	}
 }
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index b20db8dd8cd8..4e56230e93f3 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -80,7 +80,7 @@
 //! * [Balances](../pallet_balances/index.html)
 
 #![cfg_attr(not(feature = "std"), no_std)]
-#![cfg_attr(feature = "runtime-benchmarks", recursion_limit="256")]
+#![cfg_attr(feature = "runtime-benchmarks", recursion_limit="512")]
 
 #[macro_use]
 mod gas;
@@ -126,9 +126,9 @@ use frame_support::{
 };
 use frame_system::{ensure_signed, ensure_root, Module as System};
 use pallet_contracts_primitives::{
-	RentProjectionResult, GetStorageResult, ContractAccessError, ContractExecResult, ExecResult,
+	RentProjectionResult, GetStorageResult, ContractAccessError, ContractExecResult,
 };
-use frame_support::weights::Weight;
+use frame_support::weights::{Weight, PostDispatchInfo, WithPostDispatchInfo};
 
 pub type CodeHash<T> = <T as frame_system::Config>::Hash;
 pub type TrieId = Vec<u8>;
@@ -344,6 +344,11 @@ pub trait Config: frame_system::Config {
 
 	/// The maximum amount of weight that can be consumed per block for lazy trie removal.
 	type DeletionWeightLimit: Get<Weight>;
+
+	/// The maximum length of a contract code in bytes. This limit applies to the instrumented
+	/// version of the code. Therefore `instantiate_with_code` can fail even when supplying
+	/// a wasm binary below this maximum size.
+	type MaxCodeSize: Get<u32>;
 }
 
 decl_error! {
@@ -538,7 +543,7 @@ decl_module! {
 		/// * If the account is a regular account, any value will be transferred.
 		/// * If no account exists and the call value is not less than `existential_deposit`,
 		/// a regular account will be created and any value will be transferred.
-		#[weight = T::WeightInfo::call().saturating_add(*gas_limit)]
+		#[weight = T::WeightInfo::call(T::MaxCodeSize::get() / 1024).saturating_add(*gas_limit)]
 		pub fn call(
 			origin,
 			dest: <T::Lookup as StaticLookup>::Source,
@@ -549,10 +554,13 @@ decl_module! {
 			let origin = ensure_signed(origin)?;
 			let dest = T::Lookup::lookup(dest)?;
 			let mut gas_meter = GasMeter::new(gas_limit);
-			let result = Self::execute_wasm(origin, &mut gas_meter, |ctx, gas_meter| {
-				ctx.call(dest, value, gas_meter, data)
-			});
-			gas_meter.into_dispatch_result(result, T::WeightInfo::call())
+			let schedule = <Module<T>>::current_schedule();
+			let mut ctx = ExecutionContext::<T, PrefabWasmModule<T>>::top_level(origin, &schedule);
+			let (result, code_len) = match ctx.call(dest, value, &mut gas_meter, data) {
+				Ok((output, len)) => (Ok(output), len),
+				Err((err, len)) => (Err(err), len),
+			};
+			gas_meter.into_dispatch_result(result, T::WeightInfo::call(code_len / 1024))
 		}
 
 		/// Instantiates a new contract from the supplied `code` optionally transferring
@@ -592,16 +600,16 @@ decl_module! {
 			salt: Vec<u8>,
 		) -> DispatchResultWithPostInfo {
 			let origin = ensure_signed(origin)?;
-			let schedule = <Module<T>>::current_schedule();
 			let code_len = code.len() as u32;
-			ensure!(code_len <= schedule.limits.code_size, Error::<T>::CodeTooLarge);
+			ensure!(code_len <= T::MaxCodeSize::get(), Error::<T>::CodeTooLarge);
 			let mut gas_meter = GasMeter::new(gas_limit);
-			let result = Self::execute_wasm(origin, &mut gas_meter, |ctx, gas_meter| {
-				let executable = PrefabWasmModule::from_code(code, &schedule)?;
-				let result = ctx.instantiate(endowment, gas_meter, executable, data, &salt)
-					.map(|(_address, output)| output)?;
-				Ok(result)
-			});
+			let schedule = <Module<T>>::current_schedule();
+			let executable = PrefabWasmModule::from_code(code, &schedule)?;
+			let code_len = executable.code_len();
+			ensure!(code_len <= T::MaxCodeSize::get(), Error::<T>::CodeTooLarge);
+			let mut ctx = ExecutionContext::<T, PrefabWasmModule<T>>::top_level(origin, &schedule);
+			let result = ctx.instantiate(endowment, &mut gas_meter, executable, data, &salt)
+				.map(|(_address, output)| output);
 			gas_meter.into_dispatch_result(
 				result,
 				T::WeightInfo::instantiate_with_code(code_len / 1024, salt.len() as u32 / 1024)
@@ -614,8 +622,8 @@ decl_module! {
 		/// code deployment step. Instead, the `code_hash` of an on-chain deployed wasm binary
 		/// must be supplied.
 		#[weight =
-			T::WeightInfo::instantiate(salt.len() as u32 / 1024)
-			.saturating_add(*gas_limit)
+			T::WeightInfo::instantiate(T::MaxCodeSize::get() / 1024, salt.len() as u32 / 1024)
+				.saturating_add(*gas_limit)
 		]
 		pub fn instantiate(
 			origin,
@@ -627,15 +635,15 @@ decl_module! {
 		) -> DispatchResultWithPostInfo {
 			let origin = ensure_signed(origin)?;
 			let mut gas_meter = GasMeter::new(gas_limit);
-			let result = Self::execute_wasm(origin, &mut gas_meter, |ctx, gas_meter| {
-				let executable = PrefabWasmModule::from_storage(code_hash, &ctx.schedule)?;
-				let result = ctx.instantiate(endowment, gas_meter, executable, data, &salt)
-					.map(|(_address, output)| output)?;
-				Ok(result)
-			});
+			let schedule = <Module<T>>::current_schedule();
+			let executable = PrefabWasmModule::from_storage(code_hash, &schedule, &mut gas_meter)?;
+			let mut ctx = ExecutionContext::<T, PrefabWasmModule<T>>::top_level(origin, &schedule);
+			let code_len = executable.code_len();
+			let result = ctx.instantiate(endowment, &mut gas_meter, executable, data, &salt)
+				.map(|(_address, output)| output);
 			gas_meter.into_dispatch_result(
 				result,
-				T::WeightInfo::instantiate(salt.len() as u32 / 1024)
+				T::WeightInfo::instantiate(code_len / 1024, salt.len() as u32 / 1024),
 			)
 		}
 
@@ -648,7 +656,7 @@ decl_module! {
 		///
 		/// If contract is not evicted as a result of this call, [`Error::ContractNotEvictable`]
 		/// is returned and the sender is not eligible for the reward.
-		#[weight = T::WeightInfo::claim_surcharge()]
+		#[weight = T::WeightInfo::claim_surcharge(T::MaxCodeSize::get() / 1024)]
 		pub fn claim_surcharge(
 			origin,
 			dest: T::AccountId,
@@ -675,23 +683,26 @@ decl_module! {
 			};
 
 			// If poking the contract has lead to eviction of the contract, give out the rewards.
-			if let Some(rent_payed) =
-				Rent::<T, PrefabWasmModule<T>>::try_eviction(&dest, handicap)?
-			{
-				T::Currency::deposit_into_existing(
-					&rewarded,
-					T::SurchargeReward::get().min(rent_payed),
-				)
-				.map(|_| Pays::No.into())
-				.map_err(Into::into)
-			} else {
-				Err(Error::<T>::ContractNotEvictable.into())
+			match Rent::<T, PrefabWasmModule<T>>::try_eviction(&dest, handicap)? {
+				(Some(rent_payed), code_len) => {
+					T::Currency::deposit_into_existing(
+						&rewarded,
+						T::SurchargeReward::get().min(rent_payed),
+					)
+					.map(|_| PostDispatchInfo {
+						actual_weight: Some(T::WeightInfo::claim_surcharge(code_len / 1024)),
+						pays_fee: Pays::No,
+					})
+					.map_err(Into::into)
+				}
+				(None, code_len) => Err(Error::<T>::ContractNotEvictable.with_weight(
+					T::WeightInfo::claim_surcharge(code_len / 1024)
+				)),
 			}
 		}
 	}
 }
 
-/// Public APIs provided by the contracts module.
 impl<T: Config> Module<T>
 where
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
@@ -710,12 +721,12 @@ where
 		input_data: Vec<u8>,
 	) -> ContractExecResult {
 		let mut gas_meter = GasMeter::new(gas_limit);
-		let exec_result = Self::execute_wasm(origin, &mut gas_meter, |ctx, gas_meter| {
-			ctx.call(dest, value, gas_meter, input_data)
-		});
+		let schedule = <Module<T>>::current_schedule();
+		let mut ctx = ExecutionContext::<T, PrefabWasmModule<T>>::top_level(origin, &schedule);
+		let result = ctx.call(dest, value, &mut gas_meter, input_data);
 		let gas_consumed = gas_meter.gas_spent();
 		ContractExecResult {
-			exec_result,
+			exec_result: result.map(|r| r.0).map_err(|r| r.0),
 			gas_consumed,
 		}
 	}
@@ -731,18 +742,12 @@ where
 		Ok(maybe_value)
 	}
 
+	/// Query how many blocks the contract stays alive given that the amount endowment
+	/// and consumed storage does not change.
 	pub fn rent_projection(address: T::AccountId) -> RentProjectionResult<T::BlockNumber> {
 		Rent::<T, PrefabWasmModule<T>>::compute_projection(&address)
 	}
 
-	/// Store code for benchmarks which does not check nor instrument the code.
-	#[cfg(feature = "runtime-benchmarks")]
-	pub fn store_code_raw(code: Vec<u8>) -> DispatchResult {
-		let schedule = <Module<T>>::current_schedule();
-		PrefabWasmModule::store_code_unchecked(code, &schedule)?;
-		Ok(())
-	}
-
 	/// Determine the address of a contract,
 	///
 	/// This is the address generation function used by contract instantiation. Its result
@@ -775,23 +780,22 @@ where
 	pub fn subsistence_threshold() -> BalanceOf<T> {
 		T::Currency::minimum_balance().saturating_add(T::TombstoneDeposit::get())
 	}
-}
 
-impl<T: Config> Module<T>
-where
-	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
-{
-	fn execute_wasm(
-		origin: T::AccountId,
-		gas_meter: &mut GasMeter<T>,
-		func: impl FnOnce(
-			&mut ExecutionContext<T, PrefabWasmModule<T>>,
-			&mut GasMeter<T>,
-		) -> ExecResult,
-	) -> ExecResult {
+	/// Store code for benchmarks which does not check nor instrument the code.
+	#[cfg(feature = "runtime-benchmarks")]
+	fn store_code_raw(code: Vec<u8>) -> DispatchResult {
 		let schedule = <Module<T>>::current_schedule();
-		let mut ctx = ExecutionContext::top_level(origin, &schedule);
-		func(&mut ctx, gas_meter)
+		PrefabWasmModule::store_code_unchecked(code, &schedule)?;
+		Ok(())
+	}
+
+	/// This exists so that benchmarks can determine the weight of running an instrumentation.
+	#[cfg(feature = "runtime-benchmarks")]
+	fn reinstrument_module(
+		module: &mut PrefabWasmModule<T>,
+		schedule: &Schedule<T>
+	) -> DispatchResult {
+		self::wasm::reinstrument(module, schedule)
 	}
 }
 
diff --git a/frame/contracts/src/rent.rs b/frame/contracts/src/rent.rs
index 38b1e8bd1175..087c6c518300 100644
--- a/frame/contracts/src/rent.rs
+++ b/frame/contracts/src/rent.rs
@@ -325,13 +325,14 @@ where
 	pub fn try_eviction(
 		account: &T::AccountId,
 		handicap: T::BlockNumber,
-	) -> Result<Option<BalanceOf<T>>, DispatchError> {
+	) -> Result<(Option<BalanceOf<T>>, u32), DispatchError> {
 		let contract = <ContractInfoOf<T>>::get(account);
 		let contract = match contract {
-			None | Some(ContractInfo::Tombstone(_)) => return Ok(None),
+			None | Some(ContractInfo::Tombstone(_)) => return Ok((None, 0)),
 			Some(ContractInfo::Alive(contract)) => contract,
 		};
 		let module = PrefabWasmModule::<T>::from_storage_noinstr(contract.code_hash)?;
+		let code_len = module.code_len();
 		let current_block_number = <frame_system::Module<T>>::block_number();
 		let verdict = Self::consider_case(
 			account,
@@ -353,9 +354,9 @@ where
 				Self::enact_verdict(
 					account, contract, current_block_number, verdict, Some(module),
 				)?;
-				Ok(Some(rent_payed))
+				Ok((Some(rent_payed), code_len))
 			}
-			_ => Ok(None),
+			_ => Ok((None, code_len)),
 		}
 	}
 
@@ -447,28 +448,32 @@ where
 	/// Upon succesful restoration, `origin` will be destroyed, all its funds are transferred to
 	/// the restored account. The restored account will inherit the last write block and its last
 	/// deduct block will be set to the current block.
+	///
+	/// # Return Value
+	///
+	/// Result<(CallerCodeSize, DestCodeSize), (DispatchError, CallerCodeSize, DestCodesize)>
 	pub fn restore_to(
 		origin: T::AccountId,
 		dest: T::AccountId,
 		code_hash: CodeHash<T>,
 		rent_allowance: BalanceOf<T>,
 		delta: Vec<crate::exec::StorageKey>,
-	) -> Result<(), DispatchError> {
+	) -> Result<(u32, u32), (DispatchError, u32, u32)> {
 		let mut origin_contract = <ContractInfoOf<T>>::get(&origin)
 			.and_then(|c| c.get_alive())
-			.ok_or(Error::<T>::InvalidSourceContract)?;
+			.ok_or((Error::<T>::InvalidSourceContract.into(), 0, 0))?;
 
 		let child_trie_info = origin_contract.child_trie_info();
 
 		let current_block = <frame_system::Module<T>>::block_number();
 
 		if origin_contract.last_write == Some(current_block) {
-			return Err(Error::<T>::InvalidContractOrigin.into());
+			return Err((Error::<T>::InvalidContractOrigin.into(), 0, 0));
 		}
 
 		let dest_tombstone = <ContractInfoOf<T>>::get(&dest)
 			.and_then(|c| c.get_tombstone())
-			.ok_or(Error::<T>::InvalidDestinationContract)?;
+			.ok_or((Error::<T>::InvalidDestinationContract.into(), 0, 0))?;
 
 		let last_write = if !delta.is_empty() {
 			Some(current_block)
@@ -477,7 +482,7 @@ where
 		};
 
 		// Fails if the code hash does not exist on chain
-		E::add_user(code_hash)?;
+		let caller_code_len = E::add_user(code_hash).map_err(|e| (e, 0, 0))?;
 
 		// We are allowed to eagerly modify storage even though the function can
 		// fail later due to tombstones not matching. This is because the restoration
@@ -501,13 +506,13 @@ where
 		);
 
 		if tombstone != dest_tombstone {
-			return Err(Error::<T>::InvalidTombstone.into());
+			return Err((Error::<T>::InvalidTombstone.into(), caller_code_len, 0));
 		}
 
 		origin_contract.storage_size -= bytes_taken;
 
 		<ContractInfoOf<T>>::remove(&origin);
-		E::remove_user(origin_contract.code_hash);
+		let tombstone_code_len = E::remove_user(origin_contract.code_hash);
 		<ContractInfoOf<T>>::insert(&dest, ContractInfo::Alive(AliveContractInfo::<T> {
 			trie_id: origin_contract.trie_id,
 			storage_size: origin_contract.storage_size,
@@ -523,6 +528,6 @@ where
 		T::Currency::make_free_balance_be(&origin, <BalanceOf<T>>::zero());
 		T::Currency::deposit_creating(&dest, origin_free_balance);
 
-		Ok(())
+		Ok((caller_code_len, tombstone_code_len))
 	}
 }
diff --git a/frame/contracts/src/schedule.rs b/frame/contracts/src/schedule.rs
index 3580fa2aae20..c86134bc415d 100644
--- a/frame/contracts/src/schedule.rs
+++ b/frame/contracts/src/schedule.rs
@@ -104,10 +104,6 @@ pub struct Limits {
 
 	/// The maximum length of a subject in bytes used for PRNG generation.
 	pub subject_len: u32,
-
-	/// The maximum length of a contract code in bytes. This limit applies to the uninstrumented
-	/// and pristine form of the code as supplied to `instantiate_with_code`.
-	pub code_size: u32,
 }
 
 impl Limits {
@@ -250,9 +246,18 @@ pub struct HostFnWeights<T: Config> {
 	/// Weight of calling `seal_terminate`.
 	pub terminate: Weight,
 
+	/// Weight per byte of the terminated contract.
+	pub terminate_per_code_byte: Weight,
+
 	/// Weight of calling `seal_restore_to`.
 	pub restore_to: Weight,
 
+	/// Weight per byte of the restoring contract.
+	pub restore_to_per_caller_code_byte: Weight,
+
+	/// Weight per byte of the restored contract.
+	pub restore_to_per_tombstone_code_byte: Weight,
+
 	/// Weight per delta key supplied to `seal_restore_to`.
 	pub restore_to_per_delta: Weight,
 
@@ -292,6 +297,9 @@ pub struct HostFnWeights<T: Config> {
 	/// Weight of calling `seal_call`.
 	pub call: Weight,
 
+	/// Weight per byte of the called contract.
+	pub call_per_code_byte: Weight,
+
 	/// Weight surcharge that is claimed if `seal_call` does a balance transfer.
 	pub call_transfer_surcharge: Weight,
 
@@ -304,6 +312,9 @@ pub struct HostFnWeights<T: Config> {
 	/// Weight of calling `seal_instantiate`.
 	pub instantiate: Weight,
 
+	/// Weight per byte of the instantiated contract.
+	pub instantiate_per_code_byte: Weight,
+
 	/// Weight per input byte supplied to `seal_instantiate`.
 	pub instantiate_per_input_byte: Weight,
 
@@ -443,7 +454,6 @@ impl Default for Limits {
 			table_size: 4096,
 			br_table_size: 256,
 			subject_len: 32,
-			code_size: 512 * 1024,
 		}
 	}
 }
@@ -528,8 +538,11 @@ impl<T: Config> Default for HostFnWeights<T> {
 			r#return: cost!(seal_return),
 			return_per_byte: cost_byte!(seal_return_per_kb),
 			terminate: cost!(seal_terminate),
+			terminate_per_code_byte: cost_byte!(seal_terminate_per_code_kb),
 			restore_to: cost!(seal_restore_to),
-			restore_to_per_delta: cost_batched!(seal_restore_to_per_delta),
+			restore_to_per_caller_code_byte: cost_byte_args!(seal_restore_to_per_code_kb_delta, 1, 0, 0),
+			restore_to_per_tombstone_code_byte: cost_byte_args!(seal_restore_to_per_code_kb_delta, 0, 1, 0),
+			restore_to_per_delta: cost_batched_args!(seal_restore_to_per_code_kb_delta, 0, 0, 1),
 			random: cost_batched!(seal_random),
 			deposit_event: cost_batched!(seal_deposit_event),
 			deposit_event_per_topic: cost_batched_args!(seal_deposit_event_per_topic_and_kb, 1, 0),
@@ -542,13 +555,15 @@ impl<T: Config> Default for HostFnWeights<T> {
 			get_storage_per_byte: cost_byte_batched!(seal_get_storage_per_kb),
 			transfer: cost_batched!(seal_transfer),
 			call: cost_batched!(seal_call),
-			call_transfer_surcharge: cost_batched_args!(seal_call_per_transfer_input_output_kb, 1, 0, 0),
-			call_per_input_byte: cost_byte_batched_args!(seal_call_per_transfer_input_output_kb, 0, 1, 0),
-			call_per_output_byte: cost_byte_batched_args!(seal_call_per_transfer_input_output_kb, 0, 0, 1),
+			call_per_code_byte: cost_byte_batched_args!(seal_call_per_code_transfer_input_output_kb, 1, 0, 0, 0),
+			call_transfer_surcharge: cost_batched_args!(seal_call_per_code_transfer_input_output_kb, 0, 1, 0, 0),
+			call_per_input_byte: cost_byte_batched_args!(seal_call_per_code_transfer_input_output_kb, 0, 0, 1, 0),
+			call_per_output_byte: cost_byte_batched_args!(seal_call_per_code_transfer_input_output_kb, 0, 0, 0, 1),
 			instantiate: cost_batched!(seal_instantiate),
-			instantiate_per_input_byte: cost_byte_batched_args!(seal_instantiate_per_input_output_salt_kb, 1, 0, 0),
-			instantiate_per_output_byte: cost_byte_batched_args!(seal_instantiate_per_input_output_salt_kb, 0, 1, 0),
-			instantiate_per_salt_byte: cost_byte_batched_args!(seal_instantiate_per_input_output_salt_kb, 0, 0, 1),
+			instantiate_per_code_byte: cost_byte_batched_args!(seal_instantiate_per_code_input_output_salt_kb, 1, 0, 0, 0),
+			instantiate_per_input_byte: cost_byte_batched_args!(seal_instantiate_per_code_input_output_salt_kb, 0, 1, 0, 0),
+			instantiate_per_output_byte: cost_byte_batched_args!(seal_instantiate_per_code_input_output_salt_kb, 0, 0, 1, 0),
+			instantiate_per_salt_byte: cost_byte_batched_args!(seal_instantiate_per_code_input_output_salt_kb, 0, 0, 0, 1),
 			hash_sha2_256: cost_batched!(seal_hash_sha2_256),
 			hash_sha2_256_per_byte: cost_byte_batched!(seal_hash_sha2_256_per_kb),
 			hash_keccak_256: cost_batched!(seal_hash_keccak_256),
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index 62768641ac16..f10cd2882ace 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -24,6 +24,7 @@ use crate::{
 		UncheckedFrom, InitState, ReturnFlags,
 	},
 	exec::{AccountIdOf, Executable}, wasm::PrefabWasmModule,
+	weights::WeightInfo,
 };
 use assert_matches::assert_matches;
 use codec::Encode;
@@ -35,7 +36,7 @@ use sp_runtime::{
 use sp_io::hashing::blake2_256;
 use frame_support::{
 	assert_ok, assert_err, assert_err_ignore_postinfo,
-	parameter_types, StorageMap, assert_storage_noop,
+	parameter_types, StorageMap, StorageValue, assert_storage_noop,
 	traits::{Currency, ReservableCurrency, OnInitialize},
 	weights::{Weight, PostDispatchInfo, DispatchClass, constants::WEIGHT_PER_SECOND},
 	dispatch::DispatchErrorWithPostInfo,
@@ -250,6 +251,7 @@ parameter_types! {
 	pub const MaxValueSize: u32 = 16_384;
 	pub const DeletionQueueDepth: u32 = 1024;
 	pub const DeletionWeightLimit: Weight = 500_000_000_000;
+	pub const MaxCodeSize: u32 = 2 * 1024;
 }
 
 parameter_types! {
@@ -282,6 +284,7 @@ impl Config for Test {
 	type ChainExtension = TestExtension;
 	type DeletionQueueDepth = DeletionQueueDepth;
 	type DeletionWeightLimit = DeletionWeightLimit;
+	type MaxCodeSize = MaxCodeSize;
 }
 
 pub const ALICE: AccountId32 = AccountId32::new([1u8; 32]);
@@ -350,7 +353,7 @@ where
 fn calling_plain_account_fails() {
 	ExtBuilder::default().build().execute_with(|| {
 		let _ = Balances::deposit_creating(&ALICE, 100_000_000);
-		let base_cost = <<Test as crate::Config>::WeightInfo as crate::WeightInfo>::call();
+		let base_cost = <<Test as Config>::WeightInfo as WeightInfo>::call(0);
 
 		assert_eq!(
 			Contracts::call(Origin::signed(ALICE), BOB, 0, GAS_LIMIT, Vec::new()),
@@ -2432,7 +2435,7 @@ fn lazy_removal_does_no_run_on_full_block() {
 		// Run the lazy removal without any limit so that all keys would be removed if there
 		// had been some weight left in the block.
 		let weight_used = Contracts::on_initialize(Weight::max_value());
-		let base = <<Test as crate::Config>::WeightInfo as crate::WeightInfo>::on_initialize();
+		let base = <<Test as Config>::WeightInfo as WeightInfo>::on_initialize();
 		assert_eq!(weight_used, base);
 
 		// All the keys are still in place
@@ -2717,3 +2720,69 @@ fn refcounter() {
 		assert_matches!(crate::CodeStorage::<Test>::get(code_hash), None);
 	});
 }
+
+
+#[test]
+fn reinstrument_does_charge() {
+	let (wasm, code_hash) = compile_module::<Test>("return_with_data").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
+		let subsistence = Module::<Test>::subsistence_threshold();
+		let zero = 0u32.to_le_bytes().encode();
+		let code_len = wasm.len() as u32;
+
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			subsistence * 100,
+			GAS_LIMIT,
+			wasm,
+			zero.clone(),
+			vec![],
+		));
+
+		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+
+		// Call the contract two times without reinstrument
+
+		let result0 = Contracts::bare_call(
+			ALICE,
+			addr.clone(),
+			0,
+			GAS_LIMIT,
+			zero.clone(),
+		);
+		assert!(result0.exec_result.unwrap().is_success());
+
+		let result1 = Contracts::bare_call(
+			ALICE,
+			addr.clone(),
+			0,
+			GAS_LIMIT,
+			zero.clone(),
+		);
+		assert!(result1.exec_result.unwrap().is_success());
+
+		// They should match because both where called with the same schedule.
+		assert_eq!(result0.gas_consumed, result1.gas_consumed);
+
+		// Update the schedule version but keep the rest the same
+		crate::CurrentSchedule::mutate(|old: &mut Schedule<Test>| {
+			old.version += 1;
+		});
+
+		// This call should trigger reinstrumentation
+		let result2 = Contracts::bare_call(
+			ALICE,
+			addr.clone(),
+			0,
+			GAS_LIMIT,
+			zero.clone(),
+		);
+		assert!(result2.exec_result.unwrap().is_success());
+		assert!(result2.gas_consumed > result1.gas_consumed);
+		assert_eq!(
+			result2.gas_consumed,
+			result1.gas_consumed + <Test as Config>::WeightInfo::instrument(code_len / 1024),
+		);
+	});
+}
diff --git a/frame/contracts/src/wasm/code_cache.rs b/frame/contracts/src/wasm/code_cache.rs
index 6166918c80c9..1132d31776db 100644
--- a/frame/contracts/src/wasm/code_cache.rs
+++ b/frame/contracts/src/wasm/code_cache.rs
@@ -30,9 +30,13 @@
 use crate::{
 	CodeHash, CodeStorage, PristineCode, Schedule, Config, Error,
 	wasm::{prepare, PrefabWasmModule}, Module as Contracts, RawEvent,
+	gas::{Gas, GasMeter, Token},
+	weights::WeightInfo,
 };
 use sp_core::crypto::UncheckedFrom;
-use frame_support::{StorageMap, dispatch::{DispatchError, DispatchResult}};
+use frame_support::{StorageMap, dispatch::DispatchError};
+#[cfg(feature = "runtime-benchmarks")]
+pub use self::private::reinstrument as reinstrument;
 
 /// Put the instrumented module in storage.
 ///
@@ -77,14 +81,14 @@ where
 }
 
 /// Increment the refcount of a code in-storage by one.
-pub fn increment_refcount<T: Config>(code_hash: CodeHash<T>) -> DispatchResult
+pub fn increment_refcount<T: Config>(code_hash: CodeHash<T>) -> Result<u32, DispatchError>
 where
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
 {
 	<CodeStorage<T>>::mutate(code_hash, |existing| {
 		if let Some(module) = existing {
 			increment_64(&mut module.refcount);
-			Ok(())
+			Ok(module.original_code_len)
 		} else {
 			Err(Error::<T>::CodeNotFound.into())
 		}
@@ -92,19 +96,23 @@ where
 }
 
 /// Decrement the refcount of a code in-storage by one and remove the code when it drops to zero.
-pub fn decrement_refcount<T: Config>(code_hash: CodeHash<T>)
+pub fn decrement_refcount<T: Config>(code_hash: CodeHash<T>) -> u32
 where
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
 {
 	<CodeStorage<T>>::mutate_exists(code_hash, |existing| {
 		if let Some(module) = existing {
+			let code_len = module.original_code_len;
 			module.refcount = module.refcount.saturating_sub(1);
 			if module.refcount == 0 {
 				*existing = None;
 				finish_removal::<T>(code_hash);
 			}
+			code_len
+		} else {
+			0
 		}
-	});
+	})
 }
 
 /// Load code with the given code hash.
@@ -114,31 +122,48 @@ where
 /// re-instrumentation and update the cache in the storage.
 pub fn load<T: Config>(
 	code_hash: CodeHash<T>,
-	schedule: Option<&Schedule<T>>,
+	reinstrument: Option<(&Schedule<T>, &mut GasMeter<T>)>,
 ) -> Result<PrefabWasmModule<T>, DispatchError>
 where
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
 {
 	let mut prefab_module = <CodeStorage<T>>::get(code_hash)
 		.ok_or_else(|| Error::<T>::CodeNotFound)?;
+	prefab_module.code_hash = code_hash;
 
-	if let Some(schedule) = schedule {
+	if let Some((schedule, gas_meter)) = reinstrument {
 		if prefab_module.schedule_version < schedule.version {
 			// The current schedule version is greater than the version of the one cached
 			// in the storage.
 			//
 			// We need to re-instrument the code with the latest schedule here.
-			let original_code = <PristineCode<T>>::get(code_hash)
-				.ok_or_else(|| Error::<T>::CodeNotFound)?;
-			prefab_module.code = prepare::reinstrument_contract::<T>(original_code, schedule)?;
-			prefab_module.schedule_version = schedule.version;
-			<CodeStorage<T>>::insert(&code_hash, &prefab_module);
+			gas_meter.charge(&(), InstrumentToken(prefab_module.original_code_len))?;
+			private::reinstrument(&mut prefab_module, schedule)?;
 		}
 	}
-	prefab_module.code_hash = code_hash;
 	Ok(prefab_module)
 }
 
+mod private {
+	use super::*;
+
+	/// Instruments the passed prefab wasm module with the supplied schedule.
+	pub fn reinstrument<T: Config>(
+		prefab_module: &mut PrefabWasmModule<T>,
+		schedule: &Schedule<T>,
+	) -> Result<(), DispatchError>
+	where
+		T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
+	{
+		let original_code = <PristineCode<T>>::get(&prefab_module.code_hash)
+			.ok_or_else(|| Error::<T>::CodeNotFound)?;
+		prefab_module.code = prepare::reinstrument_contract::<T>(original_code, schedule)?;
+		prefab_module.schedule_version = schedule.version;
+		<CodeStorage<T>>::insert(&prefab_module.code_hash, &*prefab_module);
+		Ok(())
+	}
+}
+
 /// Finish removal of a code by deleting the pristine code and emitting an event.
 fn finish_removal<T: Config>(code_hash: CodeHash<T>)
 where
@@ -161,3 +186,17 @@ fn increment_64(refcount: &mut u64) {
 		qed
 	");
 }
+
+/// Token to be supplied to the gas meter which charges the weight needed for reinstrumenting
+/// a contract of the specified size in bytes.
+#[cfg_attr(test, derive(Debug, PartialEq, Eq))]
+#[derive(Clone, Copy)]
+struct InstrumentToken(u32);
+
+impl<T: Config> Token<T> for InstrumentToken {
+	type Metadata = ();
+
+	fn calculate_amount(&self, _metadata: &Self::Metadata) -> Gas {
+		T::WeightInfo::instrument(self.0 / 1024)
+	}
+}
diff --git a/frame/contracts/src/wasm/mod.rs b/frame/contracts/src/wasm/mod.rs
index 56be9f35313a..c6970b2b1eb0 100644
--- a/frame/contracts/src/wasm/mod.rs
+++ b/frame/contracts/src/wasm/mod.rs
@@ -33,9 +33,11 @@ use crate::{
 use sp_std::prelude::*;
 use sp_core::crypto::UncheckedFrom;
 use codec::{Encode, Decode};
-use frame_support::dispatch::{DispatchError, DispatchResult};
+use frame_support::dispatch::DispatchError;
 use pallet_contracts_primitives::ExecResult;
 pub use self::runtime::{ReturnCode, Runtime, RuntimeToken};
+#[cfg(feature = "runtime-benchmarks")]
+pub use self::code_cache::reinstrument;
 
 /// A prepared wasm module ready for execution.
 ///
@@ -125,7 +127,7 @@ where
 	pub fn store_code_unchecked(
 		original_code: Vec<u8>,
 		schedule: &Schedule<T>
-	) -> DispatchResult {
+	) -> Result<(), DispatchError> {
 		let executable = prepare::benchmarking::prepare_contract(original_code, schedule)
 			.map_err::<DispatchError, _>(Into::into)?;
 		code_cache::store(executable);
@@ -145,9 +147,10 @@ where
 {
 	fn from_storage(
 		code_hash: CodeHash<T>,
-		schedule: &Schedule<T>
+		schedule: &Schedule<T>,
+		gas_meter: &mut GasMeter<T>,
 	) -> Result<Self, DispatchError> {
-		code_cache::load(code_hash, Some(schedule))
+		code_cache::load(code_hash, Some((schedule, gas_meter)))
 	}
 
 	fn from_storage_noinstr(code_hash: CodeHash<T>) -> Result<Self, DispatchError> {
@@ -158,11 +161,11 @@ where
 		code_cache::store_decremented(self);
 	}
 
-	fn add_user(code_hash: CodeHash<T>) -> DispatchResult {
+	fn add_user(code_hash: CodeHash<T>) -> Result<u32, DispatchError> {
 		code_cache::increment_refcount::<T>(code_hash)
 	}
 
-	fn remove_user(code_hash: CodeHash<T>) {
+	fn remove_user(code_hash: CodeHash<T>) -> u32 {
 		code_cache::decrement_refcount::<T>(code_hash)
 	}
 
@@ -222,6 +225,10 @@ where
 		let len = self.original_code_len.saturating_add(self.code.len() as u32);
 		len.checked_div(self.refcount as u32).unwrap_or(len)
 	}
+
+	fn code_len(&self) -> u32 {
+		self.code.len() as u32
+	}
 }
 
 #[cfg(test)]
@@ -305,7 +312,7 @@ mod tests {
 			gas_meter: &mut GasMeter<Test>,
 			data: Vec<u8>,
 			salt: &[u8],
-		) -> Result<(AccountIdOf<Self::T>, ExecReturnValue), ExecError> {
+		) -> Result<(AccountIdOf<Self::T>, ExecReturnValue, u32), (ExecError, u32)> {
 			self.instantiates.push(InstantiateEntry {
 				code_hash: code_hash.clone(),
 				endowment,
@@ -319,6 +326,7 @@ mod tests {
 					flags: ReturnFlags::empty(),
 					data: Vec::new(),
 				},
+				0,
 			))
 		}
 		fn transfer(
@@ -339,7 +347,7 @@ mod tests {
 			value: u64,
 			_gas_meter: &mut GasMeter<Test>,
 			data: Vec<u8>,
-		) -> ExecResult {
+		) -> Result<(ExecReturnValue, u32), (ExecError, u32)> {
 			self.transfers.push(TransferEntry {
 				to: to.clone(),
 				value,
@@ -347,16 +355,16 @@ mod tests {
 			});
 			// Assume for now that it was just a plain transfer.
 			// TODO: Add tests for different call outcomes.
-			Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: Vec::new() })
+			Ok((ExecReturnValue { flags: ReturnFlags::empty(), data: Vec::new() }, 0))
 		}
 		fn terminate(
 			&mut self,
 			beneficiary: &AccountIdOf<Self::T>,
-		) -> Result<(), DispatchError> {
+		) -> Result<u32, (DispatchError, u32)> {
 			self.terminations.push(TerminationEntry {
 				beneficiary: beneficiary.clone(),
 			});
-			Ok(())
+			Ok(0)
 		}
 		fn restore_to(
 			&mut self,
@@ -364,14 +372,14 @@ mod tests {
 			code_hash: H256,
 			rent_allowance: u64,
 			delta: Vec<StorageKey>,
-		) -> Result<(), DispatchError> {
+		) -> Result<(u32, u32), (DispatchError, u32, u32)> {
 			self.restores.push(RestoreEntry {
 				dest,
 				code_hash,
 				rent_allowance,
 				delta,
 			});
-			Ok(())
+			Ok((0, 0))
 		}
 		fn caller(&self) -> &AccountIdOf<Self::T> {
 			&ALICE
@@ -443,7 +451,7 @@ mod tests {
 			gas_meter: &mut GasMeter<Test>,
 			input_data: Vec<u8>,
 			salt: &[u8],
-		) -> Result<(AccountIdOf<Self::T>, ExecReturnValue), ExecError> {
+		) -> Result<(AccountIdOf<Self::T>, ExecReturnValue, u32), (ExecError, u32)> {
 			(**self).instantiate(code, value, gas_meter, input_data, salt)
 		}
 		fn transfer(
@@ -456,7 +464,7 @@ mod tests {
 		fn terminate(
 			&mut self,
 			beneficiary: &AccountIdOf<Self::T>,
-		) -> Result<(), DispatchError> {
+		) -> Result<u32, (DispatchError, u32)> {
 			(**self).terminate(beneficiary)
 		}
 		fn call(
@@ -465,7 +473,7 @@ mod tests {
 			value: u64,
 			gas_meter: &mut GasMeter<Test>,
 			input_data: Vec<u8>,
-		) -> ExecResult {
+		) -> Result<(ExecReturnValue, u32), (ExecError, u32)> {
 			(**self).call(to, value, gas_meter, input_data)
 		}
 		fn restore_to(
@@ -474,7 +482,7 @@ mod tests {
 			code_hash: H256,
 			rent_allowance: u64,
 			delta: Vec<StorageKey>,
-		) -> Result<(), DispatchError> {
+		) -> Result<(u32, u32), (DispatchError, u32, u32)> {
 			(**self).restore_to(
 				dest,
 				code_hash,
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index 9dd098e85266..020be381851f 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -20,11 +20,11 @@
 use crate::{
 	HostFnWeights, Config, CodeHash, BalanceOf, Error,
 	exec::{Ext, StorageKey, TopicOf},
-	gas::{Gas, GasMeter, Token, GasMeterResult, ChargedAmount},
+	gas::{Gas, GasMeter, Token, ChargedAmount},
 	wasm::env_def::ConvertibleToWasm,
 };
 use parity_wasm::elements::ValueType;
-use frame_support::{dispatch::DispatchError, ensure};
+use frame_support::{dispatch::DispatchError, ensure, traits::Get};
 use sp_std::prelude::*;
 use codec::{Decode, DecodeAll, Encode};
 use sp_runtime::traits::SaturatedConversion;
@@ -165,8 +165,12 @@ pub enum RuntimeToken {
 	Return(u32),
 	/// Weight of calling `seal_terminate`.
 	Terminate,
+	/// Weight that is added to `seal_terminate` for every byte of the terminated contract.
+	TerminateSurchargeCodeSize(u32),
 	/// Weight of calling `seal_restore_to` per number of supplied delta entries.
 	RestoreTo(u32),
+	/// Weight that is added to `seal_restore_to` for the involved code sizes.
+	RestoreToSurchargeCodeSize{caller_code: u32, tombstone_code: u32},
 	/// Weight of calling `seal_random`. It includes the weight for copying the subject.
 	Random,
 	/// Weight of calling `seal_reposit_event` with the given number of topics and event size.
@@ -185,6 +189,8 @@ pub enum RuntimeToken {
 	Transfer,
 	/// Weight of calling `seal_call` for the given input size.
 	CallBase(u32),
+	/// Weight that is added to `seal_call` for every byte of the called contract.
+	CallSurchargeCodeSize(u32),
 	/// Weight of the transfer performed during a call.
 	CallSurchargeTransfer,
 	/// Weight of output received through `seal_call` for the given size.
@@ -193,6 +199,8 @@ pub enum RuntimeToken {
 	/// This includes the transfer as an instantiate without a value will always be below
 	/// the existential deposit and is disregarded as corner case.
 	InstantiateBase{input_data_len: u32, salt_len: u32},
+	/// Weight that is added to `seal_instantiate` for every byte of the instantiated contract.
+	InstantiateSurchargeCodeSize(u32),
 	/// Weight of output received through `seal_instantiate` for the given size.
 	InstantiateCopyOut(u32),
 	/// Weight of calling `seal_hash_sha_256` for the given input size.
@@ -235,8 +243,13 @@ where
 			Return(len) => s.r#return
 				.saturating_add(s.return_per_byte.saturating_mul(len.into())),
 			Terminate => s.terminate,
+			TerminateSurchargeCodeSize(len) => s.terminate_per_code_byte.saturating_mul(len.into()),
 			RestoreTo(delta) => s.restore_to
 				.saturating_add(s.restore_to_per_delta.saturating_mul(delta.into())),
+			RestoreToSurchargeCodeSize{caller_code, tombstone_code} =>
+				s.restore_to_per_caller_code_byte.saturating_mul(caller_code.into()).saturating_add(
+					s.restore_to_per_tombstone_code_byte.saturating_mul(tombstone_code.into())
+				),
 			Random => s.random,
 			DepositEvent{num_topic, len} => s.deposit_event
 				.saturating_add(s.deposit_event_per_topic.saturating_mul(num_topic.into()))
@@ -250,11 +263,14 @@ where
 			Transfer => s.transfer,
 			CallBase(len) => s.call
 				.saturating_add(s.call_per_input_byte.saturating_mul(len.into())),
+			CallSurchargeCodeSize(len) => s.call_per_code_byte.saturating_mul(len.into()),
 			CallSurchargeTransfer => s.call_transfer_surcharge,
 			CallCopyOut(len) => s.call_per_output_byte.saturating_mul(len.into()),
 			InstantiateBase{input_data_len, salt_len} => s.instantiate
 				.saturating_add(s.instantiate_per_input_byte.saturating_mul(input_data_len.into()))
 				.saturating_add(s.instantiate_per_salt_byte.saturating_mul(salt_len.into())),
+			InstantiateSurchargeCodeSize(len) =>
+				s.instantiate_per_code_byte.saturating_mul(len.into()),
 			InstantiateCopyOut(len) => s.instantiate_per_output_byte
 				.saturating_mul(len.into()),
 			HashSha256(len) => s.hash_sha2_256
@@ -408,10 +424,19 @@ where
 	where
 		Tok: Token<E::T, Metadata=HostFnWeights<E::T>>,
 	{
-		match self.gas_meter.charge(&self.ext.schedule().host_fn_weights, token) {
-			GasMeterResult::Proceed(amount) => Ok(amount),
-			GasMeterResult::OutOfGas => Err(Error::<E::T>::OutOfGas.into())
-		}
+		self.gas_meter.charge(&self.ext.schedule().host_fn_weights, token)
+	}
+
+	/// Correct previously charged gas amount.
+	pub fn adjust_gas<Tok>(&mut self, charged_amount: ChargedAmount, adjusted_amount: Tok)
+	where
+		Tok: Token<E::T, Metadata=HostFnWeights<E::T>>,
+	{
+		self.gas_meter.adjust_gas(
+			charged_amount,
+			&self.ext.schedule().host_fn_weights,
+			adjusted_amount,
+		);
 	}
 
 	/// Read designated chunk from the sandbox memory.
@@ -774,11 +799,12 @@ define_env!(Env, <E: Ext>,
 			ctx.read_sandbox_memory_as(callee_ptr, callee_len)?;
 		let value: BalanceOf<<E as Ext>::T> = ctx.read_sandbox_memory_as(value_ptr, value_len)?;
 		let input_data = ctx.read_sandbox_memory(input_data_ptr, input_data_len)?;
-
 		if value > 0u32.into() {
 			ctx.charge_gas(RuntimeToken::CallSurchargeTransfer)?;
 		}
-
+		let charged = ctx.charge_gas(
+			RuntimeToken::CallSurchargeCodeSize(<E::T as Config>::MaxCodeSize::get())
+		)?;
 		let nested_gas_limit = if gas == 0 {
 			ctx.gas_meter.gas_left()
 		} else {
@@ -796,16 +822,20 @@ define_env!(Env, <E: Ext>,
 					)
 				}
 				// there is not enough gas to allocate for the nested call.
-				None => Err(Error::<<E as Ext>::T>::OutOfGas.into()),
+				None => Err((Error::<<E as Ext>::T>::OutOfGas.into(), 0)),
 			}
 		});
-
-		if let Ok(output) = &call_outcome {
+		let code_len = match &call_outcome {
+			Ok((_, len)) => len,
+			Err((_, len)) => len,
+		};
+		ctx.adjust_gas(charged, RuntimeToken::CallSurchargeCodeSize(*code_len));
+		if let Ok((output, _)) = &call_outcome {
 			ctx.write_sandbox_output(output_ptr, output_len_ptr, &output.data, true, |len| {
 				Some(RuntimeToken::CallCopyOut(len))
 			})?;
 		}
-		Ok(Runtime::<E>::exec_into_return_code(call_outcome)?)
+		Ok(Runtime::<E>::exec_into_return_code(call_outcome.map(|r| r.0).map_err(|r| r.0))?)
 	},
 
 	// Instantiate a contract with the specified code hash.
@@ -875,7 +905,9 @@ define_env!(Env, <E: Ext>,
 		let value: BalanceOf<<E as Ext>::T> = ctx.read_sandbox_memory_as(value_ptr, value_len)?;
 		let input_data = ctx.read_sandbox_memory(input_data_ptr, input_data_len)?;
 		let salt = ctx.read_sandbox_memory(salt_ptr, salt_len)?;
-
+		let charged = ctx.charge_gas(
+			RuntimeToken::InstantiateSurchargeCodeSize(<E::T as Config>::MaxCodeSize::get())
+		)?;
 		let nested_gas_limit = if gas == 0 {
 			ctx.gas_meter.gas_left()
 		} else {
@@ -894,10 +926,15 @@ define_env!(Env, <E: Ext>,
 					)
 				}
 				// there is not enough gas to allocate for the nested call.
-				None => Err(Error::<<E as Ext>::T>::OutOfGas.into()),
+				None => Err((Error::<<E as Ext>::T>::OutOfGas.into(), 0)),
 			}
 		});
-		if let Ok((address, output)) = &instantiate_outcome {
+		let code_len = match &instantiate_outcome {
+			Ok((_, _, code_len)) => code_len,
+			Err((_, code_len)) => code_len,
+		};
+		ctx.adjust_gas(charged, RuntimeToken::InstantiateSurchargeCodeSize(*code_len));
+		if let Ok((address, output, _)) = &instantiate_outcome {
 			if !output.flags.contains(ReturnFlags::REVERT) {
 				ctx.write_sandbox_output(
 					address_ptr, address_len_ptr, &address.encode(), true, already_charged,
@@ -907,7 +944,9 @@ define_env!(Env, <E: Ext>,
 				Some(RuntimeToken::InstantiateCopyOut(len))
 			})?;
 		}
-		Ok(Runtime::<E>::exec_into_return_code(instantiate_outcome.map(|(_id, retval)| retval))?)
+		Ok(Runtime::<E>::exec_into_return_code(
+			instantiate_outcome.map(|(_, retval, _)| retval).map_err(|(err, _)| err)
+		)?)
 	},
 
 	// Remove the calling account and transfer remaining balance.
@@ -935,7 +974,15 @@ define_env!(Env, <E: Ext>,
 		let beneficiary: <<E as Ext>::T as frame_system::Config>::AccountId =
 			ctx.read_sandbox_memory_as(beneficiary_ptr, beneficiary_len)?;
 
-		ctx.ext.terminate(&beneficiary)?;
+		let charged = ctx.charge_gas(
+			RuntimeToken::TerminateSurchargeCodeSize(<E::T as Config>::MaxCodeSize::get())
+		)?;
+		let (result, code_len) = match ctx.ext.terminate(&beneficiary) {
+			Ok(len) => (Ok(()), len),
+			Err((err, len)) => (Err(err), len),
+		};
+		ctx.adjust_gas(charged, RuntimeToken::TerminateSurchargeCodeSize(code_len));
+		result?;
 		Err(TrapReason::Termination)
 	},
 
@@ -1220,7 +1267,22 @@ define_env!(Env, <E: Ext>,
 			delta
 		};
 
-		ctx.ext.restore_to(dest, code_hash, rent_allowance, delta)?;
+		let max_len = <E::T as Config>::MaxCodeSize::get();
+		let charged = ctx.charge_gas(RuntimeToken::RestoreToSurchargeCodeSize {
+			caller_code: max_len,
+			tombstone_code: max_len,
+		})?;
+		let (result, caller_code, tombstone_code) = match ctx.ext.restore_to(
+			dest, code_hash, rent_allowance, delta
+		) {
+			Ok((code, tomb)) => (Ok(()), code, tomb),
+			Err((err, code, tomb)) => (Err(err), code, tomb),
+		};
+		ctx.adjust_gas(charged, RuntimeToken::RestoreToSurchargeCodeSize {
+			caller_code,
+			tombstone_code,
+		});
+		result?;
 		Err(TrapReason::Restoration)
 	},
 
diff --git a/frame/contracts/src/weights.rs b/frame/contracts/src/weights.rs
index 9c5361103873..905ccf8cb5a2 100644
--- a/frame/contracts/src/weights.rs
+++ b/frame/contracts/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_contracts
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.1
-//! DATE: 2021-02-04, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-02-18, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -47,11 +47,12 @@ pub trait WeightInfo {
 	fn on_initialize() -> Weight;
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight;
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight;
+	fn instrument(c: u32, ) -> Weight;
 	fn update_schedule() -> Weight;
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight;
-	fn instantiate(s: u32, ) -> Weight;
-	fn call() -> Weight;
-	fn claim_surcharge() -> Weight;
+	fn instantiate(c: u32, s: u32, ) -> Weight;
+	fn call(c: u32, ) -> Weight;
+	fn claim_surcharge(c: u32, ) -> Weight;
 	fn seal_caller(r: u32, ) -> Weight;
 	fn seal_address(r: u32, ) -> Weight;
 	fn seal_gas_left(r: u32, ) -> Weight;
@@ -69,8 +70,9 @@ pub trait WeightInfo {
 	fn seal_return(r: u32, ) -> Weight;
 	fn seal_return_per_kb(n: u32, ) -> Weight;
 	fn seal_terminate(r: u32, ) -> Weight;
+	fn seal_terminate_per_code_kb(c: u32, ) -> Weight;
 	fn seal_restore_to(r: u32, ) -> Weight;
-	fn seal_restore_to_per_delta(d: u32, ) -> Weight;
+	fn seal_restore_to_per_code_kb_delta(c: u32, t: u32, d: u32, ) -> Weight;
 	fn seal_random(r: u32, ) -> Weight;
 	fn seal_deposit_event(r: u32, ) -> Weight;
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight;
@@ -82,9 +84,9 @@ pub trait WeightInfo {
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight;
 	fn seal_transfer(r: u32, ) -> Weight;
 	fn seal_call(r: u32, ) -> Weight;
-	fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight;
+	fn seal_call_per_code_transfer_input_output_kb(c: u32, t: u32, i: u32, o: u32, ) -> Weight;
 	fn seal_instantiate(r: u32, ) -> Weight;
-	fn seal_instantiate_per_input_output_salt_kb(i: u32, o: u32, s: u32, ) -> Weight;
+	fn seal_instantiate_per_code_input_output_salt_kb(c: u32, i: u32, o: u32, s: u32, ) -> Weight;
 	fn seal_hash_sha2_256(r: u32, ) -> Weight;
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight;
 	fn seal_hash_keccak_256(r: u32, ) -> Weight;
@@ -150,11 +152,11 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn on_initialize() -> Weight {
-		(3_947_000 as Weight)
+		(3_733_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 	}
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
-		(46_644_000 as Weight)
+		(49_569_000 as Weight)
 			// Standard Error: 5_000
 			.saturating_add((2_295_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
@@ -162,235 +164,259 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 164_000
-			.saturating_add((165_220_000 as Weight).saturating_mul(q as Weight))
+		(358_064_000 as Weight)
+			// Standard Error: 143_000
+			.saturating_add((140_992_000 as Weight).saturating_mul(q as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn instrument(c: u32, ) -> Weight {
+		(44_198_000 as Weight)
+			// Standard Error: 188_000
+			.saturating_add((125_833_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn update_schedule() -> Weight {
-		(28_195_000 as Weight)
+		(29_190_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 126_000
-			.saturating_add((154_196_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 63_000
-			.saturating_add((2_764_000 as Weight).saturating_mul(s as Weight))
+		(180_015_000 as Weight)
+			// Standard Error: 197_000
+			.saturating_add((167_480_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 12_000
+			.saturating_add((2_581_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
-	fn instantiate(s: u32, ) -> Weight {
-		(201_407_000 as Weight)
+	fn instantiate(c: u32, s: u32, ) -> Weight {
+		(180_996_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((8_684_000 as Weight).saturating_mul(c as Weight))
 			// Standard Error: 1_000
-			.saturating_add((2_247_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((2_518_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
-	fn call() -> Weight {
-		(180_337_000 as Weight)
+	fn call(c: u32, ) -> Weight {
+		(184_326_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((3_920_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
-	fn claim_surcharge() -> Weight {
-		(322_371_000 as Weight)
+	fn claim_surcharge(c: u32, ) -> Weight {
+		(303_270_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((5_108_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn seal_caller(r: u32, ) -> Weight {
-		(135_499_000 as Weight)
-			// Standard Error: 296_000
-			.saturating_add((275_938_000 as Weight).saturating_mul(r as Weight))
+		(128_965_000 as Weight)
+			// Standard Error: 130_000
+			.saturating_add((270_123_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_address(r: u32, ) -> Weight {
-		(132_674_000 as Weight)
-			// Standard Error: 158_000
-			.saturating_add((273_808_000 as Weight).saturating_mul(r as Weight))
+		(137_748_000 as Weight)
+			// Standard Error: 184_000
+			.saturating_add((270_103_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(126_819_000 as Weight)
-			// Standard Error: 145_000
-			.saturating_add((269_173_000 as Weight).saturating_mul(r as Weight))
+		(118_784_000 as Weight)
+			// Standard Error: 234_000
+			.saturating_add((264_467_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_balance(r: u32, ) -> Weight {
-		(140_223_000 as Weight)
-			// Standard Error: 259_000
-			.saturating_add((581_353_000 as Weight).saturating_mul(r as Weight))
+		(146_072_000 as Weight)
+			// Standard Error: 207_000
+			.saturating_add((573_282_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(129_490_000 as Weight)
-			// Standard Error: 132_000
-			.saturating_add((269_433_000 as Weight).saturating_mul(r as Weight))
+		(133_857_000 as Weight)
+			// Standard Error: 151_000
+			.saturating_add((263_110_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(127_251_000 as Weight)
-			// Standard Error: 161_000
-			.saturating_add((268_720_000 as Weight).saturating_mul(r as Weight))
+		(130_447_000 as Weight)
+			// Standard Error: 125_000
+			.saturating_add((265_565_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(129_546_000 as Weight)
-			// Standard Error: 130_000
-			.saturating_add((268_280_000 as Weight).saturating_mul(r as Weight))
+		(116_232_000 as Weight)
+			// Standard Error: 327_000
+			.saturating_add((265_728_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(133_306_000 as Weight)
-			// Standard Error: 208_000
-			.saturating_add((604_235_000 as Weight).saturating_mul(r as Weight))
+		(175_561_000 as Weight)
+			// Standard Error: 292_000
+			.saturating_add((604_373_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_block_number(r: u32, ) -> Weight {
-		(133_689_000 as Weight)
-			// Standard Error: 115_000
-			.saturating_add((267_107_000 as Weight).saturating_mul(r as Weight))
+		(133_961_000 as Weight)
+			// Standard Error: 150_000
+			.saturating_add((262_329_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_now(r: u32, ) -> Weight {
-		(133_773_000 as Weight)
-			// Standard Error: 130_000
-			.saturating_add((268_897_000 as Weight).saturating_mul(r as Weight))
+		(128_662_000 as Weight)
+			// Standard Error: 150_000
+			.saturating_add((263_234_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(133_222_000 as Weight)
-			// Standard Error: 476_000
-			.saturating_add((514_400_000 as Weight).saturating_mul(r as Weight))
+		(142_580_000 as Weight)
+			// Standard Error: 205_000
+			.saturating_add((505_378_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 	}
 	fn seal_gas(r: u32, ) -> Weight {
-		(118_769_000 as Weight)
-			// Standard Error: 102_000
-			.saturating_add((134_134_000 as Weight).saturating_mul(r as Weight))
+		(116_346_000 as Weight)
+			// Standard Error: 86_000
+			.saturating_add((124_599_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_input(r: u32, ) -> Weight {
-		(124_719_000 as Weight)
-			// Standard Error: 93_000
-			.saturating_add((7_486_000 as Weight).saturating_mul(r as Weight))
+		(124_679_000 as Weight)
+			// Standard Error: 81_000
+			.saturating_add((7_310_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(136_348_000 as Weight)
+		(136_069_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((274_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_return(r: u32, ) -> Weight {
-		(118_710_000 as Weight)
-			// Standard Error: 77_000
-			.saturating_add((4_566_000 as Weight).saturating_mul(r as Weight))
+		(118_807_000 as Weight)
+			// Standard Error: 66_000
+			.saturating_add((4_740_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(127_609_000 as Weight)
+		(127_702_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((786_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((784_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_terminate(r: u32, ) -> Weight {
-		(125_463_000 as Weight)
-			// Standard Error: 154_000
-			.saturating_add((106_188_000 as Weight).saturating_mul(r as Weight))
+		(124_847_000 as Weight)
+			// Standard Error: 87_000
+			.saturating_add((107_679_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes((5 as Weight).saturating_mul(r as Weight)))
 	}
+	fn seal_terminate_per_code_kb(c: u32, ) -> Weight {
+		(237_115_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((8_556_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add(T::DbWeight::get().reads(7 as Weight))
+			.saturating_add(T::DbWeight::get().writes(5 as Weight))
+	}
 	fn seal_restore_to(r: u32, ) -> Weight {
-		(219_195_000 as Weight)
-			// Standard Error: 361_000
-			.saturating_add((131_326_000 as Weight).saturating_mul(r as Weight))
+		(217_959_000 as Weight)
+			// Standard Error: 455_000
+			.saturating_add((134_528_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes((6 as Weight).saturating_mul(r as Weight)))
 	}
-	fn seal_restore_to_per_delta(d: u32, ) -> Weight {
-		(6_742_000 as Weight)
-			// Standard Error: 2_484_000
-			.saturating_add((3_747_735_000 as Weight).saturating_mul(d as Weight))
+	fn seal_restore_to_per_code_kb_delta(c: u32, t: u32, d: u32, ) -> Weight {
+		(0 as Weight)
+			// Standard Error: 151_000
+			.saturating_add((9_061_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 151_000
+			.saturating_add((4_807_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 1_331_000
+			.saturating_add((3_736_196_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(T::DbWeight::get().reads(8 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
 			.saturating_add(T::DbWeight::get().writes(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
 	}
 	fn seal_random(r: u32, ) -> Weight {
-		(137_248_000 as Weight)
-			// Standard Error: 662_000
-			.saturating_add((661_121_000 as Weight).saturating_mul(r as Weight))
+		(134_143_000 as Weight)
+			// Standard Error: 233_000
+			.saturating_add((643_555_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 	}
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(147_654_000 as Weight)
-			// Standard Error: 305_000
-			.saturating_add((935_148_000 as Weight).saturating_mul(r as Weight))
+		(142_838_000 as Weight)
+			// Standard Error: 367_000
+			.saturating_add((937_126_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_246_123_000 as Weight)
-			// Standard Error: 2_807_000
-			.saturating_add((585_535_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 553_000
-			.saturating_add((249_976_000 as Weight).saturating_mul(n as Weight))
+		(1_210_711_000 as Weight)
+			// Standard Error: 2_124_000
+			.saturating_add((594_541_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 418_000
+			.saturating_add((251_068_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(140_588_000 as Weight)
-			// Standard Error: 228_000
-			.saturating_add((707_872_000 as Weight).saturating_mul(r as Weight))
+		(144_533_000 as Weight)
+			// Standard Error: 220_000
+			.saturating_add((714_590_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(2_767_124_000 as Weight)
-			// Standard Error: 18_504_000
-			.saturating_add((17_507_873_000 as Weight).saturating_mul(r as Weight))
+		(406_366_000 as Weight)
+			// Standard Error: 3_533_000
+			.saturating_add((16_167_082_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(1_748_586_000 as Weight)
-			// Standard Error: 359_000
-			.saturating_add((75_231_000 as Weight).saturating_mul(n as Weight))
+		(1_739_590_000 as Weight)
+			// Standard Error: 390_000
+			.saturating_add((74_815_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn seal_clear_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_209_000
-			.saturating_add((2_261_355_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 2_284_000
+			.saturating_add((2_281_347_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_get_storage(r: u32, ) -> Weight {
-		(83_780_000 as Weight)
-			// Standard Error: 965_000
-			.saturating_add((973_164_000 as Weight).saturating_mul(r as Weight))
+		(81_889_000 as Weight)
+			// Standard Error: 1_171_000
+			.saturating_add((930_704_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(728_625_000 as Weight)
-			// Standard Error: 294_000
-			.saturating_add((154_625_000 as Weight).saturating_mul(n as Weight))
+		(709_323_000 as Weight)
+			// Standard Error: 391_000
+			.saturating_add((155_689_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 	}
 	fn seal_transfer(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 1_543_000
-			.saturating_add((5_467_966_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 1_846_000
+			.saturating_add((5_566_275_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -398,355 +424,359 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	}
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 9_216_000
-			.saturating_add((10_265_093_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 4_823_000
+			.saturating_add((10_461_861_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().reads((200 as Weight).saturating_mul(r as Weight)))
 	}
-	fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight {
-		(10_426_869_000 as Weight)
-			// Standard Error: 114_622_000
-			.saturating_add((4_366_037_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 40_000
-			.saturating_add((59_741_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 43_000
-			.saturating_add((82_331_000 as Weight).saturating_mul(o as Weight))
+	fn seal_call_per_code_transfer_input_output_kb(c: u32, t: u32, i: u32, o: u32, ) -> Weight {
+		(9_686_594_000 as Weight)
+			// Standard Error: 473_000
+			.saturating_add((393_132_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 197_094_000
+			.saturating_add((4_957_181_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 62_000
+			.saturating_add((59_974_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 66_000
+			.saturating_add((83_027_000 as Weight).saturating_mul(o as Weight))
 			.saturating_add(T::DbWeight::get().reads(206 as Weight))
 			.saturating_add(T::DbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 35_927_000
-			.saturating_add((21_088_623_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 34_133_000
+			.saturating_add((21_407_630_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes((300 as Weight).saturating_mul(r as Weight)))
 	}
-	fn seal_instantiate_per_input_output_salt_kb(i: u32, o: u32, s: u32, ) -> Weight {
-		(17_200_760_000 as Weight)
-			// Standard Error: 157_000
-			.saturating_add((61_221_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 157_000
-			.saturating_add((84_149_000 as Weight).saturating_mul(o as Weight))
-			// Standard Error: 157_000
-			.saturating_add((284_655_000 as Weight).saturating_mul(s as Weight))
+	fn seal_instantiate_per_code_input_output_salt_kb(c: u32, i: u32, o: u32, s: u32, ) -> Weight {
+		(9_705_322_000 as Weight)
+			// Standard Error: 674_000
+			.saturating_add((879_118_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 95_000
+			.saturating_add((63_025_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 95_000
+			.saturating_add((87_633_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 95_000
+			.saturating_add((311_987_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(207 as Weight))
 			.saturating_add(T::DbWeight::get().writes(203 as Weight))
 	}
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(126_005_000 as Weight)
-			// Standard Error: 133_000
-			.saturating_add((252_338_000 as Weight).saturating_mul(r as Weight))
+		(125_486_000 as Weight)
+			// Standard Error: 266_000
+			.saturating_add((240_913_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(727_930_000 as Weight)
-			// Standard Error: 57_000
-			.saturating_add((430_299_000 as Weight).saturating_mul(n as Weight))
+		(636_153_000 as Weight)
+			// Standard Error: 47_000
+			.saturating_add((429_541_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(129_778_000 as Weight)
-			// Standard Error: 146_000
-			.saturating_add((266_097_000 as Weight).saturating_mul(r as Weight))
+		(131_768_000 as Weight)
+			// Standard Error: 176_000
+			.saturating_add((256_946_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(683_078_000 as Weight)
-			// Standard Error: 42_000
-			.saturating_add((344_294_000 as Weight).saturating_mul(n as Weight))
+		(647_777_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((344_145_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(141_731_000 as Weight)
-			// Standard Error: 251_000
-			.saturating_add((239_931_000 as Weight).saturating_mul(r as Weight))
+		(130_042_000 as Weight)
+			// Standard Error: 158_000
+			.saturating_add((225_474_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(563_895_000 as Weight)
-			// Standard Error: 51_000
-			.saturating_add((160_216_000 as Weight).saturating_mul(n as Weight))
+		(638_275_000 as Weight)
+			// Standard Error: 30_000
+			.saturating_add((159_832_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(132_587_000 as Weight)
-			// Standard Error: 159_000
-			.saturating_add((239_287_000 as Weight).saturating_mul(r as Weight))
+		(126_632_000 as Weight)
+			// Standard Error: 143_000
+			.saturating_add((225_612_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(606_572_000 as Weight)
-			// Standard Error: 34_000
-			.saturating_add((160_101_000 as Weight).saturating_mul(n as Weight))
+		(656_936_000 as Weight)
+			// Standard Error: 35_000
+			.saturating_add((159_763_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(24_366_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((3_114_000 as Weight).saturating_mul(r as Weight))
+		(25_205_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((3_311_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(26_779_000 as Weight)
+		(27_394_000 as Weight)
 			// Standard Error: 28_000
-			.saturating_add((161_654_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((159_123_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(26_763_000 as Weight)
-			// Standard Error: 88_000
-			.saturating_add((232_822_000 as Weight).saturating_mul(r as Weight))
+		(27_398_000 as Weight)
+			// Standard Error: 57_000
+			.saturating_add((229_775_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(24_342_000 as Weight)
-			// Standard Error: 36_000
-			.saturating_add((12_530_000 as Weight).saturating_mul(r as Weight))
+		(25_212_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((12_291_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(24_301_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((12_106_000 as Weight).saturating_mul(r as Weight))
+		(25_116_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((12_146_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(24_253_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((6_464_000 as Weight).saturating_mul(r as Weight))
+		(25_119_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((6_608_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(24_259_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((14_030_000 as Weight).saturating_mul(r as Weight))
+		(25_146_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((14_017_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(24_313_000 as Weight)
-			// Standard Error: 37_000
-			.saturating_add((15_788_000 as Weight).saturating_mul(r as Weight))
+		(25_192_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((15_460_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(37_991_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((138_000 as Weight).saturating_mul(e as Weight))
+		(37_079_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((160_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(24_739_000 as Weight)
-			// Standard Error: 31_000
-			.saturating_add((97_567_000 as Weight).saturating_mul(r as Weight))
+		(25_599_000 as Weight)
+			// Standard Error: 201_000
+			.saturating_add((99_705_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(32_395_000 as Weight)
-			// Standard Error: 432_000
-			.saturating_add((198_972_000 as Weight).saturating_mul(r as Weight))
+		(33_236_000 as Weight)
+			// Standard Error: 368_000
+			.saturating_add((199_753_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(238_857_000 as Weight)
+		(247_488_000 as Weight)
 			// Standard Error: 6_000
-			.saturating_add((3_491_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((3_374_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(42_196_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((3_161_000 as Weight).saturating_mul(r as Weight))
+		(44_133_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((3_235_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(42_133_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((3_459_000 as Weight).saturating_mul(r as Weight))
+		(44_107_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((3_486_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(42_164_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((4_653_000 as Weight).saturating_mul(r as Weight))
+		(44_116_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((4_757_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(27_802_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((7_780_000 as Weight).saturating_mul(r as Weight))
+		(28_712_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((7_659_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(27_826_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((11_978_000 as Weight).saturating_mul(r as Weight))
+		(28_624_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((11_841_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(26_753_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((3_494_000 as Weight).saturating_mul(r as Weight))
+		(27_445_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((3_487_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(25_078_000 as Weight)
-			// Standard Error: 4_213_000
-			.saturating_add((2_324_209_000 as Weight).saturating_mul(r as Weight))
+		(26_016_000 as Weight)
+			// Standard Error: 4_230_000
+			.saturating_add((2_300_044_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(24_301_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((5_201_000 as Weight).saturating_mul(r as Weight))
+		(25_227_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((5_341_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(24_237_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((5_251_000 as Weight).saturating_mul(r as Weight))
+		(25_163_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((5_355_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(24_290_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((5_780_000 as Weight).saturating_mul(r as Weight))
+		(25_204_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((5_930_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(24_278_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((5_145_000 as Weight).saturating_mul(r as Weight))
+		(25_177_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((5_457_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(24_249_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((5_248_000 as Weight).saturating_mul(r as Weight))
+		(25_206_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((5_229_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(24_266_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((5_236_000 as Weight).saturating_mul(r as Weight))
+		(25_165_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((5_301_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(24_236_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((5_304_000 as Weight).saturating_mul(r as Weight))
+		(25_184_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((5_356_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(24_262_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((7_220_000 as Weight).saturating_mul(r as Weight))
+		(25_195_000 as Weight)
+			// Standard Error: 48_000
+			.saturating_add((7_406_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(24_287_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((7_072_000 as Weight).saturating_mul(r as Weight))
+		(25_192_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((7_303_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(24_211_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((7_196_000 as Weight).saturating_mul(r as Weight))
+		(25_165_000 as Weight)
+			// Standard Error: 34_000
+			.saturating_add((7_247_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(24_175_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((7_392_000 as Weight).saturating_mul(r as Weight))
+		(25_152_000 as Weight)
+			// Standard Error: 46_000
+			.saturating_add((7_464_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(24_209_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((7_131_000 as Weight).saturating_mul(r as Weight))
+		(25_140_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((7_308_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(24_261_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((7_203_000 as Weight).saturating_mul(r as Weight))
+		(25_723_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((6_846_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(24_258_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((7_120_000 as Weight).saturating_mul(r as Weight))
+		(25_201_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((7_226_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(24_236_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((7_076_000 as Weight).saturating_mul(r as Weight))
+		(25_192_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((7_143_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(24_262_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((7_261_000 as Weight).saturating_mul(r as Weight))
+		(25_146_000 as Weight)
+			// Standard Error: 37_000
+			.saturating_add((7_451_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(24_242_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((7_249_000 as Weight).saturating_mul(r as Weight))
+		(25_193_000 as Weight)
+			// Standard Error: 30_000
+			.saturating_add((7_391_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(24_248_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((7_149_000 as Weight).saturating_mul(r as Weight))
+		(25_192_000 as Weight)
+			// Standard Error: 30_000
+			.saturating_add((7_214_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(24_243_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((7_128_000 as Weight).saturating_mul(r as Weight))
+		(25_221_000 as Weight)
+			// Standard Error: 34_000
+			.saturating_add((7_168_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(24_217_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((7_237_000 as Weight).saturating_mul(r as Weight))
+		(25_221_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((7_200_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(24_191_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((12_970_000 as Weight).saturating_mul(r as Weight))
+		(25_229_000 as Weight)
+			// Standard Error: 32_000
+			.saturating_add((13_066_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(24_213_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((12_106_000 as Weight).saturating_mul(r as Weight))
+		(25_210_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((12_314_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(24_238_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((12_944_000 as Weight).saturating_mul(r as Weight))
+		(25_186_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((13_055_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(24_317_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((12_129_000 as Weight).saturating_mul(r as Weight))
+		(25_162_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((12_327_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(24_282_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((7_123_000 as Weight).saturating_mul(r as Weight))
+		(25_191_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((7_153_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(24_243_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((7_148_000 as Weight).saturating_mul(r as Weight))
+		(25_184_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((7_120_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(24_239_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((7_157_000 as Weight).saturating_mul(r as Weight))
+		(25_129_000 as Weight)
+			// Standard Error: 31_000
+			.saturating_add((7_247_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(24_279_000 as Weight)
+		(25_156_000 as Weight)
 			// Standard Error: 16_000
-			.saturating_add((7_253_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((7_333_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(24_285_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((7_333_000 as Weight).saturating_mul(r as Weight))
+		(25_159_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((7_415_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(24_298_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((7_228_000 as Weight).saturating_mul(r as Weight))
+		(25_181_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((7_265_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(24_226_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((7_269_000 as Weight).saturating_mul(r as Weight))
+		(25_165_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((7_443_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(24_235_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((7_299_000 as Weight).saturating_mul(r as Weight))
+		(25_103_000 as Weight)
+			// Standard Error: 44_000
+			.saturating_add((7_463_000 as Weight).saturating_mul(r as Weight))
 	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn on_initialize() -> Weight {
-		(3_947_000 as Weight)
+		(3_733_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 	}
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
-		(46_644_000 as Weight)
+		(49_569_000 as Weight)
 			// Standard Error: 5_000
 			.saturating_add((2_295_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
@@ -754,235 +784,259 @@ impl WeightInfo for () {
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 164_000
-			.saturating_add((165_220_000 as Weight).saturating_mul(q as Weight))
+		(358_064_000 as Weight)
+			// Standard Error: 143_000
+			.saturating_add((140_992_000 as Weight).saturating_mul(q as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn instrument(c: u32, ) -> Weight {
+		(44_198_000 as Weight)
+			// Standard Error: 188_000
+			.saturating_add((125_833_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn update_schedule() -> Weight {
-		(28_195_000 as Weight)
+		(29_190_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 126_000
-			.saturating_add((154_196_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 63_000
-			.saturating_add((2_764_000 as Weight).saturating_mul(s as Weight))
+		(180_015_000 as Weight)
+			// Standard Error: 197_000
+			.saturating_add((167_480_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 12_000
+			.saturating_add((2_581_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}
-	fn instantiate(s: u32, ) -> Weight {
-		(201_407_000 as Weight)
+	fn instantiate(c: u32, s: u32, ) -> Weight {
+		(180_996_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((8_684_000 as Weight).saturating_mul(c as Weight))
 			// Standard Error: 1_000
-			.saturating_add((2_247_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((2_518_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
-	fn call() -> Weight {
-		(180_337_000 as Weight)
+	fn call(c: u32, ) -> Weight {
+		(184_326_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((3_920_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
-	fn claim_surcharge() -> Weight {
-		(322_371_000 as Weight)
+	fn claim_surcharge(c: u32, ) -> Weight {
+		(303_270_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((5_108_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn seal_caller(r: u32, ) -> Weight {
-		(135_499_000 as Weight)
-			// Standard Error: 296_000
-			.saturating_add((275_938_000 as Weight).saturating_mul(r as Weight))
+		(128_965_000 as Weight)
+			// Standard Error: 130_000
+			.saturating_add((270_123_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_address(r: u32, ) -> Weight {
-		(132_674_000 as Weight)
-			// Standard Error: 158_000
-			.saturating_add((273_808_000 as Weight).saturating_mul(r as Weight))
+		(137_748_000 as Weight)
+			// Standard Error: 184_000
+			.saturating_add((270_103_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(126_819_000 as Weight)
-			// Standard Error: 145_000
-			.saturating_add((269_173_000 as Weight).saturating_mul(r as Weight))
+		(118_784_000 as Weight)
+			// Standard Error: 234_000
+			.saturating_add((264_467_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_balance(r: u32, ) -> Weight {
-		(140_223_000 as Weight)
-			// Standard Error: 259_000
-			.saturating_add((581_353_000 as Weight).saturating_mul(r as Weight))
+		(146_072_000 as Weight)
+			// Standard Error: 207_000
+			.saturating_add((573_282_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(129_490_000 as Weight)
-			// Standard Error: 132_000
-			.saturating_add((269_433_000 as Weight).saturating_mul(r as Weight))
+		(133_857_000 as Weight)
+			// Standard Error: 151_000
+			.saturating_add((263_110_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(127_251_000 as Weight)
-			// Standard Error: 161_000
-			.saturating_add((268_720_000 as Weight).saturating_mul(r as Weight))
+		(130_447_000 as Weight)
+			// Standard Error: 125_000
+			.saturating_add((265_565_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(129_546_000 as Weight)
-			// Standard Error: 130_000
-			.saturating_add((268_280_000 as Weight).saturating_mul(r as Weight))
+		(116_232_000 as Weight)
+			// Standard Error: 327_000
+			.saturating_add((265_728_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(133_306_000 as Weight)
-			// Standard Error: 208_000
-			.saturating_add((604_235_000 as Weight).saturating_mul(r as Weight))
+		(175_561_000 as Weight)
+			// Standard Error: 292_000
+			.saturating_add((604_373_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_block_number(r: u32, ) -> Weight {
-		(133_689_000 as Weight)
-			// Standard Error: 115_000
-			.saturating_add((267_107_000 as Weight).saturating_mul(r as Weight))
+		(133_961_000 as Weight)
+			// Standard Error: 150_000
+			.saturating_add((262_329_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_now(r: u32, ) -> Weight {
-		(133_773_000 as Weight)
-			// Standard Error: 130_000
-			.saturating_add((268_897_000 as Weight).saturating_mul(r as Weight))
+		(128_662_000 as Weight)
+			// Standard Error: 150_000
+			.saturating_add((263_234_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(133_222_000 as Weight)
-			// Standard Error: 476_000
-			.saturating_add((514_400_000 as Weight).saturating_mul(r as Weight))
+		(142_580_000 as Weight)
+			// Standard Error: 205_000
+			.saturating_add((505_378_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 	}
 	fn seal_gas(r: u32, ) -> Weight {
-		(118_769_000 as Weight)
-			// Standard Error: 102_000
-			.saturating_add((134_134_000 as Weight).saturating_mul(r as Weight))
+		(116_346_000 as Weight)
+			// Standard Error: 86_000
+			.saturating_add((124_599_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_input(r: u32, ) -> Weight {
-		(124_719_000 as Weight)
-			// Standard Error: 93_000
-			.saturating_add((7_486_000 as Weight).saturating_mul(r as Weight))
+		(124_679_000 as Weight)
+			// Standard Error: 81_000
+			.saturating_add((7_310_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(136_348_000 as Weight)
+		(136_069_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((274_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_return(r: u32, ) -> Weight {
-		(118_710_000 as Weight)
-			// Standard Error: 77_000
-			.saturating_add((4_566_000 as Weight).saturating_mul(r as Weight))
+		(118_807_000 as Weight)
+			// Standard Error: 66_000
+			.saturating_add((4_740_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(127_609_000 as Weight)
+		(127_702_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((786_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((784_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_terminate(r: u32, ) -> Weight {
-		(125_463_000 as Weight)
-			// Standard Error: 154_000
-			.saturating_add((106_188_000 as Weight).saturating_mul(r as Weight))
+		(124_847_000 as Weight)
+			// Standard Error: 87_000
+			.saturating_add((107_679_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((5 as Weight).saturating_mul(r as Weight)))
 	}
+	fn seal_terminate_per_code_kb(c: u32, ) -> Weight {
+		(237_115_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((8_556_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
+	}
 	fn seal_restore_to(r: u32, ) -> Weight {
-		(219_195_000 as Weight)
-			// Standard Error: 361_000
-			.saturating_add((131_326_000 as Weight).saturating_mul(r as Weight))
+		(217_959_000 as Weight)
+			// Standard Error: 455_000
+			.saturating_add((134_528_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((4 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((6 as Weight).saturating_mul(r as Weight)))
 	}
-	fn seal_restore_to_per_delta(d: u32, ) -> Weight {
-		(6_742_000 as Weight)
-			// Standard Error: 2_484_000
-			.saturating_add((3_747_735_000 as Weight).saturating_mul(d as Weight))
+	fn seal_restore_to_per_code_kb_delta(c: u32, t: u32, d: u32, ) -> Weight {
+		(0 as Weight)
+			// Standard Error: 151_000
+			.saturating_add((9_061_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 151_000
+			.saturating_add((4_807_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 1_331_000
+			.saturating_add((3_736_196_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(RocksDbWeight::get().reads(8 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(7 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
 	}
 	fn seal_random(r: u32, ) -> Weight {
-		(137_248_000 as Weight)
-			// Standard Error: 662_000
-			.saturating_add((661_121_000 as Weight).saturating_mul(r as Weight))
+		(134_143_000 as Weight)
+			// Standard Error: 233_000
+			.saturating_add((643_555_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 	}
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(147_654_000 as Weight)
-			// Standard Error: 305_000
-			.saturating_add((935_148_000 as Weight).saturating_mul(r as Weight))
+		(142_838_000 as Weight)
+			// Standard Error: 367_000
+			.saturating_add((937_126_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_246_123_000 as Weight)
-			// Standard Error: 2_807_000
-			.saturating_add((585_535_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 553_000
-			.saturating_add((249_976_000 as Weight).saturating_mul(n as Weight))
+		(1_210_711_000 as Weight)
+			// Standard Error: 2_124_000
+			.saturating_add((594_541_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 418_000
+			.saturating_add((251_068_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(140_588_000 as Weight)
-			// Standard Error: 228_000
-			.saturating_add((707_872_000 as Weight).saturating_mul(r as Weight))
+		(144_533_000 as Weight)
+			// Standard Error: 220_000
+			.saturating_add((714_590_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(2_767_124_000 as Weight)
-			// Standard Error: 18_504_000
-			.saturating_add((17_507_873_000 as Weight).saturating_mul(r as Weight))
+		(406_366_000 as Weight)
+			// Standard Error: 3_533_000
+			.saturating_add((16_167_082_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(1_748_586_000 as Weight)
-			// Standard Error: 359_000
-			.saturating_add((75_231_000 as Weight).saturating_mul(n as Weight))
+		(1_739_590_000 as Weight)
+			// Standard Error: 390_000
+			.saturating_add((74_815_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn seal_clear_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_209_000
-			.saturating_add((2_261_355_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 2_284_000
+			.saturating_add((2_281_347_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_get_storage(r: u32, ) -> Weight {
-		(83_780_000 as Weight)
-			// Standard Error: 965_000
-			.saturating_add((973_164_000 as Weight).saturating_mul(r as Weight))
+		(81_889_000 as Weight)
+			// Standard Error: 1_171_000
+			.saturating_add((930_704_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(728_625_000 as Weight)
-			// Standard Error: 294_000
-			.saturating_add((154_625_000 as Weight).saturating_mul(n as Weight))
+		(709_323_000 as Weight)
+			// Standard Error: 391_000
+			.saturating_add((155_689_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 	}
 	fn seal_transfer(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 1_543_000
-			.saturating_add((5_467_966_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 1_846_000
+			.saturating_add((5_566_275_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
@@ -990,343 +1044,347 @@ impl WeightInfo for () {
 	}
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 9_216_000
-			.saturating_add((10_265_093_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 4_823_000
+			.saturating_add((10_461_861_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((200 as Weight).saturating_mul(r as Weight)))
 	}
-	fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight {
-		(10_426_869_000 as Weight)
-			// Standard Error: 114_622_000
-			.saturating_add((4_366_037_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 40_000
-			.saturating_add((59_741_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 43_000
-			.saturating_add((82_331_000 as Weight).saturating_mul(o as Weight))
+	fn seal_call_per_code_transfer_input_output_kb(c: u32, t: u32, i: u32, o: u32, ) -> Weight {
+		(9_686_594_000 as Weight)
+			// Standard Error: 473_000
+			.saturating_add((393_132_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 197_094_000
+			.saturating_add((4_957_181_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 62_000
+			.saturating_add((59_974_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 66_000
+			.saturating_add((83_027_000 as Weight).saturating_mul(o as Weight))
 			.saturating_add(RocksDbWeight::get().reads(206 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 35_927_000
-			.saturating_add((21_088_623_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 34_133_000
+			.saturating_add((21_407_630_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((300 as Weight).saturating_mul(r as Weight)))
 	}
-	fn seal_instantiate_per_input_output_salt_kb(i: u32, o: u32, s: u32, ) -> Weight {
-		(17_200_760_000 as Weight)
-			// Standard Error: 157_000
-			.saturating_add((61_221_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 157_000
-			.saturating_add((84_149_000 as Weight).saturating_mul(o as Weight))
-			// Standard Error: 157_000
-			.saturating_add((284_655_000 as Weight).saturating_mul(s as Weight))
+	fn seal_instantiate_per_code_input_output_salt_kb(c: u32, i: u32, o: u32, s: u32, ) -> Weight {
+		(9_705_322_000 as Weight)
+			// Standard Error: 674_000
+			.saturating_add((879_118_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 95_000
+			.saturating_add((63_025_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 95_000
+			.saturating_add((87_633_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 95_000
+			.saturating_add((311_987_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(207 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(203 as Weight))
 	}
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(126_005_000 as Weight)
-			// Standard Error: 133_000
-			.saturating_add((252_338_000 as Weight).saturating_mul(r as Weight))
+		(125_486_000 as Weight)
+			// Standard Error: 266_000
+			.saturating_add((240_913_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(727_930_000 as Weight)
-			// Standard Error: 57_000
-			.saturating_add((430_299_000 as Weight).saturating_mul(n as Weight))
+		(636_153_000 as Weight)
+			// Standard Error: 47_000
+			.saturating_add((429_541_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(129_778_000 as Weight)
-			// Standard Error: 146_000
-			.saturating_add((266_097_000 as Weight).saturating_mul(r as Weight))
+		(131_768_000 as Weight)
+			// Standard Error: 176_000
+			.saturating_add((256_946_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(683_078_000 as Weight)
-			// Standard Error: 42_000
-			.saturating_add((344_294_000 as Weight).saturating_mul(n as Weight))
+		(647_777_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((344_145_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(141_731_000 as Weight)
-			// Standard Error: 251_000
-			.saturating_add((239_931_000 as Weight).saturating_mul(r as Weight))
+		(130_042_000 as Weight)
+			// Standard Error: 158_000
+			.saturating_add((225_474_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(563_895_000 as Weight)
-			// Standard Error: 51_000
-			.saturating_add((160_216_000 as Weight).saturating_mul(n as Weight))
+		(638_275_000 as Weight)
+			// Standard Error: 30_000
+			.saturating_add((159_832_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(132_587_000 as Weight)
-			// Standard Error: 159_000
-			.saturating_add((239_287_000 as Weight).saturating_mul(r as Weight))
+		(126_632_000 as Weight)
+			// Standard Error: 143_000
+			.saturating_add((225_612_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(606_572_000 as Weight)
-			// Standard Error: 34_000
-			.saturating_add((160_101_000 as Weight).saturating_mul(n as Weight))
+		(656_936_000 as Weight)
+			// Standard Error: 35_000
+			.saturating_add((159_763_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(24_366_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((3_114_000 as Weight).saturating_mul(r as Weight))
+		(25_205_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((3_311_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(26_779_000 as Weight)
+		(27_394_000 as Weight)
 			// Standard Error: 28_000
-			.saturating_add((161_654_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((159_123_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(26_763_000 as Weight)
-			// Standard Error: 88_000
-			.saturating_add((232_822_000 as Weight).saturating_mul(r as Weight))
+		(27_398_000 as Weight)
+			// Standard Error: 57_000
+			.saturating_add((229_775_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(24_342_000 as Weight)
-			// Standard Error: 36_000
-			.saturating_add((12_530_000 as Weight).saturating_mul(r as Weight))
+		(25_212_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((12_291_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(24_301_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((12_106_000 as Weight).saturating_mul(r as Weight))
+		(25_116_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((12_146_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(24_253_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((6_464_000 as Weight).saturating_mul(r as Weight))
+		(25_119_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((6_608_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(24_259_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((14_030_000 as Weight).saturating_mul(r as Weight))
+		(25_146_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((14_017_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(24_313_000 as Weight)
-			// Standard Error: 37_000
-			.saturating_add((15_788_000 as Weight).saturating_mul(r as Weight))
+		(25_192_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((15_460_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(37_991_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((138_000 as Weight).saturating_mul(e as Weight))
+		(37_079_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((160_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(24_739_000 as Weight)
-			// Standard Error: 31_000
-			.saturating_add((97_567_000 as Weight).saturating_mul(r as Weight))
+		(25_599_000 as Weight)
+			// Standard Error: 201_000
+			.saturating_add((99_705_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(32_395_000 as Weight)
-			// Standard Error: 432_000
-			.saturating_add((198_972_000 as Weight).saturating_mul(r as Weight))
+		(33_236_000 as Weight)
+			// Standard Error: 368_000
+			.saturating_add((199_753_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(238_857_000 as Weight)
+		(247_488_000 as Weight)
 			// Standard Error: 6_000
-			.saturating_add((3_491_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((3_374_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(42_196_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((3_161_000 as Weight).saturating_mul(r as Weight))
+		(44_133_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((3_235_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(42_133_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((3_459_000 as Weight).saturating_mul(r as Weight))
+		(44_107_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((3_486_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(42_164_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((4_653_000 as Weight).saturating_mul(r as Weight))
+		(44_116_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((4_757_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(27_802_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((7_780_000 as Weight).saturating_mul(r as Weight))
+		(28_712_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((7_659_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(27_826_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((11_978_000 as Weight).saturating_mul(r as Weight))
+		(28_624_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((11_841_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(26_753_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((3_494_000 as Weight).saturating_mul(r as Weight))
+		(27_445_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((3_487_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(25_078_000 as Weight)
-			// Standard Error: 4_213_000
-			.saturating_add((2_324_209_000 as Weight).saturating_mul(r as Weight))
+		(26_016_000 as Weight)
+			// Standard Error: 4_230_000
+			.saturating_add((2_300_044_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(24_301_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((5_201_000 as Weight).saturating_mul(r as Weight))
+		(25_227_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((5_341_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(24_237_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((5_251_000 as Weight).saturating_mul(r as Weight))
+		(25_163_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((5_355_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(24_290_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((5_780_000 as Weight).saturating_mul(r as Weight))
+		(25_204_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((5_930_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(24_278_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((5_145_000 as Weight).saturating_mul(r as Weight))
+		(25_177_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((5_457_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(24_249_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((5_248_000 as Weight).saturating_mul(r as Weight))
+		(25_206_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((5_229_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(24_266_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((5_236_000 as Weight).saturating_mul(r as Weight))
+		(25_165_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((5_301_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(24_236_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((5_304_000 as Weight).saturating_mul(r as Weight))
+		(25_184_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((5_356_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(24_262_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((7_220_000 as Weight).saturating_mul(r as Weight))
+		(25_195_000 as Weight)
+			// Standard Error: 48_000
+			.saturating_add((7_406_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(24_287_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((7_072_000 as Weight).saturating_mul(r as Weight))
+		(25_192_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((7_303_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(24_211_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((7_196_000 as Weight).saturating_mul(r as Weight))
+		(25_165_000 as Weight)
+			// Standard Error: 34_000
+			.saturating_add((7_247_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(24_175_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((7_392_000 as Weight).saturating_mul(r as Weight))
+		(25_152_000 as Weight)
+			// Standard Error: 46_000
+			.saturating_add((7_464_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(24_209_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((7_131_000 as Weight).saturating_mul(r as Weight))
+		(25_140_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((7_308_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(24_261_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((7_203_000 as Weight).saturating_mul(r as Weight))
+		(25_723_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((6_846_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(24_258_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((7_120_000 as Weight).saturating_mul(r as Weight))
+		(25_201_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((7_226_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(24_236_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((7_076_000 as Weight).saturating_mul(r as Weight))
+		(25_192_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((7_143_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(24_262_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((7_261_000 as Weight).saturating_mul(r as Weight))
+		(25_146_000 as Weight)
+			// Standard Error: 37_000
+			.saturating_add((7_451_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(24_242_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((7_249_000 as Weight).saturating_mul(r as Weight))
+		(25_193_000 as Weight)
+			// Standard Error: 30_000
+			.saturating_add((7_391_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(24_248_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((7_149_000 as Weight).saturating_mul(r as Weight))
+		(25_192_000 as Weight)
+			// Standard Error: 30_000
+			.saturating_add((7_214_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(24_243_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((7_128_000 as Weight).saturating_mul(r as Weight))
+		(25_221_000 as Weight)
+			// Standard Error: 34_000
+			.saturating_add((7_168_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(24_217_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((7_237_000 as Weight).saturating_mul(r as Weight))
+		(25_221_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((7_200_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(24_191_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((12_970_000 as Weight).saturating_mul(r as Weight))
+		(25_229_000 as Weight)
+			// Standard Error: 32_000
+			.saturating_add((13_066_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(24_213_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((12_106_000 as Weight).saturating_mul(r as Weight))
+		(25_210_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((12_314_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(24_238_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((12_944_000 as Weight).saturating_mul(r as Weight))
+		(25_186_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((13_055_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(24_317_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((12_129_000 as Weight).saturating_mul(r as Weight))
+		(25_162_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((12_327_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(24_282_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((7_123_000 as Weight).saturating_mul(r as Weight))
+		(25_191_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((7_153_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(24_243_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((7_148_000 as Weight).saturating_mul(r as Weight))
+		(25_184_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((7_120_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(24_239_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((7_157_000 as Weight).saturating_mul(r as Weight))
+		(25_129_000 as Weight)
+			// Standard Error: 31_000
+			.saturating_add((7_247_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(24_279_000 as Weight)
+		(25_156_000 as Weight)
 			// Standard Error: 16_000
-			.saturating_add((7_253_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((7_333_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(24_285_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((7_333_000 as Weight).saturating_mul(r as Weight))
+		(25_159_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((7_415_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(24_298_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((7_228_000 as Weight).saturating_mul(r as Weight))
+		(25_181_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((7_265_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(24_226_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((7_269_000 as Weight).saturating_mul(r as Weight))
+		(25_165_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((7_443_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(24_235_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((7_299_000 as Weight).saturating_mul(r as Weight))
+		(25_103_000 as Weight)
+			// Standard Error: 44_000
+			.saturating_add((7_463_000 as Weight).saturating_mul(r as Weight))
 	}
 }

From 11e879f9ac373dea371741e1510446eb28beedc0 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Mon, 22 Feb 2021 12:32:41 +0100
Subject: [PATCH 0415/1194] Allow `transfer_keep_alive` to transfer all free
 balance (#8125)

---
 frame/balances/src/lib.rs   |  2 +-
 frame/balances/src/tests.rs | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index ddaab519fa31..cc82497293c8 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -1069,7 +1069,7 @@ impl<T: Config<I>, I: 'static> Currency<T::AccountId> for Pallet<T, I> where
 						//   may not even be a provider.
 						let allow_death = existence_requirement == ExistenceRequirement::AllowDeath;
 						let allow_death = allow_death && !system::Pallet::<T>::is_provider_required(transactor);
-						ensure!(allow_death || from_account.free >= ed, Error::<T, I>::KeepAlive);
+						ensure!(allow_death || from_account.total() >= ed, Error::<T, I>::KeepAlive);
 
 						Ok(())
 					}
diff --git a/frame/balances/src/tests.rs b/frame/balances/src/tests.rs
index ef5823b3bc5b..776cda140efb 100644
--- a/frame/balances/src/tests.rs
+++ b/frame/balances/src/tests.rs
@@ -961,5 +961,18 @@ macro_rules! decl_tests {
 					assert_storage_noop!(assert_eq!(Balances::slash(&1337, 42).1, 42));
 				});
 		}
+
+		#[test]
+		fn transfer_keep_alive_all_free_succeed() {
+			<$ext_builder>::default()
+				.existential_deposit(100)
+				.build()
+				.execute_with(|| {
+					assert_ok!(Balances::set_balance(Origin::root(), 1, 100, 100));
+					assert_ok!(Balances::transfer_keep_alive(Some(1).into(), 2, 100));
+					assert_eq!(Balances::total_balance(&1), 100);
+					assert_eq!(Balances::total_balance(&2), 100);
+				});
+		}
 	}
 }

From fd88fbf7e05b3bea3e8324e2661c586353b48a43 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Mon, 22 Feb 2021 12:33:35 +0100
Subject: [PATCH 0416/1194] Migrate examples to use pallet macro (#8138)

---
 frame/balances/src/weights.rs            |   2 +-
 frame/benchmarking/src/lib.rs            |   2 +-
 frame/example-offchain-worker/src/lib.rs | 355 ++++++++++++-----------
 frame/example-parallel/src/lib.rs        | 120 ++++----
 frame/example-parallel/src/tests.rs      |   3 +-
 frame/example/src/lib.rs                 | 325 ++++++++++++---------
 frame/support/src/lib.rs                 |   6 +-
 frame/system/src/weights.rs              |   3 +-
 8 files changed, 433 insertions(+), 383 deletions(-)

diff --git a/frame/balances/src/weights.rs b/frame/balances/src/weights.rs
index 2b69c9c11d59..463ac7dd35c0 100644
--- a/frame/balances/src/weights.rs
+++ b/frame/balances/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_balances
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2021-01-06, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2021-01-06, STEPS: \[50, \], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
index e5a8bb51a27d..94803b88b93f 100644
--- a/frame/benchmarking/src/lib.rs
+++ b/frame/benchmarking/src/lib.rs
@@ -930,7 +930,7 @@ macro_rules! impl_benchmark_test {
 
 /// This creates a test suite which runs the module's benchmarks.
 ///
-/// When called in [`pallet_example`] as
+/// When called in `pallet_example` as
 ///
 /// ```rust,ignore
 /// impl_benchmark_test_suite!(Module, crate::tests::new_test_ext(), crate::tests::Test);
diff --git a/frame/example-offchain-worker/src/lib.rs b/frame/example-offchain-worker/src/lib.rs
index dbcf7b10f4ab..0c5e92a96e6a 100644
--- a/frame/example-offchain-worker/src/lib.rs
+++ b/frame/example-offchain-worker/src/lib.rs
@@ -16,7 +16,7 @@
 // limitations under the License.
 
 //! <!-- markdown-link-check-disable -->
-//! # Offchain Worker Example Module
+//! # Offchain Worker Example Pallet
 //!
 //! The Offchain Worker Example: A simple pallet demonstrating
 //! concepts, APIs and structures common to most offchain workers.
@@ -24,9 +24,9 @@
 //! Run `cargo doc --package pallet-example-offchain-worker --open` to view this module's
 //! documentation.
 //!
-//! - [`pallet_example_offchain_worker::Config`](./trait.Config.html)
-//! - [`Call`](./enum.Call.html)
-//! - [`Module`](./struct.Module.html)
+//! - [`Config`]
+//! - [`Call`]
+//! - [`Pallet`]
 //!
 //!
 //! ## Overview
@@ -44,27 +44,18 @@
 
 use frame_system::{
 	self as system,
-	ensure_signed,
-	ensure_none,
 	offchain::{
 		AppCrypto, CreateSignedTransaction, SendUnsignedTransaction, SendSignedTransaction,
 		SignedPayload, SigningTypes, Signer, SubmitTransaction,
 	}
 };
-use frame_support::{
-	debug,
-	dispatch::DispatchResult, decl_module, decl_storage, decl_event,
-	traits::Get,
-};
+use frame_support::{debug, traits::Get};
 use sp_core::crypto::KeyTypeId;
 use sp_runtime::{
 	RuntimeDebug,
 	offchain::{http, Duration, storage::StorageValueRef},
 	traits::Zero,
-	transaction_validity::{
-		InvalidTransaction, ValidTransaction, TransactionValidity, TransactionSource,
-		TransactionPriority,
-	},
+	transaction_validity::{InvalidTransaction, ValidTransaction, TransactionValidity},
 };
 use codec::{Encode, Decode};
 use sp_std::vec::Vec;
@@ -102,81 +93,109 @@ pub mod crypto {
 	}
 }
 
-/// This pallet's configuration trait
-pub trait Config: CreateSignedTransaction<Call<Self>> {
-	/// The identifier type for an offchain worker.
-	type AuthorityId: AppCrypto<Self::Public, Self::Signature>;
+pub use pallet::*;
 
-	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
-	/// The overarching dispatch call type.
-	type Call: From<Call<Self>>;
+#[frame_support::pallet]
+pub mod pallet {
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+	use super::*;
 
-	// Configuration parameters
+	/// This pallet's configuration trait
+	#[pallet::config]
+	pub trait Config: CreateSignedTransaction<Call<Self>> + frame_system::Config {
+		/// The identifier type for an offchain worker.
+		type AuthorityId: AppCrypto<Self::Public, Self::Signature>;
 
-	/// A grace period after we send transaction.
-	///
-	/// To avoid sending too many transactions, we only attempt to send one
-	/// every `GRACE_PERIOD` blocks. We use Local Storage to coordinate
-	/// sending between distinct runs of this offchain worker.
-	type GracePeriod: Get<Self::BlockNumber>;
+		/// The overarching event type.
+		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
 
-	/// Number of blocks of cooldown after unsigned transaction is included.
-	///
-	/// This ensures that we only accept unsigned transactions once, every `UnsignedInterval` blocks.
-	type UnsignedInterval: Get<Self::BlockNumber>;
+		/// The overarching dispatch call type.
+		type Call: From<Call<Self>>;
 
-	/// A configuration for base priority of unsigned transactions.
-	///
-	/// This is exposed so that it can be tuned for particular runtime, when
-	/// multiple pallets send unsigned transactions.
-	type UnsignedPriority: Get<TransactionPriority>;
-}
+		// Configuration parameters
 
-/// Payload used by this example crate to hold price
-/// data required to submit a transaction.
-#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug)]
-pub struct PricePayload<Public, BlockNumber> {
-	block_number: BlockNumber,
-	price: u32,
-	public: Public,
-}
-
-impl<T: SigningTypes> SignedPayload<T> for PricePayload<T::Public, T::BlockNumber> {
-	fn public(&self) -> T::Public {
-		self.public.clone()
-	}
-}
+		/// A grace period after we send transaction.
+		///
+		/// To avoid sending too many transactions, we only attempt to send one
+		/// every `GRACE_PERIOD` blocks. We use Local Storage to coordinate
+		/// sending between distinct runs of this offchain worker.
+		#[pallet::constant]
+		type GracePeriod: Get<Self::BlockNumber>;
 
-decl_storage! {
-	trait Store for Module<T: Config> as ExampleOffchainWorker {
-		/// A vector of recently submitted prices.
+		/// Number of blocks of cooldown after unsigned transaction is included.
 		///
-		/// This is used to calculate average price, should have bounded size.
-		Prices get(fn prices): Vec<u32>;
-		/// Defines the block when next unsigned transaction will be accepted.
+		/// This ensures that we only accept unsigned transactions once, every `UnsignedInterval` blocks.
+		#[pallet::constant]
+		type UnsignedInterval: Get<Self::BlockNumber>;
+
+		/// A configuration for base priority of unsigned transactions.
 		///
-		/// To prevent spam of unsigned (and unpayed!) transactions on the network,
-		/// we only allow one transaction every `T::UnsignedInterval` blocks.
-		/// This storage entry defines when new transaction is going to be accepted.
-		NextUnsignedAt get(fn next_unsigned_at): T::BlockNumber;
+		/// This is exposed so that it can be tuned for particular runtime, when
+		/// multiple pallets send unsigned transactions.
+		#[pallet::constant]
+		type UnsignedPriority: Get<TransactionPriority>;
 	}
-}
 
-decl_event!(
-	/// Events generated by the module.
-	pub enum Event<T> where AccountId = <T as frame_system::Config>::AccountId {
-		/// Event generated when new price is accepted to contribute to the average.
-		/// \[price, who\]
-		NewPrice(u32, AccountId),
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(_);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+		/// Offchain Worker entry point.
+		///
+		/// By implementing `fn offchain_worker` you declare a new offchain worker.
+		/// This function will be called when the node is fully synced and a new best block is
+		/// succesfuly imported.
+		/// Note that it's not guaranteed for offchain workers to run on EVERY block, there might
+		/// be cases where some blocks are skipped, or for some the worker runs twice (re-orgs),
+		/// so the code should be able to handle that.
+		/// You can use `Local Storage` API to coordinate runs of the worker.
+		fn offchain_worker(block_number: T::BlockNumber) {
+			// It's a good idea to add logs to your offchain workers.
+			// Using the `frame_support::debug` module you have access to the same API exposed by
+			// the `log` crate.
+			// Note that having logs compiled to WASM may cause the size of the blob to increase
+			// significantly. You can use `RuntimeDebug` custom derive to hide details of the types
+			// in WASM or use `debug::native` namespace to produce logs only when the worker is
+			// running natively.
+			debug::native::info!("Hello World from offchain workers!");
+
+			// Since off-chain workers are just part of the runtime code, they have direct access
+			// to the storage and other included pallets.
+			//
+			// We can easily import `frame_system` and retrieve a block hash of the parent block.
+			let parent_hash = <system::Pallet<T>>::block_hash(block_number - 1u32.into());
+			debug::debug!("Current block: {:?} (parent hash: {:?})", block_number, parent_hash);
+
+			// It's a good practice to keep `fn offchain_worker()` function minimal, and move most
+			// of the code to separate `impl` block.
+			// Here we call a helper function to calculate current average price.
+			// This function reads storage entries of the current state.
+			let average: Option<u32> = Self::average_price();
+			debug::debug!("Current price: {:?}", average);
+
+			// For this example we are going to send both signed and unsigned transactions
+			// depending on the block number.
+			// Usually it's enough to choose one or the other.
+			let should_send = Self::choose_transaction_type(block_number);
+			let res = match should_send {
+				TransactionType::Signed => Self::fetch_price_and_send_signed(),
+				TransactionType::UnsignedForAny => Self::fetch_price_and_send_unsigned_for_any_account(block_number),
+				TransactionType::UnsignedForAll => Self::fetch_price_and_send_unsigned_for_all_accounts(block_number),
+				TransactionType::Raw => Self::fetch_price_and_send_raw_unsigned(block_number),
+				TransactionType::None => Ok(()),
+			};
+			if let Err(e) = res {
+				debug::error!("Error: {}", e);
+			}
+		}
 	}
-);
 
-decl_module! {
 	/// A public part of the pallet.
-	pub struct Module<T: Config> for enum Call where origin: T::Origin {
-		fn deposit_event() = default;
-
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
 		/// Submit new price to the list.
 		///
 		/// This method is a public function of the module and can be called from within
@@ -191,13 +210,13 @@ decl_module! {
 		/// working and receives (and provides) meaningful data.
 		/// This example is not focused on correctness of the oracle itself, but rather its
 		/// purpose is to showcase offchain worker capabilities.
-		#[weight = 0]
-		pub fn submit_price(origin, price: u32) -> DispatchResult {
+		#[pallet::weight(0)]
+		pub fn submit_price(origin: OriginFor<T>, price: u32) -> DispatchResultWithPostInfo {
 			// Retrieve sender of the transaction.
 			let who = ensure_signed(origin)?;
 			// Add the price to the on-chain list.
 			Self::add_price(who, price);
-			Ok(())
+			Ok(().into())
 		}
 
 		/// Submit new price to the list via unsigned transaction.
@@ -216,86 +235,108 @@ decl_module! {
 		///
 		/// This example is not focused on correctness of the oracle itself, but rather its
 		/// purpose is to showcase offchain worker capabilities.
-		#[weight = 0]
-		pub fn submit_price_unsigned(origin, _block_number: T::BlockNumber, price: u32)
-			-> DispatchResult
-		{
+		#[pallet::weight(0)]
+		pub fn submit_price_unsigned(
+			origin: OriginFor<T>,
+			_block_number: T::BlockNumber,
+			price: u32
+		) -> DispatchResultWithPostInfo {
 			// This ensures that the function can only be called via unsigned transaction.
 			ensure_none(origin)?;
 			// Add the price to the on-chain list, but mark it as coming from an empty address.
 			Self::add_price(Default::default(), price);
 			// now increment the block number at which we expect next unsigned transaction.
-			let current_block = <system::Module<T>>::block_number();
+			let current_block = <system::Pallet<T>>::block_number();
 			<NextUnsignedAt<T>>::put(current_block + T::UnsignedInterval::get());
-			Ok(())
+			Ok(().into())
 		}
 
-		#[weight = 0]
+		#[pallet::weight(0)]
 		pub fn submit_price_unsigned_with_signed_payload(
-			origin,
+			origin: OriginFor<T>,
 			price_payload: PricePayload<T::Public, T::BlockNumber>,
 			_signature: T::Signature,
-		) -> DispatchResult {
+		) -> DispatchResultWithPostInfo {
 			// This ensures that the function can only be called via unsigned transaction.
 			ensure_none(origin)?;
 			// Add the price to the on-chain list, but mark it as coming from an empty address.
 			Self::add_price(Default::default(), price_payload.price);
 			// now increment the block number at which we expect next unsigned transaction.
-			let current_block = <system::Module<T>>::block_number();
+			let current_block = <system::Pallet<T>>::block_number();
 			<NextUnsignedAt<T>>::put(current_block + T::UnsignedInterval::get());
-			Ok(())
+			Ok(().into())
 		}
+	}
 
-		/// Offchain Worker entry point.
-		///
-		/// By implementing `fn offchain_worker` within `decl_module!` you declare a new offchain
-		/// worker.
-		/// This function will be called when the node is fully synced and a new best block is
-		/// succesfuly imported.
-		/// Note that it's not guaranteed for offchain workers to run on EVERY block, there might
-		/// be cases where some blocks are skipped, or for some the worker runs twice (re-orgs),
-		/// so the code should be able to handle that.
-		/// You can use `Local Storage` API to coordinate runs of the worker.
-		fn offchain_worker(block_number: T::BlockNumber) {
-			// It's a good idea to add logs to your offchain workers.
-			// Using the `frame_support::debug` module you have access to the same API exposed by
-			// the `log` crate.
-			// Note that having logs compiled to WASM may cause the size of the blob to increase
-			// significantly. You can use `RuntimeDebug` custom derive to hide details of the types
-			// in WASM or use `debug::native` namespace to produce logs only when the worker is
-			// running natively.
-			debug::native::info!("Hello World from offchain workers!");
-
-			// Since off-chain workers are just part of the runtime code, they have direct access
-			// to the storage and other included pallets.
-			//
-			// We can easily import `frame_system` and retrieve a block hash of the parent block.
-			let parent_hash = <system::Module<T>>::block_hash(block_number - 1u32.into());
-			debug::debug!("Current block: {:?} (parent hash: {:?})", block_number, parent_hash);
+	/// Events for the pallet.
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	pub enum Event<T: Config> {
+		/// Event generated when new price is accepted to contribute to the average.
+		/// \[price, who\]
+		NewPrice(u32, T::AccountId),
+	}
 
-			// It's a good practice to keep `fn offchain_worker()` function minimal, and move most
-			// of the code to separate `impl` block.
-			// Here we call a helper function to calculate current average price.
-			// This function reads storage entries of the current state.
-			let average: Option<u32> = Self::average_price();
-			debug::debug!("Current price: {:?}", average);
+	#[pallet::validate_unsigned]
+	impl<T: Config> ValidateUnsigned for Pallet<T> {
+		type Call = Call<T>;
 
-			// For this example we are going to send both signed and unsigned transactions
-			// depending on the block number.
-			// Usually it's enough to choose one or the other.
-			let should_send = Self::choose_transaction_type(block_number);
-			let res = match should_send {
-				TransactionType::Signed => Self::fetch_price_and_send_signed(),
-				TransactionType::UnsignedForAny => Self::fetch_price_and_send_unsigned_for_any_account(block_number),
-				TransactionType::UnsignedForAll => Self::fetch_price_and_send_unsigned_for_all_accounts(block_number),
-				TransactionType::Raw => Self::fetch_price_and_send_raw_unsigned(block_number),
-				TransactionType::None => Ok(()),
-			};
-			if let Err(e) = res {
-				debug::error!("Error: {}", e);
+		/// Validate unsigned call to this module.
+		///
+		/// By default unsigned transactions are disallowed, but implementing the validator
+		/// here we make sure that some particular calls (the ones produced by offchain worker)
+		/// are being whitelisted and marked as valid.
+		fn validate_unsigned(
+			_source: TransactionSource,
+			call: &Self::Call,
+		) -> TransactionValidity {
+			// Firstly let's check that we call the right function.
+			if let Call::submit_price_unsigned_with_signed_payload(
+				ref payload, ref signature
+			) = call {
+				let signature_valid = SignedPayload::<T>::verify::<T::AuthorityId>(payload, signature.clone());
+				if !signature_valid {
+					return InvalidTransaction::BadProof.into();
+				}
+				Self::validate_transaction_parameters(&payload.block_number, &payload.price)
+			} else if let Call::submit_price_unsigned(block_number, new_price) = call {
+				Self::validate_transaction_parameters(block_number, new_price)
+			} else {
+				InvalidTransaction::Call.into()
 			}
 		}
 	}
+
+	/// A vector of recently submitted prices.
+	///
+	/// This is used to calculate average price, should have bounded size.
+	#[pallet::storage]
+	#[pallet::getter(fn prices)]
+	pub(super) type Prices<T: Config> = StorageValue<_, Vec<u32>, ValueQuery>;
+
+	/// Defines the block when next unsigned transaction will be accepted.
+	///
+	/// To prevent spam of unsigned (and unpayed!) transactions on the network,
+	/// we only allow one transaction every `T::UnsignedInterval` blocks.
+	/// This storage entry defines when new transaction is going to be accepted.
+	#[pallet::storage]
+	#[pallet::getter(fn next_unsigned_at)]
+	pub(super) type NextUnsignedAt<T: Config> = StorageValue<_, T::BlockNumber, ValueQuery>;
+}
+
+/// Payload used by this example crate to hold price
+/// data required to submit a transaction.
+#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug)]
+pub struct PricePayload<Public, BlockNumber> {
+	block_number: BlockNumber,
+	price: u32,
+	public: Public,
+}
+
+impl<T: SigningTypes> SignedPayload<T> for PricePayload<T::Public, T::BlockNumber> {
+	fn public(&self) -> T::Public {
+		self.public.clone()
+	}
 }
 
 enum TransactionType {
@@ -306,11 +347,7 @@ enum TransactionType {
 	None,
 }
 
-/// Most of the functions are moved outside of the `decl_module!` macro.
-///
-/// This greatly helps with error messages, as the ones inside the macro
-/// can sometimes be hard to debug.
-impl<T: Config> Module<T> {
+impl<T: Config> Pallet<T> {
 	/// Chooses which transaction type to send.
 	///
 	/// This function serves mostly to showcase `StorageValue` helper
@@ -598,7 +635,7 @@ impl<T: Config> Module<T> {
 	/// Add new price to the list.
 	fn add_price(who: T::AccountId, price: u32) {
 		debug::info!("Adding to the average: {}", price);
-		Prices::mutate(|prices| {
+		<Prices<T>>::mutate(|prices| {
 			const MAX_LEN: usize = 64;
 
 			if prices.len() < MAX_LEN {
@@ -612,12 +649,12 @@ impl<T: Config> Module<T> {
 			.expect("The average is not empty, because it was just mutated; qed");
 		debug::info!("Current average price is: {}", average);
 		// here we are raising the NewPrice event
-		Self::deposit_event(RawEvent::NewPrice(price, who));
+		Self::deposit_event(Event::NewPrice(price, who));
 	}
 
 	/// Calculate current average price.
 	fn average_price() -> Option<u32> {
-		let prices = Prices::get();
+		let prices = <Prices<T>>::get();
 		if prices.is_empty() {
 			None
 		} else {
@@ -635,7 +672,7 @@ impl<T: Config> Module<T> {
 			return InvalidTransaction::Stale.into();
 		}
 		// Let's make sure to reject transactions from the future.
-		let current_block = <system::Module<T>>::block_number();
+		let current_block = <system::Pallet<T>>::block_number();
 		if &current_block < block_number {
 			return InvalidTransaction::Future.into();
 		}
@@ -677,33 +714,3 @@ impl<T: Config> Module<T> {
 			.build()
 	}
 }
-
-#[allow(deprecated)] // ValidateUnsigned
-impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
-	type Call = Call<T>;
-
-	/// Validate unsigned call to this module.
-	///
-	/// By default unsigned transactions are disallowed, but implementing the validator
-	/// here we make sure that some particular calls (the ones produced by offchain worker)
-	/// are being whitelisted and marked as valid.
-	fn validate_unsigned(
-		_source: TransactionSource,
-		call: &Self::Call,
-	) -> TransactionValidity {
-		// Firstly let's check that we call the right function.
-		if let Call::submit_price_unsigned_with_signed_payload(
-			ref payload, ref signature
-		) = call {
-			let signature_valid = SignedPayload::<T>::verify::<T::AuthorityId>(payload, signature.clone());
-			if !signature_valid {
-				return InvalidTransaction::BadProof.into();
-			}
-			Self::validate_transaction_parameters(&payload.block_number, &payload.price)
-		} else if let Call::submit_price_unsigned(block_number, new_price) = call {
-			Self::validate_transaction_parameters(block_number, new_price)
-		} else {
-			InvalidTransaction::Call.into()
-		}
-	}
-}
diff --git a/frame/example-parallel/src/lib.rs b/frame/example-parallel/src/lib.rs
index c83a722be127..e777100c6f54 100644
--- a/frame/example-parallel/src/lib.rs
+++ b/frame/example-parallel/src/lib.rs
@@ -22,10 +22,6 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use frame_system::ensure_signed;
-use frame_support::{
-	dispatch::DispatchResult, decl_module, decl_storage, decl_event,
-};
 use sp_runtime::RuntimeDebug;
 
 use codec::{Encode, Decode};
@@ -34,33 +30,71 @@ use sp_std::vec::Vec;
 #[cfg(test)]
 mod tests;
 
-pub trait Config: frame_system::Config {
-	/// The overarching event type.
-	type Event: From<Event> + Into<<Self as frame_system::Config>::Event>;
-	/// The overarching dispatch call type.
-	type Call: From<Call<Self>>;
-}
+pub use pallet::*;
 
-decl_storage! {
-	trait Store for Module<T: Config> as ExampleOffchainWorker {
-		/// A vector of current participants
-		///
-		/// To enlist someone to participate, signed payload should be
-		/// sent to `enlist`.
-		Participants get(fn participants): Vec<Vec<u8>>;
+#[frame_support::pallet]
+pub mod pallet {
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+	use super::*;
 
-		/// Current event id to enlist participants to.
-		CurrentEventId get(fn get_current_event_id): Vec<u8>;
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		/// The overarching dispatch call type.
+		type Call: From<Call<Self>>;
 	}
-}
 
-decl_event!(
-	/// Events generated by the module.
-	pub enum Event {
-		/// When new event is drafted.
-		NewEventDrafted(Vec<u8>),
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(_);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	/// A public part of the pallet.
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		/// Get the new event running.
+		#[pallet::weight(0)]
+		pub fn run_event(origin: OriginFor<T>, id: Vec<u8>) -> DispatchResultWithPostInfo {
+			let _ = ensure_signed(origin)?;
+			<Participants<T>>::kill();
+			<CurrentEventId<T>>::mutate(move |event_id| *event_id = id);
+			Ok(().into())
+		}
+
+		/// Submit list of participants to the current event.
+		///
+		/// The example utilizes parallel execution by checking half of the
+		/// signatures in spawned task.
+		#[pallet::weight(0)]
+		pub fn enlist_participants(origin: OriginFor<T>, participants: Vec<EnlistedParticipant>)
+			-> DispatchResultWithPostInfo
+		{
+			let _ = ensure_signed(origin)?;
+
+			if validate_participants_parallel(&<CurrentEventId<T>>::get(), &participants[..]) {
+				for participant in participants {
+					<Participants<T>>::append(participant.account);
+				}
+			}
+			Ok(().into())
+		}
 	}
-);
+
+	/// A vector of current participants
+	///
+	/// To enlist someone to participate, signed payload should be
+	/// sent to `enlist`.
+	#[pallet::storage]
+	#[pallet::getter(fn participants)]
+	pub(super) type Participants<T: Config> = StorageValue<_, Vec<Vec<u8>>, ValueQuery>;
+
+	/// Current event id to enlist participants to.
+	#[pallet::storage]
+	#[pallet::getter(fn get_current_event_id)]
+	pub(super) type CurrentEventId<T: Config> = StorageValue<_, Vec<u8>, ValueQuery>;
+}
 
 /// Request to enlist participant.
 #[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug)]
@@ -85,40 +119,6 @@ impl EnlistedParticipant {
 	}
 }
 
-decl_module! {
-	/// A public part of the pallet.
-	pub struct Module<T: Config> for enum Call where origin: T::Origin {
-		fn deposit_event() = default;
-
-		/// Get the new event running.
-		#[weight = 0]
-		pub fn run_event(origin, id: Vec<u8>) -> DispatchResult {
-			let _ = ensure_signed(origin)?;
-			Participants::kill();
-			CurrentEventId::mutate(move |event_id| *event_id = id);
-			Ok(())
-		}
-
-		/// Submit list of participants to the current event.
-		///
-		/// The example utilizes parallel execution by checking half of the
-		/// signatures in spawned task.
-		#[weight = 0]
-		pub fn enlist_participants(origin, participants: Vec<EnlistedParticipant>)
-			-> DispatchResult
-		{
-			let _ = ensure_signed(origin)?;
-
-			if validate_participants_parallel(&CurrentEventId::get(), &participants[..]) {
-				for participant in participants {
-					Participants::append(participant.account);
-				}
-			}
-			Ok(())
-		}
-	}
-}
-
 fn validate_participants_parallel(event_id: &[u8], participants: &[EnlistedParticipant]) -> bool {
 
 	fn spawn_verify(data: Vec<u8>) -> Vec<u8> {
diff --git a/frame/example-parallel/src/tests.rs b/frame/example-parallel/src/tests.rs
index 9c921e0ddfa8..da2892c67d42 100644
--- a/frame/example-parallel/src/tests.rs
+++ b/frame/example-parallel/src/tests.rs
@@ -34,7 +34,7 @@ frame_support::construct_runtime!(
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
 		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Example: pallet_example_parallel::{Module, Call, Storage, Event},
+		Example: pallet_example_parallel::{Module, Call, Storage},
 	}
 );
 
@@ -75,7 +75,6 @@ parameter_types! {
 }
 
 impl Config for Test {
-	type Event = Event;
 	type Call = Call;
 }
 
diff --git a/frame/example/src/lib.rs b/frame/example/src/lib.rs
index 763ec504ebc1..b4ae35c5508a 100644
--- a/frame/example/src/lib.rs
+++ b/frame/example/src/lib.rs
@@ -63,9 +63,9 @@
 //! // Include the following links that shows what trait needs to be implemented to use the pallet
 //! // and the supported dispatchables that are documented in the Call enum.
 //!
-//! - \[`<INSERT_CUSTOM_PALLET_NAME>::Config`](./trait.Config.html)
-//! - \[`Call`](./enum.Call.html)
-//! - \[`Module`](./struct.Module.html)
+//! - \[`Config`]
+//! - \[`Call`]
+//! - \[`Pallet`]
 //!
 //! \## Overview
 //!
@@ -257,11 +257,11 @@
 
 use sp_std::marker::PhantomData;
 use frame_support::{
-	dispatch::DispatchResult, decl_module, decl_storage, decl_event, traits::IsSubType,
+	dispatch::DispatchResult, traits::IsSubType,
 	weights::{DispatchClass, ClassifyDispatch, WeighData, Weight, PaysFee, Pays},
 };
 use sp_std::prelude::*;
-use frame_system::{ensure_signed, ensure_root};
+use frame_system::{ensure_signed};
 use codec::{Encode, Decode};
 use sp_runtime::{
 	traits::{
@@ -278,7 +278,7 @@ use sp_runtime::{
 // The `WeightData<T>` trait has access to the arguments of the dispatch that it wants to assign a
 // weight to. Nonetheless, the trait itself can not make any assumptions about what the generic type
 // of the arguments (`T`) is. Based on our needs, we could replace `T` with a more concrete type
-// while implementing the trait. The `decl_module!` expects whatever implements `WeighData<T>` to
+// while implementing the trait. The `pallet::weight` expects whatever implements `WeighData<T>` to
 // replace `T` with a tuple of the dispatch arguments. This is exactly how we will craft the
 // implementation below.
 //
@@ -315,111 +315,97 @@ impl<T: pallet_balances::Config> PaysFee<(&BalanceOf<T>,)> for WeightForSetDummy
 /// A type alias for the balance type from this pallet's point of view.
 type BalanceOf<T> = <T as pallet_balances::Config>::Balance;
 
-/// Our pallet's configuration trait. All our types and constants go in here. If the
-/// pallet is dependent on specific other pallets, then their configuration traits
-/// should be added to our implied traits list.
-///
-/// `frame_system::Config` should always be included in our implied traits.
-pub trait Config: pallet_balances::Config {
-	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
-}
+// Re-export pallet items so that they can be accessed from the crate namespace.
+pub use pallet::*;
 
-decl_storage! {
-	// A macro for the Storage trait, and its implementation, for this pallet.
-	// This allows for type-safe usage of the Substrate storage database, so you can
-	// keep things around between blocks.
-	//
-	// It is important to update your storage name so that your pallet's
-	// storage items are isolated from other pallets.
-	// ---------------------------------vvvvvvv
-	trait Store for Module<T: Config> as Example {
-		// Any storage declarations of the form:
-		//   `pub? Name get(fn getter_name)? [config()|config(myname)] [build(|_| {...})] : <type> (= <new_default_value>)?;`
-		// where `<type>` is either:
-		//   - `Type` (a basic value item); or
-		//   - `map hasher(HasherKind) KeyType => ValueType` (a map item).
-		//
-		// Note that there are two optional modifiers for the storage type declaration.
-		// - `Foo: Option<u32>`:
-		//   - `Foo::put(1); Foo::get()` returns `Some(1)`;
-		//   - `Foo::kill(); Foo::get()` returns `None`.
-		// - `Foo: u32`:
-		//   - `Foo::put(1); Foo::get()` returns `1`;
-		//   - `Foo::kill(); Foo::get()` returns `0` (u32::default()).
-		// e.g. Foo: u32;
-		// e.g. pub Bar get(fn bar): map hasher(blake2_128_concat) T::AccountId => Vec<(T::Balance, u64)>;
-		//
-		// For basic value items, you'll get a type which implements
-		// `frame_support::StorageValue`. For map items, you'll get a type which
-		// implements `frame_support::StorageMap`.
+// Definition of the pallet logic, to be aggregated at runtime definition through
+// `construct_runtime`.
+#[frame_support::pallet]
+pub mod pallet {
+	// Import various types used to declare pallet in scope.
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+	use super::*;
+
+	/// Our pallet's configuration trait. All our types and constants go in here. If the
+	/// pallet is dependent on specific other pallets, then their configuration traits
+	/// should be added to our implied traits list.
+	///
+	/// `frame_system::Config` should always be included.
+	#[pallet::config]
+	pub trait Config: pallet_balances::Config + frame_system::Config {
+		/// The overarching event type.
+		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
+	}
+
+	// Simple declaration of the `Pallet` type. It is placeholder we use to implement traits and
+	// method.
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(_);
+
+	// Pallet implements [`Hooks`] trait to define some logic to execute in some context.
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+		// `on_initialize` is executed at the beginning of the block before any extrinsic are
+		// dispatched.
 		//
-		// If they have a getter (`get(getter_name)`), then your pallet will come
-		// equipped with `fn getter_name() -> Type` for basic value items or
-		// `fn getter_name(key: KeyType) -> ValueType` for map items.
-		Dummy get(fn dummy) config(): Option<T::Balance>;
+		// This function must return the weight consumed by `on_initialize` and `on_finalize`.
+		fn on_initialize(_n: T::BlockNumber) -> Weight {
+			// Anything that needs to be done at the start of the block.
+			// We don't do anything here.
 
-		// A map that has enumerable entries.
-		Bar get(fn bar) config(): map hasher(blake2_128_concat) T::AccountId => T::Balance;
+			0
+		}
 
-		// this one uses the default, we'll demonstrate the usage of 'mutate' API.
-		Foo get(fn foo) config(): T::Balance;
-	}
-}
+		// `on_finalize` is executed at the end of block after all extrinsic are dispatched.
+		fn on_finalize(_n: T::BlockNumber) {
+			// We just kill our dummy storage item.
+			<Dummy<T>>::kill();
+		}
 
-decl_event!(
-	/// Events are a simple means of reporting specific conditions and
-	/// circumstances that have happened that users, Dapps and/or chain explorers would find
-	/// interesting and otherwise difficult to detect.
-	pub enum Event<T> where B = <T as pallet_balances::Config>::Balance {
-		// Just a normal `enum`, here's a dummy event to ensure it compiles.
-		/// Dummy event, just here so there's a generic type that's used.
-		Dummy(B),
+		// A runtime code run after every block and have access to extended set of APIs.
+		//
+		// For instance you can generate extrinsics for the upcoming produced block.
+		fn offchain_worker(_n: T::BlockNumber) {
+			// We don't do anything here.
+			// but we could dispatch extrinsic (transaction/unsigned/inherent) using
+			// sp_io::submit_extrinsic
+		}
 	}
-);
 
-// The module declaration. This states the entry points that we handle. The
-// macro takes care of the marshalling of arguments and dispatch.
-//
-// Anyone can have these functions execute by signing and submitting
-// an extrinsic. Ensure that calls into each of these execute in a time, memory and
-// using storage space proportional to any costs paid for by the caller or otherwise the
-// difficulty of forcing the call to happen.
-//
-// Generally you'll want to split these into three groups:
-// - Public calls that are signed by an external account.
-// - Root calls that are allowed to be made only by the governance system.
-// - Unsigned calls that can be of two kinds:
-//   * "Inherent extrinsics" that are opinions generally held by the block
-//     authors that build child blocks.
-//   * Unsigned Transactions that are of intrinsic recognizable utility to the
-//     network, and are validated by the runtime.
-//
-// Information about where this dispatch initiated from is provided as the first argument
-// "origin". As such functions must always look like:
-//
-// `fn foo(origin, bar: Bar, baz: Baz) -> Result;`
-//
-// The `Result` is required as part of the syntax (and expands to the conventional dispatch
-// result of `Result<(), &'static str>`).
-//
-// When you come to `impl` them later in the pallet, you must specify the full type for `origin`:
-//
-// `fn foo(origin: T::Origin, bar: Bar, baz: Baz) { ... }`
-//
-// There are three entries in the `frame_system::Origin` enum that correspond
-// to the above bullets: `::Signed(AccountId)`, `::Root` and `::None`. You should always match
-// against them as the first thing you do in your function. There are three convenience calls
-// in system that do the matching for you and return a convenient result: `ensure_signed`,
-// `ensure_root` and `ensure_none`.
-decl_module! {
-	// Simple declaration of the `Module` type. Lets the macro know what its working on.
-	pub struct Module<T: Config> for enum Call where origin: T::Origin {
-		/// Deposit one of this pallet's events by using the default implementation.
-		/// It is also possible to provide a custom implementation.
-		/// For non-generic events, the generic parameter just needs to be dropped, so that it
-		/// looks like: `fn deposit_event() = default;`.
-		fn deposit_event() = default;
+	// The call declaration. This states the entry points that we handle. The
+	// macro takes care of the marshalling of arguments and dispatch.
+	//
+	// Anyone can have these functions execute by signing and submitting
+	// an extrinsic. Ensure that calls into each of these execute in a time, memory and
+	// using storage space proportional to any costs paid for by the caller or otherwise the
+	// difficulty of forcing the call to happen.
+	//
+	// Generally you'll want to split these into three groups:
+	// - Public calls that are signed by an external account.
+	// - Root calls that are allowed to be made only by the governance system.
+	// - Unsigned calls that can be of two kinds:
+	//   * "Inherent extrinsics" that are opinions generally held by the block
+	//     authors that build child blocks.
+	//   * Unsigned Transactions that are of intrinsic recognizable utility to the
+	//     network, and are validated by the runtime.
+	//
+	// Information about where this dispatch initiated from is provided as the first argument
+	// "origin". As such functions must always look like:
+	//
+	// `fn foo(origin: OriginFor<T>, bar: Bar, baz: Baz) -> DispatchResultWithPostInfo { ... }`
+	//
+	// The `DispatchResultWithPostInfo` is required as part of the syntax (and can be found at
+	// `pallet_prelude::DispatchResultWithPostInfo`).
+	//
+	// There are three entries in the `frame_system::Origin` enum that correspond
+	// to the above bullets: `::Signed(AccountId)`, `::Root` and `::None`. You should always match
+	// against them as the first thing you do in your function. There are three convenience calls
+	// in system that do the matching for you and return a convenient result: `ensure_signed`,
+	// `ensure_root` and `ensure_none`.
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
 		/// This is your public interface. Be extremely careful.
 		/// This is just a simple example of how to interact with the pallet from the external
 		/// world.
@@ -458,18 +444,22 @@ decl_module! {
 		//
 		// If you don't respect these rules, it is likely that your chain will be attackable.
 		//
-		// Each transaction can define an optional `#[weight]` attribute to convey a set of static
+		// Each transaction must define a `#[pallet::weight(..)]` attribute to convey a set of static
 		// information about its dispatch. FRAME System and FRAME Executive pallet then use this
 		// information to properly execute the transaction, whilst keeping the total load of the
 		// chain in a moderate rate.
 		//
-		// The _right-hand-side_ value of the `#[weight]` attribute can be any type that implements
-		// a set of traits, namely [`WeighData`] and [`ClassifyDispatch`]. The former conveys the
-		// weight (a numeric representation of pure execution time and difficulty) of the
-		// transaction and the latter demonstrates the [`DispatchClass`] of the call. A higher
-		// weight means a larger transaction (less of which can be placed in a single block).
-		#[weight = 0]
-		fn accumulate_dummy(origin, increase_by: T::Balance) -> DispatchResult {
+		// The parenthesized value of the `#[pallet::weight(..)]` attribute can be any type that
+		// implements a set of traits, namely [`WeighData`] and [`ClassifyDispatch`].
+		// The former conveys the weight (a numeric representation of pure execution time and
+		// difficulty) of the transaction and the latter demonstrates the [`DispatchClass`] of the
+		// call. A higher weight means a larger transaction (less of which can be placed in a
+		// single block).
+		#[pallet::weight(0)]
+		pub(super) fn accumulate_dummy(
+			origin: OriginFor<T>,
+			increase_by: T::Balance
+		) -> DispatchResultWithPostInfo {
 			// This is a public call, so we ensure that the origin is some signed account.
 			let _sender = ensure_signed(origin)?;
 
@@ -493,10 +483,10 @@ decl_module! {
 			});
 
 			// Let's deposit an event to let the outside world know this happened.
-			Self::deposit_event(RawEvent::Dummy(increase_by));
+			Self::deposit_event(Event::Dummy(increase_by));
 
-			// All good.
-			Ok(())
+			// All good, no refund.
+			Ok(().into())
 		}
 
 		/// A privileged call; in this case it resets our dummy value to something new.
@@ -506,39 +496,92 @@ decl_module! {
 		// calls to be executed - we don't need to care why. Because it's privileged, we can
 		// assume it's a one-off operation and substantial processing/storage/memory can be used
 		// without worrying about gameability or attack scenarios.
-		// If you do not specify `Result` explicitly as return value, it will be added automatically
-		// for you and `Ok(())` will be returned.
-		#[weight = WeightForSetDummy::<T>(<BalanceOf<T>>::from(100u32))]
-		fn set_dummy(origin, #[compact] new_value: T::Balance) {
+		#[pallet::weight(WeightForSetDummy::<T>(<BalanceOf<T>>::from(100u32)))]
+		fn set_dummy(
+			origin: OriginFor<T>,
+			#[pallet::compact] new_value: T::Balance,
+		) -> DispatchResultWithPostInfo {
 			ensure_root(origin)?;
 			// Put the new value into storage.
 			<Dummy<T>>::put(new_value);
+
+			// All good, no refund.
+			Ok(().into())
 		}
+	}
 
-		// The signature could also look like: `fn on_initialize()`.
-		// This function could also very well have a weight annotation, similar to any other. The
-		// only difference is that it mut be returned, not annotated.
-		fn on_initialize(_n: T::BlockNumber) -> Weight {
-			// Anything that needs to be done at the start of the block.
-			// We don't do anything here.
+	/// Events are a simple means of reporting specific conditions and
+	/// circumstances that have happened that users, Dapps and/or chain explorers would find
+	/// interesting and otherwise difficult to detect.
+	#[pallet::event]
+	/// This attribute generate the function `deposit_event` to deposit one of this pallet event,
+	/// it is optional, it is also possible to provide a custom implementation.
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	pub enum Event<T: Config> {
+		// Just a normal `enum`, here's a dummy event to ensure it compiles.
+		/// Dummy event, just here so there's a generic type that's used.
+		Dummy(BalanceOf<T>),
+	}
 
-			0
-		}
+	// pallet::storage attributes allow for type-safe usage of the Substrate storage database,
+	// so you can keep things around between blocks.
+	//
+	// Any storage must be one of `StorageValue`, `StorageMap` or `StorageDoubleMap`.
+	// The first generic holds the prefix to use and is generated by the macro.
+	// The query kind is either `OptionQuery` (the default) or `ValueQuery`.
+	// - for `type Foo<T> = StorageValue<_, u32, OptionQuery>`:
+	//   - `Foo::put(1); Foo::get()` returns `Some(1)`;
+	//   - `Foo::kill(); Foo::get()` returns `None`.
+	// - for `type Foo<T> = StorageValue<_, u32, ValueQuery>`:
+	//   - `Foo::put(1); Foo::get()` returns `1`;
+	//   - `Foo::kill(); Foo::get()` returns `0` (u32::default()).
+	#[pallet::storage]
+	// The getter attribute generate a function on `Pallet` placeholder:
+	// `fn getter_name() -> Type` for basic value items or
+	// `fn getter_name(key: KeyType) -> ValueType` for map items.
+	#[pallet::getter(fn dummy)]
+	pub(super) type Dummy<T: Config> = StorageValue<_, T::Balance>;
+
+	// A map that has enumerable entries.
+	#[pallet::storage]
+	#[pallet::getter(fn bar)]
+	pub(super) type Bar<T: Config> = StorageMap<_, Blake2_128Concat, T::AccountId, T::Balance, ValueQuery>;
+
+	// this one uses the query kind: `ValueQuery`, we'll demonstrate the usage of 'mutate' API.
+	#[pallet::storage]
+	#[pallet::getter(fn foo)]
+	pub(super) type Foo<T: Config> = StorageValue<_, T::Balance, ValueQuery>;
+
+
+	// The genesis config type.
+	#[pallet::genesis_config]
+	pub struct GenesisConfig<T: Config> {
+		pub dummy: T::Balance,
+		pub bar: Vec<(T::AccountId, T::Balance)>,
+		pub foo: T::Balance,
+	}
 
-		// The signature could also look like: `fn on_finalize()`
-		fn on_finalize(_n: T::BlockNumber) {
-			// Anything that needs to be done at the end of the block.
-			// We just kill our dummy storage item.
-			<Dummy<T>>::kill();
+	// The default value for the genesis config type.
+	#[cfg(feature = "std")]
+	impl<T: Config> Default for GenesisConfig<T> {
+		fn default() -> Self {
+			Self {
+				dummy: Default::default(),
+				bar: Default::default(),
+				foo: Default::default(),
+			}
 		}
+	}
 
-		// A runtime code run after every block and have access to extended set of APIs.
-		//
-		// For instance you can generate extrinsics for the upcoming produced block.
-		fn offchain_worker(_n: T::BlockNumber) {
-			// We don't do anything here.
-			// but we could dispatch extrinsic (transaction/unsigned/inherent) using
-			// sp_io::submit_extrinsic
+	// The build of genesis for the pallet.
+	#[pallet::genesis_build]
+	impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+		fn build(&self) {
+			<Dummy<T>>::put(&self.dummy);
+			for (a, b) in &self.bar {
+				<Bar<T>>::insert(a, b);
+			}
+			<Foo<T>>::put(&self.foo);
 		}
 	}
 }
@@ -548,7 +591,7 @@ decl_module! {
 // - Public interface. These are functions that are `pub` and generally fall into inspector
 // functions that do not write to storage and operation functions that do.
 // - Private functions. These are your usual private utilities unavailable to other pallets.
-impl<T: Config> Module<T> {
+impl<T: Config> Pallet<T> {
 	// Add public immutables and private mutables.
 	#[allow(dead_code)]
 	fn accumulate_foo(origin: T::Origin, increase_by: T::Balance) -> DispatchResult {
@@ -684,7 +727,7 @@ mod benchmarking {
 		}
 	}
 
-	impl_benchmark_test_suite!(Module, crate::tests::new_test_ext(), crate::tests::Test);
+	impl_benchmark_test_suite!(Pallet, crate::tests::new_test_ext(), crate::tests::Test);
 }
 
 #[cfg(test)]
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index fc7939fe3010..e7af1ccab68f 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -2034,9 +2034,9 @@ pub mod pallet_prelude {
 /// 	* `add_extra_genesis` fields are converted to `GenesisConfig` field with their correct
 /// 		default if specified
 /// 	* `add_extra_genesis` build is written into `GenesisBuild::build`
-/// * storage items defined with [`pallet`] use the name of the pallet provided by [`PalletInfo::name`]
-/// 	as `pallet_prefix` (in `decl_storage`, storage items used the `pallet_prefix` given as input of
-/// 	`decl_storage` with the syntax `as Example`).
+/// * storage items defined with [`pallet`] use the name of the pallet provided by
+/// 	[`traits::PalletInfo::name`] as `pallet_prefix` (in `decl_storage`, storage items used the
+/// 	`pallet_prefix` given as input of `decl_storage` with the syntax `as Example`).
 /// 	Thus a runtime using the pallet must be careful with this change.
 /// 	To handle this change:
 /// 	* either ensure that the name of the pallet given to `construct_runtime!` is the same
diff --git a/frame/system/src/weights.rs b/frame/system/src/weights.rs
index f28e90b34c38..ae96659417bc 100644
--- a/frame/system/src/weights.rs
+++ b/frame/system/src/weights.rs
@@ -16,8 +16,9 @@
 // limitations under the License.
 
 //! Weights for frame_system
+//!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-28, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2020-10-28, STEPS: \[50, \], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:

From 59494855205374e8f27fb131425dfd78897a9298 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Mon, 22 Feb 2021 15:24:09 +0100
Subject: [PATCH 0417/1194] Make keystore return `None` when a key doesn't
 exist (#8163)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Make keystore return `None` when a key doesn't exist

* Fixes

* More fixes

* Update comment

* Update primitives/keystore/src/lib.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Update client/keystore/src/local.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Address comments

* Update client/keystore/src/local.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
---
 bin/node/cli/src/service.rs                   |   4 +-
 client/authority-discovery/src/worker.rs      |   6 +-
 .../authority-discovery/src/worker/tests.rs   |   6 +-
 client/consensus/aura/src/lib.rs              |   7 +-
 client/consensus/babe/src/authorship.rs       |   4 +-
 client/consensus/babe/src/lib.rs              |   3 +
 client/keystore/src/lib.rs                    |   4 -
 client/keystore/src/local.rs                  | 130 ++++++++++++------
 primitives/finality-grandpa/src/lib.rs        |   2 +-
 primitives/io/src/lib.rs                      |   9 +-
 primitives/keystore/src/lib.rs                |  69 +++++-----
 primitives/keystore/src/testing.rs            |  48 ++++---
 12 files changed, 174 insertions(+), 118 deletions(-)

diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index db4ed3f4f1dc..312a0226fc3d 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -625,9 +625,7 @@ mod tests {
 					sp_consensus_babe::AuthorityId::ID,
 					&alice.to_public_crypto_pair(),
 					&to_sign,
-				).unwrap()
-				 .try_into()
-				 .unwrap();
+				).unwrap().unwrap().try_into().unwrap();
 				let item = <DigestItem as CompatibleDigestItem>::babe_seal(
 					signature,
 				);
diff --git a/client/authority-discovery/src/worker.rs b/client/authority-discovery/src/worker.rs
index dac7a97746b7..b1fb89669bf2 100644
--- a/client/authority-discovery/src/worker.rs
+++ b/client/authority-discovery/src/worker.rs
@@ -296,10 +296,10 @@ where
 		for (sign_result, key) in signatures.into_iter().zip(keys) {
 			let mut signed_addresses = vec![];
 
-			// sign_with_all returns Result<Signature, Error> signature
-			// is generated for a public key that is supported.
 			// Verify that all signatures exist for all provided keys.
-			let signature = sign_result.map_err(|_| Error::MissingSignature(key.clone()))?;
+			let signature = sign_result.ok()
+				.flatten()
+				.ok_or_else(|| Error::MissingSignature(key.clone()))?;
 			schema::SignedAuthorityAddresses {
 				addresses: serialized_addresses.clone(),
 				signature,
diff --git a/client/authority-discovery/src/worker/tests.rs b/client/authority-discovery/src/worker/tests.rs
index a994e08691b5..04f597aa26b0 100644
--- a/client/authority-discovery/src/worker/tests.rs
+++ b/client/authority-discovery/src/worker/tests.rs
@@ -187,7 +187,7 @@ async fn build_dht_event(
 			serialized_addresses.as_slice(),
 		)
 		.await
-		.map_err(|_| Error::Signing)
+		.unwrap()
 		.unwrap();
 
 	let mut signed_addresses = vec![];
@@ -195,9 +195,7 @@ async fn build_dht_event(
 		addresses: serialized_addresses.clone(),
 		signature,
 	}
-	.encode(&mut signed_addresses)
-		.map_err(Error::EncodingProto)
-		.unwrap();
+	.encode(&mut signed_addresses).unwrap();
 
 	let key = hash_authority_id(&public_key.to_raw_vec());
 	let value = signed_addresses;
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index 0702ccd7f135..47ce364cb661 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -255,8 +255,8 @@ where
 		let expected_author = slot_author::<P>(slot, epoch_data);
 		expected_author.and_then(|p| {
 			if SyncCryptoStore::has_keys(
-				 &*self.keystore,
-				 &[(p.to_raw_vec(), sp_application_crypto::key_types::AURA)],
+				&*self.keystore,
+				&[(p.to_raw_vec(), sp_application_crypto::key_types::AURA)],
 			) {
 				Some(p.clone())
 			} else {
@@ -299,6 +299,9 @@ where
 				header_hash.as_ref()
 			).map_err(|e| sp_consensus::Error::CannotSign(
 				public.clone(), e.to_string(),
+			))?
+			.ok_or_else(|| sp_consensus::Error::CannotSign(
+				public.clone(), "Could not find key in keystore.".into(),
 			))?;
 			let signature = signature.clone().try_into()
 				.map_err(|_| sp_consensus::Error::InvalidSignature(
diff --git a/client/consensus/babe/src/authorship.rs b/client/consensus/babe/src/authorship.rs
index 1120f660613a..cf75a4a43f23 100644
--- a/client/consensus/babe/src/authorship.rs
+++ b/client/consensus/babe/src/authorship.rs
@@ -159,7 +159,7 @@ fn claim_secondary_slot(
 					authority_id.as_ref(),
 					transcript_data,
 				);
-				if let Ok(signature)  = result {
+				if let Ok(Some(signature)) = result {
 					Some(PreDigest::SecondaryVRF(SecondaryVRFPreDigest {
 						slot,
 						vrf_output: VRFOutput(signature.output),
@@ -265,7 +265,7 @@ fn claim_primary_slot(
 			authority_id.as_ref(),
 			transcript_data,
 		);
-		if let Ok(signature)  = result {
+		if let Ok(Some(signature)) = result {
 			let public = PublicKey::from_bytes(&authority_id.to_raw_vec()).ok()?;
 			let inout = match signature.output.attach_input_hash(&public, transcript) {
 				Ok(inout) => inout,
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index a6530dea08dc..a8e533d2a83d 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -649,6 +649,9 @@ where
 			)
 			.map_err(|e| sp_consensus::Error::CannotSign(
 				public.clone(), e.to_string(),
+			))?
+			.ok_or_else(|| sp_consensus::Error::CannotSign(
+				public.clone(), "Could not find key in keystore.".into(),
 			))?;
 			let signature: AuthoritySignature = signature.clone().try_into()
 				.map_err(|_| sp_consensus::Error::InvalidSignature(
diff --git a/client/keystore/src/lib.rs b/client/keystore/src/lib.rs
index 9cad56efacfd..38ab640d2e30 100644
--- a/client/keystore/src/lib.rs
+++ b/client/keystore/src/lib.rs
@@ -46,9 +46,6 @@ pub enum Error {
 	/// Public key type is not supported
 	#[display(fmt="Key crypto type is not supported")]
 	KeyNotSupported(KeyTypeId),
-	/// Pair not found for public key and KeyTypeId
-	#[display(fmt="Pair not found for {} public key", "_0")]
-	PairNotFound(String),
 	/// Keystore unavailable
 	#[display(fmt="Keystore unavailable")]
 	Unavailable,
@@ -61,7 +58,6 @@ impl From<Error> for TraitError {
 	fn from(error: Error) -> Self {
 		match error {
 			Error::KeyNotSupported(id) => TraitError::KeyNotSupported(id),
-			Error::PairNotFound(e) => TraitError::PairNotFound(e),
 			Error::InvalidSeed | Error::InvalidPhrase | Error::InvalidPassword => {
 				TraitError::ValidationError(error.to_string())
 			},
diff --git a/client/keystore/src/local.rs b/client/keystore/src/local.rs
index 866a50ae4c93..482ef407601d 100644
--- a/client/keystore/src/local.rs
+++ b/client/keystore/src/local.rs
@@ -60,9 +60,9 @@ impl LocalKeystore {
 
 	/// Get a key pair for the given public key.
 	///
-	/// This function is only available for a local keystore. If your application plans to work with
-	/// remote keystores, you do not want to depend on it.
-	pub fn key_pair<Pair: AppPair>(&self, public: &<Pair as AppKey>::Public) -> Result<Pair> {
+	/// Returns `Ok(None)` if the key doesn't exist, `Ok(Some(_))` if the key exists and
+	/// `Err(_)` when something failed.
+	pub fn key_pair<Pair: AppPair>(&self, public: &<Pair as AppKey>::Public) -> Result<Option<Pair>> {
 		self.0.read().key_pair::<Pair>(public)
 	}
 }
@@ -130,7 +130,7 @@ impl CryptoStore for LocalKeystore {
 		id: KeyTypeId,
 		key: &CryptoTypePublicPair,
 		msg: &[u8],
-	) -> std::result::Result<Vec<u8>, TraitError> {
+	) -> std::result::Result<Option<Vec<u8>>, TraitError> {
 		SyncCryptoStore::sign_with(self, id, key, msg)
 	}
 
@@ -139,7 +139,7 @@ impl CryptoStore for LocalKeystore {
 		key_type: KeyTypeId,
 		public: &sr25519::Public,
 		transcript_data: VRFTranscriptData,
-	) -> std::result::Result<VRFSignature, TraitError> {
+	) -> std::result::Result<Option<VRFSignature>, TraitError> {
 		SyncCryptoStore::sr25519_vrf_sign(self, key_type, public, transcript_data)
 	}
 }
@@ -175,28 +175,28 @@ impl SyncCryptoStore for LocalKeystore {
 		id: KeyTypeId,
 		key: &CryptoTypePublicPair,
 		msg: &[u8],
-	) -> std::result::Result<Vec<u8>, TraitError> {
+	) -> std::result::Result<Option<Vec<u8>>, TraitError> {
 		match key.0 {
 			ed25519::CRYPTO_ID => {
 				let pub_key = ed25519::Public::from_slice(key.1.as_slice());
-				let key_pair: ed25519::Pair = self.0.read()
+				let key_pair = self.0.read()
 					.key_pair_by_type::<ed25519::Pair>(&pub_key, id)
 					.map_err(|e| TraitError::from(e))?;
-				Ok(key_pair.sign(msg).encode())
+				key_pair.map(|k| k.sign(msg).encode()).map(Ok).transpose()
 			}
 			sr25519::CRYPTO_ID => {
 				let pub_key = sr25519::Public::from_slice(key.1.as_slice());
-				let key_pair: sr25519::Pair = self.0.read()
+				let key_pair = self.0.read()
 					.key_pair_by_type::<sr25519::Pair>(&pub_key, id)
 					.map_err(|e| TraitError::from(e))?;
-				Ok(key_pair.sign(msg).encode())
+				key_pair.map(|k| k.sign(msg).encode()).map(Ok).transpose()
 			},
 			ecdsa::CRYPTO_ID => {
 				let pub_key = ecdsa::Public::from_slice(key.1.as_slice());
-				let key_pair: ecdsa::Pair = self.0.read()
+				let key_pair = self.0.read()
 					.key_pair_by_type::<ecdsa::Pair>(&pub_key, id)
 					.map_err(|e| TraitError::from(e))?;
-				Ok(key_pair.sign(msg).encode())
+				key_pair.map(|k| k.sign(msg).encode()).map(Ok).transpose()
 			}
 			_ => Err(TraitError::KeyNotSupported(id))
 		}
@@ -232,7 +232,7 @@ impl SyncCryptoStore for LocalKeystore {
 				 .map(|k| ed25519::Public::from_slice(k.as_slice()))
 				 .collect()
 			})
-    		.unwrap_or_default()
+			.unwrap_or_default()
 	}
 
 	fn ed25519_generate_new(
@@ -278,7 +278,8 @@ impl SyncCryptoStore for LocalKeystore {
 	}
 
 	fn has_keys(&self, public_keys: &[(Vec<u8>, KeyTypeId)]) -> bool {
-		public_keys.iter().all(|(p, t)| self.0.read().key_phrase_by_type(&p, *t).is_ok())
+		public_keys.iter()
+			.all(|(p, t)| self.0.read().key_phrase_by_type(&p, *t).ok().flatten().is_some())
 	}
 
 	fn sr25519_vrf_sign(
@@ -286,16 +287,19 @@ impl SyncCryptoStore for LocalKeystore {
 		key_type: KeyTypeId,
 		public: &Sr25519Public,
 		transcript_data: VRFTranscriptData,
-	) -> std::result::Result<VRFSignature, TraitError> {
+	) -> std::result::Result<Option<VRFSignature>, TraitError> {
 		let transcript = make_transcript(transcript_data);
-		let pair = self.0.read().key_pair_by_type::<Sr25519Pair>(public, key_type)
-			.map_err(|e| TraitError::PairNotFound(e.to_string()))?;
+		let pair = self.0.read().key_pair_by_type::<Sr25519Pair>(public, key_type)?;
 
-		let (inout, proof, _) = pair.as_ref().vrf_sign(transcript);
-		Ok(VRFSignature {
-			output: inout.to_output(),
-			proof,
-		})
+		if let Some(pair) = pair {
+			let (inout, proof, _) = pair.as_ref().vrf_sign(transcript);
+			Ok(Some(VRFSignature {
+				output: inout.to_output(),
+				proof,
+			}))
+		} else {
+			Ok(None)
+		}
 	}
 }
 
@@ -411,36 +415,53 @@ impl KeystoreInner {
 	}
 
 	/// Get the key phrase for a given public key and key type.
-	fn key_phrase_by_type(&self, public: &[u8], key_type: KeyTypeId) -> Result<String> {
+	fn key_phrase_by_type(&self, public: &[u8], key_type: KeyTypeId) -> Result<Option<String>> {
 		if let Some(phrase) = self.get_additional_pair(public, key_type) {
-			return Ok(phrase.clone())
+			return Ok(Some(phrase.clone()))
 		}
 
-		let path = self.key_file_path(public, key_type).ok_or_else(|| Error::Unavailable)?;
-		let file = File::open(path)?;
+		let path = if let Some(path) = self.key_file_path(public, key_type) {
+			path
+		} else {
+			return Ok(None);
+		};
+
+		if path.exists() {
+			let file = File::open(path)?;
 
-		serde_json::from_reader(&file).map_err(Into::into)
+			serde_json::from_reader(&file).map_err(Into::into).map(Some)
+		} else {
+			Ok(None)
+		}
 	}
 
 	/// Get a key pair for the given public key and key type.
-	fn key_pair_by_type<Pair: PairT>(&self,
+	fn key_pair_by_type<Pair: PairT>(
+		&self,
 		public: &Pair::Public,
 		key_type: KeyTypeId,
-	) -> Result<Pair> {
-		let phrase = self.key_phrase_by_type(public.as_slice(), key_type)?;
+	) -> Result<Option<Pair>> {
+		let phrase = if let Some(p) = self.key_phrase_by_type(public.as_slice(), key_type)? {
+			p
+		} else {
+			return Ok(None)
+		};
+
 		let pair = Pair::from_string(
 			&phrase,
 			self.password(),
 		).map_err(|_| Error::InvalidPhrase)?;
 
 		if &pair.public() == public {
-			Ok(pair)
+			Ok(Some(pair))
 		} else {
 			Err(Error::InvalidPassword)
 		}
 	}
 
-	/// Returns the file path for the given public key and key type.
+	/// Get the file path for the given public key and key type.
+	///
+	/// Returns `None` if the keystore only exists in-memory and there isn't any path to provide.
 	fn key_file_path(&self, public: &[u8], key_type: KeyTypeId) -> Option<PathBuf> {
 		let mut buf = self.path.as_ref()?.clone();
 		let key_type = hex::encode(key_type.0);
@@ -481,8 +502,12 @@ impl KeystoreInner {
 	}
 
 	/// Get a key pair for the given public key.
-	pub fn key_pair<Pair: AppPair>(&self, public: &<Pair as AppKey>::Public) -> Result<Pair> {
-		self.key_pair_by_type::<Pair::Generic>(IsWrappedBy::from_ref(public), Pair::ID).map(Into::into)
+	///
+	/// Returns `Ok(None)` if the key doesn't exist, `Ok(Some(_))` if the key exists or `Err(_)` when
+	/// something failed.
+	pub fn key_pair<Pair: AppPair>(&self, public: &<Pair as AppKey>::Public) -> Result<Option<Pair>> {
+		self.key_pair_by_type::<Pair::Generic>(IsWrappedBy::from_ref(public), Pair::ID)
+			.map(|v| v.map(Into::into))
 	}
 }
 
@@ -531,13 +556,40 @@ mod tests {
 		assert!(store.public_keys::<ed25519::AppPublic>().unwrap().is_empty());
 
 		let key: ed25519::AppPair = store.generate().unwrap();
-		let key2: ed25519::AppPair = store.key_pair(&key.public()).unwrap();
+		let key2: ed25519::AppPair = store.key_pair(&key.public()).unwrap().unwrap();
 
 		assert_eq!(key.public(), key2.public());
 
 		assert_eq!(store.public_keys::<ed25519::AppPublic>().unwrap()[0], key.public());
 	}
 
+	#[test]
+	fn has_keys_works() {
+		let temp_dir = TempDir::new().unwrap();
+		let store = LocalKeystore::open(temp_dir.path(), None).unwrap();
+
+		let key: ed25519::AppPair = store.0.write().generate().unwrap();
+		let key2 = ed25519::Pair::generate().0;
+
+		assert!(
+			!SyncCryptoStore::has_keys(&store, &[(key2.public().to_vec(), ed25519::AppPublic::ID)])
+		);
+
+		assert!(
+			!SyncCryptoStore::has_keys(
+				&store,
+				&[
+					(key2.public().to_vec(), ed25519::AppPublic::ID),
+					(key.public().to_raw_vec(), ed25519::AppPublic::ID),
+				],
+			)
+		);
+
+		assert!(
+			SyncCryptoStore::has_keys(&store, &[(key.public().to_raw_vec(), ed25519::AppPublic::ID)])
+		);
+	}
+
 	#[test]
 	fn test_insert_ephemeral_from_seed() {
 		let temp_dir = TempDir::new().unwrap();
@@ -554,7 +606,7 @@ mod tests {
 		drop(store);
 		let store = KeystoreInner::open(temp_dir.path(), None).unwrap();
 		// Keys generated from seed should not be persisted!
-		assert!(store.key_pair::<ed25519::AppPair>(&pair.public()).is_err());
+		assert!(store.key_pair::<ed25519::AppPair>(&pair.public()).unwrap().is_none());
 	}
 
 	#[test]
@@ -569,7 +621,7 @@ mod tests {
 		let pair: ed25519::AppPair = store.generate().unwrap();
 		assert_eq!(
 			pair.public(),
-			store.key_pair::<ed25519::AppPair>(&pair.public()).unwrap().public(),
+			store.key_pair::<ed25519::AppPair>(&pair.public()).unwrap().unwrap().public(),
 		);
 
 		// Without the password the key should not be retrievable
@@ -582,7 +634,7 @@ mod tests {
 		).unwrap();
 		assert_eq!(
 			pair.public(),
-			store.key_pair::<ed25519::AppPair>(&pair.public()).unwrap().public(),
+			store.key_pair::<ed25519::AppPair>(&pair.public()).unwrap().unwrap().public(),
 		);
 	}
 
@@ -626,7 +678,7 @@ mod tests {
 		let store_key_pair = store.key_pair_by_type::<sr25519::AppPair>(
 			&key_pair.public(),
 			SR25519,
-		).expect("Gets key pair from keystore");
+		).expect("Gets key pair from keystore").unwrap();
 
 		assert_eq!(key_pair.public(), store_key_pair.public());
 	}
diff --git a/primitives/finality-grandpa/src/lib.rs b/primitives/finality-grandpa/src/lib.rs
index 383e4fe37134..5b393bd1d80e 100644
--- a/primitives/finality-grandpa/src/lib.rs
+++ b/primitives/finality-grandpa/src/lib.rs
@@ -400,7 +400,7 @@ where
 		AuthorityId::ID,
 		&public.to_public_crypto_pair(),
 		&encoded[..],
-	).ok()?.try_into().ok()?;
+	).ok().flatten()?.try_into().ok()?;
 
 	Some(grandpa::SignedMessage {
 		message,
diff --git a/primitives/io/src/lib.rs b/primitives/io/src/lib.rs
index 397dd3c21712..c0db1120dc43 100644
--- a/primitives/io/src/lib.rs
+++ b/primitives/io/src/lib.rs
@@ -474,8 +474,9 @@ pub trait Crypto {
 		let keystore = &***self.extension::<KeystoreExt>()
 			.expect("No `keystore` associated for the current context!");
 		SyncCryptoStore::sign_with(keystore, id, &pub_key.into(), msg)
-			.map(|sig| ed25519::Signature::from_slice(sig.as_slice()))
 			.ok()
+			.flatten()
+			.map(|sig| ed25519::Signature::from_slice(sig.as_slice()))
 	}
 
 	/// Verify `ed25519` signature.
@@ -600,8 +601,9 @@ pub trait Crypto {
 		let keystore = &***self.extension::<KeystoreExt>()
 			.expect("No `keystore` associated for the current context!");
 		SyncCryptoStore::sign_with(keystore, id, &pub_key.into(), msg)
-			.map(|sig| sr25519::Signature::from_slice(sig.as_slice()))
 			.ok()
+			.flatten()
+			.map(|sig| sr25519::Signature::from_slice(sig.as_slice()))
 	}
 
 	/// Verify an `sr25519` signature.
@@ -646,8 +648,9 @@ pub trait Crypto {
 		let keystore = &***self.extension::<KeystoreExt>()
 			.expect("No `keystore` associated for the current context!");
 		SyncCryptoStore::sign_with(keystore, id, &pub_key.into(), msg)
-			.map(|sig| ecdsa::Signature::from_slice(sig.as_slice()))
 			.ok()
+			.flatten()
+			.map(|sig| ecdsa::Signature::from_slice(sig.as_slice()))
 	}
 
 	/// Verify `ecdsa` signature.
diff --git a/primitives/keystore/src/lib.rs b/primitives/keystore/src/lib.rs
index f42f6dd7122d..2fda3a48c5da 100644
--- a/primitives/keystore/src/lib.rs
+++ b/primitives/keystore/src/lib.rs
@@ -34,9 +34,6 @@ pub enum Error {
 	/// Public key type is not supported
 	#[display(fmt="Key not supported: {:?}", _0)]
 	KeyNotSupported(KeyTypeId),
-	/// Pair not found for public key and KeyTypeId
-	#[display(fmt="Pair was not found: {}", _0)]
-	PairNotFound(String),
 	/// Validation error
 	#[display(fmt="Validation error: {}", _0)]
 	ValidationError(String),
@@ -125,37 +122,39 @@ pub trait CryptoStore: Send + Sync {
 	/// Signs a message with the private key that matches
 	/// the public key passed.
 	///
-	/// Returns the SCALE encoded signature if key is found & supported,
-	/// an error otherwise.
+	/// Returns the SCALE encoded signature if key is found and supported, `None` if the key doesn't
+	/// exist or an error when something failed.
 	async fn sign_with(
 		&self,
 		id: KeyTypeId,
 		key: &CryptoTypePublicPair,
 		msg: &[u8],
-	) -> Result<Vec<u8>, Error>;
+	) -> Result<Option<Vec<u8>>, Error>;
 
 	/// Sign with any key
 	///
 	/// Given a list of public keys, find the first supported key and
 	/// sign the provided message with that key.
 	///
-	/// Returns a tuple of the used key and the SCALE encoded signature.
+	/// Returns a tuple of the used key and the SCALE encoded signature or `None` if no key could
+	/// be found to sign.
 	async fn sign_with_any(
 		&self,
 		id: KeyTypeId,
 		keys: Vec<CryptoTypePublicPair>,
 		msg: &[u8]
-	) -> Result<(CryptoTypePublicPair, Vec<u8>), Error> {
+	) -> Result<Option<(CryptoTypePublicPair, Vec<u8>)>, Error> {
 		if keys.len() == 1 {
-			return self.sign_with(id, &keys[0], msg).await.map(|s| (keys[0].clone(), s));
+			return Ok(self.sign_with(id, &keys[0], msg).await?.map(|s| (keys[0].clone(), s)));
 		} else {
 			for k in self.supported_keys(id, keys).await? {
-				if let Ok(sign) = self.sign_with(id, &k, msg).await {
-					return Ok((k, sign));
+				if let Ok(Some(sign)) = self.sign_with(id, &k, msg).await {
+					return Ok(Some((k, sign)));
 				}
 			}
 		}
-		Err(Error::KeyNotSupported(id))
+
+		Ok(None)
 	}
 
 	/// Sign with all keys
@@ -164,13 +163,13 @@ pub trait CryptoStore: Send + Sync {
 	/// each key given that the key is supported.
 	///
 	/// Returns a list of `Result`s each representing the SCALE encoded
-	/// signature of each key or a Error for non-supported keys.
+	/// signature of each key, `None` if the key doesn't exist or a error when something failed.
 	async fn sign_with_all(
 		&self,
 		id: KeyTypeId,
 		keys: Vec<CryptoTypePublicPair>,
 		msg: &[u8],
-	) -> Result<Vec<Result<Vec<u8>, Error>>, ()> {
+	) -> Result<Vec<Result<Option<Vec<u8>>, Error>>, ()> {
 		let futs = keys.iter()
 			.map(|k| self.sign_with(id, k, msg));
 
@@ -187,16 +186,14 @@ pub trait CryptoStore: Send + Sync {
 	/// Namely, VRFOutput and VRFProof which are returned
 	/// inside the `VRFSignature` container struct.
 	///
-	/// This function will return an error in the cases where
-	/// the public key and key type provided do not match a private
-	/// key in the keystore. Or, in the context of remote signing
-	/// an error could be a network one.
+	/// This function will return `None` if the given `key_type` and `public` combination
+	/// doesn't exist in the keystore or an `Err` when something failed.
 	async fn sr25519_vrf_sign(
 		&self,
 		key_type: KeyTypeId,
 		public: &sr25519::Public,
 		transcript_data: VRFTranscriptData,
-	) -> Result<VRFSignature, Error>;
+	) -> Result<Option<VRFSignature>, Error>;
 }
 
 /// Sync version of the CryptoStore
@@ -285,37 +282,41 @@ pub trait SyncCryptoStore: CryptoStore + Send + Sync {
 	/// Signs a message with the private key that matches
 	/// the public key passed.
 	///
-	/// Returns the SCALE encoded signature if key is found & supported,
-	/// an error otherwise.
+	/// Returns the SCALE encoded signature if key is found and supported, `None` if the key doesn't
+	/// exist or an error when something failed.
 	fn sign_with(
 		&self,
 		id: KeyTypeId,
 		key: &CryptoTypePublicPair,
 		msg: &[u8],
-	) -> Result<Vec<u8>, Error>;
+	) -> Result<Option<Vec<u8>>, Error>;
 
 	/// Sign with any key
 	///
 	/// Given a list of public keys, find the first supported key and
 	/// sign the provided message with that key.
 	///
-	/// Returns a tuple of the used key and the SCALE encoded signature.
+	/// Returns a tuple of the used key and the SCALE encoded signature or `None` if no key could
+	/// be found to sign.
 	fn sign_with_any(
 		&self,
 		id: KeyTypeId,
 		keys: Vec<CryptoTypePublicPair>,
 		msg: &[u8]
-	) -> Result<(CryptoTypePublicPair, Vec<u8>), Error> {
+	) -> Result<Option<(CryptoTypePublicPair, Vec<u8>)>, Error> {
 		if keys.len() == 1 {
-			return SyncCryptoStore::sign_with(self, id, &keys[0], msg).map(|s| (keys[0].clone(), s));
+			return Ok(
+				SyncCryptoStore::sign_with(self, id, &keys[0], msg)?.map(|s| (keys[0].clone(), s)),
+			)
 		} else {
 			for k in SyncCryptoStore::supported_keys(self, id, keys)? {
-				if let Ok(sign) = SyncCryptoStore::sign_with(self, id, &k, msg) {
-					return Ok((k, sign));
+				if let Ok(Some(sign)) = SyncCryptoStore::sign_with(self, id, &k, msg) {
+					return Ok(Some((k, sign)));
 				}
 			}
 		}
-		Err(Error::KeyNotSupported(id))
+
+		Ok(None)
 	}
 
 	/// Sign with all keys
@@ -324,13 +325,13 @@ pub trait SyncCryptoStore: CryptoStore + Send + Sync {
 	/// each key given that the key is supported.
 	///
 	/// Returns a list of `Result`s each representing the SCALE encoded
-	/// signature of each key or a Error for non-supported keys.
+	/// signature of each key, `None` if the key doesn't exist or an error when something failed.
 	fn sign_with_all(
 		&self,
 		id: KeyTypeId,
 		keys: Vec<CryptoTypePublicPair>,
 		msg: &[u8],
-	) -> Result<Vec<Result<Vec<u8>, Error>>, ()>{
+	) -> Result<Vec<Result<Option<Vec<u8>>, Error>>, ()> {
 		Ok(keys.iter().map(|k| SyncCryptoStore::sign_with(self, id, k, msg)).collect())
 	}
 
@@ -344,16 +345,14 @@ pub trait SyncCryptoStore: CryptoStore + Send + Sync {
 	/// Namely, VRFOutput and VRFProof which are returned
 	/// inside the `VRFSignature` container struct.
 	///
-	/// This function will return an error in the cases where
-	/// the public key and key type provided do not match a private
-	/// key in the keystore. Or, in the context of remote signing
-	/// an error could be a network one.
+	/// This function will return `None` if the given `key_type` and `public` combination
+	/// doesn't exist in the keystore or an `Err` when something failed.
 	fn sr25519_vrf_sign(
 		&self,
 		key_type: KeyTypeId,
 		public: &sr25519::Public,
 		transcript_data: VRFTranscriptData,
-	) -> Result<VRFSignature, Error>;
+	) -> Result<Option<VRFSignature>, Error>;
 }
 
 /// A pointer to a keystore.
diff --git a/primitives/keystore/src/testing.rs b/primitives/keystore/src/testing.rs
index 702e2bbc857d..caee7178e094 100644
--- a/primitives/keystore/src/testing.rs
+++ b/primitives/keystore/src/testing.rs
@@ -132,7 +132,7 @@ impl CryptoStore for KeyStore {
 		id: KeyTypeId,
 		key: &CryptoTypePublicPair,
 		msg: &[u8],
-	) -> Result<Vec<u8>, Error> {
+	) -> Result<Option<Vec<u8>>, Error> {
 		SyncCryptoStore::sign_with(self, id, key, msg)
 	}
 
@@ -141,7 +141,7 @@ impl CryptoStore for KeyStore {
 		key_type: KeyTypeId,
 		public: &sr25519::Public,
 		transcript_data: VRFTranscriptData,
-	) -> Result<VRFSignature, Error> {
+	) -> Result<Option<VRFSignature>, Error> {
 		SyncCryptoStore::sr25519_vrf_sign(self, key_type, public, transcript_data)
 	}
 }
@@ -280,27 +280,27 @@ impl SyncCryptoStore for KeyStore {
 		id: KeyTypeId,
 		key: &CryptoTypePublicPair,
 		msg: &[u8],
-	) -> Result<Vec<u8>, Error> {
+	) -> Result<Option<Vec<u8>>, Error> {
 		use codec::Encode;
 
 		match key.0 {
 			ed25519::CRYPTO_ID => {
-				let key_pair: ed25519::Pair = self
-					.ed25519_key_pair(id, &ed25519::Public::from_slice(key.1.as_slice()))
-					.ok_or_else(|| Error::PairNotFound("ed25519".to_owned()))?;
-				return Ok(key_pair.sign(msg).encode());
+				let key_pair = self
+					.ed25519_key_pair(id, &ed25519::Public::from_slice(key.1.as_slice()));
+
+				key_pair.map(|k| k.sign(msg).encode()).map(Ok).transpose()
 			}
 			sr25519::CRYPTO_ID => {
-				let key_pair: sr25519::Pair = self
-					.sr25519_key_pair(id, &sr25519::Public::from_slice(key.1.as_slice()))
-					.ok_or_else(|| Error::PairNotFound("sr25519".to_owned()))?;
-				return Ok(key_pair.sign(msg).encode());
+				let key_pair = self
+					.sr25519_key_pair(id, &sr25519::Public::from_slice(key.1.as_slice()));
+
+				key_pair.map(|k| k.sign(msg).encode()).map(Ok).transpose()
 			}
 			ecdsa::CRYPTO_ID => {
-				let key_pair: ecdsa::Pair = self
-					.ecdsa_key_pair(id, &ecdsa::Public::from_slice(key.1.as_slice()))
-					.ok_or_else(|| Error::PairNotFound("ecdsa".to_owned()))?;
-				return Ok(key_pair.sign(msg).encode());
+				let key_pair = self
+					.ecdsa_key_pair(id, &ecdsa::Public::from_slice(key.1.as_slice()));
+
+				key_pair.map(|k| k.sign(msg).encode()).map(Ok).transpose()
 			}
 			_ => Err(Error::KeyNotSupported(id))
 		}
@@ -311,15 +311,19 @@ impl SyncCryptoStore for KeyStore {
 		key_type: KeyTypeId,
 		public: &sr25519::Public,
 		transcript_data: VRFTranscriptData,
-	) -> Result<VRFSignature, Error> {
+	) -> Result<Option<VRFSignature>, Error> {
 		let transcript = make_transcript(transcript_data);
-		let pair = self.sr25519_key_pair(key_type, public)
-			.ok_or_else(|| Error::PairNotFound("Not found".to_owned()))?;
+		let pair = if let Some(k) = self.sr25519_key_pair(key_type, public) {
+			k
+		} else {
+			return Ok(None)
+		};
+
 		let (inout, proof, _) = pair.as_ref().vrf_sign(transcript);
-		Ok(VRFSignature {
+		Ok(Some(VRFSignature {
 			output: inout.to_output(),
 			proof,
-		})
+		}))
 	}
 }
 
@@ -394,7 +398,7 @@ mod tests {
 			&key_pair.public(),
 			transcript_data.clone(),
 		);
-		assert!(result.is_err());
+		assert!(result.unwrap().is_none());
 
 		SyncCryptoStore::insert_unknown(
 			&store,
@@ -410,6 +414,6 @@ mod tests {
 			transcript_data,
 		);
 
-		assert!(result.is_ok());
+		assert!(result.unwrap().is_some());
 	}
 }

From 4f9ee57fd1d0c41863990ae8c5f11a8e3e32c676 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Mon, 22 Feb 2021 16:18:24 +0100
Subject: [PATCH 0418/1194] contracts: Convert to framev2 macros (#8157)

* contracts: Convert to framev2

* Reduce the API surface of the crate

* Remove unused import

* Merge import block

* Use pallet::metadata to reduce metadata diff

* Remove the explicit "Null" from AccountCounter
---
 bin/node/executor/tests/basic.rs           |    1 -
 bin/node/runtime/src/lib.rs                |    2 +-
 frame/contracts/src/benchmarking/mod.rs    |    1 +
 frame/contracts/src/chain_extension.rs     |    6 +-
 frame/contracts/src/exec.rs                |   41 +-
 frame/contracts/src/gas.rs                 |   96 +-
 frame/contracts/src/lib.rs                 | 1000 ++++++++++----------
 frame/contracts/src/rent.rs                |    6 +-
 frame/contracts/src/storage.rs             |   17 +-
 frame/contracts/src/tests.rs               |   51 +-
 frame/contracts/src/wasm/code_cache.rs     |   14 +-
 frame/contracts/src/wasm/env_def/macros.rs |   12 +-
 frame/contracts/src/wasm/env_def/mod.rs    |    6 +-
 frame/contracts/src/wasm/mod.rs            |    8 +-
 frame/contracts/src/wasm/runtime.rs        |    6 +-
 15 files changed, 636 insertions(+), 631 deletions(-)

diff --git a/bin/node/executor/tests/basic.rs b/bin/node/executor/tests/basic.rs
index 3e3b2d1eaaf3..c18f81bdc07d 100644
--- a/bin/node/executor/tests/basic.rs
+++ b/bin/node/executor/tests/basic.rs
@@ -17,7 +17,6 @@
 
 use codec::{Encode, Decode, Joiner};
 use frame_support::{
-	StorageMap,
 	traits::Currency,
 	weights::{GetDispatchInfo, DispatchInfo, DispatchClass},
 };
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index b52b24ed01bc..c8d7717b4c8f 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -71,7 +71,7 @@ pub use pallet_transaction_payment::{Multiplier, TargetedFeeAdjustment, Currency
 use pallet_session::{historical as pallet_session_historical};
 use sp_inherents::{InherentData, CheckInherentsResult};
 use static_assertions::const_assert;
-use pallet_contracts::WeightInfo;
+use pallet_contracts::weights::WeightInfo;
 
 #[cfg(any(feature = "std", test))]
 pub use sp_runtime::BuildStorage;
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index b6ff4c04ff7e..d01a2bce2c27 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -42,6 +42,7 @@ use parity_wasm::elements::{Instruction, ValueType, BlockType};
 use sp_runtime::traits::{Hash, Bounded, Zero};
 use sp_std::{default::Default, convert::{TryInto}, vec::Vec, vec};
 use pallet_contracts_primitives::RentProjection;
+use frame_support::weights::Weight;
 
 /// How many batches we do per API benchmark.
 const API_BENCHMARK_BATCHES: u32 = 20;
diff --git a/frame/contracts/src/chain_extension.rs b/frame/contracts/src/chain_extension.rs
index ef6e03479175..dc6e9771775c 100644
--- a/frame/contracts/src/chain_extension.rs
+++ b/frame/contracts/src/chain_extension.rs
@@ -18,7 +18,7 @@
 //! A mechanism for runtime authors to augment the functionality of contracts.
 //!
 //! The runtime is able to call into any contract and retrieve the result using
-//! [`bare_call`](crate::Module::bare_call). This already allows customization of runtime
+//! [`bare_call`](crate::Pallet::bare_call). This already allows customization of runtime
 //! behaviour by user generated code (contracts). However, often it is more straightforward
 //! to allow the reverse behaviour: The contract calls into the runtime. We call the latter
 //! one a "chain extension" because it allows the chain to extend the set of functions that are
@@ -37,7 +37,7 @@
 //! [`charge_weight`](Environment::charge_weight) function must be called **before**
 //! carrying out any action that causes the consumption of the chargeable weight.
 //! It cannot be overstated how delicate of a process the creation of a chain extension
-//! is. Check whether using [`bare_call`](crate::Module::bare_call) suffices for the
+//! is. Check whether using [`bare_call`](crate::Pallet::bare_call) suffices for the
 //! use case at hand.
 //!
 //! # Benchmarking
@@ -328,7 +328,7 @@ where
 	///
 	/// If the contract supplied buffer is smaller than the passed `buffer` an `Err` is returned.
 	/// If `allow_skip` is set to true the contract is allowed to skip the copying of the buffer
-	/// by supplying the guard value of [`u32::max_value()`] as `out_ptr`. The
+	/// by supplying the guard value of `u32::max_value()` as `out_ptr`. The
 	/// `weight_per_byte` is only charged when the write actually happens and is not skipped or
 	/// failed due to a too small output buffer.
 	pub fn write(
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index bf9efddc6166..745384a8674b 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -16,7 +16,7 @@
 // limitations under the License.
 
 use crate::{
-	CodeHash, Event, RawEvent, Config, Module as Contracts,
+	CodeHash, Event, Config, Module as Contracts,
 	TrieId, BalanceOf, ContractInfo, gas::GasMeter, rent::Rent, storage::{self, Storage},
 	Error, ContractInfoOf, Schedule,
 };
@@ -30,7 +30,7 @@ use frame_support::{
 	dispatch::{DispatchResult, DispatchError},
 	traits::{ExistenceRequirement, Currency, Time, Randomness, Get},
 	weights::Weight,
-	ensure, StorageMap,
+	ensure,
 };
 use pallet_contracts_primitives::{ErrorOrigin, ExecError, ExecReturnValue, ExecResult, ReturnFlags};
 
@@ -57,7 +57,11 @@ pub enum TransactorKind {
 ///
 /// This interface is specialized to an account of the executing code, so all
 /// operations are implicitly performed on that account.
-pub trait Ext {
+///
+/// # Note
+///
+/// This trait is sealed and cannot be implemented by downstream crates.
+pub trait Ext: sealing::Sealed {
 	type T: Config;
 
 	/// Returns the storage entry of the executing account by the given `key`.
@@ -446,7 +450,7 @@ where
 					.ok_or(Error::<T>::NewContractNotFunded)?;
 
 				// Deposit an instantiation event.
-				deposit_event::<T>(vec![], RawEvent::Instantiated(caller.clone(), dest.clone()));
+				deposit_event::<T>(vec![], Event::Instantiated(caller.clone(), dest.clone()));
 
 				Ok(output)
 			});
@@ -664,7 +668,7 @@ where
 		if let Some(ContractInfo::Alive(info)) = ContractInfoOf::<T>::take(&self_id) {
 			Storage::<T>::queue_trie_for_deletion(&info).map_err(|e| (e, 0))?;
 			let code_len = E::remove_user(info.code_hash);
-			Contracts::<T>::deposit_event(RawEvent::Terminated(self_id, beneficiary.clone()));
+			Contracts::<T>::deposit_event(Event::Terminated(self_id, beneficiary.clone()));
 			Ok(code_len)
 		} else {
 			panic!(
@@ -708,7 +712,7 @@ where
 		if let Ok(_) = result {
 			deposit_event::<Self::T>(
 				vec![],
-				RawEvent::Restored(
+				Event::Restored(
 					self.ctx.self_account.clone(),
 					dest,
 					code_hash,
@@ -754,7 +758,7 @@ where
 	fn deposit_event(&mut self, topics: Vec<T::Hash>, data: Vec<u8>) {
 		deposit_event::<Self::T>(
 			topics,
-			RawEvent::ContractEmitted(self.ctx.self_account.clone(), data)
+			Event::ContractEmitted(self.ctx.self_account.clone(), data)
 		);
 	}
 
@@ -799,6 +803,20 @@ fn deposit_event<T: Config>(
 	)
 }
 
+mod sealing {
+	use super::*;
+
+	pub trait Sealed {}
+
+	impl<'a, 'b: 'a, T: Config, E> Sealed for CallContext<'a, 'b, T, E> {}
+
+	#[cfg(test)]
+	impl Sealed for crate::wasm::MockExt {}
+
+	#[cfg(test)]
+	impl Sealed for &mut crate::wasm::MockExt {}
+}
+
 /// These tests exercise the executive layer.
 ///
 /// In these tests the VM/loader are mocked. Instead of dealing with wasm bytecode they use simple closures.
@@ -809,13 +827,12 @@ mod tests {
 	use super::*;
 	use crate::{
 		gas::GasMeter, tests::{ExtBuilder, Test, Event as MetaEvent},
-		gas::Gas,
 		storage::Storage,
 		tests::{
 			ALICE, BOB, CHARLIE,
 			test_utils::{place_contract, set_balance, get_balance},
 		},
-		Error,
+		Error, Weight,
 	};
 	use sp_runtime::DispatchError;
 	use assert_matches::assert_matches;
@@ -823,7 +840,7 @@ mod tests {
 
 	type MockContext<'a> = ExecutionContext<'a, Test, MockExecutable>;
 
-	const GAS_LIMIT: Gas = 10_000_000_000;
+	const GAS_LIMIT: Weight = 10_000_000_000;
 
 	thread_local! {
 		static LOADER: RefCell<MockLoader> = RefCell::new(MockLoader::default());
@@ -1334,7 +1351,7 @@ mod tests {
 			// there are instantiation event.
 			assert_eq!(Storage::<Test>::code_hash(&instantiated_contract_address).unwrap(), dummy_ch);
 			assert_eq!(&events(), &[
-				RawEvent::Instantiated(ALICE, instantiated_contract_address)
+				Event::Instantiated(ALICE, instantiated_contract_address)
 			]);
 		});
 	}
@@ -1410,7 +1427,7 @@ mod tests {
 			// there are instantiation event.
 			assert_eq!(Storage::<Test>::code_hash(&instantiated_contract_address).unwrap(), dummy_ch);
 			assert_eq!(&events(), &[
-				RawEvent::Instantiated(BOB, instantiated_contract_address)
+				Event::Instantiated(BOB, instantiated_contract_address)
 			]);
 		});
 	}
diff --git a/frame/contracts/src/gas.rs b/frame/contracts/src/gas.rs
index 2737f351a50d..80e608b217bd 100644
--- a/frame/contracts/src/gas.rs
+++ b/frame/contracts/src/gas.rs
@@ -30,14 +30,11 @@ use sp_core::crypto::UncheckedFrom;
 #[cfg(test)]
 use std::{any::Any, fmt::Debug};
 
-// Gas is essentially the same as weight. It is a 1 to 1 correspondence.
-pub type Gas = Weight;
-
 #[derive(Debug, PartialEq, Eq)]
-pub struct ChargedAmount(Gas);
+pub struct ChargedAmount(Weight);
 
 impl ChargedAmount {
-	pub fn amount(&self) -> Gas {
+	pub fn amount(&self) -> Weight {
 		self.0
 	}
 }
@@ -72,7 +69,7 @@ pub trait Token<T: Config>: Copy + Clone + TestAuxiliaries {
 	/// That said, implementors of this function still can run into overflows
 	/// while calculating the amount. In this case it is ok to use saturating operations
 	/// since on overflow they will return `max_value` which should consume all gas.
-	fn calculate_amount(&self, metadata: &Self::Metadata) -> Gas;
+	fn calculate_amount(&self, metadata: &Self::Metadata) -> Weight;
 }
 
 /// A wrapper around a type-erased trait object of what used to be a `Token`.
@@ -83,9 +80,9 @@ pub struct ErasedToken {
 }
 
 pub struct GasMeter<T: Config> {
-	gas_limit: Gas,
+	gas_limit: Weight,
 	/// Amount of gas left from initial gas limit. Can reach zero.
-	gas_left: Gas,
+	gas_left: Weight,
 	_phantom: PhantomData<T>,
 	#[cfg(test)]
 	tokens: Vec<ErasedToken>,
@@ -95,7 +92,7 @@ impl<T: Config> GasMeter<T>
 where
 	T::AccountId: UncheckedFrom<<T as frame_system::Config>::Hash> + AsRef<[u8]>
 {
-	pub fn new(gas_limit: Gas) -> Self {
+	pub fn new(gas_limit: Weight) -> Self {
 		GasMeter {
 			gas_limit,
 			gas_left: gas_limit,
@@ -177,7 +174,7 @@ where
 	/// All unused gas in the nested gas meter is returned to this gas meter.
 	pub fn with_nested<R, F: FnOnce(Option<&mut GasMeter<T>>) -> R>(
 		&mut self,
-		amount: Gas,
+		amount: Weight,
 		f: F,
 	) -> R {
 		// NOTE that it is ok to allocate all available gas since it still ensured
@@ -197,12 +194,12 @@ where
 	}
 
 	/// Returns how much gas was used.
-	pub fn gas_spent(&self) -> Gas {
+	pub fn gas_spent(&self) -> Weight {
 		self.gas_limit - self.gas_left
 	}
 
 	/// Returns how much gas left from the initial budget.
-	pub fn gas_left(&self) -> Gas {
+	pub fn gas_left(&self) -> Weight {
 		self.gas_left
 	}
 
@@ -230,49 +227,48 @@ where
 	}
 }
 
-/// A simple utility macro that helps to match against a
-/// list of tokens.
-#[macro_export]
-macro_rules! match_tokens {
-	($tokens_iter:ident,) => {
-	};
-	($tokens_iter:ident, $x:expr, $($rest:tt)*) => {
-		{
-			let next = ($tokens_iter).next().unwrap();
-			let pattern = $x;
-
-			// Note that we don't specify the type name directly in this macro,
-			// we only have some expression $x of some type. At the same time, we
-			// have an iterator of Box<dyn Any> and to downcast we need to specify
-			// the type which we want downcast to.
-			//
-			// So what we do is we assign `_pattern_typed_next_ref` to a variable which has
-			// the required type.
-			//
-			// Then we make `_pattern_typed_next_ref = token.downcast_ref()`. This makes
-			// rustc infer the type `T` (in `downcast_ref<T: Any>`) to be the same as in $x.
-
-			let mut _pattern_typed_next_ref = &pattern;
-			_pattern_typed_next_ref = match next.token.downcast_ref() {
-				Some(p) => {
-					assert_eq!(p, &pattern);
-					p
-				}
-				None => {
-					panic!("expected type {} got {}", stringify!($x), next.description);
-				}
-			};
-		}
-
-		match_tokens!($tokens_iter, $($rest)*);
-	};
-}
-
 #[cfg(test)]
 mod tests {
 	use super::{GasMeter, Token};
 	use crate::tests::Test;
 
+	/// A simple utility macro that helps to match against a
+	/// list of tokens.
+	macro_rules! match_tokens {
+		($tokens_iter:ident,) => {
+		};
+		($tokens_iter:ident, $x:expr, $($rest:tt)*) => {
+			{
+				let next = ($tokens_iter).next().unwrap();
+				let pattern = $x;
+
+				// Note that we don't specify the type name directly in this macro,
+				// we only have some expression $x of some type. At the same time, we
+				// have an iterator of Box<dyn Any> and to downcast we need to specify
+				// the type which we want downcast to.
+				//
+				// So what we do is we assign `_pattern_typed_next_ref` to a variable which has
+				// the required type.
+				//
+				// Then we make `_pattern_typed_next_ref = token.downcast_ref()`. This makes
+				// rustc infer the type `T` (in `downcast_ref<T: Any>`) to be the same as in $x.
+
+				let mut _pattern_typed_next_ref = &pattern;
+				_pattern_typed_next_ref = match next.token.downcast_ref() {
+					Some(p) => {
+						assert_eq!(p, &pattern);
+						p
+					}
+					None => {
+						panic!("expected type {} got {}", stringify!($x), next.description);
+					}
+				};
+			}
+
+			match_tokens!($tokens_iter, $($rest)*);
+		};
+	}
+
 	/// A trivial token that charges the specified number of gas units.
 	#[derive(Copy, Clone, PartialEq, Eq, Debug)]
 	struct SimpleToken(u64);
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index 4e56230e93f3..1f21a59e6158 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -98,368 +98,80 @@ pub mod weights;
 mod tests;
 
 pub use crate::{
-	gas::{Gas, GasMeter},
-	wasm::{ReturnCode as RuntimeReturnCode, PrefabWasmModule},
-	weights::WeightInfo,
+	wasm::PrefabWasmModule,
 	schedule::{Schedule, HostFnWeights, InstructionWeights, Limits},
+	pallet::*,
 };
 use crate::{
+	gas::GasMeter,
 	exec::{ExecutionContext, Executable},
 	rent::Rent,
-	storage::Storage,
+	storage::{Storage, DeletedContract},
+	weights::WeightInfo,
 };
 use sp_core::crypto::UncheckedFrom;
 use sp_std::{prelude::*, marker::PhantomData, fmt::Debug};
 use codec::{Codec, Encode, Decode};
 use sp_runtime::{
 	traits::{
-		Hash, StaticLookup, Zero, MaybeSerializeDeserialize, Member, Convert, Saturating,
+		Hash, StaticLookup, MaybeSerializeDeserialize, Member, Convert, Saturating, Zero,
 	},
 	RuntimeDebug, Perbill,
 };
 use frame_support::{
-	decl_module, decl_event, decl_storage, decl_error, ensure,
 	storage::child::ChildInfo,
-	dispatch::{DispatchResult, DispatchResultWithPostInfo},
 	traits::{OnUnbalanced, Currency, Get, Time, Randomness},
-	weights::Pays,
+	weights::{Weight, PostDispatchInfo, WithPostDispatchInfo},
 };
-use frame_system::{ensure_signed, ensure_root, Module as System};
+use frame_system::Module as System;
 use pallet_contracts_primitives::{
 	RentProjectionResult, GetStorageResult, ContractAccessError, ContractExecResult,
 };
-use frame_support::weights::{Weight, PostDispatchInfo, WithPostDispatchInfo};
 
 pub type CodeHash<T> = <T as frame_system::Config>::Hash;
 pub type TrieId = Vec<u8>;
-
-/// Information for managing an account and its sub trie abstraction.
-/// This is the required info to cache for an account
-#[derive(Encode, Decode, RuntimeDebug)]
-pub enum ContractInfo<T: Config> {
-	Alive(AliveContractInfo<T>),
-	Tombstone(TombstoneContractInfo<T>),
-}
-
-impl<T: Config> ContractInfo<T> {
-	/// If contract is alive then return some alive info
-	pub fn get_alive(self) -> Option<AliveContractInfo<T>> {
-		if let ContractInfo::Alive(alive) = self {
-			Some(alive)
-		} else {
-			None
-		}
-	}
-	/// If contract is alive then return some reference to alive info
-	pub fn as_alive(&self) -> Option<&AliveContractInfo<T>> {
-		if let ContractInfo::Alive(ref alive) = self {
-			Some(alive)
-		} else {
-			None
-		}
-	}
-	/// If contract is alive then return some mutable reference to alive info
-	pub fn as_alive_mut(&mut self) -> Option<&mut AliveContractInfo<T>> {
-		if let ContractInfo::Alive(ref mut alive) = self {
-			Some(alive)
-		} else {
-			None
-		}
-	}
-
-	/// If contract is tombstone then return some tombstone info
-	pub fn get_tombstone(self) -> Option<TombstoneContractInfo<T>> {
-		if let ContractInfo::Tombstone(tombstone) = self {
-			Some(tombstone)
-		} else {
-			None
-		}
-	}
-	/// If contract is tombstone then return some reference to tombstone info
-	pub fn as_tombstone(&self) -> Option<&TombstoneContractInfo<T>> {
-		if let ContractInfo::Tombstone(ref tombstone) = self {
-			Some(tombstone)
-		} else {
-			None
-		}
-	}
-	/// If contract is tombstone then return some mutable reference to tombstone info
-	pub fn as_tombstone_mut(&mut self) -> Option<&mut TombstoneContractInfo<T>> {
-		if let ContractInfo::Tombstone(ref mut tombstone) = self {
-			Some(tombstone)
-		} else {
-			None
-		}
-	}
-}
-
-pub type AliveContractInfo<T> =
-	RawAliveContractInfo<CodeHash<T>, BalanceOf<T>, <T as frame_system::Config>::BlockNumber>;
-
-/// Information for managing an account and its sub trie abstraction.
-/// This is the required info to cache for an account.
-#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug)]
-pub struct RawAliveContractInfo<CodeHash, Balance, BlockNumber> {
-	/// Unique ID for the subtree encoded as a bytes vector.
-	pub trie_id: TrieId,
-	/// The total number of bytes used by this contract.
-	///
-	/// It is a sum of each key-value pair stored by this contract.
-	pub storage_size: u32,
-	/// The total number of key-value pairs in storage of this contract.
-	pub pair_count: u32,
-	/// The code associated with a given account.
-	pub code_hash: CodeHash,
-	/// Pay rent at most up to this value.
-	pub rent_allowance: Balance,
-	/// The amount of rent that was payed by the contract over its whole lifetime.
-	///
-	/// A restored contract starts with a value of zero just like a new contract.
-	pub rent_payed: Balance,
-	/// Last block rent has been payed.
-	pub deduct_block: BlockNumber,
-	/// Last block child storage has been written.
-	pub last_write: Option<BlockNumber>,
-}
-
-impl<CodeHash, Balance, BlockNumber> RawAliveContractInfo<CodeHash, Balance, BlockNumber> {
-	/// Associated child trie unique id is built from the hash part of the trie id.
-	pub fn child_trie_info(&self) -> ChildInfo {
-		child_trie_info(&self.trie_id[..])
-	}
-}
-
-/// Associated child trie unique id is built from the hash part of the trie id.
-pub(crate) fn child_trie_info(trie_id: &[u8]) -> ChildInfo {
-	ChildInfo::new_default(trie_id)
-}
-
-pub type TombstoneContractInfo<T> =
-	RawTombstoneContractInfo<<T as frame_system::Config>::Hash, <T as frame_system::Config>::Hashing>;
-
-#[derive(Encode, Decode, PartialEq, Eq, RuntimeDebug)]
-pub struct RawTombstoneContractInfo<H, Hasher>(H, PhantomData<Hasher>);
-
-impl<H, Hasher> RawTombstoneContractInfo<H, Hasher>
-where
-	H: Member + MaybeSerializeDeserialize+ Debug
-		+ AsRef<[u8]> + AsMut<[u8]> + Copy + Default
-		+ sp_std::hash::Hash + Codec,
-	Hasher: Hash<Output=H>,
-{
-	fn new(storage_root: &[u8], code_hash: H) -> Self {
-		let mut buf = Vec::new();
-		storage_root.using_encoded(|encoded| buf.extend_from_slice(encoded));
-		buf.extend_from_slice(code_hash.as_ref());
-		RawTombstoneContractInfo(<Hasher as Hash>::hash(&buf[..]), PhantomData)
-	}
-}
-
-impl<T: Config> From<AliveContractInfo<T>> for ContractInfo<T> {
-	fn from(alive_info: AliveContractInfo<T>) -> Self {
-		Self::Alive(alive_info)
-	}
-}
-
 pub type BalanceOf<T> =
 	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 pub type NegativeImbalanceOf<T> =
 	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
+pub type AliveContractInfo<T> =
+	RawAliveContractInfo<CodeHash<T>, BalanceOf<T>, <T as frame_system::Config>::BlockNumber>;
+pub type TombstoneContractInfo<T> =
+	RawTombstoneContractInfo<<T as frame_system::Config>::Hash, <T as frame_system::Config>::Hashing>;
 
-pub trait Config: frame_system::Config {
-	type Time: Time;
-	type Randomness: Randomness<Self::Hash>;
-
-	/// The currency in which fees are paid and contract balances are held.
-	type Currency: Currency<Self::AccountId>;
-
-	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
-
-	/// Handler for rent payments.
-	type RentPayment: OnUnbalanced<NegativeImbalanceOf<Self>>;
-
-	/// Number of block delay an extrinsic claim surcharge has.
-	///
-	/// When claim surcharge is called by an extrinsic the rent is checked
-	/// for current_block - delay
-	type SignedClaimHandicap: Get<Self::BlockNumber>;
-
-	/// The minimum amount required to generate a tombstone.
-	type TombstoneDeposit: Get<BalanceOf<Self>>;
-
-	/// The balance every contract needs to deposit to stay alive indefinitely.
-	///
-	/// This is different from the [`Self::TombstoneDeposit`] because this only needs to be
-	/// deposited while the contract is alive. Costs for additional storage are added to
-	/// this base cost.
-	///
-	/// This is a simple way to ensure that contracts with empty storage eventually get deleted by
-	/// making them pay rent. This creates an incentive to remove them early in order to save rent.
-	type DepositPerContract: Get<BalanceOf<Self>>;
-
-	/// The balance a contract needs to deposit per storage byte to stay alive indefinitely.
-	///
-	/// Let's suppose the deposit is 1,000 BU (balance units)/byte and the rent is 1 BU/byte/day,
-	/// then a contract with 1,000,000 BU that uses 1,000 bytes of storage would pay no rent.
-	/// But if the balance reduced to 500,000 BU and the storage stayed the same at 1,000,
-	/// then it would pay 500 BU/day.
-	type DepositPerStorageByte: Get<BalanceOf<Self>>;
-
-	/// The balance a contract needs to deposit per storage item to stay alive indefinitely.
-	///
-	/// It works the same as [`Self::DepositPerStorageByte`] but for storage items.
-	type DepositPerStorageItem: Get<BalanceOf<Self>>;
-
-	/// The fraction of the deposit that should be used as rent per block.
-	///
-	/// When a contract hasn't enough balance deposited to stay alive indefinitely it needs
-	/// to pay per block for the storage it consumes that is not covered by the deposit.
-	/// This determines how high this rent payment is per block as a fraction of the deposit.
-	type RentFraction: Get<Perbill>;
-
-	/// Reward that is received by the party whose touch has led
-	/// to removal of a contract.
-	type SurchargeReward: Get<BalanceOf<Self>>;
-
-	/// The maximum nesting level of a call/instantiate stack.
-	type MaxDepth: Get<u32>;
-
-	/// The maximum size of a storage value and event payload in bytes.
-	type MaxValueSize: Get<u32>;
-
-	/// Used to answer contracts's queries regarding the current weight price. This is **not**
-	/// used to calculate the actual fee and is only for informational purposes.
-	type WeightPrice: Convert<Weight, BalanceOf<Self>>;
-
-	/// Describes the weights of the dispatchables of this module and is also used to
-	/// construct a default cost schedule.
-	type WeightInfo: WeightInfo;
-
-	/// Type that allows the runtime authors to add new host functions for a contract to call.
-	type ChainExtension: chain_extension::ChainExtension<Self>;
+#[frame_support::pallet]
+pub mod pallet {
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+	use super::*;
 
-	/// The maximum number of tries that can be queued for deletion.
-	type DeletionQueueDepth: Get<u32>;
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		/// The time implementation used to supply timestamps to conntracts through `seal_now`.
+		type Time: Time;
 
-	/// The maximum amount of weight that can be consumed per block for lazy trie removal.
-	type DeletionWeightLimit: Get<Weight>;
+		/// The generator used to supply randomness to contracts through `seal_random`.
+		type Randomness: Randomness<Self::Hash>;
 
-	/// The maximum length of a contract code in bytes. This limit applies to the instrumented
-	/// version of the code. Therefore `instantiate_with_code` can fail even when supplying
-	/// a wasm binary below this maximum size.
-	type MaxCodeSize: Get<u32>;
-}
+		/// The currency in which fees are paid and contract balances are held.
+		type Currency: Currency<Self::AccountId>;
 
-decl_error! {
-	/// Error for the contracts module.
-	pub enum Error for Module<T: Config>
-	where
-		T::AccountId: UncheckedFrom<T::Hash>,
-		T::AccountId: AsRef<[u8]>,
-	{
-		/// A new schedule must have a greater version than the current one.
-		InvalidScheduleVersion,
-		/// An origin must be signed or inherent and auxiliary sender only provided on inherent.
-		InvalidSurchargeClaim,
-		/// Cannot restore from nonexisting or tombstone contract.
-		InvalidSourceContract,
-		/// Cannot restore to nonexisting or alive contract.
-		InvalidDestinationContract,
-		/// Tombstones don't match.
-		InvalidTombstone,
-		/// An origin TrieId written in the current block.
-		InvalidContractOrigin,
-		/// The executed contract exhausted its gas limit.
-		OutOfGas,
-		/// The output buffer supplied to a contract API call was too small.
-		OutputBufferTooSmall,
-		/// Performing the requested transfer would have brought the contract below
-		/// the subsistence threshold. No transfer is allowed to do this in order to allow
-		/// for a tombstone to be created. Use `seal_terminate` to remove a contract without
-		/// leaving a tombstone behind.
-		BelowSubsistenceThreshold,
-		/// The newly created contract is below the subsistence threshold after executing
-		/// its contructor. No contracts are allowed to exist below that threshold.
-		NewContractNotFunded,
-		/// Performing the requested transfer failed for a reason originating in the
-		/// chosen currency implementation of the runtime. Most probably the balance is
-		/// too low or locks are placed on it.
-		TransferFailed,
-		/// Performing a call was denied because the calling depth reached the limit
-		/// of what is specified in the schedule.
-		MaxCallDepthReached,
-		/// The contract that was called is either no contract at all (a plain account)
-		/// or is a tombstone.
-		NotCallable,
-		/// The code supplied to `instantiate_with_code` exceeds the limit specified in the
-		/// current schedule.
-		CodeTooLarge,
-		/// No code could be found at the supplied code hash.
-		CodeNotFound,
-		/// A buffer outside of sandbox memory was passed to a contract API function.
-		OutOfBounds,
-		/// Input passed to a contract API function failed to decode as expected type.
-		DecodingFailed,
-		/// Contract trapped during execution.
-		ContractTrapped,
-		/// The size defined in `T::MaxValueSize` was exceeded.
-		ValueTooLarge,
-		/// The action performed is not allowed while the contract performing it is already
-		/// on the call stack. Those actions are contract self destruction and restoration
-		/// of a tombstone.
-		ReentranceDenied,
-		/// `seal_input` was called twice from the same contract execution context.
-		InputAlreadyRead,
-		/// The subject passed to `seal_random` exceeds the limit.
-		RandomSubjectTooLong,
-		/// The amount of topics passed to `seal_deposit_events` exceeds the limit.
-		TooManyTopics,
-		/// The topics passed to `seal_deposit_events` contains at least one duplicate.
-		DuplicateTopics,
-		/// The chain does not provide a chain extension. Calling the chain extension results
-		/// in this error. Note that this usually  shouldn't happen as deploying such contracts
-		/// is rejected.
-		NoChainExtension,
-		/// Removal of a contract failed because the deletion queue is full.
-		///
-		/// This can happen when either calling [`Module::claim_surcharge`] or `seal_terminate`.
-		/// The queue is filled by deleting contracts and emptied by a fixed amount each block.
-		/// Trying again during another block is the only way to resolve this issue.
-		DeletionQueueFull,
-		/// A contract could not be evicted because it has enough balance to pay rent.
-		///
-		/// This can be returned from [`Module::claim_surcharge`] because the target
-		/// contract has enough balance to pay for its rent.
-		ContractNotEvictable,
-		/// A storage modification exhausted the 32bit type that holds the storage size.
-		///
-		/// This can either happen when the accumulated storage in bytes is too large or
-		/// when number of storage items is too large.
-		StorageExhausted,
-		/// A contract with the same AccountId already exists.
-		DuplicateContract,
-	}
-}
+		/// The overarching event type.
+		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
 
-decl_module! {
-	/// Contracts module.
-	pub struct Module<T: Config> for enum Call
-	where
-		origin: T::Origin,
-		T::AccountId: UncheckedFrom<T::Hash>,
-		T::AccountId: AsRef<[u8]>,
-	{
-		type Error = Error<T>;
+		/// Handler for rent payments.
+		type RentPayment: OnUnbalanced<NegativeImbalanceOf<Self>>;
 
 		/// Number of block delay an extrinsic claim surcharge has.
 		///
 		/// When claim surcharge is called by an extrinsic the rent is checked
 		/// for current_block - delay
-		const SignedClaimHandicap: T::BlockNumber = T::SignedClaimHandicap::get();
+		#[pallet::constant]
+		type SignedClaimHandicap: Get<Self::BlockNumber>;
 
 		/// The minimum amount required to generate a tombstone.
-		const TombstoneDeposit: BalanceOf<T> = T::TombstoneDeposit::get();
+		#[pallet::constant]
+		type TombstoneDeposit: Get<BalanceOf<Self>>;
 
 		/// The balance every contract needs to deposit to stay alive indefinitely.
 		///
@@ -469,7 +181,8 @@ decl_module! {
 		///
 		/// This is a simple way to ensure that contracts with empty storage eventually get deleted by
 		/// making them pay rent. This creates an incentive to remove them early in order to save rent.
-		const DepositPerContract: BalanceOf<T> = T::DepositPerContract::get();
+		#[pallet::constant]
+		type DepositPerContract: Get<BalanceOf<Self>>;
 
 		/// The balance a contract needs to deposit per storage byte to stay alive indefinitely.
 		///
@@ -477,40 +190,73 @@ decl_module! {
 		/// then a contract with 1,000,000 BU that uses 1,000 bytes of storage would pay no rent.
 		/// But if the balance reduced to 500,000 BU and the storage stayed the same at 1,000,
 		/// then it would pay 500 BU/day.
-		const DepositPerStorageByte: BalanceOf<T> = T::DepositPerStorageByte::get();
+		#[pallet::constant]
+		type DepositPerStorageByte: Get<BalanceOf<Self>>;
 
 		/// The balance a contract needs to deposit per storage item to stay alive indefinitely.
 		///
 		/// It works the same as [`Self::DepositPerStorageByte`] but for storage items.
-		const DepositPerStorageItem: BalanceOf<T> = T::DepositPerStorageItem::get();
+		#[pallet::constant]
+		type DepositPerStorageItem: Get<BalanceOf<Self>>;
 
 		/// The fraction of the deposit that should be used as rent per block.
 		///
 		/// When a contract hasn't enough balance deposited to stay alive indefinitely it needs
 		/// to pay per block for the storage it consumes that is not covered by the deposit.
 		/// This determines how high this rent payment is per block as a fraction of the deposit.
-		const RentFraction: Perbill = T::RentFraction::get();
+		#[pallet::constant]
+		type RentFraction: Get<Perbill>;
 
 		/// Reward that is received by the party whose touch has led
 		/// to removal of a contract.
-		const SurchargeReward: BalanceOf<T> = T::SurchargeReward::get();
+		#[pallet::constant]
+		type SurchargeReward: Get<BalanceOf<Self>>;
+
+		/// The maximum nesting level of a call/instantiate stack.
+		#[pallet::constant]
+		type MaxDepth: Get<u32>;
+
+		/// The maximum size of a storage value and event payload in bytes.
+		#[pallet::constant]
+		type MaxValueSize: Get<u32>;
 
-		/// The maximum nesting level of a call/instantiate stack. A reasonable default
-		/// value is 100.
-		const MaxDepth: u32 = T::MaxDepth::get();
+		/// Used to answer contracts's queries regarding the current weight price. This is **not**
+		/// used to calculate the actual fee and is only for informational purposes.
+		type WeightPrice: Convert<Weight, BalanceOf<Self>>;
 
-		/// The maximum size of a storage value in bytes. A reasonable default is 16 KiB.
-		const MaxValueSize: u32 = T::MaxValueSize::get();
+		/// Describes the weights of the dispatchables of this module and is also used to
+		/// construct a default cost schedule.
+		type WeightInfo: WeightInfo;
+
+		/// Type that allows the runtime authors to add new host functions for a contract to call.
+		type ChainExtension: chain_extension::ChainExtension<Self>;
 
 		/// The maximum number of tries that can be queued for deletion.
-		const DeletionQueueDepth: u32 = T::DeletionQueueDepth::get();
+		#[pallet::constant]
+		type DeletionQueueDepth: Get<u32>;
 
 		/// The maximum amount of weight that can be consumed per block for lazy trie removal.
-		const DeletionWeightLimit: Weight = T::DeletionWeightLimit::get();
+		#[pallet::constant]
+		type DeletionWeightLimit: Get<Weight>;
+
+		/// The maximum length of a contract code in bytes. This limit applies to the instrumented
+		/// version of the code. Therefore `instantiate_with_code` can fail even when supplying
+		/// a wasm binary below this maximum size.
+		#[pallet::constant]
+		type MaxCodeSize: Get<u32>;
+	}
 
-		fn deposit_event() = default;
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(PhantomData<T>);
 
-		fn on_initialize() -> Weight {
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T>
+	where
+		T::AccountId: UncheckedFrom<T::Hash>,
+		T::AccountId: AsRef<[u8]>,
+	{
+		fn on_initialize(_block: T::BlockNumber) -> Weight {
 			// We do not want to go above the block limit and rather avoid lazy deletion
 			// in that case. This should only happen on runtime upgrades.
 			let weight_limit = T::BlockWeights::get().max_block
@@ -519,21 +265,29 @@ decl_module! {
 			Storage::<T>::process_deletion_queue_batch(weight_limit)
 				.saturating_add(T::WeightInfo::on_initialize())
 		}
+	}
 
+	#[pallet::call]
+	impl<T: Config> Pallet<T>
+	where
+		T::AccountId: UncheckedFrom<T::Hash>,
+		T::AccountId: AsRef<[u8]>,
+	{
 		/// Updates the schedule for metering contracts.
 		///
 		/// The schedule must have a greater version than the stored schedule.
-		#[weight = T::WeightInfo::update_schedule()]
-		pub fn update_schedule(origin, schedule: Schedule<T>) -> DispatchResult {
+		#[pallet::weight(T::WeightInfo::update_schedule())]
+		pub fn update_schedule(
+			origin: OriginFor<T>,
+			schedule: Schedule<T>
+		) -> DispatchResultWithPostInfo {
 			ensure_root(origin)?;
 			if <Module<T>>::current_schedule().version >= schedule.version {
 				Err(Error::<T>::InvalidScheduleVersion)?
 			}
-
-			Self::deposit_event(RawEvent::ScheduleUpdated(schedule.version));
+			Self::deposit_event(Event::ScheduleUpdated(schedule.version));
 			CurrentSchedule::put(schedule);
-
-			Ok(())
+			Ok(().into())
 		}
 
 		/// Makes a call to an account, optionally transferring some balance.
@@ -543,12 +297,12 @@ decl_module! {
 		/// * If the account is a regular account, any value will be transferred.
 		/// * If no account exists and the call value is not less than `existential_deposit`,
 		/// a regular account will be created and any value will be transferred.
-		#[weight = T::WeightInfo::call(T::MaxCodeSize::get() / 1024).saturating_add(*gas_limit)]
+		#[pallet::weight(T::WeightInfo::call(T::MaxCodeSize::get() / 1024).saturating_add(*gas_limit))]
 		pub fn call(
-			origin,
+			origin: OriginFor<T>,
 			dest: <T::Lookup as StaticLookup>::Source,
-			#[compact] value: BalanceOf<T>,
-			#[compact] gas_limit: Gas,
+			#[pallet::compact] value: BalanceOf<T>,
+			#[pallet::compact] gas_limit: Weight,
 			data: Vec<u8>
 		) -> DispatchResultWithPostInfo {
 			let origin = ensure_signed(origin)?;
@@ -584,17 +338,17 @@ decl_module! {
 		/// - The smart-contract account is created at the computed address.
 		/// - The `endowment` is transferred to the new account.
 		/// - The `deploy` function is executed in the context of the newly-created account.
-		#[weight =
+		#[pallet::weight(
 			T::WeightInfo::instantiate_with_code(
 				code.len() as u32 / 1024,
 				salt.len() as u32 / 1024,
 			)
 			.saturating_add(*gas_limit)
-		]
+		)]
 		pub fn instantiate_with_code(
-			origin,
-			#[compact] endowment: BalanceOf<T>,
-			#[compact] gas_limit: Gas,
+			origin: OriginFor<T>,
+			#[pallet::compact] endowment: BalanceOf<T>,
+			#[pallet::compact] gas_limit: Weight,
 			code: Vec<u8>,
 			data: Vec<u8>,
 			salt: Vec<u8>,
@@ -618,89 +372,289 @@ decl_module! {
 
 		/// Instantiates a contract from a previously deployed wasm binary.
 		///
-		/// This function is identical to [`Self::instantiate_with_code`] but without the
-		/// code deployment step. Instead, the `code_hash` of an on-chain deployed wasm binary
-		/// must be supplied.
-		#[weight =
-			T::WeightInfo::instantiate(T::MaxCodeSize::get() / 1024, salt.len() as u32 / 1024)
-				.saturating_add(*gas_limit)
-		]
-		pub fn instantiate(
-			origin,
-			#[compact] endowment: BalanceOf<T>,
-			#[compact] gas_limit: Gas,
-			code_hash: CodeHash<T>,
-			data: Vec<u8>,
-			salt: Vec<u8>,
-		) -> DispatchResultWithPostInfo {
-			let origin = ensure_signed(origin)?;
-			let mut gas_meter = GasMeter::new(gas_limit);
-			let schedule = <Module<T>>::current_schedule();
-			let executable = PrefabWasmModule::from_storage(code_hash, &schedule, &mut gas_meter)?;
-			let mut ctx = ExecutionContext::<T, PrefabWasmModule<T>>::top_level(origin, &schedule);
-			let code_len = executable.code_len();
-			let result = ctx.instantiate(endowment, &mut gas_meter, executable, data, &salt)
-				.map(|(_address, output)| output);
-			gas_meter.into_dispatch_result(
-				result,
-				T::WeightInfo::instantiate(code_len / 1024, salt.len() as u32 / 1024),
-			)
-		}
-
-		/// Allows block producers to claim a small reward for evicting a contract. If a block
-		/// producer fails to do so, a regular users will be allowed to claim the reward.
+		/// This function is identical to [`Self::instantiate_with_code`] but without the
+		/// code deployment step. Instead, the `code_hash` of an on-chain deployed wasm binary
+		/// must be supplied.
+		#[pallet::weight(
+			T::WeightInfo::instantiate(T::MaxCodeSize::get() / 1024, salt.len() as u32 / 1024)
+				.saturating_add(*gas_limit)
+		)]
+		pub fn instantiate(
+			origin: OriginFor<T>,
+			#[pallet::compact] endowment: BalanceOf<T>,
+			#[pallet::compact] gas_limit: Weight,
+			code_hash: CodeHash<T>,
+			data: Vec<u8>,
+			salt: Vec<u8>,
+		) -> DispatchResultWithPostInfo {
+			let origin = ensure_signed(origin)?;
+			let mut gas_meter = GasMeter::new(gas_limit);
+			let schedule = <Module<T>>::current_schedule();
+			let executable = PrefabWasmModule::from_storage(code_hash, &schedule, &mut gas_meter)?;
+			let mut ctx = ExecutionContext::<T, PrefabWasmModule<T>>::top_level(origin, &schedule);
+			let code_len = executable.code_len();
+			let result = ctx.instantiate(endowment, &mut gas_meter, executable, data, &salt)
+				.map(|(_address, output)| output);
+			gas_meter.into_dispatch_result(
+				result,
+				T::WeightInfo::instantiate(code_len / 1024, salt.len() as u32 / 1024),
+			)
+		}
+
+		/// Allows block producers to claim a small reward for evicting a contract. If a block
+		/// producer fails to do so, a regular users will be allowed to claim the reward.
+		///
+		/// In case of a successful eviction no fees are charged from the sender. However, the
+		/// reward is capped by the total amount of rent that was payed by the contract while
+		/// it was alive.
+		///
+		/// If contract is not evicted as a result of this call, [`Error::ContractNotEvictable`]
+		/// is returned and the sender is not eligible for the reward.
+		#[pallet::weight(T::WeightInfo::claim_surcharge(T::MaxCodeSize::get() / 1024))]
+		pub fn claim_surcharge(
+			origin: OriginFor<T>,
+			dest: T::AccountId,
+			aux_sender: Option<T::AccountId>
+		) -> DispatchResultWithPostInfo {
+			let origin = origin.into();
+			let (signed, rewarded) = match (origin, aux_sender) {
+				(Ok(frame_system::RawOrigin::Signed(account)), None) => {
+					(true, account)
+				},
+				(Ok(frame_system::RawOrigin::None), Some(aux_sender)) => {
+					(false, aux_sender)
+				},
+				_ => Err(Error::<T>::InvalidSurchargeClaim)?,
+			};
+
+			// Add some advantage for block producers (who send unsigned extrinsics) by
+			// adding a handicap: for signed extrinsics we use a slightly older block number
+			// for the eviction check. This can be viewed as if we pushed regular users back in past.
+			let handicap = if signed {
+				T::SignedClaimHandicap::get()
+			} else {
+				Zero::zero()
+			};
+
+			// If poking the contract has lead to eviction of the contract, give out the rewards.
+			match Rent::<T, PrefabWasmModule<T>>::try_eviction(&dest, handicap)? {
+				(Some(rent_payed), code_len) => {
+					T::Currency::deposit_into_existing(
+						&rewarded,
+						T::SurchargeReward::get().min(rent_payed),
+					)
+					.map(|_| PostDispatchInfo {
+						actual_weight: Some(T::WeightInfo::claim_surcharge(code_len / 1024)),
+						pays_fee: Pays::No,
+					})
+					.map_err(Into::into)
+				}
+				(None, code_len) => Err(Error::<T>::ContractNotEvictable.with_weight(
+					T::WeightInfo::claim_surcharge(code_len / 1024)
+				)),
+			}
+		}
+	}
+
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	#[pallet::metadata(T::AccountId = "AccountId", T::Hash = "Hash", BalanceOf<T> = "Balance")]
+	pub enum Event<T: Config> {
+		/// Contract deployed by address at the specified address. \[deployer, contract\]
+		Instantiated(T::AccountId, T::AccountId),
+
+		/// Contract has been evicted and is now in tombstone state. \[contract\]
+		Evicted(T::AccountId),
+
+		/// Contract has been terminated without leaving a tombstone.
+		/// \[contract, beneficiary\]
+		///
+		/// # Params
+		///
+		/// - `contract`: The contract that was terminated.
+		/// - `beneficiary`: The account that received the contracts remaining balance.
+		///
+		/// # Note
+		///
+		/// The only way for a contract to be removed without a tombstone and emitting
+		/// this event is by calling `seal_terminate`.
+		Terminated(T::AccountId, T::AccountId),
+
+		/// Restoration of a contract has been successful.
+		/// \[restorer, dest, code_hash, rent_allowance\]
+		///
+		/// # Params
+		///
+		/// - `restorer`: Account ID of the restoring contract.
+		/// - `dest`: Account ID of the restored contract.
+		/// - `code_hash`: Code hash of the restored contract.
+		/// - `rent_allowance`: Rent allowance of the restored contract.
+		Restored(T::AccountId, T::AccountId, T::Hash, BalanceOf<T>),
+
+		/// Code with the specified hash has been stored. \[code_hash\]
+		CodeStored(T::Hash),
+
+		/// Triggered when the current schedule is updated.
+		/// \[version\]
+		///
+		/// # Params
+		///
+		/// - `version`: The version of the newly set schedule.
+		ScheduleUpdated(u32),
+
+		/// A custom event emitted by the contract.
+		/// \[contract, data\]
+		///
+		/// # Params
+		///
+		/// - `contract`: The contract that emitted the event.
+		/// - `data`: Data supplied by the contract. Metadata generated during contract
+		///           compilation is needed to decode it.
+		ContractEmitted(T::AccountId, Vec<u8>),
+
+		/// A code with the specified hash was removed.
+		/// \[code_hash\]
+		///
+		/// This happens when the last contract that uses this code hash was removed or evicted.
+		CodeRemoved(T::Hash),
+	}
+
+	#[pallet::error]
+	pub enum Error<T> {
+		/// A new schedule must have a greater version than the current one.
+		InvalidScheduleVersion,
+		/// An origin must be signed or inherent and auxiliary sender only provided on inherent.
+		InvalidSurchargeClaim,
+		/// Cannot restore from nonexisting or tombstone contract.
+		InvalidSourceContract,
+		/// Cannot restore to nonexisting or alive contract.
+		InvalidDestinationContract,
+		/// Tombstones don't match.
+		InvalidTombstone,
+		/// An origin TrieId written in the current block.
+		InvalidContractOrigin,
+		/// The executed contract exhausted its gas limit.
+		OutOfGas,
+		/// The output buffer supplied to a contract API call was too small.
+		OutputBufferTooSmall,
+		/// Performing the requested transfer would have brought the contract below
+		/// the subsistence threshold. No transfer is allowed to do this in order to allow
+		/// for a tombstone to be created. Use `seal_terminate` to remove a contract without
+		/// leaving a tombstone behind.
+		BelowSubsistenceThreshold,
+		/// The newly created contract is below the subsistence threshold after executing
+		/// its contructor. No contracts are allowed to exist below that threshold.
+		NewContractNotFunded,
+		/// Performing the requested transfer failed for a reason originating in the
+		/// chosen currency implementation of the runtime. Most probably the balance is
+		/// too low or locks are placed on it.
+		TransferFailed,
+		/// Performing a call was denied because the calling depth reached the limit
+		/// of what is specified in the schedule.
+		MaxCallDepthReached,
+		/// The contract that was called is either no contract at all (a plain account)
+		/// or is a tombstone.
+		NotCallable,
+		/// The code supplied to `instantiate_with_code` exceeds the limit specified in the
+		/// current schedule.
+		CodeTooLarge,
+		/// No code could be found at the supplied code hash.
+		CodeNotFound,
+		/// A buffer outside of sandbox memory was passed to a contract API function.
+		OutOfBounds,
+		/// Input passed to a contract API function failed to decode as expected type.
+		DecodingFailed,
+		/// Contract trapped during execution.
+		ContractTrapped,
+		/// The size defined in `T::MaxValueSize` was exceeded.
+		ValueTooLarge,
+		/// The action performed is not allowed while the contract performing it is already
+		/// on the call stack. Those actions are contract self destruction and restoration
+		/// of a tombstone.
+		ReentranceDenied,
+		/// `seal_input` was called twice from the same contract execution context.
+		InputAlreadyRead,
+		/// The subject passed to `seal_random` exceeds the limit.
+		RandomSubjectTooLong,
+		/// The amount of topics passed to `seal_deposit_events` exceeds the limit.
+		TooManyTopics,
+		/// The topics passed to `seal_deposit_events` contains at least one duplicate.
+		DuplicateTopics,
+		/// The chain does not provide a chain extension. Calling the chain extension results
+		/// in this error. Note that this usually  shouldn't happen as deploying such contracts
+		/// is rejected.
+		NoChainExtension,
+		/// Removal of a contract failed because the deletion queue is full.
+		///
+		/// This can happen when either calling [`Pallet::claim_surcharge`] or `seal_terminate`.
+		/// The queue is filled by deleting contracts and emptied by a fixed amount each block.
+		/// Trying again during another block is the only way to resolve this issue.
+		DeletionQueueFull,
+		/// A contract could not be evicted because it has enough balance to pay rent.
 		///
-		/// In case of a successful eviction no fees are charged from the sender. However, the
-		/// reward is capped by the total amount of rent that was payed by the contract while
-		/// it was alive.
+		/// This can be returned from [`Pallet::claim_surcharge`] because the target
+		/// contract has enough balance to pay for its rent.
+		ContractNotEvictable,
+		/// A storage modification exhausted the 32bit type that holds the storage size.
 		///
-		/// If contract is not evicted as a result of this call, [`Error::ContractNotEvictable`]
-		/// is returned and the sender is not eligible for the reward.
-		#[weight = T::WeightInfo::claim_surcharge(T::MaxCodeSize::get() / 1024)]
-		pub fn claim_surcharge(
-			origin,
-			dest: T::AccountId,
-			aux_sender: Option<T::AccountId>
-		) -> DispatchResultWithPostInfo {
-			let origin = origin.into();
-			let (signed, rewarded) = match (origin, aux_sender) {
-				(Ok(frame_system::RawOrigin::Signed(account)), None) => {
-					(true, account)
-				},
-				(Ok(frame_system::RawOrigin::None), Some(aux_sender)) => {
-					(false, aux_sender)
-				},
-				_ => Err(Error::<T>::InvalidSurchargeClaim)?,
-			};
+		/// This can either happen when the accumulated storage in bytes is too large or
+		/// when number of storage items is too large.
+		StorageExhausted,
+		/// A contract with the same AccountId already exists.
+		DuplicateContract,
+	}
 
-			// Add some advantage for block producers (who send unsigned extrinsics) by
-			// adding a handicap: for signed extrinsics we use a slightly older block number
-			// for the eviction check. This can be viewed as if we pushed regular users back in past.
-			let handicap = if signed {
-				T::SignedClaimHandicap::get()
-			} else {
-				Zero::zero()
-			};
+	/// Current cost schedule for contracts.
+	#[pallet::storage]
+	#[pallet::getter(fn current_schedule)]
+	pub(super) type CurrentSchedule<T: Config> = StorageValue<_, Schedule<T>, ValueQuery>;
 
-			// If poking the contract has lead to eviction of the contract, give out the rewards.
-			match Rent::<T, PrefabWasmModule<T>>::try_eviction(&dest, handicap)? {
-				(Some(rent_payed), code_len) => {
-					T::Currency::deposit_into_existing(
-						&rewarded,
-						T::SurchargeReward::get().min(rent_payed),
-					)
-					.map(|_| PostDispatchInfo {
-						actual_weight: Some(T::WeightInfo::claim_surcharge(code_len / 1024)),
-						pays_fee: Pays::No,
-					})
-					.map_err(Into::into)
-				}
-				(None, code_len) => Err(Error::<T>::ContractNotEvictable.with_weight(
-					T::WeightInfo::claim_surcharge(code_len / 1024)
-				)),
+	/// A mapping from an original code hash to the original code, untouched by instrumentation.
+	#[pallet::storage]
+	pub type PristineCode<T: Config> = StorageMap<_, Identity, CodeHash<T>, Vec<u8>>;
+
+	/// A mapping between an original code hash and instrumented wasm code, ready for execution.
+	#[pallet::storage]
+	pub type CodeStorage<T: Config> = StorageMap<_, Identity, CodeHash<T>, PrefabWasmModule<T>>;
+
+	/// The subtrie counter.
+	#[pallet::storage]
+	pub type AccountCounter<T: Config> = StorageValue<_, u64, ValueQuery>;
+
+	/// The code associated with a given account.
+	///
+	/// TWOX-NOTE: SAFE since `AccountId` is a secure hash.
+	#[pallet::storage]
+	pub type ContractInfoOf<T: Config> = StorageMap<_, Twox64Concat, T::AccountId, ContractInfo<T>>;
+
+	/// Evicted contracts that await child trie deletion.
+	///
+	/// Child trie deletion is a heavy operation depending on the amount of storage items
+	/// stored in said trie. Therefore this operation is performed lazily in `on_initialize`.
+	#[pallet::storage]
+	pub type DeletionQueue<T: Config> = StorageValue<_, Vec<DeletedContract>, ValueQuery>;
+
+	#[pallet::genesis_config]
+	pub struct GenesisConfig<T: Config> {
+		#[doc = "Current cost schedule for contracts."]
+		pub current_schedule: Schedule<T>,
+	}
+
+	#[cfg(feature = "std")]
+	impl<T: Config> Default for GenesisConfig<T> {
+		fn default() -> Self {
+			Self {
+				current_schedule: Default::default(),
 			}
 		}
 	}
+
+	#[pallet::genesis_build]
+	impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+		fn build(&self) {
+			<CurrentSchedule<T>>::put(&self.current_schedule);
+		}
+	}
 }
 
 impl<T: Config> Module<T>
@@ -717,7 +671,7 @@ where
 		origin: T::AccountId,
 		dest: T::AccountId,
 		value: BalanceOf<T>,
-		gas_limit: Gas,
+		gas_limit: Weight,
 		input_data: Vec<u8>,
 	) -> ContractExecResult {
 		let mut gas_meter = GasMeter::new(gas_limit);
@@ -783,7 +737,7 @@ where
 
 	/// Store code for benchmarks which does not check nor instrument the code.
 	#[cfg(feature = "runtime-benchmarks")]
-	fn store_code_raw(code: Vec<u8>) -> DispatchResult {
+	fn store_code_raw(code: Vec<u8>) -> frame_support::dispatch::DispatchResult {
 		let schedule = <Module<T>>::current_schedule();
 		PrefabWasmModule::store_code_unchecked(code, &schedule)?;
 		Ok(())
@@ -794,99 +748,129 @@ where
 	fn reinstrument_module(
 		module: &mut PrefabWasmModule<T>,
 		schedule: &Schedule<T>
-	) -> DispatchResult {
+	) -> frame_support::dispatch::DispatchResult {
 		self::wasm::reinstrument(module, schedule)
 	}
 }
 
-decl_event! {
-	pub enum Event<T>
-	where
-		Balance = BalanceOf<T>,
-		<T as frame_system::Config>::AccountId,
-		<T as frame_system::Config>::Hash
-	{
-		/// Contract deployed by address at the specified address. \[deployer, contract\]
-		Instantiated(AccountId, AccountId),
+/// Information for managing an account and its sub trie abstraction.
+/// This is the required info to cache for an account
+#[derive(Encode, Decode, RuntimeDebug)]
+pub enum ContractInfo<T: Config> {
+	Alive(AliveContractInfo<T>),
+	Tombstone(TombstoneContractInfo<T>),
+}
 
-		/// Contract has been evicted and is now in tombstone state. \[contract\]
-		Evicted(AccountId),
+impl<T: Config> ContractInfo<T> {
+	/// If contract is alive then return some alive info
+	pub fn get_alive(self) -> Option<AliveContractInfo<T>> {
+		if let ContractInfo::Alive(alive) = self {
+			Some(alive)
+		} else {
+			None
+		}
+	}
+	/// If contract is alive then return some reference to alive info
+	pub fn as_alive(&self) -> Option<&AliveContractInfo<T>> {
+		if let ContractInfo::Alive(ref alive) = self {
+			Some(alive)
+		} else {
+			None
+		}
+	}
+	/// If contract is alive then return some mutable reference to alive info
+	pub fn as_alive_mut(&mut self) -> Option<&mut AliveContractInfo<T>> {
+		if let ContractInfo::Alive(ref mut alive) = self {
+			Some(alive)
+		} else {
+			None
+		}
+	}
 
-		/// Contract has been terminated without leaving a tombstone.
-		/// \[contract, beneficiary\]
-		///
-		/// # Params
-		///
-		/// - `contract`: The contract that was terminated.
-		/// - `beneficiary`: The account that received the contracts remaining balance.
-		///
-		/// # Note
-		///
-		/// The only way for a contract to be removed without a tombstone and emitting
-		/// this event is by calling `seal_terminate`.
-		Terminated(AccountId, AccountId),
+	/// If contract is tombstone then return some tombstone info
+	pub fn get_tombstone(self) -> Option<TombstoneContractInfo<T>> {
+		if let ContractInfo::Tombstone(tombstone) = self {
+			Some(tombstone)
+		} else {
+			None
+		}
+	}
+	/// If contract is tombstone then return some reference to tombstone info
+	pub fn as_tombstone(&self) -> Option<&TombstoneContractInfo<T>> {
+		if let ContractInfo::Tombstone(ref tombstone) = self {
+			Some(tombstone)
+		} else {
+			None
+		}
+	}
+	/// If contract is tombstone then return some mutable reference to tombstone info
+	pub fn as_tombstone_mut(&mut self) -> Option<&mut TombstoneContractInfo<T>> {
+		if let ContractInfo::Tombstone(ref mut tombstone) = self {
+			Some(tombstone)
+		} else {
+			None
+		}
+	}
+}
 
-		/// Restoration of a contract has been successful.
-		/// \[restorer, dest, code_hash, rent_allowance\]
-		///
-		/// # Params
-		///
-		/// - `restorer`: Account ID of the restoring contract.
-		/// - `dest`: Account ID of the restored contract.
-		/// - `code_hash`: Code hash of the restored contract.
-		/// - `rent_allowance`: Rent allowance of the restored contract.
-		Restored(AccountId, AccountId, Hash, Balance),
+/// Information for managing an account and its sub trie abstraction.
+/// This is the required info to cache for an account.
+#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug)]
+pub struct RawAliveContractInfo<CodeHash, Balance, BlockNumber> {
+	/// Unique ID for the subtree encoded as a bytes vector.
+	pub trie_id: TrieId,
+	/// The total number of bytes used by this contract.
+	///
+	/// It is a sum of each key-value pair stored by this contract.
+	pub storage_size: u32,
+	/// The total number of key-value pairs in storage of this contract.
+	pub pair_count: u32,
+	/// The code associated with a given account.
+	pub code_hash: CodeHash,
+	/// Pay rent at most up to this value.
+	pub rent_allowance: Balance,
+	/// The amount of rent that was payed by the contract over its whole lifetime.
+	///
+	/// A restored contract starts with a value of zero just like a new contract.
+	pub rent_payed: Balance,
+	/// Last block rent has been payed.
+	pub deduct_block: BlockNumber,
+	/// Last block child storage has been written.
+	pub last_write: Option<BlockNumber>,
+}
 
-		/// Code with the specified hash has been stored. \[code_hash\]
-		CodeStored(Hash),
+impl<CodeHash, Balance, BlockNumber> RawAliveContractInfo<CodeHash, Balance, BlockNumber> {
+	/// Associated child trie unique id is built from the hash part of the trie id.
+	pub fn child_trie_info(&self) -> ChildInfo {
+		child_trie_info(&self.trie_id[..])
+	}
+}
 
-		/// Triggered when the current schedule is updated.
-		/// \[version\]
-		///
-		/// # Params
-		///
-		/// - `version`: The version of the newly set schedule.
-		ScheduleUpdated(u32),
+/// Associated child trie unique id is built from the hash part of the trie id.
+pub(crate) fn child_trie_info(trie_id: &[u8]) -> ChildInfo {
+	ChildInfo::new_default(trie_id)
+}
 
-		/// A custom event emitted by the contract.
-		/// \[contract, data\]
-		///
-		/// # Params
-		///
-		/// - `contract`: The contract that emitted the event.
-		/// - `data`: Data supplied by the contract. Metadata generated during contract
-		///           compilation is needed to decode it.
-		ContractEmitted(AccountId, Vec<u8>),
+#[derive(Encode, Decode, PartialEq, Eq, RuntimeDebug)]
+pub struct RawTombstoneContractInfo<H, Hasher>(H, PhantomData<Hasher>);
 
-		/// A code with the specified hash was removed.
-		/// \[code_hash\]
-		///
-		/// This happens when the last contract that uses this code hash was removed or evicted.
-		CodeRemoved(Hash),
+impl<H, Hasher> RawTombstoneContractInfo<H, Hasher>
+where
+	H: Member + MaybeSerializeDeserialize+ Debug
+		+ AsRef<[u8]> + AsMut<[u8]> + Copy + Default
+		+ sp_std::hash::Hash + Codec,
+	Hasher: Hash<Output=H>,
+{
+	fn new(storage_root: &[u8], code_hash: H) -> Self {
+		let mut buf = Vec::new();
+		storage_root.using_encoded(|encoded| buf.extend_from_slice(encoded));
+		buf.extend_from_slice(code_hash.as_ref());
+		RawTombstoneContractInfo(<Hasher as Hash>::hash(&buf[..]), PhantomData)
 	}
 }
 
-decl_storage! {
-	trait Store for Module<T: Config> as Contracts
-	where
-		T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
-	{
-		/// Current cost schedule for contracts.
-		CurrentSchedule get(fn current_schedule) config(): Schedule<T> = Default::default();
-		/// A mapping from an original code hash to the original code, untouched by instrumentation.
-		pub PristineCode: map hasher(identity) CodeHash<T> => Option<Vec<u8>>;
-		/// A mapping between an original code hash and instrumented wasm code, ready for execution.
-		pub CodeStorage: map hasher(identity) CodeHash<T> => Option<PrefabWasmModule<T>>;
-		/// The subtrie counter.
-		pub AccountCounter: u64 = 0;
-		/// The code associated with a given account.
-		///
-		/// TWOX-NOTE: SAFE since `AccountId` is a secure hash.
-		pub ContractInfoOf: map hasher(twox_64_concat) T::AccountId => Option<ContractInfo<T>>;
-		/// Evicted contracts that await child trie deletion.
-		///
-		/// Child trie deletion is a heavy operation depending on the amount of storage items
-		/// stored in said trie. Therefore this operation is performed lazily in `on_initialize`.
-		pub DeletionQueue: Vec<storage::DeletedContract>;
+impl<T: Config> From<AliveContractInfo<T>> for ContractInfo<T> {
+	fn from(alive_info: AliveContractInfo<T>) -> Self {
+		Self::Alive(alive_info)
 	}
 }
diff --git a/frame/contracts/src/rent.rs b/frame/contracts/src/rent.rs
index 087c6c518300..85b8eff98931 100644
--- a/frame/contracts/src/rent.rs
+++ b/frame/contracts/src/rent.rs
@@ -18,7 +18,7 @@
 //! A module responsible for computing the right amount of weight and charging it.
 
 use crate::{
-	AliveContractInfo, BalanceOf, ContractInfo, ContractInfoOf, Module, RawEvent,
+	AliveContractInfo, BalanceOf, ContractInfo, ContractInfoOf, Module, Event,
 	TombstoneContractInfo, Config, CodeHash, Error,
 	storage::Storage, wasm::PrefabWasmModule, exec::Executable,
 };
@@ -26,7 +26,7 @@ use sp_std::prelude::*;
 use sp_io::hashing::blake2_256;
 use sp_core::crypto::UncheckedFrom;
 use frame_support::{
-	debug, StorageMap,
+	debug,
 	storage::child,
 	traits::{Currency, ExistenceRequirement, Get, OnUnbalanced, WithdrawReasons},
 };
@@ -268,7 +268,7 @@ where
 				let tombstone_info = ContractInfo::Tombstone(tombstone);
 				<ContractInfoOf<T>>::insert(account, &tombstone_info);
 				code.drop_from_storage();
-				<Module<T>>::deposit_event(RawEvent::Evicted(account.clone()));
+				<Module<T>>::deposit_event(Event::Evicted(account.clone()));
 				Ok(None)
 			}
 			(Verdict::Evict { amount: _ }, None) => {
diff --git a/frame/contracts/src/storage.rs b/frame/contracts/src/storage.rs
index 2a2d5da225d6..244ab3788979 100644
--- a/frame/contracts/src/storage.rs
+++ b/frame/contracts/src/storage.rs
@@ -31,9 +31,8 @@ use sp_runtime::traits::{Bounded, Saturating, Zero};
 use sp_core::crypto::UncheckedFrom;
 use frame_support::{
 	dispatch::DispatchResult,
-	StorageMap,
 	debug,
-	storage::{child::{self, KillOutcome}, StorageValue},
+	storage::child::{self, KillOutcome},
 	traits::Get,
 	weights::Weight,
 };
@@ -196,10 +195,10 @@ where
 	/// You must make sure that the contract is also removed or converted into a tombstone
 	/// when queuing the trie for deletion.
 	pub fn queue_trie_for_deletion(contract: &AliveContractInfo<T>) -> DispatchResult {
-		if DeletionQueue::decode_len().unwrap_or(0) >= T::DeletionQueueDepth::get() as usize {
+		if <DeletionQueue<T>>::decode_len().unwrap_or(0) >= T::DeletionQueueDepth::get() as usize {
 			Err(Error::<T>::DeletionQueueFull.into())
 		} else {
-			DeletionQueue::append(DeletedContract {
+			<DeletionQueue<T>>::append(DeletedContract {
 				pair_count: contract.pair_count,
 				trie_id: contract.trie_id.clone(),
 			});
@@ -234,7 +233,7 @@ where
 	/// It returns the amount of weight used for that task or `None` when no weight was used
 	/// apart from the base weight.
 	pub fn process_deletion_queue_batch(weight_limit: Weight) -> Weight {
-		let queue_len = DeletionQueue::decode_len().unwrap_or(0);
+		let queue_len = <DeletionQueue<T>>::decode_len().unwrap_or(0);
 		if queue_len == 0 {
 			return weight_limit;
 		}
@@ -251,7 +250,7 @@ where
 			return weight_limit;
 		}
 
-		let mut queue = DeletionQueue::get();
+		let mut queue = <DeletionQueue<T>>::get();
 
 		while !queue.is_empty() && remaining_key_budget > 0 {
 			// Cannot panic due to loop condition
@@ -283,7 +282,7 @@ where
 				.saturating_sub(remaining_key_budget.min(pair_count));
 		}
 
-		DeletionQueue::put(queue);
+		<DeletionQueue<T>>::put(queue);
 		weight_limit.saturating_sub(weight_per_key.saturating_mul(remaining_key_budget as Weight))
 	}
 
@@ -293,7 +292,7 @@ where
 		use sp_runtime::traits::Hash;
 		// Note that skipping a value due to error is not an issue here.
 		// We only need uniqueness, not sequence.
-		let new_seed = AccountCounter::mutate(|v| {
+		let new_seed = <AccountCounter<T>>::mutate(|v| {
 			*v = v.wrapping_add(1);
 			*v
 		});
@@ -322,6 +321,6 @@ where
 			trie_id: vec![],
 		})
 		.collect();
-		DeletionQueue::put(queue);
+		<DeletionQueue<T>>::put(queue);
 	}
 }
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index f10cd2882ace..3fa806799e95 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -17,14 +17,15 @@
 
 use crate::{
 	BalanceOf, ContractInfo, ContractInfoOf, Module,
-	RawAliveContractInfo, RawEvent, Config, Schedule, gas::Gas,
-	Error, RuntimeReturnCode, storage::Storage,
+	RawAliveContractInfo, Config, Schedule,
+	Error, storage::Storage,
 	chain_extension::{
 		Result as ExtensionResult, Environment, ChainExtension, Ext, SysConfig, RetVal,
 		UncheckedFrom, InitState, ReturnFlags,
 	},
 	exec::{AccountIdOf, Executable}, wasm::PrefabWasmModule,
 	weights::WeightInfo,
+	wasm::ReturnCode as RuntimeReturnCode,
 };
 use assert_matches::assert_matches;
 use codec::Encode;
@@ -36,8 +37,8 @@ use sp_runtime::{
 use sp_io::hashing::blake2_256;
 use frame_support::{
 	assert_ok, assert_err, assert_err_ignore_postinfo,
-	parameter_types, StorageMap, StorageValue, assert_storage_noop,
-	traits::{Currency, ReservableCurrency, OnInitialize},
+	parameter_types, assert_storage_noop,
+	traits::{Currency, ReservableCurrency, OnInitialize, GenesisBuild},
 	weights::{Weight, PostDispatchInfo, DispatchClass, constants::WEIGHT_PER_SECOND},
 	dispatch::DispatchErrorWithPostInfo,
 	storage::child,
@@ -73,7 +74,7 @@ pub mod test_utils {
 		exec::{StorageKey, AccountIdOf},
 		Module as Contracts,
 	};
-	use frame_support::{StorageMap, traits::Currency};
+	use frame_support::traits::Currency;
 
 	pub fn set_storage(addr: &AccountIdOf<Test>, key: &StorageKey, value: Option<Vec<u8>>) {
 		let contract_info = <ContractInfoOf::<Test>>::get(&addr).unwrap().get_alive().unwrap();
@@ -292,7 +293,7 @@ pub const BOB: AccountId32 = AccountId32::new([2u8; 32]);
 pub const CHARLIE: AccountId32 = AccountId32::new([3u8; 32]);
 pub const DJANGO: AccountId32 = AccountId32::new([4u8; 32]);
 
-const GAS_LIMIT: Gas = 10_000_000_000;
+const GAS_LIMIT: Weight = 10_000_000_000;
 
 pub struct ExtBuilder {
 	existential_deposit: u64,
@@ -501,19 +502,19 @@ fn instantiate_and_call_and_deposit_event() {
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::pallet_contracts(RawEvent::CodeStored(code_hash.into())),
+					event: Event::pallet_contracts(crate::Event::CodeStored(code_hash.into())),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
 					event: Event::pallet_contracts(
-						RawEvent::ContractEmitted(addr.clone(), vec![1, 2, 3, 4])
+						crate::Event::ContractEmitted(addr.clone(), vec![1, 2, 3, 4])
 					),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::pallet_contracts(RawEvent::Instantiated(ALICE, addr.clone())),
+					event: Event::pallet_contracts(crate::Event::Instantiated(ALICE, addr.clone())),
 					topics: vec![],
 				},
 			]);
@@ -1230,12 +1231,16 @@ fn restoration(
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::pallet_contracts(RawEvent::CodeStored(set_rent_code_hash.into())),
+					event: Event::pallet_contracts(
+						crate::Event::CodeStored(set_rent_code_hash.into())
+					),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::pallet_contracts(RawEvent::Instantiated(ALICE, addr_bob.clone())),
+					event: Event::pallet_contracts(
+						crate::Event::Instantiated(ALICE, addr_bob.clone())
+					),
 					topics: vec![],
 				},
 			];
@@ -1275,7 +1280,9 @@ fn restoration(
 					},
 					EventRecord {
 						phase: Phase::Initialization,
-						event: Event::pallet_contracts(RawEvent::Instantiated(ALICE, addr_dummy.clone())),
+						event: Event::pallet_contracts(
+							crate::Event::Instantiated(ALICE, addr_dummy.clone())
+						),
 						topics: vec![],
 					},
 				].iter().cloned());
@@ -1401,7 +1408,7 @@ fn restoration(
 						assert_eq!(System::events(), vec![
 							EventRecord {
 								phase: Phase::Initialization,
-								event: Event::pallet_contracts(RawEvent::Evicted(addr_bob)),
+								event: Event::pallet_contracts(crate::Event::Evicted(addr_bob)),
 								topics: vec![],
 							},
 							EventRecord {
@@ -1433,12 +1440,16 @@ fn restoration(
 							},
 							EventRecord {
 								phase: Phase::Initialization,
-								event: Event::pallet_contracts(RawEvent::CodeStored(restoration_code_hash)),
+								event: Event::pallet_contracts(
+									crate::Event::CodeStored(restoration_code_hash)
+								),
 								topics: vec![],
 							},
 							EventRecord {
 								phase: Phase::Initialization,
-								event: Event::pallet_contracts(RawEvent::Instantiated(CHARLIE, addr_django.clone())),
+								event: Event::pallet_contracts(
+									crate::Event::Instantiated(CHARLIE, addr_django.clone())
+								),
 								topics: vec![],
 							},
 
@@ -1470,7 +1481,7 @@ fn restoration(
 				assert_eq!(System::events(), vec![
 					EventRecord {
 						phase: Phase::Initialization,
-						event: Event::pallet_contracts(RawEvent::CodeRemoved(restoration_code_hash)),
+						event: Event::pallet_contracts(crate::Event::CodeRemoved(restoration_code_hash)),
 						topics: vec![],
 					},
 					EventRecord {
@@ -1481,7 +1492,9 @@ fn restoration(
 					EventRecord {
 						phase: Phase::Initialization,
 						event: Event::pallet_contracts(
-							RawEvent::Restored(addr_django, addr_bob, bob_contract.code_hash, 50)
+							crate::Event::Restored(
+								addr_django, addr_bob, bob_contract.code_hash, 50
+							)
 						),
 						topics: vec![],
 					},
@@ -1720,13 +1733,13 @@ fn self_destruct_works() {
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::pallet_contracts(RawEvent::CodeRemoved(code_hash)),
+					event: Event::pallet_contracts(crate::Event::CodeRemoved(code_hash)),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
 					event: Event::pallet_contracts(
-						RawEvent::Terminated(addr.clone(), DJANGO)
+						crate::Event::Terminated(addr.clone(), DJANGO)
 					),
 					topics: vec![],
 				},
diff --git a/frame/contracts/src/wasm/code_cache.rs b/frame/contracts/src/wasm/code_cache.rs
index 1132d31776db..0b2512f17f59 100644
--- a/frame/contracts/src/wasm/code_cache.rs
+++ b/frame/contracts/src/wasm/code_cache.rs
@@ -28,13 +28,13 @@
 //! Thus, before executing a contract it should be reinstrument with new schedule.
 
 use crate::{
-	CodeHash, CodeStorage, PristineCode, Schedule, Config, Error,
-	wasm::{prepare, PrefabWasmModule}, Module as Contracts, RawEvent,
-	gas::{Gas, GasMeter, Token},
+	CodeHash, CodeStorage, PristineCode, Schedule, Config, Error, Weight,
+	wasm::{prepare, PrefabWasmModule}, Module as Contracts, Event,
+	gas::{GasMeter, Token},
 	weights::WeightInfo,
 };
 use sp_core::crypto::UncheckedFrom;
-use frame_support::{StorageMap, dispatch::DispatchError};
+use frame_support::dispatch::DispatchError;
 #[cfg(feature = "runtime-benchmarks")]
 pub use self::private::reinstrument as reinstrument;
 
@@ -58,7 +58,7 @@ where
 			Some(module) => increment_64(&mut module.refcount),
 			None => {
 				*existing = Some(prefab_module);
-				Contracts::<T>::deposit_event(RawEvent::CodeStored(code_hash))
+				Contracts::<T>::deposit_event(Event::CodeStored(code_hash))
 			}
 		}
 	});
@@ -170,7 +170,7 @@ where
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
 {
 	<PristineCode<T>>::remove(code_hash);
-	Contracts::<T>::deposit_event(RawEvent::CodeRemoved(code_hash))
+	Contracts::<T>::deposit_event(Event::CodeRemoved(code_hash))
 }
 
 /// Increment the refcount panicking if it should ever overflow (which will not happen).
@@ -196,7 +196,7 @@ struct InstrumentToken(u32);
 impl<T: Config> Token<T> for InstrumentToken {
 	type Metadata = ();
 
-	fn calculate_amount(&self, _metadata: &Self::Metadata) -> Gas {
+	fn calculate_amount(&self, _metadata: &Self::Metadata) -> Weight {
 		T::WeightInfo::instrument(self.0 / 1024)
 	}
 }
diff --git a/frame/contracts/src/wasm/env_def/macros.rs b/frame/contracts/src/wasm/env_def/macros.rs
index dbb6705e9722..3c10d3225e43 100644
--- a/frame/contracts/src/wasm/env_def/macros.rs
+++ b/frame/contracts/src/wasm/env_def/macros.rs
@@ -20,13 +20,11 @@
 //!
 //! Most likely you should use `define_env` macro.
 
-#[macro_export]
 macro_rules! convert_args {
 	() => (vec![]);
 	( $( $t:ty ),* ) => ( vec![ $( { use $crate::wasm::env_def::ConvertibleToWasm; <$t>::VALUE_TYPE }, )* ] );
 }
 
-#[macro_export]
 macro_rules! gen_signature {
 	( ( $( $params: ty ),* ) ) => (
 		{
@@ -43,7 +41,6 @@ macro_rules! gen_signature {
 	);
 }
 
-#[macro_export]
 macro_rules! gen_signature_dispatch {
 	(
 		$needle_name:ident,
@@ -102,7 +99,6 @@ where
 	f
 }
 
-#[macro_export]
 macro_rules! unmarshall_then_body_then_marshall {
 	( $args_iter:ident, $ctx:ident, ( $( $names:ident : $params:ty ),* ) -> $returns:ty => $body:tt ) => ({
 		let body = $crate::wasm::env_def::macros::constrain_closure::<
@@ -128,7 +124,6 @@ macro_rules! unmarshall_then_body_then_marshall {
 	})
 }
 
-#[macro_export]
 macro_rules! define_func {
 	( < E: $seal_ty:tt > $name:ident ( $ctx: ident $(, $names:ident : $params:ty)*) $(-> $returns:ty)* => $body:tt ) => {
 		fn $name< E: $seal_ty >(
@@ -152,7 +147,6 @@ macro_rules! define_func {
 	};
 }
 
-#[macro_export]
 macro_rules! register_func {
 	( $reg_cb:ident, < E: $seal_ty:tt > ; ) => {};
 
@@ -215,9 +209,9 @@ mod tests {
 	use sp_runtime::traits::Zero;
 	use sp_sandbox::{ReturnValue, Value};
 	use crate::{
+		Weight,
 		wasm::{Runtime, runtime::TrapReason, tests::MockExt},
 		exec::Ext,
-		gas::Gas,
 	};
 
 	struct TestRuntime {
@@ -282,7 +276,7 @@ mod tests {
 	#[test]
 	fn macro_define_func() {
 		define_func!( <E: Ext> seal_gas (_ctx, amount: u32) => {
-			let amount = Gas::from(amount);
+			let amount = Weight::from(amount);
 			if !amount.is_zero() {
 				Ok(())
 			} else {
@@ -334,7 +328,7 @@ mod tests {
 
 		define_env!(Env, <E: Ext>,
 			seal_gas( _ctx, amount: u32 ) => {
-				let amount = Gas::from(amount);
+				let amount = Weight::from(amount);
 				if !amount.is_zero() {
 					Ok(())
 				} else {
diff --git a/frame/contracts/src/wasm/env_def/mod.rs b/frame/contracts/src/wasm/env_def/mod.rs
index 0d9ceeee0237..997ec29e028d 100644
--- a/frame/contracts/src/wasm/env_def/mod.rs
+++ b/frame/contracts/src/wasm/env_def/mod.rs
@@ -22,7 +22,7 @@ use sp_sandbox::Value;
 use parity_wasm::elements::{FunctionType, ValueType};
 
 #[macro_use]
-pub(crate) mod macros;
+pub mod macros;
 
 pub trait ConvertibleToWasm: Sized {
 	const VALUE_TYPE: ValueType;
@@ -67,13 +67,13 @@ impl ConvertibleToWasm for u64 {
 	}
 }
 
-pub(crate) type HostFunc<E> =
+pub type HostFunc<E> =
 	fn(
 		&mut Runtime<E>,
 		&[sp_sandbox::Value]
 	) -> Result<sp_sandbox::ReturnValue, sp_sandbox::HostError>;
 
-pub(crate) trait FunctionImplProvider<E: Ext> {
+pub trait FunctionImplProvider<E: Ext> {
 	fn impls<F: FnMut(&[u8], HostFunc<E>)>(f: &mut F);
 }
 
diff --git a/frame/contracts/src/wasm/mod.rs b/frame/contracts/src/wasm/mod.rs
index c6970b2b1eb0..9001e2b8e92d 100644
--- a/frame/contracts/src/wasm/mod.rs
+++ b/frame/contracts/src/wasm/mod.rs
@@ -38,6 +38,8 @@ use pallet_contracts_primitives::ExecResult;
 pub use self::runtime::{ReturnCode, Runtime, RuntimeToken};
 #[cfg(feature = "runtime-benchmarks")]
 pub use self::code_cache::reinstrument;
+#[cfg(test)]
+pub use tests::MockExt;
 
 /// A prepared wasm module ready for execution.
 ///
@@ -237,7 +239,7 @@ mod tests {
 	use crate::{
 		CodeHash, BalanceOf, Error, Module as Contracts,
 		exec::{Ext, StorageKey, AccountIdOf, Executable},
-		gas::{Gas, GasMeter},
+		gas::GasMeter,
 		tests::{Test, Call, ALICE, BOB},
 	};
 	use std::collections::HashMap;
@@ -248,7 +250,7 @@ mod tests {
 	use assert_matches::assert_matches;
 	use pallet_contracts_primitives::{ExecReturnValue, ReturnFlags, ExecError, ErrorOrigin};
 
-	const GAS_LIMIT: Gas = 10_000_000_000;
+	const GAS_LIMIT: Weight = 10_000_000_000;
 
 	#[derive(Debug, PartialEq, Eq)]
 	struct DispatchEntry(Call);
@@ -1202,7 +1204,7 @@ mod tests {
 			&mut gas_meter,
 		).unwrap();
 
-		let gas_left = Gas::decode(&mut output.data.as_slice()).unwrap();
+		let gas_left = Weight::decode(&mut output.data.as_slice()).unwrap();
 		assert!(gas_left < GAS_LIMIT, "gas_left must be less than initial");
 		assert!(gas_left > gas_meter.gas_left(), "gas_left must be greater than final");
 	}
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index 020be381851f..e0f7626b95a9 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -20,11 +20,11 @@
 use crate::{
 	HostFnWeights, Config, CodeHash, BalanceOf, Error,
 	exec::{Ext, StorageKey, TopicOf},
-	gas::{Gas, GasMeter, Token, ChargedAmount},
+	gas::{GasMeter, Token, ChargedAmount},
 	wasm::env_def::ConvertibleToWasm,
 };
 use parity_wasm::elements::ValueType;
-use frame_support::{dispatch::DispatchError, ensure, traits::Get};
+use frame_support::{dispatch::DispatchError, ensure, traits::Get, weights::Weight};
 use sp_std::prelude::*;
 use codec::{Decode, DecodeAll, Encode};
 use sp_runtime::traits::SaturatedConversion;
@@ -223,7 +223,7 @@ where
 {
 	type Metadata = HostFnWeights<T>;
 
-	fn calculate_amount(&self, s: &Self::Metadata) -> Gas {
+	fn calculate_amount(&self, s: &Self::Metadata) -> Weight {
 		use self::RuntimeToken::*;
 		match *self {
 			MeteringBlock(amount) => s.gas.saturating_add(amount.into()),

From 061ff5d72cc9864cdff3f101237bd54b99f71ddf Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Mon, 22 Feb 2021 17:46:45 +0100
Subject: [PATCH 0419/1194] Fix: stash account reaped when ledger.active == ED
 (#8170)

* do not reap account when active == ed

* add tests + refactor
---
 frame/staking/reward-curve/src/lib.rs |  4 +--
 frame/staking/src/lib.rs              |  4 +--
 frame/staking/src/tests.rs            | 37 +++++++++++++++++++++++++++
 test-utils/src/lib.rs                 |  2 +-
 4 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/frame/staking/reward-curve/src/lib.rs b/frame/staking/reward-curve/src/lib.rs
index cf7d69c24053..2e1bc1f1859d 100644
--- a/frame/staking/reward-curve/src/lib.rs
+++ b/frame/staking/reward-curve/src/lib.rs
@@ -420,14 +420,14 @@ fn generate_test_module(input: &INposInput) -> TokenStream2 {
 							/ float_res as u64
 						) as u32;
 						if err > #precision {
-							panic!(format!("\n\
+							panic!("\n\
 								Generated reward curve approximation differ from real one:\n\t\
 								for i = {} and base = {}, f(i/base) * base = {},\n\t\
 								but approximation = {},\n\t\
 								err = {:07} millionth,\n\t\
 								try increase the number of segment: {} or the test_error: {}.\n",
 								i, base, float_res, int_res, err, #max_piece_count, #precision
-							));
+							);
 						}
 					}
 				}
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 3ea66e937e83..47e835c2709f 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -1638,7 +1638,7 @@ decl_module! {
 				ledger = ledger.consolidate_unlocked(current_era)
 			}
 
-			let post_info_weight = if ledger.unlocking.is_empty() && ledger.active <= T::Currency::minimum_balance() {
+			let post_info_weight = if ledger.unlocking.is_empty() && ledger.active < T::Currency::minimum_balance() {
 				// This account must have called `unbond()` with some value that caused the active
 				// portion to fall below existential deposit + will have no more unlocking chunks
 				// left. We can now safely remove all staking-related information.
@@ -3080,7 +3080,7 @@ impl<T: Config> Module<T> {
 	/// Assumes storage is upgraded before calling.
 	///
 	/// This is called:
-	/// - after a `withdraw_unbond()` call that frees all of a stash's bonded balance.
+	/// - after a `withdraw_unbonded()` call that frees all of a stash's bonded balance.
 	/// - through `reap_stash()` if the balance has fallen to zero (through slashing).
 	fn kill_stash(stash: &T::AccountId, num_slashing_spans: u32) -> DispatchResult {
 		let controller = <Bonded<T>>::get(stash).ok_or(Error::<T>::NotStash)?;
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index 1f5e2a48888a..e5781fe8480c 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -4978,3 +4978,40 @@ fn cannot_bond_extra_to_lower_than_ed() {
 			);
 		})
 }
+
+#[test]
+fn do_not_die_when_active_is_ed() {
+	let ed = 10;
+	ExtBuilder::default()
+		.existential_deposit(ed)
+		.build_and_execute(|| {
+			// initial stuff.
+			assert_eq!(
+				Staking::ledger(&20).unwrap(),
+				StakingLedger {
+					stash: 21,
+					total: 1000,
+					active: 1000,
+					unlocking: vec![],
+					claimed_rewards: vec![]
+				}
+			);
+
+			// unbond all of it except ed.
+			assert_ok!(Staking::unbond(Origin::signed(20), 1000 - ed));
+			start_active_era(3);
+			assert_ok!(Staking::withdraw_unbonded(Origin::signed(20), 100));
+
+			// initial stuff.
+			assert_eq!(
+				Staking::ledger(&20).unwrap(),
+				StakingLedger {
+					stash: 21,
+					total: ed,
+					active: ed,
+					unlocking: vec![],
+					claimed_rewards: vec![]
+				}
+			);
+		})
+}
diff --git a/test-utils/src/lib.rs b/test-utils/src/lib.rs
index a2e83fe7b0bf..b3a0f322a639 100644
--- a/test-utils/src/lib.rs
+++ b/test-utils/src/lib.rs
@@ -72,7 +72,7 @@ macro_rules! assert_eq_uvec {
 macro_rules! __assert_eq_uvec {
 	( $x:expr, $y:expr ) => {
 		$x.iter().for_each(|e| {
-			if !$y.contains(e) { panic!(format!("vectors not equal: {:?} != {:?}", $x, $y)); }
+			if !$y.contains(e) { panic!("vectors not equal: {:?} != {:?}", $x, $y); }
 		});
 	}
 }

From 2237564b2aa6e8f7fb3f7dcb284b63b15e25b4da Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Mon, 22 Feb 2021 18:57:02 +0100
Subject: [PATCH 0420/1194] Bump thread_local (#8174)

---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5c59e29c3ebd..1f5d4bab32d6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9427,9 +9427,9 @@ dependencies = [
 
 [[package]]
 name = "thread_local"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8208a331e1cb318dd5bd76951d2b8fc48ca38a69f5f4e4af1b6a9f8c6236915"
+checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd"
 dependencies = [
  "once_cell",
 ]

From 528c14b3c96bb93d3029451f0706a079d7d7a9bb Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Mon, 22 Feb 2021 11:24:12 -0800
Subject: [PATCH 0421/1194] Return number of keys removed when calling
 `storage_kill` on child trie (#8166)

* Initial piping of returning amount of keys killed

* One more test for `None` limit

* forgot to update

* fix return value

* use version 3

* Update to return `KillOutcome`

* Update name to KillChildStorageResult
---
 frame/contracts/src/storage.rs              |  6 +--
 frame/support/src/storage/child.rs          | 17 ++-----
 primitives/externalities/src/lib.rs         |  7 +--
 primitives/io/src/lib.rs                    | 50 +++++++++++++++++++--
 primitives/state-machine/src/basic.rs       | 29 ++++++++++--
 primitives/state-machine/src/ext.rs         |  9 ++--
 primitives/state-machine/src/lib.rs         | 16 ++++---
 primitives/state-machine/src/read_only.rs   |  2 +-
 primitives/state-machine/src/testing.rs     |  2 +-
 primitives/tasks/src/async_externalities.rs |  2 +-
 10 files changed, 100 insertions(+), 40 deletions(-)

diff --git a/frame/contracts/src/storage.rs b/frame/contracts/src/storage.rs
index 244ab3788979..5fb603b334a6 100644
--- a/frame/contracts/src/storage.rs
+++ b/frame/contracts/src/storage.rs
@@ -32,7 +32,7 @@ use sp_core::crypto::UncheckedFrom;
 use frame_support::{
 	dispatch::DispatchResult,
 	debug,
-	storage::child::{self, KillOutcome},
+	storage::child::{self, KillChildStorageResult},
 	traits::Get,
 	weights::Weight,
 };
@@ -269,13 +269,13 @@ where
 				let removed = queue.swap_remove(0);
 				match outcome {
 					// This should not happen as our budget was large enough to remove all keys.
-					KillOutcome::SomeRemaining => {
+					KillChildStorageResult::SomeRemaining(_) => {
 						debug::error!(
 							"After deletion keys are remaining in this child trie: {:?}",
 							removed.trie_id,
 						);
 					},
-					KillOutcome::AllRemoved => (),
+					KillChildStorageResult::AllRemoved(_) => (),
 				}
 			}
 			remaining_key_budget = remaining_key_budget
diff --git a/frame/support/src/storage/child.rs b/frame/support/src/storage/child.rs
index c1885fc07430..66cc7d74fe7d 100644
--- a/frame/support/src/storage/child.rs
+++ b/frame/support/src/storage/child.rs
@@ -24,14 +24,7 @@
 use crate::sp_std::prelude::*;
 use codec::{Codec, Encode, Decode};
 pub use sp_core::storage::{ChildInfo, ChildType};
-
-/// The outcome of calling [`kill_storage`].
-pub enum KillOutcome {
-	/// No key remains in the child trie.
-	AllRemoved,
-	/// At least one key still resides in the child trie due to the supplied limit.
-	SomeRemaining,
-}
+pub use crate::sp_io::KillChildStorageResult;
 
 /// Return the value of the item in storage under `key`, or `None` if there is no explicit entry.
 pub fn get<T: Decode + Sized>(
@@ -177,16 +170,12 @@ pub fn exists(
 pub fn kill_storage(
 	child_info: &ChildInfo,
 	limit: Option<u32>,
-) -> KillOutcome {
-	let all_removed = match child_info.child_type() {
+) -> KillChildStorageResult {
+	match child_info.child_type() {
 		ChildType::ParentKeyId => sp_io::default_child_storage::storage_kill(
 			child_info.storage_key(),
 			limit
 		),
-	};
-	match all_removed {
-		true => KillOutcome::AllRemoved,
-		false => KillOutcome::SomeRemaining,
 	}
 }
 
diff --git a/primitives/externalities/src/lib.rs b/primitives/externalities/src/lib.rs
index a10ce32bdc85..3ee37f5e31b9 100644
--- a/primitives/externalities/src/lib.rs
+++ b/primitives/externalities/src/lib.rs
@@ -139,15 +139,16 @@ pub trait Externalities: ExtensionStore {
 	/// Clear an entire child storage.
 	///
 	/// Deletes all keys from the overlay and up to `limit` keys from the backend. No
-	/// limit is applied if `limit` is `None`. Returns `true` if the child trie was
+	/// limit is applied if `limit` is `None`. Returned boolean is `true` if the child trie was
 	/// removed completely and `false` if there are remaining keys after the function
-	/// returns.
+	/// returns. Returned `u32` is the number of keys that was removed at the end of the
+	/// operation.
 	///
 	/// # Note
 	///
 	/// An implementation is free to delete more keys than the specified limit as long as
 	/// it is able to do that in constant time.
-	fn kill_child_storage(&mut self, child_info: &ChildInfo, limit: Option<u32>) -> bool;
+	fn kill_child_storage(&mut self, child_info: &ChildInfo, limit: Option<u32>) -> (bool, u32);
 
 	/// Clear storage entries which keys are start with the given prefix.
 	fn clear_prefix(&mut self, prefix: &[u8]);
diff --git a/primitives/io/src/lib.rs b/primitives/io/src/lib.rs
index c0db1120dc43..bc86dd902d15 100644
--- a/primitives/io/src/lib.rs
+++ b/primitives/io/src/lib.rs
@@ -57,7 +57,7 @@ use sp_core::{
 use sp_trie::{TrieConfiguration, trie_types::Layout};
 
 use sp_runtime_interface::{runtime_interface, Pointer};
-use sp_runtime_interface::pass_by::PassBy;
+use sp_runtime_interface::pass_by::{PassBy, PassByCodec};
 
 use codec::{Encode, Decode};
 
@@ -81,6 +81,16 @@ pub enum EcdsaVerifyError {
 	BadSignature,
 }
 
+/// The outcome of calling [`kill_storage`]. Returned value is the number of storage items
+/// removed from the trie from making the `kill_storage` call.
+#[derive(PassByCodec, Encode, Decode)]
+pub enum KillChildStorageResult {
+	/// No key remains in the child trie.
+	AllRemoved(u32),
+	/// At least one key still resides in the child trie due to the supplied limit.
+	SomeRemaining(u32),
+}
+
 /// Interface for accessing the storage from within the runtime.
 #[runtime_interface]
 pub trait Storage {
@@ -290,7 +300,7 @@ pub trait DefaultChildStorage {
 	/// The limit can be used to partially delete a child trie in case it is too large
 	/// to delete in one go (block).
 	///
-	/// It returns false iff some keys are remaining in
+	/// It returns a boolean false iff some keys are remaining in
 	/// the child trie after the functions returns.
 	///
 	/// # Note
@@ -307,7 +317,41 @@ pub trait DefaultChildStorage {
 	#[version(2)]
 	fn storage_kill(&mut self, storage_key: &[u8], limit: Option<u32>) -> bool {
 		let child_info = ChildInfo::new_default(storage_key);
-		self.kill_child_storage(&child_info, limit)
+		let (all_removed, _num_removed) = self.kill_child_storage(&child_info, limit);
+		all_removed
+	}
+
+	/// Clear a child storage key.
+	///
+	/// Deletes all keys from the overlay and up to `limit` keys from the backend if
+	/// it is set to `Some`. No limit is applied when `limit` is set to `None`.
+	///
+	/// The limit can be used to partially delete a child trie in case it is too large
+	/// to delete in one go (block).
+	///
+	/// It returns a boolean false iff some keys are remaining in
+	/// the child trie after the functions returns. Also returns a `u32` with
+	/// the number of keys removed from the process.
+	///
+	/// # Note
+	///
+	/// Please note that keys that are residing in the overlay for that child trie when
+	/// issuing this call are all deleted without counting towards the `limit`. Only keys
+	/// written during the current block are part of the overlay. Deleting with a `limit`
+	/// mostly makes sense with an empty overlay for that child trie.
+	///
+	/// Calling this function multiple times per block for the same `storage_key` does
+	/// not make much sense because it is not cumulative when called inside the same block.
+	/// Use this function to distribute the deletion of a single child trie across multiple
+	/// blocks.
+	#[version(3)]
+	fn storage_kill(&mut self, storage_key: &[u8], limit: Option<u32>) -> KillChildStorageResult {
+		let child_info = ChildInfo::new_default(storage_key);
+		let (all_removed, num_removed) = self.kill_child_storage(&child_info, limit);
+		match all_removed {
+			true => KillChildStorageResult::AllRemoved(num_removed),
+			false => KillChildStorageResult::SomeRemaining(num_removed),
+		}
 	}
 
 	/// Check a child storage key.
diff --git a/primitives/state-machine/src/basic.rs b/primitives/state-machine/src/basic.rs
index 3b265208136a..dda8f523b77f 100644
--- a/primitives/state-machine/src/basic.rs
+++ b/primitives/state-machine/src/basic.rs
@@ -211,9 +211,9 @@ impl Externalities for BasicExternalities {
 		&mut self,
 		child_info: &ChildInfo,
 		_limit: Option<u32>,
-	) -> bool {
-		self.inner.children_default.remove(child_info.storage_key());
-		true
+	) -> (bool, u32) {
+		let num_removed = self.inner.children_default.remove(child_info.storage_key()).map(|c| c.data.len()).unwrap_or(0);
+		(true, num_removed as u32)
 	}
 
 	fn clear_prefix(&mut self, prefix: &[u8]) {
@@ -411,6 +411,29 @@ mod tests {
 		assert_eq!(ext.child_storage(child_info, b"doe"), None);
 	}
 
+	#[test]
+	fn kill_child_storage_returns_num_elements_removed() {
+		let child_info = ChildInfo::new_default(b"storage_key");
+		let child_info = &child_info;
+		let mut ext = BasicExternalities::new(Storage {
+			top: Default::default(),
+			children_default: map![
+				child_info.storage_key().to_vec() => StorageChild {
+					data: map![
+						b"doe".to_vec() => b"reindeer".to_vec(),
+						b"dog".to_vec() => b"puppy".to_vec(),
+						b"hello".to_vec() => b"world".to_vec(),
+					],
+					child_info: child_info.to_owned(),
+				}
+			]
+		});
+
+
+		let res = ext.kill_child_storage(child_info, None);
+		assert_eq!(res, (true, 3));
+	}
+
 	#[test]
 	fn basic_externalities_is_empty() {
 		// Make sure no values are set by default in `BasicExternalities`.
diff --git a/primitives/state-machine/src/ext.rs b/primitives/state-machine/src/ext.rs
index 551f8687b421..7907cda6fb4e 100644
--- a/primitives/state-machine/src/ext.rs
+++ b/primitives/state-machine/src/ext.rs
@@ -391,7 +391,7 @@ where
 		&mut self,
 		child_info: &ChildInfo,
 		limit: Option<u32>,
-	) -> bool {
+	) -> (bool, u32) {
 		trace!(target: "state", "{:04x}: KillChild({})",
 			self.id,
 			HexDisplay::from(&child_info.storage_key()),
@@ -399,9 +399,9 @@ where
 		let _guard = guard();
 		self.mark_dirty();
 		self.overlay.clear_child_storage(child_info);
+		let mut num_deleted: u32 = 0;
 
 		if let Some(limit) = limit {
-			let mut num_deleted: u32 = 0;
 			let mut all_deleted = true;
 			self.backend.apply_to_child_keys_while(child_info, |key| {
 				if num_deleted == limit {
@@ -417,13 +417,14 @@ where
 				self.overlay.set_child_storage(child_info, key.to_vec(), None);
 				true
 			});
-			all_deleted
+			(all_deleted, num_deleted)
 		} else {
 			self.backend.apply_to_child_keys_while(child_info, |key| {
+				num_deleted = num_deleted.saturating_add(1);
 				self.overlay.set_child_storage(child_info, key.to_vec(), None);
 				true
 			});
-			true
+			(true, num_deleted)
 		}
 	}
 
diff --git a/primitives/state-machine/src/lib.rs b/primitives/state-machine/src/lib.rs
index 7b337620c213..0167633d4807 100644
--- a/primitives/state-machine/src/lib.rs
+++ b/primitives/state-machine/src/lib.rs
@@ -1159,7 +1159,7 @@ mod tests {
 				changes_trie::disabled_state::<_, u64>(),
 				None,
 			);
-			assert_eq!(ext.kill_child_storage(&child_info, Some(2)), false);
+			assert_eq!(ext.kill_child_storage(&child_info, Some(2)), (false, 2));
 		}
 
 		assert_eq!(
@@ -1199,12 +1199,14 @@ mod tests {
 			changes_trie::disabled_state::<_, u64>(),
 			None,
 		);
-		assert_eq!(ext.kill_child_storage(&child_info, Some(0)), false);
-		assert_eq!(ext.kill_child_storage(&child_info, Some(1)), false);
-		assert_eq!(ext.kill_child_storage(&child_info, Some(2)), false);
-		assert_eq!(ext.kill_child_storage(&child_info, Some(3)), false);
-		assert_eq!(ext.kill_child_storage(&child_info, Some(4)), true);
-		assert_eq!(ext.kill_child_storage(&child_info, Some(5)), true);
+		assert_eq!(ext.kill_child_storage(&child_info, Some(0)), (false, 0));
+		assert_eq!(ext.kill_child_storage(&child_info, Some(1)), (false, 1));
+		assert_eq!(ext.kill_child_storage(&child_info, Some(2)), (false, 2));
+		assert_eq!(ext.kill_child_storage(&child_info, Some(3)), (false, 3));
+		assert_eq!(ext.kill_child_storage(&child_info, Some(4)), (true, 4));
+		// Only 4 items to remove
+		assert_eq!(ext.kill_child_storage(&child_info, Some(5)), (true, 4));
+		assert_eq!(ext.kill_child_storage(&child_info, None), (true, 4));
 	}
 
 	#[test]
diff --git a/primitives/state-machine/src/read_only.rs b/primitives/state-machine/src/read_only.rs
index dee7c9e337cd..296520900c95 100644
--- a/primitives/state-machine/src/read_only.rs
+++ b/primitives/state-machine/src/read_only.rs
@@ -132,7 +132,7 @@ impl<'a, H: Hasher, B: 'a + Backend<H>> Externalities for ReadOnlyExternalities<
 		&mut self,
 		_child_info: &ChildInfo,
 		_limit: Option<u32>,
-	) -> bool {
+	) -> (bool, u32) {
 		unimplemented!("kill_child_storage is not supported in ReadOnlyExternalities")
 	}
 
diff --git a/primitives/state-machine/src/testing.rs b/primitives/state-machine/src/testing.rs
index 5f10fc0a276c..f4b0cb6592ce 100644
--- a/primitives/state-machine/src/testing.rs
+++ b/primitives/state-machine/src/testing.rs
@@ -326,7 +326,7 @@ mod tests {
 		{
 			let mut ext = ext.ext();
 
-			assert!(!ext.kill_child_storage(&child_info, Some(2)), "Should not delete all keys");
+			assert!(!ext.kill_child_storage(&child_info, Some(2)).0, "Should not delete all keys");
 
 			assert!(ext.child_storage(&child_info, &b"doe"[..]).is_none());
 			assert!(ext.child_storage(&child_info, &b"dog"[..]).is_none());
diff --git a/primitives/tasks/src/async_externalities.rs b/primitives/tasks/src/async_externalities.rs
index 249222ec71c3..5d99ca4368d0 100644
--- a/primitives/tasks/src/async_externalities.rs
+++ b/primitives/tasks/src/async_externalities.rs
@@ -119,7 +119,7 @@ impl Externalities for AsyncExternalities {
 		&mut self,
 		_child_info: &ChildInfo,
 		_limit: Option<u32>,
-	) -> bool {
+	) -> (bool, u32) {
 		panic!("`kill_child_storage`: should not be used in async externalities!")
 	}
 

From 904495bc14eff5171fca5912247e772948439411 Mon Sep 17 00:00:00 2001
From: Robin Syihab <obin.mf@gmail.com>
Date: Tue, 23 Feb 2021 04:37:48 +0700
Subject: [PATCH 0422/1194] Make Regex in ss58codec and secret phrase crypto
 static (#8117) (#8177)

---
 primitives/core/src/crypto.rs | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index 360edc0c27e6..efae0cd95802 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -595,14 +595,20 @@ pub fn set_default_ss58_version(version: Ss58AddressFormat) {
 	*DEFAULT_VERSION.lock() = version
 }
 
+#[cfg(feature = "std")]
+lazy_static::lazy_static! {
+	static ref SS58_REGEX: Regex = Regex::new(r"^(?P<ss58>[\w\d ]+)?(?P<path>(//?[^/]+)*)$")
+		.expect("constructed from known-good static value; qed");
+	static ref SECRET_PHRASE_REGEX: Regex = Regex::new(r"^(?P<phrase>[\d\w ]+)?(?P<path>(//?[^/]+)*)(///(?P<password>.*))?$")
+		.expect("constructed from known-good static value; qed");
+	static ref JUNCTION_REGEX: Regex = Regex::new(r"/(/?[^/]+)")
+		.expect("constructed from known-good static value; qed");
+}
+
 #[cfg(feature = "std")]
 impl<T: Sized + AsMut<[u8]> + AsRef<[u8]> + Default + Derive> Ss58Codec for T {
 	fn from_string(s: &str) -> Result<Self, PublicError> {
-		let re = Regex::new(r"^(?P<ss58>[\w\d ]+)?(?P<path>(//?[^/]+)*)$")
-			.expect("constructed from known-good static value; qed");
-		let cap = re.captures(s).ok_or(PublicError::InvalidFormat)?;
-		let re_junction = Regex::new(r"/(/?[^/]+)")
-			.expect("constructed from known-good static value; qed");
+		let cap = SS58_REGEX.captures(s).ok_or(PublicError::InvalidFormat)?;
 		let s = cap.name("ss58")
 			.map(|r| r.as_str())
 			.unwrap_or(DEV_ADDRESS);
@@ -621,7 +627,7 @@ impl<T: Sized + AsMut<[u8]> + AsRef<[u8]> + Default + Derive> Ss58Codec for T {
 		if cap["path"].is_empty() {
 			Ok(addr)
 		} else {
-			let path = re_junction.captures_iter(&cap["path"])
+			let path = JUNCTION_REGEX.captures_iter(&cap["path"])
 				.map(|f| DeriveJunction::from(&f[1]));
 			addr.derive(path)
 				.ok_or(PublicError::InvalidPath)
@@ -629,11 +635,7 @@ impl<T: Sized + AsMut<[u8]> + AsRef<[u8]> + Default + Derive> Ss58Codec for T {
 	}
 
 	fn from_string_with_version(s: &str) -> Result<(Self, Ss58AddressFormat), PublicError> {
-		let re = Regex::new(r"^(?P<ss58>[\w\d ]+)?(?P<path>(//?[^/]+)*)$")
-			.expect("constructed from known-good static value; qed");
-		let cap = re.captures(s).ok_or(PublicError::InvalidFormat)?;
-		let re_junction = Regex::new(r"/(/?[^/]+)")
-			.expect("constructed from known-good static value; qed");
+		let cap = SS58_REGEX.captures(s).ok_or(PublicError::InvalidFormat)?;
 		let (addr, v) = Self::from_ss58check_with_version(
 			cap.name("ss58")
 				.map(|r| r.as_str())
@@ -642,7 +644,7 @@ impl<T: Sized + AsMut<[u8]> + AsRef<[u8]> + Default + Derive> Ss58Codec for T {
 		if cap["path"].is_empty() {
 			Ok((addr, v))
 		} else {
-			let path = re_junction.captures_iter(&cap["path"])
+			let path = JUNCTION_REGEX.captures_iter(&cap["path"])
 				.map(|f| DeriveJunction::from(&f[1]));
 			addr.derive(path)
 				.ok_or(PublicError::InvalidPath)
@@ -999,13 +1001,9 @@ pub trait Pair: CryptoType + Sized + Clone + Send + Sync + 'static {
 	fn from_string_with_seed(s: &str, password_override: Option<&str>)
 		-> Result<(Self, Option<Self::Seed>), SecretStringError>
 	{
-		let re = Regex::new(r"^(?P<phrase>[\d\w ]+)?(?P<path>(//?[^/]+)*)(///(?P<password>.*))?$")
-			.expect("constructed from known-good static value; qed");
-		let cap = re.captures(s).ok_or(SecretStringError::InvalidFormat)?;
+		let cap = SECRET_PHRASE_REGEX.captures(s).ok_or(SecretStringError::InvalidFormat)?;
 
-		let re_junction = Regex::new(r"/(/?[^/]+)")
-			.expect("constructed from known-good static value; qed");
-		let path = re_junction.captures_iter(&cap["path"])
+		let path = JUNCTION_REGEX.captures_iter(&cap["path"])
 			.map(|f| DeriveJunction::from(&f[1]));
 
 		let phrase = cap.name("phrase").map(|r| r.as_str()).unwrap_or(DEV_PHRASE);

From e6ac7e72c2251b8a23454c8cf0e3a2ad2c1ed566 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Tue, 23 Feb 2021 10:05:39 +0100
Subject: [PATCH 0423/1194] Add a Prometheus alert on no incoming connection
 (#7517)

---
 .maintain/monitoring/alerting-rules/alerting-rules.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.maintain/monitoring/alerting-rules/alerting-rules.yaml b/.maintain/monitoring/alerting-rules/alerting-rules.yaml
index cf00d7e2b90f..5ee237667767 100644
--- a/.maintain/monitoring/alerting-rules/alerting-rules.yaml
+++ b/.maintain/monitoring/alerting-rules/alerting-rules.yaml
@@ -108,6 +108,13 @@ groups:
     annotations:
       message: 'The node {{ $labels.instance }} has less than 3 peers for more
       than 15 minutes'
+  - alert: NoIncomingConnection
+    expr: increase(polkadot_sub_libp2p_incoming_connections_total[20m]) == 0
+    labels:
+      severity: warning
+    annotations:
+      message: 'The node {{ $labels.instance }} has not received any new incoming
+      TCP connection in the past 20 minutes. Is it connected to the Internet?'
 
   ##############################################################################
   # System

From 27e1f89a587d76ca1ffd119e9763ede672064bc6 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Tue, 23 Feb 2021 12:52:59 +0100
Subject: [PATCH 0424/1194] Bump lru dependency (#8182)

---
 Cargo.lock                       | 4 ++--
 client/network-gossip/Cargo.toml | 2 +-
 client/network/Cargo.toml        | 2 +-
 primitives/blockchain/Cargo.toml | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1f5d4bab32d6..02f0637a47dd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3486,9 +3486,9 @@ dependencies = [
 
 [[package]]
 name = "lru"
-version = "0.6.3"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3aae342b73d57ad0b8b364bd12584819f2c1fe9114285dfcf8b0722607671635"
+checksum = "1f374d42cdfc1d7dbf3d3dec28afab2eb97ffbf43a3234d795b5986dbf4b90ba"
 dependencies = [
  "hashbrown",
 ]
diff --git a/client/network-gossip/Cargo.toml b/client/network-gossip/Cargo.toml
index f8737751f0d2..b5f3b754af03 100644
--- a/client/network-gossip/Cargo.toml
+++ b/client/network-gossip/Cargo.toml
@@ -19,7 +19,7 @@ futures = "0.3.9"
 futures-timer = "3.0.1"
 libp2p = { version = "0.35.1", default-features = false }
 log = "0.4.8"
-lru = "0.6.1"
+lru = "0.6.5"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.9.0", path = "../../utils/prometheus" }
 sc-network = { version = "0.9.0", path = "../network" }
 sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index bed3aba46e1e..3d8c33eae0f2 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -36,7 +36,7 @@ hex = "0.4.0"
 ip_network = "0.3.4"
 linked-hash-map = "0.5.2"
 linked_hash_set = "0.1.3"
-lru = "0.6.3"
+lru = "0.6.5"
 log = "0.4.8"
 nohash-hasher = "0.2.0"
 parking_lot = "0.11.1"
diff --git a/primitives/blockchain/Cargo.toml b/primitives/blockchain/Cargo.toml
index 092d96116236..c37686c0df73 100644
--- a/primitives/blockchain/Cargo.toml
+++ b/primitives/blockchain/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 log = "0.4.11"
-lru = "0.6.1"
+lru = "0.6.5"
 parking_lot = "0.11.1"
 thiserror = "1.0.21"
 futures = "0.3.9"

From 1c434cd3a20c03461cb17b1e94244e134fc1b27c Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Tue, 23 Feb 2021 14:46:17 +0000
Subject: [PATCH 0425/1194] Decouple Staking and Election - Part 2 Unsigned
 Phase (#7909)

* Base features and traits.

* pallet and unsigned phase

* Undo bad formattings.

* some formatting cleanup.

* Small self-cleanup.

* Make it all build

* self-review

* Some doc tests.

* Some changes from other PR

* Fix session test

* Update Cargo.lock

* Update frame/election-provider-multi-phase/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Some review comments

* Rename + make encode/decode

* Do an assert as well, just in case.

* Fix build

* Update frame/election-provider-multi-phase/src/unsigned.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Las comment

* fix staking fuzzer.

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_election_provider_multi_phase --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/election-provider-multi-phase/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Add one last layer of feasibility check as well.

* Last fixes to benchmarks

* Some more docs.

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_election_provider_multi_phase --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/election-provider-multi-phase/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_election_provider_multi_phase --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/election-provider-multi-phase/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Some nits

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Fix doc

* Mkae ci green

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
---
 Cargo.lock                                    |   33 +
 Cargo.toml                                    |    1 +
 bin/node/runtime/Cargo.toml                   |    3 +
 bin/node/runtime/src/constants.rs             |    2 +-
 bin/node/runtime/src/lib.rs                   |   57 +-
 frame/babe/Cargo.toml                         |    2 +-
 frame/babe/src/lib.rs                         |   12 +-
 frame/babe/src/mock.rs                        |    9 +
 .../election-provider-multi-phase/Cargo.toml  |   66 +
 .../src/benchmarking.rs                       |  282 ++++
 .../src/helpers.rs                            |  159 ++
 .../election-provider-multi-phase/src/lib.rs  | 1456 +++++++++++++++++
 .../election-provider-multi-phase/src/mock.rs |  381 +++++
 .../src/unsigned.rs                           |  873 ++++++++++
 .../src/weights.rs                            |  150 ++
 frame/grandpa/Cargo.toml                      |    1 +
 frame/grandpa/src/mock.rs                     |   10 +-
 frame/offences/benchmarking/Cargo.toml        |    2 +
 frame/offences/benchmarking/src/mock.rs       |    9 +
 frame/session/benchmarking/Cargo.toml         |    4 +-
 frame/session/benchmarking/src/mock.rs        |   12 +-
 frame/session/src/lib.rs                      |   18 +-
 frame/session/src/tests.rs                    |    2 +-
 frame/staking/Cargo.toml                      |    7 +-
 frame/staking/fuzzer/Cargo.toml               |    1 +
 frame/staking/fuzzer/src/mock.rs              |   14 +-
 frame/staking/fuzzer/src/submit_solution.rs   |    2 +-
 frame/staking/src/lib.rs                      |  326 +++-
 frame/staking/src/mock.rs                     |   27 +-
 frame/staking/src/offchain_election.rs        |   37 +-
 frame/staking/src/testing_utils.rs            |    2 +-
 frame/staking/src/tests.rs                    |   97 +-
 frame/staking/src/weights.rs                  |  232 +--
 frame/support/src/traits.rs                   |   34 +-
 34 files changed, 4092 insertions(+), 231 deletions(-)
 create mode 100644 frame/election-provider-multi-phase/Cargo.toml
 create mode 100644 frame/election-provider-multi-phase/src/benchmarking.rs
 create mode 100644 frame/election-provider-multi-phase/src/helpers.rs
 create mode 100644 frame/election-provider-multi-phase/src/lib.rs
 create mode 100644 frame/election-provider-multi-phase/src/mock.rs
 create mode 100644 frame/election-provider-multi-phase/src/unsigned.rs
 create mode 100644 frame/election-provider-multi-phase/src/weights.rs

diff --git a/Cargo.lock b/Cargo.lock
index 02f0637a47dd..a65ca56cee33 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4111,6 +4111,7 @@ dependencies = [
  "pallet-contracts-primitives",
  "pallet-contracts-rpc-runtime-api",
  "pallet-democracy",
+ "pallet-election-provider-multi-phase",
  "pallet-elections-phragmen",
  "pallet-grandpa",
  "pallet-identity",
@@ -4536,6 +4537,7 @@ dependencies = [
  "sp-consensus-babe",
  "sp-consensus-vrf",
  "sp-core",
+ "sp-election-providers",
  "sp-io",
  "sp-runtime",
  "sp-session",
@@ -4695,6 +4697,32 @@ dependencies = [
  "substrate-test-utils",
 ]
 
+[[package]]
+name = "pallet-election-provider-multi-phase"
+version = "3.0.0"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "hex-literal",
+ "pallet-balances",
+ "parity-scale-codec",
+ "parking_lot 0.11.1",
+ "paste 1.0.4",
+ "rand 0.7.3",
+ "serde",
+ "sp-arithmetic",
+ "sp-core",
+ "sp-election-providers",
+ "sp-io",
+ "sp-npos-elections",
+ "sp-runtime",
+ "sp-std",
+ "sp-tracing",
+ "static_assertions",
+ "substrate-test-utils",
+]
+
 [[package]]
 name = "pallet-elections"
 version = "3.0.0"
@@ -4796,6 +4824,7 @@ dependencies = [
  "serde",
  "sp-application-crypto",
  "sp-core",
+ "sp-election-providers",
  "sp-finality-grandpa",
  "sp-io",
  "sp-keyring",
@@ -5002,6 +5031,7 @@ dependencies = [
  "parity-scale-codec",
  "serde",
  "sp-core",
+ "sp-election-providers",
  "sp-io",
  "sp-runtime",
  "sp-staking",
@@ -5124,6 +5154,7 @@ dependencies = [
  "rand 0.7.3",
  "serde",
  "sp-core",
+ "sp-election-providers",
  "sp-io",
  "sp-runtime",
  "sp-session",
@@ -5165,6 +5196,7 @@ dependencies = [
  "serde",
  "sp-application-crypto",
  "sp-core",
+ "sp-election-providers",
  "sp-io",
  "sp-npos-elections",
  "sp-runtime",
@@ -5192,6 +5224,7 @@ dependencies = [
  "parity-scale-codec",
  "serde",
  "sp-core",
+ "sp-election-providers",
  "sp-io",
  "sp-npos-elections",
  "sp-runtime",
diff --git a/Cargo.toml b/Cargo.toml
index adc8960ffd76..8873c033455a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -75,6 +75,7 @@ members = [
 	"frame/democracy",
 	"frame/try-runtime",
 	"frame/elections",
+	"frame/election-provider-multi-phase",
 	"frame/example",
 	"frame/example-offchain-worker",
 	"frame/example-parallel",
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index 1a55efbf8515..a803d141c9e1 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -56,6 +56,7 @@ pallet-contracts-primitives = { version = "2.0.0", default-features = false, pat
 pallet-contracts-rpc-runtime-api = { version = "0.8.0", default-features = false, path = "../../../frame/contracts/rpc/runtime-api/" }
 pallet-democracy = { version = "3.0.0", default-features = false, path = "../../../frame/democracy" }
 pallet-elections-phragmen = { version = "3.0.0", default-features = false, path = "../../../frame/elections-phragmen" }
+pallet-election-provider-multi-phase = { version = "3.0.0", default-features = false, path = "../../../frame/election-provider-multi-phase" }
 pallet-grandpa = { version = "3.0.0", default-features = false, path = "../../../frame/grandpa" }
 pallet-im-online = { version = "3.0.0", default-features = false, path = "../../../frame/im-online" }
 pallet-indices = { version = "3.0.0", default-features = false, path = "../../../frame/indices" }
@@ -141,6 +142,7 @@ std = [
 	"frame-benchmarking/std",
 	"frame-system-rpc-runtime-api/std",
 	"frame-system/std",
+	"pallet-election-provider-multi-phase/std",
 	"pallet-timestamp/std",
 	"pallet-tips/std",
 	"pallet-transaction-payment-rpc-runtime-api/std",
@@ -157,6 +159,7 @@ runtime-benchmarks = [
 	"frame-benchmarking",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
+	"pallet-election-provider-multi-phase/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"pallet-assets/runtime-benchmarks",
 	"pallet-babe/runtime-benchmarks",
diff --git a/bin/node/runtime/src/constants.rs b/bin/node/runtime/src/constants.rs
index f447486c7ffc..c549b1977d37 100644
--- a/bin/node/runtime/src/constants.rs
+++ b/bin/node/runtime/src/constants.rs
@@ -35,7 +35,7 @@ pub mod time {
 	use node_primitives::{Moment, BlockNumber};
 
 	/// Since BABE is probabilistic this is the average expected block time that
-	/// we are targetting. Blocks will be produced at a minimum duration defined
+	/// we are targeting. Blocks will be produced at a minimum duration defined
 	/// by `SLOT_DURATION`, but some slots will not be allocated to any
 	/// authority and hence no block will be produced. We expect to have this
 	/// block time on average following the defined slot duration and the value
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index c8d7717b4c8f..7528aa3b4052 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -28,7 +28,8 @@ use frame_support::{
 	construct_runtime, parameter_types, debug, RuntimeDebug,
 	weights::{
 		Weight, IdentityFee,
-		constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND}, DispatchClass,
+		constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
+		DispatchClass,
 	},
 	traits::{
 		Currency, Imbalance, KeyOwnerProofSystem, OnUnbalanced, Randomness, LockIdentifier,
@@ -50,14 +51,14 @@ pub use node_primitives::{AccountId, Signature};
 use node_primitives::{AccountIndex, Balance, BlockNumber, Hash, Index, Moment};
 use sp_api::impl_runtime_apis;
 use sp_runtime::{
-	Permill, Perbill, Perquintill, Percent, ApplyExtrinsicResult,
-	impl_opaque_keys, generic, create_runtime_str, ModuleId, FixedPointNumber,
+	Permill, Perbill, Perquintill, Percent, ApplyExtrinsicResult, impl_opaque_keys, generic,
+	create_runtime_str, ModuleId, FixedPointNumber,
 };
 use sp_runtime::curve::PiecewiseLinear;
 use sp_runtime::transaction_validity::{TransactionValidity, TransactionSource, TransactionPriority};
 use sp_runtime::traits::{
-	self, BlakeTwo256, Block as BlockT, StaticLookup, SaturatedConversion,
-	ConvertInto, OpaqueKeys, NumberFor,
+	self, BlakeTwo256, Block as BlockT, StaticLookup, SaturatedConversion, ConvertInto, OpaqueKeys,
+	NumberFor,
 };
 use sp_version::RuntimeVersion;
 #[cfg(any(feature = "std", test))]
@@ -145,7 +146,7 @@ impl OnUnbalanced<NegativeImbalance> for DealWithFees {
 	}
 }
 
-/// We assume that ~10% of the block weight is consumed by `on_initalize` handlers.
+/// We assume that ~10% of the block weight is consumed by `on_initialize` handlers.
 /// This is used to limit the maximal weight of a single extrinsic.
 const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10);
 /// We allow `Normal` extrinsics to fill up the block up to 75%, the rest can be used
@@ -490,18 +491,56 @@ impl pallet_staking::Config for Runtime {
 	type SessionInterface = Self;
 	type RewardCurve = RewardCurve;
 	type NextNewSession = Session;
+	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
 	type ElectionLookahead = ElectionLookahead;
 	type Call = Call;
 	type MaxIterations = MaxIterations;
 	type MinSolutionScoreBump = MinSolutionScoreBump;
-	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
 	type UnsignedPriority = StakingUnsignedPriority;
 	// The unsigned solution weight targeted by the OCW. We set it to the maximum possible value of
 	// a single extrinsic.
 	type OffchainSolutionWeightLimit = OffchainSolutionWeightLimit;
+	type ElectionProvider = ElectionProviderMultiPhase;
 	type WeightInfo = pallet_staking::weights::SubstrateWeight<Runtime>;
 }
 
+parameter_types! {
+	// phase durations. 1/4 of the last session for each.
+	pub const SignedPhase: u32 = EPOCH_DURATION_IN_BLOCKS / 4;
+	pub const UnsignedPhase: u32 = EPOCH_DURATION_IN_BLOCKS / 4;
+
+	// fallback: no need to do on-chain phragmen initially.
+	pub const Fallback: pallet_election_provider_multi_phase::FallbackStrategy =
+		pallet_election_provider_multi_phase::FallbackStrategy::Nothing;
+
+	pub SolutionImprovementThreshold: Perbill = Perbill::from_rational_approximation(1u32, 10_000);
+
+	// miner configs
+	pub const MultiPhaseUnsignedPriority: TransactionPriority = StakingUnsignedPriority::get() - 1u64;
+	pub const MinerMaxIterations: u32 = 10;
+	pub MinerMaxWeight: Weight = RuntimeBlockWeights::get()
+		.get(DispatchClass::Normal)
+		.max_extrinsic.expect("Normal extrinsics have a weight limit configured; qed")
+		.saturating_sub(BlockExecutionWeight::get());
+}
+
+impl pallet_election_provider_multi_phase::Config for Runtime {
+	type Event = Event;
+	type Currency = Balances;
+	type SignedPhase = SignedPhase;
+	type UnsignedPhase = UnsignedPhase;
+	type SolutionImprovementThreshold = MinSolutionScoreBump;
+	type MinerMaxIterations = MinerMaxIterations;
+	type MinerMaxWeight = MinerMaxWeight;
+	type MinerTxPriority = MultiPhaseUnsignedPriority;
+	type DataProvider = Staking;
+	type OnChainAccuracy = Perbill;
+	type CompactSolution = pallet_staking::CompactAssignments;
+	type Fallback = Fallback;
+	type WeightInfo = pallet_election_provider_multi_phase::weights::SubstrateWeight<Runtime>;
+	type BenchmarkingConfig = ();
+}
+
 parameter_types! {
 	pub const LaunchPeriod: BlockNumber = 28 * 24 * 60 * MINUTES;
 	pub const VotingPeriod: BlockNumber = 28 * 24 * 60 * MINUTES;
@@ -548,7 +587,7 @@ impl pallet_democracy::Config for Runtime {
 	>;
 	type BlacklistOrigin = EnsureRoot<AccountId>;
 	// Any single technical committee member may veto a coming council proposal, however they can
-	// only do it once and it lasts only for the cooloff period.
+	// only do it once and it lasts only for the cool-off period.
 	type VetoOrigin = pallet_collective::EnsureMember<AccountId, TechnicalCollective>;
 	type CooloffPeriod = CooloffPeriod;
 	type PreimageByteDeposit = PreimageByteDeposit;
@@ -1020,6 +1059,7 @@ construct_runtime!(
 		Indices: pallet_indices::{Module, Call, Storage, Config<T>, Event<T>},
 		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
 		TransactionPayment: pallet_transaction_payment::{Module, Storage},
+		ElectionProviderMultiPhase: pallet_election_provider_multi_phase::{Module, Call, Storage, Event<T>, ValidateUnsigned},
 		Staking: pallet_staking::{Module, Call, Config<T>, Storage, Event<T>, ValidateUnsigned},
 		Session: pallet_session::{Module, Call, Storage, Event, Config<T>},
 		Democracy: pallet_democracy::{Module, Call, Storage, Config, Event<T>},
@@ -1386,6 +1426,7 @@ impl_runtime_apis! {
 			add_benchmark!(params, batches, pallet_contracts, Contracts);
 			add_benchmark!(params, batches, pallet_democracy, Democracy);
 			add_benchmark!(params, batches, pallet_elections_phragmen, Elections);
+			add_benchmark!(params, batches, pallet_election_provider_multi_phase, ElectionProviderMultiPhase);
 			add_benchmark!(params, batches, pallet_grandpa, Grandpa);
 			add_benchmark!(params, batches, pallet_identity, Identity);
 			add_benchmark!(params, batches, pallet_im_online, ImOnline);
diff --git a/frame/babe/Cargo.toml b/frame/babe/Cargo.toml
index 7ecff2aae5d4..f0d902142635 100644
--- a/frame/babe/Cargo.toml
+++ b/frame/babe/Cargo.toml
@@ -32,12 +32,12 @@ sp-std = { version = "3.0.0", default-features = false, path = "../../primitives
 sp-timestamp = { version = "3.0.0", default-features = false, path = "../../primitives/timestamp" }
 
 [dev-dependencies]
-frame-benchmarking = { version = "3.0.0", path = "../benchmarking" }
 pallet-balances = { version = "3.0.0", path = "../balances" }
 pallet-offences = { version = "3.0.0", path = "../offences" }
 pallet-staking = { version = "3.0.0", path = "../staking" }
 pallet-staking-reward-curve = { version = "3.0.0", path = "../staking/reward-curve" }
 sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-election-providers = { version = "3.0.0", path = "../../primitives/election-providers" }
 
 [features]
 default = ["std"]
diff --git a/frame/babe/src/lib.rs b/frame/babe/src/lib.rs
index b42b4f177ff6..2794d5b24742 100644
--- a/frame/babe/src/lib.rs
+++ b/frame/babe/src/lib.rs
@@ -413,12 +413,14 @@ impl<T: Config> Module<T> {
 	/// In other word, this is only accurate if no slots are missed. Given missed slots, the slot
 	/// number will grow while the block number will not. Hence, the result can be interpreted as an
 	/// upper bound.
-	// -------------- IMPORTANT NOTE --------------
+	//
+	// ## IMPORTANT NOTE
+	//
 	// This implementation is linked to how [`should_epoch_change`] is working. This might need to
 	// be updated accordingly, if the underlying mechanics of slot and epochs change.
 	//
-	// WEIGHT NOTE: This function is tied to the weight of `EstimateNextSessionRotation`. If you update
-	// this function, you must also update the corresponding weight.
+	// WEIGHT NOTE: This function is tied to the weight of `EstimateNextSessionRotation`. If you
+	// update this function, you must also update the corresponding weight.
 	pub fn next_expected_epoch_change(now: T::BlockNumber) -> Option<T::BlockNumber> {
 		let next_slot = Self::current_epoch_start().saturating_add(T::EpochDuration::get());
 		next_slot
@@ -754,6 +756,10 @@ impl<T: Config> OnTimestampSet<T::Moment> for Module<T> {
 }
 
 impl<T: Config> frame_support::traits::EstimateNextSessionRotation<T::BlockNumber> for Module<T> {
+	fn average_session_length() -> T::BlockNumber {
+		T::EpochDuration::get().saturated_into()
+	}
+
 	fn estimate_next_session_rotation(now: T::BlockNumber) -> Option<T::BlockNumber> {
 		Self::next_expected_epoch_change(now)
 	}
diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index cae51fb457ba..412f13f6a2df 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -37,6 +37,7 @@ use sp_consensus_babe::{AuthorityId, AuthorityPair, Slot};
 use sp_consensus_vrf::schnorrkel::{VRFOutput, VRFProof};
 use sp_staking::SessionIndex;
 use pallet_staking::EraIndex;
+use sp_election_providers::onchain;
 use pallet_session::historical as pallet_session_historical;
 
 type DummyValidatorId = u64;
@@ -183,6 +184,13 @@ parameter_types! {
 	pub const StakingUnsignedPriority: u64 = u64::max_value() / 2;
 }
 
+impl onchain::Config for Test {
+	type AccountId = <Self as frame_system::Config>::AccountId;
+	type BlockNumber = <Self as frame_system::Config>::BlockNumber;
+	type Accuracy = Perbill;
+	type DataProvider = Staking;
+}
+
 impl pallet_staking::Config for Test {
 	type RewardRemainder = ();
 	type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote;
@@ -205,6 +213,7 @@ impl pallet_staking::Config for Test {
 	type MaxIterations = ();
 	type MinSolutionScoreBump = ();
 	type OffchainSolutionWeightLimit = ();
+	type ElectionProvider = onchain::OnChainSequentialPhragmen<Self>;
 	type WeightInfo = ();
 }
 
diff --git a/frame/election-provider-multi-phase/Cargo.toml b/frame/election-provider-multi-phase/Cargo.toml
new file mode 100644
index 000000000000..e52093ce1354
--- /dev/null
+++ b/frame/election-provider-multi-phase/Cargo.toml
@@ -0,0 +1,66 @@
+[package]
+name = "pallet-election-provider-multi-phase"
+version = "3.0.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
+license = "Apache-2.0"
+homepage = "https://substrate.dev"
+repository = "https://github.com/paritytech/substrate/"
+description = "PALLET two phase election providers"
+readme = "README.md"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+static_assertions = "1.1.0"
+serde = { version = "1.0.101", optional = true }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+
+sp-io ={ version = "3.0.0", default-features = false, path = "../../primitives/io" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-npos-elections = { version = "3.0.0", default-features = false, path = "../../primitives/npos-elections" }
+sp-arithmetic = { version = "3.0.0", default-features = false, path = "../../primitives/arithmetic" }
+sp-election-providers = { version = "3.0.0", default-features = false, path = "../../primitives/election-providers" }
+
+# Optional imports for benchmarking
+frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+rand = { version = "0.7.3", default-features = false, optional = true, features = ["alloc", "small_rng"] }
+
+[dev-dependencies]
+paste = "1.0.3"
+parking_lot = "0.11.0"
+rand = { version = "0.7.3" }
+hex-literal = "0.3.1"
+substrate-test-utils = { version = "3.0.0", path = "../../test-utils" }
+sp-io = { version = "3.0.0", path = "../../primitives/io" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
+sp-election-providers = { version = "3.0.0", features = ["runtime-benchmarks"], path = "../../primitives/election-providers" }
+pallet-balances = { version = "3.0.0", path = "../balances" }
+frame-benchmarking = { path = "../benchmarking" }
+
+[features]
+default = ["std"]
+std = [
+	"serde",
+	"codec/std",
+
+	"frame-support/std",
+	"frame-system/std",
+
+	"sp-io/std",
+	"sp-std/std",
+	"sp-runtime/std",
+	"sp-npos-elections/std",
+	"sp-arithmetic/std",
+	"sp-election-providers/std",
+]
+runtime-benchmarks = [
+	"frame-benchmarking",
+	"rand",
+]
diff --git a/frame/election-provider-multi-phase/src/benchmarking.rs b/frame/election-provider-multi-phase/src/benchmarking.rs
new file mode 100644
index 000000000000..74db28c6e392
--- /dev/null
+++ b/frame/election-provider-multi-phase/src/benchmarking.rs
@@ -0,0 +1,282 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Two phase election pallet benchmarking.
+
+use super::*;
+use crate::Module as MultiPhase;
+
+pub use frame_benchmarking::{account, benchmarks, whitelist_account, whitelisted_caller};
+use frame_support::{assert_ok, traits::OnInitialize};
+use frame_system::RawOrigin;
+use rand::{prelude::SliceRandom, rngs::SmallRng, SeedableRng};
+use sp_election_providers::Assignment;
+use sp_arithmetic::traits::One;
+use sp_runtime::InnerOf;
+use sp_std::convert::TryInto;
+
+const SEED: u32 = 0;
+
+/// Creates a **valid** solution with exactly the given size.
+///
+/// The snapshot is also created internally.
+fn solution_with_size<T: Config>(
+	size: SolutionOrSnapshotSize,
+	active_voters_count: u32,
+	desired_targets: u32,
+) -> RawSolution<CompactOf<T>> {
+	assert!(size.targets >= desired_targets, "must have enough targets");
+	assert!(
+		size.targets >= (<CompactOf<T>>::LIMIT * 2) as u32,
+		"must have enough targets for unique votes."
+	);
+	assert!(size.voters >= active_voters_count, "must have enough voters");
+	assert!(
+		(<CompactOf<T>>::LIMIT as u32) < desired_targets,
+		"must have enough winners to give them votes."
+	);
+
+	let ed: VoteWeight = T::Currency::minimum_balance().saturated_into::<u64>();
+	let stake: VoteWeight = ed.max(One::one()).saturating_mul(100);
+
+	// first generates random targets.
+	let targets: Vec<T::AccountId> =
+		(0..size.targets).map(|i| account("Targets", i, SEED)).collect();
+
+	let mut rng = SmallRng::seed_from_u64(999u64);
+
+	// decide who are the winners.
+	let winners = targets
+		.as_slice()
+		.choose_multiple(&mut rng, desired_targets as usize)
+		.cloned()
+		.collect::<Vec<_>>();
+
+	// first generate active voters who must vote for a subset of winners.
+	let active_voters = (0..active_voters_count)
+		.map(|i| {
+			// chose a random subset of winners.
+			let winner_votes = winners
+				.as_slice()
+				.choose_multiple(&mut rng, <CompactOf<T>>::LIMIT)
+				.cloned()
+				.collect::<Vec<_>>();
+			let voter = account::<T::AccountId>("Voter", i, SEED);
+			(voter, stake, winner_votes)
+		})
+		.collect::<Vec<_>>();
+
+	// rest of the voters. They can only vote for non-winners.
+	let non_winners =
+		targets.iter().filter(|t| !winners.contains(t)).cloned().collect::<Vec<T::AccountId>>();
+	let rest_voters = (active_voters_count..size.voters)
+		.map(|i| {
+			let votes = (&non_winners)
+				.choose_multiple(&mut rng, <CompactOf<T>>::LIMIT)
+				.cloned()
+				.collect::<Vec<T::AccountId>>();
+			let voter = account::<T::AccountId>("Voter", i, SEED);
+			(voter, stake, votes)
+		})
+		.collect::<Vec<_>>();
+
+	let mut all_voters = active_voters.clone();
+	all_voters.extend(rest_voters);
+	all_voters.shuffle(&mut rng);
+
+	assert_eq!(active_voters.len() as u32, active_voters_count);
+	assert_eq!(all_voters.len() as u32, size.voters);
+	assert_eq!(winners.len() as u32, desired_targets);
+
+	<SnapshotMetadata<T>>::put(SolutionOrSnapshotSize {
+		voters: all_voters.len() as u32,
+		targets: targets.len() as u32,
+	});
+	<DesiredTargets<T>>::put(desired_targets);
+	<Snapshot<T>>::put(RoundSnapshot { voters: all_voters.clone(), targets: targets.clone() });
+
+	// write the snapshot to staking or whoever is the data provider.
+	T::DataProvider::put_snapshot(all_voters.clone(), targets.clone());
+
+	let cache = helpers::generate_voter_cache::<T>(&all_voters);
+	let stake_of = helpers::stake_of_fn::<T>(&all_voters, &cache);
+	let voter_index = helpers::voter_index_fn::<T>(&cache);
+	let target_index = helpers::target_index_fn_linear::<T>(&targets);
+	let voter_at = helpers::voter_at_fn::<T>(&all_voters);
+	let target_at = helpers::target_at_fn::<T>(&targets);
+
+	let assignments = active_voters
+		.iter()
+		.map(|(voter, _stake, votes)| {
+			let percent_per_edge: InnerOf<CompactAccuracyOf<T>> =
+				(100 / votes.len()).try_into().unwrap_or_else(|_| panic!("failed to convert"));
+			Assignment {
+				who: voter.clone(),
+				distribution: votes
+					.iter()
+					.map(|t| (t.clone(), <CompactAccuracyOf<T>>::from_percent(percent_per_edge)))
+					.collect::<Vec<_>>(),
+			}
+		})
+		.collect::<Vec<_>>();
+
+	let compact =
+		<CompactOf<T>>::from_assignment(assignments, &voter_index, &target_index).unwrap();
+	let score = compact.clone().score(&winners, stake_of, voter_at, target_at).unwrap();
+	let round = <MultiPhase<T>>::round();
+	RawSolution { compact, score, round }
+}
+
+benchmarks! {
+	on_initialize_nothing {
+		assert!(<MultiPhase<T>>::current_phase().is_off());
+	}: {
+		<MultiPhase<T>>::on_initialize(1u32.into());
+	} verify {
+		assert!(<MultiPhase<T>>::current_phase().is_off());
+	}
+
+	on_initialize_open_signed {
+		// NOTE: this benchmark currently doesn't have any components because the length of a db
+		// read/write is not captured. Otherwise, it is quite influenced by how much data
+		// `T::ElectionDataProvider` is reading and passing on.
+		assert!(<MultiPhase<T>>::snapshot().is_none());
+		assert!(<MultiPhase<T>>::current_phase().is_off());
+	}: {
+		<MultiPhase<T>>::on_initialize_open_signed();
+	} verify {
+		assert!(<MultiPhase<T>>::snapshot().is_some());
+		assert!(<MultiPhase<T>>::current_phase().is_signed());
+	}
+
+	on_initialize_open_unsigned_with_snapshot {
+		assert!(<MultiPhase<T>>::snapshot().is_none());
+		assert!(<MultiPhase<T>>::current_phase().is_off());
+	}: {
+		<MultiPhase<T>>::on_initialize_open_unsigned(true, true, 1u32.into());
+	} verify {
+		assert!(<MultiPhase<T>>::snapshot().is_some());
+		assert!(<MultiPhase<T>>::current_phase().is_unsigned());
+	}
+
+	on_initialize_open_unsigned_without_snapshot {
+		// need to assume signed phase was open before
+		<MultiPhase<T>>::on_initialize_open_signed();
+		assert!(<MultiPhase<T>>::snapshot().is_some());
+		assert!(<MultiPhase<T>>::current_phase().is_signed());
+	}: {
+		<MultiPhase<T>>::on_initialize_open_unsigned(false, true, 1u32.into());
+	} verify {
+		assert!(<MultiPhase<T>>::snapshot().is_some());
+		assert!(<MultiPhase<T>>::current_phase().is_unsigned());
+	}
+
+	#[extra]
+	create_snapshot {
+		assert!(<MultiPhase<T>>::snapshot().is_none());
+	}: {
+		<MultiPhase::<T>>::create_snapshot()
+	} verify {
+		assert!(<MultiPhase<T>>::snapshot().is_some());
+	}
+
+	submit_unsigned {
+		// number of votes in snapshot.
+		let v in (T::BenchmarkingConfig::VOTERS[0]) .. T::BenchmarkingConfig::VOTERS[1];
+		// number of targets in snapshot.
+		let t in (T::BenchmarkingConfig::TARGETS[0]) .. T::BenchmarkingConfig::TARGETS[1];
+		// number of assignments, i.e. compact.len(). This means the active nominators, thus must be
+		// a subset of `v` component.
+		let a in (T::BenchmarkingConfig::ACTIVE_VOTERS[0]) .. T::BenchmarkingConfig::ACTIVE_VOTERS[1];
+		// number of desired targets. Must be a subset of `t` component.
+		let d in (T::BenchmarkingConfig::DESIRED_TARGETS[0]) .. T::BenchmarkingConfig::DESIRED_TARGETS[1];
+
+		let witness = SolutionOrSnapshotSize { voters: v, targets: t };
+		let raw_solution = solution_with_size::<T>(witness, a, d);
+
+		assert!(<MultiPhase<T>>::queued_solution().is_none());
+		<CurrentPhase<T>>::put(Phase::Unsigned((true, 1u32.into())));
+
+		// encode the most significant storage item that needs to be decoded in the dispatch.
+		let encoded_snapshot = <MultiPhase<T>>::snapshot().unwrap().encode();
+		let encoded_call = <Call<T>>::submit_unsigned(raw_solution.clone(), witness).encode();
+	}: {
+		assert_ok!(<MultiPhase<T>>::submit_unsigned(RawOrigin::None.into(), raw_solution, witness));
+		let _decoded_snap = <RoundSnapshot<T::AccountId> as Decode>::decode(&mut &*encoded_snapshot).unwrap();
+		let _decoded_call = <Call<T> as Decode>::decode(&mut &*encoded_call).unwrap();
+	} verify {
+		assert!(<MultiPhase<T>>::queued_solution().is_some());
+	}
+
+	// This is checking a valid solution. The worse case is indeed a valid solution.
+	feasibility_check {
+		// number of votes in snapshot.
+		let v in (T::BenchmarkingConfig::VOTERS[0]) .. T::BenchmarkingConfig::VOTERS[1];
+		// number of targets in snapshot.
+		let t in (T::BenchmarkingConfig::TARGETS[0]) .. T::BenchmarkingConfig::TARGETS[1];
+		// number of assignments, i.e. compact.len(). This means the active nominators, thus must be
+		// a subset of `v` component.
+		let a in (T::BenchmarkingConfig::ACTIVE_VOTERS[0]) .. T::BenchmarkingConfig::ACTIVE_VOTERS[1];
+		// number of desired targets. Must be a subset of `t` component.
+		let d in (T::BenchmarkingConfig::DESIRED_TARGETS[0]) .. T::BenchmarkingConfig::DESIRED_TARGETS[1];
+
+		let size = SolutionOrSnapshotSize { voters: v, targets: t };
+		let raw_solution = solution_with_size::<T>(size, a, d);
+
+		assert_eq!(raw_solution.compact.voter_count() as u32, a);
+		assert_eq!(raw_solution.compact.unique_targets().len() as u32, d);
+
+		// encode the most significant storage item that needs to be decoded in the dispatch.
+		let encoded_snapshot = <MultiPhase<T>>::snapshot().unwrap().encode();
+	}: {
+		assert_ok!(<MultiPhase<T>>::feasibility_check(raw_solution, ElectionCompute::Unsigned));
+		let _decoded_snap = <RoundSnapshot<T::AccountId> as Decode>::decode(&mut &*encoded_snapshot).unwrap();
+	}
+}
+
+#[cfg(test)]
+mod test {
+	use super::*;
+	use crate::mock::*;
+
+	#[test]
+	fn test_benchmarks() {
+		ExtBuilder::default().build_and_execute(|| {
+			assert_ok!(test_benchmark_feasibility_check::<Runtime>());
+		});
+
+		ExtBuilder::default().build_and_execute(|| {
+			assert_ok!(test_benchmark_submit_unsigned::<Runtime>());
+		});
+
+		ExtBuilder::default().build_and_execute(|| {
+			assert_ok!(test_benchmark_on_initialize_open_unsigned_with_snapshot::<Runtime>());
+		});
+
+		ExtBuilder::default().build_and_execute(|| {
+			assert_ok!(test_benchmark_on_initialize_open_unsigned_without_snapshot::<Runtime>());
+		});
+
+		ExtBuilder::default().build_and_execute(|| {
+			assert_ok!(test_benchmark_on_initialize_nothing::<Runtime>());
+		});
+
+		ExtBuilder::default().build_and_execute(|| {
+			assert_ok!(test_benchmark_create_snapshot::<Runtime>());
+		});
+	}
+}
diff --git a/frame/election-provider-multi-phase/src/helpers.rs b/frame/election-provider-multi-phase/src/helpers.rs
new file mode 100644
index 000000000000..be074594e660
--- /dev/null
+++ b/frame/election-provider-multi-phase/src/helpers.rs
@@ -0,0 +1,159 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Some helper functions/macros for this crate.
+
+use super::{Config, VoteWeight, CompactVoterIndexOf, CompactTargetIndexOf};
+use sp_std::{collections::btree_map::BTreeMap, convert::TryInto, boxed::Box, prelude::*};
+
+#[macro_export]
+macro_rules! log {
+	($level:tt, $patter:expr $(, $values:expr)* $(,)?) => {
+		frame_support::debug::$level!(
+			target: $crate::LOG_TARGET,
+			concat!("🗳 ", $patter) $(, $values)*
+		)
+	};
+}
+
+/// Generate a btree-map cache of the voters and their indices.
+///
+/// This can be used to efficiently build index getter closures.
+pub fn generate_voter_cache<T: Config>(
+	snapshot: &Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)>,
+) -> BTreeMap<T::AccountId, usize> {
+	let mut cache: BTreeMap<T::AccountId, usize> = BTreeMap::new();
+	snapshot.iter().enumerate().for_each(|(i, (x, _, _))| {
+		let _existed = cache.insert(x.clone(), i);
+		// if a duplicate exists, we only consider the last one. Defensive only, should never
+		// happen.
+		debug_assert!(_existed.is_none());
+	});
+
+	cache
+}
+
+/// Create a function the returns the index a voter in the snapshot.
+///
+/// The returning index type is the same as the one defined in [`T::CompactSolution::Voter`].
+///
+/// ## Warning
+///
+/// The snapshot must be the same is the one used to create `cache`.
+pub fn voter_index_fn<T: Config>(
+	cache: &BTreeMap<T::AccountId, usize>,
+) -> Box<dyn Fn(&T::AccountId) -> Option<CompactVoterIndexOf<T>> + '_> {
+	Box::new(move |who| {
+		cache.get(who).and_then(|i| <usize as TryInto<CompactVoterIndexOf<T>>>::try_into(*i).ok())
+	})
+}
+
+/// Same as [`voter_index_fn`], but the returning index is converted into usize, if possible.
+///
+/// ## Warning
+///
+/// The snapshot must be the same is the one used to create `cache`.
+pub fn voter_index_fn_usize<T: Config>(
+	cache: &BTreeMap<T::AccountId, usize>,
+) -> Box<dyn Fn(&T::AccountId) -> Option<usize> + '_> {
+	Box::new(move |who| cache.get(who).cloned())
+}
+
+/// A non-optimized, linear version of [`voter_index_fn`] that does not need a cache and does a
+/// linear search.
+///
+/// ## Warning
+///
+/// Not meant to be used in production.
+pub fn voter_index_fn_linear<T: Config>(
+	snapshot: &Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)>,
+) -> Box<dyn Fn(&T::AccountId) -> Option<CompactVoterIndexOf<T>> + '_> {
+	Box::new(move |who| {
+		snapshot
+			.iter()
+			.position(|(x, _, _)| x == who)
+			.and_then(|i| <usize as TryInto<CompactVoterIndexOf<T>>>::try_into(i).ok())
+	})
+}
+
+/// Create a function the returns the index a targets in the snapshot.
+///
+/// The returning index type is the same as the one defined in [`T::CompactSolution::Target`].
+pub fn target_index_fn_linear<T: Config>(
+	snapshot: &Vec<T::AccountId>,
+) -> Box<dyn Fn(&T::AccountId) -> Option<CompactTargetIndexOf<T>> + '_> {
+	Box::new(move |who| {
+		snapshot
+			.iter()
+			.position(|x| x == who)
+			.and_then(|i| <usize as TryInto<CompactTargetIndexOf<T>>>::try_into(i).ok())
+	})
+}
+
+/// Create a function that can map a voter index ([`CompactVoterIndexOf`]) to the actual voter
+/// account using a linearly indexible snapshot.
+pub fn voter_at_fn<T: Config>(
+	snapshot: &Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)>,
+) -> Box<dyn Fn(CompactVoterIndexOf<T>) -> Option<T::AccountId> + '_> {
+	Box::new(move |i| {
+		<CompactVoterIndexOf<T> as TryInto<usize>>::try_into(i)
+			.ok()
+			.and_then(|i| snapshot.get(i).map(|(x, _, _)| x).cloned())
+	})
+}
+
+/// Create a function that can map a target index ([`CompactTargetIndexOf`]) to the actual target
+/// account using a linearly indexible snapshot.
+pub fn target_at_fn<T: Config>(
+	snapshot: &Vec<T::AccountId>,
+) -> Box<dyn Fn(CompactTargetIndexOf<T>) -> Option<T::AccountId> + '_> {
+	Box::new(move |i| {
+		<CompactTargetIndexOf<T> as TryInto<usize>>::try_into(i)
+			.ok()
+			.and_then(|i| snapshot.get(i).cloned())
+	})
+}
+
+/// Create a function to get the stake of a voter.
+///
+/// This is not optimized and uses a linear search.
+pub fn stake_of_fn_linear<T: Config>(
+	snapshot: &Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)>,
+) -> Box<dyn Fn(&T::AccountId) -> VoteWeight + '_> {
+	Box::new(move |who| {
+		snapshot.iter().find(|(x, _, _)| x == who).map(|(_, x, _)| *x).unwrap_or_default()
+	})
+}
+
+/// Create a function to get the stake of a voter.
+///
+/// ## Warning
+///
+/// The cache need must be derived from the same snapshot. Zero is returned if a voter is
+/// non-existent.
+pub fn stake_of_fn<'a, T: Config>(
+	snapshot: &'a Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)>,
+	cache: &'a BTreeMap<T::AccountId, usize>,
+) -> Box<dyn Fn(&T::AccountId) -> VoteWeight + 'a> {
+	Box::new(move |who| {
+		if let Some(index) = cache.get(who) {
+			snapshot.get(*index).map(|(_, x, _)| x).cloned().unwrap_or_default()
+		} else {
+			0
+		}
+	})
+}
diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
new file mode 100644
index 000000000000..5e1bc8df9a7c
--- /dev/null
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -0,0 +1,1456 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! # Multi phase, offchain election provider pallet.
+//!
+//! Currently, this election-provider has two distinct phases (see [`Phase`]), **signed** and
+//! **unsigned**.
+//!
+//! ## Phases
+//!
+//! The timeline of pallet is as follows. At each block,
+//! [`sp_election_providers::ElectionDataProvider::next_election_prediction`] is used to estimate
+//! the time remaining to the next call to [`sp_election_providers::ElectionProvider::elect`]. Based
+//! on this, a phase is chosen. The timeline is as follows.
+//!
+//! ```ignore
+//!                                                                    elect()
+//!                 +   <--T::SignedPhase-->  +  <--T::UnsignedPhase-->   +
+//!   +-------------------------------------------------------------------+
+//!    Phase::Off   +       Phase::Signed     +      Phase::Unsigned      +
+//! ```
+//!
+//! Note that the unsigned phase starts [`pallet::Config::UnsignedPhase`] blocks before the
+//! `next_election_prediction`, but only ends when a call to [`ElectionProvider::elect`] happens. If
+//! no `elect` happens, the signed phase is extended.
+//!
+//! > Given this, it is rather important for the user of this pallet to ensure it always terminates
+//! election via `elect` before requesting a new one.
+//!
+//! Each of the phases can be disabled by essentially setting their length to zero. If both phases
+//! have length zero, then the pallet essentially runs only the fallback strategy, denoted by
+//! [`Config::FallbackStrategy`].
+//! ### Signed Phase
+//!
+//!	In the signed phase, solutions (of type [`RawSolution`]) are submitted and queued on chain. A
+//! deposit is reserved, based on the size of the solution, for the cost of keeping this solution
+//! on-chain for a number of blocks, and the potential weight of the solution upon being checked. A
+//! maximum of [`pallet::Config::MaxSignedSubmissions`] solutions are stored. The queue is always
+//! sorted based on score (worse to best).
+//!
+//! Upon arrival of a new solution:
+//!
+//! 1. If the queue is not full, it is stored in the appropriate sorted index.
+//! 2. If the queue is full but the submitted solution is better than one of the queued ones, the
+//!    worse solution is discarded, the bond of the outgoing solution is returned, and the new
+//!    solution is stored in the correct index.
+//! 3. If the queue is full and the solution is not an improvement compared to any of the queued
+//!    ones, it is instantly rejected and no additional bond is reserved.
+//!
+//! A signed solution cannot be reversed, taken back, updated, or retracted. In other words, the
+//! origin can not bail out in any way, if their solution is queued.
+//!
+//! Upon the end of the signed phase, the solutions are examined from best to worse (i.e. `pop()`ed
+//! until drained). Each solution undergoes an expensive [`Pallet::feasibility_check`], which
+//! ensures the score claimed by this score was correct, and it is valid based on the election data
+//! (i.e. votes and candidates). At each step, if the current best solution passes the feasibility
+//! check, it is considered to be the best one. The sender of the origin is rewarded, and the rest
+//! of the queued solutions get their deposit back and are discarded, without being checked.
+//!
+//! The following example covers all of the cases at the end of the signed phase:
+//!
+//! ```ignore
+//! Queue
+//! +-------------------------------+
+//! |Solution(score=20, valid=false)| +-->  Slashed
+//! +-------------------------------+
+//! |Solution(score=15, valid=true )| +-->  Rewarded, Saved
+//! +-------------------------------+
+//! |Solution(score=10, valid=true )| +-->  Discarded
+//! +-------------------------------+
+//! |Solution(score=05, valid=false)| +-->  Discarded
+//! +-------------------------------+
+//! |             None              |
+//! +-------------------------------+
+//! ```
+//!
+//! Note that both of the bottom solutions end up being discarded and get their deposit back,
+//! despite one of them being *invalid*.
+//!
+//! ## Unsigned Phase
+//!
+//! The unsigned phase will always follow the signed phase, with the specified duration. In this
+//! phase, only validator nodes can submit solutions. A validator node who has offchain workers
+//! enabled will start to mine a solution in this phase and submits it back to the chain as an
+//! unsigned transaction, thus the name _unsigned_ phase. This unsigned transaction can never be
+//! valid if propagated, and it acts similar to an inherent.
+//!
+//! Validators will only submit solutions if the one that they have computed is sufficiently better
+//! than the best queued one (see [`pallet::Config::SolutionImprovementThreshold`]) and will limit
+//! the weigh of the solution to [`pallet::Config::MinerMaxWeight`].
+//!
+//! The unsigned phase can be made passive depending on how the previous signed phase went, by
+//! setting the first inner value of [`Phase`] to `false`. For now, the signed phase is always
+//! active.
+//!
+//! ### Fallback
+//!
+//! If we reach the end of both phases (i.e. call to [`ElectionProvider::elect`] happens) and no
+//! good solution is queued, then the fallback strategy [`pallet::Config::Fallback`] is used to
+//! determine what needs to be done. The on-chain election is slow, and contains no balancing or
+//! reduction post-processing. See [`onchain::OnChainSequentialPhragmen`]. The
+//! [`FallbackStrategy::Nothing`] should probably only be used for testing, and returns an error.
+//!
+//! ## Feasible Solution (correct solution)
+//!
+//! All submissions must undergo a feasibility check. Signed solutions are checked on by one at the
+//! end of the signed phase, and the unsigned solutions are checked on the spot. A feasible solution
+//! is as follows:
+//!
+//! 0. **all** of the used indices must be correct.
+//! 1. present *exactly* correct number of winners.
+//! 2. any assignment is checked to match with [`RoundSnapshot::voters`].
+//! 3. the claimed score is valid, based on the fixed point arithmetic accuracy.
+//!
+//! ## Accuracy
+//!
+//! The accuracy of the election is configured via two trait parameters. namely,
+//! [`OnChainAccuracyOf`] dictates the accuracy used to compute the on-chain fallback election and
+//! [`CompactAccuracyOf`] is the accuracy that the submitted solutions must adhere to.
+//!
+//! Note that both accuracies are of great importance. The offchain solution should be as small as
+//! possible, reducing solutions size/weight. The on-chain solution can use more space for accuracy,
+//! but should still be fast to prevent massively large blocks in case of a fallback.
+//!
+//! ## Error types
+//!
+//! This pallet provides a verbose error system to ease future debugging and debugging. The
+//! overall hierarchy of errors is as follows:
+//!
+//! 1. [`pallet::Error`]: These are the errors that can be returned in the dispatchables of the
+//!    pallet, either signed or unsigned. Since decomposition with nested enums is not possible
+//!    here, they are prefixed with the logical sub-system to which they belong.
+//! 2. [`ElectionError`]: These are the errors that can be generated while the pallet is doing
+//!    something in automatic scenarios, such as `offchain_worker` or `on_initialize`. These errors
+//!    are helpful for logging and are thus nested as:
+//!    - [`ElectionError::Miner`]: wraps a [`unsigned::MinerError`].
+//!    - [`ElectionError::Feasibility`]: wraps a [`FeasibilityError`].
+//!    - [`ElectionError::OnChainFallback`]: wraps a [`sp_election_providers::onchain::Error`].
+//!
+//! Note that there could be an overlap between these sub-errors. For example, A
+//! `SnapshotUnavailable` can happen in both miner and feasibility check phase.
+//!
+//! ## Future Plans
+//!
+//! **Challenge Phase**. We plan adding a third phase to the pallet, called the challenge phase.
+//! This is phase in which no further solutions are processed, and the current best solution might
+//! be challenged by anyone (signed or unsigned). The main plan here is to enforce the solution to
+//! be PJR. Checking PJR on-chain is quite expensive, yet proving that a solution is **not** PJR is
+//! rather cheap. If a queued solution is challenged:
+//!
+//! 1. We must surely slash whoever submitted that solution (might be a challenge for unsigned
+//!    solutions).
+//! 2. It is probably fine to fallback to the on-chain election, as we expect this to happen rarely.
+//!
+//! **Bailing out**. The functionality of bailing out of a queued solution is nice. A miner can
+//! submit a solution as soon as they _think_ it is high probability feasible, and do the checks
+//! afterwards, and remove their solution (for a small cost of probably just transaction fees, or a
+//! portion of the bond).
+//!
+//! **Conditionally open unsigned phase**: Currently, the unsigned phase is always opened. This is
+//! useful because an honest validation will run our OCW code, which should be good enough to trump
+//! a mediocre or malicious signed submission (assuming in the absence of honest signed bots). If an
+//! when the signed submissions are checked against an absolute measure (e.g. PJR), then we can only
+//! open the unsigned phase in extreme conditions (i.e. "not good signed solution received") to
+//! spare some work in the validators
+//!
+//! **Allow smaller solutions and build up**: For now we only allow solutions that are exactly
+//! [`DesiredTargets`], no more, no less. Over time, we can change this to a [min, max] where any
+//! solution within this range is acceptable, where bigger solutions are prioritized.
+//!
+//! **Recursive Fallback**: Currently, the fallback is a separate enum. A different and fancier way
+//! of doing this would be to have the fallback be another
+//! [`sp_election_providers::ElectionProvider`]. In this case, this pallet can even have the
+//! on-chain election provider as fallback, or special _noop_ fallback that simply returns an error,
+//! thus replicating [`FallbackStrategy::Nothing`]. In this case, we won't need the additional
+//! config OnChainAccuracy either.
+//!
+//! **Score based on (byte) size**: We should always prioritize small solutions over bigger ones, if
+//! there is a tie. Even more harsh should be to enforce the bound of the `reduce` algorithm.
+//!
+//! **Offchain resubmit**: Essentially port https://github.com/paritytech/substrate/pull/7976 to
+//! this pallet as well. The `OFFCHAIN_REPEAT` also needs to become an adjustable parameter of the
+//! pallet.
+//!
+//! **Make the number of nominators configurable from the runtime**. Remove `sp_npos_elections`
+//! dependency from staking and the compact solution type. It should be generated at runtime, there
+//! it should be encoded how many votes each nominators have. Essentially translate
+//! https://github.com/paritytech/substrate/pull/7929 to this pallet.
+
+#![cfg_attr(not(feature = "std"), no_std)]
+
+use codec::{Decode, Encode};
+use frame_support::{
+	dispatch::DispatchResultWithPostInfo,
+	ensure,
+	traits::{Currency, Get, ReservableCurrency},
+	weights::Weight,
+};
+use frame_system::{ensure_none, offchain::SendTransactionTypes};
+use sp_election_providers::{ElectionDataProvider, ElectionProvider, onchain};
+use sp_npos_elections::{
+	assignment_ratio_to_staked_normalized, is_score_better, CompactSolution, ElectionScore,
+	EvaluateSupport, PerThing128, Supports, VoteWeight,
+};
+use sp_runtime::{
+	transaction_validity::{
+		InvalidTransaction, TransactionPriority, TransactionSource, TransactionValidity,
+		TransactionValidityError, ValidTransaction,
+	},
+	DispatchError, PerThing, Perbill, RuntimeDebug, SaturatedConversion,
+};
+use sp_std::prelude::*;
+use sp_arithmetic::{
+	UpperOf,
+	traits::{Zero, CheckedAdd},
+};
+
+#[cfg(any(feature = "runtime-benchmarks", test))]
+mod benchmarking;
+#[cfg(test)]
+mod mock;
+#[macro_use]
+pub mod helpers;
+
+const LOG_TARGET: &'static str = "runtime::election-provider";
+
+pub mod unsigned;
+pub mod weights;
+
+use weights::WeightInfo;
+
+/// The compact solution type used by this crate.
+pub type CompactOf<T> = <T as Config>::CompactSolution;
+
+/// The voter index. Derived from [`CompactOf`].
+pub type CompactVoterIndexOf<T> = <CompactOf<T> as CompactSolution>::Voter;
+/// The target index. Derived from [`CompactOf`].
+pub type CompactTargetIndexOf<T> = <CompactOf<T> as CompactSolution>::Target;
+/// The accuracy of the election, when submitted from offchain. Derived from [`CompactOf`].
+pub type CompactAccuracyOf<T> = <CompactOf<T> as CompactSolution>::Accuracy;
+/// The accuracy of the election, when computed on-chain. Equal to [`Config::OnChainAccuracy`].
+pub type OnChainAccuracyOf<T> = <T as Config>::OnChainAccuracy;
+
+/// Wrapper type that implements the configurations needed for the on-chain backup.
+struct OnChainConfig<T: Config>(sp_std::marker::PhantomData<T>);
+impl<T: Config> onchain::Config for OnChainConfig<T> {
+	type AccountId = T::AccountId;
+	type BlockNumber = T::BlockNumber;
+	type Accuracy = T::OnChainAccuracy;
+	type DataProvider = T::DataProvider;
+}
+
+/// Configuration for the benchmarks of the pallet.
+pub trait BenchmarkingConfig {
+	/// Range of voters.
+	const VOTERS: [u32; 2];
+	/// Range of targets.
+	const TARGETS: [u32; 2];
+	/// Range of active voters.
+	const ACTIVE_VOTERS: [u32; 2];
+	/// Range of desired targets.
+	const DESIRED_TARGETS: [u32; 2];
+}
+
+impl BenchmarkingConfig for () {
+	const VOTERS: [u32; 2] = [4000, 6000];
+	const TARGETS: [u32; 2] = [1000, 1600];
+	const ACTIVE_VOTERS: [u32; 2] = [1000, 3000];
+	const DESIRED_TARGETS: [u32; 2] = [400, 800];
+}
+
+/// Current phase of the pallet.
+#[derive(PartialEq, Eq, Clone, Copy, Encode, Decode, RuntimeDebug)]
+pub enum Phase<Bn> {
+	/// Nothing, the election is not happening.
+	Off,
+	/// Signed phase is open.
+	Signed,
+	/// Unsigned phase. First element is whether it is open or not, second the starting block
+	/// number.
+	Unsigned((bool, Bn)),
+}
+
+impl<Bn> Default for Phase<Bn> {
+	fn default() -> Self {
+		Phase::Off
+	}
+}
+
+impl<Bn: PartialEq + Eq> Phase<Bn> {
+	/// Weather the phase is signed or not.
+	pub fn is_signed(&self) -> bool {
+		matches!(self, Phase::Signed)
+	}
+
+	/// Weather the phase is unsigned or not.
+	pub fn is_unsigned(&self) -> bool {
+		matches!(self, Phase::Unsigned(_))
+	}
+
+	/// Weather the phase is unsigned and open or not, with specific start.
+	pub fn is_unsigned_open_at(&self, at: Bn) -> bool {
+		matches!(self, Phase::Unsigned((true, real)) if *real == at)
+	}
+
+	/// Weather the phase is unsigned and open or not.
+	pub fn is_unsigned_open(&self) -> bool {
+		matches!(self, Phase::Unsigned((true, _)))
+	}
+
+	/// Weather the phase is off or not.
+	pub fn is_off(&self) -> bool {
+		matches!(self, Phase::Off)
+	}
+}
+
+/// A configuration for the pallet to indicate what should happen in the case of a fallback i.e.
+/// reaching a call to `elect` with no good solution.
+#[cfg_attr(test, derive(Clone))]
+pub enum FallbackStrategy {
+	/// Run a on-chain sequential phragmen.
+	///
+	/// This might burn the chain for a few minutes due to a stall, but is generally a safe
+	/// approach to maintain a sensible validator set.
+	OnChain,
+	/// Nothing. Return an error.
+	Nothing,
+}
+
+/// The type of `Computation` that provided this election data.
+#[derive(PartialEq, Eq, Clone, Copy, Encode, Decode, RuntimeDebug)]
+pub enum ElectionCompute {
+	/// Election was computed on-chain.
+	OnChain,
+	/// Election was computed with a signed submission.
+	Signed,
+	/// Election was computed with an unsigned submission.
+	Unsigned,
+}
+
+impl Default for ElectionCompute {
+	fn default() -> Self {
+		ElectionCompute::OnChain
+	}
+}
+
+/// A raw, unchecked solution.
+///
+/// This is what will get submitted to the chain.
+///
+/// Such a solution should never become effective in anyway before being checked by the
+/// [`Pallet::feasibility_check`]
+#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug)]
+pub struct RawSolution<C> {
+	/// Compact election edges.
+	compact: C,
+	/// The _claimed_ score of the solution.
+	score: ElectionScore,
+	/// The round at which this solution should be submitted.
+	round: u32,
+}
+
+impl<C: Default> Default for RawSolution<C> {
+	fn default() -> Self {
+		// Round 0 is always invalid, only set this to 1.
+		Self { round: 1, compact: Default::default(), score: Default::default() }
+	}
+}
+
+/// A checked solution, ready to be enacted.
+#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, Default)]
+pub struct ReadySolution<A> {
+	/// The final supports of the solution.
+	///
+	/// This is target-major vector, storing each winners, total backing, and each individual
+	/// backer.
+	supports: Supports<A>,
+	/// The score of the solution.
+	///
+	/// This is needed to potentially challenge the solution.
+	score: ElectionScore,
+	/// How this election was computed.
+	compute: ElectionCompute,
+}
+
+/// A snapshot of all the data that is needed for en entire round. They are provided by
+/// [`ElectionDataProvider`] and are kept around until the round is finished.
+///
+/// These are stored together because they are often accessed together.
+#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, Default)]
+pub struct RoundSnapshot<A> {
+	/// All of the voters.
+	pub voters: Vec<(A, VoteWeight, Vec<A>)>,
+	/// All of the targets.
+	pub targets: Vec<A>,
+}
+
+/// Encodes the length of a solution or a snapshot.
+///
+/// This is stored automatically on-chain, and it contains the **size of the entire snapshot**.
+/// This is also used in dispatchables as weight witness data and should **only contain the size of
+/// the presented solution**, not the entire snapshot.
+#[derive(PartialEq, Eq, Clone, Copy, Encode, Decode, RuntimeDebug, Default)]
+pub struct SolutionOrSnapshotSize {
+	/// The length of voters.
+	#[codec(compact)]
+	voters: u32,
+	/// The length of targets.
+	#[codec(compact)]
+	targets: u32,
+}
+
+/// Internal errors of the pallet.
+///
+/// Note that this is different from [`pallet::Error`].
+#[derive(Debug, Eq, PartialEq)]
+pub enum ElectionError {
+	/// An error happened in the feasibility check sub-system.
+	Feasibility(FeasibilityError),
+	/// An error in the miner (offchain) sub-system.
+	Miner(unsigned::MinerError),
+	/// An error in the on-chain fallback.
+	OnChainFallback(onchain::Error),
+	/// No fallback is configured. This is a special case.
+	NoFallbackConfigured,
+}
+
+impl From<onchain::Error> for ElectionError {
+	fn from(e: onchain::Error) -> Self {
+		ElectionError::OnChainFallback(e)
+	}
+}
+
+impl From<FeasibilityError> for ElectionError {
+	fn from(e: FeasibilityError) -> Self {
+		ElectionError::Feasibility(e)
+	}
+}
+
+impl From<unsigned::MinerError> for ElectionError {
+	fn from(e: unsigned::MinerError) -> Self {
+		ElectionError::Miner(e)
+	}
+}
+
+/// Errors that can happen in the feasibility check.
+#[derive(Debug, Eq, PartialEq)]
+pub enum FeasibilityError {
+	/// Wrong number of winners presented.
+	WrongWinnerCount,
+	/// The snapshot is not available.
+	///
+	/// Kinda defensive: The pallet should technically never attempt to do a feasibility check when
+	/// no snapshot is present.
+	SnapshotUnavailable,
+	/// Internal error from the election crate.
+	NposElection(sp_npos_elections::Error),
+	/// A vote is invalid.
+	InvalidVote,
+	/// A voter is invalid.
+	InvalidVoter,
+	/// A winner is invalid.
+	InvalidWinner,
+	/// The given score was invalid.
+	InvalidScore,
+	/// The provided round is incorrect.
+	InvalidRound,
+}
+
+impl From<sp_npos_elections::Error> for FeasibilityError {
+	fn from(e: sp_npos_elections::Error) -> Self {
+		FeasibilityError::NposElection(e)
+	}
+}
+
+pub use pallet::*;
+#[frame_support::pallet]
+pub mod pallet {
+	use super::*;
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config + SendTransactionTypes<Call<Self>> {
+		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
+
+		/// Currency type.
+		type Currency: ReservableCurrency<Self::AccountId> + Currency<Self::AccountId>;
+
+		/// Duration of the unsigned phase.
+		#[pallet::constant]
+		type UnsignedPhase: Get<Self::BlockNumber>;
+		/// Duration of the signed phase.
+		#[pallet::constant]
+		type SignedPhase: Get<Self::BlockNumber>;
+
+		/// The minimum amount of improvement to the solution score that defines a solution as
+		/// "better" (in any phase).
+		#[pallet::constant]
+		type SolutionImprovementThreshold: Get<Perbill>;
+
+		/// The priority of the unsigned transaction submitted in the unsigned-phase
+		type MinerTxPriority: Get<TransactionPriority>;
+		/// Maximum number of iteration of balancing that will be executed in the embedded miner of
+		/// the pallet.
+		type MinerMaxIterations: Get<u32>;
+		/// Maximum weight that the miner should consume.
+		///
+		/// The miner will ensure that the total weight of the unsigned solution will not exceed
+		/// this values, based on [`WeightInfo::submit_unsigned`].
+		type MinerMaxWeight: Get<Weight>;
+
+		/// Something that will provide the election data.
+		type DataProvider: ElectionDataProvider<Self::AccountId, Self::BlockNumber>;
+
+		/// The compact solution type
+		type CompactSolution: codec::Codec
+			+ Default
+			+ PartialEq
+			+ Eq
+			+ Clone
+			+ sp_std::fmt::Debug
+			+ CompactSolution;
+
+		/// Accuracy used for fallback on-chain election.
+		type OnChainAccuracy: PerThing128;
+
+		/// Configuration for the fallback
+		type Fallback: Get<FallbackStrategy>;
+
+		/// The configuration of benchmarking.
+		type BenchmarkingConfig: BenchmarkingConfig;
+
+		/// The weight of the pallet.
+		type WeightInfo: WeightInfo;
+	}
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+		fn on_initialize(now: T::BlockNumber) -> Weight {
+			let next_election = T::DataProvider::next_election_prediction(now).max(now);
+
+			let signed_deadline = T::SignedPhase::get() + T::UnsignedPhase::get();
+			let unsigned_deadline = T::UnsignedPhase::get();
+
+			let remaining = next_election - now;
+			let current_phase = Self::current_phase();
+
+			match current_phase {
+				Phase::Off if remaining <= signed_deadline && remaining > unsigned_deadline => {
+					Self::on_initialize_open_signed();
+					log!(info, "Starting signed phase at #{:?} , round {}.", now, Self::round());
+					T::WeightInfo::on_initialize_open_signed()
+				}
+				Phase::Signed | Phase::Off
+					if remaining <= unsigned_deadline && remaining > 0u32.into() =>
+				{
+					let (need_snapshot, enabled, additional) = if current_phase == Phase::Signed {
+						// followed by a signed phase: close the signed phase, no need for snapshot.
+						// TWO_PHASE_NOTE: later on once we have signed phase, this should return
+						// something else.
+						(false, true, Weight::zero())
+					} else {
+						// no signed phase: create a new snapshot, definitely `enable` the unsigned
+						// phase.
+						(true, true, Weight::zero())
+					};
+
+					Self::on_initialize_open_unsigned(need_snapshot, enabled, now);
+					log!(info, "Starting unsigned phase({}) at #{:?}.", enabled, now);
+
+					let base_weight = if need_snapshot {
+						T::WeightInfo::on_initialize_open_unsigned_with_snapshot()
+					} else {
+						T::WeightInfo::on_initialize_open_unsigned_without_snapshot()
+					};
+					base_weight.saturating_add(additional)
+				}
+				_ => T::WeightInfo::on_initialize_nothing(),
+			}
+		}
+
+		fn offchain_worker(n: T::BlockNumber) {
+			// We only run the OCW in the first block of the unsigned phase.
+			if Self::current_phase().is_unsigned_open_at(n) {
+				match Self::try_acquire_offchain_lock(n) {
+					Ok(_) => {
+						let outcome = Self::mine_check_and_submit().map_err(ElectionError::from);
+						log!(info, "miner exeuction done: {:?}", outcome);
+					}
+					Err(why) => log!(warn, "denied offchain worker: {:?}", why),
+				}
+			}
+		}
+
+		fn integrity_test() {
+			use sp_std::mem::size_of;
+			// The index type of both voters and targets need to be smaller than that of usize (very
+			// unlikely to be the case, but anyhow).
+			assert!(size_of::<CompactVoterIndexOf<T>>() <= size_of::<usize>());
+			assert!(size_of::<CompactTargetIndexOf<T>>() <= size_of::<usize>());
+
+			// ----------------------------
+			// based on the requirements of [`sp_npos_elections::Assignment::try_normalize`].
+			let max_vote: usize = <CompactOf<T> as CompactSolution>::LIMIT;
+
+			// 1. Maximum sum of [ChainAccuracy; 16] must fit into `UpperOf<ChainAccuracy>`..
+			let maximum_chain_accuracy: Vec<UpperOf<OnChainAccuracyOf<T>>> = (0..max_vote)
+				.map(|_| {
+					<UpperOf<OnChainAccuracyOf<T>>>::from(
+						<OnChainAccuracyOf<T>>::one().deconstruct(),
+					)
+				})
+				.collect();
+			let _: UpperOf<OnChainAccuracyOf<T>> = maximum_chain_accuracy
+				.iter()
+				.fold(Zero::zero(), |acc, x| acc.checked_add(x).unwrap());
+
+			// 2. Maximum sum of [CompactAccuracy; 16] must fit into `UpperOf<OffchainAccuracy>`.
+			let maximum_chain_accuracy: Vec<UpperOf<CompactAccuracyOf<T>>> = (0..max_vote)
+				.map(|_| {
+					<UpperOf<CompactAccuracyOf<T>>>::from(
+						<CompactAccuracyOf<T>>::one().deconstruct(),
+					)
+				})
+				.collect();
+			let _: UpperOf<CompactAccuracyOf<T>> = maximum_chain_accuracy
+				.iter()
+				.fold(Zero::zero(), |acc, x| acc.checked_add(x).unwrap());
+		}
+	}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		/// Submit a solution for the unsigned phase.
+		///
+		/// The dispatch origin fo this call must be __none__.
+		///
+		/// This submission is checked on the fly. Moreover, this unsigned solution is only
+		/// validated when submitted to the pool from the **local** node. Effectively, this means
+		/// that only active validators can submit this transaction when authoring a block (similar
+		/// to an inherent).
+		///
+		/// To prevent any incorrect solution (and thus wasted time/weight), this transaction will
+		/// panic if the solution submitted by the validator is invalid in any way, effectively
+		/// putting their authoring reward at risk.
+		///
+		/// No deposit or reward is associated with this submission.
+		#[pallet::weight(T::WeightInfo::submit_unsigned(
+			witness.voters,
+			witness.targets,
+			solution.compact.voter_count() as u32,
+			solution.compact.unique_targets().len() as u32
+		))]
+		pub fn submit_unsigned(
+			origin: OriginFor<T>,
+			solution: RawSolution<CompactOf<T>>,
+			witness: SolutionOrSnapshotSize,
+		) -> DispatchResultWithPostInfo {
+			ensure_none(origin)?;
+			let error_message = "Invalid unsigned submission must produce invalid block and \
+			                     deprive validator from their authoring reward.";
+
+			// Check score being an improvement, phase, and desired targets.
+			Self::unsigned_pre_dispatch_checks(&solution).expect(error_message);
+
+			// ensure witness was correct.
+			let SolutionOrSnapshotSize { voters, targets } =
+				Self::snapshot_metadata().expect(error_message);
+
+			// NOTE: we are asserting, not `ensure`ing -- we want to panic here.
+			assert!(voters as u32 == witness.voters, error_message);
+			assert!(targets as u32 == witness.targets, error_message);
+
+			let ready =
+				Self::feasibility_check(solution, ElectionCompute::Unsigned).expect(error_message);
+
+			// store the newly received solution.
+			log!(info, "queued unsigned solution with score {:?}", ready.score);
+			<QueuedSolution<T>>::put(ready);
+			Self::deposit_event(Event::SolutionStored(ElectionCompute::Unsigned));
+
+			Ok(None.into())
+		}
+	}
+
+	#[pallet::event]
+	#[pallet::metadata(<T as frame_system::Config>::AccountId = "AccountId")]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	pub enum Event<T: Config> {
+		/// A solution was stored with the given compute.
+		///
+		/// If the solution is signed, this means that it hasn't yet been processed. If the
+		/// solution is unsigned, this means that it has also been processed.
+		SolutionStored(ElectionCompute),
+		/// The election has been finalized, with `Some` of the given computation, or else if the
+		/// election failed, `None`.
+		ElectionFinalized(Option<ElectionCompute>),
+		/// An account has been rewarded for their signed submission being finalized.
+		Rewarded(<T as frame_system::Config>::AccountId),
+		/// An account has been slashed for submitting an invalid signed submission.
+		Slashed(<T as frame_system::Config>::AccountId),
+		/// The signed phase of the given round has started.
+		SignedPhaseStarted(u32),
+		/// The unsigned phase of the given round has started.
+		UnsignedPhaseStarted(u32),
+	}
+
+	/// Error of the pallet that can be returned in response to dispatches.
+	#[pallet::error]
+	pub enum Error<T> {
+		/// Submission was too early.
+		PreDispatchEarlySubmission,
+		/// Wrong number of winners presented.
+		PreDispatchWrongWinnerCount,
+		/// Submission was too weak, score-wise.
+		PreDispatchWeakSubmission,
+	}
+
+	#[pallet::origin]
+	pub struct Origin<T>(PhantomData<T>);
+	#[pallet::validate_unsigned]
+	impl<T: Config> ValidateUnsigned for Pallet<T> {
+		type Call = Call<T>;
+		fn validate_unsigned(source: TransactionSource, call: &Self::Call) -> TransactionValidity {
+			if let Call::submit_unsigned(solution, _) = call {
+				// discard solution not coming from the local OCW.
+				match source {
+					TransactionSource::Local | TransactionSource::InBlock => { /* allowed */ }
+					_ => {
+						return InvalidTransaction::Call.into();
+					}
+				}
+
+				let _ = Self::unsigned_pre_dispatch_checks(solution)
+					.map_err(|err| {
+						log!(error, "unsigned transaction validation failed due to {:?}", err);
+						err
+					})
+					.map_err(dispatch_error_to_invalid)?;
+
+				ValidTransaction::with_tag_prefix("OffchainElection")
+					// The higher the score[0], the better a solution is.
+					.priority(
+						T::MinerTxPriority::get().saturating_add(
+							solution.score[0].saturated_into()
+						),
+					)
+					// used to deduplicate unsigned solutions: each validator should produce one
+					// solution per round at most, and solutions are not propagate.
+					.and_provides(solution.round)
+					// transaction should stay in the pool for the duration of the unsigned phase.
+					.longevity(T::UnsignedPhase::get().saturated_into::<u64>())
+					// We don't propagate this. This can never be validated at a remote node.
+					.propagate(false)
+					.build()
+			} else {
+				InvalidTransaction::Call.into()
+			}
+		}
+
+		fn pre_dispatch(call: &Self::Call) -> Result<(), TransactionValidityError> {
+			if let Call::submit_unsigned(solution, _) = call {
+				Self::unsigned_pre_dispatch_checks(solution)
+					.map_err(dispatch_error_to_invalid)
+					.map_err(Into::into)
+			} else {
+				Err(InvalidTransaction::Call.into())
+			}
+		}
+	}
+
+	#[pallet::type_value]
+	pub fn DefaultForRound() -> u32 {
+		1
+	}
+
+	/// Internal counter for the number of rounds.
+	///
+	/// This is useful for de-duplication of transactions submitted to the pool, and general
+	/// diagnostics of the pallet.
+	///
+	/// This is merely incremented once per every time that an upstream `elect` is called.
+	#[pallet::storage]
+	#[pallet::getter(fn round)]
+	pub type Round<T: Config> = StorageValue<_, u32, ValueQuery, DefaultForRound>;
+
+	/// Current phase.
+	#[pallet::storage]
+	#[pallet::getter(fn current_phase)]
+	pub type CurrentPhase<T: Config> = StorageValue<_, Phase<T::BlockNumber>, ValueQuery>;
+
+	/// Current best solution, signed or unsigned, queued to be returned upon `elect`.
+	#[pallet::storage]
+	#[pallet::getter(fn queued_solution)]
+	pub type QueuedSolution<T: Config> = StorageValue<_, ReadySolution<T::AccountId>>;
+
+	/// Snapshot data of the round.
+	///
+	/// This is created at the beginning of the signed phase and cleared upon calling `elect`.
+	#[pallet::storage]
+	#[pallet::getter(fn snapshot)]
+	pub type Snapshot<T: Config> = StorageValue<_, RoundSnapshot<T::AccountId>>;
+
+	/// Desired number of targets to elect for this round.
+	///
+	/// Only exists when [`Snapshot`] is present.
+	#[pallet::storage]
+	#[pallet::getter(fn desired_targets)]
+	pub type DesiredTargets<T> = StorageValue<_, u32>;
+
+	/// The metadata of the [`RoundSnapshot`]
+	///
+	/// Only exists when [`Snapshot`] is present.
+	#[pallet::storage]
+	#[pallet::getter(fn snapshot_metadata)]
+	pub type SnapshotMetadata<T: Config> = StorageValue<_, SolutionOrSnapshotSize>;
+
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(PhantomData<T>);
+}
+
+impl<T: Config> Pallet<T> {
+	/// Logic for `<Pallet as Hooks>::on_initialize` when signed phase is being opened.
+	///
+	/// This is decoupled for easy weight calculation.
+	pub(crate) fn on_initialize_open_signed() {
+		<CurrentPhase<T>>::put(Phase::Signed);
+		Self::create_snapshot();
+		Self::deposit_event(Event::SignedPhaseStarted(Self::round()));
+	}
+
+	/// Logic for `<Pallet as Hooks<T>>::on_initialize` when unsigned phase is being opened.
+	///
+	/// This is decoupled for easy weight calculation. Note that the default weight benchmark of
+	/// this function will assume an empty signed queue for `finalize_signed_phase`.
+	pub(crate) fn on_initialize_open_unsigned(
+		need_snapshot: bool,
+		enabled: bool,
+		now: T::BlockNumber,
+	) {
+		if need_snapshot {
+			// if not being followed by a signed phase, then create the snapshots.
+			debug_assert!(Self::snapshot().is_none());
+			Self::create_snapshot();
+		}
+
+		<CurrentPhase<T>>::put(Phase::Unsigned((enabled, now)));
+		Self::deposit_event(Event::UnsignedPhaseStarted(Self::round()));
+	}
+
+	/// Creates the snapshot. Writes new data to:
+	///
+	/// 1. [`SnapshotMetadata`]
+	/// 2. [`RoundSnapshot`]
+	/// 3. [`DesiredTargets`]
+	pub(crate) fn create_snapshot() {
+		// if any of them don't exist, create all of them. This is a bit conservative.
+		let targets = T::DataProvider::targets();
+		let voters = T::DataProvider::voters();
+		let desired_targets = T::DataProvider::desired_targets();
+
+		<SnapshotMetadata<T>>::put(SolutionOrSnapshotSize {
+			voters: voters.len() as u32,
+			targets: targets.len() as u32,
+		});
+		<DesiredTargets<T>>::put(desired_targets);
+		<Snapshot<T>>::put(RoundSnapshot { voters, targets });
+	}
+
+	/// Kill everything created by [`Pallet::create_snapshot`].
+	pub(crate) fn kill_snapshot() {
+		<Snapshot<T>>::kill();
+		<SnapshotMetadata<T>>::kill();
+		<DesiredTargets<T>>::kill();
+	}
+
+	/// Checks the feasibility of a solution.
+	fn feasibility_check(
+		solution: RawSolution<CompactOf<T>>,
+		compute: ElectionCompute,
+	) -> Result<ReadySolution<T::AccountId>, FeasibilityError> {
+		let RawSolution { compact, score, round } = solution;
+
+		// first, check round.
+		ensure!(Self::round() == round, FeasibilityError::InvalidRound);
+
+		// winners are not directly encoded in the solution.
+		let winners = compact.unique_targets();
+
+		let desired_targets =
+			Self::desired_targets().ok_or(FeasibilityError::SnapshotUnavailable)?;
+
+		// NOTE: this is a bit of duplicate, but we keep it around for veracity. The unsigned path
+		// already checked this in `unsigned_per_dispatch_checks`. The signed path *could* check it
+		// upon arrival, thus we would then remove it here. Given overlay it is cheap anyhow
+		ensure!(winners.len() as u32 == desired_targets, FeasibilityError::WrongWinnerCount);
+
+		// read the entire snapshot.
+		let RoundSnapshot { voters: snapshot_voters, targets: snapshot_targets } =
+			Self::snapshot().ok_or(FeasibilityError::SnapshotUnavailable)?;
+
+		// ----- Start building. First, we need some closures.
+		let cache = helpers::generate_voter_cache::<T>(&snapshot_voters);
+		let voter_at = helpers::voter_at_fn::<T>(&snapshot_voters);
+		let target_at = helpers::target_at_fn::<T>(&snapshot_targets);
+		let voter_index = helpers::voter_index_fn_usize::<T>(&cache);
+
+		// first, make sure that all the winners are sane.
+		// OPTIMIZATION: we could first build the assignments, and then extract the winners directly
+		// from that, as that would eliminate a little bit of duplicate work. For now, we keep them
+		// separate: First extract winners separately from compact, and then assignments. This is
+		// also better, because we can reject solutions that don't meet `desired_targets` early on.
+		let winners = winners
+			.into_iter()
+			.map(|i| target_at(i).ok_or(FeasibilityError::InvalidWinner))
+			.collect::<Result<Vec<T::AccountId>, FeasibilityError>>()?;
+
+		// Then convert compact -> assignment. This will fail if any of the indices are gibberish.
+		let assignments = compact
+			.into_assignment(voter_at, target_at)
+			.map_err::<FeasibilityError, _>(Into::into)?;
+
+		// Ensure that assignments is correct.
+		let _ = assignments
+			.iter()
+			.map(|ref assignment| {
+				// check that assignment.who is actually a voter (defensive-only).
+				// NOTE: while using the index map from `voter_index` is better than a blind linear
+				// search, this *still* has room for optimization. Note that we had the index when
+				// we did `compact -> assignment` and we lost it. Ideal is to keep the index around.
+
+				// defensive-only: must exist in the snapshot.
+				let snapshot_index =
+					voter_index(&assignment.who).ok_or(FeasibilityError::InvalidVoter)?;
+				// defensive-only: index comes from the snapshot, must exist.
+				let (_voter, _stake, targets) =
+					snapshot_voters.get(snapshot_index).ok_or(FeasibilityError::InvalidVoter)?;
+
+				// check that all of the targets are valid based on the snapshot.
+				if assignment.distribution.iter().any(|(d, _)| !targets.contains(d)) {
+					return Err(FeasibilityError::InvalidVote);
+				}
+				Ok(())
+			})
+			.collect::<Result<(), FeasibilityError>>()?;
+
+		// ----- Start building support. First, we need one more closure.
+		let stake_of = helpers::stake_of_fn::<T>(&snapshot_voters, &cache);
+
+		// This might fail if the normalization fails. Very unlikely. See `integrity_test`.
+		let staked_assignments = assignment_ratio_to_staked_normalized(assignments, stake_of)
+			.map_err::<FeasibilityError, _>(Into::into)?;
+
+		// This might fail if one of the voter edges is pointing to a non-winner, which is not
+		// really possible anymore because all the winners come from the same `compact`.
+		let supports = sp_npos_elections::to_supports(&winners, &staked_assignments)
+			.map_err::<FeasibilityError, _>(Into::into)?;
+
+		// Finally, check that the claimed score was indeed correct.
+		let known_score = (&supports).evaluate();
+		ensure!(known_score == score, FeasibilityError::InvalidScore);
+
+		Ok(ReadySolution { supports, compute, score })
+	}
+
+	/// Perform the tasks to be done after a new `elect` has been triggered:
+	///
+	/// 1. Increment round.
+	/// 2. Change phase to [`Phase::Off`]
+	/// 3. Clear all snapshot data.
+	fn post_elect() {
+		// inc round
+		<Round<T>>::mutate(|r| *r = *r + 1);
+
+		// change phase
+		<CurrentPhase<T>>::put(Phase::Off);
+
+		// kill snapshots
+		Self::kill_snapshot();
+	}
+
+	/// On-chain fallback of election.
+	fn onchain_fallback() -> Result<Supports<T::AccountId>, ElectionError> {
+		<onchain::OnChainSequentialPhragmen<OnChainConfig<T>> as ElectionProvider<
+			T::AccountId,
+			T::BlockNumber,
+		>>::elect()
+		.map_err(Into::into)
+	}
+
+	fn do_elect() -> Result<Supports<T::AccountId>, ElectionError> {
+		<QueuedSolution<T>>::take()
+			.map_or_else(
+				|| match T::Fallback::get() {
+					FallbackStrategy::OnChain => Self::onchain_fallback()
+						.map(|r| (r, ElectionCompute::OnChain))
+						.map_err(Into::into),
+					FallbackStrategy::Nothing => Err(ElectionError::NoFallbackConfigured),
+				},
+				|ReadySolution { supports, compute, .. }| Ok((supports, compute)),
+			)
+			.map(|(supports, compute)| {
+				Self::deposit_event(Event::ElectionFinalized(Some(compute)));
+				log!(info, "Finalized election round with compute {:?}.", compute);
+				supports
+			})
+			.map_err(|err| {
+				Self::deposit_event(Event::ElectionFinalized(None));
+				log!(warn, "Failed to finalize election round. reason {:?}", err);
+				err
+			})
+	}
+}
+
+impl<T: Config> ElectionProvider<T::AccountId, T::BlockNumber> for Pallet<T> {
+	type Error = ElectionError;
+	type DataProvider = T::DataProvider;
+
+	fn elect() -> Result<Supports<T::AccountId>, Self::Error> {
+		let outcome = Self::do_elect();
+		Self::post_elect();
+		outcome
+	}
+}
+
+/// convert a DispatchError to a custom InvalidTransaction with the inner code being the error
+/// number.
+pub fn dispatch_error_to_invalid(error: DispatchError) -> InvalidTransaction {
+	let error_number = match error {
+		DispatchError::Module { error, .. } => error,
+		_ => 0,
+	};
+	InvalidTransaction::Custom(error_number)
+}
+
+#[cfg(test)]
+mod feasibility_check {
+	//! All of the tests here should be dedicated to only testing the feasibility check and nothing
+	//! more. The best way to audit and review these tests is to try and come up with a solution
+	//! that is invalid, but gets through the system as valid.
+
+	use super::{mock::*, *};
+
+	const COMPUTE: ElectionCompute = ElectionCompute::OnChain;
+
+	#[test]
+	fn snapshot_is_there() {
+		ExtBuilder::default().build_and_execute(|| {
+			roll_to(<EpochLength>::get() - <SignedPhase>::get() - <UnsignedPhase>::get());
+			assert!(MultiPhase::current_phase().is_signed());
+			let solution = raw_solution();
+
+			// for whatever reason it might be:
+			<Snapshot<Runtime>>::kill();
+
+			assert_noop!(
+				MultiPhase::feasibility_check(solution, COMPUTE),
+				FeasibilityError::SnapshotUnavailable
+			);
+		})
+	}
+
+	#[test]
+	fn round() {
+		ExtBuilder::default().build_and_execute(|| {
+			roll_to(<EpochLength>::get() - <SignedPhase>::get() - <UnsignedPhase>::get());
+			assert!(MultiPhase::current_phase().is_signed());
+
+			let mut solution = raw_solution();
+			solution.round += 1;
+			assert_noop!(
+				MultiPhase::feasibility_check(solution, COMPUTE),
+				FeasibilityError::InvalidRound
+			);
+		})
+	}
+
+	#[test]
+	fn desired_targets() {
+		ExtBuilder::default().desired_targets(8).build_and_execute(|| {
+			roll_to(<EpochLength>::get() - <SignedPhase>::get() - <UnsignedPhase>::get());
+			assert!(MultiPhase::current_phase().is_signed());
+
+			let solution = raw_solution();
+
+			assert_eq!(solution.compact.unique_targets().len(), 4);
+			assert_eq!(MultiPhase::desired_targets().unwrap(), 8);
+
+			assert_noop!(
+				MultiPhase::feasibility_check(solution, COMPUTE),
+				FeasibilityError::WrongWinnerCount,
+			);
+		})
+	}
+
+	#[test]
+	fn winner_indices() {
+		ExtBuilder::default().desired_targets(2).build_and_execute(|| {
+			roll_to(<EpochLength>::get() - <SignedPhase>::get() - <UnsignedPhase>::get());
+			assert!(MultiPhase::current_phase().is_signed());
+
+			let mut solution = raw_solution();
+			assert_eq!(MultiPhase::snapshot().unwrap().targets.len(), 4);
+			// ----------------------------------------------------^^ valid range is [0..3].
+
+			// swap all votes from 3 to 4. This will ensure that the number of unique winners
+			// will still be 4, but one of the indices will be gibberish. Requirement is to make
+			// sure 3 a winner, which we don't do here.
+			solution
+				.compact
+				.votes1
+				.iter_mut()
+				.filter(|(_, t)| *t == 3u16)
+				.for_each(|(_, t)| *t += 1);
+			solution.compact.votes2.iter_mut().for_each(|(_, (t0, _), t1)| {
+				if *t0 == 3u16 {
+					*t0 += 1
+				};
+				if *t1 == 3u16 {
+					*t1 += 1
+				};
+			});
+			assert_noop!(
+				MultiPhase::feasibility_check(solution, COMPUTE),
+				FeasibilityError::InvalidWinner
+			);
+		})
+	}
+
+	#[test]
+	fn voter_indices() {
+		// should be caught in `compact.into_assignment`.
+		ExtBuilder::default().desired_targets(2).build_and_execute(|| {
+			roll_to(<EpochLength>::get() - <SignedPhase>::get() - <UnsignedPhase>::get());
+			assert!(MultiPhase::current_phase().is_signed());
+
+			let mut solution = raw_solution();
+			assert_eq!(MultiPhase::snapshot().unwrap().voters.len(), 8);
+			// ----------------------------------------------------^^ valid range is [0..7].
+
+			// check that there is a index 7 in votes1, and flip to 8.
+			assert!(
+				solution
+					.compact
+					.votes1
+					.iter_mut()
+					.filter(|(v, _)| *v == 7u32)
+					.map(|(v, _)| *v = 8)
+					.count() > 0
+			);
+			assert_noop!(
+				MultiPhase::feasibility_check(solution, COMPUTE),
+				FeasibilityError::NposElection(sp_npos_elections::Error::CompactInvalidIndex),
+			);
+		})
+	}
+
+	#[test]
+	fn voter_votes() {
+		ExtBuilder::default().desired_targets(2).build_and_execute(|| {
+			roll_to(<EpochLength>::get() - <SignedPhase>::get() - <UnsignedPhase>::get());
+			assert!(MultiPhase::current_phase().is_signed());
+
+			let mut solution = raw_solution();
+			assert_eq!(MultiPhase::snapshot().unwrap().voters.len(), 8);
+			// ----------------------------------------------------^^ valid range is [0..7].
+
+			// first, check that voter at index 7 (40) actually voted for 3 (40) -- this is self
+			// vote. Then, change the vote to 2 (30).
+			assert_eq!(
+				solution
+					.compact
+					.votes1
+					.iter_mut()
+					.filter(|(v, t)| *v == 7 && *t == 3)
+					.map(|(_, t)| *t = 2)
+					.count(),
+				1,
+			);
+			assert_noop!(
+				MultiPhase::feasibility_check(solution, COMPUTE),
+				FeasibilityError::InvalidVote,
+			);
+		})
+	}
+
+	#[test]
+	fn score() {
+		ExtBuilder::default().desired_targets(2).build_and_execute(|| {
+			roll_to(<EpochLength>::get() - <SignedPhase>::get() - <UnsignedPhase>::get());
+			assert!(MultiPhase::current_phase().is_signed());
+
+			let mut solution = raw_solution();
+			assert_eq!(MultiPhase::snapshot().unwrap().voters.len(), 8);
+
+			// simply faff with the score.
+			solution.score[0] += 1;
+
+			assert_noop!(
+				MultiPhase::feasibility_check(solution, COMPUTE),
+				FeasibilityError::InvalidScore,
+			);
+		})
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::{mock::*, Event, *};
+	use sp_election_providers::ElectionProvider;
+	use sp_npos_elections::Support;
+
+	#[test]
+	fn phase_rotation_works() {
+		ExtBuilder::default().build_and_execute(|| {
+			// 0 ------- 15 ------- 25 ------- 30 ------- ------- 45 ------- 55 ------- 60
+			//           |           |                            |           |
+			//         Signed      Unsigned                     Signed     Unsigned
+
+			assert_eq!(System::block_number(), 0);
+			assert_eq!(MultiPhase::current_phase(), Phase::Off);
+			assert_eq!(MultiPhase::round(), 1);
+
+			roll_to(4);
+			assert_eq!(MultiPhase::current_phase(), Phase::Off);
+			assert!(MultiPhase::snapshot().is_none());
+			assert_eq!(MultiPhase::round(), 1);
+
+			roll_to(15);
+			assert_eq!(MultiPhase::current_phase(), Phase::Signed);
+			assert_eq!(multi_phase_events(), vec![Event::SignedPhaseStarted(1)]);
+			assert!(MultiPhase::snapshot().is_some());
+			assert_eq!(MultiPhase::round(), 1);
+
+			roll_to(24);
+			assert_eq!(MultiPhase::current_phase(), Phase::Signed);
+			assert!(MultiPhase::snapshot().is_some());
+			assert_eq!(MultiPhase::round(), 1);
+
+			roll_to(25);
+			assert_eq!(MultiPhase::current_phase(), Phase::Unsigned((true, 25)));
+			assert_eq!(
+				multi_phase_events(),
+				vec![Event::SignedPhaseStarted(1), Event::UnsignedPhaseStarted(1)],
+			);
+			assert!(MultiPhase::snapshot().is_some());
+
+			roll_to(29);
+			assert_eq!(MultiPhase::current_phase(), Phase::Unsigned((true, 25)));
+			assert!(MultiPhase::snapshot().is_some());
+
+			roll_to(30);
+			assert_eq!(MultiPhase::current_phase(), Phase::Unsigned((true, 25)));
+			assert!(MultiPhase::snapshot().is_some());
+
+			// we close when upstream tells us to elect.
+			roll_to(32);
+			assert_eq!(MultiPhase::current_phase(), Phase::Unsigned((true, 25)));
+			assert!(MultiPhase::snapshot().is_some());
+
+			MultiPhase::elect().unwrap();
+
+			assert!(MultiPhase::current_phase().is_off());
+			assert!(MultiPhase::snapshot().is_none());
+			assert_eq!(MultiPhase::round(), 2);
+
+			roll_to(44);
+			assert!(MultiPhase::current_phase().is_off());
+
+			roll_to(45);
+			assert!(MultiPhase::current_phase().is_signed());
+
+			roll_to(55);
+			assert!(MultiPhase::current_phase().is_unsigned_open_at(55));
+		})
+	}
+
+	#[test]
+	fn signed_phase_void() {
+		ExtBuilder::default().phases(0, 10).build_and_execute(|| {
+			roll_to(15);
+			assert!(MultiPhase::current_phase().is_off());
+
+			roll_to(19);
+			assert!(MultiPhase::current_phase().is_off());
+
+			roll_to(20);
+			assert!(MultiPhase::current_phase().is_unsigned_open_at(20));
+			assert!(MultiPhase::snapshot().is_some());
+
+			roll_to(30);
+			assert!(MultiPhase::current_phase().is_unsigned_open_at(20));
+
+			MultiPhase::elect().unwrap();
+
+			assert!(MultiPhase::current_phase().is_off());
+			assert!(MultiPhase::snapshot().is_none());
+		});
+	}
+
+	#[test]
+	fn unsigned_phase_void() {
+		ExtBuilder::default().phases(10, 0).build_and_execute(|| {
+			roll_to(15);
+			assert!(MultiPhase::current_phase().is_off());
+
+			roll_to(19);
+			assert!(MultiPhase::current_phase().is_off());
+
+			roll_to(20);
+			assert!(MultiPhase::current_phase().is_signed());
+			assert!(MultiPhase::snapshot().is_some());
+
+			roll_to(30);
+			assert!(MultiPhase::current_phase().is_signed());
+
+			let _ = MultiPhase::elect().unwrap();
+
+			assert!(MultiPhase::current_phase().is_off());
+			assert!(MultiPhase::snapshot().is_none());
+		});
+	}
+
+	#[test]
+	fn both_phases_void() {
+		ExtBuilder::default().phases(0, 0).build_and_execute(|| {
+			roll_to(15);
+			assert!(MultiPhase::current_phase().is_off());
+
+			roll_to(19);
+			assert!(MultiPhase::current_phase().is_off());
+
+			roll_to(20);
+			assert!(MultiPhase::current_phase().is_off());
+
+			roll_to(30);
+			assert!(MultiPhase::current_phase().is_off());
+
+			// this module is now only capable of doing on-chain backup.
+			let _ = MultiPhase::elect().unwrap();
+
+			assert!(MultiPhase::current_phase().is_off());
+		});
+	}
+
+	#[test]
+	fn early_termination() {
+		// an early termination in the signed phase, with no queued solution.
+		ExtBuilder::default().build_and_execute(|| {
+			// signed phase started at block 15 and will end at 25.
+			roll_to(14);
+			assert_eq!(MultiPhase::current_phase(), Phase::Off);
+
+			roll_to(15);
+			assert_eq!(multi_phase_events(), vec![Event::SignedPhaseStarted(1)]);
+			assert_eq!(MultiPhase::current_phase(), Phase::Signed);
+			assert_eq!(MultiPhase::round(), 1);
+
+			// an unexpected call to elect.
+			roll_to(20);
+			MultiPhase::elect().unwrap();
+
+			// we surely can't have any feasible solutions. This will cause an on-chain election.
+			assert_eq!(
+				multi_phase_events(),
+				vec![
+					Event::SignedPhaseStarted(1),
+					Event::ElectionFinalized(Some(ElectionCompute::OnChain))
+				],
+			);
+			// all storage items must be cleared.
+			assert_eq!(MultiPhase::round(), 2);
+			assert!(MultiPhase::snapshot().is_none());
+			assert!(MultiPhase::snapshot_metadata().is_none());
+			assert!(MultiPhase::desired_targets().is_none());
+			assert!(MultiPhase::queued_solution().is_none());
+		})
+	}
+
+	#[test]
+	fn fallback_strategy_works() {
+		ExtBuilder::default().fallabck(FallbackStrategy::OnChain).build_and_execute(|| {
+			roll_to(15);
+			assert_eq!(MultiPhase::current_phase(), Phase::Signed);
+
+			roll_to(25);
+			assert_eq!(MultiPhase::current_phase(), Phase::Unsigned((true, 25)));
+
+			// zilch solutions thus far.
+			let supports = MultiPhase::elect().unwrap();
+
+			assert_eq!(
+				supports,
+				vec![
+					(30, Support { total: 40, voters: vec![(2, 5), (4, 5), (30, 30)] }),
+					(40, Support { total: 60, voters: vec![(2, 5), (3, 10), (4, 5), (40, 40)] })
+				]
+			)
+		});
+
+		ExtBuilder::default().fallabck(FallbackStrategy::Nothing).build_and_execute(|| {
+			roll_to(15);
+			assert_eq!(MultiPhase::current_phase(), Phase::Signed);
+
+			roll_to(25);
+			assert_eq!(MultiPhase::current_phase(), Phase::Unsigned((true, 25)));
+
+			// zilch solutions thus far.
+			assert_eq!(MultiPhase::elect().unwrap_err(), ElectionError::NoFallbackConfigured);
+		})
+	}
+
+	#[test]
+	fn number_of_voters_allowed_2sec_block() {
+		// Just a rough estimate with the substrate weights.
+		assert!(!MockWeightInfo::get());
+
+		let all_voters: u32 = 10_000;
+		let all_targets: u32 = 5_000;
+		let desired: u32 = 1_000;
+		let weight_with = |active| {
+			<Runtime as Config>::WeightInfo::submit_unsigned(
+				all_voters,
+				all_targets,
+				active,
+				desired,
+			)
+		};
+
+		let mut active = 1;
+		while weight_with(active)
+			<= <Runtime as frame_system::Config>::BlockWeights::get().max_block
+			|| active == all_voters
+		{
+			active += 1;
+		}
+
+		println!("can support {} voters to yield a weight of {}", active, weight_with(active));
+	}
+}
diff --git a/frame/election-provider-multi-phase/src/mock.rs b/frame/election-provider-multi-phase/src/mock.rs
new file mode 100644
index 000000000000..eb38a4cd52e9
--- /dev/null
+++ b/frame/election-provider-multi-phase/src/mock.rs
@@ -0,0 +1,381 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use super::*;
+use crate as multi_phase;
+pub use frame_support::{assert_noop, assert_ok};
+use frame_support::{
+	parameter_types,
+	traits::{Hooks},
+	weights::Weight,
+};
+use parking_lot::RwLock;
+use sp_core::{
+	offchain::{
+		testing::{PoolState, TestOffchainExt, TestTransactionPoolExt},
+		OffchainExt, TransactionPoolExt,
+	},
+	H256,
+};
+use sp_election_providers::ElectionDataProvider;
+use sp_npos_elections::{
+	assignment_ratio_to_staked_normalized, seq_phragmen, to_supports, to_without_backing,
+	CompactSolution, ElectionResult, EvaluateSupport,
+};
+use sp_runtime::{
+	testing::Header,
+	traits::{BlakeTwo256, IdentityLookup},
+	PerU16,
+};
+use std::sync::Arc;
+
+pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;
+pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<AccountId, Call, (), ()>;
+
+frame_support::construct_runtime!(
+	pub enum Runtime where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic
+	{
+		System: frame_system::{Module, Call, Event<T>, Config},
+		Balances: pallet_balances::{Module, Call, Event<T>, Config<T>},
+		MultiPhase: multi_phase::{Module, Call, Event<T>},
+	}
+);
+
+pub(crate) type Balance = u64;
+pub(crate) type AccountId = u64;
+
+sp_npos_elections::generate_solution_type!(
+	#[compact]
+	pub struct TestCompact::<u32, u16, PerU16>(16)
+);
+
+/// All events of this pallet.
+pub(crate) fn multi_phase_events() -> Vec<super::Event<Runtime>> {
+	System::events()
+		.into_iter()
+		.map(|r| r.event)
+		.filter_map(|e| if let Event::multi_phase(inner) = e { Some(inner) } else { None })
+		.collect::<Vec<_>>()
+}
+
+/// To from `now` to block `n`.
+pub fn roll_to(n: u64) {
+	let now = System::block_number();
+	for i in now + 1..=n {
+		System::set_block_number(i);
+		MultiPhase::on_initialize(i);
+	}
+}
+
+pub fn roll_to_with_ocw(n: u64) {
+	let now = System::block_number();
+	for i in now + 1..=n {
+		System::set_block_number(i);
+		MultiPhase::on_initialize(i);
+		MultiPhase::offchain_worker(i);
+	}
+}
+
+/// Spit out a verifiable raw solution.
+///
+/// This is a good example of what an offchain miner would do.
+pub fn raw_solution() -> RawSolution<CompactOf<Runtime>> {
+	let RoundSnapshot { voters, targets } = MultiPhase::snapshot().unwrap();
+	let desired_targets = MultiPhase::desired_targets().unwrap();
+
+	// closures
+	let cache = helpers::generate_voter_cache::<Runtime>(&voters);
+	let voter_index = helpers::voter_index_fn_linear::<Runtime>(&voters);
+	let target_index = helpers::target_index_fn_linear::<Runtime>(&targets);
+	let stake_of = helpers::stake_of_fn::<Runtime>(&voters, &cache);
+
+	let ElectionResult { winners, assignments } = seq_phragmen::<_, CompactAccuracyOf<Runtime>>(
+		desired_targets as usize,
+		targets.clone(),
+		voters.clone(),
+		None,
+	)
+	.unwrap();
+
+	let winners = to_without_backing(winners);
+
+	let score = {
+		let staked = assignment_ratio_to_staked_normalized(assignments.clone(), &stake_of).unwrap();
+		to_supports(&winners, &staked).unwrap().evaluate()
+	};
+	let compact =
+		<CompactOf<Runtime>>::from_assignment(assignments, &voter_index, &target_index).unwrap();
+
+	let round = MultiPhase::round();
+	RawSolution { compact, score, round }
+}
+
+pub fn witness() -> SolutionOrSnapshotSize {
+	MultiPhase::snapshot()
+		.map(|snap| SolutionOrSnapshotSize {
+			voters: snap.voters.len() as u32,
+			targets: snap.targets.len() as u32,
+		})
+		.unwrap_or_default()
+}
+
+impl frame_system::Config for Runtime {
+	type SS58Prefix = ();
+	type BaseCallFilter = ();
+	type Origin = Origin;
+	type Index = u64;
+	type BlockNumber = u64;
+	type Call = Call;
+	type Hash = H256;
+	type Hashing = BlakeTwo256;
+	type AccountId = AccountId;
+	type Lookup = IdentityLookup<Self::AccountId>;
+	type Header = Header;
+	type Event = Event;
+	type BlockHashCount = ();
+	type DbWeight = ();
+	type BlockLength = ();
+	type BlockWeights = BlockWeights;
+	type Version = ();
+	type PalletInfo = PalletInfo;
+	type AccountData = pallet_balances::AccountData<u64>;
+	type OnNewAccount = ();
+	type OnKilledAccount = ();
+	type SystemWeightInfo = ();
+}
+
+const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);
+parameter_types! {
+	pub const ExistentialDeposit: u64 = 1;
+	pub BlockWeights: frame_system::limits::BlockWeights = frame_system::limits::BlockWeights
+		::with_sensible_defaults(2 * frame_support::weights::constants::WEIGHT_PER_SECOND, NORMAL_DISPATCH_RATIO);
+}
+
+impl pallet_balances::Config for Runtime {
+	type Balance = Balance;
+	type Event = Event;
+	type DustRemoval = ();
+	type ExistentialDeposit = ExistentialDeposit;
+	type AccountStore = System;
+	type MaxLocks = ();
+	type WeightInfo = ();
+}
+
+parameter_types! {
+	pub static Targets: Vec<AccountId> = vec![10, 20, 30, 40];
+	pub static Voters: Vec<(AccountId, VoteWeight, Vec<AccountId>)> = vec![
+		(1, 10, vec![10, 20]),
+		(2, 10, vec![30, 40]),
+		(3, 10, vec![40]),
+		(4, 10, vec![10, 20, 30, 40]),
+		// self votes.
+		(10, 10, vec![10]),
+		(20, 20, vec![20]),
+		(30, 30, vec![30]),
+		(40, 40, vec![40]),
+	];
+
+	pub static Fallback: FallbackStrategy = FallbackStrategy::OnChain;
+	pub static DesiredTargets: u32 = 2;
+	pub static SignedPhase: u64 = 10;
+	pub static UnsignedPhase: u64 = 5;
+	pub static MaxSignedSubmissions: u32 = 5;
+
+	pub static MinerMaxIterations: u32 = 5;
+	pub static MinerTxPriority: u64 = 100;
+	pub static SolutionImprovementThreshold: Perbill = Perbill::zero();
+	pub static MinerMaxWeight: Weight = BlockWeights::get().max_block;
+	pub static MockWeightInfo: bool = false;
+
+
+	pub static EpochLength: u64 = 30;
+}
+
+// Hopefully this won't be too much of a hassle to maintain.
+pub struct DualMockWeightInfo;
+impl multi_phase::weights::WeightInfo for DualMockWeightInfo {
+	fn on_initialize_nothing() -> Weight {
+		if MockWeightInfo::get() {
+			Zero::zero()
+		} else {
+			<() as multi_phase::weights::WeightInfo>::on_initialize_nothing()
+		}
+	}
+	fn on_initialize_open_signed() -> Weight {
+		if MockWeightInfo::get() {
+			Zero::zero()
+		} else {
+			<() as multi_phase::weights::WeightInfo>::on_initialize_open_signed()
+		}
+	}
+	fn on_initialize_open_unsigned_with_snapshot() -> Weight {
+		if MockWeightInfo::get() {
+			Zero::zero()
+		} else {
+			<() as multi_phase::weights::WeightInfo>::on_initialize_open_unsigned_with_snapshot()
+		}
+	}
+	fn on_initialize_open_unsigned_without_snapshot() -> Weight {
+		if MockWeightInfo::get() {
+			Zero::zero()
+		} else {
+			<() as multi_phase::weights::WeightInfo>::on_initialize_open_unsigned_without_snapshot()
+		}
+	}
+	fn submit_unsigned(v: u32, t: u32, a: u32, d: u32) -> Weight {
+		if MockWeightInfo::get() {
+			// 10 base
+			// 5 per edge.
+			(10 as Weight).saturating_add((5 as Weight).saturating_mul(a as Weight))
+		} else {
+			<() as multi_phase::weights::WeightInfo>::submit_unsigned(v, t, a, d)
+		}
+	}
+	fn feasibility_check(v: u32, t: u32, a: u32, d: u32) -> Weight {
+		if MockWeightInfo::get() {
+			// 10 base
+			// 5 per edge.
+			(10 as Weight).saturating_add((5 as Weight).saturating_mul(a as Weight))
+		} else {
+			<() as multi_phase::weights::WeightInfo>::feasibility_check(v, t, a, d)
+		}
+	}
+}
+
+impl crate::Config for Runtime {
+	type Event = Event;
+	type Currency = Balances;
+	type SignedPhase = SignedPhase;
+	type UnsignedPhase = UnsignedPhase;
+	type SolutionImprovementThreshold = SolutionImprovementThreshold;
+	type MinerMaxIterations = MinerMaxIterations;
+	type MinerMaxWeight = MinerMaxWeight;
+	type MinerTxPriority = MinerTxPriority;
+	type DataProvider = StakingMock;
+	type WeightInfo = DualMockWeightInfo;
+	type BenchmarkingConfig = ();
+	type OnChainAccuracy = Perbill;
+	type Fallback = Fallback;
+	type CompactSolution = TestCompact;
+}
+
+impl<LocalCall> frame_system::offchain::SendTransactionTypes<LocalCall> for Runtime
+where
+	Call: From<LocalCall>,
+{
+	type OverarchingCall = Call;
+	type Extrinsic = Extrinsic;
+}
+
+pub type Extrinsic = sp_runtime::testing::TestXt<Call, ()>;
+
+#[derive(Default)]
+pub struct ExtBuilder {}
+
+pub struct StakingMock;
+impl ElectionDataProvider<AccountId, u64> for StakingMock {
+	fn targets() -> Vec<AccountId> {
+		Targets::get()
+	}
+	fn voters() -> Vec<(AccountId, VoteWeight, Vec<AccountId>)> {
+		Voters::get()
+	}
+	fn desired_targets() -> u32 {
+		DesiredTargets::get()
+	}
+	fn next_election_prediction(now: u64) -> u64 {
+		now + EpochLength::get() - now % EpochLength::get()
+	}
+}
+
+impl ExtBuilder {
+	pub fn miner_tx_priority(self, p: u64) -> Self {
+		<MinerTxPriority>::set(p);
+		self
+	}
+	pub fn solution_improvement_threshold(self, p: Perbill) -> Self {
+		<SolutionImprovementThreshold>::set(p);
+		self
+	}
+	pub fn phases(self, signed: u64, unsigned: u64) -> Self {
+		<SignedPhase>::set(signed);
+		<UnsignedPhase>::set(unsigned);
+		self
+	}
+	pub fn fallabck(self, fallback: FallbackStrategy) -> Self {
+		<Fallback>::set(fallback);
+		self
+	}
+	pub fn miner_weight(self, weight: Weight) -> Self {
+		<MinerMaxWeight>::set(weight);
+		self
+	}
+	pub fn mock_weight_info(self, mock: bool) -> Self {
+		<MockWeightInfo>::set(mock);
+		self
+	}
+	pub fn desired_targets(self, t: u32) -> Self {
+		<DesiredTargets>::set(t);
+		self
+	}
+	pub fn add_voter(self, who: AccountId, stake: Balance, targets: Vec<AccountId>) -> Self {
+		VOTERS.with(|v| v.borrow_mut().push((who, stake, targets)));
+		self
+	}
+	pub fn build(self) -> sp_io::TestExternalities {
+		sp_tracing::try_init_simple();
+		let mut storage =
+			frame_system::GenesisConfig::default().build_storage::<Runtime>().unwrap();
+
+		let _ = pallet_balances::GenesisConfig::<Runtime> {
+			balances: vec![
+				// bunch of account for submitting stuff only.
+				(99, 100),
+				(999, 100),
+				(9999, 100),
+			],
+		}
+		.assimilate_storage(&mut storage);
+
+		sp_io::TestExternalities::from(storage)
+	}
+
+	pub fn build_offchainify(
+		self,
+		iters: u32,
+	) -> (sp_io::TestExternalities, Arc<RwLock<PoolState>>) {
+		let mut ext = self.build();
+		let (offchain, offchain_state) = TestOffchainExt::new();
+		let (pool, pool_state) = TestTransactionPoolExt::new();
+
+		let mut seed = [0_u8; 32];
+		seed[0..4].copy_from_slice(&iters.to_le_bytes());
+		offchain_state.write().seed = seed;
+
+		ext.register_extension(OffchainExt::new(offchain));
+		ext.register_extension(TransactionPoolExt::new(pool));
+
+		(ext, pool_state)
+	}
+
+	pub fn build_and_execute(self, test: impl FnOnce() -> ()) {
+		self.build().execute_with(test)
+	}
+}
diff --git a/frame/election-provider-multi-phase/src/unsigned.rs b/frame/election-provider-multi-phase/src/unsigned.rs
new file mode 100644
index 000000000000..2039e5d9f075
--- /dev/null
+++ b/frame/election-provider-multi-phase/src/unsigned.rs
@@ -0,0 +1,873 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! The unsigned phase implementation.
+
+use crate::*;
+use frame_support::dispatch::DispatchResult;
+use frame_system::offchain::SubmitTransaction;
+use sp_npos_elections::{
+	seq_phragmen, CompactSolution, ElectionResult, assignment_ratio_to_staked_normalized,
+	assignment_staked_to_ratio_normalized,
+};
+use sp_runtime::{offchain::storage::StorageValueRef, traits::TrailingZeroInput};
+use sp_std::cmp::Ordering;
+
+/// Storage key used to store the persistent offchain worker status.
+pub(crate) const OFFCHAIN_HEAD_DB: &[u8] = b"parity/multi-phase-unsigned-election";
+
+/// The repeat threshold of the offchain worker. This means we won't run the offchain worker twice
+/// within a window of 5 blocks.
+pub(crate) const OFFCHAIN_REPEAT: u32 = 5;
+
+#[derive(Debug, Eq, PartialEq)]
+pub enum MinerError {
+	/// An internal error in the NPoS elections crate.
+	NposElections(sp_npos_elections::Error),
+	/// Snapshot data was unavailable unexpectedly.
+	SnapshotUnAvailable,
+	/// Submitting a transaction to the pool failed.
+	PoolSubmissionFailed,
+	/// The pre-dispatch checks failed for the mined solution.
+	PreDispatchChecksFailed,
+	/// The solution generated from the miner is not feasible.
+	Feasibility(FeasibilityError),
+}
+
+impl From<sp_npos_elections::Error> for MinerError {
+	fn from(e: sp_npos_elections::Error) -> Self {
+		MinerError::NposElections(e)
+	}
+}
+
+impl From<FeasibilityError> for MinerError {
+	fn from(e: FeasibilityError) -> Self {
+		MinerError::Feasibility(e)
+	}
+}
+
+impl<T: Config> Pallet<T> {
+	/// Mine a new solution, and submit it back to the chain as an unsigned transaction.
+	pub fn mine_check_and_submit() -> Result<(), MinerError> {
+		let iters = Self::get_balancing_iters();
+		// get the solution, with a load of checks to ensure if submitted, IT IS ABSOLUTELY VALID.
+		let (raw_solution, witness) = Self::mine_and_check(iters)?;
+
+		let call = Call::submit_unsigned(raw_solution, witness).into();
+		SubmitTransaction::<T, Call<T>>::submit_unsigned_transaction(call)
+			.map_err(|_| MinerError::PoolSubmissionFailed)
+	}
+
+	/// Mine a new npos solution, with all the relevant checks to make sure that it will be accepted
+	/// to the chain.
+	///
+	/// If you want an unchecked solution, use [`Pallet::mine_solution`].
+	/// If you want a checked solution and submit it at the same time, use
+	/// [`Pallet::mine_check_and_submit`].
+	pub fn mine_and_check(
+		iters: usize,
+	) -> Result<(RawSolution<CompactOf<T>>, SolutionOrSnapshotSize), MinerError> {
+		let (raw_solution, witness) = Self::mine_solution(iters)?;
+
+		// ensure that this will pass the pre-dispatch checks
+		Self::unsigned_pre_dispatch_checks(&raw_solution).map_err(|e| {
+			log!(warn, "pre-dispatch-checks failed for mined solution: {:?}", e);
+			MinerError::PreDispatchChecksFailed
+		})?;
+
+		// ensure that this is a feasible solution
+		let _ = Self::feasibility_check(raw_solution.clone(), ElectionCompute::Unsigned).map_err(
+			|e| {
+				log!(warn, "feasibility-check failed for mined solution: {:?}", e);
+				MinerError::from(e)
+			},
+		)?;
+
+		Ok((raw_solution, witness))
+	}
+
+	/// Mine a new npos solution.
+	pub fn mine_solution(
+		iters: usize,
+	) -> Result<(RawSolution<CompactOf<T>>, SolutionOrSnapshotSize), MinerError> {
+		let RoundSnapshot { voters, targets } =
+			Self::snapshot().ok_or(MinerError::SnapshotUnAvailable)?;
+		let desired_targets = Self::desired_targets().ok_or(MinerError::SnapshotUnAvailable)?;
+
+		seq_phragmen::<_, CompactAccuracyOf<T>>(
+			desired_targets as usize,
+			targets,
+			voters,
+			Some((iters, 0)),
+		)
+		.map_err(Into::into)
+		.and_then(Self::prepare_election_result)
+	}
+
+	/// Convert a raw solution from [`sp_npos_elections::ElectionResult`] to [`RawSolution`], which
+	/// is ready to be submitted to the chain.
+	///
+	/// Will always reduce the solution as well.
+	pub fn prepare_election_result(
+		election_result: ElectionResult<T::AccountId, CompactAccuracyOf<T>>,
+	) -> Result<(RawSolution<CompactOf<T>>, SolutionOrSnapshotSize), MinerError> {
+		// NOTE: This code path is generally not optimized as it is run offchain. Could use some at
+		// some point though.
+
+		// storage items. Note: we have already read this from storage, they must be in cache.
+		let RoundSnapshot { voters, targets } =
+			Self::snapshot().ok_or(MinerError::SnapshotUnAvailable)?;
+		let desired_targets = Self::desired_targets().ok_or(MinerError::SnapshotUnAvailable)?;
+
+		// closures.
+		let cache = helpers::generate_voter_cache::<T>(&voters);
+		let voter_index = helpers::voter_index_fn::<T>(&cache);
+		let target_index = helpers::target_index_fn_linear::<T>(&targets);
+		let voter_at = helpers::voter_at_fn::<T>(&voters);
+		let target_at = helpers::target_at_fn::<T>(&targets);
+		let stake_of = helpers::stake_of_fn::<T>(&voters, &cache);
+
+		let ElectionResult { assignments, winners } = election_result;
+
+		// convert to staked and reduce.
+		let mut staked = assignment_ratio_to_staked_normalized(assignments, &stake_of)
+			.map_err::<MinerError, _>(Into::into)?;
+		sp_npos_elections::reduce(&mut staked);
+
+		// convert back to ration and make compact.
+		let ratio = assignment_staked_to_ratio_normalized(staked)?;
+		let compact = <CompactOf<T>>::from_assignment(ratio, &voter_index, &target_index)?;
+
+		let size =
+			SolutionOrSnapshotSize { voters: voters.len() as u32, targets: targets.len() as u32 };
+		let maximum_allowed_voters = Self::maximum_voter_for_weight::<T::WeightInfo>(
+			desired_targets,
+			size,
+			T::MinerMaxWeight::get(),
+		);
+		log!(
+			debug,
+			"miner: current compact solution voters = {}, maximum_allowed = {}",
+			compact.voter_count(),
+			maximum_allowed_voters,
+		);
+		let compact = Self::trim_compact(maximum_allowed_voters, compact, &voter_index)?;
+
+		// re-calc score.
+		let winners = sp_npos_elections::to_without_backing(winners);
+		let score = compact.clone().score(&winners, stake_of, voter_at, target_at)?;
+
+		let round = Self::round();
+		Ok((RawSolution { compact, score, round }, size))
+	}
+
+	/// Get a random number of iterations to run the balancing in the OCW.
+	///
+	/// Uses the offchain seed to generate a random number, maxed with
+	/// [`Config::MinerMaxIterations`].
+	pub fn get_balancing_iters() -> usize {
+		match T::MinerMaxIterations::get() {
+			0 => 0,
+			max @ _ => {
+				let seed = sp_io::offchain::random_seed();
+				let random = <u32>::decode(&mut TrailingZeroInput::new(seed.as_ref()))
+					.expect("input is padded with zeroes; qed")
+					% max.saturating_add(1);
+				random as usize
+			}
+		}
+	}
+
+	/// Greedily reduce the size of the a solution to fit into the block, w.r.t. weight.
+	///
+	/// The weight of the solution is foremost a function of the number of voters (i.e.
+	/// `compact.len()`). Aside from this, the other components of the weight are invariant. The
+	/// number of winners shall not be changed (otherwise the solution is invalid) and the
+	/// `ElectionSize` is merely a representation of the total number of stakers.
+	///
+	/// Thus, we reside to stripping away some voters. This means only changing the `compact`
+	/// struct.
+	///
+	/// Note that the solution is already computed, and the winners are elected based on the merit
+	/// of the entire stake in the system. Nonetheless, some of the voters will be removed further
+	/// down the line.
+	///
+	/// Indeed, the score must be computed **after** this step. If this step reduces the score too
+	/// much or remove a winner, then the solution must be discarded **after** this step.
+	pub fn trim_compact<FN>(
+		maximum_allowed_voters: u32,
+		mut compact: CompactOf<T>,
+		voter_index: FN,
+	) -> Result<CompactOf<T>, MinerError>
+	where
+		for<'r> FN: Fn(&'r T::AccountId) -> Option<CompactVoterIndexOf<T>>,
+	{
+		match compact.voter_count().checked_sub(maximum_allowed_voters as usize) {
+			Some(to_remove) if to_remove > 0 => {
+				// grab all voters and sort them by least stake.
+				let RoundSnapshot { voters, .. } =
+					Self::snapshot().ok_or(MinerError::SnapshotUnAvailable)?;
+				let mut voters_sorted = voters
+					.into_iter()
+					.map(|(who, stake, _)| (who.clone(), stake))
+					.collect::<Vec<_>>();
+				voters_sorted.sort_by_key(|(_, y)| *y);
+
+				// start removing from the least stake. Iterate until we know enough have been
+				// removed.
+				let mut removed = 0;
+				for (maybe_index, _stake) in
+					voters_sorted.iter().map(|(who, stake)| (voter_index(&who), stake))
+				{
+					let index = maybe_index.ok_or(MinerError::SnapshotUnAvailable)?;
+					if compact.remove_voter(index) {
+						removed += 1
+					}
+
+					if removed >= to_remove {
+						break;
+					}
+				}
+
+				Ok(compact)
+			}
+			_ => {
+				// nada, return as-is
+				Ok(compact)
+			}
+		}
+	}
+
+	/// Find the maximum `len` that a compact can have in order to fit into the block weight.
+	///
+	/// This only returns a value between zero and `size.nominators`.
+	pub fn maximum_voter_for_weight<W: WeightInfo>(
+		desired_winners: u32,
+		size: SolutionOrSnapshotSize,
+		max_weight: Weight,
+	) -> u32 {
+		if size.voters < 1 {
+			return size.voters;
+		}
+
+		let max_voters = size.voters.max(1);
+		let mut voters = max_voters;
+
+		// helper closures.
+		let weight_with = |active_voters: u32| -> Weight {
+			W::submit_unsigned(size.voters, size.targets, active_voters, desired_winners)
+		};
+
+		let next_voters = |current_weight: Weight, voters: u32, step: u32| -> Result<u32, ()> {
+			match current_weight.cmp(&max_weight) {
+				Ordering::Less => {
+					let next_voters = voters.checked_add(step);
+					match next_voters {
+						Some(voters) if voters < max_voters => Ok(voters),
+						_ => Err(()),
+					}
+				}
+				Ordering::Greater => voters.checked_sub(step).ok_or(()),
+				Ordering::Equal => Ok(voters),
+			}
+		};
+
+		// First binary-search the right amount of voters
+		let mut step = voters / 2;
+		let mut current_weight = weight_with(voters);
+		while step > 0 {
+			match next_voters(current_weight, voters, step) {
+				// proceed with the binary search
+				Ok(next) if next != voters => {
+					voters = next;
+				}
+				// we are out of bounds, break out of the loop.
+				Err(()) => {
+					break;
+				}
+				// we found the right value - early exit the function.
+				Ok(next) => return next,
+			}
+			step = step / 2;
+			current_weight = weight_with(voters);
+		}
+
+		// Time to finish. We might have reduced less than expected due to rounding error. Increase
+		// one last time if we have any room left, the reduce until we are sure we are below limit.
+		while voters + 1 <= max_voters && weight_with(voters + 1) < max_weight {
+			voters += 1;
+		}
+		while voters.checked_sub(1).is_some() && weight_with(voters) > max_weight {
+			voters -= 1;
+		}
+
+		debug_assert!(
+			weight_with(voters.min(size.voters)) <= max_weight,
+			"weight_with({}) <= {}",
+			voters.min(size.voters),
+			max_weight,
+		);
+		voters.min(size.voters)
+	}
+
+	/// Checks if an execution of the offchain worker is permitted at the given block number, or
+	/// not.
+	///
+	/// This essentially makes sure that we don't run on previous blocks in case of a re-org, and we
+	/// don't run twice within a window of length [`OFFCHAIN_REPEAT`].
+	///
+	/// Returns `Ok(())` if offchain worker should happen, `Err(reason)` otherwise.
+	pub(crate) fn try_acquire_offchain_lock(now: T::BlockNumber) -> Result<(), &'static str> {
+		let storage = StorageValueRef::persistent(&OFFCHAIN_HEAD_DB);
+		let threshold = T::BlockNumber::from(OFFCHAIN_REPEAT);
+
+		let mutate_stat =
+			storage.mutate::<_, &'static str, _>(|maybe_head: Option<Option<T::BlockNumber>>| {
+				match maybe_head {
+					Some(Some(head)) if now < head => Err("fork."),
+					Some(Some(head)) if now >= head && now <= head + threshold => {
+						Err("recently executed.")
+					}
+					Some(Some(head)) if now > head + threshold => {
+						// we can run again now. Write the new head.
+						Ok(now)
+					}
+					_ => {
+						// value doesn't exists. Probably this node just booted up. Write, and run
+						Ok(now)
+					}
+				}
+			});
+
+		match mutate_stat {
+			// all good
+			Ok(Ok(_)) => Ok(()),
+			// failed to write.
+			Ok(Err(_)) => Err("failed to write to offchain db."),
+			// fork etc.
+			Err(why) => Err(why),
+		}
+	}
+
+	/// Do the basics checks that MUST happen during the validation and pre-dispatch of an unsigned
+	/// transaction.
+	///
+	/// Can optionally also be called during dispatch, if needed.
+	///
+	/// NOTE: Ideally, these tests should move more and more outside of this and more to the miner's
+	/// code, so that we do less and less storage reads here.
+	pub(crate) fn unsigned_pre_dispatch_checks(
+		solution: &RawSolution<CompactOf<T>>,
+	) -> DispatchResult {
+		// ensure solution is timely. Don't panic yet. This is a cheap check.
+		ensure!(Self::current_phase().is_unsigned_open(), Error::<T>::PreDispatchEarlySubmission);
+
+		// ensure correct number of winners.
+		ensure!(
+			Self::desired_targets().unwrap_or_default()
+				== solution.compact.unique_targets().len() as u32,
+			Error::<T>::PreDispatchWrongWinnerCount,
+		);
+
+		// ensure score is being improved. Panic henceforth.
+		ensure!(
+			Self::queued_solution().map_or(true, |q: ReadySolution<_>| is_score_better::<Perbill>(
+				solution.score,
+				q.score,
+				T::SolutionImprovementThreshold::get()
+			)),
+			Error::<T>::PreDispatchWeakSubmission,
+		);
+
+		Ok(())
+	}
+}
+
+#[cfg(test)]
+mod max_weight {
+	#![allow(unused_variables)]
+	use super::{mock::*, *};
+
+	struct TestWeight;
+	impl crate::weights::WeightInfo for TestWeight {
+		fn on_initialize_nothing() -> Weight {
+			unreachable!()
+		}
+		fn on_initialize_open_signed() -> Weight {
+			unreachable!()
+		}
+		fn on_initialize_open_unsigned_with_snapshot() -> Weight {
+			unreachable!()
+		}
+		fn on_initialize_open_unsigned_without_snapshot() -> Weight {
+			unreachable!()
+		}
+		fn submit_unsigned(v: u32, t: u32, a: u32, d: u32) -> Weight {
+			(0 * v + 0 * t + 1000 * a + 0 * d) as Weight
+		}
+		fn feasibility_check(v: u32, _t: u32, a: u32, d: u32) -> Weight {
+			unreachable!()
+		}
+	}
+
+	#[test]
+	fn find_max_voter_binary_search_works() {
+		let w = SolutionOrSnapshotSize { voters: 10, targets: 0 };
+
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 0), 0);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 1), 0);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 999), 0);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 1000), 1);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 1001), 1);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 1990), 1);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 1999), 1);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 2000), 2);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 2001), 2);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 2010), 2);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 2990), 2);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 2999), 2);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 3000), 3);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 3333), 3);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 5500), 5);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 7777), 7);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 9999), 9);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 10_000), 10);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 10_999), 10);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 11_000), 10);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 22_000), 10);
+
+		let w = SolutionOrSnapshotSize { voters: 1, targets: 0 };
+
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 0), 0);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 1), 0);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 999), 0);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 1000), 1);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 1001), 1);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 1990), 1);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 1999), 1);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 2000), 1);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 2001), 1);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 2010), 1);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 3333), 1);
+
+		let w = SolutionOrSnapshotSize { voters: 2, targets: 0 };
+
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 0), 0);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 1), 0);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 999), 0);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 1000), 1);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 1001), 1);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 1999), 1);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 2000), 2);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 2001), 2);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 2010), 2);
+		assert_eq!(MultiPhase::maximum_voter_for_weight::<TestWeight>(0, w, 3333), 2);
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::{
+		mock::{Origin, *},
+		Call, *,
+	};
+	use frame_support::{dispatch::Dispatchable, traits::OffchainWorker};
+	use mock::Call as OuterCall;
+	use sp_election_providers::Assignment;
+	use sp_runtime::{traits::ValidateUnsigned, PerU16};
+
+	#[test]
+	fn validate_unsigned_retracts_wrong_phase() {
+		ExtBuilder::default().desired_targets(0).build_and_execute(|| {
+			let solution = RawSolution::<TestCompact> { score: [5, 0, 0], ..Default::default() };
+			let call = Call::submit_unsigned(solution.clone(), witness());
+
+			// initial
+			assert_eq!(MultiPhase::current_phase(), Phase::Off);
+			assert!(matches!(
+				<MultiPhase as ValidateUnsigned>::validate_unsigned(TransactionSource::Local, &call)
+					.unwrap_err(),
+				TransactionValidityError::Invalid(InvalidTransaction::Custom(0))
+			));
+			assert!(matches!(
+				<MultiPhase as ValidateUnsigned>::pre_dispatch(&call).unwrap_err(),
+				TransactionValidityError::Invalid(InvalidTransaction::Custom(0))
+			));
+
+			// signed
+			roll_to(15);
+			assert_eq!(MultiPhase::current_phase(), Phase::Signed);
+			assert!(matches!(
+				<MultiPhase as ValidateUnsigned>::validate_unsigned(TransactionSource::Local, &call)
+					.unwrap_err(),
+				TransactionValidityError::Invalid(InvalidTransaction::Custom(0))
+			));
+			assert!(matches!(
+				<MultiPhase as ValidateUnsigned>::pre_dispatch(&call).unwrap_err(),
+				TransactionValidityError::Invalid(InvalidTransaction::Custom(0))
+			));
+
+			// unsigned
+			roll_to(25);
+			assert!(MultiPhase::current_phase().is_unsigned());
+
+			assert!(<MultiPhase as ValidateUnsigned>::validate_unsigned(
+				TransactionSource::Local,
+				&call
+			)
+			.is_ok());
+			assert!(<MultiPhase as ValidateUnsigned>::pre_dispatch(&call).is_ok());
+
+			// unsigned -- but not enabled.
+			<CurrentPhase<Runtime>>::put(Phase::Unsigned((false, 25)));
+			assert!(MultiPhase::current_phase().is_unsigned());
+			assert!(matches!(
+				<MultiPhase as ValidateUnsigned>::validate_unsigned(TransactionSource::Local, &call)
+					.unwrap_err(),
+				TransactionValidityError::Invalid(InvalidTransaction::Custom(0))
+			));
+			assert!(matches!(
+				<MultiPhase as ValidateUnsigned>::pre_dispatch(&call).unwrap_err(),
+				TransactionValidityError::Invalid(InvalidTransaction::Custom(0))
+			));
+		})
+	}
+
+	#[test]
+	fn validate_unsigned_retracts_low_score() {
+		ExtBuilder::default().desired_targets(0).build_and_execute(|| {
+			roll_to(25);
+			assert!(MultiPhase::current_phase().is_unsigned());
+
+			let solution = RawSolution::<TestCompact> { score: [5, 0, 0], ..Default::default() };
+			let call = Call::submit_unsigned(solution.clone(), witness());
+
+			// initial
+			assert!(<MultiPhase as ValidateUnsigned>::validate_unsigned(
+				TransactionSource::Local,
+				&call
+			)
+			.is_ok());
+			assert!(<MultiPhase as ValidateUnsigned>::pre_dispatch(&call).is_ok());
+
+			// set a better score
+			let ready = ReadySolution { score: [10, 0, 0], ..Default::default() };
+			<QueuedSolution<Runtime>>::put(ready);
+
+			// won't work anymore.
+			assert!(matches!(
+				<MultiPhase as ValidateUnsigned>::validate_unsigned(
+					TransactionSource::Local,
+					&call
+				)
+				.unwrap_err(),
+				TransactionValidityError::Invalid(InvalidTransaction::Custom(2))
+			));
+			assert!(matches!(
+				<MultiPhase as ValidateUnsigned>::pre_dispatch(&call).unwrap_err(),
+				TransactionValidityError::Invalid(InvalidTransaction::Custom(2))
+			));
+		})
+	}
+
+	#[test]
+	fn validate_unsigned_retracts_incorrect_winner_count() {
+		ExtBuilder::default().desired_targets(1).build_and_execute(|| {
+			roll_to(25);
+			assert!(MultiPhase::current_phase().is_unsigned());
+
+			let solution = RawSolution::<TestCompact> { score: [5, 0, 0], ..Default::default() };
+			let call = Call::submit_unsigned(solution.clone(), witness());
+			assert_eq!(solution.compact.unique_targets().len(), 0);
+
+			// won't work anymore.
+			assert!(matches!(
+				<MultiPhase as ValidateUnsigned>::validate_unsigned(
+					TransactionSource::Local,
+					&call
+				)
+				.unwrap_err(),
+				TransactionValidityError::Invalid(InvalidTransaction::Custom(1))
+			));
+		})
+	}
+
+	#[test]
+	fn priority_is_set() {
+		ExtBuilder::default().miner_tx_priority(20).desired_targets(0).build_and_execute(|| {
+			roll_to(25);
+			assert!(MultiPhase::current_phase().is_unsigned());
+
+			let solution = RawSolution::<TestCompact> { score: [5, 0, 0], ..Default::default() };
+			let call = Call::submit_unsigned(solution.clone(), witness());
+
+			assert_eq!(
+				<MultiPhase as ValidateUnsigned>::validate_unsigned(
+					TransactionSource::Local,
+					&call
+				)
+				.unwrap()
+				.priority,
+				25
+			);
+		})
+	}
+
+	#[test]
+	#[should_panic(expected = "Invalid unsigned submission must produce invalid block and \
+	                           deprive validator from their authoring reward.: \
+	                           DispatchError::Module { index: 2, error: 1, message: \
+	                           Some(\"PreDispatchWrongWinnerCount\") }")]
+	fn unfeasible_solution_panics() {
+		ExtBuilder::default().build_and_execute(|| {
+			roll_to(25);
+			assert!(MultiPhase::current_phase().is_unsigned());
+
+			// This is in itself an invalid BS solution.
+			let solution = RawSolution::<TestCompact> { score: [5, 0, 0], ..Default::default() };
+			let call = Call::submit_unsigned(solution.clone(), witness());
+			let outer_call: OuterCall = call.into();
+			let _ = outer_call.dispatch(Origin::none());
+		})
+	}
+
+	#[test]
+	#[should_panic(expected = "Invalid unsigned submission must produce invalid block and \
+	                           deprive validator from their authoring reward.")]
+	fn wrong_witness_panics() {
+		ExtBuilder::default().build_and_execute(|| {
+			roll_to(25);
+			assert!(MultiPhase::current_phase().is_unsigned());
+
+			// This solution is unfeasible as well, but we won't even get there.
+			let solution = RawSolution::<TestCompact> { score: [5, 0, 0], ..Default::default() };
+
+			let mut correct_witness = witness();
+			correct_witness.voters += 1;
+			correct_witness.targets -= 1;
+			let call = Call::submit_unsigned(solution.clone(), correct_witness);
+			let outer_call: OuterCall = call.into();
+			let _ = outer_call.dispatch(Origin::none());
+		})
+	}
+
+	#[test]
+	fn miner_works() {
+		ExtBuilder::default().build_and_execute(|| {
+			roll_to(25);
+			assert!(MultiPhase::current_phase().is_unsigned());
+
+			// ensure we have snapshots in place.
+			assert!(MultiPhase::snapshot().is_some());
+			assert_eq!(MultiPhase::desired_targets().unwrap(), 2);
+
+			// mine seq_phragmen solution with 2 iters.
+			let (solution, witness) = MultiPhase::mine_solution(2).unwrap();
+
+			// ensure this solution is valid.
+			assert!(MultiPhase::queued_solution().is_none());
+			assert_ok!(MultiPhase::submit_unsigned(Origin::none(), solution, witness));
+			assert!(MultiPhase::queued_solution().is_some());
+		})
+	}
+
+	#[test]
+	fn miner_trims_weight() {
+		ExtBuilder::default().miner_weight(100).mock_weight_info(true).build_and_execute(|| {
+			roll_to(25);
+			assert!(MultiPhase::current_phase().is_unsigned());
+
+			let (solution, witness) = MultiPhase::mine_solution(2).unwrap();
+			let solution_weight = <Runtime as Config>::WeightInfo::submit_unsigned(
+				witness.voters,
+				witness.targets,
+				solution.compact.voter_count() as u32,
+				solution.compact.unique_targets().len() as u32,
+			);
+			// default solution will have 5 edges (5 * 5 + 10)
+			assert_eq!(solution_weight, 35);
+			assert_eq!(solution.compact.voter_count(), 5);
+
+			// now reduce the max weight
+			<MinerMaxWeight>::set(25);
+
+			let (solution, witness) = MultiPhase::mine_solution(2).unwrap();
+			let solution_weight = <Runtime as Config>::WeightInfo::submit_unsigned(
+				witness.voters,
+				witness.targets,
+				solution.compact.voter_count() as u32,
+				solution.compact.unique_targets().len() as u32,
+			);
+			// default solution will have 5 edges (5 * 5 + 10)
+			assert_eq!(solution_weight, 25);
+			assert_eq!(solution.compact.voter_count(), 3);
+		})
+	}
+
+	#[test]
+	fn miner_will_not_submit_if_not_enough_winners() {
+		let (mut ext, _) = ExtBuilder::default().desired_targets(8).build_offchainify(0);
+		ext.execute_with(|| {
+			roll_to(25);
+			assert!(MultiPhase::current_phase().is_unsigned());
+
+			// mine seq_phragmen solution with 2 iters.
+			assert_eq!(
+				MultiPhase::mine_check_and_submit().unwrap_err(),
+				MinerError::PreDispatchChecksFailed,
+			);
+		})
+	}
+
+	#[test]
+	fn unsigned_per_dispatch_checks_can_only_submit_threshold_better() {
+		ExtBuilder::default()
+			.desired_targets(1)
+			.add_voter(7, 2, vec![10])
+			.add_voter(8, 5, vec![10])
+			.solution_improvement_threshold(Perbill::from_percent(50))
+			.build_and_execute(|| {
+				roll_to(25);
+				assert!(MultiPhase::current_phase().is_unsigned());
+				assert_eq!(MultiPhase::desired_targets().unwrap(), 1);
+
+				// an initial solution
+				let result = ElectionResult {
+					// note: This second element of backing stake is not important here.
+					winners: vec![(10, 10)],
+					assignments: vec![Assignment {
+						who: 10,
+						distribution: vec![(10, PerU16::one())],
+					}],
+				};
+				let (solution, witness) = MultiPhase::prepare_election_result(result).unwrap();
+				assert_ok!(MultiPhase::unsigned_pre_dispatch_checks(&solution));
+				assert_ok!(MultiPhase::submit_unsigned(Origin::none(), solution, witness));
+				assert_eq!(MultiPhase::queued_solution().unwrap().score[0], 10);
+
+				// trial 1: a solution who's score is only 2, i.e. 20% better in the first element.
+				let result = ElectionResult {
+					winners: vec![(10, 12)],
+					assignments: vec![
+						Assignment { who: 10, distribution: vec![(10, PerU16::one())] },
+						Assignment {
+							who: 7,
+							// note: this percent doesn't even matter, in compact it is 100%.
+							distribution: vec![(10, PerU16::one())],
+						},
+					],
+				};
+				let (solution, _) = MultiPhase::prepare_election_result(result).unwrap();
+				// 12 is not 50% more than 10
+				assert_eq!(solution.score[0], 12);
+				assert_noop!(
+					MultiPhase::unsigned_pre_dispatch_checks(&solution),
+					Error::<Runtime>::PreDispatchWeakSubmission,
+				);
+				// submitting this will actually panic.
+
+				// trial 2: a solution who's score is only 7, i.e. 70% better in the first element.
+				let result = ElectionResult {
+					winners: vec![(10, 12)],
+					assignments: vec![
+						Assignment { who: 10, distribution: vec![(10, PerU16::one())] },
+						Assignment { who: 7, distribution: vec![(10, PerU16::one())] },
+						Assignment {
+							who: 8,
+							// note: this percent doesn't even matter, in compact it is 100%.
+							distribution: vec![(10, PerU16::one())],
+						},
+					],
+				};
+				let (solution, witness) = MultiPhase::prepare_election_result(result).unwrap();
+				assert_eq!(solution.score[0], 17);
+
+				// and it is fine
+				assert_ok!(MultiPhase::unsigned_pre_dispatch_checks(&solution));
+				assert_ok!(MultiPhase::submit_unsigned(Origin::none(), solution, witness));
+			})
+	}
+
+	#[test]
+	fn ocw_check_prevent_duplicate() {
+		let (mut ext, _) = ExtBuilder::default().build_offchainify(0);
+		ext.execute_with(|| {
+			roll_to(25);
+			assert!(MultiPhase::current_phase().is_unsigned());
+
+			// first execution -- okay.
+			assert!(MultiPhase::try_acquire_offchain_lock(25).is_ok());
+
+			// next block: rejected.
+			assert!(MultiPhase::try_acquire_offchain_lock(26).is_err());
+
+			// allowed after `OFFCHAIN_REPEAT`
+			assert!(MultiPhase::try_acquire_offchain_lock((26 + OFFCHAIN_REPEAT).into()).is_ok());
+
+			// a fork like situation: re-execute last 3.
+			assert!(
+				MultiPhase::try_acquire_offchain_lock((26 + OFFCHAIN_REPEAT - 3).into()).is_err()
+			);
+			assert!(
+				MultiPhase::try_acquire_offchain_lock((26 + OFFCHAIN_REPEAT - 2).into()).is_err()
+			);
+			assert!(
+				MultiPhase::try_acquire_offchain_lock((26 + OFFCHAIN_REPEAT - 1).into()).is_err()
+			);
+		})
+	}
+
+	#[test]
+	fn ocw_only_runs_when_signed_open_now() {
+		let (mut ext, pool) = ExtBuilder::default().build_offchainify(0);
+		ext.execute_with(|| {
+			roll_to(25);
+			assert_eq!(MultiPhase::current_phase(), Phase::Unsigned((true, 25)));
+
+			// we must clear the offchain storage to ensure the offchain execution check doesn't get
+			// in the way.
+			let mut storage = StorageValueRef::persistent(&OFFCHAIN_HEAD_DB);
+
+			MultiPhase::offchain_worker(24);
+			assert!(pool.read().transactions.len().is_zero());
+			storage.clear();
+
+			MultiPhase::offchain_worker(26);
+			assert!(pool.read().transactions.len().is_zero());
+			storage.clear();
+
+			// submits!
+			MultiPhase::offchain_worker(25);
+			assert!(!pool.read().transactions.len().is_zero());
+		})
+	}
+
+	#[test]
+	fn ocw_can_submit_to_pool() {
+		let (mut ext, pool) = ExtBuilder::default().build_offchainify(0);
+		ext.execute_with(|| {
+			roll_to_with_ocw(25);
+			assert_eq!(MultiPhase::current_phase(), Phase::Unsigned((true, 25)));
+			// OCW must have submitted now
+
+			let encoded = pool.read().transactions[0].clone();
+			let extrinsic: Extrinsic = Decode::decode(&mut &*encoded).unwrap();
+			let call = extrinsic.call;
+			assert!(matches!(call, OuterCall::MultiPhase(Call::submit_unsigned(_, _))));
+		})
+	}
+}
diff --git a/frame/election-provider-multi-phase/src/weights.rs b/frame/election-provider-multi-phase/src/weights.rs
new file mode 100644
index 000000000000..cbdc5b39bf3e
--- /dev/null
+++ b/frame/election-provider-multi-phase/src/weights.rs
@@ -0,0 +1,150 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Autogenerated weights for pallet_election_provider_multi_phase
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-02-12, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
+
+// Executed Command:
+// target/release/substrate
+// benchmark
+// --chain=dev
+// --steps=50
+// --repeat=20
+// --pallet=pallet_election_provider_multi_phase
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./frame/election-provider-multi-phase/src/weights.rs
+// --template=./.maintain/frame-weight-template.hbs
+
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for pallet_election_provider_multi_phase.
+pub trait WeightInfo {
+	fn on_initialize_nothing() -> Weight;
+	fn on_initialize_open_signed() -> Weight;
+	fn on_initialize_open_unsigned_with_snapshot() -> Weight;
+	fn on_initialize_open_unsigned_without_snapshot() -> Weight;
+	fn submit_unsigned(v: u32, t: u32, a: u32, d: u32, ) -> Weight;
+	fn feasibility_check(v: u32, t: u32, a: u32, d: u32, ) -> Weight;
+}
+
+/// Weights for pallet_election_provider_multi_phase using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	fn on_initialize_nothing() -> Weight {
+		(23_401_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(7 as Weight))
+	}
+	fn on_initialize_open_signed() -> Weight {
+		(79_260_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(7 as Weight))
+			.saturating_add(T::DbWeight::get().writes(4 as Weight))
+	}
+	fn on_initialize_open_unsigned_with_snapshot() -> Weight {
+		(77_745_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(7 as Weight))
+			.saturating_add(T::DbWeight::get().writes(4 as Weight))
+	}
+	fn on_initialize_open_unsigned_without_snapshot() -> Weight {
+		(21_764_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn submit_unsigned(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
+		(0 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((4_171_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 78_000
+			.saturating_add((229_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 23_000
+			.saturating_add((13_661_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 117_000
+			.saturating_add((4_499_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add(T::DbWeight::get().reads(6 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn feasibility_check(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
+		(0 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((4_232_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 42_000
+			.saturating_add((636_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 12_000
+			.saturating_add((10_294_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 64_000
+			.saturating_add((4_428_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+	}
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+	fn on_initialize_nothing() -> Weight {
+		(23_401_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
+	}
+	fn on_initialize_open_signed() -> Weight {
+		(79_260_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
+	}
+	fn on_initialize_open_unsigned_with_snapshot() -> Weight {
+		(77_745_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
+	}
+	fn on_initialize_open_unsigned_without_snapshot() -> Weight {
+		(21_764_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn submit_unsigned(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
+		(0 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((4_171_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 78_000
+			.saturating_add((229_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 23_000
+			.saturating_add((13_661_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 117_000
+			.saturating_add((4_499_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn feasibility_check(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
+		(0 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((4_232_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 42_000
+			.saturating_add((636_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 12_000
+			.saturating_add((10_294_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 64_000
+			.saturating_add((4_428_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+	}
+}
diff --git a/frame/grandpa/Cargo.toml b/frame/grandpa/Cargo.toml
index 3e85ff50d3e1..39207e10f8f3 100644
--- a/frame/grandpa/Cargo.toml
+++ b/frame/grandpa/Cargo.toml
@@ -38,6 +38,7 @@ pallet-offences = { version = "3.0.0", path = "../offences" }
 pallet-staking = { version = "3.0.0", path = "../staking" }
 pallet-staking-reward-curve = { version = "3.0.0", path = "../staking/reward-curve" }
 pallet-timestamp = { version = "3.0.0", path = "../timestamp" }
+sp-election-providers = { version = "3.0.0", path = "../../primitives/election-providers" }
 
 [features]
 default = ["std"]
diff --git a/frame/grandpa/src/mock.rs b/frame/grandpa/src/mock.rs
index e8703dba50ae..0a24a2344547 100644
--- a/frame/grandpa/src/mock.rs
+++ b/frame/grandpa/src/mock.rs
@@ -30,7 +30,6 @@ use frame_support::{
 use pallet_staking::EraIndex;
 use sp_core::{crypto::KeyTypeId, H256};
 use sp_finality_grandpa::{RoundNumber, SetId, GRANDPA_ENGINE_ID};
-use sp_io;
 use sp_keyring::Ed25519Keyring;
 use sp_runtime::{
 	curve::PiecewiseLinear,
@@ -41,6 +40,7 @@ use sp_runtime::{
 };
 use sp_staking::SessionIndex;
 use pallet_session::historical as pallet_session_historical;
+use sp_election_providers::onchain;
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -190,6 +190,13 @@ parameter_types! {
 	pub const StakingUnsignedPriority: u64 = u64::max_value() / 2;
 }
 
+impl onchain::Config for Test {
+	type AccountId = <Self as frame_system::Config>::AccountId;
+	type BlockNumber = <Self as frame_system::Config>::BlockNumber;
+	type Accuracy = Perbill;
+	type DataProvider = Staking;
+}
+
 impl pallet_staking::Config for Test {
 	type RewardRemainder = ();
 	type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote;
@@ -212,6 +219,7 @@ impl pallet_staking::Config for Test {
 	type MaxIterations = ();
 	type MinSolutionScoreBump = ();
 	type OffchainSolutionWeightLimit = ();
+	type ElectionProvider = onchain::OnChainSequentialPhragmen<Self>;
 	type WeightInfo = ();
 }
 
diff --git a/frame/offences/benchmarking/Cargo.toml b/frame/offences/benchmarking/Cargo.toml
index a27b6c3012e3..2378be45d681 100644
--- a/frame/offences/benchmarking/Cargo.toml
+++ b/frame/offences/benchmarking/Cargo.toml
@@ -27,6 +27,7 @@ pallet-staking = { version = "3.0.0", default-features = false, features = ["run
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
 sp-staking = { version = "3.0.0", default-features = false, path = "../../../primitives/staking" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../../primitives/std" }
+sp-election-providers = { version = "3.0.0", default-features = false, path = "../../../primitives/election-providers" }
 
 [dev-dependencies]
 pallet-staking-reward-curve = { version = "3.0.0", path = "../../staking/reward-curve" }
@@ -50,6 +51,7 @@ std = [
 	"pallet-staking/std",
 	"sp-runtime/std",
 	"sp-staking/std",
+	"sp-election-providers/std",
 	"sp-std/std",
 	"codec/std",
 ]
diff --git a/frame/offences/benchmarking/src/mock.rs b/frame/offences/benchmarking/src/mock.rs
index e4ec32d0bc3b..124e6b13b77a 100644
--- a/frame/offences/benchmarking/src/mock.rs
+++ b/frame/offences/benchmarking/src/mock.rs
@@ -29,6 +29,7 @@ use sp_runtime::{
 	traits::IdentityLookup,
 	testing::{Header, UintAuthorityId},
 };
+use sp_election_providers::onchain;
 use pallet_session::historical as pallet_session_historical;
 
 type AccountId = u64;
@@ -148,6 +149,13 @@ parameter_types! {
 
 pub type Extrinsic = sp_runtime::testing::TestXt<Call, ()>;
 
+impl onchain::Config for Test {
+	type AccountId = AccountId;
+	type BlockNumber = BlockNumber;
+	type Accuracy = Perbill;
+	type DataProvider = Staking;
+}
+
 impl pallet_staking::Config for Test {
 	type Currency = Balances;
 	type UnixTime = pallet_timestamp::Module<Self>;
@@ -170,6 +178,7 @@ impl pallet_staking::Config for Test {
 	type MaxIterations = ();
 	type MinSolutionScoreBump = ();
 	type OffchainSolutionWeightLimit = ();
+	type ElectionProvider = onchain::OnChainSequentialPhragmen<Self>;
 	type WeightInfo = ();
 }
 
diff --git a/frame/session/benchmarking/Cargo.toml b/frame/session/benchmarking/Cargo.toml
index bf5a9a9617b1..e4db81c4b3bc 100644
--- a/frame/session/benchmarking/Cargo.toml
+++ b/frame/session/benchmarking/Cargo.toml
@@ -13,9 +13,9 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-std = { version = "3.0.0", default-features = false, path = "../../../primitives/std" }
 sp-session = { version = "3.0.0", default-features = false, path = "../../../primitives/session" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../../primitives/std" }
 frame-system = { version = "3.0.0", default-features = false, path = "../../system" }
 frame-benchmarking = { version = "3.0.0", default-features = false, path = "../../benchmarking" }
 frame-support = { version = "3.0.0", default-features = false, path = "../../support" }
@@ -31,12 +31,14 @@ pallet-staking-reward-curve = { version = "3.0.0", path = "../../staking/reward-
 sp-io ={ version = "3.0.0", path = "../../../primitives/io" }
 pallet-timestamp = { version = "3.0.0", path = "../../timestamp" }
 pallet-balances = { version = "3.0.0", path = "../../balances" }
+sp-election-providers = { version = "3.0.0", path = "../../../primitives/election-providers" }
 
 [features]
 default = ["std"]
 std = [
 	"sp-std/std",
 	"sp-session/std",
+	"sp-election-providers/std",
 	"sp-runtime/std",
 	"frame-system/std",
 	"frame-benchmarking/std",
diff --git a/frame/session/benchmarking/src/mock.rs b/frame/session/benchmarking/src/mock.rs
index b25b169c82ed..0eba5452b28d 100644
--- a/frame/session/benchmarking/src/mock.rs
+++ b/frame/session/benchmarking/src/mock.rs
@@ -20,6 +20,7 @@
 #![cfg(test)]
 
 use sp_runtime::traits::IdentityLookup;
+use sp_election_providers::onchain;
 use frame_support::parameter_types;
 
 type AccountId = u64;
@@ -145,13 +146,21 @@ parameter_types! {
 
 pub type Extrinsic = sp_runtime::testing::TestXt<Call, ()>;
 
-impl<C> frame_system::offchain::SendTransactionTypes<C> for Test where
+impl<C> frame_system::offchain::SendTransactionTypes<C> for Test
+where
 	Call: From<C>,
 {
 	type OverarchingCall = Call;
 	type Extrinsic = Extrinsic;
 }
 
+impl onchain::Config for Test {
+	type AccountId = AccountId;
+	type BlockNumber = BlockNumber;
+	type Accuracy = sp_runtime::Perbill;
+	type DataProvider = Staking;
+}
+
 impl pallet_staking::Config for Test {
 	type Currency = Balances;
 	type UnixTime = pallet_timestamp::Module<Self>;
@@ -174,6 +183,7 @@ impl pallet_staking::Config for Test {
 	type MaxIterations = ();
 	type MinSolutionScoreBump = ();
 	type OffchainSolutionWeightLimit = ();
+	type ElectionProvider = onchain::OnChainSequentialPhragmen<Self>;
 	type WeightInfo = ();
 }
 
diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs
index 64ec31ad99d0..d95d99389f73 100644
--- a/frame/session/src/lib.rs
+++ b/frame/session/src/lib.rs
@@ -169,11 +169,13 @@ impl<
 		Some(if now > offset {
 			let block_after_last_session = (now.clone() - offset) % period.clone();
 			if block_after_last_session > Zero::zero() {
-				now.saturating_add(
-					period.saturating_sub(block_after_last_session)
-				)
+				now.saturating_add(period.saturating_sub(block_after_last_session))
 			} else {
-				now
+				// this branch happens when the session is already rotated or will rotate in this
+				// block (depending on being called before or after `session::on_initialize`). Here,
+				// we assume the latter, namely that this is called after `session::on_initialize`,
+				// and thus we add period to it as well.
+				now + period
 			}
 		} else {
 			offset
@@ -187,6 +189,10 @@ impl<
 		// reasonable to come back here and properly calculate the weight of this function.
 		0
 	}
+
+	fn average_session_length() -> BlockNumber {
+		Period::get()
+	}
 }
 
 /// A trait for managing creation of new validator set.
@@ -833,6 +839,10 @@ impl<T: Config> EstimateNextNewSession<T::BlockNumber> for Module<T> {
 		T::NextSessionRotation::estimate_next_session_rotation(now)
 	}
 
+	fn average_session_length() -> T::BlockNumber {
+		T::NextSessionRotation::average_session_length()
+	}
+
 	fn weight(now: T::BlockNumber) -> Weight {
 		T::NextSessionRotation::weight(now)
 	}
diff --git a/frame/session/src/tests.rs b/frame/session/src/tests.rs
index c876770c74bc..b2e086aed90c 100644
--- a/frame/session/src/tests.rs
+++ b/frame/session/src/tests.rs
@@ -275,7 +275,7 @@ fn periodic_session_works() {
 	}
 
 	assert!(P::should_end_session(13u64));
-	assert_eq!(P::estimate_next_session_rotation(13u64).unwrap(), 13);
+	assert_eq!(P::estimate_next_session_rotation(13u64).unwrap(), 23);
 
 	assert!(!P::should_end_session(14u64));
 	assert_eq!(P::estimate_next_session_rotation(14u64).unwrap(), 23);
diff --git a/frame/staking/Cargo.toml b/frame/staking/Cargo.toml
index c5f7dba07545..11de7e63ea94 100644
--- a/frame/staking/Cargo.toml
+++ b/frame/staking/Cargo.toml
@@ -17,6 +17,7 @@ static_assertions = "1.1.0"
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+# TWO_PHASE_NOTE:: ideally we should be able to get rid of this.
 sp-npos-elections = { version = "3.0.0", default-features = false, path = "../../primitives/npos-elections" }
 sp-io ={ version = "3.0.0", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
@@ -26,20 +27,22 @@ frame-system = { version = "3.0.0", default-features = false, path = "../system"
 pallet-session = { version = "3.0.0", default-features = false, features = ["historical"], path = "../session" }
 pallet-authorship = { version = "3.0.0", default-features = false, path = "../authorship" }
 sp-application-crypto = { version = "3.0.0", default-features = false, path = "../../primitives/application-crypto" }
+sp-election-providers = { version = "3.0.0", default-features = false, path = "../../primitives/election-providers" }
 
 # Optional imports for benchmarking
 frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
 rand_chacha = { version = "0.2", default-features = false, optional = true }
 
 [dev-dependencies]
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
 sp-storage = { version = "3.0.0", path = "../../primitives/storage" }
 sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
 pallet-balances = { version = "3.0.0", path = "../balances" }
 pallet-timestamp = { version = "3.0.0", path = "../timestamp" }
 pallet-staking-reward-curve = { version = "3.0.0",  path = "../staking/reward-curve" }
 substrate-test-utils = { version = "3.0.0", path = "../../test-utils" }
 frame-benchmarking = { version = "3.0.0", path = "../benchmarking" }
+sp-election-providers = { version = "3.0.0", features = ["runtime-benchmarks"], path = "../../primitives/election-providers" }
 rand_chacha = { version = "0.2" }
 parking_lot = "0.11.1"
 hex = "0.4"
@@ -59,8 +62,10 @@ std = [
 	"frame-system/std",
 	"pallet-authorship/std",
 	"sp-application-crypto/std",
+	"sp-election-providers/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
+	"sp-election-providers/runtime-benchmarks",
 	"rand_chacha",
 ]
diff --git a/frame/staking/fuzzer/Cargo.toml b/frame/staking/fuzzer/Cargo.toml
index a88e9619174c..84758c6bf65c 100644
--- a/frame/staking/fuzzer/Cargo.toml
+++ b/frame/staking/fuzzer/Cargo.toml
@@ -28,6 +28,7 @@ sp-io ={ version = "3.0.0", path = "../../../primitives/io" }
 sp-core = { version = "3.0.0", path = "../../../primitives/core" }
 sp-npos-elections = { version = "3.0.0", path = "../../../primitives/npos-elections" }
 sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
+sp-election-providers = { version = "3.0.0", path = "../../../primitives/election-providers" }
 serde = "1.0.101"
 
 [features]
diff --git a/frame/staking/fuzzer/src/mock.rs b/frame/staking/fuzzer/src/mock.rs
index 88b001c7e69e..05d001d23858 100644
--- a/frame/staking/fuzzer/src/mock.rs
+++ b/frame/staking/fuzzer/src/mock.rs
@@ -149,13 +149,24 @@ parameter_types! {
 
 pub type Extrinsic = sp_runtime::testing::TestXt<Call, ()>;
 
-impl<C> frame_system::offchain::SendTransactionTypes<C> for Test where
+impl<C> frame_system::offchain::SendTransactionTypes<C> for Test
+where
 	Call: From<C>,
 {
 	type OverarchingCall = Call;
 	type Extrinsic = Extrinsic;
 }
 
+pub struct MockElectionProvider;
+impl sp_election_providers::ElectionProvider<AccountId, BlockNumber> for MockElectionProvider {
+	type Error = ();
+	type DataProvider = pallet_staking::Module<Test>;
+
+	fn elect() -> Result<sp_npos_elections::Supports<AccountId>, Self::Error> {
+		Err(())
+	}
+}
+
 impl pallet_staking::Config for Test {
 	type Currency = Balances;
 	type UnixTime = pallet_timestamp::Module<Self>;
@@ -179,4 +190,5 @@ impl pallet_staking::Config for Test {
 	type UnsignedPriority = ();
 	type OffchainSolutionWeightLimit = ();
 	type WeightInfo = ();
+	type ElectionProvider = MockElectionProvider;
 }
diff --git a/frame/staking/fuzzer/src/submit_solution.rs b/frame/staking/fuzzer/src/submit_solution.rs
index d94ee49b96db..b661a83a1bdd 100644
--- a/frame/staking/fuzzer/src/submit_solution.rs
+++ b/frame/staking/fuzzer/src/submit_solution.rs
@@ -164,7 +164,7 @@ fn main() {
 						assert_eq!(
 							call.dispatch_bypass_filter(origin.into()).unwrap_err().error,
 							DispatchError::Module {
-								index: 0,
+								index: 2,
 								error: 16,
 								message: Some("OffchainElectionWeakSubmission"),
 							},
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 47e835c2709f..a74b2d55233e 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -328,15 +328,13 @@ use frame_system::{
 };
 use sp_npos_elections::{
 	ExtendedBalance, Assignment, ElectionScore, ElectionResult as PrimitiveElectionResult,
-	to_support_map, EvaluateSupport, seq_phragmen, generate_solution_type, is_score_better,
-	SupportMap, VoteWeight, CompactSolution, PerThing128,
+	to_supports, EvaluateSupport, seq_phragmen, generate_solution_type, is_score_better, Supports,
+	VoteWeight, CompactSolution, PerThing128,
 };
+use sp_election_providers::ElectionProvider;
 pub use weights::WeightInfo;
 
 const STAKING_ID: LockIdentifier = *b"staking ";
-pub const MAX_UNLOCKING_CHUNKS: usize = 32;
-pub const MAX_NOMINATIONS: usize = <CompactAssignments as CompactSolution>::LIMIT;
-
 pub(crate) const LOG_TARGET: &'static str = "staking";
 
 // syntactic sugar for logging.
@@ -345,7 +343,7 @@ macro_rules! log {
 	($level:tt, $patter:expr $(, $values:expr)* $(,)?) => {
 		frame_support::debug::$level!(
 			target: crate::LOG_TARGET,
-			$patter $(, $values)*
+			concat!("💸 ", $patter) $(, $values)*
 		)
 	};
 }
@@ -365,6 +363,10 @@ static_assertions::const_assert!(size_of::<NominatorIndex>() <= size_of::<u32>()
 /// Maximum number of stakers that can be stored in a snapshot.
 pub(crate) const MAX_VALIDATORS: usize = ValidatorIndex::max_value() as usize;
 pub(crate) const MAX_NOMINATORS: usize = NominatorIndex::max_value() as usize;
+pub const MAX_NOMINATIONS: usize =
+	<CompactAssignments as sp_npos_elections::CompactSolution>::LIMIT;
+
+pub const MAX_UNLOCKING_CHUNKS: usize = 32;
 
 /// Counter for the number of eras that have passed.
 pub type EraIndex = u32;
@@ -388,10 +390,12 @@ pub type OffchainAccuracy = PerU16;
 pub type BalanceOf<T> =
 	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 
-type PositiveImbalanceOf<T> =
-	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::PositiveImbalance;
-type NegativeImbalanceOf<T> =
-	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
+type PositiveImbalanceOf<T> = <<T as Config>::Currency as Currency<
+	<T as frame_system::Config>::AccountId,
+>>::PositiveImbalance;
+type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<
+	<T as frame_system::Config>::AccountId,
+>>::NegativeImbalance;
 
 /// Information regarding the active era (era in used in session).
 #[derive(Encode, Decode, RuntimeDebug)]
@@ -778,7 +782,7 @@ impl<T: Config> SessionInterface<<T as frame_system::Config>::AccountId> for T w
 
 pub trait Config: frame_system::Config + SendTransactionTypes<Call<Self>> {
 	/// The staking balance.
-	type Currency: LockableCurrency<Self::AccountId, Moment=Self::BlockNumber>;
+	type Currency: LockableCurrency<Self::AccountId, Moment = Self::BlockNumber>;
 
 	/// Time used for computing era duration.
 	///
@@ -793,6 +797,14 @@ pub trait Config: frame_system::Config + SendTransactionTypes<Call<Self>> {
 	/// [`BalanceOf`].
 	type CurrencyToVote: CurrencyToVote<BalanceOf<Self>>;
 
+	/// Something that provides the election functionality.
+	type ElectionProvider: sp_election_providers::ElectionProvider<
+		Self::AccountId,
+		Self::BlockNumber,
+		// we only accept an election provider that has staking as data provider.
+		DataProvider = Module<Self>,
+	>;
+
 	/// Tokens have been minted and are unused for validator-reward.
 	/// See [Era payout](./index.html#era-payout).
 	type RewardRemainder: OnUnbalanced<NegativeImbalanceOf<Self>>;
@@ -889,7 +901,9 @@ pub enum Forcing {
 }
 
 impl Default for Forcing {
-	fn default() -> Self { Forcing::NotForcing }
+	fn default() -> Self {
+		Forcing::NotForcing
+	}
 }
 
 // A value placed in storage that represents the current version of the Staking storage. This value
@@ -1066,28 +1080,45 @@ decl_storage! {
 		/// The earliest era for which we have a pending, unapplied slash.
 		EarliestUnappliedSlash: Option<EraIndex>;
 
+		/// The last planned session scheduled by the session pallet.
+		///
+		/// This is basically in sync with the call to [`SessionManager::new_session`].
+		pub CurrentPlannedSession get(fn current_planned_session): SessionIndex;
+
 		/// Snapshot of validators at the beginning of the current election window. This should only
 		/// have a value when [`EraElectionStatus`] == `ElectionStatus::Open(_)`.
+		///
+		/// TWO_PHASE_NOTE: should be removed once we switch to multi-phase.
 		pub SnapshotValidators get(fn snapshot_validators): Option<Vec<T::AccountId>>;
 
 		/// Snapshot of nominators at the beginning of the current election window. This should only
 		/// have a value when [`EraElectionStatus`] == `ElectionStatus::Open(_)`.
+		///
+		/// TWO_PHASE_NOTE: should be removed once we switch to multi-phase.
 		pub SnapshotNominators get(fn snapshot_nominators): Option<Vec<T::AccountId>>;
 
 		/// The next validator set. At the end of an era, if this is available (potentially from the
 		/// result of an offchain worker), it is immediately used. Otherwise, the on-chain election
 		/// is executed.
+		///
+		/// TWO_PHASE_NOTE: should be removed once we switch to multi-phase.
 		pub QueuedElected get(fn queued_elected): Option<ElectionResult<T::AccountId, BalanceOf<T>>>;
 
 		/// The score of the current [`QueuedElected`].
+		///
+		/// TWO_PHASE_NOTE: should be removed once we switch to multi-phase.
 		pub QueuedScore get(fn queued_score): Option<ElectionScore>;
 
 		/// Flag to control the execution of the offchain election. When `Open(_)`, we accept
 		/// solutions to be submitted.
+		///
+		/// TWO_PHASE_NOTE: should be removed once we switch to multi-phase.
 		pub EraElectionStatus get(fn era_election_status): ElectionStatus<T::BlockNumber>;
 
 		/// True if the current **planned** session is final. Note that this does not take era
 		/// forcing into account.
+		///
+		/// TWO_PHASE_NOTE: should be removed once we switch to multi-phase.
 		pub IsCurrentSessionFinal get(fn is_current_session_final): bool = false;
 
 		/// True if network has been upgraded to this version.
@@ -1345,14 +1376,14 @@ decl_module! {
 									ElectionStatus::<T::BlockNumber>::Open(now)
 								);
 								add_weight(0, 1, 0);
-								log!(info, "💸 Election window is Open({:?}). Snapshot created", now);
+								log!(info, "Election window is Open({:?}). Snapshot created", now);
 							} else {
-								log!(warn, "💸 Failed to create snapshot at {:?}.", now);
+								log!(warn, "Failed to create snapshot at {:?}.", now);
 							}
 						}
 					}
 				} else {
-					log!(warn, "💸 Estimating next session change failed.");
+					log!(warn, "Estimating next session change failed.");
 				}
 				add_weight(0, 0, T::NextNewSession::weight(now))
 			}
@@ -1367,16 +1398,15 @@ decl_module! {
 		/// to open. If so, it runs the offchain worker code.
 		fn offchain_worker(now: T::BlockNumber) {
 			use offchain_election::{set_check_offchain_execution_status, compute_offchain_election};
-
 			if Self::era_election_status().is_open_at(now) {
 				let offchain_status = set_check_offchain_execution_status::<T>(now);
 				if let Err(why) = offchain_status {
-					log!(warn, "💸 skipping offchain worker in open election window due to [{}]", why);
+					log!(warn, "skipping offchain worker in open election window due to [{}]", why);
 				} else {
 					if let Err(e) = compute_offchain_election::<T>() {
-						log!(error, "💸 Error in election offchain worker: {:?}", e);
+						log!(error, "Error in election offchain worker: {:?}", e);
 					} else {
-						log!(debug, "💸 Executed offchain worker thread without errors.");
+						log!(debug, "Executed offchain worker thread without errors.");
 					}
 				}
 			}
@@ -2267,7 +2297,10 @@ impl<T: Config> Module<T> {
 	}
 
 	/// Internal impl of [`Self::slashable_balance_of`] that returns [`VoteWeight`].
-	pub fn slashable_balance_of_vote_weight(stash: &T::AccountId, issuance: BalanceOf<T>) -> VoteWeight {
+	pub fn slashable_balance_of_vote_weight(
+		stash: &T::AccountId,
+		issuance: BalanceOf<T>,
+	) -> VoteWeight {
 		T::CurrencyToVote::to_vote(Self::slashable_balance_of(stash), issuance)
 	}
 
@@ -2306,7 +2339,7 @@ impl<T: Config> Module<T> {
 		{
 			log!(
 				warn,
-				"💸 Snapshot size too big [{} <> {}][{} <> {}].",
+				"Snapshot size too big [{} <> {}][{} <> {}].",
 				num_validators,
 				MAX_VALIDATORS,
 				num_nominators,
@@ -2330,10 +2363,7 @@ impl<T: Config> Module<T> {
 		<SnapshotNominators<T>>::kill();
 	}
 
-	fn do_payout_stakers(
-		validator_stash: T::AccountId,
-		era: EraIndex,
-	) -> DispatchResult {
+	fn do_payout_stakers(validator_stash: T::AccountId, era: EraIndex) -> DispatchResult {
 		// Validate input data
 		let current_era = CurrentEra::get().ok_or(Error::<T>::InvalidEraToReward)?;
 		ensure!(era <= current_era, Error::<T>::InvalidEraToReward);
@@ -2626,7 +2656,7 @@ impl<T: Config> Module<T> {
 			validator_at,
 		).map_err(|e| {
 			// log the error since it is not propagated into the runtime error.
-			log!(warn, "💸 un-compacting solution failed due to {:?}", e);
+			log!(warn, "un-compacting solution failed due to {:?}", e);
 			Error::<T>::OffchainElectionBogusCompact
 		})?;
 
@@ -2641,7 +2671,7 @@ impl<T: Config> Module<T> {
 				// all of the indices must map to either a validator or a nominator. If this is ever
 				// not the case, then the locking system of staking is most likely faulty, or we
 				// have bigger problems.
-				log!(error, "💸 detected an error in the staking locking and snapshot.");
+				log!(error, "detected an error in the staking locking and snapshot.");
 				// abort.
 				return Err(Error::<T>::OffchainElectionBogusNominator.into());
 			}
@@ -2690,7 +2720,7 @@ impl<T: Config> Module<T> {
 		);
 
 		// build the support map thereof in order to evaluate.
-		let supports = to_support_map::<T::AccountId>(&winners, &staked_assignments)
+		let supports = to_supports(&winners, &staked_assignments)
 			.map_err(|_| Error::<T>::OffchainElectionBogusEdge)?;
 
 		// Check if the score is the same as the claimed one.
@@ -2698,10 +2728,11 @@ impl<T: Config> Module<T> {
 		ensure!(submitted_score == claimed_score, Error::<T>::OffchainElectionBogusScore);
 
 		// At last, alles Ok. Exposures and store the result.
-		let exposures = Self::collect_exposure(supports);
+		let exposures = Self::collect_exposures(supports);
 		log!(
 			info,
-			"💸 A better solution (with compute {:?} and score {:?}) has been validated and stored on chain.",
+			"A better solution (with compute {:?} and score {:?}) has been validated and stored \
+			 on chain.",
 			compute,
 			submitted_score,
 		);
@@ -2834,6 +2865,8 @@ impl<T: Config> Module<T> {
 
 		// Set staking information for new era.
 		let maybe_new_validators = Self::select_and_update_validators(current_era);
+		// TWO_PHASE_NOTE: use this later on.
+		let _unused_new_validators = Self::enact_election(current_era);
 
 		maybe_new_validators
 	}
@@ -2901,7 +2934,7 @@ impl<T: Config> Module<T> {
 
 			log!(
 				info,
-				"💸 new validator set of size {:?} has been elected via {:?} for era {:?}",
+				"new validator set of size {:?} has been elected via {:?} for staring era {:?}",
 				elected_stashes.len(),
 				compute,
 				current_era,
@@ -2950,20 +2983,20 @@ impl<T: Config> Module<T> {
 				Self::slashable_balance_of_fn(),
 			);
 
-			let supports = to_support_map::<T::AccountId>(
+			let supports = to_supports(
 				&elected_stashes,
 				&staked_assignments,
 			)
 			.map_err(|_|
 				log!(
 					error,
-					"💸 on-chain phragmen is failing due to a problem in the result. This must be a bug."
+					"on-chain phragmen is failing due to a problem in the result. This must be a bug."
 				)
 			)
 			.ok()?;
 
 			// collect exposures
-			let exposures = Self::collect_exposure(supports);
+			let exposures = Self::collect_exposures(supports);
 
 			// In order to keep the property required by `on_session_ending` that we must return the
 			// new validator set even if it's the same as the old, as long as any underlying
@@ -3025,7 +3058,7 @@ impl<T: Config> Module<T> {
 			// If we don't have enough candidates, nothing to do.
 			log!(
 				warn,
-				"💸 Chain does not have enough staking candidates to operate. Era {:?}.",
+				"chain does not have enough staking candidates to operate. Era {:?}.",
 				Self::current_era()
 			);
 			None
@@ -3041,9 +3074,10 @@ impl<T: Config> Module<T> {
 		}
 	}
 
-	/// Consume a set of [`Supports`] from [`sp_npos_elections`] and collect them into a [`Exposure`]
-	fn collect_exposure(
-		supports: SupportMap<T::AccountId>,
+	/// Consume a set of [`Supports`] from [`sp_npos_elections`] and collect them into a
+	/// [`Exposure`].
+	fn collect_exposures(
+		supports: Supports<T::AccountId>,
 	) -> Vec<(T::AccountId, Exposure<T::AccountId, BalanceOf<T>>)> {
 		let total_issuance = T::Currency::total_issuance();
 		let to_currency = |e: ExtendedBalance| T::CurrencyToVote::to_currency(e, total_issuance);
@@ -3075,6 +3109,80 @@ impl<T: Config> Module<T> {
 		}).collect::<Vec<(T::AccountId, Exposure<_, _>)>>()
 	}
 
+	/// Process the output of the election.
+	///
+	/// This ensures enough validators have been elected, converts all supports to exposures and
+	/// writes them to the associated storage.
+	///
+	/// Returns `Err(())` if less than [`MinimumValidatorCount`] validators have been elected, `Ok`
+	/// otherwise.
+	// TWO_PHASE_NOTE: remove the dead code.
+	#[allow(dead_code)]
+	pub fn process_election(
+		flat_supports: sp_npos_elections::Supports<T::AccountId>,
+		current_era: EraIndex,
+	) -> Result<Vec<T::AccountId>, ()> {
+		let exposures = Self::collect_exposures(flat_supports);
+		let elected_stashes = exposures.iter().cloned().map(|(x, _)| x).collect::<Vec<_>>();
+
+		if (elected_stashes.len() as u32) <= Self::minimum_validator_count() {
+			log!(
+				warn,
+				"chain does not have enough staking candidates to operate for era {:?}",
+				current_era,
+			);
+			return Err(());
+		}
+
+		// Populate Stakers and write slot stake.
+		let mut total_stake: BalanceOf<T> = Zero::zero();
+		exposures.into_iter().for_each(|(stash, exposure)| {
+			total_stake = total_stake.saturating_add(exposure.total);
+			<ErasStakers<T>>::insert(current_era, &stash, &exposure);
+
+			let mut exposure_clipped = exposure;
+			let clipped_max_len = T::MaxNominatorRewardedPerValidator::get() as usize;
+			if exposure_clipped.others.len() > clipped_max_len {
+				exposure_clipped.others.sort_by(|a, b| a.value.cmp(&b.value).reverse());
+				exposure_clipped.others.truncate(clipped_max_len);
+			}
+			<ErasStakersClipped<T>>::insert(&current_era, &stash, exposure_clipped);
+		});
+
+		// Insert current era staking information
+		<ErasTotalStake<T>>::insert(&current_era, total_stake);
+
+		// collect the pref of all winners
+		for stash in &elected_stashes {
+			let pref = Self::validators(stash);
+			<ErasValidatorPrefs<T>>::insert(&current_era, stash, pref);
+		}
+
+		// emit event
+		// TWO_PHASE_NOTE: remove the inner value.
+		Self::deposit_event(RawEvent::StakingElection(ElectionCompute::Signed));
+
+		log!(
+			info,
+			"new validator set of size {:?} has been processed for era {:?}",
+			elected_stashes.len(),
+			current_era,
+		);
+
+		Ok(elected_stashes)
+	}
+
+	/// Enact and process the election using the `ElectionProvider` type.
+	///
+	/// This will also process the election, as noted in [`process_election`].
+	fn enact_election(_current_era: EraIndex) -> Option<Vec<T::AccountId>> {
+		let _outcome = T::ElectionProvider::elect().map(|_| ());
+		log!(debug, "Experimental election provider outputted {:?}", _outcome);
+		// TWO_PHASE_NOTE: This code path shall not return anything for now. Later on, redirect the
+		// results to `process_election`.
+		None
+	}
+
 	/// Remove all associated data of a stash account from the staking system.
 	///
 	/// Assumes storage is upgraded before calling.
@@ -3167,7 +3275,11 @@ impl<T: Config> Module<T> {
 	}
 
 	#[cfg(feature = "runtime-benchmarks")]
-	pub fn add_era_stakers(current_era: EraIndex, controller: T::AccountId, exposure: Exposure<T::AccountId, BalanceOf<T>>) {
+	pub fn add_era_stakers(
+		current_era: EraIndex,
+		controller: T::AccountId,
+		exposure: Exposure<T::AccountId, BalanceOf<T>>,
+	) {
 		<ErasStakers<T>>::insert(&current_era, &controller, &exposure);
 	}
 
@@ -3180,6 +3292,109 @@ impl<T: Config> Module<T> {
 	pub fn set_slash_reward_fraction(fraction: Perbill) {
 		SlashRewardFraction::put(fraction);
 	}
+
+	/// Get all of the voters that are eligible for the npos election.
+	///
+	/// This will use all on-chain nominators, and all the validators will inject a self vote.
+	///
+	/// ### Slashing
+	///
+	/// All nominations that have been submitted before the last non-zero slash of the validator are
+	/// auto-chilled.
+	///
+	/// Note that this is VERY expensive. Use with care.
+	pub fn get_npos_voters() -> Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)> {
+		let weight_of = Self::slashable_balance_of_fn();
+		let mut all_voters = Vec::new();
+
+		for (validator, _) in <Validators<T>>::iter() {
+			// append self vote
+			let self_vote = (validator.clone(), weight_of(&validator), vec![validator.clone()]);
+			all_voters.push(self_vote);
+		}
+
+		for (nominator, nominations) in <Nominators<T>>::iter() {
+			let Nominations { submitted_in, mut targets, suppressed: _ } = nominations;
+
+			// Filter out nomination targets which were nominated before the most recent
+			// slashing span.
+			targets.retain(|stash| {
+				Self::slashing_spans(&stash)
+					.map_or(true, |spans| submitted_in >= spans.last_nonzero_slash())
+			});
+
+			let vote_weight = weight_of(&nominator);
+			all_voters.push((nominator, vote_weight, targets))
+		}
+
+		all_voters
+	}
+
+	pub fn get_npos_targets() -> Vec<T::AccountId> {
+		<Validators<T>>::iter().map(|(v, _)| v).collect::<Vec<_>>()
+	}
+}
+
+impl<T: Config> sp_election_providers::ElectionDataProvider<T::AccountId, T::BlockNumber>
+	for Module<T>
+{
+	fn desired_targets() -> u32 {
+		Self::validator_count()
+	}
+
+	fn voters() -> Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)> {
+		Self::get_npos_voters()
+	}
+
+	fn targets() -> Vec<T::AccountId> {
+		Self::get_npos_targets()
+	}
+
+	fn next_election_prediction(now: T::BlockNumber) -> T::BlockNumber {
+		let current_era = Self::current_era().unwrap_or(0);
+		let current_session = Self::current_planned_session();
+		let current_era_start_session_index =
+			Self::eras_start_session_index(current_era).unwrap_or(0);
+		let era_length = current_session
+			.saturating_sub(current_era_start_session_index)
+			.min(T::SessionsPerEra::get());
+
+		let session_length = T::NextNewSession::average_session_length();
+
+		let until_this_session_end = T::NextNewSession::estimate_next_new_session(now)
+			.unwrap_or_default()
+			.saturating_sub(now);
+
+		let sessions_left: T::BlockNumber = T::SessionsPerEra::get()
+			.saturating_sub(era_length)
+			// one session is computed in this_session_end.
+			.saturating_sub(1)
+			.into();
+
+		now.saturating_add(
+			until_this_session_end.saturating_add(sessions_left.saturating_mul(session_length)),
+		)
+	}
+
+	#[cfg(any(feature = "runtime-benchmarks", test))]
+	fn put_snapshot(
+		voters: Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)>,
+		targets: Vec<T::AccountId>,
+	) {
+		targets.into_iter().for_each(|v| {
+			<Validators<T>>::insert(
+				v,
+				ValidatorPrefs { commission: Perbill::zero(), blocked: false },
+			);
+		});
+
+		voters.into_iter().for_each(|(v, _s, t)| {
+			<Nominators<T>>::insert(
+				v,
+				Nominations { targets: t, submitted_in: 0, suppressed: false },
+			);
+		});
+	}
 }
 
 /// In this implementation `new_session(session)` must be called before `end_session(session-1)`
@@ -3195,6 +3410,7 @@ impl<T: Config> pallet_session::SessionManager<T::AccountId> for Module<T> {
 			<frame_system::Module<T>>::block_number(),
 			new_index
 		);
+		CurrentPlannedSession::put(new_index);
 		Self::new_session(new_index)
 	}
 	fn start_session(start_index: SessionIndex) {
@@ -3217,10 +3433,12 @@ impl<T: Config> pallet_session::SessionManager<T::AccountId> for Module<T> {
 	}
 }
 
-impl<T: Config> historical::SessionManager<T::AccountId, Exposure<T::AccountId, BalanceOf<T>>> for Module<T> {
-	fn new_session(new_index: SessionIndex)
-		-> Option<Vec<(T::AccountId, Exposure<T::AccountId, BalanceOf<T>>)>>
-	{
+impl<T: Config> historical::SessionManager<T::AccountId, Exposure<T::AccountId, BalanceOf<T>>>
+	for Module<T>
+{
+	fn new_session(
+		new_index: SessionIndex,
+	) -> Option<Vec<(T::AccountId, Exposure<T::AccountId, BalanceOf<T>>)>> {
 		<Self as pallet_session::SessionManager<_>>::new_session(new_index).map(|validators| {
 			let current_era = Self::current_era()
 				// Must be some as a new era has been created.
@@ -3245,8 +3463,8 @@ impl<T: Config> historical::SessionManager<T::AccountId, Exposure<T::AccountId,
 /// * 2 points to the block producer for each reference to a previously unreferenced uncle, and
 /// * 1 point to the producer of each referenced uncle block.
 impl<T> pallet_authorship::EventHandler<T::AccountId, T::BlockNumber> for Module<T>
-	where
-		T: Config + pallet_authorship::Config + pallet_session::Config
+where
+	T: Config + pallet_authorship::Config + pallet_session::Config,
 {
 	fn note_author(author: T::AccountId) {
 		Self::reward_by_ids(vec![(author, 20)])
@@ -3289,9 +3507,10 @@ impl<T: Config> Convert<T::AccountId, Option<Exposure<T::AccountId, BalanceOf<T>
 }
 
 /// This is intended to be used with `FilterHistoricalOffences`.
-impl <T: Config>
+impl<T: Config>
 	OnOffenceHandler<T::AccountId, pallet_session::historical::IdentificationTuple<T>, Weight>
-for Module<T> where
+	for Module<T>
+where
 	T: pallet_session::Config<ValidatorId = <T as frame_system::Config>::AccountId>,
 	T: pallet_session::historical::Config<
 		FullIdentification = Exposure<<T as frame_system::Config>::AccountId, BalanceOf<T>>,
@@ -3305,12 +3524,15 @@ for Module<T> where
 	>,
 {
 	fn on_offence(
-		offenders: &[OffenceDetails<T::AccountId, pallet_session::historical::IdentificationTuple<T>>],
+		offenders: &[OffenceDetails<
+			T::AccountId,
+			pallet_session::historical::IdentificationTuple<T>,
+		>],
 		slash_fraction: &[Perbill],
 		slash_session: SessionIndex,
 	) -> Result<Weight, ()> {
 		if !Self::can_report() {
-			return Err(())
+			return Err(());
 		}
 
 		let reward_proportion = SlashRewardFraction::get();
@@ -3421,6 +3643,7 @@ for Module<T> where
 	}
 
 	fn can_report() -> bool {
+		// TWO_PHASE_NOTE: we can get rid of this API
 		Self::era_election_status().is_closed()
 	}
 }
@@ -3431,7 +3654,8 @@ pub struct FilterHistoricalOffences<T, R> {
 }
 
 impl<T, Reporter, Offender, R, O> ReportOffence<Reporter, Offender, O>
-	for FilterHistoricalOffences<Module<T>, R> where
+	for FilterHistoricalOffences<Module<T>, R>
+where
 	T: Config,
 	R: ReportOffence<Reporter, Offender, O>,
 	O: Offence<Offender>,
@@ -3488,7 +3712,7 @@ impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
 				return invalid.into();
 			}
 
-			log!(debug, "💸 validateUnsigned succeeded for a solution at era {}.", era);
+			log!(debug, "validateUnsigned succeeded for a solution at era {}.", era);
 
 			ValidTransaction::with_tag_prefix("StakingOffchain")
 				// The higher the score[0], the better a solution is.
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index 0eb77e7c14ac..0d6701c48b89 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -28,7 +28,7 @@ use frame_support::{
 use sp_core::H256;
 use sp_io;
 use sp_npos_elections::{
-	to_support_map, EvaluateSupport, reduce, ExtendedBalance, StakedAssignment, ElectionScore,
+	to_supports, reduce, ExtendedBalance, StakedAssignment, ElectionScore, EvaluateSupport,
 };
 use sp_runtime::{
 	curve::PiecewiseLinear,
@@ -37,6 +37,7 @@ use sp_runtime::{
 };
 use sp_staking::offence::{OffenceDetails, OnOffenceHandler};
 use std::{cell::RefCell, collections::HashSet};
+use sp_election_providers::onchain;
 
 pub const INIT_TIMESTAMP: u64 = 30_000;
 pub const BLOCK_TIME: u64 = 1000;
@@ -239,6 +240,12 @@ impl OnUnbalanced<NegativeImbalanceOf<Test>> for RewardRemainderMock {
 	}
 }
 
+impl onchain::Config for Test {
+	type AccountId = AccountId;
+	type BlockNumber = BlockNumber;
+	type Accuracy = Perbill;
+	type DataProvider = Staking;
+}
 impl Config for Test {
 	type Currency = Balances;
 	type UnixTime = Timestamp;
@@ -261,6 +268,7 @@ impl Config for Test {
 	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
 	type UnsignedPriority = UnsignedPriority;
 	type OffchainSolutionWeightLimit = OffchainSolutionWeightLimit;
+	type ElectionProvider = onchain::OnChainSequentialPhragmen<Self>;
 	type WeightInfo = ();
 }
 
@@ -760,7 +768,7 @@ pub(crate) fn add_slash(who: &AccountId) {
 	on_offence_now(
 		&[
 			OffenceDetails {
-				offender: (who.clone(), Staking::eras_stakers(Staking::active_era().unwrap().index, who.clone())),
+				offender: (who.clone(), Staking::eras_stakers(active_era(), who.clone())),
 				reporters: vec![],
 			},
 		],
@@ -841,7 +849,7 @@ pub(crate) fn horrible_npos_solution(
 	let score = {
 		let (_, _, better_score) = prepare_submission_with(true, true, 0, |_| {});
 
-		let support = to_support_map::<AccountId>(&winners, &staked_assignment).unwrap();
+		let support = to_supports::<AccountId>(&winners, &staked_assignment).unwrap();
 		let score = support.evaluate();
 
 		assert!(sp_npos_elections::is_score_better::<Perbill>(
@@ -941,7 +949,7 @@ pub(crate) fn prepare_submission_with(
 			Staking::slashable_balance_of_fn(),
 		);
 
-		let support_map = to_support_map::<AccountId>(
+		let support_map = to_supports(
 			winners.as_slice(),
 			staked.as_slice(),
 		).unwrap();
@@ -962,9 +970,8 @@ pub(crate) fn prepare_submission_with(
 
 /// Make all validator and nominator request their payment
 pub(crate) fn make_all_reward_payment(era: EraIndex) {
-	let validators_with_reward = ErasRewardPoints::<Test>::get(era).individual.keys()
-		.cloned()
-		.collect::<Vec<_>>();
+	let validators_with_reward =
+		ErasRewardPoints::<Test>::get(era).individual.keys().cloned().collect::<Vec<_>>();
 
 	// reward validators
 	for validator_controller in validators_with_reward.iter().filter_map(Staking::bonded) {
@@ -988,10 +995,10 @@ macro_rules! assert_session_era {
 			$session,
 		);
 		assert_eq!(
-			Staking::active_era().unwrap().index,
+			Staking::current_era().unwrap(),
 			$era,
-			"wrong active era {} != {}",
-			Staking::active_era().unwrap().index,
+			"wrong current era {} != {}",
+			Staking::current_era().unwrap(),
 			$era,
 		);
 	};
diff --git a/frame/staking/src/offchain_election.rs b/frame/staking/src/offchain_election.rs
index 4f80d75086e7..8398c2022fc3 100644
--- a/frame/staking/src/offchain_election.rs
+++ b/frame/staking/src/offchain_election.rs
@@ -25,7 +25,7 @@ use codec::Decode;
 use frame_support::{traits::Get, weights::Weight, IterableStorageMap};
 use frame_system::offchain::SubmitTransaction;
 use sp_npos_elections::{
-	to_support_map, EvaluateSupport, reduce, Assignment, ElectionResult, ElectionScore,
+	to_supports, EvaluateSupport, reduce, Assignment, ElectionResult, ElectionScore,
 	ExtendedBalance, CompactSolution,
 };
 use sp_runtime::{
@@ -127,7 +127,7 @@ pub(crate) fn compute_offchain_election<T: Config>() -> Result<(), OffchainElect
 
 	crate::log!(
 		info,
-		"💸 prepared a seq-phragmen solution with {} balancing iterations and score {:?}",
+		"prepared a seq-phragmen solution with {} balancing iterations and score {:?}",
 		iters,
 		score,
 	);
@@ -284,7 +284,7 @@ where
 				if compact.remove_voter(index) {
 					crate::log!(
 						trace,
-						"💸 removed a voter at index {} with stake {:?} from compact to reduce the size",
+						"removed a voter at index {} with stake {:?} from compact to reduce the size",
 						index,
 						_stake,
 					);
@@ -297,19 +297,17 @@ where
 			}
 
 			crate::log!(
-					warn,
-					"💸 {} nominators out of {} had to be removed from compact solution due to size limits.",
-					removed,
-					compact.voter_count() + removed,
-				);
+				warn,
+				"{} nominators out of {} had to be removed from compact solution due to size \
+				 limits.",
+				removed,
+				compact.voter_count() + removed,
+			);
 			Ok(compact)
 		}
 		_ => {
 			// nada, return as-is
-			crate::log!(
-				info,
-				"💸 Compact solution did not get trimmed due to block weight limits.",
-			);
+			crate::log!(info, "Compact solution did not get trimmed due to block weight limits.",);
 			Ok(compact)
 		}
 	}
@@ -390,13 +388,16 @@ pub fn prepare_submission<T: Config>(
 	let maximum_allowed_voters =
 		maximum_compact_len::<T::WeightInfo>(winners.len() as u32, size, maximum_weight);
 
-	crate::log!(debug, "💸 Maximum weight = {:?} // current weight = {:?} // maximum voters = {:?} // current votes = {:?}",
+	crate::log!(
+		debug,
+		"Maximum weight = {:?} // current weight = {:?} // maximum voters = {:?} // current votes \
+		 = {:?}",
 		maximum_weight,
 		T::WeightInfo::submit_solution_better(
-				size.validators.into(),
-				size.nominators.into(),
-				compact.voter_count() as u32,
-				winners.len() as u32,
+			size.validators.into(),
+			size.nominators.into(),
+			compact.voter_count() as u32,
+			winners.len() as u32,
 		),
 		maximum_allowed_voters,
 		compact.voter_count(),
@@ -415,7 +416,7 @@ pub fn prepare_submission<T: Config>(
 			<Module<T>>::slashable_balance_of_fn(),
 		);
 
-		let support_map = to_support_map::<T::AccountId>(&winners, &staked)
+		let support_map = to_supports::<T::AccountId>(&winners, &staked)
 			.map_err(|_| OffchainElectionError::ElectionFailed)?;
 		support_map.evaluate()
 	};
diff --git a/frame/staking/src/testing_utils.rs b/frame/staking/src/testing_utils.rs
index a30c0136550b..f6ee89704d8d 100644
--- a/frame/staking/src/testing_utils.rs
+++ b/frame/staking/src/testing_utils.rs
@@ -247,7 +247,7 @@ pub fn get_weak_solution<T: Config>(
 		);
 
 		let support_map =
-			to_support_map::<T::AccountId>(winners.as_slice(), staked.as_slice()).unwrap();
+			to_supports::<T::AccountId>(winners.as_slice(), staked.as_slice()).unwrap();
 		support_map.evaluate()
 	};
 
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index e5781fe8480c..529cd7b87cab 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -1833,6 +1833,7 @@ fn bond_with_duplicate_vote_should_be_ignored_by_npos_election() {
 			}
 
 			assert_ok!(Staking::bond(Origin::signed(1), 2, 1000, RewardDestination::Controller));
+			// 11 should not be elected. All of these count as ONE vote.
 			assert_ok!(Staking::nominate(Origin::signed(2), vec![11, 11, 11, 21, 31,]));
 
 			assert_ok!(Staking::bond(Origin::signed(3), 4, 1000, RewardDestination::Controller));
@@ -1886,7 +1887,6 @@ fn bond_with_duplicate_vote_should_be_ignored_by_npos_election_elected() {
 			assert_ok!(Staking::nominate(Origin::signed(4), vec![21, 31]));
 
 			// winners should be 21 and 31. Otherwise this election is taking duplicates into account.
-
 			let sp_npos_elections::ElectionResult {
 				winners,
 				assignments,
@@ -2029,7 +2029,7 @@ fn reward_from_authorship_event_handler_works() {
 fn add_reward_points_fns_works() {
 	ExtBuilder::default().build_and_execute(|| {
 		// Not mandatory but must be coherent with rewards
-		assert_eq!(Session::validators(), vec![21, 11]);
+		assert_eq_uvec!(Session::validators(), vec![21, 11]);
 
 		<Module<Test>>::reward_by_ids(vec![
 			(21, 1),
@@ -3048,7 +3048,7 @@ mod offchain_election {
 				assert_eq!(Staking::era_election_status(), ElectionStatus::Open(37));
 
 				run_to_block(40);
-				assert_session_era!(4, 0);
+				assert_session_era!(4, 1);
 				assert_eq!(Staking::era_election_status(), ElectionStatus::Closed);
 				assert!(Staking::snapshot_nominators().is_none());
 				assert!(Staking::snapshot_validators().is_none());
@@ -3066,7 +3066,7 @@ mod offchain_election {
 				assert!(Staking::snapshot_validators().is_some());
 
 				run_to_block(90);
-				assert_session_era!(9, 1);
+				assert_session_era!(9, 2);
 				assert_eq!(Staking::era_election_status(), ElectionStatus::Closed);
 				assert!(Staking::snapshot_nominators().is_none());
 				assert!(Staking::snapshot_validators().is_none());
@@ -5015,3 +5015,92 @@ fn do_not_die_when_active_is_ed() {
 			);
 		})
 }
+
+mod election_data_provider {
+	use super::*;
+	use sp_election_providers::ElectionDataProvider;
+
+	#[test]
+	fn voters_include_self_vote() {
+		ExtBuilder::default().nominate(false).build().execute_with(|| {
+			assert!(<Validators<Test>>::iter().map(|(x, _)| x).all(|v| Staking::voters()
+				.into_iter()
+				.find(|(w, _, t)| { v == *w && t[0] == *w })
+				.is_some()))
+		})
+	}
+
+	#[test]
+	fn voters_exclude_slashed() {
+		ExtBuilder::default().build().execute_with(|| {
+			assert_eq!(Staking::nominators(101).unwrap().targets, vec![11, 21]);
+			assert_eq!(
+				<Staking as ElectionDataProvider<AccountId, BlockNumber>>::voters()
+					.iter()
+					.find(|x| x.0 == 101)
+					.unwrap()
+					.2,
+				vec![11, 21]
+			);
+
+			start_active_era(1);
+			add_slash(&11);
+
+			// 11 is gone.
+			start_active_era(2);
+			assert_eq!(
+				<Staking as ElectionDataProvider<AccountId, BlockNumber>>::voters()
+					.iter()
+					.find(|x| x.0 == 101)
+					.unwrap()
+					.2,
+				vec![21]
+			);
+
+			// resubmit and it is back
+			assert_ok!(Staking::nominate(Origin::signed(100), vec![11, 21]));
+			assert_eq!(
+				<Staking as ElectionDataProvider<AccountId, BlockNumber>>::voters()
+					.iter()
+					.find(|x| x.0 == 101)
+					.unwrap()
+					.2,
+				vec![11, 21]
+			);
+		})
+	}
+
+	#[test]
+	fn estimate_next_election_works() {
+		ExtBuilder::default().session_per_era(5).period(5).build().execute_with(|| {
+			// first session is always length 0.
+			for b in 1..20 {
+				run_to_block(b);
+				assert_eq!(Staking::next_election_prediction(System::block_number()), 20);
+			}
+
+			// election
+			run_to_block(20);
+			assert_eq!(Staking::next_election_prediction(System::block_number()), 45);
+			assert_eq!(staking_events().len(), 1);
+			assert_eq!(
+				*staking_events().last().unwrap(),
+				RawEvent::StakingElection(ElectionCompute::OnChain)
+			);
+
+			for b in 21..45 {
+				run_to_block(b);
+				assert_eq!(Staking::next_election_prediction(System::block_number()), 45);
+			}
+
+			// election
+			run_to_block(45);
+			assert_eq!(Staking::next_election_prediction(System::block_number()), 70);
+			assert_eq!(staking_events().len(), 3);
+			assert_eq!(
+				*staking_events().last().unwrap(),
+				RawEvent::StakingElection(ElectionCompute::OnChain)
+			);
+		})
+	}
+}
diff --git a/frame/staking/src/weights.rs b/frame/staking/src/weights.rs
index b70563ccf41b..c7b7edad5518 100644
--- a/frame/staking/src/weights.rs
+++ b/frame/staking/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_staking
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.1
-//! DATE: 2021-01-19, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-02-13, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -75,171 +75,171 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn bond() -> Weight {
-		(76_281_000 as Weight)
+		(81_642_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn bond_extra() -> Weight {
-		(62_062_000 as Weight)
+		(66_025_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn unbond() -> Weight {
-		(57_195_000 as Weight)
+		(60_810_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn withdraw_unbonded_update(s: u32, ) -> Weight {
-		(58_043_000 as Weight)
+		(61_537_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((52_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((60_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
-		(89_920_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((2_526_000 as Weight).saturating_mul(s as Weight))
+		(95_741_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((2_754_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes(8 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn validate() -> Weight {
-		(20_228_000 as Weight)
+		(21_009_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn kick(k: u32, ) -> Weight {
-		(31_066_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((17_754_000 as Weight).saturating_mul(k as Weight))
+		(31_832_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((19_418_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(k as Weight)))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn nominate(n: u32, ) -> Weight {
-		(33_494_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((5_253_000 as Weight).saturating_mul(n as Weight))
+		(34_304_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((5_643_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn chill() -> Weight {
-		(19_396_000 as Weight)
+		(20_103_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn set_payee() -> Weight {
-		(13_449_000 as Weight)
+		(13_858_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_controller() -> Weight {
-		(29_184_000 as Weight)
+		(30_269_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn set_validator_count() -> Weight {
-		(2_266_000 as Weight)
+		(2_444_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_no_eras() -> Weight {
-		(2_462_000 as Weight)
+		(2_766_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_new_era() -> Weight {
-		(2_483_000 as Weight)
+		(2_724_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_new_era_always() -> Weight {
-		(2_495_000 as Weight)
+		(2_702_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_invulnerables(v: u32, ) -> Weight {
-		(2_712_000 as Weight)
+		(2_914_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((9_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((35_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_unstake(s: u32, ) -> Weight {
-		(60_508_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((2_525_000 as Weight).saturating_mul(s as Weight))
+		(64_032_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((2_787_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(8 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn cancel_deferred_slash(s: u32, ) -> Weight {
-		(5_886_772_000 as Weight)
-			// Standard Error: 393_000
-			.saturating_add((34_849_000 as Weight).saturating_mul(s as Weight))
+		(5_903_394_000 as Weight)
+			// Standard Error: 391_000
+			.saturating_add((34_834_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn payout_stakers_dead_controller(n: u32, ) -> Weight {
-		(127_627_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((49_354_000 as Weight).saturating_mul(n as Weight))
+		(141_724_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((53_018_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(11 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(n as Weight)))
 	}
 	fn payout_stakers_alive_staked(n: u32, ) -> Weight {
-		(156_838_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((62_653_000 as Weight).saturating_mul(n as Weight))
+		(159_994_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((67_746_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(12 as Weight))
 			.saturating_add(T::DbWeight::get().reads((5 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(n as Weight)))
 	}
 	fn rebond(l: u32, ) -> Weight {
-		(40_110_000 as Weight)
+		(42_177_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((78_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add((82_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn set_history_depth(e: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 70_000
-			.saturating_add((32_883_000 as Weight).saturating_mul(e as Weight))
+			// Standard Error: 65_000
+			.saturating_add((34_151_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes((7 as Weight).saturating_mul(e as Weight)))
 	}
 	fn reap_stash(s: u32, ) -> Weight {
-		(64_605_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((2_506_000 as Weight).saturating_mul(s as Weight))
+		(68_377_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_757_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(8 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn new_era(v: u32, n: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 926_000
-			.saturating_add((548_212_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 46_000
-			.saturating_add((78_343_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(7 as Weight))
+			// Standard Error: 908_000
+			.saturating_add((588_562_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 45_000
+			.saturating_add((83_485_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(9 as Weight))
 			.saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
-			.saturating_add(T::DbWeight::get().writes(8 as Weight))
+			.saturating_add(T::DbWeight::get().writes(13 as Weight))
 			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(v as Weight)))
 	}
 	fn submit_solution_better(v: u32, n: u32, a: u32, w: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 48_000
-			.saturating_add((937_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 19_000
-			.saturating_add((657_000 as Weight).saturating_mul(n as Weight))
-			// Standard Error: 48_000
-			.saturating_add((70_669_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 101_000
-			.saturating_add((7_658_000 as Weight).saturating_mul(w as Weight))
+			// Standard Error: 52_000
+			.saturating_add((750_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 20_000
+			.saturating_add((556_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 52_000
+			.saturating_add((76_201_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 108_000
+			.saturating_add((7_271_000 as Weight).saturating_mul(w as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(a as Weight)))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(w as Weight)))
@@ -250,171 +250,171 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn bond() -> Weight {
-		(76_281_000 as Weight)
+		(81_642_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn bond_extra() -> Weight {
-		(62_062_000 as Weight)
+		(66_025_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn unbond() -> Weight {
-		(57_195_000 as Weight)
+		(60_810_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn withdraw_unbonded_update(s: u32, ) -> Weight {
-		(58_043_000 as Weight)
+		(61_537_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((52_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((60_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
-		(89_920_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((2_526_000 as Weight).saturating_mul(s as Weight))
+		(95_741_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((2_754_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn validate() -> Weight {
-		(20_228_000 as Weight)
+		(21_009_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn kick(k: u32, ) -> Weight {
-		(31_066_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((17_754_000 as Weight).saturating_mul(k as Weight))
+		(31_832_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((19_418_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(k as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn nominate(n: u32, ) -> Weight {
-		(33_494_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((5_253_000 as Weight).saturating_mul(n as Weight))
+		(34_304_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((5_643_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn chill() -> Weight {
-		(19_396_000 as Weight)
+		(20_103_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn set_payee() -> Weight {
-		(13_449_000 as Weight)
+		(13_858_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_controller() -> Weight {
-		(29_184_000 as Weight)
+		(30_269_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn set_validator_count() -> Weight {
-		(2_266_000 as Weight)
+		(2_444_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_no_eras() -> Weight {
-		(2_462_000 as Weight)
+		(2_766_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_new_era() -> Weight {
-		(2_483_000 as Weight)
+		(2_724_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_new_era_always() -> Weight {
-		(2_495_000 as Weight)
+		(2_702_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_invulnerables(v: u32, ) -> Weight {
-		(2_712_000 as Weight)
+		(2_914_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((9_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((35_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_unstake(s: u32, ) -> Weight {
-		(60_508_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((2_525_000 as Weight).saturating_mul(s as Weight))
+		(64_032_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((2_787_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn cancel_deferred_slash(s: u32, ) -> Weight {
-		(5_886_772_000 as Weight)
-			// Standard Error: 393_000
-			.saturating_add((34_849_000 as Weight).saturating_mul(s as Weight))
+		(5_903_394_000 as Weight)
+			// Standard Error: 391_000
+			.saturating_add((34_834_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn payout_stakers_dead_controller(n: u32, ) -> Weight {
-		(127_627_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((49_354_000 as Weight).saturating_mul(n as Weight))
+		(141_724_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((53_018_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(11 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(n as Weight)))
 	}
 	fn payout_stakers_alive_staked(n: u32, ) -> Weight {
-		(156_838_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((62_653_000 as Weight).saturating_mul(n as Weight))
+		(159_994_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((67_746_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(12 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((5 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(n as Weight)))
 	}
 	fn rebond(l: u32, ) -> Weight {
-		(40_110_000 as Weight)
+		(42_177_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((78_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add((82_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn set_history_depth(e: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 70_000
-			.saturating_add((32_883_000 as Weight).saturating_mul(e as Weight))
+			// Standard Error: 65_000
+			.saturating_add((34_151_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((7 as Weight).saturating_mul(e as Weight)))
 	}
 	fn reap_stash(s: u32, ) -> Weight {
-		(64_605_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((2_506_000 as Weight).saturating_mul(s as Weight))
+		(68_377_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_757_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn new_era(v: u32, n: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 926_000
-			.saturating_add((548_212_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 46_000
-			.saturating_add((78_343_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
+			// Standard Error: 908_000
+			.saturating_add((588_562_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 45_000
+			.saturating_add((83_485_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(9 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((4 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
-			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(13 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(v as Weight)))
 	}
 	fn submit_solution_better(v: u32, n: u32, a: u32, w: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 48_000
-			.saturating_add((937_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 19_000
-			.saturating_add((657_000 as Weight).saturating_mul(n as Weight))
-			// Standard Error: 48_000
-			.saturating_add((70_669_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 101_000
-			.saturating_add((7_658_000 as Weight).saturating_mul(w as Weight))
+			// Standard Error: 52_000
+			.saturating_add((750_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 20_000
+			.saturating_add((556_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 52_000
+			.saturating_add((76_201_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 108_000
+			.saturating_add((7_271_000 as Weight).saturating_mul(w as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((4 as Weight).saturating_mul(a as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(w as Weight)))
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index 602bc1aa1a69..4114afa973cb 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -490,10 +490,16 @@ impl<
 	}
 }
 
-/// Something that can estimate at which block the next session rotation will happen. This should
-/// be the same logical unit that dictates `ShouldEndSession` to the session module. No Assumptions
-/// are made about the scheduling of the sessions.
+/// Something that can estimate at which block the next session rotation will happen.
+///
+/// This should be the same logical unit that dictates `ShouldEndSession` to the session module. No
+/// Assumptions are made about the scheduling of the sessions.
 pub trait EstimateNextSessionRotation<BlockNumber> {
+	/// Return the average length of a session.
+	///
+	/// This may or may not be accurate.
+	fn average_session_length() -> BlockNumber;
+
 	/// Return the block number at which the next session rotation is estimated to happen.
 	///
 	/// None should be returned if the estimation fails to come to an answer
@@ -503,7 +509,11 @@ pub trait EstimateNextSessionRotation<BlockNumber> {
 	fn weight(now: BlockNumber) -> Weight;
 }
 
-impl<BlockNumber: Bounded> EstimateNextSessionRotation<BlockNumber> for () {
+impl<BlockNumber: Bounded + Default> EstimateNextSessionRotation<BlockNumber> for () {
+	fn average_session_length() -> BlockNumber {
+		Default::default()
+	}
+
 	fn estimate_next_session_rotation(_: BlockNumber) -> Option<BlockNumber> {
 		Default::default()
 	}
@@ -513,9 +523,15 @@ impl<BlockNumber: Bounded> EstimateNextSessionRotation<BlockNumber> for () {
 	}
 }
 
-/// Something that can estimate at which block the next `new_session` will be triggered. This must
-/// always be implemented by the session module.
+/// Something that can estimate at which block the next `new_session` will be triggered.
+///
+/// This must always be implemented by the session module.
 pub trait EstimateNextNewSession<BlockNumber> {
+	/// Return the average length of a session.
+	///
+	/// This may or may not be accurate.
+	fn average_session_length() -> BlockNumber;
+
 	/// Return the block number at which the next new session is estimated to happen.
 	fn estimate_next_new_session(now: BlockNumber) -> Option<BlockNumber>;
 
@@ -523,7 +539,11 @@ pub trait EstimateNextNewSession<BlockNumber> {
 	fn weight(now: BlockNumber) -> Weight;
 }
 
-impl<BlockNumber: Bounded> EstimateNextNewSession<BlockNumber> for () {
+impl<BlockNumber: Bounded + Default> EstimateNextNewSession<BlockNumber> for () {
+	fn average_session_length() -> BlockNumber {
+		Default::default()
+	}
+
 	fn estimate_next_new_session(_: BlockNumber) -> Option<BlockNumber> {
 		Default::default()
 	}

From ad8c585d1c1704b534a92c49e0700080c9d8e13d Mon Sep 17 00:00:00 2001
From: Martin Pugh <pugh@s3kr.it>
Date: Tue, 23 Feb 2021 18:37:17 +0100
Subject: [PATCH 0426/1194] Remove suicide from frame_system weights (#8184)

* remove suicide from frame_system weights

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=frame_system --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/system/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Update frame/system/src/weights.rs

Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 frame/system/src/weights.rs | 53 ++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/frame/system/src/weights.rs b/frame/system/src/weights.rs
index ae96659417bc..823e4b7d1e0d 100644
--- a/frame/system/src/weights.rs
+++ b/frame/system/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Weights for frame_system
+//! Autogenerated weights for frame_system
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-28, STEPS: \[50, \], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-02-23, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -50,74 +50,73 @@ pub trait WeightInfo {
 	fn set_storage(i: u32, ) -> Weight;
 	fn kill_storage(i: u32, ) -> Weight;
 	fn kill_prefix(p: u32, ) -> Weight;
-	fn suicide() -> Weight;
 }
 
 /// Weights for frame_system using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: crate::Config> WeightInfo for SubstrateWeight<T> {
 	fn remark(_b: u32, ) -> Weight {
-		(1_973_000 as Weight)
+		(1_279_000 as Weight)
 	}
 	fn set_heap_pages() -> Weight {
-		(2_816_000 as Weight)
+		(2_167_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_changes_trie_config() -> Weight {
-		(11_539_000 as Weight)
+		(10_117_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn set_storage(i: u32, ) -> Weight {
 		(0 as Weight)
-			.saturating_add((833_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 0
+			.saturating_add((608_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	fn kill_storage(i: u32, ) -> Weight {
-		(2_131_000 as Weight)
-			.saturating_add((597_000 as Weight).saturating_mul(i as Weight))
+		(3_199_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((450_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	fn kill_prefix(p: u32, ) -> Weight {
-		(11_844_000 as Weight)
-			.saturating_add((857_000 as Weight).saturating_mul(p as Weight))
+		(8_966_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((845_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
 	}
-	fn suicide() -> Weight {
-		(37_209_000 as Weight)
-	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn remark(_b: u32, ) -> Weight {
-		(1_973_000 as Weight)
+		(1_279_000 as Weight)
 	}
 	fn set_heap_pages() -> Weight {
-		(2_816_000 as Weight)
+		(2_167_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_changes_trie_config() -> Weight {
-		(11_539_000 as Weight)
+		(10_117_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn set_storage(i: u32, ) -> Weight {
 		(0 as Weight)
-			.saturating_add((833_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 0
+			.saturating_add((608_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	fn kill_storage(i: u32, ) -> Weight {
-		(2_131_000 as Weight)
-			.saturating_add((597_000 as Weight).saturating_mul(i as Weight))
+		(3_199_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((450_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	fn kill_prefix(p: u32, ) -> Weight {
-		(11_844_000 as Weight)
-			.saturating_add((857_000 as Weight).saturating_mul(p as Weight))
+		(8_966_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((845_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
 	}
-	fn suicide() -> Weight {
-		(37_209_000 as Weight)
-	}
 }

From c736c606c072c1b710f86ecf5685662472c42700 Mon Sep 17 00:00:00 2001
From: Wei Tang <wei@that.world>
Date: Wed, 24 Feb 2021 00:28:57 +0100
Subject: [PATCH 0427/1194] Reserve ss58 prefix 48 for Neatcoin (#8165)

* Reserved ss58 prefixes for Neatcoin

* Switch to use 63

* Switch to use 48
---
 primitives/core/src/crypto.rs | 4 +++-
 ss58-registry.json            | 9 +++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index efae0cd95802..0e5aca8f7ce1 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -578,11 +578,13 @@ ss58_address_format!(
 		(46, "reserved46", "Reserved for future use (46).")
 	Reserved47 =>
 		(47, "reserved47", "Reserved for future use (47).")
+	NeatcoinAccount =>
+		(48, "neatcoin", "Neatcoin mainnet, standard account (*25519).")
 	AventusAccount =>
 		(65, "aventus", "Aventus Chain mainnet, standard account (*25519).")
 	CrustAccount =>
 		(66, "crust", "Crust Network, standard account (*25519).")
-	// Note: 48 and above are reserved.
+	// Note: 16384 and above are reserved.
 );
 
 /// Set the default "version" (actually, this is a bit of a misnomer and the version byte is
diff --git a/ss58-registry.json b/ss58-registry.json
index cae6577e2157..d65485daeb19 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -442,6 +442,15 @@
 			"standardAccount": null,
 			"website": null
 		},
+		{
+			"prefix": 48,
+			"network": "neatcoin",
+			"displayName": "Neatcoin Mainnet",
+			"symbols": ["NEAT"],
+			"decimals": [12],
+			"standardAccount": "*25519",
+			"website": "https://neatcoin.org"
+		},
 		{
 			"prefix": 65,
 			"network": "aventus",

From 8643b9d5179cbef1002a2943922a68e1e6137c60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Wed, 24 Feb 2021 08:03:05 +0100
Subject: [PATCH 0428/1194] Make `on_slot` return the block with the post
 header (#8188)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Make `on_slot` return the block with the post header

Before this pr `on_slot` returned the pre block. However this is wrong,
because adding some post digest changes the hash of the header. Thus,
we need to make sure to return the correct block that uses the post
header.

* Update primitives/consensus/common/src/block_import.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
---
 client/consensus/aura/src/lib.rs              | 53 +++++++++++++++++--
 client/consensus/slots/src/lib.rs             |  7 +--
 .../consensus/common/src/block_import.rs      | 23 ++++----
 3 files changed, 68 insertions(+), 15 deletions(-)

diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index 47ce364cb661..29c4a4015516 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -683,7 +683,7 @@ impl<B: BlockT, C, P, CAW> Verifier<B> for AuraVerifier<C, P, CAW> where
 }
 
 fn initialize_authorities_cache<A, B, C>(client: &C) -> Result<(), ConsensusError> where
-	A: Codec,
+	A: Codec + Debug,
 	B: BlockT,
 	C: ProvideRuntimeApi<B> + BlockOf + ProvideCache<B>,
 	C::Api: AuraApi<B, A>,
@@ -719,7 +719,7 @@ fn initialize_authorities_cache<A, B, C>(client: &C) -> Result<(), ConsensusErro
 
 #[allow(deprecated)]
 fn authorities<A, B, C>(client: &C, at: &BlockId<B>) -> Result<Vec<A>, ConsensusError> where
-	A: Codec,
+	A: Codec + Debug,
 	B: BlockT,
 	C: ProvideRuntimeApi<B> + BlockOf + ProvideCache<B>,
 	C::Api: AuraApi<B, A>,
@@ -886,7 +886,7 @@ mod tests {
 	use sc_client_api::BlockchainEvents;
 	use sp_consensus_aura::sr25519::AuthorityPair;
 	use sc_consensus_slots::{SimpleSlotWorker, BackoffAuthoringOnFinalizedHeadLagging};
-	use std::task::Poll;
+	use std::{task::Poll, time::Instant};
 	use sc_block_builder::BlockBuilderProvider;
 	use sp_runtime::traits::Header as _;
 	use substrate_test_runtime_client::{TestClient, runtime::{Header, H256}};
@@ -1124,4 +1124,51 @@ mod tests {
 		assert!(worker.claim_slot(&head, 6.into(), &authorities).is_none());
 		assert!(worker.claim_slot(&head, 7.into(), &authorities).is_some());
 	}
+
+	#[test]
+	fn on_slot_returns_correct_block() {
+		let net = AuraTestNet::new(4);
+
+		let keystore_path = tempfile::tempdir().expect("Creates keystore path");
+		let keystore = LocalKeystore::open(keystore_path.path(), None)
+			.expect("Creates keystore.");
+		SyncCryptoStore::sr25519_generate_new(
+			&keystore,
+			AuthorityPair::ID, Some(&Keyring::Alice.to_seed()),
+		).expect("Key should be created");
+
+		let net = Arc::new(Mutex::new(net));
+
+		let mut net = net.lock();
+		let peer = net.peer(3);
+		let client = peer.client().as_full().expect("full clients are created").clone();
+		let environ = DummyFactory(client.clone());
+
+		let mut worker = AuraWorker {
+			client: client.clone(),
+			block_import: Arc::new(Mutex::new(client.clone())),
+			env: environ,
+			keystore: keystore.into(),
+			sync_oracle: DummyOracle.clone(),
+			force_authoring: false,
+			backoff_authoring_blocks: Option::<()>::None,
+			_key_type: PhantomData::<AuthorityPair>,
+		};
+
+		let head = client.header(&BlockId::Number(0)).unwrap().unwrap();
+
+		let res = futures::executor::block_on(worker.on_slot(
+			head,
+			SlotInfo {
+				slot: 0.into(),
+				timestamp: 0,
+				ends_at: Instant::now() + Duration::from_secs(100),
+				inherent_data: InherentData::new(),
+				duration: 1000,
+			},
+		)).unwrap();
+
+		// The returned block should be imported and we should be able to get its header by now.
+		assert!(client.header(&BlockId::Hash(res.block.hash())).unwrap().is_some());
+	}
 }
diff --git a/client/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs
index 62b6b452eb41..1df8378d514f 100644
--- a/client/consensus/slots/src/lib.rs
+++ b/client/consensus/slots/src/lib.rs
@@ -334,7 +334,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 
 		proposal_work.and_then(move |(proposal, claim)| async move {
 			let (block, storage_proof) = (proposal.block, proposal.proof);
-			let (header, body) = block.clone().deconstruct();
+			let (header, body) = block.deconstruct();
 			let header_num = *header.number();
 			let header_hash = header.hash();
 			let parent_hash = *header.parent_hash();
@@ -342,7 +342,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 			let block_import_params = block_import_params_maker(
 				header,
 				&header_hash,
-				body,
+				body.clone(),
 				proposal.storage_changes,
 				claim,
 				epoch_data,
@@ -361,6 +361,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 				"hash_previously" => ?header_hash,
 			);
 
+			let header = block_import_params.post_header();
 			if let Err(err) = block_import.lock().import_block(block_import_params, Default::default()) {
 				warn!(
 					target: logging_target,
@@ -376,7 +377,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 				);
 			}
 
-			Ok(SlotResult { block, storage_proof })
+			Ok(SlotResult { block: B::new(header, body), storage_proof })
 		}).then(|r| async move {
 			r.map_err(|e| warn!(target: "slots", "Encountered consensus error: {:?}", e)).ok()
 		}).boxed()
diff --git a/primitives/consensus/common/src/block_import.rs b/primitives/consensus/common/src/block_import.rs
index 41b5f391f65c..00f84501dbb3 100644
--- a/primitives/consensus/common/src/block_import.rs
+++ b/primitives/consensus/common/src/block_import.rs
@@ -193,16 +193,21 @@ impl<Block: BlockT, Transaction> BlockImportParams<Block, Transaction> {
 		if let Some(hash) = self.post_hash {
 			hash
 		} else {
-			if self.post_digests.is_empty() {
-				self.header.hash()
-			} else {
-				let mut hdr = self.header.clone();
-				for digest_item in &self.post_digests {
-					hdr.digest_mut().push(digest_item.clone());
-				}
-
-				hdr.hash()
+			self.post_header().hash()
+		}
+	}
+
+	/// Get the post header.
+	pub fn post_header(&self) -> Block::Header {
+		if self.post_digests.is_empty() {
+			self.header.clone()
+		} else {
+			let mut hdr = self.header.clone();
+			for digest_item in &self.post_digests {
+				hdr.digest_mut().push(digest_item.clone());
 			}
+
+			hdr
 		}
 	}
 

From 6bd9aad6b96dd25cc9c793a27b208367342c07d4 Mon Sep 17 00:00:00 2001
From: joshua-mir <joshua@parity.io>
Date: Wed, 24 Feb 2021 09:31:49 +0100
Subject: [PATCH 0429/1194] [multisig, insubstantial] WeightTooLow ->
 MaxWeightTooLow  (#8112)

---
 frame/multisig/src/lib.rs   | 4 ++--
 frame/multisig/src/tests.rs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frame/multisig/src/lib.rs b/frame/multisig/src/lib.rs
index a015f291bc71..aa72d2d1ad3c 100644
--- a/frame/multisig/src/lib.rs
+++ b/frame/multisig/src/lib.rs
@@ -160,7 +160,7 @@ decl_error! {
 		/// A timepoint was given, yet no multisig operation is underway.
 		UnexpectedTimepoint,
 		/// The maximum weight information provided was too low.
-		WeightTooLow,
+		MaxWeightTooLow,
 		/// The data to be stored is already stored.
 		AlreadyStored,
 	}
@@ -503,7 +503,7 @@ impl<T: Config> Module<T> {
 
 			if let Some((call, call_len)) = maybe_approved_call {
 				// verify weight
-				ensure!(call.get_dispatch_info().weight <= max_weight, Error::<T>::WeightTooLow);
+				ensure!(call.get_dispatch_info().weight <= max_weight, Error::<T>::MaxWeightTooLow);
 
 				// Clean up storage before executing call to avoid an possibility of reentrancy
 				// attack.
diff --git a/frame/multisig/src/tests.rs b/frame/multisig/src/tests.rs
index 78301b2b69f7..a3f47a26e642 100644
--- a/frame/multisig/src/tests.rs
+++ b/frame/multisig/src/tests.rs
@@ -531,7 +531,7 @@ fn weight_check_works() {
 
 		assert_noop!(
 			Multisig::as_multi(Origin::signed(2), 2, vec![1, 3], Some(now()), data, false, 0),
-			Error::<Test>::WeightTooLow,
+			Error::<Test>::MaxWeightTooLow,
 		);
 	});
 }

From 1db510877725255634dd4d50b696da79b152abb7 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Wed, 24 Feb 2021 12:43:31 +0000
Subject: [PATCH 0430/1194] Update lib.rs (#8192)

Turns out the polkadot bot assumes that this guys is exported from the root of the pallet.
---
 frame/election-provider-multi-phase/src/lib.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index 5e1bc8df9a7c..c4a5e0fa6936 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -241,7 +241,8 @@ const LOG_TARGET: &'static str = "runtime::election-provider";
 pub mod unsigned;
 pub mod weights;
 
-use weights::WeightInfo;
+/// The weight declaration of the pallet.
+pub use weights::WeightInfo;
 
 /// The compact solution type used by this crate.
 pub type CompactOf<T> = <T as Config>::CompactSolution;

From beff566b53ea1eeb4e54edc9416211141195004f Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Wed, 24 Feb 2021 17:13:34 +0100
Subject: [PATCH 0431/1194] Add some debug_asserts for #8171 (#8181)

---
 client/network/src/transactions.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/network/src/transactions.rs b/client/network/src/transactions.rs
index e6d807c2cb78..800d801ab3f8 100644
--- a/client/network/src/transactions.rs
+++ b/client/network/src/transactions.rs
@@ -319,14 +319,16 @@ impl<B: BlockT + 'static, H: ExHashT> TransactionsHandler<B, H> {
 			},
 
 			Event::NotificationStreamOpened { remote, protocol, role } if protocol == self.protocol_name => {
-				self.peers.insert(remote, Peer {
+				let _was_in = self.peers.insert(remote, Peer {
 					known_transactions: LruHashSet::new(NonZeroUsize::new(MAX_KNOWN_TRANSACTIONS)
 						.expect("Constant is nonzero")),
 					role,
 				});
+				debug_assert!(_was_in.is_none());
 			}
 			Event::NotificationStreamClosed { remote, protocol } if protocol == self.protocol_name => {
-				self.peers.remove(&remote);
+				let _peer = self.peers.remove(&remote);
+				debug_assert!(_peer.is_some());
 			}
 
 			Event::NotificationsReceived { remote, messages } => {

From 1c34ccf6c88188b173286bf28c279409eff0eebb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomusdrw@users.noreply.github.com>
Date: Wed, 24 Feb 2021 20:00:00 +0100
Subject: [PATCH 0432/1194] Display nicer inspect results. (#8198)

---
 bin/node/inspect/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/node/inspect/src/lib.rs b/bin/node/inspect/src/lib.rs
index 2a55fdcda62e..3abb9e9ff41e 100644
--- a/bin/node/inspect/src/lib.rs
+++ b/bin/node/inspect/src/lib.rs
@@ -73,7 +73,7 @@ impl<TBlock: Block> PrettyPrinter<TBlock> for DebugPrinter {
 	}
 
 	fn fmt_extrinsic(&self, fmt: &mut fmt::Formatter, extrinsic: &TBlock::Extrinsic) -> fmt::Result {
-		writeln!(fmt, " {:?}", extrinsic)?;
+		writeln!(fmt, " {:#?}", extrinsic)?;
 		writeln!(fmt, " Bytes: {:?}", HexDisplay::from(&extrinsic.encode()))?;
 		Ok(())
 	}

From 7a6d60de2d19c67831859a9014e315f5ec7a3870 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Wed, 24 Feb 2021 21:43:50 +0100
Subject: [PATCH 0433/1194] Move proof generation to the type system level
 (#8185)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Start

* Finish!!!!

* Update client/basic-authorship/src/basic_authorship.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Review comments

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
---
 Cargo.lock                                    |   1 -
 bin/node/bench/src/construct.rs               |   3 +-
 bin/node/cli/src/service.rs                   |   2 -
 client/basic-authorship/README.md             |   3 +-
 .../basic-authorship/src/basic_authorship.rs  |  84 +++++++++-----
 client/basic-authorship/src/lib.rs            |   3 +-
 client/block-builder/Cargo.toml               |   1 -
 client/block-builder/src/lib.rs               |  38 +++++-
 client/consensus/aura/src/lib.rs              |  13 ++-
 client/consensus/babe/src/tests.rs            |  18 +--
 .../consensus/manual-seal/src/seal_block.rs   |   7 +-
 client/consensus/pow/src/lib.rs               |  13 ++-
 client/consensus/pow/src/worker.rs            |  22 +++-
 client/consensus/slots/src/lib.rs             |  26 ++---
 client/finality-grandpa/rpc/src/lib.rs        |   5 +-
 client/service/src/client/client.rs           |   4 +-
 primitives/consensus/common/src/lib.rs        | 108 ++++++++++++------
 17 files changed, 230 insertions(+), 121 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a65ca56cee33..a5fa0aafcfd4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6691,7 +6691,6 @@ dependencies = [
  "sp-api",
  "sp-block-builder",
  "sp-blockchain",
- "sp-consensus",
  "sp-core",
  "sp-inherents",
  "sp-runtime",
diff --git a/bin/node/bench/src/construct.rs b/bin/node/bench/src/construct.rs
index a8a02f19c306..b64ffec641c2 100644
--- a/bin/node/bench/src/construct.rs
+++ b/bin/node/bench/src/construct.rs
@@ -48,7 +48,7 @@ use sp_transaction_pool::{
 	TransactionStatusStreamFor,
 	TxHash,
 };
-use sp_consensus::{Environment, Proposer, RecordProof};
+use sp_consensus::{Environment, Proposer};
 
 use crate::{
 	common::SizeType,
@@ -170,7 +170,6 @@ impl core::Benchmark for ConstructionBenchmark {
 				inherent_data_providers.create_inherent_data().expect("Create inherent data failed"),
 				Default::default(),
 				std::time::Duration::from_secs(20),
-				RecordProof::Yes,
 			),
 		).map(|r| r.block).expect("Proposing failed");
 
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index 312a0226fc3d..b6cad3c52de7 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -478,7 +478,6 @@ mod tests {
 	use sc_consensus_epochs::descendent_query;
 	use sp_consensus::{
 		Environment, Proposer, BlockImportParams, BlockOrigin, ForkChoiceStrategy, BlockImport,
-		RecordProof,
 	};
 	use node_primitives::{Block, DigestItem, Signature};
 	use node_runtime::{BalancesCall, Call, UncheckedExtrinsic, Address};
@@ -611,7 +610,6 @@ mod tests {
 						inherent_data,
 						digest,
 						std::time::Duration::from_secs(1),
-						RecordProof::Yes,
 					).await
 				}).expect("Error making test block").block;
 
diff --git a/client/basic-authorship/README.md b/client/basic-authorship/README.md
index 1a20593c09ea..d29ce258e513 100644
--- a/client/basic-authorship/README.md
+++ b/client/basic-authorship/README.md
@@ -20,7 +20,6 @@ let future = proposer.propose(
 	Default::default(),
 	Default::default(),
 	Duration::from_secs(2),
-	RecordProof::Yes,
 );
 
 // We wait until the proposition is performed.
@@ -29,4 +28,4 @@ println!("Generated block: {:?}", block.block);
 ```
 
 
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/client/basic-authorship/src/basic_authorship.rs b/client/basic-authorship/src/basic_authorship.rs
index 067695e5a84d..0c5bb7abefa5 100644
--- a/client/basic-authorship/src/basic_authorship.rs
+++ b/client/basic-authorship/src/basic_authorship.rs
@@ -23,7 +23,7 @@
 use std::{pin::Pin, time, sync::Arc};
 use sc_client_api::backend;
 use codec::Decode;
-use sp_consensus::{evaluation, Proposal, RecordProof};
+use sp_consensus::{evaluation, Proposal, ProofRecording, DisableProofRecording, EnableProofRecording};
 use sp_core::traits::SpawnNamed;
 use sp_inherents::InherentData;
 use log::{error, info, debug, trace, warn};
@@ -52,7 +52,7 @@ use sc_proposer_metrics::MetricsLink as PrometheusMetrics;
 pub const DEFAULT_MAX_BLOCK_SIZE: usize = 4 * 1024 * 1024 + 512;
 
 /// Proposer factory.
-pub struct ProposerFactory<A, B, C> {
+pub struct ProposerFactory<A, B, C, PR> {
 	spawn_handle: Box<dyn SpawnNamed>,
 	/// The client instance.
 	client: Arc<C>,
@@ -60,12 +60,15 @@ pub struct ProposerFactory<A, B, C> {
 	transaction_pool: Arc<A>,
 	/// Prometheus Link,
 	metrics: PrometheusMetrics,
-	/// phantom member to pin the `Backend` type.
-	_phantom: PhantomData<B>,
+	/// phantom member to pin the `Backend`/`ProofRecording` type.
+	_phantom: PhantomData<(B, PR)>,
 	max_block_size: usize,
 }
 
-impl<A, B, C> ProposerFactory<A, B, C> {
+impl<A, B, C> ProposerFactory<A, B, C, DisableProofRecording> {
+	/// Create a new proposer factory.
+	///
+	/// Proof recording will be disabled when using proposers built by this instance to build blocks.
 	pub fn new(
 		spawn_handle: impl SpawnNamed + 'static,
 		client: Arc<C>,
@@ -81,7 +84,30 @@ impl<A, B, C> ProposerFactory<A, B, C> {
 			max_block_size: DEFAULT_MAX_BLOCK_SIZE,
 		}
 	}
+}
+
+impl<A, B, C> ProposerFactory<A, B, C, EnableProofRecording> {
+	/// Create a new proposer factory with proof recording enabled.
+	///
+	/// Each proposer created by this instance will record a proof while building a block.
+	pub fn with_proof_recording(
+		spawn_handle: impl SpawnNamed + 'static,
+		client: Arc<C>,
+		transaction_pool: Arc<A>,
+		prometheus: Option<&PrometheusRegistry>,
+	) -> Self {
+		ProposerFactory {
+			spawn_handle: Box::new(spawn_handle),
+			client,
+			transaction_pool,
+			metrics: PrometheusMetrics::new(prometheus),
+			_phantom: PhantomData,
+			max_block_size: DEFAULT_MAX_BLOCK_SIZE,
+		}
+	}
+}
 
+impl<A, B, C, PR> ProposerFactory<A, B, C, PR> {
 	/// Set the maximum block size in bytes.
 	///
 	/// The default value for the maximum block size is:
@@ -91,7 +117,7 @@ impl<A, B, C> ProposerFactory<A, B, C> {
 	}
 }
 
-impl<B, Block, C, A> ProposerFactory<A, B, C>
+impl<B, Block, C, A, PR> ProposerFactory<A, B, C, PR>
 	where
 		A: TransactionPool<Block = Block> + 'static,
 		B: backend::Backend<Block> + Send + Sync + 'static,
@@ -101,18 +127,18 @@ impl<B, Block, C, A> ProposerFactory<A, B, C>
 		C::Api: ApiExt<Block, StateBackend = backend::StateBackendFor<B, Block>>
 			+ BlockBuilderApi<Block>,
 {
-	pub fn init_with_now(
+	fn init_with_now(
 		&mut self,
 		parent_header: &<Block as BlockT>::Header,
 		now: Box<dyn Fn() -> time::Instant + Send + Sync>,
-	) -> Proposer<B, Block, C, A> {
+	) -> Proposer<B, Block, C, A, PR> {
 		let parent_hash = parent_header.hash();
 
 		let id = BlockId::hash(parent_hash);
 
 		info!("🙌 Starting consensus session on top of parent {:?}", parent_hash);
 
-		let proposer = Proposer {
+		let proposer = Proposer::<_, _, _, _, PR> {
 			spawn_handle: self.spawn_handle.clone(),
 			client: self.client.clone(),
 			parent_hash,
@@ -129,8 +155,8 @@ impl<B, Block, C, A> ProposerFactory<A, B, C>
 	}
 }
 
-impl<A, B, Block, C> sp_consensus::Environment<Block> for
-	ProposerFactory<A, B, C>
+impl<A, B, Block, C, PR> sp_consensus::Environment<Block> for
+	ProposerFactory<A, B, C, PR>
 		where
 			A: TransactionPool<Block = Block> + 'static,
 			B: backend::Backend<Block> + Send + Sync + 'static,
@@ -139,9 +165,10 @@ impl<A, B, Block, C> sp_consensus::Environment<Block> for
 				+ Send + Sync + 'static,
 			C::Api: ApiExt<Block, StateBackend = backend::StateBackendFor<B, Block>>
 				+ BlockBuilderApi<Block>,
+			PR: ProofRecording,
 {
 	type CreateProposer = future::Ready<Result<Self::Proposer, Self::Error>>;
-	type Proposer = Proposer<B, Block, C, A>;
+	type Proposer = Proposer<B, Block, C, A, PR>;
 	type Error = sp_blockchain::Error;
 
 	fn init(
@@ -153,7 +180,7 @@ impl<A, B, Block, C> sp_consensus::Environment<Block> for
 }
 
 /// The proposer logic.
-pub struct Proposer<B, Block: BlockT, C, A: TransactionPool> {
+pub struct Proposer<B, Block: BlockT, C, A: TransactionPool, PR> {
 	spawn_handle: Box<dyn SpawnNamed>,
 	client: Arc<C>,
 	parent_hash: <Block as BlockT>::Hash,
@@ -162,12 +189,12 @@ pub struct Proposer<B, Block: BlockT, C, A: TransactionPool> {
 	transaction_pool: Arc<A>,
 	now: Box<dyn Fn() -> time::Instant + Send + Sync>,
 	metrics: PrometheusMetrics,
-	_phantom: PhantomData<B>,
+	_phantom: PhantomData<(B, PR)>,
 	max_block_size: usize,
 }
 
-impl<A, B, Block, C> sp_consensus::Proposer<Block> for
-	Proposer<B, Block, C, A>
+impl<A, B, Block, C, PR> sp_consensus::Proposer<Block> for
+	Proposer<B, Block, C, A, PR>
 		where
 			A: TransactionPool<Block = Block> + 'static,
 			B: backend::Backend<Block> + Send + Sync + 'static,
@@ -176,19 +203,21 @@ impl<A, B, Block, C> sp_consensus::Proposer<Block> for
 				+ Send + Sync + 'static,
 			C::Api: ApiExt<Block, StateBackend = backend::StateBackendFor<B, Block>>
 				+ BlockBuilderApi<Block>,
+			PR: ProofRecording,
 {
 	type Transaction = backend::TransactionFor<B, Block>;
 	type Proposal = Pin<Box<dyn Future<
-		Output = Result<Proposal<Block, Self::Transaction>, Self::Error>
+		Output = Result<Proposal<Block, Self::Transaction, PR::Proof>, Self::Error>
 	> + Send>>;
 	type Error = sp_blockchain::Error;
+	type ProofRecording = PR;
+	type Proof = PR::Proof;
 
 	fn propose(
 		self,
 		inherent_data: InherentData,
 		inherent_digests: DigestFor<Block>,
 		max_duration: time::Duration,
-		record_proof: RecordProof,
 	) -> Self::Proposal {
 		let (tx, rx) = oneshot::channel();
 		let spawn_handle = self.spawn_handle.clone();
@@ -200,7 +229,6 @@ impl<A, B, Block, C> sp_consensus::Proposer<Block> for
 				inherent_data,
 				inherent_digests,
 				deadline,
-				record_proof,
 			).await;
 			if tx.send(res).is_err() {
 				trace!("Could not send block production result to proposer!");
@@ -213,7 +241,7 @@ impl<A, B, Block, C> sp_consensus::Proposer<Block> for
 	}
 }
 
-impl<A, B, Block, C> Proposer<B, Block, C, A>
+impl<A, B, Block, C, PR> Proposer<B, Block, C, A, PR>
 	where
 		A: TransactionPool<Block = Block>,
 		B: backend::Backend<Block> + Send + Sync + 'static,
@@ -222,14 +250,14 @@ impl<A, B, Block, C> Proposer<B, Block, C, A>
 			+ Send + Sync + 'static,
 		C::Api: ApiExt<Block, StateBackend = backend::StateBackendFor<B, Block>>
 			+ BlockBuilderApi<Block>,
+		PR: ProofRecording,
 {
 	async fn propose_with(
 		self,
 		inherent_data: InherentData,
 		inherent_digests: DigestFor<Block>,
 		deadline: time::Instant,
-		record_proof: RecordProof,
-	) -> Result<Proposal<Block, backend::TransactionFor<B, Block>>, sp_blockchain::Error> {
+	) -> Result<Proposal<Block, backend::TransactionFor<B, Block>, PR::Proof>, sp_blockchain::Error> {
 		/// If the block is full we will attempt to push at most
 		/// this number of transactions before quitting for real.
 		/// It allows us to increase block utilization.
@@ -238,7 +266,7 @@ impl<A, B, Block, C> Proposer<B, Block, C, A>
 		let mut block_builder = self.client.new_block_at(
 			&self.parent_id,
 			inherent_digests,
-			record_proof,
+			PR::ENABLED,
 		)?;
 
 		for inherent in block_builder.create_inherents(inherent_data)? {
@@ -361,6 +389,8 @@ impl<A, B, Block, C> Proposer<B, Block, C, A>
 			error!("Failed to evaluate authored block: {:?}", err);
 		}
 
+		let proof = PR::into_proof(proof)
+			.map_err(|e| sp_blockchain::Error::Application(Box::new(e)))?;
 		Ok(Proposal { block, proof, storage_changes })
 	}
 }
@@ -452,7 +482,7 @@ mod tests {
 		// when
 		let deadline = time::Duration::from_secs(3);
 		let block = futures::executor::block_on(
-			proposer.propose(Default::default(), Default::default(), deadline, RecordProof::No)
+			proposer.propose(Default::default(), Default::default(), deadline)
 		).map(|r| r.block).unwrap();
 
 		// then
@@ -497,7 +527,7 @@ mod tests {
 
 		let deadline = time::Duration::from_secs(1);
 		futures::executor::block_on(
-			proposer.propose(Default::default(), Default::default(), deadline, RecordProof::No)
+			proposer.propose(Default::default(), Default::default(), deadline)
 		).map(|r| r.block).unwrap();
 	}
 
@@ -543,7 +573,7 @@ mod tests {
 
 		let deadline = time::Duration::from_secs(9);
 		let proposal = futures::executor::block_on(
-			proposer.propose(Default::default(), Default::default(), deadline, RecordProof::No),
+			proposer.propose(Default::default(), Default::default(), deadline),
 		).unwrap();
 
 		assert_eq!(proposal.block.extrinsics().len(), 1);
@@ -624,7 +654,7 @@ mod tests {
 			// when
 			let deadline = time::Duration::from_secs(9);
 			let block = futures::executor::block_on(
-				proposer.propose(Default::default(), Default::default(), deadline, RecordProof::No)
+				proposer.propose(Default::default(), Default::default(), deadline)
 			).map(|r| r.block).unwrap();
 
 			// then
diff --git a/client/basic-authorship/src/lib.rs b/client/basic-authorship/src/lib.rs
index 224dccd36b53..ccf73cc93f19 100644
--- a/client/basic-authorship/src/lib.rs
+++ b/client/basic-authorship/src/lib.rs
@@ -22,7 +22,7 @@
 //!
 //! ```
 //! # use sc_basic_authorship::ProposerFactory;
-//! # use sp_consensus::{Environment, Proposer, RecordProof};
+//! # use sp_consensus::{Environment, Proposer};
 //! # use sp_runtime::generic::BlockId;
 //! # use std::{sync::Arc, time::Duration};
 //! # use substrate_test_runtime_client::{
@@ -61,7 +61,6 @@
 //! 	Default::default(),
 //! 	Default::default(),
 //! 	Duration::from_secs(2),
-//! 	RecordProof::Yes,
 //! );
 //!
 //! // We wait until the proposition is performed.
diff --git a/client/block-builder/Cargo.toml b/client/block-builder/Cargo.toml
index dda5edde36db..1019e2411c68 100644
--- a/client/block-builder/Cargo.toml
+++ b/client/block-builder/Cargo.toml
@@ -17,7 +17,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 sp-state-machine = { version = "0.9.0", path = "../../primitives/state-machine" }
 sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
 sp-api = { version = "3.0.0", path = "../../primitives/api" }
-sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
 sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
 sp-core = { version = "3.0.0", path = "../../primitives/core" }
 sp-block-builder = { version = "3.0.0", path = "../../primitives/block-builder" }
diff --git a/client/block-builder/src/lib.rs b/client/block-builder/src/lib.rs
index 5f700da8914a..4893072a7137 100644
--- a/client/block-builder/src/lib.rs
+++ b/client/block-builder/src/lib.rs
@@ -37,12 +37,48 @@ use sp_core::ExecutionContext;
 use sp_api::{
 	Core, ApiExt, ApiRef, ProvideRuntimeApi, StorageChanges, StorageProof, TransactionOutcome,
 };
-use sp_consensus::RecordProof;
 
 pub use sp_block_builder::BlockBuilder as BlockBuilderApi;
 
 use sc_client_api::backend;
 
+/// Used as parameter to [`BlockBuilderProvider`] to express if proof recording should be enabled.
+///
+/// When `RecordProof::Yes` is given, all accessed trie nodes should be saved. These recorded
+/// trie nodes can be used by a third party to proof this proposal without having access to the
+/// full storage.
+#[derive(Copy, Clone, PartialEq)]
+pub enum RecordProof {
+	/// `Yes`, record a proof.
+	Yes,
+	/// `No`, don't record any proof.
+	No,
+}
+
+impl RecordProof {
+	/// Returns if `Self` == `Yes`.
+	pub fn yes(&self) -> bool {
+		matches!(self, Self::Yes)
+	}
+}
+
+/// Will return [`RecordProof::No`] as default value.
+impl Default for RecordProof {
+	fn default() -> Self {
+		Self::No
+	}
+}
+
+impl From<bool> for RecordProof {
+	fn from(val: bool) -> Self {
+		if val {
+			Self::Yes
+		} else {
+			Self::No
+		}
+	}
+}
+
 /// A block that was build by [`BlockBuilder`] plus some additional data.
 ///
 /// This additional data includes the `storage_changes`, these changes can be applied to the
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index 29c4a4015516..746ee6597ea7 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -179,7 +179,7 @@ pub fn start_aura<B, C, SC, E, I, P, SO, CAW, BS, Error>(
 		&inherent_data_providers,
 		slot_duration.slot_duration()
 	)?;
-	Ok(sc_consensus_slots::start_slot_worker::<_, _, _, _, _, AuraSlotCompatible, _>(
+	Ok(sc_consensus_slots::start_slot_worker::<_, _, _, _, _, AuraSlotCompatible, _, _>(
 		slot_duration,
 		select_chain,
 		worker,
@@ -877,7 +877,9 @@ pub fn import_queue<B, I, C, P, S, CAW>(
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use sp_consensus::{NoNetwork as DummyOracle, Proposal, RecordProof, AlwaysCanAuthor};
+	use sp_consensus::{
+		NoNetwork as DummyOracle, Proposal, AlwaysCanAuthor, DisableProofRecording,
+	};
 	use sc_network_test::{Block as TestBlock, *};
 	use sp_runtime::traits::{Block as BlockT, DigestFor};
 	use sc_network::config::ProtocolConfig;
@@ -916,20 +918,21 @@ mod tests {
 			substrate_test_runtime_client::Backend,
 			TestBlock
 		>;
-		type Proposal = future::Ready<Result<Proposal<TestBlock, Self::Transaction>, Error>>;
+		type Proposal = future::Ready<Result<Proposal<TestBlock, Self::Transaction, ()>, Error>>;
+		type ProofRecording = DisableProofRecording;
+		type Proof = ();
 
 		fn propose(
 			self,
 			_: InherentData,
 			digests: DigestFor<TestBlock>,
 			_: Duration,
-			_: RecordProof,
 		) -> Self::Proposal {
 			let r = self.1.new_block(digests).unwrap().build().map_err(|e| e.into());
 
 			future::ready(r.map(|b| Proposal {
 				block: b.block,
-				proof: b.proof,
+				proof: (),
 				storage_changes: b.storage_changes,
 			}))
 		}
diff --git a/client/consensus/babe/src/tests.rs b/client/consensus/babe/src/tests.rs
index 9d03a3266d61..a33a509ddc3d 100644
--- a/client/consensus/babe/src/tests.rs
+++ b/client/consensus/babe/src/tests.rs
@@ -32,11 +32,10 @@ use sp_consensus_babe::{AuthorityPair, Slot, AllowedSlots, make_transcript, make
 use sc_consensus_slots::BackoffAuthoringOnFinalizedHeadLagging;
 use sc_block_builder::{BlockBuilder, BlockBuilderProvider};
 use sp_consensus::{
-	NoNetwork as DummyOracle, Proposal, RecordProof, AlwaysCanAuthor,
+	NoNetwork as DummyOracle, Proposal, DisableProofRecording, AlwaysCanAuthor,
 	import_queue::{BoxBlockImport, BoxJustificationImport},
 };
-use sc_network_test::*;
-use sc_network_test::{Block as TestBlock, PeersClient};
+use sc_network_test::{Block as TestBlock, *};
 use sc_network::config::ProtocolConfig;
 use sp_runtime::{generic::DigestItem, traits::{Block as BlockT, DigestFor}};
 use sc_client_api::{BlockchainEvents, backend::TransactionFor};
@@ -44,8 +43,7 @@ use log::debug;
 use std::{time::Duration, cell::RefCell, task::Poll};
 use rand::RngCore;
 use rand_chacha::{
-	rand_core::SeedableRng,
-	ChaChaRng,
+	rand_core::SeedableRng, ChaChaRng,
 };
 use sc_keystore::LocalKeystore;
 use sp_application_crypto::key_types::BABE;
@@ -112,7 +110,8 @@ impl DummyProposer {
 			Result<
 				Proposal<
 					TestBlock,
-					sc_client_api::TransactionFor<substrate_test_runtime_client::Backend, TestBlock>
+					sc_client_api::TransactionFor<substrate_test_runtime_client::Backend, TestBlock>,
+					()
 				>,
 				Error
 			>
@@ -163,21 +162,22 @@ impl DummyProposer {
 		// mutate the block header according to the mutator.
 		(self.factory.mutator)(&mut block.header, Stage::PreSeal);
 
-		future::ready(Ok(Proposal { block, proof: None, storage_changes: Default::default() }))
+		future::ready(Ok(Proposal { block, proof: (), storage_changes: Default::default() }))
 	}
 }
 
 impl Proposer<TestBlock> for DummyProposer {
 	type Error = Error;
 	type Transaction = sc_client_api::TransactionFor<substrate_test_runtime_client::Backend, TestBlock>;
-	type Proposal = future::Ready<Result<Proposal<TestBlock, Self::Transaction>, Error>>;
+	type Proposal = future::Ready<Result<Proposal<TestBlock, Self::Transaction, ()>, Error>>;
+	type ProofRecording = DisableProofRecording;
+	type Proof = ();
 
 	fn propose(
 		mut self,
 		_: InherentData,
 		pre_digests: DigestFor<TestBlock>,
 		_: Duration,
-		_: RecordProof,
 	) -> Self::Proposal {
 		self.propose_with(pre_digests)
 	}
diff --git a/client/consensus/manual-seal/src/seal_block.rs b/client/consensus/manual-seal/src/seal_block.rs
index 59b99349bf9b..2176973f3a29 100644
--- a/client/consensus/manual-seal/src/seal_block.rs
+++ b/client/consensus/manual-seal/src/seal_block.rs
@@ -123,8 +123,11 @@ pub async fn seal_block<B, BI, SC, C, E, P>(
 			Default::default()
 		};
 
-		let proposal = proposer.propose(id.clone(), digest, Duration::from_secs(MAX_PROPOSAL_DURATION), false.into())
-			.map_err(|err| Error::StringError(format!("{:?}", err))).await?;
+		let proposal = proposer.propose(
+			id.clone(),
+			digest,
+			Duration::from_secs(MAX_PROPOSAL_DURATION),
+		).map_err(|err| Error::StringError(format!("{:?}", err))).await?;
 
 		if proposal.block.extrinsics().len() == inherents_len && !create_empty {
 			return Err(Error::EmptyTransactionPool)
diff --git a/client/consensus/pow/src/lib.rs b/client/consensus/pow/src/lib.rs
index 3c7f1a832d3c..19f339cf1015 100644
--- a/client/consensus/pow/src/lib.rs
+++ b/client/consensus/pow/src/lib.rs
@@ -52,8 +52,7 @@ use sp_consensus_pow::{Seal, TotalDifficulty, POW_ENGINE_ID};
 use sp_inherents::{InherentDataProviders, InherentData};
 use sp_consensus::{
 	BlockImportParams, BlockOrigin, ForkChoiceStrategy, SyncOracle, Environment, Proposer,
-	SelectChain, Error as ConsensusError, CanAuthorWith, RecordProof, BlockImport,
-	BlockCheckParams, ImportResult,
+	SelectChain, Error as ConsensusError, CanAuthorWith, BlockImport, BlockCheckParams, ImportResult,
 };
 use sp_consensus::import_queue::{
 	BoxBlockImport, BasicQueue, Verifier, BoxJustificationImport,
@@ -549,7 +548,10 @@ pub fn start_mining_worker<Block, C, S, Algorithm, E, SO, CAW>(
 	timeout: Duration,
 	build_time: Duration,
 	can_author_with: CAW,
-) -> (Arc<Mutex<MiningWorker<Block, Algorithm, C>>>, impl Future<Output = ()>) where
+) -> (
+	Arc<Mutex<MiningWorker<Block, Algorithm, C, <E::Proposer as Proposer<Block>>::Proof>>>,
+	impl Future<Output = ()>,
+) where
 	Block: BlockT,
 	C: ProvideRuntimeApi<Block> + BlockchainEvents<Block> + 'static,
 	S: SelectChain<Block> + 'static,
@@ -566,7 +568,7 @@ pub fn start_mining_worker<Block, C, S, Algorithm, E, SO, CAW>(
 	}
 
 	let timer = UntilImportedOrTimeout::new(client.import_notification_stream(), timeout);
-	let worker = Arc::new(Mutex::new(MiningWorker::<Block, Algorithm, C> {
+	let worker = Arc::new(Mutex::new(MiningWorker::<Block, Algorithm, C, _> {
 		build: None,
 		algorithm: algorithm.clone(),
 		block_import,
@@ -664,7 +666,6 @@ pub fn start_mining_worker<Block, C, S, Algorithm, E, SO, CAW>(
 				inherent_data,
 				inherent_digest,
 				build_time.clone(),
-				RecordProof::No,
 			).await {
 				Ok(x) => x,
 				Err(err) => {
@@ -678,7 +679,7 @@ pub fn start_mining_worker<Block, C, S, Algorithm, E, SO, CAW>(
 				},
 			};
 
-			let build = MiningBuild::<Block, Algorithm, C> {
+			let build = MiningBuild::<Block, Algorithm, C, _> {
 				metadata: MiningMetadata {
 					best_hash,
 					pre_hash: proposal.block.header().hash(),
diff --git a/client/consensus/pow/src/worker.rs b/client/consensus/pow/src/worker.rs
index c19c5524d977..d64596e48cf1 100644
--- a/client/consensus/pow/src/worker.rs
+++ b/client/consensus/pow/src/worker.rs
@@ -40,21 +40,31 @@ pub struct MiningMetadata<H, D> {
 }
 
 /// A build of mining, containing the metadata and the block proposal.
-pub struct MiningBuild<Block: BlockT, Algorithm: PowAlgorithm<Block>, C: sp_api::ProvideRuntimeApi<Block>> {
+pub struct MiningBuild<
+	Block: BlockT,
+	Algorithm: PowAlgorithm<Block>,
+	C: sp_api::ProvideRuntimeApi<Block>,
+	Proof
+> {
 	/// Mining metadata.
 	pub metadata: MiningMetadata<Block::Hash, Algorithm::Difficulty>,
 	/// Mining proposal.
-	pub proposal: Proposal<Block, sp_api::TransactionFor<C, Block>>,
+	pub proposal: Proposal<Block, sp_api::TransactionFor<C, Block>, Proof>,
 }
 
 /// Mining worker that exposes structs to query the current mining build and submit mined blocks.
-pub struct MiningWorker<Block: BlockT, Algorithm: PowAlgorithm<Block>, C: sp_api::ProvideRuntimeApi<Block>> {
-	pub(crate) build: Option<MiningBuild<Block, Algorithm, C>>,
+pub struct MiningWorker<
+	Block: BlockT,
+	Algorithm: PowAlgorithm<Block>,
+	C: sp_api::ProvideRuntimeApi<Block>,
+	Proof
+> {
+	pub(crate) build: Option<MiningBuild<Block, Algorithm, C, Proof>>,
 	pub(crate) algorithm: Algorithm,
 	pub(crate) block_import: BoxBlockImport<Block, sp_api::TransactionFor<C, Block>>,
 }
 
-impl<Block, Algorithm, C> MiningWorker<Block, Algorithm, C> where
+impl<Block, Algorithm, C, Proof> MiningWorker<Block, Algorithm, C, Proof> where
 	Block: BlockT,
 	C: sp_api::ProvideRuntimeApi<Block>,
 	Algorithm: PowAlgorithm<Block>,
@@ -72,7 +82,7 @@ impl<Block, Algorithm, C> MiningWorker<Block, Algorithm, C> where
 
 	pub(crate) fn on_build(
 		&mut self,
-		build: MiningBuild<Block, Algorithm, C>,
+		build: MiningBuild<Block, Algorithm, C, Proof>,
 	) {
 		self.build = Some(build);
 	}
diff --git a/client/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs
index 1df8378d514f..564d5c28c583 100644
--- a/client/consensus/slots/src/lib.rs
+++ b/client/consensus/slots/src/lib.rs
@@ -40,7 +40,7 @@ use log::{debug, error, info, warn};
 use parking_lot::Mutex;
 use sp_api::{ProvideRuntimeApi, ApiRef};
 use sp_arithmetic::traits::BaseArithmetic;
-use sp_consensus::{BlockImport, Proposer, SyncOracle, SelectChain, CanAuthorWith, SlotData, RecordProof};
+use sp_consensus::{BlockImport, Proposer, SyncOracle, SelectChain, CanAuthorWith, SlotData};
 use sp_consensus_slots::Slot;
 use sp_inherents::{InherentData, InherentDataProviders};
 use sp_runtime::{
@@ -57,20 +57,18 @@ pub type StorageChanges<Transaction, Block> =
 
 /// The result of [`SlotWorker::on_slot`].
 #[derive(Debug, Clone)]
-pub struct SlotResult<Block: BlockT> {
+pub struct SlotResult<Block: BlockT, Proof> {
 	/// The block that was built.
 	pub block: Block,
-	/// The optional storage proof that was calculated while building the block.
-	///
-	/// This needs to be enabled for the proposer to get this storage proof.
-	pub storage_proof: Option<sp_trie::StorageProof>,
+	/// The storage proof that was recorded while building the block.
+	pub storage_proof: Proof,
 }
 
 /// A worker that should be invoked at every new slot.
 ///
 /// The implementation should not make any assumptions of the slot being bound to the time or
 /// similar. The only valid assumption is that the slot number is always increasing.
-pub trait SlotWorker<B: BlockT> {
+pub trait SlotWorker<B: BlockT, Proof> {
 	/// Called when a new slot is triggered.
 	///
 	/// Returns a future that resolves to a [`SlotResult`] iff a block was successfully built in
@@ -79,7 +77,7 @@ pub trait SlotWorker<B: BlockT> {
 		&mut self,
 		chain_head: B::Header,
 		slot_info: SlotInfo,
-	) -> Pin<Box<dyn Future<Output = Option<SlotResult<B>>> + Send>>;
+	) -> Pin<Box<dyn Future<Output = Option<SlotResult<B, Proof>>> + Send>>;
 }
 
 /// A skeleton implementation for `SlotWorker` which tries to claim a slot at
@@ -206,7 +204,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 		&mut self,
 		chain_head: B::Header,
 		slot_info: SlotInfo,
-	) -> Pin<Box<dyn Future<Output = Option<SlotResult<B>>> + Send>>
+	) -> Pin<Box<dyn Future<Output = Option<SlotResult<B, <Self::Proposer as Proposer<B>>::Proof>>> + Send>>
 	where
 		<Self::Proposer as Proposer<B>>::Proposal: Unpin + Send + 'static,
 	{
@@ -307,7 +305,6 @@ pub trait SimpleSlotWorker<B: BlockT> {
 				logs,
 			},
 			slot_remaining_duration,
-			RecordProof::No,
 		).map_err(|e| sp_consensus::Error::ClientImport(format!("{:?}", e))));
 
 		let proposal_work =
@@ -384,12 +381,13 @@ pub trait SimpleSlotWorker<B: BlockT> {
 	}
 }
 
-impl<B: BlockT, T: SimpleSlotWorker<B>> SlotWorker<B> for T {
+impl<B: BlockT, T: SimpleSlotWorker<B>> SlotWorker<B, <T::Proposer as Proposer<B>>::Proof> for T
+{
 	fn on_slot(
 		&mut self,
 		chain_head: B::Header,
 		slot_info: SlotInfo,
-	) -> Pin<Box<dyn Future<Output = Option<SlotResult<B>>> + Send>> {
+	) -> Pin<Box<dyn Future<Output = Option<SlotResult<B, <T::Proposer as Proposer<B>>::Proof>>> + Send>> {
 		SimpleSlotWorker::on_slot(self, chain_head, slot_info)
 	}
 }
@@ -407,7 +405,7 @@ pub trait SlotCompatible {
 ///
 /// Every time a new slot is triggered, `worker.on_slot` is called and the future it returns is
 /// polled until completion, unless we are major syncing.
-pub fn start_slot_worker<B, C, W, T, SO, SC, CAW>(
+pub fn start_slot_worker<B, C, W, T, SO, SC, CAW, Proof>(
 	slot_duration: SlotDuration<T>,
 	client: C,
 	mut worker: W,
@@ -419,7 +417,7 @@ pub fn start_slot_worker<B, C, W, T, SO, SC, CAW>(
 where
 	B: BlockT,
 	C: SelectChain<B>,
-	W: SlotWorker<B>,
+	W: SlotWorker<B, Proof>,
 	SO: SyncOracle + Send,
 	SC: SlotCompatible + Unpin,
 	T: SlotData + Clone,
diff --git a/client/finality-grandpa/rpc/src/lib.rs b/client/finality-grandpa/rpc/src/lib.rs
index 204bea4c18e2..2e7354e5fda6 100644
--- a/client/finality-grandpa/rpc/src/lib.rs
+++ b/client/finality-grandpa/rpc/src/lib.rs
@@ -193,13 +193,12 @@ mod tests {
 	use jsonrpc_core::{Notification, Output, types::Params};
 
 	use parity_scale_codec::{Encode, Decode};
-	use sc_block_builder::BlockBuilder;
+	use sc_block_builder::{BlockBuilder, RecordProof};
 	use sc_finality_grandpa::{
 		report, AuthorityId, GrandpaJustificationSender, GrandpaJustification,
 		FinalityProof,
 	};
 	use sp_blockchain::HeaderBackend;
-	use sp_consensus::RecordProof;
 	use sp_core::crypto::Public;
 	use sp_keyring::Ed25519Keyring;
 	use sp_runtime::traits::{Block as BlockT, Header as HeaderT};
@@ -438,7 +437,7 @@ mod tests {
 			&*client,
 			client.info().best_hash,
 			client.info().best_number,
-			RecordProof::Yes,
+			RecordProof::No,
 			Default::default(),
 			&*backend,
 		).unwrap().build().unwrap();
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index b1ff0678ee9a..263ff7b9c569 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -52,7 +52,7 @@ use sp_state_machine::{
 use sc_executor::RuntimeVersion;
 use sp_consensus::{
 	Error as ConsensusError, BlockStatus, BlockImportParams, BlockCheckParams,
-	ImportResult, BlockOrigin, ForkChoiceStrategy, RecordProof,
+	ImportResult, BlockOrigin, ForkChoiceStrategy,
 };
 use sp_blockchain::{
 	self as blockchain,
@@ -66,7 +66,7 @@ use sp_api::{
 	CallApiAt, ConstructRuntimeApi, Core as CoreApi, ApiExt, ApiRef, ProvideRuntimeApi,
 	CallApiAtParams,
 };
-use sc_block_builder::{BlockBuilderApi, BlockBuilderProvider};
+use sc_block_builder::{BlockBuilderApi, BlockBuilderProvider, RecordProof};
 use sc_client_api::{
 	backend::{
 		self, BlockImportOperation, PrunableStateChangesTrieStorage,
diff --git a/primitives/consensus/common/src/lib.rs b/primitives/consensus/common/src/lib.rs
index 43edf4f7776c..b3aceb45e180 100644
--- a/primitives/consensus/common/src/lib.rs
+++ b/primitives/consensus/common/src/lib.rs
@@ -36,7 +36,7 @@ use sp_runtime::{
 	generic::BlockId, traits::{Block as BlockT, DigestFor, NumberFor, HashFor},
 };
 use futures::prelude::*;
-pub use sp_inherents::InherentData;
+use sp_state_machine::StorageProof;
 
 pub mod block_validation;
 pub mod offline_tracker;
@@ -55,6 +55,7 @@ pub use block_import::{
 pub use select_chain::SelectChain;
 pub use sp_state_machine::Backend as StateBackend;
 pub use import_queue::DefaultImportQueue;
+pub use sp_inherents::InherentData;
 
 /// Block status.
 #[derive(Debug, PartialEq, Eq)]
@@ -89,53 +90,81 @@ pub trait Environment<B: BlockT> {
 }
 
 /// A proposal that is created by a [`Proposer`].
-pub struct Proposal<Block: BlockT, Transaction> {
+pub struct Proposal<Block: BlockT, Transaction, Proof> {
 	/// The block that was build.
 	pub block: Block,
-	/// Optional proof that was recorded while building the block.
-	pub proof: Option<sp_state_machine::StorageProof>,
+	/// Proof that was recorded while building the block.
+	pub proof: Proof,
 	/// The storage changes while building this block.
 	pub storage_changes: sp_state_machine::StorageChanges<Transaction, HashFor<Block>, NumberFor<Block>>,
 }
 
-/// Used as parameter to [`Proposer`] to tell the requirement on recording a proof.
+/// Error that is returned when [`ProofRecording`] requested to record a proof,
+/// but no proof was recorded.
+#[derive(Debug, thiserror::Error)]
+#[error("Proof should be recorded, but no proof was provided.")]
+pub struct NoProofRecorded;
+
+/// A trait to express the state of proof recording on type system level.
 ///
-/// When `RecordProof::Yes` is given, all accessed trie nodes should be saved. These recorded
-/// trie nodes can be used by a third party to proof this proposal without having access to the
-/// full storage.
-#[derive(Copy, Clone, PartialEq)]
-pub enum RecordProof {
-	/// `Yes`, record a proof.
-	Yes,
-	/// `No`, don't record any proof.
-	No,
+/// This is used by [`Proposer`] to signal if proof recording is enabled. This can be used by
+/// downstream users of the [`Proposer`] trait to enforce that proof recording is activated when
+/// required. The only two implementations of this trait are [`DisableProofRecording`] and
+/// [`EnableProofRecording`].
+///
+/// This trait is sealed and can not be implemented outside of this crate!
+pub trait ProofRecording: Send + Sync + private::Sealed + 'static {
+	/// The proof type that will be used internally.
+	type Proof: Send + Sync + 'static;
+	/// Is proof recording enabled?
+	const ENABLED: bool;
+	/// Convert the given `storage_proof` into [`Self::Proof`].
+	///
+	/// Internally Substrate uses `Option<StorageProof>` to express the both states of proof
+	/// recording (for now) and as [`Self::Proof`] is some different type, we need to provide a
+	/// function to convert this value.
+	///
+	/// If the proof recording was requested, but `None` is given, this will return
+	/// `Err(NoProofRecorded)`.
+	fn into_proof(storage_proof: Option<StorageProof>) -> Result<Self::Proof, NoProofRecorded>;
 }
 
-impl RecordProof {
-	/// Returns if `Self` == `Yes`.
-	pub fn yes(&self) -> bool {
-		match self {
-			Self::Yes => true,
-			Self::No => false,
-		}
+/// Express that proof recording is disabled.
+///
+/// For more information see [`ProofRecording`].
+pub struct DisableProofRecording;
+
+impl ProofRecording for DisableProofRecording {
+	type Proof = ();
+	const ENABLED: bool = false;
+
+	fn into_proof(_: Option<StorageProof>) -> Result<Self::Proof, NoProofRecorded> {
+		Ok(())
 	}
 }
 
-/// Will return [`RecordProof::No`] as default value.
-impl Default for RecordProof {
-	fn default() -> Self {
-		Self::No
+/// Express that proof recording is enabled.
+///
+/// For more information see [`ProofRecording`].
+pub struct EnableProofRecording;
+
+impl ProofRecording for EnableProofRecording {
+	type Proof = sp_state_machine::StorageProof;
+	const ENABLED: bool = true;
+
+	fn into_proof(proof: Option<StorageProof>) -> Result<Self::Proof, NoProofRecorded> {
+		proof.ok_or_else(|| NoProofRecorded)
 	}
 }
 
-impl From<bool> for RecordProof {
-	fn from(val: bool) -> Self {
-		if val {
-			Self::Yes
-		} else {
-			Self::No
-		}
-	}
+/// Provides `Sealed` trait to prevent implementing trait [`ProofRecording`] outside of this crate.
+mod private {
+	/// Special trait that prevents the implementation of [`super::ProofRecording`] outside of this
+	/// crate.
+	pub trait Sealed {}
+
+	impl Sealed for super::DisableProofRecording {}
+	impl Sealed for super::EnableProofRecording {}
 }
 
 /// Logic for a proposer.
@@ -150,8 +179,16 @@ pub trait Proposer<B: BlockT> {
 	/// The transaction type used by the backend.
 	type Transaction: Default + Send + 'static;
 	/// Future that resolves to a committed proposal with an optional proof.
-	type Proposal: Future<Output = Result<Proposal<B, Self::Transaction>, Self::Error>> +
-		Send + Unpin + 'static;
+	type Proposal:
+		Future<Output = Result<Proposal<B, Self::Transaction, Self::Proof>, Self::Error>>
+		+ Send
+		+ Unpin
+		+ 'static;
+	/// The supported proof recording by the implementator of this trait. See [`ProofRecording`]
+	/// for more information.
+	type ProofRecording: self::ProofRecording<Proof = Self::Proof> + Send + Sync + 'static;
+	/// The proof type used by [`Self::ProofRecording`].
+	type Proof: Send + Sync + 'static;
 
 	/// Create a proposal.
 	///
@@ -167,7 +204,6 @@ pub trait Proposer<B: BlockT> {
 		inherent_data: InherentData,
 		inherent_digests: DigestFor<B>,
 		max_duration: Duration,
-		record_proof: RecordProof,
 	) -> Self::Proposal;
 }
 

From 5d72a5a472de5b8f451aeeee5e6b62a5ca1444dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Thu, 25 Feb 2021 08:44:51 +0000
Subject: [PATCH 0434/1194] grandpa: rewrite warp sync proof generation (#8148)

* grandpa: use AuthoritySetChanges to generate warp sync proof

* node: init grandpa warp sync protocol

* grandpa: iterator for AuthoritySetChanges

* grandpa: rewrite warp sync proof generation

* grandpa: remove old code for warp sync generation

* grandpa: fix indentation

* grandpa: fix off by one

* grandpa: use binary search to find start idx when generating warp sync proof

* grandpa: add method to verify warp sync proofs

* grandpa: remove unnecessary code to skip authority set changes

* grandpa: add test for warp sync proof generation and verification

* grandpa: add missing docs

* grandpa: remove trailing comma
---
 Cargo.lock                                    |   7 +
 bin/node/cli/src/service.rs                   |  11 +-
 client/finality-grandpa-warp-sync/Cargo.toml  |  27 +-
 client/finality-grandpa-warp-sync/src/lib.rs  |  61 ++-
 .../finality-grandpa-warp-sync/src/proof.rs   | 298 +++++++++++
 client/finality-grandpa/src/authorities.rs    |  55 +-
 client/finality-grandpa/src/finality_proof.rs | 486 +-----------------
 client/finality-grandpa/src/import.rs         |  16 +-
 client/finality-grandpa/src/justification.rs  |  35 +-
 client/finality-grandpa/src/lib.rs            |   5 +-
 10 files changed, 463 insertions(+), 538 deletions(-)
 create mode 100644 client/finality-grandpa-warp-sync/src/proof.rs

diff --git a/Cargo.lock b/Cargo.lock
index a5fa0aafcfd4..128b54e7c6d6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7254,18 +7254,25 @@ name = "sc-finality-grandpa-warp-sync"
 version = "0.9.0"
 dependencies = [
  "derive_more",
+ "finality-grandpa",
  "futures 0.3.12",
  "log",
  "num-traits",
  "parity-scale-codec",
  "parking_lot 0.11.1",
  "prost",
+ "rand 0.8.3",
+ "sc-block-builder",
  "sc-client-api",
  "sc-finality-grandpa",
  "sc-network",
  "sc-service",
  "sp-blockchain",
+ "sp-consensus",
+ "sp-finality-grandpa",
+ "sp-keyring",
  "sp-runtime",
+ "substrate-test-runtime-client",
 ]
 
 [[package]]
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index b6cad3c52de7..80561a78a062 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -197,9 +197,14 @@ pub fn new_full_base(
 	config.network.extra_sets.push(grandpa::grandpa_peers_set_config());
 
 	#[cfg(feature = "cli")]
-	config.network.request_response_protocols.push(sc_finality_grandpa_warp_sync::request_response_config_for_chain(
-		&config, task_manager.spawn_handle(), backend.clone(),
-	));
+	config.network.request_response_protocols.push(
+		sc_finality_grandpa_warp_sync::request_response_config_for_chain(
+			&config,
+			task_manager.spawn_handle(),
+			backend.clone(),
+			import_setup.1.shared_authority_set().clone(),
+		)
+	);
 
 	let (network, network_status_sinks, system_rpc_tx, network_starter) =
 		sc_service::build_network(sc_service::BuildNetworkParams {
diff --git a/client/finality-grandpa-warp-sync/Cargo.toml b/client/finality-grandpa-warp-sync/Cargo.toml
index 740c85940e77..3557d543c987 100644
--- a/client/finality-grandpa-warp-sync/Cargo.toml
+++ b/client/finality-grandpa-warp-sync/Cargo.toml
@@ -12,16 +12,25 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sc-network = { version = "0.9.0", path = "../network" }
-sc-finality-grandpa = { version = "0.9.0", path = "../finality-grandpa" }
-sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
-sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
-sc-client-api = { version = "3.0.0", path = "../api" }
-sc-service = { version = "0.9.0", path = "../service" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
+derive_more = "0.99.11"
 futures = "0.3.8"
 log = "0.4.11"
-derive_more = "0.99.11"
-codec = { package = "parity-scale-codec", version = "2.0.0" }
-prost = "0.7"
 num-traits = "0.2.14"
 parking_lot = "0.11.1"
+prost = "0.7"
+sc-client-api = { version = "3.0.0", path = "../api" }
+sc-finality-grandpa = { version = "0.9.0", path = "../finality-grandpa" }
+sc-network = { version = "0.9.0", path = "../network" }
+sc-service = { version = "0.9.0", path = "../service" }
+sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
+sp-finality-grandpa = { version = "3.0.0", path = "../../primitives/finality-grandpa" }
+sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
+
+[dev-dependencies]
+finality-grandpa = { version = "0.14.0" }
+rand = "0.8"
+sc-block-builder = { version = "0.9.0", path = "../block-builder" }
+sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
+sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
+substrate-test-runtime-client = { version = "2.0.0",  path = "../../test-utils/runtime/client" }
diff --git a/client/finality-grandpa-warp-sync/src/lib.rs b/client/finality-grandpa-warp-sync/src/lib.rs
index e14bcfdd4f32..54d06650bc37 100644
--- a/client/finality-grandpa-warp-sync/src/lib.rs
+++ b/client/finality-grandpa-warp-sync/src/lib.rs
@@ -16,7 +16,7 @@
 
 //! Helper for handling (i.e. answering) grandpa warp sync requests from a remote peer.
 
-use codec::Decode;
+use codec::{Decode, Encode};
 use sc_network::config::{IncomingRequest, OutgoingResponse, ProtocolId, RequestResponseConfig};
 use sc_client_api::Backend;
 use sp_runtime::traits::NumberFor;
@@ -27,13 +27,18 @@ use sp_runtime::traits::Block as BlockT;
 use std::time::Duration;
 use std::sync::Arc;
 use sc_service::{SpawnTaskHandle, config::{Configuration, Role}};
-use sc_finality_grandpa::WarpSyncFragmentCache;
+use sc_finality_grandpa::SharedAuthoritySet;
+
+mod proof;
+
+pub use proof::{AuthoritySetChangeProof, WarpSyncProof};
 
 /// Generates the appropriate [`RequestResponseConfig`] for a given chain configuration.
 pub fn request_response_config_for_chain<TBlock: BlockT, TBackend: Backend<TBlock> + 'static>(
 	config: &Configuration,
 	spawn_handle: SpawnTaskHandle,
 	backend: Arc<TBackend>,
+	authority_set: SharedAuthoritySet<TBlock::Hash, NumberFor<TBlock>>,
 ) -> RequestResponseConfig
 	where NumberFor<TBlock>: sc_finality_grandpa::BlockNumberOps,
 {
@@ -47,6 +52,7 @@ pub fn request_response_config_for_chain<TBlock: BlockT, TBackend: Backend<TBloc
 		let (handler, request_response_config) = GrandpaWarpSyncRequestHandler::new(
 			protocol_id.clone(),
 			backend.clone(),
+			authority_set,
 		);
 		spawn_handle.spawn("grandpa_warp_sync_request_handler", handler.run());
 		request_response_config
@@ -75,38 +81,40 @@ fn generate_protocol_name(protocol_id: ProtocolId) -> String {
 	s
 }
 
-#[derive(codec::Decode)]
+#[derive(Decode)]
 struct Request<B: BlockT> {
-	begin: B::Hash
+	begin: B::Hash,
 }
 
-/// Setting a large fragment limit, allowing client
-/// to define it is possible.
-const WARP_SYNC_FRAGMENTS_LIMIT: usize = 100;
-
-/// Number of item with justification in warp sync cache.
-/// This should be customizable, but setting it to the max number of fragments
-/// we return seems like a good idea until then.
-const WARP_SYNC_CACHE_SIZE: usize = WARP_SYNC_FRAGMENTS_LIMIT;
-
 /// Handler for incoming grandpa warp sync requests from a remote peer.
 pub struct GrandpaWarpSyncRequestHandler<TBackend, TBlock: BlockT> {
 	backend: Arc<TBackend>,
-	cache: Arc<parking_lot::RwLock<WarpSyncFragmentCache<TBlock::Header>>>,
+	authority_set: SharedAuthoritySet<TBlock::Hash, NumberFor<TBlock>>,
 	request_receiver: mpsc::Receiver<IncomingRequest>,
-	_phantom: std::marker::PhantomData<TBlock>
+	_phantom: std::marker::PhantomData<TBlock>,
 }
 
 impl<TBlock: BlockT, TBackend: Backend<TBlock>> GrandpaWarpSyncRequestHandler<TBackend, TBlock> {
 	/// Create a new [`GrandpaWarpSyncRequestHandler`].
-	pub fn new(protocol_id: ProtocolId, backend: Arc<TBackend>) -> (Self, RequestResponseConfig) {
+	pub fn new(
+		protocol_id: ProtocolId,
+		backend: Arc<TBackend>,
+		authority_set: SharedAuthoritySet<TBlock::Hash, NumberFor<TBlock>>,
+	) -> (Self, RequestResponseConfig) {
 		let (tx, request_receiver) = mpsc::channel(20);
 
 		let mut request_response_config = generate_request_response_config(protocol_id);
 		request_response_config.inbound_queue = Some(tx);
-		let cache = Arc::new(parking_lot::RwLock::new(WarpSyncFragmentCache::new(WARP_SYNC_CACHE_SIZE)));
 
-		(Self { backend, request_receiver, cache, _phantom: std::marker::PhantomData }, request_response_config)
+		(
+			Self {
+				backend,
+				request_receiver,
+				_phantom: std::marker::PhantomData,
+				authority_set,
+			},
+			request_response_config,
+		)
 	}
 
 	fn handle_request(
@@ -118,13 +126,14 @@ impl<TBlock: BlockT, TBackend: Backend<TBlock>> GrandpaWarpSyncRequestHandler<TB
 	{
 		let request = Request::<TBlock>::decode(&mut &payload[..])?;
 
-		let mut cache = self.cache.write();
-		let response = sc_finality_grandpa::prove_warp_sync(
-			self.backend.blockchain(), request.begin, Some(WARP_SYNC_FRAGMENTS_LIMIT), Some(&mut cache)
+		let proof = WarpSyncProof::generate(
+			self.backend.blockchain(),
+			request.begin,
+			&self.authority_set.authority_set_changes(),
 		)?;
 
 		pending_response.send(OutgoingResponse {
-			result: Ok(response),
+			result: Ok(proof.encode()),
 			reputation_changes: Vec::new(),
 		}).map_err(|_| HandleRequestError::SendResponse)
 	}
@@ -148,8 +157,8 @@ impl<TBlock: BlockT, TBackend: Backend<TBlock>> GrandpaWarpSyncRequestHandler<TB
 	}
 }
 
-#[derive(derive_more::Display, derive_more::From)]
-enum HandleRequestError {
+#[derive(Debug, derive_more::Display, derive_more::From)]
+pub enum HandleRequestError {
 	#[display(fmt = "Failed to decode request: {}.", _0)]
 	DecodeProto(prost::DecodeError),
 	#[display(fmt = "Failed to encode response: {}.", _0)]
@@ -157,6 +166,10 @@ enum HandleRequestError {
 	#[display(fmt = "Failed to decode block hash: {}.", _0)]
 	DecodeScale(codec::Error),
 	Client(sp_blockchain::Error),
+	#[from(ignore)]
+	InvalidRequest(String),
+	#[from(ignore)]
+	InvalidProof(String),
 	#[display(fmt = "Failed to send response.")]
 	SendResponse,
 }
diff --git a/client/finality-grandpa-warp-sync/src/proof.rs b/client/finality-grandpa-warp-sync/src/proof.rs
new file mode 100644
index 000000000000..4dd7b4f57f18
--- /dev/null
+++ b/client/finality-grandpa-warp-sync/src/proof.rs
@@ -0,0 +1,298 @@
+// Copyright 2021 Parity Technologies (UK) Ltd.
+// This file is part of Substrate.
+
+// Substrate is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Substrate is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+
+use codec::{Decode, Encode};
+
+use sc_finality_grandpa::{
+	find_scheduled_change, AuthoritySetChanges, BlockNumberOps, GrandpaJustification,
+};
+use sp_blockchain::Backend as BlockchainBackend;
+use sp_finality_grandpa::{AuthorityList, SetId};
+use sp_runtime::{
+	generic::BlockId,
+	traits::{Block as BlockT, NumberFor},
+};
+
+use crate::HandleRequestError;
+
+/// The maximum number of authority set change proofs to include in a single warp sync proof.
+const MAX_CHANGES_PER_WARP_SYNC_PROOF: usize = 256;
+
+/// A proof of an authority set change.
+#[derive(Decode, Encode)]
+pub struct AuthoritySetChangeProof<Block: BlockT> {
+	/// The last block that the given authority set finalized. This block should contain a digest
+	/// signaling an authority set change from which we can fetch the next authority set.
+	pub header: Block::Header,
+	/// A justification for the header above which proves its finality. In order to validate it the
+	/// verifier must be aware of the authorities and set id for which the justification refers to.
+	pub justification: GrandpaJustification<Block>,
+}
+
+/// An accumulated proof of multiple authority set changes.
+#[derive(Decode, Encode)]
+pub struct WarpSyncProof<Block: BlockT> {
+	proofs: Vec<AuthoritySetChangeProof<Block>>,
+}
+
+impl<Block: BlockT> WarpSyncProof<Block> {
+	/// Generates a warp sync proof starting at the given block. It will generate authority set
+	/// change proofs for all changes that happened from `begin` until the current authority set
+	/// (capped by MAX_CHANGES_PER_WARP_SYNC_PROOF).
+	pub fn generate<Backend>(
+		backend: &Backend,
+		begin: Block::Hash,
+		set_changes: &AuthoritySetChanges<NumberFor<Block>>,
+	) -> Result<WarpSyncProof<Block>, HandleRequestError>
+	where
+		Backend: BlockchainBackend<Block>,
+	{
+		// TODO: cache best response (i.e. the one with lowest begin_number)
+
+		let begin_number = backend
+			.block_number_from_id(&BlockId::Hash(begin))?
+			.ok_or_else(|| HandleRequestError::InvalidRequest("Missing start block".to_string()))?;
+
+		if begin_number > backend.info().finalized_number {
+			return Err(HandleRequestError::InvalidRequest(
+				"Start block is not finalized".to_string(),
+			));
+		}
+
+		let canon_hash = backend.hash(begin_number)?.expect(
+			"begin number is lower than finalized number; \
+			 all blocks below finalized number must have been imported; \
+			 qed.",
+		);
+
+		if canon_hash != begin {
+			return Err(HandleRequestError::InvalidRequest(
+				"Start block is not in the finalized chain".to_string(),
+			));
+		}
+
+		let mut proofs = Vec::new();
+
+		for (_, last_block) in set_changes.iter_from(begin_number) {
+			if proofs.len() >= MAX_CHANGES_PER_WARP_SYNC_PROOF {
+				break;
+			}
+
+			let header = backend.header(BlockId::Number(*last_block))?.expect(
+				"header number comes from previously applied set changes; must exist in db; qed.",
+			);
+
+			// the last block in a set is the one that triggers a change to the next set,
+			// therefore the block must have a digest that signals the authority set change
+			if find_scheduled_change::<Block>(&header).is_none() {
+				// if it doesn't contain a signal for standard change then the set must have changed
+				// through a forced changed, in which case we stop collecting proofs as the chain of
+				// trust in authority handoffs was broken.
+				break;
+			}
+
+			let justification = backend.justification(BlockId::Number(*last_block))?.expect(
+				"header is last in set and contains standard change signal; \
+				 must have justification; \
+				 qed.",
+			);
+
+			let justification = GrandpaJustification::<Block>::decode(&mut &justification[..])?;
+
+			proofs.push(AuthoritySetChangeProof {
+				header: header.clone(),
+				justification,
+			});
+		}
+
+		Ok(WarpSyncProof { proofs })
+	}
+
+	/// Verifies the warp sync proof starting at the given set id and with the given authorities.
+	/// If the proof is valid the new set id and authorities is returned.
+	pub fn verify(
+		&self,
+		set_id: SetId,
+		authorities: AuthorityList,
+	) -> Result<(SetId, AuthorityList), HandleRequestError>
+	where
+		NumberFor<Block>: BlockNumberOps,
+	{
+		let mut current_set_id = set_id;
+		let mut current_authorities = authorities;
+
+		for proof in &self.proofs {
+			proof
+				.justification
+				.verify(current_set_id, &current_authorities)
+				.map_err(|err| HandleRequestError::InvalidProof(err.to_string()))?;
+
+			let scheduled_change = find_scheduled_change::<Block>(&proof.header).ok_or(
+				HandleRequestError::InvalidProof(
+					"Header is missing authority set change digest".to_string(),
+				),
+			)?;
+
+			current_authorities = scheduled_change.next_authorities;
+			current_set_id += 1;
+		}
+
+		Ok((current_set_id, current_authorities))
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use crate::WarpSyncProof;
+	use codec::Encode;
+	use rand::prelude::*;
+	use sc_block_builder::BlockBuilderProvider;
+	use sc_client_api::Backend;
+	use sc_finality_grandpa::{AuthoritySetChanges, GrandpaJustification};
+	use sp_blockchain::HeaderBackend;
+	use sp_consensus::BlockOrigin;
+	use sp_keyring::Ed25519Keyring;
+	use sp_runtime::{generic::BlockId, traits::Header as _};
+	use std::sync::Arc;
+	use substrate_test_runtime_client::{
+		ClientBlockImportExt, ClientExt, DefaultTestClientBuilderExt, TestClientBuilder,
+		TestClientBuilderExt,
+	};
+
+	#[test]
+	fn warp_sync_proof_generate_verify() {
+		let mut rng = rand::rngs::StdRng::from_seed([0; 32]);
+		let builder = TestClientBuilder::new();
+		let backend = builder.backend();
+		let mut client = Arc::new(builder.build());
+
+		let available_authorities = Ed25519Keyring::iter().collect::<Vec<_>>();
+		let genesis_authorities = vec![(Ed25519Keyring::Alice.public().into(), 1)];
+
+		let mut current_authorities = vec![Ed25519Keyring::Alice];
+		let mut current_set_id = 0;
+		let mut authority_set_changes = Vec::new();
+
+		for n in 1..=100 {
+			let mut block = client
+				.new_block(Default::default())
+				.unwrap()
+				.build()
+				.unwrap()
+				.block;
+
+			let mut new_authorities = None;
+
+			// we will trigger an authority set change every 10 blocks
+			if n != 0 && n % 10 == 0 {
+				// pick next authorities and add digest for the set change
+				let n_authorities = rng.gen_range(1..available_authorities.len());
+				let next_authorities = available_authorities
+					.choose_multiple(&mut rng, n_authorities)
+					.cloned()
+					.collect::<Vec<_>>();
+
+				new_authorities = Some(next_authorities.clone());
+
+				let next_authorities = next_authorities
+					.iter()
+					.map(|keyring| (keyring.public().into(), 1))
+					.collect::<Vec<_>>();
+
+				let digest = sp_runtime::generic::DigestItem::Consensus(
+					sp_finality_grandpa::GRANDPA_ENGINE_ID,
+					sp_finality_grandpa::ConsensusLog::ScheduledChange(
+						sp_finality_grandpa::ScheduledChange {
+							delay: 0u64,
+							next_authorities,
+						},
+					)
+					.encode(),
+				);
+
+				block.header.digest_mut().logs.push(digest);
+			}
+
+			client.import(BlockOrigin::Own, block).unwrap();
+
+			if let Some(new_authorities) = new_authorities {
+				// generate a justification for this block, finalize it and note the authority set
+				// change
+				let (target_hash, target_number) = {
+					let info = client.info();
+					(info.best_hash, info.best_number)
+				};
+
+				let mut precommits = Vec::new();
+				for keyring in &current_authorities {
+					let precommit = finality_grandpa::Precommit {
+						target_hash,
+						target_number,
+					};
+
+					let msg = finality_grandpa::Message::Precommit(precommit.clone());
+					let encoded = sp_finality_grandpa::localized_payload(42, current_set_id, &msg);
+					let signature = keyring.sign(&encoded[..]).into();
+
+					let precommit = finality_grandpa::SignedPrecommit {
+						precommit,
+						signature,
+						id: keyring.public().into(),
+					};
+
+					precommits.push(precommit);
+				}
+
+				let commit = finality_grandpa::Commit {
+					target_hash,
+					target_number,
+					precommits,
+				};
+
+				let justification = GrandpaJustification::from_commit(&client, 42, commit).unwrap();
+
+				client
+					.finalize_block(BlockId::Hash(target_hash), Some(justification.encode()))
+					.unwrap();
+
+				authority_set_changes.push((current_set_id, n));
+
+				current_set_id += 1;
+				current_authorities = new_authorities;
+			}
+		}
+
+		let authority_set_changes = AuthoritySetChanges::from(authority_set_changes);
+
+		// generate a warp sync proof
+		let genesis_hash = client.hash(0).unwrap().unwrap();
+
+		let warp_sync_proof =
+			WarpSyncProof::generate(backend.blockchain(), genesis_hash, &authority_set_changes)
+				.unwrap();
+
+		// verifying the proof should yield the last set id and authorities
+		let (new_set_id, new_authorities) = warp_sync_proof.verify(0, genesis_authorities).unwrap();
+
+		let expected_authorities = current_authorities
+			.iter()
+			.map(|keyring| (keyring.public().into(), 1))
+			.collect::<Vec<_>>();
+
+		assert_eq!(new_set_id, current_set_id);
+		assert_eq!(new_authorities, expected_authorities);
+	}
+}
diff --git a/client/finality-grandpa/src/authorities.rs b/client/finality-grandpa/src/authorities.rs
index 067f6dfc1ae6..11d3d4ba691d 100644
--- a/client/finality-grandpa/src/authorities.rs
+++ b/client/finality-grandpa/src/authorities.rs
@@ -650,10 +650,17 @@ impl<H, N: Add<Output=N> + Clone> PendingChange<H, N> {
 	}
 }
 
-// Tracks historical authority set changes. We store the block numbers for the first block of each
-// authority set, once they have been finalized.
+/// Tracks historical authority set changes. We store the block numbers for the last block
+/// of each authority set, once they have been finalized. These blocks are guaranteed to
+/// have a justification unless they were triggered by a forced change.
 #[derive(Debug, Encode, Decode, Clone, PartialEq)]
-pub struct AuthoritySetChanges<N>(pub Vec<(u64, N)>);
+pub struct AuthoritySetChanges<N>(Vec<(u64, N)>);
+
+impl<N> From<Vec<(u64, N)>> for AuthoritySetChanges<N> {
+	fn from(changes: Vec<(u64, N)>) -> AuthoritySetChanges<N> {
+		AuthoritySetChanges(changes)
+	}
+}
 
 impl<N: Ord + Clone> AuthoritySetChanges<N> {
 	pub(crate) fn empty() -> Self {
@@ -668,6 +675,7 @@ impl<N: Ord + Clone> AuthoritySetChanges<N> {
 		let idx = self.0
 			.binary_search_by_key(&block_number, |(_, n)| n.clone())
 			.unwrap_or_else(|b| b);
+
 		if idx < self.0.len() {
 			let (set_id, block_number) = self.0[idx].clone();
 			// To make sure we have the right set we need to check that the one before it also exists.
@@ -687,6 +695,19 @@ impl<N: Ord + Clone> AuthoritySetChanges<N> {
 			None
 		}
 	}
+
+	/// Returns an iterator over all historical authority set changes starting at the given block
+	/// number (excluded). The iterator yields a tuple representing the set id and the block number
+	/// of the last block in that set.
+	pub fn iter_from(&self, block_number: N) -> impl Iterator<Item = &(u64, N)> {
+		let idx = self.0.binary_search_by_key(&block_number, |(_, n)| n.clone())
+			// if there was a change at the given block number then we should start on the next
+			// index since we want to exclude the current block number
+			.map(|n| n + 1)
+			.unwrap_or_else(|b| b);
+
+		self.0[idx..].iter()
+	}
 }
 
 #[cfg(test)]
@@ -1627,4 +1648,32 @@ mod tests {
 		assert_eq!(authority_set_changes.get_set_id(42), Some((3, 81)));
 		assert_eq!(authority_set_changes.get_set_id(141), None);
 	}
+
+	#[test]
+	fn iter_from_works() {
+		let mut authority_set_changes = AuthoritySetChanges::empty();
+		authority_set_changes.append(1, 41);
+		authority_set_changes.append(2, 81);
+		authority_set_changes.append(3, 121);
+
+		assert_eq!(
+			vec![(1, 41), (2, 81), (3, 121)],
+			authority_set_changes.iter_from(40).cloned().collect::<Vec<_>>(),
+		);
+
+		assert_eq!(
+			vec![(2, 81), (3, 121)],
+			authority_set_changes.iter_from(41).cloned().collect::<Vec<_>>(),
+		);
+
+		assert_eq!(
+			0,
+			authority_set_changes.iter_from(121).count(),
+		);
+
+		assert_eq!(
+			0,
+			authority_set_changes.iter_from(200).count(),
+		);
+	}
 }
diff --git a/client/finality-grandpa/src/finality_proof.rs b/client/finality-grandpa/src/finality_proof.rs
index e1e424472ff9..c88faa249892 100644
--- a/client/finality-grandpa/src/finality_proof.rs
+++ b/client/finality-grandpa/src/finality_proof.rs
@@ -44,10 +44,10 @@ use parity_scale_codec::{Encode, Decode};
 use sp_blockchain::{Backend as BlockchainBackend, Error as ClientError, Result as ClientResult};
 use sp_runtime::{
 	Justification, generic::BlockId,
-	traits::{NumberFor, Block as BlockT, Header as HeaderT, Zero, One},
+	traits::{NumberFor, Block as BlockT, Header as HeaderT, One},
 };
 use sc_client_api::backend::Backend;
-use sp_finality_grandpa::{AuthorityId, AuthorityList};
+use sp_finality_grandpa::AuthorityId;
 
 use crate::authorities::AuthoritySetChanges;
 use crate::justification::GrandpaJustification;
@@ -151,23 +151,6 @@ pub enum FinalityProofError {
 	Client(sp_blockchain::Error),
 }
 
-/// Single fragment of authority set proof.
-///
-/// Finality for block B is proved by providing:
-/// 1) headers of this block;
-/// 2) the justification for the block containing a authority set change digest;
-#[derive(Debug, PartialEq, Clone, Encode, Decode)]
-pub(crate) struct AuthoritySetProofFragment<Header: HeaderT> {
-	/// The header of the given block.
-	pub header: Header,
-	/// Justification of the block F.
-	pub justification: Vec<u8>,
-}
-
-/// Proof of authority set is the ordered set of authority set fragments, where:
-/// - last fragment match target block.
-type AuthoritySetProof<Header> = Vec<AuthoritySetProofFragment<Header>>;
-
 fn prove_finality<Block, B, J>(
 	blockchain: &B,
 	authority_set_changes: AuthoritySetChanges<NumberFor<Block>>,
@@ -242,238 +225,6 @@ where
 	))
 }
 
-/// Prepare authority proof for the best possible block starting at a given trusted block.
-///
-/// Started block should be in range of bonding duration.
-/// We only return proof for finalized blocks (with justification).
-///
-/// It is assumed that the caller already have a proof-of-finality for the block 'begin'.
-pub fn prove_warp_sync<Block: BlockT, B: BlockchainBackend<Block>>(
-	blockchain: &B,
-	begin: Block::Hash,
-	max_fragment_limit: Option<usize>,
-	mut cache: Option<&mut WarpSyncFragmentCache<Block::Header>>,
-) -> ::sp_blockchain::Result<Vec<u8>> {
-
-	let begin = BlockId::Hash(begin);
-	let begin_number = blockchain.block_number_from_id(&begin)?
-		.ok_or_else(|| ClientError::Backend("Missing start block".to_string()))?;
-	let end = BlockId::Hash(blockchain.last_finalized()?);
-	let end_number = blockchain.block_number_from_id(&end)?
-		// This error should not happen, we could also panic.
-		.ok_or_else(|| ClientError::Backend("Missing last finalized block".to_string()))?;
-
-	if begin_number > end_number {
-		return Err(ClientError::Backend("Unfinalized start for authority proof".to_string()));
-	}
-
-	let mut result = Vec::new();
-	let mut last_apply = None;
-
-	let header = blockchain.expect_header(begin)?;
-	let mut index = *header.number();
-
-	// Find previous change in case there is a delay.
-	// This operation is a costy and only for the delay corner case.
-	while index > Zero::zero() {
-		index = index - One::one();
-		if let Some((fragment, apply_block)) = get_warp_sync_proof_fragment(blockchain, index, &mut cache)? {
-			if last_apply.map(|next| &next > header.number()).unwrap_or(false) {
-				result.push(fragment);
-				last_apply = Some(apply_block);
-			} else {
-				break;
-			}
-		}
-	}
-
-	let mut index = *header.number();
-	while index <= end_number {
-		if max_fragment_limit.map(|limit| result.len() >= limit).unwrap_or(false) {
-			break;
-		}
-
-		if let Some((fragement, apply_block)) = get_warp_sync_proof_fragment(blockchain, index, &mut cache)? {
-			if last_apply.map(|next| apply_block < next).unwrap_or(false) {
-				// Previous delayed will not apply, do not include it.
-				result.pop();
-			}
-			result.push(fragement);
-			last_apply = Some(apply_block);
-		}
-
-		index = index + One::one();
-	}
-
-	let at_limit = max_fragment_limit.map(|limit| result.len() >= limit).unwrap_or(false);
-
-	// add last finalized block if reached and not already included.
-	if !at_limit && result.last().as_ref().map(|head| head.header.number()) != Some(&end_number) {
-		let header = blockchain.expect_header(end)?;
-		if let Some(justification) = blockchain.justification(BlockId::Number(end_number.clone()))? {
-			result.push(AuthoritySetProofFragment {
-				header: header.clone(),
-				justification,
-			});
-		} else {
-			// no justification, don't include it.
-		}
-	}
-
-	Ok(result.encode())
-}
-
-/// Try get a warp sync proof fragment a a given finalized block.
-fn get_warp_sync_proof_fragment<Block: BlockT, B: BlockchainBackend<Block>>(
-	blockchain: &B,
-	index: NumberFor<Block>,
-	cache: &mut Option<&mut WarpSyncFragmentCache<Block::Header>>,
-) -> sp_blockchain::Result<Option<(AuthoritySetProofFragment<Block::Header>, NumberFor<Block>)>> {
-	if let Some(cache) = cache.as_mut() {
-		if let Some(result) = cache.get_item(index) {
-			return Ok(result);
-		}
-	}
-
-	let mut result = None;
-	let header = blockchain.expect_header(BlockId::number(index))?;
-
-	if let Some((block_number, sp_finality_grandpa::ScheduledChange {
-		next_authorities: _,
-		delay,
-	})) = crate::import::find_forced_change::<Block>(&header) {
-		let dest = block_number + delay;
-		if let Some(justification) = blockchain.justification(BlockId::Number(index.clone()))? {
-			result = Some((AuthoritySetProofFragment {
-				header: header.clone(),
-				justification,
-			}, dest));
-		} else {
-			return Err(ClientError::Backend("Unjustified block with authority set change".to_string()));
-		}
-	}
-
-	if let Some(sp_finality_grandpa::ScheduledChange {
-		next_authorities: _,
-		delay,
-	}) = crate::import::find_scheduled_change::<Block>(&header) {
-		let dest = index + delay;
-		if let Some(justification) = blockchain.justification(BlockId::Number(index.clone()))? {
-			result = Some((AuthoritySetProofFragment {
-				header: header.clone(),
-				justification,
-			}, dest));
-		} else {
-			return Err(ClientError::Backend("Unjustified block with authority set change".to_string()));
-		}
-	}
-
-	cache.as_mut().map(|cache| cache.new_item(index, result.clone()));
-	Ok(result)
-}
-
-/// Check GRANDPA authority change sequence to assert finality of a target block.
-///
-/// Returns the header of the target block.
-#[allow(unused)]
-pub(crate) fn check_warp_sync_proof<Block: BlockT, J>(
-	current_set_id: u64,
-	current_authorities: AuthorityList,
-	remote_proof: Vec<u8>,
-) -> ClientResult<(Block::Header, u64, AuthorityList)>
-where
-		NumberFor<Block>: BlockNumberOps,
-		J: Decode + ProvableJustification<Block::Header> + BlockJustification<Block::Header>,
-{
-	// decode finality proof
-	let proof = AuthoritySetProof::<Block::Header>::decode(&mut &remote_proof[..])
-		.map_err(|_| ClientError::BadJustification("failed to decode authority proof".into()))?;
-
-		let last = proof.len() - 1;
-
-		let mut result = (current_set_id, current_authorities, NumberFor::<Block>::zero());
-
-		for (ix, fragment) in proof.into_iter().enumerate() {
-			let is_last = ix == last;
-			result = check_warp_sync_proof_fragment::<Block, J>(
-				result.0,
-				&result.1,
-				&result.2,
-				is_last,
-				&fragment,
-			)?;
-
-			if is_last {
-				return Ok((fragment.header, result.0, result.1))
-			}
-		}
-
-		// empty proof can't prove anything
-		return Err(ClientError::BadJustification("empty proof of authority".into()));
-}
-
-/// Check finality authority set sequence.
-fn check_warp_sync_proof_fragment<Block: BlockT, J>(
-	current_set_id: u64,
-	current_authorities: &AuthorityList,
-	previous_checked_block: &NumberFor<Block>,
-	is_last: bool,
-	authorities_proof: &AuthoritySetProofFragment<Block::Header>,
-) -> ClientResult<(u64, AuthorityList, NumberFor<Block>)>
-where
-		NumberFor<Block>: BlockNumberOps,
-		J: Decode + ProvableJustification<Block::Header> + BlockJustification<Block::Header>,
-{
-	let justification: J = Decode::decode(&mut authorities_proof.justification.as_slice())
-		.map_err(|_| ClientError::JustificationDecode)?;
-		justification.verify(current_set_id, &current_authorities)?;
-
-		// assert justification is for this header
-		if &justification.number() != authorities_proof.header.number()
-			|| justification.hash().as_ref() != authorities_proof.header.hash().as_ref() {
-				return Err(ClientError::Backend("Invalid authority warp proof, justification do not match header".to_string()));
-		}
-
-		if authorities_proof.header.number() <= previous_checked_block {
-			return Err(ClientError::Backend("Invalid authority warp proof".to_string()));
-		}
-		let current_block = authorities_proof.header.number();
-		let mut at_block = None;
-		if let Some(sp_finality_grandpa::ScheduledChange {
-			next_authorities,
-			delay,
-		}) = crate::import::find_scheduled_change::<Block>(&authorities_proof.header) {
-			let dest = *current_block + delay;
-			at_block = Some((dest, next_authorities));
-		}
-		if let Some((block_number, sp_finality_grandpa::ScheduledChange {
-			next_authorities,
-			delay,
-		})) = crate::import::find_forced_change::<Block>(&authorities_proof.header) {
-			let dest = block_number + delay;
-			at_block = Some((dest, next_authorities));
-		}
-
-		// Fragment without change only allowed for proof last block.
-		if at_block.is_none() && !is_last {
-			return Err(ClientError::Backend("Invalid authority warp proof".to_string()));
-		}
-		if let Some((at_block, next_authorities)) = at_block {
-			Ok((current_set_id + 1, next_authorities, at_block))
-		} else {
-			Ok((current_set_id, current_authorities.clone(), current_block.clone()))
-		}
-}
-
-/// Block info extracted from the justification.
-pub(crate) trait BlockJustification<Header: HeaderT> {
-	/// Block number justified.
-	fn number(&self) -> Header::Number;
-
-	/// Block hash justified.
-	fn hash(&self) -> Header::Hash;
-}
-
 /// Check GRANDPA proof-of-finality for the given block.
 ///
 /// Returns the vector of headers that MUST be validated + imported
@@ -483,7 +234,7 @@ pub(crate) trait BlockJustification<Header: HeaderT> {
 #[cfg(test)]
 fn check_finality_proof<Header: HeaderT, J>(
 	current_set_id: u64,
-	current_authorities: AuthorityList,
+	current_authorities: sp_finality_grandpa::AuthorityList,
 	remote_proof: Vec<u8>,
 ) -> ClientResult<FinalityProof<Header>>
 where
@@ -529,70 +280,7 @@ where
 			ClientError::Consensus(sp_consensus::Error::InvalidAuthoritiesSet),
 		)?;
 
-		GrandpaJustification::verify(self, set_id, &authorities)
-	}
-}
-
-impl<Block: BlockT> BlockJustification<Block::Header> for GrandpaJustification<Block> {
-	fn number(&self) -> NumberFor<Block> {
-		self.commit.target_number.clone()
-	}
-	fn hash(&self) -> Block::Hash {
-		self.commit.target_hash.clone()
-	}
-}
-
-/// Simple cache for warp sync queries.
-pub struct WarpSyncFragmentCache<Header: HeaderT> {
-	header_has_proof_fragment: std::collections::HashMap<Header::Number, bool>,
-	cache: linked_hash_map::LinkedHashMap<
-		Header::Number,
-		(AuthoritySetProofFragment<Header>, Header::Number),
-		>,
-	limit: usize,
-}
-
-impl<Header: HeaderT> WarpSyncFragmentCache<Header> {
-	/// Instantiate a new cache for the warp sync prover.
-	pub fn new(size: usize) -> Self {
-		WarpSyncFragmentCache {
-			header_has_proof_fragment: Default::default(),
-			cache: Default::default(),
-			limit: size,
-		}
-	}
-
-	fn new_item(
-		&mut self,
-		at: Header::Number,
-		item: Option<(AuthoritySetProofFragment<Header>, Header::Number)>,
-	) {
-		self.header_has_proof_fragment.insert(at, item.is_some());
-
-		if let Some(item) = item {
-			if self.cache.len() == self.limit {
-				self.pop_one();
-			}
-
-			self.cache.insert(at, item);
-		}
-	}
-
-	fn pop_one(&mut self) {
-		if let Some((header_number, _)) = self.cache.pop_front() {
-			self.header_has_proof_fragment.remove(&header_number);
-		}
-	}
-
-	fn get_item(
-		&mut self,
-		block: Header::Number,
-	) -> Option<Option<(AuthoritySetProofFragment<Header>, Header::Number)>> {
-		match self.header_has_proof_fragment.get(&block) {
-			Some(true) => Some(self.cache.get_refresh(&block).cloned()),
-			Some(false) => Some(None),
-			None => None
-		}
+		GrandpaJustification::verify_with_voter_set(self, set_id, &authorities)
 	}
 }
 
@@ -624,15 +312,6 @@ pub(crate) mod tests {
 	#[derive(Debug, PartialEq, Encode, Decode)]
 	pub struct TestBlockJustification(TestJustification, u64, H256);
 
-	impl BlockJustification<Header> for TestBlockJustification {
-		fn number(&self) -> <Header as HeaderT>::Number {
-			self.1
-		}
-		fn hash(&self) -> <Header as HeaderT>::Hash {
-			self.2.clone()
-		}
-	}
-
 	impl ProvableJustification<Header> for TestBlockJustification {
 		fn verify(&self, set_id: u64, authorities: &[(AuthorityId, u64)]) -> ClientResult<()> {
 			self.0.verify(set_id, authorities)
@@ -826,161 +505,4 @@ pub(crate) mod tests {
 			}
 		);
 	}
-
-	#[test]
-	fn warp_sync_proof_encoding_decoding() {
-		fn test_blockchain(
-			nb_blocks: u64,
-			mut set_change: &[(u64, Vec<u8>)],
-			mut justifications: &[(u64, Vec<u8>)],
-		) -> (InMemoryBlockchain<Block>, Vec<H256>) {
-			let blockchain = InMemoryBlockchain::<Block>::new();
-			let mut hashes = Vec::<H256>::new();
-			let mut set_id = 0;
-			for i in 0..nb_blocks {
-				let mut set_id_next = set_id;
-				let mut header = header(i);
-				set_change.first()
-					.map(|j| if i == j.0 {
-						set_change = &set_change[1..];
-						let next_authorities: Vec<_> = j.1.iter().map(|i| (AuthorityId::from_slice(&[*i; 32]), 1u64)).collect();
-						set_id_next += 1;
-						header.digest_mut().logs.push(
-							sp_runtime::generic::DigestItem::Consensus(
-								sp_finality_grandpa::GRANDPA_ENGINE_ID,
-								sp_finality_grandpa::ConsensusLog::ScheduledChange(
-									sp_finality_grandpa::ScheduledChange { delay: 0u64, next_authorities }
-								).encode(),
-							));
-					});
-
-				if let Some(parent) = hashes.last() {
-					header.set_parent_hash(parent.clone());
-				}
-				let header_hash = header.hash();
-
-				let justification = justifications.first()
-					.and_then(|j| if i == j.0 {
-						justifications = &justifications[1..];
-
-						let authority = j.1.iter().map(|j|
-							(AuthorityId::from_slice(&[*j; 32]), 1u64)
-						).collect();
-						let justification = TestBlockJustification(
-							TestJustification((set_id, authority), vec![i as u8]),
-							i,
-							header_hash,
-						);
-						Some(justification.encode())
-					} else {
-						None
-					});
-				hashes.push(header_hash.clone());
-				set_id = set_id_next;
-
-				blockchain.insert(header_hash, header, justification, None, NewBlockState::Final)
-					.unwrap();
-					}
-			(blockchain, hashes)
-		}
-
-		let (blockchain, hashes) = test_blockchain(
-			7,
-			vec![(3, vec![9])].as_slice(),
-			vec![
-			(1, vec![1, 2, 3]),
-			(2, vec![1, 2, 3]),
-			(3, vec![1, 2, 3]),
-			(4, vec![9]),
-			(6, vec![9]),
-			].as_slice(),
-		);
-
-		// proof after set change
-		let mut cache = WarpSyncFragmentCache::new(5);
-		let proof_no_cache = prove_warp_sync(&blockchain, hashes[6], None, Some(&mut cache)).unwrap();
-		let proof = prove_warp_sync(&blockchain, hashes[6], None, Some(&mut cache)).unwrap();
-		assert_eq!(proof_no_cache, proof);
-
-		let initial_authorities: Vec<_> = [1u8, 2, 3].iter().map(|i|
-			(AuthorityId::from_slice(&[*i; 32]), 1u64)
-		).collect();
-
-		let authorities_next: Vec<_> = [9u8].iter().map(|i|
-			(AuthorityId::from_slice(&[*i; 32]), 1u64)
-		).collect();
-
-		assert!(check_warp_sync_proof::<Block, TestBlockJustification>(
-				0,
-				initial_authorities.clone(),
-				proof.clone(),
-		).is_err());
-		assert!(check_warp_sync_proof::<Block, TestBlockJustification>(
-				0,
-				authorities_next.clone(),
-				proof.clone(),
-		).is_err());
-		assert!(check_warp_sync_proof::<Block, TestBlockJustification>(
-				1,
-				initial_authorities.clone(),
-				proof.clone(),
-		).is_err());
-		let (
-			_header,
-			current_set_id,
-			current_set,
-		) = check_warp_sync_proof::<Block, TestBlockJustification>(
-		1,
-		authorities_next.clone(),
-		proof.clone(),
-		).unwrap();
-
-		assert_eq!(current_set_id, 1);
-		assert_eq!(current_set, authorities_next);
-
-		// proof before set change
-		let proof = prove_warp_sync(&blockchain, hashes[1], None, None).unwrap();
-		let (
-			_header,
-			current_set_id,
-			current_set,
-		) = check_warp_sync_proof::<Block, TestBlockJustification>(
-		0,
-		initial_authorities.clone(),
-		proof.clone(),
-		).unwrap();
-
-		assert_eq!(current_set_id, 1);
-		assert_eq!(current_set, authorities_next);
-
-		// two changes
-		let (blockchain, hashes) = test_blockchain(
-			13,
-			vec![(3, vec![7]), (8, vec![9])].as_slice(),
-			vec![
-			(1, vec![1, 2, 3]),
-			(2, vec![1, 2, 3]),
-			(3, vec![1, 2, 3]),
-			(4, vec![7]),
-			(6, vec![7]),
-			(8, vec![7]), // warning, requires a justification on change set
-			(10, vec![9]),
-			].as_slice(),
-		);
-
-		// proof before set change
-		let proof = prove_warp_sync(&blockchain, hashes[1], None, None).unwrap();
-		let (
-			_header,
-			current_set_id,
-			current_set,
-		) = check_warp_sync_proof::<Block, TestBlockJustification>(
-		0,
-		initial_authorities.clone(),
-		proof.clone(),
-		).unwrap();
-
-		assert_eq!(current_set_id, 2);
-		assert_eq!(current_set, authorities_next);
-	}
 }
diff --git a/client/finality-grandpa/src/import.rs b/client/finality-grandpa/src/import.rs
index d7b83b803290..2c86319dd54a 100644
--- a/client/finality-grandpa/src/import.rs
+++ b/client/finality-grandpa/src/import.rs
@@ -182,9 +182,11 @@ impl<'a, Block: 'a + BlockT> Drop for PendingSetChanges<'a, Block> {
 	}
 }
 
-pub(crate) fn find_scheduled_change<B: BlockT>(header: &B::Header)
-	-> Option<ScheduledChange<NumberFor<B>>>
-{
+/// Checks the given header for a consensus digest signalling a **standard** scheduled change and
+/// extracts it.
+pub fn find_scheduled_change<B: BlockT>(
+	header: &B::Header,
+) -> Option<ScheduledChange<NumberFor<B>>> {
 	let id = OpaqueDigestItemId::Consensus(&GRANDPA_ENGINE_ID);
 
 	let filter_log = |log: ConsensusLog<NumberFor<B>>| match log {
@@ -197,9 +199,11 @@ pub(crate) fn find_scheduled_change<B: BlockT>(header: &B::Header)
 	header.digest().convert_first(|l| l.try_to(id).and_then(filter_log))
 }
 
-pub(crate) fn find_forced_change<B: BlockT>(header: &B::Header)
-	-> Option<(NumberFor<B>, ScheduledChange<NumberFor<B>>)>
-{
+/// Checks the given header for a consensus digest signalling a **forced** scheduled change and
+/// extracts it.
+pub fn find_forced_change<B: BlockT>(
+	header: &B::Header,
+) -> Option<(NumberFor<B>, ScheduledChange<NumberFor<B>>)> {
 	let id = OpaqueDigestItemId::Consensus(&GRANDPA_ENGINE_ID);
 
 	let filter_log = |log: ConsensusLog<NumberFor<B>>| match log {
diff --git a/client/finality-grandpa/src/justification.rs b/client/finality-grandpa/src/justification.rs
index eba909bad5ef..69ca70386007 100644
--- a/client/finality-grandpa/src/justification.rs
+++ b/client/finality-grandpa/src/justification.rs
@@ -19,15 +19,16 @@
 use std::collections::{HashMap, HashSet};
 use std::sync::Arc;
 
+use finality_grandpa::{voter_set::VoterSet, Error as GrandpaError};
+use parity_scale_codec::{Decode, Encode};
 use sp_blockchain::{Error as ClientError, HeaderBackend};
-use parity_scale_codec::{Encode, Decode};
-use finality_grandpa::voter_set::VoterSet;
-use finality_grandpa::{Error as GrandpaError};
-use sp_runtime::generic::BlockId;
-use sp_runtime::traits::{NumberFor, Block as BlockT, Header as HeaderT};
 use sp_finality_grandpa::AuthorityId;
+use sp_runtime::{
+	generic::BlockId,
+	traits::{Block as BlockT, Header as HeaderT, NumberFor},
+};
 
-use crate::{Commit, Error};
+use crate::{AuthorityList, Commit, Error};
 
 /// A GRANDPA justification for block finality, it includes a commit message and
 /// an ancestry proof including all headers routing all precommit target blocks
@@ -105,12 +106,30 @@ impl<Block: BlockT> GrandpaJustification<Block> {
 			let msg = "invalid commit target in grandpa justification".to_string();
 			Err(ClientError::BadJustification(msg))
 		} else {
-			justification.verify(set_id, voters).map(|_| justification)
+			justification
+				.verify_with_voter_set(set_id, voters)
+				.map(|_| justification)
 		}
 	}
 
 	/// Validate the commit and the votes' ancestry proofs.
-	pub(crate) fn verify(&self, set_id: u64, voters: &VoterSet<AuthorityId>) -> Result<(), ClientError>
+	pub fn verify(&self, set_id: u64, authorities: &AuthorityList) -> Result<(), ClientError>
+	where
+		NumberFor<Block>: finality_grandpa::BlockNumberOps,
+	{
+		let voters = VoterSet::new(authorities.iter().cloned()).ok_or(ClientError::Consensus(
+			sp_consensus::Error::InvalidAuthoritiesSet,
+		))?;
+
+		self.verify_with_voter_set(set_id, &voters)
+	}
+
+	/// Validate the commit and the votes' ancestry proofs.
+	pub(crate) fn verify_with_voter_set(
+		&self,
+		set_id: u64,
+		voters: &VoterSet<AuthorityId>,
+	) -> Result<(), ClientError>
 	where
 		NumberFor<Block>: finality_grandpa::BlockNumberOps,
 	{
diff --git a/client/finality-grandpa/src/lib.rs b/client/finality-grandpa/src/lib.rs
index 809e14e5c90b..809d11ebae20 100644
--- a/client/finality-grandpa/src/lib.rs
+++ b/client/finality-grandpa/src/lib.rs
@@ -121,17 +121,16 @@ mod observer;
 mod until_imported;
 mod voting_rule;
 
-pub use authorities::{SharedAuthoritySet, AuthoritySet};
+pub use authorities::{AuthoritySet, AuthoritySetChanges, SharedAuthoritySet};
 pub use finality_proof::{FinalityProof, FinalityProofProvider, FinalityProofError};
 pub use notification::{GrandpaJustificationSender, GrandpaJustificationStream};
-pub use import::GrandpaBlockImport;
+pub use import::{find_scheduled_change, find_forced_change, GrandpaBlockImport};
 pub use justification::GrandpaJustification;
 pub use voting_rule::{
 	BeforeBestBlockBy, ThreeQuartersOfTheUnfinalizedChain, VotingRule, VotingRuleResult,
 	VotingRulesBuilder,
 };
 pub use finality_grandpa::voter::report;
-pub use finality_proof::{prove_warp_sync, WarpSyncFragmentCache};
 
 use aux_schema::PersistentData;
 use environment::{Environment, VoterSetState};

From 4b5b9bdafb9adfc7e3f740c515b5359201d32d84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20P=C3=A1nik?= <jakub.panik@gmail.com>
Date: Thu, 25 Feb 2021 09:03:49 +0000
Subject: [PATCH 0435/1194] Add ss58 prefix for HydraDX (#8058)

* Add ss58 prefix for HydraDX

* fix formatting
---
 primitives/core/src/crypto.rs | 3 +++
 ss58-registry.json            | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index 0e5aca8f7ce1..95192acc4cb1 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -580,11 +580,14 @@ ss58_address_format!(
 		(47, "reserved47", "Reserved for future use (47).")
 	NeatcoinAccount =>
 		(48, "neatcoin", "Neatcoin mainnet, standard account (*25519).")
+	HydraDXAccount =>
+		(63, "hydradx", "HydraDX standard account (*25519).")
 	AventusAccount =>
 		(65, "aventus", "Aventus Chain mainnet, standard account (*25519).")
 	CrustAccount =>
 		(66, "crust", "Crust Network, standard account (*25519).")
 	// Note: 16384 and above are reserved.
+
 );
 
 /// Set the default "version" (actually, this is a bit of a misnomer and the version byte is
diff --git a/ss58-registry.json b/ss58-registry.json
index d65485daeb19..23ea3f8b6ed1 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -451,6 +451,15 @@
 			"standardAccount": "*25519",
 			"website": "https://neatcoin.org"
 		},
+		{
+			"prefix": 63,
+			"network": "hydradx",
+			"displayName": "HydraDX",
+			"symbols": ["HDX"],
+			"decimals": [12],
+			"standardAccount": "*25519",
+			"website": "https://hydradx.io"
+		},
 		{
 			"prefix": 65,
 			"network": "aventus",

From 1febf99d6385ff9ff934a9b16a53234b4858bf5c Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Thu, 25 Feb 2021 11:43:48 +0100
Subject: [PATCH 0436/1194] allow to write pre and post runtime upgrade in
 pallet macro (#8194)

---
 bin/node-template/pallets/template/Cargo.toml |  1 +
 bin/node/runtime/Cargo.toml                   | 36 +++++++++++++++++++
 frame/assets/Cargo.toml                       |  1 +
 frame/atomic-swap/Cargo.toml                  |  1 +
 frame/aura/Cargo.toml                         |  1 +
 frame/authority-discovery/Cargo.toml          |  1 +
 frame/authorship/Cargo.toml                   |  1 +
 frame/babe/Cargo.toml                         |  1 +
 frame/balances/Cargo.toml                     |  1 +
 frame/bounties/Cargo.toml                     |  1 +
 frame/collective/Cargo.toml                   |  1 +
 frame/contracts/Cargo.toml                    |  1 +
 frame/democracy/Cargo.toml                    |  1 +
 .../election-provider-multi-phase/Cargo.toml  |  1 +
 frame/elections-phragmen/Cargo.toml           |  1 +
 frame/elections/Cargo.toml                    |  1 +
 frame/example-offchain-worker/Cargo.toml      |  1 +
 frame/example-parallel/Cargo.toml             |  1 +
 frame/grandpa/Cargo.toml                      |  1 +
 frame/identity/Cargo.toml                     |  1 +
 frame/im-online/Cargo.toml                    |  1 +
 frame/indices/Cargo.toml                      |  1 +
 frame/lottery/Cargo.toml                      |  1 +
 frame/membership/Cargo.toml                   |  1 +
 frame/merkle-mountain-range/Cargo.toml        |  1 +
 frame/multisig/Cargo.toml                     |  1 +
 frame/nicks/Cargo.toml                        |  1 +
 frame/node-authorization/Cargo.toml           |  1 +
 frame/offences/Cargo.toml                     |  1 +
 frame/proxy/Cargo.toml                        |  1 +
 frame/randomness-collective-flip/Cargo.toml   |  1 +
 frame/recovery/Cargo.toml                     |  1 +
 frame/scheduler/Cargo.toml                    |  1 +
 frame/scored-pool/Cargo.toml                  |  1 +
 frame/session/Cargo.toml                      |  1 +
 frame/society/Cargo.toml                      |  1 +
 frame/staking/Cargo.toml                      |  1 +
 frame/sudo/Cargo.toml                         |  1 +
 .../procedural/src/pallet/expand/hooks.rs     | 18 ++++++++++
 frame/support/src/dispatch.rs                 | 20 +++++++++++
 frame/support/src/traits.rs                   | 24 +++++++++----
 frame/system/Cargo.toml                       |  1 +
 frame/timestamp/Cargo.toml                    |  1 +
 frame/tips/Cargo.toml                         |  1 +
 frame/transaction-payment/Cargo.toml          |  1 +
 frame/treasury/Cargo.toml                     |  1 +
 frame/utility/Cargo.toml                      |  1 +
 frame/vesting/Cargo.toml                      |  1 +
 48 files changed, 136 insertions(+), 6 deletions(-)

diff --git a/bin/node-template/pallets/template/Cargo.toml b/bin/node-template/pallets/template/Cargo.toml
index a13d05082b01..e6c0c5ac0621 100644
--- a/bin/node-template/pallets/template/Cargo.toml
+++ b/bin/node-template/pallets/template/Cargo.toml
@@ -51,3 +51,4 @@ std = [
 	'frame-support/std',
 	'frame-system/std'
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index a803d141c9e1..6e615759db3a 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -154,6 +154,7 @@ std = [
 	"pallet-society/std",
 	"pallet-recovery/std",
 	"pallet-vesting/std",
+	"frame-try-runtime/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
@@ -193,4 +194,39 @@ runtime-benchmarks = [
 try-runtime = [
 	"frame-executive/try-runtime",
 	"frame-try-runtime",
+	"frame-system/try-runtime",
+	"pallet-assets/try-runtime",
+	"pallet-authority-discovery/try-runtime",
+	"pallet-authorship/try-runtime",
+	"pallet-babe/try-runtime",
+	"pallet-balances/try-runtime",
+	"pallet-bounties/try-runtime",
+	"pallet-collective/try-runtime",
+	"pallet-contracts/try-runtime",
+	"pallet-democracy/try-runtime",
+	"pallet-elections-phragmen/try-runtime",
+	"pallet-grandpa/try-runtime",
+	"pallet-im-online/try-runtime",
+	"pallet-indices/try-runtime",
+	"pallet-lottery/try-runtime",
+	"pallet-membership/try-runtime",
+	"pallet-mmr/try-runtime",
+	"pallet-multisig/try-runtime",
+	"pallet-identity/try-runtime",
+	"pallet-scheduler/try-runtime",
+	"pallet-offences/try-runtime",
+	"pallet-proxy/try-runtime",
+	"pallet-randomness-collective-flip/try-runtime",
+	"pallet-session/try-runtime",
+	"pallet-staking/try-runtime",
+	"pallet-sudo/try-runtime",
+	"pallet-election-provider-multi-phase/try-runtime",
+	"pallet-timestamp/try-runtime",
+	"pallet-tips/try-runtime",
+	"pallet-transaction-payment/try-runtime",
+	"pallet-treasury/try-runtime",
+	"pallet-utility/try-runtime",
+	"pallet-society/try-runtime",
+	"pallet-recovery/try-runtime",
+	"pallet-vesting/try-runtime",
 ]
diff --git a/frame/assets/Cargo.toml b/frame/assets/Cargo.toml
index 67fa0af3d63b..9be2d6d09108 100644
--- a/frame/assets/Cargo.toml
+++ b/frame/assets/Cargo.toml
@@ -46,3 +46,4 @@ runtime-benchmarks = [
 	"sp-runtime/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/atomic-swap/Cargo.toml b/frame/atomic-swap/Cargo.toml
index 99ce41f39939..a3b62d65e56a 100644
--- a/frame/atomic-swap/Cargo.toml
+++ b/frame/atomic-swap/Cargo.toml
@@ -37,3 +37,4 @@ std = [
 	"sp-io/std",
 	"sp-core/std",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/aura/Cargo.toml b/frame/aura/Cargo.toml
index 80ea164cf0f5..5f299cfbe09f 100644
--- a/frame/aura/Cargo.toml
+++ b/frame/aura/Cargo.toml
@@ -45,3 +45,4 @@ std = [
 	"sp-timestamp/std",
 	"pallet-timestamp/std",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/authority-discovery/Cargo.toml b/frame/authority-discovery/Cargo.toml
index 43a09b01fd45..85844cf716f0 100644
--- a/frame/authority-discovery/Cargo.toml
+++ b/frame/authority-discovery/Cargo.toml
@@ -41,3 +41,4 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/authorship/Cargo.toml b/frame/authorship/Cargo.toml
index ab48fbec8f50..3bbbe9749c63 100644
--- a/frame/authorship/Cargo.toml
+++ b/frame/authorship/Cargo.toml
@@ -38,3 +38,4 @@ std = [
 	"frame-system/std",
 	"sp-authorship/std",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/babe/Cargo.toml b/frame/babe/Cargo.toml
index f0d902142635..3b9b16d294eb 100644
--- a/frame/babe/Cargo.toml
+++ b/frame/babe/Cargo.toml
@@ -61,3 +61,4 @@ std = [
 	"sp-timestamp/std",
 ]
 runtime-benchmarks = ["frame-benchmarking"]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/balances/Cargo.toml b/frame/balances/Cargo.toml
index 39b7fda77fef..2b1cde70d3dd 100644
--- a/frame/balances/Cargo.toml
+++ b/frame/balances/Cargo.toml
@@ -38,3 +38,4 @@ std = [
 	"frame-system/std",
 ]
 runtime-benchmarks = ["frame-benchmarking"]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/bounties/Cargo.toml b/frame/bounties/Cargo.toml
index ec4f1b94cd62..090458c0162b 100644
--- a/frame/bounties/Cargo.toml
+++ b/frame/bounties/Cargo.toml
@@ -45,3 +45,4 @@ runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/collective/Cargo.toml b/frame/collective/Cargo.toml
index 0c58f4164010..0bddb400e608 100644
--- a/frame/collective/Cargo.toml
+++ b/frame/collective/Cargo.toml
@@ -44,3 +44,4 @@ runtime-benchmarks = [
 	"sp-runtime/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/contracts/Cargo.toml b/frame/contracts/Cargo.toml
index c5ba615504c6..3cff8dbfa9bd 100644
--- a/frame/contracts/Cargo.toml
+++ b/frame/contracts/Cargo.toml
@@ -69,3 +69,4 @@ runtime-benchmarks = [
 	"rand",
 	"rand_pcg",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/democracy/Cargo.toml b/frame/democracy/Cargo.toml
index 2e675dd25188..3cd859a9b67b 100644
--- a/frame/democracy/Cargo.toml
+++ b/frame/democracy/Cargo.toml
@@ -48,3 +48,4 @@ runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/election-provider-multi-phase/Cargo.toml b/frame/election-provider-multi-phase/Cargo.toml
index e52093ce1354..851db01bfa3f 100644
--- a/frame/election-provider-multi-phase/Cargo.toml
+++ b/frame/election-provider-multi-phase/Cargo.toml
@@ -64,3 +64,4 @@ runtime-benchmarks = [
 	"frame-benchmarking",
 	"rand",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/elections-phragmen/Cargo.toml b/frame/elections-phragmen/Cargo.toml
index bdb301c73ec3..ce568d1d8eaf 100644
--- a/frame/elections-phragmen/Cargo.toml
+++ b/frame/elections-phragmen/Cargo.toml
@@ -45,3 +45,4 @@ runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/elections/Cargo.toml b/frame/elections/Cargo.toml
index a13c6d7567f0..ac3c709300f5 100644
--- a/frame/elections/Cargo.toml
+++ b/frame/elections/Cargo.toml
@@ -38,3 +38,4 @@ std = [
 	"sp-runtime/std",
 	"frame-system/std",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/example-offchain-worker/Cargo.toml b/frame/example-offchain-worker/Cargo.toml
index 5a2db258f8a1..cf4b3beaa904 100644
--- a/frame/example-offchain-worker/Cargo.toml
+++ b/frame/example-offchain-worker/Cargo.toml
@@ -38,3 +38,4 @@ std = [
 	"sp-runtime/std",
 	"sp-std/std",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/example-parallel/Cargo.toml b/frame/example-parallel/Cargo.toml
index b2f28887cec0..2c593db7ec9d 100644
--- a/frame/example-parallel/Cargo.toml
+++ b/frame/example-parallel/Cargo.toml
@@ -36,3 +36,4 @@ std = [
 	"sp-std/std",
 	"sp-tasks/std",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/grandpa/Cargo.toml b/frame/grandpa/Cargo.toml
index 39207e10f8f3..692674155c17 100644
--- a/frame/grandpa/Cargo.toml
+++ b/frame/grandpa/Cargo.toml
@@ -59,3 +59,4 @@ std = [
 	"pallet-session/std",
 ]
 runtime-benchmarks = ["frame-benchmarking"]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/identity/Cargo.toml b/frame/identity/Cargo.toml
index 3fd0c30a0f83..1db480ecb94c 100644
--- a/frame/identity/Cargo.toml
+++ b/frame/identity/Cargo.toml
@@ -40,3 +40,4 @@ std = [
 	"frame-system/std",
 ]
 runtime-benchmarks = ["frame-benchmarking"]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/im-online/Cargo.toml b/frame/im-online/Cargo.toml
index bde041c43764..6e7f4b03abb5 100644
--- a/frame/im-online/Cargo.toml
+++ b/frame/im-online/Cargo.toml
@@ -46,3 +46,4 @@ std = [
 	"frame-system/std",
 ]
 runtime-benchmarks = ["frame-benchmarking"]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/indices/Cargo.toml b/frame/indices/Cargo.toml
index cde3cdeeecba..0d99fbb13485 100644
--- a/frame/indices/Cargo.toml
+++ b/frame/indices/Cargo.toml
@@ -45,3 +45,4 @@ runtime-benchmarks = [
 	"frame-benchmarking",
 	"frame-support/runtime-benchmarks",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/lottery/Cargo.toml b/frame/lottery/Cargo.toml
index 05bb7e385f5d..94cd6d2325e5 100644
--- a/frame/lottery/Cargo.toml
+++ b/frame/lottery/Cargo.toml
@@ -41,3 +41,4 @@ runtime-benchmarks = [
 	"frame-system/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/membership/Cargo.toml b/frame/membership/Cargo.toml
index 98987e6fe901..37e7aa2cb824 100644
--- a/frame/membership/Cargo.toml
+++ b/frame/membership/Cargo.toml
@@ -35,3 +35,4 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/merkle-mountain-range/Cargo.toml b/frame/merkle-mountain-range/Cargo.toml
index eea3845ae16d..c1fe0aca8485 100644
--- a/frame/merkle-mountain-range/Cargo.toml
+++ b/frame/merkle-mountain-range/Cargo.toml
@@ -44,3 +44,4 @@ std = [
 	"sp-std/std",
 ]
 runtime-benchmarks = ["frame-benchmarking"]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/multisig/Cargo.toml b/frame/multisig/Cargo.toml
index e8d625138371..451cc1033b94 100644
--- a/frame/multisig/Cargo.toml
+++ b/frame/multisig/Cargo.toml
@@ -43,3 +43,4 @@ runtime-benchmarks = [
 	"frame-benchmarking",
 	"frame-support/runtime-benchmarks",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/nicks/Cargo.toml b/frame/nicks/Cargo.toml
index 611f492b81f2..6c8b609b401c 100644
--- a/frame/nicks/Cargo.toml
+++ b/frame/nicks/Cargo.toml
@@ -36,3 +36,4 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/node-authorization/Cargo.toml b/frame/node-authorization/Cargo.toml
index db77f25c1887..b76976d831c9 100644
--- a/frame/node-authorization/Cargo.toml
+++ b/frame/node-authorization/Cargo.toml
@@ -33,3 +33,4 @@ std = [
 	"sp-runtime/std",
 	"sp-std/std",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/offences/Cargo.toml b/frame/offences/Cargo.toml
index 3232d5f3ae5d..cbf779df8474 100644
--- a/frame/offences/Cargo.toml
+++ b/frame/offences/Cargo.toml
@@ -39,3 +39,4 @@ std = [
 	"frame-system/std",
 ]
 runtime-benchmarks = []
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/proxy/Cargo.toml b/frame/proxy/Cargo.toml
index 9490364abd87..d297d324aa10 100644
--- a/frame/proxy/Cargo.toml
+++ b/frame/proxy/Cargo.toml
@@ -44,3 +44,4 @@ runtime-benchmarks = [
 	"frame-benchmarking",
 	"frame-support/runtime-benchmarks",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/randomness-collective-flip/Cargo.toml b/frame/randomness-collective-flip/Cargo.toml
index 285326ef1e9a..ad9bcb97837d 100644
--- a/frame/randomness-collective-flip/Cargo.toml
+++ b/frame/randomness-collective-flip/Cargo.toml
@@ -35,3 +35,4 @@ std = [
 	"sp-runtime/std",
 	"sp-std/std",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/recovery/Cargo.toml b/frame/recovery/Cargo.toml
index 80450db0bd39..1f8003bd4d05 100644
--- a/frame/recovery/Cargo.toml
+++ b/frame/recovery/Cargo.toml
@@ -37,3 +37,4 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/scheduler/Cargo.toml b/frame/scheduler/Cargo.toml
index eef287d86771..a0624247f5c9 100644
--- a/frame/scheduler/Cargo.toml
+++ b/frame/scheduler/Cargo.toml
@@ -41,3 +41,4 @@ runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/scored-pool/Cargo.toml b/frame/scored-pool/Cargo.toml
index e5e71dba6888..97e3a954d7e2 100644
--- a/frame/scored-pool/Cargo.toml
+++ b/frame/scored-pool/Cargo.toml
@@ -36,3 +36,4 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/session/Cargo.toml b/frame/session/Cargo.toml
index 5b8fe6e2d137..52b8ebbdf478 100644
--- a/frame/session/Cargo.toml
+++ b/frame/session/Cargo.toml
@@ -47,3 +47,4 @@ std = [
 	"pallet-timestamp/std",
 	"sp-trie/std",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/society/Cargo.toml b/frame/society/Cargo.toml
index 5ddebeb9f579..913e40e0301d 100644
--- a/frame/society/Cargo.toml
+++ b/frame/society/Cargo.toml
@@ -41,3 +41,4 @@ runtime-benchmarks = [
 	"sp-runtime/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/staking/Cargo.toml b/frame/staking/Cargo.toml
index 11de7e63ea94..21e5b4a56489 100644
--- a/frame/staking/Cargo.toml
+++ b/frame/staking/Cargo.toml
@@ -69,3 +69,4 @@ runtime-benchmarks = [
 	"sp-election-providers/runtime-benchmarks",
 	"rand_chacha",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/sudo/Cargo.toml b/frame/sudo/Cargo.toml
index ed19d2e16535..c1b841c30c6a 100644
--- a/frame/sudo/Cargo.toml
+++ b/frame/sudo/Cargo.toml
@@ -35,3 +35,4 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/support/procedural/src/pallet/expand/hooks.rs b/frame/support/procedural/src/pallet/expand/hooks.rs
index 2e4fddebb7b0..b1eee507fdf5 100644
--- a/frame/support/procedural/src/pallet/expand/hooks.rs
+++ b/frame/support/procedural/src/pallet/expand/hooks.rs
@@ -75,6 +75,24 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 
 				result.saturating_add(additional_write)
 			}
+
+			#[cfg(feature = "try-runtime")]
+			fn pre_upgrade() -> Result<(), &'static str> {
+				<
+					Self
+					as
+					#frame_support::traits::Hooks<<T as #frame_system::Config>::BlockNumber>
+				>::pre_upgrade()
+			}
+
+			#[cfg(feature = "try-runtime")]
+			fn post_upgrade() -> Result<(), &'static str> {
+				<
+					Self
+					as
+					#frame_support::traits::Hooks<<T as #frame_system::Config>::BlockNumber>
+				>::post_upgrade()
+			}
 		}
 
 		impl<#type_impl_gen>
diff --git a/frame/support/src/dispatch.rs b/frame/support/src/dispatch.rs
index 7927ccd014bd..f5c8f017e345 100644
--- a/frame/support/src/dispatch.rs
+++ b/frame/support/src/dispatch.rs
@@ -1334,6 +1334,16 @@ macro_rules! decl_module {
 
 				result.saturating_add(additional_write)
 			}
+
+			#[cfg(feature = "try-runtime")]
+			fn pre_upgrade() -> Result<(), &'static str> {
+				Ok(())
+			}
+
+			#[cfg(feature = "try-runtime")]
+			fn post_upgrade() -> Result<(), &'static str> {
+				Ok(())
+			}
 		}
 	};
 
@@ -1356,6 +1366,16 @@ macro_rules! decl_module {
 					<$trait_instance as $system::Config>::DbWeight as $crate::traits::Get<_>
 				>::get().writes(1)
 			}
+
+			#[cfg(feature = "try-runtime")]
+			fn pre_upgrade() -> Result<(), &'static str> {
+				Ok(())
+			}
+
+			#[cfg(feature = "try-runtime")]
+			fn post_upgrade() -> Result<(), &'static str> {
+				Ok(())
+			}
 		}
 	};
 
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index 4114afa973cb..f0ab3be642cb 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -1575,17 +1575,13 @@ pub trait OnRuntimeUpgrade {
 	///
 	/// This hook is never meant to be executed on-chain but is meant to be used by testing tools.
 	#[cfg(feature = "try-runtime")]
-	fn pre_upgrade() -> Result<(), &'static str> {
-		Ok(())
-	}
+	fn pre_upgrade() -> Result<(), &'static str>;
 
 	/// Execute some post-checks after a runtime upgrade.
 	///
 	/// This hook is never meant to be executed on-chain but is meant to be used by testing tools.
 	#[cfg(feature = "try-runtime")]
-	fn post_upgrade() -> Result<(), &'static str> {
-		Ok(())
-	}
+	fn post_upgrade() -> Result<(), &'static str>;
 }
 
 #[impl_for_tuples(30)]
@@ -2012,6 +2008,22 @@ pub trait Hooks<BlockNumber> {
 	/// Return the non-negotiable weight consumed for runtime upgrade.
 	fn on_runtime_upgrade() -> crate::weights::Weight { 0 }
 
+	/// Execute some pre-checks prior to a runtime upgrade.
+	///
+	/// This hook is never meant to be executed on-chain but is meant to be used by testing tools.
+	#[cfg(feature = "try-runtime")]
+	fn pre_upgrade() -> Result<(), &'static str> {
+		Ok(())
+	}
+
+	/// Execute some post-checks after a runtime upgrade.
+	///
+	/// This hook is never meant to be executed on-chain but is meant to be used by testing tools.
+	#[cfg(feature = "try-runtime")]
+	fn post_upgrade() -> Result<(), &'static str> {
+		Ok(())
+	}
+
 	/// Implementing this function on a module allows you to perform long-running tasks
 	/// that make (by default) validators generate transactions that feed results
 	/// of those long-running computations back on chain.
diff --git a/frame/system/Cargo.toml b/frame/system/Cargo.toml
index c4530e9dfd09..4789f9b8add3 100644
--- a/frame/system/Cargo.toml
+++ b/frame/system/Cargo.toml
@@ -44,6 +44,7 @@ runtime-benchmarks = [
 	"sp-runtime/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 ]
+try-runtime = ["frame-support/try-runtime"]
 
 [[bench]]
 name = "bench"
diff --git a/frame/timestamp/Cargo.toml b/frame/timestamp/Cargo.toml
index f4f7bbda0f88..843517049ad9 100644
--- a/frame/timestamp/Cargo.toml
+++ b/frame/timestamp/Cargo.toml
@@ -45,3 +45,4 @@ std = [
 	"sp-timestamp/std"
 ]
 runtime-benchmarks = ["frame-benchmarking", "sp-io"]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/tips/Cargo.toml b/frame/tips/Cargo.toml
index 92af65ce0765..aa776ffaaf06 100644
--- a/frame/tips/Cargo.toml
+++ b/frame/tips/Cargo.toml
@@ -45,3 +45,4 @@ runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/transaction-payment/Cargo.toml b/frame/transaction-payment/Cargo.toml
index 7a713ab1cfbd..2a7fbe503efa 100644
--- a/frame/transaction-payment/Cargo.toml
+++ b/frame/transaction-payment/Cargo.toml
@@ -40,3 +40,4 @@ std = [
 	"sp-io/std",
 	"sp-core/std",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/treasury/Cargo.toml b/frame/treasury/Cargo.toml
index 461dc9122394..186a5900cf07 100644
--- a/frame/treasury/Cargo.toml
+++ b/frame/treasury/Cargo.toml
@@ -45,3 +45,4 @@ runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/utility/Cargo.toml b/frame/utility/Cargo.toml
index edb930231e17..b4f8b4943df2 100644
--- a/frame/utility/Cargo.toml
+++ b/frame/utility/Cargo.toml
@@ -43,3 +43,4 @@ runtime-benchmarks = [
 	"frame-benchmarking",
 	"frame-support/runtime-benchmarks",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/vesting/Cargo.toml b/frame/vesting/Cargo.toml
index dc42fbcbab10..31d1f72869bf 100644
--- a/frame/vesting/Cargo.toml
+++ b/frame/vesting/Cargo.toml
@@ -40,3 +40,4 @@ std = [
 	"frame-system/std",
 ]
 runtime-benchmarks = ["frame-benchmarking"]
+try-runtime = ["frame-support/try-runtime"]

From df6a40032727a11402739a3ff600577da5ae2388 Mon Sep 17 00:00:00 2001
From: Ashley <ashley.ruglys@gmail.com>
Date: Thu, 25 Feb 2021 13:39:30 +0100
Subject: [PATCH 0437/1194] Add an is_finished boolean to the grandpa warp sync
 response (#8203)

---
 client/finality-grandpa-warp-sync/src/proof.rs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/client/finality-grandpa-warp-sync/src/proof.rs b/client/finality-grandpa-warp-sync/src/proof.rs
index 4dd7b4f57f18..1b447d2ef720 100644
--- a/client/finality-grandpa-warp-sync/src/proof.rs
+++ b/client/finality-grandpa-warp-sync/src/proof.rs
@@ -46,6 +46,7 @@ pub struct AuthoritySetChangeProof<Block: BlockT> {
 #[derive(Decode, Encode)]
 pub struct WarpSyncProof<Block: BlockT> {
 	proofs: Vec<AuthoritySetChangeProof<Block>>,
+	is_finished: bool,
 }
 
 impl<Block: BlockT> WarpSyncProof<Block> {
@@ -86,8 +87,11 @@ impl<Block: BlockT> WarpSyncProof<Block> {
 
 		let mut proofs = Vec::new();
 
+		let mut proof_limit_reached = false;
+
 		for (_, last_block) in set_changes.iter_from(begin_number) {
 			if proofs.len() >= MAX_CHANGES_PER_WARP_SYNC_PROOF {
+				proof_limit_reached = true;
 				break;
 			}
 
@@ -118,7 +122,10 @@ impl<Block: BlockT> WarpSyncProof<Block> {
 			});
 		}
 
-		Ok(WarpSyncProof { proofs })
+		Ok(WarpSyncProof {
+			proofs,
+			is_finished: !proof_limit_reached,
+		})
 	}
 
 	/// Verifies the warp sync proof starting at the given set id and with the given authorities.

From 74d5612172965d66d5876ee1519a8a66c2adc4ba Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Thu, 25 Feb 2021 13:51:29 +0100
Subject: [PATCH 0438/1194] Fix networking debug_asserts (#8200)

* Fix networking debug_asserts

* Fix comment
---
 .../src/protocol/generic_proto/behaviour.rs   | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/client/network/src/protocol/generic_proto/behaviour.rs b/client/network/src/protocol/generic_proto/behaviour.rs
index cd77852c9107..3283ea33a04e 100644
--- a/client/network/src/protocol/generic_proto/behaviour.rs
+++ b/client/network/src/protocol/generic_proto/behaviour.rs
@@ -1467,13 +1467,14 @@ impl NetworkBehaviour for GenericProto {
 							if let ConnectionState::Closed = *connec_state {
 								*connec_state = ConnectionState::OpenDesiredByRemote;
 							} else {
-								// Connections in `OpeningThenClosing` state are in a Closed phase,
-								// and as such can emit `OpenDesiredByRemote` messages.
-								// Since an `Open` and a `Close` messages have already been sent,
+								// Connections in `OpeningThenClosing` and `Closing` state can be
+								// in a Closed phase, and as such can emit `OpenDesiredByRemote`
+								// messages.
+								// Since an `Open` and/or a `Close` message have already been sent,
 								// there is nothing much that can be done about this anyway.
 								debug_assert!(matches!(
 									connec_state,
-									ConnectionState::OpeningThenClosing
+									ConnectionState::OpeningThenClosing | ConnectionState::Closing
 								));
 							}
 						} else {
@@ -1502,13 +1503,15 @@ impl NetworkBehaviour for GenericProto {
 								});
 								*connec_state = ConnectionState::Opening;
 							} else {
-								// Connections in `OpeningThenClosing` and `Opening` are in a Closed
-								// phase, and as such can emit `OpenDesiredByRemote` messages.
+								// Connections in `OpeningThenClosing`, `Opening`, and `Closing`
+								// state can be in a Closed phase, and as such can emit
+								// `OpenDesiredByRemote` messages.
 								// Since an `Open` message haS already been sent, there is nothing
 								// more to do.
 								debug_assert!(matches!(
 									connec_state,
-									ConnectionState::OpenDesiredByRemote | ConnectionState::Opening
+									ConnectionState::OpenDesiredByRemote |
+									ConnectionState::Closing | ConnectionState::Opening
 								));
 							}
 						} else {
@@ -1544,12 +1547,13 @@ impl NetworkBehaviour for GenericProto {
 								*entry.into_mut() = PeerState::Incoming { connections, backoff_until };
 
 							} else {
-								// Connections in `OpeningThenClosing` are in a Closed phase, and
-								// as such can emit `OpenDesiredByRemote` messages.
+								// Connections in `OpeningThenClosing` and `Closing` state can be
+								// in a Closed phase, and as such can emit `OpenDesiredByRemote`
+								// messages.
 								// We ignore them.
 								debug_assert!(matches!(
 									connec_state,
-									ConnectionState::OpeningThenClosing
+									ConnectionState::OpeningThenClosing | ConnectionState::Closing
 								));
 								*entry.into_mut() = PeerState::Disabled { connections, backoff_until };
 							}
@@ -1578,12 +1582,13 @@ impl NetworkBehaviour for GenericProto {
 								*entry.into_mut() = PeerState::Enabled { connections };
 
 							} else {
-								// Connections in `OpeningThenClosing` are in a Closed phase, and
-								// as such can emit `OpenDesiredByRemote` messages.
+								// Connections in `OpeningThenClosing` and `Closing` state can be
+								// in a Closed phase, and as such can emit `OpenDesiredByRemote`
+								// messages.
 								// We ignore them.
 								debug_assert!(matches!(
 									connec_state,
-									ConnectionState::OpeningThenClosing
+									ConnectionState::OpeningThenClosing | ConnectionState::Closing
 								));
 								*entry.into_mut() = PeerState::DisabledPendingEnable {
 									connections,

From 6fae4a12d6205d4ae803df7e9afb4248b4ea3279 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Thu, 25 Feb 2021 16:25:08 +0100
Subject: [PATCH 0439/1194] pallet macro broke `benchmarks_instance`, fix by
 introducing  `benchmarks_instance_pallet` (#8190)

Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
---
 frame/balances/src/benchmarking.rs | 40 ++++++------
 frame/benchmarking/src/lib.rs      | 98 ++++++++++++++++++------------
 2 files changed, 79 insertions(+), 59 deletions(-)

diff --git a/frame/balances/src/benchmarking.rs b/frame/balances/src/benchmarking.rs
index 14732b44b4fc..c7cb67403d74 100644
--- a/frame/balances/src/benchmarking.rs
+++ b/frame/balances/src/benchmarking.rs
@@ -22,7 +22,7 @@
 use super::*;
 
 use frame_system::RawOrigin;
-use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
+use frame_benchmarking::{benchmarks_instance_pallet, account, whitelisted_caller, impl_benchmark_test_suite};
 use sp_runtime::traits::Bounded;
 
 use crate::Module as Balances;
@@ -32,7 +32,7 @@ const SEED: u32 = 0;
 const ED_MULTIPLIER: u32 = 10;
 
 
-benchmarks! {
+benchmarks_instance_pallet! {
 	// Benchmark `transfer` extrinsic with the worst possible conditions:
 	// * Transfer will kill the sender account.
 	// * Transfer will create the recipient account.
@@ -42,7 +42,7 @@ benchmarks! {
 
 		// Give some multiple of the existential deposit + creation fee + transfer fee
 		let balance = existential_deposit.saturating_mul(ED_MULTIPLIER.into());
-		let _ = <Balances<T> as Currency<_>>::make_free_balance_be(&caller, balance);
+		let _ = <Balances<T, I> as Currency<_>>::make_free_balance_be(&caller, balance);
 
 		// Transfer `e - 1` existential deposits + 1 unit, which guarantees to create one account, and reap this user.
 		let recipient: T::AccountId = account("recipient", 0, SEED);
@@ -50,8 +50,8 @@ benchmarks! {
 		let transfer_amount = existential_deposit.saturating_mul((ED_MULTIPLIER - 1).into()) + 1u32.into();
 	}: transfer(RawOrigin::Signed(caller.clone()), recipient_lookup, transfer_amount)
 	verify {
-		assert_eq!(Balances::<T>::free_balance(&caller), Zero::zero());
-		assert_eq!(Balances::<T>::free_balance(&recipient), transfer_amount);
+		assert_eq!(Balances::<T, I>::free_balance(&caller), Zero::zero());
+		assert_eq!(Balances::<T, I>::free_balance(&recipient), transfer_amount);
 	}
 
 	// Benchmark `transfer` with the best possible condition:
@@ -63,16 +63,16 @@ benchmarks! {
 		let recipient_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(recipient.clone());
 
 		// Give the sender account max funds for transfer (their account will never reasonably be killed).
-		let _ = <Balances<T> as Currency<_>>::make_free_balance_be(&caller, T::Balance::max_value());
+		let _ = <Balances<T, I> as Currency<_>>::make_free_balance_be(&caller, T::Balance::max_value());
 
 		// Give the recipient account existential deposit (thus their account already exists).
 		let existential_deposit = T::ExistentialDeposit::get();
-		let _ = <Balances<T> as Currency<_>>::make_free_balance_be(&recipient, existential_deposit);
+		let _ = <Balances<T, I> as Currency<_>>::make_free_balance_be(&recipient, existential_deposit);
 		let transfer_amount = existential_deposit.saturating_mul(ED_MULTIPLIER.into());
 	}: transfer(RawOrigin::Signed(caller.clone()), recipient_lookup, transfer_amount)
 	verify {
-		assert!(!Balances::<T>::free_balance(&caller).is_zero());
-		assert!(!Balances::<T>::free_balance(&recipient).is_zero());
+		assert!(!Balances::<T, I>::free_balance(&caller).is_zero());
+		assert!(!Balances::<T, I>::free_balance(&recipient).is_zero());
 	}
 
 	// Benchmark `transfer_keep_alive` with the worst possible condition:
@@ -83,13 +83,13 @@ benchmarks! {
 		let recipient_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(recipient.clone());
 
 		// Give the sender account max funds, thus a transfer will not kill account.
-		let _ = <Balances<T> as Currency<_>>::make_free_balance_be(&caller, T::Balance::max_value());
+		let _ = <Balances<T, I> as Currency<_>>::make_free_balance_be(&caller, T::Balance::max_value());
 		let existential_deposit = T::ExistentialDeposit::get();
 		let transfer_amount = existential_deposit.saturating_mul(ED_MULTIPLIER.into());
 	}: _(RawOrigin::Signed(caller.clone()), recipient_lookup, transfer_amount)
 	verify {
-		assert!(!Balances::<T>::free_balance(&caller).is_zero());
-		assert_eq!(Balances::<T>::free_balance(&recipient), transfer_amount);
+		assert!(!Balances::<T, I>::free_balance(&caller).is_zero());
+		assert_eq!(Balances::<T, I>::free_balance(&recipient), transfer_amount);
 	}
 
 	// Benchmark `set_balance` coming from ROOT account. This always creates an account.
@@ -100,11 +100,11 @@ benchmarks! {
 		// Give the user some initial balance.
 		let existential_deposit = T::ExistentialDeposit::get();
 		let balance_amount = existential_deposit.saturating_mul(ED_MULTIPLIER.into());
-		let _ = <Balances<T> as Currency<_>>::make_free_balance_be(&user, balance_amount);
+		let _ = <Balances<T, I> as Currency<_>>::make_free_balance_be(&user, balance_amount);
 	}: set_balance(RawOrigin::Root, user_lookup, balance_amount, balance_amount)
 	verify {
-		assert_eq!(Balances::<T>::free_balance(&user), balance_amount);
-		assert_eq!(Balances::<T>::reserved_balance(&user), balance_amount);
+		assert_eq!(Balances::<T, I>::free_balance(&user), balance_amount);
+		assert_eq!(Balances::<T, I>::reserved_balance(&user), balance_amount);
 	}
 
 	// Benchmark `set_balance` coming from ROOT account. This always kills an account.
@@ -115,10 +115,10 @@ benchmarks! {
 		// Give the user some initial balance.
 		let existential_deposit = T::ExistentialDeposit::get();
 		let balance_amount = existential_deposit.saturating_mul(ED_MULTIPLIER.into());
-		let _ = <Balances<T> as Currency<_>>::make_free_balance_be(&user, balance_amount);
+		let _ = <Balances<T, I> as Currency<_>>::make_free_balance_be(&user, balance_amount);
 	}: set_balance(RawOrigin::Root, user_lookup, Zero::zero(), Zero::zero())
 	verify {
-		assert!(Balances::<T>::free_balance(&user).is_zero());
+		assert!(Balances::<T, I>::free_balance(&user).is_zero());
 	}
 
 	// Benchmark `force_transfer` extrinsic with the worst possible conditions:
@@ -131,7 +131,7 @@ benchmarks! {
 
 		// Give some multiple of the existential deposit + creation fee + transfer fee
 		let balance = existential_deposit.saturating_mul(ED_MULTIPLIER.into());
-		let _ = <Balances<T> as Currency<_>>::make_free_balance_be(&source, balance);
+		let _ = <Balances<T, I> as Currency<_>>::make_free_balance_be(&source, balance);
 
 		// Transfer `e - 1` existential deposits + 1 unit, which guarantees to create one account, and reap this user.
 		let recipient: T::AccountId = account("recipient", 0, SEED);
@@ -139,8 +139,8 @@ benchmarks! {
 		let transfer_amount = existential_deposit.saturating_mul((ED_MULTIPLIER - 1).into()) + 1u32.into();
 	}: force_transfer(RawOrigin::Root, source_lookup, recipient_lookup, transfer_amount)
 	verify {
-		assert_eq!(Balances::<T>::free_balance(&source), Zero::zero());
-		assert_eq!(Balances::<T>::free_balance(&recipient), transfer_amount);
+		assert_eq!(Balances::<T, I>::free_balance(&source), Zero::zero());
+		assert_eq!(Balances::<T, I>::free_balance(&recipient), transfer_amount);
 	}
 }
 
diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
index 94803b88b93f..a1d4467d0a89 100644
--- a/frame/benchmarking/src/lib.rs
+++ b/frame/benchmarking/src/lib.rs
@@ -175,13 +175,33 @@ macro_rules! benchmarks {
 }
 
 /// Same as [`benchmarks`] but for instantiable module.
+///
+/// NOTE: For pallet declared with [`frame_support::pallet`], use [`benchmarks_instance_pallet`].
 #[macro_export]
 macro_rules! benchmarks_instance {
 	(
 		$( $rest:tt )*
 	) => {
 		$crate::benchmarks_iter!(
-			{ I }
+			{ I: Instance }
+			{ }
+			( )
+			( )
+			$( $rest )*
+		);
+	}
+}
+
+/// Same as [`benchmarks`] but for instantiable pallet declared [`frame_support::pallet`].
+///
+/// NOTE: For pallet declared with `decl_module!`, use [`benchmarks_instance`].
+#[macro_export]
+macro_rules! benchmarks_instance_pallet {
+	(
+		$( $rest:tt )*
+	) => {
+		$crate::benchmarks_iter!(
+			{ I: 'static }
 			{ }
 			( )
 			( )
@@ -195,7 +215,7 @@ macro_rules! benchmarks_instance {
 macro_rules! benchmarks_iter {
 	// detect and extract where clause:
 	(
-		{ $( $instance:ident )? }
+		{ $( $instance:ident: $instance_bound:tt )? }
 		{ $( $where_clause:tt )* }
 		( $( $names:tt )* )
 		( $( $names_extra:tt )* )
@@ -203,7 +223,7 @@ macro_rules! benchmarks_iter {
 		$( $rest:tt )*
 	) => {
 		$crate::benchmarks_iter! {
-			{ $( $instance)? }
+			{ $( $instance: $instance_bound)? }
 			{ $( $where_bound )* }
 			( $( $names )* )
 			( $( $names_extra )* )
@@ -212,7 +232,7 @@ macro_rules! benchmarks_iter {
 	};
 	// detect and extract extra tag:
 	(
-		{ $( $instance:ident )? }
+		{ $( $instance:ident: $instance_bound:tt )? }
 		{ $( $where_clause:tt )* }
 		( $( $names:tt )* )
 		( $( $names_extra:tt )* )
@@ -221,7 +241,7 @@ macro_rules! benchmarks_iter {
 		$( $rest:tt )*
 	) => {
 		$crate::benchmarks_iter! {
-			{ $( $instance)? }
+			{ $( $instance: $instance_bound )? }
 			{ $( $where_clause )* }
 			( $( $names )* )
 			( $( $names_extra )* $name )
@@ -231,7 +251,7 @@ macro_rules! benchmarks_iter {
 	};
 	// mutation arm:
 	(
-		{ $( $instance:ident )? }
+		{ $( $instance:ident: $instance_bound:tt )? }
 		{ $( $where_clause:tt )* }
 		( $( $names:tt )* ) // This contains $( $( { $instance } )? $name:ident )*
 		( $( $names_extra:tt )* )
@@ -240,7 +260,7 @@ macro_rules! benchmarks_iter {
 		$( $rest:tt )*
 	) => {
 		$crate::benchmarks_iter! {
-			{ $( $instance)? }
+			{ $( $instance: $instance_bound )? }
 			{ $( $where_clause )* }
 			( $( $names )* )
 			( $( $names_extra )* )
@@ -251,7 +271,7 @@ macro_rules! benchmarks_iter {
 	};
 	// mutation arm:
 	(
-		{ $( $instance:ident )? }
+		{ $( $instance:ident: $instance_bound:tt )? }
 		{ $( $where_clause:tt )* }
 		( $( $names:tt )* )
 		( $( $names_extra:tt )* )
@@ -260,7 +280,7 @@ macro_rules! benchmarks_iter {
 		$( $rest:tt )*
 	) => {
 		$crate::benchmarks_iter! {
-			{ $( $instance)? }
+			{ $( $instance: $instance_bound )? }
 			{ $( $where_clause )* }
 			( $( $names )* )
 			( $( $names_extra )* )
@@ -277,7 +297,7 @@ macro_rules! benchmarks_iter {
 	};
 	// iteration arm:
 	(
-		{ $( $instance:ident )? }
+		{ $( $instance:ident: $instance_bound:tt )? }
 		{ $( $where_clause:tt )* }
 		( $( $names:tt )* )
 		( $( $names_extra:tt )* )
@@ -286,7 +306,7 @@ macro_rules! benchmarks_iter {
 		$( $rest:tt )*
 	) => {
 		$crate::benchmark_backend! {
-			{ $( $instance)? }
+			{ $( $instance: $instance_bound )? }
 			$name
 			{ $( $where_clause )* }
 			{ }
@@ -298,12 +318,12 @@ macro_rules! benchmarks_iter {
 		#[cfg(test)]
 		$crate::impl_benchmark_test!(
 			{ $( $where_clause )* }
-			{ $( $instance)? }
+			{ $( $instance: $instance_bound )? }
 			$name
 		);
 
 		$crate::benchmarks_iter!(
-			{ $( $instance)? }
+			{ $( $instance: $instance_bound )? }
 			{ $( $where_clause )* }
 			( $( $names )* { $( $instance )? } $name )
 			( $( $names_extra )* )
@@ -312,26 +332,26 @@ macro_rules! benchmarks_iter {
 	};
 	// iteration-exit arm
 	(
-		{ $( $instance:ident )? }
+		{ $( $instance:ident: $instance_bound:tt )? }
 		{ $( $where_clause:tt )* }
 		( $( $names:tt )* )
 		( $( $names_extra:tt )* )
 	) => {
 		$crate::selected_benchmark!(
 			{ $( $where_clause)* }
-			{ $( $instance)? }
+			{ $( $instance: $instance_bound )? }
 			$( $names )*
 		);
 		$crate::impl_benchmark!(
 			{ $( $where_clause )* }
-			{ $( $instance)? }
+			{ $( $instance: $instance_bound )? }
 			( $( $names )* )
 			( $( $names_extra ),* )
 		);
 	};
 	// add verify block to _() format
 	(
-		{ $( $instance:ident )? }
+		{ $( $instance:ident: $instance_bound:tt )? }
 		{ $( $where_clause:tt )* }
 		( $( $names:tt )* )
 		( $( $names_extra:tt )* )
@@ -339,7 +359,7 @@ macro_rules! benchmarks_iter {
 		$( $rest:tt )*
 	) => {
 		$crate::benchmarks_iter! {
-			{ $( $instance)? }
+			{ $( $instance: $instance_bound )? }
 			{ $( $where_clause )* }
 			( $( $names )* )
 			( $( $names_extra )* )
@@ -350,7 +370,7 @@ macro_rules! benchmarks_iter {
 	};
 	// add verify block to name() format
 	(
-		{ $( $instance:ident )? }
+		{ $( $instance:ident: $instance_bound:tt )? }
 		{ $( $where_clause:tt )* }
 		( $( $names:tt )* )
 		( $( $names_extra:tt )* )
@@ -358,7 +378,7 @@ macro_rules! benchmarks_iter {
 		$( $rest:tt )*
 	) => {
 		$crate::benchmarks_iter! {
-			{ $( $instance)? }
+			{ $( $instance: $instance_bound )? }
 			{ $( $where_clause )* }
 			( $( $names )* )
 			( $( $names_extra )* )
@@ -369,7 +389,7 @@ macro_rules! benchmarks_iter {
 	};
 	// add verify block to {} format
 	(
-		{ $( $instance:ident )? }
+		{ $( $instance:ident: $instance_bound:tt )? }
 		{ $( $where_clause:tt )* }
 		( $( $names:tt )* )
 		( $( $names_extra:tt )* )
@@ -377,7 +397,7 @@ macro_rules! benchmarks_iter {
 		$( $rest:tt )*
 	) => {
 		$crate::benchmarks_iter!(
-			{ $( $instance)? }
+			{ $( $instance: $instance_bound )? }
 			{ $( $where_clause )* }
 			( $( $names )* )
 			( $( $names_extra )* )
@@ -393,7 +413,7 @@ macro_rules! benchmarks_iter {
 macro_rules! benchmark_backend {
 	// parsing arms
 	(
-		{ $( $instance:ident )? }
+		{ $( $instance:ident: $instance_bound:tt )? }
 		$name:ident
 		{ $( $where_clause:tt )* }
 		{ $( PRE { $( $pre_parsed:tt )* } )* }
@@ -405,7 +425,7 @@ macro_rules! benchmark_backend {
 		$postcode:block
 	) => {
 		$crate::benchmark_backend! {
-			{ $( $instance)? }
+			{ $( $instance: $instance_bound )? }
 			$name
 			{ $( $where_clause )* }
 			{
@@ -418,7 +438,7 @@ macro_rules! benchmark_backend {
 		}
 	};
 	(
-		{ $( $instance:ident )? }
+		{ $( $instance:ident: $instance_bound:tt )? }
 		$name:ident
 		{ $( $where_clause:tt )* }
 		{ $( $parsed:tt )* }
@@ -430,7 +450,7 @@ macro_rules! benchmark_backend {
 		$postcode:block
 	) => {
 		$crate::benchmark_backend! {
-			{ $( $instance)? }
+			{ $( $instance: $instance_bound )? }
 			$name
 			{ $( $where_clause )* }
 			{
@@ -444,7 +464,7 @@ macro_rules! benchmark_backend {
 	};
 	// mutation arm to look after a single tt for param_from.
 	(
-		{ $( $instance:ident )? }
+		{ $( $instance:ident: $instance_bound:tt )? }
 		$name:ident
 		{ $( $where_clause:tt )* }
 		{ $( $parsed:tt )* }
@@ -456,7 +476,7 @@ macro_rules! benchmark_backend {
 		$postcode:block
 	) => {
 		$crate::benchmark_backend! {
-			{ $( $instance)? }
+			{ $( $instance: $instance_bound )? }
 			$name
 			{ $( $where_clause )* }
 			{ $( $parsed )* }
@@ -470,7 +490,7 @@ macro_rules! benchmark_backend {
 	};
 	// mutation arm to look after the default tail of `=> ()`
 	(
-		{ $( $instance:ident )? }
+		{ $( $instance:ident: $instance_bound:tt )? }
 		$name:ident
 		{ $( $where_clause:tt )* }
 		{ $( $parsed:tt )* }
@@ -482,7 +502,7 @@ macro_rules! benchmark_backend {
 		$postcode:block
 	) => {
 		$crate::benchmark_backend! {
-			{ $( $instance)? }
+			{ $( $instance: $instance_bound )? }
 			$name
 			{ $( $where_clause )* }
 			{ $( $parsed )* }
@@ -496,7 +516,7 @@ macro_rules! benchmark_backend {
 	};
 	// mutation arm to look after `let _ =`
 	(
-		{ $( $instance:ident )? }
+		{ $( $instance:ident: $instance_bound:tt )? }
 		$name:ident
 		{ $( $where_clause:tt )* }
 		{ $( $parsed:tt )* }
@@ -508,7 +528,7 @@ macro_rules! benchmark_backend {
 		$postcode:block
 	) => {
 		$crate::benchmark_backend! {
-			{ $( $instance)? }
+			{ $( $instance: $instance_bound )? }
 			$name
 			{ $( $where_clause )* }
 			{ $( $parsed )* }
@@ -522,7 +542,7 @@ macro_rules! benchmark_backend {
 	};
 	// actioning arm
 	(
-		{ $( $instance:ident )? }
+		{ $( $instance:ident: $instance_bound:tt )? }
 		$name:ident
 		{ $( $where_clause:tt )* }
 		{
@@ -536,7 +556,7 @@ macro_rules! benchmark_backend {
 		#[allow(non_camel_case_types)]
 		struct $name;
 		#[allow(unused_variables)]
-		impl<T: Config $( <$instance>, I: Instance)? >
+		impl<T: Config $( <$instance>, $instance: $instance_bound )? >
 			$crate::BenchmarkingSetup<T $(, $instance)? > for $name
 			where $( $where_clause )*
 		{
@@ -597,7 +617,7 @@ macro_rules! benchmark_backend {
 macro_rules! selected_benchmark {
 	(
 		{ $( $where_clause:tt )* }
-		{ $( $instance:ident )? }
+		{ $( $instance:ident: $instance_bound:tt )? }
 		$( { $( $bench_inst:ident )? } $bench:ident )*
 	) => {
 		// The list of available benchmarks for this pallet.
@@ -607,7 +627,7 @@ macro_rules! selected_benchmark {
 		}
 
 		// Allow us to select a benchmark from the list of available benchmarks.
-		impl<T: Config $( <$instance>, I: Instance )? >
+		impl<T: Config $( <$instance>, $instance: $instance_bound )? >
 			$crate::BenchmarkingSetup<T $(, $instance )? > for SelectedBenchmark
 			where $( $where_clause )*
 		{
@@ -643,11 +663,11 @@ macro_rules! selected_benchmark {
 macro_rules! impl_benchmark {
 	(
 		{ $( $where_clause:tt )* }
-		{ $( $instance:ident )? }
+		{ $( $instance:ident: $instance_bound:tt )? }
 		( $( { $( $name_inst:ident )? } $name:ident )* )
 		( $( $name_extra:ident ),* )
 	) => {
-		impl<T: Config $(<$instance>, I: Instance)? >
+		impl<T: Config $(<$instance>, $instance: $instance_bound )? >
 			$crate::Benchmarking<$crate::BenchmarkResults> for Module<T $(, $instance)? >
 			where T: frame_system::Config, $( $where_clause )*
 		{
@@ -866,7 +886,7 @@ macro_rules! impl_benchmark {
 macro_rules! impl_benchmark_test {
 	(
 		{ $( $where_clause:tt )* }
-		{ $( $instance:ident )? }
+		{ $( $instance:ident: $instance_bound:tt )? }
 		$name:ident
 	) => {
 		$crate::paste::item! {

From f6de92e1f353be3b88a575187a22a3827a823bf2 Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann <ben@gnunicorn.org>
Date: Thu, 25 Feb 2021 17:04:36 +0100
Subject: [PATCH 0440/1194] Frame Benchmarking v3.1.0 released (#8206)

* Releasing frame-benchmarking 3.1

* bump in the entire dependency tree
---
 Cargo.lock                                     | 2 +-
 bin/node-template/node/Cargo.toml              | 2 +-
 bin/node-template/runtime/Cargo.toml           | 2 +-
 bin/node/executor/Cargo.toml                   | 2 +-
 bin/node/runtime/Cargo.toml                    | 2 +-
 frame/assets/Cargo.toml                        | 2 +-
 frame/babe/Cargo.toml                          | 2 +-
 frame/balances/Cargo.toml                      | 2 +-
 frame/benchmarking/Cargo.toml                  | 2 +-
 frame/bounties/Cargo.toml                      | 2 +-
 frame/collective/Cargo.toml                    | 2 +-
 frame/contracts/Cargo.toml                     | 2 +-
 frame/democracy/Cargo.toml                     | 2 +-
 frame/election-provider-multi-phase/Cargo.toml | 4 ++--
 frame/elections-phragmen/Cargo.toml            | 2 +-
 frame/example/Cargo.toml                       | 2 +-
 frame/grandpa/Cargo.toml                       | 4 ++--
 frame/identity/Cargo.toml                      | 2 +-
 frame/im-online/Cargo.toml                     | 2 +-
 frame/indices/Cargo.toml                       | 2 +-
 frame/lottery/Cargo.toml                       | 2 +-
 frame/merkle-mountain-range/Cargo.toml         | 2 +-
 frame/multisig/Cargo.toml                      | 2 +-
 frame/offences/benchmarking/Cargo.toml         | 2 +-
 frame/proxy/Cargo.toml                         | 2 +-
 frame/scheduler/Cargo.toml                     | 2 +-
 frame/session/benchmarking/Cargo.toml          | 2 +-
 frame/staking/Cargo.toml                       | 4 ++--
 frame/system/benchmarking/Cargo.toml           | 2 +-
 frame/timestamp/Cargo.toml                     | 2 +-
 frame/tips/Cargo.toml                          | 2 +-
 frame/treasury/Cargo.toml                      | 2 +-
 frame/utility/Cargo.toml                       | 2 +-
 frame/vesting/Cargo.toml                       | 2 +-
 utils/frame/benchmarking-cli/Cargo.toml        | 2 +-
 35 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 128b54e7c6d6..38fd31dab137 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1683,7 +1683,7 @@ dependencies = [
 
 [[package]]
 name = "frame-benchmarking"
-version = "3.0.0"
+version = "3.1.0"
 dependencies = [
  "frame-support",
  "frame-system",
diff --git a/bin/node-template/node/Cargo.toml b/bin/node-template/node/Cargo.toml
index 464b07cb98f0..2d36d3c46908 100644
--- a/bin/node-template/node/Cargo.toml
+++ b/bin/node-template/node/Cargo.toml
@@ -48,7 +48,7 @@ substrate-frame-rpc-system = { version = "3.0.0", path = "../../../utils/frame/r
 pallet-transaction-payment-rpc = { version = "3.0.0", path = "../../../frame/transaction-payment/rpc/" }
 
 # These dependencies are used for runtime benchmarking
-frame-benchmarking = { version = "3.0.0", path = "../../../frame/benchmarking" }
+frame-benchmarking = { version = "3.1.0", path = "../../../frame/benchmarking" }
 frame-benchmarking-cli = { version = "3.0.0", path = "../../../utils/frame/benchmarking-cli" }
 
 node-template-runtime = { version = "2.0.0", path = "../runtime" }
diff --git a/bin/node-template/runtime/Cargo.toml b/bin/node-template/runtime/Cargo.toml
index dd907f55fbbb..de69419b92a4 100644
--- a/bin/node-template/runtime/Cargo.toml
+++ b/bin/node-template/runtime/Cargo.toml
@@ -41,7 +41,7 @@ frame-system-rpc-runtime-api = { version = "3.0.0", default-features = false, pa
 pallet-transaction-payment-rpc-runtime-api = { version = "3.0.0", default-features = false, path = "../../../frame/transaction-payment/rpc/runtime-api/" }
 
 # Used for runtime benchmarking
-frame-benchmarking = { version = "3.0.0", default-features = false, path = "../../../frame/benchmarking", optional = true }
+frame-benchmarking = { version = "3.1.0", default-features = false, path = "../../../frame/benchmarking", optional = true }
 frame-system-benchmarking = { version = "3.0.0", default-features = false, path = "../../../frame/system/benchmarking", optional = true }
 hex-literal = { version = "0.3.1", optional = true }
 
diff --git a/bin/node/executor/Cargo.toml b/bin/node/executor/Cargo.toml
index 7faca59cd48c..ba5870de24f0 100644
--- a/bin/node/executor/Cargo.toml
+++ b/bin/node/executor/Cargo.toml
@@ -22,7 +22,7 @@ sp-io = { version = "3.0.0", path = "../../../primitives/io" }
 sp-state-machine = { version = "0.9.0", path = "../../../primitives/state-machine" }
 sp-trie = { version = "3.0.0", path = "../../../primitives/trie" }
 trie-root = "0.16.0"
-frame-benchmarking = { version = "3.0.0", path = "../../../frame/benchmarking" }
+frame-benchmarking = { version = "3.1.0", path = "../../../frame/benchmarking" }
 
 [dev-dependencies]
 criterion = "0.3.0"
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index 6e615759db3a..d8b812ef7206 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -38,7 +38,7 @@ sp-version = { version = "3.0.0", default-features = false, path = "../../../pri
 
 # frame dependencies
 frame-executive = { version = "3.0.0", default-features = false, path = "../../../frame/executive" }
-frame-benchmarking = { version = "3.0.0", default-features = false, path = "../../../frame/benchmarking", optional = true }
+frame-benchmarking = { version = "3.1.0", default-features = false, path = "../../../frame/benchmarking", optional = true }
 frame-support = { version = "3.0.0", default-features = false, path = "../../../frame/support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../../../frame/system" }
 frame-system-benchmarking = { version = "3.0.0", default-features = false, path = "../../../frame/system/benchmarking", optional = true }
diff --git a/frame/assets/Cargo.toml b/frame/assets/Cargo.toml
index 9be2d6d09108..b62e8bac8ccc 100644
--- a/frame/assets/Cargo.toml
+++ b/frame/assets/Cargo.toml
@@ -22,7 +22,7 @@ sp-runtime = { version = "3.0.0", default-features = false, path = "../../primit
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 # `system` module provides us with all sorts of useful stuff and macros depend on it being around.
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
 sp-core = { version = "3.0.0", path = "../../primitives/core" }
diff --git a/frame/babe/Cargo.toml b/frame/babe/Cargo.toml
index 3b9b16d294eb..20ef87ab15b4 100644
--- a/frame/babe/Cargo.toml
+++ b/frame/babe/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 pallet-authorship = { version = "3.0.0", default-features = false, path = "../authorship" }
diff --git a/frame/balances/Cargo.toml b/frame/balances/Cargo.toml
index 2b1cde70d3dd..53bf4502708e 100644
--- a/frame/balances/Cargo.toml
+++ b/frame/balances/Cargo.toml
@@ -17,7 +17,7 @@ serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 
diff --git a/frame/benchmarking/Cargo.toml b/frame/benchmarking/Cargo.toml
index 41ab9efeced0..b80b626801dc 100644
--- a/frame/benchmarking/Cargo.toml
+++ b/frame/benchmarking/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-benchmarking"
-version = "3.0.0"
+version = "3.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/bounties/Cargo.toml b/frame/bounties/Cargo.toml
index 090458c0162b..ff1a3a680709 100644
--- a/frame/bounties/Cargo.toml
+++ b/frame/bounties/Cargo.toml
@@ -21,7 +21,7 @@ frame-support = { version = "3.0.0", default-features = false, path = "../suppor
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 pallet-treasury = { version = "3.0.0", default-features = false, path = "../treasury" }
 
-frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
 sp-io ={ version = "3.0.0", path = "../../primitives/io" }
diff --git a/frame/collective/Cargo.toml b/frame/collective/Cargo.toml
index 0bddb400e608..5cff91499bf4 100644
--- a/frame/collective/Cargo.toml
+++ b/frame/collective/Cargo.toml
@@ -19,7 +19,7 @@ sp-core = { version = "3.0.0", default-features = false, path = "../../primitive
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 
diff --git a/frame/contracts/Cargo.toml b/frame/contracts/Cargo.toml
index 3cff8dbfa9bd..ccb879c81146 100644
--- a/frame/contracts/Cargo.toml
+++ b/frame/contracts/Cargo.toml
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 pallet-contracts-primitives = { version = "2.0.0", default-features = false, path = "common" }
diff --git a/frame/democracy/Cargo.toml b/frame/democracy/Cargo.toml
index 3cd859a9b67b..f9b0d035b089 100644
--- a/frame/democracy/Cargo.toml
+++ b/frame/democracy/Cargo.toml
@@ -18,7 +18,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 
diff --git a/frame/election-provider-multi-phase/Cargo.toml b/frame/election-provider-multi-phase/Cargo.toml
index 851db01bfa3f..a7db8d55465e 100644
--- a/frame/election-provider-multi-phase/Cargo.toml
+++ b/frame/election-provider-multi-phase/Cargo.toml
@@ -28,7 +28,7 @@ sp-arithmetic = { version = "3.0.0", default-features = false, path = "../../pri
 sp-election-providers = { version = "3.0.0", default-features = false, path = "../../primitives/election-providers" }
 
 # Optional imports for benchmarking
-frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 rand = { version = "0.7.3", default-features = false, optional = true, features = ["alloc", "small_rng"] }
 
 [dev-dependencies]
@@ -42,7 +42,7 @@ sp-core = { version = "3.0.0", path = "../../primitives/core" }
 sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
 sp-election-providers = { version = "3.0.0", features = ["runtime-benchmarks"], path = "../../primitives/election-providers" }
 pallet-balances = { version = "3.0.0", path = "../balances" }
-frame-benchmarking = { path = "../benchmarking" }
+frame-benchmarking = { path = "../benchmarking" , version = "3.1.0"}
 
 [features]
 default = ["std"]
diff --git a/frame/elections-phragmen/Cargo.toml b/frame/elections-phragmen/Cargo.toml
index ce568d1d8eaf..6d7e18bd766c 100644
--- a/frame/elections-phragmen/Cargo.toml
+++ b/frame/elections-phragmen/Cargo.toml
@@ -20,7 +20,7 @@ sp-npos-elections = { version = "3.0.0", default-features = false, path = "../..
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
 sp-io = { version = "3.0.0", path = "../../primitives/io" }
diff --git a/frame/example/Cargo.toml b/frame/example/Cargo.toml
index c6dfc018b3f5..618730688458 100644
--- a/frame/example/Cargo.toml
+++ b/frame/example/Cargo.toml
@@ -22,7 +22,7 @@ sp-runtime = { version = "3.0.0", default-features = false, path = "../../primit
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
 
-frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
 sp-core = { version = "3.0.0", path = "../../primitives/core", default-features = false }
diff --git a/frame/grandpa/Cargo.toml b/frame/grandpa/Cargo.toml
index 692674155c17..1bf7561bb20e 100644
--- a/frame/grandpa/Cargo.toml
+++ b/frame/grandpa/Cargo.toml
@@ -22,14 +22,14 @@ sp-session = { version = "3.0.0", default-features = false, path = "../../primit
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
 sp-staking = { version = "3.0.0", default-features = false, path = "../../primitives/staking" }
-frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 pallet-authorship = { version = "3.0.0", default-features = false, path = "../authorship" }
 pallet-session = { version = "3.0.0", default-features = false, path = "../session" }
 
 [dev-dependencies]
-frame-benchmarking = { version = "3.0.0", path = "../benchmarking" }
+frame-benchmarking = { version = "3.1.0", path = "../benchmarking" }
 grandpa = { package = "finality-grandpa", version = "0.14.0", features = ["derive-codec"] }
 sp-io = { version = "3.0.0", path = "../../primitives/io" }
 sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
diff --git a/frame/identity/Cargo.toml b/frame/identity/Cargo.toml
index 1db480ecb94c..08109fda2584 100644
--- a/frame/identity/Cargo.toml
+++ b/frame/identity/Cargo.toml
@@ -19,7 +19,7 @@ enumflags2 = { version = "0.6.2" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 
diff --git a/frame/im-online/Cargo.toml b/frame/im-online/Cargo.toml
index 6e7f4b03abb5..efe01a6a6f5a 100644
--- a/frame/im-online/Cargo.toml
+++ b/frame/im-online/Cargo.toml
@@ -25,7 +25,7 @@ sp-staking = { version = "3.0.0", default-features = false, path = "../../primit
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 
-frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
 pallet-session = { version = "3.0.0", path = "../session" }
diff --git a/frame/indices/Cargo.toml b/frame/indices/Cargo.toml
index 0d99fbb13485..ce9b2053ff18 100644
--- a/frame/indices/Cargo.toml
+++ b/frame/indices/Cargo.toml
@@ -23,7 +23,7 @@ sp-core = { version = "3.0.0", default-features = false, path = "../../primitive
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 
-frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
 pallet-balances = { version = "3.0.0", path = "../balances" }
diff --git a/frame/lottery/Cargo.toml b/frame/lottery/Cargo.toml
index 94cd6d2325e5..0d60b0aaca35 100644
--- a/frame/lottery/Cargo.toml
+++ b/frame/lottery/Cargo.toml
@@ -19,7 +19,7 @@ sp-runtime = { version = "3.0.0", default-features = false, path = "../../primit
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 
-frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
 pallet-balances = { version = "3.0.0", path = "../balances" }
diff --git a/frame/merkle-mountain-range/Cargo.toml b/frame/merkle-mountain-range/Cargo.toml
index c1fe0aca8485..8861ba5c0c8b 100644
--- a/frame/merkle-mountain-range/Cargo.toml
+++ b/frame/merkle-mountain-range/Cargo.toml
@@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 mmr-lib = { package = "ckb-merkle-mountain-range", default-features = false, version = "0.3.1" }
diff --git a/frame/multisig/Cargo.toml b/frame/multisig/Cargo.toml
index 451cc1033b94..e48f80567f67 100644
--- a/frame/multisig/Cargo.toml
+++ b/frame/multisig/Cargo.toml
@@ -22,7 +22,7 @@ sp-runtime = { version = "3.0.0", default-features = false, path = "../../primit
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
 
-frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
 sp-core = { version = "3.0.0", path = "../../primitives/core" }
diff --git a/frame/offences/benchmarking/Cargo.toml b/frame/offences/benchmarking/Cargo.toml
index 2378be45d681..6be2787734a4 100644
--- a/frame/offences/benchmarking/Cargo.toml
+++ b/frame/offences/benchmarking/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-frame-benchmarking = { version = "3.0.0", default-features = false, path = "../../benchmarking" }
+frame-benchmarking = { version = "3.1.0", default-features = false, path = "../../benchmarking" }
 frame-support = { version = "3.0.0", default-features = false, path = "../../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../../system" }
 pallet-babe = { version = "3.0.0", default-features = false, path = "../../babe" }
diff --git a/frame/proxy/Cargo.toml b/frame/proxy/Cargo.toml
index d297d324aa10..2934b9953b31 100644
--- a/frame/proxy/Cargo.toml
+++ b/frame/proxy/Cargo.toml
@@ -22,7 +22,7 @@ sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 
-frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
 sp-core = { version = "3.0.0", path = "../../primitives/core" }
diff --git a/frame/scheduler/Cargo.toml b/frame/scheduler/Cargo.toml
index a0624247f5c9..a5e00c344402 100644
--- a/frame/scheduler/Cargo.toml
+++ b/frame/scheduler/Cargo.toml
@@ -18,7 +18,7 @@ sp-runtime = { version = "3.0.0", default-features = false, path = "../../primit
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
 
-frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
 sp-core = { version = "3.0.0", path = "../../primitives/core", default-features = false }
diff --git a/frame/session/benchmarking/Cargo.toml b/frame/session/benchmarking/Cargo.toml
index e4db81c4b3bc..47265ed5ef7a 100644
--- a/frame/session/benchmarking/Cargo.toml
+++ b/frame/session/benchmarking/Cargo.toml
@@ -17,7 +17,7 @@ sp-session = { version = "3.0.0", default-features = false, path = "../../../pri
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../../primitives/std" }
 frame-system = { version = "3.0.0", default-features = false, path = "../../system" }
-frame-benchmarking = { version = "3.0.0", default-features = false, path = "../../benchmarking" }
+frame-benchmarking = { version = "3.1.0", default-features = false, path = "../../benchmarking" }
 frame-support = { version = "3.0.0", default-features = false, path = "../../support" }
 pallet-staking = { version = "3.0.0", default-features = false, features = ["runtime-benchmarks"], path = "../../staking" }
 pallet-session = { version = "3.0.0", default-features = false, path = "../../session" }
diff --git a/frame/staking/Cargo.toml b/frame/staking/Cargo.toml
index 21e5b4a56489..8d95e2d48b2c 100644
--- a/frame/staking/Cargo.toml
+++ b/frame/staking/Cargo.toml
@@ -30,7 +30,7 @@ sp-application-crypto = { version = "3.0.0", default-features = false, path = ".
 sp-election-providers = { version = "3.0.0", default-features = false, path = "../../primitives/election-providers" }
 
 # Optional imports for benchmarking
-frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 rand_chacha = { version = "0.2", default-features = false, optional = true }
 
 [dev-dependencies]
@@ -41,7 +41,7 @@ pallet-balances = { version = "3.0.0", path = "../balances" }
 pallet-timestamp = { version = "3.0.0", path = "../timestamp" }
 pallet-staking-reward-curve = { version = "3.0.0",  path = "../staking/reward-curve" }
 substrate-test-utils = { version = "3.0.0", path = "../../test-utils" }
-frame-benchmarking = { version = "3.0.0", path = "../benchmarking" }
+frame-benchmarking = { version = "3.1.0", path = "../benchmarking" }
 sp-election-providers = { version = "3.0.0", features = ["runtime-benchmarks"], path = "../../primitives/election-providers" }
 rand_chacha = { version = "0.2" }
 parking_lot = "0.11.1"
diff --git a/frame/system/benchmarking/Cargo.toml b/frame/system/benchmarking/Cargo.toml
index ddf52c96effe..1a9317c69bf4 100644
--- a/frame/system/benchmarking/Cargo.toml
+++ b/frame/system/benchmarking/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 sp-std = { version = "3.0.0", default-features = false, path = "../../../primitives/std" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
-frame-benchmarking = { version = "3.0.0", default-features = false, path = "../../benchmarking" }
+frame-benchmarking = { version = "3.1.0", default-features = false, path = "../../benchmarking" }
 frame-system = { version = "3.0.0", default-features = false, path = "../../system" }
 frame-support = { version = "3.0.0", default-features = false, path = "../../support" }
 sp-core = { version = "3.0.0", default-features = false, path = "../../../primitives/core" }
diff --git a/frame/timestamp/Cargo.toml b/frame/timestamp/Cargo.toml
index 843517049ad9..8094889d89f4 100644
--- a/frame/timestamp/Cargo.toml
+++ b/frame/timestamp/Cargo.toml
@@ -21,7 +21,7 @@ sp-std = { version = "3.0.0", default-features = false, path = "../../primitives
 sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io", optional = true }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
 sp-inherents = { version = "3.0.0", default-features = false, path = "../../primitives/inherents" }
-frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 sp-timestamp = { version = "3.0.0", default-features = false, path = "../../primitives/timestamp" }
diff --git a/frame/tips/Cargo.toml b/frame/tips/Cargo.toml
index aa776ffaaf06..a16c9b91327e 100644
--- a/frame/tips/Cargo.toml
+++ b/frame/tips/Cargo.toml
@@ -21,7 +21,7 @@ frame-support = { version = "3.0.0", default-features = false, path = "../suppor
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 pallet-treasury = { version = "3.0.0", default-features = false, path = "../treasury" }
 
-frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
 sp-io ={ version = "3.0.0", path = "../../primitives/io" }
diff --git a/frame/treasury/Cargo.toml b/frame/treasury/Cargo.toml
index 186a5900cf07..da0ffcb725c9 100644
--- a/frame/treasury/Cargo.toml
+++ b/frame/treasury/Cargo.toml
@@ -22,7 +22,7 @@ frame-system = { version = "3.0.0", default-features = false, path = "../system"
 pallet-balances = { version = "3.0.0", default-features = false, path = "../balances" }
 impl-trait-for-tuples = "0.2.1"
 
-frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
 sp-io ={ version = "3.0.0", path = "../../primitives/io" }
diff --git a/frame/utility/Cargo.toml b/frame/utility/Cargo.toml
index b4f8b4943df2..f55cff4d653c 100644
--- a/frame/utility/Cargo.toml
+++ b/frame/utility/Cargo.toml
@@ -22,7 +22,7 @@ sp-runtime = { version = "3.0.0", default-features = false, path = "../../primit
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
 
-frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
 sp-core = { version = "3.0.0", path = "../../primitives/core" }
diff --git a/frame/vesting/Cargo.toml b/frame/vesting/Cargo.toml
index 31d1f72869bf..e1335237eb50 100644
--- a/frame/vesting/Cargo.toml
+++ b/frame/vesting/Cargo.toml
@@ -20,7 +20,7 @@ sp-std = { version = "3.0.0", default-features = false, path = "../../primitives
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
 sp-io = { version = "3.0.0", path = "../../primitives/io" }
diff --git a/utils/frame/benchmarking-cli/Cargo.toml b/utils/frame/benchmarking-cli/Cargo.toml
index c810bd4d57d7..51290e5f44ab 100644
--- a/utils/frame/benchmarking-cli/Cargo.toml
+++ b/utils/frame/benchmarking-cli/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-frame-benchmarking = { version = "3.0.0", path = "../../../frame/benchmarking" }
+frame-benchmarking = { version = "3.1.0", path = "../../../frame/benchmarking" }
 sp-core = { version = "3.0.0", path = "../../../primitives/core" }
 sc-service = { version = "0.9.0", default-features = false, path = "../../../client/service" }
 sc-cli = { version = "0.9.0", path = "../../../client/cli" }

From debec916998233a287fb9e5a099c08d5e4a23db2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Thu, 25 Feb 2021 17:04:48 +0100
Subject: [PATCH 0441/1194] contracts: Release as v3.0.0 and add reserved field
 to `ContractInfoOf` (#8175)

* contracts: Update README

* contracts: Add CHANGELOG.md

* contracts: Bump version to v3.0.0 and allow publish

* Typos

Co-authored-by: Andrew Jones <ascjones@gmail.com>

* Improve wording in the changelog

* contracts: Add reserved field to ContractInfoOf for future proofing

* also bump frame-benchmarking

* update lockfile

Co-authored-by: Andrew Jones <ascjones@gmail.com>
Co-authored-by: Benjamin Kampmann <ben@parity.io>
---
 Cargo.lock                                 | 10 +--
 bin/node/cli/Cargo.toml                    |  2 +-
 bin/node/executor/Cargo.toml               |  2 +-
 bin/node/rpc/Cargo.toml                    |  2 +-
 bin/node/runtime/Cargo.toml                |  6 +-
 bin/node/testing/Cargo.toml                |  2 +-
 frame/contracts/CHANGELOG.md               | 78 ++++++++++++++++++++++
 frame/contracts/Cargo.toml                 |  9 +--
 frame/contracts/README.md                  | 24 +++----
 frame/contracts/common/Cargo.toml          |  3 +-
 frame/contracts/proc-macro/Cargo.toml      |  3 +-
 frame/contracts/rpc/Cargo.toml             |  7 +-
 frame/contracts/rpc/runtime-api/Cargo.toml |  5 +-
 frame/contracts/src/lib.rs                 |  2 +
 frame/contracts/src/rent.rs                |  4 +-
 frame/contracts/src/storage.rs             |  1 +
 frame/contracts/src/tests.rs               |  2 +
 17 files changed, 118 insertions(+), 44 deletions(-)
 create mode 100644 frame/contracts/CHANGELOG.md

diff --git a/Cargo.lock b/Cargo.lock
index 38fd31dab137..5a1f7bf670bb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4599,7 +4599,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-contracts"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "assert_matches",
  "frame-benchmarking",
@@ -4630,7 +4630,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-contracts-primitives"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "bitflags",
  "parity-scale-codec",
@@ -4640,7 +4640,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-contracts-proc-macro"
-version = "0.1.0"
+version = "3.0.0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4649,7 +4649,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-contracts-rpc"
-version = "0.8.1"
+version = "3.0.0"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -4668,7 +4668,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-contracts-rpc-runtime-api"
-version = "0.8.1"
+version = "3.0.0"
 dependencies = [
  "pallet-contracts-primitives",
  "parity-scale-codec",
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index 4aa73e2f7060..ba226629ae7f 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -79,7 +79,7 @@ sc-finality-grandpa-warp-sync = { version = "0.9.0", path = "../../../client/fin
 # frame dependencies
 pallet-indices = { version = "3.0.0", path = "../../../frame/indices" }
 pallet-timestamp = { version = "3.0.0", default-features = false, path = "../../../frame/timestamp" }
-pallet-contracts = { version = "2.0.0", path = "../../../frame/contracts" }
+pallet-contracts = { version = "3.0.0", path = "../../../frame/contracts" }
 frame-system = { version = "3.0.0", path = "../../../frame/system" }
 pallet-balances = { version = "3.0.0", path = "../../../frame/balances" }
 pallet-transaction-payment = { version = "3.0.0", path = "../../../frame/transaction-payment" }
diff --git a/bin/node/executor/Cargo.toml b/bin/node/executor/Cargo.toml
index ba5870de24f0..fb7fc9191141 100644
--- a/bin/node/executor/Cargo.toml
+++ b/bin/node/executor/Cargo.toml
@@ -30,7 +30,7 @@ frame-support = { version = "3.0.0", path = "../../../frame/support" }
 frame-system = { version = "3.0.0", path = "../../../frame/system" }
 node-testing = { version = "2.0.0", path = "../testing" }
 pallet-balances = { version = "3.0.0", path = "../../../frame/balances" }
-pallet-contracts = { version = "2.0.0", path = "../../../frame/contracts" }
+pallet-contracts = { version = "3.0.0", path = "../../../frame/contracts" }
 pallet-grandpa = { version = "3.0.0", path = "../../../frame/grandpa" }
 pallet-im-online = { version = "3.0.0", path = "../../../frame/im-online" }
 pallet-indices = { version = "3.0.0", path = "../../../frame/indices" }
diff --git a/bin/node/rpc/Cargo.toml b/bin/node/rpc/Cargo.toml
index 3e0e77e030f1..1689d0e8247f 100644
--- a/bin/node/rpc/Cargo.toml
+++ b/bin/node/rpc/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 jsonrpc-core = "15.1.0"
 node-primitives = { version = "2.0.0", path = "../primitives" }
 node-runtime = { version = "2.0.0", path = "../runtime" }
-pallet-contracts-rpc = { version = "0.8.0", path = "../../../frame/contracts/rpc/" }
+pallet-contracts-rpc = { version = "3.0.0", path = "../../../frame/contracts/rpc/" }
 pallet-transaction-payment-rpc = { version = "3.0.0", path = "../../../frame/transaction-payment/rpc/" }
 sc-client-api = { version = "3.0.0", path = "../../../client/api" }
 sc-consensus-babe = { version = "0.9.0", path = "../../../client/consensus/babe" }
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index d8b812ef7206..b3672cbe7526 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -51,9 +51,9 @@ pallet-babe = { version = "3.0.0", default-features = false, path = "../../../fr
 pallet-balances = { version = "3.0.0", default-features = false, path = "../../../frame/balances" }
 pallet-bounties = { version = "3.0.0", default-features = false, path = "../../../frame/bounties" }
 pallet-collective = { version = "3.0.0", default-features = false, path = "../../../frame/collective" }
-pallet-contracts = { version = "2.0.0", default-features = false, path = "../../../frame/contracts" }
-pallet-contracts-primitives = { version = "2.0.0", default-features = false, path = "../../../frame/contracts/common/" }
-pallet-contracts-rpc-runtime-api = { version = "0.8.0", default-features = false, path = "../../../frame/contracts/rpc/runtime-api/" }
+pallet-contracts = { version = "3.0.0", default-features = false, path = "../../../frame/contracts" }
+pallet-contracts-primitives = { version = "3.0.0", default-features = false, path = "../../../frame/contracts/common/" }
+pallet-contracts-rpc-runtime-api = { version = "3.0.0", default-features = false, path = "../../../frame/contracts/rpc/runtime-api/" }
 pallet-democracy = { version = "3.0.0", default-features = false, path = "../../../frame/democracy" }
 pallet-elections-phragmen = { version = "3.0.0", default-features = false, path = "../../../frame/elections-phragmen" }
 pallet-election-provider-multi-phase = { version = "3.0.0", default-features = false, path = "../../../frame/election-provider-multi-phase" }
diff --git a/bin/node/testing/Cargo.toml b/bin/node/testing/Cargo.toml
index 95bc8abef6fc..5ae277b35be2 100644
--- a/bin/node/testing/Cargo.toml
+++ b/bin/node/testing/Cargo.toml
@@ -18,7 +18,7 @@ sc-service = { version = "0.9.0", features = ["test-helpers", "db"],  path = "..
 sc-client-db = { version = "0.9.0", path = "../../../client/db/", features = ["kvdb-rocksdb", "parity-db"] }
 sc-client-api = { version = "3.0.0", path = "../../../client/api/" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-pallet-contracts = { version = "2.0.0", path = "../../../frame/contracts" }
+pallet-contracts = { version = "3.0.0", path = "../../../frame/contracts" }
 pallet-grandpa = { version = "3.0.0", path = "../../../frame/grandpa" }
 pallet-indices = { version = "3.0.0", path = "../../../frame/indices" }
 sp-keyring = { version = "3.0.0", path = "../../../primitives/keyring" }
diff --git a/frame/contracts/CHANGELOG.md b/frame/contracts/CHANGELOG.md
new file mode 100644
index 000000000000..ce35abbd86b2
--- /dev/null
+++ b/frame/contracts/CHANGELOG.md
@@ -0,0 +1,78 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+The semantic versioning guarantees cover the interface to the substrate runtime which
+includes this pallet as a dependency. This module will also add storage migrations whenever
+changes require it. Stability with regard to offchain tooling is explicitly excluded from
+this guarantee: For example adding a new field to an in-storage data structure will require
+changes to frontends to properly display it. However, those changes will still be regarded
+as a minor version bump.
+
+The interface provided to smart contracts will adhere to semver with one exception: Even
+major version bumps will be backwards compatible with regard to already deployed contracts.
+In other words: Upgrading this pallet will not break pre-existing contracts.
+
+## [v3.0.0]
+
+This version constitutes the first release that brings any stability guarantees (see above).
+
+### Added
+
+- Emit an event when a contract terminates (self-destructs).
+[1](https://github.com/paritytech/substrate/pull/8014)
+
+- Charge rent for code stored on the chain in addition to the already existing
+rent that is payed for data storage.
+[1](https://github.com/paritytech/substrate/pull/7935)
+
+- Allow the runtime to configure per storage item costs in addition
+to the already existing per byte costs.
+[1](https://github.com/paritytech/substrate/pull/7819)
+
+- Contracts are now deleted lazily so that the user who removes a contract
+does not need to pay for the deletion of the contract storage.
+[1](https://github.com/paritytech/substrate/pull/7740)
+
+- Allow runtime authors to define chain extensions in order to provide custom
+functionality to contracts.
+[1](https://github.com/paritytech/substrate/pull/7548)
+[2](https://github.com/paritytech/substrate/pull/8003)
+
+- Proper weights which are fully automated by benchmarking.
+[1](https://github.com/paritytech/substrate/pull/6715)
+[2](https://github.com/paritytech/substrate/pull/7017)
+[3](https://github.com/paritytech/substrate/pull/7361)
+
+### Changes
+
+- Collect the rent for one block during instantiation.
+[1](https://github.com/paritytech/substrate/pull/7847)
+
+- Instantiation takes a `salt` argument to allow for easier instantion of the
+same code by the same sender.
+[1](https://github.com/paritytech/substrate/pull/7482)
+
+- Improve the information returned by the `contracts_call` RPC.
+[1](https://github.com/paritytech/substrate/pull/7468)
+
+- Simplify the node configuration necessary to add this module.
+[1](https://github.com/paritytech/substrate/pull/7409)
+
+### Fixed
+
+- Consider the code size of a contract in the weight that is charged for
+loading a contract from storage.
+[1](https://github.com/paritytech/substrate/pull/8086)
+
+- Fix possible overflow in storage size calculation
+[1](https://github.com/paritytech/substrate/pull/7885)
+
+- Cap the surcharge reward that can be claimed.
+[1](https://github.com/paritytech/substrate/pull/7870)
+
+- Fix a possible DoS vector where contracts could allocate too large buffers.
+[1](https://github.com/paritytech/substrate/pull/7818)
diff --git a/frame/contracts/Cargo.toml b/frame/contracts/Cargo.toml
index ccb879c81146..2b0843a01d7c 100644
--- a/frame/contracts/Cargo.toml
+++ b/frame/contracts/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-contracts"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -9,9 +9,6 @@ repository = "https://github.com/paritytech/substrate/"
 description = "FRAME pallet for WASM contracts"
 readme = "README.md"
 
-# Prevent publish until we are ready to release 3.0.0
-publish = false
-
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
 
@@ -20,8 +17,8 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
 frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-pallet-contracts-primitives = { version = "2.0.0", default-features = false, path = "common" }
-pallet-contracts-proc-macro = { version = "0.1.0", path = "proc-macro" }
+pallet-contracts-primitives = { version = "3.0.0", default-features = false, path = "common" }
+pallet-contracts-proc-macro = { version = "3.0.0", path = "proc-macro" }
 parity-wasm = { version = "0.41.0", default-features = false }
 pwasm-utils = { version = "0.16", default-features = false }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
diff --git a/frame/contracts/README.md b/frame/contracts/README.md
index 8397d2f6bf00..1cb384e14c5a 100644
--- a/frame/contracts/README.md
+++ b/frame/contracts/README.md
@@ -2,8 +2,10 @@
 
 The Contract module provides functionality for the runtime to deploy and execute WebAssembly smart-contracts.
 
-- [`contract::Trait`](https://docs.rs/pallet-contracts/latest/pallet_contracts/trait.Trait.html)
 - [`Call`](https://docs.rs/pallet-contracts/latest/pallet_contracts/enum.Call.html)
+- [`Config`](https://docs.rs/pallet-contracts/latest/pallet_contracts/trait.Config.html)
+- [`Error`](https://docs.rs/pallet-contracts/latest/pallet_contracts/enum.Error.html)
+- [`Event`](https://docs.rs/pallet-contracts/latest/pallet_contracts/enum.Event.html)
 
 ## Overview
 
@@ -32,6 +34,9 @@ reverted at the current call's contract level. For example, if contract A calls
 then all of B's calls are reverted. Assuming correct error handling by contract A, A's other calls and state
 changes still persist.
 
+One gas is equivalent to one [weight](https://substrate.dev/docs/en/knowledgebase/learn-substrate/weight)
+which is defined as one picosecond of execution time on the runtime's reference machine.
+
 ### Notable Scenarios
 
 Contract call failures are not always cascading. When failures occur in a sub-call, they do not "bubble up",
@@ -42,19 +47,14 @@ fails, A can decide how to handle that failure, either proceeding or reverting A
 
 ### Dispatchable functions
 
-Those are documented in the reference documentation of the `Module`.
+Those are documented in the [reference documentation](https://docs.rs/pallet-contracts/latest/pallet_contracts/#dispatchable-functions).
 
 ## Usage
 
-The Contract module is a work in progress. The following examples show how this Contract module
-can be used to instantiate and call contracts.
-
-- [`ink`](https://github.com/paritytech/ink) is
-an [`eDSL`](https://wiki.haskell.org/Embedded_domain_specific_language) that enables writing
-WebAssembly based smart contracts in the Rust programming language. This is a work in progress.
-
-## Related Modules
-
-- [Balances](https://docs.rs/pallet-balances/latest/pallet_balances/)
+This module executes WebAssembly smart contracts. These can potentially be written in any language
+that compiles to web assembly. However, using a language that specifically targets this module
+will make things a lot easier. One such language is [`ink`](https://github.com/paritytech/ink)
+which is an [`eDSL`](https://wiki.haskell.org/Embedded_domain_specific_language) that enables
+writing WebAssembly based smart contracts in the Rust programming language.
 
 License: Apache-2.0
diff --git a/frame/contracts/common/Cargo.toml b/frame/contracts/common/Cargo.toml
index f385a7ae9f2f..050e18fc44d1 100644
--- a/frame/contracts/common/Cargo.toml
+++ b/frame/contracts/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-contracts-primitives"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -8,7 +8,6 @@ homepage = "https://substrate.dev"
 repository = "https://github.com/paritytech/substrate/"
 description = "A crate that hosts a common definitions that are relevant for the pallet-contracts."
 readme = "README.md"
-publish = false
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/frame/contracts/proc-macro/Cargo.toml b/frame/contracts/proc-macro/Cargo.toml
index 56ef85533557..2bdde32e0bd4 100644
--- a/frame/contracts/proc-macro/Cargo.toml
+++ b/frame/contracts/proc-macro/Cargo.toml
@@ -1,13 +1,12 @@
 [package]
 name = "pallet-contracts-proc-macro"
-version = "0.1.0"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
 homepage = "https://substrate.dev"
 repository = "https://github.com/paritytech/substrate/"
 description = "Procedural macros used in pallet_contracts"
-publish = false
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/frame/contracts/rpc/Cargo.toml b/frame/contracts/rpc/Cargo.toml
index 06c3c7d243e0..d0068e3e421c 100644
--- a/frame/contracts/rpc/Cargo.toml
+++ b/frame/contracts/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-contracts-rpc"
-version = "0.8.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -8,7 +8,6 @@ homepage = "https://substrate.dev"
 repository = "https://github.com/paritytech/substrate/"
 description = "Node-specific RPC methods for interaction with contracts."
 readme = "README.md"
-publish = false
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
@@ -24,8 +23,8 @@ sp-rpc = { version = "3.0.0", path = "../../../primitives/rpc" }
 serde = { version = "1.0.101", features = ["derive"] }
 sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
 sp-api = { version = "3.0.0", path = "../../../primitives/api" }
-pallet-contracts-primitives = { version = "2.0.0", path = "../common" }
-pallet-contracts-rpc-runtime-api = { version = "0.8.0", path = "./runtime-api" }
+pallet-contracts-primitives = { version = "3.0.0", path = "../common" }
+pallet-contracts-rpc-runtime-api = { version = "3.0.0", path = "./runtime-api" }
 
 [dev-dependencies]
 serde_json = "1.0.41"
diff --git a/frame/contracts/rpc/runtime-api/Cargo.toml b/frame/contracts/rpc/runtime-api/Cargo.toml
index 0794fee29284..32de637f1082 100644
--- a/frame/contracts/rpc/runtime-api/Cargo.toml
+++ b/frame/contracts/rpc/runtime-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-contracts-rpc-runtime-api"
-version = "0.8.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -8,7 +8,6 @@ homepage = "https://substrate.dev"
 repository = "https://github.com/paritytech/substrate/"
 description = "Runtime API definition required by Contracts RPC extensions."
 readme = "README.md"
-publish = false
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
@@ -18,7 +17,7 @@ sp-api = { version = "3.0.0", default-features = false, path = "../../../../prim
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "3.0.0", default-features = false, path = "../../../../primitives/std" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../../../primitives/runtime" }
-pallet-contracts-primitives = { version = "2.0.0", default-features = false, path = "../../common" }
+pallet-contracts-primitives = { version = "3.0.0", default-features = false, path = "../../common" }
 
 [features]
 default = ["std"]
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index 1f21a59e6158..2ce2014075a8 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -837,6 +837,8 @@ pub struct RawAliveContractInfo<CodeHash, Balance, BlockNumber> {
 	pub deduct_block: BlockNumber,
 	/// Last block child storage has been written.
 	pub last_write: Option<BlockNumber>,
+	/// This field is reserved for future evolution of format.
+	pub _reserved: Option<()>,
 }
 
 impl<CodeHash, Balance, BlockNumber> RawAliveContractInfo<CodeHash, Balance, BlockNumber> {
diff --git a/frame/contracts/src/rent.rs b/frame/contracts/src/rent.rs
index 85b8eff98931..b9ba7185706f 100644
--- a/frame/contracts/src/rent.rs
+++ b/frame/contracts/src/rent.rs
@@ -514,14 +514,12 @@ where
 		<ContractInfoOf<T>>::remove(&origin);
 		let tombstone_code_len = E::remove_user(origin_contract.code_hash);
 		<ContractInfoOf<T>>::insert(&dest, ContractInfo::Alive(AliveContractInfo::<T> {
-			trie_id: origin_contract.trie_id,
-			storage_size: origin_contract.storage_size,
-			pair_count: origin_contract.pair_count,
 			code_hash,
 			rent_allowance,
 			rent_payed: <BalanceOf<T>>::zero(),
 			deduct_block: current_block,
 			last_write,
+			.. origin_contract
 		}));
 
 		let origin_free_balance = T::Currency::free_balance(&origin);
diff --git a/frame/contracts/src/storage.rs b/frame/contracts/src/storage.rs
index 5fb603b334a6..dbf993bc3bc0 100644
--- a/frame/contracts/src/storage.rs
+++ b/frame/contracts/src/storage.rs
@@ -182,6 +182,7 @@ where
 				rent_payed: <BalanceOf<T>>::zero(),
 				pair_count: 0,
 				last_write: None,
+				_reserved: None,
 			};
 
 			*existing = Some(contract.into());
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index 3fa806799e95..c17434300d45 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -392,6 +392,7 @@ fn account_removal_does_not_remove_storage() {
 				rent_allowance: 40,
 				rent_payed: 0,
 				last_write: None,
+				_reserved: None,
 			});
 			let _ = Balances::deposit_creating(&ALICE, 110);
 			ContractInfoOf::<Test>::insert(ALICE, &alice_contract_info);
@@ -407,6 +408,7 @@ fn account_removal_does_not_remove_storage() {
 				rent_allowance: 40,
 				rent_payed: 0,
 				last_write: None,
+				_reserved: None,
 			});
 			let _ = Balances::deposit_creating(&BOB, 110);
 			ContractInfoOf::<Test>::insert(BOB, &bob_contract_info);

From ec498bb6dd113f236dc7cb09644ae4a9b844402e Mon Sep 17 00:00:00 2001
From: yjh <465402634@qq.com>
Date: Fri, 26 Feb 2021 18:47:47 +0800
Subject: [PATCH 0442/1194] chore: fix typos for contract (#8178)

---
 frame/contracts/src/wasm/runtime.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index e0f7626b95a9..c383fdcc2ac2 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -173,7 +173,7 @@ pub enum RuntimeToken {
 	RestoreToSurchargeCodeSize{caller_code: u32, tombstone_code: u32},
 	/// Weight of calling `seal_random`. It includes the weight for copying the subject.
 	Random,
-	/// Weight of calling `seal_reposit_event` with the given number of topics and event size.
+	/// Weight of calling `seal_deposit_event` with the given number of topics and event size.
 	DepositEvent{num_topic: u32, len: u32},
 	/// Weight of calling `seal_set_rent_allowance`.
 	SetRentAllowance,
@@ -846,8 +846,8 @@ define_env!(Env, <E: Ext>,
 	// length to `output_len_ptr`. The copy of the output buffer and address can be skipped by
 	// supplying the sentinel value of `u32::max_value()` to `output_ptr` or `address_ptr`.
 	//
-	// After running the constructor it is verfied that the contract account holds at
-	// least the subsistence threshold. If that is not the case the instantion fails and
+	// After running the constructor it is verified that the contract account holds at
+	// least the subsistence threshold. If that is not the case the instantiation fails and
 	// the contract is not created.
 	//
 	// # Parameters
@@ -866,7 +866,7 @@ define_env!(Env, <E: Ext>,
 	// - output_ptr: a pointer where the output buffer is copied to.
 	// - output_len_ptr: in-out pointer to where the length of the buffer is read from
 	//   and the actual length is written to.
-	// - salt_ptr: Pointer to raw bytes used for address deriviation. See `fn contract_address`.
+	// - salt_ptr: Pointer to raw bytes used for address derivation. See `fn contract_address`.
 	// - salt_len: length in bytes of the supplied salt.
 	//
 	// # Errors
@@ -956,7 +956,7 @@ define_env!(Env, <E: Ext>,
 	// which is considered fatal and results in a trap + rollback.
 	//
 	// - beneficiary_ptr: a pointer to the address of the beneficiary account where all
-	//   where all remaining funds of the caller are transfered.
+	//   where all remaining funds of the caller are transferred.
 	//   Should be decodable as an `T::AccountId`. Traps otherwise.
 	// - beneficiary_len: length of the address buffer.
 	//
@@ -1010,7 +1010,7 @@ define_env!(Env, <E: Ext>,
 
 	// Cease contract execution and save a data buffer as a result of the execution.
 	//
-	// This function never retuns as it stops execution of the caller.
+	// This function never returns as it stops execution of the caller.
 	// This is the only way to return a data buffer to the caller. Returning from
 	// execution without calling this function is equivalent to calling:
 	// ```
@@ -1197,7 +1197,7 @@ define_env!(Env, <E: Ext>,
 	// This function will compute a tombstone hash from the caller's storage and the given code hash
 	// and if the hash matches the hash found in the tombstone at the specified address - kill
 	// the caller contract and restore the destination contract and set the specified `rent_allowance`.
-	// All caller's funds are transfered to the destination.
+	// All caller's funds are transferred to the destination.
 	//
 	// The tombstone hash is derived as `hash(code_hash, storage_root_hash)`. In order to match
 	// this hash to its own hash the restorer must make its storage equal to the one of the

From ad626b00990e57f7d23dee212d3b78e758ae88c8 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Fri, 26 Feb 2021 16:09:42 +0100
Subject: [PATCH 0443/1194] Fix transactions not being propagated to
 authorities (#8212)

---
 client/network/src/transactions.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/network/src/transactions.rs b/client/network/src/transactions.rs
index 800d801ab3f8..20ac8314b747 100644
--- a/client/network/src/transactions.rs
+++ b/client/network/src/transactions.rs
@@ -439,7 +439,7 @@ impl<B: BlockT + 'static, H: ExHashT> TransactionsHandler<B, H> {
 
 		for (who, peer) in self.peers.iter_mut() {
 			// never send transactions to the light node
-			if !matches!(peer.role, ObservedRole::Full) {
+			if matches!(peer.role, ObservedRole::Light) {
 				continue;
 			}
 

From 28107d402cb88cf50119c4ecb16555fcacf3a3e6 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Fri, 26 Feb 2021 15:41:23 +0000
Subject: [PATCH 0444/1194] Better identifier and logging for runtime upgrades
 (#8123)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* A clean new attempt

* Checkpoint to move remote.

* A lot of dependency wiring to make it feature gated.

* bad macro, bad macro.

* Undo the DB mess.

* Update frame/support/src/traits.rs

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

* Apply suggestions from code review

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

* unbreak the build

* Better logging and ids for migrations

* Fix doc.

* Test

* Update frame/try-runtime/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update utils/frame/try-runtime/cli/Cargo.toml

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Update frame/try-runtime/Cargo.toml

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Address most review grumbles.

* Fix build

* Add some comments

* Remove allowing one pallet at a time.

* Rework the PR

* nit

* Slightly better error handling.

* Remove files

* Update utils/frame/remote-externalities/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update frame/support/src/dispatch.rs

* Update frame/support/src/dispatch.rs

* Fix test

* Make extension trait.

* Bring back try-runtime/std

* remove bincode

* Remove warning

* Change test features

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 Cargo.lock                                  |   4 +-
 bin/node/cli/src/command.rs                 |   2 +-
 frame/support/procedural/src/lib.rs         |   2 +-
 frame/support/src/dispatch.rs               | 110 +++++++++++------
 frame/support/src/lib.rs                    |   3 +
 frame/support/src/traits.rs                 |  48 ++++++++
 primitives/storage/src/lib.rs               |   4 +-
 utils/frame/remote-externalities/Cargo.toml |   4 +-
 utils/frame/remote-externalities/proxy_test | Bin 26476 -> 0 bytes
 utils/frame/remote-externalities/src/lib.rs | 123 ++++++++++----------
 utils/frame/try-runtime/cli/src/lib.rs      |   2 +-
 11 files changed, 194 insertions(+), 108 deletions(-)
 delete mode 100644 utils/frame/remote-externalities/proxy_test

diff --git a/Cargo.lock b/Cargo.lock
index 5a1f7bf670bb..7cb69617b1d1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6436,12 +6436,12 @@ name = "remote-externalities"
 version = "0.9.0"
 dependencies = [
  "async-std",
- "bincode",
  "env_logger 0.8.2",
- "futures 0.1.30",
+ "futures 0.3.12",
  "hex-literal",
  "jsonrpc-core-client",
  "log",
+ "parity-scale-codec",
  "sc-rpc",
  "sc-rpc-api",
  "sp-core",
diff --git a/bin/node/cli/src/command.rs b/bin/node/cli/src/command.rs
index d3689bdcd674..ece97436bfdf 100644
--- a/bin/node/cli/src/command.rs
+++ b/bin/node/cli/src/command.rs
@@ -159,7 +159,7 @@ pub fn run() -> Result<()> {
 				let task_manager = sc_service::TaskManager::new(
 					config.task_executor.clone(),
 					registry,
-				).unwrap();
+				).map_err(|e| sc_cli::Error::Service(sc_service::Error::Prometheus(e)))?;
 
 				Ok((cmd.run::<Block, Executor>(config), task_manager))
 			})
diff --git a/frame/support/procedural/src/lib.rs b/frame/support/procedural/src/lib.rs
index 2c2cdf00a045..e64a364d2951 100644
--- a/frame/support/procedural/src/lib.rs
+++ b/frame/support/procedural/src/lib.rs
@@ -17,7 +17,7 @@
 
 //! Proc macro of Support code for the runtime.
 
-#![recursion_limit="512"]
+#![recursion_limit = "512"]
 
 mod storage;
 mod construct_runtime;
diff --git a/frame/support/src/dispatch.rs b/frame/support/src/dispatch.rs
index f5c8f017e345..c2315e66e323 100644
--- a/frame/support/src/dispatch.rs
+++ b/frame/support/src/dispatch.rs
@@ -80,18 +80,18 @@ impl<T> Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 /// 		// FRAME pallets.
 /// 		#[weight = 0]
 /// 		fn my_function(origin, var: u64) -> dispatch::DispatchResult {
-///				// Your implementation
-///				Ok(())
+/// 				// Your implementation
+/// 				Ok(())
 /// 		}
 ///
-///			// Public functions are both dispatchable and available to other
+/// 			// Public functions are both dispatchable and available to other
 /// 		// FRAME pallets.
 /// 		#[weight = 0]
-///			pub fn my_public_function(origin) -> dispatch::DispatchResult {
+/// 			pub fn my_public_function(origin) -> dispatch::DispatchResult {
 /// 			// Your implementation
-///				Ok(())
+/// 				Ok(())
+/// 		}
 /// 		}
-///		}
 /// }
 /// # fn main() {}
 /// ```
@@ -99,8 +99,10 @@ impl<T> Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 /// The declaration is set with the header where:
 ///
 /// * `Module`: The struct generated by the macro, with type `Config`.
-/// * `Call`: The enum generated for every pallet, which implements [`Callable`](./dispatch/trait.Callable.html).
-/// * `origin`: Alias of `T::Origin`, declared by the [`impl_outer_origin!`](./macro.impl_outer_origin.html) macro.
+/// * `Call`: The enum generated for every pallet, which implements
+///   [`Callable`](./dispatch/trait.Callable.html).
+/// * `origin`: Alias of `T::Origin`, declared by the
+///   [`impl_outer_origin!`](./macro.impl_outer_origin.html) macro.
 /// * `Result`: The expected return type from pallet functions.
 ///
 /// The first parameter of dispatchable functions must always be `origin`.
@@ -119,15 +121,15 @@ impl<T> Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 /// 	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 /// 		#[weight = 0]
 /// 		fn my_long_function(origin) -> dispatch::DispatchResult {
-///				// Your implementation
+/// 				// Your implementation
 /// 			Ok(())
 /// 		}
 ///
 /// 		#[weight = 0]
 /// 		fn my_short_function(origin) {
-///				// Your implementation
+/// 				// Your implementation
+/// 		}
 /// 		}
-///		}
 /// }
 /// # fn main() {}
 /// ```
@@ -184,7 +186,7 @@ impl<T> Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 /// 		#[weight = 0]
 /// 		#[transactional]
 /// 		fn my_short_function(origin) {
-///				// Your implementation
+/// 				// Your implementation
 /// 		}
 /// 	}
 /// }
@@ -203,12 +205,12 @@ impl<T> Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 /// decl_module! {
 /// 	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 /// 		#[weight = 0]
-///			fn my_privileged_function(origin) -> dispatch::DispatchResult {
+/// 			fn my_privileged_function(origin) -> dispatch::DispatchResult {
 /// 			ensure_root(origin)?;
-///				// Your implementation
+/// 				// Your implementation
 /// 			Ok(())
 /// 		}
-///		}
+/// 		}
 /// }
 /// # fn main() {}
 /// ```
@@ -218,15 +220,17 @@ impl<T> Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 /// Attributes on functions are supported, but must be in the order of:
 /// 1. Optional #\[doc\] attribute.
 /// 2. #\[weight\] attribute.
-/// 3. Optional function attributes, for instance #\[transactional\]. Those function attributes will be written
-/// only on the dispatchable functions implemented on `Module`, not on the `Call` enum variant.
+/// 3. Optional function attributes, for instance #\[transactional\]. Those function attributes will
+/// be written only on the dispatchable functions implemented on `Module`, not on the `Call` enum
+/// variant.
 ///
 /// ## Multiple Module Instances Example
 ///
-/// A Substrate module can be built such that multiple instances of the same module can be used within a single
-/// runtime. For example, the [Balances module](../pallet_balances/index.html) can be added multiple times to your
-/// runtime in order to support multiple, independent currencies for your blockchain. Here is an example of how
-/// you would declare such a module using the `decl_module!` macro:
+/// A Substrate module can be built such that multiple instances of the same module can be used
+/// within a single runtime. For example, the [Balances module](../pallet_balances/index.html) can
+/// be added multiple times to your runtime in order to support multiple, independent currencies for
+/// your blockchain. Here is an example of how you would declare such a module using the
+/// `decl_module!` macro:
 ///
 /// ```
 /// # #[macro_use]
@@ -251,10 +255,10 @@ impl<T> Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 ///
 /// ## Where clause
 ///
-/// Besides the default `origin: T::Origin`, you can also pass other bounds to the module declaration.
-/// This where bound will be replicated to all types generated by this macro. The chaining of multiple
-/// trait bounds with `+` is not supported. If multiple bounds for one type are required, it needs to
-/// be split up into multiple bounds.
+/// Besides the default `origin: T::Origin`, you can also pass other bounds to the module
+/// declaration. This where bound will be replicated to all types generated by this macro. The
+/// chaining of multiple trait bounds with `+` is not supported. If multiple bounds for one type are
+/// required, it needs to be split up into multiple bounds.
 ///
 /// ```
 /// # #[macro_use]
@@ -276,16 +280,18 @@ impl<T> Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 /// The following are reserved function signatures:
 ///
 /// * `deposit_event`: Helper function for depositing an [event](https://docs.substrate.dev/docs/event-enum).
-/// The default behavior is to call `deposit_event` from the [System module](../frame_system/index.html).
-/// However, you can write your own implementation for events in your runtime. To use the default behavior,
-/// add `fn deposit_event() = default;` to your `Module`.
+/// The default behavior is to call `deposit_event` from the [System
+/// module](../frame_system/index.html). However, you can write your own implementation for events
+/// in your runtime. To use the default behavior, add `fn deposit_event() = default;` to your
+/// `Module`.
 ///
-/// The following reserved functions also take the block number (with type `T::BlockNumber`) as an optional input:
+/// The following reserved functions also take the block number (with type `T::BlockNumber`) as an
+/// optional input:
 ///
 /// * `on_runtime_upgrade`: Executes at the beginning of a block prior to on_initialize when there
-/// is a runtime upgrade. This allows each module to upgrade its storage before the storage items are used.
-/// As such, **calling other modules must be avoided**!! Using this function will implement the
-/// [`OnRuntimeUpgrade`](../sp_runtime/traits/trait.OnRuntimeUpgrade.html) trait.
+/// is a runtime upgrade. This allows each module to upgrade its storage before the storage items
+/// are used. As such, **calling other modules must be avoided**!! Using this function will
+/// implement the [`OnRuntimeUpgrade`](../sp_runtime/traits/trait.OnRuntimeUpgrade.html) trait.
 /// Function signature must be `fn on_runtime_upgrade() -> frame_support::weights::Weight`.
 ///
 /// * `on_initialize`: Executes at the beginning of a block. Using this function will
@@ -300,11 +306,11 @@ impl<T> Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 ///   * `fn on_finalize(n: BlockNumber) -> frame_support::weights::Weight` or
 ///   * `fn on_finalize() -> frame_support::weights::Weight`
 ///
-/// * `offchain_worker`: Executes at the beginning of a block and produces extrinsics for a future block
-///   upon completion. Using this function will implement the
+/// * `offchain_worker`: Executes at the beginning of a block and produces extrinsics for a future
+///   block upon completion. Using this function will implement the
 ///   [`OffchainWorker`](./traits/trait.OffchainWorker.html) trait.
-/// * `integrity_test`: Executes in a test generated by `construct_runtime`, note it doesn't
-///   execute in an externalities-provided environment. Implement
+/// * `integrity_test`: Executes in a test generated by `construct_runtime`, note it doesn't execute
+///   in an externalities-provided environment. Implement
 ///   [`IntegrityTest`](./trait.IntegrityTest.html) trait.
 #[macro_export]
 macro_rules! decl_module {
@@ -1325,13 +1331,27 @@ macro_rules! decl_module {
 				$crate::sp_tracing::enter_span!($crate::sp_tracing::trace_span!("on_runtime_upgrade"));
 				let result: $return = (|| { $( $impl )* })();
 
-				$crate::crate_to_pallet_version!()
+				let new_storage_version = $crate::crate_to_pallet_version!();
+				new_storage_version
 					.put_into_storage::<<$trait_instance as $system::Config>::PalletInfo, Self>();
 
 				let additional_write = <
 					<$trait_instance as $system::Config>::DbWeight as $crate::traits::Get<_>
 				>::get().writes(1);
 
+				let pallet_name = <<
+					$trait_instance
+					as
+					$system::Config
+				>::PalletInfo as $crate::traits::PalletInfo>::name::<Self>().expect("pallet will have name in the runtime; qed");
+
+				$crate::debug::info!(
+					target: $crate::LOG_TARGET,
+					"⚠️ running migration for {} and setting new storage version to {:?}",
+					pallet_name,
+					new_storage_version,
+				);
+
 				result.saturating_add(additional_write)
 			}
 
@@ -1359,9 +1379,23 @@ macro_rules! decl_module {
 			fn on_runtime_upgrade() -> $crate::dispatch::Weight {
 				$crate::sp_tracing::enter_span!($crate::sp_tracing::trace_span!("on_runtime_upgrade"));
 
-				$crate::crate_to_pallet_version!()
+				let new_storage_version = $crate::crate_to_pallet_version!();
+				new_storage_version
 					.put_into_storage::<<$trait_instance as $system::Config>::PalletInfo, Self>();
 
+				let pallet_name = <<
+					$trait_instance
+					as
+					$system::Config
+				>::PalletInfo as $crate::traits::PalletInfo>::name::<Self>().expect("pallet will have name in the runtime; qed");
+
+				$crate::debug::info!(
+					target: $crate::LOG_TARGET,
+					"✅ no migration for '{}' and setting new storage version to {:?}",
+					pallet_name,
+					new_storage_version,
+				);
+
 				<
 					<$trait_instance as $system::Config>::DbWeight as $crate::traits::Get<_>
 				>::get().writes(1)
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index e7af1ccab68f..e16200ef0b99 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -80,6 +80,9 @@ pub use self::storage::{
 pub use self::dispatch::{Parameter, Callable};
 pub use sp_runtime::{self, ConsensusEngineId, print, traits::Printable};
 
+/// A unified log target for support operations.
+pub const LOG_TARGET: &'static str = "runtime::frame-support";
+
 /// A type that cannot be instantiated.
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub enum Never {}
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index f0ab3be642cb..395a23d581e6 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -1553,6 +1553,54 @@ pub trait OnGenesis {
 	fn on_genesis() {}
 }
 
+/// Prefix to be used (optionally) for implementing [`OnRuntimeUpgrade::storage_key`].
+#[cfg(feature = "try-runtime")]
+pub const ON_RUNTIME_UPGRADE_PREFIX: &[u8] = b"__ON_RUNTIME_UPGRADE__";
+
+/// Some helper functions for [`OnRuntimeUpgrade`] during `try-runtime` testing.
+#[cfg(feature = "try-runtime")]
+pub trait OnRuntimeUpgradeHelpersExt {
+	/// Generate a storage key unique to this runtime upgrade.
+	///
+	/// This can be used to communicate data from pre-upgrade to post-upgrade state and check
+	/// them. See [`set_temp_storage`] and [`get_temp_storage`].
+	#[cfg(feature = "try-runtime")]
+	fn storage_key(ident: &str) -> [u8; 32] {
+		let prefix = sp_io::hashing::twox_128(ON_RUNTIME_UPGRADE_PREFIX);
+		let ident = sp_io::hashing::twox_128(ident.as_bytes());
+
+		let mut final_key = [0u8; 32];
+		final_key[..16].copy_from_slice(&prefix);
+		final_key[16..].copy_from_slice(&ident);
+
+		final_key
+	}
+
+	/// Get temporary storage data written by [`set_temp_storage`].
+	///
+	/// Returns `None` if either the data is unavailable or un-decodable.
+	///
+	/// A `at` storage identifier must be provided to indicate where the storage is being read from.
+	#[cfg(feature = "try-runtime")]
+	fn get_temp_storage<T: Decode>(at: &str) -> Option<T> {
+		sp_io::storage::get(&Self::storage_key(at))
+			.and_then(|bytes| Decode::decode(&mut &*bytes).ok())
+	}
+
+	/// Write some temporary data to a specific storage that can be read (potentially in
+	/// post-upgrade hook) via [`get_temp_storage`].
+	///
+	/// A `at` storage identifier must be provided to indicate where the storage is being written
+	/// to.
+	#[cfg(feature = "try-runtime")]
+	fn set_temp_storage<T: Encode>(data: T, at: &str) {
+		sp_io::storage::set(&Self::storage_key(at), &data.encode());
+	}
+}
+
+#[cfg(feature = "try-runtime")]
+impl<U: OnRuntimeUpgrade> OnRuntimeUpgradeHelpersExt for U {}
+
 /// The runtime upgrade trait.
 ///
 /// Implementing this lets you express what should happen when the runtime upgrades,
diff --git a/primitives/storage/src/lib.rs b/primitives/storage/src/lib.rs
index 1016b73eb1e3..ced8d8c02a80 100644
--- a/primitives/storage/src/lib.rs
+++ b/primitives/storage/src/lib.rs
@@ -29,7 +29,7 @@ use codec::{Encode, Decode};
 
 /// Storage key.
 #[derive(PartialEq, Eq, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Hash, PartialOrd, Ord, Clone))]
+#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Hash, PartialOrd, Ord, Clone, Encode, Decode))]
 pub struct StorageKey(
 	#[cfg_attr(feature = "std", serde(with = "impl_serde::serialize"))] pub Vec<u8>,
 );
@@ -107,7 +107,7 @@ impl PrefixedStorageKey {
 
 /// Storage data associated to a [`StorageKey`].
 #[derive(PartialEq, Eq, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Hash, PartialOrd, Ord, Clone))]
+#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Hash, PartialOrd, Ord, Clone, Encode, Decode))]
 pub struct StorageData(
 	#[cfg_attr(feature = "std", serde(with="impl_serde::serialize"))]
 	pub Vec<u8>,
diff --git a/utils/frame/remote-externalities/Cargo.toml b/utils/frame/remote-externalities/Cargo.toml
index 41a3b2621786..d4825211d8a6 100644
--- a/utils/frame/remote-externalities/Cargo.toml
+++ b/utils/frame/remote-externalities/Cargo.toml
@@ -16,12 +16,12 @@ targets = ["x86_64-unknown-linux-gnu"]
 jsonrpc-core-client = { version = "15.1.0", features = ["http"] }
 sc-rpc-api = { version = "0.9.0", path = "../../../client/rpc-api" }
 sc-rpc = { version = "3.0.0", path = "../../../client/rpc" }
-futures = "0.1.29"
+futures = "0.3"
 
 hex-literal = "0.3.1"
 env_logger = "0.8.2"
 log = "0.4.11"
-bincode = "1.3.1"
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 tokio = "0.1.22"
 
 sp-io = { version = "3.0.0", path = "../../../primitives/io" }
diff --git a/utils/frame/remote-externalities/proxy_test b/utils/frame/remote-externalities/proxy_test
deleted file mode 100644
index adb93f5ba270c3e3740394f183d96bc54a3211f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26476
zcmd_zJC^Q9k{n=?;%M9h7k~)F15ihx#7zVu0Fm;ngR9~4_<45aOBwPov;V3(lQZ2_
zeQ#AJ{(y(OxtY1&|Nfu;@%6v{`0Ms>>DbQIkG-^>``GTM9&>xfwqN5Jd*0JJj=JV^
z<=&rk)F-dwZh82dbDKxq`gWC^(>(kuTiV9BeX~^4IBT6fUt?|i>iNmX)9#~etIhMM
zXB$25eXKj3dwupgw$^K_?SFqf*>;qBUw51Jx{veP+B4eI%gFnE9HU;TweqBPUUxfd
zyZy`Qe$K6zQt!3Zr`}uM{`jid??1)!ls%<!9Ctt4wf27aO2s3mH1~R@dmJN|`5bMn
zeLGr7`#DN||32GRkF`qma~#p<uYUgBZ=P(fIUlLk+|OL9&%8?7&eBRR^G>O*G@mEm
z`OJISSDyLa_Uc#fR<CmQ`IPHU%UgP?m-|0IPqtho-RIn{*;=lB&9QBFO=YZS^NV-i
ze9vb;ucKZ2S&p7l-^X~oy;+`><3<1R^=!^EU!LoqejaDt_Gi1VanF^m$8(;?x>nmp
zulMtKuygtCyz+C*EAKfuul3yPIlOJ3ZyU#RU452Oa!Fs$;}|I=f!~|ku;o10b&OK>
zy{`K_i=VMp8mpdnD_bhZd7tGv_w&d#J!kQ2f5Le@dEU*t*=8%H?=3w~OG(6B=Uuk_
z+#cbbZb4LXzw0^gv7Kk%k37bC=H#GUmeO2R7x4Oe^RAIj!ElW0sQH-ZQ+JUssLIt+
zEo<F!grm*Zy03kl*Ex^gTbgTLR}rNj=P}*XnNGnv+}&#kqqVvayCj~i)K%}RUR~Ut
zxt_h&XU%ogQ8wW|+x>p7ue^Dwlzgw*`?WXsy^iOU%I4X`L_Y3%)Y6_>q@=p9L)z=l
zm1-|Xc}5jtDK$6mS}u*l-SgK-+e>luZ5``8gm1g|*{?Pn#-5In_pR-z_2wUY9+{~f
zGMDI<qGw6HxS#J|ue*6_MBSgKi+>-i_POe_rJS}V+mGI=Ozy+?>vUZ6m=fdT|E}C_
zzw81%eI~hlS3CBRwy)>$)3g1IwAY=7va(-KIp)3Ac`ffR^&=-)rXK21>-{KdpaY30
zI@WWp{ke;ZGxix(XUf@qKhvd<-no3edB0clB8JvhRL(rkJ-03Gm%=HGxB1j`s2JtA
z?`=rw+r9RyUqu<tyGq{9@~7Oqyw`0>*l>t?>{*Ze)ZF&gPld>n-yZXTQ}%s(j<wgB
zo9rXw=Q)P|PCeyW@4fj>^S=JefBr|&+x~5vzjv~#Yd)W6Ynw_SFO=zpDgv|3*4<h8
zZ|)v+QzGga$Y*csatUr#e4bw_<=Exv$Hz?VUZ?9{m0U>!`jU5Bxd(`IOC|Ty&)&1R
zntR_?5p<>8^F0@A+uRi4Gk)?vyAEfUe;jJ)waW1M>UjxnZ$^ZTTS0lwS#y*Ru<W`Z
ziFWrVKY&_yANDJCnOzB*<pAi;e@^s|v8}usoZ4KwQ{BJLp8UX;5AOx6P3mOo`5t1X
z&7|NwcLj0OA^7$4WM7B)a+B=WcBMVvb3fO81Sa#k`?eqVx~gOE0L+uFaS6Nat(=Ox
zed}|mACOBMZ8eA9&i(qDXaA0MCwnbt%6F;_I2-DqLx@uIlvAt;bUne8(|l%!GLL;<
zr`xu!dp=NN*`Hp=nCYpCS07)`qYgKB<!y&m+`qQAsN#<<=(*DaF3B)=_618yK5&-a
zL)l+j0(5%)Q|gYpmR<ZL0Uk4H4(@#%_te_Jx_RpdShqh@vWG3sqc2$5C6hF^damjo
zXm1`}*shf-_3O>s^>;q!)b~s+(2U0HnH}gYPNt~wbLP6P-U53k1<m2=k<ME|0hK?`
zqaAC^ah%@PHK!zfx62Xh6Xr|_a0F={(5jDi)pXu#<W*+&Tu=3mWs&#0_qv<s?xaUj
zzw}c{;K*Jok9(#!lGZQnmrhpO>X)^b(JLg`zVs!T-14@giKEpfz{=zP7HL!W&;}ql
zCh#2S=$3h+qbmV$%PtD_m~*?+@eEIJ$e$7yjB!Y(@23%<>Q%kg4yNn*<(*x7cu3c`
z<T91iai#_kyOsK5si$a(@&yhD4%~N#qBO$%(S3B0qosoVzn(|%2V&t!<4PJSXQAIb
zclq}&UH#B(!ifstp}RW!bGHsk-x?iFoYw3!K3;ep{qb|5ietpZd!z+;SamBS`jpl*
z;wpJw*W5td>l*5u^HFY|={{<tA~u#n<Ld6;dhtz}-<FSC990K*;AMS#%}A6}(CKTV
zXs)B^?8dzpDamhbD3<-+yLR<GLSA<s`nIc0tc(-s;}W?G2Ab~AoYC$*QS&`J^eb|D
zYy0Q{Keu&Ef1hX4abNY&ICS~^_^abI6c~8io@0mQ#++RQV_77@<YhbslD`2@SZ%l*
z{;CUKcSY7{jl0zR@%1{Kh7tf7)Pjx&5<3;|k+V*G91{2e7O4#>4_$pd+`pq#0jQ~o
zUzc|DoKPAD=)CYA`CCpa*t$#7%h-~Eo;tBFBD~9Tb#Jcr-L~tJJC&YGRc(sujd+2%
z9M^`(c|VXB#_Vx6@cd|q&FwzZPnn6YIqj$1%V$oDVw;`|fBAW@-_I)k`g{ChId^GC
zE-uGD)%546NVDX21|>0Xx%S?pZBh&6WR(qLs1^pd(e)Zzy7FlGK~W%YQvY^`tM32M
zrs#X_XTm8-7IQPUOU2yLu-h#VBuv+4t5eOpP(K?wB*@Ay==-nOwY~5TkKi|D8-!WL
zQ#UyDgvQGHM?FHxB8g6U>8yJf)3C4rKNnUQ-vA&_7ZjVNXn`2V*O)z`z0h@@K<=TU
zMM{&MQ&Dj@EgBwR)8dX>Yjhr{W!X%0=>5`ErEwtdarwGCEHE&T<%BB%130sxpla`R
z*YocM3yiMz$PyY_a-UQRy+c`7-kx)`mViycyl2?8UHu#LLXnWJ5n7-ya(5ungZe~p
z9S0I;caS^675m>WMStKa^=i4tA>WX4a1t4j4&FU8=s#iy!ljWvrrsZop0F`428`4t
zP<KsFIsypewQH>~`dG~mdq3A#a-KEUsWRw!po|-|Afg=0=X#zx^-5<t*HY;2ZC(|m
z*_IZw5JM10aQX@K41Mz>ZgNI~evP!y6`&QpD;Ywdwzfjq@XC+_8Fjojr>sug)D{T?
z3I-gd9x}|MyZJni7e<=r>Mj$qTiM5~yL{rv%fY`Cc<utk2udQ+Q9R9&>^e#49fRw-
zfrP{gw=}QO`u^=aTvLaL@j-Jtm_p<Vehz2^mFNs|;{dgD)53{dy_hp9Y0kP8AX!Ac
zpU4Z(!<E7@$VUam<~BJHK)wqLG6|`u<9i0y<-QI~6e2@~*aO4|<kQ<}vHi{5@y2wM
z`)lv{dpREZ82eIBh6Wt~LtMM5skhL7c4-0|U5*L|kVx)xe{l4nV-8A$<Ni{2Ue|j%
zSfy9HRa1l0;Ne1G!y-!^?iI=-TFun*rpN|4A^Ti3hpkF{w<MMG=8%E5AUpE6Uh8ie
zY0u;HQfCj%vC4N{*qyvEyc%y}Zxdirt3bQYiW+K4myW3sV8~m=-P~_CZ_Szz@LT<w
ziIf0Xwz!%a$&kTl8c0mALpNG65~vjnp&)mMv2m+vU{SiKTa9{ozjprmx|=6ABys|^
z49l9N$3hwJvaz(Rh}?>ERB(sX=+Y0e-^T{DWN=i5+H!aQ`r|*kcqGHu^GJub{;CQp
zzIkdEwE8$_5O34mHsy2(LMK3dqTjf;TAqxbma!zjKnQ<)z3@ExBb98PMjzSy*Q!7a
zSb$Hs9F11FOfjO+6pVOZyR>}5vdYQ1AHlvy{sMl6Cbf>QnMfDMl5hrFg^Mp+PA58b
zNhKIXsr^P-tc-Lc6C*}MWxWWP#K08L=*xLH#(j;8`Wh%1mPiOSgpMcnPm(<~{k}Cs
zC9AGrED!mURGTXPDX5e8uh(TFk4EFJI(P_uAPGgkt9WN6>B=I==UoYXui6cH6g{Jt
z1Q?vsTl?SZ)cnQ24Bi~u*N)()c;d4|`aQ*P>OqRGMt0?bXfkR?RE9tvB1&38J}ckk
zfdg<Op3{A=poXKj3F_yAseD~WATVf*if9fs$nBner7g?~3dp8zPz|CocrkH9rAg$&
zg$(xF{`uh(K~^_^1oiCP*VpL(y*dokppb`1z>i$%p@oLUXay;BZTd*mFTqIURJ7tk
z#jDzfm}#mrLhwEIUx|Rj#e(*P$onL80}G*hOZ^Z(brI6jctH}kHi@fZJ-imR9~iIW
zcy4OVP0KyV5Z+CJ_rK;@e8W1mVp!wJSQG!0I2w0P3J_OH4m%6&Rbn`Csa~HG(l@j%
z?%Mp44PKXLJ8IYKn>i#X?`nH)#5WugtWH1>-4rrU52FFaTMn-qt8_a;G@s5O(Zp$K
zVH4q$NMEzTFGkw0X|amPV7|yOhAa;X?9bUl3)cWLx<yZS^c}IiL+8rFoDV2M?AH;z
z@xLEI`@(GC)S2DLF+1U4dm1thFB|czx?CPRg^nO8WbKs>zBWO3dYh+wKt5*8;|vPV
z7{aHOuQB^~RLHt&Pg`MD*#?P<i{WPu!f)q+t7`q`VhpmB;f*92eVjPZ-0yH1qKww1
zd+m!PDFIK{TJEK0xGEpv@j~n<k33G~KDSUGn$Dq*@Kb_KgslDHe%zROM36p0-;Lc?
z9Pksaxy0?$4gF|(!Z6o#_FvBfAHo=>>>x5S7*uujfR>&YI?o`Qqu|Jcn=YnHT^6iE
z(xRex2AKP^dcH2F9ebXIF7fn?lfIUZyDLpB3tUYXOWUSEg?sMd=OA5hw0ZDdGd2Mo
zNUWnkHS9xGz%qT)ae@?5j?r@!lcC&c%Z}n0H1?z5of#lPT1C1s5rU6_1T~=<eB$5y
zQ{p4|l|`_-gar2igB!n1rzKw^7Pbw35!v7(&G57=?-+&CF~3emXARkM5Gjp2VG!N>
zH9iEIPF8`#BtQCCsyZr!5o+Z|0+59Y`k1qYNOUGy3S&TFBnf(==*mCP)eGZ;6LLQq
zz6UquatDJ!vI9$4kNBba+bEKcCh>7?+5&PBc&sJ|QjnGf+TcVKaNyD9`o{V=GePgt
zQS*4hG*(<cJ*+7rk&dEA(7i!vxOPD*sdTh}IHW#{w>M_-A35ZO=Ru|g(m)nXHeb?D
zeW73D<L{`Mh;eK$z5ao@v;I?G!~>Q(6NX+Bv?hm7@ZsUU1B~=Y1ln@D1K0?;WZeU0
zy!c#sn740ENI(O%Be&=`5f1?=UA@${?1m`U;j!S9m0kTZ*5dKKm=D5IfT<84A1dSP
z;)4%b$hLr~$a54gJ4%cI%*;CLAe>P^LU@=fpQDu|%0Ut)HFgsDfQ5P^468G!Ecx|o
ze4ykix?RsbBu~_*OU5cOM{2w$T8ZHF)LJ|(U>b@Q{2Y9Sp@1S*{|uJ&L^MoIyiW_Z
zld^W6UYf8jjl~khUE0pxOp!%Z?0z{ENn#q}N|C7CB?Jm4LY{qn-ZlT~m>Ju|<9IX#
zz`65CpaupT1fC<v)brVhNkhAXF1nRlFI}YxlM%sC_WR;(c^zhUQI4p(NFHQMs2##7
z4Q)O}n{$JjbnSE-NT0Ti@Vby^sYQcICKY87-_N~4JpOn6mg7Y-+GNMqfrf`Z?rEs0
z7^i7OB_56oD1tTkT-ZQJ@hn4#%M4^u_E5Zk!W|we@0&~K61rR+TwM(Ctiy?|liKJ?
zX-?;)t7YP!h?SvGK|X*?#r&_7ADbkoVt3L0SC3houjl4RCqPF>?~{<SSBx_Zv3at`
z1x2Cc(E?9ErE)EpgW}ac-kk3rK>l?xdui?92dWFZkKmFb@P{WK9W)8Efe?gBd?pc*
z*%4K2Tm$DQx<K%d6i~c$j!xx3EX=R0k2gv*^$myUNB_=&@9XqtE&x~%MXWJMyzV!l
z%GA|FUQUA^$P4M+V93WU<{YSwjzJa8Dnsilk%`w}*i5K;WDs;6o)I7zp>`Lvfg5sh
zItAx1Tf86b>o`xt8sfTKovy-3PF6wo0d&YTqMr+)+Ouw>*S3yHC)6T{58TEARCQHM
z*<2HbIR@bDsK1`<PrJ|0Y_QA<xPz2GqdbMWCVhh2c-mlF3*VVQfG+8^S~us4Sf=O0
zCNdl1;{9A-$){bE17RbX@)ID_lttFn%&Cx-gBUfWvG|oyz-a0^LJer(b<RbY!3FRY
z!7I`wJ?uFD>Ujk&i3S=EaB^)kk{icsEVu-u4L(fztGHfF8nkwA3Z2G0%glSlh~Ag>
z?}c7|DmH{FD#C>m&AKi_{X)=+u1e2<;<zS~OzCx~^;+9r2~KQ7u8F$Am`)@TW89+o
z+YH%%Y(E9CW0K=7YlaJ*_e^pz%z>NJLGv_R(B4vY2-2oi84CvGXFaZO4MV7Scwj(w
zQhsW_!mr5q$DQP#;2+>X*A*eiv`J-Yr-5U5ao_`tHn52@goa<8EhGS09y11oV+aVG
zXP-uGQe9vYgRR)vzkW6d%?LTr5MUHDdbauL2R-yQ*BI*LeH(oCJNT1E%QoXjk;K$d
z`?;?^GxqCH275lQ0ah?8C&pYA{2oqlswk?XFa!n(!b_onp$(@KgjFx~06q+ZSqvG3
z$p^`XhR)@Gd`w?y#(r(S;K$$T17-Z)q{5HC)5kM~pBhbwmi_EsKV#uH{h!9gkrpu9
zrBq?|F7sqZOqa_z^eQ#m-1HnV@rgL5B*;dI8H$-le+n&Db8kd;O%3XE?tk_AY<wA+
zjefi^4M_a(x5BRs0WhuB4iOpiMVMOd)ab-r-H?27`g$FF!pGMOZ)6Oj$bu~ZMNFt*
zR8Pzh>n!C4K*bIDG-3XvKp4D6Wb0hFbiy1OO7#ae#c87V2OsCxDq^O`tcu|a5|A9k
zQEIvfAzmnzn|=W&-D7kd=+!MFv+$o`qRRd*2A}^7ewGv((j0}@Fep_4_%J8w!y=(B
z(*`Reo~l!M$o8xZY>8-EqqyM_%2iXdog|#gFe2?Xe>;ypeJWCkBuL}L(wSroD`ZTZ
zJ!-UQkO$Gfi>O3!XXZpzgWXtBm&hQ`dw{%-e+vRyQ$Sb`uM%S{T}p={BElt0n1SxX
z^p7)S0Wjf4v>7pcuZo)Vq5>il5pyC;7uLS<Z@7E4$h!|o2k?Vtkr+mUaW_D_utUc&
zPeF@SzZN6mkl;=u(J*fPPvP%lsGfUL^JZ&@IY8VSLQreF8$&VC#pY#%k4nY7s28Qk
z2W87B<nTCCjY9hXfLp{2ocqliMDV~G;PcQlL1GFqE=QCWT@Zq^qXh2*&<mM~3`5l-
zaQE;{J!E1H&Bxb?wv8Uaz`tOOGo!VJca4$DwZcN_(z%V@O5-CEF%1HMw5P$<4CnR7
z*X#OZau>j&I34%~0D<M)%$q<kuN~(pD8e@sR%_at76=i1?tUj+(q?Mu8%7Cm4cOZd
z)xKt;zoXK;v`!chQ4_;YJP(cqYAf!D5!8&ojd?*?Mjbh*TEsB)qRPoMr;(rQ317eI
zCji)(;WtL+_jm(jtKm%4GA4^FLsKd?@h_^1_HI%9-h8?o4um*VCvU$2O%RY_CuTf9
z0_}x+Z}dQ>7z|Doty1y$0YvmpYFZ6G!6+p?gcU<s3$MSkhB$3A5P%$jF}WMW6aR)g
z#hdXp(&Rz|twVa`Bb72EZ_+GcKnv}OzYM=1F)lLX9#hz+6IBiScXm)Wn8Nq3*X8(|
zQwwy#OUnf&Z(XcJb}|S7sM}Fv@RIVuw*s}XE-KH)KWsn3u^S0NOxZHB@XuHxYdGrm
zm7)4Emi|CRKSsbG-|2NZE#?pSFi}j(`(X--WyZm3Hlr+f!$f+0sj=S>V`EE03RfL1
z17&j^hBsJ=!~Mf8!2SPilfi#%_QO`25YeYI<bNRdpe92kdPt$MgNv$+q`X)F`7UB|
zKm`q$b>3XPpavl3fYGlpUv2p0pVM0uJIpxliFK}!0Y){Ku8WLYD-Wg2XMpnT5yM1;
z^s#ir@iFWO5Hj(PzJLARMv&L_76t}jTJkhP(i`Af`Po*JZ+Z5vmZTkd3$KgJ8DnhB
zF3^kNSv`%+tgYeGW}&uWO0uP?OUMRlC=u@9$JYz<EPcnbAVamo#;XbI5d<~>$db42
zII~c3%bzjj3S5T~<WNW-jw!%TZZH|d5cxK`InHl0%`x^Unb7^TW&9oCexakqLNPzV
z_yJDb!WcX_dmir;?LQ2LY&RGc@&9ogyaYdUw0&v{KYiby{KN}m*63ZV6fgwET|hS?
zBUnJjng6E0T*d(@vnS_vGosFrLHa@~TC|{!+g|}MaMFa!pMlp>y{|F*ciaJYV^WRD
z7&I^(#-wCF1Q;4>q2W(uA7O`S)`3v$82G6v7!MFsAFaLD!|Uyh^>K)T@q+s6d2lHe
zi8z3LEJ{q+0WidN0&XNrJ@k%<qZskl$}st9o&!)?!3dXehkeP8FTBIxp{CE^2VujG
z6b}>}JW>**GkjKKpw0-qK3*&JmZ7XMiYjDXl#t2D4<HggymTwy{jh(>S*j<J1*^6@
zL6Fs`LW)c%?D@od*pL)%tb+lPBh6HUX*~{ND}*dHxEv33i4uZ+H1v4;`<ox-r{1_v
z{^+L@UZ3CTryG+#ztjIMr~T{4Hchzu-`$`Z!^4KJ6hJo<p5OpfENs!#6thp1fBE=M
zf8^%$|32d%jtosE^2@%)!;FXiM&jeX3FR7*h0^yUNlWl7BkoU8>3{pL@B7qru|L!b
zWo?=W511t;rUq(tOLr~-qPhij{HF#Aa80JS1gj-zaf@|3VwA(S#`s&LCvfeDGvJaL
zl!CI6L-hiTdEsd_^PoLsEz?8sGz1wK?92f!#e>HFTRD*ZIW+7)p5tfT1NH|K&ArZV
zO%9HsYls28Yv3;C%WM%u7HLOfZYMTuFlktq=b3H#z&lOw^zA%;_+ISai?F2Fqgn0B
zwS$M*k(h-#hk10`I%1uYac?rQbpZ^r=HyrqEdPv6gT$=gcrR~O^w|dG$$Td=%|xsw
zHr7hS@)c7lTstvia)<ST`eai9qj3oe+aoa@zdy&%-izZkQp!dTya^E_U{&?-e#~eq
z95D)RO5W-Un?c#4?0-Q#0vfai_7FC|H%>yF{_wpp^Z=XI0<|#J7+Zs}<4O=wtzPk?
zn&&_!BAjRiXaSZ3_lQ+%Xtl!K1nA?ae|lexPb-e|7ISYFu~;n;8yeY@jCl(Ic1C^x
zT&k_Gu_nQ!7w43CM#b|}F?am&96x(6+>^ZN3tgq5G@Of#bcd}Nj38*%DHJ>ZVvj|Y
zOpI6>-p7g<Y6=tt_XzV}IS<QsW!GNib*0u&AVa@`sfvcv(|&~ILdPCgk|?17!;Dq1
zIYHlmhPONnDf%1lMQmP&WxBTT?D7&jkfw`2BSayYgMg&tutZY_!gXRSScp!e&mprz
z2s#i6=NIBbKGiGP9)VWl^|F3r3mc)OsC>VM2K>LgB7+fU*w%PqZ|iRSKG}*r*1*0b
z{2R{!;TqM;rVGphxgTIpEDMpP{Kqx5`Z~ml(98-<YfS?&O}1yuak;ryZA9{Be|lfs
zP%SN5+yV^dUTc-O-fWXY>&2jeH7y>5FND98yV?9>R6w%2QmFWda`5O^o<rqgNXG6O
z{ECro)4Z0ZXv0~=NIHaGz?dZLfMQ~lZ##G`J#e>ZJNB%GHRb2$A!kMAieY1GvivA3
z<zog10f)iFsw=`CkuhwD5-w9}9V^>5Ex~x(n2gf=jpv9F46L1jxW`yC#AKAyt|KZd
zI|eIx2(Ai^H5}Y@0=Jt0Vt=*%5i$<Cn6~p9&p|}9b_UqicEn9Zl%S}oc&@A0q2}^T
z;tk#w0NINh3)MWC8e_Xm2vX2M#LQ3Q6ay0@OBlG=F60atyh1Zz>SV9i=Bcz?q81pk
zG6@Dm2Qpe;*)`R%ffwEP8_!|wOSCOg0I(G%+?&C`#G+YDn|r7zNe|<ta1`oB{TIWE
z?WRT^?QEYmF~=xPSf_r73jt=nd=#Y+fUM2B9W-T}A;G}5e6?f5h6MppRGAu+u(qIC
zO@y5H`uvMw8TTANto!hkYiWg`+hW+$ur1{#a#~2v2Fxt+BC5qAIz4$KPhtaLRKCmD
zBSXZsc>OodBi5;e_%Bx~Tbv-SqY(xe*;rq=Bq~P*5%p~e6I(L86fsI#wQPk=(6U0~
zgg<{Tx+de*Q7LR9W!V*~(wJeAx9nw78)xj<F7ugaHI7T?!@Tmg71!1R8dwkBNPPSd
zf50}eTh`}12xd;*Y>uC3V#lIqk%Bj|Pr-Q3TdA=h)Dcufpcw)gL_hA&E%=4=2=OcS
z0C*V|7LZ;glQ$CxW9{3j*SB3=G;Y#A3g@=f)56lQPduRu#v*^C=s$lis#Q$$$liuL
zg<uE(#-n+|$`Ki#X~LgApq-G@Lk>kmF*K9X^-~NQG<Sd0#r5;&K<v<8{c#y=El{fU
z!6EsX#<S>wJ0ez3@{3SK?VQ51R;Zod5~e>a@CbvVJM|mSVXZWdo2`iD(QKc|KQ3CH
z9A%c<4}=ctolV1J0o_B@!@{dYTALU##rwua#$PxO=o1mDoVpKh`w4&^Ym;p*pj*XG
zG(U^rLEMB-PWJb(TWa=VqCBKvT$(?j!Fv%S(7^w<H#k&f5;zwTPF52U3*>aTdVZMD
zt_m~8RLtAxf=q5+&XuO$#(*dTbqvmIv7_wg@d3){qW9SRwCvWAu}R37Kl$5ew2fUt
p#^SFqX&9c6*Bw`EWr32VKMjsu$nhNTtv|y?__%zZ{QT$N{U5`qT;l)$

diff --git a/utils/frame/remote-externalities/src/lib.rs b/utils/frame/remote-externalities/src/lib.rs
index 6c8b49c7c85d..ab2622625385 100644
--- a/utils/frame/remote-externalities/src/lib.rs
+++ b/utils/frame/remote-externalities/src/lib.rs
@@ -112,7 +112,11 @@ use sp_core::{
 	hexdisplay::HexDisplay,
 	storage::{StorageKey, StorageData},
 };
-use futures::future::Future;
+use futures::{
+	compat::Future01CompatExt,
+	TryFutureExt,
+};
+use codec::{Encode, Decode};
 
 type KeyPair = (StorageKey, StorageData);
 type Number = u32;
@@ -192,7 +196,6 @@ impl CacheConfig {
 pub struct Builder {
 	inject: Vec<KeyPair>,
 	mode: Mode,
-	chain: String,
 }
 
 impl Default for Builder {
@@ -205,7 +208,6 @@ impl Default for Builder {
 				cache: None,
 				modules: Default::default(),
 			}),
-			chain: "UNSET".into(),
 		}
 	}
 }
@@ -229,74 +231,71 @@ impl Builder {
 
 // RPC methods
 impl Builder {
-	async fn rpc_get_head(&self) -> Hash {
-		let mut rt = tokio::runtime::Runtime::new().expect("Unable to create a runtime");
+	async fn rpc_get_head(&self) -> Result<Hash, &'static str> {
 		let uri = self.as_online().uri.clone();
-		rt.block_on::<_, _, ()>(futures::lazy(move || {
-			trace!(target: LOG_TARGET, "rpc: finalized_head");
-			let client: sc_rpc_api::chain::ChainClient<Number, Hash, (), ()> =
-				jsonrpc_core_client::transports::http::connect(&uri).wait().unwrap();
-			Ok(client.finalized_head().wait().unwrap())
-		}))
-		.unwrap()
+		trace!(target: LOG_TARGET, "rpc: finalized_head");
+		let client: sc_rpc_api::chain::ChainClient<Number, Hash, (), ()> =
+			jsonrpc_core_client::transports::http::connect(&uri)
+				.compat()
+				.map_err(|_| "client initialization failed")
+				.await?;
+		client.finalized_head().compat().map_err(|_| "rpc finalized_head failed.").await
 	}
 
 	/// Relay the request to `state_getPairs` rpc endpoint.
 	///
 	/// Note that this is an unsafe RPC.
-	async fn rpc_get_pairs(&self, prefix: StorageKey, at: Hash) -> Vec<KeyPair> {
-		let mut rt = tokio::runtime::Runtime::new().expect("Unable to create a runtime");
-		let uri = self.as_online().uri.clone();
-		rt.block_on::<_, _, ()>(futures::lazy(move || {
-			trace!(target: LOG_TARGET, "rpc: storage_pairs: {:?} / {:?}", prefix, at);
-			let client: sc_rpc_api::state::StateClient<Hash> =
-				jsonrpc_core_client::transports::http::connect(&uri).wait().unwrap();
-			Ok(client.storage_pairs(prefix, Some(at)).wait().unwrap())
-		}))
-		.unwrap()
-	}
-
-	/// Get the chain name.
-	async fn chain_name(&self) -> String {
-		let mut rt = tokio::runtime::Runtime::new().expect("Unable to create a runtime");
+	async fn rpc_get_pairs(
+		&self,
+		prefix: StorageKey,
+		at: Hash,
+	) -> Result<Vec<KeyPair>, &'static str> {
 		let uri = self.as_online().uri.clone();
-		rt.block_on::<_, _, ()>(futures::lazy(move || {
-			trace!(target: LOG_TARGET, "rpc: system_chain");
-			let client: sc_rpc_api::system::SystemClient<(), ()> =
-				jsonrpc_core_client::transports::http::connect(&uri).wait().unwrap();
-			Ok(client.system_chain().wait().unwrap())
-		}))
-		.unwrap()
+		trace!(target: LOG_TARGET, "rpc: storage_pairs: {:?} / {:?}", prefix, at);
+		let client: sc_rpc_api::state::StateClient<Hash> =
+			jsonrpc_core_client::transports::http::connect(&uri)
+				.compat()
+				.map_err(|_| "client initialization failed")
+				.await?;
+		client
+			.storage_pairs(prefix, Some(at))
+			.compat()
+			.map_err(|_| "rpc finalized_head failed.")
+			.await
 	}
 }
 
 // Internal methods
 impl Builder {
 	/// Save the given data as cache.
-	fn save_cache(&self, data: &[KeyPair], path: &Path) {
-		let bdata = bincode::serialize(data).unwrap();
+	fn save_cache(&self, data: &[KeyPair], path: &Path) -> Result<(), &'static str> {
 		info!(target: LOG_TARGET, "writing to cache file {:?}", path);
-		fs::write(path, bdata).unwrap();
+		fs::write(path, data.encode()).map_err(|_| "fs::write failed.")?;
+		Ok(())
 	}
 
 	/// initialize `Self` from cache. Panics if the file does not exist.
-	fn load_cache(&self, path: &Path) -> Vec<KeyPair> {
+	fn load_cache(&self, path: &Path) -> Result<Vec<KeyPair>, &'static str> {
 		info!(target: LOG_TARGET, "scraping keypairs from cache {:?}", path,);
-		let bytes = fs::read(path).unwrap();
-		bincode::deserialize(&bytes[..]).unwrap()
+		let bytes = fs::read(path).map_err(|_| "fs::read failed.")?;
+		Decode::decode(&mut &*bytes).map_err(|_| "decode failed")
 	}
 
 	/// Build `Self` from a network node denoted by `uri`.
-	async fn load_remote(&self) -> Vec<KeyPair> {
+	async fn load_remote(&self) -> Result<Vec<KeyPair>, &'static str> {
 		let config = self.as_online();
-		let at = self.as_online().at.unwrap().clone();
+		let at = self
+			.as_online()
+			.at
+			.expect("online config must be initialized by this point; qed.")
+			.clone();
 		info!(target: LOG_TARGET, "scraping keypairs from remote node {} @ {:?}", config.uri, at);
 
 		let keys_and_values = if config.modules.len() > 0 {
 			let mut filtered_kv = vec![];
 			for f in config.modules.iter() {
 				let hashed_prefix = StorageKey(twox_128(f.as_bytes()).to_vec());
-				let module_kv = self.rpc_get_pairs(hashed_prefix.clone(), at).await;
+				let module_kv = self.rpc_get_pairs(hashed_prefix.clone(), at).await?;
 				info!(
 					target: LOG_TARGET,
 					"downloaded data for module {} (count: {} / prefix: {:?}).",
@@ -309,25 +308,26 @@ impl Builder {
 			filtered_kv
 		} else {
 			info!(target: LOG_TARGET, "downloading data for all modules.");
-			self.rpc_get_pairs(StorageKey(vec![]), at).await.into_iter().collect::<Vec<_>>()
+			self.rpc_get_pairs(StorageKey(vec![]), at).await?.into_iter().collect::<Vec<_>>()
 		};
 
-		keys_and_values
+		Ok(keys_and_values)
 	}
 
-	async fn init_remote_client(&mut self) {
-		self.as_online_mut().at = Some(self.rpc_get_head().await);
-		self.chain = self.chain_name().await;
+	async fn init_remote_client(&mut self) -> Result<(), &'static str> {
+		let at = self.rpc_get_head().await?;
+		self.as_online_mut().at = Some(at);
+		Ok(())
 	}
 
-	async fn pre_build(mut self) -> Vec<KeyPair> {
+	async fn pre_build(mut self) -> Result<Vec<KeyPair>, &'static str> {
 		let mut base_kv = match self.mode.clone() {
-			Mode::Offline(config) => self.load_cache(&config.cache.path()),
+			Mode::Offline(config) => self.load_cache(&config.cache.path())?,
 			Mode::Online(config) => {
-				self.init_remote_client().await;
-				let kp = self.load_remote().await;
+				self.init_remote_client().await?;
+				let kp = self.load_remote().await?;
 				if let Some(c) = config.cache {
-					self.save_cache(&kp, &c.path());
+					self.save_cache(&kp, &c.path())?;
 				}
 				kp
 			}
@@ -339,7 +339,7 @@ impl Builder {
 			self.inject.len()
 		);
 		base_kv.extend(self.inject.clone());
-		base_kv
+		Ok(base_kv)
 	}
 }
 
@@ -365,8 +365,8 @@ impl Builder {
 	}
 
 	/// Build the test externalities.
-	pub async fn build(self) -> TestExternalities {
-		let kv = self.pre_build().await;
+	pub async fn build(self) -> Result<TestExternalities, &'static str> {
+		let kv = self.pre_build().await?;
 		let mut ext = TestExternalities::new_empty();
 
 		info!(target: LOG_TARGET, "injecting a total of {} keys", kv.len());
@@ -374,10 +374,11 @@ impl Builder {
 			let (k, v) = (k.0, v.0);
 			ext.insert(k, v);
 		}
-		ext
+		Ok(ext)
 	}
 }
 
+#[cfg(feature = "remote-test")]
 #[cfg(test)]
 mod tests {
 	use super::*;
@@ -390,7 +391,6 @@ mod tests {
 	}
 
 	#[async_std::test]
-	#[cfg(feature = "remote-test")]
 	async fn can_build_one_pallet() {
 		init_logger();
 		Builder::new()
@@ -400,6 +400,7 @@ mod tests {
 			}))
 			.build()
 			.await
+			.unwrap()
 			.execute_with(|| {});
 	}
 
@@ -412,11 +413,11 @@ mod tests {
 			}))
 			.build()
 			.await
+			.unwrap()
 			.execute_with(|| {});
 	}
 
 	#[async_std::test]
-	#[cfg(feature = "remote-test")]
 	async fn can_create_cache() {
 		init_logger();
 		Builder::new()
@@ -429,6 +430,7 @@ mod tests {
 			}))
 			.build()
 			.await
+			.unwrap()
 			.execute_with(|| {});
 
 		let to_delete = std::fs::read_dir(CacheConfig::default().directory)
@@ -446,9 +448,8 @@ mod tests {
 	}
 
 	#[async_std::test]
-	#[cfg(feature = "remote-test")]
 	async fn can_build_all() {
 		init_logger();
-		Builder::new().build().await.execute_with(|| {});
+		Builder::new().build().await.unwrap().execute_with(|| {});
 	}
 }
diff --git a/utils/frame/try-runtime/cli/src/lib.rs b/utils/frame/try-runtime/cli/src/lib.rs
index 92526379f471..4ab38692a5cf 100644
--- a/utils/frame/try-runtime/cli/src/lib.rs
+++ b/utils/frame/try-runtime/cli/src/lib.rs
@@ -133,7 +133,7 @@ impl TryRuntimeCmd {
 			};
 
 			// inject the code into this ext.
-			builder.inject(&[(code_key, code)]).build().await
+			builder.inject(&[(code_key, code)]).build().await?
 		};
 
 		let encoded_result = StateMachine::<_, _, NumberFor<B>, _>::new(

From a6ff3d3be40de2496a705a237483b2c3a541b143 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Fri, 26 Feb 2021 19:50:58 +0100
Subject: [PATCH 0445/1194] Fix ignored error in benchmark tests (#8214)

* fix ignored error in benchmark tests

* use normal format for str

* explicit match

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 frame/benchmarking/src/lib.rs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
index a1d4467d0a89..5b137c3c1532 100644
--- a/frame/benchmarking/src/lib.rs
+++ b/frame/benchmarking/src/lib.rs
@@ -1169,9 +1169,16 @@ macro_rules! impl_benchmark_test_suite {
 					let mut anything_failed = false;
 					println!("failing benchmark tests:");
 					for benchmark_name in $bench_module::<$test>::benchmarks($extra) {
-						if let Err(err) = std::panic::catch_unwind(|| test_bench_by_name::<$test>(benchmark_name)) {
-							println!("{}: {:?}", String::from_utf8_lossy(benchmark_name), err);
-							anything_failed = true;
+						match std::panic::catch_unwind(|| test_bench_by_name::<$test>(benchmark_name)) {
+							Err(err) => {
+								println!("{}: {:?}", String::from_utf8_lossy(benchmark_name), err);
+								anything_failed = true;
+							},
+							Ok(Err(err)) => {
+								println!("{}: {}", String::from_utf8_lossy(benchmark_name), err);
+								anything_failed = true;
+							},
+							Ok(Ok(_)) => (),
 						}
 					}
 					assert!(!anything_failed);

From 88ba0e6bc926231dcf82054a7f3e42a973a1b6f9 Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Sat, 27 Feb 2021 16:11:27 +0100
Subject: [PATCH 0446/1194] Gilts Pallet (#8139)

* Initial draft

* Enlarge function drafted.

* Thaw draft

* Retract_bid draft

* Final bits of draft impl.

* Test mockup

* Tests

* Docs

* Add benchmark scaffold

* Integrate weights

* All benchmarks done

* Missing file

* Remove stale comments

* Fixes

* Fixes

* Allow for priority queuing.

* Another test and a fix

* Fixes

* Fixes

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_gilt --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/gilt/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Grumble

* Update frame/gilt/src/tests.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Update frame/gilt/src/tests.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Grumble

* Update frame/gilt/src/tests.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Update frame/gilt/src/lib.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Update frame/gilt/src/lib.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Fix unreserve ordering

* Grumble

* Fixes

Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 Cargo.lock                              |  18 +
 Cargo.toml                              |   1 +
 bin/node/cli/src/chain_spec.rs          |   1 +
 bin/node/runtime/Cargo.toml             |   5 +-
 bin/node/runtime/src/lib.rs             |  30 +-
 bin/node/testing/src/genesis.rs         |   1 +
 frame/gilt/Cargo.toml                   |  46 ++
 frame/gilt/README.md                    |   2 +
 frame/gilt/src/benchmarking.rs          | 136 ++++++
 frame/gilt/src/lib.rs                   | 582 ++++++++++++++++++++++++
 frame/gilt/src/mock.rs                  | 138 ++++++
 frame/gilt/src/tests.rs                 | 499 ++++++++++++++++++++
 frame/gilt/src/weights.rs               | 164 +++++++
 primitives/arithmetic/src/per_things.rs |   5 +
 14 files changed, 1626 insertions(+), 2 deletions(-)
 create mode 100644 frame/gilt/Cargo.toml
 create mode 100644 frame/gilt/README.md
 create mode 100644 frame/gilt/src/benchmarking.rs
 create mode 100644 frame/gilt/src/lib.rs
 create mode 100644 frame/gilt/src/mock.rs
 create mode 100644 frame/gilt/src/tests.rs
 create mode 100644 frame/gilt/src/weights.rs

diff --git a/Cargo.lock b/Cargo.lock
index 7cb69617b1d1..9660e11884c8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4113,6 +4113,7 @@ dependencies = [
  "pallet-democracy",
  "pallet-election-provider-multi-phase",
  "pallet-elections-phragmen",
+ "pallet-gilt",
  "pallet-grandpa",
  "pallet-identity",
  "pallet-im-online",
@@ -4805,6 +4806,23 @@ dependencies = [
  "sp-tasks",
 ]
 
+[[package]]
+name = "pallet-gilt"
+version = "3.0.0"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "pallet-balances",
+ "parity-scale-codec",
+ "serde",
+ "sp-arithmetic",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
 [[package]]
 name = "pallet-grandpa"
 version = "3.0.0"
diff --git a/Cargo.toml b/Cargo.toml
index 8873c033455a..9a494d6aff39 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -80,6 +80,7 @@ members = [
 	"frame/example-offchain-worker",
 	"frame/example-parallel",
 	"frame/executive",
+	"frame/gilt",
 	"frame/grandpa",
 	"frame/identity",
 	"frame/im-online",
diff --git a/bin/node/cli/src/chain_spec.rs b/bin/node/cli/src/chain_spec.rs
index 7de9cfd0b6aa..db268ad10529 100644
--- a/bin/node/cli/src/chain_spec.rs
+++ b/bin/node/cli/src/chain_spec.rs
@@ -326,6 +326,7 @@ pub fn testnet_genesis(
 			max_members: 999,
 		}),
 		pallet_vesting: Some(Default::default()),
+		pallet_gilt: Some(Default::default()),
 	}
 }
 
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index b3672cbe7526..7669273f0c82 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -55,8 +55,9 @@ pallet-contracts = { version = "3.0.0", default-features = false, path = "../../
 pallet-contracts-primitives = { version = "3.0.0", default-features = false, path = "../../../frame/contracts/common/" }
 pallet-contracts-rpc-runtime-api = { version = "3.0.0", default-features = false, path = "../../../frame/contracts/rpc/runtime-api/" }
 pallet-democracy = { version = "3.0.0", default-features = false, path = "../../../frame/democracy" }
-pallet-elections-phragmen = { version = "3.0.0", default-features = false, path = "../../../frame/elections-phragmen" }
 pallet-election-provider-multi-phase = { version = "3.0.0", default-features = false, path = "../../../frame/election-provider-multi-phase" }
+pallet-elections-phragmen = { version = "3.0.0", default-features = false, path = "../../../frame/elections-phragmen" }
+pallet-gilt = { version = "3.0.0", default-features = false, path = "../../../frame/gilt" }
 pallet-grandpa = { version = "3.0.0", default-features = false, path = "../../../frame/grandpa" }
 pallet-im-online = { version = "3.0.0", default-features = false, path = "../../../frame/im-online" }
 pallet-indices = { version = "3.0.0", default-features = false, path = "../../../frame/indices" }
@@ -112,6 +113,7 @@ std = [
 	"pallet-democracy/std",
 	"pallet-elections-phragmen/std",
 	"frame-executive/std",
+	"pallet-gilt/std",
 	"pallet-grandpa/std",
 	"pallet-im-online/std",
 	"pallet-indices/std",
@@ -170,6 +172,7 @@ runtime-benchmarks = [
 	"pallet-contracts/runtime-benchmarks",
 	"pallet-democracy/runtime-benchmarks",
 	"pallet-elections-phragmen/runtime-benchmarks",
+	"pallet-gilt/runtime-benchmarks",
 	"pallet-grandpa/runtime-benchmarks",
 	"pallet-identity/runtime-benchmarks",
 	"pallet-im-online/runtime-benchmarks",
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 7528aa3b4052..a63fb341ddac 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -1045,6 +1045,32 @@ impl pallet_assets::Config for Runtime {
 	type WeightInfo = pallet_assets::weights::SubstrateWeight<Runtime>;
 }
 
+parameter_types! {
+	pub const QueueCount: u32 = 300;
+	pub const MaxQueueLen: u32 = 1000;
+	pub const FifoQueueLen: u32 = 500;
+	pub const Period: BlockNumber = 30 * DAYS;
+	pub const MinFreeze: Balance = 100 * DOLLARS;
+	pub const IntakePeriod: BlockNumber = 10;
+	pub const MaxIntakeBids: u32 = 10;
+}
+
+impl pallet_gilt::Config for Runtime {
+	type Event = Event;
+	type Currency = Balances;
+	type AdminOrigin = frame_system::EnsureRoot<AccountId>;
+	type Deficit = ();
+	type Surplus = ();
+	type QueueCount = QueueCount;
+	type MaxQueueLen = MaxQueueLen;
+	type FifoQueueLen = FifoQueueLen;
+	type Period = Period;
+	type MinFreeze = MinFreeze;
+	type IntakePeriod = IntakePeriod;
+	type MaxIntakeBids = MaxIntakeBids;
+	type WeightInfo = pallet_gilt::weights::SubstrateWeight<Runtime>;
+}
+
 construct_runtime!(
 	pub enum Runtime where
 		Block = Block,
@@ -1088,6 +1114,7 @@ construct_runtime!(
 		Assets: pallet_assets::{Module, Call, Storage, Event<T>},
 		Mmr: pallet_mmr::{Module, Storage},
 		Lottery: pallet_lottery::{Module, Call, Storage, Event<T>},
+		Gilt: pallet_gilt::{Module, Call, Storage, Event<T>, Config},
 	}
 );
 
@@ -1425,8 +1452,9 @@ impl_runtime_apis! {
 			add_benchmark!(params, batches, pallet_collective, Council);
 			add_benchmark!(params, batches, pallet_contracts, Contracts);
 			add_benchmark!(params, batches, pallet_democracy, Democracy);
-			add_benchmark!(params, batches, pallet_elections_phragmen, Elections);
 			add_benchmark!(params, batches, pallet_election_provider_multi_phase, ElectionProviderMultiPhase);
+			add_benchmark!(params, batches, pallet_elections_phragmen, Elections);
+			add_benchmark!(params, batches, pallet_gilt, Gilt);
 			add_benchmark!(params, batches, pallet_grandpa, Grandpa);
 			add_benchmark!(params, batches, pallet_identity, Identity);
 			add_benchmark!(params, batches, pallet_im_online, ImOnline);
diff --git a/bin/node/testing/src/genesis.rs b/bin/node/testing/src/genesis.rs
index 75d0d18e6ef8..b026b9530e7f 100644
--- a/bin/node/testing/src/genesis.rs
+++ b/bin/node/testing/src/genesis.rs
@@ -119,5 +119,6 @@ pub fn config_endowed(
 			max_members: 999,
 		}),
 		pallet_vesting: Some(Default::default()),
+		pallet_gilt: Some(Default::default()),
 	}
 }
diff --git a/frame/gilt/Cargo.toml b/frame/gilt/Cargo.toml
new file mode 100644
index 000000000000..f1e0d61158d3
--- /dev/null
+++ b/frame/gilt/Cargo.toml
@@ -0,0 +1,46 @@
+[package]
+name = "pallet-gilt"
+version = "3.0.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
+license = "Apache-2.0"
+homepage = "https://substrate.dev"
+repository = "https://github.com/paritytech/substrate/"
+description = "FRAME pallet for rewarding account freezing."
+readme = "README.md"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+serde = { version = "1.0.101", optional = true }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-arithmetic = { version = "3.0.0", default-features = false, path = "../../primitives/arithmetic" }
+frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+
+[dev-dependencies]
+sp-io = { version = "3.0.0", path = "../../primitives/io" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+pallet-balances = { version = "3.0.0", path = "../balances" }
+
+[features]
+default = ["std"]
+std = [
+	"serde",
+	"codec/std",
+	"sp-std/std",
+	"sp-runtime/std",
+	"sp-arithmetic/std",
+	"frame-benchmarking/std",
+	"frame-support/std",
+	"frame-system/std",
+]
+runtime-benchmarks = [
+	"frame-benchmarking",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+]
diff --git a/frame/gilt/README.md b/frame/gilt/README.md
new file mode 100644
index 000000000000..4eaddae1786e
--- /dev/null
+++ b/frame/gilt/README.md
@@ -0,0 +1,2 @@
+
+License: Apache-2.0
diff --git a/frame/gilt/src/benchmarking.rs b/frame/gilt/src/benchmarking.rs
new file mode 100644
index 000000000000..2ee7bffd9410
--- /dev/null
+++ b/frame/gilt/src/benchmarking.rs
@@ -0,0 +1,136 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Benchmarks for Gilt Pallet
+
+#![cfg(feature = "runtime-benchmarks")]
+
+use sp_std::prelude::*;
+use super::*;
+use sp_runtime::traits::{Zero, Bounded};
+use sp_arithmetic::Perquintill;
+use frame_system::RawOrigin;
+use frame_benchmarking::{benchmarks, whitelisted_caller, impl_benchmark_test_suite};
+use frame_support::{traits::{Currency, Get, EnsureOrigin}, dispatch::UnfilteredDispatchable};
+
+use crate::Pallet as Gilt;
+
+type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+
+benchmarks! {
+	place_bid {
+		let l in 0..(T::MaxQueueLen::get() - 1);
+		let caller: T::AccountId = whitelisted_caller();
+		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
+		for i in 0..l {
+			Gilt::<T>::place_bid(RawOrigin::Signed(caller.clone()).into(), T::MinFreeze::get(), 1)?;
+		}
+	}: _(RawOrigin::Signed(caller.clone()), T::MinFreeze::get() * BalanceOf::<T>::from(2u32), 1)
+	verify {
+		assert_eq!(QueueTotals::<T>::get()[0], (l + 1, T::MinFreeze::get() * BalanceOf::<T>::from(l + 2)));
+	}
+
+	place_bid_max {
+		let caller: T::AccountId = whitelisted_caller();
+		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
+		for i in 0..T::MaxQueueLen::get() {
+			Gilt::<T>::place_bid(RawOrigin::Signed(caller.clone()).into(), T::MinFreeze::get(), 1)?;
+		}
+	}: {
+		Gilt::<T>::place_bid(
+			RawOrigin::Signed(caller.clone()).into(),
+			T::MinFreeze::get() * BalanceOf::<T>::from(2u32),
+			1,
+		)?
+	}
+	verify {
+		assert_eq!(QueueTotals::<T>::get()[0], (
+			T::MaxQueueLen::get(),
+			T::MinFreeze::get() * BalanceOf::<T>::from(T::MaxQueueLen::get() + 1),
+		));
+	}
+
+	retract_bid {
+		let l in 1..T::MaxQueueLen::get();
+		let caller: T::AccountId = whitelisted_caller();
+		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
+		for i in 0..l {
+			Gilt::<T>::place_bid(RawOrigin::Signed(caller.clone()).into(), T::MinFreeze::get(), 1)?;
+		}
+	}: _(RawOrigin::Signed(caller.clone()), T::MinFreeze::get(), 1)
+	verify {
+		assert_eq!(QueueTotals::<T>::get()[0], (l - 1, T::MinFreeze::get() * BalanceOf::<T>::from(l - 1)));
+	}
+
+	set_target {
+		let call = Call::<T>::set_target(Default::default());
+		let origin = T::AdminOrigin::successful_origin();
+	}: { call.dispatch_bypass_filter(origin)? }
+
+	thaw {
+		let caller: T::AccountId = whitelisted_caller();
+		T::Currency::make_free_balance_be(&caller, T::MinFreeze::get() * BalanceOf::<T>::from(3u32));
+		Gilt::<T>::place_bid(RawOrigin::Signed(caller.clone()).into(), T::MinFreeze::get(), 1)?;
+		Gilt::<T>::place_bid(RawOrigin::Signed(caller.clone()).into(), T::MinFreeze::get(), 1)?;
+		Gilt::<T>::enlarge(T::MinFreeze::get() * BalanceOf::<T>::from(2u32), 2);
+		Active::<T>::mutate(0, |m_g| if let Some(ref mut g) = m_g { g.expiry = Zero::zero() });
+	}: _(RawOrigin::Signed(caller.clone()), 0)
+	verify {
+		assert!(Active::<T>::get(0).is_none());
+	}
+
+	pursue_target_noop {
+	}: { Gilt::<T>::pursue_target(0) }
+
+	pursue_target_per_item {
+		// bids taken
+		let b in 1..T::MaxQueueLen::get();
+
+		let caller: T::AccountId = whitelisted_caller();
+		T::Currency::make_free_balance_be(&caller, T::MinFreeze::get() * BalanceOf::<T>::from(b + 1));
+
+		for _ in 0..b {
+			Gilt::<T>::place_bid(RawOrigin::Signed(caller.clone()).into(), T::MinFreeze::get(), 1)?;
+		}
+
+		Call::<T>::set_target(Perquintill::from_percent(100))
+			.dispatch_bypass_filter(T::AdminOrigin::successful_origin())?;
+
+	}: { Gilt::<T>::pursue_target(b) }
+
+	pursue_target_per_queue {
+		// total queues hit
+		let q in 1..T::QueueCount::get();
+
+		let caller: T::AccountId = whitelisted_caller();
+		T::Currency::make_free_balance_be(&caller, T::MinFreeze::get() * BalanceOf::<T>::from(q + 1));
+
+		for i in 0..q {
+			Gilt::<T>::place_bid(RawOrigin::Signed(caller.clone()).into(), T::MinFreeze::get(), i + 1)?;
+		}
+
+		Call::<T>::set_target(Perquintill::from_percent(100))
+			.dispatch_bypass_filter(T::AdminOrigin::successful_origin())?;
+
+	}: { Gilt::<T>::pursue_target(q) }
+}
+
+impl_benchmark_test_suite!(
+	Gilt,
+	crate::mock::new_test_ext(),
+	crate::mock::Test,
+);
diff --git a/frame/gilt/src/lib.rs b/frame/gilt/src/lib.rs
new file mode 100644
index 000000000000..94d341f47f44
--- /dev/null
+++ b/frame/gilt/src/lib.rs
@@ -0,0 +1,582 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! # Gilt Pallet
+//! A pallet allowing accounts to auction for being frozen and receive open-ended
+//! inflation-protection in return.
+//!
+//! ## Overview
+//!
+//! Lock up tokens, for at least as long as you offer, and be free from both inflation and
+//! intermediate reward or exchange until the tokens become unlocked.
+//!
+//! ## Design
+//!
+//! Queues for each of 1-`QueueCount` periods, given in blocks (`Period`). Queues are limited in
+//! size to something sensible, `MaxQueueLen`. A secondary storage item with `QueueCount` x `u32`
+//! elements with the number of items in each queue.
+//!
+//! Queues are split into two parts. The first part is a priority queue based on bid size. The
+//! second part is just a FIFO (the size of the second part is set with `FifoQueueLen`). Items are
+//! always prepended so that removal is always O(1) since removal often happens many times under a
+//! single weighed function (`on_initialize`) yet placing bids only ever happens once per weighed
+//! function (`place_bid`). If the queue has a priority portion, then it remains sorted in order of
+//! bid size so that smaller bids fall off as it gets too large.
+//!
+//! Account may enqueue a balance with some number of `Period`s lock up, up to a maximum of
+//! `QueueCount`. The balance gets reserved. There's a minimum of `MinFreeze` to avoid dust.
+//!
+//! Until your bid is turned into an issued gilt you can retract it instantly and the funds are
+//! unreserved.
+//!
+//! There's a target proportion of effective total issuance (i.e. accounting for existing gilts)
+//! which the we attempt to have frozen at any one time. It will likely be gradually increased over
+//! time by governance.
+//!
+//! As the total funds frozen under gilts drops below `FrozenFraction` of the total effective
+//! issuance, then bids are taken from queues, with the queue of the greatest period taking
+//! priority. If the item in the queue's locked amount is greater than the amount left to be
+//! frozen, then it is split up into multiple bids and becomes partially frozen under gilt.
+//!
+//! Once an account's balance is frozen, it remains frozen until the owner thaws the balance of the
+//! account. This may happen no earlier than queue's period after the point at which the gilt is
+//! issued.
+//!
+//! ## Suggested Values
+//!
+//! - `QueueCount`: 300
+//! - `Period`: 432,000
+//! - `MaxQueueLen`: 1000
+//! - `MinFreeze`: Around CHF 100 in value.
+
+#![cfg_attr(not(feature = "std"), no_std)]
+
+pub use pallet::*;
+
+#[cfg(test)]
+mod mock;
+#[cfg(test)]
+mod tests;
+mod benchmarking;
+pub mod weights;
+
+#[frame_support::pallet]
+pub mod pallet {
+	use sp_std::prelude::*;
+	use sp_arithmetic::{Perquintill, PerThing};
+	use sp_runtime::traits::{Zero, Saturating, SaturatedConversion};
+	use frame_support::traits::{Currency, OnUnbalanced, ReservableCurrency};
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+	pub use crate::weights::WeightInfo;
+
+	type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+	type PositiveImbalanceOf<T> =
+		<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::PositiveImbalance;
+	type NegativeImbalanceOf<T> =
+		<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		/// Overarching event type.
+		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
+
+		/// Currency type that this works on.
+		type Currency: ReservableCurrency<Self::AccountId>;
+
+		/// Origin required for setting the target proportion to be under gilt.
+		type AdminOrigin: EnsureOrigin<Self::Origin>;
+
+		/// Unbalanced handler to account for funds created (in case of a higher total issuance over
+		/// freezing period).
+		type Deficit: OnUnbalanced<PositiveImbalanceOf<Self>>;
+
+		/// Unbalanced handler to account for funds destroyed (in case of a lower total issuance
+		/// over freezing period).
+		type Surplus: OnUnbalanced<NegativeImbalanceOf<Self>>;
+
+		/// Number of duration queues in total. This sets the maximum duration supported, which is
+		/// this value multiplied by `Period`.
+		#[pallet::constant]
+		type QueueCount: Get<u32>;
+
+		/// Maximum number of items that may be in each duration queue.
+		#[pallet::constant]
+		type MaxQueueLen: Get<u32>;
+
+		/// Portion of the queue which is free from ordering and just a FIFO.
+		///
+		/// Must be no greater than `MaxQueueLen`.
+		#[pallet::constant]
+		type FifoQueueLen: Get<u32>;
+
+		/// The base period for the duration queues. This is the common multiple across all
+		/// supported freezing durations that can be bid upon.
+		#[pallet::constant]
+		type Period: Get<Self::BlockNumber>;
+
+		/// The minimum amount of funds that may be offered to freeze for a gilt. Note that this
+		/// does not actually limit the amount which may be frozen in a gilt since gilts may be
+		/// split up in order to satisfy the desired amount of funds under gilts.
+		///
+		/// It should be at least big enough to ensure that there is no possible storage spam attack
+		/// or queue-filling attack.
+		#[pallet::constant]
+		type MinFreeze: Get<BalanceOf<Self>>;
+
+		/// The number of blocks between consecutive attempts to issue more gilts in an effort to
+		/// get to the target amount to be frozen.
+		///
+		/// A larger value results in fewer storage hits each block, but a slower period to get to
+		/// the target.
+		#[pallet::constant]
+		type IntakePeriod: Get<Self::BlockNumber>;
+
+		/// The maximum amount of bids that can be turned into issued gilts each block. A larger
+		/// value here means less of the block available for transactions should there be a glut of
+		/// bids to make into gilts to reach the target.
+		#[pallet::constant]
+		type MaxIntakeBids: Get<u32>;
+
+		/// Information on runtime weights.
+		type WeightInfo: WeightInfo;
+	}
+
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(_);
+
+	/// A single bid on a gilt, an item of a *queue* in `Queues`.
+	#[derive(Clone, Eq, PartialEq, Default, Encode, Decode, RuntimeDebug)]
+	pub struct GiltBid<Balance, AccountId> {
+		/// The amount bid.
+		pub amount: Balance,
+		/// The owner of the bid.
+		pub who: AccountId,
+	}
+
+	/// Information representing an active gilt.
+	#[derive(Clone, Eq, PartialEq, Default, Encode, Decode, RuntimeDebug)]
+	pub struct ActiveGilt<Balance, AccountId, BlockNumber> {
+		/// The proportion of the effective total issuance (i.e. accounting for any eventual gilt
+		/// expansion or contraction that may eventually be claimed).
+		pub proportion: Perquintill,
+		/// The amount reserved under this gilt.
+		pub amount: Balance,
+		/// The account to whom this gilt belongs.
+		pub who: AccountId,
+		/// The time after which this gilt can be redeemed for the proportional amount of balance.
+		pub expiry: BlockNumber,
+	}
+
+	/// An index for a gilt.
+	pub type ActiveIndex = u32;
+
+	/// Overall information package on the active gilts.
+	///
+	/// The way of determining the net issuance (i.e. after factoring in all maturing frozen funds)
+	/// is:
+	///
+	/// `total_issuance - frozen + proportion * total_issuance`
+	#[derive(Clone, Eq, PartialEq, Default, Encode, Decode, RuntimeDebug)]
+	pub struct ActiveGiltsTotal<Balance> {
+		/// The total amount of funds held in reserve for all active gilts.
+		pub frozen: Balance,
+		/// The proportion of funds that the `frozen` balance represents to total issuance.
+		pub proportion: Perquintill,
+		/// The total number of gilts issued so far.
+		pub index: ActiveIndex,
+		/// The target proportion of gilts within total issuance.
+		pub target: Perquintill,
+	}
+
+	/// The totals of items and balances within each queue. Saves a lot of storage reads in the
+	/// case of sparsely packed queues.
+	///
+	/// The vector is indexed by duration in `Period`s, offset by one, so information on the queue
+	/// whose duration is one `Period` would be storage `0`.
+	#[pallet::storage]
+	pub type QueueTotals<T> = StorageValue<_, Vec<(u32, BalanceOf<T>)>, ValueQuery>;
+
+	/// The queues of bids ready to become gilts. Indexed by duration (in `Period`s).
+	#[pallet::storage]
+	pub type Queues<T: Config> = StorageMap<
+		_,
+		Blake2_128Concat,
+		u32,
+		Vec<GiltBid<BalanceOf<T>, T::AccountId>>,
+		ValueQuery,
+	>;
+
+	/// Information relating to the gilts currently active.
+	#[pallet::storage]
+	pub type ActiveTotal<T> = StorageValue<_, ActiveGiltsTotal<BalanceOf<T>>, ValueQuery>;
+
+	/// The currently active gilts, indexed according to the order of creation.
+	#[pallet::storage]
+	pub type Active<T> = StorageMap<
+		_,
+		Blake2_128Concat,
+		ActiveIndex,
+		ActiveGilt<BalanceOf<T>, <T as frame_system::Config>::AccountId, <T as frame_system::Config>::BlockNumber>,
+		OptionQuery,
+	>;
+
+	#[pallet::genesis_config]
+	#[derive(Default)]
+	pub struct GenesisConfig;
+
+	#[pallet::genesis_build]
+	impl<T: Config> GenesisBuild<T> for GenesisConfig {
+	 	fn build(&self) {
+			QueueTotals::<T>::put(vec![(0, BalanceOf::<T>::zero()); T::QueueCount::get() as usize]);
+		}
+	}
+
+	#[pallet::event]
+	#[pallet::metadata(T::AccountId = "AccountId")]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	pub enum Event<T: Config> {
+		/// A bid was successfully placed.
+		/// \[ who, amount, duration \]
+		BidPlaced(T::AccountId, BalanceOf<T>, u32),
+		/// A bid was successfully removed (before being accepted as a gilt).
+		/// \[ who, amount, duration \]
+		BidRetracted(T::AccountId, BalanceOf<T>, u32),
+		/// A bid was accepted as a gilt. The balance may not be released until expiry.
+		/// \[ index, expiry, who, amount \]
+		GiltIssued(ActiveIndex, T::BlockNumber, T::AccountId, BalanceOf<T>),
+		/// An expired gilt has been thawed.
+		/// \[ index, who, original_amount, additional_amount \]
+		GiltThawed(ActiveIndex, T::AccountId, BalanceOf<T>, BalanceOf<T>),
+	}
+
+	#[pallet::error]
+	pub enum Error<T> {
+		/// The duration of the bid is less than one.
+		DurationTooSmall,
+		/// The duration is the bid is greater than the number of queues.
+		DurationTooBig,
+		/// The amount of the bid is less than the minimum allowed.
+		AmountTooSmall,
+		/// The queue for the bid's duration is full and the amount bid is too low to get in through
+		/// replacing an existing bid.
+		BidTooLow,
+		/// Gilt index is unknown.
+		Unknown,
+		/// Not the owner of the gilt.
+		NotOwner,
+		/// Gilt not yet at expiry date.
+		NotExpired,
+		/// The given bid for retraction is not found.
+		NotFound,
+	}
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+		fn on_initialize(n: T::BlockNumber) -> Weight {
+			if (n % T::IntakePeriod::get()).is_zero() {
+				Self::pursue_target(T::MaxIntakeBids::get())
+			} else {
+				0
+			}
+		}
+	}
+
+	#[pallet::call]
+	impl<T:Config> Pallet<T> {
+		/// Place a bid for a gilt to be issued.
+		///
+		/// Origin must be Signed, and account must have at least `amount` in free balance.
+		///
+		/// - `amount`: The amount of the bid; these funds will be reserved. If the bid is
+		/// successfully elevated into an issued gilt, then these funds will continue to be
+		/// reserved until the gilt expires. Must be at least `MinFreeze`.
+		/// - `duration`: The number of periods for which the funds will be locked if the gilt is
+		/// issued. It will expire only after this period has elapsed after the point of issuance.
+		/// Must be greater than 1 and no more than `QueueCount`.
+		///
+		/// Complexities:
+		/// - `Queues[duration].len()` (just take max).
+		#[pallet::weight(T::WeightInfo::place_bid_max())]
+		pub fn place_bid(
+			origin: OriginFor<T>,
+			#[pallet::compact] amount: BalanceOf<T>,
+			duration: u32,
+		) -> DispatchResultWithPostInfo {
+			let who = ensure_signed(origin)?;
+
+			ensure!(amount >= T::MinFreeze::get(), Error::<T>::AmountTooSmall);
+			let queue_count = T::QueueCount::get() as usize;
+			let queue_index = duration.checked_sub(1)
+				.ok_or(Error::<T>::DurationTooSmall)? as usize;
+			ensure!(queue_index < queue_count, Error::<T>::DurationTooBig);
+
+			let net = Queues::<T>::try_mutate(duration, |q|
+				-> Result<(u32, BalanceOf::<T>), DispatchError>
+			{
+				let queue_full = q.len() == T::MaxQueueLen::get() as usize;
+				ensure!(!queue_full || q[0].amount < amount, Error::<T>::BidTooLow);
+				T::Currency::reserve(&who, amount)?;
+
+				// queue is <Ordered: Lowest ... Highest><Fifo: Last ... First>
+				let mut bid = GiltBid { amount, who: who.clone() };
+				let net = if queue_full {
+					sp_std::mem::swap(&mut q[0], &mut bid);
+					T::Currency::unreserve(&bid.who, bid.amount);
+					(0, amount - bid.amount)
+				} else {
+					q.insert(0, bid);
+					(1, amount)
+				};
+
+				let sorted_item_count = q.len().saturating_sub(T::FifoQueueLen::get() as usize);
+				if sorted_item_count > 1 {
+					q[0..sorted_item_count].sort_by_key(|x| x.amount);
+				}
+
+				Ok(net)
+			})?;
+			QueueTotals::<T>::mutate(|qs| {
+				qs.resize(queue_count, (0, Zero::zero()));
+				qs[queue_index].0 += net.0;
+				qs[queue_index].1 = qs[queue_index].1.saturating_add(net.1);
+			});
+			Self::deposit_event(Event::BidPlaced(who.clone(), amount, duration));
+
+			Ok(().into())
+		}
+
+		/// Retract a previously placed bid.
+		///
+		/// Origin must be Signed, and the account should have previously issued a still-active bid
+		/// of `amount` for `duration`.
+		///
+		/// - `amount`: The amount of the previous bid.
+		/// - `duration`: The duration of the previous bid.
+		#[pallet::weight(T::WeightInfo::place_bid(T::MaxQueueLen::get()))]
+		pub fn retract_bid(
+			origin: OriginFor<T>,
+			#[pallet::compact] amount: BalanceOf<T>,
+			duration: u32,
+		) -> DispatchResultWithPostInfo {
+			let who = ensure_signed(origin)?;
+
+			let queue_count = T::QueueCount::get() as usize;
+			let queue_index = duration.checked_sub(1)
+				.ok_or(Error::<T>::DurationTooSmall)? as usize;
+			ensure!(queue_index < queue_count, Error::<T>::DurationTooBig);
+
+			let bid = GiltBid { amount, who };
+			let new_len = Queues::<T>::try_mutate(duration, |q| -> Result<u32, DispatchError> {
+				let pos = q.iter().position(|i| i == &bid).ok_or(Error::<T>::NotFound)?;
+				q.remove(pos);
+				Ok(q.len() as u32)
+			})?;
+
+			QueueTotals::<T>::mutate(|qs| {
+				qs.resize(queue_count, (0, Zero::zero()));
+				qs[queue_index].0 = new_len;
+				qs[queue_index].1 = qs[queue_index].1.saturating_sub(bid.amount);
+			});
+
+			T::Currency::unreserve(&bid.who, bid.amount);
+			Self::deposit_event(Event::BidRetracted(bid.who, bid.amount, duration));
+
+			Ok(().into())
+		}
+
+		/// Set target proportion of gilt-funds.
+		///
+		/// Origin must be `AdminOrigin`.
+		///
+		/// - `target`: The target proportion of effective issued funds that should be under gilts
+		/// at any one time.
+		#[pallet::weight(T::WeightInfo::set_target())]
+		pub fn set_target(
+			origin: OriginFor<T>,
+			#[pallet::compact] target: Perquintill,
+		) -> DispatchResultWithPostInfo {
+			T::AdminOrigin::ensure_origin(origin)?;
+			ActiveTotal::<T>::mutate(|totals| totals.target = target);
+			Ok(().into())
+		}
+
+		/// Remove an active but expired gilt. Reserved funds under gilt are freed and balance is
+		/// adjusted to ensure that the funds grow or shrink to maintain the equivalent proportion
+		/// of effective total issued funds.
+		///
+		/// Origin must be Signed and the account must be the owner of the gilt of the given index.
+		///
+		/// - `index`: The index of the gilt to be thawed.
+		#[pallet::weight(T::WeightInfo::thaw())]
+		pub fn thaw(
+			origin: OriginFor<T>,
+			#[pallet::compact] index: ActiveIndex,
+		) -> DispatchResultWithPostInfo {
+			let who = ensure_signed(origin)?;
+
+			// Look for `index`
+			let gilt = Active::<T>::get(index).ok_or(Error::<T>::Unknown)?;
+			// If found, check the owner is `who`.
+			ensure!(gilt.who == who, Error::<T>::NotOwner);
+			let now = frame_system::Module::<T>::block_number();
+			ensure!(now >= gilt.expiry, Error::<T>::NotExpired);
+			// Remove it
+			Active::<T>::remove(index);
+
+			// Multiply the proportion it is by the total issued.
+			let total_issuance = T::Currency::total_issuance();
+			ActiveTotal::<T>::mutate(|totals| {
+				let nongilt_issuance: u128 = total_issuance.saturating_sub(totals.frozen)
+					.saturated_into();
+				let effective_issuance = totals.proportion.left_from_one()
+					.saturating_reciprocal_mul(nongilt_issuance);
+				let gilt_value: BalanceOf<T> = (gilt.proportion * effective_issuance).saturated_into();
+
+				totals.frozen = totals.frozen.saturating_sub(gilt.amount);
+				totals.proportion = totals.proportion.saturating_sub(gilt.proportion);
+
+				// Remove or mint the additional to the amount using `Deficit`/`Surplus`.
+				if gilt_value > gilt.amount {
+					// Unreserve full amount.
+					T::Currency::unreserve(&gilt.who, gilt.amount);
+					let amount = gilt_value - gilt.amount;
+					let deficit = T::Currency::deposit_creating(&gilt.who, amount);
+					T::Deficit::on_unbalanced(deficit);
+				} else {
+					if gilt_value < gilt.amount {
+						// We take anything reserved beyond the gilt's final value.
+						let rest = gilt.amount - gilt_value;
+						// `slash` might seem a little aggressive, but it's the only way to do it
+						// in case it's locked into the staking system.
+						let surplus = T::Currency::slash_reserved(&gilt.who, rest).0;
+						T::Surplus::on_unbalanced(surplus);
+					}
+					// Unreserve only its new value (less than the amount reserved). Everything
+					// should add up, but (defensive) in case it doesn't, unreserve takes lower
+					// priority over the funds.
+					let err_amt = T::Currency::unreserve(&gilt.who, gilt_value);
+					debug_assert!(err_amt.is_zero());
+				}
+
+				let e = Event::GiltThawed(index, gilt.who, gilt.amount, gilt_value);
+				Self::deposit_event(e);
+			});
+
+			Ok(().into())
+		}
+	}
+
+	impl<T: Config> Pallet<T> {
+		/// Attempt to enlarge our gilt-set from bids in order to satisfy our desired target amount
+		/// of funds frozen into gilts.
+		pub fn pursue_target(max_bids: u32) -> Weight {
+			let totals = ActiveTotal::<T>::get();
+			if totals.proportion < totals.target {
+				let missing = totals.target.saturating_sub(totals.proportion);
+
+				let total_issuance = T::Currency::total_issuance();
+				let nongilt_issuance: u128 = total_issuance.saturating_sub(totals.frozen)
+					.saturated_into();
+				let effective_issuance = totals.proportion.left_from_one()
+					.saturating_reciprocal_mul(nongilt_issuance);
+				let intake: BalanceOf<T> = (missing * effective_issuance).saturated_into();
+
+				let (bids_taken, queues_hit) = Self::enlarge(intake, max_bids);
+				let first_from_each_queue = T::WeightInfo::pursue_target_per_queue(queues_hit);
+				let rest_from_each_queue = T::WeightInfo::pursue_target_per_item(bids_taken)
+						.saturating_sub(T::WeightInfo::pursue_target_per_item(queues_hit));
+				first_from_each_queue + rest_from_each_queue
+			} else {
+				T::WeightInfo::pursue_target_noop()
+			}
+		}
+
+		/// Freeze additional funds from queue of bids up to `amount`. Use at most `max_bids`
+		/// from the queue.
+		///
+		/// Return the number of bids taken and the number of distinct queues taken from.
+		pub fn enlarge(
+			amount: BalanceOf<T>,
+			max_bids: u32,
+		) -> (u32, u32) {
+			let total_issuance = T::Currency::total_issuance();
+			let mut remaining = amount;
+			let mut bids_taken = 0;
+			let mut queues_hit = 0;
+			let now = frame_system::Module::<T>::block_number();
+
+			ActiveTotal::<T>::mutate(|totals| {
+				QueueTotals::<T>::mutate(|qs| {
+					for duration in (1..=T::QueueCount::get()).rev() {
+						if qs[duration as usize - 1].0 == 0 {
+							continue
+						}
+						let queue_index = duration as usize - 1;
+						let expiry = now.saturating_add(T::Period::get().saturating_mul(duration.into()));
+						Queues::<T>::mutate(duration, |q| {
+							while let Some(mut bid) = q.pop() {
+								if remaining < bid.amount {
+									let overflow = bid.amount - remaining;
+									bid.amount = remaining;
+									q.push(GiltBid { amount: overflow, who: bid.who.clone() });
+								}
+								let amount = bid.amount;
+								// Can never overflow due to block above.
+								remaining -= amount;
+								// Should never underflow since it should track the total of the bids
+								// exactly, but we'll be defensive.
+								qs[queue_index].1 = qs[queue_index].1.saturating_sub(bid.amount);
+
+								// Now to activate the bid...
+								let nongilt_issuance: u128 = total_issuance.saturating_sub(totals.frozen)
+									.saturated_into();
+								let effective_issuance = totals.proportion.left_from_one()
+									.saturating_reciprocal_mul(nongilt_issuance);
+								let n: u128 = amount.saturated_into();
+								let d = effective_issuance;
+								let proportion = Perquintill::from_rational_approximation(n, d);
+								let who = bid.who;
+								let index = totals.index;
+								totals.frozen += bid.amount;
+								totals.proportion = totals.proportion.saturating_add(proportion);
+								totals.index += 1;
+								let e = Event::GiltIssued(index, expiry, who.clone(), amount);
+								Self::deposit_event(e);
+								let gilt = ActiveGilt { amount, proportion, who, expiry };
+								Active::<T>::insert(index, gilt);
+
+								bids_taken += 1;
+
+								if remaining.is_zero() || bids_taken == max_bids {
+									break;
+								}
+							}
+							queues_hit += 1;
+							qs[queue_index].0 = q.len() as u32;
+						});
+						if remaining.is_zero() || bids_taken == max_bids {
+							break
+						}
+					}
+				});
+			});
+			(bids_taken, queues_hit)
+		}
+	}
+}
diff --git a/frame/gilt/src/mock.rs b/frame/gilt/src/mock.rs
new file mode 100644
index 000000000000..701c5c2f6d73
--- /dev/null
+++ b/frame/gilt/src/mock.rs
@@ -0,0 +1,138 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Test environment for Gilt pallet.
+
+use crate as pallet_gilt;
+
+use frame_support::{
+	parameter_types, ord_parameter_types, traits::{OnInitialize, OnFinalize, GenesisBuild},
+};
+use sp_core::H256;
+use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
+
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+// Configure a mock runtime to test the pallet.
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Module, Call, Config<T>, Storage, Event<T>},
+		Gilt: pallet_gilt::{Module, Call, Config, Storage, Event<T>},
+	}
+);
+
+parameter_types! {
+	pub const BlockHashCount: u64 = 250;
+	pub const SS58Prefix: u8 = 42;
+}
+
+impl frame_system::Config for Test {
+	type BaseCallFilter = ();
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
+	type Origin = Origin;
+	type Call = Call;
+	type Index = u64;
+	type BlockNumber = u64;
+	type Hash = H256;
+	type Hashing = BlakeTwo256;
+	type AccountId = u64;
+	type Lookup = IdentityLookup<Self::AccountId>;
+	type Header = Header;
+	type Event = Event;
+	type BlockHashCount = BlockHashCount;
+	type Version = ();
+	type PalletInfo = PalletInfo;
+	type AccountData = pallet_balances::AccountData<u64>;
+	type OnNewAccount = ();
+	type OnKilledAccount = ();
+	type SystemWeightInfo = ();
+	type SS58Prefix = SS58Prefix;
+}
+
+parameter_types! {
+	pub const ExistentialDeposit: u64 = 1;
+}
+
+impl pallet_balances::Config for Test {
+	type MaxLocks = ();
+	type Balance = u64;
+	type DustRemoval = ();
+	type Event = Event;
+	type ExistentialDeposit = ExistentialDeposit;
+	type AccountStore = System;
+	type WeightInfo = ();
+}
+
+parameter_types! {
+	pub const QueueCount: u32 = 3;
+	pub const MaxQueueLen: u32 = 3;
+	pub const FifoQueueLen: u32 = 1;
+	pub const Period: u64 = 3;
+	pub const MinFreeze: u64 = 2;
+	pub const IntakePeriod: u64 = 2;
+	pub const MaxIntakeBids: u32 = 2;
+}
+ord_parameter_types! {
+	pub const One: u64 = 1;
+}
+
+impl pallet_gilt::Config for Test {
+	type Event = Event;
+	type Currency = Balances;
+	type AdminOrigin = frame_system::EnsureSignedBy<One, Self::AccountId>;
+	type Deficit = ();
+	type Surplus = ();
+	type QueueCount = QueueCount;
+	type MaxQueueLen = MaxQueueLen;
+	type FifoQueueLen = FifoQueueLen;
+	type Period = Period;
+	type MinFreeze = MinFreeze;
+	type IntakePeriod = IntakePeriod;
+	type MaxIntakeBids = MaxIntakeBids;
+	type WeightInfo = ();
+}
+
+// This function basically just builds a genesis storage key/value store according to
+// our desired mockup.
+pub fn new_test_ext() -> sp_io::TestExternalities {
+	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+	pallet_balances::GenesisConfig::<Test>{
+		balances: vec![(1, 100), (2, 100), (3, 100), (4, 100)],
+	}.assimilate_storage(&mut t).unwrap();
+	GenesisBuild::<Test>::assimilate_storage(&crate::GenesisConfig, &mut t).unwrap();
+	t.into()
+}
+
+pub fn run_to_block(n: u64) {
+	while System::block_number() < n {
+		Gilt::on_finalize(System::block_number());
+		Balances::on_finalize(System::block_number());
+		System::on_finalize(System::block_number());
+		System::set_block_number(System::block_number() + 1);
+		System::on_initialize(System::block_number());
+		Balances::on_initialize(System::block_number());
+		Gilt::on_initialize(System::block_number());
+	}
+}
diff --git a/frame/gilt/src/tests.rs b/frame/gilt/src/tests.rs
new file mode 100644
index 000000000000..637a6a870597
--- /dev/null
+++ b/frame/gilt/src/tests.rs
@@ -0,0 +1,499 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Tests for Gilt pallet.
+
+use super::*;
+use crate::{Error, mock::*};
+use frame_support::{assert_ok, assert_noop, dispatch::DispatchError, traits::Currency};
+use sp_arithmetic::Perquintill;
+use pallet_balances::Error as BalancesError;
+
+#[test]
+fn basic_setup_works() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+
+		for q in 0..3 {
+			assert!(Queues::<Test>::get(q).is_empty());
+		}
+		assert_eq!(ActiveTotal::<Test>::get(), ActiveGiltsTotal {
+			frozen: 0,
+			proportion: Perquintill::zero(),
+			index: 0,
+			target: Perquintill::zero(),
+		});
+		assert_eq!(QueueTotals::<Test>::get(), vec![(0, 0); 3]);
+	});
+}
+
+#[test]
+fn set_target_works() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+		let e = DispatchError::BadOrigin;
+		assert_noop!(Gilt::set_target(Origin::signed(2), Perquintill::from_percent(50)), e);
+		assert_ok!(Gilt::set_target(Origin::signed(1), Perquintill::from_percent(50)));
+
+		assert_eq!(ActiveTotal::<Test>::get(), ActiveGiltsTotal {
+			frozen: 0,
+			proportion: Perquintill::zero(),
+			index: 0,
+			target: Perquintill::from_percent(50),
+		});
+	});
+}
+
+#[test]
+fn place_bid_works() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+		assert_noop!(Gilt::place_bid(Origin::signed(1), 1, 2), Error::<Test>::AmountTooSmall);
+		assert_noop!(Gilt::place_bid(Origin::signed(1), 101, 2), BalancesError::<Test>::InsufficientBalance);
+		assert_noop!(Gilt::place_bid(Origin::signed(1), 10, 4), Error::<Test>::DurationTooBig);
+		assert_ok!(Gilt::place_bid(Origin::signed(1), 10, 2));
+		assert_eq!(Balances::reserved_balance(1), 10);
+		assert_eq!(Queues::<Test>::get(2), vec![GiltBid { amount: 10, who: 1 }]);
+		assert_eq!(QueueTotals::<Test>::get(), vec![(0, 0), (1, 10), (0, 0)]);
+	});
+}
+
+#[test]
+fn place_bid_queuing_works() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+		assert_ok!(Gilt::place_bid(Origin::signed(1), 20, 2));
+		assert_ok!(Gilt::place_bid(Origin::signed(1), 10, 2));
+		assert_ok!(Gilt::place_bid(Origin::signed(1), 5, 2));
+		assert_noop!(Gilt::place_bid(Origin::signed(1), 5, 2), Error::<Test>::BidTooLow);
+		assert_ok!(Gilt::place_bid(Origin::signed(1), 15, 2));
+		assert_eq!(Balances::reserved_balance(1), 45);
+
+		assert_ok!(Gilt::place_bid(Origin::signed(1), 25, 2));
+		assert_eq!(Balances::reserved_balance(1), 60);
+		assert_noop!(Gilt::place_bid(Origin::signed(1), 10, 2), Error::<Test>::BidTooLow);
+		assert_eq!(Queues::<Test>::get(2), vec![
+			GiltBid { amount: 15, who: 1 },
+			GiltBid { amount: 25, who: 1 },
+			GiltBid { amount: 20, who: 1 },
+		]);
+		assert_eq!(QueueTotals::<Test>::get(), vec![(0, 0), (3, 60), (0, 0)]);
+	});
+}
+
+#[test]
+fn place_bid_fails_when_queue_full() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+		assert_ok!(Gilt::place_bid(Origin::signed(1), 10, 2));
+		assert_ok!(Gilt::place_bid(Origin::signed(2), 10, 2));
+		assert_ok!(Gilt::place_bid(Origin::signed(3), 10, 2));
+		assert_noop!(Gilt::place_bid(Origin::signed(4), 10, 2), Error::<Test>::BidTooLow);
+		assert_ok!(Gilt::place_bid(Origin::signed(4), 10, 3));
+	});
+}
+
+#[test]
+fn multiple_place_bids_works() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+		assert_ok!(Gilt::place_bid(Origin::signed(1), 10, 1));
+		assert_ok!(Gilt::place_bid(Origin::signed(1), 10, 2));
+		assert_ok!(Gilt::place_bid(Origin::signed(1), 10, 2));
+		assert_ok!(Gilt::place_bid(Origin::signed(1), 10, 3));
+		assert_ok!(Gilt::place_bid(Origin::signed(2), 10, 2));
+
+		assert_eq!(Balances::reserved_balance(1), 40);
+		assert_eq!(Balances::reserved_balance(2), 10);
+		assert_eq!(Queues::<Test>::get(1), vec![
+			GiltBid { amount: 10, who: 1 },
+		]);
+		assert_eq!(Queues::<Test>::get(2), vec![
+			GiltBid { amount: 10, who: 2 },
+			GiltBid { amount: 10, who: 1 },
+			GiltBid { amount: 10, who: 1 },
+		]);
+		assert_eq!(Queues::<Test>::get(3), vec![
+			GiltBid { amount: 10, who: 1 },
+		]);
+		assert_eq!(QueueTotals::<Test>::get(), vec![(1, 10), (3, 30), (1, 10)]);
+	});
+}
+
+#[test]
+fn retract_single_item_queue_works() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+		assert_ok!(Gilt::place_bid(Origin::signed(1), 10, 1));
+		assert_ok!(Gilt::place_bid(Origin::signed(1), 10, 2));
+		assert_ok!(Gilt::retract_bid(Origin::signed(1), 10, 1));
+
+		assert_eq!(Balances::reserved_balance(1), 10);
+		assert_eq!(Queues::<Test>::get(1), vec![]);
+		assert_eq!(Queues::<Test>::get(2), vec![ GiltBid { amount: 10, who: 1 } ]);
+		assert_eq!(QueueTotals::<Test>::get(), vec![(0, 0), (1, 10), (0, 0)]);
+	});
+}
+
+#[test]
+fn retract_with_other_and_duplicate_works() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+		assert_ok!(Gilt::place_bid(Origin::signed(1), 10, 1));
+		assert_ok!(Gilt::place_bid(Origin::signed(1), 10, 2));
+		assert_ok!(Gilt::place_bid(Origin::signed(1), 10, 2));
+		assert_ok!(Gilt::place_bid(Origin::signed(2), 10, 2));
+
+		assert_ok!(Gilt::retract_bid(Origin::signed(1), 10, 2));
+		assert_eq!(Balances::reserved_balance(1), 20);
+		assert_eq!(Balances::reserved_balance(2), 10);
+		assert_eq!(Queues::<Test>::get(1), vec![
+			GiltBid { amount: 10, who: 1 },
+		]);
+		assert_eq!(Queues::<Test>::get(2), vec![
+			GiltBid { amount: 10, who: 2 },
+			GiltBid { amount: 10, who: 1 },
+		]);
+		assert_eq!(QueueTotals::<Test>::get(), vec![(1, 10), (2, 20), (0, 0)]);
+	});
+}
+
+#[test]
+fn retract_non_existent_item_fails() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+		assert_noop!(Gilt::retract_bid(Origin::signed(1), 10, 1), Error::<Test>::NotFound);
+		assert_ok!(Gilt::place_bid(Origin::signed(1), 10, 1));
+		assert_noop!(Gilt::retract_bid(Origin::signed(1), 20, 1), Error::<Test>::NotFound);
+		assert_noop!(Gilt::retract_bid(Origin::signed(1), 10, 2), Error::<Test>::NotFound);
+		assert_noop!(Gilt::retract_bid(Origin::signed(2), 10, 1), Error::<Test>::NotFound);
+	});
+}
+
+#[test]
+fn basic_enlarge_works() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+		assert_ok!(Gilt::place_bid(Origin::signed(1), 40, 1));
+		assert_ok!(Gilt::place_bid(Origin::signed(2), 40, 2));
+		Gilt::enlarge(40, 2);
+
+		// Takes 2/2, then stopped because it reaches its max amount
+		assert_eq!(Balances::reserved_balance(1), 40);
+		assert_eq!(Balances::reserved_balance(2), 40);
+		assert_eq!(Queues::<Test>::get(1), vec![ GiltBid { amount: 40, who: 1 } ]);
+		assert_eq!(Queues::<Test>::get(2), vec![]);
+		assert_eq!(QueueTotals::<Test>::get(), vec![(1, 40), (0, 0), (0, 0)]);
+
+		assert_eq!(ActiveTotal::<Test>::get(), ActiveGiltsTotal {
+			frozen: 40,
+			proportion: Perquintill::from_percent(10),
+			index: 1,
+			target: Perquintill::zero(),
+		});
+		assert_eq!(Active::<Test>::get(0).unwrap(), ActiveGilt {
+			proportion: Perquintill::from_percent(10),
+			amount: 40,
+			who: 2,
+			expiry: 7,
+		});
+	});
+}
+
+#[test]
+fn enlarge_respects_bids_limit() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+		assert_ok!(Gilt::place_bid(Origin::signed(1), 40, 1));
+		assert_ok!(Gilt::place_bid(Origin::signed(2), 40, 2));
+		assert_ok!(Gilt::place_bid(Origin::signed(3), 40, 2));
+		assert_ok!(Gilt::place_bid(Origin::signed(4), 40, 3));
+		Gilt::enlarge(100, 2);
+
+		// Should have taken 4/3 and 2/2, then stopped because it's only allowed 2.
+		assert_eq!(Queues::<Test>::get(1), vec![ GiltBid { amount: 40, who: 1 } ]);
+		assert_eq!(Queues::<Test>::get(2), vec![ GiltBid { amount: 40, who: 3 } ]);
+		assert_eq!(Queues::<Test>::get(3), vec![]);
+		assert_eq!(QueueTotals::<Test>::get(), vec![(1, 40), (1, 40), (0, 0)]);
+
+		assert_eq!(Active::<Test>::get(0).unwrap(), ActiveGilt {
+			proportion: Perquintill::from_percent(10),
+			amount: 40,
+			who: 4,
+			expiry: 10,
+		});
+		assert_eq!(Active::<Test>::get(1).unwrap(), ActiveGilt {
+			proportion: Perquintill::from_percent(10),
+			amount: 40,
+			who: 2,
+			expiry: 7,
+		});
+		assert_eq!(ActiveTotal::<Test>::get(), ActiveGiltsTotal {
+			frozen: 80,
+			proportion: Perquintill::from_percent(20),
+			index: 2,
+			target: Perquintill::zero(),
+		});
+	});
+}
+
+#[test]
+fn enlarge_respects_amount_limit_and_will_split() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+		assert_ok!(Gilt::place_bid(Origin::signed(1), 80, 1));
+		Gilt::enlarge(40, 2);
+
+		// Takes 2/2, then stopped because it reaches its max amount
+		assert_eq!(Queues::<Test>::get(1), vec![ GiltBid { amount: 40, who: 1 } ]);
+		assert_eq!(QueueTotals::<Test>::get(), vec![(1, 40), (0, 0), (0, 0)]);
+
+		assert_eq!(Active::<Test>::get(0).unwrap(), ActiveGilt {
+			proportion: Perquintill::from_percent(10),
+			amount: 40,
+			who: 1,
+			expiry: 4,
+		});
+		assert_eq!(ActiveTotal::<Test>::get(), ActiveGiltsTotal {
+			frozen: 40,
+			proportion: Perquintill::from_percent(10),
+			index: 1,
+			target: Perquintill::zero(),
+		});
+	});
+}
+
+#[test]
+fn basic_thaw_works() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+		assert_ok!(Gilt::place_bid(Origin::signed(1), 40, 1));
+		Gilt::enlarge(40, 1);
+		run_to_block(3);
+		assert_noop!(Gilt::thaw(Origin::signed(1), 0), Error::<Test>::NotExpired);
+		run_to_block(4);
+		assert_noop!(Gilt::thaw(Origin::signed(1), 1), Error::<Test>::Unknown);
+		assert_noop!(Gilt::thaw(Origin::signed(2), 0), Error::<Test>::NotOwner);
+		assert_ok!(Gilt::thaw(Origin::signed(1), 0));
+
+		assert_eq!(ActiveTotal::<Test>::get(), ActiveGiltsTotal {
+			frozen: 0,
+			proportion: Perquintill::zero(),
+			index: 1,
+			target: Perquintill::zero(),
+		});
+		assert_eq!(Active::<Test>::get(0), None);
+		assert_eq!(Balances::free_balance(1), 100);
+		assert_eq!(Balances::reserved_balance(1), 0);
+	});
+}
+
+#[test]
+fn thaw_when_issuance_higher_works() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+		assert_ok!(Gilt::place_bid(Origin::signed(1), 100, 1));
+		Gilt::enlarge(100, 1);
+
+		// Everybody else's balances goes up by 50%
+		Balances::make_free_balance_be(&2, 150);
+		Balances::make_free_balance_be(&3, 150);
+		Balances::make_free_balance_be(&4, 150);
+
+		run_to_block(4);
+		assert_ok!(Gilt::thaw(Origin::signed(1), 0));
+
+		assert_eq!(Balances::free_balance(1), 150);
+		assert_eq!(Balances::reserved_balance(1), 0);
+	});
+}
+
+#[test]
+fn thaw_when_issuance_lower_works() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+		assert_ok!(Gilt::place_bid(Origin::signed(1), 100, 1));
+		Gilt::enlarge(100, 1);
+
+		// Everybody else's balances goes down by 25%
+		Balances::make_free_balance_be(&2, 75);
+		Balances::make_free_balance_be(&3, 75);
+		Balances::make_free_balance_be(&4, 75);
+
+		run_to_block(4);
+		assert_ok!(Gilt::thaw(Origin::signed(1), 0));
+
+		assert_eq!(Balances::free_balance(1), 75);
+		assert_eq!(Balances::reserved_balance(1), 0);
+	});
+}
+
+#[test]
+fn multiple_thaws_works() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+		assert_ok!(Gilt::place_bid(Origin::signed(1), 40, 1));
+		assert_ok!(Gilt::place_bid(Origin::signed(1), 60, 1));
+		assert_ok!(Gilt::place_bid(Origin::signed(2), 50, 1));
+		Gilt::enlarge(200, 3);
+
+		// Double everyone's free balances.
+		Balances::make_free_balance_be(&2, 100);
+		Balances::make_free_balance_be(&3, 200);
+		Balances::make_free_balance_be(&4, 200);
+
+		run_to_block(4);
+		assert_ok!(Gilt::thaw(Origin::signed(1), 0));
+		assert_ok!(Gilt::thaw(Origin::signed(1), 1));
+		assert_ok!(Gilt::thaw(Origin::signed(2), 2));
+
+		assert_eq!(Balances::free_balance(1), 200);
+		assert_eq!(Balances::free_balance(2), 200);
+	});
+}
+
+#[test]
+fn multiple_thaws_works_in_alternative_thaw_order() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+		assert_ok!(Gilt::place_bid(Origin::signed(1), 40, 1));
+		assert_ok!(Gilt::place_bid(Origin::signed(1), 60, 1));
+		assert_ok!(Gilt::place_bid(Origin::signed(2), 50, 1));
+		Gilt::enlarge(200, 3);
+
+		// Double everyone's free balances.
+		Balances::make_free_balance_be(&2, 100);
+		Balances::make_free_balance_be(&3, 200);
+		Balances::make_free_balance_be(&4, 200);
+
+		run_to_block(4);
+		assert_ok!(Gilt::thaw(Origin::signed(2), 2));
+		assert_ok!(Gilt::thaw(Origin::signed(1), 1));
+		assert_ok!(Gilt::thaw(Origin::signed(1), 0));
+
+		assert_eq!(Balances::free_balance(1), 200);
+		assert_eq!(Balances::free_balance(2), 200);
+	});
+}
+
+#[test]
+fn enlargement_to_target_works() {
+	new_test_ext().execute_with(|| {
+		run_to_block(2);
+		assert_ok!(Gilt::place_bid(Origin::signed(1), 40, 1));
+		assert_ok!(Gilt::place_bid(Origin::signed(1), 40, 2));
+		assert_ok!(Gilt::place_bid(Origin::signed(2), 40, 2));
+		assert_ok!(Gilt::place_bid(Origin::signed(2), 40, 3));
+		assert_ok!(Gilt::place_bid(Origin::signed(3), 40, 3));
+		assert_ok!(Gilt::set_target(Origin::signed(1), Perquintill::from_percent(40)));
+
+		run_to_block(3);
+		assert_eq!(Queues::<Test>::get(1), vec![
+			GiltBid { amount: 40, who: 1 },
+		]);
+		assert_eq!(Queues::<Test>::get(2), vec![
+			GiltBid { amount: 40, who: 2 },
+			GiltBid { amount: 40, who: 1 },
+		]);
+		assert_eq!(Queues::<Test>::get(3), vec![
+			GiltBid { amount: 40, who: 3 },
+			GiltBid { amount: 40, who: 2 },
+		]);
+		assert_eq!(QueueTotals::<Test>::get(), vec![(1, 40), (2, 80), (2, 80)]);
+
+		run_to_block(4);
+		// Two new gilts should have been issued to 2 & 3 for 40 each & duration of 3.
+		assert_eq!(Active::<Test>::get(0).unwrap(), ActiveGilt {
+			proportion: Perquintill::from_percent(10),
+			amount: 40,
+			who: 2,
+			expiry: 13,
+		});
+		assert_eq!(Active::<Test>::get(1).unwrap(), ActiveGilt {
+			proportion: Perquintill::from_percent(10),
+			amount: 40,
+			who: 3,
+			expiry: 13,
+
+		});
+		assert_eq!(ActiveTotal::<Test>::get(), ActiveGiltsTotal {
+			frozen: 80,
+			proportion: Perquintill::from_percent(20),
+			index: 2,
+			target: Perquintill::from_percent(40),
+		});
+
+		run_to_block(5);
+		// No change
+		assert_eq!(ActiveTotal::<Test>::get(), ActiveGiltsTotal {
+			frozen: 80,
+			proportion: Perquintill::from_percent(20),
+			index: 2,
+			target: Perquintill::from_percent(40),
+		});
+
+		run_to_block(6);
+		// Two new gilts should have been issued to 1 & 2 for 40 each & duration of 2.
+		assert_eq!(Active::<Test>::get(2).unwrap(), ActiveGilt {
+			proportion: Perquintill::from_percent(10),
+			amount: 40,
+			who: 1,
+			expiry: 12,
+		});
+		assert_eq!(Active::<Test>::get(3).unwrap(), ActiveGilt {
+			proportion: Perquintill::from_percent(10),
+			amount: 40,
+			who: 2,
+			expiry: 12,
+
+		});
+		assert_eq!(ActiveTotal::<Test>::get(), ActiveGiltsTotal {
+			frozen: 160,
+			proportion: Perquintill::from_percent(40),
+			index: 4,
+			target: Perquintill::from_percent(40),
+		});
+
+		run_to_block(8);
+		// No change now.
+		assert_eq!(ActiveTotal::<Test>::get(), ActiveGiltsTotal {
+			frozen: 160,
+			proportion: Perquintill::from_percent(40),
+			index: 4,
+			target: Perquintill::from_percent(40),
+		});
+
+		// Set target a bit higher to use up the remaining bid.
+		assert_ok!(Gilt::set_target(Origin::signed(1), Perquintill::from_percent(60)));
+		run_to_block(10);
+
+		// Two new gilts should have been issued to 1 & 2 for 40 each & duration of 2.
+		assert_eq!(Active::<Test>::get(4).unwrap(), ActiveGilt {
+			proportion: Perquintill::from_percent(10),
+			amount: 40,
+			who: 1,
+			expiry: 13,
+		});
+
+		assert_eq!(ActiveTotal::<Test>::get(), ActiveGiltsTotal {
+			frozen: 200,
+			proportion: Perquintill::from_percent(50),
+			index: 5,
+			target: Perquintill::from_percent(60),
+		});
+	});
+}
diff --git a/frame/gilt/src/weights.rs b/frame/gilt/src/weights.rs
new file mode 100644
index 000000000000..f202ae47ff63
--- /dev/null
+++ b/frame/gilt/src/weights.rs
@@ -0,0 +1,164 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Autogenerated weights for pallet_gilt
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-02-23, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
+
+// Executed Command:
+// target/release/substrate
+// benchmark
+// --chain=dev
+// --steps=50
+// --repeat=20
+// --pallet=pallet_gilt
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./frame/gilt/src/weights.rs
+// --template=./.maintain/frame-weight-template.hbs
+
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for pallet_gilt.
+pub trait WeightInfo {
+	fn place_bid(l: u32, ) -> Weight;
+	fn place_bid_max() -> Weight;
+	fn retract_bid(l: u32, ) -> Weight;
+	fn set_target() -> Weight;
+	fn thaw() -> Weight;
+	fn pursue_target_noop() -> Weight;
+	fn pursue_target_per_item(b: u32, ) -> Weight;
+	fn pursue_target_per_queue(q: u32, ) -> Weight;
+}
+
+/// Weights for pallet_gilt using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	fn place_bid(l: u32, ) -> Weight {
+		(79_274_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((289_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+	}
+	fn place_bid_max() -> Weight {
+		(297_825_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+	}
+	fn retract_bid(l: u32, ) -> Weight {
+		(79_731_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((231_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+	}
+	fn set_target() -> Weight {
+		(6_113_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn thaw() -> Weight {
+		(74_792_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+	}
+	fn pursue_target_noop() -> Weight {
+		(3_468_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+	}
+	fn pursue_target_per_item(b: u32, ) -> Weight {
+		(65_792_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((11_402_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(b as Weight)))
+	}
+	fn pursue_target_per_queue(q: u32, ) -> Weight {
+		(32_391_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((18_500_000 as Weight).saturating_mul(q as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(q as Weight)))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(q as Weight)))
+	}
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+	fn place_bid(l: u32, ) -> Weight {
+		(79_274_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((289_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+	}
+	fn place_bid_max() -> Weight {
+		(297_825_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+	}
+	fn retract_bid(l: u32, ) -> Weight {
+		(79_731_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((231_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+	}
+	fn set_target() -> Weight {
+		(6_113_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn thaw() -> Weight {
+		(74_792_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+	}
+	fn pursue_target_noop() -> Weight {
+		(3_468_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+	}
+	fn pursue_target_per_item(b: u32, ) -> Weight {
+		(65_792_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((11_402_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(b as Weight)))
+	}
+	fn pursue_target_per_queue(q: u32, ) -> Weight {
+		(32_391_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((18_500_000 as Weight).saturating_mul(q as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(q as Weight)))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((2 as Weight).saturating_mul(q as Weight)))
+	}
+}
diff --git a/primitives/arithmetic/src/per_things.rs b/primitives/arithmetic/src/per_things.rs
index caaa4c33cd43..319666747b15 100644
--- a/primitives/arithmetic/src/per_things.rs
+++ b/primitives/arithmetic/src/per_things.rs
@@ -80,6 +80,11 @@ pub trait PerThing:
 		Self::from_rational_approximation::<Self::Upper>(p * p, q * q)
 	}
 
+	/// Return the part left when `self` is saturating-subtracted from `Self::one()`.
+	fn left_from_one(self) -> Self {
+		Self::one().saturating_sub(self)
+	}
+
 	/// Multiplication that always rounds down to a whole number. The standard `Mul` rounds to the
 	/// nearest whole number.
 	///

From 2dd569a96f54ccea20d0856acd5b41fd18d10324 Mon Sep 17 00:00:00 2001
From: Xiliang Chen <xlchen1291@gmail.com>
Date: Sun, 28 Feb 2021 23:02:46 +1300
Subject: [PATCH 0447/1194] emit event on remark (#8120)

Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 frame/system/benchmarking/src/lib.rs |  6 ++++
 frame/system/src/lib.rs              | 20 +++++++++++--
 frame/system/src/weights.rs          | 45 +++++++++++++++++-----------
 3 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/frame/system/benchmarking/src/lib.rs b/frame/system/benchmarking/src/lib.rs
index a23ea07df0ea..bdb34e7944db 100644
--- a/frame/system/benchmarking/src/lib.rs
+++ b/frame/system/benchmarking/src/lib.rs
@@ -44,6 +44,12 @@ benchmarks! {
 		let caller = whitelisted_caller();
 	}: _(RawOrigin::Signed(caller), remark_message)
 
+	remark_with_event {
+		let b in 0 .. *T::BlockLength::get().max.get(DispatchClass::Normal) as u32;
+		let remark_message = vec![1; b as usize];
+		let caller = whitelisted_caller();
+	}: _(RawOrigin::Signed(caller), remark_message)
+
 	set_heap_pages {
 	}: _(RawOrigin::Root, Default::default())
 
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index e521a082a91c..124c437c44bf 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -292,8 +292,6 @@ pub mod pallet {
 		///
 		/// # <weight>
 		/// - `O(1)`
-		/// - Base Weight: 0.665 µs, independent of remark length.
-		/// - No DB operations.
 		/// # </weight>
 		#[pallet::weight(T::SystemWeightInfo::remark(_remark.len() as u32))]
 		pub(crate) fn remark(origin: OriginFor<T>, _remark: Vec<u8>) -> DispatchResultWithPostInfo {
@@ -450,11 +448,25 @@ pub mod pallet {
 			storage::unhashed::kill_prefix(&prefix);
 			Ok(().into())
 		}
+
+		/// Make some on-chain remark and emit event.
+		///
+		/// # <weight>
+		/// - `O(b)` where b is the length of the remark.
+		/// - 1 event.
+		/// # </weight>
+		#[pallet::weight(T::SystemWeightInfo::remark_with_event(remark.len() as u32))]
+		pub(crate) fn remark_with_event(origin: OriginFor<T>, remark: Vec<u8>) -> DispatchResultWithPostInfo {
+			let who = ensure_signed(origin)?;
+			let hash = T::Hashing::hash(&remark[..]);
+			Self::deposit_event(Event::Remarked(who, hash));
+			Ok(().into())
+		}
 	}
 
 	/// Event for the System pallet.
 	#[pallet::event]
-	#[pallet::metadata(T::AccountId = "AccountId")]
+	#[pallet::metadata(T::AccountId = "AccountId", T::Hash = "Hash")]
 	pub enum Event<T: Config> {
 		/// An extrinsic completed successfully. \[info\]
 		ExtrinsicSuccess(DispatchInfo),
@@ -466,6 +478,8 @@ pub mod pallet {
 		NewAccount(T::AccountId),
 		/// An \[account\] was reaped.
 		KilledAccount(T::AccountId),
+		/// On on-chain remark happened. \[origin, remark_hash\]
+		Remarked(T::AccountId, T::Hash),
 	}
 
 	/// Old name generated by `decl_event`.
diff --git a/frame/system/src/weights.rs b/frame/system/src/weights.rs
index 823e4b7d1e0d..c961b47e53ea 100644
--- a/frame/system/src/weights.rs
+++ b/frame/system/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for frame_system
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-02-23, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2021-02-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -45,6 +45,7 @@ use sp_std::marker::PhantomData;
 /// Weight functions needed for frame_system.
 pub trait WeightInfo {
 	fn remark(b: u32, ) -> Weight;
+	fn remark_with_event(b: u32, ) -> Weight;
 	fn set_heap_pages() -> Weight;
 	fn set_changes_trie_config() -> Weight;
 	fn set_storage(i: u32, ) -> Weight;
@@ -56,33 +57,38 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: crate::Config> WeightInfo for SubstrateWeight<T> {
 	fn remark(_b: u32, ) -> Weight {
-		(1_279_000 as Weight)
+		(1_296_000 as Weight)
+	}
+	fn remark_with_event(b: u32, ) -> Weight {
+		(13_474_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((1_000 as Weight).saturating_mul(b as Weight))
 	}
 	fn set_heap_pages() -> Weight {
-		(2_167_000 as Weight)
+		(2_024_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_changes_trie_config() -> Weight {
-		(10_117_000 as Weight)
+		(10_551_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn set_storage(i: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 0
-			.saturating_add((608_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((612_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	fn kill_storage(i: u32, ) -> Weight {
-		(3_199_000 as Weight)
+		(562_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((450_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((442_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	fn kill_prefix(p: u32, ) -> Weight {
-		(8_966_000 as Weight)
+		(10_499_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((845_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((840_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
 	}
 }
@@ -90,33 +96,38 @@ impl<T: crate::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn remark(_b: u32, ) -> Weight {
-		(1_279_000 as Weight)
+		(1_296_000 as Weight)
+	}
+	fn remark_with_event(b: u32, ) -> Weight {
+		(13_474_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((1_000 as Weight).saturating_mul(b as Weight))
 	}
 	fn set_heap_pages() -> Weight {
-		(2_167_000 as Weight)
+		(2_024_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_changes_trie_config() -> Weight {
-		(10_117_000 as Weight)
+		(10_551_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn set_storage(i: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 0
-			.saturating_add((608_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((612_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	fn kill_storage(i: u32, ) -> Weight {
-		(3_199_000 as Weight)
+		(562_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((450_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((442_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	fn kill_prefix(p: u32, ) -> Weight {
-		(8_966_000 as Weight)
+		(10_499_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((845_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((840_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
 	}
 }

From e84d2ae4e519d77f59ef68c8efd48909a70d58e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Sun, 28 Feb 2021 16:53:30 +0000
Subject: [PATCH 0448/1194] grandpa: maintain invariants when evaluating
 aggregated voting rules (#8186)

* grandpa: maintain invariants when evaluating aggregated voting rules

* grandpa: update comment on VotingRules::restrict_vote

* grandpa: simplify comment
---
 client/finality-grandpa/src/voting_rule.rs | 99 ++++++++++++++++++++++
 1 file changed, 99 insertions(+)

diff --git a/client/finality-grandpa/src/voting_rule.rs b/client/finality-grandpa/src/voting_rule.rs
index e7b74c3e3296..9b3fb9b32856 100644
--- a/client/finality-grandpa/src/voting_rule.rs
+++ b/client/finality-grandpa/src/voting_rule.rs
@@ -227,6 +227,11 @@ impl<Block, B> VotingRule<Block, B> for VotingRules<Block, B> where
 				if let Some(header) = rule
 					.restrict_vote(backend.clone(), &base, &best_target, &restricted_target)
 					.await
+					.filter(|(_, restricted_number)| {
+						// NOTE: we can only restrict votes within the interval [base, target)
+						restricted_number >= base.number()
+							&& restricted_number < restricted_target.number()
+					})
 					.and_then(|(hash, _)| backend.header(BlockId::Hash(hash)).ok())
 					.and_then(std::convert::identity)
 				{
@@ -313,3 +318,97 @@ impl<Block, B> VotingRule<Block, B> for Box<dyn VotingRule<Block, B>> where
 		(**self).restrict_vote(backend, base, best_target, current_target)
 	}
 }
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use sc_block_builder::BlockBuilderProvider;
+	use sp_consensus::BlockOrigin;
+	use sp_runtime::traits::Header as _;
+
+	use substrate_test_runtime_client::{
+		runtime::{Block, Header},
+		Backend, Client, ClientBlockImportExt, DefaultTestClientBuilderExt, TestClientBuilder,
+		TestClientBuilderExt,
+	};
+
+	/// A mock voting rule that subtracts a static number of block from the `current_target`.
+	#[derive(Clone)]
+	struct Subtract(u64);
+	impl VotingRule<Block, Client<Backend>> for Subtract {
+		fn restrict_vote(
+			&self,
+			backend: Arc<Client<Backend>>,
+			_base: &Header,
+			_best_target: &Header,
+			current_target: &Header,
+		) -> VotingRuleResult<Block> {
+			let target_number = current_target.number() - self.0;
+			let res = backend
+				.hash(target_number)
+				.unwrap()
+				.map(|target_hash| (target_hash, target_number));
+
+			Box::pin(std::future::ready(res))
+		}
+	}
+
+	#[test]
+	fn multiple_voting_rules_cannot_restrict_past_base() {
+		// setup an aggregate voting rule composed of two voting rules
+		// where each subtracts 50 blocks from the current target
+		let rule = VotingRulesBuilder::new()
+			.add(Subtract(50))
+			.add(Subtract(50))
+			.build();
+
+		let mut client = Arc::new(TestClientBuilder::new().build());
+
+		for _ in 0..200 {
+			let block = client
+				.new_block(Default::default())
+				.unwrap()
+				.build()
+				.unwrap()
+				.block;
+
+			client.import(BlockOrigin::Own, block).unwrap();
+		}
+
+		let genesis = client
+			.header(&BlockId::Number(0u32.into()))
+			.unwrap()
+			.unwrap();
+
+		let best = client
+			.header(&BlockId::Hash(client.info().best_hash))
+			.unwrap()
+			.unwrap();
+
+		let (_, number) =
+			futures::executor::block_on(rule.restrict_vote(client.clone(), &genesis, &best, &best))
+				.unwrap();
+
+		// we apply both rules which should subtract 100 blocks from best block (#200)
+		// which means that we should be voting for block #100
+		assert_eq!(number, 100);
+
+		let block110 = client
+			.header(&BlockId::Number(110u32.into()))
+			.unwrap()
+			.unwrap();
+
+		let (_, number) = futures::executor::block_on(rule.restrict_vote(
+			client.clone(),
+			&block110,
+			&best,
+			&best,
+		))
+		.unwrap();
+
+		// base block is #110 while best block is #200, applying both rules would make
+		// would make the target block (#100) be lower than the base block, therefore
+		// only one of the rules is applied.
+		assert_eq!(number, 150);
+	}
+}

From dd295960a0bb80620ca1381978f10bc9dfc07d32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Mon, 1 Mar 2021 15:29:17 +0100
Subject: [PATCH 0449/1194] Init `RuntimeLogger` automatically for each runtime
 api call (#8128)

* Init `RuntimeLogger` automatically for each runtime api call

This pr change the runtime api in such a way to always and automatically
enable the `RuntimeLogger`. This enables the user to use `log` or
`tracing` from inside the runtime to create log messages. As logging
introduces some extra code and especially increases the size of the wasm
blob. It is advised to disable all logging completely with
`sp-api/disable-logging` when doing the wasm builds for the on-chain
wasm runtime.

Besides these changes, the pr also brings most of the logging found in
frame to the same format "runtime::*".

* Update frame/im-online/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Update test-utils/runtime/Cargo.toml

* Fix test

* Don't use tracing in the runtime, as we don't support it :D

* Fixes

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
---
 Cargo.lock                                    |  26 +-
 bin/node/runtime/Cargo.toml                   |   2 +
 bin/node/runtime/src/lib.rs                   |   4 +-
 frame/babe/Cargo.toml                         |   2 +
 frame/babe/src/equivocation.rs                |  22 +-
 frame/balances/Cargo.toml                     |   2 +
 frame/balances/src/lib.rs                     |   6 +-
 frame/benchmarking/Cargo.toml                 |   2 +
 frame/benchmarking/src/lib.rs                 |  12 +-
 frame/collective/Cargo.toml                   |   2 +
 frame/collective/src/lib.rs                   |  23 +-
 frame/contracts/Cargo.toml                    |   2 +
 frame/contracts/src/rent.rs                   |   6 +-
 frame/contracts/src/storage.rs                |   4 +-
 .../election-provider-multi-phase/Cargo.toml  |   3 +
 .../src/helpers.rs                            |   6 +-
 frame/elections-phragmen/Cargo.toml           |   2 +
 frame/elections-phragmen/src/lib.rs           |  11 +-
 .../src/migrations_3_0_0.rs                   |  29 +-
 frame/example-offchain-worker/Cargo.toml      |   2 +
 frame/example-offchain-worker/src/lib.rs      |  33 ++-
 frame/executive/src/lib.rs                    |   4 -
 frame/grandpa/Cargo.toml                      |   2 +
 frame/grandpa/src/equivocation.rs             |  20 +-
 frame/im-online/Cargo.toml                    |   2 +
 frame/im-online/src/lib.rs                    |  14 +-
 .../primitives/Cargo.toml                     |   2 +
 .../primitives/src/lib.rs                     |  16 +-
 frame/node-authorization/Cargo.toml           |   2 +
 frame/node-authorization/src/lib.rs           |  16 +-
 frame/offences/Cargo.toml                     |   2 +
 frame/offences/src/lib.rs                     |  11 +-
 frame/scheduler/Cargo.toml                    |   4 +-
 frame/scheduler/src/lib.rs                    |  13 +-
 frame/staking/Cargo.toml                      |   2 +
 frame/staking/src/lib.rs                      |  28 +-
 frame/support/Cargo.toml                      |   7 +-
 frame/support/src/debug.rs                    | 247 ------------------
 frame/support/src/dispatch.rs                 |   4 +-
 frame/support/src/hash.rs                     |   4 +-
 frame/support/src/lib.rs                      |  30 ++-
 frame/support/src/storage/child.rs            |   6 +-
 .../src/storage/generator/double_map.rs       |   6 +-
 frame/support/src/storage/generator/map.rs    |   4 +-
 frame/support/src/storage/mod.rs              |  15 +-
 frame/support/src/storage/unhashed.rs         |   2 +-
 frame/system/Cargo.toml                       |   2 +
 frame/system/src/lib.rs                       |  17 +-
 frame/system/src/offchain.rs                  |   6 +-
 frame/timestamp/Cargo.toml                    |   4 +-
 frame/timestamp/src/lib.rs                    |   7 +-
 primitives/api/Cargo.toml                     |  13 +
 .../api/proc-macro/src/impl_runtime_apis.rs   |   3 +
 primitives/api/src/lib.rs                     |  19 ++
 primitives/api/test/Cargo.toml                |   2 +
 primitives/api/test/tests/runtime_calls.rs    |  31 +++
 primitives/runtime/Cargo.toml                 |   7 +-
 primitives/runtime/src/lib.rs                 |   1 +
 primitives/runtime/src/runtime_logger.rs      | 108 ++++++++
 test-utils/runtime/Cargo.toml                 |   6 +-
 test-utils/runtime/build.rs                   |  10 +-
 test-utils/runtime/client/src/lib.rs          |  10 +
 test-utils/runtime/src/lib.rs                 |  21 +-
 utils/wasm-builder/src/builder.rs             |  25 +-
 utils/wasm-builder/src/wasm_project.rs        |  37 ++-
 65 files changed, 571 insertions(+), 422 deletions(-)
 delete mode 100644 frame/support/src/debug.rs
 create mode 100644 primitives/runtime/src/runtime_logger.rs

diff --git a/Cargo.lock b/Cargo.lock
index 9660e11884c8..382d1fd102db 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1689,6 +1689,7 @@ dependencies = [
  "frame-system",
  "hex-literal",
  "linregress",
+ "log",
  "parity-scale-codec",
  "paste 1.0.4",
  "serde",
@@ -1769,7 +1770,6 @@ dependencies = [
  "pretty_assertions",
  "serde",
  "smallvec 1.6.1",
- "sp-api",
  "sp-arithmetic",
  "sp-core",
  "sp-inherents",
@@ -1779,7 +1779,6 @@ dependencies = [
  "sp-state-machine",
  "sp-std",
  "sp-tracing",
- "substrate-test-runtime-client",
 ]
 
 [[package]]
@@ -1840,6 +1839,7 @@ dependencies = [
  "criterion",
  "frame-support",
  "impl-trait-for-tuples",
+ "log",
  "parity-scale-codec",
  "serde",
  "sp-core",
@@ -4099,6 +4099,7 @@ dependencies = [
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
  "hex-literal",
+ "log",
  "node-primitives",
  "pallet-assets",
  "pallet-authority-discovery",
@@ -4525,6 +4526,7 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "log",
  "pallet-authorship",
  "pallet-balances",
  "pallet-offences",
@@ -4554,6 +4556,7 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "log",
  "pallet-transaction-payment",
  "parity-scale-codec",
  "serde",
@@ -4589,6 +4592,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "hex-literal",
+ "log",
  "pallet-balances",
  "parity-scale-codec",
  "serde",
@@ -4607,6 +4611,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "hex-literal",
+ "log",
  "pallet-balances",
  "pallet-contracts-primitives",
  "pallet-contracts-proc-macro",
@@ -4706,6 +4711,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "hex-literal",
+ "log",
  "pallet-balances",
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -4748,6 +4754,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "hex-literal",
+ "log",
  "pallet-balances",
  "parity-scale-codec",
  "serde",
@@ -4782,6 +4789,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "lite-json",
+ "log",
  "parity-scale-codec",
  "serde",
  "sp-core",
@@ -4831,6 +4839,7 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "log",
  "pallet-authorship",
  "pallet-balances",
  "pallet-offences",
@@ -4876,6 +4885,7 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "log",
  "pallet-authorship",
  "pallet-session",
  "parity-scale-codec",
@@ -4961,6 +4971,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "hex-literal",
+ "log",
  "parity-scale-codec",
  "serde",
  "sp-api",
@@ -5006,6 +5017,7 @@ version = "2.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
+ "log",
  "parity-scale-codec",
  "serde",
  "sp-core",
@@ -5020,6 +5032,7 @@ version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
+ "log",
  "pallet-balances",
  "parity-scale-codec",
  "serde",
@@ -5111,6 +5124,7 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "log",
  "parity-scale-codec",
  "serde",
  "sp-core",
@@ -5203,6 +5217,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "hex",
+ "log",
  "pallet-authorship",
  "pallet-balances",
  "pallet-session",
@@ -5295,6 +5310,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "impl-trait-for-tuples",
+ "log",
  "parity-scale-codec",
  "serde",
  "sp-core",
@@ -8256,6 +8272,7 @@ name = "sp-api"
 version = "3.0.0"
 dependencies = [
  "hash-db",
+ "log",
  "parity-scale-codec",
  "sp-api-proc-macro",
  "sp-core",
@@ -8283,6 +8300,7 @@ name = "sp-api-test"
 version = "2.0.1"
 dependencies = [
  "criterion",
+ "log",
  "parity-scale-codec",
  "rustversion",
  "sc-block-builder",
@@ -8292,6 +8310,7 @@ dependencies = [
  "sp-core",
  "sp-runtime",
  "sp-state-machine",
+ "sp-tracing",
  "sp-version",
  "substrate-test-runtime-client",
  "trybuild",
@@ -8736,12 +8755,15 @@ dependencies = [
  "rand 0.7.3",
  "serde",
  "serde_json",
+ "sp-api",
  "sp-application-crypto",
  "sp-arithmetic",
  "sp-core",
  "sp-io",
  "sp-state-machine",
  "sp-std",
+ "sp-tracing",
+ "substrate-test-runtime-client",
 ]
 
 [[package]]
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index 7669273f0c82..dc8ce8bace80 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -18,6 +18,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
 serde = { version = "1.0.102", optional = true }
 static_assertions = "1.1.0"
 hex-literal = { version = "0.3.1", optional = true }
+log = { version = "0.4.14", default-features = false }
 
 # primitives
 sp-authority-discovery = { version = "3.0.0", default-features = false, path = "../../../primitives/authority-discovery" }
@@ -156,6 +157,7 @@ std = [
 	"pallet-society/std",
 	"pallet-recovery/std",
 	"pallet-vesting/std",
+	"log/std",
 	"frame-try-runtime/std",
 ]
 runtime-benchmarks = [
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index a63fb341ddac..0219779ca535 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -25,7 +25,7 @@
 
 use sp_std::prelude::*;
 use frame_support::{
-	construct_runtime, parameter_types, debug, RuntimeDebug,
+	construct_runtime, parameter_types, RuntimeDebug,
 	weights::{
 		Weight, IdentityFee,
 		constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
@@ -845,7 +845,7 @@ impl<LocalCall> frame_system::offchain::CreateSignedTransaction<LocalCall> for R
 		);
 		let raw_payload = SignedPayload::new(call, extra)
 			.map_err(|e| {
-				debug::warn!("Unable to create signed payload: {:?}", e);
+				log::warn!("Unable to create signed payload: {:?}", e);
 			})
 			.ok()?;
 		let signature = raw_payload
diff --git a/frame/babe/Cargo.toml b/frame/babe/Cargo.toml
index 20ef87ab15b4..2d7467d82e5b 100644
--- a/frame/babe/Cargo.toml
+++ b/frame/babe/Cargo.toml
@@ -30,6 +30,7 @@ sp-session = { version = "3.0.0", default-features = false, path = "../../primit
 sp-staking = { version = "3.0.0", default-features = false, path = "../../primitives/staking" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 sp-timestamp = { version = "3.0.0", default-features = false, path = "../../primitives/timestamp" }
+log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
 pallet-balances = { version = "3.0.0", path = "../balances" }
@@ -59,6 +60,7 @@ std = [
 	"sp-staking/std",
 	"sp-std/std",
 	"sp-timestamp/std",
+	"log/std",
 ]
 runtime-benchmarks = ["frame-benchmarking"]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/babe/src/equivocation.rs b/frame/babe/src/equivocation.rs
index b7275d04734e..14ba0f16cb9e 100644
--- a/frame/babe/src/equivocation.rs
+++ b/frame/babe/src/equivocation.rs
@@ -35,10 +35,7 @@
 //! definition.
 //!
 
-use frame_support::{
-	debug,
-	traits::{Get, KeyOwnerProofSystem},
-};
+use frame_support::traits::{Get, KeyOwnerProofSystem};
 use sp_consensus_babe::{EquivocationProof, Slot};
 use sp_runtime::transaction_validity::{
 	InvalidTransaction, TransactionPriority, TransactionSource, TransactionValidity,
@@ -163,8 +160,15 @@ where
 		let call = Call::report_equivocation_unsigned(equivocation_proof, key_owner_proof);
 
 		match SubmitTransaction::<T, Call<T>>::submit_unsigned_transaction(call.into()) {
-			Ok(()) => debug::info!("Submitted BABE equivocation report."),
-			Err(e) => debug::error!("Error submitting equivocation report: {:?}", e),
+			Ok(()) => log::info!(
+				target: "runtime::babe",
+				"Submitted BABE equivocation report.",
+			),
+			Err(e) => log::error!(
+				target: "runtime::babe",
+				"Error submitting equivocation report: {:?}",
+				e,
+			),
 		}
 
 		Ok(())
@@ -186,9 +190,9 @@ impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
 			match source {
 				TransactionSource::Local | TransactionSource::InBlock => { /* allowed */ }
 				_ => {
-					debug::warn!(
-						target: "babe",
-						"rejecting unsigned report equivocation transaction because it is not local/in-block."
+					log::warn!(
+						target: "runtime::babe",
+						"rejecting unsigned report equivocation transaction because it is not local/in-block.",
 					);
 
 					return InvalidTransaction::Call.into();
diff --git a/frame/balances/Cargo.toml b/frame/balances/Cargo.toml
index 53bf4502708e..22c4ef0976f5 100644
--- a/frame/balances/Cargo.toml
+++ b/frame/balances/Cargo.toml
@@ -20,6 +20,7 @@ sp-runtime = { version = "3.0.0", default-features = false, path = "../../primit
 frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
 sp-io = { version = "3.0.0", path = "../../primitives/io" }
@@ -36,6 +37,7 @@ std = [
 	"frame-benchmarking/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
 ]
 runtime-benchmarks = ["frame-benchmarking"]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index cc82497293c8..cc7b6351c258 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -756,7 +756,8 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	/// Update the account entry for `who`, given the locks.
 	fn update_locks(who: &T::AccountId, locks: &[BalanceLock<T::Balance>]) {
 		if locks.len() as u32 > T::MaxLocks::get() {
-			frame_support::debug::warn!(
+			log::warn!(
+				target: "runtime::balances",
 				"Warning: A user has more currency locks than expected. \
 				A runtime configuration adjustment may be needed."
 			);
@@ -790,7 +791,8 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 					// No providers for the locks. This is impossible under normal circumstances
 					// since the funds that are under the lock will themselves be stored in the
 					// account and therefore will need a reference.
-					frame_support::debug::warn!(
+					log::warn!(
+						target: "runtime::balances",
 						"Warning: Attempt to introduce lock consumer reference, yet no providers. \
 						This is unexpected but should be safe."
 					);
diff --git a/frame/benchmarking/Cargo.toml b/frame/benchmarking/Cargo.toml
index b80b626801dc..3b20cf7dd048 100644
--- a/frame/benchmarking/Cargo.toml
+++ b/frame/benchmarking/Cargo.toml
@@ -24,6 +24,7 @@ sp-io = { version = "3.0.0", path = "../../primitives/io", default-features = fa
 sp-storage = { version = "3.0.0", path = "../../primitives/storage", default-features = false }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
 hex-literal = "0.3.1"
@@ -40,4 +41,5 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 	"linregress",
+	"log/std",
 ]
diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
index 5b137c3c1532..1ff8cc8e5762 100644
--- a/frame/benchmarking/src/lib.rs
+++ b/frame/benchmarking/src/lib.rs
@@ -29,10 +29,16 @@ pub use utils::*;
 pub use analysis::{Analysis, BenchmarkSelector, RegressionModel};
 #[doc(hidden)]
 pub use sp_io::storage::root as storage_root;
+#[doc(hidden)]
 pub use sp_runtime::traits::Zero;
+#[doc(hidden)]
 pub use frame_support;
+#[doc(hidden)]
 pub use paste;
+#[doc(hidden)]
 pub use sp_storage::TrackedStorageKey;
+#[doc(hidden)]
+pub use log;
 
 /// Construct pallet benchmarks for weighing dispatchables.
 ///
@@ -751,7 +757,7 @@ macro_rules! impl_benchmark {
 							closure_to_benchmark()?;
 						} else {
 							// Time the extrinsic logic.
-							frame_support::debug::trace!(
+							$crate::log::trace!(
 								target: "benchmark",
 								"Start Benchmark: {:?}", c
 							);
@@ -764,12 +770,12 @@ macro_rules! impl_benchmark {
 							let elapsed_extrinsic = finish_extrinsic - start_extrinsic;
 							// Commit the changes to get proper write count
 							$crate::benchmarking::commit_db();
-							frame_support::debug::trace!(
+							$crate::log::trace!(
 								target: "benchmark",
 								"End Benchmark: {} ns", elapsed_extrinsic
 							);
 							let read_write_count = $crate::benchmarking::read_write_count();
-							frame_support::debug::trace!(
+							$crate::log::trace!(
 								target: "benchmark",
 								"Read/Write Count {:?}", read_write_count
 							);
diff --git a/frame/collective/Cargo.toml b/frame/collective/Cargo.toml
index 5cff91499bf4..b8f825cc5293 100644
--- a/frame/collective/Cargo.toml
+++ b/frame/collective/Cargo.toml
@@ -22,6 +22,7 @@ sp-runtime = { version = "3.0.0", default-features = false, path = "../../primit
 frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
 hex-literal = "0.3.1"
@@ -38,6 +39,7 @@ std = [
 	"frame-support/std",
 	"sp-runtime/std",
 	"frame-system/std",
+	"log/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
diff --git a/frame/collective/src/lib.rs b/frame/collective/src/lib.rs
index 50beb8607d61..a8184b8dd528 100644
--- a/frame/collective/src/lib.rs
+++ b/frame/collective/src/lib.rs
@@ -49,7 +49,7 @@ use sp_runtime::{RuntimeDebug, traits::Hash};
 
 use frame_support::{
 	codec::{Decode, Encode},
-	debug, decl_error, decl_event, decl_module, decl_storage,
+	decl_error, decl_event, decl_module, decl_storage,
 	dispatch::{
 		DispatchError, DispatchResult, DispatchResultWithPostInfo, Dispatchable, Parameter,
 		PostDispatchInfo,
@@ -320,19 +320,21 @@ decl_module! {
 		) -> DispatchResultWithPostInfo {
 			ensure_root(origin)?;
 			if new_members.len() > T::MaxMembers::get() as usize {
-				debug::error!(
-					"New members count exceeds maximum amount of members expected. (expected: {}, actual: {})",
+				log::error!(
+					target: "runtime::collective",
+					"New members count ({}) exceeds maximum amount of members expected ({}).",
+					new_members.len(),
 					T::MaxMembers::get(),
-					new_members.len()
 				);
 			}
 
 			let old = Members::<T, I>::get();
 			if old.len() > old_count as usize {
-				debug::warn!(
-					"Wrong count used to estimate set_members weight. (expected: {}, actual: {})",
+				log::warn!(
+					target: "runtime::collective",
+					"Wrong count used to estimate set_members weight. expected ({}) vs actual ({})",
 					old_count,
-					old.len()
+					old.len(),
 				);
 			}
 			let mut new_members = new_members;
@@ -811,10 +813,11 @@ impl<T: Config<I>, I: Instance> ChangeMembers<T::AccountId> for Module<T, I> {
 		new: &[T::AccountId],
 	) {
 		if new.len() > T::MaxMembers::get() as usize {
-			debug::error!(
-				"New members count exceeds maximum amount of members expected. (expected: {}, actual: {})",
+			log::error!(
+				target: "runtime::collective",
+				"New members count ({}) exceeds maximum amount of members expected ({}).",
+				new.len(),
 				T::MaxMembers::get(),
-				new.len()
 			);
 		}
 		// remove accounts from all current voting in motions.
diff --git a/frame/contracts/Cargo.toml b/frame/contracts/Cargo.toml
index 2b0843a01d7c..018a8a5df672 100644
--- a/frame/contracts/Cargo.toml
+++ b/frame/contracts/Cargo.toml
@@ -28,6 +28,7 @@ sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 sp-sandbox = { version = "0.9.0", default-features = false, path = "../../primitives/sandbox" }
 wasmi-validation = { version = "0.3.0", default-features = false }
+log = { version = "0.4.14", default-features = false }
 
 # Only used in benchmarking to generate random contract code
 rand = { version = "0.7.0", optional = true, default-features = false }
@@ -60,6 +61,7 @@ std = [
 	"wasmi-validation/std",
 	"pallet-contracts-primitives/std",
 	"pallet-contracts-proc-macro/full",
+	"log/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
diff --git a/frame/contracts/src/rent.rs b/frame/contracts/src/rent.rs
index b9ba7185706f..e9befeee2d37 100644
--- a/frame/contracts/src/rent.rs
+++ b/frame/contracts/src/rent.rs
@@ -26,7 +26,6 @@ use sp_std::prelude::*;
 use sp_io::hashing::blake2_256;
 use sp_core::crypto::UncheckedFrom;
 use frame_support::{
-	debug,
 	storage::child,
 	traits::{Currency, ExistenceRequirement, Get, OnUnbalanced, WithdrawReasons},
 };
@@ -183,9 +182,10 @@ where
 				// accidental loss of a contract. Ony `seal_terminate` can remove a
 				// contract without a tombstone. Therefore this case should be never
 				// hit.
-				debug::error!(
+				log::error!(
+					target: "runtime::contracts",
 					"Tombstoned a contract that is below the subsistence threshold: {:?}",
-					account
+					account,
 				);
 				0u32.into()
 			}
diff --git a/frame/contracts/src/storage.rs b/frame/contracts/src/storage.rs
index dbf993bc3bc0..5b9e7c1f583c 100644
--- a/frame/contracts/src/storage.rs
+++ b/frame/contracts/src/storage.rs
@@ -31,7 +31,6 @@ use sp_runtime::traits::{Bounded, Saturating, Zero};
 use sp_core::crypto::UncheckedFrom;
 use frame_support::{
 	dispatch::DispatchResult,
-	debug,
 	storage::child::{self, KillChildStorageResult},
 	traits::Get,
 	weights::Weight,
@@ -271,7 +270,8 @@ where
 				match outcome {
 					// This should not happen as our budget was large enough to remove all keys.
 					KillChildStorageResult::SomeRemaining(_) => {
-						debug::error!(
+						log::error!(
+							target: "runtime::contracts",
 							"After deletion keys are remaining in this child trie: {:?}",
 							removed.trie_id,
 						);
diff --git a/frame/election-provider-multi-phase/Cargo.toml b/frame/election-provider-multi-phase/Cargo.toml
index a7db8d55465e..1d63f9df40a2 100644
--- a/frame/election-provider-multi-phase/Cargo.toml
+++ b/frame/election-provider-multi-phase/Cargo.toml
@@ -16,6 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 static_assertions = "1.1.0"
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+log = { version = "0.4.14", default-features = false }
 
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
@@ -49,6 +50,7 @@ default = ["std"]
 std = [
 	"serde",
 	"codec/std",
+	"log/std",
 
 	"frame-support/std",
 	"frame-system/std",
@@ -59,6 +61,7 @@ std = [
 	"sp-npos-elections/std",
 	"sp-arithmetic/std",
 	"sp-election-providers/std",
+	"log/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
diff --git a/frame/election-provider-multi-phase/src/helpers.rs b/frame/election-provider-multi-phase/src/helpers.rs
index be074594e660..7375ce017f20 100644
--- a/frame/election-provider-multi-phase/src/helpers.rs
+++ b/frame/election-provider-multi-phase/src/helpers.rs
@@ -22,10 +22,10 @@ use sp_std::{collections::btree_map::BTreeMap, convert::TryInto, boxed::Box, pre
 
 #[macro_export]
 macro_rules! log {
-	($level:tt, $patter:expr $(, $values:expr)* $(,)?) => {
-		frame_support::debug::$level!(
+	($level:tt, $pattern:expr $(, $values:expr)* $(,)?) => {
+		log::$level!(
 			target: $crate::LOG_TARGET,
-			concat!("🗳 ", $patter) $(, $values)*
+			concat!("🗳 ", $pattern) $(, $values)*
 		)
 	};
 }
diff --git a/frame/elections-phragmen/Cargo.toml b/frame/elections-phragmen/Cargo.toml
index 6d7e18bd766c..89723cb85fbe 100644
--- a/frame/elections-phragmen/Cargo.toml
+++ b/frame/elections-phragmen/Cargo.toml
@@ -21,6 +21,7 @@ frame-support = { version = "3.0.0", default-features = false, path = "../suppor
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
+log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
 sp-io = { version = "3.0.0", path = "../../primitives/io" }
@@ -39,6 +40,7 @@ std = [
 	"sp-npos-elections/std",
 	"frame-system/std",
 	"sp-std/std",
+	"log/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index 057e9f181c7a..d4676e98b823 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -704,8 +704,9 @@ impl<T: Config> Module<T> {
 				} else {
 					// overlap. This can never happen. If so, it seems like our intended replacement
 					// is already a member, so not much more to do.
-					frame_support::debug::error!(
-						"pallet-elections-phragmen: a member seems to also be a runner-up."
+					log::error!(
+						target: "runtime::elections-phragmen",
+						"A member seems to also be a runner-up.",
 					);
 				}
 				next_best
@@ -998,7 +999,11 @@ impl<T: Config> Module<T> {
 			Self::deposit_event(RawEvent::NewTerm(new_members_sorted_by_id));
 			ElectionRounds::mutate(|v| *v += 1);
 		}).map_err(|e| {
-			frame_support::debug::error!("elections-phragmen: failed to run election [{:?}].", e);
+			log::error!(
+				target: "runtime::elections-phragmen",
+				"Failed to run election [{:?}].",
+				e,
+			);
 			Self::deposit_event(RawEvent::ElectionError);
 		});
 
diff --git a/frame/elections-phragmen/src/migrations_3_0_0.rs b/frame/elections-phragmen/src/migrations_3_0_0.rs
index 0737a12207c1..8adc4c1a69f7 100644
--- a/frame/elections-phragmen/src/migrations_3_0_0.rs
+++ b/frame/elections-phragmen/src/migrations_3_0_0.rs
@@ -95,9 +95,10 @@ type Voting<T: V2ToV3> = StorageMap<__Voting, Twox64Concat, T::AccountId, Voter<
 /// with care and run at your own risk.
 pub fn apply<T: V2ToV3>(old_voter_bond: T::Balance, old_candidacy_bond: T::Balance) -> Weight {
 	let maybe_storage_version = <T::Module as GetPalletVersion>::storage_version();
-	frame_support::debug::info!(
+	log::info!(
+		target: "runtime::elections-phragmen",
 		"Running migration for elections-phragmen with storage version {:?}",
-		maybe_storage_version
+		maybe_storage_version,
 	);
 	match maybe_storage_version {
 		Some(storage_version) if storage_version <= PalletVersion::new(2, 0, 0) => {
@@ -108,9 +109,10 @@ pub fn apply<T: V2ToV3>(old_voter_bond: T::Balance, old_candidacy_bond: T::Balan
 			Weight::max_value()
 		}
 		_ => {
-			frame_support::debug::warn!(
+			log::warn!(
+				target: "runtime::elections-phragmen",
 				"Attempted to apply migration to V3 but failed because storage version is {:?}",
-				maybe_storage_version
+				maybe_storage_version,
 			);
 			0
 		},
@@ -129,7 +131,8 @@ pub fn migrate_voters_to_recorded_deposit<T: V2ToV3>(old_deposit: T::Balance) {
 		},
 	);
 
-	frame_support::debug::info!(
+	log::info!(
+		target: "runtime::elections-phragmen",
 		"migrated {} voter accounts.",
 		<Voting<T>>::iter().count(),
 	);
@@ -140,9 +143,10 @@ pub fn migrate_candidates_to_recorded_deposit<T: V2ToV3>(old_deposit: T::Balance
 	let _ = <Candidates<T>>::translate::<Vec<T::AccountId>, _>(
 		|maybe_old_candidates| {
 			maybe_old_candidates.map(|old_candidates| {
-				frame_support::debug::info!(
+				log::info!(
+					target: "runtime::elections-phragmen",
 					"migrated {} candidate accounts.",
-					old_candidates.len()
+					old_candidates.len(),
 				);
 				old_candidates
 					.into_iter()
@@ -158,7 +162,11 @@ pub fn migrate_members_to_recorded_deposit<T: V2ToV3>(old_deposit: T::Balance) {
 	let _ = <Members<T>>::translate::<Vec<(T::AccountId, T::Balance)>, _>(
 		|maybe_old_members| {
 			maybe_old_members.map(|old_members| {
-				frame_support::debug::info!("migrated {} member accounts.", old_members.len());
+				log::info!(
+					target: "runtime::elections-phragmen",
+					"migrated {} member accounts.",
+					old_members.len(),
+				);
 				old_members
 					.into_iter()
 					.map(|(who, stake)| SeatHolder {
@@ -177,9 +185,10 @@ pub fn migrate_runners_up_to_recorded_deposit<T: V2ToV3>(old_deposit: T::Balance
 	let _ = <RunnersUp<T>>::translate::<Vec<(T::AccountId, T::Balance)>, _>(
 		|maybe_old_runners_up| {
 			maybe_old_runners_up.map(|old_runners_up| {
-				frame_support::debug::info!(
+				log::info!(
+					target: "runtime::elections-phragmen",
 					"migrated {} runner-up accounts.",
-					old_runners_up.len()
+					old_runners_up.len(),
 				);
 				old_runners_up
 					.into_iter()
diff --git a/frame/example-offchain-worker/Cargo.toml b/frame/example-offchain-worker/Cargo.toml
index cf4b3beaa904..3718da643da6 100644
--- a/frame/example-offchain-worker/Cargo.toml
+++ b/frame/example-offchain-worker/Cargo.toml
@@ -23,6 +23,7 @@ sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 lite-json = { version = "0.1", default-features = false }
+log = { version = "0.4.14", default-features = false }
 
 [features]
 default = ["std"]
@@ -37,5 +38,6 @@ std = [
 	"sp-keystore",
 	"sp-runtime/std",
 	"sp-std/std",
+	"log/std",
 ]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/example-offchain-worker/src/lib.rs b/frame/example-offchain-worker/src/lib.rs
index 0c5e92a96e6a..a3c1441e1367 100644
--- a/frame/example-offchain-worker/src/lib.rs
+++ b/frame/example-offchain-worker/src/lib.rs
@@ -49,7 +49,7 @@ use frame_system::{
 		SignedPayload, SigningTypes, Signer, SubmitTransaction,
 	}
 };
-use frame_support::{debug, traits::Get};
+use frame_support::traits::Get;
 use sp_core::crypto::KeyTypeId;
 use sp_runtime::{
 	RuntimeDebug,
@@ -153,28 +153,25 @@ pub mod pallet {
 		/// so the code should be able to handle that.
 		/// You can use `Local Storage` API to coordinate runs of the worker.
 		fn offchain_worker(block_number: T::BlockNumber) {
-			// It's a good idea to add logs to your offchain workers.
-			// Using the `frame_support::debug` module you have access to the same API exposed by
-			// the `log` crate.
 			// Note that having logs compiled to WASM may cause the size of the blob to increase
 			// significantly. You can use `RuntimeDebug` custom derive to hide details of the types
-			// in WASM or use `debug::native` namespace to produce logs only when the worker is
-			// running natively.
-			debug::native::info!("Hello World from offchain workers!");
+			// in WASM. The `sp-api` crate also provides a feature `disable-logging` to disable
+			// all logging and thus, remove any logging from the WASM.
+			log::info!("Hello World from offchain workers!");
 
 			// Since off-chain workers are just part of the runtime code, they have direct access
 			// to the storage and other included pallets.
 			//
 			// We can easily import `frame_system` and retrieve a block hash of the parent block.
 			let parent_hash = <system::Pallet<T>>::block_hash(block_number - 1u32.into());
-			debug::debug!("Current block: {:?} (parent hash: {:?})", block_number, parent_hash);
+			log::debug!("Current block: {:?} (parent hash: {:?})", block_number, parent_hash);
 
 			// It's a good practice to keep `fn offchain_worker()` function minimal, and move most
 			// of the code to separate `impl` block.
 			// Here we call a helper function to calculate current average price.
 			// This function reads storage entries of the current state.
 			let average: Option<u32> = Self::average_price();
-			debug::debug!("Current price: {:?}", average);
+			log::debug!("Current price: {:?}", average);
 
 			// For this example we are going to send both signed and unsigned transactions
 			// depending on the block number.
@@ -188,7 +185,7 @@ pub mod pallet {
 				TransactionType::None => Ok(()),
 			};
 			if let Err(e) = res {
-				debug::error!("Error: {}", e);
+				log::error!("Error: {}", e);
 			}
 		}
 	}
@@ -446,8 +443,8 @@ impl<T: Config> Pallet<T> {
 
 		for (acc, res) in &results {
 			match res {
-				Ok(()) => debug::info!("[{:?}] Submitted price of {} cents", acc.id, price),
-				Err(e) => debug::error!("[{:?}] Failed to submit transaction: {:?}", acc.id, e),
+				Ok(()) => log::info!("[{:?}] Submitted price of {} cents", acc.id, price),
+				Err(e) => log::error!("[{:?}] Failed to submit transaction: {:?}", acc.id, e),
 			}
 		}
 
@@ -582,7 +579,7 @@ impl<T: Config> Pallet<T> {
 			.map_err(|_| http::Error::DeadlineReached)??;
 		// Let's check the status code before we proceed to reading the response.
 		if response.code != 200 {
-			debug::warn!("Unexpected status code: {}", response.code);
+			log::warn!("Unexpected status code: {}", response.code);
 			return Err(http::Error::Unknown);
 		}
 
@@ -593,19 +590,19 @@ impl<T: Config> Pallet<T> {
 
 		// Create a str slice from the body.
 		let body_str = sp_std::str::from_utf8(&body).map_err(|_| {
-			debug::warn!("No UTF8 body");
+			log::warn!("No UTF8 body");
 			http::Error::Unknown
 		})?;
 
 		let price = match Self::parse_price(body_str) {
 			Some(price) => Ok(price),
 			None => {
-				debug::warn!("Unable to extract price from the response: {:?}", body_str);
+				log::warn!("Unable to extract price from the response: {:?}", body_str);
 				Err(http::Error::Unknown)
 			}
 		}?;
 
-		debug::warn!("Got price: {} cents", price);
+		log::warn!("Got price: {} cents", price);
 
 		Ok(price)
 	}
@@ -634,7 +631,7 @@ impl<T: Config> Pallet<T> {
 
 	/// Add new price to the list.
 	fn add_price(who: T::AccountId, price: u32) {
-		debug::info!("Adding to the average: {}", price);
+		log::info!("Adding to the average: {}", price);
 		<Prices<T>>::mutate(|prices| {
 			const MAX_LEN: usize = 64;
 
@@ -647,7 +644,7 @@ impl<T: Config> Pallet<T> {
 
 		let average = Self::average_price()
 			.expect("The average is not empty, because it was just mutated; qed");
-		debug::info!("Current average price is: {}", average);
+		log::info!("Current average price is: {}", average);
 		// here we are raising the NewPrice event
 		Self::deposit_event(Event::NewPrice(price, who));
 	}
diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index 924adea95fd0..53353c224a8b 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -491,10 +491,6 @@ where
 		// as well.
 		frame_system::BlockHash::<System>::insert(header.number(), header.hash());
 
-		// Initialize logger, so the log messages are visible
-		// also when running WASM.
-		frame_support::debug::RuntimeLogger::init();
-
 		<AllModules as OffchainWorker<System::BlockNumber>>::offchain_worker(*header.number())
 	}
 }
diff --git a/frame/grandpa/Cargo.toml b/frame/grandpa/Cargo.toml
index 1bf7561bb20e..2bf7306f58e1 100644
--- a/frame/grandpa/Cargo.toml
+++ b/frame/grandpa/Cargo.toml
@@ -27,6 +27,7 @@ frame-support = { version = "3.0.0", default-features = false, path = "../suppor
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 pallet-authorship = { version = "3.0.0", default-features = false, path = "../authorship" }
 pallet-session = { version = "3.0.0", default-features = false, path = "../session" }
+log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
 frame-benchmarking = { version = "3.1.0", path = "../benchmarking" }
@@ -57,6 +58,7 @@ std = [
 	"frame-system/std",
 	"pallet-authorship/std",
 	"pallet-session/std",
+	"log/std",
 ]
 runtime-benchmarks = ["frame-benchmarking"]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/grandpa/src/equivocation.rs b/frame/grandpa/src/equivocation.rs
index b8bff59d3920..37496fdeb859 100644
--- a/frame/grandpa/src/equivocation.rs
+++ b/frame/grandpa/src/equivocation.rs
@@ -40,10 +40,7 @@
 use sp_std::prelude::*;
 
 use codec::{self as codec, Decode, Encode};
-use frame_support::{
-	debug,
-	traits::{Get, KeyOwnerProofSystem},
-};
+use frame_support::traits::{Get, KeyOwnerProofSystem};
 use sp_finality_grandpa::{EquivocationProof, RoundNumber, SetId};
 use sp_runtime::{
 	transaction_validity::{
@@ -174,8 +171,15 @@ where
 		let call = Call::report_equivocation_unsigned(equivocation_proof, key_owner_proof);
 
 		match SubmitTransaction::<T, Call<T>>::submit_unsigned_transaction(call.into()) {
-			Ok(()) => debug::info!("Submitted GRANDPA equivocation report."),
-			Err(e) => debug::error!("Error submitting equivocation report: {:?}", e),
+			Ok(()) => log::info!(
+				target: "runtime::afg",
+				"Submitted GRANDPA equivocation report.",
+			),
+			Err(e) => log::error!(
+				target: "runtime::afg",
+				"Error submitting equivocation report: {:?}",
+				e,
+			),
 		}
 
 		Ok(())
@@ -207,8 +211,8 @@ impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
 			match source {
 				TransactionSource::Local | TransactionSource::InBlock => { /* allowed */ }
 				_ => {
-					debug::warn!(
-						target: "afg",
+					log::warn!(
+						target: "runtime::afg",
 						"rejecting unsigned report equivocation transaction because it is not local/in-block."
 					);
 
diff --git a/frame/im-online/Cargo.toml b/frame/im-online/Cargo.toml
index efe01a6a6f5a..4c5b4a8863bc 100644
--- a/frame/im-online/Cargo.toml
+++ b/frame/im-online/Cargo.toml
@@ -24,6 +24,7 @@ sp-runtime = { version = "3.0.0", default-features = false, path = "../../primit
 sp-staking = { version = "3.0.0", default-features = false, path = "../../primitives/staking" }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+log = { version = "0.4.14", default-features = false }
 
 frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 
@@ -44,6 +45,7 @@ std = [
 	"sp-staking/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
 ]
 runtime-benchmarks = ["frame-benchmarking"]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/im-online/src/lib.rs b/frame/im-online/src/lib.rs
index bd597acfb1ed..f0df19d6ab9f 100644
--- a/frame/im-online/src/lib.rs
+++ b/frame/im-online/src/lib.rs
@@ -93,7 +93,7 @@ use sp_staking::{
 	offence::{ReportOffence, Offence, Kind},
 };
 use frame_support::{
-	decl_module, decl_event, decl_storage, Parameter, debug, decl_error,
+	decl_module, decl_event, decl_storage, Parameter, decl_error,
 	traits::{Get, ValidatorSet, ValidatorSetWithIdentification, OneSessionHandler},
 };
 use frame_system::ensure_none;
@@ -388,8 +388,8 @@ decl_module! {
 			if sp_io::offchain::is_validator() {
 				for res in Self::send_heartbeats(now).into_iter().flatten() {
 					if let Err(e) = res {
-						debug::debug!(
-							target: "imonline",
+						log::debug!(
+							target: "runtime::im-online",
 							"Skipping heartbeat at {:?}: {:?}",
 							now,
 							e,
@@ -397,8 +397,8 @@ decl_module! {
 					}
 				}
 			} else {
-				debug::trace!(
-					target: "imonline",
+				log::trace!(
+					target: "runtime::im-online",
 					"Skipping heartbeat at {:?}. Not a validator.",
 					now,
 				)
@@ -529,8 +529,8 @@ impl<T: Config> Module<T> {
 			block_number,
 			|| {
 				let call = prepare_heartbeat()?;
-				debug::info!(
-					target: "imonline",
+				log::info!(
+					target: "runtime::im-online",
 					"[index: {:?}] Reporting im-online at block: {:?} (session: {:?}): {:?}",
 					authority_index,
 					block_number,
diff --git a/frame/merkle-mountain-range/primitives/Cargo.toml b/frame/merkle-mountain-range/primitives/Cargo.toml
index be0a8bdc3a2b..62a6f4ff1cde 100644
--- a/frame/merkle-mountain-range/primitives/Cargo.toml
+++ b/frame/merkle-mountain-range/primitives/Cargo.toml
@@ -20,6 +20,7 @@ sp-api = { version = "3.0.0", default-features = false, path = "../../../primiti
 sp-core = { version = "3.0.0", default-features = false, path = "../../../primitives/core" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../../primitives/std" }
+log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
 hex-literal = "0.3"
@@ -35,4 +36,5 @@ std = [
 	"sp-core/std",
 	"sp-runtime/std",
 	"sp-std/std",
+	"log/std",
 ]
diff --git a/frame/merkle-mountain-range/primitives/src/lib.rs b/frame/merkle-mountain-range/primitives/src/lib.rs
index d57f8565b608..f1ee15b48b3f 100644
--- a/frame/merkle-mountain-range/primitives/src/lib.rs
+++ b/frame/merkle-mountain-range/primitives/src/lib.rs
@@ -20,7 +20,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 #![warn(missing_docs)]
 
-use frame_support::{RuntimeDebug, debug};
+use frame_support::RuntimeDebug;
 use sp_runtime::traits::{self, Saturating, One};
 use sp_std::fmt;
 #[cfg(not(feature = "std"))]
@@ -307,13 +307,23 @@ impl Error {
 	#![allow(unused_variables)]
 	/// Consume given error `e` with `self` and generate a native log entry with error details.
 	pub fn log_error(self, e: impl fmt::Debug) -> Self {
-		debug::native::error!("[{:?}] MMR error: {:?}", self, e);
+		log::error!(
+			target: "runtime::mmr",
+			"[{:?}] MMR error: {:?}",
+			self,
+			e,
+		);
 		self
 	}
 
 	/// Consume given error `e` with `self` and generate a native log entry with error details.
 	pub fn log_debug(self, e: impl fmt::Debug) -> Self {
-		debug::native::debug!("[{:?}] MMR error: {:?}", self, e);
+		log::debug!(
+			target: "runtime::mmr",
+			"[{:?}] MMR error: {:?}",
+			self,
+			e,
+		);
 		self
 	}
 }
diff --git a/frame/node-authorization/Cargo.toml b/frame/node-authorization/Cargo.toml
index b76976d831c9..245db9176f74 100644
--- a/frame/node-authorization/Cargo.toml
+++ b/frame/node-authorization/Cargo.toml
@@ -20,6 +20,7 @@ sp-core = { version = "3.0.0", default-features = false, path = "../../primitive
 sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+log = { version = "0.4.14", default-features = false }
 
 [features]
 default = ["std"]
@@ -32,5 +33,6 @@ std = [
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
+	"log/std",
 ]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/node-authorization/src/lib.rs b/frame/node-authorization/src/lib.rs
index f1f70e9eacd4..090be2849263 100644
--- a/frame/node-authorization/src/lib.rs
+++ b/frame/node-authorization/src/lib.rs
@@ -46,9 +46,7 @@ use sp_std::{
 use codec::Decode;
 use frame_support::{
 	decl_module, decl_storage, decl_event, decl_error,
-	debug, ensure,
-	weights::{DispatchClass, Weight},
-	traits::{Get, EnsureOrigin},
+	ensure, weights::{DispatchClass, Weight}, traits::{Get, EnsureOrigin},
 };
 use frame_system::ensure_signed;
 
@@ -387,11 +385,19 @@ decl_module! {
 		fn offchain_worker(now: T::BlockNumber) {
 			let network_state = sp_io::offchain::network_state();
 			match network_state {
-				Err(_) => debug::error!("Error: failed to get network state of node at {:?}", now),
+				Err(_) => log::error!(
+					target: "runtime::node-authorization",
+					"Error: failed to get network state of node at {:?}",
+					now,
+				),
 				Ok(state) => {
 					let encoded_peer = state.peer_id.0;
 					match Decode::decode(&mut &encoded_peer[..]) {
-						Err(_) => debug::error!("Error: failed to decode PeerId at {:?}", now),
+						Err(_) => log::error!(
+							target: "runtime::node-authorization",
+							"Error: failed to decode PeerId at {:?}",
+							now,
+						),
 						Ok(node) => sp_io::offchain::set_authorized_nodes(
 							Self::get_authorized_nodes(&PeerId(node)),
 							true
diff --git a/frame/offences/Cargo.toml b/frame/offences/Cargo.toml
index cbf779df8474..a34c5f6bc3a3 100644
--- a/frame/offences/Cargo.toml
+++ b/frame/offences/Cargo.toml
@@ -21,6 +21,7 @@ sp-runtime = { version = "3.0.0", default-features = false, path = "../../primit
 sp-staking = { version = "3.0.0", default-features = false, path = "../../primitives/staking" }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
 sp-io = { version = "3.0.0", path = "../../primitives/io" }
@@ -37,6 +38,7 @@ std = [
 	"sp-staking/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
 ]
 runtime-benchmarks = []
 try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/offences/src/lib.rs b/frame/offences/src/lib.rs
index 5c1247853da1..2765c0aaa0ea 100644
--- a/frame/offences/src/lib.rs
+++ b/frame/offences/src/lib.rs
@@ -27,9 +27,7 @@ mod tests;
 
 use sp_std::vec::Vec;
 use frame_support::{
-	decl_module, decl_event, decl_storage, Parameter, debug,
-	traits::Get,
-	weights::Weight,
+	decl_module, decl_event, decl_storage, Parameter, traits::Get, weights::Weight,
 };
 use sp_runtime::{traits::{Hash, Zero}, Perbill};
 use sp_staking::{
@@ -141,9 +139,10 @@ decl_module! {
 								false
 							},
 							Err(_) => {
-								debug::native::error!(
-									target: "pallet-offences",
-									"re-submitting a deferred slash returned Err at {}. This should not happen with pallet-staking",
+								log::error!(
+									target: "runtime::offences",
+									"re-submitting a deferred slash returned Err at {:?}. \
+									 This should not happen with pallet-staking",
 									now,
 								);
 								true
diff --git a/frame/scheduler/Cargo.toml b/frame/scheduler/Cargo.toml
index a5e00c344402..4d82133b6af9 100644
--- a/frame/scheduler/Cargo.toml
+++ b/frame/scheduler/Cargo.toml
@@ -17,6 +17,7 @@ frame-system = { version = "3.0.0", default-features = false, path = "../system"
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
+log = { version = "0.4.14", default-features = false }
 
 frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 
@@ -34,7 +35,8 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 	"sp-io/std",
-	"sp-std/std"
+	"sp-std/std",
+	"log/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
diff --git a/frame/scheduler/src/lib.rs b/frame/scheduler/src/lib.rs
index a869fae27d8b..5cab10b0aff3 100644
--- a/frame/scheduler/src/lib.rs
+++ b/frame/scheduler/src/lib.rs
@@ -333,7 +333,8 @@ decl_module! {
 				.filter_map(|(index, s)| s.map(|inner| (index as u32, inner)))
 				.collect::<Vec<_>>();
 			if queued.len() as u32 > T::MaxScheduledPerBlock::get() {
-				frame_support::debug::warn!(
+				log::warn!(
+					target: "runtime::scheduler",
 					"Warning: This block has more items queued in Scheduler than \
 					expected from the runtime configuration. An update might be needed."
 				);
@@ -500,9 +501,10 @@ impl<T: Config> Module<T> {
 		Agenda::<T>::append(when, s);
 		let index = Agenda::<T>::decode_len(when).unwrap_or(1) as u32 - 1;
 		if index > T::MaxScheduledPerBlock::get() {
-			frame_support::debug::warn!(
+			log::warn!(
+				target: "runtime::scheduler",
 				"Warning: There are more items queued in the Scheduler than \
-				expected from the runtime configuration. An update might be needed."
+				expected from the runtime configuration. An update might be needed.",
 			);
 		}
 		Self::deposit_event(RawEvent::Scheduled(when, index));
@@ -590,9 +592,10 @@ impl<T: Config> Module<T> {
 		Agenda::<T>::append(when, Some(s));
 		let index = Agenda::<T>::decode_len(when).unwrap_or(1) as u32 - 1;
 		if index > T::MaxScheduledPerBlock::get() {
-			frame_support::debug::warn!(
+			log::warn!(
+				target: "runtime::scheduler",
 				"Warning: There are more items queued in the Scheduler than \
-				expected from the runtime configuration. An update might be needed."
+				expected from the runtime configuration. An update might be needed.",
 			);
 		}
 		let address = (when, index);
diff --git a/frame/staking/Cargo.toml b/frame/staking/Cargo.toml
index 8d95e2d48b2c..1f9f29570a22 100644
--- a/frame/staking/Cargo.toml
+++ b/frame/staking/Cargo.toml
@@ -27,6 +27,7 @@ frame-system = { version = "3.0.0", default-features = false, path = "../system"
 pallet-session = { version = "3.0.0", default-features = false, features = ["historical"], path = "../session" }
 pallet-authorship = { version = "3.0.0", default-features = false, path = "../authorship" }
 sp-application-crypto = { version = "3.0.0", default-features = false, path = "../../primitives/application-crypto" }
+log = { version = "0.4.14", default-features = false }
 sp-election-providers = { version = "3.0.0", default-features = false, path = "../../primitives/election-providers" }
 
 # Optional imports for benchmarking
@@ -62,6 +63,7 @@ std = [
 	"frame-system/std",
 	"pallet-authorship/std",
 	"sp-application-crypto/std",
+	"log/std",
 	"sp-election-providers/std",
 ]
 runtime-benchmarks = [
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index a74b2d55233e..ed8a2efbd45a 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -335,13 +335,13 @@ use sp_election_providers::ElectionProvider;
 pub use weights::WeightInfo;
 
 const STAKING_ID: LockIdentifier = *b"staking ";
-pub(crate) const LOG_TARGET: &'static str = "staking";
+pub(crate) const LOG_TARGET: &'static str = "runtime::staking";
 
 // syntactic sugar for logging.
 #[macro_export]
 macro_rules! log {
 	($level:tt, $patter:expr $(, $values:expr)* $(,)?) => {
-		frame_support::debug::$level!(
+		log::$level!(
 			target: crate::LOG_TARGET,
 			concat!("💸 ", $patter) $(, $values)*
 		)
@@ -3404,30 +3404,30 @@ impl<T: Config> sp_election_providers::ElectionDataProvider<T::AccountId, T::Blo
 /// some session can lag in between the newest session planned and the latest session started.
 impl<T: Config> pallet_session::SessionManager<T::AccountId> for Module<T> {
 	fn new_session(new_index: SessionIndex) -> Option<Vec<T::AccountId>> {
-		frame_support::debug::native::trace!(
-			target: LOG_TARGET,
-			"[{}] planning new_session({})",
+		log!(
+			trace,
+			"[{:?}] planning new_session({})",
 			<frame_system::Module<T>>::block_number(),
-			new_index
+			new_index,
 		);
 		CurrentPlannedSession::put(new_index);
 		Self::new_session(new_index)
 	}
 	fn start_session(start_index: SessionIndex) {
-		frame_support::debug::native::trace!(
-			target: LOG_TARGET,
-			"[{}] starting start_session({})",
+		log!(
+			trace,
+			"[{:?}] starting start_session({})",
 			<frame_system::Module<T>>::block_number(),
-			start_index
+			start_index,
 		);
 		Self::start_session(start_index)
 	}
 	fn end_session(end_index: SessionIndex) {
-		frame_support::debug::native::trace!(
-			target: LOG_TARGET,
-			"[{}] ending end_session({})",
+		log!(
+			trace,
+			"[{:?}] ending end_session({})",
 			<frame_system::Module<T>>::block_number(),
-			end_index
+			end_index,
 		);
 		Self::end_session(end_index)
 	}
diff --git a/frame/support/Cargo.toml b/frame/support/Cargo.toml
index b77907721be2..7b1179122b97 100644
--- a/frame/support/Cargo.toml
+++ b/frame/support/Cargo.toml
@@ -13,7 +13,6 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-log = "0.4"
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 frame-metadata = { version = "13.0.0", default-features = false, path = "../metadata" }
@@ -32,13 +31,12 @@ sp-state-machine = { version = "0.9.0", optional = true, path = "../../primitive
 bitflags = "1.2"
 impl-trait-for-tuples = "0.2.1"
 smallvec = "1.4.1"
+log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
 pretty_assertions = "0.6.1"
 frame-system = { version = "3.0.0", path = "../system" }
 parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
-substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
-sp-api = { version = "3.0.0", default-features = false, path = "../../primitives/api" }
 
 [features]
 default = ["std"]
@@ -56,8 +54,7 @@ std = [
 	"sp-staking/std",
 	"sp-state-machine",
 	"frame-support-procedural/std",
+	"log/std",
 ]
-nightly = []
-strict = []
 runtime-benchmarks = []
 try-runtime = []
diff --git a/frame/support/src/debug.rs b/frame/support/src/debug.rs
deleted file mode 100644
index 43efd3d91623..000000000000
--- a/frame/support/src/debug.rs
+++ /dev/null
@@ -1,247 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Runtime debugging and logging utilities.
-//!
-//! This module contains macros and functions that will allow
-//! you to print logs out of the runtime code.
-//!
-//! First and foremost be aware that adding regular logging code to
-//! your runtime will have a negative effect on the performance
-//! and size of the blob. Luckily there are some ways to mitigate
-//! this that are described below.
-//!
-//! First component to utilize debug-printing and logging is actually
-//! located in `primitives` crate: `sp_core::RuntimeDebug`.
-//! This custom-derive generates `core::fmt::Debug` implementation,
-//! just like regular `derive(Debug)`, however it does not generate
-//! any code when the code is compiled to WASM. This means that
-//! you can safely sprinkle `RuntimeDebug` in your runtime codebase,
-//! without affecting the size. This also allows you to print/log
-//! both when the code is running natively or in WASM, but note
-//! that WASM debug formatting of structs will be empty.
-//!
-//! ```rust,no_run
-//!	use frame_support::debug;
-//!
-//! #[derive(sp_core::RuntimeDebug)]
-//!	struct MyStruct {
-//!   a: u64,
-//!	}
-//!
-//! // First initialize the logger.
-//! //
-//! // This is only required when you want the logs to be printed
-//! // also during non-native run.
-//! // Note that enabling the logger has performance impact on
-//! // WASM runtime execution and should be used sparingly.
-//!	debug::RuntimeLogger::init();
-//!
-//! let x = MyStruct { a: 5 };
-//!	// will log an info line `"My struct: MyStruct{a:5}"` when running
-//!	// natively, but will only print `"My struct: "` when running WASM.
-//!	debug::info!("My struct: {:?}", x);
-//!
-//!	// same output here, although this will print to stdout
-//!	// (and without log format)
-//!	debug::print!("My struct: {:?}", x);
-//! ```
-//!
-//! If you want to avoid extra overhead in WASM, but still be able
-//! to print / log when the code is executed natively you can use
-//! macros coming from `native` sub-module. This module enables
-//! logs conditionally and strips out logs in WASM.
-//!
-//! ```rust,no_run
-//!	use frame_support::debug::native;
-//!
-//! #[derive(sp_core::RuntimeDebug)]
-//!	struct MyStruct {
-//!   a: u64,
-//!	}
-//!
-//! // We don't initialize the logger, since
-//! // we are not printing anything out in WASM.
-//!	// debug::RuntimeLogger::init();
-//!
-//! let x = MyStruct { a: 5 };
-//!
-//!	// Displays an info log when running natively, nothing when WASM.
-//!	native::info!("My struct: {:?}", x);
-//!
-//!	// same output to stdout, no overhead on WASM.
-//!	native::print!("My struct: {:?}", x);
-//! ```
-
-use sp_std::fmt::{self, Debug};
-
-pub use log::{info, debug, error, trace, warn};
-pub use crate::runtime_print as print;
-pub use sp_std::Writer;
-
-/// Native-only logging.
-///
-/// Using any functions from this module will have any effect
-/// only if the runtime is running natively (i.e. not via WASM)
-#[cfg(feature = "std")]
-pub mod native {
-	pub use super::{info, debug, error, trace, warn, print};
-}
-
-/// Native-only logging.
-///
-/// Using any functions from this module will have any effect
-/// only if the runtime is running natively (i.e. not via WASM)
-#[cfg(not(feature = "std"))]
-pub mod native {
-	#[macro_export]
-	macro_rules! noop {
-		($($arg:tt)+) => {}
-	}
-	pub use noop as info;
-	pub use noop as debug;
-	pub use noop as error;
-	pub use noop as trace;
-	pub use noop as warn;
-	pub use noop as print;
-}
-
-/// Print out a formatted message.
-///
-/// # Example
-///
-/// ```
-/// frame_support::runtime_print!("my value is {}", 3);
-/// ```
-#[macro_export]
-macro_rules! runtime_print {
-	($($arg:tt)+) => {
-		{
-			use core::fmt::Write;
-			let mut w = $crate::sp_std::Writer::default();
-			let _ = core::write!(&mut w, $($arg)+);
-			$crate::sp_io::misc::print_utf8(&w.inner())
-		}
-	}
-}
-
-/// Print out the debuggable type.
-pub fn debug(data: &impl Debug) {
-	runtime_print!("{:?}", data);
-}
-
-/// Runtime logger implementation - `log` crate backend.
-///
-/// The logger should be initialized if you want to display
-/// logs inside the runtime that is not necessarily running natively.
-///
-/// When runtime is executed natively any log statements are displayed
-/// even if this logger is NOT initialized.
-///
-/// Note that even though the logs are not displayed in WASM, they
-/// may still affect the size and performance of the generated runtime.
-/// To lower the footprint make sure to only use macros from `native`
-/// sub-module.
-pub struct RuntimeLogger;
-
-impl RuntimeLogger {
-	/// Initialize the logger.
-	///
-	/// This is a no-op when running natively (`std`).
-	#[cfg(feature = "std")]
-	pub fn init() {}
-
-	/// Initialize the logger.
-	///
-	/// This is a no-op when running natively (`std`).
-	#[cfg(not(feature = "std"))]
-	pub fn init() {
-		static LOGGER: RuntimeLogger = RuntimeLogger;
-		let _ = log::set_logger(&LOGGER);
-
-		// Set max level to `TRACE` to ensure we propagate
-		// all log entries to the native side that will do the
-		// final filtering on what should be printed.
-		//
-		// If we don't set any level, logging is disabled
-		// completly.
-		log::set_max_level(log::LevelFilter::Trace);
-	}
-}
-
-impl log::Log for RuntimeLogger {
-	fn enabled(&self, _metadata: &log::Metadata) -> bool {
-		// to avoid calling to host twice, we pass everything
-		// and let the host decide what to print.
-		// If someone is initializing the logger they should
-		// know what they are doing.
-		true
-	}
-
-	fn log(&self, record: &log::Record) {
-		use fmt::Write;
-		let mut w = sp_std::Writer::default();
-		let _ = core::write!(&mut w, "{}", record.args());
-
-		sp_io::logging::log(
-			record.level().into(),
-			record.target(),
-			w.inner(),
-		);
-	}
-
-	fn flush(&self) {}
-}
-
-#[cfg(test)]
-mod tests {
-	use substrate_test_runtime_client::{
-		ExecutionStrategy, TestClientBuilderExt, DefaultTestClientBuilderExt,
-		TestClientBuilder, runtime::TestAPI,
-	};
-	use sp_api::ProvideRuntimeApi;
-	use sp_runtime::generic::BlockId;
-
-	#[test]
-	fn ensure_runtime_logger_works() {
-		let executable = std::env::current_exe().unwrap();
-		let output = std::process::Command::new(executable)
-			.env("RUN_TEST", "1")
-			.env("RUST_LOG", "trace")
-			.args(&["--nocapture", "ensure_runtime_logger_works_implementation"])
-			.output()
-			.unwrap();
-
-		let output = dbg!(String::from_utf8(output.stderr).unwrap());
-		assert!(output.contains("Hey I'm runtime"));
-	}
-
-	/// This is no actual test. It will be called by `ensure_runtime_logger_works`
-	/// to check that the runtime can print from the wasm side using the
-	/// `RuntimeLogger`.
-	#[test]
-	fn ensure_runtime_logger_works_implementation() {
-		if std::env::var("RUN_TEST").is_ok() {
-			sp_tracing::try_init_simple();
-
-			let client = TestClientBuilder::new().set_execution_strategy(ExecutionStrategy::AlwaysWasm).build();
-			let runtime_api = client.runtime_api();
-			let block_id = BlockId::Number(0);
-			runtime_api.do_trace_log(&block_id).expect("Logging should not fail");
-		}
-	}
-}
diff --git a/frame/support/src/dispatch.rs b/frame/support/src/dispatch.rs
index c2315e66e323..ab9feae3c249 100644
--- a/frame/support/src/dispatch.rs
+++ b/frame/support/src/dispatch.rs
@@ -1345,7 +1345,7 @@ macro_rules! decl_module {
 					$system::Config
 				>::PalletInfo as $crate::traits::PalletInfo>::name::<Self>().expect("pallet will have name in the runtime; qed");
 
-				$crate::debug::info!(
+				$crate::log::info!(
 					target: $crate::LOG_TARGET,
 					"⚠️ running migration for {} and setting new storage version to {:?}",
 					pallet_name,
@@ -1389,7 +1389,7 @@ macro_rules! decl_module {
 					$system::Config
 				>::PalletInfo as $crate::traits::PalletInfo>::name::<Self>().expect("pallet will have name in the runtime; qed");
 
-				$crate::debug::info!(
+				$crate::log::info!(
 					target: $crate::LOG_TARGET,
 					"✅ no migration for '{}' and setting new storage version to {:?}",
 					pallet_name,
diff --git a/frame/support/src/hash.rs b/frame/support/src/hash.rs
index 0a8be8aec035..22ccbeb6ceee 100644
--- a/frame/support/src/hash.rs
+++ b/frame/support/src/hash.rs
@@ -102,7 +102,7 @@ impl StorageHasher for Twox64Concat {
 impl ReversibleStorageHasher for Twox64Concat {
 	fn reverse(x: &[u8]) -> &[u8] {
 		if x.len() < 8 {
-			crate::debug::error!("Invalid reverse: hash length too short");
+			log::error!("Invalid reverse: hash length too short");
 			return &[]
 		}
 		&x[8..]
@@ -125,7 +125,7 @@ impl StorageHasher for Blake2_128Concat {
 impl ReversibleStorageHasher for Blake2_128Concat {
 	fn reverse(x: &[u8]) -> &[u8] {
 		if x.len() < 16 {
-			crate::debug::error!("Invalid reverse: hash length too short");
+			log::error!("Invalid reverse: hash length too short");
 			return &[]
 		}
 		&x[16..]
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index e16200ef0b99..4dbb6bff5ab2 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -44,9 +44,9 @@ pub use sp_state_machine::BasicExternalities;
 pub use sp_io::{storage::root as storage_root, self};
 #[doc(hidden)]
 pub use sp_runtime::RuntimeDebug;
+#[doc(hidden)]
+pub use log;
 
-#[macro_use]
-pub mod debug;
 #[macro_use]
 mod origin;
 #[macro_use]
@@ -340,6 +340,30 @@ macro_rules! ord_parameter_types {
 	}
 }
 
+/// Print out a formatted message.
+///
+/// # Example
+///
+/// ```
+/// frame_support::runtime_print!("my value is {}", 3);
+/// ```
+#[macro_export]
+macro_rules! runtime_print {
+	($($arg:tt)+) => {
+		{
+			use core::fmt::Write;
+			let mut w = $crate::sp_std::Writer::default();
+			let _ = core::write!(&mut w, $($arg)+);
+			$crate::sp_io::misc::print_utf8(&w.inner())
+		}
+	}
+}
+
+/// Print out the debuggable type.
+pub fn debug(data: &impl sp_std::fmt::Debug) {
+	runtime_print!("{:?}", data);
+}
+
 #[doc(inline)]
 pub use frame_support_procedural::{
 	decl_storage, construct_runtime, transactional, RuntimeDebugNoBound
@@ -1051,7 +1075,7 @@ pub mod pallet_prelude {
 	pub use frame_support::traits::GenesisBuild;
 	pub use frame_support::{
 		EqNoBound, PartialEqNoBound, RuntimeDebugNoBound, DebugNoBound, CloneNoBound, Twox256,
-		Twox128, Blake2_256, Blake2_128, Identity, Twox64Concat, Blake2_128Concat, debug, ensure,
+		Twox128, Blake2_256, Blake2_128, Identity, Twox64Concat, Blake2_128Concat, ensure,
 		RuntimeDebug, storage,
 		traits::{Get, Hooks, IsType, GetPalletVersion, EnsureOrigin},
 		dispatch::{DispatchResultWithPostInfo, Parameter, DispatchError},
diff --git a/frame/support/src/storage/child.rs b/frame/support/src/storage/child.rs
index 66cc7d74fe7d..6f9987474394 100644
--- a/frame/support/src/storage/child.rs
+++ b/frame/support/src/storage/child.rs
@@ -40,7 +40,11 @@ pub fn get<T: Decode + Sized>(
 			).and_then(|v| {
 				Decode::decode(&mut &v[..]).map(Some).unwrap_or_else(|_| {
 					// TODO #3700: error should be handleable.
-					runtime_print!("ERROR: Corrupted state in child trie at {:?}/{:?}", storage_key, key);
+					crate::runtime_print!(
+						"ERROR: Corrupted state in child trie at {:?}/{:?}",
+						storage_key,
+						key,
+					);
 					None
 				})
 			})
diff --git a/frame/support/src/storage/generator/double_map.rs b/frame/support/src/storage/generator/double_map.rs
index 7e1a2456e453..c02ebe48290e 100644
--- a/frame/support/src/storage/generator/double_map.rs
+++ b/frame/support/src/storage/generator/double_map.rs
@@ -393,7 +393,7 @@ impl<
 			let value = match unhashed::get::<O>(&previous_key) {
 				Some(value) => value,
 				None => {
-					crate::debug::error!("Invalid translate: fail to decode old value");
+					log::error!("Invalid translate: fail to decode old value");
 					continue
 				},
 			};
@@ -401,7 +401,7 @@ impl<
 			let key1 = match K1::decode(&mut key_material) {
 				Ok(key1) => key1,
 				Err(_) => {
-					crate::debug::error!("Invalid translate: fail to decode key1");
+					log::error!("Invalid translate: fail to decode key1");
 					continue
 				},
 			};
@@ -410,7 +410,7 @@ impl<
 			let key2 = match K2::decode(&mut key2_material) {
 				Ok(key2) => key2,
 				Err(_) => {
-					crate::debug::error!("Invalid translate: fail to decode key2");
+					log::error!("Invalid translate: fail to decode key2");
 					continue
 				},
 			};
diff --git a/frame/support/src/storage/generator/map.rs b/frame/support/src/storage/generator/map.rs
index 7f6eb2a518f5..9abc7883937d 100644
--- a/frame/support/src/storage/generator/map.rs
+++ b/frame/support/src/storage/generator/map.rs
@@ -172,7 +172,7 @@ impl<
 			let value = match unhashed::get::<O>(&previous_key) {
 				Some(value) => value,
 				None => {
-					crate::debug::error!("Invalid translate: fail to decode old value");
+					log::error!("Invalid translate: fail to decode old value");
 					continue
 				},
 			};
@@ -181,7 +181,7 @@ impl<
 			let key = match K::decode(&mut key_material) {
 				Ok(key) => key,
 				Err(_) => {
-					crate::debug::error!("Invalid translate: fail to decode key");
+					log::error!("Invalid translate: fail to decode key");
 					continue
 				},
 			};
diff --git a/frame/support/src/storage/mod.rs b/frame/support/src/storage/mod.rs
index 93cf7c663906..d9820475a7e8 100644
--- a/frame/support/src/storage/mod.rs
+++ b/frame/support/src/storage/mod.rs
@@ -62,7 +62,7 @@ mod debug_helper {
 			let mut val = v.borrow_mut();
 			*val += 1;
 			if *val > 10 {
-				crate::debug::warn!(
+				log::warn!(
 					"Detected with_transaction with nest level {}. Nested usage of with_transaction is not recommended.",
 					*val
 				);
@@ -532,9 +532,9 @@ impl<T> Iterator for PrefixIterator<T> {
 					let raw_value = match unhashed::get_raw(&self.previous_key) {
 						Some(raw_value) => raw_value,
 						None => {
-							crate::debug::error!(
+							log::error!(
 								"next_key returned a key with no value at {:?}",
-								self.previous_key
+								self.previous_key,
 							);
 							continue
 						}
@@ -546,9 +546,10 @@ impl<T> Iterator for PrefixIterator<T> {
 					let item = match (self.closure)(raw_key_without_prefix, &raw_value[..]) {
 						Ok(item) => item,
 						Err(e) => {
-							crate::debug::error!(
+							log::error!(
 								"(key, value) failed to decode at {:?}: {:?}",
-								self.previous_key, e
+								self.previous_key,
+								e,
 							);
 							continue
 						}
@@ -628,9 +629,9 @@ pub trait StoragePrefixedMap<Value: FullCodec> {
 					None => unhashed::kill(&previous_key),
 				},
 				None => {
-					crate::debug::error!(
+					log::error!(
 						"old key failed to decode at {:?}",
-						previous_key
+						previous_key,
 					);
 					continue
 				},
diff --git a/frame/support/src/storage/unhashed.rs b/frame/support/src/storage/unhashed.rs
index 8ac4240a9f0e..d3d54f3de579 100644
--- a/frame/support/src/storage/unhashed.rs
+++ b/frame/support/src/storage/unhashed.rs
@@ -25,7 +25,7 @@ pub fn get<T: Decode + Sized>(key: &[u8]) -> Option<T> {
 	sp_io::storage::get(key).and_then(|val| {
 		Decode::decode(&mut &val[..]).map(Some).unwrap_or_else(|_| {
 			// TODO #3700: error should be handleable.
-			runtime_print!("ERROR: Corrupted state at {:?}", key);
+			crate::runtime_print!("ERROR: Corrupted state at {:?}", key);
 			None
 		})
 	})
diff --git a/frame/system/Cargo.toml b/frame/system/Cargo.toml
index 4789f9b8add3..4306dbd64481 100644
--- a/frame/system/Cargo.toml
+++ b/frame/system/Cargo.toml
@@ -22,6 +22,7 @@ sp-runtime = { version = "3.0.0", default-features = false, path = "../../primit
 sp-version = { version = "3.0.0", default-features = false, path = "../../primitives/version" }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 impl-trait-for-tuples = "0.2.1"
+log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
 criterion = "0.3.3"
@@ -39,6 +40,7 @@ std = [
 	"frame-support/std",
 	"sp-runtime/std",
 	"sp-version/std",
+	"log/std",
 ]
 runtime-benchmarks = [
 	"sp-runtime/runtime-benchmarks",
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index 124c437c44bf..a99184650cf5 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -85,7 +85,7 @@ use sp_runtime::{
 
 use sp_core::{ChangesTrieConfiguration, storage::well_known_keys};
 use frame_support::{
-	Parameter, debug, storage,
+	Parameter, storage,
 	traits::{
 		Contains, Get, PalletInfo, OnNewAccount, OnKilledAccount, HandleLifetime,
 		StoredMap, EnsureOrigin, OriginTrait, Filter,
@@ -1060,7 +1060,10 @@ impl<T: Config> Module<T> {
 					(0, _) => {
 						// Logic error - cannot decrement beyond zero and no item should
 						// exist with zero providers.
-						debug::print!("Logic error: Unexpected underflow in reducing provider");
+						log::error!(
+							target: "runtime::system",
+							"Logic error: Unexpected underflow in reducing provider",
+						);
 						Ok(DecRefStatus::Reaped)
 					},
 					(1, 0) => {
@@ -1078,7 +1081,10 @@ impl<T: Config> Module<T> {
 					}
 				}
 			} else {
-				debug::print!("Logic error: Account already dead when reducing provider");
+				log::error!(
+					target: "runtime::system",
+					"Logic error: Account already dead when reducing provider",
+				);
 				Ok(DecRefStatus::Reaped)
 			}
 		})
@@ -1107,7 +1113,10 @@ impl<T: Config> Module<T> {
 		Account::<T>::mutate(who, |a| if a.consumers > 0 {
 			a.consumers -= 1;
 		} else {
-			debug::print!("Logic error: Unexpected underflow in reducing consumer");
+			log::error!(
+				target: "runtime::system",
+				"Logic error: Unexpected underflow in reducing consumer",
+			);
 		})
 	}
 
diff --git a/frame/system/src/offchain.rs b/frame/system/src/offchain.rs
index f2f446913c47..aa8bce966192 100644
--- a/frame/system/src/offchain.rs
+++ b/frame/system/src/offchain.rs
@@ -63,7 +63,7 @@ use sp_std::convert::{TryInto, TryFrom};
 use sp_std::prelude::{Box, Vec};
 use sp_runtime::app_crypto::RuntimeAppPublic;
 use sp_runtime::traits::{Extrinsic as ExtrinsicT, IdentifyAccount, One};
-use frame_support::{debug, RuntimeDebug};
+use frame_support::RuntimeDebug;
 
 /// Marker struct used to flag using all supported keys to sign a payload.
 pub struct ForAll {}
@@ -550,8 +550,8 @@ pub trait SendSignedTransaction<
 		call: LocalCall,
 	) -> Option<Result<(), ()>> {
 		let mut account_data = crate::Account::<T>::get(&account.id);
-		debug::native::debug!(
-			target: "offchain",
+		log::debug!(
+			target: "runtime::offchain",
 			"Creating signed transaction from account: {:?} (nonce: {:?})",
 			account.id,
 			account_data.nonce,
diff --git a/frame/timestamp/Cargo.toml b/frame/timestamp/Cargo.toml
index 8094889d89f4..01aa6ff3cf26 100644
--- a/frame/timestamp/Cargo.toml
+++ b/frame/timestamp/Cargo.toml
@@ -26,6 +26,7 @@ frame-support = { version = "3.0.0", default-features = false, path = "../suppor
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 sp-timestamp = { version = "3.0.0", default-features = false, path = "../../primitives/timestamp" }
 impl-trait-for-tuples = "0.2.1"
+log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
 sp-io ={ version = "3.0.0", path = "../../primitives/io" }
@@ -42,7 +43,8 @@ std = [
 	"frame-support/std",
 	"serde",
 	"frame-system/std",
-	"sp-timestamp/std"
+	"sp-timestamp/std",
+	"log/std",
 ]
 runtime-benchmarks = ["frame-benchmarking", "sp-io"]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/timestamp/src/lib.rs b/frame/timestamp/src/lib.rs
index 86ca0c11a70c..0deef258ed5b 100644
--- a/frame/timestamp/src/lib.rs
+++ b/frame/timestamp/src/lib.rs
@@ -97,8 +97,6 @@ pub mod weights;
 
 use sp_std::{result, cmp};
 use sp_inherents::InherentData;
-#[cfg(feature = "std")]
-use frame_support::debug;
 use frame_support::traits::{Time, UnixTime};
 use sp_runtime::{
 	RuntimeString,
@@ -287,8 +285,9 @@ impl<T: Config> UnixTime for Pallet<T> {
 		let now = Self::now();
 		sp_std::if_std! {
 			if now == T::Moment::zero() {
-				debug::error!(
-					"`pallet_timestamp::UnixTime::now` is called at genesis, invalid value returned: 0"
+				log::error!(
+					target: "runtime::timestamp",
+					"`pallet_timestamp::UnixTime::now` is called at genesis, invalid value returned: 0",
 				);
 			}
 		}
diff --git a/primitives/api/Cargo.toml b/primitives/api/Cargo.toml
index 20987035ef2f..c284d1f4791e 100644
--- a/primitives/api/Cargo.toml
+++ b/primitives/api/Cargo.toml
@@ -23,6 +23,8 @@ sp-state-machine = { version = "0.9.0", optional = true, path = "../state-machin
 hash-db = { version = "0.15.2", optional = true }
 thiserror = { version = "1.0.21", optional = true }
 
+log = { version = "0.4.14", default-features = false }
+
 [dev-dependencies]
 sp-test-primitives = { version = "2.0.0", path = "../test-primitives" }
 
@@ -37,4 +39,15 @@ std = [
 	"sp-version/std",
 	"hash-db",
 	"thiserror",
+	"log/std",
+]
+# Special feature to disable logging completly.
+#
+# By default `sp-api` initializes the `RuntimeLogger` for each runtime api function. However,
+# logging functionality increases the code size. It is recommended to enable this feature when
+# building a runtime for registering it on chain.
+#
+# This sets the max logging level to `off` for `log`.
+disable-logging = [
+	"log/max_level_off",
 ]
diff --git a/primitives/api/proc-macro/src/impl_runtime_apis.rs b/primitives/api/proc-macro/src/impl_runtime_apis.rs
index 51bbe1c73ac8..2be8545a81d1 100644
--- a/primitives/api/proc-macro/src/impl_runtime_apis.rs
+++ b/primitives/api/proc-macro/src/impl_runtime_apis.rs
@@ -162,6 +162,7 @@ fn generate_dispatch_function(impls: &[ItemImpl]) -> Result<TokenStream> {
 fn generate_wasm_interface(impls: &[ItemImpl]) -> Result<TokenStream> {
 	let input = Ident::new("input", Span::call_site());
 	let c = generate_crate_access(HIDDEN_INCLUDES_ID);
+
 	let impl_calls = generate_impl_calls(impls, &input)?
 		.into_iter()
 		.map(|(trait_, fn_name, impl_, attrs)| {
@@ -183,6 +184,8 @@ fn generate_wasm_interface(impls: &[ItemImpl]) -> Result<TokenStream> {
 						}
 					};
 
+					#c::init_runtime_logger();
+
 					let output = { #impl_ };
 					#c::to_substrate_wasm_fn_return_value(&output)
 				}
diff --git a/primitives/api/src/lib.rs b/primitives/api/src/lib.rs
index 592b20b62a77..afb9af343ba6 100644
--- a/primitives/api/src/lib.rs
+++ b/primitives/api/src/lib.rs
@@ -30,6 +30,19 @@
 //! api, the [`ApiExt`] trait, the [`CallApiAt`] trait and the [`ConstructRuntimeApi`] trait.
 //!
 //! On a meta level this implies, the client calls the generated API from the client perspective.
+//!
+//!
+//! # Logging
+//!
+//! Substrate supports logging from the runtime in native and in wasm. For that purpose it provides
+//! the [`RuntimeLogger`](sp_runtime::runtime_logger::RuntimeLogger). This runtime logger is
+//! automatically enabled for each call into the runtime through the runtime api. As logging
+//! introduces extra code that isn't actually required for the logic of your runtime and also
+//! increases the final wasm blob size, it is recommended to disable the logging for on-chain
+//! wasm blobs. This can be done by enabling the `disable-logging` feature of this crate. Be aware
+//! that this feature instructs `log` and `tracing` to disable logging at compile time by setting
+//! the `max_level_off` feature for these crates. So, you should not enable this feature for a
+//! native build as otherwise the node will not output any log messages.
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
@@ -386,6 +399,12 @@ pub trait ConstructRuntimeApi<Block: BlockT, C: CallApiAt<Block>> {
 	fn construct_runtime_api<'a>(call: &'a C) -> ApiRef<'a, Self::RuntimeApi>;
 }
 
+/// Init the [`RuntimeLogger`](sp_runtime::runtime_logger::RuntimeLogger).
+pub fn init_runtime_logger() {
+	#[cfg(not(feature = "disable-logging"))]
+	sp_runtime::runtime_logger::RuntimeLogger::init();
+}
+
 /// An error describing which API call failed.
 #[cfg(feature = "std")]
 #[derive(Debug, thiserror::Error)]
diff --git a/primitives/api/test/Cargo.toml b/primitives/api/test/Cargo.toml
index e8f06aaf20e1..2a6325fd09e9 100644
--- a/primitives/api/test/Cargo.toml
+++ b/primitives/api/test/Cargo.toml
@@ -15,6 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 sp-api = { version = "3.0.0", path = "../" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
 sp-version = { version = "3.0.0", path = "../../version" }
+sp-tracing = { version = "3.0.0", path = "../../tracing" }
 sp-runtime = { version = "3.0.0", path = "../../runtime" }
 sp-blockchain = { version = "3.0.0", path = "../../blockchain" }
 sp-consensus = { version = "0.9.0", path = "../../consensus/common" }
@@ -28,6 +29,7 @@ rustversion = "1.0.0"
 criterion = "0.3.0"
 substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
 sp-core = { version = "3.0.0", path = "../../core" }
+log = "0.4.14"
 
 [[bench]]
 name = "bench"
diff --git a/primitives/api/test/tests/runtime_calls.rs b/primitives/api/test/tests/runtime_calls.rs
index 94f419b1c44d..e10e1b34012a 100644
--- a/primitives/api/test/tests/runtime_calls.rs
+++ b/primitives/api/test/tests/runtime_calls.rs
@@ -215,3 +215,34 @@ fn call_runtime_api_with_multiple_arguments() {
 		.test_multiple_arguments(&block_id, data.clone(), data.clone(), data.len() as u32)
 		.unwrap();
 }
+
+#[test]
+fn disable_logging_works() {
+	if std::env::var("RUN_TEST").is_ok() {
+		sp_tracing::try_init_simple();
+
+		let mut builder = TestClientBuilder::new()
+			.set_execution_strategy(ExecutionStrategy::AlwaysWasm);
+		builder.genesis_init_mut().set_wasm_code(
+			substrate_test_runtime_client::runtime::wasm_binary_logging_disabled_unwrap().to_vec(),
+		);
+
+		let client = builder.build();
+		let runtime_api = client.runtime_api();
+		let block_id = BlockId::Number(0);
+		runtime_api.do_trace_log(&block_id).expect("Logging should not fail");
+		log::error!("Logging from native works");
+	} else {
+		let executable = std::env::current_exe().unwrap();
+		let output = std::process::Command::new(executable)
+			.env("RUN_TEST", "1")
+			.env("RUST_LOG", "info")
+			.args(&["--nocapture", "disable_logging_works"])
+			.output()
+			.unwrap();
+
+		let output = dbg!(String::from_utf8(output.stderr).unwrap());
+		assert!(!output.contains("Hey I'm runtime"));
+		assert!(output.contains("Logging from native works"));
+	}
+}
diff --git a/primitives/runtime/Cargo.toml b/primitives/runtime/Cargo.toml
index 0e4f6168ba11..7d33e7fa62d2 100644
--- a/primitives/runtime/Cargo.toml
+++ b/primitives/runtime/Cargo.toml
@@ -22,7 +22,7 @@ sp-application-crypto = { version = "3.0.0", default-features = false, path = ".
 sp-arithmetic = { version = "3.0.0", default-features = false, path = "../arithmetic" }
 sp-std = { version = "3.0.0", default-features = false, path = "../std" }
 sp-io = { version = "3.0.0", default-features = false, path = "../io" }
-log = { version = "0.4.8", optional = true }
+log = { version = "0.4.14", default-features = false }
 paste = "1.0"
 rand = { version = "0.7.2", optional = true }
 impl-trait-for-tuples = "0.2.1"
@@ -34,6 +34,9 @@ either = { version = "1.5", default-features = false }
 serde_json = "1.0.41"
 rand = "0.7.2"
 sp-state-machine = { version = "0.9.0", path = "../state-machine" }
+sp-api = { version = "3.0.0", path = "../api" }
+substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
+sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
 
 [features]
 bench = []
@@ -43,7 +46,7 @@ std = [
 	"sp-application-crypto/std",
 	"sp-arithmetic/std",
 	"codec/std",
-	"log",
+	"log/std",
 	"sp-core/std",
 	"rand",
 	"sp-std/std",
diff --git a/primitives/runtime/src/lib.rs b/primitives/runtime/src/lib.rs
index 2fb4f7546d23..c8b93a083be4 100644
--- a/primitives/runtime/src/lib.rs
+++ b/primitives/runtime/src/lib.rs
@@ -57,6 +57,7 @@ pub mod transaction_validity;
 pub mod random_number_generator;
 mod runtime_string;
 mod multiaddress;
+pub mod runtime_logger;
 
 pub use crate::runtime_string::*;
 
diff --git a/primitives/runtime/src/runtime_logger.rs b/primitives/runtime/src/runtime_logger.rs
new file mode 100644
index 000000000000..e27dc828cdbc
--- /dev/null
+++ b/primitives/runtime/src/runtime_logger.rs
@@ -0,0 +1,108 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! A logger that can be used to log from the runtime.
+//!
+//! See [`RuntimeLogger`] for more docs.
+
+/// Runtime logger implementation - `log` crate backend.
+///
+/// The logger should be initialized if you want to display
+/// logs inside the runtime that is not necessarily running natively.
+pub struct RuntimeLogger;
+
+impl RuntimeLogger {
+	/// Initialize the logger.
+	///
+	/// This is a no-op when running natively (`std`).
+	#[cfg(feature = "std")]
+	pub fn init() {}
+
+	/// Initialize the logger.
+	///
+	/// This is a no-op when running natively (`std`).
+	#[cfg(not(feature = "std"))]
+	pub fn init() {
+		static LOGGER: RuntimeLogger = RuntimeLogger;
+		let _ = log::set_logger(&LOGGER);
+
+		// Set max level to `TRACE` to ensure we propagate
+		// all log entries to the native side that will do the
+		// final filtering on what should be printed.
+		//
+		// If we don't set any level, logging is disabled
+		// completly.
+		log::set_max_level(log::LevelFilter::Trace);
+	}
+}
+
+impl log::Log for RuntimeLogger {
+	fn enabled(&self, _metadata: &log::Metadata) -> bool {
+		// to avoid calling to host twice, we pass everything
+		// and let the host decide what to print.
+		// If someone is initializing the logger they should
+		// know what they are doing.
+		true
+	}
+
+	fn log(&self, record: &log::Record) {
+		use sp_std::fmt::Write;
+		let mut w = sp_std::Writer::default();
+		let _ = ::core::write!(&mut w, "{}", record.args());
+
+		sp_io::logging::log(
+			record.level().into(),
+			record.target(),
+			w.inner(),
+		);
+	}
+
+	fn flush(&self) {}
+}
+
+#[cfg(test)]
+mod tests {
+	use substrate_test_runtime_client::{
+		ExecutionStrategy, TestClientBuilderExt, DefaultTestClientBuilderExt,
+		TestClientBuilder, runtime::TestAPI,
+	};
+	use sp_api::{ProvideRuntimeApi, BlockId};
+
+	#[test]
+	fn ensure_runtime_logger_works() {
+		if std::env::var("RUN_TEST").is_ok() {
+			sp_tracing::try_init_simple();
+
+			let client = TestClientBuilder::new()
+				.set_execution_strategy(ExecutionStrategy::AlwaysWasm).build();
+			let runtime_api = client.runtime_api();
+			let block_id = BlockId::Number(0);
+			runtime_api.do_trace_log(&block_id).expect("Logging should not fail");
+		} else {
+			let executable = std::env::current_exe().unwrap();
+			let output = std::process::Command::new(executable)
+				.env("RUN_TEST", "1")
+				.env("RUST_LOG", "trace")
+				.args(&["--nocapture", "ensure_runtime_logger_works"])
+				.output()
+				.unwrap();
+
+			let output = dbg!(String::from_utf8(output.stderr).unwrap());
+			assert!(output.contains("Hey I'm runtime"));
+		}
+	}
+}
diff --git a/test-utils/runtime/Cargo.toml b/test-utils/runtime/Cargo.toml
index 1a841ac0755a..bdb847ae5664 100644
--- a/test-utils/runtime/Cargo.toml
+++ b/test-utils/runtime/Cargo.toml
@@ -47,7 +47,7 @@ sp-externalities = { version = "0.9.0", default-features = false, path = "../../
 
 # 3rd party
 cfg-if = "1.0"
-log = { version = "0.4.8", optional = true }
+log = { version = "0.4.14", default-features = false }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 
 [dev-dependencies]
@@ -71,7 +71,7 @@ std = [
 	"frame-executive/std",
 	"sp-inherents/std",
 	"sp-keyring",
-	"log",
+	"log/std",
 	"memory-db/std",
 	"sp-offchain/std",
 	"sp-core/std",
@@ -97,3 +97,5 @@ std = [
 	"sp-transaction-pool/std",
 	"trie-db/std",
 ]
+# Special feature to disable logging
+disable-logging = [ "sp-api/disable-logging" ]
diff --git a/test-utils/runtime/build.rs b/test-utils/runtime/build.rs
index 1de18d32b08b..50c455b4ad83 100644
--- a/test-utils/runtime/build.rs
+++ b/test-utils/runtime/build.rs
@@ -26,5 +26,13 @@ fn main() {
 		// depend on the stack-size.
 		.append_to_rust_flags("-Clink-arg=-zstack-size=1048576")
 		.import_memory()
-		.build()
+		.build();
+
+	WasmBuilder::new()
+		.with_current_project()
+		.export_heap_base()
+		.import_memory()
+		.set_file_name("wasm_binary_logging_disabled.rs")
+		.enable_feature("disable-logging")
+		.build();
 }
diff --git a/test-utils/runtime/client/src/lib.rs b/test-utils/runtime/client/src/lib.rs
index 5800203cf7e7..c8d11c9b6222 100644
--- a/test-utils/runtime/client/src/lib.rs
+++ b/test-utils/runtime/client/src/lib.rs
@@ -92,6 +92,7 @@ pub struct GenesisParameters {
 	changes_trie_config: Option<ChangesTrieConfiguration>,
 	heap_pages_override: Option<u64>,
 	extra_storage: Storage,
+	wasm_code: Option<Vec<u8>>,
 }
 
 impl GenesisParameters {
@@ -113,6 +114,11 @@ impl GenesisParameters {
 			self.extra_storage.clone(),
 		)
 	}
+
+	/// Set the wasm code that should be used at genesis.
+	pub fn set_wasm_code(&mut self, code: Vec<u8>) {
+		self.wasm_code = Some(code);
+	}
 }
 
 impl substrate_test_client::GenesisInit for GenesisParameters {
@@ -121,6 +127,10 @@ impl substrate_test_client::GenesisInit for GenesisParameters {
 
 		let mut storage = self.genesis_config().genesis_map();
 
+		if let Some(ref code) = self.wasm_code {
+			storage.top.insert(sp_core::storage::well_known_keys::CODE.to_vec(), code.clone());
+		}
+
 		let child_roots = storage.children_default.iter().map(|(_sk, child_content)| {
 			let state_root = <<<runtime::Block as BlockT>::Header as HeaderT>::Hashing as HashT>::trie_root(
 				child_content.data.clone().into_iter().collect()
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index b349d1266b03..e915f345a09a 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -69,6 +69,11 @@ pub type AuraId = sp_consensus_aura::sr25519::AuthorityId;
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
+#[cfg(feature = "std")]
+pub mod wasm_binary_logging_disabled {
+	include!(concat!(env!("OUT_DIR"), "/wasm_binary_logging_disabled.rs"));
+}
+
 /// Wasm binary unwrapped. If built with `SKIP_WASM_BUILD`, the function panics.
 #[cfg(feature = "std")]
 pub fn wasm_binary_unwrap() -> &'static [u8] {
@@ -76,6 +81,16 @@ pub fn wasm_binary_unwrap() -> &'static [u8] {
 						supported with the flag disabled.")
 }
 
+/// Wasm binary unwrapped. If built with `SKIP_WASM_BUILD`, the function panics.
+#[cfg(feature = "std")]
+pub fn wasm_binary_logging_disabled_unwrap() -> &'static [u8] {
+	wasm_binary_logging_disabled::WASM_BINARY
+		.expect(
+			"Development wasm binary is not available. Testing is only supported with the flag \
+			disabled."
+		)
+}
+
 /// Test runtime version.
 pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("test"),
@@ -742,8 +757,7 @@ cfg_if! {
 				}
 
 				fn do_trace_log() {
-					frame_support::debug::RuntimeLogger::init();
-					frame_support::debug::trace!("Hey I'm runtime");
+					log::trace!("Hey I'm runtime");
 				}
 			}
 
@@ -1001,8 +1015,7 @@ cfg_if! {
 				}
 
 				fn do_trace_log() {
-					frame_support::debug::RuntimeLogger::init();
-					frame_support::debug::trace!("Hey I'm runtime");
+					log::error!("Hey I'm runtime: {}", log::STATIC_MAX_LEVEL);
 				}
 			}
 
diff --git a/utils/wasm-builder/src/builder.rs b/utils/wasm-builder/src/builder.rs
index 8ef6c95324c7..bfbc4030adfd 100644
--- a/utils/wasm-builder/src/builder.rs
+++ b/utils/wasm-builder/src/builder.rs
@@ -43,6 +43,7 @@ impl WasmBuilderSelectProject {
 			rust_flags: Vec::new(),
 			file_name: None,
 			project_cargo_toml: get_manifest_dir().join("Cargo.toml"),
+			features_to_enable: Vec::new(),
 		}
 	}
 
@@ -60,6 +61,7 @@ impl WasmBuilderSelectProject {
 				rust_flags: Vec::new(),
 				file_name: None,
 				project_cargo_toml: path,
+				features_to_enable: Vec::new(),
 			})
 		} else {
 			Err("Project path must point to the `Cargo.toml` of the project")
@@ -88,6 +90,8 @@ pub struct WasmBuilder {
 	/// The path to the `Cargo.toml` of the project that should be built
 	/// for wasm.
 	project_cargo_toml: PathBuf,
+	/// Features that should be enabled when building the wasm binary.
+	features_to_enable: Vec<String>,
 }
 
 impl WasmBuilder {
@@ -132,10 +136,20 @@ impl WasmBuilder {
 		self
 	}
 
+	/// Enable the given feature when building the wasm binary.
+	///
+	/// `feature` needs to be a valid feature that is defined in the project `Cargo.toml`.
+	pub fn enable_feature(mut self, feature: impl Into<String>) -> Self {
+		self.features_to_enable.push(feature.into());
+		self
+	}
+
 	/// Build the WASM binary.
 	pub fn build(self) {
 		let out_dir = PathBuf::from(env::var("OUT_DIR").expect("`OUT_DIR` is set by cargo!"));
-		let file_path = out_dir.join(self.file_name.unwrap_or_else(|| "wasm_binary.rs".into()));
+		let file_path = out_dir.join(
+			self.file_name.clone().unwrap_or_else(|| "wasm_binary.rs".into()),
+		);
 
 		if check_skip_build() {
 			// If we skip the build, we still want to make sure to be called when an env variable
@@ -151,6 +165,8 @@ impl WasmBuilder {
 			file_path,
 			self.project_cargo_toml,
 			self.rust_flags.into_iter().map(|f| format!("{} ", f)).collect(),
+			self.features_to_enable,
+			self.file_name,
 		);
 
 		// As last step we need to generate our `rerun-if-changed` stuff. If a build fails, we don't
@@ -200,10 +216,15 @@ fn generate_rerun_if_changed_instructions() {
 ///               constant `WASM_BINARY`, which contains the built WASM binary.
 /// `project_cargo_toml` - The path to the `Cargo.toml` of the project that should be built.
 /// `default_rustflags` - Default `RUSTFLAGS` that will always be set for the build.
+/// `features_to_enable` - Features that should be enabled for the project.
+/// `wasm_binary_name` - The optional wasm binary name that is extended with `.compact.wasm`.
+///                      If `None`, the project name will be used.
 fn build_project(
 	file_name: PathBuf,
 	project_cargo_toml: PathBuf,
 	default_rustflags: String,
+	features_to_enable: Vec<String>,
+	wasm_binary_name: Option<String>,
 ) {
 	let cargo_cmd = match crate::prerequisites::check() {
 		Ok(cmd) => cmd,
@@ -217,6 +238,8 @@ fn build_project(
 		&project_cargo_toml,
 		&default_rustflags,
 		cargo_cmd,
+		features_to_enable,
+		wasm_binary_name,
 	);
 
 	let (wasm_binary, wasm_binary_bloaty) = if let Some(wasm_binary) = wasm_binary {
diff --git a/utils/wasm-builder/src/wasm_project.rs b/utils/wasm-builder/src/wasm_project.rs
index 73dc2e13af34..039254657544 100644
--- a/utils/wasm-builder/src/wasm_project.rs
+++ b/utils/wasm-builder/src/wasm_project.rs
@@ -97,6 +97,8 @@ pub(crate) fn create_and_compile(
 	project_cargo_toml: &Path,
 	default_rustflags: &str,
 	cargo_cmd: CargoCommandVersioned,
+	features_to_enable: Vec<String>,
+	wasm_binary_name: Option<String>,
 ) -> (Option<WasmBinary>, WasmBinaryBloaty) {
 	let wasm_workspace_root = get_wasm_workspace_root();
 	let wasm_workspace = wasm_workspace_root.join("wbuild");
@@ -108,12 +110,14 @@ pub(crate) fn create_and_compile(
 		&wasm_workspace,
 		&crate_metadata,
 		&crate_metadata.workspace_root,
+		features_to_enable,
 	);
 
 	build_project(&project, default_rustflags, cargo_cmd);
 	let (wasm_binary, bloaty) = compact_wasm_file(
 		&project,
 		project_cargo_toml,
+		wasm_binary_name,
 	);
 
 	wasm_binary.as_ref().map(|wasm_binary|
@@ -199,7 +203,7 @@ fn create_project_cargo_toml(
 	crate_name: &str,
 	crate_path: &Path,
 	wasm_binary: &str,
-	enabled_features: &[String],
+	enabled_features: impl Iterator<Item = String>,
 ) {
 	let mut workspace_toml: Table = toml::from_str(
 		&fs::read_to_string(
@@ -265,7 +269,7 @@ fn create_project_cargo_toml(
 	wasm_project.insert("package".into(), crate_name.into());
 	wasm_project.insert("path".into(), crate_path.display().to_string().into());
 	wasm_project.insert("default-features".into(), false.into());
-	wasm_project.insert("features".into(), enabled_features.to_vec().into());
+	wasm_project.insert("features".into(), enabled_features.collect::<Vec<_>>().into());
 
 	dependencies.insert("wasm-project".into(), wasm_project.into());
 
@@ -339,6 +343,7 @@ fn create_project(
 	wasm_workspace: &Path,
 	crate_metadata: &Metadata,
 	workspace_root_path: &Path,
+	features_to_enable: Vec<String>,
 ) -> PathBuf {
 	let crate_name = get_crate_name(project_cargo_toml);
 	let crate_path = project_cargo_toml.parent().expect("Parent path exists; qed");
@@ -354,13 +359,16 @@ fn create_project(
 		enabled_features.push("runtime-wasm".into());
 	}
 
+	let mut enabled_features = enabled_features.into_iter().collect::<HashSet<_>>();
+	enabled_features.extend(features_to_enable.into_iter());
+
 	create_project_cargo_toml(
 		&wasm_project_folder,
 		workspace_root_path,
 		&crate_name,
 		&crate_path,
 		&wasm_binary,
-		&enabled_features,
+		enabled_features.into_iter(),
 	);
 
 	write_file_if_changed(
@@ -437,16 +445,22 @@ fn build_project(project: &Path, default_rustflags: &str, cargo_cmd: CargoComman
 fn compact_wasm_file(
 	project: &Path,
 	cargo_manifest: &Path,
+	wasm_binary_name: Option<String>,
 ) -> (Option<WasmBinary>, WasmBinaryBloaty) {
 	let is_release_build = is_release_build();
 	let target = if is_release_build { "release" } else { "debug" };
-	let wasm_binary = get_wasm_binary_name(cargo_manifest);
+	let default_wasm_binary_name = get_wasm_binary_name(cargo_manifest);
 	let wasm_file = project.join("target/wasm32-unknown-unknown")
 		.join(target)
-		.join(format!("{}.wasm", wasm_binary));
+		.join(format!("{}.wasm", default_wasm_binary_name));
 
 	let wasm_compact_file = if is_release_build {
-		let wasm_compact_file = project.join(format!("{}.compact.wasm", wasm_binary));
+		let wasm_compact_file = project.join(
+			format!(
+				"{}.compact.wasm",
+				wasm_binary_name.clone().unwrap_or_else(|| default_wasm_binary_name.clone()),
+			)
+		);
 		wasm_gc::garbage_collect_file(&wasm_file, &wasm_compact_file)
 			.expect("Failed to compact generated WASM binary.");
 		Some(WasmBinary(wasm_compact_file))
@@ -454,7 +468,16 @@ fn compact_wasm_file(
 		None
 	};
 
-	(wasm_compact_file, WasmBinaryBloaty(wasm_file))
+	let bloaty_file_name = if let Some(name) = wasm_binary_name {
+		format!("{}.wasm", name)
+	} else {
+		format!("{}.wasm", default_wasm_binary_name)
+	};
+
+	let bloaty_file = project.join(bloaty_file_name);
+	fs::copy(wasm_file, &bloaty_file).expect("Copying the bloaty file to the project dir.");
+
+	(wasm_compact_file, WasmBinaryBloaty(bloaty_file))
 }
 
 /// Custom wrapper for a [`cargo_metadata::Package`] to store it in

From 7bd6b861b59453bc0b89cfacfa29dbf5203f0fd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Mon, 1 Mar 2021 14:58:49 +0000
Subject: [PATCH 0450/1194] babe: make plan_config_change callable (#8233)

---
 frame/babe/src/default_weights.rs |  4 +++
 frame/babe/src/lib.rs             | 25 +++++++++++-------
 frame/babe/src/tests.rs           | 44 ++++++++++++++++++++++++++++---
 3 files changed, 59 insertions(+), 14 deletions(-)

diff --git a/frame/babe/src/default_weights.rs b/frame/babe/src/default_weights.rs
index c7c87b583740..f16f589a77cd 100644
--- a/frame/babe/src/default_weights.rs
+++ b/frame/babe/src/default_weights.rs
@@ -23,6 +23,10 @@ use frame_support::weights::{
 };
 
 impl crate::WeightInfo for () {
+	fn plan_config_change() -> Weight {
+		DbWeight::get().writes(1)
+	}
+
 	fn report_equivocation(validator_count: u32) -> Weight {
 		// we take the validator set count from the membership proof to
 		// calculate the weight but we set a floor of 100 validators.
diff --git a/frame/babe/src/lib.rs b/frame/babe/src/lib.rs
index 2794d5b24742..9fdb080574b7 100644
--- a/frame/babe/src/lib.rs
+++ b/frame/babe/src/lib.rs
@@ -29,7 +29,7 @@ use frame_support::{
 	weights::{Pays, Weight},
 	Parameter,
 };
-use frame_system::{ensure_none, ensure_signed};
+use frame_system::{ensure_none, ensure_root, ensure_signed};
 use sp_application_crypto::Public;
 use sp_runtime::{
 	generic::DigestItem,
@@ -108,6 +108,7 @@ pub trait Config: pallet_timestamp::Config {
 }
 
 pub trait WeightInfo {
+	fn plan_config_change() -> Weight;
 	fn report_equivocation(validator_count: u32) -> Weight;
 }
 
@@ -314,6 +315,19 @@ decl_module! {
 				key_owner_proof,
 			)
 		}
+
+		/// Plan an epoch config change. The epoch config change is recorded and will be enacted on
+		/// the next call to `enact_epoch_change`. The config will be activated one epoch after.
+		/// Multiple calls to this method will replace any existing planned config change that had
+		/// not been enacted yet.
+		#[weight = <T as Config>::WeightInfo::plan_config_change()]
+		fn plan_config_change(
+			origin,
+			config: NextConfigDescriptor,
+		) {
+			ensure_root(origin)?;
+			NextEpochConfig::put(config);
+		}
 	}
 }
 
@@ -432,15 +446,6 @@ impl<T: Config> Module<T> {
 			})
 	}
 
-	/// Plan an epoch config change. The epoch config change is recorded and will be enacted on the
-	/// next call to `enact_epoch_change`. The config will be activated one epoch after. Multiple calls to this
-	/// method will replace any existing planned config change that had not been enacted yet.
-	pub fn plan_config_change(
-		config: NextConfigDescriptor,
-	) {
-		NextEpochConfig::put(config);
-	}
-
 	/// DANGEROUS: Enact an epoch change. Should be done on every block where `should_epoch_change` has returned `true`,
 	/// and the caller is the only caller of this function.
 	///
diff --git a/frame/babe/src/tests.rs b/frame/babe/src/tests.rs
index 8576389af31f..c7261d7f1f96 100644
--- a/frame/babe/src/tests.rs
+++ b/frame/babe/src/tests.rs
@@ -231,10 +231,13 @@ fn can_enact_next_config() {
 		assert_eq!(Babe::epoch_index(), 0);
 		go_to_block(2, 7);
 
-		Babe::plan_config_change(NextConfigDescriptor::V1 {
-			c: (1, 4),
-			allowed_slots: AllowedSlots::PrimarySlots,
-		});
+		Babe::plan_config_change(
+			Origin::root(),
+			NextConfigDescriptor::V1 {
+				c: (1, 4),
+				allowed_slots: AllowedSlots::PrimarySlots,
+			},
+		).unwrap();
 
 		progress_to_block(4);
 		Babe::on_finalize(9);
@@ -252,6 +255,39 @@ fn can_enact_next_config() {
 	});
 }
 
+#[test]
+fn only_root_can_enact_config_change() {
+	use sp_runtime::DispatchError;
+
+	new_test_ext(1).execute_with(|| {
+		let next_config = NextConfigDescriptor::V1 {
+			c: (1, 4),
+			allowed_slots: AllowedSlots::PrimarySlots,
+		};
+
+		let res = Babe::plan_config_change(
+			Origin::none(),
+			next_config.clone(),
+		);
+
+		assert_eq!(res, Err(DispatchError::BadOrigin));
+
+		let res = Babe::plan_config_change(
+			Origin::signed(1),
+			next_config.clone(),
+		);
+
+		assert_eq!(res, Err(DispatchError::BadOrigin));
+
+		let res = Babe::plan_config_change(
+			Origin::root(),
+			next_config,
+		);
+
+		assert!(res.is_ok());
+	});
+}
+
 #[test]
 fn can_fetch_current_and_next_epoch_data() {
 	new_test_ext(5).execute_with(|| {

From 172c7f80c9c69c7618ab10e9fbff8993739c2f25 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Mon, 1 Mar 2021 18:57:00 +0100
Subject: [PATCH 0451/1194] Fix state mismatch in case of bad handshake (#8230)

---
 client/network/src/protocol.rs | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index e1a10b520ba9..bddd79269fd2 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -168,6 +168,13 @@ pub struct Protocol<B: BlockT> {
 	behaviour: GenericProto,
 	/// List of notifications protocols that have been registered.
 	notification_protocols: Vec<Cow<'static, str>>,
+	/// If we receive a new "substream open" event that contains an invalid handshake, we ask the
+	/// inner layer to force-close the substream. Force-closing the substream will generate a
+	/// "substream closed" event. This is a problem: since we can't propagate the "substream open"
+	/// event to the outer layers, we also shouldn't propagate this "substream closed" event. To
+	/// solve this, an entry is added to this map whenever an invalid handshake is received.
+	/// Entries are removed when the corresponding "substream closed" is later received.
+	bad_handshake_substreams: HashSet<(PeerId, sc_peerset::SetId)>,
 	/// Prometheus metrics.
 	metrics: Option<Metrics>,
 	/// The `PeerId`'s of all boot nodes.
@@ -412,6 +419,7 @@ impl<B: BlockT> Protocol<B> {
 			behaviour,
 			notification_protocols:
 				network_config.extra_sets.iter().map(|s| s.notifications_protocol.clone()).collect(),
+			bad_handshake_substreams: Default::default(),
 			metrics: if let Some(r) = metrics_registry {
 				Some(Metrics::register(r)?)
 			} else {
@@ -1493,6 +1501,7 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 						},
 						(Err(err), _) => {
 							debug!(target: "sync", "Failed to parse remote handshake: {}", err);
+							self.bad_handshake_substreams.insert((peer_id.clone(), set_id));
 							self.behaviour.disconnect_peer(&peer_id, set_id);
 							self.peerset_handle.report_peer(peer_id, rep::BAD_MESSAGE);
 							CustomMessageOutcome::None
@@ -1503,6 +1512,8 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 			GenericProtoOut::CustomProtocolReplaced { peer_id, notifications_sink, set_id } => {
 				if set_id == HARDCODED_PEERSETS_SYNC {
 					CustomMessageOutcome::None
+				} else if self.bad_handshake_substreams.contains(&(peer_id.clone(), set_id)) {
+					CustomMessageOutcome::None
 				} else {
 					CustomMessageOutcome::NotificationStreamReplaced {
 						remote: peer_id,
@@ -1524,6 +1535,11 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 						);
 						CustomMessageOutcome::None
 					}
+				} else if self.bad_handshake_substreams.remove(&(peer_id.clone(), set_id)) {
+					// The substream that has just been closed had been opened with a bad
+					// handshake. The outer layers have never received an opening event about this
+					// substream, and consequently shouldn't receive a closing event either.
+					CustomMessageOutcome::None
 				} else {
 					CustomMessageOutcome::NotificationStreamClosed {
 						remote: peer_id,

From f5d2faf14b7380fc3629381c994ccf9d107f7c17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Tue, 2 Mar 2021 08:26:43 +0100
Subject: [PATCH 0452/1194] contracts: Use unstable sort for topics (#8232)

* contracts: Use unstable sort for topics

* Add warning about non-determinism
---
 frame/contracts/src/wasm/runtime.rs | 36 ++++++++++++++---------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index c383fdcc2ac2..7fde24d20405 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -294,24 +294,6 @@ fn already_charged(_: u32) -> Option<RuntimeToken> {
 	None
 }
 
-/// Finds duplicates in a given vector.
-///
-/// This function has complexity of O(n log n) and no additional memory is required, although
-/// the order of items is not preserved.
-fn has_duplicates<T: PartialEq + AsRef<[u8]>>(items: &mut Vec<T>) -> bool {
-	// Sort the vector
-	items.sort_by(|a, b| {
-		Ord::cmp(a.as_ref(), b.as_ref())
-	});
-	// And then find any two consecutive equal elements.
-	items.windows(2).any(|w| {
-		match w {
-			&[ref a, ref b] => a == b,
-			_ => false,
-		}
-	})
-}
-
 /// Can only be used for one call.
 pub struct Runtime<'a, E: Ext + 'a> {
 	ext: &'a mut E,
@@ -1295,6 +1277,22 @@ define_env!(Env, <E: Ext>,
 	// - data_ptr - a pointer to a raw data buffer which will saved along the event.
 	// - data_len - the length of the data buffer.
 	seal_deposit_event(ctx, topics_ptr: u32, topics_len: u32, data_ptr: u32, data_len: u32) => {
+
+		fn has_duplicates<T: Ord>(items: &mut Vec<T>) -> bool {
+			// # Warning
+			//
+			// Unstable sorts are non-deterministic across architectures. The usage here is OK
+			// because we are rejecting duplicates which removes the non determinism.
+			items.sort_unstable();
+			// Find any two consecutive equal elements.
+			items.windows(2).any(|w| {
+				match &w {
+					&[a, b] => a == b,
+					_ => false,
+				}
+			})
+		}
+
 		let num_topic = topics_len
 			.checked_div(sp_std::mem::size_of::<TopicOf<E::T>>() as u32)
 			.ok_or_else(|| "Zero sized topics are not allowed")?;
@@ -1317,6 +1315,8 @@ define_env!(Env, <E: Ext>,
 		}
 
 		// Check for duplicate topics. If there are any, then trap.
+		// Complexity O(n * log(n)) and no additional allocations.
+		// This also sorts the topics.
 		if has_duplicates(&mut topics) {
 			Err(Error::<E::T>::DuplicateTopics)?;
 		}

From 44ad00d96cb3f7b174a8b6a461093fa7196ce27a Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Tue, 2 Mar 2021 11:56:51 -0400
Subject: [PATCH 0453/1194] Make Benchmark Output Analysis Function
 Configurable (#8228)

* Integrate `output-analysis`

* fix test

* use default

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=frame_system --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/system/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Update frame/system/src/weights.rs

* cargo run --release --features runtime-benchmarks --manifest-path bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=frame_system --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/system/src/weights.rs --template=./.maintain/frame-weight-template.hbs --output-analysis=max

* Update frame/system/src/weights.rs

* dont discard value_dist and model

* feedback

Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
---
 frame/benchmarking/src/analysis.rs         | 69 ++++++++++++++++++++++
 frame/benchmarking/src/lib.rs              |  2 +-
 frame/system/src/weights.rs                | 43 +++++++-------
 utils/frame/benchmarking-cli/src/lib.rs    |  7 +++
 utils/frame/benchmarking-cli/src/writer.rs | 41 ++++++++++---
 5 files changed, 131 insertions(+), 31 deletions(-)

diff --git a/frame/benchmarking/src/analysis.rs b/frame/benchmarking/src/analysis.rs
index bdfa1cf65c47..a9657fd7b11a 100644
--- a/frame/benchmarking/src/analysis.rs
+++ b/frame/benchmarking/src/analysis.rs
@@ -18,6 +18,7 @@
 //! Tools for analyzing the benchmark results.
 
 use std::collections::BTreeMap;
+use core::convert::TryFrom;
 use linregress::{FormulaRegressionBuilder, RegressionDataBuilder};
 use crate::BenchmarkResults;
 
@@ -31,6 +32,7 @@ pub struct Analysis {
 	pub model: Option<RegressionModel>,
 }
 
+#[derive(Clone, Copy)]
 pub enum BenchmarkSelector {
 	ExtrinsicTime,
 	StorageRootTime,
@@ -38,6 +40,40 @@ pub enum BenchmarkSelector {
 	Writes,
 }
 
+#[derive(Debug)]
+pub enum AnalysisChoice {
+	/// Use minimum squares regression for analyzing the benchmarking results.
+	MinSquares,
+	/// Use median slopes for analyzing the benchmarking results.
+	MedianSlopes,
+	/// Use the maximum values among all other analysis functions for the benchmarking results.
+	Max,
+}
+
+impl Default for AnalysisChoice {
+	fn default() -> Self {
+		AnalysisChoice::MinSquares
+	}
+}
+
+impl TryFrom<Option<String>> for AnalysisChoice {
+	type Error = &'static str;
+
+	fn try_from(s: Option<String>) -> Result<Self, Self::Error> {
+		match s {
+			None => Ok(AnalysisChoice::default()),
+			Some(i) => {
+				match &i[..] {
+					"min-squares" | "min_squares" => Ok(AnalysisChoice::MinSquares),
+					"median-slopes" | "median_slopes" => Ok(AnalysisChoice::MedianSlopes),
+					"max" => Ok(AnalysisChoice::Max),
+					_ => Err("invalid analysis string")
+				}
+			}
+		}
+	}
+}
+
 impl Analysis {
 	// Useful for when there are no components, and we just need an median value of the benchmark results.
 	// Note: We choose the median value because it is more robust to outliers.
@@ -215,6 +251,39 @@ impl Analysis {
 			model: Some(model),
 		})
 	}
+
+	pub fn max(r: &Vec<BenchmarkResults>, selector: BenchmarkSelector) -> Option<Self> {
+		let median_slopes = Self::median_slopes(r, selector);
+		let min_squares = Self::min_squares_iqr(r, selector);
+
+		if median_slopes.is_none() || min_squares.is_none() {
+			return None;
+		}
+
+		let median_slopes = median_slopes.unwrap();
+		let min_squares = min_squares.unwrap();
+
+		let base = median_slopes.base.max(min_squares.base);
+		let slopes = median_slopes.slopes.into_iter()
+			.zip(min_squares.slopes.into_iter())
+			.map(|(a, b): (u128, u128)| { a.max(b) })
+			.collect::<Vec<u128>>();
+		// components should always be in the same order
+		median_slopes.names.iter()
+			.zip(min_squares.names.iter())
+			.for_each(|(a, b)| assert!(a == b, "benchmark results not in the same order"));
+		let names = median_slopes.names;
+		let value_dists = min_squares.value_dists;
+		let model = min_squares.model;
+
+		Some(Self {
+			base,
+			slopes,
+			names,
+			value_dists,
+			model,
+		})
+	}
 }
 
 fn ms(mut nanos: u128) -> String {
diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
index 1ff8cc8e5762..266e2c7882ce 100644
--- a/frame/benchmarking/src/lib.rs
+++ b/frame/benchmarking/src/lib.rs
@@ -26,7 +26,7 @@ mod analysis;
 
 pub use utils::*;
 #[cfg(feature = "std")]
-pub use analysis::{Analysis, BenchmarkSelector, RegressionModel};
+pub use analysis::{Analysis, BenchmarkSelector, RegressionModel, AnalysisChoice};
 #[doc(hidden)]
 pub use sp_io::storage::root as storage_root;
 #[doc(hidden)]
diff --git a/frame/system/src/weights.rs b/frame/system/src/weights.rs
index c961b47e53ea..fc1619878963 100644
--- a/frame/system/src/weights.rs
+++ b/frame/system/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for frame_system
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-02-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2021-02-28, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -34,6 +34,7 @@
 // --heap-pages=4096
 // --output=./frame/system/src/weights.rs
 // --template=./.maintain/frame-weight-template.hbs
+// --output-analysis=max
 
 
 #![allow(unused_parens)]
@@ -57,38 +58,38 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: crate::Config> WeightInfo for SubstrateWeight<T> {
 	fn remark(_b: u32, ) -> Weight {
-		(1_296_000 as Weight)
+		(1_345_000 as Weight)
 	}
 	fn remark_with_event(b: u32, ) -> Weight {
-		(13_474_000 as Weight)
+		(9_697_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((1_000 as Weight).saturating_mul(b as Weight))
 	}
 	fn set_heap_pages() -> Weight {
-		(2_024_000 as Weight)
+		(2_070_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_changes_trie_config() -> Weight {
-		(10_551_000 as Weight)
+		(10_111_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn set_storage(i: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 0
-			.saturating_add((612_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((619_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	fn kill_storage(i: u32, ) -> Weight {
-		(562_000 as Weight)
+		(1_647_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((442_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((460_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	fn kill_prefix(p: u32, ) -> Weight {
-		(10_499_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((840_000 as Weight).saturating_mul(p as Weight))
+		(10_678_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((862_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
 	}
 }
@@ -96,38 +97,38 @@ impl<T: crate::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn remark(_b: u32, ) -> Weight {
-		(1_296_000 as Weight)
+		(1_345_000 as Weight)
 	}
 	fn remark_with_event(b: u32, ) -> Weight {
-		(13_474_000 as Weight)
+		(9_697_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((1_000 as Weight).saturating_mul(b as Weight))
 	}
 	fn set_heap_pages() -> Weight {
-		(2_024_000 as Weight)
+		(2_070_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_changes_trie_config() -> Weight {
-		(10_551_000 as Weight)
+		(10_111_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn set_storage(i: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 0
-			.saturating_add((612_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((619_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	fn kill_storage(i: u32, ) -> Weight {
-		(562_000 as Weight)
+		(1_647_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((442_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((460_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	fn kill_prefix(p: u32, ) -> Weight {
-		(10_499_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((840_000 as Weight).saturating_mul(p as Weight))
+		(10_678_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((862_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
 	}
 }
diff --git a/utils/frame/benchmarking-cli/src/lib.rs b/utils/frame/benchmarking-cli/src/lib.rs
index ba1a52aa3644..19f4596e92fd 100644
--- a/utils/frame/benchmarking-cli/src/lib.rs
+++ b/utils/frame/benchmarking-cli/src/lib.rs
@@ -72,6 +72,13 @@ pub struct BenchmarkCmd {
 	#[structopt(long)]
 	pub template: Option<std::path::PathBuf>,
 
+	/// Which analysis function to use when outputting benchmarks:
+	/// * min-squares (default)
+	/// * median-slopes
+	/// * max (max of min squares and median slopes for each value)
+	#[structopt(long)]
+	pub output_analysis: Option<String>,
+
 	/// Set the heap pages while running benchmarks.
 	#[structopt(long)]
 	pub heap_pages: Option<u64>,
diff --git a/utils/frame/benchmarking-cli/src/writer.rs b/utils/frame/benchmarking-cli/src/writer.rs
index bde0be25d036..aeed6ea1c9a8 100644
--- a/utils/frame/benchmarking-cli/src/writer.rs
+++ b/utils/frame/benchmarking-cli/src/writer.rs
@@ -20,12 +20,13 @@
 use std::collections::HashMap;
 use std::fs;
 use std::path::PathBuf;
+use core::convert::TryInto;
 
 use serde::Serialize;
 use inflector::Inflector;
 
 use crate::BenchmarkCmd;
-use frame_benchmarking::{BenchmarkBatch, BenchmarkSelector, Analysis, RegressionModel};
+use frame_benchmarking::{BenchmarkBatch, BenchmarkSelector, Analysis, AnalysisChoice, RegressionModel};
 use sp_runtime::traits::Zero;
 
 const VERSION: &'static str = env!("CARGO_PKG_VERSION");
@@ -71,6 +72,7 @@ struct CmdData {
 	wasm_execution: String,
 	chain: String,
 	db_cache: u32,
+	analysis_choice: String,
 }
 
 // This encodes the component name and whether that component is used.
@@ -104,7 +106,10 @@ fn io_error(s: &str) -> std::io::Error {
 // p1 -> [b1, b2, b3]
 // p2 -> [b1, b2]
 // ```
-fn map_results(batches: &[BenchmarkBatch]) -> Result<HashMap<(String, String), Vec<BenchmarkData>>, std::io::Error> {
+fn map_results(
+	batches: &[BenchmarkBatch],
+	analysis_choice: &AnalysisChoice,
+) -> Result<HashMap<(String, String), Vec<BenchmarkData>>, std::io::Error> {
 	// Skip if batches is empty.
 	if batches.is_empty() { return Err(io_error("empty batches")) }
 
@@ -118,7 +123,7 @@ fn map_results(batches: &[BenchmarkBatch]) -> Result<HashMap<(String, String), V
 
 		let pallet_string = String::from_utf8(batch.pallet.clone()).unwrap();
 		let instance_string = String::from_utf8(batch.instance.clone()).unwrap();
-		let benchmark_data = get_benchmark_data(batch);
+		let benchmark_data = get_benchmark_data(batch, analysis_choice);
 		pallet_benchmarks.push(benchmark_data);
 
 		// Check if this is the end of the iterator
@@ -150,11 +155,23 @@ fn extract_errors(model: &Option<RegressionModel>) -> impl Iterator<Item=u128> +
 }
 
 // Analyze and return the relevant results for a given benchmark.
-fn get_benchmark_data(batch: &BenchmarkBatch) -> BenchmarkData {
+fn get_benchmark_data(
+	batch: &BenchmarkBatch,
+	analysis_choice: &AnalysisChoice,
+) -> BenchmarkData {
 	// Analyze benchmarks to get the linear regression.
-	let extrinsic_time = Analysis::min_squares_iqr(&batch.results, BenchmarkSelector::ExtrinsicTime).unwrap();
-	let reads = Analysis::min_squares_iqr(&batch.results, BenchmarkSelector::Reads).unwrap();
-	let writes = Analysis::min_squares_iqr(&batch.results, BenchmarkSelector::Writes).unwrap();
+	let analysis_function = match analysis_choice {
+		AnalysisChoice::MinSquares => Analysis::min_squares_iqr,
+		AnalysisChoice::MedianSlopes => Analysis::median_slopes,
+		AnalysisChoice::Max => Analysis::max,
+	};
+
+	let extrinsic_time = analysis_function(&batch.results, BenchmarkSelector::ExtrinsicTime)
+		.expect("analysis function should return an extrinsic time for valid inputs");
+	let reads = analysis_function(&batch.results, BenchmarkSelector::Reads)
+		.expect("analysis function should return the number of reads for valid inputs");
+	let writes = analysis_function(&batch.results, BenchmarkSelector::Writes)
+		.expect("analysis function should return the number of writes for valid inputs");
 
 	// Analysis data may include components that are not used, this filters out anything whose value is zero.
 	let mut used_components = Vec::new();
@@ -255,6 +272,11 @@ pub fn write_results(
 	// Full CLI args passed to trigger the benchmark.
 	let args = std::env::args().collect::<Vec<String>>();
 
+	// Which analysis function should be used when outputting benchmarks
+	let analysis_choice: AnalysisChoice = cmd.output_analysis.clone()
+		.try_into()
+		.map_err(|e| io_error(e))?;
+
 	// Capture individual args
 	let cmd_data = CmdData {
 		steps: cmd.steps.clone(),
@@ -265,6 +287,7 @@ pub fn write_results(
 		wasm_execution: cmd.wasm_method.to_string(),
 		chain: format!("{:?}", cmd.shared_params.chain),
 		db_cache: cmd.database_cache_size,
+		analysis_choice: format!("{:?}", analysis_choice),
 	};
 
 	// New Handlebars instance with helpers.
@@ -275,7 +298,7 @@ pub fn write_results(
 	handlebars.register_escape_fn(|s| -> String { s.to_string() });
 
 	// Organize results by pallet into a JSON map
-	let all_results = map_results(batches)?;
+	let all_results = map_results(batches, &analysis_choice)?;
 	for ((pallet, instance), results) in all_results.iter() {
 		let mut file_path = path.clone();
 		// If a user only specified a directory...
@@ -455,7 +478,7 @@ mod test {
 			test_data(b"first", b"first", BenchmarkParameter::a, 10, 3),
 			test_data(b"first", b"second", BenchmarkParameter::b, 9, 2),
 			test_data(b"second", b"first", BenchmarkParameter::c, 3, 4),
-		]).unwrap();
+		], &AnalysisChoice::default()).unwrap();
 
 		let first_benchmark = &mapped_results.get(
 			&("first_pallet".to_string(), "instance".to_string())

From 308eb4c75c844c4078f05743e536ce03df20d379 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Tue, 2 Mar 2021 13:23:07 -0400
Subject: [PATCH 0454/1194] Add benchmark to node-template pallet-template
 (#8239)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add benchmark to node-template pallet-template

* export sp_std to avoid missing dep when using macro

* fix more `sp_std` deps

* remove unused

* Update bin/node-template/pallets/template/src/benchmarking.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update bin/node-template/pallets/template/Cargo.toml

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 Cargo.lock                                    |  1 +
 bin/node-template/pallets/template/Cargo.toml | 11 ++++-
 .../pallets/template/src/benchmarking.rs      | 24 +++++++++++
 bin/node-template/pallets/template/src/lib.rs |  5 ++-
 bin/node-template/runtime/Cargo.toml          |  1 +
 bin/node-template/runtime/src/lib.rs          |  1 +
 frame/benchmarking/src/lib.rs                 | 42 ++++++++++---------
 .../merkle-mountain-range/src/benchmarking.rs |  1 -
 frame/timestamp/src/benchmarking.rs           |  1 -
 9 files changed, 62 insertions(+), 25 deletions(-)
 create mode 100644 bin/node-template/pallets/template/src/benchmarking.rs

diff --git a/Cargo.lock b/Cargo.lock
index 382d1fd102db..c0b1fffa752a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5293,6 +5293,7 @@ dependencies = [
 name = "pallet-template"
 version = "2.0.0"
 dependencies = [
+ "frame-benchmarking",
  "frame-support",
  "frame-system",
  "parity-scale-codec",
diff --git a/bin/node-template/pallets/template/Cargo.toml b/bin/node-template/pallets/template/Cargo.toml
index e6c0c5ac0621..9f0c6ee18267 100644
--- a/bin/node-template/pallets/template/Cargo.toml
+++ b/bin/node-template/pallets/template/Cargo.toml
@@ -25,6 +25,12 @@ default-features = false
 version = "3.0.0"
 path = "../../../../frame/system"
 
+[dependencies.frame-benchmarking]
+default-features = false
+version = "3.1.0"
+path = "../../../../frame/benchmarking"
+optional = true
+
 [dev-dependencies]
 serde = { version = "1.0.101" }
 
@@ -43,12 +49,13 @@ default-features = false
 version = "3.0.0"
 path = "../../../../primitives/runtime"
 
-
 [features]
 default = ['std']
 std = [
 	'codec/std',
 	'frame-support/std',
-	'frame-system/std'
+	'frame-system/std',
+	'frame-benchmarking/std',
 ]
+runtime-benchmarks = ["frame-benchmarking"]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/bin/node-template/pallets/template/src/benchmarking.rs b/bin/node-template/pallets/template/src/benchmarking.rs
new file mode 100644
index 000000000000..5296ed7261d9
--- /dev/null
+++ b/bin/node-template/pallets/template/src/benchmarking.rs
@@ -0,0 +1,24 @@
+//! Benchmarking setup for pallet-template
+
+use super::*;
+
+use frame_system::RawOrigin;
+use frame_benchmarking::{benchmarks, whitelisted_caller, impl_benchmark_test_suite};
+#[allow(unused)]
+use crate::Module as Template;
+
+benchmarks! {
+	do_something {
+		let s in 0 .. 100;
+		let caller: T::AccountId = whitelisted_caller();
+	}: _(RawOrigin::Signed(caller), s)
+	verify {
+		assert_eq!(Something::<T>::get(), Some(s));
+	}
+}
+
+impl_benchmark_test_suite!(
+	Template,
+	crate::mock::new_test_ext(),
+	crate::mock::Test,
+);
diff --git a/bin/node-template/pallets/template/src/lib.rs b/bin/node-template/pallets/template/src/lib.rs
index 52d9e8111d13..5f4e4253f813 100644
--- a/bin/node-template/pallets/template/src/lib.rs
+++ b/bin/node-template/pallets/template/src/lib.rs
@@ -12,6 +12,9 @@ mod mock;
 #[cfg(test)]
 mod tests;
 
+#[cfg(feature = "runtime-benchmarks")]
+mod benchmarking;
+
 #[frame_support::pallet]
 pub mod pallet {
 	use frame_support::{dispatch::DispatchResultWithPostInfo, pallet_prelude::*};
@@ -46,7 +49,7 @@ pub mod pallet {
 		/// parameters. [something, who]
 		SomethingStored(u32, T::AccountId),
 	}
-	
+
 	// Errors inform users that something went wrong.
 	#[pallet::error]
 	pub enum Error<T> {
diff --git a/bin/node-template/runtime/Cargo.toml b/bin/node-template/runtime/Cargo.toml
index de69419b92a4..d4e202d688c8 100644
--- a/bin/node-template/runtime/Cargo.toml
+++ b/bin/node-template/runtime/Cargo.toml
@@ -89,4 +89,5 @@ runtime-benchmarks = [
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
+	"template/runtime-benchmarks",
 ]
diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index 8d68dbdc9686..274e46d24d71 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -475,6 +475,7 @@ impl_runtime_apis! {
 			add_benchmark!(params, batches, frame_system, SystemBench::<Runtime>);
 			add_benchmark!(params, batches, pallet_balances, Balances);
 			add_benchmark!(params, batches, pallet_timestamp, Timestamp);
+			add_benchmark!(params, batches, template, TemplateModule);
 
 			if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) }
 			Ok(batches)
diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
index 266e2c7882ce..c2f60a5e13c4 100644
--- a/frame/benchmarking/src/lib.rs
+++ b/frame/benchmarking/src/lib.rs
@@ -34,6 +34,8 @@ pub use sp_runtime::traits::Zero;
 #[doc(hidden)]
 pub use frame_support;
 #[doc(hidden)]
+pub use sp_std::{self, vec, prelude::Vec, boxed::Box};
+#[doc(hidden)]
 pub use paste;
 #[doc(hidden)]
 pub use sp_storage::TrackedStorageKey;
@@ -566,8 +568,8 @@ macro_rules! benchmark_backend {
 			$crate::BenchmarkingSetup<T $(, $instance)? > for $name
 			where $( $where_clause )*
 		{
-			fn components(&self) -> Vec<($crate::BenchmarkParameter, u32, u32)> {
-				vec! [
+			fn components(&self) -> $crate::Vec<($crate::BenchmarkParameter, u32, u32)> {
+				$crate::vec! [
 					$(
 						($crate::BenchmarkParameter::$param, $param_from, $param_to)
 					),*
@@ -578,7 +580,7 @@ macro_rules! benchmark_backend {
 				&self,
 				components: &[($crate::BenchmarkParameter, u32)],
 				verify: bool
-			) -> Result<Box<dyn FnOnce() -> Result<(), &'static str>>, &'static str> {
+			) -> Result<$crate::Box<dyn FnOnce() -> Result<(), &'static str>>, &'static str> {
 				$(
 					// Prepare instance
 					let $param = components.iter()
@@ -592,7 +594,7 @@ macro_rules! benchmark_backend {
 				$( $param_instancer ; )*
 				$( $post )*
 
-				Ok(Box::new(move || -> Result<(), &'static str> {
+				Ok($crate::Box::new(move || -> Result<(), &'static str> {
 					$eval;
 					if verify {
 						$postcode;
@@ -637,7 +639,7 @@ macro_rules! selected_benchmark {
 			$crate::BenchmarkingSetup<T $(, $instance )? > for SelectedBenchmark
 			where $( $where_clause )*
 		{
-			fn components(&self) -> Vec<($crate::BenchmarkParameter, u32, u32)> {
+			fn components(&self) -> $crate::Vec<($crate::BenchmarkParameter, u32, u32)> {
 				match self {
 					$(
 						Self::$bench => <
@@ -651,7 +653,7 @@ macro_rules! selected_benchmark {
 				&self,
 				components: &[($crate::BenchmarkParameter, u32)],
 				verify: bool
-			) -> Result<Box<dyn FnOnce() -> Result<(), &'static str>>, &'static str> {
+			) -> Result<$crate::Box<dyn FnOnce() -> Result<(), &'static str>>, &'static str> {
 				match self {
 					$(
 						Self::$bench => <
@@ -677,8 +679,8 @@ macro_rules! impl_benchmark {
 			$crate::Benchmarking<$crate::BenchmarkResults> for Module<T $(, $instance)? >
 			where T: frame_system::Config, $( $where_clause )*
 		{
-			fn benchmarks(extra: bool) -> Vec<&'static [u8]> {
-				let mut all = vec![ $( stringify!($name).as_ref() ),* ];
+			fn benchmarks(extra: bool) -> $crate::Vec<&'static [u8]> {
+				let mut all = $crate::vec![ $( stringify!($name).as_ref() ),* ];
 				if !extra {
 					let extra = [ $( stringify!($name_extra).as_ref() ),* ];
 					all.retain(|x| !extra.contains(x));
@@ -694,15 +696,15 @@ macro_rules! impl_benchmark {
 				repeat: u32,
 				whitelist: &[$crate::TrackedStorageKey],
 				verify: bool,
-			) -> Result<Vec<$crate::BenchmarkResults>, &'static str> {
+			) -> Result<$crate::Vec<$crate::BenchmarkResults>, &'static str> {
 				// Map the input to the selected benchmark.
-				let extrinsic = sp_std::str::from_utf8(extrinsic)
+				let extrinsic = $crate::sp_std::str::from_utf8(extrinsic)
 					.map_err(|_| "`extrinsic` is not a valid utf8 string!")?;
 				let selected_benchmark = match extrinsic {
 					$( stringify!($name) => SelectedBenchmark::$name, )*
 					_ => return Err("Could not find extrinsic."),
 				};
-				let mut results: Vec<$crate::BenchmarkResults> = Vec::new();
+				let mut results: $crate::Vec<$crate::BenchmarkResults> = $crate::Vec::new();
 				if repeat == 0 {
 					return Ok(results);
 				}
@@ -710,7 +712,7 @@ macro_rules! impl_benchmark {
 				// Add whitelist to DB including whitelisted caller
 				let mut whitelist = whitelist.to_vec();
 				let whitelisted_caller_key =
-					<frame_system::Account::<T> as frame_support::storage::StorageMap<_,_>>::hashed_key_for(
+					<frame_system::Account::<T> as $crate::frame_support::storage::StorageMap<_,_>>::hashed_key_for(
 						$crate::whitelisted_caller::<T::AccountId>()
 					);
 				whitelist.push(whitelisted_caller_key.into());
@@ -730,7 +732,7 @@ macro_rules! impl_benchmark {
 				let repeat_benchmark = |
 					repeat: u32,
 					c: &[($crate::BenchmarkParameter, u32)],
-					results: &mut Vec<$crate::BenchmarkResults>,
+					results: &mut $crate::Vec<$crate::BenchmarkResults>,
 					verify: bool,
 				| -> Result<(), &'static str> {
 					// Run the benchmark `repeat` times.
@@ -807,7 +809,7 @@ macro_rules! impl_benchmark {
 				if components.is_empty() {
 					if verify {
 						// If `--verify` is used, run the benchmark once to verify it would complete.
-						repeat_benchmark(1, Default::default(), &mut Vec::new(), true)?;
+						repeat_benchmark(1, Default::default(), &mut $crate::Vec::new(), true)?;
 					}
 					repeat_benchmark(repeat, Default::default(), &mut results, false)?;
 				} else {
@@ -834,7 +836,7 @@ macro_rules! impl_benchmark {
 							let component_value = lowest + step_size * s;
 
 							// Select the max value for all the other components.
-							let c: Vec<($crate::BenchmarkParameter, u32)> = components.iter()
+							let c: $crate::Vec<($crate::BenchmarkParameter, u32)> = components.iter()
 								.enumerate()
 								.map(|(idx, (n, _, h))|
 									if n == name {
@@ -847,7 +849,7 @@ macro_rules! impl_benchmark {
 
 							if verify {
 								// If `--verify` is used, run the benchmark once to verify it would complete.
-								repeat_benchmark(1, &c, &mut Vec::new(), true)?;
+								repeat_benchmark(1, &c, &mut $crate::Vec::new(), true)?;
 							}
 							repeat_benchmark(repeat, &c, &mut results, false)?;
 						}
@@ -872,7 +874,7 @@ macro_rules! impl_benchmark {
 		where
 			T: Config + frame_system::Config, $( $where_clause )*
 		{
-			let name = sp_std::str::from_utf8(name)
+			let name = $crate::sp_std::str::from_utf8(name)
 				.map_err(|_| "`name` is not a valid utf8 string!")?;
 			match name {
 				$( stringify!($name) => {
@@ -905,7 +907,7 @@ macro_rules! impl_benchmark_test {
 				>::components(&selected_benchmark);
 
 				let execute_benchmark = |
-					c: Vec<($crate::BenchmarkParameter, u32)>
+					c: $crate::Vec<($crate::BenchmarkParameter, u32)>
 				| -> Result<(), &'static str> {
 					// Set up the benchmark, return execution + verification function.
 					let closure_to_verify = <
@@ -931,9 +933,9 @@ macro_rules! impl_benchmark_test {
 				} else {
 					for (_, (name, low, high)) in components.iter().enumerate() {
 						// Test only the low and high value, assuming values in the middle won't break
-						for component_value in vec![low, high] {
+						for component_value in $crate::vec![low, high] {
 							// Select the max value for all the other components.
-							let c: Vec<($crate::BenchmarkParameter, u32)> = components.iter()
+							let c: $crate::Vec<($crate::BenchmarkParameter, u32)> = components.iter()
 								.enumerate()
 								.map(|(_, (n, _, h))|
 									if n == name {
diff --git a/frame/merkle-mountain-range/src/benchmarking.rs b/frame/merkle-mountain-range/src/benchmarking.rs
index 750a140382b9..f64e2e39aaa4 100644
--- a/frame/merkle-mountain-range/src/benchmarking.rs
+++ b/frame/merkle-mountain-range/src/benchmarking.rs
@@ -22,7 +22,6 @@
 use crate::*;
 use frame_support::traits::OnInitialize;
 use frame_benchmarking::{benchmarks, impl_benchmark_test_suite};
-use sp_std::prelude::*;
 
 benchmarks! {
 	on_initialize {
diff --git a/frame/timestamp/src/benchmarking.rs b/frame/timestamp/src/benchmarking.rs
index 57b8ce2d1b70..b3e8eca889cb 100644
--- a/frame/timestamp/src/benchmarking.rs
+++ b/frame/timestamp/src/benchmarking.rs
@@ -20,7 +20,6 @@
 #![cfg(feature = "runtime-benchmarks")]
 
 use super::*;
-use sp_std::prelude::*;
 use frame_system::RawOrigin;
 use frame_support::{ensure, traits::OnFinalize};
 use frame_benchmarking::{benchmarks, TrackedStorageKey, impl_benchmark_test_suite};

From 0a85d362cdbcd11267e53fa8563f0ddc8181bf7c Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Tue, 2 Mar 2021 19:03:05 +0100
Subject: [PATCH 0455/1194] make use of matches (#8211)

---
 frame/elections-phragmen/src/lib.rs | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index d4676e98b823..d3b12d127a3c 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -2427,17 +2427,14 @@ mod tests {
 
 			// no replacement yet.
 			let unwrapped_error = Elections::remove_member(Origin::root(), 4, true).unwrap_err();
-			matches!(
+			assert!(matches!(
 				unwrapped_error.error,
 				DispatchError::Module {
 					message: Some("InvalidReplacement"),
 					..
 				}
-			);
-			matches!(
-				unwrapped_error.post_info.actual_weight,
-				Some(x) if x < <Test as frame_system::Config>::BlockWeights::get().max_block
-			);
+			));
+			assert!(unwrapped_error.post_info.actual_weight.is_some());
 		});
 
 		ExtBuilder::default().desired_runners_up(1).build_and_execute(|| {
@@ -2456,17 +2453,14 @@ mod tests {
 
 			// there is a replacement! and this one needs a weight refund.
 			let unwrapped_error = Elections::remove_member(Origin::root(), 4, false).unwrap_err();
-			matches!(
+			assert!(matches!(
 				unwrapped_error.error,
 				DispatchError::Module {
 					message: Some("InvalidReplacement"),
 					..
 				}
-			);
-			matches!(
-				unwrapped_error.post_info.actual_weight,
-				Some(x) if x < <Test as frame_system::Config>::BlockWeights::get().max_block
-			);
+			));
+			assert!(unwrapped_error.post_info.actual_weight.is_some());
 		});
 	}
 

From 73942bc4d3dfad7950db5bc58ecfdc5a1cc9b6c8 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Tue, 2 Mar 2021 19:13:47 +0100
Subject: [PATCH 0456/1194] Add some migration helper to help migrating pallet
 changing pallet prefix (#8199)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* migration helper

* fix move_storage

* format

* doc

* improve doc

* Update frame/support/src/storage/migration.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 frame/support/src/storage/migration.rs | 194 ++++++++++++++++++++++++-
 1 file changed, 193 insertions(+), 1 deletion(-)

diff --git a/frame/support/src/storage/migration.rs b/frame/support/src/storage/migration.rs
index 69b9920194f4..b29a0b83652d 100644
--- a/frame/support/src/storage/migration.rs
+++ b/frame/support/src/storage/migration.rs
@@ -19,9 +19,11 @@
 
 use sp_std::prelude::*;
 use codec::{Encode, Decode};
-use crate::{StorageHasher, Twox128};
+use crate::{StorageHasher, Twox128, storage::unhashed};
 use crate::hash::ReversibleStorageHasher;
 
+use super::PrefixIterator;
+
 /// Utility to iterate through raw items in storage.
 pub struct StorageIterator<T> {
 	prefix: Vec<u8>,
@@ -195,3 +197,193 @@ pub fn take_storage_item<K: Encode + Sized, T: Decode + Sized, H: StorageHasher>
 ) -> Option<T> {
 	take_storage_value(module, item, key.using_encoded(H::hash).as_ref())
 }
+
+/// Move a storage from a pallet prefix to another pallet prefix.
+///
+/// Keys used in pallet storages always start with:
+/// `concat(twox_128(pallet_name), towx_128(storage_name))`.
+///
+/// This function will remove all value for which the key start with
+/// `concat(twox_128(old_pallet_name), towx_128(storage_name))` and insert them at the key with
+/// the start replaced by `concat(twox_128(new_pallet_name), towx_128(storage_name))`.
+///
+/// # Example
+///
+/// If a pallet named "my_example" has 2 storages named "Foo" and "Bar" and the pallet is renamed
+/// "my_new_example_name", a migration can be:
+/// ```
+/// # use frame_support::storage::migration::move_storage_from_pallet;
+/// # sp_io::TestExternalities::new_empty().execute_with(|| {
+/// move_storage_from_pallet(b"Foo", b"my_example", b"my_new_example_name");
+/// move_storage_from_pallet(b"Bar", b"my_example", b"my_new_example_name");
+/// # })
+/// ```
+pub fn move_storage_from_pallet(
+	storage_name: &[u8],
+	old_pallet_name: &[u8],
+	new_pallet_name: &[u8]
+) {
+	let mut new_prefix = Vec::new();
+	new_prefix.extend_from_slice(&Twox128::hash(new_pallet_name));
+	new_prefix.extend_from_slice(&Twox128::hash(storage_name));
+
+	let mut old_prefix = Vec::new();
+	old_prefix.extend_from_slice(&Twox128::hash(old_pallet_name));
+	old_prefix.extend_from_slice(&Twox128::hash(storage_name));
+
+	move_prefix(&old_prefix, &new_prefix);
+
+	if let Some(value) = unhashed::get_raw(&old_prefix) {
+		unhashed::put_raw(&new_prefix, &value);
+		unhashed::kill(&old_prefix);
+	}
+}
+
+/// Move all storages from a pallet prefix to another pallet prefix.
+///
+/// Keys used in pallet storages always start with:
+/// `concat(twox_128(pallet_name), towx_128(storage_name))`.
+///
+/// This function will remove all value for which the key start with `twox_128(old_pallet_name)`
+/// and insert them at the key with the start replaced by `twox_128(new_pallet_name)`.
+///
+/// NOTE: The value at the key `twox_128(old_pallet_name)` is not moved.
+///
+/// # Example
+///
+/// If a pallet named "my_example" has some storages and the pallet is renamed
+/// "my_new_example_name", a migration can be:
+/// ```
+/// # use frame_support::storage::migration::move_pallet;
+/// # sp_io::TestExternalities::new_empty().execute_with(|| {
+/// move_pallet(b"my_example", b"my_new_example_name");
+/// # })
+/// ```
+pub fn move_pallet(old_pallet_name: &[u8], new_pallet_name: &[u8]) {
+	move_prefix(&Twox128::hash(old_pallet_name), &Twox128::hash(new_pallet_name))
+}
+
+/// Move all `(key, value)` after some prefix to the another prefix
+///
+/// This function will remove all value for which the key start with `from_prefix`
+/// and insert them at the key with the start replaced by `to_prefix`.
+///
+/// NOTE: The value at the key `from_prefix` is not moved.
+pub fn move_prefix(from_prefix: &[u8], to_prefix: &[u8]) {
+	if from_prefix == to_prefix {
+		return
+	}
+
+	let iter = PrefixIterator {
+		prefix: from_prefix.to_vec(),
+		previous_key: from_prefix.to_vec(),
+		drain: true,
+		closure: |key, value| Ok((key.to_vec(), value.to_vec())),
+	};
+
+	for (key, value) in iter {
+		let full_key = [to_prefix, &key].concat();
+		unhashed::put_raw(&full_key, &value);
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use crate::{
+		pallet_prelude::{StorageValue, StorageMap, Twox64Concat, Twox128},
+		hash::StorageHasher,
+	};
+	use sp_io::TestExternalities;
+	use super::{move_prefix, move_pallet, move_storage_from_pallet};
+
+	struct OldPalletStorageValuePrefix;
+	impl frame_support::traits::StorageInstance for OldPalletStorageValuePrefix {
+		const STORAGE_PREFIX: &'static str = "foo_value";
+		fn pallet_prefix() -> &'static str {
+			"my_old_pallet"
+		}
+	}
+	type OldStorageValue = StorageValue<OldPalletStorageValuePrefix, u32>;
+
+	struct OldPalletStorageMapPrefix;
+	impl frame_support::traits::StorageInstance for OldPalletStorageMapPrefix {
+		const STORAGE_PREFIX: &'static str = "foo_map";
+		fn pallet_prefix() -> &'static str {
+			"my_old_pallet"
+		}
+	}
+	type OldStorageMap = StorageMap<OldPalletStorageMapPrefix, Twox64Concat, u32, u32>;
+
+	struct NewPalletStorageValuePrefix;
+	impl frame_support::traits::StorageInstance for NewPalletStorageValuePrefix {
+		const STORAGE_PREFIX: &'static str = "foo_value";
+		fn pallet_prefix() -> &'static str {
+			"my_new_pallet"
+		}
+	}
+	type NewStorageValue = StorageValue<NewPalletStorageValuePrefix, u32>;
+
+	struct NewPalletStorageMapPrefix;
+	impl frame_support::traits::StorageInstance for NewPalletStorageMapPrefix {
+		const STORAGE_PREFIX: &'static str = "foo_map";
+		fn pallet_prefix() -> &'static str {
+			"my_new_pallet"
+		}
+	}
+	type NewStorageMap = StorageMap<NewPalletStorageMapPrefix, Twox64Concat, u32, u32>;
+
+	#[test]
+	fn test_move_prefix() {
+		TestExternalities::new_empty().execute_with(|| {
+			OldStorageValue::put(3);
+			OldStorageMap::insert(1, 2);
+			OldStorageMap::insert(3, 4);
+
+			move_prefix(&Twox128::hash(b"my_old_pallet"), &Twox128::hash(b"my_new_pallet"));
+
+			assert_eq!(OldStorageValue::get(), None);
+			assert_eq!(OldStorageMap::iter().collect::<Vec<_>>(), vec![]);
+			assert_eq!(NewStorageValue::get(), Some(3));
+			assert_eq!(NewStorageMap::iter().collect::<Vec<_>>(), vec![(1, 2), (3, 4)]);
+		})
+	}
+
+	#[test]
+	fn test_move_storage() {
+		TestExternalities::new_empty().execute_with(|| {
+			OldStorageValue::put(3);
+			OldStorageMap::insert(1, 2);
+			OldStorageMap::insert(3, 4);
+
+			move_storage_from_pallet(b"foo_map", b"my_old_pallet", b"my_new_pallet");
+
+			assert_eq!(OldStorageValue::get(), Some(3));
+			assert_eq!(OldStorageMap::iter().collect::<Vec<_>>(), vec![]);
+			assert_eq!(NewStorageValue::get(), None);
+			assert_eq!(NewStorageMap::iter().collect::<Vec<_>>(), vec![(1, 2), (3, 4)]);
+
+			move_storage_from_pallet(b"foo_value", b"my_old_pallet", b"my_new_pallet");
+
+			assert_eq!(OldStorageValue::get(), None);
+			assert_eq!(OldStorageMap::iter().collect::<Vec<_>>(), vec![]);
+			assert_eq!(NewStorageValue::get(), Some(3));
+			assert_eq!(NewStorageMap::iter().collect::<Vec<_>>(), vec![(1, 2), (3, 4)]);
+		})
+	}
+
+	#[test]
+	fn test_move_pallet() {
+		TestExternalities::new_empty().execute_with(|| {
+			OldStorageValue::put(3);
+			OldStorageMap::insert(1, 2);
+			OldStorageMap::insert(3, 4);
+
+			move_pallet(b"my_old_pallet", b"my_new_pallet");
+
+			assert_eq!(OldStorageValue::get(), None);
+			assert_eq!(OldStorageMap::iter().collect::<Vec<_>>(), vec![]);
+			assert_eq!(NewStorageValue::get(), Some(3));
+			assert_eq!(NewStorageMap::iter().collect::<Vec<_>>(), vec![(1, 2), (3, 4)]);
+		})
+	}
+}

From b203f79a07e5f5a94d23f639dc4df7d54e8fe33d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Wed, 3 Mar 2021 09:41:27 +0100
Subject: [PATCH 0457/1194] Move AuRa digest from client to primitives (#8245)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Move AuRa digest from client to primitives

This makes the digest stuff usable from inside the runtime ;)

* Update primitives/runtime/src/generic/digest.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Review feedback

* Make BABE use the new functionality

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
---
 client/consensus/aura/src/lib.rs              | 44 ++++++------
 .../consensus/aura/src/digests.rs             | 28 ++++----
 primitives/consensus/aura/src/lib.rs          |  1 +
 primitives/consensus/babe/src/digests.rs      | 10 +--
 primitives/runtime/src/generic/digest.rs      | 71 ++++++++++++++++---
 5 files changed, 99 insertions(+), 55 deletions(-)
 rename {client => primitives}/consensus/aura/src/digests.rs (72%)

diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index 746ee6597ea7..71aa7bdb7c74 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -77,16 +77,13 @@ use sp_consensus_slots::Slot;
 use sp_api::ApiExt;
 
 pub use sp_consensus_aura::{
-	ConsensusLog, AuraApi, AURA_ENGINE_ID,
+	ConsensusLog, AuraApi, AURA_ENGINE_ID, digests::CompatibleDigestItem,
 	inherents::{
 		InherentType as AuraInherent,
 		AuraInherentData, INHERENT_IDENTIFIER, InherentDataProvider,
 	},
 };
 pub use sp_consensus::SyncOracle;
-pub use digests::CompatibleDigestItem;
-
-mod digests;
 
 type AuthorityId<P> = <P as Pair>::Public;
 
@@ -271,7 +268,7 @@ where
 		_claim: &Self::Claim,
 	) -> Vec<sp_runtime::DigestItem<B::Hash>> {
 		vec![
-			<DigestItemFor<B> as CompatibleDigestItem<P>>::aura_pre_digest(slot),
+			<DigestItemFor<B> as CompatibleDigestItem<P::Signature>>::aura_pre_digest(slot),
 		]
 	}
 
@@ -308,7 +305,9 @@ where
 					signature, public
 				))?;
 
-			let signature_digest_item = <DigestItemFor<B> as CompatibleDigestItem<P>>::aura_seal(signature);
+			let signature_digest_item = <
+				DigestItemFor<B> as CompatibleDigestItem<P::Signature>
+			>::aura_seal(signature);
 
 			let mut import_block = BlockImportParams::new(BlockOrigin::Own, header);
 			import_block.post_digests.push(signature_digest_item);
@@ -326,7 +325,7 @@ where
 
 	fn should_backoff(&self, slot: Slot, chain_head: &B::Header) -> bool {
 		if let Some(ref strategy) = self.backoff_authoring_blocks {
-			if let Ok(chain_head_slot) = find_pre_digest::<B, P>(chain_head) {
+			if let Ok(chain_head_slot) = find_pre_digest::<B, P::Signature>(chain_head) {
 				return strategy.should_backoff(
 					*chain_head.number(),
 					chain_head_slot,
@@ -356,7 +355,7 @@ where
 	) -> Option<std::time::Duration> {
 		let slot_remaining = self.slot_remaining_duration(slot_info);
 
-		let parent_slot = match find_pre_digest::<B, P>(head) {
+		let parent_slot = match find_pre_digest::<B, P::Signature>(head) {
 			Err(_) => return Some(slot_remaining),
 			Ok(d) => d,
 		};
@@ -414,11 +413,7 @@ impl<B: BlockT> std::convert::From<Error<B>> for String {
 	}
 }
 
-fn find_pre_digest<B: BlockT, P: Pair>(header: &B::Header) -> Result<Slot, Error<B>>
-	where DigestItemFor<B>: CompatibleDigestItem<P>,
-		P::Signature: Decode,
-		P::Public: Encode + Decode + PartialEq + Clone,
-{
+fn find_pre_digest<B: BlockT, Signature: Codec>(header: &B::Header) -> Result<Slot, Error<B>> {
 	if header.number().is_zero() {
 		return Ok(0.into());
 	}
@@ -426,7 +421,7 @@ fn find_pre_digest<B: BlockT, P: Pair>(header: &B::Header) -> Result<Slot, Error
 	let mut pre_digest: Option<Slot> = None;
 	for log in header.digest().logs() {
 		trace!(target: "aura", "Checking log {:?}", log);
-		match (log.as_aura_pre_digest(), pre_digest.is_some()) {
+		match (CompatibleDigestItem::<Signature>::as_aura_pre_digest(log), pre_digest.is_some()) {
 			(Some(_), true) => Err(aura_err(Error::MultipleHeaders))?,
 			(None, _) => trace!(target: "aura", "Ignoring digest not meant for us"),
 			(s, false) => pre_digest = s,
@@ -435,8 +430,9 @@ fn find_pre_digest<B: BlockT, P: Pair>(header: &B::Header) -> Result<Slot, Error
 	pre_digest.ok_or_else(|| aura_err(Error::NoDigestFound))
 }
 
-/// check a header has been signed by the right key. If the slot is too far in the future, an error will be returned.
-/// if it's successful, returns the pre-header and the digest item containing the seal.
+/// check a header has been signed by the right key. If the slot is too far in the future, an error
+/// will be returned. If it's successful, returns the pre-header and the digest item
+/// containing the seal.
 ///
 /// This digest item will always return `Some` when used with `as_aura_seal`.
 //
@@ -447,8 +443,8 @@ fn check_header<C, B: BlockT, P: Pair>(
 	hash: B::Hash,
 	authorities: &[AuthorityId<P>],
 ) -> Result<CheckedHeader<B::Header, (Slot, DigestItemFor<B>)>, Error<B>> where
-	DigestItemFor<B>: CompatibleDigestItem<P>,
-	P::Signature: Decode,
+	DigestItemFor<B>: CompatibleDigestItem<P::Signature>,
+	P::Signature: Codec,
 	C: sc_client_api::backend::AuxStore,
 	P::Public: Encode + Decode + PartialEq + Clone,
 {
@@ -461,7 +457,7 @@ fn check_header<C, B: BlockT, P: Pair>(
 		aura_err(Error::HeaderBadSeal(hash))
 	})?;
 
-	let slot = find_pre_digest::<B, _>(&header)?;
+	let slot = find_pre_digest::<B, P::Signature>(&header)?;
 
 	if slot > slot_now {
 		header.digest_mut().push(seal);
@@ -582,7 +578,7 @@ impl<B: BlockT, C, P, CAW> Verifier<B> for AuraVerifier<C, P, CAW> where
 		ProvideCache<B> +
 		BlockOf,
 	C::Api: BlockBuilderApi<B> + AuraApi<B, AuthorityId<P>> + ApiExt<B>,
-	DigestItemFor<B>: CompatibleDigestItem<P>,
+	DigestItemFor<B>: CompatibleDigestItem<P::Signature>,
 	P: Pair + Send + Sync + 'static,
 	P::Public: Send + Sync + Hash + Eq + Clone + Decode + Encode + Debug + 'static,
 	P::Signature: Encode + Decode,
@@ -805,7 +801,7 @@ impl<Block: BlockT, C, I, P> BlockImport<Block> for AuraBlockImport<Block, C, I,
 		new_cache: HashMap<CacheKeyId, Vec<u8>>,
 	) -> Result<ImportResult, Self::Error> {
 		let hash = block.post_hash();
-		let slot = find_pre_digest::<Block, P>(&block.header)
+		let slot = find_pre_digest::<Block, P::Signature>(&block.header)
 			.expect("valid Aura headers must contain a predigest; \
 					 header has been already verified; qed");
 
@@ -816,7 +812,7 @@ impl<Block: BlockT, C, I, P> BlockImport<Block> for AuraBlockImport<Block, C, I,
 				Error::<Block>::ParentUnavailable(parent_hash, hash)
 			).into()))?;
 
-		let parent_slot = find_pre_digest::<Block, P>(&parent_header)
+		let parent_slot = find_pre_digest::<Block, P::Signature>(&parent_header)
 			.expect("valid Aura headers contain a pre-digest; \
 					parent header has already been verified; qed");
 
@@ -848,7 +844,7 @@ pub fn import_queue<B, I, C, P, S, CAW>(
 	C::Api: BlockBuilderApi<B> + AuraApi<B, AuthorityId<P>> + ApiExt<B>,
 	C: 'static + ProvideRuntimeApi<B> + BlockOf + ProvideCache<B> + Send + Sync + AuxStore + HeaderBackend<B>,
 	I: BlockImport<B, Error=ConsensusError, Transaction = sp_api::TransactionFor<C, B>> + Send + Sync + 'static,
-	DigestItemFor<B>: CompatibleDigestItem<P>,
+	DigestItemFor<B>: CompatibleDigestItem<P::Signature>,
 	P: Pair + Send + Sync + 'static,
 	P::Public: Clone + Eq + Send + Sync + Hash + Debug + Encode + Decode,
 	P::Signature: Encode + Decode,
@@ -858,7 +854,7 @@ pub fn import_queue<B, I, C, P, S, CAW>(
 	register_aura_inherent_data_provider(&inherent_data_providers, slot_duration.get())?;
 	initialize_authorities_cache(&*client)?;
 
-	let verifier = AuraVerifier {
+	let verifier = AuraVerifier::<_, P, _> {
 		client,
 		inherent_data_providers,
 		phantom: PhantomData,
diff --git a/client/consensus/aura/src/digests.rs b/primitives/consensus/aura/src/digests.rs
similarity index 72%
rename from client/consensus/aura/src/digests.rs
rename to primitives/consensus/aura/src/digests.rs
index bbf31136b0fc..e93214eeb4ba 100644
--- a/client/consensus/aura/src/digests.rs
+++ b/primitives/consensus/aura/src/digests.rs
@@ -21,22 +21,19 @@
 //! This implements the digests for AuRa, to allow the private
 //! `CompatibleDigestItem` trait to appear in public interfaces.
 
-use sp_core::Pair;
-use sp_consensus_aura::AURA_ENGINE_ID;
-use sp_runtime::generic::{DigestItem, OpaqueDigestItemId};
+use crate::AURA_ENGINE_ID;
+use sp_runtime::generic::DigestItem;
 use sp_consensus_slots::Slot;
 use codec::{Encode, Codec};
-use std::fmt::Debug;
-
-type Signature<P> = <P as Pair>::Signature;
+use sp_std::fmt::Debug;
 
 /// A digest item which is usable with aura consensus.
-pub trait CompatibleDigestItem<P: Pair>: Sized {
+pub trait CompatibleDigestItem<Signature>: Sized {
 	/// Construct a digest item which contains a signature on the hash.
-	fn aura_seal(signature: Signature<P>) -> Self;
+	fn aura_seal(signature: Signature) -> Self;
 
 	/// If this item is an Aura seal, return the signature.
-	fn as_aura_seal(&self) -> Option<Signature<P>>;
+	fn as_aura_seal(&self) -> Option<Signature>;
 
 	/// Construct a digest item which contains the slot number
 	fn aura_pre_digest(slot: Slot) -> Self;
@@ -45,17 +42,16 @@ pub trait CompatibleDigestItem<P: Pair>: Sized {
 	fn as_aura_pre_digest(&self) -> Option<Slot>;
 }
 
-impl<P, Hash> CompatibleDigestItem<P> for DigestItem<Hash> where
-	P: Pair,
-	Signature<P>: Codec,
+impl<Signature, Hash> CompatibleDigestItem<Signature> for DigestItem<Hash> where
+	Signature: Codec,
 	Hash: Debug + Send + Sync + Eq + Clone + Codec + 'static
 {
-	fn aura_seal(signature: Signature<P>) -> Self {
+	fn aura_seal(signature: Signature) -> Self {
 		DigestItem::Seal(AURA_ENGINE_ID, signature.encode())
 	}
 
-	fn as_aura_seal(&self) -> Option<Signature<P>> {
-		self.try_to(OpaqueDigestItemId::Seal(&AURA_ENGINE_ID))
+	fn as_aura_seal(&self) -> Option<Signature> {
+		self.seal_try_to(&AURA_ENGINE_ID)
 	}
 
 	fn aura_pre_digest(slot: Slot) -> Self {
@@ -63,6 +59,6 @@ impl<P, Hash> CompatibleDigestItem<P> for DigestItem<Hash> where
 	}
 
 	fn as_aura_pre_digest(&self) -> Option<Slot> {
-		self.try_to(OpaqueDigestItemId::PreRuntime(&AURA_ENGINE_ID))
+		self.pre_runtime_try_to(&AURA_ENGINE_ID)
 	}
 }
diff --git a/primitives/consensus/aura/src/lib.rs b/primitives/consensus/aura/src/lib.rs
index 95630fa7b5c6..8c9c57567c43 100644
--- a/primitives/consensus/aura/src/lib.rs
+++ b/primitives/consensus/aura/src/lib.rs
@@ -23,6 +23,7 @@ use codec::{Encode, Decode, Codec};
 use sp_std::vec::Vec;
 use sp_runtime::ConsensusEngineId;
 
+pub mod digests;
 pub mod inherents;
 
 pub mod sr25519 {
diff --git a/primitives/consensus/babe/src/digests.rs b/primitives/consensus/babe/src/digests.rs
index 5a89e1fbc015..f34a38bc8b01 100644
--- a/primitives/consensus/babe/src/digests.rs
+++ b/primitives/consensus/babe/src/digests.rs
@@ -23,7 +23,7 @@ use super::{
 };
 use codec::{Codec, Decode, Encode};
 use sp_std::vec::Vec;
-use sp_runtime::{generic::OpaqueDigestItemId, DigestItem, RuntimeDebug};
+use sp_runtime::{DigestItem, RuntimeDebug};
 
 use sp_consensus_vrf::schnorrkel::{Randomness, VRFOutput, VRFProof};
 
@@ -184,7 +184,7 @@ impl<Hash> CompatibleDigestItem for DigestItem<Hash> where
 	}
 
 	fn as_babe_pre_digest(&self) -> Option<PreDigest> {
-		self.try_to(OpaqueDigestItemId::PreRuntime(&BABE_ENGINE_ID))
+		self.pre_runtime_try_to(&BABE_ENGINE_ID)
 	}
 
 	fn babe_seal(signature: AuthoritySignature) -> Self {
@@ -192,11 +192,11 @@ impl<Hash> CompatibleDigestItem for DigestItem<Hash> where
 	}
 
 	fn as_babe_seal(&self) -> Option<AuthoritySignature> {
-		self.try_to(OpaqueDigestItemId::Seal(&BABE_ENGINE_ID))
+		self.seal_try_to(&BABE_ENGINE_ID)
 	}
 
 	fn as_next_epoch_descriptor(&self) -> Option<NextEpochDescriptor> {
-		self.try_to(OpaqueDigestItemId::Consensus(&BABE_ENGINE_ID))
+		self.consensus_try_to(&BABE_ENGINE_ID)
 			.and_then(|x: super::ConsensusLog| match x {
 				super::ConsensusLog::NextEpochData(n) => Some(n),
 				_ => None,
@@ -204,7 +204,7 @@ impl<Hash> CompatibleDigestItem for DigestItem<Hash> where
 	}
 
 	fn as_next_config_descriptor(&self) -> Option<NextConfigDescriptor> {
-		self.try_to(OpaqueDigestItemId::Consensus(&BABE_ENGINE_ID))
+		self.consensus_try_to(&BABE_ENGINE_ID)
 			.and_then(|x: super::ConsensusLog| match x {
 				super::ConsensusLog::NextConfigData(n) => Some(n),
 				_ => None,
diff --git a/primitives/runtime/src/generic/digest.rs b/primitives/runtime/src/generic/digest.rs
index 16bd887f0474..dcdd90f4a639 100644
--- a/primitives/runtime/src/generic/digest.rs
+++ b/primitives/runtime/src/generic/digest.rs
@@ -62,16 +62,12 @@ impl<Hash> Digest<Hash> {
 
 	/// Get reference to the first digest item that matches the passed predicate.
 	pub fn log<T: ?Sized, F: Fn(&DigestItem<Hash>) -> Option<&T>>(&self, predicate: F) -> Option<&T> {
-		self.logs().iter()
-			.filter_map(predicate)
-			.next()
+		self.logs().iter().find_map(predicate)
 	}
 
 	/// Get a conversion of the first digest item that successfully converts using the function.
 	pub fn convert_first<T, F: Fn(&DigestItem<Hash>) -> Option<T>>(&self, predicate: F) -> Option<T> {
-		self.logs().iter()
-			.filter_map(predicate)
-			.next()
+		self.logs().iter().find_map(predicate)
 	}
 }
 
@@ -251,10 +247,7 @@ impl<Hash> DigestItem<Hash> {
 
 	/// Returns Some if `self` is a `DigestItem::Other`.
 	pub fn as_other(&self) -> Option<&[u8]> {
-		match *self {
-			DigestItem::Other(ref v) => Some(&v[..]),
-			_ => None,
-		}
+		self.dref().as_other()
 	}
 
 	/// Returns the opaque data contained in the item if `Some` if this entry has the id given.
@@ -267,6 +260,29 @@ impl<Hash> DigestItem<Hash> {
 	pub fn try_to<T: Decode>(&self, id: OpaqueDigestItemId) -> Option<T> {
 		self.dref().try_to::<T>(id)
 	}
+
+	/// Try to match this to a `Self::Seal`, check `id` matches and decode it.
+	///
+	/// Returns `None` if this isn't a seal item, the `id` doesn't match or when the decoding fails.
+	pub fn seal_try_to<T: Decode>(&self, id: &ConsensusEngineId) -> Option<T> {
+		self.dref().seal_try_to(id)
+	}
+
+	/// Try to match this to a `Self::Consensus`, check `id` matches and decode it.
+	///
+	/// Returns `None` if this isn't a consensus item, the `id` doesn't match or
+	/// when the decoding fails.
+	pub fn consensus_try_to<T: Decode>(&self, id: &ConsensusEngineId) -> Option<T> {
+		self.dref().consensus_try_to(id)
+	}
+
+	/// Try to match this to a `Self::PreRuntime`, check `id` matches and decode it.
+	///
+	/// Returns `None` if this isn't a pre-runtime item, the `id` doesn't match or
+	/// when the decoding fails.
+	pub fn pre_runtime_try_to<T: Decode>(&self, id: &ConsensusEngineId) -> Option<T> {
+		self.dref().pre_runtime_try_to(id)
+	}
 }
 
 impl<Hash: Encode> Encode for DigestItem<Hash> {
@@ -374,6 +390,41 @@ impl<'a, Hash> DigestItemRef<'a, Hash> {
 	pub fn try_to<T: Decode>(&self, id: OpaqueDigestItemId) -> Option<T> {
 		self.try_as_raw(id).and_then(|mut x| Decode::decode(&mut x).ok())
 	}
+
+	/// Try to match this to a `Self::Seal`, check `id` matches and decode it.
+	///
+	/// Returns `None` if this isn't a seal item, the `id` doesn't match or when the decoding fails.
+	pub fn seal_try_to<T: Decode>(&self, id: &ConsensusEngineId) -> Option<T> {
+		match self {
+			Self::Seal(v, s) if *v == id =>
+				Decode::decode(&mut &s[..]).ok(),
+			_ => None,
+		}
+	}
+
+	/// Try to match this to a `Self::Consensus`, check `id` matches and decode it.
+	///
+	/// Returns `None` if this isn't a consensus item, the `id` doesn't match or
+	/// when the decoding fails.
+	pub fn consensus_try_to<T: Decode>(&self, id: &ConsensusEngineId) -> Option<T> {
+		match self {
+			Self::Consensus(v, s) if *v == id =>
+				Decode::decode(&mut &s[..]).ok(),
+			_ => None,
+		}
+	}
+
+	/// Try to match this to a `Self::PreRuntime`, check `id` matches and decode it.
+	///
+	/// Returns `None` if this isn't a pre-runtime item, the `id` doesn't match or
+	/// when the decoding fails.
+	pub fn pre_runtime_try_to<T: Decode>(&self, id: &ConsensusEngineId) -> Option<T> {
+		match self {
+			Self::PreRuntime(v, s) if *v == id =>
+				Decode::decode(&mut &s[..]).ok(),
+			_ => None,
+		}
+	}
 }
 
 impl<'a, Hash: Encode> Encode for DigestItemRef<'a, Hash> {

From 5f056830a85f33c5628e6a3fac5c8e3270514bfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Wed, 3 Mar 2021 09:44:34 +0100
Subject: [PATCH 0458/1194] Make `ExecuteBlock::execute_block` return the final
 block header (#8244)

This pr changes the `ExecuteBlock` trait to return the final header that
results from executing the given block.
---
 Cargo.lock                           |  1 -
 bin/node-template/runtime/src/lib.rs |  2 +-
 bin/node/runtime/src/lib.rs          |  2 +-
 frame/executive/README.md            |  3 +--
 frame/executive/src/lib.rs           | 30 ++++++++++++----------------
 frame/support/src/traits.rs          | 23 ++++++++++++++++++---
 test-utils/runtime/Cargo.toml        |  2 --
 test-utils/runtime/src/lib.rs        |  4 ++--
 test-utils/runtime/src/system.rs     | 18 +++++++++--------
 9 files changed, 48 insertions(+), 37 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c0b1fffa752a..e468e9852bcc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9283,7 +9283,6 @@ name = "substrate-test-runtime"
 version = "2.0.0"
 dependencies = [
  "cfg-if 1.0.0",
- "frame-executive",
  "frame-support",
  "frame-system",
  "frame-system-rpc-runtime-api",
diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index 274e46d24d71..a7372d5d0231 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -323,7 +323,7 @@ impl_runtime_apis! {
 		}
 
 		fn execute_block(block: Block) {
-			Executive::execute_block(block)
+			Executive::execute_block(block);
 		}
 
 		fn initialize_block(header: &<Block as BlockT>::Header) {
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 0219779ca535..20abb9b54ff0 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -1179,7 +1179,7 @@ impl_runtime_apis! {
 		}
 
 		fn execute_block(block: Block) {
-			Executive::execute_block(block)
+			Executive::execute_block(block);
 		}
 
 		fn initialize_block(header: &<Block as BlockT>::Header) {
diff --git a/frame/executive/README.md b/frame/executive/README.md
index 24b354902e87..183e32b2ff8a 100644
--- a/frame/executive/README.md
+++ b/frame/executive/README.md
@@ -22,7 +22,6 @@ The Executive module provides functions to:
 
 The Executive module provides the following implementations:
 
-- `ExecuteBlock`: Trait that can be used to execute a block.
 - `Executive`: Type that can be used to make the FRAME available from the runtime.
 
 ## Usage
@@ -58,4 +57,4 @@ impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade {
 pub type Executive = executive::Executive<Runtime, Block, Context, Runtime, AllModules, CustomOnRuntimeUpgrade>;
 ```
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index 53353c224a8b..b241f9f5ff0d 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -119,26 +119,20 @@
 use sp_std::{prelude::*, marker::PhantomData};
 use frame_support::{
 	weights::{GetDispatchInfo, DispatchInfo, DispatchClass},
-	traits::{OnInitialize, OnFinalize, OnRuntimeUpgrade, OffchainWorker},
+	traits::{OnInitialize, OnFinalize, OnRuntimeUpgrade, OffchainWorker, ExecuteBlock},
 	dispatch::PostDispatchInfo,
 };
 use sp_runtime::{
 	generic::Digest, ApplyExtrinsicResult,
 	traits::{
 		self, Header, Zero, One, Checkable, Applyable, CheckEqual, ValidateUnsigned, NumberFor,
-		Block as BlockT, Dispatchable, Saturating,
+		Dispatchable, Saturating,
 	},
 	transaction_validity::{TransactionValidity, TransactionSource},
 };
 use codec::{Codec, Encode};
 use frame_system::DigestOf;
 
-/// Trait that can be used to execute a block.
-pub trait ExecuteBlock<Block: BlockT> {
-	/// Actually execute all transitions for `block`.
-	fn execute_block(block: Block);
-}
-
 pub type CheckedOf<E, C> = <E as Checkable<C>>::Checked;
 pub type CallOf<E, C> = <CheckedOf<E, C> as Applyable>::Call;
 pub type OriginOf<E, C> = <CallOf<E, C> as Dispatchable>::Origin;
@@ -180,8 +174,8 @@ where
 	OriginOf<Block::Extrinsic, Context>: From<Option<System::AccountId>>,
 	UnsignedValidator: ValidateUnsigned<Call=CallOf<Block::Extrinsic, Context>>,
 {
-	fn execute_block(block: Block) {
-		Executive::<System, Block, Context, UnsignedValidator, AllModules>::execute_block(block);
+	fn execute_block(block: Block) -> Block::Header {
+		Executive::<System, Block, Context, UnsignedValidator, AllModules>::execute_block(block)
 	}
 }
 
@@ -318,11 +312,11 @@ where
 	}
 
 	/// Actually execute all transitions for `block`.
-	pub fn execute_block(block: Block) {
+	pub fn execute_block(block: Block) -> Block::Header {
 		sp_io::init_tracing();
 		sp_tracing::within_span! {
-			sp_tracing::info_span!( "execute_block", ?block);
-		{
+			sp_tracing::info_span!("execute_block", ?block);
+
 			Self::initialize_block(block.header());
 
 			// any initial checks
@@ -339,8 +333,8 @@ where
 			}
 
 			// any final checks
-			Self::final_checks(&header);
-		} };
+			Self::final_checks(&header)
+		}
 	}
 
 	/// Execute given extrinsics and take care of post-extrinsics book-keeping.
@@ -412,7 +406,7 @@ where
 		Ok(r.map(|_| ()).map_err(|e| e.error))
 	}
 
-	fn final_checks(header: &System::Header) {
+	fn final_checks(header: &System::Header) -> System::Header {
 		sp_tracing::enter_span!(sp_tracing::Level::TRACE, "final_checks");
 		// remove temporaries
 		let new_header = <frame_system::Module<System>>::finalize();
@@ -438,6 +432,8 @@ where
 			header.extrinsics_root() == new_header.extrinsics_root(),
 			"Transaction trie root must be valid.",
 		);
+
+		new_header
 	}
 
 	/// Check a given signed transaction for validity. This doesn't execute any
@@ -502,7 +498,7 @@ mod tests {
 	use sp_core::H256;
 	use sp_runtime::{
 		generic::{Era, DigestItem}, DispatchError, testing::{Digest, Header, Block},
-		traits::{Header as HeaderT, BlakeTwo256, IdentityLookup},
+		traits::{Header as HeaderT, BlakeTwo256, IdentityLookup, Block as BlockT},
 		transaction_validity::{
 			InvalidTransaction, ValidTransaction, TransactionValidityError, UnknownTransaction
 		},
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index 395a23d581e6..ae0f5b834315 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -26,9 +26,9 @@ use sp_runtime::{
 	RuntimeAppPublic, RuntimeDebug, BoundToRuntimeAppPublic,
 	ConsensusEngineId, DispatchResult, DispatchError,
 	traits::{
-	MaybeSerializeDeserialize, AtLeast32Bit, Saturating, TrailingZeroInput, Bounded, Zero,
-	BadOrigin, AtLeast32BitUnsigned, Convert, UniqueSaturatedFrom, UniqueSaturatedInto,
-	SaturatedConversion, StoredMapError,
+		MaybeSerializeDeserialize, AtLeast32Bit, Saturating, TrailingZeroInput, Bounded, Zero,
+		BadOrigin, AtLeast32BitUnsigned, Convert, UniqueSaturatedFrom, UniqueSaturatedInto,
+		SaturatedConversion, StoredMapError, Block as BlockT,
 	},
 };
 use sp_staking::SessionIndex;
@@ -2228,6 +2228,23 @@ pub trait GetPalletVersion {
 	fn storage_version() -> Option<PalletVersion>;
 }
 
+/// Something that can execute a given block.
+///
+/// Executing a block means that all extrinsics in a given block will be executed and the resulting
+/// header will be checked against the header of the given block.
+pub trait ExecuteBlock<Block: BlockT> {
+	/// Execute the given `block`.
+	///
+	/// This will execute all extrinsics in the block and check that the resulting header is correct.
+	///
+	/// Returns the result header.
+	///
+	/// # Panic
+	///
+	/// Panics when an extrinsics panics or the resulting header doesn't match the expected header.
+	fn execute_block(block: Block) -> Block::Header;
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;
diff --git a/test-utils/runtime/Cargo.toml b/test-utils/runtime/Cargo.toml
index bdb847ae5664..89da7929e64b 100644
--- a/test-utils/runtime/Cargo.toml
+++ b/test-utils/runtime/Cargo.toml
@@ -18,7 +18,6 @@ sp-consensus-aura = { version = "0.9.0", default-features = false, path = "../..
 sp-consensus-babe = { version = "0.9.0", default-features = false, path = "../../primitives/consensus/babe" }
 sp-block-builder = { version = "3.0.0", default-features = false, path = "../../primitives/block-builder" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-frame-executive = { version = "3.0.0", default-features = false, path = "../../frame/executive" }
 sp-inherents = { version = "3.0.0", default-features = false, path = "../../primitives/inherents" }
 sp-keyring = { version = "3.0.0", optional = true, path = "../../primitives/keyring" }
 memory-db = { version = "0.26.0", default-features = false }
@@ -68,7 +67,6 @@ std = [
 	"sp-consensus-babe/std",
 	"sp-block-builder/std",
 	"codec/std",
-	"frame-executive/std",
 	"sp-inherents/std",
 	"sp-keyring",
 	"log/std",
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index e915f345a09a..5f80dc93a95f 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -615,7 +615,7 @@ cfg_if! {
 				}
 
 				fn execute_block(block: Block) {
-					system::execute_block(block)
+					system::execute_block(block);
 				}
 
 				fn initialize_block(header: &<Block as BlockT>::Header) {
@@ -869,7 +869,7 @@ cfg_if! {
 				}
 
 				fn execute_block(block: Block) {
-					system::execute_block(block)
+					system::execute_block(block);
 				}
 
 				fn initialize_block(header: &<Block as BlockT>::Header) {
diff --git a/test-utils/runtime/src/system.rs b/test-utils/runtime/src/system.rs
index c379ec5de5ec..3c0f9b18981b 100644
--- a/test-utils/runtime/src/system.rs
+++ b/test-utils/runtime/src/system.rs
@@ -107,11 +107,11 @@ pub fn polish_block(block: &mut Block) {
 	execute_block_with_state_root_handler(block, Mode::Overwrite);
 }
 
-pub fn execute_block(mut block: Block) {
-	execute_block_with_state_root_handler(&mut block, Mode::Verify);
+pub fn execute_block(mut block: Block) -> Header {
+	execute_block_with_state_root_handler(&mut block, Mode::Verify)
 }
 
-fn execute_block_with_state_root_handler(block: &mut Block, mode: Mode) {
+fn execute_block_with_state_root_handler(block: &mut Block, mode: Mode) -> Header {
 	let header = &mut block.header;
 
 	initialize_block(header);
@@ -142,14 +142,16 @@ fn execute_block_with_state_root_handler(block: &mut Block, mode: Mode) {
 			"Transaction trie root must be valid.",
 		);
 	}
+
+	new_header
 }
 
 /// The block executor.
 pub struct BlockExecutor;
 
-impl frame_executive::ExecuteBlock<Block> for BlockExecutor {
-	fn execute_block(block: Block) {
-		execute_block(block);
+impl frame_support::traits::ExecuteBlock<Block> for BlockExecutor {
+	fn execute_block(block: Block) -> Header {
+		execute_block(block)
 	}
 }
 
@@ -407,7 +409,7 @@ mod tests {
 
 	#[test]
 	fn block_import_works_native() {
-		block_import_works(|b, ext| ext.execute_with(|| execute_block(b)));
+		block_import_works(|b, ext| ext.execute_with(|| { execute_block(b); }));
 	}
 
 	#[test]
@@ -507,7 +509,7 @@ mod tests {
 
 	#[test]
 	fn block_import_with_transaction_works_native() {
-		block_import_with_transaction_works(|b, ext| ext.execute_with(|| execute_block(b)));
+		block_import_with_transaction_works(|b, ext| ext.execute_with(|| { execute_block(b); }));
 	}
 
 	#[test]

From 8fc92d1d73a6a970947545bb929691eefdfdd293 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Wed, 3 Mar 2021 13:14:07 +0100
Subject: [PATCH 0459/1194] Allow pallet::call to return `DispatchResult`
 (#8241)

* allow dispatch result

* remove custom error message

* format

* add forgotten UI test

* fix test

* fix tests
---
 .../procedural/src/pallet/parse/call.rs       |  3 +--
 .../procedural/src/pallet/parse/helper.rs     | 25 +++++++++++++++++++
 frame/support/src/lib.rs                      |  7 +++---
 frame/support/test/tests/pallet.rs            | 15 ++++++++++-
 .../tests/pallet_ui/call_invalid_return.rs    | 22 ++++++++++++++++
 .../pallet_ui/call_invalid_return.stderr      |  5 ++++
 6 files changed, 71 insertions(+), 6 deletions(-)
 create mode 100644 frame/support/test/tests/pallet_ui/call_invalid_return.rs
 create mode 100644 frame/support/test/tests/pallet_ui/call_invalid_return.stderr

diff --git a/frame/support/procedural/src/pallet/parse/call.rs b/frame/support/procedural/src/pallet/parse/call.rs
index 880cf54f8b2c..39b37157db7d 100644
--- a/frame/support/procedural/src/pallet/parse/call.rs
+++ b/frame/support/procedural/src/pallet/parse/call.rs
@@ -21,7 +21,6 @@ use syn::spanned::Spanned;
 
 /// List of additional token to be used for parsing.
 mod keyword {
-	syn::custom_keyword!(DispatchResultWithPostInfo);
 	syn::custom_keyword!(Call);
 	syn::custom_keyword!(OriginFor);
 	syn::custom_keyword!(weight);
@@ -163,7 +162,7 @@ impl CallDef {
 				}
 
 				if let syn::ReturnType::Type(_, type_) = &method.sig.output {
-					syn::parse2::<keyword::DispatchResultWithPostInfo>(type_.to_token_stream())?;
+					helper::check_pallet_call_return_type(type_)?;
 				} else {
 					let msg = "Invalid pallet::call, require return type \
 						DispatchResultWithPostInfo";
diff --git a/frame/support/procedural/src/pallet/parse/helper.rs b/frame/support/procedural/src/pallet/parse/helper.rs
index 96ab33bb65ee..b6ee5c614d6f 100644
--- a/frame/support/procedural/src/pallet/parse/helper.rs
+++ b/frame/support/procedural/src/pallet/parse/helper.rs
@@ -27,6 +27,8 @@ mod keyword {
 	syn::custom_keyword!(T);
 	syn::custom_keyword!(Pallet);
 	syn::custom_keyword!(origin);
+	syn::custom_keyword!(DispatchResult);
+	syn::custom_keyword!(DispatchResultWithPostInfo);
 }
 
 /// A usage of instance, either the trait `Config` has been used with instance or without instance.
@@ -596,3 +598,26 @@ pub fn check_type_value_gen(
 
 	Ok(i)
 }
+
+/// Check the keyword `DispatchResultWithPostInfo` or `DispatchResult`.
+pub fn check_pallet_call_return_type(
+	type_: &syn::Type,
+) -> syn::Result<()> {
+	pub struct Checker;
+	impl syn::parse::Parse for Checker {
+		fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+			let lookahead = input.lookahead1();
+			if lookahead.peek(keyword::DispatchResultWithPostInfo) {
+				input.parse::<keyword::DispatchResultWithPostInfo>()?;
+				Ok(Self)
+			} else if lookahead.peek(keyword::DispatchResult) {
+				input.parse::<keyword::DispatchResult>()?;
+				Ok(Self)
+			} else {
+				Err(lookahead.error())
+			}
+		}
+	}
+
+	syn::parse2::<Checker>(type_.to_token_stream()).map(|_| ())
+}
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 4dbb6bff5ab2..3c3fc20a530d 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -1078,7 +1078,7 @@ pub mod pallet_prelude {
 		Twox128, Blake2_256, Blake2_128, Identity, Twox64Concat, Blake2_128Concat, ensure,
 		RuntimeDebug, storage,
 		traits::{Get, Hooks, IsType, GetPalletVersion, EnsureOrigin},
-		dispatch::{DispatchResultWithPostInfo, Parameter, DispatchError},
+		dispatch::{DispatchResultWithPostInfo, Parameter, DispatchError, DispatchResult},
 		weights::{DispatchClass, Pays, Weight},
 		storage::types::{StorageValue, StorageMap, StorageDoubleMap, ValueQuery, OptionQuery},
 	};
@@ -1244,7 +1244,7 @@ pub mod pallet_prelude {
 /// 		$some_arg: $some_type,
 /// 		// or with compact attribute: #[pallet::compact] $some_arg: $some_type,
 /// 		...
-/// 	) -> DispatchResultWithPostInfo {
+/// 	) -> DispatchResultWithPostInfo { // or `-> DispatchResult`
 /// 		...
 /// 	}
 /// 	...
@@ -1255,7 +1255,8 @@ pub mod pallet_prelude {
 ///
 /// Each dispatchable needs to define a weight with `#[pallet::weight($expr)]` attribute,
 /// the first argument must be `origin: OriginFor<T>`, compact encoding for argument can be used
-/// using `#[pallet::compact]`, function must return DispatchResultWithPostInfo.
+/// using `#[pallet::compact]`, function must return `DispatchResultWithPostInfo` or
+/// `DispatchResult`.
 ///
 /// All arguments must implement `Debug`, `PartialEq`, `Eq`, `Decode`, `Encode`, `Clone`. For ease
 /// of use, bound the trait `Member` available in frame_support::pallet_prelude.
diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index 8e0bacb9aa4a..a31ce9d91ae2 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -161,6 +161,14 @@ pub mod pallet {
 
 			Ok(().into())
 		}
+
+		// Test for DispatchResult return type
+		#[pallet::weight(1)]
+		fn foo_no_post_info(
+			_origin: OriginFor<T>,
+		) -> DispatchResult {
+			Ok(())
+		}
 	}
 
 	#[pallet::error]
@@ -425,7 +433,7 @@ fn call_expand() {
 	assert_eq!(call_foo.get_call_name(), "foo");
 	assert_eq!(
 		pallet::Call::<Runtime>::get_call_names(),
-		&["foo", "foo_transactional"],
+		&["foo", "foo_transactional", "foo_no_post_info"],
 	);
 }
 
@@ -669,6 +677,11 @@ fn metadata() {
 					" Doc comment put in metadata".to_string(),
 				]),
 			},
+			FunctionMetadata {
+				name: DecodeDifferent::Decoded("foo_no_post_info".to_string()),
+				arguments: DecodeDifferent::Decoded(vec![]),
+				documentation: DecodeDifferent::Decoded(vec![]),
+			},
 		])),
 		event: Some(DecodeDifferent::Decoded(vec![
 			EventMetadata {
diff --git a/frame/support/test/tests/pallet_ui/call_invalid_return.rs b/frame/support/test/tests/pallet_ui/call_invalid_return.rs
new file mode 100644
index 000000000000..477e7f3219de
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/call_invalid_return.rs
@@ -0,0 +1,22 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::{BlockNumberFor, OriginFor};
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		fn foo(origin: OriginFor<T>) -> ::DispatchResult { todo!() }
+	}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/call_invalid_return.stderr b/frame/support/test/tests/pallet_ui/call_invalid_return.stderr
new file mode 100644
index 000000000000..c79da3bbf78c
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/call_invalid_return.stderr
@@ -0,0 +1,5 @@
+error: expected `DispatchResultWithPostInfo` or `DispatchResult`
+  --> $DIR/call_invalid_return.rs:17:35
+   |
+17 |         fn foo(origin: OriginFor<T>) -> ::DispatchResult { todo!() }
+   |                                         ^^

From e5e8197f4530a2ea6b0ee419699ad45379e96774 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Wed, 3 Mar 2021 13:27:17 +0000
Subject: [PATCH 0460/1194] Add migration logs to pallet v2 (#8243)

* Add logs to proc macro pallet.

* update logs.
---
 .../procedural/src/pallet/expand/hooks.rs     | 35 +++++++++++++++-
 .../procedural/src/pallet/parse/hooks.rs      |  8 ++++
 frame/support/src/dispatch.rs                 | 41 +++++++++----------
 3 files changed, 60 insertions(+), 24 deletions(-)

diff --git a/frame/support/procedural/src/pallet/expand/hooks.rs b/frame/support/procedural/src/pallet/expand/hooks.rs
index b1eee507fdf5..d55a74209d05 100644
--- a/frame/support/procedural/src/pallet/expand/hooks.rs
+++ b/frame/support/procedural/src/pallet/expand/hooks.rs
@@ -25,6 +25,29 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 	let pallet_ident = &def.pallet_struct.pallet;
 	let where_clause = &def.hooks.where_clause;
 	let frame_system = &def.frame_system;
+	let has_runtime_upgrade = def.hooks.has_runtime_upgrade;
+
+	let log_runtime_upgrade = if has_runtime_upgrade {
+		// a migration is defined here.
+		quote::quote! {
+			#frame_support::log::info!(
+				target: #frame_support::LOG_TARGET,
+				"⚠️ {} declares internal migrations (which *might* execute), setting storage version to {:?}",
+				pallet_name,
+				new_storage_version,
+			);
+		}
+	} else {
+		// default.
+		quote::quote! {
+			#frame_support::log::info!(
+				target: #frame_support::LOG_TARGET,
+				"✅ no migration for {}, setting storage version to {:?}",
+				pallet_name,
+				new_storage_version,
+			);
+		}
+	};
 
 	quote::quote_spanned!(def.hooks.attr_span =>
 		impl<#type_impl_gen>
@@ -60,14 +83,22 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 			for #pallet_ident<#type_use_gen> #where_clause
 		{
 			fn on_runtime_upgrade() -> #frame_support::weights::Weight {
+				// log info about the upgrade.
+				let new_storage_version = #frame_support::crate_to_pallet_version!();
+				let pallet_name = <
+					<T as #frame_system::Config>::PalletInfo
+					as
+					#frame_support::traits::PalletInfo
+				>::name::<Self>().unwrap_or("<unknown pallet name>");
+				#log_runtime_upgrade
+
 				let result = <
 					Self as #frame_support::traits::Hooks<
 						<T as #frame_system::Config>::BlockNumber
 					>
 				>::on_runtime_upgrade();
 
-				#frame_support::crate_to_pallet_version!()
-					.put_into_storage::<<T as #frame_system::Config>::PalletInfo, Self>();
+				new_storage_version.put_into_storage::<<T as #frame_system::Config>::PalletInfo, Self>();
 
 				let additional_write = <
 					<T as #frame_system::Config>::DbWeight as #frame_support::traits::Get<_>
diff --git a/frame/support/procedural/src/pallet/parse/hooks.rs b/frame/support/procedural/src/pallet/parse/hooks.rs
index 585222060e5f..99ae3ed62541 100644
--- a/frame/support/procedural/src/pallet/parse/hooks.rs
+++ b/frame/support/procedural/src/pallet/parse/hooks.rs
@@ -28,6 +28,8 @@ pub struct HooksDef {
 	pub where_clause: Option<syn::WhereClause>,
 	/// The span of the pallet::hooks attribute.
 	pub attr_span: proc_macro2::Span,
+	/// Boolean flag, set to true if the `on_runtime_upgrade` method of hooks was implemented.
+	pub has_runtime_upgrade: bool,
 }
 
 impl HooksDef {
@@ -66,10 +68,16 @@ impl HooksDef {
 			return Err(syn::Error::new(item_trait.span(), msg));
 		}
 
+		let has_runtime_upgrade = item.items.iter().any(|i| match i {
+			syn::ImplItem::Method(method) => method.sig.ident == "on_runtime_upgrade",
+			_ => false,
+		});
+
 		Ok(Self {
 			attr_span,
 			index,
 			instances,
+			has_runtime_upgrade,
 			where_clause: item.generics.where_clause.clone(),
 		})
 	}
diff --git a/frame/support/src/dispatch.rs b/frame/support/src/dispatch.rs
index ab9feae3c249..4dd2c83f1578 100644
--- a/frame/support/src/dispatch.rs
+++ b/frame/support/src/dispatch.rs
@@ -1329,29 +1329,29 @@ macro_rules! decl_module {
 		{
 			fn on_runtime_upgrade() -> $return {
 				$crate::sp_tracing::enter_span!($crate::sp_tracing::trace_span!("on_runtime_upgrade"));
-				let result: $return = (|| { $( $impl )* })();
-
-				let new_storage_version = $crate::crate_to_pallet_version!();
-				new_storage_version
-					.put_into_storage::<<$trait_instance as $system::Config>::PalletInfo, Self>();
-
-				let additional_write = <
-					<$trait_instance as $system::Config>::DbWeight as $crate::traits::Get<_>
-				>::get().writes(1);
-
 				let pallet_name = <<
 					$trait_instance
 					as
 					$system::Config
-				>::PalletInfo as $crate::traits::PalletInfo>::name::<Self>().expect("pallet will have name in the runtime; qed");
+				>::PalletInfo as $crate::traits::PalletInfo>::name::<Self>().unwrap_or("<unknown pallet name>");
+				let new_storage_version = $crate::crate_to_pallet_version!();
 
 				$crate::log::info!(
 					target: $crate::LOG_TARGET,
-					"⚠️ running migration for {} and setting new storage version to {:?}",
+					"⚠️ {} declares internal migrations (which *might* execute), setting storage version to {:?}",
 					pallet_name,
 					new_storage_version,
 				);
 
+				let result: $return = (|| { $( $impl )* })();
+
+				new_storage_version
+					.put_into_storage::<<$trait_instance as $system::Config>::PalletInfo, Self>();
+
+				let additional_write = <
+					<$trait_instance as $system::Config>::DbWeight as $crate::traits::Get<_>
+				>::get().writes(1);
+
 				result.saturating_add(additional_write)
 			}
 
@@ -1378,27 +1378,24 @@ macro_rules! decl_module {
 		{
 			fn on_runtime_upgrade() -> $crate::dispatch::Weight {
 				$crate::sp_tracing::enter_span!($crate::sp_tracing::trace_span!("on_runtime_upgrade"));
-
-				let new_storage_version = $crate::crate_to_pallet_version!();
-				new_storage_version
-					.put_into_storage::<<$trait_instance as $system::Config>::PalletInfo, Self>();
-
 				let pallet_name = <<
 					$trait_instance
 					as
 					$system::Config
-				>::PalletInfo as $crate::traits::PalletInfo>::name::<Self>().expect("pallet will have name in the runtime; qed");
+				>::PalletInfo as $crate::traits::PalletInfo>::name::<Self>().unwrap_or("<unknown pallet name>");
+				let new_storage_version = $crate::crate_to_pallet_version!();
 
 				$crate::log::info!(
 					target: $crate::LOG_TARGET,
-					"✅ no migration for '{}' and setting new storage version to {:?}",
+					"✅ no migration for {}, setting storage version to {:?}",
 					pallet_name,
 					new_storage_version,
 				);
 
-				<
-					<$trait_instance as $system::Config>::DbWeight as $crate::traits::Get<_>
-				>::get().writes(1)
+				new_storage_version
+					.put_into_storage::<<$trait_instance as $system::Config>::PalletInfo, Self>();
+
+				<<$trait_instance as $system::Config>::DbWeight as $crate::traits::Get<_>>::get().writes(1)
 			}
 
 			#[cfg(feature = "try-runtime")]

From dc5d58764781a3cd74e868f88d80240ca577312b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Wed, 3 Mar 2021 21:59:28 +0100
Subject: [PATCH 0461/1194] Do not return the `Header` from `execute_block`
 (#8256)

That was actually a bad idea by me, because it should essentially be the
same as block.header.

Ty @kianenigma
---
 frame/executive/src/lib.rs       | 12 +++++-------
 frame/support/src/traits.rs      |  4 +---
 test-utils/runtime/src/system.rs | 12 +++++-------
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index b241f9f5ff0d..7755d092712e 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -174,8 +174,8 @@ where
 	OriginOf<Block::Extrinsic, Context>: From<Option<System::AccountId>>,
 	UnsignedValidator: ValidateUnsigned<Call=CallOf<Block::Extrinsic, Context>>,
 {
-	fn execute_block(block: Block) -> Block::Header {
-		Executive::<System, Block, Context, UnsignedValidator, AllModules>::execute_block(block)
+	fn execute_block(block: Block) {
+		Executive::<System, Block, Context, UnsignedValidator, AllModules>::execute_block(block);
 	}
 }
 
@@ -312,7 +312,7 @@ where
 	}
 
 	/// Actually execute all transitions for `block`.
-	pub fn execute_block(block: Block) -> Block::Header {
+	pub fn execute_block(block: Block) {
 		sp_io::init_tracing();
 		sp_tracing::within_span! {
 			sp_tracing::info_span!("execute_block", ?block);
@@ -333,7 +333,7 @@ where
 			}
 
 			// any final checks
-			Self::final_checks(&header)
+			Self::final_checks(&header);
 		}
 	}
 
@@ -406,7 +406,7 @@ where
 		Ok(r.map(|_| ()).map_err(|e| e.error))
 	}
 
-	fn final_checks(header: &System::Header) -> System::Header {
+	fn final_checks(header: &System::Header) {
 		sp_tracing::enter_span!(sp_tracing::Level::TRACE, "final_checks");
 		// remove temporaries
 		let new_header = <frame_system::Module<System>>::finalize();
@@ -432,8 +432,6 @@ where
 			header.extrinsics_root() == new_header.extrinsics_root(),
 			"Transaction trie root must be valid.",
 		);
-
-		new_header
 	}
 
 	/// Check a given signed transaction for validity. This doesn't execute any
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index ae0f5b834315..3d103ef04c2d 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -2237,12 +2237,10 @@ pub trait ExecuteBlock<Block: BlockT> {
 	///
 	/// This will execute all extrinsics in the block and check that the resulting header is correct.
 	///
-	/// Returns the result header.
-	///
 	/// # Panic
 	///
 	/// Panics when an extrinsics panics or the resulting header doesn't match the expected header.
-	fn execute_block(block: Block) -> Block::Header;
+	fn execute_block(block: Block);
 }
 
 #[cfg(test)]
diff --git a/test-utils/runtime/src/system.rs b/test-utils/runtime/src/system.rs
index 3c0f9b18981b..704df1ad9ef7 100644
--- a/test-utils/runtime/src/system.rs
+++ b/test-utils/runtime/src/system.rs
@@ -107,11 +107,11 @@ pub fn polish_block(block: &mut Block) {
 	execute_block_with_state_root_handler(block, Mode::Overwrite);
 }
 
-pub fn execute_block(mut block: Block) -> Header {
-	execute_block_with_state_root_handler(&mut block, Mode::Verify)
+pub fn execute_block(mut block: Block) {
+	execute_block_with_state_root_handler(&mut block, Mode::Verify);
 }
 
-fn execute_block_with_state_root_handler(block: &mut Block, mode: Mode) -> Header {
+fn execute_block_with_state_root_handler(block: &mut Block, mode: Mode) {
 	let header = &mut block.header;
 
 	initialize_block(header);
@@ -142,16 +142,14 @@ fn execute_block_with_state_root_handler(block: &mut Block, mode: Mode) -> Heade
 			"Transaction trie root must be valid.",
 		);
 	}
-
-	new_header
 }
 
 /// The block executor.
 pub struct BlockExecutor;
 
 impl frame_support::traits::ExecuteBlock<Block> for BlockExecutor {
-	fn execute_block(block: Block) -> Header {
-		execute_block(block)
+	fn execute_block(block: Block) {
+		execute_block(block);
 	}
 }
 

From e2d74ac74f3511d10b963cddc8bccc1d5af0bf38 Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Wed, 3 Mar 2021 22:28:05 +0100
Subject: [PATCH 0462/1194] Self-sufficient account ref-counting (#8221)

* Self-sufficient account ref-counting

* Fixes

* Update frame/system/src/lib.rs

Co-authored-by: Jaco Greeff <jacogr@gmail.com>

* Fixes

* Fixes

* Fixes

* Fixes

* Fixes

* Update frame/system/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Update frame/system/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Update frame/system/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* fix build

* Update frame/system/src/lib.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

Co-authored-by: Jaco Greeff <jacogr@gmail.com>
Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
---
 bin/node/executor/tests/basic.rs              |  37 +++-
 bin/node/executor/tests/fees.rs               |   1 +
 bin/node/executor/tests/submit_transaction.rs |   2 +-
 frame/executive/src/lib.rs                    |   2 +-
 frame/system/src/extensions/check_nonce.rs    |   1 +
 frame/system/src/lib.rs                       | 163 ++++++++++++++----
 frame/system/src/tests.rs                     | 107 +++++++++++-
 7 files changed, 260 insertions(+), 53 deletions(-)

diff --git a/bin/node/executor/tests/basic.rs b/bin/node/executor/tests/basic.rs
index c18f81bdc07d..279b6a776031 100644
--- a/bin/node/executor/tests/basic.rs
+++ b/bin/node/executor/tests/basic.rs
@@ -26,7 +26,7 @@ use sp_runtime::{
 	traits::Hash as HashT,
 	transaction_validity::InvalidTransaction,
 };
-use frame_system::{self, EventRecord, Phase};
+use frame_system::{self, EventRecord, Phase, AccountInfo};
 
 use node_runtime::{
 	Header, Block, UncheckedExtrinsic, CheckedExtrinsic, Call, Runtime, Balances,
@@ -227,11 +227,17 @@ fn successful_execution_with_native_equivalent_code_gives_ok() {
 	let mut t = new_test_ext(compact_code_unwrap(), false);
 	t.insert(
 		<frame_system::Account<Runtime>>::hashed_key_for(alice()),
-		(0u32, 0u32, 0u32, 111 * DOLLARS, 0u128, 0u128, 0u128).encode()
+		AccountInfo::<<Runtime as frame_system::Config>::Index, _> {
+			data: (111 * DOLLARS, 0u128, 0u128, 0u128),
+			.. Default::default()
+		}.encode(),
 	);
 	t.insert(
 		<frame_system::Account<Runtime>>::hashed_key_for(bob()),
-		(0u32, 0u32, 0u32, 0 * DOLLARS, 0u128, 0u128, 0u128).encode()
+		AccountInfo::<<Runtime as frame_system::Config>::Index, _> {
+			data: (0 * DOLLARS, 0u128, 0u128, 0u128),
+			.. Default::default()
+		}.encode(),
 	);
 	t.insert(
 		<pallet_balances::TotalIssuance<Runtime>>::hashed_key().to_vec(),
@@ -270,11 +276,17 @@ fn successful_execution_with_foreign_code_gives_ok() {
 	let mut t = new_test_ext(bloaty_code_unwrap(), false);
 	t.insert(
 		<frame_system::Account<Runtime>>::hashed_key_for(alice()),
-		(0u32, 0u32, 0u32, 111 * DOLLARS, 0u128, 0u128, 0u128).encode()
+		AccountInfo::<<Runtime as frame_system::Config>::Index, _> {
+			data: (111 * DOLLARS, 0u128, 0u128, 0u128),
+			.. Default::default()
+		}.encode(),
 	);
 	t.insert(
 		<frame_system::Account<Runtime>>::hashed_key_for(bob()),
-		(0u32, 0u32, 0u32, 0 * DOLLARS, 0u128, 0u128, 0u128).encode()
+		AccountInfo::<<Runtime as frame_system::Config>::Index, _> {
+			data: (0 * DOLLARS, 0u128, 0u128, 0u128),
+			.. Default::default()
+		}.encode(),
 	);
 	t.insert(
 		<pallet_balances::TotalIssuance<Runtime>>::hashed_key().to_vec(),
@@ -704,7 +716,10 @@ fn panic_execution_gives_error() {
 	let mut t = new_test_ext(bloaty_code_unwrap(), false);
 	t.insert(
 		<frame_system::Account<Runtime>>::hashed_key_for(alice()),
-		(0u32, 0u32, 0u32, 0 * DOLLARS, 0u128, 0u128, 0u128).encode()
+		AccountInfo::<<Runtime as frame_system::Config>::Index, _> {
+			data: (0 * DOLLARS, 0u128, 0u128, 0u128),
+			.. Default::default()
+		}.encode(),
 	);
 	t.insert(<pallet_balances::TotalIssuance<Runtime>>::hashed_key().to_vec(), 0_u128.encode());
 	t.insert(<frame_system::BlockHash<Runtime>>::hashed_key_for(0), vec![0u8; 32]);
@@ -733,11 +748,17 @@ fn successful_execution_gives_ok() {
 	let mut t = new_test_ext(compact_code_unwrap(), false);
 	t.insert(
 		<frame_system::Account<Runtime>>::hashed_key_for(alice()),
-		(0u32, 0u32, 0u32, 111 * DOLLARS, 0u128, 0u128, 0u128).encode()
+		AccountInfo::<<Runtime as frame_system::Config>::Index, _> {
+			data: (111 * DOLLARS, 0u128, 0u128, 0u128),
+			.. Default::default()
+		}.encode(),
 	);
 	t.insert(
 		<frame_system::Account<Runtime>>::hashed_key_for(bob()),
-		(0u32, 0u32, 0u32, 0 * DOLLARS, 0u128, 0u128, 0u128).encode()
+		AccountInfo::<<Runtime as frame_system::Config>::Index, _> {
+			data: (0 * DOLLARS, 0u128, 0u128, 0u128),
+			.. Default::default()
+		}.encode(),
 	);
 	t.insert(
 		<pallet_balances::TotalIssuance<Runtime>>::hashed_key().to_vec(),
diff --git a/bin/node/executor/tests/fees.rs b/bin/node/executor/tests/fees.rs
index 90b28539f7bc..ad24db03f983 100644
--- a/bin/node/executor/tests/fees.rs
+++ b/bin/node/executor/tests/fees.rs
@@ -129,6 +129,7 @@ fn new_account_info(free_dollars: u128) -> Vec<u8> {
 		nonce: 0u32,
 		consumers: 0,
 		providers: 0,
+		sufficients: 0,
 		data: (free_dollars * DOLLARS, 0 * DOLLARS, 0 * DOLLARS, 0 * DOLLARS),
 	}.encode()
 }
diff --git a/bin/node/executor/tests/submit_transaction.rs b/bin/node/executor/tests/submit_transaction.rs
index ff483d9ecd8c..3de0758d8146 100644
--- a/bin/node/executor/tests/submit_transaction.rs
+++ b/bin/node/executor/tests/submit_transaction.rs
@@ -252,7 +252,7 @@ fn submitted_transaction_should_be_valid() {
 		let author = extrinsic.signature.clone().unwrap().0;
 		let address = Indices::lookup(author).unwrap();
 		let data = pallet_balances::AccountData { free: 5_000_000_000_000, ..Default::default() };
-		let account = frame_system::AccountInfo { nonce: 0, consumers: 0, providers: 0, data };
+		let account = frame_system::AccountInfo { data, .. Default::default() };
 		<frame_system::Account<Runtime>>::insert(&address, account);
 
 		// check validity
diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index 7755d092712e..9485e75bbdec 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -769,7 +769,7 @@ mod tests {
 				header: Header {
 					parent_hash: [69u8; 32].into(),
 					number: 1,
-					state_root: hex!("1599922f15b2d5cf75e83370e29e13b96fdf799d917a5b6319736af292f21665").into(),
+					state_root: hex!("2c01e6f33d595793119823478b45b36978a8f65a731b5ae3fdfb6330b4cd4b11").into(),
 					extrinsics_root: hex!("03170a2e7597b7b7e3d84c05391d139a62b157e78786d8c082f29dcf4c111314").into(),
 					digest: Digest { logs: vec![], },
 				},
diff --git a/frame/system/src/extensions/check_nonce.rs b/frame/system/src/extensions/check_nonce.rs
index bc48be925bc0..3cb74a7ed918 100644
--- a/frame/system/src/extensions/check_nonce.rs
+++ b/frame/system/src/extensions/check_nonce.rs
@@ -128,6 +128,7 @@ mod tests {
 				nonce: 1,
 				consumers: 0,
 				providers: 0,
+				sufficients: 0,
 				data: 0,
 			});
 			let info = DispatchInfo::default();
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index a99184650cf5..ce9ab0dddc10 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -262,9 +262,9 @@ pub mod pallet {
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
 		fn on_runtime_upgrade() -> frame_support::weights::Weight {
-			if !UpgradedToDualRefCount::<T>::get() {
-				UpgradedToDualRefCount::<T>::put(true);
-				migrations::migrate_to_dual_ref_count::<T>()
+			if !UpgradedToTripleRefCount::<T>::get() {
+				UpgradedToTripleRefCount::<T>::put(true);
+				migrations::migrate_to_triple_ref_count::<T>()
 			} else {
 				0
 			}
@@ -594,10 +594,10 @@ pub mod pallet {
 	#[pallet::storage]
 	pub(super) type UpgradedToU32RefCount<T: Config> = StorageValue<_, bool, ValueQuery>;
 
-	/// True if we have upgraded so that AccountInfo contains two types of `RefCount`. False
+	/// True if we have upgraded so that AccountInfo contains three types of `RefCount`. False
 	/// (default) if not.
 	#[pallet::storage]
-	pub(super) type UpgradedToDualRefCount<T: Config> = StorageValue<_, bool, ValueQuery>;
+	pub(super) type UpgradedToTripleRefCount<T: Config> = StorageValue<_, bool, ValueQuery>;
 
 	/// The execution phase of the block.
 	#[pallet::storage]
@@ -627,7 +627,7 @@ pub mod pallet {
 			<ParentHash<T>>::put::<T::Hash>(hash69());
 			<LastRuntimeUpgrade<T>>::put(LastRuntimeUpgradeInfo::from(T::Version::get()));
 			<UpgradedToU32RefCount<T>>::put(true);
-			<UpgradedToDualRefCount<T>>::put(true);
+			<UpgradedToTripleRefCount<T>>::put(true);
 
 			sp_io::storage::set(well_known_keys::CODE, &self.code);
 			sp_io::storage::set(well_known_keys::EXTRINSIC_INDEX, &0u32.encode());
@@ -642,16 +642,29 @@ mod migrations {
 	use super::*;
 
 	#[allow(dead_code)]
+	/// Migrate from unique `u8` reference counting to triple `u32` reference counting.
 	pub fn migrate_all<T: Config>() -> frame_support::weights::Weight {
 		Account::<T>::translate::<(T::Index, u8, T::AccountData), _>(|_key, (nonce, rc, data)|
-			Some(AccountInfo { nonce, consumers: rc as RefCount, providers: 1, data })
+			Some(AccountInfo { nonce, consumers: rc as RefCount, providers: 1, sufficients: 0, data })
 		);
 		T::BlockWeights::get().max_block
 	}
 
+	#[allow(dead_code)]
+	/// Migrate from unique `u32` reference counting to triple `u32` reference counting.
 	pub fn migrate_to_dual_ref_count<T: Config>() -> frame_support::weights::Weight {
-		Account::<T>::translate::<(T::Index, RefCount, T::AccountData), _>(|_key, (nonce, rc, data)|
-			Some(AccountInfo { nonce, consumers: rc as RefCount, providers: 1, data })
+		Account::<T>::translate::<(T::Index, RefCount, T::AccountData), _>(|_key, (nonce, consumers, data)|
+			Some(AccountInfo { nonce, consumers, providers: 1, sufficients: 0, data })
+		);
+		T::BlockWeights::get().max_block
+	}
+
+	/// Migrate from dual `u32` reference counting to triple `u32` reference counting.
+	pub fn migrate_to_triple_ref_count<T: Config>() -> frame_support::weights::Weight {
+		Account::<T>::translate::<(T::Index, RefCount, RefCount, T::AccountData), _>(
+			|_key, (nonce, consumers, providers, data)| {
+				Some(AccountInfo { nonce, consumers, providers, sufficients: 0, data })
+			}
 		);
 		T::BlockWeights::get().max_block
 	}
@@ -762,8 +775,11 @@ pub struct AccountInfo<Index, AccountData> {
 	/// cannot be reaped until this is zero.
 	pub consumers: RefCount,
 	/// The number of other modules that allow this account to exist. The account may not be reaped
-	/// until this is zero.
+	/// until this and `sufficients` are both zero.
 	pub providers: RefCount,
+	/// The number of modules that allow this account to exist for their own purposes only. The
+	/// account may not be reaped until this and `providers` are both zero.
+	pub sufficients: RefCount,
 	/// The additional data that belongs to this account. Used to store the balance(s) in a lot of
 	/// chains.
 	pub data: AccountData,
@@ -974,8 +990,8 @@ pub enum RefStatus {
 	Unreferenced,
 }
 
-/// Some resultant status relevant to incrementing a provider reference.
-#[derive(RuntimeDebug)]
+/// Some resultant status relevant to incrementing a provider/self-sufficient reference.
+#[derive(Eq, PartialEq, RuntimeDebug)]
 pub enum IncRefStatus {
 	/// Account was created.
 	Created,
@@ -983,8 +999,8 @@ pub enum IncRefStatus {
 	Existed,
 }
 
-/// Some resultant status relevant to decrementing a provider reference.
-#[derive(RuntimeDebug)]
+/// Some resultant status relevant to decrementing a provider/self-sufficient reference.
+#[derive(Eq, PartialEq, RuntimeDebug)]
 pub enum DecRefStatus {
 	/// Account was destroyed.
 	Reaped,
@@ -993,14 +1009,14 @@ pub enum DecRefStatus {
 }
 
 /// Some resultant status relevant to decrementing a provider reference.
-#[derive(RuntimeDebug)]
+#[derive(Eq, PartialEq, RuntimeDebug)]
 pub enum DecRefError {
 	/// Account cannot have the last provider reference removed while there is a consumer.
 	ConsumerRemaining,
 }
 
-/// Some resultant status relevant to incrementing a provider reference.
-#[derive(RuntimeDebug)]
+/// Some resultant status relevant to incrementing a consumer reference.
+#[derive(Eq, PartialEq, RuntimeDebug)]
 pub enum IncRefError {
 	/// Account cannot introduce a consumer while there are no providers.
 	NoProviders,
@@ -1036,11 +1052,9 @@ impl<T: Config> Module<T> {
 		!Self::is_provider_required(who)
 	}
 
-	/// Increment the reference counter on an account.
-	///
-	/// The account `who`'s `providers` must be non-zero or this will return an error.
+	/// Increment the provider reference counter on an account.
 	pub fn inc_providers(who: &T::AccountId) -> IncRefStatus {
-		Account::<T>::mutate(who, |a| if a.providers == 0 {
+		Account::<T>::mutate(who, |a| if a.providers == 0 && a.sufficients == 0 {
 			// Account is being created.
 			a.providers = 1;
 			Self::on_created_account(who.clone(), a);
@@ -1051,30 +1065,34 @@ impl<T: Config> Module<T> {
 		})
 	}
 
-	/// Decrement the reference counter on an account. This *MUST* only be done once for every time
-	/// you called `inc_consumers` on `who`.
+	/// Decrement the provider reference counter on an account.
+	///
+	/// This *MUST* only be done once for every time you called `inc_providers` on `who`.
 	pub fn dec_providers(who: &T::AccountId) -> Result<DecRefStatus, DecRefError> {
 		Account::<T>::try_mutate_exists(who, |maybe_account| {
 			if let Some(mut account) = maybe_account.take() {
-				match (account.providers, account.consumers) {
-					(0, _) => {
-						// Logic error - cannot decrement beyond zero and no item should
-						// exist with zero providers.
-						log::error!(
-							target: "runtime::system",
-							"Logic error: Unexpected underflow in reducing provider",
-						);
-						Ok(DecRefStatus::Reaped)
-					},
-					(1, 0) => {
+				if account.providers == 0 {
+					// Logic error - cannot decrement beyond zero.
+					log::error!(
+						target: "runtime::system",
+						"Logic error: Unexpected underflow in reducing provider",
+					);
+					account.providers = 1;
+				}
+				match (account.providers, account.consumers, account.sufficients) {
+					(1, 0, 0) => {
+						// No providers left (and no consumers) and no sufficients. Account dead.
+
 						Module::<T>::on_killed_account(who.clone());
 						Ok(DecRefStatus::Reaped)
 					}
-					(1, _) => {
+					(1, c, _) if c > 0 => {
 						// Cannot remove last provider if there are consumers.
 						Err(DecRefError::ConsumerRemaining)
 					}
-					(x, _) => {
+					(x, _, _) => {
+						// Account will continue to exist as there is either > 1 provider or
+						// > 0 sufficients.
 						account.providers = x - 1;
 						*maybe_account = Some(account);
 						Ok(DecRefStatus::Exists)
@@ -1090,11 +1108,69 @@ impl<T: Config> Module<T> {
 		})
 	}
 
-	/// The number of outstanding references for the account `who`.
+	/// Increment the self-sufficient reference counter on an account.
+	pub fn inc_sufficients(who: &T::AccountId) -> IncRefStatus {
+		Account::<T>::mutate(who, |a| if a.providers + a.sufficients == 0 {
+			// Account is being created.
+			a.sufficients = 1;
+			Self::on_created_account(who.clone(), a);
+			IncRefStatus::Created
+		} else {
+			a.sufficients = a.sufficients.saturating_add(1);
+			IncRefStatus::Existed
+		})
+	}
+
+	/// Decrement the sufficients reference counter on an account.
+	///
+	/// This *MUST* only be done once for every time you called `inc_sufficients` on `who`.
+	pub fn dec_sufficients(who: &T::AccountId) -> DecRefStatus {
+		Account::<T>::mutate_exists(who, |maybe_account| {
+			if let Some(mut account) = maybe_account.take() {
+				if account.sufficients == 0 {
+					// Logic error - cannot decrement beyond zero.
+					log::error!(
+						target: "runtime::system",
+						"Logic error: Unexpected underflow in reducing sufficients",
+					);
+				}
+				match (account.sufficients, account.providers) {
+					(0, 0) | (1, 0) => {
+						Module::<T>::on_killed_account(who.clone());
+						DecRefStatus::Reaped
+					}
+					(x, _) => {
+						account.sufficients = x - 1;
+						*maybe_account = Some(account);
+						DecRefStatus::Exists
+					}
+				}
+			} else {
+				log::error!(
+					target: "runtime::system",
+					"Logic error: Account already dead when reducing provider",
+				);
+				DecRefStatus::Reaped
+			}
+		})
+	}
+
+	/// The number of outstanding provider references for the account `who`.
 	pub fn providers(who: &T::AccountId) -> RefCount {
 		Account::<T>::get(who).providers
 	}
 
+	/// The number of outstanding sufficient references for the account `who`.
+	pub fn sufficients(who: &T::AccountId) -> RefCount {
+		Account::<T>::get(who).sufficients
+	}
+
+	/// The number of outstanding provider and sufficient references for the account `who`.
+	pub fn reference_count(who: &T::AccountId) -> RefCount {
+		let a = Account::<T>::get(who);
+		a.providers + a.sufficients
+	}
+
 	/// Increment the reference counter on an account.
 	///
 	/// The account `who`'s `providers` must be non-zero or this will return an error.
@@ -1451,6 +1527,19 @@ impl<T: Config> HandleLifetime<T::AccountId> for Provider<T> {
 	}
 }
 
+/// Event handler which registers a self-sufficient when created.
+pub struct SelfSufficient<T>(PhantomData<T>);
+impl<T: Config> HandleLifetime<T::AccountId> for SelfSufficient<T> {
+	fn created(t: &T::AccountId) -> Result<(), StoredMapError> {
+		Module::<T>::inc_sufficients(t);
+		Ok(())
+	}
+	fn killed(t: &T::AccountId) -> Result<(), StoredMapError> {
+		Module::<T>::dec_sufficients(t);
+		Ok(())
+	}
+}
+
 /// Event handler which registers a consumer when created.
 pub struct Consumer<T>(PhantomData<T>);
 impl<T: Config> HandleLifetime<T::AccountId> for Consumer<T> {
diff --git a/frame/system/src/tests.rs b/frame/system/src/tests.rs
index ca17edcf4b22..9f500e5a3b05 100644
--- a/frame/system/src/tests.rs
+++ b/frame/system/src/tests.rs
@@ -19,10 +19,7 @@ use crate::*;
 use mock::{*, Origin};
 use sp_core::H256;
 use sp_runtime::{DispatchError, DispatchErrorWithPostInfo, traits::{Header, BlakeTwo256}};
-use frame_support::{
-	weights::WithPostDispatchInfo,
-	dispatch::PostDispatchInfo,
-};
+use frame_support::{assert_noop, weights::WithPostDispatchInfo, dispatch::PostDispatchInfo};
 
 #[test]
 fn origin_works() {
@@ -37,7 +34,13 @@ fn stored_map_works() {
 		assert!(System::insert(&0, 42).is_ok());
 		assert!(!System::is_provider_required(&0));
 
-		assert_eq!(Account::<Test>::get(0), AccountInfo { nonce: 0, providers: 1, consumers: 0, data: 42 });
+		assert_eq!(Account::<Test>::get(0), AccountInfo {
+			nonce: 0,
+			providers: 1,
+			consumers: 0,
+			sufficients: 0,
+			data: 42,
+		});
 
 		assert!(System::inc_consumers(&0).is_ok());
 		assert!(System::is_provider_required(&0));
@@ -54,6 +57,98 @@ fn stored_map_works() {
 	});
 }
 
+#[test]
+fn provider_ref_handover_to_self_sufficient_ref_works() {
+	new_test_ext().execute_with(|| {
+		assert_eq!(System::inc_providers(&0), IncRefStatus::Created);
+		System::inc_account_nonce(&0);
+		assert_eq!(System::account_nonce(&0), 1);
+
+		// a second reference coming and going doesn't change anything.
+		assert_eq!(System::inc_sufficients(&0), IncRefStatus::Existed);
+		assert_eq!(System::dec_sufficients(&0), DecRefStatus::Exists);
+		assert_eq!(System::account_nonce(&0), 1);
+
+		// a provider reference coming and going doesn't change anything.
+		assert_eq!(System::inc_providers(&0), IncRefStatus::Existed);
+		assert_eq!(System::dec_providers(&0).unwrap(), DecRefStatus::Exists);
+		assert_eq!(System::account_nonce(&0), 1);
+
+		// decreasing the providers with a self-sufficient present should not delete the account
+		assert_eq!(System::inc_sufficients(&0), IncRefStatus::Existed);
+		assert_eq!(System::dec_providers(&0).unwrap(), DecRefStatus::Exists);
+		assert_eq!(System::account_nonce(&0), 1);
+
+		// decreasing the sufficients should delete the account
+		assert_eq!(System::dec_sufficients(&0), DecRefStatus::Reaped);
+		assert_eq!(System::account_nonce(&0), 0);
+	});
+}
+
+#[test]
+fn self_sufficient_ref_handover_to_provider_ref_works() {
+	new_test_ext().execute_with(|| {
+		assert_eq!(System::inc_sufficients(&0), IncRefStatus::Created);
+		System::inc_account_nonce(&0);
+		assert_eq!(System::account_nonce(&0), 1);
+
+		// a second reference coming and going doesn't change anything.
+		assert_eq!(System::inc_providers(&0), IncRefStatus::Existed);
+		assert_eq!(System::dec_providers(&0).unwrap(), DecRefStatus::Exists);
+		assert_eq!(System::account_nonce(&0), 1);
+
+		// a sufficient reference coming and going doesn't change anything.
+		assert_eq!(System::inc_sufficients(&0), IncRefStatus::Existed);
+		assert_eq!(System::dec_sufficients(&0), DecRefStatus::Exists);
+		assert_eq!(System::account_nonce(&0), 1);
+
+		// decreasing the sufficients with a provider present should not delete the account
+		assert_eq!(System::inc_providers(&0), IncRefStatus::Existed);
+		assert_eq!(System::dec_sufficients(&0), DecRefStatus::Exists);
+		assert_eq!(System::account_nonce(&0), 1);
+
+		// decreasing the providers should delete the account
+		assert_eq!(System::dec_providers(&0).unwrap(), DecRefStatus::Reaped);
+		assert_eq!(System::account_nonce(&0), 0);
+	});
+}
+
+#[test]
+fn sufficient_cannot_support_consumer() {
+	new_test_ext().execute_with(|| {
+		assert_eq!(System::inc_sufficients(&0), IncRefStatus::Created);
+		System::inc_account_nonce(&0);
+		assert_eq!(System::account_nonce(&0), 1);
+		assert_noop!(System::inc_consumers(&0), IncRefError::NoProviders);
+
+		assert_eq!(System::inc_providers(&0), IncRefStatus::Existed);
+		assert!(System::inc_consumers(&0).is_ok());
+		assert_noop!(System::dec_providers(&0), DecRefError::ConsumerRemaining);
+	});
+}
+
+#[test]
+fn provider_required_to_support_consumer() {
+	new_test_ext().execute_with(|| {
+		assert_noop!(System::inc_consumers(&0), IncRefError::NoProviders);
+
+		assert_eq!(System::inc_providers(&0), IncRefStatus::Created);
+		System::inc_account_nonce(&0);
+		assert_eq!(System::account_nonce(&0), 1);
+
+		assert_eq!(System::inc_providers(&0), IncRefStatus::Existed);
+		assert_eq!(System::dec_providers(&0).unwrap(), DecRefStatus::Exists);
+		assert_eq!(System::account_nonce(&0), 1);
+
+		assert!(System::inc_consumers(&0).is_ok());
+		assert_noop!(System::dec_providers(&0), DecRefError::ConsumerRemaining);
+
+		System::dec_consumers(&0);
+		assert_eq!(System::dec_providers(&0).unwrap(), DecRefStatus::Reaped);
+		assert_eq!(System::account_nonce(&0), 0);
+	});
+}
+
 #[test]
 fn deposit_event_should_work() {
 	new_test_ext().execute_with(|| {
@@ -403,7 +498,7 @@ fn events_not_emitted_during_genesis() {
 	new_test_ext().execute_with(|| {
 		// Block Number is zero at genesis
 		assert!(System::block_number().is_zero());
-		let mut account_data = AccountInfo { nonce: 0, consumers: 0, providers: 0, data: 0 };
+		let mut account_data = AccountInfo::default();
 		System::on_created_account(Default::default(), &mut account_data);
 		assert!(System::events().is_empty());
 		// Events will be emitted starting on block 1

From a8c2bc66ea8667a1dcbafa13ce184b020bd6f84b Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Thu, 4 Mar 2021 09:49:49 +0100
Subject: [PATCH 0463/1194] update nb-connect pin-project-lite rand_core
 (#8249)

---
 Cargo.lock | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e468e9852bcc..38e11a7fed1d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -320,7 +320,7 @@ dependencies = [
  "memchr",
  "num_cpus",
  "once_cell",
- "pin-project-lite 0.2.4",
+ "pin-project-lite 0.2.5",
  "pin-utils",
  "slab",
  "wasm-bindgen-futures",
@@ -353,7 +353,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "memchr",
- "pin-project-lite 0.2.4",
+ "pin-project-lite 0.2.5",
 ]
 
 [[package]]
@@ -366,7 +366,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "memchr",
- "pin-project-lite 0.2.4",
+ "pin-project-lite 0.2.5",
 ]
 
 [[package]]
@@ -2023,7 +2023,7 @@ dependencies = [
  "futures-io",
  "memchr",
  "parking",
- "pin-project-lite 0.2.4",
+ "pin-project-lite 0.2.5",
  "waker-fn",
 ]
 
@@ -2095,7 +2095,7 @@ dependencies = [
  "futures-sink",
  "futures-task",
  "memchr",
- "pin-project-lite 0.2.4",
+ "pin-project-lite 0.2.5",
  "pin-utils",
  "proc-macro-hack",
  "proc-macro-nested",
@@ -3813,12 +3813,12 @@ dependencies = [
 
 [[package]]
 name = "nb-connect"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8123a81538e457d44b933a02faf885d3fe8408806b23fa700e8f01c6c3a98998"
+checksum = "670361df1bc2399ee1ff50406a0d422587dd3bb0da596e1978fe8e05dabddf4f"
 dependencies = [
  "libc",
- "winapi 0.3.9",
+ "socket2",
 ]
 
 [[package]]
@@ -5825,15 +5825,15 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.1.11"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b"
+checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439697af366c49a6d0a010c56a0d97685bc140ce0d377b13a2ea2aa42d64a827"
+checksum = "0cf491442e4b033ed1c722cb9f0df5fcfcf4de682466c46469c36bc47dc5548a"
 
 [[package]]
 name = "pin-utils"
@@ -6152,7 +6152,7 @@ checksum = "77de3c815e5a160b1539c6592796801df2043ae35e123b46d73380cfa57af858"
 dependencies = [
  "futures-core",
  "futures-sink",
- "pin-project-lite 0.1.11",
+ "pin-project-lite 0.1.12",
 ]
 
 [[package]]
@@ -6215,7 +6215,7 @@ checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
 dependencies = [
  "libc",
  "rand_chacha 0.3.0",
- "rand_core 0.6.1",
+ "rand_core 0.6.2",
  "rand_hc 0.3.0",
 ]
 
@@ -6236,7 +6236,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
 dependencies = [
  "ppv-lite86",
- "rand_core 0.6.1",
+ "rand_core 0.6.2",
 ]
 
 [[package]]
@@ -6265,9 +6265,9 @@ dependencies = [
 
 [[package]]
 name = "rand_core"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c026d7df8b298d90ccbbc5190bd04d85e159eaf5576caeacf8741da93ccbd2e5"
+checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
 dependencies = [
  "getrandom 0.2.2",
 ]
@@ -6296,7 +6296,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
 dependencies = [
- "rand_core 0.6.1",
+ "rand_core 0.6.2",
 ]
 
 [[package]]
@@ -9625,7 +9625,7 @@ dependencies = [
  "mio",
  "mio-uds",
  "num_cpus",
- "pin-project-lite 0.1.11",
+ "pin-project-lite 0.1.12",
  "signal-hook-registry",
  "slab",
  "tokio-macros",
@@ -9856,7 +9856,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "log",
- "pin-project-lite 0.1.11",
+ "pin-project-lite 0.1.12",
  "tokio 0.2.25",
 ]
 
@@ -9883,7 +9883,7 @@ checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3"
 dependencies = [
  "cfg-if 1.0.0",
  "log",
- "pin-project-lite 0.2.4",
+ "pin-project-lite 0.2.5",
  "tracing-attributes",
  "tracing-core",
 ]

From fc2d2d36620140da20ff244219a4259b5e59c83a Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Thu, 4 Mar 2021 13:01:18 -0600
Subject: [PATCH 0464/1194] babe: introduce a request-answering mechanic
 (#7833)

* babe: introduce a request-answering mechanic

* gromble

* send method
---
 client/consensus/babe/src/lib.rs | 90 ++++++++++++++++++++++++++++++--
 1 file changed, 87 insertions(+), 3 deletions(-)

diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index a8e533d2a83d..5622df48dbcb 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -102,6 +102,7 @@ use sc_client_api::{
 };
 use sp_block_builder::BlockBuilder as BlockBuilderApi;
 use futures::channel::mpsc::{channel, Sender, Receiver};
+use futures::channel::oneshot;
 use retain_mut::RetainMut;
 
 use futures::prelude::*;
@@ -426,6 +427,8 @@ pub fn start_babe<B, C, SC, E, I, SO, CAW, BS, Error>(BabeParams {
 	CAW: CanAuthorWith<B> + Send + 'static,
 	BS: BackoffAuthoringBlocksStrategy<NumberFor<B>> + Send + 'static,
 {
+	const HANDLE_BUFFER_SIZE: usize = 1024;
+
 	let config = babe_link.config;
 	let slot_notification_sinks = Arc::new(Mutex::new(Vec::new()));
 
@@ -444,14 +447,14 @@ pub fn start_babe<B, C, SC, E, I, SO, CAW, BS, Error>(BabeParams {
 
 	register_babe_inherent_data_provider(&inherent_data_providers, config.slot_duration())?;
 	sc_consensus_uncles::register_uncles_inherent_data_provider(
-		client,
+		client.clone(),
 		select_chain.clone(),
 		&inherent_data_providers,
 	)?;
 
 	info!(target: "babe", "👶 Starting BABE Authorship worker");
 	let inner = sc_consensus_slots::start_slot_worker(
-		config.0,
+		config.0.clone(),
 		select_chain,
 		worker,
 		sync_oracle,
@@ -459,17 +462,93 @@ pub fn start_babe<B, C, SC, E, I, SO, CAW, BS, Error>(BabeParams {
 		babe_link.time_source,
 		can_author_with,
 	);
+
+	let (worker_tx, worker_rx) = channel(HANDLE_BUFFER_SIZE);
+
+	let answer_requests = answer_requests(worker_rx, config.0, client, babe_link.epoch_changes.clone());
 	Ok(BabeWorker {
-		inner: Box::pin(inner),
+		inner: Box::pin(future::join(inner, answer_requests).map(|_| ())),
 		slot_notification_sinks,
+		handle: BabeWorkerHandle(worker_tx),
 	})
 }
 
+async fn answer_requests<B: BlockT, C>(
+	mut request_rx: Receiver<BabeRequest<B>>,
+	genesis_config: sc_consensus_slots::SlotDuration<BabeGenesisConfiguration>,
+	client: Arc<C>,
+	epoch_changes: SharedEpochChanges<B, Epoch>,
+)
+	where C: ProvideRuntimeApi<B> + ProvideCache<B> + ProvideUncles<B> + BlockchainEvents<B>
+	+ HeaderBackend<B> + HeaderMetadata<B, Error = ClientError> + Send + Sync + 'static,
+{
+	while let Some(request) = request_rx.next().await {
+		match request {
+			BabeRequest::EpochForChild(parent_hash, parent_number, slot_number, response) => {
+				let lookup = || {
+					let epoch_changes =	epoch_changes.lock();
+					let epoch_descriptor = epoch_changes.epoch_descriptor_for_child_of(
+						descendent_query(&*client),
+						&parent_hash,
+						parent_number,
+						slot_number,
+					)
+						.map_err(|e| Error::<B>::ForkTree(Box::new(e)))?
+						.ok_or_else(|| Error::<B>::FetchEpoch(parent_hash))?;
+
+					let viable_epoch = epoch_changes.viable_epoch(
+						&epoch_descriptor,
+						|slot| Epoch::genesis(&genesis_config, slot)
+					).ok_or_else(|| Error::<B>::FetchEpoch(parent_hash))?;
+
+					Ok(sp_consensus_babe::Epoch {
+						epoch_index: viable_epoch.as_ref().epoch_index,
+						start_slot: viable_epoch.as_ref().start_slot,
+						duration: viable_epoch.as_ref().duration,
+						authorities: viable_epoch.as_ref().authorities.clone(),
+						randomness: viable_epoch.as_ref().randomness,
+					})
+				};
+
+				let _ = response.send(lookup());
+			}
+		}
+	}
+}
+
+/// Requests to the BABE service.
+#[non_exhaustive]
+pub enum BabeRequest<B: BlockT> {
+	/// Request the epoch that a child of the given block, with the given slot number would have.
+	///
+	/// The parent block is identified by its hash and number.
+	EpochForChild(
+		B::Hash,
+		NumberFor<B>,
+		Slot,
+		oneshot::Sender<Result<sp_consensus_babe::Epoch, Error<B>>>,
+	),
+}
+
+/// A handle to the BABE worker for issuing requests.
+#[derive(Clone)]
+pub struct BabeWorkerHandle<B: BlockT>(Sender<BabeRequest<B>>);
+
+impl<B: BlockT> BabeWorkerHandle<B> {
+	/// Send a request to the BABE service.
+	pub async fn send(&mut self, request: BabeRequest<B>) {
+		// Failure to send means that the service is down.
+		// This will manifest as the receiver of the request being dropped.
+		let _ = self.0.send(request).await;
+	}
+}
+
 /// Worker for Babe which implements `Future<Output=()>`. This must be polled.
 #[must_use]
 pub struct BabeWorker<B: BlockT> {
 	inner: Pin<Box<dyn futures::Future<Output=()> + Send + 'static>>,
 	slot_notification_sinks: SlotNotificationSinks<B>,
+	handle: BabeWorkerHandle<B>,
 }
 
 impl<B: BlockT> BabeWorker<B> {
@@ -484,6 +563,11 @@ impl<B: BlockT> BabeWorker<B> {
 		self.slot_notification_sinks.lock().push(sink);
 		stream
 	}
+
+	/// Get a handle to the worker.
+	pub fn handle(&self) -> BabeWorkerHandle<B> {
+		self.handle.clone()
+	}
 }
 
 impl<B: BlockT> futures::Future for BabeWorker<B> {

From 3233d2992eaef30e7c1ce7d2e8ec6ea08d4091b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Fri, 5 Mar 2021 10:56:33 +0100
Subject: [PATCH 0465/1194] Fix warnings related to panic and assert (#8272)

We were using the wrong syntax and that will be dropped with Rust 2021.
The compiler already starts to hint the wrong syntax with warnings. So,
we fix this here.
---
 client/service/test/src/client/light.rs        | 11 +++++++----
 client/service/test/src/client/mod.rs          | 11 +++++++----
 client/tracing/src/logging/mod.rs              |  8 ++++++--
 frame/democracy/src/tests.rs                   |  2 +-
 frame/election-provider-multi-phase/src/lib.rs |  9 +++++----
 frame/offences/benchmarking/src/lib.rs         |  2 +-
 6 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/client/service/test/src/client/light.rs b/client/service/test/src/client/light.rs
index 3b20f163871f..f5b2d4aac83d 100644
--- a/client/service/test/src/client/light.rs
+++ b/client/service/test/src/client/light.rs
@@ -684,10 +684,13 @@ fn changes_proof_is_generated_and_checked_when_headers_are_not_pruned() {
 		}).unwrap();
 
 		// ..and ensure that result is the same as on remote node
-		match local_result == expected_result {
-			true => (),
-			false => panic!(format!("Failed test {}: local = {:?}, expected = {:?}",
-									index, local_result, expected_result)),
+		if local_result != expected_result {
+			panic!(
+				"Failed test {}: local = {:?}, expected = {:?}",
+				index,
+				local_result,
+				expected_result,
+			);
 		}
 	}
 }
diff --git a/client/service/test/src/client/mod.rs b/client/service/test/src/client/mod.rs
index 66b6aae12c2f..17e9ac6db189 100644
--- a/client/service/test/src/client/mod.rs
+++ b/client/service/test/src/client/mod.rs
@@ -988,10 +988,13 @@ fn key_changes_works() {
 			None,
 			&StorageKey(key),
 		).unwrap();
-		match actual_result == expected_result {
-			true => (),
-			false => panic!(format!("Failed test {}: actual = {:?}, expected = {:?}",
-			                        index, actual_result, expected_result)),
+		if actual_result != expected_result {
+			panic!(
+				"Failed test {}: actual = {:?}, expected = {:?}",
+				index,
+				actual_result,
+				expected_result,
+			);
 		}
 	}
 }
diff --git a/client/tracing/src/logging/mod.rs b/client/tracing/src/logging/mod.rs
index 5674b50cb98e..433e3ee4931c 100644
--- a/client/tracing/src/logging/mod.rs
+++ b/client/tracing/src/logging/mod.rs
@@ -427,7 +427,9 @@ mod tests {
 		let output = String::from_utf8(output.stderr).unwrap();
 		assert!(
 			re.is_match(output.trim()),
-			format!("Expected:\n{}\nGot:\n{}", re, output),
+			"Expected:\n{}\nGot:\n{}",
+			re,
+			output,
 		);
 	}
 
@@ -475,7 +477,9 @@ mod tests {
 		let output = String::from_utf8(output.stderr).unwrap();
 		assert!(
 			re.is_match(output.trim()),
-			format!("Expected:\n{}\nGot:\n{}", re, output),
+			"Expected:\n{}\nGot:\n{}",
+			re,
+			output,
 		);
 	}
 
diff --git a/frame/democracy/src/tests.rs b/frame/democracy/src/tests.rs
index 99f413b38928..291cfa33b522 100644
--- a/frame/democracy/src/tests.rs
+++ b/frame/democracy/src/tests.rs
@@ -236,7 +236,7 @@ fn set_balance_proposal_hash_and_note(value: u64) -> H256 {
 	match Democracy::note_preimage(Origin::signed(6), p) {
 		Ok(_) => (),
 		Err(x) if x == Error::<Test>::DuplicatePreimage.into() => (),
-		Err(x) => panic!(x),
+		Err(x) => panic!("{:?}", x),
 	}
 	h
 }
diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index c4a5e0fa6936..d7f1760876de 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -673,8 +673,9 @@ pub mod pallet {
 			witness: SolutionOrSnapshotSize,
 		) -> DispatchResultWithPostInfo {
 			ensure_none(origin)?;
-			let error_message = "Invalid unsigned submission must produce invalid block and \
-			                     deprive validator from their authoring reward.";
+			let error_message =
+				"Invalid unsigned submission must produce invalid block and \
+				 deprive validator from their authoring reward.";
 
 			// Check score being an improvement, phase, and desired targets.
 			Self::unsigned_pre_dispatch_checks(&solution).expect(error_message);
@@ -684,8 +685,8 @@ pub mod pallet {
 				Self::snapshot_metadata().expect(error_message);
 
 			// NOTE: we are asserting, not `ensure`ing -- we want to panic here.
-			assert!(voters as u32 == witness.voters, error_message);
-			assert!(targets as u32 == witness.targets, error_message);
+			assert!(voters as u32 == witness.voters, "{}", error_message);
+			assert!(targets as u32 == witness.targets, "{}", error_message);
 
 			let ready =
 				Self::feasibility_check(solution, ElectionCompute::Unsigned).expect(error_message);
diff --git a/frame/offences/benchmarking/src/lib.rs b/frame/offences/benchmarking/src/lib.rs
index a14e4cf5d29e..0ceebaecd91a 100644
--- a/frame/offences/benchmarking/src/lib.rs
+++ b/frame/offences/benchmarking/src/lib.rs
@@ -227,7 +227,7 @@ fn check_events<T: Config, I: Iterator<Item = <T as SystemConfig>::Event>>(expec
 	}
 
 	if !length_mismatch.is_empty() {
-		panic!(length_mismatch);
+		panic!("{}", length_mismatch);
 	}
 }
 

From adca4983ce51652600fdee4415a81e621fceee6f Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Fri, 5 Mar 2021 16:08:44 +0100
Subject: [PATCH 0466/1194] Fix doc build with --all-features (#8277)

* implement

* make default pre/post_upgrade

* simplify Cargo.toml

* revert removal of outdated/private links

* link in pallet-mmr
---
 .maintain/frame-weight-template.hbs             |  2 +-
 bin/node-template/pallets/template/src/lib.rs   |  2 +-
 bin/node/runtime/Cargo.toml                     |  1 +
 bin/node/runtime/src/lib.rs                     |  1 -
 client/network/src/config.rs                    | 17 +++++++++--------
 .../src/light_client_requests/handler.rs        |  2 +-
 .../tracing/src/logging/layers/prefix_layer.rs  |  2 +-
 frame/assets/src/weights.rs                     |  2 +-
 frame/bounties/src/weights.rs                   |  2 +-
 frame/collective/src/weights.rs                 |  2 +-
 frame/contracts/src/weights.rs                  |  2 +-
 frame/democracy/src/weights.rs                  |  2 +-
 .../src/helpers.rs                              |  4 ++--
 frame/election-provider-multi-phase/src/lib.rs  | 12 ++++++------
 .../src/weights.rs                              |  2 +-
 frame/elections-phragmen/src/weights.rs         |  2 +-
 frame/example/Cargo.toml                        |  1 +
 frame/executive/Cargo.toml                      |  4 +---
 frame/gilt/Cargo.toml                           |  1 +
 frame/gilt/src/weights.rs                       |  2 +-
 frame/identity/src/weights.rs                   |  2 +-
 frame/im-online/src/weights.rs                  |  2 +-
 frame/indices/src/weights.rs                    |  2 +-
 frame/lottery/src/weights.rs                    |  2 +-
 frame/merkle-mountain-range/src/lib.rs          |  2 +-
 frame/multisig/src/weights.rs                   |  2 +-
 frame/proxy/src/weights.rs                      |  2 +-
 frame/scheduler/src/weights.rs                  |  2 +-
 frame/session/src/weights.rs                    |  2 +-
 frame/staking/src/weights.rs                    |  2 +-
 frame/support/src/traits.rs                     | 12 ++++++------
 frame/support/test/Cargo.toml                   |  1 +
 frame/system/src/weights.rs                     |  2 +-
 frame/timestamp/src/weights.rs                  |  2 +-
 frame/tips/src/weights.rs                       |  2 +-
 frame/treasury/src/weights.rs                   |  2 +-
 frame/utility/src/weights.rs                    |  2 +-
 frame/vesting/src/weights.rs                    |  2 +-
 primitives/io/src/lib.rs                        |  4 ++--
 utils/frame/benchmarking-cli/src/template.hbs   |  2 +-
 40 files changed, 59 insertions(+), 57 deletions(-)

diff --git a/.maintain/frame-weight-template.hbs b/.maintain/frame-weight-template.hbs
index 2253452e203d..04453d2bfe24 100644
--- a/.maintain/frame-weight-template.hbs
+++ b/.maintain/frame-weight-template.hbs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for {{pallet}}
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION {{version}}
-//! DATE: {{date}}, STEPS: {{cmd.steps}}, REPEAT: {{cmd.repeat}}, LOW RANGE: {{cmd.lowest_range_values}}, HIGH RANGE: {{cmd.highest_range_values}}
+//! DATE: {{date}}, STEPS: `{{cmd.steps}}`, REPEAT: {{cmd.repeat}}, LOW RANGE: `{{cmd.lowest_range_values}}`, HIGH RANGE: `{{cmd.highest_range_values}}`
 //! EXECUTION: {{cmd.execution}}, WASM-EXECUTION: {{cmd.wasm_execution}}, CHAIN: {{cmd.chain}}, DB CACHE: {{cmd.db_cache}}
 
 // Executed Command:
diff --git a/bin/node-template/pallets/template/src/lib.rs b/bin/node-template/pallets/template/src/lib.rs
index 5f4e4253f813..99a285492c77 100644
--- a/bin/node-template/pallets/template/src/lib.rs
+++ b/bin/node-template/pallets/template/src/lib.rs
@@ -2,7 +2,7 @@
 
 /// Edit this file to define custom logic or remove it if it is not needed.
 /// Learn more about FRAME and the core library of Substrate FRAME pallets:
-/// https://substrate.dev/docs/en/knowledgebase/runtime/frame
+/// <https://substrate.dev/docs/en/knowledgebase/runtime/frame>
 
 pub use pallet::*;
 
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index dc8ce8bace80..43ecca7e7445 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -234,4 +234,5 @@ try-runtime = [
 	"pallet-society/try-runtime",
 	"pallet-recovery/try-runtime",
 	"pallet-vesting/try-runtime",
+	"pallet-gilt/try-runtime",
 ]
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 20abb9b54ff0..a0b966c63c33 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -1404,7 +1404,6 @@ impl_runtime_apis! {
 	#[cfg(feature = "try-runtime")]
 	impl frame_try_runtime::TryRuntime<Block> for Runtime {
 		fn on_runtime_upgrade() -> Result<(Weight, Weight), sp_runtime::RuntimeString> {
-			frame_support::debug::RuntimeLogger::init();
 			let weight = Executive::try_runtime_upgrade()?;
 			Ok((weight, RuntimeBlockWeights::get().max_block))
 		}
diff --git a/client/network/src/config.rs b/client/network/src/config.rs
index d6d4d9d7162f..a6ce295e4622 100644
--- a/client/network/src/config.rs
+++ b/client/network/src/config.rs
@@ -109,18 +109,19 @@ pub struct Params<B: BlockT, H: ExHashT> {
 	/// protocol name. In addition all of [`RequestResponseConfig`] is used to handle incoming block
 	/// requests, if enabled.
 	///
-	/// Can be constructed either via [`block_request_handler::generate_protocol_config`] allowing
-	/// outgoing but not incoming requests, or constructed via
-	/// [`block_request_handler::BlockRequestHandler::new`] allowing both outgoing and incoming
-	/// requests.
+	/// Can be constructed either via [`crate::block_request_handler::generate_protocol_config`]
+	/// allowing outgoing but not incoming requests, or constructed via
+	/// [`crate::block_request_handler::BlockRequestHandler::new`] allowing both outgoing and
+	/// incoming requests.
 	pub block_request_protocol_config: RequestResponseConfig,
 
 	/// Request response configuration for the light client request protocol.
 	///
-	/// Can be constructed either via [`light_client_requests::generate_protocol_config`] allowing
-	/// outgoing but not incoming requests, or constructed via
-	/// [`light_client_requests::handler::LightClientRequestHandler::new`] allowing both outgoing
-	/// and incoming requests.
+	/// Can be constructed either via
+	/// [`crate::light_client_requests::generate_protocol_config`] allowing outgoing but not
+	/// incoming requests, or constructed via
+	/// [`crate::light_client_requests::handler::LightClientRequestHandler::new`] allowing
+	/// both outgoing and incoming requests.
 	pub light_client_request_protocol_config: RequestResponseConfig,
 }
 
diff --git a/client/network/src/light_client_requests/handler.rs b/client/network/src/light_client_requests/handler.rs
index 08de99a0a5de..fe0a3cb187d5 100644
--- a/client/network/src/light_client_requests/handler.rs
+++ b/client/network/src/light_client_requests/handler.rs
@@ -60,7 +60,7 @@ pub struct LightClientRequestHandler<B: Block> {
 }
 
 impl<B: Block> LightClientRequestHandler<B> {
-	/// Create a new [`BlockRequestHandler`].
+	/// Create a new [`crate::block_request_handler::BlockRequestHandler`].
 	pub fn new(
 		protocol_id: &ProtocolId,
 		client: Arc<dyn Client<B>>,
diff --git a/client/tracing/src/logging/layers/prefix_layer.rs b/client/tracing/src/logging/layers/prefix_layer.rs
index 0c8f25c24100..f35b59e8b9af 100644
--- a/client/tracing/src/logging/layers/prefix_layer.rs
+++ b/client/tracing/src/logging/layers/prefix_layer.rs
@@ -23,7 +23,7 @@ use tracing_subscriber::{layer::Context, registry::LookupSpan, Layer};
 pub const PREFIX_LOG_SPAN: &str = "substrate-log-prefix";
 
 /// A `Layer` that captures the prefix span ([`PREFIX_LOG_SPAN`]) which is then used by
-/// [`EventFormat`] to prefix the log lines by customizable string.
+/// [`crate::logging::EventFormat`] to prefix the log lines by customizable string.
 ///
 /// See the macro `sc_cli::prefix_logs_with!` for more details.
 pub struct PrefixLayer;
diff --git a/frame/assets/src/weights.rs b/frame/assets/src/weights.rs
index 1858fe708e14..3056036642a7 100644
--- a/frame/assets/src/weights.rs
+++ b/frame/assets/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_assets
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.1
-//! DATE: 2021-01-18, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2021-01-18, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
diff --git a/frame/bounties/src/weights.rs b/frame/bounties/src/weights.rs
index fcbee727abe5..50d76739a938 100644
--- a/frame/bounties/src/weights.rs
+++ b/frame/bounties/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_bounties
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-12-16, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2020-12-16, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
diff --git a/frame/collective/src/weights.rs b/frame/collective/src/weights.rs
index f8558c833f01..7bdce04d2648 100644
--- a/frame/collective/src/weights.rs
+++ b/frame/collective/src/weights.rs
@@ -17,7 +17,7 @@
 
 //! Weights for pallet_collective
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2020-10-27, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
diff --git a/frame/contracts/src/weights.rs b/frame/contracts/src/weights.rs
index 905ccf8cb5a2..3972c3fa2cd6 100644
--- a/frame/contracts/src/weights.rs
+++ b/frame/contracts/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_contracts
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-02-18, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2021-02-18, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
diff --git a/frame/democracy/src/weights.rs b/frame/democracy/src/weights.rs
index 7c169cc813ea..e2e1bd0c8be2 100644
--- a/frame/democracy/src/weights.rs
+++ b/frame/democracy/src/weights.rs
@@ -17,7 +17,7 @@
 
 //! Weights for pallet_democracy
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-28, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2020-10-28, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
diff --git a/frame/election-provider-multi-phase/src/helpers.rs b/frame/election-provider-multi-phase/src/helpers.rs
index 7375ce017f20..dd97163d2859 100644
--- a/frame/election-provider-multi-phase/src/helpers.rs
+++ b/frame/election-provider-multi-phase/src/helpers.rs
@@ -49,7 +49,7 @@ pub fn generate_voter_cache<T: Config>(
 
 /// Create a function the returns the index a voter in the snapshot.
 ///
-/// The returning index type is the same as the one defined in [`T::CompactSolution::Voter`].
+/// The returning index type is the same as the one defined in `T::CompactSolution::Voter`.
 ///
 /// ## Warning
 ///
@@ -92,7 +92,7 @@ pub fn voter_index_fn_linear<T: Config>(
 
 /// Create a function the returns the index a targets in the snapshot.
 ///
-/// The returning index type is the same as the one defined in [`T::CompactSolution::Target`].
+/// The returning index type is the same as the one defined in `T::CompactSolution::Target`.
 pub fn target_index_fn_linear<T: Config>(
 	snapshot: &Vec<T::AccountId>,
 ) -> Box<dyn Fn(&T::AccountId) -> Option<CompactTargetIndexOf<T>> + '_> {
diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index d7f1760876de..4ee6caae0a64 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -43,13 +43,13 @@
 //!
 //! Each of the phases can be disabled by essentially setting their length to zero. If both phases
 //! have length zero, then the pallet essentially runs only the fallback strategy, denoted by
-//! [`Config::FallbackStrategy`].
+//! [`Config::Fallback`].
 //! ### Signed Phase
 //!
 //!	In the signed phase, solutions (of type [`RawSolution`]) are submitted and queued on chain. A
 //! deposit is reserved, based on the size of the solution, for the cost of keeping this solution
 //! on-chain for a number of blocks, and the potential weight of the solution upon being checked. A
-//! maximum of [`pallet::Config::MaxSignedSubmissions`] solutions are stored. The queue is always
+//! maximum of `pallet::Config::MaxSignedSubmissions` solutions are stored. The queue is always
 //! sorted based on score (worse to best).
 //!
 //! Upon arrival of a new solution:
@@ -65,7 +65,7 @@
 //! origin can not bail out in any way, if their solution is queued.
 //!
 //! Upon the end of the signed phase, the solutions are examined from best to worse (i.e. `pop()`ed
-//! until drained). Each solution undergoes an expensive [`Pallet::feasibility_check`], which
+//! until drained). Each solution undergoes an expensive `Pallet::feasibility_check`, which
 //! ensures the score claimed by this score was correct, and it is valid based on the election data
 //! (i.e. votes and candidates). At each step, if the current best solution passes the feasibility
 //! check, it is considered to be the best one. The sender of the origin is rewarded, and the rest
@@ -192,14 +192,14 @@
 //! **Score based on (byte) size**: We should always prioritize small solutions over bigger ones, if
 //! there is a tie. Even more harsh should be to enforce the bound of the `reduce` algorithm.
 //!
-//! **Offchain resubmit**: Essentially port https://github.com/paritytech/substrate/pull/7976 to
+//! **Offchain resubmit**: Essentially port <https://github.com/paritytech/substrate/pull/7976> to
 //! this pallet as well. The `OFFCHAIN_REPEAT` also needs to become an adjustable parameter of the
 //! pallet.
 //!
 //! **Make the number of nominators configurable from the runtime**. Remove `sp_npos_elections`
 //! dependency from staking and the compact solution type. It should be generated at runtime, there
 //! it should be encoded how many votes each nominators have. Essentially translate
-//! https://github.com/paritytech/substrate/pull/7929 to this pallet.
+//! <https://github.com/paritytech/substrate/pull/7929> to this pallet.
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
@@ -364,7 +364,7 @@ impl Default for ElectionCompute {
 /// This is what will get submitted to the chain.
 ///
 /// Such a solution should never become effective in anyway before being checked by the
-/// [`Pallet::feasibility_check`]
+/// `Pallet::feasibility_check`
 #[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug)]
 pub struct RawSolution<C> {
 	/// Compact election edges.
diff --git a/frame/election-provider-multi-phase/src/weights.rs b/frame/election-provider-multi-phase/src/weights.rs
index cbdc5b39bf3e..276bba330d24 100644
--- a/frame/election-provider-multi-phase/src/weights.rs
+++ b/frame/election-provider-multi-phase/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_election_provider_multi_phase
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-02-12, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2021-02-12, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
diff --git a/frame/elections-phragmen/src/weights.rs b/frame/elections-phragmen/src/weights.rs
index 25c209140836..c3d9365c8855 100644
--- a/frame/elections-phragmen/src/weights.rs
+++ b/frame/elections-phragmen/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_elections_phragmen
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.1
-//! DATE: 2021-01-20, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2021-01-20, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
diff --git a/frame/example/Cargo.toml b/frame/example/Cargo.toml
index 618730688458..de741294b9c1 100644
--- a/frame/example/Cargo.toml
+++ b/frame/example/Cargo.toml
@@ -41,3 +41,4 @@ std = [
 	"sp-std/std"
 ]
 runtime-benchmarks = ["frame-benchmarking"]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/executive/Cargo.toml b/frame/executive/Cargo.toml
index 7ef00e7ff71c..6a0042308736 100644
--- a/frame/executive/Cargo.toml
+++ b/frame/executive/Cargo.toml
@@ -47,6 +47,4 @@ std = [
 	"sp-tracing/std",
 	"sp-std/std",
 ]
-try-runtime = [
-	"frame-support/try-runtime"
-]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/gilt/Cargo.toml b/frame/gilt/Cargo.toml
index f1e0d61158d3..4df0dc49aaf9 100644
--- a/frame/gilt/Cargo.toml
+++ b/frame/gilt/Cargo.toml
@@ -44,3 +44,4 @@ runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/gilt/src/weights.rs b/frame/gilt/src/weights.rs
index f202ae47ff63..1e0e5fa9b4d3 100644
--- a/frame/gilt/src/weights.rs
+++ b/frame/gilt/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_gilt
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-02-23, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2021-02-23, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
diff --git a/frame/identity/src/weights.rs b/frame/identity/src/weights.rs
index 1026e8f73f85..1635a8d70547 100644
--- a/frame/identity/src/weights.rs
+++ b/frame/identity/src/weights.rs
@@ -17,7 +17,7 @@
 
 //! Weights for pallet_identity
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2020-10-27, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
diff --git a/frame/im-online/src/weights.rs b/frame/im-online/src/weights.rs
index 8f4140fc793a..147ce11682b7 100644
--- a/frame/im-online/src/weights.rs
+++ b/frame/im-online/src/weights.rs
@@ -17,7 +17,7 @@
 
 //! Weights for pallet_im_online
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2020-10-27, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
diff --git a/frame/indices/src/weights.rs b/frame/indices/src/weights.rs
index 6cc9593d20b9..e303b943b7e2 100644
--- a/frame/indices/src/weights.rs
+++ b/frame/indices/src/weights.rs
@@ -17,7 +17,7 @@
 
 //! Weights for pallet_indices
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2020-10-27, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
diff --git a/frame/lottery/src/weights.rs b/frame/lottery/src/weights.rs
index 28d5ac0945b1..464bb94bbbb7 100644
--- a/frame/lottery/src/weights.rs
+++ b/frame/lottery/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_lottery
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2021-01-05, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2021-01-05, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
diff --git a/frame/merkle-mountain-range/src/lib.rs b/frame/merkle-mountain-range/src/lib.rs
index b137be7b53c1..6992341f6bbd 100644
--- a/frame/merkle-mountain-range/src/lib.rs
+++ b/frame/merkle-mountain-range/src/lib.rs
@@ -127,7 +127,7 @@ pub trait Config<I = DefaultInstance>: frame_system::Config {
 	///
 	/// For some applications it might be beneficial to make the MMR root available externally
 	/// apart from having it in the storage. For instance you might output it in the header digest
-	/// (see [frame_system::Module::deposit_log]) to make it available for Light Clients.
+	/// (see [`frame_system::Pallet::deposit_log`]) to make it available for Light Clients.
 	/// Hook complexity should be `O(1)`.
 	type OnNewRoot: primitives::OnNewRoot<<Self as Config<I>>::Hash>;
 
diff --git a/frame/multisig/src/weights.rs b/frame/multisig/src/weights.rs
index f67e0c8868af..1c8736616c18 100644
--- a/frame/multisig/src/weights.rs
+++ b/frame/multisig/src/weights.rs
@@ -17,7 +17,7 @@
 
 //! Weights for pallet_multisig
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2020-10-27, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
diff --git a/frame/proxy/src/weights.rs b/frame/proxy/src/weights.rs
index 92cf66120dfb..b720a22be120 100644
--- a/frame/proxy/src/weights.rs
+++ b/frame/proxy/src/weights.rs
@@ -17,7 +17,7 @@
 
 //! Weights for pallet_proxy
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2020-10-27, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
diff --git a/frame/scheduler/src/weights.rs b/frame/scheduler/src/weights.rs
index 0508930f4ef2..1d7273353f34 100644
--- a/frame/scheduler/src/weights.rs
+++ b/frame/scheduler/src/weights.rs
@@ -17,7 +17,7 @@
 
 //! Weights for pallet_scheduler
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2020-10-27, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
diff --git a/frame/session/src/weights.rs b/frame/session/src/weights.rs
index 05d9f7d78731..88ed9e6d8ece 100644
--- a/frame/session/src/weights.rs
+++ b/frame/session/src/weights.rs
@@ -17,7 +17,7 @@
 
 //! Weights for pallet_session
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2020-10-27, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
diff --git a/frame/staking/src/weights.rs b/frame/staking/src/weights.rs
index c7b7edad5518..3489a1013542 100644
--- a/frame/staking/src/weights.rs
+++ b/frame/staking/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_staking
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-02-13, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2021-02-13, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index 3d103ef04c2d..c22f694d3829 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -1553,7 +1553,7 @@ pub trait OnGenesis {
 	fn on_genesis() {}
 }
 
-/// Prefix to be used (optionally) for implementing [`OnRuntimeUpgrade::storage_key`].
+/// Prefix to be used (optionally) for implementing [`OnRuntimeUpgradeHelpersExt::storage_key`].
 #[cfg(feature = "try-runtime")]
 pub const ON_RUNTIME_UPGRADE_PREFIX: &[u8] = b"__ON_RUNTIME_UPGRADE__";
 
@@ -1563,7 +1563,7 @@ pub trait OnRuntimeUpgradeHelpersExt {
 	/// Generate a storage key unique to this runtime upgrade.
 	///
 	/// This can be used to communicate data from pre-upgrade to post-upgrade state and check
-	/// them. See [`set_temp_storage`] and [`get_temp_storage`].
+	/// them. See [`Self::set_temp_storage`] and [`Self::get_temp_storage`].
 	#[cfg(feature = "try-runtime")]
 	fn storage_key(ident: &str) -> [u8; 32] {
 		let prefix = sp_io::hashing::twox_128(ON_RUNTIME_UPGRADE_PREFIX);
@@ -1576,7 +1576,7 @@ pub trait OnRuntimeUpgradeHelpersExt {
 		final_key
 	}
 
-	/// Get temporary storage data written by [`set_temp_storage`].
+	/// Get temporary storage data written by [`Self::set_temp_storage`].
 	///
 	/// Returns `None` if either the data is unavailable or un-decodable.
 	///
@@ -1588,7 +1588,7 @@ pub trait OnRuntimeUpgradeHelpersExt {
 	}
 
 	/// Write some temporary data to a specific storage that can be read (potentially in
-	/// post-upgrade hook) via [`get_temp_storage`].
+	/// post-upgrade hook) via [`Self::get_temp_storage`].
 	///
 	/// A `at` storage identifier must be provided to indicate where the storage is being written
 	/// to.
@@ -1623,13 +1623,13 @@ pub trait OnRuntimeUpgrade {
 	///
 	/// This hook is never meant to be executed on-chain but is meant to be used by testing tools.
 	#[cfg(feature = "try-runtime")]
-	fn pre_upgrade() -> Result<(), &'static str>;
+	fn pre_upgrade() -> Result<(), &'static str> { Ok(()) }
 
 	/// Execute some post-checks after a runtime upgrade.
 	///
 	/// This hook is never meant to be executed on-chain but is meant to be used by testing tools.
 	#[cfg(feature = "try-runtime")]
-	fn post_upgrade() -> Result<(), &'static str>;
+	fn post_upgrade() -> Result<(), &'static str> { Ok(()) }
 }
 
 #[impl_for_tuples(30)]
diff --git a/frame/support/test/Cargo.toml b/frame/support/test/Cargo.toml
index 67cf668f7f4c..2ec59b1013da 100644
--- a/frame/support/test/Cargo.toml
+++ b/frame/support/test/Cargo.toml
@@ -41,3 +41,4 @@ std = [
 	"sp-runtime/std",
 	"sp-state-machine",
 ]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/system/src/weights.rs b/frame/system/src/weights.rs
index fc1619878963..04e95de4ba37 100644
--- a/frame/system/src/weights.rs
+++ b/frame/system/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for frame_system
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-02-28, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2021-02-28, STEPS: \[50, \], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
diff --git a/frame/timestamp/src/weights.rs b/frame/timestamp/src/weights.rs
index 8cc40faecc93..875d78c31d22 100644
--- a/frame/timestamp/src/weights.rs
+++ b/frame/timestamp/src/weights.rs
@@ -17,7 +17,7 @@
 
 //! Weights for pallet_timestamp
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2020-10-27, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
diff --git a/frame/tips/src/weights.rs b/frame/tips/src/weights.rs
index 94c12f740c04..f5cd4bc23c86 100644
--- a/frame/tips/src/weights.rs
+++ b/frame/tips/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_tips
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-12-20, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2020-12-20, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
diff --git a/frame/treasury/src/weights.rs b/frame/treasury/src/weights.rs
index ea939396c5f1..b8a5625bf062 100644
--- a/frame/treasury/src/weights.rs
+++ b/frame/treasury/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_treasury
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-12-16, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2020-12-16, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
diff --git a/frame/utility/src/weights.rs b/frame/utility/src/weights.rs
index 5e2eb39f6ef5..f8cc31d1bba8 100644
--- a/frame/utility/src/weights.rs
+++ b/frame/utility/src/weights.rs
@@ -17,7 +17,7 @@
 
 //! Weights for pallet_utility
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2020-10-27, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
diff --git a/frame/vesting/src/weights.rs b/frame/vesting/src/weights.rs
index f4a1ee366910..1e44474fbc97 100644
--- a/frame/vesting/src/weights.rs
+++ b/frame/vesting/src/weights.rs
@@ -17,7 +17,7 @@
 
 //! Weights for pallet_vesting
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2020-10-27, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
diff --git a/primitives/io/src/lib.rs b/primitives/io/src/lib.rs
index bc86dd902d15..521d831dfc75 100644
--- a/primitives/io/src/lib.rs
+++ b/primitives/io/src/lib.rs
@@ -81,8 +81,8 @@ pub enum EcdsaVerifyError {
 	BadSignature,
 }
 
-/// The outcome of calling [`kill_storage`]. Returned value is the number of storage items
-/// removed from the trie from making the `kill_storage` call.
+/// The outcome of calling `storage_kill`. Returned value is the number of storage items
+/// removed from the trie from making the `storage_kill` call.
 #[derive(PassByCodec, Encode, Decode)]
 pub enum KillChildStorageResult {
 	/// No key remains in the child trie.
diff --git a/utils/frame/benchmarking-cli/src/template.hbs b/utils/frame/benchmarking-cli/src/template.hbs
index 0ff6144214d6..a6f0a5ddfc82 100644
--- a/utils/frame/benchmarking-cli/src/template.hbs
+++ b/utils/frame/benchmarking-cli/src/template.hbs
@@ -2,7 +2,7 @@
 //! Autogenerated weights for {{pallet}}
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION {{version}}
-//! DATE: {{date}}, STEPS: {{cmd.steps}}, REPEAT: {{cmd.repeat}}, LOW RANGE: {{cmd.lowest_range_values}}, HIGH RANGE: {{cmd.highest_range_values}}
+//! DATE: {{date}}, STEPS: `{{cmd.steps}}`, REPEAT: {{cmd.repeat}}, LOW RANGE: `{{cmd.lowest_range_values}}`, HIGH RANGE: `{{cmd.highest_range_values}}`
 //! EXECUTION: {{cmd.execution}}, WASM-EXECUTION: {{cmd.wasm_execution}}, CHAIN: {{cmd.chain}}, DB CACHE: {{cmd.db_cache}}
 
 // Executed Command:

From 79ddc796ed130810ac9e620493154c3cac9f290a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Fri, 5 Mar 2021 17:03:30 +0100
Subject: [PATCH 0467/1194] AuRa improvements (#8255)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* AuRa improvements

Hot and fresh AuRa improvements. This pr does the following:

- Move code belonging to the import queue etc to import_queue.rs
- Introduce `ImportQueueParams` and `StartAuraParams` structs to make
it more easier to understand what parameters we pass to AuRa.
- Introduce `CheckForEquivocation` to tell AuRa if it should check for
equivocation on block import. This is required for parachains, because
they are allowed to equivocate when they build two blocks for the same
slot, but for different relay chain parents.

* Update client/consensus/aura/src/import_queue.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Fix compilation

* AAA

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
---
 bin/node-template/node/src/service.rs     |  75 +--
 client/consensus/aura/src/import_queue.rs | 542 +++++++++++++++++++++
 client/consensus/aura/src/lib.rs          | 549 +++-------------------
 3 files changed, 660 insertions(+), 506 deletions(-)
 create mode 100644 client/consensus/aura/src/import_queue.rs

diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
index 92518ef22dee..a5030f1b3517 100644
--- a/bin/node-template/node/src/service.rs
+++ b/bin/node-template/node/src/service.rs
@@ -8,7 +8,8 @@ use sc_service::{error::Error as ServiceError, Configuration, TaskManager};
 use sp_inherents::InherentDataProviders;
 use sc_executor::native_executor_instance;
 pub use sc_executor::NativeExecutor;
-use sp_consensus_aura::sr25519::{AuthorityPair as AuraPair};
+use sp_consensus_aura::sr25519::AuthorityPair as AuraPair;
+use sc_consensus_aura::{ImportQueueParams, StartAuraParams};
 use sc_finality_grandpa::SharedVoterState;
 use sc_keystore::LocalKeystore;
 use sc_telemetry::TelemetrySpan;
@@ -43,7 +44,7 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 		return Err(ServiceError::Other(
 			format!("Remote Keystores are not supported.")))
 	}
-	let inherent_data_providers = sp_inherents::InherentDataProviders::new();
+	let inherent_data_providers = InherentDataProviders::new();
 
 	let (client, backend, keystore_container, task_manager) =
 		sc_service::new_full_parts::<Block, RuntimeApi, Executor>(&config)?;
@@ -67,15 +68,18 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 		grandpa_block_import.clone(), client.clone(),
 	);
 
-	let import_queue = sc_consensus_aura::import_queue::<_, _, _, AuraPair, _, _>(
-		sc_consensus_aura::slot_duration(&*client)?,
-		aura_block_import.clone(),
-		Some(Box::new(grandpa_block_import.clone())),
-		client.clone(),
-		inherent_data_providers.clone(),
-		&task_manager.spawn_essential_handle(),
-		config.prometheus_registry(),
-		sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()),
+	let import_queue = sc_consensus_aura::import_queue::<AuraPair, _, _, _, _, _>(
+		ImportQueueParams {
+			block_import: aura_block_import.clone(),
+			justification_import: Some(Box::new(grandpa_block_import.clone())),
+			client: client.clone(),
+			inherent_data_providers: inherent_data_providers.clone(),
+			spawner: &task_manager.spawn_essential_handle(),
+			can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()),
+			slot_duration: sc_consensus_aura::slot_duration(&*client)?,
+			registry: config.prometheus_registry(),
+			check_for_equivocation: Default::default(),
+		},
 	)?;
 
 	Ok(sc_service::PartialComponents {
@@ -185,7 +189,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 	)?;
 
 	if role.is_authority() {
-		let proposer = sc_basic_authorship::ProposerFactory::new(
+		let proposer_factory = sc_basic_authorship::ProposerFactory::new(
 			task_manager.spawn_handle(),
 			client.clone(),
 			transaction_pool,
@@ -195,18 +199,20 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		let can_author_with =
 			sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone());
 
-		let aura = sc_consensus_aura::start_aura::<_, _, _, _, _, AuraPair, _, _, _,_>(
-			sc_consensus_aura::slot_duration(&*client)?,
-			client.clone(),
-			select_chain,
-			block_import,
-			proposer,
-			network.clone(),
-			inherent_data_providers.clone(),
-			force_authoring,
-			backoff_authoring_blocks,
-			keystore_container.sync_keystore(),
-			can_author_with,
+		let aura = sc_consensus_aura::start_aura::<AuraPair, _, _, _, _, _, _, _, _,_>(
+			StartAuraParams {
+				slot_duration: sc_consensus_aura::slot_duration(&*client)?,
+				client: client.clone(),
+				select_chain,
+				block_import,
+				proposer_factory,
+				inherent_data_providers: inherent_data_providers.clone(),
+				force_authoring,
+				backoff_authoring_blocks,
+				keystore: keystore_container.sync_keystore(),
+				can_author_with,
+				sync_oracle: network.clone(),
+			},
 		)?;
 
 		// the AURA authoring task is considered essential, i.e. if it
@@ -289,15 +295,18 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		client.clone(),
 	);
 
-	let import_queue = sc_consensus_aura::import_queue::<_, _, _, AuraPair, _, _>(
-		sc_consensus_aura::slot_duration(&*client)?,
-		aura_block_import,
-		Some(Box::new(grandpa_block_import)),
-		client.clone(),
-		InherentDataProviders::new(),
-		&task_manager.spawn_essential_handle(),
-		config.prometheus_registry(),
-		sp_consensus::NeverCanAuthor,
+	let import_queue = sc_consensus_aura::import_queue::<AuraPair, _, _, _, _, _>(
+		ImportQueueParams {
+			block_import: aura_block_import.clone(),
+			justification_import: Some(Box::new(grandpa_block_import.clone())),
+			client: client.clone(),
+			inherent_data_providers: InherentDataProviders::new(),
+			spawner: &task_manager.spawn_essential_handle(),
+			can_author_with: sp_consensus::NeverCanAuthor,
+			slot_duration: sc_consensus_aura::slot_duration(&*client)?,
+			registry: config.prometheus_registry(),
+			check_for_equivocation: Default::default(),
+		},
 	)?;
 
 	let (network, network_status_sinks, system_rpc_tx, network_starter) =
diff --git a/client/consensus/aura/src/import_queue.rs b/client/consensus/aura/src/import_queue.rs
new file mode 100644
index 000000000000..638931477a99
--- /dev/null
+++ b/client/consensus/aura/src/import_queue.rs
@@ -0,0 +1,542 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! Module implementing the logic for verifying and importing AuRa blocks.
+
+use crate::{
+	AuthorityId, find_pre_digest, slot_author, aura_err, Error, AuraSlotCompatible, SlotDuration,
+	register_aura_inherent_data_provider, authorities,
+};
+use std::{
+	sync::Arc, time::Duration, thread, marker::PhantomData, hash::Hash, fmt::Debug,
+	collections::HashMap,
+};
+use log::{debug, info, trace};
+use prometheus_endpoint::Registry;
+use codec::{Encode, Decode, Codec};
+use sp_consensus::{
+	BlockImport, CanAuthorWith, ForkChoiceStrategy, BlockImportParams,
+	BlockOrigin, Error as ConsensusError, BlockCheckParams, ImportResult,
+	import_queue::{
+		Verifier, BasicQueue, DefaultImportQueue, BoxJustificationImport,
+	},
+};
+use sc_client_api::{backend::AuxStore, BlockOf};
+use sp_blockchain::{well_known_cache_keys::{self, Id as CacheKeyId}, ProvideCache, HeaderBackend};
+use sp_block_builder::BlockBuilder as BlockBuilderApi;
+use sp_runtime::{generic::{BlockId, OpaqueDigestItemId}, Justification};
+use sp_runtime::traits::{Block as BlockT, Header, DigestItemFor, Zero};
+use sp_api::ProvideRuntimeApi;
+use sp_core::crypto::Pair;
+use sp_inherents::{InherentDataProviders, InherentData};
+use sp_timestamp::InherentError as TIError;
+use sc_telemetry::{telemetry, CONSENSUS_TRACE, CONSENSUS_DEBUG, CONSENSUS_INFO};
+use sc_consensus_slots::{CheckedHeader, SlotCompatible, check_equivocation};
+use sp_consensus_slots::Slot;
+use sp_api::ApiExt;
+use sp_consensus_aura::{
+	digests::CompatibleDigestItem, AuraApi, inherents::AuraInherentData,
+	ConsensusLog, AURA_ENGINE_ID,
+};
+
+/// check a header has been signed by the right key. If the slot is too far in the future, an error
+/// will be returned. If it's successful, returns the pre-header and the digest item
+/// containing the seal.
+///
+/// This digest item will always return `Some` when used with `as_aura_seal`.
+fn check_header<C, B: BlockT, P: Pair>(
+	client: &C,
+	slot_now: Slot,
+	mut header: B::Header,
+	hash: B::Hash,
+	authorities: &[AuthorityId<P>],
+	check_for_equivocation: CheckForEquivocation,
+) -> Result<CheckedHeader<B::Header, (Slot, DigestItemFor<B>)>, Error<B>> where
+	DigestItemFor<B>: CompatibleDigestItem<P::Signature>,
+	P::Signature: Codec,
+	C: sc_client_api::backend::AuxStore,
+	P::Public: Encode + Decode + PartialEq + Clone,
+{
+	let seal = match header.digest_mut().pop() {
+		Some(x) => x,
+		None => return Err(Error::HeaderUnsealed(hash)),
+	};
+
+	let sig = seal.as_aura_seal().ok_or_else(|| {
+		aura_err(Error::HeaderBadSeal(hash))
+	})?;
+
+	let slot = find_pre_digest::<B, P::Signature>(&header)?;
+
+	if slot > slot_now {
+		header.digest_mut().push(seal);
+		Ok(CheckedHeader::Deferred(header, slot))
+	} else {
+		// check the signature is valid under the expected authority and
+		// chain state.
+		let expected_author = match slot_author::<P>(slot, &authorities) {
+			None => return Err(Error::SlotAuthorNotFound),
+			Some(author) => author,
+		};
+
+		let pre_hash = header.hash();
+
+		if P::verify(&sig, pre_hash.as_ref(), expected_author) {
+			if check_for_equivocation.check_for_equivocation() {
+				if let Some(equivocation_proof) = check_equivocation(
+					client,
+					slot_now,
+					slot,
+					&header,
+					expected_author,
+				).map_err(Error::Client)? {
+					info!(
+						target: "aura",
+						"Slot author is equivocating at slot {} with headers {:?} and {:?}",
+						slot,
+						equivocation_proof.first_header.hash(),
+						equivocation_proof.second_header.hash(),
+					);
+				}
+			}
+
+			Ok(CheckedHeader::Checked(header, (slot, seal)))
+		} else {
+			Err(Error::BadSignature(hash))
+		}
+	}
+}
+
+/// A verifier for Aura blocks.
+pub struct AuraVerifier<C, P, CAW> {
+	client: Arc<C>,
+	phantom: PhantomData<P>,
+	inherent_data_providers: InherentDataProviders,
+	can_author_with: CAW,
+	check_for_equivocation: CheckForEquivocation,
+}
+
+impl<C, P, CAW> AuraVerifier<C, P, CAW> {
+	pub(crate) fn new(
+		client: Arc<C>,
+		inherent_data_providers: InherentDataProviders,
+		can_author_with: CAW,
+		check_for_equivocation: CheckForEquivocation,
+	) -> Self {
+		Self {
+			client,
+			inherent_data_providers,
+			can_author_with,
+			check_for_equivocation,
+			phantom: PhantomData,
+		}
+	}
+}
+
+impl<C, P, CAW> AuraVerifier<C, P, CAW> where
+	P: Send + Sync + 'static,
+	CAW: Send + Sync + 'static,
+{
+	fn check_inherents<B: BlockT>(
+		&self,
+		block: B,
+		block_id: BlockId<B>,
+		inherent_data: InherentData,
+		timestamp_now: u64,
+	) -> Result<(), Error<B>> where
+		C: ProvideRuntimeApi<B>, C::Api: BlockBuilderApi<B>,
+		CAW: CanAuthorWith<B>,
+	{
+		const MAX_TIMESTAMP_DRIFT_SECS: u64 = 60;
+
+		if let Err(e) = self.can_author_with.can_author_with(&block_id) {
+			debug!(
+				target: "aura",
+				"Skipping `check_inherents` as authoring version is not compatible: {}",
+				e,
+			);
+
+			return Ok(())
+		}
+
+		let inherent_res = self.client.runtime_api().check_inherents(
+			&block_id,
+			block,
+			inherent_data,
+		).map_err(|e| Error::Client(e.into()))?;
+
+		if !inherent_res.ok() {
+			inherent_res
+				.into_errors()
+				.try_for_each(|(i, e)| match TIError::try_from(&i, &e) {
+					Some(TIError::ValidAtTimestamp(timestamp)) => {
+						// halt import until timestamp is valid.
+						// reject when too far ahead.
+						if timestamp > timestamp_now + MAX_TIMESTAMP_DRIFT_SECS {
+							return Err(Error::TooFarInFuture);
+						}
+
+						let diff = timestamp.saturating_sub(timestamp_now);
+						info!(
+							target: "aura",
+							"halting for block {} seconds in the future",
+							diff
+						);
+						telemetry!(CONSENSUS_INFO; "aura.halting_for_future_block";
+							"diff" => ?diff
+						);
+						thread::sleep(Duration::from_secs(diff));
+						Ok(())
+					},
+					Some(TIError::Other(e)) => Err(Error::Runtime(e.into())),
+					None => Err(Error::DataProvider(
+						self.inherent_data_providers.error_to_string(&i, &e)
+					)),
+				})
+		} else {
+			Ok(())
+		}
+	}
+}
+
+impl<B: BlockT, C, P, CAW> Verifier<B> for AuraVerifier<C, P, CAW> where
+	C: ProvideRuntimeApi<B> +
+		Send +
+		Sync +
+		sc_client_api::backend::AuxStore +
+		ProvideCache<B> +
+		BlockOf,
+	C::Api: BlockBuilderApi<B> + AuraApi<B, AuthorityId<P>> + ApiExt<B>,
+	DigestItemFor<B>: CompatibleDigestItem<P::Signature>,
+	P: Pair + Send + Sync + 'static,
+	P::Public: Send + Sync + Hash + Eq + Clone + Decode + Encode + Debug + 'static,
+	P::Signature: Encode + Decode,
+	CAW: CanAuthorWith<B> + Send + Sync + 'static,
+{
+	fn verify(
+		&mut self,
+		origin: BlockOrigin,
+		header: B::Header,
+		justification: Option<Justification>,
+		mut body: Option<Vec<B::Extrinsic>>,
+	) -> Result<(BlockImportParams<B, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String> {
+		let mut inherent_data = self.inherent_data_providers
+			.create_inherent_data()
+			.map_err(|e| e.into_string())?;
+		let (timestamp_now, slot_now, _) = AuraSlotCompatible.extract_timestamp_and_slot(&inherent_data)
+			.map_err(|e| format!("Could not extract timestamp and slot: {:?}", e))?;
+		let hash = header.hash();
+		let parent_hash = *header.parent_hash();
+		let authorities = authorities(self.client.as_ref(), &BlockId::Hash(parent_hash))
+			.map_err(|e| format!("Could not fetch authorities at {:?}: {:?}", parent_hash, e))?;
+
+		// we add one to allow for some small drift.
+		// FIXME #1019 in the future, alter this queue to allow deferring of
+		// headers
+		let checked_header = check_header::<C, B, P>(
+			&self.client,
+			slot_now + 1,
+			header,
+			hash,
+			&authorities[..],
+			self.check_for_equivocation,
+		).map_err(|e| e.to_string())?;
+		match checked_header {
+			CheckedHeader::Checked(pre_header, (slot, seal)) => {
+				// if the body is passed through, we need to use the runtime
+				// to check that the internally-set timestamp in the inherents
+				// actually matches the slot set in the seal.
+				if let Some(inner_body) = body.take() {
+					inherent_data.aura_replace_inherent_data(slot);
+					let block = B::new(pre_header.clone(), inner_body);
+
+					// skip the inherents verification if the runtime API is old.
+					if self.client
+						.runtime_api()
+						.has_api_with::<dyn BlockBuilderApi<B>, _>(
+							&BlockId::Hash(parent_hash),
+							|v| v >= 2,
+						)
+						.map_err(|e| format!("{:?}", e))?
+					{
+						self.check_inherents(
+							block.clone(),
+							BlockId::Hash(parent_hash),
+							inherent_data,
+							timestamp_now,
+						).map_err(|e| e.to_string())?;
+					}
+
+					let (_, inner_body) = block.deconstruct();
+					body = Some(inner_body);
+				}
+
+				trace!(target: "aura", "Checked {:?}; importing.", pre_header);
+				telemetry!(CONSENSUS_TRACE; "aura.checked_and_importing"; "pre_header" => ?pre_header);
+
+				// Look for an authorities-change log.
+				let maybe_keys = pre_header.digest()
+					.logs()
+					.iter()
+					.filter_map(|l| l.try_to::<ConsensusLog<AuthorityId<P>>>(
+						OpaqueDigestItemId::Consensus(&AURA_ENGINE_ID)
+					))
+					.find_map(|l| match l {
+						ConsensusLog::AuthoritiesChange(a) => Some(
+							vec![(well_known_cache_keys::AUTHORITIES, a.encode())]
+						),
+						_ => None,
+					});
+
+				let mut import_block = BlockImportParams::new(origin, pre_header);
+				import_block.post_digests.push(seal);
+				import_block.body = body;
+				import_block.justification = justification;
+				import_block.fork_choice = Some(ForkChoiceStrategy::LongestChain);
+				import_block.post_hash = Some(hash);
+
+				Ok((import_block, maybe_keys))
+			}
+			CheckedHeader::Deferred(a, b) => {
+				debug!(target: "aura", "Checking {:?} failed; {:?}, {:?}.", hash, a, b);
+				telemetry!(CONSENSUS_DEBUG; "aura.header_too_far_in_future";
+					"hash" => ?hash, "a" => ?a, "b" => ?b
+				);
+				Err(format!("Header {:?} rejected: too far in the future", hash))
+			}
+		}
+	}
+}
+
+fn initialize_authorities_cache<A, B, C>(client: &C) -> Result<(), ConsensusError> where
+	A: Codec + Debug,
+	B: BlockT,
+	C: ProvideRuntimeApi<B> + BlockOf + ProvideCache<B>,
+	C::Api: AuraApi<B, A>,
+{
+	// no cache => no initialization
+	let cache = match client.cache() {
+		Some(cache) => cache,
+		None => return Ok(()),
+	};
+
+	// check if we already have initialized the cache
+	let map_err = |error| sp_consensus::Error::from(sp_consensus::Error::ClientImport(
+		format!(
+			"Error initializing authorities cache: {}",
+			error,
+		)));
+
+	let genesis_id = BlockId::Number(Zero::zero());
+	let genesis_authorities: Option<Vec<A>> = cache
+		.get_at(&well_known_cache_keys::AUTHORITIES, &genesis_id)
+		.unwrap_or(None)
+		.and_then(|(_, _, v)| Decode::decode(&mut &v[..]).ok());
+	if genesis_authorities.is_some() {
+		return Ok(());
+	}
+
+	let genesis_authorities = authorities(client, &genesis_id)?;
+	cache.initialize(&well_known_cache_keys::AUTHORITIES, genesis_authorities.encode())
+		.map_err(map_err)?;
+
+	Ok(())
+}
+
+/// A block-import handler for Aura.
+pub struct AuraBlockImport<Block: BlockT, C, I: BlockImport<Block>, P> {
+	inner: I,
+	client: Arc<C>,
+	_phantom: PhantomData<(Block, P)>,
+}
+
+impl<Block: BlockT, C, I: Clone + BlockImport<Block>, P> Clone for AuraBlockImport<Block, C, I, P> {
+	fn clone(&self) -> Self {
+		AuraBlockImport {
+			inner: self.inner.clone(),
+			client: self.client.clone(),
+			_phantom: PhantomData,
+		}
+	}
+}
+
+impl<Block: BlockT, C, I: BlockImport<Block>, P> AuraBlockImport<Block, C, I, P> {
+	/// New aura block import.
+	pub fn new(
+		inner: I,
+		client: Arc<C>,
+	) -> Self {
+		Self {
+			inner,
+			client,
+			_phantom: PhantomData,
+		}
+	}
+}
+
+impl<Block: BlockT, C, I, P> BlockImport<Block> for AuraBlockImport<Block, C, I, P> where
+	I: BlockImport<Block, Transaction = sp_api::TransactionFor<C, Block>> + Send + Sync,
+	I::Error: Into<ConsensusError>,
+	C: HeaderBackend<Block> + ProvideRuntimeApi<Block>,
+	P: Pair + Send + Sync + 'static,
+	P::Public: Clone + Eq + Send + Sync + Hash + Debug + Encode + Decode,
+	P::Signature: Encode + Decode,
+{
+	type Error = ConsensusError;
+	type Transaction = sp_api::TransactionFor<C, Block>;
+
+	fn check_block(
+		&mut self,
+		block: BlockCheckParams<Block>,
+	) -> Result<ImportResult, Self::Error> {
+		self.inner.check_block(block).map_err(Into::into)
+	}
+
+	fn import_block(
+		&mut self,
+		block: BlockImportParams<Block, Self::Transaction>,
+		new_cache: HashMap<CacheKeyId, Vec<u8>>,
+	) -> Result<ImportResult, Self::Error> {
+		let hash = block.post_hash();
+		let slot = find_pre_digest::<Block, P::Signature>(&block.header)
+			.expect("valid Aura headers must contain a predigest; \
+					 header has been already verified; qed");
+
+		let parent_hash = *block.header.parent_hash();
+		let parent_header = self.client.header(BlockId::Hash(parent_hash))
+			.map_err(|e| ConsensusError::ChainLookup(e.to_string()))?
+			.ok_or_else(|| ConsensusError::ChainLookup(aura_err(
+				Error::<Block>::ParentUnavailable(parent_hash, hash)
+			).into()))?;
+
+		let parent_slot = find_pre_digest::<Block, P::Signature>(&parent_header)
+			.expect("valid Aura headers contain a pre-digest; \
+					parent header has already been verified; qed");
+
+		// make sure that slot number is strictly increasing
+		if slot <= parent_slot {
+			return Err(
+				ConsensusError::ClientImport(aura_err(
+					Error::<Block>::SlotMustIncrease(parent_slot, slot)
+				).into())
+			);
+		}
+
+		self.inner.import_block(block, new_cache).map_err(Into::into)
+	}
+}
+
+/// Should we check for equivocation of a block author?
+#[derive(Debug, Clone, Copy)]
+pub enum CheckForEquivocation {
+	/// Yes, check for equivocation.
+	///
+	/// This is the default setting for this.
+	Yes,
+	/// No, don't check for equivocation.
+	No,
+}
+
+impl CheckForEquivocation {
+	/// Should we check for equivocation?
+	fn check_for_equivocation(self) -> bool {
+		matches!(self, Self::Yes)
+	}
+}
+
+impl Default for CheckForEquivocation {
+	fn default() -> Self {
+		Self::Yes
+	}
+}
+
+/// Parameters of [`import_queue`].
+pub struct ImportQueueParams<'a, Block, I, C, S, CAW> {
+	/// The block import to use.
+	pub block_import: I,
+	/// The justification import.
+	pub justification_import: Option<BoxJustificationImport<Block>>,
+	/// The client to interact with the chain.
+	pub client: Arc<C>,
+	/// The inherent data provider, to create the inherent data.
+	pub inherent_data_providers: InherentDataProviders,
+	/// The spawner to spawn background tasks.
+	pub spawner: &'a S,
+	/// The prometheus registry.
+	pub registry: Option<&'a Registry>,
+	/// Can we author with the current node?
+	pub can_author_with: CAW,
+	/// Should we check for equivocation?
+	pub check_for_equivocation: CheckForEquivocation,
+	/// The duration of one slot.
+	pub slot_duration: SlotDuration,
+}
+
+/// Start an import queue for the Aura consensus algorithm.
+pub fn import_queue<'a, P, Block, I, C, S, CAW>(
+	ImportQueueParams {
+		block_import,
+		justification_import,
+		client,
+		inherent_data_providers,
+		spawner,
+		registry,
+		can_author_with,
+		check_for_equivocation,
+		slot_duration,
+	}: ImportQueueParams<'a, Block, I, C, S, CAW>
+) -> Result<DefaultImportQueue<Block, C>, sp_consensus::Error> where
+	Block: BlockT,
+	C::Api: BlockBuilderApi<Block> + AuraApi<Block, AuthorityId<P>> + ApiExt<Block>,
+	C: 'static
+		+ ProvideRuntimeApi<Block>
+		+ BlockOf
+		+ ProvideCache<Block>
+		+ Send
+		+ Sync
+		+ AuxStore
+		+ HeaderBackend<Block>,
+	I: BlockImport<Block, Error=ConsensusError, Transaction = sp_api::TransactionFor<C, Block>>
+		+ Send
+		+ Sync
+		+ 'static,
+	DigestItemFor<Block>: CompatibleDigestItem<P::Signature>,
+	P: Pair + Send + Sync + 'static,
+	P::Public: Clone + Eq + Send + Sync + Hash + Debug + Encode + Decode,
+	P::Signature: Encode + Decode,
+	S: sp_core::traits::SpawnEssentialNamed,
+	CAW: CanAuthorWith<Block> + Send + Sync + 'static,
+{
+	register_aura_inherent_data_provider(&inherent_data_providers, slot_duration.get())?;
+	initialize_authorities_cache(&*client)?;
+
+	let verifier = AuraVerifier::<_, P, _>::new(
+		client,
+		inherent_data_providers,
+		can_author_with,
+		check_for_equivocation,
+	);
+
+	Ok(BasicQueue::new(
+		verifier,
+		Box::new(block_import),
+		justification_import,
+		spawner,
+		registry,
+	))
+}
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index 71aa7bdb7c74..1c30f136ea00 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -31,50 +31,34 @@
 //! NOTE: Aura itself is designed to be generic over the crypto used.
 #![forbid(missing_docs, unsafe_code)]
 use std::{
-	sync::Arc, time::Duration, thread, marker::PhantomData, hash::Hash, fmt::Debug, pin::Pin,
-	collections::HashMap, convert::{TryFrom, TryInto},
+	sync::Arc, marker::PhantomData, hash::Hash, fmt::Debug, pin::Pin, convert::{TryFrom, TryInto},
 };
 
 use futures::prelude::*;
 use parking_lot::Mutex;
-use log::{debug, info, trace};
-use prometheus_endpoint::Registry;
+use log::{debug, trace};
 
 use codec::{Encode, Decode, Codec};
 
 use sp_consensus::{
 	BlockImport, Environment, Proposer, CanAuthorWith, ForkChoiceStrategy, BlockImportParams,
-	BlockOrigin, Error as ConsensusError, SelectChain, SlotData, BlockCheckParams, ImportResult,
-	import_queue::{
-		Verifier, BasicQueue, DefaultImportQueue, BoxJustificationImport,
-	},
+	BlockOrigin, Error as ConsensusError, SelectChain, SlotData,
 };
 use sc_client_api::{backend::AuxStore, BlockOf};
-use sp_blockchain::{
-	self, Result as CResult, well_known_cache_keys::{self, Id as CacheKeyId},
-	ProvideCache, HeaderBackend,
-};
-use sp_block_builder::BlockBuilder as BlockBuilderApi;
+use sp_blockchain::{Result as CResult, well_known_cache_keys, ProvideCache, HeaderBackend};
 use sp_core::crypto::Public;
 use sp_application_crypto::{AppKey, AppPublic};
-use sp_runtime::{generic::{BlockId, OpaqueDigestItemId}, traits::NumberFor, Justification};
+use sp_runtime::{generic::BlockId, traits::NumberFor};
 use sp_runtime::traits::{Block as BlockT, Header, DigestItemFor, Zero, Member};
 use sp_api::ProvideRuntimeApi;
 use sp_core::crypto::Pair;
 use sp_keystore::{SyncCryptoStorePtr, SyncCryptoStore};
 use sp_inherents::{InherentDataProviders, InherentData};
-use sp_timestamp::{
-	TimestampInherentData, InherentType as TimestampInherent, InherentError as TIError
-};
-use sc_telemetry::{telemetry, CONSENSUS_TRACE, CONSENSUS_DEBUG, CONSENSUS_INFO};
-
-use sc_consensus_slots::{
-	CheckedHeader, SlotInfo, SlotCompatible, StorageChanges, check_equivocation,
-	BackoffAuthoringBlocksStrategy,
-};
+use sp_timestamp::{TimestampInherentData, InherentType as TimestampInherent};
+use sc_consensus_slots::{SlotInfo, SlotCompatible, StorageChanges, BackoffAuthoringBlocksStrategy};
 use sp_consensus_slots::Slot;
 
-use sp_api::ApiExt;
+mod import_queue;
 
 pub use sp_consensus_aura::{
 	ConsensusLog, AuraApi, AURA_ENGINE_ID, digests::CompatibleDigestItem,
@@ -84,6 +68,7 @@ pub use sp_consensus_aura::{
 	},
 };
 pub use sp_consensus::SyncOracle;
+pub use import_queue::{ImportQueueParams, import_queue, AuraBlockImport, CheckForEquivocation};
 
 type AuthorityId<P> = <P as Pair>::Public;
 
@@ -133,26 +118,54 @@ impl SlotCompatible for AuraSlotCompatible {
 	}
 }
 
+/// Parameters of [`start_aura`].
+pub struct StartAuraParams<C, SC, I, PF, SO, BS, CAW> {
+	/// The duration of a slot.
+	pub slot_duration: SlotDuration,
+	/// The client to interact with the chain.
+	pub client: Arc<C>,
+	/// A select chain implementation to select the best block.
+	pub select_chain: SC,
+	/// The block import.
+	pub block_import: I,
+	/// The proposer factory to build proposer instances.
+	pub proposer_factory: PF,
+	/// The sync oracle that can give us the current sync status.
+	pub sync_oracle: SO,
+	/// The inherent data providers to create the inherent data.
+	pub inherent_data_providers: InherentDataProviders,
+	/// Should we force the authoring of blocks?
+	pub force_authoring: bool,
+	/// The backoff strategy when we miss slots.
+	pub backoff_authoring_blocks: Option<BS>,
+	/// The keystore used by the node.
+	pub keystore: SyncCryptoStorePtr,
+	/// Can we author a block with this node?
+	pub can_author_with: CAW,
+}
+
 /// Start the aura worker. The returned future should be run in a futures executor.
-pub fn start_aura<B, C, SC, E, I, P, SO, CAW, BS, Error>(
-	slot_duration: SlotDuration,
-	client: Arc<C>,
-	select_chain: SC,
-	block_import: I,
-	env: E,
-	sync_oracle: SO,
-	inherent_data_providers: InherentDataProviders,
-	force_authoring: bool,
-	backoff_authoring_blocks: Option<BS>,
-	keystore: SyncCryptoStorePtr,
-	can_author_with: CAW,
+pub fn start_aura<P, B, C, SC, PF, I, SO, CAW, BS, Error>(
+	StartAuraParams {
+		slot_duration,
+		client,
+		select_chain,
+		block_import,
+		proposer_factory: env,
+		sync_oracle,
+		inherent_data_providers,
+		force_authoring,
+		backoff_authoring_blocks,
+		keystore,
+		can_author_with,
+	}: StartAuraParams<C, SC, I, PF, SO, BS, CAW>,
 ) -> Result<impl Future<Output = ()>, sp_consensus::Error> where
 	B: BlockT,
 	C: ProvideRuntimeApi<B> + BlockOf + ProvideCache<B> + AuxStore + HeaderBackend<B> + Send + Sync,
 	C::Api: AuraApi<B, AuthorityId<P>>,
 	SC: SelectChain<B>,
-	E: Environment<B, Error = Error> + Send + Sync + 'static,
-	E::Proposer: Proposer<B, Error = Error, Transaction = sp_api::TransactionFor<C, B>>,
+	PF: Environment<B, Error = Error> + Send + Sync + 'static,
+	PF::Proposer: Proposer<B, Error = Error, Transaction = sp_api::TransactionFor<C, B>>,
 	P: Pair + Send + Sync,
 	P::Public: AppPublic + Hash + Member + Encode + Decode,
 	P::Signature: TryFrom<Vec<u8>> + Hash + Member + Encode + Decode,
@@ -430,290 +443,21 @@ fn find_pre_digest<B: BlockT, Signature: Codec>(header: &B::Header) -> Result<Sl
 	pre_digest.ok_or_else(|| aura_err(Error::NoDigestFound))
 }
 
-/// check a header has been signed by the right key. If the slot is too far in the future, an error
-/// will be returned. If it's successful, returns the pre-header and the digest item
-/// containing the seal.
-///
-/// This digest item will always return `Some` when used with `as_aura_seal`.
-//
-fn check_header<C, B: BlockT, P: Pair>(
-	client: &C,
-	slot_now: Slot,
-	mut header: B::Header,
-	hash: B::Hash,
-	authorities: &[AuthorityId<P>],
-) -> Result<CheckedHeader<B::Header, (Slot, DigestItemFor<B>)>, Error<B>> where
-	DigestItemFor<B>: CompatibleDigestItem<P::Signature>,
-	P::Signature: Codec,
-	C: sc_client_api::backend::AuxStore,
-	P::Public: Encode + Decode + PartialEq + Clone,
-{
-	let seal = match header.digest_mut().pop() {
-		Some(x) => x,
-		None => return Err(Error::HeaderUnsealed(hash)),
-	};
-
-	let sig = seal.as_aura_seal().ok_or_else(|| {
-		aura_err(Error::HeaderBadSeal(hash))
-	})?;
-
-	let slot = find_pre_digest::<B, P::Signature>(&header)?;
-
-	if slot > slot_now {
-		header.digest_mut().push(seal);
-		Ok(CheckedHeader::Deferred(header, slot))
+/// Register the aura inherent data provider, if not registered already.
+fn register_aura_inherent_data_provider(
+	inherent_data_providers: &InherentDataProviders,
+	slot_duration: u64,
+) -> Result<(), sp_consensus::Error> {
+	if !inherent_data_providers.has_provider(&INHERENT_IDENTIFIER) {
+		inherent_data_providers
+			.register_provider(InherentDataProvider::new(slot_duration))
+			.map_err(Into::into)
+			.map_err(sp_consensus::Error::InherentData)
 	} else {
-		// check the signature is valid under the expected authority and
-		// chain state.
-		let expected_author = match slot_author::<P>(slot, &authorities) {
-			None => return Err(Error::SlotAuthorNotFound),
-			Some(author) => author,
-		};
-
-		let pre_hash = header.hash();
-
-		if P::verify(&sig, pre_hash.as_ref(), expected_author) {
-			if let Some(equivocation_proof) = check_equivocation(
-				client,
-				slot_now,
-				slot,
-				&header,
-				expected_author,
-			).map_err(Error::Client)? {
-				info!(
-					"Slot author is equivocating at slot {} with headers {:?} and {:?}",
-					slot,
-					equivocation_proof.first_header.hash(),
-					equivocation_proof.second_header.hash(),
-				);
-			}
-
-			Ok(CheckedHeader::Checked(header, (slot, seal)))
-		} else {
-			Err(Error::BadSignature(hash))
-		}
-	}
-}
-
-/// A verifier for Aura blocks.
-pub struct AuraVerifier<C, P, CAW> {
-	client: Arc<C>,
-	phantom: PhantomData<P>,
-	inherent_data_providers: sp_inherents::InherentDataProviders,
-	can_author_with: CAW,
-}
-
-impl<C, P, CAW> AuraVerifier<C, P, CAW> where
-	P: Send + Sync + 'static,
-	CAW: Send + Sync + 'static,
-{
-	fn check_inherents<B: BlockT>(
-		&self,
-		block: B,
-		block_id: BlockId<B>,
-		inherent_data: InherentData,
-		timestamp_now: u64,
-	) -> Result<(), Error<B>> where
-		C: ProvideRuntimeApi<B>, C::Api: BlockBuilderApi<B>,
-		CAW: CanAuthorWith<B>,
-	{
-		const MAX_TIMESTAMP_DRIFT_SECS: u64 = 60;
-
-		if let Err(e) = self.can_author_with.can_author_with(&block_id) {
-			debug!(
-				target: "aura",
-				"Skipping `check_inherents` as authoring version is not compatible: {}",
-				e,
-			);
-
-			return Ok(())
-		}
-
-		let inherent_res = self.client.runtime_api().check_inherents(
-			&block_id,
-			block,
-			inherent_data,
-		).map_err(|e| Error::Client(e.into()))?;
-
-		if !inherent_res.ok() {
-			inherent_res
-				.into_errors()
-				.try_for_each(|(i, e)| match TIError::try_from(&i, &e) {
-					Some(TIError::ValidAtTimestamp(timestamp)) => {
-						// halt import until timestamp is valid.
-						// reject when too far ahead.
-						if timestamp > timestamp_now + MAX_TIMESTAMP_DRIFT_SECS {
-							return Err(Error::TooFarInFuture);
-						}
-
-						let diff = timestamp.saturating_sub(timestamp_now);
-						info!(
-							target: "aura",
-							"halting for block {} seconds in the future",
-							diff
-						);
-						telemetry!(CONSENSUS_INFO; "aura.halting_for_future_block";
-							"diff" => ?diff
-						);
-						thread::sleep(Duration::from_secs(diff));
-						Ok(())
-					},
-					Some(TIError::Other(e)) => Err(Error::Runtime(e.into())),
-					None => Err(Error::DataProvider(
-						self.inherent_data_providers.error_to_string(&i, &e)
-					)),
-				})
-		} else {
-			Ok(())
-		}
-	}
-}
-
-#[forbid(deprecated)]
-impl<B: BlockT, C, P, CAW> Verifier<B> for AuraVerifier<C, P, CAW> where
-	C: ProvideRuntimeApi<B> +
-		Send +
-		Sync +
-		sc_client_api::backend::AuxStore +
-		ProvideCache<B> +
-		BlockOf,
-	C::Api: BlockBuilderApi<B> + AuraApi<B, AuthorityId<P>> + ApiExt<B>,
-	DigestItemFor<B>: CompatibleDigestItem<P::Signature>,
-	P: Pair + Send + Sync + 'static,
-	P::Public: Send + Sync + Hash + Eq + Clone + Decode + Encode + Debug + 'static,
-	P::Signature: Encode + Decode,
-	CAW: CanAuthorWith<B> + Send + Sync + 'static,
-{
-	fn verify(
-		&mut self,
-		origin: BlockOrigin,
-		header: B::Header,
-		justification: Option<Justification>,
-		mut body: Option<Vec<B::Extrinsic>>,
-	) -> Result<(BlockImportParams<B, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String> {
-		let mut inherent_data = self.inherent_data_providers
-			.create_inherent_data()
-			.map_err(|e| e.into_string())?;
-		let (timestamp_now, slot_now, _) = AuraSlotCompatible.extract_timestamp_and_slot(&inherent_data)
-			.map_err(|e| format!("Could not extract timestamp and slot: {:?}", e))?;
-		let hash = header.hash();
-		let parent_hash = *header.parent_hash();
-		let authorities = authorities(self.client.as_ref(), &BlockId::Hash(parent_hash))
-			.map_err(|e| format!("Could not fetch authorities at {:?}: {:?}", parent_hash, e))?;
-
-		// we add one to allow for some small drift.
-		// FIXME #1019 in the future, alter this queue to allow deferring of
-		// headers
-		let checked_header = check_header::<C, B, P>(
-			&self.client,
-			slot_now + 1,
-			header,
-			hash,
-			&authorities[..],
-		).map_err(|e| e.to_string())?;
-		match checked_header {
-			CheckedHeader::Checked(pre_header, (slot, seal)) => {
-				// if the body is passed through, we need to use the runtime
-				// to check that the internally-set timestamp in the inherents
-				// actually matches the slot set in the seal.
-				if let Some(inner_body) = body.take() {
-					inherent_data.aura_replace_inherent_data(slot);
-					let block = B::new(pre_header.clone(), inner_body);
-
-					// skip the inherents verification if the runtime API is old.
-					if self.client
-						.runtime_api()
-						.has_api_with::<dyn BlockBuilderApi<B>, _>(
-							&BlockId::Hash(parent_hash),
-							|v| v >= 2,
-						)
-						.map_err(|e| format!("{:?}", e))?
-					{
-						self.check_inherents(
-							block.clone(),
-							BlockId::Hash(parent_hash),
-							inherent_data,
-							timestamp_now,
-						).map_err(|e| e.to_string())?;
-					}
-
-					let (_, inner_body) = block.deconstruct();
-					body = Some(inner_body);
-				}
-
-				trace!(target: "aura", "Checked {:?}; importing.", pre_header);
-				telemetry!(CONSENSUS_TRACE; "aura.checked_and_importing"; "pre_header" => ?pre_header);
-
-				// Look for an authorities-change log.
-				let maybe_keys = pre_header.digest()
-					.logs()
-					.iter()
-					.filter_map(|l| l.try_to::<ConsensusLog<AuthorityId<P>>>(
-						OpaqueDigestItemId::Consensus(&AURA_ENGINE_ID)
-					))
-					.find_map(|l| match l {
-						ConsensusLog::AuthoritiesChange(a) => Some(
-							vec![(well_known_cache_keys::AUTHORITIES, a.encode())]
-						),
-						_ => None,
-					});
-
-				let mut import_block = BlockImportParams::new(origin, pre_header);
-				import_block.post_digests.push(seal);
-				import_block.body = body;
-				import_block.justification = justification;
-				import_block.fork_choice = Some(ForkChoiceStrategy::LongestChain);
-				import_block.post_hash = Some(hash);
-
-				Ok((import_block, maybe_keys))
-			}
-			CheckedHeader::Deferred(a, b) => {
-				debug!(target: "aura", "Checking {:?} failed; {:?}, {:?}.", hash, a, b);
-				telemetry!(CONSENSUS_DEBUG; "aura.header_too_far_in_future";
-					"hash" => ?hash, "a" => ?a, "b" => ?b
-				);
-				Err(format!("Header {:?} rejected: too far in the future", hash))
-			}
-		}
-	}
-}
-
-fn initialize_authorities_cache<A, B, C>(client: &C) -> Result<(), ConsensusError> where
-	A: Codec + Debug,
-	B: BlockT,
-	C: ProvideRuntimeApi<B> + BlockOf + ProvideCache<B>,
-	C::Api: AuraApi<B, A>,
-{
-	// no cache => no initialization
-	let cache = match client.cache() {
-		Some(cache) => cache,
-		None => return Ok(()),
-	};
-
-	// check if we already have initialized the cache
-	let map_err = |error| sp_consensus::Error::from(sp_consensus::Error::ClientImport(
-		format!(
-			"Error initializing authorities cache: {}",
-			error,
-		)));
-
-	let genesis_id = BlockId::Number(Zero::zero());
-	let genesis_authorities: Option<Vec<A>> = cache
-		.get_at(&well_known_cache_keys::AUTHORITIES, &genesis_id)
-		.unwrap_or(None)
-		.and_then(|(_, _, v)| Decode::decode(&mut &v[..]).ok());
-	if genesis_authorities.is_some() {
-		return Ok(());
+		Ok(())
 	}
-
-	let genesis_authorities = authorities(client, &genesis_id)?;
-	cache.initialize(&well_known_cache_keys::AUTHORITIES, genesis_authorities.encode())
-		.map_err(map_err)?;
-
-	Ok(())
 }
 
-#[allow(deprecated)]
 fn authorities<A, B, C>(client: &C, at: &BlockId<B>) -> Result<Vec<A>, ConsensusError> where
 	A: Codec + Debug,
 	B: BlockT,
@@ -731,145 +475,6 @@ fn authorities<A, B, C>(client: &C, at: &BlockId<B>) -> Result<Vec<A>, Consensus
 		.ok_or_else(|| sp_consensus::Error::InvalidAuthoritiesSet.into())
 }
 
-/// Register the aura inherent data provider, if not registered already.
-fn register_aura_inherent_data_provider(
-	inherent_data_providers: &InherentDataProviders,
-	slot_duration: u64,
-) -> Result<(), sp_consensus::Error> {
-	if !inherent_data_providers.has_provider(&INHERENT_IDENTIFIER) {
-		inherent_data_providers
-			.register_provider(InherentDataProvider::new(slot_duration))
-			.map_err(Into::into)
-			.map_err(sp_consensus::Error::InherentData)
-	} else {
-		Ok(())
-	}
-}
-
-/// A block-import handler for Aura.
-pub struct AuraBlockImport<Block: BlockT, C, I: BlockImport<Block>, P> {
-	inner: I,
-	client: Arc<C>,
-	_phantom: PhantomData<(Block, P)>,
-}
-
-impl<Block: BlockT, C, I: Clone + BlockImport<Block>, P> Clone for AuraBlockImport<Block, C, I, P> {
-	fn clone(&self) -> Self {
-		AuraBlockImport {
-			inner: self.inner.clone(),
-			client: self.client.clone(),
-			_phantom: PhantomData,
-		}
-	}
-}
-
-impl<Block: BlockT, C, I: BlockImport<Block>, P> AuraBlockImport<Block, C, I, P> {
-	/// New aura block import.
-	pub fn new(
-		inner: I,
-		client: Arc<C>,
-	) -> Self {
-		Self {
-			inner,
-			client,
-			_phantom: PhantomData,
-		}
-	}
-}
-
-impl<Block: BlockT, C, I, P> BlockImport<Block> for AuraBlockImport<Block, C, I, P> where
-	I: BlockImport<Block, Transaction = sp_api::TransactionFor<C, Block>> + Send + Sync,
-	I::Error: Into<ConsensusError>,
-	C: HeaderBackend<Block> + ProvideRuntimeApi<Block>,
-	P: Pair + Send + Sync + 'static,
-	P::Public: Clone + Eq + Send + Sync + Hash + Debug + Encode + Decode,
-	P::Signature: Encode + Decode,
-{
-	type Error = ConsensusError;
-	type Transaction = sp_api::TransactionFor<C, Block>;
-
-	fn check_block(
-		&mut self,
-		block: BlockCheckParams<Block>,
-	) -> Result<ImportResult, Self::Error> {
-		self.inner.check_block(block).map_err(Into::into)
-	}
-
-	fn import_block(
-		&mut self,
-		block: BlockImportParams<Block, Self::Transaction>,
-		new_cache: HashMap<CacheKeyId, Vec<u8>>,
-	) -> Result<ImportResult, Self::Error> {
-		let hash = block.post_hash();
-		let slot = find_pre_digest::<Block, P::Signature>(&block.header)
-			.expect("valid Aura headers must contain a predigest; \
-					 header has been already verified; qed");
-
-		let parent_hash = *block.header.parent_hash();
-		let parent_header = self.client.header(BlockId::Hash(parent_hash))
-			.map_err(|e| ConsensusError::ChainLookup(e.to_string()))?
-			.ok_or_else(|| ConsensusError::ChainLookup(aura_err(
-				Error::<Block>::ParentUnavailable(parent_hash, hash)
-			).into()))?;
-
-		let parent_slot = find_pre_digest::<Block, P::Signature>(&parent_header)
-			.expect("valid Aura headers contain a pre-digest; \
-					parent header has already been verified; qed");
-
-		// make sure that slot number is strictly increasing
-		if slot <= parent_slot {
-			return Err(
-				ConsensusError::ClientImport(aura_err(
-					Error::<Block>::SlotMustIncrease(parent_slot, slot)
-				).into())
-			);
-		}
-
-		self.inner.import_block(block, new_cache).map_err(Into::into)
-	}
-}
-
-/// Start an import queue for the Aura consensus algorithm.
-pub fn import_queue<B, I, C, P, S, CAW>(
-	slot_duration: SlotDuration,
-	block_import: I,
-	justification_import: Option<BoxJustificationImport<B>>,
-	client: Arc<C>,
-	inherent_data_providers: InherentDataProviders,
-	spawner: &S,
-	registry: Option<&Registry>,
-	can_author_with: CAW,
-) -> Result<DefaultImportQueue<B, C>, sp_consensus::Error> where
-	B: BlockT,
-	C::Api: BlockBuilderApi<B> + AuraApi<B, AuthorityId<P>> + ApiExt<B>,
-	C: 'static + ProvideRuntimeApi<B> + BlockOf + ProvideCache<B> + Send + Sync + AuxStore + HeaderBackend<B>,
-	I: BlockImport<B, Error=ConsensusError, Transaction = sp_api::TransactionFor<C, B>> + Send + Sync + 'static,
-	DigestItemFor<B>: CompatibleDigestItem<P::Signature>,
-	P: Pair + Send + Sync + 'static,
-	P::Public: Clone + Eq + Send + Sync + Hash + Debug + Encode + Decode,
-	P::Signature: Encode + Decode,
-	S: sp_core::traits::SpawnEssentialNamed,
-	CAW: CanAuthorWith<B> + Send + Sync + 'static,
-{
-	register_aura_inherent_data_provider(&inherent_data_providers, slot_duration.get())?;
-	initialize_authorities_cache(&*client)?;
-
-	let verifier = AuraVerifier::<_, P, _> {
-		client,
-		inherent_data_providers,
-		phantom: PhantomData,
-		can_author_with,
-	};
-
-	Ok(BasicQueue::new(
-		verifier,
-		Box::new(block_import),
-		justification_import,
-		spawner,
-		registry,
-	))
-}
-
 #[cfg(test)]
 mod tests {
 	use super::*;
@@ -884,7 +489,7 @@ mod tests {
 	use sc_client_api::BlockchainEvents;
 	use sp_consensus_aura::sr25519::AuthorityPair;
 	use sc_consensus_slots::{SimpleSlotWorker, BackoffAuthoringOnFinalizedHeadLagging};
-	use std::{task::Poll, time::Instant};
+	use std::{task::Poll, time::{Instant, Duration}};
 	use sc_block_builder::BlockBuilderProvider;
 	use sp_runtime::traits::Header as _;
 	use substrate_test_runtime_client::{TestClient, runtime::{Header, H256}};
@@ -941,7 +546,7 @@ mod tests {
 	}
 
 	impl TestNetFactory for AuraTestNet {
-		type Verifier = AuraVerifier<PeersFullClient, AuthorityPair, AlwaysCanAuthor>;
+		type Verifier = import_queue::AuraVerifier<PeersFullClient, AuthorityPair, AlwaysCanAuthor>;
 		type PeerData = ();
 
 		/// Create new test network with peers and given config.
@@ -964,12 +569,12 @@ mod tests {
 					).expect("Registers aura inherent data provider");
 
 					assert_eq!(slot_duration.get(), SLOT_DURATION);
-					AuraVerifier {
+					import_queue::AuraVerifier::new(
 						client,
 						inherent_data_providers,
-						phantom: Default::default(),
-						can_author_with: AlwaysCanAuthor,
-					}
+						AlwaysCanAuthor,
+						CheckForEquivocation::Yes,
+					)
 				},
 				PeersClient::Light(_, _) => unreachable!("No (yet) tests for light client + Aura"),
 			}
@@ -982,14 +587,12 @@ mod tests {
 		fn peers(&self) -> &Vec<Peer<Self::PeerData>> {
 			&self.peers
 		}
-
 		fn mut_peers<F: FnOnce(&mut Vec<Peer<Self::PeerData>>)>(&mut self, closure: F) {
 			closure(&mut self.peers);
 		}
 	}
 
 	#[test]
-	#[allow(deprecated)]
 	fn authoring_blocks() {
 		sp_tracing::try_init_simple();
 		let net = AuraTestNet::new(3);
@@ -1033,19 +636,19 @@ mod tests {
 				&inherent_data_providers, slot_duration.get()
 			).expect("Registers aura inherent data provider");
 
-			aura_futures.push(start_aura::<_, _, _, _, _, AuthorityPair, _, _, _, _>(
+			aura_futures.push(start_aura::<AuthorityPair, _, _, _, _, _, _, _, _, _>(StartAuraParams {
 				slot_duration,
-				client.clone(),
+				block_import: client.clone(),
 				select_chain,
 				client,
-				environ,
-				DummyOracle,
+				proposer_factory: environ,
+				sync_oracle: DummyOracle,
 				inherent_data_providers,
-				false,
-				Some(BackoffAuthoringOnFinalizedHeadLagging::default()),
+				force_authoring: false,
+				backoff_authoring_blocks: Some(BackoffAuthoringOnFinalizedHeadLagging::default()),
 				keystore,
-				sp_consensus::AlwaysCanAuthor,
-			).expect("Starts aura"));
+				can_author_with: sp_consensus::AlwaysCanAuthor,
+			}).expect("Starts aura"));
 		}
 
 		futures::executor::block_on(future::select(

From af998b20151cf08d0757a0c4d040be9438197cdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Sat, 6 Mar 2021 14:42:21 +0100
Subject: [PATCH 0468/1194] Do not use `Option` to wrap `GenesisConfig` fields
 (#8275)

Currently we wrap every `GenesisConfig` field in an `Option`, while
we require `Default` being implemented for all pallet genesisconfigs.
Passing `None` also results in the genesis not being initialized, which
is a bug as seen from the perspective of a pallet developer?

This pr changes the fields of the `GenesisConfig` to non `Option` types.
---
 bin/node-template/node/src/chain_spec.rs | 20 +++----
 bin/node/cli/src/chain_spec.rs           | 68 ++++++++++++------------
 bin/node/testing/src/genesis.rs          | 56 +++++++++----------
 frame/collective/src/lib.rs              | 10 ++--
 frame/elections-phragmen/src/lib.rs      |  8 +--
 frame/elections/src/mock.rs              |  8 +--
 frame/example/src/lib.rs                 |  8 +--
 frame/support/src/genesis_config.rs      | 22 ++++----
 frame/support/test/tests/instance.rs     | 20 +++----
 frame/support/test/tests/issue2219.rs    |  4 +-
 10 files changed, 111 insertions(+), 113 deletions(-)

diff --git a/bin/node-template/node/src/chain_spec.rs b/bin/node-template/node/src/chain_spec.rs
index c5451e81f20c..f7ed87251391 100644
--- a/bin/node-template/node/src/chain_spec.rs
+++ b/bin/node-template/node/src/chain_spec.rs
@@ -134,24 +134,24 @@ fn testnet_genesis(
 	_enable_println: bool,
 ) -> GenesisConfig {
 	GenesisConfig {
-		frame_system: Some(SystemConfig {
+		frame_system: SystemConfig {
 			// Add Wasm runtime to storage.
 			code: wasm_binary.to_vec(),
 			changes_trie_config: Default::default(),
-		}),
-		pallet_balances: Some(BalancesConfig {
+		},
+		pallet_balances: BalancesConfig {
 			// Configure endowed accounts with initial balance of 1 << 60.
 			balances: endowed_accounts.iter().cloned().map(|k|(k, 1 << 60)).collect(),
-		}),
-		pallet_aura: Some(AuraConfig {
+		},
+		pallet_aura: AuraConfig {
 			authorities: initial_authorities.iter().map(|x| (x.0.clone())).collect(),
-		}),
-		pallet_grandpa: Some(GrandpaConfig {
+		},
+		pallet_grandpa: GrandpaConfig {
 			authorities: initial_authorities.iter().map(|x| (x.1.clone(), 1)).collect(),
-		}),
-		pallet_sudo: Some(SudoConfig {
+		},
+		pallet_sudo: SudoConfig {
 			// Assign network admin rights.
 			key: root_key,
-		}),
+		},
 	}
 }
diff --git a/bin/node/cli/src/chain_spec.rs b/bin/node/cli/src/chain_spec.rs
index db268ad10529..3b40dde37721 100644
--- a/bin/node/cli/src/chain_spec.rs
+++ b/bin/node/cli/src/chain_spec.rs
@@ -246,19 +246,19 @@ pub fn testnet_genesis(
 	const STASH: Balance = ENDOWMENT / 1000;
 
 	GenesisConfig {
-		frame_system: Some(SystemConfig {
+		frame_system: SystemConfig {
 			code: wasm_binary_unwrap().to_vec(),
 			changes_trie_config: Default::default(),
-		}),
-		pallet_balances: Some(BalancesConfig {
+		},
+		pallet_balances: BalancesConfig {
 			balances: endowed_accounts.iter().cloned()
 				.map(|x| (x, ENDOWMENT))
 				.collect()
-		}),
-		pallet_indices: Some(IndicesConfig {
+		},
+		pallet_indices: IndicesConfig {
 			indices: vec![],
-		}),
-		pallet_session: Some(SessionConfig {
+		},
+		pallet_session: SessionConfig {
 			keys: initial_authorities.iter().map(|x| {
 				(x.0.clone(), x.0.clone(), session_keys(
 					x.2.clone(),
@@ -267,8 +267,8 @@ pub fn testnet_genesis(
 					x.5.clone(),
 				))
 			}).collect::<Vec<_>>(),
-		}),
-		pallet_staking: Some(StakingConfig {
+		},
+		pallet_staking: StakingConfig {
 			validator_count: initial_authorities.len() as u32 * 2,
 			minimum_validator_count: initial_authorities.len() as u32,
 			stakers: initial_authorities.iter().map(|x| {
@@ -277,56 +277,56 @@ pub fn testnet_genesis(
 			invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(),
 			slash_reward_fraction: Perbill::from_percent(10),
 			.. Default::default()
-		}),
-		pallet_democracy: Some(DemocracyConfig::default()),
-		pallet_elections_phragmen: Some(ElectionsConfig {
+		},
+		pallet_democracy: DemocracyConfig::default(),
+		pallet_elections_phragmen: ElectionsConfig {
 			members: endowed_accounts.iter()
 						.take((num_endowed_accounts + 1) / 2)
 						.cloned()
 						.map(|member| (member, STASH))
 						.collect(),
-		}),
-		pallet_collective_Instance1: Some(CouncilConfig::default()),
-		pallet_collective_Instance2: Some(TechnicalCommitteeConfig {
+		},
+		pallet_collective_Instance1: CouncilConfig::default(),
+		pallet_collective_Instance2: TechnicalCommitteeConfig {
 			members: endowed_accounts.iter()
 						.take((num_endowed_accounts + 1) / 2)
 						.cloned()
 						.collect(),
 			phantom: Default::default(),
-		}),
-		pallet_contracts: Some(ContractsConfig {
+		},
+		pallet_contracts: ContractsConfig {
 			current_schedule: pallet_contracts::Schedule {
 				enable_println, // this should only be enabled on development chains
 				..Default::default()
 			},
-		}),
-		pallet_sudo: Some(SudoConfig {
+		},
+		pallet_sudo: SudoConfig {
 			key: root_key,
-		}),
-		pallet_babe: Some(BabeConfig {
+		},
+		pallet_babe: BabeConfig {
 			authorities: vec![],
-		}),
-		pallet_im_online: Some(ImOnlineConfig {
+		},
+		pallet_im_online: ImOnlineConfig {
 			keys: vec![],
-		}),
-		pallet_authority_discovery: Some(AuthorityDiscoveryConfig {
+		},
+		pallet_authority_discovery: AuthorityDiscoveryConfig {
 			keys: vec![],
-		}),
-		pallet_grandpa: Some(GrandpaConfig {
+		},
+		pallet_grandpa: GrandpaConfig {
 			authorities: vec![],
-		}),
-		pallet_membership_Instance1: Some(Default::default()),
-		pallet_treasury: Some(Default::default()),
-		pallet_society: Some(SocietyConfig {
+		},
+		pallet_membership_Instance1: Default::default(),
+		pallet_treasury: Default::default(),
+		pallet_society: SocietyConfig {
 			members: endowed_accounts.iter()
 						.take((num_endowed_accounts + 1) / 2)
 						.cloned()
 						.collect(),
 			pot: 0,
 			max_members: 999,
-		}),
-		pallet_vesting: Some(Default::default()),
-		pallet_gilt: Some(Default::default()),
+		},
+		pallet_vesting: Default::default(),
+		pallet_gilt: Default::default(),
 	}
 }
 
diff --git a/bin/node/testing/src/genesis.rs b/bin/node/testing/src/genesis.rs
index b026b9530e7f..22187f404cfe 100644
--- a/bin/node/testing/src/genesis.rs
+++ b/bin/node/testing/src/genesis.rs
@@ -56,20 +56,20 @@ pub fn config_endowed(
 	);
 
 	GenesisConfig {
-		frame_system: Some(SystemConfig {
+		frame_system: SystemConfig {
 			changes_trie_config: if support_changes_trie { Some(ChangesTrieConfiguration {
 				digest_interval: 2,
 				digest_levels: 2,
 			}) } else { None },
 			code: code.map(|x| x.to_vec()).unwrap_or_else(|| wasm_binary_unwrap().to_vec()),
-		}),
-		pallet_indices: Some(IndicesConfig {
+		},
+		pallet_indices: IndicesConfig {
 			indices: vec![],
-		}),
-		pallet_balances: Some(BalancesConfig {
+		},
+		pallet_balances: BalancesConfig {
 			balances: endowed,
-		}),
-		pallet_session: Some(SessionConfig {
+		},
+		pallet_session: SessionConfig {
 			keys: vec![
 				(dave(), alice(), to_session_keys(
 					&Ed25519Keyring::Alice,
@@ -84,8 +84,8 @@ pub fn config_endowed(
 					&Sr25519Keyring::Charlie,
 				)),
 			]
-		}),
-		pallet_staking: Some(StakingConfig {
+		},
+		pallet_staking: StakingConfig {
 			stakers: vec![
 				(dave(), alice(), 111 * DOLLARS, StakerStatus::Validator),
 				(eve(), bob(), 100 * DOLLARS, StakerStatus::Validator),
@@ -96,29 +96,29 @@ pub fn config_endowed(
 			slash_reward_fraction: Perbill::from_percent(10),
 			invulnerables: vec![alice(), bob(), charlie()],
 			.. Default::default()
-		}),
-		pallet_contracts: Some(ContractsConfig {
+		},
+		pallet_contracts: ContractsConfig {
 			current_schedule: Default::default(),
-		}),
-		pallet_babe: Some(Default::default()),
-		pallet_grandpa: Some(GrandpaConfig {
+		},
+		pallet_babe: Default::default(),
+		pallet_grandpa: GrandpaConfig {
 			authorities: vec![],
-		}),
-		pallet_im_online: Some(Default::default()),
-		pallet_authority_discovery: Some(Default::default()),
-		pallet_democracy: Some(Default::default()),
-		pallet_collective_Instance1: Some(Default::default()),
-		pallet_collective_Instance2: Some(Default::default()),
-		pallet_membership_Instance1: Some(Default::default()),
-		pallet_elections_phragmen: Some(Default::default()),
-		pallet_sudo: Some(Default::default()),
-		pallet_treasury: Some(Default::default()),
-		pallet_society: Some(SocietyConfig {
+		},
+		pallet_im_online: Default::default(),
+		pallet_authority_discovery: Default::default(),
+		pallet_democracy: Default::default(),
+		pallet_collective_Instance1: Default::default(),
+		pallet_collective_Instance2: Default::default(),
+		pallet_membership_Instance1: Default::default(),
+		pallet_elections_phragmen: Default::default(),
+		pallet_sudo: Default::default(),
+		pallet_treasury: Default::default(),
+		pallet_society: SocietyConfig {
 			members: vec![alice(), bob()],
 			pot: 0,
 			max_members: 999,
-		}),
-		pallet_vesting: Some(Default::default()),
-		pallet_gilt: Some(Default::default()),
+		},
+		pallet_vesting: Default::default(),
+		pallet_gilt: Default::default(),
 	}
 }
diff --git a/frame/collective/src/lib.rs b/frame/collective/src/lib.rs
index a8184b8dd528..6d9066bca241 100644
--- a/frame/collective/src/lib.rs
+++ b/frame/collective/src/lib.rs
@@ -1054,15 +1054,15 @@ mod tests {
 
 	pub fn new_test_ext() -> sp_io::TestExternalities {
 		let mut ext: sp_io::TestExternalities = GenesisConfig {
-			collective_Instance1: Some(collective::GenesisConfig {
+			collective_Instance1: collective::GenesisConfig {
 				members: vec![1, 2, 3],
 				phantom: Default::default(),
-			}),
-			collective_Instance2: Some(collective::GenesisConfig {
+			},
+			collective_Instance2: collective::GenesisConfig {
 				members: vec![1, 2, 3, 4, 5],
 				phantom: Default::default(),
-			}),
-			collective: None,
+			},
+			collective: Default::default(),
 		}.build_storage().unwrap().into();
 		ext.execute_with(|| System::set_block_number(1));
 		ext
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index d3b12d127a3c..779570ca633e 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -1245,7 +1245,7 @@ mod tests {
 		pub fn build_and_execute(self, test: impl FnOnce() -> ()) {
 			MEMBERS.with(|m| *m.borrow_mut() = self.genesis_members.iter().map(|(m, _)| m.clone()).collect::<Vec<_>>());
 			let mut ext: sp_io::TestExternalities = GenesisConfig {
-				pallet_balances: Some(pallet_balances::GenesisConfig::<Test>{
+				pallet_balances: pallet_balances::GenesisConfig::<Test>{
 					balances: vec![
 						(1, 10 * self.balance_factor),
 						(2, 20 * self.balance_factor),
@@ -1254,10 +1254,10 @@ mod tests {
 						(5, 50 * self.balance_factor),
 						(6, 60 * self.balance_factor)
 					],
-				}),
-				elections_phragmen: Some(elections_phragmen::GenesisConfig::<Test> {
+				},
+				elections_phragmen: elections_phragmen::GenesisConfig::<Test> {
 					members: self.genesis_members
-				}),
+				},
 			}.build_storage().unwrap().into();
 			ext.execute_with(pre_conditions);
 			ext.execute_with(test);
diff --git a/frame/elections/src/mock.rs b/frame/elections/src/mock.rs
index 7c9bc9bfaf8b..31d3f5a1c28a 100644
--- a/frame/elections/src/mock.rs
+++ b/frame/elections/src/mock.rs
@@ -194,7 +194,7 @@ impl ExtBuilder {
 		PRESENT_SLASH_PER_VOTER.with(|v| *v.borrow_mut() = self.bad_presentation_punishment);
 		DECAY_RATIO.with(|v| *v.borrow_mut() = self.decay_ratio);
 		let mut ext: sp_io::TestExternalities = GenesisConfig {
-			pallet_balances: Some(pallet_balances::GenesisConfig::<Test>{
+			pallet_balances: pallet_balances::GenesisConfig::<Test>{
 				balances: vec![
 					(1, 10 * self.balance_factor),
 					(2, 20 * self.balance_factor),
@@ -203,13 +203,13 @@ impl ExtBuilder {
 					(5, 50 * self.balance_factor),
 					(6, 60 * self.balance_factor)
 				],
-			}),
-			elections: Some(elections::GenesisConfig::<Test>{
+			},
+			elections: elections::GenesisConfig::<Test>{
 				members: vec![],
 				desired_seats: self.desired_seats,
 				presentation_duration: 2,
 				term_duration: 5,
-			}),
+			},
 		}.build_storage().unwrap().into();
 		ext.execute_with(|| System::set_block_number(1));
 		ext
diff --git a/frame/example/src/lib.rs b/frame/example/src/lib.rs
index b4ae35c5508a..7a537f4522ab 100644
--- a/frame/example/src/lib.rs
+++ b/frame/example/src/lib.rs
@@ -814,14 +814,14 @@ mod tests {
 	pub fn new_test_ext() -> sp_io::TestExternalities {
 		let t = GenesisConfig {
 			// We use default for brevity, but you can configure as desired if needed.
-			frame_system: Some(Default::default()),
-			pallet_balances: Some(Default::default()),
-			pallet_example: Some(pallet_example::GenesisConfig {
+			frame_system: Default::default(),
+			pallet_balances: Default::default(),
+			pallet_example: pallet_example::GenesisConfig {
 				dummy: 42,
 				// we configure the map with (key, value) pairs.
 				bar: vec![(1, 2), (2, 3)],
 				foo: 24,
-			}),
+			},
 		}.build_storage().unwrap();
 		t.into()
 	}
diff --git a/frame/support/src/genesis_config.rs b/frame/support/src/genesis_config.rs
index 2b7cae898ff5..8f915082e8bb 100644
--- a/frame/support/src/genesis_config.rs
+++ b/frame/support/src/genesis_config.rs
@@ -82,7 +82,7 @@ macro_rules! impl_outer_config {
 			#[serde(deny_unknown_fields)]
 			pub struct $main {
 				$(
-					pub [< $snake $(_ $instance )? >]: Option<$config>,
+					pub [< $snake $(_ $instance )? >]: $config,
 				)*
 			}
 			#[cfg(any(feature = "std", test))]
@@ -92,15 +92,13 @@ macro_rules! impl_outer_config {
 					storage: &mut $crate::sp_runtime::Storage,
 				) -> std::result::Result<(), String> {
 					$(
-						if let Some(ref extra) = self.[< $snake $(_ $instance )? >] {
-							$crate::impl_outer_config! {
-								@CALL_FN
-								$concrete;
-								$snake;
-								$( $instance )?;
-								extra;
-								storage;
-							}
+						$crate::impl_outer_config! {
+							@CALL_FN
+							$concrete;
+							$snake;
+							$( $instance )?;
+							&self.[< $snake $(_ $instance )? >];
+							storage;
 						}
 					)*
 
@@ -117,7 +115,7 @@ macro_rules! impl_outer_config {
 		$runtime:ident;
 		$module:ident;
 		$instance:ident;
-		$extra:ident;
+		$extra:expr;
 		$storage:ident;
 	) => {
 		$crate::sp_runtime::BuildModuleGenesisStorage::<$runtime, $module::$instance>::build_module_genesis_storage(
@@ -129,7 +127,7 @@ macro_rules! impl_outer_config {
 		$runtime:ident;
 		$module:ident;
 		;
-		$extra:ident;
+		$extra:expr;
 		$storage:ident;
 	) => {
 		$crate::sp_runtime::BuildModuleGenesisStorage::
diff --git a/frame/support/test/tests/instance.rs b/frame/support/test/tests/instance.rs
index f7d79b7d4bf6..42cc2af19c65 100644
--- a/frame/support/test/tests/instance.rs
+++ b/frame/support/test/tests/instance.rs
@@ -291,26 +291,26 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, Call, Signature,
 
 fn new_test_ext() -> sp_io::TestExternalities {
 	GenesisConfig{
-		module1_Instance1: Some(module1::GenesisConfig {
+		module1_Instance1: module1::GenesisConfig {
 			value: 3,
 			test: 2,
-		}),
-		module1_Instance2: Some(module1::GenesisConfig {
+		},
+		module1_Instance2: module1::GenesisConfig {
 			value: 4,
 			test: 5,
-		}),
-		module2: Some(module2::GenesisConfig {
+		},
+		module2: module2::GenesisConfig {
 			value: 4,
 			map: vec![(0, 0)],
 			double_map: vec![(0, 0, 0)],
-		}),
-		module2_Instance1: Some(module2::GenesisConfig {
+		},
+		module2_Instance1: module2::GenesisConfig {
 			value: 4,
 			map: vec![(0, 0)],
 			double_map: vec![(0, 0, 0)],
-		}),
-		module2_Instance2: None,
-		module2_Instance3: None,
+		},
+		module2_Instance2: Default::default(),
+		module2_Instance3: Default::default(),
 	}.build_storage().unwrap().into()
 }
 
diff --git a/frame/support/test/tests/issue2219.rs b/frame/support/test/tests/issue2219.rs
index 4eacca9daca0..9ad9b8be7f41 100644
--- a/frame/support/test/tests/issue2219.rs
+++ b/frame/support/test/tests/issue2219.rs
@@ -185,9 +185,9 @@ frame_support::construct_runtime!(
 #[test]
 fn create_genesis_config() {
 	GenesisConfig {
-		module: Some(module::GenesisConfig {
+		module: module::GenesisConfig {
 			request_life_time: 0,
 			enable_storage_role: true,
-		})
+		}
 	};
 }

From a95851279f32705027d355b53a2a7c77658ab7b8 Mon Sep 17 00:00:00 2001
From: Niklas Adolfsson <niklasadolfsson1@gmail.com>
Date: Sat, 6 Mar 2021 16:33:22 +0100
Subject: [PATCH 0469/1194] refactor(remote ext): use jsonrpsee  (#8105)

* A clean new attempt

* Checkpoint to move remote.

* A lot of dependency wiring to make it feature gated.

* bad macro, bad macro.

* refactor(remote ext): use jsonrpsee

* refactor(remote ext): use jsonrpsee

* Undo the DB mess.

* fix(remote ext): use max limit `u32::MAX`

* resolve TODOs

* jsonrpsee switch to `hyper` as backend

* Update utils/frame/try-runtime/remote-externalities/src/lib.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* update jsonrpsee

* remove boiler-plate

* suppress warnings to CI happy

* Unbreak his build

* Use option

* fix nit; make it work again

* fix err message.

* Update utils/frame/remote-externalities/Cargo.toml

* Fix uri stuff

* remove needless clone

Co-authored-by: kianenigma <kian.peymani@gmail.com>
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Co-authored-by: kianenigma <kian@parity.io>
---
 Cargo.lock                                  | 69 +++++++++++++++++--
 utils/frame/remote-externalities/Cargo.toml |  9 ++-
 utils/frame/remote-externalities/src/lib.rs | 76 ++++++++++-----------
 3 files changed, 106 insertions(+), 48 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 38e11a7fed1d..b7228ae47b37 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2834,6 +2834,67 @@ dependencies = [
  "slab",
 ]
 
+[[package]]
+name = "jsonrpsee-http-client"
+version = "0.2.0-alpha"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "124797a4ea7430d0675db78e065e53316e3f1a3cbf0ee4d6dbdd42db7b08e193"
+dependencies = [
+ "async-trait",
+ "futures 0.3.12",
+ "hyper 0.13.9",
+ "jsonrpsee-types",
+ "jsonrpsee-utils",
+ "log",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "unicase",
+ "url 2.2.0",
+]
+
+[[package]]
+name = "jsonrpsee-proc-macros"
+version = "0.2.0-alpha"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9cd3d41f5b9a1d3e4e4c9ad49a7a34ad8e1134a1a587cd21c72f644f5c053dd"
+dependencies = [
+ "Inflector",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "jsonrpsee-types"
+version = "0.2.0-alpha"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbf718f9a0d09f50621ea35f507679cf3ab66910a6d95844850076c1281a203c"
+dependencies = [
+ "async-trait",
+ "futures 0.3.12",
+ "log",
+ "serde",
+ "serde_json",
+ "smallvec 1.6.1",
+ "thiserror",
+]
+
+[[package]]
+name = "jsonrpsee-utils"
+version = "0.2.0-alpha"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0e45394ec3175a767c3c5bac584560e6ad9b56ebd73216c85ec8bab49619244"
+dependencies = [
+ "futures 0.3.12",
+ "globset",
+ "hyper 0.13.9",
+ "jsonrpsee-types",
+ "lazy_static",
+ "log",
+ "unicase",
+]
+
 [[package]]
 name = "keccak"
 version = "0.1.0"
@@ -6472,16 +6533,14 @@ version = "0.9.0"
 dependencies = [
  "async-std",
  "env_logger 0.8.2",
- "futures 0.3.12",
  "hex-literal",
- "jsonrpc-core-client",
+ "jsonrpsee-http-client",
+ "jsonrpsee-proc-macros",
+ "jsonrpsee-types",
  "log",
  "parity-scale-codec",
- "sc-rpc",
- "sc-rpc-api",
  "sp-core",
  "sp-io",
- "tokio 0.1.22",
 ]
 
 [[package]]
diff --git a/utils/frame/remote-externalities/Cargo.toml b/utils/frame/remote-externalities/Cargo.toml
index d4825211d8a6..8f3f40ec484e 100644
--- a/utils/frame/remote-externalities/Cargo.toml
+++ b/utils/frame/remote-externalities/Cargo.toml
@@ -13,16 +13,15 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-jsonrpc-core-client = { version = "15.1.0", features = ["http"] }
-sc-rpc-api = { version = "0.9.0", path = "../../../client/rpc-api" }
-sc-rpc = { version = "3.0.0", path = "../../../client/rpc" }
-futures = "0.3"
+jsonrpsee-http-client = { version = "0.2.0-alpha", default-features = false, features = ["tokio02"] }
+# Needed by jsonrpsee-proc-macros: https://github.com/paritytech/jsonrpsee/issues/214
+jsonrpsee-types = "0.2.0-alpha"
+jsonrpsee-proc-macros = "0.2.0-alpha"
 
 hex-literal = "0.3.1"
 env_logger = "0.8.2"
 log = "0.4.11"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-tokio = "0.1.22"
 
 sp-io = { version = "3.0.0", path = "../../../primitives/io" }
 sp-core = { version = "3.0.0", path = "../../../primitives/core" }
diff --git a/utils/frame/remote-externalities/src/lib.rs b/utils/frame/remote-externalities/src/lib.rs
index ab2622625385..a8829a18133a 100644
--- a/utils/frame/remote-externalities/src/lib.rs
+++ b/utils/frame/remote-externalities/src/lib.rs
@@ -101,6 +101,9 @@
 //! }
 //! ```
 
+// jsonrpsee_proc_macros generates faulty warnings: https://github.com/paritytech/jsonrpsee/issues/106
+#![allow(dead_code)]
+
 use std::{
 	fs,
 	path::{Path, PathBuf},
@@ -112,18 +115,24 @@ use sp_core::{
 	hexdisplay::HexDisplay,
 	storage::{StorageKey, StorageData},
 };
-use futures::{
-	compat::Future01CompatExt,
-	TryFutureExt,
-};
 use codec::{Encode, Decode};
+use jsonrpsee_http_client::{HttpClient, HttpConfig};
 
 type KeyPair = (StorageKey, StorageData);
-type Number = u32;
 type Hash = sp_core::H256;
 // TODO: make these two generic.
 
-const LOG_TARGET: &'static str = "remote-ext";
+const LOG_TARGET: &str = "remote-ext";
+const TARGET: &str = "http://localhost:9933";
+
+jsonrpsee_proc_macros::rpc_client_api! {
+	RpcApi {
+		#[rpc(method = "state_getPairs", positional_params)]
+		fn storage_pairs(prefix: StorageKey, hash: Option<Hash>) -> Vec<(StorageKey, StorageData)>;
+		#[rpc(method = "chain_getFinalizedHead")]
+		fn finalized_head() -> Hash;
+	}
+}
 
 /// The execution mode.
 #[derive(Clone)]
@@ -160,12 +169,15 @@ pub struct OnlineConfig {
 
 impl Default for OnlineConfig {
 	fn default() -> Self {
-		Self {
-			uri: "http://localhost:9933".into(),
-			at: None,
-			cache: None,
-			modules: Default::default(),
-		}
+		Self { uri: TARGET.to_owned(), at: None, cache: None, modules: Default::default() }
+	}
+}
+
+impl OnlineConfig {
+	/// Return a new http rpc client.
+	fn rpc(&self) -> HttpClient {
+		HttpClient::new(&self.uri, HttpConfig { max_request_body_size: u32::MAX })
+			.expect("valid HTTP url; qed")
 	}
 }
 
@@ -202,12 +214,7 @@ impl Default for Builder {
 	fn default() -> Self {
 		Self {
 			inject: Default::default(),
-			mode: Mode::Online(OnlineConfig {
-				at: None,
-				uri: "http://localhost:9933".into(),
-				cache: None,
-				modules: Default::default(),
-			}),
+			mode: Mode::Online(OnlineConfig::default())
 		}
 	}
 }
@@ -232,14 +239,11 @@ impl Builder {
 // RPC methods
 impl Builder {
 	async fn rpc_get_head(&self) -> Result<Hash, &'static str> {
-		let uri = self.as_online().uri.clone();
 		trace!(target: LOG_TARGET, "rpc: finalized_head");
-		let client: sc_rpc_api::chain::ChainClient<Number, Hash, (), ()> =
-			jsonrpc_core_client::transports::http::connect(&uri)
-				.compat()
-				.map_err(|_| "client initialization failed")
-				.await?;
-		client.finalized_head().compat().map_err(|_| "rpc finalized_head failed.").await
+		RpcApi::finalized_head(&self.as_online().rpc()).await.map_err(|e| {
+			error!("Error = {:?}", e);
+			"rpc finalized_head failed."
+			})
 	}
 
 	/// Relay the request to `state_getPairs` rpc endpoint.
@@ -250,18 +254,11 @@ impl Builder {
 		prefix: StorageKey,
 		at: Hash,
 	) -> Result<Vec<KeyPair>, &'static str> {
-		let uri = self.as_online().uri.clone();
 		trace!(target: LOG_TARGET, "rpc: storage_pairs: {:?} / {:?}", prefix, at);
-		let client: sc_rpc_api::state::StateClient<Hash> =
-			jsonrpc_core_client::transports::http::connect(&uri)
-				.compat()
-				.map_err(|_| "client initialization failed")
-				.await?;
-		client
-			.storage_pairs(prefix, Some(at))
-			.compat()
-			.map_err(|_| "rpc finalized_head failed.")
-			.await
+		RpcApi::storage_pairs(&self.as_online().rpc(), prefix, Some(at)).await.map_err(|e| {
+			error!("Error = {:?}", e);
+			"rpc storage_pairs failed"
+			})
 	}
 }
 
@@ -315,8 +312,11 @@ impl Builder {
 	}
 
 	async fn init_remote_client(&mut self) -> Result<(), &'static str> {
-		let at = self.rpc_get_head().await?;
-		self.as_online_mut().at = Some(at);
+		info!(target: LOG_TARGET, "initializing remote client to {:?}", self.as_online().uri);
+		if self.as_online().at.is_none() {
+			let at = self.rpc_get_head().await?;
+			self.as_online_mut().at = Some(at);
+		}
 		Ok(())
 	}
 

From 88014d553fc1c0f1b1f4c6da1c8d6d16b32ac7f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Mon, 8 Mar 2021 03:45:53 +0100
Subject: [PATCH 0470/1194] pallet_macro: Generate default documentation for
 well known types (#8276)

---
 .../procedural/src/pallet/expand/call.rs      | 12 +++++-
 .../procedural/src/pallet/expand/config.rs    | 43 +++++++++++++++++++
 .../procedural/src/pallet/expand/error.rs     | 11 ++++-
 .../procedural/src/pallet/expand/event.rs     | 12 +++++-
 .../src/pallet/expand/genesis_config.rs       | 11 ++++-
 .../procedural/src/pallet/expand/mod.rs       | 16 ++++++-
 .../src/pallet/expand/pallet_struct.rs        | 11 ++++-
 .../procedural/src/pallet/parse/call.rs       |  3 ++
 8 files changed, 112 insertions(+), 7 deletions(-)
 create mode 100644 frame/support/procedural/src/pallet/expand/config.rs

diff --git a/frame/support/procedural/src/pallet/expand/call.rs b/frame/support/procedural/src/pallet/expand/call.rs
index 830fd267dc9b..137e055405a3 100644
--- a/frame/support/procedural/src/pallet/expand/call.rs
+++ b/frame/support/procedural/src/pallet/expand/call.rs
@@ -70,7 +70,17 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
 			.collect::<Vec<_>>()
 	});
 
+	let default_docs = [syn::parse_quote!(
+		r"Contains one variant per dispatchable that can be called by an extrinsic."
+	)];
+	let docs = if def.call.docs.is_empty() {
+		&default_docs[..]
+	} else {
+		&def.call.docs[..]
+	};
+
 	quote::quote_spanned!(def.call.attr_span =>
+		#( #[doc = #docs] )*
 		#[derive(
 			#frame_support::RuntimeDebugNoBound,
 			#frame_support::CloneNoBound,
@@ -87,7 +97,7 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
 				#frame_support::sp_std::marker::PhantomData<(#type_use_gen,)>,
 				#frame_support::Never,
 			),
-			#( #fn_name( #( #args_compact_attr #args_type ),* ), )*
+			#( #( #[doc = #fn_doc] )* #fn_name( #( #args_compact_attr #args_type ),* ), )*
 		}
 
 		impl<#type_impl_gen> #frame_support::dispatch::GetDispatchInfo
diff --git a/frame/support/procedural/src/pallet/expand/config.rs b/frame/support/procedural/src/pallet/expand/config.rs
new file mode 100644
index 000000000000..1e60313c5531
--- /dev/null
+++ b/frame/support/procedural/src/pallet/expand/config.rs
@@ -0,0 +1,43 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::pallet::{Def, parse::helper::get_doc_literals};
+
+/// * Generate default rust doc
+pub fn expand_config(def: &mut Def) -> proc_macro2::TokenStream {
+	let config = &def.config;
+	let config_item = {
+		let item = &mut def.item.content.as_mut().expect("Checked by def parser").1[config.index];
+		if let syn::Item::Trait(item) = item {
+			item
+		} else {
+			unreachable!("Checked by config parser")
+		}
+	};
+
+	if get_doc_literals(&config_item.attrs).is_empty() {
+		config_item.attrs.push(syn::parse_quote!(
+			#[doc = r"
+			Configuration trait of this pallet.
+
+			Implement this type for a runtime in order to customize this pallet.
+			"]
+		));
+	}
+
+	Default::default()
+}
diff --git a/frame/support/procedural/src/pallet/expand/error.rs b/frame/support/procedural/src/pallet/expand/error.rs
index c8c0a3c0c4d5..000f476d94d8 100644
--- a/frame/support/procedural/src/pallet/expand/error.rs
+++ b/frame/support/procedural/src/pallet/expand/error.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::pallet::Def;
+use crate::pallet::{Def, parse::helper::get_doc_literals};
 
 /// * impl various trait on Error
 /// * impl ModuleErrorMetadata for Error
@@ -74,6 +74,15 @@ pub fn expand_error(def: &mut Def) -> proc_macro2::TokenStream {
 
 	error_item.variants.insert(0, phantom_variant);
 
+	if get_doc_literals(&error_item.attrs).is_empty() {
+		error_item.attrs.push(syn::parse_quote!(
+			#[doc = r"
+			Custom [dispatch errors](https://substrate.dev/docs/en/knowledgebase/runtime/errors)
+			of this pallet.
+			"]
+		));
+	}
+
 	quote::quote_spanned!(error.attr_span =>
 		impl<#type_impl_gen> #frame_support::sp_std::fmt::Debug for #error_ident<#type_use_gen>
 			#config_where_clause
diff --git a/frame/support/procedural/src/pallet/expand/event.rs b/frame/support/procedural/src/pallet/expand/event.rs
index e04d64750bca..c4f7aeffa736 100644
--- a/frame/support/procedural/src/pallet/expand/event.rs
+++ b/frame/support/procedural/src/pallet/expand/event.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::pallet::Def;
+use crate::pallet::{Def, parse::helper::get_doc_literals};
 
 /// * Add __Ignore variant on Event
 /// * Impl various trait on Event including metadata
@@ -81,6 +81,15 @@ pub fn expand_event(def: &mut Def) -> proc_macro2::TokenStream {
 		event_item.variants.push(variant);
 	}
 
+	if get_doc_literals(&event_item.attrs).is_empty() {
+		event_item.attrs.push(syn::parse_quote!(
+			#[doc = r"
+			The [event](https://substrate.dev/docs/en/knowledgebase/runtime/events) emitted
+			by this pallet.
+			"]
+		));
+	}
+
 	// derive some traits because system event require Clone, FullCodec, Eq, PartialEq and Debug
 	event_item.attrs.push(syn::parse_quote!(
 		#[derive(
@@ -93,7 +102,6 @@ pub fn expand_event(def: &mut Def) -> proc_macro2::TokenStream {
 		)]
 	));
 
-
 	let deposit_event = if let Some((fn_vis, fn_span)) = &event.deposit_event {
 		let event_use_gen = &event.gen_kind.type_use_gen(event.attr_span);
 		let trait_use_gen = &def.trait_use_generics(event.attr_span);
diff --git a/frame/support/procedural/src/pallet/expand/genesis_config.rs b/frame/support/procedural/src/pallet/expand/genesis_config.rs
index 1dade8f0144b..96407cb382bc 100644
--- a/frame/support/procedural/src/pallet/expand/genesis_config.rs
+++ b/frame/support/procedural/src/pallet/expand/genesis_config.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::pallet::Def;
+use crate::pallet::{Def, parse::helper::get_doc_literals};
 
 /// * add various derive trait on GenesisConfig struct.
 pub fn expand_genesis_config(def: &mut Def) -> proc_macro2::TokenStream {
@@ -33,6 +33,15 @@ pub fn expand_genesis_config(def: &mut Def) -> proc_macro2::TokenStream {
 		syn::Item::Enum(syn::ItemEnum { attrs, ..}) |
 		syn::Item::Struct(syn::ItemStruct { attrs, .. }) |
 		syn::Item::Type(syn::ItemType { attrs, .. }) => {
+			if get_doc_literals(&attrs).is_empty() {
+				attrs.push(syn::parse_quote!(
+					#[doc = r"
+					Can be used to configure the
+					[genesis state](https://substrate.dev/docs/en/knowledgebase/integrate/chain-spec#the-genesis-state)
+					of the contracts pallet.
+					"]
+				));
+			}
 			attrs.push(syn::parse_quote!( #[cfg(feature = "std")] ));
 			attrs.push(syn::parse_quote!(
 				#[derive(#frame_support::Serialize, #frame_support::Deserialize)]
diff --git a/frame/support/procedural/src/pallet/expand/mod.rs b/frame/support/procedural/src/pallet/expand/mod.rs
index c2a81e9bbcd8..22ef26817778 100644
--- a/frame/support/procedural/src/pallet/expand/mod.rs
+++ b/frame/support/procedural/src/pallet/expand/mod.rs
@@ -18,6 +18,7 @@
 mod constants;
 mod pallet_struct;
 mod call;
+mod config;
 mod error;
 mod event;
 mod storage;
@@ -28,7 +29,7 @@ mod genesis_build;
 mod genesis_config;
 mod type_value;
 
-use crate::pallet::Def;
+use crate::pallet::{Def, parse::helper::get_doc_literals};
 use quote::ToTokens;
 
 /// Merge where clause together, `where` token span is taken from the first not none one.
@@ -48,6 +49,7 @@ pub fn merge_where_clauses(clauses: &[&Option<syn::WhereClause>]) -> Option<syn:
 pub fn expand(mut def: Def) -> proc_macro2::TokenStream {
 	let constants = constants::expand_constants(&mut def);
 	let pallet_struct = pallet_struct::expand_pallet_struct(&mut def);
+	let config = config::expand_config(&mut def);
 	let call = call::expand_call(&mut def);
 	let error = error::expand_error(&mut def);
 	let event = event::expand_event(&mut def);
@@ -59,9 +61,21 @@ pub fn expand(mut def: Def) -> proc_macro2::TokenStream {
 	let genesis_config = genesis_config::expand_genesis_config(&mut def);
 	let type_values = type_value::expand_type_values(&mut def);
 
+	if get_doc_literals(&def.item.attrs).is_empty() {
+		def.item.attrs.push(syn::parse_quote!(
+			#[doc = r"
+			The module that hosts all the
+			[FRAME](https://substrate.dev/docs/en/knowledgebase/runtime/frame)
+			types needed to add this pallet to a
+			[runtime](https://substrate.dev/docs/en/knowledgebase/runtime/).
+			"]
+		));
+	}
+
 	let new_items = quote::quote!(
 		#constants
 		#pallet_struct
+		#config
 		#call
 		#error
 		#event
diff --git a/frame/support/procedural/src/pallet/expand/pallet_struct.rs b/frame/support/procedural/src/pallet/expand/pallet_struct.rs
index 6e456695d9a4..47e4344c50d8 100644
--- a/frame/support/procedural/src/pallet/expand/pallet_struct.rs
+++ b/frame/support/procedural/src/pallet/expand/pallet_struct.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::pallet::Def;
+use crate::pallet::{Def, parse::helper::get_doc_literals};
 
 /// * Add derive trait on Pallet
 /// * Implement GetPalletVersion on Pallet
@@ -51,6 +51,15 @@ pub fn expand_pallet_struct(def: &mut Def) -> proc_macro2::TokenStream {
 		}
 	}
 
+	if get_doc_literals(&pallet_item.attrs).is_empty() {
+		pallet_item.attrs.push(syn::parse_quote!(
+			#[doc = r"
+			The [pallet](https://substrate.dev/docs/en/knowledgebase/runtime/pallets) implementing
+			the on-chain logic.
+			"]
+		));
+	}
+
 	pallet_item.attrs.push(syn::parse_quote!(
 		#[derive(
 			#frame_support::CloneNoBound,
diff --git a/frame/support/procedural/src/pallet/parse/call.rs b/frame/support/procedural/src/pallet/parse/call.rs
index 39b37157db7d..c3f6751ef70b 100644
--- a/frame/support/procedural/src/pallet/parse/call.rs
+++ b/frame/support/procedural/src/pallet/parse/call.rs
@@ -41,6 +41,8 @@ pub struct CallDef {
 	pub methods: Vec<CallVariantDef>,
 	/// The span of the pallet::call attribute.
 	pub attr_span: proc_macro2::Span,
+	/// Docs, specified on the impl Block.
+	pub docs: Vec<syn::Lit>,
 }
 
 /// Definition of dispatchable typically: `#[weight...] fn foo(origin .., param1: ...) -> ..`
@@ -228,6 +230,7 @@ impl CallDef {
 			instances,
 			methods,
 			where_clause: item.generics.where_clause.clone(),
+			docs: helper::get_doc_literals(&item.attrs),
 		})
 	}
 }

From ac1f7ff32bf0d0e9c328cfe083bee7492c639946 Mon Sep 17 00:00:00 2001
From: honeywest <50997103+honeywest@users.noreply.github.com>
Date: Mon, 8 Mar 2021 18:35:26 +0800
Subject: [PATCH 0471/1194] Clippy arithmetic new (#8282)

* optimize code

* fix clippy replace = with += or %=

* fix redundant closure found warning

* redundant field names in struct initialization

* fix clippy warning and optimize code

* fix clippy warning

* fix clippy warning

* fix test error
---
 primitives/arithmetic/src/biguint.rs     |  2 +-
 primitives/arithmetic/src/fixed_point.rs | 26 ++++++++-----------
 primitives/arithmetic/src/lib.rs         |  4 +--
 primitives/arithmetic/src/per_things.rs  |  4 +--
 primitives/core/src/changes_trie.rs      |  4 +--
 primitives/core/src/ecdsa.rs             |  4 +--
 primitives/core/src/ed25519.rs           |  2 --
 primitives/core/src/hashing.rs           |  2 --
 primitives/core/src/offchain/mod.rs      |  2 +-
 primitives/tracing/src/types.rs          | 33 ++++++++++++------------
 10 files changed, 37 insertions(+), 46 deletions(-)

diff --git a/primitives/arithmetic/src/biguint.rs b/primitives/arithmetic/src/biguint.rs
index 210cba8e2b1f..9813277506c4 100644
--- a/primitives/arithmetic/src/biguint.rs
+++ b/primitives/arithmetic/src/biguint.rs
@@ -326,7 +326,7 @@ impl BigUint {
 		// PROOF: 0 <= normalizer_bits < SHIFT 0 <= normalizer < B. all conversions are
 		// safe.
 		let normalizer_bits = other.msb().leading_zeros() as Single;
-		let normalizer = (2 as Single).pow(normalizer_bits as u32) as Single;
+		let normalizer = 2_u32.pow(normalizer_bits as u32) as Single;
 
 		// step D1.
 		let mut self_norm = self.mul(&Self::from(normalizer));
diff --git a/primitives/arithmetic/src/fixed_point.rs b/primitives/arithmetic/src/fixed_point.rs
index 44a869561070..896d5f38451d 100644
--- a/primitives/arithmetic/src/fixed_point.rs
+++ b/primitives/arithmetic/src/fixed_point.rs
@@ -92,7 +92,7 @@ pub trait FixedPointNumber:
 	///
 	/// Returns `None` if `int` exceeds accuracy.
 	fn checked_from_integer(int: Self::Inner) -> Option<Self> {
-		int.checked_mul(&Self::DIV).map(|inner| Self::from_inner(inner))
+		int.checked_mul(&Self::DIV).map(Self::from_inner)
 	}
 
 	/// Creates `self` from a rational number. Equal to `n / d`.
@@ -119,7 +119,7 @@ pub trait FixedPointNumber:
 
 		multiply_by_rational(n.value, Self::DIV.unique_saturated_into(), d.value).ok()
 			.and_then(|value| from_i129(I129 { value, negative }))
-			.map(|inner| Self::from_inner(inner))
+			.map(Self::from_inner)
 	}
 
 	/// Checked multiplication for integer type `N`. Equal to `self * n`.
@@ -184,7 +184,7 @@ pub trait FixedPointNumber:
 		if inner >= Self::Inner::zero() {
 			self
 		} else {
-			Self::from_inner(inner.checked_neg().unwrap_or_else(|| Self::Inner::max_value()))
+			Self::from_inner(inner.checked_neg().unwrap_or_else(Self::Inner::max_value))
 		}
 	}
 
@@ -230,7 +230,7 @@ pub trait FixedPointNumber:
 		self.into_inner().checked_div(&Self::DIV)
 			.expect("panics only if DIV is zero, DIV is not zero; qed")
 			.checked_mul(&Self::DIV)
-			.map(|inner| Self::from_inner(inner))
+			.map(Self::from_inner)
 			.expect("can not overflow since fixed number is >= integer part")
 	}
 
@@ -254,12 +254,10 @@ pub trait FixedPointNumber:
 	fn ceil(self) -> Self {
 		if self.is_negative() {
 			self.trunc()
+		} else if self.frac() == Self::zero() {
+			self
 		} else {
-			if self.frac() == Self::zero() {
-				self
-			} else {
-				self.saturating_add(Self::one()).trunc()
-			}
+			self.saturating_add(Self::one()).trunc()
 		}
 	}
 
@@ -281,12 +279,10 @@ pub trait FixedPointNumber:
 		let n = self.frac().saturating_mul(Self::saturating_from_integer(10));
 		if n < Self::saturating_from_integer(5) {
 			self.trunc()
+		} else if self.is_positive() {
+			self.saturating_add(Self::one()).trunc()
 		} else {
-			if self.is_positive() {
-				self.saturating_add(Self::one()).trunc()
-			} else {
-				self.saturating_sub(Self::one()).trunc()
-			}
+			self.saturating_sub(Self::one()).trunc()
 		}
 	}
 }
@@ -585,7 +581,7 @@ macro_rules! implement_fixed {
 			{
 				use sp_std::str::FromStr;
 				let s = String::deserialize(deserializer)?;
-				$name::from_str(&s).map_err(|err_str| de::Error::custom(err_str))
+				$name::from_str(&s).map_err(de::Error::custom)
 			}
 		}
 
diff --git a/primitives/arithmetic/src/lib.rs b/primitives/arithmetic/src/lib.rs
index 9b1e8711da8c..561c14a37e20 100644
--- a/primitives/arithmetic/src/lib.rs
+++ b/primitives/arithmetic/src/lib.rs
@@ -203,7 +203,7 @@ pub fn normalize<T>(input: &[T], targeted_sum: T) -> Result<Vec<T>, &'static str
 					.expect("Proof provided in the module doc; qed.");
 				if output_with_idx[min_index].1 >= threshold {
 					min_index += 1;
-					min_index = min_index % count;
+					min_index %= count;
 				}
 			}
 		}
@@ -215,7 +215,7 @@ pub fn normalize<T>(input: &[T], targeted_sum: T) -> Result<Vec<T>, &'static str
 				.expect("Proof provided in the module doc; qed.");
 			if output_with_idx[min_index].1 >= threshold {
 				min_index += 1;
-				min_index = min_index % count;
+				min_index %= count;
 			}
 			leftover -= One::one()
 		}
diff --git a/primitives/arithmetic/src/per_things.rs b/primitives/arithmetic/src/per_things.rs
index 319666747b15..f2b8c4f93b33 100644
--- a/primitives/arithmetic/src/per_things.rs
+++ b/primitives/arithmetic/src/per_things.rs
@@ -307,13 +307,13 @@ where
 		// Round up if the fractional part of the result is non-zero.
 		Rounding::Up => if rem_mul_upper % denom_upper > 0.into() {
 			// `rem * numer / denom` is less than `numer`, so this will not overflow.
-			rem_mul_div_inner = rem_mul_div_inner + 1.into();
+			rem_mul_div_inner += 1.into();
 		},
 		// Round up if the fractional part of the result is greater than a half. An exact half is
 		// rounded down.
 		Rounding::Nearest => if rem_mul_upper % denom_upper > denom_upper / 2.into() {
 			// `rem * numer / denom` is less than `numer`, so this will not overflow.
-			rem_mul_div_inner = rem_mul_div_inner + 1.into();
+			rem_mul_div_inner += 1.into();
 		},
 	}
 	rem_mul_div_inner.into()
diff --git a/primitives/core/src/changes_trie.rs b/primitives/core/src/changes_trie.rs
index 32991ce44a50..3291026f32fb 100644
--- a/primitives/core/src/changes_trie.rs
+++ b/primitives/core/src/changes_trie.rs
@@ -90,7 +90,7 @@ impl ChangesTrieConfiguration {
 				return max_digest_interval;
 			}
 
-			current_level = current_level - 1;
+			current_level -= 1;
 		}
 	}
 
@@ -192,7 +192,7 @@ impl ChangesTrieConfiguration {
 
 			digest_step = digest_interval;
 			digest_interval = new_digest_interval;
-			current_level = current_level + 1;
+			current_level += 1;
 		}
 
 		Some((
diff --git a/primitives/core/src/ecdsa.rs b/primitives/core/src/ecdsa.rs
index fc9b16beedd1..ee4f8f811bc4 100644
--- a/primitives/core/src/ecdsa.rs
+++ b/primitives/core/src/ecdsa.rs
@@ -487,7 +487,7 @@ impl TraitPair for Pair {
 		let message = secp256k1::Message::parse(&blake2_256(message.as_ref()));
 		let sig: (_, _) = match sig.try_into() { Ok(x) => x, _ => return false };
 		match secp256k1::recover(&message, &sig.0, &sig.1) {
-			Ok(actual) => &pubkey.0[..] == &actual.serialize_compressed()[..],
+			Ok(actual) => pubkey.0[..] == actual.serialize_compressed()[..],
 			_ => false,
 		}
 	}
@@ -525,7 +525,7 @@ impl Pair {
 	#[cfg(feature = "std")]
 	pub fn from_legacy_string(s: &str, password_override: Option<&str>) -> Pair {
 		Self::from_string(s, password_override).unwrap_or_else(|_| {
-			let mut padded_seed: Seed = [' ' as u8; 32];
+			let mut padded_seed: Seed = [b' '; 32];
 			let len = s.len().min(32);
 			padded_seed[..len].copy_from_slice(&s.as_bytes()[..len]);
 			Self::from_seed(&padded_seed)
diff --git a/primitives/core/src/ed25519.rs b/primitives/core/src/ed25519.rs
index 658931093120..3269f70be1ee 100644
--- a/primitives/core/src/ed25519.rs
+++ b/primitives/core/src/ed25519.rs
@@ -25,8 +25,6 @@ use sp_std::vec::Vec;
 use crate::{hash::H256, hash::H512};
 use codec::{Encode, Decode};
 
-#[cfg(feature = "full_crypto")]
-use blake2_rfc;
 #[cfg(feature = "full_crypto")]
 use core::convert::TryFrom;
 #[cfg(feature = "full_crypto")]
diff --git a/primitives/core/src/hashing.rs b/primitives/core/src/hashing.rs
index ac0eedef6967..4c719f7c6983 100644
--- a/primitives/core/src/hashing.rs
+++ b/primitives/core/src/hashing.rs
@@ -22,10 +22,8 @@
 //! unless you know what you're doing. Using `sp_io` will be more performant, since instead of
 //! computing the hash in WASM it delegates that computation to the host client.
 
-use blake2_rfc;
 use sha2::{Digest, Sha256};
 use tiny_keccak::{Hasher, Keccak};
-use twox_hash;
 
 /// Do a Blake2 512-bit hash and place result in `dest`.
 pub fn blake2_512_into(data: &[u8], dest: &mut [u8; 64]) {
diff --git a/primitives/core/src/offchain/mod.rs b/primitives/core/src/offchain/mod.rs
index ef6c38a7d6fd..6a08df1d7fb2 100644
--- a/primitives/core/src/offchain/mod.rs
+++ b/primitives/core/src/offchain/mod.rs
@@ -30,7 +30,7 @@ pub mod storage;
 pub mod testing;
 
 /// Local storage prefix used by the Offchain Worker API to
-pub const STORAGE_PREFIX : &'static [u8] = b"storage";
+pub const STORAGE_PREFIX : &[u8] = b"storage";
 
 /// Offchain workers local storage.
 pub trait OffchainStorage: Clone + Send + Sync {
diff --git a/primitives/tracing/src/types.rs b/primitives/tracing/src/types.rs
index 725565c37184..44f6b2f7ffc5 100644
--- a/primitives/tracing/src/types.rs
+++ b/primitives/tracing/src/types.rs
@@ -43,12 +43,12 @@ pub enum WasmLevel {
 
 impl From<&tracing_core::Level> for WasmLevel {
 	fn from(l: &tracing_core::Level) -> WasmLevel {
-		match l {
-			&tracing_core::Level::ERROR => WasmLevel::ERROR,
-			&tracing_core::Level::WARN => WasmLevel::WARN,
-			&tracing_core::Level::INFO => WasmLevel::INFO,
-			&tracing_core::Level::DEBUG => WasmLevel::DEBUG,
-			&tracing_core::Level::TRACE => WasmLevel::TRACE,
+		match *l {
+			tracing_core::Level::ERROR => WasmLevel::ERROR,
+			tracing_core::Level::WARN => WasmLevel::WARN,
+			tracing_core::Level::INFO => WasmLevel::INFO,
+			tracing_core::Level::DEBUG => WasmLevel::DEBUG,
+			tracing_core::Level::TRACE => WasmLevel::TRACE,
 		}
 	}
 }
@@ -129,7 +129,7 @@ impl From<u8> for WasmValue {
 
 impl From<&i8> for WasmValue {
 	fn from(inp: &i8) -> WasmValue {
-		WasmValue::I8(inp.clone())
+		WasmValue::I8(*inp)
 	}
 }
 
@@ -246,7 +246,7 @@ impl WasmFields {
 
 impl From<Vec<WasmFieldName>> for WasmFields {
 	fn from(v: Vec<WasmFieldName>) -> WasmFields {
-		WasmFields(v.into())
+		WasmFields(v)
 	}
 }
 
@@ -447,7 +447,7 @@ impl From<&tracing_core::Event<'_>> for WasmEntryAttributes {
 		WasmEntryAttributes {
 			parent_id: evt.parent().map(|id| id.into_u64()),
 			metadata: evt.metadata().into(),
-			fields: fields
+			fields
 		}
 	}
 }
@@ -459,7 +459,7 @@ impl From<&tracing_core::span::Attributes<'_>> for WasmEntryAttributes {
 		WasmEntryAttributes {
 			parent_id: attrs.parent().map(|id| id.into_u64()),
 			metadata: attrs.metadata().into(),
-			fields: fields
+			fields
 		}
 	}
 }
@@ -478,7 +478,6 @@ impl core::default::Default for WasmEntryAttributes {
 mod std_features {
 
 	use tracing_core::callsite;
-	use tracing;
 
 	/// Static entry use for wasm-originated metadata.
 	pub struct WasmCallsite;
@@ -488,13 +487,13 @@ mod std_features {
 	}
 	static CALLSITE: WasmCallsite =  WasmCallsite;
 	/// The identifier we are using to inject the wasm events in the generic `tracing` system
-	pub static WASM_TRACE_IDENTIFIER: &'static str = "wasm_tracing";
+	pub static WASM_TRACE_IDENTIFIER: &str = "wasm_tracing";
 	/// The fieldname for the wasm-originated name
-	pub static WASM_NAME_KEY: &'static str = "name";
+	pub static WASM_NAME_KEY: &str = "name";
 	/// The fieldname for the wasm-originated target
-	pub static WASM_TARGET_KEY: &'static str = "target";
+	pub static WASM_TARGET_KEY: &str = "target";
 	/// The the list of all static field names we construct from the given metadata
-	pub static GENERIC_FIELDS: &'static [&'static str] = &[WASM_TARGET_KEY, WASM_NAME_KEY,
+	pub static GENERIC_FIELDS: &[&str] = &[WASM_TARGET_KEY, WASM_NAME_KEY,
 		"file", "line", "module_path", "params"];
 
 	// Implementation Note:
@@ -592,7 +591,7 @@ mod std_features {
 			let metadata : &tracing_core::metadata::Metadata<'static> = (&a.metadata).into();
 
 			tracing::span::Span::child_of(
-				a.parent_id.map(|i|tracing_core::span::Id::from_u64(i)),
+				a.parent_id.map(tracing_core::span::Id::from_u64),
 				&metadata,
 				&tracing::valueset!{ metadata.fields(), target, name, file, line, module_path, ?params }
 			)
@@ -611,7 +610,7 @@ mod std_features {
 			let metadata : &tracing_core::metadata::Metadata<'static> = (&self.metadata).into();
 
 			tracing_core::Event::child_of(
-				self.parent_id.map(|i|tracing_core::span::Id::from_u64(i)),
+				self.parent_id.map(tracing_core::span::Id::from_u64),
 				&metadata,
 				&tracing::valueset!{ metadata.fields(), target, name, file, line, module_path, ?params }
 			)

From 641aa72bc6fd7845bfc6517763da0e86f6afc985 Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Tue, 9 Mar 2021 13:38:33 +0100
Subject: [PATCH 0472/1194] Assets: Remove zombies, introduce approvals (#8220)

* Initial work

* Tests for frame system

* Self-sufficient account ref-counting

* Fixes

* Benchmarks building.

* Update frame/system/src/lib.rs

Co-authored-by: Jaco Greeff <jacogr@gmail.com>

* Fixes

* Fixes

* Fixes

* Fixes

* Fixes

* Fixes

* Test approvals

* Fixes

* Report assets pallet tests

* Tests for approvals & force_cancel_approval

* Use structs rather than tuples for approval data

* Add force_asset_status, force_set_metadata

* Add clear_metadata.

* approval benchmarks

* force_asset_status benchmarks

* final benchmarks

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_assets --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/assets/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Update frame/system/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Update frame/system/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Update frame/system/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Docs for new approval dispatches.

* Docs for pallet.

* Remove accidental code.

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_assets --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/assets/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_assets --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/assets/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Fixes

* Update frame/assets/src/lib.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Grumbles.

* Transfer zero works, use DispatchResult

* fix test

* Remove force_destroy

* Remove TODO

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_assets --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/assets/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* transfer_keep_alive

* Fixes

* Fixes

* Fixes

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_assets --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/assets/src/weights.rs --template=./.maintain/frame-weight-template.hbs

Co-authored-by: Jaco Greeff <jacogr@gmail.com>
Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 bin/node/runtime/src/lib.rs      |   12 +-
 frame/assets/src/benchmarking.rs |  276 ++++-
 frame/assets/src/lib.rs          | 1707 ++++++++++++++----------------
 frame/assets/src/mock.rs         |  112 ++
 frame/assets/src/tests.rs        |  493 +++++++++
 frame/assets/src/weights.rs      |  245 +++--
 frame/gilt/src/mock.rs           |    4 +-
 7 files changed, 1776 insertions(+), 1073 deletions(-)
 create mode 100644 frame/assets/src/mock.rs
 create mode 100644 frame/assets/src/tests.rs

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index a0b966c63c33..ba7ed20fa9eb 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -1013,9 +1013,9 @@ parameter_types! {
 impl pallet_lottery::Config for Runtime {
 	type ModuleId = LotteryModuleId;
 	type Call = Call;
-	type Event = Event;
 	type Currency = Balances;
 	type Randomness = RandomnessCollectiveFlip;
+	type Event = Event;
 	type ManagerOrigin = EnsureRoot<AccountId>;
 	type MaxCalls = MaxCalls;
 	type ValidateCall = Lottery;
@@ -1024,8 +1024,8 @@ impl pallet_lottery::Config for Runtime {
 }
 
 parameter_types! {
-	pub const AssetDepositBase: Balance = 100 * DOLLARS;
-	pub const AssetDepositPerZombie: Balance = 1 * DOLLARS;
+	pub const AssetDeposit: Balance = 100 * DOLLARS;
+	pub const ApprovalDeposit: Balance = 1 * DOLLARS;
 	pub const StringLimit: u32 = 50;
 	pub const MetadataDepositBase: Balance = 10 * DOLLARS;
 	pub const MetadataDepositPerByte: Balance = 1 * DOLLARS;
@@ -1037,11 +1037,11 @@ impl pallet_assets::Config for Runtime {
 	type AssetId = u32;
 	type Currency = Balances;
 	type ForceOrigin = EnsureRoot<AccountId>;
-	type AssetDepositBase = AssetDepositBase;
-	type AssetDepositPerZombie = AssetDepositPerZombie;
-	type StringLimit = StringLimit;
+	type AssetDeposit = AssetDeposit;
 	type MetadataDepositBase = MetadataDepositBase;
 	type MetadataDepositPerByte = MetadataDepositPerByte;
+	type ApprovalDeposit = ApprovalDeposit;
+	type StringLimit = StringLimit;
 	type WeightInfo = pallet_assets::weights::SubstrateWeight<Runtime>;
 }
 
diff --git a/frame/assets/src/benchmarking.rs b/frame/assets/src/benchmarking.rs
index 86a0c48e7973..42f876ff7f3d 100644
--- a/frame/assets/src/benchmarking.rs
+++ b/frame/assets/src/benchmarking.rs
@@ -17,17 +17,23 @@
 
 //! Assets pallet benchmarking.
 
+#![cfg(feature = "runtime-benchmarks")]
+
+use sp_std::prelude::*;
 use super::*;
 use sp_runtime::traits::Bounded;
 use frame_system::RawOrigin as SystemOrigin;
-use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
+use frame_benchmarking::{
+	benchmarks, account, whitelisted_caller, whitelist_account, impl_benchmark_test_suite
+};
 use frame_support::traits::Get;
+use frame_support::{traits::EnsureOrigin, dispatch::UnfilteredDispatchable};
 
 use crate::Module as Assets;
 
 const SEED: u32 = 0;
 
-fn create_default_asset<T: Config>(max_zombies: u32)
+fn create_default_asset<T: Config>(is_sufficient: bool)
 	-> (T::AccountId, <T::Lookup as StaticLookup>::Source)
 {
 	let caller: T::AccountId = whitelisted_caller();
@@ -37,16 +43,19 @@ fn create_default_asset<T: Config>(max_zombies: u32)
 		root,
 		Default::default(),
 		caller_lookup.clone(),
-		max_zombies,
+		is_sufficient,
 		1u32.into(),
 	).is_ok());
 	(caller, caller_lookup)
 }
 
-fn create_default_minted_asset<T: Config>(max_zombies: u32, amount: T::Balance)
+fn create_default_minted_asset<T: Config>(is_sufficient: bool, amount: T::Balance)
 	-> (T::AccountId, <T::Lookup as StaticLookup>::Source)
 {
-	let (caller, caller_lookup)  = create_default_asset::<T>(max_zombies);
+	let (caller, caller_lookup)  = create_default_asset::<T>(is_sufficient);
+	if !is_sufficient {
+		T::Currency::make_free_balance_be(&caller, T::Currency::minimum_balance());
+	}
 	assert!(Assets::<T>::mint(
 		SystemOrigin::Signed(caller.clone()).into(),
 		Default::default(),
@@ -56,13 +65,58 @@ fn create_default_minted_asset<T: Config>(max_zombies: u32, amount: T::Balance)
 	(caller, caller_lookup)
 }
 
-fn add_zombies<T: Config>(minter: T::AccountId, n: u32) {
+fn swap_is_sufficient<T: Config>(s: &mut bool) {
+	Asset::<T>::mutate(&T::AssetId::default(), |maybe_a|
+		if let Some(ref mut a) = maybe_a { sp_std::mem::swap(s, &mut a.is_sufficient) }
+	);
+}
+
+fn add_consumers<T: Config>(minter: T::AccountId, n: u32) {
+	let origin = SystemOrigin::Signed(minter);
+	let mut s = false;
+	swap_is_sufficient::<T>(&mut s);
+	for i in 0..n {
+		let target = account("consumer", i, SEED);
+		T::Currency::make_free_balance_be(&target, T::Currency::minimum_balance());
+		let target_lookup = T::Lookup::unlookup(target);
+		assert!(Assets::<T>::mint(origin.clone().into(), Default::default(), target_lookup, 100u32.into()).is_ok());
+	}
+	swap_is_sufficient::<T>(&mut s);
+}
+
+fn add_sufficients<T: Config>(minter: T::AccountId, n: u32) {
 	let origin = SystemOrigin::Signed(minter);
+	let mut s = true;
+	swap_is_sufficient::<T>(&mut s);
 	for i in 0..n {
-		let target = account("zombie", i, SEED);
+		let target = account("sufficient", i, SEED);
 		let target_lookup = T::Lookup::unlookup(target);
 		assert!(Assets::<T>::mint(origin.clone().into(), Default::default(), target_lookup, 100u32.into()).is_ok());
 	}
+	swap_is_sufficient::<T>(&mut s);
+}
+
+fn add_approvals<T: Config>(minter: T::AccountId, n: u32) {
+	T::Currency::deposit_creating(&minter, T::ApprovalDeposit::get() * n.into());
+	let minter_lookup = T::Lookup::unlookup(minter.clone());
+	let origin = SystemOrigin::Signed(minter);
+	Assets::<T>::mint(
+		origin.clone().into(),
+		Default::default(),
+		minter_lookup,
+		(100 * (n + 1)).into(),
+	).unwrap();
+	for i in 0..n {
+		let target = account("approval", i, SEED);
+		T::Currency::make_free_balance_be(&target, T::Currency::minimum_balance());
+		let target_lookup = T::Lookup::unlookup(target);
+		Assets::<T>::approve_transfer(
+			origin.clone().into(),
+			Default::default(),
+			target_lookup,
+			100u32.into(),
+		).unwrap();
+	}
 }
 
 fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
@@ -77,8 +131,8 @@ benchmarks! {
 	create {
 		let caller: T::AccountId = whitelisted_caller();
 		let caller_lookup = T::Lookup::unlookup(caller.clone());
-		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
-	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, 1, 1u32.into())
+		T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T>::max_value());
+	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, 1u32.into())
 	verify {
 		assert_last_event::<T>(Event::Created(Default::default(), caller.clone(), caller).into());
 	}
@@ -86,31 +140,27 @@ benchmarks! {
 	force_create {
 		let caller: T::AccountId = whitelisted_caller();
 		let caller_lookup = T::Lookup::unlookup(caller.clone());
-	}: _(SystemOrigin::Root, Default::default(), caller_lookup, 1, 1u32.into())
+	}: _(SystemOrigin::Root, Default::default(), caller_lookup, true, 1u32.into())
 	verify {
 		assert_last_event::<T>(Event::ForceCreated(Default::default(), caller).into());
 	}
 
 	destroy {
-		let z in 0 .. 10_000;
-		let (caller, _) = create_default_asset::<T>(10_000);
-		add_zombies::<T>(caller.clone(), z);
-	}: _(SystemOrigin::Signed(caller), Default::default(), 10_000)
-	verify {
-		assert_last_event::<T>(Event::Destroyed(Default::default()).into());
-	}
-
-	force_destroy {
-		let z in 0 .. 10_000;
-		let (caller, _) = create_default_asset::<T>(10_000);
-		add_zombies::<T>(caller.clone(), z);
-	}: _(SystemOrigin::Root, Default::default(), 10_000)
+		let c in 0 .. 5_000;
+		let s in 0 .. 5_000;
+		let a in 0 .. 5_00;
+		let (caller, _) = create_default_asset::<T>(true);
+		add_consumers::<T>(caller.clone(), c);
+		add_sufficients::<T>(caller.clone(), s);
+		add_approvals::<T>(caller.clone(), a);
+		let witness = Asset::<T>::get(T::AssetId::default()).unwrap().destroy_witness();
+	}: _(SystemOrigin::Signed(caller), Default::default(), witness)
 	verify {
 		assert_last_event::<T>(Event::Destroyed(Default::default()).into());
 	}
 
 	mint {
-		let (caller, caller_lookup) = create_default_asset::<T>(10);
+		let (caller, caller_lookup) = create_default_asset::<T>(true);
 		let amount = T::Balance::from(100u32);
 	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, amount)
 	verify {
@@ -119,7 +169,7 @@ benchmarks! {
 
 	burn {
 		let amount = T::Balance::from(100u32);
-		let (caller, caller_lookup) = create_default_minted_asset::<T>(10, amount);
+		let (caller, caller_lookup) = create_default_minted_asset::<T>(true, amount);
 	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, amount)
 	verify {
 		assert_last_event::<T>(Event::Burned(Default::default(), caller, amount).into());
@@ -127,35 +177,47 @@ benchmarks! {
 
 	transfer {
 		let amount = T::Balance::from(100u32);
-		let (caller, caller_lookup) = create_default_minted_asset::<T>(10, amount);
+		let (caller, caller_lookup) = create_default_minted_asset::<T>(true, amount);
+		let target: T::AccountId = account("target", 0, SEED);
+		let target_lookup = T::Lookup::unlookup(target.clone());
+	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), target_lookup, amount)
+	verify {
+		assert_last_event::<T>(Event::Transferred(Default::default(), caller, target, amount).into());
+	}
+
+	transfer_keep_alive {
+		let mint_amount = T::Balance::from(200u32);
+		let amount = T::Balance::from(100u32);
+		let (caller, caller_lookup) = create_default_minted_asset::<T>(true, mint_amount);
 		let target: T::AccountId = account("target", 0, SEED);
 		let target_lookup = T::Lookup::unlookup(target.clone());
 	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), target_lookup, amount)
 	verify {
+		assert!(frame_system::Module::<T>::account_exists(&caller));
 		assert_last_event::<T>(Event::Transferred(Default::default(), caller, target, amount).into());
 	}
 
 	force_transfer {
 		let amount = T::Balance::from(100u32);
-		let (caller, caller_lookup) = create_default_minted_asset::<T>(10, amount);
+		let (caller, caller_lookup) = create_default_minted_asset::<T>(true, amount);
 		let target: T::AccountId = account("target", 0, SEED);
 		let target_lookup = T::Lookup::unlookup(target.clone());
 	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, target_lookup, amount)
 	verify {
 		assert_last_event::<T>(
-			Event::ForceTransferred(Default::default(), caller, target, amount).into()
+			Event::Transferred(Default::default(), caller, target, amount).into()
 		);
 	}
 
 	freeze {
-		let (caller, caller_lookup) = create_default_minted_asset::<T>(10, 100u32.into());
+		let (caller, caller_lookup) = create_default_minted_asset::<T>(true, 100u32.into());
 	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup)
 	verify {
 		assert_last_event::<T>(Event::Frozen(Default::default(), caller).into());
 	}
 
 	thaw {
-		let (caller, caller_lookup) = create_default_minted_asset::<T>(10, 100u32.into());
+		let (caller, caller_lookup) = create_default_minted_asset::<T>(true, 100u32.into());
 		Assets::<T>::freeze(
 			SystemOrigin::Signed(caller.clone()).into(),
 			Default::default(),
@@ -167,14 +229,14 @@ benchmarks! {
 	}
 
 	freeze_asset {
-		let (caller, caller_lookup) = create_default_minted_asset::<T>(10, 100u32.into());
+		let (caller, caller_lookup) = create_default_minted_asset::<T>(true, 100u32.into());
 	}: _(SystemOrigin::Signed(caller.clone()), Default::default())
 	verify {
 		assert_last_event::<T>(Event::AssetFrozen(Default::default()).into());
 	}
 
 	thaw_asset {
-		let (caller, caller_lookup) = create_default_minted_asset::<T>(10, 100u32.into());
+		let (caller, caller_lookup) = create_default_minted_asset::<T>(true, 100u32.into());
 		Assets::<T>::freeze_asset(
 			SystemOrigin::Signed(caller.clone()).into(),
 			Default::default(),
@@ -185,7 +247,7 @@ benchmarks! {
 	}
 
 	transfer_ownership {
-		let (caller, _) = create_default_asset::<T>(10);
+		let (caller, _) = create_default_asset::<T>(true);
 		let target: T::AccountId = account("target", 0, SEED);
 		let target_lookup = T::Lookup::unlookup(target.clone());
 	}: _(SystemOrigin::Signed(caller), Default::default(), target_lookup)
@@ -194,7 +256,7 @@ benchmarks! {
 	}
 
 	set_team {
-		let (caller, _) = create_default_asset::<T>(10);
+		let (caller, _) = create_default_asset::<T>(true);
 		let target0 = T::Lookup::unlookup(account("target", 0, SEED));
 		let target1 = T::Lookup::unlookup(account("target", 1, SEED));
 		let target2 = T::Lookup::unlookup(account("target", 2, SEED));
@@ -208,16 +270,34 @@ benchmarks! {
 		).into());
 	}
 
-	set_max_zombies {
-		let (caller, _) = create_default_asset::<T>(10);
-		let max_zombies: u32 = 100;
-		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
-	}: _(SystemOrigin::Signed(caller), Default::default(), max_zombies)
+	set_metadata {
+		let n in 0 .. T::StringLimit::get();
+		let s in 0 .. T::StringLimit::get();
+
+		let name = vec![0u8; n as usize];
+		let symbol = vec![0u8; s as usize];
+		let decimals = 12;
+
+		let (caller, _) = create_default_asset::<T>(true);
+		T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T>::max_value());
+	}: _(SystemOrigin::Signed(caller), Default::default(), name.clone(), symbol.clone(), decimals)
 	verify {
-		assert_last_event::<T>(Event::MaxZombiesChanged(Default::default(), max_zombies).into());
+		let id = Default::default();
+		assert_last_event::<T>(Event::MetadataSet(id, name, symbol, decimals, false).into());
 	}
 
-	set_metadata {
+	clear_metadata {
+		let (caller, _) = create_default_asset::<T>(true);
+		T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T>::max_value());
+		let dummy = vec![0u8; T::StringLimit::get() as usize];
+		let origin = SystemOrigin::Signed(caller.clone()).into();
+		Assets::<T>::set_metadata(origin, Default::default(), dummy.clone(), dummy, 12)?;
+	}: _(SystemOrigin::Signed(caller), Default::default())
+	verify {
+		assert_last_event::<T>(Event::MetadataCleared(Default::default()).into());
+	}
+
+	force_set_metadata {
 		let n in 0 .. T::StringLimit::get();
 		let s in 0 .. T::StringLimit::get();
 
@@ -225,12 +305,116 @@ benchmarks! {
 		let symbol = vec![0u8; s as usize];
 		let decimals = 12;
 
-		let (caller, _) = create_default_asset::<T>(10);
-		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
-	}: _(SystemOrigin::Signed(caller), Default::default(), name.clone(), symbol.clone(), decimals)
+		create_default_asset::<T>(true);
+
+		let origin = T::ForceOrigin::successful_origin();
+		let call = Call::<T>::force_set_metadata(
+			Default::default(),
+			name.clone(),
+			symbol.clone(),
+			decimals,
+			false,
+		);
+	}: { call.dispatch_bypass_filter(origin)? }
+	verify {
+		let id = Default::default();
+		assert_last_event::<T>(Event::MetadataSet(id, name, symbol, decimals, false).into());
+	}
+
+	force_clear_metadata {
+		let (caller, _) = create_default_asset::<T>(true);
+		T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T>::max_value());
+		let dummy = vec![0u8; T::StringLimit::get() as usize];
+		let origin = SystemOrigin::Signed(caller.clone()).into();
+		Assets::<T>::set_metadata(origin, Default::default(), dummy.clone(), dummy, 12)?;
+
+		let origin = T::ForceOrigin::successful_origin();
+		let call = Call::<T>::force_clear_metadata(Default::default());
+	}: { call.dispatch_bypass_filter(origin)? }
+	verify {
+		assert_last_event::<T>(Event::MetadataCleared(Default::default()).into());
+	}
+
+	force_asset_status {
+		let (caller, caller_lookup) = create_default_asset::<T>(true);
+
+		let origin = T::ForceOrigin::successful_origin();
+		let call = Call::<T>::force_asset_status(
+			Default::default(),
+			caller_lookup.clone(),
+			caller_lookup.clone(),
+			caller_lookup.clone(),
+			caller_lookup.clone(),
+			100u32.into(),
+			true,
+			false,
+		);
+	}: { call.dispatch_bypass_filter(origin)? }
+	verify {
+		assert_last_event::<T>(Event::AssetStatusChanged(Default::default()).into());
+	}
+
+	approve_transfer {
+		let (caller, _) = create_default_minted_asset::<T>(true, 100u32.into());
+		T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T>::max_value());
+
+		let id = Default::default();
+		let delegate: T::AccountId = account("delegate", 0, SEED);
+		let delegate_lookup = T::Lookup::unlookup(delegate.clone());
+		let amount = 100u32.into();
+	}: _(SystemOrigin::Signed(caller.clone()), id, delegate_lookup, amount)
+	verify {
+		assert_last_event::<T>(Event::ApprovedTransfer(id, caller, delegate, amount).into());
+	}
+
+	transfer_approved {
+		let (owner, owner_lookup) = create_default_minted_asset::<T>(true, 100u32.into());
+		T::Currency::make_free_balance_be(&owner, DepositBalanceOf::<T>::max_value());
+
+		let id = Default::default();
+		let delegate: T::AccountId = account("delegate", 0, SEED);
+		whitelist_account!(delegate);
+		let delegate_lookup = T::Lookup::unlookup(delegate.clone());
+		let amount = 100u32.into();
+		let origin = SystemOrigin::Signed(owner.clone()).into();
+		Assets::<T>::approve_transfer(origin, id, delegate_lookup.clone(), amount)?;
+
+		let dest: T::AccountId = account("dest", 0, SEED);
+		let dest_lookup = T::Lookup::unlookup(dest.clone());
+	}: _(SystemOrigin::Signed(delegate.clone()), id, owner_lookup, dest_lookup, amount)
+	verify {
+		assert_last_event::<T>(Event::TransferredApproved(id, owner, delegate, dest, amount).into());
+	}
+
+	cancel_approval {
+		let (caller, _) = create_default_minted_asset::<T>(true, 100u32.into());
+		T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T>::max_value());
+
+		let id = Default::default();
+		let delegate: T::AccountId = account("delegate", 0, SEED);
+		let delegate_lookup = T::Lookup::unlookup(delegate.clone());
+		let amount = 100u32.into();
+		let origin = SystemOrigin::Signed(caller.clone()).into();
+		Assets::<T>::approve_transfer(origin, id, delegate_lookup.clone(), amount)?;
+	}: _(SystemOrigin::Signed(caller.clone()), id, delegate_lookup)
+	verify {
+		assert_last_event::<T>(Event::ApprovalCancelled(id, caller, delegate).into());
+	}
+
+	force_cancel_approval {
+		let (caller, caller_lookup) = create_default_minted_asset::<T>(true, 100u32.into());
+		T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T>::max_value());
+
+		let id = Default::default();
+		let delegate: T::AccountId = account("delegate", 0, SEED);
+		let delegate_lookup = T::Lookup::unlookup(delegate.clone());
+		let amount = 100u32.into();
+		let origin = SystemOrigin::Signed(caller.clone()).into();
+		Assets::<T>::approve_transfer(origin, id, delegate_lookup.clone(), amount)?;
+	}: _(SystemOrigin::Signed(caller.clone()), id, caller_lookup, delegate_lookup)
 	verify {
-		assert_last_event::<T>(Event::MetadataSet(Default::default(), name, symbol, decimals).into());
+		assert_last_event::<T>(Event::ApprovalCancelled(id, caller, delegate).into());
 	}
 }
 
-impl_benchmark_test_suite!(Assets, crate::tests::new_test_ext(), crate::tests::Test);
+impl_benchmark_test_suite!(Assets, crate::mock::new_test_ext(), crate::mock::Test);
diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index 7b04ea11bafe..e5cb39db2b8e 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -28,6 +28,7 @@
 //! * Asset Transferal
 //! * Asset Freezing
 //! * Asset Destruction (Burning)
+//! * Delegated Asset Transfers ("Approval API")
 //!
 //! To use it in your runtime, you need to implement the assets [`Config`].
 //!
@@ -53,8 +54,10 @@
 //! * **Non-fungible asset**: An asset for which each unit has unique characteristics.
 //! * **Owner**: An account ID uniquely privileged to be able to destroy a particular asset class,
 //!   or to set the Issuer, Freezer or Admin of that asset class.
-//! * **Zombie**: An account which has a balance of some assets in this pallet, but no other
-//!   footprint on-chain, in particular no account managed in the `frame_system` pallet.
+//! * **Approval**: The act of allowing an account the permission to transfer some
+//!   balance of asset from the approving account into some third-party destination account.
+//! * **Sufficiency**: The idea of a minimum-balance of an asset being sufficient to allow the
+//!   account's existence on the system without requiring any other existential-deposit.
 //!
 //! ### Goals
 //!
@@ -62,7 +65,8 @@
 //!
 //! * Issue a new assets in a permissioned or permissionless way, if permissionless, then with a
 //!   deposit required.
-//! * Allow accounts to hold these assets without otherwise existing on-chain (*zombies*).
+//! * Allow accounts to be delegated the ability to transfer assets without otherwise existing
+//!   on-chain (*approvals*).
 //! * Move assets between accounts.
 //! * Update the asset's total supply.
 //! * Allow administrative activities by specially privileged accounts including freezing account
@@ -74,11 +78,20 @@
 //!
 //! * `create`: Creates a new asset class, taking the required deposit.
 //! * `transfer`: Transfer sender's assets to another account.
+//! * `transfer_keep_alive`: Transfer sender's assets to another account, keeping the sender alive.
+//! * `set_metadata`: Set the metadata of an asset class.
+//! * `clear_metadata`: Remove the metadata of an asset class.
+//! * `approve_transfer`: Create or increase an delegated transfer.
+//! * `cancel_approval`: Rescind a previous approval.
+//! * `transfer_approved`: Transfer third-party's assets to another account.
 //!
 //! ### Permissioned Functions
 //!
 //! * `force_create`: Creates a new asset class without taking any deposit.
-//! * `force_destroy`: Destroys an asset class.
+//! * `force_set_metadata`: Set the metadata of an asset class.
+//! * `force_clear_metadata`: Remove the metadata of an asset class.
+//! * `force_asset_status`: Alter an asset class's attributes.
+//! * `force_cancel_approval`: Rescind a previous approval.
 //!
 //! ### Privileged Functions
 //! * `destroy`: Destroys an entire asset class; called by the asset class's Owner.
@@ -109,11 +122,15 @@
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
 
+pub mod weights;
 #[cfg(feature = "runtime-benchmarks")]
 mod benchmarking;
-pub mod weights;
+#[cfg(test)]
+pub mod mock;
+#[cfg(test)]
+mod tests;
 
-use sp_std::{fmt::Debug, prelude::*};
+use sp_std::prelude::*;
 use sp_runtime::{
 	RuntimeDebug,
 	traits::{
@@ -124,18 +141,120 @@ use codec::{Encode, Decode, HasCompact};
 use frame_support::{
 	ensure,
 	traits::{Currency, ReservableCurrency, BalanceStatus::Reserved},
-	dispatch::DispatchError,
+	dispatch::{DispatchError, DispatchResult},
 };
 pub use weights::WeightInfo;
 
 pub use pallet::*;
 
-type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+type DepositBalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+
+#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug)]
+pub struct AssetDetails<
+	Balance,
+	AccountId,
+	DepositBalance,
+> {
+	/// Can change `owner`, `issuer`, `freezer` and `admin` accounts.
+	owner: AccountId,
+	/// Can mint tokens.
+	issuer: AccountId,
+	/// Can thaw tokens, force transfers and burn tokens from any account.
+	admin: AccountId,
+	/// Can freeze tokens.
+	freezer: AccountId,
+	/// The total supply across all accounts.
+	supply: Balance,
+	/// The balance deposited for this asset. This pays for the data stored here.
+	deposit: DepositBalance,
+	/// The ED for virtual accounts.
+	min_balance: Balance,
+	/// If `true`, then any account with this asset is given a provider reference. Otherwise, it
+	/// requires a consumer reference.
+	is_sufficient: bool,
+	/// The total number of accounts.
+	accounts: u32,
+	/// The total number of accounts for which we have placed a self-sufficient reference.
+	sufficients: u32,
+	/// The total number of approvals.
+	approvals: u32,
+	/// Whether the asset is frozen for non-admin transfers.
+	is_frozen: bool,
+}
+
+impl<Balance, AccountId, DepositBalance> AssetDetails<Balance, AccountId, DepositBalance> {
+	pub fn destroy_witness(&self) -> DestroyWitness {
+		DestroyWitness {
+			accounts: self.accounts,
+			sufficients: self.sufficients,
+			approvals: self.approvals,
+		}
+	}
+}
+
+/// A pair to act as a key for the approval storage map.
+#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug)]
+pub struct ApprovalKey<AccountId> {
+	/// The owner of the funds that are being approved.
+	owner: AccountId,
+	/// The party to whom transfer of the funds is being delegated.
+	delegate: AccountId,
+}
+
+/// Data concerning an approval.
+#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default)]
+pub struct Approval<Balance, DepositBalance> {
+	/// The amount of funds approved for the balance transfer from the owner to some delegated
+	/// target.
+	amount: Balance,
+	/// The amount reserved on the owner's account to hold this item in storage.
+	deposit: DepositBalance,
+}
+
+#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default)]
+pub struct AssetBalance<Balance> {
+	/// The balance.
+	balance: Balance,
+	/// Whether the account is frozen.
+	is_frozen: bool,
+	/// `true` if this balance gave the account a self-sufficient reference.
+	sufficient: bool,
+}
+
+#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default)]
+pub struct AssetMetadata<DepositBalance> {
+	/// The balance deposited for this metadata.
+	///
+	/// This pays for the data stored in this struct.
+	deposit: DepositBalance,
+	/// The user friendly name of this asset. Limited in length by `StringLimit`.
+	name: Vec<u8>,
+	/// The ticker symbol for this asset. Limited in length by `StringLimit`.
+	symbol: Vec<u8>,
+	/// The number of decimals this asset uses to represent one unit.
+	decimals: u8,
+	/// Whether the asset metadata may be changed by a non Force origin.
+	is_frozen: bool,
+}
+
+/// Witness data for the destroy transactions.
+#[derive(Copy, Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug)]
+pub struct DestroyWitness {
+	/// The number of accounts holding the asset.
+	#[codec(compact)]
+	accounts: u32,
+	/// The number of accounts holding the asset with a self-sufficient reference.
+	#[codec(compact)]
+	sufficients: u32,
+	/// The number of transfer-approvals of the asset.
+	#[codec(compact)]
+	approvals: u32,
+}
 
 #[frame_support::pallet]
 pub mod pallet {
 	use frame_support::{
-		dispatch::DispatchResultWithPostInfo,
+		dispatch::DispatchResult,
 		pallet_prelude::*,
 	};
 	use frame_system::pallet_prelude::*;
@@ -160,30 +279,151 @@ pub mod pallet {
 		/// The currency mechanism.
 		type Currency: ReservableCurrency<Self::AccountId>;
 
-		/// The origin which may forcibly create or destroy an asset.
+		/// The origin which may forcibly create or destroy an asset or otherwise alter privileged
+		/// attributes.
 		type ForceOrigin: EnsureOrigin<Self::Origin>;
 
-		/// The basic amount of funds that must be reserved when creating a new asset class.
-		type AssetDepositBase: Get<BalanceOf<Self>>;
-
-		/// The additional funds that must be reserved for every zombie account that an asset class
-		/// supports.
-		type AssetDepositPerZombie: Get<BalanceOf<Self>>;
-
-		/// The maximum length of a name or symbol stored on-chain.
-		type StringLimit: Get<u32>;
+		/// The basic amount of funds that must be reserved for an asset.
+		type AssetDeposit: Get<DepositBalanceOf<Self>>;
 
 		/// The basic amount of funds that must be reserved when adding metadata to your asset.
-		type MetadataDepositBase: Get<BalanceOf<Self>>;
+		type MetadataDepositBase: Get<DepositBalanceOf<Self>>;
 
 		/// The additional funds that must be reserved for the number of bytes you store in your
 		/// metadata.
-		type MetadataDepositPerByte: Get<BalanceOf<Self>>;
+		type MetadataDepositPerByte: Get<DepositBalanceOf<Self>>;
+
+		/// The amount of funds that must be reserved when creating a new approval.
+		type ApprovalDeposit: Get<DepositBalanceOf<Self>>;
+
+		/// The maximum length of a name or symbol stored on-chain.
+		type StringLimit: Get<u32>;
 
 		/// Weight information for extrinsics in this pallet.
 		type WeightInfo: WeightInfo;
 	}
 
+	#[pallet::storage]
+	/// Details of an asset.
+	pub(super) type Asset<T: Config> = StorageMap<
+		_,
+		Blake2_128Concat,
+		T::AssetId,
+		AssetDetails<T::Balance, T::AccountId, DepositBalanceOf<T>>,
+	>;
+
+	#[pallet::storage]
+	/// The number of units of assets held by any given account.
+	pub(super) type Account<T: Config> = StorageDoubleMap<
+		_,
+		Blake2_128Concat,
+		T::AssetId,
+		Blake2_128Concat,
+		T::AccountId,
+		AssetBalance<T::Balance>,
+		ValueQuery,
+	>;
+
+	#[pallet::storage]
+	/// Approved balance transfers. First balance is the amount approved for transfer. Second
+	/// is the amount of `T::Currency` reserved for storing this.
+	pub(super) type Approvals<T: Config> = StorageDoubleMap<
+		_,
+		Blake2_128Concat,
+		T::AssetId,
+		Blake2_128Concat,
+		ApprovalKey<T::AccountId>,
+		Approval<T::Balance, DepositBalanceOf<T>>,
+		OptionQuery,
+	>;
+
+	#[pallet::storage]
+	/// Metadata of an asset.
+	pub(super) type Metadata<T: Config> = StorageMap<
+		_,
+		Blake2_128Concat,
+		T::AssetId,
+		AssetMetadata<DepositBalanceOf<T>>,
+		ValueQuery,
+	>;
+
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	#[pallet::metadata(T::AccountId = "AccountId", T::Balance = "Balance", T::AssetId = "AssetId")]
+	pub enum Event<T: Config> {
+		/// Some asset class was created. \[asset_id, creator, owner\]
+		Created(T::AssetId, T::AccountId, T::AccountId),
+		/// Some assets were issued. \[asset_id, owner, total_supply\]
+		Issued(T::AssetId, T::AccountId, T::Balance),
+		/// Some assets were transferred. \[asset_id, from, to, amount\]
+		Transferred(T::AssetId, T::AccountId, T::AccountId, T::Balance),
+		/// Some assets were destroyed. \[asset_id, owner, balance\]
+		Burned(T::AssetId, T::AccountId, T::Balance),
+		/// The management team changed \[asset_id, issuer, admin, freezer\]
+		TeamChanged(T::AssetId, T::AccountId, T::AccountId, T::AccountId),
+		/// The owner changed \[asset_id, owner\]
+		OwnerChanged(T::AssetId, T::AccountId),
+		/// Some account `who` was frozen. \[asset_id, who\]
+		Frozen(T::AssetId, T::AccountId),
+		/// Some account `who` was thawed. \[asset_id, who\]
+		Thawed(T::AssetId, T::AccountId),
+		/// Some asset `asset_id` was frozen. \[asset_id\]
+		AssetFrozen(T::AssetId),
+		/// Some asset `asset_id` was thawed. \[asset_id\]
+		AssetThawed(T::AssetId),
+		/// An asset class was destroyed.
+		Destroyed(T::AssetId),
+		/// Some asset class was force-created. \[asset_id, owner\]
+		ForceCreated(T::AssetId, T::AccountId),
+		/// New metadata has been set for an asset. \[asset_id, name, symbol, decimals, is_frozen\]
+		MetadataSet(T::AssetId, Vec<u8>, Vec<u8>, u8, bool),
+		/// Metadata has been cleared for an asset. \[asset_id\]
+		MetadataCleared(T::AssetId),
+		/// (Additional) funds have been approved for transfer to a destination account.
+		/// \[asset_id, source, delegate, amount\]
+		ApprovedTransfer(T::AssetId, T::AccountId, T::AccountId, T::Balance),
+		/// An approval for account `delegate` was cancelled by `owner`.
+		/// \[id, owner, delegate\]
+		ApprovalCancelled(T::AssetId, T::AccountId, T::AccountId),
+		/// An `amount` was transferred in its entirety from `owner` to `destination` by
+		/// the approved `delegate`.
+		/// \[id, owner, delegate, destination\]
+		TransferredApproved(T::AssetId, T::AccountId, T::AccountId, T::AccountId, T::Balance),
+		/// An asset has had its attributes changed by the `Force` origin.
+		/// \[id\]
+		AssetStatusChanged(T::AssetId),
+	}
+
+	#[pallet::error]
+	pub enum Error<T> {
+		/// Account balance must be greater than or equal to the transfer amount.
+		BalanceLow,
+		/// Balance should be non-zero.
+		BalanceZero,
+		/// The signing account has no permission to do the operation.
+		NoPermission,
+		/// The given asset ID is unknown.
+		Unknown,
+		/// The origin account is frozen.
+		Frozen,
+		/// The asset ID is already taken.
+		InUse,
+		/// Invalid witness data given.
+		BadWitness,
+		/// Minimum balance should be non-zero.
+		MinBalanceZero,
+		/// A mint operation lead to an overflow.
+		Overflow,
+		/// No provider reference exists to allow a non-zero balance of a non-self-sufficient asset.
+		NoProvider,
+		/// Invalid metadata given.
+		BadMetadata,
+		/// No approval exists that would allow the transfer.
+		Unapproved,
+		/// The source account would not survive the transfer and it needs to stay alive.
+		WouldDie,
+	}
+
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
 
@@ -191,7 +431,7 @@ pub mod pallet {
 	impl<T: Config> Pallet<T> {
 		/// Issue a new class of fungible assets from a public origin.
 		///
-		/// This new asset class has no assets initially.
+		/// This new asset class has no assets initially and its owner is the origin.
 		///
 		/// The origin must be Signed and the sender must have sufficient funds free.
 		///
@@ -201,11 +441,8 @@ pub mod pallet {
 		/// Parameters:
 		/// - `id`: The identifier of the new asset. This must not be currently in use to identify
 		/// an existing asset.
-		/// - `owner`: The owner of this class of assets. The owner has full superuser permissions
-		/// over this asset, but may later change and configure the permissions using `transfer_ownership`
-		/// and `set_team`.
-		/// - `max_zombies`: The total number of accounts which may hold assets in this class yet
-		/// have no existential deposit.
+		/// - `admin`: The admin of this class of assets. The admin is the initial address of each
+		/// member of the asset class's admin team.
 		/// - `min_balance`: The minimum balance of this new asset that any single account must
 		/// have. If an account's balance is reduced below this, then it collapses to zero.
 		///
@@ -217,18 +454,15 @@ pub mod pallet {
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId,
 			admin: <T::Lookup as StaticLookup>::Source,
-			max_zombies: u32,
 			min_balance: T::Balance,
-		) -> DispatchResultWithPostInfo {
+		) -> DispatchResult {
 			let owner = ensure_signed(origin)?;
 			let admin = T::Lookup::lookup(admin)?;
 
 			ensure!(!Asset::<T>::contains_key(id), Error::<T>::InUse);
 			ensure!(!min_balance.is_zero(), Error::<T>::MinBalanceZero);
 
-			let deposit = T::AssetDepositPerZombie::get()
-				.saturating_mul(max_zombies.into())
-			 	.saturating_add(T::AssetDepositBase::get());
+			let deposit = T::AssetDeposit::get();
 			T::Currency::reserve(&owner, deposit)?;
 
 			Asset::<T>::insert(id, AssetDetails {
@@ -238,14 +472,15 @@ pub mod pallet {
 				freezer: admin.clone(),
 				supply: Zero::zero(),
 				deposit,
-				max_zombies,
 				min_balance,
-				zombies: Zero::zero(),
-				accounts: Zero::zero(),
+				is_sufficient: false,
+				accounts: 0,
+				sufficients: 0,
+				approvals: 0,
 				is_frozen: false,
 			});
 			Self::deposit_event(Event::Created(id, owner, admin));
-			Ok(().into())
+			Ok(())
 		}
 
 		/// Issue a new class of fungible assets from a privileged origin.
@@ -274,9 +509,9 @@ pub mod pallet {
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId,
 			owner: <T::Lookup as StaticLookup>::Source,
-			#[pallet::compact] max_zombies: u32,
+			is_sufficient: bool,
 			#[pallet::compact] min_balance: T::Balance,
-		) -> DispatchResultWithPostInfo {
+		) -> DispatchResult {
 			T::ForceOrigin::ensure_origin(origin)?;
 			let owner = T::Lookup::lookup(owner)?;
 
@@ -290,80 +525,68 @@ pub mod pallet {
 				freezer: owner.clone(),
 				supply: Zero::zero(),
 				deposit: Zero::zero(),
-				max_zombies,
 				min_balance,
-				zombies: Zero::zero(),
-				accounts: Zero::zero(),
+				is_sufficient,
+				accounts: 0,
+				sufficients: 0,
+				approvals: 0,
 				is_frozen: false,
 			});
 			Self::deposit_event(Event::ForceCreated(id, owner));
-			Ok(().into())
+			Ok(())
 		}
 
-		/// Destroy a class of fungible assets owned by the sender.
+		/// Destroy a class of fungible assets.
 		///
-		/// The origin must be Signed and the sender must be the owner of the asset `id`.
+		/// The origin must conform to `ForceOrigin` or must be Signed and the sender must be the
+		/// owner of the asset `id`.
 		///
 		/// - `id`: The identifier of the asset to be destroyed. This must identify an existing
 		/// asset.
 		///
 		/// Emits `Destroyed` event when successful.
 		///
-		/// Weight: `O(z)` where `z` is the number of zombie accounts.
-		#[pallet::weight(T::WeightInfo::destroy(*zombies_witness))]
+		/// Weight: `O(c + p + a)` where:
+		/// - `c = (witness.accounts - witness.sufficients)`
+		/// - `s = witness.sufficients`
+		/// - `a = witness.approvals`
+		#[pallet::weight(T::WeightInfo::destroy(
+			witness.accounts.saturating_sub(witness.sufficients),
+ 			witness.sufficients,
+ 			witness.approvals,
+ 		))]
 		pub(super) fn destroy(
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId,
-			#[pallet::compact] zombies_witness: u32,
-		) -> DispatchResultWithPostInfo {
-			let origin = ensure_signed(origin)?;
-
+			witness: DestroyWitness,
+		) -> DispatchResult {
+			let maybe_check_owner = match T::ForceOrigin::try_origin(origin) {
+				Ok(_) => None,
+				Err(origin) => Some(ensure_signed(origin)?),
+			};
 			Asset::<T>::try_mutate_exists(id, |maybe_details| {
-				let details = maybe_details.take().ok_or(Error::<T>::Unknown)?;
-				ensure!(details.owner == origin, Error::<T>::NoPermission);
-				ensure!(details.accounts == details.zombies, Error::<T>::RefsLeft);
-				ensure!(details.zombies <= zombies_witness, Error::<T>::BadWitness);
-
-				let metadata = Metadata::<T>::take(&id);
-				T::Currency::unreserve(&details.owner, details.deposit.saturating_add(metadata.deposit));
-
-				*maybe_details = None;
-				Account::<T>::remove_prefix(&id);
-				Self::deposit_event(Event::Destroyed(id));
-				Ok(().into())
-			})
-		}
-
-		/// Destroy a class of fungible assets.
-		///
-		/// The origin must conform to `ForceOrigin`.
-		///
-		/// - `id`: The identifier of the asset to be destroyed. This must identify an existing
-		/// asset.
-		///
-		/// Emits `Destroyed` event when successful.
-		///
-		/// Weight: `O(1)`
-		#[pallet::weight(T::WeightInfo::force_destroy(*zombies_witness))]
-		pub(super) fn force_destroy(
-			origin: OriginFor<T>,
-			#[pallet::compact] id: T::AssetId,
-			#[pallet::compact] zombies_witness: u32,
-		) -> DispatchResultWithPostInfo {
-			T::ForceOrigin::ensure_origin(origin)?;
+				let mut details = maybe_details.take().ok_or(Error::<T>::Unknown)?;
+				if let Some(check_owner) = maybe_check_owner {
+					ensure!(details.owner == check_owner, Error::<T>::NoPermission);
+				}
+				ensure!(details.accounts == witness.accounts, Error::<T>::BadWitness);
+				ensure!(details.sufficients == witness.sufficients, Error::<T>::BadWitness);
+				ensure!(details.approvals == witness.approvals, Error::<T>::BadWitness);
 
-			Asset::<T>::try_mutate_exists(id, |maybe_details| {
-				let details = maybe_details.take().ok_or(Error::<T>::Unknown)?;
-				ensure!(details.accounts == details.zombies, Error::<T>::RefsLeft);
-				ensure!(details.zombies <= zombies_witness, Error::<T>::BadWitness);
+				for (who, v) in Account::<T>::drain_prefix(id) {
+					Self::dead_account(&who, &mut details, v.sufficient);
+				}
+				debug_assert_eq!(details.accounts, 0);
+				debug_assert_eq!(details.sufficients, 0);
 
 				let metadata = Metadata::<T>::take(&id);
 				T::Currency::unreserve(&details.owner, details.deposit.saturating_add(metadata.deposit));
 
-				*maybe_details = None;
-				Account::<T>::remove_prefix(&id);
+				Approvals::<T>::remove_prefix(&id);
 				Self::deposit_event(Event::Destroyed(id));
-				Ok(().into())
+
+				// NOTE: could use postinfo to reflect the actual number of accounts/sufficient/approvals
+				Ok(())
 			})
 		}
 
@@ -385,7 +608,7 @@ pub mod pallet {
 			#[pallet::compact] id: T::AssetId,
 			beneficiary: <T::Lookup as StaticLookup>::Source,
 			#[pallet::compact] amount: T::Balance
-		) -> DispatchResultWithPostInfo {
+		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
 			let beneficiary = T::Lookup::lookup(beneficiary)?;
 
@@ -395,17 +618,17 @@ pub mod pallet {
 				ensure!(&origin == &details.issuer, Error::<T>::NoPermission);
 				details.supply = details.supply.checked_add(&amount).ok_or(Error::<T>::Overflow)?;
 
-				Account::<T>::try_mutate(id, &beneficiary, |t| -> DispatchResultWithPostInfo {
+				Account::<T>::try_mutate(id, &beneficiary, |t| -> DispatchResult {
 					let new_balance = t.balance.saturating_add(amount);
 					ensure!(new_balance >= details.min_balance, Error::<T>::BalanceLow);
 					if t.balance.is_zero() {
-						t.is_zombie = Self::new_account(&beneficiary, details)?;
+						t.sufficient = Self::new_account(&beneficiary, details)?;
 					}
 					t.balance = new_balance;
-					Ok(().into())
+					Ok(())
 				})?;
 				Self::deposit_event(Event::Issued(id, beneficiary, amount));
-				Ok(().into())
+				Ok(())
 			})
 		}
 
@@ -430,7 +653,7 @@ pub mod pallet {
 			#[pallet::compact] id: T::AssetId,
 			who: <T::Lookup as StaticLookup>::Source,
 			#[pallet::compact] amount: T::Balance
-		) -> DispatchResultWithPostInfo {
+		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
 			let who = T::Lookup::lookup(who)?;
 
@@ -447,7 +670,7 @@ pub mod pallet {
 						account.balance -= burned;
 						*maybe_account = if account.balance < d.min_balance {
 							burned += account.balance;
-							Self::dead_account(&who, d, account.is_zombie);
+							Self::dead_account(&who, d, account.sufficient);
 							None
 						} else {
 							Some(account)
@@ -459,7 +682,7 @@ pub mod pallet {
 				d.supply = d.supply.saturating_sub(burned);
 
 				Self::deposit_event(Event::Burned(id, who, burned));
-				Ok(().into())
+				Ok(())
 			})
 		}
 
@@ -487,54 +710,46 @@ pub mod pallet {
 			#[pallet::compact] id: T::AssetId,
 			target: <T::Lookup as StaticLookup>::Source,
 			#[pallet::compact] amount: T::Balance
-		) -> DispatchResultWithPostInfo {
+		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
-			ensure!(!amount.is_zero(), Error::<T>::AmountZero);
-
-			let mut origin_account = Account::<T>::get(id, &origin);
-			ensure!(!origin_account.is_frozen, Error::<T>::Frozen);
-			origin_account.balance = origin_account.balance.checked_sub(&amount)
-				.ok_or(Error::<T>::BalanceLow)?;
-
 			let dest = T::Lookup::lookup(target)?;
-			Asset::<T>::try_mutate(id, |maybe_details| {
-				let details = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
-				ensure!(!details.is_frozen, Error::<T>::Frozen);
-
-				if dest == origin {
-					return Ok(().into())
-				}
-
-				let mut amount = amount;
-				if origin_account.balance < details.min_balance {
-					amount += origin_account.balance;
-					origin_account.balance = Zero::zero();
-				}
 
-				Account::<T>::try_mutate(id, &dest, |a| -> DispatchResultWithPostInfo {
-					let new_balance = a.balance.saturating_add(amount);
-					ensure!(new_balance >= details.min_balance, Error::<T>::BalanceLow);
-					if a.balance.is_zero() {
-						a.is_zombie = Self::new_account(&dest, details)?;
-					}
-					a.balance = new_balance;
-					Ok(().into())
-				})?;
+			Self::do_transfer(id, &origin, &dest, amount, None, false)?;
+			Self::deposit_event(Event::Transferred(id, origin, dest, amount));
+			Ok(())
+		}
 
-				match origin_account.balance.is_zero() {
-					false => {
-						Self::dezombify(&origin, details, &mut origin_account.is_zombie);
-						Account::<T>::insert(id, &origin, &origin_account)
-					}
-					true => {
-						Self::dead_account(&origin, details, origin_account.is_zombie);
-						Account::<T>::remove(id, &origin);
-					}
-				}
+		/// Move some assets from the sender account to another, keeping the sender account alive.
+		///
+		/// Origin must be Signed.
+		///
+		/// - `id`: The identifier of the asset to have some amount transferred.
+		/// - `target`: The account to be credited.
+		/// - `amount`: The amount by which the sender's balance of assets should be reduced and
+		/// `target`'s balance increased. The amount actually transferred may be slightly greater in
+		/// the case that the transfer would otherwise take the sender balance above zero but below
+		/// the minimum balance. Must be greater than zero.
+		///
+		/// Emits `Transferred` with the actual amount transferred. If this takes the source balance
+		/// to below the minimum for the asset, then the amount transferred is increased to take it
+		/// to zero.
+		///
+		/// Weight: `O(1)`
+		/// Modes: Pre-existence of `target`; Post-existence of sender; Prior & post zombie-status
+		/// of sender; Account pre-existence of `target`.
+		#[pallet::weight(T::WeightInfo::transfer_keep_alive())]
+		pub(super) fn transfer_keep_alive(
+			origin: OriginFor<T>,
+			#[pallet::compact] id: T::AssetId,
+			target: <T::Lookup as StaticLookup>::Source,
+			#[pallet::compact] amount: T::Balance
+		) -> DispatchResult {
+			let origin = ensure_signed(origin)?;
+			let dest = T::Lookup::lookup(target)?;
 
-				Self::deposit_event(Event::Transferred(id, origin, dest, amount));
-				Ok(().into())
-			})
+			Self::do_transfer(id, &origin, &dest, amount, None, true)?;
+			Self::deposit_event(Event::Transferred(id, origin, dest, amount));
+			Ok(())
 		}
 
 		/// Move some assets from one account to another.
@@ -563,53 +778,14 @@ pub mod pallet {
 			source: <T::Lookup as StaticLookup>::Source,
 			dest: <T::Lookup as StaticLookup>::Source,
 			#[pallet::compact] amount: T::Balance,
-		) -> DispatchResultWithPostInfo {
+		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
-
 			let source = T::Lookup::lookup(source)?;
-			let mut source_account = Account::<T>::get(id, &source);
-			let mut amount = amount.min(source_account.balance);
-			ensure!(!amount.is_zero(), Error::<T>::AmountZero);
-
 			let dest = T::Lookup::lookup(dest)?;
-			if dest == source {
-				return Ok(().into())
-			}
-
-			Asset::<T>::try_mutate(id, |maybe_details| {
-				let details = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
-				ensure!(&origin == &details.admin, Error::<T>::NoPermission);
-
-				source_account.balance -= amount;
-				if source_account.balance < details.min_balance {
-					amount += source_account.balance;
-					source_account.balance = Zero::zero();
-				}
-
-				Account::<T>::try_mutate(id, &dest, |a| -> DispatchResultWithPostInfo {
-					let new_balance = a.balance.saturating_add(amount);
-					ensure!(new_balance >= details.min_balance, Error::<T>::BalanceLow);
-					if a.balance.is_zero() {
-						a.is_zombie = Self::new_account(&dest, details)?;
-					}
-					a.balance = new_balance;
-					Ok(().into())
-				})?;
-
-				match source_account.balance.is_zero() {
-					false => {
-						Self::dezombify(&source, details, &mut source_account.is_zombie);
-						Account::<T>::insert(id, &source, &source_account)
-					}
-					true => {
-						Self::dead_account(&source, details, source_account.is_zombie);
-						Account::<T>::remove(id, &source);
-					}
-				}
 
-				Self::deposit_event(Event::ForceTransferred(id, source, dest, amount));
-				Ok(().into())
-			})
+			Self::do_transfer(id, &source, &dest, amount, Some(origin), false)?;
+			Self::deposit_event(Event::Transferred(id, source, dest, amount));
+			Ok(())
 		}
 
 		/// Disallow further unprivileged transfers from an account.
@@ -627,7 +803,7 @@ pub mod pallet {
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId,
 			who: <T::Lookup as StaticLookup>::Source
-		) -> DispatchResultWithPostInfo {
+		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
 
 			let d = Asset::<T>::get(id).ok_or(Error::<T>::Unknown)?;
@@ -638,7 +814,7 @@ pub mod pallet {
 			Account::<T>::mutate(id, &who, |a| a.is_frozen = true);
 
 			Self::deposit_event(Event::<T>::Frozen(id, who));
-			Ok(().into())
+			Ok(())
 		}
 
 		/// Allow unprivileged transfers from an account again.
@@ -657,7 +833,7 @@ pub mod pallet {
 			#[pallet::compact]
 			id: T::AssetId,
 			who: <T::Lookup as StaticLookup>::Source
-		) -> DispatchResultWithPostInfo {
+		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
 
 			let details = Asset::<T>::get(id).ok_or(Error::<T>::Unknown)?;
@@ -668,7 +844,7 @@ pub mod pallet {
 			Account::<T>::mutate(id, &who, |a| a.is_frozen = false);
 
 			Self::deposit_event(Event::<T>::Thawed(id, who));
-			Ok(().into())
+			Ok(())
 		}
 
 		/// Disallow further unprivileged transfers for the asset class.
@@ -684,7 +860,7 @@ pub mod pallet {
 		pub(super) fn freeze_asset(
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId
-		) -> DispatchResultWithPostInfo {
+		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
 
 			Asset::<T>::try_mutate(id, |maybe_details| {
@@ -694,7 +870,7 @@ pub mod pallet {
 				d.is_frozen = true;
 
 				Self::deposit_event(Event::<T>::AssetFrozen(id));
-				Ok(().into())
+				Ok(())
 			})
 		}
 
@@ -711,7 +887,7 @@ pub mod pallet {
 		pub(super) fn thaw_asset(
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId
-		) -> DispatchResultWithPostInfo {
+		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
 
 			Asset::<T>::try_mutate(id, |maybe_details| {
@@ -721,7 +897,7 @@ pub mod pallet {
 				d.is_frozen = false;
 
 				Self::deposit_event(Event::<T>::AssetThawed(id));
-				Ok(().into())
+				Ok(())
 			})
 		}
 
@@ -729,7 +905,7 @@ pub mod pallet {
 		///
 		/// Origin must be Signed and the sender should be the Owner of the asset `id`.
 		///
-		/// - `id`: The identifier of the asset to be frozen.
+		/// - `id`: The identifier of the asset.
 		/// - `owner`: The new Owner of this asset.
 		///
 		/// Emits `OwnerChanged`.
@@ -740,22 +916,25 @@ pub mod pallet {
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId,
 			owner: <T::Lookup as StaticLookup>::Source,
-		) -> DispatchResultWithPostInfo {
+		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
 			let owner = T::Lookup::lookup(owner)?;
 
 			Asset::<T>::try_mutate(id, |maybe_details| {
 				let details = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
 				ensure!(&origin == &details.owner, Error::<T>::NoPermission);
-				if details.owner == owner { return Ok(().into()) }
+				if details.owner == owner { return Ok(()) }
+
+				let metadata_deposit = Metadata::<T>::get(id).deposit;
+				let deposit = details.deposit + metadata_deposit;
 
 				// Move the deposit to the new owner.
-				T::Currency::repatriate_reserved(&details.owner, &owner, details.deposit, Reserved)?;
+				T::Currency::repatriate_reserved(&details.owner, &owner, deposit, Reserved)?;
 
 				details.owner = owner.clone();
 
 				Self::deposit_event(Event::OwnerChanged(id, owner));
-				Ok(().into())
+				Ok(())
 			})
 		}
 
@@ -778,7 +957,7 @@ pub mod pallet {
 			issuer: <T::Lookup as StaticLookup>::Source,
 			admin: <T::Lookup as StaticLookup>::Source,
 			freezer: <T::Lookup as StaticLookup>::Source,
-		) -> DispatchResultWithPostInfo {
+		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
 			let issuer = T::Lookup::lookup(issuer)?;
 			let admin = T::Lookup::lookup(admin)?;
@@ -793,285 +972,387 @@ pub mod pallet {
 				details.freezer = freezer.clone();
 
 				Self::deposit_event(Event::TeamChanged(id, issuer, admin, freezer));
-				Ok(().into())
+				Ok(())
 			})
 		}
 
-		/// Set the maximum number of zombie accounts for an asset.
+		/// Set the metadata for an asset.
 		///
 		/// Origin must be Signed and the sender should be the Owner of the asset `id`.
 		///
 		/// Funds of sender are reserved according to the formula:
-		/// `AssetDepositBase + AssetDepositPerZombie * max_zombies` taking into account
-		/// any already reserved funds.
-		///
-		/// - `id`: The identifier of the asset to update zombie count.
-		/// - `max_zombies`: The new number of zombies allowed for this asset.
-		///
-		/// Emits `MaxZombiesChanged`.
+		/// `MetadataDepositBase + MetadataDepositPerByte * (name.len + symbol.len)` taking into
+		/// account any already reserved funds.
 		///
-		/// Weight: `O(1)`
-		#[pallet::weight(T::WeightInfo::set_max_zombies())]
-		pub(super) fn set_max_zombies(
+		/// - `id`: The identifier of the asset to update.
+		/// - `name`: The user friendly name of this asset. Limited in length by `StringLimit`.
+		/// - `symbol`: The exchange symbol for this asset. Limited in length by `StringLimit`.
+		/// - `decimals`: The number of decimals this asset uses to represent one unit.
+		///
+		/// Emits `MetadataSet`.
+		///
+		/// Weight: `O(1)`
+		#[pallet::weight(T::WeightInfo::set_metadata(name.len() as u32, symbol.len() as u32))]
+		pub(super) fn set_metadata(
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId,
-			#[pallet::compact] max_zombies: u32,
-		) -> DispatchResultWithPostInfo {
+			name: Vec<u8>,
+			symbol: Vec<u8>,
+			decimals: u8,
+		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
 
-			Asset::<T>::try_mutate(id, |maybe_details| {
-				let details = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
-				ensure!(&origin == &details.owner, Error::<T>::NoPermission);
-				ensure!(max_zombies >= details.zombies, Error::<T>::TooManyZombies);
+			ensure!(name.len() <= T::StringLimit::get() as usize, Error::<T>::BadMetadata);
+			ensure!(symbol.len() <= T::StringLimit::get() as usize, Error::<T>::BadMetadata);
+
+			let d = Asset::<T>::get(id).ok_or(Error::<T>::Unknown)?;
+			ensure!(&origin == &d.owner, Error::<T>::NoPermission);
+
+			Metadata::<T>::try_mutate_exists(id, |metadata| {
+				ensure!(metadata.as_ref().map_or(true, |m| !m.is_frozen), Error::<T>::NoPermission);
 
-				let new_deposit = T::AssetDepositPerZombie::get()
-					.saturating_mul(max_zombies.into())
-					.saturating_add(T::AssetDepositBase::get());
+				let old_deposit = metadata.take().map_or(Zero::zero(), |m| m.deposit);
+				let new_deposit = T::MetadataDepositPerByte::get()
+					.saturating_mul(((name.len() + symbol.len()) as u32).into())
+					.saturating_add(T::MetadataDepositBase::get());
 
-				if new_deposit > details.deposit {
-					T::Currency::reserve(&origin, new_deposit - details.deposit)?;
+				if new_deposit > old_deposit {
+					T::Currency::reserve(&origin, new_deposit - old_deposit)?;
 				} else {
-					T::Currency::unreserve(&origin, details.deposit - new_deposit);
+					T::Currency::unreserve(&origin, old_deposit - new_deposit);
 				}
 
-				details.max_zombies = max_zombies;
+				*metadata = Some(AssetMetadata {
+					deposit: new_deposit,
+					name: name.clone(),
+					symbol: symbol.clone(),
+					decimals,
+					is_frozen: false,
+				});
 
-				Self::deposit_event(Event::MaxZombiesChanged(id, max_zombies));
-				Ok(().into())
+				Self::deposit_event(Event::MetadataSet(id, name, symbol, decimals, false));
+				Ok(())
 			})
 		}
 
-		/// Set the metadata for an asset.
-		///
-		/// NOTE: There is no `unset_metadata` call. Simply pass an empty name, symbol,
-		/// and 0 decimals to this function to remove the metadata of an asset and
-		/// return your deposit.
+		/// Clear the metadata for an asset.
 		///
 		/// Origin must be Signed and the sender should be the Owner of the asset `id`.
 		///
-		/// Funds of sender are reserved according to the formula:
-		/// `MetadataDepositBase + MetadataDepositPerByte * (name.len + symbol.len)` taking into
-		/// account any already reserved funds.
+		/// Any deposit is freed for the asset owner.
+		///
+		/// - `id`: The identifier of the asset to clear.
+		///
+		/// Emits `MetadataCleared`.
+		///
+		/// Weight: `O(1)`
+		#[pallet::weight(T::WeightInfo::clear_metadata())]
+		pub(super) fn clear_metadata(
+			origin: OriginFor<T>,
+			#[pallet::compact] id: T::AssetId,
+		) -> DispatchResult {
+			let origin = ensure_signed(origin)?;
+
+			let d = Asset::<T>::get(id).ok_or(Error::<T>::Unknown)?;
+			ensure!(&origin == &d.owner, Error::<T>::NoPermission);
+
+			Metadata::<T>::try_mutate_exists(id, |metadata| {
+				let deposit = metadata.take().ok_or(Error::<T>::Unknown)?.deposit;
+				T::Currency::unreserve(&d.owner, deposit);
+				Self::deposit_event(Event::MetadataCleared(id));
+				Ok(())
+			})
+		}
+
+		/// Force the metadata for an asset to some value.
+		///
+		/// Origin must be ForceOrigin.
+		///
+		/// Any deposit is left alone.
 		///
 		/// - `id`: The identifier of the asset to update.
 		/// - `name`: The user friendly name of this asset. Limited in length by `StringLimit`.
 		/// - `symbol`: The exchange symbol for this asset. Limited in length by `StringLimit`.
 		/// - `decimals`: The number of decimals this asset uses to represent one unit.
 		///
-		/// Emits `MaxZombiesChanged`.
+		/// Emits `MetadataSet`.
 		///
-		/// Weight: `O(1)`
-		#[pallet::weight(T::WeightInfo::set_metadata(name.len() as u32, symbol.len() as u32))]
-		pub(super) fn set_metadata(
+		/// Weight: `O(N + S)` where N and S are the length of the name and symbol respectively.
+		#[pallet::weight(T::WeightInfo::force_set_metadata(name.len() as u32, symbol.len() as u32))]
+		pub(super) fn force_set_metadata(
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId,
 			name: Vec<u8>,
 			symbol: Vec<u8>,
 			decimals: u8,
-		) -> DispatchResultWithPostInfo {
-			let origin = ensure_signed(origin)?;
+			is_frozen: bool,
+		) -> DispatchResult {
+			T::ForceOrigin::ensure_origin(origin)?;
 
 			ensure!(name.len() <= T::StringLimit::get() as usize, Error::<T>::BadMetadata);
 			ensure!(symbol.len() <= T::StringLimit::get() as usize, Error::<T>::BadMetadata);
 
-			let d = Asset::<T>::get(id).ok_or(Error::<T>::Unknown)?;
-			ensure!(&origin == &d.owner, Error::<T>::NoPermission);
+			ensure!(Asset::<T>::contains_key(id), Error::<T>::Unknown);
+			Metadata::<T>::try_mutate_exists(id, |metadata| {
+				let deposit = metadata.take().map_or(Zero::zero(), |m| m.deposit);
+				*metadata = Some(AssetMetadata {
+					deposit,
+					name: name.clone(),
+					symbol: symbol.clone(),
+					decimals,
+					is_frozen,
+				});
+
+				Self::deposit_event(Event::MetadataSet(id, name, symbol, decimals, is_frozen));
+				Ok(())
+			})
+		}
+
+		/// Clear the metadata for an asset.
+		///
+		/// Origin must be ForceOrigin.
+		///
+		/// Any deposit is returned.
+		///
+		/// - `id`: The identifier of the asset to clear.
+		///
+		/// Emits `MetadataCleared`.
+		///
+		/// Weight: `O(1)`
+		#[pallet::weight(T::WeightInfo::force_clear_metadata())]
+		pub(super) fn force_clear_metadata(
+			origin: OriginFor<T>,
+			#[pallet::compact] id: T::AssetId,
+		) -> DispatchResult {
+			T::ForceOrigin::ensure_origin(origin)?;
 
+			let d = Asset::<T>::get(id).ok_or(Error::<T>::Unknown)?;
 			Metadata::<T>::try_mutate_exists(id, |metadata| {
-				let bytes_used = name.len() + symbol.len();
-				let old_deposit = match metadata {
-					Some(m) => m.deposit,
-					None => Default::default()
-				};
-
-				// Metadata is being removed
-				if bytes_used.is_zero() && decimals.is_zero() {
-					T::Currency::unreserve(&origin, old_deposit);
-					*metadata = None;
-				} else {
-					let new_deposit = T::MetadataDepositPerByte::get()
-						.saturating_mul(((name.len() + symbol.len()) as u32).into())
-						.saturating_add(T::MetadataDepositBase::get());
-
-					if new_deposit > old_deposit {
-						T::Currency::reserve(&origin, new_deposit - old_deposit)?;
-					} else {
-						T::Currency::unreserve(&origin, old_deposit - new_deposit);
-					}
+				let deposit = metadata.take().ok_or(Error::<T>::Unknown)?.deposit;
+				T::Currency::unreserve(&d.owner, deposit);
+				Self::deposit_event(Event::MetadataCleared(id));
+				Ok(())
+			})
+		}
 
-					*metadata = Some(AssetMetadata {
-						deposit: new_deposit,
-						name: name.clone(),
-						symbol: symbol.clone(),
-						decimals,
-					})
-				}
+		/// Alter the attributes of a given asset.
+		///
+		/// Origin must be `ForceOrigin`.
+		///
+		/// - `id`: The identifier of the asset.
+		/// - `owner`: The new Owner of this asset.
+		/// - `issuer`: The new Issuer of this asset.
+		/// - `admin`: The new Admin of this asset.
+		/// - `freezer`: The new Freezer of this asset.
+		/// - `min_balance`: The minimum balance of this new asset that any single account must
+		/// have. If an account's balance is reduced below this, then it collapses to zero.
+		/// - `is_sufficient`: Whether a non-zero balance of this asset is deposit of sufficient
+		/// value to account for the state bloat associated with its balance storage. If set to
+		/// `true`, then non-zero balances may be stored without a `consumer` reference (and thus
+		/// an ED in the Balances pallet or whatever else is used to control user-account state
+		/// growth).
+		/// - `is_frozen`: Whether this asset class is frozen except for permissioned/admin
+		/// instructions.
+		///
+		/// Emits `AssetStatusChanged` with the identity of the asset.
+		///
+		/// Weight: `O(1)`
+		#[pallet::weight(T::WeightInfo::force_asset_status())]
+		pub(super) fn force_asset_status(
+			origin: OriginFor<T>,
+			#[pallet::compact] id: T::AssetId,
+			owner: <T::Lookup as StaticLookup>::Source,
+			issuer: <T::Lookup as StaticLookup>::Source,
+			admin: <T::Lookup as StaticLookup>::Source,
+			freezer: <T::Lookup as StaticLookup>::Source,
+			#[pallet::compact] min_balance: T::Balance,
+			is_sufficient: bool,
+			is_frozen: bool,
+		) -> DispatchResult {
+			T::ForceOrigin::ensure_origin(origin)?;
 
-				Self::deposit_event(Event::MetadataSet(id, name, symbol, decimals));
-				Ok(().into())
+			Asset::<T>::try_mutate(id, |maybe_asset| {
+				let mut asset = maybe_asset.take().ok_or(Error::<T>::Unknown)?;
+				asset.owner = T::Lookup::lookup(owner)?;
+				asset.issuer = T::Lookup::lookup(issuer)?;
+				asset.admin = T::Lookup::lookup(admin)?;
+				asset.freezer = T::Lookup::lookup(freezer)?;
+				asset.min_balance = min_balance;
+				asset.is_sufficient = is_sufficient;
+				asset.is_frozen = is_frozen;
+				*maybe_asset = Some(asset);
+
+				Self::deposit_event(Event::AssetStatusChanged(id));
+				Ok(())
 			})
 		}
 
-	}
+		/// Approve an amount of asset for transfer by a delegated third-party account.
+		///
+		/// Origin must be Signed.
+		///
+		/// Ensures that `ApprovalDeposit` worth of `Currency` is reserved from signing account
+		/// for the purpose of holding the approval. If some non-zero amount of assets is already
+		/// approved from signing account to `delegate`, then it is topped up or unreserved to
+		/// meet the right value.
+		///
+		/// NOTE: The signing account does not need to own `amount` of assets at the point of
+		/// making this call.
+		///
+		/// - `id`: The identifier of the asset.
+		/// - `delegate`: The account to delegate permission to transfer asset.
+		/// - `amount`: The amount of asset that may be transferred by `delegate`. If there is
+		/// already an approval in place, then this acts additively.
+		///
+		/// Emits `ApprovedTransfer` on success.
+		///
+		/// Weight: `O(1)`
+		#[pallet::weight(T::WeightInfo::approve_transfer())]
+		pub(super) fn approve_transfer(
+			origin: OriginFor<T>,
+			#[pallet::compact] id: T::AssetId,
+			delegate: <T::Lookup as StaticLookup>::Source,
+			#[pallet::compact] amount: T::Balance,
+		) -> DispatchResult {
+			let owner = ensure_signed(origin)?;
+			let delegate = T::Lookup::lookup(delegate)?;
+
+			let key = ApprovalKey { owner, delegate };
+			Approvals::<T>::try_mutate(id, &key, |maybe_approved| -> DispatchResult {
+				let mut approved = maybe_approved.take().unwrap_or_default();
+				let deposit_required = T::ApprovalDeposit::get();
+				if approved.deposit < deposit_required {
+					T::Currency::reserve(&key.owner, deposit_required - approved.deposit)?;
+					approved.deposit = deposit_required;
+				}
+				approved.amount = approved.amount.saturating_add(amount);
+				*maybe_approved = Some(approved);
+				Ok(())
+			})?;
+			Self::deposit_event(Event::ApprovedTransfer(id, key.owner, key.delegate, amount));
 
-	#[pallet::event]
-	#[pallet::generate_deposit(pub(super) fn deposit_event)]
-	#[pallet::metadata(T::AccountId = "AccountId", T::Balance = "Balance", T::AssetId = "AssetId")]
-	pub enum Event<T: Config> {
-		/// Some asset class was created. \[asset_id, creator, owner\]
-		Created(T::AssetId, T::AccountId, T::AccountId),
-		/// Some assets were issued. \[asset_id, owner, total_supply\]
-		Issued(T::AssetId, T::AccountId, T::Balance),
-		/// Some assets were transferred. \[asset_id, from, to, amount\]
-		Transferred(T::AssetId, T::AccountId, T::AccountId, T::Balance),
-		/// Some assets were destroyed. \[asset_id, owner, balance\]
-		Burned(T::AssetId, T::AccountId, T::Balance),
-		/// The management team changed \[asset_id, issuer, admin, freezer\]
-		TeamChanged(T::AssetId, T::AccountId, T::AccountId, T::AccountId),
-		/// The owner changed \[asset_id, owner\]
-		OwnerChanged(T::AssetId, T::AccountId),
-		/// Some assets was transferred by an admin. \[asset_id, from, to, amount\]
-		ForceTransferred(T::AssetId, T::AccountId, T::AccountId, T::Balance),
-		/// Some account `who` was frozen. \[asset_id, who\]
-		Frozen(T::AssetId, T::AccountId),
-		/// Some account `who` was thawed. \[asset_id, who\]
-		Thawed(T::AssetId, T::AccountId),
-		/// Some asset `asset_id` was frozen. \[asset_id\]
-		AssetFrozen(T::AssetId),
-		/// Some asset `asset_id` was thawed. \[asset_id\]
-		AssetThawed(T::AssetId),
-		/// An asset class was destroyed.
-		Destroyed(T::AssetId),
-		/// Some asset class was force-created. \[asset_id, owner\]
-		ForceCreated(T::AssetId, T::AccountId),
-		/// The maximum amount of zombies allowed has changed. \[asset_id, max_zombies\]
-		MaxZombiesChanged(T::AssetId, u32),
-		/// New metadata has been set for an asset. \[asset_id, name, symbol, decimals\]
-		MetadataSet(T::AssetId, Vec<u8>, Vec<u8>, u8),
-	}
+			Ok(())
+		}
 
-	#[deprecated(note = "use `Event` instead")]
-	pub type RawEvent<T> = Event<T>;
+		/// Cancel all of some asset approved for delegated transfer by a third-party account.
+		///
+		/// Origin must be Signed and there must be an approval in place between signer and
+		/// `delegate`.
+		///
+		/// Unreserves any deposit previously reserved by `approve_transfer` for the approval.
+		///
+		/// - `id`: The identifier of the asset.
+		/// - `delegate`: The account delegated permission to transfer asset.
+		///
+		/// Emits `ApprovalCancelled` on success.
+		///
+		/// Weight: `O(1)`
+		#[pallet::weight(T::WeightInfo::cancel_approval())]
+		pub(super) fn cancel_approval(
+			origin: OriginFor<T>,
+			#[pallet::compact] id: T::AssetId,
+			delegate: <T::Lookup as StaticLookup>::Source,
+		) -> DispatchResult {
+			let owner = ensure_signed(origin)?;
+			let delegate = T::Lookup::lookup(delegate)?;
+			let key = ApprovalKey { owner, delegate };
+			let approval = Approvals::<T>::take(id, &key).ok_or(Error::<T>::Unknown)?;
+			T::Currency::unreserve(&key.owner, approval.deposit);
 
-	#[pallet::error]
-	pub enum Error<T> {
-		/// Transfer amount should be non-zero.
-		AmountZero,
-		/// Account balance must be greater than or equal to the transfer amount.
-		BalanceLow,
-		/// Balance should be non-zero.
-		BalanceZero,
-		/// The signing account has no permission to do the operation.
-		NoPermission,
-		/// The given asset ID is unknown.
-		Unknown,
-		/// The origin account is frozen.
-		Frozen,
-		/// The asset ID is already taken.
-		InUse,
-		/// Too many zombie accounts in use.
-		TooManyZombies,
-		/// Attempt to destroy an asset class when non-zombie, reference-bearing accounts exist.
-		RefsLeft,
-		/// Invalid witness data given.
-		BadWitness,
-		/// Minimum balance should be non-zero.
-		MinBalanceZero,
-		/// A mint operation lead to an overflow.
-		Overflow,
-		/// Some internal state is broken.
-		BadState,
-		/// Invalid metadata given.
-		BadMetadata,
-	}
+			Self::deposit_event(Event::ApprovalCancelled(id, key.owner, key.delegate));
+			Ok(())
+		}
 
-	#[pallet::storage]
-	/// Details of an asset.
-	pub(super) type Asset<T: Config> = StorageMap<
-		_,
-		Blake2_128Concat,
-		T::AssetId,
-		AssetDetails<T::Balance, T::AccountId, BalanceOf<T>>
-	>;
-	#[pallet::storage]
-	/// The number of units of assets held by any given account.
-	pub(super) type Account<T: Config> = StorageDoubleMap<
-		_,
-		Blake2_128Concat,
-		T::AssetId,
-		Blake2_128Concat,
-		T::AccountId,
-		AssetBalance<T::Balance>,
-		ValueQuery
-	>;
-	#[pallet::storage]
-	/// Metadata of an asset.
-	pub(super) type Metadata<T: Config> = StorageMap<
-		_,
-		Blake2_128Concat,
-		T::AssetId,
-		AssetMetadata<BalanceOf<T>>,
-		ValueQuery
-	>;
-}
+		/// Cancel all of some asset approved for delegated transfer by a third-party account.
+		///
+		/// Origin must be either ForceOrigin or Signed origin with the signer being the Admin
+		/// account of the asset `id`.
+		///
+		/// Unreserves any deposit previously reserved by `approve_transfer` for the approval.
+		///
+		/// - `id`: The identifier of the asset.
+		/// - `delegate`: The account delegated permission to transfer asset.
+		///
+		/// Emits `ApprovalCancelled` on success.
+		///
+		/// Weight: `O(1)`
+		#[pallet::weight(T::WeightInfo::force_cancel_approval())]
+		pub(super) fn force_cancel_approval(
+			origin: OriginFor<T>,
+			#[pallet::compact] id: T::AssetId,
+			owner: <T::Lookup as StaticLookup>::Source,
+			delegate: <T::Lookup as StaticLookup>::Source,
+		) -> DispatchResult {
+			T::ForceOrigin::try_origin(origin)
+				.map(|_| ())
+				.or_else(|origin| -> DispatchResult {
+					let origin = ensure_signed(origin)?;
+					let d = Asset::<T>::get(id).ok_or(Error::<T>::Unknown)?;
+					ensure!(&origin == &d.admin, Error::<T>::NoPermission);
+					Ok(())
+				})?;
 
-#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug)]
-pub struct AssetDetails<
-	Balance: Encode + Decode + Clone + Debug + Eq + PartialEq,
-	AccountId: Encode + Decode + Clone + Debug + Eq + PartialEq,
-	DepositBalance: Encode + Decode + Clone + Debug + Eq + PartialEq,
-> {
-	/// Can change `owner`, `issuer`, `freezer` and `admin` accounts.
-	owner: AccountId,
-	/// Can mint tokens.
-	issuer: AccountId,
-	/// Can thaw tokens, force transfers and burn tokens from any account.
-	admin: AccountId,
-	/// Can freeze tokens.
-	freezer: AccountId,
-	/// The total supply across all accounts.
-	supply: Balance,
-	/// The balance deposited for this asset.
-	///
-	/// This pays for the data stored here together with any virtual accounts.
-	deposit: DepositBalance,
-	/// The number of balance-holding accounts that this asset may have, excluding those that were
-	/// created when they had a system-level ED.
-	max_zombies: u32,
-	/// The ED for virtual accounts.
-	min_balance: Balance,
-	/// The current number of zombie accounts.
-	zombies: u32,
-	/// The total number of accounts.
-	accounts: u32,
-	/// Whether the asset is frozen for permissionless transfers.
-	is_frozen: bool,
-}
+			let owner = T::Lookup::lookup(owner)?;
+			let delegate = T::Lookup::lookup(delegate)?;
 
-#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default)]
-pub struct AssetBalance<
-	Balance: Encode + Decode + Clone + Debug + Eq + PartialEq,
-> {
-	/// The balance.
-	balance: Balance,
-	/// Whether the account is frozen.
-	is_frozen: bool,
-	/// Whether the account is a zombie. If not, then it has a reference.
-	is_zombie: bool,
-}
+			let key = ApprovalKey { owner, delegate };
+			let approval = Approvals::<T>::take(id, &key).ok_or(Error::<T>::Unknown)?;
+			T::Currency::unreserve(&key.owner, approval.deposit);
 
-#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default)]
-pub struct AssetMetadata<DepositBalance> {
-	/// The balance deposited for this metadata.
-	///
-	/// This pays for the data stored in this struct.
-	deposit: DepositBalance,
-	/// The user friendly name of this asset. Limited in length by `StringLimit`.
-	name: Vec<u8>,
-	/// The ticker symbol for this asset. Limited in length by `StringLimit`.
-	symbol: Vec<u8>,
-	/// The number of decimals this asset uses to represent one unit.
-	decimals: u8,
+			Self::deposit_event(Event::ApprovalCancelled(id, key.owner, key.delegate));
+			Ok(())
+		}
+
+		/// Transfer some asset balance from a previously delegated account to some third-party
+		/// account.
+		///
+		/// Origin must be Signed and there must be an approval in place by the `owner` to the
+		/// signer.
+		///
+		/// If the entire amount approved for transfer is transferred, then any deposit previously
+		/// reserved by `approve_transfer` is unreserved.
+		///
+		/// - `id`: The identifier of the asset.
+		/// - `owner`: The account which previously approved for a transfer of at least `amount` and
+		/// from which the asset balance will be withdrawn.
+		/// - `destination`: The account to which the asset balance of `amount` will be transferred.
+		/// - `amount`: The amount of assets to transfer.
+		///
+		/// Emits `TransferredApproved` on success.
+		///
+		/// Weight: `O(1)`
+		#[pallet::weight(T::WeightInfo::transfer_approved())]
+		pub(super) fn transfer_approved(
+			origin: OriginFor<T>,
+			#[pallet::compact] id: T::AssetId,
+			owner: <T::Lookup as StaticLookup>::Source,
+			destination: <T::Lookup as StaticLookup>::Source,
+			#[pallet::compact] amount: T::Balance,
+		) -> DispatchResult {
+			let delegate = ensure_signed(origin)?;
+			let owner = T::Lookup::lookup(owner)?;
+			let destination = T::Lookup::lookup(destination)?;
+
+			let key = ApprovalKey { owner, delegate };
+			Approvals::<T>::try_mutate_exists(id, &key, |maybe_approved| -> DispatchResult {
+				let mut approved = maybe_approved.take().ok_or(Error::<T>::Unapproved)?;
+				let remaining = approved.amount.checked_sub(&amount).ok_or(Error::<T>::Unapproved)?;
+
+				Self::do_transfer(id, &key.owner, &destination, amount, None, false)?;
+
+				if remaining.is_zero() {
+					T::Currency::unreserve(&key.owner, approved.deposit);
+				} else {
+					approved.amount = remaining;
+					*maybe_approved = Some(approved);
+				}
+				Ok(())
+			})?;
+			let event = Event::TransferredApproved(id, key.owner, key.delegate, destination, amount);
+			Self::deposit_event(event);
+			Ok(())
+		}
+	}
 }
 
 // The main implementation block for the module.
@@ -1088,546 +1369,92 @@ impl<T: Config> Pallet<T> {
 		Asset::<T>::get(id).map(|x| x.supply).unwrap_or_else(Zero::zero)
 	}
 
-	/// Check the number of zombies allow yet for an asset.
-	pub fn zombie_allowance(id: T::AssetId) -> u32 {
-		Asset::<T>::get(id).map(|x| x.max_zombies - x.zombies).unwrap_or_else(Zero::zero)
-	}
-
 	fn new_account(
 		who: &T::AccountId,
-		d: &mut AssetDetails<T::Balance, T::AccountId, BalanceOf<T>>,
+		d: &mut AssetDetails<T::Balance, T::AccountId, DepositBalanceOf<T>>,
 	) -> Result<bool, DispatchError> {
 		let accounts = d.accounts.checked_add(1).ok_or(Error::<T>::Overflow)?;
-		let r = Ok(if frame_system::Module::<T>::account_exists(who) {
-			frame_system::Module::<T>::inc_consumers(who).map_err(|_| Error::<T>::BadState)?;
-			false
-		} else {
-			ensure!(d.zombies < d.max_zombies, Error::<T>::TooManyZombies);
-			d.zombies += 1;
+		let is_sufficient = if d.is_sufficient {
+			frame_system::Module::<T>::inc_sufficients(who);
+			d.sufficients += 1;
 			true
-		});
+		} else {
+			frame_system::Module::<T>::inc_consumers(who).map_err(|_| Error::<T>::NoProvider)?;
+			false
+		};
 		d.accounts = accounts;
-		r
-	}
-
-	/// If `who`` exists in system and it's a zombie, dezombify it.
-	fn dezombify(
-		who: &T::AccountId,
-		d: &mut AssetDetails<T::Balance, T::AccountId, BalanceOf<T>>,
-		is_zombie: &mut bool,
-	) {
-		if *is_zombie && frame_system::Module::<T>::account_exists(who) {
-			// If the account exists, then it should have at least one provider
-			// so this cannot fail... but being defensive anyway.
-			let _ = frame_system::Module::<T>::inc_consumers(who);
-			*is_zombie = false;
-			d.zombies = d.zombies.saturating_sub(1);
-		}
+		Ok(is_sufficient)
 	}
 
 	fn dead_account(
 		who: &T::AccountId,
-		d: &mut AssetDetails<T::Balance, T::AccountId, BalanceOf<T>>,
-		is_zombie: bool,
+		d: &mut AssetDetails<T::Balance, T::AccountId, DepositBalanceOf<T>>,
+		sufficient: bool,
 	) {
-		if is_zombie {
-			d.zombies = d.zombies.saturating_sub(1);
+		if sufficient {
+			d.sufficients = d.sufficients.saturating_sub(1);
+			frame_system::Module::<T>::dec_sufficients(who);
 		} else {
 			frame_system::Module::<T>::dec_consumers(who);
 		}
 		d.accounts = d.accounts.saturating_sub(1);
 	}
-}
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate as pallet_assets;
-
-	use frame_support::{assert_ok, assert_noop, parameter_types};
-	use sp_core::H256;
-	use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
-	use pallet_balances::Error as BalancesError;
-
-	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
-	type Block = frame_system::mocking::MockBlock<Test>;
-
-	frame_support::construct_runtime!(
-		pub enum Test where
-			Block = Block,
-			NodeBlock = Block,
-			UncheckedExtrinsic = UncheckedExtrinsic,
-		{
-			System: frame_system::{Module, Call, Config, Storage, Event<T>},
-			Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
-			Assets: pallet_assets::{Module, Call, Storage, Event<T>},
-		}
-	);
-
-	parameter_types! {
-		pub const BlockHashCount: u64 = 250;
-	}
-	impl frame_system::Config for Test {
-		type BaseCallFilter = ();
-		type BlockWeights = ();
-		type BlockLength = ();
-		type DbWeight = ();
-		type Origin = Origin;
-		type Index = u64;
-		type Call = Call;
-		type BlockNumber = u64;
-		type Hash = H256;
-		type Hashing = BlakeTwo256;
-		type AccountId = u64;
-		type Lookup = IdentityLookup<Self::AccountId>;
-		type Header = Header;
-		type Event = Event;
-		type BlockHashCount = BlockHashCount;
-		type Version = ();
-		type PalletInfo = PalletInfo;
-		type AccountData = pallet_balances::AccountData<u64>;
-		type OnNewAccount = ();
-		type OnKilledAccount = ();
-		type SystemWeightInfo = ();
-		type SS58Prefix = ();
-	}
-
-	parameter_types! {
-		pub const ExistentialDeposit: u64 = 1;
-	}
-
-	impl pallet_balances::Config for Test {
-		type MaxLocks = ();
-		type Balance = u64;
-		type DustRemoval = ();
-		type Event = Event;
-		type ExistentialDeposit = ExistentialDeposit;
-		type AccountStore = System;
-		type WeightInfo = ();
-	}
-
-	parameter_types! {
-		pub const AssetDepositBase: u64 = 1;
-		pub const AssetDepositPerZombie: u64 = 1;
-		pub const StringLimit: u32 = 50;
-		pub const MetadataDepositBase: u64 = 1;
-		pub const MetadataDepositPerByte: u64 = 1;
-	}
-
-	impl Config for Test {
-		type Currency = Balances;
-		type Event = Event;
-		type Balance = u64;
-		type AssetId = u32;
-		type ForceOrigin = frame_system::EnsureRoot<u64>;
-		type AssetDepositBase = AssetDepositBase;
-		type AssetDepositPerZombie = AssetDepositPerZombie;
-		type StringLimit = StringLimit;
-		type MetadataDepositBase = MetadataDepositBase;
-		type MetadataDepositPerByte = MetadataDepositPerByte;
-		type WeightInfo = ();
-	}
-
-	pub(crate) fn new_test_ext() -> sp_io::TestExternalities {
-		frame_system::GenesisConfig::default().build_storage::<Test>().unwrap().into()
-	}
-
-	#[test]
-	fn basic_minting_should_work() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 1));
-			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
-			assert_eq!(Assets::balance(0, 1), 100);
-			assert_ok!(Assets::mint(Origin::signed(1), 0, 2, 100));
-			assert_eq!(Assets::balance(0, 2), 100);
-		});
-	}
-
-	#[test]
-	fn lifecycle_should_work() {
-		new_test_ext().execute_with(|| {
-			Balances::make_free_balance_be(&1, 100);
-			assert_ok!(Assets::create(Origin::signed(1), 0, 1, 10, 1));
-			assert_eq!(Balances::reserved_balance(&1), 11);
-			assert!(Asset::<Test>::contains_key(0));
-
-			assert_ok!(Assets::set_metadata(Origin::signed(1), 0, vec![0], vec![0], 12));
-			assert_eq!(Balances::reserved_balance(&1), 14);
-			assert!(Metadata::<Test>::contains_key(0));
-
-			assert_ok!(Assets::mint(Origin::signed(1), 0, 10, 100));
-			assert_ok!(Assets::mint(Origin::signed(1), 0, 20, 100));
-			assert_eq!(Account::<Test>::iter_prefix(0).count(), 2);
-
-			assert_ok!(Assets::destroy(Origin::signed(1), 0, 100));
-			assert_eq!(Balances::reserved_balance(&1), 0);
-
-			assert!(!Asset::<Test>::contains_key(0));
-			assert!(!Metadata::<Test>::contains_key(0));
-			assert_eq!(Account::<Test>::iter_prefix(0).count(), 0);
-
-			assert_ok!(Assets::create(Origin::signed(1), 0, 1, 10, 1));
-			assert_eq!(Balances::reserved_balance(&1), 11);
-			assert!(Asset::<Test>::contains_key(0));
-
-			assert_ok!(Assets::set_metadata(Origin::signed(1), 0, vec![0], vec![0], 12));
-			assert_eq!(Balances::reserved_balance(&1), 14);
-			assert!(Metadata::<Test>::contains_key(0));
-
-			assert_ok!(Assets::mint(Origin::signed(1), 0, 10, 100));
-			assert_ok!(Assets::mint(Origin::signed(1), 0, 20, 100));
-			assert_eq!(Account::<Test>::iter_prefix(0).count(), 2);
-
-			assert_ok!(Assets::force_destroy(Origin::root(), 0, 100));
-			assert_eq!(Balances::reserved_balance(&1), 0);
-
-			assert!(!Asset::<Test>::contains_key(0));
-			assert!(!Metadata::<Test>::contains_key(0));
-			assert_eq!(Account::<Test>::iter_prefix(0).count(), 0);
-		});
-	}
-
-	#[test]
-	fn destroy_with_non_zombies_should_not_work() {
-		new_test_ext().execute_with(|| {
-			Balances::make_free_balance_be(&1, 100);
-			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 1));
-			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
-			assert_noop!(Assets::destroy(Origin::signed(1), 0, 100), Error::<Test>::RefsLeft);
-			assert_noop!(Assets::force_destroy(Origin::root(), 0, 100), Error::<Test>::RefsLeft);
-			assert_ok!(Assets::burn(Origin::signed(1), 0, 1, 100));
-			assert_ok!(Assets::destroy(Origin::signed(1), 0, 100));
-		});
-	}
-
-	#[test]
-	fn destroy_with_bad_witness_should_not_work() {
-		new_test_ext().execute_with(|| {
-			Balances::make_free_balance_be(&1, 100);
-			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 1));
-			assert_ok!(Assets::mint(Origin::signed(1), 0, 10, 100));
-			assert_noop!(Assets::destroy(Origin::signed(1), 0, 0), Error::<Test>::BadWitness);
-			assert_noop!(Assets::force_destroy(Origin::root(), 0, 0), Error::<Test>::BadWitness);
-		});
-	}
 
-	#[test]
-	fn max_zombies_should_work() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 2, 1));
-			assert_ok!(Assets::mint(Origin::signed(1), 0, 0, 100));
-			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
-
-			assert_eq!(Assets::zombie_allowance(0), 0);
-			assert_noop!(Assets::mint(Origin::signed(1), 0, 2, 100), Error::<Test>::TooManyZombies);
-			assert_noop!(Assets::transfer(Origin::signed(1), 0, 2, 50), Error::<Test>::TooManyZombies);
-			assert_noop!(Assets::force_transfer(Origin::signed(1), 0, 1, 2, 50), Error::<Test>::TooManyZombies);
-
-			Balances::make_free_balance_be(&3, 100);
-			assert_ok!(Assets::mint(Origin::signed(1), 0, 3, 100));
-
-			assert_ok!(Assets::transfer(Origin::signed(0), 0, 1, 100));
-			assert_eq!(Assets::zombie_allowance(0), 1);
-			assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 50));
-		});
-	}
-
-	#[test]
-	fn resetting_max_zombies_should_work() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 2, 1));
-			Balances::make_free_balance_be(&1, 100);
-			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
-			assert_ok!(Assets::mint(Origin::signed(1), 0, 2, 100));
-			assert_ok!(Assets::mint(Origin::signed(1), 0, 3, 100));
-
-			assert_eq!(Assets::zombie_allowance(0), 0);
-
-			assert_noop!(Assets::set_max_zombies(Origin::signed(1), 0, 1), Error::<Test>::TooManyZombies);
-
-			assert_ok!(Assets::set_max_zombies(Origin::signed(1), 0, 3));
-			assert_eq!(Assets::zombie_allowance(0), 1);
-		});
-	}
-
-	#[test]
-	fn dezombifying_should_work() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 10));
-			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
-			assert_eq!(Assets::zombie_allowance(0), 9);
-
-			// introduce a bit of balance for account 2.
-			Balances::make_free_balance_be(&2, 100);
-
-			// transfer 25 units, nothing changes.
-			assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 25));
-			assert_eq!(Assets::zombie_allowance(0), 9);
-
-			// introduce a bit of balance; this will create the account.
-			Balances::make_free_balance_be(&1, 100);
-
-			// now transferring 25 units will create it.
-			assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 25));
-			assert_eq!(Assets::zombie_allowance(0), 10);
-		});
-	}
-
-	#[test]
-	fn min_balance_should_work() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 10));
-			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
-			assert_eq!(Asset::<Test>::get(0).unwrap().accounts, 1);
-
-			// Cannot create a new account with a balance that is below minimum...
-			assert_noop!(Assets::mint(Origin::signed(1), 0, 2, 9), Error::<Test>::BalanceLow);
-			assert_noop!(Assets::transfer(Origin::signed(1), 0, 2, 9), Error::<Test>::BalanceLow);
-			assert_noop!(Assets::force_transfer(Origin::signed(1), 0, 1, 2, 9), Error::<Test>::BalanceLow);
-
-			// When deducting from an account to below minimum, it should be reaped.
-
-			assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 91));
-			assert!(Assets::balance(0, 1).is_zero());
-			assert_eq!(Assets::balance(0, 2), 100);
-			assert_eq!(Asset::<Test>::get(0).unwrap().accounts, 1);
-
-			assert_ok!(Assets::force_transfer(Origin::signed(1), 0, 2, 1, 91));
-			assert!(Assets::balance(0, 2).is_zero());
-			assert_eq!(Assets::balance(0, 1), 100);
-			assert_eq!(Asset::<Test>::get(0).unwrap().accounts, 1);
-
-			assert_ok!(Assets::burn(Origin::signed(1), 0, 1, 91));
-			assert!(Assets::balance(0, 1).is_zero());
-			assert_eq!(Asset::<Test>::get(0).unwrap().accounts, 0);
-		});
-	}
-
-	#[test]
-	fn querying_total_supply_should_work() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 1));
-			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
-			assert_eq!(Assets::balance(0, 1), 100);
-			assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 50));
-			assert_eq!(Assets::balance(0, 1), 50);
-			assert_eq!(Assets::balance(0, 2), 50);
-			assert_ok!(Assets::transfer(Origin::signed(2), 0, 3, 31));
-			assert_eq!(Assets::balance(0, 1), 50);
-			assert_eq!(Assets::balance(0, 2), 19);
-			assert_eq!(Assets::balance(0, 3), 31);
-			assert_ok!(Assets::burn(Origin::signed(1), 0, 3, u64::max_value()));
-			assert_eq!(Assets::total_supply(0), 69);
-		});
-	}
-
-	#[test]
-	fn transferring_amount_below_available_balance_should_work() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 1));
-			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
-			assert_eq!(Assets::balance(0, 1), 100);
-			assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 50));
-			assert_eq!(Assets::balance(0, 1), 50);
-			assert_eq!(Assets::balance(0, 2), 50);
-		});
-	}
-
-	#[test]
-	fn transferring_frozen_user_should_not_work() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 1));
-			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
-			assert_eq!(Assets::balance(0, 1), 100);
-			assert_ok!(Assets::freeze(Origin::signed(1), 0, 1));
-			assert_noop!(Assets::transfer(Origin::signed(1), 0, 2, 50), Error::<Test>::Frozen);
-			assert_ok!(Assets::thaw(Origin::signed(1), 0, 1));
-			assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 50));
-		});
-	}
-
-	#[test]
-	fn transferring_frozen_asset_should_not_work() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 1));
-			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
-			assert_eq!(Assets::balance(0, 1), 100);
-			assert_ok!(Assets::freeze_asset(Origin::signed(1), 0));
-			assert_noop!(Assets::transfer(Origin::signed(1), 0, 2, 50), Error::<Test>::Frozen);
-			assert_ok!(Assets::thaw_asset(Origin::signed(1), 0));
-			assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 50));
-		});
-	}
-
-	#[test]
-	fn origin_guards_should_work() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 1));
-			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
-			assert_noop!(Assets::transfer_ownership(Origin::signed(2), 0, 2), Error::<Test>::NoPermission);
-			assert_noop!(Assets::set_team(Origin::signed(2), 0, 2, 2, 2), Error::<Test>::NoPermission);
-			assert_noop!(Assets::freeze(Origin::signed(2), 0, 1), Error::<Test>::NoPermission);
-			assert_noop!(Assets::thaw(Origin::signed(2), 0, 2), Error::<Test>::NoPermission);
-			assert_noop!(Assets::mint(Origin::signed(2), 0, 2, 100), Error::<Test>::NoPermission);
-			assert_noop!(Assets::burn(Origin::signed(2), 0, 1, 100), Error::<Test>::NoPermission);
-			assert_noop!(Assets::force_transfer(Origin::signed(2), 0, 1, 2, 100), Error::<Test>::NoPermission);
-			assert_noop!(Assets::set_max_zombies(Origin::signed(2), 0, 11), Error::<Test>::NoPermission);
-			assert_noop!(Assets::destroy(Origin::signed(2), 0, 100), Error::<Test>::NoPermission);
-		});
-	}
-
-	#[test]
-	fn transfer_owner_should_work() {
-		new_test_ext().execute_with(|| {
-			Balances::make_free_balance_be(&1, 100);
-			Balances::make_free_balance_be(&2, 1);
-			assert_ok!(Assets::create(Origin::signed(1), 0, 1, 10, 1));
-
-			assert_eq!(Balances::reserved_balance(&1), 11);
-
-			assert_ok!(Assets::transfer_ownership(Origin::signed(1), 0, 2));
-			assert_eq!(Balances::reserved_balance(&2), 11);
-			assert_eq!(Balances::reserved_balance(&1), 0);
-
-			assert_noop!(Assets::transfer_ownership(Origin::signed(1), 0, 1), Error::<Test>::NoPermission);
-
-			assert_ok!(Assets::transfer_ownership(Origin::signed(2), 0, 1));
-			assert_eq!(Balances::reserved_balance(&1), 11);
-			assert_eq!(Balances::reserved_balance(&2), 0);
-		});
-	}
-
-	#[test]
-	fn set_team_should_work() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 1));
-			assert_ok!(Assets::set_team(Origin::signed(1), 0, 2, 3, 4));
-
-			assert_ok!(Assets::mint(Origin::signed(2), 0, 2, 100));
-			assert_ok!(Assets::freeze(Origin::signed(4), 0, 2));
-			assert_ok!(Assets::thaw(Origin::signed(3), 0, 2));
-			assert_ok!(Assets::force_transfer(Origin::signed(3), 0, 2, 3, 100));
-			assert_ok!(Assets::burn(Origin::signed(3), 0, 3, 100));
-		});
-	}
-
-	#[test]
-	fn transferring_to_frozen_account_should_work() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 1));
-			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
-			assert_ok!(Assets::mint(Origin::signed(1), 0, 2, 100));
-			assert_eq!(Assets::balance(0, 1), 100);
-			assert_eq!(Assets::balance(0, 2), 100);
-			assert_ok!(Assets::freeze(Origin::signed(1), 0, 2));
-			assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 50));
-			assert_eq!(Assets::balance(0, 2), 150);
-		});
-	}
+	fn do_transfer(
+		id: T::AssetId,
+		source: &T::AccountId,
+		dest: &T::AccountId,
+		amount: T::Balance,
+		maybe_need_admin: Option<T::AccountId>,
+		keep_alive: bool,
+	) -> DispatchResult {
+		let mut source_account = Account::<T>::get(id, source);
+		ensure!(!source_account.is_frozen, Error::<T>::Frozen);
+
+		source_account.balance = source_account.balance.checked_sub(&amount)
+			.ok_or(Error::<T>::BalanceLow)?;
+
+		Asset::<T>::try_mutate(id, |maybe_details| {
+			let details = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
+			ensure!(!details.is_frozen, Error::<T>::Frozen);
+
+			if let Some(need_admin) = maybe_need_admin {
+				ensure!(&need_admin == &details.admin, Error::<T>::NoPermission);
+			}
 
-	#[test]
-	fn transferring_amount_more_than_available_balance_should_not_work() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 1));
-			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
-			assert_eq!(Assets::balance(0, 1), 100);
-			assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 50));
-			assert_eq!(Assets::balance(0, 1), 50);
-			assert_eq!(Assets::balance(0, 2), 50);
-			assert_ok!(Assets::burn(Origin::signed(1), 0, 1, u64::max_value()));
-			assert_eq!(Assets::balance(0, 1), 0);
-			assert_noop!(Assets::transfer(Origin::signed(1), 0, 1, 50), Error::<Test>::BalanceLow);
-			assert_noop!(Assets::transfer(Origin::signed(2), 0, 1, 51), Error::<Test>::BalanceLow);
-		});
-	}
+			if dest == source || amount.is_zero() {
+				return Ok(())
+			}
 
-	#[test]
-	fn transferring_less_than_one_unit_should_not_work() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 1));
-			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
-			assert_eq!(Assets::balance(0, 1), 100);
-			assert_noop!(Assets::transfer(Origin::signed(1), 0, 2, 0), Error::<Test>::AmountZero);
-		});
-	}
+			let mut amount = amount;
+			if source_account.balance < details.min_balance {
+				ensure!(!keep_alive, Error::<T>::WouldDie);
+				amount += source_account.balance;
+				source_account.balance = Zero::zero();
+			}
 
-	#[test]
-	fn transferring_more_units_than_total_supply_should_not_work() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 1));
-			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
-			assert_eq!(Assets::balance(0, 1), 100);
-			assert_noop!(Assets::transfer(Origin::signed(1), 0, 2, 101), Error::<Test>::BalanceLow);
-		});
-	}
+			Account::<T>::try_mutate(id, dest, |a| -> DispatchResult {
+				let new_balance = a.balance.saturating_add(amount);
 
-	#[test]
-	fn burning_asset_balance_with_positive_balance_should_work() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 1));
-			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
-			assert_eq!(Assets::balance(0, 1), 100);
-			assert_ok!(Assets::burn(Origin::signed(1), 0, 1, u64::max_value()));
-			assert_eq!(Assets::balance(0, 1), 0);
-		});
-	}
+				// This is impossible since `new_balance > amount > min_balance`, but we can
+				// handle it, so we do.
+				ensure!(new_balance >= details.min_balance, Error::<T>::BalanceLow);
 
-	#[test]
-	fn burning_asset_balance_with_zero_balance_should_not_work() {
-		new_test_ext().execute_with(|| {
-			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 1));
-			assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
-			assert_eq!(Assets::balance(0, 2), 0);
-			assert_noop!(Assets::burn(Origin::signed(1), 0, 2, u64::max_value()), Error::<Test>::BalanceZero);
-		});
-	}
+				if a.balance.is_zero() {
+					a.sufficient = Self::new_account(dest, details)?;
+				}
+				a.balance = new_balance;
+				Ok(())
+			})?;
+
+			if source_account.balance.is_zero() {
+				Self::dead_account(source, details, source_account.sufficient);
+				Account::<T>::remove(id, source);
+			} else {
+				Account::<T>::insert(id, source, &source_account)
+			}
 
-	#[test]
-	fn set_metadata_should_work() {
-		new_test_ext().execute_with(|| {
-			// Cannot add metadata to unknown asset
-			assert_noop!(
-				Assets::set_metadata(Origin::signed(1), 0, vec![0u8; 10], vec![0u8; 10], 12),
-				Error::<Test>::Unknown,
-			);
-			assert_ok!(Assets::force_create(Origin::root(), 0, 1, 10, 1));
-			// Cannot add metadata to unowned asset
-			assert_noop!(
-				Assets::set_metadata(Origin::signed(2), 0, vec![0u8; 10], vec![0u8; 10], 12),
-				Error::<Test>::NoPermission,
-			);
-
-			// Cannot add oversized metadata
-			assert_noop!(
-				Assets::set_metadata(Origin::signed(1), 0, vec![0u8; 100], vec![0u8; 10], 12),
-				Error::<Test>::BadMetadata,
-			);
-			assert_noop!(
-				Assets::set_metadata(Origin::signed(1), 0, vec![0u8; 10], vec![0u8; 100], 12),
-				Error::<Test>::BadMetadata,
-			);
-
-			// Successfully add metadata and take deposit
-			Balances::make_free_balance_be(&1, 30);
-			assert_ok!(Assets::set_metadata(Origin::signed(1), 0, vec![0u8; 10], vec![0u8; 10], 12));
-			assert_eq!(Balances::free_balance(&1), 9);
-
-			// Update deposit
-			assert_ok!(Assets::set_metadata(Origin::signed(1), 0, vec![0u8; 10], vec![0u8; 5], 12));
-			assert_eq!(Balances::free_balance(&1), 14);
-			assert_ok!(Assets::set_metadata(Origin::signed(1), 0, vec![0u8; 10], vec![0u8; 15], 12));
-			assert_eq!(Balances::free_balance(&1), 4);
-
-			// Cannot over-reserve
-			assert_noop!(
-				Assets::set_metadata(Origin::signed(1), 0, vec![0u8; 20], vec![0u8; 20], 12),
-				BalancesError::<Test, _>::InsufficientBalance,
-			);
-
-			// Clear Metadata
-			assert!(Metadata::<Test>::contains_key(0));
-			assert_ok!(Assets::set_metadata(Origin::signed(1), 0, vec![], vec![], 0));
-			assert!(!Metadata::<Test>::contains_key(0));
-		});
+			Ok(())
+		})
 	}
 }
diff --git a/frame/assets/src/mock.rs b/frame/assets/src/mock.rs
new file mode 100644
index 000000000000..434a7ccce075
--- /dev/null
+++ b/frame/assets/src/mock.rs
@@ -0,0 +1,112 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Test environment for Assets pallet.
+
+use super::*;
+use crate as pallet_assets;
+
+use sp_core::H256;
+use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
+use frame_support::{parameter_types, construct_runtime};
+
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
+		Assets: pallet_assets::{Module, Call, Storage, Event<T>},
+	}
+);
+
+parameter_types! {
+	pub const BlockHashCount: u64 = 250;
+}
+impl frame_system::Config for Test {
+	type BaseCallFilter = ();
+	type BlockWeights = ();
+	type BlockLength = ();
+	type Origin = Origin;
+	type Call = Call;
+	type Index = u64;
+	type BlockNumber = u64;
+	type Hash = H256;
+	type Hashing = BlakeTwo256;
+	type AccountId = u64;
+	type Lookup = IdentityLookup<Self::AccountId>;
+	type Header = Header;
+	type Event = Event;
+	type BlockHashCount = BlockHashCount;
+	type DbWeight = ();
+	type Version = ();
+	type PalletInfo = PalletInfo;
+	type AccountData = pallet_balances::AccountData<u64>;
+	type OnNewAccount = ();
+	type OnKilledAccount = ();
+	type SystemWeightInfo = ();
+	type SS58Prefix = ();
+}
+
+parameter_types! {
+	pub const ExistentialDeposit: u64 = 1;
+}
+
+impl pallet_balances::Config for Test {
+	type Balance = u64;
+	type DustRemoval = ();
+	type Event = Event;
+	type ExistentialDeposit = ExistentialDeposit;
+	type AccountStore = System;
+	type WeightInfo = ();
+	type MaxLocks = ();
+}
+
+parameter_types! {
+	pub const AssetDeposit: u64 = 1;
+	pub const ApprovalDeposit: u64 = 1;
+	pub const StringLimit: u32 = 50;
+	pub const MetadataDepositBase: u64 = 1;
+	pub const MetadataDepositPerByte: u64 = 1;
+}
+
+impl Config for Test {
+	type Event = Event;
+	type Balance = u64;
+	type AssetId = u32;
+	type Currency = Balances;
+	type ForceOrigin = frame_system::EnsureRoot<u64>;
+	type AssetDeposit = AssetDeposit;
+	type MetadataDepositBase = MetadataDepositBase;
+	type MetadataDepositPerByte = MetadataDepositPerByte;
+	type ApprovalDeposit = ApprovalDeposit;
+	type StringLimit = StringLimit;
+	type WeightInfo = ();
+}
+
+pub(crate) fn new_test_ext() -> sp_io::TestExternalities {
+	let t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+
+	let mut ext = sp_io::TestExternalities::new(t);
+	ext.execute_with(|| System::set_block_number(1));
+	ext
+}
diff --git a/frame/assets/src/tests.rs b/frame/assets/src/tests.rs
new file mode 100644
index 000000000000..89173b64d589
--- /dev/null
+++ b/frame/assets/src/tests.rs
@@ -0,0 +1,493 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Tests for Assets pallet.
+
+use super::*;
+use crate::{Error, mock::*};
+use frame_support::{assert_ok, assert_noop, traits::Currency};
+use pallet_balances::Error as BalancesError;
+
+fn last_event() -> mock::Event {
+	frame_system::Module::<Test>::events().pop().expect("Event expected").event
+}
+
+#[test]
+fn basic_minting_should_work() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
+		assert_eq!(Assets::balance(0, 1), 100);
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 2, 100));
+		assert_eq!(Assets::balance(0, 2), 100);
+	});
+}
+
+#[test]
+fn approval_lifecycle_works() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
+		Balances::make_free_balance_be(&1, 1);
+		assert_ok!(Assets::approve_transfer(Origin::signed(1), 0, 2, 50));
+		assert_eq!(Balances::reserved_balance(&1), 1);
+		assert_ok!(Assets::transfer_approved(Origin::signed(2), 0, 1, 3, 40));
+		assert_ok!(Assets::cancel_approval(Origin::signed(1), 0, 2));
+		assert_eq!(Assets::balance(0, 1), 60);
+		assert_eq!(Assets::balance(0, 3), 40);
+		assert_eq!(Balances::reserved_balance(&1), 0);
+	});
+}
+
+#[test]
+fn approval_deposits_work() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
+		let e = BalancesError::<Test>::InsufficientBalance;
+		assert_noop!(Assets::approve_transfer(Origin::signed(1), 0, 2, 50), e);
+
+		Balances::make_free_balance_be(&1, 1);
+		assert_ok!(Assets::approve_transfer(Origin::signed(1), 0, 2, 50));
+		assert_eq!(Balances::reserved_balance(&1), 1);
+
+		assert_ok!(Assets::transfer_approved(Origin::signed(2), 0, 1, 3, 50));
+		assert_eq!(Balances::reserved_balance(&1), 0);
+
+		assert_ok!(Assets::approve_transfer(Origin::signed(1), 0, 2, 50));
+		assert_ok!(Assets::cancel_approval(Origin::signed(1), 0, 2));
+		assert_eq!(Balances::reserved_balance(&1), 0);
+	});
+}
+
+#[test]
+fn cannot_transfer_more_than_approved() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
+		Balances::make_free_balance_be(&1, 1);
+		assert_ok!(Assets::approve_transfer(Origin::signed(1), 0, 2, 50));
+		let e = Error::<Test>::Unapproved;
+		assert_noop!(Assets::transfer_approved(Origin::signed(2), 0, 1, 3, 51), e);
+	});
+}
+
+#[test]
+fn cannot_transfer_more_than_exists() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
+		Balances::make_free_balance_be(&1, 1);
+		assert_ok!(Assets::approve_transfer(Origin::signed(1), 0, 2, 101));
+		let e = Error::<Test>::BalanceLow;
+		assert_noop!(Assets::transfer_approved(Origin::signed(2), 0, 1, 3, 101), e);
+	});
+}
+
+#[test]
+fn cancel_approval_works() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
+		Balances::make_free_balance_be(&1, 1);
+		assert_ok!(Assets::approve_transfer(Origin::signed(1), 0, 2, 50));
+		assert_noop!(Assets::cancel_approval(Origin::signed(1), 1, 2), Error::<Test>::Unknown);
+		assert_noop!(Assets::cancel_approval(Origin::signed(2), 0, 2), Error::<Test>::Unknown);
+		assert_noop!(Assets::cancel_approval(Origin::signed(1), 0, 3), Error::<Test>::Unknown);
+		assert_ok!(Assets::cancel_approval(Origin::signed(1), 0, 2));
+		assert_noop!(Assets::cancel_approval(Origin::signed(1), 0, 2), Error::<Test>::Unknown);
+	});
+}
+
+#[test]
+fn force_cancel_approval_works() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
+		Balances::make_free_balance_be(&1, 1);
+		assert_ok!(Assets::approve_transfer(Origin::signed(1), 0, 2, 50));
+		let e = Error::<Test>::NoPermission;
+		assert_noop!(Assets::force_cancel_approval(Origin::signed(2), 0, 1, 2), e);
+		assert_noop!(Assets::force_cancel_approval(Origin::signed(1), 1, 1, 2), Error::<Test>::Unknown);
+		assert_noop!(Assets::force_cancel_approval(Origin::signed(1), 0, 2, 2), Error::<Test>::Unknown);
+		assert_noop!(Assets::force_cancel_approval(Origin::signed(1), 0, 1, 3), Error::<Test>::Unknown);
+		assert_ok!(Assets::force_cancel_approval(Origin::signed(1), 0, 1, 2));
+		assert_noop!(Assets::force_cancel_approval(Origin::signed(1), 0, 1, 2), Error::<Test>::Unknown);
+	});
+}
+
+#[test]
+fn lifecycle_should_work() {
+	new_test_ext().execute_with(|| {
+		Balances::make_free_balance_be(&1, 100);
+		assert_ok!(Assets::create(Origin::signed(1), 0, 1, 1));
+		assert_eq!(Balances::reserved_balance(&1), 1);
+		assert!(Asset::<Test>::contains_key(0));
+
+		assert_ok!(Assets::set_metadata(Origin::signed(1), 0, vec![0], vec![0], 12));
+		assert_eq!(Balances::reserved_balance(&1), 4);
+		assert!(Metadata::<Test>::contains_key(0));
+
+		Balances::make_free_balance_be(&10, 100);
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 10, 100));
+		Balances::make_free_balance_be(&20, 100);
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 20, 100));
+		assert_eq!(Account::<Test>::iter_prefix(0).count(), 2);
+
+		let w = Asset::<Test>::get(0).unwrap().destroy_witness();
+		assert_ok!(Assets::destroy(Origin::signed(1), 0, w));
+		assert_eq!(Balances::reserved_balance(&1), 0);
+
+		assert!(!Asset::<Test>::contains_key(0));
+		assert!(!Metadata::<Test>::contains_key(0));
+		assert_eq!(Account::<Test>::iter_prefix(0).count(), 0);
+
+		assert_ok!(Assets::create(Origin::signed(1), 0, 1, 1));
+		assert_eq!(Balances::reserved_balance(&1), 1);
+		assert!(Asset::<Test>::contains_key(0));
+
+		assert_ok!(Assets::set_metadata(Origin::signed(1), 0, vec![0], vec![0], 12));
+		assert_eq!(Balances::reserved_balance(&1), 4);
+		assert!(Metadata::<Test>::contains_key(0));
+
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 10, 100));
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 20, 100));
+		assert_eq!(Account::<Test>::iter_prefix(0).count(), 2);
+
+		let w = Asset::<Test>::get(0).unwrap().destroy_witness();
+		assert_ok!(Assets::destroy(Origin::root(), 0, w));
+		assert_eq!(Balances::reserved_balance(&1), 0);
+
+		assert!(!Asset::<Test>::contains_key(0));
+		assert!(!Metadata::<Test>::contains_key(0));
+		assert_eq!(Account::<Test>::iter_prefix(0).count(), 0);
+	});
+}
+
+#[test]
+fn destroy_with_bad_witness_should_not_work() {
+	new_test_ext().execute_with(|| {
+		Balances::make_free_balance_be(&1, 100);
+		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
+		let w = Asset::<Test>::get(0).unwrap().destroy_witness();
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 10, 100));
+		assert_noop!(Assets::destroy(Origin::signed(1), 0, w), Error::<Test>::BadWitness);
+	});
+}
+
+#[test]
+fn non_providing_should_work() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Assets::force_create(Origin::root(), 0, 1, false, 1));
+
+		Balances::make_free_balance_be(&0, 100);
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 0, 100));
+
+		// Cannot mint into account 2 since it doesn't (yet) exist...
+		assert_noop!(Assets::mint(Origin::signed(1), 0, 1, 100), Error::<Test>::NoProvider);
+		// ...or transfer...
+		assert_noop!(Assets::transfer(Origin::signed(0), 0, 1, 50), Error::<Test>::NoProvider);
+		// ...or force-transfer
+		assert_noop!(Assets::force_transfer(Origin::signed(1), 0, 0, 1, 50), Error::<Test>::NoProvider);
+
+		Balances::make_free_balance_be(&1, 100);
+		Balances::make_free_balance_be(&2, 100);
+		assert_ok!(Assets::transfer(Origin::signed(0), 0, 1, 25));
+		assert_ok!(Assets::force_transfer(Origin::signed(1), 0, 0, 2, 25));
+	});
+}
+
+#[test]
+fn min_balance_should_work() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 10));
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
+		assert_eq!(Asset::<Test>::get(0).unwrap().accounts, 1);
+
+		// Cannot create a new account with a balance that is below minimum...
+		assert_noop!(Assets::mint(Origin::signed(1), 0, 2, 9), Error::<Test>::BalanceLow);
+		assert_noop!(Assets::transfer(Origin::signed(1), 0, 2, 9), Error::<Test>::BalanceLow);
+		assert_noop!(Assets::force_transfer(Origin::signed(1), 0, 1, 2, 9), Error::<Test>::BalanceLow);
+
+		// When deducting from an account to below minimum, it should be reaped.
+
+		assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 91));
+		assert!(Assets::balance(0, 1).is_zero());
+		assert_eq!(Assets::balance(0, 2), 100);
+		assert_eq!(Asset::<Test>::get(0).unwrap().accounts, 1);
+
+		assert_ok!(Assets::force_transfer(Origin::signed(1), 0, 2, 1, 91));
+		assert!(Assets::balance(0, 2).is_zero());
+		assert_eq!(Assets::balance(0, 1), 100);
+		assert_eq!(Asset::<Test>::get(0).unwrap().accounts, 1);
+
+		assert_ok!(Assets::burn(Origin::signed(1), 0, 1, 91));
+		assert!(Assets::balance(0, 1).is_zero());
+		assert_eq!(Asset::<Test>::get(0).unwrap().accounts, 0);
+	});
+}
+
+#[test]
+fn querying_total_supply_should_work() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
+		assert_eq!(Assets::balance(0, 1), 100);
+		assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 50));
+		assert_eq!(Assets::balance(0, 1), 50);
+		assert_eq!(Assets::balance(0, 2), 50);
+		assert_ok!(Assets::transfer(Origin::signed(2), 0, 3, 31));
+		assert_eq!(Assets::balance(0, 1), 50);
+		assert_eq!(Assets::balance(0, 2), 19);
+		assert_eq!(Assets::balance(0, 3), 31);
+		assert_ok!(Assets::burn(Origin::signed(1), 0, 3, u64::max_value()));
+		assert_eq!(Assets::total_supply(0), 69);
+	});
+}
+
+#[test]
+fn transferring_amount_below_available_balance_should_work() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
+		assert_eq!(Assets::balance(0, 1), 100);
+		assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 50));
+		assert_eq!(Assets::balance(0, 1), 50);
+		assert_eq!(Assets::balance(0, 2), 50);
+	});
+}
+
+#[test]
+fn transferring_enough_to_kill_source_when_keep_alive_should_fail() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 10));
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
+		assert_eq!(Assets::balance(0, 1), 100);
+		assert_noop!(Assets::transfer_keep_alive(Origin::signed(1), 0, 2, 91), Error::<Test>::WouldDie);
+		assert_ok!(Assets::transfer_keep_alive(Origin::signed(1), 0, 2, 90));
+		assert_eq!(Assets::balance(0, 1), 10);
+		assert_eq!(Assets::balance(0, 2), 90);
+	});
+}
+
+#[test]
+fn transferring_frozen_user_should_not_work() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
+		assert_eq!(Assets::balance(0, 1), 100);
+		assert_ok!(Assets::freeze(Origin::signed(1), 0, 1));
+		assert_noop!(Assets::transfer(Origin::signed(1), 0, 2, 50), Error::<Test>::Frozen);
+		assert_ok!(Assets::thaw(Origin::signed(1), 0, 1));
+		assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 50));
+	});
+}
+
+#[test]
+fn transferring_frozen_asset_should_not_work() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
+		assert_eq!(Assets::balance(0, 1), 100);
+		assert_ok!(Assets::freeze_asset(Origin::signed(1), 0));
+		assert_noop!(Assets::transfer(Origin::signed(1), 0, 2, 50), Error::<Test>::Frozen);
+		assert_ok!(Assets::thaw_asset(Origin::signed(1), 0));
+		assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 50));
+	});
+}
+
+#[test]
+fn origin_guards_should_work() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
+		assert_noop!(Assets::transfer_ownership(Origin::signed(2), 0, 2), Error::<Test>::NoPermission);
+		assert_noop!(Assets::set_team(Origin::signed(2), 0, 2, 2, 2), Error::<Test>::NoPermission);
+		assert_noop!(Assets::freeze(Origin::signed(2), 0, 1), Error::<Test>::NoPermission);
+		assert_noop!(Assets::thaw(Origin::signed(2), 0, 2), Error::<Test>::NoPermission);
+		assert_noop!(Assets::mint(Origin::signed(2), 0, 2, 100), Error::<Test>::NoPermission);
+		assert_noop!(Assets::burn(Origin::signed(2), 0, 1, 100), Error::<Test>::NoPermission);
+		assert_noop!(Assets::force_transfer(Origin::signed(2), 0, 1, 2, 100), Error::<Test>::NoPermission);
+		let w = Asset::<Test>::get(0).unwrap().destroy_witness();
+		assert_noop!(Assets::destroy(Origin::signed(2), 0, w), Error::<Test>::NoPermission);
+	});
+}
+
+#[test]
+fn transfer_owner_should_work() {
+	new_test_ext().execute_with(|| {
+		Balances::make_free_balance_be(&1, 100);
+		Balances::make_free_balance_be(&2, 100);
+		assert_ok!(Assets::create(Origin::signed(1), 0, 1, 1));
+
+		assert_eq!(Balances::reserved_balance(&1), 1);
+
+		assert_ok!(Assets::transfer_ownership(Origin::signed(1), 0, 2));
+		assert_eq!(Balances::reserved_balance(&2), 1);
+		assert_eq!(Balances::reserved_balance(&1), 0);
+
+		assert_noop!(Assets::transfer_ownership(Origin::signed(1), 0, 1), Error::<Test>::NoPermission);
+
+		// Set metadata now and make sure that deposit gets transferred back.
+		assert_ok!(Assets::set_metadata(Origin::signed(2), 0, vec![0u8; 10], vec![0u8; 10], 12));
+		assert_ok!(Assets::transfer_ownership(Origin::signed(2), 0, 1));
+		assert_eq!(Balances::reserved_balance(&1), 22);
+		assert_eq!(Balances::reserved_balance(&2), 0);
+	});
+}
+
+#[test]
+fn set_team_should_work() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
+		assert_ok!(Assets::set_team(Origin::signed(1), 0, 2, 3, 4));
+
+		assert_ok!(Assets::mint(Origin::signed(2), 0, 2, 100));
+		assert_ok!(Assets::freeze(Origin::signed(4), 0, 2));
+		assert_ok!(Assets::thaw(Origin::signed(3), 0, 2));
+		assert_ok!(Assets::force_transfer(Origin::signed(3), 0, 2, 3, 100));
+		assert_ok!(Assets::burn(Origin::signed(3), 0, 3, 100));
+	});
+}
+
+#[test]
+fn transferring_to_frozen_account_should_work() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 2, 100));
+		assert_eq!(Assets::balance(0, 1), 100);
+		assert_eq!(Assets::balance(0, 2), 100);
+		assert_ok!(Assets::freeze(Origin::signed(1), 0, 2));
+		assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 50));
+		assert_eq!(Assets::balance(0, 2), 150);
+	});
+}
+
+#[test]
+fn transferring_amount_more_than_available_balance_should_not_work() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
+		assert_eq!(Assets::balance(0, 1), 100);
+		assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 50));
+		assert_eq!(Assets::balance(0, 1), 50);
+		assert_eq!(Assets::balance(0, 2), 50);
+		assert_ok!(Assets::burn(Origin::signed(1), 0, 1, u64::max_value()));
+		assert_eq!(Assets::balance(0, 1), 0);
+		assert_noop!(Assets::transfer(Origin::signed(1), 0, 1, 50), Error::<Test>::BalanceLow);
+		assert_noop!(Assets::transfer(Origin::signed(2), 0, 1, 51), Error::<Test>::BalanceLow);
+	});
+}
+
+#[test]
+fn transferring_less_than_one_unit_is_fine() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
+		assert_eq!(Assets::balance(0, 1), 100);
+		assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 0));
+		assert_eq!(
+			last_event(),
+			mock::Event::pallet_assets(crate::Event::Transferred(0, 1, 2, 0)),
+		);
+	});
+}
+
+#[test]
+fn transferring_more_units_than_total_supply_should_not_work() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
+		assert_eq!(Assets::balance(0, 1), 100);
+		assert_noop!(Assets::transfer(Origin::signed(1), 0, 2, 101), Error::<Test>::BalanceLow);
+	});
+}
+
+#[test]
+fn burning_asset_balance_with_positive_balance_should_work() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
+		assert_eq!(Assets::balance(0, 1), 100);
+		assert_ok!(Assets::burn(Origin::signed(1), 0, 1, u64::max_value()));
+		assert_eq!(Assets::balance(0, 1), 0);
+	});
+}
+
+#[test]
+fn burning_asset_balance_with_zero_balance_should_not_work() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
+		assert_eq!(Assets::balance(0, 2), 0);
+		assert_noop!(Assets::burn(Origin::signed(1), 0, 2, u64::max_value()), Error::<Test>::BalanceZero);
+	});
+}
+
+#[test]
+fn set_metadata_should_work() {
+	new_test_ext().execute_with(|| {
+		// Cannot add metadata to unknown asset
+		assert_noop!(
+				Assets::set_metadata(Origin::signed(1), 0, vec![0u8; 10], vec![0u8; 10], 12),
+				Error::<Test>::Unknown,
+			);
+		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
+		// Cannot add metadata to unowned asset
+		assert_noop!(
+				Assets::set_metadata(Origin::signed(2), 0, vec![0u8; 10], vec![0u8; 10], 12),
+				Error::<Test>::NoPermission,
+			);
+
+		// Cannot add oversized metadata
+		assert_noop!(
+				Assets::set_metadata(Origin::signed(1), 0, vec![0u8; 100], vec![0u8; 10], 12),
+				Error::<Test>::BadMetadata,
+			);
+		assert_noop!(
+				Assets::set_metadata(Origin::signed(1), 0, vec![0u8; 10], vec![0u8; 100], 12),
+				Error::<Test>::BadMetadata,
+			);
+
+		// Successfully add metadata and take deposit
+		Balances::make_free_balance_be(&1, 30);
+		assert_ok!(Assets::set_metadata(Origin::signed(1), 0, vec![0u8; 10], vec![0u8; 10], 12));
+		assert_eq!(Balances::free_balance(&1), 9);
+
+		// Update deposit
+		assert_ok!(Assets::set_metadata(Origin::signed(1), 0, vec![0u8; 10], vec![0u8; 5], 12));
+		assert_eq!(Balances::free_balance(&1), 14);
+		assert_ok!(Assets::set_metadata(Origin::signed(1), 0, vec![0u8; 10], vec![0u8; 15], 12));
+		assert_eq!(Balances::free_balance(&1), 4);
+
+		// Cannot over-reserve
+		assert_noop!(
+				Assets::set_metadata(Origin::signed(1), 0, vec![0u8; 20], vec![0u8; 20], 12),
+				BalancesError::<Test, _>::InsufficientBalance,
+			);
+
+		// Clear Metadata
+		assert!(Metadata::<Test>::contains_key(0));
+		assert_noop!(Assets::clear_metadata(Origin::signed(2), 0), Error::<Test>::NoPermission);
+		assert_noop!(Assets::clear_metadata(Origin::signed(1), 1), Error::<Test>::Unknown);
+		assert_ok!(Assets::clear_metadata(Origin::signed(1), 0));
+		assert!(!Metadata::<Test>::contains_key(0));
+	});
+}
+
+// TODO: tests for force_set_metadata, force_clear_metadata, force_asset_status
diff --git a/frame/assets/src/weights.rs b/frame/assets/src/weights.rs
index 3056036642a7..c3c804a392db 100644
--- a/frame/assets/src/weights.rs
+++ b/frame/assets/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_assets
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.1
-//! DATE: 2021-01-18, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-03-08, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -46,11 +46,11 @@ use sp_std::marker::PhantomData;
 pub trait WeightInfo {
 	fn create() -> Weight;
 	fn force_create() -> Weight;
-	fn destroy(z: u32, ) -> Weight;
-	fn force_destroy(z: u32, ) -> Weight;
+	fn destroy(c: u32, s: u32, a: u32, ) -> Weight;
 	fn mint() -> Weight;
 	fn burn() -> Weight;
 	fn transfer() -> Weight;
+	fn transfer_keep_alive() -> Weight;
 	fn force_transfer() -> Weight;
 	fn freeze() -> Weight;
 	fn thaw() -> Weight;
@@ -58,100 +58,147 @@ pub trait WeightInfo {
 	fn thaw_asset() -> Weight;
 	fn transfer_ownership() -> Weight;
 	fn set_team() -> Weight;
-	fn set_max_zombies() -> Weight;
 	fn set_metadata(n: u32, s: u32, ) -> Weight;
+	fn clear_metadata() -> Weight;
+	fn force_set_metadata(n: u32, s: u32, ) -> Weight;
+	fn force_clear_metadata() -> Weight;
+	fn force_asset_status() -> Weight;
+	fn approve_transfer() -> Weight;
+	fn transfer_approved() -> Weight;
+	fn cancel_approval() -> Weight;
+	fn force_cancel_approval() -> Weight;
 }
 
 /// Weights for pallet_assets using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn create() -> Weight {
-		(44_459_000 as Weight)
+		(48_305_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_create() -> Weight {
-		(21_480_000 as Weight)
+		(23_827_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
-	fn destroy(z: u32, ) -> Weight {
+	fn destroy(c: u32, s: u32, a: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_149_000 as Weight).saturating_mul(z as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(z as Weight)))
-	}
-	fn force_destroy(z: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_146_000 as Weight).saturating_mul(z as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(z as Weight)))
+			// Standard Error: 38_000
+			.saturating_add((24_232_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 38_000
+			.saturating_add((30_467_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 383_000
+			.saturating_add((2_343_000 as Weight).saturating_mul(a as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(c as Weight)))
+			.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(s as Weight)))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(c as Weight)))
+			.saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(s as Weight)))
+			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(a as Weight)))
 	}
 	fn mint() -> Weight {
-		(32_995_000 as Weight)
+		(46_433_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn burn() -> Weight {
-		(29_245_000 as Weight)
+		(46_000_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn transfer() -> Weight {
-		(42_211_000 as Weight)
+		(70_793_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().writes(4 as Weight))
+	}
+	fn transfer_keep_alive() -> Weight {
+		(57_453_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn force_transfer() -> Weight {
-		(42_218_000 as Weight)
+		(70_968_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn freeze() -> Weight {
-		(31_079_000 as Weight)
+		(34_290_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn thaw() -> Weight {
-		(30_853_000 as Weight)
+		(34_419_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn freeze_asset() -> Weight {
-		(22_383_000 as Weight)
+		(24_373_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn thaw_asset() -> Weight {
-		(22_341_000 as Weight)
+		(24_096_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn transfer_ownership() -> Weight {
-		(22_782_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+		(28_566_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_team() -> Weight {
-		(23_293_000 as Weight)
+		(25_297_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
-	fn set_max_zombies() -> Weight {
-		(44_525_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+	fn set_metadata(_n: u32, s: u32, ) -> Weight {
+		(53_367_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((8_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
-	fn set_metadata(n: u32, s: u32, ) -> Weight {
-		(49_456_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((1_000 as Weight).saturating_mul(n as Weight))
+	fn clear_metadata() -> Weight {
+		(51_721_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn force_set_metadata(_n: u32, s: u32, ) -> Weight {
+		(27_117_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((6_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((5_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn force_clear_metadata() -> Weight {
+		(51_598_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn force_asset_status() -> Weight {
+		(23_366_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn approve_transfer() -> Weight {
+		(47_906_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn transfer_approved() -> Weight {
+		(90_338_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(5 as Weight))
+	}
+	fn cancel_approval() -> Weight {
+		(48_591_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn force_cancel_approval() -> Weight {
+		(54_879_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -160,92 +207,132 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn create() -> Weight {
-		(44_459_000 as Weight)
+		(48_305_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_create() -> Weight {
-		(21_480_000 as Weight)
+		(23_827_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
-	fn destroy(z: u32, ) -> Weight {
+	fn destroy(c: u32, s: u32, a: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_149_000 as Weight).saturating_mul(z as Weight))
-			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(z as Weight)))
-	}
-	fn force_destroy(z: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_146_000 as Weight).saturating_mul(z as Weight))
-			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(z as Weight)))
+			// Standard Error: 38_000
+			.saturating_add((24_232_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 38_000
+			.saturating_add((30_467_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 383_000
+			.saturating_add((2_343_000 as Weight).saturating_mul(a as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(c as Weight)))
+			.saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(s as Weight)))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((2 as Weight).saturating_mul(c as Weight)))
+			.saturating_add(RocksDbWeight::get().writes((2 as Weight).saturating_mul(s as Weight)))
+			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(a as Weight)))
 	}
 	fn mint() -> Weight {
-		(32_995_000 as Weight)
+		(46_433_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn burn() -> Weight {
-		(29_245_000 as Weight)
+		(46_000_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn transfer() -> Weight {
-		(42_211_000 as Weight)
+		(70_793_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
+	}
+	fn transfer_keep_alive() -> Weight {
+		(57_453_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn force_transfer() -> Weight {
-		(42_218_000 as Weight)
+		(70_968_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn freeze() -> Weight {
-		(31_079_000 as Weight)
+		(34_290_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn thaw() -> Weight {
-		(30_853_000 as Weight)
+		(34_419_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn freeze_asset() -> Weight {
-		(22_383_000 as Weight)
+		(24_373_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn thaw_asset() -> Weight {
-		(22_341_000 as Weight)
+		(24_096_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn transfer_ownership() -> Weight {
-		(22_782_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+		(28_566_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_team() -> Weight {
-		(23_293_000 as Weight)
+		(25_297_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
-	fn set_max_zombies() -> Weight {
-		(44_525_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+	fn set_metadata(_n: u32, s: u32, ) -> Weight {
+		(53_367_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((8_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
-	fn set_metadata(n: u32, s: u32, ) -> Weight {
-		(49_456_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((1_000 as Weight).saturating_mul(n as Weight))
+	fn clear_metadata() -> Weight {
+		(51_721_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn force_set_metadata(_n: u32, s: u32, ) -> Weight {
+		(27_117_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((6_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((5_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn force_clear_metadata() -> Weight {
+		(51_598_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn force_asset_status() -> Weight {
+		(23_366_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn approve_transfer() -> Weight {
+		(47_906_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn transfer_approved() -> Weight {
+		(90_338_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
+	}
+	fn cancel_approval() -> Weight {
+		(48_591_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn force_cancel_approval() -> Weight {
+		(54_879_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
diff --git a/frame/gilt/src/mock.rs b/frame/gilt/src/mock.rs
index 701c5c2f6d73..442b0bbfdb2d 100644
--- a/frame/gilt/src/mock.rs
+++ b/frame/gilt/src/mock.rs
@@ -50,7 +50,6 @@ impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type BlockWeights = ();
 	type BlockLength = ();
-	type DbWeight = ();
 	type Origin = Origin;
 	type Call = Call;
 	type Index = u64;
@@ -62,6 +61,7 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Event = Event;
 	type BlockHashCount = BlockHashCount;
+	type DbWeight = ();
 	type Version = ();
 	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<u64>;
@@ -76,13 +76,13 @@ parameter_types! {
 }
 
 impl pallet_balances::Config for Test {
-	type MaxLocks = ();
 	type Balance = u64;
 	type DustRemoval = ();
 	type Event = Event;
 	type ExistentialDeposit = ExistentialDeposit;
 	type AccountStore = System;
 	type WeightInfo = ();
+	type MaxLocks = ();
 }
 
 parameter_types! {

From e68ff138b57c47ee3aa822cdb1554d039694bb7a Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Tue, 9 Mar 2021 14:03:47 +0100
Subject: [PATCH 0473/1194] Introduce IgnoredIssuance into Gilts (#8299)

* IgnoredIssuance

* Fixes

* Fixes
---
 bin/node/runtime/src/lib.rs |  2 ++
 frame/gilt/src/lib.rs       | 14 ++++++++++----
 frame/gilt/src/mock.rs      |  5 ++++-
 frame/gilt/src/tests.rs     | 24 ++++++++++++++++++++++++
 4 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index ba7ed20fa9eb..b032fcb174e7 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -1046,6 +1046,7 @@ impl pallet_assets::Config for Runtime {
 }
 
 parameter_types! {
+	pub IgnoredIssuance: Balance = Treasury::pot();
 	pub const QueueCount: u32 = 300;
 	pub const MaxQueueLen: u32 = 1000;
 	pub const FifoQueueLen: u32 = 500;
@@ -1061,6 +1062,7 @@ impl pallet_gilt::Config for Runtime {
 	type AdminOrigin = frame_system::EnsureRoot<AccountId>;
 	type Deficit = ();
 	type Surplus = ();
+	type IgnoredIssuance = IgnoredIssuance;
 	type QueueCount = QueueCount;
 	type MaxQueueLen = MaxQueueLen;
 	type FifoQueueLen = FifoQueueLen;
diff --git a/frame/gilt/src/lib.rs b/frame/gilt/src/lib.rs
index 94d341f47f44..ab35ce76742b 100644
--- a/frame/gilt/src/lib.rs
+++ b/frame/gilt/src/lib.rs
@@ -109,6 +109,10 @@ pub mod pallet {
 		/// over freezing period).
 		type Surplus: OnUnbalanced<NegativeImbalanceOf<Self>>;
 
+		/// The issuance to ignore. This is subtracted from the `Currency`'s `total_issuance` to get
+		/// the issuance by which we inflate or deflate the gilt.
+		type IgnoredIssuance: Get<BalanceOf<Self>>;
+
 		/// Number of duration queues in total. This sets the maximum duration supported, which is
 		/// this value multiplied by `Period`.
 		#[pallet::constant]
@@ -191,7 +195,9 @@ pub mod pallet {
 	/// The way of determining the net issuance (i.e. after factoring in all maturing frozen funds)
 	/// is:
 	///
-	/// `total_issuance - frozen + proportion * total_issuance`
+	/// `issuance - frozen + proportion * issuance`
+	///
+	/// where `issuance = total_issuance - IgnoredIssuance`
 	#[derive(Clone, Eq, PartialEq, Default, Encode, Decode, RuntimeDebug)]
 	pub struct ActiveGiltsTotal<Balance> {
 		/// The total amount of funds held in reserve for all active gilts.
@@ -440,7 +446,7 @@ pub mod pallet {
 			Active::<T>::remove(index);
 
 			// Multiply the proportion it is by the total issued.
-			let total_issuance = T::Currency::total_issuance();
+			let total_issuance = T::Currency::total_issuance().saturating_sub(T::IgnoredIssuance::get());
 			ActiveTotal::<T>::mutate(|totals| {
 				let nongilt_issuance: u128 = total_issuance.saturating_sub(totals.frozen)
 					.saturated_into();
@@ -490,7 +496,7 @@ pub mod pallet {
 			if totals.proportion < totals.target {
 				let missing = totals.target.saturating_sub(totals.proportion);
 
-				let total_issuance = T::Currency::total_issuance();
+				let total_issuance = T::Currency::total_issuance().saturating_sub(T::IgnoredIssuance::get());
 				let nongilt_issuance: u128 = total_issuance.saturating_sub(totals.frozen)
 					.saturated_into();
 				let effective_issuance = totals.proportion.left_from_one()
@@ -515,7 +521,7 @@ pub mod pallet {
 			amount: BalanceOf<T>,
 			max_bids: u32,
 		) -> (u32, u32) {
-			let total_issuance = T::Currency::total_issuance();
+			let total_issuance = T::Currency::total_issuance().saturating_sub(T::IgnoredIssuance::get());
 			let mut remaining = amount;
 			let mut bids_taken = 0;
 			let mut queues_hit = 0;
diff --git a/frame/gilt/src/mock.rs b/frame/gilt/src/mock.rs
index 442b0bbfdb2d..ca4ccaff73c5 100644
--- a/frame/gilt/src/mock.rs
+++ b/frame/gilt/src/mock.rs
@@ -20,7 +20,8 @@
 use crate as pallet_gilt;
 
 use frame_support::{
-	parameter_types, ord_parameter_types, traits::{OnInitialize, OnFinalize, GenesisBuild},
+	parameter_types, ord_parameter_types,
+	traits::{OnInitialize, OnFinalize, GenesisBuild, Currency},
 };
 use sp_core::H256;
 use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
@@ -86,6 +87,7 @@ impl pallet_balances::Config for Test {
 }
 
 parameter_types! {
+	pub IgnoredIssuance: u64 = Balances::total_balance(&0); // Account zero is ignored.
 	pub const QueueCount: u32 = 3;
 	pub const MaxQueueLen: u32 = 3;
 	pub const FifoQueueLen: u32 = 1;
@@ -104,6 +106,7 @@ impl pallet_gilt::Config for Test {
 	type AdminOrigin = frame_system::EnsureSignedBy<One, Self::AccountId>;
 	type Deficit = ();
 	type Surplus = ();
+	type IgnoredIssuance = IgnoredIssuance;
 	type QueueCount = QueueCount;
 	type MaxQueueLen = MaxQueueLen;
 	type FifoQueueLen = FifoQueueLen;
diff --git a/frame/gilt/src/tests.rs b/frame/gilt/src/tests.rs
index 637a6a870597..2f328ba904bb 100644
--- a/frame/gilt/src/tests.rs
+++ b/frame/gilt/src/tests.rs
@@ -322,6 +322,30 @@ fn thaw_when_issuance_higher_works() {
 	});
 }
 
+#[test]
+fn thaw_with_ignored_issuance_works() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+		// Give account zero some balance.
+		Balances::make_free_balance_be(&0, 200);
+
+		assert_ok!(Gilt::place_bid(Origin::signed(1), 100, 1));
+		Gilt::enlarge(100, 1);
+
+		// Account zero transfers 50 into everyone else's accounts.
+		assert_ok!(Balances::transfer(Origin::signed(0), 2, 50));
+		assert_ok!(Balances::transfer(Origin::signed(0), 3, 50));
+		assert_ok!(Balances::transfer(Origin::signed(0), 4, 50));
+
+		run_to_block(4);
+		assert_ok!(Gilt::thaw(Origin::signed(1), 0));
+
+		// Account zero changes have been ignored.
+		assert_eq!(Balances::free_balance(1), 150);
+		assert_eq!(Balances::reserved_balance(1), 0);
+	});
+}
+
 #[test]
 fn thaw_when_issuance_lower_works() {
 	new_test_ext().execute_with(|| {

From a38c9489aa07fb795888f1533059310b34e7d2f9 Mon Sep 17 00:00:00 2001
From: Niklas Adolfsson <niklasadolfsson1@gmail.com>
Date: Tue, 9 Mar 2021 14:42:53 +0100
Subject: [PATCH 0474/1194] update jsonrpsee to fix a `allow(dead_code)`
 (#8302)

---
 Cargo.lock                                  | 8 ++++----
 utils/frame/remote-externalities/Cargo.toml | 4 ++--
 utils/frame/remote-externalities/src/lib.rs | 3 ---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b7228ae47b37..e8157daf0641 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2855,9 +2855,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-proc-macros"
-version = "0.2.0-alpha"
+version = "0.2.0-alpha.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9cd3d41f5b9a1d3e4e4c9ad49a7a34ad8e1134a1a587cd21c72f644f5c053dd"
+checksum = "3cb3f732ccbeafd15cefb59c7c7b5ac6c553c2653613b63e5e7feb7f06a219e9"
 dependencies = [
  "Inflector",
  "proc-macro2",
@@ -2867,9 +2867,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-types"
-version = "0.2.0-alpha"
+version = "0.2.0-alpha.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbf718f9a0d09f50621ea35f507679cf3ab66910a6d95844850076c1281a203c"
+checksum = "5a8cd20c190e75dc56f7543b9d5713c3186351b301b5507ea6b85d8c403aac78"
 dependencies = [
  "async-trait",
  "futures 0.3.12",
diff --git a/utils/frame/remote-externalities/Cargo.toml b/utils/frame/remote-externalities/Cargo.toml
index 8f3f40ec484e..de90933e1797 100644
--- a/utils/frame/remote-externalities/Cargo.toml
+++ b/utils/frame/remote-externalities/Cargo.toml
@@ -15,8 +15,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 jsonrpsee-http-client = { version = "0.2.0-alpha", default-features = false, features = ["tokio02"] }
 # Needed by jsonrpsee-proc-macros: https://github.com/paritytech/jsonrpsee/issues/214
-jsonrpsee-types = "0.2.0-alpha"
-jsonrpsee-proc-macros = "0.2.0-alpha"
+jsonrpsee-types = "0.2.0-alpha.2"
+jsonrpsee-proc-macros = "0.2.0-alpha.2"
 
 hex-literal = "0.3.1"
 env_logger = "0.8.2"
diff --git a/utils/frame/remote-externalities/src/lib.rs b/utils/frame/remote-externalities/src/lib.rs
index a8829a18133a..8211274c4629 100644
--- a/utils/frame/remote-externalities/src/lib.rs
+++ b/utils/frame/remote-externalities/src/lib.rs
@@ -101,9 +101,6 @@
 //! }
 //! ```
 
-// jsonrpsee_proc_macros generates faulty warnings: https://github.com/paritytech/jsonrpsee/issues/106
-#![allow(dead_code)]
-
 use std::{
 	fs,
 	path::{Path, PathBuf},

From 7e5c30709d0d6bae01e1eb9412d17cdf1620af7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 9 Mar 2021 14:43:19 +0100
Subject: [PATCH 0475/1194] Decrease the peer reputation on invalid block
 requests (#8260)

* Decrease the peer reputation on invalid block requests

This pr changes the block request handler to decrease the reputation of
peers when they send the same request multiple times or they send us an
invalid block request.

* Review feedback

* Change log target

* Remove unused code
---
 client/network/src/block_request_handler.rs | 140 +++++++++++++++++---
 client/network/src/gossip/tests.rs          |   1 +
 client/network/src/service/tests.rs         |   1 +
 client/network/test/src/lib.rs              |   6 +-
 client/service/src/builder.rs               |   2 +
 5 files changed, 127 insertions(+), 23 deletions(-)

diff --git a/client/network/src/block_request_handler.rs b/client/network/src/block_request_handler.rs
index 8faa6a7f6c11..85b4acf68748 100644
--- a/client/network/src/block_request_handler.rs
+++ b/client/network/src/block_request_handler.rs
@@ -24,19 +24,30 @@ use crate::protocol::{message::BlockAttributes};
 use crate::request_responses::{IncomingRequest, OutgoingResponse, ProtocolConfig};
 use crate::schema::v1::block_request::FromBlock;
 use crate::schema::v1::{BlockResponse, Direction};
+use crate::{PeerId, ReputationChange};
 use futures::channel::{mpsc, oneshot};
 use futures::stream::StreamExt;
 use log::debug;
+use lru::LruCache;
 use prost::Message;
 use sp_runtime::generic::BlockId;
 use sp_runtime::traits::{Block as BlockT, Header, One, Zero};
 use std::cmp::min;
-use std::sync::{Arc};
+use std::sync::Arc;
 use std::time::Duration;
+use std::hash::{Hasher, Hash};
 
-const LOG_TARGET: &str = "block-request-handler";
+const LOG_TARGET: &str = "sync";
 const MAX_BLOCKS_IN_RESPONSE: usize = 128;
 const MAX_BODY_BYTES: usize = 8 * 1024 * 1024;
+const MAX_NUMBER_OF_SAME_REQUESTS_PER_PEER: usize = 2;
+
+mod rep {
+	use super::ReputationChange as Rep;
+
+	/// Reputation change when a peer sent us the same request multiple times.
+	pub const SAME_REQUEST: Rep = Rep::new(i32::min_value(), "Same block request multiple times");
+}
 
 /// Generates a [`ProtocolConfig`] for the block request protocol, refusing incoming requests.
 pub fn generate_protocol_config(protocol_id: &ProtocolId) -> ProtocolConfig {
@@ -61,15 +72,45 @@ pub(crate) fn generate_protocol_name(protocol_id: &ProtocolId) -> String {
 	s
 }
 
+/// The key for [`BlockRequestHandler::seen_requests`].
+#[derive(Eq, PartialEq)]
+struct SeenRequestsKey<B: BlockT> {
+	peer: PeerId,
+	from: BlockId<B>,
+	max_blocks: usize,
+	direction: Direction,
+}
+
+impl<B: BlockT> Hash for SeenRequestsKey<B> {
+	fn hash<H: Hasher>(&self, state: &mut H) {
+		self.peer.hash(state);
+		self.max_blocks.hash(state);
+		self.direction.hash(state);
+
+		match self.from {
+			BlockId::Hash(h) => h.hash(state),
+			BlockId::Number(n) => n.hash(state),
+		}
+	}
+}
+
 /// Handler for incoming block requests from a remote peer.
-pub struct BlockRequestHandler<B> {
+pub struct BlockRequestHandler<B: BlockT> {
 	client: Arc<dyn Client<B>>,
 	request_receiver: mpsc::Receiver<IncomingRequest>,
+	/// Maps from request to number of times we have seen this request.
+	///
+	/// This is used to check if a peer is spamming us with the same request.
+	seen_requests: LruCache<SeenRequestsKey<B>, usize>,
 }
 
-impl <B: BlockT> BlockRequestHandler<B> {
+impl<B: BlockT> BlockRequestHandler<B> {
 	/// Create a new [`BlockRequestHandler`].
-	pub fn new(protocol_id: &ProtocolId, client: Arc<dyn Client<B>>) -> (Self, ProtocolConfig) {
+	pub fn new(
+		protocol_id: &ProtocolId,
+		client: Arc<dyn Client<B>>,
+		num_peer_hint: usize,
+	) -> (Self, ProtocolConfig) {
 		// Rate of arrival multiplied with the waiting time in the queue equals the queue length.
 		//
 		// An average Polkadot node serves less than 5 requests per second. The 95th percentile
@@ -82,7 +123,9 @@ impl <B: BlockT> BlockRequestHandler<B> {
 		let mut protocol_config = generate_protocol_config(protocol_id);
 		protocol_config.inbound_queue = Some(tx);
 
-		(Self { client, request_receiver }, protocol_config)
+		let seen_requests = LruCache::new(num_peer_hint * 2);
+
+		(Self { client, request_receiver, seen_requests }, protocol_config)
 	}
 
 	/// Run [`BlockRequestHandler`].
@@ -90,21 +133,23 @@ impl <B: BlockT> BlockRequestHandler<B> {
 		while let Some(request) = self.request_receiver.next().await {
 			let IncomingRequest { peer, payload, pending_response } = request;
 
-			match self.handle_request(payload, pending_response) {
+			match self.handle_request(payload, pending_response, &peer) {
 				Ok(()) => debug!(target: LOG_TARGET, "Handled block request from {}.", peer),
 				Err(e) => debug!(
 					target: LOG_TARGET,
 					"Failed to handle block request from {}: {}",
-					peer, e,
+					peer,
+					e,
 				),
 			}
 		}
 	}
 
 	fn handle_request(
-		&self,
+		&mut self,
 		payload: Vec<u8>,
-		pending_response: oneshot::Sender<OutgoingResponse>
+		pending_response: oneshot::Sender<OutgoingResponse>,
+		peer: &PeerId,
 	) -> Result<(), HandleRequestError> {
 		let request = crate::schema::v1::BlockRequest::decode(&payload[..])?;
 
@@ -127,16 +172,75 @@ impl <B: BlockT> BlockRequestHandler<B> {
 
 		let direction = Direction::from_i32(request.direction)
 			.ok_or(HandleRequestError::ParseDirection)?;
+
+		let key = SeenRequestsKey {
+			peer: *peer,
+			max_blocks,
+			direction,
+			from: from_block_id.clone(),
+		};
+
+		let mut reputation_changes = Vec::new();
+
+		if let Some(requests) = self.seen_requests.get_mut(&key) {
+			*requests = requests.saturating_add(1);
+
+			if *requests > MAX_NUMBER_OF_SAME_REQUESTS_PER_PEER {
+				reputation_changes.push(rep::SAME_REQUEST);
+			}
+		} else {
+			self.seen_requests.put(key, 1);
+		}
+
+		debug!(
+			target: LOG_TARGET,
+			"Handling block request from {}: Starting at `{:?}` with maximum blocks \
+			 of `{}` and direction `{:?}`.",
+			peer,
+			from_block_id,
+			max_blocks,
+			direction,
+		);
+
 		let attributes = BlockAttributes::from_be_u32(request.fields)?;
+
+		let result = if reputation_changes.is_empty() {
+			let block_response = self.get_block_response(
+				attributes,
+				from_block_id,
+				direction,
+				max_blocks,
+			)?;
+
+			let mut data = Vec::with_capacity(block_response.encoded_len());
+			block_response.encode(&mut data)?;
+
+			Ok(data)
+		} else {
+			Err(())
+		};
+
+		pending_response.send(OutgoingResponse {
+			result,
+			reputation_changes,
+		}).map_err(|_| HandleRequestError::SendResponse)
+	}
+
+	fn get_block_response(
+		&self,
+		attributes: BlockAttributes,
+		mut block_id: BlockId<B>,
+		direction: Direction,
+		max_blocks: usize,
+	) -> Result<BlockResponse, HandleRequestError> {
 		let get_header = attributes.contains(BlockAttributes::HEADER);
 		let get_body = attributes.contains(BlockAttributes::BODY);
 		let get_justification = attributes.contains(BlockAttributes::JUSTIFICATION);
 
 		let mut blocks = Vec::new();
-		let mut block_id = from_block_id;
 
 		let mut total_size: usize = 0;
-		while let Some(header) = self.client.header(block_id).unwrap_or(None) {
+		while let Some(header) = self.client.header(block_id).unwrap_or_default() {
 			let number = *header.number();
 			let hash = header.hash();
 			let parent_hash = *header.parent_hash();
@@ -153,7 +257,7 @@ impl <B: BlockT> BlockRequestHandler<B> {
 						.map(|extrinsic| extrinsic.encode())
 						.collect(),
 					None => {
-						log::trace!(target: "sync", "Missing data for block request.");
+						log::trace!(target: LOG_TARGET, "Missing data for block request.");
 						break;
 					}
 				}
@@ -195,15 +299,7 @@ impl <B: BlockT> BlockRequestHandler<B> {
 			}
 		}
 
-		let res = BlockResponse { blocks };
-
-		let mut data = Vec::with_capacity(res.encoded_len());
-		res.encode(&mut data)?;
-
-		pending_response.send(OutgoingResponse {
-			result: Ok(data),
-			reputation_changes: Vec::new(),
-		}).map_err(|_| HandleRequestError::SendResponse)
+		Ok(BlockResponse { blocks })
 	}
 }
 
diff --git a/client/network/src/gossip/tests.rs b/client/network/src/gossip/tests.rs
index c35159168d0f..89ad5fcf047d 100644
--- a/client/network/src/gossip/tests.rs
+++ b/client/network/src/gossip/tests.rs
@@ -99,6 +99,7 @@ fn build_test_full_node(network_config: config::NetworkConfiguration)
 		let (handler, protocol_config) = BlockRequestHandler::new(
 			&protocol_id,
 			client.clone(),
+			50,
 		);
 		async_std::task::spawn(handler.run().boxed());
 		protocol_config
diff --git a/client/network/src/service/tests.rs b/client/network/src/service/tests.rs
index defb9213a349..660eac82c4c6 100644
--- a/client/network/src/service/tests.rs
+++ b/client/network/src/service/tests.rs
@@ -99,6 +99,7 @@ fn build_test_full_node(config: config::NetworkConfiguration)
 		let (handler, protocol_config) = BlockRequestHandler::new(
 			&protocol_id,
 			client.clone(),
+			50,
 		);
 		async_std::task::spawn(handler.run().boxed());
 		protocol_config
diff --git a/client/network/test/src/lib.rs b/client/network/test/src/lib.rs
index 6e2380b28478..c8b442d0dd56 100644
--- a/client/network/test/src/lib.rs
+++ b/client/network/test/src/lib.rs
@@ -727,7 +727,11 @@ pub trait TestNetFactory: Sized {
 		let protocol_id = ProtocolId::from("test-protocol-name");
 
 		let block_request_protocol_config = {
-			let (handler, protocol_config) = BlockRequestHandler::new(&protocol_id, client.clone());
+			let (handler, protocol_config) = BlockRequestHandler::new(
+				&protocol_id,
+				client.clone(),
+				50,
+			);
 			self.spawn_task(handler.run().boxed());
 			protocol_config
 		};
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index 103e499a589d..d0fa10a44d46 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -883,6 +883,8 @@ pub fn build_network<TBl, TExPool, TImpQu, TCl>(
 			let (handler, protocol_config) = BlockRequestHandler::new(
 				&protocol_id,
 				client.clone(),
+				config.network.default_peers_set.in_peers as usize
+					+ config.network.default_peers_set.out_peers as usize,
 			);
 			spawn_handle.spawn("block_request_handler", handler.run());
 			protocol_config

From 773c0b4bc1afaa10203e6c37a4e81393228eaae0 Mon Sep 17 00:00:00 2001
From: Liu-Cheng Xu <xuliuchengxlc@gmail.com>
Date: Tue, 9 Mar 2021 22:51:11 +0800
Subject: [PATCH 0476/1194] Simplify the code a little bit (#8295)

---
 client/consensus/babe/src/authorship.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/consensus/babe/src/authorship.rs b/client/consensus/babe/src/authorship.rs
index cf75a4a43f23..2a90ca3b94c0 100644
--- a/client/consensus/babe/src/authorship.rs
+++ b/client/consensus/babe/src/authorship.rs
@@ -139,7 +139,7 @@ fn claim_secondary_slot(
 		return None;
 	}
 
-	let expected_author = super::authorship::secondary_slot_author(
+	let expected_author = secondary_slot_author(
 		slot,
 		authorities,
 		*randomness,
@@ -148,7 +148,7 @@ fn claim_secondary_slot(
 	for (authority_id, authority_index) in keys {
 		if authority_id == expected_author {
 			let pre_digest = if author_secondary_vrf {
-				let transcript_data = super::authorship::make_transcript_data(
+				let transcript_data = make_transcript_data(
 					randomness,
 					slot,
 					*epoch_index,
@@ -243,12 +243,12 @@ fn claim_primary_slot(
 	let Epoch { authorities, randomness, epoch_index, .. } = epoch;
 
 	for (authority_id, authority_index) in keys {
-		let transcript = super::authorship::make_transcript(
+		let transcript = make_transcript(
 			randomness,
 			slot,
 			*epoch_index
 		);
-		let transcript_data = super::authorship::make_transcript_data(
+		let transcript_data = make_transcript_data(
 			randomness,
 			slot,
 			*epoch_index
@@ -257,7 +257,7 @@ fn claim_primary_slot(
 		//
 		// We already checked that authorities contains `key.public()`, so it can't
 		// be empty.  Therefore, this division in `calculate_threshold` is safe.
-		let threshold = super::authorship::calculate_primary_threshold(c, authorities, *authority_index);
+		let threshold = calculate_primary_threshold(c, authorities, *authority_index);
 
 		let result = SyncCryptoStore::sr25519_vrf_sign(
 			&**keystore,
@@ -271,7 +271,7 @@ fn claim_primary_slot(
 				Ok(inout) => inout,
 				Err(_) => continue,
 			};
-			if super::authorship::check_primary_threshold(&inout, threshold) {
+			if check_primary_threshold(&inout, threshold) {
 				let pre_digest = PreDigest::Primary(PrimaryPreDigest {
 					slot,
 					vrf_output: VRFOutput(signature.output),

From a94749cb5321cbc43403ead66a1c915236720f8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Tue, 9 Mar 2021 17:05:48 +0100
Subject: [PATCH 0477/1194] Fix typo in generated docs. (#8300)

---
 frame/support/procedural/src/pallet/expand/genesis_config.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frame/support/procedural/src/pallet/expand/genesis_config.rs b/frame/support/procedural/src/pallet/expand/genesis_config.rs
index 96407cb382bc..cc35451b646f 100644
--- a/frame/support/procedural/src/pallet/expand/genesis_config.rs
+++ b/frame/support/procedural/src/pallet/expand/genesis_config.rs
@@ -38,7 +38,7 @@ pub fn expand_genesis_config(def: &mut Def) -> proc_macro2::TokenStream {
 					#[doc = r"
 					Can be used to configure the
 					[genesis state](https://substrate.dev/docs/en/knowledgebase/integrate/chain-spec#the-genesis-state)
-					of the contracts pallet.
+					of this pallet.
 					"]
 				));
 			}

From 8fca15b79bef42c53faad849652c8f5a9936b369 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 9 Mar 2021 20:14:54 +0100
Subject: [PATCH 0478/1194] Introduce new concept of "slot portion for
 proposing" (#8280)

* Introduce new concept of "slot portion for proposing"

Currently when building a block we actually give the proposer all of the
time in the slot, while this is wrong. The slot is actually split in at
least two phases proposing and propagation or in the polkadot case into
three phases validating pov's, proposing and propagation. As we don't
want to bring that much polkadot concepts into Substrate, we only
support splitting the slot into proposing and propagation. The portion
can now be passed as parameter to AuRa and BABE to configure this value.
However, this slot portion for propagation doesn't mean that the
proposer can not go over this limit. When we miss slots we still apply
the lenience factor to increase the proposing time, so that we have
enough time to build a heavy block.

Besides all what was said above, this is especially required for
parachains. Parachains have a much more constraint proposing window.
Currently the slot duration is at minimum 12 seconds, but we only have
around 500ms for proposing. So, this slot portion for proposing is
really required to make it working without hacks.

* Offgit feedback

* Cast cast cast
---
 bin/node-template/node/src/service.rs |  3 +-
 bin/node/cli/src/service.rs           |  5 +-
 client/consensus/aura/src/lib.rs      | 36 ++++++++++--
 client/consensus/babe/src/lib.rs      | 29 ++++++++--
 client/consensus/babe/src/tests.rs    |  1 +
 client/consensus/slots/src/lib.rs     | 81 +++++++++++++++------------
 client/consensus/slots/src/slots.rs   | 14 +++--
 7 files changed, 112 insertions(+), 57 deletions(-)

diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
index a5030f1b3517..368767fbdd2a 100644
--- a/bin/node-template/node/src/service.rs
+++ b/bin/node-template/node/src/service.rs
@@ -9,7 +9,7 @@ use sp_inherents::InherentDataProviders;
 use sc_executor::native_executor_instance;
 pub use sc_executor::NativeExecutor;
 use sp_consensus_aura::sr25519::AuthorityPair as AuraPair;
-use sc_consensus_aura::{ImportQueueParams, StartAuraParams};
+use sc_consensus_aura::{ImportQueueParams, StartAuraParams, SlotProportion};
 use sc_finality_grandpa::SharedVoterState;
 use sc_keystore::LocalKeystore;
 use sc_telemetry::TelemetrySpan;
@@ -212,6 +212,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 				keystore: keystore_container.sync_keystore(),
 				can_author_with,
 				sync_oracle: network.clone(),
+				block_proposal_slot_portion: SlotProportion::new(2f32 / 3f32),
 			},
 		)?;
 
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index 80561a78a062..6fed5bf5c649 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -25,8 +25,7 @@ use sc_consensus_babe;
 use node_primitives::Block;
 use node_runtime::RuntimeApi;
 use sc_service::{
-	config::{Configuration}, error::{Error as ServiceError},
-	RpcHandlers, TaskManager,
+	config::Configuration, error::Error as ServiceError, RpcHandlers, TaskManager,
 };
 use sp_inherents::InherentDataProviders;
 use sc_network::{Event, NetworkService};
@@ -35,6 +34,7 @@ use futures::prelude::*;
 use sc_client_api::{ExecutorProvider, RemoteBackend};
 use node_executor::Executor;
 use sc_telemetry::{TelemetryConnectionNotifier, TelemetrySpan};
+use sc_consensus_babe::SlotProportion;
 
 type FullClient = sc_service::TFullClient<Block, RuntimeApi, Executor>;
 type FullBackend = sc_service::TFullBackend<Block>;
@@ -279,6 +279,7 @@ pub fn new_full_base(
 			backoff_authoring_blocks,
 			babe_link,
 			can_author_with,
+			block_proposal_slot_portion: SlotProportion::new(0.5),
 		};
 
 		let babe = sc_consensus_babe::start_babe(babe_config)?;
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index 1c30f136ea00..12ce0e169713 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -69,6 +69,7 @@ pub use sp_consensus_aura::{
 };
 pub use sp_consensus::SyncOracle;
 pub use import_queue::{ImportQueueParams, import_queue, AuraBlockImport, CheckForEquivocation};
+pub use sc_consensus_slots::SlotProportion;
 
 type AuthorityId<P> = <P as Pair>::Public;
 
@@ -142,6 +143,12 @@ pub struct StartAuraParams<C, SC, I, PF, SO, BS, CAW> {
 	pub keystore: SyncCryptoStorePtr,
 	/// Can we author a block with this node?
 	pub can_author_with: CAW,
+	/// The proportion of the slot dedicated to proposing.
+	///
+	/// The block proposing will be limited to this proportion of the slot from the starting of the
+	/// slot. However, the proposing can still take longer when there is some lenience factor applied,
+	/// because there were no blocks produced for some slots.
+	pub block_proposal_slot_portion: SlotProportion,
 }
 
 /// Start the aura worker. The returned future should be run in a futures executor.
@@ -158,6 +165,7 @@ pub fn start_aura<P, B, C, SC, PF, I, SO, CAW, BS, Error>(
 		backoff_authoring_blocks,
 		keystore,
 		can_author_with,
+		block_proposal_slot_portion,
 	}: StartAuraParams<C, SC, I, PF, SO, BS, CAW>,
 ) -> Result<impl Future<Output = ()>, sp_consensus::Error> where
 	B: BlockT,
@@ -184,6 +192,7 @@ pub fn start_aura<P, B, C, SC, PF, I, SO, CAW, BS, Error>(
 		force_authoring,
 		backoff_authoring_blocks,
 		_key_type: PhantomData::<P>,
+		block_proposal_slot_portion,
 	};
 	register_aura_inherent_data_provider(
 		&inherent_data_providers,
@@ -208,6 +217,7 @@ struct AuraWorker<C, E, I, P, SO, BS> {
 	sync_oracle: SO,
 	force_authoring: bool,
 	backoff_authoring_blocks: Option<BS>,
+	block_proposal_slot_portion: SlotProportion,
 	_key_type: PhantomData<P>,
 }
 
@@ -365,11 +375,22 @@ where
 		&self,
 		head: &B::Header,
 		slot_info: &SlotInfo,
-	) -> Option<std::time::Duration> {
-		let slot_remaining = self.slot_remaining_duration(slot_info);
+	) -> std::time::Duration {
+		let max_proposing = slot_info.duration.mul_f32(self.block_proposal_slot_portion.get());
+
+		let slot_remaining = slot_info.ends_at
+			.checked_duration_since(std::time::Instant::now())
+			.unwrap_or_default();
+
+		let slot_remaining = std::cmp::min(slot_remaining, max_proposing);
+
+		// If parent is genesis block, we don't require any lenience factor.
+		if head.number().is_zero() {
+			return slot_remaining
+		}
 
 		let parent_slot = match find_pre_digest::<B, P::Signature>(head) {
-			Err(_) => return Some(slot_remaining),
+			Err(_) => return slot_remaining,
 			Ok(d) => d,
 		};
 
@@ -383,9 +404,9 @@ where
 				slot_lenience.as_secs(),
 			);
 
-			Some(slot_remaining + slot_lenience)
+			slot_remaining + slot_lenience
 		} else {
-			Some(slot_remaining)
+			slot_remaining
 		}
 	}
 }
@@ -648,6 +669,7 @@ mod tests {
 				backoff_authoring_blocks: Some(BackoffAuthoringOnFinalizedHeadLagging::default()),
 				keystore,
 				can_author_with: sp_consensus::AlwaysCanAuthor,
+				block_proposal_slot_portion: SlotProportion::new(0.5),
 			}).expect("Starts aura"));
 		}
 
@@ -708,6 +730,7 @@ mod tests {
 			force_authoring: false,
 			backoff_authoring_blocks: Some(BackoffAuthoringOnFinalizedHeadLagging::default()),
 			_key_type: PhantomData::<AuthorityPair>,
+			block_proposal_slot_portion: SlotProportion::new(0.5),
 		};
 
 		let head = Header::new(
@@ -755,6 +778,7 @@ mod tests {
 			force_authoring: false,
 			backoff_authoring_blocks: Option::<()>::None,
 			_key_type: PhantomData::<AuthorityPair>,
+			block_proposal_slot_portion: SlotProportion::new(0.5),
 		};
 
 		let head = client.header(&BlockId::Number(0)).unwrap().unwrap();
@@ -766,7 +790,7 @@ mod tests {
 				timestamp: 0,
 				ends_at: Instant::now() + Duration::from_secs(100),
 				inherent_data: InherentData::new(),
-				duration: 1000,
+				duration: Duration::from_millis(1000),
 			},
 		)).unwrap();
 
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index 5622df48dbcb..7f2f47da5d5d 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -74,6 +74,7 @@ pub use sp_consensus_babe::{
 	},
 };
 pub use sp_consensus::SyncOracle;
+pub use sc_consensus_slots::SlotProportion;
 use std::{
 	collections::HashMap, sync::Arc, u64, pin::Pin, time::{Instant, Duration},
 	any::Any, borrow::Cow, convert::TryInto,
@@ -394,6 +395,13 @@ pub struct BabeParams<B: BlockT, C, E, I, SO, SC, CAW, BS> {
 
 	/// Checks if the current native implementation can author with a runtime at a given block.
 	pub can_author_with: CAW,
+
+	/// The proportion of the slot dedicated to proposing.
+	///
+	/// The block proposing will be limited to this proportion of the slot from the starting of the
+	/// slot. However, the proposing can still take longer when there is some lenience factor applied,
+	/// because there were no blocks produced for some slots.
+	pub block_proposal_slot_portion: SlotProportion,
 }
 
 /// Start the babe worker.
@@ -409,6 +417,7 @@ pub fn start_babe<B, C, SC, E, I, SO, CAW, BS, Error>(BabeParams {
 	backoff_authoring_blocks,
 	babe_link,
 	can_author_with,
+	block_proposal_slot_portion,
 }: BabeParams<B, C, E, I, SO, SC, CAW, BS>) -> Result<
 	BabeWorker<B>,
 	sp_consensus::Error,
@@ -443,6 +452,7 @@ pub fn start_babe<B, C, SC, E, I, SO, CAW, BS, Error>(BabeParams {
 		epoch_changes: babe_link.epoch_changes.clone(),
 		slot_notification_sinks: slot_notification_sinks.clone(),
 		config: config.clone(),
+		block_proposal_slot_portion,
 	};
 
 	register_babe_inherent_data_provider(&inherent_data_providers, config.slot_duration())?;
@@ -597,6 +607,7 @@ struct BabeSlotWorker<B: BlockT, C, E, I, SO, BS> {
 	epoch_changes: SharedEpochChanges<B, Epoch>,
 	slot_notification_sinks: SlotNotificationSinks<B>,
 	config: Config,
+	block_proposal_slot_portion: SlotProportion,
 }
 
 impl<B, C, E, I, Error, SO, BS> sc_consensus_slots::SimpleSlotWorker<B>
@@ -791,16 +802,22 @@ where
 		&self,
 		parent_head: &B::Header,
 		slot_info: &SlotInfo,
-	) -> Option<std::time::Duration> {
-		let slot_remaining = self.slot_remaining_duration(slot_info);
+	) -> std::time::Duration {
+		let max_proposing = slot_info.duration.mul_f32(self.block_proposal_slot_portion.get());
+
+		let slot_remaining = slot_info.ends_at
+			.checked_duration_since(Instant::now())
+			.unwrap_or_default();
+
+		let slot_remaining = std::cmp::min(slot_remaining, max_proposing);
 
 		// If parent is genesis block, we don't require any lenience factor.
 		if parent_head.number().is_zero() {
-			return Some(slot_remaining)
+			return slot_remaining
 		}
 
 		let parent_slot = match find_pre_digest::<B>(parent_head) {
-			Err(_) => return Some(slot_remaining),
+			Err(_) => return slot_remaining,
 			Ok(d) => d.slot(),
 		};
 
@@ -814,9 +831,9 @@ where
 				slot_lenience.as_secs(),
 			);
 
-			Some(slot_remaining + slot_lenience)
+			slot_remaining + slot_lenience
 		} else {
-			Some(slot_remaining)
+			slot_remaining
 		}
 	}
 }
diff --git a/client/consensus/babe/src/tests.rs b/client/consensus/babe/src/tests.rs
index a33a509ddc3d..9ffffc37fd3b 100644
--- a/client/consensus/babe/src/tests.rs
+++ b/client/consensus/babe/src/tests.rs
@@ -431,6 +431,7 @@ fn run_one_test(
 			babe_link: data.link.clone(),
 			keystore,
 			can_author_with: sp_consensus::AlwaysCanAuthor,
+			block_proposal_slot_portion: SlotProportion::new(0.5),
 		}).expect("Starts babe"));
 	}
 	futures::executor::block_on(future::select(
diff --git a/client/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs
index 564d5c28c583..1b40ac102d5d 100644
--- a/client/consensus/slots/src/lib.rs
+++ b/client/consensus/slots/src/lib.rs
@@ -32,7 +32,7 @@ pub use slots::SlotInfo;
 use slots::Slots;
 pub use aux_schema::{check_equivocation, MAX_SLOT_CAPACITY, PRUNING_BOUND};
 
-use std::{fmt::Debug, ops::Deref, pin::Pin, sync::Arc, time::{Instant, Duration}};
+use std::{fmt::Debug, ops::Deref, pin::Pin, sync::Arc, time::Duration};
 use codec::{Decode, Encode};
 use futures::{prelude::*, future::{self, Either}};
 use futures_timer::Delay;
@@ -180,24 +180,12 @@ pub trait SimpleSlotWorker<B: BlockT> {
 	/// Returns a `Proposer` to author on top of the given block.
 	fn proposer(&mut self, block: &B::Header) -> Self::CreateProposer;
 
-	/// Remaining duration of the slot.
-	fn slot_remaining_duration(&self, slot_info: &SlotInfo) -> Duration {
-		let now = Instant::now();
-		if now < slot_info.ends_at {
-			slot_info.ends_at.duration_since(now)
-		} else {
-			Duration::from_millis(0)
-		}
-	}
-
-	/// Remaining duration for proposing. None means unlimited.
+	/// Remaining duration for proposing.
 	fn proposing_remaining_duration(
 		&self,
-		_head: &B::Header,
+		head: &B::Header,
 		slot_info: &SlotInfo,
-	) -> Option<Duration> {
-		Some(self.slot_remaining_duration(slot_info))
-	}
+	) -> Duration;
 
 	/// Implements [`SlotWorker::on_slot`].
 	fn on_slot(
@@ -210,21 +198,19 @@ pub trait SimpleSlotWorker<B: BlockT> {
 	{
 		let (timestamp, slot) = (slot_info.timestamp, slot_info.slot);
 
-		let slot_remaining_duration = self.slot_remaining_duration(&slot_info);
 		let proposing_remaining_duration = self.proposing_remaining_duration(&chain_head, &slot_info);
 
-		let proposing_remaining = match proposing_remaining_duration {
-			Some(r) if r.as_secs() == 0 && r.as_nanos() == 0 => {
-				debug!(
-					target: self.logging_target(),
-					"Skipping proposal slot {} since there's no time left to propose",
-					slot,
-				);
+		let proposing_remaining = if proposing_remaining_duration == Duration::default() {
+			debug!(
+				target: self.logging_target(),
+				"Skipping proposal slot {} since there's no time left to propose",
+				slot,
+			);
 
-				return Box::pin(future::ready(None));
-			},
-			Some(r) => Box::new(Delay::new(r)) as Box<dyn Future<Output = ()> + Unpin + Send>,
-			None => Box::new(future::pending()) as Box<_>,
+			return Box::pin(future::ready(None));
+		} else {
+			Box::new(Delay::new(proposing_remaining_duration))
+				as Box<dyn Future<Output = ()> + Unpin + Send>
 		};
 
 		let epoch_data = match self.epoch_data(&chain_head, slot) {
@@ -298,20 +284,25 @@ pub trait SimpleSlotWorker<B: BlockT> {
 
 		let logs = self.pre_digest_data(slot, &claim);
 
-		// deadline our production to approx. the end of the slot
+		// deadline our production to 98% of the total time left for proposing. As we deadline
+		// the proposing below to the same total time left, the 2% margin should be enough for
+		// the result to be returned.
 		let proposing = awaiting_proposer.and_then(move |proposer| proposer.propose(
 			slot_info.inherent_data,
 			sp_runtime::generic::Digest {
 				logs,
 			},
-			slot_remaining_duration,
+			proposing_remaining_duration.mul_f32(0.98),
 		).map_err(|e| sp_consensus::Error::ClientImport(format!("{:?}", e))));
 
 		let proposal_work =
 			futures::future::select(proposing, proposing_remaining).map(move |v| match v {
 				Either::Left((b, _)) => b.map(|b| (b, claim)),
 				Either::Right(_) => {
-					info!("⌛️ Discarding proposal for slot {}; block production took too long", slot);
+					info!(
+						"⌛️ Discarding proposal for slot {}; block production took too long",
+						slot,
+					);
 					// If the node was compiled with debug, tell the user to use release optimizations.
 					#[cfg(build_type="debug")]
 					info!("👉 Recompile your node in `--release` mode to mitigate this problem.");
@@ -381,8 +372,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 	}
 }
 
-impl<B: BlockT, T: SimpleSlotWorker<B>> SlotWorker<B, <T::Proposer as Proposer<B>>::Proof> for T
-{
+impl<B: BlockT, T: SimpleSlotWorker<B>> SlotWorker<B, <T::Proposer as Proposer<B>>::Proof> for T {
 	fn on_slot(
 		&mut self,
 		chain_head: B::Header,
@@ -564,6 +554,24 @@ impl<T: Clone + Send + Sync + 'static> SlotDuration<T> {
 	}
 }
 
+/// A unit type wrapper to express the proportion of a slot.
+pub struct SlotProportion(f32);
+
+impl SlotProportion {
+	/// Create a new proportion.
+	///
+	/// The given value `inner` should be in the range `[0,1]`. If the value is not in the required
+	/// range, it is clamped into the range.
+	pub fn new(inner: f32) -> Self {
+		Self(inner.clamp(0.0, 1.0))
+	}
+
+	/// Returns the inner that is guaranted to be in the range `[0,1]`.
+	pub fn get(&self) -> f32 {
+		self.0
+	}
+}
+
 /// Calculate a slot duration lenience based on the number of missed slots from current
 /// to parent. If the number of skipped slots is greated than 0 this method will apply
 /// an exponential backoff of at most `2^7 * slot_duration`, if no slots were skipped
@@ -589,7 +597,7 @@ pub fn slot_lenience_exponential(parent_slot: Slot, slot_info: &SlotInfo) -> Opt
 		let slot_lenience = skipped_slots / BACKOFF_STEP;
 		let slot_lenience = std::cmp::min(slot_lenience, BACKOFF_CAP);
 		let slot_lenience = 1 << slot_lenience;
-		Some(Duration::from_millis(slot_lenience * slot_info.duration))
+		Some(slot_lenience * slot_info.duration)
 	}
 }
 
@@ -613,7 +621,8 @@ pub fn slot_lenience_linear(parent_slot: Slot, slot_info: &SlotInfo) -> Option<D
 		None
 	} else {
 		let slot_lenience = std::cmp::min(skipped_slots, BACKOFF_CAP);
-		Some(Duration::from_millis(slot_lenience * slot_info.duration))
+		// We cap `slot_lenience` to `20`, so it should always fit into an `u32`.
+		Some(slot_info.duration * (slot_lenience as u32))
 	}
 }
 
@@ -727,7 +736,7 @@ mod test {
 	fn slot(slot: u64) -> super::slots::SlotInfo {
 		super::slots::SlotInfo {
 			slot: slot.into(),
-			duration: SLOT_DURATION.as_millis() as u64,
+			duration: SLOT_DURATION,
 			timestamp: Default::default(),
 			inherent_data: Default::default(),
 			ends_at: Instant::now(),
diff --git a/client/consensus/slots/src/slots.rs b/client/consensus/slots/src/slots.rs
index d3bddccce0fa..b23d67603569 100644
--- a/client/consensus/slots/src/slots.rs
+++ b/client/consensus/slots/src/slots.rs
@@ -40,9 +40,11 @@ pub fn duration_now() -> Duration {
 }
 
 /// Returns the duration until the next slot, based on current duration since
-pub fn time_until_next(now: Duration, slot_duration: u64) -> Duration {
-	let remaining_full_millis = slot_duration - (now.as_millis() as u64 % slot_duration) - 1;
-	Duration::from_millis(remaining_full_millis)
+pub fn time_until_next(now: Duration, slot_duration: Duration) -> Duration {
+	let remaining_full_millis = slot_duration.as_millis()
+		- (now.as_millis() % slot_duration.as_millis())
+		- 1;
+	Duration::from_millis(remaining_full_millis as u64)
 }
 
 /// Information about a slot.
@@ -56,13 +58,13 @@ pub struct SlotInfo {
 	/// The inherent data.
 	pub inherent_data: InherentData,
 	/// Slot duration.
-	pub duration: u64,
+	pub duration: Duration,
 }
 
 /// A stream that returns every time there is a new slot.
 pub(crate) struct Slots<SC> {
 	last_slot: Slot,
-	slot_duration: u64,
+	slot_duration: Duration,
 	inner_delay: Option<Delay>,
 	inherent_data_providers: InherentDataProviders,
 	timestamp_extractor: SC,
@@ -77,7 +79,7 @@ impl<SC> Slots<SC> {
 	) -> Self {
 		Slots {
 			last_slot: 0.into(),
-			slot_duration,
+			slot_duration: Duration::from_millis(slot_duration),
 			inner_delay: None,
 			inherent_data_providers,
 			timestamp_extractor,

From b6c2c5d08da7f2dc7322c797176dad967c636046 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 9 Mar 2021 23:22:25 +0100
Subject: [PATCH 0479/1194] Update to latest proc-macro-crate version (#8294)

---
 Cargo.lock                                    | 40 ++++++++-----
 client/chain-spec/derive/Cargo.toml           |  2 +-
 client/chain-spec/derive/src/impls.rs         | 14 ++---
 client/tracing/proc-macro/Cargo.toml          |  2 +-
 client/tracing/proc-macro/src/lib.rs          | 18 ++----
 frame/staking/reward-curve/Cargo.toml         |  2 +-
 frame/staking/reward-curve/src/lib.rs         |  7 ++-
 frame/support/procedural/tools/Cargo.toml     |  2 +-
 frame/support/procedural/tools/src/lib.rs     | 57 +++++++++----------
 primitives/api/proc-macro/Cargo.toml          |  2 +-
 primitives/api/proc-macro/src/utils.rs        | 38 ++++++-------
 primitives/npos-elections/compact/Cargo.toml  |  2 +-
 primitives/npos-elections/compact/src/lib.rs  | 23 +++-----
 .../runtime-interface/proc-macro/Cargo.toml   |  2 +-
 .../runtime-interface/proc-macro/src/utils.rs | 32 +++++------
 test-utils/derive/Cargo.toml                  |  2 +-
 test-utils/derive/src/lib.rs                  | 14 ++---
 17 files changed, 119 insertions(+), 140 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e8157daf0641..b42b637bcf39 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1797,7 +1797,7 @@ name = "frame-support-procedural-tools"
 version = "3.0.0"
 dependencies = [
  "frame-support-procedural-tools-derive",
- "proc-macro-crate",
+ "proc-macro-crate 1.0.0",
  "proc-macro2",
  "quote",
  "syn",
@@ -2756,7 +2756,7 @@ version = "15.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99a847f9ec7bb52149b2786a17c9cb260d6effc6b8eeb8c16b343a487a7563a3"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 0.1.5",
  "proc-macro2",
  "quote",
  "syn",
@@ -3817,7 +3817,7 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85ee3c48cb9d9b275ad967a0e96715badc13c6029adb92f34fa17b9ff28fd81f"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 0.1.5",
  "proc-macro-error",
  "proc-macro2",
  "quote",
@@ -5329,7 +5329,7 @@ dependencies = [
 name = "pallet-staking-reward-curve"
 version = "3.0.0"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 1.0.0",
  "proc-macro2",
  "quote",
  "sp-runtime",
@@ -5551,7 +5551,7 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9029e65297c7fd6d7013f0579e193ec2b34ae78eabca854c9417504ad8a2d214"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 0.1.5",
  "proc-macro2",
  "quote",
  "syn",
@@ -6041,6 +6041,16 @@ dependencies = [
  "toml",
 ]
 
+[[package]]
+name = "proc-macro-crate"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41fdbd1df62156fbc5945f4762632564d7d038153091c3fcf1067f6aef7cff92"
+dependencies = [
+ "thiserror",
+ "toml",
+]
+
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
@@ -6817,7 +6827,7 @@ dependencies = [
 name = "sc-chain-spec-derive"
 version = "3.0.0"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 1.0.0",
  "proc-macro2",
  "quote",
  "syn",
@@ -7874,7 +7884,7 @@ dependencies = [
 name = "sc-tracing-proc-macro"
 version = "3.0.0"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 1.0.0",
  "proc-macro2",
  "quote",
  "syn",
@@ -8349,7 +8359,7 @@ name = "sp-api-proc-macro"
 version = "3.0.0"
 dependencies = [
  "blake2-rfc",
- "proc-macro-crate",
+ "proc-macro-crate 1.0.0",
  "proc-macro2",
  "quote",
  "syn",
@@ -8757,7 +8767,7 @@ dependencies = [
 name = "sp-npos-elections-compact"
 version = "3.0.0"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 1.0.0",
  "proc-macro2",
  "quote",
  "syn",
@@ -8853,7 +8863,7 @@ name = "sp-runtime-interface-proc-macro"
 version = "3.0.0"
 dependencies = [
  "Inflector",
- "proc-macro-crate",
+ "proc-macro-crate 1.0.0",
  "proc-macro2",
  "quote",
  "syn",
@@ -9430,7 +9440,7 @@ dependencies = [
 name = "substrate-test-utils-derive"
 version = "0.9.0"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 1.0.0",
  "quote",
  "syn",
 ]
@@ -9545,18 +9555,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.23"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146"
+checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.23"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1"
+checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/client/chain-spec/derive/Cargo.toml b/client/chain-spec/derive/Cargo.toml
index 4f3484df31cb..8df820a46aee 100644
--- a/client/chain-spec/derive/Cargo.toml
+++ b/client/chain-spec/derive/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 proc-macro = true
 
 [dependencies]
-proc-macro-crate = "0.1.4"
+proc-macro-crate = "1.0.0"
 proc-macro2 = "1.0.6"
 quote = "1.0.3"
 syn = "1.0.58"
diff --git a/client/chain-spec/derive/src/impls.rs b/client/chain-spec/derive/src/impls.rs
index bb72270ed551..39984d4df104 100644
--- a/client/chain-spec/derive/src/impls.rs
+++ b/client/chain-spec/derive/src/impls.rs
@@ -19,7 +19,7 @@
 use proc_macro2::{Span, TokenStream};
 use quote::quote;
 use syn::{DeriveInput, Ident, Error};
-use proc_macro_crate::crate_name;
+use proc_macro_crate::{crate_name, FoundCrate};
 
 const CRATE_NAME: &str = "sc-chain-spec";
 const ATTRIBUTE_NAME: &str = "forks";
@@ -77,7 +77,8 @@ pub fn group_derive(ast: &DeriveInput) -> proc_macro::TokenStream {
 		let combine_with = generate_combine_with(&field_names);
 		let to_base = generate_fork_to_base(name, &field_names);
 		let serde_crate_name = match proc_macro_crate::crate_name("serde") {
-			Ok(name) => Ident::new(&name.replace("-", "_"), Span::call_site()),
+			Ok(FoundCrate::Itself) => Ident::new("serde", Span::call_site()),
+			Ok(FoundCrate::Name(name)) => Ident::new(&name, Span::call_site()),
 			Err(e) => {
 				let err = Error::new(
 					Span::call_site(),
@@ -151,14 +152,11 @@ pub fn derive(
 		_ => return err(),
 	};
 
-	const PROOF: &str = "CARGO_PKG_NAME always defined when compiling; qed";
 	let name = &ast.ident;
 	let crate_name = match crate_name(CRATE_NAME) {
-		Ok(chain_spec_name) => chain_spec_name,
-		Err(e) => if std::env::var("CARGO_PKG_NAME").expect(PROOF) == CRATE_NAME {
-			// we return the name of the crate here instead of `crate` to support doc tests.
-			CRATE_NAME.replace("-", "_")
-		} else {
+		Ok(FoundCrate::Itself) => CRATE_NAME.replace("-", "_"),
+		Ok(FoundCrate::Name(chain_spec_name)) => chain_spec_name,
+		Err(e) => {
 			let err = Error::new(Span::call_site(), &e).to_compile_error();
 			return quote!( #err ).into()
 		},
diff --git a/client/tracing/proc-macro/Cargo.toml b/client/tracing/proc-macro/Cargo.toml
index ac06dc45a9c4..3c06a75f0a1f 100644
--- a/client/tracing/proc-macro/Cargo.toml
+++ b/client/tracing/proc-macro/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 proc-macro = true
 
 [dependencies]
-proc-macro-crate = "0.1.4"
+proc-macro-crate = "1.0.0"
 proc-macro2 = "1.0.6"
 quote = { version = "1.0.3", features = ["proc-macro"] }
 syn = { version = "1.0.58", features = ["proc-macro", "full", "extra-traits", "parsing"] }
diff --git a/client/tracing/proc-macro/src/lib.rs b/client/tracing/proc-macro/src/lib.rs
index 6164977f07c1..7022d394ed95 100644
--- a/client/tracing/proc-macro/src/lib.rs
+++ b/client/tracing/proc-macro/src/lib.rs
@@ -18,7 +18,7 @@
 
 use proc_macro::TokenStream;
 use proc_macro2::Span;
-use proc_macro_crate::crate_name;
+use proc_macro_crate::{crate_name, FoundCrate};
 use quote::quote;
 use syn::{Error, Expr, Ident, ItemFn};
 
@@ -118,18 +118,10 @@ pub fn prefix_logs_with(arg: TokenStream, item: TokenStream) -> TokenStream {
 
 	let name = syn::parse_macro_input!(arg as Expr);
 
-	let crate_name = if std::env::var("CARGO_PKG_NAME")
-		.expect("cargo env var always there when compiling; qed")
-		== "sc-tracing"
-	{
-		Ident::from(Ident::new("sc_tracing", Span::call_site()))
-	} else {
-		let crate_name = match crate_name("sc-tracing") {
-			Ok(x) => x,
-			Err(err) => return Error::new(Span::call_site(), err).to_compile_error().into(),
-		};
-
-		Ident::new(&crate_name, Span::call_site())
+	let crate_name = match crate_name("sc-tracing") {
+		Ok(FoundCrate::Itself) => Ident::from(Ident::new("sc_tracing", Span::call_site())),
+		Ok(FoundCrate::Name(crate_name)) => Ident::new(&crate_name, Span::call_site()),
+		Err(e) => return Error::new(Span::call_site(), e).to_compile_error().into(),
 	};
 
 	let ItemFn {
diff --git a/frame/staking/reward-curve/Cargo.toml b/frame/staking/reward-curve/Cargo.toml
index 8713f5e1001c..fe5e0f4a947a 100644
--- a/frame/staking/reward-curve/Cargo.toml
+++ b/frame/staking/reward-curve/Cargo.toml
@@ -18,7 +18,7 @@ proc-macro = true
 syn = { version = "1.0.58", features = ["full", "visit"] }
 quote = "1.0.3"
 proc-macro2 = "1.0.6"
-proc-macro-crate = "0.1.4"
+proc-macro-crate = "1.0.0"
 
 [dev-dependencies]
 sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
diff --git a/frame/staking/reward-curve/src/lib.rs b/frame/staking/reward-curve/src/lib.rs
index 2e1bc1f1859d..5ce6d0c3a867 100644
--- a/frame/staking/reward-curve/src/lib.rs
+++ b/frame/staking/reward-curve/src/lib.rs
@@ -22,7 +22,7 @@ mod log;
 use log::log2;
 use proc_macro::TokenStream;
 use proc_macro2::{TokenStream as TokenStream2, Span};
-use proc_macro_crate::crate_name;
+use proc_macro_crate::{crate_name, FoundCrate};
 use quote::{quote, ToTokens};
 use std::convert::TryInto;
 use syn::parse::{Parse, ParseStream};
@@ -82,11 +82,12 @@ pub fn build(input: TokenStream) -> TokenStream {
 	let test_module = generate_test_module(&input);
 
 	let imports = match crate_name("sp-runtime") {
-		Ok(sp_runtime) => {
+		Ok(FoundCrate::Itself) => quote!( extern crate sp_runtime as _sp_runtime; ),
+		Ok(FoundCrate::Name(sp_runtime)) => {
 			let ident = syn::Ident::new(&sp_runtime, Span::call_site());
 			quote!( extern crate #ident as _sp_runtime; )
 		},
-		Err(e) => syn::Error::new(Span::call_site(), &e).to_compile_error(),
+		Err(e) => syn::Error::new(Span::call_site(), e).to_compile_error(),
 	};
 
 	let const_name = input.ident;
diff --git a/frame/support/procedural/tools/Cargo.toml b/frame/support/procedural/tools/Cargo.toml
index 4165cb32c3a5..316aae0a17a4 100644
--- a/frame/support/procedural/tools/Cargo.toml
+++ b/frame/support/procedural/tools/Cargo.toml
@@ -16,4 +16,4 @@ frame-support-procedural-tools-derive = { version = "3.0.0", path = "./derive" }
 proc-macro2 = "1.0.6"
 quote = "1.0.3"
 syn = { version = "1.0.58", features = ["full", "visit"] }
-proc-macro-crate = "0.1.5"
+proc-macro-crate = "1.0.0"
diff --git a/frame/support/procedural/tools/src/lib.rs b/frame/support/procedural/tools/src/lib.rs
index ce84f6981990..64f21d66391c 100644
--- a/frame/support/procedural/tools/src/lib.rs
+++ b/frame/support/procedural/tools/src/lib.rs
@@ -22,7 +22,7 @@
 // reexport proc macros
 pub use frame_support_procedural_tools_derive::*;
 
-use proc_macro_crate::crate_name;
+use proc_macro_crate::{crate_name, FoundCrate};
 use syn::parse::Error;
 use quote::quote;
 
@@ -50,44 +50,39 @@ pub fn generate_crate_access(unique_id: &str, def_crate: &str) -> TokenStream {
 ///
 /// for `frame-support` output will for example be `frame_support`.
 pub fn generate_crate_access_2018(def_crate: &str) -> Result<syn::Ident, Error> {
-	if std::env::var("CARGO_PKG_NAME").unwrap() == def_crate {
-		let name = def_crate.to_string().replace("-", "_");
-		Ok(syn::Ident::new(&name, Span::call_site()))
-	} else {
-		match crate_name(def_crate) {
-			Ok(name) => {
-				Ok(Ident::new(&name, Span::call_site()))
-			},
-			Err(e) => {
-				Err(Error::new(Span::call_site(), &e))
-			}
+	match crate_name(def_crate) {
+		Ok(FoundCrate::Itself) => {
+			let name = def_crate.to_string().replace("-", "_");
+			Ok(syn::Ident::new(&name, Span::call_site()))
+		},
+		Ok(FoundCrate::Name(name)) => {
+			Ok(Ident::new(&name, Span::call_site()))
+		},
+		Err(e) => {
+			Err(Error::new(Span::call_site(), e))
 		}
 	}
 }
 
 /// Generates the hidden includes that are required to make the macro independent from its scope.
 pub fn generate_hidden_includes(unique_id: &str, def_crate: &str) -> TokenStream {
-	if std::env::var("CARGO_PKG_NAME").unwrap() == def_crate {
-		TokenStream::new()
-	} else {
-		let mod_name = generate_hidden_includes_mod_name(unique_id);
+	let mod_name = generate_hidden_includes_mod_name(unique_id);
 
-		match crate_name(def_crate) {
-			Ok(name) => {
-				let name = Ident::new(&name, Span::call_site());
-				quote::quote!(
-					#[doc(hidden)]
-					mod #mod_name {
-						pub extern crate #name as hidden_include;
-					}
-				)
-			},
-			Err(e) => {
-				let err = Error::new(Span::call_site(), &e).to_compile_error();
-				quote!( #err )
-			}
+	match crate_name(def_crate) {
+		Ok(FoundCrate::Itself) => quote!(),
+		Ok(FoundCrate::Name(name)) => {
+			let name = Ident::new(&name, Span::call_site());
+			quote::quote!(
+				#[doc(hidden)]
+				mod #mod_name {
+					pub extern crate #name as hidden_include;
+				}
+			)
+		},
+		Err(e) => {
+			let err = Error::new(Span::call_site(), e).to_compile_error();
+			quote!( #err )
 		}
-
 	}
 }
 
diff --git a/primitives/api/proc-macro/Cargo.toml b/primitives/api/proc-macro/Cargo.toml
index 450ce64b2b6c..1df8c489e914 100644
--- a/primitives/api/proc-macro/Cargo.toml
+++ b/primitives/api/proc-macro/Cargo.toml
@@ -21,7 +21,7 @@ quote = "1.0.3"
 syn = { version = "1.0.58", features = ["full", "fold", "extra-traits", "visit"] }
 proc-macro2 = "1.0.6"
 blake2-rfc = { version = "0.2.18", default-features = false }
-proc-macro-crate = "0.1.4"
+proc-macro-crate = "1.0.0"
 
 # Required for the doc tests
 [features]
diff --git a/primitives/api/proc-macro/src/utils.rs b/primitives/api/proc-macro/src/utils.rs
index a7a6d352058c..2e4ccf8ff4ed 100644
--- a/primitives/api/proc-macro/src/utils.rs
+++ b/primitives/api/proc-macro/src/utils.rs
@@ -26,7 +26,7 @@ use quote::quote;
 
 use std::env;
 
-use proc_macro_crate::crate_name;
+use proc_macro_crate::{crate_name, FoundCrate};
 
 fn generate_hidden_includes_mod_name(unique_id: &'static str) -> Ident {
 	Ident::new(&format!("sp_api_hidden_includes_{}", unique_id), Span::call_site())
@@ -34,27 +34,23 @@ fn generate_hidden_includes_mod_name(unique_id: &'static str) -> Ident {
 
 /// Generates the hidden includes that are required to make the macro independent from its scope.
 pub fn generate_hidden_includes(unique_id: &'static str) -> TokenStream {
-	if env::var("CARGO_PKG_NAME").unwrap() == "sp-api" {
-		TokenStream::new()
-	} else {
-		let mod_name = generate_hidden_includes_mod_name(unique_id);
-		match crate_name("sp-api") {
-			Ok(client_name) => {
-				let client_name = Ident::new(&client_name, Span::call_site());
-				quote!(
-					#[doc(hidden)]
-					mod #mod_name {
-						pub extern crate #client_name as sp_api;
-					}
-				)
-			},
-			Err(e) => {
-				let err = Error::new(Span::call_site(), &e).to_compile_error();
-				quote!( #err )
-			}
+	let mod_name = generate_hidden_includes_mod_name(unique_id);
+	match crate_name("sp-api") {
+		Ok(FoundCrate::Itself) => quote!(),
+		Ok(FoundCrate::Name(client_name)) => {
+			let client_name = Ident::new(&client_name, Span::call_site());
+			quote!(
+				#[doc(hidden)]
+				mod #mod_name {
+					pub extern crate #client_name as sp_api;
+				}
+			)
+		},
+		Err(e) => {
+			let err = Error::new(Span::call_site(), e).to_compile_error();
+			quote!( #err )
 		}
-
-	}.into()
+	}
 }
 
 /// Generates the access to the `sc_client` crate.
diff --git a/primitives/npos-elections/compact/Cargo.toml b/primitives/npos-elections/compact/Cargo.toml
index 57cb6dc1c4f2..e2fff8e2db01 100644
--- a/primitives/npos-elections/compact/Cargo.toml
+++ b/primitives/npos-elections/compact/Cargo.toml
@@ -18,4 +18,4 @@ proc-macro = true
 syn = { version = "1.0.58", features = ["full", "visit"] }
 quote = "1.0"
 proc-macro2 = "1.0.6"
-proc-macro-crate = "0.1.4"
+proc-macro-crate = "1.0.0"
diff --git a/primitives/npos-elections/compact/src/lib.rs b/primitives/npos-elections/compact/src/lib.rs
index 191998a34192..ed1837bae18b 100644
--- a/primitives/npos-elections/compact/src/lib.rs
+++ b/primitives/npos-elections/compact/src/lib.rs
@@ -19,9 +19,9 @@
 
 use proc_macro::TokenStream;
 use proc_macro2::{TokenStream as TokenStream2, Span, Ident};
-use proc_macro_crate::crate_name;
+use proc_macro_crate::{crate_name, FoundCrate};
 use quote::quote;
-use syn::{parse::{Parse, ParseStream, Result}};
+use syn::parse::{Parse, ParseStream, Result};
 
 mod assignment;
 mod codec;
@@ -348,18 +348,13 @@ fn unique_targets_impl(count: usize) -> TokenStream2 {
 }
 
 fn imports() -> Result<TokenStream2> {
-	if std::env::var("CARGO_PKG_NAME").unwrap() == "sp-npos-elections" {
-		Ok(quote! {
-			use crate as _npos;
-		})
-	} else {
-		match crate_name("sp-npos-elections") {
-			Ok(sp_npos_elections) => {
-				let ident = syn::Ident::new(&sp_npos_elections, Span::call_site());
-				Ok(quote!( extern crate #ident as _npos; ))
-			},
-			Err(e) => Err(syn::Error::new(Span::call_site(), &e)),
-		}
+	match crate_name("sp-npos-elections") {
+		Ok(FoundCrate::Itself) => Ok(quote! { use crate as _npos; }),
+		Ok(FoundCrate::Name(sp_npos_elections)) => {
+			let ident = syn::Ident::new(&sp_npos_elections, Span::call_site());
+			Ok(quote!( extern crate #ident as _npos; ))
+		},
+		Err(e) => Err(syn::Error::new(Span::call_site(), e)),
 	}
 }
 
diff --git a/primitives/runtime-interface/proc-macro/Cargo.toml b/primitives/runtime-interface/proc-macro/Cargo.toml
index 51732ac63181..ae74ff739b18 100644
--- a/primitives/runtime-interface/proc-macro/Cargo.toml
+++ b/primitives/runtime-interface/proc-macro/Cargo.toml
@@ -20,4 +20,4 @@ syn = { version = "1.0.58", features = ["full", "visit", "fold", "extra-traits"]
 quote = "1.0.3"
 proc-macro2 = "1.0.3"
 Inflector = "0.11.4"
-proc-macro-crate = "0.1.4"
+proc-macro-crate = "1.0.0"
diff --git a/primitives/runtime-interface/proc-macro/src/utils.rs b/primitives/runtime-interface/proc-macro/src/utils.rs
index f4cef852076b..d2d9dd7e3997 100644
--- a/primitives/runtime-interface/proc-macro/src/utils.rs
+++ b/primitives/runtime-interface/proc-macro/src/utils.rs
@@ -24,10 +24,9 @@ use syn::{
 	TraitItem, parse_quote, spanned::Spanned, Result, Meta, NestedMeta, Lit, Attribute,
 };
 
-use proc_macro_crate::crate_name;
+use proc_macro_crate::{crate_name, FoundCrate};
 
-use std::env;
-use std::collections::{BTreeMap, btree_map::Entry};
+use std::{env, collections::{BTreeMap, btree_map::Entry}};
 
 use quote::quote;
 
@@ -77,21 +76,18 @@ impl<'a> RuntimeInterface<'a> {
 
 /// Generates the include for the runtime-interface crate.
 pub fn generate_runtime_interface_include() -> TokenStream {
-	if env::var("CARGO_PKG_NAME").unwrap() == "sp-runtime-interface" {
-		TokenStream::new()
-	} else {
-		match crate_name("sp-runtime-interface") {
-			Ok(crate_name) => {
-				let crate_name = Ident::new(&crate_name, Span::call_site());
-				quote!(
-					#[doc(hidden)]
-					extern crate #crate_name as proc_macro_runtime_interface;
-				)
-			},
-			Err(e) => {
-				let err = Error::new(Span::call_site(), &e).to_compile_error();
-				quote!( #err )
-			}
+	match crate_name("sp-runtime-interface") {
+		Ok(FoundCrate::Itself) => quote!(),
+		Ok(FoundCrate::Name(crate_name)) => {
+			let crate_name = Ident::new(&crate_name, Span::call_site());
+			quote!(
+				#[doc(hidden)]
+				extern crate #crate_name as proc_macro_runtime_interface;
+			)
+		},
+		Err(e) => {
+			let err = Error::new(Span::call_site(), e).to_compile_error();
+			quote!( #err )
 		}
 	}
 }
diff --git a/test-utils/derive/Cargo.toml b/test-utils/derive/Cargo.toml
index 8f9a37f8dba6..501a7058c634 100644
--- a/test-utils/derive/Cargo.toml
+++ b/test-utils/derive/Cargo.toml
@@ -11,7 +11,7 @@ description = "Substrate test utilities macros"
 [dependencies]
 quote = "1.0.6"
 syn = { version = "1.0.58", features = ["full"] }
-proc-macro-crate = "0.1.4"
+proc-macro-crate = "1.0.0"
 
 [lib]
 proc-macro = true
diff --git a/test-utils/derive/src/lib.rs b/test-utils/derive/src/lib.rs
index 7a9954d21d82..fb1cb24cae40 100644
--- a/test-utils/derive/src/lib.rs
+++ b/test-utils/derive/src/lib.rs
@@ -17,9 +17,8 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use proc_macro::{Span, TokenStream};
-use proc_macro_crate::crate_name;
+use proc_macro_crate::{crate_name, FoundCrate};
 use quote::quote;
-use std::env;
 
 #[proc_macro_attribute]
 pub fn test(args: TokenStream, item: TokenStream) -> TokenStream {
@@ -55,13 +54,10 @@ fn parse_knobs(
 		}
 	};
 
-	let crate_name = if env::var("CARGO_PKG_NAME").unwrap() == "substrate-test-utils" {
-		syn::Ident::new("substrate_test_utils", Span::call_site().into())
-	} else {
-		let crate_name = crate_name("substrate-test-utils")
-			.map_err(|e| syn::Error::new_spanned(&sig, e))?;
-
-		syn::Ident::new(&crate_name, Span::call_site().into())
+	let crate_name = match crate_name("substrate-test-utils") {
+		Ok(FoundCrate::Itself) => syn::Ident::new("substrate_test_utils", Span::call_site().into()),
+		Ok(FoundCrate::Name(crate_name)) => syn::Ident::new(&crate_name, Span::call_site().into()),
+		Err(e) => return Err(syn::Error::new_spanned(&sig, e)),
 	};
 
 	let header = {

From 24613496216b8c991baa24b26afc8346d313fbf5 Mon Sep 17 00:00:00 2001
From: Ashley <ashley.ruglys@gmail.com>
Date: Wed, 10 Mar 2021 09:40:22 +0100
Subject: [PATCH 0480/1194] Return babe configuration information in the babe
 api epoch functions (#8072)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Make changes

* Add serialize/deserialize, copy babe epoch config defaults from node runtime

* Fix line widths and turn default features off for serde

* Remove ser/deser from Epoch, fix node-cli

* Apply suggestions

* Add comment to BABE_GENESIS_EPOCH_CONFIG in bin

* Apply suggestions

* Add a sketchy migration function

* Add a migration test

* Check for PendingEpochConfigChange as well

* Make epoch_config in node-cli

* Move updating EpochConfig out of the if

* Fix executor tests

* Calculate weight for add_epoch_configurations

* Fix babe test

* Apply suggestions from code review

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Add more asserts to tests, remove unused changes to primitives/slots

* Allow setting the migration pallet prefix

* Rename to BabePalletPrefix

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
---
 Cargo.lock                           |  1 +
 bin/node/cli/src/chain_spec.rs       |  1 +
 bin/node/runtime/src/lib.rs          | 11 +++-
 bin/node/testing/src/genesis.rs      |  7 ++-
 client/consensus/babe/src/lib.rs     |  1 +
 frame/babe/src/lib.rs                | 84 ++++++++++++++++++++++---
 frame/babe/src/tests.rs              | 91 ++++++++++++++++++++++++++--
 primitives/consensus/babe/Cargo.toml |  2 +
 primitives/consensus/babe/src/lib.rs |  6 ++
 9 files changed, 187 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b42b637bcf39..742dd0ed85b5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8539,6 +8539,7 @@ version = "0.9.0"
 dependencies = [
  "merlin",
  "parity-scale-codec",
+ "serde",
  "sp-api",
  "sp-application-crypto",
  "sp-consensus",
diff --git a/bin/node/cli/src/chain_spec.rs b/bin/node/cli/src/chain_spec.rs
index 3b40dde37721..43383bb3c3a9 100644
--- a/bin/node/cli/src/chain_spec.rs
+++ b/bin/node/cli/src/chain_spec.rs
@@ -305,6 +305,7 @@ pub fn testnet_genesis(
 		},
 		pallet_babe: BabeConfig {
 			authorities: vec![],
+			epoch_config: Some(node_runtime::BABE_GENESIS_EPOCH_CONFIG),
 		},
 		pallet_im_online: ImOnlineConfig {
 			keys: vec![],
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index b032fcb174e7..55f42b5723ba 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -119,6 +119,13 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	transaction_version: 2,
 };
 
+/// The BABE epoch configuration at genesis.
+pub const BABE_GENESIS_EPOCH_CONFIG: sp_consensus_babe::BabeEpochConfiguration =
+	sp_consensus_babe::BabeEpochConfiguration {
+		c: PRIMARY_PROBABILITY,
+		allowed_slots: sp_consensus_babe::AllowedSlots::PrimaryAndSecondaryPlainSlots
+	};
+
 /// Native version.
 #[cfg(any(feature = "std", test))]
 pub fn native_version() -> NativeVersion {
@@ -1274,10 +1281,10 @@ impl_runtime_apis! {
 			sp_consensus_babe::BabeGenesisConfiguration {
 				slot_duration: Babe::slot_duration(),
 				epoch_length: EpochDuration::get(),
-				c: PRIMARY_PROBABILITY,
+				c: BABE_GENESIS_EPOCH_CONFIG.c,
 				genesis_authorities: Babe::authorities(),
 				randomness: Babe::randomness(),
-				allowed_slots: sp_consensus_babe::AllowedSlots::PrimaryAndSecondaryPlainSlots,
+				allowed_slots: BABE_GENESIS_EPOCH_CONFIG.allowed_slots,
 			}
 		}
 
diff --git a/bin/node/testing/src/genesis.rs b/bin/node/testing/src/genesis.rs
index 22187f404cfe..25b728ebe193 100644
--- a/bin/node/testing/src/genesis.rs
+++ b/bin/node/testing/src/genesis.rs
@@ -23,7 +23,7 @@ use sp_keyring::{Ed25519Keyring, Sr25519Keyring};
 use node_runtime::{
 	GenesisConfig, BalancesConfig, SessionConfig, StakingConfig, SystemConfig,
 	GrandpaConfig, IndicesConfig, ContractsConfig, SocietyConfig, wasm_binary_unwrap,
-	AccountId, StakerStatus,
+	AccountId, StakerStatus, BabeConfig, BABE_GENESIS_EPOCH_CONFIG,
 };
 use node_runtime::constants::currency::*;
 use sp_core::ChangesTrieConfiguration;
@@ -100,7 +100,10 @@ pub fn config_endowed(
 		pallet_contracts: ContractsConfig {
 			current_schedule: Default::default(),
 		},
-		pallet_babe: Default::default(),
+		pallet_babe: BabeConfig {
+			authorities: vec![],
+			epoch_config: Some(BABE_GENESIS_EPOCH_CONFIG),
+		},
 		pallet_grandpa: GrandpaConfig {
 			authorities: vec![],
 		},
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index 7f2f47da5d5d..861f82c0090a 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -517,6 +517,7 @@ async fn answer_requests<B: BlockT, C>(
 						duration: viable_epoch.as_ref().duration,
 						authorities: viable_epoch.as_ref().authorities.clone(),
 						randomness: viable_epoch.as_ref().randomness,
+						config: viable_epoch.as_ref().config.clone(),
 					})
 				};
 
diff --git a/frame/babe/src/lib.rs b/frame/babe/src/lib.rs
index 9fdb080574b7..29c815444a3a 100644
--- a/frame/babe/src/lib.rs
+++ b/frame/babe/src/lib.rs
@@ -42,7 +42,8 @@ use sp_timestamp::OnTimestampSet;
 
 use sp_consensus_babe::{
 	digests::{NextConfigDescriptor, NextEpochDescriptor, PreDigest},
-	BabeAuthorityWeight, ConsensusLog, Epoch, EquivocationProof, Slot, BABE_ENGINE_ID,
+	BabeAuthorityWeight, BabeEpochConfiguration, ConsensusLog, Epoch,
+	EquivocationProof, Slot, BABE_ENGINE_ID,
 };
 use sp_consensus_vrf::schnorrkel;
 
@@ -187,8 +188,8 @@ decl_storage! {
 		// variable to its underlying value.
 		pub Randomness get(fn randomness): schnorrkel::Randomness;
 
-		/// Next epoch configuration, if changed.
-		NextEpochConfig: Option<NextConfigDescriptor>;
+		/// Pending epoch configuration change that will be applied when the next epoch is enacted.
+		PendingEpochConfigChange: Option<NextConfigDescriptor>;
 
 		/// Next epoch randomness.
 		NextRandomness: schnorrkel::Randomness;
@@ -225,10 +226,21 @@ decl_storage! {
 		/// on block finalization. Querying this storage entry outside of block
 		/// execution context should always yield zero.
 		Lateness get(fn lateness): T::BlockNumber;
+
+		/// The configuration for the current epoch. Should never be `None` as it is initialized in genesis.
+		EpochConfig: Option<BabeEpochConfiguration>;
+
+		/// The configuration for the next epoch, `None` if the config will not change
+		/// (you can fallback to `EpochConfig` instead in that case).
+		NextEpochConfig: Option<BabeEpochConfiguration>;
 	}
 	add_extra_genesis {
 		config(authorities): Vec<(AuthorityId, BabeAuthorityWeight)>;
-		build(|config| Module::<T>::initialize_authorities(&config.authorities))
+		config(epoch_config): Option<BabeEpochConfiguration>;
+		build(|config| {
+			Module::<T>::initialize_authorities(&config.authorities);
+			EpochConfig::put(config.epoch_config.clone().expect("epoch_config must not be None"));
+		})
 	}
 }
 
@@ -326,7 +338,7 @@ decl_module! {
 			config: NextConfigDescriptor,
 		) {
 			ensure_root(origin)?;
-			NextEpochConfig::put(config);
+			PendingEpochConfigChange::put(config);
 		}
 	}
 }
@@ -490,8 +502,16 @@ impl<T: Config> Module<T> {
 		};
 		Self::deposit_consensus(ConsensusLog::NextEpochData(next_epoch));
 
-		if let Some(next_config) = NextEpochConfig::take() {
-			Self::deposit_consensus(ConsensusLog::NextConfigData(next_config));
+		if let Some(next_config) = NextEpochConfig::get() {
+			EpochConfig::put(next_config);
+		}
+
+		if let Some(pending_epoch_config_change) = PendingEpochConfigChange::take() {
+			let next_epoch_config: BabeEpochConfiguration =
+				pending_epoch_config_change.clone().into();
+			NextEpochConfig::put(next_epoch_config);
+
+			Self::deposit_consensus(ConsensusLog::NextConfigData(pending_epoch_config_change));
 		}
 	}
 
@@ -510,6 +530,7 @@ impl<T: Config> Module<T> {
 			duration: T::EpochDuration::get(),
 			authorities: Self::authorities(),
 			randomness: Self::randomness(),
+			config: EpochConfig::get().expect("EpochConfig is initialized in genesis; we never `take` or `kill` it; qed"),
 		}
 	}
 
@@ -527,6 +548,9 @@ impl<T: Config> Module<T> {
 			duration: T::EpochDuration::get(),
 			authorities: NextAuthorities::get(),
 			randomness: NextRandomness::get(),
+			config: NextEpochConfig::get().unwrap_or_else(|| {
+				EpochConfig::get().expect("EpochConfig is initialized in genesis; we never `take` or `kill` it; qed")
+			}),
 		}
 	}
 
@@ -835,3 +859,49 @@ fn compute_randomness(
 
 	sp_io::hashing::blake2_256(&s)
 }
+
+pub mod migrations {
+	use super::*;
+	use frame_support::pallet_prelude::{ValueQuery, StorageValue};
+
+	/// Something that can return the storage prefix of the `Babe` pallet.
+	pub trait BabePalletPrefix: Config {
+		fn pallet_prefix() -> &'static str;
+	}
+
+	struct __OldNextEpochConfig<T>(sp_std::marker::PhantomData<T>);
+	impl<T: BabePalletPrefix> frame_support::traits::StorageInstance for __OldNextEpochConfig<T> {
+		fn pallet_prefix() -> &'static str { T::pallet_prefix() }
+		const STORAGE_PREFIX: &'static str = "NextEpochConfig";
+	}
+
+	type OldNextEpochConfig<T> = StorageValue<
+		__OldNextEpochConfig<T>, Option<NextConfigDescriptor>, ValueQuery
+	>;
+
+	/// A storage migration that adds the current epoch configuration for Babe
+	/// to storage.
+	pub fn add_epoch_configuration<T: BabePalletPrefix>(
+		epoch_config: BabeEpochConfiguration,
+	) -> Weight {
+		let mut writes = 0;
+		let mut reads = 0;
+
+		if let Some(pending_change) = OldNextEpochConfig::<T>::get() {
+			PendingEpochConfigChange::put(pending_change);
+
+			writes += 1;
+		}
+
+		reads += 1;
+
+		OldNextEpochConfig::<T>::kill();
+
+		EpochConfig::put(epoch_config.clone());
+		NextEpochConfig::put(epoch_config);
+
+		writes += 3;
+
+		T::DbWeight::get().writes(writes) + T::DbWeight::get().reads(reads)
+	}
+}
diff --git a/frame/babe/src/tests.rs b/frame/babe/src/tests.rs
index c7261d7f1f96..6515e5fdaaf9 100644
--- a/frame/babe/src/tests.rs
+++ b/frame/babe/src/tests.rs
@@ -25,7 +25,7 @@ use frame_support::{
 };
 use mock::*;
 use pallet_session::ShouldEndSession;
-use sp_consensus_babe::{AllowedSlots, Slot};
+use sp_consensus_babe::{AllowedSlots, Slot, BabeEpochConfiguration};
 use sp_core::crypto::Pair;
 
 const EMPTY_RANDOMNESS: [u8; 32] = [
@@ -231,11 +231,31 @@ fn can_enact_next_config() {
 		assert_eq!(Babe::epoch_index(), 0);
 		go_to_block(2, 7);
 
+		let current_config = BabeEpochConfiguration {
+			c: (0, 4),
+			allowed_slots: sp_consensus_babe::AllowedSlots::PrimarySlots,
+		};
+
+		let next_config = BabeEpochConfiguration {
+			c: (1, 4),
+			allowed_slots: sp_consensus_babe::AllowedSlots::PrimarySlots,
+		};
+
+		let next_next_config = BabeEpochConfiguration {
+			c: (2, 4),
+			allowed_slots: sp_consensus_babe::AllowedSlots::PrimarySlots,
+		};
+
+		EpochConfig::put(current_config);
+		NextEpochConfig::put(next_config.clone());
+
+		assert_eq!(NextEpochConfig::get(), Some(next_config.clone()));
+
 		Babe::plan_config_change(
 			Origin::root(),
 			NextConfigDescriptor::V1 {
-				c: (1, 4),
-				allowed_slots: AllowedSlots::PrimarySlots,
+				c: next_next_config.c,
+				allowed_slots: next_next_config.allowed_slots,
 			},
 		).unwrap();
 
@@ -243,10 +263,13 @@ fn can_enact_next_config() {
 		Babe::on_finalize(9);
 		let header = System::finalize();
 
+		assert_eq!(EpochConfig::get(), Some(next_config));
+		assert_eq!(NextEpochConfig::get(), Some(next_next_config.clone()));
+
 		let consensus_log = sp_consensus_babe::ConsensusLog::NextConfigData(
-			sp_consensus_babe::digests::NextConfigDescriptor::V1 {
-				c: (1, 4),
-				allowed_slots: AllowedSlots::PrimarySlots,
+			NextConfigDescriptor::V1 {
+				c: next_next_config.c,
+				allowed_slots: next_next_config.allowed_slots,
 			}
 		);
 		let consensus_digest = DigestItem::Consensus(BABE_ENGINE_ID, consensus_log.encode());
@@ -291,6 +314,11 @@ fn only_root_can_enact_config_change() {
 #[test]
 fn can_fetch_current_and_next_epoch_data() {
 	new_test_ext(5).execute_with(|| {
+		EpochConfig::put(BabeEpochConfiguration {
+			c: (1, 4),
+			allowed_slots: sp_consensus_babe::AllowedSlots::PrimarySlots,
+		});
+
 		// genesis authorities should be used for the first and second epoch
 		assert_eq!(
 			Babe::current_epoch().authorities,
@@ -809,3 +837,54 @@ fn valid_equivocation_reports_dont_pay_fees() {
 		assert_eq!(post_info.pays_fee, Pays::Yes);
 	})
 }
+
+#[test]
+fn add_epoch_configurations_migration_works() {
+	use frame_support::storage::migration::{
+		put_storage_value, get_storage_value,
+	};
+
+	impl crate::migrations::BabePalletPrefix for Test {
+		fn pallet_prefix() -> &'static str {
+			"Babe"
+		}
+	}
+
+	new_test_ext(1).execute_with(|| {
+		let next_config_descriptor = NextConfigDescriptor::V1 {
+			c: (3, 4),
+			allowed_slots: AllowedSlots::PrimarySlots
+		};
+
+		put_storage_value(
+			b"Babe",
+			b"NextEpochConfig",
+			&[],
+			Some(next_config_descriptor.clone())
+		);
+
+		assert!(get_storage_value::<Option<NextConfigDescriptor>>(
+			b"Babe",
+			b"NextEpochConfig",
+			&[],
+		).is_some());
+
+		let current_epoch = BabeEpochConfiguration {
+			c: (1, 4),
+			allowed_slots: sp_consensus_babe::AllowedSlots::PrimarySlots,
+		};
+
+		crate::migrations::add_epoch_configuration::<Test>(
+			current_epoch.clone()
+		);
+
+		assert!(get_storage_value::<Option<NextConfigDescriptor>>(
+			b"Babe",
+			b"NextEpochConfig",
+			&[],
+		).is_none());
+
+		assert_eq!(EpochConfig::get(), Some(current_epoch));
+		assert_eq!(PendingEpochConfigChange::get(), Some(next_config_descriptor));
+	});
+}
diff --git a/primitives/consensus/babe/Cargo.toml b/primitives/consensus/babe/Cargo.toml
index fb02014eeef5..a8ab03dcdaa4 100644
--- a/primitives/consensus/babe/Cargo.toml
+++ b/primitives/consensus/babe/Cargo.toml
@@ -26,6 +26,7 @@ sp-inherents = { version = "3.0.0", default-features = false, path = "../../inhe
 sp-keystore = { version = "0.9.0", default-features = false, path = "../../keystore", optional = true }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../runtime" }
 sp-timestamp = { version = "3.0.0", default-features = false, path = "../../timestamp" }
+serde = { version = "1.0.123", features = ["derive"], optional = true }
 
 [features]
 default = ["std"]
@@ -43,4 +44,5 @@ std = [
 	"sp-keystore",
 	"sp-runtime/std",
 	"sp-timestamp/std",
+	"serde",
 ]
diff --git a/primitives/consensus/babe/src/lib.rs b/primitives/consensus/babe/src/lib.rs
index 6987796c114a..1b416c996fcf 100644
--- a/primitives/consensus/babe/src/lib.rs
+++ b/primitives/consensus/babe/src/lib.rs
@@ -30,6 +30,8 @@ pub use sp_consensus_vrf::schnorrkel::{
 
 use codec::{Decode, Encode};
 #[cfg(feature = "std")]
+use serde::{Serialize, Deserialize};
+#[cfg(feature = "std")]
 use sp_keystore::vrf::{VRFTranscriptData, VRFTranscriptValue};
 use sp_runtime::{traits::Header, ConsensusEngineId, RuntimeDebug};
 use sp_std::vec::Vec;
@@ -216,6 +218,7 @@ pub struct BabeGenesisConfiguration {
 
 /// Types of allowed slots.
 #[derive(Clone, Copy, PartialEq, Eq, Encode, Decode, RuntimeDebug)]
+#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 pub enum AllowedSlots {
 	/// Only allow primary slots.
 	PrimarySlots,
@@ -248,6 +251,7 @@ impl sp_consensus::SlotData for BabeGenesisConfiguration {
 
 /// Configuration data used by the BABE consensus engine.
 #[derive(Clone, PartialEq, Eq, Encode, Decode, RuntimeDebug)]
+#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 pub struct BabeEpochConfiguration {
 	/// A constant value that is used in the threshold calculation formula.
 	/// Expressed as a rational where the first member of the tuple is the
@@ -362,6 +366,8 @@ pub struct Epoch {
 	pub authorities: Vec<(AuthorityId, BabeAuthorityWeight)>,
 	/// Randomness for this epoch.
 	pub randomness: [u8; VRF_OUTPUT_LENGTH],
+	/// Configuration of the epoch.
+	pub config: BabeEpochConfiguration,
 }
 
 sp_api::decl_runtime_apis! {

From ef50a44531b807685c9fc17adbaded9998acce39 Mon Sep 17 00:00:00 2001
From: Denis Pisarev <denis.pisarev@parity.io>
Date: Wed, 10 Mar 2021 15:53:54 +0100
Subject: [PATCH 0481/1194] CI: return docs jobs (#8307)

* CI: return docs jobs allowing them to fail

* CI: refrain from Dwarnings for now

* CI: pass RUSTFLAGS directly; no need removing what wasn't there
---
 .gitlab-ci.yml | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9cd755bc799b..a7eedee9aa24 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -468,6 +468,30 @@ build-macos-subkey:
   tags:
     - osx
 
+build-rust-doc:
+  stage:                           build
+  <<:                              *docker-env
+  <<:                              *test-refs
+  needs:
+    - job:                         test-linux-stable
+      artifacts:                   false
+  variables:
+    <<:                            *default-vars
+    SKIP_WASM_BUILD:               1
+  artifacts:
+    name:                          "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}-doc"
+    when:                          on_success
+    expire_in:                     7 days
+    paths:
+    - ./crate-docs/
+  script:
+    - RUSTDOCFLAGS="--html-in-header $(pwd)/.maintain/rustdoc-header.html"
+        time cargo +nightly doc --no-deps --workspace --all-features --verbose
+    - mv ./target/doc ./crate-docs
+    - echo "<meta http-equiv=refresh content=0;url=sc_service/index.html>" > ./crate-docs/index.html
+    - sccache -s
+  allow_failure:                   true
+
 #### stage:                        publish
 
 .build-push-docker-image:          &build-push-docker-image
@@ -550,6 +574,32 @@ publish-s3-release:
     - aws s3 ls s3://${BUCKET}/${PREFIX}/latest/
         --recursive --human-readable --summarize
 
+publish-s3-doc:
+  stage:                           publish
+  image:                           paritytech/awscli:latest
+  allow_failure:                   true
+  needs:
+    - job:                         build-rust-doc
+      artifacts:                   true
+    - job:                         build-linux-substrate
+      artifacts:                   false
+  <<:                              *publish-refs
+  <<:                              *kubernetes-build
+  variables:
+    GIT_STRATEGY:                  none
+    BUCKET:                        "releases.parity.io"
+    PREFIX:                        "substrate-rustdoc"
+  script:
+    - test -r ./crate-docs/index.html || (
+        echo "./crate-docs/index.html not present, build:rust:doc:release job not complete";
+        exit 1
+      )
+    - aws s3 sync --delete --size-only --only-show-errors
+        ./crate-docs/ s3://${BUCKET}/${PREFIX}/
+  after_script:
+    - aws s3 ls s3://${BUCKET}/${PREFIX}/
+        --human-readable --summarize
+
 publish-draft-release:
   stage:                           publish
   image:                           paritytech/tools:latest

From 3adefdcea47a26c4904651e108129fd6b6ce132a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomusdrw@users.noreply.github.com>
Date: Wed, 10 Mar 2021 16:28:56 +0100
Subject: [PATCH 0482/1194] Custom RPC for Merkle Mountain Range pallet (#8137)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add MMR custom RPC.

* Change RuntimeApi to avoid hardcoding leaf type.

* Properly implement the new RuntimeAPI and wire up RPC.

* Extract Offchain DB as separate execution extension.

* Enable offchain DB access for offchain calls.

* Fix offchain_election tests.

* Skip block initialisation for proof generation.

* Fix integration test setup.

* Fix offchain tests. Not sure how I missed them earlier 🤷.

* Fix long line.

* One more test missing.

* Update mock for multi-phase.

* Address review grumbbles.

* Address review grumbles.

* Fix line width of a comment
---
 Cargo.lock                                    |  21 ++
 Cargo.toml                                    |   1 +
 bin/node-template/node/src/service.rs         |   4 +-
 bin/node/cli/src/service.rs                   |   4 +-
 bin/node/rpc/Cargo.toml                       |   1 +
 bin/node/rpc/src/lib.rs                       |   5 +
 bin/node/runtime/src/lib.rs                   |  18 +-
 bin/node/testing/src/bench.rs                 |   7 +-
 client/api/src/execution_extensions.rs        |  33 ++-
 client/executor/src/integration_tests/mod.rs  |   9 +-
 client/offchain/Cargo.toml                    |  17 +-
 client/offchain/src/api.rs                    | 165 ++++++++-----
 client/offchain/src/lib.rs                    |  34 ++-
 client/service/src/builder.rs                 |  75 +++---
 client/service/src/client/client.rs           |   6 +-
 client/service/src/lib.rs                     |   2 +-
 .../election-provider-multi-phase/src/mock.rs |   5 +-
 frame/example-offchain-worker/src/tests.rs    |  14 +-
 frame/im-online/src/tests.rs                  |   9 +-
 .../primitives/src/lib.rs                     |  79 ++++++-
 frame/merkle-mountain-range/rpc/Cargo.toml    |  29 +++
 frame/merkle-mountain-range/rpc/src/lib.rs    | 222 ++++++++++++++++++
 .../merkle-mountain-range/src/mmr/storage.rs  |  12 +-
 frame/merkle-mountain-range/src/tests.rs      |   5 +-
 frame/session/src/historical/offchain.rs      |   6 +-
 frame/staking/fuzzer/src/submit_solution.rs   |   5 +-
 frame/staking/src/tests.rs                    |   5 +-
 primitives/core/src/lib.rs                    |   3 +-
 primitives/core/src/offchain/mod.rs           | 207 ++++++++--------
 primitives/core/src/offchain/testing.rs       |  80 ++++---
 primitives/io/src/lib.rs                      |  53 +++--
 primitives/runtime/src/offchain/http.rs       |   6 +-
 primitives/runtime/src/offchain/storage.rs    |   6 +-
 .../runtime/src/offchain/storage_lock.rs      |  14 +-
 test-utils/client/Cargo.toml                  |   1 +
 test-utils/client/src/lib.rs                  |   2 +
 utils/frame/benchmarking-cli/src/command.rs   |   4 +-
 37 files changed, 828 insertions(+), 341 deletions(-)
 create mode 100644 frame/merkle-mountain-range/rpc/Cargo.toml
 create mode 100644 frame/merkle-mountain-range/rpc/src/lib.rs

diff --git a/Cargo.lock b/Cargo.lock
index 742dd0ed85b5..5dddea40cb15 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4112,6 +4112,7 @@ dependencies = [
  "node-primitives",
  "node-runtime",
  "pallet-contracts-rpc",
+ "pallet-mmr-rpc",
  "pallet-transaction-payment-rpc",
  "sc-chain-spec",
  "sc-client-api",
@@ -5041,6 +5042,24 @@ dependencies = [
  "sp-std",
 ]
 
+[[package]]
+name = "pallet-mmr-rpc"
+version = "3.0.0"
+dependencies = [
+ "jsonrpc-core",
+ "jsonrpc-core-client",
+ "jsonrpc-derive",
+ "pallet-mmr-primitives",
+ "parity-scale-codec",
+ "serde",
+ "serde_json",
+ "sp-api",
+ "sp-blockchain",
+ "sp-core",
+ "sp-rpc",
+ "sp-runtime",
+]
+
 [[package]]
 name = "pallet-multisig"
 version = "3.0.0"
@@ -7548,6 +7567,7 @@ dependencies = [
  "fnv",
  "futures 0.3.12",
  "futures-timer 3.0.2",
+ "hex",
  "hyper 0.13.9",
  "hyper-rustls",
  "lazy_static",
@@ -9336,6 +9356,7 @@ dependencies = [
  "sc-consensus",
  "sc-executor",
  "sc-light",
+ "sc-offchain",
  "sc-service",
  "serde",
  "serde_json",
diff --git a/Cargo.toml b/Cargo.toml
index 9a494d6aff39..4d8cfc3e9754 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -89,6 +89,7 @@ members = [
 	"frame/membership",
 	"frame/merkle-mountain-range",
 	"frame/merkle-mountain-range/primitives",
+	"frame/merkle-mountain-range/rpc",
 	"frame/metadata",
 	"frame/multisig",
 	"frame/nicks",
diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
index 368767fbdd2a..4ea54dc8174a 100644
--- a/bin/node-template/node/src/service.rs
+++ b/bin/node-template/node/src/service.rs
@@ -141,7 +141,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 
 	if config.offchain_worker.enabled {
 		sc_service::build_offchain_workers(
-			&config, backend.clone(), task_manager.spawn_handle(), client.clone(), network.clone(),
+			&config, task_manager.spawn_handle(), client.clone(), network.clone(),
 		);
 	}
 
@@ -323,7 +323,7 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
 
 	if config.offchain_worker.enabled {
 		sc_service::build_offchain_workers(
-			&config, backend.clone(), task_manager.spawn_handle(), client.clone(), network.clone(),
+			&config, task_manager.spawn_handle(), client.clone(), network.clone(),
 		);
 	}
 
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index 6fed5bf5c649..92f30a72577d 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -219,7 +219,7 @@ pub fn new_full_base(
 
 	if config.offchain_worker.enabled {
 		sc_service::build_offchain_workers(
-			&config, backend.clone(), task_manager.spawn_handle(), client.clone(), network.clone(),
+			&config, task_manager.spawn_handle(), client.clone(), network.clone(),
 		);
 	}
 
@@ -430,7 +430,7 @@ pub fn new_light_base(mut config: Configuration) -> Result<(
 
 	if config.offchain_worker.enabled {
 		sc_service::build_offchain_workers(
-			&config, backend.clone(), task_manager.spawn_handle(), client.clone(), network.clone(),
+			&config, task_manager.spawn_handle(), client.clone(), network.clone(),
 		);
 	}
 
diff --git a/bin/node/rpc/Cargo.toml b/bin/node/rpc/Cargo.toml
index 1689d0e8247f..7a25b6d8b0f6 100644
--- a/bin/node/rpc/Cargo.toml
+++ b/bin/node/rpc/Cargo.toml
@@ -15,6 +15,7 @@ jsonrpc-core = "15.1.0"
 node-primitives = { version = "2.0.0", path = "../primitives" }
 node-runtime = { version = "2.0.0", path = "../runtime" }
 pallet-contracts-rpc = { version = "3.0.0", path = "../../../frame/contracts/rpc/" }
+pallet-mmr-rpc = { version = "3.0.0", path = "../../../frame/merkle-mountain-range/rpc/" }
 pallet-transaction-payment-rpc = { version = "3.0.0", path = "../../../frame/transaction-payment/rpc/" }
 sc-client-api = { version = "3.0.0", path = "../../../client/api" }
 sc-consensus-babe = { version = "0.9.0", path = "../../../client/consensus/babe" }
diff --git a/bin/node/rpc/src/lib.rs b/bin/node/rpc/src/lib.rs
index e68ca6843bc9..1d9f88c8c914 100644
--- a/bin/node/rpc/src/lib.rs
+++ b/bin/node/rpc/src/lib.rs
@@ -116,6 +116,7 @@ pub fn create_full<C, P, SC, B>(
 		HeaderMetadata<Block, Error=BlockChainError> + Sync + Send + 'static,
 	C::Api: substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>,
 	C::Api: pallet_contracts_rpc::ContractsRuntimeApi<Block, AccountId, Balance, BlockNumber>,
+	C::Api: pallet_mmr_rpc::MmrRuntimeApi<Block, <Block as sp_runtime::traits::Block>::Hash>,
 	C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance>,
 	C::Api: BabeApi<Block>,
 	C::Api: BlockBuilder<Block>,
@@ -126,6 +127,7 @@ pub fn create_full<C, P, SC, B>(
 {
 	use substrate_frame_rpc_system::{FullSystem, SystemApi};
 	use pallet_contracts_rpc::{Contracts, ContractsApi};
+	use pallet_mmr_rpc::{MmrApi, Mmr};
 	use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApi};
 
 	let mut io = jsonrpc_core::IoHandler::default();
@@ -161,6 +163,9 @@ pub fn create_full<C, P, SC, B>(
 	io.extend_with(
 		ContractsApi::to_delegate(Contracts::new(client.clone()))
 	);
+	io.extend_with(
+		MmrApi::to_delegate(Mmr::new(client.clone()))
+	);
 	io.extend_with(
 		TransactionPaymentApi::to_delegate(TransactionPayment::new(client.clone()))
 	);
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 55f42b5723ba..8bb5cf0858d3 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -1377,23 +1377,31 @@ impl_runtime_apis! {
 
 	impl pallet_mmr::primitives::MmrApi<
 		Block,
-		mmr::Leaf,
 		mmr::Hash,
 	> for Runtime {
-		fn generate_proof(leaf_index: u64) -> Result<(mmr::Leaf, mmr::Proof<mmr::Hash>), mmr::Error> {
+		fn generate_proof(leaf_index: u64)
+			-> Result<(mmr::EncodableOpaqueLeaf, mmr::Proof<mmr::Hash>), mmr::Error>
+		{
 			Mmr::generate_proof(leaf_index)
+				.map(|(leaf, proof)| (mmr::EncodableOpaqueLeaf::from_leaf(&leaf), proof))
 		}
 
-		fn verify_proof(leaf: mmr::Leaf, proof: mmr::Proof<mmr::Hash>) -> Result<(), mmr::Error> {
+		fn verify_proof(leaf: mmr::EncodableOpaqueLeaf, proof: mmr::Proof<mmr::Hash>)
+			-> Result<(), mmr::Error>
+		{
+			let leaf: mmr::Leaf = leaf
+				.into_opaque_leaf()
+				.try_decode()
+				.ok_or(mmr::Error::Verify)?;
 			Mmr::verify_leaf(leaf, proof)
 		}
 
 		fn verify_proof_stateless(
 			root: mmr::Hash,
-			leaf: Vec<u8>,
+			leaf: mmr::EncodableOpaqueLeaf,
 			proof: mmr::Proof<mmr::Hash>
 		) -> Result<(), mmr::Error> {
-			let node = mmr::DataOrHash::Data(mmr::OpaqueLeaf(leaf));
+			let node = mmr::DataOrHash::Data(leaf.into_opaque_leaf());
 			pallet_mmr::verify_leaf_proof::<mmr::Hashing, _>(root, node, proof)
 		}
 	}
diff --git a/bin/node/testing/src/bench.rs b/bin/node/testing/src/bench.rs
index a6f65b86a0e2..668284101bee 100644
--- a/bin/node/testing/src/bench.rs
+++ b/bin/node/testing/src/bench.rs
@@ -417,13 +417,14 @@ impl BenchDb {
 		};
 		let task_executor = TaskExecutor::new();
 
-		let (client, backend) = sc_service::new_client(
-			db_config,
+		let backend = sc_service::new_db_backend(db_config).expect("Should not fail");
+		let client = sc_service::new_client(
+			backend.clone(),
 			NativeExecutor::new(WasmExecutionMethod::Compiled, None, 8),
 			&keyring.generate_genesis(),
 			None,
 			None,
-			ExecutionExtensions::new(profile.into_execution_strategies(), None),
+			ExecutionExtensions::new(profile.into_execution_strategies(), None, None),
 			Box::new(task_executor.clone()),
 			None,
 			Default::default(),
diff --git a/client/api/src/execution_extensions.rs b/client/api/src/execution_extensions.rs
index 1b13f2c6cffd..2f17408b7d7c 100644
--- a/client/api/src/execution_extensions.rs
+++ b/client/api/src/execution_extensions.rs
@@ -26,7 +26,7 @@ use std::sync::{Weak, Arc};
 use codec::Decode;
 use sp_core::{
 	ExecutionContext,
-	offchain::{self, OffchainExt, TransactionPoolExt},
+	offchain::{self, OffchainWorkerExt, TransactionPoolExt, OffchainDbExt},
 };
 use sp_keystore::{KeystoreExt, SyncCryptoStorePtr};
 use sp_runtime::{
@@ -76,6 +76,18 @@ impl ExtensionsFactory for () {
 	}
 }
 
+/// Create a Offchain DB accessor object.
+pub trait DbExternalitiesFactory: Send + Sync {
+	/// Create [`offchain::DbExternalities`] instance.
+	fn create(&self) -> Box<dyn offchain::DbExternalities>;
+}
+
+impl<T: offchain::DbExternalities + Clone + Sync + Send + 'static> DbExternalitiesFactory for T {
+	fn create(&self) -> Box<dyn offchain::DbExternalities> {
+		Box::new(self.clone())
+	}
+}
+
 /// A producer of execution extensions for offchain calls.
 ///
 /// This crate aggregates extensions available for the offchain calls
@@ -84,6 +96,7 @@ impl ExtensionsFactory for () {
 pub struct ExecutionExtensions<Block: traits::Block> {
 	strategies: ExecutionStrategies,
 	keystore: Option<SyncCryptoStorePtr>,
+	offchain_db: Option<Box<dyn DbExternalitiesFactory>>,
 	// FIXME: these two are only RwLock because of https://github.com/paritytech/substrate/issues/4587
 	//        remove when fixed.
 	// To break retain cycle between `Client` and `TransactionPool` we require this
@@ -99,6 +112,7 @@ impl<Block: traits::Block> Default for ExecutionExtensions<Block> {
 		Self {
 			strategies: Default::default(),
 			keystore: None,
+			offchain_db: None,
 			transaction_pool: RwLock::new(None),
 			extensions_factory: RwLock::new(Box::new(())),
 		}
@@ -110,12 +124,14 @@ impl<Block: traits::Block> ExecutionExtensions<Block> {
 	pub fn new(
 		strategies: ExecutionStrategies,
 		keystore: Option<SyncCryptoStorePtr>,
+		offchain_db: Option<Box<dyn DbExternalitiesFactory>>,
 	) -> Self {
 		let transaction_pool = RwLock::new(None);
 		let extensions_factory = Box::new(());
 		Self {
 			strategies,
 			keystore,
+			offchain_db,
 			extensions_factory: RwLock::new(extensions_factory),
 			transaction_pool,
 		}
@@ -164,9 +180,22 @@ impl<Block: traits::Block> ExecutionExtensions<Block> {
 			}
 		}
 
+		if capabilities.has(offchain::Capability::OffchainDbRead) ||
+			capabilities.has(offchain::Capability::OffchainDbWrite)
+		{
+			if let Some(offchain_db) = self.offchain_db.as_ref() {
+				extensions.register(
+					OffchainDbExt::new(offchain::LimitedExternalities::new(
+						capabilities,
+						offchain_db.create(),
+					))
+				);
+			}
+		}
+
 		if let ExecutionContext::OffchainCall(Some(ext)) = context {
 			extensions.register(
-				OffchainExt::new(offchain::LimitedExternalities::new(capabilities, ext.0)),
+				OffchainWorkerExt::new(offchain::LimitedExternalities::new(capabilities, ext.0)),
 			);
 		}
 
diff --git a/client/executor/src/integration_tests/mod.rs b/client/executor/src/integration_tests/mod.rs
index b28e3ca2436b..d08f830f40da 100644
--- a/client/executor/src/integration_tests/mod.rs
+++ b/client/executor/src/integration_tests/mod.rs
@@ -21,7 +21,7 @@ use codec::{Encode, Decode};
 use hex_literal::hex;
 use sp_core::{
 	blake2_128, blake2_256, ed25519, sr25519, map, Pair,
-	offchain::{OffchainExt, testing},
+	offchain::{OffchainWorkerExt, OffchainDbExt, testing},
 	traits::{Externalities, CallInWasm},
 };
 use sc_runtime_test::wasm_binary_unwrap;
@@ -468,7 +468,7 @@ test_wasm_execution!(offchain_index);
 fn offchain_index(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let (offchain, _state) = testing::TestOffchainExt::new();
-	ext.register_extension(OffchainExt::new(offchain));
+	ext.register_extension(OffchainWorkerExt::new(offchain));
 	call_in_wasm(
 		"test_offchain_index_set",
 		&[0],
@@ -487,7 +487,8 @@ test_wasm_execution!(offchain_local_storage_should_work);
 fn offchain_local_storage_should_work(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let (offchain, state) = testing::TestOffchainExt::new();
-	ext.register_extension(OffchainExt::new(offchain));
+	ext.register_extension(OffchainDbExt::new(offchain.clone()));
+	ext.register_extension(OffchainWorkerExt::new(offchain));
 	assert_eq!(
 		call_in_wasm(
 			"test_offchain_local_storage",
@@ -504,7 +505,7 @@ test_wasm_execution!(offchain_http_should_work);
 fn offchain_http_should_work(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let (offchain, state) = testing::TestOffchainExt::new();
-	ext.register_extension(OffchainExt::new(offchain));
+	ext.register_extension(OffchainWorkerExt::new(offchain));
 	state.write().expect_request(testing::PendingRequest {
 			method: "POST".into(),
 			uri: "http://localhost:12345".into(),
diff --git a/client/offchain/Cargo.toml b/client/offchain/Cargo.toml
index 5671affb6fb7..9aca829c70d6 100644
--- a/client/offchain/Cargo.toml
+++ b/client/offchain/Cargo.toml
@@ -14,23 +14,24 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 bytes = "0.5"
-sc-client-api = { version = "3.0.0", path = "../api" }
-sp-api = { version = "3.0.0", path = "../../primitives/api" }
+codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
+hex = "0.4"
 fnv = "1.0.6"
 futures = "0.3.9"
 futures-timer = "3.0.1"
 log = "0.4.8"
-threadpool = "1.7"
 num_cpus = "1.10"
-sp-offchain = { version = "3.0.0", path = "../../primitives/offchain" }
-codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 parking_lot = "0.11.1"
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
 rand = "0.7.2"
+sc-client-api = { version = "3.0.0", path = "../api" }
+sc-keystore = { version = "3.0.0", path = "../keystore" }
+sc-network = { version = "0.9.0", path = "../network" }
+sp-api = { version = "3.0.0", path = "../../primitives/api" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-offchain = { version = "3.0.0", path = "../../primitives/offchain" }
 sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
 sp-utils = { version = "3.0.0", path = "../../primitives/utils" }
-sc-network = { version = "0.9.0", path = "../network" }
-sc-keystore = { version = "3.0.0", path = "../keystore" }
+threadpool = "1.7"
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
 hyper = "0.13.9"
diff --git a/client/offchain/src/api.rs b/client/offchain/src/api.rs
index 64c5060fb0c6..9b5ff69b726a 100644
--- a/client/offchain/src/api.rs
+++ b/client/offchain/src/api.rs
@@ -26,12 +26,11 @@ use std::{
 
 use crate::NetworkProvider;
 use futures::Future;
-use log::error;
 use sc_network::{PeerId, Multiaddr};
 use codec::{Encode, Decode};
 use sp_core::OpaquePeerId;
 use sp_core::offchain::{
-	Externalities as OffchainExt, HttpRequestId, Timestamp, HttpRequestStatus, HttpError,
+	self, HttpRequestId, Timestamp, HttpRequestStatus, HttpError,
 	OffchainStorage, OpaqueNetworkState, OpaqueMultiaddr, StorageKind,
 };
 pub use sp_offchain::STORAGE_PREFIX;
@@ -47,22 +46,9 @@ mod http_dummy;
 
 mod timestamp;
 
-/// Asynchronous offchain API.
-///
-/// NOTE this is done to prevent recursive calls into the runtime (which are not supported currently).
-pub(crate) struct Api<Storage> {
-	/// Offchain Workers database.
-	db: Storage,
-	/// A provider for substrate networking.
-	network_provider: Arc<dyn NetworkProvider + Send + Sync>,
-	/// Is this node a potential validator?
-	is_validator: bool,
-	/// Everything HTTP-related is handled by a different struct.
-	http: http::HttpApi,
-}
-
 fn unavailable_yet<R: Default>(name: &str) -> R {
-	error!(
+	log::error!(
+		target: "sc_offchain",
 		"The {:?} API is not available for offchain workers yet. Follow \
 		https://github.com/paritytech/substrate/issues/1458 for details", name
 	);
@@ -71,43 +57,52 @@ fn unavailable_yet<R: Default>(name: &str) -> R {
 
 const LOCAL_DB: &str = "LOCAL (fork-aware) DB";
 
-impl<Storage: OffchainStorage> OffchainExt for Api<Storage> {
-	fn is_validator(&self) -> bool {
-		self.is_validator
-	}
-
-	fn network_state(&self) -> Result<OpaqueNetworkState, ()> {
-		let external_addresses = self.network_provider.external_addresses();
-
-		let state = NetworkState::new(
-			self.network_provider.local_peer_id(),
-			external_addresses,
-		);
-		Ok(OpaqueNetworkState::from(state))
-	}
+/// Offchain DB reference.
+#[derive(Debug, Clone)]
+pub struct Db<Storage> {
+	/// Persistent storage database.
+	persistent: Storage,
+}
 
-	fn timestamp(&mut self) -> Timestamp {
-		timestamp::now()
+impl<Storage: OffchainStorage> Db<Storage> {
+	/// Create new instance of Offchain DB.
+	pub fn new(persistent: Storage) -> Self {
+		Self { persistent }
 	}
 
-	fn sleep_until(&mut self, deadline: Timestamp) {
-		sleep(timestamp::timestamp_from_now(deadline));
-	}
-
-	fn random_seed(&mut self) -> [u8; 32] {
-		rand::random()
+	/// Create new instance of Offchain DB, backed by given backend.
+	pub fn factory_from_backend<Backend, Block>(backend: &Backend) -> Option<
+		Box<dyn sc_client_api::execution_extensions::DbExternalitiesFactory>
+	> where
+		Backend: sc_client_api::Backend<Block, OffchainStorage = Storage>,
+		Block: sp_runtime::traits::Block,
+		Storage: 'static,
+	{
+		sc_client_api::Backend::offchain_storage(backend).map(|db|
+			Box::new(Self::new(db)) as _
+		)
 	}
+}
 
+impl<Storage: OffchainStorage> offchain::DbExternalities for Db<Storage> {
 	fn local_storage_set(&mut self, kind: StorageKind, key: &[u8], value: &[u8]) {
+		log::debug!(
+			target: "sc_offchain",
+			"{:?}: Write: {:?} <= {:?}", kind, hex::encode(key), hex::encode(value)
+		);
 		match kind {
-			StorageKind::PERSISTENT => self.db.set(STORAGE_PREFIX, key, value),
+			StorageKind::PERSISTENT => self.persistent.set(STORAGE_PREFIX, key, value),
 			StorageKind::LOCAL => unavailable_yet(LOCAL_DB),
 		}
 	}
 
 	fn local_storage_clear(&mut self, kind: StorageKind, key: &[u8]) {
+		log::debug!(
+			target: "sc_offchain",
+			"{:?}: Clear: {:?}", kind, hex::encode(key)
+		);
 		match kind {
-			StorageKind::PERSISTENT => self.db.remove(STORAGE_PREFIX, key),
+			StorageKind::PERSISTENT => self.persistent.remove(STORAGE_PREFIX, key),
 			StorageKind::LOCAL => unavailable_yet(LOCAL_DB),
 		}
 	}
@@ -119,19 +114,76 @@ impl<Storage: OffchainStorage> OffchainExt for Api<Storage> {
 		old_value: Option<&[u8]>,
 		new_value: &[u8],
 	) -> bool {
+		log::debug!(
+			target: "sc_offchain",
+			"{:?}: CAS: {:?} <= {:?} vs {:?}",
+			kind,
+			hex::encode(key),
+			hex::encode(new_value),
+			old_value.as_ref().map(hex::encode),
+		);
 		match kind {
 			StorageKind::PERSISTENT => {
-				self.db.compare_and_set(STORAGE_PREFIX, key, old_value, new_value)
+				self.persistent.compare_and_set(STORAGE_PREFIX, key, old_value, new_value)
 			},
 			StorageKind::LOCAL => unavailable_yet(LOCAL_DB),
 		}
 	}
 
 	fn local_storage_get(&mut self, kind: StorageKind, key: &[u8]) -> Option<Vec<u8>> {
-		match kind {
-			StorageKind::PERSISTENT => self.db.get(STORAGE_PREFIX, key),
+		let result = match kind {
+			StorageKind::PERSISTENT => self.persistent.get(STORAGE_PREFIX, key),
 			StorageKind::LOCAL => unavailable_yet(LOCAL_DB),
-		}
+		};
+		log::debug!(
+			target: "sc_offchain",
+			"{:?}: Read: {:?} => {:?}",
+			kind,
+			hex::encode(key),
+			result.as_ref().map(hex::encode)
+		);
+		result
+	}
+}
+
+/// Asynchronous offchain API.
+///
+/// NOTE this is done to prevent recursive calls into the runtime
+/// (which are not supported currently).
+pub(crate) struct Api {
+	/// A provider for substrate networking.
+	network_provider: Arc<dyn NetworkProvider + Send + Sync>,
+	/// Is this node a potential validator?
+	is_validator: bool,
+	/// Everything HTTP-related is handled by a different struct.
+	http: http::HttpApi,
+}
+
+impl offchain::Externalities for Api {
+	fn is_validator(&self) -> bool {
+		self.is_validator
+	}
+
+	fn network_state(&self) -> Result<OpaqueNetworkState, ()> {
+		let external_addresses = self.network_provider.external_addresses();
+
+		let state = NetworkState::new(
+			self.network_provider.local_peer_id(),
+			external_addresses,
+		);
+		Ok(OpaqueNetworkState::from(state))
+	}
+
+	fn timestamp(&mut self) -> Timestamp {
+		timestamp::now()
+	}
+
+	fn sleep_until(&mut self, deadline: Timestamp) {
+		sleep(timestamp::timestamp_from_now(deadline));
+	}
+
+	fn random_seed(&mut self) -> [u8; 32] {
+		rand::random()
 	}
 
 	fn http_request_start(
@@ -270,16 +322,14 @@ pub(crate) struct AsyncApi {
 
 impl AsyncApi {
 	/// Creates new Offchain extensions API implementation an the asynchronous processing part.
-	pub fn new<S: OffchainStorage>(
-		db: S,
+	pub fn new(
 		network_provider: Arc<dyn NetworkProvider + Send + Sync>,
 		is_validator: bool,
 		shared_client: SharedClient,
-	) -> (Api<S>, Self) {
+	) -> (Api, Self) {
 		let (http_api, http_worker) = http::http(shared_client);
 
 		let api = Api {
-			db,
 			network_provider,
 			is_validator,
 			http: http_api,
@@ -303,9 +353,10 @@ impl AsyncApi {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use std::{convert::{TryFrom, TryInto}, time::SystemTime};
 	use sc_client_db::offchain::LocalStorage;
 	use sc_network::{NetworkStateInfo, PeerId};
+	use sp_core::offchain::{Externalities, DbExternalities};
+	use std::{convert::{TryFrom, TryInto}, time::SystemTime};
 
 	struct TestNetwork();
 
@@ -329,20 +380,22 @@ mod tests {
 		}
 	}
 
-	fn offchain_api() -> (Api<LocalStorage>, AsyncApi) {
+	fn offchain_api() -> (Api, AsyncApi) {
 		sp_tracing::try_init_simple();
-		let db = LocalStorage::new_test();
 		let mock = Arc::new(TestNetwork());
 		let shared_client = SharedClient::new();
 
 		AsyncApi::new(
-			db,
 			mock,
 			false,
 			shared_client,
 		)
 	}
 
+	fn offchain_db() -> Db<LocalStorage> {
+		Db::new(LocalStorage::new_test())
+	}
+
 	#[test]
 	fn should_get_timestamp() {
 		let mut api = offchain_api().0;
@@ -381,7 +434,7 @@ mod tests {
 	fn should_set_and_get_local_storage() {
 		// given
 		let kind = StorageKind::PERSISTENT;
-		let mut api = offchain_api().0;
+		let mut api = offchain_db();
 		let key = b"test";
 
 		// when
@@ -396,7 +449,7 @@ mod tests {
 	fn should_compare_and_set_local_storage() {
 		// given
 		let kind = StorageKind::PERSISTENT;
-		let mut api = offchain_api().0;
+		let mut api = offchain_db();
 		let key = b"test";
 		api.local_storage_set(kind, key, b"value");
 
@@ -413,7 +466,7 @@ mod tests {
 	fn should_compare_and_set_local_storage_with_none() {
 		// given
 		let kind = StorageKind::PERSISTENT;
-		let mut api = offchain_api().0;
+		let mut api = offchain_db();
 		let key = b"test";
 
 		// when
diff --git a/client/offchain/src/lib.rs b/client/offchain/src/lib.rs
index f456efb755dc..717f02eccd5d 100644
--- a/client/offchain/src/lib.rs
+++ b/client/offchain/src/lib.rs
@@ -46,13 +46,13 @@ use sp_api::{ApiExt, ProvideRuntimeApi};
 use futures::future::Future;
 use log::{debug, warn};
 use sc_network::{ExHashT, NetworkService, NetworkStateInfo, PeerId};
-use sp_core::{offchain::{self, OffchainStorage}, ExecutionContext, traits::SpawnNamed};
+use sp_core::{offchain, ExecutionContext, traits::SpawnNamed};
 use sp_runtime::{generic::BlockId, traits::{self, Header}};
 use futures::{prelude::*, future::ready};
 
 mod api;
-use api::SharedClient;
 
+pub use api::Db as OffchainDb;
 pub use sp_offchain::{OffchainWorkerApi, STORAGE_PREFIX};
 
 /// NetworkProvider provides [`OffchainWorkers`] with all necessary hooks into the
@@ -80,21 +80,19 @@ where
 }
 
 /// An offchain workers manager.
-pub struct OffchainWorkers<Client, Storage, Block: traits::Block> {
+pub struct OffchainWorkers<Client, Block: traits::Block> {
 	client: Arc<Client>,
-	db: Storage,
 	_block: PhantomData<Block>,
 	thread_pool: Mutex<ThreadPool>,
-	shared_client: SharedClient,
+	shared_client: api::SharedClient,
 }
 
-impl<Client, Storage, Block: traits::Block> OffchainWorkers<Client, Storage, Block> {
+impl<Client, Block: traits::Block> OffchainWorkers<Client, Block> {
 	/// Creates new `OffchainWorkers`.
-	pub fn new(client: Arc<Client>, db: Storage) -> Self {
-		let shared_client = SharedClient::new();
+	pub fn new(client: Arc<Client>) -> Self {
+		let shared_client = api::SharedClient::new();
 		Self {
 			client,
-			db,
 			_block: PhantomData,
 			thread_pool: Mutex::new(ThreadPool::new(num_cpus::get())),
 			shared_client,
@@ -102,9 +100,8 @@ impl<Client, Storage, Block: traits::Block> OffchainWorkers<Client, Storage, Blo
 	}
 }
 
-impl<Client, Storage, Block: traits::Block> fmt::Debug for OffchainWorkers<
+impl<Client, Block: traits::Block> fmt::Debug for OffchainWorkers<
 	Client,
-	Storage,
 	Block,
 > {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
@@ -112,15 +109,13 @@ impl<Client, Storage, Block: traits::Block> fmt::Debug for OffchainWorkers<
 	}
 }
 
-impl<Client, Storage, Block> OffchainWorkers<
+impl<Client, Block> OffchainWorkers<
 	Client,
-	Storage,
 	Block,
 > where
 	Block: traits::Block,
 	Client: ProvideRuntimeApi<Block> + Send + Sync + 'static,
 	Client::Api: OffchainWorkerApi<Block>,
-	Storage: OffchainStorage + 'static,
 {
 	/// Start the offchain workers after given block.
 	#[must_use]
@@ -150,7 +145,6 @@ impl<Client, Storage, Block> OffchainWorkers<
 		debug!("Checking offchain workers at {:?}: version:{}", at, version);
 		if version > 0 {
 			let (api, runner) = api::AsyncApi::new(
-				self.db.clone(),
 				network_provider,
 				is_validator,
 				self.shared_client.clone(),
@@ -197,10 +191,10 @@ impl<Client, Storage, Block> OffchainWorkers<
 }
 
 /// Inform the offchain worker about new imported blocks
-pub async fn notification_future<Client, Storage, Block, Spawner>(
+pub async fn notification_future<Client, Block, Spawner>(
 	is_validator: bool,
 	client: Arc<Client>,
-	offchain: Arc<OffchainWorkers<Client, Storage, Block>>,
+	offchain: Arc<OffchainWorkers<Client, Block>>,
 	spawner: Spawner,
 	network_provider: Arc<dyn NetworkProvider + Send + Sync>,
 )
@@ -208,7 +202,6 @@ pub async fn notification_future<Client, Storage, Block, Spawner>(
 		Block: traits::Block,
 		Client: ProvideRuntimeApi<Block> + sc_client_api::BlockchainEvents<Block> + Send + Sync + 'static,
 		Client::Api: OffchainWorkerApi<Block>,
-		Storage: OffchainStorage + 'static,
 		Spawner: SpawnNamed
 {
 	client.import_notification_stream().for_each(move |n| {
@@ -300,12 +293,11 @@ mod tests {
 			spawner,
 			client.clone(),
 		));
-		let db = sc_client_db::offchain::LocalStorage::new_test();
 		let network = Arc::new(TestNetwork());
 		let header = client.header(&BlockId::number(0)).unwrap().unwrap();
 
 		// when
-		let offchain = OffchainWorkers::new(client, db);
+		let offchain = OffchainWorkers::new(client);
 		futures::executor::block_on(
 			offchain.on_block_imported(&header, network, false)
 		);
@@ -317,6 +309,8 @@ mod tests {
 
 	#[test]
 	fn offchain_index_set_and_clear_works() {
+		use sp_core::offchain::OffchainStorage;
+
 		sp_tracing::try_init_simple();
 
 		let (client, backend) =
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index d0fa10a44d46..8a5f63ab7b1d 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -39,7 +39,7 @@ use futures::{
 	channel::oneshot,
 };
 use sc_keystore::LocalKeystore;
-use log::{info, warn};
+use log::info;
 use sc_network::config::{Role, OnDemand};
 use sc_network::NetworkService;
 use sc_network::block_request_handler::{self, BlockRequestHandler};
@@ -338,13 +338,17 @@ pub fn new_full_parts<TBl, TRtApi, TExecDisp>(
 			transaction_storage: config.transaction_storage.clone(),
 		};
 
+
+		let backend = new_db_backend(db_config)?;
+
 		let extensions = sc_client_api::execution_extensions::ExecutionExtensions::new(
 			config.execution_strategies.clone(),
 			Some(keystore_container.sync_keystore()),
+			sc_offchain::OffchainDb::factory_from_backend(&*backend),
 		);
 
-		new_client(
-			db_config,
+		let client = new_client(
+			backend.clone(),
 			executor,
 			chain_spec.as_storage_builder(),
 			fork_blocks,
@@ -357,7 +361,9 @@ pub fn new_full_parts<TBl, TRtApi, TExecDisp>(
 				offchain_indexing_api: config.offchain_worker.indexing_enabled,
 				wasm_runtime_overrides: config.wasm_runtime_overrides.clone(),
 			},
-		)?
+		)?;
+
+		(client, backend)
 	};
 
 	Ok((
@@ -420,9 +426,20 @@ pub fn new_light_parts<TBl, TRtApi, TExecDisp>(
 	Ok((client, backend, keystore_container, task_manager, on_demand))
 }
 
-/// Create an instance of db-backed client.
-pub fn new_client<E, Block, RA>(
+/// Create an instance of default DB-backend backend.
+pub fn new_db_backend<Block>(
 	settings: DatabaseSettings,
+) -> Result<Arc<Backend<Block>>, sp_blockchain::Error> where
+	Block: BlockT,
+{
+	const CANONICALIZATION_DELAY: u64 = 4096;
+
+	Ok(Arc::new(Backend::new(settings, CANONICALIZATION_DELAY)?))
+}
+
+/// Create an instance of client backed by given backend.
+pub fn new_client<E, Block, RA>(
+	backend: Arc<Backend<Block>>,
 	executor: E,
 	genesis_storage: &dyn BuildStorage,
 	fork_blocks: ForkBlocks<Block>,
@@ -431,38 +448,30 @@ pub fn new_client<E, Block, RA>(
 	spawn_handle: Box<dyn SpawnNamed>,
 	prometheus_registry: Option<Registry>,
 	config: ClientConfig,
-) -> Result<(
+) -> Result<
 	crate::client::Client<
 		Backend<Block>,
 		crate::client::LocalCallExecutor<Backend<Block>, E>,
 		Block,
 		RA,
 	>,
-	Arc<Backend<Block>>,
-),
 	sp_blockchain::Error,
 >
 	where
 		Block: BlockT,
 		E: CodeExecutor + RuntimeInfo,
 {
-	const CANONICALIZATION_DELAY: u64 = 4096;
-
-	let backend = Arc::new(Backend::new(settings, CANONICALIZATION_DELAY)?);
 	let executor = crate::client::LocalCallExecutor::new(backend.clone(), executor, spawn_handle, config.clone())?;
-	Ok((
-		crate::client::Client::new(
-			backend.clone(),
-			executor,
-			genesis_storage,
-			fork_blocks,
-			bad_blocks,
-			execution_extensions,
-			prometheus_registry,
-			config,
-		)?,
+	Ok(crate::client::Client::new(
 		backend,
-	))
+		executor,
+		genesis_storage,
+		fork_blocks,
+		bad_blocks,
+		execution_extensions,
+		prometheus_registry,
+		config,
+	)?)
 }
 
 /// Parameters to pass into `build`.
@@ -499,28 +508,18 @@ pub struct SpawnTasksParams<'a, TBl: BlockT, TCl, TExPool, TRpc, Backend> {
 }
 
 /// Build a shared offchain workers instance.
-pub fn build_offchain_workers<TBl, TBackend, TCl>(
+pub fn build_offchain_workers<TBl, TCl>(
 	config: &Configuration,
-	backend: Arc<TBackend>,
 	spawn_handle: SpawnTaskHandle,
 	client: Arc<TCl>,
 	network: Arc<NetworkService<TBl, <TBl as BlockT>::Hash>>,
-) -> Option<Arc<sc_offchain::OffchainWorkers<TCl, TBackend::OffchainStorage, TBl>>>
+) -> Option<Arc<sc_offchain::OffchainWorkers<TCl, TBl>>>
 	where
-		TBl: BlockT, TBackend: sc_client_api::Backend<TBl>,
-		<TBackend as sc_client_api::Backend<TBl>>::OffchainStorage: 'static,
+		TBl: BlockT,
 		TCl: Send + Sync + ProvideRuntimeApi<TBl> + BlockchainEvents<TBl> + 'static,
 		<TCl as ProvideRuntimeApi<TBl>>::Api: sc_offchain::OffchainWorkerApi<TBl>,
 {
-	let offchain_workers = match backend.offchain_storage() {
-		Some(db) => {
-			Some(Arc::new(sc_offchain::OffchainWorkers::new(client.clone(), db)))
-		},
-		None => {
-			warn!("Offchain workers disabled, due to lack of offchain storage support in backend.");
-			None
-		},
-	};
+	let offchain_workers = Some(Arc::new(sc_offchain::OffchainWorkers::new(client.clone())));
 
 	// Inform the offchain worker about new imported blocks
 	if let Some(offchain) = offchain_workers.clone() {
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index 263ff7b9c569..6e9fdea0925f 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -205,7 +205,11 @@ pub fn new_with_backend<B, E, Block, S, RA>(
 		B: backend::LocalBackend<Block> + 'static,
 {
 	let call_executor = LocalCallExecutor::new(backend.clone(), executor, spawn_handle, config.clone())?;
-	let extensions = ExecutionExtensions::new(Default::default(), keystore);
+	let extensions = ExecutionExtensions::new(
+		Default::default(),
+		keystore,
+		sc_offchain::OffchainDb::factory_from_backend(&*backend),
+	);
 	Client::new(
 		backend,
 		call_executor,
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index 39bad8f2f36e..4ca784558dbf 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -51,7 +51,7 @@ use sp_utils::{status_sinks, mpsc::{tracing_unbounded, TracingUnboundedReceiver}
 
 pub use self::error::Error;
 pub use self::builder::{
-	new_full_client, new_client, new_full_parts, new_light_parts,
+	new_full_client, new_db_backend, new_client, new_full_parts, new_light_parts,
 	spawn_tasks, build_network, build_offchain_workers,
 	BuildNetworkParams, KeystoreContainer, NetworkStarter, SpawnTasksParams, TFullClient, TLightClient,
 	TFullBackend, TLightBackend, TLightBackendWithHash, TLightClientWithBackend,
diff --git a/frame/election-provider-multi-phase/src/mock.rs b/frame/election-provider-multi-phase/src/mock.rs
index eb38a4cd52e9..e7a2924fd2aa 100644
--- a/frame/election-provider-multi-phase/src/mock.rs
+++ b/frame/election-provider-multi-phase/src/mock.rs
@@ -27,7 +27,7 @@ use parking_lot::RwLock;
 use sp_core::{
 	offchain::{
 		testing::{PoolState, TestOffchainExt, TestTransactionPoolExt},
-		OffchainExt, TransactionPoolExt,
+		OffchainDbExt, OffchainWorkerExt, TransactionPoolExt,
 	},
 	H256,
 };
@@ -369,7 +369,8 @@ impl ExtBuilder {
 		seed[0..4].copy_from_slice(&iters.to_le_bytes());
 		offchain_state.write().seed = seed;
 
-		ext.register_extension(OffchainExt::new(offchain));
+		ext.register_extension(OffchainDbExt::new(offchain.clone()));
+		ext.register_extension(OffchainWorkerExt::new(offchain));
 		ext.register_extension(TransactionPoolExt::new(pool));
 
 		(ext, pool_state)
diff --git a/frame/example-offchain-worker/src/tests.rs b/frame/example-offchain-worker/src/tests.rs
index 6f73ffcb9e15..7707e7d61e62 100644
--- a/frame/example-offchain-worker/src/tests.rs
+++ b/frame/example-offchain-worker/src/tests.rs
@@ -22,7 +22,7 @@ use codec::Decode;
 use frame_support::{assert_ok, parameter_types};
 use sp_core::{
 	H256,
-	offchain::{OffchainExt, TransactionPoolExt, testing},
+	offchain::{OffchainWorkerExt, TransactionPoolExt, testing},
 	sr25519::Signature,
 };
 
@@ -144,7 +144,7 @@ fn it_aggregates_the_price() {
 fn should_make_http_call_and_parse_result() {
 	let (offchain, state) = testing::TestOffchainExt::new();
 	let mut t = sp_io::TestExternalities::default();
-	t.register_extension(OffchainExt::new(offchain));
+	t.register_extension(OffchainWorkerExt::new(offchain));
 
 	price_oracle_response(&mut state.write());
 
@@ -160,7 +160,7 @@ fn should_make_http_call_and_parse_result() {
 fn knows_how_to_mock_several_http_calls() {
 	let (offchain, state) = testing::TestOffchainExt::new();
 	let mut t = sp_io::TestExternalities::default();
-	t.register_extension(OffchainExt::new(offchain));
+	t.register_extension(OffchainWorkerExt::new(offchain));
 
 	{
 		let mut state = state.write();
@@ -217,7 +217,7 @@ fn should_submit_signed_transaction_on_chain() {
 
 
 	let mut t = sp_io::TestExternalities::default();
-	t.register_extension(OffchainExt::new(offchain));
+	t.register_extension(OffchainWorkerExt::new(offchain));
 	t.register_extension(TransactionPoolExt::new(pool));
 	t.register_extension(KeystoreExt(Arc::new(keystore)));
 
@@ -255,7 +255,7 @@ fn should_submit_unsigned_transaction_on_chain_for_any_account() {
 		.clone();
 
 	let mut t = sp_io::TestExternalities::default();
-	t.register_extension(OffchainExt::new(offchain));
+	t.register_extension(OffchainWorkerExt::new(offchain));
 	t.register_extension(TransactionPoolExt::new(pool));
 	t.register_extension(KeystoreExt(Arc::new(keystore)));
 
@@ -308,7 +308,7 @@ fn should_submit_unsigned_transaction_on_chain_for_all_accounts() {
 		.clone();
 
 	let mut t = sp_io::TestExternalities::default();
-	t.register_extension(OffchainExt::new(offchain));
+	t.register_extension(OffchainWorkerExt::new(offchain));
 	t.register_extension(TransactionPoolExt::new(pool));
 	t.register_extension(KeystoreExt(Arc::new(keystore)));
 
@@ -349,7 +349,7 @@ fn should_submit_raw_unsigned_transaction_on_chain() {
 	let keystore = KeyStore::new();
 
 	let mut t = sp_io::TestExternalities::default();
-	t.register_extension(OffchainExt::new(offchain));
+	t.register_extension(OffchainWorkerExt::new(offchain));
 	t.register_extension(TransactionPoolExt::new(pool));
 	t.register_extension(KeystoreExt(Arc::new(keystore)));
 
diff --git a/frame/im-online/src/tests.rs b/frame/im-online/src/tests.rs
index dc6fc4f37330..919b639dd612 100644
--- a/frame/im-online/src/tests.rs
+++ b/frame/im-online/src/tests.rs
@@ -23,7 +23,8 @@ use super::*;
 use crate::mock::*;
 use sp_core::OpaquePeerId;
 use sp_core::offchain::{
-	OffchainExt,
+	OffchainDbExt,
+	OffchainWorkerExt,
 	TransactionPoolExt,
 	testing::{TestOffchainExt, TestTransactionPoolExt},
 };
@@ -205,7 +206,8 @@ fn should_generate_heartbeats() {
 	let mut ext = new_test_ext();
 	let (offchain, _state) = TestOffchainExt::new();
 	let (pool, state) = TestTransactionPoolExt::new();
-	ext.register_extension(OffchainExt::new(offchain));
+	ext.register_extension(OffchainDbExt::new(offchain.clone()));
+	ext.register_extension(OffchainWorkerExt::new(offchain));
 	ext.register_extension(TransactionPoolExt::new(pool));
 
 	ext.execute_with(|| {
@@ -310,7 +312,8 @@ fn should_not_send_a_report_if_already_online() {
 	let mut ext = new_test_ext();
 	let (offchain, _state) = TestOffchainExt::new();
 	let (pool, pool_state) = TestTransactionPoolExt::new();
-	ext.register_extension(OffchainExt::new(offchain));
+	ext.register_extension(OffchainDbExt::new(offchain.clone()));
+	ext.register_extension(OffchainWorkerExt::new(offchain));
 	ext.register_extension(TransactionPoolExt::new(pool));
 
 	ext.execute_with(|| {
diff --git a/frame/merkle-mountain-range/primitives/src/lib.rs b/frame/merkle-mountain-range/primitives/src/lib.rs
index f1ee15b48b3f..0887535dca0e 100644
--- a/frame/merkle-mountain-range/primitives/src/lib.rs
+++ b/frame/merkle-mountain-range/primitives/src/lib.rs
@@ -360,6 +360,11 @@ impl OpaqueLeaf {
 	pub fn from_encoded_leaf(encoded_leaf: Vec<u8>) -> Self {
 		OpaqueLeaf(encoded_leaf)
 	}
+
+	/// Attempt to decode the leaf into expected concrete type.
+	pub fn try_decode<T: codec::Decode>(&self) -> Option<T> {
+		codec::Decode::decode(&mut &*self.0).ok()
+	}
 }
 
 impl FullLeaf for OpaqueLeaf {
@@ -368,18 +373,49 @@ impl FullLeaf for OpaqueLeaf {
 	}
 }
 
+/// A type-safe wrapper for the concrete leaf type.
+///
+/// This structure serves merely to avoid passing raw `Vec<u8>` around.
+/// It must be `Vec<u8>`-encoding compatible.
+///
+/// It is different from [`OpaqueLeaf`], because it does implement `Codec`
+/// and the encoding has to match raw `Vec<u8>` encoding.
+#[derive(codec::Encode, codec::Decode, RuntimeDebug, PartialEq, Eq)]
+pub struct EncodableOpaqueLeaf(pub Vec<u8>);
+
+impl EncodableOpaqueLeaf {
+	/// Convert a concrete leaf into encodable opaque version.
+	pub fn from_leaf<T: FullLeaf>(leaf: &T) -> Self {
+		let opaque = OpaqueLeaf::from_leaf(leaf);
+		Self::from_opaque_leaf(opaque)
+	}
+
+	/// Given an opaque leaf, make it encodable.
+	pub fn from_opaque_leaf(opaque: OpaqueLeaf) -> Self {
+		Self(opaque.0)
+	}
+
+	/// Try to convert into a [OpaqueLeaf].
+	pub fn into_opaque_leaf(self) -> OpaqueLeaf {
+		// wrap into `OpaqueLeaf` type
+		OpaqueLeaf::from_encoded_leaf(self.0)
+	}
+}
+
 sp_api::decl_runtime_apis! {
 	/// API to interact with MMR pallet.
-	pub trait MmrApi<Leaf: codec::Codec, Hash: codec::Codec> {
+	pub trait MmrApi<Hash: codec::Codec> {
 		/// Generate MMR proof for a leaf under given index.
-		fn generate_proof(leaf_index: u64) -> Result<(Leaf, Proof<Hash>), Error>;
+		#[skip_initialize_block]
+		fn generate_proof(leaf_index: u64) -> Result<(EncodableOpaqueLeaf, Proof<Hash>), Error>;
 
 		/// Verify MMR proof against on-chain MMR.
 		///
 		/// Note this function will use on-chain MMR root hash and check if the proof
 		/// matches the hash.
 		/// See [Self::verify_proof_stateless] for a stateless verifier.
-		fn verify_proof(leaf: Leaf, proof: Proof<Hash>) -> Result<(), Error>;
+		#[skip_initialize_block]
+		fn verify_proof(leaf: EncodableOpaqueLeaf, proof: Proof<Hash>) -> Result<(), Error>;
 
 		/// Verify MMR proof against given root hash.
 		///
@@ -387,7 +423,8 @@ sp_api::decl_runtime_apis! {
 		/// proof is verified against given MMR root hash.
 		///
 		/// The leaf data is expected to be encoded in it's compact form.
-		fn verify_proof_stateless(root: Hash, leaf: Vec<u8>, proof: Proof<Hash>)
+		#[skip_initialize_block]
+		fn verify_proof_stateless(root: Hash, leaf: EncodableOpaqueLeaf, proof: Proof<Hash>)
 			-> Result<(), Error>;
 	}
 }
@@ -535,7 +572,7 @@ mod tests {
 	}
 
 	#[test]
-	fn opaque_leaves_should_be_scale_compatible_with_concrete_ones() {
+	fn opaque_leaves_should_be_full_leaf_compatible() {
 		// given
 		let a = Test::Data("Hello World!".into());
 		let b = Test::Data("".into());
@@ -564,4 +601,36 @@ mod tests {
 			opaque,
 		);
 	}
+
+	#[test]
+	fn encode_opaque_leaf_should_be_scale_compatible() {
+		use codec::Encode;
+
+		// given
+		let a = Test::Data("Hello World!".into());
+		let case1 = EncodableOpaqueLeaf::from_leaf(&a);
+		let case2 = EncodableOpaqueLeaf::from_opaque_leaf(OpaqueLeaf(a.encode()));
+		let case3 = a.encode().encode();
+
+		// when
+		let encoded = vec![&case1, &case2]
+			.into_iter()
+			.map(|x| x.encode())
+			.collect::<Vec<_>>();
+		let decoded = vec![&*encoded[0], &*encoded[1], &*case3]
+			.into_iter()
+			.map(|x| EncodableOpaqueLeaf::decode(&mut &*x))
+			.collect::<Vec<_>>();
+
+		// then
+		assert_eq!(case1, case2);
+		assert_eq!(encoded[0], encoded[1]);
+		// then encoding should also match double-encoded leaf.
+		assert_eq!(encoded[0], case3);
+
+		assert_eq!(decoded[0], decoded[1]);
+		assert_eq!(decoded[1], decoded[2]);
+		assert_eq!(decoded[0], Ok(case2));
+		assert_eq!(decoded[1], Ok(case1));
+	}
 }
diff --git a/frame/merkle-mountain-range/rpc/Cargo.toml b/frame/merkle-mountain-range/rpc/Cargo.toml
new file mode 100644
index 000000000000..4730dbc7ea42
--- /dev/null
+++ b/frame/merkle-mountain-range/rpc/Cargo.toml
@@ -0,0 +1,29 @@
+[package]
+name = "pallet-mmr-rpc"
+version = "3.0.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
+license = "Apache-2.0"
+homepage = "https://substrate.dev"
+repository = "https://github.com/paritytech/substrate/"
+description = "Node-specific RPC methods for interaction with Merkle Mountain Range pallet."
+publish = false
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "2.0.0" }
+jsonrpc-core = "15.1.0"
+jsonrpc-core-client = "15.1.0"
+jsonrpc-derive = "15.1.0"
+pallet-mmr-primitives = { version = "3.0.0", path = "../primitives" }
+serde = { version = "1.0.101", features = ["derive"] }
+sp-api = { version = "3.0.0", path = "../../../primitives/api" }
+sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
+sp-core = { version = "3.0.0", path = "../../../primitives/core" }
+sp-rpc = { version = "3.0.0", path = "../../../primitives/rpc" }
+sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
+
+[dev-dependencies]
+serde_json = "1.0.41"
diff --git a/frame/merkle-mountain-range/rpc/src/lib.rs b/frame/merkle-mountain-range/rpc/src/lib.rs
new file mode 100644
index 000000000000..5277f4fa475f
--- /dev/null
+++ b/frame/merkle-mountain-range/rpc/src/lib.rs
@@ -0,0 +1,222 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#![warn(missing_docs)]
+
+//! Node-specific RPC methods for interaction with Merkle Mountain Range pallet.
+
+use std::sync::Arc;
+
+use codec::{Codec, Encode};
+use jsonrpc_core::{Error, ErrorCode, Result};
+use jsonrpc_derive::rpc;
+use serde::{Deserialize, Serialize};
+use sp_api::ProvideRuntimeApi;
+use sp_blockchain::HeaderBackend;
+use sp_core::Bytes;
+use sp_runtime::{
+	generic::BlockId,
+	traits::{Block as BlockT},
+};
+use pallet_mmr_primitives::{Error as MmrError, Proof};
+
+pub use pallet_mmr_primitives::MmrApi as MmrRuntimeApi;
+
+/// Retrieved MMR leaf and its proof.
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub struct LeafProof<BlockHash> {
+	/// Block hash the proof was generated for.
+	pub block_hash: BlockHash,
+	/// SCALE-encoded leaf data.
+	pub leaf: Bytes,
+	/// SCALE-encoded proof data. See [pallet_mmr_primitives::Proof].
+	pub proof: Bytes,
+}
+
+impl<BlockHash> LeafProof<BlockHash> {
+	/// Create new `LeafProof` from given concrete `leaf` and `proof`.
+	pub fn new<Leaf, MmrHash>(
+		block_hash: BlockHash,
+		leaf: Leaf,
+		proof: Proof<MmrHash>,
+	) -> Self where
+		Leaf: Encode,
+		MmrHash: Encode,
+	{
+		Self {
+			block_hash,
+			leaf: Bytes(leaf.encode()),
+			proof: Bytes(proof.encode()),
+		}
+	}
+}
+
+/// MMR RPC methods.
+#[rpc]
+pub trait MmrApi<BlockHash> {
+	/// Generate MMR proof for given leaf index.
+	///
+	/// This method calls into a runtime with MMR pallet included and attempts to generate
+	/// MMR proof for leaf at given `leaf_index`.
+	/// Optionally, a block hash at which the runtime should be queried can be specified.
+	///
+	/// Returns the (full) leaf itself and a proof for this leaf (compact encoding, i.e. hash of
+	/// the leaf). Both parameters are SCALE-encoded.
+	#[rpc(name = "mmr_generateProof")]
+	fn generate_proof(
+		&self,
+		leaf_index: u64,
+		at: Option<BlockHash>,
+	) -> Result<LeafProof<BlockHash>>;
+}
+
+/// An implementation of MMR specific RPC methods.
+pub struct Mmr<C, B> {
+	client: Arc<C>,
+	_marker: std::marker::PhantomData<B>,
+}
+
+impl<C, B> Mmr<C, B> {
+	/// Create new `Mmr` with the given reference to the client.
+	pub fn new(client: Arc<C>) -> Self {
+		Self {
+			client,
+			_marker: Default::default(),
+		}
+	}
+}
+
+impl<C, Block, MmrHash> MmrApi<<Block as BlockT>::Hash,> for Mmr<C, (Block, MmrHash)>
+where
+	Block: BlockT,
+	C: Send + Sync + 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block>,
+	C::Api: MmrRuntimeApi<
+		Block,
+		MmrHash,
+	>,
+	MmrHash: Codec + Send + Sync + 'static,
+{
+	fn generate_proof(
+		&self,
+		leaf_index: u64,
+		at: Option<<Block as BlockT>::Hash>,
+	) -> Result<LeafProof<<Block as BlockT>::Hash>> {
+		let api = self.client.runtime_api();
+		let block_hash = at.unwrap_or_else(||
+			// If the block hash is not supplied assume the best block.
+			self.client.info().best_hash
+		);
+
+		let (leaf, proof) = api
+			.generate_proof_with_context(
+				&BlockId::hash(block_hash),
+				sp_core::ExecutionContext::OffchainCall(None),
+				leaf_index,
+			)
+			.map_err(runtime_error_into_rpc_error)?
+			.map_err(mmr_error_into_rpc_error)?;
+
+		Ok(LeafProof::new(block_hash, leaf, proof))
+	}
+}
+
+const RUNTIME_ERROR: i64 = 8000;
+const MMR_ERROR: i64 = 8010;
+
+/// Converts a mmr-specific error into an RPC error.
+fn mmr_error_into_rpc_error(err: MmrError) -> Error {
+	match err {
+		MmrError::LeafNotFound => Error {
+			code: ErrorCode::ServerError(MMR_ERROR + 1),
+			message: "Leaf was not found".into(),
+			data: Some(format!("{:?}", err).into()),
+		},
+		MmrError::GenerateProof => Error {
+			code: ErrorCode::ServerError(MMR_ERROR + 2),
+			message: "Error while generating the proof".into(),
+			data: Some(format!("{:?}", err).into()),
+		},
+		_ => Error {
+			code: ErrorCode::ServerError(MMR_ERROR),
+			message: "Unexpected MMR error".into(),
+			data: Some(format!("{:?}", err).into()),
+		},
+	}
+}
+
+/// Converts a runtime trap into an RPC error.
+fn runtime_error_into_rpc_error(err: impl std::fmt::Debug) -> Error {
+	Error {
+		code: ErrorCode::ServerError(RUNTIME_ERROR),
+		message: "Runtime trapped".into(),
+		data: Some(format!("{:?}", err).into()),
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use sp_core::H256;
+
+	#[test]
+	fn should_serialize_leaf_proof() {
+		// given
+		let leaf = vec![1_u8, 2, 3, 4];
+		let proof = Proof {
+			leaf_index: 1,
+			leaf_count: 9,
+			items: vec![H256::repeat_byte(1), H256::repeat_byte(2)],
+		};
+
+		let leaf_proof = LeafProof::new(H256::repeat_byte(0), leaf, proof);
+
+		// when
+		let actual = serde_json::to_string(&leaf_proof).unwrap();
+
+		// then
+		assert_eq!(
+			actual,
+			r#"{"blockHash":"0x0000000000000000000000000000000000000000000000000000000000000000","leaf":"0x1001020304","proof":"0x010000000000000009000000000000000801010101010101010101010101010101010101010101010101010101010101010202020202020202020202020202020202020202020202020202020202020202"}"#
+		);
+	}
+
+	#[test]
+	fn should_deserialize_leaf_proof() {
+		// given
+		let expected = LeafProof {
+			block_hash: H256::repeat_byte(0),
+			leaf: Bytes(vec![1_u8, 2, 3, 4].encode()),
+			proof: Bytes(Proof {
+				leaf_index: 1,
+				leaf_count: 9,
+				items: vec![H256::repeat_byte(1), H256::repeat_byte(2)],
+			}.encode()),
+		};
+
+		// when
+		let actual: LeafProof<H256> = serde_json::from_str(r#"{
+			"blockHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
+			"leaf":"0x1001020304",
+			"proof":"0x010000000000000009000000000000000801010101010101010101010101010101010101010101010101010101010101010202020202020202020202020202020202020202020202020202020202020202"
+		}"#).unwrap();
+
+		// then
+		assert_eq!(actual, expected);
+
+	}
+}
diff --git a/frame/merkle-mountain-range/src/mmr/storage.rs b/frame/merkle-mountain-range/src/mmr/storage.rs
index 0bff53f2fb05..021c0716b12e 100644
--- a/frame/merkle-mountain-range/src/mmr/storage.rs
+++ b/frame/merkle-mountain-range/src/mmr/storage.rs
@@ -62,10 +62,9 @@ impl<T, I, L> mmr_lib::MMRStore<NodeOf<T, I, L>> for Storage<OffchainStorage, T,
 	fn get_elem(&self, pos: u64) -> mmr_lib::Result<Option<NodeOf<T, I, L>>> {
 		let key = Module::<T, I>::offchain_key(pos);
 		// Retrieve the element from Off-chain DB.
-		Ok(
-			sp_io::offchain ::local_storage_get(sp_core::offchain::StorageKind::PERSISTENT, &key)
-				.and_then(|v| codec::Decode::decode(&mut &*v).ok())
-		)
+		Ok(sp_io::offchain
+			::local_storage_get(sp_core::offchain::StorageKind::PERSISTENT, &key)
+			.and_then(|v| codec::Decode::decode(&mut &*v).ok()))
 	}
 
 	fn append(&mut self, _: u64, _: Vec<NodeOf<T, I, L>>) -> mmr_lib::Result<()> {
@@ -95,9 +94,8 @@ impl<T, I, L> mmr_lib::MMRStore<NodeOf<T, I, L>> for Storage<RuntimeStorage, T,
 			// on-chain we only store the hash (even if it's a leaf)
 			<Nodes<T, I>>::insert(size, elem.hash());
 			// Indexing API is used to store the full leaf content.
-			elem.using_encoded(|elem| {
-				sp_io::offchain_index::set(&Module::<T, I>::offchain_key(size), elem)
-			});
+			let key = Module::<T, I>::offchain_key(size);
+			elem.using_encoded(|elem| sp_io::offchain_index::set(&key, elem));
 			size += 1;
 
 			if let Node::Data(..) = elem {
diff --git a/frame/merkle-mountain-range/src/tests.rs b/frame/merkle-mountain-range/src/tests.rs
index 63e4ec225706..ea522dc51cd0 100644
--- a/frame/merkle-mountain-range/src/tests.rs
+++ b/frame/merkle-mountain-range/src/tests.rs
@@ -23,7 +23,7 @@ use sp_core::{
 	H256,
 	offchain::{
 		testing::TestOffchainExt,
-		OffchainExt,
+		OffchainWorkerExt, OffchainDbExt,
 	},
 };
 use pallet_mmr_primitives::{Proof, Compact};
@@ -34,7 +34,8 @@ pub(crate) fn new_test_ext() -> sp_io::TestExternalities {
 
 fn register_offchain_ext(ext: &mut sp_io::TestExternalities) {
 	let (offchain, _offchain_state) = TestOffchainExt::with_offchain_db(ext.offchain_db());
-	ext.register_extension(OffchainExt::new(offchain));
+	ext.register_extension(OffchainDbExt::new(offchain.clone()));
+	ext.register_extension(OffchainWorkerExt::new(offchain));
 }
 
 fn new_block() -> u64 {
diff --git a/frame/session/src/historical/offchain.rs b/frame/session/src/historical/offchain.rs
index 38cf09124ccf..f095be9e44e2 100644
--- a/frame/session/src/historical/offchain.rs
+++ b/frame/session/src/historical/offchain.rs
@@ -147,7 +147,8 @@ mod tests {
 	use sp_core::crypto::key_types::DUMMY;
 	use sp_core::offchain::{
 		testing::TestOffchainExt,
-		OffchainExt,
+		OffchainDbExt,
+		OffchainWorkerExt,
 		StorageKind,
 	};
 
@@ -181,7 +182,8 @@ mod tests {
 		seed[0..4].copy_from_slice(&ITERATIONS.to_le_bytes());
 		offchain_state.write().seed = seed;
 
-		ext.register_extension(OffchainExt::new(offchain));
+		ext.register_extension(OffchainDbExt::new(offchain.clone()));
+		ext.register_extension(OffchainWorkerExt::new(offchain));
 		ext
 	}
 
diff --git a/frame/staking/fuzzer/src/submit_solution.rs b/frame/staking/fuzzer/src/submit_solution.rs
index b661a83a1bdd..63ec189d44b0 100644
--- a/frame/staking/fuzzer/src/submit_solution.rs
+++ b/frame/staking/fuzzer/src/submit_solution.rs
@@ -26,7 +26,7 @@ use pallet_staking::testing_utils::*;
 use frame_support::{assert_ok, storage::StorageValue, traits::UnfilteredDispatchable};
 use frame_system::RawOrigin;
 use sp_runtime::DispatchError;
-use sp_core::offchain::{testing::TestOffchainExt, OffchainExt};
+use sp_core::offchain::{testing::TestOffchainExt, OffchainWorkerExt, OffchainDbExt};
 use pallet_staking::{EraElectionStatus, ElectionStatus, Module as Staking, Call as StakingCall};
 
 mod mock;
@@ -55,7 +55,8 @@ pub fn new_test_ext(iterations: u32) -> sp_io::TestExternalities {
 	seed[0..4].copy_from_slice(&iterations.to_le_bytes());
 	offchain_state.write().seed = seed;
 
-	ext.register_extension(OffchainExt::new(offchain));
+	ext.register_extension(OffchainDbExt::new(offchain.clone()));
+	ext.register_extension(OffchainWorkerExt::new(offchain));
 
 	ext
 }
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index 529cd7b87cab..92e1862e3981 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -2917,7 +2917,7 @@ mod offchain_election {
 	use parking_lot::RwLock;
 	use sp_core::offchain::{
 		testing::{PoolState, TestOffchainExt, TestTransactionPoolExt},
-		OffchainExt, TransactionPoolExt,
+		OffchainWorkerExt, TransactionPoolExt, OffchainDbExt,
 	};
 	use sp_io::TestExternalities;
 	use sp_npos_elections::StakedAssignment;
@@ -2960,7 +2960,8 @@ mod offchain_election {
 		seed[0..4].copy_from_slice(&iterations.to_le_bytes());
 		offchain_state.write().seed = seed;
 
-		ext.register_extension(OffchainExt::new(offchain));
+		ext.register_extension(OffchainDbExt::new(offchain.clone()));
+		ext.register_extension(OffchainWorkerExt::new(offchain));
 		ext.register_extension(TransactionPoolExt::new(pool));
 
 		pool_state
diff --git a/primitives/core/src/lib.rs b/primitives/core/src/lib.rs
index 7fc9fa091969..c72f38ea0827 100644
--- a/primitives/core/src/lib.rs
+++ b/primitives/core/src/lib.rs
@@ -119,9 +119,10 @@ impl ExecutionContext {
 		match self {
 			Importing | Syncing | BlockConstruction =>
 				offchain::Capabilities::none(),
-			// Enable keystore and transaction pool by default for offchain calls.
+			// Enable keystore, transaction pool and Offchain DB reads by default for offchain calls.
 			OffchainCall(None) => [
 				offchain::Capability::Keystore,
+				offchain::Capability::OffchainDbRead,
 				offchain::Capability::TransactionPool,
 			][..].into(),
 			OffchainCall(Some((_, capabilities))) => *capabilities,
diff --git a/primitives/core/src/offchain/mod.rs b/primitives/core/src/offchain/mod.rs
index 6a08df1d7fb2..8b587b887efd 100644
--- a/primitives/core/src/offchain/mod.rs
+++ b/primitives/core/src/offchain/mod.rs
@@ -29,10 +29,10 @@ pub mod storage;
 #[cfg(feature = "std")]
 pub mod testing;
 
-/// Local storage prefix used by the Offchain Worker API to
+/// Persistent storage prefix used by the Offchain Worker API when creating a DB key.
 pub const STORAGE_PREFIX : &[u8] = b"storage";
 
-/// Offchain workers local storage.
+/// Offchain DB persistent (non-fork-aware) storage.
 pub trait OffchainStorage: Clone + Send + Sync {
 	/// Persist a value in storage under given key and prefix.
 	fn set(&mut self, prefix: &[u8], key: &[u8], value: &[u8]);
@@ -263,9 +263,9 @@ pub enum Capability {
 	/// Access to opaque network state.
 	NetworkState = 16,
 	/// Access to offchain worker DB (read only).
-	OffchainWorkerDbRead = 32,
+	OffchainDbRead = 32,
 	/// Access to offchain worker DB (writes).
-	OffchainWorkerDbWrite = 64,
+	OffchainDbWrite = 64,
 	/// Manage the authorized nodes
 	NodeAuthorization = 128,
 }
@@ -293,7 +293,7 @@ impl Capabilities {
 		[
 			Capability::TransactionPool,
 			Capability::Keystore,
-			Capability::OffchainWorkerDbRead,
+			Capability::OffchainDbRead,
 		][..].into()
 	}
 
@@ -337,42 +337,6 @@ pub trait Externalities: Send {
 	/// Obviously fine in the off-chain worker context.
 	fn random_seed(&mut self) -> [u8; 32];
 
-	/// Sets a value in the local storage.
-	///
-	/// Note this storage is not part of the consensus, it's only accessible by
-	/// offchain worker tasks running on the same machine. It _is_ persisted between runs.
-	fn local_storage_set(&mut self, kind: StorageKind, key: &[u8], value: &[u8]);
-
-	/// Removes a value in the local storage.
-	///
-	/// Note this storage is not part of the consensus, it's only accessible by
-	/// offchain worker tasks running on the same machine. It _is_ persisted between runs.
-	fn local_storage_clear(&mut self, kind: StorageKind, key: &[u8]);
-
-	/// Sets a value in the local storage if it matches current value.
-	///
-	/// Since multiple offchain workers may be running concurrently, to prevent
-	/// data races use CAS to coordinate between them.
-	///
-	/// Returns `true` if the value has been set, `false` otherwise.
-	///
-	/// Note this storage is not part of the consensus, it's only accessible by
-	/// offchain worker tasks running on the same machine. It _is_ persisted between runs.
-	fn local_storage_compare_and_set(
-		&mut self,
-		kind: StorageKind,
-		key: &[u8],
-		old_value: Option<&[u8]>,
-		new_value: &[u8],
-	) -> bool;
-
-	/// Gets a value from the local storage.
-	///
-	/// If the value does not exist in the storage `None` will be returned.
-	/// Note this storage is not part of the consensus, it's only accessible by
-	/// offchain worker tasks running on the same machine. It _is_ persisted between runs.
-	fn local_storage_get(&mut self, kind: StorageKind, key: &[u8]) -> Option<Vec<u8>>;
-
 	/// Initiates a http request given HTTP verb and the URL.
 	///
 	/// Meta is a future-reserved field containing additional, parity-scale-codec encoded parameters.
@@ -521,28 +485,6 @@ impl<T: Externalities + ?Sized> Externalities for Box<T> {
 		(&mut **self).random_seed()
 	}
 
-	fn local_storage_set(&mut self, kind: StorageKind, key: &[u8], value: &[u8]) {
-		(&mut **self).local_storage_set(kind, key, value)
-	}
-
-	fn local_storage_clear(&mut self, kind: StorageKind, key: &[u8]) {
-		(&mut **self).local_storage_clear(kind, key)
-	}
-
-	fn local_storage_compare_and_set(
-		&mut self,
-		kind: StorageKind,
-		key: &[u8],
-		old_value: Option<&[u8]>,
-		new_value: &[u8],
-	) -> bool {
-		(&mut **self).local_storage_compare_and_set(kind, key, old_value, new_value)
-	}
-
-	fn local_storage_get(&mut self, kind: StorageKind, key: &[u8]) -> Option<Vec<u8>> {
-		(&mut **self).local_storage_get(kind, key)
-	}
-
 	fn http_request_start(&mut self, method: &str, uri: &str, meta: &[u8]) -> Result<HttpRequestId, ()> {
 		(&mut **self).http_request_start(method, uri, meta)
 	}
@@ -582,7 +524,7 @@ impl<T: Externalities + ?Sized> Externalities for Box<T> {
 	}
 }
 
-/// An `OffchainExternalities` implementation with limited capabilities.
+/// An `*Externalities` implementation with limited capabilities.
 pub struct LimitedExternalities<T> {
 	capabilities: Capabilities,
 	externalities: T,
@@ -633,32 +575,6 @@ impl<T: Externalities> Externalities for LimitedExternalities<T> {
 		self.externalities.random_seed()
 	}
 
-	fn local_storage_set(&mut self, kind: StorageKind, key: &[u8], value: &[u8]) {
-		self.check(Capability::OffchainWorkerDbWrite, "local_storage_set");
-		self.externalities.local_storage_set(kind, key, value)
-	}
-
-	fn local_storage_clear(&mut self, kind: StorageKind, key: &[u8]) {
-		self.check(Capability::OffchainWorkerDbWrite, "local_storage_clear");
-		self.externalities.local_storage_clear(kind, key)
-	}
-
-	fn local_storage_compare_and_set(
-		&mut self,
-		kind: StorageKind,
-		key: &[u8],
-		old_value: Option<&[u8]>,
-		new_value: &[u8],
-	) -> bool {
-		self.check(Capability::OffchainWorkerDbWrite, "local_storage_compare_and_set");
-		self.externalities.local_storage_compare_and_set(kind, key, old_value, new_value)
-	}
-
-	fn local_storage_get(&mut self, kind: StorageKind, key: &[u8]) -> Option<Vec<u8>> {
-		self.check(Capability::OffchainWorkerDbRead, "local_storage_get");
-		self.externalities.local_storage_get(kind, key)
-	}
-
 	fn http_request_start(&mut self, method: &str, uri: &str, meta: &[u8]) -> Result<HttpRequestId, ()> {
 		self.check(Capability::Http, "http_request_start");
 		self.externalities.http_request_start(method, uri, meta)
@@ -707,18 +623,123 @@ impl<T: Externalities> Externalities for LimitedExternalities<T> {
 
 #[cfg(feature = "std")]
 sp_externalities::decl_extension! {
-	/// The offchain extension that will be registered at the Substrate externalities.
-	pub struct OffchainExt(Box<dyn Externalities>);
+	/// The offchain worker extension that will be registered at the Substrate externalities.
+	pub struct OffchainWorkerExt(Box<dyn Externalities>);
 }
 
 #[cfg(feature = "std")]
-impl OffchainExt {
+impl OffchainWorkerExt {
 	/// Create a new instance of `Self`.
 	pub fn new<O: Externalities + 'static>(offchain: O) -> Self {
 		Self(Box::new(offchain))
 	}
 }
 
+/// A externalities extension for accessing the Offchain DB.
+pub trait DbExternalities: Send {
+	/// Sets a value in the local storage.
+	///
+	/// Note this storage is not part of the consensus, it's only accessible by
+	/// offchain worker tasks running on the same machine. It _is_ persisted between runs.
+	fn local_storage_set(&mut self, kind: StorageKind, key: &[u8], value: &[u8]);
+
+	/// Removes a value in the local storage.
+	///
+	/// Note this storage is not part of the consensus, it's only accessible by
+	/// offchain worker tasks running on the same machine. It _is_ persisted between runs.
+	fn local_storage_clear(&mut self, kind: StorageKind, key: &[u8]);
+
+	/// Sets a value in the local storage if it matches current value.
+	///
+	/// Since multiple offchain workers may be running concurrently, to prevent
+	/// data races use CAS to coordinate between them.
+	///
+	/// Returns `true` if the value has been set, `false` otherwise.
+	///
+	/// Note this storage is not part of the consensus, it's only accessible by
+	/// offchain worker tasks running on the same machine. It _is_ persisted between runs.
+	fn local_storage_compare_and_set(
+		&mut self,
+		kind: StorageKind,
+		key: &[u8],
+		old_value: Option<&[u8]>,
+		new_value: &[u8],
+	) -> bool;
+
+	/// Gets a value from the local storage.
+	///
+	/// If the value does not exist in the storage `None` will be returned.
+	/// Note this storage is not part of the consensus, it's only accessible by
+	/// offchain worker tasks running on the same machine. It _is_ persisted between runs.
+	fn local_storage_get(&mut self, kind: StorageKind, key: &[u8]) -> Option<Vec<u8>>;
+}
+
+impl<T: DbExternalities + ?Sized> DbExternalities for Box<T> {
+	fn local_storage_set(&mut self, kind: StorageKind, key: &[u8], value: &[u8]) {
+		(&mut **self).local_storage_set(kind, key, value)
+	}
+
+	fn local_storage_clear(&mut self, kind: StorageKind, key: &[u8]) {
+		(&mut **self).local_storage_clear(kind, key)
+	}
+
+	fn local_storage_compare_and_set(
+		&mut self,
+		kind: StorageKind,
+		key: &[u8],
+		old_value: Option<&[u8]>,
+		new_value: &[u8],
+	) -> bool {
+		(&mut **self).local_storage_compare_and_set(kind, key, old_value, new_value)
+	}
+
+	fn local_storage_get(&mut self, kind: StorageKind, key: &[u8]) -> Option<Vec<u8>> {
+		(&mut **self).local_storage_get(kind, key)
+	}
+}
+
+impl<T: DbExternalities> DbExternalities for LimitedExternalities<T> {
+	fn local_storage_set(&mut self, kind: StorageKind, key: &[u8], value: &[u8]) {
+		self.check(Capability::OffchainDbWrite, "local_storage_set");
+		self.externalities.local_storage_set(kind, key, value)
+	}
+
+	fn local_storage_clear(&mut self, kind: StorageKind, key: &[u8]) {
+		self.check(Capability::OffchainDbWrite, "local_storage_clear");
+		self.externalities.local_storage_clear(kind, key)
+	}
+
+	fn local_storage_compare_and_set(
+		&mut self,
+		kind: StorageKind,
+		key: &[u8],
+		old_value: Option<&[u8]>,
+		new_value: &[u8],
+	) -> bool {
+		self.check(Capability::OffchainDbWrite, "local_storage_compare_and_set");
+		self.externalities.local_storage_compare_and_set(kind, key, old_value, new_value)
+	}
+
+	fn local_storage_get(&mut self, kind: StorageKind, key: &[u8]) -> Option<Vec<u8>> {
+		self.check(Capability::OffchainDbRead, "local_storage_get");
+		self.externalities.local_storage_get(kind, key)
+	}
+}
+
+#[cfg(feature = "std")]
+sp_externalities::decl_extension! {
+	/// The offchain database extension that will be registered at the Substrate externalities.
+	pub struct OffchainDbExt(Box<dyn DbExternalities>);
+}
+
+#[cfg(feature = "std")]
+impl OffchainDbExt {
+	/// Create a new instance of `OffchainDbExt`.
+	pub fn new<O: DbExternalities + 'static>(offchain: O) -> Self {
+		Self(Box::new(offchain))
+	}
+}
+
 /// Abstraction over transaction pool.
 ///
 /// This trait is currently used within the `ExternalitiesExtension`
diff --git a/primitives/core/src/offchain/testing.rs b/primitives/core/src/offchain/testing.rs
index da486a3d03b1..bdec7bf4efa7 100644
--- a/primitives/core/src/offchain/testing.rs
+++ b/primitives/core/src/offchain/testing.rs
@@ -244,44 +244,6 @@ impl offchain::Externalities for TestOffchainExt {
 		self.0.read().seed
 	}
 
-	fn local_storage_set(&mut self, kind: StorageKind, key: &[u8], value: &[u8]) {
-		let mut state = self.0.write();
-		match kind {
-			StorageKind::LOCAL => state.local_storage.set(b"", key, value),
-			StorageKind::PERSISTENT => state.persistent_storage.set(b"", key, value),
-		};
-	}
-
-	fn local_storage_clear(&mut self, kind: StorageKind, key: &[u8]) {
-		let mut state = self.0.write();
-		match kind {
-			StorageKind::LOCAL => state.local_storage.remove(b"", key),
-			StorageKind::PERSISTENT => state.persistent_storage.remove(b"", key),
-		};
-	}
-
-	fn local_storage_compare_and_set(
-		&mut self,
-		kind: StorageKind,
-		key: &[u8],
-		old_value: Option<&[u8]>,
-		new_value: &[u8]
-	) -> bool {
-		let mut state = self.0.write();
-		match kind {
-			StorageKind::LOCAL => state.local_storage.compare_and_set(b"", key, old_value, new_value),
-			StorageKind::PERSISTENT => state.persistent_storage.compare_and_set(b"", key, old_value, new_value),
-		}
-	}
-
-	fn local_storage_get(&mut self, kind: StorageKind, key: &[u8]) -> Option<Vec<u8>> {
-		let state = self.0.read();
-		match kind {
-			StorageKind::LOCAL => state.local_storage.get(TestPersistentOffchainDB::PREFIX, key),
-			StorageKind::PERSISTENT => state.persistent_storage.get(key),
-		}
-	}
-
 	fn http_request_start(&mut self, method: &str, uri: &str, meta: &[u8]) -> Result<RequestId, ()> {
 		let mut state = self.0.write();
 		let id = RequestId(state.requests.len() as u16);
@@ -393,6 +355,48 @@ impl offchain::Externalities for TestOffchainExt {
 	}
 }
 
+impl offchain::DbExternalities for TestOffchainExt {
+	fn local_storage_set(&mut self, kind: StorageKind, key: &[u8], value: &[u8]) {
+		let mut state = self.0.write();
+		match kind {
+			StorageKind::LOCAL => state.local_storage.set(b"", key, value),
+			StorageKind::PERSISTENT => state.persistent_storage.set(b"", key, value),
+		};
+	}
+
+	fn local_storage_clear(&mut self, kind: StorageKind, key: &[u8]) {
+		let mut state = self.0.write();
+		match kind {
+			StorageKind::LOCAL => state.local_storage.remove(b"", key),
+			StorageKind::PERSISTENT => state.persistent_storage.remove(b"", key),
+		};
+	}
+
+	fn local_storage_compare_and_set(
+		&mut self,
+		kind: StorageKind,
+		key: &[u8],
+		old_value: Option<&[u8]>,
+		new_value: &[u8]
+	) -> bool {
+		let mut state = self.0.write();
+		match kind {
+			StorageKind::LOCAL => state.local_storage
+				.compare_and_set(b"", key, old_value, new_value),
+			StorageKind::PERSISTENT => state.persistent_storage
+				.compare_and_set(b"", key, old_value, new_value),
+		}
+	}
+
+	fn local_storage_get(&mut self, kind: StorageKind, key: &[u8]) -> Option<Vec<u8>> {
+		let state = self.0.read();
+		match kind {
+			StorageKind::LOCAL => state.local_storage.get(TestPersistentOffchainDB::PREFIX, key),
+			StorageKind::PERSISTENT => state.persistent_storage.get(key),
+		}
+	}
+}
+
 /// The internal state of the fake transaction pool.
 #[derive(Default)]
 pub struct PoolState {
diff --git a/primitives/io/src/lib.rs b/primitives/io/src/lib.rs
index 521d831dfc75..e123008e5a02 100644
--- a/primitives/io/src/lib.rs
+++ b/primitives/io/src/lib.rs
@@ -39,7 +39,7 @@ use tracing;
 use sp_core::{
 	crypto::Pair,
 	traits::{CallInWasmExt, TaskExecutorExt, RuntimeSpawnExt},
-	offchain::{OffchainExt, TransactionPoolExt},
+	offchain::{OffchainDbExt, OffchainWorkerExt, TransactionPoolExt},
 	hexdisplay::HexDisplay,
 	storage::ChildInfo,
 };
@@ -843,7 +843,7 @@ pub trait Offchain {
 	/// Even if this function returns `true`, it does not mean that any keys are configured
 	/// and that the validator is registered in the chain.
 	fn is_validator(&mut self) -> bool {
-		self.extension::<OffchainExt>()
+		self.extension::<OffchainWorkerExt>()
 			.expect("is_validator can be called only in the offchain worker context")
 			.is_validator()
 	}
@@ -860,21 +860,21 @@ pub trait Offchain {
 
 	/// Returns information about the local node's network state.
 	fn network_state(&mut self) -> Result<OpaqueNetworkState, ()> {
-		self.extension::<OffchainExt>()
+		self.extension::<OffchainWorkerExt>()
 			.expect("network_state can be called only in the offchain worker context")
 			.network_state()
 	}
 
 	/// Returns current UNIX timestamp (in millis)
 	fn timestamp(&mut self) -> Timestamp {
-		self.extension::<OffchainExt>()
+		self.extension::<OffchainWorkerExt>()
 			.expect("timestamp can be called only in the offchain worker context")
 			.timestamp()
 	}
 
 	/// Pause the execution until `deadline` is reached.
 	fn sleep_until(&mut self, deadline: Timestamp) {
-		self.extension::<OffchainExt>()
+		self.extension::<OffchainWorkerExt>()
 			.expect("sleep_until can be called only in the offchain worker context")
 			.sleep_until(deadline)
 	}
@@ -884,7 +884,7 @@ pub trait Offchain {
 	/// This is a truly random, non-deterministic seed generated by host environment.
 	/// Obviously fine in the off-chain worker context.
 	fn random_seed(&mut self) -> [u8; 32] {
-		self.extension::<OffchainExt>()
+		self.extension::<OffchainWorkerExt>()
 			.expect("random_seed can be called only in the offchain worker context")
 			.random_seed()
 	}
@@ -894,8 +894,9 @@ pub trait Offchain {
 	/// Note this storage is not part of the consensus, it's only accessible by
 	/// offchain worker tasks running on the same machine. It IS persisted between runs.
 	fn local_storage_set(&mut self, kind: StorageKind, key: &[u8], value: &[u8]) {
-		self.extension::<OffchainExt>()
-			.expect("local_storage_set can be called only in the offchain worker context")
+		self.extension::<OffchainDbExt>()
+			.expect("local_storage_set can be called only in the offchain call context with
+				OffchainDb extension")
 			.local_storage_set(kind, key, value)
 	}
 
@@ -904,8 +905,9 @@ pub trait Offchain {
 	/// Note this storage is not part of the consensus, it's only accessible by
 	/// offchain worker tasks running on the same machine. It IS persisted between runs.
 	fn local_storage_clear(&mut self, kind: StorageKind, key: &[u8]) {
-		self.extension::<OffchainExt>()
-			.expect("local_storage_clear can be called only in the offchain worker context")
+		self.extension::<OffchainDbExt>()
+			.expect("local_storage_clear can be called only in the offchain call context with
+				OffchainDb extension")
 			.local_storage_clear(kind, key)
 	}
 
@@ -925,9 +927,15 @@ pub trait Offchain {
 		old_value: Option<Vec<u8>>,
 		new_value: &[u8],
 	) -> bool {
-		self.extension::<OffchainExt>()
-			.expect("local_storage_compare_and_set can be called only in the offchain worker context")
-			.local_storage_compare_and_set(kind, key, old_value.as_ref().map(|v| v.deref()), new_value)
+		self.extension::<OffchainDbExt>()
+			.expect("local_storage_compare_and_set can be called only in the offchain call context
+				with OffchainDb extension")
+			.local_storage_compare_and_set(
+				kind,
+				key,
+				old_value.as_ref().map(|v| v.deref()),
+				new_value,
+			)
 	}
 
 	/// Gets a value from the local storage.
@@ -936,8 +944,9 @@ pub trait Offchain {
 	/// Note this storage is not part of the consensus, it's only accessible by
 	/// offchain worker tasks running on the same machine. It IS persisted between runs.
 	fn local_storage_get(&mut self, kind: StorageKind, key: &[u8]) -> Option<Vec<u8>> {
-		self.extension::<OffchainExt>()
-			.expect("local_storage_get can be called only in the offchain worker context")
+		self.extension::<OffchainDbExt>()
+			.expect("local_storage_get can be called only in the offchain call context with
+				OffchainDb extension")
 			.local_storage_get(kind, key)
 	}
 
@@ -951,7 +960,7 @@ pub trait Offchain {
 		uri: &str,
 		meta: &[u8],
 	) -> Result<HttpRequestId, ()> {
-		self.extension::<OffchainExt>()
+		self.extension::<OffchainWorkerExt>()
 			.expect("http_request_start can be called only in the offchain worker context")
 			.http_request_start(method, uri, meta)
 	}
@@ -963,7 +972,7 @@ pub trait Offchain {
 		name: &str,
 		value: &str,
 	) -> Result<(), ()> {
-		self.extension::<OffchainExt>()
+		self.extension::<OffchainWorkerExt>()
 			.expect("http_request_add_header can be called only in the offchain worker context")
 			.http_request_add_header(request_id, name, value)
 	}
@@ -980,7 +989,7 @@ pub trait Offchain {
 		chunk: &[u8],
 		deadline: Option<Timestamp>,
 	) -> Result<(), HttpError> {
-		self.extension::<OffchainExt>()
+		self.extension::<OffchainWorkerExt>()
 			.expect("http_request_write_body can be called only in the offchain worker context")
 			.http_request_write_body(request_id, chunk, deadline)
 	}
@@ -997,7 +1006,7 @@ pub trait Offchain {
 		ids: &[HttpRequestId],
 		deadline: Option<Timestamp>,
 	) -> Vec<HttpRequestStatus> {
-		self.extension::<OffchainExt>()
+		self.extension::<OffchainWorkerExt>()
 			.expect("http_response_wait can be called only in the offchain worker context")
 			.http_response_wait(ids, deadline)
 	}
@@ -1007,7 +1016,7 @@ pub trait Offchain {
 	/// Returns a vector of pairs `(HeaderKey, HeaderValue)`.
 	/// NOTE response headers have to be read before response body.
 	fn http_response_headers(&mut self, request_id: HttpRequestId) -> Vec<(Vec<u8>, Vec<u8>)> {
-		self.extension::<OffchainExt>()
+		self.extension::<OffchainWorkerExt>()
 			.expect("http_response_headers can be called only in the offchain worker context")
 			.http_response_headers(request_id)
 	}
@@ -1026,7 +1035,7 @@ pub trait Offchain {
 		buffer: &mut [u8],
 		deadline: Option<Timestamp>,
 	) -> Result<u32, HttpError> {
-		self.extension::<OffchainExt>()
+		self.extension::<OffchainWorkerExt>()
 			.expect("http_response_read_body can be called only in the offchain worker context")
 			.http_response_read_body(request_id, buffer, deadline)
 			.map(|r| r as u32)
@@ -1034,7 +1043,7 @@ pub trait Offchain {
 
 	/// Set the authorized nodes and authorized_only flag.
 	fn set_authorized_nodes(&mut self, nodes: Vec<OpaquePeerId>, authorized_only: bool) {
-		self.extension::<OffchainExt>()
+		self.extension::<OffchainWorkerExt>()
 			.expect("set_authorized_nodes can be called only in the offchain worker context")
 			.set_authorized_nodes(nodes, authorized_only)
 	}
diff --git a/primitives/runtime/src/offchain/http.rs b/primitives/runtime/src/offchain/http.rs
index 31eec32f6a31..a346460897d5 100644
--- a/primitives/runtime/src/offchain/http.rs
+++ b/primitives/runtime/src/offchain/http.rs
@@ -518,7 +518,7 @@ mod tests {
 	use super::*;
 	use sp_io::TestExternalities;
 	use sp_core::offchain::{
-		OffchainExt,
+		OffchainWorkerExt,
 		testing,
 	};
 
@@ -526,7 +526,7 @@ mod tests {
 	fn should_send_a_basic_request_and_get_response() {
 		let (offchain, state) = testing::TestOffchainExt::new();
 		let mut t = TestExternalities::default();
-		t.register_extension(OffchainExt::new(offchain));
+		t.register_extension(OffchainWorkerExt::new(offchain));
 
 		t.execute_with(|| {
 			let request: Request = Request::get("http://localhost:1234");
@@ -567,7 +567,7 @@ mod tests {
 	fn should_send_a_post_request() {
 		let (offchain, state) = testing::TestOffchainExt::new();
 		let mut t = TestExternalities::default();
-		t.register_extension(OffchainExt::new(offchain));
+		t.register_extension(OffchainWorkerExt::new(offchain));
 
 		t.execute_with(|| {
 			let pending = Request::default()
diff --git a/primitives/runtime/src/offchain/storage.rs b/primitives/runtime/src/offchain/storage.rs
index 56bebf956c13..794ae4255a33 100644
--- a/primitives/runtime/src/offchain/storage.rs
+++ b/primitives/runtime/src/offchain/storage.rs
@@ -104,7 +104,7 @@ mod tests {
 	use super::*;
 	use sp_io::TestExternalities;
 	use sp_core::offchain::{
-		OffchainExt,
+		OffchainDbExt,
 		testing,
 	};
 
@@ -112,7 +112,7 @@ mod tests {
 	fn should_set_and_get() {
 		let (offchain, state) = testing::TestOffchainExt::new();
 		let mut t = TestExternalities::default();
-		t.register_extension(OffchainExt::new(offchain));
+		t.register_extension(OffchainDbExt::new(offchain));
 
 		t.execute_with(|| {
 			let val = StorageValue::persistent(b"testval");
@@ -134,7 +134,7 @@ mod tests {
 	fn should_mutate() {
 		let (offchain, state) = testing::TestOffchainExt::new();
 		let mut t = TestExternalities::default();
-		t.register_extension(OffchainExt::new(offchain));
+		t.register_extension(OffchainDbExt::new(offchain));
 
 		t.execute_with(|| {
 			let val = StorageValue::persistent(b"testval");
diff --git a/primitives/runtime/src/offchain/storage_lock.rs b/primitives/runtime/src/offchain/storage_lock.rs
index 416689cadfb8..4c66db6c385c 100644
--- a/primitives/runtime/src/offchain/storage_lock.rs
+++ b/primitives/runtime/src/offchain/storage_lock.rs
@@ -453,7 +453,7 @@ pub trait BlockNumberProvider {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use sp_core::offchain::{testing, OffchainExt};
+	use sp_core::offchain::{testing, OffchainWorkerExt, OffchainDbExt};
 	use sp_io::TestExternalities;
 
 	const VAL_1: u32 = 0u32;
@@ -463,7 +463,8 @@ mod tests {
 	fn storage_lock_write_unlock_lock_read_unlock() {
 		let (offchain, state) = testing::TestOffchainExt::new();
 		let mut t = TestExternalities::default();
-		t.register_extension(OffchainExt::new(offchain));
+		t.register_extension(OffchainDbExt::new(offchain.clone()));
+		t.register_extension(OffchainWorkerExt::new(offchain));
 
 		t.execute_with(|| {
 			let mut lock = StorageLock::<'_, Time>::new(b"lock_1");
@@ -493,7 +494,8 @@ mod tests {
 	fn storage_lock_and_forget() {
 		let (offchain, state) = testing::TestOffchainExt::new();
 		let mut t = TestExternalities::default();
-		t.register_extension(OffchainExt::new(offchain));
+		t.register_extension(OffchainDbExt::new(offchain.clone()));
+		t.register_extension(OffchainWorkerExt::new(offchain));
 
 		t.execute_with(|| {
 			let mut lock = StorageLock::<'_, Time>::new(b"lock_2");
@@ -517,7 +519,8 @@ mod tests {
 	fn storage_lock_and_let_expire_and_lock_again() {
 		let (offchain, state) = testing::TestOffchainExt::new();
 		let mut t = TestExternalities::default();
-		t.register_extension(OffchainExt::new(offchain));
+		t.register_extension(OffchainDbExt::new(offchain.clone()));
+		t.register_extension(OffchainWorkerExt::new(offchain));
 
 		t.execute_with(|| {
 			let sleep_until = offchain::timestamp().add(Duration::from_millis(500));
@@ -549,7 +552,8 @@ mod tests {
 	fn extend_active_lock() {
 		let (offchain, state) = testing::TestOffchainExt::new();
 		let mut t = TestExternalities::default();
-		t.register_extension(OffchainExt::new(offchain));
+		t.register_extension(OffchainDbExt::new(offchain.clone()));
+		t.register_extension(OffchainWorkerExt::new(offchain));
 
 		t.execute_with(|| {
 			let lock_expiration = Duration::from_millis(300);
diff --git a/test-utils/client/Cargo.toml b/test-utils/client/Cargo.toml
index 1f62e32ddf59..df1cca2101ad 100644
--- a/test-utils/client/Cargo.toml
+++ b/test-utils/client/Cargo.toml
@@ -24,6 +24,7 @@ sc-client-db = { version = "0.9.0", features = ["test-helpers"], path = "../../c
 sc-consensus = { version = "0.9.0", path = "../../client/consensus/common" }
 sc-executor = { version = "0.9.0", path = "../../client/executor" }
 sc-light = { version = "3.0.0", path = "../../client/light" }
+sc-offchain = { version = "3.0.0", path = "../../client/offchain" }
 sc-service = { version = "0.9.0", default-features = false, features = ["test-helpers"],  path = "../../client/service" }
 sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
 sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
diff --git a/test-utils/client/src/lib.rs b/test-utils/client/src/lib.rs
index bf5b2b6a0414..cdeefccc4086 100644
--- a/test-utils/client/src/lib.rs
+++ b/test-utils/client/src/lib.rs
@@ -198,6 +198,7 @@ impl<Block: BlockT, Executor, Backend, G: GenesisInit> TestClientBuilder<Block,
 	) where
 		Executor: sc_client_api::CallExecutor<Block> + 'static,
 		Backend: sc_client_api::backend::Backend<Block>,
+		<Backend as sc_client_api::backend::Backend<Block>>::OffchainStorage: 'static,
 	{
 		let storage = {
 			let mut storage = self.genesis_init.genesis_storage();
@@ -225,6 +226,7 @@ impl<Block: BlockT, Executor, Backend, G: GenesisInit> TestClientBuilder<Block,
 			ExecutionExtensions::new(
 				self.execution_strategies,
 				self.keystore,
+				sc_offchain::OffchainDb::factory_from_backend(&*self.backend),
 			),
 			None,
 			ClientConfig {
diff --git a/utils/frame/benchmarking-cli/src/command.rs b/utils/frame/benchmarking-cli/src/command.rs
index da8a1d98f09a..146b0aa84133 100644
--- a/utils/frame/benchmarking-cli/src/command.rs
+++ b/utils/frame/benchmarking-cli/src/command.rs
@@ -26,7 +26,7 @@ use sp_state_machine::StateMachine;
 use sp_externalities::Extensions;
 use sc_service::{Configuration, NativeExecutionDispatch};
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor};
-use sp_core::offchain::{OffchainExt, testing::TestOffchainExt};
+use sp_core::offchain::{OffchainWorkerExt, testing::TestOffchainExt};
 use sp_keystore::{
 	SyncCryptoStorePtr, KeystoreExt,
 	testing::KeyStore,
@@ -73,7 +73,7 @@ impl BenchmarkCmd {
 		let mut extensions = Extensions::default();
 		extensions.register(KeystoreExt(Arc::new(KeyStore::new()) as SyncCryptoStorePtr));
 		let (offchain, _) = TestOffchainExt::new();
-		extensions.register(OffchainExt::new(offchain));
+		extensions.register(OffchainWorkerExt::new(offchain));
 
 		let result = StateMachine::<_, _, NumberFor<BB>, _>::new(
 			&state,

From b24c43af1a77168feed445136ea4569f1d132c3a Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Wed, 10 Mar 2021 10:31:49 -0600
Subject: [PATCH 0483/1194] more clear randomness API for BABE (#8180)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* more clear randomness API for BABE

* babe: move randomness utilities to its own file

* node: use babe::RandomnessFromOneEpochAgo in random_seed implementation

* frame-support: annotate randomness trait with block number

* pallet-randomness-collective-flip: fix for new randomness trait

* pallet-society: fix randomness usage

* pallet-lottery: fix randomness usage

* pallet-contracts: fix randomness usage

* pallet-babe: fix randomness usage

we need to track when the current and previous epoch started so that we
know the block number by each existing on-chain was known

* node: fix random_seed

* node-template: fix random_seed

* frame-support: extend docs

* babe: add test for epoch starting block number tracking

* babe: fix epoch randomness docs

* frame: add todos for dealing with randomness api changes

Co-authored-by: André Silva <andrerfosilva@gmail.com>
---
 Cargo.lock                                  |   4 +-
 bin/node-template/runtime/src/lib.rs        |   2 +-
 bin/node/runtime/src/lib.rs                 |   2 +-
 frame/babe/src/lib.rs                       |  48 +++----
 frame/babe/src/randomness.rs                | 148 ++++++++++++++++++++
 frame/babe/src/tests.rs                     |  25 ++++
 frame/contracts/src/exec.rs                 |   4 +-
 frame/contracts/src/lib.rs                  |   2 +-
 frame/lottery/Cargo.toml                    |   1 +
 frame/lottery/src/lib.rs                    |   6 +-
 frame/lottery/src/mock.rs                   |   5 +-
 frame/randomness-collective-flip/src/lib.rs |  21 ++-
 frame/society/Cargo.toml                    |   1 +
 frame/society/src/lib.rs                    |  10 +-
 frame/society/src/mock.rs                   |   5 +-
 frame/support/src/traits.rs                 |  64 +++++----
 frame/support/test/Cargo.toml               |   2 +-
 frame/support/test/src/lib.rs               |  18 +++
 18 files changed, 288 insertions(+), 80 deletions(-)
 create mode 100644 frame/babe/src/randomness.rs

diff --git a/Cargo.lock b/Cargo.lock
index 5dddea40cb15..7194b5820f89 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1814,7 +1814,7 @@ dependencies = [
 
 [[package]]
 name = "frame-support-test"
-version = "2.0.1"
+version = "3.0.0"
 dependencies = [
  "frame-metadata",
  "frame-support",
@@ -4983,6 +4983,7 @@ version = "3.0.0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
+ "frame-support-test",
  "frame-system",
  "pallet-balances",
  "parity-scale-codec",
@@ -5278,6 +5279,7 @@ name = "pallet-society"
 version = "3.0.0"
 dependencies = [
  "frame-support",
+ "frame-support-test",
  "frame-system",
  "pallet-balances",
  "parity-scale-codec",
diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index a7372d5d0231..0f026db5735c 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -358,7 +358,7 @@ impl_runtime_apis! {
 		}
 
 		fn random_seed() -> <Block as BlockT>::Hash {
-			RandomnessCollectiveFlip::random_seed()
+			RandomnessCollectiveFlip::random_seed().0
 		}
 	}
 
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 8bb5cf0858d3..2043f59eb99a 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -1220,7 +1220,7 @@ impl_runtime_apis! {
 		}
 
 		fn random_seed() -> <Block as BlockT>::Hash {
-			RandomnessCollectiveFlip::random_seed()
+			pallet_babe::RandomnessFromOneEpochAgo::<Runtime>::random_seed().0
 		}
 	}
 
diff --git a/frame/babe/src/lib.rs b/frame/babe/src/lib.rs
index 29c815444a3a..6a4bacd88d1a 100644
--- a/frame/babe/src/lib.rs
+++ b/frame/babe/src/lib.rs
@@ -25,7 +25,7 @@ use codec::{Decode, Encode};
 use frame_support::{
 	decl_error, decl_module, decl_storage,
 	dispatch::DispatchResultWithPostInfo,
-	traits::{FindAuthor, Get, KeyOwnerProofSystem, OneSessionHandler, Randomness as RandomnessT},
+	traits::{FindAuthor, Get, KeyOwnerProofSystem, OneSessionHandler},
 	weights::{Pays, Weight},
 	Parameter,
 };
@@ -33,7 +33,7 @@ use frame_system::{ensure_none, ensure_root, ensure_signed};
 use sp_application_crypto::Public;
 use sp_runtime::{
 	generic::DigestItem,
-	traits::{Hash, IsMember, One, SaturatedConversion, Saturating, Zero},
+	traits::{IsMember, One, SaturatedConversion, Saturating, Zero},
 	ConsensusEngineId, KeyTypeId,
 };
 use sp_session::{GetSessionNumber, GetValidatorCount};
@@ -49,8 +49,9 @@ use sp_consensus_vrf::schnorrkel;
 
 pub use sp_consensus_babe::{AuthorityId, PUBLIC_KEY_LENGTH, RANDOMNESS_LENGTH, VRF_OUTPUT_LENGTH};
 
-mod equivocation;
 mod default_weights;
+mod equivocation;
+mod randomness;
 
 #[cfg(any(feature = "runtime-benchmarks", test))]
 mod benchmarking;
@@ -60,6 +61,9 @@ mod mock;
 mod tests;
 
 pub use equivocation::{BabeEquivocationOffence, EquivocationHandler, HandleEquivocation};
+pub use randomness::{
+	CurrentBlockRandomness, RandomnessFromOneEpochAgo, RandomnessFromTwoEpochsAgo,
+};
 
 pub trait Config: pallet_timestamp::Config {
 	/// The amount of time, in slots, that each epoch should last.
@@ -220,6 +224,13 @@ decl_storage! {
 		/// secondary plain slots are enabled (which don't contain a VRF output).
 		AuthorVrfRandomness get(fn author_vrf_randomness): MaybeRandomness;
 
+		/// The block numbers when the last and current epoch have started, respectively `N-1` and
+		/// `N`.
+		/// NOTE: We track this is in order to annotate the block number when a given pool of
+		/// entropy was fixed (i.e. it was known to chain observers). Since epochs are defined in
+		/// slots, which may be skipped, the block numbers may not line up with the slot numbers.
+		EpochStart: (T::BlockNumber, T::BlockNumber);
+
 		/// How late the current block is compared to its parent.
 		///
 		/// This entry is populated as part of block execution and is cleaned up
@@ -343,31 +354,6 @@ decl_module! {
 	}
 }
 
-impl<T: Config> RandomnessT<<T as frame_system::Config>::Hash> for Module<T> {
-	/// Some BABE blocks have VRF outputs where the block producer has exactly one bit of influence,
-	/// either they make the block or they do not make the block and thus someone else makes the
-	/// next block. Yet, this randomness is not fresh in all BABE blocks.
-	///
-	/// If that is an insufficient security guarantee then two things can be used to improve this
-	/// randomness:
-	///
-	/// - Name, in advance, the block number whose random value will be used; ensure your module
-	///   retains a buffer of previous random values for its subject and then index into these in
-	///   order to obviate the ability of your user to look up the parent hash and choose when to
-	///   transact based upon it.
-	/// - Require your user to first commit to an additional value by first posting its hash.
-	///   Require them to reveal the value to determine the final result, hashing it with the
-	///   output of this random function. This reduces the ability of a cabal of block producers
-	///   from conspiring against individuals.
-	fn random(subject: &[u8]) -> T::Hash {
-		let mut subject = subject.to_vec();
-		subject.reserve(VRF_OUTPUT_LENGTH);
-		subject.extend_from_slice(&Self::randomness()[..]);
-
-		<T as frame_system::Config>::Hashing::hash(&subject[..])
-	}
-}
-
 /// A BABE public key
 pub type BabeKey = [u8; PUBLIC_KEY_LENGTH];
 
@@ -492,6 +478,12 @@ impl<T: Config> Module<T> {
 		// Update the next epoch authorities.
 		NextAuthorities::put(&next_authorities);
 
+		// Update the start blocks of the previous and new current epoch.
+		<EpochStart<T>>::mutate(|(previous_epoch_start_block, current_epoch_start_block)| {
+			*previous_epoch_start_block = sp_std::mem::take(current_epoch_start_block);
+			*current_epoch_start_block = <frame_system::Module<T>>::block_number();
+		});
+
 		// After we update the current epoch, we signal the *next* epoch change
 		// so that nodes can track changes.
 		let next_randomness = NextRandomness::get();
diff --git a/frame/babe/src/randomness.rs b/frame/babe/src/randomness.rs
new file mode 100644
index 000000000000..71412a962bec
--- /dev/null
+++ b/frame/babe/src/randomness.rs
@@ -0,0 +1,148 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Provides multiple implementations of the randomness trait based on the on-chain epoch
+//! randomness collected from VRF outputs.
+
+use super::{
+	AuthorVrfRandomness, Config, EpochStart, NextRandomness, Randomness, VRF_OUTPUT_LENGTH,
+};
+use frame_support::{traits::Randomness as RandomnessT, StorageValue};
+use sp_runtime::traits::Hash;
+
+/// Randomness usable by consensus protocols that **depend** upon finality and take action
+/// based upon on-chain commitments made during the epoch before the previous epoch.
+///
+/// An off-chain consensus protocol requires randomness be finalized before usage, but one
+/// extra epoch delay beyond `RandomnessFromOneEpochAgo` suffices, under the assumption
+/// that finality never stalls for longer than one epoch.
+///
+/// All randomness is relative to commitments to any other inputs to the computation: If
+/// Alice samples randomness near perfectly using radioactive decay, but then afterwards
+/// Eve selects an arbitrary value with which to xor Alice's randomness, then Eve always
+/// wins whatever game they play.
+///
+/// All input commitments used with `RandomnessFromTwoEpochsAgo` should come from at least
+/// three epochs ago. We require BABE session keys be registered at least three epochs
+/// before being used to derive `CurrentBlockRandomness` for example.
+///
+/// All users learn `RandomnessFromTwoEpochsAgo` when epoch `current_epoch - 1` starts,
+/// although some learn it a few block earlier inside epoch `current_epoch - 2`.
+///
+/// Adversaries with enough block producers could bias this randomness by choosing upon
+/// what their block producers build at the end of epoch `current_epoch - 2` or the
+/// beginning epoch `current_epoch - 1`, or skipping slots at the end of epoch
+/// `current_epoch - 2`.
+///
+/// Adversaries should not possess many block production slots towards the beginning or
+/// end of every epoch, but they possess some influence over when they possess more slots.
+pub struct RandomnessFromTwoEpochsAgo<T>(sp_std::marker::PhantomData<T>);
+
+/// Randomness usable by on-chain code that **does not depend** upon finality and takes
+/// action based upon on-chain commitments made during the previous epoch.
+///
+/// All randomness is relative to commitments to any other inputs to the computation: If
+/// Alice samples randomness near perfectly using radioactive decay, but then afterwards
+/// Eve selects an arbitrary value with which to xor Alice's randomness, then Eve always
+/// wins whatever game they play.
+///
+/// All input commitments used with `RandomnessFromOneEpochAgo` should come from at least
+/// two epochs ago, although the previous epoch might work in special cases under
+/// additional assumption.
+///
+/// All users learn `RandomnessFromOneEpochAgo` at the end of the previous epoch, although
+/// some block producers learn it several block earlier.
+///
+/// Adversaries with enough block producers could bias this randomness by choosing upon
+/// what their block producers build at either the end of the previous epoch or the
+/// beginning of the current epoch, or electing to skipping some of their own block
+/// production slots towards the end of the previous epoch.
+///
+/// Adversaries should not possess many block production slots towards the beginning or
+/// end of every epoch, but they possess some influence over when they possess more slots.
+///
+/// As an example usage, we determine parachain auctions ending times in Polkadot using
+/// `RandomnessFromOneEpochAgo` because it reduces bias from `CurrentBlockRandomness` and
+/// does not require the extra finality delay of `RandomnessFromTwoEpochsAgo`.
+pub struct RandomnessFromOneEpochAgo<T>(sp_std::marker::PhantomData<T>);
+
+/// Randomness produced semi-freshly with each block, but inherits limitations of
+/// `RandomnessFromTwoEpochsAgo` from which it derives.
+///
+/// All randomness is relative to commitments to any other inputs to the computation: If
+/// Alice samples randomness near perfectly using radioactive decay, but then afterwards
+/// Eve selects an arbitrary value with which to xor Alice's randomness, then Eve always
+/// wins whatever game they play.
+///
+/// As with `RandomnessFromTwoEpochsAgo`, all input commitments combined with
+/// `CurrentBlockRandomness` should come from at least two epoch ago, except preferably
+/// not near epoch ending, and thus ideally three epochs ago.
+///
+/// Almost all users learn this randomness for a block when the block producer announces
+/// the block, which makes this randomness appear quite fresh. Yet, the block producer
+/// themselves learned this randomness at the beginning of epoch `current_epoch - 2`, at
+/// the same time as they learn `RandomnessFromTwoEpochsAgo`.
+///
+/// Aside from just biasing `RandomnessFromTwoEpochsAgo`, adversaries could also bias
+/// `CurrentBlockRandomness` by never announcing their block if doing so yields an
+/// unfavorable randomness. As such, `CurrentBlockRandomness` should be considered weaker
+/// than both other randomness sources provided by BABE, but `CurrentBlockRandomness`
+/// remains constrained by declared staking, while a randomness source like block hash is
+/// only constrained by adversaries' unknowable computational power.
+///
+/// As an example use, parachains could assign block production slots based upon the
+/// `CurrentBlockRandomness` of their relay parent or relay parent's parent, provided the
+/// parachain registers collators but avoids censorship sensitive functionality like
+/// slashing. Any parachain with slashing could operate BABE itself or perhaps better yet
+/// a BABE-like approach that derives its `CurrentBlockRandomness`, and authorizes block
+/// production, based upon the relay parent's `CurrentBlockRandomness` or more likely the
+/// relay parent's `RandomnessFromTwoEpochsAgo`.
+pub struct CurrentBlockRandomness<T>(sp_std::marker::PhantomData<T>);
+
+impl<T: Config> RandomnessT<T::Hash, T::BlockNumber> for RandomnessFromTwoEpochsAgo<T> {
+	fn random(subject: &[u8]) -> (T::Hash, T::BlockNumber) {
+		let mut subject = subject.to_vec();
+		subject.reserve(VRF_OUTPUT_LENGTH);
+		subject.extend_from_slice(&Randomness::get()[..]);
+
+		(T::Hashing::hash(&subject[..]), EpochStart::<T>::get().0)
+	}
+}
+
+impl<T: Config> RandomnessT<T::Hash, T::BlockNumber> for RandomnessFromOneEpochAgo<T> {
+	fn random(subject: &[u8]) -> (T::Hash, T::BlockNumber) {
+		let mut subject = subject.to_vec();
+		subject.reserve(VRF_OUTPUT_LENGTH);
+		subject.extend_from_slice(&NextRandomness::get()[..]);
+
+		(T::Hashing::hash(&subject[..]), EpochStart::<T>::get().1)
+	}
+}
+
+impl<T: Config> RandomnessT<Option<T::Hash>, T::BlockNumber> for CurrentBlockRandomness<T> {
+	fn random(subject: &[u8]) -> (Option<T::Hash>, T::BlockNumber) {
+		let random = AuthorVrfRandomness::get().map(|random| {
+			let mut subject = subject.to_vec();
+			subject.reserve(VRF_OUTPUT_LENGTH);
+			subject.extend_from_slice(&random);
+
+			T::Hashing::hash(&subject[..])
+		});
+
+		(random, <frame_system::Module<T>>::block_number())
+	}
+}
diff --git a/frame/babe/src/tests.rs b/frame/babe/src/tests.rs
index 6515e5fdaaf9..82a7782448d6 100644
--- a/frame/babe/src/tests.rs
+++ b/frame/babe/src/tests.rs
@@ -349,6 +349,31 @@ fn can_fetch_current_and_next_epoch_data() {
 	});
 }
 
+#[test]
+fn tracks_block_numbers_when_current_and_previous_epoch_started() {
+	new_test_ext(5).execute_with(|| {
+		// an epoch is 3 slots therefore at block 8 we should be in epoch #3
+		// with the previous epochs having the following blocks:
+		// epoch 1 - [1, 2, 3]
+		// epoch 2 - [4, 5, 6]
+		// epoch 3 - [7, 8, 9]
+		progress_to_block(8);
+
+		let (last_epoch, current_epoch) = EpochStart::<Test>::get();
+
+		assert_eq!(last_epoch, 4);
+		assert_eq!(current_epoch, 7);
+
+		// once we reach block 10 we switch to epoch #4
+		progress_to_block(10);
+
+		let (last_epoch, current_epoch) = EpochStart::<Test>::get();
+
+		assert_eq!(last_epoch, 7);
+		assert_eq!(current_epoch, 10);
+	});
+}
+
 #[test]
 fn report_equivocation_current_session_works() {
 	let (pairs, mut ext) = new_test_ext_with_pairs(3);
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index 745384a8674b..d0e1127db860 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -740,7 +740,9 @@ where
 	}
 
 	fn random(&self, subject: &[u8]) -> SeedOf<T> {
-		T::Randomness::random(subject)
+		// TODO: change API to expose randomness freshness
+		// https://github.com/paritytech/substrate/issues/8297
+		T::Randomness::random(subject).0
 	}
 
 	fn now(&self) -> &MomentOf<T> {
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index 2ce2014075a8..7068c4e99e97 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -151,7 +151,7 @@ pub mod pallet {
 		type Time: Time;
 
 		/// The generator used to supply randomness to contracts through `seal_random`.
-		type Randomness: Randomness<Self::Hash>;
+		type Randomness: Randomness<Self::Hash, Self::BlockNumber>;
 
 		/// The currency in which fees are paid and contract balances are held.
 		type Currency: Currency<Self::AccountId>;
diff --git a/frame/lottery/Cargo.toml b/frame/lottery/Cargo.toml
index 0d60b0aaca35..73de239a4d80 100644
--- a/frame/lottery/Cargo.toml
+++ b/frame/lottery/Cargo.toml
@@ -22,6 +22,7 @@ frame-system = { version = "3.0.0", default-features = false, path = "../system"
 frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
+frame-support-test = { version = "3.0.0", path = "../support/test" }
 pallet-balances = { version = "3.0.0", path = "../balances" }
 sp-core = { version = "3.0.0", path = "../../primitives/core" }
 sp-io = { version = "3.0.0", path = "../../primitives/io" }
diff --git a/frame/lottery/src/lib.rs b/frame/lottery/src/lib.rs
index 11543d67b316..8248caa06708 100644
--- a/frame/lottery/src/lib.rs
+++ b/frame/lottery/src/lib.rs
@@ -85,7 +85,7 @@ pub trait Config: frame_system::Config {
 	type Currency: ReservableCurrency<Self::AccountId>;
 
 	/// Something that provides randomness in the runtime.
-	type Randomness: Randomness<Self::Hash>;
+	type Randomness: Randomness<Self::Hash, Self::BlockNumber>;
 
 	/// The overarching event type.
 	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
@@ -443,8 +443,10 @@ impl<T: Config> Module<T> {
 	// Note that there is potential bias introduced by using modulus operator.
 	// You should call this function with different seed values until the random
 	// number lies within `u32::MAX - u32::MAX % n`.
+	// TODO: deal with randomness freshness
+	// https://github.com/paritytech/substrate/issues/8311
 	fn generate_random_number(seed: u32) -> u32 {
-		let random_seed = T::Randomness::random(&(T::ModuleId::get(), seed).encode());
+		let (random_seed, _) = T::Randomness::random(&(T::ModuleId::get(), seed).encode());
 		let random_number = <u32>::decode(&mut random_seed.as_ref())
 			.expect("secure hashes should always be bigger than u32; qed");
 		random_number
diff --git a/frame/lottery/src/mock.rs b/frame/lottery/src/mock.rs
index ea73ee190e6d..44691427c8e5 100644
--- a/frame/lottery/src/mock.rs
+++ b/frame/lottery/src/mock.rs
@@ -22,8 +22,9 @@ use crate as pallet_lottery;
 
 use frame_support::{
 	parameter_types,
-	traits::{OnInitialize, OnFinalize, TestRandomness},
+	traits::{OnFinalize, OnInitialize},
 };
+use frame_support_test::TestRandomness;
 use sp_core::H256;
 use sp_runtime::{
 	Perbill,
@@ -103,7 +104,7 @@ impl Config for Test {
 	type ModuleId = LotteryModuleId;
 	type Call = Call;
 	type Currency = Balances;
-	type Randomness = TestRandomness;
+	type Randomness = TestRandomness<Self>;
 	type Event = Event;
 	type ManagerOrigin = EnsureRoot<u64>;
 	type MaxCalls = MaxCalls;
diff --git a/frame/randomness-collective-flip/src/lib.rs b/frame/randomness-collective-flip/src/lib.rs
index 0dba6727da60..57e95ccb141d 100644
--- a/frame/randomness-collective-flip/src/lib.rs
+++ b/frame/randomness-collective-flip/src/lib.rs
@@ -56,7 +56,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use sp_std::{prelude::*, convert::TryInto};
-use sp_runtime::traits::Hash;
+use sp_runtime::traits::{Hash, Saturating};
 use frame_support::{
 	decl_module, decl_storage, traits::Randomness,
 	weights::Weight
@@ -99,7 +99,7 @@ decl_storage! {
 	}
 }
 
-impl<T: Config> Randomness<T::Hash> for Module<T> {
+impl<T: Config> Randomness<T::Hash, T::BlockNumber> for Module<T> {
 	/// This randomness uses a low-influence function, drawing upon the block hashes from the
 	/// previous 81 blocks. Its result for any given subject will be known far in advance by anyone
 	/// observing the chain. Any block producer has significant influence over their block hashes
@@ -110,14 +110,15 @@ impl<T: Config> Randomness<T::Hash> for Module<T> {
 	/// WARNING: Hashing the result of this function will remove any low-influence properties it has
 	/// and mean that all bits of the resulting value are entirely manipulatable by the author of
 	/// the parent block, who can determine the value of `parent_hash`.
-	fn random(subject: &[u8]) -> T::Hash {
+	fn random(subject: &[u8]) -> (T::Hash, T::BlockNumber) {
 		let block_number = <frame_system::Module<T>>::block_number();
 		let index = block_number_to_index::<T>(block_number);
 
 		let hash_series = <RandomMaterial<T>>::get();
-		if !hash_series.is_empty() {
+		let seed = if !hash_series.is_empty() {
 			// Always the case after block 1 is initialized.
-			hash_series.iter()
+			hash_series
+				.iter()
 				.cycle()
 				.skip(index)
 				.take(RANDOM_MATERIAL_LEN as usize)
@@ -126,7 +127,12 @@ impl<T: Config> Randomness<T::Hash> for Module<T> {
 				.triplet_mix()
 		} else {
 			T::Hash::default()
-		}
+		};
+
+		(
+			seed,
+			block_number.saturating_sub(RANDOM_MATERIAL_LEN.into()),
+		)
 	}
 }
 
@@ -272,8 +278,9 @@ mod tests {
 			assert_eq!(CollectiveFlip::random_seed(), CollectiveFlip::random_seed());
 			assert_ne!(CollectiveFlip::random(b"random_1"), CollectiveFlip::random(b"random_2"));
 
-			let random = CollectiveFlip::random_seed();
+			let (random, known_since) = CollectiveFlip::random_seed();
 
+			assert_eq!(known_since, 162 - RANDOM_MATERIAL_LEN as u64);
 			assert_ne!(random, H256::zero());
 			assert!(!CollectiveFlip::random_material().contains(&random));
 		});
diff --git a/frame/society/Cargo.toml b/frame/society/Cargo.toml
index 913e40e0301d..a3c6dcadab86 100644
--- a/frame/society/Cargo.toml
+++ b/frame/society/Cargo.toml
@@ -24,6 +24,7 @@ rand_chacha = { version = "0.2", default-features = false }
 [dev-dependencies]
 sp-core = { version = "3.0.0", path = "../../primitives/core" }
 sp-io ={ version = "3.0.0", path = "../../primitives/io" }
+frame-support-test = { version = "3.0.0", path = "../support/test" }
 pallet-balances = { version = "3.0.0", path = "../balances" }
 
 [features]
diff --git a/frame/society/src/lib.rs b/frame/society/src/lib.rs
index f8f8fa61a00f..66d89d67dd6e 100644
--- a/frame/society/src/lib.rs
+++ b/frame/society/src/lib.rs
@@ -283,7 +283,7 @@ pub trait Config<I=DefaultInstance>: system::Config {
 	type Currency: ReservableCurrency<Self::AccountId>;
 
 	/// Something that provides randomness in the runtime.
-	type Randomness: Randomness<Self::Hash>;
+	type Randomness: Randomness<Self::Hash, Self::BlockNumber>;
 
 	/// The minimum amount of a deposit required for a bid to be made.
 	type CandidateDeposit: Get<BalanceOf<Self, I>>;
@@ -1309,7 +1309,9 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 		let mut pot = <Pot<T, I>>::get();
 
 		// we'll need a random seed here.
-		let seed = T::Randomness::random(phrase);
+		// TODO: deal with randomness freshness
+		// https://github.com/paritytech/substrate/issues/8312
+		let (seed, _) = T::Randomness::random(phrase);
 		// seed needs to be guaranteed to be 32 bytes.
 		let seed = <[u8; 32]>::decode(&mut TrailingZeroInput::new(seed.as_ref()))
 			.expect("input is padded with zeroes; qed");
@@ -1565,7 +1567,9 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 				// Start a new defender rotation
 				let phrase = b"society_challenge";
 				// we'll need a random seed here.
-				let seed = T::Randomness::random(phrase);
+				// TODO: deal with randomness freshness
+				// https://github.com/paritytech/substrate/issues/8312
+				let (seed, _) = T::Randomness::random(phrase);
 				// seed needs to be guaranteed to be 32 bytes.
 				let seed = <[u8; 32]>::decode(&mut TrailingZeroInput::new(seed.as_ref()))
 					.expect("input is padded with zeroes; qed");
diff --git a/frame/society/src/mock.rs b/frame/society/src/mock.rs
index 4b1bb21dd18d..0a684b2a8dc8 100644
--- a/frame/society/src/mock.rs
+++ b/frame/society/src/mock.rs
@@ -22,8 +22,9 @@ use crate as pallet_society;
 
 use frame_support::{
 	parameter_types, ord_parameter_types,
-	traits::{OnInitialize, OnFinalize, TestRandomness},
+	traits::{OnInitialize, OnFinalize},
 };
+use frame_support_test::TestRandomness;
 use sp_core::H256;
 use sp_runtime::{
 	testing::Header,
@@ -104,7 +105,7 @@ impl pallet_balances::Config for Test {
 impl Config for Test {
 	type Event = Event;
 	type Currency = pallet_balances::Module<Self>;
-	type Randomness = TestRandomness;
+	type Randomness = TestRandomness<Self>;
 	type CandidateDeposit = CandidateDeposit;
 	type WrongSideDeduction = WrongSideDeduction;
 	type MaxStrikes = MaxStrikes;
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index c22f694d3829..1427a727a15d 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -23,13 +23,13 @@ use sp_std::{prelude::*, result, marker::PhantomData, ops::Div, fmt::Debug};
 use codec::{FullCodec, Codec, Encode, Decode, EncodeLike};
 use sp_core::u32_trait::Value as U32;
 use sp_runtime::{
-	RuntimeAppPublic, RuntimeDebug, BoundToRuntimeAppPublic,
-	ConsensusEngineId, DispatchResult, DispatchError,
 	traits::{
-		MaybeSerializeDeserialize, AtLeast32Bit, Saturating, TrailingZeroInput, Bounded, Zero,
-		BadOrigin, AtLeast32BitUnsigned, Convert, UniqueSaturatedFrom, UniqueSaturatedInto,
-		SaturatedConversion, StoredMapError, Block as BlockT,
+		AtLeast32Bit, AtLeast32BitUnsigned, BadOrigin, Block as BlockT, Bounded, Convert,
+		MaybeSerializeDeserialize, SaturatedConversion, Saturating, StoredMapError,
+		UniqueSaturatedFrom, UniqueSaturatedInto, Zero,
 	},
+	BoundToRuntimeAppPublic, ConsensusEngineId, DispatchError, DispatchResult, RuntimeAppPublic,
+	RuntimeDebug,
 };
 use sp_staking::SessionIndex;
 use crate::dispatch::Parameter;
@@ -1413,38 +1413,42 @@ impl<T> InitializeMembers<T> for () {
 	fn initialize_members(_: &[T]) {}
 }
 
-// A trait that is able to provide randomness.
-pub trait Randomness<Output> {
-	/// Get a "random" value
-	///
-	/// Being a deterministic blockchain, real randomness is difficult to come by. This gives you
-	/// something that approximates it. At best, this will be randomness which was
-	/// hard to predict a long time ago, but that has become easy to predict recently.
-	///
-	/// `subject` is a context identifier and allows you to get a
-	/// different result to other callers of this function; use it like
-	/// `random(&b"my context"[..])`.
-	fn random(subject: &[u8]) -> Output;
+/// A trait that is able to provide randomness.
+///
+/// Being a deterministic blockchain, real randomness is difficult to come by, different
+/// implementations of this trait will provide different security guarantees. At best,
+/// this will be randomness which was hard to predict a long time ago, but that has become
+/// easy to predict recently.
+pub trait Randomness<Output, BlockNumber> {
+	/// Get the most recently determined random seed, along with the time in the past
+	/// since when it was determinable by chain observers.
+	///
+	/// `subject` is a context identifier and allows you to get a different result to
+	/// other callers of this function; use it like `random(&b"my context"[..])`.
+	///
+	/// NOTE: The returned seed should only be used to distinguish commitments made before
+	/// the returned block number. If the block number is too early (i.e. commitments were
+	/// made afterwards), then ensure no further commitments may be made and repeatedly
+	/// call this on later blocks until the block number returned is later than the latest
+	/// commitment.
+	fn random(subject: &[u8]) -> (Output, BlockNumber);
 
 	/// Get the basic random seed.
 	///
-	/// In general you won't want to use this, but rather `Self::random` which allows you to give a
-	/// subject for the random result and whose value will be independently low-influence random
-	/// from any other such seeds.
-	fn random_seed() -> Output {
+	/// In general you won't want to use this, but rather `Self::random` which allows
+	/// you to give a subject for the random result and whose value will be
+	/// independently low-influence random from any other such seeds.
+	///
+	/// NOTE: The returned seed should only be used to distinguish commitments made before
+	/// the returned block number. If the block number is too early (i.e. commitments were
+	/// made afterwards), then ensure no further commitments may be made and repeatedly
+	/// call this on later blocks until the block number returned is later than the latest
+	/// commitment.
+	fn random_seed() -> (Output, BlockNumber) {
 		Self::random(&[][..])
 	}
 }
 
-/// Provides an implementation of [`Randomness`] that should only be used in tests!
-pub struct TestRandomness;
-
-impl<Output: Decode + Default> Randomness<Output> for TestRandomness {
-	fn random(subject: &[u8]) -> Output {
-		Output::decode(&mut TrailingZeroInput::new(subject)).unwrap_or_default()
-	}
-}
-
 /// Trait to be used by block producing consensus engine modules to determine
 /// how late the current block is (e.g. in a slot-based proposal mechanism how
 /// many slots were skipped since the previous block).
diff --git a/frame/support/test/Cargo.toml b/frame/support/test/Cargo.toml
index 2ec59b1013da..17aeea970c05 100644
--- a/frame/support/test/Cargo.toml
+++ b/frame/support/test/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-support-test"
-version = "2.0.1"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/support/test/src/lib.rs b/frame/support/test/src/lib.rs
index 4b1510bf81f4..fe1d1eb9d3d6 100644
--- a/frame/support/test/src/lib.rs
+++ b/frame/support/test/src/lib.rs
@@ -53,3 +53,21 @@ impl frame_support::traits::PalletInfo for PanicPalletInfo {
 		unimplemented!("PanicPalletInfo mustn't be triggered by tests");
 	}
 }
+
+/// Provides an implementation of [`Randomness`] that should only be used in tests!
+pub struct TestRandomness<T>(sp_std::marker::PhantomData<T>);
+
+impl<Output: codec::Decode + Default, T> frame_support::traits::Randomness<Output, T::BlockNumber>
+	for TestRandomness<T>
+where
+	T: frame_system::Config,
+{
+	fn random(subject: &[u8]) -> (Output, T::BlockNumber) {
+		use sp_runtime::traits::TrailingZeroInput;
+
+		(
+			Output::decode(&mut TrailingZeroInput::new(subject)).unwrap_or_default(),
+			frame_system::Module::<T>::block_number(),
+		)
+	}
+}

From fcab5a33c78a72f71927f9c38226636a9c5b3e6e Mon Sep 17 00:00:00 2001
From: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
Date: Thu, 11 Mar 2021 10:06:53 +0100
Subject: [PATCH 0484/1194] Implement PJR checker (#8160)

* Apply.

* get rid of glob import

* use meaningful generic type name

* pjr_check operates on `Supports` struct used elsewhere

* improve algorithmic complexity of `prepare_pjr_input`

* fix rustdoc warnings

* improve module docs

* typo

* simplify debug assertion

* add test finding the phase-change threshold value for a constructed scenario

* add more threshold scenarios to disambiguate plausible interpretations

* add link to npos paper reference

* docs: staked_assignment -> supports

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* add utility method for generating npos inputs

* add a fuzzer which asserts that all unbalanced seq_phragmen are PJR

Note that this currently fails. I hope that this can be rectified
by calculating the threshold instead of choosing some arbitrary number.

* assert in all cases, not just debug

* leverage a native solution to choose candidates

* use existing helper methods

* add pjr-check and incorporate into the fuzzer

We should probably have one of the W3F people look at this to ensure
we're not misconstruing any definitions, but this seems like a
fairly straightforward implementation.

* fix compilation errors

* Enable manually setting iteration parameters in single run.

This gives us the ability to reproducably extract cases where
honggfuzz has discovered a panic. For example:

$ cargo run --release --bin phragmen_pjr -- --candidates 569 --voters 100
Tue 23 Feb 2021 11:23:39 AM CET
   Compiling bitflags v1.2.1
   Compiling unicode-width v0.1.8
   Compiling unicode-segmentation v1.7.1
   Compiling ansi_term v0.11.0
   Compiling strsim v0.8.0
   Compiling vec_map v0.8.2
   Compiling proc-macro-error-attr v1.0.4
   Compiling proc-macro-error v1.0.4
   Compiling textwrap v0.11.0
   Compiling atty v0.2.14
   Compiling heck v0.3.2
   Compiling clap v2.33.3
   Compiling structopt-derive v0.4.14
   Compiling structopt v0.3.21
   Compiling sp-npos-elections-fuzzer v2.0.0-alpha.5 (/home/coriolinus/Documents/Projects/paritytech/substrate/primitives/npos-elections/fuzzer)
    Finished release [optimized] target(s) in 6.15s
     Running `/home/coriolinus/Documents/Projects/paritytech/substrate/target/release/phragmen_pjr -c 569 -v 100`
thread 'main' panicked at 'unbalanced sequential phragmen must satisfy PJR', primitives/npos-elections/fuzzer/src/phragmen_pjr.rs:133:5
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

This is still not adequate proof that seq_phragmen is broken; it could
very well be that our PJR checker is doing the wrong thing, or we've
somehow missed a parameter of interest. Still, it's concerning.

* update comment verbiage for accuracy

* it is valid in PJR for an elected candidate to have 0 support

* Fix phragmen_pjr fuzzer

It turns out that the fundamental problem causing previous implementations
of the fuzzer to fail wasn't in `seq_phragmen` _or_ in `pjr_check`: it was
in the rounding errors introduced in the various conversions between the
internal data representation and the external one.

Fixing the fuzzer is then simply an issue of using the internal representation
and staying in that representation. However, that leaves the issue that
`seq_phragmen` occasionally produces an output which is technically not
PJR due to rounding errors. In the future we will need to add some kind of
"close-enough" threshold. However, that is explicitly out of scope of
this PR.

* restart ci; it appears to be stalled

* use necessary import for no-std

* use a more realistic distribution of voters and candidates

This isn't ideal; more realistic numbers would be about twice these.
However, either case generation or voting has nonlinear execution
time, and doubling these values brings iteration time from ~20s to
~180s. Fuzzing 6x as fast should make up for fuzzing cases half the size.

* identify specifically which PJR check may fail

* move candidate collection comment into correct place

* standard_threshold: use a calculation method which cannot overflow

* Apply suggestions from code review (update comments)

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* clarify the effectiveness bounds for t-pjr check

* how to spell "committee"

* reorganize: high -> low abstraction

* ensure standard threshold calc cannot panic

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

Co-authored-by: kianenigma <kian.peymani@gmail.com>
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 Cargo.lock                                    |   2 +
 frame/staking/src/lib.rs                      |   2 +-
 primitives/npos-elections/fuzzer/Cargo.toml   |  14 +-
 .../npos-elections/fuzzer/src/common.rs       | 125 ++++-
 .../npos-elections/fuzzer/src/phragmen_pjr.rs | 118 ++++
 primitives/npos-elections/src/lib.rs          |  53 +-
 primitives/npos-elections/src/phragmen.rs     |   4 +
 primitives/npos-elections/src/pjr.rs          | 519 ++++++++++++++++++
 8 files changed, 792 insertions(+), 45 deletions(-)
 create mode 100644 primitives/npos-elections/fuzzer/src/phragmen_pjr.rs
 create mode 100644 primitives/npos-elections/src/pjr.rs

diff --git a/Cargo.lock b/Cargo.lock
index 7194b5820f89..911d1541f6f8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8803,9 +8803,11 @@ dependencies = [
  "honggfuzz",
  "parity-scale-codec",
  "rand 0.7.3",
+ "sp-arithmetic",
  "sp-npos-elections",
  "sp-runtime",
  "sp-std",
+ "structopt",
 ]
 
 [[package]]
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index ed8a2efbd45a..7f51d246c66a 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -2740,8 +2740,8 @@ impl<T: Config> Module<T> {
 		// write new results.
 		<QueuedElected<T>>::put(ElectionResult {
 			elected_stashes: winners,
-			compute,
 			exposures,
+			compute,
 		});
 		QueuedScore::put(submitted_score);
 
diff --git a/primitives/npos-elections/fuzzer/Cargo.toml b/primitives/npos-elections/fuzzer/Cargo.toml
index bac8a165f394..3154a7861d30 100644
--- a/primitives/npos-elections/fuzzer/Cargo.toml
+++ b/primitives/npos-elections/fuzzer/Cargo.toml
@@ -14,12 +14,14 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-npos-elections = { version = "3.0.0", path = ".." }
-sp-std = { version = "3.0.0", path = "../../std" }
-sp-runtime = { version = "3.0.0", path = "../../runtime" }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 honggfuzz = "0.5"
 rand = { version = "0.7.3", features = ["std", "small_rng"] }
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+sp-arithmetic = { version = "3.0.0", path = "../../arithmetic" }
+sp-npos-elections = { version = "3.0.0", path = ".." }
+sp-runtime = { version = "3.0.0", path = "../../runtime" }
+sp-std = { version = "3.0.0", path = "../../std" }
+structopt = "0.3.21"
 
 [[bin]]
 name = "reduce"
@@ -36,3 +38,7 @@ path = "src/phragmms_balancing.rs"
 [[bin]]
 name = "compact"
 path = "src/compact.rs"
+
+[[bin]]
+name = "phragmen_pjr"
+path = "src/phragmen_pjr.rs"
diff --git a/primitives/npos-elections/fuzzer/src/common.rs b/primitives/npos-elections/fuzzer/src/common.rs
index 29f0247f84f3..fe237c930de1 100644
--- a/primitives/npos-elections/fuzzer/src/common.rs
+++ b/primitives/npos-elections/fuzzer/src/common.rs
@@ -20,10 +20,10 @@
 // Each function will be used based on which fuzzer binary is being used.
 #![allow(dead_code)]
 
-use sp_npos_elections::{ElectionResult, VoteWeight, phragmms, seq_phragmen};
-use sp_std::collections::btree_map::BTreeMap;
+use rand::{self, seq::SliceRandom, Rng, RngCore};
+use sp_npos_elections::{phragmms, seq_phragmen, ElectionResult, VoteWeight};
 use sp_runtime::Perbill;
-use rand::{self, Rng, RngCore};
+use std::collections::{BTreeMap, HashSet};
 
 /// converts x into the range [a, b] in a pseudo-fair way.
 pub fn to_range(x: usize, a: usize, b: usize) -> usize {
@@ -39,11 +39,81 @@ pub fn to_range(x: usize, a: usize, b: usize) -> usize {
 
 pub enum ElectionType {
 	Phragmen(Option<(usize, u128)>),
-	Phragmms(Option<(usize, u128)>)
+	Phragmms(Option<(usize, u128)>),
 }
 
 pub type AccountId = u64;
 
+/// Generate a set of inputs suitable for fuzzing an election algorithm
+///
+/// Given parameters governing how many candidates and voters should exist, generates a voting
+/// scenario suitable for fuzz-testing an election algorithm.
+///
+/// The returned candidate list is sorted. This sorting property should not affect the result of the
+/// calculation.
+///
+/// The returned voters list is sorted. This enables binary searching for a particular voter by
+/// account id. This sorting property should not affect the results of the calculation.
+///
+/// Each voter's selection of candidates to vote for is sorted.
+///
+/// Note that this does not generate balancing parameters.
+pub fn generate_random_npos_inputs(
+	candidate_count: usize,
+	voter_count: usize,
+	mut rng: impl Rng,
+) -> (
+	usize,
+	Vec<AccountId>,
+	Vec<(AccountId, VoteWeight, Vec<AccountId>)>,
+) {
+	// cache for fast generation of unique candidate and voter ids
+	let mut used_ids = HashSet::with_capacity(candidate_count + voter_count);
+
+	// always generate a sensible desired number of candidates: elections are uninteresting if we
+	// desire 0 candidates, or a number of candidates >= the actual number of candidates present
+	let rounds = rng.gen_range(1, candidate_count);
+
+	// candidates are easy: just a completely random set of IDs
+	let mut candidates: Vec<AccountId> = Vec::with_capacity(candidate_count);
+	for _ in 0..candidate_count {
+		let mut id = rng.gen();
+		// insert returns `false` when the value was already present
+		while !used_ids.insert(id) {
+			id = rng.gen();
+		}
+		candidates.push(id);
+	}
+	candidates.sort_unstable();
+	candidates.dedup();
+	assert_eq!(candidates.len(), candidate_count);
+
+	let mut voters = Vec::with_capacity(voter_count);
+	for _ in 0..voter_count {
+		let mut id = rng.gen();
+		// insert returns `false` when the value was already present
+		while !used_ids.insert(id) {
+			id = rng.gen();
+		}
+
+		let vote_weight = rng.gen();
+
+		// it's not interesting if a voter chooses 0 or all candidates, so rule those cases out.
+		let n_candidates_chosen = rng.gen_range(1, candidates.len());
+
+		let mut chosen_candidates = Vec::with_capacity(n_candidates_chosen);
+		chosen_candidates.extend(candidates.choose_multiple(&mut rng, n_candidates_chosen));
+		chosen_candidates.sort();
+		voters.push((id, vote_weight, chosen_candidates));
+	}
+
+	voters.sort_unstable();
+	voters.dedup_by_key(|(id, _weight, _chosen_candidates)| *id);
+	assert_eq!(voters.len(), voter_count);
+
+	(rounds, candidates, voters)
+}
+
 pub fn generate_random_npos_result(
 	voter_count: u64,
 	target_count: u64,
@@ -71,19 +141,20 @@ pub fn generate_random_npos_result(
 	});
 
 	let mut voters = Vec::with_capacity(voter_count as usize);
-	(prefix ..= (prefix + voter_count)).for_each(|acc| {
+	(prefix..=(prefix + voter_count)).for_each(|acc| {
 		let edge_per_this_voter = rng.gen_range(1, candidates.len());
 		// all possible targets
 		let mut all_targets = candidates.clone();
 		// we remove and pop into `targets` `edge_per_this_voter` times.
-		let targets = (0..edge_per_this_voter).map(|_| {
-			let upper = all_targets.len() - 1;
-			let idx = rng.gen_range(0, upper);
-			all_targets.remove(idx)
-		})
-		.collect::<Vec<AccountId>>();
-
-		let stake_var = rng.gen_range(ed, 100 * ed) ;
+		let targets = (0..edge_per_this_voter)
+			.map(|_| {
+				let upper = all_targets.len() - 1;
+				let idx = rng.gen_range(0, upper);
+				all_targets.remove(idx)
+			})
+			.collect::<Vec<AccountId>>();
+
+		let stake_var = rng.gen_range(ed, 100 * ed);
 		let stake = base_stake + stake_var;
 		stake_of.insert(acc, stake);
 		voters.push((acc, stake, targets));
@@ -91,20 +162,20 @@ pub fn generate_random_npos_result(
 
 	(
 		match election_type {
-			ElectionType::Phragmen(conf) =>
-				seq_phragmen::<AccountId, sp_runtime::Perbill>(
-					to_elect,
-					candidates.clone(),
-					voters.clone(),
-					conf,
-				).unwrap(),
-			ElectionType::Phragmms(conf) =>
-				phragmms::<AccountId, sp_runtime::Perbill>(
-					to_elect,
-					candidates.clone(),
-					voters.clone(),
-					conf,
-				).unwrap(),
+			ElectionType::Phragmen(conf) => seq_phragmen::<AccountId, sp_runtime::Perbill>(
+				to_elect,
+				candidates.clone(),
+				voters.clone(),
+				conf,
+			)
+			.unwrap(),
+			ElectionType::Phragmms(conf) => phragmms::<AccountId, sp_runtime::Perbill>(
+				to_elect,
+				candidates.clone(),
+				voters.clone(),
+				conf,
+			)
+			.unwrap(),
 		},
 		candidates,
 		voters,
diff --git a/primitives/npos-elections/fuzzer/src/phragmen_pjr.rs b/primitives/npos-elections/fuzzer/src/phragmen_pjr.rs
new file mode 100644
index 000000000000..9727d1406ad2
--- /dev/null
+++ b/primitives/npos-elections/fuzzer/src/phragmen_pjr.rs
@@ -0,0 +1,118 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Fuzzing which ensures that running unbalanced sequential phragmen always produces a result
+//! which satisfies our PJR checker.
+//!
+//! ## Running a single iteration
+//!
+//! Honggfuzz shuts down each individual loop iteration after a configurable time limit.
+//! It can be helpful to run a single iteration on your hardware to help benchmark how long that time
+//! limit should reasonably be. Simply run the program without the `fuzzing` configuration to run a
+//! single iteration: `cargo run --bin phragmen_pjr`.
+//!
+//! ## Running
+//!
+//! Run with `HFUZZ_RUN_ARGS="-t 10" cargo hfuzz run phragmen_pjr`.
+//!
+//! Note the environment variable: by default, `cargo hfuzz` shuts down each iteration after 1 second
+//! of runtime. We significantly increase that to ensure that the fuzzing gets a chance to complete.
+//! Running a single iteration can help determine an appropriate value for this parameter.
+//!
+//! ## Debugging a panic
+//!
+//! Once a panic is found, it can be debugged with
+//! `HFUZZ_RUN_ARGS="-t 10" cargo hfuzz run-debug phragmen_pjr hfuzz_workspace/phragmen_pjr/*.fuzz`.
+//!
+
+#[cfg(fuzzing)]
+use honggfuzz::fuzz;
+
+#[cfg(not(fuzzing))]
+use structopt::StructOpt;
+
+mod common;
+use common::{generate_random_npos_inputs, to_range};
+use rand::{self, SeedableRng};
+use sp_npos_elections::{pjr_check_core, seq_phragmen_core, setup_inputs, standard_threshold};
+
+type AccountId = u64;
+
+const MIN_CANDIDATES: usize = 250;
+const MAX_CANDIDATES: usize = 1000;
+const MIN_VOTERS: usize = 500;
+const MAX_VOTERS: usize = 2500;
+
+#[cfg(fuzzing)]
+fn main() {
+	loop {
+		fuzz!(|data: (usize, usize, u64)| {
+			let (candidate_count, voter_count, seed) = data;
+			iteration(candidate_count, voter_count, seed);
+		});
+	}
+}
+
+#[cfg(not(fuzzing))]
+#[derive(Debug, StructOpt)]
+struct Opt {
+	/// How many candidates participate in this election
+	#[structopt(short, long)]
+	candidates: Option<usize>,
+
+	/// How many voters participate in this election
+	#[structopt(short, long)]
+	voters: Option<usize>,
+
+	/// Random seed to use in this election
+	#[structopt(long)]
+	seed: Option<u64>,
+}
+
+#[cfg(not(fuzzing))]
+fn main() {
+	let opt = Opt::from_args();
+	// candidates and voters by default use the maxima, which turn out to be one less than
+	// the constant.
+	iteration(
+		opt.candidates.unwrap_or(MAX_CANDIDATES - 1),
+		opt.voters.unwrap_or(MAX_VOTERS - 1),
+		opt.seed.unwrap_or_default(),
+	);
+}
+
+fn iteration(mut candidate_count: usize, mut voter_count: usize, seed: u64) {
+	let rng = rand::rngs::SmallRng::seed_from_u64(seed);
+	candidate_count = to_range(candidate_count, MIN_CANDIDATES, MAX_CANDIDATES);
+	voter_count = to_range(voter_count, MIN_VOTERS, MAX_VOTERS);
+
+	let (rounds, candidates, voters) =
+		generate_random_npos_inputs(candidate_count, voter_count, rng);
+
+	let (candidates, voters) = setup_inputs(candidates, voters);
+
+	// Run seq-phragmen
+	let (candidates, voters) = seq_phragmen_core::<AccountId>(rounds, candidates, voters)
+		.expect("seq_phragmen must succeed");
+
+	let threshold = standard_threshold(rounds, voters.iter().map(|voter| voter.budget()));
+
+	assert!(
+		pjr_check_core(&candidates, &voters, threshold),
+		"unbalanced sequential phragmen must satisfy PJR",
+	);
+}
diff --git a/primitives/npos-elections/src/lib.rs b/primitives/npos-elections/src/lib.rs
index d45698e1747b..c87085ef9ff8 100644
--- a/primitives/npos-elections/src/lib.rs
+++ b/primitives/npos-elections/src/lib.rs
@@ -18,11 +18,12 @@
 //! - [`seq_phragmen`]: Implements the Phragmén Sequential Method. An un-ranked, relatively fast
 //!   election method that ensures PJR, but does not provide a constant factor approximation of the
 //!   maximin problem.
-//! - [`phragmms()`]: Implements a hybrid approach inspired by Phragmén which is executed faster but
-//!   it can achieve a constant factor approximation of the maximin problem, similar to that of the
-//!   MMS algorithm.
-//! - [`balance`]: Implements the star balancing algorithm. This iterative process can push a
-//!   solution toward being more `balances`, which in turn can increase its score.
+//! - [`phragmms`](phragmms::phragmms): Implements a hybrid approach inspired by Phragmén which is
+//!   executed faster but it can achieve a constant factor approximation of the maximin problem,
+//!   similar to that of the MMS algorithm.
+//! - [`balance`](balancing::balance): Implements the star balancing algorithm. This iterative
+//!   process can push a solution toward being more "balanced", which in turn can increase its
+//!   score.
 //!
 //! ### Terminology
 //!
@@ -98,18 +99,20 @@ mod mock;
 #[cfg(test)]
 mod tests;
 
-mod phragmen;
-mod balancing;
-mod phragmms;
-mod node;
-mod reduce;
-mod helpers;
+pub mod phragmen;
+pub mod balancing;
+pub mod phragmms;
+pub mod node;
+pub mod reduce;
+pub mod helpers;
+pub mod pjr;
 
 pub use reduce::reduce;
 pub use helpers::*;
 pub use phragmen::*;
 pub use phragmms::*;
 pub use balancing::*;
+pub use pjr::*;
 
 // re-export the compact macro, with the dependencies of the macro.
 #[doc(hidden)]
@@ -282,6 +285,12 @@ pub struct Candidate<AccountId> {
 	round: usize,
 }
 
+impl<AccountId> Candidate<AccountId> {
+	pub fn to_ptr(self) -> CandidatePtr<AccountId> {
+		Rc::new(RefCell::new(self))
+	}
+}
+
 /// A vote being casted by a [`Voter`] to a [`Candidate`] is an `Edge`.
 #[derive(Clone, Default)]
 pub struct Edge<AccountId> {
@@ -326,6 +335,18 @@ impl<A: IdentifierT> std::fmt::Debug for Voter<A> {
 }
 
 impl<AccountId: IdentifierT> Voter<AccountId> {
+	/// Create a new `Voter`.
+	pub fn new(who: AccountId) -> Self {
+		Self { who, ..Default::default() }
+	}
+
+	/// Returns `true` if `self` votes for `target`.
+	///
+	/// Note that this does not take into account if `target` is elected (i.e. is *active*) or not.
+	pub fn votes_for(&self, target: &AccountId) -> bool {
+		self.edges.iter().any(|e| &e.who == target)
+	}
+
 	/// Returns none if this voter does not have any non-zero distributions.
 	///
 	/// Note that this might create _un-normalized_ assignments, due to accuracy loss of `P`. Call
@@ -401,6 +422,12 @@ impl<AccountId: IdentifierT> Voter<AccountId> {
 			}
 		})
 	}
+
+	/// This voter's budget
+	#[inline]
+	pub fn budget(&self) -> ExtendedBalance {
+		self.budget
+	}
 }
 
 /// Final result of the election.
@@ -734,7 +761,7 @@ pub fn is_score_better<P: PerThing>(this: ElectionScore, that: ElectionScore, ep
 /// This will perform some cleanup that are most often important:
 /// - It drops any votes that are pointing to non-candidates.
 /// - It drops duplicate targets within a voter.
-pub(crate) fn setup_inputs<AccountId: IdentifierT>(
+pub fn setup_inputs<AccountId: IdentifierT>(
 	initial_candidates: Vec<AccountId>,
 	initial_voters: Vec<(AccountId, VoteWeight, Vec<AccountId>)>,
 ) -> (Vec<CandidatePtr<AccountId>>, Vec<Voter<AccountId>>) {
@@ -746,7 +773,7 @@ pub(crate) fn setup_inputs<AccountId: IdentifierT>(
 		.enumerate()
 		.map(|(idx, who)| {
 			c_idx_cache.insert(who.clone(), idx);
-			Rc::new(RefCell::new(Candidate { who, ..Default::default() }))
+			Candidate { who, ..Default::default() }.to_ptr()
 		})
 		.collect::<Vec<CandidatePtr<AccountId>>>();
 
diff --git a/primitives/npos-elections/src/phragmen.rs b/primitives/npos-elections/src/phragmen.rs
index dad65666738c..a1e632acf5fd 100644
--- a/primitives/npos-elections/src/phragmen.rs
+++ b/primitives/npos-elections/src/phragmen.rs
@@ -63,6 +63,10 @@ const DEN: ExtendedBalance = ExtendedBalance::max_value();
 /// `expect` this to return `Ok`.
 ///
 /// This can only fail if the normalization fails.
+///
+/// Note that rounding errors can potentially cause the output of this function to fail a t-PJR
+/// check where t is the standard threshold. The underlying algorithm is sound, but the conversions
+/// between numeric types can be lossy.
 pub fn seq_phragmen<AccountId: IdentifierT, P: PerThing128>(
 	rounds: usize,
 	initial_candidates: Vec<AccountId>,
diff --git a/primitives/npos-elections/src/pjr.rs b/primitives/npos-elections/src/pjr.rs
new file mode 100644
index 000000000000..61e0b2deb79f
--- /dev/null
+++ b/primitives/npos-elections/src/pjr.rs
@@ -0,0 +1,519 @@
+ // This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Implements functions and interfaces to check solutions for being t-PJR.
+//!
+//! PJR stands for proportional justified representation. PJR is an absolute measure to make
+//! sure an NPoS solution adheres to a minimum standard.
+//!
+//! See [`pjr_check`] which is the main entry point of the module.
+
+use crate::{
+	Candidate,
+	CandidatePtr,
+	Edge,
+	ExtendedBalance,
+	IdentifierT,
+	Support,
+	SupportMap,
+	Supports,
+	Voter,
+	VoteWeight,
+};
+use sp_std::{rc::Rc, vec::Vec};
+use sp_std::collections::btree_map::BTreeMap;
+use sp_arithmetic::{traits::Zero, Perbill};
+
+/// The type used as the threshold.
+///
+/// Just some reading sugar; Must always be same as [`ExtendedBalance`];
+type Threshold = ExtendedBalance;
+
+/// Compute the threshold corresponding to the standard PJR property
+///
+/// `t-PJR` checks can check PJR according to an arbitrary threshold. The threshold can be any value,
+/// but the property gets stronger as the threshold gets smaller. The strongest possible `t-PJR` property
+/// corresponds to `t == 0`.
+///
+/// However, standard PJR is less stringent than that. This function returns the threshold whose
+/// strength corresponds to the standard PJR property.
+///
+/// - `committee_size` is the number of winners of the election.
+/// - `weights` is an iterator of voter stakes. If the sum of stakes is already known,
+///   `std::iter::once(sum_of_stakes)` is appropriate here.
+pub fn standard_threshold(
+	committee_size: usize,
+	weights: impl IntoIterator<Item = ExtendedBalance>,
+) -> Threshold {
+	weights
+		.into_iter()
+		.fold(Threshold::zero(), |acc, elem| {
+			acc.saturating_add(elem)
+		})
+	/ committee_size.max(1) as Threshold
+}
+
+/// Check a solution to be PJR.
+///
+/// The PJR property is true if `t-PJR` is true when `t == sum(stake) / committee_size`.
+pub fn pjr_check<AccountId: IdentifierT>(
+	supports: &Supports<AccountId>,
+	all_candidates: Vec<AccountId>,
+	all_voters: Vec<(AccountId, VoteWeight, Vec<AccountId>)>,
+) -> bool {
+	let t = standard_threshold(supports.len(), all_voters.iter().map(|voter| voter.1 as ExtendedBalance));
+	t_pjr_check(supports, all_candidates, all_voters, t)
+}
+
+/// Check a solution to be t-PJR.
+///
+/// ### Semantics
+///
+/// The t-PJR property is defined in the paper ["Validator Election in Nominated Proof-of-Stake"][NPoS],
+/// section 5, definition 1.
+///
+/// In plain language, the t-PJR condition is: if there is a group of `N` voters
+/// who have `r` common candidates and can afford to support each of them with backing stake `t`
+/// (i.e `sum(stake(v) for v in voters) == r * t`), then this committee needs to be represented by at
+/// least `r` elected candidates.
+///
+/// Section 5 of the NPoS paper shows that this property can be tested by: for a feasible solution,
+/// if `Max {score(c)} < t` where c is every unelected candidate, then this solution is t-PJR. There
+/// may exist edge cases which satisfy the formal definition of t-PJR but do not pass this test, but
+/// those should be rare enough that we can discount them.
+///
+/// ### Interface
+///
+/// In addition to data that can be computed from the [`Supports`] struct, a PJR check also
+/// needs to inspect un-elected candidates and edges, thus `all_candidates` and `all_voters`.
+///
+/// [NPoS]: https://arxiv.org/pdf/2004.12990v1.pdf
+//
+// ### Implementation Notes
+//
+// The paper uses mathematical notation, which priorities single-symbol names. For programmer ease,
+// we map these to more descriptive names as follows:
+//
+// C      => all_candidates
+// N      => all_voters
+// (A, w) => (candidates, voters)
+//
+// Note that while the names don't explicitly say so, `candidates` are the winning candidates, and
+// `voters` is the set of weighted edges from nominators to winning validators.
+pub fn t_pjr_check<AccountId: IdentifierT>(
+	supports: &Supports<AccountId>,
+	all_candidates: Vec<AccountId>,
+	all_voters: Vec<(AccountId, VoteWeight, Vec<AccountId>)>,
+	t: Threshold,
+) -> bool {
+	// First order of business: derive `(candidates, voters)` from `supports`.
+	let (candidates, voters) = prepare_pjr_input(
+		supports,
+		all_candidates,
+		all_voters,
+	);
+	// compute with threshold t.
+	pjr_check_core(candidates.as_ref(), voters.as_ref(), t)
+}
+
+/// The internal implementation of the PJR check after having the data converted.
+///
+/// [`pjr_check`] or [`t_pjr_check`] are typically easier to work with.
+pub fn pjr_check_core<AccountId: IdentifierT>(
+	candidates: &[CandidatePtr<AccountId>],
+	voters: &[Voter<AccountId>],
+	t: Threshold,
+) -> bool {
+	let unelected = candidates.iter().filter(|c| !c.borrow().elected);
+	let maybe_max_pre_score = unelected.map(|c| (pre_score(Rc::clone(c), voters, t), c.borrow().who.clone())).max();
+	// if unelected is empty then the solution is indeed PJR.
+	maybe_max_pre_score.map_or(true, |(max_pre_score, _)| max_pre_score < t)
+}
+
+
+
+/// Convert the data types that the user runtime has into ones that can be used by this module.
+///
+/// It is expected that this function's interface might change over time, or multiple variants of it
+/// can be provided for different use cases.
+///
+/// The ultimate goal, in any case, is to convert the election data into [`Candidate`] and [`Voter`]
+/// types defined by this crate, whilst setting correct value for some of their fields, namely:
+/// 1. Candidate [`backing_stake`](Candidate::backing_stake) and [`elected`](Candidate::elected) if they are a winner.
+/// 2. Voter edge [`weight`](Edge::weight) if they are backing a winner.
+/// 3. Voter [`budget`](Voter::budget).
+///
+/// None of the `load` or `score` values are used and can be ignored. This is similar to
+/// [`setup_inputs`] function of this crate.
+///
+/// ### Performance (Weight) Notes
+///
+/// Note that the current function is rather unfortunately inefficient. The most significant
+/// slowdown is the fact that a typical solution that need to be checked for PJR only contains a
+/// subset of the entire NPoS edge graph, encoded as `supports`. This only encodes the
+/// edges that actually contribute to a winner's backing stake and ignores the rest to save space.
+/// To check PJR, we need the entire voter set, including those edges that point to non-winners.
+/// This could cause the caller runtime to have to read the entire list of voters, which is assumed
+/// to be expensive.
+///
+/// A sensible user of this module should make sure that the PJR check is executed and checked as
+/// little as possible, and take sufficient economical measures to ensure that this function cannot
+/// be abused.
+fn prepare_pjr_input<AccountId: IdentifierT>(
+	supports: &Supports<AccountId>,
+	all_candidates: Vec<AccountId>,
+	all_voters: Vec<(AccountId, VoteWeight, Vec<AccountId>)>,
+) -> (Vec<CandidatePtr<AccountId>>, Vec<Voter<AccountId>>) {
+	let mut candidates_index: BTreeMap<AccountId, usize> = BTreeMap::new();
+
+	// dump the staked assignments in a voter-major map for faster access down the road.
+	let mut assignment_map: BTreeMap<AccountId, Vec<(AccountId, ExtendedBalance)>> = BTreeMap::new();
+	for (winner_id, Support { voters, .. }) in supports.iter() {
+		for (voter_id, support) in voters.iter() {
+			assignment_map.entry(voter_id.clone()).or_default().push((winner_id.clone(), *support));
+		}
+	}
+
+	// Convert Suppports into a SupportMap
+	//
+	// As a flat list, we're limited to linear search. That gives the production of `candidates`,
+	// below, a complexity of `O(s*c)`, where `s == supports.len()` and `c == all_candidates.len()`.
+	// For large lists, that's pretty bad.
+	//
+	// A `SupportMap`, as a `BTreeMap`, has access timing of `O(lg n)`. This means that constructing
+	// the map and then indexing from it gives us timing of `O((s + c) * lg(s))`. If in the future
+	// we get access to a deterministic `HashMap`, we can further improve that to `O(s+c)`.
+	//
+	// However, it does mean allocating sufficient space to store all the data again.
+	let supports: SupportMap<AccountId> = supports.iter().cloned().collect();
+
+	// collect all candidates and winners into a unified `Vec<CandidatePtr>`.
+	let candidates = all_candidates.into_iter().enumerate().map(|(i, c)| {
+		candidates_index.insert(c.clone(), i);
+
+		// set the backing value and elected flag if the candidate is among the winners.
+		let who = c;
+		let maybe_support = supports.get(&who);
+		let elected = maybe_support.is_some();
+		let backed_stake = maybe_support.map(|support| support.total).unwrap_or_default();
+
+		Candidate { who, elected, backed_stake, ..Default::default() }.to_ptr()
+	}).collect::<Vec<_>>();
+
+	// collect all voters into a unified Vec<Voters>.
+	let voters = all_voters.into_iter().map(|(v, w, ts)| {
+		let mut edges: Vec<Edge<AccountId>> = Vec::with_capacity(ts.len());
+		for t in ts {
+			if edges.iter().any(|e| e.who == t) {
+				// duplicate edge.
+				continue;
+			}
+
+			if let Some(idx) = candidates_index.get(&t) {
+				// if this edge is among the assignments, set the weight as well.
+				let weight = assignment_map
+					.get(&v)
+					.and_then(|d| d.iter().find_map(|(x, y)| if x == &t { Some(y) } else { None }))
+					.cloned()
+					.unwrap_or_default();
+				edges.push(Edge {
+					who: t,
+					candidate: Rc::clone(&candidates[*idx]),
+					weight,
+					..Default::default()
+				});
+			}
+		}
+
+		let who = v;
+		let budget: ExtendedBalance = w.into();
+		Voter { who, budget, edges, ..Default::default() }
+	}).collect::<Vec<_>>();
+
+	(candidates, voters)
+}
+
+/// The pre-score of an unelected candidate.
+///
+/// This is the amount of stake that *all voter* can spare to devote to this candidate without
+/// allowing the backing stake of any other elected candidate to fall below `t`.
+///
+/// In essence, it is the sum(slack(n, t)) for all `n` who vote for `unelected`.
+fn pre_score<AccountId: IdentifierT>(
+	unelected: CandidatePtr<AccountId>,
+	voters: &[Voter<AccountId>],
+	t: Threshold,
+) -> ExtendedBalance {
+	debug_assert!(!unelected.borrow().elected);
+	voters
+		.iter()
+		.filter(|ref v| v.votes_for(&unelected.borrow().who))
+		.fold(Zero::zero(), |acc: ExtendedBalance, voter| acc.saturating_add(slack(voter, t)))
+}
+
+
+/// The slack of a voter at a given state.
+///
+/// The slack of each voter, with threshold `t` is the total amount of stake that this voter can
+/// spare to a new potential member, whilst not dropping the backing stake of any of its currently
+/// active members below `t`. In essence, for each of the current active candidates `c`, we assume
+/// that we reduce the edge weight of `voter` to `c` from `w` to `w * min(1 / (t / support(c)))`.
+///
+/// More accurately:
+///
+/// 1. If `c` exactly has `t` backing or less, then we don't generate any slack.
+/// 2. If `c` has more than `t`, then we reduce it to `t`.
+fn slack<AccountId: IdentifierT>(voter: &Voter<AccountId>, t: Threshold) -> ExtendedBalance {
+	let budget = voter.budget;
+	let leftover = voter.edges.iter().fold(Zero::zero(), |acc: ExtendedBalance, edge| {
+		let candidate = edge.candidate.borrow();
+		if candidate.elected {
+			let extra =
+				Perbill::one().min(Perbill::from_rational_approximation(t, candidate.backed_stake))
+				* edge.weight;
+			acc.saturating_add(extra)
+		} else {
+			// No slack generated here.
+			acc
+		}
+	});
+
+	// NOTE: candidate for saturating_log_sub(). Defensive-only.
+	budget.saturating_sub(leftover)
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+
+	fn setup_voter(who: u32, votes: Vec<(u32, u128, bool)>) -> Voter<u32> {
+		let mut voter = Voter::new(who);
+		let mut budget = 0u128;
+		let candidates = votes.into_iter().map(|(t, w, e)| {
+			budget += w;
+			Candidate { who: t, elected: e, backed_stake: w, ..Default::default() }
+		}).collect::<Vec<_>>();
+		let edges = candidates.into_iter().map(|c|
+			Edge { who: c.who, weight: c.backed_stake, candidate: c.to_ptr(), ..Default::default() }
+		).collect::<Vec<_>>();
+		voter.edges = edges;
+		voter.budget = budget;
+		voter
+	}
+
+	#[test]
+	fn slack_works() {
+		let voter = setup_voter(10, vec![(1, 10, true), (2, 20, true)]);
+
+		assert_eq!(slack(&voter, 15), 5);
+		assert_eq!(slack(&voter, 17), 3);
+		assert_eq!(slack(&voter, 10), 10);
+		assert_eq!(slack(&voter, 5), 20);
+
+	}
+
+	#[test]
+	fn pre_score_works() {
+		// will give 5 slack
+		let v1 = setup_voter(10, vec![(1, 10, true), (2, 20, true), (3, 0, false)]);
+		// will give no slack
+		let v2 = setup_voter(20, vec![(1, 5, true), (2, 5, true)]);
+		// will give 10 slack.
+		let v3 = setup_voter(30, vec![(1, 20, true), (2, 20, true), (3, 0, false)]);
+
+		let unelected = Candidate { who: 3u32, elected: false, ..Default::default() }.to_ptr();
+		let score = pre_score(unelected, &vec![v1, v2, v3], 15);
+
+		assert_eq!(score, 15);
+	}
+
+	#[test]
+	fn can_convert_data_from_external_api() {
+		let all_candidates = vec![10, 20, 30, 40];
+		let all_voters = vec![
+			(1, 10, vec![10, 20, 30, 40]),
+			(2, 20, vec![10, 20, 30, 40]),
+			(3, 30, vec![10, 30]),
+		];
+		// tuples in voters vector are (AccountId, Balance)
+		let supports: Supports<u32> = vec![
+			(20, Support { total: 15, voters: vec![(1, 5), (2, 10)]}),
+			(40, Support { total: 15, voters: vec![(1, 5), (2, 10)]}),
+		];
+
+		let (candidates, voters) = prepare_pjr_input(
+			&supports,
+			all_candidates,
+			all_voters,
+		);
+
+		// elected flag and backing must be set correctly
+		assert_eq!(
+			candidates
+				.iter()
+				.map(|c| (c.borrow().who.clone(), c.borrow().elected, c.borrow().backed_stake))
+				.collect::<Vec<_>>(),
+			vec![(10, false, 0), (20, true, 15), (30, false, 0), (40, true, 15)],
+		);
+
+		// edge weight must be set correctly
+		assert_eq!(
+			voters
+				.iter()
+				.map(|v| (
+					v.who,
+					v.budget,
+					v.edges.iter().map(|e| (e.who, e.weight)).collect::<Vec<_>>(),
+				)).collect::<Vec<_>>(),
+			vec![
+				(1, 10, vec![(10, 0), (20, 5), (30, 0), (40, 5)]),
+				(2, 20, vec![(10, 0), (20, 10), (30, 0), (40, 10)]),
+				(3, 30, vec![(10, 0), (30, 0)]),
+			],
+		);
+
+		// fyi. this is not PJR, obviously because the votes of 3 can bump the stake a lot but they
+		// are being ignored.
+		assert!(!pjr_check_core(&candidates, &voters, 1));
+		assert!(!pjr_check_core(&candidates, &voters, 10));
+		assert!(!pjr_check_core(&candidates, &voters, 20));
+	}
+
+	// These next tests ensure that the threshold phase change property holds for us, but that's not their real purpose.
+	// They were written to help develop an intuition about what the threshold value actually means
+	// in layman's terms.
+	//
+	// The results tend to support the intuition that the threshold is the voting power at and below
+	// which a voter's preferences can simply be ignored.
+	#[test]
+	fn find_upper_bound_for_threshold_scenario_1() {
+		let all_candidates = vec![10, 20, 30, 40];
+		let all_voters = vec![
+			(1, 10, vec![10, 20, 30, 40]),
+			(2, 20, vec![10, 20, 30, 40]),
+			(3, 30, vec![10, 30]),
+		];
+		// tuples in voters vector are (AccountId, Balance)
+		let supports: Supports<u32> = vec![
+			(20, Support { total: 15, voters: vec![(1, 5), (2, 10)]}),
+			(40, Support { total: 15, voters: vec![(1, 5), (2, 10)]}),
+		];
+
+		let (candidates, voters) = prepare_pjr_input(
+			&supports,
+			all_candidates,
+			all_voters,
+		);
+
+		find_threshold_phase_change_for_scenario(candidates, voters);
+	}
+
+	#[test]
+	fn find_upper_bound_for_threshold_scenario_2() {
+		let all_candidates = vec![10, 20, 30, 40];
+		let all_voters = vec![
+			(1, 10, vec![10, 20, 30, 40]),
+			(2, 20, vec![10, 20, 30, 40]),
+			(3, 25, vec![10, 30]),
+		];
+		// tuples in voters vector are (AccountId, Balance)
+		let supports: Supports<u32> = vec![
+			(20, Support { total: 15, voters: vec![(1, 5), (2, 10)]}),
+			(40, Support { total: 15, voters: vec![(1, 5), (2, 10)]}),
+		];
+
+		let (candidates, voters) = prepare_pjr_input(
+			&supports,
+			all_candidates,
+			all_voters,
+		);
+
+		find_threshold_phase_change_for_scenario(candidates, voters);
+	}
+
+	#[test]
+	fn find_upper_bound_for_threshold_scenario_3() {
+		let all_candidates = vec![10, 20, 30, 40];
+		let all_voters = vec![
+			(1, 10, vec![10, 20, 30, 40]),
+			(2, 20, vec![10, 20, 30, 40]),
+			(3, 35, vec![10, 30]),
+		];
+		// tuples in voters vector are (AccountId, Balance)
+		let supports: Supports<u32> = vec![
+			(20, Support { total: 15, voters: vec![(1, 5), (2, 10)]}),
+			(40, Support { total: 15, voters: vec![(1, 5), (2, 10)]}),
+		];
+
+		let (candidates, voters) = prepare_pjr_input(
+			&supports,
+			all_candidates,
+			all_voters,
+		);
+
+		find_threshold_phase_change_for_scenario(candidates, voters);
+	}
+
+	fn find_threshold_phase_change_for_scenario<AccountId: IdentifierT>(
+		candidates: Vec<CandidatePtr<AccountId>>,
+		voters: Vec<Voter<AccountId>>
+	) -> Threshold {
+		let mut threshold = 1;
+		let mut prev_threshold = 0;
+
+		// find the binary range containing the threshold beyond which the PJR check succeeds
+		while !pjr_check_core(&candidates, &voters, threshold) {
+			prev_threshold = threshold;
+			threshold = threshold.checked_mul(2).expect("pjr check must fail before we run out of capacity in u128");
+		}
+
+		// now binary search within that range to find the phase threshold
+		let mut high_bound = threshold;
+		let mut low_bound = prev_threshold;
+
+		while high_bound - low_bound > 1 {
+			// maintain the invariant that low_bound fails and high_bound passes
+			let test = low_bound + ((high_bound - low_bound) / 2);
+			if pjr_check_core(&candidates, &voters, test) {
+				high_bound = test;
+			} else {
+				low_bound = test;
+			}
+		}
+
+		println!("highest failing check:   {}", low_bound);
+		println!("lowest succeeding check: {}", high_bound);
+
+		// for a value to be a threshold, it must be the boundary between two conditions
+		let mut unexpected_failures = Vec::new();
+		let mut unexpected_successes = Vec::new();
+		for t in 0..=low_bound {
+			if pjr_check_core(&candidates, &voters, t) {
+				unexpected_successes.push(t);
+			}
+		}
+		for t in high_bound..(high_bound*2) {
+			if !pjr_check_core(&candidates, &voters, t) {
+				unexpected_failures.push(t);
+			}
+		}
+		dbg!(&unexpected_successes, &unexpected_failures);
+		assert!(unexpected_failures.is_empty() && unexpected_successes.is_empty());
+
+		high_bound
+	}
+}

From 6f12d79185e8770613c00b4e0f91b036e46badc8 Mon Sep 17 00:00:00 2001
From: Andreas Doerr <adoerr@users.noreply.github.com>
Date: Thu, 11 Mar 2021 11:01:26 +0100
Subject: [PATCH 0485/1194] Fix doc build (#8322)

---
 frame/support/test/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frame/support/test/src/lib.rs b/frame/support/test/src/lib.rs
index fe1d1eb9d3d6..ae3efdf57aa2 100644
--- a/frame/support/test/src/lib.rs
+++ b/frame/support/test/src/lib.rs
@@ -54,7 +54,7 @@ impl frame_support::traits::PalletInfo for PanicPalletInfo {
 	}
 }
 
-/// Provides an implementation of [`Randomness`] that should only be used in tests!
+/// Provides an implementation of [`frame_support::traits::Randomness`] that should only be used in tests!
 pub struct TestRandomness<T>(sp_std::marker::PhantomData<T>);
 
 impl<Output: codec::Decode + Default, T> frame_support::traits::Randomness<Output, T::BlockNumber>

From 6ac86d545f6da8e4afc373dc0876c3e7ba79e51b Mon Sep 17 00:00:00 2001
From: Cecile Tonglet <cecile@parity.io>
Date: Thu, 11 Mar 2021 11:05:45 +0100
Subject: [PATCH 0486/1194] Rework telemetry to replace the use of tracing with
 an object we pass around (#8143)

polkadot companion: paritytech/polkadot#2535
---
 Cargo.lock                                    |  11 +-
 bin/node-template/node/src/service.rs         |  72 +++-
 bin/node/bench/src/construct.rs               |   1 +
 bin/node/cli/Cargo.toml                       |   2 +
 bin/node/cli/src/browser.rs                   |  14 +-
 bin/node/cli/src/chain_spec.rs                |   2 +-
 bin/node/cli/src/service.rs                   | 110 ++++--
 bin/node/inspect/src/command.rs               |   2 +-
 bin/node/testing/src/bench.rs                 |   1 +
 .../basic-authorship/src/basic_authorship.rs  |  30 +-
 client/basic-authorship/src/lib.rs            |   1 +
 client/cli/src/arg_enums.rs                   |   2 -
 client/cli/src/config.rs                      |  20 +-
 client/cli/src/lib.rs                         |   8 +-
 client/cli/src/runner.rs                      |  15 -
 client/consensus/aura/src/import_queue.rs     |  30 +-
 client/consensus/aura/src/lib.rs              |  16 +-
 client/consensus/babe/src/lib.rs              |  31 +-
 client/consensus/babe/src/tests.rs            |   2 +
 client/consensus/manual-seal/src/lib.rs       |   3 +
 client/consensus/slots/src/lib.rs             |  55 ++-
 client/finality-grandpa/src/authorities.rs    |  73 ++--
 client/finality-grandpa/src/aux_schema.rs     |   2 +-
 .../src/communication/gossip.rs               |  53 ++-
 .../finality-grandpa/src/communication/mod.rs | 187 ++++++----
 .../src/communication/tests.rs                |   2 +
 client/finality-grandpa/src/environment.rs    |  26 +-
 client/finality-grandpa/src/finality_proof.rs |   3 -
 client/finality-grandpa/src/import.rs         |  21 +-
 client/finality-grandpa/src/lib.rs            |  82 ++--
 client/finality-grandpa/src/observer.rs       |  15 +-
 client/finality-grandpa/src/tests.rs          |  25 +-
 client/service/Cargo.toml                     |   2 -
 client/service/src/builder.rs                 |  94 ++---
 client/service/src/client/call_executor.rs    |   1 +
 client/service/src/client/client.rs           |  34 +-
 client/service/src/client/light.rs            |   4 +-
 client/service/src/config.rs                  |   5 -
 client/service/src/error.rs                   |   3 +
 client/service/src/metrics.rs                 |  11 +-
 client/service/src/task_manager/tests.rs      | 100 +----
 client/service/test/src/client/mod.rs         |   1 +
 client/service/test/src/lib.rs                |   1 -
 client/telemetry/Cargo.toml                   |   4 +-
 client/telemetry/src/error.rs                 |  31 ++
 client/telemetry/src/layer.rs                 | 149 --------
 client/telemetry/src/lib.rs                   | 352 +++++++++++-------
 client/telemetry/src/node.rs                  |  36 +-
 client/tracing/Cargo.toml                     |   1 -
 client/tracing/src/lib.rs                     |  36 +-
 client/tracing/src/logging/event_format.rs    |   4 -
 client/tracing/src/logging/mod.rs             |  66 +---
 test-utils/client/src/lib.rs                  |   1 +
 utils/browser/Cargo.toml                      |   1 -
 utils/browser/src/lib.rs                      |  12 +-
 55 files changed, 1028 insertions(+), 838 deletions(-)
 create mode 100644 client/telemetry/src/error.rs
 delete mode 100644 client/telemetry/src/layer.rs

diff --git a/Cargo.lock b/Cargo.lock
index 911d1541f6f8..ffdb78686c52 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,5 +1,7 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "Inflector"
 version = "0.11.4"
@@ -3971,6 +3973,7 @@ dependencies = [
  "frame-system",
  "futures 0.3.12",
  "hex-literal",
+ "libp2p-wasm-ext",
  "log",
  "nix",
  "node-executor",
@@ -7780,8 +7783,6 @@ dependencies = [
  "tokio 0.2.25",
  "tracing",
  "tracing-futures",
- "tracing-log",
- "tracing-subscriber",
  "wasm-timer",
 ]
 
@@ -7867,10 +7868,8 @@ dependencies = [
  "rand 0.7.3",
  "serde",
  "serde_json",
- "sp-utils",
  "take_mut",
- "tracing",
- "tracing-subscriber",
+ "thiserror",
  "void",
  "wasm-timer",
 ]
@@ -7888,7 +7887,6 @@ dependencies = [
  "parking_lot 0.11.1",
  "regex",
  "rustc-hash",
- "sc-telemetry",
  "sc-tracing-proc-macro",
  "serde",
  "serde_json",
@@ -9267,7 +9265,6 @@ dependencies = [
  "sc-informant",
  "sc-network",
  "sc-service",
- "sc-telemetry",
  "sc-tracing",
  "sp-database",
  "wasm-bindgen",
diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
index 4ea54dc8174a..197a495b438b 100644
--- a/bin/node-template/node/src/service.rs
+++ b/bin/node-template/node/src/service.rs
@@ -12,7 +12,7 @@ use sp_consensus_aura::sr25519::AuthorityPair as AuraPair;
 use sc_consensus_aura::{ImportQueueParams, StartAuraParams, SlotProportion};
 use sc_finality_grandpa::SharedVoterState;
 use sc_keystore::LocalKeystore;
-use sc_telemetry::TelemetrySpan;
+use sc_telemetry::{Telemetry, TelemetryWorker};
 
 // Our native executor instance.
 native_executor_instance!(
@@ -38,6 +38,7 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 			AuraPair
 		>,
 		sc_finality_grandpa::LinkHalf<Block, FullClient, FullSelectChain>,
+		Option<Telemetry>,
 	)
 >, ServiceError> {
 	if config.keystore_remote.is_some() {
@@ -46,10 +47,28 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 	}
 	let inherent_data_providers = InherentDataProviders::new();
 
+	let telemetry = config.telemetry_endpoints.clone()
+		.filter(|x| !x.is_empty())
+		.map(|endpoints| -> Result<_, sc_telemetry::Error> {
+			let worker = TelemetryWorker::new(16)?;
+			let telemetry = worker.handle().new_telemetry(endpoints);
+			Ok((worker, telemetry))
+		})
+		.transpose()?;
+
 	let (client, backend, keystore_container, task_manager) =
-		sc_service::new_full_parts::<Block, RuntimeApi, Executor>(&config)?;
+		sc_service::new_full_parts::<Block, RuntimeApi, Executor>(
+			&config,
+			telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()),
+		)?;
 	let client = Arc::new(client);
 
+	let telemetry = telemetry
+		.map(|(worker, telemetry)| {
+			task_manager.spawn_handle().spawn("telemetry", worker.run());
+			telemetry
+		});
+
 	let select_chain = sc_consensus::LongestChain::new(backend.clone());
 
 	let transaction_pool = sc_transaction_pool::BasicPool::new_full(
@@ -61,7 +80,10 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 	);
 
 	let (grandpa_block_import, grandpa_link) = sc_finality_grandpa::block_import(
-		client.clone(), &(client.clone() as Arc<_>), select_chain.clone(),
+		client.clone(),
+		&(client.clone() as Arc<_>),
+		select_chain.clone(),
+		telemetry.as_ref().map(|x| x.handle()),
 	)?;
 
 	let aura_block_import = sc_consensus_aura::AuraBlockImport::<_, _, _, AuraPair>::new(
@@ -79,6 +101,7 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 			slot_duration: sc_consensus_aura::slot_duration(&*client)?,
 			registry: config.prometheus_registry(),
 			check_for_equivocation: Default::default(),
+			telemetry: telemetry.as_ref().map(|x| x.handle()),
 		},
 	)?;
 
@@ -91,7 +114,7 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 		select_chain,
 		transaction_pool,
 		inherent_data_providers,
-		other: (aura_block_import, grandpa_link),
+		other: (aura_block_import, grandpa_link, telemetry),
 	})
 }
 
@@ -113,7 +136,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		select_chain,
 		transaction_pool,
 		inherent_data_providers,
-		other: (block_import, grandpa_link),
+		other: (block_import, grandpa_link, mut telemetry),
 	} = new_partial(&config)?;
 
 	if let Some(url) = &config.keystore_remote {
@@ -167,10 +190,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		})
 	};
 
-	let telemetry_span = TelemetrySpan::new();
-	let _telemetry_span_entered = telemetry_span.enter();
-
-	let (_rpc_handlers, telemetry_connection_notifier) = sc_service::spawn_tasks(
+	let _rpc_handlers = sc_service::spawn_tasks(
 		sc_service::SpawnTasksParams {
 			network: network.clone(),
 			client: client.clone(),
@@ -184,7 +204,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 			network_status_sinks,
 			system_rpc_tx,
 			config,
-			telemetry_span: Some(telemetry_span.clone()),
+			telemetry: telemetry.as_mut(),
 		},
 	)?;
 
@@ -194,6 +214,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 			client.clone(),
 			transaction_pool,
 			prometheus_registry.as_ref(),
+			telemetry.as_ref().map(|x| x.handle()),
 		);
 
 		let can_author_with =
@@ -213,6 +234,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 				can_author_with,
 				sync_oracle: network.clone(),
 				block_proposal_slot_portion: SlotProportion::new(2f32 / 3f32),
+				telemetry: telemetry.as_ref().map(|x| x.handle()),
 			},
 		)?;
 
@@ -237,6 +259,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		observer_enabled: false,
 		keystore,
 		is_authority: role.is_authority(),
+		telemetry: telemetry.as_ref().map(|x| x.handle()),
 	};
 
 	if enable_grandpa {
@@ -250,10 +273,10 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 			config: grandpa_config,
 			link: grandpa_link,
 			network,
-			telemetry_on_connect: telemetry_connection_notifier.map(|x| x.on_connect_stream()),
 			voting_rule: sc_finality_grandpa::VotingRulesBuilder::default().build(),
 			prometheus_registry,
 			shared_voter_state: SharedVoterState::empty(),
+			telemetry: telemetry.as_ref().map(|x| x.handle()),
 		};
 
 		// the GRANDPA voter task is considered infallible, i.e.
@@ -270,8 +293,26 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 
 /// Builds a new service for a light client.
 pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError> {
+	let telemetry = config.telemetry_endpoints.clone()
+		.filter(|x| !x.is_empty())
+		.map(|endpoints| -> Result<_, sc_telemetry::Error> {
+			let worker = TelemetryWorker::new(16)?;
+			let telemetry = worker.handle().new_telemetry(endpoints);
+			Ok((worker, telemetry))
+		})
+		.transpose()?;
+
 	let (client, backend, keystore_container, mut task_manager, on_demand) =
-		sc_service::new_light_parts::<Block, RuntimeApi, Executor>(&config)?;
+		sc_service::new_light_parts::<Block, RuntimeApi, Executor>(
+			&config,
+			telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()),
+		)?;
+
+	let mut telemetry = telemetry
+		.map(|(worker, telemetry)| {
+			task_manager.spawn_handle().spawn("telemetry", worker.run());
+			telemetry
+		});
 
 	config.network.extra_sets.push(sc_finality_grandpa::grandpa_peers_set_config());
 
@@ -289,6 +330,7 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		client.clone(),
 		&(client.clone() as Arc<_>),
 		select_chain.clone(),
+		telemetry.as_ref().map(|x| x.handle()),
 	)?;
 
 	let aura_block_import = sc_consensus_aura::AuraBlockImport::<_, _, _, AuraPair>::new(
@@ -307,6 +349,7 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
 			slot_duration: sc_consensus_aura::slot_duration(&*client)?,
 			registry: config.prometheus_registry(),
 			check_for_equivocation: Default::default(),
+			telemetry: telemetry.as_ref().map(|x| x.handle()),
 		},
 	)?;
 
@@ -327,9 +370,6 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		);
 	}
 
-	let telemetry_span = TelemetrySpan::new();
-	let _telemetry_span_entered = telemetry_span.enter();
-
 	sc_service::spawn_tasks(sc_service::SpawnTasksParams {
 		remote_blockchain: Some(backend.remote_blockchain()),
 		transaction_pool,
@@ -343,7 +383,7 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		network,
 		network_status_sinks,
 		system_rpc_tx,
-		telemetry_span: Some(telemetry_span.clone()),
+		telemetry: telemetry.as_mut(),
 	})?;
 
 	network_starter.start_network();
diff --git a/bin/node/bench/src/construct.rs b/bin/node/bench/src/construct.rs
index b64ffec641c2..8469ec62893b 100644
--- a/bin/node/bench/src/construct.rs
+++ b/bin/node/bench/src/construct.rs
@@ -151,6 +151,7 @@ impl core::Benchmark for ConstructionBenchmark {
 			context.client.clone(),
 			self.transactions.clone().into(),
 			None,
+			None,
 		);
 		let inherent_data_providers = sp_inherents::InherentDataProviders::new();
 		inherent_data_providers
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index ba226629ae7f..ebba2095e6be 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -105,6 +105,7 @@ try-runtime-cli = { version = "0.9.0", optional = true, path = "../../../utils/f
 wasm-bindgen = { version = "0.2.57", optional = true }
 wasm-bindgen-futures = { version = "0.4.18", optional = true }
 browser-utils = { package = "substrate-browser-utils", path = "../../../utils/browser", optional = true, version = "0.9.0"}
+libp2p-wasm-ext = { version = "0.27", features = ["websocket"], optional = true }
 
 [target.'cfg(target_arch="x86_64")'.dependencies]
 node-executor = { version = "2.0.0", path = "../executor", features = [ "wasmtime" ] }
@@ -148,6 +149,7 @@ browser = [
 	"browser-utils",
 	"wasm-bindgen",
 	"wasm-bindgen-futures",
+	"libp2p-wasm-ext",
 ]
 cli = [
 	"node-executor/wasmi-errno",
diff --git a/bin/node/cli/src/browser.rs b/bin/node/cli/src/browser.rs
index 6c0a2f10d95e..49ac309d42ab 100644
--- a/bin/node/cli/src/browser.rs
+++ b/bin/node/cli/src/browser.rs
@@ -21,7 +21,7 @@ use log::info;
 use wasm_bindgen::prelude::*;
 use browser_utils::{
 	Client,
-	browser_configuration, init_logging_and_telemetry, set_console_error_panic_hook,
+	browser_configuration, init_logging, set_console_error_panic_hook,
 };
 
 /// Starts the client.
@@ -37,18 +37,14 @@ async fn start_inner(
 	log_directives: String,
 ) -> Result<Client, Box<dyn std::error::Error>> {
 	set_console_error_panic_hook();
-	let telemetry_worker = init_logging_and_telemetry(&log_directives)?;
+	init_logging(&log_directives)?;
 	let chain_spec = match chain_spec {
 		Some(chain_spec) => ChainSpec::from_json_bytes(chain_spec.as_bytes().to_vec())
 			.map_err(|e| format!("{:?}", e))?,
 		None => crate::chain_spec::development_config(),
 	};
 
-	let telemetry_handle = telemetry_worker.handle();
-	let config = browser_configuration(
-		chain_spec,
-		Some(telemetry_handle),
-	).await?;
+	let config = browser_configuration(chain_spec).await?;
 
 	info!("Substrate browser node");
 	info!("✌️  version {}", config.impl_version);
@@ -60,10 +56,8 @@ async fn start_inner(
 	// Create the service. This is the most heavy initialization step.
 	let (task_manager, rpc_handlers) =
 		crate::service::new_light_base(config)
-			.map(|(components, rpc_handlers, _, _, _, _)| (components, rpc_handlers))
+			.map(|(components, rpc_handlers, _, _, _)| (components, rpc_handlers))
 			.map_err(|e| format!("{:?}", e))?;
 
-	task_manager.spawn_handle().spawn("telemetry", telemetry_worker.run());
-
 	Ok(browser_utils::start_client(task_manager, rpc_handlers))
 }
diff --git a/bin/node/cli/src/chain_spec.rs b/bin/node/cli/src/chain_spec.rs
index 43383bb3c3a9..ae1418981f16 100644
--- a/bin/node/cli/src/chain_spec.rs
+++ b/bin/node/cli/src/chain_spec.rs
@@ -443,7 +443,7 @@ pub(crate) mod tests {
 				Ok(sc_service_test::TestNetComponents::new(task_manager, client, network, transaction_pool))
 			},
 			|config| {
-				let (keep_alive, _, _, client, network, transaction_pool) = new_light_base(config)?;
+				let (keep_alive, _, client, network, transaction_pool) = new_light_base(config)?;
 				Ok(sc_service_test::TestNetComponents::new(keep_alive, client, network, transaction_pool))
 			}
 		);
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index 92f30a72577d..1351782315be 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -33,7 +33,7 @@ use sp_runtime::traits::Block as BlockT;
 use futures::prelude::*;
 use sc_client_api::{ExecutorProvider, RemoteBackend};
 use node_executor::Executor;
-use sc_telemetry::{TelemetryConnectionNotifier, TelemetrySpan};
+use sc_telemetry::{Telemetry, TelemetryWorker};
 use sc_consensus_babe::SlotProportion;
 
 type FullClient = sc_service::TFullClient<Block, RuntimeApi, Executor>;
@@ -43,7 +43,9 @@ type FullGrandpaBlockImport =
 	grandpa::GrandpaBlockImport<FullBackend, Block, FullClient, FullSelectChain>;
 type LightClient = sc_service::TLightClient<Block, RuntimeApi, Executor>;
 
-pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponents<
+pub fn new_partial(
+	config: &Configuration,
+) -> Result<sc_service::PartialComponents<
 	FullClient, FullBackend, FullSelectChain,
 	sp_consensus::DefaultImportQueue<Block, FullClient>,
 	sc_transaction_pool::FullPool<Block, FullClient>,
@@ -58,12 +60,31 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 			sc_consensus_babe::BabeLink<Block>,
 		),
 		grandpa::SharedVoterState,
+		Option<Telemetry>,
 	)
 >, ServiceError> {
+	let telemetry = config.telemetry_endpoints.clone()
+		.filter(|x| !x.is_empty())
+		.map(|endpoints| -> Result<_, sc_telemetry::Error> {
+			let worker = TelemetryWorker::new(16)?;
+			let telemetry = worker.handle().new_telemetry(endpoints);
+			Ok((worker, telemetry))
+		})
+		.transpose()?;
+
 	let (client, backend, keystore_container, task_manager) =
-		sc_service::new_full_parts::<Block, RuntimeApi, Executor>(&config)?;
+		sc_service::new_full_parts::<Block, RuntimeApi, Executor>(
+			&config,
+			telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()),
+		)?;
 	let client = Arc::new(client);
 
+	let telemetry = telemetry
+		.map(|(worker, telemetry)| {
+			task_manager.spawn_handle().spawn("telemetry", worker.run());
+			telemetry
+		});
+
 	let select_chain = sc_consensus::LongestChain::new(backend.clone());
 
 	let transaction_pool = sc_transaction_pool::BasicPool::new_full(
@@ -75,7 +96,10 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 	);
 
 	let (grandpa_block_import, grandpa_link) = grandpa::block_import(
-		client.clone(), &(client.clone() as Arc<_>), select_chain.clone(),
+		client.clone(),
+		&(client.clone() as Arc<_>),
+		select_chain.clone(),
+		telemetry.as_ref().map(|x| x.handle()),
 	)?;
 	let justification_import = grandpa_block_import.clone();
 
@@ -97,6 +121,7 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 		&task_manager.spawn_essential_handle(),
 		config.prometheus_registry(),
 		sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()),
+		telemetry.as_ref().map(|x| x.handle()),
 	)?;
 
 	let import_setup = (block_import, grandpa_link, babe_link);
@@ -159,7 +184,7 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 		import_queue,
 		transaction_pool,
 		inherent_data_providers,
-		other: (rpc_extensions_builder, import_setup, rpc_setup),
+		other: (rpc_extensions_builder, import_setup, rpc_setup, telemetry),
 	})
 }
 
@@ -189,7 +214,7 @@ pub fn new_full_base(
 		select_chain,
 		transaction_pool,
 		inherent_data_providers,
-		other: (rpc_extensions_builder, import_setup, rpc_setup),
+		other: (rpc_extensions_builder, import_setup, rpc_setup, mut telemetry),
 	} = new_partial(&config)?;
 
 	let shared_voter_state = rpc_setup;
@@ -231,10 +256,7 @@ pub fn new_full_base(
 	let enable_grandpa = !config.disable_grandpa;
 	let prometheus_registry = config.prometheus_registry().cloned();
 
-	let telemetry_span = TelemetrySpan::new();
-	let _telemetry_span_entered = telemetry_span.enter();
-
-	let (_rpc_handlers, telemetry_connection_notifier) = sc_service::spawn_tasks(
+	let _rpc_handlers = sc_service::spawn_tasks(
 		sc_service::SpawnTasksParams {
 			config,
 			backend: backend.clone(),
@@ -248,7 +270,7 @@ pub fn new_full_base(
 			remote_blockchain: None,
 			network_status_sinks: network_status_sinks.clone(),
 			system_rpc_tx,
-			telemetry_span: Some(telemetry_span.clone()),
+			telemetry: telemetry.as_mut(),
 		},
 	)?;
 
@@ -262,6 +284,7 @@ pub fn new_full_base(
 			client.clone(),
 			transaction_pool.clone(),
 			prometheus_registry.as_ref(),
+			telemetry.as_ref().map(|x| x.handle()),
 		);
 
 		let can_author_with =
@@ -280,6 +303,7 @@ pub fn new_full_base(
 			babe_link,
 			can_author_with,
 			block_proposal_slot_portion: SlotProportion::new(0.5),
+			telemetry: telemetry.as_ref().map(|x| x.handle()),
 		};
 
 		let babe = sc_consensus_babe::start_babe(babe_config)?;
@@ -323,6 +347,7 @@ pub fn new_full_base(
 		observer_enabled: false,
 		keystore,
 		is_authority: role.is_authority(),
+		telemetry: telemetry.as_ref().map(|x| x.handle()),
 	};
 
 	if enable_grandpa {
@@ -336,7 +361,7 @@ pub fn new_full_base(
 			config,
 			link: grandpa_link,
 			network: network.clone(),
-			telemetry_on_connect: telemetry_connection_notifier.map(|x| x.on_connect_stream()),
+			telemetry: telemetry.as_ref().map(|x| x.handle()),
 			voting_rule: grandpa::VotingRulesBuilder::default().build(),
 			prometheus_registry,
 			shared_voter_state,
@@ -362,20 +387,50 @@ pub fn new_full_base(
 }
 
 /// Builds a new service for a full client.
-pub fn new_full(config: Configuration)
--> Result<TaskManager, ServiceError> {
+pub fn new_full(
+	config: Configuration,
+) -> Result<TaskManager, ServiceError> {
 	new_full_base(config, |_, _| ()).map(|NewFullBase { task_manager, .. }| {
 		task_manager
 	})
 }
 
-pub fn new_light_base(mut config: Configuration) -> Result<(
-	TaskManager, RpcHandlers, Option<TelemetryConnectionNotifier>, Arc<LightClient>,
+pub fn new_light_base(
+	mut config: Configuration,
+) -> Result<(
+	TaskManager,
+	RpcHandlers,
+	Arc<LightClient>,
 	Arc<NetworkService<Block, <Block as BlockT>::Hash>>,
 	Arc<sc_transaction_pool::LightPool<Block, LightClient, sc_network::config::OnDemand<Block>>>
 ), ServiceError> {
+	let telemetry = config.telemetry_endpoints.clone()
+		.filter(|x| !x.is_empty())
+		.map(|endpoints| -> Result<_, sc_telemetry::Error> {
+			#[cfg(feature = "browser")]
+			let transport = Some(
+				sc_telemetry::ExtTransport::new(libp2p_wasm_ext::ffi::websocket_transport())
+			);
+			#[cfg(not(feature = "browser"))]
+			let transport = None;
+
+			let worker = TelemetryWorker::with_transport(16, transport)?;
+			let telemetry = worker.handle().new_telemetry(endpoints);
+			Ok((worker, telemetry))
+		})
+		.transpose()?;
+
 	let (client, backend, keystore_container, mut task_manager, on_demand) =
-		sc_service::new_light_parts::<Block, RuntimeApi, Executor>(&config)?;
+		sc_service::new_light_parts::<Block, RuntimeApi, Executor>(
+			&config,
+			telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()),
+		)?;
+
+	let mut telemetry = telemetry
+		.map(|(worker, telemetry)| {
+			task_manager.spawn_handle().spawn("telemetry", worker.run());
+			telemetry
+		});
 
 	config.network.extra_sets.push(grandpa::grandpa_peers_set_config());
 
@@ -393,6 +448,7 @@ pub fn new_light_base(mut config: Configuration) -> Result<(
 		client.clone(),
 		&(client.clone() as Arc<_>),
 		select_chain.clone(),
+		telemetry.as_ref().map(|x| x.handle()),
 	)?;
 	let justification_import = grandpa_block_import.clone();
 
@@ -414,6 +470,7 @@ pub fn new_light_base(mut config: Configuration) -> Result<(
 		&task_manager.spawn_essential_handle(),
 		config.prometheus_registry(),
 		sp_consensus::NeverCanAuthor,
+		telemetry.as_ref().map(|x| x.handle()),
 	)?;
 
 	let (network, network_status_sinks, system_rpc_tx, network_starter) =
@@ -443,10 +500,7 @@ pub fn new_light_base(mut config: Configuration) -> Result<(
 
 	let rpc_extensions = node_rpc::create_light(light_deps);
 
-	let telemetry_span = TelemetrySpan::new();
-	let _telemetry_span_entered = telemetry_span.enter();
-
-	let (rpc_handlers, telemetry_connection_notifier) =
+	let rpc_handlers =
 		sc_service::spawn_tasks(sc_service::SpawnTasksParams {
 			on_demand: Some(on_demand),
 			remote_blockchain: Some(backend.remote_blockchain()),
@@ -457,13 +511,12 @@ pub fn new_light_base(mut config: Configuration) -> Result<(
 			config, backend, network_status_sinks, system_rpc_tx,
 			network: network.clone(),
 			task_manager: &mut task_manager,
-			telemetry_span: Some(telemetry_span.clone()),
+			telemetry: telemetry.as_mut(),
 		})?;
 
 	Ok((
 		task_manager,
 		rpc_handlers,
-		telemetry_connection_notifier,
 		client,
 		network,
 		transaction_pool,
@@ -471,8 +524,10 @@ pub fn new_light_base(mut config: Configuration) -> Result<(
 }
 
 /// Builds a new service for a light client.
-pub fn new_light(config: Configuration) -> Result<TaskManager, ServiceError> {
-	new_light_base(config).map(|(task_manager, _, _, _, _, _)| {
+pub fn new_light(
+	config: Configuration,
+) -> Result<TaskManager, ServiceError> {
+	new_light_base(config).map(|(task_manager, _, _, _, _)| {
 		task_manager
 	})
 }
@@ -553,7 +608,7 @@ mod tests {
 				Ok((node, (inherent_data_providers, setup_handles.unwrap())))
 			},
 			|config| {
-				let (keep_alive, _, _, client, network, transaction_pool) = new_light_base(config)?;
+				let (keep_alive, _, client, network, transaction_pool) = new_light_base(config)?;
 				Ok(sc_service_test::TestNetComponents::new(keep_alive, client, network, transaction_pool))
 			},
 			|service, &mut (ref inherent_data_providers, (ref mut block_import, ref babe_link))| {
@@ -580,6 +635,7 @@ mod tests {
 					service.client(),
 					service.transaction_pool(),
 					None,
+					None,
 				);
 
 				let epoch_descriptor = babe_link.epoch_changes().lock().epoch_descriptor_for_child_of(
@@ -708,7 +764,7 @@ mod tests {
 				Ok(sc_service_test::TestNetComponents::new(task_manager, client, network, transaction_pool))
 			},
 			|config| {
-				let (keep_alive, _, _, client, network, transaction_pool) = new_light_base(config)?;
+				let (keep_alive, _, client, network, transaction_pool) = new_light_base(config)?;
 				Ok(sc_service_test::TestNetComponents::new(keep_alive, client, network, transaction_pool))
 			},
 			vec![
diff --git a/bin/node/inspect/src/command.rs b/bin/node/inspect/src/command.rs
index a1a9c947a561..9c14a71375f5 100644
--- a/bin/node/inspect/src/command.rs
+++ b/bin/node/inspect/src/command.rs
@@ -34,7 +34,7 @@ impl InspectCmd {
 		RA: Send + Sync + 'static,
 		EX: NativeExecutionDispatch + 'static,
 	{
-		let client = new_full_client::<B, RA, EX>(&config)?;
+		let client = new_full_client::<B, RA, EX>(&config, None)?;
 		let inspect = Inspector::<B>::new(client);
 
 		match &self.command {
diff --git a/bin/node/testing/src/bench.rs b/bin/node/testing/src/bench.rs
index 668284101bee..cc6d7587dd51 100644
--- a/bin/node/testing/src/bench.rs
+++ b/bin/node/testing/src/bench.rs
@@ -427,6 +427,7 @@ impl BenchDb {
 			ExecutionExtensions::new(profile.into_execution_strategies(), None, None),
 			Box::new(task_executor.clone()),
 			None,
+			None,
 			Default::default(),
 		).expect("Should not fail");
 
diff --git a/client/basic-authorship/src/basic_authorship.rs b/client/basic-authorship/src/basic_authorship.rs
index 0c5bb7abefa5..93ee4fc1445d 100644
--- a/client/basic-authorship/src/basic_authorship.rs
+++ b/client/basic-authorship/src/basic_authorship.rs
@@ -32,7 +32,7 @@ use sp_runtime::{
 	traits::{Block as BlockT, Hash as HashT, Header as HeaderT, DigestFor, BlakeTwo256},
 };
 use sp_transaction_pool::{TransactionPool, InPoolTransaction};
-use sc_telemetry::{telemetry, CONSENSUS_INFO};
+use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_INFO};
 use sc_block_builder::{BlockBuilderApi, BlockBuilderProvider};
 use sp_api::{ProvideRuntimeApi, ApiExt};
 use futures::{future, future::{Future, FutureExt}, channel::oneshot, select};
@@ -60,9 +60,10 @@ pub struct ProposerFactory<A, B, C, PR> {
 	transaction_pool: Arc<A>,
 	/// Prometheus Link,
 	metrics: PrometheusMetrics,
+	max_block_size: usize,
+	telemetry: Option<TelemetryHandle>,
 	/// phantom member to pin the `Backend`/`ProofRecording` type.
 	_phantom: PhantomData<(B, PR)>,
-	max_block_size: usize,
 }
 
 impl<A, B, C> ProposerFactory<A, B, C, DisableProofRecording> {
@@ -74,14 +75,16 @@ impl<A, B, C> ProposerFactory<A, B, C, DisableProofRecording> {
 		client: Arc<C>,
 		transaction_pool: Arc<A>,
 		prometheus: Option<&PrometheusRegistry>,
+		telemetry: Option<TelemetryHandle>,
 	) -> Self {
 		ProposerFactory {
 			spawn_handle: Box::new(spawn_handle),
-			client,
 			transaction_pool,
 			metrics: PrometheusMetrics::new(prometheus),
-			_phantom: PhantomData,
 			max_block_size: DEFAULT_MAX_BLOCK_SIZE,
+			telemetry,
+			client,
+			_phantom: PhantomData,
 		}
 	}
 }
@@ -95,14 +98,16 @@ impl<A, B, C> ProposerFactory<A, B, C, EnableProofRecording> {
 		client: Arc<C>,
 		transaction_pool: Arc<A>,
 		prometheus: Option<&PrometheusRegistry>,
+		telemetry: Option<TelemetryHandle>,
 	) -> Self {
 		ProposerFactory {
 			spawn_handle: Box::new(spawn_handle),
 			client,
 			transaction_pool,
 			metrics: PrometheusMetrics::new(prometheus),
-			_phantom: PhantomData,
 			max_block_size: DEFAULT_MAX_BLOCK_SIZE,
+			telemetry,
+			_phantom: PhantomData,
 		}
 	}
 }
@@ -147,8 +152,9 @@ impl<B, Block, C, A, PR> ProposerFactory<A, B, C, PR>
 			transaction_pool: self.transaction_pool.clone(),
 			now,
 			metrics: self.metrics.clone(),
-			_phantom: PhantomData,
 			max_block_size: self.max_block_size,
+			telemetry: self.telemetry.clone(),
+			_phantom: PhantomData,
 		};
 
 		proposer
@@ -189,8 +195,9 @@ pub struct Proposer<B, Block: BlockT, C, A: TransactionPool, PR> {
 	transaction_pool: Arc<A>,
 	now: Box<dyn Fn() -> time::Instant + Send + Sync>,
 	metrics: PrometheusMetrics,
-	_phantom: PhantomData<(B, PR)>,
 	max_block_size: usize,
+	telemetry: Option<TelemetryHandle>,
+	_phantom: PhantomData<(B, PR)>,
 }
 
 impl<A, B, Block, C, PR> sp_consensus::Proposer<Block> for
@@ -371,7 +378,10 @@ impl<A, B, Block, C, PR> Proposer<B, Block, C, A, PR>
 				.collect::<Vec<_>>()
 				.join(", ")
 		);
-		telemetry!(CONSENSUS_INFO; "prepared_block_for_proposing";
+		telemetry!(
+			self.telemetry;
+			CONSENSUS_INFO;
+			"prepared_block_for_proposing";
 			"number" => ?block.header().number(),
 			"hash" => ?<Block as BlockT>::Hash::from(block.header().hash()),
 		);
@@ -461,6 +471,7 @@ mod tests {
 			client.clone(),
 			txpool.clone(),
 			None,
+			None,
 		);
 
 		let cell = Mutex::new((false, time::Instant::now()));
@@ -508,6 +519,7 @@ mod tests {
 			client.clone(),
 			txpool.clone(),
 			None,
+			None,
 		);
 
 		let cell = Mutex::new((false, time::Instant::now()));
@@ -564,6 +576,7 @@ mod tests {
 			client.clone(),
 			txpool.clone(),
 			None,
+			None,
 		);
 
 		let proposer = proposer_factory.init_with_now(
@@ -639,6 +652,7 @@ mod tests {
 			client.clone(),
 			txpool.clone(),
 			None,
+			None,
 		);
 		let mut propose_block = |
 			client: &TestClient,
diff --git a/client/basic-authorship/src/lib.rs b/client/basic-authorship/src/lib.rs
index ccf73cc93f19..acaf85db7633 100644
--- a/client/basic-authorship/src/lib.rs
+++ b/client/basic-authorship/src/lib.rs
@@ -45,6 +45,7 @@
 //!		client.clone(),
 //!		txpool.clone(),
 //!		None,
+//!		None,
 //!	);
 //!
 //! // From this factory, we create a `Proposer`.
diff --git a/client/cli/src/arg_enums.rs b/client/cli/src/arg_enums.rs
index 4b1f197cf3ea..aeb3eeacc6f2 100644
--- a/client/cli/src/arg_enums.rs
+++ b/client/cli/src/arg_enums.rs
@@ -64,7 +64,6 @@ arg_enum! {
 	#[derive(Debug, Copy, Clone, PartialEq, Eq)]
 	pub enum TracingReceiver {
 		Log,
-		Telemetry,
 	}
 }
 
@@ -72,7 +71,6 @@ impl Into<sc_tracing::TracingReceiver> for TracingReceiver {
 	fn into(self) -> sc_tracing::TracingReceiver {
 		match self {
 			TracingReceiver::Log => sc_tracing::TracingReceiver::Log,
-			TracingReceiver::Telemetry => sc_tracing::TracingReceiver::Telemetry,
 		}
 	}
 }
diff --git a/client/cli/src/config.rs b/client/cli/src/config.rs
index 748e3b101269..289d6dc7cc39 100644
--- a/client/cli/src/config.rs
+++ b/client/cli/src/config.rs
@@ -33,7 +33,6 @@ use sc_service::config::{
 	TaskExecutor, TelemetryEndpoints, TransactionPoolOptions, WasmExecutionMethod,
 };
 use sc_service::{ChainSpec, TracingReceiver, KeepBlocks, TransactionStorageMode};
-use sc_telemetry::TelemetryHandle;
 use sc_tracing::logging::LoggerBuilder;
 use std::net::SocketAddr;
 use std::path::PathBuf;
@@ -470,7 +469,6 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 		&self,
 		cli: &C,
 		task_executor: TaskExecutor,
-		telemetry_handle: Option<TelemetryHandle>,
 	) -> Result<Configuration> {
 		let is_dev = self.is_dev()?;
 		let chain_id = self.chain_id(is_dev)?;
@@ -488,12 +486,7 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 		let max_runtime_instances = self.max_runtime_instances()?.unwrap_or(8);
 		let is_validator = role.is_authority();
 		let (keystore_remote, keystore) = self.keystore_config(&config_dir)?;
-		let telemetry_endpoints = telemetry_handle
-			.as_ref()
-			.and_then(|_| self.telemetry_endpoints(&chain_spec).transpose())
-			.transpose()?
-			// Don't initialise telemetry if `telemetry_endpoints` == Some([])
-			.filter(|x| !x.is_empty());
+		let telemetry_endpoints = self.telemetry_endpoints(&chain_spec)?;
 
 		let unsafe_pruning = self
 			.import_params()
@@ -548,7 +541,6 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 			role,
 			base_path: Some(base_path),
 			informant_output_format: Default::default(),
-			telemetry_handle,
 		})
 	}
 
@@ -579,16 +571,12 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 	/// 1. Sets the panic handler
 	/// 2. Initializes the logger
 	/// 3. Raises the FD limit
-	fn init<C: SubstrateCli>(&self) -> Result<sc_telemetry::TelemetryWorker> {
+	fn init<C: SubstrateCli>(&self) -> Result<()> {
 		sp_panic_handler::set(&C::support_url(), &C::impl_version());
 
 		let mut logger = LoggerBuilder::new(self.log_filters()?);
 		logger.with_log_reloading(!self.is_log_filter_reloading_disabled()?);
 
-		if let Some(transport) = self.telemetry_external_transport()? {
-			logger.with_transport(transport);
-		}
-
 		if let Some(tracing_targets) = self.tracing_targets()? {
 			let tracing_receiver = self.tracing_receiver()?;
 			logger.with_profiling(tracing_receiver, tracing_targets);
@@ -598,7 +586,7 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 			logger.with_colors(false);
 		}
 
-		let telemetry_worker = logger.init()?;
+		logger.init()?;
 
 		if let Some(new_limit) = fdlimit::raise_fd_limit() {
 			if new_limit < RECOMMENDED_OPEN_FILE_DESCRIPTOR_LIMIT {
@@ -610,7 +598,7 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 			}
 		}
 
-		Ok(telemetry_worker)
+		Ok(())
 	}
 }
 
diff --git a/client/cli/src/lib.rs b/client/cli/src/lib.rs
index 602c53272ea5..f81c5160ca82 100644
--- a/client/cli/src/lib.rs
+++ b/client/cli/src/lib.rs
@@ -37,7 +37,6 @@ pub use params::*;
 pub use runner::*;
 pub use sc_service::{ChainSpec, Role};
 use sc_service::{Configuration, TaskExecutor};
-use sc_telemetry::TelemetryHandle;
 pub use sc_tracing::logging::LoggerBuilder;
 pub use sp_version::RuntimeVersion;
 use std::io::Write;
@@ -214,16 +213,15 @@ pub trait SubstrateCli: Sized {
 		&self,
 		command: &T,
 		task_executor: TaskExecutor,
-		telemetry_handle: Option<TelemetryHandle>,
 	) -> error::Result<Configuration> {
-		command.create_configuration(self, task_executor, telemetry_handle)
+		command.create_configuration(self, task_executor)
 	}
 
 	/// Create a runner for the command provided in argument. This will create a Configuration and
 	/// a tokio runtime
 	fn create_runner<T: CliConfiguration>(&self, command: &T) -> error::Result<Runner<Self>> {
-		let telemetry_worker = command.init::<Self>()?;
-		Runner::new(self, command, telemetry_worker)
+		command.init::<Self>()?;
+		Runner::new(self, command)
 	}
 
 	/// Native runtime version.
diff --git a/client/cli/src/runner.rs b/client/cli/src/runner.rs
index 61a7fe9b0145..b512588a204c 100644
--- a/client/cli/src/runner.rs
+++ b/client/cli/src/runner.rs
@@ -25,7 +25,6 @@ use futures::select;
 use futures::{future, future::FutureExt, Future};
 use log::info;
 use sc_service::{Configuration, TaskType, TaskManager};
-use sc_telemetry::{TelemetryHandle, TelemetryWorker};
 use sp_utils::metrics::{TOKIO_THREADS_ALIVE, TOKIO_THREADS_TOTAL};
 use std::marker::PhantomData;
 use sc_service::Error as ServiceError;
@@ -115,7 +114,6 @@ where
 pub struct Runner<C: SubstrateCli> {
 	config: Configuration,
 	tokio_runtime: tokio::runtime::Runtime,
-	telemetry_worker: TelemetryWorker,
 	phantom: PhantomData<C>,
 }
 
@@ -124,7 +122,6 @@ impl<C: SubstrateCli> Runner<C> {
 	pub fn new<T: CliConfiguration>(
 		cli: &C,
 		command: &T,
-		telemetry_worker: TelemetryWorker,
 	) -> Result<Runner<C>> {
 		let tokio_runtime = build_runtime()?;
 		let runtime_handle = tokio_runtime.handle().clone();
@@ -138,16 +135,12 @@ impl<C: SubstrateCli> Runner<C> {
 			}
 		};
 
-		let telemetry_handle = telemetry_worker.handle();
-
 		Ok(Runner {
 			config: command.create_configuration(
 				cli,
 				task_executor.into(),
-				Some(telemetry_handle),
 			)?,
 			tokio_runtime,
-			telemetry_worker,
 			phantom: PhantomData,
 		})
 	}
@@ -197,7 +190,6 @@ impl<C: SubstrateCli> Runner<C> {
 	{
 		self.print_node_infos();
 		let mut task_manager = self.tokio_runtime.block_on(initialize(self.config))?;
-		task_manager.spawn_handle().spawn("telemetry_worker", self.telemetry_worker.run());
 		let res = self.tokio_runtime.block_on(main(task_manager.future().fuse()));
 		self.tokio_runtime.block_on(task_manager.clean_shutdown());
 		Ok(res?)
@@ -236,11 +228,4 @@ impl<C: SubstrateCli> Runner<C> {
 	pub fn config_mut(&mut self) -> &mut Configuration {
 		&mut self.config
 	}
-
-	/// Get a new [`TelemetryHandle`].
-	///
-	/// This is used when you want to register with the [`TelemetryWorker`].
-	pub fn telemetry_handle(&self) -> TelemetryHandle {
-		self.telemetry_worker.handle()
-	}
 }
diff --git a/client/consensus/aura/src/import_queue.rs b/client/consensus/aura/src/import_queue.rs
index 638931477a99..d3ed2bea3e11 100644
--- a/client/consensus/aura/src/import_queue.rs
+++ b/client/consensus/aura/src/import_queue.rs
@@ -45,7 +45,7 @@ use sp_api::ProvideRuntimeApi;
 use sp_core::crypto::Pair;
 use sp_inherents::{InherentDataProviders, InherentData};
 use sp_timestamp::InherentError as TIError;
-use sc_telemetry::{telemetry, CONSENSUS_TRACE, CONSENSUS_DEBUG, CONSENSUS_INFO};
+use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_TRACE, CONSENSUS_DEBUG, CONSENSUS_INFO};
 use sc_consensus_slots::{CheckedHeader, SlotCompatible, check_equivocation};
 use sp_consensus_slots::Slot;
 use sp_api::ApiExt;
@@ -129,6 +129,7 @@ pub struct AuraVerifier<C, P, CAW> {
 	inherent_data_providers: InherentDataProviders,
 	can_author_with: CAW,
 	check_for_equivocation: CheckForEquivocation,
+	telemetry: Option<TelemetryHandle>,
 }
 
 impl<C, P, CAW> AuraVerifier<C, P, CAW> {
@@ -137,12 +138,14 @@ impl<C, P, CAW> AuraVerifier<C, P, CAW> {
 		inherent_data_providers: InherentDataProviders,
 		can_author_with: CAW,
 		check_for_equivocation: CheckForEquivocation,
+		telemetry: Option<TelemetryHandle>,
 	) -> Self {
 		Self {
 			client,
 			inherent_data_providers,
 			can_author_with,
 			check_for_equivocation,
+			telemetry,
 			phantom: PhantomData,
 		}
 	}
@@ -197,7 +200,10 @@ impl<C, P, CAW> AuraVerifier<C, P, CAW> where
 							"halting for block {} seconds in the future",
 							diff
 						);
-						telemetry!(CONSENSUS_INFO; "aura.halting_for_future_block";
+						telemetry!(
+							self.telemetry;
+							CONSENSUS_INFO;
+							"aura.halting_for_future_block";
 							"diff" => ?diff
 						);
 						thread::sleep(Duration::from_secs(diff));
@@ -287,7 +293,12 @@ impl<B: BlockT, C, P, CAW> Verifier<B> for AuraVerifier<C, P, CAW> where
 				}
 
 				trace!(target: "aura", "Checked {:?}; importing.", pre_header);
-				telemetry!(CONSENSUS_TRACE; "aura.checked_and_importing"; "pre_header" => ?pre_header);
+				telemetry!(
+					self.telemetry;
+					CONSENSUS_TRACE;
+					"aura.checked_and_importing";
+					"pre_header" => ?pre_header,
+				);
 
 				// Look for an authorities-change log.
 				let maybe_keys = pre_header.digest()
@@ -314,8 +325,13 @@ impl<B: BlockT, C, P, CAW> Verifier<B> for AuraVerifier<C, P, CAW> where
 			}
 			CheckedHeader::Deferred(a, b) => {
 				debug!(target: "aura", "Checking {:?} failed; {:?}, {:?}.", hash, a, b);
-				telemetry!(CONSENSUS_DEBUG; "aura.header_too_far_in_future";
-					"hash" => ?hash, "a" => ?a, "b" => ?b
+				telemetry!(
+					self.telemetry;
+					CONSENSUS_DEBUG;
+					"aura.header_too_far_in_future";
+					"hash" => ?hash,
+					"a" => ?a,
+					"b" => ?b,
 				);
 				Err(format!("Header {:?} rejected: too far in the future", hash))
 			}
@@ -485,6 +501,8 @@ pub struct ImportQueueParams<'a, Block, I, C, S, CAW> {
 	pub check_for_equivocation: CheckForEquivocation,
 	/// The duration of one slot.
 	pub slot_duration: SlotDuration,
+	/// Telemetry instance used to report telemetry metrics.
+	pub telemetry: Option<TelemetryHandle>,
 }
 
 /// Start an import queue for the Aura consensus algorithm.
@@ -499,6 +517,7 @@ pub fn import_queue<'a, P, Block, I, C, S, CAW>(
 		can_author_with,
 		check_for_equivocation,
 		slot_duration,
+		telemetry,
 	}: ImportQueueParams<'a, Block, I, C, S, CAW>
 ) -> Result<DefaultImportQueue<Block, C>, sp_consensus::Error> where
 	Block: BlockT,
@@ -530,6 +549,7 @@ pub fn import_queue<'a, P, Block, I, C, S, CAW>(
 		inherent_data_providers,
 		can_author_with,
 		check_for_equivocation,
+		telemetry,
 	);
 
 	Ok(BasicQueue::new(
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index 12ce0e169713..bdeb4f15f322 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -56,6 +56,7 @@ use sp_keystore::{SyncCryptoStorePtr, SyncCryptoStore};
 use sp_inherents::{InherentDataProviders, InherentData};
 use sp_timestamp::{TimestampInherentData, InherentType as TimestampInherent};
 use sc_consensus_slots::{SlotInfo, SlotCompatible, StorageChanges, BackoffAuthoringBlocksStrategy};
+use sc_telemetry::TelemetryHandle;
 use sp_consensus_slots::Slot;
 
 mod import_queue;
@@ -149,6 +150,8 @@ pub struct StartAuraParams<C, SC, I, PF, SO, BS, CAW> {
 	/// slot. However, the proposing can still take longer when there is some lenience factor applied,
 	/// because there were no blocks produced for some slots.
 	pub block_proposal_slot_portion: SlotProportion,
+	/// Telemetry instance used to report telemetry metrics.
+	pub telemetry: Option<TelemetryHandle>,
 }
 
 /// Start the aura worker. The returned future should be run in a futures executor.
@@ -166,6 +169,7 @@ pub fn start_aura<P, B, C, SC, PF, I, SO, CAW, BS, Error>(
 		keystore,
 		can_author_with,
 		block_proposal_slot_portion,
+		telemetry,
 	}: StartAuraParams<C, SC, I, PF, SO, BS, CAW>,
 ) -> Result<impl Future<Output = ()>, sp_consensus::Error> where
 	B: BlockT,
@@ -184,13 +188,14 @@ pub fn start_aura<P, B, C, SC, PF, I, SO, CAW, BS, Error>(
 	BS: BackoffAuthoringBlocksStrategy<NumberFor<B>> + Send + 'static,
 {
 	let worker = AuraWorker {
-		client,
+		client: client.clone(),
 		block_import: Arc::new(Mutex::new(block_import)),
 		env,
 		keystore,
 		sync_oracle: sync_oracle.clone(),
 		force_authoring,
 		backoff_authoring_blocks,
+		telemetry,
 		_key_type: PhantomData::<P>,
 		block_proposal_slot_portion,
 	};
@@ -218,6 +223,7 @@ struct AuraWorker<C, E, I, P, SO, BS> {
 	force_authoring: bool,
 	backoff_authoring_blocks: Option<BS>,
 	block_proposal_slot_portion: SlotProportion,
+	telemetry: Option<TelemetryHandle>,
 	_key_type: PhantomData<P>,
 }
 
@@ -371,6 +377,10 @@ where
 		}))
 	}
 
+	fn telemetry(&self) -> Option<TelemetryHandle> {
+		self.telemetry.clone()
+	}
+
 	fn proposing_remaining_duration(
 		&self,
 		head: &B::Header,
@@ -595,6 +605,7 @@ mod tests {
 						inherent_data_providers,
 						AlwaysCanAuthor,
 						CheckForEquivocation::Yes,
+						None,
 					)
 				},
 				PeersClient::Light(_, _) => unreachable!("No (yet) tests for light client + Aura"),
@@ -670,6 +681,7 @@ mod tests {
 				keystore,
 				can_author_with: sp_consensus::AlwaysCanAuthor,
 				block_proposal_slot_portion: SlotProportion::new(0.5),
+				telemetry: None,
 			}).expect("Starts aura"));
 		}
 
@@ -729,6 +741,7 @@ mod tests {
 			sync_oracle: DummyOracle.clone(),
 			force_authoring: false,
 			backoff_authoring_blocks: Some(BackoffAuthoringOnFinalizedHeadLagging::default()),
+			telemetry: None,
 			_key_type: PhantomData::<AuthorityPair>,
 			block_proposal_slot_portion: SlotProportion::new(0.5),
 		};
@@ -777,6 +790,7 @@ mod tests {
 			sync_oracle: DummyOracle.clone(),
 			force_authoring: false,
 			backoff_authoring_blocks: Option::<()>::None,
+			telemetry: None,
 			_key_type: PhantomData::<AuthorityPair>,
 			block_proposal_slot_portion: SlotProportion::new(0.5),
 		};
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index 861f82c0090a..1ea38820c965 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -90,7 +90,7 @@ use sp_runtime::{
 use sp_api::{ProvideRuntimeApi, NumberFor};
 use parking_lot::Mutex;
 use sp_inherents::{InherentDataProviders, InherentData};
-use sc_telemetry::{telemetry, CONSENSUS_TRACE, CONSENSUS_DEBUG};
+use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_TRACE, CONSENSUS_DEBUG};
 use sp_consensus::{
 	BlockImport, Environment, Proposer, BlockCheckParams,
 	ForkChoiceStrategy, BlockImportParams, BlockOrigin, Error as ConsensusError,
@@ -402,6 +402,9 @@ pub struct BabeParams<B: BlockT, C, E, I, SO, SC, CAW, BS> {
 	/// slot. However, the proposing can still take longer when there is some lenience factor applied,
 	/// because there were no blocks produced for some slots.
 	pub block_proposal_slot_portion: SlotProportion,
+
+	/// Handle use to report telemetries.
+	pub telemetry: Option<TelemetryHandle>,
 }
 
 /// Start the babe worker.
@@ -418,13 +421,15 @@ pub fn start_babe<B, C, SC, E, I, SO, CAW, BS, Error>(BabeParams {
 	babe_link,
 	can_author_with,
 	block_proposal_slot_portion,
+	telemetry,
 }: BabeParams<B, C, E, I, SO, SC, CAW, BS>) -> Result<
 	BabeWorker<B>,
 	sp_consensus::Error,
 > where
 	B: BlockT,
 	C: ProvideRuntimeApi<B> + ProvideCache<B> + ProvideUncles<B> + BlockchainEvents<B>
-		+ HeaderBackend<B> + HeaderMetadata<B, Error = ClientError> + Send + Sync + 'static,
+		+ HeaderBackend<B> + HeaderMetadata<B, Error = ClientError>
+		+ Send + Sync + 'static,
 	C::Api: BabeApi<B>,
 	SC: SelectChain<B> + 'static,
 	E: Environment<B, Error = Error> + Send + Sync + 'static,
@@ -453,6 +458,7 @@ pub fn start_babe<B, C, SC, E, I, SO, CAW, BS, Error>(BabeParams {
 		slot_notification_sinks: slot_notification_sinks.clone(),
 		config: config.clone(),
 		block_proposal_slot_portion,
+		telemetry,
 	};
 
 	register_babe_inherent_data_provider(&inherent_data_providers, config.slot_duration())?;
@@ -609,6 +615,7 @@ struct BabeSlotWorker<B: BlockT, C, E, I, SO, BS> {
 	slot_notification_sinks: SlotNotificationSinks<B>,
 	config: Config,
 	block_proposal_slot_portion: SlotProportion,
+	telemetry: Option<TelemetryHandle>,
 }
 
 impl<B, C, E, I, Error, SO, BS> sc_consensus_slots::SimpleSlotWorker<B>
@@ -799,6 +806,10 @@ where
 		}))
 	}
 
+	fn telemetry(&self) -> Option<TelemetryHandle> {
+		self.telemetry.clone()
+	}
+
 	fn proposing_remaining_duration(
 		&self,
 		parent_head: &B::Header,
@@ -947,6 +958,7 @@ pub struct BabeVerifier<Block: BlockT, Client, SelectChain, CAW> {
 	epoch_changes: SharedEpochChanges<Block, Epoch>,
 	time_source: TimeSource,
 	can_author_with: CAW,
+	telemetry: Option<TelemetryHandle>,
 }
 
 impl<Block, Client, SelectChain, CAW> BabeVerifier<Block, Client, SelectChain, CAW>
@@ -1174,6 +1186,7 @@ where
 
 				trace!(target: "babe", "Checked {:?}; importing.", pre_header);
 				telemetry!(
+					self.telemetry;
 					CONSENSUS_TRACE;
 					"babe.checked_and_importing";
 					"pre_header" => ?pre_header);
@@ -1192,7 +1205,10 @@ where
 			}
 			CheckedHeader::Deferred(a, b) => {
 				debug!(target: "babe", "Checking {:?} failed; {:?}, {:?}.", hash, a, b);
-				telemetry!(CONSENSUS_DEBUG; "babe.header_too_far_in_future";
+				telemetry!(
+					self.telemetry;
+					CONSENSUS_DEBUG;
+					"babe.header_too_far_in_future";
 					"hash" => ?hash, "a" => ?a, "b" => ?b
 				);
 				Err(Error::<Block>::TooFarInFuture(hash).into())
@@ -1599,11 +1615,13 @@ pub fn import_queue<Block: BlockT, Client, SelectChain, Inner, CAW>(
 	spawner: &impl sp_core::traits::SpawnEssentialNamed,
 	registry: Option<&Registry>,
 	can_author_with: CAW,
+	telemetry: Option<TelemetryHandle>,
 ) -> ClientResult<DefaultImportQueue<Block, Client>> where
 	Inner: BlockImport<Block, Error = ConsensusError, Transaction = sp_api::TransactionFor<Client, Block>>
 		+ Send + Sync + 'static,
-	Client: ProvideRuntimeApi<Block> + ProvideCache<Block> + Send + Sync + AuxStore + 'static,
-	Client: HeaderBackend<Block> + HeaderMetadata<Block, Error = sp_blockchain::Error>,
+	Client: ProvideRuntimeApi<Block> + ProvideCache<Block> + HeaderBackend<Block>
+		+ HeaderMetadata<Block, Error = sp_blockchain::Error> + AuxStore
+		+ Send + Sync + 'static,
 	Client::Api: BlockBuilderApi<Block> + BabeApi<Block> + ApiExt<Block>,
 	SelectChain: sp_consensus::SelectChain<Block> + 'static,
 	CAW: CanAuthorWith<Block> + Send + Sync + 'static,
@@ -1611,13 +1629,14 @@ pub fn import_queue<Block: BlockT, Client, SelectChain, Inner, CAW>(
 	register_babe_inherent_data_provider(&inherent_data_providers, babe_link.config.slot_duration)?;
 
 	let verifier = BabeVerifier {
-		client,
 		select_chain,
 		inherent_data_providers,
 		config: babe_link.config,
 		epoch_changes: babe_link.epoch_changes,
 		time_source: babe_link.time_source,
 		can_author_with,
+		telemetry,
+		client,
 	};
 
 	Ok(BasicQueue::new(
diff --git a/client/consensus/babe/src/tests.rs b/client/consensus/babe/src/tests.rs
index 9ffffc37fd3b..d3e51b020326 100644
--- a/client/consensus/babe/src/tests.rs
+++ b/client/consensus/babe/src/tests.rs
@@ -320,6 +320,7 @@ impl TestNetFactory for BabeTestNet {
 				epoch_changes: data.link.epoch_changes.clone(),
 				time_source: data.link.time_source.clone(),
 				can_author_with: AlwaysCanAuthor,
+				telemetry: None,
 			},
 			mutator: MUTATOR.with(|m| m.borrow().clone()),
 		}
@@ -432,6 +433,7 @@ fn run_one_test(
 			keystore,
 			can_author_with: sp_consensus::AlwaysCanAuthor,
 			block_proposal_slot_portion: SlotProportion::new(0.5),
+			telemetry: None,
 		}).expect("Starts babe"));
 	}
 	futures::executor::block_on(future::select(
diff --git a/client/consensus/manual-seal/src/lib.rs b/client/consensus/manual-seal/src/lib.rs
index 320f196c1052..64de70939503 100644
--- a/client/consensus/manual-seal/src/lib.rs
+++ b/client/consensus/manual-seal/src/lib.rs
@@ -300,6 +300,7 @@ mod tests {
 			client.clone(),
 			pool.clone(),
 			None,
+			None,
 		);
 		// this test checks that blocks are created as soon as transactions are imported into the pool.
 		let (sender, receiver) = futures::channel::oneshot::channel();
@@ -371,6 +372,7 @@ mod tests {
 			client.clone(),
 			pool.clone(),
 			None,
+			None,
 		);
 		// this test checks that blocks are created as soon as an engine command is sent over the stream.
 		let (mut sink, commands_stream) = futures::channel::mpsc::channel(1024);
@@ -446,6 +448,7 @@ mod tests {
 			client.clone(),
 			pool.clone(),
 			None,
+			None,
 		);
 		// this test checks that blocks are created as soon as an engine command is sent over the stream.
 		let (mut sink, commands_stream) = futures::channel::mpsc::channel(1024);
diff --git a/client/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs
index 1b40ac102d5d..037402260c0d 100644
--- a/client/consensus/slots/src/lib.rs
+++ b/client/consensus/slots/src/lib.rs
@@ -47,7 +47,7 @@ use sp_runtime::{
 	generic::BlockId,
 	traits::{Block as BlockT, Header, HashFor, NumberFor}
 };
-use sc_telemetry::{telemetry, CONSENSUS_DEBUG, CONSENSUS_WARN, CONSENSUS_INFO};
+use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_DEBUG, CONSENSUS_WARN, CONSENSUS_INFO};
 
 /// The changes that need to applied to the storage to create the state for a block.
 ///
@@ -180,6 +180,9 @@ pub trait SimpleSlotWorker<B: BlockT> {
 	/// Returns a `Proposer` to author on top of the given block.
 	fn proposer(&mut self, block: &B::Header) -> Self::CreateProposer;
 
+	/// Returns a [`TelemetryHandle`] if any.
+	fn telemetry(&self) -> Option<TelemetryHandle>;
+
 	/// Remaining duration for proposing.
 	fn proposing_remaining_duration(
 		&self,
@@ -197,6 +200,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 		<Self::Proposer as Proposer<B>>::Proposal: Unpin + Send + 'static,
 	{
 		let (timestamp, slot) = (slot_info.timestamp, slot_info.slot);
+		let telemetry = self.telemetry();
 
 		let proposing_remaining_duration = self.proposing_remaining_duration(&chain_head, &slot_info);
 
@@ -219,7 +223,9 @@ pub trait SimpleSlotWorker<B: BlockT> {
 				warn!("Unable to fetch epoch data at block {:?}: {:?}", chain_head.hash(), err);
 
 				telemetry!(
-					CONSENSUS_WARN; "slots.unable_fetching_authorities";
+					telemetry;
+					CONSENSUS_WARN;
+					"slots.unable_fetching_authorities";
 					"slot" => ?chain_head.hash(),
 					"err" => ?err,
 				);
@@ -238,6 +244,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 		{
 			debug!(target: self.logging_target(), "Skipping proposal slot. Waiting for the network.");
 			telemetry!(
+				telemetry;
 				CONSENSUS_DEBUG;
 				"slots.skipping_proposal_slot";
 				"authorities_len" => authorities_len,
@@ -263,24 +270,29 @@ pub trait SimpleSlotWorker<B: BlockT> {
 		);
 
 		telemetry!(
+			telemetry;
 			CONSENSUS_DEBUG;
 			"slots.starting_authorship";
 			"slot_num" => *slot,
 			"timestamp" => timestamp,
 		);
 
-		let awaiting_proposer = self.proposer(&chain_head).map_err(move |err| {
-			warn!("Unable to author block in slot {:?}: {:?}", slot, err);
+		let awaiting_proposer = {
+			let telemetry = telemetry.clone();
+			self.proposer(&chain_head).map_err(move |err| {
+				warn!("Unable to author block in slot {:?}: {:?}", slot, err);
 
-			telemetry!(
-				CONSENSUS_WARN;
-				"slots.unable_authoring_block";
-				"slot" => *slot,
-				"err" => ?err
-			);
+				telemetry!(
+					telemetry;
+					CONSENSUS_WARN;
+					"slots.unable_authoring_block";
+					"slot" => *slot,
+					"err" => ?err
+				);
 
-			err
-		});
+				err
+			})
+		};
 
 		let logs = self.pre_digest_data(slot, &claim);
 
@@ -295,7 +307,8 @@ pub trait SimpleSlotWorker<B: BlockT> {
 			proposing_remaining_duration.mul_f32(0.98),
 		).map_err(|e| sp_consensus::Error::ClientImport(format!("{:?}", e))));
 
-		let proposal_work =
+		let proposal_work = {
+			let telemetry = telemetry.clone();
 			futures::future::select(proposing, proposing_remaining).map(move |v| match v {
 				Either::Left((b, _)) => b.map(|b| (b, claim)),
 				Either::Right(_) => {
@@ -307,6 +320,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 					#[cfg(build_type="debug")]
 					info!("👉 Recompile your node in `--release` mode to mitigate this problem.");
 					telemetry!(
+						telemetry;
 						CONSENSUS_INFO;
 						"slots.discarding_proposal_took_too_long";
 						"slot" => *slot,
@@ -314,7 +328,8 @@ pub trait SimpleSlotWorker<B: BlockT> {
 
 					Err(sp_consensus::Error::ClientImport("Timeout in the Slots proposer".into()))
 				},
-			});
+			})
+		};
 
 		let block_import_params_maker = self.block_import_params();
 		let block_import = self.block_import();
@@ -343,7 +358,10 @@ pub trait SimpleSlotWorker<B: BlockT> {
 				header_hash,
 			);
 
-			telemetry!(CONSENSUS_INFO; "slots.pre_sealed_block";
+			telemetry!(
+				telemetry;
+				CONSENSUS_INFO;
+				"slots.pre_sealed_block";
 				"header_num" => ?header_num,
 				"hash_now" => ?block_import_params.post_hash(),
 				"hash_previously" => ?header_hash,
@@ -359,7 +377,9 @@ pub trait SimpleSlotWorker<B: BlockT> {
 				);
 
 				telemetry!(
-					CONSENSUS_WARN; "slots.err_with_block_built_on";
+					telemetry;
+					CONSENSUS_WARN;
+					"slots.err_with_block_built_on";
 					"hash" => ?parent_hash,
 					"err" => ?err,
 				);
@@ -449,7 +469,8 @@ where
 				Either::Right(future::ready(Ok(())))
 			} else {
 				Either::Left(
-					worker.on_slot(chain_head, slot_info).then(|_| future::ready(Ok(())))
+					worker.on_slot(chain_head, slot_info)
+						.then(|_| future::ready(Ok(())))
 				)
 			}
 		}).then(|res| {
diff --git a/client/finality-grandpa/src/authorities.rs b/client/finality-grandpa/src/authorities.rs
index 11d3d4ba691d..1854a33d29f1 100644
--- a/client/finality-grandpa/src/authorities.rs
+++ b/client/finality-grandpa/src/authorities.rs
@@ -23,7 +23,7 @@ use parking_lot::RwLock;
 use finality_grandpa::voter_set::VoterSet;
 use parity_scale_codec::{Encode, Decode};
 use log::debug;
-use sc_telemetry::{telemetry, CONSENSUS_INFO};
+use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_INFO};
 use sp_finality_grandpa::{AuthorityId, AuthorityList};
 
 use std::cmp::Ord;
@@ -43,8 +43,8 @@ pub enum Error<N, E> {
 	#[display(fmt = "Multiple pending forced authority set changes are not allowed.")]
 	MultiplePendingForcedAuthoritySetChanges,
 	#[display(
-		fmt = "A pending forced authority set change could not be applied since it must be applied after \
-		 the pending standard change at #{}",
+		fmt = "A pending forced authority set change could not be applied since it must be applied \
+		after the pending standard change at #{}",
 		_0
 	)]
 	ForcedAuthoritySetChangeDependencyUnsatisfied(N),
@@ -278,9 +278,13 @@ where
 		let hash = pending.canon_hash.clone();
 		let number = pending.canon_height.clone();
 
-		debug!(target: "afg", "Inserting potential standard set change signaled at block {:?} \
-							   (delayed by {:?} blocks).",
-			   (&number, &hash), pending.delay);
+		debug!(
+			target: "afg",
+			"Inserting potential standard set change signaled at block {:?} (delayed by {:?}
+			blocks).",
+			(&number, &hash),
+			pending.delay,
+		);
 
 		self.pending_standard_changes.import(
 			hash,
@@ -289,8 +293,10 @@ where
 			is_descendent_of,
 		)?;
 
-		debug!(target: "afg", "There are now {} alternatives for the next pending standard change (roots), \
-							   and a total of {} pending standard changes (across all forks).",
+		debug!(
+			target: "afg",
+			"There are now {} alternatives for the next pending standard change (roots), and a
+			total of {} pending standard changes (across all forks).",
 			self.pending_standard_changes.roots().count(),
 			self.pending_standard_changes.iter().count(),
 		);
@@ -326,9 +332,12 @@ where
 			))
 			.unwrap_or_else(|i| i);
 
-		debug!(target: "afg", "Inserting potential forced set change at block {:?} \
-							   (delayed by {:?} blocks).",
-			   (&pending.canon_height, &pending.canon_hash), pending.delay);
+		debug!(
+			target: "afg",
+			"Inserting potential forced set change at block {:?} (delayed by {:?} blocks).",
+			(&pending.canon_height, &pending.canon_hash),
+			pending.delay,
+		);
 
 		self.pending_forced_changes.insert(idx, pending);
 
@@ -409,6 +418,7 @@ where
 		best_number: N,
 		is_descendent_of: &F,
 		initial_sync: bool,
+		telemetry: Option<TelemetryHandle>,
 	) -> Result<Option<(N, Self)>, Error<N, E>>
 	where
 		F: Fn(&H, &H) -> Result<bool, E>,
@@ -461,6 +471,7 @@ where
 				);
 
 				telemetry!(
+					telemetry;
 					CONSENSUS_INFO;
 					"afg.applying_forced_authority_set_change";
 					"block" => ?change.canon_height
@@ -505,6 +516,7 @@ where
 		finalized_number: N,
 		is_descendent_of: &F,
 		initial_sync: bool,
+		telemetry: Option<&TelemetryHandle>,
 	) -> Result<Status<H, N>, Error<N, E>>
 	where
 		F: Fn(&H, &H) -> Result<bool, E>,
@@ -544,7 +556,10 @@ where
 						"👴 Applying authority set change scheduled at block #{:?}",
 						change.canon_height,
 					);
-					telemetry!(CONSENSUS_INFO; "afg.applying_scheduled_authority_set_change";
+					telemetry!(
+						telemetry;
+						CONSENSUS_INFO;
+						"afg.applying_scheduled_authority_set_change";
 						"block" => ?change.canon_height
 					);
 
@@ -894,6 +909,7 @@ mod tests {
 				_ => unreachable!(),
 			}),
 			false,
+			None,
 		).unwrap();
 
 		assert!(status.changed);
@@ -913,6 +929,7 @@ mod tests {
 				_ => unreachable!(),
 			}),
 			false,
+			None,
 		).unwrap();
 
 		assert!(status.changed);
@@ -971,7 +988,7 @@ mod tests {
 
 		// trying to finalize past `change_c` without finalizing `change_a` first
 		assert!(matches!(
-			authorities.apply_standard_changes("hash_d", 40, &is_descendent_of, false),
+			authorities.apply_standard_changes("hash_d", 40, &is_descendent_of, false, None),
 			Err(Error::ForkTree(fork_tree::Error::UnfinalizedAncestor))
 		));
 		assert_eq!(authorities.authority_set_changes, AuthoritySetChanges::empty());
@@ -981,6 +998,7 @@ mod tests {
 			15,
 			&is_descendent_of,
 			false,
+			None,
 		).unwrap();
 
 		assert!(status.changed);
@@ -996,6 +1014,7 @@ mod tests {
 			40,
 			&is_descendent_of,
 			false,
+			None,
 		).unwrap();
 
 		assert!(status.changed);
@@ -1138,7 +1157,7 @@ mod tests {
 		// too early and there's no forced changes to apply.
 		assert!(
 			authorities
-				.apply_forced_changes("hash_a10", 10, &static_is_descendent_of(true), false)
+				.apply_forced_changes("hash_a10", 10, &static_is_descendent_of(true), false, None)
 				.unwrap()
 				.is_none()
 		);
@@ -1146,7 +1165,7 @@ mod tests {
 		// too late.
 		assert!(
 			authorities
-				.apply_forced_changes("hash_a16", 16, &is_descendent_of_a, false)
+				.apply_forced_changes("hash_a16", 16, &is_descendent_of_a, false, None)
 				.unwrap()
 				.is_none()
 		);
@@ -1154,7 +1173,7 @@ mod tests {
 		// on time -- chooses the right change for this fork.
 		assert_eq!(
 			authorities
-				.apply_forced_changes("hash_a15", 15, &is_descendent_of_a, false)
+				.apply_forced_changes("hash_a15", 15, &is_descendent_of_a, false, None)
 				.unwrap()
 				.unwrap(),
 			(
@@ -1202,7 +1221,7 @@ mod tests {
 		// it should be enacted at the same block that signaled it
 		assert!(
 			authorities
-				.apply_forced_changes("hash_a", 5, &static_is_descendent_of(false), false)
+				.apply_forced_changes("hash_a", 5, &static_is_descendent_of(false), false, None)
 				.unwrap()
 				.is_some()
 		);
@@ -1269,27 +1288,27 @@ mod tests {
 		// the forced change cannot be applied since the pending changes it depends on
 		// have not been applied yet.
 		assert!(matches!(
-			authorities.apply_forced_changes("hash_d45", 45, &static_is_descendent_of(true), false),
+			authorities.apply_forced_changes("hash_d45", 45, &static_is_descendent_of(true), false, None),
 			Err(Error::ForcedAuthoritySetChangeDependencyUnsatisfied(15))
 		));
 		assert_eq!(authorities.authority_set_changes, AuthoritySetChanges::empty());
 
 		// we apply the first pending standard change at #15
 		authorities
-			.apply_standard_changes("hash_a15", 15, &static_is_descendent_of(true), false)
+			.apply_standard_changes("hash_a15", 15, &static_is_descendent_of(true), false, None)
 			.unwrap();
 		assert_eq!(authorities.authority_set_changes, AuthoritySetChanges(vec![(0, 15)]));
 
 		// but the forced change still depends on the next standard change
 		assert!(matches!(
-			authorities.apply_forced_changes("hash_d", 45, &static_is_descendent_of(true), false),
+			authorities.apply_forced_changes("hash_d", 45, &static_is_descendent_of(true), false, None),
 			Err(Error::ForcedAuthoritySetChangeDependencyUnsatisfied(20))
 		));
 		assert_eq!(authorities.authority_set_changes, AuthoritySetChanges(vec![(0, 15)]));
 
 		// we apply the pending standard change at #20
 		authorities
-			.apply_standard_changes("hash_b", 20, &static_is_descendent_of(true), false)
+			.apply_standard_changes("hash_b", 20, &static_is_descendent_of(true), false, None)
 			.unwrap();
 		assert_eq!(authorities.authority_set_changes, AuthoritySetChanges(vec![(0, 15), (1, 20)]));
 
@@ -1298,7 +1317,7 @@ mod tests {
 		// at #35. subsequent forced changes on the same branch must be kept
 		assert_eq!(
 			authorities
-				.apply_forced_changes("hash_d", 45, &static_is_descendent_of(true), false)
+				.apply_forced_changes("hash_d", 45, &static_is_descendent_of(true), false, None)
 				.unwrap()
 				.unwrap(),
 			(
@@ -1395,7 +1414,7 @@ mod tests {
 
 		// we apply the change at A0 which should prune it and the fork at B
 		authorities
-			.apply_standard_changes("hash_a0", 5, &is_descendent_of, false)
+			.apply_standard_changes("hash_a0", 5, &is_descendent_of, false, None)
 			.unwrap();
 
 		// the next change is now at A1 (#10)
@@ -1583,14 +1602,14 @@ mod tests {
 		// applying the standard change at A should not prune anything
 		// other then the change that was applied
 		authorities
-			.apply_standard_changes("A", 5, &is_descendent_of, false)
+			.apply_standard_changes("A", 5, &is_descendent_of, false, None)
 			.unwrap();
 
 		assert_eq!(authorities.pending_changes().count(), 6);
 
 		// same for B
 		authorities
-			.apply_standard_changes("B", 10, &is_descendent_of, false)
+			.apply_standard_changes("B", 10, &is_descendent_of, false, None)
 			.unwrap();
 
 		assert_eq!(authorities.pending_changes().count(), 5);
@@ -1599,7 +1618,7 @@ mod tests {
 
 		// finalizing C2 should clear all forced changes
 		authorities
-			.apply_standard_changes("C2", 15, &is_descendent_of, false)
+			.apply_standard_changes("C2", 15, &is_descendent_of, false, None)
 			.unwrap();
 
 		assert_eq!(authorities.pending_forced_changes.len(), 0);
@@ -1607,7 +1626,7 @@ mod tests {
 		// finalizing C0 should clear all forced changes but D
 		let mut authorities = authorities2;
 		authorities
-			.apply_standard_changes("C0", 15, &is_descendent_of, false)
+			.apply_standard_changes("C0", 15, &is_descendent_of, false, None)
 			.unwrap();
 
 		assert_eq!(authorities.pending_forced_changes.len(), 1);
diff --git a/client/finality-grandpa/src/aux_schema.rs b/client/finality-grandpa/src/aux_schema.rs
index 1ce3c7999f24..43c45b9f10ae 100644
--- a/client/finality-grandpa/src/aux_schema.rs
+++ b/client/finality-grandpa/src/aux_schema.rs
@@ -137,7 +137,7 @@ struct V2AuthoritySet<H, N> {
 }
 
 pub(crate) fn load_decode<B: AuxStore, T: Decode>(
-	backend: &B, 
+	backend: &B,
 	key: &[u8]
 ) -> ClientResult<Option<T>> {
 	match backend.get_aux(key)? {
diff --git a/client/finality-grandpa/src/communication/gossip.rs b/client/finality-grandpa/src/communication/gossip.rs
index 9f5582e5cea6..a6c51f7eeee7 100644
--- a/client/finality-grandpa/src/communication/gossip.rs
+++ b/client/finality-grandpa/src/communication/gossip.rs
@@ -90,7 +90,7 @@ use sc_network::{ObservedRole, PeerId, ReputationChange};
 use parity_scale_codec::{Encode, Decode};
 use sp_finality_grandpa::AuthorityId;
 
-use sc_telemetry::{telemetry, CONSENSUS_DEBUG};
+use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_DEBUG};
 use log::{trace, debug};
 use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use prometheus_endpoint::{CounterVec, Opts, PrometheusError, register, Registry, U64};
@@ -744,7 +744,7 @@ impl<Block: BlockT> Inner<Block> {
 	fn note_set(&mut self, set_id: SetId, authorities: Vec<AuthorityId>) -> MaybeMessage<Block> {
 		{
 			let local_view = match self.local_view {
- 				ref mut x @ None => x.get_or_insert(LocalView::new(
+				ref mut x @ None => x.get_or_insert(LocalView::new(
 					set_id,
 					Round(1),
 				)),
@@ -828,7 +828,12 @@ impl<Block: BlockT> Inner<Block> {
 		// ensure authority is part of the set.
 		if !self.authorities.contains(&full.message.id) {
 			debug!(target: "afg", "Message from unknown voter: {}", full.message.id);
-			telemetry!(CONSENSUS_DEBUG; "afg.bad_msg_signature"; "signature" => ?full.message.id);
+			telemetry!(
+				self.config.telemetry;
+				CONSENSUS_DEBUG;
+				"afg.bad_msg_signature";
+				"signature" => ?full.message.id,
+			);
 			return Action::Discard(cost::UNKNOWN_VOTER);
 		}
 
@@ -840,7 +845,12 @@ impl<Block: BlockT> Inner<Block> {
 			full.set_id.0,
 		) {
 			debug!(target: "afg", "Bad message signature {}", full.message.id);
-			telemetry!(CONSENSUS_DEBUG; "afg.bad_msg_signature"; "signature" => ?full.message.id);
+			telemetry!(
+				self.config.telemetry;
+				CONSENSUS_DEBUG;
+				"afg.bad_msg_signature";
+				"signature" => ?full.message.id,
+			);
 			return Action::Discard(cost::BAD_SIGNATURE);
 		}
 
@@ -866,7 +876,10 @@ impl<Block: BlockT> Inner<Block> {
 
 		if full.message.precommits.len() != full.message.auth_data.len() || full.message.precommits.is_empty() {
 			debug!(target: "afg", "Malformed compact commit");
-			telemetry!(CONSENSUS_DEBUG; "afg.malformed_compact_commit";
+			telemetry!(
+				self.config.telemetry;
+				CONSENSUS_DEBUG;
+				"afg.malformed_compact_commit";
 				"precommits_len" => ?full.message.precommits.len(),
 				"auth_data_len" => ?full.message.auth_data.len(),
 				"precommits_is_empty" => ?full.message.precommits.is_empty(),
@@ -1277,6 +1290,7 @@ pub(super) struct GossipValidator<Block: BlockT> {
 	set_state: environment::SharedVoterSetState<Block>,
 	report_sender: TracingUnboundedSender<PeerReport>,
 	metrics: Option<Metrics>,
+	telemetry: Option<TelemetryHandle>,
 }
 
 impl<Block: BlockT> GossipValidator<Block> {
@@ -1287,6 +1301,7 @@ impl<Block: BlockT> GossipValidator<Block> {
 		config: crate::Config,
 		set_state: environment::SharedVoterSetState<Block>,
 		prometheus_registry: Option<&Registry>,
+		telemetry: Option<TelemetryHandle>,
 	) -> (GossipValidator<Block>, TracingUnboundedReceiver<PeerReport>)	{
 		let metrics = match prometheus_registry.map(Metrics::register) {
 			Some(Ok(metrics)) => Some(metrics),
@@ -1303,6 +1318,7 @@ impl<Block: BlockT> GossipValidator<Block> {
 			set_state,
 			report_sender: tx,
 			metrics,
+			telemetry,
 		};
 
 		(val, rx)
@@ -1411,7 +1427,12 @@ impl<Block: BlockT> GossipValidator<Block> {
 				Err(e) => {
 					message_name = None;
 					debug!(target: "afg", "Error decoding message: {}", e);
-					telemetry!(CONSENSUS_DEBUG; "afg.err_decoding_msg"; "" => "");
+					telemetry!(
+						self.telemetry;
+						CONSENSUS_DEBUG;
+						"afg.err_decoding_msg";
+						"" => "",
+					);
 
 					let len = std::cmp::min(i32::max_value() as usize, data.len()) as i32;
 					Action::Discard(Misbehavior::UndecodablePacket(len).cost())
@@ -1630,6 +1651,7 @@ mod tests {
 			name: None,
 			is_authority: true,
 			observer_enabled: true,
+			telemetry: None,
 		}
 	}
 
@@ -1797,6 +1819,7 @@ mod tests {
 			config(),
 			voter_set_state(),
 			None,
+			None,
 		);
 
 		let set_id = 1;
@@ -1833,6 +1856,7 @@ mod tests {
 			config(),
 			voter_set_state(),
 			None,
+			None,
 		);
 		let set_id = 1;
 		let auth = AuthorityId::from_slice(&[1u8; 32]);
@@ -1878,6 +1902,7 @@ mod tests {
 			config(),
 			voter_set_state(),
 			None,
+			None,
 		);
 
 		let set_id = 1;
@@ -1947,6 +1972,7 @@ mod tests {
 			config(),
 			set_state.clone(),
 			None,
+			None,
 		);
 
 		let set_id = 1;
@@ -2002,6 +2028,7 @@ mod tests {
 			config(),
 			set_state.clone(),
 			None,
+			None,
 		);
 
 		// the validator starts at set id 2
@@ -2082,6 +2109,7 @@ mod tests {
 			config(),
 			voter_set_state(),
 			None,
+			None,
 		);
 
 		// the validator starts at set id 1.
@@ -2156,6 +2184,7 @@ mod tests {
 			config,
 			voter_set_state(),
 			None,
+			None,
 		);
 
 		// the validator starts at set id 1.
@@ -2190,6 +2219,7 @@ mod tests {
 			config(),
 			voter_set_state(),
 			None,
+			None,
 		);
 
 		// the validator starts at set id 1.
@@ -2250,6 +2280,7 @@ mod tests {
 			config,
 			voter_set_state(),
 			None,
+			None,
 		);
 
 		// the validator starts at set id 1.
@@ -2289,6 +2320,7 @@ mod tests {
 			config(),
 			voter_set_state(),
 			None,
+			None,
 		);
 
 		// the validator starts at set id 1.
@@ -2322,6 +2354,7 @@ mod tests {
 			config,
 			voter_set_state(),
 			None,
+			None,
 		);
 
 		// the validator start at set id 0
@@ -2401,6 +2434,7 @@ mod tests {
 			config(),
 			voter_set_state(),
 			None,
+			None,
 		);
 
 		// the validator start at set id 0
@@ -2441,6 +2475,7 @@ mod tests {
 			config,
 			voter_set_state(),
 			None,
+			None,
 		);
 
 		// the validator start at set id 0
@@ -2490,7 +2525,7 @@ mod tests {
 
 	#[test]
 	fn only_gossip_commits_to_peers_on_same_set() {
-		let (val, _) = GossipValidator::<Block>::new(config(), voter_set_state(), None);
+		let (val, _) = GossipValidator::<Block>::new(config(), voter_set_state(), None, None);
 
 		// the validator start at set id 1
 		val.note_set(SetId(1), Vec::new(), |_, _| {});
@@ -2568,7 +2603,7 @@ mod tests {
 
 	#[test]
 	fn expire_commits_from_older_rounds() {
-		let (val, _) = GossipValidator::<Block>::new(config(), voter_set_state(), None);
+		let (val, _) = GossipValidator::<Block>::new(config(), voter_set_state(), None, None);
 
 		let commit = |round, set_id, target_number| {
 			let commit = finality_grandpa::CompactCommit {
@@ -2619,7 +2654,7 @@ mod tests {
 
 	#[test]
 	fn allow_noting_different_authorities_for_same_set() {
-		let (val, _) = GossipValidator::<Block>::new(config(), voter_set_state(), None);
+		let (val, _) = GossipValidator::<Block>::new(config(), voter_set_state(), None, None);
 
 		let a1 = vec![AuthorityId::from_slice(&[0; 32])];
 		val.note_set(SetId(1), a1.clone(), |_, _| {});
diff --git a/client/finality-grandpa/src/communication/mod.rs b/client/finality-grandpa/src/communication/mod.rs
index d502741465d2..0d287cc96e53 100644
--- a/client/finality-grandpa/src/communication/mod.rs
+++ b/client/finality-grandpa/src/communication/mod.rs
@@ -42,7 +42,7 @@ use sc_network::{NetworkService, ReputationChange};
 use sc_network_gossip::{GossipEngine, Network as GossipNetwork};
 use parity_scale_codec::{Encode, Decode};
 use sp_runtime::traits::{Block as BlockT, Hash as HashT, Header as HeaderT, NumberFor};
-use sc_telemetry::{telemetry, CONSENSUS_DEBUG, CONSENSUS_INFO};
+use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_DEBUG, CONSENSUS_INFO};
 
 use crate::{
 	CatchUp, Commit, CommunicationIn, CommunicationOutH,
@@ -192,6 +192,8 @@ pub(crate) struct NetworkBridge<B: BlockT, N: Network<B>> {
 	// just an `UnboundedReceiver`, one could also switch to a multi-producer-*multi*-consumer
 	// channel implementation.
 	gossip_validator_report_stream: Arc<Mutex<TracingUnboundedReceiver<PeerReport>>>,
+
+	telemetry: Option<TelemetryHandle>,
 }
 
 impl<B: BlockT, N: Network<B>> Unpin for NetworkBridge<B, N> {}
@@ -206,11 +208,13 @@ impl<B: BlockT, N: Network<B>> NetworkBridge<B, N> {
 		config: crate::Config,
 		set_state: crate::environment::SharedVoterSetState<B>,
 		prometheus_registry: Option<&Registry>,
+		telemetry: Option<TelemetryHandle>,
 	) -> Self {
 		let (validator, report_stream) = GossipValidator::new(
 			config,
 			set_state.clone(),
 			prometheus_registry,
+			telemetry.clone(),
 		);
 
 		let validator = Arc::new(validator);
@@ -268,6 +272,7 @@ impl<B: BlockT, N: Network<B>> NetworkBridge<B, N> {
 			neighbor_sender: neighbor_packet_sender,
 			neighbor_packet_worker: Arc::new(Mutex::new(neighbor_packet_worker)),
 			gossip_validator_report_stream: Arc::new(Mutex::new(report_stream)),
+			telemetry,
 		}
 	}
 
@@ -320,6 +325,7 @@ impl<B: BlockT, N: Network<B>> NetworkBridge<B, N> {
 		});
 
 		let topic = round_topic::<B>(round.0, set_id.0);
+		let telemetry = self.telemetry.clone();
 		let incoming = self.gossip_engine.lock().messages_for(topic)
 			.filter_map(move |notification| {
 				let decoded = GossipMessage::<B>::decode(&mut &notification.message[..]);
@@ -339,21 +345,30 @@ impl<B: BlockT, N: Network<B>> NetworkBridge<B, N> {
 						if voters.len().get() <= TELEMETRY_VOTERS_LIMIT {
 							match &msg.message.message {
 								PrimaryPropose(propose) => {
-									telemetry!(CONSENSUS_INFO; "afg.received_propose";
+									telemetry!(
+										telemetry;
+										CONSENSUS_INFO;
+										"afg.received_propose";
 										"voter" => ?format!("{}", msg.message.id),
 										"target_number" => ?propose.target_number,
 										"target_hash" => ?propose.target_hash,
 									);
 								},
 								Prevote(prevote) => {
-									telemetry!(CONSENSUS_INFO; "afg.received_prevote";
+									telemetry!(
+										telemetry;
+										CONSENSUS_INFO;
+										"afg.received_prevote";
 										"voter" => ?format!("{}", msg.message.id),
 										"target_number" => ?prevote.target_number,
 										"target_hash" => ?prevote.target_hash,
 									);
 								},
 								Precommit(precommit) => {
-									telemetry!(CONSENSUS_INFO; "afg.received_precommit";
+									telemetry!(
+										telemetry;
+										CONSENSUS_INFO;
+										"afg.received_precommit";
 										"voter" => ?format!("{}", msg.message.id),
 										"target_number" => ?precommit.target_number,
 										"target_hash" => ?precommit.target_hash,
@@ -379,6 +394,7 @@ impl<B: BlockT, N: Network<B>> NetworkBridge<B, N> {
 			network: self.gossip_engine.clone(),
 			sender: tx,
 			has_voted,
+			telemetry: self.telemetry.clone(),
 		};
 
 		// Combine incoming votes from external GRANDPA nodes with outgoing
@@ -412,6 +428,7 @@ impl<B: BlockT, N: Network<B>> NetworkBridge<B, N> {
 			voters,
 			self.validator.clone(),
 			self.neighbor_sender.clone(),
+			self.telemetry.clone(),
 		);
 
 		let outgoing = CommitsOut::<B>::new(
@@ -420,6 +437,7 @@ impl<B: BlockT, N: Network<B>> NetworkBridge<B, N> {
 			is_voter,
 			self.validator.clone(),
 			self.neighbor_sender.clone(),
+			self.telemetry.clone(),
 		);
 
 		let outgoing = outgoing.with(|out| {
@@ -491,72 +509,80 @@ fn incoming_global<B: BlockT>(
 	voters: Arc<VoterSet<AuthorityId>>,
 	gossip_validator: Arc<GossipValidator<B>>,
 	neighbor_sender: periodic::NeighborPacketSender<B>,
+	telemetry: Option<TelemetryHandle>,
 ) -> impl Stream<Item = CommunicationIn<B>> {
-	let process_commit = move |
-		msg: FullCommitMessage<B>,
-		mut notification: sc_network_gossip::TopicNotification,
-		gossip_engine: &Arc<Mutex<GossipEngine<B>>>,
-		gossip_validator: &Arc<GossipValidator<B>>,
-		voters: &VoterSet<AuthorityId>,
-	| {
-		if voters.len().get() <= TELEMETRY_VOTERS_LIMIT {
-			let precommits_signed_by: Vec<String> =
-				msg.message.auth_data.iter().map(move |(_, a)| {
-					format!("{}", a)
-				}).collect();
-
-			telemetry!(CONSENSUS_INFO; "afg.received_commit";
-				"contains_precommits_signed_by" => ?precommits_signed_by,
-				"target_number" => ?msg.message.target_number.clone(),
-				"target_hash" => ?msg.message.target_hash.clone(),
-			);
-		}
-
-		if let Err(cost) = check_compact_commit::<B>(
-			&msg.message,
-			voters,
-			msg.round,
-			msg.set_id,
-		) {
-			if let Some(who) = notification.sender {
-				gossip_engine.lock().report(who, cost);
+	let process_commit = {
+		let telemetry = telemetry.clone();
+		move |
+			msg: FullCommitMessage<B>,
+			mut notification: sc_network_gossip::TopicNotification,
+			gossip_engine: &Arc<Mutex<GossipEngine<B>>>,
+			gossip_validator: &Arc<GossipValidator<B>>,
+			voters: &VoterSet<AuthorityId>,
+		| {
+			if voters.len().get() <= TELEMETRY_VOTERS_LIMIT {
+				let precommits_signed_by: Vec<String> =
+					msg.message.auth_data.iter().map(move |(_, a)| {
+						format!("{}", a)
+					}).collect();
+
+				telemetry!(
+					telemetry;
+					CONSENSUS_INFO;
+					"afg.received_commit";
+					"contains_precommits_signed_by" => ?precommits_signed_by,
+					"target_number" => ?msg.message.target_number.clone(),
+					"target_hash" => ?msg.message.target_hash.clone(),
+				);
 			}
 
-			return None;
-		}
-
-		let round = msg.round;
-		let set_id = msg.set_id;
-		let commit = msg.message;
-		let finalized_number = commit.target_number;
-		let gossip_validator = gossip_validator.clone();
-		let gossip_engine = gossip_engine.clone();
-		let neighbor_sender = neighbor_sender.clone();
-		let cb = move |outcome| match outcome {
-			voter::CommitProcessingOutcome::Good(_) => {
-				// if it checks out, gossip it. not accounting for
-				// any discrepancy between the actual ghost and the claimed
-				// finalized number.
-				gossip_validator.note_commit_finalized(
-					round,
-					set_id,
-					finalized_number,
-					|to, neighbor| neighbor_sender.send(to, neighbor),
-				);
+			if let Err(cost) = check_compact_commit::<B>(
+				&msg.message,
+				voters,
+				msg.round,
+				msg.set_id,
+				telemetry.as_ref(),
+			) {
+				if let Some(who) = notification.sender {
+					gossip_engine.lock().report(who, cost);
+				}
 
-				gossip_engine.lock().gossip_message(topic, notification.message.clone(), false);
+				return None;
 			}
-			voter::CommitProcessingOutcome::Bad(_) => {
-				// report peer and do not gossip.
-				if let Some(who) = notification.sender.take() {
-					gossip_engine.lock().report(who, cost::INVALID_COMMIT);
+
+			let round = msg.round;
+			let set_id = msg.set_id;
+			let commit = msg.message;
+			let finalized_number = commit.target_number;
+			let gossip_validator = gossip_validator.clone();
+			let gossip_engine = gossip_engine.clone();
+			let neighbor_sender = neighbor_sender.clone();
+			let cb = move |outcome| match outcome {
+				voter::CommitProcessingOutcome::Good(_) => {
+					// if it checks out, gossip it. not accounting for
+					// any discrepancy between the actual ghost and the claimed
+					// finalized number.
+					gossip_validator.note_commit_finalized(
+						round,
+						set_id,
+						finalized_number,
+						|to, neighbor| neighbor_sender.send(to, neighbor),
+					);
+
+					gossip_engine.lock().gossip_message(topic, notification.message.clone(), false);
 				}
-			}
-		};
+				voter::CommitProcessingOutcome::Bad(_) => {
+					// report peer and do not gossip.
+					if let Some(who) = notification.sender.take() {
+						gossip_engine.lock().report(who, cost::INVALID_COMMIT);
+					}
+				}
+			};
 
-		let cb = voter::Callback::Work(Box::new(cb));
+			let cb = voter::Callback::Work(Box::new(cb));
 
-		Some(voter::CommunicationIn::Commit(round.0, commit, cb))
+			Some(voter::CommunicationIn::Commit(round.0, commit, cb))
+		}
 	};
 
 	let process_catch_up = move |
@@ -573,6 +599,7 @@ fn incoming_global<B: BlockT>(
 			&msg.message,
 			voters,
 			msg.set_id,
+			telemetry.clone(),
 		) {
 			if let Some(who) = notification.sender {
 				gossip_engine.lock().report(who, cost);
@@ -629,6 +656,7 @@ impl<B: BlockT, N: Network<B>> Clone for NetworkBridge<B, N> {
 			neighbor_sender: self.neighbor_sender.clone(),
 			neighbor_packet_worker: self.neighbor_packet_worker.clone(),
 			gossip_validator_report_stream: self.gossip_validator_report_stream.clone(),
+			telemetry: self.telemetry.clone(),
 		}
 	}
 }
@@ -655,6 +683,7 @@ pub(crate) struct OutgoingMessages<Block: BlockT> {
 	sender: mpsc::Sender<SignedMessage<Block>>,
 	network: Arc<Mutex<GossipEngine<Block>>>,
 	has_voted: HasVoted<Block>,
+	telemetry: Option<TelemetryHandle>,
 }
 
 impl<B: BlockT> Unpin for OutgoingMessages<B> {}
@@ -717,7 +746,9 @@ impl<Block: BlockT> Sink<Message<Block>> for OutgoingMessages<Block>
 			);
 
 			telemetry!(
-				CONSENSUS_DEBUG; "afg.announcing_blocks_to_voted_peers";
+				self.telemetry;
+				CONSENSUS_DEBUG;
+				"afg.announcing_blocks_to_voted_peers";
 				"block" => ?target_hash, "round" => ?self.round, "set_id" => ?self.set_id,
 			);
 
@@ -756,6 +787,7 @@ fn check_compact_commit<Block: BlockT>(
 	voters: &VoterSet<AuthorityId>,
 	round: Round,
 	set_id: SetId,
+	telemetry: Option<&TelemetryHandle>,
 ) -> Result<(), ReputationChange> {
 	// 4f + 1 = equivocations from f voters.
 	let f = voters.total_weight() - voters.threshold();
@@ -797,7 +829,12 @@ fn check_compact_commit<Block: BlockT>(
 			&mut buf,
 		) {
 			debug!(target: "afg", "Bad commit message signature {}", id);
-			telemetry!(CONSENSUS_DEBUG; "afg.bad_commit_msg_signature"; "id" => ?id);
+			telemetry!(
+				telemetry;
+				CONSENSUS_DEBUG;
+				"afg.bad_commit_msg_signature";
+				"id" => ?id,
+			);
 			let cost = Misbehavior::BadCommitMessage {
 				signatures_checked: i as i32,
 				blocks_loaded: 0,
@@ -817,6 +854,7 @@ fn check_catch_up<Block: BlockT>(
 	msg: &CatchUp<Block>,
 	voters: &VoterSet<AuthorityId>,
 	set_id: SetId,
+	telemetry: Option<TelemetryHandle>,
 ) -> Result<(), ReputationChange> {
 	// 4f + 1 = equivocations from f voters.
 	let f = voters.total_weight() - voters.threshold();
@@ -867,6 +905,7 @@ fn check_catch_up<Block: BlockT>(
 		set_id: SetIdNumber,
 		mut signatures_checked: usize,
 		buf: &mut Vec<u8>,
+		telemetry: Option<TelemetryHandle>,
 	) -> Result<usize, ReputationChange> where
 		B: BlockT,
 		I: Iterator<Item=(Message<B>, &'a AuthorityId, &'a AuthoritySignature)>,
@@ -885,7 +924,12 @@ fn check_catch_up<Block: BlockT>(
 				buf,
 			) {
 				debug!(target: "afg", "Bad catch up message signature {}", id);
-				telemetry!(CONSENSUS_DEBUG; "afg.bad_catch_up_msg_signature"; "id" => ?id);
+				telemetry!(
+					telemetry;
+					CONSENSUS_DEBUG;
+					"afg.bad_catch_up_msg_signature";
+					"id" => ?id,
+				);
 
 				let cost = Misbehavior::BadCatchUpMessage {
 					signatures_checked: signatures_checked as i32,
@@ -909,6 +953,7 @@ fn check_catch_up<Block: BlockT>(
 		set_id.0,
 		0,
 		&mut buf,
+		telemetry.clone(),
 	)?;
 
 	// check signatures on all contained precommits.
@@ -920,6 +965,7 @@ fn check_catch_up<Block: BlockT>(
 		set_id.0,
 		signatures_checked,
 		&mut buf,
+		telemetry,
 	)?;
 
 	Ok(())
@@ -932,6 +978,7 @@ struct CommitsOut<Block: BlockT> {
 	is_voter: bool,
 	gossip_validator: Arc<GossipValidator<Block>>,
 	neighbor_sender: periodic::NeighborPacketSender<Block>,
+	telemetry: Option<TelemetryHandle>,
 }
 
 impl<Block: BlockT> CommitsOut<Block> {
@@ -942,6 +989,7 @@ impl<Block: BlockT> CommitsOut<Block> {
 		is_voter: bool,
 		gossip_validator: Arc<GossipValidator<Block>>,
 		neighbor_sender: periodic::NeighborPacketSender<Block>,
+		telemetry: Option<TelemetryHandle>,
 	) -> Self {
 		CommitsOut {
 			network,
@@ -949,6 +997,7 @@ impl<Block: BlockT> CommitsOut<Block> {
 			is_voter,
 			gossip_validator,
 			neighbor_sender,
+			telemetry,
 		}
 	}
 }
@@ -968,8 +1017,12 @@ impl<Block: BlockT> Sink<(RoundNumber, Commit<Block>)> for CommitsOut<Block> {
 		let (round, commit) = input;
 		let round = Round(round);
 
-		telemetry!(CONSENSUS_DEBUG; "afg.commit_issued";
-			"target_number" => ?commit.target_number, "target_hash" => ?commit.target_hash,
+		telemetry!(
+			self.telemetry;
+			CONSENSUS_DEBUG;
+			"afg.commit_issued";
+			"target_number" => ?commit.target_number,
+			"target_hash" => ?commit.target_hash,
 		);
 		let (precommits, auth_data) = commit.precommits.into_iter()
 			.map(|signed| (signed.precommit, (signed.signature, signed.id)))
diff --git a/client/finality-grandpa/src/communication/tests.rs b/client/finality-grandpa/src/communication/tests.rs
index 4abea991cec3..dc37a1615f41 100644
--- a/client/finality-grandpa/src/communication/tests.rs
+++ b/client/finality-grandpa/src/communication/tests.rs
@@ -139,6 +139,7 @@ fn config() -> crate::Config {
 		name: None,
 		is_authority: true,
 		observer_enabled: true,
+		telemetry: None,
 	}
 }
 
@@ -189,6 +190,7 @@ pub(crate) fn make_test_network() -> (
 		config(),
 		voter_set_state(),
 		None,
+		None,
 	);
 
 	(
diff --git a/client/finality-grandpa/src/environment.rs b/client/finality-grandpa/src/environment.rs
index 7925a674c298..5bb525549b18 100644
--- a/client/finality-grandpa/src/environment.rs
+++ b/client/finality-grandpa/src/environment.rs
@@ -39,7 +39,7 @@ use sp_runtime::generic::BlockId;
 use sp_runtime::traits::{
 	Block as BlockT, Header as HeaderT, NumberFor, Zero,
 };
-use sc_telemetry::{telemetry, CONSENSUS_DEBUG, CONSENSUS_INFO};
+use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_DEBUG, CONSENSUS_INFO};
 
 use crate::{
 	local_authority_id, CommandOrError, Commit, Config, Error, NewAuthoritySet, Precommit, Prevote,
@@ -445,6 +445,7 @@ pub(crate) struct Environment<Backend, Block: BlockT, C, N: NetworkT<Block>, SC,
 	pub(crate) voting_rule: VR,
 	pub(crate) metrics: Option<Metrics>,
 	pub(crate) justification_sender: Option<GrandpaJustificationSender<Block>>,
+	pub(crate) telemetry: Option<TelemetryHandle>,
 	pub(crate) _phantom: PhantomData<Backend>,
 }
 
@@ -891,7 +892,10 @@ where
 		};
 
 		let report_prevote_metrics = |prevote: &Prevote<Block>| {
-			telemetry!(CONSENSUS_DEBUG; "afg.prevote_issued";
+			telemetry!(
+				self.telemetry;
+				CONSENSUS_DEBUG;
+				"afg.prevote_issued";
 				"round" => round,
 				"target_number" => ?prevote.target_number,
 				"target_hash" => ?prevote.target_hash,
@@ -950,7 +954,10 @@ where
 		};
 
 		let report_precommit_metrics = |precommit: &Precommit<Block>| {
-			telemetry!(CONSENSUS_DEBUG; "afg.precommit_issued";
+			telemetry!(
+				self.telemetry;
+				CONSENSUS_DEBUG;
+				"afg.precommit_issued";
 				"round" => round,
 				"target_number" => ?precommit.target_number,
 				"target_hash" => ?precommit.target_hash,
@@ -1146,6 +1153,7 @@ where
 			(round, commit).into(),
 			false,
 			self.justification_sender.as_ref(),
+			self.telemetry.clone(),
 		)
 	}
 
@@ -1210,6 +1218,7 @@ pub(crate) fn finalize_block<BE, Block, Client>(
 	justification_or_commit: JustificationOrCommit<Block>,
 	initial_sync: bool,
 	justification_sender: Option<&GrandpaJustificationSender<Block>>,
+	telemetry: Option<TelemetryHandle>,
 ) -> Result<(), CommandOrError<Block::Hash, NumberFor<Block>>>
 where
 	Block: BlockT,
@@ -1245,6 +1254,7 @@ where
 			number,
 			&is_descendent_of::<Block, _>(&*client, None),
 			initial_sync,
+			None,
 		).map_err(|e| Error::Safety(e.to_string()))?;
 
 		// send a justification notification if a sender exists and in case of error log it.
@@ -1320,7 +1330,10 @@ where
 			warn!(target: "afg", "Error applying finality to block {:?}: {:?}", (hash, number), e);
 			e
 		})?;
-		telemetry!(CONSENSUS_INFO; "afg.finalized_blocks_up_to";
+		telemetry!(
+			telemetry;
+			CONSENSUS_INFO;
+			"afg.finalized_blocks_up_to";
 			"number" => ?number, "hash" => ?hash,
 		);
 
@@ -1340,7 +1353,10 @@ where
 				);
 			}
 
-			telemetry!(CONSENSUS_INFO; "afg.generating_new_authority_set";
+			telemetry!(
+				telemetry;
+				CONSENSUS_INFO;
+				"afg.generating_new_authority_set";
 				"number" => ?canon_number, "hash" => ?canon_hash,
 				"authorities" => ?set_ref.to_vec(),
 				"set_id" => ?new_id,
diff --git a/client/finality-grandpa/src/finality_proof.rs b/client/finality-grandpa/src/finality_proof.rs
index c88faa249892..b79b3190739d 100644
--- a/client/finality-grandpa/src/finality_proof.rs
+++ b/client/finality-grandpa/src/finality_proof.rs
@@ -247,9 +247,6 @@ where
 		.map_err(|_| ClientError::JustificationDecode)?;
 	justification.verify(current_set_id, &current_authorities)?;
 
-	use sc_telemetry::{telemetry, CONSENSUS_INFO};
-	telemetry!(CONSENSUS_INFO; "afg.finality_proof_ok";
-		"finalized_header_hash" => ?proof.block);
 	Ok(proof)
 }
 
diff --git a/client/finality-grandpa/src/import.rs b/client/finality-grandpa/src/import.rs
index 2c86319dd54a..22d7b7fd5bcc 100644
--- a/client/finality-grandpa/src/import.rs
+++ b/client/finality-grandpa/src/import.rs
@@ -24,6 +24,7 @@ use parking_lot::RwLockWriteGuard;
 
 use sp_blockchain::{BlockStatus, well_known_cache_keys};
 use sc_client_api::{backend::Backend, utils::is_descendent_of};
+use sc_telemetry::TelemetryHandle;
 use sp_utils::mpsc::TracingUnboundedSender;
 use sp_api::TransactionFor;
 
@@ -62,6 +63,7 @@ pub struct GrandpaBlockImport<Backend, Block: BlockT, Client, SC> {
 	send_voter_commands: TracingUnboundedSender<VoterCommand<Block::Hash, NumberFor<Block>>>,
 	authority_set_hard_forks: HashMap<Block::Hash, PendingChange<Block::Hash, NumberFor<Block>>>,
 	justification_sender: GrandpaJustificationSender<Block>,
+	telemetry: Option<TelemetryHandle>,
 	_phantom: PhantomData<Backend>,
 }
 
@@ -76,6 +78,7 @@ impl<Backend, Block: BlockT, Client, SC: Clone> Clone for
 			send_voter_commands: self.send_voter_commands.clone(),
 			authority_set_hard_forks: self.authority_set_hard_forks.clone(),
 			justification_sender: self.justification_sender.clone(),
+			telemetry: self.telemetry.clone(),
 			_phantom: PhantomData,
 		}
 	}
@@ -338,7 +341,13 @@ where
 		let applied_changes = {
 			let forced_change_set = guard
 				.as_mut()
-				.apply_forced_changes(hash, number, &is_descendent_of, initial_sync)
+				.apply_forced_changes(
+					hash,
+					number,
+					&is_descendent_of,
+					initial_sync,
+					self.telemetry.clone(),
+				)
 				.map_err(|e| ConsensusError::ClientImport(e.to_string()))
 				.map_err(ConsensusError::from)?;
 
@@ -355,8 +364,11 @@ where
 					let canon_hash =
 						self.inner.header(BlockId::Number(canon_number))
 							.map_err(|e| ConsensusError::ClientImport(e.to_string()))?
-							.expect("the given block number is less or equal than the current best finalized number; \
-									 current best finalized number must exist in chain; qed.")
+							.expect(
+								"the given block number is less or equal than the current best
+								finalized number; current best finalized number must exist in
+								chain; qed."
+							)
 							.hash();
 
 					NewAuthoritySet {
@@ -557,6 +569,7 @@ impl<Backend, Block: BlockT, Client, SC> GrandpaBlockImport<Backend, Block, Clie
 		send_voter_commands: TracingUnboundedSender<VoterCommand<Block::Hash, NumberFor<Block>>>,
 		authority_set_hard_forks: Vec<(SetId, PendingChange<Block::Hash, NumberFor<Block>>)>,
 		justification_sender: GrandpaJustificationSender<Block>,
+		telemetry: Option<TelemetryHandle>,
 	) -> GrandpaBlockImport<Backend, Block, Client, SC> {
 		// check for and apply any forced authority set hard fork that applies
 		// to the *current* authority set.
@@ -600,6 +613,7 @@ impl<Backend, Block: BlockT, Client, SC> GrandpaBlockImport<Backend, Block, Clie
 			send_voter_commands,
 			authority_set_hard_forks,
 			justification_sender,
+			telemetry,
 			_phantom: PhantomData,
 		}
 	}
@@ -644,6 +658,7 @@ where
 			justification.into(),
 			initial_sync,
 			Some(&self.justification_sender),
+			self.telemetry.clone(),
 		);
 
 		match result {
diff --git a/client/finality-grandpa/src/lib.rs b/client/finality-grandpa/src/lib.rs
index 809d11ebae20..c6c2a39674b8 100644
--- a/client/finality-grandpa/src/lib.rs
+++ b/client/finality-grandpa/src/lib.rs
@@ -79,7 +79,7 @@ use sp_core::{
 use sp_keystore::{SyncCryptoStorePtr, SyncCryptoStore};
 use sp_application_crypto::AppKey;
 use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver};
-use sc_telemetry::{telemetry, CONSENSUS_INFO, CONSENSUS_DEBUG};
+use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_INFO, CONSENSUS_DEBUG};
 use parking_lot::RwLock;
 
 use finality_grandpa::Error as GrandpaError;
@@ -270,6 +270,8 @@ pub struct Config {
 	pub name: Option<String>,
 	/// The keystore that manages the keys of this node.
 	pub keystore: Option<SyncCryptoStorePtr>,
+	/// TelemetryHandle instance.
+	pub telemetry: Option<TelemetryHandle>,
 }
 
 impl Config {
@@ -451,6 +453,7 @@ pub struct LinkHalf<Block: BlockT, C, SC> {
 	voter_commands_rx: TracingUnboundedReceiver<VoterCommand<Block::Hash, NumberFor<Block>>>,
 	justification_sender: GrandpaJustificationSender<Block>,
 	justification_stream: GrandpaJustificationStream<Block>,
+	telemetry: Option<TelemetryHandle>,
 }
 
 impl<Block: BlockT, C, SC> LinkHalf<Block, C, SC> {
@@ -501,6 +504,7 @@ pub fn block_import<BE, Block: BlockT, Client, SC>(
 	client: Arc<Client>,
 	genesis_authorities_provider: &dyn GenesisAuthoritySetProvider<Block>,
 	select_chain: SC,
+	telemetry: Option<TelemetryHandle>,
 ) -> Result<
 	(
 		GrandpaBlockImport<BE, Block, Client, SC>,
@@ -518,6 +522,7 @@ where
 		genesis_authorities_provider,
 		select_chain,
 		Default::default(),
+		telemetry,
 	)
 }
 
@@ -531,6 +536,7 @@ pub fn block_import_with_authority_set_hard_forks<BE, Block: BlockT, Client, SC>
 	genesis_authorities_provider: &dyn GenesisAuthoritySetProvider<Block>,
 	select_chain: SC,
 	authority_set_hard_forks: Vec<(SetId, (Block::Hash, NumberFor<Block>), AuthorityList)>,
+	telemetry: Option<TelemetryHandle>,
 ) -> Result<
 	(
 		GrandpaBlockImport<BE, Block, Client, SC>,
@@ -550,13 +556,19 @@ where
 		&*client,
 		genesis_hash,
 		<NumberFor<Block>>::zero(),
-		|| {
-			let authorities = genesis_authorities_provider.get()?;
-			telemetry!(CONSENSUS_DEBUG; "afg.loading_authorities";
-				"authorities_len" => ?authorities.len()
-			);
-			Ok(authorities)
-		}
+		{
+			let telemetry = telemetry.clone();
+			move || {
+				let authorities = genesis_authorities_provider.get()?;
+				telemetry!(
+					telemetry;
+					CONSENSUS_DEBUG;
+					"afg.loading_authorities";
+					"authorities_len" => ?authorities.len()
+				);
+				Ok(authorities)
+			}
+		},
 	)?;
 
 	let (voter_commands_tx, voter_commands_rx) = tracing_unbounded("mpsc_grandpa_voter_command");
@@ -590,6 +602,7 @@ where
 			voter_commands_tx,
 			authority_set_hard_forks,
 			justification_sender.clone(),
+			telemetry.clone(),
 		),
 		LinkHalf {
 			client,
@@ -598,6 +611,7 @@ where
 			voter_commands_rx,
 			justification_sender,
 			justification_stream,
+			telemetry,
 		},
 	))
 }
@@ -660,14 +674,14 @@ pub struct GrandpaParams<Block: BlockT, C, N, SC, VR> {
 	/// `sc_network` crate, it is assumed that the Grandpa notifications protocol has been passed
 	/// to the configuration of the networking. See [`grandpa_peers_set_config`].
 	pub network: N,
-	/// If supplied, can be used to hook on telemetry connection established events.
-	pub telemetry_on_connect: Option<TracingUnboundedReceiver<()>>,
 	/// A voting rule used to potentially restrict target votes.
 	pub voting_rule: VR,
 	/// The prometheus metrics registry.
 	pub prometheus_registry: Option<prometheus_endpoint::Registry>,
 	/// The voter state is exposed at an RPC endpoint.
 	pub shared_voter_state: SharedVoterState,
+	/// TelemetryHandle instance.
+	pub telemetry: Option<TelemetryHandle>,
 }
 
 /// Returns the configuration value to put in
@@ -706,10 +720,10 @@ where
 		mut config,
 		link,
 		network,
-		telemetry_on_connect,
 		voting_rule,
 		prometheus_registry,
 		shared_voter_state,
+		telemetry,
 	} = grandpa_params;
 
 	// NOTE: we have recently removed `run_grandpa_observer` from the public
@@ -725,6 +739,7 @@ where
 		voter_commands_rx,
 		justification_sender,
 		justification_stream: _,
+		telemetry: _,
 	} = link;
 
 	let network = NetworkBridge::new(
@@ -732,11 +747,16 @@ where
 		config.clone(),
 		persistent_data.set_state.clone(),
 		prometheus_registry.as_ref(),
+		telemetry.clone(),
 	);
 
 	let conf = config.clone();
-	let telemetry_task = if let Some(telemetry_on_connect) = telemetry_on_connect {
+	let telemetry_task = if let Some(telemetry_on_connect) = telemetry
+		.as_ref()
+		.map(|x| x.on_connect_stream())
+	{
 		let authorities = persistent_data.authority_set.clone();
+		let telemetry = telemetry.clone();
 		let events = telemetry_on_connect
 			.for_each(move |_| {
 				let current_authorities = authorities.current_authorities();
@@ -751,10 +771,13 @@ where
 
 				let authorities = serde_json::to_string(&authorities).expect(
 					"authorities is always at least an empty vector; \
-					 elements are always of type string",
+					elements are always of type string",
 				);
 
-				telemetry!(CONSENSUS_INFO; "afg.authority_set";
+				telemetry!(
+					telemetry;
+					CONSENSUS_INFO;
+					"afg.authority_set";
 					"authority_id" => authority_id.to_string(),
 					"authority_set_id" => ?set_id,
 					"authorities" => authorities,
@@ -778,6 +801,7 @@ where
 		prometheus_registry,
 		shared_voter_state,
 		justification_sender,
+		telemetry,
 	);
 
 	let voter_work = voter_work.map(|res| match res {
@@ -816,7 +840,7 @@ struct VoterWork<B, Block: BlockT, C, N: NetworkT<Block>, SC, VR> {
 	env: Arc<Environment<B, Block, C, N, SC, VR>>,
 	voter_commands_rx: TracingUnboundedReceiver<VoterCommand<Block::Hash, NumberFor<Block>>>,
 	network: NetworkBridge<Block, N>,
-
+	telemetry: Option<TelemetryHandle>,
 	/// Prometheus metrics.
 	metrics: Option<Metrics>,
 }
@@ -843,6 +867,7 @@ where
 		prometheus_registry: Option<prometheus_endpoint::Registry>,
 		shared_voter_state: SharedVoterState,
 		justification_sender: GrandpaJustificationSender<Block>,
+		telemetry: Option<TelemetryHandle>,
 	) -> Self {
 		let metrics = match prometheus_registry.as_ref().map(Metrics::register) {
 			Some(Ok(metrics)) => Some(metrics),
@@ -866,6 +891,7 @@ where
 			voter_set_state: persistent_data.set_state,
 			metrics: metrics.as_ref().map(|m| m.environment.clone()),
 			justification_sender: Some(justification_sender),
+			telemetry: telemetry.clone(),
 			_phantom: PhantomData,
 		});
 
@@ -877,6 +903,7 @@ where
 			env,
 			voter_commands_rx,
 			network,
+			telemetry,
 			metrics,
 		};
 		work.rebuild_voter();
@@ -892,7 +919,10 @@ where
 		let authority_id = local_authority_id(&self.env.voters, self.env.config.keystore.as_ref())
 			.unwrap_or_default();
 
-		telemetry!(CONSENSUS_DEBUG; "afg.starting_new_voter";
+		telemetry!(
+			self.telemetry;
+			CONSENSUS_DEBUG;
+			"afg.starting_new_voter";
 			"name" => ?self.env.config.name(),
 			"set_id" => ?self.env.set_id,
 			"authority_id" => authority_id.to_string(),
@@ -911,7 +941,10 @@ where
 			"authorities is always at least an empty vector; elements are always of type string",
 		);
 
-		telemetry!(CONSENSUS_INFO; "afg.authority_set";
+		telemetry!(
+			self.telemetry;
+			CONSENSUS_INFO;
+			"afg.authority_set";
 			"number" => ?chain_info.finalized_number,
 			"hash" => ?chain_info.finalized_hash,
 			"authority_id" => authority_id.to_string(),
@@ -971,7 +1004,10 @@ where
 				let voters: Vec<String> = new.authorities.iter().map(move |(a, _)| {
 					format!("{}", a)
 				}).collect();
-				telemetry!(CONSENSUS_INFO; "afg.voter_command_change_authorities";
+				telemetry!(
+					self.telemetry;
+					CONSENSUS_INFO;
+					"afg.voter_command_change_authorities";
 					"number" => ?new.canon_number,
 					"hash" => ?new.canon_hash,
 					"voters" => ?voters,
@@ -992,10 +1028,11 @@ where
 				})?;
 
 				let voters = Arc::new(VoterSet::new(new.authorities.into_iter())
-					.expect("new authorities come from pending change; \
-							 pending change comes from `AuthoritySet`; \
-							 `AuthoritySet` validates authorities is non-empty and weights are non-zero; \
-							 qed."
+					.expect(
+						"new authorities come from pending change; \
+						pending change comes from `AuthoritySet`; \
+						`AuthoritySet` validates authorities is non-empty and weights are non-zero; \
+						qed."
 					)
 				);
 
@@ -1011,6 +1048,7 @@ where
 					voting_rule: self.env.voting_rule.clone(),
 					metrics: self.env.metrics.clone(),
 					justification_sender: self.env.justification_sender.clone(),
+					telemetry: self.telemetry.clone(),
 					_phantom: PhantomData,
 				});
 
diff --git a/client/finality-grandpa/src/observer.rs b/client/finality-grandpa/src/observer.rs
index 3054a9df61c5..c0eab15e4f45 100644
--- a/client/finality-grandpa/src/observer.rs
+++ b/client/finality-grandpa/src/observer.rs
@@ -29,6 +29,7 @@ use log::{debug, info, warn};
 use sp_keystore::SyncCryptoStorePtr;
 use sp_consensus::SelectChain;
 use sc_client_api::backend::Backend;
+use sc_telemetry::TelemetryHandle;
 use sp_utils::mpsc::TracingUnboundedReceiver;
 use sp_runtime::traits::{NumberFor, Block as BlockT};
 use sp_blockchain::HeaderMetadata;
@@ -67,6 +68,7 @@ fn grandpa_observer<BE, Block: BlockT, Client, S, F>(
 	last_finalized_number: NumberFor<Block>,
 	commits: S,
 	note_round: F,
+	telemetry: Option<TelemetryHandle>,
 ) -> impl Future<Output = Result<(), CommandOrError<Block::Hash, NumberFor<Block>>>>
 where
 	NumberFor<Block>: BlockNumberOps,
@@ -121,6 +123,7 @@ where
 				(round, commit).into(),
 				false,
 				justification_sender.as_ref(),
+				telemetry.clone(),
 			) {
 				Ok(_) => {},
 				Err(e) => return future::err(e),
@@ -172,7 +175,8 @@ where
 		persistent_data,
 		voter_commands_rx,
 		justification_sender,
-		..
+		justification_stream: _,
+		telemetry,
 	} = link;
 
 	let network = NetworkBridge::new(
@@ -180,15 +184,17 @@ where
 		config.clone(),
 		persistent_data.set_state.clone(),
 		None,
+		telemetry.clone(),
 	);
 
 	let observer_work = ObserverWork::new(
-		client,
+		client.clone(),
 		network,
 		persistent_data,
 		config.keystore,
 		voter_commands_rx,
 		Some(justification_sender),
+		telemetry.clone(),
 	);
 
 	let observer_work = observer_work
@@ -210,6 +216,7 @@ struct ObserverWork<B: BlockT, BE, Client, N: NetworkT<B>> {
 	keystore: Option<SyncCryptoStorePtr>,
 	voter_commands_rx: TracingUnboundedReceiver<VoterCommand<B::Hash, NumberFor<B>>>,
 	justification_sender: Option<GrandpaJustificationSender<B>>,
+	telemetry: Option<TelemetryHandle>,
 	_phantom: PhantomData<BE>,
 }
 
@@ -228,6 +235,7 @@ where
 		keystore: Option<SyncCryptoStorePtr>,
 		voter_commands_rx: TracingUnboundedReceiver<VoterCommand<B::Hash, NumberFor<B>>>,
 		justification_sender: Option<GrandpaJustificationSender<B>>,
+		telemetry: Option<TelemetryHandle>,
 	) -> Self {
 
 		let mut work = ObserverWork {
@@ -240,6 +248,7 @@ where
 			keystore: keystore.clone(),
 			voter_commands_rx,
 			justification_sender,
+			telemetry,
 			_phantom: PhantomData,
 		};
 		work.rebuild_observer();
@@ -289,6 +298,7 @@ where
 			last_finalized_number,
 			global_in,
 			note_round,
+			self.telemetry.clone(),
 		);
 
 		self.observer = Box::pin(observer);
@@ -429,6 +439,7 @@ mod tests {
 			None,
 			voter_command_rx,
 			None,
+			None,
 		);
 
 		// Trigger a reputation change through the gossip validator.
diff --git a/client/finality-grandpa/src/tests.rs b/client/finality-grandpa/src/tests.rs
index 921b49db61c2..6824a8ed0427 100644
--- a/client/finality-grandpa/src/tests.rs
+++ b/client/finality-grandpa/src/tests.rs
@@ -120,6 +120,7 @@ impl TestNetFactory for GrandpaTestNet {
 					client.clone(),
 					&self.test_config,
 					LongestChain::new(backend.clone()),
+					None,
 				).expect("Could not create block import for fresh peer.");
 				let justification_import = Box::new(import.clone());
 				(
@@ -252,13 +253,14 @@ fn initialize_grandpa(
 				name: Some(format!("peer#{}", peer_id)),
 				is_authority: true,
 				observer_enabled: true,
+				telemetry: None,
 			},
 			link,
 			network: net_service,
-			telemetry_on_connect: None,
 			voting_rule: (),
 			prometheus_registry: None,
 			shared_voter_state: SharedVoterState::empty(),
+			telemetry: None,
 		};
 		let voter = run_grandpa_voter(grandpa_params).expect("all in order with client and network");
 
@@ -395,13 +397,14 @@ fn finalize_3_voters_1_full_observer() {
 				name: Some(format!("peer#{}", peer_id)),
 				is_authority: true,
 				observer_enabled: true,
+				telemetry: None,
 			},
 			link: link,
 			network: net_service,
-			telemetry_on_connect: None,
 			voting_rule: (),
 			prometheus_registry: None,
 			shared_voter_state: SharedVoterState::empty(),
+			telemetry: None,
 		};
 
 		run_grandpa_voter(grandpa_params).expect("all in order with client and network")
@@ -488,13 +491,14 @@ fn transition_3_voters_twice_1_full_observer() {
 				name: Some(format!("peer#{}", peer_id)),
 				is_authority: true,
 				observer_enabled: true,
+				telemetry: None,
 			},
 			link,
 			network: net_service,
-			telemetry_on_connect: None,
 			voting_rule: (),
 			prometheus_registry: None,
 			shared_voter_state: SharedVoterState::empty(),
+			telemetry: None,
 		};
 
 		voters.push(run_grandpa_voter(grandpa_params).expect("all in order with client and network"));
@@ -921,6 +925,7 @@ fn voter_persists_its_votes() {
 			name: Some(format!("peer#{}", 1)),
 			is_authority: true,
 			observer_enabled: true,
+			telemetry: None,
 		};
 
 		let set_state = {
@@ -939,6 +944,7 @@ fn voter_persists_its_votes() {
 			config.clone(),
 			set_state,
 			None,
+			None,
 		)
 	};
 
@@ -964,13 +970,14 @@ fn voter_persists_its_votes() {
 				name: Some(format!("peer#{}", 0)),
 				is_authority: true,
 				observer_enabled: true,
+				telemetry: None,
 			},
 			link,
 			network: net_service,
-			telemetry_on_connect: None,
 			voting_rule: VotingRulesBuilder::default().build(),
 			prometheus_registry: None,
 			shared_voter_state: SharedVoterState::empty(),
+			telemetry: None,
 		};
 
 		run_grandpa_voter(grandpa_params).expect("all in order with client and network")
@@ -1006,13 +1013,14 @@ fn voter_persists_its_votes() {
 				name: Some(format!("peer#{}", 0)),
 				is_authority: true,
 				observer_enabled: true,
+				telemetry: None,
 			},
 			link,
 			network: net_service,
-			telemetry_on_connect: None,
 			voting_rule: VotingRulesBuilder::default().build(),
 			prometheus_registry: None,
 			shared_voter_state: SharedVoterState::empty(),
+			telemetry: None,
 		};
 
 		run_grandpa_voter(grandpa_params)
@@ -1165,6 +1173,7 @@ fn finalize_3_voters_1_light_observer() {
 			name: Some("observer".to_string()),
 			is_authority: false,
 			observer_enabled: true,
+			telemetry: None,
 		},
 		net.peers[3].data.lock().take().expect("link initialized at startup; qed"),
 		net.peers[3].network_service().clone(),
@@ -1206,13 +1215,14 @@ fn voter_catches_up_to_latest_round_when_behind() {
 				name: Some(format!("peer#{}", peer_id)),
 				is_authority: true,
 				observer_enabled: true,
+				telemetry: None,
 			},
 			link,
 			network: net.lock().peer(peer_id).network_service().clone(),
-			telemetry_on_connect: None,
 			voting_rule: (),
 			prometheus_registry: None,
 			shared_voter_state: SharedVoterState::empty(),
+			telemetry: None,
 		};
 
 		Box::pin(run_grandpa_voter(grandpa_params).expect("all in order with client and network"))
@@ -1328,6 +1338,7 @@ where
 		name: None,
 		is_authority: true,
 		observer_enabled: true,
+		telemetry: None,
 	};
 
 	let network = NetworkBridge::new(
@@ -1335,6 +1346,7 @@ where
 		config.clone(),
 		set_state.clone(),
 		None,
+		None,
 	);
 
 	Environment {
@@ -1349,6 +1361,7 @@ where
 		voting_rule,
 		metrics: None,
 		justification_sender: None,
+		telemetry: None,
 		_phantom: PhantomData,
 	}
 }
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index c6119695ace7..d402564be727 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -91,5 +91,3 @@ grandpa = { version = "0.9.0", package = "sc-finality-grandpa", path = "../final
 grandpa-primitives = { version = "3.0.0", package = "sp-finality-grandpa", path = "../../primitives/finality-grandpa" }
 tokio = { version = "0.2.25", default-features = false }
 async-std = { version = "1.6.5", default-features = false }
-tracing-subscriber = "0.2.15"
-tracing-log = "0.1.1"
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index 8a5f63ab7b1d..2c8557a5456e 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -55,8 +55,8 @@ use wasm_timer::SystemTime;
 use sc_telemetry::{
 	telemetry,
 	ConnectionMessage,
-	TelemetryConnectionNotifier,
-	TelemetrySpan,
+	Telemetry,
+	TelemetryHandle,
 	SUBSTRATE_INFO,
 };
 use sp_transaction_pool::MaintainedTransactionPool;
@@ -213,17 +213,17 @@ pub type TLightClientWithBackend<TBl, TRtApi, TExecDisp, TBackend> = Client<
 >;
 
 trait AsCryptoStoreRef {
-    fn keystore_ref(&self) -> Arc<dyn CryptoStore>;
-    fn sync_keystore_ref(&self) -> Arc<dyn SyncCryptoStore>;
+	fn keystore_ref(&self) -> Arc<dyn CryptoStore>;
+	fn sync_keystore_ref(&self) -> Arc<dyn SyncCryptoStore>;
 }
 
 impl<T> AsCryptoStoreRef for Arc<T> where T: CryptoStore + SyncCryptoStore + 'static {
-    fn keystore_ref(&self) -> Arc<dyn CryptoStore> {
-        self.clone()
-    }
-    fn sync_keystore_ref(&self) -> Arc<dyn SyncCryptoStore> {
-        self.clone()
-    }
+	fn keystore_ref(&self) -> Arc<dyn CryptoStore> {
+		self.clone()
+	}
+	fn sync_keystore_ref(&self) -> Arc<dyn SyncCryptoStore> {
+		self.clone()
+	}
 }
 
 /// Construct and hold different layers of Keystore wrappers
@@ -291,16 +291,18 @@ impl KeystoreContainer {
 /// Creates a new full client for the given config.
 pub fn new_full_client<TBl, TRtApi, TExecDisp>(
 	config: &Configuration,
+	telemetry: Option<TelemetryHandle>,
 ) -> Result<TFullClient<TBl, TRtApi, TExecDisp>, Error> where
 	TBl: BlockT,
 	TExecDisp: NativeExecutionDispatch + 'static,
 {
-	new_full_parts(config).map(|parts| parts.0)
+	new_full_parts(config, telemetry).map(|parts| parts.0)
 }
 
 /// Create the initial parts of a full node.
 pub fn new_full_parts<TBl, TRtApi, TExecDisp>(
 	config: &Configuration,
+	telemetry: Option<TelemetryHandle>,
 ) -> Result<TFullParts<TBl, TRtApi, TExecDisp>,	Error> where
 	TBl: BlockT,
 	TExecDisp: NativeExecutionDispatch + 'static,
@@ -356,6 +358,7 @@ pub fn new_full_parts<TBl, TRtApi, TExecDisp>(
 			extensions,
 			Box::new(task_manager.spawn_handle()),
 			config.prometheus_config.as_ref().map(|config| config.registry.clone()),
+			telemetry,
 			ClientConfig {
 				offchain_worker_enabled : config.offchain_worker.enabled,
 				offchain_indexing_api: config.offchain_worker.indexing_enabled,
@@ -377,6 +380,7 @@ pub fn new_full_parts<TBl, TRtApi, TExecDisp>(
 /// Create the initial parts of a light node.
 pub fn new_light_parts<TBl, TRtApi, TExecDisp>(
 	config: &Configuration,
+	telemetry: Option<TelemetryHandle>,
 ) -> Result<TLightParts<TBl, TRtApi, TExecDisp>, Error> where
 	TBl: BlockT,
 	TExecDisp: NativeExecutionDispatch + 'static,
@@ -421,6 +425,7 @@ pub fn new_light_parts<TBl, TRtApi, TExecDisp>(
 		executor,
 		Box::new(task_manager.spawn_handle()),
 		config.prometheus_config.as_ref().map(|config| config.registry.clone()),
+		telemetry,
 	)?);
 
 	Ok((client, backend, keystore_container, task_manager, on_demand))
@@ -447,6 +452,7 @@ pub fn new_client<E, Block, RA>(
 	execution_extensions: ExecutionExtensions<Block>,
 	spawn_handle: Box<dyn SpawnNamed>,
 	prometheus_registry: Option<Registry>,
+	telemetry: Option<TelemetryHandle>,
 	config: ClientConfig,
 ) -> Result<
 	crate::client::Client<
@@ -470,6 +476,7 @@ pub fn new_client<E, Block, RA>(
 		bad_blocks,
 		execution_extensions,
 		prometheus_registry,
+		telemetry,
 		config,
 	)?)
 }
@@ -501,10 +508,8 @@ pub struct SpawnTasksParams<'a, TBl: BlockT, TCl, TExPool, TRpc, Backend> {
 	pub network_status_sinks: NetworkStatusSinks<TBl>,
 	/// A Sender for RPC requests.
 	pub system_rpc_tx: TracingUnboundedSender<sc_rpc::system::Request<TBl>>,
-	/// Telemetry span.
-	///
-	/// This span needs to be entered **before** calling [`spawn_tasks()`].
-	pub telemetry_span: Option<TelemetrySpan>,
+	/// Telemetry instance for this node.
+	pub telemetry: Option<&'a mut Telemetry>,
 }
 
 /// Build a shared offchain workers instance.
@@ -541,13 +546,12 @@ pub fn build_offchain_workers<TBl, TCl>(
 /// Spawn the tasks that are required to run a node.
 pub fn spawn_tasks<TBl, TBackend, TExPool, TRpc, TCl>(
 	params: SpawnTasksParams<TBl, TCl, TExPool, TRpc, TBackend>,
-) -> Result<(RpcHandlers, Option<TelemetryConnectionNotifier>), Error>
+) -> Result<RpcHandlers, Error>
 	where
 		TCl: ProvideRuntimeApi<TBl> + HeaderMetadata<TBl, Error=sp_blockchain::Error> + Chain<TBl> +
 		BlockBackend<TBl> + BlockIdTo<TBl, Error=sp_blockchain::Error> + ProofProvider<TBl> +
 		HeaderBackend<TBl> + BlockchainEvents<TBl> + ExecutorProvider<TBl> + UsageProvider<TBl> +
-		StorageProvider<TBl, TBackend> + CallApiAt<TBl> +
-		Send + 'static,
+		StorageProvider<TBl, TBackend> + CallApiAt<TBl> + Send + 'static,
 		<TCl as ProvideRuntimeApi<TBl>>::Api:
 			sp_api::Metadata<TBl> +
 			sc_offchain::OffchainWorkerApi<TBl> +
@@ -573,7 +577,7 @@ pub fn spawn_tasks<TBl, TBackend, TExPool, TRpc, TCl>(
 		network,
 		network_status_sinks,
 		system_rpc_tx,
-		telemetry_span,
+		telemetry,
 	} = params;
 
 	let chain_info = client.usage_info().chain;
@@ -584,12 +588,16 @@ pub fn spawn_tasks<TBl, TBackend, TExPool, TRpc, TCl>(
 		config.dev_key_seed.clone().map(|s| vec![s]).unwrap_or_default(),
 	).map_err(|e| Error::Application(Box::new(e)))?;
 
-	let telemetry_connection_notifier = init_telemetry(
-		&mut config,
-		telemetry_span,
-		network.clone(),
-		client.clone(),
-	);
+	let telemetry = telemetry
+		.map(|telemetry| {
+			init_telemetry(
+				&mut config,
+				network.clone(),
+				client.clone(),
+				telemetry,
+			)
+		})
+		.transpose()?;
 
 	info!("📦 Highest known block at #{}", chain_info.best_number);
 
@@ -603,7 +611,11 @@ pub fn spawn_tasks<TBl, TBackend, TExPool, TRpc, TCl>(
 
 	spawn_handle.spawn(
 		"on-transaction-imported",
-		transaction_notifications(transaction_pool.clone(), network.clone()),
+		transaction_notifications(
+			transaction_pool.clone(),
+			network.clone(),
+			telemetry.clone(),
+		),
 	);
 
 	// Prometheus metrics.
@@ -611,7 +623,7 @@ pub fn spawn_tasks<TBl, TBackend, TExPool, TRpc, TCl>(
 		config.prometheus_config.clone()
 	{
 		// Set static metrics.
-		let metrics = MetricsService::with_prometheus(&registry, &config)?;
+		let metrics = MetricsService::with_prometheus(telemetry.clone(), &registry, &config)?;
 		spawn_handle.spawn(
 			"prometheus-endpoint",
 			prometheus_endpoint::init_prometheus(port, registry).map(drop)
@@ -619,7 +631,7 @@ pub fn spawn_tasks<TBl, TBackend, TExPool, TRpc, TCl>(
 
 		metrics
 	} else {
-		MetricsService::new()
+		MetricsService::new(telemetry.clone())
 	};
 
 	// Periodically updated metrics and telemetry updates.
@@ -659,12 +671,13 @@ pub fn spawn_tasks<TBl, TBackend, TExPool, TRpc, TCl>(
 
 	task_manager.keep_alive((config.base_path, rpc, rpc_handlers.clone()));
 
-	Ok((rpc_handlers, telemetry_connection_notifier))
+	Ok(rpc_handlers)
 }
 
 async fn transaction_notifications<TBl, TExPool>(
 	transaction_pool: Arc<TExPool>,
 	network: Arc<NetworkService<TBl, <TBl as BlockT>::Hash>>,
+	telemetry: Option<TelemetryHandle>,
 )
 	where
 		TBl: BlockT,
@@ -676,9 +689,12 @@ async fn transaction_notifications<TBl, TExPool>(
 		.for_each(move |hash| {
 			network.propagate_transaction(hash);
 			let status = transaction_pool.status();
-			telemetry!(SUBSTRATE_INFO; "txpool.import";
+			telemetry!(
+				telemetry;
+				SUBSTRATE_INFO;
+				"txpool.import";
 				"ready" => status.ready,
-				"future" => status.future
+				"future" => status.future,
 			);
 			ready(())
 		})
@@ -687,12 +703,10 @@ async fn transaction_notifications<TBl, TExPool>(
 
 fn init_telemetry<TBl: BlockT, TCl: BlockBackend<TBl>>(
 	config: &mut Configuration,
-	telemetry_span: Option<TelemetrySpan>,
 	network: Arc<NetworkService<TBl, <TBl as BlockT>::Hash>>,
 	client: Arc<TCl>,
-) -> Option<TelemetryConnectionNotifier> {
-	let telemetry_span = telemetry_span?;
-	let endpoints = config.telemetry_endpoints.clone()?;
+	telemetry: &mut Telemetry,
+) -> sc_telemetry::Result<TelemetryHandle> {
 	let genesis_hash = client.block_hash(Zero::zero()).ok().flatten().unwrap_or_default();
 	let connection_message = ConnectionMessage {
 		name: config.network.node_name.to_owned(),
@@ -708,13 +722,9 @@ fn init_telemetry<TBl: BlockT, TCl: BlockBackend<TBl>>(
 		network_id: network.local_peer_id().to_base58(),
 	};
 
-	config.telemetry_handle
-		.as_mut()
-		.map(|handle| handle.start_telemetry(
-			telemetry_span,
-			endpoints,
-			connection_message,
-		))
+	telemetry.start_telemetry(connection_message)?;
+
+	Ok(telemetry.handle())
 }
 
 fn gen_handler<TBl, TBackend, TExPool, TRpc, TCl>(
diff --git a/client/service/src/client/call_executor.rs b/client/service/src/client/call_executor.rs
index 8c7ca645b0ff..176c68096e97 100644
--- a/client/service/src/client/call_executor.rs
+++ b/client/service/src/client/call_executor.rs
@@ -368,6 +368,7 @@ mod tests {
 			None,
 			Box::new(TaskExecutor::new()),
 			None,
+			None,
 			Default::default(),
 		).expect("Creates a client");
 
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index 6e9fdea0925f..07e8e005fa1a 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -35,7 +35,11 @@ use sp_core::{
 };
 #[cfg(feature="test-helpers")]
 use sp_keystore::SyncCryptoStorePtr;
-use sc_telemetry::{telemetry, SUBSTRATE_INFO};
+use sc_telemetry::{
+	telemetry,
+	TelemetryHandle,
+	SUBSTRATE_INFO,
+};
 use sp_runtime::{
 	Justification, BuildStorage,
 	generic::{BlockId, SignedBlock, DigestItem},
@@ -115,6 +119,7 @@ pub struct Client<B, E, Block, RA> where Block: BlockT {
 	block_rules: BlockRules<Block>,
 	execution_extensions: ExecutionExtensions<Block>,
 	config: ClientConfig,
+	telemetry: Option<TelemetryHandle>,
 	_phantom: PhantomData<RA>,
 }
 
@@ -152,6 +157,7 @@ pub fn new_in_mem<E, Block, S, RA>(
 	genesis_storage: &S,
 	keystore: Option<SyncCryptoStorePtr>,
 	prometheus_registry: Option<Registry>,
+	telemetry: Option<TelemetryHandle>,
 	spawn_handle: Box<dyn SpawnNamed>,
 	config: ClientConfig,
 ) -> sp_blockchain::Result<Client<
@@ -171,6 +177,7 @@ pub fn new_in_mem<E, Block, S, RA>(
 		keystore,
 		spawn_handle,
 		prometheus_registry,
+		telemetry,
 		config,
 	)
 }
@@ -196,6 +203,7 @@ pub fn new_with_backend<B, E, Block, S, RA>(
 	keystore: Option<SyncCryptoStorePtr>,
 	spawn_handle: Box<dyn SpawnNamed>,
 	prometheus_registry: Option<Registry>,
+	telemetry: Option<TelemetryHandle>,
 	config: ClientConfig,
 ) -> sp_blockchain::Result<Client<B, LocalCallExecutor<B, E>, Block, RA>>
 	where
@@ -218,6 +226,7 @@ pub fn new_with_backend<B, E, Block, S, RA>(
 		Default::default(),
 		extensions,
 		prometheus_registry,
+		telemetry,
 		config,
 	)
 }
@@ -298,6 +307,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		bad_blocks: BadBlocks<Block>,
 		execution_extensions: ExecutionExtensions<Block>,
 		prometheus_registry: Option<Registry>,
+		telemetry: Option<TelemetryHandle>,
 		config: ClientConfig,
 	) -> sp_blockchain::Result<Self> {
 		if backend.blockchain().header(BlockId::Number(Zero::zero()))?.is_none() {
@@ -330,6 +340,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 			block_rules: BlockRules::new(fork_blocks, bad_blocks),
 			execution_extensions,
 			config,
+			telemetry,
 			_phantom: Default::default(),
 		})
 	}
@@ -672,7 +683,10 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 				if origin != BlockOrigin::NetworkInitialSync ||
 					rand::thread_rng().gen_bool(0.1)
 				{
-					telemetry!(SUBSTRATE_INFO; "block.import";
+					telemetry!(
+						self.telemetry;
+						SUBSTRATE_INFO;
+						"block.import";
 						"height" => height,
 						"best" => ?hash,
 						"origin" => ?origin
@@ -989,10 +1003,13 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 			let header = self.header(&BlockId::Hash(*last))?
 				.expect(
 					"Header already known to exist in DB because it is \
-					 indicated in the tree route; qed"
+					indicated in the tree route; qed"
 				);
 
-			telemetry!(SUBSTRATE_INFO; "notify.finalized";
+			telemetry!(
+				self.telemetry;
+				SUBSTRATE_INFO;
+				"notify.finalized";
 				"height" => format!("{}", header.number()),
 				"best" => ?last,
 			);
@@ -1002,7 +1019,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 			let header = self.header(&BlockId::Hash(finalized_hash))?
 				.expect(
 					"Header already known to exist in DB because it is \
-					 indicated in the tree route; qed"
+					indicated in the tree route; qed"
 				);
 
 			let notification = FinalityNotification {
@@ -1991,9 +2008,10 @@ impl<B, E, Block, RA> backend::AuxStore for &Client<B, E, Block, RA>
 }
 
 impl<BE, E, B, RA> sp_consensus::block_validation::Chain<B> for Client<BE, E, B, RA>
-	where BE: backend::Backend<B>,
-		  E: CallExecutor<B>,
-		  B: BlockT
+	where
+		BE: backend::Backend<B>,
+		E: CallExecutor<B>,
+		B: BlockT,
 {
 	fn block_status(
 		&self,
diff --git a/client/service/src/client/light.rs b/client/service/src/client/light.rs
index 5b5c0cb0eb38..3b29a0e1a92c 100644
--- a/client/service/src/client/light.rs
+++ b/client/service/src/client/light.rs
@@ -22,6 +22,7 @@ use std::sync::Arc;
 
 use sc_executor::RuntimeInfo;
 use sp_core::traits::{CodeExecutor, SpawnNamed};
+use sc_telemetry::TelemetryHandle;
 use sp_runtime::BuildStorage;
 use sp_runtime::traits::{Block as BlockT, HashFor};
 use sp_blockchain::Result as ClientResult;
@@ -31,7 +32,6 @@ use super::{call_executor::LocalCallExecutor, client::{Client, ClientConfig}};
 use sc_client_api::light::Storage as BlockchainStorage;
 use sc_light::{Backend, GenesisCallExecutor};
 
-
 /// Create an instance of light client.
 pub fn new_light<B, S, RA, E>(
 	backend: Arc<Backend<S, HashFor<B>>>,
@@ -39,6 +39,7 @@ pub fn new_light<B, S, RA, E>(
 	code_executor: E,
 	spawn_handle: Box<dyn SpawnNamed>,
 	prometheus_registry: Option<Registry>,
+	telemetry: Option<TelemetryHandle>,
 ) -> ClientResult<
 		Client<
 			Backend<S, HashFor<B>>,
@@ -70,6 +71,7 @@ pub fn new_light<B, S, RA, E>(
 		Default::default(),
 		Default::default(),
 		prometheus_registry,
+		telemetry,
 		ClientConfig::default(),
 	)
 }
diff --git a/client/service/src/config.rs b/client/service/src/config.rs
index 4f0d426bdba4..f82a877545e8 100644
--- a/client/service/src/config.rs
+++ b/client/service/src/config.rs
@@ -96,11 +96,6 @@ pub struct Configuration {
 	/// External WASM transport for the telemetry. If `Some`, when connection to a telemetry
 	/// endpoint, this transport will be tried in priority before all others.
 	pub telemetry_external_transport: Option<ExtTransport>,
-	/// Telemetry handle.
-	///
-	/// This is a handle to a `TelemetryWorker` instance. It is used to initialize the telemetry for
-	/// a substrate node.
-	pub telemetry_handle: Option<sc_telemetry::TelemetryHandle>,
 	/// The default number of 64KB pages to allocate for Wasm execution
 	pub default_heap_pages: Option<u64>,
 	/// Should offchain workers be executed.
diff --git a/client/service/src/error.rs b/client/service/src/error.rs
index caa54700da91..9c653219ca13 100644
--- a/client/service/src/error.rs
+++ b/client/service/src/error.rs
@@ -46,6 +46,9 @@ pub enum Error {
 	#[error(transparent)]
 	Keystore(#[from] sc_keystore::Error),
 
+	#[error(transparent)]
+	Telemetry(#[from] sc_telemetry::Error),
+
 	#[error("Best chain selection strategy (SelectChain) is not provided.")]
 	SelectChainRequired,
 
diff --git a/client/service/src/metrics.rs b/client/service/src/metrics.rs
index 4fbfa4d77f08..43e5b8eaaded 100644
--- a/client/service/src/metrics.rs
+++ b/client/service/src/metrics.rs
@@ -21,7 +21,7 @@ use std::{convert::TryFrom, time::SystemTime};
 use crate::{NetworkStatus, NetworkState, NetworkStatusSinks, config::Configuration};
 use futures_timer::Delay;
 use prometheus_endpoint::{register, Gauge, U64, Registry, PrometheusError, Opts, GaugeVec};
-use sc_telemetry::{telemetry, SUBSTRATE_INFO};
+use sc_telemetry::{telemetry, TelemetryHandle, SUBSTRATE_INFO};
 use sp_api::ProvideRuntimeApi;
 use sp_runtime::traits::{NumberFor, Block, SaturatedConversion, UniqueSaturatedInto};
 use sp_transaction_pool::{PoolStatus, MaintainedTransactionPool};
@@ -112,23 +112,26 @@ pub struct MetricsService {
 	last_update: Instant,
 	last_total_bytes_inbound: u64,
 	last_total_bytes_outbound: u64,
+	telemetry: Option<TelemetryHandle>,
 }
 
 impl MetricsService {
 	/// Creates a `MetricsService` that only sends information
 	/// to the telemetry.
-	pub fn new() -> Self {
+	pub fn new(telemetry: Option<TelemetryHandle>) -> Self {
 		MetricsService {
 			metrics: None,
 			last_total_bytes_inbound: 0,
 			last_total_bytes_outbound: 0,
 			last_update: Instant::now(),
+			telemetry,
 		}
 	}
 
 	/// Creates a `MetricsService` that sends metrics
 	/// to prometheus alongside the telemetry.
 	pub fn with_prometheus(
+		telemetry: Option<TelemetryHandle>,
 		registry: &Registry,
 		config: &Configuration,
 	) -> Result<Self, PrometheusError> {
@@ -149,6 +152,7 @@ impl MetricsService {
 			last_total_bytes_inbound: 0,
 			last_total_bytes_outbound: 0,
 			last_update: Instant::now(),
+			telemetry,
 		})
 	}
 
@@ -245,6 +249,7 @@ impl MetricsService {
 
 		// Update/send metrics that are always available.
 		telemetry!(
+			self.telemetry;
 			SUBSTRATE_INFO;
 			"system.interval";
 			"height" => best_number,
@@ -307,6 +312,7 @@ impl MetricsService {
 				};
 
 			telemetry!(
+				self.telemetry;
 				SUBSTRATE_INFO;
 				"system.interval";
 				"peers" => num_peers,
@@ -328,6 +334,7 @@ impl MetricsService {
 		// Send network state information, if any.
 		if let Some(net_state) = net_state {
 			telemetry!(
+				self.telemetry;
 				SUBSTRATE_INFO;
 				"system.network_state";
 				"state" => net_state,
diff --git a/client/service/src/task_manager/tests.rs b/client/service/src/task_manager/tests.rs
index 762348ba9fa5..09768a19339f 100644
--- a/client/service/src/task_manager/tests.rs
+++ b/client/service/src/task_manager/tests.rs
@@ -20,14 +20,7 @@ use crate::config::TaskExecutor;
 use crate::task_manager::TaskManager;
 use futures::{future::FutureExt, pin_mut, select};
 use parking_lot::Mutex;
-use sc_telemetry::TelemetrySpan;
-use std::{any::Any, env, sync::Arc, time::Duration};
-use tracing::{event::Event, span::Id, subscriber::Subscriber};
-use tracing_subscriber::{
-	layer::{Context, SubscriberExt},
-	registry::LookupSpan,
-	Layer,
-};
+use std::{any::Any, sync::Arc, time::Duration};
 
 #[derive(Clone, Debug)]
 struct DropTester(Arc<Mutex<usize>>);
@@ -317,94 +310,3 @@ fn ensure_task_manager_future_continues_when_childs_not_essential_task_fails() {
 	runtime.block_on(task_manager.clean_shutdown());
 	assert_eq!(drop_tester, 0);
 }
-
-struct TestLayer {
-	spans_found: Arc<Mutex<Option<Vec<Id>>>>,
-}
-
-impl<S> Layer<S> for TestLayer
-where
-	S: Subscriber + for<'a> LookupSpan<'a>,
-{
-	fn on_event(&self, _: &Event<'_>, ctx: Context<S>) {
-		let mut spans_found = self.spans_found.lock();
-
-		if spans_found.is_some() {
-			panic!("on_event called multiple times");
-		}
-
-		*spans_found = Some(ctx.scope().map(|x| x.id()).collect());
-	}
-}
-
-fn setup_subscriber() -> (
-	impl Subscriber + for<'a> LookupSpan<'a>,
-	Arc<Mutex<Option<Vec<Id>>>>,
-) {
-	let spans_found = Arc::new(Mutex::new(Default::default()));
-	let layer = TestLayer {
-		spans_found: spans_found.clone(),
-	};
-	let subscriber = tracing_subscriber::fmt().finish().with(layer);
-	(subscriber, spans_found)
-}
-
-/// This is not an actual test, it is used by the `telemetry_span_is_forwarded_to_task` test.
-/// The given test will call the test executable and only execute this one test that
-/// test that the telemetry span and the prefix span are forwarded correctly. This needs to be done
-/// in a separate process to avoid interfering with the other tests.
-#[test]
-fn subprocess_telemetry_span_is_forwarded_to_task() {
-	if env::var("SUBPROCESS_TEST").is_err() {
-		return;
-	}
-
-	let (subscriber, spans_found) = setup_subscriber();
-	tracing_log::LogTracer::init().unwrap();
-	let _sub_guard = tracing::subscriber::set_global_default(subscriber);
-
-	let mut runtime = tokio::runtime::Runtime::new().unwrap();
-
-	let prefix_span = tracing::info_span!("prefix");
-	let _enter_prefix_span = prefix_span.enter();
-
-	let telemetry_span = TelemetrySpan::new();
-	let _enter_telemetry_span = telemetry_span.enter();
-
-	let handle = runtime.handle().clone();
-	let task_executor = TaskExecutor::from(move |fut, _| handle.spawn(fut).map(|_| ()));
-	let task_manager = new_task_manager(task_executor);
-
-	let (sender, receiver) = futures::channel::oneshot::channel();
-
-	task_manager.spawn_handle().spawn(
-		"log-something",
-		async move {
-			log::info!("boo!");
-			sender.send(()).unwrap();
-		}
-		.boxed(),
-	);
-
-	runtime.block_on(receiver).unwrap();
-	runtime.block_on(task_manager.clean_shutdown());
-
-	let spans = spans_found.lock().take().unwrap();
-	assert_eq!(2, spans.len());
-
-	assert_eq!(spans[0], prefix_span.id().unwrap());
-	assert_eq!(spans[1], telemetry_span.span().id().unwrap());
-}
-
-#[test]
-fn telemetry_span_is_forwarded_to_task() {
-	let executable = env::current_exe().unwrap();
-	let output = std::process::Command::new(executable)
-		.env("SUBPROCESS_TEST", "1")
-		.args(&["--nocapture", "subprocess_telemetry_span_is_forwarded_to_task"])
-		.output()
-		.unwrap();
-	println!("{}", String::from_utf8(output.stdout).unwrap());
-	eprintln!("{}", String::from_utf8(output.stderr).unwrap());
-	assert!(output.status.success());
-}
diff --git a/client/service/test/src/client/mod.rs b/client/service/test/src/client/mod.rs
index 17e9ac6db189..122782ee51ef 100644
--- a/client/service/test/src/client/mod.rs
+++ b/client/service/test/src/client/mod.rs
@@ -1744,6 +1744,7 @@ fn cleans_up_closed_notification_sinks_on_block_import() {
 			&substrate_test_runtime_client::GenesisParameters::default().genesis_storage(),
 			None,
 			None,
+			None,
 			Box::new(TaskExecutor::new()),
 			Default::default(),
 		)
diff --git a/client/service/test/src/lib.rs b/client/service/test/src/lib.rs
index 6c99f83d4c51..a80c53a8c21c 100644
--- a/client/service/test/src/lib.rs
+++ b/client/service/test/src/lib.rs
@@ -267,7 +267,6 @@ fn node_config<G: RuntimeGenesis + 'static, E: ChainSpecExtension + Clone + 'sta
 		prometheus_config: None,
 		telemetry_endpoints: None,
 		telemetry_external_transport: None,
-		telemetry_handle: None,
 		default_heap_pages: None,
 		offchain_worker: Default::default(),
 		force_authoring: false,
diff --git a/client/telemetry/Cargo.toml b/client/telemetry/Cargo.toml
index 0d29fbca6f9b..ac64d34bea9f 100644
--- a/client/telemetry/Cargo.toml
+++ b/client/telemetry/Cargo.toml
@@ -25,8 +25,6 @@ rand = "0.7.2"
 serde = { version = "1.0.101", features = ["derive"] }
 take_mut = "0.2.2"
 void = "1.0.2"
-tracing = "0.1.10"
-tracing-subscriber = "0.2.13"
 serde_json = "1.0.41"
-sp-utils = { version = "3.0.0", path = "../../primitives/utils" }
 chrono = "0.4.19"
+thiserror = "1.0.21"
diff --git a/client/telemetry/src/error.rs b/client/telemetry/src/error.rs
new file mode 100644
index 000000000000..90a8018f4e1d
--- /dev/null
+++ b/client/telemetry/src/error.rs
@@ -0,0 +1,31 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+#[allow(missing_docs)]
+#[derive(Debug, thiserror::Error)]
+pub enum Error {
+	#[error("IO Error")]
+	IoError(#[from] std::io::Error),
+	#[error("This telemetry instance has already been initialized!")]
+	TelemetryAlreadyInitialized,
+	#[error("The telemetry worker has been dropped already.")]
+	TelemetryWorkerDropped,
+}
+
+#[allow(missing_docs)]
+pub type Result<T> = std::result::Result<T, Error>;
diff --git a/client/telemetry/src/layer.rs b/client/telemetry/src/layer.rs
deleted file mode 100644
index 0ce3f97620da..000000000000
--- a/client/telemetry/src/layer.rs
+++ /dev/null
@@ -1,149 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-use crate::{initialize_transport, TelemetryWorker};
-use futures::channel::mpsc;
-use libp2p::wasm_ext::ExtTransport;
-use parking_lot::Mutex;
-use std::convert::TryInto;
-use std::io;
-use tracing::{Event, Id, Subscriber};
-use tracing_subscriber::{layer::Context, registry::LookupSpan, Layer};
-
-/// Span name used to report the telemetry.
-pub const TELEMETRY_LOG_SPAN: &str = "telemetry-logger";
-
-/// `Layer` that handles the logs for telemetries.
-#[derive(Debug)]
-pub struct TelemetryLayer(Mutex<mpsc::Sender<(Id, u8, String)>>);
-
-impl TelemetryLayer {
-	/// Create a new [`TelemetryLayer`] and [`TelemetryWorker`].
-	///
-	/// The `buffer_size` defaults to 16.
-	///
-	/// The [`ExtTransport`] is used in WASM contexts where we need some binding between the
-	/// networking provided by the operating system or environment and libp2p.
-	///
-	/// > **Important**: Each individual call to `write` corresponds to one message. There is no
-	/// >                internal buffering going on. In the context of WebSockets, each `write`
-	/// >                must be one individual WebSockets frame.
-	pub fn new(
-		buffer_size: Option<usize>,
-		telemetry_external_transport: Option<ExtTransport>,
-	) -> io::Result<(Self, TelemetryWorker)> {
-		let transport = initialize_transport(telemetry_external_transport)?;
-		let worker = TelemetryWorker::new(buffer_size.unwrap_or(16), transport);
-		let sender = worker.message_sender();
-		Ok((Self(Mutex::new(sender)), worker))
-	}
-}
-
-impl<S> Layer<S> for TelemetryLayer
-where
-	S: Subscriber + for<'a> LookupSpan<'a>,
-{
-	fn on_event(&self, event: &Event<'_>, ctx: Context<S>) {
-		if event.metadata().target() != TELEMETRY_LOG_SPAN {
-			return;
-		}
-
-		if let Some(span) = ctx.lookup_current() {
-			let parents = span.parents();
-
-			if let Some(span) = std::iter::once(span)
-				.chain(parents)
-				.find(|x| x.name() == TELEMETRY_LOG_SPAN)
-			{
-				let id = span.id();
-				let mut attrs = TelemetryAttrs::new(id.clone());
-				let mut vis = TelemetryAttrsVisitor(&mut attrs);
-				event.record(&mut vis);
-
-				if let TelemetryAttrs {
-					verbosity: Some(verbosity),
-					json: Some(json),
-					..
-				} = attrs
-				{
-					match self.0.lock().try_send((
-						id,
-						verbosity
-							.try_into()
-							.expect("telemetry log message verbosity are u8; qed"),
-						json,
-					)) {
-						Err(err) if err.is_full() => eprintln!("Telemetry buffer overflowed!"),
-						_ => {}
-					}
-				} else {
-					// NOTE: logging in this function doesn't work
-					eprintln!(
-						"missing fields in telemetry log: {:?}. This can happen if \
-						`tracing::info_span!` is (mis-)used with the telemetry target \
-						directly; you should use the `telemetry!` macro.",
-						event,
-					);
-				}
-			}
-		}
-	}
-}
-
-#[derive(Debug)]
-struct TelemetryAttrs {
-	verbosity: Option<u64>,
-	json: Option<String>,
-	id: Id,
-}
-
-impl TelemetryAttrs {
-	fn new(id: Id) -> Self {
-		Self {
-			verbosity: None,
-			json: None,
-			id,
-		}
-	}
-}
-
-#[derive(Debug)]
-struct TelemetryAttrsVisitor<'a>(&'a mut TelemetryAttrs);
-
-impl<'a> tracing::field::Visit for TelemetryAttrsVisitor<'a> {
-	fn record_debug(&mut self, _field: &tracing::field::Field, _value: &dyn std::fmt::Debug) {
-		// noop
-	}
-
-	fn record_u64(&mut self, field: &tracing::field::Field, value: u64) {
-		if field.name() == "verbosity" {
-			(*self.0).verbosity = Some(value);
-		}
-	}
-
-	fn record_str(&mut self, field: &tracing::field::Field, value: &str) {
-		if field.name() == "json" {
-			(*self.0).json = Some(format!(
-				r#"{{"id":{},"ts":{:?},"payload":{}}}"#,
-				self.0.id.into_u64(),
-				chrono::Local::now().to_rfc3339().to_string(),
-				value,
-			));
-		}
-	}
-}
diff --git a/client/telemetry/src/lib.rs b/client/telemetry/src/lib.rs
index b398ee86de4e..8d3b605db01a 100644
--- a/client/telemetry/src/lib.rs
+++ b/client/telemetry/src/lib.rs
@@ -29,7 +29,7 @@
 //! identify which substrate node is reporting the telemetry. Every task spawned using sc-service's
 //! `TaskManager` automatically inherit this span.
 //!
-//! Substrate's nodes initialize/register with the [`TelemetryWorker`] using a [`TelemetryHandle`].
+//! Substrate's nodes initialize/register with the [`TelemetryWorker`] using a [`TelemetryWorkerHandle`].
 //! This handle can be cloned and passed around. It uses an asynchronous channel to communicate with
 //! the running [`TelemetryWorker`] dedicated to registration. Registering can happen at any point
 //! in time during the process execution.
@@ -39,61 +39,45 @@
 use futures::{channel::mpsc, prelude::*};
 use libp2p::Multiaddr;
 use log::{error, warn};
+use parking_lot::Mutex;
 use serde::Serialize;
-use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver};
 use std::collections::HashMap;
-use tracing::Id;
+use std::sync::{atomic, Arc};
 
 pub use libp2p::wasm_ext::ExtTransport;
+pub use log;
 pub use serde_json;
-pub use tracing;
 
 mod endpoints;
-mod layer;
+mod error;
 mod node;
 mod transport;
 
 pub use endpoints::*;
-pub use layer::*;
+pub use error::*;
 use node::*;
 use transport::*;
 
 /// Substrate DEBUG log level.
-pub const SUBSTRATE_DEBUG: u8 = 9;
+pub const SUBSTRATE_DEBUG: VerbosityLevel = 9;
 /// Substrate INFO log level.
-pub const SUBSTRATE_INFO: u8 = 0;
+pub const SUBSTRATE_INFO: VerbosityLevel = 0;
 
 /// Consensus TRACE log level.
-pub const CONSENSUS_TRACE: u8 = 9;
+pub const CONSENSUS_TRACE: VerbosityLevel = 9;
 /// Consensus DEBUG log level.
-pub const CONSENSUS_DEBUG: u8 = 5;
+pub const CONSENSUS_DEBUG: VerbosityLevel = 5;
 /// Consensus WARN log level.
-pub const CONSENSUS_WARN: u8 = 4;
+pub const CONSENSUS_WARN: VerbosityLevel = 4;
 /// Consensus INFO log level.
-pub const CONSENSUS_INFO: u8 = 1;
+pub const CONSENSUS_INFO: VerbosityLevel = 1;
 
-pub(crate) type TelemetryMessage = (Id, u8, String);
+/// Telemetry message verbosity.
+pub type VerbosityLevel = u8;
 
-/// A handle representing a telemetry span, with the capability to enter the span if it exists.
-#[derive(Debug, Clone)]
-pub struct TelemetrySpan(tracing::Span);
-
-impl TelemetrySpan {
-	/// Enters this span, returning a guard that will exit the span when dropped.
-	pub fn enter(&self) -> tracing::span::Entered {
-		self.0.enter()
-	}
-
-	/// Constructs a new [`TelemetrySpan`].
-	pub fn new() -> Self {
-		Self(tracing::error_span!(TELEMETRY_LOG_SPAN))
-	}
-
-	/// Return a clone of the underlying `tracing::Span` instance.
-	pub fn span(&self) -> tracing::Span {
-		self.0.clone()
-	}
-}
+pub(crate) type Id = u64;
+pub(crate) type TelemetryPayload = serde_json::Map<String, serde_json::Value>;
+pub(crate) type TelemetryMessage = (Id, VerbosityLevel, TelemetryPayload);
 
 /// Message sent when the connection (re-)establishes.
 #[derive(Debug, Serialize)]
@@ -129,64 +113,79 @@ pub struct TelemetryWorker {
 	message_sender: mpsc::Sender<TelemetryMessage>,
 	register_receiver: mpsc::UnboundedReceiver<Register>,
 	register_sender: mpsc::UnboundedSender<Register>,
+	id_counter: Arc<atomic::AtomicU64>,
 	transport: WsTrans,
 }
 
 impl TelemetryWorker {
-	pub(crate) fn new(buffer_size: usize, transport: WsTrans) -> Self {
+	/// Instantiate a new [`TelemetryWorker`] which can run in background.
+	///
+	/// Only one is needed per process.
+	pub fn new(buffer_size: usize) -> Result<Self> {
+		let transport = initialize_transport(None)?;
 		let (message_sender, message_receiver) = mpsc::channel(buffer_size);
 		let (register_sender, register_receiver) = mpsc::unbounded();
 
-		Self {
+		Ok(Self {
 			message_receiver,
 			message_sender,
 			register_receiver,
 			register_sender,
+			id_counter: Arc::new(atomic::AtomicU64::new(1)),
 			transport,
-		}
+		})
 	}
 
-	/// Get a new [`TelemetryHandle`].
+	/// Instantiate a new [`TelemetryWorker`] which can run in background.
 	///
-	/// This is used when you want to register with the [`TelemetryWorker`].
-	pub fn handle(&self) -> TelemetryHandle {
-		TelemetryHandle {
-			message_sender: self.register_sender.clone(),
-		}
+	/// Only one is needed per process.
+	pub fn with_transport(buffer_size: usize, transport: Option<ExtTransport>) -> Result<Self> {
+		let transport = initialize_transport(transport)?;
+		let (message_sender, message_receiver) = mpsc::channel(buffer_size);
+		let (register_sender, register_receiver) = mpsc::unbounded();
+
+		Ok(Self {
+			message_receiver,
+			message_sender,
+			register_receiver,
+			register_sender,
+			id_counter: Arc::new(atomic::AtomicU64::new(1)),
+			transport,
+		})
 	}
 
-	/// Get a clone of the channel's `Sender` used to send telemetry events.
-	pub(crate) fn message_sender(&self) -> mpsc::Sender<TelemetryMessage> {
-		self.message_sender.clone()
+	/// Get a new [`TelemetryWorkerHandle`].
+	///
+	/// This is used when you want to register with the [`TelemetryWorker`].
+	pub fn handle(&self) -> TelemetryWorkerHandle {
+		TelemetryWorkerHandle {
+			message_sender: self.message_sender.clone(),
+			register_sender: self.register_sender.clone(),
+			id_counter: self.id_counter.clone(),
+		}
 	}
 
 	/// Run the telemetry worker.
 	///
 	/// This should be run in a background task.
-	pub async fn run(self) {
-		let Self {
-			mut message_receiver,
-			message_sender: _,
-			mut register_receiver,
-			register_sender: _,
-			transport,
-		} = self;
-
-		let mut node_map: HashMap<Id, Vec<(u8, Multiaddr)>> = HashMap::new();
+	pub async fn run(mut self) {
+		let mut node_map: HashMap<Id, Vec<(VerbosityLevel, Multiaddr)>> = HashMap::new();
 		let mut node_pool: HashMap<Multiaddr, _> = HashMap::new();
+		let mut pending_connection_notifications: Vec<_> = Vec::new();
 
 		loop {
 			futures::select! {
-				message = message_receiver.next() => Self::process_message(
+				message = self.message_receiver.next() => Self::process_message(
 					message,
 					&mut node_pool,
 					&node_map,
 				).await,
-				init_payload = register_receiver.next() => Self::process_register(
+				init_payload = self.register_receiver.next() => Self::process_register(
 					init_payload,
 					&mut node_pool,
 					&mut node_map,
-					transport.clone(),
+					&mut pending_connection_notifications,
+					self.transport.clone(),
 				).await,
 			}
 		}
@@ -195,7 +194,8 @@ impl TelemetryWorker {
 	async fn process_register(
 		input: Option<Register>,
 		node_pool: &mut HashMap<Multiaddr, Node<WsTrans>>,
-		node_map: &mut HashMap<Id, Vec<(u8, Multiaddr)>>,
+		node_map: &mut HashMap<Id, Vec<(VerbosityLevel, Multiaddr)>>,
+		pending_connection_notifications: &mut Vec<(Multiaddr, ConnectionNotifierSender)>,
 		transport: WsTrans,
 	) {
 		let input = input.expect("the stream is never closed; qed");
@@ -212,7 +212,7 @@ impl TelemetryWorker {
 					Ok(serde_json::Value::Object(mut value)) => {
 						value.insert("msg".into(), "system.connected".into());
 						let mut obj = serde_json::Map::new();
-						obj.insert("id".to_string(), id.into_u64().into());
+						obj.insert("id".to_string(), id.into());
 						obj.insert("payload".to_string(), value.into());
 						Some(obj)
 					}
@@ -245,6 +245,16 @@ impl TelemetryWorker {
 					});
 
 					node.connection_messages.extend(connection_message.clone());
+
+					pending_connection_notifications.retain(|(addr_b, connection_message)| {
+						if *addr_b == addr {
+							node.telemetry_connection_notifier
+								.push(connection_message.clone());
+							false
+						} else {
+							true
+						}
+					});
 				}
 			}
 			Register::Notifier {
@@ -252,15 +262,15 @@ impl TelemetryWorker {
 				connection_notifier,
 			} => {
 				for addr in addresses {
+					// If the Node has been initialized, we directly push the connection_notifier.
+					// Otherwise we push it to a queue that will be consumed when the connection
+					// initializes, thus ensuring that the connection notifier will be sent to the
+					// Node when it becomes available.
 					if let Some(node) = node_pool.get_mut(&addr) {
 						node.telemetry_connection_notifier
 							.push(connection_notifier.clone());
 					} else {
-						log::error!(
-							target: "telemetry",
-							"Received connection notifier for unknown node ({}). This is a bug.",
-							addr,
-						);
+						pending_connection_notifications.push((addr, connection_notifier.clone()));
 					}
 				}
 			}
@@ -271,21 +281,31 @@ impl TelemetryWorker {
 	async fn process_message(
 		input: Option<TelemetryMessage>,
 		node_pool: &mut HashMap<Multiaddr, Node<WsTrans>>,
-		node_map: &HashMap<Id, Vec<(u8, Multiaddr)>>,
+		node_map: &HashMap<Id, Vec<(VerbosityLevel, Multiaddr)>>,
 	) {
-		let (id, verbosity, message) = input.expect("the stream is never closed; qed");
+		let (id, verbosity, payload) = input.expect("the stream is never closed; qed");
+
+		let ts = chrono::Local::now().to_rfc3339().to_string();
+		let mut message = serde_json::Map::new();
+		message.insert("id".into(), id.into());
+		message.insert("ts".into(), ts.into());
+		message.insert("payload".into(), payload.into());
 
 		let nodes = if let Some(nodes) = node_map.get(&id) {
 			nodes
 		} else {
-			// This is a normal error because the telemetry span is entered before the telemetry
-			// is initialized so it is possible that some messages in the beginning don't get
-			// through.
+			// This is a normal error because the telemetry ID exists before the telemetry is
+			// initialized.
 			log::trace!(
 				target: "telemetry",
 				"Received telemetry log for unknown id ({:?}): {}",
 				id,
-				message,
+				serde_json::to_string(&message)
+					.unwrap_or_else(|err| format!(
+						"could not be serialized ({}): {:?}",
+						err,
+						message,
+					)),
 			);
 			return;
 		};
@@ -304,12 +324,17 @@ impl TelemetryWorker {
 			if let Some(node) = node_pool.get_mut(&addr) {
 				let _ = node.send(message.clone()).await;
 			} else {
-				log::error!(
+				log::debug!(
 					target: "telemetry",
 					"Received message for unknown node ({}). This is a bug. \
 					Message sent: {}",
 					addr,
-					message,
+					serde_json::to_string(&message)
+						.unwrap_or_else(|err| format!(
+							"could not be serialized ({}): {:?}",
+							err,
+							message,
+						)),
 				);
 			}
 		}
@@ -318,11 +343,41 @@ impl TelemetryWorker {
 
 /// Handle to the [`TelemetryWorker`] thats allows initializing the telemetry for a Substrate node.
 #[derive(Debug, Clone)]
-pub struct TelemetryHandle {
-	message_sender: mpsc::UnboundedSender<Register>,
+pub struct TelemetryWorkerHandle {
+	message_sender: mpsc::Sender<TelemetryMessage>,
+	register_sender: mpsc::UnboundedSender<Register>,
+	id_counter: Arc<atomic::AtomicU64>,
 }
 
-impl TelemetryHandle {
+impl TelemetryWorkerHandle {
+	/// Instantiate a new [`Telemetry`] object.
+	pub fn new_telemetry(&mut self, endpoints: TelemetryEndpoints) -> Telemetry {
+		let addresses = endpoints.0.iter().map(|(addr, _)| addr.clone()).collect();
+
+		Telemetry {
+			message_sender: self.message_sender.clone(),
+			register_sender: self.register_sender.clone(),
+			id: self.id_counter.fetch_add(1, atomic::Ordering::Relaxed),
+			connection_notifier: TelemetryConnectionNotifier {
+				register_sender: self.register_sender.clone(),
+				addresses,
+			},
+			endpoints: Some(endpoints),
+		}
+	}
+}
+
+/// A telemetry instance that can be used to send telemetry messages.
+#[derive(Debug)]
+pub struct Telemetry {
+	message_sender: mpsc::Sender<TelemetryMessage>,
+	register_sender: mpsc::UnboundedSender<Register>,
+	id: Id,
+	connection_notifier: TelemetryConnectionNotifier,
+	endpoints: Option<TelemetryEndpoints>,
+}
+
+impl Telemetry {
 	/// Initialize the telemetry with the endpoints provided in argument for the current substrate
 	/// node.
 	///
@@ -333,42 +388,67 @@ impl TelemetryHandle {
 	///
 	/// The `connection_message` argument is a JSON object that is sent every time the connection
 	/// (re-)establishes.
-	pub fn start_telemetry(
-		&mut self,
-		span: TelemetrySpan,
-		endpoints: TelemetryEndpoints,
-		connection_message: ConnectionMessage,
-	) -> TelemetryConnectionNotifier {
-		let Self { message_sender } = self;
-
-		let connection_notifier = TelemetryConnectionNotifier {
-			message_sender: message_sender.clone(),
-			addresses: endpoints.0.iter().map(|(addr, _)| addr.clone()).collect(),
+	pub fn start_telemetry(&mut self, connection_message: ConnectionMessage) -> Result<()> {
+		let endpoints = match self.endpoints.take() {
+			Some(x) => x,
+			None => return Err(Error::TelemetryAlreadyInitialized),
 		};
 
-		match span.0.id() {
-			Some(id) => {
-				match message_sender.unbounded_send(Register::Telemetry {
-					id,
-					endpoints,
-					connection_message,
-				}) {
-					Ok(()) => {}
-					Err(err) => error!(
-						target: "telemetry",
-						"Could not initialize telemetry: \
-						the telemetry is probably already running: {}",
-						err,
-					),
-				}
-			}
-			None => error!(
+		self.register_sender
+			.unbounded_send(Register::Telemetry {
+				id: self.id,
+				endpoints,
+				connection_message,
+			})
+			.map_err(|_| Error::TelemetryWorkerDropped)
+	}
+
+	/// Make a new clonable handle to this [`Telemetry`]. This is used for reporting telemetries.
+	pub fn handle(&self) -> TelemetryHandle {
+		TelemetryHandle {
+			message_sender: Arc::new(Mutex::new(self.message_sender.clone())),
+			id: self.id,
+			connection_notifier: self.connection_notifier.clone(),
+		}
+	}
+}
+
+/// Handle to a [`Telemetry`].
+///
+/// Used to report telemetry messages.
+#[derive(Debug, Clone)]
+pub struct TelemetryHandle {
+	message_sender: Arc<Mutex<mpsc::Sender<TelemetryMessage>>>,
+	id: Id,
+	connection_notifier: TelemetryConnectionNotifier,
+}
+
+impl TelemetryHandle {
+	/// Send telemetry messages.
+	pub fn send_telemetry(&self, verbosity: VerbosityLevel, payload: TelemetryPayload) {
+		match self
+			.message_sender
+			.lock()
+			.try_send((self.id, verbosity, payload))
+		{
+			Ok(()) => {}
+			Err(err) if err.is_full() => log::trace!(
 				target: "telemetry",
-				"Could not initialize telemetry: the span could not be entered",
+				"Telemetry channel full.",
+			),
+			Err(_) => log::trace!(
+				target: "telemetry",
+				"Telemetry channel closed.",
 			),
 		}
+	}
 
-		connection_notifier
+	/// Get event stream for telemetry connection established events.
+	///
+	/// This function will return an error if the telemetry has already been started by
+	/// [`Telemetry::start_telemetry`].
+	pub fn on_connect_stream(&self) -> ConnectionNotifierReceiver {
+		self.connection_notifier.on_connect_stream()
 	}
 }
 
@@ -376,18 +456,14 @@ impl TelemetryHandle {
 /// (re-)establishes.
 #[derive(Clone, Debug)]
 pub struct TelemetryConnectionNotifier {
-	message_sender: mpsc::UnboundedSender<Register>,
+	register_sender: mpsc::UnboundedSender<Register>,
 	addresses: Vec<Multiaddr>,
 }
 
 impl TelemetryConnectionNotifier {
-	/// Get event stream for telemetry connection established events.
-	///
-	/// This function will return an error if the telemetry has already been started by
-	/// [`TelemetryHandle::start_telemetry`].
-	pub fn on_connect_stream(&self) -> TracingUnboundedReceiver<()> {
-		let (message_sender, message_receiver) = tracing_unbounded("mpsc_telemetry_on_connect");
-		if let Err(err) = self.message_sender.unbounded_send(Register::Notifier {
+	fn on_connect_stream(&self) -> ConnectionNotifierReceiver {
+		let (message_sender, message_receiver) = connection_notifier_channel();
+		if let Err(err) = self.register_sender.unbounded_send(Register::Notifier {
 			addresses: self.addresses.clone(),
 			connection_notifier: message_sender,
 		}) {
@@ -428,34 +504,34 @@ enum Register {
 /// # let authority_id = 42_u64;
 /// # let set_id = (43_u64, 44_u64);
 /// # let authorities = vec![45_u64];
-/// telemetry!(CONSENSUS_INFO; "afg.authority_set";
-/// 	"authority_id" => authority_id.to_string(),
-/// 	"authority_set_id" => ?set_id,
-/// 	"authorities" => authorities,
+/// # let telemetry: Option<TelemetryHandle> = None;
+/// telemetry!(
+///     telemetry;      // an `Option<TelemetryHandle>`
+///     CONSENSUS_INFO;
+///     "afg.authority_set";
+///     "authority_id" => authority_id.to_string(),
+///     "authority_set_id" => ?set_id,
+///     "authorities" => authorities,
 /// );
 /// ```
 #[macro_export(local_inner_macros)]
 macro_rules! telemetry {
-	( $verbosity:expr; $msg:expr; $( $t:tt )* ) => {{
-		let verbosity: u8 = $verbosity;
-		match format_fields_to_json!($($t)*) {
-			Err(err) => {
-				$crate::tracing::error!(
-					target: "telemetry",
-					"Could not serialize value for telemetry: {}",
-					err,
-				);
-			},
-			Ok(mut json) => {
-				// NOTE: the span id will be added later in the JSON for the greater good
-				json.insert("msg".into(), $msg.into());
-				let serialized_json = $crate::serde_json::to_string(&json)
-					.expect("contains only string keys; qed");
-				$crate::tracing::info!(target: $crate::TELEMETRY_LOG_SPAN,
-					verbosity,
-					json = serialized_json.as_str(),
-				);
-			},
+	( $telemetry:expr; $verbosity:expr; $msg:expr; $( $t:tt )* ) => {{
+		if let Some(telemetry) = $telemetry.as_ref() {
+			let verbosity: $crate::VerbosityLevel = $verbosity;
+			match format_fields_to_json!($($t)*) {
+				Err(err) => {
+					$crate::log::debug!(
+						target: "telemetry",
+						"Could not serialize value for telemetry: {}",
+						err,
+					);
+				},
+				Ok(mut json) => {
+					json.insert("msg".into(), $msg.into());
+					telemetry.send_telemetry(verbosity, json);
+				},
+			}
 		}
 	}};
 }
diff --git a/client/telemetry/src/node.rs b/client/telemetry/src/node.rs
index e47bc2f9634f..2d1a04b00a4c 100644
--- a/client/telemetry/src/node.rs
+++ b/client/telemetry/src/node.rs
@@ -16,6 +16,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+use crate::TelemetryPayload;
+use futures::channel::mpsc;
 use futures::prelude::*;
 use libp2p::core::transport::Transport;
 use libp2p::Multiaddr;
@@ -23,7 +25,13 @@ use rand::Rng as _;
 use std::{fmt, mem, pin::Pin, task::Context, task::Poll, time::Duration};
 use wasm_timer::Delay;
 
-pub(crate) type ConnectionNotifierSender = sp_utils::mpsc::TracingUnboundedSender<()>;
+pub(crate) type ConnectionNotifierSender = mpsc::Sender<()>;
+pub(crate) type ConnectionNotifierReceiver = mpsc::Receiver<()>;
+
+pub(crate) fn connection_notifier_channel() -> (ConnectionNotifierSender, ConnectionNotifierReceiver)
+{
+	mpsc::channel(0)
+}
 
 /// Handler for a single telemetry node.
 ///
@@ -45,7 +53,7 @@ pub(crate) struct Node<TTrans: Transport> {
 	/// Transport used to establish new connections.
 	transport: TTrans,
 	/// Messages that are sent when the connection (re-)establishes.
-	pub(crate) connection_messages: Vec<serde_json::Map<String, serde_json::Value>>,
+	pub(crate) connection_messages: Vec<TelemetryPayload>,
 	/// Notifier for when the connection (re-)establishes.
 	pub(crate) telemetry_connection_notifier: Vec<ConnectionNotifierSender>,
 }
@@ -123,7 +131,7 @@ where
 
 pub(crate) enum Infallible {}
 
-impl<TTrans: Transport, TSinkErr> Sink<String> for Node<TTrans>
+impl<TTrans: Transport, TSinkErr> Sink<TelemetryPayload> for Node<TTrans>
 where
 	TTrans: Clone + Unpin,
 	TTrans::Dial: Unpin,
@@ -234,16 +242,28 @@ where
 		Poll::Ready(Ok(()))
 	}
 
-	fn start_send(mut self: Pin<&mut Self>, item: String) -> Result<(), Self::Error> {
+	fn start_send(mut self: Pin<&mut Self>, item: TelemetryPayload) -> Result<(), Self::Error> {
 		match &mut self.socket {
-			NodeSocket::Connected(conn) => {
-				let _ = conn.sink.start_send_unpin(item.into()).expect("boo");
-			}
+			NodeSocket::Connected(conn) => match serde_json::to_vec(&item) {
+				Ok(data) => {
+					let _ = conn.sink.start_send_unpin(data);
+				}
+				Err(err) => log::debug!(
+					target: "telemetry",
+					"Could not serialize payload: {}",
+					err,
+				),
+			},
 			_socket => {
 				log::trace!(
 					target: "telemetry",
 					"Message has been discarded: {}",
-					item,
+					serde_json::to_string(&item)
+						.unwrap_or_else(|err| format!(
+							"could not be serialized ({}): {:?}",
+							err,
+							item,
+						)),
 				);
 			}
 		}
diff --git a/client/tracing/Cargo.toml b/client/tracing/Cargo.toml
index 34aa9d9d4e7f..a119fb48b34e 100644
--- a/client/tracing/Cargo.toml
+++ b/client/tracing/Cargo.toml
@@ -30,7 +30,6 @@ tracing-core = "0.1.17"
 tracing-log = "0.1.1"
 tracing-subscriber = "0.2.15"
 sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
-sc-telemetry = { version = "3.0.0", path = "../telemetry" }
 sc-tracing-proc-macro = { version = "3.0.0", path = "./proc-macro" }
 
 [target.'cfg(target_os = "unknown")'.dependencies]
diff --git a/client/tracing/src/lib.rs b/client/tracing/src/lib.rs
index 2b0044a6f25b..41947d4c0ed8 100644
--- a/client/tracing/src/lib.rs
+++ b/client/tracing/src/lib.rs
@@ -24,7 +24,7 @@
 //!
 //! See `sp-tracing` for examples on how to use tracing.
 //!
-//! Currently we provide `Log` (default), `Telemetry` variants for `Receiver`
+//! Currently we only provide `Log` (default).
 
 #![warn(missing_docs)]
 
@@ -46,7 +46,6 @@ use tracing_subscriber::{
 	CurrentSpan,
 	layer::{Layer, Context},
 };
-use sc_telemetry::{telemetry, SUBSTRATE_INFO};
 use sp_tracing::{WASM_NAME_KEY, WASM_TARGET_KEY, WASM_TRACE_IDENTIFIER};
 
 #[doc(hidden)]
@@ -67,8 +66,6 @@ pub struct ProfilingLayer {
 pub enum TracingReceiver {
 	/// Output to logger
 	Log,
-	/// Output to telemetry
-	Telemetry,
 }
 
 impl Default for TracingReceiver {
@@ -214,10 +211,6 @@ impl ProfilingLayer {
 	pub fn new(receiver: TracingReceiver, targets: &str) -> Self {
 		match receiver {
 			TracingReceiver::Log => Self::new_with_handler(Box::new(LogTraceHandler), targets),
-			TracingReceiver::Telemetry => Self::new_with_handler(
-				Box::new(TelemetryTraceHandler),
-				targets,
-			),
 		}
 	}
 
@@ -392,33 +385,6 @@ impl TraceHandler for LogTraceHandler {
 	}
 }
 
-/// TraceHandler for sending span data to telemetry,
-/// Please see telemetry documentation for details on how to specify endpoints and
-/// set the required telemetry level to activate tracing messages
-pub struct TelemetryTraceHandler;
-
-impl TraceHandler for TelemetryTraceHandler {
-	fn handle_span(&self, span_datum: SpanDatum) {
-		telemetry!(SUBSTRATE_INFO; "tracing.profiling";
-			"name" => span_datum.name,
-			"target" => span_datum.target,
-			"time" => span_datum.overall_time.as_nanos(),
-			"id" => span_datum.id.into_u64(),
-			"parent_id" => span_datum.parent_id.as_ref().map(|i| i.into_u64()),
-			"values" => span_datum.values
-		);
-	}
-
-	fn handle_event(&self, event: TraceEvent) {
-		telemetry!(SUBSTRATE_INFO; "tracing.event";
-			"name" => event.name,
-			"target" => event.target,
-			"parent_id" => event.parent_id.as_ref().map(|i| i.into_u64()),
-			"values" => event.values
-		);
-	}
-}
-
 #[cfg(test)]
 mod tests {
 	use super::*;
diff --git a/client/tracing/src/logging/event_format.rs b/client/tracing/src/logging/event_format.rs
index 37f9ed16ead7..25fd2f3ba3d7 100644
--- a/client/tracing/src/logging/event_format.rs
+++ b/client/tracing/src/logging/event_format.rs
@@ -62,10 +62,6 @@ where
 		S: Subscriber + for<'a> LookupSpan<'a>,
 		N: for<'a> FormatFields<'a> + 'static,
 	{
-		if event.metadata().target() == sc_telemetry::TELEMETRY_LOG_SPAN {
-			return Ok(());
-		}
-
 		let writer = &mut MaybeColorWriter::new(self.enable_color, writer);
 		let normalized_meta = event.normalized_metadata();
 		let meta = normalized_meta.as_ref().unwrap_or_else(|| event.metadata());
diff --git a/client/tracing/src/logging/mod.rs b/client/tracing/src/logging/mod.rs
index 433e3ee4931c..187b6a387f32 100644
--- a/client/tracing/src/logging/mod.rs
+++ b/client/tracing/src/logging/mod.rs
@@ -29,16 +29,16 @@ mod layers;
 pub use directives::*;
 pub use sc_tracing_proc_macro::*;
 
-use sc_telemetry::{ExtTransport, TelemetryWorker};
 use std::io;
 use tracing::Subscriber;
 use tracing_subscriber::{
+	filter::LevelFilter,
 	fmt::time::ChronoLocal,
 	fmt::{
 		format, FormatEvent, FormatFields, Formatter, Layer as FmtLayer, MakeWriter,
 		SubscriberBuilder,
 	},
-	layer::{self, SubscriberExt}, filter::LevelFilter,
+	layer::{self, SubscriberExt},
 	registry::LookupSpan,
 	EnvFilter, FmtSubscriber, Layer, Registry,
 };
@@ -75,8 +75,6 @@ fn prepare_subscriber<N, E, F, W>(
 	directives: &str,
 	profiling_targets: Option<&str>,
 	force_colors: Option<bool>,
-	telemetry_buffer_size: Option<usize>,
-	telemetry_external_transport: Option<ExtTransport>,
 	builder_hook: impl Fn(
 		SubscriberBuilder<
 			format::DefaultFields,
@@ -85,7 +83,7 @@ fn prepare_subscriber<N, E, F, W>(
 			fn() -> std::io::Stderr,
 		>,
 	) -> SubscriberBuilder<N, E, F, W>,
-) -> Result<(impl Subscriber + for<'a> LookupSpan<'a>, TelemetryWorker)>
+) -> Result<impl Subscriber + for<'a> LookupSpan<'a>>
 where
 	N: for<'writer> FormatFields<'writer> + 'static,
 	E: FormatEvent<Registry, N> + 'static,
@@ -130,10 +128,9 @@ where
 
 	if let Some(profiling_targets) = profiling_targets {
 		env_filter = parse_user_directives(env_filter, profiling_targets)?;
-		env_filter = env_filter
-			.add_directive(
-				parse_default_directive("sc_tracing=trace").expect("provided directive is valid")
-			);
+		env_filter = env_filter.add_directive(
+			parse_default_directive("sc_tracing=trace").expect("provided directive is valid"),
+		);
 	}
 
 	let max_level_hint = Layer::<FmtSubscriber>::max_level_hint(&env_filter);
@@ -164,8 +161,6 @@ where
 		"%Y-%m-%d %H:%M:%S%.3f".to_string()
 	});
 
-	let (telemetry_layer, telemetry_worker) =
-		sc_telemetry::TelemetryLayer::new(telemetry_buffer_size, telemetry_external_transport)?;
 	let event_format = EventFormat {
 		timer,
 		display_target: !simple,
@@ -187,20 +182,18 @@ where
 	#[cfg(not(target_os = "unknown"))]
 	let builder = builder_hook(builder);
 
-	let subscriber = builder.finish().with(PrefixLayer).with(telemetry_layer);
+	let subscriber = builder.finish().with(PrefixLayer);
 
 	#[cfg(target_os = "unknown")]
 	let subscriber = subscriber.with(ConsoleLogLayer::new(event_format));
 
-	Ok((subscriber, telemetry_worker))
+	Ok(subscriber)
 }
 
 /// A builder that is used to initialize the global logger.
 pub struct LoggerBuilder {
 	directives: String,
 	profiling: Option<(crate::TracingReceiver, String)>,
-	telemetry_buffer_size: Option<usize>,
-	telemetry_external_transport: Option<ExtTransport>,
 	log_reloading: bool,
 	force_colors: Option<bool>,
 }
@@ -211,8 +204,6 @@ impl LoggerBuilder {
 		Self {
 			directives: directives.into(),
 			profiling: None,
-			telemetry_buffer_size: None,
-			telemetry_external_transport: None,
 			log_reloading: true,
 			force_colors: None,
 		}
@@ -234,18 +225,6 @@ impl LoggerBuilder {
 		self
 	}
 
-	/// Set a custom buffer size for the telemetry.
-	pub fn with_telemetry_buffer_size(&mut self, buffer_size: usize) -> &mut Self {
-		self.telemetry_buffer_size = Some(buffer_size);
-		self
-	}
-
-	/// Set a custom network transport (used for the telemetry).
-	pub fn with_transport(&mut self, transport: ExtTransport) -> &mut Self {
-		self.telemetry_external_transport = Some(transport);
-		self
-	}
-
 	/// Force enable/disable colors.
 	pub fn with_colors(&mut self, enable: bool) -> &mut Self {
 		self.force_colors = Some(enable);
@@ -255,64 +234,56 @@ impl LoggerBuilder {
 	/// Initialize the global logger
 	///
 	/// This sets various global logging and tracing instances and thus may only be called once.
-	pub fn init(self) -> Result<TelemetryWorker> {
+	pub fn init(self) -> Result<()> {
 		if let Some((tracing_receiver, profiling_targets)) = self.profiling {
 			if self.log_reloading {
-				let (subscriber, telemetry_worker) = prepare_subscriber(
+				let subscriber = prepare_subscriber(
 					&self.directives,
 					Some(&profiling_targets),
 					self.force_colors,
-					self.telemetry_buffer_size,
-					self.telemetry_external_transport,
 					|builder| enable_log_reloading!(builder),
 				)?;
 				let profiling = crate::ProfilingLayer::new(tracing_receiver, &profiling_targets);
 
 				tracing::subscriber::set_global_default(subscriber.with(profiling))?;
 
-				Ok(telemetry_worker)
+				Ok(())
 			} else {
-				let (subscriber, telemetry_worker) = prepare_subscriber(
+				let subscriber = prepare_subscriber(
 					&self.directives,
 					Some(&profiling_targets),
 					self.force_colors,
-					self.telemetry_buffer_size,
-					self.telemetry_external_transport,
 					|builder| builder,
 				)?;
 				let profiling = crate::ProfilingLayer::new(tracing_receiver, &profiling_targets);
 
 				tracing::subscriber::set_global_default(subscriber.with(profiling))?;
 
-				Ok(telemetry_worker)
+				Ok(())
 			}
 		} else {
 			if self.log_reloading {
-				let (subscriber, telemetry_worker) = prepare_subscriber(
+				let subscriber = prepare_subscriber(
 					&self.directives,
 					None,
 					self.force_colors,
-					self.telemetry_buffer_size,
-					self.telemetry_external_transport,
 					|builder| enable_log_reloading!(builder),
 				)?;
 
 				tracing::subscriber::set_global_default(subscriber)?;
 
-				Ok(telemetry_worker)
+				Ok(())
 			} else {
-				let (subscriber, telemetry_worker) = prepare_subscriber(
+				let subscriber = prepare_subscriber(
 					&self.directives,
 					None,
 					self.force_colors,
-					self.telemetry_buffer_size,
-					self.telemetry_external_transport,
 					|builder| builder,
 				)?;
 
 				tracing::subscriber::set_global_default(subscriber)?;
 
-				Ok(telemetry_worker)
+				Ok(())
 			}
 		}
 	}
@@ -335,7 +306,8 @@ mod tests {
 	#[test]
 	fn test_logger_filters() {
 		if env::var("RUN_TEST_LOGGER_FILTERS").is_ok() {
-			let test_directives = "afg=debug,sync=trace,client=warn,telemetry,something-with-dash=error";
+			let test_directives =
+				"afg=debug,sync=trace,client=warn,telemetry,something-with-dash=error";
 			init_logger(&test_directives);
 
 			tracing::dispatcher::get_default(|dispatcher| {
diff --git a/test-utils/client/src/lib.rs b/test-utils/client/src/lib.rs
index cdeefccc4086..d8cc40d5561c 100644
--- a/test-utils/client/src/lib.rs
+++ b/test-utils/client/src/lib.rs
@@ -229,6 +229,7 @@ impl<Block: BlockT, Executor, Backend, G: GenesisInit> TestClientBuilder<Block,
 				sc_offchain::OffchainDb::factory_from_backend(&*self.backend),
 			),
 			None,
+			None,
 			ClientConfig {
 				offchain_indexing_api: self.enable_offchain_indexing_api,
 				..Default::default()
diff --git a/utils/browser/Cargo.toml b/utils/browser/Cargo.toml
index d7051620fcfd..764d2d18a61b 100644
--- a/utils/browser/Cargo.toml
+++ b/utils/browser/Cargo.toml
@@ -27,7 +27,6 @@ sc-informant = { version = "0.9.0", path = "../../client/informant" }
 sc-service = { version = "0.9.0", path = "../../client/service", default-features = false }
 sc-network = { path = "../../client/network", version = "0.9.0"}
 sc-chain-spec = { path = "../../client/chain-spec", version = "3.0.0"}
-sc-telemetry = { path = "../../client/telemetry", version = "3.0.0"}
 sc-tracing = { path = "../../client/tracing", version = "3.0.0"}
 
 # Imported just for the `wasm-bindgen` feature
diff --git a/utils/browser/src/lib.rs b/utils/browser/src/lib.rs
index b72f2e973b68..f7e5537c43b5 100644
--- a/utils/browser/src/lib.rs
+++ b/utils/browser/src/lib.rs
@@ -24,7 +24,6 @@ use sc_service::{
 	GenericChainSpec, RuntimeGenesis,
 	KeepBlocks, TransactionStorageMode,
 };
-use sc_telemetry::TelemetryHandle;
 use sc_tracing::logging::LoggerBuilder;
 use wasm_bindgen::prelude::*;
 use futures::{
@@ -37,13 +36,8 @@ use libp2p_wasm_ext::{ExtTransport, ffi};
 pub use console_error_panic_hook::set_once as set_console_error_panic_hook;
 
 /// Initialize the logger and return a `TelemetryWorker` and a wasm `ExtTransport`.
-pub fn init_logging_and_telemetry(
-	pattern: &str,
-) -> Result<sc_telemetry::TelemetryWorker, sc_tracing::logging::Error> {
-	let transport = ExtTransport::new(ffi::websocket_transport());
-	let mut logger = LoggerBuilder::new(pattern);
-	logger.with_transport(transport);
-	logger.init()
+pub fn init_logging(pattern: &str) -> Result<(), sc_tracing::logging::Error> {
+	LoggerBuilder::new(pattern).init()
 }
 
 /// Create a service configuration from a chain spec.
@@ -51,7 +45,6 @@ pub fn init_logging_and_telemetry(
 /// This configuration contains good defaults for a browser light client.
 pub async fn browser_configuration<G, E>(
 	chain_spec: GenericChainSpec<G, E>,
-	telemetry_handle: Option<TelemetryHandle>,
 ) -> Result<Configuration, Box<dyn std::error::Error>>
 where
 	G: RuntimeGenesis + 'static,
@@ -82,7 +75,6 @@ where
 			async {}
 		}).into(),
 		telemetry_external_transport: Some(transport),
-		telemetry_handle,
 		role: Role::Light,
 		database: {
 			info!("Opening Indexed DB database '{}'...", name);

From dedbdc4f780ad06989c41542362b66e404e66a57 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Mar 2021 14:04:47 +0100
Subject: [PATCH 0487/1194] Bump tracing from 0.1.22 to 0.1.25 (#8263)

Bumps [tracing](https://github.com/tokio-rs/tracing) from 0.1.22 to 0.1.25.
- [Release notes](https://github.com/tokio-rs/tracing/releases)
- [Commits](https://github.com/tokio-rs/tracing/compare/tracing-0.1.22...tracing-0.1.25)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                                   | 8 ++++----
 client/executor/Cargo.toml                   | 2 +-
 client/service/Cargo.toml                    | 2 +-
 client/tracing/Cargo.toml                    | 2 +-
 primitives/io/Cargo.toml                     | 2 +-
 primitives/runtime-interface/test/Cargo.toml | 2 +-
 primitives/tracing/Cargo.toml                | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ffdb78686c52..25bcac940d25 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9969,9 +9969,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
 
 [[package]]
 name = "tracing"
-version = "0.1.22"
+version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3"
+checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f"
 dependencies = [
  "cfg-if 1.0.0",
  "log",
@@ -9982,9 +9982,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.11"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e0ccfc3378da0cce270c946b676a376943f5cd16aeba64568e7939806f4ada"
+checksum = "41768be5b9f3489491825f56f01f25290aa1d3e7cc97e182d4d34360493ba6fa"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/client/executor/Cargo.toml b/client/executor/Cargo.toml
index e0b21b7fb665..f678029d0674 100644
--- a/client/executor/Cargo.toml
+++ b/client/executor/Cargo.toml
@@ -47,7 +47,7 @@ sp-state-machine = { version = "0.9.0", path = "../../primitives/state-machine"
 sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
 sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
 sc-tracing = { version = "3.0.0", path = "../tracing" }
-tracing = "0.1.22"
+tracing = "0.1.25"
 tracing-subscriber = "0.2.15"
 paste = "1.0"
 
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index d402564be727..6ce1ed8b34e1 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -75,7 +75,7 @@ sc-offchain = { version = "3.0.0", path = "../offchain" }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
 sc-tracing = { version = "3.0.0", path = "../tracing" }
 sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
-tracing = "0.1.22"
+tracing = "0.1.25"
 tracing-futures = { version = "0.2.4" }
 parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
 
diff --git a/client/tracing/Cargo.toml b/client/tracing/Cargo.toml
index a119fb48b34e..d84f89b9bce7 100644
--- a/client/tracing/Cargo.toml
+++ b/client/tracing/Cargo.toml
@@ -25,7 +25,7 @@ rustc-hash = "1.1.0"
 serde = "1.0.101"
 serde_json = "1.0.41"
 thiserror = "1.0.21"
-tracing = "0.1.22"
+tracing = "0.1.25"
 tracing-core = "0.1.17"
 tracing-log = "0.1.1"
 tracing-subscriber = "0.2.15"
diff --git a/primitives/io/Cargo.toml b/primitives/io/Cargo.toml
index f87711b17234..cbbda1807cc2 100644
--- a/primitives/io/Cargo.toml
+++ b/primitives/io/Cargo.toml
@@ -30,7 +30,7 @@ sp-tracing = { version = "3.0.0", default-features = false, path = "../tracing"
 log = { version = "0.4.8", optional = true }
 futures = { version = "0.3.1", features = ["thread-pool"], optional = true }
 parking_lot = { version = "0.11.1", optional = true }
-tracing = { version = "0.1.22", default-features = false }
+tracing = { version = "0.1.25", default-features = false }
 tracing-core = { version = "0.1.17", default-features = false}
 
 [features]
diff --git a/primitives/runtime-interface/test/Cargo.toml b/primitives/runtime-interface/test/Cargo.toml
index f25183f02122..8b6c9cbe5df0 100644
--- a/primitives/runtime-interface/test/Cargo.toml
+++ b/primitives/runtime-interface/test/Cargo.toml
@@ -20,5 +20,5 @@ sp-state-machine = { version = "0.9.0", path = "../../state-machine" }
 sp-runtime = { version = "3.0.0", path = "../../runtime" }
 sp-core = { version = "3.0.0", path = "../../core" }
 sp-io = { version = "3.0.0", path = "../../io" }
-tracing = "0.1.22"
+tracing = "0.1.25"
 tracing-core = "0.1.17"
diff --git a/primitives/tracing/Cargo.toml b/primitives/tracing/Cargo.toml
index 13804353eca7..4fc70bd1b70d 100644
--- a/primitives/tracing/Cargo.toml
+++ b/primitives/tracing/Cargo.toml
@@ -20,7 +20,7 @@ targets = ["x86_64-unknown-linux-gnu", "wasm32-unknown-unknown"]
 [dependencies]
 sp-std = { version = "3.0.0", path = "../std", default-features = false}
 codec = { version = "2.0.0", package = "parity-scale-codec", default-features = false, features = ["derive"]}
-tracing = { version = "0.1.22", default-features = false }
+tracing = { version = "0.1.25", default-features = false }
 tracing-core = { version = "0.1.17", default-features = false }
 log = { version = "0.4.8", optional = true }
 tracing-subscriber = { version = "0.2.15", optional = true, features = ["tracing-log"] }

From 0a61b0a0875bb50baee45fc32ed5c328dcd5c91c Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Thu, 11 Mar 2021 14:57:06 +0100
Subject: [PATCH 0488/1194] Remove legacy network protocol (#8296)

---
 client/network/src/protocol.rs                | 100 +-----
 .../src/protocol/generic_proto/behaviour.rs   |  54 +---
 .../src/protocol/generic_proto/handler.rs     | 204 +++---------
 .../src/protocol/generic_proto/tests.rs       |   5 +-
 .../src/protocol/generic_proto/upgrade.rs     |   8 +-
 .../protocol/generic_proto/upgrade/legacy.rs  | 293 ------------------
 6 files changed, 47 insertions(+), 617 deletions(-)
 delete mode 100644 client/network/src/protocol/generic_proto/upgrade/legacy.rs

diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index bddd79269fd2..7f321775b160 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -24,7 +24,7 @@ use crate::{
 	utils::{interval, LruHashSet},
 };
 
-use bytes::{Bytes, BytesMut};
+use bytes::Bytes;
 use codec::{Decode, DecodeAll, Encode};
 use futures::{channel::oneshot, prelude::*};
 use generic_proto::{GenericProto, GenericProtoOut};
@@ -75,11 +75,6 @@ const MAX_BLOCK_ANNOUNCE_SIZE: u64 = 1024 * 1024;
 // Must be equal to `max(MAX_BLOCK_ANNOUNCE_SIZE, MAX_TRANSACTIONS_SIZE)`.
 pub(crate) const BLOCK_ANNOUNCES_TRANSACTIONS_SUBSTREAM_SIZE: u64 = 16 * 1024 * 1024;
 
-/// Current protocol version.
-pub(crate) const CURRENT_VERSION: u32 = 6;
-/// Lowest version we support
-pub(crate) const MIN_VERSION: u32 = 3;
-
 /// Identifier of the peerset for the block announces protocol.
 const HARDCODED_PEERSETS_SYNC: sc_peerset::SetId = sc_peerset::SetId::from(0);
 /// Number of hardcoded peersets (the constants right above). Any set whose identifier is equal or
@@ -254,26 +249,6 @@ impl<B: BlockT> BlockAnnouncesHandshake<B> {
 	}
 }
 
-/// Builds a SCALE-encoded "Status" message to send as handshake for the legacy protocol.
-fn build_status_message<B: BlockT>(
-	protocol_config: &ProtocolConfig,
-	best_number: NumberFor<B>,
-	best_hash: B::Hash,
-	genesis_hash: B::Hash,
-) -> Vec<u8> {
-	let status = message::generic::Status {
-		version: CURRENT_VERSION,
-		min_supported_version: MIN_VERSION,
-		genesis_hash,
-		roles: protocol_config.roles.into(),
-		best_number,
-		best_hash,
-		chain_status: Vec::new(), // TODO: find a way to make this backwards-compatible
-	};
-
-	Message::<B>::Status(status).encode()
-}
-
 impl<B: BlockT> Protocol<B> {
 	/// Create a new instance.
 	pub fn new(
@@ -375,8 +350,6 @@ impl<B: BlockT> Protocol<B> {
 		});
 
 		let behaviour = {
-			let versions = &((MIN_VERSION as u8)..=(CURRENT_VERSION as u8)).collect::<Vec<u8>>();
-
 			let best_number = info.best_number;
 			let best_hash = info.best_hash;
 			let genesis_hash = info.genesis_hash;
@@ -389,9 +362,6 @@ impl<B: BlockT> Protocol<B> {
 			).encode();
 
 			GenericProto::new(
-				protocol_id.clone(),
-				versions,
-				build_status_message::<B>(&config, best_number, best_hash, genesis_hash),
 				peerset,
 				iter::once((block_announces_protocol, block_announces_handshake, MAX_BLOCK_ANNOUNCE_SIZE))
 					.chain(network_config.extra_sets.iter()
@@ -511,9 +481,6 @@ impl<B: BlockT> Protocol<B> {
 
 		self.sync.update_chain_info(&hash, number);
 
-		self.behaviour.set_legacy_handshake_message(
-			build_status_message::<B>(&self.config, number, hash, self.genesis_hash),
-		);
 		self.behaviour.set_notif_protocol_handshake(
 			HARDCODED_PEERSETS_SYNC,
 			BlockAnnouncesHandshake::<B>::build(
@@ -539,64 +506,6 @@ impl<B: BlockT> Protocol<B> {
 		self.peers.iter().map(|(id, peer)| (id, &peer.info))
 	}
 
-	fn on_custom_message(
-		&mut self,
-		who: PeerId,
-		data: BytesMut,
-	) -> CustomMessageOutcome<B> {
-		let message = match <Message<B> as Decode>::decode(&mut &data[..]) {
-			Ok(message) => message,
-			Err(err) => {
-				debug!(
-					target: "sync",
-					"Couldn't decode packet sent by {}: {:?}: {}",
-					who,
-					data,
-					err,
-				);
-				self.peerset_handle.report_peer(who, rep::BAD_MESSAGE);
-				return CustomMessageOutcome::None;
-			}
-		};
-
-		match message {
-			GenericMessage::Status(_) =>
-				debug!(target: "sub-libp2p", "Received unexpected Status"),
-			GenericMessage::BlockAnnounce(announce) =>
-				self.push_block_announce_validation(who.clone(), announce),
-			GenericMessage::Transactions(_) =>
-				warn!(target: "sub-libp2p", "Received unexpected Transactions"),
-			GenericMessage::BlockResponse(_) =>
-				warn!(target: "sub-libp2p", "Received unexpected BlockResponse"),
-			GenericMessage::RemoteCallResponse(_) =>
-				warn!(target: "sub-libp2p", "Received unexpected RemoteCallResponse"),
-			GenericMessage::RemoteReadResponse(_) =>
-				warn!(target: "sub-libp2p", "Received unexpected RemoteReadResponse"),
-			GenericMessage::RemoteHeaderResponse(_) =>
-				warn!(target: "sub-libp2p", "Received unexpected RemoteHeaderResponse"),
-			GenericMessage::RemoteChangesResponse(_) =>
-				warn!(target: "sub-libp2p", "Received unexpected RemoteChangesResponse"),
-			GenericMessage::BlockRequest(_) |
-			GenericMessage::RemoteReadChildRequest(_) |
-			GenericMessage::RemoteCallRequest(_) |
-			GenericMessage::RemoteReadRequest(_) |
-			GenericMessage::RemoteHeaderRequest(_) |
-			GenericMessage::RemoteChangesRequest(_) |
-			GenericMessage::Consensus(_) |
-			GenericMessage::ConsensusBatch(_) => {
-				debug!(
-					target: "sub-libp2p",
-					"Received no longer supported legacy request from {:?}",
-					who
-				);
-				self.behaviour.disconnect_peer(&who, HARDCODED_PEERSETS_SYNC);
-				self.peerset_handle.report_peer(who, rep::BAD_PROTOCOL);
-			},
-		}
-
-		CustomMessageOutcome::None
-	}
-
 	fn prepare_block_request(
 		&mut self,
 		who: PeerId,
@@ -1547,13 +1456,6 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 					}
 				}
 			},
-			GenericProtoOut::LegacyMessage { peer_id, message } => {
-				if self.peers.contains_key(&peer_id) {
-					self.on_custom_message(peer_id, message)
-				} else {
-					CustomMessageOutcome::None
-				}
-			},
 			GenericProtoOut::Notification { peer_id, set_id, message } =>
 				match set_id {
 					HARDCODED_PEERSETS_SYNC if self.peers.contains_key(&peer_id) => {
diff --git a/client/network/src/protocol/generic_proto/behaviour.rs b/client/network/src/protocol/generic_proto/behaviour.rs
index 3283ea33a04e..77a54e09ea7b 100644
--- a/client/network/src/protocol/generic_proto/behaviour.rs
+++ b/client/network/src/protocol/generic_proto/behaviour.rs
@@ -16,10 +16,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::config::ProtocolId;
 use crate::protocol::generic_proto::{
-	handler::{NotificationsSink, NotifsHandlerProto, NotifsHandlerOut, NotifsHandlerIn},
-	upgrade::RegisteredProtocol
+	handler::{NotificationsSink, NotifsHandlerProto, NotifsHandlerOut, NotifsHandlerIn}
 };
 
 use bytes::BytesMut;
@@ -97,9 +95,6 @@ use wasm_timer::Instant;
 /// accommodates for any number of connections.
 ///
 pub struct GenericProto {
-	/// Legacy protocol to open with peers. Never modified.
-	legacy_protocol: RegisteredProtocol,
-
 	/// Notification protocols. Entries are only ever added and not removed.
 	/// Contains, for each protocol, the protocol name and the message to send as part of the
 	/// initial handshake.
@@ -346,14 +341,6 @@ pub enum GenericProtoOut {
 		set_id: sc_peerset::SetId,
 	},
 
-	/// Receives a message on the legacy substream.
-	LegacyMessage {
-		/// Id of the peer the message came from.
-		peer_id: PeerId,
-		/// Message that has been received.
-		message: BytesMut,
-	},
-
 	/// Receives a message on a custom protocol substream.
 	///
 	/// Also concerns received notifications for the notifications API.
@@ -370,9 +357,6 @@ pub enum GenericProtoOut {
 impl GenericProto {
 	/// Creates a `CustomProtos`.
 	pub fn new(
-		protocol: impl Into<ProtocolId>,
-		versions: &[u8],
-		handshake_message: Vec<u8>,
 		peerset: sc_peerset::Peerset,
 		notif_protocols: impl Iterator<Item = (Cow<'static, str>, Vec<u8>, u64)>,
 	) -> Self {
@@ -382,11 +366,7 @@ impl GenericProto {
 
 		assert!(!notif_protocols.is_empty());
 
-		let legacy_handshake_message = Arc::new(RwLock::new(handshake_message));
-		let legacy_protocol = RegisteredProtocol::new(protocol, versions, legacy_handshake_message);
-
 		GenericProto {
-			legacy_protocol,
 			notif_protocols,
 			peerset,
 			peers: FnvHashMap::default(),
@@ -412,14 +392,6 @@ impl GenericProto {
 		}
 	}
 
-	/// Modifies the handshake of the legacy protocol.
-	pub fn set_legacy_handshake_message(
-		&mut self,
-		handshake_message: impl Into<Vec<u8>>
-	) {
-		*self.legacy_protocol.handshake_message().write() = handshake_message.into();
-	}
-
 	/// Returns the number of discovered nodes that we keep in memory.
 	pub fn num_discovered_peers(&self) -> usize {
 		self.peerset.num_discovered_peers()
@@ -1046,10 +1018,7 @@ impl NetworkBehaviour for GenericProto {
 	type OutEvent = GenericProtoOut;
 
 	fn new_handler(&mut self) -> Self::ProtocolsHandler {
-		NotifsHandlerProto::new(
-			self.legacy_protocol.clone(),
-			self.notif_protocols.clone(),
-		)
+		NotifsHandlerProto::new(self.notif_protocols.clone())
 	}
 
 	fn addresses_of_peer(&mut self, _: &PeerId) -> Vec<Multiaddr> {
@@ -1900,25 +1869,6 @@ impl NetworkBehaviour for GenericProto {
 				};
 			}
 
-			NotifsHandlerOut::CustomMessage { message } => {
-				if self.is_open(&source, sc_peerset::SetId::from(0)) {  // TODO: using set 0 here is hacky
-					trace!(target: "sub-libp2p", "Handler({:?}) => Message", source);
-					trace!(target: "sub-libp2p", "External API <= Message({:?})", source);
-					let event = GenericProtoOut::LegacyMessage {
-						peer_id: source,
-						message,
-					};
-
-					self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
-				} else {
-					trace!(
-						target: "sub-libp2p",
-						"Handler({:?}) => Post-close message. Dropping message.",
-						source,
-					);
-				}
-			}
-
 			NotifsHandlerOut::Notification { protocol_index, message } => {
 				let set_id = sc_peerset::SetId::from(protocol_index);
 				if self.is_open(&source, set_id) {
diff --git a/client/network/src/protocol/generic_proto/handler.rs b/client/network/src/protocol/generic_proto/handler.rs
index 6fdcef1d7a2a..0db249f90a8b 100644
--- a/client/network/src/protocol/generic_proto/handler.rs
+++ b/client/network/src/protocol/generic_proto/handler.rs
@@ -60,14 +60,12 @@
 use crate::protocol::generic_proto::{
 	upgrade::{
 		NotificationsIn, NotificationsOut, NotificationsInSubstream, NotificationsOutSubstream,
-		NotificationsHandshakeError, RegisteredProtocol, RegisteredProtocolSubstream,
-		RegisteredProtocolEvent, UpgradeCollec
+		NotificationsHandshakeError, UpgradeCollec
 	},
 };
 
 use bytes::BytesMut;
-use libp2p::core::{either::EitherOutput, ConnectedPoint, PeerId};
-use libp2p::core::upgrade::{SelectUpgrade, InboundUpgrade, OutboundUpgrade};
+use libp2p::core::{ConnectedPoint, PeerId, upgrade::{InboundUpgrade, OutboundUpgrade}};
 use libp2p::swarm::{
 	ProtocolsHandler, ProtocolsHandlerEvent,
 	IntoProtocolsHandler,
@@ -83,7 +81,6 @@ use futures::{
 };
 use log::error;
 use parking_lot::{Mutex, RwLock};
-use smallvec::SmallVec;
 use std::{borrow::Cow, collections::VecDeque, mem, pin::Pin, str, sync::Arc, task::{Context, Poll}, time::Duration};
 use wasm_timer::Instant;
 
@@ -114,9 +111,6 @@ pub struct NotifsHandlerProto {
 	/// Name of protocols, prototypes for upgrades for inbound substreams, and the message we
 	/// send or respond with in the handshake.
 	protocols: Vec<(Cow<'static, str>, NotificationsIn, Arc<RwLock<Vec<u8>>>, u64)>,
-
-	/// Configuration for the legacy protocol upgrade.
-	legacy_protocol: RegisteredProtocol,
 }
 
 /// The actual handler once the connection has been established.
@@ -135,15 +129,6 @@ pub struct NotifsHandler {
 	/// Remote we are connected to.
 	peer_id: PeerId,
 
-	/// Configuration for the legacy protocol upgrade.
-	legacy_protocol: RegisteredProtocol,
-
-	/// The substreams where bidirectional communications happen.
-	legacy_substreams: SmallVec<[RegisteredProtocolSubstream<NegotiatedSubstream>; 4]>,
-
-	/// Contains substreams which are being shut down.
-	legacy_shutdown: SmallVec<[RegisteredProtocolSubstream<NegotiatedSubstream>; 4]>,
-
 	/// Events to return in priority from `poll`.
 	events_queue: VecDeque<
 		ProtocolsHandlerEvent<NotificationsOut, usize, NotifsHandlerOut, NotifsHandlerError>
@@ -227,12 +212,10 @@ enum State {
 impl IntoProtocolsHandler for NotifsHandlerProto {
 	type Handler = NotifsHandler;
 
-	fn inbound_protocol(&self) -> SelectUpgrade<UpgradeCollec<NotificationsIn>, RegisteredProtocol> {
-		let protocols = self.protocols.iter()
+	fn inbound_protocol(&self) -> UpgradeCollec<NotificationsIn> {
+		self.protocols.iter()
 			.map(|(_, p, _, _)| p.clone())
-			.collect::<UpgradeCollec<_>>();
-
-		SelectUpgrade::new(protocols, self.legacy_protocol.clone())
+			.collect::<UpgradeCollec<_>>()
 	}
 
 	fn into_handler(self, peer_id: &PeerId, connected_point: &ConnectedPoint) -> Self::Handler {
@@ -251,9 +234,6 @@ impl IntoProtocolsHandler for NotifsHandlerProto {
 			peer_id: peer_id.clone(),
 			endpoint: connected_point.clone(),
 			when_connection_open: Instant::now(),
-			legacy_protocol: self.legacy_protocol,
-			legacy_substreams: SmallVec::new(),
-			legacy_shutdown: SmallVec::new(),
 			events_queue: VecDeque::with_capacity(16),
 		}
 	}
@@ -332,17 +312,6 @@ pub enum NotifsHandlerOut {
 		protocol_index: usize,
 	},
 
-	/// Received a non-gossiping message on the legacy substream.
-	///
-	/// Can only happen when the handler is in the open state.
-	CustomMessage {
-		/// Message that has been received.
-		///
-		/// Keep in mind that this can be a `ConsensusMessage` message, which then contains a
-		/// notification.
-		message: BytesMut,
-	},
-
 	/// Received a message on a custom protocol substream.
 	///
 	/// Can only happen when the handler is in the open state.
@@ -476,7 +445,6 @@ impl NotifsHandlerProto {
 	/// is always the same whether we open a substream ourselves or respond to handshake from
 	/// the remote.
 	pub fn new(
-		legacy_protocol: RegisteredProtocol,
 		list: impl Into<Vec<(Cow<'static, str>, Arc<RwLock<Vec<u8>>>, u64)>>,
 	) -> Self {
 		let protocols =	list
@@ -489,7 +457,6 @@ impl NotifsHandlerProto {
 
 		NotifsHandlerProto {
 			protocols,
-			legacy_protocol,
 		}
 	}
 }
@@ -498,7 +465,7 @@ impl ProtocolsHandler for NotifsHandler {
 	type InEvent = NotifsHandlerIn;
 	type OutEvent = NotifsHandlerOut;
 	type Error = NotifsHandlerError;
-	type InboundProtocol = SelectUpgrade<UpgradeCollec<NotificationsIn>, RegisteredProtocol>;
+	type InboundProtocol = UpgradeCollec<NotificationsIn>;
 	type OutboundProtocol = NotificationsOut;
 	// Index within the `out_protocols`.
 	type OutboundOpenInfo = usize;
@@ -509,69 +476,51 @@ impl ProtocolsHandler for NotifsHandler {
 			.map(|p| p.in_upgrade.clone())
 			.collect::<UpgradeCollec<_>>();
 
-		let with_legacy = SelectUpgrade::new(protocols, self.legacy_protocol.clone());
-		SubstreamProtocol::new(with_legacy, ())
+		SubstreamProtocol::new(protocols, ())
 	}
 
 	fn inject_fully_negotiated_inbound(
 		&mut self,
-		out: <Self::InboundProtocol as InboundUpgrade<NegotiatedSubstream>>::Output,
+		((_remote_handshake, mut new_substream), protocol_index):
+			<Self::InboundProtocol as InboundUpgrade<NegotiatedSubstream>>::Output,
 		(): ()
 	) {
-		match out {
-			// Received notifications substream.
-			EitherOutput::First(((_remote_handshake, mut new_substream), protocol_index)) => {
-				let mut protocol_info = &mut self.protocols[protocol_index];
-				match protocol_info.state {
-					State::Closed { pending_opening } => {
-						self.events_queue.push_back(ProtocolsHandlerEvent::Custom(
-							NotifsHandlerOut::OpenDesiredByRemote {
-								protocol_index,
-							}
-						));
-
-						protocol_info.state = State::OpenDesiredByRemote {
-							in_substream: new_substream,
-							pending_opening,
-						};
-					},
-					State::OpenDesiredByRemote { .. } => {
-						// If a substream already exists, silently drop the new one.
-						// Note that we drop the substream, which will send an equivalent to a
-						// TCP "RST" to the remote and force-close the substream. It might
-						// seem like an unclean way to get rid of a substream. However, keep
-						// in mind that it is invalid for the remote to open multiple such
-						// substreams, and therefore sending a "RST" is the most correct thing
-						// to do.
-						return;
-					},
-					State::Opening { ref mut in_substream, .. } |
-					State::Open { ref mut in_substream, .. } => {
-						if in_substream.is_some() {
-							// Same remark as above.
-							return;
-						}
+		let mut protocol_info = &mut self.protocols[protocol_index];
+		match protocol_info.state {
+			State::Closed { pending_opening } => {
+				self.events_queue.push_back(ProtocolsHandlerEvent::Custom(
+					NotifsHandlerOut::OpenDesiredByRemote {
+						protocol_index,
+					}
+				));
 
-						// Create `handshake_message` on a separate line to be sure that the
-						// lock is released as soon as possible.
-						let handshake_message = protocol_info.handshake.read().clone();
-						new_substream.send_handshake(handshake_message);
-						*in_substream = Some(new_substream);
-					},
+				protocol_info.state = State::OpenDesiredByRemote {
+					in_substream: new_substream,
+					pending_opening,
 				};
-			}
-
-			// Received legacy substream.
-			EitherOutput::Second((substream, _handshake)) => {
-				// Note: while we awknowledge legacy substreams and handle incoming messages,
-				// it doesn't trigger any `OpenDesiredByRemote` event as a way to simplify the
-				// logic of this code.
-				// Since mid-2019, legacy substreams are supposed to be used at the same time as
-				// notifications substreams, and not in isolation. Nodes that open legacy
-				// substreams in isolation are considered deprecated.
-				if self.legacy_substreams.len() <= 4 {
-					self.legacy_substreams.push(substream);
+			},
+			State::OpenDesiredByRemote { .. } => {
+				// If a substream already exists, silently drop the new one.
+				// Note that we drop the substream, which will send an equivalent to a
+				// TCP "RST" to the remote and force-close the substream. It might
+				// seem like an unclean way to get rid of a substream. However, keep
+				// in mind that it is invalid for the remote to open multiple such
+				// substreams, and therefore sending a "RST" is the most correct thing
+				// to do.
+				return;
+			},
+			State::Opening { ref mut in_substream, .. } |
+			State::Open { ref mut in_substream, .. } => {
+				if in_substream.is_some() {
+					// Same remark as above.
+					return;
 				}
+
+				// Create `handshake_message` on a separate line to be sure that the
+				// lock is released as soon as possible.
+				let handshake_message = protocol_info.handshake.read().clone();
+				new_substream.send_handshake(handshake_message);
+				*in_substream = Some(new_substream);
 			},
 		}
 	}
@@ -683,11 +632,6 @@ impl ProtocolsHandler for NotifsHandler {
 			},
 
 			NotifsHandlerIn::Close { protocol_index } => {
-				for mut substream in self.legacy_substreams.drain(..) {
-					substream.shutdown();
-					self.legacy_shutdown.push(substream);
-				}
-
 				match self.protocols[protocol_index].state {
 					State::Open { .. } => {
 						self.protocols[protocol_index].state = State::Closed {
@@ -752,10 +696,6 @@ impl ProtocolsHandler for NotifsHandler {
 	}
 
 	fn connection_keep_alive(&self) -> KeepAlive {
-		if !self.legacy_substreams.is_empty() {
-			return KeepAlive::Yes;
-		}
-
 		// `Yes` if any protocol has some activity.
 		if self.protocols.iter().any(|p| !matches!(p.state, State::Closed { .. })) {
 			return KeepAlive::Yes;
@@ -883,68 +823,8 @@ impl ProtocolsHandler for NotifsHandler {
 					}
 				}
 			}
-
-			// The legacy substreams are polled only if the state is `Open`. Otherwise, it would be
-			// possible to receive notifications that would need to get silently discarded.
-			if matches!(self.protocols[0].state, State::Open { .. }) {
-				for n in (0..self.legacy_substreams.len()).rev() {
-					let mut substream = self.legacy_substreams.swap_remove(n);
-					let poll_outcome = Pin::new(&mut substream).poll_next(cx);
-					match poll_outcome {
-						Poll::Pending => self.legacy_substreams.push(substream),
-						Poll::Ready(Some(Ok(RegisteredProtocolEvent::Message(message)))) => {
-							self.legacy_substreams.push(substream);
-							return Poll::Ready(ProtocolsHandlerEvent::Custom(
-								NotifsHandlerOut::CustomMessage { message }
-							))
-						},
-						Poll::Ready(Some(Ok(RegisteredProtocolEvent::Clogged))) => {
-							return Poll::Ready(ProtocolsHandlerEvent::Close(
-								NotifsHandlerError::SyncNotificationsClogged
-							))
-						}
-						Poll::Ready(None) | Poll::Ready(Some(Err(_))) => {
-							if matches!(poll_outcome, Poll::Ready(None)) {
-								self.legacy_shutdown.push(substream);
-							}
-
-							if let State::Open { out_substream, .. } = &mut self.protocols[0].state {
-								if !out_substream.is_some() {
-									*out_substream = None;
-									return Poll::Ready(ProtocolsHandlerEvent::Custom(
-										NotifsHandlerOut::CloseDesired {
-											protocol_index: 0,
-										}
-									))
-								}
-							}
-						}
-					}
-				}
-			}
 		}
 
-		shutdown_list(&mut self.legacy_shutdown, cx);
-
 		Poll::Pending
 	}
 }
-
-/// Given a list of substreams, tries to shut them down. The substreams that have been successfully
-/// shut down are removed from the list.
-fn shutdown_list
-	(list: &mut SmallVec<impl smallvec::Array<Item = RegisteredProtocolSubstream<NegotiatedSubstream>>>,
-	cx: &mut Context)
-{
-	'outer: for n in (0..list.len()).rev() {
-		let mut substream = list.swap_remove(n);
-		loop {
-			match substream.poll_next_unpin(cx) {
-				Poll::Ready(Some(Ok(_))) => {}
-				Poll::Pending => break,
-				Poll::Ready(Some(Err(_))) | Poll::Ready(None) => continue 'outer,
-			}
-		}
-		list.push(substream);
-	}
-}
diff --git a/client/network/src/protocol/generic_proto/tests.rs b/client/network/src/protocol/generic_proto/tests.rs
index 967c0e9f8dfb..2c80fe8523ac 100644
--- a/client/network/src/protocol/generic_proto/tests.rs
+++ b/client/network/src/protocol/generic_proto/tests.rs
@@ -80,10 +80,7 @@ fn build_nodes() -> (Swarm<CustomProtoWithAddr>, Swarm<CustomProtoWithAddr>) {
 		});
 
 		let behaviour = CustomProtoWithAddr {
-			inner: GenericProto::new(
-				"test", &[1], vec![], peerset,
-				iter::once(("/foo".into(), Vec::new(), 1024 * 1024))
-			),
+			inner: GenericProto::new(peerset, iter::once(("/foo".into(), Vec::new(), 1024 * 1024))),
 			addrs: addrs
 				.iter()
 				.enumerate()
diff --git a/client/network/src/protocol/generic_proto/upgrade.rs b/client/network/src/protocol/generic_proto/upgrade.rs
index 6917742d8abb..b23e5eab06d9 100644
--- a/client/network/src/protocol/generic_proto/upgrade.rs
+++ b/client/network/src/protocol/generic_proto/upgrade.rs
@@ -15,13 +15,8 @@
 
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
+
 pub use self::collec::UpgradeCollec;
-pub use self::legacy::{
-	RegisteredProtocol,
-	RegisteredProtocolEvent,
-	RegisteredProtocolName,
-	RegisteredProtocolSubstream
-};
 pub use self::notifications::{
 	NotificationsIn,
 	NotificationsInSubstream,
@@ -32,5 +27,4 @@ pub use self::notifications::{
 };
 
 mod collec;
-mod legacy;
 mod notifications;
diff --git a/client/network/src/protocol/generic_proto/upgrade/legacy.rs b/client/network/src/protocol/generic_proto/upgrade/legacy.rs
deleted file mode 100644
index 6a5ceb5571f9..000000000000
--- a/client/network/src/protocol/generic_proto/upgrade/legacy.rs
+++ /dev/null
@@ -1,293 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-use crate::config::ProtocolId;
-use bytes::BytesMut;
-use futures::prelude::*;
-use asynchronous_codec::Framed;
-use libp2p::core::{UpgradeInfo, InboundUpgrade, OutboundUpgrade, upgrade::ProtocolName};
-use parking_lot::RwLock;
-use std::{collections::VecDeque, io, pin::Pin, sync::Arc, vec::IntoIter as VecIntoIter};
-use std::task::{Context, Poll};
-use unsigned_varint::codec::UviBytes;
-
-/// Connection upgrade for a single protocol.
-///
-/// Note that "a single protocol" here refers to `par` for example. However
-/// each protocol can have multiple different versions for networking purposes.
-pub struct RegisteredProtocol {
-	/// Id of the protocol for API purposes.
-	id: ProtocolId,
-	/// Base name of the protocol as advertised on the network.
-	/// Ends with `/` so that we can append a version number behind.
-	base_name: Vec<u8>,
-	/// List of protocol versions that we support.
-	/// Ordered in descending order so that the best comes first.
-	supported_versions: Vec<u8>,
-	/// Handshake to send after the substream is open.
-	handshake_message: Arc<RwLock<Vec<u8>>>,
-}
-
-impl RegisteredProtocol {
-	/// Creates a new `RegisteredProtocol`.
-	pub fn new(protocol: impl Into<ProtocolId>, versions: &[u8], handshake_message: Arc<RwLock<Vec<u8>>>)
-		-> Self {
-		let protocol = protocol.into();
-		let mut base_name = b"/substrate/".to_vec();
-		base_name.extend_from_slice(protocol.as_ref().as_bytes());
-		base_name.extend_from_slice(b"/");
-
-		RegisteredProtocol {
-			base_name,
-			id: protocol,
-			supported_versions: {
-				let mut tmp = versions.to_vec();
-				tmp.sort_by(|a, b| b.cmp(&a));
-				tmp
-			},
-			handshake_message,
-		}
-	}
-
-	/// Returns the `Arc` to the handshake message that was passed at initialization.
-	pub fn handshake_message(&self) -> &Arc<RwLock<Vec<u8>>> {
-		&self.handshake_message
-	}
-}
-
-impl Clone for RegisteredProtocol {
-	fn clone(&self) -> Self {
-		RegisteredProtocol {
-			id: self.id.clone(),
-			base_name: self.base_name.clone(),
-			supported_versions: self.supported_versions.clone(),
-			handshake_message: self.handshake_message.clone(),
-		}
-	}
-}
-
-/// Output of a `RegisteredProtocol` upgrade.
-pub struct RegisteredProtocolSubstream<TSubstream> {
-	/// If true, we are in the process of closing the sink.
-	is_closing: bool,
-	/// Buffer of packets to send.
-	send_queue: VecDeque<BytesMut>,
-	/// If true, we should call `poll_complete` on the inner sink.
-	requires_poll_flush: bool,
-	/// The underlying substream.
-	inner: stream::Fuse<Framed<TSubstream, UviBytes<BytesMut>>>,
-	/// If true, we have sent a "remote is clogged" event recently and shouldn't send another one
-	/// unless the buffer empties then fills itself again.
-	clogged_fuse: bool,
-}
-
-impl<TSubstream> RegisteredProtocolSubstream<TSubstream> {
-	/// Starts a graceful shutdown process on this substream.
-	///
-	/// Note that "graceful" means that we sent a closing message. We don't wait for any
-	/// confirmation from the remote.
-	///
-	/// After calling this, the stream is guaranteed to finish soon-ish.
-	pub fn shutdown(&mut self) {
-		self.is_closing = true;
-		self.send_queue.clear();
-	}
-}
-
-/// Event produced by the `RegisteredProtocolSubstream`.
-#[derive(Debug, Clone)]
-pub enum RegisteredProtocolEvent {
-	/// Received a message from the remote.
-	Message(BytesMut),
-
-	/// Diagnostic event indicating that the connection is clogged and we should avoid sending too
-	/// many messages to it.
-	Clogged,
-}
-
-impl<TSubstream> Stream for RegisteredProtocolSubstream<TSubstream>
-where TSubstream: AsyncRead + AsyncWrite + Unpin {
-	type Item = Result<RegisteredProtocolEvent, io::Error>;
-
-	fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Option<Self::Item>> {
-		// Flushing the local queue.
-		while !self.send_queue.is_empty() {
-			match Pin::new(&mut self.inner).poll_ready(cx) {
-				Poll::Ready(Ok(())) => {},
-				Poll::Ready(Err(err)) => return Poll::Ready(Some(Err(err))),
-				Poll::Pending => break,
-			}
-
-			if let Some(packet) = self.send_queue.pop_front() {
-				Pin::new(&mut self.inner).start_send(packet)?;
-				self.requires_poll_flush = true;
-			}
-		}
-
-		// If we are closing, close as soon as the Sink is closed.
-		if self.is_closing {
-			return match Pin::new(&mut self.inner).poll_close(cx) {
-				Poll::Pending => Poll::Pending,
-				Poll::Ready(Ok(_)) => Poll::Ready(None),
-				Poll::Ready(Err(err)) => Poll::Ready(Some(Err(err))),
-			}
-		}
-
-		// Indicating that the remote is clogged if that's the case.
-		if self.send_queue.len() >= 1536 {
-			if !self.clogged_fuse {
-				// Note: this fuse is important not just for preventing us from flooding the logs;
-				// 	if you remove the fuse, then we will always return early from this function and
-				//	thus never read any message from the network.
-				self.clogged_fuse = true;
-				return Poll::Ready(Some(Ok(RegisteredProtocolEvent::Clogged)))
-			}
-		} else {
-			self.clogged_fuse = false;
-		}
-
-		// Flushing if necessary.
-		if self.requires_poll_flush {
-			if let Poll::Ready(()) = Pin::new(&mut self.inner).poll_flush(cx)? {
-				self.requires_poll_flush = false;
-			}
-		}
-
-		// Receiving incoming packets.
-		// Note that `inner` is wrapped in a `Fuse`, therefore we can poll it forever.
-		match Pin::new(&mut self.inner).poll_next(cx)? {
-			Poll::Ready(Some(data)) => {
-				Poll::Ready(Some(Ok(RegisteredProtocolEvent::Message(data))))
-			}
-			Poll::Ready(None) =>
-				if !self.requires_poll_flush && self.send_queue.is_empty() {
-					Poll::Ready(None)
-				} else {
-					Poll::Pending
-				}
-			Poll::Pending => Poll::Pending,
-		}
-	}
-}
-
-impl UpgradeInfo for RegisteredProtocol {
-	type Info = RegisteredProtocolName;
-	type InfoIter = VecIntoIter<Self::Info>;
-
-	#[inline]
-	fn protocol_info(&self) -> Self::InfoIter {
-		// Report each version as an individual protocol.
-		self.supported_versions.iter().map(|&version| {
-			let num = version.to_string();
-
-			let mut name = self.base_name.clone();
-			name.extend_from_slice(num.as_bytes());
-			RegisteredProtocolName {
-				name,
-				version,
-			}
-		}).collect::<Vec<_>>().into_iter()
-	}
-}
-
-/// Implementation of `ProtocolName` for a custom protocol.
-#[derive(Debug, Clone)]
-pub struct RegisteredProtocolName {
-	/// Protocol name, as advertised on the wire.
-	name: Vec<u8>,
-	/// Version number. Stored in string form in `name`, but duplicated here for easier retrieval.
-	version: u8,
-}
-
-impl ProtocolName for RegisteredProtocolName {
-	fn protocol_name(&self) -> &[u8] {
-		&self.name
-	}
-}
-
-impl<TSubstream> InboundUpgrade<TSubstream> for RegisteredProtocol
-where TSubstream: AsyncRead + AsyncWrite + Unpin + Send + 'static,
-{
-	type Output = (RegisteredProtocolSubstream<TSubstream>, Vec<u8>);
-	type Future = Pin<Box<dyn Future<Output = Result<Self::Output, io::Error>> + Send>>;
-	type Error = io::Error;
-
-	fn upgrade_inbound(
-		self,
-		socket: TSubstream,
-		_: Self::Info,
-	) -> Self::Future {
-		Box::pin(async move {
-			let mut framed = {
-				let mut codec = UviBytes::default();
-				codec.set_max_len(16 * 1024 * 1024);		// 16 MiB hard limit for packets.
-				Framed::new(socket, codec)
-			};
-
-			let handshake = BytesMut::from(&self.handshake_message.read()[..]);
-			framed.send(handshake).await?;
-			let received_handshake = framed.next().await
-				.ok_or_else(|| io::ErrorKind::UnexpectedEof)??;
-
-			Ok((RegisteredProtocolSubstream {
-				is_closing: false,
-				send_queue: VecDeque::new(),
-				requires_poll_flush: false,
-				inner: framed.fuse(),
-				clogged_fuse: false,
-			}, received_handshake.to_vec()))
-		})
-	}
-}
-
-impl<TSubstream> OutboundUpgrade<TSubstream> for RegisteredProtocol
-where TSubstream: AsyncRead + AsyncWrite + Unpin + Send + 'static,
-{
-	type Output = <Self as InboundUpgrade<TSubstream>>::Output;
-	type Future = <Self as InboundUpgrade<TSubstream>>::Future;
-	type Error = <Self as InboundUpgrade<TSubstream>>::Error;
-
-	fn upgrade_outbound(
-		self,
-		socket: TSubstream,
-		_: Self::Info,
-	) -> Self::Future {
-		Box::pin(async move {
-			let mut framed = {
-				let mut codec = UviBytes::default();
-				codec.set_max_len(16 * 1024 * 1024);		// 16 MiB hard limit for packets.
-				Framed::new(socket, codec)
-			};
-
-			let handshake = BytesMut::from(&self.handshake_message.read()[..]);
-			framed.send(handshake).await?;
-			let received_handshake = framed.next().await
-				.ok_or_else(|| {
-					io::Error::new(io::ErrorKind::UnexpectedEof, "Failed to receive handshake")
-				})??;
-
-			Ok((RegisteredProtocolSubstream {
-				is_closing: false,
-				send_queue: VecDeque::new(),
-				requires_poll_flush: false,
-				inner: framed.fuse(),
-				clogged_fuse: false,
-			}, received_handshake.to_vec()))
-		})
-	}
-}

From aae186113c17386f54b087416c0dc41451217ba4 Mon Sep 17 00:00:00 2001
From: Wei Tang <wei@that.world>
Date: Thu, 11 Mar 2021 16:22:16 +0100
Subject: [PATCH 0489/1194] pallet-staking: add RewardDestination::None for
 explictly not receiving rewards (#8168)

---
 frame/staking/src/lib.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 7f51d246c66a..544ae29b0e6a 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -443,6 +443,8 @@ pub enum RewardDestination<AccountId> {
 	Controller,
 	/// Pay into a specified account.
 	Account(AccountId),
+	/// Receive no reward.
+	None,
 }
 
 impl<AccountId> Default for RewardDestination<AccountId> {
@@ -2499,7 +2501,8 @@ impl<T: Config> Module<T> {
 				}),
 			RewardDestination::Account(dest_account) => {
 				Some(T::Currency::deposit_creating(&dest_account, amount))
-			}
+			},
+			RewardDestination::None => None,
 		}
 	}
 

From 6b507871a2fa810a90f2ccbf3e2b3da45f2151c9 Mon Sep 17 00:00:00 2001
From: JesseAbram <33698952+JesseAbram@users.noreply.github.com>
Date: Thu, 11 Mar 2021 18:04:14 +0100
Subject: [PATCH 0490/1194] Add on_idle hook (#8209)

* add in idle hook

* remaining weight passed through to on_idle

* added weight return

* remove TODO

* weight adjustment fix

* added adjusted weight into tuple

* Update frame/support/src/dispatch.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Update frame/support/src/dispatch.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Update frame/support/src/dispatch.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Update frame/support/src/dispatch.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Update frame/support/src/dispatch.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Update frame/support/src/dispatch.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Update frame/support/src/dispatch.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* compile errors for on_idle in dispatch

* Update frame/support/src/dispatch.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Update frame/support/src/dispatch.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Update frame/support/src/dispatch.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* on idle tuple clean up

* register reduced weight

* collect and add reduced wait from on idle call

* better demo example

* Update frame/support/procedural/src/pallet/expand/hooks.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* added tests to dispatch.rs

* idle test on executive

* skip on idle if remaining weight is 0

* Update frame/executive/src/lib.rs

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

* Update frame/support/src/dispatch.rs

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

* abstract common logic out to functions

* docs

* remove demo example

* remove debug

* spacing

* docs

* revert template pallet to master

* change reduced weight to used weight

* remove empty line

* lint

* spacing

* Update frame/support/src/traits.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* documentation

* Update frame/support/procedural/src/pallet/expand/hooks.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* docs

* Update frame/support/src/traits.rs

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

* docs

* Update frame/support/src/traits.rs

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

* Update frame/support/src/traits.rs

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

* Update frame/support/src/traits.rs

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 frame/executive/src/lib.rs                    |  46 ++++-
 .../procedural/src/pallet/expand/hooks.rs     |  16 ++
 frame/support/src/dispatch.rs                 | 176 +++++++++++++++++-
 frame/support/src/lib.rs                      |   2 +-
 frame/support/src/traits.rs                   |  48 ++++-
 5 files changed, 277 insertions(+), 11 deletions(-)

diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index 9485e75bbdec..8f07aafbab27 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -119,7 +119,7 @@
 use sp_std::{prelude::*, marker::PhantomData};
 use frame_support::{
 	weights::{GetDispatchInfo, DispatchInfo, DispatchClass},
-	traits::{OnInitialize, OnFinalize, OnRuntimeUpgrade, OffchainWorker, ExecuteBlock},
+	traits::{OnInitialize, OnIdle, OnFinalize, OnRuntimeUpgrade, OffchainWorker, ExecuteBlock},
 	dispatch::PostDispatchInfo,
 };
 use sp_runtime::{
@@ -160,6 +160,7 @@ impl<
 	AllModules:
 		OnRuntimeUpgrade +
 		OnInitialize<System::BlockNumber> +
+		OnIdle<System::BlockNumber> +
 		OnFinalize<System::BlockNumber> +
 		OffchainWorker<System::BlockNumber>,
 	COnRuntimeUpgrade: OnRuntimeUpgrade,
@@ -186,6 +187,7 @@ impl<
 		UnsignedValidator,
 		AllModules: OnRuntimeUpgrade
 			+ OnInitialize<System::BlockNumber>
+			+ OnIdle<System::BlockNumber>
 			+ OnFinalize<System::BlockNumber>
 			+ OffchainWorker<System::BlockNumber>,
 		COnRuntimeUpgrade: OnRuntimeUpgrade,
@@ -349,8 +351,8 @@ where
 
 		// post-extrinsics book-keeping
 		<frame_system::Module<System>>::note_finished_extrinsics();
-		<frame_system::Module<System> as OnFinalize<System::BlockNumber>>::on_finalize(block_number);
-		<AllModules as OnFinalize<System::BlockNumber>>::on_finalize(block_number);
+
+		Self::idle_and_finalize_hook(block_number);
 	}
 
 	/// Finalize the block - it is up the caller to ensure that all header fields are valid
@@ -360,12 +362,36 @@ where
 		sp_tracing::enter_span!( sp_tracing::Level::TRACE, "finalize_block" );
 		<frame_system::Module<System>>::note_finished_extrinsics();
 		let block_number = <frame_system::Module<System>>::block_number();
-		<frame_system::Module<System> as OnFinalize<System::BlockNumber>>::on_finalize(block_number);
-		<AllModules as OnFinalize<System::BlockNumber>>::on_finalize(block_number);
+
+		Self::idle_and_finalize_hook(block_number);
 
 		<frame_system::Module<System>>::finalize()
 	}
 
+	fn idle_and_finalize_hook(block_number: NumberFor<Block>) {
+		let weight =  <frame_system::Module<System>>::block_weight();
+		let max_weight =  <System::BlockWeights as frame_support::traits::Get<_>>::get().max_block;
+		let mut remaining_weight = max_weight.saturating_sub(weight.total());
+
+		if remaining_weight > 0 {
+			let mut used_weight =
+                <frame_system::Module<System> as OnIdle<System::BlockNumber>>::on_idle(
+                    block_number,
+                    remaining_weight
+                );
+			remaining_weight = remaining_weight.saturating_sub(used_weight);
+			used_weight = <AllModules as OnIdle<System::BlockNumber>>::on_idle(
+                block_number,
+                remaining_weight
+            )
+            .saturating_add(used_weight);
+			<frame_system::Module::<System>>::register_extra_weight_unchecked(used_weight, DispatchClass::Mandatory);
+		}
+
+		<frame_system::Module<System> as OnFinalize<System::BlockNumber>>::on_finalize(block_number);
+		<AllModules as OnFinalize<System::BlockNumber>>::on_finalize(block_number);
+	}
+
 	/// Apply extrinsic outside of the block execution function.
 	///
 	/// This doesn't attempt to validate anything regarding the block, but it builds a list of uxt
@@ -555,6 +581,11 @@ mod tests {
 					175
 				}
 
+				fn on_idle(n: T::BlockNumber, remaining_weight: Weight) -> Weight {
+					println!("on_idle{}, {})", n, remaining_weight);
+					175
+				}
+
 				fn on_finalize() {
 					println!("on_finalize(?)");
 				}
@@ -769,7 +800,7 @@ mod tests {
 				header: Header {
 					parent_hash: [69u8; 32].into(),
 					number: 1,
-					state_root: hex!("2c01e6f33d595793119823478b45b36978a8f65a731b5ae3fdfb6330b4cd4b11").into(),
+					state_root: hex!("6e70de4fa07bac443dc7f8a812c8a0c941aacfa892bb373c5899f7d511d4c25b").into(),
 					extrinsics_root: hex!("03170a2e7597b7b7e3d84c05391d139a62b157e78786d8c082f29dcf4c111314").into(),
 					digest: Digest { logs: vec![], },
 				},
@@ -1006,10 +1037,11 @@ mod tests {
 		new_test_ext(1).execute_with(|| {
 
 			Executive::initialize_block(&Header::new_from_number(1));
+			Executive::finalize_block();
 			// NOTE: might need updates over time if new weights are introduced.
 			// For now it only accounts for the base block execution weight and
 			// the `on_initialize` weight defined in the custom test module.
-			assert_eq!(<frame_system::Module<Runtime>>::block_weight().total(), 175 + 10);
+			assert_eq!(<frame_system::Module<Runtime>>::block_weight().total(), 175 + 175  + 10);
 		})
 	}
 
diff --git a/frame/support/procedural/src/pallet/expand/hooks.rs b/frame/support/procedural/src/pallet/expand/hooks.rs
index d55a74209d05..3976f2c602dd 100644
--- a/frame/support/procedural/src/pallet/expand/hooks.rs
+++ b/frame/support/procedural/src/pallet/expand/hooks.rs
@@ -63,6 +63,22 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 			}
 		}
 
+		impl<#type_impl_gen>
+			#frame_support::traits::OnIdle<<T as #frame_system::Config>::BlockNumber>
+			for #pallet_ident<#type_use_gen> #where_clause
+		{
+			fn on_idle(
+				n: <T as #frame_system::Config>::BlockNumber,
+				remaining_weight: #frame_support::weights::Weight
+			) -> #frame_support::weights::Weight {
+				<
+					Self as #frame_support::traits::Hooks<
+						<T as #frame_system::Config>::BlockNumber
+					>
+				>::on_idle(n, remaining_weight)
+			}
+		}
+
 		impl<#type_impl_gen>
 			#frame_support::traits::OnInitialize<<T as #frame_system::Config>::BlockNumber>
 			for #pallet_ident<#type_use_gen> #where_clause
diff --git a/frame/support/src/dispatch.rs b/frame/support/src/dispatch.rs
index 4dd2c83f1578..64b7b7a8e218 100644
--- a/frame/support/src/dispatch.rs
+++ b/frame/support/src/dispatch.rs
@@ -300,6 +300,12 @@ impl<T> Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 ///   * `fn on_initialize(n: BlockNumber) -> frame_support::weights::Weight` or
 ///   * `fn on_initialize() -> frame_support::weights::Weight`
 ///
+/// * `on_idle`: Executes at the end of a block. Passes a remaining weight to provide a threshold
+/// for when to execute non vital functions. Using this function will implement the
+/// [`OnIdle`](./traits/trait.OnIdle.html) trait.
+/// Function signature is:
+///   * `fn on_idle(n: BlockNumber, remaining_weight: Weight) -> frame_support::weights::Weight`
+///
 /// * `on_finalize`: Executes at the end of a block. Using this function will
 /// implement the [`OnFinalize`](./traits/trait.OnFinalize.html) trait.
 /// Function signature can be either:
@@ -340,6 +346,7 @@ macro_rules! decl_module {
 			{}
 			{}
 			{}
+			{}
 			[]
 			$($t)*
 		);
@@ -375,6 +382,7 @@ macro_rules! decl_module {
 			{}
 			{}
 			{}
+			{}
 			[]
 			$($t)*
 		);
@@ -389,6 +397,7 @@ macro_rules! decl_module {
 		{}
 		{ $( $on_initialize:tt )* }
 		{ $( $on_runtime_upgrade:tt )* }
+		{ $( $on_idle:tt )* }
 		{ $( $on_finalize:tt )* }
 		{ $( $offchain:tt )* }
 		{ $( $constants:tt )* }
@@ -407,6 +416,7 @@ macro_rules! decl_module {
 			{ $vis fn deposit_event() = default; }
 			{ $( $on_initialize )* }
 			{ $( $on_runtime_upgrade )* }
+			{ $( $on_idle )* }
 			{ $( $on_finalize )* }
 			{ $( $offchain )* }
 			{ $( $constants )* }
@@ -424,6 +434,7 @@ macro_rules! decl_module {
 		{}
 		{ $( $on_initialize:tt )* }
 		{ $( $on_runtime_upgrade:tt )* }
+		{ $( $on_idle:tt )* }
 		{ $( $on_finalize:tt )* }
 		{ $( $offchain:tt )* }
 		{ $( $constants:tt )* }
@@ -449,6 +460,7 @@ macro_rules! decl_module {
 		{ $( $deposit_event:tt )+ }
 		{ $( $on_initialize:tt )* }
 		{ $( $on_runtime_upgrade:tt )* }
+		{ $( $on_idle:tt )* }
 		{ $( $on_finalize:tt )* }
 		{ $( $offchain:tt )* }
 		{ $( $constants:tt )* }
@@ -470,6 +482,7 @@ macro_rules! decl_module {
 		{ $( $deposit_event:tt )* }
 		{ $( $on_initialize:tt )* }
 		{ $( $on_runtime_upgrade:tt )* }
+		{ $( $on_idle:tt )* }
 		{}
 		{ $( $offchain:tt )* }
 		{ $( $constants:tt )* }
@@ -488,6 +501,7 @@ macro_rules! decl_module {
 			{ $( $deposit_event )* }
 			{ $( $on_initialize )* }
 			{ $( $on_runtime_upgrade )* }
+			{ $( $on_idle )* }
 			{
 				fn on_finalize( $( $param_name : $param ),* ) { $( $impl )* }
 			}
@@ -508,6 +522,7 @@ macro_rules! decl_module {
 		{ $( $deposit_event:tt )* }
 		{ $( $on_initialize:tt )* }
 		{ $( $on_runtime_upgrade:tt )* }
+		{ $( $on_idle:tt )* }
 		{}
 		{ $( $offchain:tt )* }
 		{ $( $constants:tt )* }
@@ -535,6 +550,7 @@ macro_rules! decl_module {
 		{ $( $deposit_event:tt )* }
 		{ $( $on_initialize:tt )* }
 		{ $( $on_runtime_upgrade:tt )* }
+		{ $( $on_idle:tt )* }
 		{ $( $on_finalize:tt )+ }
 		{ $( $offchain:tt )* }
 		{ $( $constants:tt )* }
@@ -548,6 +564,72 @@ macro_rules! decl_module {
 	) => {
 		compile_error!("`on_finalize` can only be passed once as input.");
 	};
+
+	// Add on_idle
+	(@normalize
+		$(#[$attr:meta])*
+		pub struct $mod_type:ident<$trait_instance:ident: $trait_name:ident$(<I>, I: $instantiable:path $(= $module_default_instance:path)?)?>
+		for enum $call_type:ident where origin: $origin_type:ty, system = $system:ident
+		{ $( $other_where_bounds:tt )* }
+		{ $( $deposit_event:tt )* }
+		{ $( $on_initialize:tt )* }
+		{ $( $on_runtime_upgrade:tt )* }
+		{}
+		{ $( $on_finalize:tt )* }
+		{ $( $offchain:tt )* }
+		{ $( $constants:tt )* }
+		{ $( $error_type:tt )* }
+		{ $( $integrity_test:tt )* }
+		[ $( $dispatchables:tt )* ]
+		$(#[doc = $doc_attr:tt])*
+		fn on_idle($param_name1:ident : $param1:ty, $param_name2:ident: $param2:ty $(,)? ) -> $return:ty { $( $impl:tt )* }
+		$($rest:tt)*
+	) => {
+		$crate::decl_module!(@normalize
+			$(#[$attr])*
+			pub struct $mod_type<$trait_instance: $trait_name$(<I>, I: $instantiable $(= $module_default_instance)?)?>
+			for enum $call_type where origin: $origin_type, system = $system
+			{ $( $other_where_bounds )* }
+			{ $( $deposit_event )* }
+			{ $( $on_initialize )* }
+			{ $( $on_runtime_upgrade )* }
+			{
+				fn on_idle( $param_name1: $param1, $param_name2: $param2 ) -> $return { $( $impl )* }
+			}
+			{ $( $on_finalize:tt )* }
+			{ $( $offchain )* }
+			{ $( $constants )* }
+			{ $( $error_type )* }
+			{ $( $integrity_test)* }
+			[ $( $dispatchables )* ]
+			$($rest)*
+		);
+	};
+	// compile_error for invalid on_idle function signature in decl_module
+	(@normalize
+		$(#[$attr:meta])*
+		pub struct $mod_type:ident<
+			$trait_instance:ident: $trait_name:ident$(<I>, I: $instantiable:path $(= $module_default_instance:path)?)?
+		>
+		for enum $call_type:ident where origin: $origin_type:ty, system = $system:ident
+		{ $( $other_where_bounds:tt )* }
+		{ $( $deposit_event:tt )* }
+		{ $( $on_initialize:tt )* }
+		{ $( $on_runtime_upgrade:tt )* }
+		{ $( $on_finalize:tt )* }
+		{ $( $offchain:tt )* }
+		{ $( $constants:tt )* }
+		{ $( $error_type:tt )* }
+		{ $( $integrity_test:tt )* }
+		[ $( $dispatchables:tt )* ]
+		$(#[doc = $doc_attr:tt])*
+		$(#[weight = $weight:expr])?
+		fn on_idle
+		$($rest:tt)*
+	) => {
+		compile_error!("`on_idle` method is reserved and syntax doesn't match expected syntax.");
+	};
+
 	// compile_error on_runtime_upgrade, without a given weight removed syntax.
 	(@normalize
 		$(#[$attr:meta])*
@@ -559,6 +641,7 @@ macro_rules! decl_module {
 		{ $( $deposit_event:tt )* }
 		{ $( $on_initialize:tt )* }
 		{}
+		{ $( $on_idle:tt )* }
 		{ $( $on_finalize:tt )* }
 		{ $( $offchain:tt )* }
 		{ $( $constants:tt )* }
@@ -584,6 +667,7 @@ macro_rules! decl_module {
 		{ $( $deposit_event:tt )* }
 		{ $( $on_initialize:tt )* }
 		{}
+		{ $( $on_idle:tt )* }
 		{ $( $on_finalize:tt )* }
 		{ $( $offchain:tt )* }
 		{ $( $constants:tt )* }
@@ -611,6 +695,7 @@ macro_rules! decl_module {
 		{ $( $deposit_event:tt )* }
 		{ $( $on_initialize:tt )* }
 		{}
+		{ $( $on_idle:tt )* }
 		{ $( $on_finalize:tt )* }
 		{ $( $offchain:tt )* }
 		{ $( $constants:tt )* }
@@ -631,6 +716,7 @@ macro_rules! decl_module {
 			{
 				fn on_runtime_upgrade( $( $param_name : $param ),* ) -> $return { $( $impl )* }
 			}
+			{ $( $on_idle )* }
 			{ $( $on_finalize )* }
 			{ $( $offchain )* }
 			{ $( $constants )* }
@@ -651,6 +737,7 @@ macro_rules! decl_module {
 		{ $( $deposit_event:tt )* }
 		{ $( $on_initialize:tt )* }
 		{ $( $on_runtime_upgrade:tt )+ }
+		{ $( $on_idle:tt )* }
 		{ $( $on_finalize:tt )* }
 		{ $( $offchain:tt )* }
 		{ $( $constants:tt )* }
@@ -674,6 +761,7 @@ macro_rules! decl_module {
 		{ $( $deposit_event:tt )* }
 		{ $( $on_initialize:tt )* }
 		{ $( $on_runtime_upgrade:tt )* }
+		{ $( $on_idle:tt )* }
 		{ $( $on_finalize:tt )* }
 		{ $( $offchain:tt )* }
 		{ $( $constants:tt )* }
@@ -692,6 +780,7 @@ macro_rules! decl_module {
 			{ $( $deposit_event )* }
 			{ $( $on_initialize )* }
 			{ $( $on_runtime_upgrade )* }
+			{ $( $on_idle )* }
 			{ $( $on_finalize )* }
 			{ $( $offchain )* }
 			{ $( $constants )* }
@@ -715,6 +804,7 @@ macro_rules! decl_module {
 		{ $( $deposit_event:tt )* }
 		{ $( $on_initialize:tt )* }
 		{ $( $on_runtime_upgrade:tt )* }
+		{ $( $on_idle:tt )* }
 		{ $( $on_finalize:tt )* }
 		{ $( $offchain:tt )* }
 		{ $( $constants:tt )* }
@@ -738,6 +828,7 @@ macro_rules! decl_module {
 		{ $( $deposit_event:tt )* }
 		{}
 		{ $( $on_runtime_upgrade:tt )* }
+		{ $( $on_idle:tt )* }
 		{ $( $on_finalize:tt )* }
 		{ $( $offchain:tt )* }
 		{ $( $constants:tt )* }
@@ -763,6 +854,7 @@ macro_rules! decl_module {
 		{ $( $deposit_event:tt )* }
 		{}
 		{ $( $on_runtime_upgrade:tt )* }
+		{ $( $on_idle:tt )* }
 		{ $( $on_finalize:tt )* }
 		{ $( $offchain:tt )* }
 		{ $( $constants:tt )* }
@@ -790,6 +882,7 @@ macro_rules! decl_module {
 		{ $( $deposit_event:tt )* }
 		{}
 		{ $( $on_runtime_upgrade:tt )* }
+		{ $( $on_idle:tt )* }
 		{ $( $on_finalize:tt )* }
 		{ $( $offchain:tt )* }
 		{ $( $constants:tt )* }
@@ -810,6 +903,7 @@ macro_rules! decl_module {
 				fn on_initialize( $( $param_name : $param ),* ) -> $return { $( $impl )* }
 			}
 			{ $( $on_runtime_upgrade )* }
+			{ $( $on_idle )* }
 			{ $( $on_finalize )* }
 			{ $( $offchain )* }
 			{ $( $constants )* }
@@ -830,6 +924,7 @@ macro_rules! decl_module {
 		{ $( $deposit_event:tt )* }
 		{ $( $on_initialize:tt )+ }
 		{ $( $on_runtime_upgrade:tt )* }
+		{ $( $on_idle:tt )* }
 		{ $( $on_finalize:tt )* }
 		{ $( $offchain:tt )* }
 		{ $( $constants:tt )* }
@@ -853,6 +948,7 @@ macro_rules! decl_module {
 		{ $( $deposit_event:tt )* }
 		{ $( $on_initialize:tt )* }
 		{ $( $on_runtime_upgrade:tt )* }
+		{ $( $on_idle:tt )* }
 		{ $( $on_finalize:tt )* }
 		{ }
 		{ $( $constants:tt )* }
@@ -873,6 +969,7 @@ macro_rules! decl_module {
 			{ $( $deposit_event )* }
 			{ $( $on_initialize )* }
 			{ $( $on_runtime_upgrade )* }
+			{ $( $on_idle )* }
 			{ $( $on_finalize )* }
 			{ fn offchain_worker( $( $param_name : $param ),* ) { $( $impl )* } }
 			{ $( $constants )* }
@@ -893,6 +990,7 @@ macro_rules! decl_module {
 		{ $( $deposit_event:tt )* }
 		{ $( $on_initialize:tt )* }
 		{ $( $on_runtime_upgrade:tt )* }
+		{ $( $on_idle:tt )* }
 		{ $( $on_finalize:tt )* }
 		{ $( $offchain:tt )+ }
 		{ $( $constants:tt )* }
@@ -917,6 +1015,7 @@ macro_rules! decl_module {
 		{ $( $deposit_event:tt )* }
 		{ $( $on_initialize:tt )* }
 		{ $( $on_runtime_upgrade:tt )* }
+		{ $( $on_idle:tt )* }
 		{ $( $on_finalize:tt )* }
 		{ $( $offchain:tt )* }
 		{ $( $constants:tt )* }
@@ -938,6 +1037,7 @@ macro_rules! decl_module {
 			{ $( $deposit_event )* }
 			{ $( $on_initialize )* }
 			{ $( $on_runtime_upgrade )* }
+			{ $( $on_idle )* }
 			{ $( $on_finalize )* }
 			{ $( $offchain )* }
 			{
@@ -964,6 +1064,7 @@ macro_rules! decl_module {
 		{ $( $deposit_event:tt )* }
 		{ $( $on_initialize:tt )* }
 		{ $( $on_runtime_upgrade:tt )* }
+		{ $( $on_idle:tt )* }
 		{ $( $on_finalize:tt )* }
 		{ $( $offchain:tt )* }
 		{ $( $constants:tt )* }
@@ -984,6 +1085,7 @@ macro_rules! decl_module {
 			{ $( $deposit_event )* }
 			{ $( $on_initialize )* }
 			{ $( $on_runtime_upgrade )* }
+			{ $( $on_idle )* }
 			{ $( $on_finalize )* }
 			{ $( $offchain )* }
 			{ $( $constants )* }
@@ -1005,6 +1107,7 @@ macro_rules! decl_module {
 		{ $( $deposit_event:tt )* }
 		{ $( $on_initialize:tt )* }
 		{ $( $on_runtime_upgrade:tt )* }
+		{ $( $on_idle:tt )* }
 		{ $( $on_finalize:tt )* }
 		{ $( $offchain:tt )* }
 		{ $( $constants:tt )* }
@@ -1023,6 +1126,7 @@ macro_rules! decl_module {
 			{ $( $deposit_event )* }
 			{ $( $on_initialize )* }
 			{ $( $on_runtime_upgrade )* }
+			{ $( $on_idle )* }
 			{ $( $on_finalize )* }
 			{ $( $offchain )* }
 			{ $( $constants )* }
@@ -1045,6 +1149,7 @@ macro_rules! decl_module {
 		{ $( $deposit_event:tt )* }
 		{ $( $on_initialize:tt )* }
 		{ $( $on_runtime_upgrade:tt )* }
+		{ $( $on_idle:tt )* }
 		{ $( $on_finalize:tt )* }
 		{ $( $offchain:tt )* }
 		{ $( $constants:tt )* }
@@ -1069,6 +1174,7 @@ macro_rules! decl_module {
 			{ $( $deposit_event )* }
 			{ $( $on_initialize )* }
 			{ $( $on_runtime_upgrade )* }
+			{ $( $on_idle )* }
 			{ $( $on_finalize )* }
 			{ $( $offchain )* }
 			{ $( $constants )* }
@@ -1099,6 +1205,7 @@ macro_rules! decl_module {
 		{ $( $deposit_event:tt )* }
 		{ $( $on_initialize:tt )* }
 		{ $( $on_runtime_upgrade:tt )* }
+		{ $( $on_idle:tt )* }
 		{ $( $on_finalize:tt )* }
 		{ $( $offchain:tt )* }
 		{ $( $constants:tt )* }
@@ -1127,6 +1234,7 @@ macro_rules! decl_module {
 		{ $( $deposit_event:tt )* }
 		{ $( $on_initialize:tt )* }
 		{ $( $on_runtime_upgrade:tt )* }
+		{ $( $on_idle:tt )* }
 		{ $( $on_finalize:tt )* }
 		{ $( $offchain:tt )* }
 		{ $( $constants:tt )* }
@@ -1155,6 +1263,7 @@ macro_rules! decl_module {
 		{ $( $deposit_event:tt )* }
 		{ $( $on_initialize:tt )* }
 		{ $( $on_runtime_upgrade:tt )* }
+		{ $( $on_idle:tt )* }
 		{ $( $on_finalize:tt )* }
 		{ $( $offchain:tt )* }
 		{ $( $constants:tt )* }
@@ -1183,6 +1292,7 @@ macro_rules! decl_module {
 		{ $( $deposit_event:tt )* }
 		{ $( $on_initialize:tt )* }
 		{ $( $on_runtime_upgrade:tt )* }
+		{ $( $on_idle:tt )* }
 		{ $( $on_finalize:tt )* }
 		{ $( $offchain:tt )* }
 		{ $( $constants:tt )* }
@@ -1212,6 +1322,7 @@ macro_rules! decl_module {
 		{ $( $deposit_event:tt )* }
 		{ $( $on_initialize:tt )* }
 		{ $( $on_runtime_upgrade:tt )* }
+		{ $( $on_idle:tt )* }
 		{ $( $on_finalize:tt )* }
 		{ $( $offchain:tt )* }
 		{ $( $constants:tt )* }
@@ -1229,6 +1340,7 @@ macro_rules! decl_module {
 			{ $( $deposit_event )* }
 			{ $( $on_initialize )* }
 			{ $( $on_runtime_upgrade )* }
+			{ $( $on_idle )* }
 			{ $( $on_finalize )* }
 			{ $( $offchain )* }
 			{ $( $constants )* }
@@ -1485,6 +1597,35 @@ macro_rules! decl_module {
 		}
 	};
 
+	(@impl_on_idle
+		{ $system:ident }
+		$module:ident<$trait_instance:ident: $trait_name:ident$(<I>, $instance:ident: $instantiable:path)?>;
+		{ $( $other_where_bounds:tt )* }
+		fn on_idle($param1:ident : $param1_ty:ty, $param2:ident: $param2_ty:ty) -> $return:ty { $( $impl:tt )* }
+	) => {
+		impl<$trait_instance: $system::Config + $trait_name$(<I>, $instance: $instantiable)?>
+			$crate::traits::OnIdle<<$trait_instance as $system::Config>::BlockNumber>
+			for $module<$trait_instance$(, $instance)?> where $( $other_where_bounds )*
+		{
+			fn on_idle($param1: $param1_ty, $param2: $param2_ty) -> $return {
+				$crate::sp_tracing::enter_span!($crate::sp_tracing::trace_span!("on_idle"));
+				{ $( $impl )* }
+			}
+		}
+	};
+
+	(@impl_on_idle
+		{ $system:ident }
+		$module:ident<$trait_instance:ident: $trait_name:ident$(<I>, $instance:ident: $instantiable:path)?>;
+		{ $( $other_where_bounds:tt )* }
+	) => {
+		impl<$trait_instance: $system::Config + $trait_name$(<I>, $instance: $instantiable)?>
+			$crate::traits::OnIdle<<$trait_instance as $system::Config>::BlockNumber>
+			for $module<$trait_instance$(, $instance)?> where $( $other_where_bounds )*
+		{
+		}
+	};
+
 	(@impl_offchain
 		{ $system:ident }
 		$module:ident<$trait_instance:ident: $trait_name:ident$(<I>, $instance:ident: $instantiable:path)?>;
@@ -1700,6 +1841,7 @@ macro_rules! decl_module {
 		{ $( $deposit_event:tt )* }
 		{ $( $on_initialize:tt )* }
 		{ $( $on_runtime_upgrade:tt )* }
+		{ $( $on_idle:tt )* }
 		{ $( $on_finalize:tt )* }
 		{ $( $offchain:tt )* }
 		{ $( $constants:tt )* }
@@ -1741,6 +1883,14 @@ macro_rules! decl_module {
 			$( $on_finalize )*
 		}
 
+		$crate::decl_module! {
+			@impl_on_idle
+			{ $system }
+			$mod_type<$trait_instance: $trait_name $(<I>, $instance: $instantiable)?>;
+			{ $( $other_where_bounds )* }
+			$( $on_idle )*
+		}
+
 		$crate::decl_module! {
 			@impl_offchain
 			{ $system }
@@ -2415,6 +2565,9 @@ macro_rules! __check_reserved_fn_name {
 	(on_runtime_upgrade $( $rest:ident )*) => {
 		$crate::__check_reserved_fn_name!(@compile_error on_runtime_upgrade);
 	};
+	(on_idle $( $rest:ident )*) => {
+		$crate::__check_reserved_fn_name!(@compile_error on_idle);
+	};
 	(on_finalize $( $rest:ident )*) => {
 		$crate::__check_reserved_fn_name!(@compile_error on_finalize);
 	};
@@ -2459,7 +2612,7 @@ mod tests {
 	use super::*;
 	use crate::weights::{DispatchInfo, DispatchClass, Pays, RuntimeDbWeight};
 	use crate::traits::{
-		CallMetadata, GetCallMetadata, GetCallName, OnInitialize, OnFinalize, OnRuntimeUpgrade,
+		CallMetadata, GetCallMetadata, GetCallName, OnInitialize, OnFinalize, OnIdle, OnRuntimeUpgrade,
 		IntegrityTest, Get, PalletInfo,
 	};
 
@@ -2522,6 +2675,10 @@ mod tests {
 			fn operational(_origin) { unreachable!() }
 
 			fn on_initialize(n: T::BlockNumber,) -> Weight { if n.into() == 42 { panic!("on_initialize") } 7 }
+			fn on_idle(n: T::BlockNumber, remaining_weight: Weight,) -> Weight {
+				if n.into() == 42 || remaining_weight == 42  { panic!("on_idle") }
+				7
+			}
 			fn on_finalize(n: T::BlockNumber,) { if n.into() == 42 { panic!("on_finalize") } }
 			fn on_runtime_upgrade() -> Weight { 10 }
 			fn offchain_worker() {}
@@ -2687,6 +2844,23 @@ mod tests {
 		assert_eq!(<Module<TraitImpl> as OnInitialize<u32>>::on_initialize(10), 7);
 	}
 
+	#[test]
+	#[should_panic(expected = "on_idle")]
+	fn on_idle_should_work_1() {
+		<Module<TraitImpl> as OnIdle<u32>>::on_idle(42, 9);
+	}
+
+	#[test]
+	#[should_panic(expected = "on_idle")]
+	fn on_idle_should_work_2() {
+		<Module<TraitImpl> as OnIdle<u32>>::on_idle(9, 42);
+	}
+
+	#[test]
+	fn on_idle_should_work_3() {
+		assert_eq!(<Module<TraitImpl> as OnIdle<u32>>::on_idle(10, 11), 7);
+	}
+
 	#[test]
 	#[should_panic(expected = "on_finalize")]
 	fn on_finalize_should_work() {
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 3c3fc20a530d..a06fd7a1d9b9 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -1223,7 +1223,7 @@ pub mod pallet_prelude {
 ///
 /// ### Macro expansion:
 ///
-/// The macro implements the traits `OnInitialize`, `OnFinalize`, `OnRuntimeUpgrade`,
+/// The macro implements the traits `OnInitialize`, `OnIdle`, `OnFinalize`, `OnRuntimeUpgrade`,
 /// `OffchainWorker`, `IntegrityTest` using `Hooks` implementation.
 ///
 /// NOTE: OnRuntimeUpgrade is implemented with `Hooks::on_runtime_upgrade` and some additional
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index 1427a727a15d..b4e5ba744c50 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -1522,6 +1522,38 @@ pub trait OnFinalize<BlockNumber> {
 	fn on_finalize(_n: BlockNumber) {}
 }
 
+/// The block's on idle trait.
+///
+/// Implementing this lets you express what should happen for your pallet before
+/// block finalization (see `on_finalize` hook) in case any remaining weight is left.
+pub trait OnIdle<BlockNumber> {
+	/// The block is being finalized.
+	/// Implement to have something happen in case there is leftover weight.
+	/// Check the passed `remaining_weight` to make sure it is high enough to allow for
+	/// your pallet's extra computation.
+	///
+	/// NOTE: This function is called AFTER ALL extrinsics - including inherent extrinsics -
+	/// in a block are applied but before `on_finalize` is executed.
+	fn on_idle(
+		_n: BlockNumber,
+		_remaining_weight: crate::weights::Weight
+	) -> crate::weights::Weight {
+		0
+	}
+}
+
+#[impl_for_tuples(30)]
+impl<BlockNumber: Clone> OnIdle<BlockNumber> for Tuple {
+	fn on_idle(n: BlockNumber,  remaining_weight: crate::weights::Weight) -> crate::weights::Weight {
+		let mut weight = 0;
+		for_tuples!( #(
+			let adjusted_remaining_weight = remaining_weight.saturating_sub(weight);
+			weight = weight.saturating_add(Tuple::on_idle(n.clone(),  adjusted_remaining_weight));
+		)* );
+		weight
+	}
+}
+
 /// The block initialization trait.
 ///
 /// Implementing this lets you express what should happen for your pallet when the block is
@@ -1539,9 +1571,9 @@ pub trait OnInitialize<BlockNumber> {
 
 #[impl_for_tuples(30)]
 impl<BlockNumber: Clone> OnInitialize<BlockNumber> for Tuple {
-	fn on_initialize(_n: BlockNumber) -> crate::weights::Weight {
+	fn on_initialize(n: BlockNumber) -> crate::weights::Weight {
 		let mut weight = 0;
-		for_tuples!( #( weight = weight.saturating_add(Tuple::on_initialize(_n.clone())); )* );
+		for_tuples!( #( weight = weight.saturating_add(Tuple::on_initialize(n.clone())); )* );
 		weight
 	}
 }
@@ -2039,6 +2071,18 @@ pub trait Hooks<BlockNumber> {
 	/// The block is being finalized. Implement to have something happen.
 	fn on_finalize(_n: BlockNumber) {}
 
+	/// This will be run when the block is being finalized (before `on_finalize`).
+	/// Implement to have something happen using the remaining weight.
+	/// Will not fire if the remaining weight is 0.
+	/// Return the weight used, the hook will subtract it from current weight used
+	/// and pass the result to the next `on_idle` hook if it exists.
+	fn on_idle(
+		_n: BlockNumber,
+		_remaining_weight: crate::weights::Weight
+	) -> crate::weights::Weight {
+		0
+	}
+
 	/// The block is being initialized. Implement to have something happen.
 	///
 	/// Return the non-negotiable weight consumed in the block.

From 8b3e5bc7cd056112d390920fca5a554b2d0b0475 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Thu, 11 Mar 2021 20:07:52 +0100
Subject: [PATCH 0491/1194] Fix #8306 (#8330)

---
 .../src/protocol/generic_proto/behaviour.rs   | 52 ++++++++-----------
 1 file changed, 23 insertions(+), 29 deletions(-)

diff --git a/client/network/src/protocol/generic_proto/behaviour.rs b/client/network/src/protocol/generic_proto/behaviour.rs
index 77a54e09ea7b..05247dc6f0e6 100644
--- a/client/network/src/protocol/generic_proto/behaviour.rs
+++ b/client/network/src/protocol/generic_proto/behaviour.rs
@@ -1759,6 +1759,7 @@ impl NetworkBehaviour for GenericProto {
 						}
 					},
 
+					Some(PeerState::Incoming { connections, .. }) |
 					Some(PeerState::DisabledPendingEnable { connections, .. }) |
 					Some(PeerState::Disabled { connections, .. }) => {
 						if let Some((_, connec_state)) = connections.iter_mut().find(|(c, s)|
@@ -1830,36 +1831,29 @@ impl NetworkBehaviour for GenericProto {
 							*entry.into_mut() = PeerState::Enabled { connections };
 						}
 					},
-					PeerState::Disabled { mut connections, backoff_until } => {
-						if let Some((_, connec_state)) = connections.iter_mut().find(|(c, s)|
-							*c == connection && matches!(s, ConnectionState::OpeningThenClosing))
-						{
-							*connec_state = ConnectionState::Closing;
-						} else {
-							error!(target: "sub-libp2p",
-								"OpenResultErr: State mismatch in the custom protos handler");
-							debug_assert!(false);
-						}
-
-						*entry.into_mut() = PeerState::Disabled { connections, backoff_until };
-					},
-					PeerState::DisabledPendingEnable { mut connections, timer, timer_deadline } => {
-						if let Some((_, connec_state)) = connections.iter_mut().find(|(c, s)|
-							*c == connection && matches!(s, ConnectionState::OpeningThenClosing))
-						{
-							*connec_state = ConnectionState::Closing;
-						} else {
-							error!(target: "sub-libp2p",
-								"OpenResultErr: State mismatch in the custom protos handler");
-							debug_assert!(false);
-						}
-
-						*entry.into_mut() = PeerState::DisabledPendingEnable {
-							connections,
-							timer,
-							timer_deadline,
+					mut state @ PeerState::Incoming { .. } |
+					mut state @ PeerState::DisabledPendingEnable { .. } |
+					mut state @ PeerState::Disabled { .. } => {
+						match &mut state {
+							PeerState::Incoming { connections, .. } |
+							PeerState::Disabled { connections, .. } |
+							PeerState::DisabledPendingEnable { connections, .. } => {
+								if let Some((_, connec_state)) = connections.iter_mut().find(|(c, s)|
+									*c == connection && matches!(s, ConnectionState::OpeningThenClosing))
+								{
+									*connec_state = ConnectionState::Closing;
+								} else {
+									error!(target: "sub-libp2p",
+										"OpenResultErr: State mismatch in the custom protos handler");
+									debug_assert!(false);
+								}
+							},
+							_ => unreachable!("Match branches are the same as the one on which we
+							enter this block; qed"),
 						};
-					},
+
+						*entry.into_mut() = state;
+					}
 					state => {
 						error!(target: "sub-libp2p",
 							"Unexpected state in the custom protos handler: {:?}",

From 1e045f218db16027197dc11ac04220896321260f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Thu, 11 Mar 2021 23:33:34 +0100
Subject: [PATCH 0492/1194] Convert timestamp to unit type wrapper (#8333)

The timestamp inherent type was up to now just a simple `u64`. This
worked, but doesn't give you that much guarantees at compile time about
the type. This pr changes that by converting this type to a unit type
wrapper, similar to what we have done for `Slot`.

This is required for some future pr that touches quite a lot of the
inherents stuff :)

Besides this unit wrapper type, this pr also moves the `OnTimestampSet`
trait to `frame_support::traits`.
---
 Cargo.lock                                    |  3 -
 client/consensus/aura/src/lib.rs              |  6 +-
 client/consensus/babe/src/lib.rs              |  6 +-
 .../manual-seal/src/consensus/babe.rs         |  7 +-
 client/consensus/pow/src/lib.rs               |  2 +-
 frame/aura/Cargo.toml                         |  2 -
 frame/aura/src/lib.rs                         |  5 +-
 frame/babe/Cargo.toml                         |  2 -
 frame/babe/src/lib.rs                         |  3 +-
 frame/support/src/traits.rs                   |  7 ++
 frame/timestamp/src/lib.rs                    | 16 ++--
 primitives/consensus/aura/src/inherents.rs    |  2 +-
 primitives/consensus/babe/src/inherents.rs    |  2 +-
 primitives/std/with_std.rs                    |  1 +
 primitives/std/without_std.rs                 |  1 +
 primitives/timestamp/Cargo.toml               |  1 -
 primitives/timestamp/src/lib.rs               | 90 ++++++++++++++++---
 17 files changed, 113 insertions(+), 43 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 25bcac940d25..2e00f515d318 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4546,7 +4546,6 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-std",
- "sp-timestamp",
 ]
 
 [[package]]
@@ -4611,7 +4610,6 @@ dependencies = [
  "sp-session",
  "sp-staking",
  "sp-std",
- "sp-timestamp",
 ]
 
 [[package]]
@@ -9042,7 +9040,6 @@ dependencies = [
 name = "sp-timestamp"
 version = "3.0.0"
 dependencies = [
- "impl-trait-for-tuples",
  "parity-scale-codec",
  "sp-api",
  "sp-inherents",
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index bdeb4f15f322..cce58304d0d0 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -54,7 +54,7 @@ use sp_api::ProvideRuntimeApi;
 use sp_core::crypto::Pair;
 use sp_keystore::{SyncCryptoStorePtr, SyncCryptoStore};
 use sp_inherents::{InherentDataProviders, InherentData};
-use sp_timestamp::{TimestampInherentData, InherentType as TimestampInherent};
+use sp_timestamp::TimestampInherentData;
 use sc_consensus_slots::{SlotInfo, SlotCompatible, StorageChanges, BackoffAuthoringBlocksStrategy};
 use sc_telemetry::TelemetryHandle;
 use sp_consensus_slots::Slot;
@@ -111,12 +111,12 @@ impl SlotCompatible for AuraSlotCompatible {
 	fn extract_timestamp_and_slot(
 		&self,
 		data: &InherentData,
-	) -> Result<(TimestampInherent, AuraInherent, std::time::Duration), sp_consensus::Error> {
+	) -> Result<(u64, AuraInherent, std::time::Duration), sp_consensus::Error> {
 		data.timestamp_inherent_data()
 			.and_then(|t| data.aura_inherent_data().map(|a| (t, a)))
 			.map_err(Into::into)
 			.map_err(sp_consensus::Error::InherentData)
-			.map(|(x, y)| (x, y, Default::default()))
+			.map(|(x, y)| (*x, y, Default::default()))
 	}
 }
 
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index 1ea38820c965..3d72c436361c 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -97,7 +97,7 @@ use sp_consensus::{
 	SelectChain, SlotData, import_queue::{Verifier, BasicQueue, DefaultImportQueue, CacheKeyId},
 };
 use sp_consensus_babe::inherents::BabeInherentData;
-use sp_timestamp::{TimestampInherentData, InherentType as TimestampInherent};
+use sp_timestamp::TimestampInherentData;
 use sc_client_api::{
 	backend::AuxStore, BlockchainEvents, ProvideUncles,
 };
@@ -919,13 +919,13 @@ impl SlotCompatible for TimeSource {
 	fn extract_timestamp_and_slot(
 		&self,
 		data: &InherentData,
-	) -> Result<(TimestampInherent, Slot, std::time::Duration), sp_consensus::Error> {
+	) -> Result<(u64, Slot, std::time::Duration), sp_consensus::Error> {
 		trace!(target: "babe", "extract timestamp");
 		data.timestamp_inherent_data()
 			.and_then(|t| data.babe_inherent_data().map(|a| (t, a)))
 			.map_err(Into::into)
 			.map_err(sp_consensus::Error::InherentData)
-			.map(|(x, y)| (x, y, self.0.lock().0.take().unwrap_or_default()))
+			.map(|(x, y)| (*x, y, self.0.lock().0.take().unwrap_or_default()))
 	}
 }
 
diff --git a/client/consensus/manual-seal/src/consensus/babe.rs b/client/consensus/manual-seal/src/consensus/babe.rs
index 247a8d9091a6..7fe51c7b79ce 100644
--- a/client/consensus/manual-seal/src/consensus/babe.rs
+++ b/client/consensus/manual-seal/src/consensus/babe.rs
@@ -221,7 +221,7 @@ impl<B, C> ConsensusDataProvider<B> for BabeConsensusDataProvider<B, C>
 
 		if !has_authority {
 			log::info!(target: "manual-seal", "authority not found");
-			let slot = inherents.timestamp_inherent_data()? / self.config.slot_duration;
+			let slot = *inherents.timestamp_inherent_data()? / self.config.slot_duration;
 			// manually hard code epoch descriptor
 			epoch_descriptor = match epoch_descriptor {
 				ViableEpochDescriptor::Signaled(identifier, _header) => {
@@ -293,7 +293,10 @@ impl ProvideInherentData for SlotTimestampProvider {
 
 	fn provide_inherent_data(&self, inherent_data: &mut InherentData) -> Result<(), sp_inherents::Error> {
 		// we update the time here.
-		let duration: InherentType = self.time.fetch_add(self.slot_duration, atomic::Ordering::SeqCst);
+		let duration: InherentType = self.time.fetch_add(
+			self.slot_duration,
+			atomic::Ordering::SeqCst,
+		).into();
 		inherent_data.put_data(INHERENT_IDENTIFIER, &duration)?;
 		Ok(())
 	}
diff --git a/client/consensus/pow/src/lib.rs b/client/consensus/pow/src/lib.rs
index 19f339cf1015..482bc80170fe 100644
--- a/client/consensus/pow/src/lib.rs
+++ b/client/consensus/pow/src/lib.rs
@@ -352,7 +352,7 @@ impl<B, I, C, S, Algorithm, CAW> BlockImport<B> for PowBlockImport<B, I, C, S, A
 				check_block.clone(),
 				BlockId::Hash(parent_hash),
 				inherent_data,
-				timestamp_now
+				*timestamp_now,
 			)?;
 
 			block.body = Some(check_block.deconstruct().1);
diff --git a/frame/aura/Cargo.toml b/frame/aura/Cargo.toml
index 5f299cfbe09f..6cae6c94c9a8 100644
--- a/frame/aura/Cargo.toml
+++ b/frame/aura/Cargo.toml
@@ -22,7 +22,6 @@ sp-runtime = { version = "3.0.0", default-features = false, path = "../../primit
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 sp-consensus-aura = { version = "0.9.0", path = "../../primitives/consensus/aura", default-features = false }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-sp-timestamp = { version = "3.0.0", default-features = false, path = "../../primitives/timestamp" }
 pallet-timestamp = { version = "3.0.0", default-features = false, path = "../timestamp" }
 
 [dev-dependencies]
@@ -42,7 +41,6 @@ std = [
 	"frame-support/std",
 	"sp-consensus-aura/std",
 	"frame-system/std",
-	"sp-timestamp/std",
 	"pallet-timestamp/std",
 ]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/aura/src/lib.rs b/frame/aura/src/lib.rs
index db639a4499be..17484461cdef 100644
--- a/frame/aura/src/lib.rs
+++ b/frame/aura/src/lib.rs
@@ -39,12 +39,13 @@
 
 use sp_std::prelude::*;
 use codec::{Encode, Decode};
-use frame_support::{Parameter, traits::{Get, FindAuthor, OneSessionHandler}, ConsensusEngineId};
+use frame_support::{
+	Parameter, traits::{Get, FindAuthor, OneSessionHandler, OnTimestampSet}, ConsensusEngineId,
+};
 use sp_runtime::{
 	RuntimeAppPublic,
 	traits::{SaturatedConversion, Saturating, Zero, Member, IsMember}, generic::DigestItem,
 };
-use sp_timestamp::OnTimestampSet;
 use sp_consensus_aura::{AURA_ENGINE_ID, ConsensusLog, AuthorityIndex, Slot};
 
 mod mock;
diff --git a/frame/babe/Cargo.toml b/frame/babe/Cargo.toml
index 2d7467d82e5b..6c7bb508b53d 100644
--- a/frame/babe/Cargo.toml
+++ b/frame/babe/Cargo.toml
@@ -29,7 +29,6 @@ sp-runtime = { version = "3.0.0", default-features = false, path = "../../primit
 sp-session = { version = "3.0.0", default-features = false, path = "../../primitives/session" }
 sp-staking = { version = "3.0.0", default-features = false, path = "../../primitives/staking" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-timestamp = { version = "3.0.0", default-features = false, path = "../../primitives/timestamp" }
 log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
@@ -59,7 +58,6 @@ std = [
 	"sp-session/std",
 	"sp-staking/std",
 	"sp-std/std",
-	"sp-timestamp/std",
 	"log/std",
 ]
 runtime-benchmarks = ["frame-benchmarking"]
diff --git a/frame/babe/src/lib.rs b/frame/babe/src/lib.rs
index 6a4bacd88d1a..75bdba78a97e 100644
--- a/frame/babe/src/lib.rs
+++ b/frame/babe/src/lib.rs
@@ -25,7 +25,7 @@ use codec::{Decode, Encode};
 use frame_support::{
 	decl_error, decl_module, decl_storage,
 	dispatch::DispatchResultWithPostInfo,
-	traits::{FindAuthor, Get, KeyOwnerProofSystem, OneSessionHandler},
+	traits::{FindAuthor, Get, KeyOwnerProofSystem, OneSessionHandler, OnTimestampSet},
 	weights::{Pays, Weight},
 	Parameter,
 };
@@ -38,7 +38,6 @@ use sp_runtime::{
 };
 use sp_session::{GetSessionNumber, GetValidatorCount};
 use sp_std::prelude::*;
-use sp_timestamp::OnTimestampSet;
 
 use sp_consensus_babe::{
 	digests::{NextConfigDescriptor, NextEpochDescriptor, PreDigest},
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index b4e5ba744c50..cb555607fc82 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -2291,6 +2291,13 @@ pub trait ExecuteBlock<Block: BlockT> {
 	fn execute_block(block: Block);
 }
 
+/// A trait which is called when the timestamp is set in the runtime.
+#[impl_trait_for_tuples::impl_for_tuples(30)]
+pub trait OnTimestampSet<Moment> {
+	/// Called when the timestamp is set.
+	fn on_timestamp_set(moment: Moment);
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;
diff --git a/frame/timestamp/src/lib.rs b/frame/timestamp/src/lib.rs
index 0deef258ed5b..2ef24a696ade 100644
--- a/frame/timestamp/src/lib.rs
+++ b/frame/timestamp/src/lib.rs
@@ -97,7 +97,7 @@ pub mod weights;
 
 use sp_std::{result, cmp};
 use sp_inherents::InherentData;
-use frame_support::traits::{Time, UnixTime};
+use frame_support::traits::{Time, UnixTime, OnTimestampSet};
 use sp_runtime::{
 	RuntimeString,
 	traits::{
@@ -106,7 +106,6 @@ use sp_runtime::{
 };
 use sp_timestamp::{
 	InherentError, INHERENT_IDENTIFIER, InherentType,
-	OnTimestampSet,
 };
 pub use weights::WeightInfo;
 
@@ -214,16 +213,17 @@ pub mod pallet {
 		const INHERENT_IDENTIFIER: InherentIdentifier = INHERENT_IDENTIFIER;
 
 		fn create_inherent(data: &InherentData) -> Option<Self::Call> {
-			let data: T::Moment = extract_inherent_data(data)
-				.expect("Gets and decodes timestamp inherent data")
-				.saturated_into();
+			let inherent_data = extract_inherent_data(data)
+				.expect("Gets and decodes timestamp inherent data");
+			let data = (*inherent_data).saturated_into::<T::Moment>();
 
 			let next_time = cmp::max(data, Self::now() + T::MinimumPeriod::get());
 			Some(Call::set(next_time.into()))
 		}
 
 		fn check_inherent(call: &Self::Call, data: &InherentData) -> result::Result<(), Self::Error> {
-			const MAX_TIMESTAMP_DRIFT_MILLIS: u64 = 30 * 1000;
+			const MAX_TIMESTAMP_DRIFT_MILLIS: sp_timestamp::Timestamp =
+				sp_timestamp::Timestamp::new(30 * 1000);
 
 			let t: u64 = match call {
 				Call::set(ref t) => t.clone().saturated_into::<u64>(),
@@ -233,10 +233,10 @@ pub mod pallet {
 			let data = extract_inherent_data(data).map_err(|e| InherentError::Other(e))?;
 
 			let minimum = (Self::now() + T::MinimumPeriod::get()).saturated_into::<u64>();
-			if t > data + MAX_TIMESTAMP_DRIFT_MILLIS {
+			if t > *(data + MAX_TIMESTAMP_DRIFT_MILLIS) {
 				Err(InherentError::Other("Timestamp too far in future to accept".into()))
 			} else if t < minimum {
-				Err(InherentError::ValidAtTimestamp(minimum))
+				Err(InherentError::ValidAtTimestamp(minimum.into()))
 			} else {
 				Ok(())
 			}
diff --git a/primitives/consensus/aura/src/inherents.rs b/primitives/consensus/aura/src/inherents.rs
index 35f686d93450..750b13c77ff6 100644
--- a/primitives/consensus/aura/src/inherents.rs
+++ b/primitives/consensus/aura/src/inherents.rs
@@ -88,7 +88,7 @@ impl ProvideInherentData for InherentDataProvider {
 		use sp_timestamp::TimestampInherentData;
 
 		let timestamp = inherent_data.timestamp_inherent_data()?;
-		let slot = timestamp / self.slot_duration;
+		let slot = *timestamp / self.slot_duration;
 		inherent_data.put_data(INHERENT_IDENTIFIER, &slot)
 	}
 
diff --git a/primitives/consensus/babe/src/inherents.rs b/primitives/consensus/babe/src/inherents.rs
index 2f1a716114c5..8aeab94df34a 100644
--- a/primitives/consensus/babe/src/inherents.rs
+++ b/primitives/consensus/babe/src/inherents.rs
@@ -83,7 +83,7 @@ impl ProvideInherentData for InherentDataProvider {
 
 	fn provide_inherent_data(&self, inherent_data: &mut InherentData) -> Result<(), Error> {
 		let timestamp = inherent_data.timestamp_inherent_data()?;
-		let slot = timestamp / self.slot_duration;
+		let slot = *timestamp / self.slot_duration;
 		inherent_data.put_data(INHERENT_IDENTIFIER, &slot)
 	}
 
diff --git a/primitives/std/with_std.rs b/primitives/std/with_std.rs
index b044eb291227..8a283e8fe333 100644
--- a/primitives/std/with_std.rs
+++ b/primitives/std/with_std.rs
@@ -37,6 +37,7 @@ pub use std::sync;
 pub use std::result;
 pub use std::slice;
 pub use std::str;
+pub use core::time;
 pub use std::vec;
 
 pub mod collections {
diff --git a/primitives/std/without_std.rs b/primitives/std/without_std.rs
index 697a0787e531..38c3a8421dac 100755
--- a/primitives/std/without_std.rs
+++ b/primitives/std/without_std.rs
@@ -39,6 +39,7 @@ pub use core::result;
 pub use core::slice;
 // Allow interpreting vectors of bytes as strings, but not constructing them.
 pub use core::str;
+pub use core::time;
 // We are trying to avoid certain things here, such as `core::string`
 // (if you need `String` you are probably doing something wrong, since
 // runtime doesn't require anything human readable).
diff --git a/primitives/timestamp/Cargo.toml b/primitives/timestamp/Cargo.toml
index 53fb37d4deb4..f3e9a331cfd3 100644
--- a/primitives/timestamp/Cargo.toml
+++ b/primitives/timestamp/Cargo.toml
@@ -18,7 +18,6 @@ sp-std = { version = "3.0.0", default-features = false, path = "../std" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../runtime" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-inherents = { version = "3.0.0", default-features = false, path = "../inherents" }
-impl-trait-for-tuples = "0.2.1"
 wasm-timer = { version = "0.2", optional = true }
 
 [features]
diff --git a/primitives/timestamp/src/lib.rs b/primitives/timestamp/src/lib.rs
index 59f792678c4b..e6ef62b5c59c 100644
--- a/primitives/timestamp/src/lib.rs
+++ b/primitives/timestamp/src/lib.rs
@@ -19,9 +19,7 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use codec::Encode;
-#[cfg(feature = "std")]
-use codec::Decode;
+use codec::{Encode, Decode};
 #[cfg(feature = "std")]
 use sp_inherents::ProvideInherentData;
 use sp_inherents::{InherentIdentifier, IsFatalError, InherentData};
@@ -30,8 +28,83 @@ use sp_runtime::RuntimeString;
 
 /// The identifier for the `timestamp` inherent.
 pub const INHERENT_IDENTIFIER: InherentIdentifier = *b"timstap0";
+
 /// The type of the inherent.
-pub type InherentType = u64;
+pub type InherentType = Timestamp;
+
+/// Unit type wrapper that represents a timestamp.
+///
+/// Such a timestamp is the time since the UNIX_EPOCH in milliseconds at a given point in time.
+#[derive(Debug, Encode, Decode, Eq, Clone, Copy, Default, Ord)]
+pub struct Timestamp(u64);
+
+impl Timestamp {
+	/// Create new `Self`.
+	pub const fn new(inner: u64) -> Self {
+		Self(inner)
+	}
+}
+
+impl sp_std::ops::Deref for Timestamp {
+	type Target = u64;
+
+	fn deref(&self) -> &Self::Target {
+		&self.0
+	}
+}
+
+impl core::ops::Add for Timestamp {
+	type Output = Self;
+
+	fn add(self, other: Self) -> Self {
+		Self(self.0 + other.0)
+	}
+}
+
+impl core::ops::Add<u64> for Timestamp {
+	type Output = Self;
+
+	fn add(self, other: u64) -> Self {
+		Self(self.0 + other)
+	}
+}
+
+impl<T: Into<u64> + Copy> core::cmp::PartialEq<T> for Timestamp {
+	fn eq(&self, eq: &T) -> bool {
+		self.0 == (*eq).into()
+	}
+}
+
+impl<T: Into<u64> + Copy> core::cmp::PartialOrd<T> for Timestamp {
+	fn partial_cmp(&self, other: &T) -> Option<core::cmp::Ordering> {
+		self.0.partial_cmp(&(*other).into())
+	}
+}
+
+#[cfg(feature = "std")]
+impl std::fmt::Display for Timestamp {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		write!(f, "{}", self.0)
+	}
+}
+
+impl From<u64> for Timestamp {
+	fn from(timestamp: u64) -> Self {
+		Timestamp(timestamp)
+	}
+}
+
+impl From<Timestamp> for u64 {
+	fn from(timestamp: Timestamp) -> u64 {
+		timestamp.0
+	}
+}
+
+impl From<sp_std::time::Duration> for Timestamp {
+	fn from(duration: sp_std::time::Duration) -> Self {
+		Timestamp(duration.as_millis() as u64)
+	}
+}
 
 /// Errors that can occur while checking the timestamp inherent.
 #[derive(Encode, sp_runtime::RuntimeDebug)]
@@ -99,8 +172,7 @@ impl ProvideInherentData for InherentDataProvider {
 			.map_err(|_| {
 				"Current time is before unix epoch".into()
 			}).and_then(|d| {
-				let duration: InherentType = d.as_millis() as u64;
-				inherent_data.put_data(INHERENT_IDENTIFIER, &duration)
+				inherent_data.put_data(INHERENT_IDENTIFIER, &InherentType::from(d))
 			})
 	}
 
@@ -109,9 +181,3 @@ impl ProvideInherentData for InherentDataProvider {
 	}
 }
 
-
-/// A trait which is called when the timestamp is set.
-#[impl_trait_for_tuples::impl_for_tuples(30)]
-pub trait OnTimestampSet<Moment> {
-	fn on_timestamp_set(moment: Moment);
-}

From 97ecd629aff816c15cfff7e73d34dc8c9c5c6a9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Fri, 12 Mar 2021 12:13:44 +0100
Subject: [PATCH 0493/1194] Do not ban peers for sending multiple valid
 requests (#8325)

We introduced banning of peers who spam us with the same request (more
than 2 times). However, we missed that it is completely legal to send
the same request multiple times as long as we did not provide any
answer. An example for that is the justification request. This request
is send multiple times until we could fetch the justification from one
of our peers. So, the solution to this problem is to tag requests as
fulfilled and to start counting these fulfilled requests. If the number
is higher than what we allow, the peer should be banned.
---
 client/network/src/block_request_handler.rs | 55 ++++++++++++++++-----
 client/network/test/src/sync.rs             | 44 +++++++++++++++++
 2 files changed, 87 insertions(+), 12 deletions(-)

diff --git a/client/network/src/block_request_handler.rs b/client/network/src/block_request_handler.rs
index 85b4acf68748..148bc01302f7 100644
--- a/client/network/src/block_request_handler.rs
+++ b/client/network/src/block_request_handler.rs
@@ -72,13 +72,14 @@ pub(crate) fn generate_protocol_name(protocol_id: &ProtocolId) -> String {
 	s
 }
 
-/// The key for [`BlockRequestHandler::seen_requests`].
-#[derive(Eq, PartialEq)]
+/// The key of [`BlockRequestHandler::seen_requests`].
+#[derive(Eq, PartialEq, Clone)]
 struct SeenRequestsKey<B: BlockT> {
 	peer: PeerId,
 	from: BlockId<B>,
 	max_blocks: usize,
 	direction: Direction,
+	attributes: BlockAttributes,
 }
 
 impl<B: BlockT> Hash for SeenRequestsKey<B> {
@@ -86,6 +87,7 @@ impl<B: BlockT> Hash for SeenRequestsKey<B> {
 		self.peer.hash(state);
 		self.max_blocks.hash(state);
 		self.direction.hash(state);
+		self.attributes.hash(state);
 
 		match self.from {
 			BlockId::Hash(h) => h.hash(state),
@@ -94,6 +96,14 @@ impl<B: BlockT> Hash for SeenRequestsKey<B> {
 	}
 }
 
+/// The value of [`BlockRequestHandler::seen_requests`].
+enum SeenRequestsValue {
+	/// First time we have seen the request.
+	First,
+	/// We have fulfilled the request `n` times.
+	Fulfilled(usize),
+}
+
 /// Handler for incoming block requests from a remote peer.
 pub struct BlockRequestHandler<B: BlockT> {
 	client: Arc<dyn Client<B>>,
@@ -101,7 +111,7 @@ pub struct BlockRequestHandler<B: BlockT> {
 	/// Maps from request to number of times we have seen this request.
 	///
 	/// This is used to check if a peer is spamming us with the same request.
-	seen_requests: LruCache<SeenRequestsKey<B>, usize>,
+	seen_requests: LruCache<SeenRequestsKey<B>, SeenRequestsValue>,
 }
 
 impl<B: BlockT> BlockRequestHandler<B> {
@@ -173,37 +183,43 @@ impl<B: BlockT> BlockRequestHandler<B> {
 		let direction = Direction::from_i32(request.direction)
 			.ok_or(HandleRequestError::ParseDirection)?;
 
+		let attributes = BlockAttributes::from_be_u32(request.fields)?;
+
 		let key = SeenRequestsKey {
 			peer: *peer,
 			max_blocks,
 			direction,
 			from: from_block_id.clone(),
+			attributes,
 		};
 
 		let mut reputation_changes = Vec::new();
 
-		if let Some(requests) = self.seen_requests.get_mut(&key) {
-			*requests = requests.saturating_add(1);
+		match self.seen_requests.get_mut(&key) {
+			Some(SeenRequestsValue::First) => {},
+			Some(SeenRequestsValue::Fulfilled(ref mut requests)) => {
+				*requests = requests.saturating_add(1);
 
-			if *requests > MAX_NUMBER_OF_SAME_REQUESTS_PER_PEER {
-				reputation_changes.push(rep::SAME_REQUEST);
+				if *requests > MAX_NUMBER_OF_SAME_REQUESTS_PER_PEER {
+					reputation_changes.push(rep::SAME_REQUEST);
+				}
+			},
+			None => {
+				self.seen_requests.put(key.clone(), SeenRequestsValue::First);
 			}
-		} else {
-			self.seen_requests.put(key, 1);
 		}
 
 		debug!(
 			target: LOG_TARGET,
 			"Handling block request from {}: Starting at `{:?}` with maximum blocks \
-			 of `{}` and direction `{:?}`.",
+			 of `{}`, direction `{:?}` and attributes `{:?}`.",
 			peer,
 			from_block_id,
 			max_blocks,
 			direction,
+			attributes,
 		);
 
-		let attributes = BlockAttributes::from_be_u32(request.fields)?;
-
 		let result = if reputation_changes.is_empty() {
 			let block_response = self.get_block_response(
 				attributes,
@@ -212,6 +228,21 @@ impl<B: BlockT> BlockRequestHandler<B> {
 				max_blocks,
 			)?;
 
+			// If any of the blocks contains nay data, we can consider it as successful request.
+			if block_response
+				.blocks
+				.iter()
+				.any(|b| !b.header.is_empty() || !b.body.is_empty() || b.is_empty_justification)
+			{
+				if let Some(value) = self.seen_requests.get_mut(&key) {
+					// If this is the first time we have processed this request, we need to change
+					// it to `Fulfilled`.
+					if let SeenRequestsValue::First = value {
+						*value = SeenRequestsValue::Fulfilled(1);
+					}
+				}
+			}
+
 			let mut data = Vec::with_capacity(block_response.encoded_len());
 			block_response.encode(&mut data)?;
 
diff --git a/client/network/test/src/sync.rs b/client/network/test/src/sync.rs
index 46fbb8f82d47..b11dbaca75e1 100644
--- a/client/network/test/src/sync.rs
+++ b/client/network/test/src/sync.rs
@@ -935,3 +935,47 @@ fn continue_to_sync_after_some_block_announcement_verifications_failed() {
 	net.block_until_sync();
 	assert!(net.peer(1).has_block(&block_hash));
 }
+
+/// When being spammed by the same request of a peer, we ban this peer. However, we should only ban
+/// this peer if the request was successful. In the case of a justification request for example,
+/// we ask our peers multiple times until we got the requested justification. This test ensures that
+/// asking for the same justification multiple times doesn't ban a peer.
+#[test]
+fn multiple_requests_are_accepted_as_long_as_they_are_not_fulfilled() {
+	sp_tracing::try_init_simple();
+	let mut net = JustificationTestNet::new(2);
+	net.peer(0).push_blocks(10, false);
+	net.block_until_sync();
+
+	// there's currently no justification for block #10
+	assert_eq!(net.peer(0).client().justification(&BlockId::Number(10)).unwrap(), None);
+	assert_eq!(net.peer(1).client().justification(&BlockId::Number(10)).unwrap(), None);
+
+	let h1 = net.peer(1).client().header(&BlockId::Number(10)).unwrap().unwrap();
+
+	// Let's assume block 10 was finalized, but we still need the justification from the network.
+	net.peer(1).request_justification(&h1.hash().into(), 10);
+
+	// Let's build some more blocks and wait always for the network to have synced them
+	for _ in 0..5 {
+		// We need to sleep 10 seconds as this is the time we wait between sending a new
+		// justification request.
+		std::thread::sleep(std::time::Duration::from_secs(10));
+		net.peer(0).push_blocks(1, false);
+		net.block_until_sync();
+		assert_eq!(1, net.peer(0).num_peers());
+	}
+
+	// Finalize the block and make the justification available.
+	net.peer(0).client().finalize_block(BlockId::Number(10), Some(Vec::new()), true).unwrap();
+
+	block_on(futures::future::poll_fn::<(), _>(|cx| {
+		net.poll(cx);
+
+		if net.peer(1).client().justification(&BlockId::Number(10)).unwrap() != Some(Vec::new()) {
+			return Poll::Pending;
+		}
+
+		Poll::Ready(())
+	}));
+}

From 101b347675e880ba9b01041b766f1487567f7450 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Fri, 12 Mar 2021 12:21:08 +0100
Subject: [PATCH 0494/1194] contracts: Expose rent parameter to contracts
 (#8231)

* contracts: Expose rent parameter to contracts

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_contracts --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/contracts/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Fix typos

* Improve comments

* Add rent parameter weights

* Allow deploying a new schedule with the same version

* Add storage migration for new schedule

* Only decode the schedule version in storage migration

* Remove confusing docs

* Replace original_code_len() by aggregate_code_len()

Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
---
 frame/contracts/CHANGELOG.md            |    8 +-
 frame/contracts/src/benchmarking/mod.rs |    8 +
 frame/contracts/src/exec.rs             |  373 ++++++-
 frame/contracts/src/lib.rs              |   12 +-
 frame/contracts/src/migration.rs        |   45 +
 frame/contracts/src/schedule.rs         |   19 +
 frame/contracts/src/storage.rs          |    8 +-
 frame/contracts/src/tests.rs            |    1 -
 frame/contracts/src/wasm/mod.rs         |   72 +-
 frame/contracts/src/wasm/runtime.rs     |   24 +
 frame/contracts/src/weights.rs          | 1257 ++++++++++++-----------
 11 files changed, 1129 insertions(+), 698 deletions(-)
 create mode 100644 frame/contracts/src/migration.rs

diff --git a/frame/contracts/CHANGELOG.md b/frame/contracts/CHANGELOG.md
index ce35abbd86b2..ef69e050a2c5 100644
--- a/frame/contracts/CHANGELOG.md
+++ b/frame/contracts/CHANGELOG.md
@@ -16,7 +16,13 @@ The interface provided to smart contracts will adhere to semver with one excepti
 major version bumps will be backwards compatible with regard to already deployed contracts.
 In other words: Upgrading this pallet will not break pre-existing contracts.
 
-## [v3.0.0]
+## [Unreleased]
+
+### Added
+
+- Add `seal_rent_params` contract callable function.
+
+## [v3.0.0] 2021-02-25
 
 This version constitutes the first release that brings any stability guarantees (see above).
 
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index d01a2bce2c27..d41154e995a6 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -533,6 +533,14 @@ benchmarks! {
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
+	seal_rent_params {
+		let r in 0 .. API_BENCHMARK_BATCHES;
+		let instance = Contract::<T>::new(WasmModule::getter(
+			"seal_rent_params", r * API_BENCHMARK_BATCH_SIZE
+		), vec![], Endow::Max)?;
+		let origin = RawOrigin::Signed(instance.caller.clone());
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
+
 	seal_weight_to_fee {
 		let r in 0 .. API_BENCHMARK_BATCHES;
 		let pages = code::max_pages::<T>();
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index d0e1127db860..427cf1ada5ad 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -18,14 +18,14 @@
 use crate::{
 	CodeHash, Event, Config, Module as Contracts,
 	TrieId, BalanceOf, ContractInfo, gas::GasMeter, rent::Rent, storage::{self, Storage},
-	Error, ContractInfoOf, Schedule,
+	Error, ContractInfoOf, Schedule, AliveContractInfo,
 };
 use sp_core::crypto::UncheckedFrom;
 use sp_std::{
 	prelude::*,
 	marker::PhantomData,
 };
-use sp_runtime::traits::{Bounded, Zero, Convert, Saturating};
+use sp_runtime::{Perbill, traits::{Bounded, Zero, Convert, Saturating}};
 use frame_support::{
 	dispatch::{DispatchResult, DispatchError},
 	traits::{ExistenceRequirement, Currency, Time, Randomness, Get},
@@ -43,13 +43,82 @@ pub type StorageKey = [u8; 32];
 /// A type that represents a topic of an event. At the moment a hash is used.
 pub type TopicOf<T> = <T as frame_system::Config>::Hash;
 
-/// Describes whether we deal with a contract or a plain account.
-pub enum TransactorKind {
-	/// Transaction was initiated from a plain account. That can be either be through a
-	/// signed transaction or through RPC.
-	PlainAccount,
-	/// The call was initiated by a contract account.
-	Contract,
+/// Information needed for rent calculations that can be requested by a contract.
+#[derive(codec::Encode)]
+#[cfg_attr(test, derive(Debug, PartialEq))]
+pub struct RentParams<T: Config> {
+	/// The total balance of the contract. Includes the balance transferred from the caller.
+	total_balance: BalanceOf<T>,
+	/// The free balance of the contract. Includes the balance transferred from the caller.
+	free_balance: BalanceOf<T>,
+	/// See crate [`Contracts::subsistence_threshold()`].
+	subsistence_threshold: BalanceOf<T>,
+	/// See crate [`Config::DepositPerContract`].
+	deposit_per_contract: BalanceOf<T>,
+	/// See crate [`Config::DepositPerStorageByte`].
+	deposit_per_storage_byte: BalanceOf<T>,
+	/// See crate [`Config::DepositPerStorageItem`].
+	deposit_per_storage_item: BalanceOf<T>,
+	/// See crate [`Ext::rent_allowance()`].
+	rent_allowance: BalanceOf<T>,
+	/// See crate [`Config::RentFraction`].
+	rent_fraction: Perbill,
+	/// See crate [`AliveContractInfo::storage_size`].
+	storage_size: u32,
+	/// See crate [`Executable::aggregate_code_len()`].
+	code_size: u32,
+	/// See crate [`Executable::refcount()`].
+	code_refcount: u32,
+	/// Reserved for backwards compatible changes to this data structure.
+	_reserved: Option<()>,
+}
+
+impl<T> RentParams<T>
+where
+	T: Config,
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
+{
+	fn new<E: Executable<T>>(
+		account_id: &T::AccountId,
+		contract: &AliveContractInfo<T>,
+		executable: &E
+	) -> Self {
+		Self {
+			total_balance: T::Currency::total_balance(account_id),
+			free_balance: T::Currency::free_balance(account_id),
+			subsistence_threshold: <Contracts<T>>::subsistence_threshold(),
+			deposit_per_contract: T::DepositPerContract::get(),
+			deposit_per_storage_byte: T::DepositPerStorageByte::get(),
+			deposit_per_storage_item: T::DepositPerStorageItem::get(),
+			rent_allowance: contract.rent_allowance,
+			rent_fraction: T::RentFraction::get(),
+			storage_size: contract.storage_size,
+			code_size: executable.aggregate_code_len(),
+			code_refcount: executable.refcount(),
+			_reserved: None,
+		}
+	}
+}
+
+/// We cannot derive `Default` because `T` does not necessarily implement `Default`.
+#[cfg(test)]
+impl<T: Config> Default for RentParams<T> {
+	fn default() -> Self {
+		Self {
+			total_balance: Default::default(),
+			free_balance: Default::default(),
+			subsistence_threshold: Default::default(),
+			deposit_per_contract: Default::default(),
+			deposit_per_storage_byte: Default::default(),
+			deposit_per_storage_item: Default::default(),
+			rent_allowance: Default::default(),
+			rent_fraction: Default::default(),
+			storage_size: Default::default(),
+			code_size: Default::default(),
+			code_refcount: Default::default(),
+			_reserved: Default::default(),
+		}
+	}
 }
 
 /// An interface that provides access to the external environment in which the
@@ -198,9 +267,13 @@ pub trait Ext: sealing::Sealed {
 
 	/// Get a reference to the schedule used by the current call.
 	fn schedule(&self) -> &Schedule<Self::T>;
+
+	/// Information needed for rent calculations.
+	fn rent_params(&self) -> &RentParams<Self::T>;
 }
 
 /// Describes the different functions that can be exported by an [`Executable`].
+#[cfg_attr(test, derive(Clone, Copy, PartialEq))]
 pub enum ExportedFunction {
 	/// The constructor function which is executed on deployment of a contract.
 	Constructor,
@@ -263,6 +336,7 @@ pub trait Executable<T: Config>: Sized {
 	/// The storage that is occupied by the instrumented executable and its pristine source.
 	///
 	/// The returned size is already divided by the number of users who share the code.
+	/// This is essentially `aggregate_code_len() / refcount()`.
 	///
 	/// # Note
 	///
@@ -273,16 +347,22 @@ pub trait Executable<T: Config>: Sized {
 
 	/// Size of the instrumented code in bytes.
 	fn code_len(&self) -> u32;
+
+	/// Sum of instrumented and pristine code len.
+	fn aggregate_code_len(&self) -> u32;
+
+	// The number of contracts using this executable.
+	fn refcount(&self) -> u32;
 }
 
 pub struct ExecutionContext<'a, T: Config + 'a, E> {
-	pub caller: Option<&'a ExecutionContext<'a, T, E>>,
-	pub self_account: T::AccountId,
-	pub self_trie_id: Option<TrieId>,
-	pub depth: usize,
-	pub schedule: &'a Schedule<T>,
-	pub timestamp: MomentOf<T>,
-	pub block_number: T::BlockNumber,
+	caller: Option<&'a ExecutionContext<'a, T, E>>,
+	self_account: T::AccountId,
+	self_trie_id: Option<TrieId>,
+	depth: usize,
+	schedule: &'a Schedule<T>,
+	timestamp: MomentOf<T>,
+	block_number: T::BlockNumber,
 	_phantom: PhantomData<E>,
 }
 
@@ -371,8 +451,12 @@ where
 				)?
 			}
 
+			let call_context = nested.new_call_context(
+				caller, &dest, value, &contract, &executable,
+			);
+
 			let output = executable.execute(
-				nested.new_call_context(caller, value),
+				call_context,
 				&ExportedFunction::Call,
 				input_data,
 				gas_meter,
@@ -403,7 +487,7 @@ where
 			let dest_trie_id = Storage::<T>::generate_trie_id(&dest);
 
 			let output = self.with_nested_context(dest.clone(), dest_trie_id, |nested| {
-				Storage::<T>::place_contract(
+				let contract = Storage::<T>::place_contract(
 					&dest,
 					nested
 						.self_trie_id
@@ -428,8 +512,16 @@ where
 				// spawned. This is OK as overcharging is always safe.
 				let occupied_storage = executable.occupied_storage();
 
+				let call_context = nested.new_call_context(
+					caller.clone(),
+					&dest,
+					endowment,
+					&contract,
+					&executable,
+				);
+
 				let output = executable.execute(
-					nested.new_call_context(caller.clone(), endowment),
+					call_context,
 					&ExportedFunction::Constructor,
 					input_data,
 					gas_meter,
@@ -468,7 +560,10 @@ where
 	fn new_call_context<'b>(
 		&'b mut self,
 		caller: T::AccountId,
+		dest: &T::AccountId,
 		value: BalanceOf<T>,
+		contract: &AliveContractInfo<T>,
+		executable: &E,
 	) -> CallContext<'b, 'a, T, E> {
 		let timestamp = self.timestamp.clone();
 		let block_number = self.block_number.clone();
@@ -478,6 +573,7 @@ where
 			value_transferred: value,
 			timestamp,
 			block_number,
+			rent_params: RentParams::new(dest, contract, executable),
 			_phantom: Default::default(),
 		}
 	}
@@ -517,6 +613,15 @@ where
 	}
 }
 
+/// Describes whether we deal with a contract or a plain account.
+enum TransactorKind {
+	/// Transaction was initiated from a plain account. That can be either be through a
+	/// signed transaction or through RPC.
+	PlainAccount,
+	/// The call was initiated by a contract account.
+	Contract,
+}
+
 /// Describes possible transfer causes.
 enum TransferCause {
 	Call,
@@ -581,6 +686,7 @@ struct CallContext<'a, 'b: 'a, T: Config + 'b, E> {
 	value_transferred: BalanceOf<T>,
 	timestamp: MomentOf<T>,
 	block_number: T::BlockNumber,
+	rent_params: RentParams<T>,
 	_phantom: PhantomData<E>,
 }
 
@@ -793,6 +899,10 @@ where
 	fn schedule(&self) -> &Schedule<Self::T> {
 		&self.ctx.schedule
 	}
+
+	fn rent_params(&self) -> &RentParams<Self::T> {
+		&self.rent_params
+	}
 }
 
 fn deposit_event<T: Config>(
@@ -834,11 +944,13 @@ mod tests {
 			ALICE, BOB, CHARLIE,
 			test_utils::{place_contract, set_balance, get_balance},
 		},
+		exec::ExportedFunction::*,
 		Error, Weight,
 	};
 	use sp_runtime::DispatchError;
 	use assert_matches::assert_matches;
 	use std::{cell::RefCell, collections::HashMap, rc::Rc};
+	use pretty_assertions::{assert_eq, assert_ne};
 
 	type MockContext<'a> = ExecutionContext<'a, Test, MockExecutable>;
 
@@ -865,7 +977,12 @@ mod tests {
 	}
 
 	#[derive(Clone)]
-	struct MockExecutable(Rc<dyn Fn(MockCtx) -> ExecResult + 'static>, CodeHash<Test>);
+	struct MockExecutable {
+		func: Rc<dyn Fn(MockCtx, &Self) -> ExecResult + 'static>,
+		func_type: ExportedFunction,
+		code_hash: CodeHash<Test>,
+		refcount: u64,
+	}
 
 	#[derive(Default)]
 	struct MockLoader {
@@ -874,16 +991,61 @@ mod tests {
 	}
 
 	impl MockLoader {
-		fn insert(f: impl Fn(MockCtx) -> ExecResult + 'static) -> CodeHash<Test> {
+		fn insert(
+			func_type: ExportedFunction,
+			f: impl Fn(MockCtx, &MockExecutable,
+		) -> ExecResult + 'static) -> CodeHash<Test> {
 			LOADER.with(|loader| {
 				let mut loader = loader.borrow_mut();
 				// Generate code hashes as monotonically increasing values.
 				let hash = <Test as frame_system::Config>::Hash::from_low_u64_be(loader.counter);
 				loader.counter += 1;
-				loader.map.insert(hash, MockExecutable (Rc::new(f), hash.clone()));
+				loader.map.insert(hash, MockExecutable {
+					func: Rc::new(f),
+					func_type,
+					code_hash: hash.clone(),
+					refcount: 1,
+				});
 				hash
 			})
 		}
+
+		fn increment_refcount(code_hash: CodeHash<Test>) {
+			LOADER.with(|loader| {
+				let mut loader = loader.borrow_mut();
+				loader.map
+					.entry(code_hash)
+					.and_modify(|executable| executable.refcount += 1)
+					.or_insert_with(|| panic!("code_hash does not exist"));
+			});
+		}
+
+		fn decrement_refcount(code_hash: CodeHash<Test>) {
+			use std::collections::hash_map::Entry::Occupied;
+			LOADER.with(|loader| {
+				let mut loader = loader.borrow_mut();
+				let mut entry = match loader.map.entry(code_hash) {
+					Occupied(e) => e,
+					_ => panic!("code_hash does not exist"),
+				};
+				let refcount = &mut entry.get_mut().refcount;
+				*refcount -= 1;
+				if *refcount == 0 {
+					entry.remove();
+				}
+			});
+		}
+
+		fn refcount(code_hash: &CodeHash<Test>) -> u32 {
+			LOADER.with(|loader| {
+				loader
+					.borrow()
+					.map
+					.get(code_hash)
+					.expect("code_hash does not exist")
+					.refcount()
+			})
+		}
 	}
 
 	impl Executable<Test> for MockExecutable {
@@ -905,30 +1067,43 @@ mod tests {
 			})
 		}
 
-		fn drop_from_storage(self) {}
+		fn drop_from_storage(self) {
+			MockLoader::decrement_refcount(self.code_hash);
+		}
 
-		fn add_user(_code_hash: CodeHash<Test>) -> Result<u32, DispatchError> {
+		fn add_user(code_hash: CodeHash<Test>) -> Result<u32, DispatchError> {
+			MockLoader::increment_refcount(code_hash);
 			Ok(0)
 		}
 
-		fn remove_user(_code_hash: CodeHash<Test>) -> u32 { 0 }
+		fn remove_user(code_hash: CodeHash<Test>) -> u32 {
+			MockLoader::decrement_refcount(code_hash);
+			0
+		}
 
 		fn execute<E: Ext<T = Test>>(
 			self,
 			mut ext: E,
-			_function: &ExportedFunction,
+			function: &ExportedFunction,
 			input_data: Vec<u8>,
 			gas_meter: &mut GasMeter<Test>,
 		) -> ExecResult {
-			(self.0)(MockCtx {
-				ext: &mut ext,
-				input_data,
-				gas_meter,
-			})
+			if let &Constructor = function {
+				MockLoader::increment_refcount(self.code_hash);
+			}
+			if function == &self.func_type {
+				(self.func)(MockCtx {
+					ext: &mut ext,
+					input_data,
+					gas_meter,
+				}, &self)
+			} else {
+				exec_success()
+			}
 		}
 
 		fn code_hash(&self) -> &CodeHash<Test> {
-			&self.1
+			&self.code_hash
 		}
 
 		fn occupied_storage(&self) -> u32 {
@@ -938,6 +1113,14 @@ mod tests {
 		fn code_len(&self) -> u32 {
 			0
 		}
+
+		fn aggregate_code_len(&self) -> u32 {
+			0
+		}
+
+		fn refcount(&self) -> u32 {
+			self.refcount as u32
+		}
 	}
 
 	fn exec_success() -> ExecResult {
@@ -952,7 +1135,7 @@ mod tests {
 
 		let value = Default::default();
 		let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
-		let exec_ch = MockLoader::insert(|_ctx| {
+		let exec_ch = MockLoader::insert(Call, |_ctx, _executable| {
 			TEST_DATA.with(|data| data.borrow_mut().push(1));
 			exec_success()
 		});
@@ -1003,7 +1186,8 @@ mod tests {
 		let dest = BOB;
 
 		let return_ch = MockLoader::insert(
-			|_| Ok(ExecReturnValue { flags: ReturnFlags::REVERT, data: Vec::new() })
+			Call,
+			|_, _| Ok(ExecReturnValue { flags: ReturnFlags::REVERT, data: Vec::new() })
 		);
 
 		ExtBuilder::default().build().execute_with(|| {
@@ -1062,7 +1246,8 @@ mod tests {
 		let origin = ALICE;
 		let dest = BOB;
 		let return_ch = MockLoader::insert(
-			|_| Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: vec![1, 2, 3, 4] })
+			Call,
+			|_, _| Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: vec![1, 2, 3, 4] })
 		);
 
 		ExtBuilder::default().build().execute_with(|| {
@@ -1090,7 +1275,8 @@ mod tests {
 		let origin = ALICE;
 		let dest = BOB;
 		let return_ch = MockLoader::insert(
-			|_| Ok(ExecReturnValue { flags: ReturnFlags::REVERT, data: vec![1, 2, 3, 4] })
+			Call,
+			|_, _| Ok(ExecReturnValue { flags: ReturnFlags::REVERT, data: vec![1, 2, 3, 4] })
 		);
 
 		ExtBuilder::default().build().execute_with(|| {
@@ -1113,7 +1299,7 @@ mod tests {
 
 	#[test]
 	fn input_data_to_call() {
-		let input_data_ch = MockLoader::insert(|ctx| {
+		let input_data_ch = MockLoader::insert(Call, |ctx, _| {
 			assert_eq!(ctx.input_data, &[1, 2, 3, 4]);
 			exec_success()
 		});
@@ -1136,7 +1322,7 @@ mod tests {
 
 	#[test]
 	fn input_data_to_instantiate() {
-		let input_data_ch = MockLoader::insert(|ctx| {
+		let input_data_ch = MockLoader::insert(Constructor, |ctx, _| {
 			assert_eq!(ctx.input_data, &[1, 2, 3, 4]);
 			exec_success()
 		});
@@ -1172,7 +1358,7 @@ mod tests {
 			static REACHED_BOTTOM: RefCell<bool> = RefCell::new(false);
 		}
 		let value = Default::default();
-		let recurse_ch = MockLoader::insert(|ctx| {
+		let recurse_ch = MockLoader::insert(Call, |ctx, _| {
 			// Try to call into yourself.
 			let r = ctx.ext.call(&BOB, 0, ctx.gas_meter, vec![]);
 
@@ -1222,7 +1408,7 @@ mod tests {
 			static WITNESSED_CALLER_CHARLIE: RefCell<Option<AccountIdOf<Test>>> = RefCell::new(None);
 		}
 
-		let bob_ch = MockLoader::insert(|ctx| {
+		let bob_ch = MockLoader::insert(Call, |ctx, _| {
 			// Record the caller for bob.
 			WITNESSED_CALLER_BOB.with(|caller|
 				*caller.borrow_mut() = Some(ctx.ext.caller().clone())
@@ -1235,7 +1421,7 @@ mod tests {
 			);
 			exec_success()
 		});
-		let charlie_ch = MockLoader::insert(|ctx| {
+		let charlie_ch = MockLoader::insert(Call, |ctx, _| {
 			// Record the caller for charlie.
 			WITNESSED_CALLER_CHARLIE.with(|caller|
 				*caller.borrow_mut() = Some(ctx.ext.caller().clone())
@@ -1265,7 +1451,7 @@ mod tests {
 
 	#[test]
 	fn address_returns_proper_values() {
-		let bob_ch = MockLoader::insert(|ctx| {
+		let bob_ch = MockLoader::insert(Call, |ctx, _| {
 			// Verify that address matches BOB.
 			assert_eq!(*ctx.ext.address(), BOB);
 
@@ -1276,7 +1462,7 @@ mod tests {
 			);
 			exec_success()
 		});
-		let charlie_ch = MockLoader::insert(|ctx| {
+		let charlie_ch = MockLoader::insert(Call, |ctx, _| {
 			assert_eq!(*ctx.ext.address(), CHARLIE);
 			exec_success()
 		});
@@ -1300,7 +1486,7 @@ mod tests {
 
 	#[test]
 	fn refuse_instantiate_with_value_below_existential_deposit() {
-		let dummy_ch = MockLoader::insert(|_| exec_success());
+		let dummy_ch = MockLoader::insert(Constructor, |_, _| exec_success());
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
 			let schedule = Contracts::current_schedule();
@@ -1326,7 +1512,8 @@ mod tests {
 	#[test]
 	fn instantiation_work_with_success_output() {
 		let dummy_ch = MockLoader::insert(
-			|_| Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: vec![80, 65, 83, 83] })
+			Constructor,
+			|_, _| Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: vec![80, 65, 83, 83] })
 		);
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
@@ -1361,7 +1548,8 @@ mod tests {
 	#[test]
 	fn instantiation_fails_with_failing_output() {
 		let dummy_ch = MockLoader::insert(
-			|_| Ok(ExecReturnValue { flags: ReturnFlags::REVERT, data: vec![70, 65, 73, 76] })
+			Constructor,
+			|_, _| Ok(ExecReturnValue { flags: ReturnFlags::REVERT, data: vec![70, 65, 73, 76] })
 		);
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
@@ -1392,12 +1580,12 @@ mod tests {
 
 	#[test]
 	fn instantiation_from_contract() {
-		let dummy_ch = MockLoader::insert(|_| exec_success());
+		let dummy_ch = MockLoader::insert(Call, |_, _| exec_success());
 		let instantiated_contract_address = Rc::new(RefCell::new(None::<AccountIdOf<Test>>));
-		let instantiator_ch = MockLoader::insert({
+		let instantiator_ch = MockLoader::insert(Call, {
 			let dummy_ch = dummy_ch.clone();
 			let instantiated_contract_address = Rc::clone(&instantiated_contract_address);
-			move |ctx| {
+			move |ctx, _| {
 				// Instantiate a contract and save it's address in `instantiated_contract_address`.
 				let (address, output, _) = ctx.ext.instantiate(
 					dummy_ch,
@@ -1436,12 +1624,12 @@ mod tests {
 
 	#[test]
 	fn instantiation_traps() {
-		let dummy_ch = MockLoader::insert(
-			|_| Err("It's a trap!".into())
+		let dummy_ch = MockLoader::insert(Constructor,
+			|_, _| Err("It's a trap!".into())
 		);
-		let instantiator_ch = MockLoader::insert({
+		let instantiator_ch = MockLoader::insert(Call, {
 			let dummy_ch = dummy_ch.clone();
-			move |ctx| {
+			move |ctx, _| {
 				// Instantiate a contract and save it's address in `instantiated_contract_address`.
 				assert_matches!(
 					ctx.ext.instantiate(
@@ -1481,7 +1669,7 @@ mod tests {
 
 	#[test]
 	fn termination_from_instantiate_fails() {
-		let terminate_ch = MockLoader::insert(|ctx| {
+		let terminate_ch = MockLoader::insert(Constructor, |ctx, _| {
 			ctx.ext.terminate(&ALICE).unwrap();
 			exec_success()
 		});
@@ -1518,7 +1706,7 @@ mod tests {
 
 	#[test]
 	fn rent_allowance() {
-		let rent_allowance_ch = MockLoader::insert(|ctx| {
+		let rent_allowance_ch = MockLoader::insert(Constructor, |ctx, _| {
 			let subsistence = Contracts::<Test>::subsistence_threshold();
 			let allowance = subsistence * 3;
 			assert_eq!(ctx.ext.rent_allowance(), <BalanceOf<Test>>::max_value());
@@ -1547,4 +1735,79 @@ mod tests {
 			assert_matches!(result, Ok(_));
 		});
 	}
+
+	#[test]
+	fn rent_params_works() {
+		let code_hash = MockLoader::insert(Call, |ctx, executable| {
+			let address = ctx.ext.address();
+			let contract = <ContractInfoOf<Test>>::get(address)
+				.and_then(|c| c.get_alive())
+				.unwrap();
+			assert_eq!(ctx.ext.rent_params(), &RentParams::new(address, &contract, executable));
+			exec_success()
+		});
+
+		ExtBuilder::default().build().execute_with(|| {
+			let subsistence = Contracts::<Test>::subsistence_threshold();
+			let schedule = Contracts::current_schedule();
+			let mut ctx = MockContext::top_level(ALICE, &schedule);
+			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
+			set_balance(&ALICE, subsistence * 10);
+			place_contract(&BOB, code_hash);
+			ctx.call(
+				BOB,
+				0,
+				&mut gas_meter,
+				vec![],
+			).unwrap();
+		});
+	}
+
+	#[test]
+	fn rent_params_snapshotted() {
+		let code_hash = MockLoader::insert(Call, |ctx, executable| {
+			let subsistence = Contracts::<Test>::subsistence_threshold();
+			let address = ctx.ext.address();
+			let contract = <ContractInfoOf<Test>>::get(address)
+				.and_then(|c| c.get_alive())
+				.unwrap();
+			let rent_params = RentParams::new(address, &contract, executable);
+
+			// Changing the allowance during the call: rent params stay unchanged.
+			let allowance = 42;
+			assert_ne!(allowance, rent_params.rent_allowance);
+			ctx.ext.set_rent_allowance(allowance);
+			assert_eq!(ctx.ext.rent_params(), &rent_params);
+
+			// Creating another instance from the same code_hash increases the refcount.
+			// This is also not reflected in the rent params.
+			assert_eq!(MockLoader::refcount(&executable.code_hash), 1);
+			ctx.ext.instantiate(
+				executable.code_hash,
+				subsistence * 25,
+				&mut GasMeter::<Test>::new(GAS_LIMIT),
+				vec![],
+				&[],
+			).unwrap();
+			assert_eq!(MockLoader::refcount(&executable.code_hash), 2);
+			assert_eq!(ctx.ext.rent_params(), &rent_params);
+
+			exec_success()
+		});
+
+		ExtBuilder::default().build().execute_with(|| {
+			let subsistence = Contracts::<Test>::subsistence_threshold();
+			let schedule = Contracts::current_schedule();
+			let mut ctx = MockContext::top_level(ALICE, &schedule);
+			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
+			set_balance(&ALICE, subsistence * 100);
+			place_contract(&BOB, code_hash);
+			ctx.call(
+				BOB,
+				subsistence * 50,
+				&mut gas_meter,
+				vec![],
+			).unwrap();
+		});
+	}
 }
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index 7068c4e99e97..5453e079e3ae 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -90,6 +90,7 @@ mod wasm;
 mod rent;
 mod benchmarking;
 mod schedule;
+mod migration;
 
 pub mod chain_extension;
 pub mod weights;
@@ -265,6 +266,10 @@ pub mod pallet {
 			Storage::<T>::process_deletion_queue_batch(weight_limit)
 				.saturating_add(T::WeightInfo::on_initialize())
 		}
+
+		fn on_runtime_upgrade() -> Weight {
+			migration::migrate::<T>()
+		}
 	}
 
 	#[pallet::call]
@@ -275,14 +280,17 @@ pub mod pallet {
 	{
 		/// Updates the schedule for metering contracts.
 		///
-		/// The schedule must have a greater version than the stored schedule.
+		/// The schedule's version cannot be less than the version of the stored schedule.
+		/// If a schedule does not change the instruction weights the version does not
+		/// need to be increased. Therefore we allow storing a schedule that has the same
+		/// version as the stored one.
 		#[pallet::weight(T::WeightInfo::update_schedule())]
 		pub fn update_schedule(
 			origin: OriginFor<T>,
 			schedule: Schedule<T>
 		) -> DispatchResultWithPostInfo {
 			ensure_root(origin)?;
-			if <Module<T>>::current_schedule().version >= schedule.version {
+			if <Module<T>>::current_schedule().version > schedule.version {
 				Err(Error::<T>::InvalidScheduleVersion)?
 			}
 			Self::deposit_event(Event::ScheduleUpdated(schedule.version));
diff --git a/frame/contracts/src/migration.rs b/frame/contracts/src/migration.rs
new file mode 100644
index 000000000000..2e10f4b7ff68
--- /dev/null
+++ b/frame/contracts/src/migration.rs
@@ -0,0 +1,45 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::{Config, Weight, CurrentSchedule, Pallet, Schedule};
+use frame_support::traits::{GetPalletVersion, PalletVersion, Get};
+
+pub fn migrate<T: Config>() -> Weight {
+	let mut weight: Weight = 0;
+
+	match <Pallet<T>>::storage_version() {
+		// Replace the schedule with the new default and increment its version.
+		Some(version) if version == PalletVersion::new(3, 0, 0) => {
+			weight = weight.saturating_add(T::DbWeight::get().reads_writes(1, 1));
+			let _ = <CurrentSchedule<T>>::translate::<u32, _>(|version| {
+				if let Some(version) = version {
+					Some(Schedule {
+						version: version.saturating_add(1),
+						// Default limits were not decreased. Therefore it is OK to overwrite
+						// the schedule with the new defaults.
+						.. Default::default()
+					})
+				} else {
+					None
+				}
+			});
+		}
+		_ => (),
+	}
+
+	weight
+}
diff --git a/frame/contracts/src/schedule.rs b/frame/contracts/src/schedule.rs
index c86134bc415d..24ba83cc1b79 100644
--- a/frame/contracts/src/schedule.rs
+++ b/frame/contracts/src/schedule.rs
@@ -45,6 +45,14 @@ pub const INSTR_BENCHMARK_BATCH_SIZE: u32 = 1_000;
 #[derive(Clone, Encode, Decode, PartialEq, Eq, ScheduleDebug)]
 pub struct Schedule<T: Config> {
 	/// Version of the schedule.
+	///
+	/// # Note
+	///
+	/// Must be incremented whenever the [`self.instruction_weights`] are changed. The
+	/// reason is that changes to instruction weights require a re-instrumentation
+	/// of all contracts which are triggered by a version comparison on call.
+	/// Changes to other parts of the schedule should not increment the version in
+	/// order to avoid unnecessary re-instrumentations.
 	pub version: u32,
 
 	/// Whether the `seal_println` function is allowed to be used contracts.
@@ -62,6 +70,11 @@ pub struct Schedule<T: Config> {
 }
 
 /// Describes the upper limits on various metrics.
+///
+/// # Note
+///
+/// The values in this struct should only ever be increased for a deployed chain. The reason
+/// is that decreasing those values will break existing contracts which are above the new limits.
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 #[derive(Clone, Encode, Decode, PartialEq, Eq, RuntimeDebug)]
 pub struct Limits {
@@ -188,6 +201,7 @@ pub struct InstructionWeights<T: Config> {
 	pub i64rotl: u32,
 	pub i64rotr: u32,
 	/// The type parameter is used in the default implementation.
+	#[codec(skip)]
 	pub _phantom: PhantomData<T>,
 }
 
@@ -348,7 +362,11 @@ pub struct HostFnWeights<T: Config> {
 	/// Weight per byte hashed by `seal_hash_blake2_128`.
 	pub hash_blake2_128_per_byte: Weight,
 
+	/// Weight of calling `seal_rent_params`.
+	pub rent_params: Weight,
+
 	/// The type parameter is used in the default implementation.
+	#[codec(skip)]
 	pub _phantom: PhantomData<T>
 }
 
@@ -572,6 +590,7 @@ impl<T: Config> Default for HostFnWeights<T> {
 			hash_blake2_256_per_byte: cost_byte_batched!(seal_hash_blake2_256_per_kb),
 			hash_blake2_128: cost_batched!(seal_hash_blake2_128),
 			hash_blake2_128_per_byte: cost_byte_batched!(seal_hash_blake2_128_per_kb),
+			rent_params: cost_batched!(seal_rent_params),
 			_phantom: PhantomData,
 		}
 	}
diff --git a/frame/contracts/src/storage.rs b/frame/contracts/src/storage.rs
index 5b9e7c1f583c..970eec200366 100644
--- a/frame/contracts/src/storage.rs
+++ b/frame/contracts/src/storage.rs
@@ -30,7 +30,7 @@ use sp_io::hashing::blake2_256;
 use sp_runtime::traits::{Bounded, Saturating, Zero};
 use sp_core::crypto::UncheckedFrom;
 use frame_support::{
-	dispatch::DispatchResult,
+	dispatch::{DispatchError, DispatchResult},
 	storage::child::{self, KillChildStorageResult},
 	traits::Get,
 	weights::Weight,
@@ -162,7 +162,7 @@ where
 		account: &AccountIdOf<T>,
 		trie_id: TrieId,
 		ch: CodeHash<T>,
-	) -> DispatchResult {
+	) -> Result<AliveContractInfo<T>, DispatchError> {
 		<ContractInfoOf<T>>::try_mutate(account, |existing| {
 			if existing.is_some() {
 				return Err(Error::<T>::DuplicateContract.into());
@@ -184,9 +184,9 @@ where
 				_reserved: None,
 			};
 
-			*existing = Some(contract.into());
+			*existing = Some(contract.clone().into());
 
-			Ok(())
+			Ok(contract)
 		})
 	}
 
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index c17434300d45..2fa09e3405c1 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -2736,7 +2736,6 @@ fn refcounter() {
 	});
 }
 
-
 #[test]
 fn reinstrument_does_charge() {
 	let (wasm, code_hash) = compile_module::<Test>("return_with_data").unwrap();
diff --git a/frame/contracts/src/wasm/mod.rs b/frame/contracts/src/wasm/mod.rs
index 9001e2b8e92d..6fc6bc1764e4 100644
--- a/frame/contracts/src/wasm/mod.rs
+++ b/frame/contracts/src/wasm/mod.rs
@@ -224,13 +224,21 @@ where
 	fn occupied_storage(&self) -> u32 {
 		// We disregard the size of the struct itself as the size is completely
 		// dominated by the code size.
-		let len = self.original_code_len.saturating_add(self.code.len() as u32);
+		let len = self.aggregate_code_len();
 		len.checked_div(self.refcount as u32).unwrap_or(len)
 	}
 
 	fn code_len(&self) -> u32 {
 		self.code.len() as u32
 	}
+
+	fn aggregate_code_len(&self) -> u32 {
+		self.original_code_len.saturating_add(self.code_len())
+	}
+
+	fn refcount(&self) -> u32 {
+		self.refcount as u32
+	}
 }
 
 #[cfg(test)]
@@ -238,7 +246,7 @@ mod tests {
 	use super::*;
 	use crate::{
 		CodeHash, BalanceOf, Error, Module as Contracts,
-		exec::{Ext, StorageKey, AccountIdOf, Executable},
+		exec::{Ext, StorageKey, AccountIdOf, Executable, RentParams},
 		gas::GasMeter,
 		tests::{Test, Call, ALICE, BOB},
 	};
@@ -249,6 +257,7 @@ mod tests {
 	use frame_support::{dispatch::DispatchResult, weights::Weight};
 	use assert_matches::assert_matches;
 	use pallet_contracts_primitives::{ExecReturnValue, ReturnFlags, ExecError, ErrorOrigin};
+	use pretty_assertions::assert_eq;
 
 	const GAS_LIMIT: Weight = 10_000_000_000;
 
@@ -295,6 +304,7 @@ mod tests {
 		// (topics, data)
 		events: Vec<(Vec<H256>, Vec<u8>)>,
 		schedule: Schedule<Test>,
+		rent_params: RentParams<Test>,
 	}
 
 	impl Ext for MockExt {
@@ -395,46 +405,38 @@ mod tests {
 		fn value_transferred(&self) -> u64 {
 			1337
 		}
-
 		fn now(&self) -> &u64 {
 			&1111
 		}
-
 		fn minimum_balance(&self) -> u64 {
 			666
 		}
-
 		fn tombstone_deposit(&self) -> u64 {
 			16
 		}
-
 		fn random(&self, subject: &[u8]) -> H256 {
 			H256::from_slice(subject)
 		}
-
 		fn deposit_event(&mut self, topics: Vec<H256>, data: Vec<u8>) {
 			self.events.push((topics, data))
 		}
-
 		fn set_rent_allowance(&mut self, rent_allowance: u64) {
 			self.rent_allowance = rent_allowance;
 		}
-
 		fn rent_allowance(&self) -> u64 {
 			self.rent_allowance
 		}
-
 		fn block_number(&self) -> u64 { 121 }
-
 		fn max_value_size(&self) -> u32 { 16_384 }
-
 		fn get_weight_price(&self, weight: Weight) -> BalanceOf<Self::T> {
 			BalanceOf::<Self::T>::from(1312_u32).saturating_mul(weight.into())
 		}
-
 		fn schedule(&self) -> &Schedule<Self::T> {
 			&self.schedule
 		}
+		fn rent_params(&self) -> &RentParams<Self::T> {
+			&self.rent_params
+		}
 	}
 
 	impl Ext for &mut MockExt {
@@ -537,6 +539,9 @@ mod tests {
 		fn schedule(&self) -> &Schedule<Self::T> {
 			(**self).schedule()
 		}
+		fn rent_params(&self) -> &RentParams<Self::T> {
+			(**self).rent_params()
+		}
 	}
 
 	fn execute<E: Ext>(
@@ -1840,4 +1845,45 @@ mod tests {
 		);
 	}
 
+	const CODE_RENT_PARAMS: &str = r#"
+(module
+	(import "seal0" "seal_rent_params" (func $seal_rent_params (param i32 i32)))
+	(import "seal0" "seal_return" (func $seal_return (param i32 i32 i32)))
+	(import "env" "memory" (memory 1 1))
+
+	;; [0, 4) buffer size = 128 bytes
+	(data (i32.const 0) "\80")
+
+	;; [4; inf) buffer where the result is copied
+
+	(func (export "call")
+		;; Load the rent params into memory
+		(call $seal_rent_params
+			(i32.const 4)		;; Pointer to the output buffer
+			(i32.const 0)		;; Pointer to the size of the buffer
+		)
+
+		;; Return the contents of the buffer
+		(call $seal_return
+			(i32.const 0)				;; return flags
+			(i32.const 4)				;; buffer pointer
+			(i32.load (i32.const 0))	;; buffer size
+		)
+	)
+
+	(func (export "deploy"))
+)
+"#;
+
+	#[test]
+	fn rent_params_work() {
+		let output = execute(
+			CODE_RENT_PARAMS,
+			vec![],
+			MockExt::default(),
+			&mut GasMeter::new(GAS_LIMIT),
+		).unwrap();
+		let rent_params = <RentParams<Test>>::default().encode();
+		assert_eq!(output, ExecReturnValue { flags: ReturnFlags::empty(), data: rent_params });
+	}
 }
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index 7fde24d20405..2ceac1c51604 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -215,6 +215,8 @@ pub enum RuntimeToken {
 	ChainExtension(u64),
 	/// Weight charged for copying data from the sandbox.
 	CopyIn(u32),
+	/// Weight of calling `seal_rent_params`.
+	RentParams,
 }
 
 impl<T: Config> Token<T> for RuntimeToken
@@ -283,6 +285,7 @@ where
 				.saturating_add(s.hash_blake2_128_per_byte.saturating_mul(len.into())),
 			ChainExtension(amount) => amount,
 			CopyIn(len) => s.return_per_byte.saturating_mul(len.into()),
+			RentParams => s.rent_params,
 		}
 	}
 }
@@ -1513,4 +1516,25 @@ define_env!(Env, <E: Ext>,
 			})),
 		}
 	},
+
+	// Stores the rent params into the supplied buffer.
+	//
+	// The value is stored to linear memory at the address pointed to by `out_ptr`.
+	// `out_len_ptr` must point to a u32 value that describes the available space at
+	// `out_ptr`. This call overwrites it with the size of the value. If the available
+	// space at `out_ptr` is less than the size of the value a trap is triggered.
+	//
+	// The data is encoded as [`crate::exec::RentParams`].
+	//
+	// # Note
+	//
+	// The returned information was collected and cached when the current contract call
+	// started execution. Any change to those values that happens due to actions of the
+	// current call or contracts that are called by this contract are not considered.
+	seal_rent_params(ctx, out_ptr: u32, out_len_ptr: u32) => {
+		ctx.charge_gas(RuntimeToken::RentParams)?;
+		Ok(ctx.write_sandbox_output(
+			out_ptr, out_len_ptr, &ctx.ext.rent_params().encode(), false, already_charged
+		)?)
+	},
 );
diff --git a/frame/contracts/src/weights.rs b/frame/contracts/src/weights.rs
index 3972c3fa2cd6..dd9f082a18dc 100644
--- a/frame/contracts/src/weights.rs
+++ b/frame/contracts/src/weights.rs
@@ -63,6 +63,7 @@ pub trait WeightInfo {
 	fn seal_rent_allowance(r: u32, ) -> Weight;
 	fn seal_block_number(r: u32, ) -> Weight;
 	fn seal_now(r: u32, ) -> Weight;
+	fn seal_rent_params(r: u32, ) -> Weight;
 	fn seal_weight_to_fee(r: u32, ) -> Weight;
 	fn seal_gas(r: u32, ) -> Weight;
 	fn seal_input(r: u32, ) -> Weight;
@@ -152,271 +153,277 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn on_initialize() -> Weight {
-		(3_733_000 as Weight)
+		(3_850_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 	}
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
-		(49_569_000 as Weight)
+		(52_925_000 as Weight)
 			// Standard Error: 5_000
-			.saturating_add((2_295_000 as Weight).saturating_mul(k as Weight))
+			.saturating_add((2_297_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
-		(358_064_000 as Weight)
-			// Standard Error: 143_000
-			.saturating_add((140_992_000 as Weight).saturating_mul(q as Weight))
+		(434_698_000 as Weight)
+			// Standard Error: 210_000
+			.saturating_add((166_559_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn instrument(c: u32, ) -> Weight {
-		(44_198_000 as Weight)
-			// Standard Error: 188_000
-			.saturating_add((125_833_000 as Weight).saturating_mul(c as Weight))
+		(29_918_000 as Weight)
+			// Standard Error: 185_000
+			.saturating_add((123_774_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn update_schedule() -> Weight {
-		(29_190_000 as Weight)
+		(29_795_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight {
-		(180_015_000 as Weight)
-			// Standard Error: 197_000
-			.saturating_add((167_480_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 12_000
-			.saturating_add((2_581_000 as Weight).saturating_mul(s as Weight))
+		(225_834_000 as Weight)
+			// Standard Error: 144_000
+			.saturating_add((165_632_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 9_000
+			.saturating_add((2_563_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
 	fn instantiate(c: u32, s: u32, ) -> Weight {
-		(180_996_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((8_684_000 as Weight).saturating_mul(c as Weight))
+		(190_482_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((8_724_000 as Weight).saturating_mul(c as Weight))
 			// Standard Error: 1_000
-			.saturating_add((2_518_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((2_512_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn call(c: u32, ) -> Weight {
-		(184_326_000 as Weight)
+		(195_414_000 as Weight)
 			// Standard Error: 2_000
 			.saturating_add((3_920_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn claim_surcharge(c: u32, ) -> Weight {
-		(303_270_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((5_108_000 as Weight).saturating_mul(c as Weight))
+		(336_867_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((5_262_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn seal_caller(r: u32, ) -> Weight {
-		(128_965_000 as Weight)
-			// Standard Error: 130_000
-			.saturating_add((270_123_000 as Weight).saturating_mul(r as Weight))
+		(143_935_000 as Weight)
+			// Standard Error: 128_000
+			.saturating_add((266_876_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_address(r: u32, ) -> Weight {
-		(137_748_000 as Weight)
-			// Standard Error: 184_000
-			.saturating_add((270_103_000 as Weight).saturating_mul(r as Weight))
+		(150_342_000 as Weight)
+			// Standard Error: 127_000
+			.saturating_add((266_051_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(118_784_000 as Weight)
-			// Standard Error: 234_000
-			.saturating_add((264_467_000 as Weight).saturating_mul(r as Weight))
+		(144_833_000 as Weight)
+			// Standard Error: 124_000
+			.saturating_add((259_279_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_balance(r: u32, ) -> Weight {
-		(146_072_000 as Weight)
-			// Standard Error: 207_000
-			.saturating_add((573_282_000 as Weight).saturating_mul(r as Weight))
+		(152_032_000 as Weight)
+			// Standard Error: 218_000
+			.saturating_add((573_038_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(133_857_000 as Weight)
-			// Standard Error: 151_000
-			.saturating_add((263_110_000 as Weight).saturating_mul(r as Weight))
+		(148_831_000 as Weight)
+			// Standard Error: 147_000
+			.saturating_add((260_718_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(130_447_000 as Weight)
-			// Standard Error: 125_000
-			.saturating_add((265_565_000 as Weight).saturating_mul(r as Weight))
+		(142_925_000 as Weight)
+			// Standard Error: 130_000
+			.saturating_add((260_426_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(116_232_000 as Weight)
-			// Standard Error: 327_000
-			.saturating_add((265_728_000 as Weight).saturating_mul(r as Weight))
+		(143_151_000 as Weight)
+			// Standard Error: 119_000
+			.saturating_add((260_964_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(175_561_000 as Weight)
-			// Standard Error: 292_000
-			.saturating_add((604_373_000 as Weight).saturating_mul(r as Weight))
+		(155_126_000 as Weight)
+			// Standard Error: 225_000
+			.saturating_add((599_056_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_block_number(r: u32, ) -> Weight {
-		(133_961_000 as Weight)
-			// Standard Error: 150_000
-			.saturating_add((262_329_000 as Weight).saturating_mul(r as Weight))
+		(144_566_000 as Weight)
+			// Standard Error: 110_000
+			.saturating_add((257_620_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_now(r: u32, ) -> Weight {
-		(128_662_000 as Weight)
-			// Standard Error: 150_000
-			.saturating_add((263_234_000 as Weight).saturating_mul(r as Weight))
+		(147_274_000 as Weight)
+			// Standard Error: 115_000
+			.saturating_add((258_627_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+	}
+	fn seal_rent_params(r: u32, ) -> Weight {
+		(168_575_000 as Weight)
+			// Standard Error: 394_000
+			.saturating_add((397_754_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(142_580_000 as Weight)
-			// Standard Error: 205_000
-			.saturating_add((505_378_000 as Weight).saturating_mul(r as Weight))
+		(148_102_000 as Weight)
+			// Standard Error: 201_000
+			.saturating_add((537_088_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 	}
 	fn seal_gas(r: u32, ) -> Weight {
-		(116_346_000 as Weight)
-			// Standard Error: 86_000
-			.saturating_add((124_599_000 as Weight).saturating_mul(r as Weight))
+		(125_122_000 as Weight)
+			// Standard Error: 89_000
+			.saturating_add((122_350_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_input(r: u32, ) -> Weight {
-		(124_679_000 as Weight)
-			// Standard Error: 81_000
-			.saturating_add((7_310_000 as Weight).saturating_mul(r as Weight))
+		(137_334_000 as Weight)
+			// Standard Error: 99_000
+			.saturating_add((7_359_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(136_069_000 as Weight)
+		(145_094_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((274_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((283_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_return(r: u32, ) -> Weight {
-		(118_807_000 as Weight)
-			// Standard Error: 66_000
-			.saturating_add((4_740_000 as Weight).saturating_mul(r as Weight))
+		(127_544_000 as Weight)
+			// Standard Error: 138_000
+			.saturating_add((4_640_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(127_702_000 as Weight)
+		(137_517_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((784_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((783_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_terminate(r: u32, ) -> Weight {
-		(124_847_000 as Weight)
-			// Standard Error: 87_000
-			.saturating_add((107_679_000 as Weight).saturating_mul(r as Weight))
+		(138_292_000 as Weight)
+			// Standard Error: 689_000
+			.saturating_add((111_698_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes((5 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_terminate_per_code_kb(c: u32, ) -> Weight {
-		(237_115_000 as Weight)
-			// Standard Error: 6_000
-			.saturating_add((8_556_000 as Weight).saturating_mul(c as Weight))
+		(263_507_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((8_409_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
 	fn seal_restore_to(r: u32, ) -> Weight {
-		(217_959_000 as Weight)
-			// Standard Error: 455_000
-			.saturating_add((134_528_000 as Weight).saturating_mul(r as Weight))
+		(232_291_000 as Weight)
+			// Standard Error: 301_000
+			.saturating_add((136_379_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes((6 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_restore_to_per_code_kb_delta(c: u32, t: u32, d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 151_000
-			.saturating_add((9_061_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 151_000
-			.saturating_add((4_807_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 1_331_000
-			.saturating_add((3_736_196_000 as Weight).saturating_mul(d as Weight))
+			// Standard Error: 162_000
+			.saturating_add((8_619_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 162_000
+			.saturating_add((4_877_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 1_433_000
+			.saturating_add((3_762_810_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(T::DbWeight::get().reads(8 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
 			.saturating_add(T::DbWeight::get().writes(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
 	}
 	fn seal_random(r: u32, ) -> Weight {
-		(134_143_000 as Weight)
-			// Standard Error: 233_000
-			.saturating_add((643_555_000 as Weight).saturating_mul(r as Weight))
+		(153_634_000 as Weight)
+			// Standard Error: 267_000
+			.saturating_add((650_160_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 	}
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(142_838_000 as Weight)
-			// Standard Error: 367_000
-			.saturating_add((937_126_000 as Weight).saturating_mul(r as Weight))
+		(137_080_000 as Weight)
+			// Standard Error: 1_009_000
+			.saturating_add((949_228_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_210_711_000 as Weight)
-			// Standard Error: 2_124_000
-			.saturating_add((594_541_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 418_000
-			.saturating_add((251_068_000 as Weight).saturating_mul(n as Weight))
+		(1_259_129_000 as Weight)
+			// Standard Error: 2_542_000
+			.saturating_add((609_859_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 501_000
+			.saturating_add((249_496_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(144_533_000 as Weight)
-			// Standard Error: 220_000
-			.saturating_add((714_590_000 as Weight).saturating_mul(r as Weight))
+		(170_417_000 as Weight)
+			// Standard Error: 434_000
+			.saturating_add((721_511_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(406_366_000 as Weight)
-			// Standard Error: 3_533_000
-			.saturating_add((16_167_082_000 as Weight).saturating_mul(r as Weight))
+		(1_870_542_000 as Weight)
+			// Standard Error: 26_871_000
+			.saturating_add((18_312_239_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(1_739_590_000 as Weight)
-			// Standard Error: 390_000
-			.saturating_add((74_815_000 as Weight).saturating_mul(n as Weight))
+		(1_763_732_000 as Weight)
+			// Standard Error: 258_000
+			.saturating_add((74_848_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn seal_clear_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_284_000
-			.saturating_add((2_281_347_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 2_745_000
+			.saturating_add((2_316_433_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_get_storage(r: u32, ) -> Weight {
-		(81_889_000 as Weight)
-			// Standard Error: 1_171_000
-			.saturating_add((930_704_000 as Weight).saturating_mul(r as Weight))
+		(87_218_000 as Weight)
+			// Standard Error: 745_000
+			.saturating_add((948_121_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(709_323_000 as Weight)
-			// Standard Error: 391_000
-			.saturating_add((155_689_000 as Weight).saturating_mul(n as Weight))
+		(719_050_000 as Weight)
+			// Standard Error: 266_000
+			.saturating_add((154_812_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 	}
 	fn seal_transfer(r: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 1_846_000
-			.saturating_add((5_566_275_000 as Weight).saturating_mul(r as Weight))
+		(19_439_000 as Weight)
+			// Standard Error: 2_468_000
+			.saturating_add((5_674_822_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -424,619 +431,625 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	}
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 4_823_000
-			.saturating_add((10_461_861_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 7_465_000
+			.saturating_add((11_066_530_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().reads((200 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_call_per_code_transfer_input_output_kb(c: u32, t: u32, i: u32, o: u32, ) -> Weight {
-		(9_686_594_000 as Weight)
-			// Standard Error: 473_000
-			.saturating_add((393_132_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 197_094_000
-			.saturating_add((4_957_181_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 62_000
-			.saturating_add((59_974_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 66_000
-			.saturating_add((83_027_000 as Weight).saturating_mul(o as Weight))
+		(9_916_288_000 as Weight)
+			// Standard Error: 552_000
+			.saturating_add((397_842_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 229_902_000
+			.saturating_add((5_243_673_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 72_000
+			.saturating_add((59_737_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 77_000
+			.saturating_add((82_259_000 as Weight).saturating_mul(o as Weight))
 			.saturating_add(T::DbWeight::get().reads(206 as Weight))
 			.saturating_add(T::DbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 34_133_000
-			.saturating_add((21_407_630_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 32_016_000
+			.saturating_add((22_206_489_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes((300 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_instantiate_per_code_input_output_salt_kb(c: u32, i: u32, o: u32, s: u32, ) -> Weight {
-		(9_705_322_000 as Weight)
-			// Standard Error: 674_000
-			.saturating_add((879_118_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 95_000
-			.saturating_add((63_025_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 95_000
-			.saturating_add((87_633_000 as Weight).saturating_mul(o as Weight))
-			// Standard Error: 95_000
-			.saturating_add((311_987_000 as Weight).saturating_mul(s as Weight))
+		(9_991_947_000 as Weight)
+			// Standard Error: 637_000
+			.saturating_add((881_981_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 90_000
+			.saturating_add((63_638_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 90_000
+			.saturating_add((87_288_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 90_000
+			.saturating_add((311_808_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(207 as Weight))
 			.saturating_add(T::DbWeight::get().writes(203 as Weight))
 	}
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(125_486_000 as Weight)
-			// Standard Error: 266_000
-			.saturating_add((240_913_000 as Weight).saturating_mul(r as Weight))
+		(132_452_000 as Weight)
+			// Standard Error: 227_000
+			.saturating_add((239_671_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(636_153_000 as Weight)
-			// Standard Error: 47_000
-			.saturating_add((429_541_000 as Weight).saturating_mul(n as Weight))
+		(756_802_000 as Weight)
+			// Standard Error: 48_000
+			.saturating_add((429_454_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(131_768_000 as Weight)
-			// Standard Error: 176_000
-			.saturating_add((256_946_000 as Weight).saturating_mul(r as Weight))
+		(139_440_000 as Weight)
+			// Standard Error: 128_000
+			.saturating_add((249_514_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(647_777_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((344_145_000 as Weight).saturating_mul(n as Weight))
+		(658_595_000 as Weight)
+			// Standard Error: 35_000
+			.saturating_add((343_814_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(130_042_000 as Weight)
-			// Standard Error: 158_000
-			.saturating_add((225_474_000 as Weight).saturating_mul(r as Weight))
+		(138_124_000 as Weight)
+			// Standard Error: 140_000
+			.saturating_add((223_189_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(638_275_000 as Weight)
-			// Standard Error: 30_000
-			.saturating_add((159_832_000 as Weight).saturating_mul(n as Weight))
+		(689_667_000 as Weight)
+			// Standard Error: 41_000
+			.saturating_add((160_006_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(126_632_000 as Weight)
-			// Standard Error: 143_000
-			.saturating_add((225_612_000 as Weight).saturating_mul(r as Weight))
+		(140_225_000 as Weight)
+			// Standard Error: 156_000
+			.saturating_add((223_696_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(656_936_000 as Weight)
-			// Standard Error: 35_000
-			.saturating_add((159_763_000 as Weight).saturating_mul(n as Weight))
+		(693_756_000 as Weight)
+			// Standard Error: 40_000
+			.saturating_add((159_996_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(25_205_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((3_311_000 as Weight).saturating_mul(r as Weight))
+		(24_250_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((3_134_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(27_394_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((159_123_000 as Weight).saturating_mul(r as Weight))
+		(26_509_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((161_556_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(27_398_000 as Weight)
-			// Standard Error: 57_000
-			.saturating_add((229_775_000 as Weight).saturating_mul(r as Weight))
+		(26_499_000 as Weight)
+			// Standard Error: 59_000
+			.saturating_add((233_755_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(25_212_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((12_291_000 as Weight).saturating_mul(r as Weight))
+		(24_175_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((12_450_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(25_116_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((12_146_000 as Weight).saturating_mul(r as Weight))
+		(24_219_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((12_058_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(25_119_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((6_608_000 as Weight).saturating_mul(r as Weight))
+		(24_146_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((6_017_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(25_146_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((14_017_000 as Weight).saturating_mul(r as Weight))
+		(24_229_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((13_726_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(25_192_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((15_460_000 as Weight).saturating_mul(r as Weight))
+		(24_219_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((15_115_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(37_079_000 as Weight)
+		(34_981_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((160_000 as Weight).saturating_mul(e as Weight))
+			.saturating_add((156_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(25_599_000 as Weight)
-			// Standard Error: 201_000
-			.saturating_add((99_705_000 as Weight).saturating_mul(r as Weight))
+		(24_599_000 as Weight)
+			// Standard Error: 102_000
+			.saturating_add((95_771_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(33_236_000 as Weight)
-			// Standard Error: 368_000
-			.saturating_add((199_753_000 as Weight).saturating_mul(r as Weight))
+		(32_584_000 as Weight)
+			// Standard Error: 176_000
+			.saturating_add((193_216_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(247_488_000 as Weight)
+		(240_739_000 as Weight)
 			// Standard Error: 6_000
-			.saturating_add((3_374_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((3_407_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(44_133_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((3_235_000 as Weight).saturating_mul(r as Weight))
+		(41_963_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((3_110_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(44_107_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((3_486_000 as Weight).saturating_mul(r as Weight))
+		(41_956_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((3_460_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(44_116_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((4_757_000 as Weight).saturating_mul(r as Weight))
+		(42_002_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((4_591_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(28_712_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((7_659_000 as Weight).saturating_mul(r as Weight))
+		(27_646_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((7_821_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(28_624_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((11_841_000 as Weight).saturating_mul(r as Weight))
+		(27_615_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((11_807_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(27_445_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((3_487_000 as Weight).saturating_mul(r as Weight))
+		(27_106_000 as Weight)
+			// Standard Error: 78_000
+			.saturating_add((2_952_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(26_016_000 as Weight)
-			// Standard Error: 4_230_000
-			.saturating_add((2_300_044_000 as Weight).saturating_mul(r as Weight))
+		(24_956_000 as Weight)
+			// Standard Error: 3_541_000
+			.saturating_add((2_332_414_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(25_227_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((5_341_000 as Weight).saturating_mul(r as Weight))
+		(24_183_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((5_166_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(25_163_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((5_355_000 as Weight).saturating_mul(r as Weight))
+		(24_142_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((5_146_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(25_204_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((5_930_000 as Weight).saturating_mul(r as Weight))
+		(24_161_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((5_807_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(25_177_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((5_457_000 as Weight).saturating_mul(r as Weight))
+		(24_167_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((5_288_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(25_206_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((5_229_000 as Weight).saturating_mul(r as Weight))
+		(24_252_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((5_091_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(25_165_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((5_301_000 as Weight).saturating_mul(r as Weight))
+		(24_243_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((5_076_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(25_184_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((5_356_000 as Weight).saturating_mul(r as Weight))
+		(24_227_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((5_135_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(25_195_000 as Weight)
-			// Standard Error: 48_000
-			.saturating_add((7_406_000 as Weight).saturating_mul(r as Weight))
+		(24_278_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((7_124_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(25_192_000 as Weight)
+		(24_254_000 as Weight)
 			// Standard Error: 19_000
-			.saturating_add((7_303_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((7_067_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(25_165_000 as Weight)
-			// Standard Error: 34_000
-			.saturating_add((7_247_000 as Weight).saturating_mul(r as Weight))
+		(24_220_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((7_122_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(25_152_000 as Weight)
-			// Standard Error: 46_000
-			.saturating_add((7_464_000 as Weight).saturating_mul(r as Weight))
+		(24_221_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((7_221_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(25_140_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((7_308_000 as Weight).saturating_mul(r as Weight))
+		(24_259_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((7_135_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(25_723_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((6_846_000 as Weight).saturating_mul(r as Weight))
+		(24_245_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((7_193_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(25_201_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((7_226_000 as Weight).saturating_mul(r as Weight))
+		(24_289_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((7_023_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(25_192_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((7_143_000 as Weight).saturating_mul(r as Weight))
+		(24_239_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((7_065_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(25_146_000 as Weight)
-			// Standard Error: 37_000
-			.saturating_add((7_451_000 as Weight).saturating_mul(r as Weight))
+		(24_256_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((7_119_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(25_193_000 as Weight)
-			// Standard Error: 30_000
-			.saturating_add((7_391_000 as Weight).saturating_mul(r as Weight))
+		(24_240_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_225_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(25_192_000 as Weight)
-			// Standard Error: 30_000
-			.saturating_add((7_214_000 as Weight).saturating_mul(r as Weight))
+		(24_266_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((6_996_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(25_221_000 as Weight)
-			// Standard Error: 34_000
-			.saturating_add((7_168_000 as Weight).saturating_mul(r as Weight))
+		(24_265_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((6_974_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(25_221_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((7_200_000 as Weight).saturating_mul(r as Weight))
+		(24_232_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((7_103_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(25_229_000 as Weight)
-			// Standard Error: 32_000
-			.saturating_add((13_066_000 as Weight).saturating_mul(r as Weight))
+		(24_245_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((12_915_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(25_210_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((12_314_000 as Weight).saturating_mul(r as Weight))
+		(24_177_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((12_232_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(25_186_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((13_055_000 as Weight).saturating_mul(r as Weight))
+		(24_171_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((12_939_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(25_162_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((12_327_000 as Weight).saturating_mul(r as Weight))
+		(24_788_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((11_657_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(25_191_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((7_153_000 as Weight).saturating_mul(r as Weight))
+		(24_252_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((7_003_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(25_184_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((7_120_000 as Weight).saturating_mul(r as Weight))
+		(24_263_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((7_005_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(25_129_000 as Weight)
-			// Standard Error: 31_000
-			.saturating_add((7_247_000 as Weight).saturating_mul(r as Weight))
+		(24_239_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((7_020_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(25_156_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((7_333_000 as Weight).saturating_mul(r as Weight))
+		(24_212_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((7_172_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(25_159_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((7_415_000 as Weight).saturating_mul(r as Weight))
+		(24_220_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((7_246_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(25_181_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((7_265_000 as Weight).saturating_mul(r as Weight))
+		(24_213_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((7_191_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(25_165_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((7_443_000 as Weight).saturating_mul(r as Weight))
+		(24_221_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_192_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(25_103_000 as Weight)
-			// Standard Error: 44_000
-			.saturating_add((7_463_000 as Weight).saturating_mul(r as Weight))
+		(24_235_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((7_106_000 as Weight).saturating_mul(r as Weight))
 	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn on_initialize() -> Weight {
-		(3_733_000 as Weight)
+		(3_850_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 	}
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
-		(49_569_000 as Weight)
+		(52_925_000 as Weight)
 			// Standard Error: 5_000
-			.saturating_add((2_295_000 as Weight).saturating_mul(k as Weight))
+			.saturating_add((2_297_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
-		(358_064_000 as Weight)
-			// Standard Error: 143_000
-			.saturating_add((140_992_000 as Weight).saturating_mul(q as Weight))
+		(434_698_000 as Weight)
+			// Standard Error: 210_000
+			.saturating_add((166_559_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn instrument(c: u32, ) -> Weight {
-		(44_198_000 as Weight)
-			// Standard Error: 188_000
-			.saturating_add((125_833_000 as Weight).saturating_mul(c as Weight))
+		(29_918_000 as Weight)
+			// Standard Error: 185_000
+			.saturating_add((123_774_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn update_schedule() -> Weight {
-		(29_190_000 as Weight)
+		(29_795_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight {
-		(180_015_000 as Weight)
-			// Standard Error: 197_000
-			.saturating_add((167_480_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 12_000
-			.saturating_add((2_581_000 as Weight).saturating_mul(s as Weight))
+		(225_834_000 as Weight)
+			// Standard Error: 144_000
+			.saturating_add((165_632_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 9_000
+			.saturating_add((2_563_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}
 	fn instantiate(c: u32, s: u32, ) -> Weight {
-		(180_996_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((8_684_000 as Weight).saturating_mul(c as Weight))
+		(190_482_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((8_724_000 as Weight).saturating_mul(c as Weight))
 			// Standard Error: 1_000
-			.saturating_add((2_518_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((2_512_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn call(c: u32, ) -> Weight {
-		(184_326_000 as Weight)
+		(195_414_000 as Weight)
 			// Standard Error: 2_000
 			.saturating_add((3_920_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn claim_surcharge(c: u32, ) -> Weight {
-		(303_270_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((5_108_000 as Weight).saturating_mul(c as Weight))
+		(336_867_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((5_262_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn seal_caller(r: u32, ) -> Weight {
-		(128_965_000 as Weight)
-			// Standard Error: 130_000
-			.saturating_add((270_123_000 as Weight).saturating_mul(r as Weight))
+		(143_935_000 as Weight)
+			// Standard Error: 128_000
+			.saturating_add((266_876_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_address(r: u32, ) -> Weight {
-		(137_748_000 as Weight)
-			// Standard Error: 184_000
-			.saturating_add((270_103_000 as Weight).saturating_mul(r as Weight))
+		(150_342_000 as Weight)
+			// Standard Error: 127_000
+			.saturating_add((266_051_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(118_784_000 as Weight)
-			// Standard Error: 234_000
-			.saturating_add((264_467_000 as Weight).saturating_mul(r as Weight))
+		(144_833_000 as Weight)
+			// Standard Error: 124_000
+			.saturating_add((259_279_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_balance(r: u32, ) -> Weight {
-		(146_072_000 as Weight)
-			// Standard Error: 207_000
-			.saturating_add((573_282_000 as Weight).saturating_mul(r as Weight))
+		(152_032_000 as Weight)
+			// Standard Error: 218_000
+			.saturating_add((573_038_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(133_857_000 as Weight)
-			// Standard Error: 151_000
-			.saturating_add((263_110_000 as Weight).saturating_mul(r as Weight))
+		(148_831_000 as Weight)
+			// Standard Error: 147_000
+			.saturating_add((260_718_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(130_447_000 as Weight)
-			// Standard Error: 125_000
-			.saturating_add((265_565_000 as Weight).saturating_mul(r as Weight))
+		(142_925_000 as Weight)
+			// Standard Error: 130_000
+			.saturating_add((260_426_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(116_232_000 as Weight)
-			// Standard Error: 327_000
-			.saturating_add((265_728_000 as Weight).saturating_mul(r as Weight))
+		(143_151_000 as Weight)
+			// Standard Error: 119_000
+			.saturating_add((260_964_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(175_561_000 as Weight)
-			// Standard Error: 292_000
-			.saturating_add((604_373_000 as Weight).saturating_mul(r as Weight))
+		(155_126_000 as Weight)
+			// Standard Error: 225_000
+			.saturating_add((599_056_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_block_number(r: u32, ) -> Weight {
-		(133_961_000 as Weight)
-			// Standard Error: 150_000
-			.saturating_add((262_329_000 as Weight).saturating_mul(r as Weight))
+		(144_566_000 as Weight)
+			// Standard Error: 110_000
+			.saturating_add((257_620_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_now(r: u32, ) -> Weight {
-		(128_662_000 as Weight)
-			// Standard Error: 150_000
-			.saturating_add((263_234_000 as Weight).saturating_mul(r as Weight))
+		(147_274_000 as Weight)
+			// Standard Error: 115_000
+			.saturating_add((258_627_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+	}
+	fn seal_rent_params(r: u32, ) -> Weight {
+		(168_575_000 as Weight)
+			// Standard Error: 394_000
+			.saturating_add((397_754_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(142_580_000 as Weight)
-			// Standard Error: 205_000
-			.saturating_add((505_378_000 as Weight).saturating_mul(r as Weight))
+		(148_102_000 as Weight)
+			// Standard Error: 201_000
+			.saturating_add((537_088_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 	}
 	fn seal_gas(r: u32, ) -> Weight {
-		(116_346_000 as Weight)
-			// Standard Error: 86_000
-			.saturating_add((124_599_000 as Weight).saturating_mul(r as Weight))
+		(125_122_000 as Weight)
+			// Standard Error: 89_000
+			.saturating_add((122_350_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_input(r: u32, ) -> Weight {
-		(124_679_000 as Weight)
-			// Standard Error: 81_000
-			.saturating_add((7_310_000 as Weight).saturating_mul(r as Weight))
+		(137_334_000 as Weight)
+			// Standard Error: 99_000
+			.saturating_add((7_359_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(136_069_000 as Weight)
+		(145_094_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((274_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((283_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_return(r: u32, ) -> Weight {
-		(118_807_000 as Weight)
-			// Standard Error: 66_000
-			.saturating_add((4_740_000 as Weight).saturating_mul(r as Weight))
+		(127_544_000 as Weight)
+			// Standard Error: 138_000
+			.saturating_add((4_640_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(127_702_000 as Weight)
+		(137_517_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((784_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((783_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_terminate(r: u32, ) -> Weight {
-		(124_847_000 as Weight)
-			// Standard Error: 87_000
-			.saturating_add((107_679_000 as Weight).saturating_mul(r as Weight))
+		(138_292_000 as Weight)
+			// Standard Error: 689_000
+			.saturating_add((111_698_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((5 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_terminate_per_code_kb(c: u32, ) -> Weight {
-		(237_115_000 as Weight)
-			// Standard Error: 6_000
-			.saturating_add((8_556_000 as Weight).saturating_mul(c as Weight))
+		(263_507_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((8_409_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}
 	fn seal_restore_to(r: u32, ) -> Weight {
-		(217_959_000 as Weight)
-			// Standard Error: 455_000
-			.saturating_add((134_528_000 as Weight).saturating_mul(r as Weight))
+		(232_291_000 as Weight)
+			// Standard Error: 301_000
+			.saturating_add((136_379_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((4 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((6 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_restore_to_per_code_kb_delta(c: u32, t: u32, d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 151_000
-			.saturating_add((9_061_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 151_000
-			.saturating_add((4_807_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 1_331_000
-			.saturating_add((3_736_196_000 as Weight).saturating_mul(d as Weight))
+			// Standard Error: 162_000
+			.saturating_add((8_619_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 162_000
+			.saturating_add((4_877_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 1_433_000
+			.saturating_add((3_762_810_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(RocksDbWeight::get().reads(8 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(7 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
 	}
 	fn seal_random(r: u32, ) -> Weight {
-		(134_143_000 as Weight)
-			// Standard Error: 233_000
-			.saturating_add((643_555_000 as Weight).saturating_mul(r as Weight))
+		(153_634_000 as Weight)
+			// Standard Error: 267_000
+			.saturating_add((650_160_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 	}
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(142_838_000 as Weight)
-			// Standard Error: 367_000
-			.saturating_add((937_126_000 as Weight).saturating_mul(r as Weight))
+		(137_080_000 as Weight)
+			// Standard Error: 1_009_000
+			.saturating_add((949_228_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_210_711_000 as Weight)
-			// Standard Error: 2_124_000
-			.saturating_add((594_541_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 418_000
-			.saturating_add((251_068_000 as Weight).saturating_mul(n as Weight))
+		(1_259_129_000 as Weight)
+			// Standard Error: 2_542_000
+			.saturating_add((609_859_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 501_000
+			.saturating_add((249_496_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(144_533_000 as Weight)
-			// Standard Error: 220_000
-			.saturating_add((714_590_000 as Weight).saturating_mul(r as Weight))
+		(170_417_000 as Weight)
+			// Standard Error: 434_000
+			.saturating_add((721_511_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(406_366_000 as Weight)
-			// Standard Error: 3_533_000
-			.saturating_add((16_167_082_000 as Weight).saturating_mul(r as Weight))
+		(1_870_542_000 as Weight)
+			// Standard Error: 26_871_000
+			.saturating_add((18_312_239_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(1_739_590_000 as Weight)
-			// Standard Error: 390_000
-			.saturating_add((74_815_000 as Weight).saturating_mul(n as Weight))
+		(1_763_732_000 as Weight)
+			// Standard Error: 258_000
+			.saturating_add((74_848_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn seal_clear_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_284_000
-			.saturating_add((2_281_347_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 2_745_000
+			.saturating_add((2_316_433_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_get_storage(r: u32, ) -> Weight {
-		(81_889_000 as Weight)
-			// Standard Error: 1_171_000
-			.saturating_add((930_704_000 as Weight).saturating_mul(r as Weight))
+		(87_218_000 as Weight)
+			// Standard Error: 745_000
+			.saturating_add((948_121_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(709_323_000 as Weight)
-			// Standard Error: 391_000
-			.saturating_add((155_689_000 as Weight).saturating_mul(n as Weight))
+		(719_050_000 as Weight)
+			// Standard Error: 266_000
+			.saturating_add((154_812_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 	}
 	fn seal_transfer(r: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 1_846_000
-			.saturating_add((5_566_275_000 as Weight).saturating_mul(r as Weight))
+		(19_439_000 as Weight)
+			// Standard Error: 2_468_000
+			.saturating_add((5_674_822_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
@@ -1044,347 +1057,347 @@ impl WeightInfo for () {
 	}
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 4_823_000
-			.saturating_add((10_461_861_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 7_465_000
+			.saturating_add((11_066_530_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((200 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_call_per_code_transfer_input_output_kb(c: u32, t: u32, i: u32, o: u32, ) -> Weight {
-		(9_686_594_000 as Weight)
-			// Standard Error: 473_000
-			.saturating_add((393_132_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 197_094_000
-			.saturating_add((4_957_181_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 62_000
-			.saturating_add((59_974_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 66_000
-			.saturating_add((83_027_000 as Weight).saturating_mul(o as Weight))
+		(9_916_288_000 as Weight)
+			// Standard Error: 552_000
+			.saturating_add((397_842_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 229_902_000
+			.saturating_add((5_243_673_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 72_000
+			.saturating_add((59_737_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 77_000
+			.saturating_add((82_259_000 as Weight).saturating_mul(o as Weight))
 			.saturating_add(RocksDbWeight::get().reads(206 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 34_133_000
-			.saturating_add((21_407_630_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 32_016_000
+			.saturating_add((22_206_489_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((300 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_instantiate_per_code_input_output_salt_kb(c: u32, i: u32, o: u32, s: u32, ) -> Weight {
-		(9_705_322_000 as Weight)
-			// Standard Error: 674_000
-			.saturating_add((879_118_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 95_000
-			.saturating_add((63_025_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 95_000
-			.saturating_add((87_633_000 as Weight).saturating_mul(o as Weight))
-			// Standard Error: 95_000
-			.saturating_add((311_987_000 as Weight).saturating_mul(s as Weight))
+		(9_991_947_000 as Weight)
+			// Standard Error: 637_000
+			.saturating_add((881_981_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 90_000
+			.saturating_add((63_638_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 90_000
+			.saturating_add((87_288_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 90_000
+			.saturating_add((311_808_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(207 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(203 as Weight))
 	}
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(125_486_000 as Weight)
-			// Standard Error: 266_000
-			.saturating_add((240_913_000 as Weight).saturating_mul(r as Weight))
+		(132_452_000 as Weight)
+			// Standard Error: 227_000
+			.saturating_add((239_671_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(636_153_000 as Weight)
-			// Standard Error: 47_000
-			.saturating_add((429_541_000 as Weight).saturating_mul(n as Weight))
+		(756_802_000 as Weight)
+			// Standard Error: 48_000
+			.saturating_add((429_454_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(131_768_000 as Weight)
-			// Standard Error: 176_000
-			.saturating_add((256_946_000 as Weight).saturating_mul(r as Weight))
+		(139_440_000 as Weight)
+			// Standard Error: 128_000
+			.saturating_add((249_514_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(647_777_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((344_145_000 as Weight).saturating_mul(n as Weight))
+		(658_595_000 as Weight)
+			// Standard Error: 35_000
+			.saturating_add((343_814_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(130_042_000 as Weight)
-			// Standard Error: 158_000
-			.saturating_add((225_474_000 as Weight).saturating_mul(r as Weight))
+		(138_124_000 as Weight)
+			// Standard Error: 140_000
+			.saturating_add((223_189_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(638_275_000 as Weight)
-			// Standard Error: 30_000
-			.saturating_add((159_832_000 as Weight).saturating_mul(n as Weight))
+		(689_667_000 as Weight)
+			// Standard Error: 41_000
+			.saturating_add((160_006_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(126_632_000 as Weight)
-			// Standard Error: 143_000
-			.saturating_add((225_612_000 as Weight).saturating_mul(r as Weight))
+		(140_225_000 as Weight)
+			// Standard Error: 156_000
+			.saturating_add((223_696_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(656_936_000 as Weight)
-			// Standard Error: 35_000
-			.saturating_add((159_763_000 as Weight).saturating_mul(n as Weight))
+		(693_756_000 as Weight)
+			// Standard Error: 40_000
+			.saturating_add((159_996_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(25_205_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((3_311_000 as Weight).saturating_mul(r as Weight))
+		(24_250_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((3_134_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(27_394_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((159_123_000 as Weight).saturating_mul(r as Weight))
+		(26_509_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((161_556_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(27_398_000 as Weight)
-			// Standard Error: 57_000
-			.saturating_add((229_775_000 as Weight).saturating_mul(r as Weight))
+		(26_499_000 as Weight)
+			// Standard Error: 59_000
+			.saturating_add((233_755_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(25_212_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((12_291_000 as Weight).saturating_mul(r as Weight))
+		(24_175_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((12_450_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(25_116_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((12_146_000 as Weight).saturating_mul(r as Weight))
+		(24_219_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((12_058_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(25_119_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((6_608_000 as Weight).saturating_mul(r as Weight))
+		(24_146_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((6_017_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(25_146_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((14_017_000 as Weight).saturating_mul(r as Weight))
+		(24_229_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((13_726_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(25_192_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((15_460_000 as Weight).saturating_mul(r as Weight))
+		(24_219_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((15_115_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(37_079_000 as Weight)
+		(34_981_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((160_000 as Weight).saturating_mul(e as Weight))
+			.saturating_add((156_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(25_599_000 as Weight)
-			// Standard Error: 201_000
-			.saturating_add((99_705_000 as Weight).saturating_mul(r as Weight))
+		(24_599_000 as Weight)
+			// Standard Error: 102_000
+			.saturating_add((95_771_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(33_236_000 as Weight)
-			// Standard Error: 368_000
-			.saturating_add((199_753_000 as Weight).saturating_mul(r as Weight))
+		(32_584_000 as Weight)
+			// Standard Error: 176_000
+			.saturating_add((193_216_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(247_488_000 as Weight)
+		(240_739_000 as Weight)
 			// Standard Error: 6_000
-			.saturating_add((3_374_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((3_407_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(44_133_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((3_235_000 as Weight).saturating_mul(r as Weight))
+		(41_963_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((3_110_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(44_107_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((3_486_000 as Weight).saturating_mul(r as Weight))
+		(41_956_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((3_460_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(44_116_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((4_757_000 as Weight).saturating_mul(r as Weight))
+		(42_002_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((4_591_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(28_712_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((7_659_000 as Weight).saturating_mul(r as Weight))
+		(27_646_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((7_821_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(28_624_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((11_841_000 as Weight).saturating_mul(r as Weight))
+		(27_615_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((11_807_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(27_445_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((3_487_000 as Weight).saturating_mul(r as Weight))
+		(27_106_000 as Weight)
+			// Standard Error: 78_000
+			.saturating_add((2_952_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(26_016_000 as Weight)
-			// Standard Error: 4_230_000
-			.saturating_add((2_300_044_000 as Weight).saturating_mul(r as Weight))
+		(24_956_000 as Weight)
+			// Standard Error: 3_541_000
+			.saturating_add((2_332_414_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(25_227_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((5_341_000 as Weight).saturating_mul(r as Weight))
+		(24_183_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((5_166_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(25_163_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((5_355_000 as Weight).saturating_mul(r as Weight))
+		(24_142_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((5_146_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(25_204_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((5_930_000 as Weight).saturating_mul(r as Weight))
+		(24_161_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((5_807_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(25_177_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((5_457_000 as Weight).saturating_mul(r as Weight))
+		(24_167_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((5_288_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(25_206_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((5_229_000 as Weight).saturating_mul(r as Weight))
+		(24_252_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((5_091_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(25_165_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((5_301_000 as Weight).saturating_mul(r as Weight))
+		(24_243_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((5_076_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(25_184_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((5_356_000 as Weight).saturating_mul(r as Weight))
+		(24_227_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((5_135_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(25_195_000 as Weight)
-			// Standard Error: 48_000
-			.saturating_add((7_406_000 as Weight).saturating_mul(r as Weight))
+		(24_278_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((7_124_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(25_192_000 as Weight)
+		(24_254_000 as Weight)
 			// Standard Error: 19_000
-			.saturating_add((7_303_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((7_067_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(25_165_000 as Weight)
-			// Standard Error: 34_000
-			.saturating_add((7_247_000 as Weight).saturating_mul(r as Weight))
+		(24_220_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((7_122_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(25_152_000 as Weight)
-			// Standard Error: 46_000
-			.saturating_add((7_464_000 as Weight).saturating_mul(r as Weight))
+		(24_221_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((7_221_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(25_140_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((7_308_000 as Weight).saturating_mul(r as Weight))
+		(24_259_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((7_135_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(25_723_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((6_846_000 as Weight).saturating_mul(r as Weight))
+		(24_245_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((7_193_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(25_201_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((7_226_000 as Weight).saturating_mul(r as Weight))
+		(24_289_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((7_023_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(25_192_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((7_143_000 as Weight).saturating_mul(r as Weight))
+		(24_239_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((7_065_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(25_146_000 as Weight)
-			// Standard Error: 37_000
-			.saturating_add((7_451_000 as Weight).saturating_mul(r as Weight))
+		(24_256_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((7_119_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(25_193_000 as Weight)
-			// Standard Error: 30_000
-			.saturating_add((7_391_000 as Weight).saturating_mul(r as Weight))
+		(24_240_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_225_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(25_192_000 as Weight)
-			// Standard Error: 30_000
-			.saturating_add((7_214_000 as Weight).saturating_mul(r as Weight))
+		(24_266_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((6_996_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(25_221_000 as Weight)
-			// Standard Error: 34_000
-			.saturating_add((7_168_000 as Weight).saturating_mul(r as Weight))
+		(24_265_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((6_974_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(25_221_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((7_200_000 as Weight).saturating_mul(r as Weight))
+		(24_232_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((7_103_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(25_229_000 as Weight)
-			// Standard Error: 32_000
-			.saturating_add((13_066_000 as Weight).saturating_mul(r as Weight))
+		(24_245_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((12_915_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(25_210_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((12_314_000 as Weight).saturating_mul(r as Weight))
+		(24_177_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((12_232_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(25_186_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((13_055_000 as Weight).saturating_mul(r as Weight))
+		(24_171_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((12_939_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(25_162_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((12_327_000 as Weight).saturating_mul(r as Weight))
+		(24_788_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((11_657_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(25_191_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((7_153_000 as Weight).saturating_mul(r as Weight))
+		(24_252_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((7_003_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(25_184_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((7_120_000 as Weight).saturating_mul(r as Weight))
+		(24_263_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((7_005_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(25_129_000 as Weight)
-			// Standard Error: 31_000
-			.saturating_add((7_247_000 as Weight).saturating_mul(r as Weight))
+		(24_239_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((7_020_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(25_156_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((7_333_000 as Weight).saturating_mul(r as Weight))
+		(24_212_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((7_172_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(25_159_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((7_415_000 as Weight).saturating_mul(r as Weight))
+		(24_220_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((7_246_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(25_181_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((7_265_000 as Weight).saturating_mul(r as Weight))
+		(24_213_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((7_191_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(25_165_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((7_443_000 as Weight).saturating_mul(r as Weight))
+		(24_221_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_192_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(25_103_000 as Weight)
-			// Standard Error: 44_000
-			.saturating_add((7_463_000 as Weight).saturating_mul(r as Weight))
+		(24_235_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((7_106_000 as Weight).saturating_mul(r as Weight))
 	}
 }

From da7ca4db778fc91323a8a0143e5ca013fe0ce4c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Fri, 12 Mar 2021 11:50:07 +0000
Subject: [PATCH 0495/1194] im-online: use EstimateNextSessionRotation to get
 better estimates of session progress (#8242)

* frame-support: add method to estimate current session progress

* im-online: use EstimateNextSessionRotation trait to delay heartbeats

* node: fix im-online pallet instantiation

* frame-support: fix docs

* frame: fix tests

* pallet-session: last block of periodic session means 100% session progress

* pallet-session: add test for periodic session progress

* pallet-babe: fix epoch progress and add test

* frame-support: return weight with session estimates

* pallet-im-online: add test for session progress logic
---
 bin/node/runtime/src/lib.rs             |   3 +-
 frame/babe/src/lib.rs                   |  25 ++++--
 frame/babe/src/mock.rs                  |  10 +--
 frame/babe/src/tests.rs                 |  36 +++++++-
 frame/im-online/src/lib.rs              | 115 ++++++++++++++----------
 frame/im-online/src/mock.rs             |  57 ++++++++++--
 frame/im-online/src/tests.rs            |  83 +++++++++++++++++
 frame/offences/benchmarking/src/mock.rs |   2 +-
 frame/session/src/lib.rs                |  81 +++++++++++------
 frame/session/src/tests.rs              |  54 +++++++++--
 frame/staking/src/lib.rs                |   8 +-
 frame/support/src/traits.rs             |  69 +++++++-------
 12 files changed, 402 insertions(+), 141 deletions(-)

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 2043f59eb99a..bb372f31c73b 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -813,7 +813,6 @@ impl pallet_sudo::Config for Runtime {
 }
 
 parameter_types! {
-	pub const SessionDuration: BlockNumber = EPOCH_DURATION_IN_SLOTS as _;
 	pub const ImOnlineUnsignedPriority: TransactionPriority = TransactionPriority::max_value();
 	/// We prioritize im-online heartbeats over election solution submission.
 	pub const StakingUnsignedPriority: TransactionPriority = TransactionPriority::max_value() / 2;
@@ -880,8 +879,8 @@ impl<C> frame_system::offchain::SendTransactionTypes<C> for Runtime where
 impl pallet_im_online::Config for Runtime {
 	type AuthorityId = ImOnlineId;
 	type Event = Event;
+	type NextSessionRotation = Babe;
 	type ValidatorSet = Historical;
-	type SessionDuration = SessionDuration;
 	type ReportUnresponsiveness = Offences;
 	type UnsignedPriority = ImOnlineUnsignedPriority;
 	type WeightInfo = pallet_im_online::weights::SubstrateWeight<Runtime>;
diff --git a/frame/babe/src/lib.rs b/frame/babe/src/lib.rs
index 75bdba78a97e..00bfa4f2656c 100644
--- a/frame/babe/src/lib.rs
+++ b/frame/babe/src/lib.rs
@@ -34,7 +34,7 @@ use sp_application_crypto::Public;
 use sp_runtime::{
 	generic::DigestItem,
 	traits::{IsMember, One, SaturatedConversion, Saturating, Zero},
-	ConsensusEngineId, KeyTypeId,
+	ConsensusEngineId, KeyTypeId, Percent,
 };
 use sp_session::{GetSessionNumber, GetValidatorCount};
 use sp_std::prelude::*;
@@ -780,14 +780,25 @@ impl<T: Config> frame_support::traits::EstimateNextSessionRotation<T::BlockNumbe
 		T::EpochDuration::get().saturated_into()
 	}
 
-	fn estimate_next_session_rotation(now: T::BlockNumber) -> Option<T::BlockNumber> {
-		Self::next_expected_epoch_change(now)
+	fn estimate_current_session_progress(_now: T::BlockNumber) -> (Option<Percent>, Weight) {
+		let elapsed = CurrentSlot::get().saturating_sub(Self::current_epoch_start()) + 1;
+
+		(
+			Some(Percent::from_rational_approximation(
+				*elapsed,
+				T::EpochDuration::get(),
+			)),
+			// Read: Current Slot, Epoch Index, Genesis Slot
+			T::DbWeight::get().reads(3),
+		)
 	}
 
-	// The validity of this weight depends on the implementation of `estimate_next_session_rotation`
-	fn weight(_now: T::BlockNumber) -> Weight {
-		// Read: Current Slot, Epoch Index, Genesis Slot
-		T::DbWeight::get().reads(3)
+	fn estimate_next_session_rotation(now: T::BlockNumber) -> (Option<T::BlockNumber>, Weight) {
+		(
+			Self::next_expected_epoch_change(now),
+			// Read: Current Slot, Epoch Index, Genesis Slot
+			T::DbWeight::get().reads(3),
+		)
 	}
 }
 
diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index 412f13f6a2df..c46b55c2c4ac 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -260,7 +260,7 @@ impl Config for Test {
 pub fn go_to_block(n: u64, s: u64) {
 	use frame_support::traits::OnFinalize;
 
-	System::on_finalize(System::block_number());
+	Babe::on_finalize(System::block_number());
 	Session::on_finalize(System::block_number());
 	Staking::on_finalize(System::block_number());
 
@@ -274,14 +274,8 @@ pub fn go_to_block(n: u64, s: u64) {
 	let pre_digest = make_secondary_plain_pre_digest(0, s.into());
 
 	System::initialize(&n, &parent_hash, &pre_digest, InitKind::Full);
-	System::set_block_number(n);
-	Timestamp::set_timestamp(n);
 
-	if s > 1 {
-		CurrentSlot::put(Slot::from(s));
-	}
-
-	System::on_initialize(n);
+	Babe::on_initialize(n);
 	Session::on_initialize(n);
 	Staking::on_initialize(n);
 }
diff --git a/frame/babe/src/tests.rs b/frame/babe/src/tests.rs
index 82a7782448d6..0ccc3db4df0b 100644
--- a/frame/babe/src/tests.rs
+++ b/frame/babe/src/tests.rs
@@ -20,12 +20,12 @@
 use super::{Call, *};
 use frame_support::{
 	assert_err, assert_ok,
-	traits::{Currency, OnFinalize},
+	traits::{Currency, EstimateNextSessionRotation, OnFinalize},
 	weights::{GetDispatchInfo, Pays},
 };
 use mock::*;
 use pallet_session::ShouldEndSession;
-use sp_consensus_babe::{AllowedSlots, Slot, BabeEpochConfiguration};
+use sp_consensus_babe::{AllowedSlots, BabeEpochConfiguration, Slot};
 use sp_core::crypto::Pair;
 
 const EMPTY_RANDOMNESS: [u8; 32] = [
@@ -220,6 +220,38 @@ fn can_predict_next_epoch_change() {
 	})
 }
 
+#[test]
+fn can_estimate_current_epoch_progress() {
+	new_test_ext(1).execute_with(|| {
+		assert_eq!(<Test as Config>::EpochDuration::get(), 3);
+
+		// with BABE the genesis block is not part of any epoch, the first epoch starts at block #1,
+		// therefore its last block should be #3
+		for i in 1u64..4 {
+			progress_to_block(i);
+
+			assert_eq!(Babe::estimate_next_session_rotation(i).0.unwrap(), 4);
+
+			// the last block of the epoch must have 100% progress.
+			if Babe::estimate_next_session_rotation(i).0.unwrap() - 1 == i {
+				assert_eq!(
+					Babe::estimate_current_session_progress(i).0.unwrap(),
+					Percent::from_percent(100)
+				);
+			} else {
+				assert!(Babe::estimate_current_session_progress(i).0.unwrap() < Percent::from_percent(100));
+			}
+		}
+
+		// the first block of the new epoch counts towards the epoch progress as well
+		progress_to_block(4);
+		assert_eq!(
+			Babe::estimate_current_session_progress(4).0.unwrap(),
+			Percent::from_percent(33),
+		);
+	})
+}
+
 #[test]
 fn can_enact_next_config() {
 	new_test_ext(1).execute_with(|| {
diff --git a/frame/im-online/src/lib.rs b/frame/im-online/src/lib.rs
index f0df19d6ab9f..e00b5aa9d139 100644
--- a/frame/im-online/src/lib.rs
+++ b/frame/im-online/src/lib.rs
@@ -81,20 +81,24 @@ use sp_std::prelude::*;
 use sp_std::convert::TryInto;
 use sp_runtime::{
 	offchain::storage::StorageValueRef,
-	RuntimeDebug,
-	traits::{Convert, Member, Saturating, AtLeast32BitUnsigned}, Perbill,
+	traits::{AtLeast32BitUnsigned, Convert, Member, Saturating},
 	transaction_validity::{
-		TransactionValidity, ValidTransaction, InvalidTransaction, TransactionSource,
-		TransactionPriority,
+		InvalidTransaction, TransactionPriority, TransactionSource, TransactionValidity,
+		ValidTransaction,
 	},
+	Perbill, Percent, RuntimeDebug,
 };
 use sp_staking::{
 	SessionIndex,
 	offence::{ReportOffence, Offence, Kind},
 };
 use frame_support::{
-	decl_module, decl_event, decl_storage, Parameter, decl_error,
-	traits::{Get, ValidatorSet, ValidatorSetWithIdentification, OneSessionHandler},
+	decl_error, decl_event, decl_module, decl_storage,
+	traits::{
+		EstimateNextSessionRotation, Get, OneSessionHandler, ValidatorSet,
+		ValidatorSetWithIdentification,
+	},
+	Parameter,
 };
 use frame_system::ensure_none;
 use frame_system::offchain::{
@@ -181,7 +185,7 @@ impl<BlockNumber: PartialEq + AtLeast32BitUnsigned + Copy> HeartbeatStatus<Block
 /// Error which may occur while executing the off-chain code.
 #[cfg_attr(test, derive(PartialEq))]
 enum OffchainErr<BlockNumber> {
-	TooEarly(BlockNumber),
+	TooEarly,
 	WaitingForInclusion(BlockNumber),
 	AlreadyOnline(u32),
 	FailedSigning,
@@ -193,8 +197,8 @@ enum OffchainErr<BlockNumber> {
 impl<BlockNumber: sp_std::fmt::Debug> sp_std::fmt::Debug for OffchainErr<BlockNumber> {
 	fn fmt(&self, fmt: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
 		match *self {
-			OffchainErr::TooEarly(ref block) =>
-				write!(fmt, "Too early to send heartbeat, next expected at {:?}", block),
+			OffchainErr::TooEarly =>
+				write!(fmt, "Too early to send heartbeat."),
 			OffchainErr::WaitingForInclusion(ref block) =>
 				write!(fmt, "Heartbeat already sent at {:?}. Waiting for inclusion.", block),
 			OffchainErr::AlreadyOnline(auth_idx) =>
@@ -245,24 +249,24 @@ pub trait Config: SendTransactionTypes<Call<Self>> + frame_system::Config {
 	/// The overarching event type.
 	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
-	/// An expected duration of the session.
-	///
-	/// This parameter is used to determine the longevity of `heartbeat` transaction
-	/// and a rough time when we should start considering sending heartbeats,
-	/// since the workers avoids sending them at the very beginning of the session, assuming
-	/// there is a chance the authority will produce a block and they won't be necessary.
-	type SessionDuration: Get<Self::BlockNumber>;
-
 	/// A type for retrieving the validators supposed to be online in a session.
 	type ValidatorSet: ValidatorSetWithIdentification<Self::AccountId>;
 
+	/// A trait that allows us to estimate the current session progress and also the
+	/// average session length.
+	///
+	/// This parameter is used to determine the longevity of `heartbeat` transaction and a
+	/// rough time when we should start considering sending heartbeats, since the workers
+	/// avoids sending them at the very beginning of the session, assuming there is a
+	/// chance the authority will produce a block and they won't be necessary.
+	type NextSessionRotation: EstimateNextSessionRotation<Self::BlockNumber>;
+
 	/// A type that gives us the ability to submit unresponsiveness offence reports.
-	type ReportUnresponsiveness:
-		ReportOffence<
-			Self::AccountId,
-			IdentificationTuple<Self>,
-			UnresponsivenessOffence<IdentificationTuple<Self>>,
-		>;
+	type ReportUnresponsiveness: ReportOffence<
+		Self::AccountId,
+		IdentificationTuple<Self>,
+		UnresponsivenessOffence<IdentificationTuple<Self>>,
+	>;
 
 	/// A configuration for base priority of unsigned transactions.
 	///
@@ -290,12 +294,17 @@ decl_event!(
 
 decl_storage! {
 	trait Store for Module<T: Config> as ImOnline {
-		/// The block number after which it's ok to send heartbeats in current session.
+		/// The block number after which it's ok to send heartbeats in the current
+		/// session.
+		///
+		/// At the beginning of each session we set this to a value that should fall
+		/// roughly in the middle of the session duration. The idea is to first wait for
+		/// the validators to produce a block in the current session, so that the
+		/// heartbeat later on will not be necessary.
 		///
-		/// At the beginning of each session we set this to a value that should
-		/// fall roughly in the middle of the session duration.
-		/// The idea is to first wait for the validators to produce a block
-		/// in the current session, so that the heartbeat later on will not be necessary.
+		/// This value will only be used as a fallback if we fail to get a proper session
+		/// progress estimate from `NextSessionRotation`, as those estimates should be
+		/// more accurate then the value we calculate for `HeartbeatAfter`.
 		HeartbeatAfter get(fn heartbeat_after): T::BlockNumber;
 
 		/// The current set of keys that may issue a heartbeat.
@@ -469,19 +478,34 @@ impl<T: Config> Module<T> {
 		);
 	}
 
-	pub(crate) fn send_heartbeats(block_number: T::BlockNumber)
-		-> OffchainResult<T, impl Iterator<Item=OffchainResult<T, ()>>>
-	{
-		let heartbeat_after = <HeartbeatAfter<T>>::get();
-		if block_number < heartbeat_after {
-			return Err(OffchainErr::TooEarly(heartbeat_after))
+	pub(crate) fn send_heartbeats(
+		block_number: T::BlockNumber,
+	) -> OffchainResult<T, impl Iterator<Item = OffchainResult<T, ()>>> {
+		const HALF_SESSION: Percent = Percent::from_percent(50);
+
+		let too_early = if let (Some(progress), _) =
+			T::NextSessionRotation::estimate_current_session_progress(block_number)
+		{
+			// we try to get an estimate of the current session progress first since it
+			// should provide more accurate results and send the heartbeat if we're halfway
+			// through the session.
+			progress < HALF_SESSION
+		} else {
+			// otherwise we fallback to using the block number calculated at the beginning
+			// of the session that should roughly correspond to the middle of the session
+			let heartbeat_after = <HeartbeatAfter<T>>::get();
+			block_number < heartbeat_after
+		};
+
+		if too_early {
+			return Err(OffchainErr::TooEarly);
 		}
 
 		let session_index = T::ValidatorSet::session_index();
 		let validators_len = Keys::<T>::decode_len().unwrap_or_default() as u32;
 
-		Ok(Self::local_authority_keys()
-			.map(move |(authority_index, key)|
+		Ok(
+			Self::local_authority_keys().map(move |(authority_index, key)| {
 				Self::send_single_heartbeat(
 					authority_index,
 					key,
@@ -489,7 +513,8 @@ impl<T: Config> Module<T> {
 					block_number,
 					validators_len,
 				)
-			))
+			}),
+		)
 	}
 
 
@@ -648,7 +673,7 @@ impl<T: Config> OneSessionHandler<T::AccountId> for Module<T> {
 		// Since we consider producing blocks as being online,
 		// the heartbeat is deferred a bit to prevent spamming.
 		let block_number = <frame_system::Module<T>>::block_number();
-		let half_session = T::SessionDuration::get() / 2u32.into();
+		let half_session = T::NextSessionRotation::average_session_length() / 2u32.into();
 		<HeartbeatAfter<T>>::put(block_number + half_session);
 
 		// Remember who the authorities are for the new session.
@@ -699,10 +724,7 @@ const INVALID_VALIDATORS_LEN: u8 = 10;
 impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
 	type Call = Call<T>;
 
-	fn validate_unsigned(
-		_source: TransactionSource,
-		call: &Self::Call,
-	) -> TransactionValidity {
+	fn validate_unsigned(_source: TransactionSource, call: &Self::Call) -> TransactionValidity {
 		if let Call::heartbeat(heartbeat, signature) = call {
 			if <Module<T>>::is_online(heartbeat.authority_index) {
 				// we already received a heartbeat for this authority
@@ -737,9 +759,12 @@ impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
 			ValidTransaction::with_tag_prefix("ImOnline")
 				.priority(T::UnsignedPriority::get())
 				.and_provides((current_session, authority_id))
-				.longevity(TryInto::<u64>::try_into(
-					T::SessionDuration::get() / 2u32.into()
-				).unwrap_or(64_u64))
+				.longevity(
+					TryInto::<u64>::try_into(
+						T::NextSessionRotation::average_session_length() / 2u32.into(),
+					)
+					.unwrap_or(64_u64),
+				)
 				.propagate(true)
 				.build()
 		} else {
diff --git a/frame/im-online/src/mock.rs b/frame/im-online/src/mock.rs
index 1b80f5b12ded..f8346aa53624 100644
--- a/frame/im-online/src/mock.rs
+++ b/frame/im-online/src/mock.rs
@@ -21,15 +21,19 @@
 
 use std::cell::RefCell;
 
-use crate::Config;
-use sp_runtime::Perbill;
-use sp_staking::{SessionIndex, offence::{ReportOffence, OffenceError}};
-use sp_runtime::testing::{Header, UintAuthorityId, TestXt};
-use sp_runtime::traits::{IdentityLookup, BlakeTwo256, ConvertInto};
+use frame_support::{parameter_types, weights::Weight};
+use pallet_session::historical as pallet_session_historical;
 use sp_core::H256;
-use frame_support::parameter_types;
+use sp_runtime::testing::{Header, TestXt, UintAuthorityId};
+use sp_runtime::traits::{BlakeTwo256, ConvertInto, IdentityLookup};
+use sp_runtime::{Perbill, Percent};
+use sp_staking::{
+	offence::{OffenceError, ReportOffence},
+	SessionIndex,
+};
+
 use crate as imonline;
-use pallet_session::historical as pallet_session_historical;
+use crate::Config;
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
@@ -176,6 +180,41 @@ impl pallet_authorship::Config for Runtime {
 	type EventHandler = ImOnline;
 }
 
+thread_local! {
+	pub static MOCK_CURRENT_SESSION_PROGRESS: RefCell<Option<Option<Percent>>> = RefCell::new(None);
+}
+
+thread_local! {
+	pub static MOCK_AVERAGE_SESSION_LENGTH: RefCell<Option<u64>> = RefCell::new(None);
+}
+
+pub struct TestNextSessionRotation;
+
+impl frame_support::traits::EstimateNextSessionRotation<u64> for TestNextSessionRotation {
+	fn average_session_length() -> u64 {
+		// take the mock result if any and return it
+		let mock = MOCK_AVERAGE_SESSION_LENGTH.with(|p| p.borrow_mut().take());
+
+		mock.unwrap_or(pallet_session::PeriodicSessions::<Period, Offset>::average_session_length())
+	}
+
+	fn estimate_current_session_progress(now: u64) -> (Option<Percent>, Weight) {
+		let (estimate, weight) =
+			pallet_session::PeriodicSessions::<Period, Offset>::estimate_current_session_progress(
+				now,
+			);
+
+		// take the mock result if any and return it
+		let mock = MOCK_CURRENT_SESSION_PROGRESS.with(|p| p.borrow_mut().take());
+
+		(mock.unwrap_or(estimate), weight)
+	}
+
+	fn estimate_next_session_rotation(now: u64) -> (Option<u64>, Weight) {
+		pallet_session::PeriodicSessions::<Period, Offset>::estimate_next_session_rotation(now)
+	}
+}
+
 parameter_types! {
 	pub const UnsignedPriority: u64 = 1 << 20;
 }
@@ -183,9 +222,9 @@ parameter_types! {
 impl Config for Runtime {
 	type AuthorityId = UintAuthorityId;
 	type Event = Event;
-	type ReportUnresponsiveness = OffenceHandler;
 	type ValidatorSet = Historical;
-	type SessionDuration = Period;
+	type NextSessionRotation = TestNextSessionRotation;
+	type ReportUnresponsiveness = OffenceHandler;
 	type UnsignedPriority = UnsignedPriority;
 	type WeightInfo = ();
 }
diff --git a/frame/im-online/src/tests.rs b/frame/im-online/src/tests.rs
index 919b639dd612..f447a2ade548 100644
--- a/frame/im-online/src/tests.rs
+++ b/frame/im-online/src/tests.rs
@@ -357,3 +357,86 @@ fn should_not_send_a_report_if_already_online() {
 		});
 	});
 }
+
+#[test]
+fn should_handle_missing_progress_estimates() {
+	use frame_support::traits::OffchainWorker;
+
+	let mut ext = new_test_ext();
+	let (offchain, _state) = TestOffchainExt::new();
+	let (pool, state) = TestTransactionPoolExt::new();
+	ext.register_extension(OffchainDbExt::new(offchain.clone()));
+	ext.register_extension(OffchainWorkerExt::new(offchain));
+	ext.register_extension(TransactionPoolExt::new(pool));
+
+	ext.execute_with(|| {
+		let block = 1;
+
+		System::set_block_number(block);
+		UintAuthorityId::set_all_keys(vec![0, 1, 2]);
+
+		// buffer new validators
+		Session::rotate_session();
+
+		// enact the change and buffer another one
+		VALIDATORS.with(|l| *l.borrow_mut() = Some(vec![0, 1, 2]));
+		Session::rotate_session();
+
+		// we will return `None` on the next call to `estimate_current_session_progress`
+		// and the offchain worker should fallback to checking `HeartbeatAfter`
+		MOCK_CURRENT_SESSION_PROGRESS.with(|p| *p.borrow_mut() = Some(None));
+		ImOnline::offchain_worker(block);
+
+		assert_eq!(state.read().transactions.len(), 3);
+	});
+}
+
+#[test]
+fn should_handle_non_linear_session_progress() {
+	// NOTE: this is the reason why we started using `EstimateNextSessionRotation` to figure out if
+	// we should send a heartbeat, it's possible that between successive blocks we progress through
+	// the session more than just one block increment (in BABE session length is defined in slots,
+	// not block numbers).
+
+	let mut ext = new_test_ext();
+	let (offchain, _state) = TestOffchainExt::new();
+	let (pool, _) = TestTransactionPoolExt::new();
+	ext.register_extension(OffchainDbExt::new(offchain.clone()));
+	ext.register_extension(OffchainWorkerExt::new(offchain));
+	ext.register_extension(TransactionPoolExt::new(pool));
+
+	ext.execute_with(|| {
+		UintAuthorityId::set_all_keys(vec![0, 1, 2]);
+
+		// buffer new validator
+		Session::rotate_session();
+
+		// mock the session length as being 10 blocks long,
+		// enact the change and buffer another one
+		VALIDATORS.with(|l| *l.borrow_mut() = Some(vec![0, 1, 2]));
+
+		// mock the session length has being 10 which should make us assume the fallback for half
+		// session will be reached by block 5.
+		MOCK_AVERAGE_SESSION_LENGTH.with(|p| *p.borrow_mut() = Some(10));
+
+		Session::rotate_session();
+
+		// if we don't have valid results for the current session progres then
+		// we'll fallback to `HeartbeatAfter` and only heartbeat on block 5.
+		MOCK_CURRENT_SESSION_PROGRESS.with(|p| *p.borrow_mut() = Some(None));
+		assert_eq!(
+			ImOnline::send_heartbeats(2).err(),
+			Some(OffchainErr::TooEarly),
+		);
+
+		MOCK_CURRENT_SESSION_PROGRESS.with(|p| *p.borrow_mut() = Some(None));
+		assert!(ImOnline::send_heartbeats(5).ok().is_some());
+
+		// if we have a valid current session progress then we'll heartbeat as soon
+		// as we're past 50% of the session regardless of the block number
+		MOCK_CURRENT_SESSION_PROGRESS
+			.with(|p| *p.borrow_mut() = Some(Some(Percent::from_percent(51))));
+
+		assert!(ImOnline::send_heartbeats(2).ok().is_some());
+	});
+}
diff --git a/frame/offences/benchmarking/src/mock.rs b/frame/offences/benchmarking/src/mock.rs
index 124e6b13b77a..54d649381eea 100644
--- a/frame/offences/benchmarking/src/mock.rs
+++ b/frame/offences/benchmarking/src/mock.rs
@@ -186,7 +186,7 @@ impl pallet_im_online::Config for Test {
 	type AuthorityId = UintAuthorityId;
 	type Event = Event;
 	type ValidatorSet = Historical;
-	type SessionDuration = Period;
+	type NextSessionRotation = pallet_session::PeriodicSessions<Period, Offset>;
 	type ReportUnresponsiveness = Offences;
 	type UnsignedPriority = ();
 	type WeightInfo = ();
diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs
index d95d99389f73..45f3ae9dfce4 100644
--- a/frame/session/src/lib.rs
+++ b/frame/session/src/lib.rs
@@ -116,8 +116,10 @@ pub mod weights;
 
 use sp_std::{prelude::*, marker::PhantomData, ops::{Sub, Rem}};
 use codec::Decode;
-use sp_runtime::{KeyTypeId, Perbill, RuntimeAppPublic};
-use sp_runtime::traits::{Convert, Zero, Member, OpaqueKeys, Saturating};
+use sp_runtime::{
+	traits::{AtLeast32BitUnsigned, Convert, Member, One, OpaqueKeys, Zero},
+	KeyTypeId, Perbill, Percent, RuntimeAppPublic,
+};
 use sp_staking::SessionIndex;
 use frame_support::{
 	ensure, decl_module, decl_event, decl_storage, decl_error, ConsensusEngineId, Parameter,
@@ -142,16 +144,14 @@ pub trait ShouldEndSession<BlockNumber> {
 /// The first session will have length of `Offset`, and
 /// the following sessions will have length of `Period`.
 /// This may prove nonsensical if `Offset` >= `Period`.
-pub struct PeriodicSessions<
-	Period,
-	Offset,
->(PhantomData<(Period, Offset)>);
+pub struct PeriodicSessions<Period, Offset>(PhantomData<(Period, Offset)>);
 
 impl<
-	BlockNumber: Rem<Output=BlockNumber> + Sub<Output=BlockNumber> + Zero + PartialOrd,
+	BlockNumber: Rem<Output = BlockNumber> + Sub<Output = BlockNumber> + Zero + PartialOrd,
 	Period: Get<BlockNumber>,
 	Offset: Get<BlockNumber>,
-> ShouldEndSession<BlockNumber> for PeriodicSessions<Period, Offset> {
+> ShouldEndSession<BlockNumber> for PeriodicSessions<Period, Offset>
+{
 	fn should_end_session(now: BlockNumber) -> bool {
 		let offset = Offset::get();
 		now >= offset && ((now - offset) % Period::get()).is_zero()
@@ -159,14 +159,47 @@ impl<
 }
 
 impl<
-	BlockNumber: Rem<Output=BlockNumber> + Sub<Output=BlockNumber> + Zero + PartialOrd + Saturating + Clone,
+	BlockNumber: AtLeast32BitUnsigned + Clone,
 	Period: Get<BlockNumber>,
-	Offset: Get<BlockNumber>,
-> EstimateNextSessionRotation<BlockNumber> for PeriodicSessions<Period, Offset> {
-	fn estimate_next_session_rotation(now: BlockNumber) -> Option<BlockNumber> {
+	Offset: Get<BlockNumber>
+> EstimateNextSessionRotation<BlockNumber> for PeriodicSessions<Period, Offset>
+{
+	fn average_session_length() -> BlockNumber {
+		Period::get()
+	}
+
+	fn estimate_current_session_progress(now: BlockNumber) -> (Option<Percent>, Weight) {
+		let offset = Offset::get();
+		let period = Period::get();
+
+		// NOTE: we add one since we assume that the current block has already elapsed,
+		// i.e. when evaluating the last block in the session the progress should be 100%
+		// (0% is never returned).
+		let progress = if now >= offset {
+			let current = (now - offset) % period.clone() + One::one();
+			Some(Percent::from_rational_approximation(
+				current.clone(),
+				period.clone(),
+			))
+		} else {
+			Some(Percent::from_rational_approximation(
+				now + One::one(),
+				offset,
+			))
+		};
+
+		// Weight note: `estimate_current_session_progress` has no storage reads and trivial
+		// computational overhead. There should be no risk to the chain having this weight value be
+		// zero for now. However, this value of zero was not properly calculated, and so it would be
+		// reasonable to come back here and properly calculate the weight of this function.
+		(progress, Zero::zero())
+	}
+
+	fn estimate_next_session_rotation(now: BlockNumber) -> (Option<BlockNumber>, Weight) {
 		let offset = Offset::get();
 		let period = Period::get();
-		Some(if now > offset {
+
+		let next_session = if now > offset {
 			let block_after_last_session = (now.clone() - offset) % period.clone();
 			if block_after_last_session > Zero::zero() {
 				now.saturating_add(period.saturating_sub(block_after_last_session))
@@ -179,19 +212,13 @@ impl<
 			}
 		} else {
 			offset
-		})
-	}
+		};
 
-	fn weight(_now: BlockNumber) -> Weight {
 		// Weight note: `estimate_next_session_rotation` has no storage reads and trivial
 		// computational overhead. There should be no risk to the chain having this weight value be
 		// zero for now. However, this value of zero was not properly calculated, and so it would be
 		// reasonable to come back here and properly calculate the weight of this function.
-		0
-	}
-
-	fn average_session_length() -> BlockNumber {
-		Period::get()
+		(Some(next_session), Zero::zero())
 	}
 }
 
@@ -833,17 +860,13 @@ impl<T: Config, Inner: FindAuthor<u32>> FindAuthor<T::ValidatorId>
 }
 
 impl<T: Config> EstimateNextNewSession<T::BlockNumber> for Module<T> {
-	/// This session module always calls new_session and next_session at the same time, hence we
-	/// do a simple proxy and pass the function to next rotation.
-	fn estimate_next_new_session(now: T::BlockNumber) -> Option<T::BlockNumber> {
-		T::NextSessionRotation::estimate_next_session_rotation(now)
-	}
-
 	fn average_session_length() -> T::BlockNumber {
 		T::NextSessionRotation::average_session_length()
 	}
 
-	fn weight(now: T::BlockNumber) -> Weight {
-		T::NextSessionRotation::weight(now)
+	/// This session module always calls new_session and next_session at the same time, hence we
+	/// do a simple proxy and pass the function to next rotation.
+	fn estimate_next_new_session(now: T::BlockNumber) -> (Option<T::BlockNumber>, Weight) {
+		T::NextSessionRotation::estimate_next_session_rotation(now)
 	}
 }
diff --git a/frame/session/src/tests.rs b/frame/session/src/tests.rs
index b2e086aed90c..a528b3293dac 100644
--- a/frame/session/src/tests.rs
+++ b/frame/session/src/tests.rs
@@ -253,7 +253,6 @@ fn session_changed_flag_works() {
 
 #[test]
 fn periodic_session_works() {
-
 	frame_support::parameter_types! {
 		const Period: u64 = 10;
 		const Offset: u64 = 3;
@@ -261,24 +260,67 @@ fn periodic_session_works() {
 
 	type P = PeriodicSessions<Period, Offset>;
 
+	// make sure that offset phase behaves correctly
 	for i in 0u64..3 {
 		assert!(!P::should_end_session(i));
-		assert_eq!(P::estimate_next_session_rotation(i).unwrap(), 3);
+		assert_eq!(P::estimate_next_session_rotation(i).0.unwrap(), 3);
+
+		// the last block of the session (i.e. the one before session rotation)
+		// should have progress 100%.
+		if P::estimate_next_session_rotation(i).0.unwrap() - 1 == i {
+			assert_eq!(
+				P::estimate_current_session_progress(i).0.unwrap(),
+				Percent::from_percent(100)
+			);
+		} else {
+			assert!(
+				P::estimate_current_session_progress(i).0.unwrap() < Percent::from_percent(100)
+			);
+		}
 	}
 
+	// we end the session at block #3 and we consider this block the first one
+	// from the next session. since we're past the offset phase it represents
+	// 1/10 of progress.
 	assert!(P::should_end_session(3u64));
-	assert_eq!(P::estimate_next_session_rotation(3u64).unwrap(), 3);
+	assert_eq!(P::estimate_next_session_rotation(3u64).0.unwrap(), 3);
+	assert_eq!(
+		P::estimate_current_session_progress(3u64).0.unwrap(),
+		Percent::from_percent(10),
+	);
 
 	for i in (1u64..10).map(|i| 3 + i) {
 		assert!(!P::should_end_session(i));
-		assert_eq!(P::estimate_next_session_rotation(i).unwrap(), 13);
+		assert_eq!(P::estimate_next_session_rotation(i).0.unwrap(), 13);
+
+		// as with the offset phase the last block of the session must have 100%
+		// progress.
+		if P::estimate_next_session_rotation(i).0.unwrap() - 1 == i {
+			assert_eq!(
+				P::estimate_current_session_progress(i).0.unwrap(),
+				Percent::from_percent(100)
+			);
+		} else {
+			assert!(
+				P::estimate_current_session_progress(i).0.unwrap() < Percent::from_percent(100)
+			);
+		}
 	}
 
+	// the new session starts and we proceed in 1/10 increments.
 	assert!(P::should_end_session(13u64));
-	assert_eq!(P::estimate_next_session_rotation(13u64).unwrap(), 23);
+	assert_eq!(P::estimate_next_session_rotation(13u64).0.unwrap(), 23);
+	assert_eq!(
+		P::estimate_current_session_progress(13u64).0.unwrap(),
+		Percent::from_percent(10)
+	);
 
 	assert!(!P::should_end_session(14u64));
-	assert_eq!(P::estimate_next_session_rotation(14u64).unwrap(), 23);
+	assert_eq!(P::estimate_next_session_rotation(14u64).0.unwrap(), 23);
+	assert_eq!(
+		P::estimate_current_session_progress(14u64).0.unwrap(),
+		Percent::from_percent(20)
+	);
 }
 
 #[test]
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 544ae29b0e6a..05511be63bb0 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -1365,7 +1365,10 @@ decl_module! {
 				// either current session final based on the plan, or we're forcing.
 				(Self::is_current_session_final() || Self::will_era_be_forced())
 			{
-				if let Some(next_session_change) = T::NextNewSession::estimate_next_new_session(now) {
+				let (maybe_next_session_change, estimate_next_new_session_weight) =
+					T::NextNewSession::estimate_next_new_session(now);
+
+				if let Some(next_session_change) = maybe_next_session_change {
 					if let Some(remaining) = next_session_change.checked_sub(&now) {
 						if remaining <= T::ElectionLookahead::get() && !remaining.is_zero() {
 							// create snapshot.
@@ -1387,7 +1390,7 @@ decl_module! {
 				} else {
 					log!(warn, "Estimating next session change failed.");
 				}
-				add_weight(0, 0, T::NextNewSession::weight(now))
+				add_weight(0, 0, estimate_next_new_session_weight)
 			}
 			// For `era_election_status`, `is_current_session_final`, `will_era_be_forced`
 			add_weight(3, 0, 0);
@@ -3365,6 +3368,7 @@ impl<T: Config> sp_election_providers::ElectionDataProvider<T::AccountId, T::Blo
 		let session_length = T::NextNewSession::average_session_length();
 
 		let until_this_session_end = T::NextNewSession::estimate_next_new_session(now)
+			.0
 			.unwrap_or_default()
 			.saturating_sub(now);
 
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index cb555607fc82..286c545d30d9 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -24,12 +24,12 @@ use codec::{FullCodec, Codec, Encode, Decode, EncodeLike};
 use sp_core::u32_trait::Value as U32;
 use sp_runtime::{
 	traits::{
-		AtLeast32Bit, AtLeast32BitUnsigned, BadOrigin, Block as BlockT, Bounded, Convert,
+		AtLeast32Bit, AtLeast32BitUnsigned, Block as BlockT, BadOrigin, Convert,
 		MaybeSerializeDeserialize, SaturatedConversion, Saturating, StoredMapError,
 		UniqueSaturatedFrom, UniqueSaturatedInto, Zero,
 	},
-	BoundToRuntimeAppPublic, ConsensusEngineId, DispatchError, DispatchResult, RuntimeAppPublic,
-	RuntimeDebug,
+	BoundToRuntimeAppPublic, ConsensusEngineId, DispatchError, DispatchResult, Percent,
+	RuntimeAppPublic, RuntimeDebug,
 };
 use sp_staking::SessionIndex;
 use crate::dispatch::Parameter;
@@ -490,42 +490,56 @@ impl<
 	}
 }
 
-/// Something that can estimate at which block the next session rotation will happen.
+/// Something that can estimate at which block the next session rotation will happen (i.e. a new
+/// session starts).
+///
+/// The accuracy of the estimates is dependent on the specific implementation, but in order to get
+/// the best estimate possible these methods should be called throughout the duration of the session
+/// (rather than calling once and storing the result).
 ///
 /// This should be the same logical unit that dictates `ShouldEndSession` to the session module. No
-/// Assumptions are made about the scheduling of the sessions.
+/// assumptions are made about the scheduling of the sessions.
 pub trait EstimateNextSessionRotation<BlockNumber> {
 	/// Return the average length of a session.
 	///
 	/// This may or may not be accurate.
 	fn average_session_length() -> BlockNumber;
 
-	/// Return the block number at which the next session rotation is estimated to happen.
+	/// Return an estimate of the current session progress.
 	///
-	/// None should be returned if the estimation fails to come to an answer
-	fn estimate_next_session_rotation(now: BlockNumber) -> Option<BlockNumber>;
+	/// None should be returned if the estimation fails to come to an answer.
+	fn estimate_current_session_progress(now: BlockNumber) -> (Option<Percent>, Weight);
 
-	/// Return the weight of calling `estimate_next_session_rotation`
-	fn weight(now: BlockNumber) -> Weight;
+	/// Return the block number at which the next session rotation is estimated to happen.
+	///
+	/// None should be returned if the estimation fails to come to an answer.
+	fn estimate_next_session_rotation(now: BlockNumber) -> (Option<BlockNumber>, Weight);
 }
 
-impl<BlockNumber: Bounded + Default> EstimateNextSessionRotation<BlockNumber> for () {
+impl<BlockNumber: Zero> EstimateNextSessionRotation<BlockNumber> for () {
 	fn average_session_length() -> BlockNumber {
-		Default::default()
+		Zero::zero()
 	}
 
-	fn estimate_next_session_rotation(_: BlockNumber) -> Option<BlockNumber> {
-		Default::default()
+	fn estimate_current_session_progress(_: BlockNumber) -> (Option<Percent>, Weight) {
+		(None, Zero::zero())
 	}
 
-	fn weight(_: BlockNumber) -> Weight {
-		0
+	fn estimate_next_session_rotation(_: BlockNumber) -> (Option<BlockNumber>, Weight) {
+		(None, Zero::zero())
 	}
 }
 
-/// Something that can estimate at which block the next `new_session` will be triggered.
+/// Something that can estimate at which block scheduling of the next session will happen (i.e when
+/// we will try to fetch new validators).
+///
+/// This only refers to the point when we fetch the next session details and not when we enact them
+/// (for enactment there's `EstimateNextSessionRotation`). With `pallet-session` this should be
+/// triggered whenever `SessionManager::new_session` is called.
 ///
-/// This must always be implemented by the session module.
+/// For example, if we are using a staking module this would be the block when the session module
+/// would ask staking what the next validator set will be, as such this must always be implemented
+/// by the session module.
 pub trait EstimateNextNewSession<BlockNumber> {
 	/// Return the average length of a session.
 	///
@@ -533,23 +547,18 @@ pub trait EstimateNextNewSession<BlockNumber> {
 	fn average_session_length() -> BlockNumber;
 
 	/// Return the block number at which the next new session is estimated to happen.
-	fn estimate_next_new_session(now: BlockNumber) -> Option<BlockNumber>;
-
-	/// Return the weight of calling `estimate_next_new_session`
-	fn weight(now: BlockNumber) -> Weight;
+	///
+	/// None should be returned if the estimation fails to come to an answer.
+	fn estimate_next_new_session(_: BlockNumber) -> (Option<BlockNumber>, Weight);
 }
 
-impl<BlockNumber: Bounded + Default> EstimateNextNewSession<BlockNumber> for () {
+impl<BlockNumber: Zero> EstimateNextNewSession<BlockNumber> for () {
 	fn average_session_length() -> BlockNumber {
-		Default::default()
-	}
-
-	fn estimate_next_new_session(_: BlockNumber) -> Option<BlockNumber> {
-		Default::default()
+		Zero::zero()
 	}
 
-	fn weight(_: BlockNumber) -> Weight {
-		0
+	fn estimate_next_new_session(_: BlockNumber) -> (Option<BlockNumber>, Weight) {
+		(None, Zero::zero())
 	}
 }
 

From 3ba58082c5ff89b348972f422c2bb66c1d5d74c8 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Fri, 12 Mar 2021 15:23:24 +0100
Subject: [PATCH 0496/1194] remove whitespaces. (#8341)

---
 frame/executive/src/lib.rs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index 8f07aafbab27..f48fda4841d2 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -375,16 +375,16 @@ where
 
 		if remaining_weight > 0 {
 			let mut used_weight =
-                <frame_system::Module<System> as OnIdle<System::BlockNumber>>::on_idle(
-                    block_number,
-                    remaining_weight
-                );
+				<frame_system::Module<System> as OnIdle<System::BlockNumber>>::on_idle(
+					block_number,
+					remaining_weight
+				);
 			remaining_weight = remaining_weight.saturating_sub(used_weight);
 			used_weight = <AllModules as OnIdle<System::BlockNumber>>::on_idle(
-                block_number,
-                remaining_weight
-            )
-            .saturating_add(used_weight);
+				block_number,
+				remaining_weight
+			)
+			.saturating_add(used_weight);
 			<frame_system::Module::<System>>::register_extra_weight_unchecked(used_weight, DispatchClass::Mandatory);
 		}
 

From 18ab0903c23eabbe53860b810314e8d4102091d8 Mon Sep 17 00:00:00 2001
From: Robert Klotzner <eskimor@users.noreply.github.com>
Date: Fri, 12 Mar 2021 20:54:44 +0100
Subject: [PATCH 0497/1194] Derive common classes for `IfDisconnected`. (#8346)

---
 client/network/src/request_responses.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/network/src/request_responses.rs b/client/network/src/request_responses.rs
index 4d478ea7afd6..e8ca2795ea79 100644
--- a/client/network/src/request_responses.rs
+++ b/client/network/src/request_responses.rs
@@ -197,6 +197,7 @@ impl From<(Cow<'static, str>, RequestId)> for ProtocolRequestId {
 }
 
 /// When sending a request, what to do on a disconnected recipient.
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub enum IfDisconnected {
 	/// Try to connect to the peer.
 	TryConnect,

From 52c2189d6d29bcac2bad742e7719592e10e26e37 Mon Sep 17 00:00:00 2001
From: Qinxuan Chen <koushiro.cqx@gmail.com>
Date: Mon, 15 Mar 2021 16:35:02 +0800
Subject: [PATCH 0498/1194] Remove useless sr-api (#8335)

Signed-off-by: koushiro <koushiro.cqx@gmail.com>
---
 primitives/sr-api/proc-macro/src/lib.rs | 190 ------------------------
 1 file changed, 190 deletions(-)
 delete mode 100644 primitives/sr-api/proc-macro/src/lib.rs

diff --git a/primitives/sr-api/proc-macro/src/lib.rs b/primitives/sr-api/proc-macro/src/lib.rs
deleted file mode 100644
index 4c4aa0d7cb92..000000000000
--- a/primitives/sr-api/proc-macro/src/lib.rs
+++ /dev/null
@@ -1,190 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Macros for declaring and implementing runtime apis.
-
-#![recursion_limit = "512"]
-
-use proc_macro::TokenStream;
-
-mod impl_runtime_apis;
-mod decl_runtime_apis;
-mod utils;
-
-/// Tags given trait implementations as runtime apis.
-///
-/// All traits given to this macro, need to be declared with the `decl_runtime_apis!` macro.
-/// The implementation of the trait should follow the declaration given to the `decl_runtime_apis!`
-/// macro, besides the `Block` type that is required as first generic parameter for each runtime
-/// api trait. When implementing a runtime api trait, it is required that the trait is referenced
-/// by a path, e.g. `impl my_trait::MyTrait for Runtime`. The macro will use this path to access
-/// the declaration of the trait for the runtime side.
-///
-/// The macro also generates the api implementations for the client side and provides it through
-/// the `RuntimeApi` type. The `RuntimeApi` is hidden behind a `feature` called `std`.
-///
-/// To expose version information about all implemented api traits, the constant
-/// `RUNTIME_API_VERSIONS` is generated. This constant should be used to instantiate the `apis`
-/// field of `RuntimeVersion`.
-///
-/// # Example
-///
-/// ```rust
-/// use sp_version::create_runtime_str;
-/// #
-/// # use sp_runtime::traits::{GetNodeBlockType, Block as BlockT};
-/// # use test_client::runtime::Block;
-/// #
-/// # /// The declaration of the `Runtime` type and the implementation of the `GetNodeBlockType`
-/// # /// trait are done by the `construct_runtime!` macro in a real runtime.
-/// # pub struct Runtime {}
-/// # impl GetNodeBlockType for Runtime {
-/// #     type NodeBlock = Block;
-/// # }
-/// #
-/// # sp_api::decl_runtime_apis! {
-/// #     /// Declare the api trait.
-/// #     pub trait Balance {
-/// #         /// Get the balance.
-/// #         fn get_balance() -> u64;
-/// #         /// Set the balance.
-/// #         fn set_balance(val: u64);
-/// #     }
-/// #     pub trait BlockBuilder {
-/// #        fn build_block() -> Block;
-/// #    }
-/// # }
-///
-/// /// All runtime api implementations need to be done in one call of the macro!
-/// sp_api::impl_runtime_apis! {
-/// #   impl sp_api::Core<Block> for Runtime {
-/// #       fn version() -> sp_version::RuntimeVersion {
-/// #           unimplemented!()
-/// #       }
-/// #       fn execute_block(_block: Block) {}
-/// #       fn initialize_block(_header: &<Block as BlockT>::Header) {}
-/// #   }
-///
-///     impl self::Balance<Block> for Runtime {
-///         fn get_balance() -> u64 {
-///             1
-///         }
-///         fn set_balance(_bal: u64) {
-///             // Store the balance
-///         }
-///     }
-///
-///     impl self::BlockBuilder<Block> for Runtime {
-///         fn build_block() -> Block {
-///              unimplemented!("Please implement me!")
-///         }
-///     }
-/// }
-///
-/// /// Runtime version. This needs to be declared for each runtime.
-/// pub const VERSION: sp_version::RuntimeVersion = sp_version::RuntimeVersion {
-///     spec_name: create_runtime_str!("node"),
-///     impl_name: create_runtime_str!("test-node"),
-///     authoring_version: 1,
-///     spec_version: 1,
-///     impl_version: 0,
-///     // Here we are exposing the runtime api versions.
-///     apis: RUNTIME_API_VERSIONS,
-///     transaction_version: 1,
-/// };
-///
-/// # fn main() {}
-/// ```
-#[proc_macro]
-pub fn impl_runtime_apis(input: TokenStream) -> TokenStream {
-	impl_runtime_apis::impl_runtime_apis_impl(input)
-}
-
-/// Declares given traits as runtime apis.
-///
-/// The macro will create two declarations, one for using on the client side and one for using
-/// on the runtime side. The declaration for the runtime side is hidden in its own module.
-/// The client side declaration gets two extra parameters per function,
-/// `&self` and `at: &BlockId<Block>`. The runtime side declaration will match the given trait
-/// declaration. Besides one exception, the macro adds an extra generic parameter `Block: BlockT`
-/// to the client side and the runtime side. This generic parameter is usable by the user.
-///
-/// For implementing these macros you should use the `impl_runtime_apis!` macro.
-///
-/// # Example
-///
-/// ```rust
-/// sp_api::decl_runtime_apis! {
-///     /// Declare the api trait.
-///     pub trait Balance {
-///         /// Get the balance.
-///         fn get_balance() -> u64;
-///         /// Set the balance.
-///         fn set_balance(val: u64);
-///     }
-///
-///     /// You can declare multiple api traits in one macro call.
-///     /// In one module you can call the macro at maximum one time.
-///     pub trait BlockBuilder {
-///         /// The macro adds an explicit `Block: BlockT` generic parameter for you.
-///         /// You can use this generic parameter as you would defined it manually.
-///         fn build_block() -> Block;
-///     }
-/// }
-///
-/// # fn main() {}
-/// ```
-///
-/// # Runtime api trait versioning
-///
-/// To support versioning of the traits, the macro supports the attribute `#[api_version(1)]`.
-/// The attribute supports any `u32` as version. By default, each trait is at version `1`, if no
-/// version is provided. We also support changing the signature of a method. This signature
-/// change is highlighted with the `#[changed_in(2)]` attribute above a method. A method that is
-/// tagged with this attribute is callable by the name `METHOD_before_version_VERSION`. This
-/// method will only support calling into wasm, trying to call into native will fail (change the
-/// spec version!). Such a method also does not need to be implemented in the runtime.
-///
-/// ```rust
-/// sp_api::decl_runtime_apis! {
-///     /// Declare the api trait.
-///     #[api_version(2)]
-///     pub trait Balance {
-///         /// Get the balance.
-///         fn get_balance() -> u64;
-///         /// Set balance.
-///         fn set_balance(val: u64);
-///         /// Set balance, old version.
-///         ///
-///         /// Is callable by `set_balance_before_version_2`.
-///         #[changed_in(2)]
-///         fn set_balance(val: u16);
-///         /// In version 2, we added this new function.
-///         fn increase_balance(val: u64);
-///     }
-/// }
-///
-/// # fn main() {}
-/// ```
-///
-/// To check if a given runtime implements a runtime api trait, the `RuntimeVersion` has the
-/// function `has_api<A>()`. Also the `ApiExt` provides a function `has_api<A>(at: &BlockId)` to
-/// check if the runtime at the given block id implements the requested runtime api trait.
-#[proc_macro]
-pub fn decl_runtime_apis(input: TokenStream) -> TokenStream {
-	decl_runtime_apis::decl_runtime_apis_impl(input)
-}

From a107e1f0b394bc61726e73560332f7d714589e2f Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Mon, 15 Mar 2021 09:45:48 +0100
Subject: [PATCH 0499/1194] Don't log to debug for every failed extrinsic. 
 (#8355)

---
 frame/system/src/lib.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index ce9ab0dddc10..6ea2a62f05ba 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -1449,7 +1449,12 @@ impl<T: Config> Module<T> {
 			match r {
 				Ok(_) => Event::ExtrinsicSuccess(info),
 				Err(err) => {
-					sp_runtime::print(err);
+					log::trace!(
+						target: "runtime::system", 
+						"Extrinsic failed at block({:?}): {:?}", 
+						Self::block_number(), 
+						err,
+					);
 					Event::ExtrinsicFailed(err.error, info)
 				},
 			}

From fdac8be155b7670c567ade2f428f74ba8db801ab Mon Sep 17 00:00:00 2001
From: Falco Hirschenberger <falco.hirschenberger@gmail.com>
Date: Mon, 15 Mar 2021 14:47:02 +0100
Subject: [PATCH 0500/1194] Add more relaxed pallet-name parsing (#8353)

Make it possbible to use the pallet's path name, with `-` separator or crate name with `_` separator.
fixes #8226
---
 utils/frame/benchmarking-cli/src/lib.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/utils/frame/benchmarking-cli/src/lib.rs b/utils/frame/benchmarking-cli/src/lib.rs
index 19f4596e92fd..6784b1ecabf4 100644
--- a/utils/frame/benchmarking-cli/src/lib.rs
+++ b/utils/frame/benchmarking-cli/src/lib.rs
@@ -21,11 +21,17 @@ mod writer;
 use sc_cli::{ExecutionStrategy, WasmExecutionMethod};
 use std::fmt::Debug;
 
+// Add a more relaxed parsing for pallet names by allowing pallet directory names with `-` to be used
+// like crate names with `_`
+fn parse_pallet_name(pallet: &str) -> String {
+	pallet.replace("-", "_")
+}
+
 /// The `benchmark` command used to benchmark FRAME Pallets.
 #[derive(Debug, structopt::StructOpt)]
 pub struct BenchmarkCmd {
 	/// Select a FRAME Pallet to benchmark, or `*` for all (in which case `extrinsic` must be `*`).
-	#[structopt(short, long)]
+	#[structopt(short, long, parse(from_str = parse_pallet_name))]
 	pub pallet: String,
 
 	/// Select an extrinsic inside the pallet to benchmark, or `*` for all.

From 354176941e29f5da533b389879c3b64af5da6b76 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Mon, 15 Mar 2021 15:09:56 +0100
Subject: [PATCH 0501/1194] Don't log so many stkaing events on genesis block
 (#8339)

* Don't log so many stkaing events on genesis block

* Clean a few more warn and info logs

* Update frame/staking/src/lib.rs

* Update frame/staking/src/lib.rs
---
 .../election-provider-multi-phase/src/lib.rs  |  8 ++++--
 frame/staking/src/lib.rs                      | 28 +++++++++++--------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index 4ee6caae0a64..aca07cae3085 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -1019,12 +1019,16 @@ impl<T: Config> Pallet<T> {
 			)
 			.map(|(supports, compute)| {
 				Self::deposit_event(Event::ElectionFinalized(Some(compute)));
-				log!(info, "Finalized election round with compute {:?}.", compute);
+				if Self::round() != 1 {
+					log!(info, "Finalized election round with compute {:?}.", compute);
+				}
 				supports
 			})
 			.map_err(|err| {
 				Self::deposit_event(Event::ElectionFinalized(None));
-				log!(warn, "Failed to finalize election round. reason {:?}", err);
+				if Self::round() != 1 {
+					log!(warn, "Failed to finalize election round. reason {:?}", err);
+				}
 				err
 			})
 	}
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 05511be63bb0..c57fac43c560 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -2938,13 +2938,15 @@ impl<T: Config> Module<T> {
 			// emit event
 			Self::deposit_event(RawEvent::StakingElection(compute));
 
-			log!(
-				info,
-				"new validator set of size {:?} has been elected via {:?} for staring era {:?}",
-				elected_stashes.len(),
-				compute,
-				current_era,
-			);
+			if current_era > 0 {
+				log!(
+					info,
+					"new validator set of size {:?} has been elected via {:?} for staring era {:?}",
+					elected_stashes.len(),
+					compute,
+					current_era,
+				);
+			}
 
 			Some(elected_stashes)
 		} else {
@@ -3132,11 +3134,13 @@ impl<T: Config> Module<T> {
 		let elected_stashes = exposures.iter().cloned().map(|(x, _)| x).collect::<Vec<_>>();
 
 		if (elected_stashes.len() as u32) <= Self::minimum_validator_count() {
-			log!(
-				warn,
-				"chain does not have enough staking candidates to operate for era {:?}",
-				current_era,
-			);
+			if current_era > 0 {
+				log!(
+					warn,
+					"chain does not have enough staking candidates to operate for era {:?}",
+					current_era,
+				);
+			}
 			return Err(());
 		}
 

From 9618c5f1f237138ffa0cfeb26bc6a34a832d1520 Mon Sep 17 00:00:00 2001
From: Shaun Wang <spxwang@gmail.com>
Date: Tue, 16 Mar 2021 21:51:51 +1300
Subject: [PATCH 0502/1194] Support pallet::storage conditional compilation
 (#8324)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Support pallet::storage conditional compilation.

* Add docs for cfg attributes.

* Keep strong types for get cfg attrs return.

* Update frame/support/procedural/src/pallet/parse/helper.rs

* Update frame/support/procedural/src/pallet/parse/storage.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 .gitlab-ci.yml                                |  1 +
 .../procedural/src/pallet/expand/storage.rs   | 13 +++-
 .../src/pallet/expand/store_trait.rs          |  3 +
 .../procedural/src/pallet/parse/call.rs       |  4 +-
 .../procedural/src/pallet/parse/config.rs     |  4 +-
 .../procedural/src/pallet/parse/event.rs      |  2 +-
 .../procedural/src/pallet/parse/helper.rs     | 17 +++++-
 .../procedural/src/pallet/parse/mod.rs        |  2 +-
 .../src/pallet/parse/pallet_struct.rs         |  2 +-
 .../procedural/src/pallet/parse/storage.rs    |  7 ++-
 frame/support/src/lib.rs                      | 12 ++++
 frame/support/test/Cargo.toml                 |  1 +
 frame/support/test/tests/pallet.rs            | 61 +++++++++++++++++++
 13 files changed, 117 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a7eedee9aa24..9619e600430a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -277,6 +277,7 @@ test-linux-stable:                 &test-linux
   script:
     # this job runs all tests in former runtime-benchmarks, frame-staking and wasmtime tests
     - time cargo test --workspace --locked --release --verbose --features runtime-benchmarks --manifest-path bin/node/cli/Cargo.toml
+    - time cargo test -p frame-support-test --features=conditional-storage --manifest-path frame/support/test/Cargo.toml
     - SUBSTRATE_TEST_TIMEOUT=1 time cargo test -p substrate-test-utils --release --verbose --locked -- --ignored timeout
     - sccache -s
 
diff --git a/frame/support/procedural/src/pallet/expand/storage.rs b/frame/support/procedural/src/pallet/expand/storage.rs
index 7948fca2faf0..86fb84b339b2 100644
--- a/frame/support/procedural/src/pallet/expand/storage.rs
+++ b/frame/support/procedural/src/pallet/expand/storage.rs
@@ -78,6 +78,8 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 			let gen = &def.type_use_generics(storage.attr_span);
 			let full_ident = quote::quote_spanned!(storage.attr_span => #ident<#gen> );
 
+			let cfg_attrs = &storage.cfg_attrs;
+
 			let metadata_trait = match &storage.metadata {
 				Metadata::Value { .. } => quote::quote_spanned!(storage.attr_span =>
 					#frame_support::storage::types::StorageValueMetadata
@@ -128,7 +130,7 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 			};
 
 			quote::quote_spanned!(storage.attr_span =>
-				#frame_support::metadata::StorageEntryMetadata {
+				#(#cfg_attrs)* #frame_support::metadata::StorageEntryMetadata {
 					name: #frame_support::metadata::DecodeDifferent::Encode(
 						<#full_ident as #metadata_trait>::NAME
 					),
@@ -159,6 +161,8 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 			let type_use_gen = &def.type_use_generics(storage.attr_span);
 			let full_ident = quote::quote_spanned!(storage.attr_span => #ident<#gen> );
 
+			let cfg_attrs = &storage.cfg_attrs;
+
 			match &storage.metadata {
 				Metadata::Value { value } => {
 					let query = match storage.query_kind.as_ref().expect("Checked by def") {
@@ -168,6 +172,7 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 						QueryKind::ValueQuery => quote::quote!(#value),
 					};
 					quote::quote_spanned!(storage.attr_span =>
+						#(#cfg_attrs)*
 						impl<#type_impl_gen> #pallet_ident<#type_use_gen> #completed_where_clause {
 							#( #docs )*
 							pub fn #getter() -> #query {
@@ -186,6 +191,7 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 						QueryKind::ValueQuery => quote::quote!(#value),
 					};
 					quote::quote_spanned!(storage.attr_span =>
+						#(#cfg_attrs)*
 						impl<#type_impl_gen> #pallet_ident<#type_use_gen> #completed_where_clause {
 							#( #docs )*
 							pub fn #getter<KArg>(k: KArg) -> #query where
@@ -206,6 +212,7 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 						QueryKind::ValueQuery => quote::quote!(#value),
 					};
 					quote::quote_spanned!(storage.attr_span =>
+						#(#cfg_attrs)*
 						impl<#type_impl_gen> #pallet_ident<#type_use_gen> #completed_where_clause {
 							#( #docs )*
 							pub fn #getter<KArg1, KArg2>(k1: KArg1, k2: KArg2) -> #query where
@@ -233,10 +240,14 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 		let prefix_struct_const = storage_def.ident.to_string();
 		let config_where_clause = &def.config.where_clause;
 
+		let cfg_attrs = &storage_def.cfg_attrs;
+
 		quote::quote_spanned!(storage_def.attr_span =>
+			#(#cfg_attrs)*
 			#prefix_struct_vis struct #prefix_struct_ident<#type_use_gen>(
 				core::marker::PhantomData<(#type_use_gen,)>
 			);
+			#(#cfg_attrs)*
 			impl<#type_impl_gen> #frame_support::traits::StorageInstance
 				for #prefix_struct_ident<#type_use_gen>
 				#config_where_clause
diff --git a/frame/support/procedural/src/pallet/expand/store_trait.rs b/frame/support/procedural/src/pallet/expand/store_trait.rs
index cdc7e2837245..81ed52ac87a6 100644
--- a/frame/support/procedural/src/pallet/expand/store_trait.rs
+++ b/frame/support/procedural/src/pallet/expand/store_trait.rs
@@ -37,10 +37,12 @@ pub fn expand_store_trait(def: &mut Def) -> proc_macro2::TokenStream {
 	let completed_where_clause = super::merge_where_clauses(&where_clauses);
 
 	let storage_names = &def.storages.iter().map(|storage| &storage.ident).collect::<Vec<_>>();
+	let storage_cfg_attrs = &def.storages.iter().map(|storage| &storage.cfg_attrs).collect::<Vec<_>>();
 
 	quote::quote_spanned!(trait_store.span() =>
 		#trait_vis trait #trait_store {
 			#(
+				#(#storage_cfg_attrs)*
 				type #storage_names;
 			)*
 		}
@@ -48,6 +50,7 @@ pub fn expand_store_trait(def: &mut Def) -> proc_macro2::TokenStream {
 			#completed_where_clause
 		{
 			#(
+				#(#storage_cfg_attrs)*
 				type #storage_names = #storage_names<#type_use_gen>;
 			)*
 		}
diff --git a/frame/support/procedural/src/pallet/parse/call.rs b/frame/support/procedural/src/pallet/parse/call.rs
index c3f6751ef70b..23406aeb2343 100644
--- a/frame/support/procedural/src/pallet/parse/call.rs
+++ b/frame/support/procedural/src/pallet/parse/call.rs
@@ -172,7 +172,7 @@ impl CallDef {
 				}
 
 				let mut call_var_attrs: Vec<FunctionAttr> =
-					helper::take_item_attrs(&mut method.attrs)?;
+					helper::take_item_pallet_attrs(&mut method.attrs)?;
 
 				if call_var_attrs.len() != 1 {
 					let msg = if call_var_attrs.is_empty() {
@@ -193,7 +193,7 @@ impl CallDef {
 					};
 
 					let arg_attrs: Vec<ArgAttrIsCompact> =
-						helper::take_item_attrs(&mut arg.attrs)?;
+						helper::take_item_pallet_attrs(&mut arg.attrs)?;
 
 					if arg_attrs.len() > 1 {
 						let msg = "Invalid pallet::call, argument has too many attributes";
diff --git a/frame/support/procedural/src/pallet/parse/config.rs b/frame/support/procedural/src/pallet/parse/config.rs
index 44525164f03d..045f2bff50e4 100644
--- a/frame/support/procedural/src/pallet/parse/config.rs
+++ b/frame/support/procedural/src/pallet/parse/config.rs
@@ -309,7 +309,7 @@ impl ConfigDef {
 				|| check_event_type(frame_system, trait_item, has_instance)?;
 
 			// Parse for constant
-			let type_attrs_const: Vec<TypeAttrConst> = helper::take_item_attrs(trait_item)?;
+			let type_attrs_const: Vec<TypeAttrConst> = helper::take_item_pallet_attrs(trait_item)?;
 
 			if type_attrs_const.len() > 1 {
 				let msg = "Invalid attribute in pallet::config, only one attribute is expected";
@@ -339,7 +339,7 @@ impl ConfigDef {
 			}
 		}
 
-		let attr: Option<DisableFrameSystemSupertraitCheck> = helper::take_first_item_attr(
+		let attr: Option<DisableFrameSystemSupertraitCheck> = helper::take_first_item_pallet_attr(
 			&mut item.attrs
 		)?;
 
diff --git a/frame/support/procedural/src/pallet/parse/event.rs b/frame/support/procedural/src/pallet/parse/event.rs
index 7d8b7d075ef2..e5aad2b5b5d2 100644
--- a/frame/support/procedural/src/pallet/parse/event.rs
+++ b/frame/support/procedural/src/pallet/parse/event.rs
@@ -163,7 +163,7 @@ impl EventDef {
 			return Err(syn::Error::new(item.span(), "Invalid pallet::event, expected item enum"))
 		};
 
-		let event_attrs: Vec<PalletEventAttr> = helper::take_item_attrs(&mut item.attrs)?;
+		let event_attrs: Vec<PalletEventAttr> = helper::take_item_pallet_attrs(&mut item.attrs)?;
 		let attr_info = PalletEventAttrInfo::from_attrs(event_attrs)?;
 		let metadata = attr_info.metadata.unwrap_or_else(Vec::new);
 		let deposit_event = attr_info.deposit_event;
diff --git a/frame/support/procedural/src/pallet/parse/helper.rs b/frame/support/procedural/src/pallet/parse/helper.rs
index b6ee5c614d6f..3a7729c47e1d 100644
--- a/frame/support/procedural/src/pallet/parse/helper.rs
+++ b/frame/support/procedural/src/pallet/parse/helper.rs
@@ -47,7 +47,7 @@ pub trait MutItemAttrs {
 }
 
 /// Take the first pallet attribute (e.g. attribute like `#[pallet..]`) and decode it to `Attr`
-pub fn take_first_item_attr<Attr>(item: &mut impl MutItemAttrs) -> syn::Result<Option<Attr>> where
+pub fn take_first_item_pallet_attr<Attr>(item: &mut impl MutItemAttrs) -> syn::Result<Option<Attr>> where
 	Attr: syn::parse::Parse,
 {
 	let attrs = if let Some(attrs) = item.mut_item_attrs() {
@@ -69,18 +69,29 @@ pub fn take_first_item_attr<Attr>(item: &mut impl MutItemAttrs) -> syn::Result<O
 }
 
 /// Take all the pallet attributes (e.g. attribute like `#[pallet..]`) and decode them to `Attr`
-pub fn take_item_attrs<Attr>(item: &mut impl MutItemAttrs) -> syn::Result<Vec<Attr>> where
+pub fn take_item_pallet_attrs<Attr>(item: &mut impl MutItemAttrs) -> syn::Result<Vec<Attr>> where
 	Attr: syn::parse::Parse,
 {
 	let mut pallet_attrs = Vec::new();
 
-	while let Some(attr) = take_first_item_attr(item)? {
+	while let Some(attr) = take_first_item_pallet_attr(item)? {
 		pallet_attrs.push(attr)
 	}
 
 	Ok(pallet_attrs)
 }
 
+/// Get all the cfg attributes (e.g. attribute like `#[cfg..]`) and decode them to `Attr`
+pub fn get_item_cfg_attrs(attrs: &[syn::Attribute]) -> Vec<syn::Attribute> {
+	attrs.iter().filter_map(|attr|  {
+		if attr.path.segments.first().map_or(false, |segment| segment.ident == "cfg") {
+			Some(attr.clone())
+		} else {
+			None
+		}
+	}).collect::<Vec<_>>()
+}
+
 impl MutItemAttrs for syn::Item {
 	fn mut_item_attrs(&mut self) -> Option<&mut Vec<syn::Attribute>> {
 		match self {
diff --git a/frame/support/procedural/src/pallet/parse/mod.rs b/frame/support/procedural/src/pallet/parse/mod.rs
index 4d8f239ded0a..39a40fc148bc 100644
--- a/frame/support/procedural/src/pallet/parse/mod.rs
+++ b/frame/support/procedural/src/pallet/parse/mod.rs
@@ -89,7 +89,7 @@ impl Def {
 		let mut type_values = vec![];
 
 		for (index, item) in items.iter_mut().enumerate() {
-			let pallet_attr: Option<PalletAttr> = helper::take_first_item_attr(item)?;
+			let pallet_attr: Option<PalletAttr> = helper::take_first_item_pallet_attr(item)?;
 
 			match pallet_attr {
 				Some(PalletAttr::Config(span)) if config.is_none() =>
diff --git a/frame/support/procedural/src/pallet/parse/pallet_struct.rs b/frame/support/procedural/src/pallet/parse/pallet_struct.rs
index 1c979741d980..6c2c90bd61a5 100644
--- a/frame/support/procedural/src/pallet/parse/pallet_struct.rs
+++ b/frame/support/procedural/src/pallet/parse/pallet_struct.rs
@@ -78,7 +78,7 @@ impl PalletStructDef {
 			return Err(syn::Error::new(item.span(), msg));
 		};
 
-		let mut event_attrs: Vec<PalletStructAttr> = helper::take_item_attrs(&mut item.attrs)?;
+		let mut event_attrs: Vec<PalletStructAttr> = helper::take_item_pallet_attrs(&mut item.attrs)?;
 		if event_attrs.len() > 1 {
 			let msg = "Invalid pallet::pallet, multiple argument pallet::generate_store found";
 			return Err(syn::Error::new(event_attrs[1].keyword.span(), msg));
diff --git a/frame/support/procedural/src/pallet/parse/storage.rs b/frame/support/procedural/src/pallet/parse/storage.rs
index c0da266cfca2..41ef337b7661 100644
--- a/frame/support/procedural/src/pallet/parse/storage.rs
+++ b/frame/support/procedural/src/pallet/parse/storage.rs
@@ -91,6 +91,8 @@ pub struct StorageDef {
 	pub where_clause: Option<syn::WhereClause>,
 	/// The span of the pallet::storage attribute.
 	pub attr_span: proc_macro2::Span,
+	/// The `cfg` attributes.
+	pub cfg_attrs: Vec<syn::Attribute>,
 }
 
 /// In `Foo<A, B, C>` retrieve the argument at given position, i.e. A is argument at position 0.
@@ -125,13 +127,15 @@ impl StorageDef {
 			return Err(syn::Error::new(item.span(), "Invalid pallet::storage, expected item type"));
 		};
 
-		let mut attrs: Vec<PalletStorageAttr> = helper::take_item_attrs(&mut item.attrs)?;
+		let mut attrs: Vec<PalletStorageAttr> = helper::take_item_pallet_attrs(&mut item.attrs)?;
 		if attrs.len() > 1 {
 			let msg = "Invalid pallet::storage, multiple argument pallet::getter found";
 			return Err(syn::Error::new(attrs[1].getter.span(), msg));
 		}
 		let getter = attrs.pop().map(|attr| attr.getter);
 
+		let cfg_attrs = helper::get_item_cfg_attrs(&item.attrs);
+
 		let mut instances = vec![];
 		instances.push(helper::check_type_def_gen(&item.generics, item.ident.span())?);
 
@@ -223,6 +227,7 @@ impl StorageDef {
 			getter,
 			query_kind,
 			where_clause,
+			cfg_attrs,
 		})
 	}
 }
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index a06fd7a1d9b9..d0d034a55f50 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -1418,6 +1418,18 @@ pub mod pallet_prelude {
 /// pub(super) type MyStorage<T> = StorageMap<_, Blake2_128Concat, u32, u32>;
 /// ```
 ///
+/// The optional attributes `#[cfg(..)]` allow conditional compilation for the storage.
+///
+/// E.g:
+/// ```ignore
+/// #[cfg(feature = "my-feature")]
+/// #[pallet::storage]
+/// pub(super) type MyStorage<T> = StorageValue<_, u32>;
+/// ```
+///
+/// All the `cfg` attributes are automatically copied to the items generated for the storage, i.e. the
+/// getter, storage prefix, and the metadata element etc.
+///
 /// NOTE: If the `QueryKind` generic parameter is still generic at this stage or is using some type
 /// alias then the generation of the getter might fail. In this case the getter can be implemented
 /// manually.
diff --git a/frame/support/test/Cargo.toml b/frame/support/test/Cargo.toml
index 17aeea970c05..7d2f0ec463a3 100644
--- a/frame/support/test/Cargo.toml
+++ b/frame/support/test/Cargo.toml
@@ -42,3 +42,4 @@ std = [
 	"sp-state-machine",
 ]
 try-runtime = ["frame-support/try-runtime"]
+conditional-storage = []
diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index a31ce9d91ae2..781806a313c2 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -217,6 +217,28 @@ pub mod pallet {
 	#[pallet::storage]
 	pub type DoubleMap2<T> = StorageDoubleMap<_, Twox64Concat, u16, Blake2_128Concat, u32, u64>;
 
+	#[pallet::storage]
+	#[pallet::getter(fn conditional_value)]
+	#[cfg(feature = "conditional-storage")]
+	pub type ConditionalValue<T> = StorageValue<_, u32>;
+
+	#[cfg(feature = "conditional-storage")]
+	#[pallet::storage]
+	#[pallet::getter(fn conditional_map)]
+	pub type ConditionalMap<T> = StorageMap<_, Twox64Concat, u16, u32>;
+
+	#[cfg(feature = "conditional-storage")]
+	#[pallet::storage]
+	#[pallet::getter(fn conditional_double_map)]
+	pub type ConditionalDoubleMap<T> = StorageDoubleMap<
+		_,
+		Blake2_128Concat,
+		u8,
+		Twox64Concat,
+		u16,
+		u32,
+	>;
+
 	#[pallet::genesis_config]
 	#[derive(Default)]
 	pub struct GenesisConfig {
@@ -522,6 +544,13 @@ fn storage_expand() {
 		k.extend(2u32.using_encoded(blake2_128_concat));
 		assert_eq!(unhashed::get::<u64>(&k), Some(3u64));
 		assert_eq!(&k[..32], &<pallet::DoubleMap2<Runtime>>::final_prefix());
+
+		#[cfg(feature = "conditional-storage")]
+		{
+			pallet::ConditionalValue::<Runtime>::put(1);
+			pallet::ConditionalMap::<Runtime>::insert(1, 2);
+			pallet::ConditionalDoubleMap::<Runtime>::insert(1, 2, 3);
+		}
 	})
 }
 
@@ -646,6 +675,38 @@ fn metadata() {
 					default: DecodeDifferent::Decoded(vec![0]),
 					documentation: DecodeDifferent::Decoded(vec![]),
 				},
+				#[cfg(feature = "conditional-storage")] StorageEntryMetadata {
+					name: DecodeDifferent::Decoded("ConditionalValue".to_string()),
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::Plain(DecodeDifferent::Decoded("u32".to_string())),
+					default: DecodeDifferent::Decoded(vec![0]),
+					documentation: DecodeDifferent::Decoded(vec![]),
+				},
+				#[cfg(feature = "conditional-storage")] StorageEntryMetadata {
+					name: DecodeDifferent::Decoded("ConditionalMap".to_string()),
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::Map {
+						key: DecodeDifferent::Decoded("u16".to_string()),
+						value: DecodeDifferent::Decoded("u32".to_string()),
+						hasher: StorageHasher::Twox64Concat,
+						unused: false,
+					},
+					default: DecodeDifferent::Decoded(vec![0]),
+					documentation: DecodeDifferent::Decoded(vec![]),
+				},
+				#[cfg(feature = "conditional-storage")] StorageEntryMetadata {
+					name: DecodeDifferent::Decoded("ConditionalDoubleMap".to_string()),
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::DoubleMap {
+						value: DecodeDifferent::Decoded("u32".to_string()),
+						key1: DecodeDifferent::Decoded("u8".to_string()),
+						key2: DecodeDifferent::Decoded("u16".to_string()),
+						hasher: StorageHasher::Blake2_128Concat,
+						key2_hasher: StorageHasher::Twox64Concat,
+					},
+					default: DecodeDifferent::Decoded(vec![0]),
+					documentation: DecodeDifferent::Decoded(vec![]),
+				},
 			]),
 		})),
 		calls: Some(DecodeDifferent::Decoded(vec![

From c939ceba381b6313462d47334f775e128ea4e95d Mon Sep 17 00:00:00 2001
From: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
Date: Tue, 16 Mar 2021 10:00:03 +0100
Subject: [PATCH 0503/1194] NPoS Challenge Mode (#8236)

* Add PJR challenge functions

- Updates the PJR check to return a counterexample if one exists
- Adds functions to cheaply check counterexamples

This is in support of off-chain PJR challenges: if a miner discovers
that an accepted election solution does not satisfy PJR, it will be
eligible for substantial rewards. This helps ensure that validator
elections have an absolute quality floor, so even if someone manages
to censor well-behaved solutions to give themselves unfair representation,
we can catch them in the act and penalize them.

* counterexample -> counter_example

* reorganize: high -> low abstraction

* reorganize challenges high -> low abstraction

* add note justifying linear search

* Simplify max_pre_score validation

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* add minor test of pjr challenge validation

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
---
 .../npos-elections/fuzzer/src/phragmen_pjr.rs |   2 +-
 primitives/npos-elections/src/pjr.rs          | 112 ++++++++++++++++--
 2 files changed, 102 insertions(+), 12 deletions(-)

diff --git a/primitives/npos-elections/fuzzer/src/phragmen_pjr.rs b/primitives/npos-elections/fuzzer/src/phragmen_pjr.rs
index 9727d1406ad2..49794f21fb25 100644
--- a/primitives/npos-elections/fuzzer/src/phragmen_pjr.rs
+++ b/primitives/npos-elections/fuzzer/src/phragmen_pjr.rs
@@ -112,7 +112,7 @@ fn iteration(mut candidate_count: usize, mut voter_count: usize, seed: u64) {
 	let threshold = standard_threshold(rounds, voters.iter().map(|voter| voter.budget()));
 
 	assert!(
-		pjr_check_core(&candidates, &voters, threshold),
+		pjr_check_core(&candidates, &voters, threshold).is_ok(),
 		"unbalanced sequential phragmen must satisfy PJR",
 	);
 }
diff --git a/primitives/npos-elections/src/pjr.rs b/primitives/npos-elections/src/pjr.rs
index 61e0b2deb79f..6caed9059e87 100644
--- a/primitives/npos-elections/src/pjr.rs
+++ b/primitives/npos-elections/src/pjr.rs
@@ -74,7 +74,7 @@ pub fn pjr_check<AccountId: IdentifierT>(
 	supports: &Supports<AccountId>,
 	all_candidates: Vec<AccountId>,
 	all_voters: Vec<(AccountId, VoteWeight, Vec<AccountId>)>,
-) -> bool {
+) -> Result<(), AccountId> {
 	let t = standard_threshold(supports.len(), all_voters.iter().map(|voter| voter.1 as ExtendedBalance));
 	t_pjr_check(supports, all_candidates, all_voters, t)
 }
@@ -119,7 +119,7 @@ pub fn t_pjr_check<AccountId: IdentifierT>(
 	all_candidates: Vec<AccountId>,
 	all_voters: Vec<(AccountId, VoteWeight, Vec<AccountId>)>,
 	t: Threshold,
-) -> bool {
+) -> Result<(), AccountId> {
 	// First order of business: derive `(candidates, voters)` from `supports`.
 	let (candidates, voters) = prepare_pjr_input(
 		supports,
@@ -133,18 +133,99 @@ pub fn t_pjr_check<AccountId: IdentifierT>(
 /// The internal implementation of the PJR check after having the data converted.
 ///
 /// [`pjr_check`] or [`t_pjr_check`] are typically easier to work with.
+///
+/// This function returns an `AccountId` in the `Err` case. This is the counter_example: the ID of the
+/// unelected candidate with the highest prescore, such that `pre_score(counter_example) >= t`.
 pub fn pjr_check_core<AccountId: IdentifierT>(
 	candidates: &[CandidatePtr<AccountId>],
 	voters: &[Voter<AccountId>],
 	t: Threshold,
-) -> bool {
+) -> Result<(), AccountId> {
 	let unelected = candidates.iter().filter(|c| !c.borrow().elected);
 	let maybe_max_pre_score = unelected.map(|c| (pre_score(Rc::clone(c), voters, t), c.borrow().who.clone())).max();
 	// if unelected is empty then the solution is indeed PJR.
-	maybe_max_pre_score.map_or(true, |(max_pre_score, _)| max_pre_score < t)
+	match maybe_max_pre_score {
+		Some((max_pre_score, counter_example)) if max_pre_score >= t => Err(counter_example),
+		_ => Ok(()),
+	}
 }
 
+/// Validate a challenge to an election result.
+///
+/// A challenge to an election result is valid if there exists some counter_example for which
+/// `pre_score(counter_example) >= threshold`. Validating an existing counter_example is computationally
+/// cheaper than re-running the PJR check.
+///
+/// This function uses the standard threshold.
+///
+/// Returns `true` if the challenge is valid: the proposed solution does not satisfy PJR.
+/// Returns `false` if the challenge is invalid: the proposed solution does in fact satisfy PJR.
+pub fn validate_pjr_challenge<AccountId: IdentifierT>(
+	counter_example: AccountId,
+	supports: &Supports<AccountId>,
+	all_candidates: Vec<AccountId>,
+	all_voters: Vec<(AccountId, VoteWeight, Vec<AccountId>)>,
+) -> bool {
+	let threshold = standard_threshold(supports.len(), all_voters.iter().map(|voter| voter.1 as ExtendedBalance));
+	validate_t_pjr_challenge(counter_example, supports, all_candidates, all_voters, threshold)
+}
 
+/// Validate a challenge to an election result.
+///
+/// A challenge to an election result is valid if there exists some counter_example for which
+/// `pre_score(counter_example) >= threshold`. Validating an existing counter_example is computationally
+/// cheaper than re-running the PJR check.
+///
+/// This function uses a supplied threshold.
+///
+/// Returns `true` if the challenge is valid: the proposed solution does not satisfy PJR.
+/// Returns `false` if the challenge is invalid: the proposed solution does in fact satisfy PJR.
+pub fn validate_t_pjr_challenge<AccountId: IdentifierT>(
+	counter_example: AccountId,
+	supports: &Supports<AccountId>,
+	all_candidates: Vec<AccountId>,
+	all_voters: Vec<(AccountId, VoteWeight, Vec<AccountId>)>,
+	threshold: Threshold,
+) -> bool {
+	let (candidates, voters) = prepare_pjr_input(
+		supports,
+		all_candidates,
+		all_voters,
+	);
+	validate_pjr_challenge_core(counter_example, &candidates, &voters, threshold)
+}
+
+/// Validate a challenge to an election result.
+///
+/// A challenge to an election result is valid if there exists some counter_example for which
+/// `pre_score(counter_example) >= threshold`. Validating an existing counter_example is computationally
+/// cheaper than re-running the PJR check.
+///
+/// Returns `true` if the challenge is valid: the proposed solution does not satisfy PJR.
+/// Returns `false` if the challenge is invalid: the proposed solution does in fact satisfy PJR.
+fn validate_pjr_challenge_core<AccountId: IdentifierT>(
+	counter_example: AccountId,
+	candidates: &[CandidatePtr<AccountId>],
+	voters: &[Voter<AccountId>],
+	threshold: Threshold,
+) -> bool {
+	// Performing a linear search of the candidate list is not great, for obvious reasons. However,
+	// the alternatives are worse:
+	//
+	// - we could pre-sort the candidates list in `prepare_pjr_input` (n log n) which would let us
+	//   binary search for the appropriate one here (log n). Overall runtime is `n log n` which is
+	//   worse than the current runtime of `n`.
+	//
+	// - we could probably pre-sort the candidates list in `n` in `prepare_pjr_input` using some
+	//   unsafe code leveraging the existing `candidates_index`: allocate an uninitialized vector of
+	//   appropriate length, then copy in all the elements. We'd really prefer to avoid unsafe code
+	//   in the runtime, though.
+	let candidate = match candidates.iter().find(|candidate| candidate.borrow().who == counter_example) {
+		None => return false,
+		Some(candidate) => candidate.clone(),
+	};
+	pre_score(candidate, &voters, threshold) >= threshold
+}
 
 /// Convert the data types that the user runtime has into ones that can be used by this module.
 ///
@@ -315,6 +396,15 @@ mod tests {
 		voter
 	}
 
+	fn assert_core_failure<AccountId: IdentifierT>(
+		candidates: &[CandidatePtr<AccountId>],
+		voters: &[Voter<AccountId>],
+		t: Threshold,
+	) {
+		let counter_example = pjr_check_core(candidates, voters, t).unwrap_err();
+		assert!(validate_pjr_challenge_core(counter_example, candidates, voters, t));
+	}
+
 	#[test]
 	fn slack_works() {
 		let voter = setup_voter(10, vec![(1, 10, true), (2, 20, true)]);
@@ -388,9 +478,9 @@ mod tests {
 
 		// fyi. this is not PJR, obviously because the votes of 3 can bump the stake a lot but they
 		// are being ignored.
-		assert!(!pjr_check_core(&candidates, &voters, 1));
-		assert!(!pjr_check_core(&candidates, &voters, 10));
-		assert!(!pjr_check_core(&candidates, &voters, 20));
+		assert_core_failure(&candidates, &voters, 1);
+		assert_core_failure(&candidates, &voters, 10);
+		assert_core_failure(&candidates, &voters, 20);
 	}
 
 	// These next tests ensure that the threshold phase change property holds for us, but that's not their real purpose.
@@ -476,7 +566,7 @@ mod tests {
 		let mut prev_threshold = 0;
 
 		// find the binary range containing the threshold beyond which the PJR check succeeds
-		while !pjr_check_core(&candidates, &voters, threshold) {
+		while pjr_check_core(&candidates, &voters, threshold).is_err() {
 			prev_threshold = threshold;
 			threshold = threshold.checked_mul(2).expect("pjr check must fail before we run out of capacity in u128");
 		}
@@ -488,7 +578,7 @@ mod tests {
 		while high_bound - low_bound > 1 {
 			// maintain the invariant that low_bound fails and high_bound passes
 			let test = low_bound + ((high_bound - low_bound) / 2);
-			if pjr_check_core(&candidates, &voters, test) {
+			if pjr_check_core(&candidates, &voters, test).is_ok() {
 				high_bound = test;
 			} else {
 				low_bound = test;
@@ -502,12 +592,12 @@ mod tests {
 		let mut unexpected_failures = Vec::new();
 		let mut unexpected_successes = Vec::new();
 		for t in 0..=low_bound {
-			if pjr_check_core(&candidates, &voters, t) {
+			if pjr_check_core(&candidates, &voters, t).is_ok() {
 				unexpected_successes.push(t);
 			}
 		}
 		for t in high_bound..(high_bound*2) {
-			if !pjr_check_core(&candidates, &voters, t) {
+			if pjr_check_core(&candidates, &voters, t).is_err() {
 				unexpected_failures.push(t);
 			}
 		}

From 8a4aeba53d54988a408cc0d8d11b93f34142a6e3 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Tue, 16 Mar 2021 12:44:30 +0100
Subject: [PATCH 0504/1194] Audit fixes for election/staking decoupling part 2
 (#8167)

* Base features and traits.

* pallet and unsigned phase

* Undo bad formattings.

* some formatting cleanup.

* Small self-cleanup.

* Make it all build

* self-review

* Some doc tests.

* Some changes from other PR

* Fix session test

* Update Cargo.lock

* Update frame/election-provider-multi-phase/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Some review comments

* Rename + make encode/decode

* Do an assert as well, just in case.

* Fix build

* Update frame/election-provider-multi-phase/src/unsigned.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Las comment

* fix staking fuzzer.

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_election_provider_multi_phase --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/election-provider-multi-phase/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Add one last layer of feasibility check as well.

* Last fixes to benchmarks

* Some more docs.

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_election_provider_multi_phase --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/election-provider-multi-phase/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_election_provider_multi_phase --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/election-provider-multi-phase/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Some nits

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Fix doc

* Mkae ci green

* Audit fixes for election-provider: part 2 signed phase.

* Fix weight

* Some grumbles.

* Try and weigh to get_npos_voters

* Fix build

* Fix line width

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Fix tests.

* Fix build

* Reorg some stuff

* More reorg.

* Reorg done.

* Fix build

* Another rename

* Fix build

* Update frame/election-provider-multi-phase/src/mock.rs

Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>

* nit

* better doc

* Line width

* Fix build

* Self-review

* Self-review

* Fix wan

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_election_provider_multi_phase --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/election-provider-multi-phase/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* fix build and review comments.

* Update frame/election-provider-multi-phase/src/lib.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* add comment

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
---
 Cargo.lock                                    | 710 +++++++++---------
 Cargo.toml                                    |   2 +-
 frame/babe/Cargo.toml                         |   2 +-
 frame/babe/src/mock.rs                        |   3 +-
 .../election-provider-multi-phase/Cargo.toml  |   8 +-
 .../src/benchmarking.rs                       | 103 +--
 .../src/helpers.rs                            |   2 +-
 .../election-provider-multi-phase/src/lib.rs  | 201 +++--
 .../election-provider-multi-phase/src/mock.rs |  52 +-
 .../src/unsigned.rs                           |  16 +-
 .../src/weights.rs                            |  93 ++-
 .../election-provider-support}/Cargo.toml     |  20 +-
 .../election-provider-support}/src/lib.rs     |  86 ++-
 .../election-provider-support}/src/onchain.rs |  49 +-
 frame/grandpa/Cargo.toml                      |   2 +-
 frame/grandpa/src/mock.rs                     |   3 +-
 frame/offences/benchmarking/Cargo.toml        |   4 +-
 frame/offences/benchmarking/src/mock.rs       |   3 +-
 frame/session/benchmarking/Cargo.toml         |   4 +-
 frame/session/benchmarking/src/mock.rs        |   3 +-
 frame/staking/Cargo.toml                      |   8 +-
 frame/staking/fuzzer/Cargo.toml               |   2 +-
 frame/staking/fuzzer/src/mock.rs              |   9 +-
 frame/staking/src/benchmarking.rs             |  41 +-
 frame/staking/src/lib.rs                      |  76 +-
 frame/staking/src/mock.rs                     |   3 +-
 frame/staking/src/offchain_election.rs        |   6 +
 frame/staking/src/testing_utils.rs            |   6 +-
 frame/staking/src/tests.rs                    |  26 +-
 frame/staking/src/weights.rs                  | 238 +++---
 frame/system/src/offchain.rs                  |  11 +-
 primitives/npos-elections/src/lib.rs          |  16 +-
 32 files changed, 1085 insertions(+), 723 deletions(-)
 rename {primitives/election-providers => frame/election-provider-support}/Cargo.toml (57%)
 rename {primitives/election-providers => frame/election-provider-support}/src/lib.rs (75%)
 rename {primitives/election-providers => frame/election-provider-support}/src/onchain.rs (70%)

diff --git a/Cargo.lock b/Cargo.lock
index 2e00f515d318..536a26ac2061 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -23,9 +23,9 @@ dependencies = [
 
 [[package]]
 name = "adler"
-version = "0.2.3"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "aead"
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "arbitrary"
-version = "0.4.7"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db55d72333851e17d572bec876e390cd3b11eb1ef53ae821dd9f3b653d2b4569"
+checksum = "698b65a961a9d730fb45b6b0327e20207810c9f61ee421b082b27ba003f49e2b"
 
 [[package]]
 name = "arrayref"
@@ -177,10 +177,11 @@ dependencies = [
 
 [[package]]
 name = "assert_cmd"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dc1679af9a1ab4bea16f228b05d18f8363f8327b1fa8db00d2760cfafc6b61e"
+checksum = "f2475b58cd94eb4f70159f4fd8844ba3b807532fe3131b3373fae060bbe30396"
 dependencies = [
+ "bstr",
  "doc-comment",
  "predicates",
  "predicates-core",
@@ -190,9 +191,9 @@ dependencies = [
 
 [[package]]
 name = "assert_matches"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "695579f0f2520f3774bb40461e5adb066459d4e0af4d59d20175484fb8e9edf1"
+checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9"
 
 [[package]]
 name = "async-attributes"
@@ -206,9 +207,9 @@ dependencies = [
 
 [[package]]
 name = "async-channel"
-version = "1.5.1"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59740d83946db6a5af71ae25ddf9562c2b176b2ca42cf99a455f09f4a220d6b9"
+checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319"
 dependencies = [
  "concurrent-queue",
  "event-listener",
@@ -285,13 +286,13 @@ dependencies = [
 
 [[package]]
 name = "async-process"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8cea09c1fb10a317d1b5af8024eeba256d6554763e85ecd90ff8df31c7bbda"
+checksum = "ef37b86e2fa961bae5a4d212708ea0154f904ce31d1a4a7f47e1bbc33a0c040b"
 dependencies = [
  "async-io",
  "blocking",
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "event-listener",
  "futures-lite",
  "once_cell",
@@ -311,7 +312,7 @@ dependencies = [
  "async-io",
  "async-lock",
  "async-process",
- "crossbeam-utils 0.8.1",
+ "crossbeam-utils 0.8.3",
  "futures-channel",
  "futures-core",
  "futures-io",
@@ -322,7 +323,7 @@ dependencies = [
  "memchr",
  "num_cpus",
  "once_cell",
- "pin-project-lite 0.2.5",
+ "pin-project-lite 0.2.6",
  "pin-utils",
  "slab",
  "wasm-bindgen-futures",
@@ -336,9 +337,9 @@ checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0"
 
 [[package]]
 name = "async-trait"
-version = "0.1.42"
+version = "0.1.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d3a45e77e34375a7923b1e8febb049bb011f064714a8e17a1a616fef01da13d"
+checksum = "7e098e9c493fdf92832223594d9a164f96bdf17ba81a42aff86f85c76768726a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -355,7 +356,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "memchr",
- "pin-project-lite 0.2.5",
+ "pin-project-lite 0.2.6",
 ]
 
 [[package]]
@@ -368,7 +369,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "memchr",
- "pin-project-lite 0.2.5",
+ "pin-project-lite 0.2.6",
 ]
 
 [[package]]
@@ -443,9 +444,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
 
 [[package]]
 name = "bincode"
-version = "1.3.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30d3a39baa26f9651f17b375061f3233dde33424a8b72b0dbe93a68a0bc896d"
+checksum = "d175dfa69e619905c4c3cdb7c3c203fa3bdd5d51184e3afdb2742c0280493772"
 dependencies = [
  "byteorder",
  "serde",
@@ -483,9 +484,9 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
 
 [[package]]
 name = "bitvec"
-version = "0.20.1"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5011ffc90248764d7005b0e10c7294f5aa1bd87d9dd7248f4ad475b347c294d"
+checksum = "1f682656975d3a682daff957be4ddeb65d6ad656737cd821f2d00685ae466af1"
 dependencies = [
  "funty",
  "radium",
@@ -560,7 +561,7 @@ dependencies = [
  "block-padding 0.1.5",
  "byte-tools",
  "byteorder",
- "generic-array 0.12.3",
+ "generic-array 0.12.4",
 ]
 
 [[package]]
@@ -619,9 +620,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
 
 [[package]]
 name = "bstr"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "473fc6b38233f9af7baa94fb5852dca389e3d95b8e21c8e3719301462c5d9faf"
+checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d"
 dependencies = [
  "lazy_static",
  "memchr",
@@ -640,9 +641,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.6.0"
+version = "3.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "099e596ef14349721d9016f6b80dd3419ea1bf289ab9b44df8e4dfd3a005d5d9"
+checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe"
 
 [[package]]
 name = "byte-slice-cast"
@@ -658,9 +659,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
 
 [[package]]
 name = "byteorder"
-version = "1.4.2"
+version = "1.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b"
+checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
 
 [[package]]
 name = "bytes"
@@ -724,9 +725,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.66"
+version = "1.0.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"
+checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd"
 dependencies = [
  "jobserver",
 ]
@@ -806,9 +807,9 @@ dependencies = [
 
 [[package]]
 name = "cid"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d88f30b1e74e7063df5711496f3ee6e74a9735d62062242d70cddf77717f18e"
+checksum = "ff0e3bc0b6446b3f9663c1a6aba6ef06c5aeaa1bc92bd18077be337198ab9768"
 dependencies = [
  "multibase",
  "multihash",
@@ -887,12 +888,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "const_fn"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6"
-
 [[package]]
 name = "constant_time_eq"
 version = "0.1.5"
@@ -1083,7 +1078,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
 dependencies = [
  "cfg-if 1.0.0",
- "crossbeam-utils 0.8.1",
+ "crossbeam-utils 0.8.3",
 ]
 
 [[package]]
@@ -1104,8 +1099,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
 dependencies = [
  "cfg-if 1.0.0",
- "crossbeam-epoch 0.9.1",
- "crossbeam-utils 0.8.1",
+ "crossbeam-epoch 0.9.3",
+ "crossbeam-utils 0.8.3",
 ]
 
 [[package]]
@@ -1125,13 +1120,12 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.1"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d"
+checksum = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12"
 dependencies = [
  "cfg-if 1.0.0",
- "const_fn",
- "crossbeam-utils 0.8.1",
+ "crossbeam-utils 0.8.3",
  "lazy_static",
  "memoffset 0.6.1",
  "scopeguard",
@@ -1161,9 +1155,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.1"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"
+checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49"
 dependencies = [
  "autocfg",
  "cfg-if 1.0.0",
@@ -1182,7 +1176,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5"
 dependencies = [
- "generic-array 0.12.3",
+ "generic-array 0.12.4",
  "subtle 1.0.0",
 ]
 
@@ -1198,9 +1192,9 @@ dependencies = [
 
 [[package]]
 name = "csv"
-version = "1.1.5"
+version = "1.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9d58633299b24b515ac72a3f869f8b91306a3cec616a602843a383acd6f9e97"
+checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1"
 dependencies = [
  "bstr",
  "csv-core",
@@ -1229,9 +1223,9 @@ dependencies = [
 
 [[package]]
 name = "ctor"
-version = "0.1.18"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10bcb9d7dcbf7002aaffbb53eac22906b64cdcc127971dcc387d8eb7c95d5560"
+checksum = "e8f45d9ad417bcef4817d614a501ab55cdd96a6fdb24f49aab89a54acfd66b19"
 dependencies = [
  "quote",
  "syn",
@@ -1323,7 +1317,7 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
 dependencies = [
- "generic-array 0.12.3",
+ "generic-array 0.12.4",
 ]
 
 [[package]]
@@ -1489,9 +1483,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26ecb66b4bdca6c1409b40fb255eefc2bd4f6d135dab3c3124f80ffa2a9661e"
+checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f"
 dependencies = [
  "atty",
  "humantime 2.1.0",
@@ -1548,7 +1542,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5"
 dependencies = [
- "futures 0.3.12",
+ "futures 0.3.13",
 ]
 
 [[package]]
@@ -1620,7 +1614,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c6447e2f8178843749e8c8003206def83ec124a7859475395777a28b5338647c"
 dependencies = [
  "either",
- "futures 0.3.12",
+ "futures 0.3.13",
  "futures-timer 3.0.2",
  "log",
  "num-traits",
@@ -1675,9 +1669,9 @@ dependencies = [
 
 [[package]]
 name = "form_urlencoded"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00"
+checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
 dependencies = [
  "matches",
  "percent-encoding 2.1.0",
@@ -1725,6 +1719,19 @@ dependencies = [
  "structopt",
 ]
 
+[[package]]
+name = "frame-election-provider-support"
+version = "3.0.0"
+dependencies = [
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "sp-arithmetic",
+ "sp-npos-elections",
+ "sp-runtime",
+ "sp-std",
+]
+
 [[package]]
 name = "frame-executive"
 version = "3.0.0"
@@ -1899,6 +1906,16 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "fs2"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
+dependencies = [
+ "libc",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "fs_extra"
 version = "1.2.0"
@@ -1935,15 +1952,15 @@ checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
 
 [[package]]
 name = "futures"
-version = "0.1.30"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c7e4c2612746b0df8fed4ce0c69156021b704c9aefa360311c04e6e9e002eed"
+checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678"
 
 [[package]]
 name = "futures"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da9052a1a50244d8d5aa9bf55cbc2fb6f357c86cc52e46c62ed390a7180cf150"
+checksum = "7f55667319111d593ba876406af7c409c0ebb44dc4be6132a783ccf163ea14c1"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1956,9 +1973,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2d31b7ec7efab6eefc7c57233bb10b847986139d88cc2f5a02a1ae6871a1846"
+checksum = "8c2dd2df839b57db9ab69c2c9d8f3e8c81984781937fe2807dc6dcf3b2ad2939"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1966,9 +1983,9 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79e5145dde8da7d1b3892dad07a9c98fc04bc39892b1ecc9692cf53e2b780a65"
+checksum = "15496a72fabf0e62bdc3df11a59a3787429221dd0710ba8ef163d6f7a9112c94"
 
 [[package]]
 name = "futures-cpupool"
@@ -1976,7 +1993,7 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
 dependencies = [
- "futures 0.1.30",
+ "futures 0.1.31",
  "num_cpus",
 ]
 
@@ -1986,8 +2003,8 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdcef58a173af8148b182684c9f2d5250875adbcaff7b5794073894f9d8634a9"
 dependencies = [
- "futures 0.1.30",
- "futures 0.3.12",
+ "futures 0.1.31",
+ "futures 0.3.13",
  "lazy_static",
  "log",
  "parking_lot 0.9.0",
@@ -1998,9 +2015,9 @@ dependencies = [
 
 [[package]]
 name = "futures-executor"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9e59fdc009a4b3096bf94f740a0f2424c082521f20a9b08c5c07c48d90fd9b9"
+checksum = "891a4b7b96d84d5940084b2a37632dd65deeae662c114ceaa2c879629c9c0ad1"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -2010,9 +2027,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28be053525281ad8259d47e4de5de657b25e7bac113458555bb4b70bc6870500"
+checksum = "d71c2c65c57704c32f5241c1223167c2c3294fd34ac020c807ddbe6db287ba59"
 
 [[package]]
 name = "futures-lite"
@@ -2025,15 +2042,15 @@ dependencies = [
  "futures-io",
  "memchr",
  "parking",
- "pin-project-lite 0.2.5",
+ "pin-project-lite 0.2.6",
  "waker-fn",
 ]
 
 [[package]]
 name = "futures-macro"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c287d25add322d9f9abdcdc5927ca398917996600182178774032e9f8258fedd"
+checksum = "ea405816a5139fb39af82c2beb921d52143f556038378d6db21183a5c37fbfb7"
 dependencies = [
  "proc-macro-hack",
  "proc-macro2",
@@ -2054,18 +2071,15 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caf5c69029bda2e743fddd0582d1083951d65cc9539aebf8812f36c3491342d6"
+checksum = "85754d98985841b7d4f5e8e6fbfa4a4ac847916893ec511a2917ccd8525b8bb3"
 
 [[package]]
 name = "futures-task"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13de07eb8ea81ae445aca7b69f5f7bf15d7bf4912d8ca37d6645c77ae8a58d86"
-dependencies = [
- "once_cell",
-]
+checksum = "fa189ef211c15ee602667a6fcfe1c1fd9e07d42250d2156382820fba33c9df80"
 
 [[package]]
 name = "futures-timer"
@@ -2085,11 +2099,11 @@ dependencies = [
 
 [[package]]
 name = "futures-util"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "632a8cd0f2a4b3fdea1657f08bde063848c3bd00f9bbf6e256b8be78802e624b"
+checksum = "1812c7ab8aedf8d6f2701a43e1243acdbcc2b36ab26e2ad421eb99ac963d96d1"
 dependencies = [
- "futures 0.1.30",
+ "futures 0.1.31",
  "futures-channel",
  "futures-core",
  "futures-io",
@@ -2097,7 +2111,7 @@ dependencies = [
  "futures-sink",
  "futures-task",
  "memchr",
- "pin-project-lite 0.2.5",
+ "pin-project-lite 0.2.6",
  "pin-utils",
  "proc-macro-hack",
  "proc-macro-nested",
@@ -2112,18 +2126,18 @@ checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
 
 [[package]]
 name = "generic-array"
-version = "0.12.3"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
+checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd"
 dependencies = [
  "typenum",
 ]
 
 [[package]]
 name = "generic-array"
-version = "0.13.2"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ed1e761351b56f54eb9dcd0cfaca9fd0daecf93918e1cfc01c8a3d26ee7adcd"
+checksum = "f797e67af32588215eaaab8327027ee8e71b9dd0b2b26996aedf20c030fce309"
 dependencies = [
  "typenum",
 ]
@@ -2226,7 +2240,7 @@ dependencies = [
  "byteorder",
  "bytes 0.4.12",
  "fnv",
- "futures 0.1.30",
+ "futures 0.1.31",
  "http 0.1.21",
  "indexmap",
  "log",
@@ -2263,9 +2277,9 @@ checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3"
 
 [[package]]
 name = "handlebars"
-version = "3.5.2"
+version = "3.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "964d0e99a61fe9b1b347389b77ebf8b7e1587b70293676aaca7d27e59b9073b2"
+checksum = "cdb0867bbc5a3da37a753e78021d5fcf8a4db00e18dd2dd90fd36e24190e162d"
 dependencies = [
  "log",
  "pest",
@@ -2319,9 +2333,9 @@ dependencies = [
 
 [[package]]
 name = "hex"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
@@ -2362,15 +2376,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c6e570451493f10f6581b48cdd530413b63ea9e780f544bfd3bdcaa0d89d1a7b"
 dependencies = [
  "digest 0.8.1",
- "generic-array 0.12.3",
+ "generic-array 0.12.4",
  "hmac 0.7.1",
 ]
 
 [[package]]
 name = "honggfuzz"
-version = "0.5.52"
+version = "0.5.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ead88897bcad1c396806d6ccba260a0363e11da997472e9e19ab9889969083a2"
+checksum = "bea09577d948a98a5f59b7c891e274c4fb35ad52f67782b3d0cb53b9c05301f1"
 dependencies = [
  "arbitrary",
  "lazy_static",
@@ -2406,7 +2420,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d"
 dependencies = [
  "bytes 0.4.12",
- "futures 0.1.30",
+ "futures 0.1.31",
  "http 0.1.21",
  "tokio-buf",
 ]
@@ -2423,9 +2437,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.3.4"
+version = "1.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
+checksum = "615caabe2c3160b313d52ccc905335f4ed5f10881dd63dc5699d47e90be85691"
 
 [[package]]
 name = "httpdate"
@@ -2450,12 +2464,12 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.12.35"
+version = "0.12.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dbe6ed1438e1f8ad955a4701e9a944938e9519f6888d12d8558b645e247d5f6"
+checksum = "5c843caf6296fc1f93444735205af9ed4e109a539005abb2564ae1d6fad34c52"
 dependencies = [
  "bytes 0.4.12",
- "futures 0.1.30",
+ "futures 0.1.31",
  "futures-cpupool",
  "h2 0.1.26",
  "http 0.1.21",
@@ -2480,9 +2494,9 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "0.13.9"
+version = "0.13.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf"
+checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb"
 dependencies = [
  "bytes 0.5.6",
  "futures-channel",
@@ -2494,7 +2508,7 @@ dependencies = [
  "httparse",
  "httpdate",
  "itoa",
- "pin-project 1.0.4",
+ "pin-project 1.0.5",
  "socket2",
  "tokio 0.2.25",
  "tower-service",
@@ -2511,7 +2525,7 @@ dependencies = [
  "bytes 0.5.6",
  "ct-logs",
  "futures-util",
- "hyper 0.13.9",
+ "hyper 0.13.10",
  "log",
  "rustls 0.18.1",
  "rustls-native-certs",
@@ -2533,9 +2547,9 @@ dependencies = [
 
 [[package]]
 name = "idna"
-version = "0.2.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
+checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21"
 dependencies = [
  "matches",
  "unicode-bidi",
@@ -2570,7 +2584,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97b8538953a3f0d0d3868f0a706eb4273535e10d72acb5c82c1c23ae48835c85"
 dependencies = [
  "async-io",
- "futures 0.3.12",
+ "futures 0.3.13",
  "futures-lite",
  "if-addrs",
  "ipnet",
@@ -2610,9 +2624,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "1.6.1"
+version = "1.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b"
+checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3"
 dependencies = [
  "autocfg",
  "hashbrown",
@@ -2646,7 +2660,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64fa110ec7b8f493f416eed552740d10e7030ad5f63b2308f82c9608ec2df275"
 dependencies = [
- "futures 0.3.12",
+ "futures 0.3.13",
  "futures-timer 2.0.2",
 ]
 
@@ -2706,9 +2720,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.46"
+version = "0.3.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf3d7383929f7c9c7c2d0fa596f325832df98c3704f2c60553080f7127a58175"
+checksum = "5cfb73131c35423a367daf8cbd24100af0d077668c8c2943f0e7dd775fef0f65"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2720,8 +2734,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "489b9c612e60c766f751ab40fcb43cbb55a1e10bb44a9b4307ed510ca598cbd7"
 dependencies = [
  "failure",
- "futures 0.1.30",
- "hyper 0.12.35",
+ "futures 0.1.31",
+ "hyper 0.12.36",
  "jsonrpc-core",
  "jsonrpc-pubsub",
  "log",
@@ -2736,7 +2750,7 @@ version = "15.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0745a6379e3edc893c84ec203589790774e4247420033e71a76d3ab4687991fa"
 dependencies = [
- "futures 0.1.30",
+ "futures 0.1.31",
  "log",
  "serde",
  "serde_derive",
@@ -2770,7 +2784,7 @@ version = "15.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fb5c4513b7b542f42da107942b7b759f27120b5cc894729f88254b28dff44b7"
 dependencies = [
- "hyper 0.12.35",
+ "hyper 0.12.36",
  "jsonrpc-core",
  "jsonrpc-server-utils",
  "log",
@@ -2843,8 +2857,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "124797a4ea7430d0675db78e065e53316e3f1a3cbf0ee4d6dbdd42db7b08e193"
 dependencies = [
  "async-trait",
- "futures 0.3.12",
- "hyper 0.13.9",
+ "futures 0.3.13",
+ "hyper 0.13.10",
  "jsonrpsee-types",
  "jsonrpsee-utils",
  "log",
@@ -2852,7 +2866,7 @@ dependencies = [
  "serde_json",
  "thiserror",
  "unicase",
- "url 2.2.0",
+ "url 2.2.1",
 ]
 
 [[package]]
@@ -2874,7 +2888,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a8cd20c190e75dc56f7543b9d5713c3186351b301b5507ea6b85d8c403aac78"
 dependencies = [
  "async-trait",
- "futures 0.3.12",
+ "futures 0.3.13",
  "log",
  "serde",
  "serde_json",
@@ -2888,9 +2902,9 @@ version = "0.2.0-alpha"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0e45394ec3175a767c3c5bac584560e6ad9b56ebd73216c85ec8bab49619244"
 dependencies = [
- "futures 0.3.12",
+ "futures 0.3.13",
  "globset",
- "hyper 0.13.9",
+ "hyper 0.13.10",
  "jsonrpsee-types",
  "lazy_static",
  "log",
@@ -2978,7 +2992,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eb1e98ba343d0b35f9009a8844cd2b87fa3192f7e79033ac05b00aeae0f3b0b5"
 dependencies = [
- "futures 0.3.12",
+ "futures 0.3.13",
  "js-sys",
  "kvdb",
  "kvdb-memorydb",
@@ -3010,9 +3024,9 @@ checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a"
 
 [[package]]
 name = "libc"
-version = "0.2.84"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cca32fa0182e8c0989459524dc356b8f2b5c10f1b9eb521b7d182c03cf8c5ff"
+checksum = "03b07a082330a35e43f63177cc01689da34fbffa0105e1246cf0311472cac73a"
 
 [[package]]
 name = "libloading"
@@ -3038,7 +3052,7 @@ checksum = "adc225a49973cf9ab10d0cdd6a4b8f0cda299df9b760824bbb623f15f8f0c95a"
 dependencies = [
  "atomic",
  "bytes 1.0.1",
- "futures 0.3.12",
+ "futures 0.3.13",
  "lazy_static",
  "libp2p-core",
  "libp2p-deflate",
@@ -3063,7 +3077,7 @@ dependencies = [
  "libp2p-yamux",
  "parity-multiaddr",
  "parking_lot 0.11.1",
- "pin-project 1.0.4",
+ "pin-project 1.0.5",
  "smallvec 1.6.1",
  "wasm-timer",
 ]
@@ -3079,7 +3093,7 @@ dependencies = [
  "ed25519-dalek",
  "either",
  "fnv",
- "futures 0.3.12",
+ "futures 0.3.13",
  "futures-timer 3.0.2",
  "lazy_static",
  "libsecp256k1",
@@ -3088,7 +3102,7 @@ dependencies = [
  "multistream-select",
  "parity-multiaddr",
  "parking_lot 0.11.1",
- "pin-project 1.0.4",
+ "pin-project 1.0.5",
  "prost",
  "prost-build",
  "rand 0.7.3",
@@ -3109,7 +3123,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d42eed63305f0420736fa487f9acef720c4528bd7852a6a760f5ccde4813345"
 dependencies = [
  "flate2",
- "futures 0.3.12",
+ "futures 0.3.13",
  "libp2p-core",
 ]
 
@@ -3119,7 +3133,7 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5153b6db68fd4baa3b304e377db744dd8fea8ff4e4504509ee636abcde88d3e3"
 dependencies = [
- "futures 0.3.12",
+ "futures 0.3.13",
  "libp2p-core",
  "log",
 ]
@@ -3132,7 +3146,7 @@ checksum = "b3c63dfa06581b24b1d12bf9815b43689a784424be217d6545c800c7c75a207f"
 dependencies = [
  "cuckoofilter",
  "fnv",
- "futures 0.3.12",
+ "futures 0.3.13",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3153,7 +3167,7 @@ dependencies = [
  "byteorder",
  "bytes 1.0.1",
  "fnv",
- "futures 0.3.12",
+ "futures 0.3.13",
  "hex_fmt",
  "libp2p-core",
  "libp2p-swarm",
@@ -3174,7 +3188,7 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b40fb36a059b7a8cce1514bd8b546fa612e006c9937caa7f5950cb20021fe91e"
 dependencies = [
- "futures 0.3.12",
+ "futures 0.3.13",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3195,7 +3209,7 @@ dependencies = [
  "bytes 1.0.1",
  "either",
  "fnv",
- "futures 0.3.12",
+ "futures 0.3.13",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3219,7 +3233,7 @@ dependencies = [
  "async-io",
  "data-encoding",
  "dns-parser",
- "futures 0.3.12",
+ "futures 0.3.13",
  "if-watch",
  "lazy_static",
  "libp2p-core",
@@ -3239,7 +3253,7 @@ checksum = "350ce8b3923594aedabd5d6e3f875d058435052a29c3f32df378bc70d10be464"
 dependencies = [
  "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
- "futures 0.3.12",
+ "futures 0.3.13",
  "libp2p-core",
  "log",
  "nohash-hasher",
@@ -3257,7 +3271,7 @@ checksum = "4aca322b52a0c5136142a7c3971446fb1e9964923a526c9cc6ef3b7c94e57778"
 dependencies = [
  "bytes 1.0.1",
  "curve25519-dalek 3.0.2",
- "futures 0.3.12",
+ "futures 0.3.13",
  "lazy_static",
  "libp2p-core",
  "log",
@@ -3277,7 +3291,7 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f3813276d0708c8db0f500d8beda1bda9ad955723b9cb272c41f4727256f73c"
 dependencies = [
- "futures 0.3.12",
+ "futures 0.3.13",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3294,7 +3308,7 @@ checksum = "9d58defcadb646ae4b033e130b48d87410bf76394dc3335496cae99dac803e61"
 dependencies = [
  "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
- "futures 0.3.12",
+ "futures 0.3.13",
  "libp2p-core",
  "log",
  "prost",
@@ -3309,9 +3323,9 @@ version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ce3374f3b28162db9d3442c9347c4f14cb01e8290052615c7d341d40eae0599"
 dependencies = [
- "futures 0.3.12",
+ "futures 0.3.13",
  "log",
- "pin-project 1.0.4",
+ "pin-project 1.0.5",
  "rand 0.7.3",
  "salsa20",
  "sha3",
@@ -3325,7 +3339,7 @@ checksum = "10e5552827c33d8326502682da73a0ba4bfa40c1b55b216af3c303f32169dd89"
 dependencies = [
  "async-trait",
  "bytes 1.0.1",
- "futures 0.3.12",
+ "futures 0.3.13",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3344,7 +3358,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7955b973e1fd2bd61ffd43ce261c1223f61f4aacd5bae362a924993f9a25fd98"
 dependencies = [
  "either",
- "futures 0.3.12",
+ "futures 0.3.13",
  "libp2p-core",
  "log",
  "rand 0.7.3",
@@ -3370,7 +3384,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "88a5aef80e519a6cb8e2663605142f97baaaea1a252eecbf8756184765f7471b"
 dependencies = [
  "async-io",
- "futures 0.3.12",
+ "futures 0.3.13",
  "futures-timer 3.0.2",
  "if-watch",
  "ipnet",
@@ -3387,7 +3401,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "80ac51ce419f60be966e02103c17f67ff5dc4422ba83ba54d251d6c62a4ed487"
 dependencies = [
  "async-std",
- "futures 0.3.12",
+ "futures 0.3.13",
  "libp2p-core",
  "log",
 ]
@@ -3398,7 +3412,7 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6149c46cb76935c80bc8be6ec6e3ebd5f5e1679765a255fb34331d54610f15dd"
 dependencies = [
- "futures 0.3.12",
+ "futures 0.3.13",
  "js-sys",
  "libp2p-core",
  "parity-send-wrapper",
@@ -3413,14 +3427,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3b1c6a3431045da8b925ed83384e4c5163e14b990572307fca9c507435d4d22"
 dependencies = [
  "either",
- "futures 0.3.12",
+ "futures 0.3.13",
  "futures-rustls",
  "libp2p-core",
  "log",
  "quicksink",
  "rw-stream-sink",
  "soketto",
- "url 2.2.0",
+ "url 2.2.1",
  "webpki-roots",
 ]
 
@@ -3430,7 +3444,7 @@ version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4819358c542a86ff95f6ae691efb4b94ddaf477079b01a686f5705b79bfc232a"
 dependencies = [
- "futures 0.3.12",
+ "futures 0.3.13",
  "libp2p-core",
  "parking_lot 0.11.1",
  "thiserror",
@@ -3619,9 +3633,9 @@ dependencies = [
 
 [[package]]
 name = "memmap2"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e73be3b7d04a0123e933fea1d50d126cc7196bbc0362c0ce426694f777194eee"
+checksum = "04e3e85b970d650e2ae6d70592474087051c11c54da7f7b4949725c5735fbcc6"
 dependencies = [
  "libc",
 ]
@@ -3675,18 +3689,18 @@ dependencies = [
 
 [[package]]
 name = "minicbor"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3265a9f5210bb726f81ef9c456ae0aff5321cd95748c0e71889b0e19d8f0332b"
+checksum = "1c2b2c73f9640fccab53947e2b3474d5071fcbc8f82cac51ddf6c8041a30a9ea"
 dependencies = [
  "minicbor-derive",
 ]
 
 [[package]]
 name = "minicbor-derive"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "130b9455e28a3f308f6579671816a6f2621e2e0cbf55dc2f886345bef699481e"
+checksum = "19ce18b5423c573a13e80cb3046ea0af6379ef725dc3af4886bdb8f4e5093068"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3695,9 +3709,9 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d"
+checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
 dependencies = [
  "adler",
  "autocfg",
@@ -3835,16 +3849,16 @@ checksum = "1255076139a83bb467426e7f8d0134968a8118844faa755985e077cf31850333"
 
 [[package]]
 name = "multistream-select"
-version = "0.10.0"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10ddc0eb0117736f19d556355464fc87efc8ad98b29e3fd84f02531eb6e90840"
+checksum = "7d91ec0a2440aaff5f78ec35631a7027d50386c6163aa975f7caa0d5da4b6ff8"
 dependencies = [
  "bytes 1.0.1",
- "futures 0.3.12",
+ "futures 0.3.13",
  "log",
- "pin-project 1.0.4",
+ "pin-project 1.0.5",
  "smallvec 1.6.1",
- "unsigned-varint 0.6.0",
+ "unsigned-varint 0.7.0",
 ]
 
 [[package]]
@@ -3854,7 +3868,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6b6147c3d50b4f3cdabfe2ecc94a0191fd3d6ad58aefd9664cf396285883486"
 dependencies = [
  "approx",
- "generic-array 0.13.2",
+ "generic-array 0.13.3",
  "matrixmultiply",
  "num-complex",
  "num-rational",
@@ -3913,7 +3927,7 @@ version = "0.8.0"
 dependencies = [
  "derive_more",
  "fs_extra",
- "futures 0.3.12",
+ "futures 0.3.13",
  "hash-db",
  "hex",
  "kvdb",
@@ -3949,7 +3963,7 @@ dependencies = [
 name = "node-browser-testing"
 version = "2.0.0"
 dependencies = [
- "futures 0.3.12",
+ "futures 0.3.13",
  "futures-timer 3.0.2",
  "jsonrpc-core",
  "libp2p",
@@ -3971,7 +3985,7 @@ dependencies = [
  "frame-benchmarking-cli",
  "frame-support",
  "frame-system",
- "futures 0.3.12",
+ "futures 0.3.13",
  "hex-literal",
  "libp2p-wasm-ext",
  "log",
@@ -4143,8 +4157,8 @@ dependencies = [
 name = "node-rpc-client"
 version = "2.0.0"
 dependencies = [
- "futures 0.1.30",
- "hyper 0.12.35",
+ "futures 0.1.31",
+ "hyper 0.12.36",
  "jsonrpc-core-client",
  "log",
  "node-primitives",
@@ -4309,7 +4323,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "fs_extra",
- "futures 0.3.12",
+ "futures 0.3.13",
  "log",
  "node-executor",
  "node-primitives",
@@ -4448,9 +4462,9 @@ checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4"
 
 [[package]]
 name = "once_cell"
-version = "1.5.2"
+version = "1.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
+checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3"
 dependencies = [
  "parking_lot 0.11.1",
 ]
@@ -4588,6 +4602,7 @@ name = "pallet-babe"
 version = "3.0.0"
 dependencies = [
  "frame-benchmarking",
+ "frame-election-provider-support",
  "frame-support",
  "frame-system",
  "log",
@@ -4604,7 +4619,6 @@ dependencies = [
  "sp-consensus-babe",
  "sp-consensus-vrf",
  "sp-core",
- "sp-election-providers",
  "sp-io",
  "sp-runtime",
  "sp-session",
@@ -4771,6 +4785,7 @@ name = "pallet-election-provider-multi-phase"
 version = "3.0.0"
 dependencies = [
  "frame-benchmarking",
+ "frame-election-provider-support",
  "frame-support",
  "frame-system",
  "hex-literal",
@@ -4783,7 +4798,6 @@ dependencies = [
  "serde",
  "sp-arithmetic",
  "sp-core",
- "sp-election-providers",
  "sp-io",
  "sp-npos-elections",
  "sp-runtime",
@@ -4900,6 +4914,7 @@ version = "3.0.0"
 dependencies = [
  "finality-grandpa",
  "frame-benchmarking",
+ "frame-election-provider-support",
  "frame-support",
  "frame-system",
  "log",
@@ -4914,7 +4929,6 @@ dependencies = [
  "serde",
  "sp-application-crypto",
  "sp-core",
- "sp-election-providers",
  "sp-finality-grandpa",
  "sp-io",
  "sp-keyring",
@@ -5014,7 +5028,7 @@ name = "pallet-mmr"
 version = "3.0.0"
 dependencies = [
  "ckb-merkle-mountain-range",
- "env_logger 0.8.2",
+ "env_logger 0.8.3",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -5130,6 +5144,7 @@ name = "pallet-offences-benchmarking"
 version = "3.0.0"
 dependencies = [
  "frame-benchmarking",
+ "frame-election-provider-support",
  "frame-support",
  "frame-system",
  "pallet-babe",
@@ -5144,7 +5159,6 @@ dependencies = [
  "parity-scale-codec",
  "serde",
  "sp-core",
- "sp-election-providers",
  "sp-io",
  "sp-runtime",
  "sp-staking",
@@ -5257,6 +5271,7 @@ name = "pallet-session-benchmarking"
 version = "3.0.0"
 dependencies = [
  "frame-benchmarking",
+ "frame-election-provider-support",
  "frame-support",
  "frame-system",
  "pallet-balances",
@@ -5268,7 +5283,6 @@ dependencies = [
  "rand 0.7.3",
  "serde",
  "sp-core",
- "sp-election-providers",
  "sp-io",
  "sp-runtime",
  "sp-session",
@@ -5297,6 +5311,7 @@ name = "pallet-staking"
 version = "3.0.0"
 dependencies = [
  "frame-benchmarking",
+ "frame-election-provider-support",
  "frame-support",
  "frame-system",
  "hex",
@@ -5312,7 +5327,6 @@ dependencies = [
  "serde",
  "sp-application-crypto",
  "sp-core",
- "sp-election-providers",
  "sp-io",
  "sp-npos-elections",
  "sp-runtime",
@@ -5328,6 +5342,7 @@ dependencies = [
 name = "pallet-staking-fuzz"
 version = "0.0.0"
 dependencies = [
+ "frame-election-provider-support",
  "frame-support",
  "frame-system",
  "honggfuzz",
@@ -5340,7 +5355,6 @@ dependencies = [
  "parity-scale-codec",
  "serde",
  "sp-core",
- "sp-election-providers",
  "sp-io",
  "sp-npos-elections",
  "sp-runtime",
@@ -5522,12 +5536,13 @@ dependencies = [
 
 [[package]]
 name = "parity-db"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "111e193c96758d476d272093a853882668da17489f76bf4361b8decae0b6c515"
+checksum = "495197c078e54b8735181aa35c00a327f7f3a3cc00a1ee8c95926dd010f0ec6b"
 dependencies = [
  "blake2-rfc",
  "crc32fast",
+ "fs2",
  "hex",
  "libc",
  "log",
@@ -5551,14 +5566,14 @@ dependencies = [
  "serde",
  "static_assertions",
  "unsigned-varint 0.7.0",
- "url 2.2.0",
+ "url 2.2.1",
 ]
 
 [[package]]
 name = "parity-scale-codec"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75c823fdae1bb5ff5708ee61a62697e6296175dc671710876871c853f48592b3"
+checksum = "0cd3dab59b5cf4bc81069ade0fc470341a1ef3ad5fa73e5a8943bed2ec12b2e8"
 dependencies = [
  "arrayvec 0.5.2",
  "bitvec",
@@ -5569,9 +5584,9 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec-derive"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9029e65297c7fd6d7013f0579e193ec2b34ae78eabca854c9417504ad8a2d214"
+checksum = "fa04976a81fde04924b40cc4036c4d12841e8bb04325a5cf2ada75731a150a7d"
 dependencies = [
  "proc-macro-crate 0.1.5",
  "proc-macro2",
@@ -5592,7 +5607,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e57fea504fea33f9fbb5f49f378359030e7e026a6ab849bb9e8f0787376f1bf"
 dependencies = [
  "bytes 0.4.12",
- "futures 0.1.30",
+ "futures 0.1.31",
  "libc",
  "log",
  "mio-named-pipes",
@@ -5661,7 +5676,7 @@ dependencies = [
  "rand 0.7.3",
  "sha-1 0.8.2",
  "slab",
- "url 2.2.0",
+ "url 2.2.1",
 ]
 
 [[package]]
@@ -5699,7 +5714,7 @@ checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
 dependencies = [
  "instant",
  "lock_api 0.4.2",
- "parking_lot_core 0.8.2",
+ "parking_lot_core 0.8.3",
 ]
 
 [[package]]
@@ -5733,14 +5748,14 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ccb628cad4f84851442432c60ad8e1f607e29752d0bf072cbd0baf28aa34272"
+checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
 dependencies = [
  "cfg-if 1.0.0",
  "instant",
  "libc",
- "redox_syscall 0.1.57",
+ "redox_syscall 0.2.5",
  "smallvec 1.6.1",
  "winapi 0.3.9",
 ]
@@ -5877,11 +5892,11 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95b70b68509f17aa2857863b6fa00bf21fc93674c7a8893de2f469f6aa7ca2f2"
+checksum = "96fa8ebb90271c4477f144354485b8068bd8f6b78b428b01ba892ca26caf0b63"
 dependencies = [
- "pin-project-internal 1.0.4",
+ "pin-project-internal 1.0.5",
 ]
 
 [[package]]
@@ -5897,9 +5912,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-internal"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caa25a6393f22ce819b0f50e0be89287292fda8d425be38ee0ca14c4931d9e71"
+checksum = "758669ae3558c6f74bd2a18b41f7ac0b5a195aea6639d6a9b5e5d1ad5ba24c0b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5914,9 +5929,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cf491442e4b033ed1c722cb9f0df5fcfcf4de682466c46469c36bc47dc5548a"
+checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905"
 
 [[package]]
 name = "pin-utils"
@@ -6232,7 +6247,7 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6"
 dependencies = [
- "env_logger 0.8.2",
+ "env_logger 0.8.3",
  "log",
  "rand 0.8.3",
 ]
@@ -6250,9 +6265,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.8"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df"
+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
 dependencies = [
  "proc-macro2",
 ]
@@ -6438,7 +6453,7 @@ checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-deque 0.8.0",
- "crossbeam-utils 0.8.1",
+ "crossbeam-utils 0.8.3",
  "lazy_static",
  "num_cpus",
 ]
@@ -6460,9 +6475,9 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
 
 [[package]]
 name = "redox_syscall"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05ec8ca9416c5ea37062b502703cd7fcb207736bc294f6e0cf367ac6fc234570"
+checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9"
 dependencies = [
  "bitflags",
 ]
@@ -6485,7 +6500,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
 dependencies = [
  "getrandom 0.2.2",
- "redox_syscall 0.2.4",
+ "redox_syscall 0.2.5",
 ]
 
 [[package]]
@@ -6564,7 +6579,7 @@ name = "remote-externalities"
 version = "0.9.0"
 dependencies = [
  "async-std",
- "env_logger 0.8.2",
+ "env_logger 0.8.3",
  "hex-literal",
  "jsonrpsee-http-client",
  "jsonrpsee-proc-macros",
@@ -6592,9 +6607,9 @@ checksum = "53552c6c49e1e13f1a203ef0080ab3bbef0beb570a528993e83df057a9d9bba1"
 
 [[package]]
 name = "ring"
-version = "0.16.19"
+version = "0.16.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "024a1e66fea74c66c66624ee5622a7ff0e4b73a13b4f5c326ddb50c708944226"
+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
 dependencies = [
  "cc",
  "libc",
@@ -6634,7 +6649,7 @@ dependencies = [
  "base64 0.13.0",
  "blake2b_simd",
  "constant_time_eq",
- "crossbeam-utils 0.8.1",
+ "crossbeam-utils 0.8.3",
 ]
 
 [[package]]
@@ -6714,7 +6729,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020"
 dependencies = [
- "futures 0.3.12",
+ "futures 0.3.13",
  "pin-project 0.4.27",
  "static_assertions",
 ]
@@ -6759,7 +6774,7 @@ dependencies = [
  "async-trait",
  "derive_more",
  "either",
- "futures 0.3.12",
+ "futures 0.3.13",
  "futures-timer 3.0.2",
  "libp2p",
  "log",
@@ -6787,7 +6802,7 @@ dependencies = [
 name = "sc-basic-authorship"
 version = "0.9.0"
 dependencies = [
- "futures 0.3.12",
+ "futures 0.3.13",
  "futures-timer 3.0.2",
  "log",
  "parity-scale-codec",
@@ -6861,7 +6876,7 @@ version = "0.9.0"
 dependencies = [
  "chrono",
  "fdlimit",
- "futures 0.3.12",
+ "futures 0.3.13",
  "hex",
  "libp2p",
  "log",
@@ -6899,7 +6914,7 @@ version = "3.0.0"
 dependencies = [
  "derive_more",
  "fnv",
- "futures 0.3.12",
+ "futures 0.3.13",
  "hash-db",
  "kvdb",
  "kvdb-memorydb",
@@ -6979,7 +6994,7 @@ name = "sc-consensus-aura"
 version = "0.9.0"
 dependencies = [
  "derive_more",
- "futures 0.3.12",
+ "futures 0.3.13",
  "futures-timer 3.0.2",
  "getrandom 0.2.2",
  "log",
@@ -7021,7 +7036,7 @@ version = "0.9.0"
 dependencies = [
  "derive_more",
  "fork-tree",
- "futures 0.3.12",
+ "futures 0.3.13",
  "futures-timer 3.0.2",
  "log",
  "merlin",
@@ -7075,7 +7090,7 @@ name = "sc-consensus-babe-rpc"
 version = "0.9.0"
 dependencies = [
  "derive_more",
- "futures 0.3.12",
+ "futures 0.3.13",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -7117,7 +7132,7 @@ version = "0.9.0"
 dependencies = [
  "assert_matches",
  "derive_more",
- "futures 0.3.12",
+ "futures 0.3.13",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -7154,7 +7169,7 @@ name = "sc-consensus-pow"
 version = "0.9.0"
 dependencies = [
  "derive_more",
- "futures 0.3.12",
+ "futures 0.3.13",
  "futures-timer 3.0.2",
  "log",
  "parity-scale-codec",
@@ -7176,7 +7191,7 @@ dependencies = [
 name = "sc-consensus-slots"
 version = "0.9.0"
 dependencies = [
- "futures 0.3.12",
+ "futures 0.3.13",
  "futures-timer 3.0.2",
  "log",
  "parity-scale-codec",
@@ -7307,13 +7322,13 @@ dependencies = [
  "dyn-clone",
  "finality-grandpa",
  "fork-tree",
- "futures 0.3.12",
+ "futures 0.3.13",
  "futures-timer 3.0.2",
  "linked-hash-map",
  "log",
  "parity-scale-codec",
  "parking_lot 0.11.1",
- "pin-project 1.0.4",
+ "pin-project 1.0.5",
  "rand 0.7.3",
  "sc-block-builder",
  "sc-client-api",
@@ -7351,7 +7366,7 @@ version = "0.9.0"
 dependencies = [
  "derive_more",
  "finality-grandpa",
- "futures 0.3.12",
+ "futures 0.3.13",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -7381,7 +7396,7 @@ version = "0.9.0"
 dependencies = [
  "derive_more",
  "finality-grandpa",
- "futures 0.3.12",
+ "futures 0.3.13",
  "log",
  "num-traits",
  "parity-scale-codec",
@@ -7406,7 +7421,7 @@ name = "sc-informant"
 version = "0.9.0"
 dependencies = [
  "ansi_term 0.12.1",
- "futures 0.3.12",
+ "futures 0.3.13",
  "log",
  "parity-util-mem",
  "sc-client-api",
@@ -7424,7 +7439,7 @@ version = "3.0.0"
 dependencies = [
  "async-trait",
  "derive_more",
- "futures 0.3.12",
+ "futures 0.3.13",
  "futures-util",
  "hex",
  "merlin",
@@ -7473,7 +7488,7 @@ dependencies = [
  "erased-serde",
  "fnv",
  "fork-tree",
- "futures 0.3.12",
+ "futures 0.3.13",
  "futures-timer 3.0.2",
  "hex",
  "ip_network",
@@ -7485,7 +7500,7 @@ dependencies = [
  "nohash-hasher",
  "parity-scale-codec",
  "parking_lot 0.11.1",
- "pin-project 1.0.4",
+ "pin-project 1.0.5",
  "prost",
  "prost-build",
  "quickcheck",
@@ -7521,7 +7536,7 @@ name = "sc-network-gossip"
 version = "0.9.0"
 dependencies = [
  "async-std",
- "futures 0.3.12",
+ "futures 0.3.13",
  "futures-timer 3.0.2",
  "libp2p",
  "log",
@@ -7540,7 +7555,7 @@ name = "sc-network-test"
 version = "0.8.0"
 dependencies = [
  "async-std",
- "futures 0.3.12",
+ "futures 0.3.13",
  "futures-timer 3.0.2",
  "libp2p",
  "log",
@@ -7568,10 +7583,10 @@ version = "3.0.0"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
- "futures 0.3.12",
+ "futures 0.3.13",
  "futures-timer 3.0.2",
  "hex",
- "hyper 0.13.9",
+ "hyper 0.13.10",
  "hyper-rustls",
  "lazy_static",
  "log",
@@ -7602,7 +7617,7 @@ dependencies = [
 name = "sc-peerset"
 version = "3.0.0"
 dependencies = [
- "futures 0.3.12",
+ "futures 0.3.13",
  "libp2p",
  "log",
  "rand 0.7.3",
@@ -7624,8 +7639,8 @@ name = "sc-rpc"
 version = "3.0.0"
 dependencies = [
  "assert_matches",
- "futures 0.1.30",
- "futures 0.3.12",
+ "futures 0.1.31",
+ "futures 0.3.13",
  "hash-db",
  "jsonrpc-core",
  "jsonrpc-pubsub",
@@ -7666,7 +7681,7 @@ name = "sc-rpc-api"
 version = "0.9.0"
 dependencies = [
  "derive_more",
- "futures 0.3.12",
+ "futures 0.3.13",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -7688,7 +7703,7 @@ dependencies = [
 name = "sc-rpc-server"
 version = "3.0.0"
 dependencies = [
- "futures 0.1.30",
+ "futures 0.1.31",
  "jsonrpc-core",
  "jsonrpc-http-server",
  "jsonrpc-ipc-server",
@@ -7722,8 +7737,8 @@ dependencies = [
  "async-std",
  "directories",
  "exit-future",
- "futures 0.1.30",
- "futures 0.3.12",
+ "futures 0.1.31",
+ "futures 0.3.13",
  "futures-timer 3.0.2",
  "hash-db",
  "jsonrpc-core",
@@ -7733,7 +7748,7 @@ dependencies = [
  "parity-scale-codec",
  "parity-util-mem",
  "parking_lot 0.11.1",
- "pin-project 1.0.4",
+ "pin-project 1.0.5",
  "rand 0.7.3",
  "sc-block-builder",
  "sc-chain-spec",
@@ -7789,8 +7804,8 @@ name = "sc-service-test"
 version = "2.0.0"
 dependencies = [
  "fdlimit",
- "futures 0.1.30",
- "futures 0.3.12",
+ "futures 0.1.31",
+ "futures 0.3.13",
  "hex-literal",
  "log",
  "parity-scale-codec",
@@ -7858,11 +7873,11 @@ name = "sc-telemetry"
 version = "3.0.0"
 dependencies = [
  "chrono",
- "futures 0.3.12",
+ "futures 0.3.13",
  "libp2p",
  "log",
  "parking_lot 0.11.1",
- "pin-project 1.0.4",
+ "pin-project 1.0.5",
  "rand 0.7.3",
  "serde",
  "serde_json",
@@ -7915,7 +7930,7 @@ dependencies = [
  "assert_matches",
  "criterion",
  "derive_more",
- "futures 0.3.12",
+ "futures 0.3.13",
  "linked-hash-map",
  "log",
  "parity-scale-codec",
@@ -7938,7 +7953,7 @@ name = "sc-transaction-pool"
 version = "3.0.0"
 dependencies = [
  "assert_matches",
- "futures 0.3.12",
+ "futures 0.3.13",
  "futures-diagnose",
  "hex",
  "intervalier",
@@ -8125,9 +8140,9 @@ checksum = "930c0acf610d3fdb5e2ab6213019aaa04e227ebe9547b0649ba599b16d788bd7"
 
 [[package]]
 name = "serde"
-version = "1.0.123"
+version = "1.0.124"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae"
+checksum = "bd761ff957cb2a45fbb9ab3da6512de9de55872866160b23c25f1a841e99d29f"
 dependencies = [
  "serde_derive",
 ]
@@ -8144,9 +8159,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.123"
+version = "1.0.124"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31"
+checksum = "1800f7693e94e186f5e25a28291ae1570da908aff7d97a095dec1e56ff99069b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8155,9 +8170,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.61"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a"
+checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79"
 dependencies = [
  "itoa",
  "ryu",
@@ -8178,9 +8193,9 @@ dependencies = [
 
 [[package]]
 name = "sha-1"
-version = "0.9.2"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce3cdf1b5e620a498ee6f2a171885ac7e22f0e12089ec4b3d22b84921792507c"
+checksum = "dfebf75d25bd900fd1e7d11501efab59bc846dbc76196839663e6637bba9f25f"
 dependencies = [
  "block-buffer 0.9.0",
  "cfg-if 1.0.0",
@@ -8243,9 +8258,9 @@ checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
 
 [[package]]
 name = "signal-hook"
-version = "0.1.17"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e31d442c16f047a671b5a71e2161d6e68814012b7f5379d269ebd915fac2729"
+checksum = "8a7f3f92a1da3d6b1d32245d0cbcbbab0cfc45996d8df619c42bccfa6d2bbb5f"
 dependencies = [
  "libc",
  "signal-hook-registry",
@@ -8337,11 +8352,11 @@ dependencies = [
  "base64 0.12.3",
  "bytes 0.5.6",
  "flate2",
- "futures 0.3.12",
+ "futures 0.3.13",
  "httparse",
  "log",
  "rand 0.7.3",
- "sha-1 0.9.2",
+ "sha-1 0.9.4",
 ]
 
 [[package]]
@@ -8490,7 +8505,7 @@ dependencies = [
 name = "sp-blockchain"
 version = "3.0.0"
 dependencies = [
- "futures 0.3.12",
+ "futures 0.3.13",
  "log",
  "lru",
  "parity-scale-codec",
@@ -8515,7 +8530,7 @@ dependencies = [
 name = "sp-consensus"
 version = "0.9.0"
 dependencies = [
- "futures 0.3.12",
+ "futures 0.3.13",
  "futures-timer 3.0.2",
  "libp2p",
  "log",
@@ -8612,7 +8627,7 @@ dependencies = [
  "criterion",
  "dyn-clonable",
  "ed25519-dalek",
- "futures 0.3.12",
+ "futures 0.3.13",
  "hash-db",
  "hash256-std-hasher",
  "hex",
@@ -8668,17 +8683,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "sp-election-providers"
-version = "3.0.0"
-dependencies = [
- "parity-scale-codec",
- "sp-arithmetic",
- "sp-npos-elections",
- "sp-runtime",
- "sp-std",
-]
-
 [[package]]
 name = "sp-externalities"
 version = "0.9.0"
@@ -8720,7 +8724,7 @@ dependencies = [
 name = "sp-io"
 version = "3.0.0"
 dependencies = [
- "futures 0.3.12",
+ "futures 0.3.13",
  "hash-db",
  "libsecp256k1",
  "log",
@@ -8755,7 +8759,7 @@ version = "0.9.0"
 dependencies = [
  "async-trait",
  "derive_more",
- "futures 0.3.12",
+ "futures 0.3.13",
  "merlin",
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -9065,7 +9069,7 @@ name = "sp-transaction-pool"
 version = "3.0.0"
 dependencies = [
  "derive_more",
- "futures 0.3.12",
+ "futures 0.3.13",
  "log",
  "parity-scale-codec",
  "serde",
@@ -9097,7 +9101,7 @@ dependencies = [
 name = "sp-utils"
 version = "3.0.0"
 dependencies = [
- "futures 0.3.12",
+ "futures 0.3.13",
  "futures-core",
  "futures-timer 3.0.2",
  "lazy_static",
@@ -9249,8 +9253,8 @@ version = "0.9.0"
 dependencies = [
  "chrono",
  "console_error_panic_hook",
- "futures 0.1.30",
- "futures 0.3.12",
+ "futures 0.1.31",
+ "futures 0.3.13",
  "futures-timer 3.0.2",
  "getrandom 0.2.2",
  "js-sys",
@@ -9292,7 +9296,7 @@ version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
- "futures 0.3.12",
+ "futures 0.3.13",
  "jsonrpc-client-transports",
  "jsonrpc-core",
  "parity-scale-codec",
@@ -9307,7 +9311,7 @@ name = "substrate-frame-rpc-system"
 version = "3.0.0"
 dependencies = [
  "frame-system-rpc-runtime-api",
- "futures 0.3.12",
+ "futures 0.3.13",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -9334,7 +9338,7 @@ dependencies = [
  "async-std",
  "derive_more",
  "futures-util",
- "hyper 0.13.9",
+ "hyper 0.13.10",
  "log",
  "prometheus",
  "tokio 0.2.25",
@@ -9344,8 +9348,8 @@ dependencies = [
 name = "substrate-test-client"
 version = "2.0.1"
 dependencies = [
- "futures 0.1.30",
- "futures 0.3.12",
+ "futures 0.1.31",
+ "futures 0.3.13",
  "hash-db",
  "hex",
  "parity-scale-codec",
@@ -9414,7 +9418,7 @@ dependencies = [
 name = "substrate-test-runtime-client"
 version = "2.0.0"
 dependencies = [
- "futures 0.3.12",
+ "futures 0.3.13",
  "parity-scale-codec",
  "sc-block-builder",
  "sc-client-api",
@@ -9435,7 +9439,7 @@ name = "substrate-test-runtime-transaction-pool"
 version = "2.0.0"
 dependencies = [
  "derive_more",
- "futures 0.3.12",
+ "futures 0.3.13",
  "parity-scale-codec",
  "parking_lot 0.11.1",
  "sc-transaction-graph",
@@ -9449,7 +9453,7 @@ dependencies = [
 name = "substrate-test-utils"
 version = "3.0.0"
 dependencies = [
- "futures 0.3.12",
+ "futures 0.3.13",
  "sc-service",
  "substrate-test-utils-derive",
  "tokio 0.2.25",
@@ -9502,9 +9506,9 @@ checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2"
 
 [[package]]
 name = "syn"
-version = "1.0.60"
+version = "1.0.62"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081"
+checksum = "123a78a3596b24fee53a6464ce52d8ecbf62241e6294c7e7fe12086cd161f512"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9531,15 +9535,15 @@ checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
 
 [[package]]
 name = "tap"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36474e732d1affd3a6ed582781b3683df3d0563714c59c39591e8ff707cf078e"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "target-lexicon"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ee5a98e506fb7231a304c3a1bd7c132a55016cf65001e0282480665870dfcb9"
+checksum = "422045212ea98508ae3d28025bc5aaa2bd4a9cdaecd442a08da2ee620ee9ea95"
 
 [[package]]
 name = "tempfile"
@@ -9550,7 +9554,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "libc",
  "rand 0.8.3",
- "redox_syscall 0.2.4",
+ "redox_syscall 0.2.5",
  "remove_dir_all",
  "winapi 0.3.9",
 ]
@@ -9651,9 +9655,9 @@ dependencies = [
 
 [[package]]
 name = "tinytemplate"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2ada8616fad06a2d0c455adc530de4ef57605a8120cc65da9653e0e9623ca74"
+checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
 dependencies = [
  "serde",
  "serde_json",
@@ -9681,7 +9685,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6"
 dependencies = [
  "bytes 0.4.12",
- "futures 0.1.30",
+ "futures 0.1.31",
  "mio",
  "num_cpus",
  "tokio-codec",
@@ -9729,7 +9733,7 @@ checksum = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46"
 dependencies = [
  "bytes 0.4.12",
  "either",
- "futures 0.1.30",
+ "futures 0.1.31",
 ]
 
 [[package]]
@@ -9739,7 +9743,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25b2998660ba0e70d18684de5d06b70b70a3a747469af9dea7618cc59e75976b"
 dependencies = [
  "bytes 0.4.12",
- "futures 0.1.30",
+ "futures 0.1.31",
  "tokio-io",
 ]
 
@@ -9749,7 +9753,7 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e"
 dependencies = [
- "futures 0.1.30",
+ "futures 0.1.31",
  "tokio-executor",
 ]
 
@@ -9760,7 +9764,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671"
 dependencies = [
  "crossbeam-utils 0.7.2",
- "futures 0.1.30",
+ "futures 0.1.31",
 ]
 
 [[package]]
@@ -9769,7 +9773,7 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "297a1206e0ca6302a0eed35b700d292b275256f596e2f3fea7729d5e629b6ff4"
 dependencies = [
- "futures 0.1.30",
+ "futures 0.1.31",
  "tokio-io",
  "tokio-threadpool",
 ]
@@ -9781,7 +9785,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674"
 dependencies = [
  "bytes 0.4.12",
- "futures 0.1.30",
+ "futures 0.1.31",
  "log",
 ]
 
@@ -9803,7 +9807,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d282d483052288b2308ba5ee795f5673b159c9bdf63c385a05609da782a5eae"
 dependencies = [
  "bytes 0.4.12",
- "futures 0.1.30",
+ "futures 0.1.31",
  "mio",
  "mio-named-pipes",
  "tokio 0.1.22",
@@ -9816,7 +9820,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351"
 dependencies = [
  "crossbeam-utils 0.7.2",
- "futures 0.1.30",
+ "futures 0.1.31",
  "lazy_static",
  "log",
  "mio",
@@ -9846,7 +9850,7 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24da22d077e0f15f55162bdbdc661228c1581892f52074fb242678d015b45162"
 dependencies = [
- "futures 0.1.30",
+ "futures 0.1.31",
 ]
 
 [[package]]
@@ -9856,7 +9860,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee"
 dependencies = [
  "fnv",
- "futures 0.1.30",
+ "futures 0.1.31",
 ]
 
 [[package]]
@@ -9866,7 +9870,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72"
 dependencies = [
  "bytes 0.4.12",
- "futures 0.1.30",
+ "futures 0.1.31",
  "iovec",
  "mio",
  "tokio-io",
@@ -9882,7 +9886,7 @@ dependencies = [
  "crossbeam-deque 0.7.3",
  "crossbeam-queue",
  "crossbeam-utils 0.7.2",
- "futures 0.1.30",
+ "futures 0.1.31",
  "lazy_static",
  "log",
  "num_cpus",
@@ -9897,7 +9901,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296"
 dependencies = [
  "crossbeam-utils 0.7.2",
- "futures 0.1.30",
+ "futures 0.1.31",
  "slab",
  "tokio-executor",
 ]
@@ -9909,7 +9913,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82"
 dependencies = [
  "bytes 0.4.12",
- "futures 0.1.30",
+ "futures 0.1.31",
  "log",
  "mio",
  "tokio-codec",
@@ -9924,7 +9928,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab57a4ac4111c8c9dbcf70779f6fc8bc35ae4b2454809febac840ad19bd7e4e0"
 dependencies = [
  "bytes 0.4.12",
- "futures 0.1.30",
+ "futures 0.1.31",
  "iovec",
  "libc",
  "log",
@@ -9972,16 +9976,16 @@ checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f"
 dependencies = [
  "cfg-if 1.0.0",
  "log",
- "pin-project-lite 0.2.5",
+ "pin-project-lite 0.2.6",
  "tracing-attributes",
  "tracing-core",
 ]
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.14"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41768be5b9f3489491825f56f01f25290aa1d3e7cc97e182d4d34360493ba6fa"
+checksum = "a8a9bd1db7706f2373a190b0d067146caa39350c486f3d455b0e33b431f94c07"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9999,19 +10003,19 @@ dependencies = [
 
 [[package]]
 name = "tracing-futures"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c"
+checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
 dependencies = [
- "pin-project 0.4.27",
+ "pin-project 1.0.5",
  "tracing",
 ]
 
 [[package]]
 name = "tracing-log"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e0f8c7178e13481ff6765bd169b33e8d554c5d2bbede5e32c356194be02b9b9"
+checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3"
 dependencies = [
  "lazy_static",
  "log",
@@ -10030,9 +10034,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1fa8f0c8f4c594e4fc9debc1990deab13238077271ba84dd853d54902ee3401"
+checksum = "8ab8966ac3ca27126141f7999361cc97dd6fb4b71da04c02044fa9045d98bb96"
 dependencies = [
  "ansi_term 0.12.1",
  "chrono",
@@ -10133,9 +10137,9 @@ dependencies = [
 
 [[package]]
 name = "trybuild"
-version = "1.0.39"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c9594b802f041389d2baac680663573dde3103bb4a4926d61d6aba689465978"
+checksum = "99471a206425fba51842a9186315f32d91c56eadc21ea4c21f847b59cf778f8b"
 dependencies = [
  "dissimilar",
  "glob",
@@ -10201,9 +10205,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.16"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606"
+checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef"
 dependencies = [
  "tinyvec",
 ]
@@ -10285,12 +10289,12 @@ dependencies = [
 
 [[package]]
 name = "url"
-version = "2.2.0"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e"
+checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b"
 dependencies = [
  "form_urlencoded",
- "idna 0.2.0",
+ "idna 0.2.2",
  "matches",
  "percent-encoding 2.1.0",
 ]
@@ -10366,7 +10370,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230"
 dependencies = [
- "futures 0.1.30",
+ "futures 0.1.31",
  "log",
  "try-lock",
 ]
@@ -10422,9 +10426,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.19"
+version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fe9756085a84584ee9457a002b7cdfe0bfff169f45d2591d8be1345a6780e35"
+checksum = "3de431a2910c86679c34283a33f66f4e4abd7e0aec27b6669060148872aadf94"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
@@ -10463,9 +10467,9 @@ checksum = "dd4945e4943ae02d15c13962b38a5b1e81eadd4b71214eee75af64a4d6a4fd64"
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.19"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0355fa0c1f9b792a09b6dcb6a8be24d51e71e6d74972f9eb4a44c4c004d24a25"
+checksum = "f0d4da138503a4cf86801b94d95781ee3619faa8feca830569cc6b54997b8b5c"
 dependencies = [
  "console_error_panic_hook",
  "js-sys",
@@ -10477,9 +10481,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.19"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27e07b46b98024c2ba2f9e83a10c2ef0515f057f2da299c1762a2017de80438b"
+checksum = "c3199c33f06500c731d5544664c24d0c2b742b98debc6b1c6f0c6d6e8fb7c19b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10502,7 +10506,7 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f"
 dependencies = [
- "futures 0.3.12",
+ "futures 0.3.13",
  "js-sys",
  "parking_lot 0.11.1",
  "pin-utils",
@@ -10730,27 +10734,27 @@ dependencies = [
 
 [[package]]
 name = "wast"
-version = "32.0.0"
+version = "35.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c24a3ee360d01d60ed0a0f960ab76a6acce64348cdb0bf8699c2a866fad57c7c"
+checksum = "db5ae96da18bb5926341516fd409b5a8ce4e4714da7f0a1063d3b20ac9f9a1e1"
 dependencies = [
  "leb128",
 ]
 
 [[package]]
 name = "wat"
-version = "1.0.33"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e8f7f34773fa6318e8897283abf7941c1f250faae4e1a52f82df09c3bad7cce"
+checksum = "0b0fa059022c5dabe129f02b429d67086400deb8277f89c975555dacc1dadbcc"
 dependencies = [
  "wast",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.46"
+version = "0.3.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "222b1ef9334f92a21d3fb53dc3fd80f30836959a90f9274a626d7e06315ba3c3"
+checksum = "c40dc691fc48003eba817c38da7113c15698142da971298003cac3ef175680b3"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -10879,7 +10883,7 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1cc7bd8c983209ed5d527f44b01c41b7dc146fd960c61cf9e1d25399841dc271"
 dependencies = [
- "futures 0.3.12",
+ "futures 0.3.13",
  "log",
  "nohash-hasher",
  "parking_lot 0.11.1",
diff --git a/Cargo.toml b/Cargo.toml
index 4d8cfc3e9754..ef2613979518 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -76,6 +76,7 @@ members = [
 	"frame/try-runtime",
 	"frame/elections",
 	"frame/election-provider-multi-phase",
+	"frame/election-provider-support",
 	"frame/example",
 	"frame/example-offchain-worker",
 	"frame/example-parallel",
@@ -145,7 +146,6 @@ members = [
 	"primitives/database",
 	"primitives/debug-derive",
 	"primitives/externalities",
-	"primitives/election-providers",
 	"primitives/finality-grandpa",
 	"primitives/inherents",
 	"primitives/io",
diff --git a/frame/babe/Cargo.toml b/frame/babe/Cargo.toml
index 6c7bb508b53d..f7bebce98acf 100644
--- a/frame/babe/Cargo.toml
+++ b/frame/babe/Cargo.toml
@@ -37,7 +37,7 @@ pallet-offences = { version = "3.0.0", path = "../offences" }
 pallet-staking = { version = "3.0.0", path = "../staking" }
 pallet-staking-reward-curve = { version = "3.0.0", path = "../staking/reward-curve" }
 sp-core = { version = "3.0.0", path = "../../primitives/core" }
-sp-election-providers = { version = "3.0.0", path = "../../primitives/election-providers" }
+frame-election-provider-support = { version = "3.0.0", path = "../election-provider-support" }
 
 [features]
 default = ["std"]
diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index c46b55c2c4ac..ef7a748c60b9 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -37,7 +37,7 @@ use sp_consensus_babe::{AuthorityId, AuthorityPair, Slot};
 use sp_consensus_vrf::schnorrkel::{VRFOutput, VRFProof};
 use sp_staking::SessionIndex;
 use pallet_staking::EraIndex;
-use sp_election_providers::onchain;
+use frame_election_provider_support::onchain;
 use pallet_session::historical as pallet_session_historical;
 
 type DummyValidatorId = u64;
@@ -187,6 +187,7 @@ parameter_types! {
 impl onchain::Config for Test {
 	type AccountId = <Self as frame_system::Config>::AccountId;
 	type BlockNumber = <Self as frame_system::Config>::BlockNumber;
+	type BlockWeights = ();
 	type Accuracy = Perbill;
 	type DataProvider = Staking;
 }
diff --git a/frame/election-provider-multi-phase/Cargo.toml b/frame/election-provider-multi-phase/Cargo.toml
index 1d63f9df40a2..4b5178faa8e8 100644
--- a/frame/election-provider-multi-phase/Cargo.toml
+++ b/frame/election-provider-multi-phase/Cargo.toml
@@ -26,7 +26,7 @@ sp-std = { version = "3.0.0", default-features = false, path = "../../primitives
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
 sp-npos-elections = { version = "3.0.0", default-features = false, path = "../../primitives/npos-elections" }
 sp-arithmetic = { version = "3.0.0", default-features = false, path = "../../primitives/arithmetic" }
-sp-election-providers = { version = "3.0.0", default-features = false, path = "../../primitives/election-providers" }
+frame-election-provider-support = { version = "3.0.0", default-features = false, path = "../election-provider-support" }
 
 # Optional imports for benchmarking
 frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
@@ -41,9 +41,9 @@ substrate-test-utils = { version = "3.0.0", path = "../../test-utils" }
 sp-io = { version = "3.0.0", path = "../../primitives/io" }
 sp-core = { version = "3.0.0", path = "../../primitives/core" }
 sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
-sp-election-providers = { version = "3.0.0", features = ["runtime-benchmarks"], path = "../../primitives/election-providers" }
+frame-election-provider-support = { version = "3.0.0", features = ["runtime-benchmarks"], path = "../election-provider-support" }
 pallet-balances = { version = "3.0.0", path = "../balances" }
-frame-benchmarking = { path = "../benchmarking" , version = "3.1.0"}
+frame-benchmarking = { version = "3.1.0", path = "../benchmarking" }
 
 [features]
 default = ["std"]
@@ -60,7 +60,7 @@ std = [
 	"sp-runtime/std",
 	"sp-npos-elections/std",
 	"sp-arithmetic/std",
-	"sp-election-providers/std",
+	"frame-election-provider-support/std",
 	"log/std",
 ]
 runtime-benchmarks = [
diff --git a/frame/election-provider-multi-phase/src/benchmarking.rs b/frame/election-provider-multi-phase/src/benchmarking.rs
index 74db28c6e392..3b1b7bd7a229 100644
--- a/frame/election-provider-multi-phase/src/benchmarking.rs
+++ b/frame/election-provider-multi-phase/src/benchmarking.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,17 +19,16 @@
 
 use super::*;
 use crate::Module as MultiPhase;
-
-pub use frame_benchmarking::{account, benchmarks, whitelist_account, whitelisted_caller};
+use frame_benchmarking::impl_benchmark_test_suite;
 use frame_support::{assert_ok, traits::OnInitialize};
 use frame_system::RawOrigin;
 use rand::{prelude::SliceRandom, rngs::SmallRng, SeedableRng};
-use sp_election_providers::Assignment;
+use frame_election_provider_support::Assignment;
 use sp_arithmetic::traits::One;
 use sp_runtime::InnerOf;
 use sp_std::convert::TryInto;
 
-const SEED: u32 = 0;
+const SEED: u32 = 999;
 
 /// Creates a **valid** solution with exactly the given size.
 ///
@@ -55,9 +54,9 @@ fn solution_with_size<T: Config>(
 
 	// first generates random targets.
 	let targets: Vec<T::AccountId> =
-		(0..size.targets).map(|i| account("Targets", i, SEED)).collect();
+		(0..size.targets).map(|i| frame_benchmarking::account("Targets", i, SEED)).collect();
 
-	let mut rng = SmallRng::seed_from_u64(999u64);
+	let mut rng = SmallRng::seed_from_u64(SEED as u64);
 
 	// decide who are the winners.
 	let winners = targets
@@ -75,7 +74,7 @@ fn solution_with_size<T: Config>(
 				.choose_multiple(&mut rng, <CompactOf<T>>::LIMIT)
 				.cloned()
 				.collect::<Vec<_>>();
-			let voter = account::<T::AccountId>("Voter", i, SEED);
+			let voter = frame_benchmarking::account::<T::AccountId>("Voter", i, SEED);
 			(voter, stake, winner_votes)
 		})
 		.collect::<Vec<_>>();
@@ -89,7 +88,7 @@ fn solution_with_size<T: Config>(
 				.choose_multiple(&mut rng, <CompactOf<T>>::LIMIT)
 				.cloned()
 				.collect::<Vec<T::AccountId>>();
-			let voter = account::<T::AccountId>("Voter", i, SEED);
+			let voter = frame_benchmarking::account::<T::AccountId>("Voter", i, SEED);
 			(voter, stake, votes)
 		})
 		.collect::<Vec<_>>();
@@ -109,8 +108,9 @@ fn solution_with_size<T: Config>(
 	<DesiredTargets<T>>::put(desired_targets);
 	<Snapshot<T>>::put(RoundSnapshot { voters: all_voters.clone(), targets: targets.clone() });
 
-	// write the snapshot to staking or whoever is the data provider.
-	T::DataProvider::put_snapshot(all_voters.clone(), targets.clone());
+	// write the snapshot to staking or whoever is the data provider, in case it is needed further
+	// down the road.
+	T::DataProvider::put_snapshot(all_voters.clone(), targets.clone(), Some(stake));
 
 	let cache = helpers::generate_voter_cache::<T>(&all_voters);
 	let stake_of = helpers::stake_of_fn::<T>(&all_voters, &cache);
@@ -138,10 +138,12 @@ fn solution_with_size<T: Config>(
 		<CompactOf<T>>::from_assignment(assignments, &voter_index, &target_index).unwrap();
 	let score = compact.clone().score(&winners, stake_of, voter_at, target_at).unwrap();
 	let round = <MultiPhase<T>>::round();
+
+	assert!(score[0] > 0, "score is zero, this probably means that the stakes are not set.");
 	RawSolution { compact, score, round }
 }
 
-benchmarks! {
+frame_benchmarking::benchmarks! {
 	on_initialize_nothing {
 		assert!(<MultiPhase<T>>::current_phase().is_off());
 	}: {
@@ -157,7 +159,7 @@ benchmarks! {
 		assert!(<MultiPhase<T>>::snapshot().is_none());
 		assert!(<MultiPhase<T>>::current_phase().is_off());
 	}: {
-		<MultiPhase<T>>::on_initialize_open_signed();
+		<MultiPhase<T>>::on_initialize_open_signed().unwrap();
 	} verify {
 		assert!(<MultiPhase<T>>::snapshot().is_some());
 		assert!(<MultiPhase<T>>::current_phase().is_signed());
@@ -167,7 +169,7 @@ benchmarks! {
 		assert!(<MultiPhase<T>>::snapshot().is_none());
 		assert!(<MultiPhase<T>>::current_phase().is_off());
 	}: {
-		<MultiPhase<T>>::on_initialize_open_unsigned(true, true, 1u32.into());
+		<MultiPhase<T>>::on_initialize_open_unsigned(true, true, 1u32.into()).unwrap();
 	} verify {
 		assert!(<MultiPhase<T>>::snapshot().is_some());
 		assert!(<MultiPhase<T>>::current_phase().is_unsigned());
@@ -175,21 +177,51 @@ benchmarks! {
 
 	on_initialize_open_unsigned_without_snapshot {
 		// need to assume signed phase was open before
-		<MultiPhase<T>>::on_initialize_open_signed();
+		<MultiPhase<T>>::on_initialize_open_signed().unwrap();
 		assert!(<MultiPhase<T>>::snapshot().is_some());
 		assert!(<MultiPhase<T>>::current_phase().is_signed());
 	}: {
-		<MultiPhase<T>>::on_initialize_open_unsigned(false, true, 1u32.into());
+		<MultiPhase<T>>::on_initialize_open_unsigned(false, true, 1u32.into()).unwrap();
 	} verify {
 		assert!(<MultiPhase<T>>::snapshot().is_some());
 		assert!(<MultiPhase<T>>::current_phase().is_unsigned());
 	}
 
+	// a call to `<Pallet as ElectionProvider>::elect` where we only return the queued solution.
+	elect_queued {
+		// assume largest values for the election status. These will merely affect the decoding.
+		let v = T::BenchmarkingConfig::VOTERS[1];
+		let t = T::BenchmarkingConfig::TARGETS[1];
+		let a = T::BenchmarkingConfig::ACTIVE_VOTERS[1];
+		let d = T::BenchmarkingConfig::DESIRED_TARGETS[1];
+
+		let witness = SolutionOrSnapshotSize { voters: v, targets: t };
+		let raw_solution = solution_with_size::<T>(witness, a, d);
+		let ready_solution =
+			<MultiPhase<T>>::feasibility_check(raw_solution, ElectionCompute::Signed).unwrap();
+
+		// these are set by the `solution_with_size` function.
+		assert!(<DesiredTargets<T>>::get().is_some());
+		assert!(<Snapshot<T>>::get().is_some());
+		assert!(<SnapshotMetadata<T>>::get().is_some());
+		<CurrentPhase<T>>::put(Phase::Signed);
+		// assume a queued solution is stored, regardless of where it comes from.
+		<QueuedSolution<T>>::put(ready_solution);
+	}: {
+		let _ = <MultiPhase<T> as ElectionProvider<T::AccountId, T::BlockNumber>>::elect();
+	} verify {
+		assert!(<MultiPhase<T>>::queued_solution().is_none());
+		assert!(<DesiredTargets<T>>::get().is_none());
+		assert!(<Snapshot<T>>::get().is_none());
+		assert!(<SnapshotMetadata<T>>::get().is_none());
+		assert_eq!(<CurrentPhase<T>>::get(), <Phase<T::BlockNumber>>::Off);
+	}
+
 	#[extra]
 	create_snapshot {
 		assert!(<MultiPhase<T>>::snapshot().is_none());
 	}: {
-		<MultiPhase::<T>>::create_snapshot()
+		<MultiPhase::<T>>::create_snapshot().unwrap()
 	} verify {
 		assert!(<MultiPhase<T>>::snapshot().is_some());
 	}
@@ -248,35 +280,8 @@ benchmarks! {
 	}
 }
 
-#[cfg(test)]
-mod test {
-	use super::*;
-	use crate::mock::*;
-
-	#[test]
-	fn test_benchmarks() {
-		ExtBuilder::default().build_and_execute(|| {
-			assert_ok!(test_benchmark_feasibility_check::<Runtime>());
-		});
-
-		ExtBuilder::default().build_and_execute(|| {
-			assert_ok!(test_benchmark_submit_unsigned::<Runtime>());
-		});
-
-		ExtBuilder::default().build_and_execute(|| {
-			assert_ok!(test_benchmark_on_initialize_open_unsigned_with_snapshot::<Runtime>());
-		});
-
-		ExtBuilder::default().build_and_execute(|| {
-			assert_ok!(test_benchmark_on_initialize_open_unsigned_without_snapshot::<Runtime>());
-		});
-
-		ExtBuilder::default().build_and_execute(|| {
-			assert_ok!(test_benchmark_on_initialize_nothing::<Runtime>());
-		});
-
-		ExtBuilder::default().build_and_execute(|| {
-			assert_ok!(test_benchmark_create_snapshot::<Runtime>());
-		});
-	}
-}
+impl_benchmark_test_suite!(
+	MultiPhase,
+	crate::mock::ExtBuilder::default().build(),
+	crate::mock::Runtime,
+);
diff --git a/frame/election-provider-multi-phase/src/helpers.rs b/frame/election-provider-multi-phase/src/helpers.rs
index dd97163d2859..41d17e6aa9a2 100644
--- a/frame/election-provider-multi-phase/src/helpers.rs
+++ b/frame/election-provider-multi-phase/src/helpers.rs
@@ -25,7 +25,7 @@ macro_rules! log {
 	($level:tt, $pattern:expr $(, $values:expr)* $(,)?) => {
 		log::$level!(
 			target: $crate::LOG_TARGET,
-			concat!("🗳 ", $pattern) $(, $values)*
+			concat!("[#{:?}] 🗳  ", $pattern), <frame_system::Module<T>>::block_number() $(, $values)*
 		)
 	};
 }
diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index aca07cae3085..641807294f05 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -23,9 +23,10 @@
 //! ## Phases
 //!
 //! The timeline of pallet is as follows. At each block,
-//! [`sp_election_providers::ElectionDataProvider::next_election_prediction`] is used to estimate
-//! the time remaining to the next call to [`sp_election_providers::ElectionProvider::elect`]. Based
-//! on this, a phase is chosen. The timeline is as follows.
+//! [`frame_election_provider_support::ElectionDataProvider::next_election_prediction`] is used to
+//! estimate the time remaining to the next call to
+//! [`frame_election_provider_support::ElectionProvider::elect`]. Based on this, a phase is chosen.
+//! The timeline is as follows.
 //!
 //! ```ignore
 //!                                                                    elect()
@@ -149,7 +150,8 @@
 //!    are helpful for logging and are thus nested as:
 //!    - [`ElectionError::Miner`]: wraps a [`unsigned::MinerError`].
 //!    - [`ElectionError::Feasibility`]: wraps a [`FeasibilityError`].
-//!    - [`ElectionError::OnChainFallback`]: wraps a [`sp_election_providers::onchain::Error`].
+//!    - [`ElectionError::OnChainFallback`]: wraps a
+//!      [`frame_election_provider_support::onchain::Error`].
 //!
 //! Note that there could be an overlap between these sub-errors. For example, A
 //! `SnapshotUnavailable` can happen in both miner and feasibility check phase.
@@ -184,10 +186,10 @@
 //!
 //! **Recursive Fallback**: Currently, the fallback is a separate enum. A different and fancier way
 //! of doing this would be to have the fallback be another
-//! [`sp_election_providers::ElectionProvider`]. In this case, this pallet can even have the
-//! on-chain election provider as fallback, or special _noop_ fallback that simply returns an error,
-//! thus replicating [`FallbackStrategy::Nothing`]. In this case, we won't need the additional
-//! config OnChainAccuracy either.
+//! [`frame_election_provider_support::ElectionProvider`]. In this case, this pallet can even have
+//! the on-chain election provider as fallback, or special _noop_ fallback that simply returns an
+//! error, thus replicating [`FallbackStrategy::Nothing`]. In this case, we won't need the
+//! additional config OnChainAccuracy either.
 //!
 //! **Score based on (byte) size**: We should always prioritize small solutions over bigger ones, if
 //! there is a tie. Even more harsh should be to enforce the bound of the `reduce` algorithm.
@@ -200,6 +202,15 @@
 //! dependency from staking and the compact solution type. It should be generated at runtime, there
 //! it should be encoded how many votes each nominators have. Essentially translate
 //! <https://github.com/paritytech/substrate/pull/7929> to this pallet.
+//!
+//! **More accurate weight for error cases**: Both `ElectionDataProvider` and `ElectionProvider`
+//! assume no weight is consumed in their functions, when operations fail with `Err`. This can
+//! clearly be improved, but not a priority as we generally expect snapshot creation to fail only
+//! due to extreme circumstances.
+//!
+//! **Take into account the encode/decode weight in benchmarks.** Currently, we only take into
+//! account the weight of encode/decode in the `submit_unsigned` given its priority. Nonetheless,
+//! all operations on the solution and the snapshot are worthy of taking this into account.
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
@@ -211,7 +222,7 @@ use frame_support::{
 	weights::Weight,
 };
 use frame_system::{ensure_none, offchain::SendTransactionTypes};
-use sp_election_providers::{ElectionDataProvider, ElectionProvider, onchain};
+use frame_election_provider_support::{ElectionDataProvider, ElectionProvider, onchain};
 use sp_npos_elections::{
 	assignment_ratio_to_staked_normalized, is_score_better, CompactSolution, ElectionScore,
 	EvaluateSupport, PerThing128, Supports, VoteWeight,
@@ -222,6 +233,7 @@ use sp_runtime::{
 		TransactionValidityError, ValidTransaction,
 	},
 	DispatchError, PerThing, Perbill, RuntimeDebug, SaturatedConversion,
+	traits::Bounded,
 };
 use sp_std::prelude::*;
 use sp_arithmetic::{
@@ -261,6 +273,7 @@ struct OnChainConfig<T: Config>(sp_std::marker::PhantomData<T>);
 impl<T: Config> onchain::Config for OnChainConfig<T> {
 	type AccountId = T::AccountId;
 	type BlockNumber = T::BlockNumber;
+	type BlockWeights = T::BlockWeights;
 	type Accuracy = T::OnChainAccuracy;
 	type DataProvider = T::DataProvider;
 }
@@ -436,6 +449,8 @@ pub enum ElectionError {
 	Miner(unsigned::MinerError),
 	/// An error in the on-chain fallback.
 	OnChainFallback(onchain::Error),
+	/// An error happened in the data provider.
+	DataProvider(&'static str),
 	/// No fallback is configured. This is a special case.
 	NoFallbackConfigured,
 }
@@ -563,17 +578,28 @@ pub mod pallet {
 
 			match current_phase {
 				Phase::Off if remaining <= signed_deadline && remaining > unsigned_deadline => {
-					Self::on_initialize_open_signed();
-					log!(info, "Starting signed phase at #{:?} , round {}.", now, Self::round());
-					T::WeightInfo::on_initialize_open_signed()
+					// NOTE: if signed-phase length is zero, second part of the if-condition fails.
+					match Self::on_initialize_open_signed() {
+						Ok(snap_weight) => {
+							log!(info, "Starting signed phase round {}.", Self::round());
+							T::WeightInfo::on_initialize_open_signed().saturating_add(snap_weight)
+						}
+						Err(why) => {
+							// not much we can do about this at this point.
+							log!(warn, "failed to open signed phase due to {:?}", why);
+							T::WeightInfo::on_initialize_nothing()
+							// NOTE: ^^ The trait specifies that this is a noop in terms of weight
+							// in case of error.
+						}
+					}
 				}
 				Phase::Signed | Phase::Off
-					if remaining <= unsigned_deadline && remaining > 0u32.into() =>
+					if remaining <= unsigned_deadline && remaining > Zero::zero() =>
 				{
-					let (need_snapshot, enabled, additional) = if current_phase == Phase::Signed {
+					// determine if followed by signed or not.
+					let (need_snapshot, enabled, signed_weight) = if current_phase == Phase::Signed {
 						// followed by a signed phase: close the signed phase, no need for snapshot.
-						// TWO_PHASE_NOTE: later on once we have signed phase, this should return
-						// something else.
+						// TODO: proper weight https://github.com/paritytech/substrate/pull/7910.
 						(false, true, Weight::zero())
 					} else {
 						// no signed phase: create a new snapshot, definitely `enable` the unsigned
@@ -581,15 +607,25 @@ pub mod pallet {
 						(true, true, Weight::zero())
 					};
 
-					Self::on_initialize_open_unsigned(need_snapshot, enabled, now);
-					log!(info, "Starting unsigned phase({}) at #{:?}.", enabled, now);
-
-					let base_weight = if need_snapshot {
-						T::WeightInfo::on_initialize_open_unsigned_with_snapshot()
-					} else {
-						T::WeightInfo::on_initialize_open_unsigned_without_snapshot()
-					};
-					base_weight.saturating_add(additional)
+					match Self::on_initialize_open_unsigned(need_snapshot, enabled, now) {
+						Ok(snap_weight) => {
+							log!(info, "Starting unsigned phase({}).", enabled);
+							let base_weight = if need_snapshot {
+								T::WeightInfo::on_initialize_open_unsigned_with_snapshot()
+							} else {
+								T::WeightInfo::on_initialize_open_unsigned_without_snapshot()
+							};
+
+							base_weight.saturating_add(snap_weight).saturating_add(signed_weight)
+						}
+						Err(why) => {
+							// not much we can do about this at this point.
+							log!(warn, "failed to open unsigned phase due to {:?}", why);
+							T::WeightInfo::on_initialize_nothing()
+							// NOTE: ^^ The trait specifies that this is a noop in terms of weight
+							// in case of error.
+						}
+					}
 				}
 				_ => T::WeightInfo::on_initialize_nothing(),
 			}
@@ -601,7 +637,7 @@ pub mod pallet {
 				match Self::try_acquire_offchain_lock(n) {
 					Ok(_) => {
 						let outcome = Self::mine_check_and_submit().map_err(ElectionError::from);
-						log!(info, "miner exeuction done: {:?}", outcome);
+						log!(info, "mine_check_and_submit execution done: {:?}", outcome);
 					}
 					Err(why) => log!(warn, "denied offchain worker: {:?}", why),
 				}
@@ -838,32 +874,41 @@ pub mod pallet {
 }
 
 impl<T: Config> Pallet<T> {
-	/// Logic for `<Pallet as Hooks>::on_initialize` when signed phase is being opened.
+	/// Logic for [`<Pallet as Hooks>::on_initialize`] when signed phase is being opened.
 	///
 	/// This is decoupled for easy weight calculation.
-	pub(crate) fn on_initialize_open_signed() {
+	///
+	/// Returns `Ok(snapshot_weight)` if success, where `snapshot_weight` is the weight that
+	/// needs to recorded for the creation of snapshot.
+	pub(crate) fn on_initialize_open_signed() -> Result<Weight, ElectionError> {
+		let weight = Self::create_snapshot()?;
 		<CurrentPhase<T>>::put(Phase::Signed);
-		Self::create_snapshot();
 		Self::deposit_event(Event::SignedPhaseStarted(Self::round()));
+		Ok(weight.saturating_add(T::DbWeight::get().writes(1)))
 	}
 
-	/// Logic for `<Pallet as Hooks<T>>::on_initialize` when unsigned phase is being opened.
+	/// Logic for [`<Pallet as Hooks<T>>::on_initialize`] when unsigned phase is being opened.
+	///
+	/// This is decoupled for easy weight calculation.
 	///
-	/// This is decoupled for easy weight calculation. Note that the default weight benchmark of
-	/// this function will assume an empty signed queue for `finalize_signed_phase`.
+	/// Returns `Ok(snapshot_weight)` if success, where `snapshot_weight` is the weight that
+	/// needs to recorded for the creation of snapshot.
 	pub(crate) fn on_initialize_open_unsigned(
 		need_snapshot: bool,
 		enabled: bool,
 		now: T::BlockNumber,
-	) {
-		if need_snapshot {
+	) -> Result<Weight, ElectionError> {
+		let weight = if need_snapshot {
 			// if not being followed by a signed phase, then create the snapshots.
 			debug_assert!(Self::snapshot().is_none());
-			Self::create_snapshot();
-		}
+			Self::create_snapshot()?
+		} else {
+			0
+		};
 
 		<CurrentPhase<T>>::put(Phase::Unsigned((enabled, now)));
 		Self::deposit_event(Event::UnsignedPhaseStarted(Self::round()));
+		Ok(weight.saturating_add(T::DbWeight::get().writes(1)))
 	}
 
 	/// Creates the snapshot. Writes new data to:
@@ -871,18 +916,33 @@ impl<T: Config> Pallet<T> {
 	/// 1. [`SnapshotMetadata`]
 	/// 2. [`RoundSnapshot`]
 	/// 3. [`DesiredTargets`]
-	pub(crate) fn create_snapshot() {
-		// if any of them don't exist, create all of them. This is a bit conservative.
-		let targets = T::DataProvider::targets();
-		let voters = T::DataProvider::voters();
-		let desired_targets = T::DataProvider::desired_targets();
+	///
+	/// Returns `Ok(consumed_weight)` if operation is okay.
+	pub(crate) fn create_snapshot() -> Result<Weight, ElectionError> {
+		let target_limit = <CompactTargetIndexOf<T>>::max_value().saturated_into::<usize>();
+		let voter_limit = <CompactVoterIndexOf<T>>::max_value().saturated_into::<usize>();
+
+		let (targets, w1) =
+			T::DataProvider::targets(Some(target_limit)).map_err(ElectionError::DataProvider)?;
+		let (voters, w2) =
+			T::DataProvider::voters(Some(voter_limit)).map_err(ElectionError::DataProvider)?;
+		let (desired_targets, w3) =
+			T::DataProvider::desired_targets().map_err(ElectionError::DataProvider)?;
+
+		// defensive-only
+		if targets.len() > target_limit || voters.len() > voter_limit {
+			debug_assert!(false, "Snapshot limit has not been respected.");
+			return Err(ElectionError::DataProvider("Snapshot too big for submission."));
+		}
 
+		// only write snapshot if all existed.
 		<SnapshotMetadata<T>>::put(SolutionOrSnapshotSize {
 			voters: voters.len() as u32,
 			targets: targets.len() as u32,
 		});
 		<DesiredTargets<T>>::put(desired_targets);
 		<Snapshot<T>>::put(RoundSnapshot { voters, targets });
+		Ok(w1.saturating_add(w2).saturating_add(w3).saturating_add(T::DbWeight::get().writes(3)))
 	}
 
 	/// Kill everything created by [`Pallet::create_snapshot`].
@@ -998,7 +1058,7 @@ impl<T: Config> Pallet<T> {
 	}
 
 	/// On-chain fallback of election.
-	fn onchain_fallback() -> Result<Supports<T::AccountId>, ElectionError> {
+	fn onchain_fallback() -> Result<(Supports<T::AccountId>, Weight), ElectionError> {
 		<onchain::OnChainSequentialPhragmen<OnChainConfig<T>> as ElectionProvider<
 			T::AccountId,
 			T::BlockNumber,
@@ -1006,23 +1066,27 @@ impl<T: Config> Pallet<T> {
 		.map_err(Into::into)
 	}
 
-	fn do_elect() -> Result<Supports<T::AccountId>, ElectionError> {
+	fn do_elect() -> Result<(Supports<T::AccountId>, Weight), ElectionError> {
 		<QueuedSolution<T>>::take()
 			.map_or_else(
 				|| match T::Fallback::get() {
 					FallbackStrategy::OnChain => Self::onchain_fallback()
-						.map(|r| (r, ElectionCompute::OnChain))
+						.map(|(s, w)| (s, w, ElectionCompute::OnChain))
 						.map_err(Into::into),
 					FallbackStrategy::Nothing => Err(ElectionError::NoFallbackConfigured),
 				},
-				|ReadySolution { supports, compute, .. }| Ok((supports, compute)),
+				|ReadySolution { supports, compute, .. }| Ok((
+					supports,
+					T::WeightInfo::elect_queued(),
+					compute
+				)),
 			)
-			.map(|(supports, compute)| {
+			.map(|(supports, weight, compute)| {
 				Self::deposit_event(Event::ElectionFinalized(Some(compute)));
 				if Self::round() != 1 {
 					log!(info, "Finalized election round with compute {:?}.", compute);
 				}
-				supports
+				(supports, weight)
 			})
 			.map_err(|err| {
 				Self::deposit_event(Event::ElectionFinalized(None));
@@ -1038,10 +1102,11 @@ impl<T: Config> ElectionProvider<T::AccountId, T::BlockNumber> for Pallet<T> {
 	type Error = ElectionError;
 	type DataProvider = T::DataProvider;
 
-	fn elect() -> Result<Supports<T::AccountId>, Self::Error> {
-		let outcome = Self::do_elect();
+	fn elect() -> Result<(Supports<T::AccountId>, Weight), Self::Error> {
+		let outcome_and_weight = Self::do_elect();
+		// IMPORTANT: regardless of if election was `Ok` or `Err`, we shall do some cleanup.
 		Self::post_elect();
-		outcome
+		outcome_and_weight
 	}
 }
 
@@ -1132,13 +1197,13 @@ mod feasibility_check {
 				.compact
 				.votes1
 				.iter_mut()
-				.filter(|(_, t)| *t == 3u16)
+				.filter(|(_, t)| *t == TargetIndex::from(3u16))
 				.for_each(|(_, t)| *t += 1);
 			solution.compact.votes2.iter_mut().for_each(|(_, (t0, _), t1)| {
-				if *t0 == 3u16 {
+				if *t0 == TargetIndex::from(3u16) {
 					*t0 += 1
 				};
-				if *t1 == 3u16 {
+				if *t1 == TargetIndex::from(3u16) {
 					*t1 += 1
 				};
 			});
@@ -1166,7 +1231,7 @@ mod feasibility_check {
 					.compact
 					.votes1
 					.iter_mut()
-					.filter(|(v, _)| *v == 7u32)
+					.filter(|(v, _)| *v == VoterIndex::from(7u32))
 					.map(|(v, _)| *v = 8)
 					.count() > 0
 			);
@@ -1229,7 +1294,7 @@ mod feasibility_check {
 #[cfg(test)]
 mod tests {
 	use super::{mock::*, Event, *};
-	use sp_election_providers::ElectionProvider;
+	use frame_election_provider_support::ElectionProvider;
 	use sp_npos_elections::Support;
 
 	#[test]
@@ -1401,7 +1466,7 @@ mod tests {
 
 	#[test]
 	fn fallback_strategy_works() {
-		ExtBuilder::default().fallabck(FallbackStrategy::OnChain).build_and_execute(|| {
+		ExtBuilder::default().fallback(FallbackStrategy::OnChain).build_and_execute(|| {
 			roll_to(15);
 			assert_eq!(MultiPhase::current_phase(), Phase::Signed);
 
@@ -1409,7 +1474,7 @@ mod tests {
 			assert_eq!(MultiPhase::current_phase(), Phase::Unsigned((true, 25)));
 
 			// zilch solutions thus far.
-			let supports = MultiPhase::elect().unwrap();
+			let (supports, _) = MultiPhase::elect().unwrap();
 
 			assert_eq!(
 				supports,
@@ -1420,7 +1485,7 @@ mod tests {
 			)
 		});
 
-		ExtBuilder::default().fallabck(FallbackStrategy::Nothing).build_and_execute(|| {
+		ExtBuilder::default().fallback(FallbackStrategy::Nothing).build_and_execute(|| {
 			roll_to(15);
 			assert_eq!(MultiPhase::current_phase(), Phase::Signed);
 
@@ -1432,6 +1497,26 @@ mod tests {
 		})
 	}
 
+	#[test]
+	fn snapshot_creation_fails_if_too_big() {
+		ExtBuilder::default().build_and_execute(|| {
+			Targets::set((0..(TargetIndex::max_value() as AccountId) + 1).collect::<Vec<_>>());
+
+			// signed phase failed to open.
+			roll_to(15);
+			assert_eq!(MultiPhase::current_phase(), Phase::Off);
+
+			// unsigned phase failed to open.
+			roll_to(25);
+			assert_eq!(MultiPhase::current_phase(), Phase::Off);
+
+			// on-chain backup works though.
+			roll_to(29);
+			let (supports, _) = MultiPhase::elect().unwrap();
+			assert!(supports.len() > 0);
+		})
+	}
+
 	#[test]
 	fn number_of_voters_allowed_2sec_block() {
 		// Just a rough estimate with the substrate weights.
diff --git a/frame/election-provider-multi-phase/src/mock.rs b/frame/election-provider-multi-phase/src/mock.rs
index e7a2924fd2aa..970f3ab9ffcd 100644
--- a/frame/election-provider-multi-phase/src/mock.rs
+++ b/frame/election-provider-multi-phase/src/mock.rs
@@ -31,7 +31,7 @@ use sp_core::{
 	},
 	H256,
 };
-use sp_election_providers::ElectionDataProvider;
+use frame_election_provider_support::{ElectionDataProvider, data_provider};
 use sp_npos_elections::{
 	assignment_ratio_to_staked_normalized, seq_phragmen, to_supports, to_without_backing,
 	CompactSolution, ElectionResult, EvaluateSupport,
@@ -60,10 +60,12 @@ frame_support::construct_runtime!(
 
 pub(crate) type Balance = u64;
 pub(crate) type AccountId = u64;
+pub(crate) type VoterIndex = u32;
+pub(crate) type TargetIndex = u16;
 
 sp_npos_elections::generate_solution_type!(
 	#[compact]
-	pub struct TestCompact::<u32, u16, PerU16>(16)
+	pub struct TestCompact::<VoterIndex, TargetIndex, PerU16>(16)
 );
 
 /// All events of this pallet.
@@ -239,6 +241,13 @@ impl multi_phase::weights::WeightInfo for DualMockWeightInfo {
 			<() as multi_phase::weights::WeightInfo>::on_initialize_open_unsigned_without_snapshot()
 		}
 	}
+	fn elect_queued() -> Weight {
+		if MockWeightInfo::get() {
+			Zero::zero()
+		} else {
+			<() as multi_phase::weights::WeightInfo>::elect_queued()
+		}
+	}
 	fn submit_unsigned(v: u32, t: u32, a: u32, d: u32) -> Weight {
 		if MockWeightInfo::get() {
 			// 10 base
@@ -291,18 +300,43 @@ pub struct ExtBuilder {}
 
 pub struct StakingMock;
 impl ElectionDataProvider<AccountId, u64> for StakingMock {
-	fn targets() -> Vec<AccountId> {
-		Targets::get()
+	fn targets(maybe_max_len: Option<usize>) -> data_provider::Result<(Vec<AccountId>, Weight)> {
+		let targets = Targets::get();
+
+		if maybe_max_len.map_or(false, |max_len| targets.len() > max_len) {
+			return Err("Targets too big");
+		}
+
+		Ok((targets, 0))
 	}
-	fn voters() -> Vec<(AccountId, VoteWeight, Vec<AccountId>)> {
-		Voters::get()
+
+	fn voters(
+		maybe_max_len: Option<usize>,
+	) -> data_provider::Result<(Vec<(AccountId, VoteWeight, Vec<AccountId>)>, Weight)> {
+		let voters = Voters::get();
+		if maybe_max_len.map_or(false, |max_len| voters.len() > max_len) {
+			return Err("Voters too big");
+		}
+
+		Ok((voters, 0))
 	}
-	fn desired_targets() -> u32 {
-		DesiredTargets::get()
+	fn desired_targets() -> data_provider::Result<(u32, Weight)> {
+		Ok((DesiredTargets::get(), 0))
 	}
+
 	fn next_election_prediction(now: u64) -> u64 {
 		now + EpochLength::get() - now % EpochLength::get()
 	}
+
+	#[cfg(any(feature = "runtime-benchmarks", test))]
+	fn put_snapshot(
+		voters: Vec<(AccountId, VoteWeight, Vec<AccountId>)>,
+		targets: Vec<AccountId>,
+		_target_stake: Option<VoteWeight>,
+	) {
+		Targets::set(targets);
+		Voters::set(voters);
+	}
 }
 
 impl ExtBuilder {
@@ -319,7 +353,7 @@ impl ExtBuilder {
 		<UnsignedPhase>::set(unsigned);
 		self
 	}
-	pub fn fallabck(self, fallback: FallbackStrategy) -> Self {
+	pub fn fallback(self, fallback: FallbackStrategy) -> Self {
 		<Fallback>::set(fallback);
 		self
 	}
diff --git a/frame/election-provider-multi-phase/src/unsigned.rs b/frame/election-provider-multi-phase/src/unsigned.rs
index 2039e5d9f075..3004e69c23c8 100644
--- a/frame/election-provider-multi-phase/src/unsigned.rs
+++ b/frame/election-provider-multi-phase/src/unsigned.rs
@@ -66,8 +66,17 @@ impl<T: Config> Pallet<T> {
 		let iters = Self::get_balancing_iters();
 		// get the solution, with a load of checks to ensure if submitted, IT IS ABSOLUTELY VALID.
 		let (raw_solution, witness) = Self::mine_and_check(iters)?;
+		let score = raw_solution.score.clone();
+
+		let call: <T as frame_system::offchain::SendTransactionTypes<Call<T>>>::OverarchingCall =
+			Call::submit_unsigned(raw_solution, witness).into();
+		log!(
+			info,
+			"mined a solution with score {:?} and size {}",
+			score,
+			call.using_encoded(|b| b.len())
+		);
 
-		let call = Call::submit_unsigned(raw_solution, witness).into();
 		SubmitTransaction::<T, Call<T>>::submit_unsigned_transaction(call)
 			.map_err(|_| MinerError::PoolSubmissionFailed)
 	}
@@ -413,6 +422,9 @@ mod max_weight {
 		fn on_initialize_open_unsigned_with_snapshot() -> Weight {
 			unreachable!()
 		}
+		fn elect_queued() -> Weight {
+			0
+		}
 		fn on_initialize_open_unsigned_without_snapshot() -> Weight {
 			unreachable!()
 		}
@@ -487,7 +499,7 @@ mod tests {
 	};
 	use frame_support::{dispatch::Dispatchable, traits::OffchainWorker};
 	use mock::Call as OuterCall;
-	use sp_election_providers::Assignment;
+	use frame_election_provider_support::Assignment;
 	use sp_runtime::{traits::ValidateUnsigned, PerU16};
 
 	#[test]
diff --git a/frame/election-provider-multi-phase/src/weights.rs b/frame/election-provider-multi-phase/src/weights.rs
index 276bba330d24..e13b82f53a17 100644
--- a/frame/election-provider-multi-phase/src/weights.rs
+++ b/frame/election-provider-multi-phase/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_election_provider_multi_phase
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-02-12, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2021-03-14, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -48,6 +48,7 @@ pub trait WeightInfo {
 	fn on_initialize_open_signed() -> Weight;
 	fn on_initialize_open_unsigned_with_snapshot() -> Weight;
 	fn on_initialize_open_unsigned_without_snapshot() -> Weight;
+	fn elect_queued() -> Weight;
 	fn submit_unsigned(v: u32, t: u32, a: u32, d: u32, ) -> Weight;
 	fn feasibility_check(v: u32, t: u32, a: u32, d: u32, ) -> Weight;
 }
@@ -56,47 +57,52 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn on_initialize_nothing() -> Weight {
-		(23_401_000 as Weight)
+		(22_833_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 	}
 	fn on_initialize_open_signed() -> Weight {
-		(79_260_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(7 as Weight))
+		(106_993_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(8 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn on_initialize_open_unsigned_with_snapshot() -> Weight {
-		(77_745_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(7 as Weight))
+		(106_490_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(8 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn on_initialize_open_unsigned_without_snapshot() -> Weight {
-		(21_764_000 as Weight)
+		(21_275_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	fn elect_queued() -> Weight {
+		(7_274_346_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(6 as Weight))
+	}
 	fn submit_unsigned(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((4_171_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 78_000
-			.saturating_add((229_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 23_000
-			.saturating_add((13_661_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 117_000
-			.saturating_add((4_499_000 as Weight).saturating_mul(d as Weight))
+			// Standard Error: 19_000
+			.saturating_add((4_017_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 66_000
+			.saturating_add((130_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 19_000
+			.saturating_add((13_057_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 99_000
+			.saturating_add((4_558_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn feasibility_check(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 12_000
-			.saturating_add((4_232_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 42_000
-			.saturating_add((636_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((4_186_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 40_000
+			.saturating_add((803_000 as Weight).saturating_mul(t as Weight))
 			// Standard Error: 12_000
-			.saturating_add((10_294_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 64_000
-			.saturating_add((4_428_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add((9_806_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 61_000
+			.saturating_add((4_156_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 	}
 }
@@ -104,47 +110,52 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn on_initialize_nothing() -> Weight {
-		(23_401_000 as Weight)
+		(22_833_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 	}
 	fn on_initialize_open_signed() -> Weight {
-		(79_260_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
+		(106_993_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(8 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn on_initialize_open_unsigned_with_snapshot() -> Weight {
-		(77_745_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
+		(106_490_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(8 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn on_initialize_open_unsigned_without_snapshot() -> Weight {
-		(21_764_000 as Weight)
+		(21_275_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	fn elect_queued() -> Weight {
+		(7_274_346_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(6 as Weight))
+	}
 	fn submit_unsigned(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((4_171_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 78_000
-			.saturating_add((229_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 23_000
-			.saturating_add((13_661_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 117_000
-			.saturating_add((4_499_000 as Weight).saturating_mul(d as Weight))
+			// Standard Error: 19_000
+			.saturating_add((4_017_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 66_000
+			.saturating_add((130_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 19_000
+			.saturating_add((13_057_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 99_000
+			.saturating_add((4_558_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn feasibility_check(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 12_000
-			.saturating_add((4_232_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 42_000
-			.saturating_add((636_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((4_186_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 40_000
+			.saturating_add((803_000 as Weight).saturating_mul(t as Weight))
 			// Standard Error: 12_000
-			.saturating_add((10_294_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 64_000
-			.saturating_add((4_428_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add((9_806_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 61_000
+			.saturating_add((4_156_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 	}
 }
diff --git a/primitives/election-providers/Cargo.toml b/frame/election-provider-support/Cargo.toml
similarity index 57%
rename from primitives/election-providers/Cargo.toml
rename to frame/election-provider-support/Cargo.toml
index cf12dce8098d..b360cd89eb57 100644
--- a/primitives/election-providers/Cargo.toml
+++ b/frame/election-provider-support/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
-name = "sp-election-providers"
+name = "frame-election-provider-support"
 version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
 homepage = "https://substrate.dev"
 repository = "https://github.com/paritytech/substrate/"
-description = "Primitive election providers"
+description = "election provider supporting traits"
 readme = "README.md"
 
 [package.metadata.docs.rs]
@@ -14,20 +14,24 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "3.0.0", default-features = false, path = "../std" }
-sp-arithmetic = { version = "3.0.0", default-features = false, path = "../arithmetic" }
-sp-npos-elections = { version = "3.0.0", default-features = false, path = "../npos-elections" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-arithmetic = { version = "3.0.0", default-features = false, path = "../../primitives/arithmetic" }
+sp-npos-elections = { version = "3.0.0", default-features = false, path = "../../primitives/npos-elections" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 
 [dev-dependencies]
-sp-npos-elections = { version = "3.0.0", path = "../npos-elections" }
-sp-runtime = { version = "3.0.0", path = "../runtime" }
+sp-npos-elections = { version = "3.0.0", path = "../../primitives/npos-elections" }
+sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
 
 [features]
 default = ["std"]
-runtime-benchmarks = []
 std = [
 	"codec/std",
 	"sp-std/std",
 	"sp-npos-elections/std",
 	"sp-arithmetic/std",
+	"frame-support/std",
+	"frame-system/std",
 ]
+runtime-benchmarks = []
diff --git a/primitives/election-providers/src/lib.rs b/frame/election-provider-support/src/lib.rs
similarity index 75%
rename from primitives/election-providers/src/lib.rs
rename to frame/election-provider-support/src/lib.rs
index 73ea58c176b2..3d7c2dbac90a 100644
--- a/primitives/election-providers/src/lib.rs
+++ b/frame/election-provider-support/src/lib.rs
@@ -78,14 +78,15 @@
 //! ## Example
 //!
 //! ```rust
-//! # use sp_election_providers::*;
+//! # use frame_election_provider_support::{*, data_provider};
 //! # use sp_npos_elections::{Support, Assignment};
+//! # use frame_support::weights::Weight;
 //!
 //! type AccountId = u64;
 //! type Balance = u64;
 //! type BlockNumber = u32;
 //!
-//! mod data_provider {
+//! mod data_provider_mod {
 //!     use super::*;
 //!
 //!     pub trait Config: Sized {
@@ -99,14 +100,16 @@
 //!     pub struct Module<T: Config>(std::marker::PhantomData<T>);
 //!
 //!     impl<T: Config> ElectionDataProvider<AccountId, BlockNumber> for Module<T> {
-//!         fn desired_targets() -> u32 {
-//!             1
+//!         fn desired_targets() -> data_provider::Result<(u32, Weight)> {
+//!             Ok((1, 0))
 //!         }
-//!         fn voters() -> Vec<(AccountId, VoteWeight, Vec<AccountId>)> {
-//!             Default::default()
+//!         fn voters(maybe_max_len: Option<usize>)
+//!         -> data_provider::Result<(Vec<(AccountId, VoteWeight, Vec<AccountId>)>, Weight)>
+//!         {
+//!             Ok((Default::default(), 0))
 //!         }
-//!         fn targets() -> Vec<AccountId> {
-//!             vec![10, 20, 30]
+//!         fn targets(maybe_max_len: Option<usize>) -> data_provider::Result<(Vec<AccountId>, Weight)> {
+//!             Ok((vec![10, 20, 30], 0))
 //!         }
 //!         fn next_election_prediction(now: BlockNumber) -> BlockNumber {
 //!             0
@@ -125,29 +128,30 @@
 //!     }
 //!
 //!     impl<T: Config> ElectionProvider<AccountId, BlockNumber> for GenericElectionProvider<T> {
-//!         type Error = ();
+//!         type Error = &'static str;
 //!         type DataProvider = T::DataProvider;
 //!
-//!         fn elect() -> Result<Supports<AccountId>, Self::Error> {
-//!             Self::DataProvider::targets()
-//!                 .first()
-//!                 .map(|winner| vec![(*winner, Support::default())])
-//!                 .ok_or(())
+//!         fn elect() -> Result<(Supports<AccountId>, Weight), Self::Error> {
+//!             Self::DataProvider::targets(None)
+//!                 .map_err(|_| "failed to elect")
+//!                 .map(|(t, weight)| {
+//! 						(vec![(t[0], Support::default())], weight)
+//! 				})
 //!         }
 //!     }
 //! }
 //!
 //! mod runtime {
 //!     use super::generic_election_provider;
-//!     use super::data_provider;
+//!     use super::data_provider_mod;
 //!     use super::AccountId;
 //!
 //!     struct Runtime;
 //!     impl generic_election_provider::Config for Runtime {
-//!         type DataProvider = data_provider::Module<Runtime>;
+//!         type DataProvider = data_provider_mod::Module<Runtime>;
 //!     }
 //!
-//!     impl data_provider::Config for Runtime {
+//!     impl data_provider_mod::Config for Runtime {
 //!         type ElectionProvider = generic_election_provider::GenericElectionProvider<Runtime>;
 //!     }
 //!
@@ -160,23 +164,44 @@
 
 pub mod onchain;
 use sp_std::{prelude::*, fmt::Debug};
+use frame_support::weights::Weight;
 
 /// Re-export some type as they are used in the interface.
 pub use sp_arithmetic::PerThing;
 pub use sp_npos_elections::{Assignment, ExtendedBalance, PerThing128, Supports, VoteWeight};
 
+/// Types that are used by the data provider trait.
+pub mod data_provider {
+	/// Alias for the result type of the election data provider.
+	pub type Result<T> = sp_std::result::Result<T, &'static str>;
+}
+
 /// Something that can provide the data to an [`ElectionProvider`].
 pub trait ElectionDataProvider<AccountId, BlockNumber> {
 	/// All possible targets for the election, i.e. the candidates.
-	fn targets() -> Vec<AccountId>;
+	///
+	/// If `maybe_max_len` is `Some(v)` then the resulting vector MUST NOT be longer than `v` items
+	/// long.
+	///
+	/// It is assumed that this function will only consume a notable amount of weight, when it
+	/// returns `Ok(_)`.
+	fn targets(maybe_max_len: Option<usize>) -> data_provider::Result<(Vec<AccountId>, Weight)>;
 
 	/// All possible voters for the election.
 	///
 	/// Note that if a notion of self-vote exists, it should be represented here.
-	fn voters() -> Vec<(AccountId, VoteWeight, Vec<AccountId>)>;
+	///
+	/// If `maybe_max_len` is `Some(v)` then the resulting vector MUST NOT be longer than `v` items
+	/// long.
+	///
+	/// It is assumed that this function will only consume a notable amount of weight, when it
+	/// returns `Ok(_)`.
+	fn voters(
+		maybe_max_len: Option<usize>,
+	) -> data_provider::Result<(Vec<(AccountId, VoteWeight, Vec<AccountId>)>, Weight)>;
 
 	/// The number of targets to elect.
-	fn desired_targets() -> u32;
+	fn desired_targets() -> data_provider::Result<(u32, Weight)>;
 
 	/// Provide a best effort prediction about when the next election is about to happen.
 	///
@@ -192,20 +217,23 @@ pub trait ElectionDataProvider<AccountId, BlockNumber> {
 	fn put_snapshot(
 		_voters: Vec<(AccountId, VoteWeight, Vec<AccountId>)>,
 		_targets: Vec<AccountId>,
+		_target_stake: Option<VoteWeight>,
 	) {
 	}
 }
 
 #[cfg(feature = "std")]
 impl<AccountId, BlockNumber> ElectionDataProvider<AccountId, BlockNumber> for () {
-	fn targets() -> Vec<AccountId> {
-		Default::default()
+	fn targets(_maybe_max_len: Option<usize>) -> data_provider::Result<(Vec<AccountId>, Weight)> {
+		Ok(Default::default())
 	}
-	fn voters() -> Vec<(AccountId, VoteWeight, Vec<AccountId>)> {
-		Default::default()
+	fn voters(
+		_maybe_max_len: Option<usize>,
+	) -> data_provider::Result<(Vec<(AccountId, VoteWeight, Vec<AccountId>)>, Weight)> {
+		Ok(Default::default())
 	}
-	fn desired_targets() -> u32 {
-		Default::default()
+	fn desired_targets() -> data_provider::Result<(u32, Weight)> {
+		Ok(Default::default())
 	}
 	fn next_election_prediction(now: BlockNumber) -> BlockNumber {
 		now
@@ -226,8 +254,8 @@ pub trait ElectionProvider<AccountId, BlockNumber> {
 
 	/// Elect a new set of winners.
 	///
-	/// The result is returned in a target major format, namely as vector of  supports.
-	fn elect() -> Result<Supports<AccountId>, Self::Error>;
+	/// The result is returned in a target major format, namely as vector of supports.
+	fn elect() -> Result<(Supports<AccountId>, Weight), Self::Error>;
 }
 
 #[cfg(feature = "std")]
@@ -235,7 +263,7 @@ impl<AccountId, BlockNumber> ElectionProvider<AccountId, BlockNumber> for () {
 	type Error = &'static str;
 	type DataProvider = ();
 
-	fn elect() -> Result<Supports<AccountId>, Self::Error> {
+	fn elect() -> Result<(Supports<AccountId>, Weight), Self::Error> {
 		Err("<() as ElectionProvider> cannot do anything.")
 	}
 }
diff --git a/primitives/election-providers/src/onchain.rs b/frame/election-provider-support/src/onchain.rs
similarity index 70%
rename from primitives/election-providers/src/onchain.rs
rename to frame/election-provider-support/src/onchain.rs
index b50dff2ff17d..b00c8698037c 100644
--- a/primitives/election-providers/src/onchain.rs
+++ b/frame/election-provider-support/src/onchain.rs
@@ -20,12 +20,15 @@
 use crate::{ElectionDataProvider, ElectionProvider};
 use sp_npos_elections::*;
 use sp_std::{collections::btree_map::BTreeMap, marker::PhantomData, prelude::*};
+use frame_support::{traits::Get, weights::Weight};
 
 /// Errors of the on-chain election.
 #[derive(Eq, PartialEq, Debug)]
 pub enum Error {
 	/// An internal error in the NPoS elections crate.
 	NposElections(sp_npos_elections::Error),
+	/// Errors from the data provider.
+	DataProvider(&'static str),
 }
 
 impl From<sp_npos_elections::Error> for Error {
@@ -40,13 +43,20 @@ impl From<sp_npos_elections::Error> for Error {
 ///
 /// ### Warning
 ///
-/// This can be very expensive to run frequently on-chain. Use with care.
+/// This can be very expensive to run frequently on-chain. Use with care. Moreover, this
+/// implementation ignores the additional data of the election data provider and gives no insight on
+/// how much weight was consumed.
+///
+/// Finally, this implementation does not impose any limits on the number of voters and targets that
+/// are provided.
 pub struct OnChainSequentialPhragmen<T: Config>(PhantomData<T>);
 
 /// Configuration trait of [`OnChainSequentialPhragmen`].
 ///
 /// Note that this is similar to a pallet traits, but [`OnChainSequentialPhragmen`] is not a pallet.
 pub trait Config {
+	/// The block limits.
+	type BlockWeights: Get<frame_system::limits::BlockWeights>;
 	/// The account identifier type.
 	type AccountId: IdentifierT;
 	/// The block number type.
@@ -61,10 +71,11 @@ impl<T: Config> ElectionProvider<T::AccountId, T::BlockNumber> for OnChainSequen
 	type Error = Error;
 	type DataProvider = T::DataProvider;
 
-	fn elect() -> Result<Supports<T::AccountId>, Self::Error> {
-		let voters = Self::DataProvider::voters();
-		let targets = Self::DataProvider::targets();
-		let desired_targets = Self::DataProvider::desired_targets() as usize;
+	fn elect() -> Result<(Supports<T::AccountId>, Weight), Self::Error> {
+		let (voters, _) = Self::DataProvider::voters(None).map_err(Error::DataProvider)?;
+		let (targets, _) = Self::DataProvider::targets(None).map_err(Error::DataProvider)?;
+		let (desired_targets, _) =
+			Self::DataProvider::desired_targets().map_err(Error::DataProvider)?;
 
 		let mut stake_map: BTreeMap<T::AccountId, VoteWeight> = BTreeMap::new();
 
@@ -77,13 +88,13 @@ impl<T: Config> ElectionProvider<T::AccountId, T::BlockNumber> for OnChainSequen
 		};
 
 		let ElectionResult { winners, assignments } =
-			seq_phragmen::<_, T::Accuracy>(desired_targets, targets, voters, None)
+			seq_phragmen::<_, T::Accuracy>(desired_targets as usize, targets, voters, None)
 				.map_err(Error::from)?;
 
 		let staked = assignment_ratio_to_staked_normalized(assignments, &stake_of)?;
 		let winners = to_without_backing(winners);
 
-		to_supports(&winners, &staked).map_err(Error::from)
+		to_supports(&winners, &staked).map_err(Error::from).map(|s| (s, T::BlockWeights::get().max_block))
 	}
 }
 
@@ -92,12 +103,13 @@ mod tests {
 	use super::*;
 	use sp_npos_elections::Support;
 	use sp_runtime::Perbill;
+	use frame_support::weights::Weight;
 
 	type AccountId = u64;
 	type BlockNumber = u32;
-
 	struct Runtime;
 	impl Config for Runtime {
+		type BlockWeights = ();
 		type AccountId = AccountId;
 		type BlockNumber = BlockNumber;
 		type Accuracy = Perbill;
@@ -108,24 +120,23 @@ mod tests {
 
 	mod mock_data_provider {
 		use super::*;
+		use crate::data_provider;
 
 		pub struct DataProvider;
 
 		impl ElectionDataProvider<AccountId, BlockNumber> for DataProvider {
-			fn voters() -> Vec<(AccountId, VoteWeight, Vec<AccountId>)> {
-				vec![
-					(1, 10, vec![10, 20]),
-					(2, 20, vec![30, 20]),
-					(3, 30, vec![10, 30]),
-				]
+			fn voters(
+				_: Option<usize>,
+			) -> data_provider::Result<(Vec<(AccountId, VoteWeight, Vec<AccountId>)>, Weight)> {
+				Ok((vec![(1, 10, vec![10, 20]), (2, 20, vec![30, 20]), (3, 30, vec![10, 30])], 0))
 			}
 
-			fn targets() -> Vec<AccountId> {
-				vec![10, 20, 30]
+			fn targets(_: Option<usize>) -> data_provider::Result<(Vec<AccountId>, Weight)> {
+				Ok((vec![10, 20, 30], 0))
 			}
 
-			fn desired_targets() -> u32 {
-				2
+			fn desired_targets() -> data_provider::Result<(u32, Weight)> {
+				Ok((2, 0))
 			}
 
 			fn next_election_prediction(_: BlockNumber) -> BlockNumber {
@@ -137,7 +148,7 @@ mod tests {
 	#[test]
 	fn onchain_seq_phragmen_works() {
 		assert_eq!(
-			OnChainPhragmen::elect().unwrap(),
+			OnChainPhragmen::elect().unwrap().0,
 			vec![
 				(
 					10,
diff --git a/frame/grandpa/Cargo.toml b/frame/grandpa/Cargo.toml
index 2bf7306f58e1..547e3966d52a 100644
--- a/frame/grandpa/Cargo.toml
+++ b/frame/grandpa/Cargo.toml
@@ -39,7 +39,7 @@ pallet-offences = { version = "3.0.0", path = "../offences" }
 pallet-staking = { version = "3.0.0", path = "../staking" }
 pallet-staking-reward-curve = { version = "3.0.0", path = "../staking/reward-curve" }
 pallet-timestamp = { version = "3.0.0", path = "../timestamp" }
-sp-election-providers = { version = "3.0.0", path = "../../primitives/election-providers" }
+frame-election-provider-support = { version = "3.0.0", path = "../election-provider-support" }
 
 [features]
 default = ["std"]
diff --git a/frame/grandpa/src/mock.rs b/frame/grandpa/src/mock.rs
index 0a24a2344547..6e83ae481d27 100644
--- a/frame/grandpa/src/mock.rs
+++ b/frame/grandpa/src/mock.rs
@@ -40,7 +40,7 @@ use sp_runtime::{
 };
 use sp_staking::SessionIndex;
 use pallet_session::historical as pallet_session_historical;
-use sp_election_providers::onchain;
+use frame_election_provider_support::onchain;
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -193,6 +193,7 @@ parameter_types! {
 impl onchain::Config for Test {
 	type AccountId = <Self as frame_system::Config>::AccountId;
 	type BlockNumber = <Self as frame_system::Config>::BlockNumber;
+	type BlockWeights = ();
 	type Accuracy = Perbill;
 	type DataProvider = Staking;
 }
diff --git a/frame/offences/benchmarking/Cargo.toml b/frame/offences/benchmarking/Cargo.toml
index 6be2787734a4..6c249ebcc61d 100644
--- a/frame/offences/benchmarking/Cargo.toml
+++ b/frame/offences/benchmarking/Cargo.toml
@@ -27,7 +27,7 @@ pallet-staking = { version = "3.0.0", default-features = false, features = ["run
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
 sp-staking = { version = "3.0.0", default-features = false, path = "../../../primitives/staking" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../../primitives/std" }
-sp-election-providers = { version = "3.0.0", default-features = false, path = "../../../primitives/election-providers" }
+frame-election-provider-support = { version = "3.0.0", default-features = false, path = "../../election-provider-support" }
 
 [dev-dependencies]
 pallet-staking-reward-curve = { version = "3.0.0", path = "../../staking/reward-curve" }
@@ -51,7 +51,7 @@ std = [
 	"pallet-staking/std",
 	"sp-runtime/std",
 	"sp-staking/std",
-	"sp-election-providers/std",
+	"frame-election-provider-support/std",
 	"sp-std/std",
 	"codec/std",
 ]
diff --git a/frame/offences/benchmarking/src/mock.rs b/frame/offences/benchmarking/src/mock.rs
index 54d649381eea..d659025247d1 100644
--- a/frame/offences/benchmarking/src/mock.rs
+++ b/frame/offences/benchmarking/src/mock.rs
@@ -29,7 +29,7 @@ use sp_runtime::{
 	traits::IdentityLookup,
 	testing::{Header, UintAuthorityId},
 };
-use sp_election_providers::onchain;
+use frame_election_provider_support::onchain;
 use pallet_session::historical as pallet_session_historical;
 
 type AccountId = u64;
@@ -152,6 +152,7 @@ pub type Extrinsic = sp_runtime::testing::TestXt<Call, ()>;
 impl onchain::Config for Test {
 	type AccountId = AccountId;
 	type BlockNumber = BlockNumber;
+	type BlockWeights = ();
 	type Accuracy = Perbill;
 	type DataProvider = Staking;
 }
diff --git a/frame/session/benchmarking/Cargo.toml b/frame/session/benchmarking/Cargo.toml
index 47265ed5ef7a..0c83347b1991 100644
--- a/frame/session/benchmarking/Cargo.toml
+++ b/frame/session/benchmarking/Cargo.toml
@@ -31,14 +31,14 @@ pallet-staking-reward-curve = { version = "3.0.0", path = "../../staking/reward-
 sp-io ={ version = "3.0.0", path = "../../../primitives/io" }
 pallet-timestamp = { version = "3.0.0", path = "../../timestamp" }
 pallet-balances = { version = "3.0.0", path = "../../balances" }
-sp-election-providers = { version = "3.0.0", path = "../../../primitives/election-providers" }
+frame-election-provider-support = { version = "3.0.0", path = "../../election-provider-support" }
 
 [features]
 default = ["std"]
 std = [
 	"sp-std/std",
 	"sp-session/std",
-	"sp-election-providers/std",
+	"frame-election-provider-support/std",
 	"sp-runtime/std",
 	"frame-system/std",
 	"frame-benchmarking/std",
diff --git a/frame/session/benchmarking/src/mock.rs b/frame/session/benchmarking/src/mock.rs
index 0eba5452b28d..8c392c4e1096 100644
--- a/frame/session/benchmarking/src/mock.rs
+++ b/frame/session/benchmarking/src/mock.rs
@@ -20,7 +20,7 @@
 #![cfg(test)]
 
 use sp_runtime::traits::IdentityLookup;
-use sp_election_providers::onchain;
+use frame_election_provider_support::onchain;
 use frame_support::parameter_types;
 
 type AccountId = u64;
@@ -157,6 +157,7 @@ where
 impl onchain::Config for Test {
 	type AccountId = AccountId;
 	type BlockNumber = BlockNumber;
+	type BlockWeights = ();
 	type Accuracy = sp_runtime::Perbill;
 	type DataProvider = Staking;
 }
diff --git a/frame/staking/Cargo.toml b/frame/staking/Cargo.toml
index 1f9f29570a22..b4c281940372 100644
--- a/frame/staking/Cargo.toml
+++ b/frame/staking/Cargo.toml
@@ -28,7 +28,7 @@ pallet-session = { version = "3.0.0", default-features = false, features = ["his
 pallet-authorship = { version = "3.0.0", default-features = false, path = "../authorship" }
 sp-application-crypto = { version = "3.0.0", default-features = false, path = "../../primitives/application-crypto" }
 log = { version = "0.4.14", default-features = false }
-sp-election-providers = { version = "3.0.0", default-features = false, path = "../../primitives/election-providers" }
+frame-election-provider-support = { version = "3.0.0", default-features = false, path = "../election-provider-support" }
 
 # Optional imports for benchmarking
 frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
@@ -43,7 +43,7 @@ pallet-timestamp = { version = "3.0.0", path = "../timestamp" }
 pallet-staking-reward-curve = { version = "3.0.0",  path = "../staking/reward-curve" }
 substrate-test-utils = { version = "3.0.0", path = "../../test-utils" }
 frame-benchmarking = { version = "3.1.0", path = "../benchmarking" }
-sp-election-providers = { version = "3.0.0", features = ["runtime-benchmarks"], path = "../../primitives/election-providers" }
+frame-election-provider-support = { version = "3.0.0", features = ["runtime-benchmarks"], path = "../election-provider-support" }
 rand_chacha = { version = "0.2" }
 parking_lot = "0.11.1"
 hex = "0.4"
@@ -64,11 +64,11 @@ std = [
 	"pallet-authorship/std",
 	"sp-application-crypto/std",
 	"log/std",
-	"sp-election-providers/std",
+	"frame-election-provider-support/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
-	"sp-election-providers/runtime-benchmarks",
+	"frame-election-provider-support/runtime-benchmarks",
 	"rand_chacha",
 ]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/staking/fuzzer/Cargo.toml b/frame/staking/fuzzer/Cargo.toml
index 84758c6bf65c..fb36327e5e91 100644
--- a/frame/staking/fuzzer/Cargo.toml
+++ b/frame/staking/fuzzer/Cargo.toml
@@ -28,7 +28,7 @@ sp-io ={ version = "3.0.0", path = "../../../primitives/io" }
 sp-core = { version = "3.0.0", path = "../../../primitives/core" }
 sp-npos-elections = { version = "3.0.0", path = "../../../primitives/npos-elections" }
 sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
-sp-election-providers = { version = "3.0.0", path = "../../../primitives/election-providers" }
+frame-election-provider-support = { version = "3.0.0", path = "../../election-provider-support" }
 serde = "1.0.101"
 
 [features]
diff --git a/frame/staking/fuzzer/src/mock.rs b/frame/staking/fuzzer/src/mock.rs
index 05d001d23858..a87e1fc08301 100644
--- a/frame/staking/fuzzer/src/mock.rs
+++ b/frame/staking/fuzzer/src/mock.rs
@@ -158,11 +158,16 @@ where
 }
 
 pub struct MockElectionProvider;
-impl sp_election_providers::ElectionProvider<AccountId, BlockNumber> for MockElectionProvider {
+impl frame_election_provider_support::ElectionProvider<AccountId, BlockNumber>
+	for MockElectionProvider
+{
 	type Error = ();
 	type DataProvider = pallet_staking::Module<Test>;
 
-	fn elect() -> Result<sp_npos_elections::Supports<AccountId>, Self::Error> {
+	fn elect() -> Result<
+		(sp_npos_elections::Supports<AccountId>, frame_support::weights::Weight),
+		Self::Error
+	> {
 		Err(())
 	}
 }
diff --git a/frame/staking/src/benchmarking.rs b/frame/staking/src/benchmarking.rs
index ecaa9889b5fb..8e0273622b05 100644
--- a/frame/staking/src/benchmarking.rs
+++ b/frame/staking/src/benchmarking.rs
@@ -25,12 +25,9 @@ use sp_npos_elections::CompactSolution;
 use sp_runtime::traits::One;
 use frame_system::RawOrigin;
 pub use frame_benchmarking::{
-	benchmarks,
-	account,
-	whitelisted_caller,
-	whitelist_account,
-	impl_benchmark_test_suite,
+	benchmarks, account, whitelisted_caller, whitelist_account, impl_benchmark_test_suite,
 };
+
 const SEED: u32 = 0;
 const MAX_SPANS: u32 = 100;
 const MAX_VALIDATORS: u32 = 1000;
@@ -768,6 +765,39 @@ benchmarks! {
 			).is_err()
 		);
 	}
+
+	get_npos_voters {
+		// number of validator intention.
+		let v in 200 .. 400;
+		// number of nominator intention.
+		let n in 200 .. 400;
+		// total number of slashing spans. Assigned to validators randomly.
+		let s in 1 .. 20;
+
+		let validators = create_validators_with_nominators_for_era::<T>(v, n, MAX_NOMINATIONS, false, None)?
+			.into_iter()
+			.map(|v| T::Lookup::lookup(v).unwrap())
+			.collect::<Vec<_>>();
+
+		(0..s).for_each(|index| {
+			add_slashing_spans::<T>(&validators[index as usize], 10);
+		});
+	}: {
+		let voters = <Staking<T>>::get_npos_voters();
+		assert_eq!(voters.len() as u32, v + n);
+	}
+
+	get_npos_targets {
+		// number of validator intention.
+		let v in 200 .. 400;
+		// number of nominator intention.
+		let n = 500;
+
+		let _ = create_validators_with_nominators_for_era::<T>(v, n, MAX_NOMINATIONS, false, None)?;
+	}: {
+		let targets = <Staking<T>>::get_npos_targets();
+		assert_eq!(targets.len() as u32, v);
+	}
 }
 
 #[cfg(test)]
@@ -875,7 +905,6 @@ mod tests {
 			assert_ok!(test_benchmark_submit_solution_weaker::<Test>());
 		});
 	}
-
 }
 
 impl_benchmark_test_suite!(
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index c57fac43c560..239effc36443 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -331,7 +331,7 @@ use sp_npos_elections::{
 	to_supports, EvaluateSupport, seq_phragmen, generate_solution_type, is_score_better, Supports,
 	VoteWeight, CompactSolution, PerThing128,
 };
-use sp_election_providers::ElectionProvider;
+use frame_election_provider_support::{ElectionProvider, data_provider};
 pub use weights::WeightInfo;
 
 const STAKING_ID: LockIdentifier = *b"staking ";
@@ -800,7 +800,7 @@ pub trait Config: frame_system::Config + SendTransactionTypes<Call<Self>> {
 	type CurrencyToVote: CurrencyToVote<BalanceOf<Self>>;
 
 	/// Something that provides the election functionality.
-	type ElectionProvider: sp_election_providers::ElectionProvider<
+	type ElectionProvider: frame_election_provider_support::ElectionProvider<
 		Self::AccountId,
 		Self::BlockNumber,
 		// we only accept an election provider that has staking as data provider.
@@ -3345,19 +3345,45 @@ impl<T: Config> Module<T> {
 	}
 }
 
-impl<T: Config> sp_election_providers::ElectionDataProvider<T::AccountId, T::BlockNumber>
+impl<T: Config> frame_election_provider_support::ElectionDataProvider<T::AccountId, T::BlockNumber>
 	for Module<T>
 {
-	fn desired_targets() -> u32 {
-		Self::validator_count()
+	fn desired_targets() -> data_provider::Result<(u32, Weight)> {
+		Ok((Self::validator_count(), <T as frame_system::Config>::DbWeight::get().reads(1)))
 	}
 
-	fn voters() -> Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)> {
-		Self::get_npos_voters()
+	fn voters(
+		maybe_max_len: Option<usize>,
+	) -> data_provider::Result<(Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)>, Weight)> {
+		// NOTE: reading these counts already needs to iterate a lot of storage keys, but they get
+		// cached. This is okay for the case of `Ok(_)`, but bad for `Err(_)`, as the trait does not
+		// report weight in failures.
+		let nominator_count = <Nominators<T>>::iter().count();
+		let validator_count = <Validators<T>>::iter().count();
+		let voter_count = nominator_count.saturating_add(validator_count);
+
+		if maybe_max_len.map_or(false, |max_len| voter_count > max_len) {
+			return Err("Voter snapshot too big");
+		}
+
+		let slashing_span_count = <SlashingSpans<T>>::iter().count();
+		let weight = T::WeightInfo::get_npos_voters(
+			nominator_count as u32,
+			validator_count as u32,
+			slashing_span_count as u32,
+		);
+		Ok((Self::get_npos_voters(), weight))
 	}
 
-	fn targets() -> Vec<T::AccountId> {
-		Self::get_npos_targets()
+	fn targets(maybe_max_len: Option<usize>) -> data_provider::Result<(Vec<T::AccountId>, Weight)> {
+		let target_count = <Validators<T>>::iter().count();
+
+		if maybe_max_len.map_or(false, |max_len| target_count > max_len) {
+			return Err("Target snapshot too big");
+		}
+
+		let weight = <T as frame_system::Config>::DbWeight::get().reads(target_count as u64);
+		Ok((Self::get_npos_targets(), weight))
 	}
 
 	fn next_election_prediction(now: T::BlockNumber) -> T::BlockNumber {
@@ -3391,15 +3417,45 @@ impl<T: Config> sp_election_providers::ElectionDataProvider<T::AccountId, T::Blo
 	fn put_snapshot(
 		voters: Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)>,
 		targets: Vec<T::AccountId>,
+		target_stake: Option<VoteWeight>,
 	) {
+		use sp_std::convert::TryFrom;
 		targets.into_iter().for_each(|v| {
+			let stake: BalanceOf<T> = target_stake
+				.and_then(|w| <BalanceOf<T>>::try_from(w).ok())
+				.unwrap_or(T::Currency::minimum_balance() * 100u32.into());
+			<Bonded<T>>::insert(v.clone(), v.clone());
+			<Ledger<T>>::insert(
+				v.clone(),
+				StakingLedger {
+					stash: v.clone(),
+					active: stake,
+					total: stake,
+					unlocking: vec![],
+					claimed_rewards: vec![],
+				},
+			);
 			<Validators<T>>::insert(
 				v,
 				ValidatorPrefs { commission: Perbill::zero(), blocked: false },
 			);
 		});
 
-		voters.into_iter().for_each(|(v, _s, t)| {
+		voters.into_iter().for_each(|(v, s, t)| {
+			let stake = <BalanceOf<T>>::try_from(s).unwrap_or_else(|_| {
+				panic!("cannot convert a VoteWeight into BalanceOf, benchmark needs reconfiguring.")
+			});
+			<Bonded<T>>::insert(v.clone(), v.clone());
+			<Ledger<T>>::insert(
+				v.clone(),
+				StakingLedger {
+					stash: v.clone(),
+					active: stake,
+					total: stake,
+					unlocking: vec![],
+					claimed_rewards: vec![],
+				},
+			);
 			<Nominators<T>>::insert(
 				v,
 				Nominations { targets: t, submitted_in: 0, suppressed: false },
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index 0d6701c48b89..b0e3d9629a35 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -37,7 +37,7 @@ use sp_runtime::{
 };
 use sp_staking::offence::{OffenceDetails, OnOffenceHandler};
 use std::{cell::RefCell, collections::HashSet};
-use sp_election_providers::onchain;
+use frame_election_provider_support::onchain;
 
 pub const INIT_TIMESTAMP: u64 = 30_000;
 pub const BLOCK_TIME: u64 = 1000;
@@ -243,6 +243,7 @@ impl OnUnbalanced<NegativeImbalanceOf<Test>> for RewardRemainderMock {
 impl onchain::Config for Test {
 	type AccountId = AccountId;
 	type BlockNumber = BlockNumber;
+	type BlockWeights = BlockWeights;
 	type Accuracy = Perbill;
 	type DataProvider = Staking;
 }
diff --git a/frame/staking/src/offchain_election.rs b/frame/staking/src/offchain_election.rs
index 8398c2022fc3..cacfe454ec70 100644
--- a/frame/staking/src/offchain_election.rs
+++ b/frame/staking/src/offchain_election.rs
@@ -521,6 +521,12 @@ mod test {
 		fn kick(w: u32) -> Weight {
 			unimplemented!()
 		}
+		fn get_npos_voters(v: u32, n: u32, s: u32) -> Weight {
+			unimplemented!()
+		}
+		fn get_npos_targets(v: u32) -> Weight {
+			unimplemented!()
+		}
 	}
 
 	#[test]
diff --git a/frame/staking/src/testing_utils.rs b/frame/staking/src/testing_utils.rs
index f6ee89704d8d..5affc50d81df 100644
--- a/frame/staking/src/testing_utils.rs
+++ b/frame/staking/src/testing_utils.rs
@@ -112,10 +112,10 @@ pub fn create_validators<T: Config>(
 /// - `nominators`: number of bonded nominators.
 /// - `edge_per_nominator`: number of edge (vote) per nominator.
 /// - `randomize_stake`: whether to randomize the stakes.
-/// - `to_nominate`: if `Some(n)`, only the first `n` bonded validator are voted upon.
-///    Else, all of them are considered and `edge_per_nominator` random validators are voted for.
+/// - `to_nominate`: if `Some(n)`, only the first `n` bonded validator are voted upon. Else, all of
+///   them are considered and `edge_per_nominator` random validators are voted for.
 ///
-/// Return the validators choosen to be nominated.
+/// Return the validators chosen to be nominated.
 pub fn create_validators_with_nominators_for_era<T: Config>(
 	validators: u32,
 	nominators: u32,
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index 92e1862e3981..0008f8cdba6d 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -5019,12 +5019,14 @@ fn do_not_die_when_active_is_ed() {
 
 mod election_data_provider {
 	use super::*;
-	use sp_election_providers::ElectionDataProvider;
+	use frame_election_provider_support::ElectionDataProvider;
 
 	#[test]
 	fn voters_include_self_vote() {
 		ExtBuilder::default().nominate(false).build().execute_with(|| {
-			assert!(<Validators<Test>>::iter().map(|(x, _)| x).all(|v| Staking::voters()
+			assert!(<Validators<Test>>::iter().map(|(x, _)| x).all(|v| Staking::voters(None)
+				.unwrap()
+				.0
 				.into_iter()
 				.find(|(w, _, t)| { v == *w && t[0] == *w })
 				.is_some()))
@@ -5036,7 +5038,9 @@ mod election_data_provider {
 		ExtBuilder::default().build().execute_with(|| {
 			assert_eq!(Staking::nominators(101).unwrap().targets, vec![11, 21]);
 			assert_eq!(
-				<Staking as ElectionDataProvider<AccountId, BlockNumber>>::voters()
+				<Staking as ElectionDataProvider<AccountId, BlockNumber>>::voters(None)
+					.unwrap()
+					.0
 					.iter()
 					.find(|x| x.0 == 101)
 					.unwrap()
@@ -5050,7 +5054,9 @@ mod election_data_provider {
 			// 11 is gone.
 			start_active_era(2);
 			assert_eq!(
-				<Staking as ElectionDataProvider<AccountId, BlockNumber>>::voters()
+				<Staking as ElectionDataProvider<AccountId, BlockNumber>>::voters(None)
+					.unwrap()
+					.0
 					.iter()
 					.find(|x| x.0 == 101)
 					.unwrap()
@@ -5061,7 +5067,9 @@ mod election_data_provider {
 			// resubmit and it is back
 			assert_ok!(Staking::nominate(Origin::signed(100), vec![11, 21]));
 			assert_eq!(
-				<Staking as ElectionDataProvider<AccountId, BlockNumber>>::voters()
+				<Staking as ElectionDataProvider<AccountId, BlockNumber>>::voters(None)
+					.unwrap()
+					.0
 					.iter()
 					.find(|x| x.0 == 101)
 					.unwrap()
@@ -5071,6 +5079,14 @@ mod election_data_provider {
 		})
 	}
 
+	#[test]
+	fn respects_len_limits() {
+		ExtBuilder::default().build().execute_with(|| {
+			assert_eq!(Staking::voters(Some(1)).unwrap_err(), "Voter snapshot too big");
+			assert_eq!(Staking::targets(Some(1)).unwrap_err(), "Target snapshot too big");
+		});
+	}
+
 	#[test]
 	fn estimate_next_election_works() {
 		ExtBuilder::default().session_per_era(5).period(5).build().execute_with(|| {
diff --git a/frame/staking/src/weights.rs b/frame/staking/src/weights.rs
index 3489a1013542..e895a9e4d51e 100644
--- a/frame/staking/src/weights.rs
+++ b/frame/staking/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_staking
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-02-13, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2021-03-14, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -69,161 +69,163 @@ pub trait WeightInfo {
 	fn reap_stash(s: u32, ) -> Weight;
 	fn new_era(v: u32, n: u32, ) -> Weight;
 	fn submit_solution_better(v: u32, n: u32, a: u32, w: u32, ) -> Weight;
+	fn get_npos_voters(v: u32, n: u32, s: u32, ) -> Weight;
+	fn get_npos_targets(v: u32, ) -> Weight;
 }
 
 /// Weights for pallet_staking using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn bond() -> Weight {
-		(81_642_000 as Weight)
+		(80_317_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn bond_extra() -> Weight {
-		(66_025_000 as Weight)
+		(64_495_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn unbond() -> Weight {
-		(60_810_000 as Weight)
+		(59_679_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn withdraw_unbonded_update(s: u32, ) -> Weight {
-		(61_537_000 as Weight)
+		(61_078_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((60_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((40_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
-		(95_741_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((2_754_000 as Weight).saturating_mul(s as Weight))
+		(95_129_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((2_755_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes(8 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn validate() -> Weight {
-		(21_009_000 as Weight)
+		(20_608_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn kick(k: u32, ) -> Weight {
-		(31_832_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((19_418_000 as Weight).saturating_mul(k as Weight))
+		(33_365_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((18_830_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(k as Weight)))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn nominate(n: u32, ) -> Weight {
-		(34_304_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((5_643_000 as Weight).saturating_mul(n as Weight))
+		(33_885_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((5_562_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn chill() -> Weight {
-		(20_103_000 as Weight)
+		(19_741_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn set_payee() -> Weight {
-		(13_858_000 as Weight)
+		(13_674_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_controller() -> Weight {
-		(30_269_000 as Weight)
+		(29_691_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn set_validator_count() -> Weight {
-		(2_444_000 as Weight)
+		(2_375_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_no_eras() -> Weight {
-		(2_766_000 as Weight)
+		(2_601_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_new_era() -> Weight {
-		(2_724_000 as Weight)
+		(2_605_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_new_era_always() -> Weight {
-		(2_702_000 as Weight)
+		(2_584_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_invulnerables(v: u32, ) -> Weight {
-		(2_914_000 as Weight)
+		(2_725_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((35_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_unstake(s: u32, ) -> Weight {
-		(64_032_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((2_787_000 as Weight).saturating_mul(s as Weight))
+		(63_551_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((2_844_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(8 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn cancel_deferred_slash(s: u32, ) -> Weight {
-		(5_903_394_000 as Weight)
+		(5_905_400_000 as Weight)
 			// Standard Error: 391_000
-			.saturating_add((34_834_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((34_785_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn payout_stakers_dead_controller(n: u32, ) -> Weight {
-		(141_724_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((53_018_000 as Weight).saturating_mul(n as Weight))
+		(142_264_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((52_542_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(11 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(n as Weight)))
 	}
 	fn payout_stakers_alive_staked(n: u32, ) -> Weight {
-		(159_994_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((67_746_000 as Weight).saturating_mul(n as Weight))
+		(180_166_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((66_767_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(12 as Weight))
 			.saturating_add(T::DbWeight::get().reads((5 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(n as Weight)))
 	}
 	fn rebond(l: u32, ) -> Weight {
-		(42_177_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((82_000 as Weight).saturating_mul(l as Weight))
+		(42_577_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((60_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn set_history_depth(e: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 65_000
-			.saturating_add((34_151_000 as Weight).saturating_mul(e as Weight))
+			// Standard Error: 68_000
+			.saturating_add((33_362_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes((7 as Weight).saturating_mul(e as Weight)))
 	}
 	fn reap_stash(s: u32, ) -> Weight {
-		(68_377_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((2_757_000 as Weight).saturating_mul(s as Weight))
+		(68_474_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((2_770_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(8 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn new_era(v: u32, n: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 908_000
-			.saturating_add((588_562_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 903_000
+			.saturating_add((594_145_000 as Weight).saturating_mul(v as Weight))
 			// Standard Error: 45_000
-			.saturating_add((83_485_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((83_373_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(9 as Weight))
 			.saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
@@ -233,172 +235,191 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn submit_solution_better(v: u32, n: u32, a: u32, w: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 52_000
-			.saturating_add((750_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((1_460_000 as Weight).saturating_mul(v as Weight))
 			// Standard Error: 20_000
-			.saturating_add((556_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((754_000 as Weight).saturating_mul(n as Weight))
 			// Standard Error: 52_000
-			.saturating_add((76_201_000 as Weight).saturating_mul(a as Weight))
+			.saturating_add((74_798_000 as Weight).saturating_mul(a as Weight))
 			// Standard Error: 108_000
-			.saturating_add((7_271_000 as Weight).saturating_mul(w as Weight))
+			.saturating_add((8_108_000 as Weight).saturating_mul(w as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(a as Weight)))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(w as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	fn get_npos_voters(v: u32, n: u32, s: u32, ) -> Weight {
+		(0 as Weight)
+			// Standard Error: 94_000
+			.saturating_add((29_321_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 94_000
+			.saturating_add((66_885_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 1_283_000
+			.saturating_add((22_991_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(v as Weight)))
+			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
+	}
+	fn get_npos_targets(v: u32, ) -> Weight {
+		(0 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((10_972_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(v as Weight)))
+	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn bond() -> Weight {
-		(81_642_000 as Weight)
+		(80_317_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn bond_extra() -> Weight {
-		(66_025_000 as Weight)
+		(64_495_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn unbond() -> Weight {
-		(60_810_000 as Weight)
+		(59_679_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn withdraw_unbonded_update(s: u32, ) -> Weight {
-		(61_537_000 as Weight)
+		(61_078_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((60_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((40_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
-		(95_741_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((2_754_000 as Weight).saturating_mul(s as Weight))
+		(95_129_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((2_755_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn validate() -> Weight {
-		(21_009_000 as Weight)
+		(20_608_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn kick(k: u32, ) -> Weight {
-		(31_832_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((19_418_000 as Weight).saturating_mul(k as Weight))
+		(33_365_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((18_830_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(k as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn nominate(n: u32, ) -> Weight {
-		(34_304_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((5_643_000 as Weight).saturating_mul(n as Weight))
+		(33_885_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((5_562_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn chill() -> Weight {
-		(20_103_000 as Weight)
+		(19_741_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn set_payee() -> Weight {
-		(13_858_000 as Weight)
+		(13_674_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_controller() -> Weight {
-		(30_269_000 as Weight)
+		(29_691_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn set_validator_count() -> Weight {
-		(2_444_000 as Weight)
+		(2_375_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_no_eras() -> Weight {
-		(2_766_000 as Weight)
+		(2_601_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_new_era() -> Weight {
-		(2_724_000 as Weight)
+		(2_605_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_new_era_always() -> Weight {
-		(2_702_000 as Weight)
+		(2_584_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_invulnerables(v: u32, ) -> Weight {
-		(2_914_000 as Weight)
+		(2_725_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((35_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_unstake(s: u32, ) -> Weight {
-		(64_032_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((2_787_000 as Weight).saturating_mul(s as Weight))
+		(63_551_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((2_844_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn cancel_deferred_slash(s: u32, ) -> Weight {
-		(5_903_394_000 as Weight)
+		(5_905_400_000 as Weight)
 			// Standard Error: 391_000
-			.saturating_add((34_834_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((34_785_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn payout_stakers_dead_controller(n: u32, ) -> Weight {
-		(141_724_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((53_018_000 as Weight).saturating_mul(n as Weight))
+		(142_264_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((52_542_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(11 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(n as Weight)))
 	}
 	fn payout_stakers_alive_staked(n: u32, ) -> Weight {
-		(159_994_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((67_746_000 as Weight).saturating_mul(n as Weight))
+		(180_166_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((66_767_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(12 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((5 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(n as Weight)))
 	}
 	fn rebond(l: u32, ) -> Weight {
-		(42_177_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((82_000 as Weight).saturating_mul(l as Weight))
+		(42_577_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((60_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn set_history_depth(e: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 65_000
-			.saturating_add((34_151_000 as Weight).saturating_mul(e as Weight))
+			// Standard Error: 68_000
+			.saturating_add((33_362_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((7 as Weight).saturating_mul(e as Weight)))
 	}
 	fn reap_stash(s: u32, ) -> Weight {
-		(68_377_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((2_757_000 as Weight).saturating_mul(s as Weight))
+		(68_474_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((2_770_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn new_era(v: u32, n: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 908_000
-			.saturating_add((588_562_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 903_000
+			.saturating_add((594_145_000 as Weight).saturating_mul(v as Weight))
 			// Standard Error: 45_000
-			.saturating_add((83_485_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((83_373_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(9 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((4 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
@@ -408,16 +429,35 @@ impl WeightInfo for () {
 	fn submit_solution_better(v: u32, n: u32, a: u32, w: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 52_000
-			.saturating_add((750_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((1_460_000 as Weight).saturating_mul(v as Weight))
 			// Standard Error: 20_000
-			.saturating_add((556_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((754_000 as Weight).saturating_mul(n as Weight))
 			// Standard Error: 52_000
-			.saturating_add((76_201_000 as Weight).saturating_mul(a as Weight))
+			.saturating_add((74_798_000 as Weight).saturating_mul(a as Weight))
 			// Standard Error: 108_000
-			.saturating_add((7_271_000 as Weight).saturating_mul(w as Weight))
+			.saturating_add((8_108_000 as Weight).saturating_mul(w as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((4 as Weight).saturating_mul(a as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(w as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	fn get_npos_voters(v: u32, n: u32, s: u32, ) -> Weight {
+		(0 as Weight)
+			// Standard Error: 94_000
+			.saturating_add((29_321_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 94_000
+			.saturating_add((66_885_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 1_283_000
+			.saturating_add((22_991_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((4 as Weight).saturating_mul(v as Weight)))
+			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
+	}
+	fn get_npos_targets(v: u32, ) -> Weight {
+		(0 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((10_972_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(v as Weight)))
+	}
 }
diff --git a/frame/system/src/offchain.rs b/frame/system/src/offchain.rs
index aa8bce966192..fe601f995ce5 100644
--- a/frame/system/src/offchain.rs
+++ b/frame/system/src/offchain.rs
@@ -38,10 +38,10 @@
 //!
 //! To be able to use signing, the following trait should be implemented:
 //!
-//! - [`AppCrypto`](./trait.AppCrypto.html): where an application-specific key
-//!   is defined and can be used by this module's helpers for signing.
-//! - [`CreateSignedTransaction`](./trait.CreateSignedTransaction.html): where
-//!   the manner in which the transaction is constructed is defined.
+//! - [`AppCrypto`](./trait.AppCrypto.html): where an application-specific key is defined and can be
+//!   used by this module's helpers for signing.
+//! - [`CreateSignedTransaction`](./trait.CreateSignedTransaction.html): where the manner in which
+//!   the transaction is constructed is defined.
 //!
 //! #### Submit an unsigned transaction with a signed payload
 //!
@@ -53,7 +53,6 @@
 //! #### Submit a signed transaction
 //!
 //! [`Signer`](./struct.Signer.html) can be used to sign/verify payloads
-//!
 
 #![warn(missing_docs)]
 
@@ -473,7 +472,7 @@ pub trait SendTransactionTypes<LocalCall> {
 	/// The runtime's call type.
 	///
 	/// This has additional bound to be able to be created from pallet-local `Call` types.
-	type OverarchingCall: From<LocalCall>;
+	type OverarchingCall: From<LocalCall> + codec::Encode;
 }
 
 /// Create signed transaction.
diff --git a/primitives/npos-elections/src/lib.rs b/primitives/npos-elections/src/lib.rs
index c87085ef9ff8..433c470d57d4 100644
--- a/primitives/npos-elections/src/lib.rs
+++ b/primitives/npos-elections/src/lib.rs
@@ -142,10 +142,22 @@ pub trait CompactSolution: Sized {
 	const LIMIT: usize;
 
 	/// The voter type. Needs to be an index (convert to usize).
-	type Voter: UniqueSaturatedInto<usize> + TryInto<usize> + TryFrom<usize> + Debug + Copy + Clone;
+	type Voter: UniqueSaturatedInto<usize>
+		+ TryInto<usize>
+		+ TryFrom<usize>
+		+ Debug
+		+ Copy
+		+ Clone
+		+ Bounded;
 
 	/// The target type. Needs to be an index (convert to usize).
-	type Target: UniqueSaturatedInto<usize> + TryInto<usize> + TryFrom<usize> + Debug + Copy + Clone;
+	type Target: UniqueSaturatedInto<usize>
+		+ TryInto<usize>
+		+ TryFrom<usize>
+		+ Debug
+		+ Copy
+		+ Clone
+		+ Bounded;
 
 	/// The weight/accuracy type of each vote.
 	type Accuracy: PerThing128;

From 39b31316815ec6d709e7ad7c1a31c436d14c53e6 Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Tue, 16 Mar 2021 13:03:58 +0100
Subject: [PATCH 0505/1194] staking: Flexible generation of reward curve and
 associated tweaks (#8327)

* Initial abstraction

* Alter rest of APIs

* Fixes

* Some extra getters in Gilt pallet.

* Refactor Gilt to avoid u128 conversions

* Simplify and improve pow in per_things

* Add scalar division to per_things

* Renaming from_fraction -> from_float, drop _approximation

* Fixes

* Fixes

* Fixes

* Fixes

* Make stuff build

* Fixes

* Fixes

* Fixes

* Fixes

* Update .gitignore

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Update frame/gilt/src/lib.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Update frame/gilt/src/mock.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Fixes

* Fixes

* Fixes

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
---
 .gitignore                                    |   1 +
 bin/node/runtime/src/impls.rs                 |   2 +-
 bin/node/runtime/src/lib.rs                   |   9 +-
 frame/babe/src/equivocation.rs                |   2 +-
 frame/babe/src/lib.rs                         |   2 +-
 frame/babe/src/mock.rs                        |   2 +-
 frame/contracts/src/tests.rs                  |   2 +-
 frame/gilt/src/lib.rs                         |  60 +++-
 frame/gilt/src/mock.rs                        |   1 +
 frame/grandpa/src/equivocation.rs             |   2 +-
 frame/grandpa/src/mock.rs                     |   2 +-
 frame/im-online/src/lib.rs                    |   8 +-
 frame/offences/benchmarking/src/mock.rs       |   2 +-
 frame/session/benchmarking/src/mock.rs        |   2 +-
 frame/session/src/lib.rs                      |   4 +-
 frame/staking/fuzzer/src/mock.rs              |   2 +-
 frame/staking/src/inflation.rs                |   2 +-
 frame/staking/src/lib.rs                      |  68 ++++-
 frame/staking/src/mock.rs                     |  21 +-
 frame/staking/src/testing_utils.rs            |   2 +-
 frame/staking/src/tests.rs                    |  16 +-
 frame/support/src/weights.rs                  |  11 +-
 .../fuzzer/src/per_thing_rational.rs          |  36 +--
 primitives/arithmetic/src/fixed_point.rs      |   2 +-
 primitives/arithmetic/src/lib.rs              |   2 +-
 primitives/arithmetic/src/per_things.rs       | 276 ++++++++++--------
 primitives/npos-elections/src/helpers.rs      |   8 +-
 primitives/npos-elections/src/lib.rs          |   4 +-
 primitives/npos-elections/src/mock.rs         |   2 +-
 primitives/npos-elections/src/phragmms.rs     |   2 +-
 primitives/npos-elections/src/pjr.rs          |   3 +-
 primitives/npos-elections/src/tests.rs        |  10 +-
 32 files changed, 342 insertions(+), 226 deletions(-)

diff --git a/.gitignore b/.gitignore
index ce302c74e10a..0486a1a716e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ rls*.log
 .cargo/
 .cargo-remote.toml
 *.bin
+*.iml
diff --git a/bin/node/runtime/src/impls.rs b/bin/node/runtime/src/impls.rs
index c6a56e5ac0da..416266119cb0 100644
--- a/bin/node/runtime/src/impls.rs
+++ b/bin/node/runtime/src/impls.rs
@@ -84,7 +84,7 @@ mod multiplier_tests {
 		let t1 = v * (s/m - ss/m);
 		let t2 = v.powi(2) * (s/m - ss/m).powi(2) / 2.0;
 		let next_float = previous_float * (1.0 + t1 + t2);
-		Multiplier::from_fraction(next_float)
+		Multiplier::from_float(next_float)
 	}
 
 	fn run_with_system_weight<F>(w: Weight, assertions: F) where F: Fn() -> () {
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index bb372f31c73b..49c6cb529130 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -471,7 +471,7 @@ parameter_types! {
 	pub const ElectionLookahead: BlockNumber = EPOCH_DURATION_IN_BLOCKS / 4;
 	pub const MaxIterations: u32 = 10;
 	// 0.05%. The higher the value, the more strict solution acceptance becomes.
-	pub MinSolutionScoreBump: Perbill = Perbill::from_rational_approximation(5u32, 10_000);
+	pub MinSolutionScoreBump: Perbill = Perbill::from_rational(5u32, 10_000);
 	pub OffchainSolutionWeightLimit: Weight = RuntimeBlockWeights::get()
 		.get(DispatchClass::Normal)
 		.max_extrinsic.expect("Normal extrinsics have a weight limit configured; qed")
@@ -496,7 +496,7 @@ impl pallet_staking::Config for Runtime {
 		pallet_collective::EnsureProportionAtLeast<_3, _4, AccountId, CouncilCollective>
 	>;
 	type SessionInterface = Self;
-	type RewardCurve = RewardCurve;
+	type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
 	type NextNewSession = Session;
 	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
 	type ElectionLookahead = ElectionLookahead;
@@ -520,7 +520,7 @@ parameter_types! {
 	pub const Fallback: pallet_election_provider_multi_phase::FallbackStrategy =
 		pallet_election_provider_multi_phase::FallbackStrategy::Nothing;
 
-	pub SolutionImprovementThreshold: Perbill = Perbill::from_rational_approximation(1u32, 10_000);
+	pub SolutionImprovementThreshold: Perbill = Perbill::from_rational(1u32, 10_000);
 
 	// miner configs
 	pub const MultiPhaseUnsignedPriority: TransactionPriority = StakingUnsignedPriority::get() - 1u64;
@@ -767,7 +767,7 @@ parameter_types! {
 	pub const DepositPerContract: Balance = TombstoneDeposit::get();
 	pub const DepositPerStorageByte: Balance = deposit(0, 1);
 	pub const DepositPerStorageItem: Balance = deposit(1, 0);
-	pub RentFraction: Perbill = Perbill::from_rational_approximation(1u32, 30 * DAYS);
+	pub RentFraction: Perbill = Perbill::from_rational(1u32, 30 * DAYS);
 	pub const SurchargeReward: Balance = 150 * MILLICENTS;
 	pub const SignedClaimHandicap: u32 = 2;
 	pub const MaxDepth: u32 = 32;
@@ -1065,6 +1065,7 @@ parameter_types! {
 impl pallet_gilt::Config for Runtime {
 	type Event = Event;
 	type Currency = Balances;
+	type CurrencyBalance = Balance;
 	type AdminOrigin = frame_system::EnsureRoot<AccountId>;
 	type Deficit = ();
 	type Surplus = ();
diff --git a/frame/babe/src/equivocation.rs b/frame/babe/src/equivocation.rs
index 14ba0f16cb9e..30fbaf31371b 100644
--- a/frame/babe/src/equivocation.rs
+++ b/frame/babe/src/equivocation.rs
@@ -290,7 +290,7 @@ impl<FullIdentification: Clone> Offence<FullIdentification>
 
 	fn slash_fraction(offenders_count: u32, validator_set_count: u32) -> Perbill {
 		// the formula is min((3k / n)^2, 1)
-		let x = Perbill::from_rational_approximation(3 * offenders_count, validator_set_count);
+		let x = Perbill::from_rational(3 * offenders_count, validator_set_count);
 		// _ ^ 2
 		x.square()
 	}
diff --git a/frame/babe/src/lib.rs b/frame/babe/src/lib.rs
index 00bfa4f2656c..c259b60c6a7c 100644
--- a/frame/babe/src/lib.rs
+++ b/frame/babe/src/lib.rs
@@ -784,7 +784,7 @@ impl<T: Config> frame_support::traits::EstimateNextSessionRotation<T::BlockNumbe
 		let elapsed = CurrentSlot::get().saturating_sub(Self::current_epoch_start()) + 1;
 
 		(
-			Some(Percent::from_rational_approximation(
+			Some(Percent::from_rational(
 				*elapsed,
 				T::EpochDuration::get(),
 			)),
diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index ef7a748c60b9..487535121ff1 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -205,7 +205,7 @@ impl pallet_staking::Config for Test {
 	type SlashCancelOrigin = frame_system::EnsureRoot<Self::AccountId>;
 	type SessionInterface = Self;
 	type UnixTime = pallet_timestamp::Module<Test>;
-	type RewardCurve = RewardCurve;
+	type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
 	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
 	type NextNewSession = Session;
 	type ElectionLookahead = ElectionLookahead;
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index 2fa09e3405c1..afa4dd5416bd 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -246,7 +246,7 @@ parameter_types! {
 	pub const DepositPerContract: u64 = 8 * DepositPerStorageByte::get();
 	pub const DepositPerStorageByte: u64 = 10_000;
 	pub const DepositPerStorageItem: u64 = 10_000;
-	pub RentFraction: Perbill = Perbill::from_rational_approximation(4u32, 10_000u32);
+	pub RentFraction: Perbill = Perbill::from_rational(4u32, 10_000u32);
 	pub const SurchargeReward: u64 = 500_000;
 	pub const MaxDepth: u32 = 100;
 	pub const MaxValueSize: u32 = 16_384;
diff --git a/frame/gilt/src/lib.rs b/frame/gilt/src/lib.rs
index ab35ce76742b..fde7e58c4a11 100644
--- a/frame/gilt/src/lib.rs
+++ b/frame/gilt/src/lib.rs
@@ -78,7 +78,7 @@ pub mod weights;
 pub mod pallet {
 	use sp_std::prelude::*;
 	use sp_arithmetic::{Perquintill, PerThing};
-	use sp_runtime::traits::{Zero, Saturating, SaturatedConversion};
+	use sp_runtime::traits::{Zero, Saturating};
 	use frame_support::traits::{Currency, OnUnbalanced, ReservableCurrency};
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
@@ -96,7 +96,13 @@ pub mod pallet {
 		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
 
 		/// Currency type that this works on.
-		type Currency: ReservableCurrency<Self::AccountId>;
+		type Currency: ReservableCurrency<Self::AccountId, Balance=Self::CurrencyBalance>;
+
+		/// Just the `Currency::Balance` type; we have this item to allow us to constrain it to
+		/// `From<u64>`.
+		type CurrencyBalance:
+			sp_runtime::traits::AtLeast32BitUnsigned + codec::FullCodec + Copy
+				+ MaybeSerializeDeserialize + sp_std::fmt::Debug + Default + From<u64>;
 
 		/// Origin required for setting the target proportion to be under gilt.
 		type AdminOrigin: EnsureOrigin<Self::Origin>;
@@ -448,11 +454,10 @@ pub mod pallet {
 			// Multiply the proportion it is by the total issued.
 			let total_issuance = T::Currency::total_issuance().saturating_sub(T::IgnoredIssuance::get());
 			ActiveTotal::<T>::mutate(|totals| {
-				let nongilt_issuance: u128 = total_issuance.saturating_sub(totals.frozen)
-					.saturated_into();
+				let nongilt_issuance = total_issuance.saturating_sub(totals.frozen);
 				let effective_issuance = totals.proportion.left_from_one()
 					.saturating_reciprocal_mul(nongilt_issuance);
-				let gilt_value: BalanceOf<T> = (gilt.proportion * effective_issuance).saturated_into();
+				let gilt_value = gilt.proportion * effective_issuance;
 
 				totals.frozen = totals.frozen.saturating_sub(gilt.amount);
 				totals.proportion = totals.proportion.saturating_sub(gilt.proportion);
@@ -488,7 +493,40 @@ pub mod pallet {
 		}
 	}
 
+	/// Issuance information returned by `issuance()`.
+	pub struct IssuanceInfo<Balance> {
+		/// The balance held in reserve over all active gilts.
+		pub reserved: Balance,
+		/// The issuance not held in reserve for active gilts. Together with `reserved` this sums to
+		/// `Currency::total_issuance`.
+		pub non_gilt: Balance,
+		/// The balance that `reserved` is effectively worth, at present. This is not issued funds
+		/// and could be less than `reserved` (though in most cases should be greater).
+		pub effective: Balance,
+	}
+
 	impl<T: Config> Pallet<T> {
+		/// Get the target amount of Gilts that we're aiming for.
+		pub fn target() -> Perquintill {
+			ActiveTotal::<T>::get().target
+		}
+
+		/// Returns information on the issuance of gilts.
+		pub fn issuance() -> IssuanceInfo<BalanceOf<T>> {
+			let totals = ActiveTotal::<T>::get();
+
+			let total_issuance = T::Currency::total_issuance();
+			let non_gilt = total_issuance.saturating_sub(totals.frozen);
+			let effective = totals.proportion.left_from_one()
+				.saturating_reciprocal_mul(non_gilt);
+
+			IssuanceInfo {
+				reserved: totals.frozen,
+				non_gilt,
+				effective,
+			}
+		}
+
 		/// Attempt to enlarge our gilt-set from bids in order to satisfy our desired target amount
 		/// of funds frozen into gilts.
 		pub fn pursue_target(max_bids: u32) -> Weight {
@@ -497,11 +535,10 @@ pub mod pallet {
 				let missing = totals.target.saturating_sub(totals.proportion);
 
 				let total_issuance = T::Currency::total_issuance().saturating_sub(T::IgnoredIssuance::get());
-				let nongilt_issuance: u128 = total_issuance.saturating_sub(totals.frozen)
-					.saturated_into();
+				let nongilt_issuance = total_issuance.saturating_sub(totals.frozen);
 				let effective_issuance = totals.proportion.left_from_one()
 					.saturating_reciprocal_mul(nongilt_issuance);
-				let intake: BalanceOf<T> = (missing * effective_issuance).saturated_into();
+				let intake = missing * effective_issuance;
 
 				let (bids_taken, queues_hit) = Self::enlarge(intake, max_bids);
 				let first_from_each_queue = T::WeightInfo::pursue_target_per_queue(queues_hit);
@@ -550,13 +587,12 @@ pub mod pallet {
 								qs[queue_index].1 = qs[queue_index].1.saturating_sub(bid.amount);
 
 								// Now to activate the bid...
-								let nongilt_issuance: u128 = total_issuance.saturating_sub(totals.frozen)
-									.saturated_into();
+								let nongilt_issuance = total_issuance.saturating_sub(totals.frozen);
 								let effective_issuance = totals.proportion.left_from_one()
 									.saturating_reciprocal_mul(nongilt_issuance);
-								let n: u128 = amount.saturated_into();
+								let n = amount;
 								let d = effective_issuance;
-								let proportion = Perquintill::from_rational_approximation(n, d);
+								let proportion = Perquintill::from_rational(n, d);
 								let who = bid.who;
 								let index = totals.index;
 								totals.frozen += bid.amount;
diff --git a/frame/gilt/src/mock.rs b/frame/gilt/src/mock.rs
index ca4ccaff73c5..b943089a741e 100644
--- a/frame/gilt/src/mock.rs
+++ b/frame/gilt/src/mock.rs
@@ -103,6 +103,7 @@ ord_parameter_types! {
 impl pallet_gilt::Config for Test {
 	type Event = Event;
 	type Currency = Balances;
+	type CurrencyBalance = <Self as pallet_balances::Config>::Balance;
 	type AdminOrigin = frame_system::EnsureSignedBy<One, Self::AccountId>;
 	type Deficit = ();
 	type Surplus = ();
diff --git a/frame/grandpa/src/equivocation.rs b/frame/grandpa/src/equivocation.rs
index 37496fdeb859..8ab86b2fed06 100644
--- a/frame/grandpa/src/equivocation.rs
+++ b/frame/grandpa/src/equivocation.rs
@@ -358,7 +358,7 @@ impl<FullIdentification: Clone> Offence<FullIdentification>
 
 	fn slash_fraction(offenders_count: u32, validator_set_count: u32) -> Perbill {
 		// the formula is min((3k / n)^2, 1)
-		let x = Perbill::from_rational_approximation(3 * offenders_count, validator_set_count);
+		let x = Perbill::from_rational(3 * offenders_count, validator_set_count);
 		// _ ^ 2
 		x.square()
 	}
diff --git a/frame/grandpa/src/mock.rs b/frame/grandpa/src/mock.rs
index 6e83ae481d27..d36d6a9fbc7a 100644
--- a/frame/grandpa/src/mock.rs
+++ b/frame/grandpa/src/mock.rs
@@ -211,7 +211,7 @@ impl pallet_staking::Config for Test {
 	type SlashCancelOrigin = frame_system::EnsureRoot<Self::AccountId>;
 	type SessionInterface = Self;
 	type UnixTime = pallet_timestamp::Module<Test>;
-	type RewardCurve = RewardCurve;
+	type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
 	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
 	type NextNewSession = Session;
 	type ElectionLookahead = ElectionLookahead;
diff --git a/frame/im-online/src/lib.rs b/frame/im-online/src/lib.rs
index e00b5aa9d139..df0cfa92dbb2 100644
--- a/frame/im-online/src/lib.rs
+++ b/frame/im-online/src/lib.rs
@@ -100,11 +100,7 @@ use frame_support::{
 	},
 	Parameter,
 };
-use frame_system::ensure_none;
-use frame_system::offchain::{
-	SendTransactionTypes,
-	SubmitTransaction,
-};
+use frame_system::{ensure_none, offchain::{SendTransactionTypes, SubmitTransaction}};
 pub use weights::WeightInfo;
 
 pub mod sr25519 {
@@ -813,7 +809,7 @@ impl<Offender: Clone> Offence<Offender> for UnresponsivenessOffence<Offender> {
 		// basically, 10% can be offline with no slash, but after that, it linearly climbs up to 7%
 		// when 13/30 are offline (around 5% when 1/3 are offline).
 		if let Some(threshold) = offenders.checked_sub(validator_set_count / 10 + 1) {
-			let x = Perbill::from_rational_approximation(3 * threshold, validator_set_count);
+			let x = Perbill::from_rational(3 * threshold, validator_set_count);
 			x.saturating_mul(Perbill::from_percent(7))
 		} else {
 			Perbill::default()
diff --git a/frame/offences/benchmarking/src/mock.rs b/frame/offences/benchmarking/src/mock.rs
index d659025247d1..e374ad73a558 100644
--- a/frame/offences/benchmarking/src/mock.rs
+++ b/frame/offences/benchmarking/src/mock.rs
@@ -170,7 +170,7 @@ impl pallet_staking::Config for Test {
 	type SlashCancelOrigin = frame_system::EnsureRoot<Self::AccountId>;
 	type BondingDuration = ();
 	type SessionInterface = Self;
-	type RewardCurve = RewardCurve;
+	type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
 	type NextNewSession = Session;
 	type ElectionLookahead = ();
 	type Call = Call;
diff --git a/frame/session/benchmarking/src/mock.rs b/frame/session/benchmarking/src/mock.rs
index 8c392c4e1096..539225c85259 100644
--- a/frame/session/benchmarking/src/mock.rs
+++ b/frame/session/benchmarking/src/mock.rs
@@ -175,7 +175,7 @@ impl pallet_staking::Config for Test {
 	type SlashCancelOrigin = frame_system::EnsureRoot<Self::AccountId>;
 	type BondingDuration = ();
 	type SessionInterface = Self;
-	type RewardCurve = RewardCurve;
+	type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
 	type NextNewSession = Session;
 	type ElectionLookahead = ();
 	type Call = Call;
diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs
index 45f3ae9dfce4..77157aa8347c 100644
--- a/frame/session/src/lib.rs
+++ b/frame/session/src/lib.rs
@@ -177,12 +177,12 @@ impl<
 		// (0% is never returned).
 		let progress = if now >= offset {
 			let current = (now - offset) % period.clone() + One::one();
-			Some(Percent::from_rational_approximation(
+			Some(Percent::from_rational(
 				current.clone(),
 				period.clone(),
 			))
 		} else {
-			Some(Percent::from_rational_approximation(
+			Some(Percent::from_rational(
 				now + One::one(),
 				offset,
 			))
diff --git a/frame/staking/fuzzer/src/mock.rs b/frame/staking/fuzzer/src/mock.rs
index a87e1fc08301..8df365737fc6 100644
--- a/frame/staking/fuzzer/src/mock.rs
+++ b/frame/staking/fuzzer/src/mock.rs
@@ -185,7 +185,7 @@ impl pallet_staking::Config for Test {
 	type SlashCancelOrigin = frame_system::EnsureRoot<Self::AccountId>;
 	type BondingDuration = ();
 	type SessionInterface = Self;
-	type RewardCurve = RewardCurve;
+	type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
 	type NextNewSession = Session;
 	type ElectionLookahead = ();
 	type Call = Call;
diff --git a/frame/staking/src/inflation.rs b/frame/staking/src/inflation.rs
index bd9d1f8bbdb3..e5259543fd4b 100644
--- a/frame/staking/src/inflation.rs
+++ b/frame/staking/src/inflation.rs
@@ -38,7 +38,7 @@ pub fn compute_total_payout<N>(
 	// Milliseconds per year for the Julian year (365.25 days).
 	const MILLISECONDS_PER_YEAR: u64 = 1000 * 3600 * 24 * 36525 / 100;
 
-	let portion = Perbill::from_rational_approximation(era_duration as u64, MILLISECONDS_PER_YEAR);
+	let portion = Perbill::from_rational(era_duration as u64, MILLISECONDS_PER_YEAR);
 	let payout = portion * yearly_inflation.calculate_for_fraction_times_denominator(
 		npos_token_staked,
 		total_tokens.clone(),
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 239effc36443..187f9f30e08a 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -782,6 +782,51 @@ impl<T: Config> SessionInterface<<T as frame_system::Config>::AccountId> for T w
 	}
 }
 
+/// Handler for determining how much of a balance should be paid out on the current era.
+pub trait EraPayout<Balance> {
+	/// Determine the payout for this era.
+	///
+	/// Returns the amount to be paid to stakers in this era, as well as whatever else should be
+	/// paid out ("the rest").
+	fn era_payout(
+		total_staked: Balance,
+		total_issuance: Balance,
+		era_duration_millis: u64,
+	) -> (Balance, Balance);
+}
+
+impl<Balance: Default> EraPayout<Balance> for () {
+	fn era_payout(
+		_total_staked: Balance,
+		_total_issuance: Balance,
+		_era_duration_millis: u64,
+	) -> (Balance, Balance) {
+		(Default::default(), Default::default())
+	}
+}
+
+pub struct ConvertCurve<T>(sp_std::marker::PhantomData<T>);
+impl<
+	Balance: AtLeast32BitUnsigned + Clone,
+	T: Get<&'static PiecewiseLinear<'static>>,
+> EraPayout<Balance> for ConvertCurve<T> {
+	fn era_payout(
+		total_staked: Balance,
+		total_issuance: Balance,
+		era_duration_millis: u64,
+	) -> (Balance, Balance) {
+		let (validator_payout, max_payout) = inflation::compute_total_payout(
+			&T::get(),
+			total_staked,
+			total_issuance,
+			// Duration of era; more than u64::MAX is rewarded as u64::MAX.
+			era_duration_millis,
+		);
+		let rest = max_payout.saturating_sub(validator_payout.clone());
+		(validator_payout, rest)
+	}
+}
+
 pub trait Config: frame_system::Config + SendTransactionTypes<Call<Self>> {
 	/// The staking balance.
 	type Currency: LockableCurrency<Self::AccountId, Moment = Self::BlockNumber>;
@@ -838,9 +883,9 @@ pub trait Config: frame_system::Config + SendTransactionTypes<Call<Self>> {
 	/// Interface for interacting with a session module.
 	type SessionInterface: self::SessionInterface<Self::AccountId>;
 
-	/// The NPoS reward curve used to define yearly inflation.
+	/// The payout for validators and the system for the current era.
 	/// See [Era payout](./index.html#era-payout).
-	type RewardCurve: Get<&'static PiecewiseLinear<'static>>;
+	type EraPayout: EraPayout<BalanceOf<Self>>;
 
 	/// Something that can estimate the next session change, accurately or as a best effort guess.
 	type NextNewSession: EstimateNextNewSession<Self::BlockNumber>;
@@ -2413,7 +2458,7 @@ impl<T: Config> Module<T> {
 
 		// This is the fraction of the total reward that the validator and the
 		// nominators will get.
-		let validator_total_reward_part = Perbill::from_rational_approximation(
+		let validator_total_reward_part = Perbill::from_rational(
 			validator_reward_points,
 			total_reward_points,
 		);
@@ -2428,7 +2473,7 @@ impl<T: Config> Module<T> {
 
 		let validator_leftover_payout = validator_total_payout - validator_commission_payout;
 		// Now let's calculate how this is split to the validator.
-		let validator_exposure_part = Perbill::from_rational_approximation(
+		let validator_exposure_part = Perbill::from_rational(
 			exposure.own,
 			exposure.total,
 		);
@@ -2445,7 +2490,7 @@ impl<T: Config> Module<T> {
 		// Lets now calculate how this is split to the nominators.
 		// Reward only the clipped exposures. Note this is not necessarily sorted.
 		for nominator in exposure.others.iter() {
-			let nominator_exposure_part = Perbill::from_rational_approximation(
+			let nominator_exposure_part = Perbill::from_rational(
 				nominator.value,
 				exposure.total,
 			);
@@ -2837,15 +2882,10 @@ impl<T: Config> Module<T> {
 		if let Some(active_era_start) = active_era.start {
 			let now_as_millis_u64 = T::UnixTime::now().as_millis().saturated_into::<u64>();
 
-			let era_duration = now_as_millis_u64 - active_era_start;
-			let (validator_payout, max_payout) = inflation::compute_total_payout(
-				&T::RewardCurve::get(),
-				Self::eras_total_stake(&active_era.index),
-				T::Currency::total_issuance(),
-				// Duration of era; more than u64::MAX is rewarded as u64::MAX.
-				era_duration.saturated_into::<u64>(),
-			);
-			let rest = max_payout.saturating_sub(validator_payout);
+			let era_duration = (now_as_millis_u64 - active_era_start).saturated_into::<u64>();
+			let staked = Self::eras_total_stake(&active_era.index);
+			let issuance = T::Currency::total_issuance();
+			let (validator_payout, rest) = T::EraPayout::era_payout(staked, issuance, era_duration);
 
 			Self::deposit_event(RawEvent::EraPayout(active_era.index, validator_payout, rest));
 
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index b0e3d9629a35..40f59fa71cd6 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -260,7 +260,7 @@ impl Config for Test {
 	type SlashCancelOrigin = frame_system::EnsureRoot<Self::AccountId>;
 	type BondingDuration = BondingDuration;
 	type SessionInterface = Self;
-	type RewardCurve = RewardCurve;
+	type EraPayout = ConvertCurve<RewardCurve>;
 	type NextNewSession = Session;
 	type ElectionLookahead = ElectionLookahead;
 	type Call = Call;
@@ -670,25 +670,22 @@ pub(crate) fn start_active_era(era_index: EraIndex) {
 }
 
 pub(crate) fn current_total_payout_for_duration(duration: u64) -> Balance {
-	let reward = inflation::compute_total_payout(
-		<Test as Config>::RewardCurve::get(),
+	let (payout, _rest) = <Test as Config>::EraPayout::era_payout(
 		Staking::eras_total_stake(active_era()),
 		Balances::total_issuance(),
 		duration,
-	)
-	.0;
-	assert!(reward > 0);
-	reward
+	);
+	assert!(payout > 0);
+	payout
 }
 
 pub(crate) fn maximum_payout_for_duration(duration: u64) -> Balance {
-	inflation::compute_total_payout(
-		<Test as Config>::RewardCurve::get(),
-		0,
+	let (payout, rest) = <Test as Config>::EraPayout::era_payout(
+		Staking::eras_total_stake(active_era()),
 		Balances::total_issuance(),
 		duration,
-	)
-	.1
+	);
+	payout + rest
 }
 
 /// Time it takes to finish a session.
diff --git a/frame/staking/src/testing_utils.rs b/frame/staking/src/testing_utils.rs
index 5affc50d81df..afe36f55b1dc 100644
--- a/frame/staking/src/testing_utils.rs
+++ b/frame/staking/src/testing_utils.rs
@@ -376,7 +376,7 @@ pub fn create_assignments_for_offchain<T: Config>(
 	),
 	&'static str
 > {
-	let ratio = OffchainAccuracy::from_rational_approximation(1, MAX_NOMINATIONS);
+	let ratio = OffchainAccuracy::from_rational(1, MAX_NOMINATIONS);
 	let assignments: Vec<Assignment<T::AccountId, OffchainAccuracy>> = <Nominators<T>>::iter()
 		.take(num_assignments as usize)
 		.map(|(n, t)| Assignment {
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index 0008f8cdba6d..43ce2259fac7 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -209,10 +209,10 @@ fn rewards_should_work() {
 				individual: vec![(11, 100), (21, 50)].into_iter().collect(),
 			}
 		);
-		let part_for_10 = Perbill::from_rational_approximation::<u32>(1000, 1125);
-		let part_for_20 = Perbill::from_rational_approximation::<u32>(1000, 1375);
-		let part_for_100_from_10 = Perbill::from_rational_approximation::<u32>(125, 1125);
-		let part_for_100_from_20 = Perbill::from_rational_approximation::<u32>(375, 1375);
+		let part_for_10 = Perbill::from_rational::<u32>(1000, 1125);
+		let part_for_20 = Perbill::from_rational::<u32>(1000, 1375);
+		let part_for_100_from_10 = Perbill::from_rational::<u32>(125, 1125);
+		let part_for_100_from_20 = Perbill::from_rational::<u32>(375, 1375);
 
 		start_session(2);
 		start_session(3);
@@ -598,8 +598,8 @@ fn nominators_also_get_slashed_pro_rata() {
 
 		let slash_amount = slash_percent * exposed_stake;
 		let validator_share =
-			Perbill::from_rational_approximation(exposed_validator, exposed_stake) * slash_amount;
-		let nominator_share = Perbill::from_rational_approximation(
+			Perbill::from_rational(exposed_validator, exposed_stake) * slash_amount;
+		let nominator_share = Perbill::from_rational(
 			exposed_nominator,
 			exposed_stake,
 		) * slash_amount;
@@ -4270,8 +4270,8 @@ fn claim_reward_at_the_last_era_and_no_double_claim_and_invalid_claim() {
 		let init_balance_10 = Balances::total_balance(&10);
 		let init_balance_100 = Balances::total_balance(&100);
 
-		let part_for_10 = Perbill::from_rational_approximation::<u32>(1000, 1125);
-		let part_for_100 = Perbill::from_rational_approximation::<u32>(125, 1125);
+		let part_for_10 = Perbill::from_rational::<u32>(1000, 1125);
+		let part_for_100 = Perbill::from_rational::<u32>(125, 1125);
 
 		// Check state
 		Payee::<Test>::insert(11, RewardDestination::Controller);
diff --git a/frame/support/src/weights.rs b/frame/support/src/weights.rs
index abd54994bc9e..840b1c3c01ac 100644
--- a/frame/support/src/weights.rs
+++ b/frame/support/src/weights.rs
@@ -130,11 +130,8 @@
 #[cfg(feature = "std")]
 use serde::{Serialize, Deserialize};
 use codec::{Encode, Decode};
-use sp_runtime::{
-	RuntimeDebug,
-	traits::SignedExtension,
-	generic::{CheckedExtrinsic, UncheckedExtrinsic},
-};
+use sp_runtime::{RuntimeDebug, traits::SignedExtension};
+use sp_runtime::generic::{CheckedExtrinsic, UncheckedExtrinsic};
 use crate::dispatch::{DispatchErrorWithPostInfo, DispatchResultWithPostInfo, DispatchError};
 use sp_runtime::traits::SaturatedConversion;
 use sp_arithmetic::{Perbill, traits::{BaseArithmetic, Saturating, Unsigned}};
@@ -964,13 +961,13 @@ mod tests {
 			smallvec![
 				WeightToFeeCoefficient {
 					coeff_integer: 0,
-					coeff_frac: Perbill::from_fraction(0.5),
+					coeff_frac: Perbill::from_float(0.5),
 					negative: false,
 					degree: 3
 				},
 				WeightToFeeCoefficient {
 					coeff_integer: 2,
-					coeff_frac: Perbill::from_rational_approximation(1u32, 3u32),
+					coeff_frac: Perbill::from_rational(1u32, 3u32),
 					negative: false,
 					degree: 2
 				},
diff --git a/primitives/arithmetic/fuzzer/src/per_thing_rational.rs b/primitives/arithmetic/fuzzer/src/per_thing_rational.rs
index ff172b8bd270..47ba5a480305 100644
--- a/primitives/arithmetic/fuzzer/src/per_thing_rational.rs
+++ b/primitives/arithmetic/fuzzer/src/per_thing_rational.rs
@@ -38,75 +38,75 @@ fn main() {
 
 			// peru16
 			let (smaller, bigger) = (u16_pair.0.min(u16_pair.1), u16_pair.0.max(u16_pair.1));
-			let ratio = PerU16::from_rational_approximation(smaller, bigger);
+			let ratio = PerU16::from_rational(smaller, bigger);
 			assert_per_thing_equal_error(
 				ratio,
-				PerU16::from_fraction(smaller as f64 / bigger.max(1) as f64),
+				PerU16::from_float(smaller as f64 / bigger.max(1) as f64),
 				1,
 			);
 			let (smaller, bigger) = (u32_pair.0.min(u32_pair.1), u32_pair.0.max(u32_pair.1));
-			let ratio = PerU16::from_rational_approximation(smaller, bigger);
+			let ratio = PerU16::from_rational(smaller, bigger);
 			assert_per_thing_equal_error(
 				ratio,
-				PerU16::from_fraction(smaller as f64 / bigger.max(1) as f64),
+				PerU16::from_float(smaller as f64 / bigger.max(1) as f64),
 				1,
 			);
 			let (smaller, bigger) = (u64_pair.0.min(u64_pair.1), u64_pair.0.max(u64_pair.1));
-			let ratio = PerU16::from_rational_approximation(smaller, bigger);
+			let ratio = PerU16::from_rational(smaller, bigger);
 			assert_per_thing_equal_error(
 				ratio,
-				PerU16::from_fraction(smaller as f64 / bigger.max(1) as f64),
+				PerU16::from_float(smaller as f64 / bigger.max(1) as f64),
 				1,
 			);
 
 			// percent
 			let (smaller, bigger) = (u16_pair.0.min(u16_pair.1), u16_pair.0.max(u16_pair.1));
-			let ratio = Percent::from_rational_approximation(smaller, bigger);
+			let ratio = Percent::from_rational(smaller, bigger);
 			assert_per_thing_equal_error(
 				ratio,
-				Percent::from_fraction(smaller as f64 / bigger.max(1) as f64),
+				Percent::from_float(smaller as f64 / bigger.max(1) as f64),
 				1,
 			);
 
 			let (smaller, bigger) = (u32_pair.0.min(u32_pair.1), u32_pair.0.max(u32_pair.1));
-			let ratio = Percent::from_rational_approximation(smaller, bigger);
+			let ratio = Percent::from_rational(smaller, bigger);
 			assert_per_thing_equal_error(
 				ratio,
-				Percent::from_fraction(smaller as f64 / bigger.max(1) as f64),
+				Percent::from_float(smaller as f64 / bigger.max(1) as f64),
 				1,
 			);
 
 			let (smaller, bigger) = (u64_pair.0.min(u64_pair.1), u64_pair.0.max(u64_pair.1));
-			let ratio = Percent::from_rational_approximation(smaller, bigger);
+			let ratio = Percent::from_rational(smaller, bigger);
 			assert_per_thing_equal_error(
 				ratio,
-				Percent::from_fraction(smaller as f64 / bigger.max(1) as f64),
+				Percent::from_float(smaller as f64 / bigger.max(1) as f64),
 				1,
 			);
 
 			// perbill
 			let (smaller, bigger) = (u32_pair.0.min(u32_pair.1), u32_pair.0.max(u32_pair.1));
-			let ratio = Perbill::from_rational_approximation(smaller, bigger);
+			let ratio = Perbill::from_rational(smaller, bigger);
 			assert_per_thing_equal_error(
 				ratio,
-				Perbill::from_fraction(smaller as f64 / bigger.max(1) as f64),
+				Perbill::from_float(smaller as f64 / bigger.max(1) as f64),
 				100,
 			);
 
 			let (smaller, bigger) = (u64_pair.0.min(u64_pair.1), u64_pair.0.max(u64_pair.1));
-			let ratio = Perbill::from_rational_approximation(smaller, bigger);
+			let ratio = Perbill::from_rational(smaller, bigger);
 			assert_per_thing_equal_error(
 				ratio,
-				Perbill::from_fraction(smaller as f64 / bigger.max(1) as f64),
+				Perbill::from_float(smaller as f64 / bigger.max(1) as f64),
 				100,
 			);
 
 			// perquintillion
 			let (smaller, bigger) = (u64_pair.0.min(u64_pair.1), u64_pair.0.max(u64_pair.1));
-			let ratio = Perquintill::from_rational_approximation(smaller, bigger);
+			let ratio = Perquintill::from_rational(smaller, bigger);
 			assert_per_thing_equal_error(
 				ratio,
-				Perquintill::from_fraction(smaller as f64 / bigger.max(1) as f64),
+				Perquintill::from_float(smaller as f64 / bigger.max(1) as f64),
 				1000,
 			);
 
diff --git a/primitives/arithmetic/src/fixed_point.rs b/primitives/arithmetic/src/fixed_point.rs
index 896d5f38451d..b837c360c7c5 100644
--- a/primitives/arithmetic/src/fixed_point.rs
+++ b/primitives/arithmetic/src/fixed_point.rs
@@ -376,7 +376,7 @@ macro_rules! implement_fixed {
 			}
 
 			#[cfg(any(feature = "std", test))]
-			pub fn from_fraction(x: f64) -> Self {
+			pub fn from_float(x: f64) -> Self {
 				Self((x * (<Self as FixedPointNumber>::DIV as f64)) as $inner_type)
 			}
 
diff --git a/primitives/arithmetic/src/lib.rs b/primitives/arithmetic/src/lib.rs
index 561c14a37e20..d6069ad5154d 100644
--- a/primitives/arithmetic/src/lib.rs
+++ b/primitives/arithmetic/src/lib.rs
@@ -494,7 +494,7 @@ mod threshold_compare_tests {
 	fn peru16_rational_does_not_overflow() {
 		// A historical example that will panic only for per_thing type that are created with
 		// maximum capacity of their type, e.g. PerU16.
-		let _ = PerU16::from_rational_approximation(17424870u32, 17424870);
+		let _ = PerU16::from_rational(17424870u32, 17424870);
 	}
 
 	#[test]
diff --git a/primitives/arithmetic/src/per_things.rs b/primitives/arithmetic/src/per_things.rs
index f2b8c4f93b33..29d5d2be73a1 100644
--- a/primitives/arithmetic/src/per_things.rs
+++ b/primitives/arithmetic/src/per_things.rs
@@ -18,8 +18,9 @@
 #[cfg(feature = "std")]
 use serde::{Serialize, Deserialize};
 
-use sp_std::{ops, fmt, prelude::*, convert::TryInto};
+use sp_std::{ops, fmt, prelude::*, convert::{TryFrom, TryInto}};
 use codec::{Encode, CompactAs};
+use num_traits::Pow;
 use crate::traits::{
 	SaturatedConversion, UniqueSaturatedInto, Saturating, BaseArithmetic, Bounded, Zero, Unsigned,
 	One,
@@ -36,6 +37,7 @@ pub type UpperOf<P> = <P as PerThing>::Upper;
 /// `X`_.
 pub trait PerThing:
 	Sized + Saturating + Copy + Default + Eq + PartialEq + Ord + PartialOrd + Bounded + fmt::Debug
+	+ ops::Div<Output=Self> + ops::Mul<Output=Self> + Pow<usize, Output=Self>
 {
 	/// The data type used to build this per-thingy.
 	type Inner: BaseArithmetic + Unsigned + Copy + Into<u128> + fmt::Debug;
@@ -70,14 +72,14 @@ pub trait PerThing:
 	fn from_percent(x: Self::Inner) -> Self {
 		let a: Self::Inner = x.min(100.into());
 		let b: Self::Inner = 100.into();
-		Self::from_rational_approximation::<Self::Inner>(a, b)
+		Self::from_rational::<Self::Inner>(a, b)
 	}
 
 	/// Return the product of multiplication of this value by itself.
 	fn square(self) -> Self {
 		let p = Self::Upper::from(self.deconstruct());
 		let q = Self::Upper::from(Self::ACCURACY);
-		Self::from_rational_approximation::<Self::Upper>(p * p, q * q)
+		Self::from_rational::<Self::Upper>(p * p, q * q)
 	}
 
 	/// Return the part left when `self` is saturating-subtracted from `Self::one()`.
@@ -204,7 +206,12 @@ pub trait PerThing:
 
 	/// Converts a fraction into `Self`.
 	#[cfg(feature = "std")]
-	fn from_fraction(x: f64) -> Self;
+	fn from_float(x: f64) -> Self;
+
+	/// Same as `Self::from_float`.
+	#[deprecated = "Use from_float instead"]
+	#[cfg(feature = "std")]
+	fn from_fraction(x: f64) -> Self { Self::from_float(x) }
 
 	/// Approximate the fraction `p/q` into a per-thing fraction. This will never overflow.
 	///
@@ -219,16 +226,28 @@ pub trait PerThing:
 	/// # fn main () {
 	/// // 989/100 is technically closer to 99%.
 	/// assert_eq!(
-	/// 		Percent::from_rational_approximation(989u64, 1000),
+	/// 		Percent::from_rational(989u64, 1000),
 	/// 		Percent::from_parts(98),
 	/// 	);
 	/// # }
 	/// ```
-	fn from_rational_approximation<N>(p: N, q: N) -> Self
+	fn from_rational<N>(p: N, q: N) -> Self
 	where
 		N: Clone + Ord + TryInto<Self::Inner> + TryInto<Self::Upper> +
 			ops::Div<N, Output=N> + ops::Rem<N, Output=N> + ops::Add<N, Output=N> + Unsigned,
 		Self::Inner: Into<N>;
+
+	/// Same as `Self::from_rational`.
+	#[deprecated = "Use from_rational instead"]
+	fn from_rational_approximation<N>(p: N, q: N) -> Self
+		where
+			N: Clone + Ord + TryInto<Self::Inner> + TryInto<Self::Upper>
+			+ ops::Div<N, Output=N> + ops::Rem<N, Output=N> + ops::Add<N, Output=N> + Unsigned
+			+ Zero + One,
+			Self::Inner: Into<N>,
+	{
+		Self::from_rational(p, q)
+	}
 }
 
 /// The rounding method to use.
@@ -369,11 +388,11 @@ macro_rules! implement_per_thing {
 
 			/// NOTE: saturate to 0 or 1 if x is beyond `[0, 1]`
 			#[cfg(feature = "std")]
-			fn from_fraction(x: f64) -> Self {
+			fn from_float(x: f64) -> Self {
 				Self::from_parts((x.max(0.).min(1.) * $max as f64) as Self::Inner)
 			}
 
-			fn from_rational_approximation<N>(p: N, q: N) -> Self
+			fn from_rational<N>(p: N, q: N) -> Self
 			where
 				N: Clone + Ord + TryInto<Self::Inner> + TryInto<Self::Upper>
 				 + ops::Div<N, Output=N> + ops::Rem<N, Output=N> + ops::Add<N, Output=N> + Unsigned
@@ -471,20 +490,31 @@ macro_rules! implement_per_thing {
 				PerThing::square(self)
 			}
 
-			/// See [`PerThing::from_fraction`].
+			/// See [`PerThing::from_float`].
 			#[cfg(feature = "std")]
-			pub fn from_fraction(x: f64) -> Self {
-				<Self as PerThing>::from_fraction(x)
+			pub fn from_float(x: f64) -> Self {
+				<Self as PerThing>::from_float(x)
 			}
 
-			/// See [`PerThing::from_rational_approximation`].
+			/// See [`PerThing::from_rational`].
+			#[deprecated = "Use `PerThing::from_rational` instead"]
 			pub fn from_rational_approximation<N>(p: N, q: N) -> Self
 				where N: Clone + Ord + TryInto<$type> +
 					TryInto<$upper_type> + ops::Div<N, Output=N> + ops::Rem<N, Output=N> +
 					ops::Add<N, Output=N> + Unsigned,
 					$type: Into<N>,
 			{
-				<Self as PerThing>::from_rational_approximation(p, q)
+				<Self as PerThing>::from_rational(p, q)
+			}
+
+			/// See [`PerThing::from_rational`].
+			pub fn from_rational<N>(p: N, q: N) -> Self
+				where N: Clone + Ord + TryInto<$type> +
+					TryInto<$upper_type> + ops::Div<N, Output=N> + ops::Rem<N, Output=N> +
+					ops::Add<N, Output=N> + Unsigned,
+					$type: Into<N>,
+			{
+				<Self as PerThing>::from_rational(p, q)
 			}
 
 			/// See [`PerThing::mul_floor`].
@@ -561,37 +591,13 @@ macro_rules! implement_per_thing {
 			/// Saturating multiply. Compute `self * rhs`, saturating at the numeric bounds instead of
 			/// overflowing. This operation is lossy.
 			fn saturating_mul(self, rhs: Self) -> Self {
-				let a = self.0 as $upper_type;
-				let b = rhs.0 as $upper_type;
-				let m = <$upper_type>::from($max);
-				let parts = a * b / m;
-				// This will always fit into $type.
-				Self::from_parts(parts as $type)
+				self * rhs
 			}
 
 			/// Saturating exponentiation. Computes `self.pow(exp)`, saturating at the numeric
 			/// bounds instead of overflowing. This operation is lossy.
 			fn saturating_pow(self, exp: usize) -> Self {
-				if self.is_zero() || self.is_one() {
-					self
-				} else {
-					let p = <$name as PerThing>::Upper::from(self.deconstruct());
-					let q = <$name as PerThing>::Upper::from(Self::ACCURACY);
-					let mut s = Self::one();
-					for _ in 0..exp {
-						if s.is_zero() {
-							break;
-						} else {
-							// x^2 always fits in Self::Upper if x fits in Self::Inner.
-							// Verified by a test.
-							s = Self::from_rational_approximation(
-								<$name as PerThing>::Upper::from(s.deconstruct()) * p,
-								q * q,
-							);
-						}
-					}
-					s
-				}
+				self.pow(exp)
 			}
 		}
 
@@ -607,7 +613,7 @@ macro_rules! implement_per_thing {
 			}
 		}
 
-		impl crate::traits::Bounded for $name {
+		impl Bounded for $name {
 			fn min_value() -> Self {
 				<Self as PerThing>::zero()
 			}
@@ -617,13 +623,48 @@ macro_rules! implement_per_thing {
 			}
 		}
 
+		impl ops::Mul for $name {
+			type Output = Self;
+
+			fn mul(self, rhs: Self) -> Self::Output {
+				let a = self.0 as $upper_type;
+				let b = rhs.0 as $upper_type;
+				let m = <$upper_type>::from($max);
+				let parts = a * b / m;
+				// This will always fit into $type.
+				Self::from_parts(parts as $type)
+			}
+		}
+
+		impl Pow<usize> for $name {
+			type Output = Self;
+
+			fn pow(self, exp: usize) -> Self::Output {
+				if exp == 0 || self.is_one() {
+					return Self::one()
+				}
+				let mut result = self;
+				let mut exp = exp - 1;
+				while exp > 0 && !result.is_zero() {
+					if exp % 2 == 0 {
+						result = result.square();
+						exp /= 2;
+					} else {
+						result = result * self;
+						exp -= 1;
+					}
+				}
+				result
+			}
+		}
+
 		impl ops::Div for $name {
 			type Output = Self;
 
 			fn div(self, rhs: Self) -> Self::Output {
 				let p = self.0;
 				let q = rhs.0;
-				Self::from_rational_approximation(p, q)
+				Self::from_rational(p, q)
 			}
 		}
 
@@ -648,6 +689,13 @@ macro_rules! implement_per_thing {
 			}
 		}
 
+		impl<N> ops::Div<N> for $name where $type: TryFrom<N> {
+			type Output = Self;
+			fn div(self, b: N) -> Self::Output {
+				<$type>::try_from(b).map_or(Self::zero(), |d| Self::from_parts(self.0 / d))
+			}
+		}
+
 		#[cfg(test)]
 		mod $test_mod {
 			use codec::{Encode, Decode};
@@ -657,13 +705,13 @@ macro_rules! implement_per_thing {
 			#[test]
 			fn macro_expanded_correctly() {
 				// needed for the `from_percent` to work. UPDATE: this is no longer needed; yet note
-				// that tests that use percentage or fractions such as $name::from_fraction(0.2) to
+				// that tests that use percentage or fractions such as $name::from_float(0.2) to
 				// create values will most likely be inaccurate when used with per_things that are
 				// not multiples of 100.
 				// assert!($max >= 100);
 				// assert!($max % 100 == 0);
 
-				// needed for `from_rational_approximation`
+				// needed for `from_rational`
 				assert!(2 * ($max as $upper_type) < <$upper_type>::max_value());
 				assert!(<$upper_type>::from($max) < <$upper_type>::max_value());
 
@@ -737,11 +785,11 @@ macro_rules! implement_per_thing {
 				assert_eq!($name::from_percent(100), $name::from_parts($max));
 				assert_eq!($name::from_percent(200), $name::from_parts($max));
 
-				assert_eq!($name::from_fraction(0.0), $name::from_parts(Zero::zero()));
-				assert_eq!($name::from_fraction(0.1), $name::from_parts($max / 10));
-				assert_eq!($name::from_fraction(1.0), $name::from_parts($max));
-				assert_eq!($name::from_fraction(2.0), $name::from_parts($max));
-				assert_eq!($name::from_fraction(-1.0), $name::from_parts(Zero::zero()));
+				assert_eq!($name::from_float(0.0), $name::from_parts(Zero::zero()));
+				assert_eq!($name::from_float(0.1), $name::from_parts($max / 10));
+				assert_eq!($name::from_float(1.0), $name::from_parts($max));
+				assert_eq!($name::from_float(2.0), $name::from_parts($max));
+				assert_eq!($name::from_float(-1.0), $name::from_parts(Zero::zero()));
 			}
 
 			#[test]
@@ -763,7 +811,7 @@ macro_rules! implement_per_thing {
 				($num_type:tt) => {
 					// multiplication from all sort of from_percent
 					assert_eq!(
-						$name::from_fraction(1.0) * $num_type::max_value(),
+						$name::from_float(1.0) * $num_type::max_value(),
 						$num_type::max_value()
 					);
 					if $max % 100 == 0 {
@@ -773,7 +821,7 @@ macro_rules! implement_per_thing {
 							1,
 						);
 						assert_eq!(
-							$name::from_fraction(0.5) * $num_type::max_value(),
+							$name::from_float(0.5) * $num_type::max_value(),
 							$num_type::max_value() / 2,
 						);
 						assert_eq_error_rate!(
@@ -783,30 +831,30 @@ macro_rules! implement_per_thing {
 						);
 					} else {
 						assert_eq!(
-							$name::from_fraction(0.99) * <$num_type>::max_value(),
+							$name::from_float(0.99) * <$num_type>::max_value(),
 							(
 								(
-									u256ify!($name::from_fraction(0.99).0) *
+									u256ify!($name::from_float(0.99).0) *
 									u256ify!(<$num_type>::max_value()) /
 									u256ify!($max)
 								).as_u128()
 							) as $num_type,
 						);
 						assert_eq!(
-							$name::from_fraction(0.50) * <$num_type>::max_value(),
+							$name::from_float(0.50) * <$num_type>::max_value(),
 							(
 								(
-									u256ify!($name::from_fraction(0.50).0) *
+									u256ify!($name::from_float(0.50).0) *
 									u256ify!(<$num_type>::max_value()) /
 									u256ify!($max)
 								).as_u128()
 							) as $num_type,
 						);
 						assert_eq!(
-							$name::from_fraction(0.01) * <$num_type>::max_value(),
+							$name::from_float(0.01) * <$num_type>::max_value(),
 							(
 								(
-									u256ify!($name::from_fraction(0.01).0) *
+									u256ify!($name::from_float(0.01).0) *
 									u256ify!(<$num_type>::max_value()) /
 									u256ify!($max)
 								).as_u128()
@@ -814,7 +862,7 @@ macro_rules! implement_per_thing {
 						);
 					}
 
-					assert_eq!($name::from_fraction(0.0) * $num_type::max_value(), 0);
+					assert_eq!($name::from_float(0.0) * $num_type::max_value(), 0);
 
 					// // multiplication with bounds
 					assert_eq!($name::one() * $num_type::max_value(), $num_type::max_value());
@@ -828,7 +876,7 @@ macro_rules! implement_per_thing {
 
 				// accuracy test
 				assert_eq!(
-					$name::from_rational_approximation(1 as $type, 3) * 30 as $type,
+					$name::from_rational(1 as $type, 3) * 30 as $type,
 					10,
 				);
 
@@ -837,10 +885,10 @@ macro_rules! implement_per_thing {
 
 			#[test]
 			fn per_thing_mul_rounds_to_nearest_number() {
-				assert_eq!($name::from_fraction(0.33) * 10u64, 3);
-				assert_eq!($name::from_fraction(0.34) * 10u64, 3);
-				assert_eq!($name::from_fraction(0.35) * 10u64, 3);
-				assert_eq!($name::from_fraction(0.36) * 10u64, 4);
+				assert_eq!($name::from_float(0.33) * 10u64, 3);
+				assert_eq!($name::from_float(0.34) * 10u64, 3);
+				assert_eq!($name::from_float(0.35) * 10u64, 3);
+				assert_eq!($name::from_float(0.36) * 10u64, 4);
 			}
 
 			#[test]
@@ -858,33 +906,33 @@ macro_rules! implement_per_thing {
 				($num_type:tt) => {
 					// within accuracy boundary
 					assert_eq!(
-						$name::from_rational_approximation(1 as $num_type, 0),
+						$name::from_rational(1 as $num_type, 0),
 						$name::one(),
 					);
 					assert_eq!(
-						$name::from_rational_approximation(1 as $num_type, 1),
+						$name::from_rational(1 as $num_type, 1),
 						$name::one(),
 					);
 					assert_eq_error_rate!(
-						$name::from_rational_approximation(1 as $num_type, 3).0,
+						$name::from_rational(1 as $num_type, 3).0,
 						$name::from_parts($max / 3).0,
 						2
 					);
 					assert_eq!(
-						$name::from_rational_approximation(1 as $num_type, 10),
-						$name::from_fraction(0.10),
+						$name::from_rational(1 as $num_type, 10),
+						$name::from_float(0.10),
 					);
 					assert_eq!(
-						$name::from_rational_approximation(1 as $num_type, 4),
-						$name::from_fraction(0.25),
+						$name::from_rational(1 as $num_type, 4),
+						$name::from_float(0.25),
 					);
 					assert_eq!(
-						$name::from_rational_approximation(1 as $num_type, 4),
-						$name::from_rational_approximation(2 as $num_type, 8),
+						$name::from_rational(1 as $num_type, 4),
+						$name::from_rational(2 as $num_type, 8),
 					);
 					// no accurate anymore but won't overflow.
 					assert_eq_error_rate!(
-						$name::from_rational_approximation(
+						$name::from_rational(
 							$num_type::max_value() - 1,
 							$num_type::max_value()
 						).0 as $upper_type,
@@ -892,7 +940,7 @@ macro_rules! implement_per_thing {
 						2,
 					);
 					assert_eq_error_rate!(
-						$name::from_rational_approximation(
+						$name::from_rational(
 							$num_type::max_value() / 3,
 							$num_type::max_value()
 						).0 as $upper_type,
@@ -900,7 +948,7 @@ macro_rules! implement_per_thing {
 						2,
 					);
 					assert_eq!(
-						$name::from_rational_approximation(1, $num_type::max_value()),
+						$name::from_rational(1, $num_type::max_value()),
 						$name::zero(),
 					);
 				};
@@ -914,28 +962,28 @@ macro_rules! implement_per_thing {
 
 				// almost at the edge
 				assert_eq!(
-					$name::from_rational_approximation(max_value - 1, max_value + 1),
+					$name::from_rational(max_value - 1, max_value + 1),
 					$name::from_parts($max - 2),
 				);
 				assert_eq!(
-					$name::from_rational_approximation(1, $max - 1),
+					$name::from_rational(1, $max - 1),
 					$name::from_parts(1),
 				);
 				assert_eq!(
-					$name::from_rational_approximation(1, $max),
+					$name::from_rational(1, $max),
 					$name::from_parts(1),
 				);
 				assert_eq!(
-					$name::from_rational_approximation(2, 2 * max_value - 1),
+					$name::from_rational(2, 2 * max_value - 1),
 					$name::from_parts(1),
 				);
 				assert_eq!(
-					$name::from_rational_approximation(1, max_value + 1),
+					$name::from_rational(1, max_value + 1),
 					$name::zero(),
 				);
 				assert_eq!(
-					$name::from_rational_approximation(3 * max_value / 2, 3 * max_value),
-					$name::from_fraction(0.5),
+					$name::from_rational(3 * max_value / 2, 3 * max_value),
+					$name::from_float(0.5),
 				);
 
 				$(per_thing_from_rationale_approx_test!($test_units);)*
@@ -943,66 +991,66 @@ macro_rules! implement_per_thing {
 
 			#[test]
 			fn per_things_mul_operates_in_output_type() {
-				// assert_eq!($name::from_fraction(0.5) * 100u32, 50u32);
-				assert_eq!($name::from_fraction(0.5) * 100u64, 50u64);
-				assert_eq!($name::from_fraction(0.5) * 100u128, 50u128);
+				// assert_eq!($name::from_float(0.5) * 100u32, 50u32);
+				assert_eq!($name::from_float(0.5) * 100u64, 50u64);
+				assert_eq!($name::from_float(0.5) * 100u128, 50u128);
 			}
 
 			#[test]
 			fn per_thing_saturating_op_works() {
 				assert_eq_error_rate!(
-					$name::from_fraction(0.5).saturating_add($name::from_fraction(0.4)).0 as $upper_type,
-					$name::from_fraction(0.9).0 as $upper_type,
+					$name::from_float(0.5).saturating_add($name::from_float(0.4)).0 as $upper_type,
+					$name::from_float(0.9).0 as $upper_type,
 					2,
 				);
 				assert_eq_error_rate!(
-					$name::from_fraction(0.5).saturating_add($name::from_fraction(0.5)).0 as $upper_type,
+					$name::from_float(0.5).saturating_add($name::from_float(0.5)).0 as $upper_type,
 					$name::one().0 as $upper_type,
 					2,
 				);
 				assert_eq!(
-					$name::from_fraction(0.6).saturating_add($name::from_fraction(0.5)),
+					$name::from_float(0.6).saturating_add($name::from_float(0.5)),
 					$name::one(),
 				);
 
 				assert_eq_error_rate!(
-					$name::from_fraction(0.6).saturating_sub($name::from_fraction(0.5)).0 as $upper_type,
-					$name::from_fraction(0.1).0 as $upper_type,
+					$name::from_float(0.6).saturating_sub($name::from_float(0.5)).0 as $upper_type,
+					$name::from_float(0.1).0 as $upper_type,
 					2,
 				);
 				assert_eq!(
-					$name::from_fraction(0.6).saturating_sub($name::from_fraction(0.6)),
-					$name::from_fraction(0.0),
+					$name::from_float(0.6).saturating_sub($name::from_float(0.6)),
+					$name::from_float(0.0),
 				);
 				assert_eq!(
-					$name::from_fraction(0.6).saturating_sub($name::from_fraction(0.7)),
-					$name::from_fraction(0.0),
+					$name::from_float(0.6).saturating_sub($name::from_float(0.7)),
+					$name::from_float(0.0),
 				);
 
 				assert_eq_error_rate!(
-					$name::from_fraction(0.5).saturating_mul($name::from_fraction(0.5)).0 as $upper_type,
-					$name::from_fraction(0.25).0 as $upper_type,
+					$name::from_float(0.5).saturating_mul($name::from_float(0.5)).0 as $upper_type,
+					$name::from_float(0.25).0 as $upper_type,
 					2,
 				);
 				assert_eq_error_rate!(
-					$name::from_fraction(0.2).saturating_mul($name::from_fraction(0.2)).0 as $upper_type,
-					$name::from_fraction(0.04).0 as $upper_type,
+					$name::from_float(0.2).saturating_mul($name::from_float(0.2)).0 as $upper_type,
+					$name::from_float(0.04).0 as $upper_type,
 					2,
 				);
 				assert_eq_error_rate!(
-					$name::from_fraction(0.1).saturating_mul($name::from_fraction(0.1)).0 as $upper_type,
-					$name::from_fraction(0.01).0 as $upper_type,
+					$name::from_float(0.1).saturating_mul($name::from_float(0.1)).0 as $upper_type,
+					$name::from_float(0.01).0 as $upper_type,
 					1,
 				);
 			}
 
 			#[test]
 			fn per_thing_square_works() {
-				assert_eq!($name::from_fraction(1.0).square(), $name::from_fraction(1.0));
-				assert_eq!($name::from_fraction(0.5).square(), $name::from_fraction(0.25));
-				assert_eq!($name::from_fraction(0.1).square(), $name::from_fraction(0.01));
+				assert_eq!($name::from_float(1.0).square(), $name::from_float(1.0));
+				assert_eq!($name::from_float(0.5).square(), $name::from_float(0.25));
+				assert_eq!($name::from_float(0.1).square(), $name::from_float(0.01));
 				assert_eq!(
-					$name::from_fraction(0.02).square(),
+					$name::from_float(0.02).square(),
 					$name::from_parts((4 * <$upper_type>::from($max) / 100 / 100) as $type)
 				);
 			}
@@ -1011,30 +1059,30 @@ macro_rules! implement_per_thing {
 			fn per_things_div_works() {
 				// normal
 				assert_eq_error_rate!(
-					($name::from_fraction(0.1) / $name::from_fraction(0.20)).0 as $upper_type,
-					$name::from_fraction(0.50).0 as $upper_type,
+					($name::from_float(0.1) / $name::from_float(0.20)).0 as $upper_type,
+					$name::from_float(0.50).0 as $upper_type,
 					2,
 				);
 				assert_eq_error_rate!(
-					($name::from_fraction(0.1) / $name::from_fraction(0.10)).0 as $upper_type,
-					$name::from_fraction(1.0).0 as $upper_type,
+					($name::from_float(0.1) / $name::from_float(0.10)).0 as $upper_type,
+					$name::from_float(1.0).0 as $upper_type,
 					2,
 				);
 				assert_eq_error_rate!(
-					($name::from_fraction(0.1) / $name::from_fraction(0.0)).0 as $upper_type,
-					$name::from_fraction(1.0).0 as $upper_type,
+					($name::from_float(0.1) / $name::from_float(0.0)).0 as $upper_type,
+					$name::from_float(1.0).0 as $upper_type,
 					2,
 				);
 
 				// will not overflow
 				assert_eq_error_rate!(
-					($name::from_fraction(0.10) / $name::from_fraction(0.05)).0 as $upper_type,
-					$name::from_fraction(1.0).0 as $upper_type,
+					($name::from_float(0.10) / $name::from_float(0.05)).0 as $upper_type,
+					$name::from_float(1.0).0 as $upper_type,
 					2,
 				);
 				assert_eq_error_rate!(
-					($name::from_fraction(1.0) / $name::from_fraction(0.5)).0 as $upper_type,
-					$name::from_fraction(1.0).0 as $upper_type,
+					($name::from_float(1.0) / $name::from_float(0.5)).0 as $upper_type,
+					$name::from_float(1.0).0 as $upper_type,
 					2,
 				);
 			}
diff --git a/primitives/npos-elections/src/helpers.rs b/primitives/npos-elections/src/helpers.rs
index 10a49a084f10..091efdd36ea5 100644
--- a/primitives/npos-elections/src/helpers.rs
+++ b/primitives/npos-elections/src/helpers.rs
@@ -95,15 +95,15 @@ mod tests {
 			Assignment {
 				who: 1u32,
 				distribution: vec![
-					(10u32, Perbill::from_fraction(0.5)),
-					(20, Perbill::from_fraction(0.5)),
+					(10u32, Perbill::from_float(0.5)),
+					(20, Perbill::from_float(0.5)),
 				],
 			},
 			Assignment {
 				who: 2u32,
 				distribution: vec![
-					(10, Perbill::from_fraction(0.33)),
-					(20, Perbill::from_fraction(0.67)),
+					(10, Perbill::from_float(0.33)),
+					(20, Perbill::from_float(0.67)),
 				],
 			},
 		];
diff --git a/primitives/npos-elections/src/lib.rs b/primitives/npos-elections/src/lib.rs
index 433c470d57d4..10ee12cc5508 100644
--- a/primitives/npos-elections/src/lib.rs
+++ b/primitives/npos-elections/src/lib.rs
@@ -371,7 +371,7 @@ impl<AccountId: IdentifierT> Voter<AccountId> {
 			.edges
 			.into_iter()
 			.filter_map(|e| {
-				let per_thing = P::from_rational_approximation(e.weight, budget);
+				let per_thing = P::from_rational(e.weight, budget);
 			// trim zero edges.
 			if per_thing.is_zero() { None } else { Some((e.who, per_thing)) }
 		}).collect::<Vec<_>>();
@@ -551,7 +551,7 @@ impl<AccountId> StakedAssignment<AccountId> {
 		let distribution = self.distribution
 			.into_iter()
 			.filter_map(|(target, w)| {
-				let per_thing = P::from_rational_approximation(w, stake);
+				let per_thing = P::from_rational(w, stake);
 				if per_thing == Bounded::min_value() {
 					None
 				} else {
diff --git a/primitives/npos-elections/src/mock.rs b/primitives/npos-elections/src/mock.rs
index ea8f3780e0e6..14e4139c5d32 100644
--- a/primitives/npos-elections/src/mock.rs
+++ b/primitives/npos-elections/src/mock.rs
@@ -345,7 +345,7 @@ pub(crate) fn run_and_compare<Output: PerThing128>(
 			for (candidate, per_thingy) in distribution {
 				if let Some(float_assignment) = float_assignments.1.iter().find(|x| x.0 == candidate ) {
 					assert_eq_error_rate!(
-						Output::from_fraction(float_assignment.1).deconstruct(),
+						Output::from_float(float_assignment.1).deconstruct(),
 						per_thingy.deconstruct(),
 						Output::Inner::one(),
 					);
diff --git a/primitives/npos-elections/src/phragmms.rs b/primitives/npos-elections/src/phragmms.rs
index ad93d2f18ef9..644535d4c41c 100644
--- a/primitives/npos-elections/src/phragmms.rs
+++ b/primitives/npos-elections/src/phragmms.rs
@@ -101,7 +101,7 @@ pub(crate) fn calculate_max_score<AccountId: IdentifierT, P: PerThing>(
 		for edge in voter.edges.iter() {
 			let edge_candidate = edge.candidate.borrow();
 			if edge_candidate.elected {
-				let edge_contribution: ExtendedBalance = P::from_rational_approximation(
+				let edge_contribution: ExtendedBalance = P::from_rational(
 					edge.weight,
 					edge_candidate.backed_stake,
 				).deconstruct().into();
diff --git a/primitives/npos-elections/src/pjr.rs b/primitives/npos-elections/src/pjr.rs
index 6caed9059e87..290110b14e65 100644
--- a/primitives/npos-elections/src/pjr.rs
+++ b/primitives/npos-elections/src/pjr.rs
@@ -37,7 +37,6 @@ use crate::{
 use sp_std::{rc::Rc, vec::Vec};
 use sp_std::collections::btree_map::BTreeMap;
 use sp_arithmetic::{traits::Zero, Perbill};
-
 /// The type used as the threshold.
 ///
 /// Just some reading sugar; Must always be same as [`ExtendedBalance`];
@@ -364,7 +363,7 @@ fn slack<AccountId: IdentifierT>(voter: &Voter<AccountId>, t: Threshold) -> Exte
 		let candidate = edge.candidate.borrow();
 		if candidate.elected {
 			let extra =
-				Perbill::one().min(Perbill::from_rational_approximation(t, candidate.backed_stake))
+				Perbill::one().min(Perbill::from_rational(t, candidate.backed_stake))
 				* edge.weight;
 			acc.saturating_add(extra)
 		} else {
diff --git a/primitives/npos-elections/src/tests.rs b/primitives/npos-elections/src/tests.rs
index edfea038ebc5..7bd8565a072f 100644
--- a/primitives/npos-elections/src/tests.rs
+++ b/primitives/npos-elections/src/tests.rs
@@ -1095,7 +1095,7 @@ mod score {
 			is_score_better(
 				claim.clone(),
 				initial.clone(),
-				Perbill::from_rational_approximation(1u32, 10_000),
+				Perbill::from_rational(1u32, 10_000),
 			),
 			true,
 		);
@@ -1104,7 +1104,7 @@ mod score {
 			is_score_better(
 				claim.clone(),
 				initial.clone(),
-				Perbill::from_rational_approximation(2u32, 10_000),
+				Perbill::from_rational(2u32, 10_000),
 			),
 			true,
 		);
@@ -1113,7 +1113,7 @@ mod score {
 			is_score_better(
 				claim.clone(),
 				initial.clone(),
-				Perbill::from_rational_approximation(3u32, 10_000),
+				Perbill::from_rational(3u32, 10_000),
 			),
 			true,
 		);
@@ -1122,7 +1122,7 @@ mod score {
 			is_score_better(
 				claim.clone(),
 				initial.clone(),
-				Perbill::from_rational_approximation(4u32, 10_000),
+				Perbill::from_rational(4u32, 10_000),
 			),
 			true,
 		);
@@ -1131,7 +1131,7 @@ mod score {
 			is_score_better(
 				claim.clone(),
 				initial.clone(),
-				Perbill::from_rational_approximation(5u32, 10_000),
+				Perbill::from_rational(5u32, 10_000),
 			),
 			false,
 		);

From c532e0bb319a8bc12b3a3b711f9285a41f0d5ec9 Mon Sep 17 00:00:00 2001
From: gabriel klawitter <gabreal@users.noreply.github.com>
Date: Tue, 16 Mar 2021 13:44:05 +0100
Subject: [PATCH 0506/1194] alerting-rules: ContinuousTaskEnded alert should
 not drop all unspecified labels (#8369)

---
 .maintain/monitoring/alerting-rules/alerting-rules.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.maintain/monitoring/alerting-rules/alerting-rules.yaml b/.maintain/monitoring/alerting-rules/alerting-rules.yaml
index 5ee237667767..1aed87ad84f8 100644
--- a/.maintain/monitoring/alerting-rules/alerting-rules.yaml
+++ b/.maintain/monitoring/alerting-rules/alerting-rules.yaml
@@ -135,7 +135,7 @@ groups:
 
   - alert: ContinuousTaskEnded
     expr: '(polkadot_tasks_spawned_total{task_name != "basic-authorship-proposer"} == 1)
-        - on(instance, task_name) (polkadot_tasks_ended_total == 1)'
+        - on(instance, task_name) group_left() (polkadot_tasks_ended_total == 1)'
     for: 5m
     labels:
       severity: warning

From ea50800227ad293321b0ee6da8263c4da173085d Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Tue, 16 Mar 2021 14:07:11 +0100
Subject: [PATCH 0507/1194] Document a pub item (#8374)

---
 frame/staking/src/lib.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 187f9f30e08a..021b7f3be419 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -805,6 +805,8 @@ impl<Balance: Default> EraPayout<Balance> for () {
 	}
 }
 
+/// Adaptor to turn a `PiecewiseLinear` curve definition into an `EraPayout` impl, used for
+/// backwards compatibility.
 pub struct ConvertCurve<T>(sp_std::marker::PhantomData<T>);
 impl<
 	Balance: AtLeast32BitUnsigned + Clone,

From b8ee107b876f345084baa2e167996f44dd323aa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 16 Mar 2021 15:42:56 +0100
Subject: [PATCH 0508/1194] Update diener to enable polkadot companions that
 use new crates (#8371)

* Update diener to enable polkadot companions that use new crates

Diener will be updated in the CI image to make it possible to have
companions that add new crates from Substrate.

Besides that the wasm-bindgen is updated, because `0.2.70` is not
available anymore on crates.io.

* update lock

Co-authored-by: kianenigma <kian@parity.io>
---
 .../gitlab/check_polkadot_companion_build.sh  |  3 +--
 Cargo.lock                                    | 20 +++++++++----------
 bin/node/browser-testing/Cargo.toml           |  2 +-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.maintain/gitlab/check_polkadot_companion_build.sh b/.maintain/gitlab/check_polkadot_companion_build.sh
index bf8fbf5aaf41..c1fd7365237d 100755
--- a/.maintain/gitlab/check_polkadot_companion_build.sh
+++ b/.maintain/gitlab/check_polkadot_companion_build.sh
@@ -86,10 +86,9 @@ else
 fi
 
 # Patch all Substrate crates in Polkadot
-diener patch --crates-to-patch ../ --substrate
+diener patch --crates-to-patch ../ --substrate --path Cargo.toml
 
 # Test Polkadot pr or master branch with this Substrate commit.
-cargo update -p sp-io
 time cargo test --all --release --verbose --features=real-overseer
 
 cd parachain/test-parachains/adder/collator/
diff --git a/Cargo.lock b/Cargo.lock
index 536a26ac2061..1ddc75fe7c53 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10399,9 +10399,9 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.70"
+version = "0.2.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55c0f7123de74f0dab9b7d00fd614e7b19349cd1e2f5252bbe9b1754b59433be"
+checksum = "7ee1280240b7c461d6a0071313e08f34a60b0365f14260362e5a2b17d1d31aa7"
 dependencies = [
  "cfg-if 1.0.0",
  "serde",
@@ -10411,9 +10411,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.70"
+version = "0.2.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bc45447f0d4573f3d65720f636bbcc3dd6ce920ed704670118650bcd47764c7"
+checksum = "5b7d8b6942b8bb3a9b0e73fc79b98095a27de6fa247615e59d096754a3bc2aa8"
 dependencies = [
  "bumpalo",
  "lazy_static",
@@ -10438,9 +10438,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.70"
+version = "0.2.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b8853882eef39593ad4174dd26fc9865a64e84026d223f63bb2c42affcbba2c"
+checksum = "e5ac38da8ef716661f0f36c0d8320b89028efe10c7c0afde65baffb496ce0d3b"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -10448,9 +10448,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.70"
+version = "0.2.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4133b5e7f2a531fa413b3a1695e925038a05a71cf67e87dafa295cb645a01385"
+checksum = "cc053ec74d454df287b9374ee8abb36ffd5acb95ba87da3ba5b7d3fe20eb401e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10461,9 +10461,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.70"
+version = "0.2.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd4945e4943ae02d15c13962b38a5b1e81eadd4b71214eee75af64a4d6a4fd64"
+checksum = "7d6f8ec44822dd71f5f221a5847fb34acd9060535c1211b70a05844c0f6383b1"
 
 [[package]]
 name = "wasm-bindgen-test"
diff --git a/bin/node/browser-testing/Cargo.toml b/bin/node/browser-testing/Cargo.toml
index fe83cc65ba63..f57bc20bc3a2 100644
--- a/bin/node/browser-testing/Cargo.toml
+++ b/bin/node/browser-testing/Cargo.toml
@@ -12,7 +12,7 @@ libp2p = { version = "0.35.1", default-features = false }
 jsonrpc-core = "15.0.0"
 serde = "1.0.106"
 serde_json = "1.0.48"
-wasm-bindgen = { version = "=0.2.70", features = ["serde-serialize"] }
+wasm-bindgen = { version = "=0.2.71", features = ["serde-serialize"] }
 wasm-bindgen-futures = "0.4.18"
 wasm-bindgen-test = "0.3.18"
 futures = "0.3.9"

From 24df4c50cb971fdfc9188d0009ef9a49eea2ce88 Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann <ben@gnunicorn.org>
Date: Tue, 16 Mar 2021 17:01:59 +0100
Subject: [PATCH 0509/1194] Release missing 3.0 crates:
 pallet-node-authorization sc-finality-grandpa-warp-sync (#8360)

* bump pallet-node-authorization

* prepping sc-finality-grandpa-warp-sync for release

* bump Cargo.lock
---
 Cargo.lock                          | 2 +-
 frame/node-authorization/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1ddc75fe7c53..ada75934c79b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5109,7 +5109,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-node-authorization"
-version = "2.0.0"
+version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
diff --git a/frame/node-authorization/Cargo.toml b/frame/node-authorization/Cargo.toml
index 245db9176f74..786eb84d1e52 100644
--- a/frame/node-authorization/Cargo.toml
+++ b/frame/node-authorization/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-node-authorization"
-version = "2.0.0"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"

From 056d63fe371e13f1bf22b2bd6325a081d3923083 Mon Sep 17 00:00:00 2001
From: Aleksandr Krupenkin <mail@akru.me>
Date: Tue, 16 Mar 2021 20:07:32 +0300
Subject: [PATCH 0510/1194] Update ss58-registry.json (#8351)

Added Plasm Network description
---
 ss58-registry.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ss58-registry.json b/ss58-registry.json
index 23ea3f8b6ed1..62ed68b7927c 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -60,9 +60,9 @@
 			"network": "plasm",
 			"displayName": "Plasm Network",
 			"symbols": ["PLM"],
-			"decimals": null,
+			"decimals": [15],
 			"standardAccount": "*25519",
-			"website": null
+			"website": "https://plasmnet.io"
 		},
 		{
 			"prefix": 6,

From 7eafd1f7fca1ff99ed11d066cf67493bbbf1b9c0 Mon Sep 17 00:00:00 2001
From: Martin Pugh <pugh@s3kr.it>
Date: Tue, 16 Mar 2021 18:09:24 +0100
Subject: [PATCH 0511/1194] [CI] Require D*-audit labels for any runtime
 changes (#8345)

* add check for audit labels if runtime change

* fix shellcheck nits

* include lib.sh in check_runtime.sh

* fix check_labels.sh

* fix check_labels.sh

* oops, this is github actions...

* why wont this work

* fetch all refs

* Update check-labels.yml

* print env - wtf is happening

* checkout the PR...

* ffs

* fix

* REVERT ME: test runtime check

* Revert "REVERT ME: test runtime check"

This reverts commit 0fd2b04abeeac12dd8ede4c0708cb796f9e3e722.
---
 .github/workflows/check-labels.yml |  4 ++++
 .maintain/common/lib.sh            | 16 +++++++++++++++-
 .maintain/github/check_labels.sh   | 17 +++++++++++++++++
 .maintain/gitlab/check_runtime.sh  | 25 ++++++++++++-------------
 4 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/check-labels.yml b/.github/workflows/check-labels.yml
index ee0307517699..062527d311d8 100644
--- a/.github/workflows/check-labels.yml
+++ b/.github/workflows/check-labels.yml
@@ -9,8 +9,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          ref: ${{ github.event.pull_request.head.ref }}
       - name: Check labels
         run: bash ${{ github.workspace }}/.maintain/github/check_labels.sh
         env:
           GITHUB_PR: ${{ github.event.pull_request.number }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          HEAD_SHA: ${{ github.event.pull_request.head.sha }}
diff --git a/.maintain/common/lib.sh b/.maintain/common/lib.sh
index 1d4be0ecc729..ce6c566d799a 100755
--- a/.maintain/common/lib.sh
+++ b/.maintain/common/lib.sh
@@ -82,7 +82,7 @@ has_label(){
 
 # Formats a message into a JSON string for posting to Matrix
 # message: 'any plaintext message'
-# formatted_message: '<strong>optional message formatted in <em>html</em></strong>' 
+# formatted_message: '<strong>optional message formatted in <em>html</em></strong>'
 # Usage: structure_message $content $formatted_content (optional)
 structure_message() {
   if [ -z "$2" ]; then
@@ -101,3 +101,17 @@ structure_message() {
 send_message() {
 curl -XPOST -d "$1" "https://matrix.parity.io/_matrix/client/r0/rooms/$2/send/m.room.message?access_token=$3"
 }
+
+# Check for runtime changes between two commits. This is defined as any changes
+# to bin/node/src/runtime, frame/ and primitives/sr_* trees.
+has_runtime_changes() {
+  from=$1
+  to=$2
+  if git diff --name-only "${from}...${to}" \
+    | grep -q -e '^frame/' -e '^primitives/'
+  then
+    return 0
+  else
+    return 1
+  fi
+}
diff --git a/.maintain/github/check_labels.sh b/.maintain/github/check_labels.sh
index 75190db6683f..6f280964fe52 100755
--- a/.maintain/github/check_labels.sh
+++ b/.maintain/github/check_labels.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 
 #shellcheck source=../common/lib.sh
 source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )/../common/lib.sh"
@@ -30,6 +31,12 @@ criticality_labels=(
   'C9-critical'
 )
 
+audit_labels=(
+  'D1-audited👍'
+  'D5-nicetohaveaudit⚠️'
+  'D9-needsaudit👮'
+)
+
 echo "[+] Checking release notes (B) labels"
 if ensure_labels "${releasenotes_labels[@]}";  then
   echo "[+] Release notes label detected. All is well."
@@ -46,4 +53,14 @@ else
   exit 1
 fi
 
+if has_runtime_changes origin/master "${HEAD_SHA}"; then
+  echo "[+] Runtime changes detected. Checking audit (D) labels"
+  if ensure_labels "${audit_labels[@]}";  then
+    echo "[+] Release audit label detected. All is well."
+  else
+    echo "[!] Release audit label not detected. Please add one of: ${audit_labels[*]}"
+    exit 1
+  fi
+fi
+
 exit 0
diff --git a/.maintain/gitlab/check_runtime.sh b/.maintain/gitlab/check_runtime.sh
index 6d009c5aafc6..3b0b1ad10761 100755
--- a/.maintain/gitlab/check_runtime.sh
+++ b/.maintain/gitlab/check_runtime.sh
@@ -8,12 +8,13 @@
 
 set -e # fail on any error
 
-
+#shellcheck source=../common/lib.sh
+. "$(dirname "${0}")/../common/lib.sh"
 
 VERSIONS_FILE="bin/node/runtime/src/lib.rs"
 
-boldprint () { printf "|\n| \033[1m${@}\033[0m\n|\n" ; }
-boldcat () { printf "|\n"; while read l; do printf "| \033[1m${l}\033[0m\n"; done; printf "|\n" ; }
+boldprint () { printf "|\n| \033[1m%s\033[0m\n|\n" "${@}"; }
+boldcat () { printf "|\n"; while read -r l; do printf "| \033[1m%s\033[0m\n" "${l}"; done; printf "|\n" ; }
 
 github_label () {
 	echo
@@ -23,7 +24,7 @@ github_label () {
 		-F "ref=master" \
 		-F "variables[LABEL]=${1}" \
 		-F "variables[PRNO]=${CI_COMMIT_REF_NAME}" \
-		${GITLAB_API}/projects/${GITHUB_API_PROJECT}/trigger/pipeline
+		"${GITLAB_API}/projects/${GITHUB_API_PROJECT}/trigger/pipeline"
 }
 
 
@@ -31,16 +32,14 @@ boldprint "latest 10 commits of ${CI_COMMIT_REF_NAME}"
 git log --graph --oneline --decorate=short -n 10
 
 boldprint "make sure the master branch and release tag are available in shallow clones"
-git fetch --depth=${GIT_DEPTH:-100} origin master
-git fetch --depth=${GIT_DEPTH:-100} origin release
+git fetch --depth="${GIT_DEPTH:-100}" origin master
+git fetch --depth="${GIT_DEPTH:-100}" origin release
 git tag -f release FETCH_HEAD
 git log -n1 release
 
 
 boldprint "check if the wasm sources changed"
-if ! git diff --name-only origin/master...${CI_COMMIT_SHA} \
-	| grep -v -e '^primitives/sr-arithmetic/fuzzer' \
-	| grep -q -e '^bin/node/src/runtime' -e '^frame/' -e '^primitives/sr-'
+if ! has_runtime_changes origin/master "${CI_COMMIT_SHA}"
 then
 	boldcat <<-EOT
 
@@ -57,9 +56,9 @@ fi
 # consensus-critical logic that has changed. the runtime wasm blobs must be
 # rebuilt.
 
-add_spec_version="$(git diff tags/release...${CI_COMMIT_SHA} ${VERSIONS_FILE} \
+add_spec_version="$(git diff "tags/release...${CI_COMMIT_SHA}" "${VERSIONS_FILE}" \
 	| sed -n -r "s/^\+[[:space:]]+spec_version: +([0-9]+),$/\1/p")"
-sub_spec_version="$(git diff tags/release...${CI_COMMIT_SHA} ${VERSIONS_FILE} \
+sub_spec_version="$(git diff "tags/release...${CI_COMMIT_SHA}" "${VERSIONS_FILE}" \
 	| sed -n -r "s/^\-[[:space:]]+spec_version: +([0-9]+),$/\1/p")"
 
 
@@ -82,9 +81,9 @@ else
 	# check for impl_version updates: if only the impl versions changed, we assume
 	# there is no consensus-critical logic that has changed.
 
-	add_impl_version="$(git diff tags/release...${CI_COMMIT_SHA} ${VERSIONS_FILE} \
+	add_impl_version="$(git diff "tags/release...${CI_COMMIT_SHA}" "${VERSIONS_FILE}" \
 		| sed -n -r 's/^\+[[:space:]]+impl_version: +([0-9]+),$/\1/p')"
-	sub_impl_version="$(git diff tags/release...${CI_COMMIT_SHA} ${VERSIONS_FILE} \
+	sub_impl_version="$(git diff "tags/release...${CI_COMMIT_SHA}" "${VERSIONS_FILE}" \
 		| sed -n -r 's/^\-[[:space:]]+impl_version: +([0-9]+),$/\1/p')"
 
 

From 66098c22a087f10acd536ba67205dd1e1a9ea5dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 16 Mar 2021 19:37:58 +0100
Subject: [PATCH 0512/1194] Fix CI benchmark check (#8380)

---
 frame/contracts/src/wasm/prepare.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/frame/contracts/src/wasm/prepare.rs b/frame/contracts/src/wasm/prepare.rs
index caf6ef88c1ba..d9c5ed0c204b 100644
--- a/frame/contracts/src/wasm/prepare.rs
+++ b/frame/contracts/src/wasm/prepare.rs
@@ -528,7 +528,6 @@ mod tests {
 	use super::*;
 	use crate::{exec::Ext, Limits};
 	use std::fmt;
-	use assert_matches::assert_matches;
 
 	impl fmt::Debug for PrefabWasmModule<crate::tests::Test> {
 		fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
@@ -572,7 +571,7 @@ mod tests {
 					.. Default::default()
 				};
 				let r = do_preparation::<env::Test, crate::tests::Test>(wasm, &schedule);
-				assert_matches!(r, $($expected)*);
+				assert_matches::assert_matches!(r, $($expected)*);
 			}
 		};
 	}
@@ -983,7 +982,7 @@ mod tests {
 			let mut schedule = Schedule::default();
 			schedule.enable_println = true;
 			let r = do_preparation::<env::Test, crate::tests::Test>(wasm, &schedule);
-			assert_matches!(r, Ok(_));
+			assert_matches::assert_matches!(r, Ok(_));
 		}
 	}
 

From 3f434dff0c870718aa24288530987b45863b1a55 Mon Sep 17 00:00:00 2001
From: Denis Pisarev <denis.pisarev@parity.io>
Date: Tue, 16 Mar 2021 20:37:03 +0100
Subject: [PATCH 0513/1194] CI: run cargo deny nightly (#8376)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* CI: run cargo deny only nightly before it's fixed

* Release missing 3.0 crates: pallet-node-authorization sc-finality-grandpa-warp-sync (#8360)

* bump pallet-node-authorization

* prepping sc-finality-grandpa-warp-sync for release

* bump Cargo.lock

* Update ss58-registry.json (#8351)

Added Plasm Network description

* [CI] Require D*-audit labels for any runtime changes (#8345)

* add check for audit labels if runtime change

* fix shellcheck nits

* include lib.sh in check_runtime.sh

* fix check_labels.sh

* fix check_labels.sh

* oops, this is github actions...

* why wont this work

* fetch all refs

* Update check-labels.yml

* print env - wtf is happening

* checkout the PR...

* ffs

* fix

* REVERT ME: test runtime check

* Revert "REVERT ME: test runtime check"

This reverts commit 0fd2b04abeeac12dd8ede4c0708cb796f9e3e722.

* Fix CI benchmark check (#8380)

* CI: run cargo deny only nightly before it's fixed

Co-authored-by: Benjamin Kampmann <ben@gnunicorn.org>
Co-authored-by: Aleksandr Krupenkin <mail@akru.me>
Co-authored-by: Martin Pugh <pugh@s3kr.it>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 .gitlab-ci.yml | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9619e600430a..d29fb27ec411 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -119,6 +119,11 @@ default:
     - if: $CI_COMMIT_REF_NAME == "tags"
     - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
 
+.nightly-pipeline:                 &nightly-pipeline
+  rules:
+    # this job runs only on nightly pipeline with the mentioned variable, against `master` branch
+    - if: $CI_COMMIT_REF_NAME == "master" && $CI_PIPELINE_SOURCE == "schedule" && $PIPELINE == "nightly"
+
 #### stage:                       .pre
 
 skip-if-draft:
@@ -199,17 +204,7 @@ test-prometheus-alerting-rules:
 cargo-deny:
   stage:                           test
   <<:                              *docker-env
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "pipeline"
-      when: never
-    - changes:
-      - "Cargo.lock"
-      - "**/Cargo.toml"
-    - if: $CI_PIPELINE_SOURCE == "web"
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-    - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME == "tags"
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
+  <<:                              *nightly-pipeline
   script:
     - cargo deny check --hide-inclusion-graph -c .maintain/deny.toml
   after_script:
@@ -654,9 +649,7 @@ deploy-prometheus-alerting-rules:
 
 trigger-simnet:
   stage:                           deploy
-  rules:
-    # this job runs only on nightly pipeline with the mentioned variable, against `master` branch
-    - if: $CI_COMMIT_REF_NAME == "master" && $CI_PIPELINE_SOURCE == "schedule" && $PIPELINE == "nightly"
+  <<:                              *nightly-pipeline
   needs:
     - job:                         publish-docker-substrate
   trigger:

From 319d244f6a2601a1a6f62595fcc7f5976615d50e Mon Sep 17 00:00:00 2001
From: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
Date: Wed, 17 Mar 2021 09:13:33 +0100
Subject: [PATCH 0514/1194] Improve complexity of
 CompactAssignments::unique_targets (#8314)

* Improve complexity of CompactAssignments::unique_targets

Original implementation was O(n**2). Current impl is O(n log n).

Avoided the original proposed mitigation because it does not retain
the de-duplicating property present in the original implementation.
This implementation does a little more work, but retains that property.

* Explicitly choose sp_std Vec and BTreeSet

Ensures that the macro still works if someone uses it in a context
in which sp_std is not imported or is renamed.

* explicitly use sp_std vectors throughout compact macro
---
 .../npos-elections/compact/src/assignment.rs  |  2 +-
 .../npos-elections/compact/src/codec.rs       | 20 +++++++--------
 primitives/npos-elections/compact/src/lib.rs  | 25 +++++++++----------
 primitives/npos-elections/src/lib.rs          |  2 ++
 4 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/primitives/npos-elections/compact/src/assignment.rs b/primitives/npos-elections/compact/src/assignment.rs
index 12f5ca2b4173..2c8edefbfb37 100644
--- a/primitives/npos-elections/compact/src/assignment.rs
+++ b/primitives/npos-elections/compact/src/assignment.rs
@@ -125,7 +125,7 @@ pub(crate) fn into_impl(count: usize, per_thing: syn::Type) -> TokenStream2 {
 						let target = target_at(*t_idx).or_invalid_index()?;
 						Ok((target, *p))
 					})
-					.collect::<Result<Vec<(A, #per_thing)>, _npos::Error>>()?;
+					.collect::<Result<_npos::sp_std::prelude::Vec<(A, #per_thing)>, _npos::Error>>()?;
 
 				if sum >= #per_thing::one() {
 					return Err(_npos::Error::CompactStakeOverflow);
diff --git a/primitives/npos-elections/compact/src/codec.rs b/primitives/npos-elections/compact/src/codec.rs
index 6e8d4d9277db..f75f99682711 100644
--- a/primitives/npos-elections/compact/src/codec.rs
+++ b/primitives/npos-elections/compact/src/codec.rs
@@ -49,14 +49,14 @@ fn decode_impl(
 		quote! {
 			let #name =
 			<
-				Vec<(_npos::codec::Compact<#voter_type>, _npos::codec::Compact<#target_type>)>
+				_npos::sp_std::prelude::Vec<(_npos::codec::Compact<#voter_type>, _npos::codec::Compact<#target_type>)>
 				as
 				_npos::codec::Decode
 			>::decode(value)?;
 			let #name = #name
 				.into_iter()
 				.map(|(v, t)| (v.0, t.0))
-				.collect::<Vec<_>>();
+				.collect::<_npos::sp_std::prelude::Vec<_>>();
 		}
 	};
 
@@ -65,7 +65,7 @@ fn decode_impl(
 		quote! {
 			let #name =
 			<
-				Vec<(
+				_npos::sp_std::prelude::Vec<(
 					_npos::codec::Compact<#voter_type>,
 					(_npos::codec::Compact<#target_type>, _npos::codec::Compact<#weight_type>),
 					_npos::codec::Compact<#target_type>,
@@ -76,7 +76,7 @@ fn decode_impl(
 			let #name = #name
 				.into_iter()
 				.map(|(v, (t1, w), t2)| (v.0, (t1.0, w.0), t2.0))
-				.collect::<Vec<_>>();
+				.collect::<_npos::sp_std::prelude::Vec<_>>();
 		}
 	};
 
@@ -90,7 +90,7 @@ fn decode_impl(
 		quote! {
 			let #name =
 			<
-				Vec<(
+				_npos::sp_std::prelude::Vec<(
 					_npos::codec::Compact<#voter_type>,
 					[(_npos::codec::Compact<#target_type>, _npos::codec::Compact<#weight_type>); #c-1],
 					_npos::codec::Compact<#target_type>,
@@ -104,7 +104,7 @@ fn decode_impl(
 					[ #inner_impl ],
 					t_last.0,
 				))
-				.collect::<Vec<_>>();
+				.collect::<_npos::sp_std::prelude::Vec<_>>();
 		}
 	}).collect::<TokenStream2>();
 
@@ -142,7 +142,7 @@ fn encode_impl(ident: syn::Ident, count: usize) -> TokenStream2 {
 					_npos::codec::Compact(v.clone()),
 					_npos::codec::Compact(t.clone()),
 				))
-				.collect::<Vec<_>>();
+				.collect::<_npos::sp_std::prelude::Vec<_>>();
 			#name.encode_to(&mut r);
 		}
 	};
@@ -160,7 +160,7 @@ fn encode_impl(ident: syn::Ident, count: usize) -> TokenStream2 {
 					),
 					_npos::codec::Compact(t2.clone()),
 				))
-				.collect::<Vec<_>>();
+				.collect::<_npos::sp_std::prelude::Vec<_>>();
 			#name.encode_to(&mut r);
 		}
 	};
@@ -184,14 +184,14 @@ fn encode_impl(ident: syn::Ident, count: usize) -> TokenStream2 {
 					[ #inners_compact_array ],
 					_npos::codec::Compact(t_last.clone()),
 				))
-				.collect::<Vec<_>>();
+				.collect::<_npos::sp_std::prelude::Vec<_>>();
 			#name.encode_to(&mut r);
 		}
 	}).collect::<TokenStream2>();
 
 	quote!(
 		impl _npos::codec::Encode for #ident {
-			fn encode(&self) -> Vec<u8> {
+			fn encode(&self) -> _npos::sp_std::prelude::Vec<u8> {
 				let mut r = vec![];
 				#encode_impl_single
 				#encode_impl_double
diff --git a/primitives/npos-elections/compact/src/lib.rs b/primitives/npos-elections/compact/src/lib.rs
index ed1837bae18b..dd6d4de9b024 100644
--- a/primitives/npos-elections/compact/src/lib.rs
+++ b/primitives/npos-elections/compact/src/lib.rs
@@ -119,14 +119,14 @@ fn struct_def(
 		let name = field_name_for(1);
 		// NOTE: we use the visibility of the struct for the fields as well.. could be made better.
 		quote!(
-			#vis #name: Vec<(#voter_type, #target_type)>,
+			#vis #name: _npos::sp_std::prelude::Vec<(#voter_type, #target_type)>,
 		)
 	};
 
 	let doubles = {
 		let name = field_name_for(2);
 		quote!(
-			#vis #name: Vec<(#voter_type, (#target_type, #weight_type), #target_type)>,
+			#vis #name: _npos::sp_std::prelude::Vec<(#voter_type, (#target_type, #weight_type), #target_type)>,
 		)
 	};
 
@@ -135,7 +135,7 @@ fn struct_def(
 			let field_name = field_name_for(c);
 			let array_len = c - 1;
 			quote!(
-				#vis #field_name: Vec<(
+				#vis #field_name: _npos::sp_std::prelude::Vec<(
 					#voter_type,
 					[(#target_type, #weight_type); #array_len],
 					#target_type
@@ -194,20 +194,19 @@ fn struct_def(
 				all_edges
 			}
 
-			fn unique_targets(&self) -> Vec<Self::Target> {
+			fn unique_targets(&self) -> _npos::sp_std::prelude::Vec<Self::Target> {
 				// NOTE: this implementation returns the targets sorted, but we don't use it yet per
 				// se, nor is the API enforcing it.
-				let mut all_targets: Vec<Self::Target> = Vec::with_capacity(self.average_edge_count());
+				use _npos::sp_std::collections::btree_set::BTreeSet;
+
+				let mut all_targets: BTreeSet<Self::Target> = BTreeSet::new();
 				let mut maybe_insert_target = |t: Self::Target| {
-					match all_targets.binary_search(&t) {
-						Ok(_) => (),
-						Err(pos) => all_targets.insert(pos, t)
-					}
+					all_targets.insert(t);
 				};
 
 				#unique_targets_impl
 
-				all_targets
+				all_targets.into_iter().collect()
 			}
 
 			fn remove_voter(&mut self, to_remove: Self::Voter) -> bool {
@@ -216,7 +215,7 @@ fn struct_def(
 			}
 
 			fn from_assignment<FV, FT, A>(
-				assignments: Vec<_npos::Assignment<A, #weight_type>>,
+				assignments: _npos::sp_std::prelude::Vec<_npos::Assignment<A, #weight_type>>,
 				index_of_voter: FV,
 				index_of_target: FT,
 			) -> Result<Self, _npos::Error>
@@ -243,8 +242,8 @@ fn struct_def(
 				self,
 				voter_at: impl Fn(Self::Voter) -> Option<A>,
 				target_at: impl Fn(Self::Target) -> Option<A>,
-			) -> Result<Vec<_npos::Assignment<A, #weight_type>>, _npos::Error> {
-				let mut assignments: Vec<_npos::Assignment<A, #weight_type>> = Default::default();
+			) -> Result<_npos::sp_std::prelude::Vec<_npos::Assignment<A, #weight_type>>, _npos::Error> {
+				let mut assignments: _npos::sp_std::prelude::Vec<_npos::Assignment<A, #weight_type>> = Default::default();
 				#into_impl
 				Ok(assignments)
 			}
diff --git a/primitives/npos-elections/src/lib.rs b/primitives/npos-elections/src/lib.rs
index 10ee12cc5508..05505d06f201 100644
--- a/primitives/npos-elections/src/lib.rs
+++ b/primitives/npos-elections/src/lib.rs
@@ -119,6 +119,8 @@ pub use pjr::*;
 pub use codec;
 #[doc(hidden)]
 pub use sp_arithmetic;
+#[doc(hidden)]
+pub use sp_std;
 
 /// Simple Extension trait to easily convert `None` from index closures to `Err`.
 ///

From cb033a47d2ae6322e318b44d65777f1bfc50a75c Mon Sep 17 00:00:00 2001
From: Zeke Mostov <32168567+emostov@users.noreply.github.com>
Date: Wed, 17 Mar 2021 01:52:42 -0700
Subject: [PATCH 0515/1194] Migrate pallet-proxy to pallet attribute macro
 (#8365)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Migrate pallet-proxy to pallet attribute macro

Part of #7882.

Converts the `Proxy` pallet to the new pallet attribute macro introduced in #6877.

[Upgrade guidelines used](https://substrate.dev/rustdocs/v3.0.0/frame_support/attr.pallet.html#upgrade-guidelines).

## ⚠️ Breaking Change  ⚠️

From [checking upgrade guidelines](https://crates.parity.io/frame_support/attr.pallet.html#checking-upgrade-guidelines)

> storages now use PalletInfo for module_prefix instead of the one given to `decl_storage`: use of this pallet in `construct_runtime!` needs careful updating of the name in order to not break storage or to upgrade storage (moreover for instantiable pallet). If pallet is published, make sure to warn about this breaking change.

So users of the `Assets` pallet must be careful about the name they used in `construct_runtime!`. Hence the `runtime-migration` label, which might not be needed depending on the configuration of the `Assets` pallet.

### Notes

There are some changes to the docs in metadata for the constants. The docs in the metadata for constants are now more complete.
---
 frame/proxy/src/benchmarking.rs |   8 +-
 frame/proxy/src/lib.rs          | 383 ++++++++++++++++++--------------
 frame/proxy/src/tests.rs        |  45 ++--
 3 files changed, 247 insertions(+), 189 deletions(-)

diff --git a/frame/proxy/src/benchmarking.rs b/frame/proxy/src/benchmarking.rs
index 130c98001187..2fb99c57c115 100644
--- a/frame/proxy/src/benchmarking.rs
+++ b/frame/proxy/src/benchmarking.rs
@@ -90,7 +90,7 @@ benchmarks! {
 		let call: <T as Config>::Call = frame_system::Call::<T>::remark(vec![]).into();
 	}: _(RawOrigin::Signed(caller), real, Some(T::ProxyType::default()), Box::new(call))
 	verify {
-		assert_last_event::<T>(RawEvent::ProxyExecuted(Ok(())).into())
+		assert_last_event::<T>(Event::ProxyExecuted(Ok(())).into())
 	}
 
 	proxy_announced {
@@ -111,7 +111,7 @@ benchmarks! {
 		add_announcements::<T>(a, Some(delegate.clone()), None)?;
 	}: _(RawOrigin::Signed(caller), delegate, real, Some(T::ProxyType::default()), Box::new(call))
 	verify {
-		assert_last_event::<T>(RawEvent::ProxyExecuted(Ok(())).into())
+		assert_last_event::<T>(Event::ProxyExecuted(Ok(())).into())
 	}
 
 	remove_announcement {
@@ -169,7 +169,7 @@ benchmarks! {
 		let call_hash = T::CallHasher::hash_of(&call);
 	}: _(RawOrigin::Signed(caller.clone()), real.clone(), call_hash)
 	verify {
-		assert_last_event::<T>(RawEvent::Announced(real, caller, call_hash).into());
+		assert_last_event::<T>(Event::Announced(real, caller, call_hash).into());
 	}
 
 	add_proxy {
@@ -220,7 +220,7 @@ benchmarks! {
 	)
 	verify {
 		let anon_account = Module::<T>::anonymous_account(&caller, &T::ProxyType::default(), 0, None);
-		assert_last_event::<T>(RawEvent::AnonymousCreated(
+		assert_last_event::<T>(Event::AnonymousCreated(
 			anon_account,
 			caller,
 			T::ProxyType::default(),
diff --git a/frame/proxy/src/lib.rs b/frame/proxy/src/lib.rs
index 1e5aaadcc62d..c3ff658daf33 100644
--- a/frame/proxy/src/lib.rs
+++ b/frame/proxy/src/lib.rs
@@ -15,11 +15,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! # Proxy Module
-//! A module allowing accounts to give permission to other accounts to dispatch types of calls from
+//! # Proxy Pallet
+//! A pallet allowing accounts to give permission to other accounts to dispatch types of calls from
 //! their signed origin.
 //!
-//! The accounts to which permission is delegated may be requied to announce the action that they
+//! The accounts to which permission is delegated may be required to announce the action that they
 //! wish to execute some duration prior to execution happens. In this case, the target account may
 //! reject the announcement and in doing so, veto the execution.
 //!
@@ -45,73 +45,25 @@ pub mod weights;
 use sp_std::prelude::*;
 use codec::{Encode, Decode};
 use sp_io::hashing::blake2_256;
-use sp_runtime::{DispatchResult, traits::{Dispatchable, Zero, Hash, Member, Saturating}};
+use sp_runtime::{
+	DispatchResult,
+	traits::{Dispatchable, Zero, Hash, Saturating}
+};
 use frame_support::{
-	decl_module, decl_event, decl_error, decl_storage, Parameter, ensure, RuntimeDebug, traits::{
-		Get, ReservableCurrency, Currency, InstanceFilter, OriginTrait, IsType, IsSubType,
-	}, weights::{Weight, GetDispatchInfo}, dispatch::PostDispatchInfo, storage::IterableStorageMap,
+		RuntimeDebug, ensure,
+		dispatch::{DispatchResultWithPostInfo, PostDispatchInfo},
+		traits::{Get, ReservableCurrency, Currency, InstanceFilter, OriginTrait, IsType, IsSubType},
+		weights::{Weight, GetDispatchInfo}
 };
-use frame_system::{self as system, ensure_signed};
+use frame_system::{self as system};
 use frame_support::dispatch::DispatchError;
 pub use weights::WeightInfo;
 
-type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
-
-/// Configuration trait.
-pub trait Config: frame_system::Config {
-	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
-
-	/// The overarching call type.
-	type Call: Parameter + Dispatchable<Origin=Self::Origin, PostInfo=PostDispatchInfo>
-		+ GetDispatchInfo + From<frame_system::Call<Self>> + IsSubType<Call<Self>>
-		+ IsType<<Self as frame_system::Config>::Call>;
-
-	/// The currency mechanism.
-	type Currency: ReservableCurrency<Self::AccountId>;
-
-	/// A kind of proxy; specified with the proxy and passed in to the `IsProxyable` fitler.
-	/// The instance filter determines whether a given call may be proxied under this type.
-	///
-	/// IMPORTANT: `Default` must be provided and MUST BE the the *most permissive* value.
-	type ProxyType: Parameter + Member + Ord + PartialOrd + InstanceFilter<<Self as Config>::Call>
-		+ Default;
-
-	/// The base amount of currency needed to reserve for creating a proxy.
-	///
-	/// This is held for an additional storage item whose value size is
-	/// `sizeof(Balance)` bytes and whose key size is `sizeof(AccountId)` bytes.
-	type ProxyDepositBase: Get<BalanceOf<Self>>;
-
-	/// The amount of currency needed per proxy added.
-	///
-	/// This is held for adding 32 bytes plus an instance of `ProxyType` more into a pre-existing
-	/// storage value.
-	type ProxyDepositFactor: Get<BalanceOf<Self>>;
-
-	/// The maximum amount of proxies allowed for a single account.
-	type MaxProxies: Get<u16>;
-
-	/// Weight information for extrinsics in this pallet.
-	type WeightInfo: WeightInfo;
+pub use pallet::*;
 
-	/// The maximum amount of time-delayed announcements that are allowed to be pending.
-	type MaxPending: Get<u32>;
-
-	/// The type of hash used for hashing the call.
-	type CallHasher: Hash;
-
-	/// The base amount of currency needed to reserve for creating an announcement.
-	///
-	/// This is held when a new storage item holding a `Balance` is created (typically 16 bytes).
-	type AnnouncementDepositBase: Get<BalanceOf<Self>>;
+type CallHashOf<T> = <<T as Config>::CallHasher as Hash>::Output;
 
-	/// The amount of currency needed per announcement made.
-	///
-	/// This is held for adding an `AccountId`, `Hash` and `BlockNumber` (typically 68 bytes)
-	/// into a pre-existing storage value.
-	type AnnouncementDepositFactor: Get<BalanceOf<Self>>;
-}
+type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 
 /// The parameters under which a particular account has a proxy relationship with some other
 /// account.
@@ -137,84 +89,85 @@ pub struct Announcement<AccountId, Hash, BlockNumber> {
 	height: BlockNumber,
 }
 
-type CallHashOf<T> = <<T as Config>::CallHasher as Hash>::Output;
-
-decl_storage! {
-	trait Store for Module<T: Config> as Proxy {
-		/// The set of account proxies. Maps the account which has delegated to the accounts
-		/// which are being delegated to, together with the amount held on deposit.
-		pub Proxies get(fn proxies): map hasher(twox_64_concat) T::AccountId
-			=> (Vec<ProxyDefinition<T::AccountId, T::ProxyType, T::BlockNumber>>, BalanceOf<T>);
+#[frame_support::pallet]
+pub mod pallet {
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+	use super::{*, DispatchResult};
 
-		/// The announcements made by the proxy (key).
-		pub Announcements get(fn announcements): map hasher(twox_64_concat) T::AccountId
-			=> (Vec<Announcement<T::AccountId, CallHashOf<T>, T::BlockNumber>>, BalanceOf<T>);
-	}
-}
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(_);
 
-decl_error! {
-	pub enum Error for Module<T: Config> {
-		/// There are too many proxies registered or too many announcements pending.
-		TooMany,
-		/// Proxy registration not found.
-		NotFound,
-		/// Sender is not a proxy of the account to be proxied.
-		NotProxy,
-		/// A call which is incompatible with the proxy type's filter was attempted.
-		Unproxyable,
-		/// Account is already a proxy.
-		Duplicate,
-		/// Call may not be made by proxy because it may escalate its privileges.
-		NoPermission,
-		/// Announcement, if made at all, was made too recently.
-		Unannounced,
-		/// Cannot add self as proxy.
-		NoSelfProxy,
-	}
-}
+	/// Configuration trait.
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		/// The overarching event type.
+		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
 
-decl_event! {
-	/// Events type.
-	pub enum Event<T> where
-		AccountId = <T as frame_system::Config>::AccountId,
-		ProxyType = <T as Config>::ProxyType,
-		Hash = CallHashOf<T>,
-	{
-		/// A proxy was executed correctly, with the given \[result\].
-		ProxyExecuted(DispatchResult),
-		/// Anonymous account has been created by new proxy with given
-		/// disambiguation index and proxy type. \[anonymous, who, proxy_type, disambiguation_index\]
-		AnonymousCreated(AccountId, AccountId, ProxyType, u16),
-		/// An announcement was placed to make a call in the future. \[real, proxy, call_hash\]
-		Announced(AccountId, AccountId, Hash),
-	}
-}
+		/// The overarching call type.
+		type Call: Parameter + Dispatchable<Origin=Self::Origin, PostInfo=PostDispatchInfo>
+			+ GetDispatchInfo + From<frame_system::Call<Self>> + IsSubType<Call<Self>>
+			+ IsType<<Self as frame_system::Config>::Call>;
 
-decl_module! {
-	pub struct Module<T: Config> for enum Call where origin: T::Origin {
-		type Error = Error<T>;
+		/// The currency mechanism.
+		type Currency: ReservableCurrency<Self::AccountId>;
 
-		/// Deposit one of this module's events by using the default implementation.
-		fn deposit_event() = default;
+		/// A kind of proxy; specified with the proxy and passed in to the `IsProxyable` fitler.
+		/// The instance filter determines whether a given call may be proxied under this type.
+		///
+		/// IMPORTANT: `Default` must be provided and MUST BE the the *most permissive* value.
+		type ProxyType: Parameter + Member + Ord + PartialOrd + InstanceFilter<<Self as Config>::Call>
+			+ Default;
 
 		/// The base amount of currency needed to reserve for creating a proxy.
-		const ProxyDepositBase: BalanceOf<T> = T::ProxyDepositBase::get();
+		///
+		/// This is held for an additional storage item whose value size is
+		/// `sizeof(Balance)` bytes and whose key size is `sizeof(AccountId)` bytes.
+		#[pallet::constant]
+		type ProxyDepositBase: Get<BalanceOf<Self>>;
 
 		/// The amount of currency needed per proxy added.
-		const ProxyDepositFactor: BalanceOf<T> = T::ProxyDepositFactor::get();
+		///
+		/// This is held for adding 32 bytes plus an instance of `ProxyType` more into a pre-existing
+		/// storage value. Thus, when configuring `ProxyDepositFactor` one should take into account
+		/// `32 + proxy_type.encode().len()` bytes of data.
+		#[pallet::constant]
+		type ProxyDepositFactor: Get<BalanceOf<Self>>;
 
 		/// The maximum amount of proxies allowed for a single account.
-		const MaxProxies: u16 = T::MaxProxies::get();
+		#[pallet::constant]
+		type MaxProxies: Get<u16>;
+
+		/// Weight information for extrinsics in this pallet.
+		type WeightInfo: WeightInfo;
 
-		/// `MaxPending` metadata shadow.
-		const MaxPending: u32 = T::MaxPending::get();
+		/// The maximum amount of time-delayed announcements that are allowed to be pending.
+		#[pallet::constant]
+		type MaxPending: Get<u32>;
 
-		/// `AnnouncementDepositBase` metadata shadow.
-		const AnnouncementDepositBase: BalanceOf<T> = T::AnnouncementDepositBase::get();
+		/// The type of hash used for hashing the call.
+		type CallHasher: Hash;
+
+		/// The base amount of currency needed to reserve for creating an announcement.
+		///
+		/// This is held when a new storage item holding a `Balance` is created (typically 16 bytes).
+		#[pallet::constant]
+		type AnnouncementDepositBase: Get<BalanceOf<Self>>;
+
+		/// The amount of currency needed per announcement made.
+		///
+		/// This is held for adding an `AccountId`, `Hash` and `BlockNumber` (typically 68 bytes)
+		/// into a pre-existing storage value.
+		#[pallet::constant]
+		type AnnouncementDepositFactor: Get<BalanceOf<Self>>;
+	}
 
-		/// `AnnouncementDepositFactor` metadata shadow.
-		const AnnouncementDepositFactor: BalanceOf<T> = T::AnnouncementDepositFactor::get();
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
 
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
 		/// Dispatch the given `call` from an account that the sender is authorised for through
 		/// `add_proxy`.
 		///
@@ -230,24 +183,27 @@ decl_module! {
 		/// # <weight>
 		/// Weight is a function of the number of proxies the user has (P).
 		/// # </weight>
-		#[weight = {
+		#[pallet::weight({
 			let di = call.get_dispatch_info();
 			(T::WeightInfo::proxy(T::MaxProxies::get().into())
 				.saturating_add(di.weight)
 				 // AccountData for inner call origin accountdata.
 				.saturating_add(T::DbWeight::get().reads_writes(1, 1)),
 			di.class)
-		}]
-		fn proxy(origin,
+		})]
+		pub(super) fn proxy(
+			origin: OriginFor<T>,
 			real: T::AccountId,
 			force_proxy_type: Option<T::ProxyType>,
 			call: Box<<T as Config>::Call>,
-		) {
+		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
 			let def = Self::find_proxy(&real, &who, force_proxy_type)?;
 			ensure!(def.delay.is_zero(), Error::<T>::Unannounced);
 
 			Self::do_proxy(def, real, *call);
+
+			Ok(().into())
 		}
 
 		/// Register a proxy account for the sender that is able to make calls on its behalf.
@@ -263,12 +219,13 @@ decl_module! {
 		/// # <weight>
 		/// Weight is a function of the number of proxies the user has (P).
 		/// # </weight>
-		#[weight = T::WeightInfo::add_proxy(T::MaxProxies::get().into())]
-		fn add_proxy(origin,
+		#[pallet::weight(T::WeightInfo::add_proxy(T::MaxProxies::get().into()))]
+		pub(super) fn add_proxy(
+			origin: OriginFor<T>,
 			delegate: T::AccountId,
 			proxy_type: T::ProxyType,
 			delay: T::BlockNumber,
-		) -> DispatchResult {
+		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
 			Self::add_proxy_delegate(&who, delegate, proxy_type, delay)
 		}
@@ -284,12 +241,13 @@ decl_module! {
 		/// # <weight>
 		/// Weight is a function of the number of proxies the user has (P).
 		/// # </weight>
-		#[weight = T::WeightInfo::remove_proxy(T::MaxProxies::get().into())]
-		fn remove_proxy(origin,
+		#[pallet::weight(T::WeightInfo::remove_proxy(T::MaxProxies::get().into()))]
+		pub(super) fn remove_proxy(
+			origin: OriginFor<T>,
 			delegate: T::AccountId,
 			proxy_type: T::ProxyType,
 			delay: T::BlockNumber,
-		) -> DispatchResult {
+		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
 			Self::remove_proxy_delegate(&who, delegate, proxy_type, delay)
 		}
@@ -304,11 +262,13 @@ decl_module! {
 		/// # <weight>
 		/// Weight is a function of the number of proxies the user has (P).
 		/// # </weight>
-		#[weight = T::WeightInfo::remove_proxies(T::MaxProxies::get().into())]
-		fn remove_proxies(origin) {
+		#[pallet::weight(T::WeightInfo::remove_proxies(T::MaxProxies::get().into()))]
+		pub(super) fn remove_proxies(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
 			let (_, old_deposit) = Proxies::<T>::take(&who);
 			T::Currency::unreserve(&who, old_deposit);
+
+			Ok(().into())
 		}
 
 		/// Spawn a fresh new account that is guaranteed to be otherwise inaccessible, and
@@ -334,8 +294,13 @@ decl_module! {
 		/// Weight is a function of the number of proxies the user has (P).
 		/// # </weight>
 		/// TODO: Might be over counting 1 read
-		#[weight = T::WeightInfo::anonymous(T::MaxProxies::get().into())]
-		fn anonymous(origin, proxy_type: T::ProxyType, delay: T::BlockNumber, index: u16) {
+		#[pallet::weight(T::WeightInfo::anonymous(T::MaxProxies::get().into()))]
+		pub(super) fn anonymous(
+			origin: OriginFor<T>,
+			proxy_type: T::ProxyType,
+			delay: T::BlockNumber,
+			index: u16
+		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
 
 			let anonymous = Self::anonymous_account(&who, &proxy_type, index, None);
@@ -348,7 +313,9 @@ decl_module! {
 				delay,
 			};
 			Proxies::<T>::insert(&anonymous, (vec![proxy_def], deposit));
-			Self::deposit_event(RawEvent::AnonymousCreated(anonymous, who, proxy_type, index));
+			Self::deposit_event(Event::AnonymousCreated(anonymous, who, proxy_type, index));
+
+			Ok(().into())
 		}
 
 		/// Removes a previously spawned anonymous proxy.
@@ -371,14 +338,15 @@ decl_module! {
 		/// # <weight>
 		/// Weight is a function of the number of proxies the user has (P).
 		/// # </weight>
-		#[weight = T::WeightInfo::kill_anonymous(T::MaxProxies::get().into())]
-		fn kill_anonymous(origin,
+		#[pallet::weight(T::WeightInfo::kill_anonymous(T::MaxProxies::get().into()))]
+		pub(super) fn kill_anonymous(
+			origin: OriginFor<T>,
 			spawner: T::AccountId,
 			proxy_type: T::ProxyType,
 			index: u16,
-			#[compact] height: T::BlockNumber,
-			#[compact] ext_index: u32,
-		) {
+			#[pallet::compact] height: T::BlockNumber,
+			#[pallet::compact] ext_index: u32,
+		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
 
 			let when = (height, ext_index);
@@ -387,6 +355,8 @@ decl_module! {
 
 			let (_, deposit) = Proxies::<T>::take(&who);
 			T::Currency::unreserve(&spawner, deposit);
+
+			Ok(().into())
 		}
 
 		/// Publish the hash of a proxy-call that will be made in the future.
@@ -410,8 +380,12 @@ decl_module! {
 		/// - A: the number of announcements made.
 		/// - P: the number of proxies the user has.
 		/// # </weight>
-		#[weight = T::WeightInfo::announce(T::MaxPending::get(), T::MaxProxies::get().into())]
-		fn announce(origin, real: T::AccountId, call_hash: CallHashOf<T>) {
+		#[pallet::weight(T::WeightInfo::announce(T::MaxPending::get(), T::MaxProxies::get().into()))]
+		pub(super) fn announce(
+			origin: OriginFor<T>,
+			real: T::AccountId,
+			call_hash: CallHashOf<T>
+		) -> DispatchResultWithPostInfo{
 			let who = ensure_signed(origin)?;
 			Proxies::<T>::get(&real).0.into_iter()
 				.find(|x| &x.delegate == &who)
@@ -435,7 +409,9 @@ decl_module! {
 				).map(|d| d.expect("Just pushed; pending.len() > 0; rejig_deposit returns Some; qed"))
 				.map(|d| *deposit = d)
 			})?;
-			Self::deposit_event(RawEvent::Announced(real, who, call_hash));
+			Self::deposit_event(Event::Announced(real, who, call_hash));
+
+			Ok(().into())
 		}
 
 		/// Remove a given announcement.
@@ -454,10 +430,18 @@ decl_module! {
 		/// - A: the number of announcements made.
 		/// - P: the number of proxies the user has.
 		/// # </weight>
-		#[weight = T::WeightInfo::remove_announcement(T::MaxPending::get(), T::MaxProxies::get().into())]
-		fn remove_announcement(origin, real: T::AccountId, call_hash: CallHashOf<T>) {
+		#[pallet::weight(
+			T::WeightInfo::remove_announcement(T::MaxPending::get(), T::MaxProxies::get().into())
+		)]
+		pub(super) fn remove_announcement(
+			origin: OriginFor<T>,
+			real: T::AccountId,
+			call_hash: CallHashOf<T>
+		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
 			Self::edit_announcements(&who, |ann| ann.real != real || ann.call_hash != call_hash)?;
+
+			Ok(().into())
 		}
 
 		/// Remove the given announcement of a delegate.
@@ -476,13 +460,21 @@ decl_module! {
 		/// - A: the number of announcements made.
 		/// - P: the number of proxies the user has.
 		/// # </weight>
-		#[weight = T::WeightInfo::reject_announcement(T::MaxPending::get(), T::MaxProxies::get().into())]
-		fn reject_announcement(origin, delegate: T::AccountId, call_hash: CallHashOf<T>) {
+		#[pallet::weight(
+			T::WeightInfo::reject_announcement(T::MaxPending::get(), T::MaxProxies::get().into())
+		)]
+		pub(super) fn reject_announcement(
+			origin: OriginFor<T>,
+			delegate: T::AccountId,
+			call_hash: CallHashOf<T>
+		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
 			Self::edit_announcements(&delegate, |ann| ann.real != who || ann.call_hash != call_hash)?;
+
+			Ok(().into())
 		}
 
-		/// Dispatch the given `call` from an account that the sender is authorised for through
+		/// Dispatch the given `call` from an account that the sender is authorized for through
 		/// `add_proxy`.
 		///
 		/// Removes any corresponding announcement(s).
@@ -499,20 +491,21 @@ decl_module! {
 		/// - A: the number of announcements made.
 		/// - P: the number of proxies the user has.
 		/// # </weight>
-		#[weight = {
+		#[pallet::weight({
 			let di = call.get_dispatch_info();
 			(T::WeightInfo::proxy_announced(T::MaxPending::get(), T::MaxProxies::get().into())
 				.saturating_add(di.weight)
 				 // AccountData for inner call origin accountdata.
 				.saturating_add(T::DbWeight::get().reads_writes(1, 1)),
 			di.class)
-		}]
-		fn proxy_announced(origin,
+		})]
+		pub(super) fn proxy_announced(
+			origin: OriginFor<T>,
 			delegate: T::AccountId,
 			real: T::AccountId,
 			force_proxy_type: Option<T::ProxyType>,
 			call: Box<<T as Config>::Call>,
-		) {
+		) -> DispatchResultWithPostInfo {
 			ensure_signed(origin)?;
 			let def = Self::find_proxy(&real, &delegate, force_proxy_type)?;
 
@@ -523,8 +516,72 @@ decl_module! {
 			).map_err(|_| Error::<T>::Unannounced)?;
 
 			Self::do_proxy(def, real, *call);
+
+			Ok(().into())
 		}
 	}
+
+	#[pallet::event]
+	#[pallet::metadata(T::AccountId = "AccountId", T::ProxyType = "ProxyType", CallHashOf<T> = "Hash")]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	pub enum Event<T: Config>
+	{
+		/// A proxy was executed correctly, with the given \[result\].
+		ProxyExecuted(DispatchResult),
+		/// Anonymous account has been created by new proxy with given
+		/// disambiguation index and proxy type. \[anonymous, who, proxy_type, disambiguation_index\]
+		AnonymousCreated(T::AccountId, T::AccountId, T::ProxyType, u16),
+		/// An announcement was placed to make a call in the future. \[real, proxy, call_hash\]
+		Announced(T::AccountId, T::AccountId, CallHashOf<T>),
+	}
+
+	/// Old name generated by `decl_event`.
+	#[deprecated(note="use `Event` instead")]
+	pub type RawEvent<T> = Event<T>;
+
+	 #[pallet::error]
+	pub enum Error<T> {
+		/// There are too many proxies registered or too many announcements pending.
+		TooMany,
+		/// Proxy registration not found.
+		NotFound,
+		/// Sender is not a proxy of the account to be proxied.
+		NotProxy,
+		/// A call which is incompatible with the proxy type's filter was attempted.
+		Unproxyable,
+		/// Account is already a proxy.
+		Duplicate,
+		/// Call may not be made by proxy because it may escalate its privileges.
+		NoPermission,
+		/// Announcement, if made at all, was made too recently.
+		Unannounced,
+		/// Cannot add self as proxy.
+		NoSelfProxy,
+	}
+
+	/// The set of account proxies. Maps the account which has delegated to the accounts
+	/// which are being delegated to, together with the amount held on deposit.
+	#[pallet::storage]
+	#[pallet::getter(fn proxies)]
+	pub type Proxies<T: Config> = StorageMap<
+		_,
+		Twox64Concat,
+		T::AccountId,
+		(Vec<ProxyDefinition<T::AccountId, T::ProxyType, T::BlockNumber>>, BalanceOf<T>),
+		ValueQuery
+	>;
+
+	/// The announcements made by the proxy (key).
+	#[pallet::storage]
+	#[pallet::getter(fn announcements)]
+	pub type Announcements<T: Config> = StorageMap<
+		_,
+		Twox64Concat,
+		T::AccountId,
+		(Vec<Announcement<T::AccountId, CallHashOf<T>, T::BlockNumber>>, BalanceOf<T>),
+		ValueQuery
+	>;
+
 }
 
 impl<T: Config> Module<T> {
@@ -568,7 +625,7 @@ impl<T: Config> Module<T> {
 		delegatee: T::AccountId,
 		proxy_type: T::ProxyType,
 		delay: T::BlockNumber,
-	) -> DispatchResult {
+	) -> DispatchResultWithPostInfo {
 		ensure!(delegator != &delegatee, Error::<T>::NoSelfProxy);
 		Proxies::<T>::try_mutate(delegator, |(ref mut proxies, ref mut deposit)| {
 			ensure!(proxies.len() < T::MaxProxies::get() as usize, Error::<T>::TooMany);
@@ -582,7 +639,7 @@ impl<T: Config> Module<T> {
 				T::Currency::unreserve(delegator, *deposit - new_deposit);
 			}
 			*deposit = new_deposit;
-			Ok(())
+			Ok(().into())
 		})
 	}
 
@@ -599,7 +656,7 @@ impl<T: Config> Module<T> {
 		delegatee: T::AccountId,
 		proxy_type: T::ProxyType,
 		delay: T::BlockNumber,
-	) -> DispatchResult {
+	) -> DispatchResultWithPostInfo {
 		Proxies::<T>::try_mutate_exists(delegator, |x| {
 			let (mut proxies, old_deposit) = x.take().ok_or(Error::<T>::NotFound)?;
 			let proxy_def = ProxyDefinition { delegate: delegatee, proxy_type, delay };
@@ -614,7 +671,7 @@ impl<T: Config> Module<T> {
 			if !proxies.is_empty() {
 				*x = Some((proxies, new_deposit))
 			}
-			Ok(())
+			Ok(().into())
 		})
 	}
 
@@ -701,7 +758,7 @@ impl<T: Config> Module<T> {
 			}
 		});
 		let e = call.dispatch(origin);
-		Self::deposit_event(RawEvent::ProxyExecuted(e.map(|_| ()).map_err(|e| e.error)));
+		Self::deposit_event(Event::ProxyExecuted(e.map(|_| ()).map_err(|e| e.error)));
 	}
 }
 
diff --git a/frame/proxy/src/tests.rs b/frame/proxy/src/tests.rs
index b31ef1dfdb2f..4d179968dd71 100644
--- a/frame/proxy/src/tests.rs
+++ b/frame/proxy/src/tests.rs
@@ -150,6 +150,7 @@ use pallet_balances::Error as BalancesError;
 use pallet_balances::Event as BalancesEvent;
 use pallet_utility::Call as UtilityCall;
 use pallet_utility::Event as UtilityEvent;
+use super::Event as ProxyEvent;
 use super::Call as ProxyCall;
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
@@ -309,11 +310,11 @@ fn filtering_works() {
 
 		let call = Box::new(Call::Balances(BalancesCall::transfer(6, 1)));
 		assert_ok!(Proxy::proxy(Origin::signed(2), 1, None, call.clone()));
-		expect_event(RawEvent::ProxyExecuted(Ok(())));
+		expect_event(ProxyEvent::ProxyExecuted(Ok(())));
 		assert_ok!(Proxy::proxy(Origin::signed(3), 1, None, call.clone()));
-		expect_event(RawEvent::ProxyExecuted(Ok(())));
+		expect_event(ProxyEvent::ProxyExecuted(Ok(())));
 		assert_ok!(Proxy::proxy(Origin::signed(4), 1, None, call.clone()));
-		expect_event(RawEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
+		expect_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
 
 		let derivative_id = Utility::derivative_account_id(1, 0);
 		assert!(Balances::mutate_account(&derivative_id, |a| a.free = 1000).is_ok());
@@ -321,42 +322,42 @@ fn filtering_works() {
 
 		let call = Box::new(Call::Utility(UtilityCall::as_derivative(0, inner.clone())));
 		assert_ok!(Proxy::proxy(Origin::signed(2), 1, None, call.clone()));
-		expect_event(RawEvent::ProxyExecuted(Ok(())));
+		expect_event(ProxyEvent::ProxyExecuted(Ok(())));
 		assert_ok!(Proxy::proxy(Origin::signed(3), 1, None, call.clone()));
-		expect_event(RawEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
+		expect_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
 		assert_ok!(Proxy::proxy(Origin::signed(4), 1, None, call.clone()));
-		expect_event(RawEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
+		expect_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
 
 		let call = Box::new(Call::Utility(UtilityCall::batch(vec![*inner])));
 		assert_ok!(Proxy::proxy(Origin::signed(2), 1, None, call.clone()));
-		expect_events(vec![UtilityEvent::BatchCompleted.into(), RawEvent::ProxyExecuted(Ok(())).into()]);
+		expect_events(vec![UtilityEvent::BatchCompleted.into(), ProxyEvent::ProxyExecuted(Ok(())).into()]);
 		assert_ok!(Proxy::proxy(Origin::signed(3), 1, None, call.clone()));
-		expect_event(RawEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
+		expect_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
 		assert_ok!(Proxy::proxy(Origin::signed(4), 1, None, call.clone()));
 		expect_events(vec![
 			UtilityEvent::BatchInterrupted(0, DispatchError::BadOrigin).into(),
-			RawEvent::ProxyExecuted(Ok(())).into(),
+			ProxyEvent::ProxyExecuted(Ok(())).into(),
 		]);
 
 		let inner = Box::new(Call::Proxy(ProxyCall::add_proxy(5, ProxyType::Any, 0)));
 		let call = Box::new(Call::Utility(UtilityCall::batch(vec![*inner])));
 		assert_ok!(Proxy::proxy(Origin::signed(2), 1, None, call.clone()));
-		expect_events(vec![UtilityEvent::BatchCompleted.into(), RawEvent::ProxyExecuted(Ok(())).into()]);
+		expect_events(vec![UtilityEvent::BatchCompleted.into(), ProxyEvent::ProxyExecuted(Ok(())).into()]);
 		assert_ok!(Proxy::proxy(Origin::signed(3), 1, None, call.clone()));
-		expect_event(RawEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
+		expect_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
 		assert_ok!(Proxy::proxy(Origin::signed(4), 1, None, call.clone()));
 		expect_events(vec![
 			UtilityEvent::BatchInterrupted(0, DispatchError::BadOrigin).into(),
-			RawEvent::ProxyExecuted(Ok(())).into(),
+			ProxyEvent::ProxyExecuted(Ok(())).into(),
 		]);
 
 		let call = Box::new(Call::Proxy(ProxyCall::remove_proxies()));
 		assert_ok!(Proxy::proxy(Origin::signed(3), 1, None, call.clone()));
-		expect_event(RawEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
+		expect_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
 		assert_ok!(Proxy::proxy(Origin::signed(4), 1, None, call.clone()));
-		expect_event(RawEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
+		expect_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
 		assert_ok!(Proxy::proxy(Origin::signed(2), 1, None, call.clone()));
-		expect_events(vec![BalancesEvent::<Test>::Unreserved(1, 5).into(), RawEvent::ProxyExecuted(Ok(())).into()]);
+		expect_events(vec![BalancesEvent::<Test>::Unreserved(1, 5).into(), ProxyEvent::ProxyExecuted(Ok(())).into()]);
 	});
 }
 
@@ -411,18 +412,18 @@ fn proxying_works() {
 			Error::<Test>::NotProxy
 		);
 		assert_ok!(Proxy::proxy(Origin::signed(2), 1, None, call.clone()));
-		expect_event(RawEvent::ProxyExecuted(Ok(())));
+		expect_event(ProxyEvent::ProxyExecuted(Ok(())));
 		assert_eq!(Balances::free_balance(6), 1);
 
 		let call = Box::new(Call::System(SystemCall::set_code(vec![])));
 		assert_ok!(Proxy::proxy(Origin::signed(3), 1, None, call.clone()));
-		expect_event(RawEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
+		expect_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
 
 		let call = Box::new(Call::Balances(BalancesCall::transfer_keep_alive(6, 1)));
 		assert_ok!(Call::Proxy(super::Call::proxy(1, None, call.clone())).dispatch(Origin::signed(2)));
-		expect_event(RawEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
+		expect_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
 		assert_ok!(Proxy::proxy(Origin::signed(3), 1, None, call.clone()));
-		expect_event(RawEvent::ProxyExecuted(Ok(())));
+		expect_event(ProxyEvent::ProxyExecuted(Ok(())));
 		assert_eq!(Balances::free_balance(6), 2);
 	});
 }
@@ -432,7 +433,7 @@ fn anonymous_works() {
 	new_test_ext().execute_with(|| {
 		assert_ok!(Proxy::anonymous(Origin::signed(1), ProxyType::Any, 0, 0));
 		let anon = Proxy::anonymous_account(&1, &ProxyType::Any, 0, None);
-		expect_event(RawEvent::AnonymousCreated(anon.clone(), 1, ProxyType::Any, 0));
+		expect_event(ProxyEvent::AnonymousCreated(anon.clone(), 1, ProxyType::Any, 0));
 
 		// other calls to anonymous allowed as long as they're not exactly the same.
 		assert_ok!(Proxy::anonymous(Origin::signed(1), ProxyType::JustTransfer, 0, 0));
@@ -449,13 +450,13 @@ fn anonymous_works() {
 		let call = Box::new(Call::Balances(BalancesCall::transfer(6, 1)));
 		assert_ok!(Balances::transfer(Origin::signed(3), anon, 5));
 		assert_ok!(Proxy::proxy(Origin::signed(1), anon, None, call));
-		expect_event(RawEvent::ProxyExecuted(Ok(())));
+		expect_event(ProxyEvent::ProxyExecuted(Ok(())));
 		assert_eq!(Balances::free_balance(6), 1);
 
 		let call = Box::new(Call::Proxy(ProxyCall::kill_anonymous(1, ProxyType::Any, 0, 1, 0)));
 		assert_ok!(Proxy::proxy(Origin::signed(2), anon2, None, call.clone()));
 		let de = DispatchError::from(Error::<Test>::NoPermission).stripped();
-		expect_event(RawEvent::ProxyExecuted(Err(de)));
+		expect_event(ProxyEvent::ProxyExecuted(Err(de)));
 		assert_noop!(
 			Proxy::kill_anonymous(Origin::signed(1), 1, ProxyType::Any, 0, 1, 0),
 			Error::<Test>::NoPermission

From abd39a8d7199b998e11426aa24af4f84e8390a69 Mon Sep 17 00:00:00 2001
From: kaichao <kaichaosuna@gmail.com>
Date: Wed, 17 Mar 2021 21:32:24 +0800
Subject: [PATCH 0516/1194] Migrate node authorization pallet to FRAME v2
 (#8337)

---
 frame/node-authorization/src/lib.rs     | 814 ++++++------------------
 frame/node-authorization/src/mock.rs    | 106 +++
 frame/node-authorization/src/tests.rs   | 366 +++++++++++
 frame/node-authorization/src/weights.rs |  48 ++
 4 files changed, 731 insertions(+), 603 deletions(-)
 create mode 100644 frame/node-authorization/src/mock.rs
 create mode 100644 frame/node-authorization/src/tests.rs
 create mode 100644 frame/node-authorization/src/weights.rs

diff --git a/frame/node-authorization/src/lib.rs b/frame/node-authorization/src/lib.rs
index 090be2849263..5f233549c73c 100644
--- a/frame/node-authorization/src/lib.rs
+++ b/frame/node-authorization/src/lib.rs
@@ -37,117 +37,137 @@
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
 
+#[cfg(test)]
+mod mock;
+#[cfg(test)]
+mod tests;
+
+pub mod weights;
+
 use sp_core::OpaquePeerId as PeerId;
 use sp_std::{
 	collections::btree_set::BTreeSet,
 	iter::FromIterator,
 	prelude::*,
 };
-use codec::Decode;
-use frame_support::{
-	decl_module, decl_storage, decl_event, decl_error,
-	ensure, weights::{DispatchClass, Weight}, traits::{Get, EnsureOrigin},
-};
-use frame_system::ensure_signed;
-
-pub trait WeightInfo {
-	fn add_well_known_node() -> Weight;
-	fn remove_well_known_node() -> Weight;
-	fn swap_well_known_node() -> Weight;
-	fn reset_well_known_nodes() -> Weight;
-	fn claim_node() -> Weight;
-	fn remove_claim() -> Weight;
-	fn transfer_node() -> Weight;
-	fn add_connections() -> Weight;
-	fn remove_connections() -> Weight;
-}
+pub use pallet::*;
+pub use weights::WeightInfo;
 
-impl WeightInfo for () {
-	fn add_well_known_node() -> Weight { 50_000_000 }
-	fn remove_well_known_node() -> Weight { 50_000_000 }
-	fn swap_well_known_node() -> Weight { 50_000_000 }
-	fn reset_well_known_nodes() -> Weight { 50_000_000 }
-	fn claim_node() -> Weight { 50_000_000 }
-	fn remove_claim() -> Weight { 50_000_000 }
-	fn transfer_node() -> Weight { 50_000_000 }
-	fn add_connections() -> Weight { 50_000_000 }
-	fn remove_connections() -> Weight { 50_000_000 }
-}
-
-pub trait Config: frame_system::Config {
-	/// The event type of this module.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
+#[frame_support::pallet]
+pub mod pallet {
+	use super::*;
+	use frame_support::{
+		dispatch::DispatchResult,
+		pallet_prelude::*,
+	};
+	use frame_system::pallet_prelude::*;
+
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(_);
+
+	/// The module configuration trait
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		/// The overarching event type.
+		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
+
+		/// The maximum number of well known nodes that are allowed to set
+		#[pallet::constant]
+		type MaxWellKnownNodes: Get<u32>;
 
-	/// The maximum number of well known nodes that are allowed to set
-	type MaxWellKnownNodes: Get<u32>;
+		/// The maximum length in bytes of PeerId
+		#[pallet::constant]
+		type MaxPeerIdLength: Get<u32>;
 
-	/// The maximum length in bytes of PeerId
-	type MaxPeerIdLength: Get<u32>;
+		/// The origin which can add a well known node.
+		type AddOrigin: EnsureOrigin<Self::Origin>;
 
-	/// The origin which can add a well known node.
-	type AddOrigin: EnsureOrigin<Self::Origin>;
+		/// The origin which can remove a well known node.
+		type RemoveOrigin: EnsureOrigin<Self::Origin>;
 
-	/// The origin which can remove a well known node.
-	type RemoveOrigin: EnsureOrigin<Self::Origin>;
+		/// The origin which can swap the well known nodes.
+		type SwapOrigin: EnsureOrigin<Self::Origin>;
 
-	/// The origin which can swap the well known nodes.
-	type SwapOrigin: EnsureOrigin<Self::Origin>;
+		/// The origin which can reset the well known nodes.
+		type ResetOrigin: EnsureOrigin<Self::Origin>;
 
-	/// The origin which can reset the well known nodes.
-	type ResetOrigin: EnsureOrigin<Self::Origin>;
+		/// Weight information for extrinsics in this pallet.
+		type WeightInfo: WeightInfo;
+	}
 
-	/// Weight information for extrinsics in this pallet.
-	type WeightInfo: WeightInfo;
-}
+	/// The set of well known nodes. This is stored sorted (just by value).
+	#[pallet::storage]
+	#[pallet::getter(fn well_known_nodes)]
+	pub type WellKnownNodes<T> = StorageValue<_, BTreeSet<PeerId>, ValueQuery>;
+
+	/// A map that maintains the ownership of each node.
+	#[pallet::storage]
+	#[pallet::getter(fn owners)]
+	pub type Owners<T: Config> = StorageMap<
+		_,
+		Blake2_128Concat,
+		PeerId,
+		T::AccountId,
+	>;
+
+	/// The additional adapative connections of each node.
+	#[pallet::storage]
+	#[pallet::getter(fn additional_connection)]
+	pub type AdditionalConnections<T> = StorageMap<
+		_,
+		Blake2_128Concat,
+		PeerId,
+		BTreeSet<PeerId>,
+		ValueQuery,
+	>;
+
+	#[pallet::genesis_config]
+	pub struct GenesisConfig<T: Config> {
+		pub nodes: Vec<(PeerId, T::AccountId)>,
+	}
 
-decl_storage! {
-	trait Store for Module<T: Config> as NodeAuthorization {
-		/// The set of well known nodes. This is stored sorted (just by value).
-		pub WellKnownNodes get(fn well_known_nodes): BTreeSet<PeerId>;
-		/// A map that maintains the ownership of each node.
-		pub Owners get(fn owners):
-			map hasher(blake2_128_concat) PeerId => T::AccountId;
-		/// The additional adapative connections of each node.
-		pub AdditionalConnections get(fn additional_connection):
-			map hasher(blake2_128_concat) PeerId => BTreeSet<PeerId>;
+	#[cfg(feature = "std")]
+	impl<T: Config> Default for GenesisConfig<T> {
+		fn default() -> Self {
+			Self { nodes: Vec::new() }
+		}
 	}
-	add_extra_genesis {
-		config(nodes): Vec<(PeerId, T::AccountId)>;
-		build(|config: &GenesisConfig<T>| {
-			<Module<T>>::initialize_nodes(&config.nodes)
-		})
+
+	#[pallet::genesis_build]
+	impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+		fn build(&self) {
+			Pallet::<T>::initialize_nodes(&self.nodes);
+		}
 	}
-}
 
-decl_event! {
-	pub enum Event<T> where
-		<T as frame_system::Config>::AccountId,
-	{
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	#[pallet::metadata(T::AccountId = "AccountId")]
+	pub enum Event<T: Config> {
 		/// The given well known node was added.
-		NodeAdded(PeerId, AccountId),
+		NodeAdded(PeerId, T::AccountId),
 		/// The given well known node was removed.
 		NodeRemoved(PeerId),
 		/// The given well known node was swapped; first item was removed,
 		/// the latter was added.
 		NodeSwapped(PeerId, PeerId),
 		/// The given well known nodes were reset.
-		NodesReset(Vec<(PeerId, AccountId)>),
+		NodesReset(Vec<(PeerId, T::AccountId)>),
 		/// The given node was claimed by a user.
-		NodeClaimed(PeerId, AccountId),
+		NodeClaimed(PeerId, T::AccountId),
 		/// The given claim was removed by its owner.
-		ClaimRemoved(PeerId, AccountId),
+		ClaimRemoved(PeerId, T::AccountId),
 		/// The node was transferred to another account.
-		NodeTransferred(PeerId, AccountId),
+		NodeTransferred(PeerId, T::AccountId),
 		/// The allowed connections were added to a node.
 		ConnectionsAdded(PeerId, Vec<PeerId>),
 		/// The allowed connections were removed from a node.
 		ConnectionsRemoved(PeerId, Vec<PeerId>),
 	}
-}
 
-decl_error! {
-	/// Error for the node authorization module.
-	pub enum Error for Module<T: Config> {
+	#[pallet::error]
+	pub enum Error<T> {
 		/// The PeerId is too long.
 		PeerIdTooLong,
 		/// Too many well known nodes.
@@ -165,41 +185,65 @@ decl_error! {
 		/// No permisson to perform specific operation.
 		PermissionDenied,
 	}
-}
 
-decl_module! {
-	pub struct Module<T: Config> for enum Call where origin: T::Origin {
-		/// The maximum number of authorized well known nodes
-		const MaxWellKnownNodes: u32 = T::MaxWellKnownNodes::get();
-
-		/// The maximum length in bytes of PeerId
-		const MaxPeerIdLength: u32 = T::MaxPeerIdLength::get();
-
-		type Error = Error<T>;
-
-		fn deposit_event() = default;
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+		/// Set reserved node every block. It may not be enabled depends on the offchain
+		/// worker settings when starting the node.
+		fn offchain_worker(now: T::BlockNumber) {
+			let network_state = sp_io::offchain::network_state();
+			match network_state {
+				Err(_) => log::error!(
+					target: "runtime::node-authorization",
+					"Error: failed to get network state of node at {:?}",
+					now,
+				),
+				Ok(state) => {
+					let encoded_peer = state.peer_id.0;
+					match Decode::decode(&mut &encoded_peer[..]) {
+						Err(_) => log::error!(
+							target: "runtime::node-authorization",
+							"Error: failed to decode PeerId at {:?}",
+							now,
+						),
+						Ok(node) => sp_io::offchain::set_authorized_nodes(
+							Self::get_authorized_nodes(&PeerId(node)),
+							true
+						)
+					}
+				}
+			}
+		}
+	}
 
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
 		/// Add a node to the set of well known nodes. If the node is already claimed, the owner
 		/// will be updated and keep the existing additional connection unchanged.
 		///
 		/// May only be called from `T::AddOrigin`.
 		///
 		/// - `node`: identifier of the node.
-		#[weight = (T::WeightInfo::add_well_known_node(), DispatchClass::Operational)]
-		pub fn add_well_known_node(origin, node: PeerId, owner: T::AccountId) {
+		#[pallet::weight((T::WeightInfo::add_well_known_node(), DispatchClass::Operational))]
+		pub fn add_well_known_node(
+			origin: OriginFor<T>,
+			node: PeerId,
+			owner: T::AccountId
+		) -> DispatchResult {
 			T::AddOrigin::ensure_origin(origin)?;
 			ensure!(node.0.len() < T::MaxPeerIdLength::get() as usize, Error::<T>::PeerIdTooLong);
 
-			let mut nodes = WellKnownNodes::get();
+			let mut nodes = WellKnownNodes::<T>::get();
 			ensure!(nodes.len() < T::MaxWellKnownNodes::get() as usize, Error::<T>::TooManyNodes);
 			ensure!(!nodes.contains(&node), Error::<T>::AlreadyJoined);
 
 			nodes.insert(node.clone());
 
-			WellKnownNodes::put(&nodes);
+			WellKnownNodes::<T>::put(&nodes);
 			<Owners<T>>::insert(&node, &owner);
 
-			Self::deposit_event(RawEvent::NodeAdded(node, owner));
+			Self::deposit_event(Event::NodeAdded(node, owner));
+			Ok(())
 		}
 
 		/// Remove a node from the set of well known nodes. The ownership and additional
@@ -208,21 +252,22 @@ decl_module! {
 		/// May only be called from `T::RemoveOrigin`.
 		///
 		/// - `node`: identifier of the node.
-		#[weight = (T::WeightInfo::remove_well_known_node(), DispatchClass::Operational)]
-		pub fn remove_well_known_node(origin, node: PeerId) {
+		#[pallet::weight((T::WeightInfo::remove_well_known_node(), DispatchClass::Operational))]
+		pub fn remove_well_known_node(origin: OriginFor<T>, node: PeerId) -> DispatchResult {
 			T::RemoveOrigin::ensure_origin(origin)?;
 			ensure!(node.0.len() < T::MaxPeerIdLength::get() as usize, Error::<T>::PeerIdTooLong);
 
-			let mut nodes = WellKnownNodes::get();
+			let mut nodes = WellKnownNodes::<T>::get();
 			ensure!(nodes.contains(&node), Error::<T>::NotExist);
 
 			nodes.remove(&node);
 
-			WellKnownNodes::put(&nodes);
+			WellKnownNodes::<T>::put(&nodes);
 			<Owners<T>>::remove(&node);
-			AdditionalConnections::remove(&node);
+			AdditionalConnections::<T>::remove(&node);
 
-			Self::deposit_event(RawEvent::NodeRemoved(node));
+			Self::deposit_event(Event::NodeRemoved(node));
+			Ok(())
 		}
 
 		/// Swap a well known node to another. Both the ownership and additional connections
@@ -232,26 +277,34 @@ decl_module! {
 		///
 		/// - `remove`: the node which will be moved out from the list.
 		/// - `add`: the node which will be put in the list.
-		#[weight = (T::WeightInfo::swap_well_known_node(), DispatchClass::Operational)]
-		pub fn swap_well_known_node(origin, remove: PeerId, add: PeerId) {
+		#[pallet::weight((T::WeightInfo::swap_well_known_node(), DispatchClass::Operational))]
+		pub fn swap_well_known_node(
+			origin: OriginFor<T>,
+			remove: PeerId,
+			add: PeerId
+		) -> DispatchResult {
 			T::SwapOrigin::ensure_origin(origin)?;
-			ensure!(remove.0.len() < T::MaxPeerIdLength::get() as usize, Error::<T>::PeerIdTooLong);
+			ensure!(
+				remove.0.len() < T::MaxPeerIdLength::get() as usize,
+				Error::<T>::PeerIdTooLong
+			);
 			ensure!(add.0.len() < T::MaxPeerIdLength::get() as usize, Error::<T>::PeerIdTooLong);
 
 			if remove == add { return Ok(()) }
 
-			let mut nodes = WellKnownNodes::get();
+			let mut nodes = WellKnownNodes::<T>::get();
 			ensure!(nodes.contains(&remove), Error::<T>::NotExist);
 			ensure!(!nodes.contains(&add), Error::<T>::AlreadyJoined);
 
 			nodes.remove(&remove);
 			nodes.insert(add.clone());
 
-			WellKnownNodes::put(&nodes);
+			WellKnownNodes::<T>::put(&nodes);
 			Owners::<T>::swap(&remove, &add);
-			AdditionalConnections::swap(&remove, &add);
+			AdditionalConnections::<T>::swap(&remove, &add);
 
-			Self::deposit_event(RawEvent::NodeSwapped(remove, add));
+			Self::deposit_event(Event::NodeSwapped(remove, add));
+			Ok(())
 		}
 
 		/// Reset all the well known nodes. This will not remove the ownership and additional
@@ -261,29 +314,34 @@ decl_module! {
 		/// May only be called from `T::ResetOrigin`.
 		///
 		/// - `nodes`: the new nodes for the allow list.
-		#[weight = (T::WeightInfo::reset_well_known_nodes(), DispatchClass::Operational)]
-		pub fn reset_well_known_nodes(origin, nodes: Vec<(PeerId, T::AccountId)>) {
+		#[pallet::weight((T::WeightInfo::reset_well_known_nodes(), DispatchClass::Operational))]
+		pub fn reset_well_known_nodes(
+			origin: OriginFor<T>,
+			nodes: Vec<(PeerId, T::AccountId)>
+		) -> DispatchResult {
 			T::ResetOrigin::ensure_origin(origin)?;
 			ensure!(nodes.len() < T::MaxWellKnownNodes::get() as usize, Error::<T>::TooManyNodes);
 
 			Self::initialize_nodes(&nodes);
 
-			Self::deposit_event(RawEvent::NodesReset(nodes));
+			Self::deposit_event(Event::NodesReset(nodes));
+			Ok(())
 		}
 
 		/// A given node can be claimed by anyone. The owner should be the first to know its
 		/// PeerId, so claim it right away!
 		///
 		/// - `node`: identifier of the node.
-		#[weight = T::WeightInfo::claim_node()]
-		pub fn claim_node(origin, node: PeerId) {
+		#[pallet::weight(T::WeightInfo::claim_node())]
+		pub fn claim_node(origin: OriginFor<T>, node: PeerId) -> DispatchResult {
 			let sender = ensure_signed(origin)?;
 
 			ensure!(node.0.len() < T::MaxPeerIdLength::get() as usize, Error::<T>::PeerIdTooLong);
 			ensure!(!Owners::<T>::contains_key(&node),Error::<T>::AlreadyClaimed);
 
 			Owners::<T>::insert(&node, &sender);
-			Self::deposit_event(RawEvent::NodeClaimed(node, sender));
+			Self::deposit_event(Event::NodeClaimed(node, sender));
+			Ok(())
 		}
 
 		/// A claim can be removed by its owner and get back the reservation. The additional
@@ -291,55 +349,61 @@ decl_module! {
 		/// needs to reach consensus among the network participants.
 		///
 		/// - `node`: identifier of the node.
-		#[weight = T::WeightInfo::remove_claim()]
-		pub fn remove_claim(origin, node: PeerId) {
+		#[pallet::weight(T::WeightInfo::remove_claim())]
+		pub fn remove_claim(origin: OriginFor<T>, node: PeerId) -> DispatchResult {
 			let sender = ensure_signed(origin)?;
 
 			ensure!(node.0.len() < T::MaxPeerIdLength::get() as usize, Error::<T>::PeerIdTooLong);
-			ensure!(Owners::<T>::contains_key(&node), Error::<T>::NotClaimed);
-			ensure!(Owners::<T>::get(&node) == sender, Error::<T>::NotOwner);
-			ensure!(!WellKnownNodes::get().contains(&node), Error::<T>::PermissionDenied);
+			let owner = Owners::<T>::get(&node).ok_or(Error::<T>::NotClaimed)?;
+			ensure!(owner == sender, Error::<T>::NotOwner);
+			ensure!(!WellKnownNodes::<T>::get().contains(&node), Error::<T>::PermissionDenied);
 
 			Owners::<T>::remove(&node);
-			AdditionalConnections::remove(&node);
+			AdditionalConnections::<T>::remove(&node);
 
-			Self::deposit_event(RawEvent::ClaimRemoved(node, sender));
+			Self::deposit_event(Event::ClaimRemoved(node, sender));
+			Ok(())
 		}
 
 		/// A node can be transferred to a new owner.
 		///
 		/// - `node`: identifier of the node.
 		/// - `owner`: new owner of the node.
-		#[weight = T::WeightInfo::transfer_node()]
-		pub fn transfer_node(origin, node: PeerId, owner: T::AccountId) {
+		#[pallet::weight(T::WeightInfo::transfer_node())]
+		pub fn transfer_node(
+			origin: OriginFor<T>,
+			node: PeerId,
+			owner: T::AccountId
+		) -> DispatchResult {
 			let sender = ensure_signed(origin)?;
 
 			ensure!(node.0.len() < T::MaxPeerIdLength::get() as usize, Error::<T>::PeerIdTooLong);
-			ensure!(Owners::<T>::contains_key(&node), Error::<T>::NotClaimed);
-			ensure!(Owners::<T>::get(&node) == sender, Error::<T>::NotOwner);
+			let pre_owner = Owners::<T>::get(&node).ok_or(Error::<T>::NotClaimed)?;
+			ensure!(pre_owner == sender, Error::<T>::NotOwner);
 
 			Owners::<T>::insert(&node, &owner);
 
-			Self::deposit_event(RawEvent::NodeTransferred(node, owner));
+			Self::deposit_event(Event::NodeTransferred(node, owner));
+			Ok(())
 		}
 
 		/// Add additional connections to a given node.
 		///
 		/// - `node`: identifier of the node.
 		/// - `connections`: additonal nodes from which the connections are allowed.
-		#[weight = T::WeightInfo::add_connections()]
+		#[pallet::weight(T::WeightInfo::add_connections())]
 		pub fn add_connections(
-			origin,
+			origin: OriginFor<T>,
 			node: PeerId,
 			connections: Vec<PeerId>
-		) {
+		) -> DispatchResult {
 			let sender = ensure_signed(origin)?;
 
 			ensure!(node.0.len() < T::MaxPeerIdLength::get() as usize, Error::<T>::PeerIdTooLong);
-			ensure!(Owners::<T>::contains_key(&node), Error::<T>::NotClaimed);
-			ensure!(Owners::<T>::get(&node) == sender, Error::<T>::NotOwner);
+			let owner = Owners::<T>::get(&node).ok_or(Error::<T>::NotClaimed)?;
+			ensure!(owner == sender, Error::<T>::NotOwner);
 
-			let mut nodes = AdditionalConnections::get(&node);
+			let mut nodes = AdditionalConnections::<T>::get(&node);
 
 			for add_node in connections.iter() {
 				if *add_node == node {
@@ -348,73 +412,48 @@ decl_module! {
 				nodes.insert(add_node.clone());
 			}
 
-			AdditionalConnections::insert(&node, nodes);
+			AdditionalConnections::<T>::insert(&node, nodes);
 
-			Self::deposit_event(RawEvent::ConnectionsAdded(node, connections));
+			Self::deposit_event(Event::ConnectionsAdded(node, connections));
+			Ok(())
 		}
 
 		/// Remove additional connections of a given node.
 		///
 		/// - `node`: identifier of the node.
 		/// - `connections`: additonal nodes from which the connections are not allowed anymore.
-		#[weight = T::WeightInfo::remove_connections()]
+		#[pallet::weight(T::WeightInfo::remove_connections())]
 		pub fn remove_connections(
-			origin,
+			origin: OriginFor<T>,
 			node: PeerId,
 			connections: Vec<PeerId>
-		) {
+		) -> DispatchResult {
 			let sender = ensure_signed(origin)?;
 
 			ensure!(node.0.len() < T::MaxPeerIdLength::get() as usize, Error::<T>::PeerIdTooLong);
-			ensure!(Owners::<T>::contains_key(&node), Error::<T>::NotClaimed);
-			ensure!(Owners::<T>::get(&node) == sender, Error::<T>::NotOwner);
+			let owner = Owners::<T>::get(&node).ok_or(Error::<T>::NotClaimed)?;
+			ensure!(owner == sender, Error::<T>::NotOwner);
 
-			let mut nodes = AdditionalConnections::get(&node);
+			let mut nodes = AdditionalConnections::<T>::get(&node);
 
 			for remove_node in connections.iter() {
 				nodes.remove(remove_node);
 			}
 
-			AdditionalConnections::insert(&node, nodes);
+			AdditionalConnections::<T>::insert(&node, nodes);
 
-			Self::deposit_event(RawEvent::ConnectionsRemoved(node, connections));
-		}
-
-		/// Set reserved node every block. It may not be enabled depends on the offchain
-		/// worker settings when starting the node.
-		fn offchain_worker(now: T::BlockNumber) {
-			let network_state = sp_io::offchain::network_state();
-			match network_state {
-				Err(_) => log::error!(
-					target: "runtime::node-authorization",
-					"Error: failed to get network state of node at {:?}",
-					now,
-				),
-				Ok(state) => {
-					let encoded_peer = state.peer_id.0;
-					match Decode::decode(&mut &encoded_peer[..]) {
-						Err(_) => log::error!(
-							target: "runtime::node-authorization",
-							"Error: failed to decode PeerId at {:?}",
-							now,
-						),
-						Ok(node) => sp_io::offchain::set_authorized_nodes(
-							Self::get_authorized_nodes(&PeerId(node)),
-							true
-						)
-					}
-				}
-			}
+			Self::deposit_event(Event::ConnectionsRemoved(node, connections));
+			Ok(())
 		}
 	}
 }
 
-impl<T: Config> Module<T> {
+impl<T: Config> Pallet<T> {
 	fn initialize_nodes(nodes: &Vec<(PeerId, T::AccountId)>) {
 		let peer_ids = nodes.iter()
 			.map(|item| item.0.clone())
 			.collect::<BTreeSet<PeerId>>();
-		WellKnownNodes::put(&peer_ids);
+		WellKnownNodes::<T>::put(&peer_ids);
 
 		for (node, who) in nodes.iter() {
 			Owners::<T>::insert(node, who);
@@ -422,9 +461,9 @@ impl<T: Config> Module<T> {
 	}
 
 	fn get_authorized_nodes(node: &PeerId) -> Vec<PeerId> {
-		let mut nodes = AdditionalConnections::get(node);
+		let mut nodes = AdditionalConnections::<T>::get(node);
 
-		let mut well_known_nodes = WellKnownNodes::get();
+		let mut well_known_nodes = WellKnownNodes::<T>::get();
 		if well_known_nodes.contains(node) {
 			well_known_nodes.remove(node);
 			nodes.extend(well_known_nodes);
@@ -433,434 +472,3 @@ impl<T: Config> Module<T> {
 		Vec::from_iter(nodes)
 	}
 }
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate as pallet_node_authorization;
-
-	use frame_support::{assert_ok, assert_noop, parameter_types, ord_parameter_types};
-	use frame_system::EnsureSignedBy;
-	use sp_core::H256;
-	use sp_runtime::{traits::{BlakeTwo256, IdentityLookup, BadOrigin}, testing::Header};
-
-	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
-	type Block = frame_system::mocking::MockBlock<Test>;
-
-	frame_support::construct_runtime!(
-		pub enum Test where
-			Block = Block,
-			NodeBlock = Block,
-			UncheckedExtrinsic = UncheckedExtrinsic,
-		{
-			System: frame_system::{Module, Call, Config, Storage, Event<T>},
-			NodeAuthorization: pallet_node_authorization::{
-				Module, Call, Storage, Config<T>, Event<T>,
-			},
-		}
-	);
-
-	parameter_types! {
-		pub const BlockHashCount: u64 = 250;
-	}
-	impl frame_system::Config for Test {
-		type BaseCallFilter = ();
-		type DbWeight = ();
-		type BlockWeights = ();
-		type BlockLength = ();
-		type Origin = Origin;
-		type Index = u64;
-		type BlockNumber = u64;
-		type Hash = H256;
-		type Call = Call;
-		type Hashing = BlakeTwo256;
-		type AccountId = u64;
-		type Lookup = IdentityLookup<Self::AccountId>;
-		type Header = Header;
-		type Event = Event;
-		type BlockHashCount = BlockHashCount;
-		type Version = ();
-		type PalletInfo = PalletInfo;
-		type AccountData = ();
-		type OnNewAccount = ();
-		type OnKilledAccount = ();
-		type SystemWeightInfo = ();
-		type SS58Prefix = ();
-	}
-
-	ord_parameter_types! {
-		pub const One: u64 = 1;
-		pub const Two: u64 = 2;
-		pub const Three: u64 = 3;
-		pub const Four: u64 = 4;
-	}
-	parameter_types! {
-		pub const MaxWellKnownNodes: u32 = 4;
-		pub const MaxPeerIdLength: u32 = 2;
-	}
-	impl Config for Test {
-		type Event = Event;
-		type MaxWellKnownNodes = MaxWellKnownNodes;
-		type MaxPeerIdLength = MaxPeerIdLength;
-		type AddOrigin = EnsureSignedBy<One, u64>;
-		type RemoveOrigin = EnsureSignedBy<Two, u64>;
-		type SwapOrigin = EnsureSignedBy<Three, u64>;
-		type ResetOrigin = EnsureSignedBy<Four, u64>;
-		type WeightInfo = ();
-	}
-
-	fn test_node(id: u8) -> PeerId {
-		PeerId(vec![id])
-	}
-
-	fn new_test_ext() -> sp_io::TestExternalities {
-		let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-		pallet_node_authorization::GenesisConfig::<Test> {
-			nodes: vec![(test_node(10), 10), (test_node(20), 20), (test_node(30), 30)],
-		}.assimilate_storage(&mut t).unwrap();
-		t.into()
-	}
-
-	#[test]
-	fn add_well_known_node_works() {
-		new_test_ext().execute_with(|| {
-			assert_noop!(
-				NodeAuthorization::add_well_known_node(Origin::signed(2), test_node(15), 15),
-				BadOrigin
-			);
-			assert_noop!(
-				NodeAuthorization::add_well_known_node(Origin::signed(1), PeerId(vec![1, 2, 3]), 15),
-				Error::<Test>::PeerIdTooLong
-			);
-			assert_noop!(
-				NodeAuthorization::add_well_known_node(Origin::signed(1), test_node(20), 20),
-				Error::<Test>::AlreadyJoined
-			);
-
-			assert_ok!(
-				NodeAuthorization::add_well_known_node(Origin::signed(1), test_node(15), 15)
-			);
-			assert_eq!(
-				WellKnownNodes::get(),
-				BTreeSet::from_iter(vec![test_node(10), test_node(15), test_node(20), test_node(30)])
-			);
-			assert_eq!(Owners::<Test>::get(test_node(10)), 10);
-			assert_eq!(Owners::<Test>::get(test_node(20)), 20);
-			assert_eq!(Owners::<Test>::get(test_node(30)), 30);
-			assert_eq!(Owners::<Test>::get(test_node(15)), 15);
-
-			assert_noop!(
-				NodeAuthorization::add_well_known_node(Origin::signed(1), test_node(25), 25),
-				Error::<Test>::TooManyNodes
-			);
-		});
-	}
-
-	#[test]
-	fn remove_well_known_node_works() {
-		new_test_ext().execute_with(|| {
-			assert_noop!(
-				NodeAuthorization::remove_well_known_node(Origin::signed(3), test_node(20)),
-				BadOrigin
-			);
-			assert_noop!(
-				NodeAuthorization::remove_well_known_node(Origin::signed(2), PeerId(vec![1, 2, 3])),
-				Error::<Test>::PeerIdTooLong
-			);
-			assert_noop!(
-				NodeAuthorization::remove_well_known_node(Origin::signed(2), test_node(40)),
-				Error::<Test>::NotExist
-			);
-
-			AdditionalConnections::insert(
-				test_node(20),
-				BTreeSet::from_iter(vec![test_node(40)])
-			);
-			assert!(AdditionalConnections::contains_key(test_node(20)));
-
-			assert_ok!(
-				NodeAuthorization::remove_well_known_node(Origin::signed(2), test_node(20))
-			);
-			assert_eq!(
-				WellKnownNodes::get(),
-				BTreeSet::from_iter(vec![test_node(10), test_node(30)])
-			);
-			assert!(!Owners::<Test>::contains_key(test_node(20)));
-			assert!(!AdditionalConnections::contains_key(test_node(20)));
-		});
-	}
-
-	#[test]
-	fn swap_well_known_node_works() {
-		new_test_ext().execute_with(|| {
-			assert_noop!(
-				NodeAuthorization::swap_well_known_node(
-					Origin::signed(4), test_node(20), test_node(5)
-				),
-				BadOrigin
-			);
-			assert_noop!(
-				NodeAuthorization::swap_well_known_node(
-					Origin::signed(3), PeerId(vec![1, 2, 3]), test_node(20)
-				),
-				Error::<Test>::PeerIdTooLong
-			);
-			assert_noop!(
-				NodeAuthorization::swap_well_known_node(
-					Origin::signed(3), test_node(20), PeerId(vec![1, 2, 3])
-				),
-				Error::<Test>::PeerIdTooLong
-			);
-
-			assert_ok!(
-				NodeAuthorization::swap_well_known_node(
-					Origin::signed(3), test_node(20), test_node(20)
-				)
-			);
-			assert_eq!(
-				WellKnownNodes::get(),
-				BTreeSet::from_iter(vec![test_node(10), test_node(20), test_node(30)])
-			);
-
-			assert_noop!(
-				NodeAuthorization::swap_well_known_node(
-					Origin::signed(3), test_node(15), test_node(5)
-				),
-				Error::<Test>::NotExist
-			);
-			assert_noop!(
-				NodeAuthorization::swap_well_known_node(
-					Origin::signed(3), test_node(20), test_node(30)
-				),
-				Error::<Test>::AlreadyJoined
-			);
-
-			AdditionalConnections::insert(
-				test_node(20),
-				BTreeSet::from_iter(vec![test_node(15)])
-			);
-			assert_ok!(
-				NodeAuthorization::swap_well_known_node(
-					Origin::signed(3), test_node(20), test_node(5)
-				)
-			);
-			assert_eq!(
-				WellKnownNodes::get(),
-				BTreeSet::from_iter(vec![test_node(5), test_node(10), test_node(30)])
-			);
-			assert!(!Owners::<Test>::contains_key(test_node(20)));
-			assert_eq!(Owners::<Test>::get(test_node(5)), 20);
-			assert!(!AdditionalConnections::contains_key(test_node(20)));
-			assert_eq!(
-				AdditionalConnections::get(test_node(5)),
-				BTreeSet::from_iter(vec![test_node(15)])
-			);
-		});
-	}
-
-	#[test]
-	fn reset_well_known_nodes_works() {
-		new_test_ext().execute_with(|| {
-			assert_noop!(
-				NodeAuthorization::reset_well_known_nodes(
-					Origin::signed(3),
-					vec![(test_node(15), 15), (test_node(5), 5), (test_node(20), 20)]
-				),
-				BadOrigin
-			);
-			assert_noop!(
-				NodeAuthorization::reset_well_known_nodes(
-					Origin::signed(4),
-					vec![
-						(test_node(15), 15),
-						(test_node(5), 5),
-						(test_node(20), 20),
-						(test_node(25), 25),
-					]
-				),
-				Error::<Test>::TooManyNodes
-			);
-
-			assert_ok!(
-				NodeAuthorization::reset_well_known_nodes(
-					Origin::signed(4),
-					vec![(test_node(15), 15), (test_node(5), 5), (test_node(20), 20)]
-				)
-			);
-			assert_eq!(
-				WellKnownNodes::get(),
-				BTreeSet::from_iter(vec![test_node(5), test_node(15), test_node(20)])
-			);
-			assert_eq!(Owners::<Test>::get(test_node(5)), 5);
-			assert_eq!(Owners::<Test>::get(test_node(15)), 15);
-			assert_eq!(Owners::<Test>::get(test_node(20)), 20);
-		});
-	}
-
-	#[test]
-	fn claim_node_works() {
-		new_test_ext().execute_with(|| {
-			assert_noop!(
-				NodeAuthorization::claim_node(Origin::signed(1), PeerId(vec![1, 2, 3])),
-				Error::<Test>::PeerIdTooLong
-			);
-			assert_noop!(
-				NodeAuthorization::claim_node(Origin::signed(1), test_node(20)),
-				Error::<Test>::AlreadyClaimed
-			);
-
-			assert_ok!(NodeAuthorization::claim_node(Origin::signed(15), test_node(15)));
-			assert_eq!(Owners::<Test>::get(test_node(15)), 15);
-		});
-	}
-
-	#[test]
-	fn remove_claim_works() {
-		new_test_ext().execute_with(|| {
-			assert_noop!(
-				NodeAuthorization::remove_claim(Origin::signed(15), PeerId(vec![1, 2, 3])),
-				Error::<Test>::PeerIdTooLong
-			);
-			assert_noop!(
-				NodeAuthorization::remove_claim(Origin::signed(15), test_node(15)),
-				Error::<Test>::NotClaimed
-			);
-
-			assert_noop!(
-				NodeAuthorization::remove_claim(Origin::signed(15), test_node(20)),
-				Error::<Test>::NotOwner
-			);
-
-			assert_noop!(
-				NodeAuthorization::remove_claim(Origin::signed(20), test_node(20)),
-				Error::<Test>::PermissionDenied
-			);
-
-			Owners::<Test>::insert(test_node(15), 15);
-			AdditionalConnections::insert(
-				test_node(15),
-				BTreeSet::from_iter(vec![test_node(20)])
-			);
-			assert_ok!(NodeAuthorization::remove_claim(Origin::signed(15), test_node(15)));
-			assert!(!Owners::<Test>::contains_key(test_node(15)));
-			assert!(!AdditionalConnections::contains_key(test_node(15)));
-		});
-	}
-
-	#[test]
-	fn transfer_node_works() {
-		new_test_ext().execute_with(|| {
-			assert_noop!(
-				NodeAuthorization::transfer_node(Origin::signed(15), PeerId(vec![1, 2, 3]), 10),
-				Error::<Test>::PeerIdTooLong
-			);
-			assert_noop!(
-				NodeAuthorization::transfer_node(Origin::signed(15), test_node(15), 10),
-				Error::<Test>::NotClaimed
-			);
-
-			assert_noop!(
-				NodeAuthorization::transfer_node(Origin::signed(15), test_node(20), 10),
-				Error::<Test>::NotOwner
-			);
-
-			assert_ok!(NodeAuthorization::transfer_node(Origin::signed(20), test_node(20), 15));
-			assert_eq!(Owners::<Test>::get(test_node(20)), 15);
-		});
-	}
-
-	#[test]
-	fn add_connections_works() {
-		new_test_ext().execute_with(|| {
-			assert_noop!(
-				NodeAuthorization::add_connections(
-					Origin::signed(15), PeerId(vec![1, 2, 3]), vec![test_node(5)]
-				),
-				Error::<Test>::PeerIdTooLong
-			);
-			assert_noop!(
-				NodeAuthorization::add_connections(
-					Origin::signed(15), test_node(15), vec![test_node(5)]
-				),
-				Error::<Test>::NotClaimed
-			);
-
-			assert_noop!(
-				NodeAuthorization::add_connections(
-					Origin::signed(15), test_node(20), vec![test_node(5)]
-				),
-				Error::<Test>::NotOwner
-			);
-
-			assert_ok!(
-				NodeAuthorization::add_connections(
-					Origin::signed(20),
-					test_node(20),
-					vec![test_node(15), test_node(5), test_node(25), test_node(20)]
-				)
-			);
-			assert_eq!(
-				AdditionalConnections::get(test_node(20)),
-				BTreeSet::from_iter(vec![test_node(5), test_node(15), test_node(25)])
-			);
-		});
-	}
-
-	#[test]
-	fn remove_connections_works() {
-		new_test_ext().execute_with(|| {
-			assert_noop!(
-				NodeAuthorization::remove_connections(
-					Origin::signed(15), PeerId(vec![1, 2, 3]), vec![test_node(5)]
-				),
-				Error::<Test>::PeerIdTooLong
-			);
-			assert_noop!(
-				NodeAuthorization::remove_connections(
-					Origin::signed(15), test_node(15), vec![test_node(5)]
-				),
-				Error::<Test>::NotClaimed
-			);
-
-			assert_noop!(
-				NodeAuthorization::remove_connections(
-					Origin::signed(15), test_node(20), vec![test_node(5)]
-				),
-				Error::<Test>::NotOwner
-			);
-
-			AdditionalConnections::insert(
-				test_node(20),
-				BTreeSet::from_iter(vec![test_node(5), test_node(15), test_node(25)])
-			);
-			assert_ok!(
-				NodeAuthorization::remove_connections(
-					Origin::signed(20),
-					test_node(20),
-					vec![test_node(15), test_node(5)]
-				)
-			);
-			assert_eq!(
-				AdditionalConnections::get(test_node(20)),
-				BTreeSet::from_iter(vec![test_node(25)])
-			);
-		});
-	}
-
-	#[test]
-	fn get_authorized_nodes_works() {
-		new_test_ext().execute_with(|| {
-			AdditionalConnections::insert(
-				test_node(20),
-				BTreeSet::from_iter(vec![test_node(5), test_node(15), test_node(25)])
-			);
-
-			let mut authorized_nodes = Module::<Test>::get_authorized_nodes(&test_node(20));
-			authorized_nodes.sort();
-			assert_eq!(
-				authorized_nodes,
-				vec![test_node(5), test_node(10), test_node(15), test_node(25), test_node(30)]
-			);
-		});
-	}
-}
diff --git a/frame/node-authorization/src/mock.rs b/frame/node-authorization/src/mock.rs
new file mode 100644
index 000000000000..2983d081739d
--- /dev/null
+++ b/frame/node-authorization/src/mock.rs
@@ -0,0 +1,106 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Test environment for node-authorization pallet.
+
+use super::*;
+use crate as pallet_node_authorization;
+
+use frame_support::{
+	parameter_types, ord_parameter_types,
+	traits::GenesisBuild,
+};
+use frame_system::EnsureSignedBy;
+use sp_core::H256;
+use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
+
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		NodeAuthorization: pallet_node_authorization::{
+			Module, Call, Storage, Config<T>, Event<T>,
+		},
+	}
+);
+
+parameter_types! {
+	pub const BlockHashCount: u64 = 250;
+}
+impl frame_system::Config for Test {
+	type BaseCallFilter = ();
+	type DbWeight = ();
+	type BlockWeights = ();
+	type BlockLength = ();
+	type Origin = Origin;
+	type Index = u64;
+	type BlockNumber = u64;
+	type Hash = H256;
+	type Call = Call;
+	type Hashing = BlakeTwo256;
+	type AccountId = u64;
+	type Lookup = IdentityLookup<Self::AccountId>;
+	type Header = Header;
+	type Event = Event;
+	type BlockHashCount = BlockHashCount;
+	type Version = ();
+	type PalletInfo = PalletInfo;
+	type AccountData = ();
+	type OnNewAccount = ();
+	type OnKilledAccount = ();
+	type SystemWeightInfo = ();
+	type SS58Prefix = ();
+}
+
+ord_parameter_types! {
+	pub const One: u64 = 1;
+	pub const Two: u64 = 2;
+	pub const Three: u64 = 3;
+	pub const Four: u64 = 4;
+}
+parameter_types! {
+	pub const MaxWellKnownNodes: u32 = 4;
+	pub const MaxPeerIdLength: u32 = 2;
+}
+impl Config for Test {
+	type Event = Event;
+	type MaxWellKnownNodes = MaxWellKnownNodes;
+	type MaxPeerIdLength = MaxPeerIdLength;
+	type AddOrigin = EnsureSignedBy<One, u64>;
+	type RemoveOrigin = EnsureSignedBy<Two, u64>;
+	type SwapOrigin = EnsureSignedBy<Three, u64>;
+	type ResetOrigin = EnsureSignedBy<Four, u64>;
+	type WeightInfo = ();
+}
+
+pub fn test_node(id: u8) -> PeerId {
+	PeerId(vec![id])
+}
+
+pub fn new_test_ext() -> sp_io::TestExternalities {
+	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+	pallet_node_authorization::GenesisConfig::<Test> {
+		nodes: vec![(test_node(10), 10), (test_node(20), 20), (test_node(30), 30)],
+	}.assimilate_storage(&mut t).unwrap();
+	t.into()
+}
diff --git a/frame/node-authorization/src/tests.rs b/frame/node-authorization/src/tests.rs
new file mode 100644
index 000000000000..d80c6da7376b
--- /dev/null
+++ b/frame/node-authorization/src/tests.rs
@@ -0,0 +1,366 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Tests for node-authorization pallet.
+
+use super::*;
+use crate::mock::*;
+use frame_support::{assert_ok, assert_noop};
+use sp_runtime::traits::BadOrigin;
+
+#[test]
+fn add_well_known_node_works() {
+	new_test_ext().execute_with(|| {
+		assert_noop!(
+			NodeAuthorization::add_well_known_node(Origin::signed(2), test_node(15), 15),
+			BadOrigin
+		);
+		assert_noop!(
+			NodeAuthorization::add_well_known_node(Origin::signed(1), PeerId(vec![1, 2, 3]), 15),
+			Error::<Test>::PeerIdTooLong
+		);
+		assert_noop!(
+			NodeAuthorization::add_well_known_node(Origin::signed(1), test_node(20), 20),
+			Error::<Test>::AlreadyJoined
+		);
+
+		assert_ok!(
+			NodeAuthorization::add_well_known_node(Origin::signed(1), test_node(15), 15)
+		);
+		assert_eq!(
+			WellKnownNodes::<Test>::get(),
+			BTreeSet::from_iter(vec![test_node(10), test_node(15), test_node(20), test_node(30)])
+		);
+		assert_eq!(Owners::<Test>::get(test_node(10)), Some(10));
+		assert_eq!(Owners::<Test>::get(test_node(20)), Some(20));
+		assert_eq!(Owners::<Test>::get(test_node(30)), Some(30));
+		assert_eq!(Owners::<Test>::get(test_node(15)), Some(15));
+
+		assert_noop!(
+			NodeAuthorization::add_well_known_node(Origin::signed(1), test_node(25), 25),
+			Error::<Test>::TooManyNodes
+		);
+	});
+}
+
+#[test]
+fn remove_well_known_node_works() {
+	new_test_ext().execute_with(|| {
+		assert_noop!(
+			NodeAuthorization::remove_well_known_node(Origin::signed(3), test_node(20)),
+			BadOrigin
+		);
+		assert_noop!(
+			NodeAuthorization::remove_well_known_node(Origin::signed(2), PeerId(vec![1, 2, 3])),
+			Error::<Test>::PeerIdTooLong
+		);
+		assert_noop!(
+			NodeAuthorization::remove_well_known_node(Origin::signed(2), test_node(40)),
+			Error::<Test>::NotExist
+		);
+
+		AdditionalConnections::<Test>::insert(
+			test_node(20),
+			BTreeSet::from_iter(vec![test_node(40)])
+		);
+		assert!(AdditionalConnections::<Test>::contains_key(test_node(20)));
+
+		assert_ok!(
+			NodeAuthorization::remove_well_known_node(Origin::signed(2), test_node(20))
+		);
+		assert_eq!(
+			WellKnownNodes::<Test>::get(),
+			BTreeSet::from_iter(vec![test_node(10), test_node(30)])
+		);
+		assert!(!Owners::<Test>::contains_key(test_node(20)));
+		assert!(!AdditionalConnections::<Test>::contains_key(test_node(20)));
+	});
+}
+
+#[test]
+fn swap_well_known_node_works() {
+	new_test_ext().execute_with(|| {
+		assert_noop!(
+			NodeAuthorization::swap_well_known_node(
+				Origin::signed(4), test_node(20), test_node(5)
+			),
+			BadOrigin
+		);
+		assert_noop!(
+			NodeAuthorization::swap_well_known_node(
+				Origin::signed(3), PeerId(vec![1, 2, 3]), test_node(20)
+			),
+			Error::<Test>::PeerIdTooLong
+		);
+		assert_noop!(
+			NodeAuthorization::swap_well_known_node(
+				Origin::signed(3), test_node(20), PeerId(vec![1, 2, 3])
+			),
+			Error::<Test>::PeerIdTooLong
+		);
+
+		assert_ok!(
+			NodeAuthorization::swap_well_known_node(
+				Origin::signed(3), test_node(20), test_node(20)
+			)
+		);
+		assert_eq!(
+			WellKnownNodes::<Test>::get(),
+			BTreeSet::from_iter(vec![test_node(10), test_node(20), test_node(30)])
+		);
+
+		assert_noop!(
+			NodeAuthorization::swap_well_known_node(
+				Origin::signed(3), test_node(15), test_node(5)
+			),
+			Error::<Test>::NotExist
+		);
+		assert_noop!(
+			NodeAuthorization::swap_well_known_node(
+				Origin::signed(3), test_node(20), test_node(30)
+			),
+			Error::<Test>::AlreadyJoined
+		);
+
+		AdditionalConnections::<Test>::insert(
+			test_node(20),
+			BTreeSet::from_iter(vec![test_node(15)])
+		);
+		assert_ok!(
+			NodeAuthorization::swap_well_known_node(
+				Origin::signed(3), test_node(20), test_node(5)
+			)
+		);
+		assert_eq!(
+			WellKnownNodes::<Test>::get(),
+			BTreeSet::from_iter(vec![test_node(5), test_node(10), test_node(30)])
+		);
+		assert!(!Owners::<Test>::contains_key(test_node(20)));
+		assert_eq!(Owners::<Test>::get(test_node(5)), Some(20));
+		assert!(!AdditionalConnections::<Test>::contains_key(test_node(20)));
+		assert_eq!(
+			AdditionalConnections::<Test>::get(test_node(5)),
+			BTreeSet::from_iter(vec![test_node(15)])
+		);
+	});
+}
+
+#[test]
+fn reset_well_known_nodes_works() {
+	new_test_ext().execute_with(|| {
+		assert_noop!(
+			NodeAuthorization::reset_well_known_nodes(
+				Origin::signed(3),
+				vec![(test_node(15), 15), (test_node(5), 5), (test_node(20), 20)]
+			),
+			BadOrigin
+		);
+		assert_noop!(
+			NodeAuthorization::reset_well_known_nodes(
+				Origin::signed(4),
+				vec![
+					(test_node(15), 15),
+					(test_node(5), 5),
+					(test_node(20), 20),
+					(test_node(25), 25),
+				]
+			),
+			Error::<Test>::TooManyNodes
+		);
+
+		assert_ok!(
+			NodeAuthorization::reset_well_known_nodes(
+				Origin::signed(4),
+				vec![(test_node(15), 15), (test_node(5), 5), (test_node(20), 20)]
+			)
+		);
+		assert_eq!(
+			WellKnownNodes::<Test>::get(),
+			BTreeSet::from_iter(vec![test_node(5), test_node(15), test_node(20)])
+		);
+		assert_eq!(Owners::<Test>::get(test_node(5)), Some(5));
+		assert_eq!(Owners::<Test>::get(test_node(15)), Some(15));
+		assert_eq!(Owners::<Test>::get(test_node(20)), Some(20));
+	});
+}
+
+#[test]
+fn claim_node_works() {
+	new_test_ext().execute_with(|| {
+		assert_noop!(
+			NodeAuthorization::claim_node(Origin::signed(1), PeerId(vec![1, 2, 3])),
+			Error::<Test>::PeerIdTooLong
+		);
+		assert_noop!(
+			NodeAuthorization::claim_node(Origin::signed(1), test_node(20)),
+			Error::<Test>::AlreadyClaimed
+		);
+
+		assert_ok!(NodeAuthorization::claim_node(Origin::signed(15), test_node(15)));
+		assert_eq!(Owners::<Test>::get(test_node(15)), Some(15));
+	});
+}
+
+#[test]
+fn remove_claim_works() {
+	new_test_ext().execute_with(|| {
+		assert_noop!(
+			NodeAuthorization::remove_claim(Origin::signed(15), PeerId(vec![1, 2, 3])),
+			Error::<Test>::PeerIdTooLong
+		);
+		assert_noop!(
+			NodeAuthorization::remove_claim(Origin::signed(15), test_node(15)),
+			Error::<Test>::NotClaimed
+		);
+
+		assert_noop!(
+			NodeAuthorization::remove_claim(Origin::signed(15), test_node(20)),
+			Error::<Test>::NotOwner
+		);
+
+		assert_noop!(
+			NodeAuthorization::remove_claim(Origin::signed(20), test_node(20)),
+			Error::<Test>::PermissionDenied
+		);
+
+		Owners::<Test>::insert(test_node(15), 15);
+		AdditionalConnections::<Test>::insert(
+			test_node(15),
+			BTreeSet::from_iter(vec![test_node(20)])
+		);
+		assert_ok!(NodeAuthorization::remove_claim(Origin::signed(15), test_node(15)));
+		assert!(!Owners::<Test>::contains_key(test_node(15)));
+		assert!(!AdditionalConnections::<Test>::contains_key(test_node(15)));
+	});
+}
+
+#[test]
+fn transfer_node_works() {
+	new_test_ext().execute_with(|| {
+		assert_noop!(
+			NodeAuthorization::transfer_node(Origin::signed(15), PeerId(vec![1, 2, 3]), 10),
+			Error::<Test>::PeerIdTooLong
+		);
+		assert_noop!(
+			NodeAuthorization::transfer_node(Origin::signed(15), test_node(15), 10),
+			Error::<Test>::NotClaimed
+		);
+
+		assert_noop!(
+			NodeAuthorization::transfer_node(Origin::signed(15), test_node(20), 10),
+			Error::<Test>::NotOwner
+		);
+
+		assert_ok!(NodeAuthorization::transfer_node(Origin::signed(20), test_node(20), 15));
+		assert_eq!(Owners::<Test>::get(test_node(20)), Some(15));
+	});
+}
+
+#[test]
+fn add_connections_works() {
+	new_test_ext().execute_with(|| {
+		assert_noop!(
+			NodeAuthorization::add_connections(
+				Origin::signed(15), PeerId(vec![1, 2, 3]), vec![test_node(5)]
+			),
+			Error::<Test>::PeerIdTooLong
+		);
+		assert_noop!(
+			NodeAuthorization::add_connections(
+				Origin::signed(15), test_node(15), vec![test_node(5)]
+			),
+			Error::<Test>::NotClaimed
+		);
+
+		assert_noop!(
+			NodeAuthorization::add_connections(
+				Origin::signed(15), test_node(20), vec![test_node(5)]
+			),
+			Error::<Test>::NotOwner
+		);
+
+		assert_ok!(
+			NodeAuthorization::add_connections(
+				Origin::signed(20),
+				test_node(20),
+				vec![test_node(15), test_node(5), test_node(25), test_node(20)]
+			)
+		);
+		assert_eq!(
+			AdditionalConnections::<Test>::get(test_node(20)),
+			BTreeSet::from_iter(vec![test_node(5), test_node(15), test_node(25)])
+		);
+	});
+}
+
+#[test]
+fn remove_connections_works() {
+	new_test_ext().execute_with(|| {
+		assert_noop!(
+			NodeAuthorization::remove_connections(
+				Origin::signed(15), PeerId(vec![1, 2, 3]), vec![test_node(5)]
+			),
+			Error::<Test>::PeerIdTooLong
+		);
+		assert_noop!(
+			NodeAuthorization::remove_connections(
+				Origin::signed(15), test_node(15), vec![test_node(5)]
+			),
+			Error::<Test>::NotClaimed
+		);
+
+		assert_noop!(
+			NodeAuthorization::remove_connections(
+				Origin::signed(15), test_node(20), vec![test_node(5)]
+			),
+			Error::<Test>::NotOwner
+		);
+
+		AdditionalConnections::<Test>::insert(
+			test_node(20),
+			BTreeSet::from_iter(vec![test_node(5), test_node(15), test_node(25)])
+		);
+		assert_ok!(
+			NodeAuthorization::remove_connections(
+				Origin::signed(20),
+				test_node(20),
+				vec![test_node(15), test_node(5)]
+			)
+		);
+		assert_eq!(
+			AdditionalConnections::<Test>::get(test_node(20)),
+			BTreeSet::from_iter(vec![test_node(25)])
+		);
+	});
+}
+
+#[test]
+fn get_authorized_nodes_works() {
+	new_test_ext().execute_with(|| {
+		AdditionalConnections::<Test>::insert(
+			test_node(20),
+			BTreeSet::from_iter(vec![test_node(5), test_node(15), test_node(25)])
+		);
+
+		let mut authorized_nodes = Module::<Test>::get_authorized_nodes(&test_node(20));
+		authorized_nodes.sort();
+		assert_eq!(
+			authorized_nodes,
+			vec![test_node(5), test_node(10), test_node(15), test_node(25), test_node(30)]
+		);
+	});
+}
diff --git a/frame/node-authorization/src/weights.rs b/frame/node-authorization/src/weights.rs
new file mode 100644
index 000000000000..3d01e40d67ac
--- /dev/null
+++ b/frame/node-authorization/src/weights.rs
@@ -0,0 +1,48 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Autogenerated weights for pallet_node_authorization
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+pub trait WeightInfo {
+	fn add_well_known_node() -> Weight;
+	fn remove_well_known_node() -> Weight;
+	fn swap_well_known_node() -> Weight;
+	fn reset_well_known_nodes() -> Weight;
+	fn claim_node() -> Weight;
+	fn remove_claim() -> Weight;
+	fn transfer_node() -> Weight;
+	fn add_connections() -> Weight;
+	fn remove_connections() -> Weight;
+}
+
+impl WeightInfo for () {
+	fn add_well_known_node() -> Weight { 50_000_000 }
+	fn remove_well_known_node() -> Weight { 50_000_000 }
+	fn swap_well_known_node() -> Weight { 50_000_000 }
+	fn reset_well_known_nodes() -> Weight { 50_000_000 }
+	fn claim_node() -> Weight { 50_000_000 }
+	fn remove_claim() -> Weight { 50_000_000 }
+	fn transfer_node() -> Weight { 50_000_000 }
+	fn add_connections() -> Weight { 50_000_000 }
+	fn remove_connections() -> Weight { 50_000_000 }
+}

From 3a12b0e4db806292ed23d1ad584284292eacc5f9 Mon Sep 17 00:00:00 2001
From: Martin Pugh <pugh@s3kr.it>
Date: Wed, 17 Mar 2021 20:02:58 +0100
Subject: [PATCH 0517/1194] fix check-labels.yml (#8387)

---
 .github/workflows/check-labels.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/check-labels.yml b/.github/workflows/check-labels.yml
index 062527d311d8..7180e7b50966 100644
--- a/.github/workflows/check-labels.yml
+++ b/.github/workflows/check-labels.yml
@@ -12,6 +12,7 @@ jobs:
         with:
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.ref }}
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
       - name: Check labels
         run: bash ${{ github.workspace }}/.maintain/github/check_labels.sh
         env:

From de96cf894db42a772f60097b094ae4ce92f2e8f1 Mon Sep 17 00:00:00 2001
From: Martin Pugh <pugh@s3kr.it>
Date: Wed, 17 Mar 2021 21:04:53 +0100
Subject: [PATCH 0518/1194] add D1-trivial label (#8388)

---
 .maintain/github/check_labels.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.maintain/github/check_labels.sh b/.maintain/github/check_labels.sh
index 6f280964fe52..ea4547ac9170 100755
--- a/.maintain/github/check_labels.sh
+++ b/.maintain/github/check_labels.sh
@@ -32,6 +32,7 @@ criticality_labels=(
 )
 
 audit_labels=(
+  'D1-trivial'
   'D1-audited👍'
   'D5-nicetohaveaudit⚠️'
   'D9-needsaudit👮'

From ce0b69a612bf35d838dc743781cd58ad022b16c6 Mon Sep 17 00:00:00 2001
From: Shaun Wang <spxwang@gmail.com>
Date: Thu, 18 Mar 2021 09:47:39 +1300
Subject: [PATCH 0519/1194] Migrate pallet-babe to pallet attribute macro.
 (#8310)

* Migrate pallet-babe to pallet attribute macro.

* Remove unnecessary bound in pallet storage.

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 frame/babe/src/benchmarking.rs |   2 +-
 frame/babe/src/equivocation.rs |   4 +-
 frame/babe/src/lib.rs          | 524 ++++++++++++++++++---------------
 frame/babe/src/mock.rs         |   4 +-
 frame/babe/src/randomness.rs   |   8 +-
 frame/babe/src/tests.rs        |  52 ++--
 6 files changed, 325 insertions(+), 269 deletions(-)

diff --git a/frame/babe/src/benchmarking.rs b/frame/babe/src/benchmarking.rs
index 087cac2ed6cc..145a82c4f804 100644
--- a/frame/babe/src/benchmarking.rs
+++ b/frame/babe/src/benchmarking.rs
@@ -91,7 +91,7 @@ mod tests {
 			let equivocation_proof = generate_equivocation_proof(
 				offending_authority_index,
 				offending_authority_pair,
-				CurrentSlot::get() + 1,
+				CurrentSlot::<Test>::get() + 1,
 			);
 
 			println!("equivocation_proof: {:?}", equivocation_proof);
diff --git a/frame/babe/src/equivocation.rs b/frame/babe/src/equivocation.rs
index 30fbaf31371b..154faa49f0b2 100644
--- a/frame/babe/src/equivocation.rs
+++ b/frame/babe/src/equivocation.rs
@@ -48,7 +48,7 @@ use sp_staking::{
 };
 use sp_std::prelude::*;
 
-use crate::{Call, Module, Config};
+use crate::{Call, Pallet, Config};
 
 /// A trait with utility methods for handling equivocation reports in BABE.
 /// The trait provides methods for reporting an offence triggered by a valid
@@ -182,7 +182,7 @@ where
 /// A `ValidateUnsigned` implementation that restricts calls to `report_equivocation_unsigned`
 /// to local calls (i.e. extrinsics generated on this node) or that already in a block. This
 /// guarantees that only block authors can include unsigned equivocation reports.
-impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
+impl<T: Config> frame_support::unsigned::ValidateUnsigned for Pallet<T> {
 	type Call = Call<T>;
 	fn validate_unsigned(source: TransactionSource, call: &Self::Call) -> TransactionValidity {
 		if let Call::report_equivocation_unsigned(equivocation_proof, key_owner_proof) = call {
diff --git a/frame/babe/src/lib.rs b/frame/babe/src/lib.rs
index c259b60c6a7c..5c8b8bb0a7ca 100644
--- a/frame/babe/src/lib.rs
+++ b/frame/babe/src/lib.rs
@@ -23,13 +23,10 @@
 
 use codec::{Decode, Encode};
 use frame_support::{
-	decl_error, decl_module, decl_storage,
 	dispatch::DispatchResultWithPostInfo,
 	traits::{FindAuthor, Get, KeyOwnerProofSystem, OneSessionHandler, OnTimestampSet},
 	weights::{Pays, Weight},
-	Parameter,
 };
-use frame_system::{ensure_none, ensure_root, ensure_signed};
 use sp_application_crypto::Public;
 use sp_runtime::{
 	generic::DigestItem,
@@ -64,52 +61,7 @@ pub use randomness::{
 	CurrentBlockRandomness, RandomnessFromOneEpochAgo, RandomnessFromTwoEpochsAgo,
 };
 
-pub trait Config: pallet_timestamp::Config {
-	/// The amount of time, in slots, that each epoch should last.
-	/// NOTE: Currently it is not possible to change the epoch duration after
-	/// the chain has started. Attempting to do so will brick block production.
-	type EpochDuration: Get<u64>;
-
-	/// The expected average block time at which BABE should be creating
-	/// blocks. Since BABE is probabilistic it is not trivial to figure out
-	/// what the expected average block time should be based on the slot
-	/// duration and the security parameter `c` (where `1 - c` represents
-	/// the probability of a slot being empty).
-	type ExpectedBlockTime: Get<Self::Moment>;
-
-	/// BABE requires some logic to be triggered on every block to query for whether an epoch
-	/// has ended and to perform the transition to the next epoch.
-	///
-	/// Typically, the `ExternalTrigger` type should be used. An internal trigger should only be used
-	/// when no other module is responsible for changing authority set.
-	type EpochChangeTrigger: EpochChangeTrigger;
-
-	/// The proof of key ownership, used for validating equivocation reports.
-	/// The proof must include the session index and validator count of the
-	/// session at which the equivocation occurred.
-	type KeyOwnerProof: Parameter + GetSessionNumber + GetValidatorCount;
-
-	/// The identification of a key owner, used when reporting equivocations.
-	type KeyOwnerIdentification: Parameter;
-
-	/// A system for proving ownership of keys, i.e. that a given key was part
-	/// of a validator set, needed for validating equivocation reports.
-	type KeyOwnerProofSystem: KeyOwnerProofSystem<
-		(KeyTypeId, AuthorityId),
-		Proof = Self::KeyOwnerProof,
-		IdentificationTuple = Self::KeyOwnerIdentification,
-	>;
-
-	/// The equivocation handling subsystem, defines methods to report an
-	/// offence (after the equivocation has been validated) and for submitting a
-	/// transaction to report an equivocation (from an offchain context).
-	/// NOTE: when enabling equivocation handling (i.e. this type isn't set to
-	/// `()`) you must use this pallet's `ValidateUnsigned` in the runtime
-	/// definition.
-	type HandleEquivocation: HandleEquivocation<Self>;
-
-	type WeightInfo: WeightInfo;
-}
+pub use pallet::*;
 
 pub trait WeightInfo {
 	fn plan_config_change() -> Weight;
@@ -137,11 +89,11 @@ pub struct SameAuthoritiesForever;
 
 impl EpochChangeTrigger for SameAuthoritiesForever {
 	fn trigger<T: Config>(now: T::BlockNumber) {
-		if <Module<T>>::should_epoch_change(now) {
-			let authorities = <Module<T>>::authorities();
+		if <Pallet<T>>::should_epoch_change(now) {
+			let authorities = <Pallet<T>>::authorities();
 			let next_authorities = authorities.clone();
 
-			<Module<T>>::enact_epoch_change(authorities, next_authorities);
+			<Pallet<T>>::enact_epoch_change(authorities, next_authorities);
 		}
 	}
 }
@@ -150,8 +102,70 @@ const UNDER_CONSTRUCTION_SEGMENT_LENGTH: usize = 256;
 
 type MaybeRandomness = Option<schnorrkel::Randomness>;
 
-decl_error! {
-	pub enum Error for Module<T: Config> {
+#[frame_support::pallet]
+pub mod pallet {
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+	use super::*;
+
+	/// The BABE Pallet
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(_);
+
+	#[pallet::config]
+	#[pallet::disable_frame_system_supertrait_check]
+	pub trait Config: pallet_timestamp::Config {
+		/// The amount of time, in slots, that each epoch should last.
+		/// NOTE: Currently it is not possible to change the epoch duration after
+		/// the chain has started. Attempting to do so will brick block production.
+		#[pallet::constant]
+		type EpochDuration: Get<u64>;
+
+		/// The expected average block time at which BABE should be creating
+		/// blocks. Since BABE is probabilistic it is not trivial to figure out
+		/// what the expected average block time should be based on the slot
+		/// duration and the security parameter `c` (where `1 - c` represents
+		/// the probability of a slot being empty).
+		#[pallet::constant]
+		type ExpectedBlockTime: Get<Self::Moment>;
+
+		/// BABE requires some logic to be triggered on every block to query for whether an epoch
+		/// has ended and to perform the transition to the next epoch.
+		///
+		/// Typically, the `ExternalTrigger` type should be used. An internal trigger should only be used
+		/// when no other module is responsible for changing authority set.
+		type EpochChangeTrigger: EpochChangeTrigger;
+
+		/// The proof of key ownership, used for validating equivocation reports.
+		/// The proof must include the session index and validator count of the
+		/// session at which the equivocation occurred.
+		type KeyOwnerProof: Parameter + GetSessionNumber + GetValidatorCount;
+
+		/// The identification of a key owner, used when reporting equivocations.
+		type KeyOwnerIdentification: Parameter;
+
+		/// A system for proving ownership of keys, i.e. that a given key was part
+		/// of a validator set, needed for validating equivocation reports.
+		type KeyOwnerProofSystem: KeyOwnerProofSystem<
+			(KeyTypeId, AuthorityId),
+			Proof = Self::KeyOwnerProof,
+			IdentificationTuple = Self::KeyOwnerIdentification,
+		>;
+
+		/// The equivocation handling subsystem, defines methods to report an
+		/// offence (after the equivocation has been validated) and for submitting a
+		/// transaction to report an equivocation (from an offchain context).
+		/// NOTE: when enabling equivocation handling (i.e. this type isn't set to
+		/// `()`) you must use this pallet's `ValidateUnsigned` in the runtime
+		/// definition.
+		type HandleEquivocation: HandleEquivocation<Self>;
+
+		type WeightInfo: WeightInfo;
+	}
+
+	#[pallet::error]
+	pub enum Error<T> {
 		/// An equivocation proof provided as part of an equivocation report is invalid.
 		InvalidEquivocationProof,
 		/// A key ownership proof provided as part of an equivocation report is invalid.
@@ -159,150 +173,189 @@ decl_error! {
 		/// A given equivocation report is valid but already previously reported.
 		DuplicateOffenceReport,
 	}
-}
 
-decl_storage! {
-	trait Store for Module<T: Config> as Babe {
-		/// Current epoch index.
-		pub EpochIndex get(fn epoch_index): u64;
+	/// Current epoch index.
+	#[pallet::storage]
+	#[pallet::getter(fn epoch_index)]
+	pub type EpochIndex<T> = StorageValue<_, u64, ValueQuery>;
 
-		/// Current epoch authorities.
-		pub Authorities get(fn authorities): Vec<(AuthorityId, BabeAuthorityWeight)>;
+	/// Current epoch authorities.
+	#[pallet::storage]
+	#[pallet::getter(fn authorities)]
+	pub type Authorities<T> = StorageValue<_, Vec<(AuthorityId, BabeAuthorityWeight)>, ValueQuery>;
 
-		/// The slot at which the first epoch actually started. This is 0
-		/// until the first block of the chain.
-		pub GenesisSlot get(fn genesis_slot): Slot;
+	/// The slot at which the first epoch actually started. This is 0
+	/// until the first block of the chain.
+	#[pallet::storage]
+	#[pallet::getter(fn genesis_slot)]
+	pub type GenesisSlot<T> = StorageValue<_, Slot, ValueQuery>;
 
-		/// Current slot number.
-		pub CurrentSlot get(fn current_slot): Slot;
+	/// Current slot number.
+	#[pallet::storage]
+	#[pallet::getter(fn current_slot)]
+	pub type CurrentSlot<T> = StorageValue<_, Slot, ValueQuery>;
 
-		/// The epoch randomness for the *current* epoch.
-		///
-		/// # Security
-		///
-		/// This MUST NOT be used for gambling, as it can be influenced by a
-		/// malicious validator in the short term. It MAY be used in many
-		/// cryptographic protocols, however, so long as one remembers that this
-		/// (like everything else on-chain) it is public. For example, it can be
-		/// used where a number is needed that cannot have been chosen by an
-		/// adversary, for purposes such as public-coin zero-knowledge proofs.
-		// NOTE: the following fields don't use the constants to define the
-		// array size because the metadata API currently doesn't resolve the
-		// variable to its underlying value.
-		pub Randomness get(fn randomness): schnorrkel::Randomness;
-
-		/// Pending epoch configuration change that will be applied when the next epoch is enacted.
-		PendingEpochConfigChange: Option<NextConfigDescriptor>;
-
-		/// Next epoch randomness.
-		NextRandomness: schnorrkel::Randomness;
-
-		/// Next epoch authorities.
-		NextAuthorities: Vec<(AuthorityId, BabeAuthorityWeight)>;
-
-		/// Randomness under construction.
-		///
-		/// We make a tradeoff between storage accesses and list length.
-		/// We store the under-construction randomness in segments of up to
-		/// `UNDER_CONSTRUCTION_SEGMENT_LENGTH`.
-		///
-		/// Once a segment reaches this length, we begin the next one.
-		/// We reset all segments and return to `0` at the beginning of every
-		/// epoch.
-		SegmentIndex build(|_| 0): u32;
-
-		/// TWOX-NOTE: `SegmentIndex` is an increasing integer, so this is okay.
-		UnderConstruction: map hasher(twox_64_concat) u32 => Vec<schnorrkel::Randomness>;
-
-		/// Temporary value (cleared at block finalization) which is `Some`
-		/// if per-block initialization has already been called for current block.
-		Initialized get(fn initialized): Option<MaybeRandomness>;
-
-		/// Temporary value (cleared at block finalization) that includes the VRF output generated
-		/// at this block. This field should always be populated during block processing unless
-		/// secondary plain slots are enabled (which don't contain a VRF output).
-		AuthorVrfRandomness get(fn author_vrf_randomness): MaybeRandomness;
-
-		/// The block numbers when the last and current epoch have started, respectively `N-1` and
-		/// `N`.
-		/// NOTE: We track this is in order to annotate the block number when a given pool of
-		/// entropy was fixed (i.e. it was known to chain observers). Since epochs are defined in
-		/// slots, which may be skipped, the block numbers may not line up with the slot numbers.
-		EpochStart: (T::BlockNumber, T::BlockNumber);
-
-		/// How late the current block is compared to its parent.
-		///
-		/// This entry is populated as part of block execution and is cleaned up
-		/// on block finalization. Querying this storage entry outside of block
-		/// execution context should always yield zero.
-		Lateness get(fn lateness): T::BlockNumber;
-
-		/// The configuration for the current epoch. Should never be `None` as it is initialized in genesis.
-		EpochConfig: Option<BabeEpochConfiguration>;
-
-		/// The configuration for the next epoch, `None` if the config will not change
-		/// (you can fallback to `EpochConfig` instead in that case).
-		NextEpochConfig: Option<BabeEpochConfiguration>;
-	}
-	add_extra_genesis {
-		config(authorities): Vec<(AuthorityId, BabeAuthorityWeight)>;
-		config(epoch_config): Option<BabeEpochConfiguration>;
-		build(|config| {
-			Module::<T>::initialize_authorities(&config.authorities);
-			EpochConfig::put(config.epoch_config.clone().expect("epoch_config must not be None"));
-		})
-	}
-}
+	/// The epoch randomness for the *current* epoch.
+	///
+	/// # Security
+	///
+	/// This MUST NOT be used for gambling, as it can be influenced by a
+	/// malicious validator in the short term. It MAY be used in many
+	/// cryptographic protocols, however, so long as one remembers that this
+	/// (like everything else on-chain) it is public. For example, it can be
+	/// used where a number is needed that cannot have been chosen by an
+	/// adversary, for purposes such as public-coin zero-knowledge proofs.
+	// NOTE: the following fields don't use the constants to define the
+	// array size because the metadata API currently doesn't resolve the
+	// variable to its underlying value.
+	#[pallet::storage]
+	#[pallet::getter(fn randomness)]
+	pub type Randomness<T> = StorageValue<_, schnorrkel::Randomness, ValueQuery>;
+
+	/// Pending epoch configuration change that will be applied when the next epoch is enacted.
+	#[pallet::storage]
+	pub(super) type PendingEpochConfigChange<T> = StorageValue<_, NextConfigDescriptor>;
+
+	/// Next epoch randomness.
+	#[pallet::storage]
+	pub(super) type NextRandomness<T> = StorageValue<_, schnorrkel::Randomness, ValueQuery>;
+
+	/// Next epoch authorities.
+	#[pallet::storage]
+	pub(super) type NextAuthorities<T> = StorageValue<
+		_,
+		Vec<(AuthorityId, BabeAuthorityWeight)>,
+		ValueQuery,
+	>;
 
-decl_module! {
-	/// The BABE Pallet
-	pub struct Module<T: Config> for enum Call where origin: T::Origin {
-		/// The number of **slots** that an epoch takes. We couple sessions to
-		/// epochs, i.e. we start a new session once the new epoch begins.
-		/// NOTE: Currently it is not possible to change the epoch duration
-		/// after the chain has started. Attempting to do so will brick block
-		/// production.
-		const EpochDuration: u64 = T::EpochDuration::get();
+	/// Randomness under construction.
+	///
+	/// We make a tradeoff between storage accesses and list length.
+	/// We store the under-construction randomness in segments of up to
+	/// `UNDER_CONSTRUCTION_SEGMENT_LENGTH`.
+	///
+	/// Once a segment reaches this length, we begin the next one.
+	/// We reset all segments and return to `0` at the beginning of every
+	/// epoch.
+	#[pallet::storage]
+	pub(super) type SegmentIndex<T> = StorageValue<_, u32, ValueQuery>;
+
+	/// TWOX-NOTE: `SegmentIndex` is an increasing integer, so this is okay.
+	#[pallet::storage]
+	pub(super) type UnderConstruction<T> = StorageMap<
+		_,
+		Twox64Concat,
+		u32,
+		Vec<schnorrkel::Randomness>,
+		ValueQuery,
+	>;
 
-		/// The expected average block time at which BABE should be creating
-		/// blocks. Since BABE is probabilistic it is not trivial to figure out
-		/// what the expected average block time should be based on the slot
-		/// duration and the security parameter `c` (where `1 - c` represents
-		/// the probability of a slot being empty).
-		const ExpectedBlockTime: T::Moment = T::ExpectedBlockTime::get();
+	/// Temporary value (cleared at block finalization) which is `Some`
+	/// if per-block initialization has already been called for current block.
+	#[pallet::storage]
+	#[pallet::getter(fn initialized)]
+	pub(super) type Initialized<T> = StorageValue<_, MaybeRandomness>;
+
+	/// Temporary value (cleared at block finalization) that includes the VRF output generated
+	/// at this block. This field should always be populated during block processing unless
+	/// secondary plain slots are enabled (which don't contain a VRF output).
+	#[pallet::storage]
+	#[pallet::getter(fn author_vrf_randomness)]
+	pub(super) type AuthorVrfRandomness<T> = StorageValue<_, MaybeRandomness, ValueQuery>;
+
+	/// The block numbers when the last and current epoch have started, respectively `N-1` and
+	/// `N`.
+	/// NOTE: We track this is in order to annotate the block number when a given pool of
+	/// entropy was fixed (i.e. it was known to chain observers). Since epochs are defined in
+	/// slots, which may be skipped, the block numbers may not line up with the slot numbers.
+	#[pallet::storage]
+	pub(super) type EpochStart<T: Config> = StorageValue<
+		_,
+		(T::BlockNumber, T::BlockNumber),
+		ValueQuery,
+	>;
+
+	/// How late the current block is compared to its parent.
+	///
+	/// This entry is populated as part of block execution and is cleaned up
+	/// on block finalization. Querying this storage entry outside of block
+	/// execution context should always yield zero.
+	#[pallet::storage]
+	#[pallet::getter(fn lateness)]
+	pub(super) type Lateness<T: Config> = StorageValue<_, T::BlockNumber, ValueQuery>;
+
+	/// The configuration for the current epoch. Should never be `None` as it is initialized in genesis.
+	#[pallet::storage]
+	pub(super) type EpochConfig<T> = StorageValue<_, BabeEpochConfiguration>;
+
+	/// The configuration for the next epoch, `None` if the config will not change
+	/// (you can fallback to `EpochConfig` instead in that case).
+	#[pallet::storage]
+	pub(super) type NextEpochConfig<T> = StorageValue<_, BabeEpochConfiguration>;
+
+	#[pallet::genesis_config]
+	pub struct GenesisConfig {
+		pub authorities: Vec<(AuthorityId, BabeAuthorityWeight)>,
+		pub epoch_config: Option<BabeEpochConfiguration>,
+	}
+
+	#[cfg(feature = "std")]
+	impl Default for GenesisConfig {
+		fn default() -> Self {
+			GenesisConfig {
+				authorities: Default::default(),
+				epoch_config: Default::default(),
+			}
+		}
+	}
 
+	#[pallet::genesis_build]
+	impl<T: Config> GenesisBuild<T> for GenesisConfig {
+		fn build(&self) {
+			SegmentIndex::<T>::put(0);
+			Pallet::<T>::initialize_authorities(&self.authorities);
+			EpochConfig::<T>::put(self.epoch_config.clone().expect("epoch_config must not be None"));
+		}
+	}
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
 		/// Initialization
-		fn on_initialize(now: T::BlockNumber) -> Weight {
+		fn on_initialize(now: BlockNumberFor<T>) -> Weight {
 			Self::do_initialize(now);
-
 			0
 		}
 
 		/// Block finalization
-		fn on_finalize() {
+		fn on_finalize(_n: BlockNumberFor<T>) {
 			// at the end of the block, we can safely include the new VRF output
 			// from this block into the under-construction randomness. If we've determined
 			// that this block was the first in a new epoch, the changeover logic has
 			// already occurred at this point, so the under-construction randomness
 			// will only contain outputs from the right epoch.
-			if let Some(Some(randomness)) = Initialized::take() {
+			if let Some(Some(randomness)) = Initialized::<T>::take() {
 				Self::deposit_randomness(&randomness);
 			}
 
 			// The stored author generated VRF output is ephemeral.
-			AuthorVrfRandomness::kill();
+			AuthorVrfRandomness::<T>::kill();
 
 			// remove temporary "environment" entry from storage
 			Lateness::<T>::kill();
 		}
+	}
 
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
 		/// Report authority equivocation/misbehavior. This method will verify
 		/// the equivocation proof and validate the given key ownership proof
 		/// against the extracted offender. If both are valid, the offence will
 		/// be reported.
-		#[weight = <T as Config>::WeightInfo::report_equivocation(key_owner_proof.validator_count())]
-		fn report_equivocation(
-			origin,
+		#[pallet::weight(<T as Config>::WeightInfo::report_equivocation(
+			key_owner_proof.validator_count(),
+		))]
+		pub fn report_equivocation(
+			origin: OriginFor<T>,
 			equivocation_proof: EquivocationProof<T::Header>,
 			key_owner_proof: T::KeyOwnerProof,
 		) -> DispatchResultWithPostInfo {
@@ -323,9 +376,11 @@ decl_module! {
 		/// block authors will call it (validated in `ValidateUnsigned`), as such
 		/// if the block author is defined it will be defined as the equivocation
 		/// reporter.
-		#[weight = <T as Config>::WeightInfo::report_equivocation(key_owner_proof.validator_count())]
-		fn report_equivocation_unsigned(
-			origin,
+		#[pallet::weight(<T as Config>::WeightInfo::report_equivocation(
+			key_owner_proof.validator_count(),
+		))]
+		pub fn report_equivocation_unsigned(
+			origin: OriginFor<T>,
 			equivocation_proof: EquivocationProof<T::Header>,
 			key_owner_proof: T::KeyOwnerProof,
 		) -> DispatchResultWithPostInfo {
@@ -342,13 +397,14 @@ decl_module! {
 		/// the next call to `enact_epoch_change`. The config will be activated one epoch after.
 		/// Multiple calls to this method will replace any existing planned config change that had
 		/// not been enacted yet.
-		#[weight = <T as Config>::WeightInfo::plan_config_change()]
-		fn plan_config_change(
-			origin,
+		#[pallet::weight(<T as Config>::WeightInfo::plan_config_change())]
+		pub fn plan_config_change(
+			origin: OriginFor<T>,
 			config: NextConfigDescriptor,
-		) {
+		) -> DispatchResultWithPostInfo {
 			ensure_root(origin)?;
-			PendingEpochConfigChange::put(config);
+			PendingEpochConfigChange::<T>::put(config);
+			Ok(().into())
 		}
 	}
 }
@@ -356,7 +412,7 @@ decl_module! {
 /// A BABE public key
 pub type BabeKey = [u8; PUBLIC_KEY_LENGTH];
 
-impl<T: Config> FindAuthor<u32> for Module<T> {
+impl<T: Config> FindAuthor<u32> for Pallet<T> {
 	fn find_author<'a, I>(digests: I) -> Option<u32> where
 		I: 'a + IntoIterator<Item=(ConsensusEngineId, &'a [u8])>
 	{
@@ -371,15 +427,15 @@ impl<T: Config> FindAuthor<u32> for Module<T> {
 	}
 }
 
-impl<T: Config> IsMember<AuthorityId> for Module<T> {
+impl<T: Config> IsMember<AuthorityId> for Pallet<T> {
 	fn is_member(authority_id: &AuthorityId) -> bool {
-		<Module<T>>::authorities()
+		<Pallet<T>>::authorities()
 			.iter()
 			.any(|id| &id.0 == authority_id)
 	}
 }
 
-impl<T: Config> pallet_session::ShouldEndSession<T::BlockNumber> for Module<T> {
+impl<T: Config> pallet_session::ShouldEndSession<T::BlockNumber> for Pallet<T> {
 	fn should_end_session(now: T::BlockNumber) -> bool {
 		// it might be (and it is in current implementation) that session module is calling
 		// should_end_session() from it's own on_initialize() handler
@@ -391,7 +447,7 @@ impl<T: Config> pallet_session::ShouldEndSession<T::BlockNumber> for Module<T> {
 	}
 }
 
-impl<T: Config> Module<T> {
+impl<T: Config> Pallet<T> {
 	/// Determine the BABE slot duration based on the Timestamp module configuration.
 	pub fn slot_duration() -> T::Moment {
 		// we double the minimum block-period so each author can always propose within
@@ -411,7 +467,7 @@ impl<T: Config> Module<T> {
 		// the same randomness and validator set as signalled in the genesis,
 		// so we don't rotate the epoch.
 		now != One::one() && {
-			let diff = CurrentSlot::get().saturating_sub(Self::current_epoch_start());
+			let diff = CurrentSlot::<T>::get().saturating_sub(Self::current_epoch_start());
 			*diff >= T::EpochDuration::get()
 		}
 	}
@@ -435,7 +491,7 @@ impl<T: Config> Module<T> {
 	pub fn next_expected_epoch_change(now: T::BlockNumber) -> Option<T::BlockNumber> {
 		let next_slot = Self::current_epoch_start().saturating_add(T::EpochDuration::get());
 		next_slot
-			.checked_sub(*CurrentSlot::get())
+			.checked_sub(*CurrentSlot::<T>::get())
 			.map(|slots_remaining| {
 				// This is a best effort guess. Drifts in the slot/block ratio will cause errors here.
 				let blocks_remaining: T::BlockNumber = slots_remaining.saturated_into();
@@ -457,12 +513,12 @@ impl<T: Config> Module<T> {
 		debug_assert!(Self::initialized().is_some());
 
 		// Update epoch index
-		let epoch_index = EpochIndex::get()
+		let epoch_index = EpochIndex::<T>::get()
 			.checked_add(1)
 			.expect("epoch indices will never reach 2^64 before the death of the universe; qed");
 
-		EpochIndex::put(epoch_index);
-		Authorities::put(authorities);
+		EpochIndex::<T>::put(epoch_index);
+		Authorities::<T>::put(authorities);
 
 		// Update epoch randomness.
 		let next_epoch_index = epoch_index
@@ -472,10 +528,10 @@ impl<T: Config> Module<T> {
 		// Returns randomness for the current epoch and computes the *next*
 		// epoch randomness.
 		let randomness = Self::randomness_change_epoch(next_epoch_index);
-		Randomness::put(randomness);
+		Randomness::<T>::put(randomness);
 
 		// Update the next epoch authorities.
-		NextAuthorities::put(&next_authorities);
+		NextAuthorities::<T>::put(&next_authorities);
 
 		// Update the start blocks of the previous and new current epoch.
 		<EpochStart<T>>::mutate(|(previous_epoch_start_block, current_epoch_start_block)| {
@@ -485,7 +541,7 @@ impl<T: Config> Module<T> {
 
 		// After we update the current epoch, we signal the *next* epoch change
 		// so that nodes can track changes.
-		let next_randomness = NextRandomness::get();
+		let next_randomness = NextRandomness::<T>::get();
 
 		let next_epoch = NextEpochDescriptor {
 			authorities: next_authorities,
@@ -493,14 +549,14 @@ impl<T: Config> Module<T> {
 		};
 		Self::deposit_consensus(ConsensusLog::NextEpochData(next_epoch));
 
-		if let Some(next_config) = NextEpochConfig::get() {
-			EpochConfig::put(next_config);
+		if let Some(next_config) = NextEpochConfig::<T>::get() {
+			EpochConfig::<T>::put(next_config);
 		}
 
-		if let Some(pending_epoch_config_change) = PendingEpochConfigChange::take() {
+		if let Some(pending_epoch_config_change) = PendingEpochConfigChange::<T>::take() {
 			let next_epoch_config: BabeEpochConfiguration =
 				pending_epoch_config_change.clone().into();
-			NextEpochConfig::put(next_epoch_config);
+			NextEpochConfig::<T>::put(next_epoch_config);
 
 			Self::deposit_consensus(ConsensusLog::NextConfigData(pending_epoch_config_change));
 		}
@@ -510,25 +566,25 @@ impl<T: Config> Module<T> {
 	/// give correct results after `do_initialize` of the first block
 	/// in the chain (as its result is based off of `GenesisSlot`).
 	pub fn current_epoch_start() -> Slot {
-		Self::epoch_start(EpochIndex::get())
+		Self::epoch_start(EpochIndex::<T>::get())
 	}
 
 	/// Produces information about the current epoch.
 	pub fn current_epoch() -> Epoch {
 		Epoch {
-			epoch_index: EpochIndex::get(),
+			epoch_index: EpochIndex::<T>::get(),
 			start_slot: Self::current_epoch_start(),
 			duration: T::EpochDuration::get(),
 			authorities: Self::authorities(),
 			randomness: Self::randomness(),
-			config: EpochConfig::get().expect("EpochConfig is initialized in genesis; we never `take` or `kill` it; qed"),
+			config: EpochConfig::<T>::get().expect("EpochConfig is initialized in genesis; we never `take` or `kill` it; qed"),
 		}
 	}
 
 	/// Produces information about the next epoch (which was already previously
 	/// announced).
 	pub fn next_epoch() -> Epoch {
-		let next_epoch_index = EpochIndex::get().checked_add(1).expect(
+		let next_epoch_index = EpochIndex::<T>::get().checked_add(1).expect(
 			"epoch index is u64; it is always only incremented by one; \
 			 if u64 is not enough we should crash for safety; qed.",
 		);
@@ -537,10 +593,10 @@ impl<T: Config> Module<T> {
 			epoch_index: next_epoch_index,
 			start_slot: Self::epoch_start(next_epoch_index),
 			duration: T::EpochDuration::get(),
-			authorities: NextAuthorities::get(),
-			randomness: NextRandomness::get(),
-			config: NextEpochConfig::get().unwrap_or_else(|| {
-				EpochConfig::get().expect("EpochConfig is initialized in genesis; we never `take` or `kill` it; qed")
+			authorities: NextAuthorities::<T>::get(),
+			randomness: NextRandomness::<T>::get(),
+			config: NextEpochConfig::<T>::get().unwrap_or_else(|| {
+				EpochConfig::<T>::get().expect("EpochConfig is initialized in genesis; we never `take` or `kill` it; qed")
 			}),
 		}
 	}
@@ -555,26 +611,26 @@ impl<T: Config> Module<T> {
 			.checked_mul(T::EpochDuration::get())
 			.expect(PROOF);
 
-		epoch_start.checked_add(*GenesisSlot::get()).expect(PROOF).into()
+		epoch_start.checked_add(*GenesisSlot::<T>::get()).expect(PROOF).into()
 	}
 
 	fn deposit_consensus<U: Encode>(new: U) {
 		let log: DigestItem<T::Hash> = DigestItem::Consensus(BABE_ENGINE_ID, new.encode());
-		<frame_system::Module<T>>::deposit_log(log.into())
+		<frame_system::Pallet<T>>::deposit_log(log.into())
 	}
 
 	fn deposit_randomness(randomness: &schnorrkel::Randomness) {
-		let segment_idx = <SegmentIndex>::get();
-		let mut segment = <UnderConstruction>::get(&segment_idx);
+		let segment_idx = SegmentIndex::<T>::get();
+		let mut segment = UnderConstruction::<T>::get(&segment_idx);
 		if segment.len() < UNDER_CONSTRUCTION_SEGMENT_LENGTH {
 			// push onto current segment: not full.
 			segment.push(*randomness);
-			<UnderConstruction>::insert(&segment_idx, &segment);
+			UnderConstruction::<T>::insert(&segment_idx, &segment);
 		} else {
 			// move onto the next segment and update the index.
 			let segment_idx = segment_idx + 1;
-			<UnderConstruction>::insert(&segment_idx, &vec![randomness.clone()]);
-			<SegmentIndex>::put(&segment_idx);
+			UnderConstruction::<T>::insert(&segment_idx, &vec![randomness.clone()]);
+			SegmentIndex::<T>::put(&segment_idx);
 		}
 	}
 
@@ -586,7 +642,7 @@ impl<T: Config> Module<T> {
 			return;
 		}
 
-		let maybe_pre_digest: Option<PreDigest> = <frame_system::Module<T>>::digest()
+		let maybe_pre_digest: Option<PreDigest> = <frame_system::Pallet<T>>::digest()
 			.logs
 			.iter()
 			.filter_map(|s| s.as_pre_runtime())
@@ -603,9 +659,9 @@ impl<T: Config> Module<T> {
 			// on the first non-zero block (i.e. block #1)
 			// this is where the first epoch (epoch #0) actually starts.
 			// we need to adjust internal storage accordingly.
-			if *GenesisSlot::get() == 0 {
-				GenesisSlot::put(digest.slot());
-				debug_assert_ne!(*GenesisSlot::get(), 0);
+			if *GenesisSlot::<T>::get() == 0 {
+				GenesisSlot::<T>::put(digest.slot());
+				debug_assert_ne!(*GenesisSlot::<T>::get(), 0);
 
 				// deposit a log because this is the first block in epoch #0
 				// we use the same values as genesis because we haven't collected any
@@ -622,11 +678,11 @@ impl<T: Config> Module<T> {
 			let current_slot = digest.slot();
 
 			// how many slots were skipped between current and last block
-			let lateness = current_slot.saturating_sub(CurrentSlot::get() + 1);
+			let lateness = current_slot.saturating_sub(CurrentSlot::<T>::get() + 1);
 			let lateness = T::BlockNumber::from(*lateness as u32);
 
 			Lateness::<T>::put(lateness);
-			CurrentSlot::put(current_slot);
+			CurrentSlot::<T>::put(current_slot);
 
 			let authority_index = digest.authority_index();
 
@@ -635,7 +691,7 @@ impl<T: Config> Module<T> {
 				.vrf_output()
 				.and_then(|vrf_output| {
 					// Reconstruct the bytes of VRFInOut using the authority id.
-					Authorities::get()
+					Authorities::<T>::get()
 						.get(authority_index as usize)
 						.and_then(|author| {
 							schnorrkel::PublicKey::from_bytes(author.0.as_slice()).ok()
@@ -644,7 +700,7 @@ impl<T: Config> Module<T> {
 							let transcript = sp_consensus_babe::make_transcript(
 								&Self::randomness(),
 								current_slot,
-								EpochIndex::get(),
+								EpochIndex::<T>::get(),
 							);
 
 							vrf_output.0.attach_input_hash(
@@ -661,11 +717,11 @@ impl<T: Config> Module<T> {
 		// For primary VRF output we place it in the `Initialized` storage
 		// item and it'll be put onto the under-construction randomness later,
 		// once we've decided which epoch this block is in.
-		Initialized::put(if is_primary { maybe_randomness } else { None });
+		Initialized::<T>::put(if is_primary { maybe_randomness } else { None });
 
 		// Place either the primary or secondary VRF output into the
 		// `AuthorVrfRandomness` storage item.
-		AuthorVrfRandomness::put(maybe_randomness);
+		AuthorVrfRandomness::<T>::put(maybe_randomness);
 
 		// enact epoch change, if necessary.
 		T::EpochChangeTrigger::trigger::<T>(now)
@@ -674,8 +730,8 @@ impl<T: Config> Module<T> {
 	/// Call this function exactly once when an epoch changes, to update the
 	/// randomness. Returns the new randomness.
 	fn randomness_change_epoch(next_epoch_index: u64) -> schnorrkel::Randomness {
-		let this_randomness = NextRandomness::get();
-		let segment_idx: u32 = <SegmentIndex>::mutate(|s| sp_std::mem::replace(s, 0));
+		let this_randomness = NextRandomness::<T>::get();
+		let segment_idx: u32 = SegmentIndex::<T>::mutate(|s| sp_std::mem::replace(s, 0));
 
 		// overestimate to the segment being full.
 		let rho_size = segment_idx.saturating_add(1) as usize * UNDER_CONSTRUCTION_SEGMENT_LENGTH;
@@ -683,18 +739,18 @@ impl<T: Config> Module<T> {
 		let next_randomness = compute_randomness(
 			this_randomness,
 			next_epoch_index,
-			(0..segment_idx).flat_map(|i| <UnderConstruction>::take(&i)),
+			(0..segment_idx).flat_map(|i| UnderConstruction::<T>::take(&i)),
 			Some(rho_size),
 		);
-		NextRandomness::put(&next_randomness);
+		NextRandomness::<T>::put(&next_randomness);
 		this_randomness
 	}
 
 	fn initialize_authorities(authorities: &[(AuthorityId, BabeAuthorityWeight)]) {
 		if !authorities.is_empty() {
-			assert!(Authorities::get().is_empty(), "Authorities are already initialized!");
-			Authorities::put(authorities);
-			NextAuthorities::put(authorities);
+			assert!(Authorities::<T>::get().is_empty(), "Authorities are already initialized!");
+			Authorities::<T>::put(authorities);
+			NextAuthorities::<T>::put(authorities);
 		}
 	}
 
@@ -714,7 +770,7 @@ impl<T: Config> Module<T> {
 		let validator_set_count = key_owner_proof.validator_count();
 		let session_index = key_owner_proof.session();
 
-		let epoch_index = (*slot.saturating_sub(GenesisSlot::get()) / T::EpochDuration::get())
+		let epoch_index = (*slot.saturating_sub(GenesisSlot::<T>::get()) / T::EpochDuration::get())
 			.saturated_into::<u32>();
 
 		// check that the slot number is consistent with the session index
@@ -763,7 +819,7 @@ impl<T: Config> Module<T> {
 	}
 }
 
-impl<T: Config> OnTimestampSet<T::Moment> for Module<T> {
+impl<T: Config> OnTimestampSet<T::Moment> for Pallet<T> {
 	fn on_timestamp_set(moment: T::Moment) {
 		let slot_duration = Self::slot_duration();
 		assert!(!slot_duration.is_zero(), "Babe slot duration cannot be zero.");
@@ -771,17 +827,17 @@ impl<T: Config> OnTimestampSet<T::Moment> for Module<T> {
 		let timestamp_slot = moment / slot_duration;
 		let timestamp_slot = Slot::from(timestamp_slot.saturated_into::<u64>());
 
-		assert!(CurrentSlot::get() == timestamp_slot, "Timestamp slot must match `CurrentSlot`");
+		assert!(CurrentSlot::<T>::get() == timestamp_slot, "Timestamp slot must match `CurrentSlot`");
 	}
 }
 
-impl<T: Config> frame_support::traits::EstimateNextSessionRotation<T::BlockNumber> for Module<T> {
+impl<T: Config> frame_support::traits::EstimateNextSessionRotation<T::BlockNumber> for Pallet<T> {
 	fn average_session_length() -> T::BlockNumber {
 		T::EpochDuration::get().saturated_into()
 	}
 
 	fn estimate_current_session_progress(_now: T::BlockNumber) -> (Option<Percent>, Weight) {
-		let elapsed = CurrentSlot::get().saturating_sub(Self::current_epoch_start()) + 1;
+		let elapsed = CurrentSlot::<T>::get().saturating_sub(Self::current_epoch_start()) + 1;
 
 		(
 			Some(Percent::from_rational(
@@ -802,17 +858,17 @@ impl<T: Config> frame_support::traits::EstimateNextSessionRotation<T::BlockNumbe
 	}
 }
 
-impl<T: Config> frame_support::traits::Lateness<T::BlockNumber> for Module<T> {
+impl<T: Config> frame_support::traits::Lateness<T::BlockNumber> for Pallet<T> {
 	fn lateness(&self) -> T::BlockNumber {
 		Self::lateness()
 	}
 }
 
-impl<T: Config> sp_runtime::BoundToRuntimeAppPublic for Module<T> {
+impl<T: Config> sp_runtime::BoundToRuntimeAppPublic for Pallet<T> {
 	type Public = AuthorityId;
 }
 
-impl<T: Config> OneSessionHandler<T::AccountId> for Module<T> {
+impl<T: Config> OneSessionHandler<T::AccountId> for Pallet<T> {
 	type Key = AuthorityId;
 
 	fn on_genesis_session<'a, I: 'a>(validators: I)
@@ -890,7 +946,7 @@ pub mod migrations {
 		let mut reads = 0;
 
 		if let Some(pending_change) = OldNextEpochConfig::<T>::get() {
-			PendingEpochConfigChange::put(pending_change);
+			PendingEpochConfigChange::<T>::put(pending_change);
 
 			writes += 1;
 		}
@@ -899,8 +955,8 @@ pub mod migrations {
 
 		OldNextEpochConfig::<T>::kill();
 
-		EpochConfig::put(epoch_config.clone());
-		NextEpochConfig::put(epoch_config);
+		EpochConfig::<T>::put(epoch_config.clone());
+		NextEpochConfig::<T>::put(epoch_config);
 
 		writes += 3;
 
diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index 487535121ff1..4a5932132781 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -27,7 +27,7 @@ use sp_runtime::{
 };
 use frame_system::InitKind;
 use frame_support::{
-	parameter_types, StorageValue,
+	parameter_types,
 	traits::{KeyOwnerProofSystem, OnInitialize},
 	weights::Weight,
 };
@@ -451,7 +451,7 @@ pub fn generate_equivocation_proof(
 	use sp_consensus_babe::digests::CompatibleDigestItem;
 
 	let current_block = System::block_number();
-	let current_slot = CurrentSlot::get();
+	let current_slot = CurrentSlot::<Test>::get();
 
 	let make_header = || {
 		let parent_hash = System::parent_hash();
diff --git a/frame/babe/src/randomness.rs b/frame/babe/src/randomness.rs
index 71412a962bec..16846c455986 100644
--- a/frame/babe/src/randomness.rs
+++ b/frame/babe/src/randomness.rs
@@ -21,7 +21,7 @@
 use super::{
 	AuthorVrfRandomness, Config, EpochStart, NextRandomness, Randomness, VRF_OUTPUT_LENGTH,
 };
-use frame_support::{traits::Randomness as RandomnessT, StorageValue};
+use frame_support::{traits::Randomness as RandomnessT};
 use sp_runtime::traits::Hash;
 
 /// Randomness usable by consensus protocols that **depend** upon finality and take action
@@ -117,7 +117,7 @@ impl<T: Config> RandomnessT<T::Hash, T::BlockNumber> for RandomnessFromTwoEpochs
 	fn random(subject: &[u8]) -> (T::Hash, T::BlockNumber) {
 		let mut subject = subject.to_vec();
 		subject.reserve(VRF_OUTPUT_LENGTH);
-		subject.extend_from_slice(&Randomness::get()[..]);
+		subject.extend_from_slice(&Randomness::<T>::get()[..]);
 
 		(T::Hashing::hash(&subject[..]), EpochStart::<T>::get().0)
 	}
@@ -127,7 +127,7 @@ impl<T: Config> RandomnessT<T::Hash, T::BlockNumber> for RandomnessFromOneEpochA
 	fn random(subject: &[u8]) -> (T::Hash, T::BlockNumber) {
 		let mut subject = subject.to_vec();
 		subject.reserve(VRF_OUTPUT_LENGTH);
-		subject.extend_from_slice(&NextRandomness::get()[..]);
+		subject.extend_from_slice(&NextRandomness::<T>::get()[..]);
 
 		(T::Hashing::hash(&subject[..]), EpochStart::<T>::get().1)
 	}
@@ -135,7 +135,7 @@ impl<T: Config> RandomnessT<T::Hash, T::BlockNumber> for RandomnessFromOneEpochA
 
 impl<T: Config> RandomnessT<Option<T::Hash>, T::BlockNumber> for CurrentBlockRandomness<T> {
 	fn random(subject: &[u8]) -> (Option<T::Hash>, T::BlockNumber) {
-		let random = AuthorVrfRandomness::get().map(|random| {
+		let random = AuthorVrfRandomness::<T>::get().map(|random| {
 			let mut subject = subject.to_vec();
 			subject.reserve(VRF_OUTPUT_LENGTH);
 			subject.extend_from_slice(&random);
diff --git a/frame/babe/src/tests.rs b/frame/babe/src/tests.rs
index 0ccc3db4df0b..e9966ddb75dd 100644
--- a/frame/babe/src/tests.rs
+++ b/frame/babe/src/tests.rs
@@ -19,7 +19,7 @@
 
 use super::{Call, *};
 use frame_support::{
-	assert_err, assert_ok,
+	assert_err, assert_ok, assert_noop,
 	traits::{Currency, EstimateNextSessionRotation, OnFinalize},
 	weights::{GetDispatchInfo, Pays},
 };
@@ -92,11 +92,11 @@ fn first_block_epoch_zero_start() {
 		Babe::on_finalize(1);
 		let header = System::finalize();
 
-		assert_eq!(SegmentIndex::get(), 0);
-		assert_eq!(UnderConstruction::get(0), vec![vrf_randomness]);
+		assert_eq!(SegmentIndex::<Test>::get(), 0);
+		assert_eq!(UnderConstruction::<Test>::get(0), vec![vrf_randomness]);
 		assert_eq!(Babe::randomness(), [0; 32]);
 		assert_eq!(Babe::author_vrf_randomness(), None);
-		assert_eq!(NextRandomness::get(), [0; 32]);
+		assert_eq!(NextRandomness::<Test>::get(), [0; 32]);
 
 		assert_eq!(header.digest.logs.len(), 2);
 		assert_eq!(pre_digest.logs.len(), 1);
@@ -278,10 +278,10 @@ fn can_enact_next_config() {
 			allowed_slots: sp_consensus_babe::AllowedSlots::PrimarySlots,
 		};
 
-		EpochConfig::put(current_config);
-		NextEpochConfig::put(next_config.clone());
+		EpochConfig::<Test>::put(current_config);
+		NextEpochConfig::<Test>::put(next_config.clone());
 
-		assert_eq!(NextEpochConfig::get(), Some(next_config.clone()));
+		assert_eq!(NextEpochConfig::<Test>::get(), Some(next_config.clone()));
 
 		Babe::plan_config_change(
 			Origin::root(),
@@ -295,8 +295,8 @@ fn can_enact_next_config() {
 		Babe::on_finalize(9);
 		let header = System::finalize();
 
-		assert_eq!(EpochConfig::get(), Some(next_config));
-		assert_eq!(NextEpochConfig::get(), Some(next_next_config.clone()));
+		assert_eq!(EpochConfig::<Test>::get(), Some(next_config));
+		assert_eq!(NextEpochConfig::<Test>::get(), Some(next_next_config.clone()));
 
 		let consensus_log = sp_consensus_babe::ConsensusLog::NextConfigData(
 			NextConfigDescriptor::V1 {
@@ -325,14 +325,14 @@ fn only_root_can_enact_config_change() {
 			next_config.clone(),
 		);
 
-		assert_eq!(res, Err(DispatchError::BadOrigin));
+		assert_noop!(res, DispatchError::BadOrigin);
 
 		let res = Babe::plan_config_change(
 			Origin::signed(1),
 			next_config.clone(),
 		);
 
-		assert_eq!(res, Err(DispatchError::BadOrigin));
+		assert_noop!(res, DispatchError::BadOrigin);
 
 		let res = Babe::plan_config_change(
 			Origin::root(),
@@ -346,7 +346,7 @@ fn only_root_can_enact_config_change() {
 #[test]
 fn can_fetch_current_and_next_epoch_data() {
 	new_test_ext(5).execute_with(|| {
-		EpochConfig::put(BabeEpochConfiguration {
+		EpochConfig::<Test>::put(BabeEpochConfiguration {
 			c: (1, 4),
 			allowed_slots: sp_consensus_babe::AllowedSlots::PrimarySlots,
 		});
@@ -444,7 +444,7 @@ fn report_equivocation_current_session_works() {
 		let equivocation_proof = generate_equivocation_proof(
 			offending_validator_index as u32,
 			&offending_authority_pair,
-			CurrentSlot::get(),
+			CurrentSlot::<Test>::get(),
 		);
 
 		// create the key ownership proof
@@ -518,7 +518,7 @@ fn report_equivocation_old_session_works() {
 		let equivocation_proof = generate_equivocation_proof(
 			offending_validator_index as u32,
 			&offending_authority_pair,
-			CurrentSlot::get(),
+			CurrentSlot::<Test>::get(),
 		);
 
 		// create the key ownership proof
@@ -584,7 +584,7 @@ fn report_equivocation_invalid_key_owner_proof() {
 		let equivocation_proof = generate_equivocation_proof(
 			offending_validator_index as u32,
 			&offending_authority_pair,
-			CurrentSlot::get(),
+			CurrentSlot::<Test>::get(),
 		);
 
 		// create the key ownership proof
@@ -664,7 +664,7 @@ fn report_equivocation_invalid_equivocation_proof() {
 		let mut equivocation_proof = generate_equivocation_proof(
 			offending_validator_index as u32,
 			&offending_authority_pair,
-			CurrentSlot::get(),
+			CurrentSlot::<Test>::get(),
 		);
 		equivocation_proof.second_header = equivocation_proof.first_header.clone();
 		assert_invalid_equivocation(equivocation_proof);
@@ -673,7 +673,7 @@ fn report_equivocation_invalid_equivocation_proof() {
 		let mut equivocation_proof = generate_equivocation_proof(
 			offending_validator_index as u32,
 			&offending_authority_pair,
-			CurrentSlot::get(),
+			CurrentSlot::<Test>::get(),
 		);
 		equivocation_proof.first_header.digest_mut().logs.remove(0);
 		assert_invalid_equivocation(equivocation_proof);
@@ -682,7 +682,7 @@ fn report_equivocation_invalid_equivocation_proof() {
 		let mut equivocation_proof = generate_equivocation_proof(
 			offending_validator_index as u32,
 			&offending_authority_pair,
-			CurrentSlot::get(),
+			CurrentSlot::<Test>::get(),
 		);
 		equivocation_proof.first_header.digest_mut().logs.remove(1);
 		assert_invalid_equivocation(equivocation_proof);
@@ -691,7 +691,7 @@ fn report_equivocation_invalid_equivocation_proof() {
 		let mut equivocation_proof = generate_equivocation_proof(
 			offending_validator_index as u32,
 			&offending_authority_pair,
-			CurrentSlot::get(),
+			CurrentSlot::<Test>::get(),
 		);
 		equivocation_proof.slot = Slot::from(0);
 		assert_invalid_equivocation(equivocation_proof.clone());
@@ -701,7 +701,7 @@ fn report_equivocation_invalid_equivocation_proof() {
 		let mut equivocation_proof = generate_equivocation_proof(
 			offending_validator_index as u32,
 			&offending_authority_pair,
-			CurrentSlot::get() + 1,
+			CurrentSlot::<Test>::get() + 1,
 		);
 
 		// use the header from the previous equivocation generated
@@ -714,7 +714,7 @@ fn report_equivocation_invalid_equivocation_proof() {
 		let mut equivocation_proof = generate_equivocation_proof(
 			offending_validator_index as u32,
 			&offending_authority_pair,
-			CurrentSlot::get() + 1,
+			CurrentSlot::<Test>::get() + 1,
 		);
 
 		// replace the seal digest with the digest from the
@@ -753,7 +753,7 @@ fn report_equivocation_validate_unsigned_prevents_duplicates() {
 		let equivocation_proof = generate_equivocation_proof(
 			offending_validator_index as u32,
 			&offending_authority_pair,
-			CurrentSlot::get(),
+			CurrentSlot::<Test>::get(),
 		);
 
 		let key = (
@@ -775,7 +775,7 @@ fn report_equivocation_validate_unsigned_prevents_duplicates() {
 		);
 
 		// the transaction is valid when passed as local
-		let tx_tag = (offending_authority_pair.public(), CurrentSlot::get());
+		let tx_tag = (offending_authority_pair.public(), CurrentSlot::<Test>::get());
 		assert_eq!(
 			<Babe as sp_runtime::traits::ValidateUnsigned>::validate_unsigned(
 				TransactionSource::Local,
@@ -848,7 +848,7 @@ fn valid_equivocation_reports_dont_pay_fees() {
 
 		// generate an equivocation proof.
 		let equivocation_proof =
-			generate_equivocation_proof(0, &offending_authority_pair, CurrentSlot::get());
+			generate_equivocation_proof(0, &offending_authority_pair, CurrentSlot::<Test>::get());
 
 		// create the key ownership proof.
 		let key_owner_proof = Historical::prove((
@@ -941,7 +941,7 @@ fn add_epoch_configurations_migration_works() {
 			&[],
 		).is_none());
 
-		assert_eq!(EpochConfig::get(), Some(current_epoch));
-		assert_eq!(PendingEpochConfigChange::get(), Some(next_config_descriptor));
+		assert_eq!(EpochConfig::<Test>::get(), Some(current_epoch));
+		assert_eq!(PendingEpochConfigChange::<Test>::get(), Some(next_config_descriptor));
 	});
 }

From 211be1d5f477fa025f7813238b95a1524ad4212f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= <jon.haggblad@gmail.com>
Date: Wed, 17 Mar 2021 22:18:16 +0100
Subject: [PATCH 0520/1194] Storing multiple Justifications per block (#7640)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* primitives/runtime: initial changes on supporting multiple Justifications

* primitives/runtime: make Justifications strongly typed

* Encode/decode Justifications

* primitives/runtime: add Justification type

* backend: apply_finality and finalize_block takes a single Justification

* manual-seal: create engine id and let rpc take encoded justification

* backend: skeleton functions for appending justifications

* backend: initial implementation append_justification

Initial implementation of append_justification on the Backend trait, and also remove unused skeleton
functions for append_justificaton on Finaziler trait.
k

* backend: guard against duplicate consensus engine id

* client/db: add check for block finality

* client/api: add append_justification to in_mem db

* client/light: add no-op append_justification

* network: fix decode call for Justification

* network: only send a single Justification in BlockData

* network: minor comment update

* protocol: update field names to distinguish single justification

* client: further field renames to plural

* client: update function names to plural justifications

* client/db: upgrade existing database for new format

* network: remove dependency on grandpa crate

* db: fix check for finalized block

* grandpa: check for multiple grandpa justifications hwne importing

* backend: update Finalizer trait to take multiple Justifications

* db: remove debugging statements in migration code

* manual-seal: update note about engine id

* db: fix check for finalized block

* client: update variable name to reflect it is now plural

* grandpa: fix incorrect empty Justications in test

* primitives: make Justifications opaque to avoid being empty

* network: fix detecting empty Justification

* runtime: doc strings for Justifications functions

* runtime: add into_justifications

* primitives: check for duplicates in when adding to Justifications

* network/test: use real grandpa engine id in test

* client: fix reviewer comments

* primitives: rename Justifications::push to append

* backend: revert changes to Finalizer trait

* backend: revert mark_finalized

* backend: revert changes to finalize_block

* backend: revert finalized_blocks

* db: add a quick early return for performance

* client: minor reviewer comments

* service/test: use local ConsensusEngineId

* network: add link to issue for sending multiple Justifications

* Apply suggestions from code review

Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>

* Apply suggestions from code review

Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>

* network: tweaks to review suggestions

* network: revert change to BlockData for backwards compatibility

* Apply suggestion from code review

Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>

* Apply suggestions from code review

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* primitives: update doc comment for Justifications

* client/db/upgrade: avoid grandpa crate dependency

* consensus: revert to single Justification for import_justification

* primitives: improve justifications docs

* style cleanups

* use and_then

* client: rename JUSTIFICATIONS db column

* network: revert to using FRNK in network-test

Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
Co-authored-by: André Silva <andrerfosilva@gmail.com>
---
 client/api/src/backend.rs                     |  16 ++-
 client/api/src/client.rs                      |   6 +-
 client/api/src/in_mem.rs                      | 125 ++++++++++++++++--
 client/consensus/aura/src/import_queue.rs     |   6 +-
 client/consensus/babe/src/lib.rs              |  10 +-
 client/consensus/babe/src/tests.rs            |   4 +-
 client/consensus/manual-seal/src/lib.rs       |  10 +-
 client/consensus/manual-seal/src/rpc.rs       |   8 +-
 client/consensus/pow/src/lib.rs               |   6 +-
 client/db/src/changes_tries_storage.rs        |   3 +-
 client/db/src/lib.rs                          | 116 +++++++++++++---
 client/db/src/upgrade.rs                      |  41 +++++-
 .../finality-grandpa-warp-sync/src/proof.rs   |  21 ++-
 client/finality-grandpa/src/environment.rs    |  13 +-
 client/finality-grandpa/src/finality_proof.rs |  93 ++++++-------
 client/finality-grandpa/src/import.rs         |  19 ++-
 client/finality-grandpa/src/tests.rs          |  16 +--
 client/light/src/backend.rs                   |  14 +-
 client/light/src/blockchain.rs                |   4 +-
 client/network/src/behaviour.rs               |   4 +-
 client/network/src/block_request_handler.rs   |  24 +++-
 client/network/src/gossip/tests.rs            |   4 +-
 client/network/src/protocol.rs                |  13 +-
 client/network/src/protocol/message.rs        |   4 +-
 client/network/src/protocol/sync.rs           |  30 +++--
 client/network/src/service.rs                 |   4 +-
 client/network/src/service/tests.rs           |   4 +-
 client/network/test/src/block_import.rs       |   4 +-
 client/network/test/src/lib.rs                |  16 +--
 client/network/test/src/sync.rs               |  63 ++++++---
 client/rpc/src/chain/chain_light.rs           |   2 +-
 client/rpc/src/chain/tests.rs                 |   2 +-
 client/service/src/chain_ops/import_blocks.rs |   2 +-
 client/service/src/client/client.rs           |  22 +--
 client/service/test/src/client/light.rs       |   7 +-
 client/service/test/src/client/mod.rs         |  19 +--
 primitives/blockchain/src/backend.rs          |   6 +-
 .../consensus/common/src/block_import.rs      |  10 +-
 .../consensus/common/src/import_queue.rs      |  20 +--
 .../common/src/import_queue/basic_queue.rs    |  33 ++---
 primitives/runtime/src/generic/block.rs       |   4 +-
 primitives/runtime/src/lib.rs                 |  60 ++++++++-
 test-utils/client/src/client_ext.rs           |  17 ++-
 43 files changed, 635 insertions(+), 270 deletions(-)

diff --git a/client/api/src/backend.rs b/client/api/src/backend.rs
index e41b250269a1..3108ba899467 100644
--- a/client/api/src/backend.rs
+++ b/client/api/src/backend.rs
@@ -22,7 +22,7 @@ use std::sync::Arc;
 use std::collections::{HashMap, HashSet};
 use sp_core::ChangesTrieConfigurationRange;
 use sp_core::offchain::OffchainStorage;
-use sp_runtime::{generic::BlockId, Justification, Storage};
+use sp_runtime::{generic::BlockId, Justification, Justifications, Storage};
 use sp_runtime::traits::{Block as BlockT, NumberFor, HashFor};
 use sp_state_machine::{
 	ChangesTrieState, ChangesTrieStorage as StateChangesTrieStorage, ChangesTrieTransaction,
@@ -148,7 +148,7 @@ pub trait BlockImportOperation<Block: BlockT> {
 		&mut self,
 		header: Block::Header,
 		body: Option<Vec<Block::Extrinsic>>,
-		justification: Option<Justification>,
+		justifications: Option<Justifications>,
 		state: NewBlockState,
 	) -> sp_blockchain::Result<()>;
 
@@ -197,6 +197,7 @@ pub trait BlockImportOperation<Block: BlockT> {
 		id: BlockId<Block>,
 		justification: Option<Justification>,
 	) -> sp_blockchain::Result<()>;
+
 	/// Mark a block as new head. If both block import and set head are specified, set head
 	/// overrides block import's best block rule.
 	fn mark_head(&mut self, id: BlockId<Block>) -> sp_blockchain::Result<()>;
@@ -230,7 +231,6 @@ pub trait Finalizer<Block: BlockT, B: Backend<Block>> {
 		notify: bool,
 	) -> sp_blockchain::Result<()>;
 
-
 	/// Finalize a block.
 	///
 	/// This will implicitly finalize all blocks up to it and
@@ -250,7 +250,6 @@ pub trait Finalizer<Block: BlockT, B: Backend<Block>> {
 		justification: Option<Justification>,
 		notify: bool,
 	) -> sp_blockchain::Result<()>;
-
 }
 
 /// Provides access to an auxiliary database.
@@ -432,6 +431,15 @@ pub trait Backend<Block: BlockT>: AuxStore + Send + Sync {
 		justification: Option<Justification>,
 	) -> sp_blockchain::Result<()>;
 
+	/// Append justification to the block with the given Id.
+	///
+	/// This should only be called for blocks that are already finalized.
+	fn append_justification(
+		&self,
+		block: BlockId<Block>,
+		justification: Justification,
+	) -> sp_blockchain::Result<()>;
+
 	/// Returns reference to blockchain backend.
 	fn blockchain(&self) -> &Self::Blockchain;
 
diff --git a/client/api/src/client.rs b/client/api/src/client.rs
index 990a7908b62b..97fe77c8d81e 100644
--- a/client/api/src/client.rs
+++ b/client/api/src/client.rs
@@ -23,7 +23,7 @@ use sp_core::storage::StorageKey;
 use sp_runtime::{
 	traits::{Block as BlockT, NumberFor},
 	generic::{BlockId, SignedBlock},
-	Justification,
+	Justifications,
 };
 use sp_consensus::BlockOrigin;
 
@@ -90,8 +90,8 @@ pub trait BlockBackend<Block: BlockT> {
 	/// Get block status.
 	fn block_status(&self, id: &BlockId<Block>) -> sp_blockchain::Result<sp_consensus::BlockStatus>;
 
-	/// Get block justification set by id.
-	fn justification(&self, id: &BlockId<Block>) -> sp_blockchain::Result<Option<Justification>>;
+	/// Get block justifications for the block with the given id.
+	fn justifications(&self, id: &BlockId<Block>) -> sp_blockchain::Result<Option<Justifications>>;
 
 	/// Get block hash by number.
 	fn block_hash(&self, number: NumberFor<Block>) -> sp_blockchain::Result<Option<Block::Hash>>;
diff --git a/client/api/src/in_mem.rs b/client/api/src/in_mem.rs
index b7060cf1d9b1..c3d266954278 100644
--- a/client/api/src/in_mem.rs
+++ b/client/api/src/in_mem.rs
@@ -27,7 +27,7 @@ use sp_core::{
 };
 use sp_runtime::generic::BlockId;
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT, Zero, NumberFor, HashFor};
-use sp_runtime::{Justification, Storage};
+use sp_runtime::{Justification, Justifications, Storage};
 use sp_state_machine::{
 	ChangesTrieTransaction, InMemoryBackend, Backend as StateBackend, StorageCollection,
 	ChildStorageCollection,
@@ -51,12 +51,12 @@ struct PendingBlock<B: BlockT> {
 
 #[derive(PartialEq, Eq, Clone)]
 enum StoredBlock<B: BlockT> {
-	Header(B::Header, Option<Justification>),
-	Full(B, Option<Justification>),
+	Header(B::Header, Option<Justifications>),
+	Full(B, Option<Justifications>),
 }
 
 impl<B: BlockT> StoredBlock<B> {
-	fn new(header: B::Header, body: Option<Vec<B::Extrinsic>>, just: Option<Justification>) -> Self {
+	fn new(header: B::Header, body: Option<Vec<B::Extrinsic>>, just: Option<Justifications>) -> Self {
 		match body {
 			Some(body) => StoredBlock::Full(B::new(header, body), just),
 			None => StoredBlock::Header(header, just),
@@ -70,7 +70,7 @@ impl<B: BlockT> StoredBlock<B> {
 		}
 	}
 
-	fn justification(&self) -> Option<&Justification> {
+	fn justifications(&self) -> Option<&Justifications> {
 		match *self {
 			StoredBlock::Header(_, ref j) | StoredBlock::Full(_, ref j) => j.as_ref()
 		}
@@ -83,7 +83,7 @@ impl<B: BlockT> StoredBlock<B> {
 		}
 	}
 
-	fn into_inner(self) -> (B::Header, Option<Vec<B::Extrinsic>>, Option<Justification>) {
+	fn into_inner(self) -> (B::Header, Option<Vec<B::Extrinsic>>, Option<Justifications>) {
 		match self {
 			StoredBlock::Header(header, just) => (header, None, just),
 			StoredBlock::Full(block, just) => {
@@ -164,7 +164,7 @@ impl<Block: BlockT> Blockchain<Block> {
 		&self,
 		hash: Block::Hash,
 		header: <Block as BlockT>::Header,
-		justification: Option<Justification>,
+		justifications: Option<Justifications>,
 		body: Option<Vec<<Block as BlockT>::Extrinsic>>,
 		new_state: NewBlockState,
 	) -> sp_blockchain::Result<()> {
@@ -176,7 +176,7 @@ impl<Block: BlockT> Blockchain<Block> {
 		{
 			let mut storage = self.storage.write();
 			storage.leaves.import(hash.clone(), number.clone(), header.parent_hash().clone());
-			storage.blocks.insert(hash.clone(), StoredBlock::new(header, body, justification));
+			storage.blocks.insert(hash.clone(), StoredBlock::new(header, body, justifications));
 
 			if let NewBlockState::Final = new_state {
 				storage.finalized_hash = hash;
@@ -285,16 +285,44 @@ impl<Block: BlockT> Blockchain<Block> {
 			let block = storage.blocks.get_mut(&hash)
 				.expect("hash was fetched from a block in the db; qed");
 
-			let block_justification = match block {
+			let block_justifications = match block {
 				StoredBlock::Header(_, ref mut j) | StoredBlock::Full(_, ref mut j) => j
 			};
 
-			*block_justification = justification;
+			*block_justifications = justification.map(Justifications::from);
 		}
 
 		Ok(())
 	}
 
+	fn append_justification(&self, id: BlockId<Block>, justification: Justification)
+		-> sp_blockchain::Result<()>
+	{
+		let hash = self.expect_block_hash_from_id(&id)?;
+		let mut storage = self.storage.write();
+
+		let block = storage
+			.blocks
+			.get_mut(&hash)
+			.expect("hash was fetched from a block in the db; qed");
+
+		let block_justifications = match block {
+			StoredBlock::Header(_, ref mut j) | StoredBlock::Full(_, ref mut j) => j
+		};
+
+		if let Some(stored_justifications) = block_justifications {
+			if !stored_justifications.append(justification) {
+				return Err(sp_blockchain::Error::BadJustification(
+					"Duplicate consensus engine ID".into()
+				));
+			}
+		} else {
+			*block_justifications = Some(Justifications::from(justification));
+		};
+
+		Ok(())
+	}
+
 	fn write_aux(&self, ops: Vec<(Vec<u8>, Option<Vec<u8>>)>) {
 		let mut storage = self.storage.write();
 		for (k, v) in ops {
@@ -365,9 +393,9 @@ impl<Block: BlockT> blockchain::Backend<Block> for Blockchain<Block> {
 		}))
 	}
 
-	fn justification(&self, id: BlockId<Block>) -> sp_blockchain::Result<Option<Justification>> {
+	fn justifications(&self, id: BlockId<Block>) -> sp_blockchain::Result<Option<Justifications>> {
 		Ok(self.id(id).and_then(|hash| self.storage.read().blocks.get(&hash).and_then(|b|
-			b.justification().map(|x| x.clone()))
+			b.justifications().map(|x| x.clone()))
 		))
 	}
 
@@ -508,12 +536,12 @@ impl<Block: BlockT> backend::BlockImportOperation<Block> for BlockImportOperatio
 		&mut self,
 		header: <Block as BlockT>::Header,
 		body: Option<Vec<<Block as BlockT>::Extrinsic>>,
-		justification: Option<Justification>,
+		justifications: Option<Justifications>,
 		state: NewBlockState,
 	) -> sp_blockchain::Result<()> {
 		assert!(self.pending_block.is_none(), "Only one block per operation is allowed");
 		self.pending_block = Some(PendingBlock {
-			block: StoredBlock::new(header, body, justification),
+			block: StoredBlock::new(header, body, justifications),
 			state,
 		});
 		Ok(())
@@ -696,6 +724,14 @@ impl<Block: BlockT> backend::Backend<Block> for Backend<Block> where Block::Hash
 		self.blockchain.finalize_header(block, justification)
 	}
 
+	fn append_justification(
+		&self,
+		block: BlockId<Block>,
+		justification: Justification,
+	) -> sp_blockchain::Result<()> {
+		self.blockchain.append_justification(block, justification)
+	}
+
 	fn blockchain(&self) -> &Self::Blockchain {
 		&self.blockchain
 	}
@@ -766,3 +802,64 @@ pub fn check_genesis_storage(storage: &Storage) -> sp_blockchain::Result<()> {
 
 	Ok(())
 }
+
+#[cfg(test)]
+mod tests {
+	use crate::{NewBlockState, in_mem::Blockchain};
+	use sp_api::{BlockId, HeaderT};
+	use sp_runtime::{ConsensusEngineId, Justifications};
+	use sp_blockchain::Backend;
+	use substrate_test_runtime::{Block, Header, H256};
+
+	pub const ID1: ConsensusEngineId = *b"TST1";
+	pub const ID2: ConsensusEngineId = *b"TST2";
+
+	fn header(number: u64) -> Header {
+		let parent_hash = match number {
+			0 => Default::default(),
+			_ => header(number - 1).hash(),
+		};
+		Header::new(number, H256::from_low_u64_be(0), H256::from_low_u64_be(0), parent_hash, Default::default())
+	}
+
+	fn test_blockchain() -> Blockchain<Block> {
+		let blockchain = Blockchain::<Block>::new();
+		let just0 = Some(Justifications::from((ID1, vec![0])));
+		let just1 = Some(Justifications::from((ID1, vec![1])));
+		let just2 = None;
+		let just3 = Some(Justifications::from((ID1, vec![3])));
+		blockchain.insert(header(0).hash(), header(0), just0, None, NewBlockState::Final).unwrap();
+		blockchain.insert(header(1).hash(), header(1), just1, None, NewBlockState::Final).unwrap();
+		blockchain.insert(header(2).hash(), header(2), just2, None, NewBlockState::Best).unwrap();
+		blockchain.insert(header(3).hash(), header(3), just3, None, NewBlockState::Final).unwrap();
+		blockchain
+	}
+
+	#[test]
+	fn append_and_retrieve_justifications() {
+		let blockchain = test_blockchain();
+		let last_finalized = blockchain.last_finalized().unwrap();
+		let block = BlockId::Hash(last_finalized);
+
+		blockchain.append_justification(block, (ID2, vec![4])).unwrap();
+		let justifications = {
+			let mut just = Justifications::from((ID1, vec![3]));
+			just.append((ID2, vec![4]));
+			just
+		};
+		assert_eq!(blockchain.justifications(block).unwrap(), Some(justifications));
+	}
+
+	#[test]
+	fn store_duplicate_justifications_is_forbidden() {
+		let blockchain = test_blockchain();
+		let last_finalized = blockchain.last_finalized().unwrap();
+		let block = BlockId::Hash(last_finalized);
+
+		blockchain.append_justification(block, (ID2, vec![0])).unwrap();
+		assert!(matches!(
+			blockchain.append_justification(block, (ID2, vec![1])),
+			Err(sp_blockchain::Error::BadJustification(_)),
+		));
+	}
+}
diff --git a/client/consensus/aura/src/import_queue.rs b/client/consensus/aura/src/import_queue.rs
index d3ed2bea3e11..c33d937d93a2 100644
--- a/client/consensus/aura/src/import_queue.rs
+++ b/client/consensus/aura/src/import_queue.rs
@@ -39,7 +39,7 @@ use sp_consensus::{
 use sc_client_api::{backend::AuxStore, BlockOf};
 use sp_blockchain::{well_known_cache_keys::{self, Id as CacheKeyId}, ProvideCache, HeaderBackend};
 use sp_block_builder::BlockBuilder as BlockBuilderApi;
-use sp_runtime::{generic::{BlockId, OpaqueDigestItemId}, Justification};
+use sp_runtime::{generic::{BlockId, OpaqueDigestItemId}, Justifications};
 use sp_runtime::traits::{Block as BlockT, Header, DigestItemFor, Zero};
 use sp_api::ProvideRuntimeApi;
 use sp_core::crypto::Pair;
@@ -238,7 +238,7 @@ impl<B: BlockT, C, P, CAW> Verifier<B> for AuraVerifier<C, P, CAW> where
 		&mut self,
 		origin: BlockOrigin,
 		header: B::Header,
-		justification: Option<Justification>,
+		justifications: Option<Justifications>,
 		mut body: Option<Vec<B::Extrinsic>>,
 	) -> Result<(BlockImportParams<B, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String> {
 		let mut inherent_data = self.inherent_data_providers
@@ -317,7 +317,7 @@ impl<B: BlockT, C, P, CAW> Verifier<B> for AuraVerifier<C, P, CAW> where
 				let mut import_block = BlockImportParams::new(origin, pre_header);
 				import_block.post_digests.push(seal);
 				import_block.body = body;
-				import_block.justification = justification;
+				import_block.justifications = justifications;
 				import_block.fork_choice = Some(ForkChoiceStrategy::LongestChain);
 				import_block.post_hash = Some(hash);
 
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index 3d72c436361c..727ee29221b2 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -84,7 +84,7 @@ use sp_core::crypto::Public;
 use sp_application_crypto::AppKey;
 use sp_keystore::{SyncCryptoStorePtr, SyncCryptoStore};
 use sp_runtime::{
-	generic::{BlockId, OpaqueDigestItemId}, Justification,
+	generic::{BlockId, OpaqueDigestItemId}, Justifications,
 	traits::{Block as BlockT, Header, DigestItemFor, Zero},
 };
 use sp_api::{ProvideRuntimeApi, NumberFor};
@@ -1097,15 +1097,15 @@ where
 		&mut self,
 		origin: BlockOrigin,
 		header: Block::Header,
-		justification: Option<Justification>,
+		justifications: Option<Justifications>,
 		mut body: Option<Vec<Block::Extrinsic>>,
 	) -> Result<(BlockImportParams<Block, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String> {
 		trace!(
 			target: "babe",
-			"Verifying origin: {:?} header: {:?} justification: {:?} body: {:?}",
+			"Verifying origin: {:?} header: {:?} justification(s): {:?} body: {:?}",
 			origin,
 			header,
-			justification,
+			justifications,
 			body,
 		);
 
@@ -1194,7 +1194,7 @@ where
 				let mut import_block = BlockImportParams::new(origin, pre_header);
 				import_block.post_digests.push(verified_info.seal);
 				import_block.body = body;
-				import_block.justification = justification;
+				import_block.justifications = justifications;
 				import_block.intermediates.insert(
 					Cow::from(INTERMEDIATE_KEY),
 					Box::new(BabeIntermediate::<Block> { epoch_descriptor }) as Box<dyn Any>,
diff --git a/client/consensus/babe/src/tests.rs b/client/consensus/babe/src/tests.rs
index d3e51b020326..70b4cd7b0b61 100644
--- a/client/consensus/babe/src/tests.rs
+++ b/client/consensus/babe/src/tests.rs
@@ -235,12 +235,12 @@ impl Verifier<TestBlock> for TestVerifier {
 		&mut self,
 		origin: BlockOrigin,
 		mut header: TestHeader,
-		justification: Option<Justification>,
+		justifications: Option<Justifications>,
 		body: Option<Vec<TestExtrinsic>>,
 	) -> Result<(BlockImportParams<TestBlock, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String> {
 		// apply post-sealing mutations (i.e. stripping seal, if desired).
 		(self.mutator)(&mut header, Stage::PostSeal);
-		self.inner.verify(origin, header, justification, body)
+		self.inner.verify(origin, header, justifications, body)
 	}
 }
 
diff --git a/client/consensus/manual-seal/src/lib.rs b/client/consensus/manual-seal/src/lib.rs
index 64de70939503..870640c1f201 100644
--- a/client/consensus/manual-seal/src/lib.rs
+++ b/client/consensus/manual-seal/src/lib.rs
@@ -27,7 +27,7 @@ use sp_consensus::{
 };
 use sp_blockchain::HeaderBackend;
 use sp_inherents::InherentDataProviders;
-use sp_runtime::{traits::Block as BlockT, Justification};
+use sp_runtime::{traits::Block as BlockT, Justifications, ConsensusEngineId};
 use sc_client_api::backend::{Backend as ClientBackend, Finalizer};
 use sc_transaction_pool::txpool;
 use std::{sync::Arc, marker::PhantomData};
@@ -49,6 +49,9 @@ pub use self::{
 };
 use sp_api::{ProvideRuntimeApi, TransactionFor};
 
+/// The `ConsensusEngineId` of Manual Seal.
+pub const MANUAL_SEAL_ENGINE_ID: ConsensusEngineId = [b'm', b'a', b'n', b'l'];
+
 /// The verifier for the manual seal engine; instantly finalizes.
 struct ManualSealVerifier;
 
@@ -57,11 +60,11 @@ impl<B: BlockT> Verifier<B> for ManualSealVerifier {
 		&mut self,
 		origin: BlockOrigin,
 		header: B::Header,
-		justification: Option<Justification>,
+		justifications: Option<Justifications>,
 		body: Option<Vec<B::Extrinsic>>,
 	) -> Result<(BlockImportParams<B, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String> {
 		let mut import_params = BlockImportParams::new(origin, header);
-		import_params.justification = justification;
+		import_params.justifications = justifications;
 		import_params.body = body;
 		import_params.finalized = false;
 		import_params.fork_choice = Some(ForkChoiceStrategy::LongestChain);
@@ -193,6 +196,7 @@ pub async fn run_manual_seal<B, BI, CB, E, C, A, SC, CS>(
 				).await;
 			}
 			EngineCommand::FinalizeBlock { hash, sender, justification } => {
+				let justification = justification.map(|j| (MANUAL_SEAL_ENGINE_ID, j));
 				finalize_block(
 					FinalizeBlockParams {
 						hash,
diff --git a/client/consensus/manual-seal/src/rpc.rs b/client/consensus/manual-seal/src/rpc.rs
index 293d4487a5d5..eb056f22fed8 100644
--- a/client/consensus/manual-seal/src/rpc.rs
+++ b/client/consensus/manual-seal/src/rpc.rs
@@ -28,7 +28,7 @@ use futures::{
 	SinkExt
 };
 use serde::{Deserialize, Serialize};
-use sp_runtime::Justification;
+use sp_runtime::EncodedJustification;
 pub use self::gen_client::Client as ManualSealClient;
 
 /// Future's type for jsonrpc
@@ -62,7 +62,7 @@ pub enum EngineCommand<Hash> {
 		/// sender to report errors/success to the rpc.
 		sender: Sender<()>,
 		/// finalization justification
-		justification: Option<Justification>,
+		justification: Option<EncodedJustification>,
 	}
 }
 
@@ -83,7 +83,7 @@ pub trait ManualSealApi<Hash> {
 	fn finalize_block(
 		&self,
 		hash: Hash,
-		justification: Option<Justification>
+		justification: Option<EncodedJustification>
 	) -> FutureResult<bool>;
 }
 
@@ -131,7 +131,7 @@ impl<Hash: Send + 'static> ManualSealApi<Hash> for ManualSeal<Hash> {
 		Box::new(future.map_err(Error::from).compat())
 	}
 
-	fn finalize_block(&self, hash: Hash, justification: Option<Justification>) -> FutureResult<bool> {
+	fn finalize_block(&self, hash: Hash, justification: Option<EncodedJustification>) -> FutureResult<bool> {
 		let mut sink = self.import_block_channel.clone();
 		let future = async move {
 			let (sender, receiver) = oneshot::channel();
diff --git a/client/consensus/pow/src/lib.rs b/client/consensus/pow/src/lib.rs
index 482bc80170fe..d1df2875a1cb 100644
--- a/client/consensus/pow/src/lib.rs
+++ b/client/consensus/pow/src/lib.rs
@@ -44,7 +44,7 @@ use parking_lot::Mutex;
 use sc_client_api::{BlockOf, backend::AuxStore, BlockchainEvents};
 use sp_blockchain::{HeaderBackend, ProvideCache, well_known_cache_keys::Id as CacheKeyId};
 use sp_block_builder::BlockBuilder as BlockBuilderApi;
-use sp_runtime::{Justification, RuntimeString};
+use sp_runtime::{Justifications, RuntimeString};
 use sp_runtime::generic::{BlockId, Digest, DigestItem};
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT};
 use sp_api::ProvideRuntimeApi;
@@ -457,7 +457,7 @@ impl<B: BlockT, Algorithm> Verifier<B> for PowVerifier<B, Algorithm> where
 		&mut self,
 		origin: BlockOrigin,
 		header: B::Header,
-		justification: Option<Justification>,
+		justifications: Option<Justifications>,
 		body: Option<Vec<B::Extrinsic>>,
 	) -> Result<(BlockImportParams<B, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String> {
 		let hash = header.hash();
@@ -470,7 +470,7 @@ impl<B: BlockT, Algorithm> Verifier<B> for PowVerifier<B, Algorithm> where
 		let mut import_block = BlockImportParams::new(origin, checked_header);
 		import_block.post_digests.push(seal);
 		import_block.body = body;
-		import_block.justification = justification;
+		import_block.justifications = justifications;
 		import_block.intermediates.insert(
 			Cow::from(INTERMEDIATE_KEY),
 			Box::new(intermediate) as Box<dyn Any>
diff --git a/client/db/src/changes_tries_storage.rs b/client/db/src/changes_tries_storage.rs
index 6233eab3ea39..8051adc1832b 100644
--- a/client/db/src/changes_tries_storage.rs
+++ b/client/db/src/changes_tries_storage.rs
@@ -955,7 +955,8 @@ mod tests {
 		let block0 = insert_header_with_configuration_change(&backend, 0, Default::default(), None, config0);
 		let config1 = Some(ChangesTrieConfiguration::new(2, 6));
 		let block1 = insert_header_with_configuration_change(&backend, 1, block0, changes(0), config1);
-		backend.finalize_block(BlockId::Number(1), Some(vec![42])).unwrap();
+		let just1 = Some((*b"TEST", vec![42]));
+		backend.finalize_block(BlockId::Number(1), just1).unwrap();
 		let config2 = Some(ChangesTrieConfiguration::new(2, 7));
 		let block2 = insert_header_with_configuration_change(&backend, 2, block1, changes(1), config2);
 		let config2_1 = Some(ChangesTrieConfiguration::new(2, 8));
diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index 6654083939da..acda057938e9 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -57,10 +57,11 @@ use sc_client_api::{
 	UsageInfo, MemoryInfo, IoInfo, MemorySize,
 	backend::{NewBlockState, PrunableStateChangesTrieStorage, ProvideChtRoots},
 	leaves::{LeafSet, FinalizationDisplaced}, cht,
+	utils::is_descendent_of,
 };
 use sp_blockchain::{
 	Result as ClientResult, Error as ClientError,
-	well_known_cache_keys, HeaderBackend,
+	well_known_cache_keys, Backend as _, HeaderBackend,
 };
 use codec::{Decode, Encode};
 use hash_db::Prefix;
@@ -70,7 +71,7 @@ use sp_core::{Hasher, ChangesTrieConfiguration};
 use sp_core::offchain::OffchainOverlayedChange;
 use sp_core::storage::{well_known_keys, ChildInfo};
 use sp_arithmetic::traits::Saturating;
-use sp_runtime::{generic::{DigestItem, BlockId}, Justification, Storage};
+use sp_runtime::{generic::{DigestItem, BlockId}, Justification, Justifications, Storage};
 use sp_runtime::traits::{
 	Block as BlockT, Header as HeaderT, NumberFor, Zero, One, SaturatedConversion, HashFor,
 };
@@ -351,7 +352,7 @@ pub(crate) mod columns {
 	pub const KEY_LOOKUP: u32 = 3;
 	pub const HEADER: u32 = 4;
 	pub const BODY: u32 = 5;
-	pub const JUSTIFICATION: u32 = 6;
+	pub const JUSTIFICATIONS: u32 = 6;
 	pub const CHANGES_TRIE: u32 = 7;
 	pub const AUX: u32 = 8;
 	/// Offchain workers local storage
@@ -363,7 +364,7 @@ pub(crate) mod columns {
 
 struct PendingBlock<Block: BlockT> {
 	header: Block::Header,
-	justification: Option<Justification>,
+	justifications: Option<Justifications>,
 	body: Option<Vec<Block::Extrinsic>>,
 	leaf_state: NewBlockState,
 }
@@ -535,8 +536,8 @@ impl<Block: BlockT> sc_client_api::blockchain::Backend<Block> for BlockchainDb<B
 		}
 	}
 
-	fn justification(&self, id: BlockId<Block>) -> ClientResult<Option<Justification>> {
-		match read_db(&*self.db, columns::KEY_LOOKUP, columns::JUSTIFICATION, id)? {
+	fn justifications(&self, id: BlockId<Block>) -> ClientResult<Option<Justifications>> {
+		match read_db(&*self.db, columns::KEY_LOOKUP, columns::JUSTIFICATIONS, id)? {
 			Some(justification) => match Decode::decode(&mut &justification[..]) {
 				Ok(justification) => Ok(Some(justification)),
 				Err(err) => return Err(sp_blockchain::Error::Backend(
@@ -716,7 +717,7 @@ impl<Block: BlockT> sc_client_api::backend::BlockImportOperation<Block> for Bloc
 		&mut self,
 		header: Block::Header,
 		body: Option<Vec<Block::Extrinsic>>,
-		justification: Option<Justification>,
+		justifications: Option<Justifications>,
 		leaf_state: NewBlockState,
 	) -> ClientResult<()> {
 		assert!(self.pending_block.is_none(), "Only one block per operation is allowed");
@@ -726,7 +727,7 @@ impl<Block: BlockT> sc_client_api::backend::BlockImportOperation<Block> for Bloc
 		self.pending_block = Some(PendingBlock {
 			header,
 			body,
-			justification,
+			justifications,
 			leaf_state,
 		});
 		Ok(())
@@ -1130,9 +1131,9 @@ impl<Block: BlockT> Backend<Block> {
 
 		if let Some(justification) = justification {
 			transaction.set_from_vec(
-				columns::JUSTIFICATION,
+				columns::JUSTIFICATIONS,
 				&utils::number_and_hash_to_lookup_key(number, hash)?,
-				justification.encode(),
+				Justifications::from(justification).encode(),
 			);
 		}
 		Ok((*hash, number, false, true))
@@ -1241,8 +1242,8 @@ impl<Block: BlockT> Backend<Block> {
 					},
 				}
 			}
-			if let Some(justification) = pending_block.justification {
-				transaction.set_from_vec(columns::JUSTIFICATION, &lookup_key, justification.encode());
+			if let Some(justifications) = pending_block.justifications {
+				transaction.set_from_vec(columns::JUSTIFICATIONS, &lookup_key, justifications.encode());
 			}
 
 			if number.is_zero() {
@@ -1409,7 +1410,7 @@ impl<Block: BlockT> Backend<Block> {
 
 		self.storage.db.commit(transaction)?;
 
-		// Apply all in-memory state shanges.
+		// Apply all in-memory state changes.
 		// Code beyond this point can't fail.
 
 		if let Some((
@@ -1668,6 +1669,50 @@ impl<Block: BlockT> sc_client_api::backend::Backend<Block> for Backend<Block> {
 		Ok(())
 	}
 
+	fn append_justification(
+		&self,
+		block: BlockId<Block>,
+		justification: Justification,
+	) -> ClientResult<()> {
+		let mut transaction: Transaction<DbHash> = Transaction::new();
+		let hash = self.blockchain.expect_block_hash_from_id(&block)?;
+		let header = self.blockchain.expect_header(block)?;
+		let number = *header.number();
+
+		// Check if the block is finalized first.
+		let is_descendent_of = is_descendent_of(&self.blockchain, None);
+		let last_finalized = self.blockchain.last_finalized()?;
+
+		// We can do a quick check first, before doing a proper but more expensive check
+		if number > self.blockchain.info().finalized_number
+			|| (hash != last_finalized && !is_descendent_of(&hash, &last_finalized)?)
+		{
+			return Err(ClientError::NotInFinalizedChain);
+		}
+
+		let justifications =
+			if let Some(mut stored_justifications) = self.blockchain.justifications(block)? {
+				if !stored_justifications.append(justification) {
+					return Err(ClientError::BadJustification(
+						"Duplicate consensus engine ID".into()
+					));
+				}
+				stored_justifications
+			} else {
+				Justifications::from(justification)
+			};
+
+		transaction.set_from_vec(
+			columns::JUSTIFICATIONS,
+			&utils::number_and_hash_to_lookup_key(number, hash)?,
+			justifications.encode(),
+		);
+
+		self.storage.db.commit(transaction)?;
+
+		Ok(())
+	}
+
 	fn changes_trie_storage(&self) -> Option<&dyn PrunableStateChangesTrieStorage<Block>> {
 		Some(&self.changes_tries_storage)
 	}
@@ -1918,12 +1963,16 @@ pub(crate) mod tests {
 	use sp_core::H256;
 	use sc_client_api::backend::{Backend as BTrait, BlockImportOperation as Op};
 	use sc_client_api::blockchain::Backend as BLBTrait;
+	use sp_runtime::ConsensusEngineId;
 	use sp_runtime::testing::{Header, Block as RawBlock, ExtrinsicWrapper};
 	use sp_runtime::traits::{Hash, BlakeTwo256};
 	use sp_runtime::generic::DigestItem;
 	use sp_state_machine::{TrieMut, TrieDBMut};
 	use sp_blockchain::{lowest_common_ancestor, tree_route};
 
+	const CONS0_ENGINE_ID: ConsensusEngineId = *b"CON0";
+	const CONS1_ENGINE_ID: ConsensusEngineId = *b"CON1";
+
 	pub(crate) type Block = RawBlock<ExtrinsicWrapper<u64>>;
 
 	pub fn prepare_changes(changes: Vec<(Vec<u8>, Vec<u8>)>) -> (H256, MemoryDB<BlakeTwo256>) {
@@ -2511,12 +2560,47 @@ pub(crate) mod tests {
 		let block0 = insert_header(&backend, 0, Default::default(), None, Default::default());
 		let _ = insert_header(&backend, 1, block0, None, Default::default());
 
-		let justification = Some(vec![1, 2, 3]);
+		let justification = Some((CONS0_ENGINE_ID, vec![1, 2, 3]));
 		backend.finalize_block(BlockId::Number(1), justification.clone()).unwrap();
 
 		assert_eq!(
-			backend.blockchain().justification(BlockId::Number(1)).unwrap(),
-			justification,
+			backend.blockchain().justifications(BlockId::Number(1)).unwrap(),
+			justification.map(Justifications::from),
+		);
+	}
+
+	#[test]
+	fn test_append_justification_to_finalized_block() {
+		use sc_client_api::blockchain::{Backend as BlockChainBackend};
+
+		let backend = Backend::<Block>::new_test(10, 10);
+
+		let block0 = insert_header(&backend, 0, Default::default(), None, Default::default());
+		let _ = insert_header(&backend, 1, block0, None, Default::default());
+
+		let just0 = (CONS0_ENGINE_ID, vec![1, 2, 3]);
+		backend.finalize_block(
+			BlockId::Number(1),
+			Some(just0.clone().into()),
+		).unwrap();
+
+		let just1 = (CONS1_ENGINE_ID, vec![4, 5]);
+		backend.append_justification(BlockId::Number(1), just1.clone()).unwrap();
+
+		let just2 = (CONS1_ENGINE_ID, vec![6, 7]);
+		assert!(matches!(
+			backend.append_justification(BlockId::Number(1), just2),
+			Err(ClientError::BadJustification(_))
+		));
+
+		let justifications = {
+			let mut just = Justifications::from(just0);
+			just.append(just1);
+			just
+		};
+		assert_eq!(
+			backend.blockchain().justifications(BlockId::Number(1)).unwrap(),
+			Some(justifications),
 		);
 	}
 
diff --git a/client/db/src/upgrade.rs b/client/db/src/upgrade.rs
index b6e49edba197..6c7cbbb4a1af 100644
--- a/client/db/src/upgrade.rs
+++ b/client/db/src/upgrade.rs
@@ -23,17 +23,19 @@ use std::io::{Read, Write, ErrorKind};
 use std::path::{Path, PathBuf};
 
 use sp_runtime::traits::Block as BlockT;
-use crate::utils::DatabaseType;
+use crate::{columns, utils::DatabaseType};
 use kvdb_rocksdb::{Database, DatabaseConfig};
+use codec::Encode;
 
 /// Version file name.
 const VERSION_FILE_NAME: &'static str = "db_version";
 
 /// Current db version.
-const CURRENT_VERSION: u32 = 2;
+const CURRENT_VERSION: u32 = 3;
 
 /// Number of columns in v1.
 const V1_NUM_COLUMNS: u32 = 11;
+const V2_NUM_COLUMNS: u32 = 12;
 
 /// Upgrade database to current version.
 pub fn upgrade_db<Block: BlockT>(db_path: &Path, db_type: DatabaseType) -> sp_blockchain::Result<()> {
@@ -42,7 +44,11 @@ pub fn upgrade_db<Block: BlockT>(db_path: &Path, db_type: DatabaseType) -> sp_bl
 		let db_version = current_version(db_path)?;
 		match db_version {
 			0 => Err(sp_blockchain::Error::Backend(format!("Unsupported database version: {}", db_version)))?,
-			1 => migrate_1_to_2::<Block>(db_path, db_type)?,
+			1 => {
+				migrate_1_to_2::<Block>(db_path, db_type)?;
+				migrate_2_to_3::<Block>(db_path, db_type)?
+			},
+			2 => migrate_2_to_3::<Block>(db_path, db_type)?,
 			CURRENT_VERSION => (),
 			_ => Err(sp_blockchain::Error::Backend(format!("Future database version: {}", db_version)))?,
 		}
@@ -62,6 +68,31 @@ fn migrate_1_to_2<Block: BlockT>(db_path: &Path, _db_type: DatabaseType) -> sp_b
 	db.add_column().map_err(db_err)
 }
 
+/// Migration from version2 to version3:
+/// - The format of the stored Justification changed to support multiple Justifications.
+fn migrate_2_to_3<Block: BlockT>(db_path: &Path, _db_type: DatabaseType) -> sp_blockchain::Result<()> {
+	let db_path = db_path.to_str()
+		.ok_or_else(|| sp_blockchain::Error::Backend("Invalid database path".into()))?;
+	let db_cfg = DatabaseConfig::with_columns(V2_NUM_COLUMNS);
+	let db = Database::open(&db_cfg, db_path).map_err(db_err)?;
+
+	// Get all the keys we need to update
+	let keys: Vec<_> = db.iter(columns::JUSTIFICATIONS).map(|entry| entry.0).collect();
+
+	// Read and update each entry
+	let mut transaction = db.transaction();
+	for key in keys {
+		if let Some(justification) = db.get(columns::JUSTIFICATIONS, &key).map_err(db_err)? {
+			// Tag each Justification with the hardcoded ID for GRANDPA. Avoid the dependency on the GRANDPA crate
+			let justifications = sp_runtime::Justifications::from((*b"FRNK", justification));
+			transaction.put_vec(columns::JUSTIFICATIONS, &key, justifications.encode());
+		}
+	}
+	db.write(transaction).map_err(db_err)?;
+
+	Ok(())
+}
+
 /// Reads current database version from the file at given path.
 /// If the file does not exist returns 0.
 fn current_version(path: &Path) -> sp_blockchain::Result<u32> {
@@ -141,8 +172,8 @@ mod tests {
 	}
 
 	#[test]
-	fn upgrade_from_1_to_2_works() {
-		for version_from_file in &[None, Some(1)] {
+	fn upgrade_to_3_works() {
+		for version_from_file in &[None, Some(1), Some(2)] {
 			let db_dir = tempfile::TempDir::new().unwrap();
 			let db_path = db_dir.path();
 			create_db(db_path, *version_from_file);
diff --git a/client/finality-grandpa-warp-sync/src/proof.rs b/client/finality-grandpa-warp-sync/src/proof.rs
index 1b447d2ef720..e6fb989abc9d 100644
--- a/client/finality-grandpa-warp-sync/src/proof.rs
+++ b/client/finality-grandpa-warp-sync/src/proof.rs
@@ -20,7 +20,7 @@ use sc_finality_grandpa::{
 	find_scheduled_change, AuthoritySetChanges, BlockNumberOps, GrandpaJustification,
 };
 use sp_blockchain::Backend as BlockchainBackend;
-use sp_finality_grandpa::{AuthorityList, SetId};
+use sp_finality_grandpa::{AuthorityList, SetId, GRANDPA_ENGINE_ID};
 use sp_runtime::{
 	generic::BlockId,
 	traits::{Block as BlockT, NumberFor},
@@ -108,11 +108,14 @@ impl<Block: BlockT> WarpSyncProof<Block> {
 				break;
 			}
 
-			let justification = backend.justification(BlockId::Number(*last_block))?.expect(
-				"header is last in set and contains standard change signal; \
-				 must have justification; \
-				 qed.",
-			);
+			let justification = backend
+				.justifications(BlockId::Number(*last_block))?
+				.and_then(|just| just.into_justification(GRANDPA_ENGINE_ID))
+				.expect(
+					"header is last in set and contains standard change signal; \
+					must have justification; \
+					qed.",
+				);
 
 			let justification = GrandpaJustification::<Block>::decode(&mut &justification[..])?;
 
@@ -171,6 +174,7 @@ mod tests {
 	use sc_finality_grandpa::{AuthoritySetChanges, GrandpaJustification};
 	use sp_blockchain::HeaderBackend;
 	use sp_consensus::BlockOrigin;
+	use sp_finality_grandpa::GRANDPA_ENGINE_ID;
 	use sp_keyring::Ed25519Keyring;
 	use sp_runtime::{generic::BlockId, traits::Header as _};
 	use std::sync::Arc;
@@ -272,7 +276,10 @@ mod tests {
 				let justification = GrandpaJustification::from_commit(&client, 42, commit).unwrap();
 
 				client
-					.finalize_block(BlockId::Hash(target_hash), Some(justification.encode()))
+					.finalize_block(
+						BlockId::Hash(target_hash),
+						Some((GRANDPA_ENGINE_ID, justification.encode()))
+					)
 					.unwrap();
 
 				authority_set_changes.push((current_set_id, n));
diff --git a/client/finality-grandpa/src/environment.rs b/client/finality-grandpa/src/environment.rs
index 5bb525549b18..27ff1e57b670 100644
--- a/client/finality-grandpa/src/environment.rs
+++ b/client/finality-grandpa/src/environment.rs
@@ -55,7 +55,7 @@ use crate::justification::GrandpaJustification;
 use crate::until_imported::UntilVoteTargetImported;
 use crate::voting_rule::VotingRule;
 use sp_finality_grandpa::{
-	AuthorityId, AuthoritySignature, Equivocation, EquivocationProof,
+	AuthorityId, AuthoritySignature, Equivocation, EquivocationProof, GRANDPA_ENGINE_ID,
 	GrandpaApi, RoundNumber, SetId,
 };
 use prometheus_endpoint::{register, Counter, Gauge, PrometheusError, U64};
@@ -1326,10 +1326,13 @@ where
 
 		// ideally some handle to a synchronization oracle would be used
 		// to avoid unconditionally notifying.
-		client.apply_finality(import_op, BlockId::Hash(hash), justification, true).map_err(|e| {
-			warn!(target: "afg", "Error applying finality to block {:?}: {:?}", (hash, number), e);
-			e
-		})?;
+		let justification = justification.map(|j| (GRANDPA_ENGINE_ID, j.clone()));
+		client
+			.apply_finality(import_op, BlockId::Hash(hash), justification, true)
+			.map_err(|e| {
+				warn!(target: "afg", "Error applying finality to block {:?}: {:?}", (hash, number), e);
+				e
+			})?;
 		telemetry!(
 			telemetry;
 			CONSENSUS_INFO;
diff --git a/client/finality-grandpa/src/finality_proof.rs b/client/finality-grandpa/src/finality_proof.rs
index b79b3190739d..80ba8cee9101 100644
--- a/client/finality-grandpa/src/finality_proof.rs
+++ b/client/finality-grandpa/src/finality_proof.rs
@@ -43,11 +43,11 @@ use finality_grandpa::BlockNumberOps;
 use parity_scale_codec::{Encode, Decode};
 use sp_blockchain::{Backend as BlockchainBackend, Error as ClientError, Result as ClientResult};
 use sp_runtime::{
-	Justification, generic::BlockId,
+	EncodedJustification, generic::BlockId,
 	traits::{NumberFor, Block as BlockT, Header as HeaderT, One},
 };
 use sc_client_api::backend::Backend;
-use sp_finality_grandpa::AuthorityId;
+use sp_finality_grandpa::{AuthorityId, GRANDPA_ENGINE_ID};
 
 use crate::authorities::AuthoritySetChanges;
 use crate::justification::GrandpaJustification;
@@ -190,8 +190,10 @@ where
 	// Get the Justification stored at the last block of the set
 	let last_block_for_set_id = BlockId::Number(last_block_for_set);
 	let justification =
-		if let Some(justification) = blockchain.justification(last_block_for_set_id)? {
-			justification
+		if let Some(grandpa_justification) = blockchain.justifications(last_block_for_set_id)?
+			.and_then(|justifications| justifications.into_justification(GRANDPA_ENGINE_ID))
+		{
+			grandpa_justification
 		} else {
 			trace!(
 				target: "afg",
@@ -257,7 +259,7 @@ pub trait ProvableJustification<Header: HeaderT>: Encode + Decode {
 
 	/// Decode and verify justification.
 	fn decode_and_verify(
-		justification: &Justification,
+		justification: &EncodedJustification,
 		set_id: u64,
 		authorities: &[(AuthorityId, u64)],
 	) -> ClientResult<Self> {
@@ -286,6 +288,7 @@ pub(crate) mod tests {
 	use super::*;
 	use crate::authorities::AuthoritySetChanges;
 	use sp_core::crypto::Public;
+	use sp_runtime::Justifications;
 	use sp_finality_grandpa::AuthorityList;
 	use sc_client_api::NewBlockState;
 	use sc_client_api::in_mem::Blockchain as InMemoryBlockchain;
@@ -330,31 +333,27 @@ pub(crate) mod tests {
 	}
 
 	fn test_blockchain() -> InMemoryBlockchain<Block> {
+		use sp_finality_grandpa::GRANDPA_ENGINE_ID as ID;
 		let blockchain = InMemoryBlockchain::<Block>::new();
-		blockchain
-			.insert(header(0).hash(), header(0), Some(vec![0]), None, NewBlockState::Final)
-			.unwrap();
-		blockchain
-			.insert(header(1).hash(), header(1), Some(vec![1]), None, NewBlockState::Final)
-			.unwrap();
-		blockchain
-			.insert(header(2).hash(), header(2), None, None, NewBlockState::Best)
-			.unwrap();
-		blockchain
-			.insert(header(3).hash(), header(3), Some(vec![3]), None, NewBlockState::Final)
-			.unwrap();
+		let just0 = Some(Justifications::from((ID, vec![0])));
+		let just1 = Some(Justifications::from((ID, vec![1])));
+		let just2 = None;
+		let just3 = Some(Justifications::from((ID, vec![3])));
+		blockchain.insert(header(0).hash(), header(0), just0, None, NewBlockState::Final).unwrap();
+		blockchain.insert(header(1).hash(), header(1), just1, None, NewBlockState::Final).unwrap();
+		blockchain.insert(header(2).hash(), header(2), just2, None, NewBlockState::Best).unwrap();
+		blockchain.insert(header(3).hash(), header(3), just3, None, NewBlockState::Final).unwrap();
 		blockchain
 	}
 
 	#[test]
 	fn finality_proof_fails_if_no_more_last_finalized_blocks() {
+		use sp_finality_grandpa::GRANDPA_ENGINE_ID as ID;
 		let blockchain = test_blockchain();
-		blockchain
-			.insert(header(4).hash(), header(4), Some(vec![1]), None, NewBlockState::Best)
-			.unwrap();
-		blockchain
-			.insert(header(5).hash(), header(5), Some(vec![2]), None, NewBlockState::Best)
-			.unwrap();
+		let just1 = Some(Justifications::from((ID, vec![1])));
+		let just2 = Some(Justifications::from((ID, vec![2])));
+		blockchain.insert(header(4).hash(), header(4), just1, None, NewBlockState::Best).unwrap();
+		blockchain.insert(header(5).hash(), header(5), just2, None, NewBlockState::Best).unwrap();
 
 		let mut authority_set_changes = AuthoritySetChanges::empty();
 		authority_set_changes.append(0, 5);
@@ -430,22 +429,17 @@ pub(crate) mod tests {
 
 	#[test]
 	fn finality_proof_using_authority_set_changes_fails_with_undefined_start() {
+		use sp_finality_grandpa::GRANDPA_ENGINE_ID as ID;
 		let blockchain = test_blockchain();
 		let auth = vec![(AuthorityId::from_slice(&[1u8; 32]), 1u64)];
-		let just4 = TestJustification((0, auth.clone()), vec![4]).encode();
-		let just7 = TestJustification((1, auth.clone()), vec![7]).encode();
-		blockchain
-			.insert(header(4).hash(), header(4), Some(just4), None, NewBlockState::Final)
-			.unwrap();
-		blockchain
-			.insert(header(5).hash(), header(5), None, None, NewBlockState::Final)
-			.unwrap();
-		blockchain
-			.insert(header(6).hash(), header(6), None, None, NewBlockState::Final)
-			.unwrap();
-		blockchain
-			.insert(header(7).hash(), header(7), Some(just7.clone()), None, NewBlockState::Final)
-			.unwrap();
+		let grandpa_just4 = TestJustification((0, auth.clone()), vec![4]).encode();
+		let grandpa_just7 = TestJustification((1, auth.clone()), vec![7]).encode();
+		let just4 = Some(Justifications::from((ID, grandpa_just4)));
+		let just7 = Some(Justifications::from((ID, grandpa_just7)));
+		blockchain.insert(header(4).hash(), header(4), just4, None, NewBlockState::Final).unwrap();
+		blockchain.insert(header(5).hash(), header(5), None, None, NewBlockState::Final).unwrap();
+		blockchain.insert(header(6).hash(), header(6), None, None, NewBlockState::Final).unwrap();
+		blockchain.insert(header(7).hash(), header(7), just7, None, NewBlockState::Final).unwrap();
 
 		// We have stored the correct block number for the relevant set, but as we are missing the
 		// block for the preceding set the start is not well-defined.
@@ -462,22 +456,17 @@ pub(crate) mod tests {
 
 	#[test]
 	fn finality_proof_using_authority_set_changes_works() {
+		use sp_finality_grandpa::GRANDPA_ENGINE_ID as ID;
 		let blockchain = test_blockchain();
 		let auth = vec![(AuthorityId::from_slice(&[1u8; 32]), 1u64)];
-		let just4 = TestJustification((0, auth.clone()), vec![4]).encode();
-		let just7 = TestJustification((1, auth.clone()), vec![7]).encode();
-		blockchain
-			.insert(header(4).hash(), header(4), Some(just4), None, NewBlockState::Final)
-			.unwrap();
-		blockchain
-			.insert(header(5).hash(), header(5), None, None, NewBlockState::Final)
-			.unwrap();
-		blockchain
-			.insert(header(6).hash(), header(6), None, None, NewBlockState::Final)
-			.unwrap();
-		blockchain
-			.insert(header(7).hash(), header(7), Some(just7.clone()), None, NewBlockState::Final)
-			.unwrap();
+		let grandpa_just4 = TestJustification((0, auth.clone()), vec![4]).encode();
+		let grandpa_just7 = TestJustification((1, auth.clone()), vec![7]).encode();
+		let just4 = Some(Justifications::from((ID, grandpa_just4)));
+		let just7 = Some(Justifications::from((ID, grandpa_just7.clone())));
+		blockchain.insert(header(4).hash(), header(4), just4, None, NewBlockState::Final) .unwrap();
+		blockchain.insert(header(5).hash(), header(5), None, None, NewBlockState::Final) .unwrap();
+		blockchain.insert(header(6).hash(), header(6), None, None, NewBlockState::Final).unwrap();
+		blockchain.insert(header(7).hash(), header(7), just7, None, NewBlockState::Final).unwrap();
 
 		let mut authority_set_changes = AuthoritySetChanges::empty();
 		authority_set_changes.append(0, 4);
@@ -497,7 +486,7 @@ pub(crate) mod tests {
 			proof_of_5,
 			FinalityProof {
 				block: header(7).hash(),
-				justification: just7,
+				justification: grandpa_just7,
 				unknown_headers: vec![header(6)],
 			}
 		);
diff --git a/client/finality-grandpa/src/import.rs b/client/finality-grandpa/src/import.rs
index 22d7b7fd5bcc..6814d5dfb619 100644
--- a/client/finality-grandpa/src/import.rs
+++ b/client/finality-grandpa/src/import.rs
@@ -451,7 +451,7 @@ impl<BE, Block: BlockT, Client, SC> BlockImport<Block>
 		let pending_changes = self.make_authorities_changes(&mut block, hash, initial_sync)?;
 
 		// we don't want to finalize on `inner.import_block`
-		let mut justification = block.justification.take();
+		let mut justifications = block.justifications.take();
 		let import_result = (&*self.inner).import_block(block, new_cache);
 
 		let mut imported_aux = {
@@ -513,17 +513,20 @@ impl<BE, Block: BlockT, Client, SC> BlockImport<Block>
 				// need to apply first, drop any justification that might have been provided with
 				// the block to make sure we request them from `sync` which will ensure they'll be
 				// applied in-order.
-				justification.take();
+				justifications.take();
 			},
 			_ => {},
 		}
 
-		match justification {
+		let grandpa_justification = justifications
+			.and_then(|just| just.into_justification(GRANDPA_ENGINE_ID));
+
+		match grandpa_justification {
 			Some(justification) => {
 				let import_res = self.import_justification(
 					hash,
 					number,
-					justification,
+					(GRANDPA_ENGINE_ID, justification),
 					needs_justification,
 					initial_sync,
 				);
@@ -637,8 +640,14 @@ where
 		enacts_change: bool,
 		initial_sync: bool,
 	) -> Result<(), ConsensusError> {
+		if justification.0 != GRANDPA_ENGINE_ID {
+			return Err(ConsensusError::ClientImport(
+				"GRANDPA can only import GRANDPA Justifications.".into(),
+			));
+		}
+
 		let justification = GrandpaJustification::decode_and_verify_finalizes(
-			&justification,
+			&justification.1,
 			(hash, number),
 			self.authority_set.set_id(),
 			&self.authority_set.current_authorities(),
diff --git a/client/finality-grandpa/src/tests.rs b/client/finality-grandpa/src/tests.rs
index 6824a8ed0427..42d0a10d34e0 100644
--- a/client/finality-grandpa/src/tests.rs
+++ b/client/finality-grandpa/src/tests.rs
@@ -39,7 +39,7 @@ use sp_consensus::{
 	import_queue::BoxJustificationImport,
 };
 use std::{collections::{HashMap, HashSet}, pin::Pin};
-use sp_runtime::traits::{Block as BlockT, Header as HeaderT};
+use sp_runtime::{Justifications, traits::{Block as BlockT, Header as HeaderT}};
 use sp_runtime::generic::{BlockId, DigestItem};
 use sp_core::H256;
 use sp_keystore::{SyncCryptoStorePtr, SyncCryptoStore};
@@ -369,7 +369,7 @@ fn finalize_3_voters_no_observers() {
 
 	// normally there's no justification for finalized blocks
 	assert!(
-		net.lock().peer(0).client().justification(&BlockId::Number(20)).unwrap().is_none(),
+		net.lock().peer(0).client().justifications(&BlockId::Number(20)).unwrap().is_none(),
 		"Extra justification for block#1",
 	);
 }
@@ -613,7 +613,7 @@ fn justification_is_generated_periodically() {
 	// when block#32 (justification_period) is finalized, justification
 	// is required => generated
 	for i in 0..3 {
-		assert!(net.lock().peer(i).client().justification(&BlockId::Number(32)).unwrap().is_some());
+		assert!(net.lock().peer(i).client().justifications(&BlockId::Number(32)).unwrap().is_some());
 	}
 }
 
@@ -658,12 +658,12 @@ fn sync_justifications_on_change_blocks() {
 	// the first 3 peers are grandpa voters and therefore have already finalized
 	// block 21 and stored a justification
 	for i in 0..3 {
-		assert!(net.lock().peer(i).client().justification(&BlockId::Number(21)).unwrap().is_some());
+		assert!(net.lock().peer(i).client().justifications(&BlockId::Number(21)).unwrap().is_some());
 	}
 
 	// the last peer should get the justification by syncing from other peers
 	futures::executor::block_on(futures::future::poll_fn(move |cx| {
-		if net.lock().peer(3).client().justification(&BlockId::Number(21)).unwrap().is_none() {
+		if net.lock().peer(3).client().justifications(&BlockId::Number(21)).unwrap().is_none() {
 			net.lock().poll(cx);
 			Poll::Pending
 		} else {
@@ -868,7 +868,7 @@ fn test_bad_justification() {
 	let block = || {
 		let block = block.clone();
 		let mut import = BlockImportParams::new(BlockOrigin::File, block.header);
-		import.justification = Some(Vec::new());
+		import.justifications = Some(Justifications::from((GRANDPA_ENGINE_ID, Vec::new())));
 		import.body = Some(block.extrinsics);
 		import.fork_choice = Some(ForkChoiceStrategy::LongestChain);
 
@@ -1583,7 +1583,7 @@ fn imports_justification_for_regular_blocks_on_import() {
 
 	// we import the block with justification attached
 	let mut import = BlockImportParams::new(BlockOrigin::File, block.header);
-	import.justification = Some(justification.encode());
+	import.justifications = Some((GRANDPA_ENGINE_ID, justification.encode()).into());
 	import.body = Some(block.extrinsics);
 	import.fork_choice = Some(ForkChoiceStrategy::LongestChain);
 
@@ -1600,7 +1600,7 @@ fn imports_justification_for_regular_blocks_on_import() {
 
 	// the justification should be imported and available from the client
 	assert!(
-		client.justification(&BlockId::Hash(block_hash)).unwrap().is_some(),
+		client.justifications(&BlockId::Hash(block_hash)).unwrap().is_some(),
 	);
 }
 
diff --git a/client/light/src/backend.rs b/client/light/src/backend.rs
index 27e0754eb552..52ace4fd9475 100644
--- a/client/light/src/backend.rs
+++ b/client/light/src/backend.rs
@@ -32,7 +32,7 @@ use sp_state_machine::{
 	Backend as StateBackend, TrieBackend, InMemoryBackend, ChangesTrieTransaction,
 	StorageCollection, ChildStorageCollection,
 };
-use sp_runtime::{generic::BlockId, Justification, Storage};
+use sp_runtime::{generic::BlockId, Justification, Justifications, Storage};
 use sp_runtime::traits::{Block as BlockT, NumberFor, Zero, Header, HashFor};
 use sp_blockchain::{Error as ClientError, Result as ClientResult};
 use sc_client_api::{
@@ -199,6 +199,14 @@ impl<S, Block> ClientBackend<Block> for Backend<S, HashFor<Block>>
 		self.blockchain.storage().finalize_header(block)
 	}
 
+	fn append_justification(
+		&self,
+		_block: BlockId<Block>,
+		_justification: Justification,
+	) -> ClientResult<()> {
+		Ok(())
+	}
+
 	fn blockchain(&self) -> &Blockchain<S> {
 		&self.blockchain
 	}
@@ -278,7 +286,7 @@ impl<S, Block> BlockImportOperation<Block> for ImportOperation<Block, S>
 		&mut self,
 		header: Block::Header,
 		_body: Option<Vec<Block::Extrinsic>>,
-		_justification: Option<Justification>,
+		_justifications: Option<Justifications>,
 		state: NewBlockState,
 	) -> ClientResult<()> {
 		self.leaf_state = state;
@@ -356,7 +364,7 @@ impl<S, Block> BlockImportOperation<Block> for ImportOperation<Block, S>
 	fn mark_finalized(
 		&mut self,
 		block: BlockId<Block>,
-		_justification: Option<Justification>,
+		_justifications: Option<Justification>,
 	) -> ClientResult<()> {
 		self.finalized_blocks.push(block);
 		Ok(())
diff --git a/client/light/src/blockchain.rs b/client/light/src/blockchain.rs
index bcabc365676a..062b3a9866d0 100644
--- a/client/light/src/blockchain.rs
+++ b/client/light/src/blockchain.rs
@@ -21,7 +21,7 @@
 
 use std::sync::Arc;
 
-use sp_runtime::{Justification, generic::BlockId};
+use sp_runtime::{Justifications, generic::BlockId};
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor, Zero};
 
 use sp_blockchain::{
@@ -109,7 +109,7 @@ impl<S, Block> BlockchainBackend<Block> for Blockchain<S> where Block: BlockT, S
 		Err(ClientError::NotAvailableOnLightClient)
 	}
 
-	fn justification(&self, _id: BlockId<Block>) -> ClientResult<Option<Justification>> {
+	fn justifications(&self, _id: BlockId<Block>) -> ClientResult<Option<Justifications>> {
 		Err(ClientError::NotAvailableOnLightClient)
 	}
 
diff --git a/client/network/src/behaviour.rs b/client/network/src/behaviour.rs
index 0eebd1713cc8..a73685ed3bf3 100644
--- a/client/network/src/behaviour.rs
+++ b/client/network/src/behaviour.rs
@@ -37,7 +37,7 @@ use libp2p::swarm::{
 use log::debug;
 use prost::Message;
 use sp_consensus::{BlockOrigin, import_queue::{IncomingBlock, Origin}};
-use sp_runtime::{traits::{Block as BlockT, NumberFor}, Justification};
+use sp_runtime::{traits::{Block as BlockT, NumberFor}, Justifications};
 use std::{
 	borrow::Cow,
 	collections::{HashSet, VecDeque},
@@ -84,7 +84,7 @@ pub struct Behaviour<B: BlockT> {
 /// Event generated by `Behaviour`.
 pub enum BehaviourOut<B: BlockT> {
 	BlockImport(BlockOrigin, Vec<IncomingBlock<B>>),
-	JustificationImport(Origin, B::Hash, NumberFor<B>, Justification),
+	JustificationImport(Origin, B::Hash, NumberFor<B>, Justifications),
 
 	/// Started a random iterative Kademlia discovery query.
 	RandomKademliaStarted(ProtocolId),
diff --git a/client/network/src/block_request_handler.rs b/client/network/src/block_request_handler.rs
index 148bc01302f7..2cc888c220f6 100644
--- a/client/network/src/block_request_handler.rs
+++ b/client/network/src/block_request_handler.rs
@@ -275,12 +275,28 @@ impl<B: BlockT> BlockRequestHandler<B> {
 			let number = *header.number();
 			let hash = header.hash();
 			let parent_hash = *header.parent_hash();
-			let justification = if get_justification {
-				self.client.justification(&BlockId::Hash(hash))?
+			let justifications = if get_justification {
+				self.client.justifications(&BlockId::Hash(hash))?
 			} else {
 				None
 			};
-			let is_empty_justification = justification.as_ref().map(|j| j.is_empty()).unwrap_or(false);
+
+			// TODO: In a follow up PR tracked by https://github.com/paritytech/substrate/issues/8172
+			// we want to send/receive all justifications.
+			// For now we keep compatibility by selecting precisely the GRANDPA one, and not just
+			// the first one. When sending we could have just taken the first one, since we don't
+			// expect there to be any other kind currently, but when receiving we need to add the
+			// engine ID tag.
+			// The ID tag is hardcoded here to avoid depending on the GRANDPA crate, and will be
+			// removed when resolving the above issue.
+			let justification = justifications.and_then(|just| just.into_justification(*b"FRNK"));
+
+			let is_empty_justification = justification
+				.as_ref()
+				.map(|j| j.is_empty())
+				.unwrap_or(false);
+
+			let justification = justification.unwrap_or_default();
 
 			let body = if get_body {
 				match self.client.block_body(&BlockId::Hash(hash))? {
@@ -306,7 +322,7 @@ impl<B: BlockT> BlockRequestHandler<B> {
 				body,
 				receipt: Vec::new(),
 				message_queue: Vec::new(),
-				justification: justification.unwrap_or_default(),
+				justification,
 				is_empty_justification,
 			};
 
diff --git a/client/network/src/gossip/tests.rs b/client/network/src/gossip/tests.rs
index 89ad5fcf047d..cd637f162721 100644
--- a/client/network/src/gossip/tests.rs
+++ b/client/network/src/gossip/tests.rs
@@ -52,7 +52,7 @@ fn build_test_full_node(network_config: config::NetworkConfiguration)
 			&mut self,
 			origin: sp_consensus::BlockOrigin,
 			header: B::Header,
-			justification: Option<sp_runtime::Justification>,
+			justifications: Option<sp_runtime::Justifications>,
 			body: Option<Vec<B::Extrinsic>>,
 		) -> Result<
 			(
@@ -79,7 +79,7 @@ fn build_test_full_node(network_config: config::NetworkConfiguration)
 			let mut import = sp_consensus::BlockImportParams::new(origin, header);
 			import.body = body;
 			import.finalized = self.0;
-			import.justification = justification;
+			import.justifications = justifications;
 			import.fork_choice = Some(sp_consensus::ForkChoiceStrategy::LongestChain);
 			Ok((import, maybe_keys))
 		}
diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index 7f321775b160..11e119799835 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -43,9 +43,10 @@ use sp_consensus::{
 	block_validation::BlockAnnounceValidator,
 	import_queue::{BlockImportResult, BlockImportError, IncomingBlock, Origin}
 };
-use sp_runtime::{generic::BlockId, Justification};
-use sp_runtime::traits::{
-	Block as BlockT, Header as HeaderT, NumberFor, Zero, CheckedSub
+use sp_runtime::{
+	Justifications,
+	generic::BlockId,
+	traits::{Block as BlockT, Header as HeaderT, NumberFor, Zero, CheckedSub},
 };
 use sp_arithmetic::traits::SaturatedConversion;
 use sync::{ChainSync, SyncState};
@@ -612,8 +613,8 @@ impl<B: BlockT> Protocol<B> {
 		if request.fields == message::BlockAttributes::JUSTIFICATION {
 			match self.sync.on_block_justification(peer_id, block_response) {
 				Ok(sync::OnBlockJustification::Nothing) => CustomMessageOutcome::None,
-				Ok(sync::OnBlockJustification::Import { peer, hash, number, justification }) =>
-					CustomMessageOutcome::JustificationImport(peer, hash, number, justification),
+				Ok(sync::OnBlockJustification::Import { peer, hash, number, justifications }) =>
+					CustomMessageOutcome::JustificationImport(peer, hash, number, justifications),
 				Err(sync::BadPeer(id, repu)) => {
 					self.behaviour.disconnect_peer(&id, HARDCODED_PEERSETS_SYNC);
 					self.peerset_handle.report_peer(id, repu);
@@ -1134,7 +1135,7 @@ fn prepare_block_request<B: BlockT>(
 #[must_use]
 pub enum CustomMessageOutcome<B: BlockT> {
 	BlockImport(BlockOrigin, Vec<IncomingBlock<B>>),
-	JustificationImport(Origin, B::Hash, NumberFor<B>, Justification),
+	JustificationImport(Origin, B::Hash, NumberFor<B>, Justifications),
 	/// Notification protocols have been opened with a remote.
 	NotificationStreamOpened {
 		remote: PeerId,
diff --git a/client/network/src/protocol/message.rs b/client/network/src/protocol/message.rs
index ed2721032801..01e9a5d7215a 100644
--- a/client/network/src/protocol/message.rs
+++ b/client/network/src/protocol/message.rs
@@ -148,7 +148,7 @@ pub struct RemoteReadResponse {
 pub mod generic {
 	use bitflags::bitflags;
 	use codec::{Encode, Decode, Input, Output};
-	use sp_runtime::Justification;
+	use sp_runtime::EncodedJustification;
 	use super::{
 		RemoteReadResponse, Transactions, Direction,
 		RequestId, BlockAttributes, RemoteCallResponse, ConsensusEngineId,
@@ -233,7 +233,7 @@ pub mod generic {
 		/// Block message queue if requested.
 		pub message_queue: Option<Vec<u8>>,
 		/// Justification if requested.
-		pub justification: Option<Justification>,
+		pub justification: Option<EncodedJustification>,
 	}
 
 	/// Identifies starting point of a block sequence.
diff --git a/client/network/src/protocol/sync.rs b/client/network/src/protocol/sync.rs
index 35f840152217..37f9a451b67d 100644
--- a/client/network/src/protocol/sync.rs
+++ b/client/network/src/protocol/sync.rs
@@ -44,7 +44,7 @@ use extra_requests::ExtraRequests;
 use libp2p::PeerId;
 use log::{debug, trace, warn, info, error};
 use sp_runtime::{
-	Justification,
+	EncodedJustification, Justifications,
 	generic::BlockId,
 	traits::{
 		Block as BlockT, Header as HeaderT, NumberFor, Zero, One, CheckedSub, SaturatedConversion,
@@ -425,7 +425,7 @@ pub enum OnBlockJustification<B: BlockT> {
 		peer: PeerId,
 		hash: B::Hash,
 		number: NumberFor<B>,
-		justification: Justification
+		justifications: Justifications
 	}
 }
 
@@ -823,11 +823,13 @@ impl<B: BlockT> ChainSync<B> {
 								.drain(self.best_queued_number + One::one())
 								.into_iter()
 								.map(|block_data| {
+									let justifications =
+										legacy_justification_mapping(block_data.block.justification);
 									IncomingBlock {
 										hash: block_data.block.hash,
 										header: block_data.block.header,
 										body: block_data.block.body,
-										justification: block_data.block.justification,
+										justifications,
 										origin: block_data.origin,
 										allow_missing_state: true,
 										import_existing: false,
@@ -846,7 +848,7 @@ impl<B: BlockT> ChainSync<B> {
 									hash: b.hash,
 									header: b.header,
 									body: b.body,
-									justification: b.justification,
+									justifications: legacy_justification_mapping(b.justification),
 									origin: Some(who.clone()),
 									allow_missing_state: true,
 									import_existing: false,
@@ -955,7 +957,7 @@ impl<B: BlockT> ChainSync<B> {
 							hash: b.hash,
 							header: b.header,
 							body: b.body,
-							justification: b.justification,
+							justifications: legacy_justification_mapping(b.justification),
 							origin: Some(who.clone()),
 							allow_missing_state: true,
 							import_existing: false,
@@ -1039,8 +1041,11 @@ impl<B: BlockT> ChainSync<B> {
 				None
 			};
 
-			if let Some((peer, hash, number, j)) = self.extra_justifications.on_response(who, justification) {
-				return Ok(OnBlockJustification::Import { peer, hash, number, justification: j })
+			if let Some((peer, hash, number, j)) = self
+				.extra_justifications
+				.on_response(who, legacy_justification_mapping(justification))
+			{
+				return Ok(OnBlockJustification::Import { peer, hash, number, justifications: j })
 			}
 		}
 
@@ -1597,6 +1602,14 @@ impl<B: BlockT> ChainSync<B> {
 	}
 }
 
+// This is purely during a backwards compatible transitionary period and should be removed
+// once we can assume all nodes can send and receive multiple Justifications
+// The ID tag is hardcoded here to avoid depending on the GRANDPA crate.
+// TODO: https://github.com/paritytech/substrate/issues/8172
+fn legacy_justification_mapping(justification: Option<EncodedJustification>) -> Option<Justifications> {
+	justification.map(|just| (*b"FRNK", just).into())
+}
+
 #[derive(Debug)]
 pub(crate) struct Metrics {
 	pub(crate) queued_blocks: u32,
@@ -2396,7 +2409,8 @@ mod test {
 		);
 
 		let finalized_block = blocks[MAX_BLOCKS_TO_LOOK_BACKWARDS as usize * 2 - 1].clone();
-		client.finalize_block(BlockId::Hash(finalized_block.hash()), Some(Vec::new())).unwrap();
+		let just = (*b"TEST", Vec::new());
+		client.finalize_block(BlockId::Hash(finalized_block.hash()), Some(just)).unwrap();
 		sync.update_chain_info(&info.best_hash, info.best_number);
 
 		let peer_id1 = PeerId::random();
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 74ce9316fc41..54a5559d2eaf 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -1452,11 +1452,11 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 					}
 					this.import_queue.import_blocks(origin, blocks);
 				},
-				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::JustificationImport(origin, hash, nb, justification))) => {
+				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::JustificationImport(origin, hash, nb, justifications))) => {
 					if let Some(metrics) = this.metrics.as_ref() {
 						metrics.import_queue_justifications_submitted.inc();
 					}
-					this.import_queue.import_justification(origin, hash, nb, justification);
+					this.import_queue.import_justifications(origin, hash, nb, justifications);
 				},
 				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::InboundRequest { protocol, result, .. })) => {
 					if let Some(metrics) = this.metrics.as_ref() {
diff --git a/client/network/src/service/tests.rs b/client/network/src/service/tests.rs
index 660eac82c4c6..fd8cf4c3d105 100644
--- a/client/network/src/service/tests.rs
+++ b/client/network/src/service/tests.rs
@@ -52,7 +52,7 @@ fn build_test_full_node(config: config::NetworkConfiguration)
 			&mut self,
 			origin: sp_consensus::BlockOrigin,
 			header: B::Header,
-			justification: Option<sp_runtime::Justification>,
+			justifications: Option<sp_runtime::Justifications>,
 			body: Option<Vec<B::Extrinsic>>,
 		) -> Result<
 			(
@@ -79,7 +79,7 @@ fn build_test_full_node(config: config::NetworkConfiguration)
 			let mut import = sp_consensus::BlockImportParams::new(origin, header);
 			import.body = body;
 			import.finalized = self.0;
-			import.justification = justification;
+			import.justifications = justifications;
 			import.fork_choice = Some(sp_consensus::ForkChoiceStrategy::LongestChain);
 			Ok((import, maybe_keys))
 		}
diff --git a/client/network/test/src/block_import.rs b/client/network/test/src/block_import.rs
index 4000e53420b4..200c7357c424 100644
--- a/client/network/test/src/block_import.rs
+++ b/client/network/test/src/block_import.rs
@@ -35,13 +35,13 @@ fn prepare_good_block() -> (TestClient, Hash, u64, PeerId, IncomingBlock<Block>)
 
 	let (hash, number) = (client.block_hash(1).unwrap().unwrap(), 1);
 	let header = client.header(&BlockId::Number(1)).unwrap();
-	let justification = client.justification(&BlockId::Number(1)).unwrap();
+	let justifications = client.justifications(&BlockId::Number(1)).unwrap();
 	let peer_id = PeerId::random();
 	(client, hash, number, peer_id.clone(), IncomingBlock {
 		hash,
 		header,
 		body: Some(Vec::new()),
-		justification,
+		justifications,
 		origin: Some(peer_id.clone()),
 		allow_missing_state: false,
 		import_existing: false,
diff --git a/client/network/test/src/lib.rs b/client/network/test/src/lib.rs
index c8b442d0dd56..1c237f94700c 100644
--- a/client/network/test/src/lib.rs
+++ b/client/network/test/src/lib.rs
@@ -63,7 +63,7 @@ use sp_core::H256;
 use sc_network::config::ProtocolConfig;
 use sp_runtime::generic::{BlockId, OpaqueDigestItemId};
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor};
-use sp_runtime::Justification;
+use sp_runtime::{Justification, Justifications};
 use substrate_test_runtime_client::{self, AccountKeyring};
 use sc_service::client::Client;
 pub use sc_network::config::EmptyTransactionPool;
@@ -109,7 +109,7 @@ impl<B: BlockT> Verifier<B> for PassThroughVerifier {
 		&mut self,
 		origin: BlockOrigin,
 		header: B::Header,
-		justification: Option<Justification>,
+		justifications: Option<Justifications>,
 		body: Option<Vec<B::Extrinsic>>
 	) -> Result<(BlockImportParams<B, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String> {
 		let maybe_keys = header.digest()
@@ -120,7 +120,7 @@ impl<B: BlockT> Verifier<B> for PassThroughVerifier {
 		let mut import = BlockImportParams::new(origin, header);
 		import.body = body;
 		import.finalized = self.finalized;
-		import.justification = justification;
+		import.justifications = justifications;
 		import.fork_choice = Some(self.fork_choice.clone());
 
 		Ok((import, maybe_keys))
@@ -184,10 +184,10 @@ impl PeersClient {
 		}
 	}
 
-	pub fn justification(&self, block: &BlockId<Block>) -> ClientResult<Option<Justification>> {
+	pub fn justifications(&self, block: &BlockId<Block>) -> ClientResult<Option<Justifications>> {
 		match *self {
-			PeersClient::Full(ref client, ref _backend) => client.justification(block),
-			PeersClient::Light(ref client, ref _backend) => client.justification(block),
+			PeersClient::Full(ref client, ref _backend) => client.justifications(block),
+			PeersClient::Light(ref client, ref _backend) => client.justifications(block),
 		}
 	}
 
@@ -577,11 +577,11 @@ impl<B: BlockT> Verifier<B> for VerifierAdapter<B> {
 		&mut self,
 		origin: BlockOrigin,
 		header: B::Header,
-		justification: Option<Justification>,
+		justifications: Option<Justifications>,
 		body: Option<Vec<B::Extrinsic>>
 	) -> Result<(BlockImportParams<B, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String> {
 		let hash = header.hash();
-		self.verifier.lock().verify(origin, header, justification, body).map_err(|e| {
+		self.verifier.lock().verify(origin, header, justifications, body).map_err(|e| {
 			self.failed_verifications.lock().insert(hash, e.clone());
 			e
 		})
diff --git a/client/network/test/src/sync.rs b/client/network/test/src/sync.rs
index b11dbaca75e1..953639dcc0e2 100644
--- a/client/network/test/src/sync.rs
+++ b/client/network/test/src/sync.rs
@@ -22,6 +22,7 @@ use futures::{Future, executor::block_on};
 use super::*;
 use sp_consensus::block_validation::Validation;
 use substrate_test_runtime::Header;
+use sp_runtime::Justifications;
 
 fn test_ancestor_search_when_common_is(n: usize) {
 	sp_tracing::try_init_simple();
@@ -248,13 +249,14 @@ fn sync_justifications() {
 	net.block_until_sync();
 
 	// there's currently no justification for block #10
-	assert_eq!(net.peer(0).client().justification(&BlockId::Number(10)).unwrap(), None);
-	assert_eq!(net.peer(1).client().justification(&BlockId::Number(10)).unwrap(), None);
+	assert_eq!(net.peer(0).client().justifications(&BlockId::Number(10)).unwrap(), None);
+	assert_eq!(net.peer(1).client().justifications(&BlockId::Number(10)).unwrap(), None);
 
 	// we finalize block #10, #15 and #20 for peer 0 with a justification
-	net.peer(0).client().finalize_block(BlockId::Number(10), Some(Vec::new()), true).unwrap();
-	net.peer(0).client().finalize_block(BlockId::Number(15), Some(Vec::new()), true).unwrap();
-	net.peer(0).client().finalize_block(BlockId::Number(20), Some(Vec::new()), true).unwrap();
+	let just = (*b"FRNK", Vec::new());
+	net.peer(0).client().finalize_block(BlockId::Number(10), Some(just.clone()), true).unwrap();
+	net.peer(0).client().finalize_block(BlockId::Number(15), Some(just.clone()), true).unwrap();
+	net.peer(0).client().finalize_block(BlockId::Number(20), Some(just.clone()), true).unwrap();
 
 	let h1 = net.peer(1).client().header(&BlockId::Number(10)).unwrap().unwrap();
 	let h2 = net.peer(1).client().header(&BlockId::Number(15)).unwrap().unwrap();
@@ -269,10 +271,20 @@ fn sync_justifications() {
 		net.poll(cx);
 
 		for height in (10..21).step_by(5) {
-			if net.peer(0).client().justification(&BlockId::Number(height)).unwrap() != Some(Vec::new()) {
+			if net
+				.peer(0)
+				.client()
+				.justifications(&BlockId::Number(height))
+				.unwrap() != Some(Justifications::from((*b"FRNK", Vec::new())))
+			{
 				return Poll::Pending;
 			}
-			if net.peer(1).client().justification(&BlockId::Number(height)).unwrap() != Some(Vec::new()) {
+			if net
+				.peer(1)
+				.client()
+				.justifications(&BlockId::Number(height))
+				.unwrap() != Some(Justifications::from((*b"FRNK", Vec::new())))
+			{
 				return Poll::Pending;
 			}
 		}
@@ -295,7 +307,8 @@ fn sync_justifications_across_forks() {
 	// for both and finalize the small fork instead.
 	net.block_until_sync();
 
-	net.peer(0).client().finalize_block(BlockId::Hash(f1_best), Some(Vec::new()), true).unwrap();
+	let just = (*b"FRNK", Vec::new());
+	net.peer(0).client().finalize_block(BlockId::Hash(f1_best), Some(just), true).unwrap();
 
 	net.peer(1).request_justification(&f1_best, 10);
 	net.peer(1).request_justification(&f2_best, 11);
@@ -303,8 +316,16 @@ fn sync_justifications_across_forks() {
 	block_on(futures::future::poll_fn::<(), _>(|cx| {
 		net.poll(cx);
 
-		if net.peer(0).client().justification(&BlockId::Number(10)).unwrap() == Some(Vec::new()) &&
-			net.peer(1).client().justification(&BlockId::Number(10)).unwrap() == Some(Vec::new())
+		if net
+			.peer(0)
+			.client()
+			.justifications(&BlockId::Number(10))
+			.unwrap() == Some(Justifications::from((*b"FRNK", Vec::new())))
+			&& net
+				.peer(1)
+				.client()
+				.justifications(&BlockId::Number(10))
+				.unwrap() == Some(Justifications::from((*b"FRNK", Vec::new())))
 		{
 			Poll::Ready(())
 		} else {
@@ -696,8 +717,9 @@ fn can_sync_to_peers_with_wrong_common_block() {
 	net.block_until_connected();
 
 	// both peers re-org to the same fork without notifying each other
-	net.peer(0).client().finalize_block(BlockId::Hash(fork_hash), Some(Vec::new()), true).unwrap();
-	net.peer(1).client().finalize_block(BlockId::Hash(fork_hash), Some(Vec::new()), true).unwrap();
+	let just = Some((*b"FRNK", Vec::new()));
+	net.peer(0).client().finalize_block(BlockId::Hash(fork_hash), just.clone(), true).unwrap();
+	net.peer(1).client().finalize_block(BlockId::Hash(fork_hash), just, true).unwrap();
 	let final_hash = net.peer(0).push_blocks(1, false);
 
 	net.block_until_sync();
@@ -948,8 +970,8 @@ fn multiple_requests_are_accepted_as_long_as_they_are_not_fulfilled() {
 	net.block_until_sync();
 
 	// there's currently no justification for block #10
-	assert_eq!(net.peer(0).client().justification(&BlockId::Number(10)).unwrap(), None);
-	assert_eq!(net.peer(1).client().justification(&BlockId::Number(10)).unwrap(), None);
+	assert_eq!(net.peer(0).client().justifications(&BlockId::Number(10)).unwrap(), None);
+	assert_eq!(net.peer(1).client().justifications(&BlockId::Number(10)).unwrap(), None);
 
 	let h1 = net.peer(1).client().header(&BlockId::Number(10)).unwrap().unwrap();
 
@@ -967,12 +989,21 @@ fn multiple_requests_are_accepted_as_long_as_they_are_not_fulfilled() {
 	}
 
 	// Finalize the block and make the justification available.
-	net.peer(0).client().finalize_block(BlockId::Number(10), Some(Vec::new()), true).unwrap();
+	net.peer(0).client().finalize_block(
+		BlockId::Number(10),
+		Some((*b"FRNK", Vec::new())),
+		true,
+	).unwrap();
 
 	block_on(futures::future::poll_fn::<(), _>(|cx| {
 		net.poll(cx);
 
-		if net.peer(1).client().justification(&BlockId::Number(10)).unwrap() != Some(Vec::new()) {
+		if net
+			.peer(1)
+			.client()
+			.justifications(&BlockId::Number(10))
+			.unwrap() != Some(Justifications::from((*b"FRNK", Vec::new())))
+		{
 			return Poll::Pending;
 		}
 
diff --git a/client/rpc/src/chain/chain_light.rs b/client/rpc/src/chain/chain_light.rs
index 41d4d02e33c9..a3f3db9b7116 100644
--- a/client/rpc/src/chain/chain_light.rs
+++ b/client/rpc/src/chain/chain_light.rs
@@ -106,7 +106,7 @@ impl<Block, Client, F> ChainBackend<Client, Block> for LightChain<Block, Client,
 					.compat()
 					.map(move |body| Some(SignedBlock {
 						block: Block::new(header, body),
-						justification: None,
+						justifications: None,
 					}))
 					.map_err(client_err)
 				),
diff --git a/client/rpc/src/chain/tests.rs b/client/rpc/src/chain/tests.rs
index 80b990a9fbf0..025ff53c2fa9 100644
--- a/client/rpc/src/chain/tests.rs
+++ b/client/rpc/src/chain/tests.rs
@@ -72,7 +72,7 @@ fn should_return_a_block() {
 	// Genesis block is not justified
 	assert_matches!(
 		api.block(Some(client.genesis_hash()).into()).wait(),
-		Ok(Some(SignedBlock { justification: None, .. }))
+		Ok(Some(SignedBlock { justifications: None, .. }))
 	);
 
 	assert_matches!(
diff --git a/client/service/src/chain_ops/import_blocks.rs b/client/service/src/chain_ops/import_blocks.rs
index 3f918e05120e..defa4128702a 100644
--- a/client/service/src/chain_ops/import_blocks.rs
+++ b/client/service/src/chain_ops/import_blocks.rs
@@ -168,7 +168,7 @@ fn import_block_to_queue<TBl, TImpQu>(
 			hash,
 			header: Some(header),
 			body: Some(extrinsics),
-			justification: signed_block.justification,
+			justifications: signed_block.justifications,
 			origin: None,
 			allow_missing_state: false,
 			import_existing: force,
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index 07e8e005fa1a..81c98b8b1e2b 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -41,7 +41,7 @@ use sc_telemetry::{
 	SUBSTRATE_INFO,
 };
 use sp_runtime::{
-	Justification, BuildStorage,
+	Justification, Justifications, BuildStorage,
 	generic::{BlockId, SignedBlock, DigestItem},
 	traits::{
 		Block as BlockT, Header as HeaderT, Zero, NumberFor,
@@ -625,7 +625,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		let BlockImportParams {
 			origin,
 			header,
-			justification,
+			justifications,
 			post_digests,
 			body,
 			storage_changes,
@@ -637,7 +637,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 			..
 		} = import_block;
 
-		assert!(justification.is_some() && finalized || justification.is_none());
+		assert!(justifications.is_some() && finalized || justifications.is_none());
 
 		if !intermediates.is_empty() {
 			return Err(Error::IncompletePipeline)
@@ -665,7 +665,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 			origin,
 			hash,
 			import_headers,
-			justification,
+			justifications,
 			body,
 			storage_changes,
 			new_cache,
@@ -704,7 +704,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		origin: BlockOrigin,
 		hash: Block::Hash,
 		import_headers: PrePostHeader<Block::Header>,
-		justification: Option<Justification>,
+		justifications: Option<Justifications>,
 		body: Option<Vec<Block::Extrinsic>>,
 		storage_changes: Option<sp_api::StorageChanges<backend::StateBackendFor<B, Block>, Block>>,
 		new_cache: HashMap<CacheKeyId, Vec<u8>>,
@@ -820,7 +820,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		operation.op.set_block_data(
 			import_headers.post().clone(),
 			body,
-			justification,
+			justifications,
 			leaf_state,
 		)?;
 
@@ -1926,9 +1926,9 @@ impl<B, E, Block, RA> BlockBackend<Block> for Client<B, E, Block, RA>
 	}
 
 	fn block(&self, id: &BlockId<Block>) -> sp_blockchain::Result<Option<SignedBlock<Block>>> {
-		Ok(match (self.header(id)?, self.body(id)?, self.justification(id)?) {
-			(Some(header), Some(extrinsics), justification) =>
-				Some(SignedBlock { block: Block::new(header, extrinsics), justification }),
+		Ok(match (self.header(id)?, self.body(id)?, self.justifications(id)?) {
+			(Some(header), Some(extrinsics), justifications) =>
+				Some(SignedBlock { block: Block::new(header, extrinsics), justifications }),
 			_ => None,
 		})
 	}
@@ -1937,8 +1937,8 @@ impl<B, E, Block, RA> BlockBackend<Block> for Client<B, E, Block, RA>
 		Client::block_status(self, id)
 	}
 
-	fn justification(&self, id: &BlockId<Block>) -> sp_blockchain::Result<Option<Justification>> {
-		self.backend.blockchain().justification(*id)
+	fn justifications(&self, id: &BlockId<Block>) -> sp_blockchain::Result<Option<Justifications>> {
+		self.backend.blockchain().justifications(*id)
 	}
 
 	fn block_hash(&self, number: NumberFor<Block>) -> sp_blockchain::Result<Option<Block::Hash>> {
diff --git a/client/service/test/src/client/light.rs b/client/service/test/src/client/light.rs
index f5b2d4aac83d..02d54a24c313 100644
--- a/client/service/test/src/client/light.rs
+++ b/client/service/test/src/client/light.rs
@@ -28,8 +28,9 @@ use sc_light::{
 };
 use std::sync::Arc;
 use sp_runtime::{
-	traits::{BlakeTwo256, HashFor, NumberFor},
-	generic::BlockId, traits::{Block as _, Header as HeaderT}, Digest,
+	generic::BlockId,
+	traits::{BlakeTwo256, Block as _, HashFor, Header as HeaderT, NumberFor},
+	Digest, Justifications,
 };
 use std::collections::HashMap;
 use parking_lot::Mutex;
@@ -377,7 +378,7 @@ fn execution_proof_is_generated_and_checked() {
 		remote_client.import_justified(
 			BlockOrigin::Own,
 			remote_client.new_block(digest).unwrap().build().unwrap().block,
-			Default::default(),
+			Justifications::from((*b"TEST", Default::default())),
 		).unwrap();
 	}
 
diff --git a/client/service/test/src/client/mod.rs b/client/service/test/src/client/mod.rs
index 122782ee51ef..d8a09734bebb 100644
--- a/client/service/test/src/client/mod.rs
+++ b/client/service/test/src/client/mod.rs
@@ -36,8 +36,9 @@ use sc_client_db::{
 };
 use sc_block_builder::BlockBuilderProvider;
 use sc_service::client::{self, Client, LocalCallExecutor, new_in_mem};
-use sp_runtime::traits::{
-	BlakeTwo256, Block as BlockT, Header as HeaderT,
+use sp_runtime::{
+	ConsensusEngineId,
+	traits::{BlakeTwo256, Block as BlockT, Header as HeaderT},
 };
 use substrate_test_runtime::TestAPI;
 use sp_state_machine::backend::Backend as _;
@@ -51,12 +52,14 @@ use sp_consensus::{
 };
 use sp_storage::StorageKey;
 use sp_trie::{TrieConfiguration, trie_types::Layout};
-use sp_runtime::{generic::BlockId, DigestItem};
+use sp_runtime::{generic::BlockId, DigestItem, Justifications};
 use hex_literal::hex;
 
 mod light;
 mod db;
 
+const TEST_ENGINE_ID: ConsensusEngineId = *b"TEST";
+
 native_executor_instance!(
 	Executor,
 	substrate_test_runtime_client::runtime::api::dispatch,
@@ -1016,7 +1019,7 @@ fn import_with_justification() {
 	client.import(BlockOrigin::Own, a2.clone()).unwrap();
 
 	// A2 -> A3
-	let justification = vec![1, 2, 3];
+	let justification = Justifications::from((TEST_ENGINE_ID, vec![1, 2, 3]));
 	let a3 = client.new_block_at(
 		&BlockId::Hash(a2.hash()),
 		Default::default(),
@@ -1030,17 +1033,17 @@ fn import_with_justification() {
 	);
 
 	assert_eq!(
-		client.justification(&BlockId::Hash(a3.hash())).unwrap(),
+		client.justifications(&BlockId::Hash(a3.hash())).unwrap(),
 		Some(justification),
 	);
 
 	assert_eq!(
-		client.justification(&BlockId::Hash(a1.hash())).unwrap(),
+		client.justifications(&BlockId::Hash(a1.hash())).unwrap(),
 		None,
 	);
 
 	assert_eq!(
-		client.justification(&BlockId::Hash(a2.hash())).unwrap(),
+		client.justifications(&BlockId::Hash(a2.hash())).unwrap(),
 		None,
 	);
 }
@@ -1088,7 +1091,7 @@ fn importing_diverged_finalized_block_should_trigger_reorg() {
 	);
 
 	// importing B1 as finalized should trigger a re-org and set it as new best
-	let justification = vec![1, 2, 3];
+	let justification = Justifications::from((TEST_ENGINE_ID, vec![1, 2, 3]));
 	client.import_justified(BlockOrigin::Own, b1.clone(), justification).unwrap();
 
 	assert_eq!(
diff --git a/primitives/blockchain/src/backend.rs b/primitives/blockchain/src/backend.rs
index b5efcfb02198..6ee836acb644 100644
--- a/primitives/blockchain/src/backend.rs
+++ b/primitives/blockchain/src/backend.rs
@@ -21,7 +21,7 @@ use std::sync::Arc;
 
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor};
 use sp_runtime::generic::BlockId;
-use sp_runtime::Justification;
+use sp_runtime::Justifications;
 use log::warn;
 use parking_lot::RwLock;
 
@@ -84,8 +84,8 @@ pub trait HeaderBackend<Block: BlockT>: Send + Sync {
 pub trait Backend<Block: BlockT>: HeaderBackend<Block> + HeaderMetadata<Block, Error=Error> {
 	/// Get block body. Returns `None` if block is not found.
 	fn body(&self, id: BlockId<Block>) -> Result<Option<Vec<<Block as BlockT>::Extrinsic>>>;
-	/// Get block justification. Returns `None` if justification does not exist.
-	fn justification(&self, id: BlockId<Block>) -> Result<Option<Justification>>;
+	/// Get block justifications. Returns `None` if no justification exists.
+	fn justifications(&self, id: BlockId<Block>) -> Result<Option<Justifications>>;
 	/// Get last finalized block hash.
 	fn last_finalized(&self) -> Result<Block::Hash>;
 	/// Returns data cache reference, if it is enabled on this backend.
diff --git a/primitives/consensus/common/src/block_import.rs b/primitives/consensus/common/src/block_import.rs
index 00f84501dbb3..9b7995a2b00b 100644
--- a/primitives/consensus/common/src/block_import.rs
+++ b/primitives/consensus/common/src/block_import.rs
@@ -18,7 +18,7 @@
 //! Block import helpers.
 
 use sp_runtime::traits::{Block as BlockT, DigestItemFor, Header as HeaderT, NumberFor, HashFor};
-use sp_runtime::Justification;
+use sp_runtime::{Justification, Justifications};
 use serde::{Serialize, Deserialize};
 use std::borrow::Cow;
 use std::collections::HashMap;
@@ -128,8 +128,8 @@ pub struct BlockImportParams<Block: BlockT, Transaction> {
 	/// re-executed in a runtime that checks digest equivalence -- the
 	/// post-runtime digests are pushed back on after.
 	pub header: Block::Header,
-	/// Justification provided for this block from the outside.
-	pub justification: Option<Justification>,
+	/// Justification(s) provided for this block from the outside.
+	pub justifications: Option<Justifications>,
 	/// Digest items that have been added after the runtime for external
 	/// work, like a consensus signature.
 	pub post_digests: Vec<DigestItemFor<Block>>,
@@ -174,7 +174,7 @@ impl<Block: BlockT, Transaction> BlockImportParams<Block, Transaction> {
 	) -> Self {
 		Self {
 			origin, header,
-			justification: None,
+			justifications: None,
 			post_digests: Vec::new(),
 			body: None,
 			storage_changes: None,
@@ -219,7 +219,7 @@ impl<Block: BlockT, Transaction> BlockImportParams<Block, Transaction> {
 		BlockImportParams {
 			origin: self.origin,
 			header: self.header,
-			justification: self.justification,
+			justifications: self.justifications,
 			post_digests: self.post_digests,
 			body: self.body,
 			storage_changes: None,
diff --git a/primitives/consensus/common/src/import_queue.rs b/primitives/consensus/common/src/import_queue.rs
index 83f6271941fa..b6067645a892 100644
--- a/primitives/consensus/common/src/import_queue.rs
+++ b/primitives/consensus/common/src/import_queue.rs
@@ -28,7 +28,7 @@
 
 use std::collections::HashMap;
 
-use sp_runtime::{Justification, traits::{Block as BlockT, Header as _, NumberFor}};
+use sp_runtime::{Justifications, traits::{Block as BlockT, Header as _, NumberFor}};
 
 use crate::{
 	error::Error as ConsensusError,
@@ -68,8 +68,8 @@ pub struct IncomingBlock<B: BlockT> {
 	pub header: Option<<B as BlockT>::Header>,
 	/// Block body if requested.
 	pub body: Option<Vec<<B as BlockT>::Extrinsic>>,
-	/// Justification if requested.
-	pub justification: Option<Justification>,
+	/// Justification(s) if requested.
+	pub justifications: Option<Justifications>,
 	/// The peer, we received this from
 	pub origin: Option<Origin>,
 	/// Allow importing the block skipping state verification if parent state is missing.
@@ -90,7 +90,7 @@ pub trait Verifier<B: BlockT>: Send + Sync {
 		&mut self,
 		origin: BlockOrigin,
 		header: B::Header,
-		justification: Option<Justification>,
+		justifications: Option<Justifications>,
 		body: Option<Vec<B::Extrinsic>>,
 	) -> Result<(BlockImportParams<B, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String>;
 }
@@ -102,13 +102,13 @@ pub trait Verifier<B: BlockT>: Send + Sync {
 pub trait ImportQueue<B: BlockT>: Send {
 	/// Import bunch of blocks.
 	fn import_blocks(&mut self, origin: BlockOrigin, blocks: Vec<IncomingBlock<B>>);
-	/// Import a block justification.
-	fn import_justification(
+	/// Import block justifications.
+	fn import_justifications(
 		&mut self,
 		who: Origin,
 		hash: B::Hash,
 		number: NumberFor<B>,
-		justification: Justification
+		justifications: Justifications
 	);
 	/// Polls for actions to perform on the network.
 	///
@@ -182,8 +182,8 @@ pub(crate) fn import_single_block_metered<B: BlockT, V: Verifier<B>, Transaction
 ) -> Result<BlockImportResult<NumberFor<B>>, BlockImportError> {
 	let peer = block.origin;
 
-	let (header, justification) = match (block.header, block.justification) {
-		(Some(header), justification) => (header, justification),
+	let (header, justifications) = match (block.header, block.justifications) {
+		(Some(header), justifications) => (header, justifications),
 		(None, _) => {
 			if let Some(ref peer) = peer {
 				debug!(target: "sync", "Header {} was not provided by {} ", block.hash, peer);
@@ -238,7 +238,7 @@ pub(crate) fn import_single_block_metered<B: BlockT, V: Verifier<B>, Transaction
 	}
 
 	let started = wasm_timer::Instant::now();
-	let (mut import_block, maybe_keys) = verifier.verify(block_origin, header, justification, block.body)
+	let (mut import_block, maybe_keys) = verifier.verify(block_origin, header, justifications, block.body)
 		.map_err(|msg| {
 			if let Some(ref peer) = peer {
 				trace!(target: "sync", "Verifying {}({}) from {} failed: {}", number, hash, peer, msg);
diff --git a/primitives/consensus/common/src/import_queue/basic_queue.rs b/primitives/consensus/common/src/import_queue/basic_queue.rs
index f1b42e1460e5..eb2b4b1fa7fc 100644
--- a/primitives/consensus/common/src/import_queue/basic_queue.rs
+++ b/primitives/consensus/common/src/import_queue/basic_queue.rs
@@ -18,7 +18,7 @@
 use std::{pin::Pin, time::Duration, marker::PhantomData};
 use futures::{prelude::*, task::Context, task::Poll};
 use futures_timer::Delay;
-use sp_runtime::{Justification, traits::{Block as BlockT, Header as HeaderT, NumberFor}};
+use sp_runtime::{Justification, Justifications, traits::{Block as BlockT, Header as HeaderT, NumberFor}};
 use sp_utils::mpsc::{TracingUnboundedSender, tracing_unbounded, TracingUnboundedReceiver};
 use prometheus_endpoint::Registry;
 
@@ -112,22 +112,24 @@ impl<B: BlockT, Transaction: Send> ImportQueue<B> for BasicQueue<B, Transaction>
 		}
 	}
 
-	fn import_justification(
+	fn import_justifications(
 		&mut self,
 		who: Origin,
 		hash: B::Hash,
 		number: NumberFor<B>,
-		justification: Justification,
+		justifications: Justifications,
 	) {
-		let res = self.justification_sender.unbounded_send(
-			worker_messages::ImportJustification(who, hash, number, justification),
-		);
-
-		if res.is_err() {
-			log::error!(
-				target: "sync",
-				"import_justification: Background import task is no longer alive"
+		for justification in justifications {
+			let res = self.justification_sender.unbounded_send(
+				worker_messages::ImportJustification(who, hash, number, justification),
 			);
+
+			if res.is_err() {
+				log::error!(
+					target: "sync",
+					"import_justification: Background import task is no longer alive"
+				);
+			}
 		}
 	}
 
@@ -281,7 +283,7 @@ impl<B: BlockT> BlockImportWorker<B> {
 		who: Origin,
 		hash: B::Hash,
 		number: NumberFor<B>,
-		justification: Justification
+		justification: Justification,
 	) {
 		let started = wasm_timer::Instant::now();
 		let success = self.justification_import.as_mut().map(|justification_import| {
@@ -442,7 +444,7 @@ mod tests {
 			&mut self,
 			origin: BlockOrigin,
 			header: Header,
-			_justification: Option<Justification>,
+			_justifications: Option<Justifications>,
 			_body: Option<Vec<Extrinsic>>,
 		) -> Result<(BlockImportParams<Block, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String> {
 			Ok((BlockImportParams::new(origin, header), None))
@@ -541,7 +543,7 @@ mod tests {
 					hash,
 					header: Some(header),
 					body: None,
-					justification: None,
+					justifications: None,
 					origin: None,
 					allow_missing_state: false,
 					import_existing: false,
@@ -554,12 +556,11 @@ mod tests {
 
 		let mut import_justification = || {
 			let hash = Hash::random();
-
 			block_on(finality_sender.send(worker_messages::ImportJustification(
 				libp2p::PeerId::random(),
 				hash,
 				1,
-				Vec::new(),
+				(*b"TEST", Vec::new()),
 			)))
 			.unwrap();
 
diff --git a/primitives/runtime/src/generic/block.rs b/primitives/runtime/src/generic/block.rs
index 7b2a10297f9c..1b30d43ccaca 100644
--- a/primitives/runtime/src/generic/block.rs
+++ b/primitives/runtime/src/generic/block.rs
@@ -30,7 +30,7 @@ use crate::traits::{
 	self, Member, Block as BlockT, Header as HeaderT, MaybeSerialize, MaybeMallocSizeOf,
 	NumberFor,
 };
-use crate::Justification;
+use crate::Justifications;
 
 /// Something to identify a block.
 #[derive(PartialEq, Eq, Clone, RuntimeDebug)]
@@ -112,5 +112,5 @@ pub struct SignedBlock<Block> {
 	/// Full block.
 	pub block: Block,
 	/// Block justification.
-	pub justification: Option<Justification>,
+	pub justifications: Option<Justifications>,
 }
diff --git a/primitives/runtime/src/lib.rs b/primitives/runtime/src/lib.rs
index c8b93a083be4..4508f84eefc3 100644
--- a/primitives/runtime/src/lib.rs
+++ b/primitives/runtime/src/lib.rs
@@ -96,7 +96,65 @@ pub use either::Either;
 /// the block itself would allow swapping justifications to change the block's hash
 /// (and thus fork the chain). Sending a `Justification` alongside a block instead
 /// bypasses this problem.
-pub type Justification = Vec<u8>;
+///
+/// Each justification is provided as an encoded blob, and is tagged with an ID
+/// to identify the consensus engine that generated the proof (we might have
+/// multiple justifications from different engines for the same block).
+pub type Justification = (ConsensusEngineId, EncodedJustification);
+
+/// The encoded justification specific to a consensus engine.
+pub type EncodedJustification = Vec<u8>;
+
+/// Collection of justifications for a given block, multiple justifications may
+/// be provided by different consensus engines for the same block.
+#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Debug, Clone, PartialEq, Eq, Encode, Decode)]
+pub struct Justifications(Vec<Justification>);
+
+impl Justifications {
+	/// Return an iterator over the justifications.
+	pub fn iter(&self) -> impl Iterator<Item = &Justification> {
+		self.0.iter()
+	}
+
+	/// Append a justification. Returns false if a justification with the same
+	/// `ConsensusEngineId` already exists, in which case the justification is
+	/// not inserted.
+	pub fn append(&mut self, justification: Justification) -> bool {
+		if self.get(justification.0).is_some() {
+			return false;
+		}
+		self.0.push(justification);
+		true
+	}
+
+	/// Return the encoded justification for the given consensus engine, if it
+	/// exists.
+	pub fn get(&self, engine_id: ConsensusEngineId) -> Option<&EncodedJustification> {
+		self.iter().find(|j| j.0 == engine_id).map(|j| &j.1)
+	}
+
+	/// Return a copy of the encoded justification for the given consensus
+	/// engine, if it exists.
+	pub fn into_justification(self, engine_id: ConsensusEngineId) -> Option<EncodedJustification> {
+		self.into_iter().find(|j| j.0 == engine_id).map(|j| j.1)
+	}
+}
+
+impl IntoIterator for Justifications {
+	type Item = Justification;
+	type IntoIter = sp_std::vec::IntoIter<Self::Item>;
+
+	fn into_iter(self) -> Self::IntoIter {
+		self.0.into_iter()
+	}
+}
+
+impl From<Justification> for Justifications {
+	fn from(justification: Justification) -> Self {
+		Self(vec![justification])
+	}
+}
 
 use traits::{Verify, Lazy};
 
diff --git a/test-utils/client/src/client_ext.rs b/test-utils/client/src/client_ext.rs
index db3e42f7e01c..aa4856f6baf6 100644
--- a/test-utils/client/src/client_ext.rs
+++ b/test-utils/client/src/client_ext.rs
@@ -24,7 +24,7 @@ use sp_consensus::{
 	BlockImportParams, BlockImport, BlockOrigin, Error as ConsensusError,
 	ForkChoiceStrategy,
 };
-use sp_runtime::Justification;
+use sp_runtime::{Justification, Justifications};
 use sp_runtime::traits::{Block as BlockT};
 use sp_runtime::generic::BlockId;
 use codec::alloc::collections::hash_map::HashMap;
@@ -51,15 +51,14 @@ pub trait ClientBlockImportExt<Block: BlockT>: Sized {
 	fn import_as_best(&mut self, origin: BlockOrigin, block: Block) -> Result<(), ConsensusError>;
 
 	/// Import a block and finalize it.
-	fn import_as_final(&mut self, origin: BlockOrigin, block: Block)
-		-> Result<(), ConsensusError>;
+	fn import_as_final(&mut self, origin: BlockOrigin, block: Block) -> Result<(), ConsensusError>;
 
-	/// Import block with justification, finalizes block.
+	/// Import block with justification(s), finalizes block.
 	fn import_justified(
 		&mut self,
 		origin: BlockOrigin,
 		block: Block,
-		justification: Justification
+		justifications: Justifications,
 	) -> Result<(), ConsensusError>;
 }
 
@@ -119,11 +118,11 @@ impl<Block: BlockT, T, Transaction> ClientBlockImportExt<Block> for std::sync::A
 		&mut self,
 		origin: BlockOrigin,
 		block: Block,
-		justification: Justification,
+		justifications: Justifications,
 	) -> Result<(), ConsensusError> {
 		let (header, extrinsics) = block.deconstruct();
 		let mut import = BlockImportParams::new(origin, header);
-		import.justification = Some(justification);
+		import.justifications = Some(justifications);
 		import.body = Some(extrinsics);
 		import.finalized = true;
 		import.fork_choice = Some(ForkChoiceStrategy::LongestChain);
@@ -168,11 +167,11 @@ impl<B, E, RA, Block: BlockT> ClientBlockImportExt<Block> for Client<B, E, Block
 		&mut self,
 		origin: BlockOrigin,
 		block: Block,
-		justification: Justification,
+		justifications: Justifications,
 	) -> Result<(), ConsensusError> {
 		let (header, extrinsics) = block.deconstruct();
 		let mut import = BlockImportParams::new(origin, header);
-		import.justification = Some(justification);
+		import.justifications = Some(justifications);
 		import.body = Some(extrinsics);
 		import.finalized = true;
 		import.fork_choice = Some(ForkChoiceStrategy::LongestChain);

From a0161f3b224a0607b351ae23b41621b01126a893 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Thu, 18 Mar 2021 00:25:58 +0100
Subject: [PATCH 0521/1194] Aura and Slots refactoring (#8386)

* Make slot duration being exposed as `Duration` to the outside

* Some slot info love

* Add `build_aura_worker` utility function

* Copy copy copy
---
 Cargo.lock                                    |  2 +
 bin/node-template/runtime/src/lib.rs          |  4 +-
 client/consensus/aura/src/import_queue.rs     |  6 +-
 client/consensus/aura/src/lib.rs              | 98 ++++++++++++++++---
 client/consensus/babe/src/lib.rs              | 12 +--
 .../manual-seal/src/consensus/babe.rs         |  2 +-
 client/consensus/slots/Cargo.toml             |  1 +
 client/consensus/slots/src/lib.rs             | 11 +--
 client/consensus/slots/src/slots.rs           | 36 +++++--
 primitives/consensus/aura/Cargo.toml          |  3 +
 primitives/consensus/aura/src/inherents.rs    |  6 +-
 primitives/consensus/aura/src/lib.rs          | 35 ++++++-
 primitives/consensus/babe/src/inherents.rs    |  6 +-
 primitives/consensus/babe/src/lib.rs          |  4 +-
 primitives/consensus/common/src/lib.rs        | 10 +-
 primitives/timestamp/src/lib.rs               | 10 +-
 test-utils/runtime/src/lib.rs                 | 10 +-
 17 files changed, 188 insertions(+), 68 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ada75934c79b..be95ca238f31 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7208,6 +7208,7 @@ dependencies = [
  "sp-inherents",
  "sp-runtime",
  "sp-state-machine",
+ "sp-timestamp",
  "sp-trie",
  "substrate-test-runtime-client",
  "thiserror",
@@ -8559,6 +8560,7 @@ dependencies = [
  "parity-scale-codec",
  "sp-api",
  "sp-application-crypto",
+ "sp-consensus",
  "sp-consensus-slots",
  "sp-inherents",
  "sp-runtime",
diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index 0f026db5735c..9436ae269bbb 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -378,8 +378,8 @@ impl_runtime_apis! {
 	}
 
 	impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {
-		fn slot_duration() -> u64 {
-			Aura::slot_duration()
+		fn slot_duration() -> sp_consensus_aura::SlotDuration {
+			sp_consensus_aura::SlotDuration::from_millis(Aura::slot_duration())
 		}
 
 		fn authorities() -> Vec<AuraId> {
diff --git a/client/consensus/aura/src/import_queue.rs b/client/consensus/aura/src/import_queue.rs
index c33d937d93a2..a0d08202da2f 100644
--- a/client/consensus/aura/src/import_queue.rs
+++ b/client/consensus/aura/src/import_queue.rs
@@ -30,7 +30,7 @@ use log::{debug, info, trace};
 use prometheus_endpoint::Registry;
 use codec::{Encode, Decode, Codec};
 use sp_consensus::{
-	BlockImport, CanAuthorWith, ForkChoiceStrategy, BlockImportParams,
+	BlockImport, CanAuthorWith, ForkChoiceStrategy, BlockImportParams, SlotData,
 	BlockOrigin, Error as ConsensusError, BlockCheckParams, ImportResult,
 	import_queue::{
 		Verifier, BasicQueue, DefaultImportQueue, BoxJustificationImport,
@@ -284,7 +284,7 @@ impl<B: BlockT, C, P, CAW> Verifier<B> for AuraVerifier<C, P, CAW> where
 							block.clone(),
 							BlockId::Hash(parent_hash),
 							inherent_data,
-							timestamp_now,
+							*timestamp_now,
 						).map_err(|e| e.to_string())?;
 					}
 
@@ -541,7 +541,7 @@ pub fn import_queue<'a, P, Block, I, C, S, CAW>(
 	S: sp_core::traits::SpawnEssentialNamed,
 	CAW: CanAuthorWith<Block> + Send + Sync + 'static,
 {
-	register_aura_inherent_data_provider(&inherent_data_providers, slot_duration.get())?;
+	register_aura_inherent_data_provider(&inherent_data_providers, slot_duration.slot_duration())?;
 	initialize_authorities_cache(&*client)?;
 
 	let verifier = AuraVerifier::<_, P, _>::new(
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index cce58304d0d0..81c6015ac7ef 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -75,7 +75,7 @@ pub use sc_consensus_slots::SlotProportion;
 type AuthorityId<P> = <P as Pair>::Public;
 
 /// Slot duration type for Aura.
-pub type SlotDuration = sc_consensus_slots::SlotDuration<u64>;
+pub type SlotDuration = sc_consensus_slots::SlotDuration<sp_consensus_aura::SlotDuration>;
 
 /// Get type of `SlotDuration` for Aura.
 pub fn slot_duration<A, B, C>(client: &C) -> CResult<SlotDuration> where
@@ -111,12 +111,12 @@ impl SlotCompatible for AuraSlotCompatible {
 	fn extract_timestamp_and_slot(
 		&self,
 		data: &InherentData,
-	) -> Result<(u64, AuraInherent, std::time::Duration), sp_consensus::Error> {
+	) -> Result<(sp_timestamp::Timestamp, AuraInherent, std::time::Duration), sp_consensus::Error> {
 		data.timestamp_inherent_data()
 			.and_then(|t| data.aura_inherent_data().map(|a| (t, a)))
 			.map_err(Into::into)
 			.map_err(sp_consensus::Error::InherentData)
-			.map(|(x, y)| (*x, y, Default::default()))
+			.map(|(x, y)| (x, y, Default::default()))
 	}
 }
 
@@ -161,7 +161,7 @@ pub fn start_aura<P, B, C, SC, PF, I, SO, CAW, BS, Error>(
 		client,
 		select_chain,
 		block_import,
-		proposer_factory: env,
+		proposer_factory,
 		sync_oracle,
 		inherent_data_providers,
 		force_authoring,
@@ -187,22 +187,23 @@ pub fn start_aura<P, B, C, SC, PF, I, SO, CAW, BS, Error>(
 	CAW: CanAuthorWith<B> + Send,
 	BS: BackoffAuthoringBlocksStrategy<NumberFor<B>> + Send + 'static,
 {
-	let worker = AuraWorker {
+	let worker = build_aura_worker::<P, _, _, _, _, _, _, _>(BuildAuraWorkerParams {
 		client: client.clone(),
-		block_import: Arc::new(Mutex::new(block_import)),
-		env,
+		block_import,
+		proposer_factory,
 		keystore,
 		sync_oracle: sync_oracle.clone(),
 		force_authoring,
 		backoff_authoring_blocks,
 		telemetry,
-		_key_type: PhantomData::<P>,
 		block_proposal_slot_portion,
-	};
+	});
+
 	register_aura_inherent_data_provider(
 		&inherent_data_providers,
 		slot_duration.slot_duration()
 	)?;
+
 	Ok(sc_consensus_slots::start_slot_worker::<_, _, _, _, _, AuraSlotCompatible, _, _>(
 		slot_duration,
 		select_chain,
@@ -214,6 +215,75 @@ pub fn start_aura<P, B, C, SC, PF, I, SO, CAW, BS, Error>(
 	))
 }
 
+/// Parameters of [`build_aura_worker`].
+pub struct BuildAuraWorkerParams<C, I, PF, SO, BS> {
+	/// The client to interact with the chain.
+	pub client: Arc<C>,
+	/// The block import.
+	pub block_import: I,
+	/// The proposer factory to build proposer instances.
+	pub proposer_factory: PF,
+	/// The sync oracle that can give us the current sync status.
+	pub sync_oracle: SO,
+	/// Should we force the authoring of blocks?
+	pub force_authoring: bool,
+	/// The backoff strategy when we miss slots.
+	pub backoff_authoring_blocks: Option<BS>,
+	/// The keystore used by the node.
+	pub keystore: SyncCryptoStorePtr,
+	/// The proportion of the slot dedicated to proposing.
+	///
+	/// The block proposing will be limited to this proportion of the slot from the starting of the
+	/// slot. However, the proposing can still take longer when there is some lenience factor applied,
+	/// because there were no blocks produced for some slots.
+	pub block_proposal_slot_portion: SlotProportion,
+	/// Telemetry instance used to report telemetry metrics.
+	pub telemetry: Option<TelemetryHandle>,
+}
+
+/// Build the aura worker.
+///
+/// The caller is responsible for running this worker, otherwise it will do nothing.
+pub fn build_aura_worker<P, B, C, PF, I, SO, BS, Error>(
+	BuildAuraWorkerParams {
+		client,
+		block_import,
+		proposer_factory,
+		sync_oracle,
+		backoff_authoring_blocks,
+		keystore,
+		block_proposal_slot_portion,
+		telemetry,
+		force_authoring,
+	}: BuildAuraWorkerParams<C, I, PF, SO, BS>,
+) -> impl sc_consensus_slots::SlotWorker<B, <PF::Proposer as Proposer<B>>::Proof> where
+	B: BlockT,
+	C: ProvideRuntimeApi<B> + BlockOf + ProvideCache<B> + AuxStore + HeaderBackend<B> + Send + Sync,
+	C::Api: AuraApi<B, AuthorityId<P>>,
+	PF: Environment<B, Error = Error> + Send + Sync + 'static,
+	PF::Proposer: Proposer<B, Error = Error, Transaction = sp_api::TransactionFor<C, B>>,
+	P: Pair + Send + Sync,
+	P::Public: AppPublic + Hash + Member + Encode + Decode,
+	P::Signature: TryFrom<Vec<u8>> + Hash + Member + Encode + Decode,
+	I: BlockImport<B, Transaction = sp_api::TransactionFor<C, B>> + Send + Sync + 'static,
+	Error: std::error::Error + Send + From<sp_consensus::Error> + 'static,
+	SO: SyncOracle + Send + Sync + Clone,
+	BS: BackoffAuthoringBlocksStrategy<NumberFor<B>> + Send + 'static,
+{
+	AuraWorker {
+		client,
+		block_import: Arc::new(Mutex::new(block_import)),
+		env: proposer_factory,
+		keystore,
+		sync_oracle,
+		force_authoring,
+		backoff_authoring_blocks,
+		telemetry,
+		_key_type: PhantomData::<P>,
+		block_proposal_slot_portion,
+	}
+}
+
 struct AuraWorker<C, E, I, P, SO, BS> {
 	client: Arc<C>,
 	block_import: Arc<Mutex<I>>,
@@ -477,7 +547,7 @@ fn find_pre_digest<B: BlockT, Signature: Codec>(header: &B::Header) -> Result<Sl
 /// Register the aura inherent data provider, if not registered already.
 fn register_aura_inherent_data_provider(
 	inherent_data_providers: &InherentDataProviders,
-	slot_duration: u64,
+	slot_duration: std::time::Duration,
 ) -> Result<(), sp_consensus::Error> {
 	if !inherent_data_providers.has_provider(&INHERENT_IDENTIFIER) {
 		inherent_data_providers
@@ -596,10 +666,10 @@ mod tests {
 					let inherent_data_providers = InherentDataProviders::new();
 					register_aura_inherent_data_provider(
 						&inherent_data_providers,
-						slot_duration.get()
+						slot_duration.slot_duration()
 					).expect("Registers aura inherent data provider");
 
-					assert_eq!(slot_duration.get(), SLOT_DURATION);
+					assert_eq!(slot_duration.slot_duration().as_millis() as u64, SLOT_DURATION);
 					import_queue::AuraVerifier::new(
 						client,
 						inherent_data_providers,
@@ -665,7 +735,7 @@ mod tests {
 
 			let inherent_data_providers = InherentDataProviders::new();
 			register_aura_inherent_data_provider(
-				&inherent_data_providers, slot_duration.get()
+				&inherent_data_providers, slot_duration.slot_duration()
 			).expect("Registers aura inherent data provider");
 
 			aura_futures.push(start_aura::<AuthorityPair, _, _, _, _, _, _, _, _, _>(StartAuraParams {
@@ -801,7 +871,7 @@ mod tests {
 			head,
 			SlotInfo {
 				slot: 0.into(),
-				timestamp: 0,
+				timestamp: 0.into(),
 				ends_at: Instant::now() + Duration::from_secs(100),
 				inherent_data: InherentData::new(),
 				duration: Duration::from_millis(1000),
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index 727ee29221b2..db13d0f3e420 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -345,8 +345,8 @@ impl Config {
 		}
 	}
 
-	/// Get the inner slot duration, in milliseconds.
-	pub fn slot_duration(&self) -> u64 {
+	/// Get the inner slot duration
+	pub fn slot_duration(&self) -> Duration {
 		self.0.slot_duration()
 	}
 }
@@ -919,13 +919,13 @@ impl SlotCompatible for TimeSource {
 	fn extract_timestamp_and_slot(
 		&self,
 		data: &InherentData,
-	) -> Result<(u64, Slot, std::time::Duration), sp_consensus::Error> {
+	) -> Result<(sp_timestamp::Timestamp, Slot, std::time::Duration), sp_consensus::Error> {
 		trace!(target: "babe", "extract timestamp");
 		data.timestamp_inherent_data()
 			.and_then(|t| data.babe_inherent_data().map(|a| (t, a)))
 			.map_err(Into::into)
 			.map_err(sp_consensus::Error::InherentData)
-			.map(|(x, y)| (*x, y, self.0.lock().0.take().unwrap_or_default()))
+			.map(|(x, y)| (x, y, self.0.lock().0.take().unwrap_or_default()))
 	}
 }
 
@@ -1220,7 +1220,7 @@ where
 /// Register the babe inherent data provider, if not registered already.
 pub fn register_babe_inherent_data_provider(
 	inherent_data_providers: &InherentDataProviders,
-	slot_duration: u64,
+	slot_duration: Duration,
 ) -> Result<(), sp_consensus::Error> {
 	debug!(target: "babe", "Registering");
 	if !inherent_data_providers.has_provider(&sp_consensus_babe::inherents::INHERENT_IDENTIFIER) {
@@ -1626,7 +1626,7 @@ pub fn import_queue<Block: BlockT, Client, SelectChain, Inner, CAW>(
 	SelectChain: sp_consensus::SelectChain<Block> + 'static,
 	CAW: CanAuthorWith<Block> + Send + Sync + 'static,
 {
-	register_babe_inherent_data_provider(&inherent_data_providers, babe_link.config.slot_duration)?;
+	register_babe_inherent_data_provider(&inherent_data_providers, babe_link.config.slot_duration())?;
 
 	let verifier = BabeVerifier {
 		select_chain,
diff --git a/client/consensus/manual-seal/src/consensus/babe.rs b/client/consensus/manual-seal/src/consensus/babe.rs
index 7fe51c7b79ce..a3f8a825e61d 100644
--- a/client/consensus/manual-seal/src/consensus/babe.rs
+++ b/client/consensus/manual-seal/src/consensus/babe.rs
@@ -90,7 +90,7 @@ impl<B, C> BabeConsensusDataProvider<B, C>
 		let timestamp_provider = SlotTimestampProvider::new(client.clone())?;
 
 		provider.register_provider(timestamp_provider)?;
-		register_babe_inherent_data_provider(provider, config.slot_duration)?;
+		register_babe_inherent_data_provider(provider, config.slot_duration())?;
 
 		Ok(Self {
 			config,
diff --git a/client/consensus/slots/Cargo.toml b/client/consensus/slots/Cargo.toml
index 7ca413630e26..34162cfae71e 100644
--- a/client/consensus/slots/Cargo.toml
+++ b/client/consensus/slots/Cargo.toml
@@ -28,6 +28,7 @@ sp-api = { version = "3.0.0", path = "../../../primitives/api" }
 sc-telemetry = { version = "3.0.0", path = "../../telemetry" }
 sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
 sp-inherents = { version = "3.0.0", path = "../../../primitives/inherents" }
+sp-timestamp = { version = "3.0.0", path = "../../../primitives/timestamp" }
 futures = "0.3.9"
 futures-timer = "3.0.1"
 parking_lot = "0.11.1"
diff --git a/client/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs
index 037402260c0d..83dd88a8d49f 100644
--- a/client/consensus/slots/src/lib.rs
+++ b/client/consensus/slots/src/lib.rs
@@ -274,7 +274,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 			CONSENSUS_DEBUG;
 			"slots.starting_authorship";
 			"slot_num" => *slot,
-			"timestamp" => timestamp,
+			"timestamp" => *timestamp,
 		);
 
 		let awaiting_proposer = {
@@ -408,7 +408,7 @@ pub trait SlotCompatible {
 	fn extract_timestamp_and_slot(
 		&self,
 		inherent: &InherentData,
-	) -> Result<(u64, Slot, std::time::Duration), sp_consensus::Error>;
+	) -> Result<(sp_timestamp::Timestamp, Slot, std::time::Duration), sp_consensus::Error>;
 }
 
 /// Start a new slot worker.
@@ -514,10 +514,7 @@ impl<T> Deref for SlotDuration<T> {
 }
 
 impl<T: SlotData> SlotData for SlotDuration<T> {
-	/// Get the slot duration in milliseconds.
-	fn slot_duration(&self) -> u64
-		where T: SlotData,
-	{
+	fn slot_duration(&self) -> std::time::Duration {
 		self.0.slot_duration()
 	}
 
@@ -562,7 +559,7 @@ impl<T: Clone + Send + Sync + 'static> SlotDuration<T> {
 			}
 		}?;
 
-		if slot_duration.slot_duration() == 0u64 {
+		if slot_duration.slot_duration() == Default::default() {
 			return Err(sp_blockchain::Error::Application(Box::new(Error::SlotDurationInvalid(slot_duration))))
 		}
 
diff --git a/client/consensus/slots/src/slots.rs b/client/consensus/slots/src/slots.rs
index b23d67603569..1cf7c30b9ed9 100644
--- a/client/consensus/slots/src/slots.rs
+++ b/client/consensus/slots/src/slots.rs
@@ -52,7 +52,7 @@ pub struct SlotInfo {
 	/// The slot number.
 	pub slot: Slot,
 	/// Current timestamp.
-	pub timestamp: u64,
+	pub timestamp: sp_timestamp::Timestamp,
 	/// The instant at which the slot ends.
 	pub ends_at: Instant,
 	/// The inherent data.
@@ -61,6 +61,26 @@ pub struct SlotInfo {
 	pub duration: Duration,
 }
 
+impl SlotInfo {
+	/// Create a new [`SlotInfo`].
+	///
+	/// `ends_at` is calculated using `timestamp` and `duration`.
+	pub fn new(
+		slot: Slot,
+		timestamp: sp_timestamp::Timestamp,
+		inherent_data: InherentData,
+		duration: Duration,
+	) -> Self {
+		Self {
+			slot,
+			timestamp,
+			inherent_data,
+			duration,
+			ends_at: Instant::now() + time_until_next(timestamp.as_duration(), duration),
+		}
+	}
+}
+
 /// A stream that returns every time there is a new slot.
 pub(crate) struct Slots<SC> {
 	last_slot: Slot,
@@ -73,13 +93,13 @@ pub(crate) struct Slots<SC> {
 impl<SC> Slots<SC> {
 	/// Create a new `Slots` stream.
 	pub fn new(
-		slot_duration: u64,
+		slot_duration: Duration,
 		inherent_data_providers: InherentDataProviders,
 		timestamp_extractor: SC,
 	) -> Self {
 		Slots {
 			last_slot: 0.into(),
-			slot_duration: Duration::from_millis(slot_duration),
+			slot_duration,
 			inner_delay: None,
 			inherent_data_providers,
 			timestamp_extractor,
@@ -122,21 +142,19 @@ impl<SC: SlotCompatible> Stream for Slots<SC> {
 			};
 			// reschedule delay for next slot.
 			let ends_in = offset +
-				time_until_next(Duration::from_millis(timestamp), slot_duration);
-			let ends_at = Instant::now() + ends_in;
+				time_until_next(timestamp.as_duration(), slot_duration);
 			self.inner_delay = Some(Delay::new(ends_in));
 
 			// never yield the same slot twice.
 			if slot > self.last_slot {
 				self.last_slot = slot;
 
-				break Poll::Ready(Some(Ok(SlotInfo {
+				break Poll::Ready(Some(Ok(SlotInfo::new(
 					slot,
-					duration: self.slot_duration,
 					timestamp,
-					ends_at,
 					inherent_data,
-				})))
+					self.slot_duration,
+				))))
 			}
 		}
 	}
diff --git a/primitives/consensus/aura/Cargo.toml b/primitives/consensus/aura/Cargo.toml
index 100c32302495..105c74bb317d 100644
--- a/primitives/consensus/aura/Cargo.toml
+++ b/primitives/consensus/aura/Cargo.toml
@@ -21,6 +21,7 @@ sp-runtime = { version = "3.0.0", default-features = false, path = "../../runtim
 sp-inherents = { version = "3.0.0", default-features = false, path = "../../inherents" }
 sp-timestamp = { version = "3.0.0", default-features = false, path = "../../timestamp" }
 sp-consensus-slots = { version = "0.9.0", default-features = false, path = "../slots" }
+sp-consensus = { version = "0.9.0", path = "../common", optional = true }
 
 [features]
 default = ["std"]
@@ -32,4 +33,6 @@ std = [
 	"sp-runtime/std",
 	"sp-inherents/std",
 	"sp-timestamp/std",
+	"sp-consensus-slots/std",
+	"sp-consensus",
 ]
diff --git a/primitives/consensus/aura/src/inherents.rs b/primitives/consensus/aura/src/inherents.rs
index 750b13c77ff6..32af901311a3 100644
--- a/primitives/consensus/aura/src/inherents.rs
+++ b/primitives/consensus/aura/src/inherents.rs
@@ -51,12 +51,12 @@ impl AuraInherentData for InherentData {
 // TODO: Remove in the future. https://github.com/paritytech/substrate/issues/8029
 #[cfg(feature = "std")]
 pub struct InherentDataProvider {
-	slot_duration: u64,
+	slot_duration: std::time::Duration,
 }
 
 #[cfg(feature = "std")]
 impl InherentDataProvider {
-	pub fn new(slot_duration: u64) -> Self {
+	pub fn new(slot_duration: std::time::Duration) -> Self {
 		Self {
 			slot_duration
 		}
@@ -88,7 +88,7 @@ impl ProvideInherentData for InherentDataProvider {
 		use sp_timestamp::TimestampInherentData;
 
 		let timestamp = inherent_data.timestamp_inherent_data()?;
-		let slot = *timestamp / self.slot_duration;
+		let slot = *timestamp / self.slot_duration.as_millis() as u64;
 		inherent_data.put_data(INHERENT_IDENTIFIER, &slot)
 	}
 
diff --git a/primitives/consensus/aura/src/lib.rs b/primitives/consensus/aura/src/lib.rs
index 8c9c57567c43..a28e681fda27 100644
--- a/primitives/consensus/aura/src/lib.rs
+++ b/primitives/consensus/aura/src/lib.rs
@@ -84,14 +84,39 @@ pub enum ConsensusLog<AuthorityId: Codec> {
 sp_api::decl_runtime_apis! {
 	/// API necessary for block authorship with aura.
 	pub trait AuraApi<AuthorityId: Codec> {
-		/// Return the slot duration in seconds for Aura.
-		/// Currently, only the value provided by this type at genesis
-		/// will be used.
+		/// Returns the slot duration for Aura.
 		///
-		/// Dynamic slot duration may be supported in the future.
-		fn slot_duration() -> u64;
+		/// Currently, only the value provided by this type at genesis will be used.
+		fn slot_duration() -> SlotDuration;
 
 		// Return the current set of authorities.
 		fn authorities() -> Vec<AuthorityId>;
 	}
 }
+
+/// Aura slot duration.
+///
+/// Internally stored as milliseconds.
+#[derive(sp_runtime::RuntimeDebug, Encode, Decode, PartialEq, Clone, Copy)]
+pub struct SlotDuration(u64);
+
+impl SlotDuration {
+	/// Initialize from the given milliseconds.
+	pub fn from_millis(val: u64) -> Self {
+		Self(val)
+	}
+
+	/// Returns the slot duration in milli seconds.
+	pub fn get(&self) -> u64 {
+		self.0
+	}
+}
+
+#[cfg(feature = "std")]
+impl sp_consensus::SlotData for SlotDuration {
+	fn slot_duration(&self) -> std::time::Duration {
+		std::time::Duration::from_millis(self.0)
+	}
+
+	const SLOT_KEY: &'static [u8] = b"aura_slot_duration";
+}
diff --git a/primitives/consensus/babe/src/inherents.rs b/primitives/consensus/babe/src/inherents.rs
index 8aeab94df34a..4c7c55f1cfd5 100644
--- a/primitives/consensus/babe/src/inherents.rs
+++ b/primitives/consensus/babe/src/inherents.rs
@@ -55,13 +55,13 @@ impl BabeInherentData for InherentData {
 // TODO: Remove in the future. https://github.com/paritytech/substrate/issues/8029
 #[cfg(feature = "std")]
 pub struct InherentDataProvider {
-	slot_duration: u64,
+	slot_duration: std::time::Duration,
 }
 
 #[cfg(feature = "std")]
 impl InherentDataProvider {
 	/// Constructs `Self`
-	pub fn new(slot_duration: u64) -> Self {
+	pub fn new(slot_duration: std::time::Duration) -> Self {
 		Self { slot_duration }
 	}
 }
@@ -83,7 +83,7 @@ impl ProvideInherentData for InherentDataProvider {
 
 	fn provide_inherent_data(&self, inherent_data: &mut InherentData) -> Result<(), Error> {
 		let timestamp = inherent_data.timestamp_inherent_data()?;
-		let slot = *timestamp / self.slot_duration;
+		let slot = *timestamp / self.slot_duration.as_millis() as u64;
 		inherent_data.put_data(INHERENT_IDENTIFIER, &slot)
 	}
 
diff --git a/primitives/consensus/babe/src/lib.rs b/primitives/consensus/babe/src/lib.rs
index 1b416c996fcf..da9f089e4561 100644
--- a/primitives/consensus/babe/src/lib.rs
+++ b/primitives/consensus/babe/src/lib.rs
@@ -242,8 +242,8 @@ impl AllowedSlots {
 
 #[cfg(feature = "std")]
 impl sp_consensus::SlotData for BabeGenesisConfiguration {
-	fn slot_duration(&self) -> u64 {
-		self.slot_duration
+	fn slot_duration(&self) -> std::time::Duration {
+		std::time::Duration::from_millis(self.slot_duration)
 	}
 
 	const SLOT_KEY: &'static [u8] = b"babe_configuration";
diff --git a/primitives/consensus/common/src/lib.rs b/primitives/consensus/common/src/lib.rs
index b3aceb45e180..27a43dbe0220 100644
--- a/primitives/consensus/common/src/lib.rs
+++ b/primitives/consensus/common/src/lib.rs
@@ -303,16 +303,8 @@ impl<Block: BlockT> CanAuthorWith<Block> for NeverCanAuthor {
 /// A type from which a slot duration can be obtained.
 pub trait SlotData {
 	/// Gets the slot duration.
-	fn slot_duration(&self) -> u64;
+	fn slot_duration(&self) -> sp_std::time::Duration;
 
 	/// The static slot key
 	const SLOT_KEY: &'static [u8];
 }
-
-impl SlotData for u64 {
-	fn slot_duration(&self) -> u64 {
-		*self
-	}
-
-	const SLOT_KEY: &'static [u8] = b"aura_slot_duration";
-}
diff --git a/primitives/timestamp/src/lib.rs b/primitives/timestamp/src/lib.rs
index e6ef62b5c59c..846ba67aec73 100644
--- a/primitives/timestamp/src/lib.rs
+++ b/primitives/timestamp/src/lib.rs
@@ -23,6 +23,7 @@ use codec::{Encode, Decode};
 #[cfg(feature = "std")]
 use sp_inherents::ProvideInherentData;
 use sp_inherents::{InherentIdentifier, IsFatalError, InherentData};
+use sp_std::time::Duration;
 
 use sp_runtime::RuntimeString;
 
@@ -43,6 +44,11 @@ impl Timestamp {
 	pub const fn new(inner: u64) -> Self {
 		Self(inner)
 	}
+
+	/// Returns `self` as [`Duration`].
+	pub fn as_duration(&self) -> Duration {
+		Duration::from_millis(self.0)
+	}
 }
 
 impl sp_std::ops::Deref for Timestamp {
@@ -100,8 +106,8 @@ impl From<Timestamp> for u64 {
 	}
 }
 
-impl From<sp_std::time::Duration> for Timestamp {
-	fn from(duration: sp_std::time::Duration) -> Self {
+impl From<Duration> for Timestamp {
+	fn from(duration: Duration) -> Self {
 		Timestamp(duration.as_millis() as u64)
 	}
 }
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index 5f80dc93a95f..f285eba1d8e4 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -762,7 +762,10 @@ cfg_if! {
 			}
 
 			impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {
-				fn slot_duration() -> u64 { 1000 }
+				fn slot_duration() -> sp_consensus_aura::SlotDuration {
+					sp_consensus_aura::SlotDuration::from_millis(1000)
+				}
+
 				fn authorities() -> Vec<AuraId> {
 					system::authorities().into_iter().map(|a| {
 						let authority: sr25519::Public = a.into();
@@ -1020,7 +1023,10 @@ cfg_if! {
 			}
 
 			impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {
-				fn slot_duration() -> u64 { 1000 }
+				fn slot_duration() -> sp_consensus_aura::SlotDuration {
+					sp_consensus_aura::SlotDuration::from_millis(1000)
+				}
+
 				fn authorities() -> Vec<AuraId> {
 					system::authorities().into_iter().map(|a| {
 						let authority: sr25519::Public = a.into();

From 46ea7e7f0b511429f5d44d104aee3e2560b11146 Mon Sep 17 00:00:00 2001
From: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
Date: Thu, 18 Mar 2021 09:38:58 +0100
Subject: [PATCH 0522/1194] Fast CompactAssignment search (#8385)

* use more efficient search through candidates in offchain-election

* mark linear accessors as test-only in election-provider-multi-phase

This prevents production code which uses them from compiling.

Also write an efficient helper for getting the target index.

* doc grammar

* use faster target_index_fn in benchmarks

* unbox helper functions

* remove unnecessary import

* write lifetime after primary trait

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
---
 .../src/benchmarking.rs                       |  2 +-
 .../src/helpers.rs                            | 78 ++++++++++++-------
 .../src/unsigned.rs                           |  2 +-
 frame/staking/src/offchain_election.rs        | 22 +++---
 4 files changed, 67 insertions(+), 37 deletions(-)

diff --git a/frame/election-provider-multi-phase/src/benchmarking.rs b/frame/election-provider-multi-phase/src/benchmarking.rs
index 3b1b7bd7a229..0a0f0f30c373 100644
--- a/frame/election-provider-multi-phase/src/benchmarking.rs
+++ b/frame/election-provider-multi-phase/src/benchmarking.rs
@@ -115,7 +115,7 @@ fn solution_with_size<T: Config>(
 	let cache = helpers::generate_voter_cache::<T>(&all_voters);
 	let stake_of = helpers::stake_of_fn::<T>(&all_voters, &cache);
 	let voter_index = helpers::voter_index_fn::<T>(&cache);
-	let target_index = helpers::target_index_fn_linear::<T>(&targets);
+	let target_index = helpers::target_index_fn::<T>(&targets);
 	let voter_at = helpers::voter_at_fn::<T>(&all_voters);
 	let target_at = helpers::target_at_fn::<T>(&targets);
 
diff --git a/frame/election-provider-multi-phase/src/helpers.rs b/frame/election-provider-multi-phase/src/helpers.rs
index 41d17e6aa9a2..a1e0c5f248d8 100644
--- a/frame/election-provider-multi-phase/src/helpers.rs
+++ b/frame/election-provider-multi-phase/src/helpers.rs
@@ -18,7 +18,7 @@
 //! Some helper functions/macros for this crate.
 
 use super::{Config, VoteWeight, CompactVoterIndexOf, CompactTargetIndexOf};
-use sp_std::{collections::btree_map::BTreeMap, convert::TryInto, boxed::Box, prelude::*};
+use sp_std::{collections::btree_map::BTreeMap, convert::TryInto, prelude::*};
 
 #[macro_export]
 macro_rules! log {
@@ -56,10 +56,10 @@ pub fn generate_voter_cache<T: Config>(
 /// The snapshot must be the same is the one used to create `cache`.
 pub fn voter_index_fn<T: Config>(
 	cache: &BTreeMap<T::AccountId, usize>,
-) -> Box<dyn Fn(&T::AccountId) -> Option<CompactVoterIndexOf<T>> + '_> {
-	Box::new(move |who| {
+) -> impl Fn(&T::AccountId) -> Option<CompactVoterIndexOf<T>> + '_ {
+	move |who| {
 		cache.get(who).and_then(|i| <usize as TryInto<CompactVoterIndexOf<T>>>::try_into(*i).ok())
-	})
+	}
 }
 
 /// Same as [`voter_index_fn`], but the returning index is converted into usize, if possible.
@@ -69,8 +69,8 @@ pub fn voter_index_fn<T: Config>(
 /// The snapshot must be the same is the one used to create `cache`.
 pub fn voter_index_fn_usize<T: Config>(
 	cache: &BTreeMap<T::AccountId, usize>,
-) -> Box<dyn Fn(&T::AccountId) -> Option<usize> + '_> {
-	Box::new(move |who| cache.get(who).cloned())
+) -> impl Fn(&T::AccountId) -> Option<usize> + '_ {
+	move |who| cache.get(who).cloned()
 }
 
 /// A non-optimized, linear version of [`voter_index_fn`] that does not need a cache and does a
@@ -79,64 +79,90 @@ pub fn voter_index_fn_usize<T: Config>(
 /// ## Warning
 ///
 /// Not meant to be used in production.
+#[cfg(test)]
 pub fn voter_index_fn_linear<T: Config>(
 	snapshot: &Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)>,
-) -> Box<dyn Fn(&T::AccountId) -> Option<CompactVoterIndexOf<T>> + '_> {
-	Box::new(move |who| {
+) -> impl Fn(&T::AccountId) -> Option<CompactVoterIndexOf<T>> + '_ {
+	move |who| {
 		snapshot
 			.iter()
 			.position(|(x, _, _)| x == who)
 			.and_then(|i| <usize as TryInto<CompactVoterIndexOf<T>>>::try_into(i).ok())
-	})
+	}
 }
 
-/// Create a function the returns the index a targets in the snapshot.
+/// Create a function the returns the index to a target in the snapshot.
 ///
-/// The returning index type is the same as the one defined in `T::CompactSolution::Target`.
+/// The returned index type is the same as the one defined in `T::CompactSolution::Target`.
+///
+/// Note: to the extent possible, the returned function should be cached and reused. Producing that
+/// function requires a `O(n log n)` data transform. Each invocation of that function completes
+/// in `O(log n)`.
+pub fn target_index_fn<T: Config>(
+	snapshot: &Vec<T::AccountId>,
+) -> impl Fn(&T::AccountId) -> Option<CompactTargetIndexOf<T>> + '_ {
+	let cache: BTreeMap<_, _> =
+		snapshot.iter().enumerate().map(|(idx, account_id)| (account_id, idx)).collect();
+	move |who| {
+		cache
+			.get(who)
+			.and_then(|i| <usize as TryInto<CompactTargetIndexOf<T>>>::try_into(*i).ok())
+	}
+}
+
+/// Create a function the returns the index to a target in the snapshot.
+///
+/// The returned index type is the same as the one defined in `T::CompactSolution::Target`.
+///
+/// ## Warning
+///
+/// Not meant to be used in production.
+#[cfg(test)]
 pub fn target_index_fn_linear<T: Config>(
 	snapshot: &Vec<T::AccountId>,
-) -> Box<dyn Fn(&T::AccountId) -> Option<CompactTargetIndexOf<T>> + '_> {
-	Box::new(move |who| {
+) -> impl Fn(&T::AccountId) -> Option<CompactTargetIndexOf<T>> + '_ {
+	move |who| {
 		snapshot
 			.iter()
 			.position(|x| x == who)
 			.and_then(|i| <usize as TryInto<CompactTargetIndexOf<T>>>::try_into(i).ok())
-	})
+	}
 }
 
 /// Create a function that can map a voter index ([`CompactVoterIndexOf`]) to the actual voter
 /// account using a linearly indexible snapshot.
 pub fn voter_at_fn<T: Config>(
 	snapshot: &Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)>,
-) -> Box<dyn Fn(CompactVoterIndexOf<T>) -> Option<T::AccountId> + '_> {
-	Box::new(move |i| {
+) -> impl Fn(CompactVoterIndexOf<T>) -> Option<T::AccountId> + '_ {
+	move |i| {
 		<CompactVoterIndexOf<T> as TryInto<usize>>::try_into(i)
 			.ok()
 			.and_then(|i| snapshot.get(i).map(|(x, _, _)| x).cloned())
-	})
+	}
 }
 
 /// Create a function that can map a target index ([`CompactTargetIndexOf`]) to the actual target
 /// account using a linearly indexible snapshot.
 pub fn target_at_fn<T: Config>(
 	snapshot: &Vec<T::AccountId>,
-) -> Box<dyn Fn(CompactTargetIndexOf<T>) -> Option<T::AccountId> + '_> {
-	Box::new(move |i| {
+) -> impl Fn(CompactTargetIndexOf<T>) -> Option<T::AccountId> + '_ {
+	move |i| {
 		<CompactTargetIndexOf<T> as TryInto<usize>>::try_into(i)
 			.ok()
 			.and_then(|i| snapshot.get(i).cloned())
-	})
+	}
 }
 
 /// Create a function to get the stake of a voter.
 ///
 /// This is not optimized and uses a linear search.
+#[cfg(test)]
 pub fn stake_of_fn_linear<T: Config>(
 	snapshot: &Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)>,
-) -> Box<dyn Fn(&T::AccountId) -> VoteWeight + '_> {
-	Box::new(move |who| {
+) -> impl Fn(&T::AccountId) -> VoteWeight + '_ {
+	move |who| {
 		snapshot.iter().find(|(x, _, _)| x == who).map(|(_, x, _)| *x).unwrap_or_default()
-	})
+	}
 }
 
 /// Create a function to get the stake of a voter.
@@ -148,12 +174,12 @@ pub fn stake_of_fn_linear<T: Config>(
 pub fn stake_of_fn<'a, T: Config>(
 	snapshot: &'a Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)>,
 	cache: &'a BTreeMap<T::AccountId, usize>,
-) -> Box<dyn Fn(&T::AccountId) -> VoteWeight + 'a> {
-	Box::new(move |who| {
+) -> impl Fn(&T::AccountId) -> VoteWeight + 'a {
+	move |who| {
 		if let Some(index) = cache.get(who) {
 			snapshot.get(*index).map(|(_, x, _)| x).cloned().unwrap_or_default()
 		} else {
 			0
 		}
-	})
+	}
 }
diff --git a/frame/election-provider-multi-phase/src/unsigned.rs b/frame/election-provider-multi-phase/src/unsigned.rs
index 3004e69c23c8..4ff224d86076 100644
--- a/frame/election-provider-multi-phase/src/unsigned.rs
+++ b/frame/election-provider-multi-phase/src/unsigned.rs
@@ -145,7 +145,7 @@ impl<T: Config> Pallet<T> {
 		// closures.
 		let cache = helpers::generate_voter_cache::<T>(&voters);
 		let voter_index = helpers::voter_index_fn::<T>(&cache);
-		let target_index = helpers::target_index_fn_linear::<T>(&targets);
+		let target_index = helpers::target_index_fn::<T>(&targets);
 		let voter_at = helpers::voter_at_fn::<T>(&voters);
 		let target_at = helpers::target_at_fn::<T>(&targets);
 		let stake_of = helpers::stake_of_fn::<T>(&voters, &cache);
diff --git a/frame/staking/src/offchain_election.rs b/frame/staking/src/offchain_election.rs
index cacfe454ec70..8fe3fc7367d9 100644
--- a/frame/staking/src/offchain_election.rs
+++ b/frame/staking/src/offchain_election.rs
@@ -31,7 +31,7 @@ use sp_npos_elections::{
 use sp_runtime::{
 	offchain::storage::StorageValueRef, traits::TrailingZeroInput, RuntimeDebug,
 };
-use sp_std::{convert::TryInto, prelude::*};
+use sp_std::{convert::TryInto, prelude::*, collections::btree_map::BTreeMap};
 
 /// Error types related to the offchain election machinery.
 #[derive(RuntimeDebug)]
@@ -331,18 +331,22 @@ pub fn prepare_submission<T: Config>(
 	let snapshot_nominators =
 		<Module<T>>::snapshot_nominators().ok_or(OffchainElectionError::SnapshotUnavailable)?;
 
+	// indexing caches
+	let nominator_indices: BTreeMap<_, _> =
+		snapshot_nominators.iter().enumerate().map(|(idx, account_id)| (account_id, idx)).collect();
+	let validator_indices: BTreeMap<_, _> =
+		snapshot_validators.iter().enumerate().map(|(idx, account_id)| (account_id, idx)).collect();
+
 	// all helper closures that we'd ever need.
 	let nominator_index = |a: &T::AccountId| -> Option<NominatorIndex> {
-		snapshot_nominators
-			.iter()
-			.position(|x| x == a)
-			.and_then(|i| <usize as TryInto<NominatorIndex>>::try_into(i).ok())
+		nominator_indices
+			.get(a)
+			.and_then(|i| <usize as TryInto<NominatorIndex>>::try_into(*i).ok())
 	};
 	let validator_index = |a: &T::AccountId| -> Option<ValidatorIndex> {
-		snapshot_validators
-			.iter()
-			.position(|x| x == a)
-			.and_then(|i| <usize as TryInto<ValidatorIndex>>::try_into(i).ok())
+		validator_indices
+			.get(a)
+			.and_then(|i| <usize as TryInto<ValidatorIndex>>::try_into(*i).ok())
 	};
 	let nominator_at = |i: NominatorIndex| -> Option<T::AccountId> {
 		snapshot_nominators.get(i as usize).cloned()

From cc24950837d3a98727b12ba9229f2aabb67f411c Mon Sep 17 00:00:00 2001
From: Shaun Wang <spxwang@gmail.com>
Date: Thu, 18 Mar 2021 21:50:08 +1300
Subject: [PATCH 0523/1194] Replace 'Module' with 'Pallet' in construct_runtime
 macro (#8372)

* Use 'Pallet' struct in construct_runtime.

* Fix genesis and metadata macro.

* Fix 'Pallet' type alias.

* Replace 'Module' with 'Pallet' for all construct_runtime use cases.

* Replace more deprecated 'Module' struct.

* Bring back AllModules and AllPalletsWithSystem type, but deprecate them.

* Replace deprecated 'Module' struct from merge master.

* Minor fix.

* Fix UI tests.

* Revert UI override in derive_no_bound.

* Fix more deprecated 'Module' use from master branch.

* Fix more deprecated 'Module' use from master branch.
---
 .../pallets/template/src/mock.rs              |   6 +-
 bin/node-template/runtime/src/lib.rs          |  22 +-
 bin/node/executor/tests/basic.rs              |   4 +-
 bin/node/runtime/src/lib.rs                   |  88 ++---
 frame/assets/src/benchmarking.rs              |   6 +-
 frame/assets/src/lib.rs                       |   8 +-
 frame/assets/src/mock.rs                      |   6 +-
 frame/assets/src/tests.rs                     |   2 +-
 frame/atomic-swap/src/lib.rs                  |   6 +-
 frame/atomic-swap/src/tests.rs                |   6 +-
 frame/aura/src/lib.rs                         |   4 +-
 frame/aura/src/mock.rs                        |   6 +-
 frame/authority-discovery/src/lib.rs          |   6 +-
 frame/authorship/src/lib.rs                   |  14 +-
 frame/babe/src/lib.rs                         |   2 +-
 frame/babe/src/mock.rs                        |  20 +-
 frame/babe/src/randomness.rs                  |   2 +-
 frame/balances/src/benchmarking.rs            |   2 +-
 frame/balances/src/lib.rs                     |   2 +-
 frame/balances/src/tests.rs                   |   2 +-
 frame/balances/src/tests_composite.rs         |   8 +-
 frame/balances/src/tests_local.rs             |   8 +-
 frame/balances/src/tests_reentrancy.rs        |  10 +-
 frame/benchmarking/src/lib.rs                 |  18 +-
 frame/benchmarking/src/tests.rs               |   6 +-
 frame/bounties/src/benchmarking.rs            |   6 +-
 frame/bounties/src/lib.rs                     |  10 +-
 frame/bounties/src/tests.rs                   |  10 +-
 frame/collective/src/benchmarking.rs          |   2 +-
 frame/collective/src/lib.rs                   |  12 +-
 frame/contracts/COMPLEXITY.md                 |   2 +-
 frame/contracts/src/benchmarking/code.rs      |   2 +-
 frame/contracts/src/benchmarking/mod.rs       |   4 +-
 frame/contracts/src/exec.rs                   |   8 +-
 frame/contracts/src/lib.rs                    |  18 +-
 frame/contracts/src/rent.rs                   |  14 +-
 frame/contracts/src/storage.rs                |   4 +-
 frame/contracts/src/tests.rs                  |  50 +--
 frame/contracts/src/wasm/code_cache.rs        |   2 +-
 frame/contracts/src/wasm/mod.rs               |   2 +-
 frame/democracy/src/benchmarking.rs           |   4 +-
 frame/democracy/src/lib.rs                    |  22 +-
 frame/democracy/src/tests.rs                  |  10 +-
 .../src/benchmarking.rs                       |   2 +-
 .../src/helpers.rs                            |   2 +-
 .../election-provider-multi-phase/src/mock.rs |   6 +-
 frame/elections-phragmen/src/lib.rs           |   8 +-
 frame/elections/src/lib.rs                    |   8 +-
 frame/elections/src/mock.rs                   |   6 +-
 frame/example-offchain-worker/src/tests.rs    |   4 +-
 frame/example-parallel/src/tests.rs           |   4 +-
 frame/example/src/lib.rs                      |   6 +-
 frame/executive/README.md                     |   4 +-
 frame/executive/src/lib.rs                    | 128 +++----
 frame/gilt/src/lib.rs                         |   4 +-
 frame/gilt/src/mock.rs                        |   6 +-
 frame/grandpa/src/lib.rs                      |   8 +-
 frame/grandpa/src/mock.rs                     |  18 +-
 frame/identity/src/benchmarking.rs            |   4 +-
 frame/identity/src/tests.rs                   |   6 +-
 frame/im-online/src/lib.rs                    |   2 +-
 frame/im-online/src/mock.rs                   |   8 +-
 frame/indices/src/mock.rs                     |   6 +-
 frame/lottery/src/lib.rs                      |   4 +-
 frame/lottery/src/mock.rs                     |   6 +-
 frame/membership/src/lib.rs                   |   4 +-
 .../primitives/src/lib.rs                     |   4 +-
 frame/merkle-mountain-range/src/mock.rs       |   6 +-
 frame/merkle-mountain-range/src/tests.rs      |   4 +-
 frame/multisig/src/lib.rs                     |   4 +-
 frame/multisig/src/tests.rs                   |   8 +-
 frame/nicks/src/lib.rs                        |   6 +-
 frame/node-authorization/src/mock.rs          |   4 +-
 frame/node-authorization/src/tests.rs         |   2 +-
 frame/offences/benchmarking/src/lib.rs        |   6 +-
 frame/offences/benchmarking/src/mock.rs       |  16 +-
 frame/offences/src/mock.rs                    |   4 +-
 frame/proxy/src/benchmarking.rs               |  14 +-
 frame/proxy/src/lib.rs                        |  10 +-
 frame/proxy/src/tests.rs                      |  16 +-
 frame/randomness-collective-flip/src/lib.rs   |   8 +-
 frame/recovery/src/lib.rs                     |   8 +-
 frame/recovery/src/mock.rs                    |   6 +-
 frame/scheduler/src/benchmarking.rs           |   2 +-
 frame/scheduler/src/lib.rs                    |   8 +-
 frame/scored-pool/src/mock.rs                 |   6 +-
 frame/scored-pool/src/tests.rs                |   4 +-
 frame/session/benchmarking/src/lib.rs         |   8 +-
 frame/session/benchmarking/src/mock.rs        |  10 +-
 frame/session/src/historical/mod.rs           |   2 +-
 frame/session/src/historical/offchain.rs      |   4 +-
 frame/session/src/historical/onchain.rs       |   2 +-
 frame/session/src/lib.rs                      |   8 +-
 frame/session/src/mock.rs                     |  16 +-
 frame/society/src/lib.rs                      |   6 +-
 frame/society/src/mock.rs                     |   8 +-
 frame/staking/fuzzer/src/mock.rs              |  12 +-
 frame/staking/src/lib.rs                      |  10 +-
 frame/staking/src/mock.rs                     |  10 +-
 frame/sudo/src/mock.rs                        |   6 +-
 .../procedural/src/construct_runtime/mod.rs   | 332 +++++++++---------
 .../procedural/src/construct_runtime/parse.rs |  72 ++--
 frame/support/procedural/src/lib.rs           |  14 +-
 .../src/pallet/expand/pallet_struct.rs        |   2 +
 frame/support/src/dispatch.rs                 |   9 +-
 frame/support/src/genesis_config.rs           |   6 +-
 frame/support/src/metadata.rs                 |  12 +-
 frame/support/test/src/lib.rs                 |   2 +-
 frame/support/test/tests/construct_runtime.rs |  22 +-
 .../conflicting_index.stderr                  |   4 +-
 .../conflicting_index_2.stderr                |   4 +-
 .../conflicting_module_name.rs                |   6 +-
 .../conflicting_module_name.stderr            |   8 +-
 .../double_module_parts.rs                    |   2 +-
 .../generics_in_invalid_module.rs             |   2 +-
 .../generics_in_invalid_module.stderr         |   2 +-
 .../invalid_module_details_keyword.stderr     |   2 +-
 .../invalid_module_entry.rs                   |   2 +-
 .../invalid_module_entry.stderr               |   2 +-
 ...g_event_generic_on_module_with_instance.rs |   2 +-
 ...ent_generic_on_module_with_instance.stderr |   2 +-
 ..._origin_generic_on_module_with_instance.rs |   2 +-
 ...gin_generic_on_module_with_instance.stderr |   2 +-
 .../missing_system_module.stderr              |   2 +-
 .../more_than_256_modules.stderr              |   2 +-
 frame/support/test/tests/instance.rs          |  16 +-
 frame/support/test/tests/issue2219.rs         |   4 +-
 frame/support/test/tests/pallet.rs            |  12 +-
 .../test/tests/pallet_compatibility.rs        |   6 +-
 .../tests/pallet_compatibility_instance.rs    |  14 +-
 frame/support/test/tests/pallet_instance.rs   |  38 +-
 frame/support/test/tests/pallet_version.rs    |  22 +-
 .../tests/pallet_with_name_trait_is_valid.rs  |   4 +-
 frame/system/README.md                        |   4 +-
 frame/system/benches/bench.rs                 |   4 +-
 frame/system/benchmarking/src/lib.rs          |   6 +-
 frame/system/benchmarking/src/mock.rs         |   2 +-
 frame/system/src/extensions/check_genesis.rs  |   4 +-
 .../system/src/extensions/check_mortality.rs  |   8 +-
 .../src/extensions/check_spec_version.rs      |   4 +-
 .../system/src/extensions/check_tx_version.rs |   4 +-
 frame/system/src/extensions/check_weight.rs   |   6 +-
 frame/system/src/lib.rs                       |  24 +-
 frame/system/src/mock.rs                      |   2 +-
 frame/timestamp/src/benchmarking.rs           |   2 +-
 frame/timestamp/src/lib.rs                    |   4 +-
 frame/tips/src/lib.rs                         |   4 +-
 frame/tips/src/tests.rs                       |  10 +-
 frame/transaction-payment/src/lib.rs          |  10 +-
 frame/treasury/src/tests.rs                   |   8 +-
 frame/utility/src/benchmarking.rs             |   2 +-
 frame/utility/src/tests.rs                    |  10 +-
 frame/vesting/src/benchmarking.rs             |   2 +-
 frame/vesting/src/lib.rs                      |  10 +-
 .../runtime/src/offchain/storage_lock.rs      |   4 +-
 test-utils/runtime/src/lib.rs                 |  28 +-
 utils/frame/remote-externalities/src/lib.rs   |   2 +-
 157 files changed, 881 insertions(+), 864 deletions(-)

diff --git a/bin/node-template/pallets/template/src/mock.rs b/bin/node-template/pallets/template/src/mock.rs
index d33670f2e9cb..1ebe3bee6090 100644
--- a/bin/node-template/pallets/template/src/mock.rs
+++ b/bin/node-template/pallets/template/src/mock.rs
@@ -7,7 +7,7 @@ use sp_runtime::{
 use frame_system as system;
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
-type Block = frame_system::mocking::MockBlock<Test>; 
+type Block = frame_system::mocking::MockBlock<Test>;
 
 // Configure a mock runtime to test the pallet.
 frame_support::construct_runtime!(
@@ -16,8 +16,8 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		TemplateModule: pallet_template::{Module, Call, Storage, Event<T>},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		TemplateModule: pallet_template::{Pallet, Call, Storage, Event<T>},
 	}
 );
 
diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index 9436ae269bbb..4ca347dd8813 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -270,16 +270,16 @@ construct_runtime!(
 		NodeBlock = opaque::Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Module, Call, Storage},
-		Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent},
-		Aura: pallet_aura::{Module, Config<T>},
-		Grandpa: pallet_grandpa::{Module, Call, Storage, Config, Event},
-		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
-		TransactionPayment: pallet_transaction_payment::{Module, Storage},
-		Sudo: pallet_sudo::{Module, Call, Config<T>, Storage, Event<T>},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Call, Storage},
+		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
+		Aura: pallet_aura::{Pallet, Config<T>},
+		Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event},
+		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		TransactionPayment: pallet_transaction_payment::{Pallet, Storage},
+		Sudo: pallet_sudo::{Pallet, Call, Config<T>, Storage, Event<T>},
 		// Include the custom logic from the template pallet in the runtime.
-		TemplateModule: template::{Module, Call, Storage, Event<T>},
+		TemplateModule: template::{Pallet, Call, Storage, Event<T>},
 	}
 );
 
@@ -313,7 +313,7 @@ pub type Executive = frame_executive::Executive<
 	Block,
 	frame_system::ChainContext<Runtime>,
 	Runtime,
-	AllModules,
+	AllPallets,
 >;
 
 impl_runtime_apis! {
@@ -453,7 +453,7 @@ impl_runtime_apis! {
 		) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {
 			use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey};
 
-			use frame_system_benchmarking::Module as SystemBench;
+			use frame_system_benchmarking::Pallet as SystemBench;
 			impl frame_system_benchmarking::Config for Runtime {}
 
 			let whitelist: Vec<TrackedStorageKey> = vec![
diff --git a/bin/node/executor/tests/basic.rs b/bin/node/executor/tests/basic.rs
index 279b6a776031..0d228678aeec 100644
--- a/bin/node/executor/tests/basic.rs
+++ b/bin/node/executor/tests/basic.rs
@@ -600,13 +600,13 @@ fn deploying_wasm_contract_should_work() {
 	let transfer_code = wat::parse_str(CODE_TRANSFER).unwrap();
 	let transfer_ch = <Runtime as frame_system::Config>::Hashing::hash(&transfer_code);
 
-	let addr = pallet_contracts::Module::<Runtime>::contract_address(
+	let addr = pallet_contracts::Pallet::<Runtime>::contract_address(
 		&charlie(),
 		&transfer_ch,
 		&[],
 	);
 
-	let subsistence = pallet_contracts::Module::<Runtime>::subsistence_threshold();
+	let subsistence = pallet_contracts::Pallet::<Runtime>::subsistence_threshold();
 
 	let time = 42 * 1000;
 	let b = construct_block(
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 49c6cb529130..12de6d54aaf3 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -379,7 +379,7 @@ impl pallet_balances::Config for Runtime {
 	type DustRemoval = ();
 	type Event = Event;
 	type ExistentialDeposit = ExistentialDeposit;
-	type AccountStore = frame_system::Module<Runtime>;
+	type AccountStore = frame_system::Pallet<Runtime>;
 	type WeightInfo = pallet_balances::weights::SubstrateWeight<Runtime>;
 }
 
@@ -1005,7 +1005,7 @@ impl pallet_mmr::Config for Runtime {
 	const INDEXING_PREFIX: &'static [u8] = b"mmr";
 	type Hashing = <Runtime as frame_system::Config>::Hashing;
 	type Hash = <Runtime as frame_system::Config>::Hash;
-	type LeafData = frame_system::Module<Self>;
+	type LeafData = frame_system::Pallet<Self>;
 	type OnNewRoot = ();
 	type WeightInfo = ();
 }
@@ -1086,44 +1086,44 @@ construct_runtime!(
 		NodeBlock = node_primitives::Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Utility: pallet_utility::{Module, Call, Event},
-		Babe: pallet_babe::{Module, Call, Storage, Config, ValidateUnsigned},
-		Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent},
-		Authorship: pallet_authorship::{Module, Call, Storage, Inherent},
-		Indices: pallet_indices::{Module, Call, Storage, Config<T>, Event<T>},
-		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
-		TransactionPayment: pallet_transaction_payment::{Module, Storage},
-		ElectionProviderMultiPhase: pallet_election_provider_multi_phase::{Module, Call, Storage, Event<T>, ValidateUnsigned},
-		Staking: pallet_staking::{Module, Call, Config<T>, Storage, Event<T>, ValidateUnsigned},
-		Session: pallet_session::{Module, Call, Storage, Event, Config<T>},
-		Democracy: pallet_democracy::{Module, Call, Storage, Config, Event<T>},
-		Council: pallet_collective::<Instance1>::{Module, Call, Storage, Origin<T>, Event<T>, Config<T>},
-		TechnicalCommittee: pallet_collective::<Instance2>::{Module, Call, Storage, Origin<T>, Event<T>, Config<T>},
-		Elections: pallet_elections_phragmen::{Module, Call, Storage, Event<T>, Config<T>},
-		TechnicalMembership: pallet_membership::<Instance1>::{Module, Call, Storage, Event<T>, Config<T>},
-		Grandpa: pallet_grandpa::{Module, Call, Storage, Config, Event, ValidateUnsigned},
-		Treasury: pallet_treasury::{Module, Call, Storage, Config, Event<T>},
-		Contracts: pallet_contracts::{Module, Call, Config<T>, Storage, Event<T>},
-		Sudo: pallet_sudo::{Module, Call, Config<T>, Storage, Event<T>},
-		ImOnline: pallet_im_online::{Module, Call, Storage, Event<T>, ValidateUnsigned, Config<T>},
-		AuthorityDiscovery: pallet_authority_discovery::{Module, Call, Config},
-		Offences: pallet_offences::{Module, Call, Storage, Event},
-		Historical: pallet_session_historical::{Module},
-		RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Module, Call, Storage},
-		Identity: pallet_identity::{Module, Call, Storage, Event<T>},
-		Society: pallet_society::{Module, Call, Storage, Event<T>, Config<T>},
-		Recovery: pallet_recovery::{Module, Call, Storage, Event<T>},
-		Vesting: pallet_vesting::{Module, Call, Storage, Event<T>, Config<T>},
-		Scheduler: pallet_scheduler::{Module, Call, Storage, Event<T>},
-		Proxy: pallet_proxy::{Module, Call, Storage, Event<T>},
-		Multisig: pallet_multisig::{Module, Call, Storage, Event<T>},
-		Bounties: pallet_bounties::{Module, Call, Storage, Event<T>},
-		Tips: pallet_tips::{Module, Call, Storage, Event<T>},
-		Assets: pallet_assets::{Module, Call, Storage, Event<T>},
-		Mmr: pallet_mmr::{Module, Storage},
-		Lottery: pallet_lottery::{Module, Call, Storage, Event<T>},
-		Gilt: pallet_gilt::{Module, Call, Storage, Event<T>, Config},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Utility: pallet_utility::{Pallet, Call, Event},
+		Babe: pallet_babe::{Pallet, Call, Storage, Config, ValidateUnsigned},
+		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
+		Authorship: pallet_authorship::{Pallet, Call, Storage, Inherent},
+		Indices: pallet_indices::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		TransactionPayment: pallet_transaction_payment::{Pallet, Storage},
+		ElectionProviderMultiPhase: pallet_election_provider_multi_phase::{Pallet, Call, Storage, Event<T>, ValidateUnsigned},
+		Staking: pallet_staking::{Pallet, Call, Config<T>, Storage, Event<T>, ValidateUnsigned},
+		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
+		Democracy: pallet_democracy::{Pallet, Call, Storage, Config, Event<T>},
+		Council: pallet_collective::<Instance1>::{Pallet, Call, Storage, Origin<T>, Event<T>, Config<T>},
+		TechnicalCommittee: pallet_collective::<Instance2>::{Pallet, Call, Storage, Origin<T>, Event<T>, Config<T>},
+		Elections: pallet_elections_phragmen::{Pallet, Call, Storage, Event<T>, Config<T>},
+		TechnicalMembership: pallet_membership::<Instance1>::{Pallet, Call, Storage, Event<T>, Config<T>},
+		Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event, ValidateUnsigned},
+		Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>},
+		Contracts: pallet_contracts::{Pallet, Call, Config<T>, Storage, Event<T>},
+		Sudo: pallet_sudo::{Pallet, Call, Config<T>, Storage, Event<T>},
+		ImOnline: pallet_im_online::{Pallet, Call, Storage, Event<T>, ValidateUnsigned, Config<T>},
+		AuthorityDiscovery: pallet_authority_discovery::{Pallet, Call, Config},
+		Offences: pallet_offences::{Pallet, Call, Storage, Event},
+		Historical: pallet_session_historical::{Pallet},
+		RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Call, Storage},
+		Identity: pallet_identity::{Pallet, Call, Storage, Event<T>},
+		Society: pallet_society::{Pallet, Call, Storage, Event<T>, Config<T>},
+		Recovery: pallet_recovery::{Pallet, Call, Storage, Event<T>},
+		Vesting: pallet_vesting::{Pallet, Call, Storage, Event<T>, Config<T>},
+		Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>},
+		Proxy: pallet_proxy::{Pallet, Call, Storage, Event<T>},
+		Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>},
+		Bounties: pallet_bounties::{Pallet, Call, Storage, Event<T>},
+		Tips: pallet_tips::{Pallet, Call, Storage, Event<T>},
+		Assets: pallet_assets::{Pallet, Call, Storage, Event<T>},
+		Mmr: pallet_mmr::{Pallet, Storage},
+		Lottery: pallet_lottery::{Pallet, Call, Storage, Event<T>},
+		Gilt: pallet_gilt::{Pallet, Call, Storage, Event<T>, Config},
 	}
 );
 
@@ -1163,7 +1163,7 @@ pub type Executive = frame_executive::Executive<
 	Block,
 	frame_system::ChainContext<Runtime>,
 	Runtime,
-	AllModules,
+	AllPallets,
 	(),
 >;
 
@@ -1435,9 +1435,9 @@ impl_runtime_apis! {
 			// Trying to add benchmarks directly to the Session Pallet caused cyclic dependency
 			// issues. To get around that, we separated the Session benchmarks into its own crate,
 			// which is why we need these two lines below.
-			use pallet_session_benchmarking::Module as SessionBench;
-			use pallet_offences_benchmarking::Module as OffencesBench;
-			use frame_system_benchmarking::Module as SystemBench;
+			use pallet_session_benchmarking::Pallet as SessionBench;
+			use pallet_offences_benchmarking::Pallet as OffencesBench;
+			use frame_system_benchmarking::Pallet as SystemBench;
 
 			impl pallet_session_benchmarking::Config for Runtime {}
 			impl pallet_offences_benchmarking::Config for Runtime {}
diff --git a/frame/assets/src/benchmarking.rs b/frame/assets/src/benchmarking.rs
index 42f876ff7f3d..37300bf221de 100644
--- a/frame/assets/src/benchmarking.rs
+++ b/frame/assets/src/benchmarking.rs
@@ -29,7 +29,7 @@ use frame_benchmarking::{
 use frame_support::traits::Get;
 use frame_support::{traits::EnsureOrigin, dispatch::UnfilteredDispatchable};
 
-use crate::Module as Assets;
+use crate::Pallet as Assets;
 
 const SEED: u32 = 0;
 
@@ -120,7 +120,7 @@ fn add_approvals<T: Config>(minter: T::AccountId, n: u32) {
 }
 
 fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
-	let events = frame_system::Module::<T>::events();
+	let events = frame_system::Pallet::<T>::events();
 	let system_event: <T as frame_system::Config>::Event = generic_event.into();
 	// compare to the last event record
 	let frame_system::EventRecord { event, .. } = &events[events.len() - 1];
@@ -193,7 +193,7 @@ benchmarks! {
 		let target_lookup = T::Lookup::unlookup(target.clone());
 	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), target_lookup, amount)
 	verify {
-		assert!(frame_system::Module::<T>::account_exists(&caller));
+		assert!(frame_system::Pallet::<T>::account_exists(&caller));
 		assert_last_event::<T>(Event::Transferred(Default::default(), caller, target, amount).into());
 	}
 
diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index e5cb39db2b8e..b8d436f106bb 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -1375,11 +1375,11 @@ impl<T: Config> Pallet<T> {
 	) -> Result<bool, DispatchError> {
 		let accounts = d.accounts.checked_add(1).ok_or(Error::<T>::Overflow)?;
 		let is_sufficient = if d.is_sufficient {
-			frame_system::Module::<T>::inc_sufficients(who);
+			frame_system::Pallet::<T>::inc_sufficients(who);
 			d.sufficients += 1;
 			true
 		} else {
-			frame_system::Module::<T>::inc_consumers(who).map_err(|_| Error::<T>::NoProvider)?;
+			frame_system::Pallet::<T>::inc_consumers(who).map_err(|_| Error::<T>::NoProvider)?;
 			false
 		};
 		d.accounts = accounts;
@@ -1393,9 +1393,9 @@ impl<T: Config> Pallet<T> {
 	) {
 		if sufficient {
 			d.sufficients = d.sufficients.saturating_sub(1);
-			frame_system::Module::<T>::dec_sufficients(who);
+			frame_system::Pallet::<T>::dec_sufficients(who);
 		} else {
-			frame_system::Module::<T>::dec_consumers(who);
+			frame_system::Pallet::<T>::dec_consumers(who);
 		}
 		d.accounts = d.accounts.saturating_sub(1);
 	}
diff --git a/frame/assets/src/mock.rs b/frame/assets/src/mock.rs
index 434a7ccce075..806d85ce7194 100644
--- a/frame/assets/src/mock.rs
+++ b/frame/assets/src/mock.rs
@@ -33,9 +33,9 @@ construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
-		Assets: pallet_assets::{Module, Call, Storage, Event<T>},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Assets: pallet_assets::{Pallet, Call, Storage, Event<T>},
 	}
 );
 
diff --git a/frame/assets/src/tests.rs b/frame/assets/src/tests.rs
index 89173b64d589..1fe9358dcbff 100644
--- a/frame/assets/src/tests.rs
+++ b/frame/assets/src/tests.rs
@@ -23,7 +23,7 @@ use frame_support::{assert_ok, assert_noop, traits::Currency};
 use pallet_balances::Error as BalancesError;
 
 fn last_event() -> mock::Event {
-	frame_system::Module::<Test>::events().pop().expect("Event expected").event
+	frame_system::Pallet::<Test>::events().pop().expect("Event expected").event
 }
 
 #[test]
diff --git a/frame/atomic-swap/src/lib.rs b/frame/atomic-swap/src/lib.rs
index e6d44d73c40d..536a452c115d 100644
--- a/frame/atomic-swap/src/lib.rs
+++ b/frame/atomic-swap/src/lib.rs
@@ -191,7 +191,7 @@ decl_event!(
 	{
 		/// Swap created. \[account, proof, swap\]
 		NewSwap(AccountId, HashedProof, PendingSwap),
-		/// Swap claimed. The last parameter indicates whether the execution succeeds. 
+		/// Swap claimed. The last parameter indicates whether the execution succeeds.
 		/// \[account, proof, success\]
 		SwapClaimed(AccountId, HashedProof, bool),
 		/// Swap cancelled. \[account, proof\]
@@ -237,7 +237,7 @@ decl_module! {
 			let swap = PendingSwap {
 				source,
 				action,
-				end_block: frame_system::Module::<T>::block_number() + duration,
+				end_block: frame_system::Pallet::<T>::block_number() + duration,
 			};
 			PendingSwaps::<T>::insert(target.clone(), hashed_proof.clone(), swap.clone());
 
@@ -307,7 +307,7 @@ decl_module! {
 				Error::<T>::SourceMismatch,
 			);
 			ensure!(
-				frame_system::Module::<T>::block_number() >= swap.end_block,
+				frame_system::Pallet::<T>::block_number() >= swap.end_block,
 				Error::<T>::DurationNotPassed,
 			);
 
diff --git a/frame/atomic-swap/src/tests.rs b/frame/atomic-swap/src/tests.rs
index 977b17f8710e..baa9a08957d4 100644
--- a/frame/atomic-swap/src/tests.rs
+++ b/frame/atomic-swap/src/tests.rs
@@ -19,9 +19,9 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
-		AtomicSwap: pallet_atomic_swap::{Module, Call, Event<T>},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		AtomicSwap: pallet_atomic_swap::{Pallet, Call, Event<T>},
 	}
 );
 
diff --git a/frame/aura/src/lib.rs b/frame/aura/src/lib.rs
index 17484461cdef..40d17115412f 100644
--- a/frame/aura/src/lib.rs
+++ b/frame/aura/src/lib.rs
@@ -130,7 +130,7 @@ impl<T: Config> Pallet<T> {
 			AURA_ENGINE_ID,
 			ConsensusLog::AuthoritiesChange(new).encode()
 		);
-		<frame_system::Module<T>>::deposit_log(log.into());
+		<frame_system::Pallet<T>>::deposit_log(log.into());
 	}
 
 	fn initialize_authorities(authorities: &[T::AuthorityId]) {
@@ -194,7 +194,7 @@ impl<T: Config> OneSessionHandler<T::AccountId> for Pallet<T> {
 			ConsensusLog::<T::AuthorityId>::OnDisabled(i as AuthorityIndex).encode(),
 		);
 
-		<frame_system::Module<T>>::deposit_log(log.into());
+		<frame_system::Pallet<T>>::deposit_log(log.into());
 	}
 }
 
diff --git a/frame/aura/src/mock.rs b/frame/aura/src/mock.rs
index a5ef12f5935f..481edbaff487 100644
--- a/frame/aura/src/mock.rs
+++ b/frame/aura/src/mock.rs
@@ -34,9 +34,9 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent},
-		Aura: pallet_aura::{Module, Call, Storage, Config<T>},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
+		Aura: pallet_aura::{Pallet, Call, Storage, Config<T>},
 	}
 );
 
diff --git a/frame/authority-discovery/src/lib.rs b/frame/authority-discovery/src/lib.rs
index cc3f41f59ed8..ca8f3eeff3d6 100644
--- a/frame/authority-discovery/src/lib.rs
+++ b/frame/authority-discovery/src/lib.rs
@@ -136,9 +136,9 @@ mod tests {
 			NodeBlock = Block,
 			UncheckedExtrinsic = UncheckedExtrinsic,
 		{
-			System: frame_system::{Module, Call, Config, Storage, Event<T>},
-			Session: pallet_session::{Module, Call, Storage, Event, Config<T>},
-			AuthorityDiscovery: pallet_authority_discovery::{Module, Call, Config},
+			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+			Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
+			AuthorityDiscovery: pallet_authority_discovery::{Pallet, Call, Config},
 		}
 	);
 
diff --git a/frame/authorship/src/lib.rs b/frame/authorship/src/lib.rs
index 3d89ab24d01c..286abc721cbb 100644
--- a/frame/authorship/src/lib.rs
+++ b/frame/authorship/src/lib.rs
@@ -234,7 +234,7 @@ impl<T: Config> Module<T> {
 			return author;
 		}
 
-		let digest = <frame_system::Module<T>>::digest();
+		let digest = <frame_system::Pallet<T>>::digest();
 		let pre_runtime_digests = digest.logs.iter().filter_map(|d| d.as_pre_runtime());
 		if let Some(author) = T::FindAuthor::find_author(pre_runtime_digests) {
 			<Self as Store>::Author::put(&author);
@@ -245,7 +245,7 @@ impl<T: Config> Module<T> {
 	}
 
 	fn verify_and_import_uncles(new_uncles: Vec<T::Header>) -> dispatch::DispatchResult {
-		let now = <frame_system::Module<T>>::block_number();
+		let now = <frame_system::Pallet<T>>::block_number();
 
 		let mut uncles = <Self as Store>::Uncles::get();
 		uncles.push(UncleEntryItem::InclusionHeight(now));
@@ -278,7 +278,7 @@ impl<T: Config> Module<T> {
 		accumulator: &mut <T::FilterUncle as FilterUncle<T::Header, T::AccountId>>::Accumulator,
 	) -> Result<Option<T::AccountId>, dispatch::DispatchError>
 	{
-		let now = <frame_system::Module<T>>::block_number();
+		let now = <frame_system::Pallet<T>>::block_number();
 
 		let (minimum_height, maximum_height) = {
 			let uncle_generations = T::UncleGenerations::get();
@@ -303,7 +303,7 @@ impl<T: Config> Module<T> {
 
 		{
 			let parent_number = uncle.number().clone() - One::one();
-			let parent_hash = <frame_system::Module<T>>::block_hash(&parent_number);
+			let parent_hash = <frame_system::Pallet<T>>::block_hash(&parent_number);
 			if &parent_hash != uncle.parent_hash() {
 				return Err(Error::<T>::InvalidUncleParent.into());
 			}
@@ -314,7 +314,7 @@ impl<T: Config> Module<T> {
 		}
 
 		let duplicate = existing_uncles.into_iter().find(|h| **h == hash).is_some();
-		let in_chain = <frame_system::Module<T>>::block_hash(uncle.number()) == hash;
+		let in_chain = <frame_system::Pallet<T>>::block_hash(uncle.number()) == hash;
 
 		if duplicate || in_chain {
 			return Err(Error::<T>::UncleAlreadyIncluded.into())
@@ -413,8 +413,8 @@ mod tests {
 			NodeBlock = Block,
 			UncheckedExtrinsic = UncheckedExtrinsic,
 		{
-			System: frame_system::{Module, Call, Config, Storage, Event<T>},
-			Authorship: pallet_authorship::{Module, Call, Storage, Inherent},
+			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+			Authorship: pallet_authorship::{Pallet, Call, Storage, Inherent},
 		}
 	);
 
diff --git a/frame/babe/src/lib.rs b/frame/babe/src/lib.rs
index 5c8b8bb0a7ca..fb1e32e5350b 100644
--- a/frame/babe/src/lib.rs
+++ b/frame/babe/src/lib.rs
@@ -536,7 +536,7 @@ impl<T: Config> Pallet<T> {
 		// Update the start blocks of the previous and new current epoch.
 		<EpochStart<T>>::mutate(|(previous_epoch_start_block, current_epoch_start_block)| {
 			*previous_epoch_start_block = sp_std::mem::take(current_epoch_start_block);
-			*current_epoch_start_block = <frame_system::Module<T>>::block_number();
+			*current_epoch_start_block = <frame_system::Pallet<T>>::block_number();
 		});
 
 		// After we update the current epoch, we signal the *next* epoch change
diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index 4a5932132781..0029b51abf39 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -51,14 +51,14 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
-		Historical: pallet_session_historical::{Module},
-		Offences: pallet_offences::{Module, Call, Storage, Event},
-		Babe: pallet_babe::{Module, Call, Storage, Config, ValidateUnsigned},
-		Staking: pallet_staking::{Module, Call, Storage, Config<T>, Event<T>},
-		Session: pallet_session::{Module, Call, Storage, Event, Config<T>},
-		Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Historical: pallet_session_historical::{Pallet},
+		Offences: pallet_offences::{Pallet, Call, Storage, Event},
+		Babe: pallet_babe::{Pallet, Call, Storage, Config, ValidateUnsigned},
+		Staking: pallet_staking::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
+		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
 	}
 );
 
@@ -104,7 +104,7 @@ where
 
 impl_opaque_keys! {
 	pub struct MockSessionKeys {
-		pub babe_authority: super::Module<Test>,
+		pub babe_authority: super::Pallet<Test>,
 	}
 }
 
@@ -204,7 +204,7 @@ impl pallet_staking::Config for Test {
 	type SlashDeferDuration = SlashDeferDuration;
 	type SlashCancelOrigin = frame_system::EnsureRoot<Self::AccountId>;
 	type SessionInterface = Self;
-	type UnixTime = pallet_timestamp::Module<Test>;
+	type UnixTime = pallet_timestamp::Pallet<Test>;
 	type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
 	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
 	type NextNewSession = Session;
diff --git a/frame/babe/src/randomness.rs b/frame/babe/src/randomness.rs
index 16846c455986..a7e8b3157768 100644
--- a/frame/babe/src/randomness.rs
+++ b/frame/babe/src/randomness.rs
@@ -143,6 +143,6 @@ impl<T: Config> RandomnessT<Option<T::Hash>, T::BlockNumber> for CurrentBlockRan
 			T::Hashing::hash(&subject[..])
 		});
 
-		(random, <frame_system::Module<T>>::block_number())
+		(random, <frame_system::Pallet<T>>::block_number())
 	}
 }
diff --git a/frame/balances/src/benchmarking.rs b/frame/balances/src/benchmarking.rs
index c7cb67403d74..62959c4f1dc4 100644
--- a/frame/balances/src/benchmarking.rs
+++ b/frame/balances/src/benchmarking.rs
@@ -25,7 +25,7 @@ use frame_system::RawOrigin;
 use frame_benchmarking::{benchmarks_instance_pallet, account, whitelisted_caller, impl_benchmark_test_suite};
 use sp_runtime::traits::Bounded;
 
-use crate::Module as Balances;
+use crate::Pallet as Balances;
 
 const SEED: u32 = 0;
 // existential deposit multiplier
diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index cc7b6351c258..8908f4c09775 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -624,7 +624,7 @@ pub struct DustCleaner<T: Config<I>, I: 'static = ()>(Option<(T::AccountId, Nega
 impl<T: Config<I>, I: 'static> Drop for DustCleaner<T, I> {
 	fn drop(&mut self) {
 		if let Some((who, dust)) = self.0.take() {
-			Module::<T, I>::deposit_event(Event::DustLost(who, dust.peek()));
+			Pallet::<T, I>::deposit_event(Event::DustLost(who, dust.peek()));
 			T::DustRemoval::on_unbalanced(dust);
 		}
 	}
diff --git a/frame/balances/src/tests.rs b/frame/balances/src/tests.rs
index 776cda140efb..da6c99d46ced 100644
--- a/frame/balances/src/tests.rs
+++ b/frame/balances/src/tests.rs
@@ -55,7 +55,7 @@ macro_rules! decl_tests {
 		}
 
 		fn last_event() -> Event {
-			system::Module::<Test>::events().pop().expect("Event expected").event
+			system::Pallet::<Test>::events().pop().expect("Event expected").event
 		}
 
 		#[test]
diff --git a/frame/balances/src/tests_composite.rs b/frame/balances/src/tests_composite.rs
index 14dfd0c4b33d..90bcaf1a480a 100644
--- a/frame/balances/src/tests_composite.rs
+++ b/frame/balances/src/tests_composite.rs
@@ -30,7 +30,7 @@ use frame_support::weights::{Weight, DispatchInfo, IdentityFee};
 use pallet_transaction_payment::CurrencyAdapter;
 use crate::{
 	self as pallet_balances,
-	Module, Config, decl_tests,
+	Pallet, Config, decl_tests,
 };
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -41,8 +41,8 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
 	}
 );
 
@@ -80,7 +80,7 @@ parameter_types! {
 	pub const TransactionByteFee: u64 = 1;
 }
 impl pallet_transaction_payment::Config for Test {
-	type OnChargeTransaction = CurrencyAdapter<Module<Test>, ()>;
+	type OnChargeTransaction = CurrencyAdapter<Pallet<Test>, ()>;
 	type TransactionByteFee = TransactionByteFee;
 	type WeightToFee = IdentityFee<u64>;
 	type FeeMultiplierUpdate = ();
diff --git a/frame/balances/src/tests_local.rs b/frame/balances/src/tests_local.rs
index 02088e88b98e..10ea74d8887b 100644
--- a/frame/balances/src/tests_local.rs
+++ b/frame/balances/src/tests_local.rs
@@ -30,7 +30,7 @@ use frame_support::traits::StorageMapShim;
 use frame_support::weights::{Weight, DispatchInfo, IdentityFee};
 use crate::{
 	self as pallet_balances,
-	Module, Config, decl_tests,
+	Pallet, Config, decl_tests,
 };
 use pallet_transaction_payment::CurrencyAdapter;
 
@@ -43,8 +43,8 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
 	}
 );
 
@@ -82,7 +82,7 @@ parameter_types! {
 	pub const TransactionByteFee: u64 = 1;
 }
 impl pallet_transaction_payment::Config for Test {
-	type OnChargeTransaction = CurrencyAdapter<Module<Test>, ()>;
+	type OnChargeTransaction = CurrencyAdapter<Pallet<Test>, ()>;
 	type TransactionByteFee = TransactionByteFee;
 	type WeightToFee = IdentityFee<u64>;
 	type FeeMultiplierUpdate = ();
diff --git a/frame/balances/src/tests_reentrancy.rs b/frame/balances/src/tests_reentrancy.rs
index 020c514b6317..547c7dd7cfb7 100644
--- a/frame/balances/src/tests_reentrancy.rs
+++ b/frame/balances/src/tests_reentrancy.rs
@@ -30,7 +30,7 @@ use frame_support::traits::StorageMapShim;
 use frame_support::weights::{IdentityFee};
 use crate::{
 	self as pallet_balances,
-	Module, Config,
+	Pallet, Config,
 };
 use pallet_transaction_payment::CurrencyAdapter;
 
@@ -47,7 +47,7 @@ type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 fn last_event() -> Event {
-	system::Module::<Test>::events().pop().expect("Event expected").event
+	system::Pallet::<Test>::events().pop().expect("Event expected").event
 }
 
 frame_support::construct_runtime!(
@@ -56,8 +56,8 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
 	}
 );
 
@@ -95,7 +95,7 @@ parameter_types! {
 	pub const TransactionByteFee: u64 = 1;
 }
 impl pallet_transaction_payment::Config for Test {
-	type OnChargeTransaction = CurrencyAdapter<Module<Test>, ()>;
+	type OnChargeTransaction = CurrencyAdapter<Pallet<Test>, ()>;
 	type TransactionByteFee = TransactionByteFee;
 	type WeightToFee = IdentityFee<u64>;
 	type FeeMultiplierUpdate = ();
diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
index c2f60a5e13c4..b134e79ca245 100644
--- a/frame/benchmarking/src/lib.rs
+++ b/frame/benchmarking/src/lib.rs
@@ -676,7 +676,7 @@ macro_rules! impl_benchmark {
 		( $( $name_extra:ident ),* )
 	) => {
 		impl<T: Config $(<$instance>, $instance: $instance_bound )? >
-			$crate::Benchmarking<$crate::BenchmarkResults> for Module<T $(, $instance)? >
+			$crate::Benchmarking<$crate::BenchmarkResults> for Pallet<T $(, $instance)? >
 			where T: frame_system::Config, $( $where_clause )*
 		{
 			fn benchmarks(extra: bool) -> $crate::Vec<&'static [u8]> {
@@ -744,8 +744,8 @@ macro_rules! impl_benchmark {
 						>::instance(&selected_benchmark, c, verify)?;
 
 						// Set the block number to at least 1 so events are deposited.
-						if $crate::Zero::is_zero(&frame_system::Module::<T>::block_number()) {
-							frame_system::Module::<T>::set_block_number(1u32.into());
+						if $crate::Zero::is_zero(&frame_system::Pallet::<T>::block_number()) {
+							frame_system::Pallet::<T>::set_block_number(1u32.into());
 						}
 
 						// Commit the externalities to the database, flushing the DB cache.
@@ -915,8 +915,8 @@ macro_rules! impl_benchmark_test {
 					>::instance(&selected_benchmark, &c, true)?;
 
 					// Set the block number to at least 1 so events are deposited.
-					if $crate::Zero::is_zero(&frame_system::Module::<T>::block_number()) {
-						frame_system::Module::<T>::set_block_number(1u32.into());
+					if $crate::Zero::is_zero(&frame_system::Pallet::<T>::block_number()) {
+						frame_system::Pallet::<T>::set_block_number(1u32.into());
 					}
 
 					// Run execution + verification
@@ -961,7 +961,7 @@ macro_rules! impl_benchmark_test {
 /// When called in `pallet_example` as
 ///
 /// ```rust,ignore
-/// impl_benchmark_test_suite!(Module, crate::tests::new_test_ext(), crate::tests::Test);
+/// impl_benchmark_test_suite!(Pallet, crate::tests::new_test_ext(), crate::tests::Test);
 /// ```
 ///
 /// It expands to the equivalent of:
@@ -1019,11 +1019,11 @@ macro_rules! impl_benchmark_test {
 /// }
 ///
 /// mod tests {
-/// 	// because of macro syntax limitations, neither Module nor benches can be paths, but both have
+/// 	// because of macro syntax limitations, neither Pallet nor benches can be paths, but both have
 /// 	// to be idents in the scope of `impl_benchmark_test_suite`.
-/// 	use crate::{benches, Module};
+/// 	use crate::{benches, Pallet};
 ///
-/// 	impl_benchmark_test_suite!(Module, new_test_ext(), Test, benchmarks_path = benches);
+/// 	impl_benchmark_test_suite!(Pallet, new_test_ext(), Test, benchmarks_path = benches);
 ///
 /// 	// new_test_ext and the Test item are defined later in this module
 /// }
diff --git a/frame/benchmarking/src/tests.rs b/frame/benchmarking/src/tests.rs
index 8431f3e46c27..ac0a20854305 100644
--- a/frame/benchmarking/src/tests.rs
+++ b/frame/benchmarking/src/tests.rs
@@ -76,8 +76,8 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		TestPallet: pallet_test::{Module, Call, Storage},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		TestPallet: pallet_test::{Pallet, Call, Storage},
 	}
 );
 
@@ -133,7 +133,7 @@ mod benchmarks {
 	use crate::{BenchmarkingSetup, BenchmarkParameter, account};
 
 	// Additional used internally by the benchmark macro.
-	use super::pallet_test::{Call, Config, Module};
+	use super::pallet_test::{Call, Config, Pallet};
 
 	crate::benchmarks!{
 		where_clause {
diff --git a/frame/bounties/src/benchmarking.rs b/frame/bounties/src/benchmarking.rs
index 632f951f05e1..cb7933079763 100644
--- a/frame/bounties/src/benchmarking.rs
+++ b/frame/bounties/src/benchmarking.rs
@@ -84,7 +84,7 @@ fn setup_pot_account<T: Config>() {
 }
 
 fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
-	let events = frame_system::Module::<T>::events();
+	let events = frame_system::Pallet::<T>::events();
 	let system_event: <T as frame_system::Config>::Event = generic_event.into();
 	// compare to the last event record
 	let EventRecord { event, .. } = &events[events.len() - 1];
@@ -122,7 +122,7 @@ benchmarks! {
 		let (curator_lookup, bounty_id) = create_bounty::<T>()?;
 		Bounties::<T>::on_initialize(T::BlockNumber::zero());
 		let bounty_id = BountyCount::get() - 1;
-		frame_system::Module::<T>::set_block_number(T::BountyUpdatePeriod::get() + 1u32.into());
+		frame_system::Pallet::<T>::set_block_number(T::BountyUpdatePeriod::get() + 1u32.into());
 		let caller = whitelisted_caller();
 	}: _(RawOrigin::Signed(caller), bounty_id)
 
@@ -159,7 +159,7 @@ benchmarks! {
 		let beneficiary = T::Lookup::unlookup(beneficiary_account.clone());
 		Bounties::<T>::award_bounty(RawOrigin::Signed(curator.clone()).into(), bounty_id, beneficiary)?;
 
-		frame_system::Module::<T>::set_block_number(T::BountyDepositPayoutDelay::get());
+		frame_system::Pallet::<T>::set_block_number(T::BountyDepositPayoutDelay::get());
 		ensure!(T::Currency::free_balance(&beneficiary_account).is_zero(), "Beneficiary already has balance");
 
 	}: _(RawOrigin::Signed(curator), bounty_id)
diff --git a/frame/bounties/src/lib.rs b/frame/bounties/src/lib.rs
index ba0d4a5b16cb..7d6cd6fc1439 100644
--- a/frame/bounties/src/lib.rs
+++ b/frame/bounties/src/lib.rs
@@ -424,7 +424,7 @@ decl_module! {
 								// If the sender is not the curator, and the curator is inactive,
 								// slash the curator.
 								if sender != *curator {
-									let block_number = system::Module::<T>::block_number();
+									let block_number = system::Pallet::<T>::block_number();
 									if *update_due < block_number {
 										slash_curator(curator, &mut bounty.curator_deposit);
 										// Continue to change bounty status below...
@@ -479,7 +479,7 @@ decl_module! {
 						T::Currency::reserve(curator, deposit)?;
 						bounty.curator_deposit = deposit;
 
-						let update_due = system::Module::<T>::block_number() + T::BountyUpdatePeriod::get();
+						let update_due = system::Pallet::<T>::block_number() + T::BountyUpdatePeriod::get();
 						bounty.status = BountyStatus::Active { curator: curator.clone(), update_due };
 
 						Ok(())
@@ -518,7 +518,7 @@ decl_module! {
 				bounty.status = BountyStatus::PendingPayout {
 					curator: signer,
 					beneficiary: beneficiary.clone(),
-					unlock_at: system::Module::<T>::block_number() + T::BountyDepositPayoutDelay::get(),
+					unlock_at: system::Pallet::<T>::block_number() + T::BountyDepositPayoutDelay::get(),
 				};
 
 				Ok(())
@@ -543,7 +543,7 @@ decl_module! {
 			Bounties::<T>::try_mutate_exists(bounty_id, |maybe_bounty| -> DispatchResult {
 				let bounty = maybe_bounty.take().ok_or(Error::<T>::InvalidIndex)?;
 				if let BountyStatus::PendingPayout { curator, beneficiary, unlock_at } = bounty.status {
-					ensure!(system::Module::<T>::block_number() >= unlock_at, Error::<T>::Premature);
+					ensure!(system::Pallet::<T>::block_number() >= unlock_at, Error::<T>::Premature);
 					let bounty_account = Self::bounty_account_id(bounty_id);
 					let balance = T::Currency::free_balance(&bounty_account);
 					let fee = bounty.fee.min(balance); // just to be safe
@@ -649,7 +649,7 @@ decl_module! {
 				match bounty.status {
 					BountyStatus::Active { ref curator, ref mut update_due } => {
 						ensure!(*curator == signer, Error::<T>::RequireCurator);
-						*update_due = (system::Module::<T>::block_number() + T::BountyUpdatePeriod::get()).max(*update_due);
+						*update_due = (system::Pallet::<T>::block_number() + T::BountyUpdatePeriod::get()).max(*update_due);
 					},
 					_ => return Err(Error::<T>::UnexpectedStatus.into()),
 				}
diff --git a/frame/bounties/src/tests.rs b/frame/bounties/src/tests.rs
index cbff502daa65..617f18697526 100644
--- a/frame/bounties/src/tests.rs
+++ b/frame/bounties/src/tests.rs
@@ -43,10 +43,10 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
-		Bounties: pallet_bounties::{Module, Call, Storage, Event<T>},
-		Treasury: pallet_treasury::{Module, Call, Storage, Config, Event<T>},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Bounties: pallet_bounties::{Pallet, Call, Storage, Event<T>},
+		Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>},
 	}
 );
 
@@ -107,7 +107,7 @@ parameter_types! {
 // impl pallet_treasury::Config for Test {
 impl pallet_treasury::Config for Test {
 	type ModuleId = TreasuryModuleId;
-	type Currency = pallet_balances::Module<Test>;
+	type Currency = pallet_balances::Pallet<Test>;
 	type ApproveOrigin = frame_system::EnsureRoot<u128>;
 	type RejectOrigin = frame_system::EnsureRoot<u128>;
 	type Event = Event;
diff --git a/frame/collective/src/benchmarking.rs b/frame/collective/src/benchmarking.rs
index 1afdd14b1ad3..cd4fcfba5fe1 100644
--- a/frame/collective/src/benchmarking.rs
+++ b/frame/collective/src/benchmarking.rs
@@ -31,7 +31,7 @@ use sp_runtime::traits::Bounded;
 use sp_std::mem::size_of;
 
 use frame_system::Call as SystemCall;
-use frame_system::Module as System;
+use frame_system::Pallet as System;
 use crate::Module as Collective;
 
 const SEED: u32 = 0;
diff --git a/frame/collective/src/lib.rs b/frame/collective/src/lib.rs
index 6d9066bca241..28c2ff77b81f 100644
--- a/frame/collective/src/lib.rs
+++ b/frame/collective/src/lib.rs
@@ -472,7 +472,7 @@ decl_module! {
 				let index = Self::proposal_count();
 				<ProposalCount<I>>::mutate(|i| *i += 1);
 				<ProposalOf<T, I>>::insert(proposal_hash, *proposal);
-				let end = system::Module::<T>::block_number() + T::MotionDuration::get();
+				let end = system::Pallet::<T>::block_number() + T::MotionDuration::get();
 				let votes = Votes { index, threshold, ayes: vec![who.clone()], nays: vec![], end };
 				<Voting<T, I>>::insert(proposal_hash, votes);
 
@@ -647,7 +647,7 @@ decl_module! {
 			}
 
 			// Only allow actual closing of the proposal after the voting period has ended.
-			ensure!(system::Module::<T>::block_number() >= voting.end, Error::<T, I>::TooEarly);
+			ensure!(system::Pallet::<T>::block_number() >= voting.end, Error::<T, I>::TooEarly);
 
 			let prime_vote = Self::prime().map(|who| voting.ayes.iter().any(|a| a == &who));
 
@@ -1045,10 +1045,10 @@ mod tests {
 			NodeBlock = Block,
 			UncheckedExtrinsic = UncheckedExtrinsic
 		{
-			System: system::{Module, Call, Event<T>},
-			Collective: collective::<Instance1>::{Module, Call, Event<T>, Origin<T>, Config<T>},
-			CollectiveMajority: collective::<Instance2>::{Module, Call, Event<T>, Origin<T>, Config<T>},
-			DefaultCollective: collective::{Module, Call, Event<T>, Origin<T>, Config<T>},
+			System: system::{Pallet, Call, Event<T>},
+			Collective: collective::<Instance1>::{Pallet, Call, Event<T>, Origin<T>, Config<T>},
+			CollectiveMajority: collective::<Instance2>::{Pallet, Call, Event<T>, Origin<T>, Config<T>},
+			DefaultCollective: collective::{Pallet, Call, Event<T>, Origin<T>, Config<T>},
 		}
 	);
 
diff --git a/frame/contracts/COMPLEXITY.md b/frame/contracts/COMPLEXITY.md
index 32f6f84b89b6..f0e5a035586b 100644
--- a/frame/contracts/COMPLEXITY.md
+++ b/frame/contracts/COMPLEXITY.md
@@ -176,7 +176,7 @@ Before a call or instantiate can be performed the execution context must be init
 For the first call or instantiation in the handling of an extrinsic, this involves two calls:
 
 1. `<timestamp::Module<T>>::now()`
-2. `<system::Module<T>>::block_number()`
+2. `<system::Pallet<T>>::block_number()`
 
 The complexity of initialization depends on the complexity of these functions. In the current
 implementation they just involve a DB read.
diff --git a/frame/contracts/src/benchmarking/code.rs b/frame/contracts/src/benchmarking/code.rs
index 64d2a0cf011d..de1ef72d1b55 100644
--- a/frame/contracts/src/benchmarking/code.rs
+++ b/frame/contracts/src/benchmarking/code.rs
@@ -25,7 +25,7 @@
 //! compiles it down into a `WasmModule` that can be used as a contract's code.
 
 use crate::Config;
-use crate::Module as Contracts;
+use crate::Pallet as Contracts;
 
 use parity_wasm::elements::{
 	Instruction, Instructions, FuncBody, ValueType, BlockType, Section, CustomSection,
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index d41154e995a6..81419781bf85 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -23,7 +23,7 @@ mod code;
 mod sandbox;
 
 use crate::{
-	*, Module as Contracts,
+	*, Pallet as Contracts,
 	exec::StorageKey,
 	rent::Rent,
 	schedule::{API_BENCHMARK_BATCH_SIZE, INSTR_BENCHMARK_BATCH_SIZE},
@@ -37,7 +37,7 @@ use self::{
 	sandbox::Sandbox,
 };
 use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
-use frame_system::{Module as System, RawOrigin};
+use frame_system::{Pallet as System, RawOrigin};
 use parity_wasm::elements::{Instruction, ValueType, BlockType};
 use sp_runtime::traits::{Hash, Bounded, Zero};
 use sp_std::{default::Default, convert::{TryInto}, vec::Vec, vec};
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index 427cf1ada5ad..a0752d9e05d6 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -16,7 +16,7 @@
 // limitations under the License.
 
 use crate::{
-	CodeHash, Event, Config, Module as Contracts,
+	CodeHash, Event, Config, Pallet as Contracts,
 	TrieId, BalanceOf, ContractInfo, gas::GasMeter, rent::Rent, storage::{self, Storage},
 	Error, ContractInfoOf, Schedule, AliveContractInfo,
 };
@@ -384,7 +384,7 @@ where
 			depth: 0,
 			schedule,
 			timestamp: T::Time::now(),
-			block_number: <frame_system::Module<T>>::block_number(),
+			block_number: <frame_system::Pallet<T>>::block_number(),
 			_phantom: Default::default(),
 		}
 	}
@@ -909,7 +909,7 @@ fn deposit_event<T: Config>(
 	topics: Vec<T::Hash>,
 	event: Event<T>,
 ) {
-	<frame_system::Module<T>>::deposit_event_indexed(
+	<frame_system::Pallet<T>>::deposit_event_indexed(
 		&*topics,
 		<T as Config>::Event::from(event).into(),
 	)
@@ -961,7 +961,7 @@ mod tests {
 	}
 
 	fn events() -> Vec<Event<Test>> {
-		<frame_system::Module<Test>>::events()
+		<frame_system::Pallet<Test>>::events()
 			.into_iter()
 			.filter_map(|meta| match meta.event {
 				MetaEvent::pallet_contracts(contract_event) => Some(contract_event),
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index 5453e079e3ae..b12bb9214576 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! # Contract Module
+//! # Contract Pallet
 //!
 //! The Contract module provides functionality for the runtime to deploy and execute WebAssembly smart-contracts.
 //!
@@ -124,7 +124,7 @@ use frame_support::{
 	traits::{OnUnbalanced, Currency, Get, Time, Randomness},
 	weights::{Weight, PostDispatchInfo, WithPostDispatchInfo},
 };
-use frame_system::Module as System;
+use frame_system::Pallet as System;
 use pallet_contracts_primitives::{
 	RentProjectionResult, GetStorageResult, ContractAccessError, ContractExecResult,
 };
@@ -290,7 +290,7 @@ pub mod pallet {
 			schedule: Schedule<T>
 		) -> DispatchResultWithPostInfo {
 			ensure_root(origin)?;
-			if <Module<T>>::current_schedule().version > schedule.version {
+			if <Pallet<T>>::current_schedule().version > schedule.version {
 				Err(Error::<T>::InvalidScheduleVersion)?
 			}
 			Self::deposit_event(Event::ScheduleUpdated(schedule.version));
@@ -316,7 +316,7 @@ pub mod pallet {
 			let origin = ensure_signed(origin)?;
 			let dest = T::Lookup::lookup(dest)?;
 			let mut gas_meter = GasMeter::new(gas_limit);
-			let schedule = <Module<T>>::current_schedule();
+			let schedule = <Pallet<T>>::current_schedule();
 			let mut ctx = ExecutionContext::<T, PrefabWasmModule<T>>::top_level(origin, &schedule);
 			let (result, code_len) = match ctx.call(dest, value, &mut gas_meter, data) {
 				Ok((output, len)) => (Ok(output), len),
@@ -365,7 +365,7 @@ pub mod pallet {
 			let code_len = code.len() as u32;
 			ensure!(code_len <= T::MaxCodeSize::get(), Error::<T>::CodeTooLarge);
 			let mut gas_meter = GasMeter::new(gas_limit);
-			let schedule = <Module<T>>::current_schedule();
+			let schedule = <Pallet<T>>::current_schedule();
 			let executable = PrefabWasmModule::from_code(code, &schedule)?;
 			let code_len = executable.code_len();
 			ensure!(code_len <= T::MaxCodeSize::get(), Error::<T>::CodeTooLarge);
@@ -397,7 +397,7 @@ pub mod pallet {
 		) -> DispatchResultWithPostInfo {
 			let origin = ensure_signed(origin)?;
 			let mut gas_meter = GasMeter::new(gas_limit);
-			let schedule = <Module<T>>::current_schedule();
+			let schedule = <Pallet<T>>::current_schedule();
 			let executable = PrefabWasmModule::from_storage(code_hash, &schedule, &mut gas_meter)?;
 			let mut ctx = ExecutionContext::<T, PrefabWasmModule<T>>::top_level(origin, &schedule);
 			let code_len = executable.code_len();
@@ -665,7 +665,7 @@ pub mod pallet {
 	}
 }
 
-impl<T: Config> Module<T>
+impl<T: Config> Pallet<T>
 where
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
@@ -683,7 +683,7 @@ where
 		input_data: Vec<u8>,
 	) -> ContractExecResult {
 		let mut gas_meter = GasMeter::new(gas_limit);
-		let schedule = <Module<T>>::current_schedule();
+		let schedule = <Pallet<T>>::current_schedule();
 		let mut ctx = ExecutionContext::<T, PrefabWasmModule<T>>::top_level(origin, &schedule);
 		let result = ctx.call(dest, value, &mut gas_meter, input_data);
 		let gas_consumed = gas_meter.gas_spent();
@@ -746,7 +746,7 @@ where
 	/// Store code for benchmarks which does not check nor instrument the code.
 	#[cfg(feature = "runtime-benchmarks")]
 	fn store_code_raw(code: Vec<u8>) -> frame_support::dispatch::DispatchResult {
-		let schedule = <Module<T>>::current_schedule();
+		let schedule = <Pallet<T>>::current_schedule();
 		PrefabWasmModule::store_code_unchecked(code, &schedule)?;
 		Ok(())
 	}
diff --git a/frame/contracts/src/rent.rs b/frame/contracts/src/rent.rs
index e9befeee2d37..9b3a3f731a2a 100644
--- a/frame/contracts/src/rent.rs
+++ b/frame/contracts/src/rent.rs
@@ -18,7 +18,7 @@
 //! A module responsible for computing the right amount of weight and charging it.
 
 use crate::{
-	AliveContractInfo, BalanceOf, ContractInfo, ContractInfoOf, Module, Event,
+	AliveContractInfo, BalanceOf, ContractInfo, ContractInfoOf, Pallet, Event,
 	TombstoneContractInfo, Config, CodeHash, Error,
 	storage::Storage, wasm::PrefabWasmModule, exec::Executable,
 };
@@ -124,7 +124,7 @@ where
 		free_balance: &BalanceOf<T>,
 		contract: &AliveContractInfo<T>,
 	) -> Option<BalanceOf<T>> {
-		let subsistence_threshold = Module::<T>::subsistence_threshold();
+		let subsistence_threshold = Pallet::<T>::subsistence_threshold();
 		// Reserved balance contributes towards the subsistence threshold to stay consistent
 		// with the existential deposit where the reserved balance is also counted.
 		if *total_balance < subsistence_threshold {
@@ -268,7 +268,7 @@ where
 				let tombstone_info = ContractInfo::Tombstone(tombstone);
 				<ContractInfoOf<T>>::insert(account, &tombstone_info);
 				code.drop_from_storage();
-				<Module<T>>::deposit_event(Event::Evicted(account.clone()));
+				<Pallet<T>>::deposit_event(Event::Evicted(account.clone()));
 				Ok(None)
 			}
 			(Verdict::Evict { amount: _ }, None) => {
@@ -298,7 +298,7 @@ where
 		contract: AliveContractInfo<T>,
 		code_size: u32,
 	) -> Result<Option<AliveContractInfo<T>>, DispatchError> {
-		let current_block_number = <frame_system::Module<T>>::block_number();
+		let current_block_number = <frame_system::Pallet<T>>::block_number();
 		let verdict = Self::consider_case(
 			account,
 			current_block_number,
@@ -333,7 +333,7 @@ where
 		};
 		let module = PrefabWasmModule::<T>::from_storage_noinstr(contract.code_hash)?;
 		let code_len = module.code_len();
-		let current_block_number = <frame_system::Module<T>>::block_number();
+		let current_block_number = <frame_system::Pallet<T>>::block_number();
 		let verdict = Self::consider_case(
 			account,
 			current_block_number,
@@ -384,7 +384,7 @@ where
 		let module = PrefabWasmModule::from_storage_noinstr(alive_contract_info.code_hash)
 			.map_err(|_| IsTombstone)?;
 		let code_size = module.occupied_storage();
-		let current_block_number = <frame_system::Module<T>>::block_number();
+		let current_block_number = <frame_system::Pallet<T>>::block_number();
 		let verdict = Self::consider_case(
 			account,
 			current_block_number,
@@ -465,7 +465,7 @@ where
 
 		let child_trie_info = origin_contract.child_trie_info();
 
-		let current_block = <frame_system::Module<T>>::block_number();
+		let current_block = <frame_system::Pallet<T>>::block_number();
 
 		if origin_contract.last_write == Some(current_block) {
 			return Err((Error::<T>::InvalidContractOrigin.into(), 0, 0));
diff --git a/frame/contracts/src/storage.rs b/frame/contracts/src/storage.rs
index 970eec200366..a73569a88628 100644
--- a/frame/contracts/src/storage.rs
+++ b/frame/contracts/src/storage.rs
@@ -117,7 +117,7 @@ where
 			.and_then(|val| val.checked_add(new_value_len))
 			.ok_or_else(|| Error::<T>::StorageExhausted)?;
 
-		new_info.last_write = Some(<frame_system::Module<T>>::block_number());
+		new_info.last_write = Some(<frame_system::Pallet<T>>::block_number());
 		<ContractInfoOf<T>>::insert(&account, ContractInfo::Alive(new_info));
 
 		// Finally, perform the change on the storage.
@@ -176,7 +176,7 @@ where
 					// We want to charge rent for the first block in advance. Therefore we
 					// treat the contract as if it was created in the last block and then
 					// charge rent for it during instantiation.
-					<frame_system::Module<T>>::block_number().saturating_sub(1u32.into()),
+					<frame_system::Pallet<T>>::block_number().saturating_sub(1u32.into()),
 				rent_allowance: <BalanceOf<T>>::max_value(),
 				rent_payed: <BalanceOf<T>>::zero(),
 				pair_count: 0,
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index afa4dd5416bd..92cfe182808d 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -16,7 +16,7 @@
 // limitations under the License.
 
 use crate::{
-	BalanceOf, ContractInfo, ContractInfoOf, Module,
+	BalanceOf, ContractInfo, ContractInfoOf, Pallet,
 	RawAliveContractInfo, Config, Schedule,
 	Error, storage::Storage,
 	chain_extension::{
@@ -57,11 +57,11 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
-		Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent},
-		Randomness: pallet_randomness_collective_flip::{Module, Call, Storage},
-		Contracts: pallet_contracts::{Module, Call, Config<T>, Storage, Event<T>},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
+		Randomness: pallet_randomness_collective_flip::{Pallet, Call, Storage},
+		Contracts: pallet_contracts::{Pallet, Call, Config<T>, Storage, Event<T>},
 	}
 );
 
@@ -72,7 +72,7 @@ pub mod test_utils {
 		ContractInfoOf, CodeHash,
 		storage::Storage,
 		exec::{StorageKey, AccountIdOf},
-		Module as Contracts,
+		Pallet as Contracts,
 	};
 	use frame_support::traits::Currency;
 
@@ -457,7 +457,7 @@ fn instantiate_and_call_and_deposit_event() {
 		.build()
 		.execute_with(|| {
 			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			let subsistence = Module::<Test>::subsistence_threshold();
+			let subsistence = Pallet::<Test>::subsistence_threshold();
 
 			// Check at the end to get hash on error easily
 			let creation = Contracts::instantiate_with_code(
@@ -572,7 +572,7 @@ fn deposit_event_max_value_limit() {
 #[test]
 fn run_out_of_gas() {
 	let (wasm, code_hash) = compile_module::<Test>("run_out_of_gas").unwrap();
-	let subsistence = Module::<Test>::subsistence_threshold();
+	let subsistence = Pallet::<Test>::subsistence_threshold();
 
 	ExtBuilder::default()
 		.existential_deposit(50)
@@ -908,7 +908,7 @@ fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
 				.unwrap().get_alive().unwrap().rent_allowance;
 			let balance = Balances::free_balance(&addr);
 
-			let subsistence_threshold = Module::<Test>::subsistence_threshold();
+			let subsistence_threshold = Pallet::<Test>::subsistence_threshold();
 
 			// Trigger rent must have no effect
 			assert!(!trigger_call(addr.clone()));
@@ -997,7 +997,7 @@ fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
 		.build()
 		.execute_with(|| {
 			// Create
-			let subsistence_threshold = Module::<Test>::subsistence_threshold();
+			let subsistence_threshold = Pallet::<Test>::subsistence_threshold();
 			let _ = Balances::deposit_creating(&ALICE, subsistence_threshold * 1000);
 			assert_ok!(Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
@@ -1878,7 +1878,7 @@ fn crypto_hashes() {
 				// We offset data in the contract tables by 1.
 				let mut params = vec![(n + 1) as u8];
 				params.extend_from_slice(input);
-				let result = <Module<Test>>::bare_call(
+				let result = <Pallet<Test>>::bare_call(
 					ALICE,
 					addr.clone(),
 					0,
@@ -1896,7 +1896,7 @@ fn crypto_hashes() {
 fn transfer_return_code() {
 	let (wasm, code_hash) = compile_module::<Test>("transfer_return_code").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let subsistence = Module::<Test>::subsistence_threshold();
+		let subsistence = Pallet::<Test>::subsistence_threshold();
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 
 		assert_ok!(
@@ -1943,7 +1943,7 @@ fn call_return_code() {
 	let (caller_code, caller_hash) = compile_module::<Test>("call_return_code").unwrap();
 	let (callee_code, callee_hash) = compile_module::<Test>("ok_trap_revert").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let subsistence = Module::<Test>::subsistence_threshold();
+		let subsistence = Pallet::<Test>::subsistence_threshold();
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 		let _ = Balances::deposit_creating(&CHARLIE, 1000 * subsistence);
 
@@ -2036,7 +2036,7 @@ fn instantiate_return_code() {
 	let (caller_code, caller_hash) = compile_module::<Test>("instantiate_return_code").unwrap();
 	let (callee_code, callee_hash) = compile_module::<Test>("ok_trap_revert").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let subsistence = Module::<Test>::subsistence_threshold();
+		let subsistence = Pallet::<Test>::subsistence_threshold();
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 		let _ = Balances::deposit_creating(&CHARLIE, 1000 * subsistence);
 		let callee_hash = callee_hash.as_ref().to_vec();
@@ -2127,7 +2127,7 @@ fn instantiate_return_code() {
 fn disabled_chain_extension_wont_deploy() {
 	let (code, _hash) = compile_module::<Test>("chain_extension").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let subsistence = Module::<Test>::subsistence_threshold();
+		let subsistence = Pallet::<Test>::subsistence_threshold();
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 		TestExtension::disable();
 		assert_err_ignore_postinfo!(
@@ -2148,7 +2148,7 @@ fn disabled_chain_extension_wont_deploy() {
 fn disabled_chain_extension_errors_on_call() {
 	let (code, hash) = compile_module::<Test>("chain_extension").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let subsistence = Module::<Test>::subsistence_threshold();
+		let subsistence = Pallet::<Test>::subsistence_threshold();
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 		assert_ok!(
 			Contracts::instantiate_with_code(
@@ -2179,7 +2179,7 @@ fn disabled_chain_extension_errors_on_call() {
 fn chain_extension_works() {
 	let (code, hash) = compile_module::<Test>("chain_extension").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let subsistence = Module::<Test>::subsistence_threshold();
+		let subsistence = Pallet::<Test>::subsistence_threshold();
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 		assert_ok!(
 			Contracts::instantiate_with_code(
@@ -2248,7 +2248,7 @@ fn chain_extension_works() {
 fn lazy_removal_works() {
 	let (code, hash) = compile_module::<Test>("self_destruct").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let subsistence = Module::<Test>::subsistence_threshold();
+		let subsistence = Pallet::<Test>::subsistence_threshold();
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 
 		assert_ok!(
@@ -2308,7 +2308,7 @@ fn lazy_removal_partial_remove_works() {
 	let mut ext = ExtBuilder::default().existential_deposit(50).build();
 
 	let trie = ext.execute_with(|| {
-		let subsistence = Module::<Test>::subsistence_threshold();
+		let subsistence = Pallet::<Test>::subsistence_threshold();
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 
 		assert_ok!(
@@ -2389,7 +2389,7 @@ fn lazy_removal_partial_remove_works() {
 fn lazy_removal_does_no_run_on_full_block() {
 	let (code, hash) = compile_module::<Test>("self_destruct").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let subsistence = Module::<Test>::subsistence_threshold();
+		let subsistence = Pallet::<Test>::subsistence_threshold();
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 
 		assert_ok!(
@@ -2473,7 +2473,7 @@ fn lazy_removal_does_no_run_on_full_block() {
 fn lazy_removal_does_not_use_all_weight() {
 	let (code, hash) = compile_module::<Test>("self_destruct").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let subsistence = Module::<Test>::subsistence_threshold();
+		let subsistence = Pallet::<Test>::subsistence_threshold();
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 
 		assert_ok!(
@@ -2543,7 +2543,7 @@ fn lazy_removal_does_not_use_all_weight() {
 fn deletion_queue_full() {
 	let (code, hash) = compile_module::<Test>("self_destruct").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let subsistence = Module::<Test>::subsistence_threshold();
+		let subsistence = Pallet::<Test>::subsistence_threshold();
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 
 		assert_ok!(
@@ -2669,7 +2669,7 @@ fn refcounter() {
 	let (wasm, code_hash) = compile_module::<Test>("self_destruct").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
 		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-		let subsistence = Module::<Test>::subsistence_threshold();
+		let subsistence = Pallet::<Test>::subsistence_threshold();
 
 		// Create two contracts with the same code and check that they do in fact share it.
 		assert_ok!(Contracts::instantiate_with_code(
@@ -2741,7 +2741,7 @@ fn reinstrument_does_charge() {
 	let (wasm, code_hash) = compile_module::<Test>("return_with_data").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
 		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-		let subsistence = Module::<Test>::subsistence_threshold();
+		let subsistence = Pallet::<Test>::subsistence_threshold();
 		let zero = 0u32.to_le_bytes().encode();
 		let code_len = wasm.len() as u32;
 
diff --git a/frame/contracts/src/wasm/code_cache.rs b/frame/contracts/src/wasm/code_cache.rs
index 0b2512f17f59..f9513afe51f4 100644
--- a/frame/contracts/src/wasm/code_cache.rs
+++ b/frame/contracts/src/wasm/code_cache.rs
@@ -29,7 +29,7 @@
 
 use crate::{
 	CodeHash, CodeStorage, PristineCode, Schedule, Config, Error, Weight,
-	wasm::{prepare, PrefabWasmModule}, Module as Contracts, Event,
+	wasm::{prepare, PrefabWasmModule}, Pallet as Contracts, Event,
 	gas::{GasMeter, Token},
 	weights::WeightInfo,
 };
diff --git a/frame/contracts/src/wasm/mod.rs b/frame/contracts/src/wasm/mod.rs
index 6fc6bc1764e4..fc442473ff0f 100644
--- a/frame/contracts/src/wasm/mod.rs
+++ b/frame/contracts/src/wasm/mod.rs
@@ -245,7 +245,7 @@ where
 mod tests {
 	use super::*;
 	use crate::{
-		CodeHash, BalanceOf, Error, Module as Contracts,
+		CodeHash, BalanceOf, Error, Pallet as Contracts,
 		exec::{Ext, StorageKey, AccountIdOf, Executable, RentParams},
 		gas::GasMeter,
 		tests::{Test, Call, ALICE, BOB},
diff --git a/frame/democracy/src/benchmarking.rs b/frame/democracy/src/benchmarking.rs
index 57447944d22a..40bc99ec12e0 100644
--- a/frame/democracy/src/benchmarking.rs
+++ b/frame/democracy/src/benchmarking.rs
@@ -24,10 +24,10 @@ use frame_support::{
 	IterableStorageMap,
 	traits::{Currency, Get, EnsureOrigin, OnInitialize, UnfilteredDispatchable, schedule::DispatchTime},
 };
-use frame_system::{RawOrigin, Module as System, self, EventRecord};
+use frame_system::{RawOrigin, Pallet as System, self, EventRecord};
 use sp_runtime::traits::{Bounded, One};
 
-use crate::Module as Democracy;
+use crate::Pallet as Democracy;
 
 const SEED: u32 = 0;
 const MAX_REFERENDUMS: u32 = 99;
diff --git a/frame/democracy/src/lib.rs b/frame/democracy/src/lib.rs
index a7dd2d5bd929..8790e0e487bb 100644
--- a/frame/democracy/src/lib.rs
+++ b/frame/democracy/src/lib.rs
@@ -596,7 +596,7 @@ decl_module! {
 
 			if let Some((until, _)) = <Blacklist<T>>::get(proposal_hash) {
 				ensure!(
-					<frame_system::Module<T>>::block_number() >= until,
+					<frame_system::Pallet<T>>::block_number() >= until,
 					Error::<T>::ProposalBlacklisted,
 				);
 			}
@@ -688,7 +688,7 @@ decl_module! {
 			ensure!(!<NextExternal<T>>::exists(), Error::<T>::DuplicateProposal);
 			if let Some((until, _)) = <Blacklist<T>>::get(proposal_hash) {
 				ensure!(
-					<frame_system::Module<T>>::block_number() >= until,
+					<frame_system::Pallet<T>>::block_number() >= until,
 					Error::<T>::ProposalBlacklisted,
 				);
 			}
@@ -776,7 +776,7 @@ decl_module! {
 			ensure!(proposal_hash == e_proposal_hash, Error::<T>::InvalidHash);
 
 			<NextExternal<T>>::kill();
-			let now = <frame_system::Module<T>>::block_number();
+			let now = <frame_system::Pallet<T>>::block_number();
 			Self::inject_referendum(now + voting_period, proposal_hash, threshold, delay);
 		}
 
@@ -806,7 +806,7 @@ decl_module! {
 				.err().ok_or(Error::<T>::AlreadyVetoed)?;
 
 			existing_vetoers.insert(insert_position, who.clone());
-			let until = <frame_system::Module<T>>::block_number() + T::CooloffPeriod::get();
+			let until = <frame_system::Pallet<T>>::block_number() + T::CooloffPeriod::get();
 			<Blacklist<T>>::insert(&proposal_hash, (until, existing_vetoers));
 
 			Self::deposit_event(RawEvent::Vetoed(who, proposal_hash, until));
@@ -1004,7 +1004,7 @@ decl_module! {
 					_ => None,
 				}).ok_or(Error::<T>::PreimageMissing)?;
 
-			let now = <frame_system::Module<T>>::block_number();
+			let now = <frame_system::Pallet<T>>::block_number();
 			let (voting, enactment) = (T::VotingPeriod::get(), T::EnactmentPeriod::get());
 			let additional = if who == provider { Zero::zero() } else { enactment };
 			ensure!(now >= since + voting + additional, Error::<T>::TooEarly);
@@ -1209,7 +1209,7 @@ impl<T: Config> Module<T> {
 		delay: T::BlockNumber
 	) -> ReferendumIndex {
 		<Module<T>>::inject_referendum(
-			<frame_system::Module<T>>::block_number() + T::VotingPeriod::get(),
+			<frame_system::Pallet<T>>::block_number() + T::VotingPeriod::get(),
 			proposal_hash,
 			threshold,
 			delay
@@ -1308,7 +1308,7 @@ impl<T: Config> Module<T> {
 					Some(ReferendumInfo::Finished{end, approved}) =>
 						if let Some((lock_periods, balance)) = votes[i].1.locked_if(approved) {
 							let unlock_at = end + T::EnactmentPeriod::get() * lock_periods.into();
-							let now = system::Module::<T>::block_number();
+							let now = system::Pallet::<T>::block_number();
 							if now < unlock_at {
 								ensure!(matches!(scope, UnvoteScope::Any), Error::<T>::NoPermission);
 								prior.accumulate(unlock_at, balance)
@@ -1435,7 +1435,7 @@ impl<T: Config> Module<T> {
 				} => {
 					// remove any delegation votes to our current target.
 					let votes = Self::reduce_upstream_delegation(&target, conviction.votes(balance));
-					let now = system::Module::<T>::block_number();
+					let now = system::Pallet::<T>::block_number();
 					let lock_periods = conviction.lock_periods().into();
 					prior.accumulate(now + T::EnactmentPeriod::get() * lock_periods, balance);
 					voting.set_common(delegations, prior);
@@ -1455,7 +1455,7 @@ impl<T: Config> Module<T> {
 	/// a security hole) but may be reduced from what they are currently.
 	fn update_lock(who: &T::AccountId) {
 		let lock_needed = VotingOf::<T>::mutate(who, |voting| {
-			voting.rejig(system::Module::<T>::block_number());
+			voting.rejig(system::Pallet::<T>::block_number());
 			voting.locked_balance()
 		});
 		if lock_needed.is_zero() {
@@ -1716,7 +1716,7 @@ impl<T: Config> Module<T> {
 			.saturating_mul(T::PreimageByteDeposit::get());
 		T::Currency::reserve(&who, deposit)?;
 
-		let now = <frame_system::Module<T>>::block_number();
+		let now = <frame_system::Pallet<T>>::block_number();
 		let a = PreimageStatus::Available {
 			data: encoded_proposal,
 			provider: who.clone(),
@@ -1738,7 +1738,7 @@ impl<T: Config> Module<T> {
 		let status = Preimages::<T>::get(&proposal_hash).ok_or(Error::<T>::NotImminent)?;
 		let expiry = status.to_missing_expiry().ok_or(Error::<T>::DuplicatePreimage)?;
 
-		let now = <frame_system::Module<T>>::block_number();
+		let now = <frame_system::Pallet<T>>::block_number();
 		let free = <BalanceOf<T>>::zero();
 		let a = PreimageStatus::Available {
 			data: encoded_proposal,
diff --git a/frame/democracy/src/tests.rs b/frame/democracy/src/tests.rs
index 291cfa33b522..57e845ace9f2 100644
--- a/frame/democracy/src/tests.rs
+++ b/frame/democracy/src/tests.rs
@@ -60,10 +60,10 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
-		Scheduler: pallet_scheduler::{Module, Call, Storage, Config, Event<T>},
-		Democracy: pallet_democracy::{Module, Call, Storage, Config, Event<T>},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Scheduler: pallet_scheduler::{Pallet, Call, Storage, Config, Event<T>},
+		Democracy: pallet_democracy::{Pallet, Call, Storage, Config, Event<T>},
 	}
 );
 
@@ -161,7 +161,7 @@ impl Contains<u64> for OneToFive {
 impl Config for Test {
 	type Proposal = Call;
 	type Event = Event;
-	type Currency = pallet_balances::Module<Self>;
+	type Currency = pallet_balances::Pallet<Self>;
 	type EnactmentPeriod = EnactmentPeriod;
 	type LaunchPeriod = LaunchPeriod;
 	type VotingPeriod = VotingPeriod;
diff --git a/frame/election-provider-multi-phase/src/benchmarking.rs b/frame/election-provider-multi-phase/src/benchmarking.rs
index 0a0f0f30c373..40c7e801ae78 100644
--- a/frame/election-provider-multi-phase/src/benchmarking.rs
+++ b/frame/election-provider-multi-phase/src/benchmarking.rs
@@ -18,7 +18,7 @@
 //! Two phase election pallet benchmarking.
 
 use super::*;
-use crate::Module as MultiPhase;
+use crate::Pallet as MultiPhase;
 use frame_benchmarking::impl_benchmark_test_suite;
 use frame_support::{assert_ok, traits::OnInitialize};
 use frame_system::RawOrigin;
diff --git a/frame/election-provider-multi-phase/src/helpers.rs b/frame/election-provider-multi-phase/src/helpers.rs
index a1e0c5f248d8..7894f71800fd 100644
--- a/frame/election-provider-multi-phase/src/helpers.rs
+++ b/frame/election-provider-multi-phase/src/helpers.rs
@@ -25,7 +25,7 @@ macro_rules! log {
 	($level:tt, $pattern:expr $(, $values:expr)* $(,)?) => {
 		log::$level!(
 			target: $crate::LOG_TARGET,
-			concat!("[#{:?}] 🗳  ", $pattern), <frame_system::Module<T>>::block_number() $(, $values)*
+			concat!("[#{:?}] 🗳  ", $pattern), <frame_system::Pallet<T>>::block_number() $(, $values)*
 		)
 	};
 }
diff --git a/frame/election-provider-multi-phase/src/mock.rs b/frame/election-provider-multi-phase/src/mock.rs
index 970f3ab9ffcd..67e77db296c3 100644
--- a/frame/election-provider-multi-phase/src/mock.rs
+++ b/frame/election-provider-multi-phase/src/mock.rs
@@ -52,9 +52,9 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: frame_system::{Module, Call, Event<T>, Config},
-		Balances: pallet_balances::{Module, Call, Event<T>, Config<T>},
-		MultiPhase: multi_phase::{Module, Call, Event<T>},
+		System: frame_system::{Pallet, Call, Event<T>, Config},
+		Balances: pallet_balances::{Pallet, Call, Event<T>, Config<T>},
+		MultiPhase: multi_phase::{Pallet, Call, Event<T>},
 	}
 );
 
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index 779570ca633e..26b9c9190a96 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -1096,7 +1096,7 @@ mod tests {
 		type Event = Event;
 		type DustRemoval = ();
 		type ExistentialDeposit = ExistentialDeposit;
-		type AccountStore = frame_system::Module<Test>;
+		type AccountStore = frame_system::Pallet<Test>;
 		type MaxLocks = ();
 		type WeightInfo = ();
 	}
@@ -1187,9 +1187,9 @@ mod tests {
 			NodeBlock = Block,
 			UncheckedExtrinsic = UncheckedExtrinsic
 		{
-			System: frame_system::{Module, Call, Event<T>},
-			Balances: pallet_balances::{Module, Call, Event<T>, Config<T>},
-			Elections: elections_phragmen::{Module, Call, Event<T>, Config<T>},
+			System: frame_system::{Pallet, Call, Event<T>},
+			Balances: pallet_balances::{Pallet, Call, Event<T>, Config<T>},
+			Elections: elections_phragmen::{Pallet, Call, Event<T>, Config<T>},
 		}
 	);
 
diff --git a/frame/elections/src/lib.rs b/frame/elections/src/lib.rs
index 6eaa2dfad373..d6b68bbf5a04 100644
--- a/frame/elections/src/lib.rs
+++ b/frame/elections/src/lib.rs
@@ -713,7 +713,7 @@ decl_event!(
 		BadReaperSlashed(AccountId),
 		/// A tally (for approval votes of \[seats\]) has started.
 		TallyStarted(u32),
-		/// A tally (for approval votes of seat(s)) has ended (with one or more new members). 
+		/// A tally (for approval votes of seat(s)) has ended (with one or more new members).
 		/// \[incoming, outgoing\]
 		TallyFinalized(Vec<AccountId>, Vec<AccountId>),
 	}
@@ -759,7 +759,7 @@ impl<T: Config> Module<T> {
 					// if there's a tally in progress, then next tally can begin immediately afterwards
 					(tally_end, c.len() - leavers.len() + comers as usize, comers)
 				} else {
-					(<frame_system::Module<T>>::block_number(), c.len(), 0)
+					(<frame_system::Pallet<T>>::block_number(), c.len(), 0)
 				};
 			if count < desired_seats as usize {
 				Some(next_possible)
@@ -914,7 +914,7 @@ impl<T: Config> Module<T> {
 	fn start_tally() {
 		let members = Self::members();
 		let desired_seats = Self::desired_seats() as usize;
-		let number = <frame_system::Module<T>>::block_number();
+		let number = <frame_system::Pallet<T>>::block_number();
 		let expiring =
 			members.iter().take_while(|i| i.1 <= number).map(|i| i.0.clone()).collect::<Vec<_>>();
 		let retaining_seats = members.len() - expiring.len();
@@ -942,7 +942,7 @@ impl<T: Config> Module<T> {
 				.ok_or("finalize can only be called after a tally is started.")?;
 		let leaderboard: Vec<(BalanceOf<T>, T::AccountId)> = <Leaderboard<T>>::take()
 			.unwrap_or_default();
-		let new_expiry = <frame_system::Module<T>>::block_number() + Self::term_duration();
+		let new_expiry = <frame_system::Pallet<T>>::block_number() + Self::term_duration();
 
 		// return bond to winners.
 		let candidacy_bond = T::CandidacyBond::get();
diff --git a/frame/elections/src/mock.rs b/frame/elections/src/mock.rs
index 31d3f5a1c28a..287eaa27b196 100644
--- a/frame/elections/src/mock.rs
+++ b/frame/elections/src/mock.rs
@@ -135,9 +135,9 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: system::{Module, Call, Event<T>},
-		Balances: pallet_balances::{Module, Call, Event<T>, Config<T>},
-		Elections: elections::{Module, Call, Event<T>, Config<T>},
+		System: system::{Pallet, Call, Event<T>},
+		Balances: pallet_balances::{Pallet, Call, Event<T>, Config<T>},
+		Elections: elections::{Pallet, Call, Event<T>, Config<T>},
 	}
 );
 
diff --git a/frame/example-offchain-worker/src/tests.rs b/frame/example-offchain-worker/src/tests.rs
index 7707e7d61e62..e91b374adbe1 100644
--- a/frame/example-offchain-worker/src/tests.rs
+++ b/frame/example-offchain-worker/src/tests.rs
@@ -49,8 +49,8 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Example: example_offchain_worker::{Module, Call, Storage, Event<T>, ValidateUnsigned},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Example: example_offchain_worker::{Pallet, Call, Storage, Event<T>, ValidateUnsigned},
 	}
 );
 
diff --git a/frame/example-parallel/src/tests.rs b/frame/example-parallel/src/tests.rs
index da2892c67d42..e82d75e63206 100644
--- a/frame/example-parallel/src/tests.rs
+++ b/frame/example-parallel/src/tests.rs
@@ -33,8 +33,8 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Example: pallet_example_parallel::{Module, Call, Storage},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Example: pallet_example_parallel::{Pallet, Call, Storage},
 	}
 );
 
diff --git a/frame/example/src/lib.rs b/frame/example/src/lib.rs
index 7a537f4522ab..86e9b7fdc0c1 100644
--- a/frame/example/src/lib.rs
+++ b/frame/example/src/lib.rs
@@ -758,9 +758,9 @@ mod tests {
 			NodeBlock = Block,
 			UncheckedExtrinsic = UncheckedExtrinsic,
 		{
-			System: frame_system::{Module, Call, Config, Storage, Event<T>},
-			Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
-			Example: pallet_example::{Module, Call, Storage, Config<T>, Event<T>},
+			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+			Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+			Example: pallet_example::{Pallet, Call, Storage, Config<T>, Event<T>},
 		}
 	);
 
diff --git a/frame/executive/README.md b/frame/executive/README.md
index 183e32b2ff8a..ae3bbf1a9d99 100644
--- a/frame/executive/README.md
+++ b/frame/executive/README.md
@@ -35,7 +35,7 @@ The default Substrate node template declares the [`Executive`](https://docs.rs/f
 ```rust
 #
 /// Executive: handles dispatch to the various modules.
-pub type Executive = executive::Executive<Runtime, Block, Context, Runtime, AllModules>;
+pub type Executive = executive::Executive<Runtime, Block, Context, Runtime, AllPallets>;
 ```
 
 ### Custom `OnRuntimeUpgrade` logic
@@ -54,7 +54,7 @@ impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade {
     }
 }
 
-pub type Executive = executive::Executive<Runtime, Block, Context, Runtime, AllModules, CustomOnRuntimeUpgrade>;
+pub type Executive = executive::Executive<Runtime, Block, Context, Runtime, AllPallets, CustomOnRuntimeUpgrade>;
 ```
 
 License: Apache-2.0
diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index f48fda4841d2..277b20cf20bf 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -59,7 +59,7 @@
 //! # type Context = frame_system::ChainContext<Runtime>;
 //! # pub type Block = generic::Block<Header, UncheckedExtrinsic>;
 //! # pub type Balances = u64;
-//! # pub type AllModules = u64;
+//! # pub type AllPallets = u64;
 //! # pub enum Runtime {};
 //! # use sp_runtime::transaction_validity::{
 //! #    TransactionValidity, UnknownTransaction, TransactionSource,
@@ -73,7 +73,7 @@
 //! #     }
 //! # }
 //! /// Executive: handles dispatch to the various modules.
-//! pub type Executive = executive::Executive<Runtime, Block, Context, Runtime, AllModules>;
+//! pub type Executive = executive::Executive<Runtime, Block, Context, Runtime, AllPallets>;
 //! ```
 //!
 //! ### Custom `OnRuntimeUpgrade` logic
@@ -90,7 +90,7 @@
 //! # type Context = frame_system::ChainContext<Runtime>;
 //! # pub type Block = generic::Block<Header, UncheckedExtrinsic>;
 //! # pub type Balances = u64;
-//! # pub type AllModules = u64;
+//! # pub type AllPallets = u64;
 //! # pub enum Runtime {};
 //! # use sp_runtime::transaction_validity::{
 //! #    TransactionValidity, UnknownTransaction, TransactionSource,
@@ -111,7 +111,7 @@
 //!     }
 //! }
 //!
-//! pub type Executive = executive::Executive<Runtime, Block, Context, Runtime, AllModules, CustomOnRuntimeUpgrade>;
+//! pub type Executive = executive::Executive<Runtime, Block, Context, Runtime, AllPallets, CustomOnRuntimeUpgrade>;
 //! ```
 
 #![cfg_attr(not(feature = "std"), no_std)]
@@ -144,12 +144,12 @@ pub type OriginOf<E, C> = <CallOf<E, C> as Dispatchable>::Origin;
 /// - `Block`: The block type of the runtime
 /// - `Context`: The context that is used when checking an extrinsic.
 /// - `UnsignedValidator`: The unsigned transaction validator of the runtime.
-/// - `AllModules`: Tuple that contains all modules. Will be used to call e.g. `on_initialize`.
+/// - `AllPallets`: Tuple that contains all modules. Will be used to call e.g. `on_initialize`.
 /// - `OnRuntimeUpgrade`: Custom logic that should be called after a runtime upgrade. Modules are
-///                       already called by `AllModules`. It will be called before all modules will
+///                       already called by `AllPallets`. It will be called before all modules will
 ///                       be called.
-pub struct Executive<System, Block, Context, UnsignedValidator, AllModules, OnRuntimeUpgrade = ()>(
-	PhantomData<(System, Block, Context, UnsignedValidator, AllModules, OnRuntimeUpgrade)>
+pub struct Executive<System, Block, Context, UnsignedValidator, AllPallets, OnRuntimeUpgrade = ()>(
+	PhantomData<(System, Block, Context, UnsignedValidator, AllPallets, OnRuntimeUpgrade)>
 );
 
 impl<
@@ -157,7 +157,7 @@ impl<
 	Block: traits::Block<Header=System::Header, Hash=System::Hash>,
 	Context: Default,
 	UnsignedValidator,
-	AllModules:
+	AllPallets:
 		OnRuntimeUpgrade +
 		OnInitialize<System::BlockNumber> +
 		OnIdle<System::BlockNumber> +
@@ -165,7 +165,7 @@ impl<
 		OffchainWorker<System::BlockNumber>,
 	COnRuntimeUpgrade: OnRuntimeUpgrade,
 > ExecuteBlock<Block> for
-	Executive<System, Block, Context, UnsignedValidator, AllModules, COnRuntimeUpgrade>
+	Executive<System, Block, Context, UnsignedValidator, AllPallets, COnRuntimeUpgrade>
 where
 	Block::Extrinsic: Checkable<Context> + Codec,
 	CheckedOf<Block::Extrinsic, Context>:
@@ -176,7 +176,7 @@ where
 	UnsignedValidator: ValidateUnsigned<Call=CallOf<Block::Extrinsic, Context>>,
 {
 	fn execute_block(block: Block) {
-		Executive::<System, Block, Context, UnsignedValidator, AllModules>::execute_block(block);
+		Executive::<System, Block, Context, UnsignedValidator, AllPallets>::execute_block(block);
 	}
 }
 
@@ -185,13 +185,13 @@ impl<
 		Block: traits::Block<Header = System::Header, Hash = System::Hash>,
 		Context: Default,
 		UnsignedValidator,
-		AllModules: OnRuntimeUpgrade
+		AllPallets: OnRuntimeUpgrade
 			+ OnInitialize<System::BlockNumber>
 			+ OnIdle<System::BlockNumber>
 			+ OnFinalize<System::BlockNumber>
 			+ OffchainWorker<System::BlockNumber>,
 		COnRuntimeUpgrade: OnRuntimeUpgrade,
-	> Executive<System, Block, Context, UnsignedValidator, AllModules, COnRuntimeUpgrade>
+	> Executive<System, Block, Context, UnsignedValidator, AllPallets, COnRuntimeUpgrade>
 where
 	Block::Extrinsic: Checkable<Context> + Codec,
 	CheckedOf<Block::Extrinsic, Context>: Applyable + GetDispatchInfo,
@@ -204,10 +204,10 @@ where
 	pub fn execute_on_runtime_upgrade() -> frame_support::weights::Weight {
 		let mut weight = 0;
 		weight = weight.saturating_add(
-			<frame_system::Module<System> as OnRuntimeUpgrade>::on_runtime_upgrade(),
+			<frame_system::Pallet<System> as OnRuntimeUpgrade>::on_runtime_upgrade(),
 		);
 		weight = weight.saturating_add(COnRuntimeUpgrade::on_runtime_upgrade());
-		weight = weight.saturating_add(<AllModules as OnRuntimeUpgrade>::on_runtime_upgrade());
+		weight = weight.saturating_add(<AllPallets as OnRuntimeUpgrade>::on_runtime_upgrade());
 
 		weight
 	}
@@ -218,7 +218,7 @@ where
 	#[cfg(feature = "try-runtime")]
 	pub fn try_runtime_upgrade() -> Result<frame_support::weights::Weight, &'static str> {
 		<
-			(frame_system::Module::<System>, COnRuntimeUpgrade, AllModules)
+			(frame_system::Pallet::<System>, COnRuntimeUpgrade, AllPallets)
 			as
 			OnRuntimeUpgrade
 		>::pre_upgrade()?;
@@ -226,7 +226,7 @@ where
 		let weight = Self::execute_on_runtime_upgrade();
 
 		<
-			(frame_system::Module::<System>, COnRuntimeUpgrade, AllModules)
+			(frame_system::Pallet::<System>, COnRuntimeUpgrade, AllPallets)
 			as
 			OnRuntimeUpgrade
 		>::post_upgrade()?;
@@ -265,24 +265,24 @@ where
 		if Self::runtime_upgraded() {
 			weight = weight.saturating_add(Self::execute_on_runtime_upgrade());
 		}
-		<frame_system::Module<System>>::initialize(
+		<frame_system::Pallet<System>>::initialize(
 			block_number,
 			parent_hash,
 			digest,
 			frame_system::InitKind::Full,
 		);
 		weight = weight.saturating_add(
-			<frame_system::Module<System> as OnInitialize<System::BlockNumber>>::on_initialize(*block_number)
+			<frame_system::Pallet<System> as OnInitialize<System::BlockNumber>>::on_initialize(*block_number)
 		);
 		weight = weight.saturating_add(
-			<AllModules as OnInitialize<System::BlockNumber>>::on_initialize(*block_number)
+			<AllPallets as OnInitialize<System::BlockNumber>>::on_initialize(*block_number)
 		);
 		weight = weight.saturating_add(
 			<System::BlockWeights as frame_support::traits::Get<_>>::get().base_block
 		);
-		<frame_system::Module::<System>>::register_extra_weight_unchecked(weight, DispatchClass::Mandatory);
+		<frame_system::Pallet::<System>>::register_extra_weight_unchecked(weight, DispatchClass::Mandatory);
 
-		frame_system::Module::<System>::note_finished_initialize();
+		frame_system::Pallet::<System>::note_finished_initialize();
 	}
 
 	/// Returns if the runtime was upgraded since the last time this function was called.
@@ -308,7 +308,7 @@ where
 		let n = header.number().clone();
 		assert!(
 			n > System::BlockNumber::zero()
-			&& <frame_system::Module<System>>::block_hash(n - System::BlockNumber::one()) == *header.parent_hash(),
+			&& <frame_system::Pallet<System>>::block_hash(n - System::BlockNumber::one()) == *header.parent_hash(),
 			"Parent hash should be valid.",
 		);
 	}
@@ -350,7 +350,7 @@ where
 		});
 
 		// post-extrinsics book-keeping
-		<frame_system::Module<System>>::note_finished_extrinsics();
+		<frame_system::Pallet<System>>::note_finished_extrinsics();
 
 		Self::idle_and_finalize_hook(block_number);
 	}
@@ -360,36 +360,36 @@ where
 	pub fn finalize_block() -> System::Header {
 		sp_io::init_tracing();
 		sp_tracing::enter_span!( sp_tracing::Level::TRACE, "finalize_block" );
-		<frame_system::Module<System>>::note_finished_extrinsics();
-		let block_number = <frame_system::Module<System>>::block_number();
+		<frame_system::Pallet<System>>::note_finished_extrinsics();
+		let block_number = <frame_system::Pallet<System>>::block_number();
 
 		Self::idle_and_finalize_hook(block_number);
 
-		<frame_system::Module<System>>::finalize()
+		<frame_system::Pallet<System>>::finalize()
 	}
 
 	fn idle_and_finalize_hook(block_number: NumberFor<Block>) {
-		let weight =  <frame_system::Module<System>>::block_weight();
+		let weight =  <frame_system::Pallet<System>>::block_weight();
 		let max_weight =  <System::BlockWeights as frame_support::traits::Get<_>>::get().max_block;
 		let mut remaining_weight = max_weight.saturating_sub(weight.total());
 
 		if remaining_weight > 0 {
 			let mut used_weight =
-				<frame_system::Module<System> as OnIdle<System::BlockNumber>>::on_idle(
+				<frame_system::Pallet<System> as OnIdle<System::BlockNumber>>::on_idle(
 					block_number,
 					remaining_weight
 				);
 			remaining_weight = remaining_weight.saturating_sub(used_weight);
-			used_weight = <AllModules as OnIdle<System::BlockNumber>>::on_idle(
+			used_weight = <AllPallets as OnIdle<System::BlockNumber>>::on_idle(
 				block_number,
 				remaining_weight
 			)
 			.saturating_add(used_weight);
-			<frame_system::Module::<System>>::register_extra_weight_unchecked(used_weight, DispatchClass::Mandatory);
+			<frame_system::Pallet::<System>>::register_extra_weight_unchecked(used_weight, DispatchClass::Mandatory);
 		}
 
-		<frame_system::Module<System> as OnFinalize<System::BlockNumber>>::on_finalize(block_number);
-		<AllModules as OnFinalize<System::BlockNumber>>::on_finalize(block_number);
+		<frame_system::Pallet<System> as OnFinalize<System::BlockNumber>>::on_finalize(block_number);
+		<AllPallets as OnFinalize<System::BlockNumber>>::on_finalize(block_number);
 	}
 
 	/// Apply extrinsic outside of the block execution function.
@@ -419,7 +419,7 @@ where
 		// We don't need to make sure to `note_extrinsic` only after we know it's going to be
 		// executed to prevent it from leaking in storage since at this point, it will either
 		// execute or panic (and revert storage changes).
-		<frame_system::Module<System>>::note_extrinsic(to_note);
+		<frame_system::Pallet<System>>::note_extrinsic(to_note);
 
 		// AUDIT: Under no circumstances may this function panic from here onwards.
 
@@ -427,7 +427,7 @@ where
 		let dispatch_info = xt.get_dispatch_info();
 		let r = Applyable::apply::<UnsignedValidator>(xt, &dispatch_info, encoded_len)?;
 
-		<frame_system::Module<System>>::note_applied_extrinsic(&r, dispatch_info);
+		<frame_system::Pallet<System>>::note_applied_extrinsic(&r, dispatch_info);
 
 		Ok(r.map(|_| ()).map_err(|e| e.error))
 	}
@@ -435,7 +435,7 @@ where
 	fn final_checks(header: &System::Header) {
 		sp_tracing::enter_span!(sp_tracing::Level::TRACE, "final_checks");
 		// remove temporaries
-		let new_header = <frame_system::Module<System>>::finalize();
+		let new_header = <frame_system::Pallet<System>>::finalize();
 
 		// check digest
 		assert_eq!(
@@ -499,7 +499,7 @@ where
 		// OffchainWorker RuntimeApi should skip initialization.
 		let digests = header.digest().clone();
 
-		<frame_system::Module<System>>::initialize(
+		<frame_system::Pallet<System>>::initialize(
 			header.number(),
 			header.parent_hash(),
 			&digests,
@@ -511,7 +511,7 @@ where
 		// as well.
 		frame_system::BlockHash::<System>::insert(header.number(), header.hash());
 
-		<AllModules as OffchainWorker<System::BlockNumber>>::offchain_worker(*header.number())
+		<AllPallets as OffchainWorker<System::BlockNumber>>::offchain_worker(*header.number())
 	}
 }
 
@@ -628,9 +628,9 @@ mod tests {
 			NodeBlock = TestBlock,
 			UncheckedExtrinsic = TestUncheckedExtrinsic
 		{
-			System: frame_system::{Module, Call, Config, Storage, Event<T>},
-			Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
-			Custom: custom::{Module, Call, ValidateUnsigned},
+			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+			Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+			Custom: custom::{Pallet, Call, ValidateUnsigned},
 		}
 	);
 
@@ -741,7 +741,7 @@ mod tests {
 		Block<TestXt>,
 		ChainContext<Runtime>,
 		Runtime,
-		AllModules,
+		AllPallets,
 		CustomOnRuntimeUpgrade
 	>;
 
@@ -780,8 +780,8 @@ mod tests {
 			));
 			let r = Executive::apply_extrinsic(xt);
 			assert!(r.is_ok());
-			assert_eq!(<pallet_balances::Module<Runtime>>::total_balance(&1), 142 - fee);
-			assert_eq!(<pallet_balances::Module<Runtime>>::total_balance(&2), 69);
+			assert_eq!(<pallet_balances::Pallet<Runtime>>::total_balance(&1), 142 - fee);
+			assert_eq!(<pallet_balances::Pallet<Runtime>>::total_balance(&2), 69);
 		});
 	}
 
@@ -857,7 +857,7 @@ mod tests {
 				Digest::default(),
 			));
 			assert!(Executive::apply_extrinsic(xt).is_err());
-			assert_eq!(<frame_system::Module<Runtime>>::extrinsic_index(), Some(0));
+			assert_eq!(<frame_system::Pallet<Runtime>>::extrinsic_index(), Some(0));
 		});
 	}
 
@@ -883,7 +883,7 @@ mod tests {
 				Digest::default(),
 			));
 			// Base block execution weight + `on_initialize` weight from the custom module.
-			assert_eq!(<frame_system::Module<Runtime>>::block_weight().total(), base_block_weight);
+			assert_eq!(<frame_system::Pallet<Runtime>>::block_weight().total(), base_block_weight);
 
 			for nonce in 0..=num_to_exhaust_block {
 				let xt = TestXt::new(
@@ -893,11 +893,11 @@ mod tests {
 				if nonce != num_to_exhaust_block {
 					assert!(res.is_ok());
 					assert_eq!(
-						<frame_system::Module<Runtime>>::block_weight().total(),
+						<frame_system::Pallet<Runtime>>::block_weight().total(),
 						//--------------------- on_initialize + block_execution + extrinsic_base weight
 						(encoded_len + 5) * (nonce + 1) + base_block_weight,
 					);
-					assert_eq!(<frame_system::Module<Runtime>>::extrinsic_index(), Some(nonce as u32 + 1));
+					assert_eq!(<frame_system::Pallet<Runtime>>::extrinsic_index(), Some(nonce as u32 + 1));
 				} else {
 					assert_eq!(res, Err(InvalidTransaction::ExhaustsResources.into()));
 				}
@@ -924,8 +924,8 @@ mod tests {
 				Digest::default(),
 			));
 
-			assert_eq!(<frame_system::Module<Runtime>>::block_weight().total(), base_block_weight);
-			assert_eq!(<frame_system::Module<Runtime>>::all_extrinsics_len(), 0);
+			assert_eq!(<frame_system::Pallet<Runtime>>::block_weight().total(), base_block_weight);
+			assert_eq!(<frame_system::Pallet<Runtime>>::all_extrinsics_len(), 0);
 
 			assert!(Executive::apply_extrinsic(xt.clone()).unwrap().is_ok());
 			assert!(Executive::apply_extrinsic(x1.clone()).unwrap().is_ok());
@@ -935,14 +935,14 @@ mod tests {
 			let extrinsic_weight = len as Weight + <Runtime as frame_system::Config>::BlockWeights
 				::get().get(DispatchClass::Normal).base_extrinsic;
 			assert_eq!(
-				<frame_system::Module<Runtime>>::block_weight().total(),
+				<frame_system::Pallet<Runtime>>::block_weight().total(),
 				base_block_weight + 3 * extrinsic_weight,
 			);
-			assert_eq!(<frame_system::Module<Runtime>>::all_extrinsics_len(), 3 * len);
+			assert_eq!(<frame_system::Pallet<Runtime>>::all_extrinsics_len(), 3 * len);
 
-			let _ = <frame_system::Module<Runtime>>::finalize();
+			let _ = <frame_system::Pallet<Runtime>>::finalize();
 			// All extrinsics length cleaned on `System::finalize`
-			assert_eq!(<frame_system::Module<Runtime>>::all_extrinsics_len(), 0);
+			assert_eq!(<frame_system::Pallet<Runtime>>::all_extrinsics_len(), 0);
 
 			// New Block
 			Executive::initialize_block(&Header::new(
@@ -954,7 +954,7 @@ mod tests {
 			));
 
 			// Block weight cleaned up on `System::initialize`
-			assert_eq!(<frame_system::Module<Runtime>>::block_weight().total(), base_block_weight);
+			assert_eq!(<frame_system::Pallet<Runtime>>::block_weight().total(), base_block_weight);
 		});
 	}
 
@@ -989,7 +989,7 @@ mod tests {
 		let execute_with_lock = |lock: WithdrawReasons| {
 			let mut t = new_test_ext(1);
 			t.execute_with(|| {
-				<pallet_balances::Module<Runtime> as LockableCurrency<Balance>>::set_lock(
+				<pallet_balances::Pallet<Runtime> as LockableCurrency<Balance>>::set_lock(
 					id,
 					&1,
 					110,
@@ -1017,13 +1017,13 @@ mod tests {
 				if lock == WithdrawReasons::except(WithdrawReasons::TRANSACTION_PAYMENT) {
 					assert!(Executive::apply_extrinsic(xt).unwrap().is_ok());
 					// tx fee has been deducted.
-					assert_eq!(<pallet_balances::Module<Runtime>>::total_balance(&1), 111 - fee);
+					assert_eq!(<pallet_balances::Pallet<Runtime>>::total_balance(&1), 111 - fee);
 				} else {
 					assert_eq!(
 						Executive::apply_extrinsic(xt),
 						Err(InvalidTransaction::Payment.into()),
 					);
-					assert_eq!(<pallet_balances::Module<Runtime>>::total_balance(&1), 111);
+					assert_eq!(<pallet_balances::Pallet<Runtime>>::total_balance(&1), 111);
 				}
 			});
 		};
@@ -1041,7 +1041,7 @@ mod tests {
 			// NOTE: might need updates over time if new weights are introduced.
 			// For now it only accounts for the base block execution weight and
 			// the `on_initialize` weight defined in the custom test module.
-			assert_eq!(<frame_system::Module<Runtime>>::block_weight().total(), 175 + 175  + 10);
+			assert_eq!(<frame_system::Pallet<Runtime>>::block_weight().total(), 175 + 175  + 10);
 		})
 	}
 
@@ -1159,16 +1159,16 @@ mod tests {
 			));
 
 			// All weights that show up in the `initialize_block_impl`
-			let frame_system_upgrade_weight = frame_system::Module::<Runtime>::on_runtime_upgrade();
+			let frame_system_upgrade_weight = frame_system::Pallet::<Runtime>::on_runtime_upgrade();
 			let custom_runtime_upgrade_weight = CustomOnRuntimeUpgrade::on_runtime_upgrade();
-			let runtime_upgrade_weight = <AllModules as OnRuntimeUpgrade>::on_runtime_upgrade();
-			let frame_system_on_initialize_weight = frame_system::Module::<Runtime>::on_initialize(block_number);
-			let on_initialize_weight = <AllModules as OnInitialize<u64>>::on_initialize(block_number);
+			let runtime_upgrade_weight = <AllPallets as OnRuntimeUpgrade>::on_runtime_upgrade();
+			let frame_system_on_initialize_weight = frame_system::Pallet::<Runtime>::on_initialize(block_number);
+			let on_initialize_weight = <AllPallets as OnInitialize<u64>>::on_initialize(block_number);
 			let base_block_weight = <Runtime as frame_system::Config>::BlockWeights::get().base_block;
 
 			// Weights are recorded correctly
 			assert_eq!(
-				frame_system::Module::<Runtime>::block_weight().total(),
+				frame_system::Pallet::<Runtime>::block_weight().total(),
 				frame_system_upgrade_weight +
 				custom_runtime_upgrade_weight +
 				runtime_upgrade_weight +
diff --git a/frame/gilt/src/lib.rs b/frame/gilt/src/lib.rs
index fde7e58c4a11..23596a8b6e14 100644
--- a/frame/gilt/src/lib.rs
+++ b/frame/gilt/src/lib.rs
@@ -446,7 +446,7 @@ pub mod pallet {
 			let gilt = Active::<T>::get(index).ok_or(Error::<T>::Unknown)?;
 			// If found, check the owner is `who`.
 			ensure!(gilt.who == who, Error::<T>::NotOwner);
-			let now = frame_system::Module::<T>::block_number();
+			let now = frame_system::Pallet::<T>::block_number();
 			ensure!(now >= gilt.expiry, Error::<T>::NotExpired);
 			// Remove it
 			Active::<T>::remove(index);
@@ -562,7 +562,7 @@ pub mod pallet {
 			let mut remaining = amount;
 			let mut bids_taken = 0;
 			let mut queues_hit = 0;
-			let now = frame_system::Module::<T>::block_number();
+			let now = frame_system::Pallet::<T>::block_number();
 
 			ActiveTotal::<T>::mutate(|totals| {
 				QueueTotals::<T>::mutate(|qs| {
diff --git a/frame/gilt/src/mock.rs b/frame/gilt/src/mock.rs
index b943089a741e..1abb92ed3dfa 100644
--- a/frame/gilt/src/mock.rs
+++ b/frame/gilt/src/mock.rs
@@ -36,9 +36,9 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Balances: pallet_balances::{Module, Call, Config<T>, Storage, Event<T>},
-		Gilt: pallet_gilt::{Module, Call, Config, Storage, Event<T>},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Pallet, Call, Config<T>, Storage, Event<T>},
+		Gilt: pallet_gilt::{Pallet, Call, Config, Storage, Event<T>},
 	}
 );
 
diff --git a/frame/grandpa/src/lib.rs b/frame/grandpa/src/lib.rs
index b68624df7b5d..eb3dc4f110ac 100644
--- a/frame/grandpa/src/lib.rs
+++ b/frame/grandpa/src/lib.rs
@@ -390,7 +390,7 @@ impl<T: Config> Module<T> {
 	/// Cannot be done when already paused.
 	pub fn schedule_pause(in_blocks: T::BlockNumber) -> DispatchResult {
 		if let StoredState::Live = <State<T>>::get() {
-			let scheduled_at = <frame_system::Module<T>>::block_number();
+			let scheduled_at = <frame_system::Pallet<T>>::block_number();
 			<State<T>>::put(StoredState::PendingPause {
 				delay: in_blocks,
 				scheduled_at,
@@ -405,7 +405,7 @@ impl<T: Config> Module<T> {
 	/// Schedule a resume of GRANDPA after pausing.
 	pub fn schedule_resume(in_blocks: T::BlockNumber) -> DispatchResult {
 		if let StoredState::Paused = <State<T>>::get() {
-			let scheduled_at = <frame_system::Module<T>>::block_number();
+			let scheduled_at = <frame_system::Pallet<T>>::block_number();
 			<State<T>>::put(StoredState::PendingResume {
 				delay: in_blocks,
 				scheduled_at,
@@ -437,7 +437,7 @@ impl<T: Config> Module<T> {
 		forced: Option<T::BlockNumber>,
 	) -> DispatchResult {
 		if !<PendingChange<T>>::exists() {
-			let scheduled_at = <frame_system::Module<T>>::block_number();
+			let scheduled_at = <frame_system::Pallet<T>>::block_number();
 
 			if let Some(_) = forced {
 				if Self::next_forced().map_or(false, |next| next > scheduled_at) {
@@ -465,7 +465,7 @@ impl<T: Config> Module<T> {
 	/// Deposit one of this module's logs.
 	fn deposit_log(log: ConsensusLog<T::BlockNumber>) {
 		let log: DigestItem<T::Hash> = DigestItem::Consensus(GRANDPA_ENGINE_ID, log.encode());
-		<frame_system::Module<T>>::deposit_log(log.into());
+		<frame_system::Pallet<T>>::deposit_log(log.into());
 	}
 
 	// Perform module initialization, abstracted so that it can be called either through genesis
diff --git a/frame/grandpa/src/mock.rs b/frame/grandpa/src/mock.rs
index d36d6a9fbc7a..9e8bf3b8e0ca 100644
--- a/frame/grandpa/src/mock.rs
+++ b/frame/grandpa/src/mock.rs
@@ -51,14 +51,14 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent},
-		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
-		Staking: pallet_staking::{Module, Call, Config<T>, Storage, Event<T>, ValidateUnsigned},
-		Session: pallet_session::{Module, Call, Storage, Event, Config<T>},
-		Grandpa: pallet_grandpa::{Module, Call, Storage, Config, Event, ValidateUnsigned},
-		Offences: pallet_offences::{Module, Call, Storage, Event},
-		Historical: pallet_session_historical::{Module},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
+		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Staking: pallet_staking::{Pallet, Call, Config<T>, Storage, Event<T>, ValidateUnsigned},
+		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
+		Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event, ValidateUnsigned},
+		Offences: pallet_offences::{Pallet, Call, Storage, Event},
+		Historical: pallet_session_historical::{Pallet},
 	}
 );
 
@@ -210,7 +210,7 @@ impl pallet_staking::Config for Test {
 	type SlashDeferDuration = SlashDeferDuration;
 	type SlashCancelOrigin = frame_system::EnsureRoot<Self::AccountId>;
 	type SessionInterface = Self;
-	type UnixTime = pallet_timestamp::Module<Test>;
+	type UnixTime = pallet_timestamp::Pallet<Test>;
 	type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
 	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
 	type NextNewSession = Session;
diff --git a/frame/identity/src/benchmarking.rs b/frame/identity/src/benchmarking.rs
index 645b3817d6ec..372abc72a97d 100644
--- a/frame/identity/src/benchmarking.rs
+++ b/frame/identity/src/benchmarking.rs
@@ -25,12 +25,12 @@ use frame_system::{EventRecord, RawOrigin};
 use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
 use sp_runtime::traits::Bounded;
 
-use crate::Module as Identity;
+use crate::Pallet as Identity;
 
 const SEED: u32 = 0;
 
 fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
-	let events = frame_system::Module::<T>::events();
+	let events = frame_system::Pallet::<T>::events();
 	let system_event: <T as frame_system::Config>::Event = generic_event.into();
 	// compare to the last event record
 	let EventRecord { event, .. } = &events[events.len() - 1];
diff --git a/frame/identity/src/tests.rs b/frame/identity/src/tests.rs
index 230079a21ea0..a996c989a918 100644
--- a/frame/identity/src/tests.rs
+++ b/frame/identity/src/tests.rs
@@ -37,9 +37,9 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
-		Identity: pallet_identity::{Module, Call, Storage, Event<T>},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Identity: pallet_identity::{Pallet, Call, Storage, Event<T>},
 	}
 );
 
diff --git a/frame/im-online/src/lib.rs b/frame/im-online/src/lib.rs
index df0cfa92dbb2..ec8c6218b3f1 100644
--- a/frame/im-online/src/lib.rs
+++ b/frame/im-online/src/lib.rs
@@ -668,7 +668,7 @@ impl<T: Config> OneSessionHandler<T::AccountId> for Module<T> {
 		// Tell the offchain worker to start making the next session's heartbeats.
 		// Since we consider producing blocks as being online,
 		// the heartbeat is deferred a bit to prevent spamming.
-		let block_number = <frame_system::Module<T>>::block_number();
+		let block_number = <frame_system::Pallet<T>>::block_number();
 		let half_session = T::NextSessionRotation::average_session_length() / 2u32.into();
 		<HeartbeatAfter<T>>::put(block_number + half_session);
 
diff --git a/frame/im-online/src/mock.rs b/frame/im-online/src/mock.rs
index f8346aa53624..35028dd89df4 100644
--- a/frame/im-online/src/mock.rs
+++ b/frame/im-online/src/mock.rs
@@ -44,10 +44,10 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Session: pallet_session::{Module, Call, Storage, Event, Config<T>},
-		ImOnline: imonline::{Module, Call, Storage, Config<T>, Event<T>},
-		Historical: pallet_session_historical::{Module},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
+		ImOnline: imonline::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Historical: pallet_session_historical::{Pallet},
 	}
 );
 
diff --git a/frame/indices/src/mock.rs b/frame/indices/src/mock.rs
index 06c73b1a9bc2..01db4b50f508 100644
--- a/frame/indices/src/mock.rs
+++ b/frame/indices/src/mock.rs
@@ -33,9 +33,9 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
-		Indices: pallet_indices::{Module, Call, Storage, Config<T>, Event<T>},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Indices: pallet_indices::{Pallet, Call, Storage, Config<T>, Event<T>},
 	}
 );
 
diff --git a/frame/lottery/src/lib.rs b/frame/lottery/src/lib.rs
index 8248caa06708..84b924c17380 100644
--- a/frame/lottery/src/lib.rs
+++ b/frame/lottery/src/lib.rs
@@ -277,7 +277,7 @@ decl_module! {
 				ensure!(lottery.is_none(), Error::<T>::InProgress);
 				let index = LotteryIndex::get();
 				let new_index = index.checked_add(1).ok_or(Error::<T>::Overflow)?;
-				let start = frame_system::Module::<T>::block_number();
+				let start = frame_system::Pallet::<T>::block_number();
 				// Use new_index to more easily track everything with the current state.
 				*lottery = Some(LotteryConfig {
 					price,
@@ -392,7 +392,7 @@ impl<T: Config> Module<T> {
 	fn do_buy_ticket(caller: &T::AccountId, call: &<T as Config>::Call) -> DispatchResult {
 		// Check the call is valid lottery
 		let config = Lottery::<T>::get().ok_or(Error::<T>::NotConfigured)?;
-		let block_number = frame_system::Module::<T>::block_number();
+		let block_number = frame_system::Pallet::<T>::block_number();
 		ensure!(block_number < config.start.saturating_add(config.length), Error::<T>::AlreadyEnded);
 		ensure!(T::ValidateCall::validate_call(call), Error::<T>::InvalidCall);
 		let call_index = Self::call_to_index(call)?;
diff --git a/frame/lottery/src/mock.rs b/frame/lottery/src/mock.rs
index 44691427c8e5..a776896921a7 100644
--- a/frame/lottery/src/mock.rs
+++ b/frame/lottery/src/mock.rs
@@ -42,9 +42,9 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
-		Lottery: pallet_lottery::{Module, Call, Storage, Event<T>},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Lottery: pallet_lottery::{Pallet, Call, Storage, Event<T>},
 	}
 );
 
diff --git a/frame/membership/src/lib.rs b/frame/membership/src/lib.rs
index f08093809544..e26af3ce9b71 100644
--- a/frame/membership/src/lib.rs
+++ b/frame/membership/src/lib.rs
@@ -293,8 +293,8 @@ mod tests {
 			NodeBlock = Block,
 			UncheckedExtrinsic = UncheckedExtrinsic,
 		{
-			System: frame_system::{Module, Call, Config, Storage, Event<T>},
-			Membership: pallet_membership::{Module, Call, Storage, Config<T>, Event<T>},
+			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+			Membership: pallet_membership::{Pallet, Call, Storage, Config<T>, Event<T>},
 		}
 	);
 
diff --git a/frame/merkle-mountain-range/primitives/src/lib.rs b/frame/merkle-mountain-range/primitives/src/lib.rs
index 0887535dca0e..73d4d3ecc1fc 100644
--- a/frame/merkle-mountain-range/primitives/src/lib.rs
+++ b/frame/merkle-mountain-range/primitives/src/lib.rs
@@ -51,10 +51,10 @@ impl LeafDataProvider for () {
 /// so that any point in time in the future we can receive a proof about some past
 /// blocks without using excessive on-chain storage.
 ///
-/// Hence we implement the [LeafDataProvider] for [frame_system::Module]. Since the
+/// Hence we implement the [LeafDataProvider] for [frame_system::Pallet]. Since the
 /// current block hash is not available (since the block is not finished yet),
 /// we use the `parent_hash` here along with parent block number.
-impl<T: frame_system::Config> LeafDataProvider for frame_system::Module<T> {
+impl<T: frame_system::Config> LeafDataProvider for frame_system::Pallet<T> {
 	type LeafData = (
 		<T as frame_system::Config>::BlockNumber,
 		<T as frame_system::Config>::Hash
diff --git a/frame/merkle-mountain-range/src/mock.rs b/frame/merkle-mountain-range/src/mock.rs
index 0adb0294d508..072724a58afe 100644
--- a/frame/merkle-mountain-range/src/mock.rs
+++ b/frame/merkle-mountain-range/src/mock.rs
@@ -40,8 +40,8 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		MMR: pallet_mmr::{Module, Call, Storage},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		MMR: pallet_mmr::{Pallet, Call, Storage},
 	}
 );
 
@@ -78,7 +78,7 @@ impl Config for Test {
 
 	type Hashing = Keccak256;
 	type Hash = H256;
-	type LeafData = Compact<Keccak256, (frame_system::Module<Test>, LeafData)>;
+	type LeafData = Compact<Keccak256, (frame_system::Pallet<Test>, LeafData)>;
 	type OnNewRoot = ();
 	type WeightInfo = ();
 }
diff --git a/frame/merkle-mountain-range/src/tests.rs b/frame/merkle-mountain-range/src/tests.rs
index ea522dc51cd0..dfaf60ef2eab 100644
--- a/frame/merkle-mountain-range/src/tests.rs
+++ b/frame/merkle-mountain-range/src/tests.rs
@@ -39,11 +39,11 @@ fn register_offchain_ext(ext: &mut sp_io::TestExternalities) {
 }
 
 fn new_block() -> u64 {
-	let number = frame_system::Module::<Test>::block_number() + 1;
+	let number = frame_system::Pallet::<Test>::block_number() + 1;
 	let hash = H256::repeat_byte(number as u8);
 	LEAF_DATA.with(|r| r.borrow_mut().a = number);
 
-	frame_system::Module::<Test>::initialize(
+	frame_system::Pallet::<Test>::initialize(
 		&number,
 		&hash,
 		&Default::default(),
diff --git a/frame/multisig/src/lib.rs b/frame/multisig/src/lib.rs
index aa72d2d1ad3c..3b434ec48404 100644
--- a/frame/multisig/src/lib.rs
+++ b/frame/multisig/src/lib.rs
@@ -638,8 +638,8 @@ impl<T: Config> Module<T> {
 	/// The current `Timepoint`.
 	pub fn timepoint() -> Timepoint<T::BlockNumber> {
 		Timepoint {
-			height: <system::Module<T>>::block_number(),
-			index: <system::Module<T>>::extrinsic_index().unwrap_or_default(),
+			height: <system::Pallet<T>>::block_number(),
+			index: <system::Pallet<T>>::extrinsic_index().unwrap_or_default(),
 		}
 	}
 
diff --git a/frame/multisig/src/tests.rs b/frame/multisig/src/tests.rs
index a3f47a26e642..a3a3edc34f1a 100644
--- a/frame/multisig/src/tests.rs
+++ b/frame/multisig/src/tests.rs
@@ -37,9 +37,9 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
-		Multisig: pallet_multisig::{Module, Call, Storage, Event<T>},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>},
 	}
 );
 
@@ -124,7 +124,7 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 }
 
 fn last_event() -> Event {
-	system::Module::<Test>::events().pop().map(|e| e.event).expect("Event expected")
+	system::Pallet::<Test>::events().pop().map(|e| e.event).expect("Event expected")
 }
 
 fn expect_event<E: Into<Event>>(e: E) {
diff --git a/frame/nicks/src/lib.rs b/frame/nicks/src/lib.rs
index 681a45626fbc..6dee9ba79a60 100644
--- a/frame/nicks/src/lib.rs
+++ b/frame/nicks/src/lib.rs
@@ -257,9 +257,9 @@ mod tests {
 			NodeBlock = Block,
 			UncheckedExtrinsic = UncheckedExtrinsic,
 		{
-			System: frame_system::{Module, Call, Config, Storage, Event<T>},
-			Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
-			Nicks: pallet_nicks::{Module, Call, Storage, Event<T>},
+			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+			Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+			Nicks: pallet_nicks::{Pallet, Call, Storage, Event<T>},
 		}
 	);
 
diff --git a/frame/node-authorization/src/mock.rs b/frame/node-authorization/src/mock.rs
index 2983d081739d..5118f07c7694 100644
--- a/frame/node-authorization/src/mock.rs
+++ b/frame/node-authorization/src/mock.rs
@@ -37,9 +37,9 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		NodeAuthorization: pallet_node_authorization::{
-			Module, Call, Storage, Config<T>, Event<T>,
+			Pallet, Call, Storage, Config<T>, Event<T>,
 		},
 	}
 );
diff --git a/frame/node-authorization/src/tests.rs b/frame/node-authorization/src/tests.rs
index d80c6da7376b..15a286fbc239 100644
--- a/frame/node-authorization/src/tests.rs
+++ b/frame/node-authorization/src/tests.rs
@@ -356,7 +356,7 @@ fn get_authorized_nodes_works() {
 			BTreeSet::from_iter(vec![test_node(5), test_node(15), test_node(25)])
 		);
 
-		let mut authorized_nodes = Module::<Test>::get_authorized_nodes(&test_node(20));
+		let mut authorized_nodes = Pallet::<Test>::get_authorized_nodes(&test_node(20));
 		authorized_nodes.sort();
 		assert_eq!(
 			authorized_nodes,
diff --git a/frame/offences/benchmarking/src/lib.rs b/frame/offences/benchmarking/src/lib.rs
index 0ceebaecd91a..f430330f767b 100644
--- a/frame/offences/benchmarking/src/lib.rs
+++ b/frame/offences/benchmarking/src/lib.rs
@@ -24,7 +24,7 @@ mod mock;
 use sp_std::prelude::*;
 use sp_std::vec;
 
-use frame_system::{RawOrigin, Module as System, Config as SystemConfig};
+use frame_system::{RawOrigin, Pallet as System, Config as SystemConfig};
 use frame_benchmarking::{benchmarks, account, impl_benchmark_test_suite};
 use frame_support::traits::{Currency, OnInitialize, ValidatorSet, ValidatorSetWithIdentification};
 
@@ -50,7 +50,7 @@ const MAX_OFFENDERS: u32 = 100;
 const MAX_NOMINATORS: u32 = 100;
 const MAX_DEFERRED_OFFENCES: u32 = 100;
 
-pub struct Module<T: Config>(Offences<T>);
+pub struct Pallet<T: Config>(Offences<T>);
 
 pub trait Config:
 	SessionConfig
@@ -421,7 +421,7 @@ benchmarks! {
 }
 
 impl_benchmark_test_suite!(
-	Module,
+	Pallet,
 	crate::mock::new_test_ext(),
 	crate::mock::Test,
 );
diff --git a/frame/offences/benchmarking/src/mock.rs b/frame/offences/benchmarking/src/mock.rs
index e374ad73a558..1260fcba2fec 100644
--- a/frame/offences/benchmarking/src/mock.rs
+++ b/frame/offences/benchmarking/src/mock.rs
@@ -159,7 +159,7 @@ impl onchain::Config for Test {
 
 impl pallet_staking::Config for Test {
 	type Currency = Balances;
-	type UnixTime = pallet_timestamp::Module<Self>;
+	type UnixTime = pallet_timestamp::Pallet<Self>;
 	type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote;
 	type RewardRemainder = ();
 	type Event = Event;
@@ -220,13 +220,13 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: system::{Module, Call, Event<T>},
-		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
-		Staking: pallet_staking::{Module, Call, Config<T>, Storage, Event<T>, ValidateUnsigned},
-		Session: pallet_session::{Module, Call, Storage, Event, Config<T>},
-		ImOnline: pallet_im_online::{Module, Call, Storage, Event<T>, ValidateUnsigned, Config<T>},
-		Offences: pallet_offences::{Module, Call, Storage, Event},
-		Historical: pallet_session_historical::{Module},
+		System: system::{Pallet, Call, Event<T>},
+		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Staking: pallet_staking::{Pallet, Call, Config<T>, Storage, Event<T>, ValidateUnsigned},
+		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
+		ImOnline: pallet_im_online::{Pallet, Call, Storage, Event<T>, ValidateUnsigned, Config<T>},
+		Offences: pallet_offences::{Pallet, Call, Storage, Event},
+		Historical: pallet_session_historical::{Pallet},
 	}
 );
 
diff --git a/frame/offences/src/mock.rs b/frame/offences/src/mock.rs
index c47a9cf943c1..ab45bb0837b5 100644
--- a/frame/offences/src/mock.rs
+++ b/frame/offences/src/mock.rs
@@ -91,8 +91,8 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Offences: offences::{Module, Call, Storage, Event},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Offences: offences::{Pallet, Call, Storage, Event},
 	}
 );
 
diff --git a/frame/proxy/src/benchmarking.rs b/frame/proxy/src/benchmarking.rs
index 2fb99c57c115..4027fcbafa0d 100644
--- a/frame/proxy/src/benchmarking.rs
+++ b/frame/proxy/src/benchmarking.rs
@@ -23,12 +23,12 @@ use super::*;
 use frame_system::{RawOrigin, EventRecord};
 use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
 use sp_runtime::traits::Bounded;
-use crate::Module as Proxy;
+use crate::Pallet as Proxy;
 
 const SEED: u32 = 0;
 
 fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
-	let events = frame_system::Module::<T>::events();
+	let events = frame_system::Pallet::<T>::events();
 	let system_event: <T as frame_system::Config>::Event = generic_event.into();
 	// compare to the last event record
 	let EventRecord { event, .. } = &events[events.len() - 1];
@@ -219,7 +219,7 @@ benchmarks! {
 		0
 	)
 	verify {
-		let anon_account = Module::<T>::anonymous_account(&caller, &T::ProxyType::default(), 0, None);
+		let anon_account = Pallet::<T>::anonymous_account(&caller, &T::ProxyType::default(), 0, None);
 		assert_last_event::<T>(Event::AnonymousCreated(
 			anon_account,
 			caller,
@@ -233,15 +233,15 @@ benchmarks! {
 
 		let caller: T::AccountId = whitelisted_caller();
 		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
-		Module::<T>::anonymous(
+		Pallet::<T>::anonymous(
 			RawOrigin::Signed(whitelisted_caller()).into(),
 			T::ProxyType::default(),
 			T::BlockNumber::zero(),
 			0
 		)?;
-		let height = system::Module::<T>::block_number();
-		let ext_index = system::Module::<T>::extrinsic_index().unwrap_or(0);
-		let anon = Module::<T>::anonymous_account(&caller, &T::ProxyType::default(), 0, None);
+		let height = system::Pallet::<T>::block_number();
+		let ext_index = system::Pallet::<T>::extrinsic_index().unwrap_or(0);
+		let anon = Pallet::<T>::anonymous_account(&caller, &T::ProxyType::default(), 0, None);
 
 		add_proxies::<T>(p, Some(anon.clone()))?;
 		ensure!(Proxies::<T>::contains_key(&anon), "anon proxy not created");
diff --git a/frame/proxy/src/lib.rs b/frame/proxy/src/lib.rs
index c3ff658daf33..5600fb6ea806 100644
--- a/frame/proxy/src/lib.rs
+++ b/frame/proxy/src/lib.rs
@@ -394,7 +394,7 @@ pub mod pallet {
 			let announcement = Announcement {
 				real: real.clone(),
 				call_hash: call_hash.clone(),
-				height: system::Module::<T>::block_number(),
+				height: system::Pallet::<T>::block_number(),
 			};
 
 			Announcements::<T>::try_mutate(&who, |(ref mut pending, ref mut deposit)| {
@@ -510,7 +510,7 @@ pub mod pallet {
 			let def = Self::find_proxy(&real, &delegate, force_proxy_type)?;
 
 			let call_hash = T::CallHasher::hash_of(&call);
-			let now = system::Module::<T>::block_number();
+			let now = system::Pallet::<T>::block_number();
 			Self::edit_announcements(&delegate, |ann|
 				ann.real != real || ann.call_hash != call_hash || now.saturating_sub(ann.height) < def.delay
 			).map_err(|_| Error::<T>::Unannounced)?;
@@ -584,7 +584,7 @@ pub mod pallet {
 
 }
 
-impl<T: Config> Module<T> {
+impl<T: Config> Pallet<T> {
 
 	/// Calculate the address of an anonymous account.
 	///
@@ -604,8 +604,8 @@ impl<T: Config> Module<T> {
 		maybe_when: Option<(T::BlockNumber, u32)>,
 	) -> T::AccountId {
 		let (height, ext_index) = maybe_when.unwrap_or_else(|| (
-			system::Module::<T>::block_number(),
-			system::Module::<T>::extrinsic_index().unwrap_or_default()
+			system::Pallet::<T>::block_number(),
+			system::Pallet::<T>::extrinsic_index().unwrap_or_default()
 		));
 		let entropy = (b"modlpy/proxy____", who, height, ext_index, proxy_type, index)
 			.using_encoded(blake2_256);
diff --git a/frame/proxy/src/tests.rs b/frame/proxy/src/tests.rs
index 4d179968dd71..797a5ee3d469 100644
--- a/frame/proxy/src/tests.rs
+++ b/frame/proxy/src/tests.rs
@@ -38,10 +38,10 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
-		Proxy: proxy::{Module, Call, Storage, Event<T>},
-		Utility: pallet_utility::{Module, Call, Event},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Proxy: proxy::{Pallet, Call, Storage, Event<T>},
+		Utility: pallet_utility::{Pallet, Call, Event},
 	}
 );
 
@@ -164,7 +164,7 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 }
 
 fn last_event() -> Event {
-	system::Module::<Test>::events().pop().expect("Event expected").event
+	system::Pallet::<Test>::events().pop().expect("Event expected").event
 }
 
 fn expect_event<E: Into<Event>>(e: E) {
@@ -172,7 +172,7 @@ fn expect_event<E: Into<Event>>(e: E) {
 }
 
 fn last_events(n: usize) -> Vec<Event> {
-	system::Module::<Test>::events().into_iter().rev().take(n).rev().map(|e| e.event).collect()
+	system::Pallet::<Test>::events().into_iter().rev().take(n).rev().map(|e| e.event).collect()
 }
 
 fn expect_events(e: Vec<Event>) {
@@ -271,7 +271,7 @@ fn delayed_requires_pre_announcement() {
 		assert_noop!(Proxy::proxy_announced(Origin::signed(0), 2, 1, None, call.clone()), e);
 		let call_hash = BlakeTwo256::hash_of(&call);
 		assert_ok!(Proxy::announce(Origin::signed(2), 1, call_hash));
-		system::Module::<Test>::set_block_number(2);
+		system::Pallet::<Test>::set_block_number(2);
 		assert_ok!(Proxy::proxy_announced(Origin::signed(0), 2, 1, None, call.clone()));
 	});
 }
@@ -289,7 +289,7 @@ fn proxy_announced_removes_announcement_and_returns_deposit() {
 		let e = Error::<Test>::Unannounced;
 		assert_noop!(Proxy::proxy_announced(Origin::signed(0), 3, 1, None, call.clone()), e);
 
-		system::Module::<Test>::set_block_number(2);
+		system::Pallet::<Test>::set_block_number(2);
 		assert_ok!(Proxy::proxy_announced(Origin::signed(0), 3, 1, None, call.clone()));
 		assert_eq!(Announcements::<Test>::get(3), (vec![Announcement {
 			real: 2,
diff --git a/frame/randomness-collective-flip/src/lib.rs b/frame/randomness-collective-flip/src/lib.rs
index 57e95ccb141d..3e37a03b2e2f 100644
--- a/frame/randomness-collective-flip/src/lib.rs
+++ b/frame/randomness-collective-flip/src/lib.rs
@@ -76,7 +76,7 @@ fn block_number_to_index<T: Config>(block_number: T::BlockNumber) -> usize {
 decl_module! {
 	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		fn on_initialize(block_number: T::BlockNumber) -> Weight {
-			let parent_hash = <frame_system::Module<T>>::parent_hash();
+			let parent_hash = <frame_system::Pallet<T>>::parent_hash();
 
 			<RandomMaterial<T>>::mutate(|ref mut values| if values.len() < RANDOM_MATERIAL_LEN as usize {
 				values.push(parent_hash)
@@ -111,7 +111,7 @@ impl<T: Config> Randomness<T::Hash, T::BlockNumber> for Module<T> {
 	/// and mean that all bits of the resulting value are entirely manipulatable by the author of
 	/// the parent block, who can determine the value of `parent_hash`.
 	fn random(subject: &[u8]) -> (T::Hash, T::BlockNumber) {
-		let block_number = <frame_system::Module<T>>::block_number();
+		let block_number = <frame_system::Pallet<T>>::block_number();
 		let index = block_number_to_index::<T>(block_number);
 
 		let hash_series = <RandomMaterial<T>>::get();
@@ -157,8 +157,8 @@ mod tests {
 			NodeBlock = Block,
 			UncheckedExtrinsic = UncheckedExtrinsic,
 		{
-			System: frame_system::{Module, Call, Config, Storage, Event<T>},
-			CollectiveFlip: pallet_randomness_collective_flip::{Module, Call, Storage},
+			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+			CollectiveFlip: pallet_randomness_collective_flip::{Pallet, Call, Storage},
 		}
 	);
 
diff --git a/frame/recovery/src/lib.rs b/frame/recovery/src/lib.rs
index 00cd6ff2a7f7..20e984c98d0f 100644
--- a/frame/recovery/src/lib.rs
+++ b/frame/recovery/src/lib.rs
@@ -496,7 +496,7 @@ decl_module! {
 			T::Currency::reserve(&who, recovery_deposit)?;
 			// Create an active recovery status
 			let recovery_status = ActiveRecovery {
-				created: <system::Module<T>>::block_number(),
+				created: <system::Pallet<T>>::block_number(),
 				deposit: recovery_deposit,
 				friends: vec![],
 			};
@@ -578,7 +578,7 @@ decl_module! {
 			let active_recovery = Self::active_recovery(&account, &who).ok_or(Error::<T>::NotStarted)?;
 			ensure!(!Proxy::<T>::contains_key(&who), Error::<T>::AlreadyProxy);
 			// Make sure the delay period has passed
-			let current_block_number = <system::Module<T>>::block_number();
+			let current_block_number = <system::Pallet<T>>::block_number();
 			let recoverable_block_number = active_recovery.created
 				.checked_add(&recovery_config.delay_period)
 				.ok_or(Error::<T>::Overflow)?;
@@ -588,7 +588,7 @@ decl_module! {
 				recovery_config.threshold as usize <= active_recovery.friends.len(),
 				Error::<T>::Threshold
 			);
-			system::Module::<T>::inc_consumers(&who).map_err(|_| Error::<T>::BadState)?;
+			system::Pallet::<T>::inc_consumers(&who).map_err(|_| Error::<T>::BadState)?;
 			// Create the recovery storage item
 			Proxy::<T>::insert(&who, &account);
 			Self::deposit_event(RawEvent::AccountRecovered(account, who));
@@ -677,7 +677,7 @@ decl_module! {
 			// Check `who` is allowed to make a call on behalf of `account`
 			ensure!(Self::proxy(&who) == Some(account), Error::<T>::NotAllowed);
 			Proxy::<T>::remove(&who);
-			system::Module::<T>::dec_consumers(&who);
+			system::Pallet::<T>::dec_consumers(&who);
 		}
 	}
 }
diff --git a/frame/recovery/src/mock.rs b/frame/recovery/src/mock.rs
index ee38b0e24cc6..301dd8dba8dd 100644
--- a/frame/recovery/src/mock.rs
+++ b/frame/recovery/src/mock.rs
@@ -35,9 +35,9 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
-		Recovery: recovery::{Module, Call, Storage, Event<T>},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Recovery: recovery::{Pallet, Call, Storage, Event<T>},
 	}
 );
 
diff --git a/frame/scheduler/src/benchmarking.rs b/frame/scheduler/src/benchmarking.rs
index 37ccb900a824..563a1ba89c86 100644
--- a/frame/scheduler/src/benchmarking.rs
+++ b/frame/scheduler/src/benchmarking.rs
@@ -26,7 +26,7 @@ use frame_support::{ensure, traits::OnInitialize};
 use frame_benchmarking::{benchmarks, impl_benchmark_test_suite};
 
 use crate::Module as Scheduler;
-use frame_system::Module as System;
+use frame_system::Pallet as System;
 
 const BLOCK_NUMBER: u32 = 2;
 
diff --git a/frame/scheduler/src/lib.rs b/frame/scheduler/src/lib.rs
index 5cab10b0aff3..abce8504e5a5 100644
--- a/frame/scheduler/src/lib.rs
+++ b/frame/scheduler/src/lib.rs
@@ -465,7 +465,7 @@ impl<T: Config> Module<T> {
 	}
 
 	fn resolve_time(when: DispatchTime<T::BlockNumber>) -> Result<T::BlockNumber, DispatchError> {
-		let now = frame_system::Module::<T>::block_number();
+		let now = frame_system::Pallet::<T>::block_number();
 
 		let when = match when {
 			DispatchTime::At(x) => x,
@@ -793,9 +793,9 @@ mod tests {
 			NodeBlock = Block,
 			UncheckedExtrinsic = UncheckedExtrinsic,
 		{
-			System: frame_system::{Module, Call, Config, Storage, Event<T>},
-			Logger: logger::{Module, Call, Event},
-			Scheduler: scheduler::{Module, Call, Storage, Event<T>},
+			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+			Logger: logger::{Pallet, Call, Event},
+			Scheduler: scheduler::{Pallet, Call, Storage, Event<T>},
 		}
 	);
 
diff --git a/frame/scored-pool/src/mock.rs b/frame/scored-pool/src/mock.rs
index 3c4263b813e4..76f9dd848d6c 100644
--- a/frame/scored-pool/src/mock.rs
+++ b/frame/scored-pool/src/mock.rs
@@ -37,9 +37,9 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
-		ScoredPool: pallet_scored_pool::{Module, Call, Storage, Config<T>, Event<T>},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		ScoredPool: pallet_scored_pool::{Pallet, Call, Storage, Config<T>, Event<T>},
 	}
 );
 
diff --git a/frame/scored-pool/src/tests.rs b/frame/scored-pool/src/tests.rs
index 8f33f30f6ed8..e24ee9116497 100644
--- a/frame/scored-pool/src/tests.rs
+++ b/frame/scored-pool/src/tests.rs
@@ -24,8 +24,8 @@ use frame_support::{assert_ok, assert_noop, traits::OnInitialize};
 use sp_runtime::traits::BadOrigin;
 
 type ScoredPool = Module<Test>;
-type System = frame_system::Module<Test>;
-type Balances = pallet_balances::Module<Test>;
+type System = frame_system::Pallet<Test>;
+type Balances = pallet_balances::Pallet<Test>;
 
 #[test]
 fn query_membership_works() {
diff --git a/frame/session/benchmarking/src/lib.rs b/frame/session/benchmarking/src/lib.rs
index 8546800ee4fd..696a86166c1d 100644
--- a/frame/session/benchmarking/src/lib.rs
+++ b/frame/session/benchmarking/src/lib.rs
@@ -41,10 +41,10 @@ use sp_runtime::traits::{One, StaticLookup};
 
 const MAX_VALIDATORS: u32 = 1000;
 
-pub struct Module<T: Config>(pallet_session::Module<T>);
+pub struct Pallet<T: Config>(pallet_session::Module<T>);
 pub trait Config: pallet_session::Config + pallet_session::historical::Config + pallet_staking::Config {}
 
-impl<T: Config> OnInitialize<T::BlockNumber> for Module<T> {
+impl<T: Config> OnInitialize<T::BlockNumber> for Pallet<T> {
 	fn on_initialize(n: T::BlockNumber) -> frame_support::weights::Weight {
 		pallet_session::Module::<T>::on_initialize(n)
 	}
@@ -157,7 +157,7 @@ fn check_membership_proof_setup<T: Config>(
 		Session::<T>::set_keys(RawOrigin::Signed(controller).into(), keys, proof).unwrap();
 	}
 
-	Module::<T>::on_initialize(T::BlockNumber::one());
+	Pallet::<T>::on_initialize(T::BlockNumber::one());
 
 	// skip sessions until the new validator set is enacted
 	while Session::<T>::validators().len() < n as usize {
@@ -170,7 +170,7 @@ fn check_membership_proof_setup<T: Config>(
 }
 
 impl_benchmark_test_suite!(
-	Module,
+	Pallet,
 	crate::mock::new_test_ext(),
 	crate::mock::Test,
 	extra = false,
diff --git a/frame/session/benchmarking/src/mock.rs b/frame/session/benchmarking/src/mock.rs
index 539225c85259..8ba6b3c04b71 100644
--- a/frame/session/benchmarking/src/mock.rs
+++ b/frame/session/benchmarking/src/mock.rs
@@ -37,10 +37,10 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
-		Staking: pallet_staking::{Module, Call, Config<T>, Storage, Event<T>, ValidateUnsigned},
-		Session: pallet_session::{Module, Call, Storage, Event, Config<T>},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Staking: pallet_staking::{Pallet, Call, Config<T>, Storage, Event<T>, ValidateUnsigned},
+		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
 	}
 );
 
@@ -164,7 +164,7 @@ impl onchain::Config for Test {
 
 impl pallet_staking::Config for Test {
 	type Currency = Balances;
-	type UnixTime = pallet_timestamp::Module<Self>;
+	type UnixTime = pallet_timestamp::Pallet<Self>;
 	type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote;
 	type RewardRemainder = ();
 	type Event = Event;
diff --git a/frame/session/src/historical/mod.rs b/frame/session/src/historical/mod.rs
index 9b4d2704cf45..8902ebe551f6 100644
--- a/frame/session/src/historical/mod.rs
+++ b/frame/session/src/historical/mod.rs
@@ -358,7 +358,7 @@ pub(crate) mod tests {
 		);
 		BasicExternalities::execute_with_storage(&mut t, || {
 			for (ref k, ..) in &keys {
-				frame_system::Module::<Test>::inc_providers(k);
+				frame_system::Pallet::<Test>::inc_providers(k);
 			}
 		});
 		crate::GenesisConfig::<Test> { keys }.assimilate_storage(&mut t).unwrap();
diff --git a/frame/session/src/historical/offchain.rs b/frame/session/src/historical/offchain.rs
index f095be9e44e2..f675d878c1e2 100644
--- a/frame/session/src/historical/offchain.rs
+++ b/frame/session/src/historical/offchain.rs
@@ -28,7 +28,7 @@
 use sp_runtime::{offchain::storage::StorageValueRef, KeyTypeId};
 use sp_session::MembershipProof;
 
-use super::super::{Module as SessionModule, SessionIndex};
+use super::super::{Pallet as SessionModule, SessionIndex};
 use super::{IdentificationTuple, ProvingTrie, Config};
 
 use super::shared;
@@ -167,7 +167,7 @@ mod tests {
 		);
 		BasicExternalities::execute_with_storage(&mut t, || {
 			for (ref k, ..) in &keys {
-				frame_system::Module::<Test>::inc_providers(k);
+				frame_system::Pallet::<Test>::inc_providers(k);
 			}
 		});
 
diff --git a/frame/session/src/historical/onchain.rs b/frame/session/src/historical/onchain.rs
index 3b933bf262a0..8fe63a79e1c5 100644
--- a/frame/session/src/historical/onchain.rs
+++ b/frame/session/src/historical/onchain.rs
@@ -21,7 +21,7 @@ use codec::Encode;
 use sp_runtime::traits::Convert;
 
 use super::super::Config as SessionConfig;
-use super::super::{Module as SessionModule, SessionIndex};
+use super::super::{Pallet as SessionModule, SessionIndex};
 use super::Config as HistoricalConfig;
 
 use super::shared;
diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs
index 77157aa8347c..ce924f1400fa 100644
--- a/frame/session/src/lib.rs
+++ b/frame/session/src/lib.rs
@@ -442,7 +442,7 @@ decl_storage! {
 			for (account, val, keys) in config.keys.iter().cloned() {
 				<Module<T>>::inner_set_keys(&val, keys)
 					.expect("genesis config must not contain duplicates; qed");
-				assert!(frame_system::Module::<T>::inc_consumers(&account).is_ok());
+				assert!(frame_system::Pallet::<T>::inc_consumers(&account).is_ok());
 			}
 
 			let initial_validators_0 = T::SessionManager::new_session(0)
@@ -746,10 +746,10 @@ impl<T: Config> Module<T> {
 		let who = T::ValidatorIdOf::convert(account.clone())
 			.ok_or(Error::<T>::NoAssociatedValidatorId)?;
 
-		frame_system::Module::<T>::inc_consumers(&account).map_err(|_| Error::<T>::NoAccount)?;
+		frame_system::Pallet::<T>::inc_consumers(&account).map_err(|_| Error::<T>::NoAccount)?;
 		let old_keys = Self::inner_set_keys(&who, keys)?;
 		if old_keys.is_some() {
-			let _ = frame_system::Module::<T>::dec_consumers(&account);
+			let _ = frame_system::Pallet::<T>::dec_consumers(&account);
 			// ^^^ Defensive only; Consumers were incremented just before, so should never fail.
 		}
 
@@ -798,7 +798,7 @@ impl<T: Config> Module<T> {
 			let key_data = old_keys.get_raw(*id);
 			Self::clear_key_owner(*id, key_data);
 		}
-		frame_system::Module::<T>::dec_consumers(&account);
+		frame_system::Pallet::<T>::dec_consumers(&account);
 
 		Ok(())
 	}
diff --git a/frame/session/src/mock.rs b/frame/session/src/mock.rs
index 73499bf739b8..b64359fccee3 100644
--- a/frame/session/src/mock.rs
+++ b/frame/session/src/mock.rs
@@ -78,9 +78,9 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Session: pallet_session::{Module, Call, Storage, Event, Config<T>},
-		Historical: pallet_session_historical::{Module},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
+		Historical: pallet_session_historical::{Pallet},
 	}
 );
 
@@ -91,8 +91,8 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Session: pallet_session::{Module, Call, Storage, Event, Config<T>},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
 	}
 );
 
@@ -210,11 +210,11 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 	);
 	BasicExternalities::execute_with_storage(&mut t, || {
 		for (ref k, ..) in &keys {
-			frame_system::Module::<Test>::inc_providers(k);
+			frame_system::Pallet::<Test>::inc_providers(k);
 		}
-		frame_system::Module::<Test>::inc_providers(&4);
+		frame_system::Pallet::<Test>::inc_providers(&4);
 		// An additional identity that we use.
-		frame_system::Module::<Test>::inc_providers(&69);
+		frame_system::Pallet::<Test>::inc_providers(&69);
 	});
 	pallet_session::GenesisConfig::<Test> { keys }.assimilate_storage(&mut t).unwrap();
 	sp_io::TestExternalities::new(t)
diff --git a/frame/society/src/lib.rs b/frame/society/src/lib.rs
index 66d89d67dd6e..3546ea68d4dc 100644
--- a/frame/society/src/lib.rs
+++ b/frame/society/src/lib.rs
@@ -793,7 +793,7 @@ decl_module! {
 
 			let mut payouts = <Payouts<T, I>>::get(&who);
 			if let Some((when, amount)) = payouts.first() {
-				if when <= &<system::Module<T>>::block_number() {
+				if when <= &<system::Pallet<T>>::block_number() {
 					T::Currency::transfer(&Self::payouts(), &who, *amount, AllowDeath)?;
 					payouts.remove(0);
 					if payouts.is_empty() {
@@ -981,7 +981,7 @@ decl_module! {
 						// Reduce next pot by payout
 						<Pot<T, I>>::put(pot - value);
 						// Add payout for new candidate
-						let maturity = <system::Module<T>>::block_number()
+						let maturity = <system::Pallet<T>>::block_number()
 							+ Self::lock_duration(Self::members().len() as u32);
 						Self::pay_accepted_candidate(&who, value, kind, maturity);
 					}
@@ -1324,7 +1324,7 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 			// critical issues or side-effects. This is auto-correcting as members fall out of society.
 			members.reserve(candidates.len());
 
-			let maturity = <system::Module<T>>::block_number()
+			let maturity = <system::Pallet<T>>::block_number()
 				+ Self::lock_duration(members.len() as u32);
 
 			let mut rewardees = Vec::new();
diff --git a/frame/society/src/mock.rs b/frame/society/src/mock.rs
index 0a684b2a8dc8..53d999e37e62 100644
--- a/frame/society/src/mock.rs
+++ b/frame/society/src/mock.rs
@@ -41,9 +41,9 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
-		Society: pallet_society::{Module, Call, Storage, Event<T>, Config<T>},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Society: pallet_society::{Pallet, Call, Storage, Event<T>, Config<T>},
 	}
 );
 
@@ -104,7 +104,7 @@ impl pallet_balances::Config for Test {
 
 impl Config for Test {
 	type Event = Event;
-	type Currency = pallet_balances::Module<Self>;
+	type Currency = pallet_balances::Pallet<Self>;
 	type Randomness = TestRandomness<Self>;
 	type CandidateDeposit = CandidateDeposit;
 	type WrongSideDeduction = WrongSideDeduction;
diff --git a/frame/staking/fuzzer/src/mock.rs b/frame/staking/fuzzer/src/mock.rs
index 8df365737fc6..8fe7975cef06 100644
--- a/frame/staking/fuzzer/src/mock.rs
+++ b/frame/staking/fuzzer/src/mock.rs
@@ -33,11 +33,11 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
-		Staking: pallet_staking::{Module, Call, Config<T>, Storage, Event<T>, ValidateUnsigned},
-		Indices: pallet_indices::{Module, Call, Storage, Config<T>, Event<T>},
-		Session: pallet_session::{Module, Call, Storage, Event, Config<T>},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Staking: pallet_staking::{Pallet, Call, Config<T>, Storage, Event<T>, ValidateUnsigned},
+		Indices: pallet_indices::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
 	}
 );
 
@@ -174,7 +174,7 @@ impl frame_election_provider_support::ElectionProvider<AccountId, BlockNumber>
 
 impl pallet_staking::Config for Test {
 	type Currency = Balances;
-	type UnixTime = pallet_timestamp::Module<Self>;
+	type UnixTime = pallet_timestamp::Pallet<Self>;
 	type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote;
 	type RewardRemainder = ();
 	type Event = Event;
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 021b7f3be419..6fdb20e2bb83 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -1552,7 +1552,7 @@ decl_module! {
 				Err(Error::<T>::InsufficientValue)?
 			}
 
-			system::Module::<T>::inc_consumers(&stash).map_err(|_| Error::<T>::BadState)?;
+			system::Pallet::<T>::inc_consumers(&stash).map_err(|_| Error::<T>::BadState)?;
 
 			// You're auto-bonded forever, here. We might improve this by only bonding when
 			// you actually validate/nominate and remove once you unbond __everything__.
@@ -3254,7 +3254,7 @@ impl<T: Config> Module<T> {
 		<Validators<T>>::remove(stash);
 		<Nominators<T>>::remove(stash);
 
-		system::Module::<T>::dec_consumers(stash);
+		system::Pallet::<T>::dec_consumers(stash);
 
 		Ok(())
 	}
@@ -3516,7 +3516,7 @@ impl<T: Config> pallet_session::SessionManager<T::AccountId> for Module<T> {
 		log!(
 			trace,
 			"[{:?}] planning new_session({})",
-			<frame_system::Module<T>>::block_number(),
+			<frame_system::Pallet<T>>::block_number(),
 			new_index,
 		);
 		CurrentPlannedSession::put(new_index);
@@ -3526,7 +3526,7 @@ impl<T: Config> pallet_session::SessionManager<T::AccountId> for Module<T> {
 		log!(
 			trace,
 			"[{:?}] starting start_session({})",
-			<frame_system::Module<T>>::block_number(),
+			<frame_system::Pallet<T>>::block_number(),
 			start_index,
 		);
 		Self::start_session(start_index)
@@ -3535,7 +3535,7 @@ impl<T: Config> pallet_session::SessionManager<T::AccountId> for Module<T> {
 		log!(
 			trace,
 			"[{:?}] ending end_session({})",
-			<frame_system::Module<T>>::block_number(),
+			<frame_system::Pallet<T>>::block_number(),
 			end_index,
 		);
 		Self::end_session(end_index)
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index 40f59fa71cd6..68612c8f96fd 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -98,11 +98,11 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent},
-		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
-		Staking: staking::{Module, Call, Config<T>, Storage, Event<T>, ValidateUnsigned},
-		Session: pallet_session::{Module, Call, Storage, Event, Config<T>},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
+		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Staking: staking::{Pallet, Call, Config<T>, Storage, Event<T>, ValidateUnsigned},
+		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
 	}
 );
 
diff --git a/frame/sudo/src/mock.rs b/frame/sudo/src/mock.rs
index 91cd03ac4756..cd242d491dae 100644
--- a/frame/sudo/src/mock.rs
+++ b/frame/sudo/src/mock.rs
@@ -82,9 +82,9 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Sudo: sudo::{Module, Call, Config<T>, Storage, Event<T>},
-		Logger: logger::{Module, Call, Storage, Event<T>},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Sudo: sudo::{Pallet, Call, Config<T>, Storage, Event<T>},
+		Logger: logger::{Pallet, Call, Storage, Event<T>},
 	}
 );
 
diff --git a/frame/support/procedural/src/construct_runtime/mod.rs b/frame/support/procedural/src/construct_runtime/mod.rs
index abd68e4425d8..0951dbdea987 100644
--- a/frame/support/procedural/src/construct_runtime/mod.rs
+++ b/frame/support/procedural/src/construct_runtime/mod.rs
@@ -19,90 +19,90 @@ mod parse;
 
 use frame_support_procedural_tools::syn_ext as ext;
 use frame_support_procedural_tools::{generate_crate_access, generate_hidden_includes};
-use parse::{ModuleDeclaration, RuntimeDefinition, WhereSection, ModulePart};
+use parse::{PalletDeclaration, RuntimeDefinition, WhereSection, PalletPart};
 use proc_macro::TokenStream;
 use proc_macro2::{TokenStream as TokenStream2};
 use quote::quote;
 use syn::{Ident, Result, TypePath};
 use std::collections::HashMap;
 
-/// The fixed name of the system module.
-const SYSTEM_MODULE_NAME: &str = "System";
+/// The fixed name of the system pallet.
+const SYSTEM_PALLET_NAME: &str = "System";
 
-/// The complete definition of a module with the resulting fixed index.
+/// The complete definition of a pallet with the resulting fixed index.
 #[derive(Debug, Clone)]
-pub struct Module {
+pub struct Pallet {
 	pub name: Ident,
 	pub index: u8,
-	pub module: Ident,
+	pub pallet: Ident,
 	pub instance: Option<Ident>,
-	pub module_parts: Vec<ModulePart>,
+	pub pallet_parts: Vec<PalletPart>,
 }
 
-impl Module {
-	/// Get resolved module parts
-	fn module_parts(&self) -> &[ModulePart] {
-		&self.module_parts
+impl Pallet {
+	/// Get resolved pallet parts
+	fn pallet_parts(&self) -> &[PalletPart] {
+		&self.pallet_parts
 	}
 
 	/// Find matching parts
-	fn find_part(&self, name: &str) -> Option<&ModulePart> {
-		self.module_parts.iter().find(|part| part.name() == name)
+	fn find_part(&self, name: &str) -> Option<&PalletPart> {
+		self.pallet_parts.iter().find(|part| part.name() == name)
 	}
 
-	/// Return whether module contains part
+	/// Return whether pallet contains part
 	fn exists_part(&self, name: &str) -> bool {
 		self.find_part(name).is_some()
 	}
 }
 
-/// Convert from the parsed module to their final information.
-/// Assign index to each modules using same rules as rust for fieldless enum.
+/// Convert from the parsed pallet to their final information.
+/// Assign index to each pallet using same rules as rust for fieldless enum.
 /// I.e. implicit are assigned number incrementedly from last explicit or 0.
-fn complete_modules(decl: impl Iterator<Item = ModuleDeclaration>) -> syn::Result<Vec<Module>> {
+fn complete_pallets(decl: impl Iterator<Item = PalletDeclaration>) -> syn::Result<Vec<Pallet>> {
 	let mut indices = HashMap::new();
 	let mut last_index: Option<u8> = None;
 	let mut names = HashMap::new();
 
 	decl
-		.map(|module| {
-			let final_index = match module.index {
+		.map(|pallet| {
+			let final_index = match pallet.index {
 				Some(i) => i,
 				None => last_index.map_or(Some(0), |i| i.checked_add(1))
 					.ok_or_else(|| {
-						let msg = "Module index doesn't fit into u8, index is 256";
-						syn::Error::new(module.name.span(), msg)
+						let msg = "Pallet index doesn't fit into u8, index is 256";
+						syn::Error::new(pallet.name.span(), msg)
 					})?,
 			};
 
 			last_index = Some(final_index);
 
-			if let Some(used_module) = indices.insert(final_index, module.name.clone()) {
+			if let Some(used_pallet) = indices.insert(final_index, pallet.name.clone()) {
 				let msg = format!(
-					"Module indices are conflicting: Both modules {} and {} are at index {}",
-					used_module,
-					module.name,
+					"Pallet indices are conflicting: Both pallets {} and {} are at index {}",
+					used_pallet,
+					pallet.name,
 					final_index,
 				);
-				let mut err = syn::Error::new(used_module.span(), &msg);
-				err.combine(syn::Error::new(module.name.span(), msg));
+				let mut err = syn::Error::new(used_pallet.span(), &msg);
+				err.combine(syn::Error::new(pallet.name.span(), msg));
 				return Err(err);
 			}
 
-			if let Some(used_module) = names.insert(module.name.clone(), module.name.span()) {
-				let msg = "Two modules with the same name!";
+			if let Some(used_pallet) = names.insert(pallet.name.clone(), pallet.name.span()) {
+				let msg = "Two pallets with the same name!";
 
-				let mut err = syn::Error::new(used_module, &msg);
-				err.combine(syn::Error::new(module.name.span(), &msg));
+				let mut err = syn::Error::new(used_pallet, &msg);
+				err.combine(syn::Error::new(pallet.name.span(), &msg));
 				return Err(err);
 			}
 
-			Ok(Module {
-				name: module.name,
+			Ok(Pallet {
+				name: pallet.name,
 				index: final_index,
-				module: module.module,
-				instance: module.instance,
-				module_parts: module.module_parts,
+				pallet: pallet.pallet,
+				instance: pallet.instance,
+				pallet_parts: pallet.pallet_parts,
 			})
 		})
 		.collect()
@@ -124,55 +124,55 @@ fn construct_runtime_parsed(definition: RuntimeDefinition) -> Result<TokenStream
 			unchecked_extrinsic,
 			..
 		},
-		modules:
+		pallets:
 			ext::Braces {
-				content: ext::Punctuated { inner: modules, .. },
-				token: modules_token,
+				content: ext::Punctuated { inner: pallets, .. },
+				token: pallets_token,
 			},
 		..
 	} = definition;
 
-	let modules = complete_modules(modules.into_iter())?;
+	let pallets = complete_pallets(pallets.into_iter())?;
 
-	let system_module = modules.iter()
-		.find(|decl| decl.name == SYSTEM_MODULE_NAME)
+	let system_pallet = pallets.iter()
+		.find(|decl| decl.name == SYSTEM_PALLET_NAME)
 		.ok_or_else(|| syn::Error::new(
-			modules_token.span,
-			"`System` module declaration is missing. \
-			 Please add this line: `System: frame_system::{Module, Call, Storage, Config, Event<T>},`",
+			pallets_token.span,
+			"`System` pallet declaration is missing. \
+			 Please add this line: `System: frame_system::{Pallet, Call, Storage, Config, Event<T>},`",
 		))?;
 
 	let hidden_crate_name = "construct_runtime";
 	let scrate = generate_crate_access(&hidden_crate_name, "frame-support");
 	let scrate_decl = generate_hidden_includes(&hidden_crate_name, "frame-support");
 
-	let all_but_system_modules = modules.iter().filter(|module| module.name != SYSTEM_MODULE_NAME);
+	let all_but_system_pallets = pallets.iter().filter(|pallet| pallet.name != SYSTEM_PALLET_NAME);
 
 	let outer_event = decl_outer_event(
 		&name,
-		modules.iter(),
+		pallets.iter(),
 		&scrate,
 	)?;
 
 	let outer_origin = decl_outer_origin(
 		&name,
-		all_but_system_modules,
-		&system_module,
+		all_but_system_pallets,
+		&system_pallet,
 		&scrate,
 	)?;
-	let all_modules = decl_all_modules(&name, modules.iter());
-	let module_to_index = decl_pallet_runtime_setup(&modules, &scrate);
+	let all_pallets = decl_all_pallets(&name, pallets.iter());
+	let pallet_to_index = decl_pallet_runtime_setup(&pallets, &scrate);
 
-	let dispatch = decl_outer_dispatch(&name, modules.iter(), &scrate);
-	let metadata = decl_runtime_metadata(&name, modules.iter(), &scrate, &unchecked_extrinsic);
-	let outer_config = decl_outer_config(&name, modules.iter(), &scrate);
+	let dispatch = decl_outer_dispatch(&name, pallets.iter(), &scrate);
+	let metadata = decl_runtime_metadata(&name, pallets.iter(), &scrate, &unchecked_extrinsic);
+	let outer_config = decl_outer_config(&name, pallets.iter(), &scrate);
 	let inherent = decl_outer_inherent(
 		&block,
 		&unchecked_extrinsic,
-		modules.iter(),
+		pallets.iter(),
 		&scrate,
 	);
-	let validate_unsigned = decl_validate_unsigned(&name, modules.iter(), &scrate);
+	let validate_unsigned = decl_validate_unsigned(&name, pallets.iter(), &scrate);
 	let integrity_test = decl_integrity_test(&scrate);
 
 	let res = quote!(
@@ -197,9 +197,9 @@ fn construct_runtime_parsed(definition: RuntimeDefinition) -> Result<TokenStream
 
 		#outer_origin
 
-		#all_modules
+		#all_pallets
 
-		#module_to_index
+		#pallet_to_index
 
 		#dispatch
 
@@ -219,16 +219,16 @@ fn construct_runtime_parsed(definition: RuntimeDefinition) -> Result<TokenStream
 
 fn decl_validate_unsigned<'a>(
 	runtime: &'a Ident,
-	module_declarations: impl Iterator<Item = &'a Module>,
+	pallet_declarations: impl Iterator<Item = &'a Pallet>,
 	scrate: &'a TokenStream2,
 ) -> TokenStream2 {
-	let modules_tokens = module_declarations
-		.filter(|module_declaration| module_declaration.exists_part("ValidateUnsigned"))
-		.map(|module_declaration| &module_declaration.name);
+	let pallets_tokens = pallet_declarations
+		.filter(|pallet_declaration| pallet_declaration.exists_part("ValidateUnsigned"))
+		.map(|pallet_declaration| &pallet_declaration.name);
 	quote!(
 		#scrate::impl_outer_validate_unsigned!(
 			impl ValidateUnsigned for #runtime {
-				#( #modules_tokens )*
+				#( #pallets_tokens )*
 			}
 		);
 	)
@@ -237,13 +237,13 @@ fn decl_validate_unsigned<'a>(
 fn decl_outer_inherent<'a>(
 	block: &'a syn::TypePath,
 	unchecked_extrinsic: &'a syn::TypePath,
-	module_declarations: impl Iterator<Item = &'a Module>,
+	pallet_declarations: impl Iterator<Item = &'a Pallet>,
 	scrate: &'a TokenStream2,
 ) -> TokenStream2 {
-	let modules_tokens = module_declarations.filter_map(|module_declaration| {
-		let maybe_config_part = module_declaration.find_part("Inherent");
+	let pallets_tokens = pallet_declarations.filter_map(|pallet_declaration| {
+		let maybe_config_part = pallet_declaration.find_part("Inherent");
 		maybe_config_part.map(|_| {
-			let name = &module_declaration.name;
+			let name = &pallet_declaration.name;
 			quote!(#name,)
 		})
 	});
@@ -253,7 +253,7 @@ fn decl_outer_inherent<'a>(
 				Block = #block,
 				UncheckedExtrinsic = #unchecked_extrinsic
 			{
-				#(#modules_tokens)*
+				#(#pallets_tokens)*
 			}
 		);
 	)
@@ -261,37 +261,37 @@ fn decl_outer_inherent<'a>(
 
 fn decl_outer_config<'a>(
 	runtime: &'a Ident,
-	module_declarations: impl Iterator<Item = &'a Module>,
+	pallet_declarations: impl Iterator<Item = &'a Pallet>,
 	scrate: &'a TokenStream2,
 ) -> TokenStream2 {
-	let modules_tokens = module_declarations
-		.filter_map(|module_declaration| {
-			module_declaration.find_part("Config").map(|part| {
+	let pallets_tokens = pallet_declarations
+		.filter_map(|pallet_declaration| {
+			pallet_declaration.find_part("Config").map(|part| {
 				let transformed_generics: Vec<_> = part
 					.generics
 					.params
 					.iter()
 					.map(|param| quote!(<#param>))
 					.collect();
-				(module_declaration, transformed_generics)
+				(pallet_declaration, transformed_generics)
 			})
 		})
-		.map(|(module_declaration, generics)| {
-			let module = &module_declaration.module;
+		.map(|(pallet_declaration, generics)| {
+			let pallet = &pallet_declaration.pallet;
 			let name = Ident::new(
-				&format!("{}Config", module_declaration.name),
-				module_declaration.name.span(),
+				&format!("{}Config", pallet_declaration.name),
+				pallet_declaration.name.span(),
 			);
-			let instance = module_declaration.instance.as_ref().into_iter();
+			let instance = pallet_declaration.instance.as_ref().into_iter();
 			quote!(
 				#name =>
-					#module #(#instance)* #(#generics)*,
+					#pallet #(#instance)* #(#generics)*,
 			)
 		});
 	quote!(
 		#scrate::impl_outer_config! {
-			pub struct GenesisConfig for #runtime where AllModulesWithSystem = AllModulesWithSystem {
-				#(#modules_tokens)*
+			pub struct GenesisConfig for #runtime where AllPalletsWithSystem = AllPalletsWithSystem {
+				#(#pallets_tokens)*
 			}
 		}
 	)
@@ -299,63 +299,63 @@ fn decl_outer_config<'a>(
 
 fn decl_runtime_metadata<'a>(
 	runtime: &'a Ident,
-	module_declarations: impl Iterator<Item = &'a Module>,
+	pallet_declarations: impl Iterator<Item = &'a Pallet>,
 	scrate: &'a TokenStream2,
 	extrinsic: &TypePath,
 ) -> TokenStream2 {
-	let modules_tokens = module_declarations
-		.filter_map(|module_declaration| {
-			module_declaration.find_part("Module").map(|_| {
-				let filtered_names: Vec<_> = module_declaration
-					.module_parts()
+	let pallets_tokens = pallet_declarations
+		.filter_map(|pallet_declaration| {
+			pallet_declaration.find_part("Pallet").map(|_| {
+				let filtered_names: Vec<_> = pallet_declaration
+					.pallet_parts()
 					.iter()
-					.filter(|part| part.name() != "Module")
+					.filter(|part| part.name() != "Pallet")
 					.map(|part| part.ident())
 					.collect();
-				(module_declaration, filtered_names)
+				(pallet_declaration, filtered_names)
 			})
 		})
-		.map(|(module_declaration, filtered_names)| {
-			let module = &module_declaration.module;
-			let name = &module_declaration.name;
-			let instance = module_declaration
+		.map(|(pallet_declaration, filtered_names)| {
+			let pallet = &pallet_declaration.pallet;
+			let name = &pallet_declaration.name;
+			let instance = pallet_declaration
 				.instance
 				.as_ref()
 				.map(|name| quote!(<#name>))
 				.into_iter();
 
-			let index = module_declaration.index;
+			let index = pallet_declaration.index;
 
 			quote!(
-				#module::Module #(#instance)* as #name { index #index } with #(#filtered_names)*,
+				#pallet::Pallet #(#instance)* as #name { index #index } with #(#filtered_names)*,
 			)
 		});
 	quote!(
 		#scrate::impl_runtime_metadata!{
-			for #runtime with modules where Extrinsic = #extrinsic
-				#(#modules_tokens)*
+			for #runtime with pallets where Extrinsic = #extrinsic
+				#(#pallets_tokens)*
 		}
 	)
 }
 
 fn decl_outer_dispatch<'a>(
 	runtime: &'a Ident,
-	module_declarations: impl Iterator<Item = &'a Module>,
+	pallet_declarations: impl Iterator<Item = &'a Pallet>,
 	scrate: &'a TokenStream2,
 ) -> TokenStream2 {
-	let modules_tokens = module_declarations
-		.filter(|module_declaration| module_declaration.exists_part("Call"))
-		.map(|module_declaration| {
-			let module = &module_declaration.module;
-			let name = &module_declaration.name;
-			let index = module_declaration.index;
-			quote!(#[codec(index = #index)] #module::#name)
+	let pallets_tokens = pallet_declarations
+		.filter(|pallet_declaration| pallet_declaration.exists_part("Call"))
+		.map(|pallet_declaration| {
+			let pallet = &pallet_declaration.pallet;
+			let name = &pallet_declaration.name;
+			let index = pallet_declaration.index;
+			quote!(#[codec(index = #index)] #pallet::#name)
 		});
 
 	quote!(
 		#scrate::impl_outer_dispatch! {
 			pub enum Call for #runtime where origin: Origin {
-				#(#modules_tokens,)*
+				#(#pallets_tokens,)*
 			}
 		}
 	)
@@ -363,32 +363,32 @@ fn decl_outer_dispatch<'a>(
 
 fn decl_outer_origin<'a>(
 	runtime_name: &'a Ident,
-	modules_except_system: impl Iterator<Item = &'a Module>,
-	system_module: &'a Module,
+	pallets_except_system: impl Iterator<Item = &'a Pallet>,
+	system_pallet: &'a Pallet,
 	scrate: &'a TokenStream2,
 ) -> syn::Result<TokenStream2> {
-	let mut modules_tokens = TokenStream2::new();
-	for module_declaration in modules_except_system {
-		if let Some(module_entry) = module_declaration.find_part("Origin") {
-			let module = &module_declaration.module;
-			let instance = module_declaration.instance.as_ref();
-			let generics = &module_entry.generics;
+	let mut pallets_tokens = TokenStream2::new();
+	for pallet_declaration in pallets_except_system {
+		if let Some(pallet_entry) = pallet_declaration.find_part("Origin") {
+			let pallet = &pallet_declaration.pallet;
+			let instance = pallet_declaration.instance.as_ref();
+			let generics = &pallet_entry.generics;
 			if instance.is_some() && generics.params.is_empty() {
 				let msg = format!(
-					"Instantiable module with no generic `Origin` cannot \
-					 be constructed: module `{}` must have generic `Origin`",
-					module_declaration.name
+					"Instantiable pallet with no generic `Origin` cannot \
+					 be constructed: pallet `{}` must have generic `Origin`",
+					pallet_declaration.name
 				);
-				return Err(syn::Error::new(module_declaration.name.span(), msg));
+				return Err(syn::Error::new(pallet_declaration.name.span(), msg));
 			}
-			let index = module_declaration.index;
-			let tokens = quote!(#[codec(index = #index)] #module #instance #generics,);
-			modules_tokens.extend(tokens);
+			let index = pallet_declaration.index;
+			let tokens = quote!(#[codec(index = #index)] #pallet #instance #generics,);
+			pallets_tokens.extend(tokens);
 		}
 	}
 
-	let system_name = &system_module.module;
-	let system_index = system_module.index;
+	let system_name = &system_pallet.pallet;
+	let system_index = system_pallet.index;
 
 	Ok(quote!(
 		#scrate::impl_outer_origin! {
@@ -396,7 +396,7 @@ fn decl_outer_origin<'a>(
 				system = #system_name,
 				system_index = #system_index
 			{
-				#modules_tokens
+				#pallets_tokens
 			}
 		}
 	))
@@ -404,89 +404,99 @@ fn decl_outer_origin<'a>(
 
 fn decl_outer_event<'a>(
 	runtime_name: &'a Ident,
-	module_declarations: impl Iterator<Item = &'a Module>,
+	pallet_declarations: impl Iterator<Item = &'a Pallet>,
 	scrate: &'a TokenStream2,
 ) -> syn::Result<TokenStream2> {
-	let mut modules_tokens = TokenStream2::new();
-	for module_declaration in module_declarations {
-		if let Some(module_entry) = module_declaration.find_part("Event") {
-			let module = &module_declaration.module;
-			let instance = module_declaration.instance.as_ref();
-			let generics = &module_entry.generics;
+	let mut pallets_tokens = TokenStream2::new();
+	for pallet_declaration in pallet_declarations {
+		if let Some(pallet_entry) = pallet_declaration.find_part("Event") {
+			let pallet = &pallet_declaration.pallet;
+			let instance = pallet_declaration.instance.as_ref();
+			let generics = &pallet_entry.generics;
 			if instance.is_some() && generics.params.is_empty() {
 				let msg = format!(
-					"Instantiable module with no generic `Event` cannot \
-					 be constructed: module `{}` must have generic `Event`",
-					module_declaration.name,
+					"Instantiable pallet with no generic `Event` cannot \
+					 be constructed: pallet `{}` must have generic `Event`",
+					pallet_declaration.name,
 				);
-				return Err(syn::Error::new(module_declaration.name.span(), msg));
+				return Err(syn::Error::new(pallet_declaration.name.span(), msg));
 			}
 
-			let index = module_declaration.index;
-			let tokens = quote!(#[codec(index = #index)] #module #instance #generics,);
-			modules_tokens.extend(tokens);
+			let index = pallet_declaration.index;
+			let tokens = quote!(#[codec(index = #index)] #pallet #instance #generics,);
+			pallets_tokens.extend(tokens);
 		}
 	}
 
 	Ok(quote!(
 		#scrate::impl_outer_event! {
 			pub enum Event for #runtime_name {
-				#modules_tokens
+				#pallets_tokens
 			}
 		}
 	))
 }
 
-fn decl_all_modules<'a>(
+fn decl_all_pallets<'a>(
 	runtime: &'a Ident,
-	module_declarations: impl Iterator<Item = &'a Module>,
+	pallet_declarations: impl Iterator<Item = &'a Pallet>,
 ) -> TokenStream2 {
 	let mut types = TokenStream2::new();
 	let mut names = Vec::new();
-	for module_declaration in module_declarations {
-		let type_name = &module_declaration.name;
-		let module = &module_declaration.module;
+	for pallet_declaration in pallet_declarations {
+		let type_name = &pallet_declaration.name;
+		let pallet = &pallet_declaration.pallet;
 		let mut generics = vec![quote!(#runtime)];
 		generics.extend(
-			module_declaration
+			pallet_declaration
 				.instance
 				.iter()
-				.map(|name| quote!(#module::#name)),
+				.map(|name| quote!(#pallet::#name)),
 		);
 		let type_decl = quote!(
-			pub type #type_name = #module::Module <#(#generics),*>;
+			pub type #type_name = #pallet::Pallet <#(#generics),*>;
 		);
 		types.extend(type_decl);
-		names.push(&module_declaration.name);
+		names.push(&pallet_declaration.name);
 	}
 	// Make nested tuple structure like (((Babe, Consensus), Grandpa), ...)
-	// But ignore the system module.
-	let all_modules = names.iter()
-		.filter(|n| **n != SYSTEM_MODULE_NAME)
+	// But ignore the system pallet.
+	let all_pallets = names.iter()
+		.filter(|n| **n != SYSTEM_PALLET_NAME)
 		.fold(TokenStream2::default(), |combined, name| quote!((#name, #combined)));
 
-	let all_modules_with_system = names.iter()
+	let all_pallets_with_system = names.iter()
 		.fold(TokenStream2::default(), |combined, name| quote!((#name, #combined)));
 
 	quote!(
 		#types
 		/// All pallets included in the runtime as a nested tuple of types.
 		/// Excludes the System pallet.
-		pub type AllModules = ( #all_modules );
+		pub type AllPallets = ( #all_pallets );
 		/// All pallets included in the runtime as a nested tuple of types.
-		pub type AllModulesWithSystem = ( #all_modules_with_system );
+		pub type AllPalletsWithSystem = ( #all_pallets_with_system );
+
+		/// All modules included in the runtime as a nested tuple of types.
+		/// Excludes the System pallet.
+		#[deprecated(note = "use `AllPallets` instead")]
+		#[allow(dead_code)]
+		pub type AllModules = ( #all_pallets );
+		/// All modules included in the runtime as a nested tuple of types.
+		#[deprecated(note = "use `AllPalletsWithSystem` instead")]
+		#[allow(dead_code)]
+		pub type AllModulesWithSystem = ( #all_pallets_with_system );
 	)
 }
 
 fn decl_pallet_runtime_setup(
-	module_declarations: &[Module],
+	pallet_declarations: &[Pallet],
 	scrate: &TokenStream2,
 ) -> TokenStream2 {
-	let names = module_declarations.iter().map(|d| &d.name);
-	let names2 = module_declarations.iter().map(|d| &d.name);
-	let name_strings = module_declarations.iter().map(|d| d.name.to_string());
-	let indices = module_declarations.iter()
-		.map(|module| module.index as usize);
+	let names = pallet_declarations.iter().map(|d| &d.name);
+	let names2 = pallet_declarations.iter().map(|d| &d.name);
+	let name_strings = pallet_declarations.iter().map(|d| d.name.to_string());
+	let indices = pallet_declarations.iter()
+		.map(|pallet| pallet.index as usize);
 
 	quote!(
 		/// Provides an implementation of `PalletInfo` to provide information
@@ -527,7 +537,7 @@ fn decl_integrity_test(scrate: &TokenStream2) -> TokenStream2 {
 
 			#[test]
 			pub fn runtime_integrity_tests() {
-				<AllModules as #scrate::traits::IntegrityTest>::integrity_test();
+				<AllPallets as #scrate::traits::IntegrityTest>::integrity_test();
 			}
 		}
 	)
diff --git a/frame/support/procedural/src/construct_runtime/parse.rs b/frame/support/procedural/src/construct_runtime/parse.rs
index 6d4ba6cdbf74..def207439b53 100644
--- a/frame/support/procedural/src/construct_runtime/parse.rs
+++ b/frame/support/procedural/src/construct_runtime/parse.rs
@@ -28,7 +28,7 @@ mod keyword {
 	syn::custom_keyword!(Block);
 	syn::custom_keyword!(NodeBlock);
 	syn::custom_keyword!(UncheckedExtrinsic);
-	syn::custom_keyword!(Module);
+	syn::custom_keyword!(Pallet);
 	syn::custom_keyword!(Call);
 	syn::custom_keyword!(Storage);
 	syn::custom_keyword!(Event);
@@ -44,7 +44,7 @@ pub struct RuntimeDefinition {
 	pub enum_token: Token![enum],
 	pub name: Ident,
 	pub where_section: WhereSection,
-	pub modules: ext::Braces<ext::Punctuated<ModuleDeclaration, Token![,]>>,
+	pub pallets: ext::Braces<ext::Punctuated<PalletDeclaration, Token![,]>>,
 }
 
 impl Parse for RuntimeDefinition {
@@ -54,7 +54,7 @@ impl Parse for RuntimeDefinition {
 			enum_token: input.parse()?,
 			name: input.parse()?,
 			where_section: input.parse()?,
-			modules: input.parse()?,
+			pallets: input.parse()?,
 		})
 	}
 }
@@ -150,20 +150,20 @@ impl Parse for WhereDefinition {
 }
 
 #[derive(Debug, Clone)]
-pub struct ModuleDeclaration {
+pub struct PalletDeclaration {
 	pub name: Ident,
 	/// Optional fixed index (e.g. `MyPallet ...  = 3,`)
 	pub index: Option<u8>,
-	pub module: Ident,
+	pub pallet: Ident,
 	pub instance: Option<Ident>,
-	pub module_parts: Vec<ModulePart>,
+	pub pallet_parts: Vec<PalletPart>,
 }
 
-impl Parse for ModuleDeclaration {
+impl Parse for PalletDeclaration {
 	fn parse(input: ParseStream) -> Result<Self> {
 		let name = input.parse()?;
 		let _: Token![:] = input.parse()?;
-		let module = input.parse()?;
+		let pallet = input.parse()?;
 		let instance = if input.peek(Token![::]) && input.peek3(Token![<]) {
 			let _: Token![::] = input.parse()?;
 			let _: Token![<] = input.parse()?;
@@ -175,7 +175,7 @@ impl Parse for ModuleDeclaration {
 		};
 
 		let _: Token![::] = input.parse()?;
-		let module_parts = parse_module_parts(input)?;
+		let pallet_parts = parse_pallet_parts(input)?;
 
 		let index = if input.peek(Token![=]) {
 			input.parse::<Token![=]>()?;
@@ -188,9 +188,9 @@ impl Parse for ModuleDeclaration {
 
 		let parsed = Self {
 			name,
-			module,
+			pallet,
 			instance,
-			module_parts,
+			pallet_parts,
 			index,
 		};
 
@@ -198,14 +198,14 @@ impl Parse for ModuleDeclaration {
 	}
 }
 
-/// Parse [`ModulePart`]'s from a braces enclosed list that is split by commas, e.g.
+/// Parse [`PalletPart`]'s from a braces enclosed list that is split by commas, e.g.
 ///
 /// `{ Call, Event }`
-fn parse_module_parts(input: ParseStream) -> Result<Vec<ModulePart>> {
-	let module_parts :ext::Braces<ext::Punctuated<ModulePart, Token![,]>> = input.parse()?;
+fn parse_pallet_parts(input: ParseStream) -> Result<Vec<PalletPart>> {
+	let pallet_parts :ext::Braces<ext::Punctuated<PalletPart, Token![,]>> = input.parse()?;
 
 	let mut resolved = HashSet::new();
-	for part in module_parts.content.inner.iter() {
+	for part in pallet_parts.content.inner.iter() {
 		if !resolved.insert(part.name()) {
 			let msg = format!(
 				"`{}` was already declared before. Please remove the duplicate declaration",
@@ -215,12 +215,12 @@ fn parse_module_parts(input: ParseStream) -> Result<Vec<ModulePart>> {
 		}
 	}
 
-	Ok(module_parts.content.inner.into_iter().collect())
+	Ok(pallet_parts.content.inner.into_iter().collect())
 }
 
 #[derive(Debug, Clone)]
-pub enum ModulePartKeyword {
-	Module(keyword::Module),
+pub enum PalletPartKeyword {
+	Pallet(keyword::Pallet),
 	Call(keyword::Call),
 	Storage(keyword::Storage),
 	Event(keyword::Event),
@@ -230,12 +230,12 @@ pub enum ModulePartKeyword {
 	ValidateUnsigned(keyword::ValidateUnsigned),
 }
 
-impl Parse for ModulePartKeyword {
+impl Parse for PalletPartKeyword {
 	fn parse(input: ParseStream) -> Result<Self> {
 		let lookahead = input.lookahead1();
 
-		if lookahead.peek(keyword::Module) {
-			Ok(Self::Module(input.parse()?))
+		if lookahead.peek(keyword::Pallet) {
+			Ok(Self::Pallet(input.parse()?))
 		} else if lookahead.peek(keyword::Call) {
 			Ok(Self::Call(input.parse()?))
 		} else if lookahead.peek(keyword::Storage) {
@@ -256,11 +256,11 @@ impl Parse for ModulePartKeyword {
 	}
 }
 
-impl ModulePartKeyword {
+impl PalletPartKeyword {
 	/// Returns the name of `Self`.
 	fn name(&self) -> &'static str {
 		match self {
-			Self::Module(_) => "Module",
+			Self::Pallet(_) => "Pallet",
 			Self::Call(_) => "Call",
 			Self::Storage(_) => "Storage",
 			Self::Event(_) => "Event",
@@ -276,21 +276,21 @@ impl ModulePartKeyword {
 		Ident::new(self.name(), self.span())
 	}
 
-	/// Returns `true` if this module part is allowed to have generic arguments.
+	/// Returns `true` if this pallet part is allowed to have generic arguments.
 	fn allows_generic(&self) -> bool {
 		Self::all_generic_arg().iter().any(|n| *n == self.name())
 	}
 
-	/// Returns the names of all module parts that allow to have a generic argument.
+	/// Returns the names of all pallet parts that allow to have a generic argument.
 	fn all_generic_arg() -> &'static [&'static str] {
 		&["Event", "Origin", "Config"]
 	}
 }
 
-impl Spanned for ModulePartKeyword {
+impl Spanned for PalletPartKeyword {
 	fn span(&self) -> Span {
 		match self {
-			Self::Module(inner) => inner.span(),
+			Self::Pallet(inner) => inner.span(),
 			Self::Call(inner) => inner.span(),
 			Self::Storage(inner) => inner.span(),
 			Self::Event(inner) => inner.span(),
@@ -303,21 +303,21 @@ impl Spanned for ModulePartKeyword {
 }
 
 #[derive(Debug, Clone)]
-pub struct ModulePart {
-	pub keyword: ModulePartKeyword,
+pub struct PalletPart {
+	pub keyword: PalletPartKeyword,
 	pub generics: syn::Generics,
 }
 
-impl Parse for ModulePart {
+impl Parse for PalletPart {
 	fn parse(input: ParseStream) -> Result<Self> {
-		let keyword: ModulePartKeyword = input.parse()?;
+		let keyword: PalletPartKeyword = input.parse()?;
 
 		let generics: syn::Generics = input.parse()?;
 		if !generics.params.is_empty() && !keyword.allows_generic() {
-			let valid_generics = ModulePart::format_names(ModulePartKeyword::all_generic_arg());
+			let valid_generics = PalletPart::format_names(PalletPartKeyword::all_generic_arg());
 			let msg = format!(
 				"`{}` is not allowed to have generics. \
-				 Only the following modules are allowed to have generics: {}.",
+				 Only the following pallets are allowed to have generics: {}.",
 				keyword.name(),
 				valid_generics,
 			);
@@ -331,18 +331,18 @@ impl Parse for ModulePart {
 	}
 }
 
-impl ModulePart {
+impl PalletPart {
 	pub fn format_names(names: &[&'static str]) -> String {
 		let res: Vec<_> = names.iter().map(|s| format!("`{}`", s)).collect();
 		res.join(", ")
 	}
 
-	/// The name of this module part.
+	/// The name of this pallet part.
 	pub fn name(&self) -> &'static str {
 		self.keyword.name()
 	}
 
-	/// The name of this module part as `Ident`.
+	/// The name of this pallet part as `Ident`.
 	pub fn ident(&self) -> Ident {
 		self.keyword.ident()
 	}
diff --git a/frame/support/procedural/src/lib.rs b/frame/support/procedural/src/lib.rs
index e64a364d2951..2aecc5b99392 100644
--- a/frame/support/procedural/src/lib.rs
+++ b/frame/support/procedural/src/lib.rs
@@ -192,7 +192,7 @@ use proc_macro::TokenStream;
 /// construct_runtime!(
 /// 	pub enum Runtime with ... {
 ///         ...,
-///         Example: example::{Module, Storage, ..., Config<T>},
+///         Example: example::{Pallet, Storage, ..., Config<T>},
 ///         ...,
 ///	}
 /// );
@@ -258,13 +258,13 @@ pub fn decl_storage(input: TokenStream) -> TokenStream {
 ///         NodeBlock = runtime::Block,
 ///         UncheckedExtrinsic = UncheckedExtrinsic
 ///     {
-///         System: system::{Module, Call, Event<T>, Config<T>} = 0,
-///         Test: test::{Module, Call} = 1,
-///         Test2: test_with_long_module::{Module, Event<T>},
+///         System: system::{Pallet, Call, Event<T>, Config<T>} = 0,
+///         Test: test::{Pallet, Call} = 1,
+///         Test2: test_with_long_module::{Pallet, Event<T>},
 ///
 ///         // Module with instances
-///         Test3_Instance1: test3::<Instance1>::{Module, Call, Storage, Event<T, I>, Config<T, I>, Origin<T, I>},
-///         Test3_DefaultInstance: test3::{Module, Call, Storage, Event<T>, Config<T>, Origin<T>} = 4,
+///         Test3_Instance1: test3::<Instance1>::{Pallet, Call, Storage, Event<T, I>, Config<T, I>, Origin<T, I>},
+///         Test3_DefaultInstance: test3::{Pallet, Call, Storage, Event<T>, Config<T>, Origin<T>} = 4,
 ///     }
 /// )
 /// ```
@@ -306,7 +306,7 @@ pub fn decl_storage(input: TokenStream) -> TokenStream {
 /// # Type definitions
 ///
 /// * The macro generates a type alias for each pallet to their `Module` (or `Pallet`).
-///   E.g. `type System = frame_system::Module<Runtime>`
+///   E.g. `type System = frame_system::Pallet<Runtime>`
 #[proc_macro]
 pub fn construct_runtime(input: TokenStream) -> TokenStream {
 	construct_runtime::construct_runtime(input)
diff --git a/frame/support/procedural/src/pallet/expand/pallet_struct.rs b/frame/support/procedural/src/pallet/expand/pallet_struct.rs
index 47e4344c50d8..fd3230edd1e7 100644
--- a/frame/support/procedural/src/pallet/expand/pallet_struct.rs
+++ b/frame/support/procedural/src/pallet/expand/pallet_struct.rs
@@ -102,6 +102,8 @@ pub fn expand_pallet_struct(def: &mut Def) -> proc_macro2::TokenStream {
 		/// Type alias to `Pallet`, to be used by `construct_runtime`.
 		///
 		/// Generated by `pallet` attribute macro.
+		#[deprecated(note = "use `Pallet` instead")]
+		#[allow(dead_code)]
 		pub type Module<#type_decl_gen> = #pallet_ident<#type_use_gen>;
 
 		// Implement `GetPalletVersion` for `Pallet`
diff --git a/frame/support/src/dispatch.rs b/frame/support/src/dispatch.rs
index 64b7b7a8e218..aede0404da19 100644
--- a/frame/support/src/dispatch.rs
+++ b/frame/support/src/dispatch.rs
@@ -1375,11 +1375,11 @@ macro_rules! decl_module {
 		impl<$trait_instance: $trait_name$(<I>, $instance: $instantiable)?> $module<$trait_instance $(, $instance)?>
 			where $( $other_where_bounds )*
 		{
-			/// Deposits an event using `frame_system::Module::deposit_event`.
+			/// Deposits an event using `frame_system::Pallet::deposit_event`.
 			$vis fn deposit_event(
 				event: impl Into<< $trait_instance as $trait_name $(<$instance>)? >::Event>
 			) {
-				<$system::Module<$trait_instance>>::deposit_event(event.into())
+				<$system::Pallet<$trait_instance>>::deposit_event(event.into())
 			}
 		}
 	};
@@ -1859,6 +1859,11 @@ macro_rules! decl_module {
 		>($crate::sp_std::marker::PhantomData<($trait_instance, $( $instance)?)>) where
 			$( $other_where_bounds )*;
 
+		/// Type alias to `Module`, to be used by `construct_runtime`.
+		#[allow(dead_code)]
+		pub type Pallet<$trait_instance $(, $instance $( = $module_default_instance)?)?>
+			= $mod_type<$trait_instance $(, $instance)?>;
+
 		$crate::decl_module! {
 			@impl_on_initialize
 			{ $system }
diff --git a/frame/support/src/genesis_config.rs b/frame/support/src/genesis_config.rs
index 8f915082e8bb..3f7f943603e4 100644
--- a/frame/support/src/genesis_config.rs
+++ b/frame/support/src/genesis_config.rs
@@ -56,7 +56,7 @@ macro_rules! __impl_outer_config_types {
 /// specific genesis configuration.
 ///
 /// ```ignore
-/// pub struct GenesisConfig for Runtime where AllModulesWithSystem = AllModulesWithSystem {
+/// pub struct GenesisConfig for Runtime where AllPalletsWithSystem = AllPalletsWithSystem {
 /// 	rust_module_one: Option<ModuleOneConfig>,
 /// 	...
 /// }
@@ -65,7 +65,7 @@ macro_rules! __impl_outer_config_types {
 macro_rules! impl_outer_config {
 	(
 		pub struct $main:ident for $concrete:ident where
-			AllModulesWithSystem = $all_modules_with_system:ident
+			AllPalletsWithSystem = $all_pallets_with_system:ident
 		{
 			$( $config:ident =>
 				$snake:ident $( $instance:ident )? $( <$generic:ident> )*, )*
@@ -103,7 +103,7 @@ macro_rules! impl_outer_config {
 					)*
 
 					$crate::BasicExternalities::execute_with_storage(storage, || {
-						<$all_modules_with_system as $crate::traits::OnGenesis>::on_genesis();
+						<$all_pallets_with_system as $crate::traits::OnGenesis>::on_genesis();
 					});
 
 					Ok(())
diff --git a/frame/support/src/metadata.rs b/frame/support/src/metadata.rs
index 2edaba1cb47e..d0c59a0dfdc1 100644
--- a/frame/support/src/metadata.rs
+++ b/frame/support/src/metadata.rs
@@ -58,7 +58,7 @@ pub use frame_metadata::{
 ///
 /// struct Runtime;
 /// frame_support::impl_runtime_metadata! {
-///     for Runtime with modules where Extrinsic = UncheckedExtrinsic
+///     for Runtime with pallets where Extrinsic = UncheckedExtrinsic
 ///         module0::Module as Module0 { index 0 } with,
 ///         module1::Module as Module1 { index 1 } with,
 ///         module2::Module as Module2 { index 2 } with Storage,
@@ -69,7 +69,7 @@ pub use frame_metadata::{
 #[macro_export]
 macro_rules! impl_runtime_metadata {
 	(
-		for $runtime:ident with modules where Extrinsic = $ext:ident
+		for $runtime:ident with pallets where Extrinsic = $ext:ident
 			$( $rest:tt )*
 	) => {
 		impl $runtime {
@@ -421,7 +421,7 @@ mod tests {
 	impl crate::traits::PalletInfo for TestRuntime {
 		fn index<P: 'static>() -> Option<usize> {
 			let type_id = sp_std::any::TypeId::of::<P>();
-			if type_id == sp_std::any::TypeId::of::<system::Module<TestRuntime>>() {
+			if type_id == sp_std::any::TypeId::of::<system::Pallet<TestRuntime>>() {
 				return Some(0)
 			}
 			if type_id == sp_std::any::TypeId::of::<EventModule>() {
@@ -435,7 +435,7 @@ mod tests {
 		}
 		fn name<P: 'static>() -> Option<&'static str> {
 			let type_id = sp_std::any::TypeId::of::<P>();
-			if type_id == sp_std::any::TypeId::of::<system::Module<TestRuntime>>() {
+			if type_id == sp_std::any::TypeId::of::<system::Pallet<TestRuntime>>() {
 				return Some("System")
 			}
 			if type_id == sp_std::any::TypeId::of::<EventModule>() {
@@ -492,8 +492,8 @@ mod tests {
 	}
 
 	impl_runtime_metadata!(
-		for TestRuntime with modules where Extrinsic = TestExtrinsic
-			system::Module as System { index 0 } with Event,
+		for TestRuntime with pallets where Extrinsic = TestExtrinsic
+			system::Pallet as System { index 0 } with Event,
 			event_module::Module as Module { index 1 } with Event Call,
 			event_module2::Module as Module2 { index 2 } with Event Storage Call,
 	);
diff --git a/frame/support/test/src/lib.rs b/frame/support/test/src/lib.rs
index ae3efdf57aa2..d40031c149d9 100644
--- a/frame/support/test/src/lib.rs
+++ b/frame/support/test/src/lib.rs
@@ -67,7 +67,7 @@ where
 
 		(
 			Output::decode(&mut TrailingZeroInput::new(subject)).unwrap_or_default(),
-			frame_system::Module::<T>::block_number(),
+			frame_system::Pallet::<T>::block_number(),
 		)
 	}
 }
diff --git a/frame/support/test/tests/construct_runtime.rs b/frame/support/test/tests/construct_runtime.rs
index 8dc44c2024ad..a1ec744e4273 100644
--- a/frame/support/test/tests/construct_runtime.rs
+++ b/frame/support/test/tests/construct_runtime.rs
@@ -138,17 +138,17 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: system::{Module, Call, Event<T>, Origin<T>} = 30,
-		Module1_1: module1::<Instance1>::{Module, Call, Storage, Event<T>, Origin<T>},
-		Module2: module2::{Module, Call, Storage, Event, Origin},
-		Module1_2: module1::<Instance2>::{Module, Call, Storage, Event<T>, Origin<T>},
-		Module1_3: module1::<Instance3>::{Module, Storage} = 6,
-		Module1_4: module1::<Instance4>::{Module, Call} = 3,
-		Module1_5: module1::<Instance5>::{Module, Event<T>},
-		Module1_6: module1::<Instance6>::{Module, Call, Storage, Event<T>, Origin<T>} = 1,
-		Module1_7: module1::<Instance7>::{Module, Call, Storage, Event<T>, Origin<T>},
-		Module1_8: module1::<Instance8>::{Module, Call, Storage, Event<T>, Origin<T>} = 12,
-		Module1_9: module1::<Instance9>::{Module, Call, Storage, Event<T>, Origin<T>},
+		System: system::{Pallet, Call, Event<T>, Origin<T>} = 30,
+		Module1_1: module1::<Instance1>::{Pallet, Call, Storage, Event<T>, Origin<T>},
+		Module2: module2::{Pallet, Call, Storage, Event, Origin},
+		Module1_2: module1::<Instance2>::{Pallet, Call, Storage, Event<T>, Origin<T>},
+		Module1_3: module1::<Instance3>::{Pallet, Storage} = 6,
+		Module1_4: module1::<Instance4>::{Pallet, Call} = 3,
+		Module1_5: module1::<Instance5>::{Pallet, Event<T>},
+		Module1_6: module1::<Instance6>::{Pallet, Call, Storage, Event<T>, Origin<T>} = 1,
+		Module1_7: module1::<Instance7>::{Pallet, Call, Storage, Event<T>, Origin<T>},
+		Module1_8: module1::<Instance8>::{Pallet, Call, Storage, Event<T>, Origin<T>} = 12,
+		Module1_9: module1::<Instance9>::{Pallet, Call, Storage, Event<T>, Origin<T>},
 	}
 );
 
diff --git a/frame/support/test/tests/construct_runtime_ui/conflicting_index.stderr b/frame/support/test/tests/construct_runtime_ui/conflicting_index.stderr
index 65368666c88f..2e2028fd1b86 100644
--- a/frame/support/test/tests/construct_runtime_ui/conflicting_index.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/conflicting_index.stderr
@@ -1,10 +1,10 @@
-error: Module indices are conflicting: Both modules System and Pallet1 are at index 0
+error: Pallet indices are conflicting: Both pallets System and Pallet1 are at index 0
  --> $DIR/conflicting_index.rs:9:3
   |
 9 |         System: system::{},
   |         ^^^^^^
 
-error: Module indices are conflicting: Both modules System and Pallet1 are at index 0
+error: Pallet indices are conflicting: Both pallets System and Pallet1 are at index 0
   --> $DIR/conflicting_index.rs:10:3
    |
 10 |         Pallet1: pallet1::{} = 0,
diff --git a/frame/support/test/tests/construct_runtime_ui/conflicting_index_2.stderr b/frame/support/test/tests/construct_runtime_ui/conflicting_index_2.stderr
index b792ff5d2a54..bfa3706a456a 100644
--- a/frame/support/test/tests/construct_runtime_ui/conflicting_index_2.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/conflicting_index_2.stderr
@@ -1,10 +1,10 @@
-error: Module indices are conflicting: Both modules System and Pallet3 are at index 5
+error: Pallet indices are conflicting: Both pallets System and Pallet3 are at index 5
  --> $DIR/conflicting_index_2.rs:9:3
   |
 9 |         System: system::{} = 5,
   |         ^^^^^^
 
-error: Module indices are conflicting: Both modules System and Pallet3 are at index 5
+error: Pallet indices are conflicting: Both pallets System and Pallet3 are at index 5
   --> $DIR/conflicting_index_2.rs:12:3
    |
 12 |         Pallet3: pallet3::{},
diff --git a/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.rs b/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.rs
index bc242a57a41e..7cc6cbd6bd6e 100644
--- a/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.rs
+++ b/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.rs
@@ -6,9 +6,9 @@ construct_runtime! {
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: system::{Module},
-		Balance: balances::{Module},
-		Balance: balances::{Module},
+		System: system::{Pallet},
+		Balance: balances::{Pallet},
+		Balance: balances::{Pallet},
 	}
 }
 
diff --git a/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.stderr b/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.stderr
index f5b999db66a4..27c5644e0d73 100644
--- a/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.stderr
@@ -1,11 +1,11 @@
-error: Two modules with the same name!
+error: Two pallets with the same name!
   --> $DIR/conflicting_module_name.rs:10:3
    |
-10 |         Balance: balances::{Module},
+10 |         Balance: balances::{Pallet},
    |         ^^^^^^^
 
-error: Two modules with the same name!
+error: Two pallets with the same name!
   --> $DIR/conflicting_module_name.rs:11:3
    |
-11 |         Balance: balances::{Module},
+11 |         Balance: balances::{Pallet},
    |         ^^^^^^^
diff --git a/frame/support/test/tests/construct_runtime_ui/double_module_parts.rs b/frame/support/test/tests/construct_runtime_ui/double_module_parts.rs
index ec37456e58e7..836af597851d 100644
--- a/frame/support/test/tests/construct_runtime_ui/double_module_parts.rs
+++ b/frame/support/test/tests/construct_runtime_ui/double_module_parts.rs
@@ -6,7 +6,7 @@ construct_runtime! {
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: system::{Module},
+		System: system::{Pallet},
 		Balance: balances::{Config, Call, Config<T>, Origin<T>},
 	}
 }
diff --git a/frame/support/test/tests/construct_runtime_ui/generics_in_invalid_module.rs b/frame/support/test/tests/construct_runtime_ui/generics_in_invalid_module.rs
index b79d73ff5c02..b3f0d340d671 100644
--- a/frame/support/test/tests/construct_runtime_ui/generics_in_invalid_module.rs
+++ b/frame/support/test/tests/construct_runtime_ui/generics_in_invalid_module.rs
@@ -6,7 +6,7 @@ construct_runtime! {
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: system::{Module},
+		System: system::{Pallet},
 		Balance: balances::<Instance1>::{Call<T>, Origin<T>},
 	}
 }
diff --git a/frame/support/test/tests/construct_runtime_ui/generics_in_invalid_module.stderr b/frame/support/test/tests/construct_runtime_ui/generics_in_invalid_module.stderr
index fe880549211b..06caa036b91f 100644
--- a/frame/support/test/tests/construct_runtime_ui/generics_in_invalid_module.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/generics_in_invalid_module.stderr
@@ -1,4 +1,4 @@
-error: `Call` is not allowed to have generics. Only the following modules are allowed to have generics: `Event`, `Origin`, `Config`.
+error: `Call` is not allowed to have generics. Only the following pallets are allowed to have generics: `Event`, `Origin`, `Config`.
   --> $DIR/generics_in_invalid_module.rs:10:36
    |
 10 |         Balance: balances::<Instance1>::{Call<T>, Origin<T>},
diff --git a/frame/support/test/tests/construct_runtime_ui/invalid_module_details_keyword.stderr b/frame/support/test/tests/construct_runtime_ui/invalid_module_details_keyword.stderr
index 66c9fc95cb54..29df6e4bd8cb 100644
--- a/frame/support/test/tests/construct_runtime_ui/invalid_module_details_keyword.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/invalid_module_details_keyword.stderr
@@ -1,4 +1,4 @@
-error: expected one of: `Module`, `Call`, `Storage`, `Event`, `Config`, `Origin`, `Inherent`, `ValidateUnsigned`
+error: expected one of: `Pallet`, `Call`, `Storage`, `Event`, `Config`, `Origin`, `Inherent`, `ValidateUnsigned`
  --> $DIR/invalid_module_details_keyword.rs:9:20
   |
 9 |         system: System::{enum},
diff --git a/frame/support/test/tests/construct_runtime_ui/invalid_module_entry.rs b/frame/support/test/tests/construct_runtime_ui/invalid_module_entry.rs
index 3754d41d6e81..e7d32559a6cc 100644
--- a/frame/support/test/tests/construct_runtime_ui/invalid_module_entry.rs
+++ b/frame/support/test/tests/construct_runtime_ui/invalid_module_entry.rs
@@ -6,7 +6,7 @@ construct_runtime! {
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: system::{Module},
+		System: system::{Pallet},
 		Balance: balances::{Error},
 	}
 }
diff --git a/frame/support/test/tests/construct_runtime_ui/invalid_module_entry.stderr b/frame/support/test/tests/construct_runtime_ui/invalid_module_entry.stderr
index 7442c6be3a9a..bd3e672dc8b4 100644
--- a/frame/support/test/tests/construct_runtime_ui/invalid_module_entry.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/invalid_module_entry.stderr
@@ -1,4 +1,4 @@
-error: expected one of: `Module`, `Call`, `Storage`, `Event`, `Config`, `Origin`, `Inherent`, `ValidateUnsigned`
+error: expected one of: `Pallet`, `Call`, `Storage`, `Event`, `Config`, `Origin`, `Inherent`, `ValidateUnsigned`
   --> $DIR/invalid_module_entry.rs:10:23
    |
 10 |         Balance: balances::{Error},
diff --git a/frame/support/test/tests/construct_runtime_ui/missing_event_generic_on_module_with_instance.rs b/frame/support/test/tests/construct_runtime_ui/missing_event_generic_on_module_with_instance.rs
index 5eb7df5d18c2..f748e643aa18 100644
--- a/frame/support/test/tests/construct_runtime_ui/missing_event_generic_on_module_with_instance.rs
+++ b/frame/support/test/tests/construct_runtime_ui/missing_event_generic_on_module_with_instance.rs
@@ -6,7 +6,7 @@ construct_runtime! {
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: system::{Module},
+		System: system::{Pallet},
 		Balance: balances::<Instance1>::{Event},
 	}
 }
diff --git a/frame/support/test/tests/construct_runtime_ui/missing_event_generic_on_module_with_instance.stderr b/frame/support/test/tests/construct_runtime_ui/missing_event_generic_on_module_with_instance.stderr
index f80b4bd66abd..b1aa9b86cd0d 100644
--- a/frame/support/test/tests/construct_runtime_ui/missing_event_generic_on_module_with_instance.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/missing_event_generic_on_module_with_instance.stderr
@@ -1,4 +1,4 @@
-error: Instantiable module with no generic `Event` cannot be constructed: module `Balance` must have generic `Event`
+error: Instantiable pallet with no generic `Event` cannot be constructed: pallet `Balance` must have generic `Event`
   --> $DIR/missing_event_generic_on_module_with_instance.rs:10:3
    |
 10 |         Balance: balances::<Instance1>::{Event},
diff --git a/frame/support/test/tests/construct_runtime_ui/missing_origin_generic_on_module_with_instance.rs b/frame/support/test/tests/construct_runtime_ui/missing_origin_generic_on_module_with_instance.rs
index 5e44ae84d87c..7053acc18590 100644
--- a/frame/support/test/tests/construct_runtime_ui/missing_origin_generic_on_module_with_instance.rs
+++ b/frame/support/test/tests/construct_runtime_ui/missing_origin_generic_on_module_with_instance.rs
@@ -6,7 +6,7 @@ construct_runtime! {
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: system::{Module},
+		System: system::{Pallet},
 		Balance: balances::<Instance1>::{Origin},
 	}
 }
diff --git a/frame/support/test/tests/construct_runtime_ui/missing_origin_generic_on_module_with_instance.stderr b/frame/support/test/tests/construct_runtime_ui/missing_origin_generic_on_module_with_instance.stderr
index 0f7d36aafb86..63bb7442a857 100644
--- a/frame/support/test/tests/construct_runtime_ui/missing_origin_generic_on_module_with_instance.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/missing_origin_generic_on_module_with_instance.stderr
@@ -1,4 +1,4 @@
-error: Instantiable module with no generic `Origin` cannot be constructed: module `Balance` must have generic `Origin`
+error: Instantiable pallet with no generic `Origin` cannot be constructed: pallet `Balance` must have generic `Origin`
   --> $DIR/missing_origin_generic_on_module_with_instance.rs:10:3
    |
 10 |         Balance: balances::<Instance1>::{Origin},
diff --git a/frame/support/test/tests/construct_runtime_ui/missing_system_module.stderr b/frame/support/test/tests/construct_runtime_ui/missing_system_module.stderr
index 2ebe0721eb38..c5319da85107 100644
--- a/frame/support/test/tests/construct_runtime_ui/missing_system_module.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/missing_system_module.stderr
@@ -1,4 +1,4 @@
-error: `System` module declaration is missing. Please add this line: `System: frame_system::{Module, Call, Storage, Config, Event<T>},`
+error: `System` pallet declaration is missing. Please add this line: `System: frame_system::{Pallet, Call, Storage, Config, Event<T>},`
  --> $DIR/missing_system_module.rs:8:2
   |
 8 |       {
diff --git a/frame/support/test/tests/construct_runtime_ui/more_than_256_modules.stderr b/frame/support/test/tests/construct_runtime_ui/more_than_256_modules.stderr
index c0ef5c8e60b9..2e055f5d3726 100644
--- a/frame/support/test/tests/construct_runtime_ui/more_than_256_modules.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/more_than_256_modules.stderr
@@ -1,4 +1,4 @@
-error: Module index doesn't fit into u8, index is 256
+error: Pallet index doesn't fit into u8, index is 256
   --> $DIR/more_than_256_modules.rs:10:3
    |
 10 |         Pallet256: pallet256::{},
diff --git a/frame/support/test/tests/instance.rs b/frame/support/test/tests/instance.rs
index 42cc2af19c65..e0dd1d1891d2 100644
--- a/frame/support/test/tests/instance.rs
+++ b/frame/support/test/tests/instance.rs
@@ -264,24 +264,24 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: system::{Module, Call, Event<T>},
+		System: system::{Pallet, Call, Event<T>},
 		Module1_1: module1::<Instance1>::{
-			Module, Call, Storage, Event<T>, Config<T>, Origin<T>, Inherent
+			Pallet, Call, Storage, Event<T>, Config<T>, Origin<T>, Inherent
 		},
 		Module1_2: module1::<Instance2>::{
-			Module, Call, Storage, Event<T>, Config<T>, Origin<T>, Inherent
+			Pallet, Call, Storage, Event<T>, Config<T>, Origin<T>, Inherent
 		},
-		Module2: module2::{Module, Call, Storage, Event<T>, Config<T>, Origin<T>, Inherent},
+		Module2: module2::{Pallet, Call, Storage, Event<T>, Config<T>, Origin<T>, Inherent},
 		Module2_1: module2::<Instance1>::{
-			Module, Call, Storage, Event<T>, Config<T>, Origin<T>, Inherent
+			Pallet, Call, Storage, Event<T>, Config<T>, Origin<T>, Inherent
 		},
 		Module2_2: module2::<Instance2>::{
-			Module, Call, Storage, Event<T>, Config<T>, Origin<T>, Inherent
+			Pallet, Call, Storage, Event<T>, Config<T>, Origin<T>, Inherent
 		},
 		Module2_3: module2::<Instance3>::{
-			Module, Call, Storage, Event<T>, Config<T>, Origin<T>, Inherent
+			Pallet, Call, Storage, Event<T>, Config<T>, Origin<T>, Inherent
 		},
-		Module3: module3::{Module, Call},
+		Module3: module3::{Pallet, Call},
 	}
 );
 
diff --git a/frame/support/test/tests/issue2219.rs b/frame/support/test/tests/issue2219.rs
index 9ad9b8be7f41..4525e8c1a1fe 100644
--- a/frame/support/test/tests/issue2219.rs
+++ b/frame/support/test/tests/issue2219.rs
@@ -177,8 +177,8 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: system::{Module, Call, Event<T>},
-		Module: module::{Module, Call, Storage, Config},
+		System: system::{Pallet, Call, Event<T>},
+		Module: module::{Pallet, Call, Storage, Config},
 	}
 );
 
diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index 781806a313c2..5387312819c8 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -418,9 +418,9 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: frame_system::{Module, Call, Event<T>},
-		Example: pallet::{Module, Call, Event<T>, Config, Storage, Inherent, Origin<T>, ValidateUnsigned},
-		Example2: pallet2::{Module, Call, Event, Config<T>, Storage},
+		System: frame_system::{Pallet, Call, Event<T>},
+		Example: pallet::{Pallet, Call, Event<T>, Config, Storage, Inherent, Origin<T>, ValidateUnsigned},
+		Example2: pallet2::{Pallet, Call, Event, Config<T>, Storage},
 	}
 );
 
@@ -559,11 +559,11 @@ fn pallet_hooks_expand() {
 	TestExternalities::default().execute_with(|| {
 		frame_system::Pallet::<Runtime>::set_block_number(1);
 
-		assert_eq!(AllModules::on_initialize(1), 10);
-		AllModules::on_finalize(1);
+		assert_eq!(AllPallets::on_initialize(1), 10);
+		AllPallets::on_finalize(1);
 
 		assert_eq!(pallet::Pallet::<Runtime>::storage_version(), None);
-		assert_eq!(AllModules::on_runtime_upgrade(), 30);
+		assert_eq!(AllPallets::on_runtime_upgrade(), 30);
 		assert_eq!(
 			pallet::Pallet::<Runtime>::storage_version(),
 			Some(pallet::Pallet::<Runtime>::current_version()),
diff --git a/frame/support/test/tests/pallet_compatibility.rs b/frame/support/test/tests/pallet_compatibility.rs
index 5b9001e0475f..95e1c027eb3f 100644
--- a/frame/support/test/tests/pallet_compatibility.rs
+++ b/frame/support/test/tests/pallet_compatibility.rs
@@ -247,10 +247,10 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: frame_system::{Module, Call, Event<T>},
+		System: frame_system::{Pallet, Call, Event<T>},
 		// NOTE: name Example here is needed in order to have same module prefix
-		Example: pallet::{Module, Call, Event<T>, Config<T>, Storage},
-		PalletOld: pallet_old::{Module, Call, Event<T>, Config<T>, Storage},
+		Example: pallet::{Pallet, Call, Event<T>, Config<T>, Storage},
+		PalletOld: pallet_old::{Pallet, Call, Event<T>, Config<T>, Storage},
 	}
 );
 
diff --git a/frame/support/test/tests/pallet_compatibility_instance.rs b/frame/support/test/tests/pallet_compatibility_instance.rs
index d7de03ea46cf..603c583ae217 100644
--- a/frame/support/test/tests/pallet_compatibility_instance.rs
+++ b/frame/support/test/tests/pallet_compatibility_instance.rs
@@ -259,13 +259,13 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: frame_system::{Module, Call, Event<T>},
-		Example: pallet::{Module, Call, Event<T>, Config<T>, Storage},
-		PalletOld: pallet_old::{Module, Call, Event<T>, Config<T>, Storage},
-		Instance2Example: pallet::<Instance2>::{Module, Call, Event<T>, Config<T>, Storage},
-		PalletOld2: pallet_old::<Instance2>::{Module, Call, Event<T>, Config<T>, Storage},
-		Instance3Example: pallet::<Instance3>::{Module, Call, Event<T>, Config<T>, Storage},
-		PalletOld3: pallet_old::<Instance3>::{Module, Call, Event<T>, Config<T>, Storage},
+		System: frame_system::{Pallet, Call, Event<T>},
+		Example: pallet::{Pallet, Call, Event<T>, Config<T>, Storage},
+		PalletOld: pallet_old::{Pallet, Call, Event<T>, Config<T>, Storage},
+		Instance2Example: pallet::<Instance2>::{Pallet, Call, Event<T>, Config<T>, Storage},
+		PalletOld2: pallet_old::<Instance2>::{Pallet, Call, Event<T>, Config<T>, Storage},
+		Instance3Example: pallet::<Instance3>::{Pallet, Call, Event<T>, Config<T>, Storage},
+		PalletOld3: pallet_old::<Instance3>::{Pallet, Call, Event<T>, Config<T>, Storage},
 	}
 );
 
diff --git a/frame/support/test/tests/pallet_instance.rs b/frame/support/test/tests/pallet_instance.rs
index 62654d53e19d..1bf4c1af0928 100644
--- a/frame/support/test/tests/pallet_instance.rs
+++ b/frame/support/test/tests/pallet_instance.rs
@@ -288,13 +288,13 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: frame_system::{Module, Call, Event<T>},
-		Example: pallet::{Module, Call, Event<T>, Config, Storage, Inherent, Origin<T>, ValidateUnsigned},
+		System: frame_system::{Pallet, Call, Event<T>},
+		Example: pallet::{Pallet, Call, Event<T>, Config, Storage, Inherent, Origin<T>, ValidateUnsigned},
 		Instance1Example: pallet::<Instance1>::{
-			Module, Call, Event<T>, Config, Storage, Inherent, Origin<T>, ValidateUnsigned
+			Pallet, Call, Event<T>, Config, Storage, Inherent, Origin<T>, ValidateUnsigned
 		},
-		Example2: pallet2::{Module, Call, Event<T>, Config<T>, Storage},
-		Instance1Example2: pallet2::<Instance1>::{Module, Call, Event<T>, Config<T>, Storage},
+		Example2: pallet2::{Pallet, Call, Event<T>, Config<T>, Storage},
+		Instance1Example2: pallet2::<Instance1>::{Pallet, Call, Event<T>, Config<T>, Storage},
 	}
 );
 
@@ -377,19 +377,19 @@ fn instance_expand() {
 #[test]
 fn pallet_expand_deposit_event() {
 	TestExternalities::default().execute_with(|| {
-		frame_system::Module::<Runtime>::set_block_number(1);
+		frame_system::Pallet::<Runtime>::set_block_number(1);
 		pallet::Call::<Runtime>::foo(3).dispatch_bypass_filter(None.into()).unwrap();
 		assert_eq!(
-			frame_system::Module::<Runtime>::events()[0].event,
+			frame_system::Pallet::<Runtime>::events()[0].event,
 			Event::pallet(pallet::Event::Something(3)),
 		);
 	});
 
 	TestExternalities::default().execute_with(|| {
-		frame_system::Module::<Runtime>::set_block_number(1);
+		frame_system::Pallet::<Runtime>::set_block_number(1);
 		pallet::Call::<Runtime, pallet::Instance1>::foo(3).dispatch_bypass_filter(None.into()).unwrap();
 		assert_eq!(
-			frame_system::Module::<Runtime>::events()[0].event,
+			frame_system::Pallet::<Runtime>::events()[0].event,
 			Event::pallet_Instance1(pallet::Event::Something(3)),
 		);
 	});
@@ -480,14 +480,14 @@ fn storage_expand() {
 #[test]
 fn pallet_hooks_expand() {
 	TestExternalities::default().execute_with(|| {
-		frame_system::Module::<Runtime>::set_block_number(1);
+		frame_system::Pallet::<Runtime>::set_block_number(1);
 
-		assert_eq!(AllModules::on_initialize(1), 21);
-		AllModules::on_finalize(1);
+		assert_eq!(AllPallets::on_initialize(1), 21);
+		AllPallets::on_finalize(1);
 
 		assert_eq!(pallet::Pallet::<Runtime>::storage_version(), None);
 		assert_eq!(pallet::Pallet::<Runtime, pallet::Instance1>::storage_version(), None);
-		assert_eq!(AllModules::on_runtime_upgrade(), 61);
+		assert_eq!(AllPallets::on_runtime_upgrade(), 61);
 		assert_eq!(
 			pallet::Pallet::<Runtime>::storage_version(),
 			Some(pallet::Pallet::<Runtime>::current_version()),
@@ -499,27 +499,27 @@ fn pallet_hooks_expand() {
 
 		// The order is indeed reversed due to https://github.com/paritytech/substrate/issues/6280
 		assert_eq!(
-			frame_system::Module::<Runtime>::events()[0].event,
+			frame_system::Pallet::<Runtime>::events()[0].event,
 			Event::pallet_Instance1(pallet::Event::Something(11)),
 		);
 		assert_eq!(
-			frame_system::Module::<Runtime>::events()[1].event,
+			frame_system::Pallet::<Runtime>::events()[1].event,
 			Event::pallet(pallet::Event::Something(10)),
 		);
 		assert_eq!(
-			frame_system::Module::<Runtime>::events()[2].event,
+			frame_system::Pallet::<Runtime>::events()[2].event,
 			Event::pallet_Instance1(pallet::Event::Something(21)),
 		);
 		assert_eq!(
-			frame_system::Module::<Runtime>::events()[3].event,
+			frame_system::Pallet::<Runtime>::events()[3].event,
 			Event::pallet(pallet::Event::Something(20)),
 		);
 		assert_eq!(
-			frame_system::Module::<Runtime>::events()[4].event,
+			frame_system::Pallet::<Runtime>::events()[4].event,
 			Event::pallet_Instance1(pallet::Event::Something(31)),
 		);
 		assert_eq!(
-			frame_system::Module::<Runtime>::events()[5].event,
+			frame_system::Pallet::<Runtime>::events()[5].event,
 			Event::pallet(pallet::Event::Something(30)),
 		);
 	})
diff --git a/frame/support/test/tests/pallet_version.rs b/frame/support/test/tests/pallet_version.rs
index 4cc93d395db2..b3436b7baed9 100644
--- a/frame/support/test/tests/pallet_version.rs
+++ b/frame/support/test/tests/pallet_version.rs
@@ -174,15 +174,15 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: frame_system::{Module, Call, Event<T>},
-		Module1: module1::{Module, Call},
-		Module2: module2::{Module, Call},
-		Module2_1: module2::<Instance1>::{Module, Call},
-		Module2_2: module2::<Instance2>::{Module, Call},
-		Pallet3: pallet3::{Module, Call},
-		Pallet4: pallet4::{Module, Call},
-		Pallet4_1: pallet4::<Instance1>::{Module, Call},
-		Pallet4_2: pallet4::<Instance2>::{Module, Call},
+		System: frame_system::{Pallet, Call, Event<T>},
+		Module1: module1::{Pallet, Call},
+		Module2: module2::{Pallet, Call},
+		Module2_1: module2::<Instance1>::{Pallet, Call},
+		Module2_2: module2::<Instance2>::{Pallet, Call},
+		Pallet3: pallet3::{Pallet, Call},
+		Pallet4: pallet4::{Pallet, Call},
+		Pallet4_1: pallet4::<Instance1>::{Pallet, Call},
+		Pallet4_2: pallet4::<Instance2>::{Pallet, Call},
 	}
 );
 
@@ -218,7 +218,7 @@ fn check_pallet_version(pallet: &str) {
 #[test]
 fn on_runtime_upgrade_sets_the_pallet_versions_in_storage() {
 	sp_io::TestExternalities::new_empty().execute_with(|| {
-		AllModules::on_runtime_upgrade();
+		AllPallets::on_runtime_upgrade();
 
 		check_pallet_version("Module1");
 		check_pallet_version("Module2");
@@ -237,7 +237,7 @@ fn on_runtime_upgrade_overwrites_old_version() {
 		let key = get_pallet_version_storage_key_for_pallet("Module2");
 		sp_io::storage::set(&key, &SOME_TEST_VERSION.encode());
 
-		AllModules::on_runtime_upgrade();
+		AllPallets::on_runtime_upgrade();
 
 		check_pallet_version("Module1");
 		check_pallet_version("Module2");
diff --git a/frame/support/test/tests/pallet_with_name_trait_is_valid.rs b/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
index b09beb04cd17..05cedbdb91a0 100644
--- a/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
+++ b/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
@@ -109,8 +109,8 @@ mod tests {
 			NodeBlock = TestBlock,
 			UncheckedExtrinsic = TestUncheckedExtrinsic
 		{
-			System: frame_system::{Module, Call, Config, Storage, Event<T>},
-			PalletTest: pallet_test::{Module, Call, Storage, Event<T>, Config, ValidateUnsigned, Inherent},
+			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+			PalletTest: pallet_test::{Pallet, Call, Storage, Event<T>, Config, ValidateUnsigned, Inherent},
 		}
 	);
 
diff --git a/frame/system/README.md b/frame/system/README.md
index 106a16bc209d..a6da7c3816d2 100644
--- a/frame/system/README.md
+++ b/frame/system/README.md
@@ -64,8 +64,8 @@ decl_module! {
 		#[weight = 0]
 		pub fn system_module_example(origin) -> dispatch::DispatchResult {
 			let _sender = ensure_signed(origin)?;
-			let _extrinsic_count = <system::Module<T>>::extrinsic_count();
-			let _parent_hash = <system::Module<T>>::parent_hash();
+			let _extrinsic_count = <system::Pallet<T>>::extrinsic_count();
+			let _parent_hash = <system::Pallet<T>>::parent_hash();
 			Ok(())
 		}
 	}
diff --git a/frame/system/benches/bench.rs b/frame/system/benches/bench.rs
index 6ed3d456826c..3ebee534a64e 100644
--- a/frame/system/benches/bench.rs
+++ b/frame/system/benches/bench.rs
@@ -50,8 +50,8 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Module: module::{Module, Call, Event},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Module: module::{Pallet, Call, Event},
 	}
 );
 
diff --git a/frame/system/benchmarking/src/lib.rs b/frame/system/benchmarking/src/lib.rs
index bdb34e7944db..7146bcd60645 100644
--- a/frame/system/benchmarking/src/lib.rs
+++ b/frame/system/benchmarking/src/lib.rs
@@ -30,11 +30,11 @@ use frame_support::{
 	traits::Get,
 	weights::DispatchClass,
 };
-use frame_system::{Module as System, Call, RawOrigin, DigestItemOf};
+use frame_system::{Pallet as System, Call, RawOrigin, DigestItemOf};
 
 mod mock;
 
-pub struct Module<T: Config>(System<T>);
+pub struct Pallet<T: Config>(System<T>);
 pub trait Config: frame_system::Config {}
 
 benchmarks! {
@@ -145,7 +145,7 @@ benchmarks! {
 }
 
 impl_benchmark_test_suite!(
-	Module,
+	Pallet,
 	crate::mock::new_test_ext(),
 	crate::mock::Test,
 );
diff --git a/frame/system/benchmarking/src/mock.rs b/frame/system/benchmarking/src/mock.rs
index edc5dfebbd10..23da1fee5617 100644
--- a/frame/system/benchmarking/src/mock.rs
+++ b/frame/system/benchmarking/src/mock.rs
@@ -34,7 +34,7 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 	}
 );
 
diff --git a/frame/system/src/extensions/check_genesis.rs b/frame/system/src/extensions/check_genesis.rs
index de635b4fb91a..aa6c1358790a 100644
--- a/frame/system/src/extensions/check_genesis.rs
+++ b/frame/system/src/extensions/check_genesis.rs
@@ -16,7 +16,7 @@
 // limitations under the License.
 
 use codec::{Encode, Decode};
-use crate::{Config, Module};
+use crate::{Config, Pallet};
 use sp_runtime::{
 	traits::{SignedExtension, Zero},
 	transaction_validity::TransactionValidityError,
@@ -53,6 +53,6 @@ impl<T: Config + Send + Sync> SignedExtension for CheckGenesis<T> {
 	const IDENTIFIER: &'static str = "CheckGenesis";
 
 	fn additional_signed(&self) -> Result<Self::AdditionalSigned, TransactionValidityError> {
-		Ok(<Module<T>>::block_hash(T::BlockNumber::zero()))
+		Ok(<Pallet<T>>::block_hash(T::BlockNumber::zero()))
 	}
 }
diff --git a/frame/system/src/extensions/check_mortality.rs b/frame/system/src/extensions/check_mortality.rs
index 1e8eb32a3d3c..b3e4c4ecfda8 100644
--- a/frame/system/src/extensions/check_mortality.rs
+++ b/frame/system/src/extensions/check_mortality.rs
@@ -16,7 +16,7 @@
 // limitations under the License.
 
 use codec::{Encode, Decode};
-use crate::{Config, Module, BlockHash};
+use crate::{Config, Pallet, BlockHash};
 use sp_runtime::{
 	generic::Era,
 	traits::{SignedExtension, DispatchInfoOf, SaturatedConversion},
@@ -62,7 +62,7 @@ impl<T: Config + Send + Sync> SignedExtension for CheckMortality<T> {
 		_info: &DispatchInfoOf<Self::Call>,
 		_len: usize,
 	) -> TransactionValidity {
-		let current_u64 = <Module<T>>::block_number().saturated_into::<u64>();
+		let current_u64 = <Pallet<T>>::block_number().saturated_into::<u64>();
 		let valid_till = self.0.death(current_u64);
 		Ok(ValidTransaction {
 			longevity: valid_till.saturating_sub(current_u64),
@@ -71,12 +71,12 @@ impl<T: Config + Send + Sync> SignedExtension for CheckMortality<T> {
 	}
 
 	fn additional_signed(&self) -> Result<Self::AdditionalSigned, TransactionValidityError> {
-		let current_u64 = <Module<T>>::block_number().saturated_into::<u64>();
+		let current_u64 = <Pallet<T>>::block_number().saturated_into::<u64>();
 		let n = self.0.birth(current_u64).saturated_into::<T::BlockNumber>();
 		if !<BlockHash<T>>::contains_key(n) {
 			Err(InvalidTransaction::AncientBirthBlock.into())
 		} else {
-			Ok(<Module<T>>::block_hash(n))
+			Ok(<Pallet<T>>::block_hash(n))
 		}
 	}
 }
diff --git a/frame/system/src/extensions/check_spec_version.rs b/frame/system/src/extensions/check_spec_version.rs
index 1fd8376d342b..e41ce1725a54 100644
--- a/frame/system/src/extensions/check_spec_version.rs
+++ b/frame/system/src/extensions/check_spec_version.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::{Config, Module};
+use crate::{Config, Pallet};
 use codec::{Encode, Decode};
 use sp_runtime::{
 	traits::SignedExtension,
@@ -53,6 +53,6 @@ impl<T: Config + Send + Sync> SignedExtension for CheckSpecVersion<T> {
 	const IDENTIFIER: &'static str = "CheckSpecVersion";
 
 	fn additional_signed(&self) -> Result<Self::AdditionalSigned, TransactionValidityError> {
-		Ok(<Module<T>>::runtime_version().spec_version)
+		Ok(<Pallet<T>>::runtime_version().spec_version)
 	}
 }
diff --git a/frame/system/src/extensions/check_tx_version.rs b/frame/system/src/extensions/check_tx_version.rs
index fa11a0a5727f..ad23dc7e9dd0 100644
--- a/frame/system/src/extensions/check_tx_version.rs
+++ b/frame/system/src/extensions/check_tx_version.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::{Config, Module};
+use crate::{Config, Pallet};
 use codec::{Encode, Decode};
 use sp_runtime::{
 	traits::SignedExtension,
@@ -53,6 +53,6 @@ impl<T: Config + Send + Sync> SignedExtension for CheckTxVersion<T> {
 	const IDENTIFIER: &'static str = "CheckTxVersion";
 
 	fn additional_signed(&self) -> Result<Self::AdditionalSigned, TransactionValidityError> {
-		Ok(<Module<T>>::runtime_version().transaction_version)
+		Ok(<Pallet<T>>::runtime_version().transaction_version)
 	}
 }
diff --git a/frame/system/src/extensions/check_weight.rs b/frame/system/src/extensions/check_weight.rs
index 70116f4b6524..fc9898b778b8 100644
--- a/frame/system/src/extensions/check_weight.rs
+++ b/frame/system/src/extensions/check_weight.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::{limits::BlockWeights, Config, Module};
+use crate::{limits::BlockWeights, Config, Pallet};
 use codec::{Encode, Decode};
 use sp_runtime::{
 	traits::{SignedExtension, DispatchInfoOf, Dispatchable, PostDispatchInfoOf, Printable},
@@ -58,7 +58,7 @@ impl<T: Config + Send + Sync> CheckWeight<T> where
 		info: &DispatchInfoOf<T::Call>,
 	) -> Result<crate::ConsumedWeight, TransactionValidityError> {
 		let maximum_weight = T::BlockWeights::get();
-		let all_weight = Module::<T>::block_weight();
+		let all_weight = Pallet::<T>::block_weight();
 		calculate_consumed_weight::<T::Call>(maximum_weight, all_weight, info)
 	}
 
@@ -70,7 +70,7 @@ impl<T: Config + Send + Sync> CheckWeight<T> where
 		len: usize,
 	) -> Result<u32, TransactionValidityError> {
 		let length_limit = T::BlockLength::get();
-		let current_len = Module::<T>::all_extrinsics_len();
+		let current_len = Pallet::<T>::all_extrinsics_len();
 		let added_len = len as u32;
 		let next_len = current_len.saturating_add(added_len);
 		if next_len > *length_limit.max.get(info.class) {
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index 6ea2a62f05ba..ebf9eb38375b 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -1022,7 +1022,7 @@ pub enum IncRefError {
 	NoProviders,
 }
 
-impl<T: Config> Module<T> {
+impl<T: Config> Pallet<T> {
 	pub fn account_exists(who: &T::AccountId) -> bool {
 		Account::<T>::contains_key(who)
 	}
@@ -1083,7 +1083,7 @@ impl<T: Config> Module<T> {
 					(1, 0, 0) => {
 						// No providers left (and no consumers) and no sufficients. Account dead.
 
-						Module::<T>::on_killed_account(who.clone());
+						Pallet::<T>::on_killed_account(who.clone());
 						Ok(DecRefStatus::Reaped)
 					}
 					(1, c, _) if c > 0 => {
@@ -1136,7 +1136,7 @@ impl<T: Config> Module<T> {
 				}
 				match (account.sufficients, account.providers) {
 					(0, 0) | (1, 0) => {
-						Module::<T>::on_killed_account(who.clone());
+						Pallet::<T>::on_killed_account(who.clone());
 						DecRefStatus::Reaped
 					}
 					(x, _) => {
@@ -1450,9 +1450,9 @@ impl<T: Config> Module<T> {
 				Ok(_) => Event::ExtrinsicSuccess(info),
 				Err(err) => {
 					log::trace!(
-						target: "runtime::system", 
-						"Extrinsic failed at block({:?}): {:?}", 
-						Self::block_number(), 
+						target: "runtime::system",
+						"Extrinsic failed at block({:?}): {:?}",
+						Self::block_number(),
 						err,
 					);
 					Event::ExtrinsicFailed(err.error, info)
@@ -1520,11 +1520,11 @@ impl<T: Config> Module<T> {
 pub struct Provider<T>(PhantomData<T>);
 impl<T: Config> HandleLifetime<T::AccountId> for Provider<T> {
 	fn created(t: &T::AccountId) -> Result<(), StoredMapError> {
-		Module::<T>::inc_providers(t);
+		Pallet::<T>::inc_providers(t);
 		Ok(())
 	}
 	fn killed(t: &T::AccountId) -> Result<(), StoredMapError> {
-		Module::<T>::dec_providers(t)
+		Pallet::<T>::dec_providers(t)
 			.map(|_| ())
 			.or_else(|e| match e {
 				DecRefError::ConsumerRemaining => Err(StoredMapError::ConsumerRemaining),
@@ -1536,11 +1536,11 @@ impl<T: Config> HandleLifetime<T::AccountId> for Provider<T> {
 pub struct SelfSufficient<T>(PhantomData<T>);
 impl<T: Config> HandleLifetime<T::AccountId> for SelfSufficient<T> {
 	fn created(t: &T::AccountId) -> Result<(), StoredMapError> {
-		Module::<T>::inc_sufficients(t);
+		Pallet::<T>::inc_sufficients(t);
 		Ok(())
 	}
 	fn killed(t: &T::AccountId) -> Result<(), StoredMapError> {
-		Module::<T>::dec_sufficients(t);
+		Pallet::<T>::dec_sufficients(t);
 		Ok(())
 	}
 }
@@ -1549,13 +1549,13 @@ impl<T: Config> HandleLifetime<T::AccountId> for SelfSufficient<T> {
 pub struct Consumer<T>(PhantomData<T>);
 impl<T: Config> HandleLifetime<T::AccountId> for Consumer<T> {
 	fn created(t: &T::AccountId) -> Result<(), StoredMapError> {
-		Module::<T>::inc_consumers(t)
+		Pallet::<T>::inc_consumers(t)
 			.map_err(|e| match e {
 				IncRefError::NoProviders => StoredMapError::NoProviders
 			})
 	}
 	fn killed(t: &T::AccountId) -> Result<(), StoredMapError> {
-		Module::<T>::dec_consumers(t);
+		Pallet::<T>::dec_consumers(t);
 		Ok(())
 	}
 }
diff --git a/frame/system/src/mock.rs b/frame/system/src/mock.rs
index 2b31929b5da8..43c7d8d25277 100644
--- a/frame/system/src/mock.rs
+++ b/frame/system/src/mock.rs
@@ -33,7 +33,7 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 	}
 );
 
diff --git a/frame/timestamp/src/benchmarking.rs b/frame/timestamp/src/benchmarking.rs
index b3e8eca889cb..d64fa8dc691c 100644
--- a/frame/timestamp/src/benchmarking.rs
+++ b/frame/timestamp/src/benchmarking.rs
@@ -24,7 +24,7 @@ use frame_system::RawOrigin;
 use frame_support::{ensure, traits::OnFinalize};
 use frame_benchmarking::{benchmarks, TrackedStorageKey, impl_benchmark_test_suite};
 
-use crate::Module as Timestamp;
+use crate::Pallet as Timestamp;
 
 const MAX_TIME: u32 = 100;
 
diff --git a/frame/timestamp/src/lib.rs b/frame/timestamp/src/lib.rs
index 2ef24a696ade..002a8d1c989b 100644
--- a/frame/timestamp/src/lib.rs
+++ b/frame/timestamp/src/lib.rs
@@ -319,8 +319,8 @@ mod tests {
 			NodeBlock = Block,
 			UncheckedExtrinsic = UncheckedExtrinsic,
 		{
-			System: frame_system::{Module, Call, Config, Storage, Event<T>},
-			Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent},
+			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+			Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
 		}
 	);
 
diff --git a/frame/tips/src/lib.rs b/frame/tips/src/lib.rs
index 442df89428fc..88cb65963af8 100644
--- a/frame/tips/src/lib.rs
+++ b/frame/tips/src/lib.rs
@@ -401,7 +401,7 @@ decl_module! {
 
 			let tip = Tips::<T>::get(hash).ok_or(Error::<T>::UnknownTip)?;
 			let n = tip.closes.as_ref().ok_or(Error::<T>::StillOpen)?;
-			ensure!(system::Module::<T>::block_number() >= *n, Error::<T>::Premature);
+			ensure!(system::Pallet::<T>::block_number() >= *n, Error::<T>::Premature);
 			// closed.
 			Reasons::<T>::remove(&tip.reason);
 			Tips::<T>::remove(hash);
@@ -463,7 +463,7 @@ impl<T: Config> Module<T> {
 		Self::retain_active_tips(&mut tip.tips);
 		let threshold = (T::Tippers::count() + 1) / 2;
 		if tip.tips.len() >= threshold && tip.closes.is_none() {
-			tip.closes = Some(system::Module::<T>::block_number() + T::TipCountdown::get());
+			tip.closes = Some(system::Pallet::<T>::block_number() + T::TipCountdown::get());
 			true
 		} else {
 			false
diff --git a/frame/tips/src/tests.rs b/frame/tips/src/tests.rs
index 413e2dd9437e..ef30962fc846 100644
--- a/frame/tips/src/tests.rs
+++ b/frame/tips/src/tests.rs
@@ -40,10 +40,10 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
-		Treasury: pallet_treasury::{Module, Call, Storage, Config, Event<T>},
-		TipsModTestInst: tips::{Module, Call, Storage, Event<T>},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>},
+		TipsModTestInst: tips::{Pallet, Call, Storage, Event<T>},
 	}
 );
 
@@ -125,7 +125,7 @@ parameter_types! {
 }
 impl pallet_treasury::Config for Test {
 	type ModuleId = TreasuryModuleId;
-	type Currency = pallet_balances::Module<Test>;
+	type Currency = pallet_balances::Pallet<Test>;
 	type ApproveOrigin = frame_system::EnsureRoot<u128>;
 	type RejectOrigin = frame_system::EnsureRoot<u128>;
 	type Event = Event;
diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
index 709a8f69a487..b2dc2c9859e0 100644
--- a/frame/transaction-payment/src/lib.rs
+++ b/frame/transaction-payment/src/lib.rs
@@ -178,7 +178,7 @@ impl<T, S, V, M> Convert<Multiplier, Multiplier> for TargetedFeeAdjustment<T, S,
 		// the computed ratio is only among the normal class.
 		let normal_max_weight = weights.get(DispatchClass::Normal).max_total
 			.unwrap_or_else(|| weights.max_block);
-		let current_block_weight = <frame_system::Module<T>>::block_weight();
+		let current_block_weight = <frame_system::Pallet<T>>::block_weight();
 		let normal_block_weight = *current_block_weight
 			.get(DispatchClass::Normal)
 			.min(&normal_max_weight);
@@ -303,7 +303,7 @@ decl_module! {
 			target += addition;
 
 			sp_io::TestExternalities::new_empty().execute_with(|| {
-				<frame_system::Module<T>>::set_block_consumed_resources(target, 0);
+				<frame_system::Pallet<T>>::set_block_consumed_resources(target, 0);
 				let next = T::FeeMultiplierUpdate::convert(min_value);
 				assert!(next > min_value, "The minimum bound of the multiplier is too low. When \
 					block saturation is more than target by 1% and multiplier is minimal then \
@@ -630,9 +630,9 @@ mod tests {
 			NodeBlock = Block,
 			UncheckedExtrinsic = UncheckedExtrinsic,
 		{
-			System: system::{Module, Call, Config, Storage, Event<T>},
-			Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
-			TransactionPayment: pallet_transaction_payment::{Module, Storage},
+			System: system::{Pallet, Call, Config, Storage, Event<T>},
+			Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+			TransactionPayment: pallet_transaction_payment::{Pallet, Storage},
 		}
 	);
 
diff --git a/frame/treasury/src/tests.rs b/frame/treasury/src/tests.rs
index 3c70099843ea..45fc3e629fb0 100644
--- a/frame/treasury/src/tests.rs
+++ b/frame/treasury/src/tests.rs
@@ -43,9 +43,9 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
-		Treasury: treasury::{Module, Call, Storage, Config, Event<T>},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Treasury: treasury::{Pallet, Call, Storage, Config, Event<T>},
 	}
 );
 
@@ -105,7 +105,7 @@ parameter_types! {
 }
 impl Config for Test {
 	type ModuleId = TreasuryModuleId;
-	type Currency = pallet_balances::Module<Test>;
+	type Currency = pallet_balances::Pallet<Test>;
 	type ApproveOrigin = frame_system::EnsureRoot<u128>;
 	type RejectOrigin = frame_system::EnsureRoot<u128>;
 	type Event = Event;
diff --git a/frame/utility/src/benchmarking.rs b/frame/utility/src/benchmarking.rs
index 79fb569c77a5..b05b97d1d497 100644
--- a/frame/utility/src/benchmarking.rs
+++ b/frame/utility/src/benchmarking.rs
@@ -26,7 +26,7 @@ use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark
 const SEED: u32 = 0;
 
 fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
-	let events = frame_system::Module::<T>::events();
+	let events = frame_system::Pallet::<T>::events();
 	let system_event: <T as frame_system::Config>::Event = generic_event.into();
 	// compare to the last event record
 	let EventRecord { event, .. } = &events[events.len() - 1];
diff --git a/frame/utility/src/tests.rs b/frame/utility/src/tests.rs
index af31bbe96cbc..739ad74d6576 100644
--- a/frame/utility/src/tests.rs
+++ b/frame/utility/src/tests.rs
@@ -75,10 +75,10 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Module, Call, Config, Storage, Event<T>},
-		Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
-		Utility: utility::{Module, Call, Event},
-		Example: example::{Module, Call},
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Utility: utility::{Pallet, Call, Event},
+		Example: example::{Pallet, Call},
 	}
 );
 
@@ -170,7 +170,7 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 }
 
 fn last_event() -> Event {
-	frame_system::Module::<Test>::events().pop().map(|e| e.event).expect("Event expected")
+	frame_system::Pallet::<Test>::events().pop().map(|e| e.event).expect("Event expected")
 }
 
 fn expect_event<E: Into<Event>>(e: E) {
diff --git a/frame/vesting/src/benchmarking.rs b/frame/vesting/src/benchmarking.rs
index 937f2b033d84..0a882157ab38 100644
--- a/frame/vesting/src/benchmarking.rs
+++ b/frame/vesting/src/benchmarking.rs
@@ -21,7 +21,7 @@
 
 use super::*;
 
-use frame_system::{RawOrigin, Module as System};
+use frame_system::{RawOrigin, Pallet as System};
 use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
 use sp_runtime::traits::Bounded;
 
diff --git a/frame/vesting/src/lib.rs b/frame/vesting/src/lib.rs
index 9cf9166b37c0..7b725f7486df 100644
--- a/frame/vesting/src/lib.rs
+++ b/frame/vesting/src/lib.rs
@@ -314,7 +314,7 @@ impl<T: Config> Module<T> {
 	/// current unvested amount.
 	fn update_lock(who: T::AccountId) -> DispatchResult {
 		let vesting = Self::vesting(&who).ok_or(Error::<T>::NotVesting)?;
-		let now = <frame_system::Module<T>>::block_number();
+		let now = <frame_system::Pallet<T>>::block_number();
 		let locked_now = vesting.locked_at::<T::BlockNumberToBalance>(now);
 
 		if locked_now.is_zero() {
@@ -339,7 +339,7 @@ impl<T: Config> VestingSchedule<T::AccountId> for Module<T> where
 	/// Get the amount that is currently being vested and cannot be transferred out of this account.
 	fn vesting_balance(who: &T::AccountId) -> Option<BalanceOf<T>> {
 		if let Some(v) = Self::vesting(who) {
-			let now = <frame_system::Module<T>>::block_number();
+			let now = <frame_system::Pallet<T>>::block_number();
 			let locked_now = v.locked_at::<T::BlockNumberToBalance>(now);
 			Some(T::Currency::free_balance(who).min(locked_now))
 		} else {
@@ -408,9 +408,9 @@ mod tests {
 			NodeBlock = Block,
 			UncheckedExtrinsic = UncheckedExtrinsic,
 		{
-			System: frame_system::{Module, Call, Config, Storage, Event<T>},
-			Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
-			Vesting: pallet_vesting::{Module, Call, Storage, Event<T>, Config<T>},
+			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+			Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+			Vesting: pallet_vesting::{Pallet, Call, Storage, Event<T>, Config<T>},
 		}
 	);
 
diff --git a/primitives/runtime/src/offchain/storage_lock.rs b/primitives/runtime/src/offchain/storage_lock.rs
index 4c66db6c385c..1529de4ab591 100644
--- a/primitives/runtime/src/offchain/storage_lock.rs
+++ b/primitives/runtime/src/offchain/storage_lock.rs
@@ -439,11 +439,11 @@ pub trait BlockNumberProvider {
 	///
 	/// In case of using crate `sp_runtime` without the crate `frame`
 	/// system, it is already implemented for
-	/// `frame_system::Module<T: Config>` as:
+	/// `frame_system::Pallet<T: Config>` as:
 	///
 	/// ```ignore
 	/// fn current_block_number() -> Self {
-	///     frame_system::Module<Config>::block_number()
+	///     frame_system::Pallet<Config>::block_number()
 	/// }
 	/// ```
 	/// .
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index f285eba1d8e4..b0d0c63218f8 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -451,13 +451,13 @@ impl From<frame_system::Event<Runtime>> for Event {
 impl frame_support::traits::PalletInfo for Runtime {
 	fn index<P: 'static>() -> Option<usize> {
 		let type_id = sp_std::any::TypeId::of::<P>();
-		if type_id == sp_std::any::TypeId::of::<system::Module<Runtime>>() {
+		if type_id == sp_std::any::TypeId::of::<system::Pallet<Runtime>>() {
 			return Some(0)
 		}
-		if type_id == sp_std::any::TypeId::of::<pallet_timestamp::Module<Runtime>>() {
+		if type_id == sp_std::any::TypeId::of::<pallet_timestamp::Pallet<Runtime>>() {
 			return Some(1)
 		}
-		if type_id == sp_std::any::TypeId::of::<pallet_babe::Module<Runtime>>() {
+		if type_id == sp_std::any::TypeId::of::<pallet_babe::Pallet<Runtime>>() {
 			return Some(2)
 		}
 
@@ -465,13 +465,13 @@ impl frame_support::traits::PalletInfo for Runtime {
 	}
 	fn name<P: 'static>() -> Option<&'static str> {
 		let type_id = sp_std::any::TypeId::of::<P>();
-		if type_id == sp_std::any::TypeId::of::<system::Module<Runtime>>() {
+		if type_id == sp_std::any::TypeId::of::<system::Pallet<Runtime>>() {
 			return Some("System")
 		}
-		if type_id == sp_std::any::TypeId::of::<pallet_timestamp::Module<Runtime>>() {
+		if type_id == sp_std::any::TypeId::of::<pallet_timestamp::Pallet<Runtime>>() {
 			return Some("Timestamp")
 		}
-		if type_id == sp_std::any::TypeId::of::<pallet_babe::Module<Runtime>>() {
+		if type_id == sp_std::any::TypeId::of::<pallet_babe::Pallet<Runtime>>() {
 			return Some("Babe")
 		}
 
@@ -782,21 +782,21 @@ cfg_if! {
 						c: (3, 10),
 						genesis_authorities: system::authorities()
 							.into_iter().map(|x|(x, 1)).collect(),
-						randomness: <pallet_babe::Module<Runtime>>::randomness(),
+						randomness: <pallet_babe::Pallet<Runtime>>::randomness(),
 						allowed_slots: AllowedSlots::PrimaryAndSecondaryPlainSlots,
 					}
 				}
 
 				fn current_epoch_start() -> Slot {
-					<pallet_babe::Module<Runtime>>::current_epoch_start()
+					<pallet_babe::Pallet<Runtime>>::current_epoch_start()
 				}
 
 				fn current_epoch() -> sp_consensus_babe::Epoch {
-					<pallet_babe::Module<Runtime>>::current_epoch()
+					<pallet_babe::Pallet<Runtime>>::current_epoch()
 				}
 
 				fn next_epoch() -> sp_consensus_babe::Epoch {
-					<pallet_babe::Module<Runtime>>::next_epoch()
+					<pallet_babe::Pallet<Runtime>>::next_epoch()
 				}
 
 				fn submit_report_equivocation_unsigned_extrinsic(
@@ -1043,21 +1043,21 @@ cfg_if! {
 						c: (3, 10),
 						genesis_authorities: system::authorities()
 							.into_iter().map(|x|(x, 1)).collect(),
-						randomness: <pallet_babe::Module<Runtime>>::randomness(),
+						randomness: <pallet_babe::Pallet<Runtime>>::randomness(),
 						allowed_slots: AllowedSlots::PrimaryAndSecondaryPlainSlots,
 					}
 				}
 
 				fn current_epoch_start() -> Slot {
-					<pallet_babe::Module<Runtime>>::current_epoch_start()
+					<pallet_babe::Pallet<Runtime>>::current_epoch_start()
 				}
 
 				fn current_epoch() -> sp_consensus_babe::Epoch {
-					<pallet_babe::Module<Runtime>>::current_epoch()
+					<pallet_babe::Pallet<Runtime>>::current_epoch()
 				}
 
 				fn next_epoch() -> sp_consensus_babe::Epoch {
-					<pallet_babe::Module<Runtime>>::next_epoch()
+					<pallet_babe::Pallet<Runtime>>::next_epoch()
 				}
 
 				fn submit_report_equivocation_unsigned_extrinsic(
diff --git a/utils/frame/remote-externalities/src/lib.rs b/utils/frame/remote-externalities/src/lib.rs
index 8211274c4629..a5687f42337f 100644
--- a/utils/frame/remote-externalities/src/lib.rs
+++ b/utils/frame/remote-externalities/src/lib.rs
@@ -76,7 +76,7 @@
 //!             assert_eq!(
 //!                 // note: the hash corresponds to 3098546. We can check only the parent.
 //!                 // https://polkascan.io/kusama/block/3098546
-//!                 <frame_system::Module<Runtime>>::block_hash(3098545u32),
+//!                 <frame_system::Pallet<Runtime>>::block_hash(3098545u32),
 //!                 parent,
 //!             )
 //!         });

From c2cffa1b9ef250ff490ebb7e416577bacccc10e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Thu, 18 Mar 2021 12:16:42 +0100
Subject: [PATCH 0524/1194] Improve logging in network gossip (#8389)

* Improve logging in network gossip

This adds some more information to the logging output to get a better
understanding when something fails.

* Update client/network-gossip/src/state_machine.rs

Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>

Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
---
 Cargo.lock                                 |  1 +
 client/network-gossip/Cargo.toml           |  1 +
 client/network-gossip/src/state_machine.rs | 69 ++++++++++++++++++----
 3 files changed, 60 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index be95ca238f31..100461b20991 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7548,6 +7548,7 @@ dependencies = [
  "sp-runtime",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
+ "tracing",
  "wasm-timer",
 ]
 
diff --git a/client/network-gossip/Cargo.toml b/client/network-gossip/Cargo.toml
index b5f3b754af03..146bc41cb165 100644
--- a/client/network-gossip/Cargo.toml
+++ b/client/network-gossip/Cargo.toml
@@ -24,6 +24,7 @@ prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.
 sc-network = { version = "0.9.0", path = "../network" }
 sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
 wasm-timer = "0.2"
+tracing = "0.1.25"
 
 [dev-dependencies]
 async-std = "1.6.5"
diff --git a/client/network-gossip/src/state_machine.rs b/client/network-gossip/src/state_machine.rs
index a58432d8c247..4c006f288f01 100644
--- a/client/network-gossip/src/state_machine.rs
+++ b/client/network-gossip/src/state_machine.rs
@@ -23,7 +23,6 @@ use std::collections::{HashMap, HashSet};
 use std::sync::Arc;
 use std::iter;
 use std::time;
-use log::{debug, error, trace};
 use lru::LruCache;
 use libp2p::PeerId;
 use prometheus_endpoint::{register, Counter, PrometheusError, Registry, U64};
@@ -146,7 +145,13 @@ fn propagate<'a, B: BlockT, I>(
 
 			peer.known_messages.insert(message_hash.clone());
 
-			trace!(target: "gossip", "Propagating to {}: {:?}", id, message);
+			tracing::trace!(
+				target: "gossip",
+				to = %id,
+				%protocol,
+				?message,
+				"Propagating message",
+			);
 			network.write_notification(id.clone(), protocol.clone(), message.clone());
 		}
 	}
@@ -173,7 +178,7 @@ impl<B: BlockT> ConsensusGossip<B> {
 		let metrics = match metrics_registry.map(Metrics::register) {
 			Some(Ok(metrics)) => Some(metrics),
 			Some(Err(e)) => {
-				debug!(target: "gossip", "Failed to register metrics: {:?}", e);
+				tracing::debug!(target: "gossip", "Failed to register metrics: {:?}", e);
 				None
 			}
 			None => None,
@@ -197,7 +202,13 @@ impl<B: BlockT> ConsensusGossip<B> {
 			return;
 		}
 
-		trace!(target:"gossip", "Registering {:?} {}", role, who);
+		tracing::trace!(
+			target:"gossip",
+			%who,
+			protocol = %self.protocol,
+			?role,
+			"Registering peer",
+		);
 		self.peers.insert(who.clone(), PeerConsensus {
 			known_messages: HashSet::new(),
 		});
@@ -301,7 +312,10 @@ impl<B: BlockT> ConsensusGossip<B> {
 			metrics.expired_messages.inc_by(expired_messages as u64)
 		}
 
-		trace!(target: "gossip", "Cleaned up {} stale messages, {} left ({} known)",
+		tracing::trace!(
+			target: "gossip",
+			protocol = %self.protocol,
+			"Cleaned up {} stale messages, {} left ({} known)",
 			expired_messages,
 			self.messages.len(),
 			known_messages.len(),
@@ -331,14 +345,25 @@ impl<B: BlockT> ConsensusGossip<B> {
 		let mut to_forward = vec![];
 
 		if !messages.is_empty() {
-			trace!(target: "gossip", "Received {} messages from peer {}", messages.len(), who);
+			tracing::trace!(
+				target: "gossip",
+				messages_num = %messages.len(),
+				%who,
+				protocol = %self.protocol,
+				"Received messages from peer",
+			);
 		}
 
 		for message in messages {
 			let message_hash = HashFor::<B>::hash(&message[..]);
 
 			if self.known_messages.contains(&message_hash) {
-				trace!(target:"gossip", "Ignored already known message from {}", who);
+				tracing::trace!(
+					target: "gossip",
+					%who,
+					protocol = %self.protocol,
+					"Ignored already known message",
+				);
 				network.report_peer(who.clone(), rep::DUPLICATE_GOSSIP);
 				continue;
 			}
@@ -354,7 +379,12 @@ impl<B: BlockT> ConsensusGossip<B> {
 				ValidationResult::ProcessAndKeep(topic) => (topic, true),
 				ValidationResult::ProcessAndDiscard(topic) => (topic, false),
 				ValidationResult::Discard => {
-					trace!(target:"gossip", "Discard message from peer {}", who);
+					tracing::trace!(
+						target: "gossip",
+						%who,
+						protocol = %self.protocol,
+						"Discard message from peer",
+					);
 					continue;
 				},
 			};
@@ -362,7 +392,12 @@ impl<B: BlockT> ConsensusGossip<B> {
 			let peer = match self.peers.get_mut(&who) {
 				Some(peer) => peer,
 				None => {
-					error!(target:"gossip", "Got message from unregistered peer {}", who);
+					tracing::error!(
+						target: "gossip",
+						%who,
+						protocol = %self.protocol,
+						"Got message from unregistered peer",
+					);
 					continue;
 				}
 			};
@@ -415,7 +450,13 @@ impl<B: BlockT> ConsensusGossip<B> {
 
 				peer.known_messages.insert(entry.message_hash.clone());
 
-				trace!(target: "gossip", "Sending topic message to {}: {:?}", who, entry.message);
+				tracing::trace!(
+					target: "gossip",
+					to = %who,
+					protocol = %self.protocol,
+					?entry.message,
+					"Sending topic message",
+				);
 				network.write_notification(who.clone(), self.protocol.clone(), entry.message.clone());
 			}
 		}
@@ -457,7 +498,13 @@ impl<B: BlockT> ConsensusGossip<B> {
 
 		let message_hash = HashFor::<B>::hash(&message);
 
-		trace!(target: "gossip", "Sending direct to {}: {:?}", who, message);
+		tracing::trace!(
+			target: "gossip",
+			to = %who,
+			protocol = %self.protocol,
+			?message,
+			"Sending direct message",
+		);
 
 		peer.known_messages.insert(message_hash);
 		network.write_notification(who.clone(), self.protocol.clone(), message);

From 462384b7670a54de85b872497c09354e9c440de0 Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Thu, 18 Mar 2021 12:46:27 +0100
Subject: [PATCH 0525/1194] Storage chains: indexing, renewals and reference
 counting (#8265)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Transaction indexing

* Tests and fixes

* Fixed a comment

* Style

* Build

* Style

* Apply suggestions from code review

Co-authored-by: cheme <emericchevalier.pro@gmail.com>

* Code review suggestions

* Add missing impl

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* impl JoinInput

* Don't store empty slices

* JoinInput operates on slices

Co-authored-by: cheme <emericchevalier.pro@gmail.com>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 client/api/src/backend.rs                     |   5 +-
 client/api/src/client.rs                      |  15 +-
 client/api/src/in_mem.rs                      |  10 +-
 client/api/src/leaves.rs                      |   7 +-
 client/db/Cargo.toml                          |   2 +-
 client/db/src/lib.rs                          | 371 ++++++++++++++----
 client/db/src/light.rs                        |   2 +-
 client/db/src/parity_db.rs                    |  12 +-
 client/db/src/utils.rs                        |  48 ++-
 client/light/src/backend.rs                   |   7 +-
 client/light/src/blockchain.rs                |   4 +-
 client/network/src/bitswap.rs                 |  11 +-
 client/service/src/client/client.rs           |  10 +-
 primitives/blockchain/src/backend.rs          |  13 +-
 primitives/database/Cargo.toml                |   1 +
 primitives/database/src/kvdb.rs               |  65 ++-
 primitives/database/src/lib.rs                | 125 ++----
 primitives/database/src/mem.rs                |  46 ++-
 primitives/externalities/src/lib.rs           |  10 +
 primitives/state-machine/src/ext.rs           |  32 +-
 primitives/state-machine/src/lib.rs           |   1 +
 .../src/overlayed_changes/mod.rs              |  41 ++
 22 files changed, 596 insertions(+), 242 deletions(-)

diff --git a/client/api/src/backend.rs b/client/api/src/backend.rs
index 3108ba899467..14841d8d3e96 100644
--- a/client/api/src/backend.rs
+++ b/client/api/src/backend.rs
@@ -26,7 +26,7 @@ use sp_runtime::{generic::BlockId, Justification, Justifications, Storage};
 use sp_runtime::traits::{Block as BlockT, NumberFor, HashFor};
 use sp_state_machine::{
 	ChangesTrieState, ChangesTrieStorage as StateChangesTrieStorage, ChangesTrieTransaction,
-	StorageCollection, ChildStorageCollection, OffchainChangesCollection,
+	StorageCollection, ChildStorageCollection, OffchainChangesCollection, IndexOperation,
 };
 use sp_storage::{StorageData, StorageKey, PrefixedStorageKey, ChildInfo};
 use crate::{
@@ -201,6 +201,9 @@ pub trait BlockImportOperation<Block: BlockT> {
 	/// Mark a block as new head. If both block import and set head are specified, set head
 	/// overrides block import's best block rule.
 	fn mark_head(&mut self, id: BlockId<Block>) -> sp_blockchain::Result<()>;
+
+	/// Add a transaction index operation.
+	fn update_transaction_index(&mut self, index: Vec<IndexOperation>) -> sp_blockchain::Result<()>;
 }
 
 /// Interface for performing operations on the backend.
diff --git a/client/api/src/client.rs b/client/api/src/client.rs
index 97fe77c8d81e..4a0940b1f4bd 100644
--- a/client/api/src/client.rs
+++ b/client/api/src/client.rs
@@ -96,15 +96,18 @@ pub trait BlockBackend<Block: BlockT> {
 	/// Get block hash by number.
 	fn block_hash(&self, number: NumberFor<Block>) -> sp_blockchain::Result<Option<Block::Hash>>;
 
-	/// Get single extrinsic by hash.
-	fn extrinsic(
+	/// Get single indexed transaction by content hash. 
+	///
+	/// Note that this will only fetch transactions
+	/// that are indexed by the runtime with `storage_index_transaction`.
+	fn indexed_transaction(
 		&self,
 		hash: &Block::Hash,
-	) -> sp_blockchain::Result<Option<<Block as BlockT>::Extrinsic>>;
+	) -> sp_blockchain::Result<Option<Vec<u8>>>;
 
-	/// Check if extrinsic exists.
-	fn have_extrinsic(&self, hash: &Block::Hash) -> sp_blockchain::Result<bool> {
-		Ok(self.extrinsic(hash)?.is_some())
+	/// Check if transaction index exists.
+	fn has_indexed_transaction(&self, hash: &Block::Hash) -> sp_blockchain::Result<bool> {
+		Ok(self.indexed_transaction(hash)?.is_some())
 	}
 }
 
diff --git a/client/api/src/in_mem.rs b/client/api/src/in_mem.rs
index c3d266954278..930ae39c4b52 100644
--- a/client/api/src/in_mem.rs
+++ b/client/api/src/in_mem.rs
@@ -30,7 +30,7 @@ use sp_runtime::traits::{Block as BlockT, Header as HeaderT, Zero, NumberFor, Ha
 use sp_runtime::{Justification, Justifications, Storage};
 use sp_state_machine::{
 	ChangesTrieTransaction, InMemoryBackend, Backend as StateBackend, StorageCollection,
-	ChildStorageCollection,
+	ChildStorageCollection, IndexOperation,
 };
 use sp_blockchain::{CachedHeaderMetadata, HeaderMetadata};
 
@@ -415,10 +415,10 @@ impl<Block: BlockT> blockchain::Backend<Block> for Blockchain<Block> {
 		unimplemented!()
 	}
 
-	fn extrinsic(
+	fn indexed_transaction(
 		&self,
 		_hash: &Block::Hash,
-	) -> sp_blockchain::Result<Option<<Block as BlockT>::Extrinsic>> {
+	) -> sp_blockchain::Result<Option<Vec<u8>>> {
 		unimplemented!("Not supported by the in-mem backend.")
 	}
 }
@@ -613,6 +613,10 @@ impl<Block: BlockT> backend::BlockImportOperation<Block> for BlockImportOperatio
 		self.set_head = Some(block);
 		Ok(())
 	}
+
+	fn update_transaction_index(&mut self, _index: Vec<IndexOperation>) -> sp_blockchain::Result<()> {
+		Ok(())
+	}
 }
 
 /// In-memory backend. Keeps all states and blocks in memory.
diff --git a/client/api/src/leaves.rs b/client/api/src/leaves.rs
index 1971012c6aab..47cac8b186f4 100644
--- a/client/api/src/leaves.rs
+++ b/client/api/src/leaves.rs
@@ -25,7 +25,7 @@ use sp_runtime::traits::AtLeast32Bit;
 use codec::{Encode, Decode};
 use sp_blockchain::{Error, Result};
 
-type DbHash = [u8; 32];
+type DbHash = sp_core::H256;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 struct LeafSetItem<H, N> {
@@ -55,6 +55,11 @@ impl<H, N: Ord> FinalizationDisplaced<H, N> {
 		// one transaction, then there will be no overlap in the keys.
 		self.leaves.append(&mut other.leaves);
 	}
+
+	/// Iterate over all displaced leaves.
+	pub fn leaves(&self) -> impl IntoIterator<Item=&H> {
+		self.leaves.values().flatten()
+	}
 }
 
 /// list of leaf hashes ordered by number (descending).
diff --git a/client/db/Cargo.toml b/client/db/Cargo.toml
index 72c26fead1c1..e5e52494c2db 100644
--- a/client/db/Cargo.toml
+++ b/client/db/Cargo.toml
@@ -35,7 +35,7 @@ sp-trie = { version = "3.0.0", path = "../../primitives/trie" }
 sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
 sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
 sp-database = { version = "3.0.0", path = "../../primitives/database" }
-parity-db = { version = "0.2.2", optional = true }
+parity-db = { version = "0.2.3", optional = true }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.9.0", path = "../../utils/prometheus" }
 
 [dev-dependencies]
diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index acda057938e9..0fc8e299f2a6 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -78,7 +78,7 @@ use sp_runtime::traits::{
 use sp_state_machine::{
 	DBValue, ChangesTrieTransaction, ChangesTrieCacheAction, UsageInfo as StateUsageInfo,
 	StorageCollection, ChildStorageCollection, OffchainChangesCollection,
-	backend::Backend as StateBackend, StateMachineStats,
+	backend::Backend as StateBackend, StateMachineStats, IndexOperation,
 };
 use crate::utils::{DatabaseType, Meta, meta_keys, read_db, read_meta};
 use crate::changes_tries_storage::{DbChangesTrieStorage, DbChangesTrieStorageTransaction};
@@ -107,7 +107,16 @@ pub type DbState<B> = sp_state_machine::TrieBackend<
 
 const DB_HASH_LEN: usize = 32;
 /// Hash type that this backend uses for the database.
-pub type DbHash = [u8; DB_HASH_LEN];
+pub type DbHash = sp_core::H256;
+
+/// This is used as block body when storage-chain mode is enabled.
+#[derive(Debug, Encode, Decode)]
+struct ExtrinsicHeader {
+	/// Hash of the indexed part
+	indexed_hash: DbHash, // Zero hash if there's no indexed data
+	/// The rest of the data.
+	data: Vec<u8>,
+}
 
 /// A reference tracking state.
 ///
@@ -506,33 +515,47 @@ impl<Block: BlockT> sc_client_api::blockchain::HeaderBackend<Block> for Blockcha
 
 impl<Block: BlockT> sc_client_api::blockchain::Backend<Block> for BlockchainDb<Block> {
 	fn body(&self, id: BlockId<Block>) -> ClientResult<Option<Vec<Block::Extrinsic>>> {
-		match read_db(&*self.db, columns::KEY_LOOKUP, columns::BODY, id)? {
-			Some(body) => {
-				match self.transaction_storage {
-					TransactionStorageMode::BlockBody => match Decode::decode(&mut &body[..]) {
-						Ok(body) => Ok(Some(body)),
-						Err(err) => return Err(sp_blockchain::Error::Backend(
-							format!("Error decoding body: {}", err)
-						)),
-					},
-					TransactionStorageMode::StorageChain => {
-						match Vec::<Block::Hash>::decode(&mut &body[..]) {
-							Ok(hashes) => {
-								let extrinsics: ClientResult<Vec<Block::Extrinsic>> = hashes.into_iter().map(
-									|h| self.extrinsic(&h).and_then(|maybe_ex| maybe_ex.ok_or_else(
-										|| sp_blockchain::Error::Backend(
-											format!("Missing transaction: {}", h))))
-								).collect();
-								Ok(Some(extrinsics?))
+		let body = match read_db(&*self.db, columns::KEY_LOOKUP, columns::BODY, id)? {
+			Some(body) => body,
+			None => return Ok(None),
+		};
+		match self.transaction_storage {
+			TransactionStorageMode::BlockBody => match Decode::decode(&mut &body[..]) {
+				Ok(body) => Ok(Some(body)),
+				Err(err) => return Err(sp_blockchain::Error::Backend(
+					format!("Error decoding body: {}", err)
+				)),
+			},
+			TransactionStorageMode::StorageChain => {
+				match Vec::<ExtrinsicHeader>::decode(&mut &body[..]) {
+					Ok(index) => {
+						let extrinsics: ClientResult<Vec<Block::Extrinsic>> = index.into_iter().map(
+							| ExtrinsicHeader { indexed_hash, data } | {
+								let decode_result = if indexed_hash != Default::default() {
+									match self.db.get(columns::TRANSACTION, indexed_hash.as_ref()) {
+										Some(t) => {
+											let mut input = utils::join_input(data.as_ref(), t.as_ref());
+											Block::Extrinsic::decode(&mut input)
+										},
+										None => return Err(sp_blockchain::Error::Backend(
+											format!("Missing indexed transaction {:?}", indexed_hash))
+										)
+									}
+								} else {
+									Block::Extrinsic::decode(&mut data.as_ref())
+								};
+								decode_result.map_err(|err| sp_blockchain::Error::Backend(
+									format!("Error decoding extrinsic: {}", err))
+								)
 							}
-							Err(err) => return Err(sp_blockchain::Error::Backend(
-								format!("Error decoding body list: {}", err)
-							)),
-						}
+						).collect();
+						Ok(Some(extrinsics?))
 					}
+					Err(err) => return Err(sp_blockchain::Error::Backend(
+						format!("Error decoding body list: {}", err)
+					)),
 				}
 			}
-			None => Ok(None),
 		}
 	}
 
@@ -564,21 +587,11 @@ impl<Block: BlockT> sc_client_api::blockchain::Backend<Block> for BlockchainDb<B
 		children::read_children(&*self.db, columns::META, meta_keys::CHILDREN_PREFIX, parent_hash)
 	}
 
-	fn extrinsic(&self, hash: &Block::Hash) -> ClientResult<Option<Block::Extrinsic>> {
-		match self.db.get(columns::TRANSACTION, hash.as_ref()) {
-			Some(ex) => {
-				match Decode::decode(&mut &ex[..]) {
-					Ok(ex) => Ok(Some(ex)),
-					Err(err) => Err(sp_blockchain::Error::Backend(
-							format!("Error decoding extrinsic {}: {}", hash, err)
-					)),
-				}
-			},
-			None => Ok(None),
-		}
+	fn indexed_transaction(&self, hash: &Block::Hash) -> ClientResult<Option<Vec<u8>>> {
+		Ok(self.db.get(columns::TRANSACTION, hash.as_ref()))
 	}
 
-	fn have_extrinsic(&self, hash: &Block::Hash) -> ClientResult<bool> {
+	fn has_indexed_transaction(&self, hash: &Block::Hash) -> ClientResult<bool> {
 		Ok(self.db.contains(columns::TRANSACTION, hash.as_ref()))
 	}
 }
@@ -681,6 +694,7 @@ pub struct BlockImportOperation<Block: BlockT> {
 	finalized_blocks: Vec<(BlockId<Block>, Option<Justification>)>,
 	set_head: Option<BlockId<Block>>,
 	commit_state: bool,
+	index_ops: Vec<IndexOperation>,
 }
 
 impl<Block: BlockT> BlockImportOperation<Block> {
@@ -823,6 +837,11 @@ impl<Block: BlockT> sc_client_api::backend::BlockImportOperation<Block> for Bloc
 		self.set_head = Some(block);
 		Ok(())
 	}
+
+	fn update_transaction_index(&mut self, index_ops: Vec<IndexOperation>) -> ClientResult<()> {
+		self.index_ops = index_ops;
+		Ok(())
+	}
 }
 
 struct StorageDb<Block: BlockT> {
@@ -1155,21 +1174,21 @@ impl<Block: BlockT> Backend<Block> {
 			if new_canonical <= self.storage.state_db.best_canonical().unwrap_or(0) {
 				return Ok(())
 			}
-
 			let hash = if new_canonical == number_u64 {
 				hash
 			} else {
-				::sc_client_api::blockchain::HeaderBackend::hash(&self.blockchain, new_canonical.saturated_into())?
-					.expect("existence of block with number `new_canonical` \
-						implies existence of blocks with all numbers before it; qed")
+				sc_client_api::blockchain::HeaderBackend::hash(
+					&self.blockchain,
+					new_canonical.saturated_into(),
+				)?.expect("existence of block with number `new_canonical` \
+					implies existence of blocks with all numbers before it; qed")
 			};
 
 			trace!(target: "db", "Canonicalize block #{} ({:?})", new_canonical, hash);
 			let commit = self.storage.state_db.canonicalize_block(&hash)
 				.map_err(|e: sc_state_db::Error<io::Error>| sp_blockchain::Error::from_state_db(e))?;
 			apply_state_commit(transaction, commit);
-		};
-
+		}
 		Ok(())
 	}
 
@@ -1225,20 +1244,14 @@ impl<Block: BlockT> Backend<Block> {
 			)?;
 
 			transaction.set_from_vec(columns::HEADER, &lookup_key, pending_block.header.encode());
-			if let Some(body) = &pending_block.body {
+			if let Some(body) = pending_block.body {
 				match self.transaction_storage {
 					TransactionStorageMode::BlockBody => {
 						transaction.set_from_vec(columns::BODY, &lookup_key, body.encode());
 					},
 					TransactionStorageMode::StorageChain => {
-						let mut hashes = Vec::with_capacity(body.len());
-						for extrinsic in body {
-							let extrinsic = extrinsic.encode();
-							let hash = HashFor::<Block>::hash(&extrinsic);
-							transaction.set(columns::TRANSACTION, &hash.as_ref(), &extrinsic);
-							hashes.push(hash);
-						}
-						transaction.set_from_vec(columns::BODY, &lookup_key, hashes.encode());
+						let body = apply_index_ops::<Block>(&mut transaction, body, operation.index_ops);
+						transaction.set_from_vec(columns::BODY, &lookup_key, body);
 					},
 				}
 			}
@@ -1491,8 +1504,8 @@ impl<Block: BlockT> Backend<Block> {
 			}
 		}
 
-		self.prune_blocks(transaction, f_num)?;
 		let new_displaced = self.blockchain.leaves.write().finalize_height(f_num);
+		self.prune_blocks(transaction, f_num, &new_displaced)?;
 		match displaced {
 			x @ &mut None => *x = Some(new_displaced),
 			&mut Some(ref mut displaced) => displaced.merge(new_displaced),
@@ -1505,47 +1518,83 @@ impl<Block: BlockT> Backend<Block> {
 		&self,
 		transaction: &mut Transaction<DbHash>,
 		finalized: NumberFor<Block>,
+		displaced: &FinalizationDisplaced<Block::Hash, NumberFor<Block>>,
 	) -> ClientResult<()> {
 		if let KeepBlocks::Some(keep_blocks) = self.keep_blocks {
 			// Always keep the last finalized block
 			let keep = std::cmp::max(keep_blocks, 1);
-			if finalized < keep.into() {
-				return Ok(())
+			if finalized >= keep.into() {
+				let number = finalized.saturating_sub(keep.into());
+				self.prune_block(transaction, BlockId::<Block>::number(number))?;
 			}
-			let number = finalized.saturating_sub(keep.into());
-			match read_db(&*self.storage.db, columns::KEY_LOOKUP, columns::BODY, BlockId::<Block>::number(number))? {
-				Some(body) => {
-					debug!(target: "db", "Removing block #{}", number);
-					utils::remove_from_db(
-						transaction,
-						&*self.storage.db,
-						columns::KEY_LOOKUP,
-						columns::BODY,
-						BlockId::<Block>::number(number),
-					)?;
-					match self.transaction_storage {
-						TransactionStorageMode::BlockBody => {},
-						TransactionStorageMode::StorageChain => {
-							match Vec::<Block::Hash>::decode(&mut &body[..]) {
-								Ok(hashes) => {
-									for h in hashes {
-										transaction.remove(columns::TRANSACTION, h.as_ref());
+
+			// Also discard all blocks from displaced branches
+			for h in displaced.leaves() {
+				let mut number = finalized;
+				let mut hash = h.clone();
+				// Follow displaced chains back until we reach a finalized block.
+				// Since leaves are discarded due to finality, they can't have parents
+				// that are canonical, but not yet finalized. So we stop deletig as soon as
+				// we reach canonical chain.
+				while self.blockchain.hash(number)? != Some(hash.clone()) {
+					let id = BlockId::<Block>::hash(hash.clone());
+					match self.blockchain.header(id)? {
+						Some(header) => {
+							self.prune_block(transaction, id)?;
+							number = header.number().saturating_sub(One::one());
+							hash = header.parent_hash().clone();
+						},
+						None => break,
+					}
+				}
+			}
+		}
+		Ok(())
+	}
+
+	fn prune_block(
+		&self,
+		transaction: &mut Transaction<DbHash>,
+		id: BlockId<Block>,
+	) -> ClientResult<()> {
+		match read_db(&*self.storage.db, columns::KEY_LOOKUP, columns::BODY, id)? {
+			Some(body) => {
+				debug!(target: "db", "Removing block #{}", id);
+				utils::remove_from_db(
+					transaction,
+					&*self.storage.db,
+					columns::KEY_LOOKUP,
+					columns::BODY,
+					id,
+				)?;
+				match self.transaction_storage {
+					TransactionStorageMode::BlockBody => {},
+					TransactionStorageMode::StorageChain => {
+						match Vec::<ExtrinsicHeader>::decode(&mut &body[..]) {
+							Ok(body) => {
+								for ExtrinsicHeader { indexed_hash, .. } in body {
+									if indexed_hash != Default::default() {
+										transaction.release(
+											columns::TRANSACTION,
+											indexed_hash,
+										);
 									}
 								}
-								Err(err) => return Err(sp_blockchain::Error::Backend(
-									format!("Error decoding body list: {}", err)
-								)),
 							}
+							Err(err) => return Err(sp_blockchain::Error::Backend(
+									format!("Error decoding body list: {}", err)
+							)),
 						}
 					}
 				}
-				None => return Ok(()),
 			}
+			None => return Ok(()),
 		}
 		Ok(())
 	}
 }
 
+
 fn apply_state_commit(transaction: &mut Transaction<DbHash>, commit: sc_state_db::CommitSet<Vec<u8>>) {
 	for (key, val) in commit.data.inserted.into_iter() {
 		transaction.set_from_vec(columns::STATE, &key[..], val);
@@ -1561,6 +1610,67 @@ fn apply_state_commit(transaction: &mut Transaction<DbHash>, commit: sc_state_db
 	}
 }
 
+fn apply_index_ops<Block: BlockT>(
+	transaction: &mut Transaction<DbHash>,
+	body: Vec<Block::Extrinsic>,
+	ops: Vec<IndexOperation>,
+) -> Vec<u8> {
+	let mut extrinsic_headers: Vec<ExtrinsicHeader> = Vec::with_capacity(body.len());
+	let mut index_map = HashMap::new();
+	let mut renewed_map = HashMap::new();
+	for op in ops {
+		match op {
+			IndexOperation::Insert { extrinsic, offset } => {
+				index_map.insert(extrinsic, offset);
+			}
+			IndexOperation::Renew { extrinsic, hash, .. } => {
+				renewed_map.insert(extrinsic, DbHash::from_slice(hash.as_ref()));
+			}
+		}
+	}
+	for (index, extrinsic) in body.into_iter().enumerate() {
+		let extrinsic = extrinsic.encode();
+		let extrinsic_header = if let Some(hash) = renewed_map.get(&(index as u32)) {
+			// Bump ref counter
+			transaction.reference(columns::TRANSACTION, DbHash::from_slice(hash.as_ref()));
+			ExtrinsicHeader {
+				indexed_hash: hash.clone(),
+				data: extrinsic,
+			}
+		} else {
+			match index_map.get(&(index as u32)) {
+				Some(offset) if *offset as usize <= extrinsic.len() => {
+					let offset = *offset as usize;
+					let hash = HashFor::<Block>::hash(&extrinsic[offset..]);
+					transaction.store(
+						columns::TRANSACTION,
+						DbHash::from_slice(hash.as_ref()),
+						extrinsic[offset..].to_vec(),
+					);
+					ExtrinsicHeader {
+						indexed_hash: DbHash::from_slice(hash.as_ref()),
+						data: extrinsic[..offset].to_vec(),
+					}
+				},
+				_ => {
+					ExtrinsicHeader {
+						indexed_hash: Default::default(),
+						data: extrinsic,
+					}
+				}
+			}
+		};
+		extrinsic_headers.push(extrinsic_header);
+	}
+	debug!(
+		target: "db",
+		"DB transaction index: {} inserted, {} renewed",
+		index_map.len(),
+		renewed_map.len()
+	);
+	extrinsic_headers.encode()
+}
+
 impl<Block> sc_client_api::backend::AuxStore for Backend<Block> where Block: BlockT {
 	fn insert_aux<
 		'a,
@@ -1609,6 +1719,7 @@ impl<Block: BlockT> sc_client_api::backend::Backend<Block> for Backend<Block> {
 			finalized_blocks: Vec::new(),
 			set_head: None,
 			commit_state: false,
+			index_ops: Default::default(),
 		})
 	}
 
@@ -1998,7 +2109,7 @@ pub(crate) mod tests {
 		changes: Option<Vec<(Vec<u8>, Vec<u8>)>>,
 		extrinsics_root: H256,
 	) -> H256 {
-		insert_block(backend, number, parent_hash, changes, extrinsics_root, Vec::new())
+		insert_block(backend, number, parent_hash, changes, extrinsics_root, Vec::new(), None)
 	}
 
 	pub fn insert_block(
@@ -2008,6 +2119,7 @@ pub(crate) mod tests {
 		changes: Option<Vec<(Vec<u8>, Vec<u8>)>>,
 		extrinsics_root: H256,
 		body: Vec<ExtrinsicWrapper<u64>>,
+		transaction_index: Option<Vec<IndexOperation>>,
 	) -> H256 {
 		use sp_runtime::testing::Digest;
 
@@ -2035,6 +2147,9 @@ pub(crate) mod tests {
 		let mut op = backend.begin_operation().unwrap();
 		backend.begin_state_operation(&mut op, block_id).unwrap();
 		op.set_block_data(header, Some(body), None, NewBlockState::Best).unwrap();
+		if let Some(index) = transaction_index {
+			op.update_transaction_index(index).unwrap();
+		}
 		op.update_changes_trie((changes_trie_update, ChangesTrieCacheAction::Clear)).unwrap();
 		backend.commit_operation(op).unwrap();
 
@@ -2676,7 +2791,7 @@ pub(crate) mod tests {
 			let mut blocks = Vec::new();
 			let mut prev_hash = Default::default();
 			for i in 0 .. 5 {
-				let hash = insert_block(&backend, i, prev_hash, None, Default::default(), vec![i.into()]);
+				let hash = insert_block(&backend, i, prev_hash, None, Default::default(), vec![i.into()], None);
 				blocks.push(hash);
 				prev_hash = hash;
 			}
@@ -2697,4 +2812,100 @@ pub(crate) mod tests {
 			assert_eq!(Some(vec![4.into()]), bc.body(BlockId::hash(blocks[4])).unwrap());
 		}
 	}
+
+	#[test]
+	fn prune_blocks_on_finalize_with_fork() {
+		let backend = Backend::<Block>::new_test_with_tx_storage(
+			2,
+			10,
+			TransactionStorageMode::StorageChain
+		);
+		let mut blocks = Vec::new();
+		let mut prev_hash = Default::default();
+		for i in 0 .. 5 {
+			let hash = insert_block(&backend, i, prev_hash, None, Default::default(), vec![i.into()], None);
+			blocks.push(hash);
+			prev_hash = hash;
+		}
+
+		// insert a fork at block 2
+		let fork_hash_root = insert_block(
+			&backend,
+			2,
+			blocks[1],
+			None,
+			sp_core::H256::random(),
+			vec![2.into()],
+			None
+		);
+		insert_block(&backend, 3, fork_hash_root, None, H256::random(), vec![3.into(), 11.into()], None);
+		let mut op = backend.begin_operation().unwrap();
+		backend.begin_state_operation(&mut op, BlockId::Hash(blocks[4])).unwrap();
+		op.mark_head(BlockId::Hash(blocks[4])).unwrap();
+		backend.commit_operation(op).unwrap();
+
+		for i in 1 .. 5 {
+			let mut op = backend.begin_operation().unwrap();
+			backend.begin_state_operation(&mut op, BlockId::Hash(blocks[4])).unwrap();
+			op.mark_finalized(BlockId::Hash(blocks[i]), None).unwrap();
+			backend.commit_operation(op).unwrap();
+		}
+
+		let bc = backend.blockchain();
+		assert_eq!(None, bc.body(BlockId::hash(blocks[0])).unwrap());
+		assert_eq!(None, bc.body(BlockId::hash(blocks[1])).unwrap());
+		assert_eq!(None, bc.body(BlockId::hash(blocks[2])).unwrap());
+		assert_eq!(Some(vec![3.into()]), bc.body(BlockId::hash(blocks[3])).unwrap());
+		assert_eq!(Some(vec![4.into()]), bc.body(BlockId::hash(blocks[4])).unwrap());
+	}
+
+	#[test]
+	fn renew_transaction_storage() {
+		let backend = Backend::<Block>::new_test_with_tx_storage(
+			2,
+			10,
+			TransactionStorageMode::StorageChain
+		);
+		let mut blocks = Vec::new();
+		let mut prev_hash = Default::default();
+		let x1 = ExtrinsicWrapper::from(0u64).encode();
+		let x1_hash = <HashFor::<Block> as sp_core::Hasher>::hash(&x1[1..]);
+		for i in 0 .. 10 {
+			let mut index = Vec::new();
+			if i == 0 {
+				index.push(IndexOperation::Insert { extrinsic: 0, offset: 1 });
+			} else if i < 5 {
+				// keep renewing 1st
+				index.push(IndexOperation::Renew {
+					extrinsic: 0,
+					hash: x1_hash.as_ref().to_vec(),
+					size: (x1.len() - 1) as u32,
+				});
+			} // else stop renewing
+			let hash = insert_block(
+				&backend,
+				i,
+				prev_hash,
+				None,
+				Default::default(),
+				vec![i.into()],
+				Some(index)
+			);
+			blocks.push(hash);
+			prev_hash = hash;
+		}
+
+		for i in 1 .. 10 {
+			let mut op = backend.begin_operation().unwrap();
+			backend.begin_state_operation(&mut op, BlockId::Hash(blocks[4])).unwrap();
+			op.mark_finalized(BlockId::Hash(blocks[i]), None).unwrap();
+			backend.commit_operation(op).unwrap();
+			let bc = backend.blockchain();
+			if i < 6 {
+				assert!(bc.indexed_transaction(&x1_hash).unwrap().is_some());
+			} else {
+				assert!(bc.indexed_transaction(&x1_hash).unwrap().is_none());
+			}
+		}
+	}
 }
diff --git a/client/db/src/light.rs b/client/db/src/light.rs
index 91f37dd374d9..bf24197c5b5d 100644
--- a/client/db/src/light.rs
+++ b/client/db/src/light.rs
@@ -756,7 +756,7 @@ pub(crate) mod tests {
 	#[test]
 	fn finalized_ancient_headers_are_replaced_with_cht() {
 		fn insert_headers<F: Fn(&Hash, u64) -> Header>(header_producer: F) ->
-			(Arc<sp_database::MemDb<DbHash>>, LightStorage<Block>)
+			(Arc<sp_database::MemDb>, LightStorage<Block>)
 		{
 			let raw_db = Arc::new(sp_database::MemDb::default());
 			let db = LightStorage::from_kvdb(raw_db.clone()).unwrap();
diff --git a/client/db/src/parity_db.rs b/client/db/src/parity_db.rs
index 71cc5117f19e..ed39c1e9f669 100644
--- a/client/db/src/parity_db.rs
+++ b/client/db/src/parity_db.rs
@@ -33,7 +33,7 @@ fn handle_err<T>(result: parity_db::Result<T>) -> T {
 }
 
 /// Wrap parity-db database into a trait object that implements `sp_database::Database`
-pub fn open<H: Clone>(path: &std::path::Path, db_type: DatabaseType)
+pub fn open<H: Clone + AsRef<[u8]>>(path: &std::path::Path, db_type: DatabaseType)
 	-> parity_db::Result<std::sync::Arc<dyn Database<H>>>
 {
 	let mut config = parity_db::Options::with_columns(path, NUM_COLUMNS as u8);
@@ -48,7 +48,7 @@ pub fn open<H: Clone>(path: &std::path::Path, db_type: DatabaseType)
 	Ok(std::sync::Arc::new(DbAdapter(db)))
 }
 
-impl<H: Clone> Database<H> for DbAdapter {
+impl<H: Clone + AsRef<[u8]>> Database<H> for DbAdapter {
 	fn commit(&self, transaction: Transaction<H>) -> Result<(), DatabaseError> {
 		handle_err(self.0.commit(transaction.0.into_iter().map(|change|
 			match change {
@@ -65,7 +65,11 @@ impl<H: Clone> Database<H> for DbAdapter {
 		handle_err(self.0.get(col as u8, key))
 	}
 
-	fn lookup(&self, _hash: &H) -> Option<Vec<u8>> {
-		unimplemented!();
+	fn contains(&self, col: ColumnId, key: &[u8]) -> bool {
+		handle_err(self.0.get_size(col as u8, key)).is_some()
+	}
+
+	fn value_size(&self, col: ColumnId, key: &[u8]) -> Option<usize> {
+		handle_err(self.0.get_size(col as u8, key)).map(|s| s as usize)
 	}
 }
diff --git a/client/db/src/utils.rs b/client/db/src/utils.rs
index cd9b2a6f56d4..590b994d50e8 100644
--- a/client/db/src/utils.rs
+++ b/client/db/src/utils.rs
@@ -278,7 +278,7 @@ pub fn open_database<Block: BlockT>(
 		#[cfg(feature = "with-parity-db")]
 		DatabaseSettingsSrc::ParityDb { path } => {
 			crate::parity_db::open(&path, db_type)
-				.map_err(|e| sp_blockchain::Error::Backend(format!("{:?}", e)))?
+				.map_err(|e| sp_blockchain::Error::Backend(format!("{}", e)))?
 		},
 		#[cfg(not(feature = "with-parity-db"))]
 		DatabaseSettingsSrc::ParityDb { .. } => {
@@ -449,10 +449,35 @@ impl DatabaseType {
 	}
 }
 
+pub(crate) struct JoinInput<'a, 'b>(&'a [u8], &'b [u8]);
+
+pub(crate) fn join_input<'a, 'b>(i1: &'a[u8], i2: &'b [u8]) -> JoinInput<'a, 'b> {
+	JoinInput(i1, i2)
+}
+
+impl<'a, 'b> codec::Input for JoinInput<'a, 'b> {
+	fn remaining_len(&mut self) -> Result<Option<usize>, codec::Error> {
+		Ok(Some(self.0.len() + self.1.len()))
+	}
+
+	fn read(&mut self, into: &mut [u8]) -> Result<(), codec::Error> {
+		let mut read = 0;
+		if self.0.len() > 0 {
+			read = std::cmp::min(self.0.len(), into.len());
+			self.0.read(&mut into[..read])?;
+		}
+		if read < into.len() {
+			self.1.read(&mut into[read..])?;
+		}
+		Ok(())
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;
 	use sp_runtime::testing::{Block as RawBlock, ExtrinsicWrapper};
+	use codec::Input;
 	type Block = RawBlock<ExtrinsicWrapper<u32>>;
 
 	#[test]
@@ -469,4 +494,25 @@ mod tests {
 		assert_eq!(DatabaseType::Full.as_str(), "full");
 		assert_eq!(DatabaseType::Light.as_str(), "light");
 	}
+
+	#[test]
+	fn join_input_works() {
+		let buf1 = [1, 2, 3, 4];
+		let buf2 = [5, 6, 7, 8];
+		let mut test = [0, 0, 0];
+		let mut joined = join_input(buf1.as_ref(), buf2.as_ref());
+		assert_eq!(joined.remaining_len().unwrap(), Some(8));
+
+		joined.read(&mut test).unwrap();
+		assert_eq!(test, [1, 2, 3]);
+		assert_eq!(joined.remaining_len().unwrap(), Some(5));
+
+		joined.read(&mut test).unwrap();
+		assert_eq!(test, [4, 5, 6]);
+		assert_eq!(joined.remaining_len().unwrap(), Some(2));
+
+		joined.read(&mut test[0..2]).unwrap();
+		assert_eq!(test, [7, 8, 6]);
+		assert_eq!(joined.remaining_len().unwrap(), Some(0));
+	}
 }
diff --git a/client/light/src/backend.rs b/client/light/src/backend.rs
index 52ace4fd9475..621ada13ff61 100644
--- a/client/light/src/backend.rs
+++ b/client/light/src/backend.rs
@@ -30,7 +30,7 @@ use sp_core::storage::{well_known_keys, ChildInfo};
 use sp_core::offchain::storage::InMemOffchainStorage;
 use sp_state_machine::{
 	Backend as StateBackend, TrieBackend, InMemoryBackend, ChangesTrieTransaction,
-	StorageCollection, ChildStorageCollection,
+	StorageCollection, ChildStorageCollection, IndexOperation,
 };
 use sp_runtime::{generic::BlockId, Justification, Justifications, Storage};
 use sp_runtime::traits::{Block as BlockT, NumberFor, Zero, Header, HashFor};
@@ -374,6 +374,11 @@ impl<S, Block> BlockImportOperation<Block> for ImportOperation<Block, S>
 		self.set_head = Some(block);
 		Ok(())
 	}
+
+	fn update_transaction_index(&mut self, _index: Vec<IndexOperation>) -> sp_blockchain::Result<()> {
+		// noop for the light client
+		Ok(())
+	}
 }
 
 impl<H: Hasher> std::fmt::Debug for GenesisOrUnavailableState<H> {
diff --git a/client/light/src/blockchain.rs b/client/light/src/blockchain.rs
index 062b3a9866d0..3349adf7ac69 100644
--- a/client/light/src/blockchain.rs
+++ b/client/light/src/blockchain.rs
@@ -129,10 +129,10 @@ impl<S, Block> BlockchainBackend<Block> for Blockchain<S> where Block: BlockT, S
 		Err(ClientError::NotAvailableOnLightClient)
 	}
 
-	fn extrinsic(
+	fn indexed_transaction(
 		&self,
 		_hash: &Block::Hash,
-	) -> ClientResult<Option<<Block as BlockT>::Extrinsic>> {
+	) -> ClientResult<Option<Vec<u8>>> {
 		Err(ClientError::NotAvailableOnLightClient)
 	}
 }
diff --git a/client/network/src/bitswap.rs b/client/network/src/bitswap.rs
index 7129f3dbe07b..aea2b8420cb2 100644
--- a/client/network/src/bitswap.rs
+++ b/client/network/src/bitswap.rs
@@ -25,7 +25,6 @@ use std::io;
 use std::sync::Arc;
 use std::task::{Context, Poll};
 use cid::Version;
-use codec::Encode;
 use core::pin::Pin;
 use futures::Future;
 use futures::io::{AsyncRead, AsyncWrite};
@@ -257,15 +256,15 @@ impl<B: BlockT> NetworkBehaviour for Bitswap<B> {
 			}
 			let mut hash = B::Hash::default();
 			hash.as_mut().copy_from_slice(&cid.hash().digest()[0..32]);
-			let extrinsic = match self.client.extrinsic(&hash) {
+			let transaction = match self.client.indexed_transaction(&hash) {
 				Ok(ex) => ex,
 				Err(e) => {
-					error!(target: LOG_TARGET, "Error retrieving extrinsic {}: {}", hash, e);
+					error!(target: LOG_TARGET, "Error retrieving transaction {}: {}", hash, e);
 					None
 				}
 			};
-			match extrinsic {
-				Some(extrinsic) => {
+			match transaction {
+				Some(transaction) => {
 					trace!(target: LOG_TARGET, "Found CID {:?}, hash {:?}", cid, hash);
 					if entry.want_type == WantType::Block as i32 {
 						let prefix = Prefix {
@@ -276,7 +275,7 @@ impl<B: BlockT> NetworkBehaviour for Bitswap<B> {
 						};
 						response.payload.push(MessageBlock {
 							prefix: prefix.to_bytes(),
-							data: extrinsic.encode(),
+							data: transaction,
 						});
 					} else {
 						response.block_presences.push(BlockPresence {
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index 81c98b8b1e2b..a39c45664192 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -767,6 +767,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 					offchain_sc,
 					tx, _,
 					changes_trie_tx,
+					tx_index,
 				) = storage_changes.into_inner();
 
 				if self.config.offchain_indexing_api {
@@ -775,6 +776,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 
 				operation.op.update_db_storage(tx)?;
 				operation.op.update_storage(main_sc.clone(), child_sc.clone())?;
+				operation.op.update_transaction_index(tx_index)?;
 
 				if let Some(changes_trie_transaction) = changes_trie_tx {
 					operation.op.update_changes_trie(changes_trie_transaction)?;
@@ -1945,12 +1947,12 @@ impl<B, E, Block, RA> BlockBackend<Block> for Client<B, E, Block, RA>
 		self.backend.blockchain().hash(number)
 	}
 
-	fn extrinsic(&self, hash: &Block::Hash) -> sp_blockchain::Result<Option<Block::Extrinsic>> {
-		self.backend.blockchain().extrinsic(hash)
+	fn indexed_transaction(&self, hash: &Block::Hash) -> sp_blockchain::Result<Option<Vec<u8>>> {
+		self.backend.blockchain().indexed_transaction(hash)
 	}
 
-	fn have_extrinsic(&self, hash: &Block::Hash) -> sp_blockchain::Result<bool> {
-		self.backend.blockchain().have_extrinsic(hash)
+	fn has_indexed_transaction(&self, hash: &Block::Hash) -> sp_blockchain::Result<bool> {
+		self.backend.blockchain().has_indexed_transaction(hash)
 	}
 }
 
diff --git a/primitives/blockchain/src/backend.rs b/primitives/blockchain/src/backend.rs
index 6ee836acb644..b00cbada9f47 100644
--- a/primitives/blockchain/src/backend.rs
+++ b/primitives/blockchain/src/backend.rs
@@ -216,15 +216,16 @@ pub trait Backend<Block: BlockT>: HeaderBackend<Block> + HeaderMetadata<Block, E
 		Ok(None)
 	}
 
-	/// Get single extrinsic by hash.
-	fn extrinsic(
+	/// Get single indexed transaction by content hash. Note that this will only fetch transactions
+	/// that are indexed by the runtime with `storage_index_transaction`.
+	fn indexed_transaction(
 		&self,
 		hash: &Block::Hash,
-	) -> Result<Option<<Block as BlockT>::Extrinsic>>;
+	) -> Result<Option<Vec<u8>>>;
 
-	/// Check if extrinsic exists.
-	fn have_extrinsic(&self, hash: &Block::Hash) -> Result<bool> {
-		Ok(self.extrinsic(hash)?.is_some())
+	/// Check if indexed transaction exists.
+	fn has_indexed_transaction(&self, hash: &Block::Hash) -> Result<bool> {
+		Ok(self.indexed_transaction(hash)?.is_some())
 	}
 }
 
diff --git a/primitives/database/Cargo.toml b/primitives/database/Cargo.toml
index 4062ba292352..aae7668b5ec8 100644
--- a/primitives/database/Cargo.toml
+++ b/primitives/database/Cargo.toml
@@ -13,3 +13,4 @@ readme = "README.md"
 [dependencies]
 parking_lot = "0.11.1"
 kvdb = "0.9.0"
+
diff --git a/primitives/database/src/kvdb.rs b/primitives/database/src/kvdb.rs
index b50ca53786f9..d99fe6360ef7 100644
--- a/primitives/database/src/kvdb.rs
+++ b/primitives/database/src/kvdb.rs
@@ -33,18 +33,73 @@ fn handle_err<T>(result: std::io::Result<T>) -> T {
 }
 
 /// Wrap RocksDb database into a trait object that implements `sp_database::Database`
-pub fn as_database<D: KeyValueDB + 'static, H: Clone>(db: D) -> std::sync::Arc<dyn Database<H>> {
+pub fn as_database<D, H>(db: D) -> std::sync::Arc<dyn Database<H>>
+	where D: KeyValueDB + 'static, H: Clone + AsRef<[u8]>
+{
 	std::sync::Arc::new(DbAdapter(db))
 }
 
-impl<D: KeyValueDB, H: Clone> Database<H> for DbAdapter<D> {
+impl <D: KeyValueDB> DbAdapter<D> {
+	// Returns counter key and counter value if it exists.
+	fn read_counter(&self, col: ColumnId, key: &[u8]) -> error::Result<(Vec<u8>, Option<u32>)> {
+		// Add a key suffix for the counter
+		let mut counter_key = key.to_vec();
+		counter_key.push(0);
+		Ok(match self.0.get(col, &counter_key).map_err(|e| error::DatabaseError(Box::new(e)))? {
+			Some(data) => {
+				let mut counter_data = [0; 4];
+				if data.len() != 4 {
+					return Err(error::DatabaseError(Box::new(
+								std::io::Error::new(std::io::ErrorKind::Other,
+									format!("Unexpected counter len {}", data.len())))
+					))
+				}
+				counter_data.copy_from_slice(&data);
+				let counter = u32::from_le_bytes(counter_data);
+				(counter_key, Some(counter))
+			},
+			None => (counter_key, None)
+		})
+	}
+}
+
+impl<D: KeyValueDB, H: Clone + AsRef<[u8]>> Database<H> for DbAdapter<D> {
 	fn commit(&self, transaction: Transaction<H>) -> error::Result<()> {
 		let mut tx = DBTransaction::new();
 		for change in transaction.0.into_iter() {
 			match change {
 				Change::Set(col, key, value) => tx.put_vec(col, &key, value),
 				Change::Remove(col, key) => tx.delete(col, &key),
-				_ => unimplemented!(),
+				Change::Store(col, key, value) => {
+					match self.read_counter(col, key.as_ref())? {
+						(counter_key, Some(mut counter)) => {
+							counter += 1;
+							tx.put(col, &counter_key, &counter.to_le_bytes());
+						},
+						(counter_key, None) => {
+							let d = 1u32.to_le_bytes();
+							tx.put(col, &counter_key, &d);
+							tx.put_vec(col, key.as_ref(), value);
+						},
+					}
+				}
+				Change::Reference(col, key) => {
+					if let (counter_key, Some(mut counter)) = self.read_counter(col, key.as_ref())? {
+						counter += 1;
+						tx.put(col, &counter_key, &counter.to_le_bytes());
+					}
+				}
+				Change::Release(col, key) => {
+					if let (counter_key, Some(mut counter)) = self.read_counter(col, key.as_ref())? {
+						counter -= 1;
+						if counter == 0 {
+							tx.delete(col, &counter_key);
+							tx.delete(col, key.as_ref());
+						} else {
+							tx.put(col, &counter_key, &counter.to_le_bytes());
+						}
+					}
+				}
 			}
 		}
 		self.0.write(tx).map_err(|e| error::DatabaseError(Box::new(e)))
@@ -54,7 +109,7 @@ impl<D: KeyValueDB, H: Clone> Database<H> for DbAdapter<D> {
 		handle_err(self.0.get(col, key))
 	}
 
-	fn lookup(&self, _hash: &H) -> Option<Vec<u8>> {
-		unimplemented!();
+	fn contains(&self, col: ColumnId, key: &[u8]) -> bool {
+		handle_err(self.0.has_key(col, key))
 	}
 }
diff --git a/primitives/database/src/lib.rs b/primitives/database/src/lib.rs
index 7107ea25c02c..1fa0c8e49b01 100644
--- a/primitives/database/src/lib.rs
+++ b/primitives/database/src/lib.rs
@@ -32,16 +32,9 @@ pub type ColumnId = u32;
 pub enum Change<H> {
 	Set(ColumnId, Vec<u8>, Vec<u8>),
 	Remove(ColumnId, Vec<u8>),
-	Store(H, Vec<u8>),
-	Release(H),
-}
-
-/// An alteration to the database that references the data.
-pub enum ChangeRef<'a, H> {
-	Set(ColumnId, &'a [u8], &'a [u8]),
-	Remove(ColumnId, &'a [u8]),
-	Store(H, &'a [u8]),
-	Release(H),
+	Store(ColumnId, H, Vec<u8>),
+	Reference(ColumnId, H),
+	Release(ColumnId, H),
 }
 
 /// A series of changes to the database that can be committed atomically. They do not take effect
@@ -67,49 +60,27 @@ impl<H> Transaction<H> {
 		self.0.push(Change::Remove(col, key.to_vec()))
 	}
 	/// Store the `preimage` of `hash` into the database, so that it may be looked up later with
-	/// `Database::lookup`. This may be called multiple times, but `Database::lookup` but subsequent
+	/// `Database::get`. This may be called multiple times, but subsequent
 	/// calls will ignore `preimage` and simply increase the number of references on `hash`.
-	pub fn store(&mut self, hash: H, preimage: &[u8]) {
-		self.0.push(Change::Store(hash, preimage.to_vec()))
+	pub fn store(&mut self, col: ColumnId, hash: H, preimage: Vec<u8>) {
+		self.0.push(Change::Store(col, hash, preimage))
+	}
+	/// Increase the number of references for `hash` in the database.
+	pub fn reference(&mut self, col: ColumnId, hash: H) {
+		self.0.push(Change::Reference(col, hash))
 	}
 	/// Release the preimage of `hash` from the database. An equal number of these to the number of
-	/// corresponding `store`s must have been given before it is legal for `Database::lookup` to
+	/// corresponding `store`s must have been given before it is legal for `Database::get` to
 	/// be unable to provide the preimage.
-	pub fn release(&mut self, hash: H) {
-		self.0.push(Change::Release(hash))
+	pub fn release(&mut self, col: ColumnId, hash: H) {
+		self.0.push(Change::Release(col, hash))
 	}
 }
 
-pub trait Database<H: Clone>: Send + Sync {
+pub trait Database<H: Clone + AsRef<[u8]>>: Send + Sync {
 	/// Commit the `transaction` to the database atomically. Any further calls to `get` or `lookup`
 	/// will reflect the new state.
-	fn commit(&self, transaction: Transaction<H>) -> error::Result<()> {
-		for change in transaction.0.into_iter() {
-			match change {
-				Change::Set(col, key, value) => self.set(col, &key, &value),
-				Change::Remove(col, key) => self.remove(col, &key),
-				Change::Store(hash, preimage) => self.store(&hash, &preimage),
-				Change::Release(hash) => self.release(&hash),
-			}?;
-		}
-
-		Ok(())
-	}
-
-	/// Commit the `transaction` to the database atomically. Any further calls to `get` or `lookup`
-	/// will reflect the new state.
-	fn commit_ref<'a>(&self, transaction: &mut dyn Iterator<Item=ChangeRef<'a, H>>) -> error::Result<()> {
-		let mut tx = Transaction::new();
-		for change in transaction {
-			match change {
-				ChangeRef::Set(col, key, value) => tx.set(col, key, value),
-				ChangeRef::Remove(col, key) => tx.remove(col, key),
-				ChangeRef::Store(hash, preimage) => tx.store(hash, preimage),
-				ChangeRef::Release(hash) => tx.release(hash),
-			}
-		}
-		self.commit(tx)
-	}
+	fn commit(&self, transaction: Transaction<H>) -> error::Result<()>;
 
 	/// Retrieve the value previously stored against `key` or `None` if
 	/// `key` is not currently in the database.
@@ -120,6 +91,11 @@ pub trait Database<H: Clone>: Send + Sync {
 		self.get(col, key).is_some()
 	}
 
+	/// Check value size in the database possibly without retrieving it.
+	fn value_size(&self, col: ColumnId, key: &[u8]) -> Option<usize> {
+		self.get(col, key).map(|v| v.len())
+	}
+
 	/// Call `f` with the value previously stored against `key`.
 	///
 	/// This may be faster than `get` since it doesn't allocate.
@@ -127,50 +103,6 @@ pub trait Database<H: Clone>: Send + Sync {
 	fn with_get(&self, col: ColumnId, key: &[u8], f: &mut dyn FnMut(&[u8])) {
 		self.get(col, key).map(|v| f(&v));
 	}
-
-	/// Set the value of `key` in `col` to `value`, replacing anything that is there currently.
-	fn set(&self, col: ColumnId, key: &[u8], value: &[u8]) -> error::Result<()> {
-		let mut t = Transaction::new();
-		t.set(col, key, value);
-		self.commit(t)
-	}
-	/// Remove the value of `key` in `col`.
-	fn remove(&self, col: ColumnId, key: &[u8]) -> error::Result<()> {
-		let mut t = Transaction::new();
-		t.remove(col, key);
-		self.commit(t)
-	}
-
-	/// Retrieve the first preimage previously `store`d for `hash` or `None` if no preimage is
-	/// currently stored.
-	fn lookup(&self, hash: &H) -> Option<Vec<u8>>;
-
-	/// Call `f` with the preimage stored for `hash` and return the result, or `None` if no preimage
-	/// is currently stored.
-	///
-	/// This may be faster than `lookup` since it doesn't allocate.
-	/// Use `with_lookup` helper function if you need `f` to return a value from `f`
-	fn with_lookup(&self, hash: &H, f: &mut dyn FnMut(&[u8])) {
-		self.lookup(hash).map(|v| f(&v));
-	}
-
-	/// Store the `preimage` of `hash` into the database, so that it may be looked up later with
-	/// `Database::lookup`. This may be called multiple times, but `Database::lookup` but subsequent
-	/// calls will ignore `preimage` and simply increase the number of references on `hash`.
-	fn store(&self, hash: &H, preimage: &[u8]) -> error::Result<()> {
-		let mut t = Transaction::new();
-		t.store(hash.clone(), preimage);
-		self.commit(t)
-	}
-
-	/// Release the preimage of `hash` from the database. An equal number of these to the number of
-	/// corresponding `store`s must have been given before it is legal for `Database::lookup` to
-	/// be unable to provide the preimage.
-	fn release(&self, hash: &H) -> error::Result<()> {
-		let mut t = Transaction::new();
-		t.release(hash.clone());
-		self.commit(t)
-	}
 }
 
 impl<H> std::fmt::Debug for dyn Database<H> {
@@ -183,20 +115,13 @@ impl<H> std::fmt::Debug for dyn Database<H> {
 /// `key` is not currently in the database.
 ///
 /// This may be faster than `get` since it doesn't allocate.
-pub fn with_get<R, H: Clone>(db: &dyn Database<H>, col: ColumnId, key: &[u8], mut f: impl FnMut(&[u8]) -> R) -> Option<R> {
+pub fn with_get<R, H: Clone + AsRef<[u8]>>(
+	db: &dyn Database<H>,
+	col: ColumnId,
+	key: &[u8], mut f: impl FnMut(&[u8]) -> R
+) -> Option<R> {
 	let mut result: Option<R> = None;
 	let mut adapter = |k: &_| { result = Some(f(k)); };
 	db.with_get(col, key, &mut adapter);
 	result
 }
-
-/// Call `f` with the preimage stored for `hash` and return the result, or `None` if no preimage
-/// is currently stored.
-///
-/// This may be faster than `lookup` since it doesn't allocate.
-pub fn with_lookup<R, H: Clone>(db: &dyn Database<H>, hash: &H, mut f: impl FnMut(&[u8]) -> R) -> Option<R> {
-	let mut result: Option<R> = None;
-	let mut adapter = |k: &_| { result = Some(f(k)); };
-	db.with_lookup(hash, &mut adapter);
-	result
-}
diff --git a/primitives/database/src/mem.rs b/primitives/database/src/mem.rs
index 41af2e2f235c..24ddf0331971 100644
--- a/primitives/database/src/mem.rs
+++ b/primitives/database/src/mem.rs
@@ -17,26 +17,41 @@
 
 //! In-memory implementation of `Database`
 
-use std::collections::HashMap;
+use std::collections::{HashMap, hash_map::Entry};
 use crate::{Database, Change, ColumnId, Transaction, error};
 use parking_lot::RwLock;
 
 #[derive(Default)]
 /// This implements `Database` as an in-memory hash map. `commit` is not atomic.
-pub struct MemDb<H: Clone + Send + Sync + Eq + PartialEq + Default + std::hash::Hash>
-	(RwLock<(HashMap<ColumnId, HashMap<Vec<u8>, Vec<u8>>>, HashMap<H, Vec<u8>>)>);
+pub struct MemDb(RwLock<HashMap<ColumnId, HashMap<Vec<u8>, (u32, Vec<u8>)>>>);
 
-impl<H> Database<H> for MemDb<H>
-	where H: Clone + Send + Sync + Eq + PartialEq + Default + std::hash::Hash
+impl<H> Database<H> for MemDb
+	where H: Clone + AsRef<[u8]>
 {
 	fn commit(&self, transaction: Transaction<H>) -> error::Result<()> {
 		let mut s = self.0.write();
 		for change in transaction.0.into_iter() {
 			match change {
-				Change::Set(col, key, value) => { s.0.entry(col).or_default().insert(key, value); },
-				Change::Remove(col, key) => { s.0.entry(col).or_default().remove(&key); },
-				Change::Store(hash, preimage) => { s.1.insert(hash, preimage); },
-				Change::Release(hash) => { s.1.remove(&hash); },
+				Change::Set(col, key, value) => { s.entry(col).or_default().insert(key, (1, value)); },
+				Change::Remove(col, key) => { s.entry(col).or_default().remove(&key); },
+				Change::Store(col, hash, value) => {
+					s.entry(col).or_default().entry(hash.as_ref().to_vec())
+						.and_modify(|(c, _)| *c += 1)
+						.or_insert_with(|| (1, value));
+				},
+				Change::Reference(col, hash) => {
+					if let Entry::Occupied(mut entry) = s.entry(col).or_default().entry(hash.as_ref().to_vec()) {
+						entry.get_mut().0 += 1;
+					}
+				}
+				Change::Release(col, hash) => {
+					if let Entry::Occupied(mut entry) = s.entry(col).or_default().entry(hash.as_ref().to_vec()) {
+						entry.get_mut().0 -= 1;
+						if entry.get().0 == 0 {
+							entry.remove();
+						}
+					}
+				}
 			}
 		}
 
@@ -45,18 +60,11 @@ impl<H> Database<H> for MemDb<H>
 
 	fn get(&self, col: ColumnId, key: &[u8]) -> Option<Vec<u8>> {
 		let s = self.0.read();
-		s.0.get(&col).and_then(|c| c.get(key).cloned())
-	}
-
-	fn lookup(&self, hash: &H) -> Option<Vec<u8>> {
-		let s = self.0.read();
-		s.1.get(hash).cloned()
+		s.get(&col).and_then(|c| c.get(key).map(|(_, v)| v.clone()))
 	}
 }
 
-impl<H> MemDb<H>
-	where H: Clone + Send + Sync + Eq + PartialEq + Default + std::hash::Hash
-{
+impl MemDb {
 	/// Create a new instance
 	pub fn new() -> Self {
 		MemDb::default()
@@ -65,7 +73,7 @@ impl<H> MemDb<H>
 	/// Count number of values in a column
 	pub fn count(&self, col: ColumnId) -> usize {
 		let s = self.0.read();
-		s.0.get(&col).map(|c| c.len()).unwrap_or(0)
+		s.get(&col).map(|c| c.len()).unwrap_or(0)
 	}
 }
 
diff --git a/primitives/externalities/src/lib.rs b/primitives/externalities/src/lib.rs
index 3ee37f5e31b9..1077f41048d5 100644
--- a/primitives/externalities/src/lib.rs
+++ b/primitives/externalities/src/lib.rs
@@ -228,6 +228,16 @@ pub trait Externalities: ExtensionStore {
 	/// no transaction is open that can be closed.
 	fn storage_commit_transaction(&mut self) -> Result<(), ()>;
 
+	/// Index specified transaction slice and store it.
+	fn storage_index_transaction(&mut self, _index: u32, _offset: u32) {
+		unimplemented!("storage_index_transaction");
+	}
+
+	/// Renew existing piece of transaction storage.
+	fn storage_renew_transaction_index(&mut self, _index: u32, _hash: &[u8], _size: u32) {
+		unimplemented!("storage_renew_transaction_index");
+	}
+
 	/// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 	/// Benchmarking related functionality and shouldn't be used anywhere else!
 	/// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/primitives/state-machine/src/ext.rs b/primitives/state-machine/src/ext.rs
index 7907cda6fb4e..65b7b638a9a2 100644
--- a/primitives/state-machine/src/ext.rs
+++ b/primitives/state-machine/src/ext.rs
@@ -18,7 +18,7 @@
 //! Concrete externalities implementation.
 
 use crate::{
-	StorageKey, StorageValue, OverlayedChanges,
+	StorageKey, StorageValue, OverlayedChanges, IndexOperation,
 	backend::Backend, overlayed_changes::OverlayedExtensions,
 };
 use hash_db::Hasher;
@@ -568,6 +568,36 @@ where
 		}
 	}
 
+	fn storage_index_transaction(&mut self, index: u32, offset: u32) {
+		trace!(
+			target: "state",
+			"{:04x}: IndexTransaction ({}): [{}..]",
+			self.id,
+			index,
+			offset,
+		);
+		self.overlay.add_transaction_index(IndexOperation::Insert {
+			extrinsic: index,
+			offset,
+		});
+	}
+
+	/// Renew existing piece of data storage.
+	fn storage_renew_transaction_index(&mut self, index: u32, hash: &[u8], size: u32) {
+		trace!(
+			target: "state",
+			"{:04x}: RenewTransactionIndex ({}) {} bytes",
+			self.id,
+			HexDisplay::from(&hash),
+			size,
+		);
+		self.overlay.add_transaction_index(IndexOperation::Renew {
+			extrinsic: index,
+			hash: hash.to_vec(),
+			size
+		});
+	}
+
 	#[cfg(not(feature = "std"))]
 	fn storage_changes_root(&mut self, _parent_hash: &[u8]) -> Result<Option<Vec<u8>>, ()> {
 		Ok(None)
diff --git a/primitives/state-machine/src/lib.rs b/primitives/state-machine/src/lib.rs
index 0167633d4807..0a664840df85 100644
--- a/primitives/state-machine/src/lib.rs
+++ b/primitives/state-machine/src/lib.rs
@@ -121,6 +121,7 @@ pub use crate::overlayed_changes::{
 	StorageChanges, StorageTransactionCache,
 	OffchainChangesCollection,
 	OffchainOverlayedChanges,
+	IndexOperation,
 };
 pub use crate::backend::Backend;
 pub use crate::trie_backend_essence::{TrieBackendStorage, Storage};
diff --git a/primitives/state-machine/src/overlayed_changes/mod.rs b/primitives/state-machine/src/overlayed_changes/mod.rs
index 285bf2a73a14..1d3cbb59ba0c 100644
--- a/primitives/state-machine/src/overlayed_changes/mod.rs
+++ b/primitives/state-machine/src/overlayed_changes/mod.rs
@@ -103,12 +103,35 @@ pub struct OverlayedChanges {
 	children: Map<StorageKey, (OverlayedChangeSet, ChildInfo)>,
 	/// Offchain related changes.
 	offchain: OffchainOverlayedChanges,
+	/// Transaction index changes,
+	transaction_index_ops: Vec<IndexOperation>,
 	/// True if extrinsics stats must be collected.
 	collect_extrinsics: bool,
 	/// Collect statistic on this execution.
 	stats: StateMachineStats,
 }
 
+/// Transcation index operation.
+#[derive(Debug, Clone)]
+pub enum IndexOperation {
+	/// Insert transaction into index.
+	Insert {
+		/// Extrinsic index in the current block.
+		extrinsic: u32,
+		/// Data offset in the extrinsic.
+		offset: u32,
+	},
+	/// Renew existing transaction storage.
+	Renew {
+		/// Extrinsic index in the current block.
+		extrinsic: u32,
+		/// Referenced index hash.
+		hash: Vec<u8>,
+		/// Expected data size.
+		size: u32,
+	}
+}
+
 /// A storage changes structure that can be generated by the data collected in [`OverlayedChanges`].
 ///
 /// This contains all the changes to the storage and transactions to apply theses changes to the
@@ -137,6 +160,10 @@ pub struct StorageChanges<Transaction, H: Hasher, N: BlockNumber> {
 	/// Phantom data for block number until change trie support no_std.
 	#[cfg(not(feature = "std"))]
 	pub _ph: sp_std::marker::PhantomData<N>,
+
+	/// Changes to the transaction index,
+	#[cfg(feature = "std")]
+	pub transaction_index_changes: Vec<IndexOperation>,
 }
 
 #[cfg(feature = "std")]
@@ -149,6 +176,7 @@ impl<Transaction, H: Hasher, N: BlockNumber> StorageChanges<Transaction, H, N> {
 		Transaction,
 		H::Out,
 		Option<ChangesTrieTransaction<H, N>>,
+		Vec<IndexOperation>,
 	) {
 		(
 			self.main_storage_changes,
@@ -157,6 +185,7 @@ impl<Transaction, H: Hasher, N: BlockNumber> StorageChanges<Transaction, H, N> {
 			self.transaction,
 			self.transaction_storage_root,
 			self.changes_trie_transaction,
+			self.transaction_index_changes,
 		)
 	}
 }
@@ -214,6 +243,8 @@ impl<Transaction: Default, H: Hasher, N: BlockNumber> Default for StorageChanges
 			changes_trie_transaction: None,
 			#[cfg(not(feature = "std"))]
 			_ph: Default::default(),
+			#[cfg(feature = "std")]
+			transaction_index_changes: Default::default(),
 		}
 	}
 }
@@ -543,6 +574,9 @@ impl OverlayedChanges {
 		let (main_storage_changes, child_storage_changes) = self.drain_committed();
 		let offchain_storage_changes = self.offchain_drain_committed().collect();
 
+		#[cfg(feature = "std")]
+		let transaction_index_changes = std::mem::take(&mut self.transaction_index_ops);
+
 		Ok(StorageChanges {
 			main_storage_changes: main_storage_changes.collect(),
 			child_storage_changes: child_storage_changes.map(|(sk, it)| (sk, it.0.collect())).collect(),
@@ -551,6 +585,8 @@ impl OverlayedChanges {
 			transaction_storage_root,
 			#[cfg(feature = "std")]
 			changes_trie_transaction,
+			#[cfg(feature = "std")]
+			transaction_index_changes,
 			#[cfg(not(feature = "std"))]
 			_ph: Default::default(),
 		})
@@ -666,6 +702,11 @@ impl OverlayedChanges {
 			None => self.offchain.remove(STORAGE_PREFIX, key),
 		}
 	}
+
+	/// Add transaction index operation.
+	pub fn add_transaction_index(&mut self, op: IndexOperation) {
+		self.transaction_index_ops.push(op)
+	}
 }
 
 #[cfg(feature = "std")]

From f8a58bd6c55eee66282675c9d0b6d0808e6ce36b Mon Sep 17 00:00:00 2001
From: sacha-l <alexander.lansky@gmail.com>
Date: Thu, 18 Mar 2021 12:20:02 -0400
Subject: [PATCH 0526/1194] doc(frame): [nitpicks] (#8396)

---
 frame/collective/README.md | 12 ++++++------
 frame/contracts/src/lib.rs |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/frame/collective/README.md b/frame/collective/README.md
index f62df65f728c..444927e51da2 100644
--- a/frame/collective/README.md
+++ b/frame/collective/README.md
@@ -7,19 +7,19 @@ The pallet assumes that the amount of members stays at or below `MaxMembers` for
 calculations, but enforces this neither in `set_members` nor in `change_members_sorted`.
 
 A "prime" member may be set to help determine the default vote behavior based on chain
-config. If `PreimDefaultVote` is used, the prime vote acts as the default vote in case of any
+config. If `PrimeDefaultVote` is used, the prime vote acts as the default vote in case of any
 abstentions after the voting period. If `MoreThanMajorityThenPrimeDefaultVote` is used, then
 abstentations will first follow the majority of the collective voting, and then the prime
 member.
 
-Voting happens through motions comprising a proposal (i.e. a curried dispatchable) plus a
+Voting happens through motions comprising a proposal (i.e. a dispatchable) plus a
 number of approvals required for it to pass and be called. Motions are open for members to
-vote on for a minimum period given by `MotionDuration`. As soon as the needed number of
+vote on for a minimum period given by `MotionDuration`. As soon as the required number of
 approvals is given, the motion is closed and executed. If the number of approvals is not reached
 during the voting period, then `close` may be called by any account in order to force the end
-the motion explicitly. If a prime member is defined then their vote is used in place of any
+the motion explicitly. If a prime member is defined, then their vote is used instead of any
 abstentions and the proposal is executed if there are enough approvals counting the new votes.
 
-If there are not, or if no prime is set, then the motion is dropped without being executed.
+If there are not, or if no prime member is set, then the motion is dropped without being executed.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index b12bb9214576..880bf0b89820 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -221,7 +221,7 @@ pub mod pallet {
 		#[pallet::constant]
 		type MaxValueSize: Get<u32>;
 
-		/// Used to answer contracts's queries regarding the current weight price. This is **not**
+		/// Used to answer contracts' queries regarding the current weight price. This is **not**
 		/// used to calculate the actual fee and is only for informational purposes.
 		type WeightPrice: Convert<Weight, BalanceOf<Self>>;
 

From 4365fa6f95f0de4a97d0238cef7111f1e284da97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Thu, 18 Mar 2021 20:24:05 +0100
Subject: [PATCH 0527/1194] Better description for assert in frame-session
 genesis (#8399)

* Better description for assert in frame-session genesis

There is an assert that checks that an account exists, after setting a
key. However, this assert isn't very self-descriptive.

* Update frame/session/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
---
 frame/session/src/lib.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs
index ce924f1400fa..d9d5c81e8a50 100644
--- a/frame/session/src/lib.rs
+++ b/frame/session/src/lib.rs
@@ -442,7 +442,11 @@ decl_storage! {
 			for (account, val, keys) in config.keys.iter().cloned() {
 				<Module<T>>::inner_set_keys(&val, keys)
 					.expect("genesis config must not contain duplicates; qed");
-				assert!(frame_system::Pallet::<T>::inc_consumers(&account).is_ok());
+				assert!(
+					frame_system::Pallet::<T>::inc_consumers(&account).is_ok(),
+					"Account ({:?}) does not exist at genesis to set key. Account not endowed?",
+					account,
+				);
 			}
 
 			let initial_validators_0 = T::SessionManager::new_session(0)

From b0667821e61f4790da84930b7cdb80fb20b48596 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Fri, 19 Mar 2021 09:32:22 +0100
Subject: [PATCH 0528/1194] Compute yearly inflation on-chain allowing to
 change x_ideal according to number of slots. (#8332)

* new crate

* Update frame/staking/reward-fn/src/lib.rs

Co-authored-by: Gavin Wood <gavin@parity.io>

* fix doc

Co-authored-by: Gavin Wood <gavin@parity.io>
---
 Cargo.lock                            |   8 +
 Cargo.toml                            |   1 +
 frame/staking/reward-fn/Cargo.toml    |  25 +++
 frame/staking/reward-fn/src/lib.rs    | 235 ++++++++++++++++++++++++++
 frame/staking/reward-fn/tests/test.rs | 101 +++++++++++
 5 files changed, 370 insertions(+)
 create mode 100644 frame/staking/reward-fn/Cargo.toml
 create mode 100644 frame/staking/reward-fn/src/lib.rs
 create mode 100644 frame/staking/reward-fn/tests/test.rs

diff --git a/Cargo.lock b/Cargo.lock
index 100461b20991..caad06f6805e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5372,6 +5372,14 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "pallet-staking-reward-fn"
+version = "3.0.0"
+dependencies = [
+ "log",
+ "sp-arithmetic",
+]
+
 [[package]]
 name = "pallet-sudo"
 version = "3.0.0"
diff --git a/Cargo.toml b/Cargo.toml
index ef2613979518..742b1f87dbdc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -107,6 +107,7 @@ members = [
 	"frame/staking",
 	"frame/staking/fuzzer",
 	"frame/staking/reward-curve",
+	"frame/staking/reward-fn",
 	"frame/sudo",
 	"frame/support",
 	"frame/support/procedural",
diff --git a/frame/staking/reward-fn/Cargo.toml b/frame/staking/reward-fn/Cargo.toml
new file mode 100644
index 000000000000..15b17a5e716c
--- /dev/null
+++ b/frame/staking/reward-fn/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+name = "pallet-staking-reward-fn"
+version = "3.0.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
+license = "Apache-2.0"
+homepage = "https://substrate.dev"
+repository = "https://github.com/paritytech/substrate/"
+description = "Reward function for FRAME staking pallet"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+
+[dependencies]
+sp-arithmetic = { version = "3.0.0", default-features = false, path = "../../../primitives/arithmetic" }
+log = { version = "0.4.14", default-features = false }
+
+[features]
+default = ["std"]
+std = [
+	"sp-arithmetic/std",
+	"log/std",
+]
diff --git a/frame/staking/reward-fn/src/lib.rs b/frame/staking/reward-fn/src/lib.rs
new file mode 100644
index 000000000000..b697842fa69b
--- /dev/null
+++ b/frame/staking/reward-fn/src/lib.rs
@@ -0,0 +1,235 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Useful function for inflation for nominated proof of stake.
+
+use sp_arithmetic::{Perquintill, PerThing, biguint::BigUint, traits::{Zero, SaturatedConversion}};
+use core::convert::TryFrom;
+
+/// Compute yearly inflation using function
+///
+/// ```ignore
+/// I(x) = for x between 0 and x_ideal: x / x_ideal,
+/// for x between x_ideal and 1: 2^((x_ideal - x) / d)
+/// ```
+///
+/// where:
+/// * x is the stake rate, i.e. fraction of total issued tokens that actively staked behind
+///   validators.
+/// * d is the falloff or `decay_rate`
+/// * x_ideal: the ideal stake rate.
+///
+/// The result is meant to be scaled with minimum inflation and maximum inflation.
+///
+/// (as detailed
+/// [here](https://research.web3.foundation/en/latest/polkadot/economics/1-token-economics.html#inflation-model-with-parachains))
+///
+/// Arguments are:
+/// * `stake`:
+///   The fraction of total issued tokens that actively staked behind
+///   validators. Known as `x` in the literature.
+///   Must be between 0 and 1.
+/// * `ideal_stake`:
+///   The fraction of total issued tokens that should be actively staked behind
+///   validators. Known as `x_ideal` in the literature.
+///   Must be between 0 and 1.
+/// * `falloff`:
+///   Known as `decay_rate` in the literature. A co-efficient dictating the strength of
+///   the global incentivization to get the `ideal_stake`. A higher number results in less typical
+///   inflation at the cost of greater volatility for validators.
+///   Must be more than 0.01.
+pub fn compute_inflation<P: PerThing>(
+	stake: P,
+	ideal_stake: P,
+	falloff: P,
+) -> P {
+	if stake < ideal_stake {
+		// ideal_stake is more than 0 because it is strictly more than stake
+		return stake / ideal_stake
+	}
+
+	if falloff < P::from_percent(1.into()) {
+		log::error!("Invalid inflation computation: falloff less than 1% is not supported");
+		return PerThing::zero()
+	}
+
+	let accuracy = {
+		let mut a = BigUint::from(Into::<u128>::into(P::ACCURACY));
+		a.lstrip();
+		a
+	};
+	
+	let mut falloff = BigUint::from(falloff.deconstruct().into());
+	falloff.lstrip();
+
+	let ln2 = {
+		let ln2 = P::from_rational(LN2.deconstruct().into(), Perquintill::ACCURACY.into());
+		BigUint::from(ln2.deconstruct().into())
+	};
+
+	// falloff is stripped above.
+	let ln2_div_d = div_by_stripped(ln2.mul(&accuracy), &falloff);
+
+	let inpos_param = INPoSParam {
+		x_ideal: BigUint::from(ideal_stake.deconstruct().into()),
+		x: BigUint::from(stake.deconstruct().into()),
+		accuracy,
+		ln2_div_d,
+	};
+
+	let res = compute_taylor_serie_part(&inpos_param);
+
+	match u128::try_from(res.clone()) {
+		Ok(res) if res <= Into::<u128>::into(P::ACCURACY) => {
+			P::from_parts(res.saturated_into())
+		},
+		// If result is beyond bounds there is nothing we can do
+		_ => {
+			log::error!("Invalid inflation computation: unexpected result {:?}", res);
+			P::zero()
+		},
+	}
+}
+
+
+/// Internal struct holding parameter info alongside other cached value.
+///
+/// All expressed in part from `accuracy`
+struct INPoSParam {
+	ln2_div_d: BigUint,
+	x_ideal: BigUint,
+	x: BigUint,
+	/// Must be stripped and have no leading zeros.
+	accuracy: BigUint,
+}
+
+/// `ln(2)` expressed in as perquintillionth.
+const LN2: Perquintill = Perquintill::from_parts(0_693_147_180_559_945_309);
+
+/// Compute `2^((x_ideal - x) / d)` using taylor serie.
+///
+/// x must be strictly more than x_ideal.
+///
+/// result is expressed with accuracy `INPoSParam.accuracy`
+fn compute_taylor_serie_part(p: &INPoSParam) -> BigUint {
+	// The last computed taylor term.
+	let mut last_taylor_term = p.accuracy.clone();
+
+	// Whereas taylor sum is positive.
+	let mut taylor_sum_positive = true;
+
+	// The sum of all taylor term.
+	let mut taylor_sum = last_taylor_term.clone();
+
+	for k in 1..300 {
+		last_taylor_term = compute_taylor_term(k, &last_taylor_term, p);
+
+		if last_taylor_term.is_zero() {
+			break
+		}
+
+		let last_taylor_term_positive = k % 2 == 0;
+
+		if taylor_sum_positive == last_taylor_term_positive {
+			taylor_sum = taylor_sum.add(&last_taylor_term);
+		} else {
+			if taylor_sum >= last_taylor_term {
+				taylor_sum = taylor_sum.sub(&last_taylor_term)
+					// NOTE: Should never happen as checked above
+					.unwrap_or_else(|e| e);
+			} else {
+				taylor_sum_positive = !taylor_sum_positive;
+				taylor_sum = last_taylor_term.clone().sub(&taylor_sum)
+					// NOTE: Should never happen as checked above
+					.unwrap_or_else(|e| e);
+			}
+		}
+	}
+
+	if !taylor_sum_positive {
+		return BigUint::zero()
+	}
+
+	taylor_sum.lstrip();
+	taylor_sum
+}
+
+/// Return the absolute value of k-th taylor term of `2^((x_ideal - x))/d` i.e.
+/// `((x - x_ideal) * ln(2) / d)^k / k!`
+///
+/// x must be strictly more x_ideal.
+///
+/// We compute the term from the last term using this formula:
+///
+/// `((x - x_ideal) * ln(2) / d)^k / k! == previous_term * (x - x_ideal) * ln(2) / d / k`
+///
+/// `previous_taylor_term` and result are expressed with accuracy `INPoSParam.accuracy`
+fn compute_taylor_term(k: u32, previous_taylor_term: &BigUint, p: &INPoSParam) -> BigUint {
+	let x_minus_x_ideal = p.x.clone().sub(&p.x_ideal)
+		// NOTE: Should never happen, as x must be more than x_ideal
+		.unwrap_or_else(|_| BigUint::zero());
+
+	let res = previous_taylor_term.clone()
+		.mul(&x_minus_x_ideal)
+		.mul(&p.ln2_div_d)
+		.div_unit(k);
+
+	// p.accuracy is stripped by definition.
+	let res = div_by_stripped(res, &p.accuracy);
+	let mut res = div_by_stripped(res, &p.accuracy);
+
+	res.lstrip();
+	res
+}
+
+/// Compute a div b.
+///
+/// requires `b` to be stripped and have no leading zeros.
+fn div_by_stripped(mut a: BigUint, b: &BigUint) -> BigUint {
+	a.lstrip();
+
+	if b.len() == 0 {
+		log::error!("Computation error: Invalid division");
+		return BigUint::zero()
+	}
+
+	if b.len() == 1 {
+		return a.div_unit(b.checked_get(0).unwrap_or(1))
+	}
+
+	if b.len() > a.len() {
+		return BigUint::zero()
+	}
+
+	if b.len() == a.len() {
+		// 100_000^2 is more than 2^32-1, thus `new_a` has more limbs than `b`.
+		let mut new_a = a.mul(&BigUint::from(100_000u64.pow(2)));
+		new_a.lstrip();
+
+		debug_assert!(new_a.len() > b.len());
+		return new_a
+			.div(b, false)
+			.map(|res| res.0)
+			.unwrap_or_else(|| BigUint::zero())
+			.div_unit(100_000)
+			.div_unit(100_000)
+	}
+	
+	a.div(b, false)
+		.map(|res| res.0)
+		.unwrap_or_else(|| BigUint::zero())
+}
diff --git a/frame/staking/reward-fn/tests/test.rs b/frame/staking/reward-fn/tests/test.rs
new file mode 100644
index 000000000000..32daf9d09a76
--- /dev/null
+++ b/frame/staking/reward-fn/tests/test.rs
@@ -0,0 +1,101 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use sp_arithmetic::{PerThing, Perbill, PerU16, Percent, Perquintill};
+
+/// This test the precision and panics if error too big error.
+///
+/// error is asserted to be less or equal to 8/accuracy or 8*f64::EPSILON
+fn test_precision<P: PerThing>(stake: P, ideal_stake: P, falloff: P) {
+	let accuracy_f64 = Into::<u128>::into(P::ACCURACY) as f64;
+	let res = pallet_staking_reward_fn::compute_inflation(stake, ideal_stake, falloff);
+	let res = Into::<u128>::into(res.deconstruct()) as f64 / accuracy_f64;
+
+	let expect = float_i_npos(stake, ideal_stake, falloff);
+
+	let error = (res - expect).abs();
+
+	if error > 8f64 / accuracy_f64 && error > 8.0 * f64::EPSILON {
+		panic!(
+			"stake: {:?}, ideal_stake: {:?}, falloff: {:?}, res: {}, expect: {}",
+			stake, ideal_stake, falloff, res , expect
+		);
+	}
+}
+
+/// compute the inflation using floats
+fn float_i_npos<P: PerThing>(stake: P, ideal_stake: P, falloff: P) -> f64 {
+	let accuracy_f64 = Into::<u128>::into(P::ACCURACY) as f64;
+
+	let ideal_stake = Into::<u128>::into(ideal_stake.deconstruct()) as f64 / accuracy_f64;
+	let stake = Into::<u128>::into(stake.deconstruct()) as f64 / accuracy_f64;
+	let falloff = Into::<u128>::into(falloff.deconstruct()) as f64 / accuracy_f64;
+
+	let x_ideal = ideal_stake;
+	let x = stake;
+	let d = falloff;
+
+	if x < x_ideal {
+		x / x_ideal
+	} else {
+		2_f64.powf((x_ideal - x) / d)
+	}
+}
+
+#[test]
+fn test_precision_for_minimum_falloff() {
+	fn test_falloff_precision_for_minimum_falloff<P: PerThing>() {
+		for stake in 0..1_000 {
+			let stake = P::from_rational(stake, 1_000);
+			let ideal_stake = P::zero();
+			let falloff = P::from_rational(1, 100);
+			test_precision(stake, ideal_stake, falloff);
+		}
+	}
+
+	test_falloff_precision_for_minimum_falloff::<Perquintill>();
+
+	test_falloff_precision_for_minimum_falloff::<PerU16>();
+
+	test_falloff_precision_for_minimum_falloff::<Perbill>();
+
+	test_falloff_precision_for_minimum_falloff::<Percent>();
+}
+
+#[test]
+fn compute_inflation_works() {
+	fn compute_inflation_works<P: PerThing>() {
+		for stake in 0..100 {
+			for ideal_stake in 0..10 {
+				for falloff in 1..10 {
+					let stake = P::from_rational(stake, 100);
+					let ideal_stake = P::from_rational(ideal_stake, 10);
+					let falloff = P::from_rational(falloff, 100);
+					test_precision(stake, ideal_stake, falloff);
+				}
+			}
+		}
+	}
+
+	compute_inflation_works::<Perquintill>();
+
+	compute_inflation_works::<PerU16>();
+
+	compute_inflation_works::<Perbill>();
+
+	compute_inflation_works::<Percent>();
+}

From bb8ab898e042e90eea3cdd3325f533f39562934f Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Fri, 19 Mar 2021 20:47:28 +0100
Subject: [PATCH 0529/1194] Make work for no_std (#8402)

---
 frame/staking/reward-fn/src/lib.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frame/staking/reward-fn/src/lib.rs b/frame/staking/reward-fn/src/lib.rs
index b697842fa69b..6c54fec9239e 100644
--- a/frame/staking/reward-fn/src/lib.rs
+++ b/frame/staking/reward-fn/src/lib.rs
@@ -15,6 +15,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#![cfg_attr(not(feature = "std"), no_std)]
+
 //! Useful function for inflation for nominated proof of stake.
 
 use sp_arithmetic::{Perquintill, PerThing, biguint::BigUint, traits::{Zero, SaturatedConversion}};
@@ -72,7 +74,7 @@ pub fn compute_inflation<P: PerThing>(
 		a.lstrip();
 		a
 	};
-	
+
 	let mut falloff = BigUint::from(falloff.deconstruct().into());
 	falloff.lstrip();
 
@@ -228,7 +230,7 @@ fn div_by_stripped(mut a: BigUint, b: &BigUint) -> BigUint {
 			.div_unit(100_000)
 			.div_unit(100_000)
 	}
-	
+
 	a.div(b, false)
 		.map(|res| res.0)
 		.unwrap_or_else(|| BigUint::zero())

From 283bb60954d6809a76e52619e58c78fb8053e3eb Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Sat, 20 Mar 2021 09:43:47 +0100
Subject: [PATCH 0530/1194] Decouple Staking and Election - Part 2.1: Unleash
 Multi Phase (#8113)

* Base features and traits.

* pallet and unsigned phase

* Undo bad formattings.

* some formatting cleanup.

* Small self-cleanup.

* Make it all build

* self-review

* Some doc tests.

* Some changes from other PR

* Fix session test

* Update Cargo.lock

* Update frame/election-provider-multi-phase/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Some review comments

* Rename + make encode/decode

* Do an assert as well, just in case.

* Fix build

* Update frame/election-provider-multi-phase/src/unsigned.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Las comment

* fix staking fuzzer.

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_election_provider_multi_phase --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/election-provider-multi-phase/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Add one last layer of feasibility check as well.

* Last fixes to benchmarks

* Some more docs.

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_election_provider_multi_phase --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/election-provider-multi-phase/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_election_provider_multi_phase --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/election-provider-multi-phase/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Some nits

* It all works

* Some self cleanup

* Update frame/staking/src/lib.rs

Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>

* remove most todos.

* Round of self-review.

* Fix migration

* clean macro

* Revert wrong merge

* remove fuzzer stuff.

* Self review

* Update frame/staking/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* review comments

* add logs

* Add tests to demonstrate the capacity of the snapshot.

* Replace upgrade

* Last touches

* Fix benchmakrs

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_election_provider_multi_phase --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/election-provider-multi-phase/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* remove unused stuff

* Fix tests.

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
---
 Cargo.lock                                    |   24 +-
 Cargo.toml                                    |    1 -
 bin/node/runtime/src/lib.rs                   |   22 +-
 frame/babe/src/mock.rs                        |    6 -
 .../src/unsigned.rs                           |    3 +-
 .../src/weights.rs                            |   86 +-
 frame/election-provider-support/src/lib.rs    |    4 +-
 frame/grandpa/src/mock.rs                     |    8 +-
 frame/offences/benchmarking/src/lib.rs        |    4 +-
 frame/offences/benchmarking/src/mock.rs       |    8 +-
 frame/session/benchmarking/src/mock.rs        |    8 +-
 frame/staking/Cargo.toml                      |    4 +-
 frame/staking/fuzzer/.gitignore               |    2 -
 frame/staking/fuzzer/Cargo.lock               | 2294 -----------------
 frame/staking/fuzzer/Cargo.toml               |   41 -
 frame/staking/fuzzer/src/submit_solution.rs   |  183 --
 frame/staking/src/benchmarking.rs             |  239 +-
 frame/staking/src/lib.rs                      | 1254 ++-------
 frame/staking/src/mock.rs                     |  221 +-
 frame/staking/src/offchain_election.rs        |  598 -----
 frame/staking/src/testing_utils.rs            |  226 +-
 frame/staking/src/tests.rs                    | 1427 +---------
 frame/staking/src/weights.rs                  |  315 +--
 23 files changed, 430 insertions(+), 6548 deletions(-)
 delete mode 100644 frame/staking/fuzzer/.gitignore
 delete mode 100644 frame/staking/fuzzer/Cargo.lock
 delete mode 100644 frame/staking/fuzzer/Cargo.toml
 delete mode 100644 frame/staking/fuzzer/src/submit_solution.rs
 delete mode 100644 frame/staking/src/offchain_election.rs

diff --git a/Cargo.lock b/Cargo.lock
index caad06f6805e..7dfafef08f7e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5323,6 +5323,7 @@ dependencies = [
  "pallet-timestamp",
  "parity-scale-codec",
  "parking_lot 0.11.1",
+ "paste 1.0.4",
  "rand_chacha 0.2.2",
  "serde",
  "sp-application-crypto",
@@ -5338,29 +5339,6 @@ dependencies = [
  "substrate-test-utils",
 ]
 
-[[package]]
-name = "pallet-staking-fuzz"
-version = "0.0.0"
-dependencies = [
- "frame-election-provider-support",
- "frame-support",
- "frame-system",
- "honggfuzz",
- "pallet-balances",
- "pallet-indices",
- "pallet-session",
- "pallet-staking",
- "pallet-staking-reward-curve",
- "pallet-timestamp",
- "parity-scale-codec",
- "serde",
- "sp-core",
- "sp-io",
- "sp-npos-elections",
- "sp-runtime",
- "sp-std",
-]
-
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "3.0.0"
diff --git a/Cargo.toml b/Cargo.toml
index 742b1f87dbdc..9675070a516f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -105,7 +105,6 @@ members = [
 	"frame/session/benchmarking",
 	"frame/society",
 	"frame/staking",
-	"frame/staking/fuzzer",
 	"frame/staking/reward-curve",
 	"frame/staking/reward-fn",
 	"frame/sudo",
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 12de6d54aaf3..fd25c900da4e 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -468,14 +468,6 @@ parameter_types! {
 	pub const SlashDeferDuration: pallet_staking::EraIndex = 24 * 7; // 1/4 the bonding duration.
 	pub const RewardCurve: &'static PiecewiseLinear<'static> = &REWARD_CURVE;
 	pub const MaxNominatorRewardedPerValidator: u32 = 256;
-	pub const ElectionLookahead: BlockNumber = EPOCH_DURATION_IN_BLOCKS / 4;
-	pub const MaxIterations: u32 = 10;
-	// 0.05%. The higher the value, the more strict solution acceptance becomes.
-	pub MinSolutionScoreBump: Perbill = Perbill::from_rational(5u32, 10_000);
-	pub OffchainSolutionWeightLimit: Weight = RuntimeBlockWeights::get()
-		.get(DispatchClass::Normal)
-		.max_extrinsic.expect("Normal extrinsics have a weight limit configured; qed")
-		.saturating_sub(BlockExecutionWeight::get());
 }
 
 impl pallet_staking::Config for Runtime {
@@ -499,14 +491,6 @@ impl pallet_staking::Config for Runtime {
 	type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
 	type NextNewSession = Session;
 	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
-	type ElectionLookahead = ElectionLookahead;
-	type Call = Call;
-	type MaxIterations = MaxIterations;
-	type MinSolutionScoreBump = MinSolutionScoreBump;
-	type UnsignedPriority = StakingUnsignedPriority;
-	// The unsigned solution weight targeted by the OCW. We set it to the maximum possible value of
-	// a single extrinsic.
-	type OffchainSolutionWeightLimit = OffchainSolutionWeightLimit;
 	type ElectionProvider = ElectionProviderMultiPhase;
 	type WeightInfo = pallet_staking::weights::SubstrateWeight<Runtime>;
 }
@@ -518,7 +502,7 @@ parameter_types! {
 
 	// fallback: no need to do on-chain phragmen initially.
 	pub const Fallback: pallet_election_provider_multi_phase::FallbackStrategy =
-		pallet_election_provider_multi_phase::FallbackStrategy::Nothing;
+		pallet_election_provider_multi_phase::FallbackStrategy::OnChain;
 
 	pub SolutionImprovementThreshold: Perbill = Perbill::from_rational(1u32, 10_000);
 
@@ -536,7 +520,7 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
 	type Currency = Balances;
 	type SignedPhase = SignedPhase;
 	type UnsignedPhase = UnsignedPhase;
-	type SolutionImprovementThreshold = MinSolutionScoreBump;
+	type SolutionImprovementThreshold = SolutionImprovementThreshold;
 	type MinerMaxIterations = MinerMaxIterations;
 	type MinerMaxWeight = MinerMaxWeight;
 	type MinerTxPriority = MultiPhaseUnsignedPriority;
@@ -1095,7 +1079,7 @@ construct_runtime!(
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
 		TransactionPayment: pallet_transaction_payment::{Pallet, Storage},
 		ElectionProviderMultiPhase: pallet_election_provider_multi_phase::{Pallet, Call, Storage, Event<T>, ValidateUnsigned},
-		Staking: pallet_staking::{Pallet, Call, Config<T>, Storage, Event<T>, ValidateUnsigned},
+		Staking: pallet_staking::{Pallet, Call, Config<T>, Storage, Event<T>},
 		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
 		Democracy: pallet_democracy::{Pallet, Call, Storage, Config, Event<T>},
 		Council: pallet_collective::<Instance1>::{Pallet, Call, Storage, Origin<T>, Event<T>, Config<T>},
diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index 0029b51abf39..93b4af00b5dc 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -208,12 +208,6 @@ impl pallet_staking::Config for Test {
 	type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
 	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
 	type NextNewSession = Session;
-	type ElectionLookahead = ElectionLookahead;
-	type Call = Call;
-	type UnsignedPriority = StakingUnsignedPriority;
-	type MaxIterations = ();
-	type MinSolutionScoreBump = ();
-	type OffchainSolutionWeightLimit = ();
 	type ElectionProvider = onchain::OnChainSequentialPhragmen<Self>;
 	type WeightInfo = ();
 }
diff --git a/frame/election-provider-multi-phase/src/unsigned.rs b/frame/election-provider-multi-phase/src/unsigned.rs
index 4ff224d86076..b570c4482814 100644
--- a/frame/election-provider-multi-phase/src/unsigned.rs
+++ b/frame/election-provider-multi-phase/src/unsigned.rs
@@ -737,7 +737,6 @@ mod tests {
 			roll_to(25);
 			assert!(MultiPhase::current_phase().is_unsigned());
 
-			// mine seq_phragmen solution with 2 iters.
 			assert_eq!(
 				MultiPhase::mine_check_and_submit().unwrap_err(),
 				MinerError::PreDispatchChecksFailed,
@@ -844,7 +843,7 @@ mod tests {
 	}
 
 	#[test]
-	fn ocw_only_runs_when_signed_open_now() {
+	fn ocw_only_runs_when_unsigned_open_now() {
 		let (mut ext, pool) = ExtBuilder::default().build_offchainify(0);
 		ext.execute_with(|| {
 			roll_to(25);
diff --git a/frame/election-provider-multi-phase/src/weights.rs b/frame/election-provider-multi-phase/src/weights.rs
index e13b82f53a17..3d3a5cede329 100644
--- a/frame/election-provider-multi-phase/src/weights.rs
+++ b/frame/election-provider-multi-phase/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_election_provider_multi_phase
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-03-14, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-03-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -57,52 +57,50 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn on_initialize_nothing() -> Weight {
-		(22_833_000 as Weight)
+		(22_730_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 	}
 	fn on_initialize_open_signed() -> Weight {
-		(106_993_000 as Weight)
+		(112_051_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(8 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn on_initialize_open_unsigned_with_snapshot() -> Weight {
-		(106_490_000 as Weight)
+		(112_165_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(8 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn on_initialize_open_unsigned_without_snapshot() -> Weight {
-		(21_275_000 as Weight)
+		(21_039_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn elect_queued() -> Weight {
-		(7_274_346_000 as Weight)
+		(7_362_949_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(6 as Weight))
 	}
-	fn submit_unsigned(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
+	fn submit_unsigned(v: u32, _t: u32, a: u32, d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((4_017_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 66_000
-			.saturating_add((130_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 19_000
-			.saturating_add((13_057_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 99_000
-			.saturating_add((4_558_000 as Weight).saturating_mul(d as Weight))
+			// Standard Error: 21_000
+			.saturating_add((3_933_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 21_000
+			.saturating_add((13_520_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 107_000
+			.saturating_add((2_880_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn feasibility_check(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((4_186_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 40_000
-			.saturating_add((803_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 12_000
-			.saturating_add((9_806_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 61_000
-			.saturating_add((4_156_000 as Weight).saturating_mul(d as Weight))
+			// Standard Error: 10_000
+			.saturating_add((4_069_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 36_000
+			.saturating_add((503_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 10_000
+			.saturating_add((10_000_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 54_000
+			.saturating_add((3_734_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 	}
 }
@@ -110,52 +108,50 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn on_initialize_nothing() -> Weight {
-		(22_833_000 as Weight)
+		(22_730_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 	}
 	fn on_initialize_open_signed() -> Weight {
-		(106_993_000 as Weight)
+		(112_051_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(8 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn on_initialize_open_unsigned_with_snapshot() -> Weight {
-		(106_490_000 as Weight)
+		(112_165_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(8 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn on_initialize_open_unsigned_without_snapshot() -> Weight {
-		(21_275_000 as Weight)
+		(21_039_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn elect_queued() -> Weight {
-		(7_274_346_000 as Weight)
+		(7_362_949_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(6 as Weight))
 	}
-	fn submit_unsigned(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
+	fn submit_unsigned(v: u32, _t: u32, a: u32, d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((4_017_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 66_000
-			.saturating_add((130_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 19_000
-			.saturating_add((13_057_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 99_000
-			.saturating_add((4_558_000 as Weight).saturating_mul(d as Weight))
+			// Standard Error: 21_000
+			.saturating_add((3_933_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 21_000
+			.saturating_add((13_520_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 107_000
+			.saturating_add((2_880_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn feasibility_check(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((4_186_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 40_000
-			.saturating_add((803_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 12_000
-			.saturating_add((9_806_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 61_000
-			.saturating_add((4_156_000 as Weight).saturating_mul(d as Weight))
+			// Standard Error: 10_000
+			.saturating_add((4_069_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 36_000
+			.saturating_add((503_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 10_000
+			.saturating_add((10_000_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 54_000
+			.saturating_add((3_734_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 	}
 }
diff --git a/frame/election-provider-support/src/lib.rs b/frame/election-provider-support/src/lib.rs
index 3d7c2dbac90a..1a4a293a3270 100644
--- a/frame/election-provider-support/src/lib.rs
+++ b/frame/election-provider-support/src/lib.rs
@@ -168,7 +168,9 @@ use frame_support::weights::Weight;
 
 /// Re-export some type as they are used in the interface.
 pub use sp_arithmetic::PerThing;
-pub use sp_npos_elections::{Assignment, ExtendedBalance, PerThing128, Supports, VoteWeight};
+pub use sp_npos_elections::{
+	Assignment, ExtendedBalance, PerThing128, Supports, Support, VoteWeight
+};
 
 /// Types that are used by the data provider trait.
 pub mod data_provider {
diff --git a/frame/grandpa/src/mock.rs b/frame/grandpa/src/mock.rs
index 9e8bf3b8e0ca..af9d7f0fe425 100644
--- a/frame/grandpa/src/mock.rs
+++ b/frame/grandpa/src/mock.rs
@@ -54,7 +54,7 @@ frame_support::construct_runtime!(
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-		Staking: pallet_staking::{Pallet, Call, Config<T>, Storage, Event<T>, ValidateUnsigned},
+		Staking: pallet_staking::{Pallet, Call, Config<T>, Storage, Event<T>},
 		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
 		Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event, ValidateUnsigned},
 		Offences: pallet_offences::{Pallet, Call, Storage, Event},
@@ -214,12 +214,6 @@ impl pallet_staking::Config for Test {
 	type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
 	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
 	type NextNewSession = Session;
-	type ElectionLookahead = ElectionLookahead;
-	type Call = Call;
-	type UnsignedPriority = StakingUnsignedPriority;
-	type MaxIterations = ();
-	type MinSolutionScoreBump = ();
-	type OffchainSolutionWeightLimit = ();
 	type ElectionProvider = onchain::OnChainSequentialPhragmen<Self>;
 	type WeightInfo = ();
 }
diff --git a/frame/offences/benchmarking/src/lib.rs b/frame/offences/benchmarking/src/lib.rs
index f430330f767b..83275da593e9 100644
--- a/frame/offences/benchmarking/src/lib.rs
+++ b/frame/offences/benchmarking/src/lib.rs
@@ -40,7 +40,7 @@ use pallet_session::historical::{Config as HistoricalConfig, IdentificationTuple
 use pallet_session::{Config as SessionConfig, SessionManager};
 use pallet_staking::{
 	Module as Staking, Config as StakingConfig, RewardDestination, ValidatorPrefs,
-	Exposure, IndividualExposure, ElectionStatus, MAX_NOMINATIONS, Event as StakingEvent
+	Exposure, IndividualExposure, MAX_NOMINATIONS, Event as StakingEvent
 };
 
 const SEED: u32 = 0;
@@ -386,8 +386,6 @@ benchmarks! {
 		let o = 10;
 		let n = 100;
 
-		Staking::<T>::put_election_status(ElectionStatus::Closed);
-
 		let mut deferred_offences = vec![];
 		let offenders = make_offenders::<T>(o, n)?.0;
 		let offence_details = offenders.into_iter()
diff --git a/frame/offences/benchmarking/src/mock.rs b/frame/offences/benchmarking/src/mock.rs
index 1260fcba2fec..1fe8db5aaaa2 100644
--- a/frame/offences/benchmarking/src/mock.rs
+++ b/frame/offences/benchmarking/src/mock.rs
@@ -172,13 +172,7 @@ impl pallet_staking::Config for Test {
 	type SessionInterface = Self;
 	type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
 	type NextNewSession = Session;
-	type ElectionLookahead = ();
-	type Call = Call;
 	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
-	type UnsignedPriority = ();
-	type MaxIterations = ();
-	type MinSolutionScoreBump = ();
-	type OffchainSolutionWeightLimit = ();
 	type ElectionProvider = onchain::OnChainSequentialPhragmen<Self>;
 	type WeightInfo = ();
 }
@@ -222,7 +216,7 @@ frame_support::construct_runtime!(
 	{
 		System: system::{Pallet, Call, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-		Staking: pallet_staking::{Pallet, Call, Config<T>, Storage, Event<T>, ValidateUnsigned},
+		Staking: pallet_staking::{Pallet, Call, Config<T>, Storage, Event<T>},
 		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
 		ImOnline: pallet_im_online::{Pallet, Call, Storage, Event<T>, ValidateUnsigned, Config<T>},
 		Offences: pallet_offences::{Pallet, Call, Storage, Event},
diff --git a/frame/session/benchmarking/src/mock.rs b/frame/session/benchmarking/src/mock.rs
index 8ba6b3c04b71..af5d8f6a0936 100644
--- a/frame/session/benchmarking/src/mock.rs
+++ b/frame/session/benchmarking/src/mock.rs
@@ -39,7 +39,7 @@ frame_support::construct_runtime!(
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-		Staking: pallet_staking::{Pallet, Call, Config<T>, Storage, Event<T>, ValidateUnsigned},
+		Staking: pallet_staking::{Pallet, Call, Config<T>, Storage, Event<T>},
 		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
 	}
 );
@@ -177,13 +177,7 @@ impl pallet_staking::Config for Test {
 	type SessionInterface = Self;
 	type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
 	type NextNewSession = Session;
-	type ElectionLookahead = ();
-	type Call = Call;
 	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
-	type UnsignedPriority = UnsignedPriority;
-	type MaxIterations = ();
-	type MinSolutionScoreBump = ();
-	type OffchainSolutionWeightLimit = ();
 	type ElectionProvider = onchain::OnChainSequentialPhragmen<Self>;
 	type WeightInfo = ();
 }
diff --git a/frame/staking/Cargo.toml b/frame/staking/Cargo.toml
index b4c281940372..24909b35f53c 100644
--- a/frame/staking/Cargo.toml
+++ b/frame/staking/Cargo.toml
@@ -17,7 +17,6 @@ static_assertions = "1.1.0"
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-# TWO_PHASE_NOTE:: ideally we should be able to get rid of this.
 sp-npos-elections = { version = "3.0.0", default-features = false, path = "../../primitives/npos-elections" }
 sp-io ={ version = "3.0.0", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
@@ -27,8 +26,9 @@ frame-system = { version = "3.0.0", default-features = false, path = "../system"
 pallet-session = { version = "3.0.0", default-features = false, features = ["historical"], path = "../session" }
 pallet-authorship = { version = "3.0.0", default-features = false, path = "../authorship" }
 sp-application-crypto = { version = "3.0.0", default-features = false, path = "../../primitives/application-crypto" }
-log = { version = "0.4.14", default-features = false }
 frame-election-provider-support = { version = "3.0.0", default-features = false, path = "../election-provider-support" }
+log = { version = "0.4.14", default-features = false }
+paste = "1.0"
 
 # Optional imports for benchmarking
 frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
diff --git a/frame/staking/fuzzer/.gitignore b/frame/staking/fuzzer/.gitignore
deleted file mode 100644
index 3ebcb104d4a5..000000000000
--- a/frame/staking/fuzzer/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-hfuzz_target
-hfuzz_workspace
diff --git a/frame/staking/fuzzer/Cargo.lock b/frame/staking/fuzzer/Cargo.lock
deleted file mode 100644
index e451e12d1013..000000000000
--- a/frame/staking/fuzzer/Cargo.lock
+++ /dev/null
@@ -1,2294 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-[[package]]
-name = "Inflector"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
-dependencies = [
- "lazy_static",
- "regex",
-]
-
-[[package]]
-name = "ahash"
-version = "0.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f33b5018f120946c1dcf279194f238a9f146725593ead1c08fa47ff22b0b5d3"
-dependencies = [
- "const-random",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "0.7.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "alga"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f823d037a7ec6ea2197046bafd4ae150e6bc36f9ca347404f46a46823fa84f2"
-dependencies = [
- "approx",
- "num-complex",
- "num-traits",
-]
-
-[[package]]
-name = "approx"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "arbitrary"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75153c95fdedd7db9732dfbfc3702324a1627eec91ba56e37cd0ac78314ab2ed"
-
-[[package]]
-name = "arrayref"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
-
-[[package]]
-name = "arrayvec"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9"
-dependencies = [
- "nodrop",
-]
-
-[[package]]
-name = "arrayvec"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
-
-[[package]]
-name = "autocfg"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
-
-[[package]]
-name = "autocfg"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
-
-[[package]]
-name = "backtrace"
-version = "0.3.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1e692897359247cc6bb902933361652380af0f1b7651ae5c5013407f30e109e"
-dependencies = [
- "backtrace-sys",
- "cfg-if",
- "libc",
- "rustc-demangle",
-]
-
-[[package]]
-name = "backtrace-sys"
-version = "0.1.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7de8aba10a69c8e8d7622c5710229485ec32e9d55fdad160ea559c086fdcd118"
-dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
-name = "base58"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5024ee8015f02155eee35c711107ddd9a9bf3cb689cf2a9089c97e79b6e1ae83"
-
-[[package]]
-name = "bitflags"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-
-[[package]]
-name = "bitmask"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5da9b3d9f6f585199287a473f4f8dfab6566cf827d15c00c219f53c645687ead"
-
-[[package]]
-name = "bitvec"
-version = "0.17.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41262f11d771fd4a61aa3ce019fca363b4b6c282fca9da2a31186d3965a47a5c"
-dependencies = [
- "either",
- "radium",
-]
-
-[[package]]
-name = "blake2-rfc"
-version = "0.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400"
-dependencies = [
- "arrayvec 0.4.12",
- "constant_time_eq",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
-dependencies = [
- "block-padding",
- "byte-tools",
- "byteorder",
- "generic-array",
-]
-
-[[package]]
-name = "block-padding"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
-dependencies = [
- "byte-tools",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12ae9db68ad7fac5fe51304d20f016c911539251075a214f8e663babefa35187"
-
-[[package]]
-name = "byte-slice-cast"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3"
-
-[[package]]
-name = "byte-tools"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
-
-[[package]]
-name = "byteorder"
-version = "1.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
-
-[[package]]
-name = "cc"
-version = "1.0.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "clear_on_drop"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97276801e127ffb46b66ce23f35cc96bd454fa311294bced4bbace7baa8b1d17"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "cloudabi"
-version = "0.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "const-random"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f1af9ac737b2dd2d577701e59fd09ba34822f6f2ebdb30a7647405d9e55e16a"
-dependencies = [
- "const-random-macro",
- "proc-macro-hack",
-]
-
-[[package]]
-name = "const-random-macro"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25e4c606eb459dd29f7c57b2e0879f2b6f14ee130918c2b78ccb58a9624e6c7a"
-dependencies = [
- "getrandom",
- "proc-macro-hack",
-]
-
-[[package]]
-name = "constant_time_eq"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
-
-[[package]]
-name = "crunchy"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
-
-[[package]]
-name = "crypto-mac"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5"
-dependencies = [
- "generic-array",
- "subtle 1.0.0",
-]
-
-[[package]]
-name = "curve25519-dalek"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26778518a7f6cffa1d25a44b602b62b979bd88adb9e99ffec546998cf3404839"
-dependencies = [
- "byteorder",
- "digest",
- "rand_core 0.5.1",
- "subtle 2.2.2",
- "zeroize",
-]
-
-[[package]]
-name = "derive_more"
-version = "0.99.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2323f3f47db9a0e77ce7a300605d8d2098597fc451ed1a97bb1f6411bb550a7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "digest"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "ed25519-dalek"
-version = "1.0.0-pre.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978710b352437433c97b2bff193f2fb1dfd58a093f863dd95e225a19baa599a2"
-dependencies = [
- "clear_on_drop",
- "curve25519-dalek",
- "rand 0.7.3",
- "sha2",
-]
-
-[[package]]
-name = "either"
-version = "1.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
-
-[[package]]
-name = "environmental"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "516aa8d7a71cb00a1c4146f0798549b93d083d4f189b3ced8f3de6b8f11ee6c4"
-
-[[package]]
-name = "failure"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8529c2421efa3066a5cbd8063d2244603824daccb6936b079010bb2aa89464b"
-dependencies = [
- "backtrace",
- "failure_derive",
-]
-
-[[package]]
-name = "failure_derive"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "030a733c8287d6213886dd487564ff5c8f6aae10278b3588ed177f9d18f8d231"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "synstructure",
-]
-
-[[package]]
-name = "fake-simd"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
-
-[[package]]
-name = "fixed-hash"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32529fc42e86ec06e5047092082aab9ad459b070c5d2a76b14f4f5ce70bf2e84"
-dependencies = [
- "byteorder",
- "rand 0.7.3",
- "rustc-hex",
- "static_assertions",
-]
-
-[[package]]
-name = "frame-benchmarking"
-version = "2.0.0-alpha.5"
-dependencies = [
- "frame-support",
- "frame-system",
- "linregress",
- "parity-scale-codec",
- "sp-api",
- "sp-io",
- "sp-runtime",
- "sp-runtime-interface",
- "sp-std",
-]
-
-[[package]]
-name = "frame-metadata"
-version = "11.0.0-alpha.5"
-dependencies = [
- "parity-scale-codec",
- "serde",
- "sp-core",
- "sp-std",
-]
-
-[[package]]
-name = "frame-support"
-version = "2.0.0-alpha.5"
-dependencies = [
- "bitmask",
- "frame-metadata",
- "frame-support-procedural",
- "impl-trait-for-tuples",
- "log",
- "once_cell",
- "parity-scale-codec",
- "paste",
- "serde",
- "sp-arithmetic",
- "sp-core",
- "sp-inherents",
- "sp-io",
- "sp-runtime",
- "sp-state-machine",
- "sp-std",
- "tracing",
-]
-
-[[package]]
-name = "frame-support-procedural"
-version = "2.0.0-alpha.5"
-dependencies = [
- "frame-support-procedural-tools",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "frame-support-procedural-tools"
-version = "2.0.0-alpha.5"
-dependencies = [
- "frame-support-procedural-tools-derive",
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "frame-support-procedural-tools-derive"
-version = "2.0.0-alpha.5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "frame-system"
-version = "2.0.0-alpha.5"
-dependencies = [
- "frame-support",
- "impl-trait-for-tuples",
- "parity-scale-codec",
- "serde",
- "sp-core",
- "sp-io",
- "sp-runtime",
- "sp-std",
- "sp-version",
-]
-
-[[package]]
-name = "fuchsia-cprng"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
-
-[[package]]
-name = "futures"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c329ae8753502fb44ae4fc2b622fa2a94652c41e795143765ba0927f92ab780"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0c77d04ce8edd9cb903932b608268b3fffec4163dc053b3b402bf47eac1f1a8"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f25592f769825e89b92358db00d26f965761e094951ac44d3663ef25b7ac464a"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f674f3e1bcb15b37284a90cedf55afdba482ab061c407a9c0ebbd0f3109741ba"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
- "num_cpus",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a638959aa96152c7a4cddf50fcb1e3fede0583b27157c26e67d6f99904090dc6"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7"
-dependencies = [
- "proc-macro-hack",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3466821b4bc114d95b087b850a724c6f83115e929bc88f1fa98a3304a944c8a6"
-
-[[package]]
-name = "futures-task"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b0a34e53cf6cdcd0178aa573aed466b646eb3db769570841fda0c7ede375a27"
-
-[[package]]
-name = "futures-util"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22766cf25d64306bedf0384da004d05c9974ab104fcc4528f1236181c18004c5"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-utils",
- "proc-macro-hack",
- "proc-macro-nested",
- "slab",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
-dependencies = [
- "typenum",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi",
-]
-
-[[package]]
-name = "hash-db"
-version = "0.15.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d23bd4e7b5eda0d0f3a307e8b381fdc8ba9000f26fbe912250c0a4cc3956364a"
-
-[[package]]
-name = "hash256-std-hasher"
-version = "0.15.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92c171d55b98633f4ed3860808f004099b36c1cc29c42cfc53aa8591b21efcf2"
-dependencies = [
- "crunchy",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e6073d0ca812575946eb5f35ff68dbe519907b25c42530389ff946dc84c6ead"
-dependencies = [
- "ahash",
- "autocfg 0.1.7",
-]
-
-[[package]]
-name = "heck"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "725cf19794cf90aa94e65050cb4191ff5d8fa87a498383774c47b332e3af952e"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hex"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35"
-
-[[package]]
-name = "hmac"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695"
-dependencies = [
- "crypto-mac",
- "digest",
-]
-
-[[package]]
-name = "hmac-drbg"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6e570451493f10f6581b48cdd530413b63ea9e780f544bfd3bdcaa0d89d1a7b"
-dependencies = [
- "digest",
- "generic-array",
- "hmac",
-]
-
-[[package]]
-name = "impl-codec"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1be51a921b067b0eaca2fad532d9400041561aa922221cc65f95a85641c6bf53"
-dependencies = [
- "parity-scale-codec",
-]
-
-[[package]]
-name = "impl-serde"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58e3cae7e99c7ff5a995da2cf78dd0a5383740eda71d98cf7b1910c301ac69b8"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "impl-serde"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bbe9ea9b182f0fb1cabbd61f4ff9b7b7b9197955e95a7e4c27de5055eb29ff8"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "impl-trait-for-tuples"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef5550a42e3740a0e71f909d4c861056a284060af885ae7aa6242820f920d9d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "integer-sqrt"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f65877bf7d44897a473350b1046277941cee20b263397e90869c50b6e766088b"
-
-[[package]]
-name = "js-sys"
-version = "0.3.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a27d435371a2fa5b6d2b028a74bbdb1234f308da363226a2854ca3ff8ba7055"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "keccak"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7"
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "libc"
-version = "0.2.68"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0"
-
-[[package]]
-name = "libfuzzer-sys"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d718794b8e23533b9069bd2c4597d69e41cc7ab1c02700a502971aca0cdcf24"
-dependencies = [
- "arbitrary",
- "cc",
-]
-
-[[package]]
-name = "libm"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
-
-[[package]]
-name = "libsecp256k1"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fc1e2c808481a63dc6da2074752fdd4336a3c8fcc68b83db6f1fd5224ae7962"
-dependencies = [
- "arrayref",
- "crunchy",
- "digest",
- "hmac-drbg",
- "rand 0.7.3",
- "sha2",
- "subtle 2.2.2",
- "typenum",
-]
-
-[[package]]
-name = "linregress"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9290cf6f928576eeb9c096c6fad9d8d452a0a1a70a2bbffa6e36064eedc0aac9"
-dependencies = [
- "failure",
- "nalgebra",
- "statrs",
-]
-
-[[package]]
-name = "lock_api"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79b2de95ecb4691949fea4716ca53cdbcfccb2c612e19644a8bad05edcf9f47b"
-dependencies = [
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "matrixmultiply"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4f7ec66360130972f34830bfad9ef05c6610a43938a467bcc9ab9369ab3478f"
-dependencies = [
- "rawpointer",
-]
-
-[[package]]
-name = "maybe-uninit"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
-
-[[package]]
-name = "memchr"
-version = "2.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
-
-[[package]]
-name = "memory-db"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f58381b20ebe2c578e75dececd9da411414903415349548ccc46aac3209cdfbc"
-dependencies = [
- "ahash",
- "hash-db",
- "hashbrown",
- "parity-util-mem",
-]
-
-[[package]]
-name = "memory_units"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882"
-
-[[package]]
-name = "merlin"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6feca46f4fa3443a01769d768727f10c10a20fdb65e52dc16a81f0c8269bb78"
-dependencies = [
- "byteorder",
- "keccak",
- "rand_core 0.5.1",
- "zeroize",
-]
-
-[[package]]
-name = "nalgebra"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaa9fddbc34c8c35dd2108515587b8ce0cab396f17977b8c738568e4edb521a2"
-dependencies = [
- "alga",
- "approx",
- "generic-array",
- "matrixmultiply",
- "num-complex",
- "num-rational",
- "num-traits",
- "rand 0.6.5",
- "typenum",
-]
-
-[[package]]
-name = "nodrop"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
-
-[[package]]
-name = "num-bigint"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304"
-dependencies = [
- "autocfg 1.0.0",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-complex"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95"
-dependencies = [
- "autocfg 1.0.0",
- "num-traits",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba"
-dependencies = [
- "autocfg 1.0.0",
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
-dependencies = [
- "autocfg 1.0.0",
- "num-bigint",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096"
-dependencies = [
- "autocfg 1.0.0",
- "libm",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c601810575c99596d4afc46f78a678c80105117c379eb3650cf99b8a21ce5b"
-dependencies = [
- "parking_lot 0.9.0",
-]
-
-[[package]]
-name = "opaque-debug"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
-
-[[package]]
-name = "pallet-authorship"
-version = "2.0.0-alpha.5"
-dependencies = [
- "frame-support",
- "frame-system",
- "impl-trait-for-tuples",
- "parity-scale-codec",
- "sp-authorship",
- "sp-core",
- "sp-inherents",
- "sp-io",
- "sp-runtime",
- "sp-std",
-]
-
-[[package]]
-name = "pallet-balances"
-version = "2.0.0-alpha.5"
-dependencies = [
- "frame-benchmarking",
- "frame-support",
- "frame-system",
- "parity-scale-codec",
- "serde",
- "sp-io",
- "sp-runtime",
- "sp-std",
-]
-
-[[package]]
-name = "pallet-indices"
-version = "2.0.0-alpha.5"
-dependencies = [
- "frame-support",
- "frame-system",
- "parity-scale-codec",
- "serde",
- "sp-core",
- "sp-io",
- "sp-keyring",
- "sp-runtime",
- "sp-std",
-]
-
-[[package]]
-name = "pallet-session"
-version = "2.0.0-alpha.5"
-dependencies = [
- "frame-support",
- "frame-system",
- "impl-trait-for-tuples",
- "pallet-timestamp",
- "parity-scale-codec",
- "serde",
- "sp-io",
- "sp-runtime",
- "sp-staking",
- "sp-std",
- "sp-trie",
-]
-
-[[package]]
-name = "pallet-staking"
-version = "2.0.0-alpha.5"
-dependencies = [
- "frame-support",
- "frame-system",
- "pallet-authorship",
- "pallet-indices",
- "pallet-session",
- "parity-scale-codec",
- "rand 0.7.3",
- "serde",
- "sp-application-crypto",
- "sp-core",
- "sp-io",
- "sp-npos-elections",
- "sp-runtime",
- "sp-staking",
- "sp-std",
- "static_assertions",
-]
-
-[[package]]
-name = "pallet-staking-fuzz"
-version = "0.0.0"
-dependencies = [
- "frame-support",
- "frame-system",
- "libfuzzer-sys",
- "pallet-balances",
- "pallet-indices",
- "pallet-session",
- "pallet-staking",
- "pallet-staking-reward-curve",
- "pallet-timestamp",
- "parity-scale-codec",
- "rand 0.7.3",
- "sp-core",
- "sp-io",
- "sp-npos-elections",
- "sp-runtime",
- "sp-std",
-]
-
-[[package]]
-name = "pallet-staking-reward-curve"
-version = "2.0.0-alpha.5"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "pallet-timestamp"
-version = "2.0.0-alpha.5"
-dependencies = [
- "frame-benchmarking",
- "frame-support",
- "frame-system",
- "impl-trait-for-tuples",
- "parity-scale-codec",
- "serde",
- "sp-inherents",
- "sp-runtime",
- "sp-std",
- "sp-timestamp",
-]
-
-[[package]]
-name = "parity-scale-codec"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "329c8f7f4244ddb5c37c103641027a76c530e65e8e4b8240b29f81ea40508b17"
-dependencies = [
- "arrayvec 0.5.1",
- "bitvec",
- "byte-slice-cast",
- "parity-scale-codec-derive",
- "serde",
-]
-
-[[package]]
-name = "parity-scale-codec-derive"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a0ec292e92e8ec7c58e576adacc1e3f399c597c8f263c42f18420abe58e7245"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "parity-util-mem"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e42755f26e5ea21a6a819d9e63cbd70713e9867a2b767ec2cc65ca7659532c5"
-dependencies = [
- "cfg-if",
- "impl-trait-for-tuples",
- "parity-util-mem-derive",
- "parking_lot 0.10.0",
- "primitive-types",
- "winapi",
-]
-
-[[package]]
-name = "parity-util-mem-derive"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2"
-dependencies = [
- "proc-macro2",
- "syn",
- "synstructure",
-]
-
-[[package]]
-name = "parity-wasm"
-version = "0.41.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddfc878dac00da22f8f61e7af3157988424567ab01d9920b962ef7dcbd7cd865"
-
-[[package]]
-name = "parking_lot"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252"
-dependencies = [
- "lock_api",
- "parking_lot_core 0.6.2",
- "rustc_version",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92e98c49ab0b7ce5b222f2cc9193fc4efe11c6d0bd4f648e374684a6857b1cfc"
-dependencies = [
- "lock_api",
- "parking_lot_core 0.7.0",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b"
-dependencies = [
- "cfg-if",
- "cloudabi",
- "libc",
- "redox_syscall",
- "rustc_version",
- "smallvec 0.6.13",
- "winapi",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7582838484df45743c8434fbff785e8edf260c28748353d44bc0da32e0ceabf1"
-dependencies = [
- "cfg-if",
- "cloudabi",
- "libc",
- "redox_syscall",
- "smallvec 1.2.0",
- "winapi",
-]
-
-[[package]]
-name = "paste"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092d791bf7847f70bbd49085489fba25fc2c193571752bff9e36e74e72403932"
-dependencies = [
- "paste-impl",
- "proc-macro-hack",
-]
-
-[[package]]
-name = "paste-impl"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "406c23fb4c45cc6f68a9bbabb8ec7bd6f8cfcbd17e9e8f72c2460282f8325729"
-dependencies = [
- "proc-macro-hack",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "pbkdf2"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "006c038a43a45995a9670da19e67600114740e8511d4333bf97a56e66a7542d9"
-dependencies = [
- "byteorder",
- "crypto-mac",
-]
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0-alpha.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587"
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
-
-[[package]]
-name = "primitive-types"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5e4b9943a2da369aec5e96f7c10ebc74fcf434d39590d974b0a3460e6f67fbb"
-dependencies = [
- "fixed-hash",
- "impl-codec",
- "impl-serde 0.3.0",
- "uint",
-]
-
-[[package]]
-name = "proc-macro-crate"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e10d4b51f154c8a7fb96fd6dad097cb74b863943ec010ac94b9fd1be8861fe1e"
-dependencies = [
- "toml",
-]
-
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcfdefadc3d57ca21cf17990a28ef4c0f7c61383a28cb7604cf4a18e6ede1420"
-
-[[package]]
-name = "proc-macro-nested"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e946095f9d3ed29ec38de908c22f95d9ac008e424c7bcae54c75a79c527c694"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df246d292ff63439fea9bc8c0a270bed0e390d5ebd4db4ba15aba81111b5abe3"
-dependencies = [
- "unicode-xid",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "radium"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac"
-
-[[package]]
-name = "rand"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
-dependencies = [
- "cloudabi",
- "fuchsia-cprng",
- "libc",
- "rand_core 0.3.1",
- "winapi",
-]
-
-[[package]]
-name = "rand"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
-dependencies = [
- "autocfg 0.1.7",
- "libc",
- "rand_chacha 0.1.1",
- "rand_core 0.4.2",
- "rand_hc 0.1.0",
- "rand_isaac",
- "rand_jitter",
- "rand_os",
- "rand_pcg",
- "rand_xorshift",
- "winapi",
-]
-
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc 0.2.0",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
-dependencies = [
- "autocfg 0.1.7",
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
-dependencies = [
- "rand_core 0.4.2",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_isaac"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rand_jitter"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
-dependencies = [
- "libc",
- "rand_core 0.4.2",
- "winapi",
-]
-
-[[package]]
-name = "rand_os"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
-dependencies = [
- "cloudabi",
- "fuchsia-cprng",
- "libc",
- "rand_core 0.4.2",
- "rdrand",
- "winapi",
-]
-
-[[package]]
-name = "rand_pcg"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
-dependencies = [
- "autocfg 0.1.7",
- "rand_core 0.4.2",
-]
-
-[[package]]
-name = "rand_xorshift"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rawpointer"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
-
-[[package]]
-name = "rdrand"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.1.56"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
-
-[[package]]
-name = "regex"
-version = "1.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f6946991529684867e47d86474e3a6d0c0ab9b82d5821e314b1ede31fa3a4b3"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
- "thread_local",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae"
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
-
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
-[[package]]
-name = "rustc-hex"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6"
-
-[[package]]
-name = "rustc_version"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-dependencies = [
- "semver",
-]
-
-[[package]]
-name = "schnorrkel"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "021b403afe70d81eea68f6ea12f6b3c9588e5d536a94c3bf80f15e7faa267862"
-dependencies = [
- "arrayref",
- "arrayvec 0.5.1",
- "curve25519-dalek",
- "getrandom",
- "merlin",
- "rand 0.7.3",
- "rand_core 0.5.1",
- "sha2",
- "subtle 2.2.2",
- "zeroize",
-]
-
-[[package]]
-name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
-name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-
-[[package]]
-name = "send_wrapper"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0eddf2e8f50ced781f288c19f18621fa72a3779e3cb58dbf23b07469b0abeb4"
-
-[[package]]
-name = "serde"
-version = "1.0.105"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e707fbbf255b8fc8c3b99abb91e7257a622caeb20a9818cbadbeeede4e0932ff"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.105"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac5d00fc561ba2724df6758a17de23df5914f20e41cb00f94d5b7ae42fffaff8"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "sha2"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27044adfd2e1f077f649f59deb9490d3941d674002f7d062870a60ebe9bd47a0"
-dependencies = [
- "block-buffer",
- "digest",
- "fake-simd",
- "opaque-debug",
-]
-
-[[package]]
-name = "slab"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
-
-[[package]]
-name = "smallvec"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6"
-dependencies = [
- "maybe-uninit",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c2fb2ec9bcd216a5b0d0ccf31ab17b5ed1d627960edff65bbe95d3ce221cefc"
-
-[[package]]
-name = "sp-api"
-version = "2.0.0-alpha.5"
-dependencies = [
- "hash-db",
- "parity-scale-codec",
- "sp-api-proc-macro",
- "sp-core",
- "sp-runtime",
- "sp-state-machine",
- "sp-std",
- "sp-version",
-]
-
-[[package]]
-name = "sp-api-proc-macro"
-version = "2.0.0-alpha.5"
-dependencies = [
- "blake2-rfc",
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "sp-application-crypto"
-version = "2.0.0-alpha.5"
-dependencies = [
- "parity-scale-codec",
- "serde",
- "sp-core",
- "sp-io",
- "sp-std",
-]
-
-[[package]]
-name = "sp-arithmetic"
-version = "2.0.0-alpha.5"
-dependencies = [
- "integer-sqrt",
- "num-traits",
- "parity-scale-codec",
- "serde",
- "sp-debug-derive",
- "sp-std",
-]
-
-[[package]]
-name = "sp-authorship"
-version = "2.0.0-alpha.5"
-dependencies = [
- "parity-scale-codec",
- "sp-inherents",
- "sp-runtime",
- "sp-std",
-]
-
-[[package]]
-name = "sp-core"
-version = "2.0.0-alpha.5"
-dependencies = [
- "base58",
- "blake2-rfc",
- "byteorder",
- "ed25519-dalek",
- "futures",
- "hash-db",
- "hash256-std-hasher",
- "hex",
- "impl-serde 0.3.0",
- "lazy_static",
- "libsecp256k1",
- "log",
- "num-traits",
- "parity-scale-codec",
- "parity-util-mem",
- "parking_lot 0.10.0",
- "primitive-types",
- "rand 0.7.3",
- "regex",
- "schnorrkel",
- "serde",
- "sha2",
- "sp-debug-derive",
- "sp-externalities",
- "sp-runtime-interface",
- "sp-std",
- "sp-storage",
- "substrate-bip39",
- "tiny-bip39",
- "tiny-keccak",
- "twox-hash",
- "wasmi",
- "zeroize",
-]
-
-[[package]]
-name = "sp-debug-derive"
-version = "2.0.0-alpha.5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "sp-externalities"
-version = "0.8.0-alpha.5"
-dependencies = [
- "environmental",
- "sp-std",
- "sp-storage",
-]
-
-[[package]]
-name = "sp-inherents"
-version = "2.0.0-alpha.5"
-dependencies = [
- "derive_more",
- "parity-scale-codec",
- "parking_lot 0.10.0",
- "sp-core",
- "sp-std",
-]
-
-[[package]]
-name = "sp-io"
-version = "2.0.0-alpha.5"
-dependencies = [
- "hash-db",
- "libsecp256k1",
- "log",
- "parity-scale-codec",
- "sp-core",
- "sp-externalities",
- "sp-runtime-interface",
- "sp-state-machine",
- "sp-std",
- "sp-trie",
- "sp-wasm-interface",
-]
-
-[[package]]
-name = "sp-keyring"
-version = "2.0.0-alpha.5"
-dependencies = [
- "lazy_static",
- "sp-core",
- "sp-runtime",
- "strum",
-]
-
-[[package]]
-name = "sp-panic-handler"
-version = "2.0.0-alpha.5"
-dependencies = [
- "backtrace",
- "log",
-]
-
-[[package]]
-name = "sp-npos-elections"
-version = "2.0.0-alpha.5"
-dependencies = [
- "parity-scale-codec",
- "serde",
- "sp-npos-elections-compact",
- "sp-runtime",
- "sp-std",
-]
-
-[[package]]
-name = "sp-npos-elections-compact"
-version = "2.0.0-rc3"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "sp-runtime"
-version = "2.0.0-alpha.5"
-dependencies = [
- "hash256-std-hasher",
- "impl-trait-for-tuples",
- "log",
- "parity-scale-codec",
- "parity-util-mem",
- "paste",
- "rand 0.7.3",
- "serde",
- "sp-application-crypto",
- "sp-arithmetic",
- "sp-core",
- "sp-inherents",
- "sp-io",
- "sp-std",
-]
-
-[[package]]
-name = "sp-runtime-interface"
-version = "2.0.0-alpha.5"
-dependencies = [
- "parity-scale-codec",
- "primitive-types",
- "sp-externalities",
- "sp-runtime-interface-proc-macro",
- "sp-std",
- "sp-wasm-interface",
- "static_assertions",
-]
-
-[[package]]
-name = "sp-runtime-interface-proc-macro"
-version = "2.0.0-alpha.5"
-dependencies = [
- "Inflector",
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "sp-staking"
-version = "2.0.0-alpha.5"
-dependencies = [
- "parity-scale-codec",
- "sp-runtime",
- "sp-std",
-]
-
-[[package]]
-name = "sp-state-machine"
-version = "0.8.0-alpha.5"
-dependencies = [
- "hash-db",
- "log",
- "num-traits",
- "parity-scale-codec",
- "parking_lot 0.10.0",
- "rand 0.7.3",
- "sp-core",
- "sp-externalities",
- "sp-panic-handler",
- "sp-trie",
- "trie-db",
- "trie-root",
-]
-
-[[package]]
-name = "sp-std"
-version = "2.0.0-alpha.5"
-
-[[package]]
-name = "sp-storage"
-version = "2.0.0-alpha.5"
-dependencies = [
- "impl-serde 0.2.3",
- "serde",
- "sp-debug-derive",
- "sp-std",
-]
-
-[[package]]
-name = "sp-timestamp"
-version = "2.0.0-alpha.5"
-dependencies = [
- "impl-trait-for-tuples",
- "parity-scale-codec",
- "sp-api",
- "sp-inherents",
- "sp-runtime",
- "sp-std",
- "wasm-timer",
-]
-
-[[package]]
-name = "sp-trie"
-version = "2.0.0-alpha.5"
-dependencies = [
- "hash-db",
- "memory-db",
- "parity-scale-codec",
- "sp-core",
- "sp-std",
- "trie-db",
- "trie-root",
-]
-
-[[package]]
-name = "sp-version"
-version = "2.0.0-alpha.5"
-dependencies = [
- "impl-serde 0.2.3",
- "parity-scale-codec",
- "serde",
- "sp-runtime",
- "sp-std",
-]
-
-[[package]]
-name = "sp-wasm-interface"
-version = "2.0.0-alpha.5"
-dependencies = [
- "impl-trait-for-tuples",
- "parity-scale-codec",
- "sp-std",
- "wasmi",
-]
-
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[package]]
-name = "statrs"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10102ac8d55e35db2b3fafc26f81ba8647da2e15879ab686a67e6d19af2685e8"
-dependencies = [
- "rand 0.5.6",
-]
-
-[[package]]
-name = "strum"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6138f8f88a16d90134763314e3fc76fa3ed6a7db4725d6acf9a3ef95a3188d22"
-dependencies = [
- "strum_macros",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0054a7df764039a6cd8592b9de84be4bec368ff081d203a7d5371cbfa8e65c81"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "substrate-bip39"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c004e8166d6e0aa3a9d5fa673e5b7098ff25f930de1013a21341988151e681bb"
-dependencies = [
- "hmac",
- "pbkdf2",
- "schnorrkel",
- "sha2",
-]
-
-[[package]]
-name = "subtle"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
-
-[[package]]
-name = "subtle"
-version = "2.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c65d530b10ccaeac294f349038a597e435b18fb456aadd0840a623f83b9e941"
-
-[[package]]
-name = "syn"
-version = "1.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0df0eb663f387145cab623dea85b09c2c5b4b0aef44e945d928e682fce71bb03"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
-]
-
-[[package]]
-name = "synstructure"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "unicode-xid",
-]
-
-[[package]]
-name = "thread_local"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "tiny-bip39"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0165e045cc2ae1660270ca65e1676dbaab60feb0f91b10f7d0665e9b47e31f2"
-dependencies = [
- "failure",
- "hmac",
- "once_cell",
- "pbkdf2",
- "rand 0.7.3",
- "rustc-hash",
- "sha2",
- "unicode-normalization",
-]
-
-[[package]]
-name = "tiny-keccak"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2953ca5148619bc99695c1274cb54c5275bbb913c6adad87e72eaf8db9787f69"
-dependencies = [
- "crunchy",
-]
-
-[[package]]
-name = "toml"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "tracing"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1721cc8cf7d770cc4257872507180f35a4797272f5962f24c806af9e7faf52ab"
-dependencies = [
- "cfg-if",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fbad39da2f9af1cae3016339ad7f2c7a9e870f12e8fd04c4fd7ef35b30c0d2b"
-dependencies = [
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0aa83a9a47081cd522c09c81b31aec2c9273424976f922ad61c053b58350b715"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "trie-db"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de9222c50cc325855621271157c973da27a0dcd26fa06f8edf81020bd2333df0"
-dependencies = [
- "hash-db",
- "hashbrown",
- "log",
- "rustc-hex",
- "smallvec 1.2.0",
-]
-
-[[package]]
-name = "trie-root"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "652931506d2c1244d7217a70b99f56718a7b4161b37f04e7cd868072a99f68cd"
-dependencies = [
- "hash-db",
-]
-
-[[package]]
-name = "twox-hash"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bfd5b7557925ce778ff9b9ef90e3ade34c524b5ff10e239c69a42d546d2af56"
-dependencies = [
- "rand 0.7.3",
-]
-
-[[package]]
-name = "typenum"
-version = "1.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9"
-
-[[package]]
-name = "uint"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e75a4cdd7b87b28840dba13c483b9a88ee6bbf16ba5c951ee1ecfcf723078e0d"
-dependencies = [
- "byteorder",
- "crunchy",
- "rustc-hex",
- "static_assertions",
-]
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4"
-dependencies = [
- "smallvec 1.2.0",
-]
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
-
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cc57ce05287f8376e998cbddfb4c8cb43b84a7ec55cf4551d7c00eef317a47f"
-dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d967d37bf6c16cca2973ca3af071d0a2523392e4a594548155d89a678f4237cd"
-dependencies = [
- "bumpalo",
- "lazy_static",
- "log",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7add542ea1ac7fdaa9dc25e031a6af33b7d63376292bd24140c637d00d1c312a"
-dependencies = [
- "cfg-if",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bd151b63e1ea881bb742cd20e1d6127cef28399558f3b5d415289bc41eee3a4"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d68a5b36eef1be7868f668632863292e37739656a80fc4b9acec7b0bd35a4931"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daf76fe7d25ac79748a37538b7daeed1c7a6867c92d3245c12c6222e4a20d639"
-
-[[package]]
-name = "wasm-timer"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "324c5e65a08699c9c4334ba136597ab22b85dccd4b65dd1e36ccf8f723a95b54"
-dependencies = [
- "futures",
- "js-sys",
- "parking_lot 0.9.0",
- "pin-utils",
- "send_wrapper",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
-[[package]]
-name = "wasmi"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf617d864d25af3587aa745529f7aaa541066c876d57e050c0d0c85c61c92aff"
-dependencies = [
- "libc",
- "memory_units",
- "num-rational",
- "num-traits",
- "parity-wasm",
- "wasmi-validation",
-]
-
-[[package]]
-name = "wasmi-validation"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea78c597064ba73596099281e2f4cfc019075122a65cdda3205af94f0b264d93"
-dependencies = [
- "parity-wasm",
-]
-
-[[package]]
-name = "web-sys"
-version = "0.3.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d6f51648d8c56c366144378a33290049eafdd784071077f6fe37dae64c1c4cb"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "winapi"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "zeroize"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cbac2ed2ba24cc90f5e06485ac8c7c1e5449fe8911aef4d8877218af021a5b8"
-dependencies = [
- "zeroize_derive",
-]
-
-[[package]]
-name = "zeroize_derive"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de251eec69fc7c1bc3923403d18ececb929380e016afe103da75f396704f8ca2"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "synstructure",
-]
diff --git a/frame/staking/fuzzer/Cargo.toml b/frame/staking/fuzzer/Cargo.toml
deleted file mode 100644
index fb36327e5e91..000000000000
--- a/frame/staking/fuzzer/Cargo.toml
+++ /dev/null
@@ -1,41 +0,0 @@
-[package]
-name = "pallet-staking-fuzz"
-version = "0.0.0"
-authors = ["Automatically generated"]
-publish = false
-edition = "2018"
-license = "Apache-2.0"
-homepage = "https://substrate.dev"
-repository = "https://github.com/paritytech/substrate/"
-description = "FRAME pallet staking fuzzing"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[dependencies]
-honggfuzz = "0.5"
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-pallet-staking = { version = "3.0.0", path = "..", features = ["runtime-benchmarks"] }
-pallet-staking-reward-curve = { version = "3.0.0",  path = "../reward-curve" }
-pallet-session = { version = "3.0.0", path = "../../session" }
-pallet-indices = { version = "3.0.0", path = "../../indices" }
-pallet-balances = { version = "3.0.0", path = "../../balances" }
-pallet-timestamp = { version = "3.0.0", path = "../../timestamp" }
-frame-system = { version = "3.0.0", path = "../../system" }
-frame-support = { version = "3.0.0", path = "../../support" }
-sp-std = { version = "3.0.0", path = "../../../primitives/std" }
-sp-io ={ version = "3.0.0", path = "../../../primitives/io" }
-sp-core = { version = "3.0.0", path = "../../../primitives/core" }
-sp-npos-elections = { version = "3.0.0", path = "../../../primitives/npos-elections" }
-sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
-frame-election-provider-support = { version = "3.0.0", path = "../../election-provider-support" }
-serde = "1.0.101"
-
-[features]
-# Note feature std is required so that impl_opaque_keys derive serde.
-default = ["std"]
-std = []
-
-[[bin]]
-name = "submit_solution"
-path = "src/submit_solution.rs"
diff --git a/frame/staking/fuzzer/src/submit_solution.rs b/frame/staking/fuzzer/src/submit_solution.rs
deleted file mode 100644
index 63ec189d44b0..000000000000
--- a/frame/staking/fuzzer/src/submit_solution.rs
+++ /dev/null
@@ -1,183 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Fuzzing for staking pallet.
-//!
-//! HFUZZ_RUN_ARGS="-n 8" cargo hfuzz run submit_solution
-
-use honggfuzz::fuzz;
-
-use mock::Test;
-use pallet_staking::testing_utils::*;
-use frame_support::{assert_ok, storage::StorageValue, traits::UnfilteredDispatchable};
-use frame_system::RawOrigin;
-use sp_runtime::DispatchError;
-use sp_core::offchain::{testing::TestOffchainExt, OffchainWorkerExt, OffchainDbExt};
-use pallet_staking::{EraElectionStatus, ElectionStatus, Module as Staking, Call as StakingCall};
-
-mod mock;
-
-#[repr(u32)]
-#[allow(dead_code)]
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-enum Mode {
-	/// Initial submission. This will be rather cheap.
-	InitialSubmission,
-	/// A better submission that will replace the previous ones. This is the most expensive.
-	StrongerSubmission,
-	/// A weak submission that will be rejected. This will be rather cheap.
-	WeakerSubmission,
-}
-
-pub fn new_test_ext(iterations: u32) -> sp_io::TestExternalities {
-	let mut ext: sp_io::TestExternalities = frame_system::GenesisConfig::default()
-		.build_storage::<mock::Test>()
-		.map(Into::into)
-		.expect("Failed to create test externalities.");
-
-	let (offchain, offchain_state) = TestOffchainExt::new();
-
-	let mut seed = [0u8; 32];
-	seed[0..4].copy_from_slice(&iterations.to_le_bytes());
-	offchain_state.write().seed = seed;
-
-	ext.register_extension(OffchainDbExt::new(offchain.clone()));
-	ext.register_extension(OffchainWorkerExt::new(offchain));
-
-	ext
-}
-
-fn main() {
-	let to_range = |x: u32, a: u32, b: u32| {
-		let collapsed = x % b;
-		if collapsed >= a {
-			collapsed
-		} else {
-			collapsed + a
-		}
-	};
-	loop {
-		fuzz!(|data: (u32, u32, u32, u32, u32)| {
-			let (mut num_validators, mut num_nominators, mut edge_per_voter, mut to_elect, mode_u32) = data;
-			// always run with 5 iterations.
-			let mut ext = new_test_ext(5);
-			let mode: Mode = unsafe { std::mem::transmute(mode_u32) };
-			num_validators = to_range(num_validators, 50, 1000);
-			num_nominators = to_range(num_nominators, 50, 2000);
-			edge_per_voter = to_range(edge_per_voter, 1, 16);
-			to_elect = to_range(to_elect, 20, num_validators);
-
-			let do_reduce = true;
-
-			println!("+++ instance with params {} / {} / {} / {} / {:?}({})",
-				num_nominators,
-				num_validators,
-				edge_per_voter,
-				to_elect,
-				mode,
-				mode_u32,
-			);
-
-			ext.execute_with(|| {
-				// initial setup
-				init_active_era();
-
-				assert_ok!(create_validators_with_nominators_for_era::<Test>(
-					num_validators,
-					num_nominators,
-					edge_per_voter as usize,
-					true,
-					None,
-				));
-
-				<EraElectionStatus<Test>>::put(ElectionStatus::Open(1));
-				assert!(<Staking<Test>>::create_stakers_snapshot().0);
-
-				let origin = RawOrigin::Signed(create_funded_user::<Test>("fuzzer", 0, 100));
-
-				// stuff to submit
-				let (winners, compact, score, size) = match mode {
-					Mode::InitialSubmission => {
-						// No need to setup anything
-						get_seq_phragmen_solution::<Test>(do_reduce)
-					},
-					Mode::StrongerSubmission => {
-						let (winners, compact, score, size) = get_weak_solution::<Test>(false);
-						println!("Weak on chain score = {:?}", score);
-						assert_ok!(
-							<Staking<Test>>::submit_election_solution(
-								origin.clone().into(),
-								winners,
-								compact,
-								score,
-								current_era::<Test>(),
-								size,
-							)
-						);
-						get_seq_phragmen_solution::<Test>(do_reduce)
-					},
-					Mode::WeakerSubmission => {
-						let (winners, compact, score, size) = get_seq_phragmen_solution::<Test>(do_reduce);
-						println!("Strong on chain score = {:?}", score);
-						assert_ok!(
-							<Staking<Test>>::submit_election_solution(
-								origin.clone().into(),
-								winners,
-								compact,
-								score,
-								current_era::<Test>(),
-								size,
-							)
-						);
-						get_weak_solution::<Test>(false)
-					}
-				};
-
-				// must have chosen correct number of winners.
-				assert_eq!(winners.len() as u32, <Staking<Test>>::validator_count());
-
-				// final call and origin
-				let call = StakingCall::<Test>::submit_election_solution(
-					winners,
-					compact,
-					score,
-					current_era::<Test>(),
-					size,
-				);
-
-				// actually submit
-				match mode {
-					Mode::WeakerSubmission => {
-						assert_eq!(
-							call.dispatch_bypass_filter(origin.into()).unwrap_err().error,
-							DispatchError::Module {
-								index: 2,
-								error: 16,
-								message: Some("OffchainElectionWeakSubmission"),
-							},
-						);
-					},
-					// NOTE: so exhaustive pattern doesn't work here.. maybe some rust issue?
-					// or due to `#[repr(u32)]`?
-					Mode::InitialSubmission | Mode::StrongerSubmission => {
-						assert_ok!(call.dispatch_bypass_filter(origin.into()));
-					}
-				};
-			})
-		});
-	}
-}
diff --git a/frame/staking/src/benchmarking.rs b/frame/staking/src/benchmarking.rs
index 8e0273622b05..83a67abb3c8e 100644
--- a/frame/staking/src/benchmarking.rs
+++ b/frame/staking/src/benchmarking.rs
@@ -21,7 +21,6 @@ use super::*;
 use crate::Module as Staking;
 use testing_utils::*;
 
-use sp_npos_elections::CompactSolution;
 use sp_runtime::traits::One;
 use frame_system::RawOrigin;
 pub use frame_benchmarking::{
@@ -94,8 +93,8 @@ pub fn create_validator_with_nominators<T: Config>(
 	// Start a new Era
 	let new_validators = Staking::<T>::new_era(SessionIndex::one()).unwrap();
 
-	assert!(new_validators.len() == 1);
-	assert!(new_validators[0] == v_stash, "Our validator was not selected!");
+	assert_eq!(new_validators.len(), 1);
+	assert_eq!(new_validators[0], v_stash, "Our validator was not selected!");
 
 	// Give Era Points
 	let reward = EraRewardPoints::<T::AccountId> {
@@ -541,231 +540,6 @@ benchmarks! {
 		assert!(balance_before > balance_after);
 	}
 
-	// This benchmark create `v` validators intent, `n` nominators intent, in total creating `e`
-	// edges.
-	#[extra]
-	submit_solution_initial {
-		// number of validator intention. This will be equal to `ElectionSize::validators`.
-		let v in 200 .. 400;
-		// number of nominator intention. This will be equal to `ElectionSize::nominators`.
-		let n in 500 .. 1000;
-		// number of assignments. Basically, number of active nominators. This will be equal to
-		// `compact.len()`.
-		let a in 200 .. 400;
-		// number of winners, also ValidatorCount. This will be equal to `winner.len()`.
-		let w in 16 .. 100;
-
-		ensure!(w as usize >= MAX_NOMINATIONS, "doesn't support lower value");
-
-		let winners = create_validators_with_nominators_for_era::<T>(
-			v,
-			n,
-			MAX_NOMINATIONS,
-			false,
-			Some(w),
-		)?;
-
-		// needed for the solution to be generates.
-		assert!(<Staking<T>>::create_stakers_snapshot().0);
-
-		// set number of winners
-		ValidatorCount::put(w);
-
-		// create a assignments in total for the w winners.
-		let (winners, assignments) = create_assignments_for_offchain::<T>(a, winners)?;
-
-		let (
-			winners,
-			compact,
-			score,
-			size
-		) = offchain_election::prepare_submission::<T>(
-			assignments,
-			winners,
-			false,
-			T::BlockWeights::get().max_block,
-		).unwrap();
-
-		assert_eq!(
-			winners.len(), compact.unique_targets().len(),
-			"unique targets ({}) and winners ({}) count not same. This solution is not valid.",
-			compact.unique_targets().len(),
-			winners.len(),
-		);
-
-		// needed for the solution to be accepted
-		<EraElectionStatus<T>>::put(ElectionStatus::Open(T::BlockNumber::from(1u32)));
-
-		let era = <Staking<T>>::current_era().unwrap_or(0);
-		let caller: T::AccountId = account("caller", n, SEED);
-		whitelist_account!(caller);
-	}: {
-		let result = <Staking<T>>::submit_election_solution(
-			RawOrigin::Signed(caller.clone()).into(),
-			winners,
-			compact,
-			score.clone(),
-			era,
-			size,
-		);
-		assert!(result.is_ok());
-	}
-	verify {
-		// new solution has been accepted.
-		assert_eq!(<Staking<T>>::queued_score().unwrap(), score);
-	}
-
-	// same as submit_solution_initial but we place a very weak solution on chian first.
-	submit_solution_better {
-		// number of validator intention.
-		let v in 200 .. 400;
-		// number of nominator intention.
-		let n in 500 .. 1000;
-		// number of assignments. Basically, number of active nominators.
-		let a in 200 .. 400;
-		// number of winners, also ValidatorCount.
-		let w in 16 .. 100;
-
-		ensure!(w as usize >= MAX_NOMINATIONS, "doesn't support lower value");
-
-		let winners = create_validators_with_nominators_for_era::<T>(
-			v,
-			n,
-			MAX_NOMINATIONS,
-			false,
-			Some(w),
-		)?;
-
-		// needed for the solution to be generates.
-		assert!(<Staking<T>>::create_stakers_snapshot().0);
-
-		// set number of winners
-		ValidatorCount::put(w);
-
-		// create a assignments in total for the w winners.
-		let (winners, assignments) = create_assignments_for_offchain::<T>(a, winners)?;
-
-		let single_winner = winners[0].0.clone();
-
-		let (
-			winners,
-			compact,
-			score,
-			size
-		) = offchain_election::prepare_submission::<T>(
-			assignments,
-			winners,
-			false,
-			T::BlockWeights::get().max_block,
-		).unwrap();
-
-		assert_eq!(
-			winners.len(), compact.unique_targets().len(),
-			"unique targets ({}) and winners ({}) count not same. This solution is not valid.",
-			compact.unique_targets().len(),
-			winners.len(),
-		);
-
-		// needed for the solution to be accepted
-		<EraElectionStatus<T>>::put(ElectionStatus::Open(T::BlockNumber::from(1u32)));
-
-		let era = <Staking<T>>::current_era().unwrap_or(0);
-		let caller: T::AccountId = account("caller", n, SEED);
-		whitelist_account!(caller);
-
-		// submit a very bad solution on-chain
-		{
-			// this is needed to fool the chain to accept this solution.
-			ValidatorCount::put(1);
-			let (winners, compact, score, size) = get_single_winner_solution::<T>(single_winner)?;
-			assert!(
-				<Staking<T>>::submit_election_solution(
-					RawOrigin::Signed(caller.clone()).into(),
-					winners,
-					compact,
-					score.clone(),
-					era,
-					size,
-			).is_ok());
-
-			// new solution has been accepted.
-			assert_eq!(<Staking<T>>::queued_score().unwrap(), score);
-			ValidatorCount::put(w);
-		}
-	}: {
-		let result = <Staking<T>>::submit_election_solution(
-			RawOrigin::Signed(caller.clone()).into(),
-			winners,
-			compact,
-			score.clone(),
-			era,
-			size,
-		);
-		assert!(result.is_ok());
-	}
-	verify {
-		// new solution has been accepted.
-		assert_eq!(<Staking<T>>::queued_score().unwrap(), score);
-	}
-
-	// This will be early rejected based on the score.
-	#[extra]
-	submit_solution_weaker {
-		// number of validator intention.
-		let v in 200 .. 400;
-		// number of nominator intention.
-		let n in 500 .. 1000;
-
-		create_validators_with_nominators_for_era::<T>(v, n, MAX_NOMINATIONS, false, None)?;
-
-		// needed for the solution to be generates.
-		assert!(<Staking<T>>::create_stakers_snapshot().0);
-
-		// needed for the solution to be accepted
-		<EraElectionStatus<T>>::put(ElectionStatus::Open(T::BlockNumber::from(1u32)));
-		let era = <Staking<T>>::current_era().unwrap_or(0);
-		let caller: T::AccountId = account("caller", n, SEED);
-		whitelist_account!(caller);
-
-		// submit a seq-phragmen with all the good stuff on chain.
-		{
-			let (winners, compact, score, size) = get_seq_phragmen_solution::<T>(true);
-			assert_eq!(
-				winners.len(), compact.unique_targets().len(),
-				"unique targets ({}) and winners ({}) count not same. This solution is not valid.",
-				compact.unique_targets().len(),
-				winners.len(),
-			);
-			assert!(
-				<Staking<T>>::submit_election_solution(
-					RawOrigin::Signed(caller.clone()).into(),
-					winners,
-					compact,
-					score.clone(),
-					era,
-					size,
-				).is_ok()
-			);
-
-			// new solution has been accepted.
-			assert_eq!(<Staking<T>>::queued_score().unwrap(), score);
-		}
-
-		// prepare a bad solution. This will be very early rejected.
-		let (winners, compact, score, size) = get_weak_solution::<T>(true);
-	}: {
-		assert!(
-			<Staking<T>>::submit_election_solution(
-				RawOrigin::Signed(caller.clone()).into(),
-				winners,
-				compact,
-				score.clone(),
-				era,
-				size,
-			).is_err()
-		);
-	}
-
 	get_npos_voters {
 		// number of validator intention.
 		let v in 200 .. 400;
@@ -896,15 +670,6 @@ mod tests {
 			assert_ok!(closure_to_benchmark());
 		});
 	}
-
-	#[test]
-	#[ignore]
-	fn test_benchmarks_offchain() {
-		ExtBuilder::default().has_stakers(false).build().execute_with(|| {
-			assert_ok!(test_benchmark_submit_solution_better::<Test>());
-			assert_ok!(test_benchmark_submit_solution_weaker::<Test>());
-		});
-	}
 }
 
 impl_benchmark_test_suite!(
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 6fdb20e2bb83..77ef928b92aa 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -278,7 +278,6 @@ pub mod testing_utils;
 pub mod benchmarking;
 
 pub mod slashing;
-pub mod offchain_election;
 pub mod inflation;
 pub mod weights;
 
@@ -292,16 +291,16 @@ use sp_std::{
 use codec::{HasCompact, Encode, Decode};
 use frame_support::{
 	decl_module, decl_event, decl_storage, ensure, decl_error,
-	weights::{Weight, constants::{WEIGHT_PER_MICROS, WEIGHT_PER_NANOS}},
-	storage::IterableStorageMap,
-	dispatch::{
-		DispatchResult, DispatchResultWithPostInfo, DispatchErrorWithPostInfo,
-		WithPostDispatchInfo,
+	weights::{
+		Weight,
+		constants::{WEIGHT_PER_MICROS, WEIGHT_PER_NANOS},
 	},
+	storage::IterableStorageMap,
+	dispatch::{DispatchResult, DispatchResultWithPostInfo},
 	traits::{
 		Currency, LockIdentifier, LockableCurrency, WithdrawReasons, OnUnbalanced, Imbalance, Get,
-		UnixTime, EstimateNextNewSession, EnsureOrigin, CurrencyToVote, IsSubType,
-	}
+		UnixTime, EstimateNextNewSession, EnsureOrigin, CurrencyToVote,
+	},
 };
 use pallet_session::historical;
 use sp_runtime::{
@@ -309,11 +308,7 @@ use sp_runtime::{
 	curve::PiecewiseLinear,
 	traits::{
 		Convert, Zero, StaticLookup, CheckedSub, Saturating, SaturatedConversion,
-		AtLeast32BitUnsigned, Dispatchable,
-	},
-	transaction_validity::{
-		TransactionValidityError, TransactionValidity, ValidTransaction, InvalidTransaction,
-		TransactionSource, TransactionPriority,
+		AtLeast32BitUnsigned,
 	},
 };
 use sp_staking::{
@@ -323,15 +318,10 @@ use sp_staking::{
 #[cfg(feature = "std")]
 use sp_runtime::{Serialize, Deserialize};
 use frame_system::{
-	self as system, ensure_signed, ensure_root, ensure_none,
+	self as system, ensure_signed, ensure_root,
 	offchain::SendTransactionTypes,
 };
-use sp_npos_elections::{
-	ExtendedBalance, Assignment, ElectionScore, ElectionResult as PrimitiveElectionResult,
-	to_supports, EvaluateSupport, seq_phragmen, generate_solution_type, is_score_better, Supports,
-	VoteWeight, CompactSolution, PerThing128,
-};
-use frame_election_provider_support::{ElectionProvider, data_provider};
+use frame_election_provider_support::{ElectionProvider, VoteWeight, Supports, data_provider};
 pub use weights::WeightInfo;
 
 const STAKING_ID: LockIdentifier = *b"staking ";
@@ -343,7 +333,7 @@ macro_rules! log {
 	($level:tt, $patter:expr $(, $values:expr)* $(,)?) => {
 		log::$level!(
 			target: crate::LOG_TARGET,
-			concat!("💸 ", $patter) $(, $values)*
+			concat!("[{:?}] 💸 ", $patter), <frame_system::Pallet<T>>::block_number() $(, $values)*
 		)
 	};
 }
@@ -361,8 +351,6 @@ static_assertions::const_assert!(size_of::<ValidatorIndex>() <= size_of::<u32>()
 static_assertions::const_assert!(size_of::<NominatorIndex>() <= size_of::<u32>());
 
 /// Maximum number of stakers that can be stored in a snapshot.
-pub(crate) const MAX_VALIDATORS: usize = ValidatorIndex::max_value() as usize;
-pub(crate) const MAX_NOMINATORS: usize = NominatorIndex::max_value() as usize;
 pub const MAX_NOMINATIONS: usize =
 	<CompactAssignments as sp_npos_elections::CompactSolution>::LIMIT;
 
@@ -375,14 +363,11 @@ pub type EraIndex = u32;
 pub type RewardPoint = u32;
 
 // Note: Maximum nomination limit is set here -- 16.
-generate_solution_type!(
+sp_npos_elections::generate_solution_type!(
 	#[compact]
 	pub struct CompactAssignments::<NominatorIndex, ValidatorIndex, OffchainAccuracy>(16)
 );
 
-/// Accuracy used for on-chain election.
-pub type ChainAccuracy = Perbill;
-
 /// Accuracy used for off-chain election. This better be small.
 pub type OffchainAccuracy = PerU16;
 
@@ -670,78 +655,6 @@ pub struct UnappliedSlash<AccountId, Balance: HasCompact> {
 	payout: Balance,
 }
 
-/// Indicate how an election round was computed.
-#[derive(PartialEq, Eq, Clone, Copy, Encode, Decode, RuntimeDebug)]
-pub enum ElectionCompute {
-	/// Result was forcefully computed on chain at the end of the session.
-	OnChain,
-	/// Result was submitted and accepted to the chain via a signed transaction.
-	Signed,
-	/// Result was submitted and accepted to the chain via an unsigned transaction (by an
-	/// authority).
-	Unsigned,
-}
-
-/// The result of an election round.
-#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug)]
-pub struct ElectionResult<AccountId, Balance: HasCompact> {
-	/// Flat list of validators who have been elected.
-	elected_stashes: Vec<AccountId>,
-	/// Flat list of new exposures, to be updated in the [`Exposure`] storage.
-	exposures: Vec<(AccountId, Exposure<AccountId, Balance>)>,
-	/// Type of the result. This is kept on chain only to track and report the best score's
-	/// submission type. An optimisation could remove this.
-	compute: ElectionCompute,
-}
-
-/// The status of the upcoming (offchain) election.
-#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug)]
-pub enum ElectionStatus<BlockNumber> {
-	/// Nothing has and will happen for now. submission window is not open.
-	Closed,
-	/// The submission window has been open since the contained block number.
-	Open(BlockNumber),
-}
-
-/// Some indications about the size of the election. This must be submitted with the solution.
-///
-/// Note that these values must reflect the __total__ number, not only those that are present in the
-/// solution. In short, these should be the same size as the size of the values dumped in
-/// `SnapshotValidators` and `SnapshotNominators`.
-#[derive(PartialEq, Eq, Clone, Copy, Encode, Decode, RuntimeDebug, Default)]
-pub struct ElectionSize {
-	/// Number of validators in the snapshot of the current election round.
-	#[codec(compact)]
-	pub validators: ValidatorIndex,
-	/// Number of nominators in the snapshot of the current election round.
-	#[codec(compact)]
-	pub nominators: NominatorIndex,
-}
-
-
-impl<BlockNumber: PartialEq> ElectionStatus<BlockNumber> {
-	pub fn is_open_at(&self, n: BlockNumber) -> bool {
-		*self == Self::Open(n)
-	}
-
-	pub fn is_closed(&self) -> bool {
-		match self {
-			Self::Closed => true,
-			_ => false
-		}
-	}
-
-	pub fn is_open(&self) -> bool {
-		!self.is_closed()
-	}
-}
-
-impl<BlockNumber> Default for ElectionStatus<BlockNumber> {
-	fn default() -> Self {
-		Self::Closed
-	}
-}
-
 /// Means for interacting with a specialized version of the `session` trait.
 ///
 /// This is needed because `Staking` sets the `ValidatorIdOf` of the `pallet_session::Config`
@@ -892,45 +805,12 @@ pub trait Config: frame_system::Config + SendTransactionTypes<Call<Self>> {
 	/// Something that can estimate the next session change, accurately or as a best effort guess.
 	type NextNewSession: EstimateNextNewSession<Self::BlockNumber>;
 
-	/// The number of blocks before the end of the era from which election submissions are allowed.
-	///
-	/// Setting this to zero will disable the offchain compute and only on-chain seq-phragmen will
-	/// be used.
-	///
-	/// This is bounded by being within the last session. Hence, setting it to a value more than the
-	/// length of a session will be pointless.
-	type ElectionLookahead: Get<Self::BlockNumber>;
-
-	/// The overarching call type.
-	type Call: Dispatchable + From<Call<Self>> + IsSubType<Call<Self>> + Clone;
-
-	/// Maximum number of balancing iterations to run in the offchain submission.
-	///
-	/// If set to 0, balance_solution will not be executed at all.
-	type MaxIterations: Get<u32>;
-
-	/// The threshold of improvement that should be provided for a new solution to be accepted.
-	type MinSolutionScoreBump: Get<Perbill>;
-
 	/// The maximum number of nominators rewarded for each validator.
 	///
 	/// For each validator only the `$MaxNominatorRewardedPerValidator` biggest stakers can claim
 	/// their reward. This used to limit the i/o cost for the nominator payout.
 	type MaxNominatorRewardedPerValidator: Get<u32>;
 
-	/// A configuration for base priority of unsigned transactions.
-	///
-	/// This is exposed so that it can be tuned for particular runtime, when
-	/// multiple pallets send unsigned transactions.
-	type UnsignedPriority: Get<TransactionPriority>;
-
-	/// Maximum weight that the unsigned transaction can have.
-	///
-	/// Chose this value with care. On one hand, it should be as high as possible, so the solution
-	/// can contain as many nominators/validators as possible. On the other hand, it should be small
-	/// enough to fit in the block.
-	type OffchainSolutionWeightLimit: Get<Weight>;
-
 	/// Weight information for extrinsics in this pallet.
 	type WeightInfo: WeightInfo;
 }
@@ -964,12 +844,13 @@ enum Releases {
 	V2_0_0,
 	V3_0_0,
 	V4_0_0,
-	V5_0_0,
+	V5_0_0, // blockable validators.
+	V6_0_0, // removal of all storage associated with offchain phragmen.
 }
 
 impl Default for Releases {
 	fn default() -> Self {
-		Releases::V5_0_0
+		Releases::V6_0_0
 	}
 }
 
@@ -1134,47 +1015,11 @@ decl_storage! {
 		/// This is basically in sync with the call to [`SessionManager::new_session`].
 		pub CurrentPlannedSession get(fn current_planned_session): SessionIndex;
 
-		/// Snapshot of validators at the beginning of the current election window. This should only
-		/// have a value when [`EraElectionStatus`] == `ElectionStatus::Open(_)`.
-		///
-		/// TWO_PHASE_NOTE: should be removed once we switch to multi-phase.
-		pub SnapshotValidators get(fn snapshot_validators): Option<Vec<T::AccountId>>;
-
-		/// Snapshot of nominators at the beginning of the current election window. This should only
-		/// have a value when [`EraElectionStatus`] == `ElectionStatus::Open(_)`.
-		///
-		/// TWO_PHASE_NOTE: should be removed once we switch to multi-phase.
-		pub SnapshotNominators get(fn snapshot_nominators): Option<Vec<T::AccountId>>;
-
-		/// The next validator set. At the end of an era, if this is available (potentially from the
-		/// result of an offchain worker), it is immediately used. Otherwise, the on-chain election
-		/// is executed.
-		///
-		/// TWO_PHASE_NOTE: should be removed once we switch to multi-phase.
-		pub QueuedElected get(fn queued_elected): Option<ElectionResult<T::AccountId, BalanceOf<T>>>;
-
-		/// The score of the current [`QueuedElected`].
-		///
-		/// TWO_PHASE_NOTE: should be removed once we switch to multi-phase.
-		pub QueuedScore get(fn queued_score): Option<ElectionScore>;
-
-		/// Flag to control the execution of the offchain election. When `Open(_)`, we accept
-		/// solutions to be submitted.
-		///
-		/// TWO_PHASE_NOTE: should be removed once we switch to multi-phase.
-		pub EraElectionStatus get(fn era_election_status): ElectionStatus<T::BlockNumber>;
-
-		/// True if the current **planned** session is final. Note that this does not take era
-		/// forcing into account.
-		///
-		/// TWO_PHASE_NOTE: should be removed once we switch to multi-phase.
-		pub IsCurrentSessionFinal get(fn is_current_session_final): bool = false;
-
 		/// True if network has been upgraded to this version.
 		/// Storage version of the pallet.
 		///
-		/// This is set to v5.0.0 for new networks.
-		StorageVersion build(|_: &GenesisConfig<T>| Releases::V5_0_0): Releases;
+		/// This is set to v6.0.0 for new networks.
+		StorageVersion build(|_: &GenesisConfig<T>| Releases::V6_0_0): Releases;
 	}
 	add_extra_genesis {
 		config(stakers):
@@ -1213,23 +1058,61 @@ decl_storage! {
 pub mod migrations {
 	use super::*;
 
-	#[derive(Decode)]
-	struct OldValidatorPrefs {
-		#[codec(compact)]
-		pub commission: Perbill
-	}
-	impl OldValidatorPrefs {
-		fn upgraded(self) -> ValidatorPrefs {
-			ValidatorPrefs {
-				commission: self.commission,
-				.. Default::default()
+	pub mod v6 {
+		use super::*;
+		use frame_support::{traits::Get, weights::Weight, pallet_prelude::*};
+
+		macro_rules! generate_storage_types {
+			($name:ident => Value<$value:ty>) => {
+				paste::paste! {
+					struct [<$name Instance>];
+					impl frame_support::traits::StorageInstance for [<$name Instance>] {
+						fn pallet_prefix() -> &'static str {
+							"Staking"
+						}
+						const STORAGE_PREFIX: &'static str = stringify!($name);
+					}
+					type $name = StorageValue<[<$name Instance>], $value, ValueQuery>;
+				}
 			}
 		}
-	}
-	pub fn migrate_to_blockable<T: Config>() -> frame_support::weights::Weight {
-		Validators::<T>::translate::<OldValidatorPrefs, _>(|_, p| Some(p.upgraded()));
-		ErasValidatorPrefs::<T>::translate::<OldValidatorPrefs, _>(|_, _, p| Some(p.upgraded()));
-		T::BlockWeights::get().max_block
+
+		// NOTE: value type doesn't matter, we just set it to () here.
+		generate_storage_types!(SnapshotValidators => Value<()>);
+		generate_storage_types!(SnapshotNominators => Value<()>);
+		generate_storage_types!(QueuedElected => Value<()>);
+		generate_storage_types!(QueuedScore => Value<()>);
+		generate_storage_types!(EraElectionStatus => Value<()>);
+		generate_storage_types!(IsCurrentSessionFinal => Value<()>);
+
+		/// check to execute prior to migration.
+		pub fn pre_migrate<T: Config>() -> Result<(), &'static str> {
+			// these may or may not exist.
+			log!(info, "SnapshotValidators.exits()? {:?}", SnapshotValidators::exists());
+			log!(info, "SnapshotNominators.exits()? {:?}", SnapshotNominators::exists());
+			log!(info, "QueuedElected.exits()? {:?}", QueuedElected::exists());
+			log!(info, "QueuedScore.exits()? {:?}", QueuedScore::exists());
+			// these must exist.
+			assert!(IsCurrentSessionFinal::exists(), "IsCurrentSessionFinal storage item not found!");
+			assert!(EraElectionStatus::exists(), "EraElectionStatus storage item not found!");
+			Ok(())
+		}
+
+		/// Migrate storage to v6.
+		pub fn migrate<T: Config>() -> Weight {
+			log!(info, "Migrating staking to Releases::V6_0_0");
+
+			SnapshotValidators::kill();
+			SnapshotNominators::kill();
+			QueuedElected::kill();
+			QueuedScore::kill();
+			EraElectionStatus::kill();
+			IsCurrentSessionFinal::kill();
+
+			StorageVersion::put(Releases::V6_0_0);
+			log!(info, "Done.");
+			T::DbWeight::get().writes(6 + 1)
+		}
 	}
 }
 
@@ -1247,10 +1130,8 @@ decl_event!(
 		/// An old slashing report from a prior era was discarded because it could
 		/// not be processed. \[session_index\]
 		OldSlashingReportDiscarded(SessionIndex),
-		/// A new set of stakers was elected with the given \[compute\].
-		StakingElection(ElectionCompute),
-		/// A new solution for the upcoming election has been stored. \[compute\]
-		SolutionStored(ElectionCompute),
+		/// A new set of stakers was elected.
+		StakingElection,
 		/// An account has bonded this amount. \[stash, amount\]
 		///
 		/// NOTE: This event is only emitted when funds are bonded via a dispatchable. Notably,
@@ -1299,37 +1180,6 @@ decl_error! {
 		NotSortedAndUnique,
 		/// Rewards for this era have already been claimed for this validator.
 		AlreadyClaimed,
-		/// The submitted result is received out of the open window.
-		OffchainElectionEarlySubmission,
-		/// The submitted result is not as good as the one stored on chain.
-		OffchainElectionWeakSubmission,
-		/// The snapshot data of the current window is missing.
-		SnapshotUnavailable,
-		/// Incorrect number of winners were presented.
-		OffchainElectionBogusWinnerCount,
-		/// One of the submitted winners is not an active candidate on chain (index is out of range
-		/// in snapshot).
-		OffchainElectionBogusWinner,
-		/// Error while building the assignment type from the compact. This can happen if an index
-		/// is invalid, or if the weights _overflow_.
-		OffchainElectionBogusCompact,
-		/// One of the submitted nominators is not an active nominator on chain.
-		OffchainElectionBogusNominator,
-		/// One of the submitted nominators has an edge to which they have not voted on chain.
-		OffchainElectionBogusNomination,
-		/// One of the submitted nominators has an edge which is submitted before the last non-zero
-		/// slash of the target.
-		OffchainElectionSlashedNomination,
-		/// A self vote must only be originated from a validator to ONLY themselves.
-		OffchainElectionBogusSelfVote,
-		/// The submitted result has unknown edges that are not among the presented winners.
-		OffchainElectionBogusEdge,
-		/// The claimed score does not match with the one computed from the data.
-		OffchainElectionBogusScore,
-		/// The election size is invalid.
-		OffchainElectionBogusElectionSize,
-		/// The call is not allowed at the given time due to restrictions of election period.
-		CallNotAllowed,
 		/// Incorrect previous history depth input provided.
 		IncorrectHistoryDepth,
 		/// Incorrect number of slashing spans provided.
@@ -1358,23 +1208,6 @@ decl_module! {
 		/// intervention.
 		const SlashDeferDuration: EraIndex = T::SlashDeferDuration::get();
 
-		/// The number of blocks before the end of the era from which election submissions are allowed.
-		///
-		/// Setting this to zero will disable the offchain compute and only on-chain seq-phragmen will
-		/// be used.
-		///
-		/// This is bounded by being within the last session. Hence, setting it to a value more than the
-		/// length of a session will be pointless.
-		const ElectionLookahead: T::BlockNumber = T::ElectionLookahead::get();
-
-		/// Maximum number of balancing iterations to run in the offchain submission.
-		///
-		/// If set to 0, balance_solution will not be executed at all.
-		const MaxIterations: u32 = T::MaxIterations::get();
-
-		/// The threshold of improvement that should be provided for a new solution to be accepted.
-		const MinSolutionScoreBump: Perbill = T::MinSolutionScoreBump::get();
-
 		/// The maximum number of nominators rewarded for each validator.
 		///
 		/// For each validator only the `$MaxNominatorRewardedPerValidator` biggest stakers can claim
@@ -1385,82 +1218,11 @@ decl_module! {
 
 		fn deposit_event() = default;
 
-		fn on_runtime_upgrade() -> frame_support::weights::Weight {
-			if StorageVersion::get() == Releases::V4_0_0 {
-				StorageVersion::put(Releases::V5_0_0);
-				migrations::migrate_to_blockable::<T>()
+		fn on_runtime_upgrade() -> Weight {
+			if StorageVersion::get() == Releases::V5_0_0 {
+				migrations::v6::migrate::<T>()
 			} else {
-				0
-			}
-		}
-
-		/// sets `ElectionStatus` to `Open(now)` where `now` is the block number at which the
-		/// election window has opened, if we are at the last session and less blocks than
-		/// `T::ElectionLookahead` is remaining until the next new session schedule. The offchain
-		/// worker, if applicable, will execute at the end of the current block, and solutions may
-		/// be submitted.
-		fn on_initialize(now: T::BlockNumber) -> Weight {
-			let mut consumed_weight = 0;
-			let mut add_weight = |reads, writes, weight| {
-				consumed_weight += T::DbWeight::get().reads_writes(reads, writes);
-				consumed_weight += weight;
-			};
-
-			if
-				// if we don't have any ongoing offchain compute.
-				Self::era_election_status().is_closed() &&
-				// either current session final based on the plan, or we're forcing.
-				(Self::is_current_session_final() || Self::will_era_be_forced())
-			{
-				let (maybe_next_session_change, estimate_next_new_session_weight) =
-					T::NextNewSession::estimate_next_new_session(now);
-
-				if let Some(next_session_change) = maybe_next_session_change {
-					if let Some(remaining) = next_session_change.checked_sub(&now) {
-						if remaining <= T::ElectionLookahead::get() && !remaining.is_zero() {
-							// create snapshot.
-							let (did_snapshot, snapshot_weight) = Self::create_stakers_snapshot();
-							add_weight(0, 0, snapshot_weight);
-							if did_snapshot {
-								// Set the flag to make sure we don't waste any compute here in the same era
-								// after we have triggered the offline compute.
-								<EraElectionStatus<T>>::put(
-									ElectionStatus::<T::BlockNumber>::Open(now)
-								);
-								add_weight(0, 1, 0);
-								log!(info, "Election window is Open({:?}). Snapshot created", now);
-							} else {
-								log!(warn, "Failed to create snapshot at {:?}.", now);
-							}
-						}
-					}
-				} else {
-					log!(warn, "Estimating next session change failed.");
-				}
-				add_weight(0, 0, estimate_next_new_session_weight)
-			}
-			// For `era_election_status`, `is_current_session_final`, `will_era_be_forced`
-			add_weight(3, 0, 0);
-			// Additional read from `on_finalize`
-			add_weight(1, 0, 0);
-			consumed_weight
-		}
-
-		/// Check if the current block number is the one at which the election window has been set
-		/// to open. If so, it runs the offchain worker code.
-		fn offchain_worker(now: T::BlockNumber) {
-			use offchain_election::{set_check_offchain_execution_status, compute_offchain_election};
-			if Self::era_election_status().is_open_at(now) {
-				let offchain_status = set_check_offchain_execution_status::<T>(now);
-				if let Err(why) = offchain_status {
-					log!(warn, "skipping offchain worker in open election window due to [{}]", why);
-				} else {
-					if let Err(e) = compute_offchain_election::<T>() {
-						log!(error, "Error in election offchain worker: {:?}", e);
-					} else {
-						log!(debug, "Executed offchain worker thread without errors.");
-					}
-				}
+				T::DbWeight::get().reads(1)
 			}
 		}
 
@@ -1488,17 +1250,7 @@ decl_module! {
 			);
 
 			use sp_runtime::UpperOf;
-			// see the documentation of `Assignment::try_normalize`. Now we can ensure that this
-			// will always return `Ok`.
-			// 1. Maximum sum of Vec<ChainAccuracy> must fit into `UpperOf<ChainAccuracy>`.
-			assert!(
-				<usize as TryInto<UpperOf<ChainAccuracy>>>::try_into(MAX_NOMINATIONS)
-				.unwrap()
-				.checked_mul(<ChainAccuracy>::one().deconstruct().try_into().unwrap())
-				.is_some()
-			);
-
-			// 2. Maximum sum of Vec<OffchainAccuracy> must fit into `UpperOf<OffchainAccuracy>`.
+			// 1. Maximum sum of Vec<OffchainAccuracy> must fit into `UpperOf<OffchainAccuracy>`.
 			assert!(
 				<usize as TryInto<UpperOf<OffchainAccuracy>>>::try_into(MAX_NOMINATIONS)
 				.unwrap()
@@ -1599,7 +1351,6 @@ decl_module! {
 		/// # </weight>
 		#[weight = T::WeightInfo::bond_extra()]
 		fn bond_extra(origin, #[compact] max_additional: BalanceOf<T>) {
-			ensure!(Self::era_election_status().is_closed(), Error::<T>::CallNotAllowed);
 			let stash = ensure_signed(origin)?;
 
 			let controller = Self::bonded(&stash).ok_or(Error::<T>::NotStash)?;
@@ -1652,7 +1403,6 @@ decl_module! {
 		/// </weight>
 		#[weight = T::WeightInfo::unbond()]
 		fn unbond(origin, #[compact] value: BalanceOf<T>) {
-			ensure!(Self::era_election_status().is_closed(), Error::<T>::CallNotAllowed);
 			let controller = ensure_signed(origin)?;
 			let mut ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
 			ensure!(
@@ -1712,7 +1462,6 @@ decl_module! {
 		/// # </weight>
 		#[weight = T::WeightInfo::withdraw_unbonded_kill(*num_slashing_spans)]
 		fn withdraw_unbonded(origin, num_slashing_spans: u32) -> DispatchResultWithPostInfo {
-			ensure!(Self::era_election_status().is_closed(), Error::<T>::CallNotAllowed);
 			let controller = ensure_signed(origin)?;
 			let mut ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
 			let (stash, old_total) = (ledger.stash.clone(), ledger.total);
@@ -1767,7 +1516,6 @@ decl_module! {
 		/// # </weight>
 		#[weight = T::WeightInfo::validate()]
 		pub fn validate(origin, prefs: ValidatorPrefs) {
-			ensure!(Self::era_election_status().is_closed(), Error::<T>::CallNotAllowed);
 			let controller = ensure_signed(origin)?;
 			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
 			let stash = &ledger.stash;
@@ -1796,7 +1544,6 @@ decl_module! {
 		/// # </weight>
 		#[weight = T::WeightInfo::nominate(targets.len() as u32)]
 		pub fn nominate(origin, targets: Vec<<T::Lookup as StaticLookup>::Source>) {
-			ensure!(Self::era_election_status().is_closed(), Error::<T>::CallNotAllowed);
 			let controller = ensure_signed(origin)?;
 			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
 			let stash = &ledger.stash;
@@ -1844,7 +1591,6 @@ decl_module! {
 		/// # </weight>
 		#[weight = T::WeightInfo::chill()]
 		fn chill(origin) {
-			ensure!(Self::era_election_status().is_closed(), Error::<T>::CallNotAllowed);
 			let controller = ensure_signed(origin)?;
 			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
 			Self::chill_stash(&ledger.stash);
@@ -2088,7 +1834,6 @@ decl_module! {
 		/// # </weight>
 		#[weight = T::WeightInfo::payout_stakers_alive_staked(T::MaxNominatorRewardedPerValidator::get())]
 		fn payout_stakers(origin, validator_stash: T::AccountId, era: EraIndex) -> DispatchResult {
-			ensure!(Self::era_election_status().is_closed(), Error::<T>::CallNotAllowed);
 			ensure_signed(origin)?;
 			Self::do_payout_stakers(validator_stash, era)
 		}
@@ -2109,7 +1854,6 @@ decl_module! {
 		/// # </weight>
 		#[weight = T::WeightInfo::rebond(MAX_UNLOCKING_CHUNKS as u32)]
 		fn rebond(origin, #[compact] value: BalanceOf<T>) -> DispatchResultWithPostInfo {
-			ensure!(Self::era_election_status().is_closed(), Error::<T>::CallNotAllowed);
 			let controller = ensure_signed(origin)?;
 			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
 			ensure!(!ledger.unlocking.is_empty(), Error::<T>::NoUnlockChunk);
@@ -2188,121 +1932,6 @@ decl_module! {
 			T::Currency::remove_lock(STAKING_ID, &stash);
 		}
 
-		/// Submit an election result to the chain. If the solution:
-		///
-		/// 1. is valid.
-		/// 2. has a better score than a potentially existing solution on chain.
-		///
-		/// then, it will be _put_ on chain.
-		///
-		/// A solution consists of two pieces of data:
-		///
-		/// 1. `winners`: a flat vector of all the winners of the round.
-		/// 2. `assignments`: the compact version of an assignment vector that encodes the edge
-		///    weights.
-		///
-		/// Both of which may be computed using _phragmen_, or any other algorithm.
-		///
-		/// Additionally, the submitter must provide:
-		///
-		/// - The `score` that they claim their solution has.
-		///
-		/// Both validators and nominators will be represented by indices in the solution. The
-		/// indices should respect the corresponding types ([`ValidatorIndex`] and
-		/// [`NominatorIndex`]). Moreover, they should be valid when used to index into
-		/// [`SnapshotValidators`] and [`SnapshotNominators`]. Any invalid index will cause the
-		/// solution to be rejected. These two storage items are set during the election window and
-		/// may be used to determine the indices.
-		///
-		/// A solution is valid if:
-		///
-		/// 0. It is submitted when [`EraElectionStatus`] is `Open`.
-		/// 1. Its claimed score is equal to the score computed on-chain.
-		/// 2. Presents the correct number of winners.
-		/// 3. All indexes must be value according to the snapshot vectors. All edge values must
-		///    also be correct and should not overflow the granularity of the ratio type (i.e. 256
-		///    or billion).
-		/// 4. For each edge, all targets are actually nominated by the voter.
-		/// 5. Has correct self-votes.
-		///
-		/// A solutions score is consisted of 3 parameters:
-		///
-		/// 1. `min { support.total }` for each support of a winner. This value should be maximized.
-		/// 2. `sum { support.total }` for each support of a winner. This value should be minimized.
-		/// 3. `sum { support.total^2 }` for each support of a winner. This value should be
-		///    minimized (to ensure less variance)
-		///
-		/// # <weight>
-		/// The transaction is assumed to be the longest path, a better solution.
-		///   - Initial solution is almost the same.
-		///   - Worse solution is retraced in pre-dispatch-checks which sets its own weight.
-		/// # </weight>
-		#[weight = T::WeightInfo::submit_solution_better(
-			size.validators.into(),
-			size.nominators.into(),
-			compact.voter_count() as u32,
-			winners.len() as u32,
-		)]
-		pub fn submit_election_solution(
-			origin,
-			winners: Vec<ValidatorIndex>,
-			compact: CompactAssignments,
-			score: ElectionScore,
-			era: EraIndex,
-			size: ElectionSize,
-		) -> DispatchResultWithPostInfo {
-			let _who = ensure_signed(origin)?;
-			Self::check_and_replace_solution(
-				winners,
-				compact,
-				ElectionCompute::Signed,
-				score,
-				era,
-				size,
-			)
-		}
-
-		/// Unsigned version of `submit_election_solution`.
-		///
-		/// Note that this must pass the [`ValidateUnsigned`] check which only allows transactions
-		/// from the local node to be included. In other words, only the block author can include a
-		/// transaction in the block.
-		///
-		/// # <weight>
-		/// See [`submit_election_solution`].
-		/// # </weight>
-		#[weight = T::WeightInfo::submit_solution_better(
-			size.validators.into(),
-			size.nominators.into(),
-			compact.voter_count() as u32,
-			winners.len() as u32,
-		)]
-		pub fn submit_election_solution_unsigned(
-			origin,
-			winners: Vec<ValidatorIndex>,
-			compact: CompactAssignments,
-			score: ElectionScore,
-			era: EraIndex,
-			size: ElectionSize,
-		) -> DispatchResultWithPostInfo {
-			ensure_none(origin)?;
-			let adjustments = Self::check_and_replace_solution(
-				winners,
-				compact,
-				ElectionCompute::Unsigned,
-				score,
-				era,
-				size,
-			).expect(
-				"An unsigned solution can only be submitted by validators; A validator should \
-				always produce correct solutions, else this block should not be imported, thus \
-				effectively depriving the validators from their authoring reward. Hence, this panic
-				is expected."
-			);
-
-			Ok(adjustments)
-		}
-
 		/// Remove the given nominations from the calling validator.
 		///
 		/// Effects will be felt at the beginning of the next era.
@@ -2319,7 +1948,6 @@ decl_module! {
 		#[weight = T::WeightInfo::kick(who.len() as u32)]
 		pub fn kick(origin, who: Vec<<T::Lookup as StaticLookup>::Source>) -> DispatchResult {
 			let controller = ensure_signed(origin)?;
-			ensure!(Self::era_election_status().is_closed(), Error::<T>::CallNotAllowed);
 			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
 			let stash = &ledger.stash;
 
@@ -2369,52 +1997,6 @@ impl<T: Config> Module<T> {
 		})
 	}
 
-	/// Dump the list of validators and nominators into vectors and keep them on-chain.
-	///
-	/// This data is used to efficiently evaluate election results. returns `true` if the operation
-	/// is successful.
-	pub fn create_stakers_snapshot() -> (bool, Weight) {
-		let mut consumed_weight = 0;
-		let mut add_db_reads_writes = |reads, writes| {
-			consumed_weight += T::DbWeight::get().reads_writes(reads, writes);
-		};
-		let validators = <Validators<T>>::iter().map(|(v, _)| v).collect::<Vec<_>>();
-		let mut nominators = <Nominators<T>>::iter().map(|(n, _)| n).collect::<Vec<_>>();
-
-		let num_validators = validators.len();
-		let num_nominators = nominators.len();
-		add_db_reads_writes((num_validators + num_nominators) as Weight, 0);
-
-		if
-			num_validators > MAX_VALIDATORS ||
-			num_nominators.saturating_add(num_validators) > MAX_NOMINATORS
-		{
-			log!(
-				warn,
-				"Snapshot size too big [{} <> {}][{} <> {}].",
-				num_validators,
-				MAX_VALIDATORS,
-				num_nominators,
-				MAX_NOMINATORS,
-			);
-			(false, consumed_weight)
-		} else {
-			// all validators nominate themselves;
-			nominators.extend(validators.clone());
-
-			<SnapshotValidators<T>>::put(validators);
-			<SnapshotNominators<T>>::put(nominators);
-			add_db_reads_writes(0, 2);
-			(true, consumed_weight)
-		}
-	}
-
-	/// Clears both snapshots of stakers.
-	fn kill_stakers_snapshot() {
-		<SnapshotValidators<T>>::kill();
-		<SnapshotNominators<T>>::kill();
-	}
-
 	fn do_payout_stakers(validator_stash: T::AccountId, era: EraIndex) -> DispatchResult {
 		// Validate input data
 		let current_era = CurrentEra::get().ok_or(Error::<T>::InvalidEraToReward)?;
@@ -2571,18 +2153,15 @@ impl<T: Config> Module<T> {
 				.unwrap_or(0); // Must never happen.
 
 			match ForceEra::get() {
+				// Will set to default again, which is `NotForcing`.
 				Forcing::ForceNew => ForceEra::kill(),
+				// Short circuit to `new_era`.
 				Forcing::ForceAlways => (),
+				// Only go to `new_era` if deadline reached.
 				Forcing::NotForcing if era_length >= T::SessionsPerEra::get() => (),
 				_ => {
-					// Either `ForceNone`, or `NotForcing && era_length < T::SessionsPerEra::get()`.
-					if era_length + 1 == T::SessionsPerEra::get() {
-						IsCurrentSessionFinal::put(true);
-					} else if era_length >= T::SessionsPerEra::get() {
-						// Should only happen when we are ready to trigger an era but we have ForceNone,
-						// otherwise previous arm would short circuit.
-						Self::close_election_window();
-					}
+					// either `Forcing::ForceNone`,
+					// or `Forcing::NotForcing if era_length >= T::SessionsPerEra::get()`.
 					return None
 				},
 			}
@@ -2591,219 +2170,11 @@ impl<T: Config> Module<T> {
 			Self::new_era(session_index)
 		} else {
 			// Set initial era
+			log!(debug, "Starting the first era.");
 			Self::new_era(session_index)
 		}
 	}
 
-	/// Basic and cheap checks that we perform in validate unsigned, and in the execution.
-	///
-	/// State reads: ElectionState, CurrentEr, QueuedScore.
-	///
-	/// This function does weight refund in case of errors, which is based upon the fact that it is
-	/// called at the very beginning of the call site's function.
-	pub fn pre_dispatch_checks(score: ElectionScore, era: EraIndex) -> DispatchResultWithPostInfo {
-		// discard solutions that are not in-time
-		// check window open
-		ensure!(
-			Self::era_election_status().is_open(),
-			Error::<T>::OffchainElectionEarlySubmission.with_weight(T::DbWeight::get().reads(1)),
-		);
-
-		// check current era.
-		if let Some(current_era) = Self::current_era() {
-			ensure!(
-				current_era == era,
-				Error::<T>::OffchainElectionEarlySubmission.with_weight(T::DbWeight::get().reads(2)),
-			)
-		}
-
-		// assume the given score is valid. Is it better than what we have on-chain, if we have any?
-		if let Some(queued_score) = Self::queued_score() {
-			ensure!(
-				is_score_better(score, queued_score, T::MinSolutionScoreBump::get()),
-				Error::<T>::OffchainElectionWeakSubmission.with_weight(T::DbWeight::get().reads(3)),
-			)
-		}
-
-		Ok(None.into())
-	}
-
-	/// Checks a given solution and if correct and improved, writes it on chain as the queued result
-	/// of the next round. This may be called by both a signed and an unsigned transaction.
-	pub fn check_and_replace_solution(
-		winners: Vec<ValidatorIndex>,
-		compact_assignments: CompactAssignments,
-		compute: ElectionCompute,
-		claimed_score: ElectionScore,
-		era: EraIndex,
-		election_size: ElectionSize,
-	) -> DispatchResultWithPostInfo {
-		// Do the basic checks. era, claimed score and window open.
-		let _ = Self::pre_dispatch_checks(claimed_score, era)?;
-
-		// before we read any further state, we check that the unique targets in compact is same as
-		// compact. is a all in-memory check and easy to do. Moreover, it ensures that the solution
-		// is not full of bogus edges that can cause lots of reads to SlashingSpans. Thus, we can
-		// assume that the storage access of this function is always O(|winners|), not
-		// O(|compact.edge_count()|).
-		ensure!(
-			compact_assignments.unique_targets().len() == winners.len(),
-			Error::<T>::OffchainElectionBogusWinnerCount,
-		);
-
-		// Check that the number of presented winners is sane. Most often we have more candidates
-		// than we need. Then it should be `Self::validator_count()`. Else it should be all the
-		// candidates.
-		let snapshot_validators_length = <SnapshotValidators<T>>::decode_len()
-			.map(|l| l as u32)
-			.ok_or_else(|| Error::<T>::SnapshotUnavailable)?;
-
-		// size of the solution must be correct.
-		ensure!(
-			snapshot_validators_length == u32::from(election_size.validators),
-			Error::<T>::OffchainElectionBogusElectionSize,
-		);
-
-		// check the winner length only here and when we know the length of the snapshot validators
-		// length.
-		let desired_winners = Self::validator_count().min(snapshot_validators_length);
-		ensure!(winners.len() as u32 == desired_winners, Error::<T>::OffchainElectionBogusWinnerCount);
-
-		let snapshot_nominators_len = <SnapshotNominators<T>>::decode_len()
-			.map(|l| l as u32)
-			.ok_or_else(|| Error::<T>::SnapshotUnavailable)?;
-
-		// rest of the size of the solution must be correct.
-		ensure!(
-			snapshot_nominators_len == election_size.nominators,
-			Error::<T>::OffchainElectionBogusElectionSize,
-		);
-
-		// decode snapshot validators.
-		let snapshot_validators = Self::snapshot_validators()
-			.ok_or(Error::<T>::SnapshotUnavailable)?;
-
-		// check if all winners were legit; this is rather cheap. Replace with accountId.
-		let winners = winners.into_iter().map(|widx| {
-			// NOTE: at the moment, since staking is explicitly blocking any offence until election
-			// is closed, we don't check here if the account id at `snapshot_validators[widx]` is
-			// actually a validator. If this ever changes, this loop needs to also check this.
-			snapshot_validators.get(widx as usize).cloned().ok_or(Error::<T>::OffchainElectionBogusWinner)
-		}).collect::<Result<Vec<T::AccountId>, Error<T>>>()?;
-
-		// decode the rest of the snapshot.
-		let snapshot_nominators = Self::snapshot_nominators()
-			.ok_or(Error::<T>::SnapshotUnavailable)?;
-
-		// helpers
-		let nominator_at = |i: NominatorIndex| -> Option<T::AccountId> {
-			snapshot_nominators.get(i as usize).cloned()
-		};
-		let validator_at = |i: ValidatorIndex| -> Option<T::AccountId> {
-			snapshot_validators.get(i as usize).cloned()
-		};
-
-		// un-compact.
-		let assignments = compact_assignments.into_assignment(
-			nominator_at,
-			validator_at,
-		).map_err(|e| {
-			// log the error since it is not propagated into the runtime error.
-			log!(warn, "un-compacting solution failed due to {:?}", e);
-			Error::<T>::OffchainElectionBogusCompact
-		})?;
-
-		// check all nominators actually including the claimed vote. Also check correct self votes.
-		// Note that we assume all validators and nominators in `assignments` are properly bonded,
-		// because they are coming from the snapshot via a given index.
-		for Assignment { who, distribution } in assignments.iter() {
-			let is_validator = <Validators<T>>::contains_key(&who);
-			let maybe_nomination = Self::nominators(&who);
-
-			if !(maybe_nomination.is_some() ^ is_validator) {
-				// all of the indices must map to either a validator or a nominator. If this is ever
-				// not the case, then the locking system of staking is most likely faulty, or we
-				// have bigger problems.
-				log!(error, "detected an error in the staking locking and snapshot.");
-				// abort.
-				return Err(Error::<T>::OffchainElectionBogusNominator.into());
-			}
-
-			if !is_validator {
-				// a normal vote
-				let nomination = maybe_nomination.expect(
-					"exactly one of `maybe_validator` and `maybe_nomination.is_some` is true. \
-					is_validator is false; maybe_nomination is some; qed"
-				);
-
-				// NOTE: we don't really have to check here if the sum of all edges are the
-				// nominator correct. Un-compacting assures this by definition.
-
-				for (t, _) in distribution {
-					// each target in the provided distribution must be actually nominated by the
-					// nominator after the last non-zero slash.
-					if nomination.targets.iter().find(|&tt| tt == t).is_none() {
-						return Err(Error::<T>::OffchainElectionBogusNomination.into());
-					}
-
-					if <Self as Store>::SlashingSpans::get(&t).map_or(
-						false,
-						|spans| nomination.submitted_in < spans.last_nonzero_slash(),
-					) {
-						return Err(Error::<T>::OffchainElectionSlashedNomination.into());
-					}
-				}
-			} else {
-				// a self vote
-				ensure!(distribution.len() == 1, Error::<T>::OffchainElectionBogusSelfVote);
-				ensure!(distribution[0].0 == *who, Error::<T>::OffchainElectionBogusSelfVote);
-				// defensive only. A compact assignment of length one does NOT encode the weight and
-				// it is always created to be 100%.
-				ensure!(
-					distribution[0].1 == OffchainAccuracy::one(),
-					Error::<T>::OffchainElectionBogusSelfVote,
-				);
-			}
-		}
-
-		// convert into staked assignments.
-		let staked_assignments = sp_npos_elections::assignment_ratio_to_staked(
-			assignments,
-			Self::slashable_balance_of_fn(),
-		);
-
-		// build the support map thereof in order to evaluate.
-		let supports = to_supports(&winners, &staked_assignments)
-			.map_err(|_| Error::<T>::OffchainElectionBogusEdge)?;
-
-		// Check if the score is the same as the claimed one.
-		let submitted_score = (&supports).evaluate();
-		ensure!(submitted_score == claimed_score, Error::<T>::OffchainElectionBogusScore);
-
-		// At last, alles Ok. Exposures and store the result.
-		let exposures = Self::collect_exposures(supports);
-		log!(
-			info,
-			"A better solution (with compute {:?} and score {:?}) has been validated and stored \
-			 on chain.",
-			compute,
-			submitted_score,
-		);
-
-		// write new results.
-		<QueuedElected<T>>::put(ElectionResult {
-			elected_stashes: winners,
-			exposures,
-			compute,
-		});
-		QueuedScore::put(submitted_score);
-
-		// emit event.
-		Self::deposit_event(RawEvent::SolutionStored(compute));
-
-		Ok(None.into())
-	}
-
 	/// Start a session potentially starting an era.
 	fn start_session(start_session: SessionIndex) {
 		let next_active_era = Self::active_era().map(|e| e.index + 1).unwrap_or(0);
@@ -2912,251 +2283,27 @@ impl<T: Config> Module<T> {
 		}
 
 		// Set staking information for new era.
-		let maybe_new_validators = Self::select_and_update_validators(current_era);
-		// TWO_PHASE_NOTE: use this later on.
-		let _unused_new_validators = Self::enact_election(current_era);
+		let maybe_new_validators = Self::enact_election(current_era);
 
 		maybe_new_validators
 	}
 
-	/// Remove all the storage items associated with the election.
-	fn close_election_window() {
-		// Close window.
-		<EraElectionStatus<T>>::put(ElectionStatus::Closed);
-		// Kill snapshots.
-		Self::kill_stakers_snapshot();
-		// Don't track final session.
-		IsCurrentSessionFinal::put(false);
-	}
-
-	/// Select the new validator set at the end of the era.
-	///
-	/// Runs [`try_do_phragmen`] and updates the following storage items:
-	/// - [`EraElectionStatus`]: with `None`.
-	/// - [`ErasStakers`]: with the new staker set.
-	/// - [`ErasStakersClipped`].
-	/// - [`ErasValidatorPrefs`].
-	/// - [`ErasTotalStake`]: with the new total stake.
-	/// - [`SnapshotValidators`] and [`SnapshotNominators`] are both removed.
-	///
-	/// Internally, [`QueuedElected`], snapshots and [`QueuedScore`] are also consumed.
-	///
-	/// If the election has been successful, It passes the new set upwards.
+	/// Enact and process the election using the `ElectionProvider` type.
 	///
-	/// This should only be called at the end of an era.
-	fn select_and_update_validators(current_era: EraIndex) -> Option<Vec<T::AccountId>> {
-		if let Some(ElectionResult::<T::AccountId, BalanceOf<T>> {
-			elected_stashes,
-			exposures,
-			compute,
-		}) = Self::try_do_election() {
-			// Totally close the election round and data.
-			Self::close_election_window();
-
-			// Populate Stakers and write slot stake.
-			let mut total_stake: BalanceOf<T> = Zero::zero();
-			exposures.into_iter().for_each(|(stash, exposure)| {
-				total_stake = total_stake.saturating_add(exposure.total);
-				<ErasStakers<T>>::insert(current_era, &stash, &exposure);
-
-				let mut exposure_clipped = exposure;
-				let clipped_max_len = T::MaxNominatorRewardedPerValidator::get() as usize;
-				if exposure_clipped.others.len() > clipped_max_len {
-					exposure_clipped.others.sort_by(|a, b| a.value.cmp(&b.value).reverse());
-					exposure_clipped.others.truncate(clipped_max_len);
-				}
-				<ErasStakersClipped<T>>::insert(&current_era, &stash, exposure_clipped);
-			});
-
-			// Insert current era staking information
-			<ErasTotalStake<T>>::insert(&current_era, total_stake);
-
-			// collect the pref of all winners
-			for stash in &elected_stashes {
-				let pref = Self::validators(stash);
-				<ErasValidatorPrefs<T>>::insert(&current_era, stash, pref);
-			}
-
-			// emit event
-			Self::deposit_event(RawEvent::StakingElection(compute));
-
-			if current_era > 0 {
-				log!(
-					info,
-					"new validator set of size {:?} has been elected via {:?} for staring era {:?}",
-					elected_stashes.len(),
-					compute,
-					current_era,
+	/// This will also process the election, as noted in [`process_election`].
+	fn enact_election(current_era: EraIndex) -> Option<Vec<T::AccountId>> {
+		T::ElectionProvider::elect()
+			.map_err(|e| {
+				log!(warn, "election provider failed due to {:?}", e)
+			})
+			.and_then(|(res, weight)| {
+				<frame_system::Pallet<T>>::register_extra_weight_unchecked(
+					weight,
+					frame_support::weights::DispatchClass::Mandatory,
 				);
-			}
-
-			Some(elected_stashes)
-		} else {
-			None
-		}
-	}
-
-	/// Select a new validator set from the assembled stakers and their role preferences. It tries
-	/// first to peek into [`QueuedElected`]. Otherwise, it runs a new on-chain phragmen election.
-	///
-	/// If [`QueuedElected`] and [`QueuedScore`] exists, they are both removed. No further storage
-	/// is updated.
-	fn try_do_election() -> Option<ElectionResult<T::AccountId, BalanceOf<T>>> {
-		// an election result from either a stored submission or locally executed one.
-		let next_result = <QueuedElected<T>>::take().or_else(||
-			Self::do_on_chain_phragmen()
-		);
-
-		// either way, kill this. We remove it here to make sure it always has the exact same
-		// lifetime as `QueuedElected`.
-		QueuedScore::kill();
-
-		next_result
-	}
-
-	/// Execute election and return the new results. The edge weights are processed into support
-	/// values.
-	///
-	/// This is basically a wrapper around [`Self::do_phragmen`] which translates
-	/// `PrimitiveElectionResult` into `ElectionResult`.
-	///
-	/// No storage item is updated.
-	pub fn do_on_chain_phragmen() -> Option<ElectionResult<T::AccountId, BalanceOf<T>>> {
-		if let Some(phragmen_result) = Self::do_phragmen::<ChainAccuracy>(0) {
-			let elected_stashes = phragmen_result.winners.iter()
-				.map(|(s, _)| s.clone())
-				.collect::<Vec<T::AccountId>>();
-			let assignments = phragmen_result.assignments;
-
-			let staked_assignments = sp_npos_elections::assignment_ratio_to_staked(
-				assignments,
-				Self::slashable_balance_of_fn(),
-			);
-
-			let supports = to_supports(
-				&elected_stashes,
-				&staked_assignments,
-			)
-			.map_err(|_|
-				log!(
-					error,
-					"on-chain phragmen is failing due to a problem in the result. This must be a bug."
-				)
-			)
-			.ok()?;
-
-			// collect exposures
-			let exposures = Self::collect_exposures(supports);
-
-			// In order to keep the property required by `on_session_ending` that we must return the
-			// new validator set even if it's the same as the old, as long as any underlying
-			// economic conditions have changed, we don't attempt to do any optimization where we
-			// compare against the prior set.
-			Some(ElectionResult::<T::AccountId, BalanceOf<T>> {
-				elected_stashes,
-				exposures,
-				compute: ElectionCompute::OnChain,
+				Self::process_election(res, current_era)
 			})
-		} else {
-			// There were not enough candidates for even our minimal level of functionality. This is
-			// bad. We should probably disable all functionality except for block production and let
-			// the chain keep producing blocks until we can decide on a sufficiently substantial
-			// set. TODO: #2494
-			None
-		}
-	}
-
-	/// Execute phragmen election and return the new results. No post-processing is applied and the
-	/// raw edge weights are returned.
-	///
-	/// Self votes are added and nominations before the most recent slashing span are ignored.
-	///
-	/// No storage item is updated.
-	pub fn do_phragmen<Accuracy: PerThing128>(
-		iterations: usize,
-	) -> Option<PrimitiveElectionResult<T::AccountId, Accuracy>> {
-		let weight_of = Self::slashable_balance_of_fn();
-		let mut all_nominators: Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)> = Vec::new();
-		let mut all_validators = Vec::new();
-		for (validator, _) in <Validators<T>>::iter() {
-			// append self vote
-			let self_vote = (validator.clone(), weight_of(&validator), vec![validator.clone()]);
-			all_nominators.push(self_vote);
-			all_validators.push(validator);
-		}
-
-		let nominator_votes = <Nominators<T>>::iter().map(|(nominator, nominations)| {
-			let Nominations { submitted_in, mut targets, suppressed: _ } = nominations;
-
-			// Filter out nomination targets which were nominated before the most recent
-			// slashing span.
-			targets.retain(|stash| {
-				<Self as Store>::SlashingSpans::get(&stash).map_or(
-					true,
-					|spans| submitted_in >= spans.last_nonzero_slash(),
-				)
-			});
-
-			(nominator, targets)
-		});
-		all_nominators.extend(nominator_votes.map(|(n, ns)| {
-			let s = weight_of(&n);
-			(n, s, ns)
-		}));
-
-		if all_validators.len() < Self::minimum_validator_count().max(1) as usize {
-			// If we don't have enough candidates, nothing to do.
-			log!(
-				warn,
-				"chain does not have enough staking candidates to operate. Era {:?}.",
-				Self::current_era()
-			);
-			None
-		} else {
-			seq_phragmen::<_, Accuracy>(
-				Self::validator_count() as usize,
-				all_validators,
-				all_nominators,
-				Some((iterations, 0)), // exactly run `iterations` rounds.
-			)
-			.map_err(|err| log!(error, "Call to seq-phragmen failed due to {:?}", err))
 			.ok()
-		}
-	}
-
-	/// Consume a set of [`Supports`] from [`sp_npos_elections`] and collect them into a
-	/// [`Exposure`].
-	fn collect_exposures(
-		supports: Supports<T::AccountId>,
-	) -> Vec<(T::AccountId, Exposure<T::AccountId, BalanceOf<T>>)> {
-		let total_issuance = T::Currency::total_issuance();
-		let to_currency = |e: ExtendedBalance| T::CurrencyToVote::to_currency(e, total_issuance);
-
-		supports.into_iter().map(|(validator, support)| {
-			// build `struct exposure` from `support`
-			let mut others = Vec::with_capacity(support.voters.len());
-			let mut own: BalanceOf<T> = Zero::zero();
-			let mut total: BalanceOf<T> = Zero::zero();
-			support.voters
-				.into_iter()
-				.map(|(nominator, weight)| (nominator, to_currency(weight)))
-				.for_each(|(nominator, stake)| {
-					if nominator == validator {
-						own = own.saturating_add(stake);
-					} else {
-						others.push(IndividualExposure { who: nominator, value: stake });
-					}
-					total = total.saturating_add(stake);
-				});
-
-			let exposure = Exposure {
-				own,
-				others,
-				total,
-			};
-
-			(validator, exposure)
-		}).collect::<Vec<(T::AccountId, Exposure<_, _>)>>()
 	}
 
 	/// Process the output of the election.
@@ -3166,8 +2313,6 @@ impl<T: Config> Module<T> {
 	///
 	/// Returns `Err(())` if less than [`MinimumValidatorCount`] validators have been elected, `Ok`
 	/// otherwise.
-	// TWO_PHASE_NOTE: remove the dead code.
-	#[allow(dead_code)]
 	pub fn process_election(
 		flat_supports: sp_npos_elections::Supports<T::AccountId>,
 		current_era: EraIndex,
@@ -3175,18 +2320,21 @@ impl<T: Config> Module<T> {
 		let exposures = Self::collect_exposures(flat_supports);
 		let elected_stashes = exposures.iter().cloned().map(|(x, _)| x).collect::<Vec<_>>();
 
-		if (elected_stashes.len() as u32) <= Self::minimum_validator_count() {
+		if (elected_stashes.len() as u32) < Self::minimum_validator_count().max(1) {
+			// Session will panic if we ever return an empty validator set, thus max(1) ^^.
 			if current_era > 0 {
 				log!(
 					warn,
-					"chain does not have enough staking candidates to operate for era {:?}",
+					"chain does not have enough staking candidates to operate for era {:?} ({} elected, minimum is {})",
 					current_era,
+					elected_stashes.len(),
+					Self::minimum_validator_count(),
 				);
 			}
 			return Err(());
 		}
 
-		// Populate Stakers and write slot stake.
+		// Populate stakers, exposures, and the snapshot of validator prefs.
 		let mut total_stake: BalanceOf<T> = Zero::zero();
 		exposures.into_iter().for_each(|(stash, exposure)| {
 			total_stake = total_stake.saturating_add(exposure.total);
@@ -3211,28 +2359,54 @@ impl<T: Config> Module<T> {
 		}
 
 		// emit event
-		// TWO_PHASE_NOTE: remove the inner value.
-		Self::deposit_event(RawEvent::StakingElection(ElectionCompute::Signed));
-
-		log!(
-			info,
-			"new validator set of size {:?} has been processed for era {:?}",
-			elected_stashes.len(),
-			current_era,
-		);
+		Self::deposit_event(RawEvent::StakingElection);
+
+		if current_era > 0 {
+			log!(
+				info,
+				"new validator set of size {:?} has been processed for era {:?}",
+				elected_stashes.len(),
+				current_era,
+			);
+		}
 
 		Ok(elected_stashes)
 	}
 
-	/// Enact and process the election using the `ElectionProvider` type.
-	///
-	/// This will also process the election, as noted in [`process_election`].
-	fn enact_election(_current_era: EraIndex) -> Option<Vec<T::AccountId>> {
-		let _outcome = T::ElectionProvider::elect().map(|_| ());
-		log!(debug, "Experimental election provider outputted {:?}", _outcome);
-		// TWO_PHASE_NOTE: This code path shall not return anything for now. Later on, redirect the
-		// results to `process_election`.
-		None
+	/// Consume a set of [`Supports`] from [`sp_npos_elections`] and collect them into a
+	/// [`Exposure`].
+	fn collect_exposures(
+		supports: Supports<T::AccountId>,
+	) -> Vec<(T::AccountId, Exposure<T::AccountId, BalanceOf<T>>)> {
+		let total_issuance = T::Currency::total_issuance();
+		let to_currency = |e: frame_election_provider_support::ExtendedBalance| {
+			T::CurrencyToVote::to_currency(e, total_issuance)
+		};
+
+		supports
+			.into_iter()
+			.map(|(validator, support)| {
+				// build `struct exposure` from `support`
+				let mut others = Vec::with_capacity(support.voters.len());
+				let mut own: BalanceOf<T> = Zero::zero();
+				let mut total: BalanceOf<T> = Zero::zero();
+				support
+					.voters
+					.into_iter()
+					.map(|(nominator, weight)| (nominator, to_currency(weight)))
+					.for_each(|(nominator, stake)| {
+						if nominator == validator {
+						own = own.saturating_add(stake);
+						} else {
+							others.push(IndividualExposure { who: nominator, value: stake });
+						}
+						total = total.saturating_add(stake);
+					});
+
+				let exposure = Exposure { own, others, total };
+				(validator, exposure)
+			})
+			.collect::<Vec<(T::AccountId, Exposure<_, _>)>>()
 	}
 
 	/// Remove all associated data of a stash account from the staking system.
@@ -3319,13 +2493,6 @@ impl<T: Config> Module<T> {
 		}
 	}
 
-	fn will_era_be_forced() -> bool {
-		match ForceEra::get() {
-			Forcing::ForceAlways | Forcing::ForceNew => true,
-			Forcing::ForceNone | Forcing::NotForcing => false,
-		}
-	}
-
 	#[cfg(feature = "runtime-benchmarks")]
 	pub fn add_era_stakers(
 		current_era: EraIndex,
@@ -3335,11 +2502,6 @@ impl<T: Config> Module<T> {
 		<ErasStakers<T>>::insert(&current_era, &controller, &exposure);
 	}
 
-	#[cfg(feature = "runtime-benchmarks")]
-	pub fn put_election_status(status: ElectionStatus::<T::BlockNumber>) {
-		<EraElectionStatus<T>>::put(status);
-	}
-
 	#[cfg(feature = "runtime-benchmarks")]
 	pub fn set_slash_reward_fraction(fraction: Perbill) {
 		SlashRewardFraction::put(fraction);
@@ -3365,13 +2527,17 @@ impl<T: Config> Module<T> {
 			all_voters.push(self_vote);
 		}
 
+		// collect all slashing spans into a BTreeMap for further queries.
+		let slashing_spans = <SlashingSpans<T>>::iter().collect::<BTreeMap<_, _>>();
+
 		for (nominator, nominations) in <Nominators<T>>::iter() {
 			let Nominations { submitted_in, mut targets, suppressed: _ } = nominations;
 
 			// Filter out nomination targets which were nominated before the most recent
 			// slashing span.
 			targets.retain(|stash| {
-				Self::slashing_spans(&stash)
+				slashing_spans
+					.get(stash)
 					.map_or(true, |spans| submitted_in >= spans.last_nonzero_slash())
 			});
 
@@ -3513,31 +2679,16 @@ impl<T: Config> frame_election_provider_support::ElectionDataProvider<T::Account
 /// some session can lag in between the newest session planned and the latest session started.
 impl<T: Config> pallet_session::SessionManager<T::AccountId> for Module<T> {
 	fn new_session(new_index: SessionIndex) -> Option<Vec<T::AccountId>> {
-		log!(
-			trace,
-			"[{:?}] planning new_session({})",
-			<frame_system::Pallet<T>>::block_number(),
-			new_index,
-		);
+		log!(trace, "planning new_session({})", new_index);
 		CurrentPlannedSession::put(new_index);
 		Self::new_session(new_index)
 	}
 	fn start_session(start_index: SessionIndex) {
-		log!(
-			trace,
-			"[{:?}] starting start_session({})",
-			<frame_system::Pallet<T>>::block_number(),
-			start_index,
-		);
+		log!(trace, "starting start_session({})", start_index);
 		Self::start_session(start_index)
 	}
 	fn end_session(end_index: SessionIndex) {
-		log!(
-			trace,
-			"[{:?}] ending end_session({})",
-			<frame_system::Pallet<T>>::block_number(),
-			end_index,
-		);
+		log!(trace, "ending end_session({})", end_index);
 		Self::end_session(end_index)
 	}
 }
@@ -3752,8 +2903,8 @@ where
 	}
 
 	fn can_report() -> bool {
-		// TWO_PHASE_NOTE: we can get rid of this API
-		Self::era_election_status().is_closed()
+		// TODO: https://github.com/paritytech/substrate/issues/8343
+		true
 	}
 }
 
@@ -3789,100 +2940,7 @@ where
 	}
 }
 
-#[allow(deprecated)]
-impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
-	type Call = Call<T>;
-	fn validate_unsigned(source: TransactionSource, call: &Self::Call) -> TransactionValidity {
-		if let Call::submit_election_solution_unsigned(
-			_,
-			_,
-			score,
-			era,
-			_,
-		) = call {
-			use offchain_election::DEFAULT_LONGEVITY;
-
-			// discard solution not coming from the local OCW.
-			match source {
-				TransactionSource::Local | TransactionSource::InBlock => { /* allowed */ }
-				_ => {
-					log!(debug, "rejecting unsigned transaction because it is not local/in-block.");
-					return InvalidTransaction::Call.into();
-				}
-			}
-
-			if let Err(error_with_post_info) = Self::pre_dispatch_checks(*score, *era) {
-				let invalid = to_invalid(error_with_post_info);
-				log!(
-					debug,
-					"💸 validate unsigned pre dispatch checks failed due to error #{:?}.",
-					invalid,
-				);
-				return invalid.into();
-			}
-
-			log!(debug, "validateUnsigned succeeded for a solution at era {}.", era);
-
-			ValidTransaction::with_tag_prefix("StakingOffchain")
-				// The higher the score[0], the better a solution is.
-				.priority(T::UnsignedPriority::get().saturating_add(score[0].saturated_into()))
-				// Defensive only. A single solution can exist in the pool per era. Each validator
-				// will run OCW at most once per era, hence there should never exist more than one
-				// transaction anyhow.
-				.and_provides(era)
-				// Note: this can be more accurate in the future. We do something like
-				// `era_end_block - current_block` but that is not needed now as we eagerly run
-				// offchain workers now and the above should be same as `T::ElectionLookahead`
-				// without the need to query more storage in the validation phase. If we randomize
-				// offchain worker, then we might re-consider this.
-				.longevity(TryInto::<u64>::try_into(
-						T::ElectionLookahead::get()).unwrap_or(DEFAULT_LONGEVITY)
-				)
-				// We don't propagate this. This can never the validated at a remote node.
-				.propagate(false)
-				.build()
-		} else {
-			InvalidTransaction::Call.into()
-		}
-	}
-
-	fn pre_dispatch(call: &Self::Call) -> Result<(), TransactionValidityError> {
-		if let Call::submit_election_solution_unsigned(
-			_,
-			_,
-			score,
-			era,
-			_,
-		) = call {
-			// IMPORTANT NOTE: These checks are performed in the dispatch call itself, yet we need
-			// to duplicate them here to prevent a block producer from putting a previously
-			// validated, yet no longer valid solution on chain.
-			// OPTIMISATION NOTE: we could skip this in the `submit_election_solution_unsigned`
-			// since we already do it here. The signed version needs it though. Yer for now we keep
-			// this duplicate check here so both signed and unsigned can use a singular
-			// `check_and_replace_solution`.
-			Self::pre_dispatch_checks(*score, *era)
-				.map(|_| ())
-				.map_err(to_invalid)
-				.map_err(Into::into)
-		} else {
-			Err(InvalidTransaction::Call.into())
-		}
-	}
-}
-
 /// Check that list is sorted and has no duplicates.
 fn is_sorted_and_unique(list: &[u32]) -> bool {
 	list.windows(2).all(|w| w[0] < w[1])
 }
-
-/// convert a DispatchErrorWithPostInfo to a custom InvalidTransaction with the inner code being the
-/// error number.
-fn to_invalid(error_with_post_info: DispatchErrorWithPostInfo) -> InvalidTransaction {
-	let error = error_with_post_info.error;
-	let error_number = match error {
-		DispatchError::Module { error, ..} => error,
-		_ => 0,
-	};
-	InvalidTransaction::Custom(error_number)
-}
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index 68612c8f96fd..b4c84059a210 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -22,14 +22,11 @@ use crate as staking;
 use frame_support::{
 	assert_ok, parameter_types,
 	traits::{Currency, FindAuthor, Get, OnFinalize, OnInitialize, OneSessionHandler},
-	weights::{constants::RocksDbWeight, Weight},
+	weights::constants::RocksDbWeight,
 	IterableStorageMap, StorageDoubleMap, StorageMap, StorageValue,
 };
 use sp_core::H256;
 use sp_io;
-use sp_npos_elections::{
-	to_supports, reduce, ExtendedBalance, StakedAssignment, ElectionScore, EvaluateSupport,
-};
 use sp_runtime::{
 	curve::PiecewiseLinear,
 	testing::{Header, TestXt, UintAuthorityId},
@@ -101,7 +98,7 @@ frame_support::construct_runtime!(
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-		Staking: staking::{Pallet, Call, Config<T>, Storage, Event<T>, ValidateUnsigned},
+		Staking: staking::{Pallet, Call, Config<T>, Storage, Event<T>},
 		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
 	}
 );
@@ -126,10 +123,8 @@ parameter_types! {
 	pub static SessionsPerEra: SessionIndex = 3;
 	pub static ExistentialDeposit: Balance = 1;
 	pub static SlashDeferDuration: EraIndex = 0;
-	pub static ElectionLookahead: BlockNumber = 0;
 	pub static Period: BlockNumber = 5;
 	pub static Offset: BlockNumber = 0;
-	pub static MaxIterations: u32 = 0;
 }
 
 impl frame_system::Config for Test {
@@ -220,9 +215,6 @@ parameter_types! {
 	pub const BondingDuration: EraIndex = 3;
 	pub const RewardCurve: &'static PiecewiseLinear<'static> = &I_NPOS;
 	pub const MaxNominatorRewardedPerValidator: u32 = 64;
-	pub const UnsignedPriority: u64 = 1 << 20;
-	pub const MinSolutionScoreBump: Perbill = Perbill::zero();
-	pub OffchainSolutionWeightLimit: Weight = BlockWeights::get().max_block;
 }
 
 thread_local! {
@@ -262,13 +254,7 @@ impl Config for Test {
 	type SessionInterface = Self;
 	type EraPayout = ConvertCurve<RewardCurve>;
 	type NextNewSession = Session;
-	type ElectionLookahead = ElectionLookahead;
-	type Call = Call;
-	type MaxIterations = MaxIterations;
-	type MinSolutionScoreBump = MinSolutionScoreBump;
 	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
-	type UnsignedPriority = UnsignedPriority;
-	type OffchainSolutionWeightLimit = OffchainSolutionWeightLimit;
 	type ElectionProvider = onchain::OnChainSequentialPhragmen<Self>;
 	type WeightInfo = ();
 }
@@ -352,10 +338,6 @@ impl ExtBuilder {
 		SESSIONS_PER_ERA.with(|v| *v.borrow_mut() = length);
 		self
 	}
-	pub fn election_lookahead(self, look: BlockNumber) -> Self {
-		ELECTION_LOOKAHEAD.with(|v| *v.borrow_mut() = look);
-		self
-	}
 	pub fn period(self, length: BlockNumber) -> Self {
 		PERIOD.with(|v| *v.borrow_mut() = length);
 		self
@@ -364,13 +346,6 @@ impl ExtBuilder {
 		self.has_stakers = has;
 		self
 	}
-	pub fn max_offchain_iterations(self, iterations: u32) -> Self {
-		MAX_ITERATIONS.with(|v| *v.borrow_mut() = iterations);
-		self
-	}
-	pub fn offchain_election_ext(self) -> Self {
-		self.session_per_era(4).period(5).election_lookahead(3)
-	}
 	pub fn initialize_first_session(mut self, init: bool) -> Self {
 		self.initialize_first_session = init;
 		self
@@ -774,198 +749,6 @@ pub(crate) fn add_slash(who: &AccountId) {
 	);
 }
 
-// winners will be chosen by simply their unweighted total backing stake. Nominator stake is
-// distributed evenly.
-pub(crate) fn horrible_npos_solution(
-	do_reduce: bool,
-) -> (CompactAssignments, Vec<ValidatorIndex>, ElectionScore) {
-	let mut backing_stake_of: BTreeMap<AccountId, Balance> = BTreeMap::new();
-
-	// self stake
-	<Validators<Test>>::iter().for_each(|(who, _p)| {
-		*backing_stake_of.entry(who).or_insert(Zero::zero()) += Staking::slashable_balance_of(&who)
-	});
-
-	// add nominator stuff
-	<Nominators<Test>>::iter().for_each(|(who, nomination)| {
-		nomination.targets.iter().for_each(|v| {
-			*backing_stake_of.entry(*v).or_insert(Zero::zero()) +=
-				Staking::slashable_balance_of(&who)
-		})
-	});
-
-	// elect winners
-	let mut sorted: Vec<AccountId> = backing_stake_of.keys().cloned().collect();
-	sorted.sort_by_key(|x| backing_stake_of.get(x).unwrap());
-	let winners: Vec<AccountId> = sorted
-		.iter()
-		.cloned()
-		.take(Staking::validator_count() as usize)
-		.collect();
-
-	// create assignments
-	let mut staked_assignment: Vec<StakedAssignment<AccountId>> = Vec::new();
-	<Nominators<Test>>::iter().for_each(|(who, nomination)| {
-		let mut dist: Vec<(AccountId, ExtendedBalance)> = Vec::new();
-		nomination.targets.iter().for_each(|v| {
-			if winners.iter().find(|w| *w == v).is_some() {
-				dist.push((*v, ExtendedBalance::zero()));
-			}
-		});
-
-		if dist.len() == 0 {
-			return;
-		}
-
-		// assign real stakes. just split the stake.
-		let stake = Staking::slashable_balance_of(&who) as ExtendedBalance;
-		let mut sum: ExtendedBalance = Zero::zero();
-		let dist_len = dist.len();
-		{
-			dist.iter_mut().for_each(|(_, w)| {
-				let partial = stake / (dist_len as ExtendedBalance);
-				*w = partial;
-				sum += partial;
-			});
-		}
-
-		// assign the leftover to last.
-		{
-			let leftover = stake - sum;
-			let last = dist.last_mut().unwrap();
-			last.1 += leftover;
-		}
-
-		staked_assignment.push(StakedAssignment {
-			who,
-			distribution: dist,
-		});
-	});
-
-	// Ensure that this result is worse than seq-phragmen. Otherwise, it should not have been used
-	// for testing.
-	let score = {
-		let (_, _, better_score) = prepare_submission_with(true, true, 0, |_| {});
-
-		let support = to_supports::<AccountId>(&winners, &staked_assignment).unwrap();
-		let score = support.evaluate();
-
-		assert!(sp_npos_elections::is_score_better::<Perbill>(
-			better_score,
-			score,
-			MinSolutionScoreBump::get(),
-		));
-
-		score
-	};
-
-	if do_reduce {
-		reduce(&mut staked_assignment);
-	}
-
-	let snapshot_validators = Staking::snapshot_validators().unwrap();
-	let snapshot_nominators = Staking::snapshot_nominators().unwrap();
-	let nominator_index = |a: &AccountId| -> Option<NominatorIndex> {
-		snapshot_nominators.iter().position(|x| x == a).map(|i| i as NominatorIndex)
-	};
-	let validator_index = |a: &AccountId| -> Option<ValidatorIndex> {
-		snapshot_validators.iter().position(|x| x == a).map(|i| i as ValidatorIndex)
-	};
-
-	// convert back to ratio assignment. This takes less space.
-	let assignments_reduced =
-		sp_npos_elections::assignment_staked_to_ratio::<AccountId, OffchainAccuracy>(staked_assignment);
-
-	let compact =
-		CompactAssignments::from_assignment(assignments_reduced, nominator_index, validator_index)
-			.unwrap();
-
-	// winner ids to index
-	let winners = winners.into_iter().map(|w| validator_index(&w).unwrap()).collect::<Vec<_>>();
-
-	(compact, winners, score)
-}
-
-/// Note: this should always logically reproduce [`offchain_election::prepare_submission`], yet we
-/// cannot do it since we want to have `tweak` injected into the process.
-///
-/// If the input is being tweaked in a way that the score cannot be compute accurately,
-/// `compute_real_score` can be set to true. In this case a `Default` score is returned.
-pub(crate) fn prepare_submission_with(
-	compute_real_score: bool,
-	do_reduce: bool,
-	iterations: usize,
-	tweak: impl FnOnce(&mut Vec<StakedAssignment<AccountId>>),
-) -> (CompactAssignments, Vec<ValidatorIndex>, ElectionScore) {
-	// run election on the default stuff.
-	let sp_npos_elections::ElectionResult {
-		winners,
-		assignments,
-	} = Staking::do_phragmen::<OffchainAccuracy>(iterations).unwrap();
-	let winners = sp_npos_elections::to_without_backing(winners);
-
-	let mut staked = sp_npos_elections::assignment_ratio_to_staked(
-		assignments,
-		Staking::slashable_balance_of_fn(),
-	);
-
-	// apply custom tweaks. awesome for testing.
-	tweak(&mut staked);
-
-	if do_reduce {
-		reduce(&mut staked);
-	}
-
-	// convert back to ratio assignment. This takes less space.
-	let snapshot_validators = Staking::snapshot_validators().expect("snapshot not created.");
-	let snapshot_nominators = Staking::snapshot_nominators().expect("snapshot not created.");
-	let nominator_index = |a: &AccountId| -> Option<NominatorIndex> {
-		snapshot_nominators
-			.iter()
-			.position(|x| x == a)
-			.map_or_else(
-				|| { println!("unable to find nominator index for {:?}", a); None },
-				|i| Some(i as NominatorIndex),
-			)
-	};
-	let validator_index = |a: &AccountId| -> Option<ValidatorIndex> {
-		snapshot_validators
-			.iter()
-			.position(|x| x == a)
-			.map_or_else(
-				|| { println!("unable to find validator index for {:?}", a); None },
-				|i| Some(i as ValidatorIndex),
-			)
-	};
-
-	let assignments_reduced = sp_npos_elections::assignment_staked_to_ratio(staked);
-
-	// re-compute score by converting, yet again, into staked type
-	let score = if compute_real_score {
-		let staked = sp_npos_elections::assignment_ratio_to_staked(
-			assignments_reduced.clone(),
-			Staking::slashable_balance_of_fn(),
-		);
-
-		let support_map = to_supports(
-			winners.as_slice(),
-			staked.as_slice(),
-		).unwrap();
-		support_map.evaluate()
-	} else {
-		Default::default()
-	};
-
-	let compact =
-		CompactAssignments::from_assignment(assignments_reduced, nominator_index, validator_index)
-			.expect("Failed to create compact");
-
-	// winner ids to index
-	let winners = winners.into_iter().map(|w| validator_index(&w).unwrap()).collect::<Vec<_>>();
-
-	(compact, winners, score)
-}
-
 /// Make all validator and nominator request their payment
 pub(crate) fn make_all_reward_payment(era: EraIndex) {
 	let validators_with_reward =
diff --git a/frame/staking/src/offchain_election.rs b/frame/staking/src/offchain_election.rs
deleted file mode 100644
index 8fe3fc7367d9..000000000000
--- a/frame/staking/src/offchain_election.rs
+++ /dev/null
@@ -1,598 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Helpers for offchain worker election.
-
-use crate::{
-	Call, CompactAssignments, ElectionSize, Module, NominatorIndex, Nominators, OffchainAccuracy,
-	Config, ValidatorIndex, WeightInfo,
-};
-use codec::Decode;
-use frame_support::{traits::Get, weights::Weight, IterableStorageMap};
-use frame_system::offchain::SubmitTransaction;
-use sp_npos_elections::{
-	to_supports, EvaluateSupport, reduce, Assignment, ElectionResult, ElectionScore,
-	ExtendedBalance, CompactSolution,
-};
-use sp_runtime::{
-	offchain::storage::StorageValueRef, traits::TrailingZeroInput, RuntimeDebug,
-};
-use sp_std::{convert::TryInto, prelude::*, collections::btree_map::BTreeMap};
-
-/// Error types related to the offchain election machinery.
-#[derive(RuntimeDebug)]
-pub enum OffchainElectionError {
-	/// election returned None. This means less candidate that minimum number of needed
-	/// validators were present. The chain is in trouble and not much that we can do about it.
-	ElectionFailed,
-	/// Submission to the transaction pool failed.
-	PoolSubmissionFailed,
-	/// The snapshot data is not available.
-	SnapshotUnavailable,
-	/// Error from npos-election crate. This usually relates to compact operation.
-	InternalElectionError(sp_npos_elections::Error),
-	/// One of the computed winners is invalid.
-	InvalidWinner,
-	/// A nominator is not available in the snapshot.
-	NominatorSnapshotCorrupt,
-}
-
-impl From<sp_npos_elections::Error> for OffchainElectionError {
-	fn from(e: sp_npos_elections::Error) -> Self {
-		Self::InternalElectionError(e)
-	}
-}
-
-/// Storage key used to store the persistent offchain worker status.
-pub(crate) const OFFCHAIN_HEAD_DB: &[u8] = b"parity/staking-election/";
-/// The repeat threshold of the offchain worker. This means we won't run the offchain worker twice
-/// within a window of 5 blocks.
-pub(crate) const OFFCHAIN_REPEAT: u32 = 5;
-/// Default number of blocks for which the unsigned transaction should stay in the pool
-pub(crate) const DEFAULT_LONGEVITY: u64 = 25;
-
-/// Checks if an execution of the offchain worker is permitted at the given block number, or not.
-///
-/// This essentially makes sure that we don't run on previous blocks in case of a re-org, and we
-/// don't run twice within a window of length [`OFFCHAIN_REPEAT`].
-///
-/// Returns `Ok(())` if offchain worker should happen, `Err(reason)` otherwise.
-pub(crate) fn set_check_offchain_execution_status<T: Config>(
-	now: T::BlockNumber,
-) -> Result<(), &'static str> {
-	let storage = StorageValueRef::persistent(&OFFCHAIN_HEAD_DB);
-	let threshold = T::BlockNumber::from(OFFCHAIN_REPEAT);
-
-	let mutate_stat =
-		storage.mutate::<_, &'static str, _>(|maybe_head: Option<Option<T::BlockNumber>>| {
-			match maybe_head {
-				Some(Some(head)) if now < head => Err("fork."),
-				Some(Some(head)) if now >= head && now <= head + threshold => {
-					Err("recently executed.")
-				}
-				Some(Some(head)) if now > head + threshold => {
-					// we can run again now. Write the new head.
-					Ok(now)
-				}
-				_ => {
-					// value doesn't exists. Probably this node just booted up. Write, and run
-					Ok(now)
-				}
-			}
-		});
-
-	match mutate_stat {
-		// all good
-		Ok(Ok(_)) => Ok(()),
-		// failed to write.
-		Ok(Err(_)) => Err("failed to write to offchain db."),
-		// fork etc.
-		Err(why) => Err(why),
-	}
-}
-
-/// The internal logic of the offchain worker of this module. This runs the phragmen election,
-/// compacts and reduces the solution, computes the score and submits it back to the chain as an
-/// unsigned transaction, without any signature.
-pub(crate) fn compute_offchain_election<T: Config>() -> Result<(), OffchainElectionError> {
-	let iters = get_balancing_iters::<T>();
-	// compute raw solution. Note that we use `OffchainAccuracy`.
-	let ElectionResult {
-		winners,
-		assignments,
-	} = <Module<T>>::do_phragmen::<OffchainAccuracy>(iters)
-		.ok_or(OffchainElectionError::ElectionFailed)?;
-
-	// process and prepare it for submission.
-	let (winners, compact, score, size) = prepare_submission::<T>(
-		assignments,
-		winners,
-		true,
-		T::OffchainSolutionWeightLimit::get(),
-	)?;
-
-	crate::log!(
-		info,
-		"prepared a seq-phragmen solution with {} balancing iterations and score {:?}",
-		iters,
-		score,
-	);
-
-	// defensive-only: current era can never be none except genesis.
-	let current_era = <Module<T>>::current_era().unwrap_or_default();
-
-	// send it.
-	let call = Call::submit_election_solution_unsigned(
-		winners,
-		compact,
-		score,
-		current_era,
-		size,
-	).into();
-
-	SubmitTransaction::<T, Call<T>>::submit_unsigned_transaction(call)
-		.map_err(|_| OffchainElectionError::PoolSubmissionFailed)
-}
-
-/// Get a random number of iterations to run the balancing.
-///
-/// Uses the offchain seed to generate a random number.
-pub fn get_balancing_iters<T: Config>() -> usize {
-	match T::MaxIterations::get() {
-		0 => 0,
-		max @ _ => {
-			let seed = sp_io::offchain::random_seed();
-			let random = <u32>::decode(&mut TrailingZeroInput::new(seed.as_ref()))
-				.expect("input is padded with zeroes; qed") % max.saturating_add(1);
-			random as usize
-		}
-	}
-}
-
-/// Find the maximum `len` that a compact can have in order to fit into the block weight.
-///
-/// This only returns a value between zero and `size.nominators`.
-pub fn maximum_compact_len<W: crate::WeightInfo>(
-	winners_len: u32,
-	size: ElectionSize,
-	max_weight: Weight,
-) -> u32 {
-	use sp_std::cmp::Ordering;
-
-	if size.nominators < 1 {
-		return size.nominators;
-	}
-
-	let max_voters = size.nominators.max(1);
-	let mut voters = max_voters;
-
-	// helper closures.
-	let weight_with = |voters: u32| -> Weight {
-		W::submit_solution_better(
-			size.validators.into(),
-			size.nominators.into(),
-			voters,
-			winners_len,
-		)
-	};
-
-	let next_voters = |current_weight: Weight, voters: u32, step: u32| -> Result<u32, ()> {
-		match current_weight.cmp(&max_weight) {
-			Ordering::Less => {
-				let next_voters = voters.checked_add(step);
-				match next_voters {
-					Some(voters) if voters < max_voters => Ok(voters),
-					_ => Err(()),
-				}
-			},
-			Ordering::Greater => voters.checked_sub(step).ok_or(()),
-			Ordering::Equal => Ok(voters),
-		}
-	};
-
-	// First binary-search the right amount of voters
-	let mut step = voters / 2;
-	let mut current_weight = weight_with(voters);
-	while step > 0 {
-		match next_voters(current_weight, voters, step) {
-			// proceed with the binary search
-			Ok(next) if next != voters => {
-				voters = next;
-			},
-			// we are out of bounds, break out of the loop.
-			Err(()) => {
-				break;
-			},
-			// we found the right value - early exit the function.
-			Ok(next) => return next
-		}
-		step = step / 2;
-		current_weight = weight_with(voters);
-	}
-
-
-	// Time to finish.
-	// We might have reduced less than expected due to rounding error. Increase one last time if we
-	// have any room left, the reduce until we are sure we are below limit.
-	while voters + 1 <= max_voters && weight_with(voters + 1) < max_weight {
-		voters += 1;
-	}
-	while voters.checked_sub(1).is_some() && weight_with(voters) > max_weight {
-		voters -= 1;
-	}
-
-	debug_assert!(
-		weight_with(voters.min(size.nominators)) <= max_weight,
-		"weight_with({}) <= {}", voters.min(size.nominators), max_weight,
-	);
-	voters.min(size.nominators)
-}
-
-/// Greedily reduce the size of the a solution to fit into the block, w.r.t. weight.
-///
-/// The weight of the solution is foremost a function of the number of voters (i.e.
-/// `compact.len()`). Aside from this, the other components of the weight are invariant. The number
-/// of winners shall not be changed (otherwise the solution is invalid) and the `ElectionSize` is
-/// merely a representation of the total number of stakers.
-///
-/// Thus, we reside to stripping away some voters. This means only changing the `compact` struct.
-///
-/// Note that the solution is already computed, and the winners are elected based on the merit of
-/// teh entire stake in the system. Nonetheless, some of the voters will be removed further down the
-/// line.
-///
-/// Indeed, the score must be computed **after** this step. If this step reduces the score too much,
-/// then the solution will be discarded.
-pub fn trim_to_weight<T: Config, FN>(
-	maximum_allowed_voters: u32,
-	mut compact: CompactAssignments,
-	nominator_index: FN,
-) -> Result<CompactAssignments, OffchainElectionError>
-where
-	for<'r> FN: Fn(&'r T::AccountId) -> Option<NominatorIndex>,
-{
-	match compact.voter_count().checked_sub(maximum_allowed_voters as usize) {
-		Some(to_remove) if to_remove > 0 => {
-			// grab all voters and sort them by least stake.
-			let balance_of = <Module<T>>::slashable_balance_of_fn();
-			let mut voters_sorted = <Nominators<T>>::iter()
-				.map(|(who, _)| (who.clone(), balance_of(&who)))
-				.collect::<Vec<_>>();
-			voters_sorted.sort_by_key(|(_, y)| *y);
-
-			// start removing from the least stake. Iterate until we know enough have been removed.
-			let mut removed = 0;
-			for (maybe_index, _stake) in voters_sorted
-				.iter()
-				.map(|(who, stake)| (nominator_index(&who), stake))
-			{
-				let index = maybe_index.ok_or(OffchainElectionError::NominatorSnapshotCorrupt)?;
-				if compact.remove_voter(index) {
-					crate::log!(
-						trace,
-						"removed a voter at index {} with stake {:?} from compact to reduce the size",
-						index,
-						_stake,
-					);
-					removed += 1
-				}
-
-				if removed >= to_remove {
-					break;
-				}
-			}
-
-			crate::log!(
-				warn,
-				"{} nominators out of {} had to be removed from compact solution due to size \
-				 limits.",
-				removed,
-				compact.voter_count() + removed,
-			);
-			Ok(compact)
-		}
-		_ => {
-			// nada, return as-is
-			crate::log!(info, "Compact solution did not get trimmed due to block weight limits.",);
-			Ok(compact)
-		}
-	}
-}
-
-/// Takes an election result and spits out some data that can be submitted to the chain.
-///
-/// This does a lot of stuff; read the inline comments.
-pub fn prepare_submission<T: Config>(
-	assignments: Vec<Assignment<T::AccountId, OffchainAccuracy>>,
-	winners: Vec<(T::AccountId, ExtendedBalance)>,
-	do_reduce: bool,
-	maximum_weight: Weight,
-) -> Result<
-	(Vec<ValidatorIndex>, CompactAssignments, ElectionScore, ElectionSize),
-	OffchainElectionError,
-> {
-	// make sure that the snapshot is available.
-	let snapshot_validators =
-		<Module<T>>::snapshot_validators().ok_or(OffchainElectionError::SnapshotUnavailable)?;
-	let snapshot_nominators =
-		<Module<T>>::snapshot_nominators().ok_or(OffchainElectionError::SnapshotUnavailable)?;
-
-	// indexing caches
-	let nominator_indices: BTreeMap<_, _> =
-		snapshot_nominators.iter().enumerate().map(|(idx, account_id)| (account_id, idx)).collect();
-	let validator_indices: BTreeMap<_, _> =
-		snapshot_validators.iter().enumerate().map(|(idx, account_id)| (account_id, idx)).collect();
-
-	// all helper closures that we'd ever need.
-	let nominator_index = |a: &T::AccountId| -> Option<NominatorIndex> {
-		nominator_indices
-			.get(a)
-			.and_then(|i| <usize as TryInto<NominatorIndex>>::try_into(*i).ok())
-	};
-	let validator_index = |a: &T::AccountId| -> Option<ValidatorIndex> {
-		validator_indices
-			.get(a)
-			.and_then(|i| <usize as TryInto<ValidatorIndex>>::try_into(*i).ok())
-	};
-	let nominator_at = |i: NominatorIndex| -> Option<T::AccountId> {
-		snapshot_nominators.get(i as usize).cloned()
-	};
-
-	let validator_at = |i: ValidatorIndex| -> Option<T::AccountId> {
-		snapshot_validators.get(i as usize).cloned()
-	};
-
-	// both conversions are safe; snapshots are not created if they exceed.
-	let size = ElectionSize {
-		validators: snapshot_validators.len() as ValidatorIndex,
-		nominators: snapshot_nominators.len() as NominatorIndex,
-	};
-
-	// Clean winners.
-	let winners = sp_npos_elections::to_without_backing(winners);
-
-	// convert into absolute value and to obtain the reduced version.
-	let mut staked = sp_npos_elections::assignment_ratio_to_staked(
-		assignments,
-		<Module<T>>::slashable_balance_of_fn(),
-	);
-
-	// reduce
-	if do_reduce {
-		reduce(&mut staked);
-	}
-
-	// Convert back to ratio assignment. This takes less space.
-	let low_accuracy_assignment = sp_npos_elections::assignment_staked_to_ratio_normalized(staked)
-		.map_err(|e| OffchainElectionError::from(e))?;
-
-	// compact encode the assignment.
-	let compact = CompactAssignments::from_assignment(
-		low_accuracy_assignment,
-		nominator_index,
-		validator_index,
-	)
-	.map_err(|e| OffchainElectionError::from(e))?;
-
-	// potentially reduce the size of the compact to fit weight.
-	let maximum_allowed_voters =
-		maximum_compact_len::<T::WeightInfo>(winners.len() as u32, size, maximum_weight);
-
-	crate::log!(
-		debug,
-		"Maximum weight = {:?} // current weight = {:?} // maximum voters = {:?} // current votes \
-		 = {:?}",
-		maximum_weight,
-		T::WeightInfo::submit_solution_better(
-			size.validators.into(),
-			size.nominators.into(),
-			compact.voter_count() as u32,
-			winners.len() as u32,
-		),
-		maximum_allowed_voters,
-		compact.voter_count(),
-	);
-
-	let compact = trim_to_weight::<T, _>(maximum_allowed_voters, compact, &nominator_index)?;
-
-	// re-compute the score. We re-create what the chain will do. This is a bit verbose and wastes
-	// CPU time, but it is necessary to ensure that the score that we claim is the same as the one
-	// calculated by the chain.
-	let score = {
-		let compact = compact.clone();
-		let assignments = compact.into_assignment(nominator_at, validator_at).unwrap();
-		let staked = sp_npos_elections::assignment_ratio_to_staked(
-			assignments.clone(),
-			<Module<T>>::slashable_balance_of_fn(),
-		);
-
-		let support_map = to_supports::<T::AccountId>(&winners, &staked)
-			.map_err(|_| OffchainElectionError::ElectionFailed)?;
-		support_map.evaluate()
-	};
-
-	// winners to index. Use a simple for loop for a more expressive early exit in case of error.
-	let mut winners_indexed: Vec<ValidatorIndex> = Vec::with_capacity(winners.len());
-	for w in winners {
-		if let Some(idx) = snapshot_validators.iter().position(|v| *v == w) {
-			let compact_index: ValidatorIndex = idx
-				.try_into()
-				.map_err(|_| OffchainElectionError::InvalidWinner)?;
-			winners_indexed.push(compact_index);
-		} else {
-			return Err(OffchainElectionError::InvalidWinner);
-		}
-	}
-
-	Ok((winners_indexed, compact, score, size))
-}
-
-#[cfg(test)]
-mod test {
-	#![allow(unused_variables)]
-	use super::*;
-	use crate::ElectionSize;
-
-	struct Staking;
-
-	impl crate::WeightInfo for Staking {
-		fn bond() -> Weight {
-			unimplemented!()
-		}
-		fn bond_extra() -> Weight {
-			unimplemented!()
-		}
-		fn unbond() -> Weight {
-			unimplemented!()
-		}
-		fn withdraw_unbonded_update(s: u32) -> Weight {
-			unimplemented!()
-		}
-		fn withdraw_unbonded_kill(s: u32) -> Weight {
-			unimplemented!()
-		}
-		fn validate() -> Weight {
-			unimplemented!()
-		}
-		fn nominate(n: u32) -> Weight {
-			unimplemented!()
-		}
-		fn chill() -> Weight {
-			unimplemented!()
-		}
-		fn set_payee() -> Weight {
-			unimplemented!()
-		}
-		fn set_controller() -> Weight {
-			unimplemented!()
-		}
-		fn set_validator_count() -> Weight {
-			unimplemented!()
-		}
-		fn force_no_eras() -> Weight {
-			unimplemented!()
-		}
-		fn force_new_era() -> Weight {
-			unimplemented!()
-		}
-		fn force_new_era_always() -> Weight {
-			unimplemented!()
-		}
-		fn set_invulnerables(v: u32) -> Weight {
-			unimplemented!()
-		}
-		fn force_unstake(s: u32) -> Weight {
-			unimplemented!()
-		}
-		fn cancel_deferred_slash(s: u32) -> Weight {
-			unimplemented!()
-		}
-		fn payout_stakers_dead_controller(n: u32) -> Weight {
-			unimplemented!()
-		}
-		fn payout_stakers_alive_staked(n: u32) -> Weight {
-			unimplemented!()
-		}
-		fn rebond(l: u32) -> Weight {
-			unimplemented!()
-		}
-		fn set_history_depth(e: u32) -> Weight {
-			unimplemented!()
-		}
-		fn reap_stash(s: u32) -> Weight {
-			unimplemented!()
-		}
-		fn new_era(v: u32, n: u32) -> Weight {
-			unimplemented!()
-		}
-		fn submit_solution_better(v: u32, n: u32, a: u32, w: u32) -> Weight {
-			(0 * v + 0 * n + 1000 * a + 0 * w) as Weight
-		}
-		fn kick(w: u32) -> Weight {
-			unimplemented!()
-		}
-		fn get_npos_voters(v: u32, n: u32, s: u32) -> Weight {
-			unimplemented!()
-		}
-		fn get_npos_targets(v: u32) -> Weight {
-			unimplemented!()
-		}
-	}
-
-	#[test]
-	fn find_max_voter_binary_search_works() {
-		let size = ElectionSize {
-			validators: 0,
-			nominators: 10,
-		};
-
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 0), 0);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 1), 0);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 999), 0);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 1000), 1);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 1001), 1);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 1990), 1);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 1999), 1);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 2000), 2);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 2001), 2);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 2010), 2);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 2990), 2);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 2999), 2);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 3000), 3);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 3333), 3);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 5500), 5);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 7777), 7);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 9999), 9);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 10_000), 10);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 10_999), 10);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 11_000), 10);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 22_000), 10);
-
-		let size = ElectionSize {
-			validators: 0,
-			nominators: 1,
-		};
-
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 0), 0);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 1), 0);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 999), 0);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 1000), 1);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 1001), 1);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 1990), 1);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 1999), 1);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 2000), 1);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 2001), 1);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 2010), 1);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 3333), 1);
-
-		let size = ElectionSize {
-			validators: 0,
-			nominators: 2,
-		};
-
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 0), 0);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 1), 0);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 999), 0);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 1000), 1);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 1001), 1);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 1999), 1);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 2000), 2);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 2001), 2);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 2010), 2);
-		assert_eq!(maximum_compact_len::<Staking>(0, size, 3333), 2);
-	}
-}
diff --git a/frame/staking/src/testing_utils.rs b/frame/staking/src/testing_utils.rs
index afe36f55b1dc..c4daf88098e7 100644
--- a/frame/staking/src/testing_utils.rs
+++ b/frame/staking/src/testing_utils.rs
@@ -24,7 +24,6 @@ use frame_benchmarking::account;
 use frame_system::RawOrigin;
 use sp_io::hashing::blake2_256;
 use rand_chacha::{rand_core::{RngCore, SeedableRng}, ChaChaRng};
-use sp_npos_elections::*;
 
 const SEED: u32 = 0;
 
@@ -143,7 +142,7 @@ pub fn create_validators_with_nominators_for_era<T: Config>(
 	}
 
 	let to_nominate = to_nominate.unwrap_or(validators_stash.len() as u32) as usize;
-	let validator_choosen = validators_stash[0..to_nominate].to_vec();
+	let validator_chosen = validators_stash[0..to_nominate].to_vec();
 
 	// Create nominators
 	for j in 0 .. nominators {
@@ -155,7 +154,7 @@ pub fn create_validators_with_nominators_for_era<T: Config>(
 		)?;
 
 		// Have them randomly validate
-		let mut available_validators = validator_choosen.clone();
+		let mut available_validators = validator_chosen.clone();
 		let mut selected_validators: Vec<<T::Lookup as StaticLookup>::Source> =
 			Vec::with_capacity(edge_per_nominator);
 
@@ -169,227 +168,10 @@ pub fn create_validators_with_nominators_for_era<T: Config>(
 
 	ValidatorCount::put(validators);
 
-	Ok(validator_choosen)
+	Ok(validator_chosen)
 }
 
-
-/// Build a _really bad_ but acceptable solution for election. This should always yield a solution
-/// which has a less score than the seq-phragmen.
-pub fn get_weak_solution<T: Config>(
-	do_reduce: bool,
-) -> (Vec<ValidatorIndex>, CompactAssignments, ElectionScore, ElectionSize) {
-	let mut backing_stake_of: BTreeMap<T::AccountId, BalanceOf<T>> = BTreeMap::new();
-
-	// self stake
-	<Validators<T>>::iter().for_each(|(who, _p)| {
-		*backing_stake_of.entry(who.clone()).or_insert_with(|| Zero::zero()) +=
-			<Module<T>>::slashable_balance_of(&who)
-	});
-
-	// elect winners. We chose the.. least backed ones.
-	let mut sorted: Vec<T::AccountId> = backing_stake_of.keys().cloned().collect();
-	sorted.sort_by_key(|x| backing_stake_of.get(x).unwrap());
-	let winners: Vec<T::AccountId> = sorted
-		.iter()
-		.rev()
-		.cloned()
-		.take(<Module<T>>::validator_count() as usize)
-		.collect();
-
-	let mut staked_assignments: Vec<StakedAssignment<T::AccountId>> = Vec::new();
-	// you could at this point start adding some of the nominator's stake, but for now we don't.
-	// This solution must be bad.
-
-	// add self support to winners.
-	winners.iter().for_each(|w| {
-		staked_assignments.push(StakedAssignment {
-			who: w.clone(),
-			distribution: vec![(
-				w.clone(),
-				<Module<T>>::slashable_balance_of_vote_weight(
-					&w,
-					T::Currency::total_issuance(),
-				).into(),
-			)],
-		})
-	});
-
-	if do_reduce {
-		reduce(&mut staked_assignments);
-	}
-
-	// helpers for building the compact
-	let snapshot_validators = <Module<T>>::snapshot_validators().unwrap();
-	let snapshot_nominators = <Module<T>>::snapshot_nominators().unwrap();
-
-	let nominator_index = |a: &T::AccountId| -> Option<NominatorIndex> {
-		snapshot_nominators
-			.iter()
-			.position(|x| x == a)
-			.and_then(|i| <usize as TryInto<NominatorIndex>>::try_into(i).ok())
-	};
-	let validator_index = |a: &T::AccountId| -> Option<ValidatorIndex> {
-		snapshot_validators
-			.iter()
-			.position(|x| x == a)
-			.and_then(|i| <usize as TryInto<ValidatorIndex>>::try_into(i).ok())
-	};
-
-	// convert back to ratio assignment. This takes less space.
-	let low_accuracy_assignment = assignment_staked_to_ratio_normalized(staked_assignments)
-		.expect("Failed to normalize");
-
-	// re-calculate score based on what the chain will decode.
-	let score = {
-		let staked = assignment_ratio_to_staked::<_, OffchainAccuracy, _>(
-			low_accuracy_assignment.clone(),
-			<Module<T>>::slashable_balance_of_fn(),
-		);
-
-		let support_map =
-			to_supports::<T::AccountId>(winners.as_slice(), staked.as_slice()).unwrap();
-		support_map.evaluate()
-	};
-
-	// compact encode the assignment.
-	let compact = CompactAssignments::from_assignment(
-		low_accuracy_assignment,
-		nominator_index,
-		validator_index,
-	)
-	.unwrap();
-
-	// winners to index.
-	let winners = winners
-		.into_iter()
-		.map(|w| {
-			snapshot_validators
-				.iter()
-				.position(|v| *v == w)
-				.unwrap()
-				.try_into()
-				.unwrap()
-		})
-		.collect::<Vec<ValidatorIndex>>();
-
-	let size = ElectionSize {
-		validators: snapshot_validators.len() as ValidatorIndex,
-		nominators: snapshot_nominators.len() as NominatorIndex,
-	};
-
-	(winners, compact, score, size)
-}
-
-/// Create a solution for seq-phragmen. This uses the same internal function as used by the offchain
-/// worker code.
-pub fn get_seq_phragmen_solution<T: Config>(
-	do_reduce: bool,
-) -> (
-	Vec<ValidatorIndex>,
-	CompactAssignments,
-	ElectionScore,
-	ElectionSize,
-) {
-	let iters = offchain_election::get_balancing_iters::<T>();
-
-	let sp_npos_elections::ElectionResult {
-		winners,
-		assignments,
-	} = <Module<T>>::do_phragmen::<OffchainAccuracy>(iters).unwrap();
-
-	offchain_election::prepare_submission::<T>(
-		assignments,
-		winners,
-		do_reduce,
-		T::BlockWeights::get().max_block,
-	)
-	.unwrap()
-}
-
-/// Returns a solution in which only one winner is elected with just a self vote.
-pub fn get_single_winner_solution<T: Config>(
-	winner: T::AccountId,
-) -> Result<
-	(
-		Vec<ValidatorIndex>,
-		CompactAssignments,
-		ElectionScore,
-		ElectionSize,
-	),
-	&'static str,
-> {
-	let snapshot_validators = <Module<T>>::snapshot_validators().unwrap();
-	let snapshot_nominators = <Module<T>>::snapshot_nominators().unwrap();
-
-	let val_index = snapshot_validators
-		.iter()
-		.position(|x| *x == winner)
-		.ok_or("not a validator")?;
-	let nom_index = snapshot_nominators
-		.iter()
-		.position(|x| *x == winner)
-		.ok_or("not a nominator")?;
-
-	let stake = <Staking<T>>::slashable_balance_of(&winner);
-	let stake =
-		<T::CurrencyToVote>::to_vote(stake, T::Currency::total_issuance()) as ExtendedBalance;
-
-	let val_index = val_index as ValidatorIndex;
-	let nom_index = nom_index as NominatorIndex;
-
-	let winners = vec![val_index];
-	let compact = CompactAssignments {
-		votes1: vec![(nom_index, val_index)],
-		..Default::default()
-	};
-	let score = [stake, stake, stake * stake];
-	let size = ElectionSize {
-		validators: snapshot_validators.len() as ValidatorIndex,
-		nominators: snapshot_nominators.len() as NominatorIndex,
-	};
-
-	Ok((winners, compact, score, size))
-}
-
-/// get the active era.
+/// get the current era.
 pub fn current_era<T: Config>() -> EraIndex {
 	<Module<T>>::current_era().unwrap_or(0)
 }
-
-/// initialize the first era.
-pub fn init_active_era() {
-	ActiveEra::put(ActiveEraInfo {
-		index: 1,
-		start: None,
-	})
-}
-
-/// Create random assignments for the given list of winners. Each assignment will have
-/// MAX_NOMINATIONS edges.
-pub fn create_assignments_for_offchain<T: Config>(
-	num_assignments: u32,
-	winners: Vec<<T::Lookup as StaticLookup>::Source>,
-) -> Result<
-	(
-		Vec<(T::AccountId, ExtendedBalance)>,
-		Vec<Assignment<T::AccountId, OffchainAccuracy>>,
-	),
-	&'static str
-> {
-	let ratio = OffchainAccuracy::from_rational(1, MAX_NOMINATIONS);
-	let assignments: Vec<Assignment<T::AccountId, OffchainAccuracy>> = <Nominators<T>>::iter()
-		.take(num_assignments as usize)
-		.map(|(n, t)| Assignment {
-			who: n,
-			distribution: t.targets.iter().map(|v| (v.clone(), ratio)).collect(),
-		})
-		.collect();
-
-	ensure!(assignments.len() == num_assignments as usize, "must bench for `a` assignments");
-
-	let winners = winners.into_iter().map(|v| {
-		(<T::Lookup as StaticLookup>::lookup(v).unwrap(), 0)
-	}).collect();
-
-	Ok((winners, assignments))
-}
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index 43ce2259fac7..df3456bf2992 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -25,10 +25,11 @@ use sp_runtime::{
 use sp_staking::offence::OffenceDetails;
 use frame_support::{
 	assert_ok, assert_noop, StorageMap,
-	traits::{Currency, ReservableCurrency, OnInitialize, OnFinalize},
+	traits::{Currency, ReservableCurrency, OnInitialize},
 };
 use pallet_balances::Error as BalancesError;
 use substrate_test_utils::assert_eq_uvec;
+use frame_election_provider_support::Support;
 
 #[test]
 fn force_unstake_works() {
@@ -1806,7 +1807,7 @@ fn bond_with_little_staked_value_bounded() {
 }
 
 #[test]
-fn bond_with_duplicate_vote_should_be_ignored_by_npos_election() {
+fn bond_with_duplicate_vote_should_be_ignored_by_election_provider() {
 	ExtBuilder::default()
 		.validator_count(2)
 		.nominate(false)
@@ -1817,43 +1818,43 @@ fn bond_with_duplicate_vote_should_be_ignored_by_npos_election() {
 			assert_ok!(Staking::chill(Origin::signed(100)));
 			// make stakes equal.
 			assert_ok!(Staking::bond_extra(Origin::signed(31), 999));
-
+			// ensure all have equal stake.
 			assert_eq!(
 				<Validators<Test>>::iter()
 					.map(|(v, _)| (v, Staking::ledger(v - 1).unwrap().total))
 					.collect::<Vec<_>>(),
 				vec![(31, 1000), (21, 1000), (11, 1000)],
 			);
+			// no nominators shall exist.
 			assert!(<Nominators<Test>>::iter().map(|(n, _)| n).collect::<Vec<_>>().is_empty());
 
-			// give the man some money
+			// give the man some money.
 			let initial_balance = 1000;
-			for i in [1, 2, 3, 4,].iter() {
+			for i in [1, 2, 3, 4].iter() {
 				let _ = Balances::make_free_balance_be(i, initial_balance);
 			}
 
 			assert_ok!(Staking::bond(Origin::signed(1), 2, 1000, RewardDestination::Controller));
-			// 11 should not be elected. All of these count as ONE vote.
-			assert_ok!(Staking::nominate(Origin::signed(2), vec![11, 11, 11, 21, 31,]));
+			assert_ok!(Staking::nominate(Origin::signed(2), vec![11, 11, 11, 21, 31]));
 
 			assert_ok!(Staking::bond(Origin::signed(3), 4, 1000, RewardDestination::Controller));
 			assert_ok!(Staking::nominate(Origin::signed(4), vec![21, 31]));
 
-			// winners should be 21 and 31. Otherwise this election is taking duplicates into account.
-			let sp_npos_elections::ElectionResult {
-				winners,
-				assignments,
-			} = Staking::do_phragmen::<Perbill>(0).unwrap();
-			let winners = sp_npos_elections::to_without_backing(winners);
-
-			assert_eq!(winners, vec![31, 21]);
-			// only distribution to 21 and 31.
-			assert_eq!(assignments.iter().find(|a| a.who == 1).unwrap().distribution.len(), 2);
+			// winners should be 21 and 31. Otherwise this election is taking duplicates into
+			// account.
+			let supports = <Test as Config>::ElectionProvider::elect().unwrap().0;
+			assert_eq!(
+				supports,
+				vec![
+					(21, Support { total: 1800, voters: vec![(21, 1000), (3, 400), (1, 400)] }),
+					(31, Support { total: 2200, voters: vec![(31, 1000), (3, 600), (1, 600)] })
+				],
+			);
 		});
 }
 
 #[test]
-fn bond_with_duplicate_vote_should_be_ignored_by_npos_election_elected() {
+fn bond_with_duplicate_vote_should_be_ignored_by_election_provider_elected() {
 	// same as above but ensures that even when the duple is being elected, everything is sane.
 	ExtBuilder::default()
 		.validator_count(2)
@@ -1863,39 +1864,39 @@ fn bond_with_duplicate_vote_should_be_ignored_by_npos_election_elected() {
 		.execute_with(|| {
 			// disable the nominator
 			assert_ok!(Staking::chill(Origin::signed(100)));
-			// make stakes equal.
+			// 31/30 will have less stake
 			assert_ok!(Staking::bond_extra(Origin::signed(31), 99));
-
+			// ensure all have equal stake.
 			assert_eq!(
 				<Validators<Test>>::iter()
 					.map(|(v, _)| (v, Staking::ledger(v - 1).unwrap().total))
 					.collect::<Vec<_>>(),
 				vec![(31, 100), (21, 1000), (11, 1000)],
 			);
+			// no nominators shall exist.
 			assert!(<Nominators<Test>>::iter().map(|(n, _)| n).collect::<Vec<_>>().is_empty());
 
-			// give the man some money
+			// give the man some money.
 			let initial_balance = 1000;
 			for i in [1, 2, 3, 4,].iter() {
 				let _ = Balances::make_free_balance_be(i, initial_balance);
 			}
 
 			assert_ok!(Staking::bond(Origin::signed(1), 2, 1000, RewardDestination::Controller));
-			assert_ok!(Staking::nominate(Origin::signed(2), vec![11, 11, 11, 21, 31,]));
+			assert_ok!(Staking::nominate(Origin::signed(2), vec![11, 11, 11, 21, 31]));
 
 			assert_ok!(Staking::bond(Origin::signed(3), 4, 1000, RewardDestination::Controller));
 			assert_ok!(Staking::nominate(Origin::signed(4), vec![21, 31]));
 
-			// winners should be 21 and 31. Otherwise this election is taking duplicates into account.
-			let sp_npos_elections::ElectionResult {
-				winners,
-				assignments,
-			} = Staking::do_phragmen::<Perbill>(0).unwrap();
-
-			let winners = sp_npos_elections::to_without_backing(winners);
-			assert_eq!(winners, vec![21, 11]);
-			// only distribution to 21 and 31.
-			assert_eq!(assignments.iter().find(|a| a.who == 1).unwrap().distribution.len(), 2);
+			// winners should be 21 and 11.
+			let supports = <Test as Config>::ElectionProvider::elect().unwrap().0;
+			assert_eq!(
+				supports,
+				vec![
+					(11, Support { total: 1500, voters: vec![(11, 1000), (1, 500)] }),
+					(21, Support { total: 2500, voters: vec![(21, 1000), (3, 1000), (1, 500)] })
+				],
+			);
 		});
 }
 
@@ -2905,1298 +2906,6 @@ fn remove_multi_deferred() {
 	})
 }
 
-mod offchain_election {
-	use crate::*;
-	use codec::Encode;
-	use frame_support::{
-		assert_noop, assert_ok, assert_err_with_weight,
-		dispatch::DispatchResultWithPostInfo,
-	};
-	use sp_runtime::transaction_validity::TransactionSource;
-	use mock::*;
-	use parking_lot::RwLock;
-	use sp_core::offchain::{
-		testing::{PoolState, TestOffchainExt, TestTransactionPoolExt},
-		OffchainWorkerExt, TransactionPoolExt, OffchainDbExt,
-	};
-	use sp_io::TestExternalities;
-	use sp_npos_elections::StakedAssignment;
-	use frame_support::traits::OffchainWorker;
-	use std::sync::Arc;
-	use substrate_test_utils::assert_eq_uvec;
-
-	fn percent(x: u16) -> OffchainAccuracy {
-		OffchainAccuracy::from_percent(x)
-	}
-
-	/// setup a new set of validators and nominator storage items independent of the parent mock
-	/// file. This produces a edge graph that can be reduced.
-	pub fn build_offchain_election_test_ext() {
-		for i in (10..=40).step_by(10) {
-			// Note: we respect the convention of the mock (10, 11 pairs etc.) since these accounts
-			// have corresponding keys in session which makes everything more ergonomic and
-			// realistic.
-			bond_validator(i + 1, i, 100);
-		}
-
-		let mut voter = 1;
-		bond_nominator(voter, 1000 + voter, 100, vec![11]);
-		voter = 2;
-		bond_nominator(voter, 1000 + voter, 100, vec![11, 11]);
-		voter = 3;
-		bond_nominator(voter, 1000 + voter, 100, vec![21, 41]);
-		voter = 4;
-		bond_nominator(voter, 1000 + voter, 100, vec![21, 31, 41]);
-		voter = 5;
-		bond_nominator(voter, 1000 + voter, 100, vec![21, 31, 41]);
-	}
-
-	/// convert an externalities to one that can handle offchain worker tests.
-	fn offchainify(ext: &mut TestExternalities, iterations: u32) -> Arc<RwLock<PoolState>> {
-		let (offchain, offchain_state) = TestOffchainExt::new();
-		let (pool, pool_state) = TestTransactionPoolExt::new();
-
-		let mut seed = [0_u8; 32];
-		seed[0..4].copy_from_slice(&iterations.to_le_bytes());
-		offchain_state.write().seed = seed;
-
-		ext.register_extension(OffchainDbExt::new(offchain.clone()));
-		ext.register_extension(OffchainWorkerExt::new(offchain));
-		ext.register_extension(TransactionPoolExt::new(pool));
-
-		pool_state
-	}
-
-	fn election_size() -> ElectionSize {
-		ElectionSize {
-			validators: Staking::snapshot_validators().unwrap().len() as ValidatorIndex,
-			nominators: Staking::snapshot_nominators().unwrap().len() as NominatorIndex,
-		}
-	}
-
-	fn submit_solution(
-		origin: Origin,
-		winners: Vec<ValidatorIndex>,
-		compact: CompactAssignments,
-		score: ElectionScore,
-	) -> DispatchResultWithPostInfo {
-		Staking::submit_election_solution(
-			origin,
-			winners,
-			compact,
-			score,
-			current_era(),
-			election_size(),
-		)
-	}
-
-	#[test]
-	fn is_current_session_final_works() {
-		ExtBuilder::default()
-			.session_per_era(3)
-			.build()
-			.execute_with(|| {
-				mock::start_active_era(1);
-				assert_eq!(Session::current_index(), 3);
-				assert_eq!(Staking::current_era(), Some(1));
-				assert_eq!(Staking::is_current_session_final(), false);
-
-				start_session(4);
-				assert_eq!(Session::current_index(), 4);
-				assert_eq!(Staking::current_era(), Some(1));
-				assert_eq!(Staking::is_current_session_final(), true);
-
-				start_session(5);
-				assert_eq!(Session::current_index(), 5);
-				// era changed.
-				assert_eq!(Staking::current_era(), Some(2));
-				assert_eq!(Staking::is_current_session_final(), false);
-			})
-	}
-
-	#[test]
-	fn offchain_window_is_triggered() {
-		ExtBuilder::default()
-			.session_per_era(5)
-			.period(10)
-			.election_lookahead(3)
-			.build()
-			.execute_with(|| {
-				run_to_block(7);
-				assert_session_era!(0, 0);
-
-				run_to_block(10);
-				assert_session_era!(1, 0);
-				assert_eq!(Staking::era_election_status(), ElectionStatus::Closed);
-				assert!(Staking::snapshot_nominators().is_none());
-				assert!(Staking::snapshot_validators().is_none());
-
-				run_to_block(36);
-				assert_session_era!(3, 0);
-
-				// fist era has session 0, which has 0 blocks length, so we have in total 40 blocks
-				// in the era.
-				run_to_block(37);
-				assert_session_era!(3, 0);
-				assert_eq!(Staking::era_election_status(), ElectionStatus::Open(37));
-				assert!(Staking::snapshot_nominators().is_some());
-				assert!(Staking::snapshot_validators().is_some());
-
-				run_to_block(38);
-				assert_eq!(Staking::era_election_status(), ElectionStatus::Open(37));
-
-				run_to_block(39);
-				assert_eq!(Staking::era_election_status(), ElectionStatus::Open(37));
-
-				run_to_block(40);
-				assert_session_era!(4, 1);
-				assert_eq!(Staking::era_election_status(), ElectionStatus::Closed);
-				assert!(Staking::snapshot_nominators().is_none());
-				assert!(Staking::snapshot_validators().is_none());
-
-				run_to_block(86);
-				assert_session_era!(8, 1);
-				assert_eq!(Staking::era_election_status(), ElectionStatus::Closed);
-				assert!(Staking::snapshot_nominators().is_none());
-				assert!(Staking::snapshot_validators().is_none());
-
-				// second era onwards has 50 blocks per era.
-				run_to_block(87);
-				assert_eq!(Staking::era_election_status(), ElectionStatus::Open(87));
-				assert!(Staking::snapshot_nominators().is_some());
-				assert!(Staking::snapshot_validators().is_some());
-
-				run_to_block(90);
-				assert_session_era!(9, 2);
-				assert_eq!(Staking::era_election_status(), ElectionStatus::Closed);
-				assert!(Staking::snapshot_nominators().is_none());
-				assert!(Staking::snapshot_validators().is_none());
-			})
-	}
-
-	#[test]
-	fn offchain_window_is_triggered_when_forcing() {
-		ExtBuilder::default()
-			.session_per_era(5)
-			.period(10)
-			.election_lookahead(3)
-			.build()
-			.execute_with(|| {
-				run_to_block(12);
-				ForceEra::put(Forcing::ForceNew);
-				run_to_block(13);
-				assert_eq!(Staking::era_election_status(), ElectionStatus::Closed);
-
-				run_to_block(17); // instead of 47
-				assert_eq!(Staking::era_election_status(), ElectionStatus::Open(17));
-
-				run_to_block(20);
-				assert_eq!(Staking::era_election_status(), ElectionStatus::Closed);
-			})
-	}
-
-	#[test]
-	fn offchain_window_is_triggered_when_force_always() {
-		ExtBuilder::default()
-			.session_per_era(5)
-			.period(10)
-			.election_lookahead(3)
-			.build()
-			.execute_with(|| {
-				ForceEra::put(Forcing::ForceAlways);
-				run_to_block(16);
-				assert_eq!(Staking::era_election_status(), ElectionStatus::Closed);
-
-				run_to_block(17); // instead of 37
-				assert_eq!(Staking::era_election_status(), ElectionStatus::Open(17));
-
-				run_to_block(20);
-				assert_eq!(Staking::era_election_status(), ElectionStatus::Closed);
-
-				run_to_block(26);
-				assert_eq!(Staking::era_election_status(), ElectionStatus::Closed);
-
-				run_to_block(27); // next one again
-				assert_eq!(Staking::era_election_status(), ElectionStatus::Open(27));
-			})
-	}
-
-	#[test]
-	fn offchain_window_closes_when_forcenone() {
-		ExtBuilder::default()
-			.session_per_era(5)
-			.period(10)
-			.election_lookahead(3)
-			.build()
-			.execute_with(|| {
-				ForceEra::put(Forcing::ForceNone);
-
-				run_to_block(36);
-				assert_session_era!(3, 0);
-				assert_eq!(Staking::era_election_status(), ElectionStatus::Closed);
-
-				// opens
-				run_to_block(37);
-				assert_eq!(Staking::era_election_status(), ElectionStatus::Open(37));
-				assert!(Staking::is_current_session_final());
-				assert!(Staking::snapshot_validators().is_some());
-
-				// closes normally
-				run_to_block(40);
-				assert_eq!(Staking::era_election_status(), ElectionStatus::Closed);
-				assert!(!Staking::is_current_session_final());
-				assert!(Staking::snapshot_validators().is_none());
-				assert_session_era!(4, 0);
-
-				run_to_block(47);
-				assert_eq!(Staking::era_election_status(), ElectionStatus::Closed);
-				assert_session_era!(4, 0);
-
-				run_to_block(57);
-				assert_eq!(Staking::era_election_status(), ElectionStatus::Closed);
-				assert_session_era!(5, 0);
-
-				run_to_block(67);
-				assert_eq!(Staking::era_election_status(), ElectionStatus::Closed);
-
-				// Will not open again as scheduled
-				run_to_block(87);
-				assert_eq!(Staking::era_election_status(), ElectionStatus::Closed);
-				assert_session_era!(8, 0);
-
-				run_to_block(90);
-				assert_eq!(Staking::era_election_status(), ElectionStatus::Closed);
-				assert_session_era!(9, 0);
-			})
-	}
-
-	#[test]
-	fn offchain_window_on_chain_fallback_works() {
-		ExtBuilder::default().build_and_execute(|| {
-			start_session(1);
-			start_session(2);
-			assert_eq!(Staking::era_election_status(), ElectionStatus::Closed);
-			// some election must have happened by now.
-			assert_eq!(
-				System::events()
-					.into_iter()
-					.map(|r| r.event)
-					.filter_map(|e| {
-						if let mock::Event::staking(inner) = e {
-							Some(inner)
-						} else {
-							None
-						}
-					})
-					.last()
-					.unwrap(),
-				RawEvent::StakingElection(ElectionCompute::OnChain),
-			);
-		})
-	}
-
-	#[test]
-	#[ignore]
-	fn offchain_wont_work_if_snapshot_fails() {
-		ExtBuilder::default()
-			.offchain_election_ext()
-			.build()
-			.execute_with(|| {
-				run_to_block(12);
-				assert!(Staking::snapshot_validators().is_some());
-				assert_eq!(Staking::era_election_status(), ElectionStatus::Open(12));
-
-				// validate more than the limit
-				let limit: NominatorIndex = ValidatorIndex::max_value() as NominatorIndex + 1;
-				let ctrl = 1_000_000;
-				for i in 0..limit {
-					bond_validator((1000 + i).into(), (1000 + i + ctrl).into(), 100);
-				}
-
-				// window stays closed since no snapshot was taken.
-				run_to_block(27);
-				assert!(Staking::snapshot_validators().is_none());
-				assert_eq!(Staking::era_election_status(), ElectionStatus::Closed);
-			})
-	}
-
-	#[test]
-	fn staking_is_locked_when_election_window_open() {
-		ExtBuilder::default()
-			.offchain_election_ext()
-			.election_lookahead(3)
-			.build()
-			.execute_with(|| {
-				run_to_block(12);
-				assert!(Staking::snapshot_validators().is_some());
-				// given
-				assert_eq!(Staking::era_election_status(), ElectionStatus::Open(12));
-
-				// chill et. al. are now not allowed.
-				assert_noop!(
-					Staking::chill(Origin::signed(10)),
-					Error::<Test>::CallNotAllowed,
-				);
-			})
-	}
-
-	#[test]
-	fn signed_result_can_be_submitted() {
-		// should check that we have a new validator set normally, event says that it comes from
-		// offchain.
-		ExtBuilder::default()
-			.offchain_election_ext()
-			.build()
-			.execute_with(|| {
-				run_to_block(12);
-				assert_eq!(Staking::era_election_status(), ElectionStatus::Open(12));
-				assert!(Staking::snapshot_validators().is_some());
-
-				let (compact, winners, score) = prepare_submission_with(true, true, 2, |_| {});
-				assert_ok!(submit_solution(
-					Origin::signed(10),
-					winners,
-					compact,
-					score,
-				));
-
-				let queued_result = Staking::queued_elected().unwrap();
-				assert_eq!(queued_result.compute, ElectionCompute::Signed);
-				assert_eq!(
-					System::events()
-						.into_iter()
-						.map(|r| r.event)
-						.filter_map(|e| {
-							if let mock::Event::staking(inner) = e {
-								Some(inner)
-							} else {
-								None
-							}
-						})
-						.last()
-						.unwrap(),
-					RawEvent::SolutionStored(ElectionCompute::Signed),
-				);
-
-				run_to_block(15);
-				assert_eq!(Staking::era_election_status(), ElectionStatus::Closed);
-
-				assert_eq!(
-					System::events()
-						.into_iter()
-						.map(|r| r.event)
-						.filter_map(|e| {
-							if let mock::Event::staking(inner) = e {
-								Some(inner)
-							} else {
-								None
-							}
-						})
-						.last()
-						.unwrap(),
-					RawEvent::StakingElection(ElectionCompute::Signed),
-				);
-			})
-	}
-
-	#[test]
-	fn signed_result_can_be_submitted_later() {
-		// same as `signed_result_can_be_submitted` but at a later block.
-		ExtBuilder::default()
-			.offchain_election_ext()
-			.build()
-			.execute_with(|| {
-				run_to_block(14);
-				assert_eq!(Staking::era_election_status(), ElectionStatus::Open(12));
-
-				let (compact, winners, score) = prepare_submission_with(true, true, 2, |_| {});
-				assert_ok!(submit_solution(Origin::signed(10), winners, compact, score));
-
-				let queued_result = Staking::queued_elected().unwrap();
-				assert_eq!(queued_result.compute, ElectionCompute::Signed);
-
-				run_to_block(15);
-				assert_eq!(Staking::era_election_status(), ElectionStatus::Closed);
-
-				assert_eq!(
-					System::events()
-						.into_iter()
-						.map(|r| r.event)
-						.filter_map(|e| {
-							if let mock::Event::staking(inner) = e {
-								Some(inner)
-							} else {
-								None
-							}
-						})
-						.last()
-						.unwrap(),
-					RawEvent::StakingElection(ElectionCompute::Signed),
-				);
-			})
-	}
-
-	#[test]
-	fn early_solution_submission_is_rejected() {
-		// should check that we have a new validator set normally, event says that it comes from
-		// offchain.
-		ExtBuilder::default()
-			.offchain_election_ext()
-			.build()
-			.execute_with(|| {
-				run_to_block(11);
-				// submission is not yet allowed
-				assert_eq!(Staking::era_election_status(), ElectionStatus::Closed);
-
-				// create all the indices just to build the solution.
-				Staking::create_stakers_snapshot();
-				let (compact, winners, score) = prepare_submission_with(true, true, 2, |_| {});
-				Staking::kill_stakers_snapshot();
-
-				assert_err_with_weight!(
-					Staking::submit_election_solution(
-						Origin::signed(10),
-						winners.clone(),
-						compact.clone(),
-						score,
-						current_era(),
-						ElectionSize::default(),
-					),
-					Error::<Test>::OffchainElectionEarlySubmission,
-					Some(<Test as frame_system::Config>::DbWeight::get().reads(1)),
-				);
-			})
-	}
-
-	#[test]
-	fn weak_solution_is_rejected() {
-		// A solution which is weaker than what we currently have on-chain is rejected.
-		ExtBuilder::default()
-			.offchain_election_ext()
-			.has_stakers(false)
-			.validator_count(4)
-			.build()
-			.execute_with(|| {
-				build_offchain_election_test_ext();
-				run_to_block(12);
-
-				// a good solution
-				let (compact, winners, score) = prepare_submission_with(true, true, 2, |_| {});
-				assert_ok!(submit_solution(
-					Origin::signed(10),
-					winners,
-					compact,
-					score,
-				));
-
-				// a bad solution
-				let (compact, winners, score) = horrible_npos_solution(false);
-				assert_err_with_weight!(
-					submit_solution(
-						Origin::signed(10),
-						winners.clone(),
-						compact.clone(),
-						score,
-					),
-					Error::<Test>::OffchainElectionWeakSubmission,
-					Some(<Test as frame_system::Config>::DbWeight::get().reads(3))
-				);
-			})
-	}
-
-	#[test]
-	fn better_solution_is_accepted() {
-		// A solution which is better than what we currently have on-chain is accepted.
-		ExtBuilder::default()
-			.offchain_election_ext()
-			.validator_count(4)
-			.has_stakers(false)
-			.build()
-			.execute_with(|| {
-				build_offchain_election_test_ext();
-				run_to_block(12);
-
-				// a meeeeh solution
-				let (compact, winners, score) = horrible_npos_solution(false);
-				assert_ok!(submit_solution(
-					Origin::signed(10),
-					winners,
-					compact,
-					score,
-				));
-
-				// a better solution
-				let (compact, winners, score) = prepare_submission_with(true, true, 2, |_| {});
-				assert_ok!(submit_solution(
-					Origin::signed(10),
-					winners,
-					compact,
-					score,
-				));
-			})
-	}
-
-	#[test]
-	fn offchain_worker_runs_when_window_open() {
-		// at the end of the first finalized block with ElectionStatus::open(_), it should execute.
-		let mut ext = ExtBuilder::default()
-			.offchain_election_ext()
-			.validator_count(2)
-			.build();
-		let state = offchainify(&mut ext, 0);
-		ext.execute_with(|| {
-			run_to_block(12);
-
-			// local key 11 is in the elected set.
-			assert_eq_uvec!(Session::validators(), vec![11, 21]);
-			assert_eq!(state.read().transactions.len(), 0);
-			Staking::offchain_worker(12);
-			assert_eq!(state.read().transactions.len(), 1);
-
-			let encoded = state.read().transactions[0].clone();
-			let extrinsic: Extrinsic = Decode::decode(&mut &*encoded).unwrap();
-
-			let call = extrinsic.call;
-			let inner = match call {
-				mock::Call::Staking(inner) => inner,
-				_ => unreachable!(),
-			};
-
-			assert_eq!(
-				<Staking as sp_runtime::traits::ValidateUnsigned>::validate_unsigned(
-					TransactionSource::Local,
-					&inner,
-				),
-				TransactionValidity::Ok(ValidTransaction {
-					priority: UnsignedPriority::get() + 1125, // the proposed slot stake.
-					requires: vec![],
-					provides: vec![("StakingOffchain", current_era()).encode()],
-					longevity: 3,
-					propagate: false,
-				})
-			)
-		})
-	}
-
-	#[test]
-	fn offchain_worker_runs_with_balancing() {
-		// Offchain worker balances based on the number provided by randomness. See the difference
-		// in the priority, which comes from the computed score.
-		let mut ext = ExtBuilder::default()
-			.offchain_election_ext()
-			.validator_count(2)
-			.max_offchain_iterations(2)
-			.build();
-		let state = offchainify(&mut ext, 2);
-		ext.execute_with(|| {
-			run_to_block(12);
-
-			// local key 11 is in the elected set.
-			assert_eq_uvec!(Session::validators(), vec![11, 21]);
-			assert_eq!(state.read().transactions.len(), 0);
-			Staking::offchain_worker(12);
-			assert_eq!(state.read().transactions.len(), 1);
-
-			let encoded = state.read().transactions[0].clone();
-			let extrinsic: Extrinsic = Decode::decode(&mut &*encoded).unwrap();
-
-			let call = extrinsic.call;
-			let inner = match call {
-				mock::Call::Staking(inner) => inner,
-				_ => unreachable!(),
-			};
-
-			assert_eq!(
-				<Staking as sp_runtime::traits::ValidateUnsigned>::validate_unsigned(
-					TransactionSource::Local,
-					&inner,
-				),
-				TransactionValidity::Ok(ValidTransaction {
-					// the proposed slot stake, with balance_solution.
-					priority: UnsignedPriority::get() + 1250,
-					requires: vec![],
-					provides: vec![("StakingOffchain", active_era()).encode()],
-					longevity: 3,
-					propagate: false,
-				})
-			)
-		})
-	}
-
-	#[test]
-	fn mediocre_submission_from_authority_is_early_rejected() {
-		let mut ext = ExtBuilder::default()
-			.offchain_election_ext()
-			.validator_count(4)
-			.build();
-		let state = offchainify(&mut ext, 0);
-		ext.execute_with(|| {
-			run_to_block(12);
-			// put a good solution on-chain
-			let (compact, winners, score) = prepare_submission_with(true, true, 2, |_| {});
-			assert_ok!(submit_solution(
-				Origin::signed(10),
-				winners,
-				compact,
-				score,
-			),);
-
-			// now run the offchain worker in the same chain state.
-			Staking::offchain_worker(12);
-			assert_eq!(state.read().transactions.len(), 1);
-
-			let encoded = state.read().transactions[0].clone();
-			let extrinsic: Extrinsic = Decode::decode(&mut &*encoded).unwrap();
-
-			let call = extrinsic.call;
-			let inner = match call {
-				mock::Call::Staking(inner) => inner,
-				_ => unreachable!(),
-			};
-
-			// pass this call to ValidateUnsigned
-			assert_eq!(
-				<Staking as sp_runtime::traits::ValidateUnsigned>::validate_unsigned(
-					TransactionSource::Local,
-					&inner,
-				),
-				TransactionValidity::Err(
-					InvalidTransaction::Custom(<Error<Test>>::OffchainElectionWeakSubmission.as_u8()).into(),
-				),
-			)
-		})
-	}
-
-	#[test]
-	fn invalid_election_correct_number_of_winners() {
-		ExtBuilder::default()
-			.offchain_election_ext()
-			.validator_count(4)
-			.has_stakers(false)
-			.build()
-			.execute_with(|| {
-				build_offchain_election_test_ext();
-				run_to_block(12);
-
-				ValidatorCount::put(3);
-				let (compact, winners, score) = prepare_submission_with(true, true, 2, |_| {});
-				ValidatorCount::put(4);
-
-				assert_eq!(winners.len(), 3);
-
-				assert_noop!(
-					submit_solution(
-						Origin::signed(10),
-						winners,
-						compact,
-						score,
-					),
-					Error::<Test>::OffchainElectionBogusWinnerCount,
-				);
-			})
-	}
-
-	#[test]
-	fn invalid_election_solution_size() {
-		ExtBuilder::default()
-			.offchain_election_ext()
-			.build()
-			.execute_with(|| {
-				run_to_block(12);
-
-				let (compact, winners, score) = prepare_submission_with(true, true, 2, |_| {});
-
-				assert_noop!(
-					Staking::submit_election_solution(
-						Origin::signed(10),
-						winners,
-						compact,
-						score,
-						current_era(),
-						ElectionSize::default(),
-					),
-					Error::<Test>::OffchainElectionBogusElectionSize,
-				);
-			})
-	}
-
-	#[test]
-	fn invalid_election_correct_number_of_winners_1() {
-		// if we have too little validators, then the number of candidates is the bound.
-		ExtBuilder::default()
-			.offchain_election_ext()
-			.validator_count(8) // we simply cannot elect 8
-			.has_stakers(false)
-			.build()
-			.execute_with(|| {
-				build_offchain_election_test_ext();
-				run_to_block(12);
-
-				ValidatorCount::put(3);
-				let (compact, winners, score) = prepare_submission_with(true, true, 2, |_| {});
-				ValidatorCount::put(4);
-
-				assert_eq!(winners.len(), 3);
-
-				assert_noop!(
-					submit_solution(
-						Origin::signed(10),
-						winners,
-						compact,
-						score,
-					),
-					Error::<Test>::OffchainElectionBogusWinnerCount,
-				);
-			})
-	}
-
-	#[test]
-	fn invalid_election_correct_number_of_winners_2() {
-		// if we have too little validators, then the number of candidates is the bound.
-		ExtBuilder::default()
-			.offchain_election_ext()
-			.validator_count(8) // we simply cannot elect 8
-			.has_stakers(false)
-			.build()
-			.execute_with(|| {
-				build_offchain_election_test_ext();
-				run_to_block(12);
-
-				let (compact, winners, score) = prepare_submission_with(true, true, 2, |_| {});
-
-				assert_eq!(winners.len(), 4);
-
-				// all good. We chose 4 and it works.
-				assert_ok!(submit_solution(
-					Origin::signed(10),
-					winners,
-					compact,
-					score,
-				),);
-			})
-	}
-
-	#[test]
-	fn invalid_election_out_of_bound_nominator_index() {
-		// A nominator index which is simply invalid
-		ExtBuilder::default()
-			.offchain_election_ext()
-			.validator_count(4)
-			.has_stakers(false)
-			.build()
-			.execute_with(|| {
-				build_offchain_election_test_ext();
-				run_to_block(12);
-
-				assert_eq!(Staking::snapshot_nominators().unwrap().len(), 5 + 4);
-				assert_eq!(Staking::snapshot_validators().unwrap().len(), 4);
-				let (mut compact, winners, score) = prepare_submission_with(true, true, 2, |_| {});
-
-				// index 9 doesn't exist.
-				compact.votes1.push((9, 2));
-
-				// The error type sadly cannot be more specific now.
-				assert_noop!(
-					submit_solution(
-						Origin::signed(10),
-						winners,
-						compact,
-						score,
-					),
-					Error::<Test>::OffchainElectionBogusCompact,
-				);
-			})
-	}
-
-	#[test]
-	fn invalid_election_out_of_bound_validator_index() {
-		// A validator index which is out of bound
-		ExtBuilder::default()
-			.offchain_election_ext()
-			.validator_count(2)
-			.has_stakers(false)
-			.build()
-			.execute_with(|| {
-				build_offchain_election_test_ext();
-				run_to_block(12);
-
-				assert_eq!(Staking::snapshot_nominators().unwrap().len(), 5 + 4);
-				assert_eq!(Staking::snapshot_validators().unwrap().len(), 4);
-				let (mut compact, winners, score) = prepare_submission_with(true, true, 2, |_| {});
-
-				// index 4 doesn't exist.
-				compact.votes1.iter_mut().for_each(|(_, vidx)| if *vidx == 1 { *vidx = 4 });
-
-				// The error type sadly cannot be more specific now.
-				assert_noop!(
-					submit_solution(
-						Origin::signed(10),
-						winners,
-						compact,
-						score,
-					),
-					Error::<Test>::OffchainElectionBogusCompact,
-				);
-			})
-	}
-
-	#[test]
-	fn invalid_election_out_of_bound_winner_index() {
-		// A winner index which is simply invalid
-		ExtBuilder::default()
-			.offchain_election_ext()
-			.validator_count(4)
-			.has_stakers(false)
-			.build()
-			.execute_with(|| {
-				build_offchain_election_test_ext();
-				run_to_block(12);
-
-				assert_eq!(Staking::snapshot_nominators().unwrap().len(), 5 + 4);
-				assert_eq!(Staking::snapshot_validators().unwrap().len(), 4);
-				let (compact, _, score) = prepare_submission_with(true, true, 2, |_| {});
-
-				// index 4 doesn't exist.
-				let winners = vec![0, 1, 2, 4];
-
-				assert_noop!(
-					submit_solution(
-						Origin::signed(10),
-						winners,
-						compact,
-						score,
-					),
-					Error::<Test>::OffchainElectionBogusWinner,
-				);
-			})
-	}
-
-	#[test]
-	fn invalid_election_non_winner_validator_index() {
-		// An edge that points to a correct validator index who is NOT a winner. This is very
-		// similar to the test that raises `OffchainElectionBogusNomination`.
-		ExtBuilder::default()
-			.offchain_election_ext()
-			.validator_count(2) // we select only 2.
-			.has_stakers(false)
-			.build()
-			.execute_with(|| {
-				build_offchain_election_test_ext();
-				run_to_block(12);
-
-				assert_eq!(Staking::snapshot_nominators().unwrap().len(), 5 + 4);
-				assert_eq!(Staking::snapshot_validators().unwrap().len(), 4);
-				let (compact, winners, score) = prepare_submission_with(false, true, 2, |a| {
-					// swap all 11 and 41s in the distribution with non-winners. Note that it is
-					// important that the count of winners and the count of unique targets remain
-					// valid.
-					a.iter_mut().for_each(| StakedAssignment { who, distribution } |
-						distribution.iter_mut().for_each(|(t, _)| {
-							if *t == 41 { *t = 31 } else { *t = 21 }
-							// if it is self vote, correct that.
-							if *who == 41 { *who = 31 }
-							if *who == 11 { *who = 21 }
-						})
-					);
-				});
-
-				assert_noop!(
-					submit_solution(
-						Origin::signed(10),
-						winners,
-						compact,
-						score,
-					),
-					Error::<Test>::OffchainElectionBogusNomination,
-				);
-			})
-	}
-
-	#[test]
-	fn offchain_election_unique_target_count_is_checked() {
-		// Number of unique targets and and winners.len must match.
-		ExtBuilder::default()
-			.offchain_election_ext()
-			.validator_count(2) // we select only 2.
-			.has_stakers(false)
-			.build()
-			.execute_with(|| {
-				build_offchain_election_test_ext();
-				run_to_block(12);
-
-				assert_eq!(Staking::snapshot_nominators().unwrap().len(), 5 + 4);
-				assert_eq!(Staking::snapshot_validators().unwrap().len(), 4);
-
-				let (compact, winners, score) = prepare_submission_with(false, true, 2, |a| {
-					a.iter_mut()
-						.find(|x| x.who == 5)
-						// just add any new target.
-						.map(|x| {
-							// old value.
-							assert_eq!(x.distribution, vec![(41, 100)]);
-							// new value.
-							x.distribution = vec![(21, 50), (41, 50)]
-						});
-				});
-
-				assert_noop!(
-					submit_solution(
-						Origin::signed(10),
-						winners,
-						compact,
-						score,
-					),
-					Error::<Test>::OffchainElectionBogusWinnerCount,
-				);
-			})
-	}
-
-	#[test]
-	fn invalid_election_wrong_self_vote() {
-		// A self vote for someone else.
-		ExtBuilder::default()
-			.offchain_election_ext()
-			.validator_count(4)
-			.has_stakers(false)
-			.build()
-			.execute_with(|| {
-				build_offchain_election_test_ext();
-				run_to_block(12);
-
-				let (compact, winners, score) = prepare_submission_with(true, true, 2, |a| {
-					// mutate a self vote to target someone else. That someone else is still among the
-					// winners
-					a.iter_mut().find(|x| x.who == 11).map(|x| {
-						x.distribution
-							.iter_mut()
-							.find(|y| y.0 == 11)
-							.map(|y| y.0 = 21)
-					});
-				});
-
-				assert_noop!(
-					submit_solution(
-						Origin::signed(10),
-						winners,
-						compact,
-						score,
-					),
-					Error::<Test>::OffchainElectionBogusSelfVote,
-				);
-			})
-	}
-
-	#[test]
-	fn invalid_election_wrong_self_vote_2() {
-		// A self validator voting for someone else next to self vote.
-		ExtBuilder::default()
-			.offchain_election_ext()
-			.validator_count(4)
-			.has_stakers(false)
-			.build()
-			.execute_with(|| {
-				build_offchain_election_test_ext();
-				run_to_block(12);
-
-				let (compact, winners, score) = prepare_submission_with(true, true, 2, |a| {
-					// Remove the self vote.
-					a.retain(|x| x.who != 11);
-					// add is as a new double vote
-					a.push(StakedAssignment {
-						who: 11,
-						distribution: vec![(11, 50), (21, 50)],
-					});
-				});
-
-				// This raises score issue.
-				assert_noop!(
-					submit_solution(
-						Origin::signed(10),
-						winners,
-						compact,
-						score,
-					),
-					Error::<Test>::OffchainElectionBogusSelfVote,
-				);
-			})
-	}
-
-	#[test]
-	fn invalid_election_over_stake() {
-		// Someone's edge ratios sums to more than 100%.
-		ExtBuilder::default()
-			.offchain_election_ext()
-			.validator_count(4)
-			.has_stakers(false)
-			.build()
-			.execute_with(|| {
-				build_offchain_election_test_ext();
-				run_to_block(12);
-
-				// Note: we don't reduce here to be able to tweak votes3. votes3 will vanish if you
-				// reduce.
-				let (mut compact, winners, score) = prepare_submission_with(true, false, 0, |_| {});
-
-				if let Some(c) = compact.votes3.iter_mut().find(|x| x.0 == 0) {
-					// by default it should have been (0, [(2, 33%), (1, 33%)], 0)
-					// now the sum is above 100%
-					c.1 = [(2, percent(66)), (1, percent(66))];
-				}
-
-				assert_noop!(
-					submit_solution(
-						Origin::signed(10),
-						winners,
-						compact,
-						score,
-					),
-					Error::<Test>::OffchainElectionBogusCompact,
-				);
-			})
-	}
-
-	#[test]
-	fn invalid_election_under_stake() {
-		// at the time of this writing, we cannot under stake someone. The compact assignment works
-		// in a way that some of the stakes are presented by the submitter, and the last one is read
-		// from chain by subtracting the rest from total. Hence, the sum is always correct.
-		// This test is only here as a demonstration.
-	}
-
-	#[test]
-	fn invalid_election_invalid_target_stealing() {
-		// A valid voter who voted for someone who is a candidate, and is a correct winner, but is
-		// actually NOT nominated by this nominator.
-		ExtBuilder::default()
-			.offchain_election_ext()
-			.validator_count(4)
-			.has_stakers(false)
-			.build()
-			.execute_with(|| {
-				build_offchain_election_test_ext();
-				run_to_block(12);
-
-				let (compact, winners, score) = prepare_submission_with(true, false, 0, |a| {
-					// 3 only voted for 20 and 40. We add a fake vote to 30. The stake sum is still
-					// correctly 100.
-					a.iter_mut()
-						.find(|x| x.who == 3)
-						.map(|x| x.distribution = vec![(21, 50), (41, 30), (31, 20)]);
-				});
-
-				assert_noop!(
-					submit_solution(
-						Origin::signed(10),
-						winners,
-						compact,
-						score,
-					),
-					Error::<Test>::OffchainElectionBogusNomination,
-				);
-			})
-	}
-
-	#[test]
-	fn nomination_slash_filter_is_checked() {
-		// If a nominator has voted for someone who has been recently slashed, that particular
-		// nomination should be disabled for the upcoming election. A solution must respect this
-		// rule.
-		ExtBuilder::default()
-			.offchain_election_ext()
-			.validator_count(4)
-			.has_stakers(false)
-			.build()
-			.execute_with(|| {
-				build_offchain_election_test_ext();
-
-				// finalize the round with fallback. This is needed since all nominator submission
-				// are in era zero and we want this one to pass with no problems.
-				run_to_block(15);
-
-				// go to the next session to trigger mock::start_era and bump the active era
-				run_to_block(20);
-
-				// slash 10. This must happen outside of the election window.
-				let offender_expo = Staking::eras_stakers(Staking::active_era().unwrap().index, 11);
-				on_offence_now(
-					&[OffenceDetails {
-						offender: (11, offender_expo.clone()),
-						reporters: vec![],
-					}],
-					&[Perbill::from_percent(50)],
-				);
-
-				// validate 10 again for the next round. But this guy will not have the votes that
-				// it should have had from 1 and 2.
-				assert_ok!(Staking::validate(
-					Origin::signed(10),
-					Default::default()
-				));
-
-				// open the election window and create snapshots.
-				run_to_block(32);
-
-				// a solution that has been prepared after the slash.
-				let (compact, winners, score) = prepare_submission_with(true, false, 0, |a| {
-					// no one is allowed to vote for 10, except for itself.
-					a.into_iter()
-						.filter(|s| s.who != 11)
-						.for_each(|s|
-							assert!(s.distribution.iter().find(|(t, _)| *t == 11).is_none())
-						);
-				});
-
-				// can be submitted.
-				assert_ok!(submit_solution(
-					Origin::signed(10),
-					winners,
-					compact,
-					score,
-				));
-
-				// a wrong solution.
-				let (compact, winners, score) = prepare_submission_with(true, false, 0, |a| {
-					// add back the vote that has been filtered out.
-					a.push(StakedAssignment {
-						who: 1,
-						distribution: vec![(11, 100)]
-					});
-				});
-
-				// is rejected.
-				assert_noop!(
-					submit_solution(
-						Origin::signed(10),
-						winners,
-						compact,
-						score,
-					),
-					Error::<Test>::OffchainElectionSlashedNomination,
-				);
-			})
-	}
-
-	#[test]
-	fn invalid_election_wrong_score() {
-		// A valid voter who's total distributed stake is more than what they bond
-		ExtBuilder::default()
-			.offchain_election_ext()
-			.validator_count(4)
-			.has_stakers(false)
-			.build()
-			.execute_with(|| {
-				build_offchain_election_test_ext();
-				run_to_block(12);
-
-				let (compact, winners, mut score) = prepare_submission_with(true, true, 2, |_| {});
-				score[0] += 1;
-
-				assert_noop!(
-					submit_solution(
-						Origin::signed(10),
-						winners,
-						compact,
-						score,
-					),
-					Error::<Test>::OffchainElectionBogusScore,
-				);
-			})
-	}
-
-	#[test]
-	fn offchain_storage_is_set() {
-		let mut ext = ExtBuilder::default()
-			.offchain_election_ext()
-			.validator_count(4)
-			.build();
-		let state = offchainify(&mut ext, 0);
-
-		ext.execute_with(|| {
-			use offchain_election::OFFCHAIN_HEAD_DB;
-			use sp_runtime::offchain::storage::StorageValueRef;
-
-			run_to_block(12);
-
-			Staking::offchain_worker(12);
-			// it works
-			assert_eq!(state.read().transactions.len(), 1);
-
-			// and it is set
-			let storage = StorageValueRef::persistent(&OFFCHAIN_HEAD_DB);
-			assert_eq!(storage.get::<BlockNumber>().unwrap().unwrap(), 12);
-		})
-	}
-
-	#[test]
-	fn offchain_storage_prevents_duplicate() {
-		let mut ext = ExtBuilder::default()
-			.offchain_election_ext()
-			.validator_count(4)
-			.build();
-		let _ = offchainify(&mut ext, 0);
-
-		ext.execute_with(|| {
-			use offchain_election::OFFCHAIN_HEAD_DB;
-			use sp_runtime::offchain::storage::StorageValueRef;
-			let storage = StorageValueRef::persistent(&OFFCHAIN_HEAD_DB);
-
-			run_to_block(12);
-
-			// first run -- ok
-			assert_eq!(
-				offchain_election::set_check_offchain_execution_status::<Test>(12),
-				Ok(()),
-			);
-			assert_eq!(storage.get::<BlockNumber>().unwrap().unwrap(), 12);
-
-			// re-execute after the next. not allowed.
-			assert_eq!(
-				offchain_election::set_check_offchain_execution_status::<Test>(13),
-				Err("recently executed."),
-			);
-
-			// a fork like situation -- re-execute 10, 11, 12. But it won't go through.
-			assert_eq!(
-				offchain_election::set_check_offchain_execution_status::<Test>(10),
-				Err("fork."),
-			);
-			assert_eq!(
-				offchain_election::set_check_offchain_execution_status::<Test>(11),
-				Err("fork."),
-			);
-			assert_eq!(
-				offchain_election::set_check_offchain_execution_status::<Test>(12),
-				Err("recently executed."),
-			);
-		})
-	}
-
-	#[test]
-	#[should_panic]
-	fn offence_is_blocked_when_window_open() {
-		ExtBuilder::default()
-			.offchain_election_ext()
-			.validator_count(4)
-			.has_stakers(false)
-			.build()
-			.execute_with(|| {
-				run_to_block(12);
-				assert_eq!(Staking::era_election_status(), ElectionStatus::Open(12));
-
-				let offender_expo = Staking::eras_stakers(Staking::active_era().unwrap().index, 10);
-
-				// panic from the impl in mock
-				on_offence_now(
-					&[OffenceDetails {
-						offender: (10, offender_expo.clone()),
-						reporters: vec![],
-					}],
-					&[Perbill::from_percent(10)],
-				);
-			})
-	}
-}
-
 #[test]
 fn slash_kicks_validators_not_nominators_and_disables_nominator_for_kicked_validator() {
 	ExtBuilder::default().build_and_execute(|| {
@@ -4704,39 +3413,6 @@ fn offences_weight_calculated_correctly() {
 	});
 }
 
-#[test]
-fn on_initialize_weight_is_correct() {
-	ExtBuilder::default().has_stakers(false).build_and_execute(|| {
-		assert_eq!(Validators::<Test>::iter().count(), 0);
-		assert_eq!(Nominators::<Test>::iter().count(), 0);
-		// When this pallet has nothing, we do 4 reads each block
-		let base_weight = <Test as frame_system::Config>::DbWeight::get().reads(4);
-		assert_eq!(base_weight, Staking::on_initialize(0));
-	});
-
-	ExtBuilder::default()
-	.offchain_election_ext()
-	.validator_count(4)
-	.has_stakers(false)
-	.build()
-	.execute_with(|| {
-		crate::tests::offchain_election::build_offchain_election_test_ext();
-		run_to_block(11);
-		Staking::on_finalize(System::block_number());
-		System::set_block_number((System::block_number() + 1).into());
-		Timestamp::set_timestamp(System::block_number() * 1000 + INIT_TIMESTAMP);
-		Session::on_initialize(System::block_number());
-
-		assert_eq!(Validators::<Test>::iter().count(), 4);
-		assert_eq!(Nominators::<Test>::iter().count(), 5);
-		// With 4 validators and 5 nominator, we should increase weight by:
-		// - (4 + 5) reads
-		// - 3 Writes
-		let final_weight = <Test as frame_system::Config>::DbWeight::get().reads_writes(4 + 9, 3);
-		assert_eq!(final_weight, Staking::on_initialize(System::block_number()));
-	});
-}
-
 #[test]
 fn payout_creates_controller() {
 	ExtBuilder::default().has_stakers(false).build_and_execute(|| {
@@ -5021,6 +3697,39 @@ mod election_data_provider {
 	use super::*;
 	use frame_election_provider_support::ElectionDataProvider;
 
+	#[test]
+	fn targets_2sec_block() {
+		let mut validators = 1000;
+		while <Test as Config>::WeightInfo::get_npos_targets(validators)
+			< 2 * frame_support::weights::constants::WEIGHT_PER_SECOND
+		{
+			validators += 1;
+		}
+
+		println!("Can create a snapshot of {} validators in 2sec block", validators);
+	}
+
+	#[test]
+	fn voters_2sec_block() {
+		// we assume a network only wants up to 1000 validators in most cases, thus having 2000
+		// candidates is as high as it gets.
+		let validators = 2000;
+		// we assume the worse case: each validator also has a slashing span.
+		let slashing_spans = validators;
+		let mut nominators = 1000;
+
+		while <Test as Config>::WeightInfo::get_npos_voters(validators, nominators, slashing_spans)
+			< 2 * frame_support::weights::constants::WEIGHT_PER_SECOND
+		{
+			nominators += 1;
+		}
+
+		println!(
+			"Can create a snapshot of {} nominators [{} validators, each 1 slashing] in 2sec block",
+			nominators, validators
+		);
+	}
+
 	#[test]
 	fn voters_include_self_vote() {
 		ExtBuilder::default().nominate(false).build().execute_with(|| {
@@ -5102,7 +3811,7 @@ mod election_data_provider {
 			assert_eq!(staking_events().len(), 1);
 			assert_eq!(
 				*staking_events().last().unwrap(),
-				RawEvent::StakingElection(ElectionCompute::OnChain)
+				RawEvent::StakingElection
 			);
 
 			for b in 21..45 {
@@ -5116,7 +3825,7 @@ mod election_data_provider {
 			assert_eq!(staking_events().len(), 3);
 			assert_eq!(
 				*staking_events().last().unwrap(),
-				RawEvent::StakingElection(ElectionCompute::OnChain)
+				RawEvent::StakingElection
 			);
 		})
 	}
diff --git a/frame/staking/src/weights.rs b/frame/staking/src/weights.rs
index e895a9e4d51e..520bef8c539b 100644
--- a/frame/staking/src/weights.rs
+++ b/frame/staking/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_staking
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-03-14, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-03-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -68,7 +68,6 @@ pub trait WeightInfo {
 	fn set_history_depth(e: u32, ) -> Weight;
 	fn reap_stash(s: u32, ) -> Weight;
 	fn new_era(v: u32, n: u32, ) -> Weight;
-	fn submit_solution_better(v: u32, n: u32, a: u32, w: u32, ) -> Weight;
 	fn get_npos_voters(v: u32, n: u32, s: u32, ) -> Weight;
 	fn get_npos_targets(v: u32, ) -> Weight;
 }
@@ -77,192 +76,178 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn bond() -> Weight {
-		(80_317_000 as Weight)
+		(82_121_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn bond_extra() -> Weight {
-		(64_495_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(61_899_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn unbond() -> Weight {
-		(59_679_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(56_392_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn withdraw_unbonded_update(s: u32, ) -> Weight {
-		(61_078_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((40_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(57_382_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((70_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
-		(95_129_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((2_755_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(T::DbWeight::get().reads(7 as Weight))
+		(92_185_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((2_844_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(8 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn validate() -> Weight {
-		(20_608_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+		(16_892_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn kick(k: u32, ) -> Weight {
-		(33_365_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((18_830_000 as Weight).saturating_mul(k as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+		(27_411_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((19_272_000 as Weight).saturating_mul(k as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(k as Weight)))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn nominate(n: u32, ) -> Weight {
-		(33_885_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((5_562_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(30_188_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((5_666_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn chill() -> Weight {
-		(19_741_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+		(15_870_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn set_payee() -> Weight {
-		(13_674_000 as Weight)
+		(13_853_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_controller() -> Weight {
-		(29_691_000 as Weight)
+		(30_291_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn set_validator_count() -> Weight {
-		(2_375_000 as Weight)
+		(2_397_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_no_eras() -> Weight {
-		(2_601_000 as Weight)
+		(2_627_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_new_era() -> Weight {
-		(2_605_000 as Weight)
+		(2_679_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_new_era_always() -> Weight {
-		(2_584_000 as Weight)
+		(2_643_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_invulnerables(v: u32, ) -> Weight {
-		(2_725_000 as Weight)
+		(2_871_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((35_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_unstake(s: u32, ) -> Weight {
-		(63_551_000 as Weight)
-			// Standard Error: 7_000
-			.saturating_add((2_844_000 as Weight).saturating_mul(s as Weight))
+		(65_876_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((2_832_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(8 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn cancel_deferred_slash(s: u32, ) -> Weight {
-		(5_905_400_000 as Weight)
+		(5_896_640_000 as Weight)
 			// Standard Error: 391_000
-			.saturating_add((34_785_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((34_808_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn payout_stakers_dead_controller(n: u32, ) -> Weight {
-		(142_264_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((52_542_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(11 as Weight))
+		(137_975_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((54_061_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(10 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(n as Weight)))
 	}
 	fn payout_stakers_alive_staked(n: u32, ) -> Weight {
-		(180_166_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((66_767_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(12 as Weight))
+		(163_885_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((68_096_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(11 as Weight))
 			.saturating_add(T::DbWeight::get().reads((5 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(n as Weight)))
 	}
 	fn rebond(l: u32, ) -> Weight {
-		(42_577_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((60_000 as Weight).saturating_mul(l as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(37_847_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((89_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn set_history_depth(e: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 68_000
-			.saturating_add((33_362_000 as Weight).saturating_mul(e as Weight))
+			// Standard Error: 69_000
+			.saturating_add((34_413_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes((7 as Weight).saturating_mul(e as Weight)))
 	}
 	fn reap_stash(s: u32, ) -> Weight {
-		(68_474_000 as Weight)
+		(69_257_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((2_770_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((2_819_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(8 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn new_era(v: u32, n: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 903_000
-			.saturating_add((594_145_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 45_000
-			.saturating_add((83_373_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(9 as Weight))
-			.saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(v as Weight)))
+			// Standard Error: 1_013_000
+			.saturating_add((382_529_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 50_000
+			.saturating_add((63_170_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(10 as Weight))
+			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
-			.saturating_add(T::DbWeight::get().writes(13 as Weight))
+			.saturating_add(T::DbWeight::get().writes(9 as Weight))
 			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(v as Weight)))
 	}
-	fn submit_solution_better(v: u32, n: u32, a: u32, w: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 52_000
-			.saturating_add((1_460_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 20_000
-			.saturating_add((754_000 as Weight).saturating_mul(n as Weight))
-			// Standard Error: 52_000
-			.saturating_add((74_798_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 108_000
-			.saturating_add((8_108_000 as Weight).saturating_mul(w as Weight))
-			.saturating_add(T::DbWeight::get().reads(6 as Weight))
-			.saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(a as Weight)))
-			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(w as Weight)))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-	}
 	fn get_npos_voters(v: u32, n: u32, s: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 94_000
-			.saturating_add((29_321_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 94_000
-			.saturating_add((66_885_000 as Weight).saturating_mul(n as Weight))
-			// Standard Error: 1_283_000
-			.saturating_add((22_991_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(v as Weight)))
+			// Standard Error: 90_000
+			.saturating_add((27_108_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 90_000
+			.saturating_add((29_962_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 1_228_000
+			.saturating_add((26_080_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
+			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn get_npos_targets(v: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((10_972_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 32_000
+			.saturating_add((11_220_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(v as Weight)))
 	}
@@ -271,192 +256,178 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn bond() -> Weight {
-		(80_317_000 as Weight)
+		(82_121_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn bond_extra() -> Weight {
-		(64_495_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(61_899_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn unbond() -> Weight {
-		(59_679_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(56_392_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn withdraw_unbonded_update(s: u32, ) -> Weight {
-		(61_078_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((40_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(57_382_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((70_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
-		(95_129_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((2_755_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
+		(92_185_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((2_844_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn validate() -> Weight {
-		(20_608_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+		(16_892_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn kick(k: u32, ) -> Weight {
-		(33_365_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((18_830_000 as Weight).saturating_mul(k as Weight))
-			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+		(27_411_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((19_272_000 as Weight).saturating_mul(k as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(k as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn nominate(n: u32, ) -> Weight {
-		(33_885_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((5_562_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(30_188_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((5_666_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn chill() -> Weight {
-		(19_741_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+		(15_870_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn set_payee() -> Weight {
-		(13_674_000 as Weight)
+		(13_853_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_controller() -> Weight {
-		(29_691_000 as Weight)
+		(30_291_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn set_validator_count() -> Weight {
-		(2_375_000 as Weight)
+		(2_397_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_no_eras() -> Weight {
-		(2_601_000 as Weight)
+		(2_627_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_new_era() -> Weight {
-		(2_605_000 as Weight)
+		(2_679_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_new_era_always() -> Weight {
-		(2_584_000 as Weight)
+		(2_643_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_invulnerables(v: u32, ) -> Weight {
-		(2_725_000 as Weight)
+		(2_871_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((35_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_unstake(s: u32, ) -> Weight {
-		(63_551_000 as Weight)
-			// Standard Error: 7_000
-			.saturating_add((2_844_000 as Weight).saturating_mul(s as Weight))
+		(65_876_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((2_832_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn cancel_deferred_slash(s: u32, ) -> Weight {
-		(5_905_400_000 as Weight)
+		(5_896_640_000 as Weight)
 			// Standard Error: 391_000
-			.saturating_add((34_785_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((34_808_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn payout_stakers_dead_controller(n: u32, ) -> Weight {
-		(142_264_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((52_542_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(11 as Weight))
+		(137_975_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((54_061_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(n as Weight)))
 	}
 	fn payout_stakers_alive_staked(n: u32, ) -> Weight {
-		(180_166_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((66_767_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(12 as Weight))
+		(163_885_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((68_096_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(11 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((5 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(n as Weight)))
 	}
 	fn rebond(l: u32, ) -> Weight {
-		(42_577_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((60_000 as Weight).saturating_mul(l as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(37_847_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((89_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn set_history_depth(e: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 68_000
-			.saturating_add((33_362_000 as Weight).saturating_mul(e as Weight))
+			// Standard Error: 69_000
+			.saturating_add((34_413_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((7 as Weight).saturating_mul(e as Weight)))
 	}
 	fn reap_stash(s: u32, ) -> Weight {
-		(68_474_000 as Weight)
+		(69_257_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((2_770_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((2_819_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn new_era(v: u32, n: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 903_000
-			.saturating_add((594_145_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 45_000
-			.saturating_add((83_373_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(9 as Weight))
-			.saturating_add(RocksDbWeight::get().reads((4 as Weight).saturating_mul(v as Weight)))
+			// Standard Error: 1_013_000
+			.saturating_add((382_529_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 50_000
+			.saturating_add((63_170_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
-			.saturating_add(RocksDbWeight::get().writes(13 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(9 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(v as Weight)))
 	}
-	fn submit_solution_better(v: u32, n: u32, a: u32, w: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 52_000
-			.saturating_add((1_460_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 20_000
-			.saturating_add((754_000 as Weight).saturating_mul(n as Weight))
-			// Standard Error: 52_000
-			.saturating_add((74_798_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 108_000
-			.saturating_add((8_108_000 as Weight).saturating_mul(w as Weight))
-			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
-			.saturating_add(RocksDbWeight::get().reads((4 as Weight).saturating_mul(a as Weight)))
-			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(w as Weight)))
-			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-	}
 	fn get_npos_voters(v: u32, n: u32, s: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 94_000
-			.saturating_add((29_321_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 94_000
-			.saturating_add((66_885_000 as Weight).saturating_mul(n as Weight))
-			// Standard Error: 1_283_000
-			.saturating_add((22_991_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
-			.saturating_add(RocksDbWeight::get().reads((4 as Weight).saturating_mul(v as Weight)))
+			// Standard Error: 90_000
+			.saturating_add((27_108_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 90_000
+			.saturating_add((29_962_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 1_228_000
+			.saturating_add((26_080_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
+			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn get_npos_targets(v: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((10_972_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 32_000
+			.saturating_add((11_220_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(v as Weight)))
 	}

From c731027de861b86166957fc2793bc2a50d86c19a Mon Sep 17 00:00:00 2001
From: Shaun Wang <spxwang@gmail.com>
Date: Sun, 21 Mar 2021 13:50:53 +1300
Subject: [PATCH 0531/1194] Implement PartialEq for DispatchError. (#8407)

---
 primitives/runtime/src/lib.rs | 55 ++++++++++++++++++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

diff --git a/primitives/runtime/src/lib.rs b/primitives/runtime/src/lib.rs
index 4508f84eefc3..4fb7d9c7737f 100644
--- a/primitives/runtime/src/lib.rs
+++ b/primitives/runtime/src/lib.rs
@@ -450,7 +450,7 @@ pub type DispatchResult = sp_std::result::Result<(), DispatchError>;
 pub type DispatchResultWithInfo<T> = sp_std::result::Result<T, DispatchErrorWithPostInfo<T>>;
 
 /// Reason why a dispatch call failed.
-#[derive(Eq, PartialEq, Clone, Copy, Encode, Decode, RuntimeDebug)]
+#[derive(Eq, Clone, Copy, Encode, Decode, RuntimeDebug)]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 pub enum DispatchError {
 	/// Some error occurred.
@@ -589,6 +589,27 @@ impl<T> traits::Printable for DispatchErrorWithPostInfo<T> where
 	}
 }
 
+impl PartialEq for DispatchError {
+	fn eq(&self, other: &Self) -> bool {
+		use DispatchError::*;
+
+		match (self, other) {
+			(CannotLookup, CannotLookup) |
+			(BadOrigin, BadOrigin) |
+			(ConsumerRemaining, ConsumerRemaining) |
+			(NoProviders, NoProviders) => true,
+
+			(Other(l), Other(r)) => l == r,
+			(
+				Module { index: index_l, error: error_l, .. },
+				Module { index: index_r, error: error_r, .. },
+			) => (index_l == index_r) && (error_l == error_r),
+
+			_ => false,
+		}
+	}
+}
+
 /// This type specifies the outcome of dispatching a call to a module.
 ///
 /// In case of failure an error specific to the module is returned.
@@ -826,6 +847,38 @@ mod tests {
 		);
 	}
 
+	#[test]
+	fn dispatch_error_equality() {
+		use DispatchError::*;
+
+		let variants = vec![
+			Other("foo"),
+			Other("bar"),
+			CannotLookup,
+			BadOrigin,
+			Module { index: 1, error: 1, message: None },
+			Module { index: 1, error: 2, message: None },
+			Module { index: 2, error: 1, message: None },
+			ConsumerRemaining,
+			NoProviders,
+		];
+		for (i, variant) in variants.iter().enumerate() {
+			for (j, other_variant) in variants.iter().enumerate() {
+				if i == j {
+					assert_eq!(variant, other_variant);
+				} else {
+					assert_ne!(variant, other_variant);
+				}
+			}
+		}
+
+		// Ignores `message` field in `Module` variant.
+		assert_eq!(
+			Module { index: 1, error: 1, message: Some("foo") },
+			Module { index: 1, error: 1, message: None},
+		);
+	}
+
 	#[test]
 	fn multi_signature_ecdsa_verify_works() {
 		let msg = &b"test-message"[..];

From f6e265d5d4973c8dd7e9824b13211219972edad7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Sun, 21 Mar 2021 14:49:44 +0100
Subject: [PATCH 0532/1194] Use the log crate to output contract generated
 messages. (#8403)

---
 frame/contracts/README.md           | 15 +++++++++++++++
 frame/contracts/src/wasm/runtime.rs |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/frame/contracts/README.md b/frame/contracts/README.md
index 1cb384e14c5a..6c987165990b 100644
--- a/frame/contracts/README.md
+++ b/frame/contracts/README.md
@@ -57,4 +57,19 @@ will make things a lot easier. One such language is [`ink`](https://github.com/p
 which is an [`eDSL`](https://wiki.haskell.org/Embedded_domain_specific_language) that enables
 writing WebAssembly based smart contracts in the Rust programming language.
 
+## Debugging
+
+Contracts can emit messages to the node console when run on a development chain through the
+`seal_println` API. This is exposed in ink! via
+[`ink_env::debug_println()`](https://docs.rs/ink_env/latest/ink_env/fn.debug_println.html).
+
+In order to see these messages the log level for the `runtime::contracts` target needs to be raised
+to at least the `info` level which is the default. However, those messages are easy to overlook
+because of the noise generated by block production. A good starting point for contract debugging
+could be:
+
+```bash
+cargo run --release -- --dev --tmp -lerror,runtime::contracts
+```
+
 License: Apache-2.0
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index 2ceac1c51604..8e3c2244f1ef 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -1366,7 +1366,7 @@ define_env!(Env, <E: Ext>,
 	seal_println(ctx, str_ptr: u32, str_len: u32) => {
 		let data = ctx.read_sandbox_memory(str_ptr, str_len)?;
 		if let Ok(utf8) = core::str::from_utf8(&data) {
-			sp_runtime::print(utf8);
+			log::info!(target: "runtime::contracts", "seal_println: {}", utf8);
 		}
 		Ok(())
 	},

From 6e42b4b97417fcf8d62e9db01c5519213c80cc52 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Mon, 22 Mar 2021 11:32:47 +0100
Subject: [PATCH 0533/1194] Rename GenericProto to Notifications (#8415)

* Rename GenericProto to Notifications

* Small comment fix
---
 client/network/src/protocol.rs                | 20 +++++-----
 .../{generic_proto.rs => notifications.rs}    |  9 ++---
 .../behaviour.rs                              | 40 +++++++++----------
 .../handler.rs                                |  2 +-
 .../{generic_proto => notifications}/tests.rs | 24 +++++------
 .../upgrade.rs                                |  0
 .../upgrade/collec.rs                         |  0
 .../upgrade/notifications.rs                  |  0
 8 files changed, 46 insertions(+), 49 deletions(-)
 rename client/network/src/protocol/{generic_proto.rs => notifications.rs} (71%)
 rename client/network/src/protocol/{generic_proto => notifications}/behaviour.rs (98%)
 rename client/network/src/protocol/{generic_proto => notifications}/handler.rs (99%)
 rename client/network/src/protocol/{generic_proto => notifications}/tests.rs (92%)
 rename client/network/src/protocol/{generic_proto => notifications}/upgrade.rs (100%)
 rename client/network/src/protocol/{generic_proto => notifications}/upgrade/collec.rs (100%)
 rename client/network/src/protocol/{generic_proto => notifications}/upgrade/notifications.rs (100%)

diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index 11e119799835..b86b1a97458b 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -27,7 +27,7 @@ use crate::{
 use bytes::Bytes;
 use codec::{Decode, DecodeAll, Encode};
 use futures::{channel::oneshot, prelude::*};
-use generic_proto::{GenericProto, GenericProtoOut};
+use notifications::{Notifications, NotificationsOut};
 use libp2p::core::{ConnectedPoint, connection::{ConnectionId, ListenerId}};
 use libp2p::request_response::OutboundFailure;
 use libp2p::swarm::{NetworkBehaviour, NetworkBehaviourAction, PollParameters};
@@ -56,13 +56,13 @@ use std::collections::{HashMap, HashSet, VecDeque};
 use std::sync::Arc;
 use std::{io, iter, num::NonZeroUsize, pin::Pin, task::Poll, time};
 
-mod generic_proto;
+mod notifications;
 
 pub mod message;
 pub mod event;
 pub mod sync;
 
-pub use generic_proto::{NotificationsSink, Ready, NotifsHandlerError};
+pub use notifications::{NotificationsSink, Ready, NotifsHandlerError};
 
 /// Interval at which we perform time based maintenance
 const TICK_TIMEOUT: time::Duration = time::Duration::from_millis(1100);
@@ -161,7 +161,7 @@ pub struct Protocol<B: BlockT> {
 	/// Used to report reputation changes.
 	peerset_handle: sc_peerset::PeersetHandle,
 	/// Handles opening the unique substream and sending and receiving raw messages.
-	behaviour: GenericProto,
+	behaviour: Notifications,
 	/// List of notifications protocols that have been registered.
 	notification_protocols: Vec<Cow<'static, str>>,
 	/// If we receive a new "substream open" event that contains an invalid handshake, we ask the
@@ -362,7 +362,7 @@ impl<B: BlockT> Protocol<B> {
 				genesis_hash,
 			).encode();
 
-			GenericProto::new(
+			Notifications::new(
 				peerset,
 				iter::once((block_announces_protocol, block_announces_handshake, MAX_BLOCK_ANNOUNCE_SIZE))
 					.chain(network_config.extra_sets.iter()
@@ -1169,7 +1169,7 @@ pub enum CustomMessageOutcome<B: BlockT> {
 }
 
 impl<B: BlockT> NetworkBehaviour for Protocol<B> {
-	type ProtocolsHandler = <GenericProto as NetworkBehaviour>::ProtocolsHandler;
+	type ProtocolsHandler = <Notifications as NetworkBehaviour>::ProtocolsHandler;
 	type OutEvent = CustomMessageOutcome<B>;
 
 	fn new_handler(&mut self) -> Self::ProtocolsHandler {
@@ -1332,7 +1332,7 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 		};
 
 		let outcome = match event {
-			GenericProtoOut::CustomProtocolOpen { peer_id, set_id, received_handshake, notifications_sink, .. } => {
+			NotificationsOut::CustomProtocolOpen { peer_id, set_id, received_handshake, notifications_sink, .. } => {
 				// Set number 0 is hardcoded the default set of peers we sync from.
 				if set_id == HARDCODED_PEERSETS_SYNC {
 					// `received_handshake` can be either a `Status` message if received from the
@@ -1419,7 +1419,7 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 					}
 				}
 			}
-			GenericProtoOut::CustomProtocolReplaced { peer_id, notifications_sink, set_id } => {
+			NotificationsOut::CustomProtocolReplaced { peer_id, notifications_sink, set_id } => {
 				if set_id == HARDCODED_PEERSETS_SYNC {
 					CustomMessageOutcome::None
 				} else if self.bad_handshake_substreams.contains(&(peer_id.clone(), set_id)) {
@@ -1432,7 +1432,7 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 					}
 				}
 			},
-			GenericProtoOut::CustomProtocolClosed { peer_id, set_id } => {
+			NotificationsOut::CustomProtocolClosed { peer_id, set_id } => {
 				// Set number 0 is hardcoded the default set of peers we sync from.
 				if set_id == HARDCODED_PEERSETS_SYNC {
 					if self.on_sync_peer_disconnected(peer_id.clone()).is_ok() {
@@ -1457,7 +1457,7 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 					}
 				}
 			},
-			GenericProtoOut::Notification { peer_id, set_id, message } =>
+			NotificationsOut::Notification { peer_id, set_id, message } =>
 				match set_id {
 					HARDCODED_PEERSETS_SYNC if self.peers.contains_key(&peer_id) => {
 						if let Ok(announce) = message::BlockAnnounce::decode(&mut message.as_ref()) {
diff --git a/client/network/src/protocol/generic_proto.rs b/client/network/src/protocol/notifications.rs
similarity index 71%
rename from client/network/src/protocol/generic_proto.rs
rename to client/network/src/protocol/notifications.rs
index a305fc1f5ea5..ef25795758b8 100644
--- a/client/network/src/protocol/generic_proto.rs
+++ b/client/network/src/protocol/notifications.rs
@@ -16,13 +16,10 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-//! Implementation of libp2p's `NetworkBehaviour` trait that opens a single substream with the
-//! remote and then allows any communication with them.
-//!
-//! The `Protocol` struct uses `GenericProto` in order to open substreams with the rest of the
-//! network, then performs the Substrate protocol handling on top.
+//! Implementation of libp2p's `NetworkBehaviour` trait that establishes communications and opens
+//! notifications substreams.
 
-pub use self::behaviour::{GenericProto, GenericProtoOut};
+pub use self::behaviour::{Notifications, NotificationsOut};
 pub use self::handler::{NotifsHandlerError, NotificationsSink, Ready};
 
 mod behaviour;
diff --git a/client/network/src/protocol/generic_proto/behaviour.rs b/client/network/src/protocol/notifications/behaviour.rs
similarity index 98%
rename from client/network/src/protocol/generic_proto/behaviour.rs
rename to client/network/src/protocol/notifications/behaviour.rs
index 05247dc6f0e6..08c4ec5d4f7b 100644
--- a/client/network/src/protocol/generic_proto/behaviour.rs
+++ b/client/network/src/protocol/notifications/behaviour.rs
@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::protocol::generic_proto::{
+use crate::protocol::notifications::{
 	handler::{NotificationsSink, NotifsHandlerProto, NotifsHandlerOut, NotifsHandlerIn}
 };
 
@@ -44,7 +44,7 @@ use wasm_timer::Instant;
 ///
 /// # How it works
 ///
-/// The role of the `GenericProto` is to synchronize the following components:
+/// The role of the `Notifications` is to synchronize the following components:
 ///
 /// - The libp2p swarm that opens new connections and reports disconnects.
 /// - The connection handler (see `group.rs`) that handles individual connections.
@@ -83,9 +83,9 @@ use wasm_timer::Instant;
 ///      different than a single connection failing and being re-established
 ///      in terms of potential reordering and dropped messages. Messages can
 ///      be received on any connection.
-///   3. The behaviour reports `GenericProtoOut::CustomProtocolOpen` when the
+///   3. The behaviour reports `NotificationsOut::CustomProtocolOpen` when the
 ///      first connection reports `NotifsHandlerOut::OpenResultOk`.
-///   4. The behaviour reports `GenericProtoOut::CustomProtocolClosed` when the
+///   4. The behaviour reports `NotificationsOut::CustomProtocolClosed` when the
 ///      last connection reports `NotifsHandlerOut::ClosedResult`.
 ///
 /// In this way, the number of actual established connections to the peer is
@@ -94,7 +94,7 @@ use wasm_timer::Instant;
 /// and only as a result of simultaneous dialing. However, the implementation
 /// accommodates for any number of connections.
 ///
-pub struct GenericProto {
+pub struct Notifications {
 	/// Notification protocols. Entries are only ever added and not removed.
 	/// Contains, for each protocol, the protocol name and the message to send as part of the
 	/// initial handshake.
@@ -127,7 +127,7 @@ pub struct GenericProto {
 	next_incoming_index: sc_peerset::IncomingIndex,
 
 	/// Events to produce from `poll()`.
-	events: VecDeque<NetworkBehaviourAction<NotifsHandlerIn, GenericProtoOut>>,
+	events: VecDeque<NetworkBehaviourAction<NotifsHandlerIn, NotificationsOut>>,
 }
 
 /// Identifier for a delay firing.
@@ -302,9 +302,9 @@ struct IncomingPeer {
 	incoming_id: sc_peerset::IncomingIndex,
 }
 
-/// Event that can be emitted by the `GenericProto`.
+/// Event that can be emitted by the `Notifications`.
 #[derive(Debug)]
-pub enum GenericProtoOut {
+pub enum NotificationsOut {
 	/// Opened a custom protocol with the remote.
 	CustomProtocolOpen {
 		/// Id of the peer we are connected to.
@@ -354,7 +354,7 @@ pub enum GenericProtoOut {
 	},
 }
 
-impl GenericProto {
+impl Notifications {
 	/// Creates a `CustomProtos`.
 	pub fn new(
 		peerset: sc_peerset::Peerset,
@@ -366,7 +366,7 @@ impl GenericProto {
 
 		assert!(!notif_protocols.is_empty());
 
-		GenericProto {
+		Notifications {
 			notif_protocols,
 			peerset,
 			peers: FnvHashMap::default(),
@@ -462,7 +462,7 @@ impl GenericProto {
 
 				if connections.iter().any(|(_, s)| matches!(s, ConnectionState::Open(_))) {
 					debug!(target: "sub-libp2p", "External API <= Closed({}, {:?})", peer_id, set_id);
-					let event = GenericProtoOut::CustomProtocolClosed {
+					let event = NotificationsOut::CustomProtocolClosed {
 						peer_id: peer_id.clone(),
 						set_id,
 					};
@@ -828,7 +828,7 @@ impl GenericProto {
 
 				if connections.iter().any(|(_, s)| matches!(s, ConnectionState::Open(_))) {
 					debug!(target: "sub-libp2p", "External API <= Closed({}, {:?})", entry.key().0, set_id);
-					let event = GenericProtoOut::CustomProtocolClosed {
+					let event = NotificationsOut::CustomProtocolClosed {
 						peer_id: entry.key().0.clone(),
 						set_id,
 					};
@@ -1013,9 +1013,9 @@ impl GenericProto {
 	}
 }
 
-impl NetworkBehaviour for GenericProto {
+impl NetworkBehaviour for Notifications {
 	type ProtocolsHandler = NotifsHandlerProto;
-	type OutEvent = GenericProtoOut;
+	type OutEvent = NotificationsOut;
 
 	fn new_handler(&mut self) -> Self::ProtocolsHandler {
 		NotifsHandlerProto::new(self.notif_protocols.clone())
@@ -1265,7 +1265,7 @@ impl NetworkBehaviour for GenericProto {
 										"External API <= Sink replaced({}, {:?})",
 										peer_id, set_id
 									);
-									let event = GenericProtoOut::CustomProtocolReplaced {
+									let event = NotificationsOut::CustomProtocolReplaced {
 										peer_id: peer_id.clone(),
 										set_id,
 										notifications_sink: replacement_sink,
@@ -1277,7 +1277,7 @@ impl NetworkBehaviour for GenericProto {
 									target: "sub-libp2p", "External API <= Closed({}, {:?})",
 									peer_id, set_id
 								);
-								let event = GenericProtoOut::CustomProtocolClosed {
+								let event = NotificationsOut::CustomProtocolClosed {
 									peer_id: peer_id.clone(),
 									set_id,
 								};
@@ -1642,7 +1642,7 @@ impl NetworkBehaviour for GenericProto {
 						{
 							if pos <= replacement_pos {
 								debug!(target: "sub-libp2p", "External API <= Sink replaced({:?})", source);
-								let event = GenericProtoOut::CustomProtocolReplaced {
+								let event = NotificationsOut::CustomProtocolReplaced {
 									peer_id: source,
 									set_id,
 									notifications_sink: replacement_sink,
@@ -1665,7 +1665,7 @@ impl NetworkBehaviour for GenericProto {
 							}
 
 							debug!(target: "sub-libp2p", "External API <= Closed({}, {:?})", source, set_id);
-							let event = GenericProtoOut::CustomProtocolClosed {
+							let event = NotificationsOut::CustomProtocolClosed {
 								peer_id: source,
 								set_id,
 							};
@@ -1739,7 +1739,7 @@ impl NetworkBehaviour for GenericProto {
 						{
 							if !any_open {
 								debug!(target: "sub-libp2p", "External API <= Open({:?})", source);
-								let event = GenericProtoOut::CustomProtocolOpen {
+								let event = NotificationsOut::CustomProtocolOpen {
 									peer_id: source,
 									set_id,
 									received_handshake,
@@ -1876,7 +1876,7 @@ impl NetworkBehaviour for GenericProto {
 					);
 					trace!(target: "sub-libp2p", "External API <= Message({}, {:?})",
 						source, set_id);
-					let event = GenericProtoOut::Notification {
+					let event = NotificationsOut::Notification {
 						peer_id: source,
 						set_id,
 						message,
diff --git a/client/network/src/protocol/generic_proto/handler.rs b/client/network/src/protocol/notifications/handler.rs
similarity index 99%
rename from client/network/src/protocol/generic_proto/handler.rs
rename to client/network/src/protocol/notifications/handler.rs
index 0db249f90a8b..ec3760d52576 100644
--- a/client/network/src/protocol/generic_proto/handler.rs
+++ b/client/network/src/protocol/notifications/handler.rs
@@ -57,7 +57,7 @@
 //! It is illegal to send a [`NotifsHandlerIn::Open`] before a previously-emitted
 //! [`NotifsHandlerIn::Open`] has gotten an answer.
 
-use crate::protocol::generic_proto::{
+use crate::protocol::notifications::{
 	upgrade::{
 		NotificationsIn, NotificationsOut, NotificationsInSubstream, NotificationsOutSubstream,
 		NotificationsHandshakeError, UpgradeCollec
diff --git a/client/network/src/protocol/generic_proto/tests.rs b/client/network/src/protocol/notifications/tests.rs
similarity index 92%
rename from client/network/src/protocol/generic_proto/tests.rs
rename to client/network/src/protocol/notifications/tests.rs
index 2c80fe8523ac..f159a8e63178 100644
--- a/client/network/src/protocol/generic_proto/tests.rs
+++ b/client/network/src/protocol/notifications/tests.rs
@@ -18,7 +18,7 @@
 
 #![cfg(test)]
 
-use crate::protocol::generic_proto::{GenericProto, GenericProtoOut};
+use crate::protocol::notifications::{Notifications, NotificationsOut};
 
 use futures::prelude::*;
 use libp2p::{PeerId, Multiaddr, Transport};
@@ -80,7 +80,7 @@ fn build_nodes() -> (Swarm<CustomProtoWithAddr>, Swarm<CustomProtoWithAddr>) {
 		});
 
 		let behaviour = CustomProtoWithAddr {
-			inner: GenericProto::new(peerset, iter::once(("/foo".into(), Vec::new(), 1024 * 1024))),
+			inner: Notifications::new(peerset, iter::once(("/foo".into(), Vec::new(), 1024 * 1024))),
 			addrs: addrs
 				.iter()
 				.enumerate()
@@ -110,12 +110,12 @@ fn build_nodes() -> (Swarm<CustomProtoWithAddr>, Swarm<CustomProtoWithAddr>) {
 
 /// Wraps around the `CustomBehaviour` network behaviour, and adds hardcoded node addresses to it.
 struct CustomProtoWithAddr {
-	inner: GenericProto,
+	inner: Notifications,
 	addrs: Vec<(PeerId, Multiaddr)>,
 }
 
 impl std::ops::Deref for CustomProtoWithAddr {
-	type Target = GenericProto;
+	type Target = Notifications;
 
 	fn deref(&self) -> &Self::Target {
 		&self.inner
@@ -129,8 +129,8 @@ impl std::ops::DerefMut for CustomProtoWithAddr {
 }
 
 impl NetworkBehaviour for CustomProtoWithAddr {
-	type ProtocolsHandler = <GenericProto as NetworkBehaviour>::ProtocolsHandler;
-	type OutEvent = <GenericProto as NetworkBehaviour>::OutEvent;
+	type ProtocolsHandler = <Notifications as NetworkBehaviour>::ProtocolsHandler;
+	type OutEvent = <Notifications as NetworkBehaviour>::OutEvent;
 
 	fn new_handler(&mut self) -> Self::ProtocolsHandler {
 		self.inner.new_handler()
@@ -240,7 +240,7 @@ fn reconnect_after_disconnect() {
 			};
 
 			match event {
-				future::Either::Left(GenericProtoOut::CustomProtocolOpen { .. }) => {
+				future::Either::Left(NotificationsOut::CustomProtocolOpen { .. }) => {
 					match service1_state {
 						ServiceState::NotConnected => {
 							service1_state = ServiceState::FirstConnec;
@@ -255,14 +255,14 @@ fn reconnect_after_disconnect() {
 						ServiceState::FirstConnec | ServiceState::ConnectedAgain => panic!(),
 					}
 				},
-				future::Either::Left(GenericProtoOut::CustomProtocolClosed { .. }) => {
+				future::Either::Left(NotificationsOut::CustomProtocolClosed { .. }) => {
 					match service1_state {
 						ServiceState::FirstConnec => service1_state = ServiceState::Disconnected,
 						ServiceState::ConnectedAgain| ServiceState::NotConnected |
 						ServiceState::Disconnected => panic!(),
 					}
 				},
-				future::Either::Right(GenericProtoOut::CustomProtocolOpen { .. }) => {
+				future::Either::Right(NotificationsOut::CustomProtocolOpen { .. }) => {
 					match service2_state {
 						ServiceState::NotConnected => {
 							service2_state = ServiceState::FirstConnec;
@@ -277,7 +277,7 @@ fn reconnect_after_disconnect() {
 						ServiceState::FirstConnec | ServiceState::ConnectedAgain => panic!(),
 					}
 				},
-				future::Either::Right(GenericProtoOut::CustomProtocolClosed { .. }) => {
+				future::Either::Right(NotificationsOut::CustomProtocolClosed { .. }) => {
 					match service2_state {
 						ServiceState::FirstConnec => service2_state = ServiceState::Disconnected,
 						ServiceState::ConnectedAgain| ServiceState::NotConnected |
@@ -310,8 +310,8 @@ fn reconnect_after_disconnect() {
 			};
 
 			match event {
-				GenericProtoOut::CustomProtocolOpen { .. } |
-				GenericProtoOut::CustomProtocolClosed { .. } => panic!(),
+				NotificationsOut::CustomProtocolOpen { .. } |
+				NotificationsOut::CustomProtocolClosed { .. } => panic!(),
 				_ => {}
 			}
 		}
diff --git a/client/network/src/protocol/generic_proto/upgrade.rs b/client/network/src/protocol/notifications/upgrade.rs
similarity index 100%
rename from client/network/src/protocol/generic_proto/upgrade.rs
rename to client/network/src/protocol/notifications/upgrade.rs
diff --git a/client/network/src/protocol/generic_proto/upgrade/collec.rs b/client/network/src/protocol/notifications/upgrade/collec.rs
similarity index 100%
rename from client/network/src/protocol/generic_proto/upgrade/collec.rs
rename to client/network/src/protocol/notifications/upgrade/collec.rs
diff --git a/client/network/src/protocol/generic_proto/upgrade/notifications.rs b/client/network/src/protocol/notifications/upgrade/notifications.rs
similarity index 100%
rename from client/network/src/protocol/generic_proto/upgrade/notifications.rs
rename to client/network/src/protocol/notifications/upgrade/notifications.rs

From 97da79eb0656134a1cf51e60ad6af9378662ee63 Mon Sep 17 00:00:00 2001
From: Denis Pisarev <denis.pisarev@parity.io>
Date: Mon, 22 Mar 2021 12:02:20 +0100
Subject: [PATCH 0534/1194] CI: address the bug with .env (#8404)

---
 .gitlab-ci.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d29fb27ec411..9d3bd1faab4e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -519,6 +519,10 @@ build-rust-doc:
     - buildah info
     - buildah push --format=v2s2 "$IMAGE_NAME:$VERSION"
     - buildah push --format=v2s2 "$IMAGE_NAME:latest"
+    # pass artifacts to the trigget-simnet job
+    - echo "VERSION=${VERSION}" > artifacts/${PRODUCT}/build.env
+    - echo "TRIGGERER=${CI_PROJECT_NAME}" >> artifacts/${PRODUCT}/build.env
+  after_script:
     - buildah logout "$IMAGE_NAME"
 
 publish-docker-substrate:
@@ -530,8 +534,6 @@ publish-docker-substrate:
   variables:
     <<:                            *docker-build-vars
     PRODUCT:                       substrate
-  after_script:
-    - echo "VERSION=${VERSION}" >> build.env
   artifacts:
     reports:
       # this artifact is used in trigger-simnet job

From 3472a656d23a8bb0850a074b13deac2a91b2e6e3 Mon Sep 17 00:00:00 2001
From: Denis Pisarev <denis.pisarev@parity.io>
Date: Mon, 22 Mar 2021 14:57:58 +0100
Subject: [PATCH 0535/1194] CI: fix env file location (#8417)

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9d3bd1faab4e..5cf4749eac64 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -520,8 +520,8 @@ build-rust-doc:
     - buildah push --format=v2s2 "$IMAGE_NAME:$VERSION"
     - buildah push --format=v2s2 "$IMAGE_NAME:latest"
     # pass artifacts to the trigget-simnet job
-    - echo "VERSION=${VERSION}" > artifacts/${PRODUCT}/build.env
-    - echo "TRIGGERER=${CI_PROJECT_NAME}" >> artifacts/${PRODUCT}/build.env
+    - echo "VERSION=${VERSION}" > build.env
+    - echo "TRIGGERER=${CI_PROJECT_NAME}" >> build.env
   after_script:
     - buildah logout "$IMAGE_NAME"
 

From 83942f58fc859ef5790351691e1ef665d79f0ead Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Mon, 22 Mar 2021 17:51:57 +0100
Subject: [PATCH 0536/1194] Optimize the peerset a bit (#8416)

* Only allocate slots for the relevant peer set

* Do a pre-check before calling has_free_outgoing_slot

* Oops, fix infinite loop
---
 client/peerset/src/lib.rs        | 104 +++++++++++++++++--------------
 client/peerset/src/peersstate.rs |   9 ++-
 2 files changed, 64 insertions(+), 49 deletions(-)

diff --git a/client/peerset/src/lib.rs b/client/peerset/src/lib.rs
index 31162930efc6..153e097dc8b4 100644
--- a/client/peerset/src/lib.rs
+++ b/client/peerset/src/lib.rs
@@ -296,7 +296,10 @@ impl Peerset {
 			}
 		}
 
-		peerset.alloc_slots();
+		for set_index in 0..peerset.data.num_sets() {
+			peerset.alloc_slots(SetId(set_index));
+		}
+
 		(peerset, handle)
 	}
 
@@ -307,7 +310,7 @@ impl Peerset {
 		}
 
 		self.data.add_no_slot_node(set_id.0, peer_id);
-		self.alloc_slots();
+		self.alloc_slots(set_id);
 	}
 
 	fn on_remove_reserved_peer(&mut self, set_id: SetId, peer_id: PeerId) {
@@ -372,7 +375,7 @@ impl Peerset {
 			}
 
 		} else {
-			self.alloc_slots();
+			self.alloc_slots(set_id);
 		}
 	}
 
@@ -383,7 +386,7 @@ impl Peerset {
 	pub fn add_to_peers_set(&mut self, set_id: SetId, peer_id: PeerId) {
 		if let peersstate::Peer::Unknown(entry) = self.data.peer(set_id.0, &peer_id) {
 			entry.discover();
-			self.alloc_slots();
+			self.alloc_slots(set_id);
 		}
 	}
 
@@ -500,59 +503,68 @@ impl Peerset {
 		}
 	}
 
-	/// Try to fill available out slots with nodes.
-	fn alloc_slots(&mut self) {
+	/// Try to fill available out slots with nodes for the given set.
+	fn alloc_slots(&mut self, set_id: SetId) {
 		self.update_time();
 
 		// Try to connect to all the reserved nodes that we are not connected to.
-		for set_index in 0..self.data.num_sets() {
-			for reserved_node in &self.reserved_nodes[set_index].0 {
-				let entry = match self.data.peer(set_index, reserved_node) {
-					peersstate::Peer::Unknown(n) => n.discover(),
-					peersstate::Peer::NotConnected(n) => n,
-					peersstate::Peer::Connected(_) => continue,
-				};
-
-				match entry.try_outgoing() {
-					Ok(conn) => self.message_queue.push_back(Message::Connect {
-						set_id: SetId(set_index),
-						peer_id: conn.into_peer_id()
-					}),
-					Err(_) => {
-						// An error is returned only if no slot is available. Reserved nodes are
-						// marked in the state machine with a flag saying "doesn't occupy a slot",
-						// and as such this should never happen.
-						debug_assert!(false);
-						log::error!(
-							target: "peerset",
-							"Not enough slots to connect to reserved node"
-						);
-					}
+		for reserved_node in &self.reserved_nodes[set_id.0].0 {
+			let entry = match self.data.peer(set_id.0, reserved_node) {
+				peersstate::Peer::Unknown(n) => n.discover(),
+				peersstate::Peer::NotConnected(n) => n,
+				peersstate::Peer::Connected(_) => continue,
+			};
+
+			match entry.try_outgoing() {
+				Ok(conn) => self.message_queue.push_back(Message::Connect {
+					set_id,
+					peer_id: conn.into_peer_id()
+				}),
+				Err(_) => {
+					// An error is returned only if no slot is available. Reserved nodes are
+					// marked in the state machine with a flag saying "doesn't occupy a slot",
+					// and as such this should never happen.
+					debug_assert!(false);
+					log::error!(
+						target: "peerset",
+						"Not enough slots to connect to reserved node"
+					);
 				}
 			}
 		}
 
 		// Now, we try to connect to other nodes.
-		for set_index in 0..self.data.num_sets() {
-			// Nothing more to do if we're in reserved mode.
-			if self.reserved_nodes[set_index].1 {
-				continue;
+
+		// Nothing more to do if we're in reserved mode.
+		if self.reserved_nodes[set_id.0].1 {
+			return;
+		}
+
+		// Try to grab the next node to attempt to connect to.
+		// Since `highest_not_connected_peer` is rather expensive to call, check beforehand
+		// whether we have an available slot.
+		while self.data.has_free_outgoing_slot(set_id.0) {
+			let next = match self.data.highest_not_connected_peer(set_id.0) {
+				Some(n) => n,
+				None => break
+			};
+
+			// Don't connect to nodes with an abysmal reputation.
+			if next.reputation() < BANNED_THRESHOLD {
+				break;
 			}
 
-			// Try to grab the next node to attempt to connect to.
-			while let Some(next) = self.data.highest_not_connected_peer(set_index) {
-				// Don't connect to nodes with an abysmal reputation.
-				if next.reputation() < BANNED_THRESHOLD {
+			match next.try_outgoing() {
+				Ok(conn) => self.message_queue.push_back(Message::Connect {
+					set_id,
+					peer_id: conn.into_peer_id()
+				}),
+				Err(_) => {
+					// This branch can only be entered if there is no free slot, which is
+					// checked above.
+					debug_assert!(false);
 					break;
 				}
-
-				match next.try_outgoing() {
-					Ok(conn) => self.message_queue.push_back(Message::Connect {
-						set_id: SetId(set_index),
-						peer_id: conn.into_peer_id()
-					}),
-					Err(_) => break,	// No more slots available.
-				}
 			}
 		}
 	}
@@ -624,7 +636,7 @@ impl Peerset {
 			self.on_remove_from_peers_set(set_id, peer_id);
 		}
 
-		self.alloc_slots();
+		self.alloc_slots(set_id);
 	}
 
 	/// Reports an adjustment to the reputation of the given peer.
diff --git a/client/peerset/src/peersstate.rs b/client/peerset/src/peersstate.rs
index c79dac5e10a7..c200d2729e16 100644
--- a/client/peerset/src/peersstate.rs
+++ b/client/peerset/src/peersstate.rs
@@ -283,6 +283,11 @@ impl PeersState {
 		}
 	}
 
+	/// Returns `true` if there is a free outgoing slot available related to this set.
+	pub fn has_free_outgoing_slot(&self, set: usize) -> bool {
+		self.sets[set].num_out < self.sets[set].max_out
+	}
+
 	/// Add a node to the list of nodes that don't occupy slots.
 	///
 	/// Has no effect if the node was already in the group.
@@ -506,9 +511,7 @@ impl<'a> NotConnectedPeer<'a> {
 
 		// Note that it is possible for num_out to be strictly superior to the max, in case we were
 		// connected to reserved node then marked them as not reserved.
-		if self.state.sets[self.set].num_out >= self.state.sets[self.set].max_out
-			&& !is_no_slot_occupy
-		{
+		if !self.state.has_free_outgoing_slot(self.set) && !is_no_slot_occupy {
 			return Err(self);
 		}
 

From 067f185298b97d48aed042d6f5fb80c46cc9fb6e Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Tue, 23 Mar 2021 11:02:07 +0100
Subject: [PATCH 0537/1194] Refactor NotifsHandler::poll (#8422)

* Refactor a bit NotifsHandler::poll

* Avoid some spurious wake-ups
---
 .../src/protocol/notifications/handler.rs     | 143 ++++++++++--------
 1 file changed, 79 insertions(+), 64 deletions(-)

diff --git a/client/network/src/protocol/notifications/handler.rs b/client/network/src/protocol/notifications/handler.rs
index ec3760d52576..99677cc45e54 100644
--- a/client/network/src/protocol/notifications/handler.rs
+++ b/client/network/src/protocol/notifications/handler.rs
@@ -188,10 +188,10 @@ enum State {
 		/// We use two different channels in order to have two different channel sizes, but from
 		/// the receiving point of view, the two channels are the same.
 		/// The receivers are fused in case the user drops the [`NotificationsSink`] entirely.
-		notifications_sink_rx: stream::Select<
+		notifications_sink_rx: stream::Peekable<stream::Select<
 			stream::Fuse<mpsc::Receiver<NotificationsSinkMessage>>,
 			stream::Fuse<mpsc::Receiver<NotificationsSinkMessage>>
-		>,
+		>>,
 
 		/// Outbound substream that has been accepted by the remote.
 		///
@@ -552,7 +552,7 @@ impl ProtocolsHandler for NotifsHandler {
 				};
 
 				self.protocols[protocol_index].state = State::Open {
-					notifications_sink_rx: stream::select(async_rx.fuse(), sync_rx.fuse()),
+					notifications_sink_rx: stream::select(async_rx.fuse(), sync_rx.fuse()).peekable(),
 					out_substream: Some(substream),
 					in_substream: in_substream.take(),
 				};
@@ -716,8 +716,80 @@ impl ProtocolsHandler for NotifsHandler {
 			return Poll::Ready(ev);
 		}
 
+		// For each open substream, try send messages from `notifications_sink_rx` to the
+		// substream.
+		for protocol_index in 0..self.protocols.len() {
+			if let State::Open { notifications_sink_rx, out_substream: Some(out_substream), .. }
+				= &mut self.protocols[protocol_index].state
+			{
+				loop {
+					// Only proceed with `out_substream.poll_ready_unpin` if there is an element
+					// available in `notifications_sink_rx`. This avoids waking up the task when
+					// a substream is ready to send if there isn't actually something to send.
+					match Pin::new(&mut *notifications_sink_rx).as_mut().poll_peek(cx) {
+						Poll::Ready(Some(&NotificationsSinkMessage::ForceClose)) => {
+							return Poll::Ready(
+								ProtocolsHandlerEvent::Close(NotifsHandlerError::SyncNotificationsClogged)
+							);
+						},
+						Poll::Ready(Some(&NotificationsSinkMessage::Notification { .. })) => {},
+						Poll::Ready(None) | Poll::Pending => break,
+					}
+
+					// Before we extract the element from `notifications_sink_rx`, check that the
+					// substream is ready to accept a message.
+					match out_substream.poll_ready_unpin(cx) {
+						Poll::Ready(_) => {},
+						Poll::Pending => break
+					}
+
+					// Now that the substream is ready for a message, grab what to send.
+					let message = match notifications_sink_rx.poll_next_unpin(cx) {
+						Poll::Ready(Some(NotificationsSinkMessage::Notification { message })) => message,
+						Poll::Ready(Some(NotificationsSinkMessage::ForceClose))
+						| Poll::Ready(None)
+						| Poll::Pending => {
+							// Should never be reached, as per `poll_peek` above.
+							debug_assert!(false);
+							break;
+						}
+					};
+
+					let _ = out_substream.start_send_unpin(message);
+					// Note that flushing is performed later down this function.
+				}
+			}
+		}
+
+		// Flush all outbound substreams.
+		// When `poll` returns `Poll::Ready`, the libp2p `Swarm` may decide to no longer call
+		// `poll` again before it is ready to accept more events.
+		// In order to make sure that substreams are flushed as soon as possible, the flush is
+		// performed before the code paths that can produce `Ready` (with some rare exceptions).
+		// Importantly, however, the flush is performed *after* notifications are queued with
+		// `Sink::start_send`.
+		for protocol_index in 0..self.protocols.len() {
+			match &mut self.protocols[protocol_index].state {
+				State::Open { out_substream: out_substream @ Some(_), .. } => {
+					match Sink::poll_flush(Pin::new(out_substream.as_mut().unwrap()), cx) {
+						Poll::Pending | Poll::Ready(Ok(())) => {},
+						Poll::Ready(Err(_)) => {
+							*out_substream = None;
+							let event = NotifsHandlerOut::CloseDesired { protocol_index };
+							return Poll::Ready(ProtocolsHandlerEvent::Custom(event));
+						}
+					};
+				}
+
+				State::Closed { .. } |
+				State::Opening { .. } |
+				State::Open { out_substream: None, .. } |
+				State::OpenDesiredByRemote { .. } => {}
+			}
+		}
+
+		// Poll inbound substreams.
 		for protocol_index in 0..self.protocols.len() {
-			// Poll inbound substreams.
 			// Inbound substreams being closed is always tolerated, except for the
 			// `OpenDesiredByRemote` state which might need to be switched back to `Closed`.
 			match &mut self.protocols[protocol_index].state {
@@ -763,68 +835,11 @@ impl ProtocolsHandler for NotifsHandler {
 					}
 				}
 			}
-
-			// Poll outbound substream.
-			match &mut self.protocols[protocol_index].state {
-				State::Open { out_substream: out_substream @ Some(_), .. } => {
-					match Sink::poll_flush(Pin::new(out_substream.as_mut().unwrap()), cx) {
-						Poll::Pending | Poll::Ready(Ok(())) => {},
-						Poll::Ready(Err(_)) => {
-							*out_substream = None;
-							let event = NotifsHandlerOut::CloseDesired { protocol_index };
-							return Poll::Ready(ProtocolsHandlerEvent::Custom(event));
-						}
-					};
-				}
-
-				State::Closed { .. } |
-				State::Opening { .. } |
-				State::Open { out_substream: None, .. } |
-				State::OpenDesiredByRemote { .. } => {}
-			}
-
-			if let State::Open { notifications_sink_rx, out_substream: Some(out_substream), .. }
-				= &mut self.protocols[protocol_index].state
-			{
-				loop {
-					// Before we poll the notifications sink receiver, check that the substream
-					// is ready to accept a message.
-					match out_substream.poll_ready_unpin(cx) {
-						Poll::Ready(_) => {},
-						Poll::Pending => break
-					}
-
-					// Now that all substreams are ready for a message, grab what to send.
-					let message = match notifications_sink_rx.poll_next_unpin(cx) {
-						Poll::Ready(Some(msg)) => msg,
-						Poll::Ready(None) | Poll::Pending => break,
-					};
-
-					match message {
-						NotificationsSinkMessage::Notification { message } => {
-							let _ = out_substream.start_send_unpin(message);
-
-							// Calling `start_send_unpin` only queues the message. Actually
-							// emitting the message is done with `poll_flush`. In order to
-							// not introduce too much complexity, this flushing is done earlier
-							// in the body of this `poll()` method. As such, we schedule a task
-							// wake-up now in order to guarantee that `poll()` will be called
-							// again and the flush happening.
-							// At the time of the writing of this comment, a rewrite of this
-							// code is being planned. If you find this comment in the wild and
-							// the rewrite didn't happen, please consider a refactor.
-							cx.waker().wake_by_ref();
-						}
-						NotificationsSinkMessage::ForceClose => {
-							return Poll::Ready(
-								ProtocolsHandlerEvent::Close(NotifsHandlerError::SyncNotificationsClogged)
-							);
-						}
-					}
-				}
-			}
 		}
 
+		// This is the only place in this method that can return `Pending`.
+		// By putting it at the very bottom, we are guaranteed that everything has been properly
+		// polled.
 		Poll::Pending
 	}
 }

From 7821936dc985438af58b7b05fd63612bbebd4155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Tue, 23 Mar 2021 11:15:40 +0100
Subject: [PATCH 0538/1194] contracts: Update deduct block when a contract is
 excempted (#8418)

---
 frame/contracts/src/rent.rs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/frame/contracts/src/rent.rs b/frame/contracts/src/rent.rs
index 9b3a3f731a2a..8605451ad1ee 100644
--- a/frame/contracts/src/rent.rs
+++ b/frame/contracts/src/rent.rs
@@ -245,7 +245,6 @@ where
 		evictable_code: Option<PrefabWasmModule<T>>,
 	) -> Result<Option<AliveContractInfo<T>>, DispatchError> {
 		match (verdict, evictable_code) {
-			(Verdict::Exempt, _) => return Ok(Some(alive_contract_info)),
 			(Verdict::Evict { amount }, Some(code)) => {
 				// We need to remove the trie first because it is the only operation
 				// that can fail and this function is called without a storage
@@ -274,6 +273,14 @@ where
 			(Verdict::Evict { amount: _ }, None) => {
 				Ok(None)
 			}
+			(Verdict::Exempt, _) =>  {
+				let contract = ContractInfo::Alive(AliveContractInfo::<T> {
+					deduct_block: current_block_number,
+					..alive_contract_info
+				});
+				<ContractInfoOf<T>>::insert(account, &contract);
+				Ok(Some(contract.get_alive().expect("We just constructed it as alive. qed")))
+			},
 			(Verdict::Charge { amount }, _) => {
 				let contract = ContractInfo::Alive(AliveContractInfo::<T> {
 					rent_allowance: alive_contract_info.rent_allowance - amount.peek(),

From fcf950ca4906bed0b8118d6b40fa8a8a0acf9425 Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Tue, 23 Mar 2021 12:10:03 +0100
Subject: [PATCH 0539/1194] Fix CI for new labels (#8432)

* Fix up CI/CD for the new labels.

* New labels.

* Fix labels

* Fix labels

* Fix accidental change
---
 .maintain/github/check_labels.sh  | 17 +++++++++--------
 .maintain/gitlab/check_runtime.sh |  2 --
 docs/CONTRIBUTING.adoc            | 17 +++++++++++++----
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/.maintain/github/check_labels.sh b/.maintain/github/check_labels.sh
index ea4547ac9170..7b0aed9fe734 100755
--- a/.maintain/github/check_labels.sh
+++ b/.maintain/github/check_labels.sh
@@ -25,17 +25,18 @@ releasenotes_labels=(
 )
 
 criticality_labels=(
-  'C1-low'
-  'C3-medium'
-  'C7-high'
-  'C9-critical'
+  'C1-low 📌'
+  'C3-medium 📣'
+  'C7-high ❗️'
+  'C9-critical ‼️'
 )
 
 audit_labels=(
-  'D1-trivial'
-  'D1-audited👍'
-  'D5-nicetohaveaudit⚠️'
-  'D9-needsaudit👮'
+  'D1-audited 👍'
+  'D2-notlive 💤'
+  'D3-trivial 🧸'
+  'D5-nicetohaveaudit ⚠️'
+  'D9-needsaudit 👮'
 )
 
 echo "[+] Checking release notes (B) labels"
diff --git a/.maintain/gitlab/check_runtime.sh b/.maintain/gitlab/check_runtime.sh
index 3b0b1ad10761..af392e1b7d11 100755
--- a/.maintain/gitlab/check_runtime.sh
+++ b/.maintain/gitlab/check_runtime.sh
@@ -66,8 +66,6 @@ sub_spec_version="$(git diff "tags/release...${CI_COMMIT_SHA}" "${VERSIONS_FILE}
 if [ "${add_spec_version}" != "${sub_spec_version}" ]
 then
 
-	github_label "D2-breaksapi"
-
 	boldcat <<-EOT
 
 		changes to the runtime sources and changes in the spec version.
diff --git a/docs/CONTRIBUTING.adoc b/docs/CONTRIBUTING.adoc
index 6262ed9086a5..c0f43f01f413 100644
--- a/docs/CONTRIBUTING.adoc
+++ b/docs/CONTRIBUTING.adoc
@@ -35,12 +35,21 @@ A PR needs to be reviewed and approved by project maintainers unless:
 
 *Process:*
 
-. Please tag each PR with exactly one `A`, `B` and `C` label at the minimum.
+. Please tag each PR with exactly one `A`, `B`, `C` and `D` label at the minimum.
 . Once a PR is ready for review please add the https://github.com/paritytech/substrate/pulls?q=is%3Apr+is%3Aopen+label%3AA0-pleasereview[`A0-pleasereview`] label. Generally PRs should sit with this label for 48 hours in order to garner feedback. It may be merged before if all relevant parties had a look at it.
 . If the first review is not an approval, swap `A0-pleasereview` to any label `[A3, A7]` to indicate that the PR has received some feedback, but needs further work. For example. https://github.com/paritytech/substrate/labels/A3-inprogress[`A3-inprogress`] is a general indicator that the PR is work in progress and https://github.com/paritytech/substrate/labels/A4-gotissues[`A4-gotissues`] means that it has significant problems that need fixing. Once the work is done, change the label back to `A0-pleasereview`. You might end up swapping a few times back and forth to climb up the A label group. Once a PR is https://github.com/paritytech/substrate/labels/A8-mergeoncegreen[`A8-mergeoncegreen`], it is ready to merge.
-. PRs must be tagged with respect to _release notes_ with https://github.com/paritytech/substrate/labels/B0-silent[`B0-silent`] and `B1-..`. The former indicates that no changes should be mentioned in any release notes. The latter indicates that the changes should be reported in the corresponding release note
-. PRs that break the external API must be tagged with https://github.com/paritytech/substrate/labels/D2-breaksapi[`D2-breaksapi`], when it changes the FRAME or consensus of running system with https://github.com/paritytech/substrate/labels/B3-breaksconsensus[`B3-breaksconsensus`].
-. PRs should be labeled with their release importance via the `C1-C9`.
+. PRs must be tagged with their release notes requirements via the `B1-B9` labels.
+. PRs must be tagged with their release importance via the `C1-C9` labels.
+. PRs must be tagged with their audit requirements via the `D1-D9` labels.
+. PRs that must be backported to a stable branch must be tagged with https://github.com/paritytech/substrate/labels/E1-runtimemigration[`E0-patchthis`].
+. PRs that introduce runtime migrations must be tagged with https://github.com/paritytech/substrate/labels/E1-runtimemigration[`E1-runtimemigration`].
+. PRs that introduce irreversible database migrations must be tagged with https://github.com/paritytech/substrate/labels/E2-databasemigration[`E2-databasemigration`].
+. PRs that add host functions must be tagged with with https://github.com/paritytech/substrate/labels/E4-newhostfunctions[`E4-newhostfunctions`].
+. PRs that break the external API must be tagged with https://github.com/paritytech/substrate/labels/E5-breaksapi[`E5-breaksapi`].
+. PRs that materially change the FRAME/runtime semantics must be tagged with https://github.com/paritytech/substrate/labels/E6-transactionversion[`E6-transactionversion`].
+. PRs that change the mechanism for block authoring in a backwards-incompatible way must be tagged with https://github.com/paritytech/substrate/labels/E7-breaksauthoring[`E7-breaksauthoring`].
+. PRs that "break everything" must be tagged with https://github.com/paritytech/substrate/labels/E8-breakseverything[`E8-breakseverything`].
+. PRs that block a new release must be tagged with https://github.com/paritytech/substrate/labels/E9-blocker%20%E2%9B%94%EF%B8%8F[`E9-blocker`].
 . PRs should be categorized into projects.
 . No PR should be merged until all reviews' comments are addressed and CI is successful.
 

From 307a3b6c1c4cc911dd52c710a5d8b744533724f1 Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Tue, 23 Mar 2021 14:10:36 +0100
Subject: [PATCH 0540/1194] Fungibles trait and impl for Assets pallet (#8425)

* Fungibles trait and impl for Assets pallet

* Comment & whitespace

* Fixes

* Fix up CI/CD for the new labels.

* New labels.

* Fix labels

* Fix labels

* Whitespace

* Bump impl version.

* Fix accidental change

* Fixes

* Questionable fix.

* Better benchmark
---
 bin/node/runtime/src/lib.rs        |   2 +-
 frame/assets/src/benchmarking.rs   |  11 +-
 frame/assets/src/lib.rs            | 257 ++++++++++++++++++-----------
 frame/staking/reward-fn/src/lib.rs |   7 +-
 frame/support/src/traits.rs        |  16 ++
 5 files changed, 189 insertions(+), 104 deletions(-)

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index fd25c900da4e..5f5a3cc663c8 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -114,7 +114,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	// implementation changes and behavior does not, then leave spec_version as
 	// is and increment impl_version.
 	spec_version: 265,
-	impl_version: 0,
+	impl_version: 1,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 2,
 };
diff --git a/frame/assets/src/benchmarking.rs b/frame/assets/src/benchmarking.rs
index 37300bf221de..227d45623d68 100644
--- a/frame/assets/src/benchmarking.rs
+++ b/frame/assets/src/benchmarking.rs
@@ -127,6 +127,14 @@ fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
 	assert_eq!(event, &system_event);
 }
 
+fn assert_event<T: Config>(generic_event: <T as Config>::Event) {
+	let system_event: <T as frame_system::Config>::Event = generic_event.into();
+	let events = frame_system::Pallet::<T>::events();
+	assert!(events.iter().any(|event_record| {
+		matches!(&event_record, frame_system::EventRecord { event, .. } if &system_event == event)
+	}));
+}
+
 benchmarks! {
 	create {
 		let caller: T::AccountId = whitelisted_caller();
@@ -383,7 +391,8 @@ benchmarks! {
 		let dest_lookup = T::Lookup::unlookup(dest.clone());
 	}: _(SystemOrigin::Signed(delegate.clone()), id, owner_lookup, dest_lookup, amount)
 	verify {
-		assert_last_event::<T>(Event::TransferredApproved(id, owner, delegate, dest, amount).into());
+		assert!(T::Currency::reserved_balance(&owner).is_zero());
+		assert_event::<T>(Event::Transferred(id, owner, dest, amount).into());
 	}
 
 	cancel_approval {
diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index b8d436f106bb..e9f5445dd8e4 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -138,16 +138,49 @@ use sp_runtime::{
 	}
 };
 use codec::{Encode, Decode, HasCompact};
-use frame_support::{
-	ensure,
-	traits::{Currency, ReservableCurrency, BalanceStatus::Reserved},
-	dispatch::{DispatchError, DispatchResult},
-};
+use frame_support::{ensure, dispatch::{DispatchError, DispatchResult}};
+use frame_support::traits::{Currency, ReservableCurrency, BalanceStatus::Reserved, Fungibles};
+use frame_system::Config as SystemConfig;
 pub use weights::WeightInfo;
-
 pub use pallet::*;
 
-type DepositBalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+impl<T: Config> Fungibles<<T as SystemConfig>::AccountId> for Pallet<T> {
+	type AssetId = T::AssetId;
+	type Balance = T::Balance;
+
+	fn balance(
+		asset: Self::AssetId,
+		who: &<T as SystemConfig>::AccountId,
+	) -> Self::Balance {
+		Pallet::<T>::balance(asset, who)
+	}
+
+	fn can_deposit(
+		asset: Self::AssetId,
+		who: &<T as SystemConfig>::AccountId,
+		amount: Self::Balance,
+	) -> bool {
+		Pallet::<T>::can_deposit(asset, who, amount)
+	}
+
+	fn deposit(
+		asset: Self::AssetId,
+		who: <T as SystemConfig>::AccountId,
+		amount: Self::Balance,
+	) -> DispatchResult {
+		Pallet::<T>::increase_balance(asset, who, amount, None)
+	}
+
+	fn withdraw(
+		asset: Self::AssetId,
+		who: <T as SystemConfig>::AccountId,
+		amount: Self::Balance,
+	) -> DispatchResult {
+		Pallet::<T>::reduce_balance(asset, who, amount, None)
+	}
+}
+
+type DepositBalanceOf<T> = <<T as Config>::Currency as Currency<<T as SystemConfig>::AccountId>>::Balance;
 
 #[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug)]
 pub struct AssetDetails<
@@ -273,7 +306,7 @@ pub mod pallet {
 		/// The units in which we record balances.
 		type Balance: Member + Parameter + AtLeast32BitUnsigned + Default + Copy;
 
-		/// The arithmetic type of asset identifier.
+		/// Identifier for the class of asset.
 		type AssetId: Member + Parameter + Default + Copy + HasCompact;
 
 		/// The currency mechanism.
@@ -435,8 +468,7 @@ pub mod pallet {
 		///
 		/// The origin must be Signed and the sender must have sufficient funds free.
 		///
-		/// Funds of sender are reserved according to the formula:
-		/// `AssetDepositBase + AssetDepositPerZombie * max_zombies`.
+		/// Funds of sender are reserved by `AssetDeposit`.
 		///
 		/// Parameters:
 		/// - `id`: The identifier of the new asset. This must not be currently in use to identify
@@ -611,25 +643,7 @@ pub mod pallet {
 		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
 			let beneficiary = T::Lookup::lookup(beneficiary)?;
-
-			Asset::<T>::try_mutate(id, |maybe_details| {
-				let details = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
-
-				ensure!(&origin == &details.issuer, Error::<T>::NoPermission);
-				details.supply = details.supply.checked_add(&amount).ok_or(Error::<T>::Overflow)?;
-
-				Account::<T>::try_mutate(id, &beneficiary, |t| -> DispatchResult {
-					let new_balance = t.balance.saturating_add(amount);
-					ensure!(new_balance >= details.min_balance, Error::<T>::BalanceLow);
-					if t.balance.is_zero() {
-						t.sufficient = Self::new_account(&beneficiary, details)?;
-					}
-					t.balance = new_balance;
-					Ok(())
-				})?;
-				Self::deposit_event(Event::Issued(id, beneficiary, amount));
-				Ok(())
-			})
+			Self::increase_balance(id, beneficiary, amount, Some(origin))
 		}
 
 		/// Reduce the balance of `who` by as much as possible up to `amount` assets of `id`.
@@ -657,33 +671,7 @@ pub mod pallet {
 			let origin = ensure_signed(origin)?;
 			let who = T::Lookup::lookup(who)?;
 
-			Asset::<T>::try_mutate(id, |maybe_details| {
-				let d = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
-				ensure!(&origin == &d.admin, Error::<T>::NoPermission);
-
-				let burned = Account::<T>::try_mutate_exists(
-					id,
-					&who,
-					|maybe_account| -> Result<T::Balance, DispatchError> {
-						let mut account = maybe_account.take().ok_or(Error::<T>::BalanceZero)?;
-						let mut burned = amount.min(account.balance);
-						account.balance -= burned;
-						*maybe_account = if account.balance < d.min_balance {
-							burned += account.balance;
-							Self::dead_account(&who, d, account.sufficient);
-							None
-						} else {
-							Some(account)
-						};
-						Ok(burned)
-					}
-				)?;
-
-				d.supply = d.supply.saturating_sub(burned);
-
-				Self::deposit_event(Event::Burned(id, who, burned));
-				Ok(())
-			})
+			Self::reduce_balance(id, who, amount, Some(origin))
 		}
 
 		/// Move some assets from the sender account to another.
@@ -714,9 +702,7 @@ pub mod pallet {
 			let origin = ensure_signed(origin)?;
 			let dest = T::Lookup::lookup(target)?;
 
-			Self::do_transfer(id, &origin, &dest, amount, None, false)?;
-			Self::deposit_event(Event::Transferred(id, origin, dest, amount));
-			Ok(())
+			Self::do_transfer(id, origin, dest, amount, None, false)
 		}
 
 		/// Move some assets from the sender account to another, keeping the sender account alive.
@@ -747,9 +733,7 @@ pub mod pallet {
 			let origin = ensure_signed(origin)?;
 			let dest = T::Lookup::lookup(target)?;
 
-			Self::do_transfer(id, &origin, &dest, amount, None, true)?;
-			Self::deposit_event(Event::Transferred(id, origin, dest, amount));
-			Ok(())
+			Self::do_transfer(id, origin, dest, amount, None, true)
 		}
 
 		/// Move some assets from one account to another.
@@ -783,9 +767,7 @@ pub mod pallet {
 			let source = T::Lookup::lookup(source)?;
 			let dest = T::Lookup::lookup(dest)?;
 
-			Self::do_transfer(id, &source, &dest, amount, Some(origin), false)?;
-			Self::deposit_event(Event::Transferred(id, source, dest, amount));
-			Ok(())
+			Self::do_transfer(id, source, dest, amount, Some(origin), false)
 		}
 
 		/// Disallow further unprivileged transfers from an account.
@@ -1338,7 +1320,7 @@ pub mod pallet {
 				let mut approved = maybe_approved.take().ok_or(Error::<T>::Unapproved)?;
 				let remaining = approved.amount.checked_sub(&amount).ok_or(Error::<T>::Unapproved)?;
 
-				Self::do_transfer(id, &key.owner, &destination, amount, None, false)?;
+				Self::do_transfer(id, key.owner.clone(), destination, amount, None, false)?;
 
 				if remaining.is_zero() {
 					T::Currency::unreserve(&key.owner, approved.deposit);
@@ -1348,8 +1330,6 @@ pub mod pallet {
 				}
 				Ok(())
 			})?;
-			let event = Event::TransferredApproved(id, key.owner, key.delegate, destination, amount);
-			Self::deposit_event(event);
 			Ok(())
 		}
 	}
@@ -1360,8 +1340,8 @@ impl<T: Config> Pallet<T> {
 	// Public immutables
 
 	/// Get the asset `id` balance of `who`.
-	pub fn balance(id: T::AssetId, who: T::AccountId) -> T::Balance {
-		Account::<T>::get(id, who).balance
+	pub fn balance(id: T::AssetId, who: impl sp_std::borrow::Borrow<T::AccountId>) -> T::Balance {
+		Account::<T>::get(id, who.borrow()).balance
 	}
 
 	/// Get the total supply of an asset `id`.
@@ -1400,15 +1380,97 @@ impl<T: Config> Pallet<T> {
 		d.accounts = d.accounts.saturating_sub(1);
 	}
 
+	fn can_deposit(id: T::AssetId, who: &T::AccountId, amount: T::Balance) -> bool {
+		let details = match Asset::<T>::get(id) {
+			Some(details) => details,
+			None => return false,
+		};
+		if details.supply.checked_add(&amount).is_none() { return false }
+		let account = Account::<T>::get(id, who);
+		if account.balance.checked_add(&amount).is_none() { return false }
+		if account.balance.is_zero() {
+			if amount < details.min_balance { return false }
+			if !details.is_sufficient && frame_system::Pallet::<T>::providers(who) == 0 { return false }
+			if details.is_sufficient && details.sufficients.checked_add(1).is_none() { return false }
+		}
+
+		true
+	}
+
+	fn increase_balance(
+		id: T::AssetId,
+		beneficiary: T::AccountId,
+		amount: T::Balance,
+		maybe_check_issuer: Option<T::AccountId>,
+	) -> DispatchResult {
+		Asset::<T>::try_mutate(id, |maybe_details| {
+			let details = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
+
+			if let Some(check_issuer) = maybe_check_issuer {
+				ensure!(&check_issuer == &details.issuer, Error::<T>::NoPermission);
+			}
+			details.supply = details.supply.checked_add(&amount).ok_or(Error::<T>::Overflow)?;
+
+			Account::<T>::try_mutate(id, &beneficiary, |t| -> DispatchResult {
+				let new_balance = t.balance.saturating_add(amount);
+				ensure!(new_balance >= details.min_balance, Error::<T>::BalanceLow);
+				if t.balance.is_zero() {
+					t.sufficient = Self::new_account(&beneficiary, details)?;
+				}
+				t.balance = new_balance;
+				Ok(())
+			})?;
+			Self::deposit_event(Event::Issued(id, beneficiary, amount));
+			Ok(())
+		})
+	}
+
+	fn reduce_balance(
+		id: T::AssetId,
+		target: T::AccountId,
+		amount: T::Balance,
+		maybe_check_admin: Option<T::AccountId>,
+	) -> DispatchResult {
+		Asset::<T>::try_mutate(id, |maybe_details| {
+			let d = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
+			if let Some(check_admin) = maybe_check_admin {
+				ensure!(&check_admin == &d.admin, Error::<T>::NoPermission);
+			}
+
+			let burned = Account::<T>::try_mutate_exists(
+				id,
+				&target,
+				|maybe_account| -> Result<T::Balance, DispatchError> {
+					let mut account = maybe_account.take().ok_or(Error::<T>::BalanceZero)?;
+					let mut burned = amount.min(account.balance);
+					account.balance -= burned;
+					*maybe_account = if account.balance < d.min_balance {
+						burned += account.balance;
+						Self::dead_account(&target, d, account.sufficient);
+						None
+					} else {
+						Some(account)
+					};
+					Ok(burned)
+				}
+			)?;
+
+			d.supply = d.supply.saturating_sub(burned);
+
+			Self::deposit_event(Event::Burned(id, target, burned));
+			Ok(())
+		})
+	}
+
 	fn do_transfer(
 		id: T::AssetId,
-		source: &T::AccountId,
-		dest: &T::AccountId,
+		source: T::AccountId,
+		dest: T::AccountId,
 		amount: T::Balance,
 		maybe_need_admin: Option<T::AccountId>,
 		keep_alive: bool,
 	) -> DispatchResult {
-		let mut source_account = Account::<T>::get(id, source);
+		let mut source_account = Account::<T>::get(id, &source);
 		ensure!(!source_account.is_frozen, Error::<T>::Frozen);
 
 		source_account.balance = source_account.balance.checked_sub(&amount)
@@ -1422,38 +1484,37 @@ impl<T: Config> Pallet<T> {
 				ensure!(&need_admin == &details.admin, Error::<T>::NoPermission);
 			}
 
-			if dest == source || amount.is_zero() {
-				return Ok(())
-			}
+			if dest != source && !amount.is_zero() {
+				let mut amount = amount;
+				if source_account.balance < details.min_balance {
+					ensure!(!keep_alive, Error::<T>::WouldDie);
+					amount += source_account.balance;
+					source_account.balance = Zero::zero();
+				}
 
-			let mut amount = amount;
-			if source_account.balance < details.min_balance {
-				ensure!(!keep_alive, Error::<T>::WouldDie);
-				amount += source_account.balance;
-				source_account.balance = Zero::zero();
-			}
+				Account::<T>::try_mutate(id, &dest, |a| -> DispatchResult {
+					let new_balance = a.balance.saturating_add(amount);
 
-			Account::<T>::try_mutate(id, dest, |a| -> DispatchResult {
-				let new_balance = a.balance.saturating_add(amount);
+					// This is impossible since `new_balance > amount > min_balance`, but we can
+					// handle it, so we do.
+					ensure!(new_balance >= details.min_balance, Error::<T>::BalanceLow);
 
-				// This is impossible since `new_balance > amount > min_balance`, but we can
-				// handle it, so we do.
-				ensure!(new_balance >= details.min_balance, Error::<T>::BalanceLow);
+					if a.balance.is_zero() {
+						a.sufficient = Self::new_account(&dest, details)?;
+					}
+					a.balance = new_balance;
+					Ok(())
+				})?;
 
-				if a.balance.is_zero() {
-					a.sufficient = Self::new_account(dest, details)?;
+				if source_account.balance.is_zero() {
+					Self::dead_account(&source, details, source_account.sufficient);
+					Account::<T>::remove(id, &source);
+				} else {
+					Account::<T>::insert(id, &source, &source_account)
 				}
-				a.balance = new_balance;
-				Ok(())
-			})?;
-
-			if source_account.balance.is_zero() {
-				Self::dead_account(source, details, source_account.sufficient);
-				Account::<T>::remove(id, source);
-			} else {
-				Account::<T>::insert(id, source, &source_account)
 			}
 
+			Self::deposit_event(Event::Transferred(id, source, dest, amount));
 			Ok(())
 		})
 	}
diff --git a/frame/staking/reward-fn/src/lib.rs b/frame/staking/reward-fn/src/lib.rs
index 6c54fec9239e..205f0207673a 100644
--- a/frame/staking/reward-fn/src/lib.rs
+++ b/frame/staking/reward-fn/src/lib.rs
@@ -79,7 +79,9 @@ pub fn compute_inflation<P: PerThing>(
 	falloff.lstrip();
 
 	let ln2 = {
-		let ln2 = P::from_rational(LN2.deconstruct().into(), Perquintill::ACCURACY.into());
+		/// `ln(2)` expressed in as perquintillionth.
+		const LN2: u64 = 0_693_147_180_559_945_309;
+		let ln2 = P::from_rational(LN2.into(), Perquintill::ACCURACY.into());
 		BigUint::from(ln2.deconstruct().into())
 	};
 
@@ -119,9 +121,6 @@ struct INPoSParam {
 	accuracy: BigUint,
 }
 
-/// `ln(2)` expressed in as perquintillionth.
-const LN2: Perquintill = Perquintill::from_parts(0_693_147_180_559_945_309);
-
 /// Compute `2^((x_ideal - x) / d)` using taylor serie.
 ///
 /// x must be strictly more than x_ideal.
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index 286c545d30d9..9f8afdf7c754 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -1128,6 +1128,22 @@ pub trait Currency<AccountId> {
 	) -> SignedImbalance<Self::Balance, Self::PositiveImbalance>;
 }
 
+/// Trait for providing an ERC-20 style set of named fungible assets.
+pub trait Fungibles<AccountId> {
+	/// Means of identifying one asset class from another.
+	type AssetId: FullCodec + Copy + Default;
+	/// Scalar type for storing balance of an account.
+	type Balance: AtLeast32BitUnsigned + FullCodec + Copy + Default;
+	/// Get the `asset` balance of `who`.
+	fn balance(asset: Self::AssetId, who: &AccountId) -> Self::Balance;
+	/// Returns `true` if the `asset` balance of `who` may be increased by `amount`.
+	fn can_deposit(asset: Self::AssetId, who: &AccountId, amount: Self::Balance) -> bool;
+	/// Increase the `asset` balance of `who` by `amount`.
+	fn deposit(asset: Self::AssetId, who: AccountId, amount: Self::Balance) -> DispatchResult;
+	/// Attempt to reduce the `asset` balance of `who` by `amount`.
+	fn withdraw(asset: Self::AssetId, who: AccountId, amount: Self::Balance) -> DispatchResult;
+}
+
 /// Status of funds.
 #[derive(PartialEq, Eq, Clone, Copy, Encode, Decode, RuntimeDebug)]
 pub enum BalanceStatus {

From f2e8da0fd2991ff8d8959d981bcc01592f5728a2 Mon Sep 17 00:00:00 2001
From: Steve Biedermann <hardliner66@gmail.com>
Date: Tue, 23 Mar 2021 14:23:07 +0100
Subject: [PATCH 0541/1194] Improve remote-externalities (#8397)

* make builder generic to allow using different hash types

* expose "cache", "block_number" and "modules" as cli options for live state

* Change Builder to be generic over Block instead of Hash
add rpc method to get hash from block number
allow passing of block numbers and hashes

* fix live tests

* fix formatting in utils/frame/remote-externalities/src/lib.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* change cli to only accept block hashes
break up lines that were too long
use starts_with instead of match s.get
use unwrap_or_default instead of unwrap_or(Vec::new())

* improve error message

* fix indentation

* replace Block with sp_runtime::testing::Block

* Move cache test out of remote-test feature tests
Add cache file (contains only "Proxy" module) for local test

* simplify match expression to and_then

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Combine the two cfg attributes into one

Co-authored-by: David <dvdplm@gmail.com>

* Restrict visibility of test_prelude use statements to crate level

* Fix usage of and_then

* Rename cache to snapshot

* Remove fully qualified path for Debug

* Refine naming. snapshot to state_snapshot

* Remove unnecessary comment

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Co-authored-by: David <dvdplm@gmail.com>
---
 Cargo.lock                                    |   3 +-
 utils/frame/remote-externalities/Cargo.toml   |   3 +-
 utils/frame/remote-externalities/src/lib.rs   | 173 ++++++++++--------
 .../remote-externalities/test_data/proxy_test | Bin 0 -> 39 bytes
 utils/frame/try-runtime/cli/src/lib.rs        | 134 +++++++++++---
 5 files changed, 205 insertions(+), 108 deletions(-)
 create mode 100644 utils/frame/remote-externalities/test_data/proxy_test

diff --git a/Cargo.lock b/Cargo.lock
index 7dfafef08f7e..045b2780c4bf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6564,7 +6564,6 @@ dependencies = [
 name = "remote-externalities"
 version = "0.9.0"
 dependencies = [
- "async-std",
  "env_logger 0.8.3",
  "hex-literal",
  "jsonrpsee-http-client",
@@ -6574,6 +6573,8 @@ dependencies = [
  "parity-scale-codec",
  "sp-core",
  "sp-io",
+ "sp-runtime",
+ "tokio 0.2.25",
 ]
 
 [[package]]
diff --git a/utils/frame/remote-externalities/Cargo.toml b/utils/frame/remote-externalities/Cargo.toml
index de90933e1797..b8bee6380006 100644
--- a/utils/frame/remote-externalities/Cargo.toml
+++ b/utils/frame/remote-externalities/Cargo.toml
@@ -25,9 +25,10 @@ codec = { package = "parity-scale-codec", version = "2.0.0" }
 
 sp-io = { version = "3.0.0", path = "../../../primitives/io" }
 sp-core = { version = "3.0.0", path = "../../../primitives/core" }
+sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
 
 [dev-dependencies]
-async-std = { version = "1.6.5", features = ["attributes"] }
+tokio = { version = "0.2", features = ["macros"] }
 
 [features]
 remote-test = []
diff --git a/utils/frame/remote-externalities/src/lib.rs b/utils/frame/remote-externalities/src/lib.rs
index a5687f42337f..8d142100ec34 100644
--- a/utils/frame/remote-externalities/src/lib.rs
+++ b/utils/frame/remote-externalities/src/lib.rs
@@ -18,7 +18,7 @@
 //! # Remote Externalities
 //!
 //! An equivalent of `sp_io::TestExternalities` that can load its state from a remote substrate
-//! based chain, or a local cache file.
+//! based chain, or a local state snapshot file.
 //!
 //! #### Runtime to Test Against
 //!
@@ -106,7 +106,7 @@ use std::{
 	path::{Path, PathBuf},
 };
 use log::*;
-use sp_core::{hashing::twox_128};
+use sp_core::hashing::twox_128;
 pub use sp_io::TestExternalities;
 use sp_core::{
 	hexdisplay::HexDisplay,
@@ -115,62 +115,62 @@ use sp_core::{
 use codec::{Encode, Decode};
 use jsonrpsee_http_client::{HttpClient, HttpConfig};
 
+use sp_runtime::traits::Block as BlockT;
+
 type KeyPair = (StorageKey, StorageData);
-type Hash = sp_core::H256;
-// TODO: make these two generic.
 
 const LOG_TARGET: &str = "remote-ext";
 const TARGET: &str = "http://localhost:9933";
 
 jsonrpsee_proc_macros::rpc_client_api! {
-	RpcApi {
+	RpcApi<B: BlockT> {
 		#[rpc(method = "state_getPairs", positional_params)]
-		fn storage_pairs(prefix: StorageKey, hash: Option<Hash>) -> Vec<(StorageKey, StorageData)>;
+		fn storage_pairs(prefix: StorageKey, hash: Option<B::Hash>) -> Vec<(StorageKey, StorageData)>;
 		#[rpc(method = "chain_getFinalizedHead")]
-		fn finalized_head() -> Hash;
+		fn finalized_head() -> B::Hash;
 	}
 }
 
 /// The execution mode.
 #[derive(Clone)]
-pub enum Mode {
+pub enum Mode<B: BlockT> {
 	/// Online.
-	Online(OnlineConfig),
-	/// Offline. Uses a cached file and needs not any client config.
+	Online(OnlineConfig<B>),
+	/// Offline. Uses a state snapshot file and needs not any client config.
 	Offline(OfflineConfig),
 }
 
 /// configuration of the online execution.
 ///
-/// A cache config must be present.
+/// A state snapshot config must be present.
 #[derive(Clone)]
 pub struct OfflineConfig {
-	/// The configuration of the cache file to use. It must be present.
-	pub cache: CacheConfig,
+	/// The configuration of the state snapshot file to use. It must be present.
+	pub state_snapshot: SnapshotConfig,
 }
 
 /// Configuration of the online execution.
 ///
-/// A cache config may be present and will be written to in that case.
+/// A state snapshot config may be present and will be written to in that case.
 #[derive(Clone)]
-pub struct OnlineConfig {
+pub struct OnlineConfig<B: BlockT> {
 	/// The HTTP uri to use.
 	pub uri: String,
 	/// The block number at which to connect. Will be latest finalized head if not provided.
-	pub at: Option<Hash>,
-	/// An optional cache file to WRITE to, not for reading. Not cached if set to `None`.
-	pub cache: Option<CacheConfig>,
+	pub at: Option<B::Hash>,
+	/// An optional state snapshot file to WRITE to, not for reading. Not written if set to `None`.
+	pub state_snapshot: Option<SnapshotConfig>,
 	/// The modules to scrape. If empty, entire chain state will be scraped.
 	pub modules: Vec<String>,
 }
 
-impl Default for OnlineConfig {
+impl<B: BlockT> Default for OnlineConfig<B> {
 	fn default() -> Self {
-		Self { uri: TARGET.to_owned(), at: None, cache: None, modules: Default::default() }
+		Self { uri: TARGET.to_owned(), at: None, state_snapshot: None, modules: Default::default() }
 	}
 }
 
-impl OnlineConfig {
+impl<B: BlockT> OnlineConfig<B> {
 	/// Return a new http rpc client.
 	fn rpc(&self) -> HttpClient {
 		HttpClient::new(&self.uri, HttpConfig { max_request_body_size: u32::MAX })
@@ -178,9 +178,9 @@ impl OnlineConfig {
 	}
 }
 
-/// Configuration of the cache.
+/// Configuration of the state snapshot.
 #[derive(Clone)]
-pub struct CacheConfig {
+pub struct SnapshotConfig {
 	// TODO: I could mix these two into one filed, but I think separate is better bc one can be
 	// configurable while one not.
 	/// File name.
@@ -189,43 +189,43 @@ pub struct CacheConfig {
 	pub directory: String,
 }
 
-impl Default for CacheConfig {
+impl Default for SnapshotConfig {
 	fn default() -> Self {
-		Self { name: "CACHE".into(), directory: ".".into() }
+		Self { name: "SNAPSHOT".into(), directory: ".".into() }
 	}
 }
 
-impl CacheConfig {
+impl SnapshotConfig {
 	fn path(&self) -> PathBuf {
 		Path::new(&self.directory).join(self.name.clone())
 	}
 }
 
 /// Builder for remote-externalities.
-pub struct Builder {
+pub struct Builder<B: BlockT> {
 	inject: Vec<KeyPair>,
-	mode: Mode,
+	mode: Mode<B>,
 }
 
-impl Default for Builder {
+impl<B: BlockT> Default for Builder<B> {
 	fn default() -> Self {
 		Self {
 			inject: Default::default(),
-			mode: Mode::Online(OnlineConfig::default())
+			mode: Mode::Online(OnlineConfig::default()),
 		}
 	}
 }
 
 // Mode methods
-impl Builder {
-	fn as_online(&self) -> &OnlineConfig {
+impl<B: BlockT> Builder<B> {
+	fn as_online(&self) -> &OnlineConfig<B> {
 		match &self.mode {
 			Mode::Online(config) => &config,
 			_ => panic!("Unexpected mode: Online"),
 		}
 	}
 
-	fn as_online_mut(&mut self) -> &mut OnlineConfig {
+	fn as_online_mut(&mut self) -> &mut OnlineConfig<B> {
 		match &mut self.mode {
 			Mode::Online(config) => config,
 			_ => panic!("Unexpected mode: Online"),
@@ -234,13 +234,13 @@ impl Builder {
 }
 
 // RPC methods
-impl Builder {
-	async fn rpc_get_head(&self) -> Result<Hash, &'static str> {
+impl<B: BlockT> Builder<B> {
+	async fn rpc_get_head(&self) -> Result<B::Hash, &'static str> {
 		trace!(target: LOG_TARGET, "rpc: finalized_head");
-		RpcApi::finalized_head(&self.as_online().rpc()).await.map_err(|e| {
+		RpcApi::<B>::finalized_head(&self.as_online().rpc()).await.map_err(|e| {
 			error!("Error = {:?}", e);
 			"rpc finalized_head failed."
-			})
+		})
 	}
 
 	/// Relay the request to `state_getPairs` rpc endpoint.
@@ -249,28 +249,28 @@ impl Builder {
 	async fn rpc_get_pairs(
 		&self,
 		prefix: StorageKey,
-		at: Hash,
+		at: B::Hash,
 	) -> Result<Vec<KeyPair>, &'static str> {
 		trace!(target: LOG_TARGET, "rpc: storage_pairs: {:?} / {:?}", prefix, at);
-		RpcApi::storage_pairs(&self.as_online().rpc(), prefix, Some(at)).await.map_err(|e| {
+		RpcApi::<B>::storage_pairs(&self.as_online().rpc(), prefix, Some(at)).await.map_err(|e| {
 			error!("Error = {:?}", e);
 			"rpc storage_pairs failed"
-			})
+		})
 	}
 }
 
 // Internal methods
-impl Builder {
-	/// Save the given data as cache.
-	fn save_cache(&self, data: &[KeyPair], path: &Path) -> Result<(), &'static str> {
-		info!(target: LOG_TARGET, "writing to cache file {:?}", path);
+impl<B: BlockT> Builder<B> {
+	/// Save the given data as state snapshot.
+	fn save_state_snapshot(&self, data: &[KeyPair], path: &Path) -> Result<(), &'static str> {
+		info!(target: LOG_TARGET, "writing to state snapshot file {:?}", path);
 		fs::write(path, data.encode()).map_err(|_| "fs::write failed.")?;
 		Ok(())
 	}
 
-	/// initialize `Self` from cache. Panics if the file does not exist.
-	fn load_cache(&self, path: &Path) -> Result<Vec<KeyPair>, &'static str> {
-		info!(target: LOG_TARGET, "scraping keypairs from cache {:?}", path,);
+	/// initialize `Self` from state snapshot. Panics if the file does not exist.
+	fn load_state_snapshot(&self, path: &Path) -> Result<Vec<KeyPair>, &'static str> {
+		info!(target: LOG_TARGET, "scraping keypairs from state snapshot {:?}", path,);
 		let bytes = fs::read(path).map_err(|_| "fs::read failed.")?;
 		Decode::decode(&mut &*bytes).map_err(|_| "decode failed")
 	}
@@ -319,12 +319,12 @@ impl Builder {
 
 	async fn pre_build(mut self) -> Result<Vec<KeyPair>, &'static str> {
 		let mut base_kv = match self.mode.clone() {
-			Mode::Offline(config) => self.load_cache(&config.cache.path())?,
+			Mode::Offline(config) => self.load_state_snapshot(&config.state_snapshot.path())?,
 			Mode::Online(config) => {
 				self.init_remote_client().await?;
 				let kp = self.load_remote().await?;
-				if let Some(c) = config.cache {
-					self.save_cache(&kp, &c.path())?;
+				if let Some(c) = config.state_snapshot {
+					self.save_state_snapshot(&kp, &c.path())?;
 				}
 				kp
 			}
@@ -341,7 +341,7 @@ impl Builder {
 }
 
 // Public methods
-impl Builder {
+impl<B: BlockT> Builder<B> {
 	/// Create a new builder.
 	pub fn new() -> Self {
 		Default::default()
@@ -355,8 +355,8 @@ impl Builder {
 		self
 	}
 
-	/// Configure a cache to be used.
-	pub fn mode(mut self, mode: Mode) -> Self {
+	/// Configure a state snapshot to be used.
+	pub fn mode(mut self, mode: Mode<B>) -> Self {
 		self.mode = mode;
 		self
 	}
@@ -375,62 +375,75 @@ impl Builder {
 	}
 }
 
-#[cfg(feature = "remote-test")]
 #[cfg(test)]
-mod tests {
-	use super::*;
+mod test_prelude {
+	pub(crate) use super::*;
+	pub(crate) use sp_runtime::testing::{H256 as Hash, Block as RawBlock, ExtrinsicWrapper};
+
+	pub(crate) type Block = RawBlock<ExtrinsicWrapper<Hash>>;
 
-	fn init_logger() {
+	pub(crate) fn init_logger() {
 		let _ = env_logger::Builder::from_default_env()
 			.format_module_path(false)
 			.format_level(true)
 			.try_init();
 	}
+}
 
-	#[async_std::test]
-	async fn can_build_one_pallet() {
+#[cfg(test)]
+mod tests {
+	use super::test_prelude::*;
+
+	#[tokio::test]
+	async fn can_load_state_snapshot() {
 		init_logger();
-		Builder::new()
-			.mode(Mode::Online(OnlineConfig {
-				modules: vec!["Proxy".into()],
-				..Default::default()
+		Builder::<Block>::new()
+			.mode(Mode::Offline(OfflineConfig {
+				state_snapshot: SnapshotConfig { name: "test_data/proxy_test".into(), ..Default::default() },
 			}))
 			.build()
 			.await
-			.unwrap()
+			.expect("Can't read state snapshot file")
 			.execute_with(|| {});
 	}
+}
+
+#[cfg(all(test, feature = "remote-test"))]
+mod remote_tests {
+	use super::test_prelude::*;
 
-	#[async_std::test]
-	async fn can_load_cache() {
+	#[tokio::test]
+	async fn can_build_one_pallet() {
 		init_logger();
-		Builder::new()
-			.mode(Mode::Offline(OfflineConfig {
-				cache: CacheConfig { name: "proxy_test".into(), ..Default::default() },
+		Builder::<Block>::new()
+			.mode(Mode::Online(OnlineConfig {
+				modules: vec!["Proxy".into()],
+				..Default::default()
 			}))
 			.build()
 			.await
-			.unwrap()
+			.expect("Can't reach the remote node. Is it running?")
 			.execute_with(|| {});
 	}
 
-	#[async_std::test]
-	async fn can_create_cache() {
+	#[tokio::test]
+	async fn can_create_state_snapshot() {
 		init_logger();
-		Builder::new()
+		Builder::<Block>::new()
 			.mode(Mode::Online(OnlineConfig {
-				cache: Some(CacheConfig {
-					name: "test_cache_to_remove.bin".into(),
+				state_snapshot: Some(SnapshotConfig {
+					name: "test_snapshot_to_remove.bin".into(),
 					..Default::default()
 				}),
 				..Default::default()
 			}))
 			.build()
 			.await
+			.expect("Can't reach the remote node. Is it running?")
 			.unwrap()
 			.execute_with(|| {});
 
-		let to_delete = std::fs::read_dir(CacheConfig::default().directory)
+		let to_delete = std::fs::read_dir(SnapshotConfig::default().directory)
 			.unwrap()
 			.into_iter()
 			.map(|d| d.unwrap())
@@ -444,9 +457,13 @@ mod tests {
 		}
 	}
 
-	#[async_std::test]
+	#[tokio::test]
 	async fn can_build_all() {
 		init_logger();
-		Builder::new().build().await.unwrap().execute_with(|| {});
+		Builder::<Block>::new()
+			.build()
+			.await
+			.expect("Can't reach the remote node. Is it running?")
+			.execute_with(|| {});
 	}
 }
diff --git a/utils/frame/remote-externalities/test_data/proxy_test b/utils/frame/remote-externalities/test_data/proxy_test
new file mode 100644
index 0000000000000000000000000000000000000000..548ce9cdba4f157e3ff0018d314f3fecfbed9f8f
GIT binary patch
literal 39
vcmZQ+kl?)D>{e98_qB(Af%W>u%I&?*zKN<^Se*X}{?*hKULwHEz`y_iDLxHx

literal 0
HcmV?d00001

diff --git a/utils/frame/try-runtime/cli/src/lib.rs b/utils/frame/try-runtime/cli/src/lib.rs
index 4ab38692a5cf..ff8c5c08ec5b 100644
--- a/utils/frame/try-runtime/cli/src/lib.rs
+++ b/utils/frame/try-runtime/cli/src/lib.rs
@@ -18,7 +18,7 @@
 //! `Structopt`-ready struct for `try-runtime`.
 
 use parity_scale_codec::Decode;
-use std::{fmt::Debug, str::FromStr};
+use std::{fmt::Debug, path::PathBuf, str::FromStr};
 use sc_service::Configuration;
 use sc_cli::{CliConfiguration, ExecutionStrategy, WasmExecutionMethod};
 use sc_executor::NativeExecutor;
@@ -37,10 +37,6 @@ pub struct TryRuntimeCmd {
 	#[structopt(flatten)]
 	pub shared_params: sc_cli::SharedParams,
 
-	/// The state to use to run the migration. Should be a valid FILE or HTTP URI.
-	#[structopt(short, long, default_value = "http://localhost:9933")]
-	pub state: State,
-
 	/// The execution strategy that should be used for benchmarks
 	#[structopt(
 		long = "execution",
@@ -60,32 +56,90 @@ pub struct TryRuntimeCmd {
 		default_value = "Interpreted"
 	)]
 	pub wasm_method: WasmExecutionMethod,
+
+	/// The state to use to run the migration.
+	#[structopt(subcommand)]
+	pub state: State,
 }
 
 /// The state to use for a migration dry-run.
-#[derive(Debug)]
+#[derive(Debug, structopt::StructOpt)]
 pub enum State {
-	/// A snapshot. Inner value is a file path.
-	Snap(String),
+	/// Use a state snapshot as state to run the migration.
+	Snap {
+		#[structopt(flatten)]
+		snapshot_path: SnapshotPath,
+	},
+
+	/// Use a live chain to run the migration.
+	Live {
+		/// An optional state snapshot file to WRITE to. Not written if set to `None`.
+		#[structopt(short, long)]
+		snapshot_path: Option<SnapshotPath>,
 
-	/// A live chain. Inner value is the HTTP uri.
-	Live(String),
+		/// The block hash at which to connect.
+		/// Will be latest finalized head if not provided.
+		#[structopt(short, long, multiple = false, parse(try_from_str = parse_hash))]
+		block_at: Option<String>,
+
+		/// The modules to scrape. If empty, entire chain state will be scraped.
+		#[structopt(short, long, require_delimiter = true)]
+		modules: Option<Vec<String>>,
+
+		/// The url to connect to.
+		#[structopt(default_value = "http://localhost:9933", parse(try_from_str = parse_url))]
+		url: String,
+	},
 }
 
-impl FromStr for State {
+fn parse_hash(block_number: &str) -> Result<String, String> {
+	let block_number = if block_number.starts_with("0x") {
+		&block_number[2..]
+	} else {
+		block_number
+	};
+
+	if let Some(pos) = block_number.chars().position(|c| !c.is_ascii_hexdigit()) {
+		Err(format!(
+			"Expected block hash, found illegal hex character at position: {}",
+			2 + pos,
+		))
+	} else {
+		Ok(block_number.into())
+	}
+}
+
+fn parse_url(s: &str) -> Result<String, &'static str> {
+	if s.starts_with("http://") {
+		// could use Url crate as well, but lets keep it simple for now.
+		Ok(s.to_string())
+	} else {
+		Err("not a valid HTTP url: must start with 'http://'")
+	}
+}
+
+#[derive(Debug, structopt::StructOpt)]
+pub struct SnapshotPath {
+	/// The directory of the state snapshot.
+	#[structopt(short, long, default_value = ".")]
+	directory: String,
+
+	/// The file name of the state snapshot.
+	#[structopt(default_value = "SNAPSHOT")]
+	file_name: String,
+}
+
+impl FromStr for SnapshotPath {
 	type Err = &'static str;
 	fn from_str(s: &str) -> Result<Self, Self::Err> {
-		match s.get(..7) {
-			// could use Url crate as well, but lets keep it simple for now.
-			Some("http://") => Ok(State::Live(s.to_string())),
-			Some("file://") => s
-				.split("//")
-				.collect::<Vec<_>>()
-				.get(1)
-				.map(|s| State::Snap(s.to_string()))
-				.ok_or("invalid file URI"),
-			_ => Err("invalid format. Must be a valid HTTP or File URI"),
-		}
+		let p: PathBuf = s.parse().map_err(|_| "invalid path")?;
+		let parent = p.parent();
+		let file_name = p.file_name();
+
+		file_name.and_then(|file_name| Some(Self {
+			directory: parent.map(|p| p.to_string_lossy().into()).unwrap_or(".".to_string()),
+			file_name: file_name.to_string_lossy().into()
+		})).ok_or("invalid path")
 	}
 }
 
@@ -93,6 +147,10 @@ impl TryRuntimeCmd {
 	pub async fn run<B, ExecDispatch>(&self, config: Configuration) -> sc_cli::Result<()>
 	where
 		B: BlockT,
+		B::Hash: FromStr,
+		<B::Hash as FromStr>::Err: Debug,
+		NumberFor<B>: FromStr,
+		<NumberFor<B> as FromStr>::Err: Debug,
 		ExecDispatch: NativeExecutionDispatch + 'static,
 	{
 		let spec = config.chain_spec;
@@ -121,13 +179,33 @@ impl TryRuntimeCmd {
 		);
 
 		let ext = {
-			use remote_externalities::{Builder, Mode, CacheConfig, OfflineConfig, OnlineConfig};
+			use remote_externalities::{Builder, Mode, SnapshotConfig, OfflineConfig, OnlineConfig};
 			let builder = match &self.state {
-				State::Snap(file_path) => Builder::new().mode(Mode::Offline(OfflineConfig {
-					cache: CacheConfig { name: file_path.into(), ..Default::default() },
-				})),
-				State::Live(http_uri) => Builder::new().mode(Mode::Online(OnlineConfig {
-					uri: http_uri.into(),
+				State::Snap { snapshot_path } => {
+					let SnapshotPath { directory, file_name } = snapshot_path;
+					Builder::<B>::new().mode(Mode::Offline(OfflineConfig {
+						state_snapshot: SnapshotConfig {
+							name: file_name.into(),
+							directory: directory.into(),
+						},
+					}))
+				},
+				State::Live {
+					url,
+					snapshot_path,
+					block_at,
+					modules
+				} => Builder::<B>::new().mode(Mode::Online(OnlineConfig {
+					uri: url.into(),
+					state_snapshot: snapshot_path.as_ref().map(|c| SnapshotConfig {
+						name: c.file_name.clone(),
+						directory: c.directory.clone(),
+					}),
+					modules: modules.clone().unwrap_or_default(),
+					at: match block_at {
+						Some(b) => Some(b.parse().map_err(|e| format!("Could not parse hash: {:?}", e))?),
+						None => None,
+					},
 					..Default::default()
 				})),
 			};

From 36d77bcfa7fa637716907059e112d9de2f59b8e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Tue, 23 Mar 2021 14:48:36 +0100
Subject: [PATCH 0542/1194] Expose block number in seal_random (#8329)

* Allow contract callable functions to specify the module

* Add new version of `seal_random`

* Fix overlong lines

* Fix benchmarking code

* Update README.md

* Replace Module by Pallet
---
 frame/contracts/CHANGELOG.md               |   4 +
 frame/contracts/src/exec.rs                |   8 +-
 frame/contracts/src/wasm/env_def/macros.rs |  42 +++++---
 frame/contracts/src/wasm/env_def/mod.rs    |   4 +-
 frame/contracts/src/wasm/mod.rs            |  91 ++++++++++++++++--
 frame/contracts/src/wasm/prepare.rs        |  52 ++++------
 frame/contracts/src/wasm/runtime.rs        | 107 ++++++++++++++-------
 7 files changed, 213 insertions(+), 95 deletions(-)

diff --git a/frame/contracts/CHANGELOG.md b/frame/contracts/CHANGELOG.md
index ef69e050a2c5..68f35a444d2c 100644
--- a/frame/contracts/CHANGELOG.md
+++ b/frame/contracts/CHANGELOG.md
@@ -20,7 +20,11 @@ In other words: Upgrading this pallet will not break pre-existing contracts.
 
 ### Added
 
+- Add new version of `seal_random` which exposes additional information.
+[1](https://github.com/paritytech/substrate/pull/8329)
+
 - Add `seal_rent_params` contract callable function.
+[1](https://github.com/paritytech/substrate/pull/8231)
 
 ## [v3.0.0] 2021-02-25
 
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index a0752d9e05d6..602a004dacce 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -243,7 +243,7 @@ pub trait Ext: sealing::Sealed {
 	fn tombstone_deposit(&self) -> BalanceOf<Self::T>;
 
 	/// Returns a random number for the current block with the given subject.
-	fn random(&self, subject: &[u8]) -> SeedOf<Self::T>;
+	fn random(&self, subject: &[u8]) -> (SeedOf<Self::T>, BlockNumberOf<Self::T>);
 
 	/// Deposit an event with the given topics.
 	///
@@ -845,10 +845,8 @@ where
 		self.value_transferred
 	}
 
-	fn random(&self, subject: &[u8]) -> SeedOf<T> {
-		// TODO: change API to expose randomness freshness
-		// https://github.com/paritytech/substrate/issues/8297
-		T::Randomness::random(subject).0
+	fn random(&self, subject: &[u8]) -> (SeedOf<T>, BlockNumberOf<T>) {
+		T::Randomness::random(subject)
 	}
 
 	fn now(&self) -> &MomentOf<T> {
diff --git a/frame/contracts/src/wasm/env_def/macros.rs b/frame/contracts/src/wasm/env_def/macros.rs
index 3c10d3225e43..cfb529d2932b 100644
--- a/frame/contracts/src/wasm/env_def/macros.rs
+++ b/frame/contracts/src/wasm/env_def/macros.rs
@@ -43,21 +43,23 @@ macro_rules! gen_signature {
 
 macro_rules! gen_signature_dispatch {
 	(
+		$needle_module:ident,
 		$needle_name:ident,
 		$needle_sig:ident ;
+		$module:ident,
 		$name:ident
-		( $ctx:ident $( , $names:ident : $params:ty )* ) $( -> $returns:ty )* , $($rest:tt)* ) => {
-		if stringify!($name).as_bytes() == $needle_name {
+		( $ctx:ident $( , $names:ident : $params:ty )* ) $( -> $returns:ty )* , $($rest:tt)*
+	) => {
+		if stringify!($module).as_bytes() == $needle_module && stringify!($name).as_bytes() == $needle_name {
 			let signature = gen_signature!( ( $( $params ),* ) $( -> $returns )* );
 			if $needle_sig == &signature {
 				return true;
 			}
 		} else {
-			gen_signature_dispatch!($needle_name, $needle_sig ; $($rest)*);
+			gen_signature_dispatch!($needle_module, $needle_name, $needle_sig ; $($rest)*);
 		}
 	};
-	( $needle_name:ident, $needle_sig:ident ; ) => {
-	};
+	( $needle_module:ident, $needle_name:ident, $needle_sig:ident ; ) => {};
 }
 
 /// Unmarshall arguments and then execute `body` expression and return its result.
@@ -151,10 +153,11 @@ macro_rules! register_func {
 	( $reg_cb:ident, < E: $seal_ty:tt > ; ) => {};
 
 	( $reg_cb:ident, < E: $seal_ty:tt > ;
-		$name:ident ( $ctx:ident $( , $names:ident : $params:ty )* )
+		$module:ident $name:ident ( $ctx:ident $( , $names:ident : $params:ty )* )
 		$( -> $returns:ty )* => $body:tt $($rest:tt)*
 	) => {
 		$reg_cb(
+			stringify!($module).as_bytes(),
 			stringify!($name).as_bytes(),
 			{
 				define_func!(
@@ -176,14 +179,17 @@ macro_rules! register_func {
 /// and reject the code if any imported function has a mismatched signature.
 macro_rules! define_env {
 	( $init_name:ident , < E: $seal_ty:tt > ,
-		$( $name:ident ( $ctx:ident $( , $names:ident : $params:ty )* )
+		$( [$module:ident] $name:ident ( $ctx:ident $( , $names:ident : $params:ty )* )
 			$( -> $returns:ty )* => $body:tt , )*
 	) => {
 		pub struct $init_name;
 
 		impl $crate::wasm::env_def::ImportSatisfyCheck for $init_name {
-			fn can_satisfy(name: &[u8], func_type: &parity_wasm::elements::FunctionType) -> bool {
-				gen_signature_dispatch!( name, func_type ; $( $name ( $ctx $(, $names : $params )* ) $( -> $returns )* , )* );
+			fn can_satisfy(module: &[u8], name: &[u8], func_type: &parity_wasm::elements::FunctionType) -> bool {
+				gen_signature_dispatch!(
+					module, name, func_type ;
+					$( $module, $name ( $ctx $(, $names : $params )* ) $( -> $returns )* , )*
+				);
 
 				return false;
 			}
@@ -195,8 +201,12 @@ macro_rules! define_env {
 				sp_core::crypto::UncheckedFrom<<E::T as frame_system::Config>::Hash> +
 					AsRef<[u8]>
 		{
-			fn impls<F: FnMut(&[u8], $crate::wasm::env_def::HostFunc<E>)>(f: &mut F) {
-				register_func!(f, < E: $seal_ty > ; $( $name ( $ctx $( , $names : $params )* ) $( -> $returns)* => $body )* );
+			fn impls<F: FnMut(&[u8], &[u8], $crate::wasm::env_def::HostFunc<E>)>(f: &mut F) {
+				register_func!(
+					f,
+					< E: $seal_ty > ;
+					$( $module $name ( $ctx $( , $names : $params )* ) $( -> $returns)* => $body )*
+				);
 			}
 		}
 	};
@@ -327,7 +337,7 @@ mod tests {
 		use crate::wasm::env_def::ImportSatisfyCheck;
 
 		define_env!(Env, <E: Ext>,
-			seal_gas( _ctx, amount: u32 ) => {
+			[seal0] seal_gas( _ctx, amount: u32 ) => {
 				let amount = Weight::from(amount);
 				if !amount.is_zero() {
 					Ok(())
@@ -337,7 +347,11 @@ mod tests {
 			},
 		);
 
-		assert!(Env::can_satisfy(b"seal_gas", &FunctionType::new(vec![ValueType::I32], None)));
-		assert!(!Env::can_satisfy(b"not_exists", &FunctionType::new(vec![], None)));
+		assert!(
+			Env::can_satisfy(b"seal0", b"seal_gas",&FunctionType::new(vec![ValueType::I32], None))
+		);
+		assert!(
+			!Env::can_satisfy(b"seal0", b"not_exists", &FunctionType::new(vec![], None))
+		);
 	}
 }
diff --git a/frame/contracts/src/wasm/env_def/mod.rs b/frame/contracts/src/wasm/env_def/mod.rs
index 997ec29e028d..6d33444b04df 100644
--- a/frame/contracts/src/wasm/env_def/mod.rs
+++ b/frame/contracts/src/wasm/env_def/mod.rs
@@ -74,7 +74,7 @@ pub type HostFunc<E> =
 	) -> Result<sp_sandbox::ReturnValue, sp_sandbox::HostError>;
 
 pub trait FunctionImplProvider<E: Ext> {
-	fn impls<F: FnMut(&[u8], HostFunc<E>)>(f: &mut F);
+	fn impls<F: FnMut(&[u8], &[u8], HostFunc<E>)>(f: &mut F);
 }
 
 /// This trait can be used to check whether the host environment can satisfy
@@ -83,5 +83,5 @@ pub trait ImportSatisfyCheck {
 	/// Returns `true` if the host environment contains a function with
 	/// the specified name and its type matches to the given type, or `false`
 	/// otherwise.
-	fn can_satisfy(name: &[u8], func_type: &FunctionType) -> bool;
+	fn can_satisfy(module: &[u8], name: &[u8], func_type: &FunctionType) -> bool;
 }
diff --git a/frame/contracts/src/wasm/mod.rs b/frame/contracts/src/wasm/mod.rs
index fc442473ff0f..f7fde5ba1786 100644
--- a/frame/contracts/src/wasm/mod.rs
+++ b/frame/contracts/src/wasm/mod.rs
@@ -192,8 +192,8 @@ where
 
 		let mut imports = sp_sandbox::EnvironmentDefinitionBuilder::new();
 		imports.add_memory(self::prepare::IMPORT_MODULE_MEMORY, "memory", memory.clone());
-		runtime::Env::impls(&mut |name, func_ptr| {
-			imports.add_host_func(self::prepare::IMPORT_MODULE_FN, name, func_ptr);
+		runtime::Env::impls(&mut |module, name, func_ptr| {
+			imports.add_host_func(module, name, func_ptr);
 		});
 
 		let mut runtime = Runtime::new(
@@ -246,7 +246,7 @@ mod tests {
 	use super::*;
 	use crate::{
 		CodeHash, BalanceOf, Error, Pallet as Contracts,
-		exec::{Ext, StorageKey, AccountIdOf, Executable, RentParams},
+		exec::{Ext, StorageKey, AccountIdOf, Executable, SeedOf, BlockNumberOf, RentParams},
 		gas::GasMeter,
 		tests::{Test, Call, ALICE, BOB},
 	};
@@ -414,8 +414,8 @@ mod tests {
 		fn tombstone_deposit(&self) -> u64 {
 			16
 		}
-		fn random(&self, subject: &[u8]) -> H256 {
-			H256::from_slice(subject)
+		fn random(&self, subject: &[u8]) -> (SeedOf<Self::T>, BlockNumberOf<Self::T>) {
+			(H256::from_slice(subject), 42)
 		}
 		fn deposit_event(&mut self, topics: Vec<H256>, data: Vec<u8>) {
 			self.events.push((topics, data))
@@ -515,7 +515,7 @@ mod tests {
 		fn tombstone_deposit(&self) -> u64 {
 			(**self).tombstone_deposit()
 		}
-		fn random(&self, subject: &[u8]) -> H256 {
+		fn random(&self, subject: &[u8]) -> (SeedOf<Self::T>, BlockNumberOf<Self::T>) {
 			(**self).random(subject)
 		}
 		fn deposit_event(&mut self, topics: Vec<H256>, data: Vec<u8>) {
@@ -1531,6 +1531,85 @@ mod tests {
 		);
 	}
 
+	const CODE_RANDOM_V1: &str = r#"
+(module
+	(import "seal1" "seal_random" (func $seal_random (param i32 i32 i32 i32)))
+	(import "seal0" "seal_return" (func $seal_return (param i32 i32 i32)))
+	(import "env" "memory" (memory 1 1))
+
+	;; [0,128) is reserved for the result of PRNG.
+
+	;; the subject used for the PRNG. [128,160)
+	(data (i32.const 128)
+		"\00\01\02\03\04\05\06\07\08\09\0A\0B\0C\0D\0E\0F"
+		"\00\01\02\03\04\05\06\07\08\09\0A\0B\0C\0D\0E\0F"
+	)
+
+	;; size of our buffer is 128 bytes
+	(data (i32.const 160) "\80")
+
+	(func $assert (param i32)
+		(block $ok
+			(br_if $ok
+				(get_local 0)
+			)
+			(unreachable)
+		)
+	)
+
+	(func (export "call")
+		;; This stores the block random seed in the buffer
+		(call $seal_random
+			(i32.const 128) ;; Pointer in memory to the start of the subject buffer
+			(i32.const 32) ;; The subject buffer's length
+			(i32.const 0) ;; Pointer to the output buffer
+			(i32.const 160) ;; Pointer to the output buffer length
+		)
+
+		;; assert len == 32
+		(call $assert
+			(i32.eq
+				(i32.load (i32.const 160))
+				(i32.const 40)
+			)
+		)
+
+		;; return the random data
+		(call $seal_return
+			(i32.const 0)
+			(i32.const 0)
+			(i32.const 40)
+		)
+	)
+	(func (export "deploy"))
+)
+"#;
+
+	#[test]
+	fn random_v1() {
+		let mut gas_meter = GasMeter::new(GAS_LIMIT);
+
+		let output = execute(
+			CODE_RANDOM_V1,
+			vec![],
+			MockExt::default(),
+			&mut gas_meter,
+		).unwrap();
+
+		// The mock ext just returns the same data that was passed as the subject.
+		assert_eq!(
+			output,
+			ExecReturnValue {
+				flags: ReturnFlags::empty(),
+				data: (
+						hex!("000102030405060708090A0B0C0D0E0F000102030405060708090A0B0C0D0E0F"),
+						42u64,
+					).encode(),
+			},
+		);
+	}
+
+
 	const CODE_DEPOSIT_EVENT: &str = r#"
 (module
 	(import "seal0" "seal_deposit_event" (func $seal_deposit_event (param i32 i32 i32 i32)))
diff --git a/frame/contracts/src/wasm/prepare.rs b/frame/contracts/src/wasm/prepare.rs
index d9c5ed0c204b..4bb70e805e5f 100644
--- a/frame/contracts/src/wasm/prepare.rs
+++ b/frame/contracts/src/wasm/prepare.rs
@@ -28,11 +28,7 @@ use parity_wasm::elements::{self, Internal, External, MemoryType, Type, ValueTyp
 use sp_runtime::traits::Hash;
 use sp_std::prelude::*;
 
-/// Currently, all imported functions must be located inside this module. We might support
-/// additional modules for versioning later.
-pub const IMPORT_MODULE_FN: &str = "seal0";
-
-/// Imported memory must be located inside this module. The reason for that is that current
+/// Imported memory must be located inside this module. The reason for hardcoding is that current
 /// compiler toolchains might not support specifying other modules than "env" for memory imports.
 pub const IMPORT_MODULE_MEMORY: &str = "env";
 
@@ -194,7 +190,7 @@ impl<'a, T: Config> ContractModule<'a, T> {
 		let contract_module = pwasm_utils::inject_gas_counter(
 			self.module,
 			&gas_rules,
-			IMPORT_MODULE_FN
+			"seal0",
 		).map_err(|_| "gas instrumentation failed")?;
 		Ok(ContractModule {
 			module: contract_module,
@@ -325,12 +321,7 @@ impl<'a, T: Config> ContractModule<'a, T> {
 			let type_idx = match import.external() {
 				&External::Table(_) => return Err("Cannot import tables"),
 				&External::Global(_) => return Err("Cannot import globals"),
-				&External::Function(ref type_idx) => {
-					if import.module() != IMPORT_MODULE_FN {
-						return Err("Invalid module for imported function");
-					}
-					type_idx
-				},
+				&External::Function(ref type_idx) => type_idx,
 				&External::Memory(ref memory_type) => {
 					if import.module() != IMPORT_MODULE_MEMORY {
 						return Err("Invalid module for imported memory");
@@ -363,7 +354,9 @@ impl<'a, T: Config> ContractModule<'a, T> {
 			}
 
 			if import_fn_banlist.iter().any(|f| import.field().as_bytes() == *f)
-				|| !C::can_satisfy(import.field().as_bytes(), func_ty)
+				|| !C::can_satisfy(
+					import.module().as_bytes(), import.field().as_bytes(), func_ty,
+				)
 			{
 				return Err("module imports a non-existent function");
 			}
@@ -498,7 +491,7 @@ pub mod benchmarking {
 	use parity_wasm::elements::FunctionType;
 
 	impl ImportSatisfyCheck for () {
-		fn can_satisfy(_name: &[u8], _func_type: &FunctionType) -> bool {
+		fn can_satisfy(_module: &[u8], _name: &[u8], _func_type: &FunctionType) -> bool {
 			true
 		}
 	}
@@ -543,14 +536,17 @@ mod tests {
 		// Define test environment for tests. We need ImportSatisfyCheck
 		// implementation from it. So actual implementations doesn't matter.
 		define_env!(Test, <E: Ext>,
-			panic(_ctx) => { unreachable!(); },
+			[seal0] panic(_ctx) => { unreachable!(); },
 
 			// gas is an implementation defined function and a contract can't import it.
-			gas(_ctx, _amount: u32) => { unreachable!(); },
+			[seal0] gas(_ctx, _amount: u32) => { unreachable!(); },
+
+			[seal0] nop(_ctx, _unused: u64) => { unreachable!(); },
 
-			nop(_ctx, _unused: u64) => { unreachable!(); },
+			// new version of nop with other data type for argumebt
+			[seal1] nop(_ctx, _unused: i32) => { unreachable!(); },
 
-			seal_println(_ctx, _ptr: u32, _len: u32) => { unreachable!(); },
+			[seal0] seal_println(_ctx, _ptr: u32, _len: u32) => { unreachable!(); },
 		);
 	}
 
@@ -904,30 +900,16 @@ mod tests {
 			Err("Invalid module for imported memory")
 		);
 
-		// functions are in "env" and not in "seal0"
-		prepare_test!(function_not_in_env,
-			r#"
-			(module
-				(import "env" "nop" (func (param i64)))
-
-				(func (export "call"))
-				(func (export "deploy"))
-			)
-			"#,
-			Err("Invalid module for imported function")
-		);
-
-		// functions are in "seal0" and not in in some arbitrary module
-		prepare_test!(function_not_arbitrary_module,
+		prepare_test!(function_in_other_module_works,
 			r#"
 			(module
-				(import "any_module" "nop" (func (param i64)))
+				(import "seal1" "nop" (func (param i32)))
 
 				(func (export "call"))
 				(func (export "deploy"))
 			)
 			"#,
-			Err("Invalid module for imported function")
+			Ok(_)
 		);
 
 		// wrong signature
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index 8e3c2244f1ef..802207e4fe8e 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -629,7 +629,7 @@ define_env!(Env, <E: Ext>,
 	// This call is supposed to be called only by instrumentation injected code.
 	//
 	// - amount: How much gas is used.
-	gas(ctx, amount: u32) => {
+	[seal0] gas(ctx, amount: u32) => {
 		ctx.charge_gas(RuntimeToken::MeteringBlock(amount))?;
 		Ok(())
 	},
@@ -649,7 +649,7 @@ define_env!(Env, <E: Ext>,
 	//
 	// - If value length exceeds the configured maximum value length of a storage entry.
 	// - Upon trying to set an empty storage entry (value length is 0).
-	seal_set_storage(ctx, key_ptr: u32, value_ptr: u32, value_len: u32) => {
+	[seal0] seal_set_storage(ctx, key_ptr: u32, value_ptr: u32, value_len: u32) => {
 		ctx.charge_gas(RuntimeToken::SetStorage(value_len))?;
 		if value_len > ctx.ext.max_value_size() {
 			Err(Error::<E::T>::ValueTooLarge)?;
@@ -665,7 +665,7 @@ define_env!(Env, <E: Ext>,
 	// # Parameters
 	//
 	// - `key_ptr`: pointer into the linear memory where the location to clear the value is placed.
-	seal_clear_storage(ctx, key_ptr: u32) => {
+	[seal0] seal_clear_storage(ctx, key_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::ClearStorage)?;
 		let mut key: StorageKey = [0; 32];
 		ctx.read_sandbox_memory_into_buf(key_ptr, &mut key)?;
@@ -684,7 +684,7 @@ define_env!(Env, <E: Ext>,
 	// # Errors
 	//
 	// `ReturnCode::KeyNotFound`
-	seal_get_storage(ctx, key_ptr: u32, out_ptr: u32, out_len_ptr: u32) -> ReturnCode => {
+	[seal0] seal_get_storage(ctx, key_ptr: u32, out_ptr: u32, out_len_ptr: u32) -> ReturnCode => {
 		ctx.charge_gas(RuntimeToken::GetStorageBase)?;
 		let mut key: StorageKey = [0; 32];
 		ctx.read_sandbox_memory_into_buf(key_ptr, &mut key)?;
@@ -713,7 +713,7 @@ define_env!(Env, <E: Ext>,
 	//
 	// `ReturnCode::BelowSubsistenceThreshold`
 	// `ReturnCode::TransferFailed`
-	seal_transfer(
+	[seal0] seal_transfer(
 		ctx,
 		account_ptr: u32,
 		account_len: u32,
@@ -767,7 +767,7 @@ define_env!(Env, <E: Ext>,
 	// `ReturnCode::BelowSubsistenceThreshold`
 	// `ReturnCode::TransferFailed`
 	// `ReturnCode::NotCallable`
-	seal_call(
+	[seal0] seal_call(
 		ctx,
 		callee_ptr: u32,
 		callee_len: u32,
@@ -868,7 +868,7 @@ define_env!(Env, <E: Ext>,
 	// `ReturnCode::TransferFailed`
 	// `ReturnCode::NewContractNotFunded`
 	// `ReturnCode::CodeNotFound`
-	seal_instantiate(
+	[seal0] seal_instantiate(
 		ctx,
 		code_hash_ptr: u32,
 		code_hash_len: u32,
@@ -950,7 +950,7 @@ define_env!(Env, <E: Ext>,
 	// - The contract is live i.e is already on the call stack.
 	// - Failed to send the balance to the beneficiary.
 	// - The deletion queue is full.
-	seal_terminate(
+	[seal0] seal_terminate(
 		ctx,
 		beneficiary_ptr: u32,
 		beneficiary_len: u32
@@ -981,7 +981,7 @@ define_env!(Env, <E: Ext>,
 	// # Note
 	//
 	// This function can only be called once. Calling it multiple times will trigger a trap.
-	seal_input(ctx, out_ptr: u32, out_len_ptr: u32) => {
+	[seal0] seal_input(ctx, out_ptr: u32, out_len_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::InputBase)?;
 		if let Some(input) = ctx.input_data.take() {
 			ctx.write_sandbox_output(out_ptr, out_len_ptr, &input, false, |len| {
@@ -1010,7 +1010,7 @@ define_env!(Env, <E: Ext>,
 	// --- msb ---
 	//
 	// Using a reserved bit triggers a trap.
-	seal_return(ctx, flags: u32, data_ptr: u32, data_len: u32) => {
+	[seal0] seal_return(ctx, flags: u32, data_ptr: u32, data_len: u32) => {
 		ctx.charge_gas(RuntimeToken::Return(data_len))?;
 		Err(TrapReason::Return(ReturnData {
 			flags,
@@ -1028,7 +1028,7 @@ define_env!(Env, <E: Ext>,
 	// If this is a top-level call (i.e. initiated by an extrinsic) the origin address of the
 	// extrinsic will be returned. Otherwise, if this call is initiated by another contract then the
 	// address of the contract will be returned. The value is encoded as T::AccountId.
-	seal_caller(ctx, out_ptr: u32, out_len_ptr: u32) => {
+	[seal0] seal_caller(ctx, out_ptr: u32, out_len_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::Caller)?;
 		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.ext.caller().encode(), false, already_charged
@@ -1041,7 +1041,7 @@ define_env!(Env, <E: Ext>,
 	// `out_len_ptr` must point to a u32 value that describes the available space at
 	// `out_ptr`. This call overwrites it with the size of the value. If the available
 	// space at `out_ptr` is less than the size of the value a trap is triggered.
-	seal_address(ctx, out_ptr: u32, out_len_ptr: u32) => {
+	[seal0] seal_address(ctx, out_ptr: u32, out_len_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::Address)?;
 		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.ext.address().encode(), false, already_charged
@@ -1061,7 +1061,7 @@ define_env!(Env, <E: Ext>,
 	//
 	// It is recommended to avoid specifying very small values for `gas` as the prices for a single
 	// gas can be smaller than one.
-	seal_weight_to_fee(ctx, gas: u64, out_ptr: u32, out_len_ptr: u32) => {
+	[seal0] seal_weight_to_fee(ctx, gas: u64, out_ptr: u32, out_len_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::WeightToFee)?;
 		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.ext.get_weight_price(gas).encode(), false, already_charged
@@ -1076,7 +1076,7 @@ define_env!(Env, <E: Ext>,
 	// space at `out_ptr` is less than the size of the value a trap is triggered.
 	//
 	// The data is encoded as Gas.
-	seal_gas_left(ctx, out_ptr: u32, out_len_ptr: u32) => {
+	[seal0] seal_gas_left(ctx, out_ptr: u32, out_len_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::GasLeft)?;
 		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.gas_meter.gas_left().encode(), false, already_charged
@@ -1091,7 +1091,7 @@ define_env!(Env, <E: Ext>,
 	// space at `out_ptr` is less than the size of the value a trap is triggered.
 	//
 	// The data is encoded as T::Balance.
-	seal_balance(ctx, out_ptr: u32, out_len_ptr: u32) => {
+	[seal0] seal_balance(ctx, out_ptr: u32, out_len_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::Balance)?;
 		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.ext.balance().encode(), false, already_charged
@@ -1106,7 +1106,7 @@ define_env!(Env, <E: Ext>,
 	// space at `out_ptr` is less than the size of the value a trap is triggered.
 	//
 	// The data is encoded as T::Balance.
-	seal_value_transferred(ctx, out_ptr: u32, out_len_ptr: u32) => {
+	[seal0] seal_value_transferred(ctx, out_ptr: u32, out_len_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::ValueTransferred)?;
 		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.ext.value_transferred().encode(), false, already_charged
@@ -1121,7 +1121,43 @@ define_env!(Env, <E: Ext>,
 	// space at `out_ptr` is less than the size of the value a trap is triggered.
 	//
 	// The data is encoded as T::Hash.
-	seal_random(ctx, subject_ptr: u32, subject_len: u32, out_ptr: u32, out_len_ptr: u32) => {
+	//
+	// # Deprecation
+	//
+	// This function is deprecated. Users should migrate to the version in the "seal1" module.
+	[seal0] seal_random(ctx, subject_ptr: u32, subject_len: u32, out_ptr: u32, out_len_ptr: u32) => {
+		ctx.charge_gas(RuntimeToken::Random)?;
+		if subject_len > ctx.ext.schedule().limits.subject_len {
+			Err(Error::<E::T>::RandomSubjectTooLong)?;
+		}
+		let subject_buf = ctx.read_sandbox_memory(subject_ptr, subject_len)?;
+		Ok(ctx.write_sandbox_output(
+			out_ptr, out_len_ptr, &ctx.ext.random(&subject_buf).0.encode(), false, already_charged
+		)?)
+	},
+
+	// Stores a random number for the current block and the given subject into the supplied buffer.
+	//
+	// The value is stored to linear memory at the address pointed to by `out_ptr`.
+	// `out_len_ptr` must point to a u32 value that describes the available space at
+	// `out_ptr`. This call overwrites it with the size of the value. If the available
+	// space at `out_ptr` is less than the size of the value a trap is triggered.
+	//
+	// The data is encoded as (T::Hash, T::BlockNumber).
+	//
+	// # Changes from v0
+	//
+	// In addition to the seed it returns the block number since which it was determinable
+	// by chain observers.
+	//
+	// # Note
+	//
+	// The returned seed should only be used to distinguish commitments made before
+	// the returned block number. If the block number is too early (i.e. commitments were
+	// made afterwards), then ensure no further commitments may be made and repeatedly
+	// call this on later blocks until the block number returned is later than the latest
+	// commitment.
+	[seal1] seal_random(ctx, subject_ptr: u32, subject_len: u32, out_ptr: u32, out_len_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::Random)?;
 		if subject_len > ctx.ext.schedule().limits.subject_len {
 			Err(Error::<E::T>::RandomSubjectTooLong)?;
@@ -1138,7 +1174,7 @@ define_env!(Env, <E: Ext>,
 	// `out_len_ptr` must point to a u32 value that describes the available space at
 	// `out_ptr`. This call overwrites it with the size of the value. If the available
 	// space at `out_ptr` is less than the size of the value a trap is triggered.
-	seal_now(ctx, out_ptr: u32, out_len_ptr: u32) => {
+	[seal0] seal_now(ctx, out_ptr: u32, out_len_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::Now)?;
 		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.ext.now().encode(), false, already_charged
@@ -1148,7 +1184,7 @@ define_env!(Env, <E: Ext>,
 	// Stores the minimum balance (a.k.a. existential deposit) into the supplied buffer.
 	//
 	// The data is encoded as T::Balance.
-	seal_minimum_balance(ctx, out_ptr: u32, out_len_ptr: u32) => {
+	[seal0] seal_minimum_balance(ctx, out_ptr: u32, out_len_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::MinimumBalance)?;
 		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.ext.minimum_balance().encode(), false, already_charged
@@ -1170,7 +1206,7 @@ define_env!(Env, <E: Ext>,
 	// a contract to leave a tombstone the balance of the contract must not go
 	// below the sum of existential deposit and the tombstone deposit. The sum
 	// is commonly referred as subsistence threshold in code.
-	seal_tombstone_deposit(ctx, out_ptr: u32, out_len_ptr: u32) => {
+	[seal0] seal_tombstone_deposit(ctx, out_ptr: u32, out_len_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::TombstoneDeposit)?;
 		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.ext.tombstone_deposit().encode(), false, already_charged
@@ -1208,7 +1244,7 @@ define_env!(Env, <E: Ext>,
 	// - Tombstone hashes do not match.
 	// - The calling contract is already present on the call stack.
 	// - The supplied code_hash does not exist on-chain.
-	seal_restore_to(
+	[seal0] seal_restore_to(
 		ctx,
 		dest_ptr: u32,
 		dest_len: u32,
@@ -1279,8 +1315,13 @@ define_env!(Env, <E: Ext>,
 	// - topics_len - the length of the topics buffer. Pass 0 if you want to pass an empty vector.
 	// - data_ptr - a pointer to a raw data buffer which will saved along the event.
 	// - data_len - the length of the data buffer.
-	seal_deposit_event(ctx, topics_ptr: u32, topics_len: u32, data_ptr: u32, data_len: u32) => {
-
+	[seal0] seal_deposit_event(
+		ctx,
+		topics_ptr: u32,
+		topics_len: u32,
+		data_ptr: u32,
+		data_len: u32
+	) => {
 		fn has_duplicates<T: Ord>(items: &mut Vec<T>) -> bool {
 			// # Warning
 			//
@@ -1336,7 +1377,7 @@ define_env!(Env, <E: Ext>,
 	// - value_ptr: a pointer to the buffer with value, how much to allow for rent
 	//   Should be decodable as a `T::Balance`. Traps otherwise.
 	// - value_len: length of the value buffer.
-	seal_set_rent_allowance(ctx, value_ptr: u32, value_len: u32) => {
+	[seal0] seal_set_rent_allowance(ctx, value_ptr: u32, value_len: u32) => {
 		ctx.charge_gas(RuntimeToken::SetRentAllowance)?;
 		let value: BalanceOf<<E as Ext>::T> =
 			ctx.read_sandbox_memory_as(value_ptr, value_len)?;
@@ -1353,7 +1394,7 @@ define_env!(Env, <E: Ext>,
 	// space at `out_ptr` is less than the size of the value a trap is triggered.
 	//
 	// The data is encoded as T::Balance.
-	seal_rent_allowance(ctx, out_ptr: u32, out_len_ptr: u32) => {
+	[seal0] seal_rent_allowance(ctx, out_ptr: u32, out_len_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::RentAllowance)?;
 		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.ext.rent_allowance().encode(), false, already_charged
@@ -1363,7 +1404,7 @@ define_env!(Env, <E: Ext>,
 	// Prints utf8 encoded string from the data buffer.
 	// Only available on `--dev` chains.
 	// This function may be removed at any time, superseded by a more general contract debugging feature.
-	seal_println(ctx, str_ptr: u32, str_len: u32) => {
+	[seal0] seal_println(ctx, str_ptr: u32, str_len: u32) => {
 		let data = ctx.read_sandbox_memory(str_ptr, str_len)?;
 		if let Ok(utf8) = core::str::from_utf8(&data) {
 			log::info!(target: "runtime::contracts", "seal_println: {}", utf8);
@@ -1377,7 +1418,7 @@ define_env!(Env, <E: Ext>,
 	// `out_len_ptr` must point to a u32 value that describes the available space at
 	// `out_ptr`. This call overwrites it with the size of the value. If the available
 	// space at `out_ptr` is less than the size of the value a trap is triggered.
-	seal_block_number(ctx, out_ptr: u32, out_len_ptr: u32) => {
+	[seal0] seal_block_number(ctx, out_ptr: u32, out_len_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::BlockNumber)?;
 		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.ext.block_number().encode(), false, already_charged
@@ -1404,7 +1445,7 @@ define_env!(Env, <E: Ext>,
 	// - `output_ptr`: the pointer into the linear memory where the output
 	//                 data is placed. The function will write the result
 	//                 directly into this buffer.
-	seal_hash_sha2_256(ctx, input_ptr: u32, input_len: u32, output_ptr: u32) => {
+	[seal0] seal_hash_sha2_256(ctx, input_ptr: u32, input_len: u32, output_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::HashSha256(input_len))?;
 		Ok(ctx.compute_hash_on_intermediate_buffer(sha2_256, input_ptr, input_len, output_ptr)?)
 	},
@@ -1429,7 +1470,7 @@ define_env!(Env, <E: Ext>,
 	// - `output_ptr`: the pointer into the linear memory where the output
 	//                 data is placed. The function will write the result
 	//                 directly into this buffer.
-	seal_hash_keccak_256(ctx, input_ptr: u32, input_len: u32, output_ptr: u32) => {
+	[seal0] seal_hash_keccak_256(ctx, input_ptr: u32, input_len: u32, output_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::HashKeccak256(input_len))?;
 		Ok(ctx.compute_hash_on_intermediate_buffer(keccak_256, input_ptr, input_len, output_ptr)?)
 	},
@@ -1454,7 +1495,7 @@ define_env!(Env, <E: Ext>,
 	// - `output_ptr`: the pointer into the linear memory where the output
 	//                 data is placed. The function will write the result
 	//                 directly into this buffer.
-	seal_hash_blake2_256(ctx, input_ptr: u32, input_len: u32, output_ptr: u32) => {
+	[seal0] seal_hash_blake2_256(ctx, input_ptr: u32, input_len: u32, output_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::HashBlake256(input_len))?;
 		Ok(ctx.compute_hash_on_intermediate_buffer(blake2_256, input_ptr, input_len, output_ptr)?)
 	},
@@ -1479,7 +1520,7 @@ define_env!(Env, <E: Ext>,
 	// - `output_ptr`: the pointer into the linear memory where the output
 	//                 data is placed. The function will write the result
 	//                 directly into this buffer.
-	seal_hash_blake2_128(ctx, input_ptr: u32, input_len: u32, output_ptr: u32) => {
+	[seal0] seal_hash_blake2_128(ctx, input_ptr: u32, input_len: u32, output_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::HashBlake128(input_len))?;
 		Ok(ctx.compute_hash_on_intermediate_buffer(blake2_128, input_ptr, input_len, output_ptr)?)
 	},
@@ -1495,7 +1536,7 @@ define_env!(Env, <E: Ext>,
 	//
 	// If no chain extension exists the contract will trap with the `NoChainExtension`
 	// module error.
-	seal_call_chain_extension(
+	[seal0] seal_call_chain_extension(
 		ctx,
 		func_id: u32,
 		input_ptr: u32,
@@ -1531,7 +1572,7 @@ define_env!(Env, <E: Ext>,
 	// The returned information was collected and cached when the current contract call
 	// started execution. Any change to those values that happens due to actions of the
 	// current call or contracts that are called by this contract are not considered.
-	seal_rent_params(ctx, out_ptr: u32, out_len_ptr: u32) => {
+	[seal0] seal_rent_params(ctx, out_ptr: u32, out_len_ptr: u32) => {
 		ctx.charge_gas(RuntimeToken::RentParams)?;
 		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.ext.rent_params().encode(), false, already_charged

From 87cdfd3a8dbd46678197d9af37d2d46d556ad333 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Tue, 23 Mar 2021 15:53:46 +0100
Subject: [PATCH 0543/1194] Add tracing logic in pallet macro for hooks and
 dispatchables (#8305)

* span in hooks

* add span for dispatchable

* Update frame/support/src/lib.rs

* Update frame/support/src/lib.rs

Co-authored-by: David <dvdplm@gmail.com>

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: David <dvdplm@gmail.com>
---
 frame/support/procedural/src/pallet/expand/call.rs  |  8 ++++++--
 frame/support/procedural/src/pallet/expand/hooks.rs | 10 ++++++++++
 frame/support/src/lib.rs                            |  3 +++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/frame/support/procedural/src/pallet/expand/call.rs b/frame/support/procedural/src/pallet/expand/call.rs
index 137e055405a3..295cf14d37f0 100644
--- a/frame/support/procedural/src/pallet/expand/call.rs
+++ b/frame/support/procedural/src/pallet/expand/call.rs
@@ -162,9 +162,13 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
 			) -> #frame_support::dispatch::DispatchResultWithPostInfo {
 				match self {
 					#(
-						Self::#fn_name( #( #args_name, )* ) =>
+						Self::#fn_name( #( #args_name, )* ) => {
+							#frame_support::sp_tracing::enter_span!(
+								#frame_support::sp_tracing::trace_span!(stringify!(#fn_name))
+							);
 							<#pallet_ident<#type_use_gen>>::#fn_name(origin, #( #args_name, )* )
-								.map(Into::into).map_err(Into::into),
+								.map(Into::into).map_err(Into::into)
+						},
 					)*
 					Self::__Ignore(_, _) => {
 						let _ = origin; // Use origin for empty Call enum
diff --git a/frame/support/procedural/src/pallet/expand/hooks.rs b/frame/support/procedural/src/pallet/expand/hooks.rs
index 3976f2c602dd..2d12d5ecf9d4 100644
--- a/frame/support/procedural/src/pallet/expand/hooks.rs
+++ b/frame/support/procedural/src/pallet/expand/hooks.rs
@@ -55,6 +55,9 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 			for #pallet_ident<#type_use_gen> #where_clause
 		{
 			fn on_finalize(n: <T as #frame_system::Config>::BlockNumber) {
+				#frame_support::sp_tracing::enter_span!(
+					#frame_support::sp_tracing::trace_span!("on_finalize")
+				);
 				<
 					Self as #frame_support::traits::Hooks<
 						<T as #frame_system::Config>::BlockNumber
@@ -86,6 +89,9 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 			fn on_initialize(
 				n: <T as #frame_system::Config>::BlockNumber
 			) -> #frame_support::weights::Weight {
+				#frame_support::sp_tracing::enter_span!(
+					#frame_support::sp_tracing::trace_span!("on_initialize")
+				);
 				<
 					Self as #frame_support::traits::Hooks<
 						<T as #frame_system::Config>::BlockNumber
@@ -99,6 +105,10 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 			for #pallet_ident<#type_use_gen> #where_clause
 		{
 			fn on_runtime_upgrade() -> #frame_support::weights::Weight {
+				#frame_support::sp_tracing::enter_span!(
+					#frame_support::sp_tracing::trace_span!("on_runtime_update")
+				);
+
 				// log info about the upgrade.
 				let new_storage_version = #frame_support::crate_to_pallet_version!();
 				let pallet_name = <
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index d0d034a55f50..220e7a06bdf3 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -1229,6 +1229,9 @@ pub mod pallet_prelude {
 /// NOTE: OnRuntimeUpgrade is implemented with `Hooks::on_runtime_upgrade` and some additional
 /// logic. E.g. logic to write pallet version into storage.
 ///
+/// NOTE: The macro also adds some tracing logic when implementing the above traits. The following
+///  hooks emit traces: `on_initialize`, `on_finalize` and `on_runtime_upgrade`.
+///
 /// # Call: `#[pallet::call]` mandatory
 ///
 /// Implementation of pallet dispatchables.

From 4df3c9ac85d6a4e2a8e6a5553de416eab0853c02 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Tue, 23 Mar 2021 17:40:52 +0100
Subject: [PATCH 0544/1194] improve doc (#8437)

---
 frame/aura/src/lib.rs                       |  4 +-
 frame/contracts/src/lib.rs                  |  6 +--
 frame/democracy/src/lib.rs                  |  4 +-
 frame/elections-phragmen/src/lib.rs         |  6 +--
 frame/identity/src/lib.rs                   |  4 +-
 frame/im-online/src/lib.rs                  |  6 +--
 frame/multisig/src/lib.rs                   |  4 +-
 frame/nicks/src/lib.rs                      |  4 +-
 frame/proxy/src/lib.rs                      | 13 +----
 frame/randomness-collective-flip/src/lib.rs |  2 +-
 frame/recovery/src/lib.rs                   |  4 +-
 frame/scheduler/src/lib.rs                  |  6 +--
 frame/scored-pool/src/lib.rs                |  6 +--
 frame/session/src/lib.rs                    |  6 +--
 frame/society/src/lib.rs                    |  4 +-
 frame/staking/src/lib.rs                    | 58 ++++++++++-----------
 frame/sudo/src/lib.rs                       |  6 +--
 frame/timestamp/src/lib.rs                  |  6 +--
 frame/treasury/src/lib.rs                   |  6 +--
 frame/utility/src/lib.rs                    |  7 +--
 frame/vesting/src/lib.rs                    |  7 +--
 21 files changed, 75 insertions(+), 94 deletions(-)

diff --git a/frame/aura/src/lib.rs b/frame/aura/src/lib.rs
index 40d17115412f..a9b91737235a 100644
--- a/frame/aura/src/lib.rs
+++ b/frame/aura/src/lib.rs
@@ -17,8 +17,8 @@
 
 //! # Aura Module
 //!
-//! - [`aura::Config`](./trait.Config.html)
-//! - [`Module`](./struct.Module.html)
+//! - [`Config`]
+//! - [`Pallet`]
 //!
 //! ## Overview
 //!
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index 880bf0b89820..496d5f5d080b 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -19,8 +19,8 @@
 //!
 //! The Contract module provides functionality for the runtime to deploy and execute WebAssembly smart-contracts.
 //!
-//! - [`contract::Config`](./trait.Config.html)
-//! - [`Call`](./enum.Call.html)
+//! - [`Config`]
+//! - [`Call`]
 //!
 //! ## Overview
 //!
@@ -336,7 +336,7 @@ pub mod pallet {
 		/// * `gas_limit`: The gas limit enforced when executing the constructor.
 		/// * `code`: The contract code to deploy in raw bytes.
 		/// * `data`: The input data to pass to the contract constructor.
-		/// * `salt`: Used for the address derivation. See [`Self::contract_address`].
+		/// * `salt`: Used for the address derivation. See [`Pallet::contract_address`].
 		///
 		/// Instantiation is executed as follows:
 		///
diff --git a/frame/democracy/src/lib.rs b/frame/democracy/src/lib.rs
index 8790e0e487bb..37a2fd5ce7c4 100644
--- a/frame/democracy/src/lib.rs
+++ b/frame/democracy/src/lib.rs
@@ -17,8 +17,8 @@
 
 //! # Democracy Pallet
 //!
-//! - [`democracy::Config`](./trait.Config.html)
-//! - [`Call`](./enum.Call.html)
+//! - [`Config`]
+//! - [`Call`]
 //!
 //! ## Overview
 //!
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index 26b9c9190a96..5031cb57e642 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -92,9 +92,9 @@
 //!
 //! ### Module Information
 //!
-//! - [`election_sp_phragmen::Config`](./trait.Config.html)
-//! - [`Call`](./enum.Call.html)
-//! - [`Module`](./struct.Module.html)
+//! - [`Config`]
+//! - [`Call`]
+//! - [`Module`]
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
diff --git a/frame/identity/src/lib.rs b/frame/identity/src/lib.rs
index fed32afa2e62..6d6e3170d51b 100644
--- a/frame/identity/src/lib.rs
+++ b/frame/identity/src/lib.rs
@@ -17,8 +17,8 @@
 
 //! # Identity Module
 //!
-//! - [`identity::Config`](./trait.Config.html)
-//! - [`Call`](./enum.Call.html)
+//! - [`Config`]
+//! - [`Call`]
 //!
 //! ## Overview
 //!
diff --git a/frame/im-online/src/lib.rs b/frame/im-online/src/lib.rs
index ec8c6218b3f1..d8f3fdc854b1 100644
--- a/frame/im-online/src/lib.rs
+++ b/frame/im-online/src/lib.rs
@@ -30,9 +30,9 @@
 //! as the [NetworkState](../../client/offchain/struct.NetworkState.html).
 //! It is submitted as an Unsigned Transaction via off-chain workers.
 //!
-//! - [`im_online::Config`](./trait.Config.html)
-//! - [`Call`](./enum.Call.html)
-//! - [`Module`](./struct.Module.html)
+//! - [`Config`]
+//! - [`Call`]
+//! - [`Module`]
 //!
 //! ## Interface
 //!
diff --git a/frame/multisig/src/lib.rs b/frame/multisig/src/lib.rs
index 3b434ec48404..1d3a83ccb687 100644
--- a/frame/multisig/src/lib.rs
+++ b/frame/multisig/src/lib.rs
@@ -18,8 +18,8 @@
 //! # Multisig Module
 //! A module for doing multisig dispatch.
 //!
-//! - [`multisig::Config`](./trait.Config.html)
-//! - [`Call`](./enum.Call.html)
+//! - [`Config`]
+//! - [`Call`]
 //!
 //! ## Overview
 //!
diff --git a/frame/nicks/src/lib.rs b/frame/nicks/src/lib.rs
index 6dee9ba79a60..02eb488c1b27 100644
--- a/frame/nicks/src/lib.rs
+++ b/frame/nicks/src/lib.rs
@@ -17,8 +17,8 @@
 
 //! # Nicks Module
 //!
-//! - [`nicks::Config`](./trait.Config.html)
-//! - [`Call`](./enum.Call.html)
+//! - [`Config`]
+//! - [`Call`]
 //!
 //! ## Overview
 //!
diff --git a/frame/proxy/src/lib.rs b/frame/proxy/src/lib.rs
index 5600fb6ea806..5e63e0cd8d3d 100644
--- a/frame/proxy/src/lib.rs
+++ b/frame/proxy/src/lib.rs
@@ -23,17 +23,8 @@
 //! wish to execute some duration prior to execution happens. In this case, the target account may
 //! reject the announcement and in doing so, veto the execution.
 //!
-//! - [`proxy::Config`](./trait.Config.html)
-//! - [`Call`](./enum.Call.html)
-//!
-//! ## Overview
-//!
-//! ## Interface
-//!
-//! ### Dispatchable Functions
-//!
-//! [`Call`]: ./enum.Call.html
-//! [`Config`]: ./trait.Config.html
+//! - [`Config`]
+//! - [`Call`]
 
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
diff --git a/frame/randomness-collective-flip/src/lib.rs b/frame/randomness-collective-flip/src/lib.rs
index 3e37a03b2e2f..5ef76a33c21f 100644
--- a/frame/randomness-collective-flip/src/lib.rs
+++ b/frame/randomness-collective-flip/src/lib.rs
@@ -25,7 +25,7 @@
 //!
 //! ## Public Functions
 //!
-//! See the [`Module`](./struct.Module.html) struct for details of publicly available functions.
+//! See the [`Module`] struct for details of publicly available functions.
 //!
 //! ## Usage
 //!
diff --git a/frame/recovery/src/lib.rs b/frame/recovery/src/lib.rs
index 20e984c98d0f..cb991e64945a 100644
--- a/frame/recovery/src/lib.rs
+++ b/frame/recovery/src/lib.rs
@@ -17,8 +17,8 @@
 
 //! # Recovery Pallet
 //!
-//! - [`recovery::Config`](./trait.Config.html)
-//! - [`Call`](./enum.Call.html)
+//! - [`Config`]
+//! - [`Call`]
 //!
 //! ## Overview
 //!
diff --git a/frame/scheduler/src/lib.rs b/frame/scheduler/src/lib.rs
index abce8504e5a5..9848c9853d0b 100644
--- a/frame/scheduler/src/lib.rs
+++ b/frame/scheduler/src/lib.rs
@@ -18,9 +18,9 @@
 //! # Scheduler
 //! A module for scheduling dispatches.
 //!
-//! - [`scheduler::Config`](./trait.Config.html)
-//! - [`Call`](./enum.Call.html)
-//! - [`Module`](./struct.Module.html)
+//! - [`Config`]
+//! - [`Call`]
+//! - [`Module`]
 //!
 //! ## Overview
 //!
diff --git a/frame/scored-pool/src/lib.rs b/frame/scored-pool/src/lib.rs
index ce2279b15005..da26872a0071 100644
--- a/frame/scored-pool/src/lib.rs
+++ b/frame/scored-pool/src/lib.rs
@@ -37,9 +37,9 @@
 //! from the `Pool` and `Members`; the entity is immediately replaced
 //! by the next highest scoring candidate in the pool, if available.
 //!
-//! - [`scored_pool::Config`](./trait.Config.html)
-//! - [`Call`](./enum.Call.html)
-//! - [`Module`](./struct.Module.html)
+//! - [`Config`]
+//! - [`Call`]
+//! - [`Module`]
 //!
 //! ## Interface
 //!
diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs
index d9d5c81e8a50..e7b16808f723 100644
--- a/frame/session/src/lib.rs
+++ b/frame/session/src/lib.rs
@@ -20,9 +20,9 @@
 //! The Session module allows validators to manage their session keys, provides a function for
 //! changing the session length, and handles session rotation.
 //!
-//! - [`session::Config`](./trait.Config.html)
-//! - [`Call`](./enum.Call.html)
-//! - [`Module`](./struct.Module.html)
+//! - [`Config`]
+//! - [`Call`]
+//! - [`Module`]
 //!
 //! ## Overview
 //!
diff --git a/frame/society/src/lib.rs b/frame/society/src/lib.rs
index 3546ea68d4dc..a5ba2124c882 100644
--- a/frame/society/src/lib.rs
+++ b/frame/society/src/lib.rs
@@ -17,8 +17,8 @@
 
 //! # Society Module
 //!
-//! - [`society::Config`](./trait.Config.html)
-//! - [`Call`](./enum.Call.html)
+//! - [`Config`]
+//! - [`Call`]
 //!
 //! ## Overview
 //!
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 77ef928b92aa..fe1738ca3331 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -19,9 +19,9 @@
 //!
 //! The Staking module is used to manage funds at stake by network maintainers.
 //!
-//! - [`staking::Config`](./trait.Config.html)
-//! - [`Call`](./enum.Call.html)
-//! - [`Module`](./struct.Module.html)
+//! - [`Config`]
+//! - [`Call`]
+//! - [`Module`]
 //!
 //! ## Overview
 //!
@@ -65,16 +65,16 @@
 //! is paired with an active **controller** account, which issues instructions on how they shall be
 //! used.
 //!
-//! An account pair can become bonded using the [`bond`](./enum.Call.html#variant.bond) call.
+//! An account pair can become bonded using the [`bond`](Call::bond) call.
 //!
 //! Stash accounts can change their associated controller using the
-//! [`set_controller`](./enum.Call.html#variant.set_controller) call.
+//! [`set_controller`](Call::set_controller) call.
 //!
 //! There are three possible roles that any staked account pair can be in: `Validator`, `Nominator`
-//! and `Idle` (defined in [`StakerStatus`](./enum.StakerStatus.html)). There are three
+//! and `Idle` (defined in [`StakerStatus`]). There are three
 //! corresponding instructions to change between roles, namely:
-//! [`validate`](./enum.Call.html#variant.validate),
-//! [`nominate`](./enum.Call.html#variant.nominate), and [`chill`](./enum.Call.html#variant.chill).
+//! [`validate`](Call::validate),
+//! [`nominate`](Call::nominate), and [`chill`](Call::chill).
 //!
 //! #### Validating
 //!
@@ -86,7 +86,7 @@
 //! by nominators and their votes.
 //!
 //! An account can become a validator candidate via the
-//! [`validate`](./enum.Call.html#variant.validate) call.
+//! [`validate`](Call::validate) call.
 //!
 //! #### Nomination
 //!
@@ -98,7 +98,7 @@
 //! the misbehaving/offline validators as much as possible, simply because the nominators will also
 //! lose funds if they vote poorly.
 //!
-//! An account can become a nominator via the [`nominate`](enum.Call.html#variant.nominate) call.
+//! An account can become a nominator via the [`nominate`](Call::nominate) call.
 //!
 //! #### Rewards and Slash
 //!
@@ -127,7 +127,7 @@
 //! This means that if they are a nominator, they will not be considered as voters anymore and if
 //! they are validators, they will no longer be a candidate for the next election.
 //!
-//! An account can step back via the [`chill`](enum.Call.html#variant.chill) call.
+//! An account can step back via the [`chill`](Call::chill) call.
 //!
 //! ### Session managing
 //!
@@ -175,7 +175,7 @@
 //! ### Era payout
 //!
 //! The era payout is computed using yearly inflation curve defined at
-//! [`T::RewardCurve`](./trait.Config.html#associatedtype.RewardCurve) as such:
+//! [`Config::EraPayout`] as such:
 //!
 //! ```nocompile
 //! staker_payout = yearly_inflation(npos_token_staked / total_tokens) * total_tokens / era_per_year
@@ -186,7 +186,7 @@
 //! remaining_payout = max_yearly_inflation * total_tokens / era_per_year - staker_payout
 //! ```
 //! The remaining reward is send to the configurable end-point
-//! [`T::RewardRemainder`](./trait.Config.html#associatedtype.RewardRemainder).
+//! [`Config::RewardRemainder`].
 //!
 //! ### Reward Calculation
 //!
@@ -198,29 +198,28 @@
 //!
 //! Total reward is split among validators and their nominators depending on the number of points
 //! they received during the era. Points are added to a validator using
-//! [`reward_by_ids`](./enum.Call.html#variant.reward_by_ids) or
-//! [`reward_by_indices`](./enum.Call.html#variant.reward_by_indices).
+//! [`reward_by_ids`](Module::reward_by_ids).
 //!
-//! [`Module`](./struct.Module.html) implements
-//! [`pallet_authorship::EventHandler`](../pallet_authorship/trait.EventHandler.html) to add reward
+//! [`Module`] implements
+//! [`pallet_authorship::EventHandler`] to add reward
 //! points to block producer and block producer of referenced uncles.
 //!
 //! The validator and its nominator split their reward as following:
 //!
 //! The validator can declare an amount, named
-//! [`commission`](./struct.ValidatorPrefs.html#structfield.commission), that does not get shared
+//! [`commission`](ValidatorPrefs::commission), that does not get shared
 //! with the nominators at each reward payout through its
-//! [`ValidatorPrefs`](./struct.ValidatorPrefs.html). This value gets deducted from the total reward
+//! [`ValidatorPrefs`]. This value gets deducted from the total reward
 //! that is paid to the validator and its nominators. The remaining portion is split among the
 //! validator and all of the nominators that nominated the validator, proportional to the value
 //! staked behind this validator (_i.e._ dividing the
-//! [`own`](./struct.Exposure.html#structfield.own) or
-//! [`others`](./struct.Exposure.html#structfield.others) by
-//! [`total`](./struct.Exposure.html#structfield.total) in [`Exposure`](./struct.Exposure.html)).
+//! [`own`](Exposure::own) or
+//! [`others`](Exposure::others) by
+//! [`total`](Exposure::total) in [`Exposure`]).
 //!
 //! All entities who receive a reward have the option to choose their reward destination through the
-//! [`Payee`](./struct.Payee.html) storage item (see
-//! [`set_payee`](enum.Call.html#variant.set_payee)), to be one of the following:
+//! [`Payee`] storage item (see
+//! [`set_payee`](Call::set_payee)), to be one of the following:
 //!
 //! - Controller account, (obviously) not increasing the staked value.
 //! - Stash account, not increasing the staked value.
@@ -231,15 +230,15 @@
 //! Any funds already placed into stash can be the target of the following operations:
 //!
 //! The controller account can free a portion (or all) of the funds using the
-//! [`unbond`](enum.Call.html#variant.unbond) call. Note that the funds are not immediately
+//! [`unbond`](Call::unbond) call. Note that the funds are not immediately
 //! accessible. Instead, a duration denoted by
-//! [`BondingDuration`](./trait.Config.html#associatedtype.BondingDuration) (in number of eras) must
+//! [`Config::BondingDuration`] (in number of eras) must
 //! pass until the funds can actually be removed. Once the `BondingDuration` is over, the
-//! [`withdraw_unbonded`](./enum.Call.html#variant.withdraw_unbonded) call can be used to actually
+//! [`withdraw_unbonded`](Call::withdraw_unbonded) call can be used to actually
 //! withdraw the funds.
 //!
 //! Note that there is a limitation to the number of fund-chunks that can be scheduled to be
-//! unlocked in the future via [`unbond`](enum.Call.html#variant.unbond). In case this maximum
+//! unlocked in the future via [`unbond`](Call::unbond). In case this maximum
 //! (`MAX_UNLOCKING_CHUNKS`) is reached, the bonded account _must_ first wait until a successful
 //! call to `withdraw_unbonded` to remove some of the chunks.
 //!
@@ -256,7 +255,7 @@
 //!
 //! ## GenesisConfig
 //!
-//! The Staking module depends on the [`GenesisConfig`](./struct.GenesisConfig.html). The
+//! The Staking module depends on the [`GenesisConfig`]. The
 //! `GenesisConfig` is optional and allow to set some initial stakers.
 //!
 //! ## Related Modules
@@ -2471,7 +2470,6 @@ impl<T: Config> Module<T> {
 	/// relatively to their points.
 	///
 	/// COMPLEXITY: Complexity is `number_of_validator_to_reward x current_elected_len`.
-	/// If you need to reward lots of validator consider using `reward_by_indices`.
 	pub fn reward_by_ids(
 		validators_points: impl IntoIterator<Item = (T::AccountId, u32)>
 	) {
diff --git a/frame/sudo/src/lib.rs b/frame/sudo/src/lib.rs
index c7cc38a81c13..53797d8cfc1d 100644
--- a/frame/sudo/src/lib.rs
+++ b/frame/sudo/src/lib.rs
@@ -17,8 +17,8 @@
 
 //! # Sudo Module
 //!
-//! - [`sudo::Config`](./trait.Config.html)
-//! - [`Call`](./enum.Call.html)
+//! - [`Config`]
+//! - [`Call`]
 //!
 //! ## Overview
 //!
@@ -81,8 +81,6 @@
 //!
 //! * [Democracy](../pallet_democracy/index.html)
 //!
-//! [`Call`]: ./enum.Call.html
-//! [`Config`]: ./trait.Config.html
 //! [`Origin`]: https://docs.substrate.dev/docs/substrate-types
 
 #![cfg_attr(not(feature = "std"), no_std)]
diff --git a/frame/timestamp/src/lib.rs b/frame/timestamp/src/lib.rs
index 002a8d1c989b..d46755119685 100644
--- a/frame/timestamp/src/lib.rs
+++ b/frame/timestamp/src/lib.rs
@@ -19,9 +19,9 @@
 //!
 //! The Timestamp pallet provides functionality to get and set the on-chain time.
 //!
-//! - [`timestamp::Config`](./trait.Config.html)
-//! - [`Call`](./enum.Call.html)
-//! - [`Pallet`](./struct.Pallet.html)
+//! - [`Config`]
+//! - [`Call`]
+//! - [`Pallet`]
 //!
 //! ## Overview
 //!
diff --git a/frame/treasury/src/lib.rs b/frame/treasury/src/lib.rs
index b5e2c7881bb5..46098c14fb1a 100644
--- a/frame/treasury/src/lib.rs
+++ b/frame/treasury/src/lib.rs
@@ -20,8 +20,8 @@
 //! The Treasury module provides a "pot" of funds that can be managed by stakeholders in the system
 //! and a structure for making spending proposals from this pot.
 //!
-//! - [`treasury::Config`](./trait.Config.html)
-//! - [`Call`](./enum.Call.html)
+//! - [`Config`]
+//! - [`Call`]
 //!
 //! ## Overview
 //!
@@ -53,7 +53,7 @@
 //!
 //! ## GenesisConfig
 //!
-//! The Treasury module depends on the [`GenesisConfig`](./struct.GenesisConfig.html).
+//! The Treasury module depends on the [`GenesisConfig`].
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
diff --git a/frame/utility/src/lib.rs b/frame/utility/src/lib.rs
index 28345e5ffe72..f76c7252a8e3 100644
--- a/frame/utility/src/lib.rs
+++ b/frame/utility/src/lib.rs
@@ -18,8 +18,8 @@
 //! # Utility Module
 //! A stateless module with helpers for dispatch management which does no re-authentication.
 //!
-//! - [`utility::Config`](./trait.Config.html)
-//! - [`Call`](./enum.Call.html)
+//! - [`Config`]
+//! - [`Call`]
 //!
 //! ## Overview
 //!
@@ -48,9 +48,6 @@
 //!
 //! #### For pseudonymal dispatch
 //! * `as_derivative` - Dispatch a call from a derivative signed origin.
-//!
-//! [`Call`]: ./enum.Call.html
-//! [`Config`]: ./trait.Config.html
 
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
diff --git a/frame/vesting/src/lib.rs b/frame/vesting/src/lib.rs
index 7b725f7486df..98f6067a687e 100644
--- a/frame/vesting/src/lib.rs
+++ b/frame/vesting/src/lib.rs
@@ -17,8 +17,8 @@
 
 //! # Vesting Module
 //!
-//! - [`vesting::Config`](./trait.Config.html)
-//! - [`Call`](./enum.Call.html)
+//! - [`Config`]
+//! - [`Call`]
 //!
 //! ## Overview
 //!
@@ -41,9 +41,6 @@
 //! - `vest` - Update the lock, reducing it in line with the amount "vested" so far.
 //! - `vest_other` - Update the lock of another account, reducing it in line with the amount
 //!   "vested" so far.
-//!
-//! [`Call`]: ./enum.Call.html
-//! [`Config`]: ./trait.Config.html
 
 #![cfg_attr(not(feature = "std"), no_std)]
 

From 30ad9184c488c8e57507c1a660bb1fd16646a0f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Wed, 24 Mar 2021 09:09:19 +0100
Subject: [PATCH 0545/1194] contracts: Reduce the API surface (#8359)

* contracts: Remove types and storage from the public interface

* contracts: Remove current_schedule() getter

* contracts: Improve documentation

* Update README.md

* Fix integration test
---
 bin/node/cli/src/chain_spec.rs           |   7 +-
 bin/node/executor/tests/basic.rs         |  11 +-
 bin/node/runtime/src/lib.rs              |   6 +-
 frame/contracts/CHANGELOG.md             |   3 +
 frame/contracts/src/benchmarking/code.rs |   8 +-
 frame/contracts/src/benchmarking/mod.rs  |  25 +--
 frame/contracts/src/chain_extension.rs   |  12 +-
 frame/contracts/src/exec.rs              |  38 ++--
 frame/contracts/src/lib.rs               | 219 ++++++-----------------
 frame/contracts/src/schedule.rs          |  32 +++-
 frame/contracts/src/storage.rs           | 125 ++++++++++++-
 frame/contracts/src/tests.rs             |   3 +-
 frame/contracts/src/wasm/prepare.rs      |   2 +-
 frame/contracts/src/wasm/runtime.rs      |   3 +-
 14 files changed, 256 insertions(+), 238 deletions(-)

diff --git a/bin/node/cli/src/chain_spec.rs b/bin/node/cli/src/chain_spec.rs
index ae1418981f16..c30710d236ac 100644
--- a/bin/node/cli/src/chain_spec.rs
+++ b/bin/node/cli/src/chain_spec.rs
@@ -295,10 +295,9 @@ pub fn testnet_genesis(
 			phantom: Default::default(),
 		},
 		pallet_contracts: ContractsConfig {
-			current_schedule: pallet_contracts::Schedule {
-				enable_println, // this should only be enabled on development chains
-				..Default::default()
-			},
+			// println should only be enabled on development chains
+			current_schedule: pallet_contracts::Schedule::default()
+				.enable_println(enable_println),
 		},
 		pallet_sudo: SudoConfig {
 			key: root_key,
diff --git a/bin/node/executor/tests/basic.rs b/bin/node/executor/tests/basic.rs
index 0d228678aeec..5f20c502e495 100644
--- a/bin/node/executor/tests/basic.rs
+++ b/bin/node/executor/tests/basic.rs
@@ -656,13 +656,10 @@ fn deploying_wasm_contract_should_work() {
 	).0.unwrap();
 
 	t.execute_with(|| {
-		// Verify that the contract constructor worked well and code of TRANSFER contract is actually deployed.
-		assert_eq!(
-			&pallet_contracts::ContractInfoOf::<Runtime>::get(addr)
-				.and_then(|c| c.get_alive())
-				.unwrap()
-				.code_hash,
-			&transfer_ch
+		// Verify that the contract does exist by querying some of its storage items
+		// It does not matter that the storage item itself does not exist.
+		assert!(
+			&pallet_contracts::Pallet::<Runtime>::get_storage(addr, Default::default()).is_ok()
 		);
 	});
 }
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 5f5a3cc663c8..15ae0209a5e2 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -744,11 +744,11 @@ impl pallet_tips::Config for Runtime {
 }
 
 parameter_types! {
-	pub const TombstoneDeposit: Balance = deposit(
+	pub TombstoneDeposit: Balance = deposit(
 		1,
-		sp_std::mem::size_of::<pallet_contracts::ContractInfo<Runtime>>() as u32
+		<pallet_contracts::Pallet<Runtime>>::contract_info_size(),
 	);
-	pub const DepositPerContract: Balance = TombstoneDeposit::get();
+	pub DepositPerContract: Balance = TombstoneDeposit::get();
 	pub const DepositPerStorageByte: Balance = deposit(0, 1);
 	pub const DepositPerStorageItem: Balance = deposit(1, 0);
 	pub RentFraction: Perbill = Perbill::from_rational(1u32, 30 * DAYS);
diff --git a/frame/contracts/CHANGELOG.md b/frame/contracts/CHANGELOG.md
index 68f35a444d2c..efc3eb93c570 100644
--- a/frame/contracts/CHANGELOG.md
+++ b/frame/contracts/CHANGELOG.md
@@ -20,6 +20,9 @@ In other words: Upgrading this pallet will not break pre-existing contracts.
 
 ### Added
 
+- Make storage and fields of `Schedule` private to the crate.
+[1](https://github.com/paritytech/substrate/pull/8359)
+
 - Add new version of `seal_random` which exposes additional information.
 [1](https://github.com/paritytech/substrate/pull/8329)
 
diff --git a/frame/contracts/src/benchmarking/code.rs b/frame/contracts/src/benchmarking/code.rs
index de1ef72d1b55..118ce038fc22 100644
--- a/frame/contracts/src/benchmarking/code.rs
+++ b/frame/contracts/src/benchmarking/code.rs
@@ -24,9 +24,7 @@
 //! we define this simple definition of a contract that can be passed to `create_code` that
 //! compiles it down into a `WasmModule` that can be used as a contract's code.
 
-use crate::Config;
-use crate::Pallet as Contracts;
-
+use crate::{Config, CurrentSchedule};
 use parity_wasm::elements::{
 	Instruction, Instructions, FuncBody, ValueType, BlockType, Section, CustomSection,
 };
@@ -225,7 +223,7 @@ where
 		if def.inject_stack_metering {
 			code = inject_limiter(
 				code,
-				Contracts::<T>::current_schedule().limits.stack_height
+				<CurrentSchedule<T>>::get().limits.stack_height
 			)
 			.unwrap();
 		}
@@ -505,5 +503,5 @@ where
 	T: Config,
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
-	Contracts::<T>::current_schedule().limits.memory_pages
+	<CurrentSchedule<T>>::get().limits.memory_pages
 }
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index 81419781bf85..3db04d3caf3d 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -36,6 +36,7 @@ use self::{
 	},
 	sandbox::Sandbox,
 };
+use codec::Encode;
 use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
 use frame_system::{Pallet as System, RawOrigin};
 use parity_wasm::elements::{Instruction, ValueType, BlockType};
@@ -313,7 +314,7 @@ benchmarks! {
 		let WasmModule { code, hash, .. } = WasmModule::<T>::sized(c * 1024);
 		Contracts::<T>::store_code_raw(code)?;
 		let mut module = PrefabWasmModule::from_storage_noinstr(hash)?;
-		let schedule = Contracts::<T>::current_schedule();
+		let schedule = <CurrentSchedule<T>>::get();
 	}: {
 		Contracts::<T>::reinstrument_module(&mut module, &schedule)?;
 	}
@@ -936,7 +937,7 @@ benchmarks! {
 	seal_random {
 		let r in 0 .. API_BENCHMARK_BATCHES;
 		let pages = code::max_pages::<T>();
-		let subject_len = Contracts::<T>::current_schedule().limits.subject_len;
+		let subject_len = <CurrentSchedule<T>>::get().limits.subject_len;
 		assert!(subject_len < 1024);
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
@@ -992,7 +993,7 @@ benchmarks! {
 	// `t`: Number of topics
 	// `n`: Size of event payload in kb
 	seal_deposit_event_per_topic_and_kb {
-		let t in 0 .. Contracts::<T>::current_schedule().limits.event_topics;
+		let t in 0 .. <CurrentSchedule<T>>::get().limits.event_topics;
 		let n in 0 .. T::MaxValueSize::get() / 1024;
 		let mut topics = (0..API_BENCHMARK_BATCH_SIZE)
 			.map(|n| (n * t..n * t + t).map(|i| T::Hashing::hash_of(&i)).collect::<Vec<_>>().encode())
@@ -1922,7 +1923,7 @@ benchmarks! {
 
 	// w_br_table_per_entry = w_bench
 	instr_br_table_per_entry {
-		let e in 1 .. Contracts::<T>::current_schedule().limits.br_table_size;
+		let e in 1 .. <CurrentSchedule<T>>::get().limits.br_table_size;
 		let entry: Vec<u32> = [0, 1].iter()
 			.cloned()
 			.cycle()
@@ -1978,7 +1979,7 @@ benchmarks! {
 	// w_call_indrect = w_bench - 3 * w_param
 	instr_call_indirect {
 		let r in 0 .. INSTR_BENCHMARK_BATCHES;
-		let num_elements = Contracts::<T>::current_schedule().limits.table_size;
+		let num_elements = <CurrentSchedule<T>>::get().limits.table_size;
 		use self::code::TableSegment;
 		let mut sbox = Sandbox::from(&WasmModule::<T>::from(ModuleDefinition {
 			// We need to make use of the stack here in order to trigger stack height
@@ -2008,8 +2009,8 @@ benchmarks! {
 	// linearly depend on the amount of parameters to this function.
 	// Please note that this is not necessary with a direct call.
 	instr_call_indirect_per_param {
-		let p in 0 .. Contracts::<T>::current_schedule().limits.parameters;
-		let num_elements = Contracts::<T>::current_schedule().limits.table_size;
+		let p in 0 .. <CurrentSchedule<T>>::get().limits.parameters;
+		let num_elements = <CurrentSchedule<T>>::get().limits.table_size;
 		use self::code::TableSegment;
 		let mut sbox = Sandbox::from(&WasmModule::<T>::from(ModuleDefinition {
 			// We need to make use of the stack here in order to trigger stack height
@@ -2039,7 +2040,7 @@ benchmarks! {
 	// w_local_get = w_bench - 1 * w_param
 	instr_local_get {
 		let r in 0 .. INSTR_BENCHMARK_BATCHES;
-		let max_locals = Contracts::<T>::current_schedule().limits.stack_height;
+		let max_locals = <CurrentSchedule<T>>::get().limits.stack_height;
 		let mut call_body = body::repeated_dyn(r * INSTR_BENCHMARK_BATCH_SIZE, vec![
 			RandomGetLocal(0, max_locals),
 			Regular(Instruction::Drop),
@@ -2056,7 +2057,7 @@ benchmarks! {
 	// w_local_set = w_bench - 1 * w_param
 	instr_local_set {
 		let r in 0 .. INSTR_BENCHMARK_BATCHES;
-		let max_locals = Contracts::<T>::current_schedule().limits.stack_height;
+		let max_locals = <CurrentSchedule<T>>::get().limits.stack_height;
 		let mut call_body = body::repeated_dyn(r * INSTR_BENCHMARK_BATCH_SIZE, vec![
 			RandomI64Repeated(1),
 			RandomSetLocal(0, max_locals),
@@ -2073,7 +2074,7 @@ benchmarks! {
 	// w_local_tee = w_bench - 2 * w_param
 	instr_local_tee {
 		let r in 0 .. INSTR_BENCHMARK_BATCHES;
-		let max_locals = Contracts::<T>::current_schedule().limits.stack_height;
+		let max_locals = <CurrentSchedule<T>>::get().limits.stack_height;
 		let mut call_body = body::repeated_dyn(r * INSTR_BENCHMARK_BATCH_SIZE, vec![
 			RandomI64Repeated(1),
 			RandomTeeLocal(0, max_locals),
@@ -2091,7 +2092,7 @@ benchmarks! {
 	// w_global_get = w_bench - 1 * w_param
 	instr_global_get {
 		let r in 0 .. INSTR_BENCHMARK_BATCHES;
-		let max_globals = Contracts::<T>::current_schedule().limits.globals;
+		let max_globals = <CurrentSchedule<T>>::get().limits.globals;
 		let mut sbox = Sandbox::from(&WasmModule::<T>::from(ModuleDefinition {
 			call_body: Some(body::repeated_dyn(r * INSTR_BENCHMARK_BATCH_SIZE, vec![
 				RandomGetGlobal(0, max_globals),
@@ -2107,7 +2108,7 @@ benchmarks! {
 	// w_global_set = w_bench - 1 * w_param
 	instr_global_set {
 		let r in 0 .. INSTR_BENCHMARK_BATCHES;
-		let max_globals = Contracts::<T>::current_schedule().limits.globals;
+		let max_globals = <CurrentSchedule<T>>::get().limits.globals;
 		let mut sbox = Sandbox::from(&WasmModule::<T>::from(ModuleDefinition {
 			call_body: Some(body::repeated_dyn(r * INSTR_BENCHMARK_BATCH_SIZE, vec![
 				RandomI64Repeated(1),
diff --git a/frame/contracts/src/chain_extension.rs b/frame/contracts/src/chain_extension.rs
index dc6e9771775c..4ac5300d57d7 100644
--- a/frame/contracts/src/chain_extension.rs
+++ b/frame/contracts/src/chain_extension.rs
@@ -47,6 +47,12 @@
 //! induces. In order to be able to charge the correct weight for the functions defined
 //! by a chain extension benchmarks must be written, too. In the near future this crate
 //! will provide the means for easier creation of those specialized benchmarks.
+//!
+//! # Example
+//!
+//! The ink! repository maintains an
+//! [end-to-end example](https://github.com/paritytech/ink/tree/master/examples/rand-extension)
+//! on how to use a chain extension in order to provide new features to ink! contracts.
 
 use crate::{
 	Error,
@@ -141,8 +147,8 @@ pub enum RetVal {
 
 /// Grants the chain extension access to its parameters and execution environment.
 ///
-/// It uses the typestate pattern to enforce the correct usage of the parameters passed
-/// to the chain extension.
+/// It uses [typestate programming](https://docs.rust-embedded.org/book/static-guarantees/typestate-programming.html)
+/// to enforce the correct usage of the parameters passed to the chain extension.
 pub struct Environment<'a, 'b, E: Ext, S: state::State> {
 	/// The actual data of this type.
 	inner: Inner<'a, 'b, E>,
@@ -376,6 +382,8 @@ mod state {
 	pub trait BufIn: State {}
 	pub trait BufOut: State {}
 
+	/// The initial state of an [`Environment`](`super::Environment`).
+	/// See [typestate programming](https://docs.rust-embedded.org/book/static-guarantees/typestate-programming.html).
 	pub enum Init {}
 	pub enum OnlyIn {}
 	pub enum PrimInBufOut {}
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index 602a004dacce..27f70dea8c59 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -943,7 +943,7 @@ mod tests {
 			test_utils::{place_contract, set_balance, get_balance},
 		},
 		exec::ExportedFunction::*,
-		Error, Weight,
+		Error, Weight, CurrentSchedule,
 	};
 	use sp_runtime::DispatchError;
 	use assert_matches::assert_matches;
@@ -1139,7 +1139,7 @@ mod tests {
 		});
 
 		ExtBuilder::default().build().execute_with(|| {
-			let schedule = Contracts::current_schedule();
+			let schedule = <CurrentSchedule<Test>>::get();
 			let mut ctx = MockContext::top_level(ALICE, &schedule);
 			place_contract(&BOB, exec_ch);
 
@@ -1189,7 +1189,7 @@ mod tests {
 		);
 
 		ExtBuilder::default().build().execute_with(|| {
-			let schedule = Contracts::current_schedule();
+			let schedule = <CurrentSchedule<Test>>::get();
 			let mut ctx = MockContext::top_level(origin.clone(), &schedule);
 			place_contract(&BOB, return_ch);
 			set_balance(&origin, 100);
@@ -1249,7 +1249,7 @@ mod tests {
 		);
 
 		ExtBuilder::default().build().execute_with(|| {
-			let schedule = Contracts::current_schedule();
+			let schedule = <CurrentSchedule<Test>>::get();
 			let mut ctx = MockContext::top_level(origin, &schedule);
 			place_contract(&BOB, return_ch);
 
@@ -1278,7 +1278,7 @@ mod tests {
 		);
 
 		ExtBuilder::default().build().execute_with(|| {
-			let schedule = Contracts::current_schedule();
+			let schedule = <CurrentSchedule<Test>>::get();
 			let mut ctx = MockContext::top_level(origin, &schedule);
 			place_contract(&BOB, return_ch);
 
@@ -1304,7 +1304,7 @@ mod tests {
 
 		// This one tests passing the input data into a contract via call.
 		ExtBuilder::default().build().execute_with(|| {
-			let schedule = Contracts::current_schedule();
+			let schedule = <CurrentSchedule<Test>>::get();
 			let mut ctx = MockContext::top_level(ALICE, &schedule);
 			place_contract(&BOB, input_data_ch);
 
@@ -1327,7 +1327,7 @@ mod tests {
 
 		// This one tests passing the input data into a contract via instantiate.
 		ExtBuilder::default().build().execute_with(|| {
-			let schedule = Contracts::current_schedule();
+			let schedule = <CurrentSchedule<Test>>::get();
 			let subsistence = Contracts::<Test>::subsistence_threshold();
 			let mut ctx = MockContext::top_level(ALICE, &schedule);
 			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
@@ -1380,7 +1380,7 @@ mod tests {
 		});
 
 		ExtBuilder::default().build().execute_with(|| {
-			let schedule = Contracts::current_schedule();
+			let schedule = <CurrentSchedule<Test>>::get();
 			let mut ctx = MockContext::top_level(ALICE, &schedule);
 			set_balance(&BOB, 1);
 			place_contract(&BOB, recurse_ch);
@@ -1428,7 +1428,7 @@ mod tests {
 		});
 
 		ExtBuilder::default().build().execute_with(|| {
-			let schedule = Contracts::current_schedule();
+			let schedule = <CurrentSchedule<Test>>::get();
 			let mut ctx = MockContext::top_level(origin.clone(), &schedule);
 			place_contract(&dest, bob_ch);
 			place_contract(&CHARLIE, charlie_ch);
@@ -1466,7 +1466,7 @@ mod tests {
 		});
 
 		ExtBuilder::default().build().execute_with(|| {
-			let schedule = Contracts::current_schedule();
+			let schedule = <CurrentSchedule<Test>>::get();
 			let mut ctx = MockContext::top_level(ALICE, &schedule);
 			place_contract(&BOB, bob_ch);
 			place_contract(&CHARLIE, charlie_ch);
@@ -1487,7 +1487,7 @@ mod tests {
 		let dummy_ch = MockLoader::insert(Constructor, |_, _| exec_success());
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
-			let schedule = Contracts::current_schedule();
+			let schedule = <CurrentSchedule<Test>>::get();
 			let mut ctx = MockContext::top_level(ALICE, &schedule);
 			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
 			let executable = MockExecutable::from_storage(
@@ -1515,7 +1515,7 @@ mod tests {
 		);
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
-			let schedule = Contracts::current_schedule();
+			let schedule = <CurrentSchedule<Test>>::get();
 			let mut ctx = MockContext::top_level(ALICE, &schedule);
 			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
 			let executable = MockExecutable::from_storage(
@@ -1551,7 +1551,7 @@ mod tests {
 		);
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
-			let schedule = Contracts::current_schedule();
+			let schedule = <CurrentSchedule<Test>>::get();
 			let mut ctx = MockContext::top_level(ALICE, &schedule);
 			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
 			let executable = MockExecutable::from_storage(
@@ -1599,7 +1599,7 @@ mod tests {
 		});
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
-			let schedule = Contracts::current_schedule();
+			let schedule = <CurrentSchedule<Test>>::get();
 			let mut ctx = MockContext::top_level(ALICE, &schedule);
 			set_balance(&ALICE, Contracts::<Test>::subsistence_threshold() * 100);
 			place_contract(&BOB, instantiator_ch);
@@ -1648,7 +1648,7 @@ mod tests {
 		});
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
-			let schedule = Contracts::current_schedule();
+			let schedule = <CurrentSchedule<Test>>::get();
 			let mut ctx = MockContext::top_level(ALICE, &schedule);
 			set_balance(&ALICE, 1000);
 			set_balance(&BOB, 100);
@@ -1676,7 +1676,7 @@ mod tests {
 			.existential_deposit(15)
 			.build()
 			.execute_with(|| {
-				let schedule = Contracts::current_schedule();
+				let schedule = <CurrentSchedule<Test>>::get();
 				let mut ctx = MockContext::top_level(ALICE, &schedule);
 				let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
 				let executable = MockExecutable::from_storage(
@@ -1715,7 +1715,7 @@ mod tests {
 
 		ExtBuilder::default().build().execute_with(|| {
 			let subsistence = Contracts::<Test>::subsistence_threshold();
-			let schedule = Contracts::current_schedule();
+			let schedule = <CurrentSchedule<Test>>::get();
 			let mut ctx = MockContext::top_level(ALICE, &schedule);
 			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
 			let executable = MockExecutable::from_storage(
@@ -1747,7 +1747,7 @@ mod tests {
 
 		ExtBuilder::default().build().execute_with(|| {
 			let subsistence = Contracts::<Test>::subsistence_threshold();
-			let schedule = Contracts::current_schedule();
+			let schedule = <CurrentSchedule<Test>>::get();
 			let mut ctx = MockContext::top_level(ALICE, &schedule);
 			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
 			set_balance(&ALICE, subsistence * 10);
@@ -1795,7 +1795,7 @@ mod tests {
 
 		ExtBuilder::default().build().execute_with(|| {
 			let subsistence = Contracts::<Test>::subsistence_threshold();
-			let schedule = Contracts::current_schedule();
+			let schedule = <CurrentSchedule<Test>>::get();
 			let mut ctx = MockContext::top_level(ALICE, &schedule);
 			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
 			set_balance(&ALICE, subsistence * 100);
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index 496d5f5d080b..46947ea9e1ae 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -24,12 +24,12 @@
 //!
 //! ## Overview
 //!
-//! This module extends accounts based on the `Currency` trait to have smart-contract functionality. It can
-//! be used with other modules that implement accounts based on `Currency`. These "smart-contract accounts"
+//! This module extends accounts based on the [`Currency`] trait to have smart-contract functionality. It can
+//! be used with other modules that implement accounts based on [`Currency`]. These "smart-contract accounts"
 //! have the ability to instantiate smart-contracts and make calls to other contract and non-contract accounts.
 //!
-//! The smart-contract code is stored once in a `code_cache`, and later retrievable via its `code_hash`.
-//! This means that multiple smart-contracts can be instantiated from the same `code_cache`, without replicating
+//! The smart-contract code is stored once in a code cache, and later retrievable via its hash.
+//! This means that multiple smart-contracts can be instantiated from the same hash, without replicating
 //! the code each time.
 //!
 //! When a smart-contract is called, its associated code is retrieved via the code hash and gets executed.
@@ -59,12 +59,17 @@
 //!
 //! ### Dispatchable functions
 //!
-//! * `instantiate_with_code` - Deploys a new contract from the supplied wasm binary, optionally transferring
-//! some balance. This instantiates a new smart contract account and calls its contract deploy
-//! handler to initialize the contract.
-//! * `instantiate` - The same as `instantiate_with_code` but instead of uploading new code an
-//! existing `code_hash` is supplied.
-//! * `call` - Makes a call to an account, optionally transferring some balance.
+//! * [`Pallet::update_schedule`] -
+//! ([Root Origin](https://substrate.dev/docs/en/knowledgebase/runtime/origin) Only) -
+//! Set a new [`Schedule`].
+//! * [`Pallet::instantiate_with_code`] - Deploys a new contract from the supplied wasm binary,
+//! optionally transferring
+//! some balance. This instantiates a new smart contract account with the supplied code and
+//! calls its constructor to initialize the contract.
+//! * [`Pallet::instantiate`] - The same as `instantiate_with_code` but instead of uploading new
+//! code an existing `code_hash` is supplied.
+//! * [`Pallet::call`] - Makes a call to an account, optionally transferring some balance.
+//! * [`Pallet::claim_surcharge`] - Evict a contract that cannot pay rent anymore.
 //!
 //! ## Usage
 //!
@@ -98,29 +103,24 @@ pub mod weights;
 #[cfg(test)]
 mod tests;
 
-pub use crate::{
-	wasm::PrefabWasmModule,
-	schedule::{Schedule, HostFnWeights, InstructionWeights, Limits},
-	pallet::*,
-};
+pub use crate::{pallet::*, schedule::Schedule};
 use crate::{
 	gas::GasMeter,
 	exec::{ExecutionContext, Executable},
 	rent::Rent,
-	storage::{Storage, DeletedContract},
+	storage::{Storage, DeletedContract, ContractInfo, AliveContractInfo, TombstoneContractInfo},
 	weights::WeightInfo,
+	wasm::PrefabWasmModule,
 };
 use sp_core::crypto::UncheckedFrom;
-use sp_std::{prelude::*, marker::PhantomData, fmt::Debug};
-use codec::{Codec, Encode, Decode};
+use sp_std::prelude::*;
 use sp_runtime::{
 	traits::{
-		Hash, StaticLookup, MaybeSerializeDeserialize, Member, Convert, Saturating, Zero,
+		Hash, StaticLookup, Convert, Saturating, Zero,
 	},
-	RuntimeDebug, Perbill,
+	Perbill,
 };
 use frame_support::{
-	storage::child::ChildInfo,
 	traits::{OnUnbalanced, Currency, Get, Time, Randomness},
 	weights::{Weight, PostDispatchInfo, WithPostDispatchInfo},
 };
@@ -129,16 +129,12 @@ use pallet_contracts_primitives::{
 	RentProjectionResult, GetStorageResult, ContractAccessError, ContractExecResult,
 };
 
-pub type CodeHash<T> = <T as frame_system::Config>::Hash;
-pub type TrieId = Vec<u8>;
-pub type BalanceOf<T> =
+type CodeHash<T> = <T as frame_system::Config>::Hash;
+type TrieId = Vec<u8>;
+type BalanceOf<T> =
 	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
-pub type NegativeImbalanceOf<T> =
+type NegativeImbalanceOf<T> =
 	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
-pub type AliveContractInfo<T> =
-	RawAliveContractInfo<CodeHash<T>, BalanceOf<T>, <T as frame_system::Config>::BlockNumber>;
-pub type TombstoneContractInfo<T> =
-	RawTombstoneContractInfo<<T as frame_system::Config>::Hash, <T as frame_system::Config>::Hashing>;
 
 #[frame_support::pallet]
 pub mod pallet {
@@ -248,7 +244,6 @@ pub mod pallet {
 	}
 
 	#[pallet::pallet]
-	#[pallet::generate_store(pub(super) trait Store)]
 	pub struct Pallet<T>(PhantomData<T>);
 
 	#[pallet::hooks]
@@ -290,7 +285,7 @@ pub mod pallet {
 			schedule: Schedule<T>
 		) -> DispatchResultWithPostInfo {
 			ensure_root(origin)?;
-			if <Pallet<T>>::current_schedule().version > schedule.version {
+			if <CurrentSchedule<T>>::get().version > schedule.version {
 				Err(Error::<T>::InvalidScheduleVersion)?
 			}
 			Self::deposit_event(Event::ScheduleUpdated(schedule.version));
@@ -316,7 +311,7 @@ pub mod pallet {
 			let origin = ensure_signed(origin)?;
 			let dest = T::Lookup::lookup(dest)?;
 			let mut gas_meter = GasMeter::new(gas_limit);
-			let schedule = <Pallet<T>>::current_schedule();
+			let schedule = <CurrentSchedule<T>>::get();
 			let mut ctx = ExecutionContext::<T, PrefabWasmModule<T>>::top_level(origin, &schedule);
 			let (result, code_len) = match ctx.call(dest, value, &mut gas_meter, data) {
 				Ok((output, len)) => (Ok(output), len),
@@ -365,7 +360,7 @@ pub mod pallet {
 			let code_len = code.len() as u32;
 			ensure!(code_len <= T::MaxCodeSize::get(), Error::<T>::CodeTooLarge);
 			let mut gas_meter = GasMeter::new(gas_limit);
-			let schedule = <Pallet<T>>::current_schedule();
+			let schedule = <CurrentSchedule<T>>::get();
 			let executable = PrefabWasmModule::from_code(code, &schedule)?;
 			let code_len = executable.code_len();
 			ensure!(code_len <= T::MaxCodeSize::get(), Error::<T>::CodeTooLarge);
@@ -397,7 +392,7 @@ pub mod pallet {
 		) -> DispatchResultWithPostInfo {
 			let origin = ensure_signed(origin)?;
 			let mut gas_meter = GasMeter::new(gas_limit);
-			let schedule = <Pallet<T>>::current_schedule();
+			let schedule = <CurrentSchedule<T>>::get();
 			let executable = PrefabWasmModule::from_storage(code_hash, &schedule, &mut gas_meter)?;
 			let mut ctx = ExecutionContext::<T, PrefabWasmModule<T>>::top_level(origin, &schedule);
 			let code_len = executable.code_len();
@@ -614,33 +609,33 @@ pub mod pallet {
 
 	/// Current cost schedule for contracts.
 	#[pallet::storage]
-	#[pallet::getter(fn current_schedule)]
-	pub(super) type CurrentSchedule<T: Config> = StorageValue<_, Schedule<T>, ValueQuery>;
+	pub(crate) type CurrentSchedule<T: Config> = StorageValue<_, Schedule<T>, ValueQuery>;
 
 	/// A mapping from an original code hash to the original code, untouched by instrumentation.
 	#[pallet::storage]
-	pub type PristineCode<T: Config> = StorageMap<_, Identity, CodeHash<T>, Vec<u8>>;
+	pub(crate) type PristineCode<T: Config> = StorageMap<_, Identity, CodeHash<T>, Vec<u8>>;
 
 	/// A mapping between an original code hash and instrumented wasm code, ready for execution.
 	#[pallet::storage]
-	pub type CodeStorage<T: Config> = StorageMap<_, Identity, CodeHash<T>, PrefabWasmModule<T>>;
+	pub(crate) type CodeStorage<T: Config> = StorageMap<_, Identity, CodeHash<T>, PrefabWasmModule<T>>;
 
 	/// The subtrie counter.
 	#[pallet::storage]
-	pub type AccountCounter<T: Config> = StorageValue<_, u64, ValueQuery>;
+	pub(crate) type AccountCounter<T: Config> = StorageValue<_, u64, ValueQuery>;
 
 	/// The code associated with a given account.
 	///
 	/// TWOX-NOTE: SAFE since `AccountId` is a secure hash.
 	#[pallet::storage]
-	pub type ContractInfoOf<T: Config> = StorageMap<_, Twox64Concat, T::AccountId, ContractInfo<T>>;
+	pub(crate) type ContractInfoOf<T: Config> = StorageMap<_, Twox64Concat, T::AccountId, ContractInfo<T>>;
 
 	/// Evicted contracts that await child trie deletion.
 	///
 	/// Child trie deletion is a heavy operation depending on the amount of storage items
 	/// stored in said trie. Therefore this operation is performed lazily in `on_initialize`.
 	#[pallet::storage]
-	pub type DeletionQueue<T: Config> = StorageValue<_, Vec<DeletedContract>, ValueQuery>;
+	pub(crate) type DeletionQueue<T: Config> = StorageValue<_, Vec<DeletedContract>, ValueQuery>;
+
 
 	#[pallet::genesis_config]
 	pub struct GenesisConfig<T: Config> {
@@ -683,7 +678,7 @@ where
 		input_data: Vec<u8>,
 	) -> ContractExecResult {
 		let mut gas_meter = GasMeter::new(gas_limit);
-		let schedule = <Pallet<T>>::current_schedule();
+		let schedule = <CurrentSchedule<T>>::get();
 		let mut ctx = ExecutionContext::<T, PrefabWasmModule<T>>::top_level(origin, &schedule);
 		let result = ctx.call(dest, value, &mut gas_meter, input_data);
 		let gas_consumed = gas_meter.gas_spent();
@@ -743,10 +738,24 @@ where
 		T::Currency::minimum_balance().saturating_add(T::TombstoneDeposit::get())
 	}
 
+	/// The in-memory size in bytes of the data structure associated with each contract.
+	///
+	/// The data structure is also put into storage for each contract. The in-storage size
+	/// is never larger than the in-memory representation and usually smaller due to compact
+	/// encoding and lack of padding.
+	///
+	/// # Note
+	///
+	/// This returns the in-memory size because the in-storage size (SCALE encoded) cannot
+	/// be efficiently determined. Treat this as an upper bound of the in-storage size.
+	pub fn contract_info_size() -> u32 {
+		sp_std::mem::size_of::<ContractInfo<T>>() as u32
+	}
+
 	/// Store code for benchmarks which does not check nor instrument the code.
 	#[cfg(feature = "runtime-benchmarks")]
 	fn store_code_raw(code: Vec<u8>) -> frame_support::dispatch::DispatchResult {
-		let schedule = <Pallet<T>>::current_schedule();
+		let schedule = <CurrentSchedule<T>>::get();
 		PrefabWasmModule::store_code_unchecked(code, &schedule)?;
 		Ok(())
 	}
@@ -760,127 +769,3 @@ where
 		self::wasm::reinstrument(module, schedule)
 	}
 }
-
-/// Information for managing an account and its sub trie abstraction.
-/// This is the required info to cache for an account
-#[derive(Encode, Decode, RuntimeDebug)]
-pub enum ContractInfo<T: Config> {
-	Alive(AliveContractInfo<T>),
-	Tombstone(TombstoneContractInfo<T>),
-}
-
-impl<T: Config> ContractInfo<T> {
-	/// If contract is alive then return some alive info
-	pub fn get_alive(self) -> Option<AliveContractInfo<T>> {
-		if let ContractInfo::Alive(alive) = self {
-			Some(alive)
-		} else {
-			None
-		}
-	}
-	/// If contract is alive then return some reference to alive info
-	pub fn as_alive(&self) -> Option<&AliveContractInfo<T>> {
-		if let ContractInfo::Alive(ref alive) = self {
-			Some(alive)
-		} else {
-			None
-		}
-	}
-	/// If contract is alive then return some mutable reference to alive info
-	pub fn as_alive_mut(&mut self) -> Option<&mut AliveContractInfo<T>> {
-		if let ContractInfo::Alive(ref mut alive) = self {
-			Some(alive)
-		} else {
-			None
-		}
-	}
-
-	/// If contract is tombstone then return some tombstone info
-	pub fn get_tombstone(self) -> Option<TombstoneContractInfo<T>> {
-		if let ContractInfo::Tombstone(tombstone) = self {
-			Some(tombstone)
-		} else {
-			None
-		}
-	}
-	/// If contract is tombstone then return some reference to tombstone info
-	pub fn as_tombstone(&self) -> Option<&TombstoneContractInfo<T>> {
-		if let ContractInfo::Tombstone(ref tombstone) = self {
-			Some(tombstone)
-		} else {
-			None
-		}
-	}
-	/// If contract is tombstone then return some mutable reference to tombstone info
-	pub fn as_tombstone_mut(&mut self) -> Option<&mut TombstoneContractInfo<T>> {
-		if let ContractInfo::Tombstone(ref mut tombstone) = self {
-			Some(tombstone)
-		} else {
-			None
-		}
-	}
-}
-
-/// Information for managing an account and its sub trie abstraction.
-/// This is the required info to cache for an account.
-#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug)]
-pub struct RawAliveContractInfo<CodeHash, Balance, BlockNumber> {
-	/// Unique ID for the subtree encoded as a bytes vector.
-	pub trie_id: TrieId,
-	/// The total number of bytes used by this contract.
-	///
-	/// It is a sum of each key-value pair stored by this contract.
-	pub storage_size: u32,
-	/// The total number of key-value pairs in storage of this contract.
-	pub pair_count: u32,
-	/// The code associated with a given account.
-	pub code_hash: CodeHash,
-	/// Pay rent at most up to this value.
-	pub rent_allowance: Balance,
-	/// The amount of rent that was payed by the contract over its whole lifetime.
-	///
-	/// A restored contract starts with a value of zero just like a new contract.
-	pub rent_payed: Balance,
-	/// Last block rent has been payed.
-	pub deduct_block: BlockNumber,
-	/// Last block child storage has been written.
-	pub last_write: Option<BlockNumber>,
-	/// This field is reserved for future evolution of format.
-	pub _reserved: Option<()>,
-}
-
-impl<CodeHash, Balance, BlockNumber> RawAliveContractInfo<CodeHash, Balance, BlockNumber> {
-	/// Associated child trie unique id is built from the hash part of the trie id.
-	pub fn child_trie_info(&self) -> ChildInfo {
-		child_trie_info(&self.trie_id[..])
-	}
-}
-
-/// Associated child trie unique id is built from the hash part of the trie id.
-pub(crate) fn child_trie_info(trie_id: &[u8]) -> ChildInfo {
-	ChildInfo::new_default(trie_id)
-}
-
-#[derive(Encode, Decode, PartialEq, Eq, RuntimeDebug)]
-pub struct RawTombstoneContractInfo<H, Hasher>(H, PhantomData<Hasher>);
-
-impl<H, Hasher> RawTombstoneContractInfo<H, Hasher>
-where
-	H: Member + MaybeSerializeDeserialize+ Debug
-		+ AsRef<[u8]> + AsMut<[u8]> + Copy + Default
-		+ sp_std::hash::Hash + Codec,
-	Hasher: Hash<Output=H>,
-{
-	fn new(storage_root: &[u8], code_hash: H) -> Self {
-		let mut buf = Vec::new();
-		storage_root.using_encoded(|encoded| buf.extend_from_slice(encoded));
-		buf.extend_from_slice(code_hash.as_ref());
-		RawTombstoneContractInfo(<Hasher as Hash>::hash(&buf[..]), PhantomData)
-	}
-}
-
-impl<T: Config> From<AliveContractInfo<T>> for ContractInfo<T> {
-	fn from(alive_info: AliveContractInfo<T>) -> Self {
-		Self::Alive(alive_info)
-	}
-}
diff --git a/frame/contracts/src/schedule.rs b/frame/contracts/src/schedule.rs
index 24ba83cc1b79..90c396c62777 100644
--- a/frame/contracts/src/schedule.rs
+++ b/frame/contracts/src/schedule.rs
@@ -39,7 +39,11 @@ pub const API_BENCHMARK_BATCH_SIZE: u32 = 100;
 /// as for `API_BENCHMARK_BATCH_SIZE`.
 pub const INSTR_BENCHMARK_BATCH_SIZE: u32 = 1_000;
 
-/// Definition of the cost schedule and other parameterizations for wasm vm.
+/// Definition of the cost schedule and other parameterizations for the wasm vm.
+///
+/// Its fields are private to the crate in order to allow addition of new contract
+/// callable functions without bumping to a new major version. A genesis config should
+/// rely on public functions of this type.
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "std", serde(bound(serialize = "", deserialize = "")))]
 #[derive(Clone, Encode, Decode, PartialEq, Eq, ScheduleDebug)]
@@ -53,20 +57,20 @@ pub struct Schedule<T: Config> {
 	/// of all contracts which are triggered by a version comparison on call.
 	/// Changes to other parts of the schedule should not increment the version in
 	/// order to avoid unnecessary re-instrumentations.
-	pub version: u32,
+	pub(crate) version: u32,
 
 	/// Whether the `seal_println` function is allowed to be used contracts.
 	/// MUST only be enabled for `dev` chains, NOT for production chains
-	pub enable_println: bool,
+	pub(crate) enable_println: bool,
 
 	/// Describes the upper limits on various metrics.
-	pub limits: Limits,
+	pub(crate) limits: Limits,
 
 	/// The weights for individual wasm instructions.
-	pub instruction_weights: InstructionWeights<T>,
+	pub(crate) instruction_weights: InstructionWeights<T>,
 
 	/// The weights for each imported function a contract is allowed to call.
-	pub host_fn_weights: HostFnWeights<T>,
+	pub(crate) host_fn_weights: HostFnWeights<T>,
 }
 
 /// Describes the upper limits on various metrics.
@@ -602,7 +606,21 @@ struct ScheduleRules<'a, T: Config> {
 }
 
 impl<T: Config> Schedule<T> {
-	pub fn rules(&self, module: &elements::Module) -> impl rules::Rules + '_ {
+	/// Allow contracts to call `seal_println` in order to print messages to the console.
+	///
+	/// This should only ever be activated in development chains. The printed messages
+	/// can be observed on the console by setting the environment variable
+	/// `RUST_LOG=runtime=debug` when running the node.
+	///
+	/// # Note
+	///
+	/// Is set to `false` by default.
+	pub fn enable_println(mut self, enable: bool) -> Self {
+		self.enable_println = enable;
+		self
+	}
+
+	pub(crate) fn rules(&self, module: &elements::Module) -> impl rules::Rules + '_ {
 		ScheduleRules {
 			schedule: &self,
 			params: module
diff --git a/frame/contracts/src/storage.rs b/frame/contracts/src/storage.rs
index a73569a88628..d78551f8f170 100644
--- a/frame/contracts/src/storage.rs
+++ b/frame/contracts/src/storage.rs
@@ -19,23 +19,131 @@
 
 use crate::{
 	exec::{AccountIdOf, StorageKey},
-	AliveContractInfo, BalanceOf, CodeHash, ContractInfo, ContractInfoOf, Config, TrieId,
+	BalanceOf, CodeHash, ContractInfoOf, Config, TrieId,
 	AccountCounter, DeletionQueue, Error,
 	weights::WeightInfo,
 };
-use codec::{Encode, Decode};
+use codec::{Codec, Encode, Decode};
 use sp_std::prelude::*;
-use sp_std::marker::PhantomData;
+use sp_std::{marker::PhantomData, fmt::Debug};
 use sp_io::hashing::blake2_256;
-use sp_runtime::traits::{Bounded, Saturating, Zero};
+use sp_runtime::{
+	RuntimeDebug,
+	traits::{Bounded, Saturating, Zero, Hash, Member, MaybeSerializeDeserialize},
+};
 use sp_core::crypto::UncheckedFrom;
 use frame_support::{
 	dispatch::{DispatchError, DispatchResult},
-	storage::child::{self, KillChildStorageResult},
+	storage::child::{self, KillChildStorageResult, ChildInfo},
 	traits::Get,
 	weights::Weight,
 };
 
+pub type AliveContractInfo<T> =
+	RawAliveContractInfo<CodeHash<T>, BalanceOf<T>, <T as frame_system::Config>::BlockNumber>;
+pub type TombstoneContractInfo<T> =
+	RawTombstoneContractInfo<<T as frame_system::Config>::Hash, <T as frame_system::Config>::Hashing>;
+
+/// Information for managing an account and its sub trie abstraction.
+/// This is the required info to cache for an account
+#[derive(Encode, Decode, RuntimeDebug)]
+pub enum ContractInfo<T: Config> {
+	Alive(AliveContractInfo<T>),
+	Tombstone(TombstoneContractInfo<T>),
+}
+
+impl<T: Config> ContractInfo<T> {
+	/// If contract is alive then return some alive info
+	pub fn get_alive(self) -> Option<AliveContractInfo<T>> {
+		if let ContractInfo::Alive(alive) = self {
+			Some(alive)
+		} else {
+			None
+		}
+	}
+	/// If contract is alive then return some reference to alive info
+	pub fn as_alive(&self) -> Option<&AliveContractInfo<T>> {
+		if let ContractInfo::Alive(ref alive) = self {
+			Some(alive)
+		} else {
+			None
+		}
+	}
+
+	/// If contract is tombstone then return some tombstone info
+	pub fn get_tombstone(self) -> Option<TombstoneContractInfo<T>> {
+		if let ContractInfo::Tombstone(tombstone) = self {
+			Some(tombstone)
+		} else {
+			None
+		}
+	}
+}
+
+/// Information for managing an account and its sub trie abstraction.
+/// This is the required info to cache for an account.
+#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug)]
+pub struct RawAliveContractInfo<CodeHash, Balance, BlockNumber> {
+	/// Unique ID for the subtree encoded as a bytes vector.
+	pub trie_id: TrieId,
+	/// The total number of bytes used by this contract.
+	///
+	/// It is a sum of each key-value pair stored by this contract.
+	pub storage_size: u32,
+	/// The total number of key-value pairs in storage of this contract.
+	pub pair_count: u32,
+	/// The code associated with a given account.
+	pub code_hash: CodeHash,
+	/// Pay rent at most up to this value.
+	pub rent_allowance: Balance,
+	/// The amount of rent that was payed by the contract over its whole lifetime.
+	///
+	/// A restored contract starts with a value of zero just like a new contract.
+	pub rent_payed: Balance,
+	/// Last block rent has been payed.
+	pub deduct_block: BlockNumber,
+	/// Last block child storage has been written.
+	pub last_write: Option<BlockNumber>,
+	/// This field is reserved for future evolution of format.
+	pub _reserved: Option<()>,
+}
+
+impl<CodeHash, Balance, BlockNumber> RawAliveContractInfo<CodeHash, Balance, BlockNumber> {
+	/// Associated child trie unique id is built from the hash part of the trie id.
+	pub fn child_trie_info(&self) -> ChildInfo {
+		child_trie_info(&self.trie_id[..])
+	}
+}
+
+/// Associated child trie unique id is built from the hash part of the trie id.
+fn child_trie_info(trie_id: &[u8]) -> ChildInfo {
+	ChildInfo::new_default(trie_id)
+}
+
+#[derive(Encode, Decode, PartialEq, Eq, RuntimeDebug)]
+pub struct RawTombstoneContractInfo<H, Hasher>(H, PhantomData<Hasher>);
+
+impl<H, Hasher> RawTombstoneContractInfo<H, Hasher>
+where
+	H: Member + MaybeSerializeDeserialize+ Debug
+		+ AsRef<[u8]> + AsMut<[u8]> + Copy + Default
+		+ sp_std::hash::Hash + Codec,
+	Hasher: Hash<Output=H>,
+{
+	pub fn new(storage_root: &[u8], code_hash: H) -> Self {
+		let mut buf = Vec::new();
+		storage_root.using_encoded(|encoded| buf.extend_from_slice(encoded));
+		buf.extend_from_slice(code_hash.as_ref());
+		RawTombstoneContractInfo(<Hasher as Hash>::hash(&buf[..]), PhantomData)
+	}
+}
+
+impl<T: Config> From<AliveContractInfo<T>> for ContractInfo<T> {
+	fn from(alive_info: AliveContractInfo<T>) -> Self {
+		Self::Alive(alive_info)
+	}
+}
+
 /// An error that means that the account requested either doesn't exist or represents a tombstone
 /// account.
 #[cfg_attr(test, derive(PartialEq, Eq, Debug))]
@@ -59,7 +167,7 @@ where
 	/// The read is performed from the `trie_id` only. The `address` is not necessary. If the contract
 	/// doesn't store under the given `key` `None` is returned.
 	pub fn read(trie_id: &TrieId, key: &StorageKey) -> Option<Vec<u8>> {
-		child::get_raw(&crate::child_trie_info(&trie_id), &blake2_256(key))
+		child::get_raw(&child_trie_info(&trie_id), &blake2_256(key))
 	}
 
 	/// Update a storage entry into a contract's kv storage.
@@ -87,7 +195,7 @@ where
 		};
 
 		let hashed_key = blake2_256(key);
-		let child_trie_info = &crate::child_trie_info(&trie_id);
+		let child_trie_info = &child_trie_info(&trie_id);
 
 		let opt_prev_len = child::len(&child_trie_info, &hashed_key);
 
@@ -257,7 +365,7 @@ where
 			let trie = &mut queue[0];
 			let pair_count = trie.pair_count;
 			let outcome = child::kill_storage(
-				&crate::child_trie_info(&trie.trie_id),
+				&child_trie_info(&trie.trie_id),
 				Some(remaining_key_budget),
 			);
 			if pair_count > remaining_key_budget {
@@ -290,7 +398,6 @@ where
 	/// This generator uses inner counter for account id and applies the hash over `AccountId +
 	/// accountid_counter`.
 	pub fn generate_trie_id(account_id: &AccountIdOf<T>) -> TrieId {
-		use sp_runtime::traits::Hash;
 		// Note that skipping a value due to error is not an issue here.
 		// We only need uniqueness, not sequence.
 		let new_seed = <AccountCounter<T>>::mutate(|v| {
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index 92cfe182808d..5fb637f3e9f1 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -17,7 +17,7 @@
 
 use crate::{
 	BalanceOf, ContractInfo, ContractInfoOf, Pallet,
-	RawAliveContractInfo, Config, Schedule,
+	Config, Schedule,
 	Error, storage::Storage,
 	chain_extension::{
 		Result as ExtensionResult, Environment, ChainExtension, Ext, SysConfig, RetVal,
@@ -26,6 +26,7 @@ use crate::{
 	exec::{AccountIdOf, Executable}, wasm::PrefabWasmModule,
 	weights::WeightInfo,
 	wasm::ReturnCode as RuntimeReturnCode,
+	storage::RawAliveContractInfo,
 };
 use assert_matches::assert_matches;
 use codec::Encode;
diff --git a/frame/contracts/src/wasm/prepare.rs b/frame/contracts/src/wasm/prepare.rs
index 4bb70e805e5f..15556b0c5cd0 100644
--- a/frame/contracts/src/wasm/prepare.rs
+++ b/frame/contracts/src/wasm/prepare.rs
@@ -519,7 +519,7 @@ pub mod benchmarking {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use crate::{exec::Ext, Limits};
+	use crate::{exec::Ext, schedule::Limits};
 	use std::fmt;
 
 	impl fmt::Debug for PrefabWasmModule<crate::tests::Test> {
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index 802207e4fe8e..f3757e4c2b10 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -18,10 +18,11 @@
 //! Environment definition of the wasm smart-contract runtime.
 
 use crate::{
-	HostFnWeights, Config, CodeHash, BalanceOf, Error,
+	Config, CodeHash, BalanceOf, Error,
 	exec::{Ext, StorageKey, TopicOf},
 	gas::{GasMeter, Token, ChargedAmount},
 	wasm::env_def::ConvertibleToWasm,
+	schedule::HostFnWeights,
 };
 use parity_wasm::elements::ValueType;
 use frame_support::{dispatch::DispatchError, ensure, traits::Get, weights::Weight};

From 4d4e1a2bd1a493af72ab6558ec58e104c86f3f12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Wed, 24 Mar 2021 08:56:25 +0000
Subject: [PATCH 0546/1194] grandpa: speed up tests (#8439)

* grandpa: tests: add peers with authority role

* grandpa: tests: manually wake-up poll_fn future
---
 client/finality-grandpa/src/tests.rs          | 61 ++++++++++++-------
 client/finality-grandpa/src/until_imported.rs |  7 ++-
 client/network/test/src/lib.rs                |  4 +-
 3 files changed, 49 insertions(+), 23 deletions(-)

diff --git a/client/finality-grandpa/src/tests.rs b/client/finality-grandpa/src/tests.rs
index 42d0a10d34e0..d0a6b0874fa7 100644
--- a/client/finality-grandpa/src/tests.rs
+++ b/client/finality-grandpa/src/tests.rs
@@ -62,18 +62,34 @@ struct GrandpaTestNet {
 }
 
 impl GrandpaTestNet {
-	fn new(test_config: TestApi, n_peers: usize) -> Self {
+	fn new(test_config: TestApi, n_authority: usize, n_full: usize) -> Self {
 		let mut net = GrandpaTestNet {
-			peers: Vec::with_capacity(n_peers),
+			peers: Vec::with_capacity(n_authority + n_full),
 			test_config,
 		};
-		for _ in 0..n_peers {
+
+		for _ in 0..n_authority {
+			net.add_authority_peer();
+		}
+
+		for _ in 0..n_full {
 			net.add_full_peer();
 		}
+
 		net
 	}
 }
 
+impl GrandpaTestNet {
+	fn add_authority_peer(&mut self) {
+		self.add_full_peer_with_config(FullPeerConfig {
+			notifications_protocols: vec![communication::GRANDPA_PROTOCOL_NAME.into()],
+			is_authority: true,
+			..Default::default()
+		})
+	}
+}
+
 impl TestNetFactory for GrandpaTestNet {
 	type Verifier = PassThroughVerifier;
 	type PeerData = PeerData;
@@ -94,6 +110,7 @@ impl TestNetFactory for GrandpaTestNet {
 	fn add_full_peer(&mut self) {
 		self.add_full_peer_with_config(FullPeerConfig {
 			notifications_protocols: vec![communication::GRANDPA_PROTOCOL_NAME.into()],
+			is_authority: false,
 			..Default::default()
 		})
 	}
@@ -354,7 +371,7 @@ fn finalize_3_voters_no_observers() {
 	let peers = &[Ed25519Keyring::Alice, Ed25519Keyring::Bob, Ed25519Keyring::Charlie];
 	let voters = make_ids(peers);
 
-	let mut net = GrandpaTestNet::new(TestApi::new(voters), 3);
+	let mut net = GrandpaTestNet::new(TestApi::new(voters), 3, 0);
 	runtime.spawn(initialize_grandpa(&mut net, peers));
 	net.peer(0).push_blocks(20, false);
 	net.block_until_sync();
@@ -381,7 +398,7 @@ fn finalize_3_voters_1_full_observer() {
 	let peers = &[Ed25519Keyring::Alice, Ed25519Keyring::Bob, Ed25519Keyring::Charlie];
 	let voters = make_ids(peers);
 
-	let mut net = GrandpaTestNet::new(TestApi::new(voters), 4);
+	let mut net = GrandpaTestNet::new(TestApi::new(voters), 3, 1);
 	runtime.spawn(initialize_grandpa(&mut net, peers));
 
 	runtime.spawn({
@@ -464,7 +481,7 @@ fn transition_3_voters_twice_1_full_observer() {
 	let genesis_voters = make_ids(peers_a);
 
 	let api = TestApi::new(genesis_voters);
-	let net = Arc::new(Mutex::new(GrandpaTestNet::new(api, 8)));
+	let net = Arc::new(Mutex::new(GrandpaTestNet::new(api, 8, 1)));
 
 	let mut runtime = Runtime::new().unwrap();
 
@@ -602,7 +619,7 @@ fn justification_is_generated_periodically() {
 	let peers = &[Ed25519Keyring::Alice, Ed25519Keyring::Bob, Ed25519Keyring::Charlie];
 	let voters = make_ids(peers);
 
-	let mut net = GrandpaTestNet::new(TestApi::new(voters), 3);
+	let mut net = GrandpaTestNet::new(TestApi::new(voters), 3, 0);
 	runtime.spawn(initialize_grandpa(&mut net, peers));
 	net.peer(0).push_blocks(32, false);
 	net.block_until_sync();
@@ -626,7 +643,7 @@ fn sync_justifications_on_change_blocks() {
 
 	// 4 peers, 3 of them are authorities and participate in grandpa
 	let api = TestApi::new(voters);
-	let mut net = GrandpaTestNet::new(api, 4);
+	let mut net = GrandpaTestNet::new(api, 3, 1);
 	let voters = initialize_grandpa(&mut net, peers_a);
 
 	// add 20 blocks
@@ -688,8 +705,10 @@ fn finalizes_multiple_pending_changes_in_order() {
 	let genesis_voters = make_ids(peers_a);
 
 	// 6 peers, 3 of them are authorities and participate in grandpa from genesis
+	// but all of them will be part of the voter set eventually so they should be
+	// all added to the network as authorities
 	let api = TestApi::new(genesis_voters);
-	let mut net = GrandpaTestNet::new(api, 6);
+	let mut net = GrandpaTestNet::new(api, 6, 0);
 	runtime.spawn(initialize_grandpa(&mut net, all_peers));
 
 	// add 20 blocks
@@ -749,7 +768,7 @@ fn force_change_to_new_set() {
 	let api = TestApi::new(make_ids(genesis_authorities));
 
 	let voters = make_ids(peers_a);
-	let mut net = GrandpaTestNet::new(api, 3);
+	let mut net = GrandpaTestNet::new(api, 3, 0);
 	let voters_future = initialize_grandpa(&mut net, peers_a);
 	let net = Arc::new(Mutex::new(net));
 
@@ -798,7 +817,7 @@ fn allows_reimporting_change_blocks() {
 	let peers_b = &[Ed25519Keyring::Alice, Ed25519Keyring::Bob];
 	let voters = make_ids(peers_a);
 	let api = TestApi::new(voters);
-	let mut net = GrandpaTestNet::new(api.clone(), 3);
+	let mut net = GrandpaTestNet::new(api.clone(), 3, 0);
 
 	let client = net.peer(0).client().clone();
 	let (mut block_import, ..) = net.make_block_import::<
@@ -847,7 +866,7 @@ fn test_bad_justification() {
 	let peers_b = &[Ed25519Keyring::Alice, Ed25519Keyring::Bob];
 	let voters = make_ids(peers_a);
 	let api = TestApi::new(voters);
-	let mut net = GrandpaTestNet::new(api.clone(), 3);
+	let mut net = GrandpaTestNet::new(api.clone(), 3, 0);
 
 	let client = net.peer(0).client().clone();
 	let (mut block_import, ..) = net.make_block_import::<
@@ -907,7 +926,7 @@ fn voter_persists_its_votes() {
 	let voters = make_ids(peers);
 
 	// alice has a chain with 20 blocks
-	let mut net = GrandpaTestNet::new(TestApi::new(voters.clone()), 2);
+	let mut net = GrandpaTestNet::new(TestApi::new(voters.clone()), 2, 0);
 
 	// create the communication layer for bob, but don't start any
 	// voter. instead we'll listen for the prevote that alice casts
@@ -992,7 +1011,7 @@ fn voter_persists_its_votes() {
 
 		// we add a new peer to the test network and we'll use
 		// the network service of this new peer
-		net.add_full_peer();
+		net.add_authority_peer();
 		let net_service = net.peers[2].network_service().clone();
 		// but we'll reuse the client from the first peer (alice_voter1)
 		// since we want to share the same database, so that we can
@@ -1163,7 +1182,7 @@ fn finalize_3_voters_1_light_observer() {
 	let authorities = &[Ed25519Keyring::Alice, Ed25519Keyring::Bob, Ed25519Keyring::Charlie];
 	let voters = make_ids(authorities);
 
-	let mut net = GrandpaTestNet::new(TestApi::new(voters), 4);
+	let mut net = GrandpaTestNet::new(TestApi::new(voters), 3, 1);
 	let voters = initialize_grandpa(&mut net, authorities);
 	let observer = observer::run_grandpa_observer(
 		Config {
@@ -1201,7 +1220,7 @@ fn voter_catches_up_to_latest_round_when_behind() {
 	let peers = &[Ed25519Keyring::Alice, Ed25519Keyring::Bob];
 	let voters = make_ids(peers);
 
-	let net = GrandpaTestNet::new(TestApi::new(voters), 2);
+	let net = GrandpaTestNet::new(TestApi::new(voters), 2, 0);
 
 	let net = Arc::new(Mutex::new(net));
 	let mut finality_notifications = Vec::new();
@@ -1269,7 +1288,7 @@ fn voter_catches_up_to_latest_round_when_behind() {
 		let runtime = runtime.handle().clone();
 
 		wait_for_finality.then(move |_| {
-			net.lock().add_full_peer();
+			net.lock().add_authority_peer();
 
 			let link = {
 				let net = net.lock();
@@ -1373,7 +1392,7 @@ fn grandpa_environment_respects_voting_rules() {
 	let peers = &[Ed25519Keyring::Alice];
 	let voters = make_ids(peers);
 
-	let mut net = GrandpaTestNet::new(TestApi::new(voters), 1);
+	let mut net = GrandpaTestNet::new(TestApi::new(voters), 1, 0);
 	let peer = net.peer(0);
 	let network_service = peer.network_service().clone();
 	let link = peer.data.lock().take().unwrap();
@@ -1466,7 +1485,7 @@ fn grandpa_environment_never_overwrites_round_voter_state() {
 	let peers = &[Ed25519Keyring::Alice];
 	let voters = make_ids(peers);
 
-	let mut net = GrandpaTestNet::new(TestApi::new(voters), 1);
+	let mut net = GrandpaTestNet::new(TestApi::new(voters), 1, 0);
 	let peer = net.peer(0);
 	let network_service = peer.network_service().clone();
 	let link = peer.data.lock().take().unwrap();
@@ -1535,7 +1554,7 @@ fn imports_justification_for_regular_blocks_on_import() {
 	let peers = &[Ed25519Keyring::Alice];
 	let voters = make_ids(peers);
 	let api = TestApi::new(voters);
-	let mut net = GrandpaTestNet::new(api.clone(), 1);
+	let mut net = GrandpaTestNet::new(api.clone(), 1, 0);
 
 	let client = net.peer(0).client().clone();
 	let (mut block_import, ..) = net.make_block_import::<
@@ -1612,7 +1631,7 @@ fn grandpa_environment_doesnt_send_equivocation_reports_for_itself() {
 	let voters = make_ids(&[alice]);
 
 	let environment = {
-		let mut net = GrandpaTestNet::new(TestApi::new(voters), 1);
+		let mut net = GrandpaTestNet::new(TestApi::new(voters), 1, 0);
 		let peer = net.peer(0);
 		let network_service = peer.network_service().clone();
 		let link = peer.data.lock().take().unwrap();
diff --git a/client/finality-grandpa/src/until_imported.rs b/client/finality-grandpa/src/until_imported.rs
index c27eab535156..bcde68d2fb33 100644
--- a/client/finality-grandpa/src/until_imported.rs
+++ b/client/finality-grandpa/src/until_imported.rs
@@ -987,7 +987,7 @@ mod tests {
 		threads_pool.spawn_ok(until_imported.into_future().map(|_| ()));
 
 		// assert that we will make sync requests
-		let assert = futures::future::poll_fn(|_| {
+		let assert = futures::future::poll_fn(|ctx| {
 			let block_sync_requests = block_sync_requester.requests.lock();
 
 			// we request blocks targeted by the precommits that aren't imported
@@ -997,6 +997,11 @@ mod tests {
 				return Poll::Ready(());
 			}
 
+			// NOTE: nothing in this function is future-aware (i.e nothing gets registered to wake
+			// up this future), we manually wake up this task to avoid having to wait until the
+			// timeout below triggers.
+			ctx.waker().wake_by_ref();
+
 			Poll::Pending
 		});
 
diff --git a/client/network/test/src/lib.rs b/client/network/test/src/lib.rs
index 1c237f94700c..32a6e07eab42 100644
--- a/client/network/test/src/lib.rs
+++ b/client/network/test/src/lib.rs
@@ -610,6 +610,8 @@ pub struct FullPeerConfig {
 	///
 	/// If `None`, it will be connected to all other peers.
 	pub connect_to_peers: Option<Vec<usize>>,
+	/// Whether the full peer should have the authority role.
+	pub is_authority: bool,
 }
 
 pub trait TestNetFactory: Sized {
@@ -743,7 +745,7 @@ pub trait TestNetFactory: Sized {
 		};
 
 		let network = NetworkWorker::new(sc_network::config::Params {
-			role: Role::Full,
+			role: if config.is_authority { Role::Authority } else { Role::Full },
 			executor: None,
 			transactions_handler_executor: Box::new(|task| { async_std::task::spawn(task); }),
 			network_config,

From 069917b9db49205222fbf1a1a9f4058ab2328f5d Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Wed, 24 Mar 2021 11:06:41 +0100
Subject: [PATCH 0547/1194] remove outdated comment (#8442)

---
 frame/assets/src/lib.rs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index e9f5445dd8e4..65630cf1ba56 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -1495,8 +1495,6 @@ impl<T: Config> Pallet<T> {
 				Account::<T>::try_mutate(id, &dest, |a| -> DispatchResult {
 					let new_balance = a.balance.saturating_add(amount);
 
-					// This is impossible since `new_balance > amount > min_balance`, but we can
-					// handle it, so we do.
 					ensure!(new_balance >= details.min_balance, Error::<T>::BalanceLow);
 
 					if a.balance.is_zero() {

From 189d0791765d3205690e28333106b49fb1f68bea Mon Sep 17 00:00:00 2001
From: Seun Lanlege <seun@parity.io>
Date: Wed, 24 Mar 2021 11:28:26 +0100
Subject: [PATCH 0548/1194] test runner (#7665)

---
 Cargo.lock                                   | 425 +++++++++++------
 Cargo.toml                                   |   2 +
 bin/node/test-runner-example/Cargo.toml      |  40 ++
 bin/node/test-runner-example/src/lib.rs      | 202 ++++++++
 client/executor/src/native_executor.rs       |  14 +-
 frame/babe/src/tests.rs                      |   1 -
 test-utils/test-runner/Cargo.toml            |  61 +++
 test-utils/test-runner/src/host_functions.rs |  70 +++
 test-utils/test-runner/src/lib.rs            | 312 ++++++++++++
 test-utils/test-runner/src/node.rs           | 476 +++++++++++++++++++
 test-utils/test-runner/src/utils.rs          |  56 +++
 11 files changed, 1502 insertions(+), 157 deletions(-)
 create mode 100644 bin/node/test-runner-example/Cargo.toml
 create mode 100644 bin/node/test-runner-example/src/lib.rs
 create mode 100644 test-utils/test-runner/Cargo.toml
 create mode 100644 test-utils/test-runner/src/host_functions.rs
 create mode 100644 test-utils/test-runner/src/lib.rs
 create mode 100644 test-utils/test-runner/src/node.rs
 create mode 100644 test-utils/test-runner/src/utils.rs

diff --git a/Cargo.lock b/Cargo.lock
index 045b2780c4bf..cd3d3b660861 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -482,6 +482,16 @@ version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
 
+[[package]]
+name = "bitvec"
+version = "0.17.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41262f11d771fd4a61aa3ce019fca363b4b6c282fca9da2a31186d3965a47a5c"
+dependencies = [
+ "either",
+ "radium 0.3.0",
+]
+
 [[package]]
 name = "bitvec"
 version = "0.20.2"
@@ -489,7 +499,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f682656975d3a682daff957be4ddeb65d6ad656737cd821f2d00685ae466af1"
 dependencies = [
  "funty",
- "radium",
+ "radium 0.6.2",
  "tap",
  "wyz",
 ]
@@ -645,6 +655,12 @@ version = "3.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe"
 
+[[package]]
+name = "byte-slice-cast"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3"
+
 [[package]]
 name = "byte-slice-cast"
 version = "1.0.0"
@@ -1618,7 +1634,7 @@ dependencies = [
  "futures-timer 3.0.2",
  "log",
  "num-traits",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parking_lot 0.11.1",
  "rand 0.8.3",
 ]
@@ -1664,7 +1680,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 name = "fork-tree"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
 ]
 
 [[package]]
@@ -1686,7 +1702,7 @@ dependencies = [
  "hex-literal",
  "linregress",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "paste 1.0.4",
  "serde",
  "sp-api",
@@ -1705,7 +1721,7 @@ dependencies = [
  "chrono",
  "frame-benchmarking",
  "handlebars",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sc-cli",
  "sc-client-db",
  "sc-executor",
@@ -1725,7 +1741,7 @@ version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sp-arithmetic",
  "sp-npos-elections",
  "sp-runtime",
@@ -1742,7 +1758,7 @@ dependencies = [
  "pallet-balances",
  "pallet-indices",
  "pallet-transaction-payment",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -1756,7 +1772,7 @@ dependencies = [
 name = "frame-metadata"
 version = "13.0.0"
 dependencies = [
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-std",
@@ -1773,7 +1789,7 @@ dependencies = [
  "impl-trait-for-tuples",
  "log",
  "once_cell",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parity-util-mem",
  "paste 1.0.4",
  "pretty_assertions",
@@ -1828,7 +1844,7 @@ dependencies = [
  "frame-metadata",
  "frame-support",
  "frame-system",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "pretty_assertions",
  "rustversion",
  "serde",
@@ -1849,7 +1865,7 @@ dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-externalities",
@@ -1867,7 +1883,7 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -1879,7 +1895,7 @@ dependencies = [
 name = "frame-system-rpc-runtime-api"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sp-api",
 ]
 
@@ -1888,7 +1904,7 @@ name = "frame-try-runtime"
 version = "0.9.0"
 dependencies = [
  "frame-support",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sp-api",
  "sp-runtime",
  "sp-std",
@@ -2599,7 +2615,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df170efa359aebdd5cb7fe78edcc67107748e4737bdca8a8fb40d15ea7a877ed"
 dependencies = [
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
 ]
 
 [[package]]
@@ -4004,7 +4020,7 @@ dependencies = [
  "pallet-staking",
  "pallet-timestamp",
  "pallet-transaction-payment",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parking_lot 0.11.1",
  "platforms",
  "rand 0.7.3",
@@ -4076,7 +4092,7 @@ dependencies = [
  "pallet-timestamp",
  "pallet-transaction-payment",
  "pallet-treasury",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sc-executor",
  "sp-application-crypto",
  "sp-consensus-babe",
@@ -4098,7 +4114,7 @@ version = "0.8.0"
 dependencies = [
  "derive_more",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sc-cli",
  "sc-client-api",
  "sc-service",
@@ -4113,7 +4129,7 @@ name = "node-primitives"
 version = "2.0.0"
 dependencies = [
  "frame-system",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "pretty_assertions",
  "sp-application-crypto",
  "sp-core",
@@ -4221,7 +4237,7 @@ dependencies = [
  "pallet-treasury",
  "pallet-utility",
  "pallet-vesting",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-api",
  "sp-authority-discovery",
@@ -4299,7 +4315,7 @@ dependencies = [
  "pallet-timestamp",
  "pallet-transaction-payment",
  "pallet-transaction-payment-rpc-runtime-api",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-api",
  "sp-block-builder",
@@ -4338,7 +4354,7 @@ dependencies = [
  "pallet-timestamp",
  "pallet-transaction-payment",
  "pallet-treasury",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sc-block-builder",
  "sc-cli",
  "sc-client-api",
@@ -4519,7 +4535,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -4534,7 +4550,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -4551,7 +4567,7 @@ dependencies = [
  "lazy_static",
  "pallet-session",
  "pallet-timestamp",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parking_lot 0.11.1",
  "serde",
  "sp-application-crypto",
@@ -4569,7 +4585,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-session",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-application-crypto",
  "sp-authority-discovery",
@@ -4587,7 +4603,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "impl-trait-for-tuples",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-authorship",
  "sp-core",
@@ -4613,7 +4629,7 @@ dependencies = [
  "pallet-staking",
  "pallet-staking-reward-curve",
  "pallet-timestamp",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-application-crypto",
  "sp-consensus-babe",
@@ -4635,7 +4651,7 @@ dependencies = [
  "frame-system",
  "log",
  "pallet-transaction-payment",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -4652,7 +4668,7 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "pallet-treasury",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -4671,7 +4687,7 @@ dependencies = [
  "hex-literal",
  "log",
  "pallet-balances",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -4694,7 +4710,7 @@ dependencies = [
  "pallet-contracts-proc-macro",
  "pallet-randomness-collective-flip",
  "pallet-timestamp",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parity-wasm 0.41.0",
  "paste 1.0.4",
  "pretty_assertions",
@@ -4716,7 +4732,7 @@ name = "pallet-contracts-primitives"
 version = "3.0.0"
 dependencies = [
  "bitflags",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sp-runtime",
  "sp-std",
 ]
@@ -4739,7 +4755,7 @@ dependencies = [
  "jsonrpc-derive",
  "pallet-contracts-primitives",
  "pallet-contracts-rpc-runtime-api",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "serde_json",
  "sp-api",
@@ -4754,7 +4770,7 @@ name = "pallet-contracts-rpc-runtime-api"
 version = "3.0.0"
 dependencies = [
  "pallet-contracts-primitives",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sp-api",
  "sp-runtime",
  "sp-std",
@@ -4770,7 +4786,7 @@ dependencies = [
  "hex-literal",
  "pallet-balances",
  "pallet-scheduler",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -4791,7 +4807,7 @@ dependencies = [
  "hex-literal",
  "log",
  "pallet-balances",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parking_lot 0.11.1",
  "paste 1.0.4",
  "rand 0.7.3",
@@ -4815,7 +4831,7 @@ dependencies = [
  "frame-system",
  "hex-literal",
  "pallet-balances",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -4833,7 +4849,7 @@ dependencies = [
  "hex-literal",
  "log",
  "pallet-balances",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -4851,7 +4867,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -4867,7 +4883,7 @@ dependencies = [
  "frame-system",
  "lite-json",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -4882,7 +4898,7 @@ version = "2.0.1"
 dependencies = [
  "frame-support",
  "frame-system",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -4899,7 +4915,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-arithmetic",
  "sp-core",
@@ -4925,7 +4941,7 @@ dependencies = [
  "pallet-staking",
  "pallet-staking-reward-curve",
  "pallet-timestamp",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-application-crypto",
  "sp-core",
@@ -4947,7 +4963,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -4965,7 +4981,7 @@ dependencies = [
  "log",
  "pallet-authorship",
  "pallet-session",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-application-crypto",
  "sp-core",
@@ -4983,7 +4999,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -5001,7 +5017,7 @@ dependencies = [
  "frame-support-test",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -5015,7 +5031,7 @@ version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -5034,7 +5050,7 @@ dependencies = [
  "frame-system",
  "hex-literal",
  "pallet-mmr-primitives",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -5050,7 +5066,7 @@ dependencies = [
  "frame-system",
  "hex-literal",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-api",
  "sp-core",
@@ -5066,7 +5082,7 @@ dependencies = [
  "jsonrpc-core-client",
  "jsonrpc-derive",
  "pallet-mmr-primitives",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "serde_json",
  "sp-api",
@@ -5084,7 +5100,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -5099,7 +5115,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -5114,7 +5130,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -5130,7 +5146,7 @@ dependencies = [
  "frame-system",
  "log",
  "pallet-balances",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -5156,7 +5172,7 @@ dependencies = [
  "pallet-staking",
  "pallet-staking-reward-curve",
  "pallet-timestamp",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -5174,7 +5190,7 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "pallet-utility",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -5188,7 +5204,7 @@ version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "safe-mix",
  "serde",
  "sp-core",
@@ -5205,7 +5221,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -5221,7 +5237,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -5237,7 +5253,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -5254,7 +5270,7 @@ dependencies = [
  "impl-trait-for-tuples",
  "lazy_static",
  "pallet-timestamp",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-application-crypto",
  "sp-core",
@@ -5279,7 +5295,7 @@ dependencies = [
  "pallet-staking",
  "pallet-staking-reward-curve",
  "pallet-timestamp",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "rand 0.7.3",
  "serde",
  "sp-core",
@@ -5297,7 +5313,7 @@ dependencies = [
  "frame-support-test",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "rand_chacha 0.2.2",
  "serde",
  "sp-core",
@@ -5321,7 +5337,7 @@ dependencies = [
  "pallet-session",
  "pallet-staking-reward-curve",
  "pallet-timestamp",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parking_lot 0.11.1",
  "paste 1.0.4",
  "rand_chacha 0.2.2",
@@ -5364,7 +5380,7 @@ version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -5379,7 +5395,7 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -5395,7 +5411,7 @@ dependencies = [
  "frame-system",
  "impl-trait-for-tuples",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-inherents",
@@ -5414,7 +5430,7 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "pallet-treasury",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -5430,7 +5446,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "serde_json",
  "smallvec 1.6.1",
@@ -5449,7 +5465,7 @@ dependencies = [
  "jsonrpc-core-client",
  "jsonrpc-derive",
  "pallet-transaction-payment-rpc-runtime-api",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sp-api",
  "sp-blockchain",
  "sp-core",
@@ -5462,7 +5478,7 @@ name = "pallet-transaction-payment-rpc-runtime-api"
 version = "3.0.0"
 dependencies = [
  "pallet-transaction-payment",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sp-api",
  "sp-runtime",
 ]
@@ -5476,7 +5492,7 @@ dependencies = [
  "frame-system",
  "impl-trait-for-tuples",
  "pallet-balances",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -5493,7 +5509,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -5511,7 +5527,7 @@ dependencies = [
  "frame-system",
  "hex-literal",
  "pallet-balances",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -5555,6 +5571,18 @@ dependencies = [
  "url 2.2.1",
 ]
 
+[[package]]
+name = "parity-scale-codec"
+version = "1.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4b26b16c7687c3075982af47719e481815df30bc544f7a6690763a25ca16e9d"
+dependencies = [
+ "arrayvec 0.5.2",
+ "bitvec 0.17.4",
+ "byte-slice-cast 0.3.5",
+ "serde",
+]
+
 [[package]]
 name = "parity-scale-codec"
 version = "2.0.1"
@@ -5562,8 +5590,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0cd3dab59b5cf4bc81069ade0fc470341a1ef3ad5fa73e5a8943bed2ec12b2e8"
 dependencies = [
  "arrayvec 0.5.2",
- "bitvec",
- "byte-slice-cast",
+ "bitvec 0.20.2",
+ "byte-slice-cast 1.0.0",
  "parity-scale-codec-derive",
  "serde",
 ]
@@ -6258,6 +6286,12 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "radium"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac"
+
 [[package]]
 name = "radium"
 version = "0.6.2"
@@ -6570,7 +6604,7 @@ dependencies = [
  "jsonrpsee-proc-macros",
  "jsonrpsee-types",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -6765,7 +6799,7 @@ dependencies = [
  "futures-timer 3.0.2",
  "libp2p",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "prost",
  "prost-build",
  "quickcheck",
@@ -6792,7 +6826,7 @@ dependencies = [
  "futures 0.3.13",
  "futures-timer 3.0.2",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parking_lot 0.11.1",
  "sc-block-builder",
  "sc-client-api",
@@ -6814,7 +6848,7 @@ dependencies = [
 name = "sc-block-builder"
 version = "0.9.0"
 dependencies = [
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sc-client-api",
  "sp-api",
  "sp-block-builder",
@@ -6832,7 +6866,7 @@ name = "sc-chain-spec"
 version = "3.0.0"
 dependencies = [
  "impl-trait-for-tuples",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sc-chain-spec-derive",
  "sc-consensus-babe",
  "sc-consensus-epochs",
@@ -6868,7 +6902,7 @@ dependencies = [
  "libp2p",
  "log",
  "names",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "rand 0.7.3",
  "regex",
  "rpassword",
@@ -6907,7 +6941,7 @@ dependencies = [
  "kvdb-memorydb",
  "lazy_static",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parking_lot 0.11.1",
  "sc-executor",
  "sp-api",
@@ -6944,7 +6978,7 @@ dependencies = [
  "linked-hash-map",
  "log",
  "parity-db",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parity-util-mem",
  "parking_lot 0.11.1",
  "quickcheck",
@@ -6985,7 +7019,7 @@ dependencies = [
  "futures-timer 3.0.2",
  "getrandom 0.2.2",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parking_lot 0.11.1",
  "sc-block-builder",
  "sc-client-api",
@@ -7030,7 +7064,7 @@ dependencies = [
  "num-bigint",
  "num-rational",
  "num-traits",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parking_lot 0.11.1",
  "pdqselect",
  "rand 0.7.3",
@@ -7106,7 +7140,7 @@ name = "sc-consensus-epochs"
 version = "0.9.0"
 dependencies = [
  "fork-tree",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parking_lot 0.11.1",
  "sc-client-api",
  "sp-blockchain",
@@ -7124,7 +7158,7 @@ dependencies = [
  "jsonrpc-core-client",
  "jsonrpc-derive",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parking_lot 0.11.1",
  "sc-basic-authorship",
  "sc-client-api",
@@ -7159,7 +7193,7 @@ dependencies = [
  "futures 0.3.13",
  "futures-timer 3.0.2",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parking_lot 0.11.1",
  "sc-client-api",
  "sp-api",
@@ -7181,7 +7215,7 @@ dependencies = [
  "futures 0.3.13",
  "futures-timer 3.0.2",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parking_lot 0.11.1",
  "sc-client-api",
  "sc-telemetry",
@@ -7224,7 +7258,7 @@ dependencies = [
  "lazy_static",
  "libsecp256k1",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parity-wasm 0.41.0",
  "parking_lot 0.11.1",
  "paste 1.0.4",
@@ -7259,7 +7293,7 @@ name = "sc-executor-common"
 version = "0.9.0"
 dependencies = [
  "derive_more",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parity-wasm 0.41.0",
  "sp-allocator",
  "sp-core",
@@ -7274,7 +7308,7 @@ name = "sc-executor-wasmi"
 version = "0.9.0"
 dependencies = [
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sc-executor-common",
  "sp-allocator",
  "sp-core",
@@ -7289,7 +7323,7 @@ version = "0.9.0"
 dependencies = [
  "assert_matches",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parity-wasm 0.41.0",
  "pwasm-utils 0.14.0",
  "sc-executor-common",
@@ -7314,7 +7348,7 @@ dependencies = [
  "futures-timer 3.0.2",
  "linked-hash-map",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parking_lot 0.11.1",
  "pin-project 1.0.5",
  "rand 0.7.3",
@@ -7361,7 +7395,7 @@ dependencies = [
  "jsonrpc-pubsub",
  "lazy_static",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sc-block-builder",
  "sc-client-api",
  "sc-finality-grandpa",
@@ -7387,7 +7421,7 @@ dependencies = [
  "futures 0.3.13",
  "log",
  "num-traits",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parking_lot 0.11.1",
  "prost",
  "rand 0.8.3",
@@ -7447,7 +7481,7 @@ version = "3.0.0"
 dependencies = [
  "hash-db",
  "lazy_static",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parking_lot 0.11.1",
  "sc-client-api",
  "sc-executor",
@@ -7486,7 +7520,7 @@ dependencies = [
  "log",
  "lru",
  "nohash-hasher",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parking_lot 0.11.1",
  "pin-project 1.0.5",
  "prost",
@@ -7580,7 +7614,7 @@ dependencies = [
  "lazy_static",
  "log",
  "num_cpus",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parking_lot 0.11.1",
  "rand 0.7.3",
  "sc-block-builder",
@@ -7635,7 +7669,7 @@ dependencies = [
  "jsonrpc-pubsub",
  "lazy_static",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parking_lot 0.11.1",
  "sc-block-builder",
  "sc-cli",
@@ -7676,7 +7710,7 @@ dependencies = [
  "jsonrpc-derive",
  "jsonrpc-pubsub",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parking_lot 0.11.1",
  "serde",
  "serde_json",
@@ -7734,7 +7768,7 @@ dependencies = [
  "jsonrpc-pubsub",
  "lazy_static",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parity-util-mem",
  "parking_lot 0.11.1",
  "pin-project 1.0.5",
@@ -7797,7 +7831,7 @@ dependencies = [
  "futures 0.3.13",
  "hex-literal",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parking_lot 0.11.1",
  "sc-block-builder",
  "sc-client-api",
@@ -7829,7 +7863,7 @@ name = "sc-state-db"
 version = "0.9.0"
 dependencies = [
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parity-util-mem",
  "parity-util-mem-derive",
  "parking_lot 0.11.1",
@@ -7922,7 +7956,7 @@ dependencies = [
  "futures 0.3.13",
  "linked-hash-map",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parity-util-mem",
  "parking_lot 0.11.1",
  "retain_mut",
@@ -7947,7 +7981,7 @@ dependencies = [
  "hex",
  "intervalier",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parity-util-mem",
  "parking_lot 0.11.1",
  "sc-block-builder",
@@ -8365,7 +8399,7 @@ version = "3.0.0"
 dependencies = [
  "hash-db",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sp-api-proc-macro",
  "sp-core",
  "sp-runtime",
@@ -8393,7 +8427,7 @@ version = "2.0.1"
 dependencies = [
  "criterion",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "rustversion",
  "sc-block-builder",
  "sp-api",
@@ -8412,7 +8446,7 @@ dependencies = [
 name = "sp-application-crypto"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -8438,7 +8472,7 @@ dependencies = [
  "criterion",
  "integer-sqrt",
  "num-traits",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "primitive-types",
  "rand 0.7.3",
  "serde",
@@ -8462,7 +8496,7 @@ dependencies = [
 name = "sp-authority-discovery"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sp-api",
  "sp-application-crypto",
  "sp-runtime",
@@ -8473,7 +8507,7 @@ dependencies = [
 name = "sp-authorship"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sp-inherents",
  "sp-runtime",
  "sp-std",
@@ -8483,7 +8517,7 @@ dependencies = [
 name = "sp-block-builder"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sp-api",
  "sp-inherents",
  "sp-runtime",
@@ -8497,7 +8531,7 @@ dependencies = [
  "futures 0.3.13",
  "log",
  "lru",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parking_lot 0.11.1",
  "sp-api",
  "sp-consensus",
@@ -8523,7 +8557,7 @@ dependencies = [
  "futures-timer 3.0.2",
  "libp2p",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parking_lot 0.11.1",
  "serde",
  "sp-api",
@@ -8545,7 +8579,7 @@ dependencies = [
 name = "sp-consensus-aura"
 version = "0.9.0"
 dependencies = [
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sp-api",
  "sp-application-crypto",
  "sp-consensus",
@@ -8561,7 +8595,7 @@ name = "sp-consensus-babe"
 version = "0.9.0"
 dependencies = [
  "merlin",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-api",
  "sp-application-crypto",
@@ -8580,7 +8614,7 @@ dependencies = [
 name = "sp-consensus-pow"
 version = "0.9.0"
 dependencies = [
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sp-api",
  "sp-core",
  "sp-runtime",
@@ -8591,7 +8625,7 @@ dependencies = [
 name = "sp-consensus-slots"
 version = "0.9.0"
 dependencies = [
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sp-arithmetic",
  "sp-runtime",
 ]
@@ -8600,7 +8634,7 @@ dependencies = [
 name = "sp-consensus-vrf"
 version = "0.9.0"
 dependencies = [
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "schnorrkel",
  "sp-core",
  "sp-runtime",
@@ -8628,7 +8662,7 @@ dependencies = [
  "log",
  "merlin",
  "num-traits",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parity-util-mem",
  "parking_lot 0.11.1",
  "pretty_assertions",
@@ -8678,7 +8712,7 @@ name = "sp-externalities"
 version = "0.9.0"
 dependencies = [
  "environmental",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sp-std",
  "sp-storage",
 ]
@@ -8689,7 +8723,7 @@ version = "3.0.0"
 dependencies = [
  "finality-grandpa",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-api",
  "sp-application-crypto",
@@ -8703,7 +8737,7 @@ dependencies = [
 name = "sp-inherents"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parking_lot 0.11.1",
  "sp-core",
  "sp-std",
@@ -8718,7 +8752,7 @@ dependencies = [
  "hash-db",
  "libsecp256k1",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parking_lot 0.11.1",
  "sp-core",
  "sp-externalities",
@@ -8751,7 +8785,7 @@ dependencies = [
  "derive_more",
  "futures 0.3.13",
  "merlin",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parking_lot 0.11.1",
  "rand 0.7.3",
  "rand_chacha 0.2.2",
@@ -8765,7 +8799,7 @@ dependencies = [
 name = "sp-npos-elections"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "rand 0.7.3",
  "serde",
  "sp-arithmetic",
@@ -8791,7 +8825,7 @@ name = "sp-npos-elections-fuzzer"
 version = "2.0.0-alpha.5"
 dependencies = [
  "honggfuzz",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "rand 0.7.3",
  "sp-arithmetic",
  "sp-npos-elections",
@@ -8834,7 +8868,7 @@ dependencies = [
  "hash256-std-hasher",
  "impl-trait-for-tuples",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parity-util-mem",
  "paste 1.0.4",
  "rand 0.7.3",
@@ -8856,7 +8890,7 @@ name = "sp-runtime-interface"
 version = "3.0.0"
 dependencies = [
  "impl-trait-for-tuples",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "primitive-types",
  "rustversion",
  "sp-core",
@@ -8927,7 +8961,7 @@ name = "sp-sandbox"
 version = "0.9.0"
 dependencies = [
  "assert_matches",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sp-core",
  "sp-io",
  "sp-std",
@@ -8948,7 +8982,7 @@ dependencies = [
 name = "sp-session"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sp-api",
  "sp-core",
  "sp-runtime",
@@ -8960,7 +8994,7 @@ dependencies = [
 name = "sp-staking"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sp-runtime",
  "sp-std",
 ]
@@ -8973,7 +9007,7 @@ dependencies = [
  "hex-literal",
  "log",
  "num-traits",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parking_lot 0.11.1",
  "pretty_assertions",
  "rand 0.7.3",
@@ -8998,7 +9032,7 @@ name = "sp-storage"
 version = "3.0.0"
 dependencies = [
  "impl-serde",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "ref-cast",
  "serde",
  "sp-debug-derive",
@@ -9010,7 +9044,7 @@ name = "sp-tasks"
 version = "3.0.0"
 dependencies = [
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sp-core",
  "sp-externalities",
  "sp-io",
@@ -9022,7 +9056,7 @@ dependencies = [
 name = "sp-test-primitives"
 version = "2.0.0"
 dependencies = [
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parity-util-mem",
  "serde",
  "sp-application-crypto",
@@ -9034,7 +9068,7 @@ dependencies = [
 name = "sp-timestamp"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sp-api",
  "sp-inherents",
  "sp-runtime",
@@ -9047,7 +9081,7 @@ name = "sp-tracing"
 version = "3.0.0"
 dependencies = [
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sp-std",
  "tracing",
  "tracing-core",
@@ -9061,7 +9095,7 @@ dependencies = [
  "derive_more",
  "futures 0.3.13",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-api",
  "sp-blockchain",
@@ -9077,7 +9111,7 @@ dependencies = [
  "hash-db",
  "hex-literal",
  "memory-db",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sp-core",
  "sp-runtime",
  "sp-std",
@@ -9103,7 +9137,7 @@ name = "sp-version"
 version = "3.0.0"
 dependencies = [
  "impl-serde",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "serde",
  "sp-runtime",
  "sp-std",
@@ -9114,7 +9148,7 @@ name = "sp-wasm-interface"
 version = "3.0.0"
 dependencies = [
  "impl-trait-for-tuples",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sp-std",
  "wasmi",
 ]
@@ -9289,7 +9323,7 @@ dependencies = [
  "futures 0.3.13",
  "jsonrpc-client-transports",
  "jsonrpc-core",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sc-rpc-api",
  "serde",
  "sp-storage",
@@ -9306,7 +9340,7 @@ dependencies = [
  "jsonrpc-core-client",
  "jsonrpc-derive",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sc-client-api",
  "sc-rpc-api",
  "sc-transaction-pool",
@@ -9342,7 +9376,7 @@ dependencies = [
  "futures 0.3.13",
  "hash-db",
  "hex",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sc-client-api",
  "sc-client-db",
  "sc-consensus",
@@ -9373,7 +9407,7 @@ dependencies = [
  "memory-db",
  "pallet-babe",
  "pallet-timestamp",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parity-util-mem",
  "sc-block-builder",
  "sc-executor",
@@ -9409,7 +9443,7 @@ name = "substrate-test-runtime-client"
 version = "2.0.0"
 dependencies = [
  "futures 0.3.13",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "sc-block-builder",
  "sc-client-api",
  "sc-consensus",
@@ -9430,7 +9464,7 @@ version = "2.0.0"
 dependencies = [
  "derive_more",
  "futures 0.3.13",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "parking_lot 0.11.1",
  "sc-transaction-graph",
  "sp-blockchain",
@@ -9558,6 +9592,88 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "test-runner"
+version = "0.9.0"
+dependencies = [
+ "env_logger 0.7.1",
+ "frame-system",
+ "futures 0.1.31",
+ "futures 0.3.13",
+ "jsonrpc-core",
+ "libp2p",
+ "log",
+ "node-cli",
+ "parity-scale-codec 1.3.7",
+ "rand 0.7.3",
+ "sc-basic-authorship",
+ "sc-cli",
+ "sc-client-api",
+ "sc-consensus-babe",
+ "sc-consensus-manual-seal",
+ "sc-executor",
+ "sc-finality-grandpa",
+ "sc-informant",
+ "sc-network",
+ "sc-rpc",
+ "sc-rpc-server",
+ "sc-service",
+ "sc-transaction-graph",
+ "sc-transaction-pool",
+ "sp-api",
+ "sp-block-builder",
+ "sp-blockchain",
+ "sp-consensus",
+ "sp-consensus-babe",
+ "sp-core",
+ "sp-externalities",
+ "sp-inherents",
+ "sp-io",
+ "sp-keyring",
+ "sp-keystore",
+ "sp-offchain",
+ "sp-runtime",
+ "sp-runtime-interface",
+ "sp-session",
+ "sp-state-machine",
+ "sp-transaction-pool",
+ "sp-wasm-interface",
+ "tokio 0.2.25",
+]
+
+[[package]]
+name = "test-runner-example"
+version = "0.1.0"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "log",
+ "node-cli",
+ "node-primitives",
+ "node-runtime",
+ "pallet-balances",
+ "pallet-sudo",
+ "pallet-transaction-payment",
+ "rand 0.8.3",
+ "sc-client-api",
+ "sc-consensus",
+ "sc-consensus-babe",
+ "sc-consensus-manual-seal",
+ "sc-executor",
+ "sc-finality-grandpa",
+ "sc-informant",
+ "sc-network",
+ "sc-service",
+ "sp-api",
+ "sp-consensus-babe",
+ "sp-inherents",
+ "sp-keyring",
+ "sp-keystore",
+ "sp-runtime",
+ "test-runner",
+]
+
 [[package]]
 name = "textwrap"
 version = "0.11.0"
@@ -9706,6 +9822,7 @@ dependencies = [
  "libc",
  "memchr",
  "mio",
+ "mio-named-pipes",
  "mio-uds",
  "num_cpus",
  "pin-project-lite 0.1.12",
@@ -10060,7 +10177,7 @@ dependencies = [
  "hash-db",
  "keccak-hasher",
  "memory-db",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "trie-db",
  "trie-root",
  "trie-standardmap",
@@ -10110,7 +10227,7 @@ version = "0.9.0"
 dependencies = [
  "frame-try-runtime",
  "log",
- "parity-scale-codec",
+ "parity-scale-codec 2.0.1",
  "remote-externalities",
  "sc-cli",
  "sc-client-api",
diff --git a/Cargo.toml b/Cargo.toml
index 9675070a516f..57052a8d38e0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,6 +6,7 @@ members = [
 	"bin/node/bench",
 	"bin/node/browser-testing",
 	"bin/node/cli",
+	"bin/node/test-runner-example",
 	"bin/node/executor",
 	"bin/node/primitives",
 	"bin/node/rpc",
@@ -184,6 +185,7 @@ members = [
 	"test-utils/runtime",
 	"test-utils/runtime/client",
 	"test-utils/runtime/transaction-pool",
+	"test-utils/test-runner",
 	"test-utils/test-crate",
 	"utils/browser",
 	"utils/build-script-utils",
diff --git a/bin/node/test-runner-example/Cargo.toml b/bin/node/test-runner-example/Cargo.toml
new file mode 100644
index 000000000000..f94575e8e621
--- /dev/null
+++ b/bin/node/test-runner-example/Cargo.toml
@@ -0,0 +1,40 @@
+[package]
+name = "test-runner-example"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
+publish = false
+
+[dependencies]
+test-runner = { path = "../../../test-utils/test-runner", version = "0.9.0" }
+
+frame-system = { version = "3.0.0", path = "../../../frame/system" }
+frame-support = { path = "../../../frame/support", version = "3.0.0" }
+frame-benchmarking = { path = "../../../frame/benchmarking", version = "3.0.0" }
+pallet-balances = { path = "../../../frame/balances", version = "3.0.0" }
+pallet-sudo = { path = "../../../frame/sudo", version = "3.0.0" }
+pallet-transaction-payment = { version = "3.0.0", path = "../../../frame/transaction-payment" }
+
+node-runtime = { path = "../runtime", version = "2.0.1" }
+node-primitives = { version = "2.0.0", path = "../primitives" }
+node-cli = { path = "../cli", version = "2.0.0" }
+
+grandpa = { version = "0.9.0", package = "sc-finality-grandpa", path = "../../../client/finality-grandpa" }
+sp-consensus-babe = { version = "0.9.0", path = "../../../primitives/consensus/babe" }
+sc-consensus-babe = { version = "0.9.0", path = "../../../client/consensus/babe" }
+sc-consensus-manual-seal = { version = "0.9.0", path = "../../../client/consensus/manual-seal" }
+sc-service = { version = "0.9.0", default-features = false, path = "../../../client/service" }
+sc-executor = { version = "0.9.0", path = "../../../client/executor" }
+sc-client-api = { version = "3.0.0", path = "../../../client/api" }
+sc-network = { version = "0.9.0", path = "../../../client/network" }
+sc-informant = { version = "0.9.0", path = "../../../client/informant" }
+sc-consensus = { version = "0.9.0", path = "../../../client/consensus/common" }
+
+sp-runtime = { path = "../../../primitives/runtime", version = "3.0.0" }
+sp-keyring = { version = "3.0.0", path = "../../../primitives/keyring" }
+sp-api = { version = "3.0.0",  path = "../../../primitives/api" }
+sp-inherents = { version = "3.0.0", path = "../../../primitives/inherents" }
+sp-keystore = { version = "0.9.0", path = "../../../primitives/keystore" }
+
+rand = "0.8.3"
+log = "0.4.14"
diff --git a/bin/node/test-runner-example/src/lib.rs b/bin/node/test-runner-example/src/lib.rs
new file mode 100644
index 000000000000..22cfffa7f23a
--- /dev/null
+++ b/bin/node/test-runner-example/src/lib.rs
@@ -0,0 +1,202 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! Basic example of end to end runtime tests.
+
+use test_runner::{Node, ChainInfo, SignatureVerificationOverride};
+use grandpa::GrandpaBlockImport;
+use sc_service::{TFullBackend, TFullClient, Configuration, TaskManager, new_full_parts};
+use std::sync::Arc;
+use sp_inherents::InherentDataProviders;
+use sc_consensus_babe::BabeBlockImport;
+use sp_keystore::SyncCryptoStorePtr;
+use sp_keyring::sr25519::Keyring::Alice;
+use sp_consensus_babe::AuthorityId;
+use sc_consensus_manual_seal::{ConsensusDataProvider, consensus::babe::BabeConsensusDataProvider};
+use sp_runtime::{traits::IdentifyAccount, MultiSigner, generic::Era};
+
+type BlockImport<B, BE, C, SC> = BabeBlockImport<B, C, GrandpaBlockImport<BE, B, C, SC>>;
+
+sc_executor::native_executor_instance!(
+	pub Executor,
+	node_runtime::api::dispatch,
+	node_runtime::native_version,
+	(
+		frame_benchmarking::benchmarking::HostFunctions,
+		SignatureVerificationOverride,
+	)
+);
+
+/// ChainInfo implementation.
+struct NodeTemplateChainInfo;
+
+impl ChainInfo for NodeTemplateChainInfo {
+	type Block = node_primitives::Block;
+	type Executor = Executor;
+	type Runtime = node_runtime::Runtime;
+	type RuntimeApi = node_runtime::RuntimeApi;
+	type SelectChain = sc_consensus::LongestChain<TFullBackend<Self::Block>, Self::Block>;
+	type BlockImport = BlockImport<
+		Self::Block,
+		TFullBackend<Self::Block>,
+		TFullClient<Self::Block, Self::RuntimeApi, Self::Executor>,
+		Self::SelectChain,
+	>;
+	type SignedExtras = node_runtime::SignedExtra;
+
+	fn signed_extras(from: <Self::Runtime as frame_system::Config>::AccountId) -> Self::SignedExtras {
+		(
+			frame_system::CheckSpecVersion::<Self::Runtime>::new(),
+			frame_system::CheckTxVersion::<Self::Runtime>::new(),
+			frame_system::CheckGenesis::<Self::Runtime>::new(),
+			frame_system::CheckMortality::<Self::Runtime>::from(Era::Immortal),
+			frame_system::CheckNonce::<Self::Runtime>::from(frame_system::Pallet::<Self::Runtime>::account_nonce(from)),
+			frame_system::CheckWeight::<Self::Runtime>::new(),
+			pallet_transaction_payment::ChargeTransactionPayment::<Self::Runtime>::from(0),
+		)
+	}
+
+	fn create_client_parts(
+		config: &Configuration,
+	) -> Result<
+		(
+			Arc<TFullClient<Self::Block, Self::RuntimeApi, Self::Executor>>,
+			Arc<TFullBackend<Self::Block>>,
+			SyncCryptoStorePtr,
+			TaskManager,
+			InherentDataProviders,
+			Option<
+				Box<
+					dyn ConsensusDataProvider<
+						Self::Block,
+						Transaction = sp_api::TransactionFor<
+							TFullClient<Self::Block, Self::RuntimeApi, Self::Executor>,
+							Self::Block,
+						>,
+					>,
+				>,
+			>,
+			Self::SelectChain,
+			Self::BlockImport,
+		),
+		sc_service::Error,
+	> {
+		let (client, backend, keystore, task_manager) =
+			new_full_parts::<Self::Block, Self::RuntimeApi, Self::Executor>(config, None)?;
+		let client = Arc::new(client);
+
+		let inherent_providers = InherentDataProviders::new();
+		let select_chain = sc_consensus::LongestChain::new(backend.clone());
+
+		let (grandpa_block_import, ..) =
+			grandpa::block_import(
+				client.clone(),
+				&(client.clone() as Arc<_>),
+				select_chain.clone(),
+				None
+			)?;
+
+		let (block_import, babe_link) = sc_consensus_babe::block_import(
+			sc_consensus_babe::Config::get_or_compute(&*client)?,
+			grandpa_block_import,
+			client.clone(),
+		)?;
+
+		let consensus_data_provider = BabeConsensusDataProvider::new(
+			client.clone(),
+			keystore.sync_keystore(),
+			&inherent_providers,
+			babe_link.epoch_changes().clone(),
+			vec![(AuthorityId::from(Alice.public()), 1000)],
+		)
+			.expect("failed to create ConsensusDataProvider");
+
+		Ok((
+			client,
+			backend,
+			keystore.sync_keystore(),
+			task_manager,
+			inherent_providers,
+			Some(Box::new(consensus_data_provider)),
+			select_chain,
+			block_import,
+		))
+	}
+
+	fn dispatch_with_root(call: <Self::Runtime as frame_system::Config>::Call, node: &mut Node<Self>) {
+		let alice = MultiSigner::from(Alice.public()).into_account();
+		let call = pallet_sudo::Call::sudo(Box::new(call));
+		node.submit_extrinsic(call, alice);
+		node.seal_blocks(1);
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use test_runner::NodeConfig;
+	use log::LevelFilter;
+	use sc_client_api::execution_extensions::ExecutionStrategies;
+	use node_cli::chain_spec::development_config;
+
+	#[test]
+	fn test_runner() {
+		let config = NodeConfig {
+			execution_strategies: ExecutionStrategies {
+				syncing: sc_client_api::ExecutionStrategy::AlwaysWasm,
+				importing: sc_client_api::ExecutionStrategy::AlwaysWasm,
+				block_construction: sc_client_api::ExecutionStrategy::AlwaysWasm,
+				offchain_worker: sc_client_api::ExecutionStrategy::AlwaysWasm,
+				other: sc_client_api::ExecutionStrategy::AlwaysWasm,
+			},
+			chain_spec: Box::new(development_config()),
+			log_targets: vec![
+				("yamux", LevelFilter::Off),
+				("multistream_select", LevelFilter::Off),
+				("libp2p", LevelFilter::Off),
+				("jsonrpc_client_transports", LevelFilter::Off),
+				("sc_network", LevelFilter::Off),
+				("tokio_reactor", LevelFilter::Off),
+				("parity-db", LevelFilter::Off),
+				("sub-libp2p", LevelFilter::Off),
+				("sync", LevelFilter::Off),
+				("peerset", LevelFilter::Off),
+				("ws", LevelFilter::Off),
+				("sc_network", LevelFilter::Off),
+				("sc_service", LevelFilter::Off),
+				("sc_basic_authorship", LevelFilter::Off),
+				("telemetry-logger", LevelFilter::Off),
+				("sc_peerset", LevelFilter::Off),
+				("rpc", LevelFilter::Off),
+				("runtime", LevelFilter::Trace),
+				("babe", LevelFilter::Debug)
+			],
+		};
+		let mut node = Node::<NodeTemplateChainInfo>::new(config).unwrap();
+		// seals blocks
+		node.seal_blocks(1);
+		// submit extrinsics
+		let alice = MultiSigner::from(Alice.public()).into_account();
+		node.submit_extrinsic(frame_system::Call::remark((b"hello world").to_vec()), alice);
+
+		// look ma, I can read state.
+		let _events = node.with_state(|| frame_system::Pallet::<node_runtime::Runtime>::events());
+		// get access to the underlying client.
+		let _client = node.client();
+	}
+}
diff --git a/client/executor/src/native_executor.rs b/client/executor/src/native_executor.rs
index 42a7950593cc..6df651e1b776 100644
--- a/client/executor/src/native_executor.rs
+++ b/client/executor/src/native_executor.rs
@@ -274,10 +274,20 @@ impl<D: NativeExecutionDispatch> NativeExecutor<D> {
 		default_heap_pages: Option<u64>,
 		max_runtime_instances: usize,
 	) -> Self {
-		let mut host_functions = D::ExtendHostFunctions::host_functions();
+		let extended =  D::ExtendHostFunctions::host_functions();
+		let mut host_functions = sp_io::SubstrateHostFunctions::host_functions()
+			.into_iter()
+			// filter out any host function overrides provided.
+			.filter(|host_fn| {
+				extended.iter()
+					.find(|ext_host_fn| host_fn.name() == ext_host_fn.name())
+					.is_none()
+			})
+			.collect::<Vec<_>>();
+
 
 		// Add the custom host functions provided by the user.
-		host_functions.extend(sp_io::SubstrateHostFunctions::host_functions());
+		host_functions.extend(extended);
 		let wasm_executor = WasmExecutor::new(
 			fallback_method,
 			default_heap_pages,
diff --git a/frame/babe/src/tests.rs b/frame/babe/src/tests.rs
index e9966ddb75dd..6aa80e969733 100644
--- a/frame/babe/src/tests.rs
+++ b/frame/babe/src/tests.rs
@@ -356,7 +356,6 @@ fn can_fetch_current_and_next_epoch_data() {
 			Babe::current_epoch().authorities,
 			Babe::next_epoch().authorities,
 		);
-
 		// 1 era = 3 epochs
 		// 1 epoch = 3 slots
 		// Eras start from 0.
diff --git a/test-utils/test-runner/Cargo.toml b/test-utils/test-runner/Cargo.toml
new file mode 100644
index 000000000000..cac699854f82
--- /dev/null
+++ b/test-utils/test-runner/Cargo.toml
@@ -0,0 +1,61 @@
+[package]
+name = "test-runner"
+version = "0.9.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
+publish = false
+
+[dependencies]
+# client deps
+sc-executor = { version = "0.9.0", path = "../../client/executor" }
+sc-service = { version = "0.9.0", path = "../../client/service" }
+sc-informant = { version = "0.9.0", path = "../../client/informant" }
+sc-network = { version = "0.9.0", path = "../../client/network" }
+sc-cli = { version = "0.9.0", path = "../../client/cli" }
+sc-basic-authorship = { version = "0.9.0", path = "../../client/basic-authorship" }
+sc-rpc = { version = "3.0.0", path = "../../client/rpc" }
+sc-transaction-pool = { version = "3.0.0", path = "../../client/transaction-pool" }
+sc-transaction-graph = { version = "3.0.0", path = "../../client/transaction-pool/graph" }
+sc-client-api = { version = "3.0.0", path = "../../client/api" }
+sc-rpc-server = { version = "3.0.0", path = "../../client/rpc-servers" }
+manual-seal = { package = "sc-consensus-manual-seal", version = "0.9.0", path = "../../client/consensus/manual-seal" }
+
+# primitive deps
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
+sp-block-builder = { version = "3.0.0", path = "../../primitives/block-builder" }
+sp-api = { version = "3.0.0", path = "../../primitives/api" }
+sp-io = { version = "3.0.0", path = "../../primitives/io" }
+sp-transaction-pool = { version = "3.0.0", path = "../../primitives/transaction-pool" }
+sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
+sp-keystore = { version = "0.9.0", path = "../../primitives/keystore" }
+sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
+sp-session = { version = "3.0.0", path = "../../primitives/session" }
+sp-offchain = { version = "3.0.0", path = "../../primitives/offchain" }
+sp-inherents = { version = "3.0.0", path = "../../primitives/inherents" }
+sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
+
+sp-externalities = { version = "0.9.0", path = "../../primitives/externalities" }
+sp-state-machine = { version = "0.9.0", path = "../../primitives/state-machine" }
+sp-wasm-interface = { version = "3.0.0", path = "../../primitives/wasm-interface" }
+sp-runtime-interface = { version = "3.0.0", path = "../../primitives/runtime-interface" }
+
+# pallets
+frame-system = { version = "3.0.0", path = "../../frame/system" }
+
+parity-scale-codec = "1.3.1"
+env_logger = "0.7.1"
+log = "0.4.8"
+futures01 = { package = "futures", version = "0.1.29" }
+futures = { package = "futures", version = "0.3", features = ["compat"] }
+rand = "0.7"
+tokio = { version = "0.2", features = ["full"] }
+libp2p = "0.35.1"
+
+# Calling RPC
+jsonrpc-core = "15.1"
+[dev-dependencies]
+sc-finality-grandpa = { version = "0.9.0", path = "../../client/finality-grandpa" }
+sc-consensus-babe = { version = "0.9.0", path = "../../client/consensus/babe" }
+sp-consensus-babe = { version = "0.9.0", path = "../../primitives/consensus/babe" }
+node-cli = { version = "2.0.0", path = "../../bin/node/cli" }
\ No newline at end of file
diff --git a/test-utils/test-runner/src/host_functions.rs b/test-utils/test-runner/src/host_functions.rs
new file mode 100644
index 000000000000..ca8790683e6c
--- /dev/null
+++ b/test-utils/test-runner/src/host_functions.rs
@@ -0,0 +1,70 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+#[macro_export]
+macro_rules! override_host_functions {
+    ($($fn_name:expr, $name:ident,)*) => {{
+        let mut host_functions = vec![];
+        $(
+            struct $name;
+            impl sp_wasm_interface::Function for $name {
+                fn name(&self) -> &str {
+                    &$fn_name
+                }
+
+                fn signature(&self) -> sp_wasm_interface::Signature {
+                    sp_wasm_interface::Signature {
+                        args: std::borrow::Cow::Owned(vec![
+                            sp_wasm_interface::ValueType::I32,
+                            sp_wasm_interface::ValueType::I64,
+                            sp_wasm_interface::ValueType::I32,
+                        ]),
+                        return_value: Some(sp_wasm_interface::ValueType::I32),
+                    }
+                }
+
+                fn execute(
+                    &self,
+                    context: &mut dyn sp_wasm_interface::FunctionContext,
+                    _args: &mut dyn Iterator<Item = sp_wasm_interface::Value>,
+                ) -> Result<Option<sp_wasm_interface::Value>, String> {
+                    <bool as sp_runtime_interface::host::IntoFFIValue>::into_ffi_value(true, context)
+                        .map(sp_wasm_interface::IntoValue::into_value)
+                        .map(Some)
+                }
+            }
+            host_functions.push(&$name as &'static dyn sp_wasm_interface::Function);
+        )*
+        host_functions
+   }};
+}
+
+/// Provides host functions that overrides runtime signature verification
+/// to always return true.
+pub struct SignatureVerificationOverride;
+
+impl sp_wasm_interface::HostFunctions for SignatureVerificationOverride {
+    fn host_functions() -> Vec<&'static dyn sp_wasm_interface::Function> {
+        override_host_functions!(
+            "ext_crypto_ecdsa_verify_version_1", EcdsaVerify,
+            "ext_crypto_ed25519_verify_version_1", Ed25519Verify,
+            "ext_crypto_sr25519_verify_version_1", Sr25519Verify,
+            "ext_crypto_sr25519_verify_version_2", Sr25519VerifyV2,
+        )
+    }
+}
diff --git a/test-utils/test-runner/src/lib.rs b/test-utils/test-runner/src/lib.rs
new file mode 100644
index 000000000000..87ec4336d952
--- /dev/null
+++ b/test-utils/test-runner/src/lib.rs
@@ -0,0 +1,312 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! Test runner
+//! # Substrate Test Runner
+//!
+//! Allows you to test
+//! <br />
+//!
+//! -   Migrations
+//! -   Runtime Upgrades
+//! -   Pallets and general runtime functionality.
+//!
+//! This works by running a full node with a Manual Seal-BABE™ hybrid consensus for block authoring.
+//!
+//! <h2>Note</h2>
+//! The running node has no signature verification, which allows us author extrinsics for any account on chain.
+//!     <br/>
+//!     <br/>
+//!
+//! <h2>How do I Use this?</h2>
+//!
+//!
+//! ```rust,ignore
+//! use test_runner::{Node, ChainInfo, SignatureVerificationOverride, base_path, NodeConfig};
+//! use sc_finality_grandpa::GrandpaBlockImport;
+//! use sc_service::{
+//!     TFullBackend, TFullClient, Configuration, TaskManager, new_full_parts, BasePath,
+//!     DatabaseConfig, KeepBlocks, TransactionStorageMode, ChainSpec, Role,
+//!     config::{NetworkConfiguration, KeystoreConfig},
+//! };
+//! use std::sync::Arc;
+//! use sp_inherents::InherentDataProviders;
+//! use sc_consensus_babe::BabeBlockImport;
+//! use sp_keystore::SyncCryptoStorePtr;
+//! use sp_keyring::sr25519::Keyring::{Alice, Bob};
+//! use node_cli::chain_spec::development_config;
+//! use sp_consensus_babe::AuthorityId;
+//! use manual_seal::{ConsensusDataProvider, consensus::babe::BabeConsensusDataProvider};
+//! use sp_runtime::{traits::IdentifyAccount, MultiSigner, generic::Era};
+//! use sc_executor::WasmExecutionMethod;
+//! use sc_network::{multiaddr, config::TransportConfig};
+//! use sc_client_api::execution_extensions::ExecutionStrategies;
+//! use sc_informant::OutputFormat;
+//! use sp_api::TransactionFor;
+//!
+//! type BlockImport<B, BE, C, SC> = BabeBlockImport<B, C, GrandpaBlockImport<BE, B, C, SC>>;
+//!
+//! sc_executor::native_executor_instance!(
+//! 	pub Executor,
+//! 	node_runtime::api::dispatch,
+//! 	node_runtime::native_version,
+//! 	SignatureVerificationOverride,
+//! );
+//!
+//! struct Requirements;
+//!
+//! impl ChainInfo for Requirements {
+//!     /// Provide a Block type with an OpaqueExtrinsic
+//!     type Block = node_primitives::Block;
+//!     /// Provide an Executor type for the runtime
+//!     type Executor = Executor;
+//!     /// Provide the runtime itself
+//!     type Runtime = node_runtime::Runtime;
+//!     /// A touch of runtime api
+//!     type RuntimeApi = node_runtime::RuntimeApi;
+//!     /// A pinch of SelectChain implementation
+//!     type SelectChain = sc_consensus::LongestChain<TFullBackend<Self::Block>, Self::Block>;
+//!     /// A slice of concrete BlockImport type
+//! 	type BlockImport = BlockImport<
+//! 		Self::Block,
+//! 		TFullBackend<Self::Block>,
+//! 		TFullClient<Self::Block, Self::RuntimeApi, Self::Executor>,
+//! 		Self::SelectChain,
+//!     >;
+//!     /// and a dash of SignedExtensions
+//! 	type SignedExtras = node_runtime::SignedExtra;
+//!
+//!     /// Create your signed extras here.
+//! 	fn signed_extras(
+//! 		from: <Self::Runtime as frame_system::Config>::AccountId,
+//! 	) -> Self::SignedExtension {
+//! 		let nonce = frame_system::Pallet::<Self::Runtime>::account_nonce(from);
+//!
+//! 		(
+//! 			frame_system::CheckSpecVersion::<Self::Runtime>::new(),
+//! 			frame_system::CheckTxVersion::<Self::Runtime>::new(),
+//! 			frame_system::CheckGenesis::<Self::Runtime>::new(),
+//! 			frame_system::CheckMortality::<Self::Runtime>::from(Era::Immortal),
+//! 			frame_system::CheckNonce::<Self::Runtime>::from(nonce),
+//! 			frame_system::CheckWeight::<Self::Runtime>::new(),
+//! 			pallet_transaction_payment::ChargeTransactionPayment::<Self::Runtime>::from(0),
+//! 		)
+//! 	}
+//!
+//!     /// The function signature tells you all you need to know. ;)
+//! 	fn create_client_parts(config: &Configuration) -> Result<
+//! 		(
+//! 			Arc<TFullClient<Self::Block, Self::RuntimeApi, Self::Executor>>,
+//! 			Arc<TFullBackend<Self::Block>>,
+//! 			KeyStorePtr,
+//! 			TaskManager,
+//! 			InherentDataProviders,
+//! 			Option<Box<
+//! 				dyn ConsensusDataProvider<
+//! 					Self::Block,
+//! 					Transaction = TransactionFor<
+//! 						TFullClient<Self::Block, Self::RuntimeApi, Self::Executor>,
+//! 						Self::Block
+//! 					>,
+//! 				>
+//! 			>>,
+//! 			Self::SelectChain,
+//! 			Self::BlockImport
+//! 		),
+//! 		sc_service::Error
+//! 	> {
+//! 		let (
+//! 			client,
+//! 			backend,
+//! 			keystore,
+//! 			task_manager,
+//! 		) = new_full_parts::<Self::Block, Self::RuntimeApi, Self::Executor>(config)?;
+//! 		let client = Arc::new(client);
+//!
+//! 		let inherent_providers = InherentDataProviders::new();
+//! 		let select_chain = sc_consensus::LongestChain::new(backend.clone());
+//!
+//! 		let (grandpa_block_import, ..) =
+//! 			sc_finality_grandpa::block_import(client.clone(), &(client.clone() as Arc<_>), select_chain.clone())?;
+//!
+//! 		let (block_import, babe_link) = sc_consensus_babe::block_import(
+//! 			sc_consensus_babe::Config::get_or_compute(&*client)?,
+//! 			grandpa_block_import,
+//! 			client.clone(),
+//! 		)?;
+//!
+//! 		let consensus_data_provider = BabeConsensusDataProvider::new(
+//! 			client.clone(),
+//! 			keystore.clone(),
+//! 			&inherent_providers,
+//! 			babe_link.epoch_changes().clone(),
+//! 			vec![(AuthorityId::from(Alice.public()), 1000)]
+//! 		)
+//! 		.expect("failed to create ConsensusDataProvider");
+//!
+//! 		Ok((
+//! 			client,
+//! 			backend,
+//! 			keystore,
+//! 			task_manager,
+//! 			inherent_providers,
+//! 			Some(Box::new(consensus_data_provider)),
+//! 			select_chain,
+//! 			block_import
+//! 		))
+//! 	}
+//!
+//! 	fn dispatch_with_root(call: <Self::Runtime as frame_system::Config>::Call, node: &mut Node<Self>) {
+//!         let alice = MultiSigner::from(Alice.public()).into_account();
+//! 		// for chains that support sudo, otherwise, you'd have to use pallet-democracy here.
+//!         let call = pallet_sudo::Call::sudo(Box::new(call));
+//!         node.submit_extrinsic(call, alice);
+//!         node.seal_blocks(1);
+//!     }
+//! }
+//!
+//! /// And now for the most basic test
+//!
+//! #[test]
+//! fn simple_balances_test() {
+//! 	// given
+//! 	let config = NodeConfig {
+//!			execution_strategies: ExecutionStrategies {
+//!				syncing: sc_client_api::ExecutionStrategy::NativeWhenPossible,
+//!				importing: sc_client_api::ExecutionStrategy::NativeWhenPossible,
+//!				block_construction: sc_client_api::ExecutionStrategy::NativeWhenPossible,
+//!				offchain_worker: sc_client_api::ExecutionStrategy::NativeWhenPossible,
+//!				other: sc_client_api::ExecutionStrategy::NativeWhenPossible,
+//! 		},
+//! 		chain_spec: Box::new(development_config()),
+//! 		log_targets: vec![],
+//! 	};
+//! 	let mut node = Node::<Requirements>::new(config).unwrap();
+//!
+//! 	type Balances = pallet_balances::Pallet<node_runtime::Runtime>;
+//!
+//! 	let (alice, bob) = (Alice.pair(), Bob.pair());
+//! 	let (alice_account_id, bob_acount_id) = (
+//!         MultiSigner::from(alice.public()).into_account(),
+//!         MultiSigner::from(bob.public()).into_account()
+//!     );
+//!
+//!     /// the function with_state allows us to read state, pretty cool right? :D
+//! 	let old_balance = node.with_state(|| Balances::free_balance(alice_account_id.clone()));
+//!
+//!     // 70 dots
+//!     let amount = 70_000_000_000_000;
+//!
+//!     /// Send extrinsic in action.
+//! 	node.submit_extrinsic(BalancesCall::transfer(bob_acount_id.clone(), amount), alice_account_id.clone());
+//!
+//!     /// Produce blocks in action, Powered by manual-seal™.
+//! 	node.seal_blocks(1);
+//!
+//!     /// we can check the new state :D
+//! 	let new_balance = node.with_state(|| Balances::free_balance(alice_account_id));
+//!
+//!     /// we can now make assertions on how state has changed.
+//! 	assert_eq!(old_balance + amount, new_balance);
+//! }
+//! ```
+
+use manual_seal::consensus::ConsensusDataProvider;
+use sc_executor::NativeExecutionDispatch;
+use sc_service::{Configuration, TFullBackend, TFullClient, TaskManager};
+use sp_api::{ConstructRuntimeApi, TransactionFor};
+use sp_consensus::{BlockImport, SelectChain};
+use sp_inherents::InherentDataProviders;
+use sp_keystore::SyncCryptoStorePtr;
+use sp_runtime::traits::{Block as BlockT, SignedExtension};
+use std::sync::Arc;
+
+mod node;
+mod utils;
+mod host_functions;
+
+pub use host_functions::*;
+pub use node::*;
+
+/// Wrapper trait for concrete type required by this testing framework.
+pub trait ChainInfo: Sized {
+	/// Opaque block type
+	type Block: BlockT;
+
+	/// Executor type
+	type Executor: NativeExecutionDispatch + 'static;
+
+	/// Runtime
+	type Runtime: frame_system::Config;
+
+	/// RuntimeApi
+	type RuntimeApi: Send
+		+ Sync
+		+ 'static
+		+ ConstructRuntimeApi<Self::Block, TFullClient<Self::Block, Self::RuntimeApi, Self::Executor>>;
+
+	/// select chain type.
+	type SelectChain: SelectChain<Self::Block> + 'static;
+
+	/// Block import type.
+	type BlockImport: Send
+		+ Sync
+		+ Clone
+		+ BlockImport<
+			Self::Block,
+			Error = sp_consensus::Error,
+			Transaction = TransactionFor<TFullClient<Self::Block, Self::RuntimeApi, Self::Executor>, Self::Block>,
+		> + 'static;
+
+	/// The signed extras required by the runtime
+	type SignedExtras: SignedExtension;
+
+	/// Signed extras, this function is caled in an externalities provided environment.
+	fn signed_extras(from: <Self::Runtime as frame_system::Config>::AccountId) -> Self::SignedExtras;
+
+	/// Attempt to create client parts, including block import,
+	/// select chain strategy and consensus data provider.
+	fn create_client_parts(
+		config: &Configuration,
+	) -> Result<
+		(
+			Arc<TFullClient<Self::Block, Self::RuntimeApi, Self::Executor>>,
+			Arc<TFullBackend<Self::Block>>,
+			SyncCryptoStorePtr,
+			TaskManager,
+			InherentDataProviders,
+			Option<
+				Box<
+					dyn ConsensusDataProvider<
+						Self::Block,
+						Transaction = TransactionFor<
+							TFullClient<Self::Block, Self::RuntimeApi, Self::Executor>,
+							Self::Block,
+						>,
+					>,
+				>,
+			>,
+			Self::SelectChain,
+			Self::BlockImport,
+		),
+		sc_service::Error,
+	>;
+
+	/// Given a call and a handle to the node, execute the call with root privileges.
+	fn dispatch_with_root(call: <Self::Runtime as frame_system::Config>::Call, node: &mut Node<Self>);
+}
diff --git a/test-utils/test-runner/src/node.rs b/test-utils/test-runner/src/node.rs
new file mode 100644
index 000000000000..6965c6a804db
--- /dev/null
+++ b/test-utils/test-runner/src/node.rs
@@ -0,0 +1,476 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+use std::sync::Arc;
+
+use futures::{FutureExt, SinkExt, channel::{mpsc, oneshot}};
+use jsonrpc_core::MetaIoHandler;
+use manual_seal::{run_manual_seal, EngineCommand, ManualSealParams};
+use sc_cli::build_runtime;
+use sc_client_api::{
+	backend::{self, Backend}, CallExecutor, ExecutorProvider,
+	execution_extensions::ExecutionStrategies,
+};
+use sc_service::{
+	build_network, spawn_tasks, BuildNetworkParams, SpawnTasksParams, TFullBackend,
+	TFullCallExecutor, TFullClient, TaskManager, TaskType, ChainSpec, BasePath,
+	Configuration, DatabaseConfig, KeepBlocks, TransactionStorageMode, config::KeystoreConfig,
+};
+use sc_transaction_pool::BasicPool;
+use sp_api::{ApiExt, ConstructRuntimeApi, Core, Metadata, OverlayedChanges, StorageTransactionCache};
+use sp_block_builder::BlockBuilder;
+use sp_blockchain::HeaderBackend;
+use sp_core::ExecutionContext;
+use sp_offchain::OffchainWorkerApi;
+use sp_runtime::traits::{Block as BlockT, Extrinsic};
+use sp_runtime::{generic::BlockId, transaction_validity::TransactionSource, MultiSignature, MultiAddress};
+use sp_runtime::{generic::UncheckedExtrinsic, traits::NumberFor};
+use sp_session::SessionKeys;
+use sp_state_machine::Ext;
+use sp_transaction_pool::runtime_api::TaggedTransactionQueue;
+use sp_transaction_pool::TransactionPool;
+
+pub use crate::utils::{logger, base_path};
+use crate::ChainInfo;
+use log::LevelFilter;
+use sp_keyring::sr25519::Keyring::Alice;
+use sc_network::{multiaddr, config::{NetworkConfiguration, TransportConfig, Role}};
+use sc_informant::OutputFormat;
+use sc_executor::WasmExecutionMethod;
+
+/// This holds a reference to a running node on another thread,
+/// the node process is dropped when this struct is dropped
+/// also holds logs from the process.
+pub struct Node<T: ChainInfo> {
+	/// rpc handler for communicating with the node over rpc.
+	rpc_handler: Arc<MetaIoHandler<sc_rpc::Metadata, sc_rpc_server::RpcMiddleware>>,
+	/// Stream of log lines
+	log_stream: mpsc::UnboundedReceiver<String>,
+	/// node tokio runtime
+	_runtime: tokio::runtime::Runtime,
+	/// handle to the running node.
+	_task_manager: Option<TaskManager>,
+	/// client instance
+	client: Arc<TFullClient<T::Block, T::RuntimeApi, T::Executor>>,
+	/// transaction pool
+	pool: Arc<
+		dyn TransactionPool<
+			Block = T::Block,
+			Hash = <T::Block as BlockT>::Hash,
+			Error = sc_transaction_pool::error::Error,
+			InPoolTransaction = sc_transaction_graph::base_pool::Transaction<
+				<T::Block as BlockT>::Hash,
+				<T::Block as BlockT>::Extrinsic,
+			>,
+		>,
+	>,
+	/// channel to communicate with manual seal on.
+	manual_seal_command_sink: mpsc::Sender<EngineCommand<<T::Block as BlockT>::Hash>>,
+	/// backend type.
+	backend: Arc<TFullBackend<T::Block>>,
+	/// Block number at initialization of this Node.
+	initial_block_number: NumberFor<T::Block>
+}
+
+/// Configuration options for the node.
+pub struct NodeConfig {
+	/// A set of log targets you'd like to enable/disbale
+	pub log_targets: Vec<(&'static str, LevelFilter)>,
+
+	/// ChainSpec for the runtime
+	pub chain_spec: Box<dyn ChainSpec>,
+
+	/// wasm execution strategies.
+	pub execution_strategies: ExecutionStrategies,
+}
+
+type EventRecord<T> = frame_system::EventRecord<<T as frame_system::Config>::Event, <T as frame_system::Config>::Hash>;
+
+impl<T: ChainInfo> Node<T> {
+	/// Starts a node with the manual-seal authorship.
+	pub fn new(node_config: NodeConfig) -> Result<Self, sc_service::Error>
+	where
+		<T::RuntimeApi as ConstructRuntimeApi<T::Block, TFullClient<T::Block, T::RuntimeApi, T::Executor>>>::RuntimeApi:
+			Core<T::Block>
+				+ Metadata<T::Block>
+				+ OffchainWorkerApi<T::Block>
+				+ SessionKeys<T::Block>
+				+ TaggedTransactionQueue<T::Block>
+				+ BlockBuilder<T::Block>
+				+ ApiExt<T::Block, StateBackend = <TFullBackend<T::Block> as Backend<T::Block>>::State>,
+	{
+		let NodeConfig { log_targets, mut chain_spec, execution_strategies } = node_config;
+		let tokio_runtime = build_runtime().unwrap();
+
+		// unbounded logs, should be fine, test is shortlived.
+		let (log_sink, log_stream) = mpsc::unbounded();
+
+		logger(log_targets, tokio_runtime.handle().clone(), log_sink);
+		let runtime_handle = tokio_runtime.handle().clone();
+
+		let task_executor = move |fut, task_type| match task_type {
+			TaskType::Async => runtime_handle.spawn(fut).map(drop),
+			TaskType::Blocking => runtime_handle
+				.spawn_blocking(move || futures::executor::block_on(fut))
+				.map(drop),
+		};
+
+		let base_path = if let Some(base) = base_path() {
+			BasePath::new(base)
+		} else {
+			BasePath::new_temp_dir().expect("couldn't create a temp dir")
+		};
+		let root_path = base_path.path().to_path_buf().join("chains").join(chain_spec.id());
+
+		let key_seed = Alice.to_seed();
+		let storage = chain_spec
+			.as_storage_builder()
+			.build_storage()
+			.expect("could not build storage");
+
+		chain_spec.set_storage(storage);
+
+		let mut network_config = NetworkConfiguration::new(
+			format!("Test Node for: {}", key_seed),
+			"network/test/0.1",
+			Default::default(),
+			None,
+		);
+		let informant_output_format = OutputFormat { enable_color: false };
+
+		network_config.allow_non_globals_in_dht = true;
+
+		network_config
+			.listen_addresses
+			.push(multiaddr::Protocol::Memory(rand::random()).into());
+
+		network_config.transport = TransportConfig::MemoryOnly;
+
+		let config = Configuration {
+			impl_name: "test-node".to_string(),
+			impl_version: "0.1".to_string(),
+			role: Role::Authority,
+			task_executor: task_executor.into(),
+			transaction_pool: Default::default(),
+			network: network_config,
+			keystore: KeystoreConfig::Path {
+				path: root_path.join("key"),
+				password: None,
+			},
+			database: DatabaseConfig::RocksDb {
+				path: root_path.join("db"),
+				cache_size: 128,
+			},
+			state_cache_size: 16777216,
+			state_cache_child_ratio: None,
+			chain_spec,
+			wasm_method: WasmExecutionMethod::Interpreted,
+			execution_strategies,
+			rpc_http: None,
+			rpc_ws: None,
+			rpc_ipc: None,
+			rpc_ws_max_connections: None,
+			rpc_cors: None,
+			rpc_methods: Default::default(),
+			prometheus_config: None,
+			telemetry_endpoints: None,
+			telemetry_external_transport: None,
+			default_heap_pages: None,
+			offchain_worker: Default::default(),
+			force_authoring: false,
+			disable_grandpa: false,
+			dev_key_seed: Some(key_seed),
+			tracing_targets: None,
+			tracing_receiver: Default::default(),
+			max_runtime_instances: 8,
+			announce_block: true,
+			base_path: Some(base_path),
+			wasm_runtime_overrides: None,
+			informant_output_format,
+			disable_log_reloading: false,
+			keystore_remote: None,
+			keep_blocks: KeepBlocks::All,
+			state_pruning: Default::default(),
+			transaction_storage: TransactionStorageMode::BlockBody,
+		};
+
+		let (
+			client,
+			backend,
+			keystore,
+			mut task_manager,
+			inherent_data_providers,
+			consensus_data_provider,
+			select_chain,
+			block_import,
+		) = T::create_client_parts(&config)?;
+
+		let import_queue =
+			manual_seal::import_queue(Box::new(block_import.clone()), &task_manager.spawn_essential_handle(), None);
+
+		let transaction_pool = BasicPool::new_full(
+			config.transaction_pool.clone(),
+			true.into(),
+			config.prometheus_registry(),
+			task_manager.spawn_handle(),
+			client.clone(),
+		);
+
+		let (network, network_status_sinks, system_rpc_tx, network_starter) = {
+			let params = BuildNetworkParams {
+				config: &config,
+				client: client.clone(),
+				transaction_pool: transaction_pool.clone(),
+				spawn_handle: task_manager.spawn_handle(),
+				import_queue,
+				on_demand: None,
+				block_announce_validator_builder: None,
+			};
+			build_network(params)?
+		};
+
+		sc_service::build_offchain_workers(
+			&config,
+			task_manager.spawn_handle(),
+			client.clone(),
+			network.clone(),
+		);
+
+		// Proposer object for block authorship.
+		let env = sc_basic_authorship::ProposerFactory::new(
+			task_manager.spawn_handle(),
+			client.clone(),
+			transaction_pool.clone(),
+			config.prometheus_registry(),
+			None
+		);
+
+		// Channel for the rpc handler to communicate with the authorship task.
+		let (command_sink, commands_stream) = mpsc::channel(10);
+
+		let rpc_handlers = {
+			let params = SpawnTasksParams {
+				config,
+				client: client.clone(),
+				backend: backend.clone(),
+				task_manager: &mut task_manager,
+				keystore,
+				on_demand: None,
+				transaction_pool: transaction_pool.clone(),
+				rpc_extensions_builder: Box::new(move |_, _| jsonrpc_core::IoHandler::default()),
+				remote_blockchain: None,
+				network,
+				network_status_sinks,
+				system_rpc_tx,
+				telemetry: None
+			};
+			spawn_tasks(params)?
+		};
+
+		// Background authorship future.
+		let authorship_future = run_manual_seal(ManualSealParams {
+			block_import,
+			env,
+			client: client.clone(),
+			pool: transaction_pool.pool().clone(),
+			commands_stream,
+			select_chain,
+			consensus_data_provider,
+			inherent_data_providers,
+		});
+
+		// spawn the authorship task as an essential task.
+		task_manager
+			.spawn_essential_handle()
+			.spawn("manual-seal", authorship_future);
+
+		network_starter.start_network();
+		let rpc_handler = rpc_handlers.io_handler();
+		let initial_number = client.info().best_number;
+
+		Ok(Self {
+			rpc_handler,
+			_task_manager: Some(task_manager),
+			_runtime: tokio_runtime,
+			client,
+			pool: transaction_pool,
+			backend,
+			log_stream,
+			manual_seal_command_sink: command_sink,
+			initial_block_number: initial_number,
+		})
+	}
+
+	/// Returns a reference to the rpc handlers.
+	pub fn rpc_handler(&self) -> Arc<MetaIoHandler<sc_rpc::Metadata, sc_rpc_server::RpcMiddleware>> {
+		self.rpc_handler.clone()
+	}
+
+	/// Return a reference to the Client
+	pub fn client(&self) -> Arc<TFullClient<T::Block, T::RuntimeApi, T::Executor>> {
+		self.client.clone()
+	}
+
+	/// Executes closure in an externalities provided environment.
+	pub fn with_state<R>(&self, closure: impl FnOnce() -> R) -> R
+	where
+		<TFullCallExecutor<T::Block, T::Executor> as CallExecutor<T::Block>>::Error: std::fmt::Debug,
+	{
+		let id = BlockId::Hash(self.client.info().best_hash);
+		let mut overlay = OverlayedChanges::default();
+		let changes_trie = backend::changes_tries_state_at_block(&id, self.backend.changes_trie_storage()).unwrap();
+		let mut cache =
+			StorageTransactionCache::<T::Block, <TFullBackend<T::Block> as Backend<T::Block>>::State>::default();
+		let mut extensions = self
+			.client
+			.execution_extensions()
+			.extensions(&id, ExecutionContext::BlockConstruction);
+		let state_backend = self
+			.backend
+			.state_at(id.clone())
+			.expect(&format!("State at block {} not found", id));
+
+		let mut ext = Ext::new(
+			&mut overlay,
+			&mut cache,
+			&state_backend,
+			changes_trie.clone(),
+			Some(&mut extensions),
+		);
+		sp_externalities::set_and_run_with_externalities(&mut ext, closure)
+	}
+
+	/// submit some extrinsic to the node, providing the sending account.
+	pub fn submit_extrinsic(
+		&mut self,
+		call: impl Into<<T::Runtime as frame_system::Config>::Call>,
+		from: <T::Runtime as frame_system::Config>::AccountId,
+	) -> <T::Block as BlockT>::Hash
+	where
+		<T::Block as BlockT>::Extrinsic: From<
+			UncheckedExtrinsic<
+				MultiAddress<
+					<T::Runtime as frame_system::Config>::AccountId,
+					<T::Runtime as frame_system::Config>::Index,
+				>,
+				<T::Runtime as frame_system::Config>::Call,
+				MultiSignature,
+				T::SignedExtras,
+			>,
+		>,
+	{
+		let extra = self.with_state(|| T::signed_extras(from.clone()));
+		let signed_data = Some((from.into(), MultiSignature::Sr25519(Default::default()), extra));
+		let ext = UncheckedExtrinsic::<
+			MultiAddress<
+				<T::Runtime as frame_system::Config>::AccountId,
+				<T::Runtime as frame_system::Config>::Index,
+			>,
+			<T::Runtime as frame_system::Config>::Call,
+			MultiSignature,
+			T::SignedExtras,
+		>::new(call.into(), signed_data)
+		.expect("UncheckedExtrinsic::new() always returns Some");
+		let at = self.client.info().best_hash;
+
+		self._runtime
+			.block_on(
+				self.pool.submit_one(&BlockId::Hash(at), TransactionSource::Local, ext.into()),
+			)
+			.unwrap()
+	}
+
+	/// Get the events of the most recently produced block
+	pub fn events(&self) -> Vec<EventRecord<T::Runtime>> {
+		self.with_state(|| frame_system::Pallet::<T::Runtime>::events())
+	}
+
+	/// Checks the node logs for a specific entry.
+	pub fn assert_log_line(&mut self, content: &str) {
+		futures::executor::block_on(async {
+			use futures::StreamExt;
+
+			while let Some(log_line) = self.log_stream.next().await {
+				if log_line.contains(content) {
+					return;
+				}
+			}
+
+			panic!("Could not find {} in logs content", content);
+		});
+	}
+
+	/// Instructs manual seal to seal new, possibly empty blocks.
+	pub fn seal_blocks(&mut self, num: usize) {
+		let (tokio, sink) = (&mut self._runtime, &mut self.manual_seal_command_sink);
+
+		for count in 0..num {
+			let (sender, future_block) = oneshot::channel();
+			let future = sink.send(EngineCommand::SealNewBlock {
+				create_empty: true,
+				finalize: false,
+				parent_hash: None,
+				sender: Some(sender),
+			});
+
+			tokio.block_on(async {
+				const ERROR: &'static str = "manual-seal authorship task is shutting down";
+				future.await.expect(ERROR);
+
+				match future_block.await.expect(ERROR) {
+					Ok(block) => log::info!("sealed {} (hash: {}) of {} blocks", count + 1, block.hash, num),
+					Err(err) => log::error!("failed to seal block {} of {}, error: {:?}", count + 1, num, err),
+				}
+			});
+		}
+	}
+
+	/// Revert count number of blocks from the chain.
+	pub fn revert_blocks(&self, count: NumberFor<T::Block>) {
+		self.backend.revert(count, true).expect("Failed to revert blocks: ");
+	}
+
+	/// Revert all blocks added since creation of the node.
+	pub fn clean(&self) {
+		// if a db path was specified, revert all blocks we've added
+		if let Some(_) = base_path() {
+			let diff = self.client.info().best_number - self.initial_block_number;
+			self.revert_blocks(diff);
+		}
+	}
+
+	/// Performs a runtime upgrade given a wasm blob.
+	pub fn upgrade_runtime(&mut self, wasm: Vec<u8>)
+		where
+			<T::Runtime as frame_system::Config>::Call: From<frame_system::Call<T::Runtime>>
+	{
+		let call = frame_system::Call::set_code(wasm);
+		T::dispatch_with_root(call.into(), self);
+	}
+}
+
+impl<T: ChainInfo> Drop for Node<T> {
+	fn drop(&mut self) {
+		self.clean();
+
+		if let Some(mut task_manager) = self._task_manager.take() {
+			// if this isn't called the node will live forever
+			task_manager.terminate()
+		}
+	}
+}
diff --git a/test-utils/test-runner/src/utils.rs b/test-utils/test-runner/src/utils.rs
new file mode 100644
index 000000000000..7cd512e2d486
--- /dev/null
+++ b/test-utils/test-runner/src/utils.rs
@@ -0,0 +1,56 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+use futures::{Sink, SinkExt};
+use std::fmt;
+use std::io::Write;
+use log::LevelFilter;
+
+/// Base db path gotten from env
+pub fn base_path() -> Option<String> {
+	std::env::var("DB_BASE_PATH").ok()
+}
+
+/// Builds the global logger.
+pub fn logger<S>(
+	log_targets: Vec<(&'static str, LevelFilter)>,
+	executor: tokio::runtime::Handle,
+	log_sink: S,
+)
+where
+	S: Sink<String> + Clone + Unpin + Send + Sync + 'static,
+	S::Error: Send + Sync + fmt::Debug,
+{
+	let mut builder = env_logger::builder();
+	builder.format(move |buf: &mut env_logger::fmt::Formatter, record: &log::Record| {
+		let entry = format!("{} {} {}", record.level(), record.target(), record.args());
+		let res = writeln!(buf, "{}", entry);
+
+		let mut log_sink_clone = log_sink.clone();
+		let _ = executor.spawn(async move {
+			log_sink_clone.send(entry).await.expect("log_stream is dropped");
+		});
+		res
+	});
+	builder.write_style(env_logger::WriteStyle::Always);
+
+	for (module, level) in log_targets {
+		builder.filter_module(module, level);
+	}
+	let _ = builder.is_test(true).try_init();
+}

From 91f45595ad28463205a6b207b8487290125266c2 Mon Sep 17 00:00:00 2001
From: Shaun Wang <spxwang@gmail.com>
Date: Wed, 24 Mar 2021 23:35:39 +1300
Subject: [PATCH 0549/1194] Migrate pallet-utility to pallet attribute macro.
 (#8326)

* Migrate pallet-utility to pallet attribute macro.

* Replace 'Module' with 'Pallet' in benchmarking.
---
 frame/utility/src/benchmarking.rs |   2 +-
 frame/utility/src/lib.rs          | 119 +++++++++++++++++-------------
 frame/utility/src/tests.rs        |   5 +-
 3 files changed, 73 insertions(+), 53 deletions(-)

diff --git a/frame/utility/src/benchmarking.rs b/frame/utility/src/benchmarking.rs
index b05b97d1d497..de7f48d625c5 100644
--- a/frame/utility/src/benchmarking.rs
+++ b/frame/utility/src/benchmarking.rs
@@ -70,7 +70,7 @@ benchmarks! {
 }
 
 impl_benchmark_test_suite!(
-	Module,
+	Pallet,
 	crate::tests::new_test_ext(),
 	crate::tests::Test,
 );
diff --git a/frame/utility/src/lib.rs b/frame/utility/src/lib.rs
index f76c7252a8e3..983d24c74dbe 100644
--- a/frame/utility/src/lib.rs
+++ b/frame/utility/src/lib.rs
@@ -15,15 +15,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! # Utility Module
-//! A stateless module with helpers for dispatch management which does no re-authentication.
+//! # Utility Pallet
+//! A stateless pallet with helpers for dispatch management which does no re-authentication.
 //!
 //! - [`Config`]
 //! - [`Call`]
 //!
 //! ## Overview
 //!
-//! This module contains two basic pieces of functionality:
+//! This pallet contains two basic pieces of functionality:
 //! - Batch dispatch: A stateless operation, allowing any origin to execute multiple calls in a
 //!   single dispatch. This can be useful to amalgamate proposals, combining `set_code` with
 //!   corresponding `set_storage`s, for efficient multiple payouts with just a single signature
@@ -34,9 +34,9 @@
 //!   need multiple distinct accounts (e.g. as controllers for many staking accounts), but where
 //!   it's perfectly fine to have each of them controlled by the same underlying keypair.
 //!   Derivative accounts are, for the purposes of proxy filtering considered exactly the same as
-//!   the oigin and are thus hampered with the origin's filters.
+//!   the origin and are thus hampered with the origin's filters.
 //!
-//! Since proxy filters are respected in all dispatches of this module, it should never need to be
+//! Since proxy filters are respected in all dispatches of this pallet, it should never need to be
 //! filtered by any proxy.
 //!
 //! ## Interface
@@ -60,36 +60,45 @@ use sp_std::prelude::*;
 use codec::{Encode, Decode};
 use sp_core::TypeId;
 use sp_io::hashing::blake2_256;
-use frame_support::{decl_module, decl_event, decl_storage, Parameter, transactional};
 use frame_support::{
-	traits::{OriginTrait, UnfilteredDispatchable, Get},
-	weights::{Weight, GetDispatchInfo, DispatchClass, extract_actual_weight},
-	dispatch::{PostDispatchInfo, DispatchResultWithPostInfo},
+	transactional,
+	traits::{OriginTrait, UnfilteredDispatchable},
+	weights::{GetDispatchInfo, extract_actual_weight},
+	dispatch::PostDispatchInfo,
 };
-use frame_system::{ensure_signed, ensure_root};
-use sp_runtime::{DispatchError, traits::Dispatchable};
+use sp_runtime::traits::Dispatchable;
 pub use weights::WeightInfo;
 
-/// Configuration trait.
-pub trait Config: frame_system::Config {
-	/// The overarching event type.
-	type Event: From<Event> + Into<<Self as frame_system::Config>::Event>;
+pub use pallet::*;
 
-	/// The overarching call type.
-	type Call: Parameter + Dispatchable<Origin=Self::Origin, PostInfo=PostDispatchInfo>
-		+ GetDispatchInfo + From<frame_system::Call<Self>>
-		+ UnfilteredDispatchable<Origin=Self::Origin>;
+#[frame_support::pallet]
+pub mod pallet {
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+	use super::*;
 
-	/// Weight information for extrinsics in this pallet.
-	type WeightInfo: WeightInfo;
-}
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(_);
 
-decl_storage! {
-	trait Store for Module<T: Config> as Utility {}
-}
 
-decl_event! {
-	/// Events type.
+	/// Configuration trait.
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		/// The overarching event type.
+		type Event: From<Event> + IsType<<Self as frame_system::Config>::Event>;
+
+		/// The overarching call type.
+		type Call: Parameter + Dispatchable<Origin=Self::Origin, PostInfo=PostDispatchInfo>
+			+ GetDispatchInfo + From<frame_system::Call<Self>>
+			+ UnfilteredDispatchable<Origin=Self::Origin>;
+
+		/// Weight information for extrinsics in this pallet.
+		type WeightInfo: WeightInfo;
+	}
+
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
 	pub enum Event {
 		/// Batch of dispatches did not complete fully. Index of first failing dispatch given, as
 		/// well as the error. \[index, error\]
@@ -97,21 +106,12 @@ decl_event! {
 		/// Batch of dispatches completed fully with no error.
 		BatchCompleted,
 	}
-}
-
-/// A module identifier. These are per module and should be stored in a registry somewhere.
-#[derive(Clone, Copy, Eq, PartialEq, Encode, Decode)]
-struct IndexedUtilityModuleId(u16);
 
-impl TypeId for IndexedUtilityModuleId {
-	const TYPE_ID: [u8; 4] = *b"suba";
-}
-
-decl_module! {
-	pub struct Module<T: Config> for enum Call where origin: T::Origin {
-		/// Deposit one of this module's events by using the default implementation.
-		fn deposit_event() = default;
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
 
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
 		/// Send a batch of dispatch calls.
 		///
 		/// May be called from any origin.
@@ -130,7 +130,7 @@ decl_module! {
 		/// `BatchInterrupted` event is deposited, along with the number of successful calls made
 		/// and the error of the failed call. If all were successful, then the `BatchCompleted`
 		/// event is deposited.
-		#[weight = {
+		#[pallet::weight({
 			let dispatch_infos = calls.iter().map(|call| call.get_dispatch_info()).collect::<Vec<_>>();
 			let dispatch_weight = dispatch_infos.iter()
 				.map(|di| di.weight)
@@ -147,8 +147,11 @@ decl_module! {
 				}
 			};
 			(dispatch_weight, dispatch_class)
-		}]
-		fn batch(origin, calls: Vec<<T as Config>::Call>) -> DispatchResultWithPostInfo {
+		})]
+		pub fn batch(
+			origin: OriginFor<T>,
+			calls: Vec<<T as Config>::Call>,
+		) -> DispatchResultWithPostInfo {
 			let is_root = ensure_root(origin.clone()).is_ok();
 			let calls_len = calls.len();
 			// Track the actual weight of each of the batch calls.
@@ -189,7 +192,7 @@ decl_module! {
 		/// NOTE: Prior to version *12, this was called `as_limited_sub`.
 		///
 		/// The dispatch origin for this call must be _Signed_.
-		#[weight = {
+		#[pallet::weight({
 			let dispatch_info = call.get_dispatch_info();
 			(
 				T::WeightInfo::as_derivative()
@@ -198,8 +201,12 @@ decl_module! {
 					.saturating_add(T::DbWeight::get().reads_writes(1, 1)),
 				dispatch_info.class,
 			)
-		}]
-		fn as_derivative(origin, index: u16, call: Box<<T as Config>::Call>) -> DispatchResultWithPostInfo {
+		})]
+		pub fn as_derivative(
+			origin: OriginFor<T>,
+			index: u16,
+			call: Box<<T as Config>::Call>,
+		) -> DispatchResultWithPostInfo {
 			let mut origin = origin;
 			let who = ensure_signed(origin.clone())?;
 			let pseudonym = Self::derivative_account_id(who, index);
@@ -229,7 +236,7 @@ decl_module! {
 		/// # <weight>
 		/// - Complexity: O(C) where C is the number of calls to be batched.
 		/// # </weight>
-		#[weight = {
+		#[pallet::weight({
 			let dispatch_infos = calls.iter().map(|call| call.get_dispatch_info()).collect::<Vec<_>>();
 			let dispatch_weight = dispatch_infos.iter()
 				.map(|di| di.weight)
@@ -246,9 +253,12 @@ decl_module! {
 				}
 			};
 			(dispatch_weight, dispatch_class)
-		}]
+		})]
 		#[transactional]
-		fn batch_all(origin, calls: Vec<<T as Config>::Call>) -> DispatchResultWithPostInfo {
+		pub fn batch_all(
+			origin: OriginFor<T>,
+			calls: Vec<<T as Config>::Call>,
+		) -> DispatchResultWithPostInfo {
 			let is_root = ensure_root(origin.clone()).is_ok();
 			let calls_len = calls.len();
 			// Track the actual weight of each of the batch calls.
@@ -276,9 +286,18 @@ decl_module! {
 			Ok(Some(base_weight + weight).into())
 		}
 	}
+
+}
+
+/// A pallet identifier. These are per pallet and should be stored in a registry somewhere.
+#[derive(Clone, Copy, Eq, PartialEq, Encode, Decode)]
+struct IndexedUtilityPalletId(u16);
+
+impl TypeId for IndexedUtilityPalletId {
+	const TYPE_ID: [u8; 4] = *b"suba";
 }
 
-impl<T: Config> Module<T> {
+impl<T: Config> Pallet<T> {
 	/// Derive a derivative account ID from the owner account and the sub-account index.
 	pub fn derivative_account_id(who: T::AccountId, index: u16) -> T::AccountId {
 		let entropy = (b"modlpy/utilisuba", who, index).using_encoded(blake2_256);
diff --git a/frame/utility/src/tests.rs b/frame/utility/src/tests.rs
index 739ad74d6576..3a8089519fac 100644
--- a/frame/utility/src/tests.rs
+++ b/frame/utility/src/tests.rs
@@ -22,7 +22,7 @@
 use super::*;
 
 use frame_support::{
-	assert_ok, assert_noop, parameter_types, assert_err_ignore_postinfo,
+	assert_ok, assert_noop, parameter_types, assert_err_ignore_postinfo, decl_module,
 	weights::{Weight, Pays},
 	dispatch::{DispatchError, DispatchErrorWithPostInfo, Dispatchable},
 	traits::Filter,
@@ -35,7 +35,8 @@ use crate as utility;
 // example module to test behaviors.
 pub mod example {
 	use super::*;
-	use frame_support::dispatch::WithPostDispatchInfo;
+	use frame_system::ensure_signed;
+	use frame_support::dispatch::{DispatchResultWithPostInfo, WithPostDispatchInfo};
 	pub trait Config: frame_system::Config { }
 
 	decl_module! {

From 3a3e9ea4c299e70adc6513200ce2be9dd36c4f0a Mon Sep 17 00:00:00 2001
From: Thandile Nododile <nododilereply@gmail.com>
Date: Wed, 24 Mar 2021 14:20:55 +0200
Subject: [PATCH 0550/1194] update README.adoc (#8412)

Fixes for better understanding and reading to developers. Added exact outputs and specific word names.

Note!
 - Couldn't merge the approved previous pull request found at https://github.com/paritytech/substrate/pull/8409 which is the same as this one, that I proposed earlier on.
---
 bin/utils/subkey/README.adoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/utils/subkey/README.adoc b/bin/utils/subkey/README.adoc
index 5ce0d2d32447..b82213777e93 100644
--- a/bin/utils/subkey/README.adoc
+++ b/bin/utils/subkey/README.adoc
@@ -12,7 +12,7 @@ Subkey is a commandline utility included with Substrate that generates or restor
 subkey generate
 ```
 
-Will output a mnemonic phrase and give you the seed, public key, and address of a new account. DO NOT SHARE your mnemonic or seed with ANYONE it will give them access to your funds. If someone is making a transfer to you they will only need your **Address**.
+Will output a secret phrase("mnemonic phrase") and give you the secret seed("Private Key"), public key("Account ID") and SS58 address("Public Address") of a new account. DO NOT SHARE your mnemonic phrase or secret seed with ANYONE it will give them access to your funds. If someone is making a transfer to you they will only need your **Public Address**.
 
 === Inspecting a key
 
@@ -80,4 +80,4 @@ Public Key URI `F3opxRbN5ZbjJNU511Kj2TLuzFcDq9BGduA9TgiECafpg29` is account:
   Public key (hex):   0x6d6f646c70792f74727372790000000000000000000000000000000000000000
   Account ID:         0x6d6f646c70792f74727372790000000000000000000000000000000000000000
   SS58 Address:       F3opxRbN5ZbjJNU511Kj2TLuzFcDq9BGduA9TgiECafpg29
-```
\ No newline at end of file
+```

From f02dcaaff4b916a5a90ff01c4f65ccb4b6722ab6 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Wed, 24 Mar 2021 13:27:25 +0100
Subject: [PATCH 0551/1194] Make candidate intake in society configurable
 (#8445)

* Make candidate intake in society configurable

* Update frame/society/src/lib.rs

* fix fix
---
 bin/node/runtime/src/lib.rs |  2 ++
 frame/society/src/lib.rs    | 14 ++++++++++----
 frame/society/src/mock.rs   |  2 ++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 15ae0209a5e2..f96c30d914ff 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -953,6 +953,7 @@ parameter_types! {
 	pub const PeriodSpend: Balance = 500 * DOLLARS;
 	pub const MaxLockDuration: BlockNumber = 36 * 30 * DAYS;
 	pub const ChallengePeriod: BlockNumber = 7 * DAYS;
+	pub const MaxCandidateIntake: u32 = 10;
 	pub const SocietyModuleId: ModuleId = ModuleId(*b"py/socie");
 }
 
@@ -970,6 +971,7 @@ impl pallet_society::Config for Runtime {
 	type MaxLockDuration = MaxLockDuration;
 	type FounderSetOrigin = pallet_collective::EnsureProportionMoreThan<_1, _2, AccountId, CouncilCollective>;
 	type SuspensionJudgementOrigin = pallet_society::EnsureFounder<Runtime>;
+	type MaxCandidateIntake = MaxCandidateIntake;
 	type ChallengePeriod = ChallengePeriod;
 }
 
diff --git a/frame/society/src/lib.rs b/frame/society/src/lib.rs
index a5ba2124c882..8e5ce6c86781 100644
--- a/frame/society/src/lib.rs
+++ b/frame/society/src/lib.rs
@@ -272,7 +272,7 @@ type BalanceOf<T, I> = <<T as Config<I>>::Currency as Currency<<T as system::Con
 type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
 
 /// The module's configuration trait.
-pub trait Config<I=DefaultInstance>: system::Config {
+pub trait Config<I = DefaultInstance>: system::Config {
 	/// The overarching event type.
 	type Event: From<Event<Self, I>> + Into<<Self as system::Config>::Event>;
 
@@ -316,6 +316,9 @@ pub trait Config<I=DefaultInstance>: system::Config {
 
 	/// The number of blocks between membership challenges.
 	type ChallengePeriod: Get<Self::BlockNumber>;
+
+	/// The maximum number of candidates that we accept per round.
+	type MaxCandidateIntake: Get<u32>;
 }
 
 /// A vote by a member on a candidate application.
@@ -497,6 +500,9 @@ decl_module! {
 		/// The societies's module id
 		const ModuleId: ModuleId = T::ModuleId::get();
 
+		/// Maximum candidate intake per round.
+		const MaxCandidateIntake: u32 = T::MaxCandidateIntake::get();
+
 		// Used for handling module events.
 		fn deposit_event() = default;
 
@@ -1615,11 +1621,11 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 	/// May be empty.
 	pub fn take_selected(
 		members_len: usize,
-		pot: BalanceOf<T, I>
+		pot: BalanceOf<T, I>,
 	) -> Vec<Bid<T::AccountId, BalanceOf<T, I>>> {
 		let max_members = MaxMembers::<I>::get() as usize;
-		// No more than 10 will be returned.
-		let mut max_selections: usize = 10.min(max_members.saturating_sub(members_len));
+		let mut max_selections: usize =
+			(T::MaxCandidateIntake::get() as usize).min(max_members.saturating_sub(members_len));
 
 		if max_selections > 0 {
 			// Get the number of left-most bidders whose bids add up to less than `pot`.
diff --git a/frame/society/src/mock.rs b/frame/society/src/mock.rs
index 53d999e37e62..ff80b50b6d35 100644
--- a/frame/society/src/mock.rs
+++ b/frame/society/src/mock.rs
@@ -57,6 +57,7 @@ parameter_types! {
 	pub const ChallengePeriod: u64 = 8;
 	pub const BlockHashCount: u64 = 250;
 	pub const ExistentialDeposit: u64 = 1;
+	pub const MaxCandidateIntake: u32 = 10;
 	pub const SocietyModuleId: ModuleId = ModuleId(*b"py/socie");
 	pub BlockWeights: frame_system::limits::BlockWeights =
 		frame_system::limits::BlockWeights::simple_max(1024);
@@ -116,6 +117,7 @@ impl Config for Test {
 	type FounderSetOrigin = EnsureSignedBy<FounderSetAccount, u128>;
 	type SuspensionJudgementOrigin = EnsureSignedBy<SuspensionJudgementSetAccount, u128>;
 	type ChallengePeriod = ChallengePeriod;
+	type MaxCandidateIntake = MaxCandidateIntake;
 	type ModuleId = SocietyModuleId;
 }
 

From b6e84381c27cac1c784787550a203da951b57f21 Mon Sep 17 00:00:00 2001
From: Shaun Wang <spxwang@gmail.com>
Date: Thu, 25 Mar 2021 01:29:30 +1300
Subject: [PATCH 0552/1194] Migrate pallet-vesting to pallet attribute macro.
 (#8440)

* Migrate pallet-vesting to pallet attribute macro.

* Update metadata type alias.

* Replace 'Module' with 'Pallet' in benchmarking.

* Trigger CI.
---
 frame/vesting/src/benchmarking.rs |   2 +-
 frame/vesting/src/lib.rs          | 165 +++++++++++++++++-------------
 2 files changed, 95 insertions(+), 72 deletions(-)

diff --git a/frame/vesting/src/benchmarking.rs b/frame/vesting/src/benchmarking.rs
index 0a882157ab38..8d16a53fba2c 100644
--- a/frame/vesting/src/benchmarking.rs
+++ b/frame/vesting/src/benchmarking.rs
@@ -25,7 +25,7 @@ use frame_system::{RawOrigin, Pallet as System};
 use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
 use sp_runtime::traits::Bounded;
 
-use crate::Module as Vesting;
+use crate::Pallet as Vesting;
 
 const SEED: u32 = 0;
 
diff --git a/frame/vesting/src/lib.rs b/frame/vesting/src/lib.rs
index 98f6067a687e..483e734fe4ca 100644
--- a/frame/vesting/src/lib.rs
+++ b/frame/vesting/src/lib.rs
@@ -15,15 +15,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! # Vesting Module
+//! # Vesting Pallet
 //!
 //! - [`Config`]
 //! - [`Call`]
 //!
 //! ## Overview
 //!
-//! A simple module providing a means of placing a linear curve on an account's locked balance. This
-//! module ensures that there is a lock in place preventing the balance to drop below the *unvested*
+//! A simple pallet providing a means of placing a linear curve on an account's locked balance. This
+//! pallet ensures that there is a lock in place preventing the balance to drop below the *unvested*
 //! amount for any reason other than transaction fee payment.
 //!
 //! As the amount vested increases over time, the amount unvested reduces. However, locks remain in
@@ -34,7 +34,7 @@
 //!
 //! ## Interface
 //!
-//! This module implements the `VestingSchedule` trait.
+//! This pallet implements the `VestingSchedule` trait.
 //!
 //! ### Dispatchable Functions
 //!
@@ -50,37 +50,21 @@ pub mod weights;
 use sp_std::prelude::*;
 use sp_std::fmt::Debug;
 use codec::{Encode, Decode};
-use sp_runtime::{DispatchResult, RuntimeDebug, traits::{
+use sp_runtime::{RuntimeDebug, traits::{
 	StaticLookup, Zero, AtLeast32BitUnsigned, MaybeSerializeDeserialize, Convert
 }};
-use frame_support::{decl_module, decl_event, decl_storage, decl_error, ensure};
+use frame_support::{ensure, pallet_prelude::*};
 use frame_support::traits::{
 	Currency, LockableCurrency, VestingSchedule, WithdrawReasons, LockIdentifier,
 	ExistenceRequirement, Get,
 };
-use frame_system::{ensure_signed, ensure_root};
+use frame_system::{ensure_signed, ensure_root, pallet_prelude::*};
 pub use weights::WeightInfo;
+pub use pallet::*;
 
 type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 type MaxLocksOf<T> = <<T as Config>::Currency as LockableCurrency<<T as frame_system::Config>::AccountId>>::MaxLocks;
 
-pub trait Config: frame_system::Config {
-	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
-
-	/// The currency trait.
-	type Currency: LockableCurrency<Self::AccountId>;
-
-	/// Convert the block number into a balance.
-	type BlockNumberToBalance: Convert<Self::BlockNumber, BalanceOf<Self>>;
-
-	/// The minimum amount transferred to call `vested_transfer`.
-	type MinVestedTransfer: Get<BalanceOf<Self>>;
-
-	/// Weight information for extrinsics in this pallet.
-	type WeightInfo: WeightInfo;
-}
-
 const VESTING_ID: LockIdentifier = *b"vesting ";
 
 /// Struct to encode the vesting schedule of an individual account.
@@ -116,23 +100,68 @@ impl<
 	}
 }
 
-decl_storage! {
-	trait Store for Module<T: Config> as Vesting {
-		/// Information regarding the vesting of a given account.
-		pub Vesting get(fn vesting):
-			map hasher(blake2_128_concat) T::AccountId
-			=> Option<VestingInfo<BalanceOf<T>, T::BlockNumber>>;
+#[frame_support::pallet]
+pub mod pallet {
+	use super::*;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		/// The overarching event type.
+		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
+
+		/// The currency trait.
+		type Currency: LockableCurrency<Self::AccountId>;
+
+		/// Convert the block number into a balance.
+		type BlockNumberToBalance: Convert<Self::BlockNumber, BalanceOf<Self>>;
+
+		/// The minimum amount transferred to call `vested_transfer`.
+		#[pallet::constant]
+		type MinVestedTransfer: Get<BalanceOf<Self>>;
+
+		/// Weight information for extrinsics in this pallet.
+		type WeightInfo: WeightInfo;
+	}
+
+	/// Information regarding the vesting of a given account.
+	#[pallet::storage]
+	#[pallet::getter(fn vesting)]
+	pub type Vesting<T: Config> = StorageMap<
+		_,
+		Blake2_128Concat,
+		T::AccountId,
+		VestingInfo<BalanceOf<T>, T::BlockNumber>,
+	>;
+
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(_);
+
+	#[pallet::genesis_config]
+	pub struct GenesisConfig<T: Config> {
+		pub vesting: Vec<(T::AccountId, T::BlockNumber, T::BlockNumber, BalanceOf<T>)>,
 	}
-	add_extra_genesis {
-		config(vesting): Vec<(T::AccountId, T::BlockNumber, T::BlockNumber, BalanceOf<T>)>;
-		build(|config: &GenesisConfig<T>| {
+
+	#[cfg(feature = "std")]
+	impl<T: Config> Default for GenesisConfig<T> {
+		fn default() -> Self {
+			GenesisConfig {
+				vesting: Default::default(),
+			}
+		}
+	}
+
+	#[pallet::genesis_build]
+	impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+		fn build(&self) {
 			use sp_runtime::traits::Saturating;
+
 			// Generate initial vesting configuration
 			// * who - Account which we are generating vesting configuration for
 			// * begin - Block when the account will start to vest
 			// * length - Number of blocks from `begin` until fully vested
 			// * liquid - Number of units which can be spent before vesting begins
-			for &(ref who, begin, length, liquid) in config.vesting.iter() {
+			for &(ref who, begin, length, liquid) in self.vesting.iter() {
 				let balance = T::Currency::free_balance(who);
 				assert!(!balance.is_zero(), "Currencies must be init'd before vesting");
 				// Total genesis `balance` minus `liquid` equals funds locked for vesting
@@ -148,24 +177,24 @@ decl_storage! {
 				let reasons = WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE;
 				T::Currency::set_lock(VESTING_ID, who, locked, reasons);
 			}
-		})
+		}
 	}
-}
 
-decl_event!(
-	pub enum Event<T> where AccountId = <T as frame_system::Config>::AccountId, Balance = BalanceOf<T> {
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	#[pallet::metadata(T::AccountId = "AccountId", BalanceOf<T> = "Balance")]
+	pub enum Event<T: Config> {
 		/// The amount vested has been updated. This could indicate more funds are available. The
 		/// balance given is the amount which is left unvested (and thus locked).
 		/// \[account, unvested\]
-		VestingUpdated(AccountId, Balance),
+		VestingUpdated(T::AccountId, BalanceOf<T>),
 		/// An \[account\] has become fully vested. No further vesting can happen.
-		VestingCompleted(AccountId),
+		VestingCompleted(T::AccountId),
 	}
-);
 
-decl_error! {
-	/// Error for the vesting module.
-	pub enum Error for Module<T: Config> {
+	/// Error for the vesting pallet.
+	#[pallet::error]
+	pub enum Error<T> {
 		/// The account given is not vesting.
 		NotVesting,
 		/// An existing vesting schedule already exists for this account that cannot be clobbered.
@@ -173,22 +202,16 @@ decl_error! {
 		/// Amount being transferred is too low to create a vesting schedule.
 		AmountLow,
 	}
-}
-
-decl_module! {
-	/// Vesting module declaration.
-	pub struct Module<T: Config> for enum Call where origin: T::Origin {
-		type Error = Error<T>;
-
-		/// The minimum amount to be transferred to create a new vesting schedule.
-		const MinVestedTransfer: BalanceOf<T> = T::MinVestedTransfer::get();
 
-		fn deposit_event() = default;
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
 
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
 		/// Unlock any vested funds of the sender account.
 		///
 		/// The dispatch origin for this call must be _Signed_ and the sender must have funds still
-		/// locked under this module.
+		/// locked under this pallet.
 		///
 		/// Emits either `VestingCompleted` or `VestingUpdated`.
 		///
@@ -198,10 +221,10 @@ decl_module! {
 		///     - Reads: Vesting Storage, Balances Locks, [Sender Account]
 		///     - Writes: Vesting Storage, Balances Locks, [Sender Account]
 		/// # </weight>
-		#[weight = T::WeightInfo::vest_locked(MaxLocksOf::<T>::get())
+		#[pallet::weight(T::WeightInfo::vest_locked(MaxLocksOf::<T>::get())
 			.max(T::WeightInfo::vest_unlocked(MaxLocksOf::<T>::get()))
-		]
-		fn vest(origin) -> DispatchResult {
+		)]
+		pub fn vest(origin: OriginFor<T>) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			Self::update_lock(who)
 		}
@@ -211,7 +234,7 @@ decl_module! {
 		/// The dispatch origin for this call must be _Signed_.
 		///
 		/// - `target`: The account whose vested funds should be unlocked. Must have funds still
-		/// locked under this module.
+		/// locked under this pallet.
 		///
 		/// Emits either `VestingCompleted` or `VestingUpdated`.
 		///
@@ -221,10 +244,10 @@ decl_module! {
 		///     - Reads: Vesting Storage, Balances Locks, Target Account
 		///     - Writes: Vesting Storage, Balances Locks, Target Account
 		/// # </weight>
-		#[weight = T::WeightInfo::vest_other_locked(MaxLocksOf::<T>::get())
+		#[pallet::weight(T::WeightInfo::vest_other_locked(MaxLocksOf::<T>::get())
 			.max(T::WeightInfo::vest_other_unlocked(MaxLocksOf::<T>::get()))
-		]
-		fn vest_other(origin, target: <T::Lookup as StaticLookup>::Source) -> DispatchResult {
+		)]
+		pub fn vest_other(origin: OriginFor<T>, target: <T::Lookup as StaticLookup>::Source) -> DispatchResult {
 			ensure_signed(origin)?;
 			Self::update_lock(T::Lookup::lookup(target)?)
 		}
@@ -245,9 +268,9 @@ decl_module! {
 		///     - Reads: Vesting Storage, Balances Locks, Target Account, [Sender Account]
 		///     - Writes: Vesting Storage, Balances Locks, Target Account, [Sender Account]
 		/// # </weight>
-		#[weight = T::WeightInfo::vested_transfer(MaxLocksOf::<T>::get())]
+		#[pallet::weight(T::WeightInfo::vested_transfer(MaxLocksOf::<T>::get()))]
 		pub fn vested_transfer(
-			origin,
+			origin: OriginFor<T>,
 			target: <T::Lookup as StaticLookup>::Source,
 			schedule: VestingInfo<BalanceOf<T>, T::BlockNumber>,
 		) -> DispatchResult {
@@ -282,9 +305,9 @@ decl_module! {
 		///     - Reads: Vesting Storage, Balances Locks, Target Account, Source Account
 		///     - Writes: Vesting Storage, Balances Locks, Target Account, Source Account
 		/// # </weight>
-		#[weight = T::WeightInfo::force_vested_transfer(MaxLocksOf::<T>::get())]
+		#[pallet::weight(T::WeightInfo::force_vested_transfer(MaxLocksOf::<T>::get()))]
 		pub fn force_vested_transfer(
-			origin,
+			origin: OriginFor<T>,
 			source: <T::Lookup as StaticLookup>::Source,
 			target: <T::Lookup as StaticLookup>::Source,
 			schedule: VestingInfo<BalanceOf<T>, T::BlockNumber>,
@@ -306,8 +329,8 @@ decl_module! {
 	}
 }
 
-impl<T: Config> Module<T> {
-	/// (Re)set or remove the module's currency lock on `who`'s account in accordance with their
+impl<T: Config> Pallet<T> {
+	/// (Re)set or remove the pallet's currency lock on `who`'s account in accordance with their
 	/// current unvested amount.
 	fn update_lock(who: T::AccountId) -> DispatchResult {
 		let vesting = Self::vesting(&who).ok_or(Error::<T>::NotVesting)?;
@@ -317,17 +340,17 @@ impl<T: Config> Module<T> {
 		if locked_now.is_zero() {
 			T::Currency::remove_lock(VESTING_ID, &who);
 			Vesting::<T>::remove(&who);
-			Self::deposit_event(RawEvent::VestingCompleted(who));
+			Self::deposit_event(Event::<T>::VestingCompleted(who));
 		} else {
 			let reasons = WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE;
 			T::Currency::set_lock(VESTING_ID, &who, locked_now, reasons);
-			Self::deposit_event(RawEvent::VestingUpdated(who, locked_now));
+			Self::deposit_event(Event::<T>::VestingUpdated(who, locked_now));
 		}
 		Ok(())
 	}
 }
 
-impl<T: Config> VestingSchedule<T::AccountId> for Module<T> where
+impl<T: Config> VestingSchedule<T::AccountId> for Pallet<T> where
 	BalanceOf<T>: MaybeSerializeDeserialize + Debug
 {
 	type Moment = T::BlockNumber;

From 6792846dca22bac2070bea4094d8287211edde04 Mon Sep 17 00:00:00 2001
From: Falco Hirschenberger <falco.hirschenberger@gmail.com>
Date: Wed, 24 Mar 2021 18:35:05 +0100
Subject: [PATCH 0553/1194] Check `unreserve` and `transfer` returnvalues in
 debug code (#8398)

* Check `unreserve` and `transfer` returnvalues in debug code

fixes #8106

* few more

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 frame/balances/src/lib.rs                  |  3 ++-
 frame/balances/src/tests.rs                |  6 +++---
 frame/bounties/src/lib.rs                  | 22 +++++++++++++++-------
 frame/democracy/src/lib.rs                 |  6 ++++--
 frame/identity/src/lib.rs                  | 15 ++++++++++-----
 frame/lottery/src/lib.rs                   |  3 ++-
 frame/multisig/src/lib.rs                  |  3 ++-
 frame/nicks/src/lib.rs                     |  3 ++-
 frame/society/src/lib.rs                   | 15 ++++++++++-----
 frame/support/src/storage/generator/mod.rs |  3 ++-
 frame/tips/src/lib.rs                      | 12 ++++++++----
 frame/treasury/src/lib.rs                  |  3 ++-
 frame/vesting/src/lib.rs                   |  6 ++++--
 13 files changed, 66 insertions(+), 34 deletions(-)

diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index 8908f4c09775..fc4dab7cec4a 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -763,7 +763,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 			);
 		}
 		// No way this can fail since we do not alter the existential balances.
-		let _ = Self::mutate_account(who, |b| {
+		let res = Self::mutate_account(who, |b| {
 			b.misc_frozen = Zero::zero();
 			b.fee_frozen = Zero::zero();
 			for l in locks.iter() {
@@ -775,6 +775,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 				}
 			}
 		});
+		debug_assert!(res.is_ok());
 
 		let existed = Locks::<T, I>::contains_key(who);
 		if locks.is_empty() {
diff --git a/frame/balances/src/tests.rs b/frame/balances/src/tests.rs
index da6c99d46ced..3eb70e401e7f 100644
--- a/frame/balances/src/tests.rs
+++ b/frame/balances/src/tests.rs
@@ -684,7 +684,7 @@ macro_rules! decl_tests {
 					let _ = Balances::deposit_creating(&1, 100);
 
 					System::set_block_number(2);
-					let _ = Balances::reserve(&1, 10);
+					assert_ok!(Balances::reserve(&1, 10));
 
 					assert_eq!(
 						last_event(),
@@ -692,7 +692,7 @@ macro_rules! decl_tests {
 					);
 
 					System::set_block_number(3);
-					let _ = Balances::unreserve(&1, 5);
+					assert!(Balances::unreserve(&1, 5).is_zero());
 
 					assert_eq!(
 						last_event(),
@@ -700,7 +700,7 @@ macro_rules! decl_tests {
 					);
 
 					System::set_block_number(4);
-					let _ = Balances::unreserve(&1, 6);
+					assert_eq!(Balances::unreserve(&1, 6), 1);
 
 					// should only unreserve 5
 					assert_eq!(
diff --git a/frame/bounties/src/lib.rs b/frame/bounties/src/lib.rs
index 7d6cd6fc1439..dafa7cd61d05 100644
--- a/frame/bounties/src/lib.rs
+++ b/frame/bounties/src/lib.rs
@@ -435,7 +435,8 @@ decl_module! {
 								} else {
 									// Else this is the curator, willingly giving up their role.
 									// Give back their deposit.
-									let _ = T::Currency::unreserve(&curator, bounty.curator_deposit);
+									let err_amount = T::Currency::unreserve(&curator, bounty.curator_deposit);
+									debug_assert!(err_amount.is_zero());
 									// Continue to change bounty status below...
 								}
 							},
@@ -548,9 +549,13 @@ decl_module! {
 					let balance = T::Currency::free_balance(&bounty_account);
 					let fee = bounty.fee.min(balance); // just to be safe
 					let payout = balance.saturating_sub(fee);
-					let _ = T::Currency::unreserve(&curator, bounty.curator_deposit);
-					let _ = T::Currency::transfer(&bounty_account, &curator, fee, AllowDeath); // should not fail
-					let _ = T::Currency::transfer(&bounty_account, &beneficiary, payout, AllowDeath); // should not fail
+					let err_amount = T::Currency::unreserve(&curator, bounty.curator_deposit);
+					debug_assert!(err_amount.is_zero());
+					let res = T::Currency::transfer(&bounty_account, &curator, fee, AllowDeath); // should not fail
+					debug_assert!(res.is_ok());
+					let res = T::Currency::transfer(&bounty_account, &beneficiary, payout, AllowDeath); // should not fail
+					debug_assert!(res.is_ok());
+
 					*maybe_bounty = None;
 
 					BountyDescriptions::remove(bounty_id);
@@ -604,7 +609,8 @@ decl_module! {
 					},
 					BountyStatus::Active { curator, .. } => {
 						// Cancelled by council, refund deposit of the working curator.
-						let _ = T::Currency::unreserve(&curator, bounty.curator_deposit);
+						let err_amount = T::Currency::unreserve(&curator, bounty.curator_deposit);
+						debug_assert!(err_amount.is_zero());
 						// Then execute removal of the bounty below.
 					},
 					BountyStatus::PendingPayout { .. } => {
@@ -621,7 +627,8 @@ decl_module! {
 				BountyDescriptions::remove(bounty_id);
 
 				let balance = T::Currency::free_balance(&bounty_account);
-				let _ = T::Currency::transfer(&bounty_account, &Self::account_id(), balance, AllowDeath); // should not fail
+				let res = T::Currency::transfer(&bounty_account, &Self::account_id(), balance, AllowDeath); // should not fail
+				debug_assert!(res.is_ok());
 				*maybe_bounty = None;
 
 				Self::deposit_event(Event::<T>::BountyCanceled(bounty_id));
@@ -736,7 +743,8 @@ impl<T: Config> pallet_treasury::SpendFunds<T> for Module<T> {
 							bounty.status = BountyStatus::Funded;
 
 							// return their deposit.
-							let _ = T::Currency::unreserve(&bounty.proposer, bounty.bond);
+							let err_amount = T::Currency::unreserve(&bounty.proposer, bounty.bond);
+							debug_assert!(err_amount.is_zero());
 
 							// fund the bounty account
 							imbalance.subsume(T::Currency::deposit_creating(&Self::bounty_account_id(index), bounty.value));
diff --git a/frame/democracy/src/lib.rs b/frame/democracy/src/lib.rs
index 37a2fd5ce7c4..b3b37b0b34b6 100644
--- a/frame/democracy/src/lib.rs
+++ b/frame/democracy/src/lib.rs
@@ -1010,7 +1010,8 @@ decl_module! {
 			ensure!(now >= since + voting + additional, Error::<T>::TooEarly);
 			ensure!(expiry.map_or(true, |e| now > e), Error::<T>::Imminent);
 
-			let _ = T::Currency::repatriate_reserved(&provider, &who, deposit, BalanceStatus::Free);
+			let res = T::Currency::repatriate_reserved(&provider, &who, deposit, BalanceStatus::Free);
+			debug_assert!(res.is_ok());
 			<Preimages<T>>::remove(&proposal_hash);
 			Self::deposit_event(RawEvent::PreimageReaped(proposal_hash, provider, deposit, who));
 		}
@@ -1541,7 +1542,8 @@ impl<T: Config> Module<T> {
 		let preimage = <Preimages<T>>::take(&proposal_hash);
 		if let Some(PreimageStatus::Available { data, provider, deposit, .. }) = preimage {
 			if let Ok(proposal) = T::Proposal::decode(&mut &data[..]) {
-				let _ = T::Currency::unreserve(&provider, deposit);
+				let err_amount = T::Currency::unreserve(&provider, deposit);
+				debug_assert!(err_amount.is_zero());
 				Self::deposit_event(RawEvent::PreimageUsed(proposal_hash, provider, deposit));
 
 				let ok = proposal.dispatch(frame_system::RawOrigin::Root.into()).is_ok();
diff --git a/frame/identity/src/lib.rs b/frame/identity/src/lib.rs
index 6d6e3170d51b..880d20279592 100644
--- a/frame/identity/src/lib.rs
+++ b/frame/identity/src/lib.rs
@@ -598,7 +598,8 @@ decl_module! {
 				T::Currency::reserve(&sender, id.deposit - old_deposit)?;
 			}
 			if old_deposit > id.deposit {
-				let _ = T::Currency::unreserve(&sender, old_deposit - id.deposit);
+				let err_amount = T::Currency::unreserve(&sender, old_deposit - id.deposit);
+				debug_assert!(err_amount.is_zero());
 			}
 
 			let judgements = id.judgements.len();
@@ -655,7 +656,8 @@ decl_module! {
 			if old_deposit < new_deposit {
 				T::Currency::reserve(&sender, new_deposit - old_deposit)?;
 			} else if old_deposit > new_deposit {
-				let _ = T::Currency::unreserve(&sender, old_deposit - new_deposit);
+				let err_amount = T::Currency::unreserve(&sender, old_deposit - new_deposit);
+				debug_assert!(err_amount.is_zero());
 			}
 			// do nothing if they're equal.
 
@@ -713,7 +715,8 @@ decl_module! {
 				<SuperOf<T>>::remove(sub);
 			}
 
-			let _ = T::Currency::unreserve(&sender, deposit.clone());
+			let err_amount = T::Currency::unreserve(&sender, deposit.clone());
+			debug_assert!(err_amount.is_zero());
 
 			Self::deposit_event(RawEvent::IdentityCleared(sender, deposit));
 
@@ -819,7 +822,8 @@ decl_module! {
 				Err(Error::<T>::JudgementGiven)?
 			};
 
-			let _ = T::Currency::unreserve(&sender, fee);
+			let err_amount = T::Currency::unreserve(&sender, fee);
+			debug_assert!(err_amount.is_zero());
 			let judgements = id.judgements.len();
 			let extra_fields = id.info.additional.len();
 			<IdentityOf<T>>::insert(&sender, id);
@@ -1095,7 +1099,8 @@ decl_module! {
 				sub_ids.retain(|x| x != &sub);
 				let deposit = T::SubAccountDeposit::get().min(*subs_deposit);
 				*subs_deposit -= deposit;
-				let _ = T::Currency::unreserve(&sender, deposit);
+				let err_amount = T::Currency::unreserve(&sender, deposit);
+				debug_assert!(err_amount.is_zero());
 				Self::deposit_event(RawEvent::SubIdentityRemoved(sub, sender, deposit));
 			});
 		}
diff --git a/frame/lottery/src/lib.rs b/frame/lottery/src/lib.rs
index 84b924c17380..94b7dd459889 100644
--- a/frame/lottery/src/lib.rs
+++ b/frame/lottery/src/lib.rs
@@ -324,7 +324,8 @@ decl_module! {
 						let winning_number = Self::choose_winner(ticket_count);
 						let winner = Tickets::<T>::get(winning_number).unwrap_or(lottery_account);
 						// Not much we can do if this fails...
-						let _ = T::Currency::transfer(&Self::account_id(), &winner, lottery_balance, KeepAlive);
+						let res = T::Currency::transfer(&Self::account_id(), &winner, lottery_balance, KeepAlive);
+						debug_assert!(res.is_ok());
 
 						Self::deposit_event(RawEvent::Winner(winner, lottery_balance));
 
diff --git a/frame/multisig/src/lib.rs b/frame/multisig/src/lib.rs
index 1d3a83ccb687..8c8e1c0dbc43 100644
--- a/frame/multisig/src/lib.rs
+++ b/frame/multisig/src/lib.rs
@@ -436,7 +436,8 @@ decl_module! {
 			ensure!(m.when == timepoint, Error::<T>::WrongTimepoint);
 			ensure!(m.depositor == who, Error::<T>::NotOwner);
 
-			let _ = T::Currency::unreserve(&m.depositor, m.deposit);
+			let err_amount = T::Currency::unreserve(&m.depositor, m.deposit);
+			debug_assert!(err_amount.is_zero());
 			<Multisigs<T>>::remove(&id, &call_hash);
 			Self::clear_call(&call_hash);
 
diff --git a/frame/nicks/src/lib.rs b/frame/nicks/src/lib.rs
index 02eb488c1b27..67e62a09da64 100644
--- a/frame/nicks/src/lib.rs
+++ b/frame/nicks/src/lib.rs
@@ -179,7 +179,8 @@ decl_module! {
 
 			let deposit = <NameOf<T>>::take(&sender).ok_or(Error::<T>::Unnamed)?.1;
 
-			let _ = T::Currency::unreserve(&sender, deposit.clone());
+			let err_amount = T::Currency::unreserve(&sender, deposit.clone());
+			debug_assert!(err_amount.is_zero());
 
 			Self::deposit_event(RawEvent::NameCleared(sender, deposit));
 		}
diff --git a/frame/society/src/lib.rs b/frame/society/src/lib.rs
index 8e5ce6c86781..64caf328002a 100644
--- a/frame/society/src/lib.rs
+++ b/frame/society/src/lib.rs
@@ -590,7 +590,8 @@ decl_module! {
 					// no reason that either should fail.
 					match b.remove(pos).kind {
 						BidKind::Deposit(deposit) => {
-							let _ = T::Currency::unreserve(&who, deposit);
+							let err_amount = T::Currency::unreserve(&who, deposit);
+							debug_assert!(err_amount.is_zero());
 						}
 						BidKind::Vouch(voucher, _) => {
 							<Vouching<T, I>>::remove(&voucher);
@@ -1241,7 +1242,8 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 			let Bid { who: popped, kind, .. } = bids.pop().expect("b.len() > 1000; qed");
 			match kind {
 				BidKind::Deposit(deposit) => {
-					let _ = T::Currency::unreserve(&popped, deposit);
+					let err_amount = T::Currency::unreserve(&popped, deposit);
+					debug_assert!(err_amount.is_zero());
 				}
 				BidKind::Vouch(voucher, _) => {
 					<Vouching<T, I>>::remove(&voucher);
@@ -1408,7 +1410,8 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 					Self::bump_payout(winner, maturity, total_slash);
 				} else {
 					// Move the slashed amount back from payouts account to local treasury.
-					let _ = T::Currency::transfer(&Self::payouts(), &Self::account_id(), total_slash, AllowDeath);
+					let res = T::Currency::transfer(&Self::payouts(), &Self::account_id(), total_slash, AllowDeath);
+					debug_assert!(res.is_ok());
 				}
 			}
 
@@ -1419,7 +1422,8 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 
 				// this should never fail since we ensure we can afford the payouts in a previous
 				// block, but there's not much we can do to recover if it fails anyway.
-				let _ = T::Currency::transfer(&Self::account_id(), &Self::payouts(), total_payouts, AllowDeath);
+				let res = T::Currency::transfer(&Self::account_id(), &Self::payouts(), total_payouts, AllowDeath);
+				debug_assert!(res.is_ok());
 			}
 
 			// if at least one candidate was accepted...
@@ -1520,7 +1524,8 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 			BidKind::Deposit(deposit) => {
 				// In the case that a normal deposit bid is accepted we unreserve
 				// the deposit.
-				let _ = T::Currency::unreserve(candidate, deposit);
+				let err_amount = T::Currency::unreserve(candidate, deposit);
+				debug_assert!(err_amount.is_zero());
 				value
 			}
 			BidKind::Vouch(voucher, tip) => {
diff --git a/frame/support/src/storage/generator/mod.rs b/frame/support/src/storage/generator/mod.rs
index fc2a21ff7251..86eafe86f43f 100644
--- a/frame/support/src/storage/generator/mod.rs
+++ b/frame/support/src/storage/generator/mod.rs
@@ -80,7 +80,8 @@ mod tests {
 			let translate_fn = |old: Option<u32>| -> Option<(u64, u64)> {
 				old.map(|o| (o.into(), (o*2).into()))
 			};
-			let _ = Value::translate(translate_fn);
+			let res = Value::translate(translate_fn);
+			debug_assert!(res.is_ok());
 
 			// new storage should be `(1111, 1111 * 2)`
 			assert_eq!(Value::get(), (1111, 2222));
diff --git a/frame/tips/src/lib.rs b/frame/tips/src/lib.rs
index 88cb65963af8..6d85df33f10c 100644
--- a/frame/tips/src/lib.rs
+++ b/frame/tips/src/lib.rs
@@ -291,7 +291,8 @@ decl_module! {
 			Reasons::<T>::remove(&tip.reason);
 			Tips::<T>::remove(&hash);
 			if !tip.deposit.is_zero() {
-				let _ = T::Currency::unreserve(&who, tip.deposit);
+				let err_amount = T::Currency::unreserve(&who, tip.deposit);
+				debug_assert!(err_amount.is_zero());
 			}
 			Self::deposit_event(RawEvent::TipRetracted(hash));
 		}
@@ -505,7 +506,8 @@ impl<T: Config> Module<T> {
 
 		let mut payout = tips[tips.len() / 2].1.min(max_payout);
 		if !tip.deposit.is_zero() {
-			let _ = T::Currency::unreserve(&tip.finder, tip.deposit);
+			let err_amount = T::Currency::unreserve(&tip.finder, tip.deposit);
+			debug_assert!(err_amount.is_zero());
 		}
 
 		if tip.finders_fee && tip.finder != tip.who {
@@ -514,11 +516,13 @@ impl<T: Config> Module<T> {
 			payout -= finders_fee;
 			// this should go through given we checked it's at most the free balance, but still
 			// we only make a best-effort.
-			let _ = T::Currency::transfer(&treasury, &tip.finder, finders_fee, KeepAlive);
+			let res = T::Currency::transfer(&treasury, &tip.finder, finders_fee, KeepAlive);
+			debug_assert!(res.is_ok());
 		}
 
 		// same as above: best-effort only.
-		let _ = T::Currency::transfer(&treasury, &tip.who, payout, KeepAlive);
+		let res = T::Currency::transfer(&treasury, &tip.who, payout, KeepAlive);
+		debug_assert!(res.is_ok());
 		Self::deposit_event(RawEvent::TipClosed(hash, tip.who, payout));
 	}
 
diff --git a/frame/treasury/src/lib.rs b/frame/treasury/src/lib.rs
index 46098c14fb1a..cef50706b517 100644
--- a/frame/treasury/src/lib.rs
+++ b/frame/treasury/src/lib.rs
@@ -377,7 +377,8 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 						<Proposals<T, I>>::remove(index);
 
 						// return their deposit.
-						let _ = T::Currency::unreserve(&p.proposer, p.bond);
+						let err_amount = T::Currency::unreserve(&p.proposer, p.bond);
+						debug_assert!(err_amount.is_zero());
 
 						// provide the allocation.
 						imbalance.subsume(T::Currency::deposit_creating(&p.beneficiary, p.value));
diff --git a/frame/vesting/src/lib.rs b/frame/vesting/src/lib.rs
index 483e734fe4ca..c02e9dc78c13 100644
--- a/frame/vesting/src/lib.rs
+++ b/frame/vesting/src/lib.rs
@@ -394,7 +394,8 @@ impl<T: Config> VestingSchedule<T::AccountId> for Pallet<T> where
 		};
 		Vesting::<T>::insert(who, vesting_schedule);
 		// it can't fail, but even if somehow it did, we don't really care.
-		let _ = Self::update_lock(who.clone());
+		let res = Self::update_lock(who.clone());
+		debug_assert!(res.is_ok());
 		Ok(())
 	}
 
@@ -402,7 +403,8 @@ impl<T: Config> VestingSchedule<T::AccountId> for Pallet<T> where
 	fn remove_vesting_schedule(who: &T::AccountId) {
 		Vesting::<T>::remove(who);
 		// it can't fail, but even if somehow it did, we don't really care.
-		let _ = Self::update_lock(who.clone());
+		let res = Self::update_lock(who.clone());
+		debug_assert!(res.is_ok());
 	}
 }
 

From 67695c8a2be3d6686331a18f09a43a8c24af4253 Mon Sep 17 00:00:00 2001
From: Roman Borschel <romanb@users.noreply.github.com>
Date: Wed, 24 Mar 2021 19:29:35 +0100
Subject: [PATCH 0554/1194] Update to libp2p-0.36 (#8420)

* Update to libp2p-0.36

* Some more Cargo.lock updates.
---
 Cargo.lock                             | 281 ++++++++++++++++++++-----
 bin/node/browser-testing/Cargo.toml    |   2 +-
 bin/node/cli/Cargo.toml                |   2 +-
 client/authority-discovery/Cargo.toml  |   2 +-
 client/cli/Cargo.toml                  |   2 +-
 client/network-gossip/Cargo.toml       |   2 +-
 client/network/Cargo.toml              |   6 +-
 client/network/src/discovery.rs        |   4 +-
 client/network/src/transport.rs        |   5 +-
 client/network/test/Cargo.toml         |   2 +-
 client/peerset/Cargo.toml              |   2 +-
 client/telemetry/Cargo.toml            |   2 +-
 client/telemetry/src/transport.rs      |   3 +-
 primitives/consensus/common/Cargo.toml |   2 +-
 utils/browser/Cargo.toml               |   2 +-
 15 files changed, 245 insertions(+), 74 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cd3d3b660861..a91fad334576 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -329,6 +329,20 @@ dependencies = [
  "wasm-bindgen-futures",
 ]
 
+[[package]]
+name = "async-std-resolver"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f665c56111e244fe38e7708ee10948a4356ad6a548997c21f5a63a0f4e0edc4d"
+dependencies = [
+ "async-std",
+ "async-trait",
+ "futures-io",
+ "futures-util",
+ "pin-utils",
+ "trust-dns-resolver",
+]
+
 [[package]]
 name = "async-task"
 version = "4.0.3"
@@ -1464,6 +1478,18 @@ version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
 
+[[package]]
+name = "enum-as-inner"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c5f0096a91d210159eceb2ff5e1c4da18388a170e1e3ce948aac9c8fdbbf595"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "enumflags2"
 version = "0.6.4"
@@ -1912,9 +1938,9 @@ dependencies = [
 
 [[package]]
 name = "fs-swap"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5839fda247e24ca4919c87c71dd5ca658f1f39e4f06829f80e3f15c3bafcfc2c"
+checksum = "03d47dad3685eceed8488986cad3d5027165ea5edb164331770e2059555f10a5"
 dependencies = [
  "lazy_static",
  "libc",
@@ -2407,6 +2433,17 @@ dependencies = [
  "memmap",
 ]
 
+[[package]]
+name = "hostname"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867"
+dependencies = [
+ "libc",
+ "match_cfg",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "http"
 version = "0.1.21"
@@ -2525,7 +2562,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project 1.0.5",
- "socket2",
+ "socket2 0.3.19",
  "tokio 0.2.25",
  "tower-service",
  "tracing",
@@ -2595,9 +2632,9 @@ dependencies = [
 
 [[package]]
 name = "if-watch"
-version = "0.1.8"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b8538953a3f0d0d3868f0a706eb4273535e10d72acb5c82c1c23ae48835c85"
+checksum = "6a6d52908d4ea4ab2bc22474ba149bf1011c8e2c3ebc1ff593ae28ac44f494b6"
 dependencies = [
  "async-io",
  "futures 0.3.13",
@@ -2695,6 +2732,18 @@ version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2ee15951c035f79eddbef745611ec962f63f4558f1dadf98ab723cc603487c6f"
 
+[[package]]
+name = "ipconfig"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7e2f18aece9709094573a9f24f483c4f65caa4298e2f7ae1b71cc65d853fad7"
+dependencies = [
+ "socket2 0.3.19",
+ "widestring",
+ "winapi 0.3.9",
+ "winreg",
+]
+
 [[package]]
 name = "ipnet"
 version = "2.3.0"
@@ -3040,9 +3089,9 @@ checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a"
 
 [[package]]
 name = "libc"
-version = "0.2.88"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03b07a082330a35e43f63177cc01689da34fbffa0105e1246cf0311472cac73a"
+checksum = "ba4aede83fc3617411dc6993bc8c70919750c1c257c6ca6a502aed6e0e2394ae"
 
 [[package]]
 name = "libloading"
@@ -3062,9 +3111,9 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
 
 [[package]]
 name = "libp2p"
-version = "0.35.1"
+version = "0.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adc225a49973cf9ab10d0cdd6a4b8f0cda299df9b760824bbb623f15f8f0c95a"
+checksum = "fe5759b526f75102829c15e4d8566603b4bf502ed19b5f35920d98113873470d"
 dependencies = [
  "atomic",
  "bytes 1.0.1",
@@ -3083,6 +3132,7 @@ dependencies = [
  "libp2p-ping",
  "libp2p-plaintext",
  "libp2p-pnet",
+ "libp2p-relay",
  "libp2p-request-response",
  "libp2p-swarm",
  "libp2p-swarm-derive",
@@ -3100,9 +3150,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-core"
-version = "0.27.1"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a2d56aadc2c2bf22cd7797f86e56a65b5b3994a0136b65be3106938acae7a26"
+checksum = "c1e1797734bbd4c453664fefb029628f77c356ffc5bce98f06b18a7db3ebb0f7"
 dependencies = [
  "asn1_der",
  "bs58",
@@ -3134,9 +3184,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-deflate"
-version = "0.27.1"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d42eed63305f0420736fa487f9acef720c4528bd7852a6a760f5ccde4813345"
+checksum = "a2181a641cd15f9b6ba71b1335800f309012a0a97a29ffaabbbf40e9d3d58f08"
 dependencies = [
  "flate2",
  "futures 0.3.13",
@@ -3145,20 +3195,23 @@ dependencies = [
 
 [[package]]
 name = "libp2p-dns"
-version = "0.27.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5153b6db68fd4baa3b304e377db744dd8fea8ff4e4504509ee636abcde88d3e3"
+checksum = "9712eb3e9f7dcc77cc5ca7d943b6a85ce4b1faaf91a67e003442412a26d6d6f8"
 dependencies = [
+ "async-std-resolver",
  "futures 0.3.13",
  "libp2p-core",
  "log",
+ "smallvec 1.6.1",
+ "trust-dns-resolver",
 ]
 
 [[package]]
 name = "libp2p-floodsub"
-version = "0.27.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3c63dfa06581b24b1d12bf9815b43689a784424be217d6545c800c7c75a207f"
+checksum = "897645f99e9b396df256a6aa8ba8c4bc019ac6b7c62556f624b5feea9acc82bb"
 dependencies = [
  "cuckoofilter",
  "fnv",
@@ -3174,9 +3227,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-gossipsub"
-version = "0.28.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "502dc5fcbfec4aa1c63ef3f7307ffe20e90c1a1387bf23ed0bec087f2dde58a1"
+checksum = "794b0c85f5df1acbc1fc38414d37272594811193b6325c76d3931c3e3f5df8c0"
 dependencies = [
  "asynchronous-codec 0.6.0",
  "base64 0.13.0",
@@ -3200,9 +3253,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-identify"
-version = "0.27.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b40fb36a059b7a8cce1514bd8b546fa612e006c9937caa7f5950cb20021fe91e"
+checksum = "f88ebc841d744979176ab4b8b294a3e655a7ba4ef26a905d073a52b49ed4dff5"
 dependencies = [
  "futures 0.3.13",
  "libp2p-core",
@@ -3216,9 +3269,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-kad"
-version = "0.28.1"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf3da6c9acbcc05f93235d201d7d45ef4e8b88a45d8836f98becd8b4d443f066"
+checksum = "bbb5b90b6bda749023a85f60b49ea74b387c25f17d8df541ae72a3c75dd52e63"
 dependencies = [
  "arrayvec 0.5.2",
  "asynchronous-codec 0.6.0",
@@ -3242,9 +3295,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-mdns"
-version = "0.28.1"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e9e6374814d1b118d97ccabdfc975c8910bd16dc38a8bc058eeb08bf2080fe1"
+checksum = "be28ca13bb648d249a9baebd750ebc64ce7040ddd5f0ce1035ff1f4549fb596d"
 dependencies = [
  "async-io",
  "data-encoding",
@@ -3255,17 +3308,17 @@ dependencies = [
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "rand 0.7.3",
+ "rand 0.8.3",
  "smallvec 1.6.1",
- "socket2",
+ "socket2 0.4.0",
  "void",
 ]
 
 [[package]]
 name = "libp2p-mplex"
-version = "0.27.1"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "350ce8b3923594aedabd5d6e3f875d058435052a29c3f32df378bc70d10be464"
+checksum = "85e9b544335d1ed30af71daa96edbefadef6f19c7a55f078b9fc92c87163105d"
 dependencies = [
  "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
@@ -3281,9 +3334,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-noise"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4aca322b52a0c5136142a7c3971446fb1e9964923a526c9cc6ef3b7c94e57778"
+checksum = "36db0f0db3b0433f5b9463f1c0cd9eadc0a3734a9170439ce501ff99733a88bd"
 dependencies = [
  "bytes 1.0.1",
  "curve25519-dalek 3.0.2",
@@ -3303,9 +3356,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-ping"
-version = "0.27.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f3813276d0708c8db0f500d8beda1bda9ad955723b9cb272c41f4727256f73c"
+checksum = "dea10fc5209260915ea65b78f612d7ff78a29ab288e7aa3250796866af861c45"
 dependencies = [
  "futures 0.3.13",
  "libp2p-core",
@@ -3318,9 +3371,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-plaintext"
-version = "0.27.1"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d58defcadb646ae4b033e130b48d87410bf76394dc3335496cae99dac803e61"
+checksum = "0c8c37b4d2a075b4be8442760a5f8c037180f0c8dd5b5734b9978ab868b3aa11"
 dependencies = [
  "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
@@ -3347,11 +3400,34 @@ dependencies = [
  "sha3",
 ]
 
+[[package]]
+name = "libp2p-relay"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ff268be6a9d6f3c6cca3b81bbab597b15217f9ad8787c6c40fc548c1af7cd24"
+dependencies = [
+ "asynchronous-codec 0.6.0",
+ "bytes 1.0.1",
+ "futures 0.3.13",
+ "futures-timer 3.0.2",
+ "libp2p-core",
+ "libp2p-swarm",
+ "log",
+ "pin-project 1.0.5",
+ "prost",
+ "prost-build",
+ "rand 0.7.3",
+ "smallvec 1.6.1",
+ "unsigned-varint 0.7.0",
+ "void",
+ "wasm-timer",
+]
+
 [[package]]
 name = "libp2p-request-response"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10e5552827c33d8326502682da73a0ba4bfa40c1b55b216af3c303f32169dd89"
+checksum = "725367dd2318c54c5ab1a6418592e5b01c63b0dedfbbfb8389220b2bcf691899"
 dependencies = [
  "async-trait",
  "bytes 1.0.1",
@@ -3369,9 +3445,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-swarm"
-version = "0.27.2"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7955b973e1fd2bd61ffd43ce261c1223f61f4aacd5bae362a924993f9a25fd98"
+checksum = "75c26980cadd7c25d89071cb23e1f7f5df4863128cc91d83c6ddc72338cecafa"
 dependencies = [
  "either",
  "futures 0.3.13",
@@ -3395,9 +3471,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-tcp"
-version = "0.27.1"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88a5aef80e519a6cb8e2663605142f97baaaea1a252eecbf8756184765f7471b"
+checksum = "2b1a27d21c477951799e99d5c105d78868258502ce092988040a808d5a19bbd9"
 dependencies = [
  "async-io",
  "futures 0.3.13",
@@ -3407,14 +3483,14 @@ dependencies = [
  "libc",
  "libp2p-core",
  "log",
- "socket2",
+ "socket2 0.4.0",
 ]
 
 [[package]]
 name = "libp2p-uds"
-version = "0.27.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80ac51ce419f60be966e02103c17f67ff5dc4422ba83ba54d251d6c62a4ed487"
+checksum = "ffd6564bb3b7ff203661ccbb69003c2b551e34cef974f2d6c6a28306a12170b5"
 dependencies = [
  "async-std",
  "futures 0.3.13",
@@ -3424,9 +3500,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-wasm-ext"
-version = "0.27.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6149c46cb76935c80bc8be6ec6e3ebd5f5e1679765a255fb34331d54610f15dd"
+checksum = "6df65fc13f6188edf7e6927b086330448b3ca27af86b49748c6d299d7c8d9040"
 dependencies = [
  "futures 0.3.13",
  "js-sys",
@@ -3438,9 +3514,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-websocket"
-version = "0.28.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3b1c6a3431045da8b925ed83384e4c5163e14b990572307fca9c507435d4d22"
+checksum = "cace60995ef6f637e4752cccbb2590f6bc358e8741a0d066307636c69a4b3a74"
 dependencies = [
  "either",
  "futures 0.3.13",
@@ -3456,9 +3532,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-yamux"
-version = "0.30.1"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4819358c542a86ff95f6ae691efb4b94ddaf477079b01a686f5705b79bfc232a"
+checksum = "96d6144cc94143fb0a8dd1e7c2fbcc32a2808168bcd1d69920635424d5993b7b"
 dependencies = [
  "futures 0.3.13",
  "libp2p-core",
@@ -3586,6 +3662,15 @@ dependencies = [
  "hashbrown",
 ]
 
+[[package]]
+name = "lru-cache"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c"
+dependencies = [
+ "linked-hash-map",
+]
+
 [[package]]
 name = "mach"
 version = "0.3.2"
@@ -3601,6 +3686,12 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
 
+[[package]]
+name = "match_cfg"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
+
 [[package]]
 name = "matchers"
 version = "0.0.1"
@@ -3705,9 +3796,9 @@ dependencies = [
 
 [[package]]
 name = "minicbor"
-version = "0.7.2"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c2b2c73f9640fccab53947e2b3474d5071fcbc8f82cac51ddf6c8041a30a9ea"
+checksum = "ea79ce4ab9f445ec6b71833a2290ac0a29c9dde0fa7cae4c481eecae021d9bd9"
 dependencies = [
  "minicbor-derive",
 ]
@@ -3805,7 +3896,7 @@ version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897"
 dependencies = [
- "socket2",
+ "socket2 0.3.19",
  "winapi 0.3.9",
 ]
 
@@ -3911,7 +4002,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "670361df1bc2399ee1ff50406a0d422587dd3bb0da596e1978fe8e05dabddf4f"
 dependencies = [
  "libc",
- "socket2",
+ "socket2 0.3.19",
 ]
 
 [[package]]
@@ -5555,9 +5646,9 @@ dependencies = [
 
 [[package]]
 name = "parity-multiaddr"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2c6805f98667a3828afb2ec2c396a8d610497e8d546f5447188aae47c5a79ec"
+checksum = "58341485071825827b7f03cf7efd1cb21e6a709bea778fb50227fd45d2f361b4"
 dependencies = [
  "arrayref",
  "bs58",
@@ -6620,6 +6711,16 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "resolv-conf"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00"
+dependencies = [
+ "hostname",
+ "quick-error 1.2.3",
+]
+
 [[package]]
 name = "retain_mut"
 version = "0.1.2"
@@ -8366,6 +8467,16 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "socket2"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2"
+dependencies = [
+ "libc",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "soketto"
 version = "0.4.2"
@@ -10215,6 +10326,49 @@ dependencies = [
  "keccak-hasher",
 ]
 
+[[package]]
+name = "trust-dns-proto"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d57e219ba600dd96c2f6d82eb79645068e14edbc5c7e27514af40436b88150c"
+dependencies = [
+ "async-trait",
+ "cfg-if 1.0.0",
+ "data-encoding",
+ "enum-as-inner",
+ "futures-channel",
+ "futures-io",
+ "futures-util",
+ "idna 0.2.2",
+ "ipnet",
+ "lazy_static",
+ "log",
+ "rand 0.8.3",
+ "smallvec 1.6.1",
+ "thiserror",
+ "tinyvec",
+ "url 2.2.1",
+]
+
+[[package]]
+name = "trust-dns-resolver"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0437eea3a6da51acc1e946545ff53d5b8fb2611ff1c3bed58522dde100536ae"
+dependencies = [
+ "cfg-if 1.0.0",
+ "futures-util",
+ "ipconfig",
+ "lazy_static",
+ "log",
+ "lru-cache",
+ "parking_lot 0.11.1",
+ "resolv-conf",
+ "smallvec 1.6.1",
+ "thiserror",
+ "trust-dns-proto",
+]
+
 [[package]]
 name = "try-lock"
 version = "0.2.3"
@@ -10914,6 +11068,12 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "widestring"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c"
+
 [[package]]
 name = "winapi"
 version = "0.2.8"
@@ -10957,6 +11117,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "winreg"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9"
+dependencies = [
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "ws2_32-sys"
 version = "0.2.1"
diff --git a/bin/node/browser-testing/Cargo.toml b/bin/node/browser-testing/Cargo.toml
index f57bc20bc3a2..292ee2cab6bf 100644
--- a/bin/node/browser-testing/Cargo.toml
+++ b/bin/node/browser-testing/Cargo.toml
@@ -8,7 +8,7 @@ license = "Apache-2.0"
 
 [dependencies]
 futures-timer = "3.0.2"
-libp2p = { version = "0.35.1", default-features = false }
+libp2p = { version = "0.36.0", default-features = false }
 jsonrpc-core = "15.0.0"
 serde = "1.0.106"
 serde_json = "1.0.48"
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index ebba2095e6be..c30378e8fc83 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -105,7 +105,7 @@ try-runtime-cli = { version = "0.9.0", optional = true, path = "../../../utils/f
 wasm-bindgen = { version = "0.2.57", optional = true }
 wasm-bindgen-futures = { version = "0.4.18", optional = true }
 browser-utils = { package = "substrate-browser-utils", path = "../../../utils/browser", optional = true, version = "0.9.0"}
-libp2p-wasm-ext = { version = "0.27", features = ["websocket"], optional = true }
+libp2p-wasm-ext = { version = "0.28", features = ["websocket"], optional = true }
 
 [target.'cfg(target_arch="x86_64")'.dependencies]
 node-executor = { version = "2.0.0", path = "../executor", features = [ "wasmtime" ] }
diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml
index 4de6b5479066..4a92186c444b 100644
--- a/client/authority-discovery/Cargo.toml
+++ b/client/authority-discovery/Cargo.toml
@@ -23,7 +23,7 @@ derive_more = "0.99.2"
 either = "1.5.3"
 futures = "0.3.9"
 futures-timer = "3.0.1"
-libp2p = { version = "0.35.1", default-features = false, features = ["kad"] }
+libp2p = { version = "0.36.0", default-features = false, features = ["kad"] }
 log = "0.4.8"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
 prost = "0.7"
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index 4617c2d790ad..55748ffb3d90 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -18,7 +18,7 @@ regex = "1.4.2"
 tokio = { version = "0.2.21", features = [ "signal", "rt-core", "rt-threaded", "blocking" ] }
 futures = "0.3.9"
 fdlimit = "0.2.1"
-libp2p = "0.35.1"
+libp2p = "0.36.0"
 parity-scale-codec = "2.0.0"
 hex = "0.4.2"
 rand = "0.7.3"
diff --git a/client/network-gossip/Cargo.toml b/client/network-gossip/Cargo.toml
index 146bc41cb165..a72e65ab3f57 100644
--- a/client/network-gossip/Cargo.toml
+++ b/client/network-gossip/Cargo.toml
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 futures = "0.3.9"
 futures-timer = "3.0.1"
-libp2p = { version = "0.35.1", default-features = false }
+libp2p = { version = "0.36.0", default-features = false }
 log = "0.4.8"
 lru = "0.6.5"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.9.0", path = "../../utils/prometheus" }
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index 3d8c33eae0f2..604165d10074 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -63,17 +63,17 @@ wasm-timer = "0.2"
 zeroize = "1.2.0"
 
 [dependencies.libp2p]
-version = "0.35.1"
+version = "0.36.0"
 
 [target.'cfg(target_os = "unknown")'.dependencies.libp2p]
-version = "0.35.1"
+version = "0.36.0"
 default-features = false
 features = ["identify", "kad", "mdns", "mplex", "noise", "ping", "request-response", "tcp-async-io", "websocket", "yamux"]
 
 
 [dev-dependencies]
 assert_matches = "1.3"
-libp2p = { version = "0.35.1", default-features = false }
+libp2p = { version = "0.36.0", default-features = false }
 quickcheck = "1.0.3"
 rand = "0.7.2"
 sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
diff --git a/client/network/src/discovery.rs b/client/network/src/discovery.rs
index 87b533ef77dc..b7c791e39267 100644
--- a/client/network/src/discovery.rs
+++ b/client/network/src/discovery.rs
@@ -61,7 +61,7 @@ use libp2p::kad::handler::KademliaHandlerProto;
 use libp2p::kad::QueryId;
 use libp2p::kad::record::{self, store::{MemoryStore, RecordStore}};
 #[cfg(not(target_os = "unknown"))]
-use libp2p::mdns::{Mdns, MdnsEvent};
+use libp2p::mdns::{Mdns, MdnsConfig, MdnsEvent};
 use libp2p::multiaddr::Protocol;
 use log::{debug, info, trace, warn};
 use std::{cmp, collections::{HashMap, HashSet, VecDeque}, io, num::NonZeroUsize, time::Duration};
@@ -220,7 +220,7 @@ impl DiscoveryConfig {
 			discovery_only_if_under_num,
 			#[cfg(not(target_os = "unknown"))]
 			mdns: if enable_mdns {
-				MdnsWrapper::Instantiating(Mdns::new().boxed())
+				MdnsWrapper::Instantiating(Mdns::new(MdnsConfig::default()).boxed())
 			} else {
 				MdnsWrapper::Disabled
 			},
diff --git a/client/network/src/transport.rs b/client/network/src/transport.rs
index 12c82c0fcefd..ab587e01a875 100644
--- a/client/network/src/transport.rs
+++ b/client/network/src/transport.rs
@@ -63,10 +63,11 @@ pub fn build_transport(
 		let desktop_trans = tcp::TcpConfig::new().nodelay(true);
 		let desktop_trans = websocket::WsConfig::new(desktop_trans.clone())
 			.or_transport(desktop_trans);
-		OptionalTransport::some(if let Ok(dns) = dns::DnsConfig::new(desktop_trans.clone()) {
+		let dns_init = futures::executor::block_on(dns::DnsConfig::system(desktop_trans.clone()));
+		OptionalTransport::some(if let Ok(dns) = dns_init {
 			EitherTransport::Left(dns)
 		} else {
-			EitherTransport::Right(desktop_trans.map_err(dns::DnsErr::Underlying))
+			EitherTransport::Right(desktop_trans.map_err(dns::DnsErr::Transport))
 		})
 	} else {
 		OptionalTransport::none()
diff --git a/client/network/test/Cargo.toml b/client/network/test/Cargo.toml
index 009315084cc3..7ba468fa3f78 100644
--- a/client/network/test/Cargo.toml
+++ b/client/network/test/Cargo.toml
@@ -20,7 +20,7 @@ parking_lot = "0.11.1"
 futures = "0.3.9"
 futures-timer = "3.0.1"
 rand = "0.7.2"
-libp2p = { version = "0.35.1", default-features = false }
+libp2p = { version = "0.36.0", default-features = false }
 sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
 sc-consensus = { version = "0.9.0", path = "../../consensus/common" }
 sc-client-api = { version = "3.0.0", path = "../../api" }
diff --git a/client/peerset/Cargo.toml b/client/peerset/Cargo.toml
index 536ec6b68175..984bfc5e835f 100644
--- a/client/peerset/Cargo.toml
+++ b/client/peerset/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 futures = "0.3.9"
-libp2p = { version = "0.35.1", default-features = false }
+libp2p = { version = "0.36.0", default-features = false }
 sp-utils = { version = "3.0.0", path = "../../primitives/utils"}
 log = "0.4.8"
 serde_json = "1.0.41"
diff --git a/client/telemetry/Cargo.toml b/client/telemetry/Cargo.toml
index ac64d34bea9f..ab02104c15c3 100644
--- a/client/telemetry/Cargo.toml
+++ b/client/telemetry/Cargo.toml
@@ -18,7 +18,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 parking_lot = "0.11.1"
 futures = "0.3.9"
 wasm-timer = "0.2.5"
-libp2p = { version = "0.35.1", default-features = false, features = ["dns", "tcp-async-io", "wasm-ext", "websocket"] }
+libp2p = { version = "0.36.0", default-features = false, features = ["dns-async-std", "tcp-async-io", "wasm-ext", "websocket"] }
 log = "0.4.8"
 pin-project = "1.0.4"
 rand = "0.7.2"
diff --git a/client/telemetry/src/transport.rs b/client/telemetry/src/transport.rs
index e32a29d9a950..0aed263a7275 100644
--- a/client/telemetry/src/transport.rs
+++ b/client/telemetry/src/transport.rs
@@ -17,6 +17,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use futures::{
+	executor::block_on,
 	prelude::*,
 	ready,
 	task::{Context, Poll},
@@ -47,7 +48,7 @@ pub(crate) fn initialize_transport(
 	// an external transport on desktop and the fallback is used all the time.
 	#[cfg(not(target_os = "unknown"))]
 	let transport = transport.or_transport({
-		let inner = libp2p::dns::DnsConfig::new(libp2p::tcp::TcpConfig::new())?;
+		let inner = block_on(libp2p::dns::DnsConfig::system(libp2p::tcp::TcpConfig::new()))?;
 		libp2p::websocket::framed::WsConfig::new(inner).and_then(|connec, _| {
 			let connec = connec
 				.with(|item| {
diff --git a/primitives/consensus/common/Cargo.toml b/primitives/consensus/common/Cargo.toml
index 8c5ae968158a..3d71cf63f55d 100644
--- a/primitives/consensus/common/Cargo.toml
+++ b/primitives/consensus/common/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 thiserror = "1.0.21"
-libp2p = { version = "0.35.1", default-features = false }
+libp2p = { version = "0.36.0", default-features = false }
 log = "0.4.8"
 sp-core = { path= "../../core", version = "3.0.0"}
 sp-inherents = { version = "3.0.0", path = "../../inherents" }
diff --git a/utils/browser/Cargo.toml b/utils/browser/Cargo.toml
index 764d2d18a61b..3a11df62dc25 100644
--- a/utils/browser/Cargo.toml
+++ b/utils/browser/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 futures = { version = "0.3", features = ["compat"] }
 futures01 = { package = "futures", version = "0.1.29" }
 log = "0.4.8"
-libp2p-wasm-ext = { version = "0.27", features = ["websocket"] }
+libp2p-wasm-ext = { version = "0.28", features = ["websocket"] }
 console_error_panic_hook = "0.1.6"
 js-sys = "0.3.34"
 wasm-bindgen = "0.2.57"

From 3efe87daba09be18b3596e075c3733fe47bafdd5 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Wed, 24 Mar 2021 20:51:58 +0100
Subject: [PATCH 0555/1194] Use Debug for genesis mismatch message (#8449)

---
 client/network/src/protocol.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index b86b1a97458b..84b5285b38ad 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -665,7 +665,7 @@ impl<B: BlockT> Protocol<B> {
 		if status.genesis_hash != self.genesis_hash {
 			log!(
 				target: "sync",
-				if self.important_peers.contains(&who) { Level::Warn } else { Level::Trace },
+				if self.important_peers.contains(&who) { Level::Warn } else { Level::Debug },
 				"Peer is on different chain (our genesis: {} theirs: {})",
 				self.genesis_hash, status.genesis_hash
 			);

From 2f69b2d417cbee2c343e0bb6af20fc89e4dea213 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Thu, 25 Mar 2021 10:15:28 +0100
Subject: [PATCH 0556/1194] Make the number of nominations configurable (#8368)

* Base features and traits.

* pallet and unsigned phase

* Undo bad formattings.

* some formatting cleanup.

* Small self-cleanup.

* Make it all build

* self-review

* Some doc tests.

* Some changes from other PR

* Fix session test

* Update Cargo.lock

* Update frame/election-provider-multi-phase/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Some review comments

* Rename + make encode/decode

* Do an assert as well, just in case.

* Fix build

* Update frame/election-provider-multi-phase/src/unsigned.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Las comment

* fix staking fuzzer.

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_election_provider_multi_phase --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/election-provider-multi-phase/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Add one last layer of feasibility check as well.

* Last fixes to benchmarks

* Some more docs.

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_election_provider_multi_phase --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/election-provider-multi-phase/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_election_provider_multi_phase --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/election-provider-multi-phase/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Some nits

* It all works

* Some self cleanup

* Update frame/staking/src/lib.rs

Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>

* remove most todos.

* Round of self-review.

* Fix migration

* clean macro

* Revert wrong merge

* Make the number of nominations configurable

* Self reivew

* renmae.

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
---
 Cargo.lock                                    |  2 +-
 bin/node/runtime/Cargo.toml                   |  2 +
 bin/node/runtime/src/lib.rs                   | 10 +++-
 frame/babe/src/mock.rs                        |  1 +
 .../election-provider-multi-phase/src/lib.rs  | 10 ++++
 .../election-provider-multi-phase/src/mock.rs |  1 +
 frame/election-provider-support/src/lib.rs    |  5 ++
 .../election-provider-support/src/onchain.rs  |  1 +
 frame/grandpa/src/mock.rs                     |  1 +
 frame/offences/benchmarking/src/lib.rs        | 15 +++---
 frame/offences/benchmarking/src/mock.rs       |  1 +
 frame/session/benchmarking/src/lib.rs         | 10 ++--
 frame/session/benchmarking/src/mock.rs        |  1 +
 frame/staking/Cargo.toml                      |  2 -
 frame/staking/src/benchmarking.rs             | 53 ++++++++++++++-----
 frame/staking/src/lib.rs                      | 50 ++++-------------
 frame/staking/src/mock.rs                     |  1 +
 17 files changed, 98 insertions(+), 68 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a91fad334576..48673e57ce54 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4338,6 +4338,7 @@ dependencies = [
  "sp-inherents",
  "sp-io",
  "sp-keyring",
+ "sp-npos-elections",
  "sp-offchain",
  "sp-runtime",
  "sp-session",
@@ -5436,7 +5437,6 @@ dependencies = [
  "sp-application-crypto",
  "sp-core",
  "sp-io",
- "sp-npos-elections",
  "sp-runtime",
  "sp-staking",
  "sp-std",
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index 43ecca7e7445..f0cad60f2614 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -36,6 +36,7 @@ sp-keyring = { version = "3.0.0", optional = true, path = "../../../primitives/k
 sp-session = { version = "3.0.0", default-features = false, path = "../../../primitives/session" }
 sp-transaction-pool = { version = "3.0.0", default-features = false, path = "../../../primitives/transaction-pool" }
 sp-version = { version = "3.0.0", default-features = false, path = "../../../primitives/version" }
+sp-npos-elections = { version = "3.0.0", default-features = false, path = "../../../primitives/npos-elections" }
 
 # frame dependencies
 frame-executive = { version = "3.0.0", default-features = false, path = "../../../frame/executive" }
@@ -159,6 +160,7 @@ std = [
 	"pallet-vesting/std",
 	"log/std",
 	"frame-try-runtime/std",
+	"sp-npos-elections/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index f96c30d914ff..46f80cc56afd 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -471,6 +471,8 @@ parameter_types! {
 }
 
 impl pallet_staking::Config for Runtime {
+	const MAX_NOMINATIONS: u32 =
+		<NposCompactSolution16 as sp_npos_elections::CompactSolution>::LIMIT as u32;
 	type Currency = Balances;
 	type UnixTime = Timestamp;
 	type CurrencyToVote = U128CurrencyToVote;
@@ -515,6 +517,12 @@ parameter_types! {
 		.saturating_sub(BlockExecutionWeight::get());
 }
 
+sp_npos_elections::generate_solution_type!(
+	#[compact]
+	pub struct NposCompactSolution16::<u32, u16, sp_runtime::PerU16>(16)
+	// -------------------- ^^ <NominatorIndex, ValidatorIndex, Accuracy>
+);
+
 impl pallet_election_provider_multi_phase::Config for Runtime {
 	type Event = Event;
 	type Currency = Balances;
@@ -526,7 +534,7 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
 	type MinerTxPriority = MultiPhaseUnsignedPriority;
 	type DataProvider = Staking;
 	type OnChainAccuracy = Perbill;
-	type CompactSolution = pallet_staking::CompactAssignments;
+	type CompactSolution = NposCompactSolution16;
 	type Fallback = Fallback;
 	type WeightInfo = pallet_election_provider_multi_phase::weights::SubstrateWeight<Runtime>;
 	type BenchmarkingConfig = ();
diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index 93b4af00b5dc..137f32b5e502 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -193,6 +193,7 @@ impl onchain::Config for Test {
 }
 
 impl pallet_staking::Config for Test {
+	const MAX_NOMINATIONS: u32 = 16;
 	type RewardRemainder = ();
 	type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote;
 	type Event = Event;
diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index 641807294f05..1609ffa3beef 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -678,6 +678,16 @@ pub mod pallet {
 			let _: UpperOf<CompactAccuracyOf<T>> = maximum_chain_accuracy
 				.iter()
 				.fold(Zero::zero(), |acc, x| acc.checked_add(x).unwrap());
+
+			// We only accept data provider who's maximum votes per voter matches our
+			// `T::CompactSolution`'s `LIMIT`.
+			//
+			// NOTE that this pallet does not really need to enforce this in runtime. The compact
+			// solution cannot represent any voters more than `LIMIT` anyhow.
+			assert_eq!(
+				<T::DataProvider as ElectionDataProvider<T::AccountId, T::BlockNumber>>::MAXIMUM_VOTES_PER_VOTER,
+				<CompactOf<T> as CompactSolution>::LIMIT as u32,
+			);
 		}
 	}
 
diff --git a/frame/election-provider-multi-phase/src/mock.rs b/frame/election-provider-multi-phase/src/mock.rs
index 67e77db296c3..22b5a0ac67b7 100644
--- a/frame/election-provider-multi-phase/src/mock.rs
+++ b/frame/election-provider-multi-phase/src/mock.rs
@@ -300,6 +300,7 @@ pub struct ExtBuilder {}
 
 pub struct StakingMock;
 impl ElectionDataProvider<AccountId, u64> for StakingMock {
+	const MAXIMUM_VOTES_PER_VOTER: u32 = <TestCompact as CompactSolution>::LIMIT as u32;
 	fn targets(maybe_max_len: Option<usize>) -> data_provider::Result<(Vec<AccountId>, Weight)> {
 		let targets = Targets::get();
 
diff --git a/frame/election-provider-support/src/lib.rs b/frame/election-provider-support/src/lib.rs
index 1a4a293a3270..b846460e71f8 100644
--- a/frame/election-provider-support/src/lib.rs
+++ b/frame/election-provider-support/src/lib.rs
@@ -100,6 +100,7 @@
 //!     pub struct Module<T: Config>(std::marker::PhantomData<T>);
 //!
 //!     impl<T: Config> ElectionDataProvider<AccountId, BlockNumber> for Module<T> {
+//!         const MAXIMUM_VOTES_PER_VOTER: u32 = 1;
 //!         fn desired_targets() -> data_provider::Result<(u32, Weight)> {
 //!             Ok((1, 0))
 //!         }
@@ -180,6 +181,9 @@ pub mod data_provider {
 
 /// Something that can provide the data to an [`ElectionProvider`].
 pub trait ElectionDataProvider<AccountId, BlockNumber> {
+	/// Maximum number of votes per voter that this data provider is providing.
+	const MAXIMUM_VOTES_PER_VOTER: u32;
+
 	/// All possible targets for the election, i.e. the candidates.
 	///
 	/// If `maybe_max_len` is `Some(v)` then the resulting vector MUST NOT be longer than `v` items
@@ -226,6 +230,7 @@ pub trait ElectionDataProvider<AccountId, BlockNumber> {
 
 #[cfg(feature = "std")]
 impl<AccountId, BlockNumber> ElectionDataProvider<AccountId, BlockNumber> for () {
+	const MAXIMUM_VOTES_PER_VOTER: u32 = 0;
 	fn targets(_maybe_max_len: Option<usize>) -> data_provider::Result<(Vec<AccountId>, Weight)> {
 		Ok(Default::default())
 	}
diff --git a/frame/election-provider-support/src/onchain.rs b/frame/election-provider-support/src/onchain.rs
index b00c8698037c..e034a9c36a8a 100644
--- a/frame/election-provider-support/src/onchain.rs
+++ b/frame/election-provider-support/src/onchain.rs
@@ -125,6 +125,7 @@ mod tests {
 		pub struct DataProvider;
 
 		impl ElectionDataProvider<AccountId, BlockNumber> for DataProvider {
+			const MAXIMUM_VOTES_PER_VOTER: u32 = 2;
 			fn voters(
 				_: Option<usize>,
 			) -> data_provider::Result<(Vec<(AccountId, VoteWeight, Vec<AccountId>)>, Weight)> {
diff --git a/frame/grandpa/src/mock.rs b/frame/grandpa/src/mock.rs
index af9d7f0fe425..3f450e18bc78 100644
--- a/frame/grandpa/src/mock.rs
+++ b/frame/grandpa/src/mock.rs
@@ -199,6 +199,7 @@ impl onchain::Config for Test {
 }
 
 impl pallet_staking::Config for Test {
+	const MAX_NOMINATIONS: u32 = 16;
 	type RewardRemainder = ();
 	type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote;
 	type Event = Event;
diff --git a/frame/offences/benchmarking/src/lib.rs b/frame/offences/benchmarking/src/lib.rs
index 83275da593e9..08517a4ac8df 100644
--- a/frame/offences/benchmarking/src/lib.rs
+++ b/frame/offences/benchmarking/src/lib.rs
@@ -28,7 +28,10 @@ use frame_system::{RawOrigin, Pallet as System, Config as SystemConfig};
 use frame_benchmarking::{benchmarks, account, impl_benchmark_test_suite};
 use frame_support::traits::{Currency, OnInitialize, ValidatorSet, ValidatorSetWithIdentification};
 
-use sp_runtime::{Perbill, traits::{Convert, StaticLookup, Saturating, UniqueSaturatedInto}};
+use sp_runtime::{
+	Perbill,
+	traits::{Convert, StaticLookup, Saturating, UniqueSaturatedInto},
+};
 use sp_staking::offence::{ReportOffence, Offence, OffenceDetails};
 
 use pallet_balances::Config as BalancesConfig;
@@ -39,8 +42,8 @@ use pallet_offences::{Config as OffencesConfig, Module as Offences};
 use pallet_session::historical::{Config as HistoricalConfig, IdentificationTuple};
 use pallet_session::{Config as SessionConfig, SessionManager};
 use pallet_staking::{
-	Module as Staking, Config as StakingConfig, RewardDestination, ValidatorPrefs,
-	Exposure, IndividualExposure, MAX_NOMINATIONS, Event as StakingEvent
+	Module as Staking, Config as StakingConfig, RewardDestination, ValidatorPrefs, Exposure,
+	IndividualExposure, Event as StakingEvent,
 };
 
 const SEED: u32 = 0;
@@ -236,7 +239,7 @@ benchmarks! {
 		let r in 1 .. MAX_REPORTERS;
 		// we skip 1 offender, because in such case there is no slashing
 		let o in 2 .. MAX_OFFENDERS;
-		let n in 0 .. MAX_NOMINATORS.min(MAX_NOMINATIONS as u32);
+		let n in 0 .. MAX_NOMINATORS.min(<T as pallet_staking::Config>::MAX_NOMINATIONS);
 
 		// Make r reporters
 		let mut reporters = vec![];
@@ -310,7 +313,7 @@ benchmarks! {
 	}
 
 	report_offence_grandpa {
-		let n in 0 .. MAX_NOMINATORS.min(MAX_NOMINATIONS as u32);
+		let n in 0 .. MAX_NOMINATORS.min(<T as pallet_staking::Config>::MAX_NOMINATIONS);
 
 		// for grandpa equivocation reports the number of reporters
 		// and offenders is always 1
@@ -346,7 +349,7 @@ benchmarks! {
 	}
 
 	report_offence_babe {
-		let n in 0 .. MAX_NOMINATORS.min(MAX_NOMINATIONS as u32);
+		let n in 0 .. MAX_NOMINATORS.min(<T as pallet_staking::Config>::MAX_NOMINATIONS);
 
 		// for babe equivocation reports the number of reporters
 		// and offenders is always 1
diff --git a/frame/offences/benchmarking/src/mock.rs b/frame/offences/benchmarking/src/mock.rs
index 1fe8db5aaaa2..223d6d4d477a 100644
--- a/frame/offences/benchmarking/src/mock.rs
+++ b/frame/offences/benchmarking/src/mock.rs
@@ -158,6 +158,7 @@ impl onchain::Config for Test {
 }
 
 impl pallet_staking::Config for Test {
+	const MAX_NOMINATIONS: u32 = 16;
 	type Currency = Balances;
 	type UnixTime = pallet_timestamp::Pallet<Self>;
 	type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote;
diff --git a/frame/session/benchmarking/src/lib.rs b/frame/session/benchmarking/src/lib.rs
index 696a86166c1d..fff3717607f8 100644
--- a/frame/session/benchmarking/src/lib.rs
+++ b/frame/session/benchmarking/src/lib.rs
@@ -35,7 +35,7 @@ use frame_system::RawOrigin;
 use pallet_session::{historical::Module as Historical, Module as Session, *};
 use pallet_staking::{
 	benchmarking::create_validator_with_nominators, testing_utils::create_validators,
-	MAX_NOMINATIONS, RewardDestination,
+	RewardDestination,
 };
 use sp_runtime::traits::{One, StaticLookup};
 
@@ -52,10 +52,10 @@ impl<T: Config> OnInitialize<T::BlockNumber> for Pallet<T> {
 
 benchmarks! {
 	set_keys {
-		let n = MAX_NOMINATIONS as u32;
+		let n = <T as pallet_staking::Config>::MAX_NOMINATIONS;
 		let (v_stash, _) = create_validator_with_nominators::<T>(
 			n,
-			MAX_NOMINATIONS as u32,
+			<T as pallet_staking::Config>::MAX_NOMINATIONS,
 			false,
 			RewardDestination::Staked,
 		)?;
@@ -68,10 +68,10 @@ benchmarks! {
 	}: _(RawOrigin::Signed(v_controller), keys, proof)
 
 	purge_keys {
-		let n = MAX_NOMINATIONS as u32;
+		let n = <T as pallet_staking::Config>::MAX_NOMINATIONS;
 		let (v_stash, _) = create_validator_with_nominators::<T>(
 			n,
-			MAX_NOMINATIONS as u32,
+			<T as pallet_staking::Config>::MAX_NOMINATIONS,
 			false,
 			RewardDestination::Staked
 		)?;
diff --git a/frame/session/benchmarking/src/mock.rs b/frame/session/benchmarking/src/mock.rs
index af5d8f6a0936..53afeb620c26 100644
--- a/frame/session/benchmarking/src/mock.rs
+++ b/frame/session/benchmarking/src/mock.rs
@@ -163,6 +163,7 @@ impl onchain::Config for Test {
 }
 
 impl pallet_staking::Config for Test {
+	const MAX_NOMINATIONS: u32 = 16;
 	type Currency = Balances;
 	type UnixTime = pallet_timestamp::Pallet<Self>;
 	type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote;
diff --git a/frame/staking/Cargo.toml b/frame/staking/Cargo.toml
index 24909b35f53c..908e361e667e 100644
--- a/frame/staking/Cargo.toml
+++ b/frame/staking/Cargo.toml
@@ -17,7 +17,6 @@ static_assertions = "1.1.0"
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-npos-elections = { version = "3.0.0", default-features = false, path = "../../primitives/npos-elections" }
 sp-io ={ version = "3.0.0", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
 sp-staking = { version = "3.0.0", default-features = false, path = "../../primitives/staking" }
@@ -54,7 +53,6 @@ std = [
 	"serde",
 	"codec/std",
 	"sp-std/std",
-	"sp-npos-elections/std",
 	"sp-io/std",
 	"frame-support/std",
 	"sp-runtime/std",
diff --git a/frame/staking/src/benchmarking.rs b/frame/staking/src/benchmarking.rs
index 83a67abb3c8e..1d8a5c1fd645 100644
--- a/frame/staking/src/benchmarking.rs
+++ b/frame/staking/src/benchmarking.rs
@@ -204,16 +204,20 @@ benchmarks! {
 	kick {
 		// scenario: we want to kick `k` nominators from nominating us (we are a validator).
 		// we'll assume that `k` is under 128 for the purposes of determining the slope.
-		// each nominator should have `MAX_NOMINATIONS` validators nominated, and our validator
+		// each nominator should have `T::MAX_NOMINATIONS` validators nominated, and our validator
 		// should be somewhere in there.
 		let k in 1 .. 128;
 
-		// these are the other validators; there are `MAX_NOMINATIONS - 1` of them, so there are a
-		// total of `MAX_NOMINATIONS` validators in the system.
-		let rest_of_validators = create_validators::<T>(MAX_NOMINATIONS as u32 - 1, 100)?;
+		// these are the other validators; there are `T::MAX_NOMINATIONS - 1` of them, so
+		// there are a total of `T::MAX_NOMINATIONS` validators in the system.
+		let rest_of_validators = create_validators::<T>(T::MAX_NOMINATIONS - 1, 100)?;
 
 		// this is the validator that will be kicking.
-		let (stash, controller) = create_stash_controller::<T>(MAX_NOMINATIONS as u32 - 1, 100, Default::default())?;
+		let (stash, controller) = create_stash_controller::<T>(
+			T::MAX_NOMINATIONS - 1,
+			100,
+			Default::default(),
+		)?;
 		let stash_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(stash.clone());
 
 		// they start validating.
@@ -224,7 +228,11 @@ benchmarks! {
 		let mut nominator_stashes = Vec::with_capacity(k as usize);
 		for i in 0 .. k {
 			// create a nominator stash.
-			let (n_stash, n_controller) = create_stash_controller::<T>(MAX_NOMINATIONS as u32 + i, 100, Default::default())?;
+			let (n_stash, n_controller) = create_stash_controller::<T>(
+				T::MAX_NOMINATIONS + i,
+				100,
+				Default::default(),
+			)?;
 
 			// bake the nominations; we first clone them from the rest of the validators.
 			let mut nominations = rest_of_validators.clone();
@@ -256,9 +264,9 @@ benchmarks! {
 		}
 	}
 
-	// Worst case scenario, MAX_NOMINATIONS
+	// Worst case scenario, T::MAX_NOMINATIONS
 	nominate {
-		let n in 1 .. MAX_NOMINATIONS as u32;
+		let n in 1 .. T::MAX_NOMINATIONS;
 		let (stash, controller) = create_stash_controller::<T>(n + 1, 100, Default::default())?;
 		let validators = create_validators::<T>(n, 100)?;
 		whitelist_account!(controller);
@@ -467,7 +475,13 @@ benchmarks! {
 		let v in 1 .. 10;
 		let n in 1 .. 100;
 
-		create_validators_with_nominators_for_era::<T>(v, n, MAX_NOMINATIONS, false, None)?;
+		create_validators_with_nominators_for_era::<T>(
+			v,
+			n,
+			<T as Config>::MAX_NOMINATIONS as usize,
+			false,
+			None,
+		)?;
 		let session_index = SessionIndex::one();
 	}: {
 		let validators = Staking::<T>::new_era(session_index).ok_or("`new_era` failed")?;
@@ -478,7 +492,13 @@ benchmarks! {
 	payout_all {
 		let v in 1 .. 10;
 		let n in 1 .. 100;
-		create_validators_with_nominators_for_era::<T>(v, n, MAX_NOMINATIONS, false, None)?;
+		create_validators_with_nominators_for_era::<T>(
+			v,
+			n,
+			<T as Config>::MAX_NOMINATIONS as usize,
+			false,
+			None,
+		)?;
 		// Start a new Era
 		let new_validators = Staking::<T>::new_era(SessionIndex::one()).unwrap();
 		assert!(new_validators.len() == v as usize);
@@ -548,7 +568,7 @@ benchmarks! {
 		// total number of slashing spans. Assigned to validators randomly.
 		let s in 1 .. 20;
 
-		let validators = create_validators_with_nominators_for_era::<T>(v, n, MAX_NOMINATIONS, false, None)?
+		let validators = create_validators_with_nominators_for_era::<T>(v, n, T::MAX_NOMINATIONS as usize, false, None)?
 			.into_iter()
 			.map(|v| T::Lookup::lookup(v).unwrap())
 			.collect::<Vec<_>>();
@@ -567,7 +587,7 @@ benchmarks! {
 		// number of nominator intention.
 		let n = 500;
 
-		let _ = create_validators_with_nominators_for_era::<T>(v, n, MAX_NOMINATIONS, false, None)?;
+		let _ = create_validators_with_nominators_for_era::<T>(v, n, T::MAX_NOMINATIONS as usize, false, None)?;
 	}: {
 		let targets = <Staking<T>>::get_npos_targets();
 		assert_eq!(targets.len() as u32, v);
@@ -586,8 +606,13 @@ mod tests {
 			let v = 10;
 			let n = 100;
 
-			create_validators_with_nominators_for_era::<Test>(v, n, MAX_NOMINATIONS, false, None)
-				.unwrap();
+			create_validators_with_nominators_for_era::<Test>(
+				v,
+				n,
+				<Test as Config>::MAX_NOMINATIONS as usize,
+				false,
+				None,
+			).unwrap();
 
 			let count_validators = Validators::<Test>::iter().count();
 			let count_nominators = Nominators::<Test>::iter().count();
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index fe1738ca3331..31735f75ebc1 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -284,8 +284,7 @@ use sp_std::{
 	result,
 	prelude::*,
 	collections::btree_map::BTreeMap,
-	convert::{TryInto, From},
-	mem::size_of,
+	convert::From,
 };
 use codec::{HasCompact, Encode, Decode};
 use frame_support::{
@@ -303,7 +302,7 @@ use frame_support::{
 };
 use pallet_session::historical;
 use sp_runtime::{
-	Percent, Perbill, PerU16, RuntimeDebug, DispatchError,
+	Percent, Perbill, RuntimeDebug, DispatchError,
 	curve::PiecewiseLinear,
 	traits::{
 		Convert, Zero, StaticLookup, CheckedSub, Saturating, SaturatedConversion,
@@ -337,22 +336,6 @@ macro_rules! log {
 	};
 }
 
-/// Data type used to index nominators in the compact type
-pub type NominatorIndex = u32;
-
-/// Data type used to index validators in the compact type.
-pub type ValidatorIndex = u16;
-
-// Ensure the size of both ValidatorIndex and NominatorIndex. They both need to be well below usize.
-static_assertions::const_assert!(size_of::<ValidatorIndex>() <= size_of::<usize>());
-static_assertions::const_assert!(size_of::<NominatorIndex>() <= size_of::<usize>());
-static_assertions::const_assert!(size_of::<ValidatorIndex>() <= size_of::<u32>());
-static_assertions::const_assert!(size_of::<NominatorIndex>() <= size_of::<u32>());
-
-/// Maximum number of stakers that can be stored in a snapshot.
-pub const MAX_NOMINATIONS: usize =
-	<CompactAssignments as sp_npos_elections::CompactSolution>::LIMIT;
-
 pub const MAX_UNLOCKING_CHUNKS: usize = 32;
 
 /// Counter for the number of eras that have passed.
@@ -361,15 +344,6 @@ pub type EraIndex = u32;
 /// Counter for the number of "reward" points earned by a given validator.
 pub type RewardPoint = u32;
 
-// Note: Maximum nomination limit is set here -- 16.
-sp_npos_elections::generate_solution_type!(
-	#[compact]
-	pub struct CompactAssignments::<NominatorIndex, ValidatorIndex, OffchainAccuracy>(16)
-);
-
-/// Accuracy used for off-chain election. This better be small.
-pub type OffchainAccuracy = PerU16;
-
 /// The balance type of this module.
 pub type BalanceOf<T> =
 	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
@@ -766,6 +740,9 @@ pub trait Config: frame_system::Config + SendTransactionTypes<Call<Self>> {
 		DataProvider = Module<Self>,
 	>;
 
+	/// Maximum number of nominations per nominator.
+	const MAX_NOMINATIONS: u32;
+
 	/// Tokens have been minted and are unused for validator-reward.
 	/// See [Era payout](./index.html#era-payout).
 	type RewardRemainder: OnUnbalanced<NegativeImbalanceOf<Self>>;
@@ -1213,6 +1190,9 @@ decl_module! {
 		/// their reward. This used to limit the i/o cost for the nominator payout.
 		const MaxNominatorRewardedPerValidator: u32 = T::MaxNominatorRewardedPerValidator::get();
 
+		/// Maximum number of nominations per nominator.
+		const MaxNominations: u32 = T::MAX_NOMINATIONS;
+
 		type Error = Error<T>;
 
 		fn deposit_event() = default;
@@ -1247,15 +1227,6 @@ decl_module! {
 					T::BondingDuration::get(),
 				)
 			);
-
-			use sp_runtime::UpperOf;
-			// 1. Maximum sum of Vec<OffchainAccuracy> must fit into `UpperOf<OffchainAccuracy>`.
-			assert!(
-				<usize as TryInto<UpperOf<OffchainAccuracy>>>::try_into(MAX_NOMINATIONS)
-				.unwrap()
-				.checked_mul(<OffchainAccuracy>::one().deconstruct().try_into().unwrap())
-				.is_some()
-			);
 		}
 
 		/// Take the origin account as a stash and lock up `value` of its balance. `controller` will
@@ -1547,7 +1518,7 @@ decl_module! {
 			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
 			let stash = &ledger.stash;
 			ensure!(!targets.is_empty(), Error::<T>::EmptyTargets);
-			ensure!(targets.len() <= MAX_NOMINATIONS, Error::<T>::TooManyTargets);
+			ensure!(targets.len() <= T::MAX_NOMINATIONS as usize, Error::<T>::TooManyTargets);
 
 			let old = Nominators::<T>::get(stash).map_or_else(Vec::new, |x| x.targets);
 
@@ -2313,7 +2284,7 @@ impl<T: Config> Module<T> {
 	/// Returns `Err(())` if less than [`MinimumValidatorCount`] validators have been elected, `Ok`
 	/// otherwise.
 	pub fn process_election(
-		flat_supports: sp_npos_elections::Supports<T::AccountId>,
+		flat_supports: frame_election_provider_support::Supports<T::AccountId>,
 		current_era: EraIndex,
 	) -> Result<Vec<T::AccountId>, ()> {
 		let exposures = Self::collect_exposures(flat_supports);
@@ -2554,6 +2525,7 @@ impl<T: Config> Module<T> {
 impl<T: Config> frame_election_provider_support::ElectionDataProvider<T::AccountId, T::BlockNumber>
 	for Module<T>
 {
+	const MAXIMUM_VOTES_PER_VOTER: u32 = T::MAX_NOMINATIONS;
 	fn desired_targets() -> data_provider::Result<(u32, Weight)> {
 		Ok((Self::validator_count(), <T as frame_system::Config>::DbWeight::get().reads(1)))
 	}
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index b4c84059a210..03f5acfad728 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -240,6 +240,7 @@ impl onchain::Config for Test {
 	type DataProvider = Staking;
 }
 impl Config for Test {
+	const MAX_NOMINATIONS: u32 = 16;
 	type Currency = Balances;
 	type UnixTime = Timestamp;
 	type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote;

From e60597dff0aa7ffad623be2cc6edd94c7dc51edd Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Thu, 25 Mar 2021 10:43:20 +0100
Subject: [PATCH 0557/1194] fix local variable names (#8450)

---
 .../procedural/src/pallet/expand/call.rs      | 20 +++++++++----------
 frame/support/src/dispatch.rs                 | 20 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/frame/support/procedural/src/pallet/expand/call.rs b/frame/support/procedural/src/pallet/expand/call.rs
index 295cf14d37f0..27288a003785 100644
--- a/frame/support/procedural/src/pallet/expand/call.rs
+++ b/frame/support/procedural/src/pallet/expand/call.rs
@@ -108,26 +108,26 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
 				match *self {
 					#(
 						Self::#fn_name ( #( ref #args_name, )* ) => {
-							let base_weight = #fn_weight;
+							let __pallet_base_weight = #fn_weight;
 
-							let weight = <
+							let __pallet_weight = <
 								dyn #frame_support::dispatch::WeighData<( #( & #args_type, )* )>
-							>::weigh_data(&base_weight, ( #( #args_name, )* ));
+							>::weigh_data(&__pallet_base_weight, ( #( #args_name, )* ));
 
-							let class = <
+							let __pallet_class = <
 								dyn #frame_support::dispatch::ClassifyDispatch<
 									( #( & #args_type, )* )
 								>
-							>::classify_dispatch(&base_weight, ( #( #args_name, )* ));
+							>::classify_dispatch(&__pallet_base_weight, ( #( #args_name, )* ));
 
-							let pays_fee = <
+							let __pallet_pays_fee = <
 								dyn #frame_support::dispatch::PaysFee<( #( & #args_type, )* )>
-							>::pays_fee(&base_weight, ( #( #args_name, )* ));
+							>::pays_fee(&__pallet_base_weight, ( #( #args_name, )* ));
 
 							#frame_support::dispatch::DispatchInfo {
-								weight,
-								class,
-								pays_fee,
+								weight: __pallet_weight,
+								class: __pallet_class,
+								pays_fee: __pallet_pays_fee,
 							}
 						},
 					)*
diff --git a/frame/support/src/dispatch.rs b/frame/support/src/dispatch.rs
index aede0404da19..d6f133a8d20a 100644
--- a/frame/support/src/dispatch.rs
+++ b/frame/support/src/dispatch.rs
@@ -1967,23 +1967,23 @@ macro_rules! decl_module {
 				match *self {
 					$(
 						$call_type::$fn_name( $( ref $param_name ),* ) => {
-							let base_weight = $weight;
-							let weight = <dyn $crate::dispatch::WeighData<( $( & $param, )* )>>::weigh_data(
-								&base_weight,
+							let __pallet_base_weight = $weight;
+							let __pallet_weight = <dyn $crate::dispatch::WeighData<( $( & $param, )* )>>::weigh_data(
+								&__pallet_base_weight,
 								($( $param_name, )*)
 							);
-							let class = <dyn $crate::dispatch::ClassifyDispatch<( $( & $param, )* )>>::classify_dispatch(
-								&base_weight,
+							let __pallet_class = <dyn $crate::dispatch::ClassifyDispatch<( $( & $param, )* )>>::classify_dispatch(
+								&__pallet_base_weight,
 								($( $param_name, )*)
 							);
-							let pays_fee = <dyn $crate::dispatch::PaysFee<( $( & $param, )* )>>::pays_fee(
-								&base_weight,
+							let __pallet_pays_fee = <dyn $crate::dispatch::PaysFee<( $( & $param, )* )>>::pays_fee(
+								&__pallet_base_weight,
 								($( $param_name, )*)
 							);
 							$crate::dispatch::DispatchInfo {
-								weight,
-								class,
-								pays_fee,
+								weight: __pallet_weight,
+								class: __pallet_class,
+								pays_fee: __pallet_pays_fee,
 							}
 						},
 					)*

From 2e34d473e6ba81b454eb039544f2162975c0b30b Mon Sep 17 00:00:00 2001
From: Andrew Jones <ascjones@gmail.com>
Date: Thu, 25 Mar 2021 13:46:36 +0000
Subject: [PATCH 0558/1194] Remove redundant libp2p dependency from test runner
 (#8455)

* Upgrade test runner to use latest libp2p

* Update test-utils/test-runner/Cargo.toml

Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>

* Update Cargo.lock

Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
---
 Cargo.lock                        | 1 -
 test-utils/test-runner/Cargo.toml | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 48673e57ce54..c869f0c8dfcf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9712,7 +9712,6 @@ dependencies = [
  "futures 0.1.31",
  "futures 0.3.13",
  "jsonrpc-core",
- "libp2p",
  "log",
  "node-cli",
  "parity-scale-codec 1.3.7",
diff --git a/test-utils/test-runner/Cargo.toml b/test-utils/test-runner/Cargo.toml
index cac699854f82..4d9d6125bd4e 100644
--- a/test-utils/test-runner/Cargo.toml
+++ b/test-utils/test-runner/Cargo.toml
@@ -50,7 +50,6 @@ futures01 = { package = "futures", version = "0.1.29" }
 futures = { package = "futures", version = "0.3", features = ["compat"] }
 rand = "0.7"
 tokio = { version = "0.2", features = ["full"] }
-libp2p = "0.35.1"
 
 # Calling RPC
 jsonrpc-core = "15.1"
@@ -58,4 +57,4 @@ jsonrpc-core = "15.1"
 sc-finality-grandpa = { version = "0.9.0", path = "../../client/finality-grandpa" }
 sc-consensus-babe = { version = "0.9.0", path = "../../client/consensus/babe" }
 sp-consensus-babe = { version = "0.9.0", path = "../../primitives/consensus/babe" }
-node-cli = { version = "2.0.0", path = "../../bin/node/cli" }
\ No newline at end of file
+node-cli = { version = "2.0.0", path = "../../bin/node/cli" }

From 06ac563eeae2656c3716890c614f7a954610220e Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Fri, 26 Mar 2021 07:46:03 +0100
Subject: [PATCH 0559/1194] Upgrade pallet atomic swap (#8452)

* upgrade pallet atomic swap

* fix doc
---
 frame/atomic-swap/src/lib.rs | 159 +++++++++++++++++++----------------
 1 file changed, 87 insertions(+), 72 deletions(-)

diff --git a/frame/atomic-swap/src/lib.rs b/frame/atomic-swap/src/lib.rs
index 536a452c115d..513a9343a72e 100644
--- a/frame/atomic-swap/src/lib.rs
+++ b/frame/atomic-swap/src/lib.rs
@@ -17,15 +17,15 @@
 
 //! # Atomic Swap
 //!
-//! A module for atomically sending funds.
+//! A pallet for atomically sending funds.
 //!
-//! - [`atomic_swap::Config`](./trait.Config.html)
-//! - [`Call`](./enum.Call.html)
-//! - [`Module`](./struct.Module.html)
+//! - [`Config`]
+//! - [`Call`]
+//! - [`Pallet`]
 //!
 //! ## Overview
 //!
-//! A module for atomically sending funds from an origin to a target. A proof
+//! A pallet for atomically sending funds from an origin to a target. A proof
 //! is used to allow the target to approve (claim) the swap. If the swap is not
 //! claimed within a specified duration of time, the sender may cancel it.
 //!
@@ -33,9 +33,9 @@
 //!
 //! ### Dispatchable Functions
 //!
-//! * `create_swap` - called by a sender to register a new atomic swap
-//! * `claim_swap` - called by the target to approve a swap
-//! * `cancel_swap` - may be called by a sender after a specified duration
+//! * [`create_swap`](Call::create_swap) - called by a sender to register a new atomic swap
+//! * [`claim_swap`](Call::claim_swap) - called by the target to approve a swap
+//! * [`cancel_swap`](Call::cancel_swap) - may be called by a sender after a specified duration
 
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
@@ -45,17 +45,16 @@ mod tests;
 use sp_std::{prelude::*, marker::PhantomData, ops::{Deref, DerefMut}};
 use sp_io::hashing::blake2_256;
 use frame_support::{
-	Parameter, decl_module, decl_storage, decl_event, decl_error, ensure,
+	RuntimeDebugNoBound,
 	traits::{Get, Currency, ReservableCurrency, BalanceStatus},
 	weights::Weight,
 	dispatch::DispatchResult,
 };
-use frame_system::{self as system, ensure_signed};
 use codec::{Encode, Decode};
 use sp_runtime::RuntimeDebug;
 
 /// Pending atomic swap operation.
-#[derive(Clone, Eq, PartialEq, RuntimeDebug, Encode, Decode)]
+#[derive(Clone, Eq, PartialEq, RuntimeDebugNoBound, Encode, Decode)]
 pub struct PendingSwap<T: Config> {
 	/// Source of the swap.
 	pub source: T::AccountId,
@@ -135,35 +134,50 @@ impl<T: Config, AccountId, C> SwapAction<AccountId, T> for BalanceSwapAction<Acc
 	}
 }
 
-/// Atomic swap's pallet configuration trait.
-pub trait Config: frame_system::Config {
-	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
-	/// Swap action.
-	type SwapAction: SwapAction<Self::AccountId, Self> + Parameter;
-	/// Limit of proof size.
-	///
-	/// Atomic swap is only atomic if once the proof is revealed, both parties can submit the proofs
-	/// on-chain. If A is the one that generates the proof, then it requires that either:
-	/// - A's blockchain has the same proof length limit as B's blockchain.
-	/// - Or A's blockchain has shorter proof length limit as B's blockchain.
-	///
-	/// If B sees A is on a blockchain with larger proof length limit, then it should kindly refuse
-	/// to accept the atomic swap request if A generates the proof, and asks that B generates the
-	/// proof instead.
-	type ProofLimit: Get<u32>;
-}
-
-decl_storage! {
-	trait Store for Module<T: Config> as AtomicSwap {
-		pub PendingSwaps: double_map
-			hasher(twox_64_concat) T::AccountId, hasher(blake2_128_concat) HashedProof
-			=> Option<PendingSwap<T>>;
+pub use pallet::*;
+
+#[frame_support::pallet]
+pub mod pallet {
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+	use super::*;
+
+	/// Atomic swap's pallet configuration trait.
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		/// The overarching event type.
+		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
+		/// Swap action.
+		type SwapAction: SwapAction<Self::AccountId, Self> + Parameter;
+		/// Limit of proof size.
+		///
+		/// Atomic swap is only atomic if once the proof is revealed, both parties can submit the proofs
+		/// on-chain. If A is the one that generates the proof, then it requires that either:
+		/// - A's blockchain has the same proof length limit as B's blockchain.
+		/// - Or A's blockchain has shorter proof length limit as B's blockchain.
+		///
+		/// If B sees A is on a blockchain with larger proof length limit, then it should kindly refuse
+		/// to accept the atomic swap request if A generates the proof, and asks that B generates the
+		/// proof instead.
+		type ProofLimit: Get<u32>;
 	}
-}
 
-decl_error! {
-	pub enum Error for Module<T: Config> {
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(PhantomData<T>);
+
+	#[pallet::storage]
+	pub type PendingSwaps<T: Config> = StorageDoubleMap<_,
+		Twox64Concat, T::AccountId,
+		Blake2_128Concat, HashedProof,
+		PendingSwap<T>,
+	>;
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::error]
+	pub enum Error<T> {
 		/// Swap already exists.
 		AlreadyExist,
 		/// Swap proof is invalid.
@@ -181,31 +195,27 @@ decl_error! {
 		/// Duration has not yet passed for the swap to be cancelled.
 		DurationNotPassed,
 	}
-}
 
-decl_event!(
 	/// Event of atomic swap pallet.
-	pub enum Event<T> where
-		AccountId = <T as system::Config>::AccountId,
-		PendingSwap = PendingSwap<T>,
-	{
+	#[pallet::event]
+	#[pallet::metadata(T::AccountId = "AccountId", PendingSwap<T> = "PendingSwap")]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	pub enum Event<T: Config> {
 		/// Swap created. \[account, proof, swap\]
-		NewSwap(AccountId, HashedProof, PendingSwap),
+		NewSwap(T::AccountId, HashedProof, PendingSwap<T>),
 		/// Swap claimed. The last parameter indicates whether the execution succeeds.
 		/// \[account, proof, success\]
-		SwapClaimed(AccountId, HashedProof, bool),
+		SwapClaimed(T::AccountId, HashedProof, bool),
 		/// Swap cancelled. \[account, proof\]
-		SwapCancelled(AccountId, HashedProof),
+		SwapCancelled(T::AccountId, HashedProof),
 	}
-);
-
-decl_module! {
-	/// Module definition of atomic swap pallet.
-	pub struct Module<T: Config> for enum Call where origin: T::Origin {
-		type Error = Error<T>;
 
-		fn deposit_event() = default;
+	/// Old name generated by `decl_event`.
+	#[deprecated(note="use `Event` instead")]
+	pub type RawEvent<T> = Event<T>;
 
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
 		/// Register a new atomic swap, declaring an intention to send funds from origin to target
 		/// on the current blockchain. The target can claim the fund using the revealed proof. If
 		/// the fund is not claimed after `duration` blocks, then the sender can cancel the swap.
@@ -218,14 +228,14 @@ decl_module! {
 		/// - `duration`: Locked duration of the atomic swap. For safety reasons, it is recommended
 		///   that the revealer uses a shorter duration than the counterparty, to prevent the
 		///   situation where the revealer reveals the proof too late around the end block.
-		#[weight = T::DbWeight::get().reads_writes(1, 1).saturating_add(40_000_000)]
-		fn create_swap(
-			origin,
+		#[pallet::weight(T::DbWeight::get().reads_writes(1, 1).saturating_add(40_000_000))]
+		pub(crate) fn create_swap(
+			origin: OriginFor<T>,
 			target: T::AccountId,
 			hashed_proof: HashedProof,
 			action: T::SwapAction,
 			duration: T::BlockNumber,
-		) {
+		) -> DispatchResult {
 			let source = ensure_signed(origin)?;
 			ensure!(
 				!PendingSwaps::<T>::contains_key(&target, hashed_proof),
@@ -242,8 +252,10 @@ decl_module! {
 			PendingSwaps::<T>::insert(target.clone(), hashed_proof.clone(), swap.clone());
 
 			Self::deposit_event(
-				RawEvent::NewSwap(target, hashed_proof, swap)
+				Event::NewSwap(target, hashed_proof, swap)
 			);
+
+			Ok(())
 		}
 
 		/// Claim an atomic swap.
@@ -253,13 +265,14 @@ decl_module! {
 		/// - `proof`: Revealed proof of the claim.
 		/// - `action`: Action defined in the swap, it must match the entry in blockchain. Otherwise
 		///   the operation fails. This is used for weight calculation.
-		#[weight = T::DbWeight::get().reads_writes(1, 1)
-		  .saturating_add(40_000_000)
-		  .saturating_add((proof.len() as Weight).saturating_mul(100))
-		  .saturating_add(action.weight())
-		]
-		fn claim_swap(
-			origin,
+		#[pallet::weight(
+			T::DbWeight::get().reads_writes(1, 1)
+				.saturating_add(40_000_000)
+				.saturating_add((proof.len() as Weight).saturating_mul(100))
+				.saturating_add(action.weight())
+		)]
+		pub(crate) fn claim_swap(
+			origin: OriginFor<T>,
 			proof: Vec<u8>,
 			action: T::SwapAction,
 		) -> DispatchResult {
@@ -280,7 +293,7 @@ decl_module! {
 			PendingSwaps::<T>::remove(target.clone(), hashed_proof.clone());
 
 			Self::deposit_event(
-				RawEvent::SwapClaimed(target, hashed_proof, succeeded)
+				Event::SwapClaimed(target, hashed_proof, succeeded)
 			);
 
 			Ok(())
@@ -292,12 +305,12 @@ decl_module! {
 		///
 		/// - `target`: Target of the original atomic swap.
 		/// - `hashed_proof`: Hashed proof of the original atomic swap.
-		#[weight = T::DbWeight::get().reads_writes(1, 1).saturating_add(40_000_000)]
-		fn cancel_swap(
-			origin,
+		#[pallet::weight(T::DbWeight::get().reads_writes(1, 1).saturating_add(40_000_000))]
+		pub(crate) fn cancel_swap(
+			origin: OriginFor<T>,
 			target: T::AccountId,
 			hashed_proof: HashedProof,
-		) {
+		) -> DispatchResult {
 			let source = ensure_signed(origin)?;
 
 			let swap = PendingSwaps::<T>::get(&target, hashed_proof)
@@ -315,8 +328,10 @@ decl_module! {
 			PendingSwaps::<T>::remove(&target, hashed_proof.clone());
 
 			Self::deposit_event(
-				RawEvent::SwapCancelled(target, hashed_proof)
+				Event::SwapCancelled(target, hashed_proof)
 			);
+
+			Ok(())
 		}
 	}
 }

From c9832072c8b25530d2ede189bc21bf62eb2cb69c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Fri, 26 Mar 2021 14:21:00 +0100
Subject: [PATCH 0560/1194] Change companion check order (#8460)

* Change companion check order

Apparently if the pr isn't approved it counts as not mergable. However,
this is rahter confusing. To fix this, we just change the order.

* Move exit
---
 .../gitlab/check_polkadot_companion_status.sh | 43 +++++++++----------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/.maintain/gitlab/check_polkadot_companion_status.sh b/.maintain/gitlab/check_polkadot_companion_status.sh
index 4714baf54fb2..bfd27e6347c9 100755
--- a/.maintain/gitlab/check_polkadot_companion_status.sh
+++ b/.maintain/gitlab/check_polkadot_companion_status.sh
@@ -56,27 +56,7 @@ fi
 boldprint "companion pr: #${pr_companion}"
 
 # check the status of that pull request - needs to be
-# mergable and approved
-
-curl -H "${github_header}" -sS -o companion_pr.json \
-  ${github_api_polkadot_pull_url}/${pr_companion}
-
-pr_head_sha=$(jq -r -e '.head.sha' < companion_pr.json)
-boldprint "Polkadot PR's HEAD SHA: $pr_head_sha"
-
-if jq -e .merged < companion_pr.json >/dev/null
-then
-  boldprint "polkadot pr #${pr_companion} already merged"
-  exit 0
-fi
-
-if jq -e '.mergeable' < companion_pr.json >/dev/null
-then
-  boldprint "polkadot pr #${pr_companion} mergeable"
-else
-  boldprint "polkadot pr #${pr_companion} not mergeable"
-  exit 1
-fi
+# approved and mergable
 
 curl -H "${github_header}" -sS -o companion_pr_reviews.json \
   ${github_api_polkadot_pull_url}/${pr_companion}/reviews
@@ -98,6 +78,25 @@ if [ -z "$(jq -r -e '.[].state | select(. == "APPROVED")' < companion_pr_reviews
 fi
 
 boldprint "polkadot pr #${pr_companion} state APPROVED"
-exit 0
 
+curl -H "${github_header}" -sS -o companion_pr.json \
+  ${github_api_polkadot_pull_url}/${pr_companion}
+
+pr_head_sha=$(jq -r -e '.head.sha' < companion_pr.json)
+boldprint "Polkadot PR's HEAD SHA: $pr_head_sha"
+
+if jq -e .merged < companion_pr.json >/dev/null
+then
+  boldprint "polkadot pr #${pr_companion} already merged"
+  exit 0
+fi
+
+if jq -e '.mergeable' < companion_pr.json >/dev/null
+then
+  boldprint "polkadot pr #${pr_companion} mergeable"
+else
+  boldprint "polkadot pr #${pr_companion} not mergeable"
+  exit 1
+fi
 
+exit 0

From 84360e1212032ef46639de669c87ca015c95dfa4 Mon Sep 17 00:00:00 2001
From: Andrew Jones <ascjones@gmail.com>
Date: Fri, 26 Mar 2021 14:54:08 +0000
Subject: [PATCH 0561/1194] Migrate `pallet-sudo` to `pallet!` (#8448)

* WIP convert sudo pallet to attribute macros

* Fix up tests and migrate mock

* Fix up genesis build

* Migrate doc comment example

* Update frame/sudo/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Update frame/sudo/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Update frame/sudo/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Update frame/sudo/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Allow unused metadata call_functions

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
---
 frame/sudo/src/lib.rs                         | 174 +++++++++++-------
 frame/sudo/src/mock.rs                        |  94 ++++++----
 frame/sudo/src/tests.rs                       |  10 +-
 .../procedural/src/pallet/expand/call.rs      |   1 +
 4 files changed, 178 insertions(+), 101 deletions(-)

diff --git a/frame/sudo/src/lib.rs b/frame/sudo/src/lib.rs
index 53797d8cfc1d..d840d45a7f43 100644
--- a/frame/sudo/src/lib.rs
+++ b/frame/sudo/src/lib.rs
@@ -15,14 +15,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! # Sudo Module
+//! # Sudo Pallet
 //!
 //! - [`Config`]
 //! - [`Call`]
 //!
 //! ## Overview
 //!
-//! The Sudo module allows for a single account (called the "sudo key")
+//! The Sudo pallet allows for a single account (called the "sudo key")
 //! to execute dispatchable functions that require a `Root` call
 //! or designate a new account to replace them as the sudo key.
 //! Only one account can be the sudo key at a time.
@@ -31,7 +31,7 @@
 //!
 //! ### Dispatchable Functions
 //!
-//! Only the sudo key can call the dispatchable functions from the Sudo module.
+//! Only the sudo key can call the dispatchable functions from the Sudo pallet.
 //!
 //! * `sudo` - Make a `Root` call to a dispatchable function.
 //! * `set_key` - Assign a new account to be the sudo key.
@@ -40,8 +40,8 @@
 //!
 //! ### Executing Privileged Functions
 //!
-//! The Sudo module itself is not intended to be used within other modules.
-//! Instead, you can build "privileged functions" (i.e. functions that require `Root` origin) in other modules.
+//! The Sudo pallet itself is not intended to be used within other pallets.
+//! Instead, you can build "privileged functions" (i.e. functions that require `Root` origin) in other pallets.
 //! You can execute these privileged functions by calling `sudo` with the sudo key account.
 //! Privileged functions cannot be directly executed via an extrinsic.
 //!
@@ -49,35 +49,46 @@
 //!
 //! ### Simple Code Snippet
 //!
-//! This is an example of a module that exposes a privileged function:
+//! This is an example of a pallet that exposes a privileged function:
 //!
 //! ```
-//! use frame_support::{decl_module, dispatch};
-//! use frame_system::ensure_root;
 //!
-//! pub trait Config: frame_system::Config {}
+//! #[frame_support::pallet]
+//! pub mod logger {
+//! 	use frame_support::pallet_prelude::*;
+//! 	use frame_system::pallet_prelude::*;
+//! 	use super::*;
 //!
-//! decl_module! {
-//!     pub struct Module<T: Config> for enum Call where origin: T::Origin {
-//! 		#[weight = 0]
-//!         pub fn privileged_function(origin) -> dispatch::DispatchResult {
+//! 	#[pallet::config]
+//! 	pub trait Config: frame_system::Config {}
+//!
+//! 	#[pallet::pallet]
+//! 	pub struct Pallet<T>(PhantomData<T>);
+//!
+//! 	#[pallet::hooks]
+//! 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+//!
+//! 	#[pallet::call]
+//! 	impl<T: Config> Pallet<T> {
+//! 		#[pallet::weight(0)]
+//!         pub fn privileged_function(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
 //!             ensure_root(origin)?;
 //!
 //!             // do something...
 //!
-//!             Ok(())
+//!             Ok(().into())
 //!         }
-//!     }
+//! 	}
 //! }
 //! # fn main() {}
 //! ```
 //!
 //! ## Genesis Config
 //!
-//! The Sudo module depends on the [`GenesisConfig`](./struct.GenesisConfig.html).
+//! The Sudo pallet depends on the [`GenesisConfig`].
 //! You need to set an initial superuser account as the sudo `key`.
 //!
-//! ## Related Modules
+//! ## Related Pallets
 //!
 //! * [Democracy](../pallet_democracy/index.html)
 //!
@@ -89,35 +100,41 @@ use sp_std::prelude::*;
 use sp_runtime::{DispatchResult, traits::StaticLookup};
 
 use frame_support::{
-	Parameter, decl_module, decl_event, decl_storage, decl_error, ensure,
+	weights::GetDispatchInfo,
+	traits::UnfilteredDispatchable,
 };
-use frame_support::{
-	weights::{Weight, GetDispatchInfo, Pays},
-	traits::{UnfilteredDispatchable, Get},
-	dispatch::DispatchResultWithPostInfo,
-};
-use frame_system::ensure_signed;
 
 #[cfg(test)]
 mod mock;
 #[cfg(test)]
 mod tests;
 
-pub trait Config: frame_system::Config {
-	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
+pub use pallet::*;
 
-	/// A sudo-able call.
-	type Call: Parameter + UnfilteredDispatchable<Origin=Self::Origin> + GetDispatchInfo;
-}
+#[frame_support::pallet]
+pub mod pallet {
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+	use super::{*, DispatchResult};
 
-decl_module! {
-	/// Sudo module declaration.
-	pub struct Module<T: Config> for enum Call where origin: T::Origin {
-		type Error = Error<T>;
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		/// The overarching event type.
+		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
 
-		fn deposit_event() = default;
+		/// A sudo-able call.
+		type Call: Parameter + UnfilteredDispatchable<Origin=Self::Origin> + GetDispatchInfo;
+	}
 
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
 		/// Authenticates the sudo key and dispatches a function call with `Root` origin.
 		///
 		/// The dispatch origin for this call must be _Signed_.
@@ -128,17 +145,20 @@ decl_module! {
 		/// - One DB write (event).
 		/// - Weight of derivative `call` execution + 10,000.
 		/// # </weight>
-		#[weight = {
+		#[pallet::weight({
 			let dispatch_info = call.get_dispatch_info();
 			(dispatch_info.weight.saturating_add(10_000), dispatch_info.class)
-		}]
-		fn sudo(origin, call: Box<<T as Config>::Call>) -> DispatchResultWithPostInfo {
+		})]
+		pub(crate) fn sudo(
+			origin: OriginFor<T>,
+			call: Box<<T as Config>::Call>,
+		) -> DispatchResultWithPostInfo {
 			// This is a public call, so we ensure that the origin is some signed account.
 			let sender = ensure_signed(origin)?;
 			ensure!(sender == Self::key(), Error::<T>::RequireSudo);
 
 			let res = call.dispatch_bypass_filter(frame_system::RawOrigin::Root.into());
-			Self::deposit_event(RawEvent::Sudid(res.map(|_| ()).map_err(|e| e.error)));
+			Self::deposit_event(Event::Sudid(res.map(|_| ()).map_err(|e| e.error)));
 			// Sudo user does not pay a fee.
 			Ok(Pays::No.into())
 		}
@@ -153,14 +173,18 @@ decl_module! {
 		/// - O(1).
 		/// - The weight of this call is defined by the caller.
 		/// # </weight>
-		#[weight = (*_weight, call.get_dispatch_info().class)]
-		fn sudo_unchecked_weight(origin, call: Box<<T as Config>::Call>, _weight: Weight) -> DispatchResultWithPostInfo {
+		#[pallet::weight((*_weight, call.get_dispatch_info().class))]
+		pub(crate) fn sudo_unchecked_weight(
+			origin: OriginFor<T>,
+			call: Box<<T as Config>::Call>,
+			_weight: Weight,
+		) -> DispatchResultWithPostInfo {
 			// This is a public call, so we ensure that the origin is some signed account.
 			let sender = ensure_signed(origin)?;
 			ensure!(sender == Self::key(), Error::<T>::RequireSudo);
 
 			let res = call.dispatch_bypass_filter(frame_system::RawOrigin::Root.into());
-			Self::deposit_event(RawEvent::Sudid(res.map(|_| ()).map_err(|e| e.error)));
+			Self::deposit_event(Event::Sudid(res.map(|_| ()).map_err(|e| e.error)));
 			// Sudo user does not pay a fee.
 			Ok(Pays::No.into())
 		}
@@ -174,14 +198,17 @@ decl_module! {
 		/// - Limited storage reads.
 		/// - One DB change.
 		/// # </weight>
-		#[weight = 0]
-		fn set_key(origin, new: <T::Lookup as StaticLookup>::Source) -> DispatchResultWithPostInfo {
+		#[pallet::weight(0)]
+		pub(crate) fn set_key(
+			origin: OriginFor<T>,
+			new: <T::Lookup as StaticLookup>::Source,
+		) -> DispatchResultWithPostInfo {
 			// This is a public call, so we ensure that the origin is some signed account.
 			let sender = ensure_signed(origin)?;
 			ensure!(sender == Self::key(), Error::<T>::RequireSudo);
 			let new = T::Lookup::lookup(new)?;
 
-			Self::deposit_event(RawEvent::KeyChanged(Self::key()));
+			Self::deposit_event(Event::KeyChanged(Self::key()));
 			<Key<T>>::put(new);
 			// Sudo user does not pay a fee.
 			Ok(Pays::No.into())
@@ -198,7 +225,7 @@ decl_module! {
 		/// - One DB write (event).
 		/// - Weight of derivative `call` execution + 10,000.
 		/// # </weight>
-		#[weight = {
+		#[pallet::weight({
 			let dispatch_info = call.get_dispatch_info();
 			(
 				dispatch_info.weight
@@ -207,8 +234,9 @@ decl_module! {
 					.saturating_add(T::DbWeight::get().reads_writes(1, 1)),
 				dispatch_info.class,
 			)
-		}]
-		fn sudo_as(origin,
+		})]
+		pub(crate) fn sudo_as(
+			origin: OriginFor<T>,
 			who: <T::Lookup as StaticLookup>::Source,
 			call: Box<<T as Config>::Call>
 		) -> DispatchResultWithPostInfo {
@@ -220,35 +248,55 @@ decl_module! {
 
 			let res = call.dispatch_bypass_filter(frame_system::RawOrigin::Signed(who).into());
 
-			Self::deposit_event(RawEvent::SudoAsDone(res.map(|_| ()).map_err(|e| e.error)));
+			Self::deposit_event(Event::SudoAsDone(res.map(|_| ()).map_err(|e| e.error)));
 			// Sudo user does not pay a fee.
 			Ok(Pays::No.into())
 		}
 	}
-}
 
-decl_event!(
-	pub enum Event<T> where AccountId = <T as frame_system::Config>::AccountId {
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	#[pallet::metadata(T::AccountId = "AccountId")]
+	pub enum Event<T: Config> {
 		/// A sudo just took place. \[result\]
 		Sudid(DispatchResult),
 		/// The \[sudoer\] just switched identity; the old key is supplied.
-		KeyChanged(AccountId),
+		KeyChanged(T::AccountId),
 		/// A sudo just took place. \[result\]
 		SudoAsDone(DispatchResult),
 	}
-);
 
-decl_storage! {
-	trait Store for Module<T: Config> as Sudo {
+	#[pallet::error]
+	/// Error for the Sudo pallet
+	pub enum Error<T> {
+		/// Sender must be the Sudo account
+		RequireSudo,
+	}
+
+	/// The `AccountId` of the sudo key.
+	#[pallet::storage]
+	#[pallet::getter(fn key)]
+	pub(super) type Key<T: Config> = StorageValue<_, T::AccountId, ValueQuery>;
+
+	#[pallet::genesis_config]
+	pub struct GenesisConfig<T: Config> {
 		/// The `AccountId` of the sudo key.
-		Key get(fn key) config(): T::AccountId;
+		pub key: T::AccountId,
 	}
-}
 
-decl_error! {
-	/// Error for the Sudo module
-	pub enum Error for Module<T: Config> {
-		/// Sender must be the Sudo account
-		RequireSudo,
+	#[cfg(feature = "std")]
+	impl<T: Config> Default for GenesisConfig<T> {
+		fn default() -> Self {
+			Self {
+				key: Default::default(),
+			}
+		}
+	}
+
+	#[pallet::genesis_build]
+	impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+		fn build(&self) {
+			<Key<T>>::put(&self.key);
+		}
 	}
 }
diff --git a/frame/sudo/src/mock.rs b/frame/sudo/src/mock.rs
index cd242d491dae..9aac0a129907 100644
--- a/frame/sudo/src/mock.rs
+++ b/frame/sudo/src/mock.rs
@@ -18,7 +18,7 @@
 //! Test utilities
 
 use super::*;
-use frame_support::{parameter_types, weights::Weight};
+use frame_support::{parameter_types, traits::GenesisBuild};
 use sp_core::H256;
 use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
 use sp_io;
@@ -27,52 +27,80 @@ use frame_support::traits::Filter;
 use frame_system::limits;
 
 // Logger module to track execution.
+#[frame_support::pallet]
 pub mod logger {
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
 	use super::*;
-	use frame_system::ensure_root;
 
+	#[pallet::config]
 	pub trait Config: frame_system::Config {
-		type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
+		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
 	}
 
-	decl_storage! {
-		trait Store for Module<T: Config> as Logger {
-			AccountLog get(fn account_log): Vec<T::AccountId>;
-			I32Log get(fn i32_log): Vec<i32>;
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		#[pallet::weight(*weight)]
+		pub(crate) fn privileged_i32_log(
+			origin: OriginFor<T>,
+			i: i32,
+			weight: Weight
+		) -> DispatchResultWithPostInfo {
+			// Ensure that the `origin` is `Root`.
+			ensure_root(origin)?;
+			<I32Log<T>>::append(i);
+			Self::deposit_event(Event::AppendI32(i, weight));
+			Ok(().into())
 		}
-	}
 
-	decl_event! {
-		pub enum Event<T> where AccountId = <T as frame_system::Config>::AccountId {
-			AppendI32(i32, Weight),
-			AppendI32AndAccount(AccountId, i32, Weight),
+		#[pallet::weight(*weight)]
+		pub(crate) fn non_privileged_log(
+			origin: OriginFor<T>,
+			i: i32,
+			weight: Weight
+		) -> DispatchResultWithPostInfo {
+			// Ensure that the `origin` is some signed account.
+			let sender = ensure_signed(origin)?;
+			<I32Log<T>>::append(i);
+			<AccountLog<T>>::append(sender.clone());
+			Self::deposit_event(Event::AppendI32AndAccount(sender, i, weight));
+			Ok(().into())
 		}
 	}
 
-	decl_module! {
-		pub struct Module<T: Config> for enum Call where origin: <T as frame_system::Config>::Origin {
-			fn deposit_event() = default;
-
-			#[weight = *weight]
-			fn privileged_i32_log(origin, i: i32, weight: Weight){
-				// Ensure that the `origin` is `Root`.
-				ensure_root(origin)?;
-				<I32Log>::append(i);
-				Self::deposit_event(RawEvent::AppendI32(i, weight));
-			}
-
-			#[weight = *weight]
-			fn non_privileged_log(origin, i: i32, weight: Weight){
-				// Ensure that the `origin` is some signed account.
-				let sender = ensure_signed(origin)?;
-				<I32Log>::append(i);
-				<AccountLog<T>>::append(sender.clone());
-				Self::deposit_event(RawEvent::AppendI32AndAccount(sender, i, weight));
-			}
-		}
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	#[pallet::metadata(T::AccountId = "AccountId")]
+	pub enum Event<T: Config> {
+		AppendI32(i32, Weight),
+		AppendI32AndAccount(T::AccountId, i32, Weight),
 	}
+
+	#[pallet::storage]
+	#[pallet::getter(fn account_log)]
+	pub(super) type AccountLog<T: Config> = StorageValue<
+		_,
+		Vec<T::AccountId>,
+		ValueQuery
+	>;
+
+	#[pallet::storage]
+	#[pallet::getter(fn i32_log)]
+	pub(super) type I32Log<T> = StorageValue<
+		_,
+		Vec<i32>,
+		ValueQuery
+	>;
 }
 
+
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
diff --git a/frame/sudo/src/tests.rs b/frame/sudo/src/tests.rs
index 4d2552b7b88b..780e07676b29 100644
--- a/frame/sudo/src/tests.rs
+++ b/frame/sudo/src/tests.rs
@@ -58,7 +58,7 @@ fn sudo_emits_events_correctly() {
 		// Should emit event to indicate success when called with the root `key` and `call` is `Ok`.
 		let call = Box::new(Call::Logger(LoggerCall::privileged_i32_log(42, 1)));
 		assert_ok!(Sudo::sudo(Origin::signed(1), call));
-		let expected_event = TestEvent::sudo(RawEvent::Sudid(Ok(())));
+		let expected_event = TestEvent::sudo(Event::Sudid(Ok(())));
 		assert!(System::events().iter().any(|a| a.event == expected_event));
 	})
 }
@@ -97,7 +97,7 @@ fn sudo_unchecked_weight_emits_events_correctly() {
 		// Should emit event to indicate success when called with the root `key` and `call` is `Ok`.
 		let call = Box::new(Call::Logger(LoggerCall::privileged_i32_log(42, 1)));
 		assert_ok!(Sudo::sudo_unchecked_weight(Origin::signed(1), call, 1_000));
-		let expected_event = TestEvent::sudo(RawEvent::Sudid(Ok(())));
+		let expected_event = TestEvent::sudo(Event::Sudid(Ok(())));
 		assert!(System::events().iter().any(|a| a.event == expected_event));
 	})
 }
@@ -124,11 +124,11 @@ fn set_key_emits_events_correctly() {
 
 		// A root `key` can change the root `key`.
 		assert_ok!(Sudo::set_key(Origin::signed(1), 2));
-		let expected_event = TestEvent::sudo(RawEvent::KeyChanged(1));
+		let expected_event = TestEvent::sudo(Event::KeyChanged(1));
 		assert!(System::events().iter().any(|a| a.event == expected_event));
 		// Double check.
 		assert_ok!(Sudo::set_key(Origin::signed(2), 4));
-		let expected_event = TestEvent::sudo(RawEvent::KeyChanged(2));
+		let expected_event = TestEvent::sudo(Event::KeyChanged(2));
 		assert!(System::events().iter().any(|a| a.event == expected_event));
 	});
 }
@@ -164,7 +164,7 @@ fn sudo_as_emits_events_correctly() {
 		// A non-privileged function will work when passed to `sudo_as` with the root `key`.
 		let call = Box::new(Call::Logger(LoggerCall::non_privileged_log(42, 1)));
 		assert_ok!(Sudo::sudo_as(Origin::signed(1), 2, call));
-		let expected_event = TestEvent::sudo(RawEvent::SudoAsDone(Ok(())));
+		let expected_event = TestEvent::sudo(Event::SudoAsDone(Ok(())));
 		assert!(System::events().iter().any(|a| a.event == expected_event));
 	});
 }
diff --git a/frame/support/procedural/src/pallet/expand/call.rs b/frame/support/procedural/src/pallet/expand/call.rs
index 27288a003785..301d3fc5d9fa 100644
--- a/frame/support/procedural/src/pallet/expand/call.rs
+++ b/frame/support/procedural/src/pallet/expand/call.rs
@@ -186,6 +186,7 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
 
 		impl<#type_impl_gen> #pallet_ident<#type_use_gen> #where_clause {
 			#[doc(hidden)]
+			#[allow(dead_code)]
 			pub fn call_functions() -> &'static [#frame_support::dispatch::FunctionMetadata] {
 				&[ #(
 					#frame_support::dispatch::FunctionMetadata {

From f16abdac4d39542f5eacc8041a7d1ce573278034 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Fri, 26 Mar 2021 15:59:05 +0100
Subject: [PATCH 0562/1194] Fix companion check (#8464)

---
 .maintain/gitlab/check_polkadot_companion_status.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.maintain/gitlab/check_polkadot_companion_status.sh b/.maintain/gitlab/check_polkadot_companion_status.sh
index bfd27e6347c9..e0412c7b7bec 100755
--- a/.maintain/gitlab/check_polkadot_companion_status.sh
+++ b/.maintain/gitlab/check_polkadot_companion_status.sh
@@ -58,6 +58,12 @@ boldprint "companion pr: #${pr_companion}"
 # check the status of that pull request - needs to be
 # approved and mergable
 
+curl -H "${github_header}" -sS -o companion_pr.json \
+  ${github_api_polkadot_pull_url}/${pr_companion}
+
+pr_head_sha=$(jq -r -e '.head.sha' < companion_pr.json)
+boldprint "Polkadot PR's HEAD SHA: $pr_head_sha"
+
 curl -H "${github_header}" -sS -o companion_pr_reviews.json \
   ${github_api_polkadot_pull_url}/${pr_companion}/reviews
 
@@ -79,12 +85,6 @@ fi
 
 boldprint "polkadot pr #${pr_companion} state APPROVED"
 
-curl -H "${github_header}" -sS -o companion_pr.json \
-  ${github_api_polkadot_pull_url}/${pr_companion}
-
-pr_head_sha=$(jq -r -e '.head.sha' < companion_pr.json)
-boldprint "Polkadot PR's HEAD SHA: $pr_head_sha"
-
 if jq -e .merged < companion_pr.json >/dev/null
 then
   boldprint "polkadot pr #${pr_companion} already merged"

From e3a864a5baaf46cea6c83a2cc8db86fb529136cb Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Fri, 26 Mar 2021 18:02:41 +0100
Subject: [PATCH 0563/1194] Add NetworkService::add_known_address (#8467)

---
 client/network/src/service.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 54a5559d2eaf..bf3a86444b43 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -647,6 +647,13 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 			.unbounded_send(ServiceToWorkerMsg::SetReservedOnly(reserved_only));
 	}
 
+	/// Adds an address known to a node.
+	pub fn add_known_address(&mut self, peer_id: PeerId, addr: Multiaddr) {
+		let _ = self
+			.to_worker
+			.unbounded_send(ServiceToWorkerMsg::AddKnownAddress(peer_id, addr));
+	}
+
 	/// Appends a notification to the buffer of pending outgoing notifications with the given peer.
 	/// Has no effect if the notifications channel with this protocol name is not open.
 	///

From 56b9d48c92cd2aff9b1da83fe66e45de7860fd97 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Fri, 26 Mar 2021 22:28:55 +0100
Subject: [PATCH 0564/1194] Fix &mut self -> &self in add_known_address (#8468)

---
 client/network/src/service.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index bf3a86444b43..7ea66799bad3 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -648,7 +648,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	}
 
 	/// Adds an address known to a node.
-	pub fn add_known_address(&mut self, peer_id: PeerId, addr: Multiaddr) {
+	pub fn add_known_address(&self, peer_id: PeerId, addr: Multiaddr) {
 		let _ = self
 			.to_worker
 			.unbounded_send(ServiceToWorkerMsg::AddKnownAddress(peer_id, addr));

From 0f6b5734e8ff52199987b496b2ef7bfd51655198 Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Sat, 27 Mar 2021 14:37:13 +0100
Subject: [PATCH 0565/1194] Repot frame_support::traits; introduce some new
 currency stuff (#8435)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Reservable, Transferrable Fungible(s), plus adapters.

* Repot into new dir

* Imbalances for Fungibles

* Repot and balanced fungible.

* Clean up names and bridge-over Imbalanced.

* Repot frame_support::trait. Finally.

* Make build.

* Docs

* Good errors

* Fix tests. Implement fungible::Inspect for Balances.

* Implement additional traits for Balances.

* Revert UI test "fixes"

* Fix UI error

* Fix UI test

* Fixes

* Update lock

* Grumbles

* Grumbles

* Fixes

Co-authored-by: Bastian Köcher <info@kchr.de>
---
 frame/assets/src/lib.rs                       |  105 +-
 frame/balances/src/lib.rs                     |  174 +-
 frame/support/src/traits.rs                   | 2380 +----------------
 frame/support/src/traits/dispatch.rs          |   87 +
 frame/support/src/traits/filter.rs            |  282 ++
 frame/support/src/traits/hooks.rs             |  349 +++
 frame/support/src/traits/members.rs           |  142 +
 frame/support/src/traits/metadata.rs          |  168 ++
 frame/support/src/traits/misc.rs              |  271 ++
 frame/support/src/traits/randomness.rs        |   54 +
 frame/support/src/traits/schedule.rs          |  133 +
 frame/support/src/traits/storage.rs           |   45 +
 frame/support/src/traits/stored_map.rs        |  141 +
 frame/support/src/traits/tokens.rs            |   28 +
 frame/support/src/traits/tokens/currency.rs   |  208 ++
 .../src/traits/tokens/currency/lockable.rs    |  104 +
 .../src/traits/tokens/currency/reservable.rs  |   83 +
 frame/support/src/traits/tokens/fungible.rs   |  218 ++
 .../src/traits/tokens/fungible/balanced.rs    |  363 +++
 .../src/traits/tokens/fungible/imbalance.rs   |  162 ++
 frame/support/src/traits/tokens/fungibles.rs  |  143 +
 .../src/traits/tokens/fungibles/balanced.rs   |  375 +++
 .../src/traits/tokens/fungibles/imbalance.rs  |  169 ++
 frame/support/src/traits/tokens/imbalance.rs  |  174 ++
 .../traits/tokens/imbalance/on_unbalanced.rs  |   50 +
 .../tokens/imbalance/signed_imbalance.rs      |   69 +
 .../traits/tokens/imbalance/split_two_ways.rs |   51 +
 frame/support/src/traits/tokens/misc.rs       |  164 ++
 frame/support/src/traits/validation.rs        |  242 ++
 frame/support/src/traits/voting.rs            |   88 +
 .../genesis_default_not_satisfied.stderr      |   18 +-
 frame/system/src/lib.rs                       |   13 +-
 frame/transaction-payment/src/payment.rs      |    1 +
 primitives/runtime/src/lib.rs                 |   52 +
 34 files changed, 4741 insertions(+), 2365 deletions(-)
 create mode 100644 frame/support/src/traits/dispatch.rs
 create mode 100644 frame/support/src/traits/filter.rs
 create mode 100644 frame/support/src/traits/hooks.rs
 create mode 100644 frame/support/src/traits/members.rs
 create mode 100644 frame/support/src/traits/metadata.rs
 create mode 100644 frame/support/src/traits/misc.rs
 create mode 100644 frame/support/src/traits/randomness.rs
 create mode 100644 frame/support/src/traits/schedule.rs
 create mode 100644 frame/support/src/traits/storage.rs
 create mode 100644 frame/support/src/traits/stored_map.rs
 create mode 100644 frame/support/src/traits/tokens.rs
 create mode 100644 frame/support/src/traits/tokens/currency.rs
 create mode 100644 frame/support/src/traits/tokens/currency/lockable.rs
 create mode 100644 frame/support/src/traits/tokens/currency/reservable.rs
 create mode 100644 frame/support/src/traits/tokens/fungible.rs
 create mode 100644 frame/support/src/traits/tokens/fungible/balanced.rs
 create mode 100644 frame/support/src/traits/tokens/fungible/imbalance.rs
 create mode 100644 frame/support/src/traits/tokens/fungibles.rs
 create mode 100644 frame/support/src/traits/tokens/fungibles/balanced.rs
 create mode 100644 frame/support/src/traits/tokens/fungibles/imbalance.rs
 create mode 100644 frame/support/src/traits/tokens/imbalance.rs
 create mode 100644 frame/support/src/traits/tokens/imbalance/on_unbalanced.rs
 create mode 100644 frame/support/src/traits/tokens/imbalance/signed_imbalance.rs
 create mode 100644 frame/support/src/traits/tokens/imbalance/split_two_ways.rs
 create mode 100644 frame/support/src/traits/tokens/misc.rs
 create mode 100644 frame/support/src/traits/validation.rs
 create mode 100644 frame/support/src/traits/voting.rs

diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index 65630cf1ba56..db7338e36e53 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -139,15 +139,25 @@ use sp_runtime::{
 };
 use codec::{Encode, Decode, HasCompact};
 use frame_support::{ensure, dispatch::{DispatchError, DispatchResult}};
-use frame_support::traits::{Currency, ReservableCurrency, BalanceStatus::Reserved, Fungibles};
+use frame_support::traits::{Currency, ReservableCurrency, BalanceStatus::Reserved};
+use frame_support::traits::tokens::{WithdrawConsequence, DepositConsequence, fungibles};
 use frame_system::Config as SystemConfig;
+
 pub use weights::WeightInfo;
 pub use pallet::*;
 
-impl<T: Config> Fungibles<<T as SystemConfig>::AccountId> for Pallet<T> {
+impl<T: Config> fungibles::Inspect<<T as SystemConfig>::AccountId> for Pallet<T> {
 	type AssetId = T::AssetId;
 	type Balance = T::Balance;
 
+	fn total_issuance(asset: Self::AssetId) -> Self::Balance {
+		Asset::<T>::get(asset).map(|x| x.supply).unwrap_or_else(Zero::zero)
+	}
+
+	fn minimum_balance(asset: Self::AssetId) -> Self::Balance {
+		Asset::<T>::get(asset).map(|x| x.min_balance).unwrap_or_else(Zero::zero)
+	}
+
 	fn balance(
 		asset: Self::AssetId,
 		who: &<T as SystemConfig>::AccountId,
@@ -159,24 +169,45 @@ impl<T: Config> Fungibles<<T as SystemConfig>::AccountId> for Pallet<T> {
 		asset: Self::AssetId,
 		who: &<T as SystemConfig>::AccountId,
 		amount: Self::Balance,
-	) -> bool {
+	) -> DepositConsequence {
 		Pallet::<T>::can_deposit(asset, who, amount)
 	}
 
+	fn can_withdraw(
+		asset: Self::AssetId,
+		who: &<T as SystemConfig>::AccountId,
+		amount: Self::Balance,
+	) -> WithdrawConsequence<Self::Balance> {
+		Pallet::<T>::can_withdraw(asset, who, amount)
+	}
+}
+
+impl<T: Config> fungibles::Mutate<<T as SystemConfig>::AccountId> for Pallet<T> {
 	fn deposit(
 		asset: Self::AssetId,
-		who: <T as SystemConfig>::AccountId,
+		who: &<T as SystemConfig>::AccountId,
 		amount: Self::Balance,
 	) -> DispatchResult {
-		Pallet::<T>::increase_balance(asset, who, amount, None)
+		Pallet::<T>::increase_balance(asset, who.clone(), amount, None)
 	}
 
 	fn withdraw(
 		asset: Self::AssetId,
-		who: <T as SystemConfig>::AccountId,
+		who: &<T as SystemConfig>::AccountId,
 		amount: Self::Balance,
-	) -> DispatchResult {
-		Pallet::<T>::reduce_balance(asset, who, amount, None)
+	) -> Result<Self::Balance, DispatchError> {
+		Pallet::<T>::reduce_balance(asset, who.clone(), amount, None)
+	}
+}
+
+impl<T: Config> fungibles::Transfer<T::AccountId> for Pallet<T> {
+	fn transfer(
+		asset: Self::AssetId,
+		source: &T::AccountId,
+		dest: &T::AccountId,
+		amount: T::Balance,
+	) -> Result<T::Balance, DispatchError> {
+		<Self as fungibles::Mutate::<T::AccountId>>::transfer(asset, source, dest, amount)
 	}
 }
 
@@ -671,7 +702,7 @@ pub mod pallet {
 			let origin = ensure_signed(origin)?;
 			let who = T::Lookup::lookup(who)?;
 
-			Self::reduce_balance(id, who, amount, Some(origin))
+			Self::reduce_balance(id, who, amount, Some(origin)).map(|_| ())
 		}
 
 		/// Move some assets from the sender account to another.
@@ -1380,21 +1411,57 @@ impl<T: Config> Pallet<T> {
 		d.accounts = d.accounts.saturating_sub(1);
 	}
 
-	fn can_deposit(id: T::AssetId, who: &T::AccountId, amount: T::Balance) -> bool {
+	fn can_deposit(id: T::AssetId, who: &T::AccountId, amount: T::Balance) -> DepositConsequence {
 		let details = match Asset::<T>::get(id) {
 			Some(details) => details,
-			None => return false,
+			None => return DepositConsequence::UnknownAsset,
 		};
-		if details.supply.checked_add(&amount).is_none() { return false }
+		if details.supply.checked_add(&amount).is_none() {
+			return DepositConsequence::Overflow
+		}
 		let account = Account::<T>::get(id, who);
-		if account.balance.checked_add(&amount).is_none() { return false }
+		if account.balance.checked_add(&amount).is_none() {
+			return DepositConsequence::Overflow
+		}
 		if account.balance.is_zero() {
-			if amount < details.min_balance { return false }
-			if !details.is_sufficient && frame_system::Pallet::<T>::providers(who) == 0 { return false }
-			if details.is_sufficient && details.sufficients.checked_add(1).is_none() { return false }
+			if amount < details.min_balance {
+				return DepositConsequence::BelowMinimum
+			}
+			if !details.is_sufficient && frame_system::Pallet::<T>::providers(who) == 0 {
+				return DepositConsequence::CannotCreate
+			}
+			if details.is_sufficient && details.sufficients.checked_add(1).is_none() {
+				return DepositConsequence::Overflow
+			}
 		}
 
-		true
+		DepositConsequence::Success
+	}
+
+	fn can_withdraw(
+		id: T::AssetId,
+		who: &T::AccountId,
+		amount: T::Balance,
+	) -> WithdrawConsequence<T::Balance> {
+		let details = match Asset::<T>::get(id) {
+			Some(details) => details,
+			None => return WithdrawConsequence::UnknownAsset,
+		};
+		if details.supply.checked_sub(&amount).is_none() {
+			return WithdrawConsequence::Underflow
+		}
+		let account = Account::<T>::get(id, who);
+		if let Some(rest) = account.balance.checked_sub(&amount) {
+			if rest < details.min_balance {
+				WithdrawConsequence::ReducedToZero(rest)
+			} else {
+				// NOTE: this assumes (correctly) that the token won't be a provider. If that ever
+				// changes, this will need to change.
+				WithdrawConsequence::Success
+			}
+		} else {
+			WithdrawConsequence::NoFunds
+		}
 	}
 
 	fn increase_balance(
@@ -1430,7 +1497,7 @@ impl<T: Config> Pallet<T> {
 		target: T::AccountId,
 		amount: T::Balance,
 		maybe_check_admin: Option<T::AccountId>,
-	) -> DispatchResult {
+	) -> Result<T::Balance, DispatchError> {
 		Asset::<T>::try_mutate(id, |maybe_details| {
 			let d = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
 			if let Some(check_admin) = maybe_check_admin {
@@ -1458,7 +1525,7 @@ impl<T: Config> Pallet<T> {
 			d.supply = d.supply.saturating_sub(burned);
 
 			Self::deposit_event(Event::Burned(id, target, burned));
-			Ok(())
+			Ok(burned)
 		})
 	}
 
diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index fc4dab7cec4a..a2e858799b0e 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -682,6 +682,78 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		}
 	}
 
+	fn deposit_consequence(
+		_who: &T::AccountId,
+		amount: T::Balance,
+		account: &AccountData<T::Balance>,
+	) -> DepositConsequence {
+		if amount.is_zero() { return DepositConsequence::Success }
+
+		if TotalIssuance::<T, I>::get().checked_add(&amount).is_none() {
+			return DepositConsequence::Overflow
+		}
+
+		let new_total_balance = match account.total().checked_add(&amount) {
+			Some(x) => x,
+			None => return DepositConsequence::Overflow,
+		};
+
+		if new_total_balance < T::ExistentialDeposit::get() {
+			return DepositConsequence::BelowMinimum
+		}
+
+		// NOTE: We assume that we are a provider, so don't need to do any checks in the
+		// case of account creation.
+
+		DepositConsequence::Success
+	}
+
+	fn withdraw_consequence(
+		who: &T::AccountId,
+		amount: T::Balance,
+		account: &AccountData<T::Balance>,
+	) -> WithdrawConsequence<T::Balance> {
+		if amount.is_zero() { return WithdrawConsequence::Success }
+
+		if TotalIssuance::<T, I>::get().checked_sub(&amount).is_none() {
+			return WithdrawConsequence::Underflow
+		}
+
+		let new_total_balance = match account.total().checked_sub(&amount) {
+			Some(x) => x,
+			None => return WithdrawConsequence::NoFunds,
+		};
+
+		// Provider restriction - total account balance cannot be reduced to zero if it cannot
+		// sustain the loss of a provider reference.
+		// NOTE: This assumes that the pallet is a provider (which is true). Is this ever changes,
+		// then this will need to adapt accordingly.
+		let ed = T::ExistentialDeposit::get();
+		let success = if new_total_balance < ed {
+			if frame_system::Pallet::<T>::can_dec_provider(who) {
+				WithdrawConsequence::ReducedToZero(new_total_balance)
+			} else {
+				return WithdrawConsequence::WouldDie
+			}
+		} else {
+			WithdrawConsequence::Success
+		};
+
+		// Enough free funds to have them be reduced.
+		let new_free_balance = match account.free.checked_sub(&amount) {
+			Some(b) => b,
+			None => return WithdrawConsequence::NoFunds,
+		};
+
+		// Eventual free funds must be no less than the frozen balance.
+		let min_balance = account.frozen(Reasons::All);
+		if new_free_balance < min_balance {
+			return WithdrawConsequence::Frozen
+		}
+
+		success
+	}
+
 	/// Mutate an account to some new value, or delete it entirely with `None`. Will enforce
 	/// `ExistentialDeposit` law, annulling the account as needed.
 	///
@@ -803,6 +875,75 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	}
 }
 
+use frame_support::traits::tokens::{fungible, DepositConsequence, WithdrawConsequence};
+
+impl<T: Config<I>, I: 'static> fungible::Inspect<T::AccountId> for Pallet<T, I> {
+	type Balance = T::Balance;
+
+	fn total_issuance() -> Self::Balance {
+		TotalIssuance::<T, I>::get()
+	}
+	fn minimum_balance() -> Self::Balance {
+		T::ExistentialDeposit::get()
+	}
+	fn balance(who: &T::AccountId) -> Self::Balance {
+		Self::account(who).total()
+	}
+	fn can_deposit(who: &T::AccountId, amount: Self::Balance) -> DepositConsequence {
+		Self::deposit_consequence(who, amount, &Self::account(who))
+	}
+	fn can_withdraw(who: &T::AccountId, amount: Self::Balance) -> WithdrawConsequence<Self::Balance> {
+		Self::withdraw_consequence(who, amount, &Self::account(who))
+	}
+}
+
+impl<T: Config<I>, I: 'static> fungible::Mutate<T::AccountId> for Pallet<T, I> {
+	fn deposit(who: &T::AccountId, amount: Self::Balance) -> DispatchResult {
+		if amount.is_zero() { return Ok(()) }
+		Self::try_mutate_account(who, |account, _is_new| -> DispatchResult {
+			Self::deposit_consequence(who, amount, &account).into_result()?;
+			account.free += amount;
+			Ok(())
+		})?;
+		TotalIssuance::<T, I>::mutate(|t| *t += amount);
+		Ok(())
+	}
+
+	fn withdraw(who: &T::AccountId, amount: Self::Balance) -> Result<Self::Balance, DispatchError> {
+		if amount.is_zero() { return Ok(Self::Balance::zero()); }
+
+		let actual = Self::try_mutate_account(who, |account, _is_new| -> Result<T::Balance, DispatchError> {
+			let extra = Self::withdraw_consequence(who, amount, &account).into_result()?;
+			let actual = amount + extra;
+			account.free -= actual;
+			Ok(actual)
+		})?;
+		TotalIssuance::<T, I>::mutate(|t| *t -= actual);
+		Ok(actual)
+	}
+}
+
+impl<T: Config<I>, I: 'static> fungible::Transfer<T::AccountId> for Pallet<T, I> {
+	fn transfer(
+		source: &T::AccountId,
+		dest: &T::AccountId,
+		amount: T::Balance,
+	) -> Result<T::Balance, DispatchError> {
+		<Self as fungible::Mutate::<T::AccountId>>::transfer(source, dest, amount)
+	}
+}
+
+impl<T: Config<I>, I: 'static> fungible::Unbalanced<T::AccountId> for Pallet<T, I> {
+	fn set_balance(who: &T::AccountId, amount: Self::Balance) -> DispatchResult {
+		Self::mutate_account(who, |account| account.free = amount)?;
+		Ok(())
+	}
+
+	fn set_total_issuance(amount: Self::Balance) {
+		TotalIssuance::<T, I>::mutate(|t| *t = amount);
+	}
+}
+
 // wrapping these imbalances in a private module is necessary to ensure absolute privacy
 // of the inner member.
 mod imbalances {
@@ -811,6 +952,7 @@ mod imbalances {
 		TryDrop, RuntimeDebug,
 	};
 	use sp_std::mem;
+	use frame_support::traits::SameOrOther;
 
 	/// Opaque, move-only struct with private fields that serves as a token denoting that
 	/// funds have been created without any equal and opposite accounting.
@@ -844,6 +986,12 @@ mod imbalances {
 		}
 	}
 
+	impl<T: Config<I>, I: 'static> Default for PositiveImbalance<T, I> {
+		fn default() -> Self {
+			Self::zero()
+		}
+	}
+
 	impl<T: Config<I>, I: 'static> Imbalance<T::Balance> for PositiveImbalance<T, I> {
 		type Opposite = NegativeImbalance<T, I>;
 
@@ -874,14 +1022,16 @@ mod imbalances {
 			self.0 = self.0.saturating_add(other.0);
 			mem::forget(other);
 		}
-		fn offset(self, other: Self::Opposite) -> result::Result<Self, Self::Opposite> {
+		fn offset(self, other: Self::Opposite) -> SameOrOther<Self, Self::Opposite> {
 			let (a, b) = (self.0, other.0);
 			mem::forget((self, other));
 
-			if a >= b {
-				Ok(Self(a - b))
+			if a > b {
+				SameOrOther::Same(Self(a - b))
+			} else if b > a {
+				SameOrOther::Other(NegativeImbalance::new(b - a))
 			} else {
-				Err(NegativeImbalance::new(b - a))
+				SameOrOther::None
 			}
 		}
 		fn peek(&self) -> T::Balance {
@@ -895,6 +1045,12 @@ mod imbalances {
 		}
 	}
 
+	impl<T: Config<I>, I: 'static> Default for NegativeImbalance<T, I> {
+		fn default() -> Self {
+			Self::zero()
+		}
+	}
+
 	impl<T: Config<I>, I: 'static> Imbalance<T::Balance> for NegativeImbalance<T, I> {
 		type Opposite = PositiveImbalance<T, I>;
 
@@ -925,14 +1081,16 @@ mod imbalances {
 			self.0 = self.0.saturating_add(other.0);
 			mem::forget(other);
 		}
-		fn offset(self, other: Self::Opposite) -> result::Result<Self, Self::Opposite> {
+		fn offset(self, other: Self::Opposite) -> SameOrOther<Self, Self::Opposite> {
 			let (a, b) = (self.0, other.0);
 			mem::forget((self, other));
 
-			if a >= b {
-				Ok(Self(a - b))
+			if a > b {
+				SameOrOther::Same(Self(a - b))
+			} else if b > a {
+				SameOrOther::Other(PositiveImbalance::new(b - a))
 			} else {
-				Err(PositiveImbalance::new(b - a))
+				SameOrOther::None
 			}
 		}
 		fn peek(&self) -> T::Balance {
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index 9f8afdf7c754..391fa0b53898 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -15,2347 +15,71 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Traits for FRAME.
+//! Traits and associated utilities for use in the FRAME environment.
 //!
 //! NOTE: If you're looking for `parameter_types`, it has moved in to the top-level module.
 
-use sp_std::{prelude::*, result, marker::PhantomData, ops::Div, fmt::Debug};
-use codec::{FullCodec, Codec, Encode, Decode, EncodeLike};
-use sp_core::u32_trait::Value as U32;
-use sp_runtime::{
-	traits::{
-		AtLeast32Bit, AtLeast32BitUnsigned, Block as BlockT, BadOrigin, Convert,
-		MaybeSerializeDeserialize, SaturatedConversion, Saturating, StoredMapError,
-		UniqueSaturatedFrom, UniqueSaturatedInto, Zero,
-	},
-	BoundToRuntimeAppPublic, ConsensusEngineId, DispatchError, DispatchResult, Percent,
-	RuntimeAppPublic, RuntimeDebug,
+pub mod tokens;
+pub use tokens::fungible::{
+	Inspect as InspectFungible, Mutate as MutateFungible, Transfer as TransferFungible,
+	Reserve as ReserveFungible, Balanced as BalancedFungible, Unbalanced as UnbalancedFungible,
+	ItemOf,
 };
-use sp_staking::SessionIndex;
-use crate::dispatch::Parameter;
-use crate::storage::StorageMap;
-use crate::weights::Weight;
-use bitflags::bitflags;
-use impl_trait_for_tuples::impl_for_tuples;
-
-/// Re-expected for the macro.
-#[doc(hidden)]
-pub use sp_std::{mem::{swap, take}, cell::RefCell, vec::Vec, boxed::Box};
-
-/// A trait for online node inspection in a session.
-///
-/// Something that can give information about the current validator set.
-pub trait ValidatorSet<AccountId> {
-	/// Type for representing validator id in a session.
-	type ValidatorId: Parameter;
-	/// A type for converting `AccountId` to `ValidatorId`.
-	type ValidatorIdOf: Convert<AccountId, Option<Self::ValidatorId>>;
-
-	/// Returns current session index.
-	fn session_index() -> SessionIndex;
-
-	/// Returns the active set of validators.
-	fn validators() -> Vec<Self::ValidatorId>;
-}
-
-/// [`ValidatorSet`] combined with an identification.
-pub trait ValidatorSetWithIdentification<AccountId>: ValidatorSet<AccountId> {
-	/// Full identification of `ValidatorId`.
-	type Identification: Parameter;
-	/// A type for converting `ValidatorId` to `Identification`.
-	type IdentificationOf: Convert<Self::ValidatorId, Option<Self::Identification>>;
-}
-
-/// A session handler for specific key type.
-pub trait OneSessionHandler<ValidatorId>: BoundToRuntimeAppPublic {
-	/// The key type expected.
-	type Key: Decode + Default + RuntimeAppPublic;
-
-	/// The given validator set will be used for the genesis session.
-	/// It is guaranteed that the given validator set will also be used
-	/// for the second session, therefore the first call to `on_new_session`
-	/// should provide the same validator set.
-	fn on_genesis_session<'a, I: 'a>(validators: I)
-		where I: Iterator<Item=(&'a ValidatorId, Self::Key)>, ValidatorId: 'a;
-
-	/// Session set has changed; act appropriately. Note that this can be called
-	/// before initialization of your module.
-	///
-	/// `changed` is true when at least one of the session keys
-	/// or the underlying economic identities/distribution behind one the
-	/// session keys has changed, false otherwise.
-	///
-	/// The `validators` are the validators of the incoming session, and `queued_validators`
-	/// will follow.
-	fn on_new_session<'a, I: 'a>(
-		changed: bool,
-		validators: I,
-		queued_validators: I,
-	) where I: Iterator<Item=(&'a ValidatorId, Self::Key)>, ValidatorId: 'a;
-
-	/// A notification for end of the session.
-	///
-	/// Note it is triggered before any `SessionManager::end_session` handlers,
-	/// so we can still affect the validator set.
-	fn on_before_session_ending() {}
-
-	/// A validator got disabled. Act accordingly until a new session begins.
-	fn on_disabled(_validator_index: usize);
-}
-
-/// Simple trait for providing a filter over a reference to some type.
-pub trait Filter<T> {
-	/// Determine if a given value should be allowed through the filter (returns `true`) or not.
-	fn filter(_: &T) -> bool;
-}
-
-impl<T> Filter<T> for () {
-	fn filter(_: &T) -> bool { true }
-}
-
-/// Trait to add a constraint onto the filter.
-pub trait FilterStack<T>: Filter<T> {
-	/// The type used to archive the stack.
-	type Stack;
-
-	/// Add a new `constraint` onto the filter.
-	fn push(constraint: impl Fn(&T) -> bool + 'static);
-
-	/// Removes the most recently pushed, and not-yet-popped, constraint from the filter.
-	fn pop();
-
-	/// Clear the filter, returning a value that may be used later to `restore` it.
-	fn take() -> Self::Stack;
-
-	/// Restore the filter from a previous `take` operation.
-	fn restore(taken: Self::Stack);
-}
-
-/// Guard type for pushing a constraint to a `FilterStack` and popping when dropped.
-pub struct FilterStackGuard<F: FilterStack<T>, T>(PhantomData<(F, T)>);
-
-/// Guard type for clearing all pushed constraints from a `FilterStack` and reinstating them when
-/// dropped.
-pub struct ClearFilterGuard<F: FilterStack<T>, T>(Option<F::Stack>, PhantomData<T>);
-
-impl<F: FilterStack<T>, T> FilterStackGuard<F, T> {
-	/// Create a new instance, adding a new `constraint` onto the filter `T`, and popping it when
-	/// this instance is dropped.
-	pub fn new(constraint: impl Fn(&T) -> bool + 'static) -> Self {
-		F::push(constraint);
-		Self(PhantomData)
-	}
-}
-
-impl<F: FilterStack<T>, T> Drop for FilterStackGuard<F, T> {
-	fn drop(&mut self) {
-		F::pop();
-	}
-}
-
-impl<F: FilterStack<T>, T> ClearFilterGuard<F, T> {
-	/// Create a new instance, adding a new `constraint` onto the filter `T`, and popping it when
-	/// this instance is dropped.
-	pub fn new() -> Self {
-		Self(Some(F::take()), PhantomData)
-	}
-}
-
-impl<F: FilterStack<T>, T> Drop for ClearFilterGuard<F, T> {
-	fn drop(&mut self) {
-		if let Some(taken) = self.0.take() {
-			F::restore(taken);
-		}
-	}
-}
-
-/// Simple trait for providing a filter over a reference to some type, given an instance of itself.
-pub trait InstanceFilter<T>: Sized + Send + Sync {
-	/// Determine if a given value should be allowed through the filter (returns `true`) or not.
-	fn filter(&self, _: &T) -> bool;
-
-	/// Determines whether `self` matches at least everything that `_o` does.
-	fn is_superset(&self, _o: &Self) -> bool { false }
-}
-
-impl<T> InstanceFilter<T> for () {
-	fn filter(&self, _: &T) -> bool { true }
-	fn is_superset(&self, _o: &Self) -> bool { true }
-}
-
-#[macro_export]
-macro_rules! impl_filter_stack {
-	($target:ty, $base:ty, $call:ty, $module:ident) => {
-		#[cfg(feature = "std")]
-		mod $module {
-			#[allow(unused_imports)]
-			use super::*;
-			use $crate::traits::{swap, take, RefCell, Vec, Box, Filter, FilterStack};
-
-			thread_local! {
-				static FILTER: RefCell<Vec<Box<dyn Fn(&$call) -> bool + 'static>>> = RefCell::new(Vec::new());
-			}
-
-			impl Filter<$call> for $target {
-				fn filter(call: &$call) -> bool {
-					<$base>::filter(call) &&
-						FILTER.with(|filter| filter.borrow().iter().all(|f| f(call)))
-				}
-			}
-
-			impl FilterStack<$call> for $target {
-				type Stack = Vec<Box<dyn Fn(&$call) -> bool + 'static>>;
-				fn push(f: impl Fn(&$call) -> bool + 'static) {
-					FILTER.with(|filter| filter.borrow_mut().push(Box::new(f)));
-				}
-				fn pop() {
-					FILTER.with(|filter| filter.borrow_mut().pop());
-				}
-				fn take() -> Self::Stack {
-					FILTER.with(|filter| take(filter.borrow_mut().as_mut()))
-				}
-				fn restore(mut s: Self::Stack) {
-					FILTER.with(|filter| swap(filter.borrow_mut().as_mut(), &mut s));
-				}
-			}
-		}
-
-		#[cfg(not(feature = "std"))]
-		mod $module {
-			#[allow(unused_imports)]
-			use super::*;
-			use $crate::traits::{swap, take, RefCell, Vec, Box, Filter, FilterStack};
-
-			struct ThisFilter(RefCell<Vec<Box<dyn Fn(&$call) -> bool + 'static>>>);
-			// NOTE: Safe only in wasm (guarded above) because there's only one thread.
-			unsafe impl Send for ThisFilter {}
-			unsafe impl Sync for ThisFilter {}
-
-			static FILTER: ThisFilter = ThisFilter(RefCell::new(Vec::new()));
-
-			impl Filter<$call> for $target {
-				fn filter(call: &$call) -> bool {
-					<$base>::filter(call) && FILTER.0.borrow().iter().all(|f| f(call))
-				}
-			}
-
-			impl FilterStack<$call> for $target {
-				type Stack = Vec<Box<dyn Fn(&$call) -> bool + 'static>>;
-				fn push(f: impl Fn(&$call) -> bool + 'static) {
-					FILTER.0.borrow_mut().push(Box::new(f));
-				}
-				fn pop() {
-					FILTER.0.borrow_mut().pop();
-				}
-				fn take() -> Self::Stack {
-					take(FILTER.0.borrow_mut().as_mut())
-				}
-				fn restore(mut s: Self::Stack) {
-					swap(FILTER.0.borrow_mut().as_mut(), &mut s);
-				}
-			}
-		}
-	}
-}
-
-/// Type that provide some integrity tests.
-///
-/// This implemented for modules by `decl_module`.
-#[impl_for_tuples(30)]
-pub trait IntegrityTest {
-	/// Run integrity test.
-	///
-	/// The test is not executed in a externalities provided environment.
-	fn integrity_test() {}
-}
-
-#[cfg(test)]
-mod test_impl_filter_stack {
-	use super::*;
-
-	pub struct IsCallable;
-	pub struct BaseFilter;
-	impl Filter<u32> for BaseFilter {
-		fn filter(x: &u32) -> bool { x % 2 == 0 }
-	}
-	impl_filter_stack!(
-		crate::traits::test_impl_filter_stack::IsCallable,
-		crate::traits::test_impl_filter_stack::BaseFilter,
-		u32,
-		is_callable
-	);
-
-	#[test]
-	fn impl_filter_stack_should_work() {
-		assert!(IsCallable::filter(&36));
-		assert!(IsCallable::filter(&40));
-		assert!(IsCallable::filter(&42));
-		assert!(!IsCallable::filter(&43));
-
-		IsCallable::push(|x| *x < 42);
-		assert!(IsCallable::filter(&36));
-		assert!(IsCallable::filter(&40));
-		assert!(!IsCallable::filter(&42));
-
-		IsCallable::push(|x| *x % 3 == 0);
-		assert!(IsCallable::filter(&36));
-		assert!(!IsCallable::filter(&40));
-
-		IsCallable::pop();
-		assert!(IsCallable::filter(&36));
-		assert!(IsCallable::filter(&40));
-		assert!(!IsCallable::filter(&42));
-
-		let saved = IsCallable::take();
-		assert!(IsCallable::filter(&36));
-		assert!(IsCallable::filter(&40));
-		assert!(IsCallable::filter(&42));
-		assert!(!IsCallable::filter(&43));
-
-		IsCallable::restore(saved);
-		assert!(IsCallable::filter(&36));
-		assert!(IsCallable::filter(&40));
-		assert!(!IsCallable::filter(&42));
-
-		IsCallable::pop();
-		assert!(IsCallable::filter(&36));
-		assert!(IsCallable::filter(&40));
-		assert!(IsCallable::filter(&42));
-		assert!(!IsCallable::filter(&43));
-	}
-
-	#[test]
-	fn guards_should_work() {
-		assert!(IsCallable::filter(&36));
-		assert!(IsCallable::filter(&40));
-		assert!(IsCallable::filter(&42));
-		assert!(!IsCallable::filter(&43));
-		{
-			let _guard_1 = FilterStackGuard::<IsCallable, u32>::new(|x| *x < 42);
-			assert!(IsCallable::filter(&36));
-			assert!(IsCallable::filter(&40));
-			assert!(!IsCallable::filter(&42));
-			{
-				let _guard_2 = FilterStackGuard::<IsCallable, u32>::new(|x| *x % 3 == 0);
-				assert!(IsCallable::filter(&36));
-				assert!(!IsCallable::filter(&40));
-			}
-			assert!(IsCallable::filter(&36));
-			assert!(IsCallable::filter(&40));
-			assert!(!IsCallable::filter(&42));
-			{
-				let _guard_2 = ClearFilterGuard::<IsCallable, u32>::new();
-				assert!(IsCallable::filter(&36));
-				assert!(IsCallable::filter(&40));
-				assert!(IsCallable::filter(&42));
-				assert!(!IsCallable::filter(&43));
-			}
-			assert!(IsCallable::filter(&36));
-			assert!(IsCallable::filter(&40));
-			assert!(!IsCallable::filter(&42));
-		}
-		assert!(IsCallable::filter(&36));
-		assert!(IsCallable::filter(&40));
-		assert!(IsCallable::filter(&42));
-		assert!(!IsCallable::filter(&43));
-	}
-}
-
-/// An abstraction of a value stored within storage, but possibly as part of a larger composite
-/// item.
-pub trait StoredMap<K, T: Default> {
-	/// Get the item, or its default if it doesn't yet exist; we make no distinction between the
-	/// two.
-	fn get(k: &K) -> T;
-
-	/// Maybe mutate the item only if an `Ok` value is returned from `f`. Do nothing if an `Err` is
-	/// returned. It is removed or reset to default value if it has been mutated to `None`
-	fn try_mutate_exists<R, E: From<StoredMapError>>(
-		k: &K,
-		f: impl FnOnce(&mut Option<T>) -> Result<R, E>,
-	) -> Result<R, E>;
-
-	// Everything past here has a default implementation.
-
-	/// Mutate the item.
-	fn mutate<R>(k: &K, f: impl FnOnce(&mut T) -> R) -> Result<R, StoredMapError> {
-		Self::mutate_exists(k, |maybe_account| match maybe_account {
-			Some(ref mut account) => f(account),
-			x @ None => {
-				let mut account = Default::default();
-				let r = f(&mut account);
-				*x = Some(account);
-				r
-			}
-		})
-	}
-
-	/// Mutate the item, removing or resetting to default value if it has been mutated to `None`.
-	///
-	/// This is infallible as long as the value does not get destroyed.
-	fn mutate_exists<R>(
-		k: &K,
-		f: impl FnOnce(&mut Option<T>) -> R,
-	) -> Result<R, StoredMapError> {
-		Self::try_mutate_exists(k, |x| -> Result<R, StoredMapError> { Ok(f(x)) })
-	}
-
-	/// Set the item to something new.
-	fn insert(k: &K, t: T) -> Result<(), StoredMapError> { Self::mutate(k, |i| *i = t) }
-
-	/// Remove the item or otherwise replace it with its default value; we don't care which.
-	fn remove(k: &K) -> Result<(), StoredMapError> { Self::mutate_exists(k, |x| *x = None) }
-}
-
-/// A simple, generic one-parameter event notifier/handler.
-pub trait HandleLifetime<T> {
-	/// An account was created.
-	fn created(_t: &T) -> Result<(), StoredMapError> { Ok(()) }
-
-	/// An account was killed.
-	fn killed(_t: &T) -> Result<(), StoredMapError> { Ok(()) }
-}
-
-impl<T> HandleLifetime<T> for () {}
-
-/// A shim for placing around a storage item in order to use it as a `StoredValue`. Ideally this
-/// wouldn't be needed as `StorageValue`s should blanket implement `StoredValue`s, however this
-/// would break the ability to have custom impls of `StoredValue`. The other workaround is to
-/// implement it directly in the macro.
-///
-/// This form has the advantage that two additional types are provides, `Created` and `Removed`,
-/// which are both generic events that can be tied to handlers to do something in the case of being
-/// about to create an account where one didn't previously exist (at all; not just where it used to
-/// be the default value), or where the account is being removed or reset back to the default value
-/// where previously it did exist (though may have been in a default state). This works well with
-/// system module's `CallOnCreatedAccount` and `CallKillAccount`.
-pub struct StorageMapShim<S, L, K, T>(sp_std::marker::PhantomData<(S, L, K, T)>);
-impl<
-	S: StorageMap<K, T, Query=T>,
-	L: HandleLifetime<K>,
-	K: FullCodec,
-	T: FullCodec + Default,
-> StoredMap<K, T> for StorageMapShim<S, L, K, T> {
-	fn get(k: &K) -> T { S::get(k) }
-	fn insert(k: &K, t: T) -> Result<(), StoredMapError> {
-		if !S::contains_key(&k) {
-			L::created(k)?;
-		}
-		S::insert(k, t);
-		Ok(())
-	}
-	fn remove(k: &K) -> Result<(), StoredMapError> {
-		if S::contains_key(&k) {
-			L::killed(&k)?;
-			S::remove(k);
-		}
-		Ok(())
-	}
-	fn mutate<R>(k: &K, f: impl FnOnce(&mut T) -> R) -> Result<R, StoredMapError> {
-		if !S::contains_key(&k) {
-			L::created(k)?;
-		}
-		Ok(S::mutate(k, f))
-	}
-	fn mutate_exists<R>(k: &K, f: impl FnOnce(&mut Option<T>) -> R) -> Result<R, StoredMapError> {
-		S::try_mutate_exists(k, |maybe_value| {
-			let existed = maybe_value.is_some();
-			let r = f(maybe_value);
-			let exists = maybe_value.is_some();
-
-			if !existed && exists {
-				L::created(k)?;
-			} else if existed && !exists {
-				L::killed(k)?;
-			}
-			Ok(r)
-		})
-	}
-	fn try_mutate_exists<R, E: From<StoredMapError>>(
-		k: &K,
-		f: impl FnOnce(&mut Option<T>) -> Result<R, E>,
-	) -> Result<R, E> {
-		S::try_mutate_exists(k, |maybe_value| {
-			let existed = maybe_value.is_some();
-			let r = f(maybe_value)?;
-			let exists = maybe_value.is_some();
-
-			if !existed && exists {
-				L::created(k).map_err(E::from)?;
-			} else if existed && !exists {
-				L::killed(k).map_err(E::from)?;
-			}
-			Ok(r)
-		})
-	}
-}
-
-/// Something that can estimate at which block the next session rotation will happen (i.e. a new
-/// session starts).
-///
-/// The accuracy of the estimates is dependent on the specific implementation, but in order to get
-/// the best estimate possible these methods should be called throughout the duration of the session
-/// (rather than calling once and storing the result).
-///
-/// This should be the same logical unit that dictates `ShouldEndSession` to the session module. No
-/// assumptions are made about the scheduling of the sessions.
-pub trait EstimateNextSessionRotation<BlockNumber> {
-	/// Return the average length of a session.
-	///
-	/// This may or may not be accurate.
-	fn average_session_length() -> BlockNumber;
-
-	/// Return an estimate of the current session progress.
-	///
-	/// None should be returned if the estimation fails to come to an answer.
-	fn estimate_current_session_progress(now: BlockNumber) -> (Option<Percent>, Weight);
-
-	/// Return the block number at which the next session rotation is estimated to happen.
-	///
-	/// None should be returned if the estimation fails to come to an answer.
-	fn estimate_next_session_rotation(now: BlockNumber) -> (Option<BlockNumber>, Weight);
-}
-
-impl<BlockNumber: Zero> EstimateNextSessionRotation<BlockNumber> for () {
-	fn average_session_length() -> BlockNumber {
-		Zero::zero()
-	}
-
-	fn estimate_current_session_progress(_: BlockNumber) -> (Option<Percent>, Weight) {
-		(None, Zero::zero())
-	}
-
-	fn estimate_next_session_rotation(_: BlockNumber) -> (Option<BlockNumber>, Weight) {
-		(None, Zero::zero())
-	}
-}
-
-/// Something that can estimate at which block scheduling of the next session will happen (i.e when
-/// we will try to fetch new validators).
-///
-/// This only refers to the point when we fetch the next session details and not when we enact them
-/// (for enactment there's `EstimateNextSessionRotation`). With `pallet-session` this should be
-/// triggered whenever `SessionManager::new_session` is called.
-///
-/// For example, if we are using a staking module this would be the block when the session module
-/// would ask staking what the next validator set will be, as such this must always be implemented
-/// by the session module.
-pub trait EstimateNextNewSession<BlockNumber> {
-	/// Return the average length of a session.
-	///
-	/// This may or may not be accurate.
-	fn average_session_length() -> BlockNumber;
-
-	/// Return the block number at which the next new session is estimated to happen.
-	///
-	/// None should be returned if the estimation fails to come to an answer.
-	fn estimate_next_new_session(_: BlockNumber) -> (Option<BlockNumber>, Weight);
-}
-
-impl<BlockNumber: Zero> EstimateNextNewSession<BlockNumber> for () {
-	fn average_session_length() -> BlockNumber {
-		Zero::zero()
-	}
-
-	fn estimate_next_new_session(_: BlockNumber) -> (Option<BlockNumber>, Weight) {
-		(None, Zero::zero())
-	}
-}
-
-/// Anything that can have a `::len()` method.
-pub trait Len {
-	/// Return the length of data type.
-	fn len(&self) -> usize;
-}
-
-impl<T: IntoIterator + Clone,> Len for T where <T as IntoIterator>::IntoIter: ExactSizeIterator {
-	fn len(&self) -> usize {
-		self.clone().into_iter().len()
-	}
-}
-
-/// A trait for querying a single value from a type.
-///
-/// It is not required that the value is constant.
-pub trait Get<T> {
-	/// Return the current value.
-	fn get() -> T;
-}
-
-impl<T: Default> Get<T> for () {
-	fn get() -> T { T::default() }
-}
-
-/// A trait for querying whether a type can be said to "contain" a value.
-pub trait Contains<T: Ord> {
-	/// Return `true` if this "contains" the given value `t`.
-	fn contains(t: &T) -> bool { Self::sorted_members().binary_search(t).is_ok() }
-
-	/// Get a vector of all members in the set, ordered.
-	fn sorted_members() -> Vec<T>;
-
-	/// Get the number of items in the set.
-	fn count() -> usize { Self::sorted_members().len() }
-
-	/// Add an item that would satisfy `contains`. It does not make sure any other
-	/// state is correctly maintained or generated.
-	///
-	/// **Should be used for benchmarking only!!!**
-	#[cfg(feature = "runtime-benchmarks")]
-	fn add(_t: &T) { unimplemented!() }
-}
-
-/// A trait for querying bound for the length of an implementation of `Contains`
-pub trait ContainsLengthBound {
-	/// Minimum number of elements contained
-	fn min_len() -> usize;
-	/// Maximum number of elements contained
-	fn max_len() -> usize;
-}
-
-/// Handler for when a new account has been created.
-#[impl_for_tuples(30)]
-pub trait OnNewAccount<AccountId> {
-	/// A new account `who` has been registered.
-	fn on_new_account(who: &AccountId);
-}
-
-/// The account with the given id was reaped.
-#[impl_for_tuples(30)]
-pub trait OnKilledAccount<AccountId> {
-	/// The account with the given id was reaped.
-	fn on_killed_account(who: &AccountId);
-}
-
-/// A trait for finding the author of a block header based on the `PreRuntime` digests contained
-/// within it.
-pub trait FindAuthor<Author> {
-	/// Find the author of a block based on the pre-runtime digests.
-	fn find_author<'a, I>(digests: I) -> Option<Author>
-		where I: 'a + IntoIterator<Item=(ConsensusEngineId, &'a [u8])>;
-}
-
-impl<A> FindAuthor<A> for () {
-	fn find_author<'a, I>(_: I) -> Option<A>
-		where I: 'a + IntoIterator<Item=(ConsensusEngineId, &'a [u8])>
-	{
-		None
-	}
-}
-
-/// A trait for verifying the seal of a header and returning the author.
-pub trait VerifySeal<Header, Author> {
-	/// Verify a header and return the author, if any.
-	fn verify_seal(header: &Header) -> Result<Option<Author>, &'static str>;
-}
-
-/// Something which can compute and check proofs of
-/// a historical key owner and return full identification data of that
-/// key owner.
-pub trait KeyOwnerProofSystem<Key> {
-	/// The proof of membership itself.
-	type Proof: Codec;
-	/// The full identification of a key owner and the stash account.
-	type IdentificationTuple: Codec;
-
-	/// Prove membership of a key owner in the current block-state.
-	///
-	/// This should typically only be called off-chain, since it may be
-	/// computationally heavy.
-	///
-	/// Returns `Some` iff the key owner referred to by the given `key` is a
-	/// member of the current set.
-	fn prove(key: Key) -> Option<Self::Proof>;
-
-	/// Check a proof of membership on-chain. Return `Some` iff the proof is
-	/// valid and recent enough to check.
-	fn check_proof(key: Key, proof: Self::Proof) -> Option<Self::IdentificationTuple>;
-}
-
-impl<Key> KeyOwnerProofSystem<Key> for () {
-	// The proof and identification tuples is any bottom type to guarantee that the methods of this
-	// implementation can never be called or return anything other than `None`.
-	type Proof = crate::Void;
-	type IdentificationTuple = crate::Void;
-
-	fn prove(_key: Key) -> Option<Self::Proof> {
-		None
-	}
-
-	fn check_proof(_key: Key, _proof: Self::Proof) -> Option<Self::IdentificationTuple> {
-		None
-	}
-}
-
-/// Handler for when some currency "account" decreased in balance for
-/// some reason.
-///
-/// The only reason at present for an increase would be for validator rewards, but
-/// there may be other reasons in the future or for other chains.
-///
-/// Reasons for decreases include:
-///
-/// - Someone got slashed.
-/// - Someone paid for a transaction to be included.
-pub trait OnUnbalanced<Imbalance: TryDrop> {
-	/// Handler for some imbalances. The different imbalances might have different origins or
-	/// meanings, dependent on the context. Will default to simply calling on_unbalanced for all
-	/// of them. Infallible.
-	fn on_unbalanceds<B>(amounts: impl Iterator<Item=Imbalance>) where Imbalance: crate::traits::Imbalance<B> {
-		Self::on_unbalanced(amounts.fold(Imbalance::zero(), |i, x| x.merge(i)))
-	}
-
-	/// Handler for some imbalance. Infallible.
-	fn on_unbalanced(amount: Imbalance) {
-		amount.try_drop().unwrap_or_else(Self::on_nonzero_unbalanced)
-	}
-
-	/// Actually handle a non-zero imbalance. You probably want to implement this rather than
-	/// `on_unbalanced`.
-	fn on_nonzero_unbalanced(amount: Imbalance) { drop(amount); }
-}
-
-impl<Imbalance: TryDrop> OnUnbalanced<Imbalance> for () {}
-
-/// Simple boolean for whether an account needs to be kept in existence.
-#[derive(Copy, Clone, Eq, PartialEq)]
-pub enum ExistenceRequirement {
-	/// Operation must not result in the account going out of existence.
-	///
-	/// Note this implies that if the account never existed in the first place, then the operation
-	/// may legitimately leave the account unchanged and still non-existent.
-	KeepAlive,
-	/// Operation may result in account going out of existence.
-	AllowDeath,
-}
-
-/// A type for which some values make sense to be able to drop without further consideration.
-pub trait TryDrop: Sized {
-	/// Drop an instance cleanly. Only works if its value represents "no-operation".
-	fn try_drop(self) -> Result<(), Self>;
-}
-
-/// A trait for a not-quite Linear Type that tracks an imbalance.
-///
-/// Functions that alter account balances return an object of this trait to
-/// express how much account balances have been altered in aggregate. If
-/// dropped, the currency system will take some default steps to deal with
-/// the imbalance (`balances` module simply reduces or increases its
-/// total issuance). Your module should generally handle it in some way,
-/// good practice is to do so in a configurable manner using an
-/// `OnUnbalanced` type for each situation in which your module needs to
-/// handle an imbalance.
-///
-/// Imbalances can either be Positive (funds were added somewhere without
-/// being subtracted elsewhere - e.g. a reward) or Negative (funds deducted
-/// somewhere without an equal and opposite addition - e.g. a slash or
-/// system fee payment).
-///
-/// Since they are unsigned, the actual type is always Positive or Negative.
-/// The trait makes no distinction except to define the `Opposite` type.
-///
-/// New instances of zero value can be created (`zero`) and destroyed
-/// (`drop_zero`).
-///
-/// Existing instances can be `split` and merged either consuming `self` with
-/// `merge` or mutating `self` with `subsume`. If the target is an `Option`,
-/// then `maybe_merge` and `maybe_subsume` might work better. Instances can
-/// also be `offset` with an `Opposite` that is less than or equal to in value.
-///
-/// You can always retrieve the raw balance value using `peek`.
-#[must_use]
-pub trait Imbalance<Balance>: Sized + TryDrop {
-	/// The oppositely imbalanced type. They come in pairs.
-	type Opposite: Imbalance<Balance>;
-
-	/// The zero imbalance. Can be destroyed with `drop_zero`.
-	fn zero() -> Self;
-
-	/// Drop an instance cleanly. Only works if its `self.value()` is zero.
-	fn drop_zero(self) -> Result<(), Self>;
-
-	/// Consume `self` and return two independent instances; the first
-	/// is guaranteed to be at most `amount` and the second will be the remainder.
-	fn split(self, amount: Balance) -> (Self, Self);
-
-	/// Consume `self` and return two independent instances; the amounts returned will be in
-	/// approximately the same ratio as `first`:`second`.
-	///
-	/// NOTE: This requires up to `first + second` room for a multiply, and `first + second` should
-	/// fit into a `u32`. Overflow will safely saturate in both cases.
-	fn ration(self, first: u32, second: u32) -> (Self, Self)
-		where Balance: From<u32> + Saturating + Div<Output=Balance>
-	{
-		let total: u32 = first.saturating_add(second);
-		let amount1 = self.peek().saturating_mul(first.into()) / total.into();
-		self.split(amount1)
-	}
-
-	/// Consume self and add its two components, defined by the first component's balance,
-	/// element-wise to two pre-existing Imbalances.
-	///
-	/// A convenient replacement for `split` and `merge`.
-	fn split_merge(self, amount: Balance, others: (Self, Self)) -> (Self, Self) {
-		let (a, b) = self.split(amount);
-		(a.merge(others.0), b.merge(others.1))
-	}
-
-	/// Consume self and add its two components, defined by the ratio `first`:`second`,
-	/// element-wise to two pre-existing Imbalances.
-	///
-	/// A convenient replacement for `split` and `merge`.
-	fn ration_merge(self, first: u32, second: u32, others: (Self, Self)) -> (Self, Self)
-		where Balance: From<u32> + Saturating + Div<Output=Balance>
-	{
-		let (a, b) = self.ration(first, second);
-		(a.merge(others.0), b.merge(others.1))
-	}
-
-	/// Consume self and add its two components, defined by the first component's balance,
-	/// element-wise into two pre-existing Imbalance refs.
-	///
-	/// A convenient replacement for `split` and `subsume`.
-	fn split_merge_into(self, amount: Balance, others: &mut (Self, Self)) {
-		let (a, b) = self.split(amount);
-		others.0.subsume(a);
-		others.1.subsume(b);
-	}
-
-	/// Consume self and add its two components, defined by the ratio `first`:`second`,
-	/// element-wise to two pre-existing Imbalances.
-	///
-	/// A convenient replacement for `split` and `merge`.
-	fn ration_merge_into(self, first: u32, second: u32, others: &mut (Self, Self))
-		where Balance: From<u32> + Saturating + Div<Output=Balance>
-	{
-		let (a, b) = self.ration(first, second);
-		others.0.subsume(a);
-		others.1.subsume(b);
-	}
-
-	/// Consume `self` and an `other` to return a new instance that combines
-	/// both.
-	fn merge(self, other: Self) -> Self;
-
-	/// Consume self to mutate `other` so that it combines both. Just like `subsume`, only with
-	/// reversed arguments.
-	fn merge_into(self, other: &mut Self) {
-		other.subsume(self)
-	}
-
-	/// Consume `self` and maybe an `other` to return a new instance that combines
-	/// both.
-	fn maybe_merge(self, other: Option<Self>) -> Self {
-		if let Some(o) = other {
-			self.merge(o)
-		} else {
-			self
-		}
-	}
-
-	/// Consume an `other` to mutate `self` into a new instance that combines
-	/// both.
-	fn subsume(&mut self, other: Self);
-
-	/// Maybe consume an `other` to mutate `self` into a new instance that combines
-	/// both.
-	fn maybe_subsume(&mut self, other: Option<Self>) {
-		if let Some(o) = other {
-			self.subsume(o)
-		}
-	}
-
-	/// Consume self and along with an opposite counterpart to return
-	/// a combined result.
-	///
-	/// Returns `Ok` along with a new instance of `Self` if this instance has a
-	/// greater value than the `other`. Otherwise returns `Err` with an instance of
-	/// the `Opposite`. In both cases the value represents the combination of `self`
-	/// and `other`.
-	fn offset(self, other: Self::Opposite) -> Result<Self, Self::Opposite>;
-
-	/// The raw value of self.
-	fn peek(&self) -> Balance;
-}
-
-/// Either a positive or a negative imbalance.
-pub enum SignedImbalance<B, P: Imbalance<B>>{
-	/// A positive imbalance (funds have been created but none destroyed).
-	Positive(P),
-	/// A negative imbalance (funds have been destroyed but none created).
-	Negative(P::Opposite),
-}
-
-impl<
-	P: Imbalance<B, Opposite=N>,
-	N: Imbalance<B, Opposite=P>,
-	B: AtLeast32BitUnsigned + FullCodec + Copy + MaybeSerializeDeserialize + Debug + Default,
-> SignedImbalance<B, P> {
-	pub fn zero() -> Self {
-		SignedImbalance::Positive(P::zero())
-	}
-
-	pub fn drop_zero(self) -> Result<(), Self> {
-		match self {
-			SignedImbalance::Positive(x) => x.drop_zero().map_err(SignedImbalance::Positive),
-			SignedImbalance::Negative(x) => x.drop_zero().map_err(SignedImbalance::Negative),
-		}
-	}
-
-	/// Consume `self` and an `other` to return a new instance that combines
-	/// both.
-	pub fn merge(self, other: Self) -> Self {
-		match (self, other) {
-			(SignedImbalance::Positive(one), SignedImbalance::Positive(other)) =>
-				SignedImbalance::Positive(one.merge(other)),
-			(SignedImbalance::Negative(one), SignedImbalance::Negative(other)) =>
-				SignedImbalance::Negative(one.merge(other)),
-			(SignedImbalance::Positive(one), SignedImbalance::Negative(other)) =>
-				if one.peek() > other.peek() {
-					SignedImbalance::Positive(one.offset(other).ok().unwrap_or_else(P::zero))
-				} else {
-					SignedImbalance::Negative(other.offset(one).ok().unwrap_or_else(N::zero))
-				},
-			(one, other) => other.merge(one),
-		}
-	}
-}
-
-/// Split an unbalanced amount two ways between a common divisor.
-pub struct SplitTwoWays<
-	Balance,
-	Imbalance,
-	Part1,
-	Target1,
-	Part2,
-	Target2,
->(PhantomData<(Balance, Imbalance, Part1, Target1, Part2, Target2)>);
-
-impl<
-	Balance: From<u32> + Saturating + Div<Output=Balance>,
-	I: Imbalance<Balance>,
-	Part1: U32,
-	Target1: OnUnbalanced<I>,
-	Part2: U32,
-	Target2: OnUnbalanced<I>,
-> OnUnbalanced<I> for SplitTwoWays<Balance, I, Part1, Target1, Part2, Target2>
-{
-	fn on_nonzero_unbalanced(amount: I) {
-		let total: u32 = Part1::VALUE + Part2::VALUE;
-		let amount1 = amount.peek().saturating_mul(Part1::VALUE.into()) / total.into();
-		let (imb1, imb2) = amount.split(amount1);
-		Target1::on_unbalanced(imb1);
-		Target2::on_unbalanced(imb2);
-	}
-}
-
-/// Abstraction over a fungible assets system.
-pub trait Currency<AccountId> {
-	/// The balance of an account.
-	type Balance: AtLeast32BitUnsigned + FullCodec + Copy + MaybeSerializeDeserialize + Debug +
-		Default;
-
-	/// The opaque token type for an imbalance. This is returned by unbalanced operations
-	/// and must be dealt with. It may be dropped but cannot be cloned.
-	type PositiveImbalance: Imbalance<Self::Balance, Opposite=Self::NegativeImbalance>;
-
-	/// The opaque token type for an imbalance. This is returned by unbalanced operations
-	/// and must be dealt with. It may be dropped but cannot be cloned.
-	type NegativeImbalance: Imbalance<Self::Balance, Opposite=Self::PositiveImbalance>;
-
-	// PUBLIC IMMUTABLES
-
-	/// The combined balance of `who`.
-	fn total_balance(who: &AccountId) -> Self::Balance;
-
-	/// Same result as `slash(who, value)` (but without the side-effects) assuming there are no
-	/// balance changes in the meantime and only the reserved balance is not taken into account.
-	fn can_slash(who: &AccountId, value: Self::Balance) -> bool;
-
-	/// The total amount of issuance in the system.
-	fn total_issuance() -> Self::Balance;
-
-	/// The minimum balance any single account may have. This is equivalent to the `Balances` module's
-	/// `ExistentialDeposit`.
-	fn minimum_balance() -> Self::Balance;
-
-	/// Reduce the total issuance by `amount` and return the according imbalance. The imbalance will
-	/// typically be used to reduce an account by the same amount with e.g. `settle`.
-	///
-	/// This is infallible, but doesn't guarantee that the entire `amount` is burnt, for example
-	/// in the case of underflow.
-	fn burn(amount: Self::Balance) -> Self::PositiveImbalance;
-
-	/// Increase the total issuance by `amount` and return the according imbalance. The imbalance
-	/// will typically be used to increase an account by the same amount with e.g.
-	/// `resolve_into_existing` or `resolve_creating`.
-	///
-	/// This is infallible, but doesn't guarantee that the entire `amount` is issued, for example
-	/// in the case of overflow.
-	fn issue(amount: Self::Balance) -> Self::NegativeImbalance;
-
-	/// Produce a pair of imbalances that cancel each other out exactly.
-	///
-	/// This is just the same as burning and issuing the same amount and has no effect on the
-	/// total issuance.
-	fn pair(amount: Self::Balance) -> (Self::PositiveImbalance, Self::NegativeImbalance) {
-		(Self::burn(amount.clone()), Self::issue(amount))
-	}
-
-	/// The 'free' balance of a given account.
-	///
-	/// This is the only balance that matters in terms of most operations on tokens. It alone
-	/// is used to determine the balance when in the contract execution environment. When this
-	/// balance falls below the value of `ExistentialDeposit`, then the 'current account' is
-	/// deleted: specifically `FreeBalance`.
-	///
-	/// `system::AccountNonce` is also deleted if `ReservedBalance` is also zero (it also gets
-	/// collapsed to zero if it ever becomes less than `ExistentialDeposit`.
-	fn free_balance(who: &AccountId) -> Self::Balance;
-
-	/// Returns `Ok` iff the account is able to make a withdrawal of the given amount
-	/// for the given reason. Basically, it's just a dry-run of `withdraw`.
-	///
-	/// `Err(...)` with the reason why not otherwise.
-	fn ensure_can_withdraw(
-		who: &AccountId,
-		_amount: Self::Balance,
-		reasons: WithdrawReasons,
-		new_balance: Self::Balance,
-	) -> DispatchResult;
-
-	// PUBLIC MUTABLES (DANGEROUS)
-
-	/// Transfer some liquid free balance to another staker.
-	///
-	/// This is a very high-level function. It will ensure all appropriate fees are paid
-	/// and no imbalance in the system remains.
-	fn transfer(
-		source: &AccountId,
-		dest: &AccountId,
-		value: Self::Balance,
-		existence_requirement: ExistenceRequirement,
-	) -> DispatchResult;
-
-	/// Deducts up to `value` from the combined balance of `who`, preferring to deduct from the
-	/// free balance. This function cannot fail.
-	///
-	/// The resulting imbalance is the first item of the tuple returned.
-	///
-	/// As much funds up to `value` will be deducted as possible. If this is less than `value`,
-	/// then a non-zero second item will be returned.
-	fn slash(
-		who: &AccountId,
-		value: Self::Balance
-	) -> (Self::NegativeImbalance, Self::Balance);
-
-	/// Mints `value` to the free balance of `who`.
-	///
-	/// If `who` doesn't exist, nothing is done and an Err returned.
-	fn deposit_into_existing(
-		who: &AccountId,
-		value: Self::Balance
-	) -> result::Result<Self::PositiveImbalance, DispatchError>;
-
-	/// Similar to deposit_creating, only accepts a `NegativeImbalance` and returns nothing on
-	/// success.
-	fn resolve_into_existing(
-		who: &AccountId,
-		value: Self::NegativeImbalance,
-	) -> result::Result<(), Self::NegativeImbalance> {
-		let v = value.peek();
-		match Self::deposit_into_existing(who, v) {
-			Ok(opposite) => Ok(drop(value.offset(opposite))),
-			_ => Err(value),
-		}
-	}
-
-	/// Adds up to `value` to the free balance of `who`. If `who` doesn't exist, it is created.
-	///
-	/// Infallible.
-	fn deposit_creating(
-		who: &AccountId,
-		value: Self::Balance,
-	) -> Self::PositiveImbalance;
-
-	/// Similar to deposit_creating, only accepts a `NegativeImbalance` and returns nothing on
-	/// success.
-	fn resolve_creating(
-		who: &AccountId,
-		value: Self::NegativeImbalance,
-	) {
-		let v = value.peek();
-		drop(value.offset(Self::deposit_creating(who, v)));
-	}
-
-	/// Removes some free balance from `who` account for `reason` if possible. If `liveness` is
-	/// `KeepAlive`, then no less than `ExistentialDeposit` must be left remaining.
-	///
-	/// This checks any locks, vesting, and liquidity requirements. If the removal is not possible,
-	/// then it returns `Err`.
-	///
-	/// If the operation is successful, this will return `Ok` with a `NegativeImbalance` whose value
-	/// is `value`.
-	fn withdraw(
-		who: &AccountId,
-		value: Self::Balance,
-		reasons: WithdrawReasons,
-		liveness: ExistenceRequirement,
-	) -> result::Result<Self::NegativeImbalance, DispatchError>;
-
-	/// Similar to withdraw, only accepts a `PositiveImbalance` and returns nothing on success.
-	fn settle(
-		who: &AccountId,
-		value: Self::PositiveImbalance,
-		reasons: WithdrawReasons,
-		liveness: ExistenceRequirement,
-	) -> result::Result<(), Self::PositiveImbalance> {
-		let v = value.peek();
-		match Self::withdraw(who, v, reasons, liveness) {
-			Ok(opposite) => Ok(drop(value.offset(opposite))),
-			_ => Err(value),
-		}
-	}
-
-	/// Ensure an account's free balance equals some value; this will create the account
-	/// if needed.
-	///
-	/// Returns a signed imbalance and status to indicate if the account was successfully updated or update
-	/// has led to killing of the account.
-	fn make_free_balance_be(
-		who: &AccountId,
-		balance: Self::Balance,
-	) -> SignedImbalance<Self::Balance, Self::PositiveImbalance>;
-}
-
-/// Trait for providing an ERC-20 style set of named fungible assets.
-pub trait Fungibles<AccountId> {
-	/// Means of identifying one asset class from another.
-	type AssetId: FullCodec + Copy + Default;
-	/// Scalar type for storing balance of an account.
-	type Balance: AtLeast32BitUnsigned + FullCodec + Copy + Default;
-	/// Get the `asset` balance of `who`.
-	fn balance(asset: Self::AssetId, who: &AccountId) -> Self::Balance;
-	/// Returns `true` if the `asset` balance of `who` may be increased by `amount`.
-	fn can_deposit(asset: Self::AssetId, who: &AccountId, amount: Self::Balance) -> bool;
-	/// Increase the `asset` balance of `who` by `amount`.
-	fn deposit(asset: Self::AssetId, who: AccountId, amount: Self::Balance) -> DispatchResult;
-	/// Attempt to reduce the `asset` balance of `who` by `amount`.
-	fn withdraw(asset: Self::AssetId, who: AccountId, amount: Self::Balance) -> DispatchResult;
-}
-
-/// Status of funds.
-#[derive(PartialEq, Eq, Clone, Copy, Encode, Decode, RuntimeDebug)]
-pub enum BalanceStatus {
-	/// Funds are free, as corresponding to `free` item in Balances.
-	Free,
-	/// Funds are reserved, as corresponding to `reserved` item in Balances.
-	Reserved,
-}
-
-/// A currency where funds can be reserved from the user.
-pub trait ReservableCurrency<AccountId>: Currency<AccountId> {
-	/// Same result as `reserve(who, value)` (but without the side-effects) assuming there
-	/// are no balance changes in the meantime.
-	fn can_reserve(who: &AccountId, value: Self::Balance) -> bool;
-
-	/// Deducts up to `value` from reserved balance of `who`. This function cannot fail.
-	///
-	/// As much funds up to `value` will be deducted as possible. If the reserve balance of `who`
-	/// is less than `value`, then a non-zero second item will be returned.
-	fn slash_reserved(
-		who: &AccountId,
-		value: Self::Balance
-	) -> (Self::NegativeImbalance, Self::Balance);
-
-	/// The amount of the balance of a given account that is externally reserved; this can still get
-	/// slashed, but gets slashed last of all.
-	///
-	/// This balance is a 'reserve' balance that other subsystems use in order to set aside tokens
-	/// that are still 'owned' by the account holder, but which are suspendable.
-	///
-	/// When this balance falls below the value of `ExistentialDeposit`, then this 'reserve account'
-	/// is deleted: specifically, `ReservedBalance`.
-	///
-	/// `system::AccountNonce` is also deleted if `FreeBalance` is also zero (it also gets
-	/// collapsed to zero if it ever becomes less than `ExistentialDeposit`.
-	fn reserved_balance(who: &AccountId) -> Self::Balance;
-
-	/// Moves `value` from balance to reserved balance.
-	///
-	/// If the free balance is lower than `value`, then no funds will be moved and an `Err` will
-	/// be returned to notify of this. This is different behavior than `unreserve`.
-	fn reserve(who: &AccountId, value: Self::Balance) -> DispatchResult;
-
-	/// Moves up to `value` from reserved balance to free balance. This function cannot fail.
-	///
-	/// As much funds up to `value` will be moved as possible. If the reserve balance of `who`
-	/// is less than `value`, then the remaining amount will be returned.
-	///
-	/// # NOTES
-	///
-	/// - This is different from `reserve`.
-	/// - If the remaining reserved balance is less than `ExistentialDeposit`, it will
-	/// invoke `on_reserved_too_low` and could reap the account.
-	fn unreserve(who: &AccountId, value: Self::Balance) -> Self::Balance;
-
-	/// Moves up to `value` from reserved balance of account `slashed` to balance of account
-	/// `beneficiary`. `beneficiary` must exist for this to succeed. If it does not, `Err` will be
-	/// returned. Funds will be placed in either the `free` balance or the `reserved` balance,
-	/// depending on the `status`.
-	///
-	/// As much funds up to `value` will be deducted as possible. If this is less than `value`,
-	/// then `Ok(non_zero)` will be returned.
-	fn repatriate_reserved(
-		slashed: &AccountId,
-		beneficiary: &AccountId,
-		value: Self::Balance,
-		status: BalanceStatus,
-	) -> result::Result<Self::Balance, DispatchError>;
-}
-
-/// An identifier for a lock. Used for disambiguating different locks so that
-/// they can be individually replaced or removed.
-pub type LockIdentifier = [u8; 8];
-
-/// A currency whose accounts can have liquidity restrictions.
-pub trait LockableCurrency<AccountId>: Currency<AccountId> {
-	/// The quantity used to denote time; usually just a `BlockNumber`.
-	type Moment;
-
-	/// The maximum number of locks a user should have on their account.
-	type MaxLocks: Get<u32>;
-
-	/// Create a new balance lock on account `who`.
-	///
-	/// If the new lock is valid (i.e. not already expired), it will push the struct to
-	/// the `Locks` vec in storage. Note that you can lock more funds than a user has.
-	///
-	/// If the lock `id` already exists, this will update it.
-	fn set_lock(
-		id: LockIdentifier,
-		who: &AccountId,
-		amount: Self::Balance,
-		reasons: WithdrawReasons,
-	);
-
-	/// Changes a balance lock (selected by `id`) so that it becomes less liquid in all
-	/// parameters or creates a new one if it does not exist.
-	///
-	/// Calling `extend_lock` on an existing lock `id` differs from `set_lock` in that it
-	/// applies the most severe constraints of the two, while `set_lock` replaces the lock
-	/// with the new parameters. As in, `extend_lock` will set:
-	/// - maximum `amount`
-	/// - bitwise mask of all `reasons`
-	fn extend_lock(
-		id: LockIdentifier,
-		who: &AccountId,
-		amount: Self::Balance,
-		reasons: WithdrawReasons,
-	);
-
-	/// Remove an existing lock.
-	fn remove_lock(
-		id: LockIdentifier,
-		who: &AccountId,
-	);
-}
-
-/// A vesting schedule over a currency. This allows a particular currency to have vesting limits
-/// applied to it.
-pub trait VestingSchedule<AccountId> {
-	/// The quantity used to denote time; usually just a `BlockNumber`.
-	type Moment;
-
-	/// The currency that this schedule applies to.
-	type Currency: Currency<AccountId>;
-
-	/// Get the amount that is currently being vested and cannot be transferred out of this account.
-	/// Returns `None` if the account has no vesting schedule.
-	fn vesting_balance(who: &AccountId) -> Option<<Self::Currency as Currency<AccountId>>::Balance>;
-
-	/// Adds a vesting schedule to a given account.
-	///
-	/// If there already exists a vesting schedule for the given account, an `Err` is returned
-	/// and nothing is updated.
-	///
-	/// Is a no-op if the amount to be vested is zero.
-	///
-	/// NOTE: This doesn't alter the free balance of the account.
-	fn add_vesting_schedule(
-		who: &AccountId,
-		locked: <Self::Currency as Currency<AccountId>>::Balance,
-		per_block: <Self::Currency as Currency<AccountId>>::Balance,
-		starting_block: Self::Moment,
-	) -> DispatchResult;
-
-	/// Remove a vesting schedule for a given account.
-	///
-	/// NOTE: This doesn't alter the free balance of the account.
-	fn remove_vesting_schedule(who: &AccountId);
-}
-
-bitflags! {
-	/// Reasons for moving funds out of an account.
-	#[derive(Encode, Decode)]
-	pub struct WithdrawReasons: i8 {
-		/// In order to pay for (system) transaction costs.
-		const TRANSACTION_PAYMENT = 0b00000001;
-		/// In order to transfer ownership.
-		const TRANSFER = 0b00000010;
-		/// In order to reserve some funds for a later return or repatriation.
-		const RESERVE = 0b00000100;
-		/// In order to pay some other (higher-level) fees.
-		const FEE = 0b00001000;
-		/// In order to tip a validator for transaction inclusion.
-		const TIP = 0b00010000;
-	}
-}
-
-impl WithdrawReasons {
-	/// Choose all variants except for `one`.
-	///
-	/// ```rust
-	/// # use frame_support::traits::WithdrawReasons;
-	/// # fn main() {
-	/// assert_eq!(
-	/// 	WithdrawReasons::FEE | WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE | WithdrawReasons::TIP,
-	/// 	WithdrawReasons::except(WithdrawReasons::TRANSACTION_PAYMENT),
-	///	);
-	/// # }
-	/// ```
-	pub fn except(one: WithdrawReasons) -> WithdrawReasons {
-		let mut flags = Self::all();
-		flags.toggle(one);
-		flags
-	}
-}
-
-pub trait Time {
-	type Moment: AtLeast32Bit + Parameter + Default + Copy;
-
-	fn now() -> Self::Moment;
-}
-
-/// Trait to deal with unix time.
-pub trait UnixTime {
-	/// Return duration since `SystemTime::UNIX_EPOCH`.
-	fn now() -> core::time::Duration;
-}
-
-/// Trait for type that can handle incremental changes to a set of account IDs.
-pub trait ChangeMembers<AccountId: Clone + Ord> {
-	/// A number of members `incoming` just joined the set and replaced some `outgoing` ones. The
-	/// new set is given by `new`, and need not be sorted.
-	///
-	/// This resets any previous value of prime.
-	fn change_members(incoming: &[AccountId], outgoing: &[AccountId], mut new: Vec<AccountId>) {
-		new.sort();
-		Self::change_members_sorted(incoming, outgoing, &new[..]);
-	}
-
-	/// A number of members `_incoming` just joined the set and replaced some `_outgoing` ones. The
-	/// new set is thus given by `sorted_new` and **must be sorted**.
-	///
-	/// NOTE: This is the only function that needs to be implemented in `ChangeMembers`.
-	///
-	/// This resets any previous value of prime.
-	fn change_members_sorted(
-		incoming: &[AccountId],
-		outgoing: &[AccountId],
-		sorted_new: &[AccountId],
-	);
-
-	/// Set the new members; they **must already be sorted**. This will compute the diff and use it to
-	/// call `change_members_sorted`.
-	///
-	/// This resets any previous value of prime.
-	fn set_members_sorted(new_members: &[AccountId], old_members: &[AccountId]) {
-		let (incoming, outgoing) = Self::compute_members_diff_sorted(new_members, old_members);
-		Self::change_members_sorted(&incoming[..], &outgoing[..], &new_members);
-	}
-
-	/// Compute diff between new and old members; they **must already be sorted**.
-	///
-	/// Returns incoming and outgoing members.
-	fn compute_members_diff_sorted(
-		new_members: &[AccountId],
-		old_members: &[AccountId],
-	) -> (Vec<AccountId>, Vec<AccountId>) {
-		let mut old_iter = old_members.iter();
-		let mut new_iter = new_members.iter();
-		let mut incoming = Vec::new();
-		let mut outgoing = Vec::new();
-		let mut old_i = old_iter.next();
-		let mut new_i = new_iter.next();
-		loop {
-			match (old_i, new_i) {
-				(None, None) => break,
-				(Some(old), Some(new)) if old == new => {
-					old_i = old_iter.next();
-					new_i = new_iter.next();
-				}
-				(Some(old), Some(new)) if old < new => {
-					outgoing.push(old.clone());
-					old_i = old_iter.next();
-				}
-				(Some(old), None) => {
-					outgoing.push(old.clone());
-					old_i = old_iter.next();
-				}
-				(_, Some(new)) => {
-					incoming.push(new.clone());
-					new_i = new_iter.next();
-				}
-			}
-		}
-		(incoming, outgoing)
-	}
-
-	/// Set the prime member.
-	fn set_prime(_prime: Option<AccountId>) {}
-
-	/// Get the current prime.
-	fn get_prime() -> Option<AccountId> {
-		None
-	}
-}
-
-impl<T: Clone + Ord> ChangeMembers<T> for () {
-	fn change_members(_: &[T], _: &[T], _: Vec<T>) {}
-	fn change_members_sorted(_: &[T], _: &[T], _: &[T]) {}
-	fn set_members_sorted(_: &[T], _: &[T]) {}
-	fn set_prime(_: Option<T>) {}
-}
-
-/// Trait for type that can handle the initialization of account IDs at genesis.
-pub trait InitializeMembers<AccountId> {
-	/// Initialize the members to the given `members`.
-	fn initialize_members(members: &[AccountId]);
-}
-
-impl<T> InitializeMembers<T> for () {
-	fn initialize_members(_: &[T]) {}
-}
-
-/// A trait that is able to provide randomness.
-///
-/// Being a deterministic blockchain, real randomness is difficult to come by, different
-/// implementations of this trait will provide different security guarantees. At best,
-/// this will be randomness which was hard to predict a long time ago, but that has become
-/// easy to predict recently.
-pub trait Randomness<Output, BlockNumber> {
-	/// Get the most recently determined random seed, along with the time in the past
-	/// since when it was determinable by chain observers.
-	///
-	/// `subject` is a context identifier and allows you to get a different result to
-	/// other callers of this function; use it like `random(&b"my context"[..])`.
-	///
-	/// NOTE: The returned seed should only be used to distinguish commitments made before
-	/// the returned block number. If the block number is too early (i.e. commitments were
-	/// made afterwards), then ensure no further commitments may be made and repeatedly
-	/// call this on later blocks until the block number returned is later than the latest
-	/// commitment.
-	fn random(subject: &[u8]) -> (Output, BlockNumber);
-
-	/// Get the basic random seed.
-	///
-	/// In general you won't want to use this, but rather `Self::random` which allows
-	/// you to give a subject for the random result and whose value will be
-	/// independently low-influence random from any other such seeds.
-	///
-	/// NOTE: The returned seed should only be used to distinguish commitments made before
-	/// the returned block number. If the block number is too early (i.e. commitments were
-	/// made afterwards), then ensure no further commitments may be made and repeatedly
-	/// call this on later blocks until the block number returned is later than the latest
-	/// commitment.
-	fn random_seed() -> (Output, BlockNumber) {
-		Self::random(&[][..])
-	}
-}
-
-/// Trait to be used by block producing consensus engine modules to determine
-/// how late the current block is (e.g. in a slot-based proposal mechanism how
-/// many slots were skipped since the previous block).
-pub trait Lateness<N> {
-	/// Returns a generic measure of how late the current block is compared to
-	/// its parent.
-	fn lateness(&self) -> N;
-}
-
-impl<N: Zero> Lateness<N> for () {
-	fn lateness(&self) -> N {
-		Zero::zero()
-	}
-}
-
-/// Implementors of this trait provide information about whether or not some validator has
-/// been registered with them. The [Session module](../../pallet_session/index.html) is an implementor.
-pub trait ValidatorRegistration<ValidatorId> {
-	/// Returns true if the provided validator ID has been registered with the implementing runtime
-	/// module
-	fn is_registered(id: &ValidatorId) -> bool;
-}
-
-/// Provides information about the pallet setup in the runtime.
-///
-/// An implementor should be able to provide information about each pallet that
-/// is configured in `construct_runtime!`.
-pub trait PalletInfo {
-	/// Convert the given pallet `P` into its index as configured in the runtime.
-	fn index<P: 'static>() -> Option<usize>;
-	/// Convert the given pallet `P` into its name as configured in the runtime.
-	fn name<P: 'static>() -> Option<&'static str>;
-}
-
-/// The function and pallet name of the Call.
-#[derive(Clone, Eq, PartialEq, Default, RuntimeDebug)]
-pub struct CallMetadata {
-	/// Name of the function.
-	pub function_name: &'static str,
-	/// Name of the pallet to which the function belongs.
-	pub pallet_name: &'static str,
-}
-
-/// Gets the function name of the Call.
-pub trait GetCallName {
-	/// Return all function names.
-	fn get_call_names() -> &'static [&'static str];
-	/// Return the function name of the Call.
-	fn get_call_name(&self) -> &'static str;
-}
-
-/// Gets the metadata for the Call - function name and pallet name.
-pub trait GetCallMetadata {
-	/// Return all module names.
-	fn get_module_names() -> &'static [&'static str];
-	/// Return all function names for the given `module`.
-	fn get_call_names(module: &str) -> &'static [&'static str];
-	/// Return a [`CallMetadata`], containing function and pallet name of the Call.
-	fn get_call_metadata(&self) -> CallMetadata;
-}
-
-/// The block finalization trait.
-///
-/// Implementing this lets you express what should happen for your pallet when the block is ending.
-#[impl_for_tuples(30)]
-pub trait OnFinalize<BlockNumber> {
-	/// The block is being finalized. Implement to have something happen.
-	///
-	/// NOTE: This function is called AFTER ALL extrinsics in a block are applied,
-	/// including inherent extrinsics.
-	fn on_finalize(_n: BlockNumber) {}
-}
-
-/// The block's on idle trait.
-///
-/// Implementing this lets you express what should happen for your pallet before
-/// block finalization (see `on_finalize` hook) in case any remaining weight is left.
-pub trait OnIdle<BlockNumber> {
-	/// The block is being finalized.
-	/// Implement to have something happen in case there is leftover weight.
-	/// Check the passed `remaining_weight` to make sure it is high enough to allow for
-	/// your pallet's extra computation.
-	///
-	/// NOTE: This function is called AFTER ALL extrinsics - including inherent extrinsics -
-	/// in a block are applied but before `on_finalize` is executed.
-	fn on_idle(
-		_n: BlockNumber,
-		_remaining_weight: crate::weights::Weight
-	) -> crate::weights::Weight {
-		0
-	}
-}
-
-#[impl_for_tuples(30)]
-impl<BlockNumber: Clone> OnIdle<BlockNumber> for Tuple {
-	fn on_idle(n: BlockNumber,  remaining_weight: crate::weights::Weight) -> crate::weights::Weight {
-		let mut weight = 0;
-		for_tuples!( #(
-			let adjusted_remaining_weight = remaining_weight.saturating_sub(weight);
-			weight = weight.saturating_add(Tuple::on_idle(n.clone(),  adjusted_remaining_weight));
-		)* );
-		weight
-	}
-}
-
-/// The block initialization trait.
-///
-/// Implementing this lets you express what should happen for your pallet when the block is
-/// beginning (right before the first extrinsic is executed).
-pub trait OnInitialize<BlockNumber> {
-	/// The block is being initialized. Implement to have something happen.
-	///
-	/// Return the non-negotiable weight consumed in the block.
-	///
-	/// NOTE: This function is called BEFORE ANY extrinsic in a block is applied,
-	/// including inherent extrinsics. Hence for instance, if you runtime includes
-	/// `pallet_timestamp`, the `timestamp` is not yet up to date at this point.
-	fn on_initialize(_n: BlockNumber) -> crate::weights::Weight { 0 }
-}
-
-#[impl_for_tuples(30)]
-impl<BlockNumber: Clone> OnInitialize<BlockNumber> for Tuple {
-	fn on_initialize(n: BlockNumber) -> crate::weights::Weight {
-		let mut weight = 0;
-		for_tuples!( #( weight = weight.saturating_add(Tuple::on_initialize(n.clone())); )* );
-		weight
-	}
-}
+pub use tokens::fungibles::{
+	Inspect as InspectFungibles, Mutate as MutateFungibles, Transfer as TransferFungibles,
+	Reserve as ReserveFungibles, Balanced as BalancedFungibles, Unbalanced as UnbalancedFungibles,
+};
+pub use tokens::currency::{
+	Currency, LockIdentifier, LockableCurrency, ReservableCurrency, VestingSchedule,
+};
+pub use tokens::imbalance::{Imbalance, OnUnbalanced, SignedImbalance};
+pub use tokens::{ExistenceRequirement, WithdrawReasons, BalanceStatus};
 
-/// A trait that will be called at genesis.
-///
-/// Implementing this trait for a pallet let's you express operations that should
-/// happen at genesis. It will be called in an externalities provided environment and
-/// will see the genesis state after all pallets have written their genesis state.
-#[impl_for_tuples(30)]
-pub trait OnGenesis {
-	/// Something that should happen at genesis.
-	fn on_genesis() {}
-}
+mod members;
+pub use members::{Contains, ContainsLengthBound, InitializeMembers, ChangeMembers};
 
-/// Prefix to be used (optionally) for implementing [`OnRuntimeUpgradeHelpersExt::storage_key`].
-#[cfg(feature = "try-runtime")]
-pub const ON_RUNTIME_UPGRADE_PREFIX: &[u8] = b"__ON_RUNTIME_UPGRADE__";
-
-/// Some helper functions for [`OnRuntimeUpgrade`] during `try-runtime` testing.
-#[cfg(feature = "try-runtime")]
-pub trait OnRuntimeUpgradeHelpersExt {
-	/// Generate a storage key unique to this runtime upgrade.
-	///
-	/// This can be used to communicate data from pre-upgrade to post-upgrade state and check
-	/// them. See [`Self::set_temp_storage`] and [`Self::get_temp_storage`].
-	#[cfg(feature = "try-runtime")]
-	fn storage_key(ident: &str) -> [u8; 32] {
-		let prefix = sp_io::hashing::twox_128(ON_RUNTIME_UPGRADE_PREFIX);
-		let ident = sp_io::hashing::twox_128(ident.as_bytes());
+mod validation;
+pub use validation::{
+	ValidatorSet, ValidatorSetWithIdentification, OneSessionHandler, FindAuthor, VerifySeal,
+	EstimateNextNewSession, EstimateNextSessionRotation, KeyOwnerProofSystem, ValidatorRegistration,
+	Lateness,
+};
 
-		let mut final_key = [0u8; 32];
-		final_key[..16].copy_from_slice(&prefix);
-		final_key[16..].copy_from_slice(&ident);
+mod filter;
+pub use filter::{
+	Filter, FilterStack, FilterStackGuard, ClearFilterGuard, InstanceFilter, IntegrityTest,
+};
 
-		final_key
-	}
+mod misc;
+pub use misc::{
+	Len, Get, GetDefault, HandleLifetime, TryDrop, Time, UnixTime, IsType, IsSubType, ExecuteBlock,
+	SameOrOther, OnNewAccount, OnKilledAccount, OffchainWorker,
+};
 
-	/// Get temporary storage data written by [`Self::set_temp_storage`].
-	///
-	/// Returns `None` if either the data is unavailable or un-decodable.
-	///
-	/// A `at` storage identifier must be provided to indicate where the storage is being read from.
-	#[cfg(feature = "try-runtime")]
-	fn get_temp_storage<T: Decode>(at: &str) -> Option<T> {
-		sp_io::storage::get(&Self::storage_key(at))
-			.and_then(|bytes| Decode::decode(&mut &*bytes).ok())
-	}
+mod stored_map;
+pub use stored_map::{StoredMap, StorageMapShim};
+mod randomness;
+pub use randomness::Randomness;
 
-	/// Write some temporary data to a specific storage that can be read (potentially in
-	/// post-upgrade hook) via [`Self::get_temp_storage`].
-	///
-	/// A `at` storage identifier must be provided to indicate where the storage is being written
-	/// to.
-	#[cfg(feature = "try-runtime")]
-	fn set_temp_storage<T: Encode>(data: T, at: &str) {
-		sp_io::storage::set(&Self::storage_key(at), &data.encode());
-	}
-}
+mod metadata;
+pub use metadata::{
+	CallMetadata, GetCallMetadata, GetCallName, PalletInfo, PalletVersion, GetPalletVersion,
+	PALLET_VERSION_STORAGE_KEY_POSTFIX,
+};
 
+mod hooks;
+pub use hooks::{Hooks, OnGenesis, OnInitialize, OnFinalize, OnIdle, OnRuntimeUpgrade, OnTimestampSet};
 #[cfg(feature = "try-runtime")]
-impl<U: OnRuntimeUpgrade> OnRuntimeUpgradeHelpersExt for U {}
-
-/// The runtime upgrade trait.
-///
-/// Implementing this lets you express what should happen when the runtime upgrades,
-/// and changes may need to occur to your module.
-pub trait OnRuntimeUpgrade {
-	/// Perform a module upgrade.
-	///
-	/// # Warning
-	///
-	/// This function will be called before we initialized any runtime state, aka `on_initialize`
-	/// wasn't called yet. So, information like the block number and any other
-	/// block local data are not accessible.
-	///
-	/// Return the non-negotiable weight consumed for runtime upgrade.
-	fn on_runtime_upgrade() -> crate::weights::Weight {
-		0
-	}
-
-	/// Execute some pre-checks prior to a runtime upgrade.
-	///
-	/// This hook is never meant to be executed on-chain but is meant to be used by testing tools.
-	#[cfg(feature = "try-runtime")]
-	fn pre_upgrade() -> Result<(), &'static str> { Ok(()) }
-
-	/// Execute some post-checks after a runtime upgrade.
-	///
-	/// This hook is never meant to be executed on-chain but is meant to be used by testing tools.
-	#[cfg(feature = "try-runtime")]
-	fn post_upgrade() -> Result<(), &'static str> { Ok(()) }
-}
-
-#[impl_for_tuples(30)]
-impl OnRuntimeUpgrade for Tuple {
-	fn on_runtime_upgrade() -> crate::weights::Weight {
-		let mut weight = 0;
-		for_tuples!( #( weight = weight.saturating_add(Tuple::on_runtime_upgrade()); )* );
-		weight
-	}
-
-	#[cfg(feature = "try-runtime")]
-	fn pre_upgrade() -> Result<(), &'static str> {
-		let mut result = Ok(());
-		for_tuples!( #( result = result.and(Tuple::pre_upgrade()); )* );
-		result
-	}
-
-	#[cfg(feature = "try-runtime")]
-	fn post_upgrade() -> Result<(), &'static str> {
-		let mut result = Ok(());
-		for_tuples!( #( result = result.and(Tuple::post_upgrade()); )* );
-		result
-	}
-}
-
-/// Off-chain computation trait.
-///
-/// Implementing this trait on a module allows you to perform long-running tasks
-/// that make (by default) validators generate transactions that feed results
-/// of those long-running computations back on chain.
-///
-/// NOTE: This function runs off-chain, so it can access the block state,
-/// but cannot preform any alterations. More specifically alterations are
-/// not forbidden, but they are not persisted in any way after the worker
-/// has finished.
-#[impl_for_tuples(30)]
-pub trait OffchainWorker<BlockNumber> {
-	/// This function is being called after every block import (when fully synced).
-	///
-	/// Implement this and use any of the `Offchain` `sp_io` set of APIs
-	/// to perform off-chain computations, calls and submit transactions
-	/// with results to trigger any on-chain changes.
-	/// Any state alterations are lost and are not persisted.
-	fn offchain_worker(_n: BlockNumber) {}
-}
-
-pub mod schedule {
-	use super::*;
-
-	/// Information relating to the period of a scheduled task. First item is the length of the
-	/// period and the second is the number of times it should be executed in total before the task
-	/// is considered finished and removed.
-	pub type Period<BlockNumber> = (BlockNumber, u32);
-
-	/// Priority with which a call is scheduled. It's just a linear amount with lowest values meaning
-	/// higher priority.
-	pub type Priority = u8;
-
-	/// The dispatch time of a scheduled task.
-	#[derive(Encode, Decode, Copy, Clone, PartialEq, Eq, RuntimeDebug)]
-	pub enum DispatchTime<BlockNumber> {
-		/// At specified block.
-		At(BlockNumber),
-		/// After specified number of blocks.
-		After(BlockNumber),
-	}
-
-	/// The highest priority. We invert the value so that normal sorting will place the highest
-	/// priority at the beginning of the list.
-	pub const HIGHEST_PRIORITY: Priority = 0;
-	/// Anything of this value or lower will definitely be scheduled on the block that they ask for, even
-	/// if it breaches the `MaximumWeight` limitation.
-	pub const HARD_DEADLINE: Priority = 63;
-	/// The lowest priority. Most stuff should be around here.
-	pub const LOWEST_PRIORITY: Priority = 255;
-
-	/// A type that can be used as a scheduler.
-	pub trait Anon<BlockNumber, Call, Origin> {
-		/// An address which can be used for removing a scheduled task.
-		type Address: Codec + Clone + Eq + EncodeLike + Debug;
-
-		/// Schedule a dispatch to happen at the beginning of some block in the future.
-		///
-		/// This is not named.
-		fn schedule(
-			when: DispatchTime<BlockNumber>,
-			maybe_periodic: Option<Period<BlockNumber>>,
-			priority: Priority,
-			origin: Origin,
-			call: Call
-		) -> Result<Self::Address, DispatchError>;
-
-		/// Cancel a scheduled task. If periodic, then it will cancel all further instances of that,
-		/// also.
-		///
-		/// Will return an error if the `address` is invalid.
-		///
-		/// NOTE: This guaranteed to work only *before* the point that it is due to be executed.
-		/// If it ends up being delayed beyond the point of execution, then it cannot be cancelled.
-		///
-		/// NOTE2: This will not work to cancel periodic tasks after their initial execution. For
-		/// that, you must name the task explicitly using the `Named` trait.
-		fn cancel(address: Self::Address) -> Result<(), ()>;
-
-		/// Reschedule a task. For one-off tasks, this dispatch is guaranteed to succeed
-		/// only if it is executed *before* the currently scheduled block. For periodic tasks,
-		/// this dispatch is guaranteed to succeed only before the *initial* execution; for
-		/// others, use `reschedule_named`.
-		///
-		/// Will return an error if the `address` is invalid.
-		fn reschedule(
-			address: Self::Address,
-			when: DispatchTime<BlockNumber>,
-		) -> Result<Self::Address, DispatchError>;
-
-		/// Return the next dispatch time for a given task.
-		///
-		/// Will return an error if the `address` is invalid.
-		fn next_dispatch_time(address: Self::Address) -> Result<BlockNumber, ()>;
-	}
-
-	/// A type that can be used as a scheduler.
-	pub trait Named<BlockNumber, Call, Origin> {
-		/// An address which can be used for removing a scheduled task.
-		type Address: Codec + Clone + Eq + EncodeLike + sp_std::fmt::Debug;
-
-		/// Schedule a dispatch to happen at the beginning of some block in the future.
-		///
-		/// - `id`: The identity of the task. This must be unique and will return an error if not.
-		fn schedule_named(
-			id: Vec<u8>,
-			when: DispatchTime<BlockNumber>,
-			maybe_periodic: Option<Period<BlockNumber>>,
-			priority: Priority,
-			origin: Origin,
-			call: Call
-		) -> Result<Self::Address, ()>;
-
-		/// Cancel a scheduled, named task. If periodic, then it will cancel all further instances
-		/// of that, also.
-		///
-		/// Will return an error if the `id` is invalid.
-		///
-		/// NOTE: This guaranteed to work only *before* the point that it is due to be executed.
-		/// If it ends up being delayed beyond the point of execution, then it cannot be cancelled.
-		fn cancel_named(id: Vec<u8>) -> Result<(), ()>;
-
-		/// Reschedule a task. For one-off tasks, this dispatch is guaranteed to succeed
-		/// only if it is executed *before* the currently scheduled block.
-		fn reschedule_named(
-			id: Vec<u8>,
-			when: DispatchTime<BlockNumber>,
-		) -> Result<Self::Address, DispatchError>;
-
-		/// Return the next dispatch time for a given task.
-		///
-		/// Will return an error if the `id` is invalid.
-		fn next_dispatch_time(id: Vec<u8>) -> Result<BlockNumber, ()>;
-	}
-}
-
-/// Some sort of check on the origin is performed by this object.
-pub trait EnsureOrigin<OuterOrigin> {
-	/// A return type.
-	type Success;
-	/// Perform the origin check.
-	fn ensure_origin(o: OuterOrigin) -> result::Result<Self::Success, BadOrigin> {
-		Self::try_origin(o).map_err(|_| BadOrigin)
-	}
-	/// Perform the origin check.
-	fn try_origin(o: OuterOrigin) -> result::Result<Self::Success, OuterOrigin>;
-
-	/// Returns an outer origin capable of passing `try_origin` check.
-	///
-	/// ** Should be used for benchmarking only!!! **
-	#[cfg(feature = "runtime-benchmarks")]
-	fn successful_origin() -> OuterOrigin;
-}
-
-/// Type that can be dispatched with an origin but without checking the origin filter.
-///
-/// Implemented for pallet dispatchable type by `decl_module` and for runtime dispatchable by
-/// `construct_runtime` and `impl_outer_dispatch`.
-pub trait UnfilteredDispatchable {
-	/// The origin type of the runtime, (i.e. `frame_system::Config::Origin`).
-	type Origin;
-
-	/// Dispatch this call but do not check the filter in origin.
-	fn dispatch_bypass_filter(self, origin: Self::Origin) -> crate::dispatch::DispatchResultWithPostInfo;
-}
-
-/// Methods available on `frame_system::Config::Origin`.
-pub trait OriginTrait: Sized {
-	/// Runtime call type, as in `frame_system::Config::Call`
-	type Call;
-
-	/// The caller origin, overarching type of all pallets origins.
-	type PalletsOrigin;
-
-	/// The AccountId used across the system.
-	type AccountId;
-
-	/// Add a filter to the origin.
-	fn add_filter(&mut self, filter: impl Fn(&Self::Call) -> bool + 'static);
-
-	/// Reset origin filters to default one, i.e `frame_system::Config::BaseCallFilter`.
-	fn reset_filter(&mut self);
-
-	/// Replace the caller with caller from the other origin
-	fn set_caller_from(&mut self, other: impl Into<Self>);
-
-	/// Filter the call, if false then call is filtered out.
-	fn filter_call(&self, call: &Self::Call) -> bool;
-
-	/// Get the caller.
-	fn caller(&self) -> &Self::PalletsOrigin;
-
-	/// Create with system none origin and `frame-system::Config::BaseCallFilter`.
-	fn none() -> Self;
-
-	/// Create with system root origin and no filter.
-	fn root() -> Self;
-
-	/// Create with system signed origin and `frame-system::Config::BaseCallFilter`.
-	fn signed(by: Self::AccountId) -> Self;
-}
-
-/// Trait to be used when types are exactly same.
-///
-/// This allow to convert back and forth from type, a reference and a mutable reference.
-pub trait IsType<T>: Into<T> + From<T> {
-	/// Cast reference.
-	fn from_ref(t: &T) -> &Self;
-
-	/// Cast reference.
-	fn into_ref(&self) -> &T;
-
-	/// Cast mutable reference.
-	fn from_mut(t: &mut T) -> &mut Self;
-
-	/// Cast mutable reference.
-	fn into_mut(&mut self) -> &mut T;
-}
-
-impl<T> IsType<T> for T {
-	fn from_ref(t: &T) -> &Self { t }
-	fn into_ref(&self) -> &T { self }
-	fn from_mut(t: &mut T) -> &mut Self { t }
-	fn into_mut(&mut self) -> &mut T { self }
-}
-
-/// An instance of a pallet in the storage.
-///
-/// It is required that these instances are unique, to support multiple instances per pallet in the same runtime!
-///
-/// E.g. for module MyModule default instance will have prefix "MyModule" and other instances
-/// "InstanceNMyModule".
-pub trait Instance: 'static {
-	/// Unique module prefix. E.g. "InstanceNMyModule" or "MyModule"
-	const PREFIX: &'static str;
-}
-
-/// An instance of a storage in a pallet.
-///
-/// Define an instance for an individual storage inside a pallet.
-/// The pallet prefix is used to isolate the storage between pallets, and the storage prefix is
-/// used to isolate storages inside a pallet.
-///
-/// NOTE: These information can be used to define storages in pallet such as a `StorageMap` which
-/// can use keys after `twox_128(pallet_prefix())++twox_128(STORAGE_PREFIX)`
-pub trait StorageInstance {
-	/// Prefix of a pallet to isolate it from other pallets.
-	fn pallet_prefix() -> &'static str;
-
-	/// Prefix given to a storage to isolate from other storages in the pallet.
-	const STORAGE_PREFIX: &'static str;
-}
-
-/// Implement Get by returning Default for any type that implements Default.
-pub struct GetDefault;
-impl<T: Default> crate::traits::Get<T> for GetDefault {
-	fn get() -> T {
-		T::default()
-	}
-}
-
-/// A trait similar to `Convert` to convert values from `B` an abstract balance type
-/// into u64 and back from u128. (This conversion is used in election and other places where complex
-/// calculation over balance type is needed)
-///
-/// Total issuance of the currency is passed in, but an implementation of this trait may or may not
-/// use it.
-///
-/// # WARNING
-///
-/// the total issuance being passed in implies that the implementation must be aware of the fact
-/// that its values can affect the outcome. This implies that if the vote value is dependent on the
-/// total issuance, it should never ber written to storage for later re-use.
-pub trait CurrencyToVote<B> {
-	/// Convert balance to u64.
-	fn to_vote(value: B, issuance: B) -> u64;
-
-	/// Convert u128 to balance.
-	fn to_currency(value: u128, issuance: B) -> B;
-}
-
-/// An implementation of `CurrencyToVote` tailored for chain's that have a balance type of u128.
-///
-/// The factor is the `(total_issuance / u64::max()).max(1)`, represented as u64. Let's look at the
-/// important cases:
-///
-/// If the chain's total issuance is less than u64::max(), this will always be 1, which means that
-/// the factor will not have any effect. In this case, any account's balance is also less. Thus,
-/// both of the conversions are basically an `as`; Any balance can fit in u64.
-///
-/// If the chain's total issuance is more than 2*u64::max(), then a factor might be multiplied and
-/// divided upon conversion.
-pub struct U128CurrencyToVote;
-
-impl U128CurrencyToVote {
-	fn factor(issuance: u128) -> u128 {
-		(issuance / u64::max_value() as u128).max(1)
-	}
-}
-
-impl CurrencyToVote<u128> for U128CurrencyToVote {
-	fn to_vote(value: u128, issuance: u128) -> u64 {
-		(value / Self::factor(issuance)).saturated_into()
-	}
-
-	fn to_currency(value: u128, issuance: u128) -> u128 {
-		value.saturating_mul(Self::factor(issuance))
-	}
-}
-
-
-/// A naive implementation of `CurrencyConvert` that simply saturates all conversions.
-///
-/// # Warning
-///
-/// This is designed to be used mostly for testing. Use with care, and think about the consequences.
-pub struct SaturatingCurrencyToVote;
-
-impl<B: UniqueSaturatedInto<u64> + UniqueSaturatedFrom<u128>> CurrencyToVote<B> for SaturatingCurrencyToVote {
-	fn to_vote(value: B, _: B) -> u64 {
-		value.unique_saturated_into()
-	}
-
-	fn to_currency(value: u128, _: B) -> B {
-		B::unique_saturated_from(value)
-	}
-}
-
-/// Something that can be checked to be a of sub type `T`.
-///
-/// This is useful for enums where each variant encapsulates a different sub type, and
-/// you need access to these sub types.
-///
-/// For example, in FRAME, this trait is implemented for the runtime `Call` enum. Pallets use this
-/// to check if a certain call is an instance of the local pallet's `Call` enum.
-///
-/// # Example
-///
-/// ```
-/// # use frame_support::traits::IsSubType;
-///
-/// enum Test {
-///     String(String),
-///     U32(u32),
-/// }
-///
-/// impl IsSubType<String> for Test {
-///     fn is_sub_type(&self) -> Option<&String> {
-///         match self {
-///             Self::String(ref r) => Some(r),
-///             _ => None,
-///         }
-///     }
-/// }
-///
-/// impl IsSubType<u32> for Test {
-///     fn is_sub_type(&self) -> Option<&u32> {
-///         match self {
-///             Self::U32(ref r) => Some(r),
-///             _ => None,
-///         }
-///     }
-/// }
-///
-/// fn main() {
-///     let data = Test::String("test".into());
-///
-///     assert_eq!("test", IsSubType::<String>::is_sub_type(&data).unwrap().as_str());
-/// }
-/// ```
-pub trait IsSubType<T> {
-	/// Returns `Some(_)` if `self` is an instance of sub type `T`.
-	fn is_sub_type(&self) -> Option<&T>;
-}
-
-/// The pallet hooks trait. Implementing this lets you express some logic to execute.
-pub trait Hooks<BlockNumber> {
-	/// The block is being finalized. Implement to have something happen.
-	fn on_finalize(_n: BlockNumber) {}
-
-	/// This will be run when the block is being finalized (before `on_finalize`).
-	/// Implement to have something happen using the remaining weight.
-	/// Will not fire if the remaining weight is 0.
-	/// Return the weight used, the hook will subtract it from current weight used
-	/// and pass the result to the next `on_idle` hook if it exists.
-	fn on_idle(
-		_n: BlockNumber,
-		_remaining_weight: crate::weights::Weight
-	) -> crate::weights::Weight {
-		0
-	}
-
-	/// The block is being initialized. Implement to have something happen.
-	///
-	/// Return the non-negotiable weight consumed in the block.
-	fn on_initialize(_n: BlockNumber) -> crate::weights::Weight { 0 }
-
-	/// Perform a module upgrade.
-	///
-	/// NOTE: this doesn't include all pallet logic triggered on runtime upgrade. For instance it
-	/// doesn't include the write of the pallet version in storage. The final complete logic
-	/// triggered on runtime upgrade is given by implementation of `OnRuntimeUpgrade` trait by
-	/// `Pallet`.
-	///
-	/// # Warning
-	///
-	/// This function will be called before we initialized any runtime state, aka `on_initialize`
-	/// wasn't called yet. So, information like the block number and any other
-	/// block local data are not accessible.
-	///
-	/// Return the non-negotiable weight consumed for runtime upgrade.
-	fn on_runtime_upgrade() -> crate::weights::Weight { 0 }
-
-	/// Execute some pre-checks prior to a runtime upgrade.
-	///
-	/// This hook is never meant to be executed on-chain but is meant to be used by testing tools.
-	#[cfg(feature = "try-runtime")]
-	fn pre_upgrade() -> Result<(), &'static str> {
-		Ok(())
-	}
-
-	/// Execute some post-checks after a runtime upgrade.
-	///
-	/// This hook is never meant to be executed on-chain but is meant to be used by testing tools.
-	#[cfg(feature = "try-runtime")]
-	fn post_upgrade() -> Result<(), &'static str> {
-		Ok(())
-	}
-
-	/// Implementing this function on a module allows you to perform long-running tasks
-	/// that make (by default) validators generate transactions that feed results
-	/// of those long-running computations back on chain.
-	///
-	/// NOTE: This function runs off-chain, so it can access the block state,
-	/// but cannot preform any alterations. More specifically alterations are
-	/// not forbidden, but they are not persisted in any way after the worker
-	/// has finished.
-	///
-	/// This function is being called after every block import (when fully synced).
-	///
-	/// Implement this and use any of the `Offchain` `sp_io` set of APIs
-	/// to perform off-chain computations, calls and submit transactions
-	/// with results to trigger any on-chain changes.
-	/// Any state alterations are lost and are not persisted.
-	fn offchain_worker(_n: BlockNumber) {}
-
-	/// Run integrity test.
-	///
-	/// The test is not executed in a externalities provided environment.
-	fn integrity_test() {}
-}
-
-/// A trait to define the build function of a genesis config, T and I are placeholder for pallet
-/// trait and pallet instance.
+pub use hooks::{OnRuntimeUpgradeHelpersExt, ON_RUNTIME_UPGRADE_PREFIX};
 #[cfg(feature = "std")]
-pub trait GenesisBuild<T, I=()>: Default + MaybeSerializeDeserialize {
-	/// The build function is called within an externalities allowing storage APIs.
-	/// Thus one can write to storage using regular pallet storages.
-	fn build(&self);
-
-	/// Build the storage using `build` inside default storage.
-	fn build_storage(&self) -> Result<sp_runtime::Storage, String> {
-		let mut storage = Default::default();
-		self.assimilate_storage(&mut storage)?;
-		Ok(storage)
-	}
-
-	/// Assimilate the storage for this module into pre-existing overlays.
-	fn assimilate_storage(&self, storage: &mut sp_runtime::Storage) -> Result<(), String> {
-		sp_state_machine::BasicExternalities::execute_with_storage(storage, || {
-			self.build();
-			Ok(())
-		})
-	}
-}
-
-/// The storage key postfix that is used to store the [`PalletVersion`] per pallet.
-///
-/// The full storage key is built by using:
-/// Twox128([`PalletInfo::name`]) ++ Twox128([`PALLET_VERSION_STORAGE_KEY_POSTFIX`])
-pub const PALLET_VERSION_STORAGE_KEY_POSTFIX: &[u8] = b":__PALLET_VERSION__:";
-
-/// The version of a pallet.
-///
-/// Each pallet version is stored in the state under a fixed key. See
-/// [`PALLET_VERSION_STORAGE_KEY_POSTFIX`] for how this key is built.
-#[derive(RuntimeDebug, Eq, PartialEq, Encode, Decode, Ord, Clone, Copy)]
-pub struct PalletVersion {
-	/// The major version of the pallet.
-	pub major: u16,
-	/// The minor version of the pallet.
-	pub minor: u8,
-	/// The patch version of the pallet.
-	pub patch: u8,
-}
-
-impl PalletVersion {
-	/// Creates a new instance of `Self`.
-	pub fn new(major: u16, minor: u8, patch: u8) -> Self {
-		Self {
-			major,
-			minor,
-			patch,
-		}
-	}
-
-	/// Returns the storage key for a pallet version.
-	///
-	/// See [`PALLET_VERSION_STORAGE_KEY_POSTFIX`] on how this key is built.
-	///
-	/// Returns `None` if the given `PI` returned a `None` as name for the given
-	/// `Pallet`.
-	pub fn storage_key<PI: PalletInfo, Pallet: 'static>() -> Option<[u8; 32]> {
-		let pallet_name = PI::name::<Pallet>()?;
-
-		let pallet_name = sp_io::hashing::twox_128(pallet_name.as_bytes());
-		let postfix = sp_io::hashing::twox_128(PALLET_VERSION_STORAGE_KEY_POSTFIX);
-
-		let mut final_key = [0u8; 32];
-		final_key[..16].copy_from_slice(&pallet_name);
-		final_key[16..].copy_from_slice(&postfix);
-
-		Some(final_key)
-	}
-
-	/// Put this pallet version into the storage.
-	///
-	/// It will use the storage key that is associated with the given `Pallet`.
-	///
-	/// # Panics
-	///
-	/// This function will panic iff `Pallet` can not be found by `PalletInfo`.
-	/// In a runtime that is put together using
-	/// [`construct_runtime!`](crate::construct_runtime) this should never happen.
-	///
-	/// It will also panic if this function isn't executed in an externalities
-	/// provided environment.
-	pub fn put_into_storage<PI: PalletInfo, Pallet: 'static>(&self) {
-		let key = Self::storage_key::<PI, Pallet>()
-			.expect("Every active pallet has a name in the runtime; qed");
-
-		crate::storage::unhashed::put(&key, self);
-	}
-}
-
-impl sp_std::cmp::PartialOrd for PalletVersion {
-	fn partial_cmp(&self, other: &Self) -> Option<sp_std::cmp::Ordering> {
-		let res = self.major
-			.cmp(&other.major)
-			.then_with(||
-				self.minor
-					.cmp(&other.minor)
-					.then_with(|| self.patch.cmp(&other.patch)
-			));
-
-		Some(res)
-	}
-}
-
-/// Provides version information about a pallet.
-///
-/// This trait provides two functions for returning the version of a
-/// pallet. There is a state where both functions can return distinct versions.
-/// See [`GetPalletVersion::storage_version`] for more information about this.
-pub trait GetPalletVersion {
-	/// Returns the current version of the pallet.
-	fn current_version() -> PalletVersion;
-
-	/// Returns the version of the pallet that is stored in storage.
-	///
-	/// Most of the time this will return the exact same version as
-	/// [`GetPalletVersion::current_version`]. Only when being in
-	/// a state after a runtime upgrade happened and the pallet did
-	/// not yet updated its version in storage, this will return a
-	/// different(the previous, seen from the time of calling) version.
-	///
-	/// See [`PalletVersion`] for more information.
-	///
-	/// # Note
-	///
-	/// If there was no previous version of the pallet stored in the state,
-	/// this function returns `None`.
-	fn storage_version() -> Option<PalletVersion>;
-}
-
-/// Something that can execute a given block.
-///
-/// Executing a block means that all extrinsics in a given block will be executed and the resulting
-/// header will be checked against the header of the given block.
-pub trait ExecuteBlock<Block: BlockT> {
-	/// Execute the given `block`.
-	///
-	/// This will execute all extrinsics in the block and check that the resulting header is correct.
-	///
-	/// # Panic
-	///
-	/// Panics when an extrinsics panics or the resulting header doesn't match the expected header.
-	fn execute_block(block: Block);
-}
-
-/// A trait which is called when the timestamp is set in the runtime.
-#[impl_trait_for_tuples::impl_for_tuples(30)]
-pub trait OnTimestampSet<Moment> {
-	/// Called when the timestamp is set.
-	fn on_timestamp_set(moment: Moment);
-}
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-
-	#[test]
-	fn on_initialize_and_on_runtime_upgrade_weight_merge_works() {
-		struct Test;
-		impl OnInitialize<u8> for Test {
-			fn on_initialize(_n: u8) -> crate::weights::Weight {
-				10
-			}
-		}
-		impl OnRuntimeUpgrade for Test {
-			fn on_runtime_upgrade() -> crate::weights::Weight {
-				20
-			}
-		}
+pub use hooks::GenesisBuild;
 
-		assert_eq!(<(Test, Test)>::on_initialize(0), 20);
-		assert_eq!(<(Test, Test)>::on_runtime_upgrade(), 40);
-	}
+pub mod schedule;
+mod storage;
+pub use storage::{Instance, StorageInstance};
 
-	#[test]
-	fn check_pallet_version_ordering() {
-		let version = PalletVersion::new(1, 0, 0);
-		assert!(version > PalletVersion::new(0, 1, 2));
-		assert!(version == PalletVersion::new(1, 0, 0));
-		assert!(version < PalletVersion::new(1, 0, 1));
-		assert!(version < PalletVersion::new(1, 1, 0));
+mod dispatch;
+pub use dispatch::{EnsureOrigin, OriginTrait, UnfilteredDispatchable};
 
-		let version = PalletVersion::new(2, 50, 50);
-		assert!(version < PalletVersion::new(2, 50, 51));
-		assert!(version > PalletVersion::new(2, 49, 51));
-		assert!(version < PalletVersion::new(3, 49, 51));
-	}
-}
+mod voting;
+pub use voting::{CurrencyToVote, SaturatingCurrencyToVote, U128CurrencyToVote};
diff --git a/frame/support/src/traits/dispatch.rs b/frame/support/src/traits/dispatch.rs
new file mode 100644
index 000000000000..29dbaf105a05
--- /dev/null
+++ b/frame/support/src/traits/dispatch.rs
@@ -0,0 +1,87 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Traits for dealing with dispatching calls and the origin from which they are dispatched.
+
+use crate::dispatch::DispatchResultWithPostInfo;
+use sp_runtime::traits::BadOrigin;
+
+/// Some sort of check on the origin is performed by this object.
+pub trait EnsureOrigin<OuterOrigin> {
+	/// A return type.
+	type Success;
+	/// Perform the origin check.
+	fn ensure_origin(o: OuterOrigin) -> Result<Self::Success, BadOrigin> {
+		Self::try_origin(o).map_err(|_| BadOrigin)
+	}
+	/// Perform the origin check.
+	fn try_origin(o: OuterOrigin) -> Result<Self::Success, OuterOrigin>;
+
+	/// Returns an outer origin capable of passing `try_origin` check.
+	///
+	/// ** Should be used for benchmarking only!!! **
+	#[cfg(feature = "runtime-benchmarks")]
+	fn successful_origin() -> OuterOrigin;
+}
+
+/// Type that can be dispatched with an origin but without checking the origin filter.
+///
+/// Implemented for pallet dispatchable type by `decl_module` and for runtime dispatchable by
+/// `construct_runtime` and `impl_outer_dispatch`.
+pub trait UnfilteredDispatchable {
+	/// The origin type of the runtime, (i.e. `frame_system::Config::Origin`).
+	type Origin;
+
+	/// Dispatch this call but do not check the filter in origin.
+	fn dispatch_bypass_filter(self, origin: Self::Origin) -> DispatchResultWithPostInfo;
+}
+
+/// Methods available on `frame_system::Config::Origin`.
+pub trait OriginTrait: Sized {
+	/// Runtime call type, as in `frame_system::Config::Call`
+	type Call;
+
+	/// The caller origin, overarching type of all pallets origins.
+	type PalletsOrigin;
+
+	/// The AccountId used across the system.
+	type AccountId;
+
+	/// Add a filter to the origin.
+	fn add_filter(&mut self, filter: impl Fn(&Self::Call) -> bool + 'static);
+
+	/// Reset origin filters to default one, i.e `frame_system::Config::BaseCallFilter`.
+	fn reset_filter(&mut self);
+
+	/// Replace the caller with caller from the other origin
+	fn set_caller_from(&mut self, other: impl Into<Self>);
+
+	/// Filter the call, if false then call is filtered out.
+	fn filter_call(&self, call: &Self::Call) -> bool;
+
+	/// Get the caller.
+	fn caller(&self) -> &Self::PalletsOrigin;
+
+	/// Create with system none origin and `frame-system::Config::BaseCallFilter`.
+	fn none() -> Self;
+
+	/// Create with system root origin and no filter.
+	fn root() -> Self;
+
+	/// Create with system signed origin and `frame-system::Config::BaseCallFilter`.
+	fn signed(by: Self::AccountId) -> Self;
+}
diff --git a/frame/support/src/traits/filter.rs b/frame/support/src/traits/filter.rs
new file mode 100644
index 000000000000..f884a8ece72e
--- /dev/null
+++ b/frame/support/src/traits/filter.rs
@@ -0,0 +1,282 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Traits and associated utilities for dealing with abstract constraint filters.
+
+use sp_std::marker::PhantomData;
+
+/// Simple trait for providing a filter over a reference to some type.
+pub trait Filter<T> {
+	/// Determine if a given value should be allowed through the filter (returns `true`) or not.
+	fn filter(_: &T) -> bool;
+}
+
+impl<T> Filter<T> for () {
+	fn filter(_: &T) -> bool { true }
+}
+
+/// Trait to add a constraint onto the filter.
+pub trait FilterStack<T>: Filter<T> {
+	/// The type used to archive the stack.
+	type Stack;
+
+	/// Add a new `constraint` onto the filter.
+	fn push(constraint: impl Fn(&T) -> bool + 'static);
+
+	/// Removes the most recently pushed, and not-yet-popped, constraint from the filter.
+	fn pop();
+
+	/// Clear the filter, returning a value that may be used later to `restore` it.
+	fn take() -> Self::Stack;
+
+	/// Restore the filter from a previous `take` operation.
+	fn restore(taken: Self::Stack);
+}
+
+/// Guard type for pushing a constraint to a `FilterStack` and popping when dropped.
+pub struct FilterStackGuard<F: FilterStack<T>, T>(PhantomData<(F, T)>);
+
+/// Guard type for clearing all pushed constraints from a `FilterStack` and reinstating them when
+/// dropped.
+pub struct ClearFilterGuard<F: FilterStack<T>, T>(Option<F::Stack>, PhantomData<T>);
+
+impl<F: FilterStack<T>, T> FilterStackGuard<F, T> {
+	/// Create a new instance, adding a new `constraint` onto the filter `T`, and popping it when
+	/// this instance is dropped.
+	pub fn new(constraint: impl Fn(&T) -> bool + 'static) -> Self {
+		F::push(constraint);
+		Self(PhantomData)
+	}
+}
+
+impl<F: FilterStack<T>, T> Drop for FilterStackGuard<F, T> {
+	fn drop(&mut self) {
+		F::pop();
+	}
+}
+
+impl<F: FilterStack<T>, T> ClearFilterGuard<F, T> {
+	/// Create a new instance, adding a new `constraint` onto the filter `T`, and popping it when
+	/// this instance is dropped.
+	pub fn new() -> Self {
+		Self(Some(F::take()), PhantomData)
+	}
+}
+
+impl<F: FilterStack<T>, T> Drop for ClearFilterGuard<F, T> {
+	fn drop(&mut self) {
+		if let Some(taken) = self.0.take() {
+			F::restore(taken);
+		}
+	}
+}
+
+/// Simple trait for providing a filter over a reference to some type, given an instance of itself.
+pub trait InstanceFilter<T>: Sized + Send + Sync {
+	/// Determine if a given value should be allowed through the filter (returns `true`) or not.
+	fn filter(&self, _: &T) -> bool;
+
+	/// Determines whether `self` matches at least everything that `_o` does.
+	fn is_superset(&self, _o: &Self) -> bool { false }
+}
+
+impl<T> InstanceFilter<T> for () {
+	fn filter(&self, _: &T) -> bool { true }
+	fn is_superset(&self, _o: &Self) -> bool { true }
+}
+
+/// Re-expected for the macro.
+#[doc(hidden)]
+pub use sp_std::{mem::{swap, take}, cell::RefCell, vec::Vec, boxed::Box};
+
+#[macro_export]
+macro_rules! impl_filter_stack {
+	($target:ty, $base:ty, $call:ty, $module:ident) => {
+		#[cfg(feature = "std")]
+		mod $module {
+			#[allow(unused_imports)]
+			use super::*;
+			use $crate::traits::filter::{swap, take, RefCell, Vec, Box, Filter, FilterStack};
+
+			thread_local! {
+				static FILTER: RefCell<Vec<Box<dyn Fn(&$call) -> bool + 'static>>> = RefCell::new(Vec::new());
+			}
+
+			impl Filter<$call> for $target {
+				fn filter(call: &$call) -> bool {
+					<$base>::filter(call) &&
+						FILTER.with(|filter| filter.borrow().iter().all(|f| f(call)))
+				}
+			}
+
+			impl FilterStack<$call> for $target {
+				type Stack = Vec<Box<dyn Fn(&$call) -> bool + 'static>>;
+				fn push(f: impl Fn(&$call) -> bool + 'static) {
+					FILTER.with(|filter| filter.borrow_mut().push(Box::new(f)));
+				}
+				fn pop() {
+					FILTER.with(|filter| filter.borrow_mut().pop());
+				}
+				fn take() -> Self::Stack {
+					FILTER.with(|filter| take(filter.borrow_mut().as_mut()))
+				}
+				fn restore(mut s: Self::Stack) {
+					FILTER.with(|filter| swap(filter.borrow_mut().as_mut(), &mut s));
+				}
+			}
+		}
+
+		#[cfg(not(feature = "std"))]
+		mod $module {
+			#[allow(unused_imports)]
+			use super::*;
+			use $crate::traits::{swap, take, RefCell, Vec, Box, Filter, FilterStack};
+
+			struct ThisFilter(RefCell<Vec<Box<dyn Fn(&$call) -> bool + 'static>>>);
+			// NOTE: Safe only in wasm (guarded above) because there's only one thread.
+			unsafe impl Send for ThisFilter {}
+			unsafe impl Sync for ThisFilter {}
+
+			static FILTER: ThisFilter = ThisFilter(RefCell::new(Vec::new()));
+
+			impl Filter<$call> for $target {
+				fn filter(call: &$call) -> bool {
+					<$base>::filter(call) && FILTER.0.borrow().iter().all(|f| f(call))
+				}
+			}
+
+			impl FilterStack<$call> for $target {
+				type Stack = Vec<Box<dyn Fn(&$call) -> bool + 'static>>;
+				fn push(f: impl Fn(&$call) -> bool + 'static) {
+					FILTER.0.borrow_mut().push(Box::new(f));
+				}
+				fn pop() {
+					FILTER.0.borrow_mut().pop();
+				}
+				fn take() -> Self::Stack {
+					take(FILTER.0.borrow_mut().as_mut())
+				}
+				fn restore(mut s: Self::Stack) {
+					swap(FILTER.0.borrow_mut().as_mut(), &mut s);
+				}
+			}
+		}
+	}
+}
+
+/// Type that provide some integrity tests.
+///
+/// This implemented for modules by `decl_module`.
+#[impl_trait_for_tuples::impl_for_tuples(30)]
+pub trait IntegrityTest {
+	/// Run integrity test.
+	///
+	/// The test is not executed in a externalities provided environment.
+	fn integrity_test() {}
+}
+
+#[cfg(test)]
+pub mod test_impl_filter_stack {
+	use super::*;
+
+	pub struct IsCallable;
+	pub struct BaseFilter;
+	impl Filter<u32> for BaseFilter {
+		fn filter(x: &u32) -> bool { x % 2 == 0 }
+	}
+	impl_filter_stack!(
+		crate::traits::filter::test_impl_filter_stack::IsCallable,
+		crate::traits::filter::test_impl_filter_stack::BaseFilter,
+		u32,
+		is_callable
+	);
+
+	#[test]
+	fn impl_filter_stack_should_work() {
+		assert!(IsCallable::filter(&36));
+		assert!(IsCallable::filter(&40));
+		assert!(IsCallable::filter(&42));
+		assert!(!IsCallable::filter(&43));
+
+		IsCallable::push(|x| *x < 42);
+		assert!(IsCallable::filter(&36));
+		assert!(IsCallable::filter(&40));
+		assert!(!IsCallable::filter(&42));
+
+		IsCallable::push(|x| *x % 3 == 0);
+		assert!(IsCallable::filter(&36));
+		assert!(!IsCallable::filter(&40));
+
+		IsCallable::pop();
+		assert!(IsCallable::filter(&36));
+		assert!(IsCallable::filter(&40));
+		assert!(!IsCallable::filter(&42));
+
+		let saved = IsCallable::take();
+		assert!(IsCallable::filter(&36));
+		assert!(IsCallable::filter(&40));
+		assert!(IsCallable::filter(&42));
+		assert!(!IsCallable::filter(&43));
+
+		IsCallable::restore(saved);
+		assert!(IsCallable::filter(&36));
+		assert!(IsCallable::filter(&40));
+		assert!(!IsCallable::filter(&42));
+
+		IsCallable::pop();
+		assert!(IsCallable::filter(&36));
+		assert!(IsCallable::filter(&40));
+		assert!(IsCallable::filter(&42));
+		assert!(!IsCallable::filter(&43));
+	}
+
+	#[test]
+	fn guards_should_work() {
+		assert!(IsCallable::filter(&36));
+		assert!(IsCallable::filter(&40));
+		assert!(IsCallable::filter(&42));
+		assert!(!IsCallable::filter(&43));
+		{
+			let _guard_1 = FilterStackGuard::<IsCallable, u32>::new(|x| *x < 42);
+			assert!(IsCallable::filter(&36));
+			assert!(IsCallable::filter(&40));
+			assert!(!IsCallable::filter(&42));
+			{
+				let _guard_2 = FilterStackGuard::<IsCallable, u32>::new(|x| *x % 3 == 0);
+				assert!(IsCallable::filter(&36));
+				assert!(!IsCallable::filter(&40));
+			}
+			assert!(IsCallable::filter(&36));
+			assert!(IsCallable::filter(&40));
+			assert!(!IsCallable::filter(&42));
+			{
+				let _guard_2 = ClearFilterGuard::<IsCallable, u32>::new();
+				assert!(IsCallable::filter(&36));
+				assert!(IsCallable::filter(&40));
+				assert!(IsCallable::filter(&42));
+				assert!(!IsCallable::filter(&43));
+			}
+			assert!(IsCallable::filter(&36));
+			assert!(IsCallable::filter(&40));
+			assert!(!IsCallable::filter(&42));
+		}
+		assert!(IsCallable::filter(&36));
+		assert!(IsCallable::filter(&40));
+		assert!(IsCallable::filter(&42));
+		assert!(!IsCallable::filter(&43));
+	}
+}
diff --git a/frame/support/src/traits/hooks.rs b/frame/support/src/traits/hooks.rs
new file mode 100644
index 000000000000..5f7b35a9ad25
--- /dev/null
+++ b/frame/support/src/traits/hooks.rs
@@ -0,0 +1,349 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Traits for hooking tasks to events in a blockchain's lifecycle.
+
+use sp_arithmetic::traits::Saturating;
+use sp_runtime::traits::MaybeSerializeDeserialize;
+use impl_trait_for_tuples::impl_for_tuples;
+
+/// The block initialization trait.
+///
+/// Implementing this lets you express what should happen for your pallet when the block is
+/// beginning (right before the first extrinsic is executed).
+pub trait OnInitialize<BlockNumber> {
+	/// The block is being initialized. Implement to have something happen.
+	///
+	/// Return the non-negotiable weight consumed in the block.
+	///
+	/// NOTE: This function is called BEFORE ANY extrinsic in a block is applied,
+	/// including inherent extrinsics. Hence for instance, if you runtime includes
+	/// `pallet_timestamp`, the `timestamp` is not yet up to date at this point.
+	fn on_initialize(_n: BlockNumber) -> crate::weights::Weight { 0 }
+}
+
+#[impl_for_tuples(30)]
+impl<BlockNumber: Clone> OnInitialize<BlockNumber> for Tuple {
+	fn on_initialize(n: BlockNumber) -> crate::weights::Weight {
+		let mut weight = 0;
+		for_tuples!( #( weight = weight.saturating_add(Tuple::on_initialize(n.clone())); )* );
+		weight
+	}
+}
+
+/// The block finalization trait.
+///
+/// Implementing this lets you express what should happen for your pallet when the block is ending.
+#[impl_for_tuples(30)]
+pub trait OnFinalize<BlockNumber> {
+	/// The block is being finalized. Implement to have something happen.
+	///
+	/// NOTE: This function is called AFTER ALL extrinsics in a block are applied,
+	/// including inherent extrinsics.
+	fn on_finalize(_n: BlockNumber) {}
+}
+
+/// The block's on idle trait.
+///
+/// Implementing this lets you express what should happen for your pallet before
+/// block finalization (see `on_finalize` hook) in case any remaining weight is left.
+pub trait OnIdle<BlockNumber> {
+	/// The block is being finalized.
+	/// Implement to have something happen in case there is leftover weight.
+	/// Check the passed `remaining_weight` to make sure it is high enough to allow for
+	/// your pallet's extra computation.
+	///
+	/// NOTE: This function is called AFTER ALL extrinsics - including inherent extrinsics -
+	/// in a block are applied but before `on_finalize` is executed.
+	fn on_idle(
+		_n: BlockNumber,
+		_remaining_weight: crate::weights::Weight
+	) -> crate::weights::Weight {
+		0
+	}
+}
+
+#[impl_for_tuples(30)]
+impl<BlockNumber: Clone> OnIdle<BlockNumber> for Tuple {
+	fn on_idle(n: BlockNumber,  remaining_weight: crate::weights::Weight) -> crate::weights::Weight {
+		let mut weight = 0;
+		for_tuples!( #(
+			let adjusted_remaining_weight = remaining_weight.saturating_sub(weight);
+			weight = weight.saturating_add(Tuple::on_idle(n.clone(),  adjusted_remaining_weight));
+		)* );
+		weight
+	}
+}
+
+/// A trait that will be called at genesis.
+///
+/// Implementing this trait for a pallet let's you express operations that should
+/// happen at genesis. It will be called in an externalities provided environment and
+/// will see the genesis state after all pallets have written their genesis state.
+#[impl_for_tuples(30)]
+pub trait OnGenesis {
+	/// Something that should happen at genesis.
+	fn on_genesis() {}
+}
+
+/// Prefix to be used (optionally) for implementing [`OnRuntimeUpgradeHelpersExt::storage_key`].
+#[cfg(feature = "try-runtime")]
+pub const ON_RUNTIME_UPGRADE_PREFIX: &[u8] = b"__ON_RUNTIME_UPGRADE__";
+
+/// Some helper functions for [`OnRuntimeUpgrade`] during `try-runtime` testing.
+#[cfg(feature = "try-runtime")]
+pub trait OnRuntimeUpgradeHelpersExt {
+	/// Generate a storage key unique to this runtime upgrade.
+	///
+	/// This can be used to communicate data from pre-upgrade to post-upgrade state and check
+	/// them. See [`Self::set_temp_storage`] and [`Self::get_temp_storage`].
+	#[cfg(feature = "try-runtime")]
+	fn storage_key(ident: &str) -> [u8; 32] {
+		let prefix = sp_io::hashing::twox_128(ON_RUNTIME_UPGRADE_PREFIX);
+		let ident = sp_io::hashing::twox_128(ident.as_bytes());
+
+		let mut final_key = [0u8; 32];
+		final_key[..16].copy_from_slice(&prefix);
+		final_key[16..].copy_from_slice(&ident);
+
+		final_key
+	}
+
+	/// Get temporary storage data written by [`Self::set_temp_storage`].
+	///
+	/// Returns `None` if either the data is unavailable or un-decodable.
+	///
+	/// A `at` storage identifier must be provided to indicate where the storage is being read from.
+	#[cfg(feature = "try-runtime")]
+	fn get_temp_storage<T: codec::Decode>(at: &str) -> Option<T> {
+		sp_io::storage::get(&Self::storage_key(at))
+			.and_then(|bytes| codec::Decode::decode(&mut &*bytes).ok())
+	}
+
+	/// Write some temporary data to a specific storage that can be read (potentially in
+	/// post-upgrade hook) via [`Self::get_temp_storage`].
+	///
+	/// A `at` storage identifier must be provided to indicate where the storage is being written
+	/// to.
+	#[cfg(feature = "try-runtime")]
+	fn set_temp_storage<T: codec::Encode>(data: T, at: &str) {
+		sp_io::storage::set(&Self::storage_key(at), &data.encode());
+	}
+}
+
+#[cfg(feature = "try-runtime")]
+impl<U: OnRuntimeUpgrade> OnRuntimeUpgradeHelpersExt for U {}
+
+/// The runtime upgrade trait.
+///
+/// Implementing this lets you express what should happen when the runtime upgrades,
+/// and changes may need to occur to your module.
+pub trait OnRuntimeUpgrade {
+	/// Perform a module upgrade.
+	///
+	/// # Warning
+	///
+	/// This function will be called before we initialized any runtime state, aka `on_initialize`
+	/// wasn't called yet. So, information like the block number and any other
+	/// block local data are not accessible.
+	///
+	/// Return the non-negotiable weight consumed for runtime upgrade.
+	fn on_runtime_upgrade() -> crate::weights::Weight {
+		0
+	}
+
+	/// Execute some pre-checks prior to a runtime upgrade.
+	///
+	/// This hook is never meant to be executed on-chain but is meant to be used by testing tools.
+	#[cfg(feature = "try-runtime")]
+	fn pre_upgrade() -> Result<(), &'static str> { Ok(()) }
+
+	/// Execute some post-checks after a runtime upgrade.
+	///
+	/// This hook is never meant to be executed on-chain but is meant to be used by testing tools.
+	#[cfg(feature = "try-runtime")]
+	fn post_upgrade() -> Result<(), &'static str> { Ok(()) }
+}
+
+#[impl_for_tuples(30)]
+impl OnRuntimeUpgrade for Tuple {
+	fn on_runtime_upgrade() -> crate::weights::Weight {
+		let mut weight = 0;
+		for_tuples!( #( weight = weight.saturating_add(Tuple::on_runtime_upgrade()); )* );
+		weight
+	}
+
+	#[cfg(feature = "try-runtime")]
+	fn pre_upgrade() -> Result<(), &'static str> {
+		let mut result = Ok(());
+		for_tuples!( #( result = result.and(Tuple::pre_upgrade()); )* );
+		result
+	}
+
+	#[cfg(feature = "try-runtime")]
+	fn post_upgrade() -> Result<(), &'static str> {
+		let mut result = Ok(());
+		for_tuples!( #( result = result.and(Tuple::post_upgrade()); )* );
+		result
+	}
+}
+
+/// The pallet hooks trait. Implementing this lets you express some logic to execute.
+pub trait Hooks<BlockNumber> {
+	/// The block is being finalized. Implement to have something happen.
+	fn on_finalize(_n: BlockNumber) {}
+
+	/// This will be run when the block is being finalized (before `on_finalize`).
+	/// Implement to have something happen using the remaining weight.
+	/// Will not fire if the remaining weight is 0.
+	/// Return the weight used, the hook will subtract it from current weight used
+	/// and pass the result to the next `on_idle` hook if it exists.
+	fn on_idle(
+		_n: BlockNumber,
+		_remaining_weight: crate::weights::Weight
+	) -> crate::weights::Weight {
+		0
+	}
+
+	/// The block is being initialized. Implement to have something happen.
+	///
+	/// Return the non-negotiable weight consumed in the block.
+	fn on_initialize(_n: BlockNumber) -> crate::weights::Weight { 0 }
+
+	/// Perform a module upgrade.
+	///
+	/// NOTE: this doesn't include all pallet logic triggered on runtime upgrade. For instance it
+	/// doesn't include the write of the pallet version in storage. The final complete logic
+	/// triggered on runtime upgrade is given by implementation of `OnRuntimeUpgrade` trait by
+	/// `Pallet`.
+	///
+	/// # Warning
+	///
+	/// This function will be called before we initialized any runtime state, aka `on_initialize`
+	/// wasn't called yet. So, information like the block number and any other
+	/// block local data are not accessible.
+	///
+	/// Return the non-negotiable weight consumed for runtime upgrade.
+	fn on_runtime_upgrade() -> crate::weights::Weight { 0 }
+
+	/// Execute some pre-checks prior to a runtime upgrade.
+	///
+	/// This hook is never meant to be executed on-chain but is meant to be used by testing tools.
+	#[cfg(feature = "try-runtime")]
+	fn pre_upgrade() -> Result<(), &'static str> {
+		Ok(())
+	}
+
+	/// Execute some post-checks after a runtime upgrade.
+	///
+	/// This hook is never meant to be executed on-chain but is meant to be used by testing tools.
+	#[cfg(feature = "try-runtime")]
+	fn post_upgrade() -> Result<(), &'static str> {
+		Ok(())
+	}
+
+	/// Implementing this function on a module allows you to perform long-running tasks
+	/// that make (by default) validators generate transactions that feed results
+	/// of those long-running computations back on chain.
+	///
+	/// NOTE: This function runs off-chain, so it can access the block state,
+	/// but cannot preform any alterations. More specifically alterations are
+	/// not forbidden, but they are not persisted in any way after the worker
+	/// has finished.
+	///
+	/// This function is being called after every block import (when fully synced).
+	///
+	/// Implement this and use any of the `Offchain` `sp_io` set of APIs
+	/// to perform off-chain computations, calls and submit transactions
+	/// with results to trigger any on-chain changes.
+	/// Any state alterations are lost and are not persisted.
+	fn offchain_worker(_n: BlockNumber) {}
+
+	/// Run integrity test.
+	///
+	/// The test is not executed in a externalities provided environment.
+	fn integrity_test() {}
+}
+
+/// A trait to define the build function of a genesis config, T and I are placeholder for pallet
+/// trait and pallet instance.
+#[cfg(feature = "std")]
+pub trait GenesisBuild<T, I=()>: Default + MaybeSerializeDeserialize {
+	/// The build function is called within an externalities allowing storage APIs.
+	/// Thus one can write to storage using regular pallet storages.
+	fn build(&self);
+
+	/// Build the storage using `build` inside default storage.
+	fn build_storage(&self) -> Result<sp_runtime::Storage, String> {
+		let mut storage = Default::default();
+		self.assimilate_storage(&mut storage)?;
+		Ok(storage)
+	}
+
+	/// Assimilate the storage for this module into pre-existing overlays.
+	fn assimilate_storage(&self, storage: &mut sp_runtime::Storage) -> Result<(), String> {
+		sp_state_machine::BasicExternalities::execute_with_storage(storage, || {
+			self.build();
+			Ok(())
+		})
+	}
+}
+
+/// A trait which is called when the timestamp is set in the runtime.
+#[impl_for_tuples(30)]
+pub trait OnTimestampSet<Moment> {
+	/// Called when the timestamp is set.
+	fn on_timestamp_set(moment: Moment);
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use crate::traits::metadata::PalletVersion;
+
+	#[test]
+	fn on_initialize_and_on_runtime_upgrade_weight_merge_works() {
+		struct Test;
+		impl OnInitialize<u8> for Test {
+			fn on_initialize(_n: u8) -> crate::weights::Weight {
+				10
+			}
+		}
+		impl OnRuntimeUpgrade for Test {
+			fn on_runtime_upgrade() -> crate::weights::Weight {
+				20
+			}
+		}
+
+		assert_eq!(<(Test, Test)>::on_initialize(0), 20);
+		assert_eq!(<(Test, Test)>::on_runtime_upgrade(), 40);
+	}
+
+	#[test]
+	fn check_pallet_version_ordering() {
+		let version = PalletVersion::new(1, 0, 0);
+		assert!(version > PalletVersion::new(0, 1, 2));
+		assert!(version == PalletVersion::new(1, 0, 0));
+		assert!(version < PalletVersion::new(1, 0, 1));
+		assert!(version < PalletVersion::new(1, 1, 0));
+
+		let version = PalletVersion::new(2, 50, 50);
+		assert!(version < PalletVersion::new(2, 50, 51));
+		assert!(version > PalletVersion::new(2, 49, 51));
+		assert!(version < PalletVersion::new(3, 49, 51));
+	}
+}
diff --git a/frame/support/src/traits/members.rs b/frame/support/src/traits/members.rs
new file mode 100644
index 000000000000..d3ce6786af8c
--- /dev/null
+++ b/frame/support/src/traits/members.rs
@@ -0,0 +1,142 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Traits for dealing with the idea of membership.
+
+use sp_std::prelude::*;
+
+/// A trait for querying whether a type can be said to "contain" a value.
+pub trait Contains<T: Ord> {
+	/// Return `true` if this "contains" the given value `t`.
+	fn contains(t: &T) -> bool { Self::sorted_members().binary_search(t).is_ok() }
+
+	/// Get a vector of all members in the set, ordered.
+	fn sorted_members() -> Vec<T>;
+
+	/// Get the number of items in the set.
+	fn count() -> usize { Self::sorted_members().len() }
+
+	/// Add an item that would satisfy `contains`. It does not make sure any other
+	/// state is correctly maintained or generated.
+	///
+	/// **Should be used for benchmarking only!!!**
+	#[cfg(feature = "runtime-benchmarks")]
+	fn add(_t: &T) { unimplemented!() }
+}
+
+/// A trait for querying bound for the length of an implementation of `Contains`
+pub trait ContainsLengthBound {
+	/// Minimum number of elements contained
+	fn min_len() -> usize;
+	/// Maximum number of elements contained
+	fn max_len() -> usize;
+}
+
+/// Trait for type that can handle the initialization of account IDs at genesis.
+pub trait InitializeMembers<AccountId> {
+	/// Initialize the members to the given `members`.
+	fn initialize_members(members: &[AccountId]);
+}
+
+impl<T> InitializeMembers<T> for () {
+	fn initialize_members(_: &[T]) {}
+}
+
+/// Trait for type that can handle incremental changes to a set of account IDs.
+pub trait ChangeMembers<AccountId: Clone + Ord> {
+	/// A number of members `incoming` just joined the set and replaced some `outgoing` ones. The
+	/// new set is given by `new`, and need not be sorted.
+	///
+	/// This resets any previous value of prime.
+	fn change_members(incoming: &[AccountId], outgoing: &[AccountId], mut new: Vec<AccountId>) {
+		new.sort();
+		Self::change_members_sorted(incoming, outgoing, &new[..]);
+	}
+
+	/// A number of members `_incoming` just joined the set and replaced some `_outgoing` ones. The
+	/// new set is thus given by `sorted_new` and **must be sorted**.
+	///
+	/// NOTE: This is the only function that needs to be implemented in `ChangeMembers`.
+	///
+	/// This resets any previous value of prime.
+	fn change_members_sorted(
+		incoming: &[AccountId],
+		outgoing: &[AccountId],
+		sorted_new: &[AccountId],
+	);
+
+	/// Set the new members; they **must already be sorted**. This will compute the diff and use it to
+	/// call `change_members_sorted`.
+	///
+	/// This resets any previous value of prime.
+	fn set_members_sorted(new_members: &[AccountId], old_members: &[AccountId]) {
+		let (incoming, outgoing) = Self::compute_members_diff_sorted(new_members, old_members);
+		Self::change_members_sorted(&incoming[..], &outgoing[..], &new_members);
+	}
+
+	/// Compute diff between new and old members; they **must already be sorted**.
+	///
+	/// Returns incoming and outgoing members.
+	fn compute_members_diff_sorted(
+		new_members: &[AccountId],
+		old_members: &[AccountId],
+	) -> (Vec<AccountId>, Vec<AccountId>) {
+		let mut old_iter = old_members.iter();
+		let mut new_iter = new_members.iter();
+		let mut incoming = Vec::new();
+		let mut outgoing = Vec::new();
+		let mut old_i = old_iter.next();
+		let mut new_i = new_iter.next();
+		loop {
+			match (old_i, new_i) {
+				(None, None) => break,
+				(Some(old), Some(new)) if old == new => {
+					old_i = old_iter.next();
+					new_i = new_iter.next();
+				}
+				(Some(old), Some(new)) if old < new => {
+					outgoing.push(old.clone());
+					old_i = old_iter.next();
+				}
+				(Some(old), None) => {
+					outgoing.push(old.clone());
+					old_i = old_iter.next();
+				}
+				(_, Some(new)) => {
+					incoming.push(new.clone());
+					new_i = new_iter.next();
+				}
+			}
+		}
+		(incoming, outgoing)
+	}
+
+	/// Set the prime member.
+	fn set_prime(_prime: Option<AccountId>) {}
+
+	/// Get the current prime.
+	fn get_prime() -> Option<AccountId> {
+		None
+	}
+}
+
+impl<T: Clone + Ord> ChangeMembers<T> for () {
+	fn change_members(_: &[T], _: &[T], _: Vec<T>) {}
+	fn change_members_sorted(_: &[T], _: &[T], _: &[T]) {}
+	fn set_members_sorted(_: &[T], _: &[T]) {}
+	fn set_prime(_: Option<T>) {}
+}
diff --git a/frame/support/src/traits/metadata.rs b/frame/support/src/traits/metadata.rs
new file mode 100644
index 000000000000..ff4507dce9c9
--- /dev/null
+++ b/frame/support/src/traits/metadata.rs
@@ -0,0 +1,168 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Traits for managing information attached to pallets and their constituents.
+
+use codec::{Encode, Decode};
+use sp_runtime::RuntimeDebug;
+
+/// Provides information about the pallet setup in the runtime.
+///
+/// An implementor should be able to provide information about each pallet that
+/// is configured in `construct_runtime!`.
+pub trait PalletInfo {
+	/// Convert the given pallet `P` into its index as configured in the runtime.
+	fn index<P: 'static>() -> Option<usize>;
+	/// Convert the given pallet `P` into its name as configured in the runtime.
+	fn name<P: 'static>() -> Option<&'static str>;
+}
+
+/// The function and pallet name of the Call.
+#[derive(Clone, Eq, PartialEq, Default, RuntimeDebug)]
+pub struct CallMetadata {
+	/// Name of the function.
+	pub function_name: &'static str,
+	/// Name of the pallet to which the function belongs.
+	pub pallet_name: &'static str,
+}
+
+/// Gets the function name of the Call.
+pub trait GetCallName {
+	/// Return all function names.
+	fn get_call_names() -> &'static [&'static str];
+	/// Return the function name of the Call.
+	fn get_call_name(&self) -> &'static str;
+}
+
+/// Gets the metadata for the Call - function name and pallet name.
+pub trait GetCallMetadata {
+	/// Return all module names.
+	fn get_module_names() -> &'static [&'static str];
+	/// Return all function names for the given `module`.
+	fn get_call_names(module: &str) -> &'static [&'static str];
+	/// Return a [`CallMetadata`], containing function and pallet name of the Call.
+	fn get_call_metadata(&self) -> CallMetadata;
+}
+
+/// The storage key postfix that is used to store the [`PalletVersion`] per pallet.
+///
+/// The full storage key is built by using:
+/// Twox128([`PalletInfo::name`]) ++ Twox128([`PALLET_VERSION_STORAGE_KEY_POSTFIX`])
+pub const PALLET_VERSION_STORAGE_KEY_POSTFIX: &[u8] = b":__PALLET_VERSION__:";
+
+/// The version of a pallet.
+///
+/// Each pallet version is stored in the state under a fixed key. See
+/// [`PALLET_VERSION_STORAGE_KEY_POSTFIX`] for how this key is built.
+#[derive(RuntimeDebug, Eq, PartialEq, Encode, Decode, Ord, Clone, Copy)]
+pub struct PalletVersion {
+	/// The major version of the pallet.
+	pub major: u16,
+	/// The minor version of the pallet.
+	pub minor: u8,
+	/// The patch version of the pallet.
+	pub patch: u8,
+}
+
+impl PalletVersion {
+	/// Creates a new instance of `Self`.
+	pub fn new(major: u16, minor: u8, patch: u8) -> Self {
+		Self {
+			major,
+			minor,
+			patch,
+		}
+	}
+
+	/// Returns the storage key for a pallet version.
+	///
+	/// See [`PALLET_VERSION_STORAGE_KEY_POSTFIX`] on how this key is built.
+	///
+	/// Returns `None` if the given `PI` returned a `None` as name for the given
+	/// `Pallet`.
+	pub fn storage_key<PI: PalletInfo, Pallet: 'static>() -> Option<[u8; 32]> {
+		let pallet_name = PI::name::<Pallet>()?;
+
+		let pallet_name = sp_io::hashing::twox_128(pallet_name.as_bytes());
+		let postfix = sp_io::hashing::twox_128(PALLET_VERSION_STORAGE_KEY_POSTFIX);
+
+		let mut final_key = [0u8; 32];
+		final_key[..16].copy_from_slice(&pallet_name);
+		final_key[16..].copy_from_slice(&postfix);
+
+		Some(final_key)
+	}
+
+	/// Put this pallet version into the storage.
+	///
+	/// It will use the storage key that is associated with the given `Pallet`.
+	///
+	/// # Panics
+	///
+	/// This function will panic iff `Pallet` can not be found by `PalletInfo`.
+	/// In a runtime that is put together using
+	/// [`construct_runtime!`](crate::construct_runtime) this should never happen.
+	///
+	/// It will also panic if this function isn't executed in an externalities
+	/// provided environment.
+	pub fn put_into_storage<PI: PalletInfo, Pallet: 'static>(&self) {
+		let key = Self::storage_key::<PI, Pallet>()
+			.expect("Every active pallet has a name in the runtime; qed");
+
+		crate::storage::unhashed::put(&key, self);
+	}
+}
+
+impl sp_std::cmp::PartialOrd for PalletVersion {
+	fn partial_cmp(&self, other: &Self) -> Option<sp_std::cmp::Ordering> {
+		let res = self.major
+			.cmp(&other.major)
+			.then_with(||
+				self.minor
+					.cmp(&other.minor)
+					.then_with(|| self.patch.cmp(&other.patch)
+					));
+
+		Some(res)
+	}
+}
+
+/// Provides version information about a pallet.
+///
+/// This trait provides two functions for returning the version of a
+/// pallet. There is a state where both functions can return distinct versions.
+/// See [`GetPalletVersion::storage_version`] for more information about this.
+pub trait GetPalletVersion {
+	/// Returns the current version of the pallet.
+	fn current_version() -> PalletVersion;
+
+	/// Returns the version of the pallet that is stored in storage.
+	///
+	/// Most of the time this will return the exact same version as
+	/// [`GetPalletVersion::current_version`]. Only when being in
+	/// a state after a runtime upgrade happened and the pallet did
+	/// not yet updated its version in storage, this will return a
+	/// different(the previous, seen from the time of calling) version.
+	///
+	/// See [`PalletVersion`] for more information.
+	///
+	/// # Note
+	///
+	/// If there was no previous version of the pallet stored in the state,
+	/// this function returns `None`.
+	fn storage_version() -> Option<PalletVersion>;
+}
diff --git a/frame/support/src/traits/misc.rs b/frame/support/src/traits/misc.rs
new file mode 100644
index 000000000000..2f219942907d
--- /dev/null
+++ b/frame/support/src/traits/misc.rs
@@ -0,0 +1,271 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Smaller traits used in FRAME which don't need their own file.
+
+use sp_runtime::traits::{StoredMapError, Block as BlockT};
+use sp_arithmetic::traits::AtLeast32Bit;
+use crate::dispatch::Parameter;
+
+/// Anything that can have a `::len()` method.
+pub trait Len {
+	/// Return the length of data type.
+	fn len(&self) -> usize;
+}
+
+impl<T: IntoIterator + Clone,> Len for T where <T as IntoIterator>::IntoIter: ExactSizeIterator {
+	fn len(&self) -> usize {
+		self.clone().into_iter().len()
+	}
+}
+
+/// A trait for querying a single value from a type.
+///
+/// It is not required that the value is constant.
+pub trait Get<T> {
+	/// Return the current value.
+	fn get() -> T;
+}
+
+impl<T: Default> Get<T> for () {
+	fn get() -> T { T::default() }
+}
+
+/// Implement Get by returning Default for any type that implements Default.
+pub struct GetDefault;
+impl<T: Default> Get<T> for GetDefault {
+	fn get() -> T {
+		T::default()
+	}
+}
+
+/// A type for which some values make sense to be able to drop without further consideration.
+pub trait TryDrop: Sized {
+	/// Drop an instance cleanly. Only works if its value represents "no-operation".
+	fn try_drop(self) -> Result<(), Self>;
+}
+
+/// Return type used when we need to return one of two items, each of the opposite direction or
+/// sign, with one (`Same`) being of the same type as the `self` or primary argument of the function
+/// that returned it.
+pub enum SameOrOther<A, B> {
+	/// No item.
+	None,
+	/// An item of the same type as the `Self` on which the return function was called.
+	Same(A),
+	/// An item of the opposite type to the `Self` on which the return function was called.
+	Other(B),
+}
+
+impl<A, B> TryDrop for SameOrOther<A, B> {
+	fn try_drop(self) -> Result<(), Self> {
+		if let SameOrOther::None = self {
+			Ok(())
+		} else {
+			Err(self)
+		}
+	}
+}
+
+impl<A, B> SameOrOther<A, B> {
+	/// Returns `Ok` with the inner value of `Same` if `self` is that, otherwise returns `Err` with
+	/// `self`.
+	pub fn try_same(self) -> Result<A, Self> {
+		match self {
+			SameOrOther::Same(a) => Ok(a),
+			x => Err(x),
+		}
+	}
+
+	/// Returns `Ok` with the inner value of `Other` if `self` is that, otherwise returns `Err` with
+	/// `self`.
+	pub fn try_other(self) -> Result<B, Self> {
+		match self {
+			SameOrOther::Other(b) => Ok(b),
+			x => Err(x),
+		}
+	}
+
+	/// Returns `Ok` if `self` is `None`, otherwise returns `Err` with `self`.
+	pub fn try_none(self) -> Result<(), Self> {
+		match self {
+			SameOrOther::None => Ok(()),
+			x => Err(x),
+		}
+	}
+
+	pub fn same(self) -> Result<A, B> where A: Default {
+		match self {
+			SameOrOther::Same(a) => Ok(a),
+			SameOrOther::None => Ok(A::default()),
+			SameOrOther::Other(b) => Err(b),
+		}
+	}
+
+	pub fn other(self) -> Result<B, A> where B: Default {
+		match self {
+			SameOrOther::Same(a) => Err(a),
+			SameOrOther::None => Ok(B::default()),
+			SameOrOther::Other(b) => Ok(b),
+		}
+	}
+}
+
+/// Handler for when a new account has been created.
+#[impl_trait_for_tuples::impl_for_tuples(30)]
+pub trait OnNewAccount<AccountId> {
+	/// A new account `who` has been registered.
+	fn on_new_account(who: &AccountId);
+}
+
+/// The account with the given id was reaped.
+#[impl_trait_for_tuples::impl_for_tuples(30)]
+pub trait OnKilledAccount<AccountId> {
+	/// The account with the given id was reaped.
+	fn on_killed_account(who: &AccountId);
+}
+
+/// A simple, generic one-parameter event notifier/handler.
+pub trait HandleLifetime<T> {
+	/// An account was created.
+	fn created(_t: &T) -> Result<(), StoredMapError> { Ok(()) }
+
+	/// An account was killed.
+	fn killed(_t: &T) -> Result<(), StoredMapError> { Ok(()) }
+}
+
+impl<T> HandleLifetime<T> for () {}
+
+pub trait Time {
+	type Moment: AtLeast32Bit + Parameter + Default + Copy;
+
+	fn now() -> Self::Moment;
+}
+
+/// Trait to deal with unix time.
+pub trait UnixTime {
+	/// Return duration since `SystemTime::UNIX_EPOCH`.
+	fn now() -> core::time::Duration;
+}
+
+/// Trait to be used when types are exactly same.
+///
+/// This allow to convert back and forth from type, a reference and a mutable reference.
+pub trait IsType<T>: Into<T> + From<T> {
+	/// Cast reference.
+	fn from_ref(t: &T) -> &Self;
+
+	/// Cast reference.
+	fn into_ref(&self) -> &T;
+
+	/// Cast mutable reference.
+	fn from_mut(t: &mut T) -> &mut Self;
+
+	/// Cast mutable reference.
+	fn into_mut(&mut self) -> &mut T;
+}
+
+impl<T> IsType<T> for T {
+	fn from_ref(t: &T) -> &Self { t }
+	fn into_ref(&self) -> &T { self }
+	fn from_mut(t: &mut T) -> &mut Self { t }
+	fn into_mut(&mut self) -> &mut T { self }
+}
+
+/// Something that can be checked to be a of sub type `T`.
+///
+/// This is useful for enums where each variant encapsulates a different sub type, and
+/// you need access to these sub types.
+///
+/// For example, in FRAME, this trait is implemented for the runtime `Call` enum. Pallets use this
+/// to check if a certain call is an instance of the local pallet's `Call` enum.
+///
+/// # Example
+///
+/// ```
+/// # use frame_support::traits::IsSubType;
+///
+/// enum Test {
+///     String(String),
+///     U32(u32),
+/// }
+///
+/// impl IsSubType<String> for Test {
+///     fn is_sub_type(&self) -> Option<&String> {
+///         match self {
+///             Self::String(ref r) => Some(r),
+///             _ => None,
+///         }
+///     }
+/// }
+///
+/// impl IsSubType<u32> for Test {
+///     fn is_sub_type(&self) -> Option<&u32> {
+///         match self {
+///             Self::U32(ref r) => Some(r),
+///             _ => None,
+///         }
+///     }
+/// }
+///
+/// fn main() {
+///     let data = Test::String("test".into());
+///
+///     assert_eq!("test", IsSubType::<String>::is_sub_type(&data).unwrap().as_str());
+/// }
+/// ```
+pub trait IsSubType<T> {
+	/// Returns `Some(_)` if `self` is an instance of sub type `T`.
+	fn is_sub_type(&self) -> Option<&T>;
+}
+
+/// Something that can execute a given block.
+///
+/// Executing a block means that all extrinsics in a given block will be executed and the resulting
+/// header will be checked against the header of the given block.
+pub trait ExecuteBlock<Block: BlockT> {
+	/// Execute the given `block`.
+	///
+	/// This will execute all extrinsics in the block and check that the resulting header is correct.
+	///
+	/// # Panic
+	///
+	/// Panics when an extrinsics panics or the resulting header doesn't match the expected header.
+	fn execute_block(block: Block);
+}
+
+/// Off-chain computation trait.
+///
+/// Implementing this trait on a module allows you to perform long-running tasks
+/// that make (by default) validators generate transactions that feed results
+/// of those long-running computations back on chain.
+///
+/// NOTE: This function runs off-chain, so it can access the block state,
+/// but cannot preform any alterations. More specifically alterations are
+/// not forbidden, but they are not persisted in any way after the worker
+/// has finished.
+#[impl_trait_for_tuples::impl_for_tuples(30)]
+pub trait OffchainWorker<BlockNumber> {
+	/// This function is being called after every block import (when fully synced).
+	///
+	/// Implement this and use any of the `Offchain` `sp_io` set of APIs
+	/// to perform off-chain computations, calls and submit transactions
+	/// with results to trigger any on-chain changes.
+	/// Any state alterations are lost and are not persisted.
+	fn offchain_worker(_n: BlockNumber) {}
+}
+
diff --git a/frame/support/src/traits/randomness.rs b/frame/support/src/traits/randomness.rs
new file mode 100644
index 000000000000..865893f99b39
--- /dev/null
+++ b/frame/support/src/traits/randomness.rs
@@ -0,0 +1,54 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Traits for dealing with on-chain randomness.
+
+/// A trait that is able to provide randomness.
+///
+/// Being a deterministic blockchain, real randomness is difficult to come by, different
+/// implementations of this trait will provide different security guarantees. At best,
+/// this will be randomness which was hard to predict a long time ago, but that has become
+/// easy to predict recently.
+pub trait Randomness<Output, BlockNumber> {
+	/// Get the most recently determined random seed, along with the time in the past
+	/// since when it was determinable by chain observers.
+	///
+	/// `subject` is a context identifier and allows you to get a different result to
+	/// other callers of this function; use it like `random(&b"my context"[..])`.
+	///
+	/// NOTE: The returned seed should only be used to distinguish commitments made before
+	/// the returned block number. If the block number is too early (i.e. commitments were
+	/// made afterwards), then ensure no further commitments may be made and repeatedly
+	/// call this on later blocks until the block number returned is later than the latest
+	/// commitment.
+	fn random(subject: &[u8]) -> (Output, BlockNumber);
+
+	/// Get the basic random seed.
+	///
+	/// In general you won't want to use this, but rather `Self::random` which allows
+	/// you to give a subject for the random result and whose value will be
+	/// independently low-influence random from any other such seeds.
+	///
+	/// NOTE: The returned seed should only be used to distinguish commitments made before
+	/// the returned block number. If the block number is too early (i.e. commitments were
+	/// made afterwards), then ensure no further commitments may be made and repeatedly
+	/// call this on later blocks until the block number returned is later than the latest
+	/// commitment.
+	fn random_seed() -> (Output, BlockNumber) {
+		Self::random(&[][..])
+	}
+}
diff --git a/frame/support/src/traits/schedule.rs b/frame/support/src/traits/schedule.rs
new file mode 100644
index 000000000000..58e4c419f281
--- /dev/null
+++ b/frame/support/src/traits/schedule.rs
@@ -0,0 +1,133 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Traits and associated utilities for scheduling dispatchables in FRAME.
+
+use sp_std::{prelude::*, fmt::Debug};
+use codec::{Encode, Decode, Codec, EncodeLike};
+use sp_runtime::{RuntimeDebug, DispatchError};
+
+/// Information relating to the period of a scheduled task. First item is the length of the
+/// period and the second is the number of times it should be executed in total before the task
+/// is considered finished and removed.
+pub type Period<BlockNumber> = (BlockNumber, u32);
+
+/// Priority with which a call is scheduled. It's just a linear amount with lowest values meaning
+/// higher priority.
+pub type Priority = u8;
+
+/// The dispatch time of a scheduled task.
+#[derive(Encode, Decode, Copy, Clone, PartialEq, Eq, RuntimeDebug)]
+pub enum DispatchTime<BlockNumber> {
+	/// At specified block.
+	At(BlockNumber),
+	/// After specified number of blocks.
+	After(BlockNumber),
+}
+
+/// The highest priority. We invert the value so that normal sorting will place the highest
+/// priority at the beginning of the list.
+pub const HIGHEST_PRIORITY: Priority = 0;
+/// Anything of this value or lower will definitely be scheduled on the block that they ask for, even
+/// if it breaches the `MaximumWeight` limitation.
+pub const HARD_DEADLINE: Priority = 63;
+/// The lowest priority. Most stuff should be around here.
+pub const LOWEST_PRIORITY: Priority = 255;
+
+/// A type that can be used as a scheduler.
+pub trait Anon<BlockNumber, Call, Origin> {
+	/// An address which can be used for removing a scheduled task.
+	type Address: Codec + Clone + Eq + EncodeLike + Debug;
+
+	/// Schedule a dispatch to happen at the beginning of some block in the future.
+	///
+	/// This is not named.
+	fn schedule(
+		when: DispatchTime<BlockNumber>,
+		maybe_periodic: Option<Period<BlockNumber>>,
+		priority: Priority,
+		origin: Origin,
+		call: Call
+	) -> Result<Self::Address, DispatchError>;
+
+	/// Cancel a scheduled task. If periodic, then it will cancel all further instances of that,
+	/// also.
+	///
+	/// Will return an error if the `address` is invalid.
+	///
+	/// NOTE: This guaranteed to work only *before* the point that it is due to be executed.
+	/// If it ends up being delayed beyond the point of execution, then it cannot be cancelled.
+	///
+	/// NOTE2: This will not work to cancel periodic tasks after their initial execution. For
+	/// that, you must name the task explicitly using the `Named` trait.
+	fn cancel(address: Self::Address) -> Result<(), ()>;
+
+	/// Reschedule a task. For one-off tasks, this dispatch is guaranteed to succeed
+	/// only if it is executed *before* the currently scheduled block. For periodic tasks,
+	/// this dispatch is guaranteed to succeed only before the *initial* execution; for
+	/// others, use `reschedule_named`.
+	///
+	/// Will return an error if the `address` is invalid.
+	fn reschedule(
+		address: Self::Address,
+		when: DispatchTime<BlockNumber>,
+	) -> Result<Self::Address, DispatchError>;
+
+	/// Return the next dispatch time for a given task.
+	///
+	/// Will return an error if the `address` is invalid.
+	fn next_dispatch_time(address: Self::Address) -> Result<BlockNumber, ()>;
+}
+
+/// A type that can be used as a scheduler.
+pub trait Named<BlockNumber, Call, Origin> {
+	/// An address which can be used for removing a scheduled task.
+	type Address: Codec + Clone + Eq + EncodeLike + sp_std::fmt::Debug;
+
+	/// Schedule a dispatch to happen at the beginning of some block in the future.
+	///
+	/// - `id`: The identity of the task. This must be unique and will return an error if not.
+	fn schedule_named(
+		id: Vec<u8>,
+		when: DispatchTime<BlockNumber>,
+		maybe_periodic: Option<Period<BlockNumber>>,
+		priority: Priority,
+		origin: Origin,
+		call: Call
+	) -> Result<Self::Address, ()>;
+
+	/// Cancel a scheduled, named task. If periodic, then it will cancel all further instances
+	/// of that, also.
+	///
+	/// Will return an error if the `id` is invalid.
+	///
+	/// NOTE: This guaranteed to work only *before* the point that it is due to be executed.
+	/// If it ends up being delayed beyond the point of execution, then it cannot be cancelled.
+	fn cancel_named(id: Vec<u8>) -> Result<(), ()>;
+
+	/// Reschedule a task. For one-off tasks, this dispatch is guaranteed to succeed
+	/// only if it is executed *before* the currently scheduled block.
+	fn reschedule_named(
+		id: Vec<u8>,
+		when: DispatchTime<BlockNumber>,
+	) -> Result<Self::Address, DispatchError>;
+
+	/// Return the next dispatch time for a given task.
+	///
+	/// Will return an error if the `id` is invalid.
+	fn next_dispatch_time(id: Vec<u8>) -> Result<BlockNumber, ()>;
+}
diff --git a/frame/support/src/traits/storage.rs b/frame/support/src/traits/storage.rs
new file mode 100644
index 000000000000..82e9c1e7a60f
--- /dev/null
+++ b/frame/support/src/traits/storage.rs
@@ -0,0 +1,45 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Traits for encoding data related to pallet's storage items.
+
+/// An instance of a pallet in the storage.
+///
+/// It is required that these instances are unique, to support multiple instances per pallet in the same runtime!
+///
+/// E.g. for module MyModule default instance will have prefix "MyModule" and other instances
+/// "InstanceNMyModule".
+pub trait Instance: 'static {
+	/// Unique module prefix. E.g. "InstanceNMyModule" or "MyModule"
+	const PREFIX: &'static str;
+}
+
+/// An instance of a storage in a pallet.
+///
+/// Define an instance for an individual storage inside a pallet.
+/// The pallet prefix is used to isolate the storage between pallets, and the storage prefix is
+/// used to isolate storages inside a pallet.
+///
+/// NOTE: These information can be used to define storages in pallet such as a `StorageMap` which
+/// can use keys after `twox_128(pallet_prefix())++twox_128(STORAGE_PREFIX)`
+pub trait StorageInstance {
+	/// Prefix of a pallet to isolate it from other pallets.
+	fn pallet_prefix() -> &'static str;
+
+	/// Prefix given to a storage to isolate from other storages in the pallet.
+	const STORAGE_PREFIX: &'static str;
+}
diff --git a/frame/support/src/traits/stored_map.rs b/frame/support/src/traits/stored_map.rs
new file mode 100644
index 000000000000..10964541ab32
--- /dev/null
+++ b/frame/support/src/traits/stored_map.rs
@@ -0,0 +1,141 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Traits and associated datatypes for managing abstract stored values.
+
+use codec::FullCodec;
+use sp_runtime::traits::StoredMapError;
+use crate::storage::StorageMap;
+use crate::traits::misc::HandleLifetime;
+
+/// An abstraction of a value stored within storage, but possibly as part of a larger composite
+/// item.
+pub trait StoredMap<K, T: Default> {
+	/// Get the item, or its default if it doesn't yet exist; we make no distinction between the
+	/// two.
+	fn get(k: &K) -> T;
+
+	/// Maybe mutate the item only if an `Ok` value is returned from `f`. Do nothing if an `Err` is
+	/// returned. It is removed or reset to default value if it has been mutated to `None`
+	fn try_mutate_exists<R, E: From<StoredMapError>>(
+		k: &K,
+		f: impl FnOnce(&mut Option<T>) -> Result<R, E>,
+	) -> Result<R, E>;
+
+	// Everything past here has a default implementation.
+
+	/// Mutate the item.
+	fn mutate<R>(k: &K, f: impl FnOnce(&mut T) -> R) -> Result<R, StoredMapError> {
+		Self::mutate_exists(k, |maybe_account| match maybe_account {
+			Some(ref mut account) => f(account),
+			x @ None => {
+				let mut account = Default::default();
+				let r = f(&mut account);
+				*x = Some(account);
+				r
+			}
+		})
+	}
+
+	/// Mutate the item, removing or resetting to default value if it has been mutated to `None`.
+	///
+	/// This is infallible as long as the value does not get destroyed.
+	fn mutate_exists<R>(
+		k: &K,
+		f: impl FnOnce(&mut Option<T>) -> R,
+	) -> Result<R, StoredMapError> {
+		Self::try_mutate_exists(k, |x| -> Result<R, StoredMapError> { Ok(f(x)) })
+	}
+
+	/// Set the item to something new.
+	fn insert(k: &K, t: T) -> Result<(), StoredMapError> { Self::mutate(k, |i| *i = t) }
+
+	/// Remove the item or otherwise replace it with its default value; we don't care which.
+	fn remove(k: &K) -> Result<(), StoredMapError> { Self::mutate_exists(k, |x| *x = None) }
+}
+
+/// A shim for placing around a storage item in order to use it as a `StoredValue`. Ideally this
+/// wouldn't be needed as `StorageValue`s should blanket implement `StoredValue`s, however this
+/// would break the ability to have custom impls of `StoredValue`. The other workaround is to
+/// implement it directly in the macro.
+///
+/// This form has the advantage that two additional types are provides, `Created` and `Removed`,
+/// which are both generic events that can be tied to handlers to do something in the case of being
+/// about to create an account where one didn't previously exist (at all; not just where it used to
+/// be the default value), or where the account is being removed or reset back to the default value
+/// where previously it did exist (though may have been in a default state). This works well with
+/// system module's `CallOnCreatedAccount` and `CallKillAccount`.
+pub struct StorageMapShim<S, L, K, T>(sp_std::marker::PhantomData<(S, L, K, T)>);
+impl<
+	S: StorageMap<K, T, Query=T>,
+	L: HandleLifetime<K>,
+	K: FullCodec,
+	T: FullCodec + Default,
+> StoredMap<K, T> for StorageMapShim<S, L, K, T> {
+	fn get(k: &K) -> T { S::get(k) }
+	fn insert(k: &K, t: T) -> Result<(), StoredMapError> {
+		if !S::contains_key(&k) {
+			L::created(k)?;
+		}
+		S::insert(k, t);
+		Ok(())
+	}
+	fn remove(k: &K) -> Result<(), StoredMapError> {
+		if S::contains_key(&k) {
+			L::killed(&k)?;
+			S::remove(k);
+		}
+		Ok(())
+	}
+	fn mutate<R>(k: &K, f: impl FnOnce(&mut T) -> R) -> Result<R, StoredMapError> {
+		if !S::contains_key(&k) {
+			L::created(k)?;
+		}
+		Ok(S::mutate(k, f))
+	}
+	fn mutate_exists<R>(k: &K, f: impl FnOnce(&mut Option<T>) -> R) -> Result<R, StoredMapError> {
+		S::try_mutate_exists(k, |maybe_value| {
+			let existed = maybe_value.is_some();
+			let r = f(maybe_value);
+			let exists = maybe_value.is_some();
+
+			if !existed && exists {
+				L::created(k)?;
+			} else if existed && !exists {
+				L::killed(k)?;
+			}
+			Ok(r)
+		})
+	}
+	fn try_mutate_exists<R, E: From<StoredMapError>>(
+		k: &K,
+		f: impl FnOnce(&mut Option<T>) -> Result<R, E>,
+	) -> Result<R, E> {
+		S::try_mutate_exists(k, |maybe_value| {
+			let existed = maybe_value.is_some();
+			let r = f(maybe_value)?;
+			let exists = maybe_value.is_some();
+
+			if !existed && exists {
+				L::created(k).map_err(E::from)?;
+			} else if existed && !exists {
+				L::killed(k).map_err(E::from)?;
+			}
+			Ok(r)
+		})
+	}
+}
diff --git a/frame/support/src/traits/tokens.rs b/frame/support/src/traits/tokens.rs
new file mode 100644
index 000000000000..82af5dbade8f
--- /dev/null
+++ b/frame/support/src/traits/tokens.rs
@@ -0,0 +1,28 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Traits for working with tokens and their associated datastructures.
+
+pub mod fungible;
+pub mod fungibles;
+pub mod currency;
+pub mod imbalance;
+mod misc;
+pub use misc::{
+	WithdrawConsequence, DepositConsequence, ExistenceRequirement, BalanceStatus, WithdrawReasons,
+};
+pub use imbalance::Imbalance;
diff --git a/frame/support/src/traits/tokens/currency.rs b/frame/support/src/traits/tokens/currency.rs
new file mode 100644
index 000000000000..567ca44aa78c
--- /dev/null
+++ b/frame/support/src/traits/tokens/currency.rs
@@ -0,0 +1,208 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! The Currency trait and associated types.
+
+use sp_std::fmt::Debug;
+use sp_runtime::traits::MaybeSerializeDeserialize;
+use crate::dispatch::{DispatchResult, DispatchError};
+use super::misc::{Balance, WithdrawReasons, ExistenceRequirement};
+use super::imbalance::{Imbalance, SignedImbalance};
+
+
+mod reservable;
+pub use reservable::ReservableCurrency;
+mod lockable;
+pub use lockable::{LockableCurrency, VestingSchedule, LockIdentifier};
+
+/// Abstraction over a fungible assets system.
+pub trait Currency<AccountId> {
+	/// The balance of an account.
+	type Balance: Balance + MaybeSerializeDeserialize + Debug;
+
+	/// The opaque token type for an imbalance. This is returned by unbalanced operations
+	/// and must be dealt with. It may be dropped but cannot be cloned.
+	type PositiveImbalance: Imbalance<Self::Balance, Opposite=Self::NegativeImbalance>;
+
+	/// The opaque token type for an imbalance. This is returned by unbalanced operations
+	/// and must be dealt with. It may be dropped but cannot be cloned.
+	type NegativeImbalance: Imbalance<Self::Balance, Opposite=Self::PositiveImbalance>;
+
+	// PUBLIC IMMUTABLES
+
+	/// The combined balance of `who`.
+	fn total_balance(who: &AccountId) -> Self::Balance;
+
+	/// Same result as `slash(who, value)` (but without the side-effects) assuming there are no
+	/// balance changes in the meantime and only the reserved balance is not taken into account.
+	fn can_slash(who: &AccountId, value: Self::Balance) -> bool;
+
+	/// The total amount of issuance in the system.
+	fn total_issuance() -> Self::Balance;
+
+	/// The minimum balance any single account may have. This is equivalent to the `Balances` module's
+	/// `ExistentialDeposit`.
+	fn minimum_balance() -> Self::Balance;
+
+	/// Reduce the total issuance by `amount` and return the according imbalance. The imbalance will
+	/// typically be used to reduce an account by the same amount with e.g. `settle`.
+	///
+	/// This is infallible, but doesn't guarantee that the entire `amount` is burnt, for example
+	/// in the case of underflow.
+	fn burn(amount: Self::Balance) -> Self::PositiveImbalance;
+
+	/// Increase the total issuance by `amount` and return the according imbalance. The imbalance
+	/// will typically be used to increase an account by the same amount with e.g.
+	/// `resolve_into_existing` or `resolve_creating`.
+	///
+	/// This is infallible, but doesn't guarantee that the entire `amount` is issued, for example
+	/// in the case of overflow.
+	fn issue(amount: Self::Balance) -> Self::NegativeImbalance;
+
+	/// Produce a pair of imbalances that cancel each other out exactly.
+	///
+	/// This is just the same as burning and issuing the same amount and has no effect on the
+	/// total issuance.
+	fn pair(amount: Self::Balance) -> (Self::PositiveImbalance, Self::NegativeImbalance) {
+		(Self::burn(amount.clone()), Self::issue(amount))
+	}
+
+	/// The 'free' balance of a given account.
+	///
+	/// This is the only balance that matters in terms of most operations on tokens. It alone
+	/// is used to determine the balance when in the contract execution environment. When this
+	/// balance falls below the value of `ExistentialDeposit`, then the 'current account' is
+	/// deleted: specifically `FreeBalance`.
+	///
+	/// `system::AccountNonce` is also deleted if `ReservedBalance` is also zero (it also gets
+	/// collapsed to zero if it ever becomes less than `ExistentialDeposit`.
+	fn free_balance(who: &AccountId) -> Self::Balance;
+
+	/// Returns `Ok` iff the account is able to make a withdrawal of the given amount
+	/// for the given reason. Basically, it's just a dry-run of `withdraw`.
+	///
+	/// `Err(...)` with the reason why not otherwise.
+	fn ensure_can_withdraw(
+		who: &AccountId,
+		_amount: Self::Balance,
+		reasons: WithdrawReasons,
+		new_balance: Self::Balance,
+	) -> DispatchResult;
+
+	// PUBLIC MUTABLES (DANGEROUS)
+
+	/// Transfer some liquid free balance to another staker.
+	///
+	/// This is a very high-level function. It will ensure all appropriate fees are paid
+	/// and no imbalance in the system remains.
+	fn transfer(
+		source: &AccountId,
+		dest: &AccountId,
+		value: Self::Balance,
+		existence_requirement: ExistenceRequirement,
+	) -> DispatchResult;
+
+	/// Deducts up to `value` from the combined balance of `who`, preferring to deduct from the
+	/// free balance. This function cannot fail.
+	///
+	/// The resulting imbalance is the first item of the tuple returned.
+	///
+	/// As much funds up to `value` will be deducted as possible. If this is less than `value`,
+	/// then a non-zero second item will be returned.
+	fn slash(
+		who: &AccountId,
+		value: Self::Balance
+	) -> (Self::NegativeImbalance, Self::Balance);
+
+	/// Mints `value` to the free balance of `who`.
+	///
+	/// If `who` doesn't exist, nothing is done and an Err returned.
+	fn deposit_into_existing(
+		who: &AccountId,
+		value: Self::Balance
+	) -> Result<Self::PositiveImbalance, DispatchError>;
+
+	/// Similar to deposit_creating, only accepts a `NegativeImbalance` and returns nothing on
+	/// success.
+	fn resolve_into_existing(
+		who: &AccountId,
+		value: Self::NegativeImbalance,
+	) -> Result<(), Self::NegativeImbalance> {
+		let v = value.peek();
+		match Self::deposit_into_existing(who, v) {
+			Ok(opposite) => Ok(drop(value.offset(opposite))),
+			_ => Err(value),
+		}
+	}
+
+	/// Adds up to `value` to the free balance of `who`. If `who` doesn't exist, it is created.
+	///
+	/// Infallible.
+	fn deposit_creating(
+		who: &AccountId,
+		value: Self::Balance,
+	) -> Self::PositiveImbalance;
+
+	/// Similar to deposit_creating, only accepts a `NegativeImbalance` and returns nothing on
+	/// success.
+	fn resolve_creating(
+		who: &AccountId,
+		value: Self::NegativeImbalance,
+	) {
+		let v = value.peek();
+		drop(value.offset(Self::deposit_creating(who, v)));
+	}
+
+	/// Removes some free balance from `who` account for `reason` if possible. If `liveness` is
+	/// `KeepAlive`, then no less than `ExistentialDeposit` must be left remaining.
+	///
+	/// This checks any locks, vesting, and liquidity requirements. If the removal is not possible,
+	/// then it returns `Err`.
+	///
+	/// If the operation is successful, this will return `Ok` with a `NegativeImbalance` whose value
+	/// is `value`.
+	fn withdraw(
+		who: &AccountId,
+		value: Self::Balance,
+		reasons: WithdrawReasons,
+		liveness: ExistenceRequirement,
+	) -> Result<Self::NegativeImbalance, DispatchError>;
+
+	/// Similar to withdraw, only accepts a `PositiveImbalance` and returns nothing on success.
+	fn settle(
+		who: &AccountId,
+		value: Self::PositiveImbalance,
+		reasons: WithdrawReasons,
+		liveness: ExistenceRequirement,
+	) -> Result<(), Self::PositiveImbalance> {
+		let v = value.peek();
+		match Self::withdraw(who, v, reasons, liveness) {
+			Ok(opposite) => Ok(drop(value.offset(opposite))),
+			_ => Err(value),
+		}
+	}
+
+	/// Ensure an account's free balance equals some value; this will create the account
+	/// if needed.
+	///
+	/// Returns a signed imbalance and status to indicate if the account was successfully updated or update
+	/// has led to killing of the account.
+	fn make_free_balance_be(
+		who: &AccountId,
+		balance: Self::Balance,
+	) -> SignedImbalance<Self::Balance, Self::PositiveImbalance>;
+}
diff --git a/frame/support/src/traits/tokens/currency/lockable.rs b/frame/support/src/traits/tokens/currency/lockable.rs
new file mode 100644
index 000000000000..ed3d1cf46362
--- /dev/null
+++ b/frame/support/src/traits/tokens/currency/lockable.rs
@@ -0,0 +1,104 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! The lockable currency trait and some associated types.
+
+use crate::dispatch::DispatchResult;
+use crate::traits::misc::Get;
+use super::Currency;
+use super::super::misc::WithdrawReasons;
+
+/// An identifier for a lock. Used for disambiguating different locks so that
+/// they can be individually replaced or removed.
+pub type LockIdentifier = [u8; 8];
+
+/// A currency whose accounts can have liquidity restrictions.
+pub trait LockableCurrency<AccountId>: Currency<AccountId> {
+	/// The quantity used to denote time; usually just a `BlockNumber`.
+	type Moment;
+
+	/// The maximum number of locks a user should have on their account.
+	type MaxLocks: Get<u32>;
+
+	/// Create a new balance lock on account `who`.
+	///
+	/// If the new lock is valid (i.e. not already expired), it will push the struct to
+	/// the `Locks` vec in storage. Note that you can lock more funds than a user has.
+	///
+	/// If the lock `id` already exists, this will update it.
+	fn set_lock(
+		id: LockIdentifier,
+		who: &AccountId,
+		amount: Self::Balance,
+		reasons: WithdrawReasons,
+	);
+
+	/// Changes a balance lock (selected by `id`) so that it becomes less liquid in all
+	/// parameters or creates a new one if it does not exist.
+	///
+	/// Calling `extend_lock` on an existing lock `id` differs from `set_lock` in that it
+	/// applies the most severe constraints of the two, while `set_lock` replaces the lock
+	/// with the new parameters. As in, `extend_lock` will set:
+	/// - maximum `amount`
+	/// - bitwise mask of all `reasons`
+	fn extend_lock(
+		id: LockIdentifier,
+		who: &AccountId,
+		amount: Self::Balance,
+		reasons: WithdrawReasons,
+	);
+
+	/// Remove an existing lock.
+	fn remove_lock(
+		id: LockIdentifier,
+		who: &AccountId,
+	);
+}
+
+/// A vesting schedule over a currency. This allows a particular currency to have vesting limits
+/// applied to it.
+pub trait VestingSchedule<AccountId> {
+	/// The quantity used to denote time; usually just a `BlockNumber`.
+	type Moment;
+
+	/// The currency that this schedule applies to.
+	type Currency: Currency<AccountId>;
+
+	/// Get the amount that is currently being vested and cannot be transferred out of this account.
+	/// Returns `None` if the account has no vesting schedule.
+	fn vesting_balance(who: &AccountId) -> Option<<Self::Currency as Currency<AccountId>>::Balance>;
+
+	/// Adds a vesting schedule to a given account.
+	///
+	/// If there already exists a vesting schedule for the given account, an `Err` is returned
+	/// and nothing is updated.
+	///
+	/// Is a no-op if the amount to be vested is zero.
+	///
+	/// NOTE: This doesn't alter the free balance of the account.
+	fn add_vesting_schedule(
+		who: &AccountId,
+		locked: <Self::Currency as Currency<AccountId>>::Balance,
+		per_block: <Self::Currency as Currency<AccountId>>::Balance,
+		starting_block: Self::Moment,
+	) -> DispatchResult;
+
+	/// Remove a vesting schedule for a given account.
+	///
+	/// NOTE: This doesn't alter the free balance of the account.
+	fn remove_vesting_schedule(who: &AccountId);
+}
diff --git a/frame/support/src/traits/tokens/currency/reservable.rs b/frame/support/src/traits/tokens/currency/reservable.rs
new file mode 100644
index 000000000000..14ea1d3a16fb
--- /dev/null
+++ b/frame/support/src/traits/tokens/currency/reservable.rs
@@ -0,0 +1,83 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! The reservable currency trait.
+
+use super::Currency;
+use super::super::misc::BalanceStatus;
+use crate::dispatch::{DispatchResult, DispatchError};
+
+/// A currency where funds can be reserved from the user.
+pub trait ReservableCurrency<AccountId>: Currency<AccountId> {
+	/// Same result as `reserve(who, value)` (but without the side-effects) assuming there
+	/// are no balance changes in the meantime.
+	fn can_reserve(who: &AccountId, value: Self::Balance) -> bool;
+
+	/// Deducts up to `value` from reserved balance of `who`. This function cannot fail.
+	///
+	/// As much funds up to `value` will be deducted as possible. If the reserve balance of `who`
+	/// is less than `value`, then a non-zero second item will be returned.
+	fn slash_reserved(
+		who: &AccountId,
+		value: Self::Balance
+	) -> (Self::NegativeImbalance, Self::Balance);
+
+	/// The amount of the balance of a given account that is externally reserved; this can still get
+	/// slashed, but gets slashed last of all.
+	///
+	/// This balance is a 'reserve' balance that other subsystems use in order to set aside tokens
+	/// that are still 'owned' by the account holder, but which are suspendable.
+	///
+	/// When this balance falls below the value of `ExistentialDeposit`, then this 'reserve account'
+	/// is deleted: specifically, `ReservedBalance`.
+	///
+	/// `system::AccountNonce` is also deleted if `FreeBalance` is also zero (it also gets
+	/// collapsed to zero if it ever becomes less than `ExistentialDeposit`.
+	fn reserved_balance(who: &AccountId) -> Self::Balance;
+
+	/// Moves `value` from balance to reserved balance.
+	///
+	/// If the free balance is lower than `value`, then no funds will be moved and an `Err` will
+	/// be returned to notify of this. This is different behavior than `unreserve`.
+	fn reserve(who: &AccountId, value: Self::Balance) -> DispatchResult;
+
+	/// Moves up to `value` from reserved balance to free balance. This function cannot fail.
+	///
+	/// As much funds up to `value` will be moved as possible. If the reserve balance of `who`
+	/// is less than `value`, then the remaining amount will be returned.
+	///
+	/// # NOTES
+	///
+	/// - This is different from `reserve`.
+	/// - If the remaining reserved balance is less than `ExistentialDeposit`, it will
+	/// invoke `on_reserved_too_low` and could reap the account.
+	fn unreserve(who: &AccountId, value: Self::Balance) -> Self::Balance;
+
+	/// Moves up to `value` from reserved balance of account `slashed` to balance of account
+	/// `beneficiary`. `beneficiary` must exist for this to succeed. If it does not, `Err` will be
+	/// returned. Funds will be placed in either the `free` balance or the `reserved` balance,
+	/// depending on the `status`.
+	///
+	/// As much funds up to `value` will be deducted as possible. If this is less than `value`,
+	/// then `Ok(non_zero)` will be returned.
+	fn repatriate_reserved(
+		slashed: &AccountId,
+		beneficiary: &AccountId,
+		value: Self::Balance,
+		status: BalanceStatus,
+	) -> Result<Self::Balance, DispatchError>;
+}
diff --git a/frame/support/src/traits/tokens/fungible.rs b/frame/support/src/traits/tokens/fungible.rs
new file mode 100644
index 000000000000..8e6b4ace3464
--- /dev/null
+++ b/frame/support/src/traits/tokens/fungible.rs
@@ -0,0 +1,218 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! The traits for dealing with a single fungible token class and any associated types.
+
+use super::*;
+use sp_runtime::traits::Saturating;
+use crate::traits::misc::Get;
+use crate::dispatch::{DispatchResult, DispatchError};
+use super::misc::{DepositConsequence, WithdrawConsequence, Balance};
+
+mod balanced;
+mod imbalance;
+pub use balanced::{Balanced, Unbalanced};
+pub use imbalance::{Imbalance, HandleImbalanceDrop, DebtOf, CreditOf};
+
+/// Trait for providing balance-inspection access to a fungible asset.
+pub trait Inspect<AccountId> {
+	/// Scalar type for representing balance of an account.
+	type Balance: Balance;
+	/// The total amount of issuance in the system.
+	fn total_issuance() -> Self::Balance;
+	/// The minimum balance any single account may have.
+	fn minimum_balance() -> Self::Balance;
+	/// Get the balance of `who`.
+	fn balance(who: &AccountId) -> Self::Balance;
+	/// Returns `true` if the balance of `who` may be increased by `amount`.
+	fn can_deposit(who: &AccountId, amount: Self::Balance) -> DepositConsequence;
+	/// Returns `Failed` if the balance of `who` may not be decreased by `amount`, otherwise
+	/// the consequence.
+	fn can_withdraw(who: &AccountId, amount: Self::Balance) -> WithdrawConsequence<Self::Balance>;
+}
+
+/// Trait for providing an ERC-20 style fungible asset.
+pub trait Mutate<AccountId>: Inspect<AccountId> {
+	/// Increase the balance of `who` by `amount`.
+	fn deposit(who: &AccountId, amount: Self::Balance) -> DispatchResult;
+	/// Attempt to reduce the balance of `who` by `amount`.
+	fn withdraw(who: &AccountId, amount: Self::Balance) -> Result<Self::Balance, DispatchError>;
+	/// Transfer funds from one account into another.
+	fn transfer(
+		source: &AccountId,
+		dest: &AccountId,
+		amount: Self::Balance,
+	) -> Result<Self::Balance, DispatchError> {
+		let extra = Self::can_withdraw(&source, amount).into_result()?;
+		Self::can_deposit(&dest, amount.saturating_add(extra)).into_result()?;
+		let actual = Self::withdraw(source, amount)?;
+		debug_assert!(actual == amount.saturating_add(extra), "can_withdraw must agree with withdraw; qed");
+		match Self::deposit(dest, actual) {
+			Ok(_) => Ok(actual),
+			Err(err) => {
+				debug_assert!(false, "can_deposit returned true previously; qed");
+				// attempt to return the funds back to source
+				let revert = Self::deposit(source, actual);
+				debug_assert!(revert.is_ok(), "withdrew funds previously; qed");
+				Err(err)
+			}
+		}
+	}
+}
+
+/// Trait for providing a fungible asset which can only be transferred.
+pub trait Transfer<AccountId>: Inspect<AccountId> {
+	/// Transfer funds from one account into another.
+	fn transfer(
+		source: &AccountId,
+		dest: &AccountId,
+		amount: Self::Balance,
+	) -> Result<Self::Balance, DispatchError>;
+}
+
+/// Trait for providing a fungible asset which can be reserved.
+pub trait Reserve<AccountId>: Inspect<AccountId> {
+	/// Amount of funds held in reserve by `who`.
+	fn reserved_balance(who: &AccountId) -> Self::Balance;
+	/// Amount of funds held in total by `who`.
+	fn total_balance(who: &AccountId) -> Self::Balance {
+		Self::reserved_balance(who).saturating_add(Self::balance(who))
+	}
+	/// Check to see if some `amount` of funds may be reserved on the account of `who`.
+	fn can_reserve(who: &AccountId, amount: Self::Balance) -> bool;
+	/// Reserve some funds in an account.
+	fn reserve(who: &AccountId, amount: Self::Balance) -> DispatchResult;
+	/// Unreserve some funds in an account.
+	fn unreserve(who: &AccountId, amount: Self::Balance) -> DispatchResult;
+	/// Transfer reserved funds into another account.
+	fn repatriate_reserved(
+		who: &AccountId,
+		amount: Self::Balance,
+		status: BalanceStatus,
+	) -> DispatchResult;
+}
+
+pub struct ItemOf<
+	F: fungibles::Inspect<AccountId>,
+	A: Get<<F as fungibles::Inspect<AccountId>>::AssetId>,
+	AccountId,
+>(
+	sp_std::marker::PhantomData<(F, A, AccountId)>
+);
+
+impl<
+	F: fungibles::Inspect<AccountId>,
+	A: Get<<F as fungibles::Inspect<AccountId>>::AssetId>,
+	AccountId,
+> Inspect<AccountId> for ItemOf<F, A, AccountId> {
+	type Balance = <F as fungibles::Inspect<AccountId>>::Balance;
+	fn total_issuance() -> Self::Balance {
+		<F as fungibles::Inspect<AccountId>>::total_issuance(A::get())
+	}
+	fn minimum_balance() -> Self::Balance {
+		<F as fungibles::Inspect<AccountId>>::minimum_balance(A::get())
+	}
+	fn balance(who: &AccountId) -> Self::Balance {
+		<F as fungibles::Inspect<AccountId>>::balance(A::get(), who)
+	}
+	fn can_deposit(who: &AccountId, amount: Self::Balance) -> DepositConsequence {
+		<F as fungibles::Inspect<AccountId>>::can_deposit(A::get(), who, amount)
+	}
+	fn can_withdraw(who: &AccountId, amount: Self::Balance) -> WithdrawConsequence<Self::Balance> {
+		<F as fungibles::Inspect<AccountId>>::can_withdraw(A::get(), who, amount)
+	}
+}
+
+impl<
+	F: fungibles::Mutate<AccountId>,
+	A: Get<<F as fungibles::Inspect<AccountId>>::AssetId>,
+	AccountId,
+> Mutate<AccountId> for ItemOf<F, A, AccountId> {
+	fn deposit(who: &AccountId, amount: Self::Balance) -> DispatchResult {
+		<F as fungibles::Mutate<AccountId>>::deposit(A::get(), who, amount)
+	}
+	fn withdraw(who: &AccountId, amount: Self::Balance) -> Result<Self::Balance, DispatchError> {
+		<F as fungibles::Mutate<AccountId>>::withdraw(A::get(), who, amount)
+	}
+}
+
+impl<
+	F: fungibles::Transfer<AccountId>,
+	A: Get<<F as fungibles::Inspect<AccountId>>::AssetId>,
+	AccountId,
+> Transfer<AccountId> for ItemOf<F, A, AccountId> {
+	fn transfer(source: &AccountId, dest: &AccountId, amount: Self::Balance)
+		-> Result<Self::Balance, DispatchError>
+	{
+		<F as fungibles::Transfer<AccountId>>::transfer(A::get(), source, dest, amount)
+	}
+}
+
+impl<
+	F: fungibles::Reserve<AccountId>,
+	A: Get<<F as fungibles::Inspect<AccountId>>::AssetId>,
+	AccountId,
+> Reserve<AccountId> for ItemOf<F, A, AccountId> {
+	fn reserved_balance(who: &AccountId) -> Self::Balance {
+		<F as fungibles::Reserve<AccountId>>::reserved_balance(A::get(), who)
+	}
+	fn total_balance(who: &AccountId) -> Self::Balance {
+		<F as fungibles::Reserve<AccountId>>::total_balance(A::get(), who)
+	}
+	fn can_reserve(who: &AccountId, amount: Self::Balance) -> bool {
+		<F as fungibles::Reserve<AccountId>>::can_reserve(A::get(), who, amount)
+	}
+	fn reserve(who: &AccountId, amount: Self::Balance) -> DispatchResult {
+		<F as fungibles::Reserve<AccountId>>::reserve(A::get(), who, amount)
+	}
+	fn unreserve(who: &AccountId, amount: Self::Balance) -> DispatchResult {
+		<F as fungibles::Reserve<AccountId>>::unreserve(A::get(), who, amount)
+	}
+	fn repatriate_reserved(
+		who: &AccountId,
+		amount: Self::Balance,
+		status: BalanceStatus,
+	) -> DispatchResult {
+		<F as fungibles::Reserve<AccountId>>::repatriate_reserved(A::get(), who, amount, status)
+	}
+}
+
+impl<
+	F: fungibles::Unbalanced<AccountId>,
+	A: Get<<F as fungibles::Inspect<AccountId>>::AssetId>,
+	AccountId,
+> Unbalanced<AccountId> for ItemOf<F, A, AccountId> {
+	fn set_balance(who: &AccountId, amount: Self::Balance) -> DispatchResult {
+		<F as fungibles::Unbalanced<AccountId>>::set_balance(A::get(), who, amount)
+	}
+	fn set_total_issuance(amount: Self::Balance) -> () {
+		<F as fungibles::Unbalanced<AccountId>>::set_total_issuance(A::get(), amount)
+	}
+	fn decrease_balance(who: &AccountId, amount: Self::Balance) -> Result<Self::Balance, DispatchError> {
+		<F as fungibles::Unbalanced<AccountId>>::decrease_balance(A::get(), who, amount)
+	}
+	fn decrease_balance_at_most(who: &AccountId, amount: Self::Balance) -> Self::Balance {
+		<F as fungibles::Unbalanced<AccountId>>::decrease_balance_at_most(A::get(), who, amount)
+	}
+	fn increase_balance(who: &AccountId, amount: Self::Balance) -> Result<Self::Balance, DispatchError> {
+		<F as fungibles::Unbalanced<AccountId>>::increase_balance(A::get(), who, amount)
+	}
+	fn increase_balance_at_most(who: &AccountId, amount: Self::Balance) -> Self::Balance {
+		<F as fungibles::Unbalanced<AccountId>>::increase_balance_at_most(A::get(), who, amount)
+	}
+}
+
diff --git a/frame/support/src/traits/tokens/fungible/balanced.rs b/frame/support/src/traits/tokens/fungible/balanced.rs
new file mode 100644
index 000000000000..514a6f4c1881
--- /dev/null
+++ b/frame/support/src/traits/tokens/fungible/balanced.rs
@@ -0,0 +1,363 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! The trait and associated types for sets of fungible tokens that manage total issuance without
+//! requiring atomic balanced operations.
+
+use super::*;
+use sp_std::marker::PhantomData;
+use sp_runtime::{TokenError, traits::{CheckedAdd, Zero}};
+use super::super::Imbalance as ImbalanceT;
+use crate::traits::misc::{SameOrOther, TryDrop};
+use crate::dispatch::{DispatchResult, DispatchError};
+
+/// A fungible token class where any creation and deletion of tokens is semi-explicit and where the
+/// total supply is maintained automatically.
+///
+/// This is auto-implemented when a token class has `Unbalanced` implemented.
+pub trait Balanced<AccountId>: Inspect<AccountId> {
+	/// The type for managing what happens when an instance of `Debt` is dropped without being used.
+	type OnDropDebt: HandleImbalanceDrop<Self::Balance>;
+	/// The type for managing what happens when an instance of `Credit` is dropped without being
+	/// used.
+	type OnDropCredit: HandleImbalanceDrop<Self::Balance>;
+
+	/// Reduce the total issuance by `amount` and return the according imbalance. The imbalance will
+	/// typically be used to reduce an account by the same amount with e.g. `settle`.
+	///
+	/// This is infallible, but doesn't guarantee that the entire `amount` is burnt, for example
+	/// in the case of underflow.
+	fn rescind(amount: Self::Balance) -> DebtOf<AccountId, Self>;
+
+	/// Increase the total issuance by `amount` and return the according imbalance. The imbalance
+	/// will typically be used to increase an account by the same amount with e.g.
+	/// `resolve_into_existing` or `resolve_creating`.
+	///
+	/// This is infallible, but doesn't guarantee that the entire `amount` is issued, for example
+	/// in the case of overflow.
+	fn issue(amount: Self::Balance) -> CreditOf<AccountId, Self>;
+
+	/// Produce a pair of imbalances that cancel each other out exactly.
+	///
+	/// This is just the same as burning and issuing the same amount and has no effect on the
+	/// total issuance.
+	fn pair(amount: Self::Balance)
+			-> (DebtOf<AccountId, Self>, CreditOf<AccountId, Self>)
+	{
+		(Self::rescind(amount), Self::issue(amount))
+	}
+
+	/// Deducts up to `value` from the combined balance of `who`, preferring to deduct from the
+	/// free balance. This function cannot fail.
+	///
+	/// The resulting imbalance is the first item of the tuple returned.
+	///
+	/// As much funds up to `value` will be deducted as possible. If this is less than `value`,
+	/// then a non-zero second item will be returned.
+	fn slash(
+		who: &AccountId,
+		amount: Self::Balance,
+	) -> (CreditOf<AccountId, Self>, Self::Balance);
+
+	/// Mints exactly `value` into the account of `who`.
+	///
+	/// If `who` doesn't exist, nothing is done and an `Err` returned. This could happen because it
+	/// the account doesn't yet exist and it isn't possible to create it under the current
+	/// circumstances and with `value` in it.
+	fn deposit(
+		who: &AccountId,
+		value: Self::Balance,
+	) -> Result<DebtOf<AccountId, Self>, DispatchError>;
+
+	/// Removes `value` balance from `who` account if possible.
+	///
+	/// If the removal is not possible, then it returns `Err` and nothing is changed.
+	///
+	/// If the operation is successful, this will return `Ok` with a `NegativeImbalance` whose value
+	/// is no less than `value`. It may be more in the case that removing it reduced it below
+	/// `Self::minimum_balance()`.
+	fn withdraw(
+		who: &AccountId,
+		value: Self::Balance,
+		//TODO: liveness: ExistenceRequirement,
+	) -> Result<CreditOf<AccountId, Self>, DispatchError>;
+
+	/// The balance of `who` is increased in order to counter `credit`. If the whole of `credit`
+	/// cannot be countered, then nothing is changed and the original `credit` is returned in an
+	/// `Err`.
+	///
+	/// Please note: If `credit.peek()` is less than `Self::minimum_balance()`, then `who` must
+	/// already exist for this to succeed.
+	fn resolve(
+		who: &AccountId,
+		credit: CreditOf<AccountId, Self>,
+	) -> Result<(), CreditOf<AccountId, Self>> {
+		let v = credit.peek();
+		let debt = match Self::deposit(who, v) {
+			Err(_) => return Err(credit),
+			Ok(d) => d,
+		};
+		let result = credit.offset(debt).try_drop();
+		debug_assert!(result.is_ok(), "ok deposit return must be equal to credit value; qed");
+		Ok(())
+	}
+
+	/// The balance of `who` is decreased in order to counter `debt`. If the whole of `debt`
+	/// cannot be countered, then nothing is changed and the original `debt` is returned in an
+	/// `Err`.
+	fn settle(
+		who: &AccountId,
+		debt: DebtOf<AccountId, Self>,
+		//TODO: liveness: ExistenceRequirement,
+	) -> Result<CreditOf<AccountId, Self>, DebtOf<AccountId, Self>> {
+		let amount = debt.peek();
+		let credit = match Self::withdraw(who, amount) {
+			Err(_) => return Err(debt),
+			Ok(d) => d,
+		};
+		match credit.offset(debt) {
+			SameOrOther::None => Ok(CreditOf::<AccountId, Self>::zero()),
+			SameOrOther::Same(dust) => Ok(dust),
+			SameOrOther::Other(rest) => {
+				debug_assert!(false, "ok withdraw return must be at least debt value; qed");
+				Err(rest)
+			}
+		}
+	}
+}
+
+/// A fungible token class where the balance can be set arbitrarily.
+///
+/// **WARNING**
+/// Do not use this directly unless you want trouble, since it allows you to alter account balances
+/// without keeping the issuance up to date. It has no safeguards against accidentally creating
+/// token imbalances in your system leading to accidental imflation or deflation. It's really just
+/// for the underlying datatype to implement so the user gets the much safer `Balanced` trait to
+/// use.
+pub trait Unbalanced<AccountId>: Inspect<AccountId> {
+	/// Set the balance of `who` to `amount`. If this cannot be done for some reason (e.g.
+	/// because the account cannot be created or an overflow) then an `Err` is returned.
+	fn set_balance(who: &AccountId, amount: Self::Balance) -> DispatchResult;
+
+	/// Set the total issuance to `amount`.
+	fn set_total_issuance(amount: Self::Balance);
+
+	/// Reduce the balance of `who` by `amount`. If it cannot be reduced by that amount for
+	/// some reason, return `Err` and don't reduce it at all. If Ok, return the imbalance.
+	///
+	/// Minimum balance will be respected and the returned imbalance may be up to
+	/// `Self::minimum_balance() - 1` greater than `amount`.
+	fn decrease_balance(who: &AccountId, amount: Self::Balance)
+		-> Result<Self::Balance, DispatchError>
+	{
+		let old_balance = Self::balance(who);
+		let (mut new_balance, mut amount) = if old_balance < amount {
+			Err(TokenError::NoFunds)?
+		} else {
+			(old_balance - amount, amount)
+		};
+		if new_balance < Self::minimum_balance() {
+			amount = amount.saturating_add(new_balance);
+			new_balance = Zero::zero();
+		}
+		// Defensive only - this should not fail now.
+		Self::set_balance(who, new_balance)?;
+		Ok(amount)
+	}
+
+	/// Reduce the balance of `who` by the most that is possible, up to `amount`.
+	///
+	/// Minimum balance will be respected and the returned imbalance may be up to
+	/// `Self::minimum_balance() - 1` greater than `amount`.
+	///
+	/// Return the imbalance by which the account was reduced.
+	fn decrease_balance_at_most(who: &AccountId, amount: Self::Balance)
+		-> Self::Balance
+	{
+		let old_balance = Self::balance(who);
+		let (mut new_balance, mut amount) = if old_balance < amount {
+			(Zero::zero(), old_balance)
+		} else {
+			(old_balance - amount, amount)
+		};
+		let minimum_balance = Self::minimum_balance();
+		if new_balance < minimum_balance {
+			amount = amount.saturating_add(new_balance);
+			new_balance = Zero::zero();
+		}
+		let mut r = Self::set_balance(who, new_balance);
+		if r.is_err() {
+			// Some error, probably because we tried to destroy an account which cannot be destroyed.
+			if new_balance.is_zero() && amount >= minimum_balance {
+				new_balance = minimum_balance;
+				amount -= minimum_balance;
+				r = Self::set_balance(who, new_balance);
+			}
+			if r.is_err() {
+				// Still an error. Apparently it's not possible to reduce at all.
+				amount = Zero::zero();
+			}
+		}
+		amount
+	}
+
+	/// Increase the balance of `who` by `amount`. If it cannot be increased by that amount
+	/// for some reason, return `Err` and don't increase it at all. If Ok, return the imbalance.
+	///
+	/// Minimum balance will be respected and an error will be returned if
+	/// `amount < Self::minimum_balance()` when the account of `who` is zero.
+	fn increase_balance(who: &AccountId, amount: Self::Balance)
+		-> Result<Self::Balance, DispatchError>
+	{
+		let old_balance = Self::balance(who);
+		let new_balance = old_balance.checked_add(&amount).ok_or(TokenError::Overflow)?;
+		if new_balance < Self::minimum_balance() {
+			Err(TokenError::BelowMinimum)?
+		}
+		if old_balance != new_balance {
+			Self::set_balance(who, new_balance)?;
+		}
+		Ok(amount)
+	}
+
+	/// Increase the balance of `who` by the most that is possible, up to `amount`.
+	///
+	/// Minimum balance will be respected and the returned imbalance will be zero in the case that
+	/// `amount < Self::minimum_balance()`.
+	///
+	/// Return the imbalance by which the account was increased.
+	fn increase_balance_at_most(who: &AccountId, amount: Self::Balance)
+		-> Self::Balance
+	{
+		let old_balance = Self::balance(who);
+		let mut new_balance = old_balance.saturating_add(amount);
+		let mut amount = new_balance - old_balance;
+		if new_balance < Self::minimum_balance() {
+			new_balance = Zero::zero();
+			amount = Zero::zero();
+		}
+		if old_balance == new_balance || Self::set_balance(who, new_balance).is_ok() {
+			amount
+		} else {
+			Zero::zero()
+		}
+	}
+}
+
+/// Simple handler for an imbalance drop which increases the total issuance of the system by the
+/// imbalance amount. Used for leftover debt.
+pub struct IncreaseIssuance<AccountId, U>(PhantomData<(AccountId, U)>);
+impl<AccountId, U: Unbalanced<AccountId>> HandleImbalanceDrop<U::Balance>
+	for IncreaseIssuance<AccountId, U>
+{
+	fn handle(amount: U::Balance) {
+		U::set_total_issuance(U::total_issuance().saturating_add(amount))
+	}
+}
+
+/// Simple handler for an imbalance drop which decreases the total issuance of the system by the
+/// imbalance amount. Used for leftover credit.
+pub struct DecreaseIssuance<AccountId, U>(PhantomData<(AccountId, U)>);
+impl<AccountId, U: Unbalanced<AccountId>> HandleImbalanceDrop<U::Balance>
+	for DecreaseIssuance<AccountId, U>
+{
+	fn handle(amount: U::Balance) {
+		U::set_total_issuance(U::total_issuance().saturating_sub(amount))
+	}
+}
+
+/// An imbalance type which uses `DecreaseIssuance` to deal with anything `Drop`ed.
+///
+/// Basically means that funds in someone's account have been removed and not yet placed anywhere
+/// else. If it gets dropped, then those funds will be assumed to be "burned" and the total supply
+/// will be accordingly decreased to ensure it equals the sum of the balances of all accounts.
+type Credit<AccountId, U> = Imbalance<
+	<U as Inspect<AccountId>>::Balance,
+	DecreaseIssuance<AccountId, U>,
+	IncreaseIssuance<AccountId, U>,
+>;
+
+/// An imbalance type which uses `IncreaseIssuance` to deal with anything `Drop`ed.
+///
+/// Basically means that there are funds in someone's account whose origin is as yet unaccounted
+/// for. If it gets dropped, then those funds will be assumed to be "minted" and the total supply
+/// will be accordingly increased to ensure it equals the sum of the balances of all accounts.
+type Debt<AccountId, U> = Imbalance<
+	<U as Inspect<AccountId>>::Balance,
+	IncreaseIssuance<AccountId, U>,
+	DecreaseIssuance<AccountId, U>,
+>;
+
+/// Create some `Credit` item. Only for internal use.
+fn credit<AccountId, U: Unbalanced<AccountId>>(
+	amount: U::Balance,
+) -> Credit<AccountId, U> {
+	Imbalance::new(amount)
+}
+
+/// Create some `Debt` item. Only for internal use.
+fn debt<AccountId, U: Unbalanced<AccountId>>(
+	amount: U::Balance,
+) -> Debt<AccountId, U> {
+	Imbalance::new(amount)
+}
+
+impl<AccountId, U: Unbalanced<AccountId>> Balanced<AccountId> for U {
+	type OnDropCredit = DecreaseIssuance<AccountId, U>;
+	type OnDropDebt = IncreaseIssuance<AccountId, U>;
+	fn rescind(amount: Self::Balance) -> Debt<AccountId, Self> {
+		let old = U::total_issuance();
+		let new = old.saturating_sub(amount);
+		U::set_total_issuance(new);
+		debt(old - new)
+	}
+	fn issue(amount: Self::Balance) -> Credit<AccountId, Self> {
+		let old = U::total_issuance();
+		let new = old.saturating_add(amount);
+		U::set_total_issuance(new);
+		credit(new - old)
+	}
+	fn slash(
+		who: &AccountId,
+		amount: Self::Balance,
+	) -> (Credit<AccountId, Self>, Self::Balance) {
+		let slashed = U::decrease_balance_at_most(who, amount);
+		// `slashed` could be less than, greater than or equal to `amount`.
+		// If slashed == amount, it means the account had at least amount in it and it could all be
+		//   removed without a problem.
+		// If slashed > amount, it means the account had more than amount in it, but not enough more
+		//   to push it over minimum_balance.
+		// If slashed < amount, it means the account didn't have enough in it to be reduced by
+		//   `amount` without being destroyed.
+		(credit(slashed), amount.saturating_sub(slashed))
+	}
+	fn deposit(
+		who: &AccountId,
+		amount: Self::Balance
+	) -> Result<Debt<AccountId, Self>, DispatchError> {
+		let increase = U::increase_balance(who, amount)?;
+		Ok(debt(increase))
+	}
+	fn withdraw(
+		who: &AccountId,
+		amount: Self::Balance,
+		//TODO: liveness: ExistenceRequirement,
+	) -> Result<Credit<AccountId, Self>, DispatchError> {
+		let decrease = U::decrease_balance(who, amount)?;
+		Ok(credit(decrease))
+	}
+}
diff --git a/frame/support/src/traits/tokens/fungible/imbalance.rs b/frame/support/src/traits/tokens/fungible/imbalance.rs
new file mode 100644
index 000000000000..c084fa97fbec
--- /dev/null
+++ b/frame/support/src/traits/tokens/fungible/imbalance.rs
@@ -0,0 +1,162 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! The imbalance type and its associates, which handles keeps everything adding up properly with
+//! unbalanced operations.
+
+use super::*;
+use sp_std::marker::PhantomData;
+use sp_runtime::traits::Zero;
+use super::misc::Balance;
+use super::balanced::Balanced;
+use crate::traits::misc::{TryDrop, SameOrOther};
+use super::super::Imbalance as ImbalanceT;
+
+/// Handler for when an imbalance gets dropped. This could handle either a credit (negative) or
+/// debt (positive) imbalance.
+pub trait HandleImbalanceDrop<Balance> {
+	/// Some something with the imbalance's value which is being dropped.
+	fn handle(amount: Balance);
+}
+
+/// An imbalance in the system, representing a divergence of recorded token supply from the sum of
+/// the balances of all accounts. This is `must_use` in order to ensure it gets handled (placing
+/// into an account, settling from an account or altering the supply).
+///
+/// Importantly, it has a special `Drop` impl, and cannot be created outside of this module.
+#[must_use]
+pub struct Imbalance<
+	B: Balance,
+	OnDrop: HandleImbalanceDrop<B>,
+	OppositeOnDrop: HandleImbalanceDrop<B>,
+> {
+	amount: B,
+	_phantom: PhantomData<(OnDrop, OppositeOnDrop)>,
+}
+
+impl<
+	B: Balance,
+	OnDrop: HandleImbalanceDrop<B>,
+	OppositeOnDrop: HandleImbalanceDrop<B>
+> Drop for Imbalance<B, OnDrop, OppositeOnDrop> {
+	fn drop(&mut self) {
+		if !self.amount.is_zero() {
+			OnDrop::handle(self.amount)
+		}
+	}
+}
+
+impl<
+	B: Balance,
+	OnDrop: HandleImbalanceDrop<B>,
+	OppositeOnDrop: HandleImbalanceDrop<B>,
+> TryDrop for Imbalance<B, OnDrop, OppositeOnDrop> {
+	/// Drop an instance cleanly. Only works if its value represents "no-operation".
+	fn try_drop(self) -> Result<(), Self> {
+		self.drop_zero()
+	}
+}
+
+impl<
+	B: Balance,
+	OnDrop: HandleImbalanceDrop<B>,
+	OppositeOnDrop: HandleImbalanceDrop<B>,
+> Default for Imbalance<B, OnDrop, OppositeOnDrop> {
+	fn default() -> Self {
+		Self::zero()
+	}
+}
+
+impl<
+	B: Balance,
+	OnDrop: HandleImbalanceDrop<B>,
+	OppositeOnDrop: HandleImbalanceDrop<B>,
+> Imbalance<B, OnDrop, OppositeOnDrop> {
+	pub(crate) fn new(amount: B) -> Self {
+		Self { amount, _phantom: PhantomData }
+	}
+}
+
+impl<
+	B: Balance,
+	OnDrop: HandleImbalanceDrop<B>,
+	OppositeOnDrop: HandleImbalanceDrop<B>,
+> ImbalanceT<B> for Imbalance<B, OnDrop, OppositeOnDrop> {
+	type Opposite = Imbalance<B, OppositeOnDrop, OnDrop>;
+
+	fn zero() -> Self {
+		Self { amount: Zero::zero(), _phantom: PhantomData }
+	}
+
+	fn drop_zero(self) -> Result<(), Self> {
+		if self.amount.is_zero() {
+			sp_std::mem::forget(self);
+			Ok(())
+		} else {
+			Err(self)
+		}
+	}
+
+	fn split(self, amount: B) -> (Self, Self) {
+		let first = self.amount.min(amount);
+		let second = self.amount - first;
+		sp_std::mem::forget(self);
+		(Imbalance::new(first), Imbalance::new(second))
+	}
+	fn merge(mut self, other: Self) -> Self {
+		self.amount = self.amount.saturating_add(other.amount);
+		sp_std::mem::forget(other);
+		self
+	}
+	fn subsume(&mut self, other: Self) {
+		self.amount = self.amount.saturating_add(other.amount);
+		sp_std::mem::forget(other);
+	}
+	fn offset(self, other: Imbalance<B, OppositeOnDrop, OnDrop>)
+		-> SameOrOther<Self, Imbalance<B, OppositeOnDrop, OnDrop>>
+	{
+		let (a, b) = (self.amount, other.amount);
+		sp_std::mem::forget((self, other));
+
+		if a == b {
+			SameOrOther::None
+		} else if a > b {
+			SameOrOther::Same(Imbalance::new(a - b))
+		} else {
+			SameOrOther::Other(Imbalance::<B, OppositeOnDrop, OnDrop>::new(b - a))
+		}
+	}
+	fn peek(&self) -> B {
+		self.amount
+	}
+}
+
+/// Imbalance implying that the total_issuance value is less than the sum of all account balances.
+pub type DebtOf<AccountId, B> = Imbalance<
+	<B as Inspect<AccountId>>::Balance,
+	// This will generally be implemented by increasing the total_issuance value.
+	<B as Balanced<AccountId>>::OnDropDebt,
+	<B as Balanced<AccountId>>::OnDropCredit,
+>;
+
+/// Imbalance implying that the total_issuance value is greater than the sum of all account balances.
+pub type CreditOf<AccountId, B> = Imbalance<
+	<B as Inspect<AccountId>>::Balance,
+	// This will generally be implemented by decreasing the total_issuance value.
+	<B as Balanced<AccountId>>::OnDropCredit,
+	<B as Balanced<AccountId>>::OnDropDebt,
+>;
diff --git a/frame/support/src/traits/tokens/fungibles.rs b/frame/support/src/traits/tokens/fungibles.rs
new file mode 100644
index 000000000000..8f6779881169
--- /dev/null
+++ b/frame/support/src/traits/tokens/fungibles.rs
@@ -0,0 +1,143 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! The traits for sets of fungible tokens and any associated types.
+
+use super::*;
+use crate::dispatch::{DispatchError, DispatchResult};
+use super::misc::{AssetId, Balance};
+use sp_runtime::traits::Saturating;
+
+mod balanced;
+pub use balanced::{Balanced, Unbalanced};
+mod imbalance;
+pub use imbalance::{Imbalance, HandleImbalanceDrop, DebtOf, CreditOf};
+
+/// Trait for providing balance-inspection access to a set of named fungible assets.
+pub trait Inspect<AccountId> {
+	/// Means of identifying one asset class from another.
+	type AssetId: AssetId;
+	/// Scalar type for representing balance of an account.
+	type Balance: Balance;
+	/// The total amount of issuance in the system.
+	fn total_issuance(asset: Self::AssetId) -> Self::Balance;
+	/// The minimum balance any single account may have.
+	fn minimum_balance(asset: Self::AssetId) -> Self::Balance;
+	/// Get the `asset` balance of `who`.
+	fn balance(asset: Self::AssetId, who: &AccountId) -> Self::Balance;
+	/// Returns `true` if the `asset` balance of `who` may be increased by `amount`.
+	fn can_deposit(asset: Self::AssetId, who: &AccountId, amount: Self::Balance)
+		-> DepositConsequence;
+	/// Returns `Failed` if the `asset` balance of `who` may not be decreased by `amount`, otherwise
+	/// the consequence.
+	fn can_withdraw(
+		asset: Self::AssetId,
+		who: &AccountId,
+		amount: Self::Balance,
+	) -> WithdrawConsequence<Self::Balance>;
+}
+
+/// Trait for providing a set of named fungible assets which can be created and destroyed.
+pub trait Mutate<AccountId>: Inspect<AccountId> {
+	/// Attempt to increase the `asset` balance of `who` by `amount`.
+	///
+	/// If not possible then don't do anything. Possible reasons for failure include:
+	/// - Minimum balance not met.
+	/// - Account cannot be created (e.g. because there is no provider reference and/or the asset
+	///   isn't considered worth anything).
+	///
+	/// Since this is an operation which should be possible to take alone, if successful it will
+	/// increase the overall supply of the underlying token.
+	fn deposit(asset: Self::AssetId, who: &AccountId, amount: Self::Balance) -> DispatchResult;
+
+	/// Attempt to reduce the `asset` balance of `who` by `amount`.
+	///
+	/// If not possible then don't do anything. Possible reasons for failure include:
+	/// - Less funds in the account than `amount`
+	/// - Liquidity requirements (locks, reservations) prevent the funds from being removed
+	/// - Operation would require destroying the account and it is required to stay alive (e.g.
+	///   because it's providing a needed provider reference).
+	///
+	/// Since this is an operation which should be possible to take alone, if successful it will
+	/// reduce the overall supply of the underlying token.
+	///
+	/// Due to minimum balance requirements, it's possible that the amount withdrawn could be up to
+	/// `Self::minimum_balance() - 1` more than the `amount`. The total amount withdrawn is returned
+	/// in an `Ok` result. This may be safely ignored if you don't mind the overall supply reducing.
+	fn withdraw(asset: Self::AssetId, who: &AccountId, amount: Self::Balance)
+		-> Result<Self::Balance, DispatchError>;
+
+	/// Transfer funds from one account into another.
+	fn transfer(
+		asset: Self::AssetId,
+		source: &AccountId,
+		dest: &AccountId,
+		amount: Self::Balance,
+	) -> Result<Self::Balance, DispatchError> {
+		let extra = Self::can_withdraw(asset, &source, amount).into_result()?;
+		Self::can_deposit(asset, &dest, amount.saturating_add(extra)).into_result()?;
+		let actual = Self::withdraw(asset, source, amount)?;
+		debug_assert!(actual == amount.saturating_add(extra), "can_withdraw must agree with withdraw; qed");
+		match Self::deposit(asset, dest, actual) {
+			Ok(_) => Ok(actual),
+			Err(err) => {
+				debug_assert!(false, "can_deposit returned true previously; qed");
+				// attempt to return the funds back to source
+				let revert = Self::deposit(asset, source, actual);
+				debug_assert!(revert.is_ok(), "withdrew funds previously; qed");
+				Err(err)
+			}
+		}
+	}
+}
+
+/// Trait for providing a set of named fungible assets which can only be transferred.
+pub trait Transfer<AccountId>: Inspect<AccountId> {
+	/// Transfer funds from one account into another.
+	fn transfer(
+		asset: Self::AssetId,
+		source: &AccountId,
+		dest: &AccountId,
+		amount: Self::Balance,
+	) -> Result<Self::Balance, DispatchError>;
+}
+
+/// Trait for providing a set of named fungible assets which can be reserved.
+pub trait Reserve<AccountId>: Inspect<AccountId> {
+	/// Amount of funds held in reserve.
+	fn reserved_balance(asset: Self::AssetId, who: &AccountId) -> Self::Balance;
+
+	/// Amount of funds held in reserve.
+	fn total_balance(asset: Self::AssetId, who: &AccountId) -> Self::Balance;
+
+	/// Check to see if some `amount` of `asset` may be reserved on the account of `who`.
+	fn can_reserve(asset: Self::AssetId, who: &AccountId, amount: Self::Balance) -> bool;
+
+	/// Reserve some funds in an account.
+	fn reserve(asset: Self::AssetId, who: &AccountId, amount: Self::Balance) -> DispatchResult;
+
+	/// Unreserve some funds in an account.
+	fn unreserve(asset: Self::AssetId, who: &AccountId, amount: Self::Balance) -> DispatchResult;
+
+	/// Transfer reserved funds into another account.
+	fn repatriate_reserved(
+		asset: Self::AssetId,
+		who: &AccountId,
+		amount: Self::Balance,
+		status: BalanceStatus,
+	) -> DispatchResult;
+}
diff --git a/frame/support/src/traits/tokens/fungibles/balanced.rs b/frame/support/src/traits/tokens/fungibles/balanced.rs
new file mode 100644
index 000000000000..0af07228e010
--- /dev/null
+++ b/frame/support/src/traits/tokens/fungibles/balanced.rs
@@ -0,0 +1,375 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! The trait and associated types for sets of fungible tokens that manage total issuance without
+//! requiring atomic balanced operations.
+
+use super::*;
+use sp_std::marker::PhantomData;
+use sp_runtime::{TokenError, traits::{Zero, CheckedAdd}};
+use sp_arithmetic::traits::Saturating;
+use crate::dispatch::{DispatchError, DispatchResult};
+use crate::traits::misc::{SameOrOther, TryDrop};
+
+/// A fungible token class where any creation and deletion of tokens is semi-explicit and where the
+/// total supply is maintained automatically.
+///
+/// This is auto-implemented when a token class has `Unbalanced` implemented.
+pub trait Balanced<AccountId>: Inspect<AccountId> {
+	type OnDropDebt: HandleImbalanceDrop<Self::AssetId, Self::Balance>;
+	type OnDropCredit: HandleImbalanceDrop<Self::AssetId, Self::Balance>;
+
+	/// Reduce the total issuance by `amount` and return the according imbalance. The imbalance will
+	/// typically be used to reduce an account by the same amount with e.g. `settle`.
+	///
+	/// This is infallible, but doesn't guarantee that the entire `amount` is burnt, for example
+	/// in the case of underflow.
+	fn rescind(asset: Self::AssetId, amount: Self::Balance) -> DebtOf<AccountId, Self>;
+
+	/// Increase the total issuance by `amount` and return the according imbalance. The imbalance
+	/// will typically be used to increase an account by the same amount with e.g.
+	/// `resolve_into_existing` or `resolve_creating`.
+	///
+	/// This is infallible, but doesn't guarantee that the entire `amount` is issued, for example
+	/// in the case of overflow.
+	fn issue(asset: Self::AssetId, amount: Self::Balance) -> CreditOf<AccountId, Self>;
+
+	/// Produce a pair of imbalances that cancel each other out exactly.
+	///
+	/// This is just the same as burning and issuing the same amount and has no effect on the
+	/// total issuance.
+	fn pair(asset: Self::AssetId, amount: Self::Balance)
+			-> (DebtOf<AccountId, Self>, CreditOf<AccountId, Self>)
+	{
+		(Self::rescind(asset, amount), Self::issue(asset, amount))
+	}
+
+	/// Deducts up to `value` from the combined balance of `who`, preferring to deduct from the
+	/// free balance. This function cannot fail.
+	///
+	/// The resulting imbalance is the first item of the tuple returned.
+	///
+	/// As much funds up to `value` will be deducted as possible. If this is less than `value`,
+	/// then a non-zero second item will be returned.
+	fn slash(
+		asset: Self::AssetId,
+		who: &AccountId,
+		amount: Self::Balance,
+	) -> (CreditOf<AccountId, Self>, Self::Balance);
+
+	/// Mints exactly `value` into the `asset` account of `who`.
+	///
+	/// If `who` doesn't exist, nothing is done and an `Err` returned. This could happen because it
+	/// the account doesn't yet exist and it isn't possible to create it under the current
+	/// circumstances and with `value` in it.
+	fn deposit(
+		asset: Self::AssetId,
+		who: &AccountId,
+		value: Self::Balance,
+	) -> Result<DebtOf<AccountId, Self>, DispatchError>;
+
+	/// Removes `value` free `asset` balance from `who` account if possible.
+	///
+	/// If the removal is not possible, then it returns `Err` and nothing is changed.
+	///
+	/// If the operation is successful, this will return `Ok` with a `NegativeImbalance` whose value
+	/// is no less than `value`. It may be more in the case that removing it reduced it below
+	/// `Self::minimum_balance()`.
+	fn withdraw(
+		asset: Self::AssetId,
+		who: &AccountId,
+		value: Self::Balance,
+		//TODO: liveness: ExistenceRequirement,
+	) -> Result<CreditOf<AccountId, Self>, DispatchError>;
+
+	/// The balance of `who` is increased in order to counter `credit`. If the whole of `credit`
+	/// cannot be countered, then nothing is changed and the original `credit` is returned in an
+	/// `Err`.
+	///
+	/// Please note: If `credit.peek()` is less than `Self::minimum_balance()`, then `who` must
+	/// already exist for this to succeed.
+	fn resolve(
+		who: &AccountId,
+		credit: CreditOf<AccountId, Self>,
+	) -> Result<(), CreditOf<AccountId, Self>> {
+		let v = credit.peek();
+		let debt = match Self::deposit(credit.asset(), who, v) {
+			Err(_) => return Err(credit),
+			Ok(d) => d,
+		};
+		if let Ok(result) = credit.offset(debt) {
+			let result = result.try_drop();
+			debug_assert!(result.is_ok(), "ok deposit return must be equal to credit value; qed");
+		} else {
+			debug_assert!(false, "debt.asset is credit.asset; qed");
+		}
+		Ok(())
+	}
+
+	/// The balance of `who` is decreased in order to counter `debt`. If the whole of `debt`
+	/// cannot be countered, then nothing is changed and the original `debt` is returned in an
+	/// `Err`.
+	fn settle(
+		who: &AccountId,
+		debt: DebtOf<AccountId, Self>,
+		//TODO: liveness: ExistenceRequirement,
+	) -> Result<CreditOf<AccountId, Self>, DebtOf<AccountId, Self>> {
+		let amount = debt.peek();
+		let asset = debt.asset();
+		let credit = match Self::withdraw(asset, who, amount) {
+			Err(_) => return Err(debt),
+			Ok(d) => d,
+		};
+		match credit.offset(debt) {
+			Ok(SameOrOther::None) => Ok(CreditOf::<AccountId, Self>::zero(asset)),
+			Ok(SameOrOther::Same(dust)) => Ok(dust),
+			Ok(SameOrOther::Other(rest)) => {
+				debug_assert!(false, "ok withdraw return must be at least debt value; qed");
+				Err(rest)
+			}
+			Err(_) => {
+				debug_assert!(false, "debt.asset is credit.asset; qed");
+				Ok(CreditOf::<AccountId, Self>::zero(asset))
+			}
+		}
+	}
+}
+
+/// A fungible token class where the balance can be set arbitrarily.
+///
+/// **WARNING**
+/// Do not use this directly unless you want trouble, since it allows you to alter account balances
+/// without keeping the issuance up to date. It has no safeguards against accidentally creating
+/// token imbalances in your system leading to accidental imflation or deflation. It's really just
+/// for the underlying datatype to implement so the user gets the much safer `Balanced` trait to
+/// use.
+pub trait Unbalanced<AccountId>: Inspect<AccountId> {
+	/// Set the `asset` balance of `who` to `amount`. If this cannot be done for some reason (e.g.
+	/// because the account cannot be created or an overflow) then an `Err` is returned.
+	fn set_balance(asset: Self::AssetId, who: &AccountId, amount: Self::Balance) -> DispatchResult;
+
+	/// Set the total issuance of `asset` to `amount`.
+	fn set_total_issuance(asset: Self::AssetId, amount: Self::Balance);
+
+	/// Reduce the `asset` balance of `who` by `amount`. If it cannot be reduced by that amount for
+	/// some reason, return `Err` and don't reduce it at all. If Ok, return the imbalance.
+	///
+	/// Minimum balance will be respected and the returned imbalance may be up to
+	/// `Self::minimum_balance() - 1` greater than `amount`.
+	fn decrease_balance(asset: Self::AssetId, who: &AccountId, amount: Self::Balance)
+		-> Result<Self::Balance, DispatchError>
+	{
+		let old_balance = Self::balance(asset, who);
+		let (mut new_balance, mut amount) = if old_balance < amount {
+			Err(TokenError::NoFunds)?
+		} else {
+			(old_balance - amount, amount)
+		};
+		if new_balance < Self::minimum_balance(asset) {
+			amount = amount.saturating_add(new_balance);
+			new_balance = Zero::zero();
+		}
+		// Defensive only - this should not fail now.
+		Self::set_balance(asset, who, new_balance)?;
+		Ok(amount)
+	}
+
+	/// Reduce the `asset` balance of `who` by the most that is possible, up to `amount`.
+	///
+	/// Minimum balance will be respected and the returned imbalance may be up to
+	/// `Self::minimum_balance() - 1` greater than `amount`.
+	///
+	/// Return the imbalance by which the account was reduced.
+	fn decrease_balance_at_most(asset: Self::AssetId, who: &AccountId, amount: Self::Balance)
+		-> Self::Balance
+	{
+		let old_balance = Self::balance(asset, who);
+		let (mut new_balance, mut amount) = if old_balance < amount {
+			(Zero::zero(), old_balance)
+		} else {
+			(old_balance - amount, amount)
+		};
+		let minimum_balance = Self::minimum_balance(asset);
+		if new_balance < minimum_balance {
+			amount = amount.saturating_add(new_balance);
+			new_balance = Zero::zero();
+		}
+		let mut r = Self::set_balance(asset, who, new_balance);
+		if r.is_err() {
+			// Some error, probably because we tried to destroy an account which cannot be destroyed.
+			if new_balance.is_zero() && amount >= minimum_balance {
+				new_balance = minimum_balance;
+				amount -= minimum_balance;
+				r = Self::set_balance(asset, who, new_balance);
+			}
+			if r.is_err() {
+				// Still an error. Apparently it's not possible to reduce at all.
+				amount = Zero::zero();
+			}
+		}
+		amount
+	}
+
+	/// Increase the `asset` balance of `who` by `amount`. If it cannot be increased by that amount
+	/// for some reason, return `Err` and don't increase it at all. If Ok, return the imbalance.
+	///
+	/// Minimum balance will be respected and an error will be returned if
+	/// `amount < Self::minimum_balance()` when the account of `who` is zero.
+	fn increase_balance(asset: Self::AssetId, who: &AccountId, amount: Self::Balance)
+		-> Result<Self::Balance, DispatchError>
+	{
+		let old_balance = Self::balance(asset, who);
+		let new_balance = old_balance.checked_add(&amount).ok_or(TokenError::Overflow)?;
+		if new_balance < Self::minimum_balance(asset) {
+			Err(TokenError::BelowMinimum)?
+		}
+		if old_balance != new_balance {
+			Self::set_balance(asset, who, new_balance)?;
+		}
+		Ok(amount)
+	}
+
+	/// Increase the `asset` balance of `who` by the most that is possible, up to `amount`.
+	///
+	/// Minimum balance will be respected and the returned imbalance will be zero in the case that
+	/// `amount < Self::minimum_balance()`.
+	///
+	/// Return the imbalance by which the account was increased.
+	fn increase_balance_at_most(asset: Self::AssetId, who: &AccountId, amount: Self::Balance)
+		-> Self::Balance
+	{
+		let old_balance = Self::balance(asset, who);
+		let mut new_balance = old_balance.saturating_add(amount);
+		let mut amount = new_balance - old_balance;
+		if new_balance < Self::minimum_balance(asset) {
+			new_balance = Zero::zero();
+			amount = Zero::zero();
+		}
+		if old_balance == new_balance || Self::set_balance(asset, who, new_balance).is_ok() {
+			amount
+		} else {
+			Zero::zero()
+		}
+	}
+}
+
+/// Simple handler for an imbalance drop which increases the total issuance of the system by the
+/// imbalance amount. Used for leftover debt.
+pub struct IncreaseIssuance<AccountId, U>(PhantomData<(AccountId, U)>);
+impl<AccountId, U: Unbalanced<AccountId>> HandleImbalanceDrop<U::AssetId, U::Balance>
+	for IncreaseIssuance<AccountId, U>
+{
+	fn handle(asset: U::AssetId, amount: U::Balance) {
+		U::set_total_issuance(asset, U::total_issuance(asset).saturating_add(amount))
+	}
+}
+
+/// Simple handler for an imbalance drop which decreases the total issuance of the system by the
+/// imbalance amount. Used for leftover credit.
+pub struct DecreaseIssuance<AccountId, U>(PhantomData<(AccountId, U)>);
+impl<AccountId, U: Unbalanced<AccountId>> HandleImbalanceDrop<U::AssetId, U::Balance>
+	for DecreaseIssuance<AccountId, U>
+{
+	fn handle(asset: U::AssetId, amount: U::Balance) {
+		U::set_total_issuance(asset, U::total_issuance(asset).saturating_sub(amount))
+	}
+}
+
+/// An imbalance type which uses `DecreaseIssuance` to deal with anything `Drop`ed.
+///
+/// Basically means that funds in someone's account have been removed and not yet placed anywhere
+/// else. If it gets dropped, then those funds will be assumed to be "burned" and the total supply
+/// will be accordingly decreased to ensure it equals the sum of the balances of all accounts.
+type Credit<AccountId, U> = Imbalance<
+	<U as Inspect<AccountId>>::AssetId,
+	<U as Inspect<AccountId>>::Balance,
+	DecreaseIssuance<AccountId, U>,
+	IncreaseIssuance<AccountId, U>,
+>;
+
+/// An imbalance type which uses `IncreaseIssuance` to deal with anything `Drop`ed.
+///
+/// Basically means that there are funds in someone's account whose origin is as yet unaccounted
+/// for. If it gets dropped, then those funds will be assumed to be "minted" and the total supply
+/// will be accordingly increased to ensure it equals the sum of the balances of all accounts.
+type Debt<AccountId, U> = Imbalance<
+	<U as Inspect<AccountId>>::AssetId,
+	<U as Inspect<AccountId>>::Balance,
+	IncreaseIssuance<AccountId, U>,
+	DecreaseIssuance<AccountId, U>,
+>;
+
+/// Create some `Credit` item. Only for internal use.
+fn credit<AccountId, U: Unbalanced<AccountId>>(
+	asset: U::AssetId,
+	amount: U::Balance,
+) -> Credit<AccountId, U> {
+	Imbalance::new(asset, amount)
+}
+
+/// Create some `Debt` item. Only for internal use.
+fn debt<AccountId, U: Unbalanced<AccountId>>(
+	asset: U::AssetId,
+	amount: U::Balance,
+) -> Debt<AccountId, U> {
+	Imbalance::new(asset, amount)
+}
+
+impl<AccountId, U: Unbalanced<AccountId>> Balanced<AccountId> for U {
+	type OnDropCredit = DecreaseIssuance<AccountId, U>;
+	type OnDropDebt = IncreaseIssuance<AccountId, U>;
+	fn rescind(asset: Self::AssetId, amount: Self::Balance) -> Debt<AccountId, Self> {
+		U::set_total_issuance(asset, U::total_issuance(asset).saturating_sub(amount));
+		debt(asset, amount)
+	}
+	fn issue(asset: Self::AssetId, amount: Self::Balance) -> Credit<AccountId, Self> {
+		U::set_total_issuance(asset, U::total_issuance(asset).saturating_add(amount));
+		credit(asset, amount)
+	}
+	fn slash(
+		asset: Self::AssetId,
+		who: &AccountId,
+		amount: Self::Balance,
+	) -> (Credit<AccountId, Self>, Self::Balance) {
+		let slashed = U::decrease_balance_at_most(asset, who, amount);
+		// `slashed` could be less than, greater than or equal to `amount`.
+		// If slashed == amount, it means the account had at least amount in it and it could all be
+		//   removed without a problem.
+		// If slashed > amount, it means the account had more than amount in it, but not enough more
+		//   to push it over minimum_balance.
+		// If slashed < amount, it means the account didn't have enough in it to be reduced by
+		//   `amount` without being destroyed.
+		(credit(asset, slashed), amount.saturating_sub(slashed))
+	}
+	fn deposit(
+		asset: Self::AssetId,
+		who: &AccountId,
+		amount: Self::Balance
+	) -> Result<Debt<AccountId, Self>, DispatchError> {
+		let increase = U::increase_balance(asset, who, amount)?;
+		Ok(debt(asset, increase))
+	}
+	fn withdraw(
+		asset: Self::AssetId,
+		who: &AccountId,
+		amount: Self::Balance,
+		//TODO: liveness: ExistenceRequirement,
+	) -> Result<Credit<AccountId, Self>, DispatchError> {
+		let decrease = U::decrease_balance(asset, who, amount)?;
+		Ok(credit(asset, decrease))
+	}
+}
diff --git a/frame/support/src/traits/tokens/fungibles/imbalance.rs b/frame/support/src/traits/tokens/fungibles/imbalance.rs
new file mode 100644
index 000000000000..ecc415cb568b
--- /dev/null
+++ b/frame/support/src/traits/tokens/fungibles/imbalance.rs
@@ -0,0 +1,169 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! The imbalance type and its associates, which handles keeps everything adding up properly with
+//! unbalanced operations.
+
+use super::*;
+use sp_std::marker::PhantomData;
+use sp_runtime::traits::Zero;
+use super::fungibles::{AssetId, Balance};
+use super::balanced::Balanced;
+use crate::traits::misc::{TryDrop, SameOrOther};
+
+/// Handler for when an imbalance gets dropped. This could handle either a credit (negative) or
+/// debt (positive) imbalance.
+pub trait HandleImbalanceDrop<AssetId, Balance> {
+	fn handle(asset: AssetId, amount: Balance);
+}
+
+/// An imbalance in the system, representing a divergence of recorded token supply from the sum of
+/// the balances of all accounts. This is `must_use` in order to ensure it gets handled (placing
+/// into an account, settling from an account or altering the supply).
+///
+/// Importantly, it has a special `Drop` impl, and cannot be created outside of this module.
+#[must_use]
+pub struct Imbalance<
+	A: AssetId,
+	B: Balance,
+	OnDrop: HandleImbalanceDrop<A, B>,
+	OppositeOnDrop: HandleImbalanceDrop<A, B>,
+> {
+	asset: A,
+	amount: B,
+	_phantom: PhantomData<(OnDrop, OppositeOnDrop)>,
+}
+
+impl<
+	A: AssetId,
+	B: Balance,
+	OnDrop: HandleImbalanceDrop<A, B>,
+	OppositeOnDrop: HandleImbalanceDrop<A, B>
+> Drop for Imbalance<A, B, OnDrop, OppositeOnDrop> {
+	fn drop(&mut self) {
+		if !self.amount.is_zero() {
+			OnDrop::handle(self.asset, self.amount)
+		}
+	}
+}
+
+impl<
+	A: AssetId,
+	B: Balance,
+	OnDrop: HandleImbalanceDrop<A, B>,
+	OppositeOnDrop: HandleImbalanceDrop<A, B>,
+> TryDrop for Imbalance<A, B, OnDrop, OppositeOnDrop> {
+	/// Drop an instance cleanly. Only works if its value represents "no-operation".
+	fn try_drop(self) -> Result<(), Self> {
+		self.drop_zero()
+	}
+}
+
+impl<
+	A: AssetId,
+	B: Balance,
+	OnDrop: HandleImbalanceDrop<A, B>,
+	OppositeOnDrop: HandleImbalanceDrop<A, B>,
+> Imbalance<A, B, OnDrop, OppositeOnDrop> {
+	pub fn zero(asset: A) -> Self {
+		Self { asset, amount: Zero::zero(), _phantom: PhantomData }
+	}
+
+	pub(crate) fn new(asset: A, amount: B) -> Self {
+		Self { asset, amount, _phantom: PhantomData }
+	}
+
+	pub fn drop_zero(self) -> Result<(), Self> {
+		if self.amount.is_zero() {
+			sp_std::mem::forget(self);
+			Ok(())
+		} else {
+			Err(self)
+		}
+	}
+
+	pub fn split(self, amount: B) -> (Self, Self) {
+		let first = self.amount.min(amount);
+		let second = self.amount - first;
+		let asset = self.asset;
+		sp_std::mem::forget(self);
+		(Imbalance::new(asset, first), Imbalance::new(asset, second))
+	}
+	pub fn merge(mut self, other: Self) -> Result<Self, (Self, Self)> {
+		if self.asset == other.asset {
+			self.amount = self.amount.saturating_add(other.amount);
+			sp_std::mem::forget(other);
+			Ok(self)
+		} else {
+			Err((self, other))
+		}
+	}
+	pub fn subsume(&mut self, other: Self) -> Result<(), Self> {
+		if self.asset == other.asset {
+			self.amount = self.amount.saturating_add(other.amount);
+			sp_std::mem::forget(other);
+			Ok(())
+		} else {
+			Err(other)
+		}
+	}
+	pub fn offset(self, other: Imbalance<A, B, OppositeOnDrop, OnDrop>) -> Result<
+		SameOrOther<Self, Imbalance<A, B, OppositeOnDrop, OnDrop>>,
+		(Self, Imbalance<A, B, OppositeOnDrop, OnDrop>),
+	> {
+		if self.asset == other.asset {
+			let (a, b) = (self.amount, other.amount);
+			let asset = self.asset;
+			sp_std::mem::forget((self, other));
+
+			if a == b {
+				Ok(SameOrOther::None)
+			} else if a > b {
+				Ok(SameOrOther::Same(Imbalance::new(asset, a - b)))
+			} else {
+				Ok(SameOrOther::Other(Imbalance::<A, B, OppositeOnDrop, OnDrop>::new(asset, b - a)))
+			}
+		} else {
+			Err((self, other))
+		}
+	}
+	pub fn peek(&self) -> B {
+		self.amount
+	}
+
+	pub fn asset(&self) -> A {
+		self.asset
+	}
+}
+
+/// Imbalance implying that the total_issuance value is less than the sum of all account balances.
+pub type DebtOf<AccountId, B> = Imbalance<
+	<B as Inspect<AccountId>>::AssetId,
+	<B as Inspect<AccountId>>::Balance,
+	// This will generally be implemented by increasing the total_issuance value.
+	<B as Balanced<AccountId>>::OnDropDebt,
+	<B as Balanced<AccountId>>::OnDropCredit,
+>;
+
+/// Imbalance implying that the total_issuance value is greater than the sum of all account balances.
+pub type CreditOf<AccountId, B> = Imbalance<
+	<B as Inspect<AccountId>>::AssetId,
+	<B as Inspect<AccountId>>::Balance,
+	// This will generally be implemented by decreasing the total_issuance value.
+	<B as Balanced<AccountId>>::OnDropCredit,
+	<B as Balanced<AccountId>>::OnDropDebt,
+>;
diff --git a/frame/support/src/traits/tokens/imbalance.rs b/frame/support/src/traits/tokens/imbalance.rs
new file mode 100644
index 000000000000..9652b9a0275a
--- /dev/null
+++ b/frame/support/src/traits/tokens/imbalance.rs
@@ -0,0 +1,174 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! The imbalance trait type and its associates, which handles keeps everything adding up properly
+//! with unbalanced operations.
+
+use sp_std::ops::Div;
+use sp_runtime::traits::Saturating;
+use crate::traits::misc::{TryDrop, SameOrOther};
+
+mod split_two_ways;
+mod signed_imbalance;
+mod on_unbalanced;
+pub use split_two_ways::SplitTwoWays;
+pub use signed_imbalance::SignedImbalance;
+pub use on_unbalanced::OnUnbalanced;
+
+/// A trait for a not-quite Linear Type that tracks an imbalance.
+///
+/// Functions that alter account balances return an object of this trait to
+/// express how much account balances have been altered in aggregate. If
+/// dropped, the currency system will take some default steps to deal with
+/// the imbalance (`balances` module simply reduces or increases its
+/// total issuance). Your module should generally handle it in some way,
+/// good practice is to do so in a configurable manner using an
+/// `OnUnbalanced` type for each situation in which your module needs to
+/// handle an imbalance.
+///
+/// Imbalances can either be Positive (funds were added somewhere without
+/// being subtracted elsewhere - e.g. a reward) or Negative (funds deducted
+/// somewhere without an equal and opposite addition - e.g. a slash or
+/// system fee payment).
+///
+/// Since they are unsigned, the actual type is always Positive or Negative.
+/// The trait makes no distinction except to define the `Opposite` type.
+///
+/// New instances of zero value can be created (`zero`) and destroyed
+/// (`drop_zero`).
+///
+/// Existing instances can be `split` and merged either consuming `self` with
+/// `merge` or mutating `self` with `subsume`. If the target is an `Option`,
+/// then `maybe_merge` and `maybe_subsume` might work better. Instances can
+/// also be `offset` with an `Opposite` that is less than or equal to in value.
+///
+/// You can always retrieve the raw balance value using `peek`.
+#[must_use]
+pub trait Imbalance<Balance>: Sized + TryDrop + Default {
+	/// The oppositely imbalanced type. They come in pairs.
+	type Opposite: Imbalance<Balance>;
+
+	/// The zero imbalance. Can be destroyed with `drop_zero`.
+	fn zero() -> Self;
+
+	/// Drop an instance cleanly. Only works if its `self.value()` is zero.
+	fn drop_zero(self) -> Result<(), Self>;
+
+	/// Consume `self` and return two independent instances; the first
+	/// is guaranteed to be at most `amount` and the second will be the remainder.
+	fn split(self, amount: Balance) -> (Self, Self);
+
+	/// Consume `self` and return two independent instances; the amounts returned will be in
+	/// approximately the same ratio as `first`:`second`.
+	///
+	/// NOTE: This requires up to `first + second` room for a multiply, and `first + second` should
+	/// fit into a `u32`. Overflow will safely saturate in both cases.
+	fn ration(self, first: u32, second: u32) -> (Self, Self)
+		where Balance: From<u32> + Saturating + Div<Output=Balance>
+	{
+		let total: u32 = first.saturating_add(second);
+		if total == 0 { return (Self::zero(), Self::zero()) }
+		let amount1 = self.peek().saturating_mul(first.into()) / total.into();
+		self.split(amount1)
+	}
+
+	/// Consume self and add its two components, defined by the first component's balance,
+	/// element-wise to two pre-existing Imbalances.
+	///
+	/// A convenient replacement for `split` and `merge`.
+	fn split_merge(self, amount: Balance, others: (Self, Self)) -> (Self, Self) {
+		let (a, b) = self.split(amount);
+		(a.merge(others.0), b.merge(others.1))
+	}
+
+	/// Consume self and add its two components, defined by the ratio `first`:`second`,
+	/// element-wise to two pre-existing Imbalances.
+	///
+	/// A convenient replacement for `split` and `merge`.
+	fn ration_merge(self, first: u32, second: u32, others: (Self, Self)) -> (Self, Self)
+		where Balance: From<u32> + Saturating + Div<Output=Balance>
+	{
+		let (a, b) = self.ration(first, second);
+		(a.merge(others.0), b.merge(others.1))
+	}
+
+	/// Consume self and add its two components, defined by the first component's balance,
+	/// element-wise into two pre-existing Imbalance refs.
+	///
+	/// A convenient replacement for `split` and `subsume`.
+	fn split_merge_into(self, amount: Balance, others: &mut (Self, Self)) {
+		let (a, b) = self.split(amount);
+		others.0.subsume(a);
+		others.1.subsume(b);
+	}
+
+	/// Consume self and add its two components, defined by the ratio `first`:`second`,
+	/// element-wise to two pre-existing Imbalances.
+	///
+	/// A convenient replacement for `split` and `merge`.
+	fn ration_merge_into(self, first: u32, second: u32, others: &mut (Self, Self))
+		where Balance: From<u32> + Saturating + Div<Output=Balance>
+	{
+		let (a, b) = self.ration(first, second);
+		others.0.subsume(a);
+		others.1.subsume(b);
+	}
+
+	/// Consume `self` and an `other` to return a new instance that combines
+	/// both.
+	fn merge(self, other: Self) -> Self;
+
+	/// Consume self to mutate `other` so that it combines both. Just like `subsume`, only with
+	/// reversed arguments.
+	fn merge_into(self, other: &mut Self) {
+		other.subsume(self)
+	}
+
+	/// Consume `self` and maybe an `other` to return a new instance that combines
+	/// both.
+	fn maybe_merge(self, other: Option<Self>) -> Self {
+		if let Some(o) = other {
+			self.merge(o)
+		} else {
+			self
+		}
+	}
+
+	/// Consume an `other` to mutate `self` into a new instance that combines
+	/// both.
+	fn subsume(&mut self, other: Self);
+
+	/// Maybe consume an `other` to mutate `self` into a new instance that combines
+	/// both.
+	fn maybe_subsume(&mut self, other: Option<Self>) {
+		if let Some(o) = other {
+			self.subsume(o)
+		}
+	}
+
+	/// Consume self and along with an opposite counterpart to return
+	/// a combined result.
+	///
+	/// Returns `Ok` along with a new instance of `Self` if this instance has a
+	/// greater value than the `other`. Otherwise returns `Err` with an instance of
+	/// the `Opposite`. In both cases the value represents the combination of `self`
+	/// and `other`.
+	fn offset(self, other: Self::Opposite)-> SameOrOther<Self, Self::Opposite>;
+
+	/// The raw value of self.
+	fn peek(&self) -> Balance;
+}
diff --git a/frame/support/src/traits/tokens/imbalance/on_unbalanced.rs b/frame/support/src/traits/tokens/imbalance/on_unbalanced.rs
new file mode 100644
index 000000000000..f3ecc14308e7
--- /dev/null
+++ b/frame/support/src/traits/tokens/imbalance/on_unbalanced.rs
@@ -0,0 +1,50 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Trait for handling imbalances.
+
+use crate::traits::misc::TryDrop;
+
+/// Handler for when some currency "account" decreased in balance for
+/// some reason.
+///
+/// The only reason at present for an increase would be for validator rewards, but
+/// there may be other reasons in the future or for other chains.
+///
+/// Reasons for decreases include:
+///
+/// - Someone got slashed.
+/// - Someone paid for a transaction to be included.
+pub trait OnUnbalanced<Imbalance: TryDrop> {
+	/// Handler for some imbalances. The different imbalances might have different origins or
+	/// meanings, dependent on the context. Will default to simply calling on_unbalanced for all
+	/// of them. Infallible.
+	fn on_unbalanceds<B>(amounts: impl Iterator<Item=Imbalance>) where Imbalance: crate::traits::Imbalance<B> {
+		Self::on_unbalanced(amounts.fold(Imbalance::zero(), |i, x| x.merge(i)))
+	}
+
+	/// Handler for some imbalance. Infallible.
+	fn on_unbalanced(amount: Imbalance) {
+		amount.try_drop().unwrap_or_else(Self::on_nonzero_unbalanced)
+	}
+
+	/// Actually handle a non-zero imbalance. You probably want to implement this rather than
+	/// `on_unbalanced`.
+	fn on_nonzero_unbalanced(amount: Imbalance) { drop(amount); }
+}
+
+impl<Imbalance: TryDrop> OnUnbalanced<Imbalance> for () {}
diff --git a/frame/support/src/traits/tokens/imbalance/signed_imbalance.rs b/frame/support/src/traits/tokens/imbalance/signed_imbalance.rs
new file mode 100644
index 000000000000..e3523f86804f
--- /dev/null
+++ b/frame/support/src/traits/tokens/imbalance/signed_imbalance.rs
@@ -0,0 +1,69 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Convenience type for managing an imbalance whose sign is unknown.
+
+use codec::FullCodec;
+use sp_std::fmt::Debug;
+use sp_runtime::traits::{AtLeast32BitUnsigned, MaybeSerializeDeserialize};
+use crate::traits::misc::SameOrOther;
+use super::super::imbalance::Imbalance;
+
+/// Either a positive or a negative imbalance.
+pub enum SignedImbalance<B, PositiveImbalance: Imbalance<B>>{
+	/// A positive imbalance (funds have been created but none destroyed).
+	Positive(PositiveImbalance),
+	/// A negative imbalance (funds have been destroyed but none created).
+	Negative(PositiveImbalance::Opposite),
+}
+
+impl<
+	P: Imbalance<B, Opposite=N>,
+	N: Imbalance<B, Opposite=P>,
+	B: AtLeast32BitUnsigned + FullCodec + Copy + MaybeSerializeDeserialize + Debug + Default,
+> SignedImbalance<B, P> {
+	/// Create a `Positive` instance of `Self` whose value is zero.
+	pub fn zero() -> Self {
+		SignedImbalance::Positive(P::zero())
+	}
+
+	/// Drop `Self` if and only if it is equal to zero. Return `Err` with `Self` if not.
+	pub fn drop_zero(self) -> Result<(), Self> {
+		match self {
+			SignedImbalance::Positive(x) => x.drop_zero().map_err(SignedImbalance::Positive),
+			SignedImbalance::Negative(x) => x.drop_zero().map_err(SignedImbalance::Negative),
+		}
+	}
+
+	/// Consume `self` and an `other` to return a new instance that combines
+	/// both.
+	pub fn merge(self, other: Self) -> Self {
+		match (self, other) {
+			(SignedImbalance::Positive(one), SignedImbalance::Positive(other)) =>
+				SignedImbalance::Positive(one.merge(other)),
+			(SignedImbalance::Negative(one), SignedImbalance::Negative(other)) =>
+				SignedImbalance::Negative(one.merge(other)),
+			(SignedImbalance::Positive(one), SignedImbalance::Negative(other)) =>
+				match one.offset(other) {
+					SameOrOther::Same(positive) => SignedImbalance::Positive(positive),
+					SameOrOther::Other(negative) => SignedImbalance::Negative(negative),
+					SameOrOther::None => SignedImbalance::Positive(P::zero()),
+				},
+			(one, other) => other.merge(one),
+		}
+	}
+}
diff --git a/frame/support/src/traits/tokens/imbalance/split_two_ways.rs b/frame/support/src/traits/tokens/imbalance/split_two_ways.rs
new file mode 100644
index 000000000000..f3f9870b62cd
--- /dev/null
+++ b/frame/support/src/traits/tokens/imbalance/split_two_ways.rs
@@ -0,0 +1,51 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Means for splitting an imbalance into two and hanlding them differently.
+
+use sp_std::{ops::Div, marker::PhantomData};
+use sp_core::u32_trait::Value as U32;
+use sp_runtime::traits::Saturating;
+use super::super::imbalance::{Imbalance, OnUnbalanced};
+
+/// Split an unbalanced amount two ways between a common divisor.
+pub struct SplitTwoWays<
+	Balance,
+	Imbalance,
+	Part1,
+	Target1,
+	Part2,
+	Target2,
+>(PhantomData<(Balance, Imbalance, Part1, Target1, Part2, Target2)>);
+
+impl<
+	Balance: From<u32> + Saturating + Div<Output=Balance>,
+	I: Imbalance<Balance>,
+	Part1: U32,
+	Target1: OnUnbalanced<I>,
+	Part2: U32,
+	Target2: OnUnbalanced<I>,
+> OnUnbalanced<I> for SplitTwoWays<Balance, I, Part1, Target1, Part2, Target2>
+{
+	fn on_nonzero_unbalanced(amount: I) {
+		let total: u32 = Part1::VALUE + Part2::VALUE;
+		let amount1 = amount.peek().saturating_mul(Part1::VALUE.into()) / total.into();
+		let (imb1, imb2) = amount.split(amount1);
+		Target1::on_unbalanced(imb1);
+		Target2::on_unbalanced(imb2);
+	}
+}
diff --git a/frame/support/src/traits/tokens/misc.rs b/frame/support/src/traits/tokens/misc.rs
new file mode 100644
index 000000000000..303d183cf274
--- /dev/null
+++ b/frame/support/src/traits/tokens/misc.rs
@@ -0,0 +1,164 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Miscellaneous types.
+
+use codec::{Encode, Decode, FullCodec};
+use sp_core::RuntimeDebug;
+use sp_arithmetic::traits::{Zero, AtLeast32BitUnsigned};
+use sp_runtime::TokenError;
+
+/// One of a number of consequences of withdrawing a fungible from an account.
+#[derive(Copy, Clone, Eq, PartialEq)]
+pub enum WithdrawConsequence<Balance> {
+	/// Withdraw could not happen since the amount to be withdrawn is less than the total funds in
+	/// the account.
+	NoFunds,
+	/// The withdraw would mean the account dying when it needs to exist (usually because it is a
+	/// provider and there are consumer references on it).
+	WouldDie,
+	/// The asset is unknown. Usually because an `AssetId` has been presented which doesn't exist
+	/// on the system.
+	UnknownAsset,
+	/// There has been an underflow in the system. This is indicative of a corrupt state and
+	/// likely unrecoverable.
+	Underflow,
+	/// Not enough of the funds in the account are unavailable for withdrawal.
+	Frozen,
+	/// Account balance would reduce to zero, potentially destroying it. The parameter is the
+	/// amount of balance which is destroyed.
+	ReducedToZero(Balance),
+	/// Account continued in existence.
+	Success,
+}
+
+impl<Balance: Zero> WithdrawConsequence<Balance> {
+	/// Convert the type into a `Result` with `TokenError` as the error or the additional `Balance`
+	/// by which the account will be reduced.
+	pub fn into_result(self) -> Result<Balance, TokenError> {
+		use WithdrawConsequence::*;
+		match self {
+			NoFunds => Err(TokenError::NoFunds),
+			WouldDie => Err(TokenError::WouldDie),
+			UnknownAsset => Err(TokenError::UnknownAsset),
+			Underflow => Err(TokenError::Underflow),
+			Frozen => Err(TokenError::Frozen),
+			ReducedToZero(result) => Ok(result),
+			Success => Ok(Zero::zero()),
+		}
+	}
+}
+
+/// One of a number of consequences of withdrawing a fungible from an account.
+#[derive(Copy, Clone, Eq, PartialEq)]
+pub enum DepositConsequence {
+	/// Deposit couldn't happen due to the amount being too low. This is usually because the
+	/// account doesn't yet exist and the deposit wouldn't bring it to at least the minimum needed
+	/// for existance.
+	BelowMinimum,
+	/// Deposit cannot happen since the account cannot be created (usually because it's a consumer
+	/// and there exists no provider reference).
+	CannotCreate,
+	/// The asset is unknown. Usually because an `AssetId` has been presented which doesn't exist
+	/// on the system.
+	UnknownAsset,
+	/// An overflow would occur. This is practically unexpected, but could happen in test systems
+	/// with extremely small balance types or balances that approach the max value of the balance
+	/// type.
+	Overflow,
+	/// Account continued in existence.
+	Success,
+}
+
+impl DepositConsequence {
+	/// Convert the type into a `Result` with `TokenError` as the error.
+	pub fn into_result(self) -> Result<(), TokenError> {
+		use DepositConsequence::*;
+		Err(match self {
+			BelowMinimum => TokenError::BelowMinimum,
+			CannotCreate => TokenError::CannotCreate,
+			UnknownAsset => TokenError::UnknownAsset,
+			Overflow => TokenError::Overflow,
+			Success => return Ok(()),
+		})
+	}
+}
+
+/// Simple boolean for whether an account needs to be kept in existence.
+#[derive(Copy, Clone, Eq, PartialEq)]
+pub enum ExistenceRequirement {
+	/// Operation must not result in the account going out of existence.
+	///
+	/// Note this implies that if the account never existed in the first place, then the operation
+	/// may legitimately leave the account unchanged and still non-existent.
+	KeepAlive,
+	/// Operation may result in account going out of existence.
+	AllowDeath,
+}
+
+/// Status of funds.
+#[derive(PartialEq, Eq, Clone, Copy, Encode, Decode, RuntimeDebug)]
+pub enum BalanceStatus {
+	/// Funds are free, as corresponding to `free` item in Balances.
+	Free,
+	/// Funds are reserved, as corresponding to `reserved` item in Balances.
+	Reserved,
+}
+
+bitflags::bitflags! {
+	/// Reasons for moving funds out of an account.
+	#[derive(Encode, Decode)]
+	pub struct WithdrawReasons: i8 {
+		/// In order to pay for (system) transaction costs.
+		const TRANSACTION_PAYMENT = 0b00000001;
+		/// In order to transfer ownership.
+		const TRANSFER = 0b00000010;
+		/// In order to reserve some funds for a later return or repatriation.
+		const RESERVE = 0b00000100;
+		/// In order to pay some other (higher-level) fees.
+		const FEE = 0b00001000;
+		/// In order to tip a validator for transaction inclusion.
+		const TIP = 0b00010000;
+	}
+}
+
+impl WithdrawReasons {
+	/// Choose all variants except for `one`.
+	///
+	/// ```rust
+	/// # use frame_support::traits::WithdrawReasons;
+	/// # fn main() {
+	/// assert_eq!(
+	/// 	WithdrawReasons::FEE | WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE | WithdrawReasons::TIP,
+	/// 	WithdrawReasons::except(WithdrawReasons::TRANSACTION_PAYMENT),
+	///	);
+	/// # }
+	/// ```
+	pub fn except(one: WithdrawReasons) -> WithdrawReasons {
+		let mut flags = Self::all();
+		flags.toggle(one);
+		flags
+	}
+}
+
+/// Simple amalgamation trait to collect together properties for an AssetId under one roof.
+pub trait AssetId: FullCodec + Copy + Default + Eq + PartialEq {}
+impl<T: FullCodec + Copy + Default + Eq + PartialEq> AssetId for T {}
+
+/// Simple amalgamation trait to collect together properties for a Balance under one roof.
+pub trait Balance: AtLeast32BitUnsigned + FullCodec + Copy + Default {}
+impl<T: AtLeast32BitUnsigned + FullCodec + Copy + Default> Balance for T {}
diff --git a/frame/support/src/traits/validation.rs b/frame/support/src/traits/validation.rs
new file mode 100644
index 000000000000..900be7bb8e7e
--- /dev/null
+++ b/frame/support/src/traits/validation.rs
@@ -0,0 +1,242 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Traits for dealing with validation and validators.
+
+use sp_std::prelude::*;
+use codec::{Codec, Decode};
+use sp_runtime::traits::{Convert, Zero};
+use sp_runtime::{BoundToRuntimeAppPublic, ConsensusEngineId, Percent, RuntimeAppPublic};
+use sp_staking::SessionIndex;
+use crate::dispatch::Parameter;
+use crate::weights::Weight;
+
+/// A trait for online node inspection in a session.
+///
+/// Something that can give information about the current validator set.
+pub trait ValidatorSet<AccountId> {
+	/// Type for representing validator id in a session.
+	type ValidatorId: Parameter;
+	/// A type for converting `AccountId` to `ValidatorId`.
+	type ValidatorIdOf: Convert<AccountId, Option<Self::ValidatorId>>;
+
+	/// Returns current session index.
+	fn session_index() -> SessionIndex;
+
+	/// Returns the active set of validators.
+	fn validators() -> Vec<Self::ValidatorId>;
+}
+
+/// [`ValidatorSet`] combined with an identification.
+pub trait ValidatorSetWithIdentification<AccountId>: ValidatorSet<AccountId> {
+	/// Full identification of `ValidatorId`.
+	type Identification: Parameter;
+	/// A type for converting `ValidatorId` to `Identification`.
+	type IdentificationOf: Convert<Self::ValidatorId, Option<Self::Identification>>;
+}
+
+/// A trait for finding the author of a block header based on the `PreRuntime` digests contained
+/// within it.
+pub trait FindAuthor<Author> {
+	/// Find the author of a block based on the pre-runtime digests.
+	fn find_author<'a, I>(digests: I) -> Option<Author>
+		where I: 'a + IntoIterator<Item=(ConsensusEngineId, &'a [u8])>;
+}
+
+impl<A> FindAuthor<A> for () {
+	fn find_author<'a, I>(_: I) -> Option<A>
+		where I: 'a + IntoIterator<Item=(ConsensusEngineId, &'a [u8])>
+	{
+		None
+	}
+}
+
+/// A trait for verifying the seal of a header and returning the author.
+pub trait VerifySeal<Header, Author> {
+	/// Verify a header and return the author, if any.
+	fn verify_seal(header: &Header) -> Result<Option<Author>, &'static str>;
+}
+
+/// A session handler for specific key type.
+pub trait OneSessionHandler<ValidatorId>: BoundToRuntimeAppPublic {
+	/// The key type expected.
+	type Key: Decode + Default + RuntimeAppPublic;
+
+	/// The given validator set will be used for the genesis session.
+	/// It is guaranteed that the given validator set will also be used
+	/// for the second session, therefore the first call to `on_new_session`
+	/// should provide the same validator set.
+	fn on_genesis_session<'a, I: 'a>(validators: I)
+		where I: Iterator<Item=(&'a ValidatorId, Self::Key)>, ValidatorId: 'a;
+
+	/// Session set has changed; act appropriately. Note that this can be called
+	/// before initialization of your module.
+	///
+	/// `changed` is true when at least one of the session keys
+	/// or the underlying economic identities/distribution behind one the
+	/// session keys has changed, false otherwise.
+	///
+	/// The `validators` are the validators of the incoming session, and `queued_validators`
+	/// will follow.
+	fn on_new_session<'a, I: 'a>(
+		changed: bool,
+		validators: I,
+		queued_validators: I,
+	) where I: Iterator<Item=(&'a ValidatorId, Self::Key)>, ValidatorId: 'a;
+
+	/// A notification for end of the session.
+	///
+	/// Note it is triggered before any `SessionManager::end_session` handlers,
+	/// so we can still affect the validator set.
+	fn on_before_session_ending() {}
+
+	/// A validator got disabled. Act accordingly until a new session begins.
+	fn on_disabled(_validator_index: usize);
+}
+
+/// Something that can estimate at which block the next session rotation will happen (i.e. a new
+/// session starts).
+///
+/// The accuracy of the estimates is dependent on the specific implementation, but in order to get
+/// the best estimate possible these methods should be called throughout the duration of the session
+/// (rather than calling once and storing the result).
+///
+/// This should be the same logical unit that dictates `ShouldEndSession` to the session module. No
+/// assumptions are made about the scheduling of the sessions.
+pub trait EstimateNextSessionRotation<BlockNumber> {
+	/// Return the average length of a session.
+	///
+	/// This may or may not be accurate.
+	fn average_session_length() -> BlockNumber;
+
+	/// Return an estimate of the current session progress.
+	///
+	/// None should be returned if the estimation fails to come to an answer.
+	fn estimate_current_session_progress(now: BlockNumber) -> (Option<Percent>, Weight);
+
+	/// Return the block number at which the next session rotation is estimated to happen.
+	///
+	/// None should be returned if the estimation fails to come to an answer.
+	fn estimate_next_session_rotation(now: BlockNumber) -> (Option<BlockNumber>, Weight);
+}
+
+impl<BlockNumber: Zero> EstimateNextSessionRotation<BlockNumber> for () {
+	fn average_session_length() -> BlockNumber {
+		Zero::zero()
+	}
+
+	fn estimate_current_session_progress(_: BlockNumber) -> (Option<Percent>, Weight) {
+		(None, Zero::zero())
+	}
+
+	fn estimate_next_session_rotation(_: BlockNumber) -> (Option<BlockNumber>, Weight) {
+		(None, Zero::zero())
+	}
+}
+
+/// Something that can estimate at which block scheduling of the next session will happen (i.e when
+/// we will try to fetch new validators).
+///
+/// This only refers to the point when we fetch the next session details and not when we enact them
+/// (for enactment there's `EstimateNextSessionRotation`). With `pallet-session` this should be
+/// triggered whenever `SessionManager::new_session` is called.
+///
+/// For example, if we are using a staking module this would be the block when the session module
+/// would ask staking what the next validator set will be, as such this must always be implemented
+/// by the session module.
+pub trait EstimateNextNewSession<BlockNumber> {
+	/// Return the average length of a session.
+	///
+	/// This may or may not be accurate.
+	fn average_session_length() -> BlockNumber;
+
+	/// Return the block number at which the next new session is estimated to happen.
+	///
+	/// None should be returned if the estimation fails to come to an answer.
+	fn estimate_next_new_session(_: BlockNumber) -> (Option<BlockNumber>, Weight);
+}
+
+impl<BlockNumber: Zero> EstimateNextNewSession<BlockNumber> for () {
+	fn average_session_length() -> BlockNumber {
+		Zero::zero()
+	}
+
+	fn estimate_next_new_session(_: BlockNumber) -> (Option<BlockNumber>, Weight) {
+		(None, Zero::zero())
+	}
+}
+
+/// Something which can compute and check proofs of
+/// a historical key owner and return full identification data of that
+/// key owner.
+pub trait KeyOwnerProofSystem<Key> {
+	/// The proof of membership itself.
+	type Proof: Codec;
+	/// The full identification of a key owner and the stash account.
+	type IdentificationTuple: Codec;
+
+	/// Prove membership of a key owner in the current block-state.
+	///
+	/// This should typically only be called off-chain, since it may be
+	/// computationally heavy.
+	///
+	/// Returns `Some` iff the key owner referred to by the given `key` is a
+	/// member of the current set.
+	fn prove(key: Key) -> Option<Self::Proof>;
+
+	/// Check a proof of membership on-chain. Return `Some` iff the proof is
+	/// valid and recent enough to check.
+	fn check_proof(key: Key, proof: Self::Proof) -> Option<Self::IdentificationTuple>;
+}
+
+impl<Key> KeyOwnerProofSystem<Key> for () {
+	// The proof and identification tuples is any bottom type to guarantee that the methods of this
+	// implementation can never be called or return anything other than `None`.
+	type Proof = crate::Void;
+	type IdentificationTuple = crate::Void;
+
+	fn prove(_key: Key) -> Option<Self::Proof> {
+		None
+	}
+
+	fn check_proof(_key: Key, _proof: Self::Proof) -> Option<Self::IdentificationTuple> {
+		None
+	}
+}
+
+/// Trait to be used by block producing consensus engine modules to determine
+/// how late the current block is (e.g. in a slot-based proposal mechanism how
+/// many slots were skipped since the previous block).
+pub trait Lateness<N> {
+	/// Returns a generic measure of how late the current block is compared to
+	/// its parent.
+	fn lateness(&self) -> N;
+}
+
+impl<N: Zero> Lateness<N> for () {
+	fn lateness(&self) -> N {
+		Zero::zero()
+	}
+}
+
+/// Implementors of this trait provide information about whether or not some validator has
+/// been registered with them. The [Session module](../../pallet_session/index.html) is an implementor.
+pub trait ValidatorRegistration<ValidatorId> {
+	/// Returns true if the provided validator ID has been registered with the implementing runtime
+	/// module
+	fn is_registered(id: &ValidatorId) -> bool;
+}
diff --git a/frame/support/src/traits/voting.rs b/frame/support/src/traits/voting.rs
new file mode 100644
index 000000000000..b6913a182d30
--- /dev/null
+++ b/frame/support/src/traits/voting.rs
@@ -0,0 +1,88 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Traits and associated data structures concerned with voting, and moving between tokens and
+//! votes.
+
+use sp_arithmetic::traits::{UniqueSaturatedInto, UniqueSaturatedFrom, SaturatedConversion};
+
+/// A trait similar to `Convert` to convert values from `B` an abstract balance type
+/// into u64 and back from u128. (This conversion is used in election and other places where complex
+/// calculation over balance type is needed)
+///
+/// Total issuance of the currency is passed in, but an implementation of this trait may or may not
+/// use it.
+///
+/// # WARNING
+///
+/// the total issuance being passed in implies that the implementation must be aware of the fact
+/// that its values can affect the outcome. This implies that if the vote value is dependent on the
+/// total issuance, it should never ber written to storage for later re-use.
+pub trait CurrencyToVote<B> {
+	/// Convert balance to u64.
+	fn to_vote(value: B, issuance: B) -> u64;
+
+	/// Convert u128 to balance.
+	fn to_currency(value: u128, issuance: B) -> B;
+}
+
+/// An implementation of `CurrencyToVote` tailored for chain's that have a balance type of u128.
+///
+/// The factor is the `(total_issuance / u64::max()).max(1)`, represented as u64. Let's look at the
+/// important cases:
+///
+/// If the chain's total issuance is less than u64::max(), this will always be 1, which means that
+/// the factor will not have any effect. In this case, any account's balance is also less. Thus,
+/// both of the conversions are basically an `as`; Any balance can fit in u64.
+///
+/// If the chain's total issuance is more than 2*u64::max(), then a factor might be multiplied and
+/// divided upon conversion.
+pub struct U128CurrencyToVote;
+
+impl U128CurrencyToVote {
+	fn factor(issuance: u128) -> u128 {
+		(issuance / u64::max_value() as u128).max(1)
+	}
+}
+
+impl CurrencyToVote<u128> for U128CurrencyToVote {
+	fn to_vote(value: u128, issuance: u128) -> u64 {
+		(value / Self::factor(issuance)).saturated_into()
+	}
+
+	fn to_currency(value: u128, issuance: u128) -> u128 {
+		value.saturating_mul(Self::factor(issuance))
+	}
+}
+
+
+/// A naive implementation of `CurrencyConvert` that simply saturates all conversions.
+///
+/// # Warning
+///
+/// This is designed to be used mostly for testing. Use with care, and think about the consequences.
+pub struct SaturatingCurrencyToVote;
+
+impl<B: UniqueSaturatedInto<u64> + UniqueSaturatedFrom<u128>> CurrencyToVote<B> for SaturatingCurrencyToVote {
+	fn to_vote(value: B, _: B) -> u64 {
+		value.unique_saturated_into()
+	}
+
+	fn to_currency(value: u128, _: B) -> B {
+		B::unique_saturated_from(value)
+	}
+}
diff --git a/frame/support/test/tests/pallet_ui/genesis_default_not_satisfied.stderr b/frame/support/test/tests/pallet_ui/genesis_default_not_satisfied.stderr
index a2998788736a..8a6ee8b8f504 100644
--- a/frame/support/test/tests/pallet_ui/genesis_default_not_satisfied.stderr
+++ b/frame/support/test/tests/pallet_ui/genesis_default_not_satisfied.stderr
@@ -1,10 +1,10 @@
 error[E0277]: the trait bound `pallet::GenesisConfig: std::default::Default` is not satisfied
-    --> $DIR/genesis_default_not_satisfied.rs:22:18
-     |
-22   |     impl<T: Config> GenesisBuild<T> for GenesisConfig {}
-     |                     ^^^^^^^^^^^^^^^ the trait `std::default::Default` is not implemented for `pallet::GenesisConfig`
-     |
-    ::: $WORKSPACE/frame/support/src/traits.rs
-     |
-     | pub trait GenesisBuild<T, I=()>: Default + MaybeSerializeDeserialize {
-     |                                  ------- required by this bound in `GenesisBuild`
+   --> $DIR/genesis_default_not_satisfied.rs:22:18
+    |
+22  |     impl<T: Config> GenesisBuild<T> for GenesisConfig {}
+    |                     ^^^^^^^^^^^^^^^ the trait `std::default::Default` is not implemented for `pallet::GenesisConfig`
+    |
+   ::: $WORKSPACE/frame/support/src/traits/hooks.rs
+    |
+    | pub trait GenesisBuild<T, I=()>: Default + MaybeSerializeDeserialize {
+    |                                  ------- required by this bound in `GenesisBuild`
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index ebf9eb38375b..9d3ecd6f41f5 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -1201,11 +1201,22 @@ impl<T: Config> Pallet<T> {
 		Account::<T>::get(who).consumers
 	}
 
-	/// True if the account has some outstanding references.
+	/// True if the account has some outstanding consumer references.
 	pub fn is_provider_required(who: &T::AccountId) -> bool {
 		Account::<T>::get(who).consumers != 0
 	}
 
+	/// True if the account has no outstanding consumer references or more than one provider.
+	pub fn can_dec_provider(who: &T::AccountId) -> bool {
+		let a = Account::<T>::get(who);
+		a.consumers == 0 || a.providers > 1
+	}
+
+	/// True if the account has at least one provider reference.
+	pub fn can_inc_consumer(who: &T::AccountId) -> bool {
+		Account::<T>::get(who).providers > 0
+	}
+
 	/// Deposits an event into this block's event record.
 	pub fn deposit_event(event: impl Into<T::Event>) {
 		Self::deposit_event_indexed(&[], event.into());
diff --git a/frame/transaction-payment/src/payment.rs b/frame/transaction-payment/src/payment.rs
index f84b19d78c29..7292ef4dfee7 100644
--- a/frame/transaction-payment/src/payment.rs
+++ b/frame/transaction-payment/src/payment.rs
@@ -117,6 +117,7 @@ where
 			// merge the imbalance caused by paying the fees and refunding parts of it again.
 			let adjusted_paid = paid
 				.offset(refund_imbalance)
+				.same()
 				.map_err(|_| TransactionValidityError::Invalid(InvalidTransaction::Payment))?;
 			// Call someone else to handle the imbalance (fee and tip separately)
 			let imbalances = adjusted_paid.split(tip);
diff --git a/primitives/runtime/src/lib.rs b/primitives/runtime/src/lib.rs
index 4fb7d9c7737f..090c9781eb13 100644
--- a/primitives/runtime/src/lib.rs
+++ b/primitives/runtime/src/lib.rs
@@ -474,6 +474,8 @@ pub enum DispatchError {
 	ConsumerRemaining,
 	/// There are no providers so the account cannot be created.
 	NoProviders,
+	/// An error to do with tokens.
+	Token(TokenError),
 }
 
 /// Result of a `Dispatchable` which contains the `DispatchResult` and additional information about
@@ -532,6 +534,49 @@ impl From<crate::traits::StoredMapError> for DispatchError {
 	}
 }
 
+/// Description of what went wrong when trying to complete an operation on a token.
+#[derive(Eq, PartialEq, Clone, Copy, Encode, Decode, RuntimeDebug)]
+#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+pub enum TokenError {
+	/// Funds are unavailable.
+	NoFunds,
+	/// Account that must exist would die.
+	WouldDie,
+	/// Account cannot exist with the funds that would be given.
+	BelowMinimum,
+	/// Account cannot be created.
+	CannotCreate,
+	/// The asset in question is unknown.
+	UnknownAsset,
+	/// Funds exist but are frozen.
+	Frozen,
+	/// An underflow would occur.
+	Underflow,
+	/// An overflow would occur.
+	Overflow,
+}
+
+impl From<TokenError> for &'static str {
+	fn from(e: TokenError) -> &'static str {
+		match e {
+			TokenError::NoFunds => "Funds are unavailable",
+			TokenError::WouldDie => "Account that must exist would die",
+			TokenError::BelowMinimum => "Account cannot exist with the funds that would be given",
+			TokenError::CannotCreate => "Account cannot be created",
+			TokenError::UnknownAsset => "The asset in question is unknown",
+			TokenError::Frozen => "Funds exist but are frozen",
+			TokenError::Underflow => "An underflow would occur",
+			TokenError::Overflow => "An overflow would occur",
+		}
+	}
+}
+
+impl From<TokenError> for DispatchError {
+	fn from(e: TokenError) -> DispatchError {
+		DispatchError::Token(e)
+	}
+}
+
 impl From<&'static str> for DispatchError {
 	fn from(err: &'static str) -> DispatchError {
 		DispatchError::Other(err)
@@ -547,6 +592,7 @@ impl From<DispatchError> for &'static str {
 			DispatchError::Module { message, .. } => message.unwrap_or("Unknown module error"),
 			DispatchError::ConsumerRemaining => "Consumer remaining",
 			DispatchError::NoProviders => "No providers",
+			DispatchError::Token(e) => e.into(),
 		}
 	}
 }
@@ -575,6 +621,10 @@ impl traits::Printable for DispatchError {
 			}
 			Self::ConsumerRemaining => "Consumer remaining".print(),
 			Self::NoProviders => "No providers".print(),
+			Self::Token(e) => {
+				"Token error: ".print();
+				<&'static str>::from(*e).print();
+			}
 		}
 	}
 }
@@ -599,7 +649,9 @@ impl PartialEq for DispatchError {
 			(ConsumerRemaining, ConsumerRemaining) |
 			(NoProviders, NoProviders) => true,
 
+			(Token(l), Token(r)) => l == r,
 			(Other(l), Other(r)) => l == r,
+
 			(
 				Module { index: index_l, error: error_l, .. },
 				Module { index: index_r, error: error_r, .. },

From b4e27ee13ca7c86a647656643e07d624fcf0cc15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Sat, 27 Mar 2021 22:40:28 +0100
Subject: [PATCH 0566/1194] Use `async_trait` in sc-consensus-slots (#8461)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Use `async_trait` in sc-consensus-slots

This makes the code a little bit easier to read and also expresses that
there can always only be one call at a time to `on_slot`.

* slots: remove mutex around BlockImport in SlotWorker

Co-authored-by: André Silva <andrerfosilva@gmail.com>
---
 Cargo.lock                          |   2 +-
 client/consensus/aura/src/lib.rs    |  13 +-
 client/consensus/babe/src/lib.rs    |  10 +-
 client/consensus/slots/Cargo.toml   |   2 +-
 client/consensus/slots/src/lib.rs   | 278 ++++++++++++++++------------
 client/consensus/slots/src/slots.rs |  33 ++--
 6 files changed, 181 insertions(+), 157 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c869f0c8dfcf..3602f0cac5ce 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7313,11 +7313,11 @@ dependencies = [
 name = "sc-consensus-slots"
 version = "0.9.0"
 dependencies = [
+ "async-trait",
  "futures 0.3.13",
  "futures-timer 3.0.2",
  "log",
  "parity-scale-codec 2.0.1",
- "parking_lot 0.11.1",
  "sc-client-api",
  "sc-telemetry",
  "sp-api",
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index 81c6015ac7ef..cc60406d1664 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -35,7 +35,6 @@ use std::{
 };
 
 use futures::prelude::*;
-use parking_lot::Mutex;
 use log::{debug, trace};
 
 use codec::{Encode, Decode, Codec};
@@ -272,7 +271,7 @@ pub fn build_aura_worker<P, B, C, PF, I, SO, BS, Error>(
 {
 	AuraWorker {
 		client,
-		block_import: Arc::new(Mutex::new(block_import)),
+		block_import,
 		env: proposer_factory,
 		keystore,
 		sync_oracle,
@@ -286,7 +285,7 @@ pub fn build_aura_worker<P, B, C, PF, I, SO, BS, Error>(
 
 struct AuraWorker<C, E, I, P, SO, BS> {
 	client: Arc<C>,
-	block_import: Arc<Mutex<I>>,
+	block_import: I,
 	env: E,
 	keystore: SyncCryptoStorePtr,
 	sync_oracle: SO,
@@ -326,8 +325,8 @@ where
 		"aura"
 	}
 
-	fn block_import(&self) -> Arc<Mutex<Self::BlockImport>> {
-		self.block_import.clone()
+	fn block_import(&mut self) -> &mut Self::BlockImport {
+		&mut self.block_import
 	}
 
 	fn epoch_data(
@@ -805,7 +804,7 @@ mod tests {
 
 		let worker = AuraWorker {
 			client: client.clone(),
-			block_import: Arc::new(Mutex::new(client)),
+			block_import: client,
 			env: environ,
 			keystore: keystore.into(),
 			sync_oracle: DummyOracle.clone(),
@@ -854,7 +853,7 @@ mod tests {
 
 		let mut worker = AuraWorker {
 			client: client.clone(),
-			block_import: Arc::new(Mutex::new(client.clone())),
+			block_import: client.clone(),
 			env: environ,
 			keystore: keystore.into(),
 			sync_oracle: DummyOracle.clone(),
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index db13d0f3e420..28cfec1238e4 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -438,7 +438,7 @@ pub fn start_babe<B, C, SC, E, I, SO, CAW, BS, Error>(BabeParams {
 		+ Sync + 'static,
 	Error: std::error::Error + Send + From<ConsensusError> + From<I::Error> + 'static,
 	SO: SyncOracle + Send + Sync + Clone + 'static,
-	CAW: CanAuthorWith<B> + Send + 'static,
+	CAW: CanAuthorWith<B> + Send + Sync + 'static,
 	BS: BackoffAuthoringBlocksStrategy<NumberFor<B>> + Send + 'static,
 {
 	const HANDLE_BUFFER_SIZE: usize = 1024;
@@ -448,7 +448,7 @@ pub fn start_babe<B, C, SC, E, I, SO, CAW, BS, Error>(BabeParams {
 
 	let worker = BabeSlotWorker {
 		client: client.clone(),
-		block_import: Arc::new(Mutex::new(block_import)),
+		block_import,
 		env,
 		sync_oracle: sync_oracle.clone(),
 		force_authoring,
@@ -605,7 +605,7 @@ type SlotNotificationSinks<B> = Arc<
 
 struct BabeSlotWorker<B: BlockT, C, E, I, SO, BS> {
 	client: Arc<C>,
-	block_import: Arc<Mutex<I>>,
+	block_import: I,
 	env: E,
 	sync_oracle: SO,
 	force_authoring: bool,
@@ -647,8 +647,8 @@ where
 		"babe"
 	}
 
-	fn block_import(&self) -> Arc<Mutex<Self::BlockImport>> {
-		self.block_import.clone()
+	fn block_import(&mut self) -> &mut Self::BlockImport {
+		&mut self.block_import
 	}
 
 	fn epoch_data(
diff --git a/client/consensus/slots/Cargo.toml b/client/consensus/slots/Cargo.toml
index 34162cfae71e..64beea50fcf6 100644
--- a/client/consensus/slots/Cargo.toml
+++ b/client/consensus/slots/Cargo.toml
@@ -31,9 +31,9 @@ sp-inherents = { version = "3.0.0", path = "../../../primitives/inherents" }
 sp-timestamp = { version = "3.0.0", path = "../../../primitives/timestamp" }
 futures = "0.3.9"
 futures-timer = "3.0.1"
-parking_lot = "0.11.1"
 log = "0.4.11"
 thiserror = "1.0.21"
+async-trait = "0.1.42"
 
 [dev-dependencies]
 substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
diff --git a/client/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs
index 83dd88a8d49f..351ef932ada1 100644
--- a/client/consensus/slots/src/lib.rs
+++ b/client/consensus/slots/src/lib.rs
@@ -32,12 +32,11 @@ pub use slots::SlotInfo;
 use slots::Slots;
 pub use aux_schema::{check_equivocation, MAX_SLOT_CAPACITY, PRUNING_BOUND};
 
-use std::{fmt::Debug, ops::Deref, pin::Pin, sync::Arc, time::Duration};
+use std::{fmt::Debug, ops::Deref, time::Duration};
 use codec::{Decode, Encode};
-use futures::{prelude::*, future::{self, Either}};
+use futures::{future::Either, Future, TryFutureExt};
 use futures_timer::Delay;
 use log::{debug, error, info, warn};
-use parking_lot::Mutex;
 use sp_api::{ProvideRuntimeApi, ApiRef};
 use sp_arithmetic::traits::BaseArithmetic;
 use sp_consensus::{BlockImport, Proposer, SyncOracle, SelectChain, CanAuthorWith, SlotData};
@@ -68,21 +67,23 @@ pub struct SlotResult<Block: BlockT, Proof> {
 ///
 /// The implementation should not make any assumptions of the slot being bound to the time or
 /// similar. The only valid assumption is that the slot number is always increasing.
+#[async_trait::async_trait]
 pub trait SlotWorker<B: BlockT, Proof> {
 	/// Called when a new slot is triggered.
 	///
 	/// Returns a future that resolves to a [`SlotResult`] iff a block was successfully built in
 	/// the slot. Otherwise `None` is returned.
-	fn on_slot(
+	async fn on_slot(
 		&mut self,
 		chain_head: B::Header,
 		slot_info: SlotInfo,
-	) -> Pin<Box<dyn Future<Output = Option<SlotResult<B, Proof>>> + Send>>;
+	) -> Option<SlotResult<B, Proof>>;
 }
 
 /// A skeleton implementation for `SlotWorker` which tries to claim a slot at
 /// its beginning and tries to produce a block if successfully claimed, timing
 /// out if block production takes too long.
+#[async_trait::async_trait]
 pub trait SimpleSlotWorker<B: BlockT> {
 	/// A handle to a `BlockImport`.
 	type BlockImport: BlockImport<B, Transaction = <Self::Proposer as Proposer<B>>::Transaction>
@@ -96,7 +97,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 		+ Send + Unpin + 'static;
 
 	/// The type of proposer to use to build blocks.
-	type Proposer: Proposer<B>;
+	type Proposer: Proposer<B> + Send;
 
 	/// Data associated with a slot claim.
 	type Claim: Send + 'static;
@@ -108,7 +109,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 	fn logging_target(&self) -> &'static str;
 
 	/// A handle to a `BlockImport`.
-	fn block_import(&self) -> Arc<Mutex<Self::BlockImport>>;
+	fn block_import(&mut self) -> &mut Self::BlockImport;
 
 	/// Returns the epoch data necessary for authoring. For time-dependent epochs,
 	/// use the provided slot number as a canonical source of time.
@@ -191,36 +192,38 @@ pub trait SimpleSlotWorker<B: BlockT> {
 	) -> Duration;
 
 	/// Implements [`SlotWorker::on_slot`].
-	fn on_slot(
+	async fn on_slot(
 		&mut self,
 		chain_head: B::Header,
 		slot_info: SlotInfo,
-	) -> Pin<Box<dyn Future<Output = Option<SlotResult<B, <Self::Proposer as Proposer<B>>::Proof>>> + Send>>
-	where
-		<Self::Proposer as Proposer<B>>::Proposal: Unpin + Send + 'static,
-	{
+	) -> Option<SlotResult<B, <Self::Proposer as Proposer<B>>::Proof>> {
 		let (timestamp, slot) = (slot_info.timestamp, slot_info.slot);
 		let telemetry = self.telemetry();
+		let logging_target = self.logging_target();
 
 		let proposing_remaining_duration = self.proposing_remaining_duration(&chain_head, &slot_info);
 
 		let proposing_remaining = if proposing_remaining_duration == Duration::default() {
 			debug!(
-				target: self.logging_target(),
+				target: logging_target,
 				"Skipping proposal slot {} since there's no time left to propose",
 				slot,
 			);
 
-			return Box::pin(future::ready(None));
+			return None
 		} else {
-			Box::new(Delay::new(proposing_remaining_duration))
-				as Box<dyn Future<Output = ()> + Unpin + Send>
+			Delay::new(proposing_remaining_duration)
 		};
 
 		let epoch_data = match self.epoch_data(&chain_head, slot) {
 			Ok(epoch_data) => epoch_data,
 			Err(err) => {
-				warn!("Unable to fetch epoch data at block {:?}: {:?}", chain_head.hash(), err);
+				warn!(
+					target: logging_target,
+					"Unable to fetch epoch data at block {:?}: {:?}",
+					chain_head.hash(),
+					err,
+				);
 
 				telemetry!(
 					telemetry;
@@ -230,7 +233,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 					"err" => ?err,
 				);
 
-				return Box::pin(future::ready(None));
+				return None;
 			}
 		};
 
@@ -242,7 +245,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 			self.sync_oracle().is_offline() &&
 			authorities_len.map(|a| a > 1).unwrap_or(false)
 		{
-			debug!(target: self.logging_target(), "Skipping proposal slot. Waiting for the network.");
+			debug!(target: logging_target, "Skipping proposal slot. Waiting for the network.");
 			telemetry!(
 				telemetry;
 				CONSENSUS_DEBUG;
@@ -250,16 +253,16 @@ pub trait SimpleSlotWorker<B: BlockT> {
 				"authorities_len" => authorities_len,
 			);
 
-			return Box::pin(future::ready(None));
+			return None;
 		}
 
 		let claim = match self.claim_slot(&chain_head, slot, &epoch_data) {
-			None => return Box::pin(future::ready(None)),
+			None => return None,
 			Some(claim) => claim,
 		};
 
 		if self.should_backoff(slot, &chain_head) {
-			return Box::pin(future::ready(None));
+			return None;
 		}
 
 		debug!(
@@ -277,10 +280,15 @@ pub trait SimpleSlotWorker<B: BlockT> {
 			"timestamp" => *timestamp,
 		);
 
-		let awaiting_proposer = {
-			let telemetry = telemetry.clone();
-			self.proposer(&chain_head).map_err(move |err| {
-				warn!("Unable to author block in slot {:?}: {:?}", slot, err);
+		let proposer = match self.proposer(&chain_head).await {
+			Ok(p) => p,
+			Err(err) => {
+				warn!(
+					target: logging_target,
+					"Unable to author block in slot {:?}: {:?}",
+					slot,
+					err,
+				);
 
 				telemetry!(
 					telemetry;
@@ -290,8 +298,8 @@ pub trait SimpleSlotWorker<B: BlockT> {
 					"err" => ?err
 				);
 
-				err
-			})
+				return None
+			}
 		};
 
 		let logs = self.pre_digest_data(slot, &claim);
@@ -299,106 +307,126 @@ pub trait SimpleSlotWorker<B: BlockT> {
 		// deadline our production to 98% of the total time left for proposing. As we deadline
 		// the proposing below to the same total time left, the 2% margin should be enough for
 		// the result to be returned.
-		let proposing = awaiting_proposer.and_then(move |proposer| proposer.propose(
+		let proposing = proposer.propose(
 			slot_info.inherent_data,
 			sp_runtime::generic::Digest {
 				logs,
 			},
 			proposing_remaining_duration.mul_f32(0.98),
-		).map_err(|e| sp_consensus::Error::ClientImport(format!("{:?}", e))));
-
-		let proposal_work = {
-			let telemetry = telemetry.clone();
-			futures::future::select(proposing, proposing_remaining).map(move |v| match v {
-				Either::Left((b, _)) => b.map(|b| (b, claim)),
-				Either::Right(_) => {
-					info!(
-						"⌛️ Discarding proposal for slot {}; block production took too long",
-						slot,
-					);
-					// If the node was compiled with debug, tell the user to use release optimizations.
-					#[cfg(build_type="debug")]
-					info!("👉 Recompile your node in `--release` mode to mitigate this problem.");
-					telemetry!(
-						telemetry;
-						CONSENSUS_INFO;
-						"slots.discarding_proposal_took_too_long";
-						"slot" => *slot,
-					);
+		).map_err(|e| sp_consensus::Error::ClientImport(format!("{:?}", e)));
 
-					Err(sp_consensus::Error::ClientImport("Timeout in the Slots proposer".into()))
-				},
-			})
+		let proposal = match futures::future::select(proposing, proposing_remaining).await {
+			Either::Left((Ok(p), _)) => p,
+			Either::Left((Err(err), _)) => {
+				warn!(
+					target: logging_target,
+					"Proposing failed: {:?}",
+					err,
+				);
+
+				return None
+			},
+			Either::Right(_) => {
+				info!(
+					target: logging_target,
+					"⌛️ Discarding proposal for slot {}; block production took too long",
+					slot,
+				);
+				// If the node was compiled with debug, tell the user to use release optimizations.
+				#[cfg(build_type="debug")]
+				info!(
+					target: logging_target,
+					"👉 Recompile your node in `--release` mode to mitigate this problem.",
+				);
+				telemetry!(
+					telemetry;
+					CONSENSUS_INFO;
+					"slots.discarding_proposal_took_too_long";
+					"slot" => *slot,
+				);
+
+				return None
+			},
 		};
 
 		let block_import_params_maker = self.block_import_params();
 		let block_import = self.block_import();
-		let logging_target = self.logging_target();
-
-		proposal_work.and_then(move |(proposal, claim)| async move {
-			let (block, storage_proof) = (proposal.block, proposal.proof);
-			let (header, body) = block.deconstruct();
-			let header_num = *header.number();
-			let header_hash = header.hash();
-			let parent_hash = *header.parent_hash();
-
-			let block_import_params = block_import_params_maker(
-				header,
-				&header_hash,
-				body.clone(),
-				proposal.storage_changes,
-				claim,
-				epoch_data,
-			)?;
-
-			info!(
-				"🔖 Pre-sealed block for proposal at {}. Hash now {:?}, previously {:?}.",
-				header_num,
-				block_import_params.post_hash(),
-				header_hash,
-			);
 
-			telemetry!(
-				telemetry;
-				CONSENSUS_INFO;
-				"slots.pre_sealed_block";
-				"header_num" => ?header_num,
-				"hash_now" => ?block_import_params.post_hash(),
-				"hash_previously" => ?header_hash,
-			);
-
-			let header = block_import_params.post_header();
-			if let Err(err) = block_import.lock().import_block(block_import_params, Default::default()) {
+		let (block, storage_proof) = (proposal.block, proposal.proof);
+		let (header, body) = block.deconstruct();
+		let header_num = *header.number();
+		let header_hash = header.hash();
+		let parent_hash = *header.parent_hash();
+
+		let block_import_params = match block_import_params_maker(
+			header,
+			&header_hash,
+			body.clone(),
+			proposal.storage_changes,
+			claim,
+			epoch_data,
+		) {
+			Ok(bi) => bi,
+			Err(err) => {
 				warn!(
 					target: logging_target,
-					"Error with block built on {:?}: {:?}",
-					parent_hash,
+					"Failed to create block import params: {:?}",
 					err,
 				);
 
-				telemetry!(
-					telemetry;
-					CONSENSUS_WARN;
-					"slots.err_with_block_built_on";
-					"hash" => ?parent_hash,
-					"err" => ?err,
-				);
+				return None
 			}
+		};
+
+		info!(
+			target: logging_target,
+			"🔖 Pre-sealed block for proposal at {}. Hash now {:?}, previously {:?}.",
+			header_num,
+			block_import_params.post_hash(),
+			header_hash,
+		);
 
-			Ok(SlotResult { block: B::new(header, body), storage_proof })
-		}).then(|r| async move {
-			r.map_err(|e| warn!(target: "slots", "Encountered consensus error: {:?}", e)).ok()
-		}).boxed()
+		telemetry!(
+			telemetry;
+			CONSENSUS_INFO;
+			"slots.pre_sealed_block";
+			"header_num" => ?header_num,
+			"hash_now" => ?block_import_params.post_hash(),
+			"hash_previously" => ?header_hash,
+		);
+
+		let header = block_import_params.post_header();
+		if let Err(err) = block_import
+			.import_block(block_import_params, Default::default())
+		{
+			warn!(
+				target: logging_target,
+				"Error with block built on {:?}: {:?}",
+				parent_hash,
+				err,
+			);
+
+			telemetry!(
+				telemetry;
+				CONSENSUS_WARN;
+				"slots.err_with_block_built_on";
+				"hash" => ?parent_hash,
+				"err" => ?err,
+			);
+		}
+
+		Some(SlotResult { block: B::new(header, body), storage_proof })
 	}
 }
 
-impl<B: BlockT, T: SimpleSlotWorker<B>> SlotWorker<B, <T::Proposer as Proposer<B>>::Proof> for T {
-	fn on_slot(
+#[async_trait::async_trait]
+impl<B: BlockT, T: SimpleSlotWorker<B> + Send> SlotWorker<B, <T::Proposer as Proposer<B>>::Proof> for T {
+	async fn on_slot(
 		&mut self,
 		chain_head: B::Header,
 		slot_info: SlotInfo,
-	) -> Pin<Box<dyn Future<Output = Option<SlotResult<B, <T::Proposer as Proposer<B>>::Proof>>> + Send>> {
-		SimpleSlotWorker::on_slot(self, chain_head, slot_info)
+	) -> Option<SlotResult<B, <T::Proposer as Proposer<B>>::Proof>> {
+		SimpleSlotWorker::on_slot(self, chain_head, slot_info).await
 	}
 }
 
@@ -436,25 +464,39 @@ where
 	let SlotDuration(slot_duration) = slot_duration;
 
 	// rather than use a timer interval, we schedule our waits ourselves
-	Slots::<SC>::new(
+	let mut slots = Slots::<SC>::new(
 		slot_duration.slot_duration(),
 		inherent_data_providers,
 		timestamp_extractor,
-	).inspect_err(|e| debug!(target: "slots", "Faulty timer: {:?}", e))
-		.try_for_each(move |slot_info| {
+	);
+
+	async move {
+		loop {
+			let slot_info = match slots.next_slot().await {
+				Ok(slot) => slot,
+				Err(err) => {
+					debug!(target: "slots", "Faulty timer: {:?}", err);
+					return
+				},
+			};
+
 			// only propose when we are not syncing.
 			if sync_oracle.is_major_syncing() {
 				debug!(target: "slots", "Skipping proposal slot due to sync.");
-				return Either::Right(future::ready(Ok(())));
+				continue;
 			}
 
 			let slot = slot_info.slot;
 			let chain_head = match client.best_chain() {
 				Ok(x) => x,
 				Err(e) => {
-					warn!(target: "slots", "Unable to author block in slot {}. \
-					no best block header: {:?}", slot, e);
-					return Either::Right(future::ready(Ok(())));
+					warn!(
+						target: "slots",
+						"Unable to author block in slot {}. No best block header: {:?}",
+						slot,
+						e,
+					);
+					continue;
 				}
 			};
 
@@ -466,19 +508,11 @@ where
 					slot,
 					err,
 				);
-				Either::Right(future::ready(Ok(())))
 			} else {
-				Either::Left(
-					worker.on_slot(chain_head, slot_info)
-						.then(|_| future::ready(Ok(())))
-				)
-			}
-		}).then(|res| {
-			if let Err(err) = res {
-				warn!(target: "slots", "Slots stream terminated with an error: {:?}", err);
+				worker.on_slot(chain_head, slot_info).await;
 			}
-			future::ready(())
-		})
+		}
+	}
 }
 
 /// A header which has been checked
diff --git a/client/consensus/slots/src/slots.rs b/client/consensus/slots/src/slots.rs
index 1cf7c30b9ed9..d7ed1eda64c0 100644
--- a/client/consensus/slots/src/slots.rs
+++ b/client/consensus/slots/src/slots.rs
@@ -22,10 +22,9 @@
 
 use super::{SlotCompatible, Slot};
 use sp_consensus::Error;
-use futures::{prelude::*, task::Context, task::Poll};
 use sp_inherents::{InherentData, InherentDataProviders};
 
-use std::{pin::Pin, time::{Duration, Instant}};
+use std::time::{Duration, Instant};
 use futures_timer::Delay;
 
 /// Returns current duration since unix epoch.
@@ -107,57 +106,49 @@ impl<SC> Slots<SC> {
 	}
 }
 
-impl<SC: SlotCompatible> Stream for Slots<SC> {
-	type Item = Result<SlotInfo, Error>;
-
-	fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Option<Self::Item>> {
+impl<SC: SlotCompatible> Slots<SC> {
+	/// Returns a future that fires when the next slot starts.
+	pub async fn next_slot(&mut self) -> Result<SlotInfo, Error> {
 		loop {
-			let slot_duration = self.slot_duration;
 			self.inner_delay = match self.inner_delay.take() {
 				None => {
 					// schedule wait.
-					let wait_dur = time_until_next(duration_now(), slot_duration);
+					let wait_dur = time_until_next(duration_now(), self.slot_duration);
 					Some(Delay::new(wait_dur))
 				}
 				Some(d) => Some(d),
 			};
 
-			if let Some(ref mut inner_delay) = self.inner_delay {
-				match Future::poll(Pin::new(inner_delay), cx) {
-					Poll::Pending => return Poll::Pending,
-					Poll::Ready(()) => {}
-				}
+			if let Some(inner_delay) = self.inner_delay.take() {
+				inner_delay.await;
 			}
-
 			// timeout has fired.
 
 			let inherent_data = match self.inherent_data_providers.create_inherent_data() {
 				Ok(id) => id,
-				Err(err) => return Poll::Ready(Some(Err(sp_consensus::Error::InherentData(err)))),
+				Err(err) => return Err(sp_consensus::Error::InherentData(err)),
 			};
 			let result = self.timestamp_extractor.extract_timestamp_and_slot(&inherent_data);
 			let (timestamp, slot, offset) = match result {
 				Ok(v) => v,
-				Err(err) => return Poll::Ready(Some(Err(err))),
+				Err(err) => return Err(err),
 			};
 			// reschedule delay for next slot.
 			let ends_in = offset +
-				time_until_next(timestamp.as_duration(), slot_duration);
+				time_until_next(timestamp.as_duration(), self.slot_duration);
 			self.inner_delay = Some(Delay::new(ends_in));
 
 			// never yield the same slot twice.
 			if slot > self.last_slot {
 				self.last_slot = slot;
 
-				break Poll::Ready(Some(Ok(SlotInfo::new(
+				break Ok(SlotInfo::new(
 					slot,
 					timestamp,
 					inherent_data,
 					self.slot_duration,
-				))))
+				))
 			}
 		}
 	}
 }
-
-impl<SC> Unpin for Slots<SC> {}

From ec8a6614b858d6cc9471bd2298b9be082d0aa987 Mon Sep 17 00:00:00 2001
From: Zeke Mostov <32168567+emostov@users.noreply.github.com>
Date: Sun, 28 Mar 2021 01:09:32 -0700
Subject: [PATCH 0567/1194] [pallet-staking] Refund unused weight for
 `payout_stakers` (#8458)

* [pallet-staking] Refund unused weight for `payout_stakers`

fixes #8428

* Use periods in comments

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Address Shawn's Feedback

* Assert monotomic weights && improve test note

* Remove stray new line

* debug_assert payout_count <= max

* Only track payouts to nominators; not validators

* Trivial comment update

Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
---
 frame/staking/src/lib.rs     |  44 ++++++--
 frame/staking/src/mock.rs    |   2 +
 frame/staking/src/tests.rs   | 154 ++++++++++++++++++++++++--
 frame/staking/src/weights.rs | 206 +++++++++++++++++------------------
 4 files changed, 281 insertions(+), 125 deletions(-)

diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 31735f75ebc1..d9894eabc355 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -290,7 +290,7 @@ use codec::{HasCompact, Encode, Decode};
 use frame_support::{
 	decl_module, decl_event, decl_storage, ensure, decl_error,
 	weights::{
-		Weight,
+		Weight, WithPostDispatchInfo,
 		constants::{WEIGHT_PER_MICROS, WEIGHT_PER_NANOS},
 	},
 	storage::IterableStorageMap,
@@ -1803,7 +1803,7 @@ decl_module! {
 		///   Paying even a dead controller is cheaper weight-wise. We don't do any refunds here.
 		/// # </weight>
 		#[weight = T::WeightInfo::payout_stakers_alive_staked(T::MaxNominatorRewardedPerValidator::get())]
-		fn payout_stakers(origin, validator_stash: T::AccountId, era: EraIndex) -> DispatchResult {
+		fn payout_stakers(origin, validator_stash: T::AccountId, era: EraIndex) -> DispatchResultWithPostInfo {
 			ensure_signed(origin)?;
 			Self::do_payout_stakers(validator_stash, era)
 		}
@@ -1967,24 +1967,35 @@ impl<T: Config> Module<T> {
 		})
 	}
 
-	fn do_payout_stakers(validator_stash: T::AccountId, era: EraIndex) -> DispatchResult {
+	fn do_payout_stakers(validator_stash: T::AccountId, era: EraIndex) -> DispatchResultWithPostInfo {
 		// Validate input data
-		let current_era = CurrentEra::get().ok_or(Error::<T>::InvalidEraToReward)?;
-		ensure!(era <= current_era, Error::<T>::InvalidEraToReward);
+		let current_era = CurrentEra::get().ok_or(
+			Error::<T>::InvalidEraToReward.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
+		)?;
 		let history_depth = Self::history_depth();
-		ensure!(era >= current_era.saturating_sub(history_depth), Error::<T>::InvalidEraToReward);
+		ensure!(
+			era <= current_era && era >= current_era.saturating_sub(history_depth),
+			Error::<T>::InvalidEraToReward.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
+		);
 
 		// Note: if era has no reward to be claimed, era may be future. better not to update
 		// `ledger.claimed_rewards` in this case.
 		let era_payout = <ErasValidatorReward<T>>::get(&era)
-			.ok_or_else(|| Error::<T>::InvalidEraToReward)?;
-
-		let controller = Self::bonded(&validator_stash).ok_or(Error::<T>::NotStash)?;
+			.ok_or_else(||
+				Error::<T>::InvalidEraToReward
+					.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
+			)?;
+
+		let controller = Self::bonded(&validator_stash).ok_or(
+			Error::<T>::NotStash.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
+		)?;
 		let mut ledger = <Ledger<T>>::get(&controller).ok_or_else(|| Error::<T>::NotController)?;
 
 		ledger.claimed_rewards.retain(|&x| x >= current_era.saturating_sub(history_depth));
 		match ledger.claimed_rewards.binary_search(&era) {
-			Ok(_) => Err(Error::<T>::AlreadyClaimed)?,
+			Ok(_) => Err(
+				Error::<T>::AlreadyClaimed.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
+			)?,
 			Err(pos) => ledger.claimed_rewards.insert(pos, era),
 		}
 
@@ -2008,7 +2019,9 @@ impl<T: Config> Module<T> {
 			.unwrap_or_else(|| Zero::zero());
 
 		// Nothing to do if they have no reward points.
-		if validator_reward_points.is_zero() { return Ok(())}
+		if validator_reward_points.is_zero() {
+			return Ok(Some(T::WeightInfo::payout_stakers_alive_staked(0)).into())
+		}
 
 		// This is the fraction of the total reward that the validator and the
 		// nominators will get.
@@ -2041,6 +2054,10 @@ impl<T: Config> Module<T> {
 			Self::deposit_event(RawEvent::Reward(ledger.stash, imbalance.peek()));
 		}
 
+		// Track the number of payout ops to nominators. Note: `WeightInfo::payout_stakers_alive_staked`
+		// always assumes at least a validator is paid out, so we do not need to count their payout op.
+		let mut nominator_payout_count: u32 = 0;
+
 		// Lets now calculate how this is split to the nominators.
 		// Reward only the clipped exposures. Note this is not necessarily sorted.
 		for nominator in exposure.others.iter() {
@@ -2052,11 +2069,14 @@ impl<T: Config> Module<T> {
 			let nominator_reward: BalanceOf<T> = nominator_exposure_part * validator_leftover_payout;
 			// We can now make nominator payout:
 			if let Some(imbalance) = Self::make_payout(&nominator.who, nominator_reward) {
+				// Note: this logic does not count payouts for `RewardDestination::None`.
+				nominator_payout_count += 1;
 				Self::deposit_event(RawEvent::Reward(nominator.who.clone(), imbalance.peek()));
 			}
 		}
 
-		Ok(())
+		debug_assert!(nominator_payout_count <= T::MaxNominatorRewardedPerValidator::get());
+		Ok(Some(T::WeightInfo::payout_stakers_alive_staked(nominator_payout_count)).into())
 	}
 
 	/// Update the ledger for a controller.
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index 03f5acfad728..1942e5eed0c6 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -269,6 +269,8 @@ where
 }
 
 pub type Extrinsic = TestXt<Call, ()>;
+pub(crate) type StakingCall = crate::Call<Test>;
+pub(crate) type TestRuntimeCall = <Test as frame_system::Config>::Call;
 
 pub struct ExtBuilder {
 	validator_pool: bool,
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index df3456bf2992..0fc53d9d8f0d 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -20,12 +20,14 @@
 use super::*;
 use mock::*;
 use sp_runtime::{
-	assert_eq_error_rate, traits::BadOrigin,
+	assert_eq_error_rate,
+	traits::{BadOrigin, Dispatchable},
 };
 use sp_staking::offence::OffenceDetails;
 use frame_support::{
 	assert_ok, assert_noop, StorageMap,
 	traits::{Currency, ReservableCurrency, OnInitialize},
+	weights::{extract_actual_weight, GetDispatchInfo},
 };
 use pallet_balances::Error as BalancesError;
 use substrate_test_utils::assert_eq_uvec;
@@ -2976,6 +2978,9 @@ fn claim_reward_at_the_last_era_and_no_double_claim_and_invalid_claim() {
 	// * an invalid era to claim doesn't update last_reward
 	// * double claim of one era fails
 	ExtBuilder::default().nominate(true).build_and_execute(|| {
+		// Consumed weight for all payout_stakers dispatches that fail
+		let err_weight = weights::SubstrateWeight::<Test>::payout_stakers_alive_staked(0);
+
 		let init_balance_10 = Balances::total_balance(&10);
 		let init_balance_100 = Balances::total_balance(&100);
 
@@ -3021,19 +3026,19 @@ fn claim_reward_at_the_last_era_and_no_double_claim_and_invalid_claim() {
 		assert_noop!(
 			Staking::payout_stakers(Origin::signed(1337), 11, 0),
 			// Fail: Era out of history
-			Error::<Test>::InvalidEraToReward
+			Error::<Test>::InvalidEraToReward.with_weight(err_weight)
 		);
 		assert_ok!(Staking::payout_stakers(Origin::signed(1337), 11, 1));
 		assert_ok!(Staking::payout_stakers(Origin::signed(1337), 11, 2));
 		assert_noop!(
 			Staking::payout_stakers(Origin::signed(1337), 11, 2),
 			// Fail: Double claim
-			Error::<Test>::AlreadyClaimed
+			Error::<Test>::AlreadyClaimed.with_weight(err_weight)
 		);
 		assert_noop!(
 			Staking::payout_stakers(Origin::signed(1337), 11, active_era),
 			// Fail: Era not finished yet
-			Error::<Test>::InvalidEraToReward
+			Error::<Test>::InvalidEraToReward.with_weight(err_weight)
 		);
 
 		// Era 0 can't be rewarded anymore and current era can't be rewarded yet
@@ -3287,6 +3292,9 @@ fn test_payout_stakers() {
 fn payout_stakers_handles_basic_errors() {
 	// Here we will test payouts handle all errors.
 	ExtBuilder::default().has_stakers(false).build_and_execute(|| {
+		// Consumed weight for all payout_stakers dispatches that fail
+		let err_weight = weights::SubstrateWeight::<Test>::payout_stakers_alive_staked(0);
+
 		// Same setup as the test above
 		let balance = 1000;
 		bond_validator(11, 10, balance); // Default(64)
@@ -3305,9 +3313,15 @@ fn payout_stakers_handles_basic_errors() {
 		mock::start_active_era(2);
 
 		// Wrong Era, too big
-		assert_noop!(Staking::payout_stakers(Origin::signed(1337), 11, 2), Error::<Test>::InvalidEraToReward);
+		assert_noop!(
+			Staking::payout_stakers(Origin::signed(1337), 11, 2),
+			Error::<Test>::InvalidEraToReward.with_weight(err_weight)
+		);
 		// Wrong Staker
-		assert_noop!(Staking::payout_stakers(Origin::signed(1337), 10, 1), Error::<Test>::NotStash);
+		assert_noop!(
+			Staking::payout_stakers(Origin::signed(1337), 10, 1),
+			Error::<Test>::NotStash.with_weight(err_weight)
+		);
 
 		for i in 3..100 {
 			Staking::reward_by_ids(vec![(11, 1)]);
@@ -3317,14 +3331,134 @@ fn payout_stakers_handles_basic_errors() {
 		}
 		// We are at era 99, with history depth of 84
 		// We should be able to payout era 15 through 98 (84 total eras), but not 14 or 99.
-		assert_noop!(Staking::payout_stakers(Origin::signed(1337), 11, 14), Error::<Test>::InvalidEraToReward);
-		assert_noop!(Staking::payout_stakers(Origin::signed(1337), 11, 99), Error::<Test>::InvalidEraToReward);
+		assert_noop!(
+			Staking::payout_stakers(Origin::signed(1337), 11, 14),
+			Error::<Test>::InvalidEraToReward.with_weight(err_weight)
+		);
+		assert_noop!(
+			Staking::payout_stakers(Origin::signed(1337), 11, 99),
+			Error::<Test>::InvalidEraToReward.with_weight(err_weight)
+		);
 		assert_ok!(Staking::payout_stakers(Origin::signed(1337), 11, 15));
 		assert_ok!(Staking::payout_stakers(Origin::signed(1337), 11, 98));
 
 		// Can't claim again
-		assert_noop!(Staking::payout_stakers(Origin::signed(1337), 11, 15), Error::<Test>::AlreadyClaimed);
-		assert_noop!(Staking::payout_stakers(Origin::signed(1337), 11, 98), Error::<Test>::AlreadyClaimed);
+		assert_noop!(
+			Staking::payout_stakers(Origin::signed(1337), 11, 15),
+			Error::<Test>::AlreadyClaimed.with_weight(err_weight)
+		);
+		assert_noop!(
+			Staking::payout_stakers(Origin::signed(1337), 11, 98),
+			Error::<Test>::AlreadyClaimed.with_weight(err_weight)
+		);
+	});
+}
+
+#[test]
+fn payout_stakers_handles_weight_refund() {
+	// Note: this test relies on the assumption that `payout_stakers_alive_staked` is solely used by
+	// `payout_stakers` to calculate the weight of each payout op.
+	ExtBuilder::default().has_stakers(false).build_and_execute(|| {
+		let max_nom_rewarded = <Test as Config>::MaxNominatorRewardedPerValidator::get();
+		// Make sure the configured value is meaningful for our use.
+		assert!(max_nom_rewarded >= 4);
+		let half_max_nom_rewarded = max_nom_rewarded / 2;
+		// Sanity check our max and half max nominator quantities.
+		assert!(half_max_nom_rewarded > 0);
+		assert!(max_nom_rewarded > half_max_nom_rewarded);
+
+		let max_nom_rewarded_weight
+			= <Test as Config>::WeightInfo::payout_stakers_alive_staked(max_nom_rewarded);
+		let half_max_nom_rewarded_weight
+			= <Test as Config>::WeightInfo::payout_stakers_alive_staked(half_max_nom_rewarded);
+		let zero_nom_payouts_weight = <Test as Config>::WeightInfo::payout_stakers_alive_staked(0);
+		assert!(zero_nom_payouts_weight > 0);
+		assert!(half_max_nom_rewarded_weight > zero_nom_payouts_weight);
+		assert!(max_nom_rewarded_weight > half_max_nom_rewarded_weight);
+
+		let balance = 1000;
+		bond_validator(11, 10, balance);
+
+		/* Era 1 */
+		start_active_era(1);
+
+		// Reward just the validator.
+		Staking::reward_by_ids(vec![(11, 1)]);
+
+		// Add some `half_max_nom_rewarded` nominators who will start backing the validator in the
+		// next era.
+		for i in 0..half_max_nom_rewarded {
+			bond_nominator((1000 + i).into(), (100 + i).into(), balance + i as Balance, vec![11]);
+		}
+
+		/* Era 2 */
+		start_active_era(2);
+
+		// Collect payouts when there are no nominators
+		let call = TestRuntimeCall::Staking(StakingCall::payout_stakers(11, 1));
+		let info = call.get_dispatch_info();
+		let result = call.dispatch(Origin::signed(20));
+		assert_ok!(result);
+		assert_eq!(
+			extract_actual_weight(&result, &info),
+			zero_nom_payouts_weight
+		);
+
+		// The validator is not rewarded in this era; so there will be zero payouts to claim for this era.
+
+		/* Era 3 */
+		start_active_era(3);
+
+		// Collect payouts for an era where the validator did not receive any points.
+		let call = TestRuntimeCall::Staking(StakingCall::payout_stakers(11, 2));
+		let info = call.get_dispatch_info();
+		let result = call.dispatch(Origin::signed(20));
+		assert_ok!(result);
+		assert_eq!(extract_actual_weight(&result, &info), zero_nom_payouts_weight);
+
+		// Reward the validator and its nominators.
+		Staking::reward_by_ids(vec![(11, 1)]);
+
+		/* Era 4 */
+		start_active_era(4);
+
+		// Collect payouts when the validator has `half_max_nom_rewarded` nominators.
+		let call = TestRuntimeCall::Staking(StakingCall::payout_stakers(11, 3));
+		let info = call.get_dispatch_info();
+		let result = call.dispatch(Origin::signed(20));
+		assert_ok!(result);
+		assert_eq!(extract_actual_weight(&result, &info), half_max_nom_rewarded_weight);
+
+		// Add enough nominators so that we are at the limit. They will be active nominators
+		// in the next era.
+		for i in half_max_nom_rewarded..max_nom_rewarded {
+			bond_nominator((1000 + i).into(), (100 + i).into(), balance + i as Balance, vec![11]);
+		}
+
+		/* Era 5 */
+		start_active_era(5);
+		// We now have `max_nom_rewarded` nominators actively nominating our validator.
+
+		// Reward the validator so we can collect for everyone in the next era.
+		Staking::reward_by_ids(vec![(11, 1)]);
+
+		/* Era 6 */
+		start_active_era(6);
+
+		// Collect payouts when the validator had `half_max_nom_rewarded` nominators.
+		let call = TestRuntimeCall::Staking(StakingCall::payout_stakers(11, 5));
+		let info = call.get_dispatch_info();
+		let result = call.dispatch(Origin::signed(20));
+		assert_ok!(result);
+		assert_eq!(extract_actual_weight(&result, &info), max_nom_rewarded_weight);
+
+		// Try and collect payouts for an era that has already been collected.
+		let call = TestRuntimeCall::Staking(StakingCall::payout_stakers(11, 5));
+		let info = call.get_dispatch_info();
+		let result = call.dispatch(Origin::signed(20));
+		assert!(result.is_err());
+		// When there is an error the consumed weight == weight when there are 0 nominator payouts.
+		assert_eq!(extract_actual_weight(&result, &info), zero_nom_payouts_weight);
 	});
 }
 
diff --git a/frame/staking/src/weights.rs b/frame/staking/src/weights.rs
index 520bef8c539b..d3274cad8050 100644
--- a/frame/staking/src/weights.rs
+++ b/frame/staking/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_staking
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-03-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-03-25, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -76,155 +76,155 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn bond() -> Weight {
-		(82_121_000 as Weight)
+		(79_895_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn bond_extra() -> Weight {
-		(61_899_000 as Weight)
+		(60_561_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn unbond() -> Weight {
-		(56_392_000 as Weight)
+		(54_996_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn withdraw_unbonded_update(s: u32, ) -> Weight {
-		(57_382_000 as Weight)
+		(56_056_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((70_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((67_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
-		(92_185_000 as Weight)
+		(90_267_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((2_844_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((2_787_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(8 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn validate() -> Weight {
-		(16_892_000 as Weight)
+		(16_345_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn kick(k: u32, ) -> Weight {
-		(27_411_000 as Weight)
+		(27_080_000 as Weight)
 			// Standard Error: 14_000
-			.saturating_add((19_272_000 as Weight).saturating_mul(k as Weight))
+			.saturating_add((18_739_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(k as Weight)))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn nominate(n: u32, ) -> Weight {
-		(30_188_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((5_666_000 as Weight).saturating_mul(n as Weight))
+		(29_101_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((5_670_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn chill() -> Weight {
-		(15_870_000 as Weight)
+		(15_771_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn set_payee() -> Weight {
-		(13_853_000 as Weight)
+		(13_329_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_controller() -> Weight {
-		(30_291_000 as Weight)
+		(29_807_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn set_validator_count() -> Weight {
-		(2_397_000 as Weight)
+		(2_323_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_no_eras() -> Weight {
-		(2_627_000 as Weight)
+		(2_528_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_new_era() -> Weight {
-		(2_679_000 as Weight)
+		(2_529_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_new_era_always() -> Weight {
-		(2_643_000 as Weight)
+		(2_527_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_invulnerables(v: u32, ) -> Weight {
-		(2_871_000 as Weight)
+		(2_661_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((35_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_unstake(s: u32, ) -> Weight {
-		(65_876_000 as Weight)
+		(64_650_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((2_832_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((2_755_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(8 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn cancel_deferred_slash(s: u32, ) -> Weight {
-		(5_896_640_000 as Weight)
-			// Standard Error: 391_000
-			.saturating_add((34_808_000 as Weight).saturating_mul(s as Weight))
+		(5_904_642_000 as Weight)
+			// Standard Error: 393_000
+			.saturating_add((34_810_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn payout_stakers_dead_controller(n: u32, ) -> Weight {
-		(137_975_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((54_061_000 as Weight).saturating_mul(n as Weight))
+		(131_368_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((52_611_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(10 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(n as Weight)))
 	}
 	fn payout_stakers_alive_staked(n: u32, ) -> Weight {
-		(163_885_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((68_096_000 as Weight).saturating_mul(n as Weight))
+		(165_079_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((66_740_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(11 as Weight))
 			.saturating_add(T::DbWeight::get().reads((5 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(n as Weight)))
 	}
 	fn rebond(l: u32, ) -> Weight {
-		(37_847_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((89_000 as Weight).saturating_mul(l as Weight))
+		(37_039_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((93_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn set_history_depth(e: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 69_000
-			.saturating_add((34_413_000 as Weight).saturating_mul(e as Weight))
+			// Standard Error: 71_000
+			.saturating_add((34_403_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes((7 as Weight).saturating_mul(e as Weight)))
 	}
 	fn reap_stash(s: u32, ) -> Weight {
-		(69_257_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((2_819_000 as Weight).saturating_mul(s as Weight))
+		(67_561_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_766_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(8 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn new_era(v: u32, n: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 1_013_000
-			.saturating_add((382_529_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 50_000
-			.saturating_add((63_170_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 1_016_000
+			.saturating_add((389_979_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 51_000
+			.saturating_add((63_208_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(10 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
@@ -233,12 +233,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	}
 	fn get_npos_voters(v: u32, n: u32, s: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 90_000
-			.saturating_add((27_108_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 90_000
-			.saturating_add((29_962_000 as Weight).saturating_mul(n as Weight))
-			// Standard Error: 1_228_000
-			.saturating_add((26_080_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 95_000
+			.saturating_add((26_419_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 95_000
+			.saturating_add((29_033_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 1_305_000
+			.saturating_add((23_680_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
@@ -247,7 +247,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn get_npos_targets(v: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 32_000
-			.saturating_add((11_220_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((11_317_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(v as Weight)))
 	}
@@ -256,155 +256,155 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn bond() -> Weight {
-		(82_121_000 as Weight)
+		(79_895_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn bond_extra() -> Weight {
-		(61_899_000 as Weight)
+		(60_561_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn unbond() -> Weight {
-		(56_392_000 as Weight)
+		(54_996_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn withdraw_unbonded_update(s: u32, ) -> Weight {
-		(57_382_000 as Weight)
+		(56_056_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((70_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((67_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
-		(92_185_000 as Weight)
+		(90_267_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((2_844_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((2_787_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn validate() -> Weight {
-		(16_892_000 as Weight)
+		(16_345_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn kick(k: u32, ) -> Weight {
-		(27_411_000 as Weight)
+		(27_080_000 as Weight)
 			// Standard Error: 14_000
-			.saturating_add((19_272_000 as Weight).saturating_mul(k as Weight))
+			.saturating_add((18_739_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(k as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn nominate(n: u32, ) -> Weight {
-		(30_188_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((5_666_000 as Weight).saturating_mul(n as Weight))
+		(29_101_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((5_670_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn chill() -> Weight {
-		(15_870_000 as Weight)
+		(15_771_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn set_payee() -> Weight {
-		(13_853_000 as Weight)
+		(13_329_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_controller() -> Weight {
-		(30_291_000 as Weight)
+		(29_807_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn set_validator_count() -> Weight {
-		(2_397_000 as Weight)
+		(2_323_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_no_eras() -> Weight {
-		(2_627_000 as Weight)
+		(2_528_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_new_era() -> Weight {
-		(2_679_000 as Weight)
+		(2_529_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_new_era_always() -> Weight {
-		(2_643_000 as Weight)
+		(2_527_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_invulnerables(v: u32, ) -> Weight {
-		(2_871_000 as Weight)
+		(2_661_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((35_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_unstake(s: u32, ) -> Weight {
-		(65_876_000 as Weight)
+		(64_650_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((2_832_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((2_755_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn cancel_deferred_slash(s: u32, ) -> Weight {
-		(5_896_640_000 as Weight)
-			// Standard Error: 391_000
-			.saturating_add((34_808_000 as Weight).saturating_mul(s as Weight))
+		(5_904_642_000 as Weight)
+			// Standard Error: 393_000
+			.saturating_add((34_810_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn payout_stakers_dead_controller(n: u32, ) -> Weight {
-		(137_975_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((54_061_000 as Weight).saturating_mul(n as Weight))
+		(131_368_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((52_611_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(n as Weight)))
 	}
 	fn payout_stakers_alive_staked(n: u32, ) -> Weight {
-		(163_885_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((68_096_000 as Weight).saturating_mul(n as Weight))
+		(165_079_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((66_740_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(11 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((5 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(n as Weight)))
 	}
 	fn rebond(l: u32, ) -> Weight {
-		(37_847_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((89_000 as Weight).saturating_mul(l as Weight))
+		(37_039_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((93_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn set_history_depth(e: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 69_000
-			.saturating_add((34_413_000 as Weight).saturating_mul(e as Weight))
+			// Standard Error: 71_000
+			.saturating_add((34_403_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((7 as Weight).saturating_mul(e as Weight)))
 	}
 	fn reap_stash(s: u32, ) -> Weight {
-		(69_257_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((2_819_000 as Weight).saturating_mul(s as Weight))
+		(67_561_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_766_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn new_era(v: u32, n: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 1_013_000
-			.saturating_add((382_529_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 50_000
-			.saturating_add((63_170_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 1_016_000
+			.saturating_add((389_979_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 51_000
+			.saturating_add((63_208_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
@@ -413,12 +413,12 @@ impl WeightInfo for () {
 	}
 	fn get_npos_voters(v: u32, n: u32, s: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 90_000
-			.saturating_add((27_108_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 90_000
-			.saturating_add((29_962_000 as Weight).saturating_mul(n as Weight))
-			// Standard Error: 1_228_000
-			.saturating_add((26_080_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 95_000
+			.saturating_add((26_419_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 95_000
+			.saturating_add((29_033_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 1_305_000
+			.saturating_add((23_680_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
@@ -427,7 +427,7 @@ impl WeightInfo for () {
 	fn get_npos_targets(v: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 32_000
-			.saturating_add((11_220_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((11_317_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(v as Weight)))
 	}

From 505a8d6ae1e36b81220b7ac6999f99d14d2708af Mon Sep 17 00:00:00 2001
From: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
Date: Sun, 28 Mar 2021 10:21:06 +0200
Subject: [PATCH 0568/1194] make types within `generate_solution_type` macro
 explicit (#8447)

* make types within `generate_solution_type` macro explicit

Closes #8444.

Just changes the parsing logic for that macro; does not change any
emitted code. The associated types associated with the macro now
require explicit, keyword-style declaration.

**Old**:

```rust
sp_npos_elections::generate_solution_type!(
	#[compact]
	pub struct TestCompact::<VoterIndex, TargetIndex, PerU16>(16)
);
```

**New**:

```rust
sp_npos_elections::generate_solution_type!(
	#[compact]
	pub struct TestCompact::<VoterIndex = VoterIndex, CandidateIndex = TargetIndex, Accuracy = PerU16>(16)
);
```

* un-ignore doc-tests

* use new form in bin/node/runtime/

* rename CandidateIndex -> TargetIndex

* add tests demonstrating some potential compile failures
---
 Cargo.lock                                    |  4 ++
 bin/node/runtime/src/lib.rs                   |  7 ++-
 .../election-provider-multi-phase/src/mock.rs |  2 +-
 primitives/npos-elections/compact/Cargo.toml  |  6 +++
 primitives/npos-elections/compact/src/lib.rs  | 46 +++++++++++++++----
 .../compact/tests/ui/fail/missing_accuracy.rs |  9 ++++
 .../tests/ui/fail/missing_accuracy.stderr     |  5 ++
 .../compact/tests/ui/fail/missing_target.rs   |  9 ++++
 .../tests/ui/fail/missing_target.stderr       |  5 ++
 .../compact/tests/ui/fail/missing_voter.rs    |  9 ++++
 .../tests/ui/fail/missing_voter.stderr        |  5 ++
 .../compact/tests/ui/fail/no_annotations.rs   |  9 ++++
 .../tests/ui/fail/no_annotations.stderr       |  5 ++
 .../tests/ui/fail/swap_voter_target.rs        |  9 ++++
 .../tests/ui/fail/swap_voter_target.stderr    |  5 ++
 .../npos-elections/fuzzer/src/compact.rs      |  6 ++-
 primitives/npos-elections/src/tests.rs        | 20 ++++++--
 17 files changed, 145 insertions(+), 16 deletions(-)
 create mode 100644 primitives/npos-elections/compact/tests/ui/fail/missing_accuracy.rs
 create mode 100644 primitives/npos-elections/compact/tests/ui/fail/missing_accuracy.stderr
 create mode 100644 primitives/npos-elections/compact/tests/ui/fail/missing_target.rs
 create mode 100644 primitives/npos-elections/compact/tests/ui/fail/missing_target.stderr
 create mode 100644 primitives/npos-elections/compact/tests/ui/fail/missing_voter.rs
 create mode 100644 primitives/npos-elections/compact/tests/ui/fail/missing_voter.stderr
 create mode 100644 primitives/npos-elections/compact/tests/ui/fail/no_annotations.rs
 create mode 100644 primitives/npos-elections/compact/tests/ui/fail/no_annotations.stderr
 create mode 100644 primitives/npos-elections/compact/tests/ui/fail/swap_voter_target.rs
 create mode 100644 primitives/npos-elections/compact/tests/ui/fail/swap_voter_target.stderr

diff --git a/Cargo.lock b/Cargo.lock
index 3602f0cac5ce..5f09da33b79d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8925,10 +8925,14 @@ dependencies = [
 name = "sp-npos-elections-compact"
 version = "3.0.0"
 dependencies = [
+ "parity-scale-codec 2.0.1",
  "proc-macro-crate 1.0.0",
  "proc-macro2",
  "quote",
+ "sp-arithmetic",
+ "sp-npos-elections",
  "syn",
+ "trybuild",
 ]
 
 [[package]]
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 46f80cc56afd..fcd120d000bf 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -519,8 +519,11 @@ parameter_types! {
 
 sp_npos_elections::generate_solution_type!(
 	#[compact]
-	pub struct NposCompactSolution16::<u32, u16, sp_runtime::PerU16>(16)
-	// -------------------- ^^ <NominatorIndex, ValidatorIndex, Accuracy>
+	pub struct NposCompactSolution16::<
+		VoterIndex = u32,
+		TargetIndex = u16,
+		Accuracy = sp_runtime::PerU16,
+	>(16)
 );
 
 impl pallet_election_provider_multi_phase::Config for Runtime {
diff --git a/frame/election-provider-multi-phase/src/mock.rs b/frame/election-provider-multi-phase/src/mock.rs
index 22b5a0ac67b7..cebd5cf06e69 100644
--- a/frame/election-provider-multi-phase/src/mock.rs
+++ b/frame/election-provider-multi-phase/src/mock.rs
@@ -65,7 +65,7 @@ pub(crate) type TargetIndex = u16;
 
 sp_npos_elections::generate_solution_type!(
 	#[compact]
-	pub struct TestCompact::<VoterIndex, TargetIndex, PerU16>(16)
+	pub struct TestCompact::<VoterIndex = VoterIndex, TargetIndex = TargetIndex, Accuracy = PerU16>(16)
 );
 
 /// All events of this pallet.
diff --git a/primitives/npos-elections/compact/Cargo.toml b/primitives/npos-elections/compact/Cargo.toml
index e2fff8e2db01..63432a36efc8 100644
--- a/primitives/npos-elections/compact/Cargo.toml
+++ b/primitives/npos-elections/compact/Cargo.toml
@@ -19,3 +19,9 @@ syn = { version = "1.0.58", features = ["full", "visit"] }
 quote = "1.0"
 proc-macro2 = "1.0.6"
 proc-macro-crate = "1.0.0"
+
+[dev-dependencies]
+parity-scale-codec = "2.0.1"
+sp-arithmetic = { path = "../../arithmetic" }
+sp-npos-elections = { path = ".." }
+trybuild = "1.0.41"
diff --git a/primitives/npos-elections/compact/src/lib.rs b/primitives/npos-elections/compact/src/lib.rs
index dd6d4de9b024..e558ae89ca93 100644
--- a/primitives/npos-elections/compact/src/lib.rs
+++ b/primitives/npos-elections/compact/src/lib.rs
@@ -52,8 +52,14 @@ pub(crate) fn syn_err(message: &'static str) -> syn::Error {
 /// For example, the following generates a public struct with name `TestSolution` with `u16` voter
 /// type, `u8` target type and `Perbill` accuracy with maximum of 8 edges per voter.
 ///
-/// ```ignore
-/// generate_solution_type!(pub struct TestSolution<u16, u8, Perbill>::(8))
+/// ```
+/// # use sp_npos_elections_compact::generate_solution_type;
+/// # use sp_arithmetic::per_things::Perbill;
+/// generate_solution_type!(pub struct TestSolution::<
+/// 	VoterIndex = u16,
+/// 	TargetIndex = u8,
+/// 	Accuracy = Perbill,
+/// >(8));
 /// ```
 ///
 /// The given struct provides function to convert from/to Assignment:
@@ -65,11 +71,13 @@ pub(crate) fn syn_err(message: &'static str) -> syn::Error {
 /// lead to many 0s in the solution. If prefixed with `#[compact]`, then a custom compact encoding
 /// for numbers will be used, similar to how `parity-scale-codec`'s `Compact` works.
 ///
-/// ```ignore
+/// ```
+/// # use sp_npos_elections_compact::generate_solution_type;
+/// # use sp_arithmetic::per_things::Perbill;
 /// generate_solution_type!(
 ///     #[compact]
-///     pub struct TestSolutionCompact<u16, u8, Perbill>::(8)
-/// )
+///     pub struct TestSolutionCompact::<VoterIndex = u16, TargetIndex = u8, Accuracy = Perbill>(8)
+/// );
 /// ```
 #[proc_macro]
 pub fn generate_solution_type(item: TokenStream) -> TokenStream {
@@ -386,7 +394,7 @@ fn check_compact_attr(input: ParseStream) -> Result<bool> {
 	}
 }
 
-/// #[compact] pub struct CompactName::<u32, u32, u32>()
+/// #[compact] pub struct CompactName::<VoterIndex = u32, TargetIndex = u32, Accuracy = u32>()
 impl Parse for SolutionDef {
 	fn parse(input: ParseStream) -> syn::Result<Self> {
 		// optional #[compact]
@@ -405,9 +413,22 @@ impl Parse for SolutionDef {
 			return Err(syn_err("Must provide 3 generic args."))
 		}
 
-		let mut types: Vec<syn::Type> = generics.args.iter().map(|t|
+		let expected_types = ["VoterIndex", "TargetIndex", "Accuracy"];
+
+		let mut types: Vec<syn::Type> = generics.args.iter().zip(expected_types.iter()).map(|(t, expected)|
 			match t {
-				syn::GenericArgument::Type(ty) => Ok(ty.clone()),
+				syn::GenericArgument::Type(ty) => {
+					// this is now an error
+					Err(syn::Error::new_spanned(ty, format!("Expected binding: `{} = ...`", expected)))
+				},
+				syn::GenericArgument::Binding(syn::Binding{ident, ty, ..}) => {
+					// check that we have the right keyword for this position in the argument list
+					if ident == expected {
+						Ok(ty.clone())
+					} else {
+						Err(syn::Error::new_spanned(ident, format!("Expected `{}`", expected)))
+					}
+				}
 				_ => Err(syn_err("Wrong type of generic provided. Must be a `type`.")),
 			}
 		).collect::<Result<_>>()?;
@@ -436,3 +457,12 @@ impl Parse for SolutionDef {
 fn field_name_for(n: usize) -> Ident {
 	Ident::new(&format!("{}{}", PREFIX, n), Span::call_site())
 }
+
+#[cfg(test)]
+mod tests {
+	#[test]
+	fn ui_fail() {
+		let cases = trybuild::TestCases::new();
+		cases.compile_fail("tests/ui/fail/*.rs");
+	}
+}
diff --git a/primitives/npos-elections/compact/tests/ui/fail/missing_accuracy.rs b/primitives/npos-elections/compact/tests/ui/fail/missing_accuracy.rs
new file mode 100644
index 000000000000..4bbf4960a948
--- /dev/null
+++ b/primitives/npos-elections/compact/tests/ui/fail/missing_accuracy.rs
@@ -0,0 +1,9 @@
+use sp_npos_elections_compact::generate_solution_type;
+
+generate_solution_type!(pub struct TestSolution::<
+	VoterIndex = u16,
+	TargetIndex = u8,
+	Perbill,
+>(8));
+
+fn main() {}
diff --git a/primitives/npos-elections/compact/tests/ui/fail/missing_accuracy.stderr b/primitives/npos-elections/compact/tests/ui/fail/missing_accuracy.stderr
new file mode 100644
index 000000000000..b6bb8f39ede6
--- /dev/null
+++ b/primitives/npos-elections/compact/tests/ui/fail/missing_accuracy.stderr
@@ -0,0 +1,5 @@
+error: Expected binding: `Accuracy = ...`
+ --> $DIR/missing_accuracy.rs:6:2
+  |
+6 |     Perbill,
+  |     ^^^^^^^
diff --git a/primitives/npos-elections/compact/tests/ui/fail/missing_target.rs b/primitives/npos-elections/compact/tests/ui/fail/missing_target.rs
new file mode 100644
index 000000000000..7d7584340713
--- /dev/null
+++ b/primitives/npos-elections/compact/tests/ui/fail/missing_target.rs
@@ -0,0 +1,9 @@
+use sp_npos_elections_compact::generate_solution_type;
+
+generate_solution_type!(pub struct TestSolution::<
+	VoterIndex = u16,
+	u8,
+	Accuracy = Perbill,
+>(8));
+
+fn main() {}
diff --git a/primitives/npos-elections/compact/tests/ui/fail/missing_target.stderr b/primitives/npos-elections/compact/tests/ui/fail/missing_target.stderr
new file mode 100644
index 000000000000..d0c92c5bbd8e
--- /dev/null
+++ b/primitives/npos-elections/compact/tests/ui/fail/missing_target.stderr
@@ -0,0 +1,5 @@
+error: Expected binding: `TargetIndex = ...`
+ --> $DIR/missing_target.rs:5:2
+  |
+5 |     u8,
+  |     ^^
diff --git a/primitives/npos-elections/compact/tests/ui/fail/missing_voter.rs b/primitives/npos-elections/compact/tests/ui/fail/missing_voter.rs
new file mode 100644
index 000000000000..3ad77dc104ad
--- /dev/null
+++ b/primitives/npos-elections/compact/tests/ui/fail/missing_voter.rs
@@ -0,0 +1,9 @@
+use sp_npos_elections_compact::generate_solution_type;
+
+generate_solution_type!(pub struct TestSolution::<
+	u16,
+	TargetIndex = u8,
+	Accuracy = Perbill,
+>(8));
+
+fn main() {}
diff --git a/primitives/npos-elections/compact/tests/ui/fail/missing_voter.stderr b/primitives/npos-elections/compact/tests/ui/fail/missing_voter.stderr
new file mode 100644
index 000000000000..a825d460c2fa
--- /dev/null
+++ b/primitives/npos-elections/compact/tests/ui/fail/missing_voter.stderr
@@ -0,0 +1,5 @@
+error: Expected binding: `VoterIndex = ...`
+ --> $DIR/missing_voter.rs:4:2
+  |
+4 |     u16,
+  |     ^^^
diff --git a/primitives/npos-elections/compact/tests/ui/fail/no_annotations.rs b/primitives/npos-elections/compact/tests/ui/fail/no_annotations.rs
new file mode 100644
index 000000000000..aaebb857b3d8
--- /dev/null
+++ b/primitives/npos-elections/compact/tests/ui/fail/no_annotations.rs
@@ -0,0 +1,9 @@
+use sp_npos_elections_compact::generate_solution_type;
+
+generate_solution_type!(pub struct TestSolution::<
+	u16,
+	u8,
+	Perbill,
+>(8));
+
+fn main() {}
diff --git a/primitives/npos-elections/compact/tests/ui/fail/no_annotations.stderr b/primitives/npos-elections/compact/tests/ui/fail/no_annotations.stderr
new file mode 100644
index 000000000000..28f1c2091546
--- /dev/null
+++ b/primitives/npos-elections/compact/tests/ui/fail/no_annotations.stderr
@@ -0,0 +1,5 @@
+error: Expected binding: `VoterIndex = ...`
+ --> $DIR/no_annotations.rs:4:2
+  |
+4 |     u16,
+  |     ^^^
diff --git a/primitives/npos-elections/compact/tests/ui/fail/swap_voter_target.rs b/primitives/npos-elections/compact/tests/ui/fail/swap_voter_target.rs
new file mode 100644
index 000000000000..37124256b35e
--- /dev/null
+++ b/primitives/npos-elections/compact/tests/ui/fail/swap_voter_target.rs
@@ -0,0 +1,9 @@
+use sp_npos_elections_compact::generate_solution_type;
+
+generate_solution_type!(pub struct TestSolution::<
+	TargetIndex = u16,
+	VoterIndex = u8,
+	Accuracy = Perbill,
+>(8));
+
+fn main() {}
diff --git a/primitives/npos-elections/compact/tests/ui/fail/swap_voter_target.stderr b/primitives/npos-elections/compact/tests/ui/fail/swap_voter_target.stderr
new file mode 100644
index 000000000000..5759fee7472f
--- /dev/null
+++ b/primitives/npos-elections/compact/tests/ui/fail/swap_voter_target.stderr
@@ -0,0 +1,5 @@
+error: Expected `VoterIndex`
+ --> $DIR/swap_voter_target.rs:4:2
+  |
+4 |     TargetIndex = u16,
+  |     ^^^^^^^^^^^
diff --git a/primitives/npos-elections/fuzzer/src/compact.rs b/primitives/npos-elections/fuzzer/src/compact.rs
index 91f734bb5b7c..a49f6a535e5f 100644
--- a/primitives/npos-elections/fuzzer/src/compact.rs
+++ b/primitives/npos-elections/fuzzer/src/compact.rs
@@ -4,7 +4,11 @@ use sp_npos_elections::sp_arithmetic::Percent;
 use sp_runtime::codec::{Encode, Error};
 
 fn main() {
-	generate_solution_type!(#[compact] pub struct InnerTestSolutionCompact::<u32, u32, Percent>(16));
+	generate_solution_type!(#[compact] pub struct InnerTestSolutionCompact::<
+		VoterIndex = u32,
+		TargetIndex = u32,
+		Accuracy = Percent,
+	>(16));
 	loop {
 		fuzz!(|fuzzer_data: &[u8]| {
 			let result_decoded: Result<InnerTestSolutionCompact, Error> =
diff --git a/primitives/npos-elections/src/tests.rs b/primitives/npos-elections/src/tests.rs
index 7bd8565a072f..6304e50ec586 100644
--- a/primitives/npos-elections/src/tests.rs
+++ b/primitives/npos-elections/src/tests.rs
@@ -1148,7 +1148,11 @@ mod solution_type {
 
 	type TestAccuracy = Percent;
 
-	generate_solution_type!(pub struct TestSolutionCompact::<u32, u8, TestAccuracy>(16));
+	generate_solution_type!(pub struct TestSolutionCompact::<
+		VoterIndex = u32,
+		TargetIndex = u8,
+		Accuracy = TestAccuracy,
+	>(16));
 
 	#[allow(dead_code)]
 	mod __private {
@@ -1158,7 +1162,7 @@ mod solution_type {
 		use sp_arithmetic::Percent;
 		generate_solution_type!(
 			#[compact]
-			struct InnerTestSolutionCompact::<u32, u8, Percent>(12)
+			struct InnerTestSolutionCompact::<VoterIndex = u32, TargetIndex = u8, Accuracy = Percent>(12)
 		);
 	}
 
@@ -1166,7 +1170,11 @@ mod solution_type {
 	fn solution_struct_works_with_and_without_compact() {
 		// we use u32 size to make sure compact is smaller.
 		let without_compact = {
-			generate_solution_type!(pub struct InnerTestSolution::<u32, u32, Percent>(16));
+			generate_solution_type!(pub struct InnerTestSolution::<
+				VoterIndex = u32,
+				TargetIndex = u32,
+				Accuracy = Percent,
+			>(16));
 			let compact = InnerTestSolution {
 				votes1: vec![(2, 20), (4, 40)],
 				votes2: vec![
@@ -1180,7 +1188,11 @@ mod solution_type {
 		};
 
 		let with_compact = {
-			generate_solution_type!(#[compact] pub struct InnerTestSolutionCompact::<u32, u32, Percent>(16));
+			generate_solution_type!(#[compact] pub struct InnerTestSolutionCompact::<
+				VoterIndex = u32,
+				TargetIndex = u32,
+				Accuracy = Percent,
+			>(16));
 			let compact = InnerTestSolutionCompact {
 				votes1: vec![(2, 20), (4, 40)],
 				votes2: vec![

From 13bea77c6910f76ef7fa59fec347874c99b2170c Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Sun, 28 Mar 2021 20:59:34 +0200
Subject: [PATCH 0569/1194] Implement `fungible::*` for Balances (#8454)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Reservable, Transferrable Fungible(s), plus adapters.

* Repot into new dir

* Imbalances for Fungibles

* Repot and balanced fungible.

* Clean up names and bridge-over Imbalanced.

* Repot frame_support::trait. Finally.

* Make build.

* Docs

* Good errors

* Fix tests. Implement fungible::Inspect for Balances.

* Implement additional traits for Balances.

* Revert UI test "fixes"

* Fix UI error

* Fix UI test

* More work on fungibles

* Fixes

* More work.

* Update lock

* Make fungible::reserved work for Balances

* Introduce Freezer to Assets, ready for a reserve & locks pallet. Some renaming/refactoring.

* Cleanup errors

* Imbalances working with Assets

* Test for freezer.

* Grumbles

* Grumbles

* Fixes

* Extra "side-car" data for a user's asset balance.

* Fix

* Fix test

* Fixes

* Line lengths

* Comments

* Update frame/assets/src/tests.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Update frame/support/src/traits/tokens/fungibles.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Update frame/assets/src/lib.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Update frame/support/src/traits/tokens/fungible.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Introduce `transfer_reserved`

* Rename fungible Reserve -> Hold, add flag structs

* Avoid the `melted` API - its too complex and gives little help

* Repot Assets pallet

Co-authored-by: Bastian Köcher <info@kchr.de>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 Cargo.lock                                    |  16 +
 bin/node/runtime/src/lib.rs                   |   2 +
 frame/assets/src/extra_mutator.rs             | 105 ++++
 frame/assets/src/functions.rs                 | 469 ++++++++++++++++++
 frame/assets/src/impl_fungibles.rs            | 153 ++++++
 frame/assets/src/impl_stored_map.rs           |  58 +++
 frame/assets/src/lib.rs                       | 456 ++---------------
 frame/assets/src/mock.rs                      |  35 ++
 frame/assets/src/tests.rs                     |  85 +++-
 frame/assets/src/types.rs                     | 186 +++++++
 frame/balances/src/lib.rs                     | 176 +++++--
 frame/support/src/traits.rs                   |  11 +-
 frame/support/src/traits/tokens/fungible.rs   | 196 ++++++--
 .../src/traits/tokens/fungible/balanced.rs    |   7 +-
 frame/support/src/traits/tokens/fungibles.rs  | 117 ++++-
 .../src/traits/tokens/fungibles/balanced.rs   |   3 +
 frame/support/src/traits/tokens/misc.rs       |   4 +
 17 files changed, 1531 insertions(+), 548 deletions(-)
 create mode 100644 frame/assets/src/extra_mutator.rs
 create mode 100644 frame/assets/src/functions.rs
 create mode 100644 frame/assets/src/impl_fungibles.rs
 create mode 100644 frame/assets/src/impl_stored_map.rs
 create mode 100644 frame/assets/src/types.rs

diff --git a/Cargo.lock b/Cargo.lock
index 5f09da33b79d..83a2d4527ba2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4635,6 +4635,22 @@ dependencies = [
  "sp-std",
 ]
 
+[[package]]
+name = "pallet-assets-freezer"
+version = "3.0.0"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "pallet-assets",
+ "parity-scale-codec 2.0.1",
+ "serde",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
 [[package]]
 name = "pallet-atomic-swap"
 version = "3.0.0"
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index fcd120d000bf..f790cf41a401 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -1045,6 +1045,8 @@ impl pallet_assets::Config for Runtime {
 	type MetadataDepositPerByte = MetadataDepositPerByte;
 	type ApprovalDeposit = ApprovalDeposit;
 	type StringLimit = StringLimit;
+	type Freezer = ();
+	type Extra = ();
 	type WeightInfo = pallet_assets::weights::SubstrateWeight<Runtime>;
 }
 
diff --git a/frame/assets/src/extra_mutator.rs b/frame/assets/src/extra_mutator.rs
new file mode 100644
index 000000000000..26a9a3f357c5
--- /dev/null
+++ b/frame/assets/src/extra_mutator.rs
@@ -0,0 +1,105 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Datatype for easy mutation of the extra "sidecar" data.
+
+use super::*;
+
+/// A mutator type allowing inspection and possible modification of the extra "sidecar" data.
+///
+/// This may be used as a `Deref` for the pallet's extra data. If mutated (using `DerefMut`), then
+/// any uncommitted changes (see `commit` function) will be automatically committed to storage when
+/// dropped. Changes, even after committed, may be reverted to their original values with the
+/// `revert` function.
+pub struct ExtraMutator<T: Config> {
+	id: T::AssetId,
+	who: T::AccountId,
+	original: T::Extra,
+	pending: Option<T::Extra>,
+}
+
+impl<T: Config> Drop for ExtraMutator<T> {
+	fn drop(&mut self) {
+		debug_assert!(self.commit().is_ok(), "attempt to write to non-existent asset account");
+	}
+}
+
+impl<T: Config> sp_std::ops::Deref for ExtraMutator<T> {
+	type Target = T::Extra;
+	fn deref(&self) -> &T::Extra {
+		match self.pending {
+			Some(ref value) => value,
+			None => &self.original,
+		}
+	}
+}
+
+impl<T: Config> sp_std::ops::DerefMut for ExtraMutator<T> {
+	fn deref_mut(&mut self) -> &mut T::Extra {
+		if self.pending.is_none() {
+			self.pending = Some(self.original.clone());
+		}
+		self.pending.as_mut().unwrap()
+	}
+}
+
+impl<T: Config> ExtraMutator<T> {
+	pub(super) fn maybe_new(id: T::AssetId, who: impl sp_std::borrow::Borrow<T::AccountId>)
+		-> Option<ExtraMutator<T>>
+	{
+		if Account::<T>::contains_key(id, who.borrow()) {
+			Some(ExtraMutator::<T> {
+				id,
+				who: who.borrow().clone(),
+				original: Account::<T>::get(id, who.borrow()).extra,
+				pending: None,
+			})
+		} else {
+			None
+		}
+	}
+
+
+	/// Commit any changes to storage.
+	pub fn commit(&mut self) -> Result<(), ()> {
+		if let Some(extra) = self.pending.take() {
+			Account::<T>::try_mutate_exists(self.id, self.who.borrow(), |maybe_account|
+				if let Some(ref mut account) = maybe_account {
+					account.extra = extra;
+					Ok(())
+				} else {
+					Err(())
+				}
+			)
+		} else {
+			Ok(())
+		}
+	}
+
+	/// Revert any changes, even those already committed by `self` and drop self.
+	pub fn revert(mut self) -> Result<(), ()> {
+		self.pending = None;
+		Account::<T>::try_mutate_exists(self.id, self.who.borrow(), |maybe_account|
+			if let Some(ref mut account) = maybe_account {
+				account.extra = self.original.clone();
+				Ok(())
+			} else {
+				Err(())
+			}
+		)
+	}
+}
diff --git a/frame/assets/src/functions.rs b/frame/assets/src/functions.rs
new file mode 100644
index 000000000000..197b010b6eb8
--- /dev/null
+++ b/frame/assets/src/functions.rs
@@ -0,0 +1,469 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Functions for the Assets pallet.
+
+use super::*;
+
+// The main implementation block for the module.
+impl<T: Config> Pallet<T> {
+	// Public immutables
+
+	/// Return the extra "sid-car" data for `id`/`who`, or `None` if the account doesn't exist.
+	pub fn adjust_extra(id: T::AssetId, who: impl sp_std::borrow::Borrow<T::AccountId>)
+		-> Option<ExtraMutator<T>>
+	{
+		ExtraMutator::maybe_new(id, who)
+	}
+
+	/// Get the asset `id` balance of `who`.
+	pub fn balance(id: T::AssetId, who: impl sp_std::borrow::Borrow<T::AccountId>) -> T::Balance {
+		Account::<T>::get(id, who.borrow()).balance
+	}
+
+	/// Get the total supply of an asset `id`.
+	pub fn total_supply(id: T::AssetId) -> T::Balance {
+		Asset::<T>::get(id).map(|x| x.supply).unwrap_or_else(Zero::zero)
+	}
+
+	pub(super) fn new_account(
+		who: &T::AccountId,
+		d: &mut AssetDetails<T::Balance, T::AccountId, DepositBalanceOf<T>>,
+	) -> Result<bool, DispatchError> {
+		let accounts = d.accounts.checked_add(1).ok_or(Error::<T>::Overflow)?;
+		let is_sufficient = if d.is_sufficient {
+			frame_system::Pallet::<T>::inc_sufficients(who);
+			d.sufficients += 1;
+			true
+		} else {
+			frame_system::Pallet::<T>::inc_consumers(who).map_err(|_| Error::<T>::NoProvider)?;
+			false
+		};
+		d.accounts = accounts;
+		Ok(is_sufficient)
+	}
+
+	pub(super) fn dead_account(
+		what: T::AssetId,
+		who: &T::AccountId,
+		d: &mut AssetDetails<T::Balance, T::AccountId, DepositBalanceOf<T>>,
+		sufficient: bool,
+	) {
+		if sufficient {
+			d.sufficients = d.sufficients.saturating_sub(1);
+			frame_system::Pallet::<T>::dec_sufficients(who);
+		} else {
+			frame_system::Pallet::<T>::dec_consumers(who);
+		}
+		d.accounts = d.accounts.saturating_sub(1);
+		T::Freezer::died(what, who)
+	}
+
+	pub(super) fn can_increase(id: T::AssetId, who: &T::AccountId, amount: T::Balance) -> DepositConsequence {
+		let details = match Asset::<T>::get(id) {
+			Some(details) => details,
+			None => return DepositConsequence::UnknownAsset,
+		};
+		if details.supply.checked_add(&amount).is_none() {
+			return DepositConsequence::Overflow
+		}
+		let account = Account::<T>::get(id, who);
+		if account.balance.checked_add(&amount).is_none() {
+			return DepositConsequence::Overflow
+		}
+		if account.balance.is_zero() {
+			if amount < details.min_balance {
+				return DepositConsequence::BelowMinimum
+			}
+			if !details.is_sufficient && frame_system::Pallet::<T>::providers(who) == 0 {
+				return DepositConsequence::CannotCreate
+			}
+			if details.is_sufficient && details.sufficients.checked_add(1).is_none() {
+				return DepositConsequence::Overflow
+			}
+		}
+
+		DepositConsequence::Success
+	}
+
+	/// Return the consequence of a withdraw.
+	pub(super) fn can_decrease(
+		id: T::AssetId,
+		who: &T::AccountId,
+		amount: T::Balance,
+		keep_alive: bool,
+	) -> WithdrawConsequence<T::Balance> {
+		use WithdrawConsequence::*;
+		let details = match Asset::<T>::get(id) {
+			Some(details) => details,
+			None => return UnknownAsset,
+		};
+		if details.supply.checked_sub(&amount).is_none() {
+			return Underflow
+		}
+		if details.is_frozen {
+			return Frozen
+		}
+		let account = Account::<T>::get(id, who);
+		if account.is_frozen {
+			return Frozen
+		}
+		if let Some(rest) = account.balance.checked_sub(&amount) {
+			if let Some(frozen) = T::Freezer::frozen_balance(id, who) {
+				match frozen.checked_add(&details.min_balance) {
+					Some(required) if rest < required => return Frozen,
+					None => return Overflow,
+					_ => {}
+				}
+			}
+
+			let is_provider = false;
+			let is_required = is_provider && !frame_system::Pallet::<T>::can_dec_provider(who);
+			let must_keep_alive = keep_alive || is_required;
+
+			if rest < details.min_balance {
+				if must_keep_alive {
+					WouldDie
+				} else {
+					ReducedToZero(rest)
+				}
+			} else {
+				Success
+			}
+		} else {
+			NoFunds
+		}
+	}
+
+	// Maximum `amount` that can be passed into `can_withdraw` to result in a `WithdrawConsequence`
+	// of `Success`.
+	pub(super) fn reducible_balance(
+		id: T::AssetId,
+		who: &T::AccountId,
+		keep_alive: bool,
+	) -> Result<T::Balance, Error<T>> {
+		let details = match Asset::<T>::get(id) {
+			Some(details) => details,
+			None => return Err(Error::<T>::Unknown),
+		};
+		ensure!(!details.is_frozen, Error::<T>::Frozen);
+
+		let account = Account::<T>::get(id, who);
+		ensure!(!account.is_frozen, Error::<T>::Frozen);
+
+		let amount = if let Some(frozen) = T::Freezer::frozen_balance(id, who) {
+			// Frozen balance: account CANNOT be deleted
+			let required = frozen.checked_add(&details.min_balance).ok_or(Error::<T>::Overflow)?;
+			account.balance.saturating_sub(required)
+		} else {
+			let is_provider = false;
+			let is_required = is_provider && !frame_system::Pallet::<T>::can_dec_provider(who);
+			if keep_alive || is_required {
+				// We want to keep the account around.
+				account.balance.saturating_sub(details.min_balance)
+			} else {
+				// Don't care if the account dies
+				account.balance
+			}
+		};
+		Ok(amount.min(details.supply))
+	}
+
+	/// Make preparatory checks for debiting some funds from an account. Flags indicate requirements
+	/// of the debit.
+	///
+	/// - `amount`: The amount desired to be debited. The actual amount returned for debit may be
+	///   less (in the case of `best_effort` being `true`) or greater by up to the minimum balance
+	///   less one.
+	/// - `keep_alive`: Require that `target` must stay alive.
+	/// - `respect_freezer`: Respect any freezes on the account or token (or not).
+	/// - `best_effort`: The debit amount may be less than `amount`.
+	///
+	/// On success, the amount which should be debited (this will always be at least `amount` unless
+	/// `best_effort` is `true`) together with an optional value indicating the argument which must
+	/// be passed into the `melted` function of the `T::Freezer` if `Some`.
+	///
+	/// If no valid debit can be made then return an `Err`.
+	pub(super) fn prep_debit(
+		id: T::AssetId,
+		target: &T::AccountId,
+		amount: T::Balance,
+		f: DebitFlags,
+	) -> Result<T::Balance, DispatchError> {
+		let actual = Self::reducible_balance(id, target, f.keep_alive)?
+			.min(amount);
+		ensure!(f.best_effort || actual >= amount, Error::<T>::BalanceLow);
+
+		let conseq = Self::can_decrease(id, target, actual, f.keep_alive);
+		let actual = match conseq.into_result() {
+			Ok(dust) => actual.saturating_add(dust), //< guaranteed by reducible_balance
+			Err(e) => {
+				debug_assert!(false, "passed from reducible_balance; qed");
+				return Err(e.into())
+			}
+		};
+
+		Ok(actual)
+	}
+
+	/// Make preparatory checks for crediting some funds from an account. Flags indicate
+	/// requirements of the credit.
+	///
+	/// - `amount`: The amount desired to be credited.
+	/// - `debit`: The amount by which some other account has been debited. If this is greater than
+	///   `amount`, then the `burn_dust` parameter takes effect.
+	/// - `burn_dust`: Indicates that in the case of debit being greater than amount, the additional
+	///   (dust) value should be burned, rather than credited.
+	///
+	/// On success, the amount which should be credited (this will always be at least `amount`)
+	/// together with an optional value indicating the value which should be burned. The latter
+	/// will always be `None` as long as `burn_dust` is `false` or `debit` is no greater than
+	/// `amount`.
+	///
+	/// If no valid credit can be made then return an `Err`.
+	pub(super) fn prep_credit(
+		id: T::AssetId,
+		dest: &T::AccountId,
+		amount: T::Balance,
+		debit: T::Balance,
+		burn_dust: bool,
+	) -> Result<(T::Balance, Option<T::Balance>), DispatchError> {
+		let (credit, maybe_burn) = match (burn_dust, debit.checked_sub(&amount)) {
+			(true, Some(dust)) => (amount, Some(dust)),
+			_ => (debit, None),
+		};
+		Self::can_increase(id, &dest, credit).into_result()?;
+		Ok((credit, maybe_burn))
+	}
+
+	/// Increases the asset `id` balance of `beneficiary` by `amount`.
+	///
+	/// This alters the registered supply of the asset and emits an event.
+	///
+	/// Will return an error or will increase the amount by exactly `amount`.
+	pub(super) fn do_mint(
+		id: T::AssetId,
+		beneficiary: &T::AccountId,
+		amount: T::Balance,
+		maybe_check_issuer: Option<T::AccountId>,
+	) -> DispatchResult {
+		Self::increase_balance(id, beneficiary, amount, |details| -> DispatchResult {
+			if let Some(check_issuer) = maybe_check_issuer {
+				ensure!(&check_issuer == &details.issuer, Error::<T>::NoPermission);
+			}
+			debug_assert!(T::Balance::max_value() - details.supply >= amount, "checked in prep; qed");
+			details.supply = details.supply.saturating_add(amount);
+			Ok(())
+		})?;
+		Self::deposit_event(Event::Issued(id, beneficiary.clone(), amount));
+		Ok(())
+	}
+
+	/// Increases the asset `id` balance of `beneficiary` by `amount`.
+	///
+	/// LOW-LEVEL: Does not alter the supply of asset or emit an event. Use `do_mint` if you need
+	/// that. This is not intended to be used alone.
+	///
+	/// Will return an error or will increase the amount by exactly `amount`.
+	pub(super) fn increase_balance(
+		id: T::AssetId,
+		beneficiary: &T::AccountId,
+		amount: T::Balance,
+		check: impl FnOnce(&mut AssetDetails<T::Balance, T::AccountId, DepositBalanceOf<T>>) -> DispatchResult,
+	) -> DispatchResult {
+		if amount.is_zero() { return Ok(()) }
+
+		Self::can_increase(id, beneficiary, amount).into_result()?;
+		Asset::<T>::try_mutate(id, |maybe_details| -> DispatchResult {
+			let details = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
+
+			check(details)?;
+
+			Account::<T>::try_mutate(id, beneficiary, |t| -> DispatchResult {
+				let new_balance = t.balance.saturating_add(amount);
+				ensure!(new_balance >= details.min_balance, TokenError::BelowMinimum);
+				if t.balance.is_zero() {
+					t.sufficient = Self::new_account(beneficiary, details)?;
+				}
+				t.balance = new_balance;
+				Ok(())
+			})?;
+			Ok(())
+		})?;
+		Ok(())
+	}
+
+	/// Reduces asset `id` balance of `target` by `amount`. Flags `f` can be given to alter whether
+	/// it attempts a `best_effort` or makes sure to `keep_alive` the account.
+	///
+	/// This alters the registered supply of the asset and emits an event.
+	///
+	/// Will return an error and do nothing or will decrease the amount and return the amount
+	/// reduced by.
+	pub(super) fn do_burn(
+		id: T::AssetId,
+		target: &T::AccountId,
+		amount: T::Balance,
+		maybe_check_admin: Option<T::AccountId>,
+		f: DebitFlags,
+	) -> Result<T::Balance, DispatchError> {
+		let actual = Self::decrease_balance(id, target, amount, f, |actual, details| {
+			// Check admin rights.
+			if let Some(check_admin) = maybe_check_admin {
+				ensure!(&check_admin == &details.admin, Error::<T>::NoPermission);
+			}
+
+			debug_assert!(details.supply >= actual, "checked in prep; qed");
+			details.supply = details.supply.saturating_sub(actual);
+
+			Ok(())
+		})?;
+		Self::deposit_event(Event::Burned(id, target.clone(), actual));
+		Ok(actual)
+	}
+
+	/// Reduces asset `id` balance of `target` by `amount`. Flags `f` can be given to alter whether
+	/// it attempts a `best_effort` or makes sure to `keep_alive` the account.
+	///
+	/// LOW-LEVEL: Does not alter the supply of asset or emit an event. Use `do_burn` if you need
+	/// that. This is not intended to be used alone.
+	///
+	/// Will return an error and do nothing or will decrease the amount and return the amount
+	/// reduced by.
+	pub(super) fn decrease_balance(
+		id: T::AssetId,
+		target: &T::AccountId,
+		amount: T::Balance,
+		f: DebitFlags,
+		check: impl FnOnce(
+			T::Balance,
+			&mut AssetDetails<T::Balance, T::AccountId, DepositBalanceOf<T>>,
+		) -> DispatchResult,
+	) -> Result<T::Balance, DispatchError> {
+		if amount.is_zero() { return Ok(amount) }
+
+		let actual = Self::prep_debit(id, target, amount, f)?;
+
+		Asset::<T>::try_mutate(id, |maybe_details| -> DispatchResult {
+			let details = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
+
+			check(actual, details)?;
+
+			Account::<T>::try_mutate_exists(id, target, |maybe_account| -> DispatchResult {
+				let mut account = maybe_account.take().unwrap_or_default();
+				debug_assert!(account.balance >= actual, "checked in prep; qed");
+
+				// Make the debit.
+				account.balance = account.balance.saturating_sub(actual);
+				*maybe_account = if account.balance < details.min_balance {
+					debug_assert!(account.balance.is_zero(), "checked in prep; qed");
+					Self::dead_account(id, target, details, account.sufficient);
+					None
+				} else {
+					Some(account)
+				};
+				Ok(())
+			})?;
+
+			Ok(())
+		})?;
+
+		Ok(actual)
+	}
+
+	/// Reduces the asset `id` balance of `source` by some `amount` and increases the balance of
+	/// `dest` by (similar) amount.
+	///
+	/// Returns the actual amount placed into `dest`. Exact semantics are determined by the flags
+	/// `f`.
+	///
+	/// Will fail if the amount transferred is so small that it cannot create the destination due
+	/// to minimum balance requirements.
+	pub(super) fn do_transfer(
+		id: T::AssetId,
+		source: &T::AccountId,
+		dest: &T::AccountId,
+		amount: T::Balance,
+		maybe_need_admin: Option<T::AccountId>,
+		f: TransferFlags,
+	) -> Result<T::Balance, DispatchError> {
+		// Early exist if no-op.
+		if amount.is_zero() {
+			Self::deposit_event(Event::Transferred(id, source.clone(), dest.clone(), amount));
+			return Ok(amount)
+		}
+
+		// Figure out the debit and credit, together with side-effects.
+		let debit = Self::prep_debit(id, &source, amount, f.into())?;
+		let (credit, maybe_burn) = Self::prep_credit(id, &dest, amount, debit, f.burn_dust)?;
+
+		let mut source_account = Account::<T>::get(id, &source);
+
+		Asset::<T>::try_mutate(id, |maybe_details| -> DispatchResult {
+			let details = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
+
+			// Check admin rights.
+			if let Some(need_admin) = maybe_need_admin {
+				ensure!(&need_admin == &details.admin, Error::<T>::NoPermission);
+			}
+
+			// Skip if source == dest
+			if source == dest {
+				return Ok(())
+			}
+
+			// Burn any dust if needed.
+			if let Some(burn) = maybe_burn {
+				// Debit dust from supply; this will not saturate since it's already checked in prep.
+				debug_assert!(details.supply >= burn, "checked in prep; qed");
+				details.supply = details.supply.saturating_sub(burn);
+			}
+
+			// Debit balance from source; this will not saturate since it's already checked in prep.
+			debug_assert!(source_account.balance >= debit, "checked in prep; qed");
+			source_account.balance = source_account.balance.saturating_sub(debit);
+
+			Account::<T>::try_mutate(id, &dest, |a| -> DispatchResult {
+				// Calculate new balance; this will not saturate since it's already checked in prep.
+				debug_assert!(a.balance.checked_add(&credit).is_some(), "checked in prep; qed");
+				let new_balance = a.balance.saturating_add(credit);
+
+				// Create a new account if there wasn't one already.
+				if a.balance.is_zero() {
+					a.sufficient = Self::new_account(&dest, details)?;
+				}
+
+				a.balance = new_balance;
+				Ok(())
+			})?;
+
+			// Remove source account if it's now dead.
+			if source_account.balance < details.min_balance {
+				debug_assert!(source_account.balance.is_zero(), "checked in prep; qed");
+				Self::dead_account(id, &source, details, source_account.sufficient);
+				Account::<T>::remove(id, &source);
+			} else {
+				Account::<T>::insert(id, &source, &source_account)
+			}
+
+			Ok(())
+		})?;
+
+		Self::deposit_event(Event::Transferred(id, source.clone(), dest.clone(), credit));
+		Ok(credit)
+	}
+}
diff --git a/frame/assets/src/impl_fungibles.rs b/frame/assets/src/impl_fungibles.rs
new file mode 100644
index 000000000000..a4cff9b7e9a6
--- /dev/null
+++ b/frame/assets/src/impl_fungibles.rs
@@ -0,0 +1,153 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Implementations for fungibles trait.
+
+use super::*;
+
+impl<T: Config> fungibles::Inspect<<T as SystemConfig>::AccountId> for Pallet<T> {
+	type AssetId = T::AssetId;
+	type Balance = T::Balance;
+
+	fn total_issuance(asset: Self::AssetId) -> Self::Balance {
+		Asset::<T>::get(asset).map(|x| x.supply).unwrap_or_else(Zero::zero)
+	}
+
+	fn minimum_balance(asset: Self::AssetId) -> Self::Balance {
+		Asset::<T>::get(asset).map(|x| x.min_balance).unwrap_or_else(Zero::zero)
+	}
+
+	fn balance(
+		asset: Self::AssetId,
+		who: &<T as SystemConfig>::AccountId,
+	) -> Self::Balance {
+		Pallet::<T>::balance(asset, who)
+	}
+
+	fn reducible_balance(
+		asset: Self::AssetId,
+		who: &<T as SystemConfig>::AccountId,
+		keep_alive: bool,
+	) -> Self::Balance {
+		Pallet::<T>::reducible_balance(asset, who, keep_alive).unwrap_or(Zero::zero())
+	}
+
+	fn can_deposit(
+		asset: Self::AssetId,
+		who: &<T as SystemConfig>::AccountId,
+		amount: Self::Balance,
+	) -> DepositConsequence {
+		Pallet::<T>::can_increase(asset, who, amount)
+	}
+
+	fn can_withdraw(
+		asset: Self::AssetId,
+		who: &<T as SystemConfig>::AccountId,
+		amount: Self::Balance,
+	) -> WithdrawConsequence<Self::Balance> {
+		Pallet::<T>::can_decrease(asset, who, amount, false)
+	}
+}
+
+impl<T: Config> fungibles::Mutate<<T as SystemConfig>::AccountId> for Pallet<T> {
+	fn mint_into(
+		asset: Self::AssetId,
+		who: &<T as SystemConfig>::AccountId,
+		amount: Self::Balance,
+	) -> DispatchResult {
+		Self::do_mint(asset, who, amount, None)
+	}
+
+	fn burn_from(
+		asset: Self::AssetId,
+		who: &<T as SystemConfig>::AccountId,
+		amount: Self::Balance,
+	) -> Result<Self::Balance, DispatchError> {
+		let f = DebitFlags {
+			keep_alive: false,
+			best_effort: false,
+		};
+		Self::do_burn(asset, who, amount, None, f)
+	}
+
+	fn slash(
+		asset: Self::AssetId,
+		who: &<T as SystemConfig>::AccountId,
+		amount: Self::Balance,
+	) -> Result<Self::Balance, DispatchError> {
+		let f = DebitFlags {
+			keep_alive: false,
+			best_effort: true,
+		};
+		Self::do_burn(asset, who, amount, None, f)
+	}
+}
+
+impl<T: Config> fungibles::Transfer<T::AccountId> for Pallet<T> {
+	fn transfer(
+		asset: Self::AssetId,
+		source: &T::AccountId,
+		dest: &T::AccountId,
+		amount: T::Balance,
+		keep_alive: bool,
+	) -> Result<T::Balance, DispatchError> {
+		let f = TransferFlags {
+			keep_alive,
+			best_effort: false,
+			burn_dust: false
+		};
+		Self::do_transfer(asset, source, dest, amount, None, f)
+	}
+}
+
+impl<T: Config> fungibles::Unbalanced<T::AccountId> for Pallet<T> {
+	fn set_balance(_: Self::AssetId, _: &T::AccountId, _: Self::Balance) -> DispatchResult {
+		unreachable!("set_balance is not used if other functions are impl'd");
+	}
+	fn set_total_issuance(id: T::AssetId, amount: Self::Balance) {
+		Asset::<T>::mutate_exists(id, |maybe_asset| if let Some(ref mut asset) = maybe_asset {
+			asset.supply = amount
+		});
+	}
+	fn decrease_balance(asset: T::AssetId, who: &T::AccountId, amount: Self::Balance)
+						-> Result<Self::Balance, DispatchError>
+	{
+		let f = DebitFlags { keep_alive: false, best_effort: false };
+		Self::decrease_balance(asset, who, amount, f, |_, _| Ok(()))
+	}
+	fn decrease_balance_at_most(asset: T::AssetId, who: &T::AccountId, amount: Self::Balance)
+								-> Self::Balance
+	{
+		let f = DebitFlags { keep_alive: false, best_effort: true };
+		Self::decrease_balance(asset, who, amount, f, |_, _| Ok(()))
+			.unwrap_or(Zero::zero())
+	}
+	fn increase_balance(asset: T::AssetId, who: &T::AccountId, amount: Self::Balance)
+						-> Result<Self::Balance, DispatchError>
+	{
+		Self::increase_balance(asset, who, amount, |_| Ok(()))?;
+		Ok(amount)
+	}
+	fn increase_balance_at_most(asset: T::AssetId, who: &T::AccountId, amount: Self::Balance)
+								-> Self::Balance
+	{
+		match Self::increase_balance(asset, who, amount, |_| Ok(())) {
+			Ok(()) => amount,
+			Err(_) => Zero::zero(),
+		}
+	}
+}
diff --git a/frame/assets/src/impl_stored_map.rs b/frame/assets/src/impl_stored_map.rs
new file mode 100644
index 000000000000..a8a6f95557df
--- /dev/null
+++ b/frame/assets/src/impl_stored_map.rs
@@ -0,0 +1,58 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Assets pallet's `StoredMap` implementation.
+
+use super::*;
+
+impl<T: Config> StoredMap<(T::AssetId, T::AccountId), T::Extra> for Pallet<T> {
+	fn get(id_who: &(T::AssetId, T::AccountId)) -> T::Extra {
+		let &(id, ref who) = id_who;
+		if Account::<T>::contains_key(id, who) {
+			Account::<T>::get(id, who).extra
+		} else {
+			Default::default()
+		}
+	}
+
+	fn try_mutate_exists<R, E: From<StoredMapError>>(
+		id_who: &(T::AssetId, T::AccountId),
+		f: impl FnOnce(&mut Option<T::Extra>) -> Result<R, E>,
+	) -> Result<R, E> {
+		let &(id, ref who) = id_who;
+		let mut maybe_extra = Some(Account::<T>::get(id, who).extra);
+		let r = f(&mut maybe_extra)?;
+		// They want to write some value or delete it.
+		// If the account existed and they want to write a value, then we write.
+		// If the account didn't exist and they want to delete it, then we let it pass.
+		// Otherwise, we fail.
+		Account::<T>::try_mutate_exists(id, who, |maybe_account| {
+			if let Some(extra) = maybe_extra {
+				// They want to write a value. Let this happen only if the account actually exists.
+				if let Some(ref mut account) = maybe_account {
+					account.extra = extra;
+				} else {
+					Err(StoredMapError::NoProviders)?;
+				}
+			} else {
+				// They want to delete it. Let this pass if the item never existed anyway.
+				ensure!(maybe_account.is_none(), StoredMapError::ConsumerRemaining);
+			}
+			Ok(r)
+		})
+	}
+}
diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index db7338e36e53..2a162c2c936b 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -130,191 +130,30 @@ pub mod mock;
 #[cfg(test)]
 mod tests;
 
-use sp_std::prelude::*;
+mod extra_mutator;
+pub use extra_mutator::*;
+mod impl_stored_map;
+mod impl_fungibles;
+mod functions;
+mod types;
+pub use types::*;
+
+use sp_std::{prelude::*, borrow::Borrow};
 use sp_runtime::{
-	RuntimeDebug,
-	traits::{
-		AtLeast32BitUnsigned, Zero, StaticLookup, Saturating, CheckedSub, CheckedAdd,
+	RuntimeDebug, TokenError, traits::{
+		AtLeast32BitUnsigned, Zero, StaticLookup, Saturating, CheckedSub, CheckedAdd, Bounded,
+		StoredMapError,
 	}
 };
 use codec::{Encode, Decode, HasCompact};
 use frame_support::{ensure, dispatch::{DispatchError, DispatchResult}};
-use frame_support::traits::{Currency, ReservableCurrency, BalanceStatus::Reserved};
+use frame_support::traits::{Currency, ReservableCurrency, BalanceStatus::Reserved, StoredMap};
 use frame_support::traits::tokens::{WithdrawConsequence, DepositConsequence, fungibles};
 use frame_system::Config as SystemConfig;
 
 pub use weights::WeightInfo;
 pub use pallet::*;
 
-impl<T: Config> fungibles::Inspect<<T as SystemConfig>::AccountId> for Pallet<T> {
-	type AssetId = T::AssetId;
-	type Balance = T::Balance;
-
-	fn total_issuance(asset: Self::AssetId) -> Self::Balance {
-		Asset::<T>::get(asset).map(|x| x.supply).unwrap_or_else(Zero::zero)
-	}
-
-	fn minimum_balance(asset: Self::AssetId) -> Self::Balance {
-		Asset::<T>::get(asset).map(|x| x.min_balance).unwrap_or_else(Zero::zero)
-	}
-
-	fn balance(
-		asset: Self::AssetId,
-		who: &<T as SystemConfig>::AccountId,
-	) -> Self::Balance {
-		Pallet::<T>::balance(asset, who)
-	}
-
-	fn can_deposit(
-		asset: Self::AssetId,
-		who: &<T as SystemConfig>::AccountId,
-		amount: Self::Balance,
-	) -> DepositConsequence {
-		Pallet::<T>::can_deposit(asset, who, amount)
-	}
-
-	fn can_withdraw(
-		asset: Self::AssetId,
-		who: &<T as SystemConfig>::AccountId,
-		amount: Self::Balance,
-	) -> WithdrawConsequence<Self::Balance> {
-		Pallet::<T>::can_withdraw(asset, who, amount)
-	}
-}
-
-impl<T: Config> fungibles::Mutate<<T as SystemConfig>::AccountId> for Pallet<T> {
-	fn deposit(
-		asset: Self::AssetId,
-		who: &<T as SystemConfig>::AccountId,
-		amount: Self::Balance,
-	) -> DispatchResult {
-		Pallet::<T>::increase_balance(asset, who.clone(), amount, None)
-	}
-
-	fn withdraw(
-		asset: Self::AssetId,
-		who: &<T as SystemConfig>::AccountId,
-		amount: Self::Balance,
-	) -> Result<Self::Balance, DispatchError> {
-		Pallet::<T>::reduce_balance(asset, who.clone(), amount, None)
-	}
-}
-
-impl<T: Config> fungibles::Transfer<T::AccountId> for Pallet<T> {
-	fn transfer(
-		asset: Self::AssetId,
-		source: &T::AccountId,
-		dest: &T::AccountId,
-		amount: T::Balance,
-	) -> Result<T::Balance, DispatchError> {
-		<Self as fungibles::Mutate::<T::AccountId>>::transfer(asset, source, dest, amount)
-	}
-}
-
-type DepositBalanceOf<T> = <<T as Config>::Currency as Currency<<T as SystemConfig>::AccountId>>::Balance;
-
-#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug)]
-pub struct AssetDetails<
-	Balance,
-	AccountId,
-	DepositBalance,
-> {
-	/// Can change `owner`, `issuer`, `freezer` and `admin` accounts.
-	owner: AccountId,
-	/// Can mint tokens.
-	issuer: AccountId,
-	/// Can thaw tokens, force transfers and burn tokens from any account.
-	admin: AccountId,
-	/// Can freeze tokens.
-	freezer: AccountId,
-	/// The total supply across all accounts.
-	supply: Balance,
-	/// The balance deposited for this asset. This pays for the data stored here.
-	deposit: DepositBalance,
-	/// The ED for virtual accounts.
-	min_balance: Balance,
-	/// If `true`, then any account with this asset is given a provider reference. Otherwise, it
-	/// requires a consumer reference.
-	is_sufficient: bool,
-	/// The total number of accounts.
-	accounts: u32,
-	/// The total number of accounts for which we have placed a self-sufficient reference.
-	sufficients: u32,
-	/// The total number of approvals.
-	approvals: u32,
-	/// Whether the asset is frozen for non-admin transfers.
-	is_frozen: bool,
-}
-
-impl<Balance, AccountId, DepositBalance> AssetDetails<Balance, AccountId, DepositBalance> {
-	pub fn destroy_witness(&self) -> DestroyWitness {
-		DestroyWitness {
-			accounts: self.accounts,
-			sufficients: self.sufficients,
-			approvals: self.approvals,
-		}
-	}
-}
-
-/// A pair to act as a key for the approval storage map.
-#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug)]
-pub struct ApprovalKey<AccountId> {
-	/// The owner of the funds that are being approved.
-	owner: AccountId,
-	/// The party to whom transfer of the funds is being delegated.
-	delegate: AccountId,
-}
-
-/// Data concerning an approval.
-#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default)]
-pub struct Approval<Balance, DepositBalance> {
-	/// The amount of funds approved for the balance transfer from the owner to some delegated
-	/// target.
-	amount: Balance,
-	/// The amount reserved on the owner's account to hold this item in storage.
-	deposit: DepositBalance,
-}
-
-#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default)]
-pub struct AssetBalance<Balance> {
-	/// The balance.
-	balance: Balance,
-	/// Whether the account is frozen.
-	is_frozen: bool,
-	/// `true` if this balance gave the account a self-sufficient reference.
-	sufficient: bool,
-}
-
-#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default)]
-pub struct AssetMetadata<DepositBalance> {
-	/// The balance deposited for this metadata.
-	///
-	/// This pays for the data stored in this struct.
-	deposit: DepositBalance,
-	/// The user friendly name of this asset. Limited in length by `StringLimit`.
-	name: Vec<u8>,
-	/// The ticker symbol for this asset. Limited in length by `StringLimit`.
-	symbol: Vec<u8>,
-	/// The number of decimals this asset uses to represent one unit.
-	decimals: u8,
-	/// Whether the asset metadata may be changed by a non Force origin.
-	is_frozen: bool,
-}
-
-/// Witness data for the destroy transactions.
-#[derive(Copy, Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug)]
-pub struct DestroyWitness {
-	/// The number of accounts holding the asset.
-	#[codec(compact)]
-	accounts: u32,
-	/// The number of accounts holding the asset with a self-sufficient reference.
-	#[codec(compact)]
-	sufficients: u32,
-	/// The number of transfer-approvals of the asset.
-	#[codec(compact)]
-	approvals: u32,
-}
-
 #[frame_support::pallet]
 pub mod pallet {
 	use frame_support::{
@@ -363,6 +202,13 @@ pub mod pallet {
 		/// The maximum length of a name or symbol stored on-chain.
 		type StringLimit: Get<u32>;
 
+		/// A hook to allow a per-asset, per-account minimum balance to be enforced. This must be
+		/// respected in all permissionless operations.
+		type Freezer: FrozenBalance<Self::AssetId, Self::AccountId, Self::Balance>;
+
+		/// Additional data to be stored with an account's asset balance.
+		type Extra: Member + Parameter + Default;
+
 		/// Weight information for extrinsics in this pallet.
 		type WeightInfo: WeightInfo;
 	}
@@ -384,7 +230,7 @@ pub mod pallet {
 		T::AssetId,
 		Blake2_128Concat,
 		T::AccountId,
-		AssetBalance<T::Balance>,
+		AssetBalance<T::Balance, T::Extra>,
 		ValueQuery,
 	>;
 
@@ -637,7 +483,7 @@ pub mod pallet {
 				ensure!(details.approvals == witness.approvals, Error::<T>::BadWitness);
 
 				for (who, v) in Account::<T>::drain_prefix(id) {
-					Self::dead_account(&who, &mut details, v.sufficient);
+					Self::dead_account(id, &who, &mut details, v.sufficient);
 				}
 				debug_assert_eq!(details.accounts, 0);
 				debug_assert_eq!(details.sufficients, 0);
@@ -674,7 +520,9 @@ pub mod pallet {
 		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
 			let beneficiary = T::Lookup::lookup(beneficiary)?;
-			Self::increase_balance(id, beneficiary, amount, Some(origin))
+			Self::do_mint(id, &beneficiary, amount, Some(origin))?;
+			Self::deposit_event(Event::Issued(id, beneficiary, amount));
+			Ok(())
 		}
 
 		/// Reduce the balance of `who` by as much as possible up to `amount` assets of `id`.
@@ -702,7 +550,10 @@ pub mod pallet {
 			let origin = ensure_signed(origin)?;
 			let who = T::Lookup::lookup(who)?;
 
-			Self::reduce_balance(id, who, amount, Some(origin)).map(|_| ())
+			let f = DebitFlags { keep_alive: false, best_effort: true };
+			let burned = Self::do_burn(id, &who, amount, Some(origin), f)?;
+			Self::deposit_event(Event::Burned(id, who, burned));
+			Ok(())
 		}
 
 		/// Move some assets from the sender account to another.
@@ -733,7 +584,12 @@ pub mod pallet {
 			let origin = ensure_signed(origin)?;
 			let dest = T::Lookup::lookup(target)?;
 
-			Self::do_transfer(id, origin, dest, amount, None, false)
+			let f = TransferFlags {
+				keep_alive: false,
+				best_effort: false,
+				burn_dust: false
+			};
+			Self::do_transfer(id, &origin, &dest, amount, None, f).map(|_| ())
 		}
 
 		/// Move some assets from the sender account to another, keeping the sender account alive.
@@ -761,10 +617,15 @@ pub mod pallet {
 			target: <T::Lookup as StaticLookup>::Source,
 			#[pallet::compact] amount: T::Balance
 		) -> DispatchResult {
-			let origin = ensure_signed(origin)?;
+			let source = ensure_signed(origin)?;
 			let dest = T::Lookup::lookup(target)?;
 
-			Self::do_transfer(id, origin, dest, amount, None, true)
+			let f = TransferFlags {
+				keep_alive: true,
+				best_effort: false,
+				burn_dust: false
+			};
+			Self::do_transfer(id, &source, &dest, amount, None, f).map(|_| ())
 		}
 
 		/// Move some assets from one account to another.
@@ -798,7 +659,12 @@ pub mod pallet {
 			let source = T::Lookup::lookup(source)?;
 			let dest = T::Lookup::lookup(dest)?;
 
-			Self::do_transfer(id, source, dest, amount, Some(origin), false)
+			let f = TransferFlags {
+				keep_alive: false,
+				best_effort: false,
+				burn_dust: false
+			};
+			Self::do_transfer(id, &source, &dest, amount, Some(origin), f).map(|_| ())
 		}
 
 		/// Disallow further unprivileged transfers from an account.
@@ -1351,7 +1217,12 @@ pub mod pallet {
 				let mut approved = maybe_approved.take().ok_or(Error::<T>::Unapproved)?;
 				let remaining = approved.amount.checked_sub(&amount).ok_or(Error::<T>::Unapproved)?;
 
-				Self::do_transfer(id, key.owner.clone(), destination, amount, None, false)?;
+				let f = TransferFlags {
+					keep_alive: false,
+					best_effort: false,
+					burn_dust: false
+				};
+				Self::do_transfer(id, &key.owner, &destination, amount, None, f)?;
 
 				if remaining.is_zero() {
 					T::Currency::unreserve(&key.owner, approved.deposit);
@@ -1365,222 +1236,3 @@ pub mod pallet {
 		}
 	}
 }
-
-// The main implementation block for the module.
-impl<T: Config> Pallet<T> {
-	// Public immutables
-
-	/// Get the asset `id` balance of `who`.
-	pub fn balance(id: T::AssetId, who: impl sp_std::borrow::Borrow<T::AccountId>) -> T::Balance {
-		Account::<T>::get(id, who.borrow()).balance
-	}
-
-	/// Get the total supply of an asset `id`.
-	pub fn total_supply(id: T::AssetId) -> T::Balance {
-		Asset::<T>::get(id).map(|x| x.supply).unwrap_or_else(Zero::zero)
-	}
-
-	fn new_account(
-		who: &T::AccountId,
-		d: &mut AssetDetails<T::Balance, T::AccountId, DepositBalanceOf<T>>,
-	) -> Result<bool, DispatchError> {
-		let accounts = d.accounts.checked_add(1).ok_or(Error::<T>::Overflow)?;
-		let is_sufficient = if d.is_sufficient {
-			frame_system::Pallet::<T>::inc_sufficients(who);
-			d.sufficients += 1;
-			true
-		} else {
-			frame_system::Pallet::<T>::inc_consumers(who).map_err(|_| Error::<T>::NoProvider)?;
-			false
-		};
-		d.accounts = accounts;
-		Ok(is_sufficient)
-	}
-
-	fn dead_account(
-		who: &T::AccountId,
-		d: &mut AssetDetails<T::Balance, T::AccountId, DepositBalanceOf<T>>,
-		sufficient: bool,
-	) {
-		if sufficient {
-			d.sufficients = d.sufficients.saturating_sub(1);
-			frame_system::Pallet::<T>::dec_sufficients(who);
-		} else {
-			frame_system::Pallet::<T>::dec_consumers(who);
-		}
-		d.accounts = d.accounts.saturating_sub(1);
-	}
-
-	fn can_deposit(id: T::AssetId, who: &T::AccountId, amount: T::Balance) -> DepositConsequence {
-		let details = match Asset::<T>::get(id) {
-			Some(details) => details,
-			None => return DepositConsequence::UnknownAsset,
-		};
-		if details.supply.checked_add(&amount).is_none() {
-			return DepositConsequence::Overflow
-		}
-		let account = Account::<T>::get(id, who);
-		if account.balance.checked_add(&amount).is_none() {
-			return DepositConsequence::Overflow
-		}
-		if account.balance.is_zero() {
-			if amount < details.min_balance {
-				return DepositConsequence::BelowMinimum
-			}
-			if !details.is_sufficient && frame_system::Pallet::<T>::providers(who) == 0 {
-				return DepositConsequence::CannotCreate
-			}
-			if details.is_sufficient && details.sufficients.checked_add(1).is_none() {
-				return DepositConsequence::Overflow
-			}
-		}
-
-		DepositConsequence::Success
-	}
-
-	fn can_withdraw(
-		id: T::AssetId,
-		who: &T::AccountId,
-		amount: T::Balance,
-	) -> WithdrawConsequence<T::Balance> {
-		let details = match Asset::<T>::get(id) {
-			Some(details) => details,
-			None => return WithdrawConsequence::UnknownAsset,
-		};
-		if details.supply.checked_sub(&amount).is_none() {
-			return WithdrawConsequence::Underflow
-		}
-		let account = Account::<T>::get(id, who);
-		if let Some(rest) = account.balance.checked_sub(&amount) {
-			if rest < details.min_balance {
-				WithdrawConsequence::ReducedToZero(rest)
-			} else {
-				// NOTE: this assumes (correctly) that the token won't be a provider. If that ever
-				// changes, this will need to change.
-				WithdrawConsequence::Success
-			}
-		} else {
-			WithdrawConsequence::NoFunds
-		}
-	}
-
-	fn increase_balance(
-		id: T::AssetId,
-		beneficiary: T::AccountId,
-		amount: T::Balance,
-		maybe_check_issuer: Option<T::AccountId>,
-	) -> DispatchResult {
-		Asset::<T>::try_mutate(id, |maybe_details| {
-			let details = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
-
-			if let Some(check_issuer) = maybe_check_issuer {
-				ensure!(&check_issuer == &details.issuer, Error::<T>::NoPermission);
-			}
-			details.supply = details.supply.checked_add(&amount).ok_or(Error::<T>::Overflow)?;
-
-			Account::<T>::try_mutate(id, &beneficiary, |t| -> DispatchResult {
-				let new_balance = t.balance.saturating_add(amount);
-				ensure!(new_balance >= details.min_balance, Error::<T>::BalanceLow);
-				if t.balance.is_zero() {
-					t.sufficient = Self::new_account(&beneficiary, details)?;
-				}
-				t.balance = new_balance;
-				Ok(())
-			})?;
-			Self::deposit_event(Event::Issued(id, beneficiary, amount));
-			Ok(())
-		})
-	}
-
-	fn reduce_balance(
-		id: T::AssetId,
-		target: T::AccountId,
-		amount: T::Balance,
-		maybe_check_admin: Option<T::AccountId>,
-	) -> Result<T::Balance, DispatchError> {
-		Asset::<T>::try_mutate(id, |maybe_details| {
-			let d = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
-			if let Some(check_admin) = maybe_check_admin {
-				ensure!(&check_admin == &d.admin, Error::<T>::NoPermission);
-			}
-
-			let burned = Account::<T>::try_mutate_exists(
-				id,
-				&target,
-				|maybe_account| -> Result<T::Balance, DispatchError> {
-					let mut account = maybe_account.take().ok_or(Error::<T>::BalanceZero)?;
-					let mut burned = amount.min(account.balance);
-					account.balance -= burned;
-					*maybe_account = if account.balance < d.min_balance {
-						burned += account.balance;
-						Self::dead_account(&target, d, account.sufficient);
-						None
-					} else {
-						Some(account)
-					};
-					Ok(burned)
-				}
-			)?;
-
-			d.supply = d.supply.saturating_sub(burned);
-
-			Self::deposit_event(Event::Burned(id, target, burned));
-			Ok(burned)
-		})
-	}
-
-	fn do_transfer(
-		id: T::AssetId,
-		source: T::AccountId,
-		dest: T::AccountId,
-		amount: T::Balance,
-		maybe_need_admin: Option<T::AccountId>,
-		keep_alive: bool,
-	) -> DispatchResult {
-		let mut source_account = Account::<T>::get(id, &source);
-		ensure!(!source_account.is_frozen, Error::<T>::Frozen);
-
-		source_account.balance = source_account.balance.checked_sub(&amount)
-			.ok_or(Error::<T>::BalanceLow)?;
-
-		Asset::<T>::try_mutate(id, |maybe_details| {
-			let details = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
-			ensure!(!details.is_frozen, Error::<T>::Frozen);
-
-			if let Some(need_admin) = maybe_need_admin {
-				ensure!(&need_admin == &details.admin, Error::<T>::NoPermission);
-			}
-
-			if dest != source && !amount.is_zero() {
-				let mut amount = amount;
-				if source_account.balance < details.min_balance {
-					ensure!(!keep_alive, Error::<T>::WouldDie);
-					amount += source_account.balance;
-					source_account.balance = Zero::zero();
-				}
-
-				Account::<T>::try_mutate(id, &dest, |a| -> DispatchResult {
-					let new_balance = a.balance.saturating_add(amount);
-
-					ensure!(new_balance >= details.min_balance, Error::<T>::BalanceLow);
-
-					if a.balance.is_zero() {
-						a.sufficient = Self::new_account(&dest, details)?;
-					}
-					a.balance = new_balance;
-					Ok(())
-				})?;
-
-				if source_account.balance.is_zero() {
-					Self::dead_account(&source, details, source_account.sufficient);
-					Account::<T>::remove(id, &source);
-				} else {
-					Account::<T>::insert(id, &source, &source_account)
-				}
-			}
-
-			Self::deposit_event(Event::Transferred(id, source, dest, amount));
-			Ok(())
-		})
-	}
-}
diff --git a/frame/assets/src/mock.rs b/frame/assets/src/mock.rs
index 806d85ce7194..26ff938512a2 100644
--- a/frame/assets/src/mock.rs
+++ b/frame/assets/src/mock.rs
@@ -100,7 +100,42 @@ impl Config for Test {
 	type MetadataDepositPerByte = MetadataDepositPerByte;
 	type ApprovalDeposit = ApprovalDeposit;
 	type StringLimit = StringLimit;
+	type Freezer = TestFreezer;
 	type WeightInfo = ();
+	type Extra = ();
+}
+
+use std::cell::RefCell;
+use std::collections::HashMap;
+
+#[derive(Copy, Clone, Eq, PartialEq, Debug)]
+pub(crate) enum Hook {
+	Died(u32, u64),
+}
+thread_local! {
+	static FROZEN: RefCell<HashMap<(u32, u64), u64>> = RefCell::new(Default::default());
+	static HOOKS: RefCell<Vec<Hook>> = RefCell::new(Default::default());
+}
+
+pub struct TestFreezer;
+impl FrozenBalance<u32, u64, u64> for TestFreezer {
+	fn frozen_balance(asset: u32, who: &u64) -> Option<u64> {
+		FROZEN.with(|f| f.borrow().get(&(asset, who.clone())).cloned())
+	}
+
+	fn died(asset: u32, who: &u64) {
+		HOOKS.with(|h| h.borrow_mut().push(Hook::Died(asset, who.clone())));
+	}
+}
+
+pub(crate) fn set_frozen_balance(asset: u32, who: u64, amount: u64) {
+	FROZEN.with(|f| f.borrow_mut().insert((asset, who), amount));
+}
+pub(crate) fn clear_frozen_balance(asset: u32, who: u64) {
+	FROZEN.with(|f| f.borrow_mut().remove(&(asset, who)));
+}
+pub(crate) fn hooks() -> Vec<Hook> {
+	HOOKS.with(|h| h.borrow().clone())
 }
 
 pub(crate) fn new_test_ext() -> sp_io::TestExternalities {
diff --git a/frame/assets/src/tests.rs b/frame/assets/src/tests.rs
index 1fe9358dcbff..953164a0b938 100644
--- a/frame/assets/src/tests.rs
+++ b/frame/assets/src/tests.rs
@@ -19,6 +19,7 @@
 
 use super::*;
 use crate::{Error, mock::*};
+use sp_runtime::TokenError;
 use frame_support::{assert_ok, assert_noop, traits::Currency};
 use pallet_balances::Error as BalancesError;
 
@@ -198,11 +199,11 @@ fn non_providing_should_work() {
 		assert_ok!(Assets::mint(Origin::signed(1), 0, 0, 100));
 
 		// Cannot mint into account 2 since it doesn't (yet) exist...
-		assert_noop!(Assets::mint(Origin::signed(1), 0, 1, 100), Error::<Test>::NoProvider);
+		assert_noop!(Assets::mint(Origin::signed(1), 0, 1, 100), TokenError::CannotCreate);
 		// ...or transfer...
-		assert_noop!(Assets::transfer(Origin::signed(0), 0, 1, 50), Error::<Test>::NoProvider);
+		assert_noop!(Assets::transfer(Origin::signed(0), 0, 1, 50), TokenError::CannotCreate);
 		// ...or force-transfer
-		assert_noop!(Assets::force_transfer(Origin::signed(1), 0, 0, 1, 50), Error::<Test>::NoProvider);
+		assert_noop!(Assets::force_transfer(Origin::signed(1), 0, 0, 1, 50), TokenError::CannotCreate);
 
 		Balances::make_free_balance_be(&1, 100);
 		Balances::make_free_balance_be(&2, 100);
@@ -219,12 +220,11 @@ fn min_balance_should_work() {
 		assert_eq!(Asset::<Test>::get(0).unwrap().accounts, 1);
 
 		// Cannot create a new account with a balance that is below minimum...
-		assert_noop!(Assets::mint(Origin::signed(1), 0, 2, 9), Error::<Test>::BalanceLow);
-		assert_noop!(Assets::transfer(Origin::signed(1), 0, 2, 9), Error::<Test>::BalanceLow);
-		assert_noop!(Assets::force_transfer(Origin::signed(1), 0, 1, 2, 9), Error::<Test>::BalanceLow);
+		assert_noop!(Assets::mint(Origin::signed(1), 0, 2, 9), TokenError::BelowMinimum);
+		assert_noop!(Assets::transfer(Origin::signed(1), 0, 2, 9), TokenError::BelowMinimum);
+		assert_noop!(Assets::force_transfer(Origin::signed(1), 0, 1, 2, 9), TokenError::BelowMinimum);
 
 		// When deducting from an account to below minimum, it should be reaped.
-
 		assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 91));
 		assert!(Assets::balance(0, 1).is_zero());
 		assert_eq!(Assets::balance(0, 2), 100);
@@ -277,7 +277,7 @@ fn transferring_enough_to_kill_source_when_keep_alive_should_fail() {
 		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 10));
 		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
 		assert_eq!(Assets::balance(0, 1), 100);
-		assert_noop!(Assets::transfer_keep_alive(Origin::signed(1), 0, 2, 91), Error::<Test>::WouldDie);
+		assert_noop!(Assets::transfer_keep_alive(Origin::signed(1), 0, 2, 91), Error::<Test>::BalanceLow);
 		assert_ok!(Assets::transfer_keep_alive(Origin::signed(1), 0, 2, 90));
 		assert_eq!(Assets::balance(0, 1), 10);
 		assert_eq!(Assets::balance(0, 2), 90);
@@ -430,12 +430,14 @@ fn burning_asset_balance_with_positive_balance_should_work() {
 }
 
 #[test]
-fn burning_asset_balance_with_zero_balance_should_not_work() {
+fn burning_asset_balance_with_zero_balance_does_nothing() {
 	new_test_ext().execute_with(|| {
 		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
 		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
 		assert_eq!(Assets::balance(0, 2), 0);
-		assert_noop!(Assets::burn(Origin::signed(1), 0, 2, u64::max_value()), Error::<Test>::BalanceZero);
+		assert_ok!(Assets::burn(Origin::signed(1), 0, 2, u64::max_value()));
+		assert_eq!(Assets::balance(0, 2), 0);
+		assert_eq!(Assets::total_supply(0), 100);
 	});
 }
 
@@ -491,3 +493,66 @@ fn set_metadata_should_work() {
 }
 
 // TODO: tests for force_set_metadata, force_clear_metadata, force_asset_status
+// https://github.com/paritytech/substrate/issues/8470
+
+#[test]
+fn freezer_should_work() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 10));
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
+		assert_eq!(Assets::balance(0, 1), 100);
+
+
+		// freeze 50 of it.
+		set_frozen_balance(0, 1, 50);
+
+		assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 20));
+		// cannot transfer another 21 away as this would take the non-frozen balance (30) to below
+		// the minimum balance (10).
+		assert_noop!(Assets::transfer(Origin::signed(1), 0, 2, 21), Error::<Test>::BalanceLow);
+
+		// create an approved transfer...
+		Balances::make_free_balance_be(&1, 100);
+		assert_ok!(Assets::approve_transfer(Origin::signed(1), 0, 2, 50));
+		let e = Error::<Test>::BalanceLow;
+		// ...but that wont work either:
+		assert_noop!(Assets::transfer_approved(Origin::signed(2), 0, 1, 2, 21), e);
+		// a force transfer won't work also.
+		let e = Error::<Test>::BalanceLow;
+		assert_noop!(Assets::force_transfer(Origin::signed(1), 0, 1, 2, 21), e);
+
+		// reduce it to only 49 frozen...
+		set_frozen_balance(0, 1, 49);
+		// ...and it's all good:
+		assert_ok!(Assets::force_transfer(Origin::signed(1), 0, 1, 2, 21));
+
+		// and if we clear it, we can remove the account completely.
+		clear_frozen_balance(0, 1);
+		assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 50));
+		assert_eq!(hooks(), vec![Hook::Died(0, 1)]);
+	});
+}
+
+#[test]
+fn imbalances_should_work() {
+	use frame_support::traits::tokens::fungibles::Balanced;
+
+	new_test_ext().execute_with(|| {
+		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
+
+		let imb = Assets::issue(0, 100);
+		assert_eq!(Assets::total_supply(0), 100);
+		assert_eq!(imb.peek(), 100);
+
+		let (imb1, imb2) = imb.split(30);
+		assert_eq!(imb1.peek(), 30);
+		assert_eq!(imb2.peek(), 70);
+
+		drop(imb2);
+		assert_eq!(Assets::total_supply(0), 30);
+
+		assert!(Assets::resolve(&1, imb1).is_ok());
+		assert_eq!(Assets::balance(0, 1), 30);
+		assert_eq!(Assets::total_supply(0), 30);
+	});
+}
diff --git a/frame/assets/src/types.rs b/frame/assets/src/types.rs
new file mode 100644
index 000000000000..7e0e235b1b7e
--- /dev/null
+++ b/frame/assets/src/types.rs
@@ -0,0 +1,186 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Various basic tyoes for use in the assets pallet.
+
+use super::*;
+
+pub(super) type DepositBalanceOf<T> = <<T as Config>::Currency as Currency<<T as SystemConfig>::AccountId>>::Balance;
+
+#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug)]
+pub struct AssetDetails<
+	Balance,
+	AccountId,
+	DepositBalance,
+> {
+	/// Can change `owner`, `issuer`, `freezer` and `admin` accounts.
+	pub(super) owner: AccountId,
+	/// Can mint tokens.
+	pub(super) issuer: AccountId,
+	/// Can thaw tokens, force transfers and burn tokens from any account.
+	pub(super) admin: AccountId,
+	/// Can freeze tokens.
+	pub(super) freezer: AccountId,
+	/// The total supply across all accounts.
+	pub(super) supply: Balance,
+	/// The balance deposited for this asset. This pays for the data stored here.
+	pub(super) deposit: DepositBalance,
+	/// The ED for virtual accounts.
+	pub(super) min_balance: Balance,
+	/// If `true`, then any account with this asset is given a provider reference. Otherwise, it
+	/// requires a consumer reference.
+	pub(super) is_sufficient: bool,
+	/// The total number of accounts.
+	pub(super) accounts: u32,
+	/// The total number of accounts for which we have placed a self-sufficient reference.
+	pub(super) sufficients: u32,
+	/// The total number of approvals.
+	pub(super) approvals: u32,
+	/// Whether the asset is frozen for non-admin transfers.
+	pub(super) is_frozen: bool,
+}
+
+impl<Balance, AccountId, DepositBalance> AssetDetails<Balance, AccountId, DepositBalance> {
+	pub fn destroy_witness(&self) -> DestroyWitness {
+		DestroyWitness {
+			accounts: self.accounts,
+			sufficients: self.sufficients,
+			approvals: self.approvals,
+		}
+	}
+}
+
+/// A pair to act as a key for the approval storage map.
+#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug)]
+pub struct ApprovalKey<AccountId> {
+	/// The owner of the funds that are being approved.
+	pub(super) owner: AccountId,
+	/// The party to whom transfer of the funds is being delegated.
+	pub(super) delegate: AccountId,
+}
+
+/// Data concerning an approval.
+#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default)]
+pub struct Approval<Balance, DepositBalance> {
+	/// The amount of funds approved for the balance transfer from the owner to some delegated
+	/// target.
+	pub(super) amount: Balance,
+	/// The amount reserved on the owner's account to hold this item in storage.
+	pub(super) deposit: DepositBalance,
+}
+
+#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default)]
+pub struct AssetBalance<Balance, Extra> {
+	/// The balance.
+	pub(super) balance: Balance,
+	/// Whether the account is frozen.
+	pub(super) is_frozen: bool,
+	/// `true` if this balance gave the account a self-sufficient reference.
+	pub(super) sufficient: bool,
+	/// Additional "sidecar" data, in case some other pallet wants to use this storage item.
+	pub(super) extra: Extra,
+}
+
+#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default)]
+pub struct AssetMetadata<DepositBalance> {
+	/// The balance deposited for this metadata.
+	///
+	/// This pays for the data stored in this struct.
+	pub(super) deposit: DepositBalance,
+	/// The user friendly name of this asset. Limited in length by `StringLimit`.
+	pub(super) name: Vec<u8>,
+	/// The ticker symbol for this asset. Limited in length by `StringLimit`.
+	pub(super) symbol: Vec<u8>,
+	/// The number of decimals this asset uses to represent one unit.
+	pub(super) decimals: u8,
+	/// Whether the asset metadata may be changed by a non Force origin.
+	pub(super) is_frozen: bool,
+}
+
+/// Witness data for the destroy transactions.
+#[derive(Copy, Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug)]
+pub struct DestroyWitness {
+	/// The number of accounts holding the asset.
+	#[codec(compact)]
+	pub(super) accounts: u32,
+	/// The number of accounts holding the asset with a self-sufficient reference.
+	#[codec(compact)]
+	pub(super) sufficients: u32,
+	/// The number of transfer-approvals of the asset.
+	#[codec(compact)]
+	pub(super) approvals: u32,
+}
+
+/// Trait for allowing a minimum balance on the account to be specified, beyond the
+/// `minimum_balance` of the asset. This is additive - the `minimum_balance` of the asset must be
+/// met *and then* anything here in addition.
+pub trait FrozenBalance<AssetId, AccountId, Balance> {
+	/// Return the frozen balance. Under normal behaviour, this amount should always be
+	/// withdrawable.
+	///
+	/// In reality, the balance of every account must be at least the sum of this (if `Some`) and
+	/// the asset's minimum_balance, since there may be complications to destroying an asset's
+	/// account completely.
+	///
+	/// If `None` is returned, then nothing special is enforced.
+	///
+	/// If any operation ever breaks this requirement (which will only happen through some sort of
+	/// privileged intervention), then `melted` is called to do any cleanup.
+	fn frozen_balance(asset: AssetId, who: &AccountId) -> Option<Balance>;
+
+	/// Called when an account has been removed.
+	fn died(asset: AssetId, who: &AccountId);
+}
+
+impl<AssetId, AccountId, Balance> FrozenBalance<AssetId, AccountId, Balance> for () {
+	fn frozen_balance(_: AssetId, _: &AccountId) -> Option<Balance> { None }
+	fn died(_: AssetId, _: &AccountId) {}
+}
+
+#[derive(Copy, Clone, PartialEq, Eq)]
+pub(super) struct TransferFlags {
+	/// The debited account must stay alive at the end of the operation; an error is returned if
+	/// this cannot be achieved legally.
+	pub(super) keep_alive: bool,
+	/// Less than the amount specified needs be debited by the operation for it to be considered
+	/// successful. If `false`, then the amount debited will always be at least the amount
+	/// specified.
+	pub(super) best_effort: bool,
+	/// Any additional funds debited (due to minimum balance requirements) should be burned rather
+	/// than credited to the destination account.
+	pub(super) burn_dust: bool,
+}
+
+#[derive(Copy, Clone, PartialEq, Eq)]
+pub(super) struct DebitFlags {
+	/// The debited account must stay alive at the end of the operation; an error is returned if
+	/// this cannot be achieved legally.
+	pub(super) keep_alive: bool,
+	/// Less than the amount specified needs be debited by the operation for it to be considered
+	/// successful. If `false`, then the amount debited will always be at least the amount
+	/// specified.
+	pub(super) best_effort: bool,
+}
+
+impl From<TransferFlags> for DebitFlags {
+	fn from(f: TransferFlags) -> Self {
+		Self {
+			keep_alive: f.keep_alive,
+			best_effort: f.best_effort,
+		}
+	}
+}
diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index a2e858799b0e..35841c504adf 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -39,7 +39,7 @@
 //! ### Terminology
 //!
 //! - **Existential Deposit:** The minimum balance required to create or keep an account open. This prevents
-//! "dust accounts" from filling storage. When the free plus the reserved balance (i.e. the total balance)
+//!   "dust accounts" from filling storage. When the free plus the reserved balance (i.e. the total balance)
 //!   fall below this, then the account is said to be dead; and it loses its functionality as well as any
 //!   prior history and all information on it is removed from the chain's state.
 //!   No account should ever have a total balance that is strictly between 0 and the existential
@@ -164,7 +164,8 @@ use frame_support::{
 		Currency, OnUnbalanced, TryDrop, StoredMap,
 		WithdrawReasons, LockIdentifier, LockableCurrency, ExistenceRequirement,
 		Imbalance, SignedImbalance, ReservableCurrency, Get, ExistenceRequirement::KeepAlive,
-		ExistenceRequirement::AllowDeath, BalanceStatus as Status,
+		ExistenceRequirement::AllowDeath,
+		tokens::{fungible, DepositConsequence, WithdrawConsequence, BalanceStatus as Status}
 	}
 };
 #[cfg(feature = "std")]
@@ -764,7 +765,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	/// the caller will do this.
 	pub fn mutate_account<R>(
 		who: &T::AccountId,
-		f: impl FnOnce(&mut AccountData<T::Balance>) -> R
+		f: impl FnOnce(&mut AccountData<T::Balance>) -> R,
 	) -> Result<R, StoredMapError> {
 		Self::try_mutate_account(who, |a, _| -> Result<R, StoredMapError> { Ok(f(a)) })
 	}
@@ -780,7 +781,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	/// the caller will do this.
 	fn try_mutate_account<R, E: From<StoredMapError>>(
 		who: &T::AccountId,
-		f: impl FnOnce(&mut AccountData<T::Balance>, bool) -> Result<R, E>
+		f: impl FnOnce(&mut AccountData<T::Balance>, bool) -> Result<R, E>,
 	) -> Result<R, E> {
 		Self::try_mutate_account_with_dust(who, f)
 			.map(|(result, dust_cleaner)| {
@@ -804,7 +805,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	/// the caller will do this.
 	fn try_mutate_account_with_dust<R, E: From<StoredMapError>>(
 		who: &T::AccountId,
-		f: impl FnOnce(&mut AccountData<T::Balance>, bool) -> Result<R, E>
+		f: impl FnOnce(&mut AccountData<T::Balance>, bool) -> Result<R, E>,
 	) -> Result<(R, DustCleaner<T, I>), E> {
 		let result = T::AccountStore::try_mutate_exists(who, |maybe_account| {
 			let is_new = maybe_account.is_none();
@@ -873,9 +874,57 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 			}
 		}
 	}
-}
 
-use frame_support::traits::tokens::{fungible, DepositConsequence, WithdrawConsequence};
+
+	/// Move the reserved balance of one account into the balance of another, according to `status`.
+	///
+	/// Is a no-op if:
+	/// - the value to be moved is zero; or
+	/// - the `slashed` id equal to `beneficiary` and the `status` is `Reserved`.
+	fn do_transfer_reserved(
+		slashed: &T::AccountId,
+		beneficiary: &T::AccountId,
+		value: T::Balance,
+		best_effort: bool,
+		status: Status,
+	) -> Result<T::Balance, DispatchError> {
+		if value.is_zero() { return Ok(Zero::zero()) }
+
+		if slashed == beneficiary {
+			return match status {
+				Status::Free => Ok(Self::unreserve(slashed, value)),
+				Status::Reserved => Ok(value.saturating_sub(Self::reserved_balance(slashed))),
+			};
+		}
+
+		let ((actual, _maybe_one_dust), _maybe_other_dust) = Self::try_mutate_account_with_dust(
+			beneficiary,
+			|to_account, is_new| -> Result<(T::Balance, DustCleaner<T, I>), DispatchError> {
+				ensure!(!is_new, Error::<T, I>::DeadAccount);
+				Self::try_mutate_account_with_dust(
+					slashed,
+					|from_account, _| -> Result<T::Balance, DispatchError> {
+						let actual = cmp::min(from_account.reserved, value);
+						ensure!(best_effort || actual == value, Error::<T, I>::InsufficientBalance);
+						match status {
+							Status::Free => to_account.free = to_account.free
+								.checked_add(&actual)
+								.ok_or(Error::<T, I>::Overflow)?,
+							Status::Reserved => to_account.reserved = to_account.reserved
+								.checked_add(&actual)
+								.ok_or(Error::<T, I>::Overflow)?,
+						}
+						from_account.reserved -= actual;
+						Ok(actual)
+					}
+				)
+			}
+		)?;
+
+		Self::deposit_event(Event::ReserveRepatriated(slashed.clone(), beneficiary.clone(), actual, status));
+		Ok(actual)
+	}
+}
 
 impl<T: Config<I>, I: 'static> fungible::Inspect<T::AccountId> for Pallet<T, I> {
 	type Balance = T::Balance;
@@ -889,6 +938,19 @@ impl<T: Config<I>, I: 'static> fungible::Inspect<T::AccountId> for Pallet<T, I>
 	fn balance(who: &T::AccountId) -> Self::Balance {
 		Self::account(who).total()
 	}
+	fn reducible_balance(who: &T::AccountId, keep_alive: bool) -> Self::Balance {
+		let a = Self::account(who);
+		// Liquid balance is what is neither reserved nor locked/frozen.
+		let liquid = a.free.saturating_sub(a.fee_frozen.max(a.misc_frozen));
+		if frame_system::Pallet::<T>::can_dec_provider(who) && !keep_alive {
+			liquid
+		} else {
+			// `must_remain_to_exist` is the part of liquid balance which must remain to keep total over
+			// ED.
+			let must_remain_to_exist = T::ExistentialDeposit::get().saturating_sub(a.total() - liquid);
+			liquid.saturating_sub(must_remain_to_exist)
+		}
+	}
 	fn can_deposit(who: &T::AccountId, amount: Self::Balance) -> DepositConsequence {
 		Self::deposit_consequence(who, amount, &Self::account(who))
 	}
@@ -898,7 +960,7 @@ impl<T: Config<I>, I: 'static> fungible::Inspect<T::AccountId> for Pallet<T, I>
 }
 
 impl<T: Config<I>, I: 'static> fungible::Mutate<T::AccountId> for Pallet<T, I> {
-	fn deposit(who: &T::AccountId, amount: Self::Balance) -> DispatchResult {
+	fn mint_into(who: &T::AccountId, amount: Self::Balance) -> DispatchResult {
 		if amount.is_zero() { return Ok(()) }
 		Self::try_mutate_account(who, |account, _is_new| -> DispatchResult {
 			Self::deposit_consequence(who, amount, &account).into_result()?;
@@ -909,9 +971,8 @@ impl<T: Config<I>, I: 'static> fungible::Mutate<T::AccountId> for Pallet<T, I> {
 		Ok(())
 	}
 
-	fn withdraw(who: &T::AccountId, amount: Self::Balance) -> Result<Self::Balance, DispatchError> {
+	fn burn_from(who: &T::AccountId, amount: Self::Balance) -> Result<Self::Balance, DispatchError> {
 		if amount.is_zero() { return Ok(Self::Balance::zero()); }
-
 		let actual = Self::try_mutate_account(who, |account, _is_new| -> Result<T::Balance, DispatchError> {
 			let extra = Self::withdraw_consequence(who, amount, &account).into_result()?;
 			let actual = amount + extra;
@@ -928,8 +989,11 @@ impl<T: Config<I>, I: 'static> fungible::Transfer<T::AccountId> for Pallet<T, I>
 		source: &T::AccountId,
 		dest: &T::AccountId,
 		amount: T::Balance,
+		keep_alive: bool,
 	) -> Result<T::Balance, DispatchError> {
-		<Self as fungible::Mutate::<T::AccountId>>::transfer(source, dest, amount)
+		let er = if keep_alive { KeepAlive } else { AllowDeath };
+		<Self as Currency::<T::AccountId>>::transfer(source, dest, amount, er)
+			.map(|_| amount)
 	}
 }
 
@@ -944,6 +1008,60 @@ impl<T: Config<I>, I: 'static> fungible::Unbalanced<T::AccountId> for Pallet<T,
 	}
 }
 
+impl<T: Config<I>, I: 'static> fungible::InspectHold<T::AccountId> for Pallet<T, I> {
+	fn balance_on_hold(who: &T::AccountId) -> T::Balance {
+		Self::account(who).reserved
+	}
+	fn can_hold(who: &T::AccountId, amount: T::Balance) -> bool {
+		let a = Self::account(who);
+		let min_balance = T::ExistentialDeposit::get().max(a.frozen(Reasons::All));
+		if a.reserved.checked_add(&amount).is_none() { return false }
+		// We require it to be min_balance + amount to ensure that the full reserved funds may be
+		// slashed without compromising locked funds or destroying the account.
+		let required_free = match min_balance.checked_add(&amount) {
+			Some(x) => x,
+			None => return false,
+		};
+		a.free >= required_free
+	}
+}
+impl<T: Config<I>, I: 'static> fungible::MutateHold<T::AccountId> for Pallet<T, I> {
+	fn hold(who: &T::AccountId, amount: Self::Balance) -> DispatchResult {
+		if amount.is_zero() { return Ok(()) }
+		ensure!(Self::can_reserve(who, amount), Error::<T, I>::InsufficientBalance);
+		Self::mutate_account(who, |a| {
+			a.free -= amount;
+			a.reserved += amount;
+		})?;
+		Ok(())
+	}
+	fn release(who: &T::AccountId, amount: Self::Balance, best_effort: bool)
+		-> Result<T::Balance, DispatchError>
+	{
+		if amount.is_zero() { return Ok(amount) }
+		// Done on a best-effort basis.
+		Self::try_mutate_account(who, |a, _| {
+			let new_free = a.free.saturating_add(amount.min(a.reserved));
+			let actual = new_free - a.free;
+			ensure!(best_effort || actual == amount, Error::<T, I>::InsufficientBalance);
+			// ^^^ Guaranteed to be <= amount and <= a.reserved
+			a.free = new_free;
+			a.reserved = a.reserved.saturating_sub(actual.clone());
+			Ok(actual)
+		})
+	}
+	fn transfer_held(
+		source: &T::AccountId,
+		dest: &T::AccountId,
+		amount: Self::Balance,
+		best_effort: bool,
+		on_hold: bool,
+	) -> Result<Self::Balance, DispatchError> {
+		let status = if on_hold { Status::Reserved } else { Status::Free };
+		Self::do_transfer_reserved(source, dest, amount, best_effort, status)
+	}
+}
+
 // wrapping these imbalances in a private module is necessary to ensure absolute privacy
 // of the inner member.
 mod imbalances {
@@ -1521,40 +1639,8 @@ impl<T: Config<I>, I: 'static> ReservableCurrency<T::AccountId> for Pallet<T, I>
 		value: Self::Balance,
 		status: Status,
 	) -> Result<Self::Balance, DispatchError> {
-		if value.is_zero() { return Ok(Zero::zero()) }
-
-		if slashed == beneficiary {
-			return match status {
-				Status::Free => Ok(Self::unreserve(slashed, value)),
-				Status::Reserved => Ok(value.saturating_sub(Self::reserved_balance(slashed))),
-			};
-		}
-
-		let ((actual, _maybe_one_dust), _maybe_other_dust) = Self::try_mutate_account_with_dust(
-			beneficiary,
-			|to_account, is_new| -> Result<(Self::Balance, DustCleaner<T, I>), DispatchError> {
-				ensure!(!is_new, Error::<T, I>::DeadAccount);
-				Self::try_mutate_account_with_dust(
-					slashed,
-					|from_account, _| -> Result<Self::Balance, DispatchError> {
-						let actual = cmp::min(from_account.reserved, value);
-						match status {
-							Status::Free => to_account.free = to_account.free
-								.checked_add(&actual)
-								.ok_or(Error::<T, I>::Overflow)?,
-							Status::Reserved => to_account.reserved = to_account.reserved
-								.checked_add(&actual)
-								.ok_or(Error::<T, I>::Overflow)?,
-						}
-						from_account.reserved -= actual;
-						Ok(actual)
-					}
-				)
-			}
-		)?;
-
-		Self::deposit_event(Event::ReserveRepatriated(slashed.clone(), beneficiary.clone(), actual, status));
-		Ok(value - actual)
+		let actual = Self::do_transfer_reserved(slashed, beneficiary, value, true, status)?;
+		Ok(value.saturating_sub(actual))
 	}
 }
 
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index 391fa0b53898..ba4869d4b871 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -20,15 +20,8 @@
 //! NOTE: If you're looking for `parameter_types`, it has moved in to the top-level module.
 
 pub mod tokens;
-pub use tokens::fungible::{
-	Inspect as InspectFungible, Mutate as MutateFungible, Transfer as TransferFungible,
-	Reserve as ReserveFungible, Balanced as BalancedFungible, Unbalanced as UnbalancedFungible,
-	ItemOf,
-};
-pub use tokens::fungibles::{
-	Inspect as InspectFungibles, Mutate as MutateFungibles, Transfer as TransferFungibles,
-	Reserve as ReserveFungibles, Balanced as BalancedFungibles, Unbalanced as UnbalancedFungibles,
-};
+pub use tokens::fungible;
+pub use tokens::fungibles;
 pub use tokens::currency::{
 	Currency, LockIdentifier, LockableCurrency, ReservableCurrency, VestingSchedule,
 };
diff --git a/frame/support/src/traits/tokens/fungible.rs b/frame/support/src/traits/tokens/fungible.rs
index 8e6b4ace3464..5472212aaa65 100644
--- a/frame/support/src/traits/tokens/fungible.rs
+++ b/frame/support/src/traits/tokens/fungible.rs
@@ -32,14 +32,22 @@ pub use imbalance::{Imbalance, HandleImbalanceDrop, DebtOf, CreditOf};
 pub trait Inspect<AccountId> {
 	/// Scalar type for representing balance of an account.
 	type Balance: Balance;
+
 	/// The total amount of issuance in the system.
 	fn total_issuance() -> Self::Balance;
+
 	/// The minimum balance any single account may have.
 	fn minimum_balance() -> Self::Balance;
+
 	/// Get the balance of `who`.
 	fn balance(who: &AccountId) -> Self::Balance;
+
+	/// Get the maximum amount that `who` can withdraw/transfer successfully.
+	fn reducible_balance(who: &AccountId, keep_alive: bool) -> Self::Balance;
+
 	/// Returns `true` if the balance of `who` may be increased by `amount`.
 	fn can_deposit(who: &AccountId, amount: Self::Balance) -> DepositConsequence;
+
 	/// Returns `Failed` if the balance of `who` may not be decreased by `amount`, otherwise
 	/// the consequence.
 	fn can_withdraw(who: &AccountId, amount: Self::Balance) -> WithdrawConsequence<Self::Balance>;
@@ -47,26 +55,42 @@ pub trait Inspect<AccountId> {
 
 /// Trait for providing an ERC-20 style fungible asset.
 pub trait Mutate<AccountId>: Inspect<AccountId> {
-	/// Increase the balance of `who` by `amount`.
-	fn deposit(who: &AccountId, amount: Self::Balance) -> DispatchResult;
-	/// Attempt to reduce the balance of `who` by `amount`.
-	fn withdraw(who: &AccountId, amount: Self::Balance) -> Result<Self::Balance, DispatchError>;
-	/// Transfer funds from one account into another.
-	fn transfer(
+	/// Increase the balance of `who` by exactly `amount`, minting new tokens. If that isn't
+	/// possible then an `Err` is returned and nothing is changed.
+	fn mint_into(who: &AccountId, amount: Self::Balance) -> DispatchResult;
+
+	/// Decrease the balance of `who` by at least `amount`, possibly slightly more in the case of
+	/// minimum_balance requirements, burning the tokens. If that isn't possible then an `Err` is
+	/// returned and nothing is changed. If successful, the amount of tokens reduced is returned.
+	fn burn_from(who: &AccountId, amount: Self::Balance) -> Result<Self::Balance, DispatchError>;
+
+	/// Attempt to reduce the balance of `who` by as much as possible up to `amount`, and possibly
+	/// slightly more due to minimum_balance requirements. If no decrease is possible then an `Err`
+	/// is returned and nothing is changed. If successful, the amount of tokens reduced is returned.
+	///
+	/// The default implementation just uses `withdraw` along with `reducible_balance` to ensure
+	/// that is doesn't fail.
+	fn slash(who: &AccountId, amount: Self::Balance) -> Result<Self::Balance, DispatchError> {
+		Self::burn_from(who, Self::reducible_balance(who, false).min(amount))
+	}
+
+	/// Transfer funds from one account into another. The default implementation uses `mint_into`
+	/// and `burn_from` and may generate unwanted events.
+	fn teleport(
 		source: &AccountId,
 		dest: &AccountId,
 		amount: Self::Balance,
 	) -> Result<Self::Balance, DispatchError> {
 		let extra = Self::can_withdraw(&source, amount).into_result()?;
 		Self::can_deposit(&dest, amount.saturating_add(extra)).into_result()?;
-		let actual = Self::withdraw(source, amount)?;
+		let actual = Self::burn_from(source, amount)?;
 		debug_assert!(actual == amount.saturating_add(extra), "can_withdraw must agree with withdraw; qed");
-		match Self::deposit(dest, actual) {
+		match Self::mint_into(dest, actual) {
 			Ok(_) => Ok(actual),
 			Err(err) => {
 				debug_assert!(false, "can_deposit returned true previously; qed");
 				// attempt to return the funds back to source
-				let revert = Self::deposit(source, actual);
+				let revert = Self::mint_into(source, actual);
 				debug_assert!(revert.is_ok(), "withdrew funds previously; qed");
 				Err(err)
 			}
@@ -81,31 +105,82 @@ pub trait Transfer<AccountId>: Inspect<AccountId> {
 		source: &AccountId,
 		dest: &AccountId,
 		amount: Self::Balance,
+		keep_alive: bool,
 	) -> Result<Self::Balance, DispatchError>;
 }
 
-/// Trait for providing a fungible asset which can be reserved.
-pub trait Reserve<AccountId>: Inspect<AccountId> {
+/// Trait for inspecting a fungible asset which can be reserved.
+pub trait InspectHold<AccountId>: Inspect<AccountId> {
 	/// Amount of funds held in reserve by `who`.
-	fn reserved_balance(who: &AccountId) -> Self::Balance;
-	/// Amount of funds held in total by `who`.
-	fn total_balance(who: &AccountId) -> Self::Balance {
-		Self::reserved_balance(who).saturating_add(Self::balance(who))
-	}
-	/// Check to see if some `amount` of funds may be reserved on the account of `who`.
-	fn can_reserve(who: &AccountId, amount: Self::Balance) -> bool;
-	/// Reserve some funds in an account.
-	fn reserve(who: &AccountId, amount: Self::Balance) -> DispatchResult;
-	/// Unreserve some funds in an account.
-	fn unreserve(who: &AccountId, amount: Self::Balance) -> DispatchResult;
-	/// Transfer reserved funds into another account.
-	fn repatriate_reserved(
-		who: &AccountId,
+	fn balance_on_hold(who: &AccountId) -> Self::Balance;
+
+	/// Check to see if some `amount` of funds of `who` may be placed on hold.
+	fn can_hold(who: &AccountId, amount: Self::Balance) -> bool;
+}
+
+/// Trait for mutating a fungible asset which can be reserved.
+pub trait MutateHold<AccountId>: InspectHold<AccountId> + Transfer<AccountId> {
+	/// Hold some funds in an account.
+	fn hold(who: &AccountId, amount: Self::Balance) -> DispatchResult;
+
+	/// Release up to `amount` held funds in an account.
+	///
+	/// The actual amount released is returned with `Ok`.
+	///
+	/// If `best_effort` is `true`, then the amount actually unreserved and returned as the inner
+	/// value of `Ok` may be smaller than the `amount` passed.
+	fn release(who: &AccountId, amount: Self::Balance, best_effort: bool)
+		-> Result<Self::Balance, DispatchError>;
+
+	/// Transfer held funds into a destination account.
+	///
+	/// If `on_hold` is `true`, then the destination account must already exist and the assets
+	/// transferred will still be on hold in the destination account. If not, then the destination
+	/// account need not already exist, but must be creatable.
+	///
+	/// If `best_effort` is `true`, then an amount less than `amount` may be transferred without
+	/// error.
+	///
+	/// The actual amount transferred is returned, or `Err` in the case of error and nothing is
+	/// changed.
+	fn transfer_held(
+		source: &AccountId,
+		dest: &AccountId,
 		amount: Self::Balance,
-		status: BalanceStatus,
-	) -> DispatchResult;
+		best_effort: bool,
+		on_held: bool,
+	) -> Result<Self::Balance, DispatchError>;
 }
 
+/// Trait for slashing a fungible asset which can be reserved.
+pub trait BalancedHold<AccountId>: Balanced<AccountId> + MutateHold<AccountId> {
+	/// Reduce the balance of some funds on hold in an account.
+	///
+	/// The resulting imbalance is the first item of the tuple returned.
+	///
+	/// As much funds that are on hold up to `amount` will be deducted as possible. If this is less
+	/// than `amount`, then a non-zero second item will be returned.
+	fn slash_held(who: &AccountId, amount: Self::Balance)
+		-> (CreditOf<AccountId, Self>, Self::Balance);
+}
+
+impl<
+	AccountId,
+	T: Balanced<AccountId> + MutateHold<AccountId>,
+> BalancedHold<AccountId> for T {
+	fn slash_held(who: &AccountId, amount: Self::Balance)
+		-> (CreditOf<AccountId, Self>, Self::Balance)
+	{
+		let actual = match Self::release(who, amount, true) {
+			Ok(x) => x,
+			Err(_) => return (Imbalance::default(), amount),
+		};
+		<Self as fungible::Balanced<AccountId>>::slash(who, actual)
+	}
+}
+
+/// Convert a `fungibles` trait implementation into a `fungible` trait implementation by identifying
+/// a single item.
 pub struct ItemOf<
 	F: fungibles::Inspect<AccountId>,
 	A: Get<<F as fungibles::Inspect<AccountId>>::AssetId>,
@@ -129,6 +204,9 @@ impl<
 	fn balance(who: &AccountId) -> Self::Balance {
 		<F as fungibles::Inspect<AccountId>>::balance(A::get(), who)
 	}
+	fn reducible_balance(who: &AccountId, keep_alive: bool) -> Self::Balance {
+		<F as fungibles::Inspect<AccountId>>::reducible_balance(A::get(), who, keep_alive)
+	}
 	fn can_deposit(who: &AccountId, amount: Self::Balance) -> DepositConsequence {
 		<F as fungibles::Inspect<AccountId>>::can_deposit(A::get(), who, amount)
 	}
@@ -142,11 +220,11 @@ impl<
 	A: Get<<F as fungibles::Inspect<AccountId>>::AssetId>,
 	AccountId,
 > Mutate<AccountId> for ItemOf<F, A, AccountId> {
-	fn deposit(who: &AccountId, amount: Self::Balance) -> DispatchResult {
-		<F as fungibles::Mutate<AccountId>>::deposit(A::get(), who, amount)
+	fn mint_into(who: &AccountId, amount: Self::Balance) -> DispatchResult {
+		<F as fungibles::Mutate<AccountId>>::mint_into(A::get(), who, amount)
 	}
-	fn withdraw(who: &AccountId, amount: Self::Balance) -> Result<Self::Balance, DispatchError> {
-		<F as fungibles::Mutate<AccountId>>::withdraw(A::get(), who, amount)
+	fn burn_from(who: &AccountId, amount: Self::Balance) -> Result<Self::Balance, DispatchError> {
+		<F as fungibles::Mutate<AccountId>>::burn_from(A::get(), who, amount)
 	}
 }
 
@@ -155,39 +233,54 @@ impl<
 	A: Get<<F as fungibles::Inspect<AccountId>>::AssetId>,
 	AccountId,
 > Transfer<AccountId> for ItemOf<F, A, AccountId> {
-	fn transfer(source: &AccountId, dest: &AccountId, amount: Self::Balance)
+	fn transfer(source: &AccountId, dest: &AccountId, amount: Self::Balance, keep_alive: bool)
 		-> Result<Self::Balance, DispatchError>
 	{
-		<F as fungibles::Transfer<AccountId>>::transfer(A::get(), source, dest, amount)
+		<F as fungibles::Transfer<AccountId>>::transfer(A::get(), source, dest, amount, keep_alive)
 	}
 }
 
 impl<
-	F: fungibles::Reserve<AccountId>,
+	F: fungibles::InspectHold<AccountId>,
 	A: Get<<F as fungibles::Inspect<AccountId>>::AssetId>,
 	AccountId,
-> Reserve<AccountId> for ItemOf<F, A, AccountId> {
-	fn reserved_balance(who: &AccountId) -> Self::Balance {
-		<F as fungibles::Reserve<AccountId>>::reserved_balance(A::get(), who)
+> InspectHold<AccountId> for ItemOf<F, A, AccountId> {
+	fn balance_on_hold(who: &AccountId) -> Self::Balance {
+		<F as fungibles::InspectHold<AccountId>>::balance_on_hold(A::get(), who)
 	}
-	fn total_balance(who: &AccountId) -> Self::Balance {
-		<F as fungibles::Reserve<AccountId>>::total_balance(A::get(), who)
+	fn can_hold(who: &AccountId, amount: Self::Balance) -> bool {
+		<F as fungibles::InspectHold<AccountId>>::can_hold(A::get(), who, amount)
 	}
-	fn can_reserve(who: &AccountId, amount: Self::Balance) -> bool {
-		<F as fungibles::Reserve<AccountId>>::can_reserve(A::get(), who, amount)
-	}
-	fn reserve(who: &AccountId, amount: Self::Balance) -> DispatchResult {
-		<F as fungibles::Reserve<AccountId>>::reserve(A::get(), who, amount)
+}
+
+impl<
+	F: fungibles::MutateHold<AccountId>,
+	A: Get<<F as fungibles::Inspect<AccountId>>::AssetId>,
+	AccountId,
+> MutateHold<AccountId> for ItemOf<F, A, AccountId> {
+	fn hold(who: &AccountId, amount: Self::Balance) -> DispatchResult {
+		<F as fungibles::MutateHold<AccountId>>::hold(A::get(), who, amount)
 	}
-	fn unreserve(who: &AccountId, amount: Self::Balance) -> DispatchResult {
-		<F as fungibles::Reserve<AccountId>>::unreserve(A::get(), who, amount)
+	fn release(who: &AccountId, amount: Self::Balance, best_effort: bool)
+		-> Result<Self::Balance, DispatchError>
+	{
+		<F as fungibles::MutateHold<AccountId>>::release(A::get(), who, amount, best_effort)
 	}
-	fn repatriate_reserved(
-		who: &AccountId,
+	fn transfer_held(
+		source: &AccountId,
+		dest: &AccountId,
 		amount: Self::Balance,
-		status: BalanceStatus,
-	) -> DispatchResult {
-		<F as fungibles::Reserve<AccountId>>::repatriate_reserved(A::get(), who, amount, status)
+		best_effort: bool,
+		on_hold: bool,
+	) -> Result<Self::Balance, DispatchError> {
+		<F as fungibles::MutateHold<AccountId>>::transfer_held(
+			A::get(),
+			source,
+			dest,
+			amount,
+			best_effort,
+			on_hold,
+		)
 	}
 }
 
@@ -215,4 +308,3 @@ impl<
 		<F as fungibles::Unbalanced<AccountId>>::increase_balance_at_most(A::get(), who, amount)
 	}
 }
-
diff --git a/frame/support/src/traits/tokens/fungible/balanced.rs b/frame/support/src/traits/tokens/fungible/balanced.rs
index 514a6f4c1881..19bdb4f245ee 100644
--- a/frame/support/src/traits/tokens/fungible/balanced.rs
+++ b/frame/support/src/traits/tokens/fungible/balanced.rs
@@ -55,14 +55,11 @@ pub trait Balanced<AccountId>: Inspect<AccountId> {
 	///
 	/// This is just the same as burning and issuing the same amount and has no effect on the
 	/// total issuance.
-	fn pair(amount: Self::Balance)
-			-> (DebtOf<AccountId, Self>, CreditOf<AccountId, Self>)
-	{
+	fn pair(amount: Self::Balance) -> (DebtOf<AccountId, Self>, CreditOf<AccountId, Self>) {
 		(Self::rescind(amount), Self::issue(amount))
 	}
 
-	/// Deducts up to `value` from the combined balance of `who`, preferring to deduct from the
-	/// free balance. This function cannot fail.
+	/// Deducts up to `value` from the combined balance of `who`. This function cannot fail.
 	///
 	/// The resulting imbalance is the first item of the tuple returned.
 	///
diff --git a/frame/support/src/traits/tokens/fungibles.rs b/frame/support/src/traits/tokens/fungibles.rs
index 8f6779881169..490f28dfb453 100644
--- a/frame/support/src/traits/tokens/fungibles.rs
+++ b/frame/support/src/traits/tokens/fungibles.rs
@@ -31,17 +31,26 @@ pub use imbalance::{Imbalance, HandleImbalanceDrop, DebtOf, CreditOf};
 pub trait Inspect<AccountId> {
 	/// Means of identifying one asset class from another.
 	type AssetId: AssetId;
+
 	/// Scalar type for representing balance of an account.
 	type Balance: Balance;
+
 	/// The total amount of issuance in the system.
 	fn total_issuance(asset: Self::AssetId) -> Self::Balance;
+
 	/// The minimum balance any single account may have.
 	fn minimum_balance(asset: Self::AssetId) -> Self::Balance;
+
 	/// Get the `asset` balance of `who`.
 	fn balance(asset: Self::AssetId, who: &AccountId) -> Self::Balance;
+
+	/// Get the maximum amount of `asset` that `who` can withdraw/transfer successfully.
+	fn reducible_balance(asset: Self::AssetId, who: &AccountId, keep_alive: bool) -> Self::Balance;
+
 	/// Returns `true` if the `asset` balance of `who` may be increased by `amount`.
 	fn can_deposit(asset: Self::AssetId, who: &AccountId, amount: Self::Balance)
 		-> DepositConsequence;
+
 	/// Returns `Failed` if the `asset` balance of `who` may not be decreased by `amount`, otherwise
 	/// the consequence.
 	fn can_withdraw(
@@ -62,7 +71,7 @@ pub trait Mutate<AccountId>: Inspect<AccountId> {
 	///
 	/// Since this is an operation which should be possible to take alone, if successful it will
 	/// increase the overall supply of the underlying token.
-	fn deposit(asset: Self::AssetId, who: &AccountId, amount: Self::Balance) -> DispatchResult;
+	fn mint_into(asset: Self::AssetId, who: &AccountId, amount: Self::Balance) -> DispatchResult;
 
 	/// Attempt to reduce the `asset` balance of `who` by `amount`.
 	///
@@ -78,11 +87,25 @@ pub trait Mutate<AccountId>: Inspect<AccountId> {
 	/// Due to minimum balance requirements, it's possible that the amount withdrawn could be up to
 	/// `Self::minimum_balance() - 1` more than the `amount`. The total amount withdrawn is returned
 	/// in an `Ok` result. This may be safely ignored if you don't mind the overall supply reducing.
-	fn withdraw(asset: Self::AssetId, who: &AccountId, amount: Self::Balance)
+	fn burn_from(asset: Self::AssetId, who: &AccountId, amount: Self::Balance)
 		-> Result<Self::Balance, DispatchError>;
 
-	/// Transfer funds from one account into another.
-	fn transfer(
+	/// Attempt to reduce the `asset` balance of `who` by as much as possible up to `amount`, and
+	/// possibly slightly more due to minimum_balance requirements. If no decrease is possible then
+	/// an `Err` is returned and nothing is changed. If successful, the amount of tokens reduced is
+	/// returned.
+	///
+	/// The default implementation just uses `withdraw` along with `reducible_balance` to ensure
+	/// that is doesn't fail.
+	fn slash(asset: Self::AssetId, who: &AccountId, amount: Self::Balance)
+		-> Result<Self::Balance, DispatchError>
+	{
+		Self::burn_from(asset, who, Self::reducible_balance(asset, who, false).min(amount))
+	}
+
+	/// Transfer funds from one account into another. The default implementation uses `mint_into`
+	/// and `burn_from` and may generate unwanted events.
+	fn teleport(
 		asset: Self::AssetId,
 		source: &AccountId,
 		dest: &AccountId,
@@ -90,14 +113,14 @@ pub trait Mutate<AccountId>: Inspect<AccountId> {
 	) -> Result<Self::Balance, DispatchError> {
 		let extra = Self::can_withdraw(asset, &source, amount).into_result()?;
 		Self::can_deposit(asset, &dest, amount.saturating_add(extra)).into_result()?;
-		let actual = Self::withdraw(asset, source, amount)?;
+		let actual = Self::burn_from(asset, source, amount)?;
 		debug_assert!(actual == amount.saturating_add(extra), "can_withdraw must agree with withdraw; qed");
-		match Self::deposit(asset, dest, actual) {
+		match Self::mint_into(asset, dest, actual) {
 			Ok(_) => Ok(actual),
 			Err(err) => {
 				debug_assert!(false, "can_deposit returned true previously; qed");
 				// attempt to return the funds back to source
-				let revert = Self::deposit(asset, source, actual);
+				let revert = Self::mint_into(asset, source, actual);
 				debug_assert!(revert.is_ok(), "withdrew funds previously; qed");
 				Err(err)
 			}
@@ -113,31 +136,75 @@ pub trait Transfer<AccountId>: Inspect<AccountId> {
 		source: &AccountId,
 		dest: &AccountId,
 		amount: Self::Balance,
+		keep_alive: bool,
 	) -> Result<Self::Balance, DispatchError>;
 }
 
-/// Trait for providing a set of named fungible assets which can be reserved.
-pub trait Reserve<AccountId>: Inspect<AccountId> {
-	/// Amount of funds held in reserve.
-	fn reserved_balance(asset: Self::AssetId, who: &AccountId) -> Self::Balance;
+/// Trait for inspecting a set of named fungible assets which can be placed on hold.
+pub trait InspectHold<AccountId>: Inspect<AccountId> {
+	/// Amount of funds held in hold.
+	fn balance_on_hold(asset: Self::AssetId, who: &AccountId) -> Self::Balance;
 
-	/// Amount of funds held in reserve.
-	fn total_balance(asset: Self::AssetId, who: &AccountId) -> Self::Balance;
-
-	/// Check to see if some `amount` of `asset` may be reserved on the account of `who`.
-	fn can_reserve(asset: Self::AssetId, who: &AccountId, amount: Self::Balance) -> bool;
+	/// Check to see if some `amount` of `asset` may be held on the account of `who`.
+	fn can_hold(asset: Self::AssetId, who: &AccountId, amount: Self::Balance) -> bool;
+}
 
-	/// Reserve some funds in an account.
-	fn reserve(asset: Self::AssetId, who: &AccountId, amount: Self::Balance) -> DispatchResult;
+/// Trait for mutating a set of named fungible assets which can be placed on hold.
+pub trait MutateHold<AccountId>: InspectHold<AccountId> + Transfer<AccountId> {
+	/// Hold some funds in an account.
+	fn hold(asset: Self::AssetId, who: &AccountId, amount: Self::Balance) -> DispatchResult;
 
-	/// Unreserve some funds in an account.
-	fn unreserve(asset: Self::AssetId, who: &AccountId, amount: Self::Balance) -> DispatchResult;
+	/// Release some funds in an account from being on hold.
+	///
+	/// If `best_effort` is `true`, then the amount actually released and returned as the inner
+	/// value of `Ok` may be smaller than the `amount` passed.
+	fn release(asset: Self::AssetId, who: &AccountId, amount: Self::Balance, best_effort: bool)
+		-> Result<Self::Balance, DispatchError>;
 
-	/// Transfer reserved funds into another account.
-	fn repatriate_reserved(
+	/// Transfer held funds into a destination account.
+	///
+	/// If `on_hold` is `true`, then the destination account must already exist and the assets
+	/// transferred will still be on hold in the destination account. If not, then the destination
+	/// account need not already exist, but must be creatable.
+	///
+	/// If `best_effort` is `true`, then an amount less than `amount` may be transferred without
+	/// error.
+	///
+	/// The actual amount transferred is returned, or `Err` in the case of error and nothing is
+	/// changed.
+	fn transfer_held(
 		asset: Self::AssetId,
-		who: &AccountId,
+		source: &AccountId,
+		dest: &AccountId,
 		amount: Self::Balance,
-		status: BalanceStatus,
-	) -> DispatchResult;
+		best_effort: bool,
+		on_hold: bool,
+	) -> Result<Self::Balance, DispatchError>;
+}
+
+/// Trait for mutating one of several types of fungible assets which can be held.
+pub trait BalancedHold<AccountId>: Balanced<AccountId> + MutateHold<AccountId> {
+	/// Release and slash some funds in an account.
+	///
+	/// The resulting imbalance is the first item of the tuple returned.
+	///
+	/// As much funds up to `amount` will be deducted as possible. If this is less than `amount`,
+	/// then a non-zero second item will be returned.
+	fn slash_held(asset: Self::AssetId, who: &AccountId, amount: Self::Balance)
+		-> (CreditOf<AccountId, Self>, Self::Balance);
+}
+
+impl<
+	AccountId,
+	T: Balanced<AccountId> + MutateHold<AccountId>,
+> BalancedHold<AccountId> for T {
+	fn slash_held(asset: Self::AssetId, who: &AccountId, amount: Self::Balance)
+		-> (CreditOf<AccountId, Self>, Self::Balance)
+	{
+		let actual = match Self::release(asset, who, amount, true) {
+			Ok(x) => x,
+			Err(_) => return (Imbalance::zero(asset), amount),
+		};
+		<Self as fungibles::Balanced<AccountId>>::slash(asset, who, actual)
+	}
 }
diff --git a/frame/support/src/traits/tokens/fungibles/balanced.rs b/frame/support/src/traits/tokens/fungibles/balanced.rs
index 0af07228e010..efb21300bcaa 100644
--- a/frame/support/src/traits/tokens/fungibles/balanced.rs
+++ b/frame/support/src/traits/tokens/fungibles/balanced.rs
@@ -30,7 +30,10 @@ use crate::traits::misc::{SameOrOther, TryDrop};
 ///
 /// This is auto-implemented when a token class has `Unbalanced` implemented.
 pub trait Balanced<AccountId>: Inspect<AccountId> {
+	/// The type for managing what happens when an instance of `Debt` is dropped without being used.
 	type OnDropDebt: HandleImbalanceDrop<Self::AssetId, Self::Balance>;
+	/// The type for managing what happens when an instance of `Credit` is dropped without being
+	/// used.
 	type OnDropCredit: HandleImbalanceDrop<Self::AssetId, Self::Balance>;
 
 	/// Reduce the total issuance by `amount` and return the according imbalance. The imbalance will
diff --git a/frame/support/src/traits/tokens/misc.rs b/frame/support/src/traits/tokens/misc.rs
index 303d183cf274..02f7ba384bd0 100644
--- a/frame/support/src/traits/tokens/misc.rs
+++ b/frame/support/src/traits/tokens/misc.rs
@@ -37,6 +37,9 @@ pub enum WithdrawConsequence<Balance> {
 	/// There has been an underflow in the system. This is indicative of a corrupt state and
 	/// likely unrecoverable.
 	Underflow,
+	/// There has been an overflow in the system. This is indicative of a corrupt state and
+	/// likely unrecoverable.
+	Overflow,
 	/// Not enough of the funds in the account are unavailable for withdrawal.
 	Frozen,
 	/// Account balance would reduce to zero, potentially destroying it. The parameter is the
@@ -56,6 +59,7 @@ impl<Balance: Zero> WithdrawConsequence<Balance> {
 			WouldDie => Err(TokenError::WouldDie),
 			UnknownAsset => Err(TokenError::UnknownAsset),
 			Underflow => Err(TokenError::Underflow),
+			Overflow => Err(TokenError::Overflow),
 			Frozen => Err(TokenError::Frozen),
 			ReducedToZero(result) => Ok(result),
 			Success => Ok(Zero::zero()),

From f13a7f3eb19e34f543421d2228d91f1517f57baa Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Mon, 29 Mar 2021 11:19:40 +0200
Subject: [PATCH 0570/1194] Bring back the on_finalize weight of staking.
 (#8463)

* Bring back the on_finalize weighg of stakin.

* Better logs

* Also make a few things pub

* Fix build

* Add assertions

* Add test.

* remove dbg

* Update frame/election-provider-multi-phase/src/unsigned.rs

* Update frame/staking/src/tests.rs

* Fix

* Fix

* Update frame/election-provider-multi-phase/src/unsigned.rs
---
 frame/election-provider-multi-phase/src/lib.rs   | 16 ++++++++--------
 .../src/unsigned.rs                              | 16 ++++++++++++----
 frame/elections-phragmen/src/lib.rs              |  1 -
 frame/staking/src/lib.rs                         |  5 +++++
 frame/staking/src/tests.rs                       |  8 ++++++++
 5 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index 1609ffa3beef..5545b3961124 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -381,11 +381,11 @@ impl Default for ElectionCompute {
 #[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug)]
 pub struct RawSolution<C> {
 	/// Compact election edges.
-	compact: C,
+	pub compact: C,
 	/// The _claimed_ score of the solution.
-	score: ElectionScore,
+	pub score: ElectionScore,
 	/// The round at which this solution should be submitted.
-	round: u32,
+	pub round: u32,
 }
 
 impl<C: Default> Default for RawSolution<C> {
@@ -402,13 +402,13 @@ pub struct ReadySolution<A> {
 	///
 	/// This is target-major vector, storing each winners, total backing, and each individual
 	/// backer.
-	supports: Supports<A>,
+	pub supports: Supports<A>,
 	/// The score of the solution.
 	///
 	/// This is needed to potentially challenge the solution.
-	score: ElectionScore,
+	pub score: ElectionScore,
 	/// How this election was computed.
-	compute: ElectionCompute,
+	pub compute: ElectionCompute,
 }
 
 /// A snapshot of all the data that is needed for en entire round. They are provided by
@@ -432,10 +432,10 @@ pub struct RoundSnapshot<A> {
 pub struct SolutionOrSnapshotSize {
 	/// The length of voters.
 	#[codec(compact)]
-	voters: u32,
+	pub voters: u32,
 	/// The length of targets.
 	#[codec(compact)]
-	targets: u32,
+	pub targets: u32,
 }
 
 /// Internal errors of the pallet.
diff --git a/frame/election-provider-multi-phase/src/unsigned.rs b/frame/election-provider-multi-phase/src/unsigned.rs
index b570c4482814..280907ac5439 100644
--- a/frame/election-provider-multi-phase/src/unsigned.rs
+++ b/frame/election-provider-multi-phase/src/unsigned.rs
@@ -168,12 +168,16 @@ impl<T: Config> Pallet<T> {
 			size,
 			T::MinerMaxWeight::get(),
 		);
+
 		log!(
 			debug,
-			"miner: current compact solution voters = {}, maximum_allowed = {}",
+			"initial solution voters = {}, snapshot = {:?}, maximum_allowed(capped) = {}",
 			compact.voter_count(),
+			size,
 			maximum_allowed_voters,
 		);
+
+		// trim weight.
 		let compact = Self::trim_compact(maximum_allowed_voters, compact, &voter_index)?;
 
 		// re-calc score.
@@ -252,10 +256,12 @@ impl<T: Config> Pallet<T> {
 					}
 				}
 
+				log!(debug, "removed {} voter to meet the max weight limit.", to_remove);
 				Ok(compact)
 			}
 			_ => {
 				// nada, return as-is
+				log!(debug, "didn't remove any voter for weight limits.");
 				Ok(compact)
 			}
 		}
@@ -298,6 +304,7 @@ impl<T: Config> Pallet<T> {
 		// First binary-search the right amount of voters
 		let mut step = voters / 2;
 		let mut current_weight = weight_with(voters);
+
 		while step > 0 {
 			match next_voters(current_weight, voters, step) {
 				// proceed with the binary search
@@ -324,13 +331,14 @@ impl<T: Config> Pallet<T> {
 			voters -= 1;
 		}
 
+		let final_decision = voters.min(size.voters);
 		debug_assert!(
-			weight_with(voters.min(size.voters)) <= max_weight,
+			weight_with(final_decision) <= max_weight,
 			"weight_with({}) <= {}",
-			voters.min(size.voters),
+			final_decision,
 			max_weight,
 		);
-		voters.min(size.voters)
+		final_decision
 	}
 
 	/// Checks if an execution of the offchain worker is permitted at the given block number, or
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index 5031cb57e642..84b7a068c5f2 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -1308,7 +1308,6 @@ mod tests {
 	}
 
 	fn has_lock(who: &u64) -> u64 {
-		dbg!(Balances::locks(who));
 		Balances::locks(who)
 			.get(0)
 			.cloned()
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index d9894eabc355..0ec976e37712 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -1205,6 +1205,11 @@ decl_module! {
 			}
 		}
 
+		fn on_initialize(_now: T::BlockNumber) -> Weight {
+			// just return the weight of the on_finalize.
+			T::DbWeight::get().reads(1)
+		}
+
 		fn on_finalize() {
 			// Set the start of the first era.
 			if let Some(mut active_era) = Self::active_era() {
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index 0fc53d9d8f0d..7a3ec19f8af2 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -3827,6 +3827,14 @@ fn do_not_die_when_active_is_ed() {
 		})
 }
 
+#[test]
+fn on_finalize_weight_is_nonzero() {
+	ExtBuilder::default().build_and_execute(|| {
+		let on_finalize_weight = <Test as frame_system::Config>::DbWeight::get().reads(1);
+		assert!(Staking::on_initialize(1) >= on_finalize_weight);
+	})
+}
+
 mod election_data_provider {
 	use super::*;
 	use frame_election_provider_support::ElectionDataProvider;

From 099ee1486aa9acbcfa05f16ae114d316632824f9 Mon Sep 17 00:00:00 2001
From: Steve Biedermann <hardliner66@gmail.com>
Date: Mon, 29 Mar 2021 12:47:34 +0200
Subject: [PATCH 0571/1194] Use pathbuf for remote externalities (#8480)

* Combine SnapshotConfig string fields name and directory into single PathBuf field named path

* Update Cargo.lock

* fix test build failure
---
 Cargo.lock                                  | 16 --------
 utils/frame/remote-externalities/src/lib.rs | 26 ++++++-------
 utils/frame/try-runtime/cli/src/lib.rs      | 41 ++-------------------
 3 files changed, 15 insertions(+), 68 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 83a2d4527ba2..5f09da33b79d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4635,22 +4635,6 @@ dependencies = [
  "sp-std",
 ]
 
-[[package]]
-name = "pallet-assets-freezer"
-version = "3.0.0"
-dependencies = [
- "frame-benchmarking",
- "frame-support",
- "frame-system",
- "pallet-assets",
- "parity-scale-codec 2.0.1",
- "serde",
- "sp-core",
- "sp-io",
- "sp-runtime",
- "sp-std",
-]
-
 [[package]]
 name = "pallet-atomic-swap"
 version = "3.0.0"
diff --git a/utils/frame/remote-externalities/src/lib.rs b/utils/frame/remote-externalities/src/lib.rs
index 8d142100ec34..8cca728c1ffa 100644
--- a/utils/frame/remote-externalities/src/lib.rs
+++ b/utils/frame/remote-externalities/src/lib.rs
@@ -181,23 +181,19 @@ impl<B: BlockT> OnlineConfig<B> {
 /// Configuration of the state snapshot.
 #[derive(Clone)]
 pub struct SnapshotConfig {
-	// TODO: I could mix these two into one filed, but I think separate is better bc one can be
-	// configurable while one not.
-	/// File name.
-	pub name: String,
-	/// Base directory.
-	pub directory: String,
+	/// The path to the snapshot file.
+	pub path: PathBuf,
 }
 
-impl Default for SnapshotConfig {
-	fn default() -> Self {
-		Self { name: "SNAPSHOT".into(), directory: ".".into() }
+impl SnapshotConfig {
+	pub fn new<P: Into<PathBuf>>(path: P) -> Self {
+		Self { path: path.into() }
 	}
 }
 
-impl SnapshotConfig {
-	fn path(&self) -> PathBuf {
-		Path::new(&self.directory).join(self.name.clone())
+impl Default for SnapshotConfig {
+	fn default() -> Self {
+		Self { path: Path::new("SNAPSHOT").into() }
 	}
 }
 
@@ -319,12 +315,12 @@ impl<B: BlockT> Builder<B> {
 
 	async fn pre_build(mut self) -> Result<Vec<KeyPair>, &'static str> {
 		let mut base_kv = match self.mode.clone() {
-			Mode::Offline(config) => self.load_state_snapshot(&config.state_snapshot.path())?,
+			Mode::Offline(config) => self.load_state_snapshot(&config.state_snapshot.path)?,
 			Mode::Online(config) => {
 				self.init_remote_client().await?;
 				let kp = self.load_remote().await?;
 				if let Some(c) = config.state_snapshot {
-					self.save_state_snapshot(&kp, &c.path())?;
+					self.save_state_snapshot(&kp, &c.path)?;
 				}
 				kp
 			}
@@ -399,7 +395,7 @@ mod tests {
 		init_logger();
 		Builder::<Block>::new()
 			.mode(Mode::Offline(OfflineConfig {
-				state_snapshot: SnapshotConfig { name: "test_data/proxy_test".into(), ..Default::default() },
+				state_snapshot: SnapshotConfig { path: "test_data/proxy_test".into() },
 			}))
 			.build()
 			.await
diff --git a/utils/frame/try-runtime/cli/src/lib.rs b/utils/frame/try-runtime/cli/src/lib.rs
index ff8c5c08ec5b..8e407f3b2d73 100644
--- a/utils/frame/try-runtime/cli/src/lib.rs
+++ b/utils/frame/try-runtime/cli/src/lib.rs
@@ -67,15 +67,14 @@ pub struct TryRuntimeCmd {
 pub enum State {
 	/// Use a state snapshot as state to run the migration.
 	Snap {
-		#[structopt(flatten)]
-		snapshot_path: SnapshotPath,
+		snapshot_path: PathBuf,
 	},
 
 	/// Use a live chain to run the migration.
 	Live {
 		/// An optional state snapshot file to WRITE to. Not written if set to `None`.
 		#[structopt(short, long)]
-		snapshot_path: Option<SnapshotPath>,
+		snapshot_path: Option<PathBuf>,
 
 		/// The block hash at which to connect.
 		/// Will be latest finalized head if not provided.
@@ -118,31 +117,6 @@ fn parse_url(s: &str) -> Result<String, &'static str> {
 	}
 }
 
-#[derive(Debug, structopt::StructOpt)]
-pub struct SnapshotPath {
-	/// The directory of the state snapshot.
-	#[structopt(short, long, default_value = ".")]
-	directory: String,
-
-	/// The file name of the state snapshot.
-	#[structopt(default_value = "SNAPSHOT")]
-	file_name: String,
-}
-
-impl FromStr for SnapshotPath {
-	type Err = &'static str;
-	fn from_str(s: &str) -> Result<Self, Self::Err> {
-		let p: PathBuf = s.parse().map_err(|_| "invalid path")?;
-		let parent = p.parent();
-		let file_name = p.file_name();
-
-		file_name.and_then(|file_name| Some(Self {
-			directory: parent.map(|p| p.to_string_lossy().into()).unwrap_or(".".to_string()),
-			file_name: file_name.to_string_lossy().into()
-		})).ok_or("invalid path")
-	}
-}
-
 impl TryRuntimeCmd {
 	pub async fn run<B, ExecDispatch>(&self, config: Configuration) -> sc_cli::Result<()>
 	where
@@ -182,12 +156,8 @@ impl TryRuntimeCmd {
 			use remote_externalities::{Builder, Mode, SnapshotConfig, OfflineConfig, OnlineConfig};
 			let builder = match &self.state {
 				State::Snap { snapshot_path } => {
-					let SnapshotPath { directory, file_name } = snapshot_path;
 					Builder::<B>::new().mode(Mode::Offline(OfflineConfig {
-						state_snapshot: SnapshotConfig {
-							name: file_name.into(),
-							directory: directory.into(),
-						},
+						state_snapshot: SnapshotConfig::new(snapshot_path),
 					}))
 				},
 				State::Live {
@@ -197,10 +167,7 @@ impl TryRuntimeCmd {
 					modules
 				} => Builder::<B>::new().mode(Mode::Online(OnlineConfig {
 					uri: url.into(),
-					state_snapshot: snapshot_path.as_ref().map(|c| SnapshotConfig {
-						name: c.file_name.clone(),
-						directory: c.directory.clone(),
-					}),
+					state_snapshot: snapshot_path.as_ref().map(SnapshotConfig::new),
 					modules: modules.clone().unwrap_or_default(),
 					at: match block_at {
 						Some(b) => Some(b.parse().map_err(|e| format!("Could not parse hash: {:?}", e))?),

From 2125b50be5771858ad083a4ded3a32255d2ffe89 Mon Sep 17 00:00:00 2001
From: Jimmy Chu <jimmy@parity.io>
Date: Mon, 29 Mar 2021 21:33:28 +0800
Subject: [PATCH 0572/1194] Benchmarking pallet-example (#8301)

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
---
 Cargo.lock                          |   3 +-
 frame/elections-phragmen/src/lib.rs |   2 +-
 frame/example/Cargo.toml            |   9 +-
 frame/example/src/benchmarking.rs   |  76 +++++++
 frame/example/src/lib.rs            | 307 +++++++---------------------
 frame/example/src/tests.rs          | 189 +++++++++++++++++
 frame/example/src/weights.rs        | 100 +++++++++
 7 files changed, 450 insertions(+), 236 deletions(-)
 create mode 100644 frame/example/src/benchmarking.rs
 create mode 100644 frame/example/src/tests.rs
 create mode 100644 frame/example/src/weights.rs

diff --git a/Cargo.lock b/Cargo.lock
index 5f09da33b79d..e1a18f3a8120 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4953,11 +4953,12 @@ dependencies = [
 
 [[package]]
 name = "pallet-example"
-version = "2.0.0"
+version = "3.0.0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "log",
  "pallet-balances",
  "parity-scale-codec 2.0.1",
  "serde",
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index 84b7a068c5f2..7f0a6afb2b10 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -1084,7 +1084,7 @@ mod tests {
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
-	type SS58Prefix = ();
+		type SS58Prefix = ();
 	}
 
 	parameter_types! {
diff --git a/frame/example/Cargo.toml b/frame/example/Cargo.toml
index de741294b9c1..e24616bc84cf 100644
--- a/frame/example/Cargo.toml
+++ b/frame/example/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-example"
-version = "2.0.0"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Unlicense"
@@ -21,8 +21,8 @@ pallet-balances = { version = "3.0.0", default-features = false, path = "../bala
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
-
 frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
+log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
 sp-core = { version = "3.0.0", path = "../../primitives/core", default-features = false }
@@ -30,14 +30,15 @@ sp-core = { version = "3.0.0", path = "../../primitives/core", default-features
 [features]
 default = ["std"]
 std = [
-	"serde",
 	"codec/std",
-	"sp-runtime/std",
 	"frame-benchmarking/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
 	"pallet-balances/std",
+	"serde",
 	"sp-io/std",
+	"sp-runtime/std",
 	"sp-std/std"
 ]
 runtime-benchmarks = ["frame-benchmarking"]
diff --git a/frame/example/src/benchmarking.rs b/frame/example/src/benchmarking.rs
new file mode 100644
index 000000000000..64602ca41cee
--- /dev/null
+++ b/frame/example/src/benchmarking.rs
@@ -0,0 +1,76 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Benchmarking for pallet-example.
+
+#![cfg(feature = "runtime-benchmarks")]
+
+use crate::*;
+use frame_benchmarking::{benchmarks, whitelisted_caller, impl_benchmark_test_suite};
+use frame_system::RawOrigin;
+
+// To actually run this benchmark on pallet-example, we need to put this pallet into the
+//   runtime and compile it with `runtime-benchmarks` feature. The detail procedures are
+//   documented at:
+//   https://substrate.dev/docs/en/knowledgebase/runtime/benchmarking#how-to-benchmark
+//
+// The auto-generated weight estimate of this pallet is copied over to the `weights.rs` file.
+// The exact command of how the estimate generated is printed at the top of the file.
+
+// Details on using the benchmarks macro can be seen at:
+//   https://substrate.dev/rustdocs/v3.0.0/frame_benchmarking/macro.benchmarks.html
+benchmarks!{
+	// This will measure the execution time of `set_dummy` for b in [1..1000] range.
+	set_dummy_benchmark {
+		// This is the benchmark setup phase
+		let b in 1 .. 1000;
+	}: set_dummy(RawOrigin::Root, b.into()) // The execution phase is just running `set_dummy` extrinsic call
+	verify {
+		// This is the optional benchmark verification phase, asserting certain states.
+		assert_eq!(Pallet::<T>::dummy(), Some(b.into()))
+	}
+
+	// This will measure the execution time of `accumulate_dummy` for b in [1..1000] range.
+	// The benchmark execution phase is shorthanded. When the name of the benchmark case is the same
+	// as the extrinsic call. `_(...)` is used to represent the extrinsic name.
+	// The benchmark verification phase is omitted.
+	accumulate_dummy {
+		let b in 1 .. 1000;
+		// The caller account is whitelisted for DB reads/write by the benchmarking macro.
+		let caller: T::AccountId = whitelisted_caller();
+	}: _(RawOrigin::Signed(caller), b.into())
+
+	// This will measure the execution time of sorting a vector.
+	sort_vector {
+		let x in 0 .. 10000;
+		let mut m = Vec::<u32>::new();
+		for i in (0..x).rev() {
+			m.push(i);
+		}
+	}: {
+		// The benchmark execution phase could also be a closure with custom code
+		m.sort();
+	}
+}
+
+// This line generates test cases for benchmarking, and could be run by:
+//   `cargo test -p pallet-example --all-features`, you will see an additional line of:
+//   `test benchmarking::benchmark_tests::test_benchmarks ... ok` in the result.
+//
+// The line generates three steps per benchmark, with repeat=1 and the three steps are
+//   [low, mid, high] of the range.
+impl_benchmark_test_suite!(Pallet, crate::tests::new_test_ext(), crate::tests::Test);
diff --git a/frame/example/src/lib.rs b/frame/example/src/lib.rs
index 86e9b7fdc0c1..fd1bc292ac8a 100644
--- a/frame/example/src/lib.rs
+++ b/frame/example/src/lib.rs
@@ -255,28 +255,45 @@
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use sp_std::marker::PhantomData;
+use sp_std::{
+	prelude::*,
+	marker::PhantomData
+};
 use frame_support::{
 	dispatch::DispatchResult, traits::IsSubType,
 	weights::{DispatchClass, ClassifyDispatch, WeighData, Weight, PaysFee, Pays},
 };
-use sp_std::prelude::*;
 use frame_system::{ensure_signed};
 use codec::{Encode, Decode};
 use sp_runtime::{
 	traits::{
-		SignedExtension, Bounded, SaturatedConversion, DispatchInfoOf,
+		SignedExtension, Bounded, SaturatedConversion, DispatchInfoOf, Saturating
 	},
 	transaction_validity::{
 		ValidTransaction, TransactionValidityError, InvalidTransaction, TransactionValidity,
 	},
 };
+use log::info;
+
+// Re-export pallet items so that they can be accessed from the crate namespace.
+pub use pallet::*;
+
+#[cfg(test)]
+mod tests;
+
+mod benchmarking;
+pub mod weights;
+pub use weights::*;
+
+/// A type alias for the balance type from this pallet's point of view.
+type BalanceOf<T> = <T as pallet_balances::Config>::Balance;
+const MILLICENTS: u32 = 1_000_000_000;
 
 // A custom weight calculator tailored for the dispatch call `set_dummy()`. This actually examines
 // the arguments and makes a decision based upon them.
 //
 // The `WeightData<T>` trait has access to the arguments of the dispatch that it wants to assign a
-// weight to. Nonetheless, the trait itself can not make any assumptions about what the generic type
+// weight to. Nonetheless, the trait itself cannot make any assumptions about what the generic type
 // of the arguments (`T`) is. Based on our needs, we could replace `T` with a more concrete type
 // while implementing the trait. The `pallet::weight` expects whatever implements `WeighData<T>` to
 // replace `T` with a tuple of the dispatch arguments. This is exactly how we will craft the
@@ -286,13 +303,22 @@ use sp_runtime::{
 // - The final weight of each dispatch is calculated as the argument of the call multiplied by the
 //   parameter given to the `WeightForSetDummy`'s constructor.
 // - assigns a dispatch class `operational` if the argument of the call is more than 1000.
+//
+// More information can be read at:
+//   - https://substrate.dev/docs/en/knowledgebase/learn-substrate/weight
+//   - https://substrate.dev/docs/en/knowledgebase/runtime/fees#default-weight-annotations
+//
+// Manually configuring weight is an advanced operation and what you really need may well be
+//   fulfilled by running the benchmarking toolchain. Refer to `benchmarking.rs` file.
 struct WeightForSetDummy<T: pallet_balances::Config>(BalanceOf<T>);
 
 impl<T: pallet_balances::Config> WeighData<(&BalanceOf<T>,)> for WeightForSetDummy<T>
 {
 	fn weigh_data(&self, target: (&BalanceOf<T>,)) -> Weight {
 		let multiplier = self.0;
-		(*target.0 * multiplier).saturated_into::<Weight>()
+		// *target.0 is the amount passed into the extrinsic
+		let cents = *target.0 / <BalanceOf<T>>::from(MILLICENTS);
+		(cents * multiplier).saturated_into::<Weight>()
 	}
 }
 
@@ -312,12 +338,6 @@ impl<T: pallet_balances::Config> PaysFee<(&BalanceOf<T>,)> for WeightForSetDummy
 	}
 }
 
-/// A type alias for the balance type from this pallet's point of view.
-type BalanceOf<T> = <T as pallet_balances::Config>::Balance;
-
-// Re-export pallet items so that they can be accessed from the crate namespace.
-pub use pallet::*;
-
 // Definition of the pallet logic, to be aggregated at runtime definition through
 // `construct_runtime`.
 #[frame_support::pallet]
@@ -334,8 +354,15 @@ pub mod pallet {
 	/// `frame_system::Config` should always be included.
 	#[pallet::config]
 	pub trait Config: pallet_balances::Config + frame_system::Config {
+		// Setting a constant config parameter from the runtime
+		#[pallet::constant]
+		type MagicNumber: Get<Self::Balance>;
+
 		/// The overarching event type.
 		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
+
+		/// Type representing the weight of this pallet
+		type WeightInfo: WeightInfo;
 	}
 
 	// Simple declaration of the `Pallet` type. It is placeholder we use to implement traits and
@@ -354,14 +381,12 @@ pub mod pallet {
 		fn on_initialize(_n: T::BlockNumber) -> Weight {
 			// Anything that needs to be done at the start of the block.
 			// We don't do anything here.
-
 			0
 		}
 
 		// `on_finalize` is executed at the end of block after all extrinsic are dispatched.
 		fn on_finalize(_n: T::BlockNumber) {
-			// We just kill our dummy storage item.
-			<Dummy<T>>::kill();
+			// Perform necessary data/state clean up here.
 		}
 
 		// A runtime code run after every block and have access to extended set of APIs.
@@ -370,7 +395,9 @@ pub mod pallet {
 		fn offchain_worker(_n: T::BlockNumber) {
 			// We don't do anything here.
 			// but we could dispatch extrinsic (transaction/unsigned/inherent) using
-			// sp_io::submit_extrinsic
+			// sp_io::submit_extrinsic.
+			// To see example on offchain worker, please refer to example-offchain-worker pallet
+		 	// accompanied in this repository.
 		}
 	}
 
@@ -455,11 +482,16 @@ pub mod pallet {
 		// difficulty) of the transaction and the latter demonstrates the [`DispatchClass`] of the
 		// call. A higher weight means a larger transaction (less of which can be placed in a
 		// single block).
-		#[pallet::weight(0)]
+		//
+		// The weight for this extrinsic we rely on the auto-generated `WeightInfo` from the benchmark
+		// toolchain.
+		#[pallet::weight(
+			<T as pallet::Config>::WeightInfo::accumulate_dummy((*increase_by).saturated_into())
+		)]
 		pub(super) fn accumulate_dummy(
 			origin: OriginFor<T>,
 			increase_by: T::Balance
-		) -> DispatchResultWithPostInfo {
+		) -> DispatchResult {
 			// This is a public call, so we ensure that the origin is some signed account.
 			let _sender = ensure_signed(origin)?;
 
@@ -478,15 +510,16 @@ pub mod pallet {
 
 			// Here's the new one of read and then modify the value.
 			<Dummy<T>>::mutate(|dummy| {
-				let new_dummy = dummy.map_or(increase_by, |dummy| dummy + increase_by);
+				// Using `saturating_add` instead of a regular `+` to avoid overflowing
+				let new_dummy = dummy.map_or(increase_by, |d| d.saturating_add(increase_by));
 				*dummy = Some(new_dummy);
 			});
 
 			// Let's deposit an event to let the outside world know this happened.
-			Self::deposit_event(Event::Dummy(increase_by));
+			Self::deposit_event(Event::AccumulateDummy(increase_by));
 
 			// All good, no refund.
-			Ok(().into())
+			Ok(())
 		}
 
 		/// A privileged call; in this case it resets our dummy value to something new.
@@ -496,17 +529,28 @@ pub mod pallet {
 		// calls to be executed - we don't need to care why. Because it's privileged, we can
 		// assume it's a one-off operation and substantial processing/storage/memory can be used
 		// without worrying about gameability or attack scenarios.
+		//
+		// The weight for this extrinsic we use our own weight object `WeightForSetDummy` to determine
+		// its weight
 		#[pallet::weight(WeightForSetDummy::<T>(<BalanceOf<T>>::from(100u32)))]
-		fn set_dummy(
+		pub(super) fn set_dummy(
 			origin: OriginFor<T>,
 			#[pallet::compact] new_value: T::Balance,
-		) -> DispatchResultWithPostInfo {
+		) -> DispatchResult {
 			ensure_root(origin)?;
+
+			// Print out log or debug message in the console via log::{error, warn, info, debug, trace},
+			// accepting format strings similar to `println!`.
+			// https://substrate.dev/rustdocs/v3.0.0/log/index.html
+			info!("New value is now: {:?}", new_value);
+
 			// Put the new value into storage.
 			<Dummy<T>>::put(new_value);
 
+			Self::deposit_event(Event::SetDummy(new_value));
+
 			// All good, no refund.
-			Ok(().into())
+			Ok(())
 		}
 	}
 
@@ -520,7 +564,9 @@ pub mod pallet {
 	pub enum Event<T: Config> {
 		// Just a normal `enum`, here's a dummy event to ensure it compiles.
 		/// Dummy event, just here so there's a generic type that's used.
-		Dummy(BalanceOf<T>),
+		AccumulateDummy(BalanceOf<T>),
+		SetDummy(BalanceOf<T>),
+		SetBar(T::AccountId, BalanceOf<T>),
 	}
 
 	// pallet::storage attributes allow for type-safe usage of the Substrate storage database,
@@ -545,14 +591,13 @@ pub mod pallet {
 	// A map that has enumerable entries.
 	#[pallet::storage]
 	#[pallet::getter(fn bar)]
-	pub(super) type Bar<T: Config> = StorageMap<_, Blake2_128Concat, T::AccountId, T::Balance, ValueQuery>;
+	pub(super) type Bar<T: Config> = StorageMap<_, Blake2_128Concat, T::AccountId, T::Balance>;
 
 	// this one uses the query kind: `ValueQuery`, we'll demonstrate the usage of 'mutate' API.
 	#[pallet::storage]
 	#[pallet::getter(fn foo)]
 	pub(super) type Foo<T: Config> = StorageValue<_, T::Balance, ValueQuery>;
 
-
 	// The genesis config type.
 	#[pallet::genesis_config]
 	pub struct GenesisConfig<T: Config> {
@@ -600,7 +645,7 @@ impl<T: Config> Pallet<T> {
 		let prev = <Foo<T>>::get();
 		// Because Foo has 'default', the type of 'foo' in closure is the raw type instead of an Option<> type.
 		let result = <Foo<T>>::mutate(|foo| {
-			*foo = *foo + increase_by;
+			*foo = foo.saturating_add(increase_by);
 			*foo
 		});
 		assert!(prev + increase_by == result);
@@ -640,11 +685,11 @@ impl<T: Config> Pallet<T> {
 // types defined in the runtime. Lookup `pub type SignedExtra = (...)` in `node/runtime` and
 // `node-template` for an example of this.
 
-/// A simple signed extension that checks for the `set_dummy` call. In that case, it increases the
-/// priority and prints some log.
-///
-/// Additionally, it drops any transaction with an encoded length higher than 200 bytes. No
-/// particular reason why, just to demonstrate the power of signed extensions.
+// A simple signed extension that checks for the `set_dummy` call. In that case, it increases the
+// priority and prints some log.
+//
+// Additionally, it drops any transaction with an encoded length higher than 200 bytes. No
+// particular reason why, just to demonstrate the power of signed extensions.
 #[derive(Encode, Decode, Clone, Eq, PartialEq)]
 pub struct WatchDummy<T: Config + Send + Sync>(PhantomData<T>);
 
@@ -691,201 +736,3 @@ where
 		}
 	}
 }
-
-#[cfg(feature = "runtime-benchmarks")]
-mod benchmarking {
-	use super::*;
-	use frame_benchmarking::{benchmarks, account, impl_benchmark_test_suite};
-	use frame_system::RawOrigin;
-
-	benchmarks!{
-		// This will measure the execution time of `accumulate_dummy` for b in [1..1000] range.
-		accumulate_dummy {
-			let b in 1 .. 1000;
-			let caller = account("caller", 0, 0);
-		}: _ (RawOrigin::Signed(caller), b.into())
-
-		// This will measure the execution time of `set_dummy` for b in [1..1000] range.
-		set_dummy {
-			let b in 1 .. 1000;
-		}: set_dummy (RawOrigin::Root, b.into())
-
-		// This will measure the execution time of `set_dummy` for b in [1..10] range.
-		another_set_dummy {
-			let b in 1 .. 10;
-		}: set_dummy (RawOrigin::Root, b.into())
-
-		// This will measure the execution time of sorting a vector.
-		sort_vector {
-			let x in 0 .. 10000;
-			let mut m = Vec::<u32>::new();
-			for i in (0..x).rev() {
-				m.push(i);
-			}
-		}: {
-			m.sort();
-		}
-	}
-
-	impl_benchmark_test_suite!(Pallet, crate::tests::new_test_ext(), crate::tests::Test);
-}
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-
-	use frame_support::{
-		assert_ok, parameter_types,
-		weights::{DispatchInfo, GetDispatchInfo}, traits::{OnInitialize, OnFinalize}
-	};
-	use sp_core::H256;
-	// The testing primitives are very useful for avoiding having to work with signatures
-	// or public keys. `u64` is used as the `AccountId` and no `Signature`s are required.
-	use sp_runtime::{
-		testing::Header, BuildStorage,
-		traits::{BlakeTwo256, IdentityLookup},
-	};
-	// Reexport crate as its pallet name for construct_runtime.
-	use crate as pallet_example;
-
-	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
-	type Block = frame_system::mocking::MockBlock<Test>;
-
-	// For testing the pallet, we construct a mock runtime.
-	frame_support::construct_runtime!(
-		pub enum Test where
-			Block = Block,
-			NodeBlock = Block,
-			UncheckedExtrinsic = UncheckedExtrinsic,
-		{
-			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-			Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-			Example: pallet_example::{Pallet, Call, Storage, Config<T>, Event<T>},
-		}
-	);
-
-	parameter_types! {
-		pub const BlockHashCount: u64 = 250;
-		pub BlockWeights: frame_system::limits::BlockWeights =
-			frame_system::limits::BlockWeights::simple_max(1024);
-	}
-	impl frame_system::Config for Test {
-		type BaseCallFilter = ();
-		type BlockWeights = ();
-		type BlockLength = ();
-		type DbWeight = ();
-		type Origin = Origin;
-		type Index = u64;
-		type BlockNumber = u64;
-		type Hash = H256;
-		type Call = Call;
-		type Hashing = BlakeTwo256;
-		type AccountId = u64;
-		type Lookup = IdentityLookup<Self::AccountId>;
-		type Header = Header;
-		type Event = Event;
-		type BlockHashCount = BlockHashCount;
-		type Version = ();
-		type PalletInfo = PalletInfo;
-		type AccountData = pallet_balances::AccountData<u64>;
-		type OnNewAccount = ();
-		type OnKilledAccount = ();
-		type SystemWeightInfo = ();
-		type SS58Prefix = ();
-	}
-	parameter_types! {
-		pub const ExistentialDeposit: u64 = 1;
-	}
-	impl pallet_balances::Config for Test {
-		type MaxLocks = ();
-		type Balance = u64;
-		type DustRemoval = ();
-		type Event = Event;
-		type ExistentialDeposit = ExistentialDeposit;
-		type AccountStore = System;
-		type WeightInfo = ();
-	}
-	impl Config for Test {
-		type Event = Event;
-	}
-
-	// This function basically just builds a genesis storage key/value store according to
-	// our desired mockup.
-	pub fn new_test_ext() -> sp_io::TestExternalities {
-		let t = GenesisConfig {
-			// We use default for brevity, but you can configure as desired if needed.
-			frame_system: Default::default(),
-			pallet_balances: Default::default(),
-			pallet_example: pallet_example::GenesisConfig {
-				dummy: 42,
-				// we configure the map with (key, value) pairs.
-				bar: vec![(1, 2), (2, 3)],
-				foo: 24,
-			},
-		}.build_storage().unwrap();
-		t.into()
-	}
-
-	#[test]
-	fn it_works_for_optional_value() {
-		new_test_ext().execute_with(|| {
-			// Check that GenesisBuilder works properly.
-			assert_eq!(Example::dummy(), Some(42));
-
-			// Check that accumulate works when we have Some value in Dummy already.
-			assert_ok!(Example::accumulate_dummy(Origin::signed(1), 27));
-			assert_eq!(Example::dummy(), Some(69));
-
-			// Check that finalizing the block removes Dummy from storage.
-			<Example as OnFinalize<u64>>::on_finalize(1);
-			assert_eq!(Example::dummy(), None);
-
-			// Check that accumulate works when we Dummy has None in it.
-			<Example as OnInitialize<u64>>::on_initialize(2);
-			assert_ok!(Example::accumulate_dummy(Origin::signed(1), 42));
-			assert_eq!(Example::dummy(), Some(42));
-		});
-	}
-
-	#[test]
-	fn it_works_for_default_value() {
-		new_test_ext().execute_with(|| {
-			assert_eq!(Example::foo(), 24);
-			assert_ok!(Example::accumulate_foo(Origin::signed(1), 1));
-			assert_eq!(Example::foo(), 25);
-		});
-	}
-
-	#[test]
-	fn signed_ext_watch_dummy_works() {
-		new_test_ext().execute_with(|| {
-			let call = <pallet_example::Call<Test>>::set_dummy(10).into();
-			let info = DispatchInfo::default();
-
-			assert_eq!(
-				WatchDummy::<Test>(PhantomData).validate(&1, &call, &info, 150)
-					.unwrap()
-					.priority,
-				u64::max_value(),
-			);
-			assert_eq!(
-				WatchDummy::<Test>(PhantomData).validate(&1, &call, &info, 250),
-				InvalidTransaction::ExhaustsResources.into(),
-			);
-		})
-	}
-
-	#[test]
-	fn weights_work() {
-		// must have a defined weight.
-		let default_call = <pallet_example::Call<Test>>::accumulate_dummy(10);
-		let info = default_call.get_dispatch_info();
-		// aka. `let info = <Call<Test> as GetDispatchInfo>::get_dispatch_info(&default_call);`
-		assert_eq!(info.weight, 0);
-
-		// must have a custom weight of `100 * arg = 2000`
-		let custom_call = <pallet_example::Call<Test>>::set_dummy(20);
-		let info = custom_call.get_dispatch_info();
-		assert_eq!(info.weight, 2000);
-	}
-}
diff --git a/frame/example/src/tests.rs b/frame/example/src/tests.rs
new file mode 100644
index 000000000000..ed866344a4b1
--- /dev/null
+++ b/frame/example/src/tests.rs
@@ -0,0 +1,189 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Tests for pallet-example.
+
+use crate::*;
+use frame_support::{
+	assert_ok, parameter_types,
+	weights::{DispatchInfo, GetDispatchInfo}, traits::OnInitialize
+};
+use sp_core::H256;
+// The testing primitives are very useful for avoiding having to work with signatures
+// or public keys. `u64` is used as the `AccountId` and no `Signature`s are required.
+use sp_runtime::{
+	testing::Header, BuildStorage,
+	traits::{BlakeTwo256, IdentityLookup},
+};
+// Reexport crate as its pallet name for construct_runtime.
+use crate as pallet_example;
+
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+// For testing the pallet, we construct a mock runtime.
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Example: pallet_example::{Pallet, Call, Storage, Config<T>, Event<T>},
+	}
+);
+
+parameter_types! {
+	pub const BlockHashCount: u64 = 250;
+	pub BlockWeights: frame_system::limits::BlockWeights =
+		frame_system::limits::BlockWeights::simple_max(1024);
+}
+impl frame_system::Config for Test {
+	type BaseCallFilter = ();
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
+	type Origin = Origin;
+	type Index = u64;
+	type BlockNumber = u64;
+	type Hash = H256;
+	type Call = Call;
+	type Hashing = BlakeTwo256;
+	type AccountId = u64;
+	type Lookup = IdentityLookup<Self::AccountId>;
+	type Header = Header;
+	type Event = Event;
+	type BlockHashCount = BlockHashCount;
+	type Version = ();
+	type PalletInfo = PalletInfo;
+	type AccountData = pallet_balances::AccountData<u64>;
+	type OnNewAccount = ();
+	type OnKilledAccount = ();
+	type SystemWeightInfo = ();
+	type SS58Prefix = ();
+}
+parameter_types! {
+	pub const ExistentialDeposit: u64 = 1;
+}
+impl pallet_balances::Config for Test {
+	type MaxLocks = ();
+	type Balance = u64;
+	type DustRemoval = ();
+	type Event = Event;
+	type ExistentialDeposit = ExistentialDeposit;
+	type AccountStore = System;
+	type WeightInfo = ();
+}
+
+parameter_types! {
+	pub const MagicNumber: u64 = 1_000_000_000;
+}
+impl Config for Test {
+	type MagicNumber = MagicNumber;
+	type Event = Event;
+	type WeightInfo = ();
+}
+
+// This function basically just builds a genesis storage key/value store according to
+// our desired mockup.
+pub fn new_test_ext() -> sp_io::TestExternalities {
+	let t = GenesisConfig {
+		// We use default for brevity, but you can configure as desired if needed.
+		frame_system: Default::default(),
+		pallet_balances: Default::default(),
+		pallet_example: pallet_example::GenesisConfig {
+			dummy: 42,
+			// we configure the map with (key, value) pairs.
+			bar: vec![(1, 2), (2, 3)],
+			foo: 24,
+		},
+	}.build_storage().unwrap();
+	t.into()
+}
+
+#[test]
+fn it_works_for_optional_value() {
+	new_test_ext().execute_with(|| {
+		// Check that GenesisBuilder works properly.
+		let val1 = 42;
+		let val2 = 27;
+		assert_eq!(Example::dummy(), Some(val1));
+
+		// Check that accumulate works when we have Some value in Dummy already.
+		assert_ok!(Example::accumulate_dummy(Origin::signed(1), val2));
+		assert_eq!(Example::dummy(), Some(val1 + val2));
+
+		// Check that accumulate works when we Dummy has None in it.
+		<Example as OnInitialize<u64>>::on_initialize(2);
+		assert_ok!(Example::accumulate_dummy(Origin::signed(1), val1));
+		assert_eq!(Example::dummy(), Some(val1 + val2 + val1));
+	});
+}
+
+#[test]
+fn it_works_for_default_value() {
+	new_test_ext().execute_with(|| {
+		assert_eq!(Example::foo(), 24);
+		assert_ok!(Example::accumulate_foo(Origin::signed(1), 1));
+		assert_eq!(Example::foo(), 25);
+	});
+}
+
+#[test]
+fn set_dummy_works() {
+	new_test_ext().execute_with(|| {
+		let test_val = 133;
+		assert_ok!(Example::set_dummy(Origin::root(), test_val.into()));
+		assert_eq!(Example::dummy(), Some(test_val));
+	});
+}
+
+#[test]
+fn signed_ext_watch_dummy_works() {
+	new_test_ext().execute_with(|| {
+		let call = <pallet_example::Call<Test>>::set_dummy(10).into();
+		let info = DispatchInfo::default();
+
+		assert_eq!(
+			WatchDummy::<Test>(PhantomData).validate(&1, &call, &info, 150)
+				.unwrap()
+				.priority,
+			u64::max_value(),
+		);
+		assert_eq!(
+			WatchDummy::<Test>(PhantomData).validate(&1, &call, &info, 250),
+			InvalidTransaction::ExhaustsResources.into(),
+		);
+	})
+}
+
+#[test]
+fn weights_work() {
+	// must have a defined weight.
+	let default_call = <pallet_example::Call<Test>>::accumulate_dummy(10);
+	let info1 = default_call.get_dispatch_info();
+	// aka. `let info = <Call<Test> as GetDispatchInfo>::get_dispatch_info(&default_call);`
+	assert!(info1.weight > 0);
+
+
+	// `set_dummy` is simpler than `accumulate_dummy`, and the weight
+	//   should be less.
+	let custom_call = <pallet_example::Call<Test>>::set_dummy(20);
+	let info2 = custom_call.get_dispatch_info();
+	assert!(info1.weight > info2.weight);
+}
diff --git a/frame/example/src/weights.rs b/frame/example/src/weights.rs
new file mode 100644
index 000000000000..db6491335c76
--- /dev/null
+++ b/frame/example/src/weights.rs
@@ -0,0 +1,100 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Autogenerated weights for pallet_example
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-03-15, STEPS: `[100, ]`, REPEAT: 10, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
+
+// Executed Command:
+// ./target/release/substrate
+// benchmark
+// --chain
+// dev
+// --execution
+// wasm
+// --wasm-execution
+// compiled
+// --pallet
+// pallet_example
+// --extrinsic
+// *
+// --steps
+// 100
+// --repeat
+// 10
+// --raw
+// --output
+// ./
+// --template
+// ./.maintain/frame-weight-template.hbs
+
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for pallet_example.
+pub trait WeightInfo {
+	fn set_dummy_benchmark(b: u32, ) -> Weight;
+	fn accumulate_dummy(b: u32, ) -> Weight;
+	fn sort_vector(x: u32, ) -> Weight;
+}
+
+/// Weights for pallet_example using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	fn set_dummy_benchmark(b: u32, ) -> Weight {
+		(5_834_000 as Weight)
+			.saturating_add((24_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn accumulate_dummy(b: u32, ) -> Weight {
+		(51_353_000 as Weight)
+			.saturating_add((14_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn sort_vector(x: u32, ) -> Weight {
+		(2_569_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((4_000 as Weight).saturating_mul(x as Weight))
+	}
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+	fn set_dummy_benchmark(b: u32, ) -> Weight {
+		(5_834_000 as Weight)
+			.saturating_add((24_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn accumulate_dummy(b: u32, ) -> Weight {
+		(51_353_000 as Weight)
+			.saturating_add((14_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn sort_vector(x: u32, ) -> Weight {
+		(2_569_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((4_000 as Weight).saturating_mul(x as Weight))
+	}
+}

From c6ba7933c840cd262cca4b95cfdfa93452e83f84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Mon, 29 Mar 2021 17:05:06 +0200
Subject: [PATCH 0573/1194] Prepare UI tests for Rust 1.51 & new CI image
 (#8474)

* Prepare UI tests for Rust 1.51 & new CI image

* another stderr to be fixed

Co-authored-by: Denis P <denis.pisarev@parity.io>
---
 .../missing_system_module.stderr              |  3 +--
 .../test/tests/derive_no_bound_ui/eq.stderr   |  5 +++++
 .../tests/pallet_ui/hooks_invalid_item.stderr | 20 ++++++++++++++-----
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/frame/support/test/tests/construct_runtime_ui/missing_system_module.stderr b/frame/support/test/tests/construct_runtime_ui/missing_system_module.stderr
index c5319da85107..7648f5c1bfb3 100644
--- a/frame/support/test/tests/construct_runtime_ui/missing_system_module.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/missing_system_module.stderr
@@ -1,7 +1,6 @@
 error: `System` pallet declaration is missing. Please add this line: `System: frame_system::{Pallet, Call, Storage, Config, Event<T>},`
  --> $DIR/missing_system_module.rs:8:2
   |
-8 |       {
-  |  _____^
+8 | /     {
 9 | |     }
   | |_____^
diff --git a/frame/support/test/tests/derive_no_bound_ui/eq.stderr b/frame/support/test/tests/derive_no_bound_ui/eq.stderr
index bbd907adecb3..36384178d469 100644
--- a/frame/support/test/tests/derive_no_bound_ui/eq.stderr
+++ b/frame/support/test/tests/derive_no_bound_ui/eq.stderr
@@ -4,4 +4,9 @@ error[E0277]: can't compare `Foo<T>` with `Foo<T>`
 6   | struct Foo<T: Config> {
     |        ^^^ no implementation for `Foo<T> == Foo<T>`
     |
+   ::: $RUST/core/src/cmp.rs
+    |
+    | pub trait Eq: PartialEq<Self> {
+    |               --------------- required by this bound in `Eq`
+    |
     = help: the trait `PartialEq` is not implemented for `Foo<T>`
diff --git a/frame/support/test/tests/pallet_ui/hooks_invalid_item.stderr b/frame/support/test/tests/pallet_ui/hooks_invalid_item.stderr
index 0379448f694f..3812b433e20c 100644
--- a/frame/support/test/tests/pallet_ui/hooks_invalid_item.stderr
+++ b/frame/support/test/tests/pallet_ui/hooks_invalid_item.stderr
@@ -1,5 +1,15 @@
-error[E0107]: wrong number of type arguments: expected 1, found 0
-  --> $DIR/hooks_invalid_item.rs:12:18
-   |
-12 |     impl<T: Config> Hooks for Pallet<T> {}
-   |                     ^^^^^ expected 1 type argument
+error[E0107]: missing generics for trait `Hooks`
+   --> $DIR/hooks_invalid_item.rs:12:18
+    |
+12  |     impl<T: Config> Hooks for Pallet<T> {}
+    |                     ^^^^^ expected 1 type argument
+    |
+note: trait defined here, with 1 type parameter: `BlockNumber`
+   --> $DIR/hooks.rs:206:11
+    |
+206 | pub trait Hooks<BlockNumber> {
+    |           ^^^^^ -----------
+help: use angle brackets to add missing type argument
+    |
+12  |     impl<T: Config> Hooks<BlockNumber> for Pallet<T> {}
+    |                          ^^^^^^^^^^^^^

From a2fdd15c047289426e6023f393ee9172d81cc0ff Mon Sep 17 00:00:00 2001
From: Sukhveer Sanghera <github@everhusk.com>
Date: Mon, 29 Mar 2021 19:18:29 +0200
Subject: [PATCH 0574/1194] Add Social Network (#8065)

* Add Social Network

* Remove TNET

* Update ss58-registry.json

* Update ss58-registry.json

* Update ss58-registry.json

* Add back comment

Co-authored-by: everhusk <sanghera@everhusk.com>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Github Actions <action@github.com>
---
 primitives/core/src/crypto.rs | 3 ++-
 ss58-registry.json            | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index 95192acc4cb1..aedfbd748650 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -586,8 +586,9 @@ ss58_address_format!(
 		(65, "aventus", "Aventus Chain mainnet, standard account (*25519).")
 	CrustAccount =>
 		(66, "crust", "Crust Network, standard account (*25519).")
+	SocialAccount =>
+		(252, "social-network", "Social Network, standard account (*25519).")
 	// Note: 16384 and above are reserved.
-
 );
 
 /// Set the default "version" (actually, this is a bit of a misnomer and the version byte is
diff --git a/ss58-registry.json b/ss58-registry.json
index 62ed68b7927c..97b3b064e96d 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -477,6 +477,15 @@
 			"decimals": [12],
 			"standardAccount": "*25519",
 			"website": "https://crust.network"
+		},
+		{
+			"prefix": 252,
+			"network": "social-network",
+			"displayName": "Social Network",
+			"symbols": ["NET"],
+			"decimals": [18],
+			"standardAccount": "*25519",
+			"website": "https://social.network"
 		}
 	]
 }

From 9768df2aef81f47da7875f8b5f42dd6206a551b6 Mon Sep 17 00:00:00 2001
From: Jimmy Chu <jimmy@parity.io>
Date: Tue, 30 Mar 2021 07:47:37 +0800
Subject: [PATCH 0575/1194] Enhancement on Substrate Node Template (#8473)

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>
---
 .maintain/node-template-release.sh            |   2 +-
 .maintain/node-template-release/Cargo.toml    |   2 +-
 Cargo.lock                                    |   6 +-
 bin/node-template/.editorconfig               |  16 +++
 bin/node-template/README.md                   | 128 ++++++++----------
 bin/node-template/docker-compose.yml          |  17 +++
 bin/node-template/docs/rust-setup.md          |  81 +++++++++++
 bin/node-template/node/Cargo.toml             |  10 +-
 bin/node-template/pallets/template/Cargo.toml |  46 ++-----
 bin/node-template/pallets/template/src/lib.rs |  10 +-
 bin/node-template/runtime/Cargo.toml          |  22 +--
 bin/node-template/runtime/src/lib.rs          |  23 ++--
 bin/node-template/scripts/docker_run.sh       |  10 ++
 bin/node-template/scripts/init.sh             |   2 +-
 docs/node-template-release.md                 |  78 +++++++++++
 15 files changed, 308 insertions(+), 145 deletions(-)
 create mode 100644 bin/node-template/.editorconfig
 create mode 100644 bin/node-template/docker-compose.yml
 create mode 100644 bin/node-template/docs/rust-setup.md
 create mode 100644 bin/node-template/scripts/docker_run.sh
 create mode 100644 docs/node-template-release.md

diff --git a/.maintain/node-template-release.sh b/.maintain/node-template-release.sh
index 1a6c24532059..fd470a3dce17 100755
--- a/.maintain/node-template-release.sh
+++ b/.maintain/node-template-release.sh
@@ -10,7 +10,7 @@ if [ "$#" -ne 1 ]; then
   exit 1
 fi
 
-PATH_TO_ARCHIVE=$(pwd)/$1
+PATH_TO_ARCHIVE=$1
 cd $PROJECT_ROOT/.maintain/node-template-release
 
 cargo run $PROJECT_ROOT/bin/node-template $PATH_TO_ARCHIVE
diff --git a/.maintain/node-template-release/Cargo.toml b/.maintain/node-template-release/Cargo.toml
index dd3166d58ddf..c1d9f2da7fae 100644
--- a/.maintain/node-template-release/Cargo.toml
+++ b/.maintain/node-template-release/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "node-template-release"
-version = "2.0.0"
+version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0"
diff --git a/Cargo.lock b/Cargo.lock
index e1a18f3a8120..338bafbc87af 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4352,7 +4352,7 @@ dependencies = [
 
 [[package]]
 name = "node-template"
-version = "2.0.0"
+version = "3.0.0"
 dependencies = [
  "frame-benchmarking",
  "frame-benchmarking-cli",
@@ -4389,7 +4389,7 @@ dependencies = [
 
 [[package]]
 name = "node-template-runtime"
-version = "2.0.0"
+version = "3.0.0"
 dependencies = [
  "frame-benchmarking",
  "frame-executive",
@@ -5482,7 +5482,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-template"
-version = "2.0.0"
+version = "3.0.0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
diff --git a/bin/node-template/.editorconfig b/bin/node-template/.editorconfig
new file mode 100644
index 000000000000..5adac74ca24b
--- /dev/null
+++ b/bin/node-template/.editorconfig
@@ -0,0 +1,16 @@
+root = true
+
+[*]
+indent_style=space
+indent_size=2
+tab_width=2
+end_of_line=lf
+charset=utf-8
+trim_trailing_whitespace=true
+insert_final_newline = true
+
+[*.{rs,toml}]
+indent_style=tab
+indent_size=tab
+tab_width=4
+max_line_length=100
diff --git a/bin/node-template/README.md b/bin/node-template/README.md
index 8c8b82a14bb8..cd977fac8449 100644
--- a/bin/node-template/README.md
+++ b/bin/node-template/README.md
@@ -1,97 +1,71 @@
 # Substrate Node Template
 
-A new FRAME-based Substrate node, ready for hacking :rocket:
+A fresh FRAME-based [Substrate](https://www.substrate.io/) node, ready for hacking :rocket:
 
-## Local Development
+## Getting Started
 
-Follow these steps to prepare a local Substrate development environment :hammer_and_wrench:
+Follow these steps to get started with the Node Template :hammer_and_wrench:
 
-### Simple Setup
+### Rust Setup
 
-Install all the required dependencies with a single command (be patient, this can take up to 30
-minutes).
+First, complete the [basic Rust setup instructions](./doc/rust-setup.md).
 
-```bash
-curl https://getsubstrate.io -sSf | bash -s -- --fast
-```
+### Run
 
-### Manual Setup
+Use Rust's native `cargo` command to build and launch the template node:
 
-Find manual setup instructions at the
-[Substrate Developer Hub](https://substrate.dev/docs/en/knowledgebase/getting-started/#manual-installation).
+```sh
+cargo run --release -- --dev --tmp
+```
 
 ### Build
 
-Once the development environment is set up, build the node template. This command will build the
-[Wasm](https://substrate.dev/docs/en/knowledgebase/advanced/executor#wasm-execution) and
-[native](https://substrate.dev/docs/en/knowledgebase/advanced/executor#native-execution) code:
+The `cargo run` command will perform an initial build. Use the following command to build the node
+without launching it:
 
-```bash
+```sh
 cargo build --release
 ```
 
-## Run
-
-### Single Node Development Chain
+### Embedded Docs
 
-Purge any existing dev chain state:
+Once the project has been built, the following command can be used to explore all parameters and
+subcommands:
 
-```bash
-./target/release/node-template purge-chain --dev
+```sh
+./target/release/node-template -h
 ```
 
-Start a dev chain:
+## Run
 
-```bash
-./target/release/node-template --dev
-```
+The provided `cargo run` command will launch a temporary node and its state will be discarded after
+you terminate the process. After the project has been built, there are other ways to launch the
+node.
+
+### Single-Node Development Chain
 
-Or, start a dev chain with detailed logging:
+This command will start the single-node development chain with persistent state:
 
 ```bash
-RUST_LOG=debug RUST_BACKTRACE=1 ./target/release/node-template -lruntime=debug --dev
+./target/release/node-template --dev
 ```
 
-### Multi-Node Local Testnet
-
-To see the multi-node consensus algorithm in action, run a local testnet with two validator nodes,
-Alice and Bob, that have been [configured](./node/src/chain_spec.rs) as the initial
-authorities of the `local` testnet chain and endowed with testnet units.
-
-Note: this will require two terminal sessions (one for each node).
-
-Start Alice's node first. The command below uses the default TCP port (30333) and specifies
-`/tmp/alice` as the chain database location. Alice's node ID will be
-`12D3KooWEyoppNCUx8Yx66oV9fJnriXwCcXwDDUA2kj6vnc6iDEp` (legacy representation:
-`QmRpheLN4JWdAnY7HGJfWFNbfkQCb6tFf4vvA6hgjMZKrR`); this is determined by the `node-key`.
+Purge the development chain's state:
 
 ```bash
-cargo run -- \
-  --base-path /tmp/alice \
-  --chain=local \
-  --alice \
-  --node-key 0000000000000000000000000000000000000000000000000000000000000001 \
-  --telemetry-url 'ws://telemetry.polkadot.io:1024 0' \
-  --validator
+./target/release/node-template purge-chain --dev
 ```
 
-In another terminal, use the following command to start Bob's node on a different TCP port (30334)
-and with a chain database location of `/tmp/bob`. The `--bootnodes` option will connect his node to
-Alice's on TCP port 30333:
+Start the development chain with detailed logging:
 
 ```bash
-cargo run -- \
-  --base-path /tmp/bob \
-  --bootnodes /ip4/127.0.0.1/tcp/30333/p2p/12D3KooWEyoppNCUx8Yx66oV9fJnriXwCcXwDDUA2kj6vnc6iDEp \
-  --chain=local \
-  --bob \
-  --port 30334 \
-  --ws-port 9945 \
-  --telemetry-url 'ws://telemetry.polkadot.io:1024 0' \
-  --validator
+RUST_BACKTRACE=1 ./target/release/node-template -ldebug --dev
 ```
 
-Execute `cargo run -- --help` to learn more about the template node's CLI options.
+### Multi-Node Local Testnet
+
+If you want to see the multi-node consensus algorithm in action, refer to
+[our Start a Private Network tutorial](https://substrate.dev/docs/en/tutorials/start-a-private-network/).
 
 ## Template Structure
 
@@ -184,24 +158,28 @@ A FRAME pallet is compromised of a number of blockchain primitives:
 -   Config: The `Config` configuration interface is used to define the types and parameters upon
     which a FRAME pallet depends.
 
-## Generate a Custom Node Template
+### Run in Docker
 
-Generate a Substrate node template based on a particular commit by running the following commands:
+First, install [Docker](https://docs.docker.com/get-docker/) and
+[Docker Compose](https://docs.docker.com/compose/install/).
+
+Then run the following command to start a single node development chain.
 
 ```bash
-# Clone from the main Substrate repo
-git clone https://github.com/paritytech/substrate.git
-cd substrate
+./scripts/docker_run.sh
+```
 
-# Switch to the branch or commit to base the template on
-git checkout <branch/tag/sha1>
+This command will firstly compile your code, and then start a local development network. You can
+also replace the default command (`cargo build --release && ./target/release/node-template --dev --ws-external`)
+by appending your own. A few useful ones are as follow.
 
-# Run the helper script to generate a node template. This script compiles Substrate, so it will take
-# a while to complete. It expects a single parameter: the location for the script's output expressed
-# as a relative path.
-.maintain/node-template-release.sh ../node-template.tar.gz
-```
+```bash
+# Run Substrate node without re-compiling
+./scripts/docker_run.sh ./target/release/node-template --dev --ws-external
+
+# Purge the local dev chain
+./scripts/docker_run.sh ./target/release/node-template purge-chain --dev
 
-Custom node templates are not supported. Please use a recently tagged version of the
-[Substrate Developer Node Template](https://github.com/substrate-developer-hub/substrate-node-template)
-in order to receive support.
+# Check whether the code is compilable
+./scripts/docker_run.sh cargo check
+```
diff --git a/bin/node-template/docker-compose.yml b/bin/node-template/docker-compose.yml
new file mode 100644
index 000000000000..cfc4437bbae4
--- /dev/null
+++ b/bin/node-template/docker-compose.yml
@@ -0,0 +1,17 @@
+version: "3.2"
+
+services:
+  dev:
+    container_name: node-template
+    image: paritytech/ci-linux:974ba3ac-20201006
+    working_dir: /var/www/node-template
+    ports:
+      - "9944:9944"
+    environment:
+      - CARGO_HOME=/var/www/node-template/.cargo
+    volumes:
+      - .:/var/www/node-template
+      - type: bind
+        source: ./.local
+        target: /root/.local
+    command: bash -c "cargo build --release && ./target/release/node-template --dev --ws-external"
diff --git a/bin/node-template/docs/rust-setup.md b/bin/node-template/docs/rust-setup.md
new file mode 100644
index 000000000000..34f6e43e7f0d
--- /dev/null
+++ b/bin/node-template/docs/rust-setup.md
@@ -0,0 +1,81 @@
+---
+title: Installation
+---
+
+This page will guide you through the steps needed to prepare a computer for development with the
+Substrate Node Template. Since Substrate is built with
+[the Rust programming language](https://www.rust-lang.org/), the first thing you will need to do is
+prepare the computer for Rust development - these steps will vary based on the computer's operating
+system. Once Rust is configured, you will use its toolchains to interact with Rust projects; the
+commands for Rust's toolchains will be the same for all supported, Unix-based operating systems.
+
+## Unix-Based Operating Systems
+
+Substrate development is easiest on Unix-based operating systems like macOS or Linux. The examples
+in the Substrate [Tutorials](https://substrate.dev/tutorials) and [Recipes](https://substrate.dev/recipes/)
+use Unix-style terminals to demonstrate how to interact with Substrate from the command line.
+
+### macOS
+
+Open the Terminal application and execute the following commands:
+
+```bash
+# Install Homebrew if necessary https://brew.sh/
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
+
+# Make sure Homebrew is up-to-date, install openssl and cmake
+brew update
+brew install openssl cmake
+```
+
+### Ubuntu/Debian
+
+Use a terminal shell to execute the following commands:
+
+```bash
+sudo apt update
+# May prompt for location information
+sudo apt install -y cmake pkg-config libssl-dev git build-essential clang libclang-dev curl
+```
+
+### Arch Linux
+
+Run these commands from a terminal:
+
+```bash
+pacman -Syu --needed --noconfirm cmake gcc openssl-1.0 pkgconf git clang
+export OPENSSL_LIB_DIR="/usr/lib/openssl-1.0"
+export OPENSSL_INCLUDE_DIR="/usr/include/openssl-1.0"
+```
+
+### Fedora/RHEL/CentOS
+
+Use a terminal to run the following commands:
+
+```bash
+# Update
+sudo dnf update
+# Install packages
+sudo dnf install cmake pkgconfig rocksdb rocksdb-devel llvm git libcurl libcurl-devel curl-devel clang
+```
+
+## Rust Developer Environment
+
+This project uses [`rustup`](https://rustup.rs/) to help manage the Rust toolchain. First install
+and configure `rustup`:
+
+```bash
+# Install
+curl https://sh.rustup.rs -sSf | sh
+# Configure
+source ~/.cargo/env
+```
+
+Finally, configure the Rust toolchain:
+
+```bash
+rustup default stable
+rustup update nightly
+rustup update stable
+rustup target add wasm32-unknown-unknown --toolchain nightly
+```
diff --git a/bin/node-template/node/Cargo.toml b/bin/node-template/node/Cargo.toml
index 2d36d3c46908..e53320c94051 100644
--- a/bin/node-template/node/Cargo.toml
+++ b/bin/node-template/node/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "node-template"
-version = "2.0.0"
-authors = ["Anonymous"]
-description = "A new FRAME-based Substrate node, ready for hacking."
+version = "3.0.0"
+authors = ["Substrate DevHub <https://github.com/substrate-developer-hub>"]
+description = "A fresh FRAME-based Substrate node, ready for hacking."
 edition = "2018"
 license = "Unlicense"
 build = "build.rs"
 homepage = "https://substrate.dev"
-repository = "https://github.com/paritytech/substrate/"
+repository = "https://github.com/substrate-developer-hub/substrate-node-template/"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
@@ -51,7 +51,7 @@ pallet-transaction-payment-rpc = { version = "3.0.0", path = "../../../frame/tra
 frame-benchmarking = { version = "3.1.0", path = "../../../frame/benchmarking" }
 frame-benchmarking-cli = { version = "3.0.0", path = "../../../utils/frame/benchmarking-cli" }
 
-node-template-runtime = { version = "2.0.0", path = "../runtime" }
+node-template-runtime = { version = "3.0.0", path = "../runtime" }
 
 [build-dependencies]
 substrate-build-script-utils = { version = "3.0.0", path = "../../../utils/build-script-utils" }
diff --git a/bin/node-template/pallets/template/Cargo.toml b/bin/node-template/pallets/template/Cargo.toml
index 9f0c6ee18267..df76d20a4a7e 100644
--- a/bin/node-template/pallets/template/Cargo.toml
+++ b/bin/node-template/pallets/template/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
-authors = ['Anonymous']
+authors = ['Substrate DevHub <https://github.com/substrate-developer-hub>']
 edition = '2018'
 name = 'pallet-template'
-version = "2.0.0"
+version = "3.0.0"
 license = "Unlicense"
 homepage = "https://substrate.dev"
-repository = "https://github.com/paritytech/substrate/"
+repository = "https://github.com/substrate-developer-hub/substrate-node-template/"
 description = "FRAME pallet template for defining custom runtime logic."
 readme = "README.md"
 
@@ -14,40 +14,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-
-[dependencies.frame-support]
-default-features = false
-version = "3.0.0"
-path = "../../../../frame/support"
-
-[dependencies.frame-system]
-default-features = false
-version = "3.0.0"
-path = "../../../../frame/system"
-
-[dependencies.frame-benchmarking]
-default-features = false
-version = "3.1.0"
-path = "../../../../frame/benchmarking"
-optional = true
+frame-support = { default-features = false, version = "3.0.0", path = "../../../../frame/support" }
+frame-system = { default-features = false,  version = "3.0.0",  path = "../../../../frame/system" }
+frame-benchmarking = { default-features = false,  version = "3.1.0",  path = "../../../../frame/benchmarking", optional = true }
 
 [dev-dependencies]
-serde = { version = "1.0.101" }
-
-[dev-dependencies.sp-core]
-default-features = false
-version = "3.0.0"
-path = "../../../../primitives/core"
-
-[dev-dependencies.sp-io]
-default-features = false
-version = "3.0.0"
-path = "../../../../primitives/io"
-
-[dev-dependencies.sp-runtime]
-default-features = false
-version = "3.0.0"
-path = "../../../../primitives/runtime"
+serde = { version = "1.0.119" }
+sp-core = { default-features = false, version = "3.0.0", path = "../../../../primitives/core" }
+sp-io = { default-features = false, version = "3.0.0", path = "../../../../primitives/io" }
+sp-runtime = { default-features = false, version = "3.0.0", path = "../../../../primitives/runtime" }
 
 [features]
 default = ['std']
@@ -57,5 +32,6 @@ std = [
 	'frame-system/std',
 	'frame-benchmarking/std',
 ]
+
 runtime-benchmarks = ["frame-benchmarking"]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/bin/node-template/pallets/template/src/lib.rs b/bin/node-template/pallets/template/src/lib.rs
index 99a285492c77..7b986a518669 100644
--- a/bin/node-template/pallets/template/src/lib.rs
+++ b/bin/node-template/pallets/template/src/lib.rs
@@ -17,7 +17,7 @@ mod benchmarking;
 
 #[frame_support::pallet]
 pub mod pallet {
-	use frame_support::{dispatch::DispatchResultWithPostInfo, pallet_prelude::*};
+	use frame_support::{dispatch::DispatchResult, pallet_prelude::*};
 	use frame_system::pallet_prelude::*;
 
 	/// Configure the pallet by specifying the parameters and types on which it depends.
@@ -70,7 +70,7 @@ pub mod pallet {
 		/// An example dispatchable that takes a singles value as a parameter, writes the value to
 		/// storage and emits an event. This function must be dispatched by a signed extrinsic.
 		#[pallet::weight(10_000 + T::DbWeight::get().writes(1))]
-		pub fn do_something(origin: OriginFor<T>, something: u32) -> DispatchResultWithPostInfo {
+		pub fn do_something(origin: OriginFor<T>, something: u32) -> DispatchResult {
 			// Check that the extrinsic was signed and get the signer.
 			// This function will return an error if the extrinsic is not signed.
 			// https://substrate.dev/docs/en/knowledgebase/runtime/origin
@@ -82,12 +82,12 @@ pub mod pallet {
 			// Emit an event.
 			Self::deposit_event(Event::SomethingStored(something, who));
 			// Return a successful DispatchResultWithPostInfo
-			Ok(().into())
+			Ok(())
 		}
 
 		/// An example dispatchable that may throw a custom error.
 		#[pallet::weight(10_000 + T::DbWeight::get().reads_writes(1,1))]
-		pub fn cause_error(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
+		pub fn cause_error(origin: OriginFor<T>) -> DispatchResult {
 			let _who = ensure_signed(origin)?;
 
 			// Read a value from storage.
@@ -99,7 +99,7 @@ pub mod pallet {
 					let new = old.checked_add(1).ok_or(Error::<T>::StorageOverflow)?;
 					// Update the value in storage with the incremented result.
 					<Something<T>>::put(new);
-					Ok(().into())
+					Ok(())
 				},
 			}
 		}
diff --git a/bin/node-template/runtime/Cargo.toml b/bin/node-template/runtime/Cargo.toml
index d4e202d688c8..5bba2a4e970b 100644
--- a/bin/node-template/runtime/Cargo.toml
+++ b/bin/node-template/runtime/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "node-template-runtime"
-version = "2.0.0"
-authors = ["Anonymous"]
+version = "3.0.0"
+authors = ["Substrate DevHub <https://github.com/substrate-developer-hub>"]
 edition = "2018"
 license = "Unlicense"
 homepage = "https://substrate.dev"
-repository = "https://github.com/paritytech/substrate/"
+repository = "https://github.com/substrate-developer-hub/substrate-node-template/"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
@@ -45,7 +45,7 @@ frame-benchmarking = { version = "3.1.0", default-features = false, path = "../.
 frame-system-benchmarking = { version = "3.0.0", default-features = false, path = "../../../frame/system/benchmarking", optional = true }
 hex-literal = { version = "0.3.1", optional = true }
 
-template = { version = "2.0.0", default-features = false, path = "../pallets/template", package = "pallet-template" }
+pallet-template = { version = "3.0.0", default-features = false, path = "../pallets/template" }
 
 [build-dependencies]
 substrate-wasm-builder = { version = "4.0.0", path = "../../../utils/wasm-builder" }
@@ -56,14 +56,17 @@ std = [
 	"codec/std",
 	"frame-executive/std",
 	"frame-support/std",
+	"frame-system-rpc-runtime-api/std",
+	"frame-system/std",
 	"pallet-aura/std",
 	"pallet-balances/std",
 	"pallet-grandpa/std",
 	"pallet-randomness-collective-flip/std",
 	"pallet-sudo/std",
+	"pallet-template/std",
 	"pallet-timestamp/std",
-	"pallet-transaction-payment/std",
 	"pallet-transaction-payment-rpc-runtime-api/std",
+	"pallet-transaction-payment/std",
 	"serde",
 	"sp-api/std",
 	"sp-block-builder/std",
@@ -76,18 +79,15 @@ std = [
 	"sp-std/std",
 	"sp-transaction-pool/std",
 	"sp-version/std",
-	"frame-system/std",
-	"frame-system-rpc-runtime-api/std",
-	"template/std",
 ]
 runtime-benchmarks = [
-	"sp-runtime/runtime-benchmarks",
 	"frame-benchmarking",
 	"frame-support/runtime-benchmarks",
 	"frame-system-benchmarking",
-	"hex-literal",
 	"frame-system/runtime-benchmarks",
+	"hex-literal",
 	"pallet-balances/runtime-benchmarks",
+	"pallet-template/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
-	"template/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 ]
diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index 4ca347dd8813..1675b3d2a1cd 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -40,7 +40,7 @@ pub use frame_support::{
 use pallet_transaction_payment::CurrencyAdapter;
 
 /// Import the template pallet.
-pub use template;
+pub use pallet_template;
 
 /// An index to a block.
 pub type BlockNumber = u32;
@@ -92,17 +92,24 @@ pub mod opaque {
 	}
 }
 
+// To learn more about runtime versioning and what each of the following value means:
+//   https://substrate.dev/docs/en/knowledgebase/runtime/upgrades#runtime-versioning
 pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("node-template"),
 	impl_name: create_runtime_str!("node-template"),
 	authoring_version: 1,
-	spec_version: 1,
+	// The version of the runtime specification. A full node will not attempt to use its native
+	//   runtime in substitute for the on-chain Wasm runtime unless all of `spec_name`,
+	//   `spec_version`, and `authoring_version` are the same between Wasm and native.
+	// This value is set to 100 to notify Polkadot-JS App (https://polkadot.js.org/apps) to use
+	//   the compatible custom types.
+	spec_version: 100,
 	impl_version: 1,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
 };
 
-/// This determines the average expected block time that we are targetting.
+/// This determines the average expected block time that we are targeting.
 /// Blocks will be produced at a minimum duration defined by `SLOT_DURATION`.
 /// `SLOT_DURATION` is picked up by `pallet_timestamp` which is in turn picked
 /// up by `pallet_aura` to implement `fn slot_duration()`.
@@ -258,8 +265,8 @@ impl pallet_sudo::Config for Runtime {
 	type Call = Call;
 }
 
-/// Configure the pallet template in pallets/template.
-impl template::Config for Runtime {
+/// Configure the pallet-template in pallets/template.
+impl pallet_template::Config for Runtime {
 	type Event = Event;
 }
 
@@ -278,8 +285,8 @@ construct_runtime!(
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
 		TransactionPayment: pallet_transaction_payment::{Pallet, Storage},
 		Sudo: pallet_sudo::{Pallet, Call, Config<T>, Storage, Event<T>},
-		// Include the custom logic from the template pallet in the runtime.
-		TemplateModule: template::{Pallet, Call, Storage, Event<T>},
+		// Include the custom logic from the pallet-template in the runtime.
+		TemplateModule: pallet_template::{Pallet, Call, Storage, Event<T>},
 	}
 );
 
@@ -475,7 +482,7 @@ impl_runtime_apis! {
 			add_benchmark!(params, batches, frame_system, SystemBench::<Runtime>);
 			add_benchmark!(params, batches, pallet_balances, Balances);
 			add_benchmark!(params, batches, pallet_timestamp, Timestamp);
-			add_benchmark!(params, batches, template, TemplateModule);
+			add_benchmark!(params, batches, pallet_template, TemplateModule);
 
 			if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) }
 			Ok(batches)
diff --git a/bin/node-template/scripts/docker_run.sh b/bin/node-template/scripts/docker_run.sh
new file mode 100644
index 000000000000..0bac44b4cfb3
--- /dev/null
+++ b/bin/node-template/scripts/docker_run.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+# This script is meant to be run on Unix/Linux based systems
+set -e
+
+echo "*** Start Substrate node template ***"
+
+cd $(dirname ${BASH_SOURCE[0]})/..
+
+docker-compose down --remove-orphans
+docker-compose run --rm --service-ports dev $@
diff --git a/bin/node-template/scripts/init.sh b/bin/node-template/scripts/init.sh
index 1405a41ef333..f976f7235d70 100755
--- a/bin/node-template/scripts/init.sh
+++ b/bin/node-template/scripts/init.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-
+# This script is meant to be run on Unix/Linux based systems
 set -e
 
 echo "*** Initializing WASM build environment"
diff --git a/docs/node-template-release.md b/docs/node-template-release.md
new file mode 100644
index 000000000000..25834ae99f43
--- /dev/null
+++ b/docs/node-template-release.md
@@ -0,0 +1,78 @@
+# Substrate Node Template Release Process
+
+1. This release process has to be run in a github checkout Substrate directory with your work
+committed into `https://github.com/paritytech/substrate/`, because the build script will check
+the existence of your current git commit ID in the remote repository.
+
+	Assume you are in root directory of Substrate. Run:
+
+	```bash
+	cd .maintain/
+	./node-template-release.sh <output tar.gz file>
+	```
+
+2. Expand the output tar gzipped file and replace files in current Substrate Node Template
+by running the following command.
+
+	```bash
+	# This is where the tar.gz file uncompressed
+	cd substrate-node-template
+	# rsync with force copying. Note the slash at the destination directory is important
+	rsync -avh * <destination node-template directory>/
+	# For dry-running add `-n` argument
+	# rsync -avhn * <destination node-template directory>/
+	```
+
+	The above command only copies existing files from the source to the destination, but does not
+	delete files/directories that are removed from the source. So you need to manually check and
+	remove them in the destination.
+
+3. There are actually three packages in the Node Template, `node-template` (the node),
+`node-template-runtime` (the runtime), and `pallet-template`, and each has its own `Cargo.toml`.
+Inside these three files, dependencies are listed in expanded form and linked to a certain git
+commit in Substrate remote repository, such as:
+
+	```toml
+	[dev-dependencies.sp-core]
+	default-features = false
+	git = 'https://github.com/paritytech/substrate.git'
+	rev = 'c1fe59d060600a10eebb4ace277af1fee20bad17'
+	version = '3.0.0'
+	```
+
+	We will update each of them to the shortened form and link them to the Rust
+	[crate registry](https://crates.io/). After confirming the versioned package is published in
+	the crate, the above will become:
+
+	```toml
+	[dev-dependencies]
+	sp-core = { version = '3.0.0', default-features = false }
+	```
+
+	P.S: This step can be automated if we update `node-template-release` package in
+	`.maintain/node-template-release`.
+
+4. Once the three `Cargo.toml`s are updated, compile and confirm that the Node Template builds. Then
+commit the changes to a new branch in [Substrate Node Template](https://github.com/substrate-developer-hub/substrate-node-template), and make a PR.
+
+	> Note that there is a chance the code in Substrate Node Template works with the linked Substrate git
+	commit but not with published packages due to the latest (as yet) unpublished features. In this case,
+	rollback that section of the Node Template to its previous version to ensure the Node Template builds.
+
+5. Once the PR is merged, tag the merged commit in master branch with the version number
+`vX.Y.Z+A` (e.g. `v3.0.0+1`). The `X`(major), `Y`(minor), and `Z`(patch) version number should
+follow Substrate release version. The last digit is any significant fixes made in the Substrate
+Node Template apart from Substrate. When the Substrate version is updated, this digit is reset to 0.
+
+## Troubleshooting
+
+- Running the script `./node-template-release.sh <output tar.gz file>`, after all tests passed
+	successfully, seeing the following error message:
+
+	```
+	thread 'main' panicked at 'Creates output file: Os { code: 2, kind: NotFound, message: "No such file or directory" }', src/main.rs:250:10
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
+	```
+
+	This is likely due to that your output path is not a valid `tar.gz` filename or you don't have write
+	permission to the destination. Try with a simple output path such as `~/node-tpl.tar.gz`.

From f3b3e6243377a919dd48305b90d72fbcef4f9f07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 30 Mar 2021 08:10:54 +0200
Subject: [PATCH 0576/1194] Get rid of `test-helpers` feature in
 sc-consensus-babe (#8486)

This is not really required and having a special `test-helpers` feature
is a bad idea anyway.
---
 bin/node/cli/Cargo.toml          |  2 +-
 bin/node/cli/src/service.rs      | 39 +++++++++++++++++++-------------
 client/consensus/babe/Cargo.toml |  3 ---
 client/consensus/babe/src/lib.rs | 38 -------------------------------
 4 files changed, 24 insertions(+), 58 deletions(-)

diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index c30378e8fc83..9449edfbf6e0 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -116,7 +116,7 @@ sp-trie = { version = "3.0.0", default-features = false, path = "../../../primit
 [dev-dependencies]
 sc-keystore = { version = "3.0.0", path = "../../../client/keystore" }
 sc-consensus = { version = "0.9.0", path = "../../../client/consensus/common" }
-sc-consensus-babe = { version = "0.9.0", features = ["test-helpers"], path = "../../../client/consensus/babe" }
+sc-consensus-babe = { version = "0.9.0", path = "../../../client/consensus/babe" }
 sc-consensus-epochs = { version = "0.9.0", path = "../../../client/consensus/epochs" }
 sc-service-test = { version = "2.0.0", path = "../../../client/service/test" }
 futures = "0.3.9"
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index 1351782315be..4dc99c173691 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -638,27 +638,34 @@ mod tests {
 					None,
 				);
 
-				let epoch_descriptor = babe_link.epoch_changes().lock().epoch_descriptor_for_child_of(
-					descendent_query(&*service.client()),
-					&parent_hash,
-					parent_number,
-					slot.into(),
-				).unwrap().unwrap();
-
 				let mut digest = Digest::<H256>::default();
 
 				// even though there's only one authority some slots might be empty,
 				// so we must keep trying the next slots until we can claim one.
-				let babe_pre_digest = loop {
-					inherent_data.replace_data(sp_timestamp::INHERENT_IDENTIFIER, &(slot * SLOT_DURATION));
-					if let Some(babe_pre_digest) = sc_consensus_babe::test_helpers::claim_slot(
+				let (babe_pre_digest, epoch_descriptor) = loop {
+					inherent_data.replace_data(
+						sp_timestamp::INHERENT_IDENTIFIER,
+						&(slot * SLOT_DURATION),
+					);
+
+					let epoch_descriptor = babe_link.epoch_changes().lock().epoch_descriptor_for_child_of(
+						descendent_query(&*service.client()),
+						&parent_hash,
+						parent_number,
+						slot.into(),
+					).unwrap().unwrap();
+
+					let epoch = babe_link.epoch_changes().lock().epoch_data(
+						&epoch_descriptor,
+						|slot| sc_consensus_babe::Epoch::genesis(&babe_link.config(), slot),
+					).unwrap();
+
+					if let Some(babe_pre_digest) = sc_consensus_babe::authorship::claim_slot(
 						slot.into(),
-						&parent_header,
-						&*service.client(),
-						keystore.clone(),
-						&babe_link,
-					) {
-						break babe_pre_digest;
+						&epoch,
+						&keystore,
+					).map(|(digest, _)| digest) {
+						break (babe_pre_digest, epoch_descriptor)
 					}
 
 					slot += 1;
diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml
index 14d48fba1bb5..cd989650671d 100644
--- a/client/consensus/babe/Cargo.toml
+++ b/client/consensus/babe/Cargo.toml
@@ -65,6 +65,3 @@ substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils
 sc-block-builder = { version = "0.9.0", path = "../../block-builder" }
 rand_chacha = "0.2.2"
 tempfile = "3.1.0"
-
-[features]
-test-helpers = []
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index 28cfec1238e4..8fd41aa98014 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -1647,41 +1647,3 @@ pub fn import_queue<Block: BlockT, Client, SelectChain, Inner, CAW>(
 		registry,
 	))
 }
-
-/// BABE test helpers. Utility methods for manually authoring blocks.
-#[cfg(feature = "test-helpers")]
-pub mod test_helpers {
-	use super::*;
-
-	/// Try to claim the given slot and return a `BabePreDigest` if
-	/// successful.
-	pub fn claim_slot<B, C>(
-		slot: Slot,
-		parent: &B::Header,
-		client: &C,
-		keystore: SyncCryptoStorePtr,
-		link: &BabeLink<B>,
-	) -> Option<PreDigest> where
-		B: BlockT,
-		C: ProvideRuntimeApi<B> +
-			ProvideCache<B> +
-			HeaderBackend<B> +
-			HeaderMetadata<B, Error = ClientError>,
-		C::Api: BabeApi<B>,
-	{
-		let epoch_changes = link.epoch_changes.lock();
-		let epoch = epoch_changes.epoch_data_for_child_of(
-			descendent_query(client),
-			&parent.hash(),
-			parent.number().clone(),
-			slot,
-			|slot| Epoch::genesis(&link.config, slot),
-		).unwrap().unwrap();
-
-		authorship::claim_slot(
-			slot,
-			&epoch,
-			&keystore,
-		).map(|(digest, _)| digest)
-	}
-}

From d3f204439220df98a59011674615d462ae667713 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 30 Mar 2021 11:19:49 +0200
Subject: [PATCH 0577/1194] Make `BlockImport` and `Verifier` async (#8472)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Make grandpa work

* Introduce `SharedData`

* Add test and fix bugs

* Switch to `SharedData`

* Make grandpa tests working

* More Babe work

* Make it async

* Fix fix

* Use `async_trait` in sc-consensus-slots

This makes the code a little bit easier to read and also expresses that
there can always only be one call at a time to `on_slot`.

* Make grandpa tests compile

* More Babe tests work

* Fix network test

* Start fixing service test

* Finish service-test

* Fix sc-consensus-aura

* Fix fix fix

* More fixes

* Make everything compile *yeah*

* Fix build when we have Rust 1.51

* Update client/consensus/common/src/shared_data.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Update client/consensus/common/src/shared_data.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Update client/consensus/common/src/shared_data.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Update client/consensus/common/src/shared_data.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Update client/consensus/common/src/shared_data.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Update client/consensus/babe/src/tests.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Update client/consensus/babe/src/tests.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Fix warning

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
---
 .gitlab-ci.yml                                |   4 +-
 Cargo.lock                                    |  14 +-
 Cargo.toml                                    |   2 +
 .../pallets/template/src/benchmarking.rs      |   2 +-
 bin/node/cli/src/service.rs                   |  10 +-
 bin/node/executor/Cargo.toml                  |   1 +
 bin/node/executor/tests/basic.rs              |   2 +-
 bin/node/testing/src/bench.rs                 |   2 +-
 .../basic-authorship/src/basic_authorship.rs  |  27 +-
 client/consensus/aura/Cargo.toml              |   3 +-
 client/consensus/aura/src/import_queue.rs     |  13 +-
 client/consensus/aura/src/lib.rs              |  23 +-
 client/consensus/babe/Cargo.toml              |   1 +
 client/consensus/babe/rpc/src/lib.rs          |   2 +-
 client/consensus/babe/src/aux_schema.rs       |  17 +-
 client/consensus/babe/src/lib.rs              | 333 +++++++++---------
 client/consensus/babe/src/tests.rs            |  73 ++--
 client/consensus/common/Cargo.toml            |   1 +
 client/consensus/common/src/lib.rs            |   2 +
 client/consensus/common/src/shared_data.rs    | 271 ++++++++++++++
 client/consensus/epochs/Cargo.toml            |   2 +-
 client/consensus/epochs/src/lib.rs            |   9 +-
 client/consensus/manual-seal/Cargo.toml       |   1 +
 .../manual-seal/src/consensus/babe.rs         |  15 +-
 client/consensus/manual-seal/src/lib.rs       |   3 +-
 .../consensus/manual-seal/src/seal_block.rs   |   2 +-
 client/consensus/pow/Cargo.toml               |   1 +
 client/consensus/pow/src/lib.rs               |  27 +-
 client/consensus/pow/src/worker.rs            |  11 +-
 client/consensus/slots/src/lib.rs             |   1 +
 .../finality-grandpa-warp-sync/src/proof.rs   |   2 +-
 client/finality-grandpa/Cargo.toml            |   1 +
 client/finality-grandpa/src/authorities.rs    |  39 +-
 client/finality-grandpa/src/aux_schema.rs     |  10 +-
 client/finality-grandpa/src/environment.rs    |   4 +-
 client/finality-grandpa/src/import.rs         |  61 ++--
 client/finality-grandpa/src/lib.rs            |   2 +-
 client/finality-grandpa/src/observer.rs       |   2 +-
 client/finality-grandpa/src/tests.rs          |  67 ++--
 client/finality-grandpa/src/voting_rule.rs    |   2 +-
 client/network/src/gossip/tests.rs            |   4 +-
 client/network/src/protocol/sync.rs           |  14 +-
 client/network/src/service/tests.rs           |   4 +-
 client/network/test/Cargo.toml                |   1 +
 client/network/test/src/block_import.rs       |  15 +-
 client/network/test/src/lib.rs                | 259 ++++++++------
 client/offchain/src/lib.rs                    |   5 +-
 client/rpc/src/chain/tests.rs                 |  12 +-
 client/rpc/src/state/tests.rs                 |   6 +-
 client/service/Cargo.toml                     |   1 +
 client/service/src/client/client.rs           |  18 +-
 client/service/test/Cargo.toml                |   2 +-
 client/service/test/src/client/light.rs       |   6 +-
 client/service/test/src/client/mod.rs         | 273 ++++++++------
 client/sync-state-rpc/src/lib.rs              |   6 +-
 client/transaction-pool/src/testing/pool.rs   |   2 +-
 primitives/consensus/common/Cargo.toml        |   1 +
 .../consensus/common/src/block_import.rs      |  37 +-
 .../consensus/common/src/import_queue.rs      |  45 +--
 .../common/src/import_queue/basic_queue.rs    |  16 +-
 test-utils/client/Cargo.toml                  |   1 +
 test-utils/client/src/client_ext.rs           |  77 ++--
 test-utils/runtime/Cargo.toml                 |   1 +
 test-utils/runtime/client/src/trait_tests.rs  |  61 ++--
 test-utils/runtime/src/lib.rs                 |   2 +-
 65 files changed, 1230 insertions(+), 704 deletions(-)
 create mode 100644 client/consensus/common/src/shared_data.rs

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5cf4749eac64..e9f17f54503f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -336,7 +336,7 @@ check-web-wasm:
     # Note: we don't need to test crates imported in `bin/node/cli`
     - time cargo build --manifest-path=client/consensus/aura/Cargo.toml --target=wasm32-unknown-unknown --features getrandom
     # Note: the command below is a bit weird because several Cargo issues prevent us from compiling the node in a more straight-forward way.
-    - time cargo +nightly build --manifest-path=bin/node/cli/Cargo.toml --no-default-features --features browser --target=wasm32-unknown-unknown -Z features=itarget
+    - time cargo +nightly build --manifest-path=bin/node/cli/Cargo.toml --no-default-features --features browser --target=wasm32-unknown-unknown
     # with-tracing must be explicitly activated, we run a test to ensure this works as expected in both cases
     - time cargo +nightly test --manifest-path primitives/tracing/Cargo.toml --no-default-features
     - time cargo +nightly test --manifest-path primitives/tracing/Cargo.toml --no-default-features --features=with-tracing
@@ -407,7 +407,7 @@ test-browser-node:
     CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUNNER: "wasm-bindgen-test-runner"
     WASM_BINDGEN_TEST_TIMEOUT:                  120
   script:
-    - cargo +nightly test --target wasm32-unknown-unknown -p node-browser-testing -Z features=itarget
+    - cargo +nightly test --target wasm32-unknown-unknown -p node-browser-testing
 
 build-linux-substrate:             &build-binary
   stage:                           build
diff --git a/Cargo.lock b/Cargo.lock
index 338bafbc87af..1ea9b2fda028 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4171,6 +4171,7 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "futures 0.3.13",
  "node-primitives",
  "node-runtime",
  "node-testing",
@@ -7106,6 +7107,7 @@ dependencies = [
 name = "sc-consensus"
 version = "0.9.0"
 dependencies = [
+ "parking_lot 0.11.1",
  "sc-client-api",
  "sp-blockchain",
  "sp-consensus",
@@ -7116,6 +7118,7 @@ dependencies = [
 name = "sc-consensus-aura"
 version = "0.9.0"
 dependencies = [
+ "async-trait",
  "derive_more",
  "futures 0.3.13",
  "futures-timer 3.0.2",
@@ -7157,6 +7160,7 @@ dependencies = [
 name = "sc-consensus-babe"
 version = "0.9.0"
 dependencies = [
+ "async-trait",
  "derive_more",
  "fork-tree",
  "futures 0.3.13",
@@ -7243,8 +7247,8 @@ version = "0.9.0"
 dependencies = [
  "fork-tree",
  "parity-scale-codec 2.0.1",
- "parking_lot 0.11.1",
  "sc-client-api",
+ "sc-consensus",
  "sp-blockchain",
  "sp-runtime",
 ]
@@ -7254,6 +7258,7 @@ name = "sc-consensus-manual-seal"
 version = "0.9.0"
 dependencies = [
  "assert_matches",
+ "async-trait",
  "derive_more",
  "futures 0.3.13",
  "jsonrpc-core",
@@ -7291,6 +7296,7 @@ dependencies = [
 name = "sc-consensus-pow"
 version = "0.9.0"
 dependencies = [
+ "async-trait",
  "derive_more",
  "futures 0.3.13",
  "futures-timer 3.0.2",
@@ -7442,6 +7448,7 @@ name = "sc-finality-grandpa"
 version = "0.9.0"
 dependencies = [
  "assert_matches",
+ "async-trait",
  "derive_more",
  "dyn-clone",
  "finality-grandpa",
@@ -7680,6 +7687,7 @@ name = "sc-network-test"
 version = "0.8.0"
 dependencies = [
  "async-std",
+ "async-trait",
  "futures 0.3.13",
  "futures-timer 3.0.2",
  "libp2p",
@@ -7860,6 +7868,7 @@ name = "sc-service"
 version = "0.9.0"
 dependencies = [
  "async-std",
+ "async-trait",
  "directories",
  "exit-future",
  "futures 0.1.31",
@@ -8665,6 +8674,7 @@ dependencies = [
 name = "sp-consensus"
 version = "0.9.0"
 dependencies = [
+ "async-trait",
  "futures 0.3.13",
  "futures-timer 3.0.2",
  "libp2p",
@@ -9488,6 +9498,7 @@ dependencies = [
 name = "substrate-test-client"
 version = "2.0.1"
 dependencies = [
+ "async-trait",
  "futures 0.1.31",
  "futures 0.3.13",
  "hash-db",
@@ -9519,6 +9530,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "frame-system-rpc-runtime-api",
+ "futures 0.3.13",
  "log",
  "memory-db",
  "pallet-babe",
diff --git a/Cargo.toml b/Cargo.toml
index 57052a8d38e0..3e4787770e05 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,4 +1,6 @@
 [workspace]
+resolver = "2"
+
 members = [
 	"bin/node-template/node",
 	"bin/node-template/pallets/template",
diff --git a/bin/node-template/pallets/template/src/benchmarking.rs b/bin/node-template/pallets/template/src/benchmarking.rs
index 5296ed7261d9..93d7fa395ad6 100644
--- a/bin/node-template/pallets/template/src/benchmarking.rs
+++ b/bin/node-template/pallets/template/src/benchmarking.rs
@@ -5,7 +5,7 @@ use super::*;
 use frame_system::RawOrigin;
 use frame_benchmarking::{benchmarks, whitelisted_caller, impl_benchmark_test_suite};
 #[allow(unused)]
-use crate::Module as Template;
+use crate::Pallet as Template;
 
 benchmarks! {
 	do_something {
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index 4dc99c173691..ce0ffb2cecc0 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -534,7 +534,7 @@ pub fn new_light(
 
 #[cfg(test)]
 mod tests {
-	use std::{sync::Arc, borrow::Cow, any::Any, convert::TryInto};
+	use std::{sync::Arc, borrow::Cow, convert::TryInto};
 	use sc_consensus_babe::{CompatibleDigestItem, BabeIntermediate, INTERMEDIATE_KEY};
 	use sc_consensus_epochs::descendent_query;
 	use sp_consensus::{
@@ -648,14 +648,14 @@ mod tests {
 						&(slot * SLOT_DURATION),
 					);
 
-					let epoch_descriptor = babe_link.epoch_changes().lock().epoch_descriptor_for_child_of(
+					let epoch_descriptor = babe_link.epoch_changes().shared_data().epoch_descriptor_for_child_of(
 						descendent_query(&*service.client()),
 						&parent_hash,
 						parent_number,
 						slot.into(),
 					).unwrap().unwrap();
 
-					let epoch = babe_link.epoch_changes().lock().epoch_data(
+					let epoch = babe_link.epoch_changes().shared_data().epoch_data(
 						&epoch_descriptor,
 						|slot| sc_consensus_babe::Epoch::genesis(&babe_link.config(), slot),
 					).unwrap();
@@ -703,11 +703,11 @@ mod tests {
 				params.body = Some(new_body);
 				params.intermediates.insert(
 					Cow::from(INTERMEDIATE_KEY),
-					Box::new(BabeIntermediate::<Block> { epoch_descriptor }) as Box<dyn Any>,
+					Box::new(BabeIntermediate::<Block> { epoch_descriptor }) as Box<_>,
 				);
 				params.fork_choice = Some(ForkChoiceStrategy::LongestChain);
 
-				block_import.import_block(params, Default::default())
+				futures::executor::block_on(block_import.import_block(params, Default::default()))
 					.expect("error importing test block");
 			},
 			|service, _| {
diff --git a/bin/node/executor/Cargo.toml b/bin/node/executor/Cargo.toml
index fb7fc9191141..54a44d59c259 100644
--- a/bin/node/executor/Cargo.toml
+++ b/bin/node/executor/Cargo.toml
@@ -44,6 +44,7 @@ sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
 sp-externalities = { version = "0.9.0", path = "../../../primitives/externalities" }
 substrate-test-client = { version = "2.0.0", path = "../../../test-utils/client" }
 wat = "1.0"
+futures = "0.3.9"
 
 [features]
 wasmtime = [
diff --git a/bin/node/executor/tests/basic.rs b/bin/node/executor/tests/basic.rs
index 5f20c502e495..fe3ae5f14cc3 100644
--- a/bin/node/executor/tests/basic.rs
+++ b/bin/node/executor/tests/basic.rs
@@ -841,5 +841,5 @@ fn should_import_block_with_test_client() {
 	let block_data = block1.0;
 	let block = node_primitives::Block::decode(&mut &block_data[..]).unwrap();
 
-	client.import(BlockOrigin::Own, block).unwrap();
+	futures::executor::block_on(client.import(BlockOrigin::Own, block)).unwrap();
 }
diff --git a/bin/node/testing/src/bench.rs b/bin/node/testing/src/bench.rs
index cc6d7587dd51..edb99c617771 100644
--- a/bin/node/testing/src/bench.rs
+++ b/bin/node/testing/src/bench.rs
@@ -691,7 +691,7 @@ impl BenchContext {
 		assert_eq!(self.client.chain_info().best_number, 0);
 
 		assert_eq!(
-			self.client.import_block(import_params, Default::default())
+			futures::executor::block_on(self.client.import_block(import_params, Default::default()))
 				.expect("Failed to import block"),
 			ImportResult::Imported(
 				ImportedAux {
diff --git a/client/basic-authorship/src/basic_authorship.rs b/client/basic-authorship/src/basic_authorship.rs
index 93ee4fc1445d..910abfad5ae1 100644
--- a/client/basic-authorship/src/basic_authorship.rs
+++ b/client/basic-authorship/src/basic_authorship.rs
@@ -420,6 +420,7 @@ mod tests {
 	use sp_blockchain::HeaderBackend;
 	use sp_runtime::traits::NumberFor;
 	use sc_client_api::Backend;
+	use futures::executor::block_on;
 
 	const SOURCE: TransactionSource = TransactionSource::External;
 
@@ -454,11 +455,11 @@ mod tests {
 			client.clone(),
 		);
 
-		futures::executor::block_on(
+		block_on(
 			txpool.submit_at(&BlockId::number(0), SOURCE, vec![extrinsic(0), extrinsic(1)])
 		).unwrap();
 
-		futures::executor::block_on(
+		block_on(
 			txpool.maintain(chain_event(
 				client.header(&BlockId::Number(0u64))
 					.expect("header get error")
@@ -492,7 +493,7 @@ mod tests {
 
 		// when
 		let deadline = time::Duration::from_secs(3);
-		let block = futures::executor::block_on(
+		let block = block_on(
 			proposer.propose(Default::default(), Default::default(), deadline)
 		).map(|r| r.block).unwrap();
 
@@ -538,7 +539,7 @@ mod tests {
 		);
 
 		let deadline = time::Duration::from_secs(1);
-		futures::executor::block_on(
+		block_on(
 			proposer.propose(Default::default(), Default::default(), deadline)
 		).map(|r| r.block).unwrap();
 	}
@@ -559,11 +560,11 @@ mod tests {
 		let genesis_hash = client.info().best_hash;
 		let block_id = BlockId::Hash(genesis_hash);
 
-		futures::executor::block_on(
+		block_on(
 			txpool.submit_at(&BlockId::number(0), SOURCE, vec![extrinsic(0)]),
 		).unwrap();
 
-		futures::executor::block_on(
+		block_on(
 			txpool.maintain(chain_event(
 				client.header(&BlockId::Number(0u64))
 					.expect("header get error")
@@ -585,7 +586,7 @@ mod tests {
 		);
 
 		let deadline = time::Duration::from_secs(9);
-		let proposal = futures::executor::block_on(
+		let proposal = block_on(
 			proposer.propose(Default::default(), Default::default(), deadline),
 		).unwrap();
 
@@ -625,7 +626,7 @@ mod tests {
 			client.clone(),
 		);
 
-		futures::executor::block_on(
+		block_on(
 			txpool.submit_at(&BlockId::number(0), SOURCE, vec![
 				extrinsic(0),
 				extrinsic(1),
@@ -667,7 +668,7 @@ mod tests {
 
 			// when
 			let deadline = time::Duration::from_secs(9);
-			let block = futures::executor::block_on(
+			let block = block_on(
 				proposer.propose(Default::default(), Default::default(), deadline)
 			).map(|r| r.block).unwrap();
 
@@ -679,7 +680,7 @@ mod tests {
 			block
 		};
 
-		futures::executor::block_on(
+		block_on(
 			txpool.maintain(chain_event(
 				client.header(&BlockId::Number(0u64))
 					.expect("header get error")
@@ -689,9 +690,9 @@ mod tests {
 
 		// let's create one block and import it
 		let block = propose_block(&client, 0, 2, 7);
-		client.import(BlockOrigin::Own, block).unwrap();
+		block_on(client.import(BlockOrigin::Own, block)).unwrap();
 
-		futures::executor::block_on(
+		block_on(
 			txpool.maintain(chain_event(
 				client.header(&BlockId::Number(1))
 					.expect("header get error")
@@ -701,6 +702,6 @@ mod tests {
 
 		// now let's make sure that we can still make some progress
 		let block = propose_block(&client, 1, 2, 5);
-		client.import(BlockOrigin::Own, block).unwrap();
+		block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	}
 }
diff --git a/client/consensus/aura/Cargo.toml b/client/consensus/aura/Cargo.toml
index 1465119c81d0..b2301fa9c5de 100644
--- a/client/consensus/aura/Cargo.toml
+++ b/client/consensus/aura/Cargo.toml
@@ -26,7 +26,6 @@ futures = "0.3.9"
 futures-timer = "3.0.1"
 sp-inherents = { version = "3.0.0", path = "../../../primitives/inherents" }
 log = "0.4.8"
-parking_lot = "0.11.1"
 sp-core = { version = "3.0.0", path = "../../../primitives/core" }
 sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
 sp-io = { version = "3.0.0", path = "../../../primitives/io" }
@@ -38,6 +37,7 @@ sp-timestamp = { version = "3.0.0", path = "../../../primitives/timestamp" }
 sp-keystore = { version = "0.9.0", path = "../../../primitives/keystore" }
 sc-telemetry = { version = "3.0.0", path = "../../telemetry" }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0"}
+async-trait = "0.1.42"
 # We enable it only for web-wasm check
 # See https://docs.rs/getrandom/0.2.1/getrandom/#webassembly-support
 getrandom = { version = "0.2", features = ["js"], optional = true }
@@ -52,3 +52,4 @@ sc-network-test = { version = "0.8.0", path = "../../network/test" }
 sc-service = { version = "0.9.0", default-features = false, path = "../../service" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
 tempfile = "3.1.0"
+parking_lot = "0.11.1"
diff --git a/client/consensus/aura/src/import_queue.rs b/client/consensus/aura/src/import_queue.rs
index a0d08202da2f..736c89aff6b0 100644
--- a/client/consensus/aura/src/import_queue.rs
+++ b/client/consensus/aura/src/import_queue.rs
@@ -220,6 +220,7 @@ impl<C, P, CAW> AuraVerifier<C, P, CAW> where
 	}
 }
 
+#[async_trait::async_trait]
 impl<B: BlockT, C, P, CAW> Verifier<B> for AuraVerifier<C, P, CAW> where
 	C: ProvideRuntimeApi<B> +
 		Send +
@@ -234,7 +235,7 @@ impl<B: BlockT, C, P, CAW> Verifier<B> for AuraVerifier<C, P, CAW> where
 	P::Signature: Encode + Decode,
 	CAW: CanAuthorWith<B> + Send + Sync + 'static,
 {
-	fn verify(
+	async fn verify(
 		&mut self,
 		origin: BlockOrigin,
 		header: B::Header,
@@ -405,6 +406,7 @@ impl<Block: BlockT, C, I: BlockImport<Block>, P> AuraBlockImport<Block, C, I, P>
 	}
 }
 
+#[async_trait::async_trait]
 impl<Block: BlockT, C, I, P> BlockImport<Block> for AuraBlockImport<Block, C, I, P> where
 	I: BlockImport<Block, Transaction = sp_api::TransactionFor<C, Block>> + Send + Sync,
 	I::Error: Into<ConsensusError>,
@@ -412,18 +414,19 @@ impl<Block: BlockT, C, I, P> BlockImport<Block> for AuraBlockImport<Block, C, I,
 	P: Pair + Send + Sync + 'static,
 	P::Public: Clone + Eq + Send + Sync + Hash + Debug + Encode + Decode,
 	P::Signature: Encode + Decode,
+	sp_api::TransactionFor<C, Block>: Send + 'static,
 {
 	type Error = ConsensusError;
 	type Transaction = sp_api::TransactionFor<C, Block>;
 
-	fn check_block(
+	async fn check_block(
 		&mut self,
 		block: BlockCheckParams<Block>,
 	) -> Result<ImportResult, Self::Error> {
-		self.inner.check_block(block).map_err(Into::into)
+		self.inner.check_block(block).await.map_err(Into::into)
 	}
 
-	fn import_block(
+	async fn import_block(
 		&mut self,
 		block: BlockImportParams<Block, Self::Transaction>,
 		new_cache: HashMap<CacheKeyId, Vec<u8>>,
@@ -453,7 +456,7 @@ impl<Block: BlockT, C, I, P> BlockImport<Block> for AuraBlockImport<Block, C, I,
 			);
 		}
 
-		self.inner.import_block(block, new_cache).map_err(Into::into)
+		self.inner.import_block(block, new_cache).await.map_err(Into::into)
 	}
 }
 
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index cc60406d1664..77dac0f75448 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -580,6 +580,7 @@ mod tests {
 	use super::*;
 	use sp_consensus::{
 		NoNetwork as DummyOracle, Proposal, AlwaysCanAuthor, DisableProofRecording,
+		import_queue::BoxJustificationImport,
 	};
 	use sc_network_test::{Block as TestBlock, *};
 	use sp_runtime::traits::{Block as BlockT, DigestFor};
@@ -641,13 +642,17 @@ mod tests {
 
 	const SLOT_DURATION: u64 = 1000;
 
+	type AuraVerifier = import_queue::AuraVerifier<PeersFullClient, AuthorityPair, AlwaysCanAuthor>;
+	type AuraPeer = Peer<(), PeersClient>;
+
 	pub struct AuraTestNet {
-		peers: Vec<Peer<()>>,
+		peers: Vec<AuraPeer>,
 	}
 
 	impl TestNetFactory for AuraTestNet {
-		type Verifier = import_queue::AuraVerifier<PeersFullClient, AuthorityPair, AlwaysCanAuthor>;
+		type Verifier = AuraVerifier;
 		type PeerData = ();
+		type BlockImport = PeersClient;
 
 		/// Create new test network with peers and given config.
 		fn from_config(_config: &ProtocolConfig) -> Self {
@@ -681,14 +686,22 @@ mod tests {
 			}
 		}
 
-		fn peer(&mut self, i: usize) -> &mut Peer<Self::PeerData> {
+		fn make_block_import(&self, client: PeersClient) -> (
+			BlockImportAdapter<Self::BlockImport>,
+			Option<BoxJustificationImport<Block>>,
+			Self::PeerData,
+		) {
+			(client.as_block_import(), None, ())
+		}
+
+		fn peer(&mut self, i: usize) -> &mut AuraPeer {
 			&mut self.peers[i]
 		}
 
-		fn peers(&self) -> &Vec<Peer<Self::PeerData>> {
+		fn peers(&self) -> &Vec<AuraPeer> {
 			&self.peers
 		}
-		fn mut_peers<F: FnOnce(&mut Vec<Peer<Self::PeerData>>)>(&mut self, closure: F) {
+		fn mut_peers<F: FnOnce(&mut Vec<AuraPeer>)>(&mut self, closure: F) {
 			closure(&mut self.peers);
 		}
 	}
diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml
index cd989650671d..b04caeb3ee9d 100644
--- a/client/consensus/babe/Cargo.toml
+++ b/client/consensus/babe/Cargo.toml
@@ -53,6 +53,7 @@ merlin = "2.0"
 pdqselect = "0.1.0"
 derive_more = "0.99.2"
 retain_mut = "0.1.2"
+async-trait = "0.1.42"
 
 [dev-dependencies]
 sp-keyring = { version = "3.0.0", path = "../../../primitives/keyring" }
diff --git a/client/consensus/babe/rpc/src/lib.rs b/client/consensus/babe/rpc/src/lib.rs
index ca14a764eece..6696a65040a5 100644
--- a/client/consensus/babe/rpc/src/lib.rs
+++ b/client/consensus/babe/rpc/src/lib.rs
@@ -217,7 +217,7 @@ fn epoch_data<B, C, SC>(
 		SC: SelectChain<B>,
 {
 	let parent = select_chain.best_chain()?;
-	epoch_changes.lock().epoch_data_for_child_of(
+	epoch_changes.shared_data().epoch_data_for_child_of(
 		descendent_query(&**client),
 		&parent.hash(),
 		parent.number().clone(),
diff --git a/client/consensus/babe/src/aux_schema.rs b/client/consensus/babe/src/aux_schema.rs
index 7d5df77c9217..8b8804e3bfb0 100644
--- a/client/consensus/babe/src/aux_schema.rs
+++ b/client/consensus/babe/src/aux_schema.rs
@@ -18,8 +18,6 @@
 
 //! Schema for BABE epoch changes in the aux-db.
 
-use std::sync::Arc;
-use parking_lot::Mutex;
 use log::info;
 use codec::{Decode, Encode};
 
@@ -79,18 +77,19 @@ pub fn load_epoch_changes<Block: BlockT, B: AuxStore>(
 		},
 	};
 
-	let epoch_changes = Arc::new(Mutex::new(maybe_epoch_changes.unwrap_or_else(|| {
-		info!(target: "babe",
-			  "👶 Creating empty BABE epoch changes on what appears to be first startup."
+	let epoch_changes = SharedEpochChanges::<Block, Epoch>::new(maybe_epoch_changes.unwrap_or_else(|| {
+		info!(
+			target: "babe",
+			"👶 Creating empty BABE epoch changes on what appears to be first startup.",
 		);
 		EpochChangesFor::<Block, Epoch>::default()
-	})));
+	}));
 
 	// rebalance the tree after deserialization. this isn't strictly necessary
 	// since the tree is now rebalanced on every update operation. but since the
 	// tree wasn't rebalanced initially it's useful to temporarily leave it here
 	// to avoid having to wait until an import for rebalancing.
-	epoch_changes.lock().rebalance();
+	epoch_changes.shared_data().rebalance();
 
 	Ok(epoch_changes)
 }
@@ -189,7 +188,7 @@ mod test {
 		).unwrap();
 
 		assert!(
-			epoch_changes.lock()
+			epoch_changes.shared_data()
 				.tree()
 				.iter()
 				.map(|(_, _, epoch)| epoch.clone())
@@ -201,7 +200,7 @@ mod test {
 		); // PersistedEpochHeader does not implement Debug, so we use assert! directly.
 
 		write_epoch_changes::<TestBlock, _, _>(
-			&epoch_changes.lock(),
+			&epoch_changes.shared_data(),
 			|values| {
 				client.insert_aux(values, &[]).unwrap();
 			},
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index 8fd41aa98014..c3f1929c2ea8 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -76,8 +76,8 @@ pub use sp_consensus_babe::{
 pub use sp_consensus::SyncOracle;
 pub use sc_consensus_slots::SlotProportion;
 use std::{
-	collections::HashMap, sync::Arc, u64, pin::Pin, time::{Instant, Duration},
-	any::Any, borrow::Cow, convert::TryInto,
+	collections::HashMap, sync::Arc, u64, pin::Pin, borrow::Cow, convert::TryInto,
+	time::{Duration, Instant},
 };
 use sp_consensus::{ImportResult, CanAuthorWith, import_queue::BoxJustificationImport};
 use sp_core::crypto::Public;
@@ -502,7 +502,7 @@ async fn answer_requests<B: BlockT, C>(
 		match request {
 			BabeRequest::EpochForChild(parent_hash, parent_number, slot_number, response) => {
 				let lookup = || {
-					let epoch_changes =	epoch_changes.lock();
+					let epoch_changes = epoch_changes.shared_data();
 					let epoch_descriptor = epoch_changes.epoch_descriptor_for_child_of(
 						descendent_query(&*client),
 						&parent_hash,
@@ -656,7 +656,7 @@ where
 		parent: &B::Header,
 		slot: Slot,
 	) -> Result<Self::EpochData, ConsensusError> {
-		self.epoch_changes.lock().epoch_descriptor_for_child_of(
+		self.epoch_changes.shared_data().epoch_descriptor_for_child_of(
 			descendent_query(&*self.client),
 			&parent.hash(),
 			parent.number().clone(),
@@ -667,7 +667,8 @@ where
 	}
 
 	fn authorities_len(&self, epoch_descriptor: &Self::EpochData) -> Option<usize> {
-		self.epoch_changes.lock()
+		self.epoch_changes
+			.shared_data()
 			.viable_epoch(&epoch_descriptor, |slot| Epoch::genesis(&self.config, slot))
 			.map(|epoch| epoch.as_ref().authorities.len())
 	}
@@ -681,7 +682,7 @@ where
 		debug!(target: "babe", "Attempting to claim slot {}", slot);
 		let s = authorship::claim_slot(
 			slot,
-			self.epoch_changes.lock().viable_epoch(
+			self.epoch_changes.shared_data().viable_epoch(
 				&epoch_descriptor,
 				|slot| Epoch::genesis(&self.config, slot)
 			)?.as_ref(),
@@ -768,7 +769,7 @@ where
 			import_block.storage_changes = Some(storage_changes);
 			import_block.intermediates.insert(
 				Cow::from(INTERMEDIATE_KEY),
-				Box::new(BabeIntermediate::<B> { epoch_descriptor }) as Box<dyn Any>,
+				Box::new(BabeIntermediate::<B> { epoch_descriptor }) as Box<_>,
 			);
 
 			Ok(import_block)
@@ -1083,6 +1084,7 @@ where
 	}
 }
 
+#[async_trait::async_trait]
 impl<Block, Client, SelectChain, CAW> Verifier<Block>
 	for BabeVerifier<Block, Client, SelectChain, CAW>
 where
@@ -1093,7 +1095,7 @@ where
 	SelectChain: sp_consensus::SelectChain<Block>,
 	CAW: CanAuthorWith<Block> + Send + Sync,
 {
-	fn verify(
+	async fn verify(
 		&mut self,
 		origin: BlockOrigin,
 		header: Block::Header,
@@ -1125,7 +1127,7 @@ where
 			.map_err(Error::<Block>::FetchParentHeader)?;
 
 		let pre_digest = find_pre_digest::<Block>(&header)?;
-		let epoch_changes = self.epoch_changes.lock();
+		let epoch_changes = self.epoch_changes.shared_data();
 		let epoch_descriptor = epoch_changes.epoch_descriptor_for_child_of(
 			descendent_query(&*self.client),
 			&parent_hash,
@@ -1189,7 +1191,8 @@ where
 					self.telemetry;
 					CONSENSUS_TRACE;
 					"babe.checked_and_importing";
-					"pre_header" => ?pre_header);
+					"pre_header" => ?pre_header,
+				);
 
 				let mut import_block = BlockImportParams::new(origin, pre_header);
 				import_block.post_digests.push(verified_info.seal);
@@ -1197,7 +1200,7 @@ where
 				import_block.justifications = justifications;
 				import_block.intermediates.insert(
 					Cow::from(INTERMEDIATE_KEY),
-					Box::new(BabeIntermediate::<Block> { epoch_descriptor }) as Box<dyn Any>,
+					Box::new(BabeIntermediate::<Block> { epoch_descriptor }) as Box<_>,
 				);
 				import_block.post_hash = Some(hash);
 
@@ -1275,6 +1278,7 @@ impl<Block: BlockT, Client, I> BabeBlockImport<Block, Client, I> {
 	}
 }
 
+#[async_trait::async_trait]
 impl<Block, Client, Inner> BlockImport<Block> for BabeBlockImport<Block, Client, Inner> where
 	Block: BlockT,
 	Inner: BlockImport<Block, Transaction = sp_api::TransactionFor<Client, Block>> + Send + Sync,
@@ -1286,7 +1290,7 @@ impl<Block, Client, Inner> BlockImport<Block> for BabeBlockImport<Block, Client,
 	type Error = ConsensusError;
 	type Transaction = sp_api::TransactionFor<Client, Block>;
 
-	fn import_block(
+	async fn import_block(
 		&mut self,
 		mut block: BlockImportParams<Block, Self::Transaction>,
 		new_cache: HashMap<CacheKeyId, Vec<u8>>,
@@ -1328,202 +1332,209 @@ impl<Block, Client, Inner> BlockImport<Block> for BabeBlockImport<Block, Client,
 			);
 		}
 
-		let mut epoch_changes = self.epoch_changes.lock();
+		// if there's a pending epoch we'll save the previous epoch changes here
+		// this way we can revert it if there's any error
+		let mut old_epoch_changes = None;
 
-		// check if there's any epoch change expected to happen at this slot.
-		// `epoch` is the epoch to verify the block under, and `first_in_epoch` is true
-		// if this is the first block in its chain for that epoch.
-		//
-		// also provides the total weight of the chain, including the imported block.
-		let (epoch_descriptor, first_in_epoch, parent_weight) = {
-			let parent_weight = if *parent_header.number() == Zero::zero() {
-				0
-			} else {
-				aux_schema::load_block_weight(&*self.client, parent_hash)
-					.map_err(|e| ConsensusError::ClientImport(e.to_string()))?
+		// Use an extra scope to make the compiler happy, because otherwise he complains about the
+		// mutex, even if we dropped it...
+		let mut epoch_changes = {
+			let mut epoch_changes = self.epoch_changes.shared_data_locked();
+
+			// check if there's any epoch change expected to happen at this slot.
+			// `epoch` is the epoch to verify the block under, and `first_in_epoch` is true
+			// if this is the first block in its chain for that epoch.
+			//
+			// also provides the total weight of the chain, including the imported block.
+			let (epoch_descriptor, first_in_epoch, parent_weight) = {
+				let parent_weight = if *parent_header.number() == Zero::zero() {
+					0
+				} else {
+					aux_schema::load_block_weight(&*self.client, parent_hash)
+						.map_err(|e| ConsensusError::ClientImport(e.to_string()))?
 					.ok_or_else(|| ConsensusError::ClientImport(
 						babe_err(Error::<Block>::ParentBlockNoAssociatedWeight(hash)).into()
 					))?
-			};
+				};
 
-			let intermediate = block.take_intermediate::<BabeIntermediate<Block>>(
-				INTERMEDIATE_KEY
-			)?;
+				let intermediate = block.take_intermediate::<BabeIntermediate<Block>>(
+					INTERMEDIATE_KEY
+				)?;
 
-			let epoch_descriptor = intermediate.epoch_descriptor;
-			let first_in_epoch = parent_slot < epoch_descriptor.start_slot();
-			(epoch_descriptor, first_in_epoch, parent_weight)
-		};
+				let epoch_descriptor = intermediate.epoch_descriptor;
+				let first_in_epoch = parent_slot < epoch_descriptor.start_slot();
+				(epoch_descriptor, first_in_epoch, parent_weight)
+			};
 
-		let total_weight = parent_weight + pre_digest.added_weight();
-
-		// search for this all the time so we can reject unexpected announcements.
-		let next_epoch_digest = find_next_epoch_digest::<Block>(&block.header)
-			.map_err(|e| ConsensusError::ClientImport(e.to_string()))?;
-		let next_config_digest = find_next_config_digest::<Block>(&block.header)
-			.map_err(|e| ConsensusError::ClientImport(e.to_string()))?;
-
-		match (first_in_epoch, next_epoch_digest.is_some(), next_config_digest.is_some()) {
-			(true, true, _) => {},
-			(false, false, false) => {},
-			(false, false, true) => {
-				return Err(
-					ConsensusError::ClientImport(
-						babe_err(Error::<Block>::UnexpectedConfigChange).into(),
+			let total_weight = parent_weight + pre_digest.added_weight();
+
+			// search for this all the time so we can reject unexpected announcements.
+			let next_epoch_digest = find_next_epoch_digest::<Block>(&block.header)
+				.map_err(|e| ConsensusError::ClientImport(e.to_string()))?;
+			let next_config_digest = find_next_config_digest::<Block>(&block.header)
+				.map_err(|e| ConsensusError::ClientImport(e.to_string()))?;
+
+			match (first_in_epoch, next_epoch_digest.is_some(), next_config_digest.is_some()) {
+				(true, true, _) => {},
+				(false, false, false) => {},
+				(false, false, true) => {
+					return Err(
+						ConsensusError::ClientImport(
+							babe_err(Error::<Block>::UnexpectedConfigChange).into(),
+						)
 					)
-				)
-			},
-			(true, false, _) => {
-				return Err(
-					ConsensusError::ClientImport(
-						babe_err(Error::<Block>::ExpectedEpochChange(hash, slot)).into(),
+				},
+				(true, false, _) => {
+					return Err(
+						ConsensusError::ClientImport(
+							babe_err(Error::<Block>::ExpectedEpochChange(hash, slot)).into(),
+						)
 					)
-				)
-			},
-			(false, true, _) => {
-				return Err(
-					ConsensusError::ClientImport(
-						babe_err(Error::<Block>::UnexpectedEpochChange).into(),
+				},
+				(false, true, _) => {
+					return Err(
+						ConsensusError::ClientImport(
+							babe_err(Error::<Block>::UnexpectedEpochChange).into(),
+						)
 					)
-				)
-			},
-		}
+				},
+			}
 
-		// if there's a pending epoch we'll save the previous epoch changes here
-		// this way we can revert it if there's any error
-		let mut old_epoch_changes = None;
+			let info = self.client.info();
 
-		let info = self.client.info();
+			if let Some(next_epoch_descriptor) = next_epoch_digest {
+				old_epoch_changes = Some((*epoch_changes).clone());
 
-		if let Some(next_epoch_descriptor) = next_epoch_digest {
-			old_epoch_changes = Some(epoch_changes.clone());
+				let viable_epoch = epoch_changes.viable_epoch(
+					&epoch_descriptor,
+					|slot| Epoch::genesis(&self.config, slot)
+				).ok_or_else(|| {
+					ConsensusError::ClientImport(Error::<Block>::FetchEpoch(parent_hash).into())
+				})?;
 
-			let viable_epoch = epoch_changes.viable_epoch(
-				&epoch_descriptor,
-				|slot| Epoch::genesis(&self.config, slot)
-			).ok_or_else(|| {
-				ConsensusError::ClientImport(Error::<Block>::FetchEpoch(parent_hash).into())
-			})?;
+				let epoch_config = next_config_digest.map(Into::into).unwrap_or_else(
+					|| viable_epoch.as_ref().config.clone()
+				);
 
-			let epoch_config = next_config_digest.map(Into::into).unwrap_or_else(
-				|| viable_epoch.as_ref().config.clone()
-			);
+				// restrict info logging during initial sync to avoid spam
+				let log_level = if block.origin == BlockOrigin::NetworkInitialSync {
+					log::Level::Debug
+				} else {
+					log::Level::Info
+				};
 
-			// restrict info logging during initial sync to avoid spam
-			let log_level = if block.origin == BlockOrigin::NetworkInitialSync {
-				log::Level::Debug
-			} else {
-				log::Level::Info
-			};
+				log!(target: "babe",
+					 log_level,
+					 "👶 New epoch {} launching at block {} (block slot {} >= start slot {}).",
+					 viable_epoch.as_ref().epoch_index,
+					 hash,
+					 slot,
+					 viable_epoch.as_ref().start_slot,
+				);
 
-			log!(target: "babe",
-				log_level,
-				"👶 New epoch {} launching at block {} (block slot {} >= start slot {}).",
-				viable_epoch.as_ref().epoch_index,
-				hash,
-				slot,
-				viable_epoch.as_ref().start_slot,
-			);
+				let next_epoch = viable_epoch.increment((next_epoch_descriptor, epoch_config));
 
-			let next_epoch = viable_epoch.increment((next_epoch_descriptor, epoch_config));
+				log!(target: "babe",
+					 log_level,
+					 "👶 Next epoch starts at slot {}",
+					 next_epoch.as_ref().start_slot,
+				);
 
-			log!(target: "babe",
-				log_level,
-				"👶 Next epoch starts at slot {}",
-				next_epoch.as_ref().start_slot,
-			);
+				// prune the tree of epochs not part of the finalized chain or
+				// that are not live anymore, and then track the given epoch change
+				// in the tree.
+				// NOTE: it is important that these operations are done in this
+				// order, otherwise if pruning after import the `is_descendent_of`
+				// used by pruning may not know about the block that is being
+				// imported.
+				let prune_and_import = || {
+					prune_finalized(
+						self.client.clone(),
+						&mut epoch_changes,
+					)?;
 
-			// prune the tree of epochs not part of the finalized chain or
-			// that are not live anymore, and then track the given epoch change
-			// in the tree.
-			// NOTE: it is important that these operations are done in this
-			// order, otherwise if pruning after import the `is_descendent_of`
-			// used by pruning may not know about the block that is being
-			// imported.
-			let prune_and_import = || {
-				prune_finalized(
-					self.client.clone(),
-					&mut epoch_changes,
-				)?;
+					epoch_changes.import(
+						descendent_query(&*self.client),
+						hash,
+						number,
+						*block.header.parent_hash(),
+						next_epoch,
+					).map_err(|e| ConsensusError::ClientImport(format!("{:?}", e)))?;
 
-				epoch_changes.import(
-					descendent_query(&*self.client),
-					hash,
-					number,
-					*block.header.parent_hash(),
-					next_epoch,
-				).map_err(|e| ConsensusError::ClientImport(format!("{:?}", e)))?;
+					Ok(())
+				};
 
-				Ok(())
-			};
+				if let Err(e) = prune_and_import() {
+					debug!(target: "babe", "Failed to launch next epoch: {:?}", e);
+					*epoch_changes = old_epoch_changes.expect("set `Some` above and not taken; qed");
+					return Err(e);
+				}
 
-			if let Err(e) = prune_and_import() {
-				debug!(target: "babe", "Failed to launch next epoch: {:?}", e);
-				*epoch_changes = old_epoch_changes.expect("set `Some` above and not taken; qed");
-				return Err(e);
+				crate::aux_schema::write_epoch_changes::<Block, _, _>(
+					&*epoch_changes,
+					|insert| block.auxiliary.extend(
+						insert.iter().map(|(k, v)| (k.to_vec(), Some(v.to_vec())))
+					)
+				);
 			}
 
-			crate::aux_schema::write_epoch_changes::<Block, _, _>(
-				&*epoch_changes,
-				|insert| block.auxiliary.extend(
-					insert.iter().map(|(k, v)| (k.to_vec(), Some(v.to_vec())))
-				)
+			aux_schema::write_block_weight(
+				hash,
+				total_weight,
+				|values| block.auxiliary.extend(
+					values.iter().map(|(k, v)| (k.to_vec(), Some(v.to_vec())))
+				),
 			);
-		}
-
-		aux_schema::write_block_weight(
-			hash,
-			total_weight,
-			|values| block.auxiliary.extend(
-				values.iter().map(|(k, v)| (k.to_vec(), Some(v.to_vec())))
-			),
-		);
 
-		// The fork choice rule is that we pick the heaviest chain (i.e.
-		// more primary blocks), if there's a tie we go with the longest
-		// chain.
-		block.fork_choice = {
-			let (last_best, last_best_number) = (info.best_hash, info.best_number);
-
-			let last_best_weight = if &last_best == block.header.parent_hash() {
-				// the parent=genesis case is already covered for loading parent weight,
-				// so we don't need to cover again here.
-				parent_weight
-			} else {
-				aux_schema::load_block_weight(&*self.client, last_best)
-					.map_err(|e| ConsensusError::ChainLookup(format!("{:?}", e)))?
+			// The fork choice rule is that we pick the heaviest chain (i.e.
+			// more primary blocks), if there's a tie we go with the longest
+			// chain.
+			block.fork_choice = {
+				let (last_best, last_best_number) = (info.best_hash, info.best_number);
+
+				let last_best_weight = if &last_best == block.header.parent_hash() {
+					// the parent=genesis case is already covered for loading parent weight,
+					// so we don't need to cover again here.
+					parent_weight
+				} else {
+					aux_schema::load_block_weight(&*self.client, last_best)
+						.map_err(|e| ConsensusError::ChainLookup(format!("{:?}", e)))?
 					.ok_or_else(
 						|| ConsensusError::ChainLookup("No block weight for parent header.".to_string())
 					)?
+				};
+
+				Some(ForkChoiceStrategy::Custom(if total_weight > last_best_weight {
+					true
+				} else if total_weight == last_best_weight {
+					number > last_best_number
+				} else {
+					false
+				}))
 			};
 
-			Some(ForkChoiceStrategy::Custom(if total_weight > last_best_weight {
-				true
-			} else if total_weight == last_best_weight {
-				number > last_best_number
-			} else {
-				false
-			}))
+			// Release the mutex, but it stays locked
+			epoch_changes.release_mutex()
 		};
 
-		let import_result = self.inner.import_block(block, new_cache);
+		let import_result = self.inner.import_block(block, new_cache).await;
 
 		// revert to the original epoch changes in case there's an error
 		// importing the block
 		if import_result.is_err() {
 			if let Some(old_epoch_changes) = old_epoch_changes {
-				*epoch_changes = old_epoch_changes;
+				*epoch_changes.upgrade() = old_epoch_changes;
 			}
 		}
 
 		import_result.map_err(Into::into)
 	}
 
-	fn check_block(
+	async fn check_block(
 		&mut self,
 		block: BlockCheckParams<Block>,
 	) -> Result<ImportResult, Self::Error> {
-		self.inner.check_block(block).map_err(Into::into)
+		self.inner.check_block(block).await.map_err(Into::into)
 	}
 }
 
@@ -1583,7 +1594,7 @@ pub fn block_import<Client, Block: BlockT, I>(
 	// startup rather than waiting until importing the next epoch change block.
 	prune_finalized(
 		client.clone(),
-		&mut epoch_changes.lock(),
+		&mut epoch_changes.shared_data(),
 	)?;
 
 	let import = BabeBlockImport::new(
diff --git a/client/consensus/babe/src/tests.rs b/client/consensus/babe/src/tests.rs
index 70b4cd7b0b61..839d38b94a93 100644
--- a/client/consensus/babe/src/tests.rs
+++ b/client/consensus/babe/src/tests.rs
@@ -47,6 +47,7 @@ use rand_chacha::{
 };
 use sc_keystore::LocalKeystore;
 use sp_application_crypto::key_types::BABE;
+use futures::executor::block_on;
 
 type Item = DigestItem<Hash>;
 
@@ -67,6 +68,9 @@ enum Stage {
 
 type Mutator = Arc<dyn Fn(&mut TestHeader, Stage) + Send + Sync>;
 
+type BabeBlockImport =
+	PanickingBlockImport<crate::BabeBlockImport<TestBlock, TestClient, Arc<TestClient>>>;
+
 #[derive(Clone)]
 struct DummyFactory {
 	client: Arc<TestClient>,
@@ -134,7 +138,7 @@ impl DummyProposer {
 
 		// figure out if we should add a consensus digest, since the test runtime
 		// doesn't.
-		let epoch_changes = self.factory.epoch_changes.lock();
+		let epoch_changes = self.factory.epoch_changes.shared_data();
 		let epoch = epoch_changes.epoch_data_for_child_of(
 			descendent_query(&*self.factory.client),
 			&self.parent_hash,
@@ -188,30 +192,37 @@ thread_local! {
 }
 
 #[derive(Clone)]
-struct PanickingBlockImport<B>(B);
-
-impl<B: BlockImport<TestBlock>> BlockImport<TestBlock> for PanickingBlockImport<B> {
+pub struct PanickingBlockImport<B>(B);
+
+#[async_trait::async_trait]
+impl<B: BlockImport<TestBlock>> BlockImport<TestBlock> for PanickingBlockImport<B>
+	where
+		B::Transaction: Send,
+		B: Send,
+{
 	type Error = B::Error;
 	type Transaction = B::Transaction;
 
-	fn import_block(
+	async fn import_block(
 		&mut self,
 		block: BlockImportParams<TestBlock, Self::Transaction>,
 		new_cache: HashMap<CacheKeyId, Vec<u8>>,
 	) -> Result<ImportResult, Self::Error> {
-		Ok(self.0.import_block(block, new_cache).expect("importing block failed"))
+		Ok(self.0.import_block(block, new_cache).await.expect("importing block failed"))
 	}
 
-	fn check_block(
+	async fn check_block(
 		&mut self,
 		block: BlockCheckParams<TestBlock>,
 	) -> Result<ImportResult, Self::Error> {
-		Ok(self.0.check_block(block).expect("checking block failed"))
+		Ok(self.0.check_block(block).await.expect("checking block failed"))
 	}
 }
 
+type BabePeer = Peer<Option<PeerData>, BabeBlockImport>;
+
 pub struct BabeTestNet {
-	peers: Vec<Peer<Option<PeerData>>>,
+	peers: Vec<BabePeer>,
 }
 
 type TestHeader = <TestBlock as BlockT>::Header;
@@ -227,11 +238,12 @@ pub struct TestVerifier {
 	mutator: Mutator,
 }
 
+#[async_trait::async_trait]
 impl Verifier<TestBlock> for TestVerifier {
 	/// Verify the given data and return the BlockImportParams and an optional
 	/// new set of validators to import. If not, err with an Error-Message
 	/// presented to the User in the logs.
-	fn verify(
+	async fn verify(
 		&mut self,
 		origin: BlockOrigin,
 		mut header: TestHeader,
@@ -240,7 +252,7 @@ impl Verifier<TestBlock> for TestVerifier {
 	) -> Result<(BlockImportParams<TestBlock, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String> {
 		// apply post-sealing mutations (i.e. stripping seal, if desired).
 		(self.mutator)(&mut header, Stage::PostSeal);
-		self.inner.verify(origin, header, justifications, body)
+		self.inner.verify(dbg!(origin), header, justifications, body).await
 	}
 }
 
@@ -255,6 +267,7 @@ pub struct PeerData {
 impl TestNetFactory for BabeTestNet {
 	type Verifier = TestVerifier;
 	type PeerData = Option<PeerData>;
+	type BlockImport = BabeBlockImport;
 
 	/// Create new test network with peers and given config.
 	fn from_config(_config: &ProtocolConfig) -> Self {
@@ -264,9 +277,9 @@ impl TestNetFactory for BabeTestNet {
 		}
 	}
 
-	fn make_block_import<Transaction>(&self, client: PeersClient)
+	fn make_block_import(&self, client: PeersClient)
 		-> (
-			BlockImportAdapter<Transaction>,
+			BlockImportAdapter<Self::BlockImport>,
 			Option<BoxJustificationImport<Block>>,
 			Option<PeerData>,
 		)
@@ -287,7 +300,7 @@ impl TestNetFactory for BabeTestNet {
 			Some(Box::new(block_import.clone()) as BoxBlockImport<_, _>)
 		);
 		(
-			BlockImportAdapter::new_full(block_import),
+			BlockImportAdapter::new(block_import),
 			None,
 			Some(PeerData { link, inherent_data_providers, block_import: data_block_import }),
 		)
@@ -326,17 +339,17 @@ impl TestNetFactory for BabeTestNet {
 		}
 	}
 
-	fn peer(&mut self, i: usize) -> &mut Peer<Self::PeerData> {
+	fn peer(&mut self, i: usize) -> &mut BabePeer {
 		trace!(target: "babe", "Retrieving a peer");
 		&mut self.peers[i]
 	}
 
-	fn peers(&self) -> &Vec<Peer<Self::PeerData>> {
+	fn peers(&self) -> &Vec<BabePeer> {
 		trace!(target: "babe", "Retrieving peers");
 		&self.peers
 	}
 
-	fn mut_peers<F: FnOnce(&mut Vec<Peer<Self::PeerData>>)>(
+	fn mut_peers<F: FnOnce(&mut Vec<BabePeer>)>(
 		&mut self,
 		closure: F,
 	) {
@@ -436,7 +449,7 @@ fn run_one_test(
 			telemetry: None,
 		}).expect("Starts babe"));
 	}
-	futures::executor::block_on(future::select(
+	block_on(future::select(
 		futures::future::poll_fn(move |cx| {
 			let mut net = net.lock();
 			net.poll(cx);
@@ -567,7 +580,7 @@ fn can_author_block() {
 }
 
 // Propose and import a new BABE block on top of the given parent.
-fn propose_and_import_block<Transaction>(
+fn propose_and_import_block<Transaction: Send + 'static>(
 	parent: &TestHeader,
 	slot: Option<Slot>,
 	proposer_factory: &mut DummyFactory,
@@ -595,7 +608,7 @@ fn propose_and_import_block<Transaction>(
 
 	let mut block = futures::executor::block_on(proposer.propose_with(pre_digest)).unwrap().block;
 
-	let epoch_descriptor = proposer_factory.epoch_changes.lock().epoch_descriptor_for_child_of(
+	let epoch_descriptor = proposer_factory.epoch_changes.shared_data().epoch_descriptor_for_child_of(
 		descendent_query(&*proposer_factory.client),
 		&parent_hash,
 		*parent.number(),
@@ -623,10 +636,10 @@ fn propose_and_import_block<Transaction>(
 	import.body = Some(block.extrinsics);
 	import.intermediates.insert(
 		Cow::from(INTERMEDIATE_KEY),
-		Box::new(BabeIntermediate::<TestBlock> { epoch_descriptor }) as Box<dyn Any>,
+		Box::new(BabeIntermediate::<TestBlock> { epoch_descriptor }) as Box<_>,
 	);
 	import.fork_choice = Some(ForkChoiceStrategy::LongestChain);
-	let import_result = block_import.import_block(import, Default::default()).unwrap();
+	let import_result = block_on(block_import.import_block(import, Default::default())).unwrap();
 
 	match import_result {
 		ImportResult::Imported(_) => {},
@@ -664,7 +677,7 @@ fn importing_block_one_sets_genesis_epoch() {
 
 	let genesis_epoch = Epoch::genesis(&data.link.config, 999.into());
 
-	let epoch_changes = data.link.epoch_changes.lock();
+	let epoch_changes = data.link.epoch_changes.shared_data();
 	let epoch_for_second_block = epoch_changes.epoch_data_for_child_of(
 		descendent_query(&*client),
 		&block_hash,
@@ -739,13 +752,13 @@ fn importing_epoch_change_block_prunes_tree() {
 
 	// We should be tracking a total of 9 epochs in the fork tree
 	assert_eq!(
-		epoch_changes.lock().tree().iter().count(),
+		epoch_changes.shared_data().tree().iter().count(),
 		9,
 	);
 
 	// And only one root
 	assert_eq!(
-		epoch_changes.lock().tree().roots().count(),
+		epoch_changes.shared_data().tree().roots().count(),
 		1,
 	);
 
@@ -756,16 +769,16 @@ fn importing_epoch_change_block_prunes_tree() {
 
 	// at this point no hashes from the first fork must exist on the tree
 	assert!(
-		!epoch_changes.lock().tree().iter().map(|(h, _, _)| h).any(|h| fork_1.contains(h)),
+		!epoch_changes.shared_data().tree().iter().map(|(h, _, _)| h).any(|h| fork_1.contains(h)),
 	);
 
 	// but the epoch changes from the other forks must still exist
 	assert!(
-		epoch_changes.lock().tree().iter().map(|(h, _, _)| h).any(|h| fork_2.contains(h))
+		epoch_changes.shared_data().tree().iter().map(|(h, _, _)| h).any(|h| fork_2.contains(h))
 	);
 
 	assert!(
-		epoch_changes.lock().tree().iter().map(|(h, _, _)| h).any(|h| fork_3.contains(h)),
+		epoch_changes.shared_data().tree().iter().map(|(h, _, _)| h).any(|h| fork_3.contains(h)),
 	);
 
 	// finalizing block #25 from the canon chain should prune out the second fork
@@ -774,12 +787,12 @@ fn importing_epoch_change_block_prunes_tree() {
 
 	// at this point no hashes from the second fork must exist on the tree
 	assert!(
-		!epoch_changes.lock().tree().iter().map(|(h, _, _)| h).any(|h| fork_2.contains(h)),
+		!epoch_changes.shared_data().tree().iter().map(|(h, _, _)| h).any(|h| fork_2.contains(h)),
 	);
 
 	// while epoch changes from the last fork should still exist
 	assert!(
-		epoch_changes.lock().tree().iter().map(|(h, _, _)| h).any(|h| fork_3.contains(h)),
+		epoch_changes.shared_data().tree().iter().map(|(h, _, _)| h).any(|h| fork_3.contains(h)),
 	);
 }
 
diff --git a/client/consensus/common/Cargo.toml b/client/consensus/common/Cargo.toml
index 41c42866e727..5762b9c998b6 100644
--- a/client/consensus/common/Cargo.toml
+++ b/client/consensus/common/Cargo.toml
@@ -17,3 +17,4 @@ sc-client-api = { version = "3.0.0", path = "../../api" }
 sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
 sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
 sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
+parking_lot = "0.11.1"
diff --git a/client/consensus/common/src/lib.rs b/client/consensus/common/src/lib.rs
index a53517c5c35e..9b4d70576919 100644
--- a/client/consensus/common/src/lib.rs
+++ b/client/consensus/common/src/lib.rs
@@ -17,6 +17,8 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Collection of common consensus specific implementations
+
 mod longest_chain;
+pub mod shared_data;
 
 pub use longest_chain::LongestChain;
diff --git a/client/consensus/common/src/shared_data.rs b/client/consensus/common/src/shared_data.rs
new file mode 100644
index 000000000000..d90fc6273e05
--- /dev/null
+++ b/client/consensus/common/src/shared_data.rs
@@ -0,0 +1,271 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! Provides a generic wrapper around shared data. See [`SharedData`] for more information.
+
+use std::sync::Arc;
+use parking_lot::{Mutex, MappedMutexGuard, Condvar, MutexGuard};
+
+/// Created by [`SharedDataLocked::release_mutex`].
+///
+/// As long as the object isn't dropped, the shared data is locked. It is advised to drop this
+/// object when the shared data doesn't need to be locked anymore. To get access to the shared data
+/// [`Self::upgrade`] is provided.
+#[must_use = "Shared data will be unlocked on drop!"]
+pub struct SharedDataLockedUpgradable<T> {
+	shared_data: SharedData<T>,
+}
+
+impl<T> SharedDataLockedUpgradable<T> {
+	/// Upgrade to a *real* mutex guard that will give access to the inner data.
+	///
+	/// Every call to this function will reaquire the mutex again.
+	pub fn upgrade(&mut self) -> MappedMutexGuard<T> {
+		MutexGuard::map(self.shared_data.inner.lock(), |i| &mut i.shared_data)
+	}
+}
+
+impl<T> Drop for SharedDataLockedUpgradable<T> {
+	fn drop(&mut self) {
+		let mut inner = self.shared_data.inner.lock();
+		// It should not be locked anymore
+		inner.locked = false;
+
+		// Notify all waiting threads.
+		self.shared_data.cond_var.notify_all();
+	}
+}
+
+/// Created by [`SharedData::shared_data_locked`].
+///
+/// As long as this object isn't dropped, the shared data is held in a mutex guard and the shared
+/// data is tagged as locked. Access to the shared data is provided through [`Deref`] and
+/// [`DerefMut`]. The trick is to use [`Self::release_mutex`] to release the mutex, but still keep
+/// the shared data locked. This means every other thread trying to access the shared data in this
+/// time will need to wait until this lock is freed.
+///
+/// If this object is dropped without calling [`Self::release_mutex`], the lock will be dropped
+/// immediately.
+#[must_use = "Shared data will be unlocked on drop!"]
+pub struct SharedDataLocked<'a, T> {
+	/// The current active mutex guard holding the inner data.
+	inner: MutexGuard<'a, SharedDataInner<T>>,
+	/// The [`SharedData`] instance that created this instance.
+	///
+	/// This instance is only taken on drop or when calling [`Self::release_mutex`].
+	shared_data: Option<SharedData<T>>,
+}
+
+impl<'a, T> SharedDataLocked<'a, T> {
+	/// Release the mutex, but keep the shared data locked.
+	pub fn release_mutex(mut self) -> SharedDataLockedUpgradable<T> {
+		SharedDataLockedUpgradable {
+			shared_data: self.shared_data.take()
+				.expect("`shared_data` is only taken on drop; qed"),
+		}
+	}
+}
+
+impl<'a, T> Drop for SharedDataLocked<'a, T> {
+	fn drop(&mut self) {
+		if let Some(shared_data) = self.shared_data.take() {
+			// If the `shared_data` is still set, it means [`Self::release_mutex`] wasn't
+			// called and the lock should be released.
+			self.inner.locked = false;
+
+			// Notify all waiting threads about the released lock.
+			shared_data.cond_var.notify_all();
+		}
+	}
+}
+
+impl<'a, T> std::ops::Deref for SharedDataLocked<'a, T> {
+	type Target = T;
+
+	fn deref(&self) -> &Self::Target {
+		&self.inner.shared_data
+	}
+}
+
+impl<'a, T> std::ops::DerefMut for SharedDataLocked<'a, T> {
+	fn deref_mut(&mut self) -> &mut Self::Target {
+		&mut self.inner.shared_data
+	}
+}
+
+/// Holds the shared data and if the shared data is currently locked.
+///
+/// For more information see [`SharedData`].
+struct SharedDataInner<T> {
+	/// The actual shared data that is protected here against concurrent access.
+	shared_data: T,
+	/// Is `shared_data` currently locked and can not be accessed?
+	locked: bool,
+}
+
+/// Some shared data that provides support for locking this shared data for some time.
+///
+/// When working with consensus engines there is often data that needs to be shared between multiple
+/// parts of the system, like block production and block import. This struct provides an abstraction
+/// for this shared data in a generic way.
+///
+/// The pain point when sharing this data is often the usage of mutex guards in an async context as
+/// this doesn't work for most of them as these guards don't implement `Send`. This abstraction
+/// provides a way to lock the shared data, while not having the mutex locked. So, the data stays
+/// locked and we are still able to hold this lock over an `await` call.
+///
+/// # Example
+///
+/// ```
+///# use sc_consensus::shared_data::SharedData;
+///
+/// let shared_data = SharedData::new(String::from("hello world"));
+///
+/// let lock = shared_data.shared_data_locked();
+///
+/// let shared_data2 = shared_data.clone();
+/// let join_handle1 = std::thread::spawn(move || {
+///     // This will need to wait for the outer lock to be released before it can access the data.
+///     shared_data2.shared_data().push_str("1");
+/// });
+///
+/// assert_eq!(*lock, "hello world");
+///
+/// // Let us release the mutex, but we still keep it locked.
+/// // Now we could call `await` for example.
+/// let mut lock = lock.release_mutex();
+///
+/// let shared_data2 = shared_data.clone();
+/// let join_handle2 = std::thread::spawn(move || {
+///     shared_data2.shared_data().push_str("2");
+/// });
+///
+/// // We still have the lock and can upgrade it to access the data.
+/// assert_eq!(*lock.upgrade(), "hello world");
+/// lock.upgrade().push_str("3");
+///
+/// drop(lock);
+/// join_handle1.join().unwrap();
+/// join_handle2.join().unwrap();
+///
+/// let data = shared_data.shared_data();
+/// // As we don't know the order of the threads, we need to check for both combinations
+/// assert!(*data == "hello world321" || *data == "hello world312");
+/// ```
+pub struct SharedData<T> {
+	inner: Arc<Mutex<SharedDataInner<T>>>,
+	cond_var: Arc<Condvar>,
+}
+
+impl<T> Clone for SharedData<T> {
+	fn clone(&self) -> Self {
+		Self {
+			inner: self.inner.clone(),
+			cond_var: self.cond_var.clone(),
+		}
+	}
+}
+
+impl<T> SharedData<T> {
+	/// Create a new instance of [`SharedData`] to share the given `shared_data`.
+	pub fn new(shared_data: T) -> Self {
+		Self {
+			inner: Arc::new(Mutex::new(SharedDataInner { shared_data, locked: false })),
+			cond_var: Default::default(),
+		}
+	}
+
+	/// Acquire access to the shared data.
+	///
+	/// This will give mutable access to the shared data. After the returned mutex guard is dropped,
+	/// the shared data is accessible by other threads. So, this function should be used when
+	/// reading/writing of the shared data in a local context is required.
+	///
+	/// When requiring to lock shared data for some longer time, even with temporarily releasing the
+	/// lock, [`Self::shared_data_locked`] should be used.
+	pub fn shared_data(&self) -> MappedMutexGuard<T> {
+		let mut guard = self.inner.lock();
+
+		while guard.locked {
+			self.cond_var.wait(&mut guard);
+		}
+
+		debug_assert!(!guard.locked);
+
+		MutexGuard::map(guard, |i| &mut i.shared_data)
+	}
+
+	/// Acquire access to the shared data and lock it.
+	///
+	/// This will give mutable access to the shared data. The returned [`SharedDataLocked`]
+	/// provides the function [`SharedDataLocked::release_mutex`] to release the mutex, but
+	/// keeping the data locked. This is useful in async contexts for example where the data needs to
+	/// be locked, but a mutex guard can not be held.
+	///
+	/// For an example see [`SharedData`].
+	pub fn shared_data_locked(&self) -> SharedDataLocked<T> {
+		let mut guard = self.inner.lock();
+
+		while guard.locked {
+			self.cond_var.wait(&mut guard);
+		}
+
+		debug_assert!(!guard.locked);
+		guard.locked = true;
+
+		SharedDataLocked {
+			inner: guard,
+			shared_data: Some(self.clone()),
+		}
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+
+	#[test]
+	fn shared_data_locking_works() {
+		const THREADS: u32 = 100;
+		let shared_data = SharedData::new(0u32);
+
+		let lock = shared_data.shared_data_locked();
+
+		for i in 0..THREADS {
+			let data = shared_data.clone();
+			std::thread::spawn(move || {
+				if i % 2 == 1 {
+					*data.shared_data() += 1;
+				} else {
+					let mut lock = data.shared_data_locked().release_mutex();
+					// Give the other threads some time to wake up
+					std::thread::sleep(std::time::Duration::from_millis(10));
+					*lock.upgrade() += 1;
+				}
+			});
+		}
+
+		let lock = lock.release_mutex();
+		std::thread::sleep(std::time::Duration::from_millis(100));
+		drop(lock);
+
+		while *shared_data.shared_data() < THREADS {
+			std::thread::sleep(std::time::Duration::from_millis(100));
+		}
+	}
+}
diff --git a/client/consensus/epochs/Cargo.toml b/client/consensus/epochs/Cargo.toml
index bebe6979e694..8e2fe7710096 100644
--- a/client/consensus/epochs/Cargo.toml
+++ b/client/consensus/epochs/Cargo.toml
@@ -14,8 +14,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
-parking_lot = "0.11.1"
 fork-tree = { version = "3.0.0", path = "../../../utils/fork-tree" }
 sp-runtime = {  path = "../../../primitives/runtime" , version = "3.0.0"}
 sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
 sc-client-api = { path = "../../api" , version = "3.0.0"}
+sc-consensus = { path = "../common" , version = "0.9.0"}
diff --git a/client/consensus/epochs/src/lib.rs b/client/consensus/epochs/src/lib.rs
index 5c5ef446993a..98a3e8353051 100644
--- a/client/consensus/epochs/src/lib.rs
+++ b/client/consensus/epochs/src/lib.rs
@@ -20,8 +20,7 @@
 
 pub mod migration;
 
-use std::{sync::Arc, ops::Add, collections::BTreeMap, borrow::{Borrow, BorrowMut}};
-use parking_lot::Mutex;
+use std::{ops::Add, collections::BTreeMap, borrow::{Borrow, BorrowMut}};
 use codec::{Encode, Decode};
 use fork_tree::ForkTree;
 use sc_client_api::utils::is_descendent_of;
@@ -645,10 +644,12 @@ impl<Hash, Number, E: Epoch> EpochChanges<Hash, Number, E> where
 }
 
 /// Type alias to produce the epoch-changes tree from a block type.
-pub type EpochChangesFor<Block, Epoch> = EpochChanges<<Block as BlockT>::Hash, NumberFor<Block>, Epoch>;
+pub type EpochChangesFor<Block, Epoch> =
+	EpochChanges<<Block as BlockT>::Hash, NumberFor<Block>, Epoch>;
 
 /// A shared epoch changes tree.
-pub type SharedEpochChanges<Block, Epoch> = Arc<Mutex<EpochChangesFor<Block, Epoch>>>;
+pub type SharedEpochChanges<Block, Epoch> =
+	sc_consensus::shared_data::SharedData<EpochChangesFor<Block, Epoch>>;
 
 #[cfg(test)]
 mod tests {
diff --git a/client/consensus/manual-seal/Cargo.toml b/client/consensus/manual-seal/Cargo.toml
index 679fd5a3eb38..32cc89034fb1 100644
--- a/client/consensus/manual-seal/Cargo.toml
+++ b/client/consensus/manual-seal/Cargo.toml
@@ -23,6 +23,7 @@ parking_lot = "0.11.1"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 serde = { version = "1.0", features=["derive"] }
 assert_matches = "1.3.0"
+async-trait = "0.1.42"
 
 sc-client-api = { path = "../../api", version = "3.0.0"}
 sc-consensus-babe = { path = "../../consensus/babe", version = "0.9.0"}
diff --git a/client/consensus/manual-seal/src/consensus/babe.rs b/client/consensus/manual-seal/src/consensus/babe.rs
index a3f8a825e61d..d627ea2a25c3 100644
--- a/client/consensus/manual-seal/src/consensus/babe.rs
+++ b/client/consensus/manual-seal/src/consensus/babe.rs
@@ -21,12 +21,7 @@
 use super::ConsensusDataProvider;
 use crate::Error;
 use codec::Encode;
-use std::{
-	any::Any,
-	borrow::Cow,
-	sync::{Arc, atomic},
-	time::SystemTime,
-};
+use std::{borrow::Cow, sync::{Arc, atomic}, time::SystemTime};
 use sc_client_api::AuxStore;
 use sc_consensus_babe::{
 	Config, Epoch, authorship, CompatibleDigestItem, BabeIntermediate,
@@ -102,7 +97,7 @@ impl<B, C> BabeConsensusDataProvider<B, C>
 	}
 
 	fn epoch(&self, parent: &B::Header, slot: Slot) -> Result<Epoch, Error> {
-		let epoch_changes = self.epoch_changes.lock();
+		let epoch_changes = self.epoch_changes.shared_data();
 		let epoch_descriptor = epoch_changes
 			.epoch_descriptor_for_child_of(
 				descendent_query(&*self.client),
@@ -156,7 +151,7 @@ impl<B, C> ConsensusDataProvider<B> for BabeConsensusDataProvider<B, C>
 				authority_index: 0_u32,
 			});
 
-			let mut epoch_changes = self.epoch_changes.lock();
+			let mut epoch_changes = self.epoch_changes.shared_data();
 			let epoch_descriptor = epoch_changes
 				.epoch_descriptor_for_child_of(
 					descendent_query(&*self.client),
@@ -200,7 +195,7 @@ impl<B, C> ConsensusDataProvider<B> for BabeConsensusDataProvider<B, C>
 		inherents: &InherentData
 	) -> Result<(), Error> {
 		let slot = inherents.babe_inherent_data()?;
-		let epoch_changes = self.epoch_changes.lock();
+		let epoch_changes = self.epoch_changes.shared_data();
 		let mut epoch_descriptor = epoch_changes
 			.epoch_descriptor_for_child_of(
 				descendent_query(&*self.client),
@@ -239,7 +234,7 @@ impl<B, C> ConsensusDataProvider<B> for BabeConsensusDataProvider<B, C>
 
 		params.intermediates.insert(
 			Cow::from(INTERMEDIATE_KEY),
-			Box::new(BabeIntermediate::<B> { epoch_descriptor }) as Box<dyn Any>,
+			Box::new(BabeIntermediate::<B> { epoch_descriptor }) as Box<_>,
 		);
 
 		Ok(())
diff --git a/client/consensus/manual-seal/src/lib.rs b/client/consensus/manual-seal/src/lib.rs
index 870640c1f201..a5351c63bc3b 100644
--- a/client/consensus/manual-seal/src/lib.rs
+++ b/client/consensus/manual-seal/src/lib.rs
@@ -55,8 +55,9 @@ pub const MANUAL_SEAL_ENGINE_ID: ConsensusEngineId = [b'm', b'a', b'n', b'l'];
 /// The verifier for the manual seal engine; instantly finalizes.
 struct ManualSealVerifier;
 
+#[async_trait::async_trait]
 impl<B: BlockT> Verifier<B> for ManualSealVerifier {
-	fn verify(
+	async fn verify(
 		&mut self,
 		origin: BlockOrigin,
 		header: B::Header,
diff --git a/client/consensus/manual-seal/src/seal_block.rs b/client/consensus/manual-seal/src/seal_block.rs
index 2176973f3a29..23a560cebd54 100644
--- a/client/consensus/manual-seal/src/seal_block.rs
+++ b/client/consensus/manual-seal/src/seal_block.rs
@@ -144,7 +144,7 @@ pub async fn seal_block<B, BI, SC, C, E, P>(
 			digest_provider.append_block_import(&parent, &mut params, &id)?;
 		}
 
-		match block_import.import_block(params, HashMap::new())? {
+		match block_import.import_block(params, HashMap::new()).await? {
 			ImportResult::Imported(aux) => {
 				Ok(CreatedBlock { hash: <B as BlockT>::Header::hash(&header), aux })
 			},
diff --git a/client/consensus/pow/Cargo.toml b/client/consensus/pow/Cargo.toml
index 8be43a8fa04b..86b0b1df54e2 100644
--- a/client/consensus/pow/Cargo.toml
+++ b/client/consensus/pow/Cargo.toml
@@ -30,3 +30,4 @@ parking_lot = "0.11.1"
 sp-timestamp = { version = "3.0.0", path = "../../../primitives/timestamp" }
 derive_more = "0.99.2"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0"}
+async-trait = "0.1.42"
diff --git a/client/consensus/pow/src/lib.rs b/client/consensus/pow/src/lib.rs
index d1df2875a1cb..ea2e30afdc48 100644
--- a/client/consensus/pow/src/lib.rs
+++ b/client/consensus/pow/src/lib.rs
@@ -36,7 +36,7 @@ mod worker;
 pub use crate::worker::{MiningWorker, MiningMetadata, MiningBuild};
 
 use std::{
-	sync::Arc, any::Any, borrow::Cow, collections::HashMap, marker::PhantomData,
+	sync::Arc, borrow::Cow, collections::HashMap, marker::PhantomData,
 	cmp::Ordering, time::Duration,
 };
 use futures::{prelude::*, future::Either};
@@ -307,6 +307,7 @@ impl<B, I, C, S, Algorithm, CAW> PowBlockImport<B, I, C, S, Algorithm, CAW> wher
 	}
 }
 
+#[async_trait::async_trait]
 impl<B, I, C, S, Algorithm, CAW> BlockImport<B> for PowBlockImport<B, I, C, S, Algorithm, CAW> where
 	B: BlockT,
 	I: BlockImport<B, Transaction = sp_api::TransactionFor<C, B>> + Send + Sync,
@@ -314,21 +315,21 @@ impl<B, I, C, S, Algorithm, CAW> BlockImport<B> for PowBlockImport<B, I, C, S, A
 	S: SelectChain<B>,
 	C: ProvideRuntimeApi<B> + Send + Sync + HeaderBackend<B> + AuxStore + ProvideCache<B> + BlockOf,
 	C::Api: BlockBuilderApi<B>,
-	Algorithm: PowAlgorithm<B>,
-	Algorithm::Difficulty: 'static,
-	CAW: CanAuthorWith<B>,
+	Algorithm: PowAlgorithm<B> + Send,
+	Algorithm::Difficulty: 'static + Send,
+	CAW: CanAuthorWith<B> + Send,
 {
 	type Error = ConsensusError;
 	type Transaction = sp_api::TransactionFor<C, B>;
 
-	fn check_block(
+	async fn check_block(
 		&mut self,
 		block: BlockCheckParams<B>,
 	) -> Result<ImportResult, Self::Error> {
-		self.inner.check_block(block).map_err(Into::into)
+		self.inner.check_block(block).await.map_err(Into::into)
 	}
 
-	fn import_block(
+	async fn import_block(
 		&mut self,
 		mut block: BlockImportParams<B, Self::Transaction>,
 		new_cache: HashMap<CacheKeyId, Vec<u8>>,
@@ -403,7 +404,7 @@ impl<B, I, C, S, Algorithm, CAW> BlockImport<B> for PowBlockImport<B, I, C, S, A
 			));
 		}
 
-		self.inner.import_block(block, new_cache).map_err(Into::into)
+		self.inner.import_block(block, new_cache).await.map_err(Into::into)
 	}
 }
 
@@ -449,11 +450,12 @@ impl<B: BlockT, Algorithm> PowVerifier<B, Algorithm> {
 	}
 }
 
+#[async_trait::async_trait]
 impl<B: BlockT, Algorithm> Verifier<B> for PowVerifier<B, Algorithm> where
 	Algorithm: PowAlgorithm<B> + Send + Sync,
-	Algorithm::Difficulty: 'static,
+	Algorithm::Difficulty: 'static + Send,
 {
-	fn verify(
+	async fn verify(
 		&mut self,
 		origin: BlockOrigin,
 		header: B::Header,
@@ -473,7 +475,7 @@ impl<B: BlockT, Algorithm> Verifier<B> for PowVerifier<B, Algorithm> where
 		import_block.justifications = justifications;
 		import_block.intermediates.insert(
 			Cow::from(INTERMEDIATE_KEY),
-			Box::new(intermediate) as Box<dyn Any>
+			Box::new(intermediate) as Box<_>,
 		);
 		import_block.post_hash = Some(hash);
 
@@ -513,6 +515,7 @@ pub fn import_queue<B, Transaction, Algorithm>(
 	B: BlockT,
 	Transaction: Send + Sync + 'static,
 	Algorithm: PowAlgorithm<B> + Clone + Send + Sync + 'static,
+	Algorithm::Difficulty: Send,
 {
 	register_pow_inherent_data_provider(&inherent_data_providers)?;
 
@@ -556,7 +559,7 @@ pub fn start_mining_worker<Block, C, S, Algorithm, E, SO, CAW>(
 	C: ProvideRuntimeApi<Block> + BlockchainEvents<Block> + 'static,
 	S: SelectChain<Block> + 'static,
 	Algorithm: PowAlgorithm<Block> + Clone,
-	Algorithm::Difficulty: 'static,
+	Algorithm::Difficulty: Send + 'static,
 	E: Environment<Block> + Send + Sync + 'static,
 	E::Error: std::fmt::Debug,
 	E::Proposer: Proposer<Block, Transaction = sp_api::TransactionFor<C, Block>>,
diff --git a/client/consensus/pow/src/worker.rs b/client/consensus/pow/src/worker.rs
index d64596e48cf1..18844e51ce41 100644
--- a/client/consensus/pow/src/worker.rs
+++ b/client/consensus/pow/src/worker.rs
@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use std::{pin::Pin, time::Duration, collections::HashMap, any::Any, borrow::Cow};
+use std::{pin::Pin, time::Duration, collections::HashMap, borrow::Cow};
 use sc_client_api::ImportNotifications;
 use sp_runtime::{DigestItem, traits::Block as BlockT, generic::BlockId};
 use sp_consensus::{Proposal, BlockOrigin, BlockImportParams, import_queue::BoxBlockImport};
@@ -68,7 +68,8 @@ impl<Block, Algorithm, C, Proof> MiningWorker<Block, Algorithm, C, Proof> where
 	Block: BlockT,
 	C: sp_api::ProvideRuntimeApi<Block>,
 	Algorithm: PowAlgorithm<Block>,
-	Algorithm::Difficulty: 'static,
+	Algorithm::Difficulty: 'static + Send,
+	sp_api::TransactionFor<C, Block>: Send + 'static,
 {
 	/// Get the current best hash. `None` if the worker has just started or the client is doing
 	/// major syncing.
@@ -94,7 +95,7 @@ impl<Block, Algorithm, C, Proof> MiningWorker<Block, Algorithm, C, Proof> where
 
 	/// Submit a mined seal. The seal will be validated again. Returns true if the submission is
 	/// successful.
-	pub fn submit(&mut self, seal: Seal) -> bool {
+	pub async fn submit(&mut self, seal: Seal) -> bool {
 		if let Some(build) = self.build.take() {
 			match self.algorithm.verify(
 				&BlockId::Hash(build.metadata.best_hash),
@@ -135,10 +136,10 @@ impl<Block, Algorithm, C, Proof> MiningWorker<Block, Algorithm, C, Proof> where
 
 			import_block.intermediates.insert(
 				Cow::from(INTERMEDIATE_KEY),
-				Box::new(intermediate) as Box<dyn Any>
+				Box::new(intermediate) as Box<_>,
 			);
 
-			match self.block_import.import_block(import_block, HashMap::default()) {
+			match self.block_import.import_block(import_block, HashMap::default()).await {
 				Ok(_) => {
 					info!(
 						target: "pow",
diff --git a/client/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs
index 351ef932ada1..c1f13fea1f9e 100644
--- a/client/consensus/slots/src/lib.rs
+++ b/client/consensus/slots/src/lib.rs
@@ -398,6 +398,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 		let header = block_import_params.post_header();
 		if let Err(err) = block_import
 			.import_block(block_import_params, Default::default())
+			.await
 		{
 			warn!(
 				target: logging_target,
diff --git a/client/finality-grandpa-warp-sync/src/proof.rs b/client/finality-grandpa-warp-sync/src/proof.rs
index e6fb989abc9d..4677d2401e83 100644
--- a/client/finality-grandpa-warp-sync/src/proof.rs
+++ b/client/finality-grandpa-warp-sync/src/proof.rs
@@ -237,7 +237,7 @@ mod tests {
 				block.header.digest_mut().logs.push(digest);
 			}
 
-			client.import(BlockOrigin::Own, block).unwrap();
+			futures::executor::block_on(client.import(BlockOrigin::Own, block)).unwrap();
 
 			if let Some(new_authorities) = new_authorities {
 				// generate a justification for this block, finalize it and note the authority set
diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml
index 7ae5666c7bc8..1f21f454491b 100644
--- a/client/finality-grandpa/Cargo.toml
+++ b/client/finality-grandpa/Cargo.toml
@@ -47,6 +47,7 @@ sc-block-builder = { version = "0.9.0", path = "../block-builder" }
 finality-grandpa = { version = "0.14.0", features = ["derive-codec"] }
 pin-project = "1.0.4"
 linked-hash-map = "0.5.2"
+async-trait = "0.1.42"
 
 [dev-dependencies]
 assert_matches = "1.3.0"
diff --git a/client/finality-grandpa/src/authorities.rs b/client/finality-grandpa/src/authorities.rs
index 1854a33d29f1..056460ac9ed8 100644
--- a/client/finality-grandpa/src/authorities.rs
+++ b/client/finality-grandpa/src/authorities.rs
@@ -19,17 +19,17 @@
 //! Utilities for dealing with authorities, authority sets, and handoffs.
 
 use fork_tree::ForkTree;
-use parking_lot::RwLock;
+use parking_lot::MappedMutexGuard;
 use finality_grandpa::voter_set::VoterSet;
 use parity_scale_codec::{Encode, Decode};
 use log::debug;
 use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_INFO};
 use sp_finality_grandpa::{AuthorityId, AuthorityList};
+use sc_consensus::shared_data::{SharedData, SharedDataLocked};
 
 use std::cmp::Ord;
 use std::fmt::Debug;
 use std::ops::Add;
-use std::sync::Arc;
 
 /// Error type returned on operations on the `AuthoritySet`.
 #[derive(Debug, derive_more::Display)]
@@ -70,19 +70,30 @@ impl<N, E: std::error::Error> From<E> for Error<N, E> {
 
 /// A shared authority set.
 pub struct SharedAuthoritySet<H, N> {
-	inner: Arc<RwLock<AuthoritySet<H, N>>>,
+	inner: SharedData<AuthoritySet<H, N>>,
 }
 
 impl<H, N> Clone for SharedAuthoritySet<H, N> {
 	fn clone(&self) -> Self {
-		SharedAuthoritySet { inner: self.inner.clone() }
+		SharedAuthoritySet {
+			inner: self.inner.clone(),
+		}
 	}
 }
 
 impl<H, N> SharedAuthoritySet<H, N> {
-	/// Acquire a reference to the inner read-write lock.
-	pub(crate) fn inner(&self) -> &RwLock<AuthoritySet<H, N>> {
-		&*self.inner
+	/// Returns access to the [`AuthoritySet`].
+	pub(crate) fn inner(&self) -> MappedMutexGuard<AuthoritySet<H, N>> {
+		self.inner.shared_data()
+	}
+
+	/// Returns access to the [`AuthoritySet`] and locks it.
+	///
+	/// For more information see [`SharedDataLocked`].
+	pub(crate) fn inner_locked(
+		&self,
+	) -> SharedDataLocked<AuthoritySet<H, N>> {
+		self.inner.shared_data_locked()
 	}
 }
 
@@ -93,17 +104,17 @@ where N: Add<Output=N> + Ord + Clone + Debug,
 	/// Get the earliest limit-block number that's higher or equal to the given
 	/// min number, if any.
 	pub(crate) fn current_limit(&self, min: N) -> Option<N> {
-		self.inner.read().current_limit(min)
+		self.inner().current_limit(min)
 	}
 
 	/// Get the current set ID. This is incremented every time the set changes.
 	pub fn set_id(&self) -> u64 {
-		self.inner.read().set_id
+		self.inner().set_id
 	}
 
 	/// Get the current authorities and their weights (for the current set ID).
 	pub fn current_authorities(&self) -> VoterSet<AuthorityId> {
-		VoterSet::new(self.inner.read().current_authorities.iter().cloned()).expect(
+		VoterSet::new(self.inner().current_authorities.iter().cloned()).expect(
 			"current_authorities is non-empty and weights are non-zero; \
 			 constructor and all mutating operations on `AuthoritySet` ensure this; \
 			 qed.",
@@ -112,18 +123,20 @@ where N: Add<Output=N> + Ord + Clone + Debug,
 
 	/// Clone the inner `AuthoritySet`.
 	pub fn clone_inner(&self) -> AuthoritySet<H, N> {
-		self.inner.read().clone()
+		self.inner().clone()
 	}
 
 	/// Clone the inner `AuthoritySetChanges`.
 	pub fn authority_set_changes(&self) -> AuthoritySetChanges<N> {
-		self.inner.read().authority_set_changes.clone()
+		self.inner().authority_set_changes.clone()
 	}
 }
 
 impl<H, N> From<AuthoritySet<H, N>> for SharedAuthoritySet<H, N> {
 	fn from(set: AuthoritySet<H, N>) -> Self {
-		SharedAuthoritySet { inner: Arc::new(RwLock::new(set)) }
+		SharedAuthoritySet {
+			inner: SharedData::new(set),
+		}
 	}
 }
 
diff --git a/client/finality-grandpa/src/aux_schema.rs b/client/finality-grandpa/src/aux_schema.rs
index 43c45b9f10ae..8ecfae40f68c 100644
--- a/client/finality-grandpa/src/aux_schema.rs
+++ b/client/finality-grandpa/src/aux_schema.rs
@@ -592,7 +592,7 @@ mod test {
 		).unwrap();
 
 		assert_eq!(
-			*authority_set.inner().read(),
+			*authority_set.inner(),
 			AuthoritySet::new(
 				authorities.clone(),
 				set_id,
@@ -616,7 +616,7 @@ mod test {
 						votes: vec![],
 					},
 					set_id,
-					&*authority_set.inner().read(),
+					&*authority_set.inner(),
 				),
 				current_rounds,
 			},
@@ -688,7 +688,7 @@ mod test {
 		).unwrap();
 
 		assert_eq!(
-			*authority_set.inner().read(),
+			*authority_set.inner(),
 			AuthoritySet::new(
 				authorities.clone(),
 				set_id,
@@ -712,7 +712,7 @@ mod test {
 						votes: vec![],
 					},
 					set_id,
-					&*authority_set.inner().read(),
+					&*authority_set.inner(),
 				),
 				current_rounds,
 			},
@@ -781,7 +781,7 @@ mod test {
 		).unwrap();
 
 		assert_eq!(
-			*authority_set.inner().read(),
+			*authority_set.inner(),
 			AuthoritySet::new(
 				authorities.clone(),
 				set_id,
diff --git a/client/finality-grandpa/src/environment.rs b/client/finality-grandpa/src/environment.rs
index 27ff1e57b670..3786355d2db4 100644
--- a/client/finality-grandpa/src/environment.rs
+++ b/client/finality-grandpa/src/environment.rs
@@ -508,7 +508,7 @@ where
 			.best_chain()
 			.map_err(|e| Error::Blockchain(e.to_string()))?;
 
-		let authority_set = self.authority_set.inner().read();
+		let authority_set = self.authority_set.inner();
 
 		// block hash and number of the next pending authority set change in the
 		// given best chain.
@@ -1228,7 +1228,7 @@ where
 	// NOTE: lock must be held through writing to DB to avoid race. this lock
 	//       also implicitly synchronizes the check for last finalized number
 	//       below.
-	let mut authority_set = authority_set.inner().write();
+	let mut authority_set = authority_set.inner();
 
 	let status = client.info();
 
diff --git a/client/finality-grandpa/src/import.rs b/client/finality-grandpa/src/import.rs
index 6814d5dfb619..b2fcca019bcb 100644
--- a/client/finality-grandpa/src/import.rs
+++ b/client/finality-grandpa/src/import.rs
@@ -20,13 +20,13 @@ use std::{sync::Arc, collections::HashMap};
 
 use log::debug;
 use parity_scale_codec::Encode;
-use parking_lot::RwLockWriteGuard;
 
 use sp_blockchain::{BlockStatus, well_known_cache_keys};
 use sc_client_api::{backend::Backend, utils::is_descendent_of};
 use sc_telemetry::TelemetryHandle;
 use sp_utils::mpsc::TracingUnboundedSender;
 use sp_api::TransactionFor;
+use sc_consensus::shared_data::{SharedDataLockedUpgradable, SharedDataLocked};
 
 use sp_consensus::{
 	BlockImport, Error as ConsensusError,
@@ -99,7 +99,7 @@ impl<BE, Block: BlockT, Client, SC> JustificationImport<Block>
 		let chain_info = self.inner.info();
 
 		// request justifications for all pending changes for which change blocks have already been imported
-		let authorities = self.authority_set.inner().read();
+		let authorities = self.authority_set.inner();
 		for pending_change in authorities.pending_changes() {
 			if pending_change.delay_kind == DelayKind::Finalized &&
 				pending_change.effective_number() > chain_info.finalized_number &&
@@ -157,30 +157,30 @@ impl<H, N> AppliedChanges<H, N> {
 	}
 }
 
-struct PendingSetChanges<'a, Block: 'a + BlockT> {
+struct PendingSetChanges<Block: BlockT> {
 	just_in_case: Option<(
 		AuthoritySet<Block::Hash, NumberFor<Block>>,
-		RwLockWriteGuard<'a, AuthoritySet<Block::Hash, NumberFor<Block>>>,
+		SharedDataLockedUpgradable<AuthoritySet<Block::Hash, NumberFor<Block>>>,
 	)>,
 	applied_changes: AppliedChanges<Block::Hash, NumberFor<Block>>,
 	do_pause: bool,
 }
 
-impl<'a, Block: 'a + BlockT> PendingSetChanges<'a, Block> {
+impl<Block: BlockT> PendingSetChanges<Block> {
 	// revert the pending set change explicitly.
-	fn revert(self) { }
+	fn revert(self) {}
 
 	fn defuse(mut self) -> (AppliedChanges<Block::Hash, NumberFor<Block>>, bool) {
 		self.just_in_case = None;
-		let applied_changes = ::std::mem::replace(&mut self.applied_changes, AppliedChanges::None);
+		let applied_changes = std::mem::replace(&mut self.applied_changes, AppliedChanges::None);
 		(applied_changes, self.do_pause)
 	}
 }
 
-impl<'a, Block: 'a + BlockT> Drop for PendingSetChanges<'a, Block> {
+impl<Block: BlockT> Drop for PendingSetChanges<Block> {
 	fn drop(&mut self) {
 		if let Some((old_set, mut authorities)) = self.just_in_case.take() {
-			*authorities = old_set;
+			*authorities.upgrade() = old_set;
 		}
 	}
 }
@@ -269,33 +269,38 @@ where
 		// when we update the authorities, we need to hold the lock
 		// until the block is written to prevent a race if we need to restore
 		// the old authority set on error or panic.
-		struct InnerGuard<'a, T: 'a> {
-			old: Option<T>,
-			guard: Option<RwLockWriteGuard<'a, T>>,
+		struct InnerGuard<'a, H, N> {
+			old: Option<AuthoritySet<H, N>>,
+			guard: Option<SharedDataLocked<'a, AuthoritySet<H, N>>>,
 		}
 
-		impl<'a, T: 'a> InnerGuard<'a, T> {
-			fn as_mut(&mut self) -> &mut T {
+		impl<'a, H, N> InnerGuard<'a, H, N> {
+			fn as_mut(&mut self) -> &mut AuthoritySet<H, N> {
 				&mut **self.guard.as_mut().expect("only taken on deconstruction; qed")
 			}
 
-			fn set_old(&mut self, old: T) {
+			fn set_old(&mut self, old: AuthoritySet<H, N>) {
 				if self.old.is_none() {
 					// ignore "newer" old changes.
 					self.old = Some(old);
 				}
 			}
 
-			fn consume(mut self) -> Option<(T, RwLockWriteGuard<'a, T>)> {
+			fn consume(
+				mut self,
+			) -> Option<(AuthoritySet<H, N>, SharedDataLocked<'a, AuthoritySet<H, N>>)> {
 				if let Some(old) = self.old.take() {
-					Some((old, self.guard.take().expect("only taken on deconstruction; qed")))
+					Some((
+						old,
+						self.guard.take().expect("only taken on deconstruction; qed"),
+					))
 				} else {
 					None
 				}
 			}
 		}
 
-		impl<'a, T: 'a> Drop for InnerGuard<'a, T> {
+		impl<'a, H, N> Drop for InnerGuard<'a, H, N> {
 			fn drop(&mut self) {
 				if let (Some(mut guard), Some(old)) = (self.guard.take(), self.old.take()) {
 					*guard = old;
@@ -315,7 +320,7 @@ where
 		let is_descendent_of = is_descendent_of(&*self.inner, Some((hash, parent_hash)));
 
 		let mut guard = InnerGuard {
-			guard: Some(self.authority_set.inner().write()),
+			guard: Some(self.authority_set.inner_locked()),
 			old: None,
 		};
 
@@ -413,10 +418,13 @@ where
 			);
 		}
 
+		let just_in_case = just_in_case.map(|(o, i)| (o, i.release_mutex()));
+
 		Ok(PendingSetChanges { just_in_case, applied_changes, do_pause })
 	}
 }
 
+#[async_trait::async_trait]
 impl<BE, Block: BlockT, Client, SC> BlockImport<Block>
 	for GrandpaBlockImport<BE, Block, Client, SC> where
 		NumberFor<Block>: finality_grandpa::BlockNumberOps,
@@ -425,11 +433,13 @@ impl<BE, Block: BlockT, Client, SC> BlockImport<Block>
 		Client: crate::ClientForGrandpa<Block, BE>,
 		for<'a> &'a Client:
 			BlockImport<Block, Error = ConsensusError, Transaction = TransactionFor<Client, Block>>,
+		TransactionFor<Client, Block>: Send + 'static,
+		SC: Send,
 {
 	type Error = ConsensusError;
 	type Transaction = TransactionFor<Client, Block>;
 
-	fn import_block(
+	async fn import_block(
 		&mut self,
 		mut block: BlockImportParams<Block, Self::Transaction>,
 		new_cache: HashMap<well_known_cache_keys::Id, Vec<u8>>,
@@ -452,7 +462,7 @@ impl<BE, Block: BlockT, Client, SC> BlockImport<Block>
 
 		// we don't want to finalize on `inner.import_block`
 		let mut justifications = block.justifications.take();
-		let import_result = (&*self.inner).import_block(block, new_cache);
+		let import_result = (&*self.inner).import_block(block, new_cache).await;
 
 		let mut imported_aux = {
 			match import_result {
@@ -556,11 +566,11 @@ impl<BE, Block: BlockT, Client, SC> BlockImport<Block>
 		Ok(ImportResult::Imported(imported_aux))
 	}
 
-	fn check_block(
+	async fn check_block(
 		&mut self,
 		block: BlockCheckParams<Block>,
 	) -> Result<ImportResult, Self::Error> {
-		self.inner.check_block(block)
+		self.inner.check_block(block).await
 	}
 }
 
@@ -580,8 +590,7 @@ impl<Backend, Block: BlockT, Client, SC> GrandpaBlockImport<Backend, Block, Clie
 			.iter()
 			.find(|(set_id, _)| *set_id == authority_set.set_id())
 		{
-			let mut authority_set = authority_set.inner().write();
-			authority_set.current_authorities = change.next_authorities.clone();
+			authority_set.inner().current_authorities = change.next_authorities.clone();
 		}
 
 		// index authority set hard forks by block hash so that they can be used
@@ -596,7 +605,7 @@ impl<Backend, Block: BlockT, Client, SC> GrandpaBlockImport<Backend, Block, Clie
 		// any *pending* standard changes, checking by the block hash at which
 		// they were announced.
 		{
-			let mut authority_set = authority_set.inner().write();
+			let mut authority_set = authority_set.inner();
 
 			authority_set.pending_standard_changes = authority_set
 				.pending_standard_changes
diff --git a/client/finality-grandpa/src/lib.rs b/client/finality-grandpa/src/lib.rs
index c6c2a39674b8..9a8939660473 100644
--- a/client/finality-grandpa/src/lib.rs
+++ b/client/finality-grandpa/src/lib.rs
@@ -1019,7 +1019,7 @@ where
 					// set changed (not where the signal happened!) as the base.
 					let set_state = VoterSetState::live(
 						new.set_id,
-						&*self.env.authority_set.inner().read(),
+						&*self.env.authority_set.inner(),
 						(new.canon_hash, new.canon_number),
 					);
 
diff --git a/client/finality-grandpa/src/observer.rs b/client/finality-grandpa/src/observer.rs
index c0eab15e4f45..827a7388d603 100644
--- a/client/finality-grandpa/src/observer.rs
+++ b/client/finality-grandpa/src/observer.rs
@@ -326,7 +326,7 @@ where
 				// set changed (not where the signal happened!) as the base.
 				let set_state = VoterSetState::live(
 					new.set_id,
-					&*self.persistent_data.authority_set.inner().read(),
+					&*self.persistent_data.authority_set.inner(),
 					(new.canon_hash, new.canon_number),
 				);
 
diff --git a/client/finality-grandpa/src/tests.rs b/client/finality-grandpa/src/tests.rs
index d0a6b0874fa7..b87bbefc1137 100644
--- a/client/finality-grandpa/src/tests.rs
+++ b/client/finality-grandpa/src/tests.rs
@@ -28,9 +28,9 @@ use sc_network_test::{
 use sc_network::config::ProtocolConfig;
 use parking_lot::{RwLock, Mutex};
 use futures_timer::Delay;
+use futures::executor::block_on;
 use tokio::runtime::{Runtime, Handle};
 use sp_keyring::Ed25519Keyring;
-use sc_client_api::backend::TransactionFor;
 use sp_blockchain::Result;
 use sp_api::{ApiRef, ProvideRuntimeApi};
 use substrate_test_runtime_client::runtime::BlockNumber;
@@ -43,7 +43,9 @@ use sp_runtime::{Justifications, traits::{Block as BlockT, Header as HeaderT}};
 use sp_runtime::generic::{BlockId, DigestItem};
 use sp_core::H256;
 use sp_keystore::{SyncCryptoStorePtr, SyncCryptoStore};
-use sp_finality_grandpa::{GRANDPA_ENGINE_ID, AuthorityList, EquivocationProof, GrandpaApi, OpaqueKeyOwnershipProof};
+use sp_finality_grandpa::{
+	GRANDPA_ENGINE_ID, AuthorityList, EquivocationProof, GrandpaApi, OpaqueKeyOwnershipProof,
+};
 
 use authorities::AuthoritySet;
 use sc_block_builder::BlockBuilderProvider;
@@ -54,7 +56,13 @@ use sp_application_crypto::key_types::GRANDPA;
 type TestLinkHalf =
 	LinkHalf<Block, PeersFullClient, LongestChain<substrate_test_runtime_client::Backend, Block>>;
 type PeerData = Mutex<Option<TestLinkHalf>>;
-type GrandpaPeer = Peer<PeerData>;
+type GrandpaPeer = Peer<PeerData, GrandpaBlockImport>;
+type GrandpaBlockImport = crate::GrandpaBlockImport<
+	substrate_test_runtime_client::Backend,
+	Block,
+	PeersFullClient,
+	LongestChain<substrate_test_runtime_client::Backend, Block>
+>;
 
 struct GrandpaTestNet {
 	peers: Vec<GrandpaPeer>,
@@ -93,6 +101,7 @@ impl GrandpaTestNet {
 impl TestNetFactory for GrandpaTestNet {
 	type Verifier = PassThroughVerifier;
 	type PeerData = PeerData;
+	type BlockImport = GrandpaBlockImport;
 
 	/// Create new test network with peers and given config.
 	fn from_config(_config: &ProtocolConfig) -> Self {
@@ -124,9 +133,9 @@ impl TestNetFactory for GrandpaTestNet {
 		PassThroughVerifier::new(false) // use non-instant finality.
 	}
 
-	fn make_block_import<Transaction>(&self, client: PeersClient)
+	fn make_block_import(&self, client: PeersClient)
 		-> (
-			BlockImportAdapter<Transaction>,
+			BlockImportAdapter<Self::BlockImport>,
 			Option<BoxJustificationImport<Block>>,
 			PeerData,
 		)
@@ -141,7 +150,7 @@ impl TestNetFactory for GrandpaTestNet {
 				).expect("Could not create block import for fresh peer.");
 				let justification_import = Box::new(import.clone());
 				(
-					BlockImportAdapter::new_full(import),
+					BlockImportAdapter::new(import),
 					Some(justification_import),
 					Mutex::new(Some(link)),
 				)
@@ -820,11 +829,7 @@ fn allows_reimporting_change_blocks() {
 	let mut net = GrandpaTestNet::new(api.clone(), 3, 0);
 
 	let client = net.peer(0).client().clone();
-	let (mut block_import, ..) = net.make_block_import::<
-		TransactionFor<substrate_test_runtime_client::Backend, Block>
-	>(
-		client.clone(),
-	);
+	let (mut block_import, ..) = net.make_block_import(client.clone());
 
 	let full_client = client.as_full().unwrap();
 	let builder = full_client.new_block_at(&BlockId::Number(0), Default::default(), false).unwrap();
@@ -844,7 +849,7 @@ fn allows_reimporting_change_blocks() {
 	};
 
 	assert_eq!(
-		block_import.import_block(block(), HashMap::new()).unwrap(),
+		block_on(block_import.import_block(block(), HashMap::new())).unwrap(),
 		ImportResult::Imported(ImportedAux {
 			needs_justification: true,
 			clear_justification_requests: false,
@@ -855,7 +860,7 @@ fn allows_reimporting_change_blocks() {
 	);
 
 	assert_eq!(
-		block_import.import_block(block(), HashMap::new()).unwrap(),
+		block_on(block_import.import_block(block(), HashMap::new())).unwrap(),
 		ImportResult::AlreadyInChain
 	);
 }
@@ -869,11 +874,7 @@ fn test_bad_justification() {
 	let mut net = GrandpaTestNet::new(api.clone(), 3, 0);
 
 	let client = net.peer(0).client().clone();
-	let (mut block_import, ..) = net.make_block_import::<
-		TransactionFor<substrate_test_runtime_client::Backend, Block>
-	>(
-		client.clone(),
-	);
+	let (mut block_import, ..) = net.make_block_import(client.clone());
 
 	let full_client = client.as_full().expect("only full clients are used in test");
 	let builder = full_client.new_block_at(&BlockId::Number(0), Default::default(), false).unwrap();
@@ -895,7 +896,7 @@ fn test_bad_justification() {
 	};
 
 	assert_eq!(
-		block_import.import_block(block(), HashMap::new()).unwrap(),
+		block_on(block_import.import_block(block(), HashMap::new())).unwrap(),
 		ImportResult::Imported(ImportedAux {
 			needs_justification: true,
 			clear_justification_requests: false,
@@ -906,7 +907,7 @@ fn test_bad_justification() {
 	);
 
 	assert_eq!(
-		block_import.import_block(block(), HashMap::new()).unwrap(),
+		block_on(block_import.import_block(block(), HashMap::new())).unwrap(),
 		ImportResult::AlreadyInChain
 	);
 }
@@ -950,9 +951,7 @@ fn voter_persists_its_votes() {
 		let set_state = {
 			let bob_client = net.peer(1).client().clone();
 			let (_, _, link) = net
-				.make_block_import::<
-					TransactionFor<substrate_test_runtime_client::Backend, Block>
-				>(bob_client);
+				.make_block_import(bob_client);
 			let LinkHalf { persistent_data, .. } = link.lock().take().unwrap();
 			let PersistentData { set_state, .. } = persistent_data;
 			set_state
@@ -1019,9 +1018,7 @@ fn voter_persists_its_votes() {
 		let alice_client = net.peer(0).client().clone();
 
 		let (_block_import, _, link) = net
-			.make_block_import::<
-				TransactionFor<substrate_test_runtime_client::Backend, Block>
-			>(alice_client);
+			.make_block_import(alice_client);
 		let link = link.lock().take().unwrap();
 
 		let grandpa_params = GrandpaParams {
@@ -1422,7 +1419,7 @@ fn grandpa_environment_respects_voting_rules() {
 
 	// the unrestricted environment should just return the best block
 	assert_eq!(
-		futures::executor::block_on(unrestricted_env.best_chain_containing(
+		block_on(unrestricted_env.best_chain_containing(
 			peer.client().info().finalized_hash
 		)).unwrap().unwrap().1,
 		21,
@@ -1431,14 +1428,14 @@ fn grandpa_environment_respects_voting_rules() {
 	// both the other environments should return block 16, which is 3/4 of the
 	// way in the unfinalized chain
 	assert_eq!(
-		futures::executor::block_on(three_quarters_env.best_chain_containing(
+		block_on(three_quarters_env.best_chain_containing(
 			peer.client().info().finalized_hash
 		)).unwrap().unwrap().1,
 		16,
 	);
 
 	assert_eq!(
-		futures::executor::block_on(default_env.best_chain_containing(
+		block_on(default_env.best_chain_containing(
 			peer.client().info().finalized_hash
 		)).unwrap().unwrap().1,
 		16,
@@ -1449,7 +1446,7 @@ fn grandpa_environment_respects_voting_rules() {
 
 	// the 3/4 environment should propose block 21 for voting
 	assert_eq!(
-		futures::executor::block_on(three_quarters_env.best_chain_containing(
+		block_on(three_quarters_env.best_chain_containing(
 			peer.client().info().finalized_hash
 		)).unwrap().unwrap().1,
 		21,
@@ -1458,7 +1455,7 @@ fn grandpa_environment_respects_voting_rules() {
 	// while the default environment will always still make sure we don't vote
 	// on the best block (2 behind)
 	assert_eq!(
-		futures::executor::block_on(default_env.best_chain_containing(
+		block_on(default_env.best_chain_containing(
 			peer.client().info().finalized_hash
 		)).unwrap().unwrap().1,
 		19,
@@ -1471,7 +1468,7 @@ fn grandpa_environment_respects_voting_rules() {
 	// best block, there's a hard rule that we can't cast any votes lower than
 	// the given base (#21).
 	assert_eq!(
-		futures::executor::block_on(default_env.best_chain_containing(
+		block_on(default_env.best_chain_containing(
 			peer.client().info().finalized_hash
 		)).unwrap().unwrap().1,
 		21,
@@ -1557,9 +1554,7 @@ fn imports_justification_for_regular_blocks_on_import() {
 	let mut net = GrandpaTestNet::new(api.clone(), 1, 0);
 
 	let client = net.peer(0).client().clone();
-	let (mut block_import, ..) = net.make_block_import::<
-		TransactionFor<substrate_test_runtime_client::Backend, Block>
-	>(client.clone());
+	let (mut block_import, ..) = net.make_block_import(client.clone());
 
 	let full_client = client.as_full().expect("only full clients are used in test");
 	let builder = full_client.new_block_at(&BlockId::Number(0), Default::default(), false).unwrap();
@@ -1607,7 +1602,7 @@ fn imports_justification_for_regular_blocks_on_import() {
 	import.fork_choice = Some(ForkChoiceStrategy::LongestChain);
 
 	assert_eq!(
-		block_import.import_block(import, HashMap::new()).unwrap(),
+		block_on(block_import.import_block(import, HashMap::new())).unwrap(),
 		ImportResult::Imported(ImportedAux {
 			needs_justification: false,
 			clear_justification_requests: false,
diff --git a/client/finality-grandpa/src/voting_rule.rs b/client/finality-grandpa/src/voting_rule.rs
index 9b3fb9b32856..3ede7649a138 100644
--- a/client/finality-grandpa/src/voting_rule.rs
+++ b/client/finality-grandpa/src/voting_rule.rs
@@ -372,7 +372,7 @@ mod tests {
 				.unwrap()
 				.block;
 
-			client.import(BlockOrigin::Own, block).unwrap();
+			futures::executor::block_on(client.import(BlockOrigin::Own, block)).unwrap();
 		}
 
 		let genesis = client
diff --git a/client/network/src/gossip/tests.rs b/client/network/src/gossip/tests.rs
index cd637f162721..b000cf575ddb 100644
--- a/client/network/src/gossip/tests.rs
+++ b/client/network/src/gossip/tests.rs
@@ -47,8 +47,10 @@ fn build_test_full_node(network_config: config::NetworkConfiguration)
 
 	#[derive(Clone)]
 	struct PassThroughVerifier(bool);
+
+	#[async_trait::async_trait]
 	impl<B: BlockT> sp_consensus::import_queue::Verifier<B> for PassThroughVerifier {
-		fn verify(
+		async fn verify(
 			&mut self,
 			origin: sp_consensus::BlockOrigin,
 			header: B::Header,
diff --git a/client/network/src/protocol/sync.rs b/client/network/src/protocol/sync.rs
index 37f9a451b67d..22cfcc5eb4f6 100644
--- a/client/network/src/protocol/sync.rs
+++ b/client/network/src/protocol/sync.rs
@@ -2016,7 +2016,7 @@ mod test {
 		let mut new_blocks = |n| {
 			for _ in 0..n {
 				let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
-				client.import(BlockOrigin::Own, block.clone()).unwrap();
+				block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
 			}
 
 			let info = client.info();
@@ -2147,7 +2147,7 @@ mod test {
 
 		let block = block_builder.build().unwrap().block;
 
-		client.import(BlockOrigin::Own, block.clone()).unwrap();
+		block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
 		block
 	}
 
@@ -2188,7 +2188,7 @@ mod test {
 			let block = block_builder.build().unwrap().block;
 
 			if import {
-				client2.import(BlockOrigin::Own, block.clone()).unwrap();
+				block_on(client2.import(BlockOrigin::Own, block.clone())).unwrap();
 			}
 
 			block
@@ -2213,7 +2213,7 @@ mod test {
 		send_block_announce(block3_fork.header().clone(), &peer_id2, &mut sync);
 
 		// Import and tell sync that we now have the fork.
-		client.import(BlockOrigin::Own, block3_fork.clone()).unwrap();
+		block_on(client.import(BlockOrigin::Own, block3_fork.clone())).unwrap();
 		sync.update_chain_info(&block3_fork.hash(), 3);
 
 		let block4 = build_block_at(block3_fork.hash(), false);
@@ -2325,7 +2325,7 @@ mod test {
 
 			resp_blocks.into_iter()
 					.rev()
-					.for_each(|b| client.import_as_final(BlockOrigin::Own, b).unwrap());
+					.for_each(|b| block_on(client.import_as_final(BlockOrigin::Own, b)).unwrap());
 		}
 
 		// Let peer2 announce that it finished syncing
@@ -2388,7 +2388,7 @@ mod test {
 			let mut client = Arc::new(TestClientBuilder::new().build());
 			let fork_blocks = blocks[..MAX_BLOCKS_TO_LOOK_BACKWARDS as usize * 2]
 				.into_iter()
-				.inspect(|b| client.import(BlockOrigin::Own, (*b).clone()).unwrap())
+				.inspect(|b| block_on(client.import(BlockOrigin::Own, (*b).clone())).unwrap())
 				.cloned()
 				.collect::<Vec<_>>();
 
@@ -2492,7 +2492,7 @@ mod test {
 
 			resp_blocks.into_iter()
 				.rev()
-				.for_each(|b| client.import(BlockOrigin::Own, b).unwrap());
+				.for_each(|b| block_on(client.import(BlockOrigin::Own, b)).unwrap());
 		}
 
 		// Request the tip
diff --git a/client/network/src/service/tests.rs b/client/network/src/service/tests.rs
index fd8cf4c3d105..dd4a0597cbcb 100644
--- a/client/network/src/service/tests.rs
+++ b/client/network/src/service/tests.rs
@@ -47,8 +47,10 @@ fn build_test_full_node(config: config::NetworkConfiguration)
 
 	#[derive(Clone)]
 	struct PassThroughVerifier(bool);
+
+	#[async_trait::async_trait]
 	impl<B: BlockT> sp_consensus::import_queue::Verifier<B> for PassThroughVerifier {
-		fn verify(
+		async fn verify(
 			&mut self,
 			origin: sp_consensus::BlockOrigin,
 			header: B::Header,
diff --git a/client/network/test/Cargo.toml b/client/network/test/Cargo.toml
index 7ba468fa3f78..4fc1aa740040 100644
--- a/client/network/test/Cargo.toml
+++ b/client/network/test/Cargo.toml
@@ -34,3 +34,4 @@ substrate-test-runtime = { version = "2.0.0", path = "../../../test-utils/runtim
 tempfile = "3.1.0"
 sp-tracing = { version = "3.0.0", path = "../../../primitives/tracing" }
 sc-service = { version = "0.9.0", default-features = false, features = ["test-helpers"],  path = "../../service" }
+async-trait = "0.1.42"
diff --git a/client/network/test/src/block_import.rs b/client/network/test/src/block_import.rs
index 200c7357c424..b3641d4b4121 100644
--- a/client/network/test/src/block_import.rs
+++ b/client/network/test/src/block_import.rs
@@ -26,12 +26,13 @@ use substrate_test_runtime_client::{self, prelude::*};
 use substrate_test_runtime_client::runtime::{Block, Hash};
 use sp_runtime::generic::BlockId;
 use sc_block_builder::BlockBuilderProvider;
+use futures::executor::block_on;
 use super::*;
 
 fn prepare_good_block() -> (TestClient, Hash, u64, PeerId, IncomingBlock<Block>) {
 	let mut client = substrate_test_runtime_client::new();
 	let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::File, block).unwrap();
+	block_on(client.import(BlockOrigin::File, block)).unwrap();
 
 	let (hash, number) = (client.block_hash(1).unwrap().unwrap(), 1);
 	let header = client.header(&BlockId::Number(1)).unwrap();
@@ -55,12 +56,12 @@ fn import_single_good_block_works() {
 	let mut expected_aux = ImportedAux::default();
 	expected_aux.is_new_best = true;
 
-	match import_single_block(
+	match block_on(import_single_block(
 		&mut substrate_test_runtime_client::new(),
 		BlockOrigin::File,
 		block,
 		&mut PassThroughVerifier::new(true)
-	) {
+	)) {
 		Ok(BlockImportResult::ImportedUnknown(ref num, ref aux, ref org))
 			if *num == number && *aux == expected_aux && *org == Some(peer_id) => {}
 		r @ _ => panic!("{:?}", r)
@@ -70,12 +71,12 @@ fn import_single_good_block_works() {
 #[test]
 fn import_single_good_known_block_is_ignored() {
 	let (mut client, _hash, number, _, block) = prepare_good_block();
-	match import_single_block(
+	match block_on(import_single_block(
 		&mut client,
 		BlockOrigin::File,
 		block,
 		&mut PassThroughVerifier::new(true)
-	) {
+	)) {
 		Ok(BlockImportResult::ImportedKnown(ref n, _)) if *n == number => {}
 		_ => panic!()
 	}
@@ -85,12 +86,12 @@ fn import_single_good_known_block_is_ignored() {
 fn import_single_good_block_without_header_fails() {
 	let (_, _, _, peer_id, mut block) = prepare_good_block();
 	block.header = None;
-	match import_single_block(
+	match block_on(import_single_block(
 		&mut substrate_test_runtime_client::new(),
 		BlockOrigin::File,
 		block,
 		&mut PassThroughVerifier::new(true)
-	) {
+	)) {
 		Err(BlockImportError::IncompleteHeader(ref org)) if *org == Some(peer_id) => {}
 		_ => panic!()
 	}
diff --git a/client/network/test/src/lib.rs b/client/network/test/src/lib.rs
index 32a6e07eab42..5e05f5717549 100644
--- a/client/network/test/src/lib.rs
+++ b/client/network/test/src/lib.rs
@@ -23,8 +23,7 @@ mod block_import;
 mod sync;
 
 use std::{
-	borrow::Cow, collections::HashMap, pin::Pin, sync::Arc, marker::PhantomData,
-	task::{Poll, Context as FutureContext}
+	borrow::Cow, collections::HashMap, pin::Pin, sync::Arc, task::{Poll, Context as FutureContext}
 };
 
 use libp2p::build_multiaddr;
@@ -64,7 +63,7 @@ use sc_network::config::ProtocolConfig;
 use sp_runtime::generic::{BlockId, OpaqueDigestItemId};
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor};
 use sp_runtime::{Justification, Justifications};
-use substrate_test_runtime_client::{self, AccountKeyring};
+use substrate_test_runtime_client::AccountKeyring;
 use sc_service::client::Client;
 pub use sc_network::config::EmptyTransactionPool;
 pub use substrate_test_runtime_client::runtime::{Block, Extrinsic, Hash, Transfer};
@@ -104,8 +103,9 @@ impl PassThroughVerifier {
 }
 
 /// This `Verifier` accepts all data as valid.
+#[async_trait::async_trait]
 impl<B: BlockT> Verifier<B> for PassThroughVerifier {
-	fn verify(
+	async fn verify(
 		&mut self,
 		origin: BlockOrigin,
 		header: B::Header,
@@ -154,13 +154,8 @@ impl PeersClient {
 		}
 	}
 
-	pub fn as_block_import<Transaction>(&self) -> BlockImportAdapter<Transaction> {
-		match *self {
-			PeersClient::Full(ref client, ref _backend) =>
-				BlockImportAdapter::new_full(client.clone()),
-			PeersClient::Light(ref client, ref _backend) =>
-				BlockImportAdapter::Light(Arc::new(Mutex::new(client.clone())), PhantomData),
-		}
+	pub fn as_block_import(&self) -> BlockImportAdapter<Self> {
+		BlockImportAdapter::new(self.clone())
 	}
 
 	pub fn get_aux(&self, key: &[u8]) -> ClientResult<Option<Vec<u8>>> {
@@ -218,7 +213,36 @@ impl PeersClient {
 	}
 }
 
-pub struct Peer<D> {
+#[async_trait::async_trait]
+impl BlockImport<Block> for PeersClient {
+	type Error = ConsensusError;
+	type Transaction = ();
+
+	async fn check_block(
+		&mut self,
+		block: BlockCheckParams<Block>,
+	) -> Result<ImportResult, Self::Error> {
+		match self {
+			PeersClient::Full(client, _) => client.check_block(block).await,
+			PeersClient::Light(client, _) => client.check_block(block).await,
+		}
+	}
+
+	async fn import_block(
+		&mut self,
+		block: BlockImportParams<Block, ()>,
+		cache: HashMap<well_known_cache_keys::Id, Vec<u8>>,
+	) -> Result<ImportResult, Self::Error> {
+		match self {
+			PeersClient::Full(client, _) =>
+				client.import_block(block.convert_transaction(), cache).await,
+			PeersClient::Light(client, _) =>
+				client.import_block(block.convert_transaction(), cache).await,
+		}
+	}
+}
+
+pub struct Peer<D, BlockImport> {
 	pub data: D,
 	client: PeersClient,
 	/// We keep a copy of the verifier so that we can invoke it for locally-generated blocks,
@@ -226,7 +250,7 @@ pub struct Peer<D> {
 	verifier: VerifierAdapter<Block>,
 	/// We keep a copy of the block_import so that we can invoke it for locally-generated blocks,
 	/// instead of going through the import queue.
-	block_import: BlockImportAdapter<()>,
+	block_import: BlockImportAdapter<BlockImport>,
 	select_chain: Option<LongestChain<substrate_test_runtime_client::Backend, Block>>,
 	backend: Option<Arc<substrate_test_runtime_client::Backend>>,
 	network: NetworkWorker<Block, <Block as BlockT>::Hash>,
@@ -235,7 +259,10 @@ pub struct Peer<D> {
 	listen_addr: Multiaddr,
 }
 
-impl<D> Peer<D> {
+impl<D, B> Peer<D, B> where
+	B: BlockImport<Block, Error = ConsensusError> + Send + Sync,
+	B::Transaction: Send,
+{
 	/// Get this peer ID.
 	pub fn id(&self) -> PeerId {
 		self.network.service().local_peer_id().clone()
@@ -277,13 +304,24 @@ impl<D> Peer<D> {
 	}
 
 	/// Request explicit fork sync.
-	pub fn set_sync_fork_request(&self, peers: Vec<PeerId>, hash: <Block as BlockT>::Hash, number: NumberFor<Block>) {
+	pub fn set_sync_fork_request(
+		&self,
+		peers: Vec<PeerId>,
+		hash: <Block as BlockT>::Hash,
+		number: NumberFor<Block>,
+	) {
 		self.network.service().set_sync_fork_request(peers, hash, number);
 	}
 
 	/// Add blocks to the peer -- edit the block before adding
-	pub fn generate_blocks<F>(&mut self, count: usize, origin: BlockOrigin, edit_block: F) -> H256
-		where F: FnMut(BlockBuilder<Block, PeersFullClient, substrate_test_runtime_client::Backend>) -> Block
+	pub fn generate_blocks<F>(
+		&mut self,
+		count: usize,
+		origin: BlockOrigin,
+		edit_block: F,
+	) -> H256
+		where
+			F: FnMut(BlockBuilder<Block, PeersFullClient, substrate_test_runtime_client::Backend>) -> Block
 	{
 		let best_hash = self.client.info().best_hash;
 		self.generate_blocks_at(BlockId::Hash(best_hash), count, origin, edit_block, false, true, true)
@@ -320,19 +358,21 @@ impl<D> Peer<D> {
 				block.header.parent_hash,
 			);
 			let header = block.header.clone();
-			let (import_block, cache) = self.verifier.verify(
+			let (import_block, cache) = futures::executor::block_on(self.verifier.verify(
 				origin,
 				header.clone(),
 				None,
 				if headers_only { None } else { Some(block.extrinsics) },
-			).unwrap();
+			)).unwrap();
 			let cache = if let Some(cache) = cache {
 				cache.into_iter().collect()
 			} else {
 				Default::default()
 			};
 
-			self.block_import.import_block(import_block, cache).expect("block_import failed");
+			futures::executor::block_on(
+				self.block_import.import_block(import_block, cache)
+			).expect("block_import failed");
 			if announce_block {
 				self.network.service().announce_block(hash, None);
 			}
@@ -478,102 +518,80 @@ impl<D> Peer<D> {
 	}
 }
 
+pub trait BlockImportAdapterFull:
+	BlockImport<
+		Block,
+		Transaction = TransactionFor<substrate_test_runtime_client::Backend, Block>,
+		Error = ConsensusError,
+	> +
+	Send +
+	Sync +
+	Clone
+{}
+
+impl<T> BlockImportAdapterFull for T where
+	T: BlockImport<
+		Block,
+		Transaction = TransactionFor<substrate_test_runtime_client::Backend, Block>,
+		Error = ConsensusError,
+	> +
+	Send +
+	Sync +
+	Clone
+{}
+
 /// Implements `BlockImport` for any `Transaction`. Internally the transaction is
 /// "converted", aka the field is set to `None`.
 ///
 /// This is required as the `TestNetFactory` trait does not distinguish between
 /// full and light nodes.
-pub enum BlockImportAdapter<Transaction> {
-	Full(
-		Arc<Mutex<dyn BlockImport<
-			Block,
-			Transaction = TransactionFor<substrate_test_runtime_client::Backend, Block>,
-			Error = ConsensusError
-		> + Send>>,
-		PhantomData<Transaction>,
-	),
-	Light(
-		Arc<Mutex<dyn BlockImport<
-			Block,
-			Transaction = TransactionFor<substrate_test_runtime_client::LightBackend, Block>,
-			Error = ConsensusError
-		> + Send>>,
-		PhantomData<Transaction>,
-	),
+#[derive(Clone)]
+pub struct BlockImportAdapter<I> {
+	inner: I,
 }
 
-impl<Transaction> BlockImportAdapter<Transaction> {
+impl<I> BlockImportAdapter<I> {
 	/// Create a new instance of `Self::Full`.
-	pub fn new_full(
-		full: impl BlockImport<
-			Block,
-			Transaction = TransactionFor<substrate_test_runtime_client::Backend, Block>,
-			Error = ConsensusError
-		>
-		+ 'static
-		+ Send
-	) -> Self {
-		Self::Full(Arc::new(Mutex::new(full)), PhantomData)
-	}
-
-	/// Create a new instance of `Self::Light`.
-	pub fn new_light(
-		light: impl BlockImport<
-			Block,
-			Transaction = TransactionFor<substrate_test_runtime_client::LightBackend, Block>,
-			Error = ConsensusError
-		>
-		+ 'static
-		+ Send
-	) -> Self {
-		Self::Light(Arc::new(Mutex::new(light)), PhantomData)
-	}
-}
-
-impl<Transaction> Clone for BlockImportAdapter<Transaction> {
-	fn clone(&self) -> Self {
-		match self {
-			Self::Full(full, _) => Self::Full(full.clone(), PhantomData),
-			Self::Light(light, _) => Self::Light(light.clone(), PhantomData),
+	pub fn new(inner: I) -> Self {
+		Self {
+			inner,
 		}
 	}
 }
 
-impl<Transaction> BlockImport<Block> for BlockImportAdapter<Transaction> {
+#[async_trait::async_trait]
+impl<I> BlockImport<Block> for BlockImportAdapter<I> where
+	I: BlockImport<Block, Error = ConsensusError> + Send + Sync,
+	I::Transaction: Send,
+{
 	type Error = ConsensusError;
-	type Transaction = Transaction;
+	type Transaction = ();
 
-	fn check_block(
+	async fn check_block(
 		&mut self,
 		block: BlockCheckParams<Block>,
 	) -> Result<ImportResult, Self::Error> {
-		match self {
-			Self::Full(full, _) => full.lock().check_block(block),
-			Self::Light(light, _) => light.lock().check_block(block),
-		}
+		self.inner.check_block(block).await
 	}
 
-	fn import_block(
+	async fn import_block(
 		&mut self,
-		block: BlockImportParams<Block, Transaction>,
+		block: BlockImportParams<Block, ()>,
 		cache: HashMap<well_known_cache_keys::Id, Vec<u8>>,
 	) -> Result<ImportResult, Self::Error> {
-		match self {
-			Self::Full(full, _) => full.lock().import_block(block.convert_transaction(), cache),
-			Self::Light(light, _) => light.lock().import_block(block.convert_transaction(), cache),
-		}
+		self.inner.import_block(block.convert_transaction(), cache).await
 	}
 }
 
-/// Implements `Verifier` on an `Arc<Mutex<impl Verifier>>`. Used internally.
-#[derive(Clone)]
+/// Implements `Verifier` and keeps track of failed verifications.
 struct VerifierAdapter<B: BlockT> {
-	verifier: Arc<Mutex<Box<dyn Verifier<B>>>>,
+	verifier: Arc<futures::lock::Mutex<Box<dyn Verifier<B>>>>,
 	failed_verifications: Arc<Mutex<HashMap<B::Hash, String>>>,
 }
 
+#[async_trait::async_trait]
 impl<B: BlockT> Verifier<B> for VerifierAdapter<B> {
-	fn verify(
+	async fn verify(
 		&mut self,
 		origin: BlockOrigin,
 		header: B::Header,
@@ -581,17 +599,26 @@ impl<B: BlockT> Verifier<B> for VerifierAdapter<B> {
 		body: Option<Vec<B::Extrinsic>>
 	) -> Result<(BlockImportParams<B, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String> {
 		let hash = header.hash();
-		self.verifier.lock().verify(origin, header, justifications, body).map_err(|e| {
+		self.verifier.lock().await.verify(origin, header, justifications, body).await.map_err(|e| {
 			self.failed_verifications.lock().insert(hash, e.clone());
 			e
 		})
 	}
 }
 
+impl<B: BlockT> Clone for VerifierAdapter<B> {
+	fn clone(&self) -> Self {
+		Self {
+			verifier: self.verifier.clone(),
+			failed_verifications: self.failed_verifications.clone(),
+		}
+	}
+}
+
 impl<B: BlockT> VerifierAdapter<B> {
-	fn new(verifier: Arc<Mutex<Box<dyn Verifier<B>>>>) -> VerifierAdapter<B> {
+	fn new(verifier: impl Verifier<B> + 'static) -> Self {
 		VerifierAdapter {
-			verifier,
+			verifier: Arc::new(futures::lock::Mutex::new(Box::new(verifier))),
 			failed_verifications: Default::default(),
 		}
 	}
@@ -614,8 +641,9 @@ pub struct FullPeerConfig {
 	pub is_authority: bool,
 }
 
-pub trait TestNetFactory: Sized {
+pub trait TestNetFactory: Sized where <Self::BlockImport as BlockImport<Block>>::Transaction: Send {
 	type Verifier: 'static + Verifier<Block>;
+	type BlockImport: BlockImport<Block, Error = ConsensusError> + Clone + Send + Sync + 'static;
 	type PeerData: Default;
 
 	/// These two need to be implemented!
@@ -628,23 +656,20 @@ pub trait TestNetFactory: Sized {
 	) -> Self::Verifier;
 
 	/// Get reference to peer.
-	fn peer(&mut self, i: usize) -> &mut Peer<Self::PeerData>;
-	fn peers(&self) -> &Vec<Peer<Self::PeerData>>;
-	fn mut_peers<F: FnOnce(&mut Vec<Peer<Self::PeerData>>)>(
+	fn peer(&mut self, i: usize) -> &mut Peer<Self::PeerData, Self::BlockImport>;
+	fn peers(&self) -> &Vec<Peer<Self::PeerData, Self::BlockImport>>;
+	fn mut_peers<F: FnOnce(&mut Vec<Peer<Self::PeerData, Self::BlockImport>>)>(
 		&mut self,
 		closure: F,
 	);
 
 	/// Get custom block import handle for fresh client, along with peer data.
-	fn make_block_import<Transaction>(&self, client: PeersClient)
+	fn make_block_import(&self, client: PeersClient)
 		-> (
-			BlockImportAdapter<Transaction>,
+			BlockImportAdapter<Self::BlockImport>,
 			Option<BoxJustificationImport<Block>>,
 			Self::PeerData,
-		)
-	{
-		(client.as_block_import(), None, Default::default())
-	}
+		);
 
 	fn default_config() -> ProtocolConfig {
 		ProtocolConfig::default()
@@ -688,7 +713,7 @@ pub trait TestNetFactory: Sized {
 			&Default::default(),
 			&data,
 		);
-		let verifier = VerifierAdapter::new(Arc::new(Mutex::new(Box::new(verifier) as Box<_>)));
+		let verifier = VerifierAdapter::new(verifier);
 
 		let import_queue = Box::new(BasicQueue::new(
 			verifier.clone(),
@@ -776,7 +801,7 @@ pub trait TestNetFactory: Sized {
 
 			peers.push(Peer {
 				data,
-				client: PeersClient::Full(client, backend.clone()),
+				client: PeersClient::Full(client.clone(), backend.clone()),
 				select_chain: Some(longest_chain),
 				backend: Some(backend),
 				imported_blocks_stream,
@@ -804,7 +829,7 @@ pub trait TestNetFactory: Sized {
 			&Default::default(),
 			&data,
 		);
-		let verifier = VerifierAdapter::new(Arc::new(Mutex::new(Box::new(verifier) as Box<_>)));
+		let verifier = VerifierAdapter::new(verifier);
 
 		let import_queue = Box::new(BasicQueue::new(
 			verifier.clone(),
@@ -986,7 +1011,7 @@ pub trait TestNetFactory: Sized {
 }
 
 pub struct TestNet {
-	peers: Vec<Peer<()>>,
+	peers: Vec<Peer<(), PeersClient>>,
 	fork_choice: ForkChoiceStrategy,
 }
 
@@ -1003,6 +1028,7 @@ impl TestNet {
 impl TestNetFactory for TestNet {
 	type Verifier = PassThroughVerifier;
 	type PeerData = ();
+	type BlockImport = PeersClient;
 
 	/// Create new test network with peers and given config.
 	fn from_config(_config: &ProtocolConfig) -> Self {
@@ -1018,15 +1044,25 @@ impl TestNetFactory for TestNet {
 		PassThroughVerifier::new_with_fork_choice(false, self.fork_choice.clone())
 	}
 
-	fn peer(&mut self, i: usize) -> &mut Peer<()> {
+	fn make_block_import(&self, client: PeersClient)
+		-> (
+			BlockImportAdapter<Self::BlockImport>,
+			Option<BoxJustificationImport<Block>>,
+			Self::PeerData,
+		)
+	{
+		(client.as_block_import(), None, ())
+	}
+
+	fn peer(&mut self, i: usize) -> &mut Peer<(), Self::BlockImport> {
 		&mut self.peers[i]
 	}
 
-	fn peers(&self) -> &Vec<Peer<()>> {
+	fn peers(&self) -> &Vec<Peer<(), Self::BlockImport>> {
 		&self.peers
 	}
 
-	fn mut_peers<F: FnOnce(&mut Vec<Peer<()>>)>(&mut self, closure: F) {
+	fn mut_peers<F: FnOnce(&mut Vec<Peer<(), Self::BlockImport>>)>(&mut self, closure: F) {
 		closure(&mut self.peers);
 	}
 }
@@ -1052,6 +1088,7 @@ pub struct JustificationTestNet(TestNet);
 impl TestNetFactory for JustificationTestNet {
 	type Verifier = PassThroughVerifier;
 	type PeerData = ();
+	type BlockImport = PeersClient;
 
 	fn from_config(config: &ProtocolConfig) -> Self {
 		JustificationTestNet(TestNet::from_config(config))
@@ -1061,23 +1098,23 @@ impl TestNetFactory for JustificationTestNet {
 		self.0.make_verifier(client, config, peer_data)
 	}
 
-	fn peer(&mut self, i: usize) -> &mut Peer<Self::PeerData> {
+	fn peer(&mut self, i: usize) -> &mut Peer<Self::PeerData, Self::BlockImport> {
 		self.0.peer(i)
 	}
 
-	fn peers(&self) -> &Vec<Peer<Self::PeerData>> {
+	fn peers(&self) -> &Vec<Peer<Self::PeerData, Self::BlockImport>> {
 		self.0.peers()
 	}
 
 	fn mut_peers<F: FnOnce(
-		&mut Vec<Peer<Self::PeerData>>,
+		&mut Vec<Peer<Self::PeerData, Self::BlockImport>>,
 	)>(&mut self, closure: F) {
 		self.0.mut_peers(closure)
 	}
 
-	fn make_block_import<Transaction>(&self, client: PeersClient)
+	fn make_block_import(&self, client: PeersClient)
 		-> (
-			BlockImportAdapter<Transaction>,
+			BlockImportAdapter<Self::BlockImport>,
 			Option<BoxJustificationImport<Block>>,
 			Self::PeerData,
 		)
diff --git a/client/offchain/src/lib.rs b/client/offchain/src/lib.rs
index 717f02eccd5d..26975edbd6b6 100644
--- a/client/offchain/src/lib.rs
+++ b/client/offchain/src/lib.rs
@@ -240,6 +240,7 @@ mod tests {
 	use sp_consensus::BlockOrigin;
 	use sc_client_api::Backend as _;
 	use sc_block_builder::BlockBuilderProvider as _;
+	use futures::executor::block_on;
 
 	struct TestNetwork();
 
@@ -331,7 +332,7 @@ mod tests {
 		).unwrap();
 
 		let block = block_builder.build().unwrap().block;
-		client.import(BlockOrigin::Own, block).unwrap();
+		block_on(client.import(BlockOrigin::Own, block)).unwrap();
 
 		assert_eq!(value, &offchain_db.get(sp_offchain::STORAGE_PREFIX, &key).unwrap());
 
@@ -341,7 +342,7 @@ mod tests {
 		).unwrap();
 
 		let block = block_builder.build().unwrap().block;
-		client.import(BlockOrigin::Own, block).unwrap();
+		block_on(client.import(BlockOrigin::Own, block)).unwrap();
 
 		assert!(offchain_db.get(sp_offchain::STORAGE_PREFIX, &key).is_none());
 	}
diff --git a/client/rpc/src/chain/tests.rs b/client/rpc/src/chain/tests.rs
index 025ff53c2fa9..bb673d65ea0f 100644
--- a/client/rpc/src/chain/tests.rs
+++ b/client/rpc/src/chain/tests.rs
@@ -67,7 +67,7 @@ fn should_return_a_block() {
 
 	let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
 	let block_hash = block.hash();
-	client.import(BlockOrigin::Own, block).unwrap();
+	executor::block_on(client.import(BlockOrigin::Own, block)).unwrap();
 
 	// Genesis block is not justified
 	assert_matches!(
@@ -133,7 +133,7 @@ fn should_return_block_hash() {
 	);
 
 	let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, block.clone()).unwrap();
+	executor::block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
 
 	assert_matches!(
 		api.block_hash(Some(ListOrValue::Value(0u64.into())).into()),
@@ -167,7 +167,7 @@ fn should_return_finalized_hash() {
 
 	// import new block
 	let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, block).unwrap();
+	executor::block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	// no finalization yet
 	assert_matches!(
 		api.finalized_head(),
@@ -199,7 +199,7 @@ fn should_notify_about_latest_block() {
 		));
 
 		let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
-		client.import(BlockOrigin::Own, block).unwrap();
+		executor::block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	}
 
 	// assert initial head sent.
@@ -229,7 +229,7 @@ fn should_notify_about_best_block() {
 		));
 
 		let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
-		client.import(BlockOrigin::Own, block).unwrap();
+		executor::block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	}
 
 	// assert initial head sent.
@@ -259,7 +259,7 @@ fn should_notify_about_finalized_block() {
 		));
 
 		let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
-		client.import(BlockOrigin::Own, block).unwrap();
+		executor::block_on(client.import(BlockOrigin::Own, block)).unwrap();
 		client.finalize_block(BlockId::number(1), None).unwrap();
 	}
 
diff --git a/client/rpc/src/state/tests.rs b/client/rpc/src/state/tests.rs
index 87b0fae1d6b3..b5d30b341390 100644
--- a/client/rpc/src/state/tests.rs
+++ b/client/rpc/src/state/tests.rs
@@ -180,7 +180,7 @@ fn should_notify_about_storage_changes() {
 			nonce: 0,
 		}).unwrap();
 		let block = builder.build().unwrap().block;
-		client.import(BlockOrigin::Own, block).unwrap();
+		executor::block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	}
 
 	// assert notification sent to transport
@@ -222,7 +222,7 @@ fn should_send_initial_storage_changes_and_notifications() {
 			nonce: 0,
 		}).unwrap();
 		let block = builder.build().unwrap().block;
-		client.import(BlockOrigin::Own, block).unwrap();
+		executor::block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	}
 
 	// assert initial values sent to transport
@@ -258,7 +258,7 @@ fn should_query_storage() {
 			builder.push_storage_change(vec![5], Some(vec![nonce as u8])).unwrap();
 			let block = builder.build().unwrap().block;
 			let hash = block.header.hash();
-			client.import(BlockOrigin::Own, block).unwrap();
+			executor::block_on(client.import(BlockOrigin::Own, block)).unwrap();
 			hash
 		};
 		let block1_hash = add_block(0);
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index 6ce1ed8b34e1..cff05390d787 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -78,6 +78,7 @@ sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
 tracing = "0.1.25"
 tracing-futures = { version = "0.2.4" }
 parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
+async-trait = "0.1.42"
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
 tempfile = "3.1.0"
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index a39c45664192..f975961c3b4e 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -1698,6 +1698,7 @@ impl<B, E, Block, RA> CallApiAt<Block> for Client<B, E, Block, RA> where
 /// NOTE: only use this implementation when you are sure there are NO consensus-level BlockImport
 /// objects. Otherwise, importing blocks directly into the client would be bypassing
 /// important verification work.
+#[async_trait::async_trait]
 impl<B, E, Block, RA> sp_consensus::BlockImport<Block> for &Client<B, E, Block, RA> where
 	B: backend::Backend<Block>,
 	E: CallExecutor<Block> + Send + Sync,
@@ -1705,6 +1706,8 @@ impl<B, E, Block, RA> sp_consensus::BlockImport<Block> for &Client<B, E, Block,
 	Client<B, E, Block, RA>: ProvideRuntimeApi<Block>,
 	<Client<B, E, Block, RA> as ProvideRuntimeApi<Block>>::Api: CoreApi<Block> +
 		ApiExt<Block, StateBackend = B::State>,
+	RA: Sync + Send,
+	backend::TransactionFor<B, Block>: Send + 'static,
 {
 	type Error = ConsensusError;
 	type Transaction = backend::TransactionFor<B, Block>;
@@ -1718,7 +1721,7 @@ impl<B, E, Block, RA> sp_consensus::BlockImport<Block> for &Client<B, E, Block,
 	///
 	/// If you are not sure that there are no BlockImport objects provided by the consensus
 	/// algorithm, don't use this function.
-	fn import_block(
+	async fn import_block(
 		&mut self,
 		mut import_block: BlockImportParams<Block, backend::TransactionFor<B, Block>>,
 		new_cache: HashMap<CacheKeyId, Vec<u8>>,
@@ -1742,7 +1745,7 @@ impl<B, E, Block, RA> sp_consensus::BlockImport<Block> for &Client<B, E, Block,
 	}
 
 	/// Check block preconditions.
-	fn check_block(
+	async fn check_block(
 		&mut self,
 		block: BlockCheckParams<Block>,
 	) -> Result<ImportResult, Self::Error> {
@@ -1798,6 +1801,7 @@ impl<B, E, Block, RA> sp_consensus::BlockImport<Block> for &Client<B, E, Block,
 	}
 }
 
+#[async_trait::async_trait]
 impl<B, E, Block, RA> sp_consensus::BlockImport<Block> for Client<B, E, Block, RA> where
 	B: backend::Backend<Block>,
 	E: CallExecutor<Block> + Send + Sync,
@@ -1805,23 +1809,25 @@ impl<B, E, Block, RA> sp_consensus::BlockImport<Block> for Client<B, E, Block, R
 	Self: ProvideRuntimeApi<Block>,
 	<Self as ProvideRuntimeApi<Block>>::Api: CoreApi<Block> +
 		ApiExt<Block, StateBackend = B::State>,
+	RA: Sync + Send,
+	backend::TransactionFor<B, Block>: Send + 'static,
 {
 	type Error = ConsensusError;
 	type Transaction = backend::TransactionFor<B, Block>;
 
-	fn import_block(
+	async fn import_block(
 		&mut self,
 		import_block: BlockImportParams<Block, Self::Transaction>,
 		new_cache: HashMap<CacheKeyId, Vec<u8>>,
 	) -> Result<ImportResult, Self::Error> {
-		(&*self).import_block(import_block, new_cache)
+		(&*self).import_block(import_block, new_cache).await
 	}
 
-	fn check_block(
+	async fn check_block(
 		&mut self,
 		block: BlockCheckParams<Block>,
 	) -> Result<ImportResult, Self::Error> {
-		(&*self).check_block(block)
+		(&*self).check_block(block).await
 	}
 }
 
diff --git a/client/service/test/Cargo.toml b/client/service/test/Cargo.toml
index e55320d6c5fb..2108d7e26fa8 100644
--- a/client/service/test/Cargo.toml
+++ b/client/service/test/Cargo.toml
@@ -28,7 +28,7 @@ sp-trie = { version = "3.0.0", path = "../../../primitives/trie" }
 sp-storage = { version = "3.0.0", path = "../../../primitives/storage" }
 sc-client-db = { version = "0.9.0", default-features = false, path = "../../db" }
 futures = { version = "0.3.1", features = ["compat"] }
-sc-service = { version = "0.9.0", default-features = false, features = ["test-helpers"], path = "../../service" }
+sc-service = { version = "0.9.0", features = ["test-helpers"], path = "../../service" }
 sc-network = { version = "0.9.0", path = "../../network" }
 sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
 sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
diff --git a/client/service/test/src/client/light.rs b/client/service/test/src/client/light.rs
index 02d54a24c313..a183cbce62bd 100644
--- a/client/service/test/src/client/light.rs
+++ b/client/service/test/src/client/light.rs
@@ -375,11 +375,11 @@ fn execution_proof_is_generated_and_checked() {
 	for i in 1u32..3u32 {
 		let mut digest = Digest::default();
 		digest.push(sp_runtime::generic::DigestItem::Other::<H256>(i.to_le_bytes().to_vec()));
-		remote_client.import_justified(
+		futures::executor::block_on(remote_client.import_justified(
 			BlockOrigin::Own,
 			remote_client.new_block(digest).unwrap().build().unwrap().block,
 			Justifications::from((*b"TEST", Default::default())),
-		).unwrap();
+		)).unwrap();
 	}
 
 	// check method that doesn't requires environment
@@ -540,7 +540,7 @@ fn prepare_for_header_proof_check(insert_cht: bool) -> (TestChecker, Hash, Heade
 	let mut local_headers_hashes = Vec::new();
 	for i in 0..4 {
 		let block = remote_client.new_block(Default::default()).unwrap().build().unwrap().block;
-		remote_client.import(BlockOrigin::Own, block).unwrap();
+		futures::executor::block_on(remote_client.import(BlockOrigin::Own, block)).unwrap();
 		local_headers_hashes.push(
 			remote_client.block_hash(i + 1)
 				.map_err(|_| ClientError::Backend("TestError".into()))
diff --git a/client/service/test/src/client/mod.rs b/client/service/test/src/client/mod.rs
index d8a09734bebb..0234f43513d5 100644
--- a/client/service/test/src/client/mod.rs
+++ b/client/service/test/src/client/mod.rs
@@ -54,6 +54,7 @@ use sp_storage::StorageKey;
 use sp_trie::{TrieConfiguration, trie_types::Layout};
 use sp_runtime::{generic::BlockId, DigestItem, Justifications};
 use hex_literal::hex;
+use futures::executor::block_on;
 
 mod light;
 mod db;
@@ -108,7 +109,7 @@ pub fn prepare_client_with_key_changes() -> (
 			}).unwrap();
 		}
 		let block = builder.build().unwrap().block;
-		remote_client.import(BlockOrigin::Own, block).unwrap();
+		block_on(remote_client.import(BlockOrigin::Own, block)).unwrap();
 
 		let header = remote_client.header(&BlockId::Number(i as u64 + 1)).unwrap().unwrap();
 		let trie_root = header.digest().log(DigestItem::as_changes_trie_root)
@@ -363,7 +364,7 @@ fn block_builder_works_with_no_transactions() {
 
 	let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
 
-	client.import(BlockOrigin::Own, block).unwrap();
+	block_on(client.import(BlockOrigin::Own, block)).unwrap();
 
 	assert_eq!(client.chain_info().best_number, 1);
 }
@@ -382,7 +383,7 @@ fn block_builder_works_with_transactions() {
 	}).unwrap();
 
 	let block = builder.build().unwrap().block;
-	client.import(BlockOrigin::Own, block).unwrap();
+	block_on(client.import(BlockOrigin::Own, block)).unwrap();
 
 	assert_eq!(client.chain_info().best_number, 1);
 	assert_ne!(
@@ -428,7 +429,7 @@ fn block_builder_does_not_include_invalid() {
 	);
 
 	let block = builder.build().unwrap().block;
-	client.import(BlockOrigin::Own, block).unwrap();
+	block_on(client.import(BlockOrigin::Own, block)).unwrap();
 
 	assert_eq!(client.chain_info().best_number, 1);
 	assert_ne!(
@@ -476,11 +477,11 @@ fn uncles_with_only_ancestors() {
 
 	// G -> A1
 	let a1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a1.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
 	// A1 -> A2
 	let a2 = client.new_block(Default::default()).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a2.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 	let v: Vec<H256> = Vec::new();
 	assert_eq!(v, client.uncles(a2.hash(), 3).unwrap());
 }
@@ -496,7 +497,7 @@ fn uncles_with_multiple_forks() {
 
 	// G -> A1
 	let a1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a1.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
 	// A1 -> A2
 	let a2 = client.new_block_at(
@@ -504,7 +505,7 @@ fn uncles_with_multiple_forks() {
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a2.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
 	// A2 -> A3
 	let a3 = client.new_block_at(
@@ -512,7 +513,7 @@ fn uncles_with_multiple_forks() {
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a3.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a3.clone())).unwrap();
 
 	// A3 -> A4
 	let a4 = client.new_block_at(
@@ -520,7 +521,7 @@ fn uncles_with_multiple_forks() {
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a4.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a4.clone())).unwrap();
 
 	// A4 -> A5
 	let a5 = client.new_block_at(
@@ -528,7 +529,7 @@ fn uncles_with_multiple_forks() {
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a5.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a5.clone())).unwrap();
 
 	// A1 -> B2
 	let mut builder = client.new_block_at(
@@ -544,7 +545,7 @@ fn uncles_with_multiple_forks() {
 		nonce: 0,
 	}).unwrap();
 	let b2 = builder.build().unwrap().block;
-	client.import(BlockOrigin::Own, b2.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, b2.clone())).unwrap();
 
 	// B2 -> B3
 	let b3 = client.new_block_at(
@@ -552,7 +553,7 @@ fn uncles_with_multiple_forks() {
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, b3.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, b3.clone())).unwrap();
 
 	// B3 -> B4
 	let b4 = client.new_block_at(
@@ -560,7 +561,7 @@ fn uncles_with_multiple_forks() {
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, b4.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, b4.clone())).unwrap();
 
 	// // B2 -> C3
 	let mut builder = client.new_block_at(
@@ -576,7 +577,7 @@ fn uncles_with_multiple_forks() {
 		nonce: 1,
 	}).unwrap();
 	let c3 = builder.build().unwrap().block;
-	client.import(BlockOrigin::Own, c3.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, c3.clone())).unwrap();
 
 	// A1 -> D2
 	let mut builder = client.new_block_at(
@@ -592,7 +593,7 @@ fn uncles_with_multiple_forks() {
 		nonce: 0,
 	}).unwrap();
 	let d2 = builder.build().unwrap().block;
-	client.import(BlockOrigin::Own, d2.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, d2.clone())).unwrap();
 
 	let genesis_hash = client.chain_info().genesis_hash;
 
@@ -624,11 +625,11 @@ fn best_containing_on_longest_chain_with_single_chain_3_blocks() {
 
 	// G -> A1
 	let a1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a1.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
 	// A1 -> A2
 	let a2 = client.new_block(Default::default()).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a2.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
 	let genesis_hash = client.chain_info().genesis_hash;
 
@@ -648,7 +649,7 @@ fn best_containing_on_longest_chain_with_multiple_forks() {
 
 	// G -> A1
 	let a1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a1.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
 	// A1 -> A2
 	let a2 = client.new_block_at(
@@ -656,7 +657,7 @@ fn best_containing_on_longest_chain_with_multiple_forks() {
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a2.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
 	// A2 -> A3
 	let a3 = client.new_block_at(
@@ -664,7 +665,7 @@ fn best_containing_on_longest_chain_with_multiple_forks() {
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a3.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a3.clone())).unwrap();
 
 	// A3 -> A4
 	let a4 = client.new_block_at(
@@ -672,7 +673,7 @@ fn best_containing_on_longest_chain_with_multiple_forks() {
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a4.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a4.clone())).unwrap();
 
 	// A4 -> A5
 	let a5 = client.new_block_at(
@@ -680,7 +681,7 @@ fn best_containing_on_longest_chain_with_multiple_forks() {
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a5.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a5.clone())).unwrap();
 
 	// A1 -> B2
 	let mut builder = client.new_block_at(
@@ -696,7 +697,7 @@ fn best_containing_on_longest_chain_with_multiple_forks() {
 		nonce: 0,
 	}).unwrap();
 	let b2 = builder.build().unwrap().block;
-	client.import(BlockOrigin::Own, b2.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, b2.clone())).unwrap();
 
 	// B2 -> B3
 	let b3 = client.new_block_at(
@@ -704,7 +705,7 @@ fn best_containing_on_longest_chain_with_multiple_forks() {
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, b3.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, b3.clone())).unwrap();
 
 	// B3 -> B4
 	let b4 = client.new_block_at(
@@ -712,7 +713,7 @@ fn best_containing_on_longest_chain_with_multiple_forks() {
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, b4.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, b4.clone())).unwrap();
 
 	// // B2 -> C3
 	let mut builder = client.new_block_at(
@@ -728,7 +729,7 @@ fn best_containing_on_longest_chain_with_multiple_forks() {
 		nonce: 1,
 	}).unwrap();
 	let c3 = builder.build().unwrap().block;
-	client.import(BlockOrigin::Own, c3.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, c3.clone())).unwrap();
 
 	// A1 -> D2
 	let mut builder = client.new_block_at(
@@ -744,7 +745,7 @@ fn best_containing_on_longest_chain_with_multiple_forks() {
 		nonce: 0,
 	}).unwrap();
 	let d2 = builder.build().unwrap().block;
-	client.import(BlockOrigin::Own, d2.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, d2.clone())).unwrap();
 
 	assert_eq!(client.chain_info().best_hash, a5.hash());
 
@@ -952,11 +953,15 @@ fn best_containing_on_longest_chain_with_multiple_forks() {
 	assert_eq!(None, longest_chain_select.finality_target(
 		b4.hash(), Some(0)).unwrap());
 
-	assert_eq!(None, longest_chain_select.finality_target(
-		c3.hash().clone(), Some(0)).unwrap());
+	assert_eq!(
+		None,
+		longest_chain_select.finality_target(c3.hash().clone(), Some(0)).unwrap(),
+	);
 
-	assert_eq!(None, longest_chain_select.finality_target(
-		d2.hash().clone(), Some(0)).unwrap());
+	assert_eq!(
+		None,
+		longest_chain_select.finality_target(d2.hash().clone(), Some(0)).unwrap(),
+	);
 }
 
 #[test]
@@ -968,15 +973,18 @@ fn best_containing_on_longest_chain_with_max_depth_higher_than_best() {
 
 	// G -> A1
 	let a1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a1.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
 	// A1 -> A2
 	let a2 = client.new_block(Default::default()).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a2.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
 	let genesis_hash = client.chain_info().genesis_hash;
 
-	assert_eq!(a2.hash(), longest_chain_select.finality_target(genesis_hash, Some(10)).unwrap().unwrap());
+	assert_eq!(
+		a2.hash(),
+		longest_chain_select.finality_target(genesis_hash, Some(10)).unwrap().unwrap(),
+	);
 }
 
 #[test]
@@ -1008,7 +1016,7 @@ fn import_with_justification() {
 
 	// G -> A1
 	let a1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a1.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
 	// A1 -> A2
 	let a2 = client.new_block_at(
@@ -1016,7 +1024,7 @@ fn import_with_justification() {
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a2.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
 	// A2 -> A3
 	let justification = Justifications::from((TEST_ENGINE_ID, vec![1, 2, 3]));
@@ -1025,7 +1033,7 @@ fn import_with_justification() {
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import_justified(BlockOrigin::Own, a3.clone(), justification.clone()).unwrap();
+	block_on(client.import_justified(BlockOrigin::Own, a3.clone(), justification.clone())).unwrap();
 
 	assert_eq!(
 		client.chain_info().finalized_hash,
@@ -1060,14 +1068,14 @@ fn importing_diverged_finalized_block_should_trigger_reorg() {
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a1.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
 	let a2 = client.new_block_at(
 		&BlockId::Hash(a1.hash()),
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a2.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
 	let mut b1 = client.new_block_at(
 		&BlockId::Number(0),
@@ -1092,7 +1100,7 @@ fn importing_diverged_finalized_block_should_trigger_reorg() {
 
 	// importing B1 as finalized should trigger a re-org and set it as new best
 	let justification = Justifications::from((TEST_ENGINE_ID, vec![1, 2, 3]));
-	client.import_justified(BlockOrigin::Own, b1.clone(), justification).unwrap();
+	block_on(client.import_justified(BlockOrigin::Own, b1.clone(), justification)).unwrap();
 
 	assert_eq!(
 		client.chain_info().best_hash,
@@ -1117,14 +1125,14 @@ fn finalizing_diverged_block_should_trigger_reorg() {
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a1.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
 	let a2 = client.new_block_at(
 		&BlockId::Hash(a1.hash()),
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a2.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
 	let mut b1 = client.new_block_at(
 		&BlockId::Number(0),
@@ -1139,14 +1147,14 @@ fn finalizing_diverged_block_should_trigger_reorg() {
 		nonce: 0,
 	}).unwrap();
 	let b1 = b1.build().unwrap().block;
-	client.import(BlockOrigin::Own, b1.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, b1.clone())).unwrap();
 
 	let b2 = client.new_block_at(
 		&BlockId::Hash(b1.hash()),
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, b2.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, b2.clone())).unwrap();
 
 	// A2 is the current best since it's the longest chain
 	assert_eq!(
@@ -1184,7 +1192,7 @@ fn finalizing_diverged_block_should_trigger_reorg() {
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, b3.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, b3.clone())).unwrap();
 
 	assert_eq!(
 		client.chain_info().best_hash,
@@ -1227,7 +1235,7 @@ fn state_reverted_on_reorg() {
 		nonce: 0,
 	}).unwrap();
 	let a1 = a1.build().unwrap().block;
-	client.import(BlockOrigin::Own, a1.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
 	let mut b1 = client.new_block_at(
 		&BlockId::Number(0),
@@ -1242,7 +1250,7 @@ fn state_reverted_on_reorg() {
 	}).unwrap();
 	let b1 = b1.build().unwrap().block;
 	// Reorg to B1
-	client.import_as_best(BlockOrigin::Own, b1.clone()).unwrap();
+	block_on(client.import_as_best(BlockOrigin::Own, b1.clone())).unwrap();
 
 	assert_eq!(950, current_balance(&client));
 	let mut a2 = client.new_block_at(
@@ -1258,7 +1266,7 @@ fn state_reverted_on_reorg() {
 	}).unwrap();
 	let a2 = a2.build().unwrap().block;
 	// Re-org to A2
-	client.import_as_best(BlockOrigin::Own, a2).unwrap();
+	block_on(client.import_as_best(BlockOrigin::Own, a2)).unwrap();
 	assert_eq!(980, current_balance(&client));
 }
 
@@ -1297,14 +1305,14 @@ fn doesnt_import_blocks_that_revert_finality() {
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a1.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
 	let a2 = client.new_block_at(
 		&BlockId::Hash(a1.hash()),
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a2.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
 	let mut b1 = client.new_block_at(&BlockId::Number(0), Default::default(), false).unwrap();
 
@@ -1316,11 +1324,11 @@ fn doesnt_import_blocks_that_revert_finality() {
 		nonce: 0,
 	}).unwrap();
 	let b1 = b1.build().unwrap().block;
-	client.import(BlockOrigin::Own, b1.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, b1.clone())).unwrap();
 
 	let b2 = client.new_block_at(&BlockId::Hash(b1.hash()), Default::default(), false)
 		.unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, b2.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, b2.clone())).unwrap();
 
 	// prepare B3 before we finalize A2, because otherwise we won't be able to
 	// read changes trie configuration after A2 is finalized
@@ -1331,7 +1339,7 @@ fn doesnt_import_blocks_that_revert_finality() {
 	// B3 at the same height but that doesn't include it
 	ClientExt::finalize_block(&client, BlockId::Hash(a2.hash()), None).unwrap();
 
-	let import_err = client.import(BlockOrigin::Own, b3).err().unwrap();
+	let import_err = block_on(client.import(BlockOrigin::Own, b3)).err().unwrap();
 	let expected_err = ConsensusError::ClientImport(
 		sp_blockchain::Error::RuntimeApiError(
 			sp_api::ApiError::Application(Box::new(sp_blockchain::Error::NotInFinalizedChain))
@@ -1356,7 +1364,7 @@ fn doesnt_import_blocks_that_revert_finality() {
 	}).unwrap();
 	let c1 = c1.build().unwrap().block;
 
-	let import_err = client.import(BlockOrigin::Own, c1).err().unwrap();
+	let import_err = block_on(client.import(BlockOrigin::Own, c1)).err().unwrap();
 	let expected_err = ConsensusError::ClientImport(
 		sp_blockchain::Error::NotInFinalizedChain.to_string()
 	);
@@ -1367,7 +1375,6 @@ fn doesnt_import_blocks_that_revert_finality() {
 	);
 }
 
-
 #[test]
 fn respects_block_rules() {
 	fn run_test(
@@ -1396,7 +1403,7 @@ fn respects_block_rules() {
 			allow_missing_state: false,
 			import_existing: false,
 		};
-		assert_eq!(client.check_block(params).unwrap(), ImportResult::imported(false));
+		assert_eq!(block_on(client.check_block(params)).unwrap(), ImportResult::imported(false));
 
 		// this is 0x0d6d6612a10485370d9e085aeea7ec427fb3f34d961c6a816cdbe5cde2278864
 		let mut block_not_ok = client.new_block_at(&BlockId::Number(0), Default::default(), false)
@@ -1414,11 +1421,11 @@ fn respects_block_rules() {
 		if record_only {
 			known_bad.insert(block_not_ok.hash());
 		} else {
-			assert_eq!(client.check_block(params).unwrap(), ImportResult::KnownBad);
+			assert_eq!(block_on(client.check_block(params)).unwrap(), ImportResult::KnownBad);
 		}
 
 		// Now going to the fork
-		client.import_as_final(BlockOrigin::Own, block_ok).unwrap();
+		block_on(client.import_as_final(BlockOrigin::Own, block_ok)).unwrap();
 
 		// And check good fork
 		let mut block_ok = client.new_block_at(&BlockId::Number(1), Default::default(), false)
@@ -1436,7 +1443,7 @@ fn respects_block_rules() {
 		if record_only {
 			fork_rules.push((1, block_ok.hash().clone()));
 		}
-		assert_eq!(client.check_block(params).unwrap(), ImportResult::imported(false));
+		assert_eq!(block_on(client.check_block(params)).unwrap(), ImportResult::imported(false));
 
 		// And now try bad fork
 		let mut block_not_ok = client.new_block_at(&BlockId::Number(1), Default::default(), false)
@@ -1453,7 +1460,7 @@ fn respects_block_rules() {
 		};
 
 		if !record_only {
-			assert_eq!(client.check_block(params).unwrap(), ImportResult::KnownBad);
+			assert_eq!(block_on(client.check_block(params)).unwrap(), ImportResult::KnownBad);
 		}
 	}
 
@@ -1491,8 +1498,11 @@ fn returns_status_for_pruned_blocks() {
 
 	let mut client = TestClientBuilder::with_backend(backend).build();
 
-	let a1 = client.new_block_at(&BlockId::Number(0), Default::default(), false)
-		.unwrap().build().unwrap().block;
+	let a1 = client.new_block_at(
+		&BlockId::Number(0),
+		Default::default(),
+		false,
+	).unwrap().build().unwrap().block;
 
 	let mut b1 = client.new_block_at(&BlockId::Number(0), Default::default(), false).unwrap();
 
@@ -1513,17 +1523,32 @@ fn returns_status_for_pruned_blocks() {
 		import_existing: false,
 	};
 
-	assert_eq!(client.check_block(check_block_a1.clone()).unwrap(), ImportResult::imported(false));
-	assert_eq!(client.block_status(&BlockId::hash(check_block_a1.hash)).unwrap(), BlockStatus::Unknown);
+	assert_eq!(
+		block_on(client.check_block(check_block_a1.clone())).unwrap(),
+		ImportResult::imported(false),
+	);
+	assert_eq!(
+		client.block_status(&BlockId::hash(check_block_a1.hash)).unwrap(),
+		BlockStatus::Unknown,
+	);
 
-	client.import_as_final(BlockOrigin::Own, a1.clone()).unwrap();
+	block_on(client.import_as_final(BlockOrigin::Own, a1.clone())).unwrap();
 
-	assert_eq!(client.check_block(check_block_a1.clone()).unwrap(), ImportResult::AlreadyInChain);
-	assert_eq!(client.block_status(&BlockId::hash(check_block_a1.hash)).unwrap(), BlockStatus::InChainWithState);
+	assert_eq!(
+		block_on(client.check_block(check_block_a1.clone())).unwrap(),
+		ImportResult::AlreadyInChain,
+	);
+	assert_eq!(
+		client.block_status(&BlockId::hash(check_block_a1.hash)).unwrap(),
+		BlockStatus::InChainWithState,
+	);
 
-	let a2 = client.new_block_at(&BlockId::Hash(a1.hash()), Default::default(), false)
-		.unwrap().build().unwrap().block;
-	client.import_as_final(BlockOrigin::Own, a2.clone()).unwrap();
+	let a2 = client.new_block_at(
+		&BlockId::Hash(a1.hash()),
+		Default::default(),
+		false,
+	).unwrap().build().unwrap().block;
+	block_on(client.import_as_final(BlockOrigin::Own, a2.clone())).unwrap();
 
 	let check_block_a2 = BlockCheckParams {
 		hash: a2.hash().clone(),
@@ -1533,15 +1558,30 @@ fn returns_status_for_pruned_blocks() {
 		import_existing: false,
 	};
 
-	assert_eq!(client.check_block(check_block_a1.clone()).unwrap(), ImportResult::AlreadyInChain);
-	assert_eq!(client.block_status(&BlockId::hash(check_block_a1.hash)).unwrap(), BlockStatus::InChainPruned);
-	assert_eq!(client.check_block(check_block_a2.clone()).unwrap(), ImportResult::AlreadyInChain);
-	assert_eq!(client.block_status(&BlockId::hash(check_block_a2.hash)).unwrap(), BlockStatus::InChainWithState);
+	assert_eq!(
+		block_on(client.check_block(check_block_a1.clone())).unwrap(),
+		ImportResult::AlreadyInChain,
+	);
+	assert_eq!(
+		client.block_status(&BlockId::hash(check_block_a1.hash)).unwrap(),
+		BlockStatus::InChainPruned,
+	);
+	assert_eq!(
+		block_on(client.check_block(check_block_a2.clone())).unwrap(),
+		ImportResult::AlreadyInChain,
+	);
+	assert_eq!(
+		client.block_status(&BlockId::hash(check_block_a2.hash)).unwrap(),
+		BlockStatus::InChainWithState,
+	);
 
-	let a3 = client.new_block_at(&BlockId::Hash(a2.hash()), Default::default(), false)
-		.unwrap().build().unwrap().block;
+	let a3 = client.new_block_at(
+		&BlockId::Hash(a2.hash()),
+		Default::default(),
+		false,
+	).unwrap().build().unwrap().block;
 
-	client.import_as_final(BlockOrigin::Own, a3.clone()).unwrap();
+	block_on(client.import_as_final(BlockOrigin::Own, a3.clone())).unwrap();
 	let check_block_a3 = BlockCheckParams {
 		hash: a3.hash().clone(),
 		number: 2,
@@ -1551,12 +1591,30 @@ fn returns_status_for_pruned_blocks() {
 	};
 
 	// a1 and a2 are both pruned at this point
-	assert_eq!(client.check_block(check_block_a1.clone()).unwrap(), ImportResult::AlreadyInChain);
-	assert_eq!(client.block_status(&BlockId::hash(check_block_a1.hash)).unwrap(), BlockStatus::InChainPruned);
-	assert_eq!(client.check_block(check_block_a2.clone()).unwrap(), ImportResult::AlreadyInChain);
-	assert_eq!(client.block_status(&BlockId::hash(check_block_a2.hash)).unwrap(), BlockStatus::InChainPruned);
-	assert_eq!(client.check_block(check_block_a3.clone()).unwrap(), ImportResult::AlreadyInChain);
-	assert_eq!(client.block_status(&BlockId::hash(check_block_a3.hash)).unwrap(), BlockStatus::InChainWithState);
+	assert_eq!(
+		block_on(client.check_block(check_block_a1.clone())).unwrap(),
+		ImportResult::AlreadyInChain,
+	);
+	assert_eq!(
+		client.block_status(&BlockId::hash(check_block_a1.hash)).unwrap(),
+		BlockStatus::InChainPruned,
+	);
+	assert_eq!(
+		block_on(client.check_block(check_block_a2.clone())).unwrap(),
+		ImportResult::AlreadyInChain,
+	);
+	assert_eq!(
+		client.block_status(&BlockId::hash(check_block_a2.hash)).unwrap(),
+		BlockStatus::InChainPruned,
+	);
+	assert_eq!(
+		block_on(client.check_block(check_block_a3.clone())).unwrap(),
+		ImportResult::AlreadyInChain,
+	);
+	assert_eq!(
+		client.block_status(&BlockId::hash(check_block_a3.hash)).unwrap(),
+		BlockStatus::InChainWithState,
+	);
 
 	let mut check_block_b1 = BlockCheckParams {
 		hash: b1.hash().clone(),
@@ -1565,11 +1623,20 @@ fn returns_status_for_pruned_blocks() {
 		allow_missing_state: false,
 		import_existing: false,
 	};
-	assert_eq!(client.check_block(check_block_b1.clone()).unwrap(), ImportResult::MissingState);
+	assert_eq!(
+		block_on(client.check_block(check_block_b1.clone())).unwrap(),
+		ImportResult::MissingState,
+	);
 	check_block_b1.allow_missing_state = true;
-	assert_eq!(client.check_block(check_block_b1.clone()).unwrap(), ImportResult::imported(false));
+	assert_eq!(
+		block_on(client.check_block(check_block_b1.clone())).unwrap(),
+		ImportResult::imported(false),
+	);
 	check_block_b1.parent_hash = H256::random();
-	assert_eq!(client.check_block(check_block_b1.clone()).unwrap(), ImportResult::UnknownParent);
+	assert_eq!(
+		block_on(client.check_block(check_block_b1.clone())).unwrap(),
+		ImportResult::UnknownParent,
+	);
 }
 
 #[test]
@@ -1600,18 +1667,18 @@ fn imports_blocks_with_changes_tries_config_change() {
 	(1..11).for_each(|number| {
 		let block = client.new_block_at(&BlockId::Number(number - 1), Default::default(), false)
 			.unwrap().build().unwrap().block;
-		client.import(BlockOrigin::Own, block).unwrap();
+		block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	});
 	(11..12).for_each(|number| {
 		let mut block = client.new_block_at(&BlockId::Number(number - 1), Default::default(), false).unwrap();
 		block.push_storage_change(vec![42], Some(number.to_le_bytes().to_vec())).unwrap();
 		let block = block.build().unwrap().block;
-		client.import(BlockOrigin::Own, block).unwrap();
+		block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	});
 	(12..23).for_each(|number| {
 		let block = client.new_block_at(&BlockId::Number(number - 1), Default::default(), false)
 			.unwrap().build().unwrap().block;
-		client.import(BlockOrigin::Own, block).unwrap();
+		block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	});
 	(23..24).for_each(|number| {
 		let mut block = client.new_block_at(&BlockId::Number(number - 1), Default::default(), false).unwrap();
@@ -1620,24 +1687,24 @@ fn imports_blocks_with_changes_tries_config_change() {
 			digest_levels: 1,
 		})).unwrap();
 		let block = block.build().unwrap().block;
-		client.import(BlockOrigin::Own, block).unwrap();
+		block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	});
 	(24..26).for_each(|number| {
 		let mut block = client.new_block_at(&BlockId::Number(number - 1), Default::default(), false).unwrap();
 		block.push_storage_change(vec![42], Some(number.to_le_bytes().to_vec())).unwrap();
 		let block = block.build().unwrap().block;
-		client.import(BlockOrigin::Own, block).unwrap();
+		block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	});
 	(26..27).for_each(|number| {
 		let block = client.new_block_at(&BlockId::Number(number - 1), Default::default(), false)
 			.unwrap().build().unwrap().block;
-		client.import(BlockOrigin::Own, block).unwrap();
+		block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	});
 	(27..28).for_each(|number| {
 		let mut block = client.new_block_at(&BlockId::Number(number - 1), Default::default(), false).unwrap();
 		block.push_storage_change(vec![42], Some(number.to_le_bytes().to_vec())).unwrap();
 		let block = block.build().unwrap().block;
-		client.import(BlockOrigin::Own, block).unwrap();
+		block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	});
 	(28..29).for_each(|number| {
 		let mut block = client.new_block_at(&BlockId::Number(number - 1), Default::default(), false).unwrap();
@@ -1646,23 +1713,23 @@ fn imports_blocks_with_changes_tries_config_change() {
 			digest_levels: 1,
 		})).unwrap();
 		let block = block.build().unwrap().block;
-		client.import(BlockOrigin::Own, block).unwrap();
+		block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	});
 	(29..30).for_each(|number| {
 		let block = client.new_block_at(&BlockId::Number(number - 1), Default::default(), false)
 			.unwrap().build().unwrap().block;
-		client.import(BlockOrigin::Own, block).unwrap();
+		block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	});
 	(30..31).for_each(|number| {
 		let mut block = client.new_block_at(&BlockId::Number(number - 1), Default::default(), false).unwrap();
 		block.push_storage_change(vec![42], Some(number.to_le_bytes().to_vec())).unwrap();
 		let block = block.build().unwrap().block;
-		client.import(BlockOrigin::Own, block).unwrap();
+		block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	});
 	(31..32).for_each(|number| {
 		let block = client.new_block_at(&BlockId::Number(number - 1), Default::default(), false)
 			.unwrap().build().unwrap().block;
-		client.import(BlockOrigin::Own, block).unwrap();
+		block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	});
 
 	// now check that configuration cache works
@@ -1778,7 +1845,7 @@ fn cleans_up_closed_notification_sinks_on_block_import() {
 		let mut import = BlockImportParams::new(origin, header);
 		import.body = Some(extrinsics);
 		import.fork_choice = Some(ForkChoiceStrategy::LongestChain);
-		client.import_block(import, Default::default()).unwrap();
+		block_on(client.import_block(import, Default::default())).unwrap();
 	};
 
 	// after importing a block we should still have 4 notification sinks
@@ -1821,14 +1888,14 @@ fn reorg_triggers_a_notification_even_for_sources_that_should_not_trigger_notifi
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::NetworkInitialSync, a1.clone()).unwrap();
+	block_on(client.import(BlockOrigin::NetworkInitialSync, a1.clone())).unwrap();
 
 	let a2 = client.new_block_at(
 		&BlockId::Hash(a1.hash()),
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::NetworkInitialSync, a2.clone()).unwrap();
+	block_on(client.import(BlockOrigin::NetworkInitialSync, a2.clone())).unwrap();
 
 	let mut b1 = client.new_block_at(
 		&BlockId::Number(0),
@@ -1843,7 +1910,7 @@ fn reorg_triggers_a_notification_even_for_sources_that_should_not_trigger_notifi
 		nonce: 0,
 	}).unwrap();
 	let b1 = b1.build().unwrap().block;
-	client.import(BlockOrigin::NetworkInitialSync, b1.clone()).unwrap();
+	block_on(client.import(BlockOrigin::NetworkInitialSync, b1.clone())).unwrap();
 
 	let b2 = client.new_block_at(
 		&BlockId::Hash(b1.hash()),
@@ -1852,7 +1919,7 @@ fn reorg_triggers_a_notification_even_for_sources_that_should_not_trigger_notifi
 	).unwrap().build().unwrap().block;
 
 	// Should trigger a notification because we reorg
-	client.import_as_best(BlockOrigin::NetworkInitialSync, b2.clone()).unwrap();
+	block_on(client.import_as_best(BlockOrigin::NetworkInitialSync, b2.clone())).unwrap();
 
 	// There should be one notification
 	let notification = notification_stream.next().unwrap();
diff --git a/client/sync-state-rpc/src/lib.rs b/client/sync-state-rpc/src/lib.rs
index 846652311644..4cb495599554 100644
--- a/client/sync-state-rpc/src/lib.rs
+++ b/client/sync-state-rpc/src/lib.rs
@@ -37,7 +37,7 @@ type SharedEpochChanges<TBl> = sc_consensus_epochs::SharedEpochChanges<TBl, sc_c
 enum Error<Block: BlockT> {
 	#[error(transparent)]
 	Blockchain(#[from] sp_blockchain::Error),
-	
+
 	#[error("Failed to load the block weight for block {0:?}")]
 	LoadingBlockWeightFailed(<Block as BlockT>::Hash),
 
@@ -94,7 +94,7 @@ impl<TBl, TCl> SyncStateRpcHandler<TBl, TCl>
 			chain_spec, client, shared_authority_set, shared_epoch_changes, deny_unsafe,
 		}
 	}
-	
+
 	fn build_sync_state(&self) -> Result<sc_chain_spec::LightSyncState<TBl>, Error<TBl>> {
 		let finalized_hash = self.client.info().finalized_hash;
 		let finalized_header = self.client.header(BlockId::Hash(finalized_hash))?
@@ -108,7 +108,7 @@ impl<TBl, TCl> SyncStateRpcHandler<TBl, TCl>
 
 		Ok(sc_chain_spec::LightSyncState {
 			finalized_block_header: finalized_header,
-			babe_epoch_changes: self.shared_epoch_changes.lock().clone(),
+			babe_epoch_changes: self.shared_epoch_changes.shared_data().clone(),
 			babe_finalized_block_weight: finalized_block_weight,
 			grandpa_authority_set: self.shared_authority_set.clone_inner(),
 		})
diff --git a/client/transaction-pool/src/testing/pool.rs b/client/transaction-pool/src/testing/pool.rs
index a41632ed8de8..063947b383d0 100644
--- a/client/transaction-pool/src/testing/pool.rs
+++ b/client/transaction-pool/src/testing/pool.rs
@@ -985,7 +985,7 @@ fn import_notification_to_pool_maintain_works() {
 	let mut block_builder = client.new_block(Default::default()).unwrap();
 	block_builder.push(xt).unwrap();
 	let block = block_builder.build().unwrap().block;
-	client.import(BlockOrigin::Own, block).unwrap();
+	block_on(client.import(BlockOrigin::Own, block)).unwrap();
 
 	// Get the notification of the block import and maintain the pool with it,
 	// Now, the pool should not contain any transactions.
diff --git a/primitives/consensus/common/Cargo.toml b/primitives/consensus/common/Cargo.toml
index 3d71cf63f55d..6c3ae5fc060b 100644
--- a/primitives/consensus/common/Cargo.toml
+++ b/primitives/consensus/common/Cargo.toml
@@ -34,6 +34,7 @@ parking_lot = "0.11.1"
 serde = { version = "1.0", features = ["derive"] }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0"}
 wasm-timer = "0.2.5"
+async-trait = "0.1.42"
 
 [dev-dependencies]
 futures = "0.3.9"
diff --git a/primitives/consensus/common/src/block_import.rs b/primitives/consensus/common/src/block_import.rs
index 9b7995a2b00b..8d01da64b4cd 100644
--- a/primitives/consensus/common/src/block_import.rs
+++ b/primitives/consensus/common/src/block_import.rs
@@ -146,7 +146,7 @@ pub struct BlockImportParams<Block: BlockT, Transaction> {
 	/// Intermediate values that are interpreted by block importers. Each block importer,
 	/// upon handling a value, removes it from the intermediate list. The final block importer
 	/// rejects block import if there are still intermediate values that remain unhandled.
-	pub intermediates: HashMap<Cow<'static, [u8]>, Box<dyn Any>>,
+	pub intermediates: HashMap<Cow<'static, [u8]>, Box<dyn Any + Send>>,
 	/// Auxiliary consensus data produced by the block.
 	/// Contains a list of key-value pairs. If values are `None`, the keys
 	/// will be deleted.
@@ -264,14 +264,15 @@ impl<Block: BlockT, Transaction> BlockImportParams<Block, Transaction> {
 }
 
 /// Block import trait.
+#[async_trait::async_trait]
 pub trait BlockImport<B: BlockT> {
 	/// The error type.
 	type Error: std::error::Error + Send + 'static;
 	/// The transaction type used by the backend.
-	type Transaction;
+	type Transaction: Send + 'static;
 
 	/// Check block preconditions.
-	fn check_block(
+	async fn check_block(
 		&mut self,
 		block: BlockCheckParams<B>,
 	) -> Result<ImportResult, Self::Error>;
@@ -279,56 +280,64 @@ pub trait BlockImport<B: BlockT> {
 	/// Import a block.
 	///
 	/// Cached data can be accessed through the blockchain cache.
-	fn import_block(
+	async fn import_block(
 		&mut self,
 		block: BlockImportParams<B, Self::Transaction>,
 		cache: HashMap<CacheKeyId, Vec<u8>>,
 	) -> Result<ImportResult, Self::Error>;
 }
 
-impl<B: BlockT, Transaction> BlockImport<B> for crate::import_queue::BoxBlockImport<B, Transaction> {
+#[async_trait::async_trait]
+impl<B: BlockT, Transaction> BlockImport<B> for crate::import_queue::BoxBlockImport<B, Transaction>
+	where
+		Transaction: Send + 'static,
+{
 	type Error = crate::error::Error;
 	type Transaction = Transaction;
 
 	/// Check block preconditions.
-	fn check_block(
+	async fn check_block(
 		&mut self,
 		block: BlockCheckParams<B>,
 	) -> Result<ImportResult, Self::Error> {
-		(**self).check_block(block)
+		(**self).check_block(block).await
 	}
 
 	/// Import a block.
 	///
 	/// Cached data can be accessed through the blockchain cache.
-	fn import_block(
+	async fn import_block(
 		&mut self,
 		block: BlockImportParams<B, Transaction>,
 		cache: HashMap<CacheKeyId, Vec<u8>>,
 	) -> Result<ImportResult, Self::Error> {
-		(**self).import_block(block, cache)
+		(**self).import_block(block, cache).await
 	}
 }
 
+#[async_trait::async_trait]
 impl<B: BlockT, T, E: std::error::Error + Send + 'static, Transaction> BlockImport<B> for Arc<T>
-	where for<'r> &'r T: BlockImport<B, Error = E, Transaction = Transaction>
+	where
+		for<'r> &'r T: BlockImport<B, Error = E, Transaction = Transaction>,
+		T: Send + Sync,
+		Transaction: Send + 'static,
 {
 	type Error = E;
 	type Transaction = Transaction;
 
-	fn check_block(
+	async fn check_block(
 		&mut self,
 		block: BlockCheckParams<B>,
 	) -> Result<ImportResult, Self::Error> {
-		(&**self).check_block(block)
+		(&**self).check_block(block).await
 	}
 
-	fn import_block(
+	async fn import_block(
 		&mut self,
 		block: BlockImportParams<B, Transaction>,
 		cache: HashMap<CacheKeyId, Vec<u8>>,
 	) -> Result<ImportResult, Self::Error> {
-		(&**self).import_block(block, cache)
+		(&**self).import_block(block, cache).await
 	}
 }
 
diff --git a/primitives/consensus/common/src/import_queue.rs b/primitives/consensus/common/src/import_queue.rs
index b6067645a892..4220c7b14162 100644
--- a/primitives/consensus/common/src/import_queue.rs
+++ b/primitives/consensus/common/src/import_queue.rs
@@ -82,11 +82,12 @@ pub struct IncomingBlock<B: BlockT> {
 pub type CacheKeyId = [u8; 4];
 
 /// Verify a justification of a block
+#[async_trait::async_trait]
 pub trait Verifier<B: BlockT>: Send + Sync {
 	/// Verify the given data and return the BlockImportParams and an optional
 	/// new set of validators to import. If not, err with an Error-Message
 	/// presented to the User in the logs.
-	fn verify(
+	async fn verify(
 		&mut self,
 		origin: BlockOrigin,
 		header: B::Header,
@@ -163,18 +164,18 @@ pub enum BlockImportError {
 }
 
 /// Single block import function.
-pub fn import_single_block<B: BlockT, V: Verifier<B>, Transaction>(
-	import_handle: &mut dyn BlockImport<B, Transaction = Transaction, Error = ConsensusError>,
+pub async fn import_single_block<B: BlockT, V: Verifier<B>, Transaction: Send + 'static>(
+	import_handle: &mut impl BlockImport<B, Transaction = Transaction, Error = ConsensusError>,
 	block_origin: BlockOrigin,
 	block: IncomingBlock<B>,
 	verifier: &mut V,
 ) -> Result<BlockImportResult<NumberFor<B>>, BlockImportError> {
-	import_single_block_metered(import_handle, block_origin, block, verifier, None)
+	import_single_block_metered(import_handle, block_origin, block, verifier, None).await
 }
 
 /// Single block import function with metering.
-pub(crate) fn import_single_block_metered<B: BlockT, V: Verifier<B>, Transaction>(
-	import_handle: &mut dyn BlockImport<B, Transaction = Transaction, Error = ConsensusError>,
+pub(crate) async fn import_single_block_metered<B: BlockT, V: Verifier<B>, Transaction: Send + 'static>(
+	import_handle: &mut impl BlockImport<B, Transaction = Transaction, Error = ConsensusError>,
 	block_origin: BlockOrigin,
 	block: IncomingBlock<B>,
 	verifier: &mut V,
@@ -232,24 +233,28 @@ pub(crate) fn import_single_block_metered<B: BlockT, V: Verifier<B>, Transaction
 		parent_hash,
 		allow_missing_state: block.allow_missing_state,
 		import_existing: block.import_existing,
-	}))? {
+	}).await)? {
 		BlockImportResult::ImportedUnknown { .. } => (),
 		r => return Ok(r), // Any other successful result means that the block is already imported.
 	}
 
 	let started = wasm_timer::Instant::now();
-	let (mut import_block, maybe_keys) = verifier.verify(block_origin, header, justifications, block.body)
-		.map_err(|msg| {
-			if let Some(ref peer) = peer {
-				trace!(target: "sync", "Verifying {}({}) from {} failed: {}", number, hash, peer, msg);
-			} else {
-				trace!(target: "sync", "Verifying {}({}) failed: {}", number, hash, msg);
-			}
-			if let Some(metrics) = metrics.as_ref() {
-				metrics.report_verification(false, started.elapsed());
-			}
-			BlockImportError::VerificationFailed(peer.clone(), msg)
-		})?;
+	let (mut import_block, maybe_keys) = verifier.verify(
+		block_origin,
+		header,
+		justifications,
+		block.body
+	).await.map_err(|msg| {
+		if let Some(ref peer) = peer {
+			trace!(target: "sync", "Verifying {}({}) from {} failed: {}", number, hash, peer, msg);
+		} else {
+			trace!(target: "sync", "Verifying {}({}) failed: {}", number, hash, msg);
+		}
+		if let Some(metrics) = metrics.as_ref() {
+			metrics.report_verification(false, started.elapsed());
+		}
+		BlockImportError::VerificationFailed(peer.clone(), msg)
+	})?;
 
 	if let Some(metrics) = metrics.as_ref() {
 		metrics.report_verification(true, started.elapsed());
@@ -261,7 +266,7 @@ pub(crate) fn import_single_block_metered<B: BlockT, V: Verifier<B>, Transaction
 	}
 	import_block.allow_missing_state = block.allow_missing_state;
 
-	let imported = import_handle.import_block(import_block.convert_transaction(), cache);
+	let imported = import_handle.import_block(import_block.convert_transaction(), cache).await;
 	if let Some(metrics) = metrics.as_ref() {
 		metrics.report_verification_and_import(started.elapsed());
 	}
diff --git a/primitives/consensus/common/src/import_queue/basic_queue.rs b/primitives/consensus/common/src/import_queue/basic_queue.rs
index eb2b4b1fa7fc..7998ba1b3ec7 100644
--- a/primitives/consensus/common/src/import_queue/basic_queue.rs
+++ b/primitives/consensus/common/src/import_queue/basic_queue.rs
@@ -155,7 +155,7 @@ mod worker_messages {
 /// to be run.
 ///
 /// Returns when `block_import` ended.
-async fn block_import_process<B: BlockT, Transaction: Send>(
+async fn block_import_process<B: BlockT, Transaction: Send + 'static>(
 	mut block_import: BoxBlockImport<B, Transaction>,
 	mut verifier: impl Verifier<B>,
 	mut result_sender: BufferedLinkSender<B>,
@@ -195,7 +195,7 @@ struct BlockImportWorker<B: BlockT> {
 }
 
 impl<B: BlockT> BlockImportWorker<B> {
-	fn new<V: 'static + Verifier<B>, Transaction: Send>(
+	fn new<V: 'static + Verifier<B>, Transaction: Send + 'static>(
 		result_sender: BufferedLinkSender<B>,
 		verifier: V,
 		block_import: BoxBlockImport<B, Transaction>,
@@ -322,7 +322,7 @@ struct ImportManyBlocksResult<B: BlockT> {
 /// Import several blocks at once, returning import result for each block.
 ///
 /// This will yield after each imported block once, to ensure that other futures can be called as well.
-async fn import_many_blocks<B: BlockT, V: Verifier<B>, Transaction>(
+async fn import_many_blocks<B: BlockT, V: Verifier<B>, Transaction: Send + 'static>(
 	import_handle: &mut BoxBlockImport<B, Transaction>,
 	blocks_origin: BlockOrigin,
 	blocks: Vec<IncomingBlock<B>>,
@@ -371,7 +371,7 @@ async fn import_many_blocks<B: BlockT, V: Verifier<B>, Transaction>(
 				block,
 				verifier,
 				metrics.clone(),
-			)
+			).await
 		};
 
 		if let Some(metrics) = metrics.as_ref() {
@@ -439,8 +439,9 @@ mod tests {
 	use sp_test_primitives::{Block, BlockNumber, Extrinsic, Hash, Header};
 	use std::collections::HashMap;
 
+	#[async_trait::async_trait]
 	impl Verifier<Block> for () {
-		fn verify(
+		async fn verify(
 			&mut self,
 			origin: BlockOrigin,
 			header: Header,
@@ -451,18 +452,19 @@ mod tests {
 		}
 	}
 
+	#[async_trait::async_trait]
 	impl BlockImport<Block> for () {
 		type Error = crate::Error;
 		type Transaction = Extrinsic;
 
-		fn check_block(
+		async fn check_block(
 			&mut self,
 			_block: BlockCheckParams<Block>,
 		) -> Result<ImportResult, Self::Error> {
 			Ok(ImportResult::imported(false))
 		}
 
-		fn import_block(
+		async fn import_block(
 			&mut self,
 			_block: BlockImportParams<Block, Self::Transaction>,
 			_cache: HashMap<CacheKeyId, Vec<u8>>,
diff --git a/test-utils/client/Cargo.toml b/test-utils/client/Cargo.toml
index df1cca2101ad..925a69e41bb4 100644
--- a/test-utils/client/Cargo.toml
+++ b/test-utils/client/Cargo.toml
@@ -33,3 +33,4 @@ sp-keystore = { version = "0.9.0", path = "../../primitives/keystore" }
 sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
 sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
 sp-state-machine = { version = "0.9.0", path = "../../primitives/state-machine" }
+async-trait = "0.1.42"
diff --git a/test-utils/client/src/client_ext.rs b/test-utils/client/src/client_ext.rs
index aa4856f6baf6..edba96d760fc 100644
--- a/test-utils/client/src/client_ext.rs
+++ b/test-utils/client/src/client_ext.rs
@@ -43,18 +43,20 @@ pub trait ClientExt<Block: BlockT>: Sized {
 }
 
 /// Extension trait for a test client around block importing.
+#[async_trait::async_trait]
 pub trait ClientBlockImportExt<Block: BlockT>: Sized {
 	/// Import block to the chain. No finality.
-	fn import(&mut self, origin: BlockOrigin, block: Block) -> Result<(), ConsensusError>;
+	async fn import(&mut self, origin: BlockOrigin, block: Block) -> Result<(), ConsensusError>;
 
 	/// Import a block and make it our best block if possible.
-	fn import_as_best(&mut self, origin: BlockOrigin, block: Block) -> Result<(), ConsensusError>;
+	async fn import_as_best(&mut self, origin: BlockOrigin, block: Block) -> Result<(), ConsensusError>;
 
 	/// Import a block and finalize it.
-	fn import_as_final(&mut self, origin: BlockOrigin, block: Block) -> Result<(), ConsensusError>;
+	async fn import_as_final(&mut self, origin: BlockOrigin, block: Block)
+		-> Result<(), ConsensusError>;
 
 	/// Import block with justification(s), finalizes block.
-	fn import_justified(
+	async fn import_justified(
 		&mut self,
 		origin: BlockOrigin,
 		block: Block,
@@ -83,38 +85,54 @@ impl<B, E, RA, Block> ClientExt<Block> for Client<B, E, Block, RA>
 }
 
 /// This implementation is required, because of the weird api requirements around `BlockImport`.
+#[async_trait::async_trait]
 impl<Block: BlockT, T, Transaction> ClientBlockImportExt<Block> for std::sync::Arc<T>
-	where for<'r> &'r T: BlockImport<Block, Error = ConsensusError, Transaction = Transaction>
+	where
+		for<'r> &'r T: BlockImport<Block, Error = ConsensusError, Transaction = Transaction>,
+		Transaction: Send + 'static,
+		T: Send + Sync,
 {
-	fn import(&mut self, origin: BlockOrigin, block: Block) -> Result<(), ConsensusError> {
+	async fn import(
+		&mut self,
+		origin: BlockOrigin,
+		block: Block,
+	) -> Result<(), ConsensusError> {
 		let (header, extrinsics) = block.deconstruct();
 		let mut import = BlockImportParams::new(origin, header);
 		import.body = Some(extrinsics);
 		import.fork_choice = Some(ForkChoiceStrategy::LongestChain);
 
-		BlockImport::import_block(self, import, HashMap::new()).map(|_| ())
+		BlockImport::import_block(self, import, HashMap::new()).await.map(|_| ())
 	}
 
-	fn import_as_best(&mut self, origin: BlockOrigin, block: Block) -> Result<(), ConsensusError> {
+	async fn import_as_best(
+		&mut self,
+		origin: BlockOrigin,
+		block: Block,
+	) -> Result<(), ConsensusError> {
 		let (header, extrinsics) = block.deconstruct();
 		let mut import = BlockImportParams::new(origin, header);
 		import.body = Some(extrinsics);
 		import.fork_choice = Some(ForkChoiceStrategy::Custom(true));
 
-		BlockImport::import_block(self, import, HashMap::new()).map(|_| ())
+		BlockImport::import_block(self, import, HashMap::new()).await.map(|_| ())
 	}
 
-	fn import_as_final(&mut self, origin: BlockOrigin, block: Block) -> Result<(), ConsensusError> {
+	async fn import_as_final(
+		&mut self,
+		origin: BlockOrigin,
+		block: Block,
+	) -> Result<(), ConsensusError> {
 		let (header, extrinsics) = block.deconstruct();
 		let mut import = BlockImportParams::new(origin, header);
 		import.body = Some(extrinsics);
 		import.finalized = true;
 		import.fork_choice = Some(ForkChoiceStrategy::Custom(true));
 
-		BlockImport::import_block(self, import, HashMap::new()).map(|_| ())
+		BlockImport::import_block(self, import, HashMap::new()).await.map(|_| ())
 	}
 
-	fn import_justified(
+	async fn import_justified(
 		&mut self,
 		origin: BlockOrigin,
 		block: Block,
@@ -127,43 +145,60 @@ impl<Block: BlockT, T, Transaction> ClientBlockImportExt<Block> for std::sync::A
 		import.finalized = true;
 		import.fork_choice = Some(ForkChoiceStrategy::LongestChain);
 
-		BlockImport::import_block(self, import, HashMap::new()).map(|_| ())
+		BlockImport::import_block(self, import, HashMap::new()).await.map(|_| ())
 	}
 }
 
+#[async_trait::async_trait]
 impl<B, E, RA, Block: BlockT> ClientBlockImportExt<Block> for Client<B, E, Block, RA>
 	where
 		Self: BlockImport<Block, Error = ConsensusError>,
+		RA: Send,
+		B: Send + Sync,
+		E: Send,
+		<Self as BlockImport<Block>>::Transaction: Send,
 {
-	fn import(&mut self, origin: BlockOrigin, block: Block) -> Result<(), ConsensusError> {
+	async fn import(
+		&mut self,
+		origin: BlockOrigin,
+		block: Block,
+	) -> Result<(), ConsensusError> {
 		let (header, extrinsics) = block.deconstruct();
 		let mut import = BlockImportParams::new(origin, header);
 		import.body = Some(extrinsics);
 		import.fork_choice = Some(ForkChoiceStrategy::LongestChain);
 
-		BlockImport::import_block(self, import, HashMap::new()).map(|_| ())
+		BlockImport::import_block(self, import, HashMap::new()).await.map(|_| ())
 	}
 
-	fn import_as_best(&mut self, origin: BlockOrigin, block: Block) -> Result<(), ConsensusError> {
+	async fn import_as_best(
+		&mut self,
+		origin: BlockOrigin,
+		block: Block,
+	) -> Result<(), ConsensusError> {
 		let (header, extrinsics) = block.deconstruct();
 		let mut import = BlockImportParams::new(origin, header);
 		import.body = Some(extrinsics);
 		import.fork_choice = Some(ForkChoiceStrategy::Custom(true));
 
-		BlockImport::import_block(self, import, HashMap::new()).map(|_| ())
+		BlockImport::import_block(self, import, HashMap::new()).await.map(|_| ())
 	}
 
-	fn import_as_final(&mut self, origin: BlockOrigin, block: Block) -> Result<(), ConsensusError> {
+	async fn import_as_final(
+		&mut self,
+		origin: BlockOrigin,
+		block: Block,
+	) -> Result<(), ConsensusError> {
 		let (header, extrinsics) = block.deconstruct();
 		let mut import = BlockImportParams::new(origin, header);
 		import.body = Some(extrinsics);
 		import.finalized = true;
 		import.fork_choice = Some(ForkChoiceStrategy::Custom(true));
 
-		BlockImport::import_block(self, import, HashMap::new()).map(|_| ())
+		BlockImport::import_block(self, import, HashMap::new()).await.map(|_| ())
 	}
 
-	fn import_justified(
+	async fn import_justified(
 		&mut self,
 		origin: BlockOrigin,
 		block: Block,
@@ -176,6 +211,6 @@ impl<B, E, RA, Block: BlockT> ClientBlockImportExt<Block> for Client<B, E, Block
 		import.finalized = true;
 		import.fork_choice = Some(ForkChoiceStrategy::LongestChain);
 
-		BlockImport::import_block(self, import, HashMap::new()).map(|_| ())
+		BlockImport::import_block(self, import, HashMap::new()).await.map(|_| ())
 	}
 }
diff --git a/test-utils/runtime/Cargo.toml b/test-utils/runtime/Cargo.toml
index 89da7929e64b..96b7efff8338 100644
--- a/test-utils/runtime/Cargo.toml
+++ b/test-utils/runtime/Cargo.toml
@@ -53,6 +53,7 @@ serde = { version = "1.0.101", optional = true, features = ["derive"] }
 sc-block-builder = { version = "0.9.0", path = "../../client/block-builder" }
 sc-executor = { version = "0.9.0", path = "../../client/executor" }
 substrate-test-runtime-client = { version = "2.0.0", path = "./client" }
+futures = "0.3.9"
 
 [build-dependencies]
 substrate-wasm-builder = { version = "4.0.0", path = "../../utils/wasm-builder" }
diff --git a/test-utils/runtime/client/src/trait_tests.rs b/test-utils/runtime/client/src/trait_tests.rs
index 5a8083065ec0..32d94dd618a7 100644
--- a/test-utils/runtime/client/src/trait_tests.rs
+++ b/test-utils/runtime/client/src/trait_tests.rs
@@ -32,6 +32,7 @@ use substrate_test_runtime::{self, Transfer};
 use sp_runtime::generic::BlockId;
 use sp_runtime::traits::{Block as BlockT, HashFor};
 use sc_block_builder::BlockBuilderProvider;
+use futures::executor::block_on;
 
 /// helper to test the `leaves` implementation for various backends
 pub fn test_leaves_for_backend<B: 'static>(backend: Arc<B>) where
@@ -57,7 +58,7 @@ pub fn test_leaves_for_backend<B: 'static>(backend: Arc<B>) where
 
 	// G -> A1
 	let a1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a1.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 	assert_eq!(
 		blockchain.leaves().unwrap(),
 		vec![a1.hash()],
@@ -69,7 +70,7 @@ pub fn test_leaves_for_backend<B: 'static>(backend: Arc<B>) where
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a2.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
 	#[allow(deprecated)]
 	assert_eq!(
@@ -83,7 +84,7 @@ pub fn test_leaves_for_backend<B: 'static>(backend: Arc<B>) where
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a3.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a3.clone())).unwrap();
 
 	assert_eq!(
 		blockchain.leaves().unwrap(),
@@ -96,7 +97,7 @@ pub fn test_leaves_for_backend<B: 'static>(backend: Arc<B>) where
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a4.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a4.clone())).unwrap();
 	assert_eq!(
 		blockchain.leaves().unwrap(),
 		vec![a4.hash()],
@@ -109,7 +110,7 @@ pub fn test_leaves_for_backend<B: 'static>(backend: Arc<B>) where
 		false,
 	).unwrap().build().unwrap().block;
 
-	client.import(BlockOrigin::Own, a5.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a5.clone())).unwrap();
 	assert_eq!(
 		blockchain.leaves().unwrap(),
 		vec![a5.hash()],
@@ -130,7 +131,7 @@ pub fn test_leaves_for_backend<B: 'static>(backend: Arc<B>) where
 		nonce: 0,
 	}).unwrap();
 	let b2 = builder.build().unwrap().block;
-	client.import(BlockOrigin::Own, b2.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, b2.clone())).unwrap();
 	assert_eq!(
 		blockchain.leaves().unwrap(),
 		vec![a5.hash(), b2.hash()],
@@ -143,7 +144,7 @@ pub fn test_leaves_for_backend<B: 'static>(backend: Arc<B>) where
 		false,
 	).unwrap().build().unwrap().block;
 
-	client.import(BlockOrigin::Own, b3.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, b3.clone())).unwrap();
 	assert_eq!(
 		blockchain.leaves().unwrap(),
 		vec![a5.hash(), b3.hash()],
@@ -155,7 +156,7 @@ pub fn test_leaves_for_backend<B: 'static>(backend: Arc<B>) where
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, b4.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, b4.clone())).unwrap();
 	assert_eq!(
 		blockchain.leaves().unwrap(),
 		vec![a5.hash(), b4.hash()],
@@ -175,7 +176,7 @@ pub fn test_leaves_for_backend<B: 'static>(backend: Arc<B>) where
 		nonce: 1,
 	}).unwrap();
 	let c3 = builder.build().unwrap().block;
-	client.import(BlockOrigin::Own, c3.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, c3.clone())).unwrap();
 	assert_eq!(
 		blockchain.leaves().unwrap(),
 		vec![a5.hash(), b4.hash(), c3.hash()],
@@ -195,7 +196,7 @@ pub fn test_leaves_for_backend<B: 'static>(backend: Arc<B>) where
 		nonce: 0,
 	}).unwrap();
 	let d2 = builder.build().unwrap().block;
-	client.import(BlockOrigin::Own, d2.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, d2.clone())).unwrap();
 	assert_eq!(
 		blockchain.leaves().unwrap(),
 		vec![a5.hash(), b4.hash(), c3.hash(), d2.hash()],
@@ -220,7 +221,7 @@ pub fn test_children_for_backend<B: 'static>(backend: Arc<B>) where
 
 	// G -> A1
 	let a1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a1.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
 	// A1 -> A2
 	let a2 = client.new_block_at(
@@ -228,7 +229,7 @@ pub fn test_children_for_backend<B: 'static>(backend: Arc<B>) where
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a2.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
 	// A2 -> A3
 	let a3 = client.new_block_at(
@@ -236,7 +237,7 @@ pub fn test_children_for_backend<B: 'static>(backend: Arc<B>) where
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a3.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a3.clone())).unwrap();
 
 	// A3 -> A4
 	let a4 = client.new_block_at(
@@ -244,7 +245,7 @@ pub fn test_children_for_backend<B: 'static>(backend: Arc<B>) where
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a4.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a4.clone())).unwrap();
 
 	// A4 -> A5
 	let a5 = client.new_block_at(
@@ -252,7 +253,7 @@ pub fn test_children_for_backend<B: 'static>(backend: Arc<B>) where
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a5.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a5.clone())).unwrap();
 
 	// A1 -> B2
 	let mut builder = client.new_block_at(
@@ -268,7 +269,7 @@ pub fn test_children_for_backend<B: 'static>(backend: Arc<B>) where
 		nonce: 0,
 	}).unwrap();
 	let b2 = builder.build().unwrap().block;
-	client.import(BlockOrigin::Own, b2.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, b2.clone())).unwrap();
 
 	// B2 -> B3
 	let b3 = client.new_block_at(
@@ -276,7 +277,7 @@ pub fn test_children_for_backend<B: 'static>(backend: Arc<B>) where
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, b3.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, b3.clone())).unwrap();
 
 	// B3 -> B4
 	let b4 = client.new_block_at(
@@ -284,7 +285,7 @@ pub fn test_children_for_backend<B: 'static>(backend: Arc<B>) where
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, b4).unwrap();
+	block_on(client.import(BlockOrigin::Own, b4)).unwrap();
 
 	// // B2 -> C3
 	let mut builder = client.new_block_at(
@@ -300,7 +301,7 @@ pub fn test_children_for_backend<B: 'static>(backend: Arc<B>) where
 		nonce: 1,
 	}).unwrap();
 	let c3 = builder.build().unwrap().block;
-	client.import(BlockOrigin::Own, c3.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, c3.clone())).unwrap();
 
 	// A1 -> D2
 	let mut builder = client.new_block_at(
@@ -316,7 +317,7 @@ pub fn test_children_for_backend<B: 'static>(backend: Arc<B>) where
 		nonce: 0,
 	}).unwrap();
 	let d2 = builder.build().unwrap().block;
-	client.import(BlockOrigin::Own, d2.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, d2.clone())).unwrap();
 
 	let genesis_hash = client.chain_info().genesis_hash;
 
@@ -349,7 +350,7 @@ pub fn test_blockchain_query_by_number_gets_canonical<B: 'static>(backend: Arc<B
 
 	// G -> A1
 	let a1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a1.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
 	// A1 -> A2
 	let a2 = client.new_block_at(
@@ -357,7 +358,7 @@ pub fn test_blockchain_query_by_number_gets_canonical<B: 'static>(backend: Arc<B
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a2.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
 	// A2 -> A3
 	let a3 = client.new_block_at(
@@ -365,7 +366,7 @@ pub fn test_blockchain_query_by_number_gets_canonical<B: 'static>(backend: Arc<B
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a3.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a3.clone())).unwrap();
 
 	// A3 -> A4
 	let a4 = client.new_block_at(
@@ -373,7 +374,7 @@ pub fn test_blockchain_query_by_number_gets_canonical<B: 'static>(backend: Arc<B
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a4.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a4.clone())).unwrap();
 
 	// A4 -> A5
 	let a5 = client.new_block_at(
@@ -381,7 +382,7 @@ pub fn test_blockchain_query_by_number_gets_canonical<B: 'static>(backend: Arc<B
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, a5.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, a5.clone())).unwrap();
 
 	// A1 -> B2
 	let mut builder = client.new_block_at(
@@ -397,7 +398,7 @@ pub fn test_blockchain_query_by_number_gets_canonical<B: 'static>(backend: Arc<B
 		nonce: 0,
 	}).unwrap();
 	let b2 = builder.build().unwrap().block;
-	client.import(BlockOrigin::Own, b2.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, b2.clone())).unwrap();
 
 	// B2 -> B3
 	let b3 = client.new_block_at(
@@ -405,7 +406,7 @@ pub fn test_blockchain_query_by_number_gets_canonical<B: 'static>(backend: Arc<B
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, b3.clone()).unwrap();
+	block_on(client.import(BlockOrigin::Own, b3.clone())).unwrap();
 
 	// B3 -> B4
 	let b4 = client.new_block_at(
@@ -413,7 +414,7 @@ pub fn test_blockchain_query_by_number_gets_canonical<B: 'static>(backend: Arc<B
 		Default::default(),
 		false,
 	).unwrap().build().unwrap().block;
-	client.import(BlockOrigin::Own, b4).unwrap();
+	block_on(client.import(BlockOrigin::Own, b4)).unwrap();
 
 	// // B2 -> C3
 	let mut builder = client.new_block_at(
@@ -429,7 +430,7 @@ pub fn test_blockchain_query_by_number_gets_canonical<B: 'static>(backend: Arc<B
 		nonce: 1,
 	}).unwrap();
 	let c3 = builder.build().unwrap().block;
-	client.import(BlockOrigin::Own, c3).unwrap();
+	block_on(client.import(BlockOrigin::Own, c3)).unwrap();
 
 	// A1 -> D2
 	let mut builder = client.new_block_at(
@@ -445,7 +446,7 @@ pub fn test_blockchain_query_by_number_gets_canonical<B: 'static>(backend: Arc<B
 		nonce: 0,
 	}).unwrap();
 	let d2 = builder.build().unwrap().block;
-	client.import(BlockOrigin::Own, d2).unwrap();
+	block_on(client.import(BlockOrigin::Own, d2)).unwrap();
 
 	let genesis_hash = client.chain_info().genesis_hash;
 
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index b0d0c63218f8..460494bfbd93 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -1261,7 +1261,7 @@ mod tests {
 			(BlockId::Hash(hash), block)
 		};
 
-		client.import(BlockOrigin::Own, block).unwrap();
+		futures::executor::block_on(client.import(BlockOrigin::Own, block)).unwrap();
 
 		// Allocation of 1024k while having ~2048k should succeed.
 		let ret = client.runtime_api().vec_with_capacity(&new_block_id, 1048576);

From aa3344161522648039fd1080f03396775d1a13bf Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Tue, 30 Mar 2021 11:40:56 +0200
Subject: [PATCH 0578/1194] helper macro to create storage types on the fly
 (#8456)

* helper macro to create storage types on the fly

* Update frame/support/src/lib.rs

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

* update lock

* fix test;

* Fix line width

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>
---
 .../src/migrations_3_0_0.rs                   |  48 +++----
 frame/staking/src/lib.rs                      |  29 ++---
 frame/support/src/lib.rs                      | 118 ++++++++++++++++++
 3 files changed, 140 insertions(+), 55 deletions(-)

diff --git a/frame/elections-phragmen/src/migrations_3_0_0.rs b/frame/elections-phragmen/src/migrations_3_0_0.rs
index 8adc4c1a69f7..8afc9ed66920 100644
--- a/frame/elections-phragmen/src/migrations_3_0_0.rs
+++ b/frame/elections-phragmen/src/migrations_3_0_0.rs
@@ -21,7 +21,6 @@ use codec::{Encode, Decode, FullCodec};
 use sp_std::prelude::*;
 use frame_support::{
 	RuntimeDebug, weights::Weight, Twox64Concat,
-	storage::types::{StorageMap, StorageValue},
 	traits::{GetPalletVersion, PalletVersion},
 };
 
@@ -51,38 +50,21 @@ pub trait V2ToV3 {
 	type Balance: 'static + FullCodec + Copy;
 }
 
-struct __Candidates;
-impl frame_support::traits::StorageInstance for __Candidates {
-	fn pallet_prefix() -> &'static str { "PhragmenElection" }
-	const STORAGE_PREFIX: &'static str = "Candidates";
-}
-
-#[allow(type_alias_bounds)]
-type Candidates<T: V2ToV3> = StorageValue<__Candidates, Vec<(T::AccountId, T::Balance)>>;
-
-struct __Members;
-impl frame_support::traits::StorageInstance for __Members {
-	fn pallet_prefix() -> &'static str { "PhragmenElection" }
-	const STORAGE_PREFIX: &'static str = "Members";
-}
-#[allow(type_alias_bounds)]
-type Members<T: V2ToV3> = StorageValue<__Members, Vec<SeatHolder<T::AccountId, T::Balance>>>;
-
-struct __RunnersUp;
-impl frame_support::traits::StorageInstance for __RunnersUp {
-	fn pallet_prefix() -> &'static str { "PhragmenElection" }
-	const STORAGE_PREFIX: &'static str = "RunnersUp";
-}
-#[allow(type_alias_bounds)]
-type RunnersUp<T: V2ToV3> = StorageValue<__RunnersUp, Vec<SeatHolder<T::AccountId, T::Balance>>>;
-
-struct __Voting;
-impl frame_support::traits::StorageInstance for __Voting {
-	fn pallet_prefix() -> &'static str { "PhragmenElection" }
-	const STORAGE_PREFIX: &'static str = "Voting";
-}
-#[allow(type_alias_bounds)]
-type Voting<T: V2ToV3> = StorageMap<__Voting, Twox64Concat, T::AccountId, Voter<T::AccountId, T::Balance>>;
+frame_support::generate_storage_alias!(
+	PhragmenElection, Candidates<T: V2ToV3> => Value<Vec<(T::AccountId, T::Balance)>>
+);
+frame_support::generate_storage_alias!(
+	PhragmenElection, Members<T: V2ToV3> => Value<Vec<SeatHolder<T::AccountId, T::Balance>>>
+);
+frame_support::generate_storage_alias!(
+	PhragmenElection, RunnersUp<T: V2ToV3> => Value<Vec<SeatHolder<T::AccountId, T::Balance>>>
+);
+frame_support::generate_storage_alias!(
+	PhragmenElection, Voting<T: V2ToV3> => Map<
+		(Twox64Concat, T::AccountId),
+		Voter<T::AccountId, T::Balance>
+	>
+);
 
 /// Apply all of the migrations from 2_0_0 to 3_0_0.
 ///
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 0ec976e37712..c28dbc87bccd 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -1036,30 +1036,15 @@ pub mod migrations {
 
 	pub mod v6 {
 		use super::*;
-		use frame_support::{traits::Get, weights::Weight, pallet_prelude::*};
-
-		macro_rules! generate_storage_types {
-			($name:ident => Value<$value:ty>) => {
-				paste::paste! {
-					struct [<$name Instance>];
-					impl frame_support::traits::StorageInstance for [<$name Instance>] {
-						fn pallet_prefix() -> &'static str {
-							"Staking"
-						}
-						const STORAGE_PREFIX: &'static str = stringify!($name);
-					}
-					type $name = StorageValue<[<$name Instance>], $value, ValueQuery>;
-				}
-			}
-		}
+		use frame_support::{traits::Get, weights::Weight, generate_storage_alias};
 
 		// NOTE: value type doesn't matter, we just set it to () here.
-		generate_storage_types!(SnapshotValidators => Value<()>);
-		generate_storage_types!(SnapshotNominators => Value<()>);
-		generate_storage_types!(QueuedElected => Value<()>);
-		generate_storage_types!(QueuedScore => Value<()>);
-		generate_storage_types!(EraElectionStatus => Value<()>);
-		generate_storage_types!(IsCurrentSessionFinal => Value<()>);
+		generate_storage_alias!(Staking, SnapshotValidators => Value<()>);
+		generate_storage_alias!(Staking, SnapshotNominators => Value<()>);
+		generate_storage_alias!(Staking, QueuedElected => Value<()>);
+		generate_storage_alias!(Staking, QueuedScore => Value<()>);
+		generate_storage_alias!(Staking, EraElectionStatus => Value<()>);
+		generate_storage_alias!(Staking, IsCurrentSessionFinal => Value<()>);
 
 		/// check to execute prior to migration.
 		pub fn pre_migrate<T: Config>() -> Result<(), &'static str> {
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 220e7a06bdf3..362c4c5a0a73 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -87,6 +87,124 @@ pub const LOG_TARGET: &'static str = "runtime::frame-support";
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub enum Never {}
 
+/// Generate a new type alias for [`storage::types::value::StorageValue`],
+/// [`storage::types::value::StorageMap`] and [`storage::types::value::StorageDoubleMap`].
+///
+/// Useful for creating a *storage-like* struct for test and migrations.
+///
+///```
+/// # use frame_support::generate_storage_alias;
+/// use frame_support::codec;
+/// use frame_support::Twox64Concat;
+/// // generate a storage value with type u32.
+/// generate_storage_alias!(Prefix, StorageName => Value<u32>);
+///
+/// // generate a double map from `(u32, u32)` (with hasher `Twox64Concat`) to `Vec<u8>`
+/// generate_storage_alias!(
+///		OtherPrefix, OtherStorageName => DoubleMap<
+/// 		(u32, u32),
+/// 		(u32, u32),
+/// 		Vec<u8>
+///		>
+/// );
+///
+/// // generate a map from `Config::AccountId` (with hasher `Twox64Concat`) to `Vec<u8>`
+/// trait Config { type AccountId: codec::FullCodec; }
+/// generate_storage_alias!(
+///		Prefix, GenericStorage<T: Config> => Map<(Twox64Concat, T::AccountId), Vec<u8>>
+/// );
+/// # fn main() {}
+///```
+#[macro_export]
+macro_rules! generate_storage_alias {
+	// without generic for $name.
+	($pallet:ident, $name:ident => Map<($key:ty, $hasher:ty), $value:ty>) => {
+		$crate::paste::paste! {
+			$crate::generate_storage_alias!(@GENERATE_INSTANCE_STRUCT $pallet, $name);
+			type $name = $crate::storage::types::StorageMap<
+				[<$name Instance>],
+				$hasher,
+				$key,
+				$value,
+			>;
+		}
+	};
+	($pallet:ident, $name:ident => DoubleMap<($key1:ty, $hasher1:ty), ($key2:ty, $hasher2:ty), $value:ty>) => {
+		$crate::paste::paste! {
+			$crate::generate_storage_alias!(@GENERATE_INSTANCE_STRUCT $pallet, $name);
+			type $name = $crate::storage::types::StorageMap<
+				[<$name Instance>],
+				$hasher1,
+				$key1,
+				$hasher2,
+				$key2,
+				$value,
+			>;
+		}
+	};
+	($pallet:ident, $name:ident => Value<$value:ty>) => {
+		$crate::paste::paste! {
+			$crate::generate_storage_alias!(@GENERATE_INSTANCE_STRUCT $pallet, $name);
+			type $name = $crate::storage::types::StorageValue<
+				[<$name Instance>],
+				$value,
+			>;
+		}
+	};
+	// with generic for $name.
+	($pallet:ident, $name:ident<$t:ident : $bounds:tt> => Map<($key:ty, $hasher:ty), $value:ty>) => {
+		$crate::paste::paste! {
+			$crate::generate_storage_alias!(@GENERATE_INSTANCE_STRUCT $pallet, $name);
+			#[allow(type_alias_bounds)]
+			type $name<$t : $bounds> = $crate::storage::types::StorageMap<
+				[<$name Instance>],
+				$key,
+				$hasher,
+				$value,
+			>;
+		}
+	};
+	(
+		$pallet:ident,
+		$name:ident<$t:ident : $bounds:tt>
+		=> DoubleMap<($key1:ty, $hasher1:ty), ($key2:ty, $hasher2:ty), $value:ty>)
+	=> {
+		$crate::paste::paste! {
+			$crate::generate_storage_alias!(@GENERATE_INSTANCE_STRUCT $pallet, $name);
+			#[allow(type_alias_bounds)]
+			type $name<$t : $bounds> = $crate::storage::types::StorageMap<
+				[<$name Instance>],
+				$key1,
+				$hasher1,
+				$key2,
+				$hasher2,
+				$value,
+			>;
+		}
+	};
+	($pallet:ident, $name:ident<$t:ident : $bounds:tt> => Value<$value:ty>) => {
+		$crate::paste::paste! {
+			$crate::generate_storage_alias!(@GENERATE_INSTANCE_STRUCT $pallet, $name);
+			#[allow(type_alias_bounds)]
+			type $name<$t : $bounds> = $crate::storage::types::StorageValue<
+				[<$name Instance>],
+				$value,
+				$crate::storage::types::ValueQuery,
+			>;
+		}
+	};
+	// helper used in all arms.
+	(@GENERATE_INSTANCE_STRUCT $pallet:ident, $name:ident) => {
+		$crate::paste::paste! {
+			struct [<$name Instance>];
+			impl $crate::traits::StorageInstance for [<$name Instance>] {
+				fn pallet_prefix() -> &'static str { stringify!($pallet) }
+				const STORAGE_PREFIX: &'static str = stringify!($name);
+			}
+		}
+	}
+}
+
 /// Create new implementations of the [`Get`](crate::traits::Get) trait.
 ///
 /// The so-called parameter type can be created in four different ways:

From 88243c11d67baeaa27057118db10135dad6e7df5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Tue, 30 Mar 2021 12:08:05 +0100
Subject: [PATCH 0579/1194] client: fix justifications migration (#8489)

* client: rename variables

* client: fix justifications migration

* client: fix compilation
---
 client/db/src/lib.rs     | 6 +++---
 client/db/src/upgrade.rs | 9 +++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index 0fc8e299f2a6..03a6ce220095 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -561,10 +561,10 @@ impl<Block: BlockT> sc_client_api::blockchain::Backend<Block> for BlockchainDb<B
 
 	fn justifications(&self, id: BlockId<Block>) -> ClientResult<Option<Justifications>> {
 		match read_db(&*self.db, columns::KEY_LOOKUP, columns::JUSTIFICATIONS, id)? {
-			Some(justification) => match Decode::decode(&mut &justification[..]) {
-				Ok(justification) => Ok(Some(justification)),
+			Some(justifications) => match Decode::decode(&mut &justifications[..]) {
+				Ok(justifications) => Ok(Some(justifications)),
 				Err(err) => return Err(sp_blockchain::Error::Backend(
-					format!("Error decoding justification: {}", err)
+					format!("Error decoding justifications: {}", err)
 				)),
 			}
 			None => Ok(None),
diff --git a/client/db/src/upgrade.rs b/client/db/src/upgrade.rs
index 6c7cbbb4a1af..ea91b8253e1d 100644
--- a/client/db/src/upgrade.rs
+++ b/client/db/src/upgrade.rs
@@ -25,7 +25,7 @@ use std::path::{Path, PathBuf};
 use sp_runtime::traits::Block as BlockT;
 use crate::{columns, utils::DatabaseType};
 use kvdb_rocksdb::{Database, DatabaseConfig};
-use codec::Encode;
+use codec::{Decode, Encode};
 
 /// Version file name.
 const VERSION_FILE_NAME: &'static str = "db_version";
@@ -83,7 +83,12 @@ fn migrate_2_to_3<Block: BlockT>(db_path: &Path, _db_type: DatabaseType) -> sp_b
 	let mut transaction = db.transaction();
 	for key in keys {
 		if let Some(justification) = db.get(columns::JUSTIFICATIONS, &key).map_err(db_err)? {
-			// Tag each Justification with the hardcoded ID for GRANDPA. Avoid the dependency on the GRANDPA crate
+			// Tag each justification with the hardcoded ID for GRANDPA to avoid the dependency on
+			// the GRANDPA crate.
+			// NOTE: when storing justifications the previous API would get a `Vec<u8>` and still
+			// call encode on it.
+			let justification = Vec::<u8>::decode(&mut &justification[..])
+				.map_err(|_| sp_blockchain::Error::Backend("Invalid justification blob".into()))?;
 			let justifications = sp_runtime::Justifications::from((*b"FRNK", justification));
 			transaction.put_vec(columns::JUSTIFICATIONS, &key, justifications.encode());
 		}

From 3e96c698d7a41fd8fc7c0c644d49db326e86bdc5 Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Wed, 31 Mar 2021 10:28:52 +0300
Subject: [PATCH 0580/1194] Fix sync restart (#8497)

---
 client/network/src/protocol/sync.rs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/client/network/src/protocol/sync.rs b/client/network/src/protocol/sync.rs
index 22cfcc5eb4f6..d7d0f66750b6 100644
--- a/client/network/src/protocol/sync.rs
+++ b/client/network/src/protocol/sync.rs
@@ -1552,11 +1552,13 @@ impl<B: BlockT> ChainSync<B> {
 		debug!(target:"sync", "Restarted with {} ({})", self.best_queued_number, self.best_queued_hash);
 		let old_peers = std::mem::take(&mut self.peers);
 
-		old_peers.into_iter().filter_map(move |(id, p)| {
+		old_peers.into_iter().filter_map(move |(id, mut p)| {
 			// peers that were downloading justifications
 			// should be kept in that state.
 			match p.state {
 				PeerSyncState::DownloadingJustification(_) => {
+					// We make sure our commmon number is at least something we have.
+					p.common_number = info.best_number;
 					self.peers.insert(id, p);
 					return None;
 				}
@@ -2064,6 +2066,14 @@ mod test {
 			sync.peers.get(&peer_id3).unwrap().state,
 			PeerSyncState::DownloadingJustification(b1_hash),
 		);
+
+		// Set common block to something that we don't have (e.g. failed import)
+		sync.peers.get_mut(&peer_id3).unwrap().common_number = 100;
+		let _ = sync.restart().count();
+		assert_eq!(
+			sync.peers.get(&peer_id3).unwrap().common_number,
+			50
+		);
 	}
 
 	/// Send a block annoucnement for the given `header`.

From 70f1b61a135197d811a4a3b88a7c87cfdcfcf73f Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Wed, 31 Mar 2021 13:46:14 +0300
Subject: [PATCH 0581/1194] Duplicate logging to stdout (#8495)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Duplicate logging to stdout

* Update client/tracing/src/logging/event_format.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 client/tracing/src/logging/event_format.rs | 16 +++++++++++++++-
 client/tracing/src/logging/mod.rs          |  1 +
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/client/tracing/src/logging/event_format.rs b/client/tracing/src/logging/event_format.rs
index 25fd2f3ba3d7..5e7a5246cca0 100644
--- a/client/tracing/src/logging/event_format.rs
+++ b/client/tracing/src/logging/event_format.rs
@@ -43,6 +43,8 @@ pub struct EventFormat<T = SystemTime> {
 	pub display_thread_name: bool,
 	/// Enable ANSI terminal colors for formatted output.
 	pub enable_color: bool,
+	/// Duplicate INFO, WARN and ERROR messages to stdout.
+	pub dup_to_stdout: bool,
 }
 
 impl<T> EventFormat<T>
@@ -123,7 +125,19 @@ where
 		writer: &mut dyn fmt::Write,
 		event: &Event,
 	) -> fmt::Result {
-		self.format_event_custom(CustomFmtContext::FmtContext(ctx), writer, event)
+		if self.dup_to_stdout && (
+			event.metadata().level() == &Level::INFO ||
+			event.metadata().level() == &Level::WARN ||
+			event.metadata().level() == &Level::ERROR
+		) {
+			let mut out = String::new();
+			self.format_event_custom(CustomFmtContext::FmtContext(ctx), &mut out, event)?;
+			writer.write_str(&out)?;
+			print!("{}", out);
+			Ok(())
+		} else {
+			self.format_event_custom(CustomFmtContext::FmtContext(ctx), writer, event)
+		}
 	}
 }
 
diff --git a/client/tracing/src/logging/mod.rs b/client/tracing/src/logging/mod.rs
index 187b6a387f32..1023879e3d7f 100644
--- a/client/tracing/src/logging/mod.rs
+++ b/client/tracing/src/logging/mod.rs
@@ -167,6 +167,7 @@ where
 		display_level: !simple,
 		display_thread_name: !simple,
 		enable_color,
+		dup_to_stdout: !atty::is(atty::Stream::Stderr) && atty::is(atty::Stream::Stdout),
 	};
 	let builder = FmtSubscriber::builder().with_env_filter(env_filter);
 

From bf200cca41b26793c878f7930b6fbead262a415e Mon Sep 17 00:00:00 2001
From: Andrew Jones <ascjones@gmail.com>
Date: Wed, 31 Mar 2021 19:08:28 +0100
Subject: [PATCH 0582/1194] Migrate `pallet-indices` to `pallet!` (#8465)

* tmp add upgrade file

* Migrate pallet-indices to `pallet!`

* Delete temp upgrade file

* Fix some migration errors

* Fix some warnings

* Add serde bound, explicit balance type

* Module -> Pallet
---
 frame/indices/src/benchmarking.rs |   2 +-
 frame/indices/src/lib.rs          | 204 ++++++++++++++++++------------
 2 files changed, 123 insertions(+), 83 deletions(-)

diff --git a/frame/indices/src/benchmarking.rs b/frame/indices/src/benchmarking.rs
index 6ea39e9ccc23..625a994af38f 100644
--- a/frame/indices/src/benchmarking.rs
+++ b/frame/indices/src/benchmarking.rs
@@ -24,7 +24,7 @@ use frame_system::RawOrigin;
 use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
 use sp_runtime::traits::Bounded;
 
-use crate::Module as Indices;
+use crate::Pallet as Indices;
 
 const SEED: u32 = 0;
 
diff --git a/frame/indices/src/lib.rs b/frame/indices/src/lib.rs
index c925d3a0533e..19697f2d941b 100644
--- a/frame/indices/src/lib.rs
+++ b/frame/indices/src/lib.rs
@@ -29,86 +29,51 @@ use sp_std::prelude::*;
 use codec::Codec;
 use sp_runtime::MultiAddress;
 use sp_runtime::traits::{
-	StaticLookup, Member, LookupError, Zero, Saturating, AtLeast32Bit
+	StaticLookup, LookupError, Zero, Saturating, AtLeast32Bit
 };
-use frame_support::{Parameter, decl_module, decl_error, decl_event, decl_storage, ensure};
-use frame_support::dispatch::DispatchResult;
-use frame_support::traits::{Currency, ReservableCurrency, Get, BalanceStatus::Reserved};
-use frame_system::{ensure_signed, ensure_root};
+use frame_support::traits::{Currency, ReservableCurrency, BalanceStatus::Reserved};
 pub use weights::WeightInfo;
 
 type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 
-/// The module's config trait.
-pub trait Config: frame_system::Config {
-	/// Type used for storing an account's index; implies the maximum number of accounts the system
-	/// can hold.
-	type AccountIndex: Parameter + Member + Codec + Default + AtLeast32Bit + Copy;
+pub use pallet::*;
 
-	/// The currency trait.
-	type Currency: ReservableCurrency<Self::AccountId>;
+#[frame_support::pallet]
+pub mod pallet {
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+	use super::*;
 
-	/// The deposit needed for reserving an index.
-	type Deposit: Get<BalanceOf<Self>>;
+	/// The module's config trait.
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		/// Type used for storing an account's index; implies the maximum number of accounts the system
+		/// can hold.
+		type AccountIndex: Parameter + Member + MaybeSerializeDeserialize + Codec + Default + AtLeast32Bit + Copy;
 
-	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
+		/// The currency trait.
+		type Currency: ReservableCurrency<Self::AccountId>;
 
-	/// Weight information for extrinsics in this pallet.
-	type WeightInfo: WeightInfo;
-}
-
-decl_storage! {
-	trait Store for Module<T: Config> as Indices {
-		/// The lookup from index to account.
-		pub Accounts build(|config: &GenesisConfig<T>|
-			config.indices.iter()
-				.cloned()
-				.map(|(a, b)| (a, (b, Zero::zero(), false)))
-				.collect::<Vec<_>>()
-		): map hasher(blake2_128_concat) T::AccountIndex => Option<(T::AccountId, BalanceOf<T>, bool)>;
-	}
-	add_extra_genesis {
-		config(indices): Vec<(T::AccountIndex, T::AccountId)>;
-	}
-}
+		/// The deposit needed for reserving an index.
+		#[pallet::constant]
+		type Deposit: Get<BalanceOf<Self>>;
 
-decl_event!(
-	pub enum Event<T> where
-		<T as frame_system::Config>::AccountId,
-		<T as Config>::AccountIndex
-	{
-		/// A account index was assigned. \[index, who\]
-		IndexAssigned(AccountId, AccountIndex),
-		/// A account index has been freed up (unassigned). \[index\]
-		IndexFreed(AccountIndex),
-		/// A account index has been frozen to its current account ID. \[index, who\]
-		IndexFrozen(AccountIndex, AccountId),
-	}
-);
+		/// The overarching event type.
+		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
 
-decl_error! {
-	pub enum Error for Module<T: Config> {
-		/// The index was not already assigned.
-		NotAssigned,
-		/// The index is assigned to another account.
-		NotOwner,
-		/// The index was not available.
-		InUse,
-		/// The source and destination accounts are identical.
-		NotTransfer,
-		/// The index is permanent and may not be freed/changed.
-		Permanent,
+		/// Weight information for extrinsics in this pallet.
+		type WeightInfo: WeightInfo;
 	}
-}
 
-decl_module! {
-	pub struct Module<T: Config> for enum Call where origin: T::Origin, system = frame_system {
-		/// The deposit needed for reserving an index.
-		const Deposit: BalanceOf<T> = T::Deposit::get();
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(PhantomData<T>);
 
-		fn deposit_event() = default;
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
 
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
 		/// Assign an previously unassigned index.
 		///
 		/// Payment: `Deposit` is reserved from the sender account.
@@ -127,8 +92,8 @@ decl_module! {
 		/// -------------------
 		/// - DB Weight: 1 Read/Write (Accounts)
 		/// # </weight>
-		#[weight = T::WeightInfo::claim()]
-		fn claim(origin, index: T::AccountIndex) {
+		#[pallet::weight(T::WeightInfo::claim())]
+		pub(crate) fn claim(origin: OriginFor<T>, index: T::AccountIndex) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 
 			Accounts::<T>::try_mutate(index, |maybe_value| {
@@ -136,7 +101,8 @@ decl_module! {
 				*maybe_value = Some((who.clone(), T::Deposit::get(), false));
 				T::Currency::reserve(&who, T::Deposit::get())
 			})?;
-			Self::deposit_event(RawEvent::IndexAssigned(who, index));
+			Self::deposit_event(Event::IndexAssigned(who, index));
+			Ok(())
 		}
 
 		/// Assign an index already owned by the sender to another account. The balance reservation
@@ -159,8 +125,12 @@ decl_module! {
 		///    - Reads: Indices Accounts, System Account (recipient)
 		///    - Writes: Indices Accounts, System Account (recipient)
 		/// # </weight>
-		#[weight = T::WeightInfo::transfer()]
-		fn transfer(origin, new: T::AccountId, index: T::AccountIndex) {
+		#[pallet::weight(T::WeightInfo::transfer())]
+		pub(crate) fn transfer(
+			origin: OriginFor<T>,
+			new: T::AccountId,
+			index: T::AccountIndex,
+		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			ensure!(who != new, Error::<T>::NotTransfer);
 
@@ -172,7 +142,8 @@ decl_module! {
 				*maybe_value = Some((new.clone(), amount.saturating_sub(lost), false));
 				Ok(())
 			})?;
-			Self::deposit_event(RawEvent::IndexAssigned(new, index));
+			Self::deposit_event(Event::IndexAssigned(new, index));
+			Ok(())
 		}
 
 		/// Free up an index owned by the sender.
@@ -193,8 +164,8 @@ decl_module! {
 		/// -------------------
 		/// - DB Weight: 1 Read/Write (Accounts)
 		/// # </weight>
-		#[weight = T::WeightInfo::free()]
-		fn free(origin, index: T::AccountIndex) {
+		#[pallet::weight(T::WeightInfo::free())]
+		pub(crate) fn free(origin: OriginFor<T>, index: T::AccountIndex) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 
 			Accounts::<T>::try_mutate(index, |maybe_value| -> DispatchResult {
@@ -204,7 +175,8 @@ decl_module! {
 				T::Currency::unreserve(&who, amount);
 				Ok(())
 			})?;
-			Self::deposit_event(RawEvent::IndexFreed(index));
+			Self::deposit_event(Event::IndexFreed(index));
+			Ok(())
 		}
 
 		/// Force an index to an account. This doesn't require a deposit. If the index is already
@@ -228,8 +200,13 @@ decl_module! {
 		///    - Reads: Indices Accounts, System Account (original owner)
 		///    - Writes: Indices Accounts, System Account (original owner)
 		/// # </weight>
-		#[weight = T::WeightInfo::force_transfer()]
-		fn force_transfer(origin, new: T::AccountId, index: T::AccountIndex, freeze: bool) {
+		#[pallet::weight(T::WeightInfo::force_transfer())]
+		pub(crate) fn force_transfer(
+			origin: OriginFor<T>,
+			new: T::AccountId,
+			index: T::AccountIndex,
+			freeze: bool,
+		) -> DispatchResult {
 			ensure_root(origin)?;
 
 			Accounts::<T>::mutate(index, |maybe_value| {
@@ -238,7 +215,8 @@ decl_module! {
 				}
 				*maybe_value = Some((new.clone(), Zero::zero(), freeze));
 			});
-			Self::deposit_event(RawEvent::IndexAssigned(new, index));
+			Self::deposit_event(Event::IndexAssigned(new, index));
+			Ok(())
 		}
 
 		/// Freeze an index so it will always point to the sender account. This consumes the deposit.
@@ -258,8 +236,8 @@ decl_module! {
 		/// -------------------
 		/// - DB Weight: 1 Read/Write (Accounts)
 		/// # </weight>
-		#[weight = T::WeightInfo::freeze()]
-		fn freeze(origin, index: T::AccountIndex) {
+		#[pallet::weight(T::WeightInfo::freeze())]
+		pub(crate) fn freeze(origin: OriginFor<T>, index: T::AccountIndex) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 
 			Accounts::<T>::try_mutate(index, |maybe_value| -> DispatchResult {
@@ -270,12 +248,74 @@ decl_module! {
 				*maybe_value = Some((account, Zero::zero(), true));
 				Ok(())
 			})?;
-			Self::deposit_event(RawEvent::IndexFrozen(index, who));
+			Self::deposit_event(Event::IndexFrozen(index, who));
+			Ok(())
+		}
+	}
+
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	#[pallet::metadata(T::AccountId = "AccountId", T::AccountIndex = "AccountIndex")]
+	pub enum Event<T: Config> {
+		/// A account index was assigned. \[index, who\]
+		IndexAssigned(T::AccountId, T::AccountIndex),
+		/// A account index has been freed up (unassigned). \[index\]
+		IndexFreed(T::AccountIndex),
+		/// A account index has been frozen to its current account ID. \[index, who\]
+		IndexFrozen(T::AccountIndex, T::AccountId),
+	}
+
+	/// Old name generated by `decl_event`.
+	#[deprecated(note="use `Event` instead")]
+	pub type RawEvent<T> = Event<T>;
+
+	#[pallet::error]
+	pub enum Error<T> {
+		/// The index was not already assigned.
+		NotAssigned,
+		/// The index is assigned to another account.
+		NotOwner,
+		/// The index was not available.
+		InUse,
+		/// The source and destination accounts are identical.
+		NotTransfer,
+		/// The index is permanent and may not be freed/changed.
+		Permanent,
+	}
+
+	/// The lookup from index to account.
+	#[pallet::storage]
+	pub type Accounts<T: Config> = StorageMap<
+		_, Blake2_128Concat,
+		T::AccountIndex,
+		(T::AccountId, BalanceOf<T>, bool)
+	>;
+
+	#[pallet::genesis_config]
+	pub struct GenesisConfig<T: Config> {
+		pub indices: Vec<(T::AccountIndex, T::AccountId)>,
+	}
+
+	#[cfg(feature = "std")]
+	impl<T: Config> Default for GenesisConfig<T> {
+		fn default() -> Self {
+			Self {
+				indices: Default::default(),
+			}
+		}
+	}
+
+	#[pallet::genesis_build]
+	impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+		fn build(&self) {
+			for (a, b) in &self.indices {
+				<Accounts<T>>::insert(a, (b, <BalanceOf<T>>::zero(), false))
+			}
 		}
 	}
 }
 
-impl<T: Config> Module<T> {
+impl<T: Config> Pallet<T> {
 	// PUBLIC IMMUTABLES
 
 	/// Lookup an T::AccountIndex to get an Id, if there's one there.
@@ -295,7 +335,7 @@ impl<T: Config> Module<T> {
 	}
 }
 
-impl<T: Config> StaticLookup for Module<T> {
+impl<T: Config> StaticLookup for Pallet<T> {
 	type Source = MultiAddress<T::AccountId, T::AccountIndex>;
 	type Target = T::AccountId;
 

From 753187e12ab6b4ff2915291c156b283d82d126ed Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Thu, 1 Apr 2021 00:02:31 +0300
Subject: [PATCH 0583/1194] Fixed sync skipping some block announcements
 (#8459)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fixed sync missing some block announcements

* Apply suggestions from code review

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
---
 client/network/src/protocol/message.rs | 20 +++++++
 client/network/src/protocol/sync.rs    | 67 ++++++++++++----------
 client/network/test/src/lib.rs         | 11 +++-
 client/network/test/src/sync.rs        | 77 ++++++++++++++++++++++++++
 4 files changed, 144 insertions(+), 31 deletions(-)

diff --git a/client/network/src/protocol/message.rs b/client/network/src/protocol/message.rs
index 01e9a5d7215a..7564804400fb 100644
--- a/client/network/src/protocol/message.rs
+++ b/client/network/src/protocol/message.rs
@@ -144,6 +144,26 @@ pub struct RemoteReadResponse {
 	pub proof: StorageProof,
 }
 
+/// Announcement summary used for debug logging.
+#[derive(Debug)]
+pub struct AnnouncementSummary<H: HeaderT> {
+	block_hash: H::Hash,
+	number: H::Number,
+	parent_hash: H::Hash,
+	state: Option<BlockState>,
+}
+
+impl<H: HeaderT> generic::BlockAnnounce<H> {
+	pub fn summary(&self) -> AnnouncementSummary<H> {
+		AnnouncementSummary {
+			block_hash: self.header.hash(),
+			number: *self.header.number(),
+			parent_hash: self.header.parent_hash().clone(),
+			state: self.state,
+		}
+	}
+}
+
 /// Generic types.
 pub mod generic {
 	use bitflags::bitflags;
diff --git a/client/network/src/protocol/sync.rs b/client/network/src/protocol/sync.rs
index d7d0f66750b6..dd682bf348b0 100644
--- a/client/network/src/protocol/sync.rs
+++ b/client/network/src/protocol/sync.rs
@@ -505,9 +505,10 @@ impl<B: BlockT> ChainSync<B> {
 		}
 	}
 
-	/// Number of active sync requests.
+	/// Number of active forks requests. This includes
+	/// requests that are pending or could be issued right away.
 	pub fn num_sync_requests(&self) -> usize {
-		self.fork_targets.len()
+		self.fork_targets.values().filter(|f| f.number <= self.best_queued_number).count()
 	}
 
 	/// Number of downloaded blocks.
@@ -1421,23 +1422,36 @@ impl<B: BlockT> ChainSync<B> {
 		&mut self,
 		pre_validation_result: PreValidateBlockAnnounce<B::Header>,
 	) -> PollBlockAnnounceValidation<B::Header> {
-		trace!(
-			target: "sync",
-			"Finished block announce validation: {:?}",
-			pre_validation_result,
-		);
-
 		let (announce, is_best, who) = match pre_validation_result {
 			PreValidateBlockAnnounce::Failure { who, disconnect } => {
+				debug!(
+					target: "sync",
+					"Failed announce validation: {:?}, disconnect: {}",
+					who,
+					disconnect,
+				);
 				return PollBlockAnnounceValidation::Failure { who, disconnect }
 			},
 			PreValidateBlockAnnounce::Process { announce, is_new_best, who } => {
 				(announce, is_new_best, who)
 			},
-			PreValidateBlockAnnounce::Error { .. } | PreValidateBlockAnnounce::Skip =>
-				return PollBlockAnnounceValidation::Skip,
+			PreValidateBlockAnnounce::Error { .. } | PreValidateBlockAnnounce::Skip => {
+				debug!(
+					target: "sync",
+					"Ignored announce validation",
+				);
+				return PollBlockAnnounceValidation::Skip
+			},
 		};
 
+		trace!(
+			target: "sync",
+			"Finished block announce validation: from {:?}: {:?}. local_best={}",
+			who,
+			announce.summary(),
+			is_best,
+		);
+
 		let number = *announce.header.number();
 		let hash = announce.header.hash();
 		let parent_status = self.block_status(announce.header.parent_hash()).unwrap_or(BlockStatus::Unknown);
@@ -1508,25 +1522,22 @@ impl<B: BlockT> ChainSync<B> {
 			return PollBlockAnnounceValidation::ImportHeader { is_best, announce, who }
 		}
 
-		if number <= self.best_queued_number {
-			trace!(
-				target: "sync",
-				"Added sync target for block announced from {}: {} {:?}",
-				who,
-				hash,
-				announce.header,
-			);
-			self.fork_targets
-				.entry(hash.clone())
-				.or_insert_with(|| ForkTarget {
-					number,
-					parent_hash: Some(*announce.header.parent_hash()),
-					peers: Default::default(),
-				})
-				.peers.insert(who.clone());
-		}
+		trace!(
+			target: "sync",
+			"Added sync target for block announced from {}: {} {:?}",
+			who,
+			hash,
+			announce.summary(),
+		);
+		self.fork_targets
+			.entry(hash.clone())
+			.or_insert_with(|| ForkTarget {
+				number,
+				parent_hash: Some(*announce.header.parent_hash()),
+				peers: Default::default(),
+			})
+			.peers.insert(who.clone());
 
-		trace!(target: "sync", "Announce validation result is nothing");
 		PollBlockAnnounceValidation::Nothing { is_best, who, announce }
 	}
 
diff --git a/client/network/test/src/lib.rs b/client/network/test/src/lib.rs
index 5e05f5717549..689eca8aac5d 100644
--- a/client/network/test/src/lib.rs
+++ b/client/network/test/src/lib.rs
@@ -489,6 +489,11 @@ impl<D, B> Peer<D, B> where
 		&self.network.service()
 	}
 
+	/// Get a reference to the network worker.
+	pub fn network(&self) -> &NetworkWorker<Block, <Block as BlockT>::Hash> {
+		&self.network
+	}
+
 	/// Test helper to compare the blockchain state of multiple (networked)
 	/// clients.
 	pub fn blockchain_canon_equals(&self, other: &Self) -> bool {
@@ -985,12 +990,12 @@ pub trait TestNetFactory: Sized where <Self::BlockImport as BlockImport<Block>>:
 	/// Polls the testnet. Processes all the pending actions.
 	fn poll(&mut self, cx: &mut FutureContext) {
 		self.mut_peers(|peers| {
-			for peer in peers {
-				trace!(target: "sync", "-- Polling {}", peer.id());
+			for (i, peer) in peers.into_iter().enumerate() {
+				trace!(target: "sync", "-- Polling {}: {}", i, peer.id());
 				if let Poll::Ready(()) = peer.network.poll_unpin(cx) {
 					panic!("NetworkWorker has terminated unexpectedly.")
 				}
-				trace!(target: "sync", "-- Polling complete {}", peer.id());
+				trace!(target: "sync", "-- Polling complete {}: {}", i, peer.id());
 
 				// We poll `imported_blocks_stream`.
 				while let Poll::Ready(Some(notification)) = peer.imported_blocks_stream.as_mut().poll_next(cx) {
diff --git a/client/network/test/src/sync.rs b/client/network/test/src/sync.rs
index 953639dcc0e2..553a769ec14a 100644
--- a/client/network/test/src/sync.rs
+++ b/client/network/test/src/sync.rs
@@ -740,6 +740,27 @@ impl BlockAnnounceValidator<Block> for NewBestBlockAnnounceValidator {
 	}
 }
 
+/// Returns `Validation::Failure` for specified block number
+struct FailingBlockAnnounceValidator(u64);
+
+impl BlockAnnounceValidator<Block> for FailingBlockAnnounceValidator {
+	fn validate(
+		&mut self,
+		header: &Header,
+		_: &[u8],
+	) -> Pin<Box<dyn Future<Output = Result<Validation, Box<dyn std::error::Error + Send>>> + Send>> {
+		let number = *header.number();
+		let target_number = self.0;
+		async move { Ok(
+			if number == target_number {
+				Validation::Failure { disconnect: false }
+			} else {
+				Validation::Success { is_new_best: true }
+			}
+		) }.boxed()
+	}
+}
+
 #[test]
 fn sync_blocks_when_block_announce_validator_says_it_is_new_best() {
 	sp_tracing::try_init_simple();
@@ -1010,3 +1031,59 @@ fn multiple_requests_are_accepted_as_long_as_they_are_not_fulfilled() {
 		Poll::Ready(())
 	}));
 }
+
+#[test]
+fn syncs_all_forks_from_single_peer() {
+	sp_tracing::try_init_simple();
+	let mut net = TestNet::new(2);
+	net.peer(0).push_blocks(10, false);
+	net.peer(1).push_blocks(10, false);
+
+	// poll until the two nodes connect, otherwise announcing the block will not work
+	net.block_until_connected();
+
+	// Peer 0 produces new blocks and announces.
+	let branch1 = net.peer(0).push_blocks_at(BlockId::Number(10), 2, true);
+
+	// Wait till peer 1 starts downloading
+	block_on(futures::future::poll_fn::<(), _>(|cx| {
+		net.poll(cx);
+		if net.peer(1).network().best_seen_block() != Some(12) {
+			return Poll::Pending
+		}
+		Poll::Ready(())
+	}));
+
+	// Peer 0 produces and announces another fork
+	let branch2 = net.peer(0).push_blocks_at(BlockId::Number(10), 2, false);
+
+	net.block_until_sync();
+
+	// Peer 1 should have both branches,
+	assert!(net.peer(1).client().header(&BlockId::Hash(branch1)).unwrap().is_some());
+	assert!(net.peer(1).client().header(&BlockId::Hash(branch2)).unwrap().is_some());
+}
+
+#[test]
+fn syncs_after_missing_announcement() {
+	sp_tracing::try_init_simple();
+	let mut net = TestNet::new(0);
+	net.add_full_peer_with_config(Default::default());
+	// Set peer 1 to ignore announcement
+	net.add_full_peer_with_config(FullPeerConfig {
+		block_announce_validator: Some(Box::new(FailingBlockAnnounceValidator(11))),
+		..Default::default()
+	});
+	net.peer(0).push_blocks(10, false);
+	net.peer(1).push_blocks(10, false);
+
+	net.block_until_connected();
+
+	// Peer 0 produces a new block and announces. Peer 1 ignores announcement.
+	net.peer(0).push_blocks_at(BlockId::Number(10), 1, false);
+	// Peer 0 produces another block and announces.
+	let final_block = net.peer(0).push_blocks_at(BlockId::Number(11), 1, false);
+	net.peer(1).push_blocks_at(BlockId::Number(10), 1, true);
+	net.block_until_sync();
+	assert!(net.peer(1).client().header(&BlockId::Hash(final_block)).unwrap().is_some());
+}

From f794140759d8bf9aa03483d663e86f2272090009 Mon Sep 17 00:00:00 2001
From: Yuanchao Sun <yuanchao.sun@gmail.com>
Date: Thu, 1 Apr 2021 05:48:12 +0800
Subject: [PATCH 0584/1194] Expose key_owner(), so other pallets can look up
 validator ID by the (#8506)

session key.
---
 frame/session/src/lib.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs
index e7b16808f723..3255bc20af4c 100644
--- a/frame/session/src/lib.rs
+++ b/frame/session/src/lib.rs
@@ -819,7 +819,8 @@ impl<T: Config> Module<T> {
 		<NextKeys<T>>::insert(v, keys);
 	}
 
-	fn key_owner(id: KeyTypeId, key_data: &[u8]) -> Option<T::ValidatorId> {
+	/// Query the owner of a session key by returning the owner's validator ID.
+	pub fn key_owner(id: KeyTypeId, key_data: &[u8]) -> Option<T::ValidatorId> {
 		<KeyOwner<T>>::get((id, key_data))
 	}
 

From 18e8b2163c83bc7e80be463685c530fa8be29c87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Thu, 1 Apr 2021 10:42:56 +0100
Subject: [PATCH 0585/1194] grandpa: always store justification for the latest
 finalized block (#8392)

* grandpa: always store justification for best finalized block

* grandpa-warp-sync: add latest justification when finished proving

* grandpa-warp-sync: change logic for sending best justification when finished

* grandpa: test storing best justification

* grandpa: reorder variants in WarpSyncFinished
---
 client/finality-grandpa-warp-sync/src/lib.rs  |  4 +-
 .../finality-grandpa-warp-sync/src/proof.rs   | 63 ++++++++++++++-----
 client/finality-grandpa/src/aux_schema.rs     | 53 ++++++++++++----
 client/finality-grandpa/src/environment.rs    | 47 +++++++-------
 client/finality-grandpa/src/justification.rs  |  5 ++
 client/finality-grandpa/src/lib.rs            |  1 +
 client/finality-grandpa/src/tests.rs          | 13 +++-
 7 files changed, 130 insertions(+), 56 deletions(-)

diff --git a/client/finality-grandpa-warp-sync/src/lib.rs b/client/finality-grandpa-warp-sync/src/lib.rs
index 54d06650bc37..52e18e38909c 100644
--- a/client/finality-grandpa-warp-sync/src/lib.rs
+++ b/client/finality-grandpa-warp-sync/src/lib.rs
@@ -120,14 +120,14 @@ impl<TBlock: BlockT, TBackend: Backend<TBlock>> GrandpaWarpSyncRequestHandler<TB
 	fn handle_request(
 		&self,
 		payload: Vec<u8>,
-		pending_response: oneshot::Sender<OutgoingResponse>
+		pending_response: oneshot::Sender<OutgoingResponse>,
 	) -> Result<(), HandleRequestError>
 		where NumberFor<TBlock>: sc_finality_grandpa::BlockNumberOps,
 	{
 		let request = Request::<TBlock>::decode(&mut &payload[..])?;
 
 		let proof = WarpSyncProof::generate(
-			self.backend.blockchain(),
+			&*self.backend,
 			request.begin,
 			&self.authority_set.authority_set_changes(),
 		)?;
diff --git a/client/finality-grandpa-warp-sync/src/proof.rs b/client/finality-grandpa-warp-sync/src/proof.rs
index 4677d2401e83..6b7002555d39 100644
--- a/client/finality-grandpa-warp-sync/src/proof.rs
+++ b/client/finality-grandpa-warp-sync/src/proof.rs
@@ -16,14 +16,15 @@
 
 use codec::{Decode, Encode};
 
+use sc_client_api::Backend as ClientBackend;
 use sc_finality_grandpa::{
 	find_scheduled_change, AuthoritySetChanges, BlockNumberOps, GrandpaJustification,
 };
-use sp_blockchain::Backend as BlockchainBackend;
+use sp_blockchain::{Backend as BlockchainBackend, HeaderBackend};
 use sp_finality_grandpa::{AuthorityList, SetId, GRANDPA_ENGINE_ID};
 use sp_runtime::{
 	generic::BlockId,
-	traits::{Block as BlockT, NumberFor},
+	traits::{Block as BlockT, NumberFor, One},
 };
 
 use crate::HandleRequestError;
@@ -42,11 +43,21 @@ pub struct AuthoritySetChangeProof<Block: BlockT> {
 	pub justification: GrandpaJustification<Block>,
 }
 
+/// Represents the current state of the warp sync, namely whether it is considered
+/// finished, i.e. we have proved everything up until the latest authority set, or not.
+/// When the warp sync is finished we might optionally provide a justification for the
+/// latest finalized block, which should be checked against the latest authority set.
+#[derive(Debug, Decode, Encode)]
+pub enum WarpSyncFinished<Block: BlockT> {
+	No,
+	Yes(Option<GrandpaJustification<Block>>),
+}
+
 /// An accumulated proof of multiple authority set changes.
 #[derive(Decode, Encode)]
 pub struct WarpSyncProof<Block: BlockT> {
 	proofs: Vec<AuthoritySetChangeProof<Block>>,
-	is_finished: bool,
+	is_finished: WarpSyncFinished<Block>,
 }
 
 impl<Block: BlockT> WarpSyncProof<Block> {
@@ -59,21 +70,22 @@ impl<Block: BlockT> WarpSyncProof<Block> {
 		set_changes: &AuthoritySetChanges<NumberFor<Block>>,
 	) -> Result<WarpSyncProof<Block>, HandleRequestError>
 	where
-		Backend: BlockchainBackend<Block>,
+		Backend: ClientBackend<Block>,
 	{
 		// TODO: cache best response (i.e. the one with lowest begin_number)
+		let blockchain = backend.blockchain();
 
-		let begin_number = backend
+		let begin_number = blockchain
 			.block_number_from_id(&BlockId::Hash(begin))?
 			.ok_or_else(|| HandleRequestError::InvalidRequest("Missing start block".to_string()))?;
 
-		if begin_number > backend.info().finalized_number {
+		if begin_number > blockchain.info().finalized_number {
 			return Err(HandleRequestError::InvalidRequest(
 				"Start block is not finalized".to_string(),
 			));
 		}
 
-		let canon_hash = backend.hash(begin_number)?.expect(
+		let canon_hash = blockchain.hash(begin_number)?.expect(
 			"begin number is lower than finalized number; \
 			 all blocks below finalized number must have been imported; \
 			 qed.",
@@ -86,7 +98,6 @@ impl<Block: BlockT> WarpSyncProof<Block> {
 		}
 
 		let mut proofs = Vec::new();
-
 		let mut proof_limit_reached = false;
 
 		for (_, last_block) in set_changes.iter_from(begin_number) {
@@ -95,7 +106,7 @@ impl<Block: BlockT> WarpSyncProof<Block> {
 				break;
 			}
 
-			let header = backend.header(BlockId::Number(*last_block))?.expect(
+			let header = blockchain.header(BlockId::Number(*last_block))?.expect(
 				"header number comes from previously applied set changes; must exist in db; qed.",
 			);
 
@@ -108,7 +119,7 @@ impl<Block: BlockT> WarpSyncProof<Block> {
 				break;
 			}
 
-			let justification = backend
+			let justification = blockchain
 				.justifications(BlockId::Number(*last_block))?
 				.and_then(|just| just.into_justification(GRANDPA_ENGINE_ID))
 				.expect(
@@ -125,9 +136,29 @@ impl<Block: BlockT> WarpSyncProof<Block> {
 			});
 		}
 
+		let is_finished = if proof_limit_reached {
+			WarpSyncFinished::No
+		} else {
+			let latest =
+				sc_finality_grandpa::best_justification(backend)?.filter(|justification| {
+					// the existing best justification must be for a block higher than the
+					// last authority set change. if we didn't prove any authority set
+					// change then we fallback to make sure it's higher or equal to the
+					// initial warp sync block.
+					let limit = proofs
+						.last()
+						.map(|proof| proof.justification.target().0 + One::one())
+						.unwrap_or(begin_number);
+
+					justification.target().0 >= limit
+				});
+
+			WarpSyncFinished::Yes(latest)
+		};
+
 		Ok(WarpSyncProof {
 			proofs,
-			is_finished: !proof_limit_reached,
+			is_finished,
 		})
 	}
 
@@ -160,6 +191,12 @@ impl<Block: BlockT> WarpSyncProof<Block> {
 			current_set_id += 1;
 		}
 
+		if let WarpSyncFinished::Yes(Some(ref justification)) = self.is_finished {
+			justification
+				.verify(current_set_id, &current_authorities)
+				.map_err(|err| HandleRequestError::InvalidProof(err.to_string()))?;
+		}
+
 		Ok((current_set_id, current_authorities))
 	}
 }
@@ -170,7 +207,6 @@ mod tests {
 	use codec::Encode;
 	use rand::prelude::*;
 	use sc_block_builder::BlockBuilderProvider;
-	use sc_client_api::Backend;
 	use sc_finality_grandpa::{AuthoritySetChanges, GrandpaJustification};
 	use sp_blockchain::HeaderBackend;
 	use sp_consensus::BlockOrigin;
@@ -295,8 +331,7 @@ mod tests {
 		let genesis_hash = client.hash(0).unwrap().unwrap();
 
 		let warp_sync_proof =
-			WarpSyncProof::generate(backend.blockchain(), genesis_hash, &authority_set_changes)
-				.unwrap();
+			WarpSyncProof::generate(&*backend, genesis_hash, &authority_set_changes).unwrap();
 
 		// verifying the proof should yield the last set id and authorities
 		let (new_set_id, new_authorities) = warp_sync_proof.verify(0, genesis_authorities).unwrap();
diff --git a/client/finality-grandpa/src/aux_schema.rs b/client/finality-grandpa/src/aux_schema.rs
index 8ecfae40f68c..296f7c13c524 100644
--- a/client/finality-grandpa/src/aux_schema.rs
+++ b/client/finality-grandpa/src/aux_schema.rs
@@ -19,27 +19,30 @@
 //! Schema for stuff in the aux-db.
 
 use std::fmt::Debug;
-use parity_scale_codec::{Encode, Decode};
-use sc_client_api::backend::AuxStore;
-use sp_blockchain::{Result as ClientResult, Error as ClientError};
-use fork_tree::ForkTree;
+
 use finality_grandpa::round::State as RoundState;
-use sp_runtime::traits::{Block as BlockT, NumberFor};
 use log::{info, warn};
-use sp_finality_grandpa::{AuthorityList, SetId, RoundNumber};
+use parity_scale_codec::{Decode, Encode};
+
+use fork_tree::ForkTree;
+use sc_client_api::backend::AuxStore;
+use sp_blockchain::{Error as ClientError, Result as ClientResult};
+use sp_finality_grandpa::{AuthorityList, RoundNumber, SetId};
+use sp_runtime::traits::{Block as BlockT, NumberFor};
 
 use crate::authorities::{
-	AuthoritySet, AuthoritySetChanges, SharedAuthoritySet, PendingChange, DelayKind,
+	AuthoritySet, AuthoritySetChanges, DelayKind, PendingChange, SharedAuthoritySet,
 };
 use crate::environment::{
 	CompletedRound, CompletedRounds, CurrentRounds, HasVoted, SharedVoterSetState, VoterSetState,
 };
-use crate::NewAuthoritySet;
+use crate::{GrandpaJustification, NewAuthoritySet};
 
 const VERSION_KEY: &[u8] = b"grandpa_schema_version";
 const SET_STATE_KEY: &[u8] = b"grandpa_completed_round";
 const CONCLUDED_ROUNDS: &[u8] = b"grandpa_concluded_rounds";
 const AUTHORITY_SET_KEY: &[u8] = b"grandpa_voters";
+const BEST_JUSTIFICATION: &[u8] = b"grandpa_best_justification";
 
 const CURRENT_VERSION: u32 = 3;
 
@@ -464,7 +467,7 @@ where
 pub(crate) fn update_authority_set<Block: BlockT, F, R>(
 	set: &AuthoritySet<Block::Hash, NumberFor<Block>>,
 	new_set: Option<&NewAuthoritySet<Block::Hash, NumberFor<Block>>>,
-	write_aux: F
+	write_aux: F,
 ) -> R
 where
 	F: FnOnce(&[(&'static [u8], &[u8])]) -> R,
@@ -492,6 +495,33 @@ where
 	}
 }
 
+/// Update the justification for the latest finalized block on-disk.
+///
+/// We always keep around the justification for the best finalized block and overwrite it
+/// as we finalize new blocks, this makes sure that we don't store useless justifications
+/// but can always prove finality of the latest block.
+pub(crate) fn update_best_justification<Block: BlockT, F, R>(
+	justification: &GrandpaJustification<Block>,
+	write_aux: F,
+) -> R
+where
+	F: FnOnce(&[(&'static [u8], &[u8])]) -> R,
+{
+	let encoded_justification = justification.encode();
+	write_aux(&[(BEST_JUSTIFICATION, &encoded_justification[..])])
+}
+
+/// Fetch the justification for the latest block finalized by GRANDPA, if any.
+pub fn best_justification<B, Block>(
+	backend: &B,
+) -> ClientResult<Option<GrandpaJustification<Block>>>
+where
+	B: AuxStore,
+	Block: BlockT,
+{
+	load_decode::<_, GrandpaJustification<Block>>(backend, BEST_JUSTIFICATION)
+}
+
 /// Write voter set state.
 pub(crate) fn write_voter_set_state<Block: BlockT, B: AuxStore>(
 	backend: &B,
@@ -517,10 +547,9 @@ pub(crate) fn write_concluded_round<Block: BlockT, B: AuxStore>(
 
 #[cfg(test)]
 pub(crate) fn load_authorities<B: AuxStore, H: Decode, N: Decode + Clone + Ord>(
-	backend: &B
+	backend: &B,
 ) -> Option<AuthoritySet<H, N>> {
-	load_decode::<_, AuthoritySet<H, N>>(backend, AUTHORITY_SET_KEY)
-		.expect("backend error")
+	load_decode::<_, AuthoritySet<H, N>>(backend, AUTHORITY_SET_KEY).expect("backend error")
 }
 
 #[cfg(test)]
diff --git a/client/finality-grandpa/src/environment.rs b/client/finality-grandpa/src/environment.rs
index 3786355d2db4..d3a5b49b5072 100644
--- a/client/finality-grandpa/src/environment.rs
+++ b/client/finality-grandpa/src/environment.rs
@@ -1275,11 +1275,8 @@ where
 		// `N+1`. this assumption is required to make sure we store
 		// justifications for transition blocks which will be requested by
 		// syncing clients.
-		let justification = match justification_or_commit {
-			JustificationOrCommit::Justification(justification) => {
-				notify_justification(justification_sender, || Ok(justification.clone()));
-				Some(justification.encode())
-			},
+		let (justification_required, justification) = match justification_or_commit {
+			JustificationOrCommit::Justification(justification) => (true, justification),
 			JustificationOrCommit::Commit((round_number, commit)) => {
 				let mut justification_required =
 					// justification is always required when block that enacts new authorities
@@ -1297,42 +1294,35 @@ where
 					}
 				}
 
-				// NOTE: the code below is a bit more verbose because we
-				// really want to avoid creating a justification if it isn't
-				// needed (e.g. if there's no subscribers), and also to avoid
-				// creating it twice. depending on the vote tree for the round,
-				// creating a justification might require multiple fetches of
-				// headers from the database.
-				let justification = || GrandpaJustification::from_commit(
+				let justification = GrandpaJustification::from_commit(
 					&client,
 					round_number,
 					commit,
-				);
-
-				if justification_required {
-					let justification = justification()?;
-					notify_justification(justification_sender, || Ok(justification.clone()));
-
-					Some(justification.encode())
-				} else {
-					notify_justification(justification_sender, justification);
+				)?;
 
-					None
-				}
+				(justification_required, justification)
 			},
 		};
 
-		debug!(target: "afg", "Finalizing blocks up to ({:?}, {})", number, hash);
+		notify_justification(justification_sender, || Ok(justification.clone()));
+
+		let persisted_justification = if justification_required {
+			Some((GRANDPA_ENGINE_ID, justification.encode()))
+		} else {
+			None
+		};
 
 		// ideally some handle to a synchronization oracle would be used
 		// to avoid unconditionally notifying.
-		let justification = justification.map(|j| (GRANDPA_ENGINE_ID, j.clone()));
 		client
-			.apply_finality(import_op, BlockId::Hash(hash), justification, true)
+			.apply_finality(import_op, BlockId::Hash(hash), persisted_justification, true)
 			.map_err(|e| {
 				warn!(target: "afg", "Error applying finality to block {:?}: {:?}", (hash, number), e);
 				e
 			})?;
+
+		debug!(target: "afg", "Finalizing blocks up to ({:?}, {})", number, hash);
+
 		telemetry!(
 			telemetry;
 			CONSENSUS_INFO;
@@ -1340,6 +1330,11 @@ where
 			"number" => ?number, "hash" => ?hash,
 		);
 
+		crate::aux_schema::update_best_justification(
+			&justification,
+			|insert| apply_aux(import_op, insert, &[]),
+		)?;
+
 		let new_authorities = if let Some((canon_hash, canon_number)) = status.new_set_block {
 			// the authority set has changed.
 			let (new_id, set_ref) = authority_set.current();
diff --git a/client/finality-grandpa/src/justification.rs b/client/finality-grandpa/src/justification.rs
index 69ca70386007..7805161f06c6 100644
--- a/client/finality-grandpa/src/justification.rs
+++ b/client/finality-grandpa/src/justification.rs
@@ -195,6 +195,11 @@ impl<Block: BlockT> GrandpaJustification<Block> {
 
 		Ok(())
 	}
+
+	/// The target block number and hash that this justifications proves finality for.
+	pub fn target(&self) -> (NumberFor<Block>, Block::Hash) {
+		(self.commit.target_number, self.commit.target_hash)
+	}
 }
 
 /// A utility trait implementing `finality_grandpa::Chain` using a given set of headers.
diff --git a/client/finality-grandpa/src/lib.rs b/client/finality-grandpa/src/lib.rs
index 9a8939660473..fb9ecaa2c137 100644
--- a/client/finality-grandpa/src/lib.rs
+++ b/client/finality-grandpa/src/lib.rs
@@ -122,6 +122,7 @@ mod until_imported;
 mod voting_rule;
 
 pub use authorities::{AuthoritySet, AuthoritySetChanges, SharedAuthoritySet};
+pub use aux_schema::best_justification;
 pub use finality_proof::{FinalityProof, FinalityProofProvider, FinalityProofError};
 pub use notification::{GrandpaJustificationSender, GrandpaJustificationStream};
 pub use import::{find_scheduled_change, find_forced_change, GrandpaBlockImport};
diff --git a/client/finality-grandpa/src/tests.rs b/client/finality-grandpa/src/tests.rs
index b87bbefc1137..fa4bd028bfe2 100644
--- a/client/finality-grandpa/src/tests.rs
+++ b/client/finality-grandpa/src/tests.rs
@@ -451,10 +451,19 @@ fn finalize_3_voters_1_full_observer() {
 	}
 
 	// wait for all finalized on each.
-	let wait_for = futures::future::join_all(finality_notifications)
-		.map(|_| ());
+	let wait_for = futures::future::join_all(finality_notifications).map(|_| ());
 
 	block_until_complete(wait_for, &net, &mut runtime);
+
+	// all peers should have stored the justification for the best finalized block #20
+	for peer_id in 0..4 {
+		let client = net.lock().peers[peer_id].client().as_full().unwrap();
+		let justification = crate::aux_schema::best_justification::<_, Block>(&*client)
+			.unwrap()
+			.unwrap();
+
+		assert_eq!(justification.commit.target_number, 20);
+	}
 }
 
 #[test]

From 67f882cfd8d0dd13b5887fbabcbc1e05d7a6a2e2 Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Thu, 1 Apr 2021 14:20:24 +0200
Subject: [PATCH 0586/1194] Introduce `OnSetCode` type into system config
 trait. (#8496)

* Introduce OnSetCode type into system config trait.

* Docs.

* Fixes

* Fixes
---
 .../pallets/template/src/mock.rs              |  1 +
 bin/node-template/runtime/src/lib.rs          |  2 ++
 bin/node/runtime/src/lib.rs                   |  1 +
 frame/assets/src/mock.rs                      |  1 +
 frame/atomic-swap/src/tests.rs                |  1 +
 frame/aura/src/mock.rs                        |  1 +
 frame/authority-discovery/src/lib.rs          |  1 +
 frame/authorship/src/lib.rs                   |  1 +
 frame/babe/src/mock.rs                        |  1 +
 frame/balances/src/tests_composite.rs         |  1 +
 frame/balances/src/tests_local.rs             |  1 +
 frame/balances/src/tests_reentrancy.rs        |  1 +
 frame/benchmarking/src/tests.rs               |  1 +
 frame/bounties/src/tests.rs                   |  1 +
 frame/collective/src/lib.rs                   |  1 +
 frame/contracts/src/tests.rs                  |  1 +
 frame/democracy/src/tests.rs                  |  1 +
 .../election-provider-multi-phase/src/mock.rs |  1 +
 frame/elections-phragmen/src/lib.rs           |  1 +
 frame/elections/src/mock.rs                   |  1 +
 frame/example-offchain-worker/src/tests.rs    |  1 +
 frame/example-parallel/src/tests.rs           |  1 +
 frame/example/src/tests.rs                    |  1 +
 frame/executive/src/lib.rs                    |  1 +
 frame/gilt/src/mock.rs                        |  1 +
 frame/grandpa/src/mock.rs                     |  1 +
 frame/identity/src/tests.rs                   |  1 +
 frame/im-online/src/mock.rs                   |  1 +
 frame/indices/src/mock.rs                     |  1 +
 frame/lottery/src/mock.rs                     |  1 +
 frame/membership/src/lib.rs                   |  1 +
 frame/merkle-mountain-range/src/mock.rs       |  1 +
 frame/multisig/src/tests.rs                   |  1 +
 frame/nicks/src/lib.rs                        |  1 +
 frame/node-authorization/src/mock.rs          |  1 +
 frame/offences/benchmarking/src/mock.rs       |  1 +
 frame/offences/src/mock.rs                    |  1 +
 frame/proxy/src/tests.rs                      |  1 +
 frame/randomness-collective-flip/src/lib.rs   |  1 +
 frame/recovery/src/mock.rs                    |  1 +
 frame/scheduler/src/lib.rs                    |  5 +++--
 frame/scored-pool/src/mock.rs                 |  1 +
 frame/session/benchmarking/src/mock.rs        |  1 +
 frame/session/src/mock.rs                     |  1 +
 frame/society/src/mock.rs                     |  1 +
 frame/staking/fuzzer/src/mock.rs              |  1 +
 frame/staking/src/mock.rs                     |  1 +
 frame/sudo/src/mock.rs                        |  1 +
 frame/support/test/tests/pallet.rs            |  1 +
 .../test/tests/pallet_compatibility.rs        |  1 +
 .../tests/pallet_compatibility_instance.rs    |  1 +
 frame/support/test/tests/pallet_instance.rs   |  1 +
 frame/support/test/tests/pallet_version.rs    |  1 +
 .../tests/pallet_with_name_trait_is_valid.rs  |  1 +
 frame/system/benches/bench.rs                 |  1 +
 frame/system/benchmarking/src/mock.rs         |  1 +
 frame/system/src/lib.rs                       | 20 +++++++++++++++++--
 frame/system/src/mock.rs                      |  1 +
 frame/timestamp/src/lib.rs                    |  1 +
 frame/tips/src/tests.rs                       |  1 +
 frame/transaction-payment/src/lib.rs          |  1 +
 frame/treasury/src/tests.rs                   |  1 +
 frame/utility/src/tests.rs                    |  1 +
 frame/vesting/src/lib.rs                      |  1 +
 test-utils/runtime/src/lib.rs                 |  1 +
 65 files changed, 85 insertions(+), 4 deletions(-)

diff --git a/bin/node-template/pallets/template/src/mock.rs b/bin/node-template/pallets/template/src/mock.rs
index 1ebe3bee6090..8719bcb4df2d 100644
--- a/bin/node-template/pallets/template/src/mock.rs
+++ b/bin/node-template/pallets/template/src/mock.rs
@@ -49,6 +49,7 @@ impl system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = SS58Prefix;
+	type OnSetCode = ();
 }
 
 impl pallet_template::Config for Test {
diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index 1675b3d2a1cd..1453b54309e6 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -195,6 +195,8 @@ impl frame_system::Config for Runtime {
 	type SystemWeightInfo = ();
 	/// This is used as an identifier of the chain. 42 is the generic substrate prefix.
 	type SS58Prefix = SS58Prefix;
+	/// The set code logic, just the default since we're not a parachain.
+	type OnSetCode = ();
 }
 
 impl pallet_aura::Config for Runtime {
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index f790cf41a401..8f8f82648822 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -213,6 +213,7 @@ impl frame_system::Config for Runtime {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = frame_system::weights::SubstrateWeight<Runtime>;
 	type SS58Prefix = SS58Prefix;
+	type OnSetCode = ();
 }
 
 impl pallet_utility::Config for Runtime {
diff --git a/frame/assets/src/mock.rs b/frame/assets/src/mock.rs
index 26ff938512a2..0b7aa339835e 100644
--- a/frame/assets/src/mock.rs
+++ b/frame/assets/src/mock.rs
@@ -65,6 +65,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 
 parameter_types! {
diff --git a/frame/atomic-swap/src/tests.rs b/frame/atomic-swap/src/tests.rs
index baa9a08957d4..cc2849f5bd2c 100644
--- a/frame/atomic-swap/src/tests.rs
+++ b/frame/atomic-swap/src/tests.rs
@@ -53,6 +53,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
diff --git a/frame/aura/src/mock.rs b/frame/aura/src/mock.rs
index 481edbaff487..26d5a2754974 100644
--- a/frame/aura/src/mock.rs
+++ b/frame/aura/src/mock.rs
@@ -70,6 +70,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 
 impl pallet_timestamp::Config for Test {
diff --git a/frame/authority-discovery/src/lib.rs b/frame/authority-discovery/src/lib.rs
index ca8f3eeff3d6..93466d4f3509 100644
--- a/frame/authority-discovery/src/lib.rs
+++ b/frame/authority-discovery/src/lib.rs
@@ -200,6 +200,7 @@ mod tests {
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
 		type SS58Prefix = ();
+		type OnSetCode = ();
 	}
 
 	pub struct TestSessionHandler;
diff --git a/frame/authorship/src/lib.rs b/frame/authorship/src/lib.rs
index 286abc721cbb..5e9955f59f9d 100644
--- a/frame/authorship/src/lib.rs
+++ b/frame/authorship/src/lib.rs
@@ -447,6 +447,7 @@ mod tests {
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
 		type SS58Prefix = ();
+		type OnSetCode = ();
 	}
 
 	parameter_types! {
diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index 137f32b5e502..39831eceb75b 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -92,6 +92,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 
 impl<C> frame_system::offchain::SendTransactionTypes<C> for Test
diff --git a/frame/balances/src/tests_composite.rs b/frame/balances/src/tests_composite.rs
index 90bcaf1a480a..b4bdb13fbb83 100644
--- a/frame/balances/src/tests_composite.rs
+++ b/frame/balances/src/tests_composite.rs
@@ -75,6 +75,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 parameter_types! {
 	pub const TransactionByteFee: u64 = 1;
diff --git a/frame/balances/src/tests_local.rs b/frame/balances/src/tests_local.rs
index 10ea74d8887b..f6f0bf8389a1 100644
--- a/frame/balances/src/tests_local.rs
+++ b/frame/balances/src/tests_local.rs
@@ -77,6 +77,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 parameter_types! {
 	pub const TransactionByteFee: u64 = 1;
diff --git a/frame/balances/src/tests_reentrancy.rs b/frame/balances/src/tests_reentrancy.rs
index 547c7dd7cfb7..4016cdb463c6 100644
--- a/frame/balances/src/tests_reentrancy.rs
+++ b/frame/balances/src/tests_reentrancy.rs
@@ -90,6 +90,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 parameter_types! {
 	pub const TransactionByteFee: u64 = 1;
diff --git a/frame/benchmarking/src/tests.rs b/frame/benchmarking/src/tests.rs
index ac0a20854305..0869ae68c7e0 100644
--- a/frame/benchmarking/src/tests.rs
+++ b/frame/benchmarking/src/tests.rs
@@ -104,6 +104,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 
 parameter_types!{
diff --git a/frame/bounties/src/tests.rs b/frame/bounties/src/tests.rs
index 617f18697526..d676c940f5af 100644
--- a/frame/bounties/src/tests.rs
+++ b/frame/bounties/src/tests.rs
@@ -80,6 +80,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
diff --git a/frame/collective/src/lib.rs b/frame/collective/src/lib.rs
index 28c2ff77b81f..d5768e4f5cb8 100644
--- a/frame/collective/src/lib.rs
+++ b/frame/collective/src/lib.rs
@@ -1004,6 +1004,7 @@ mod tests {
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
 		type SS58Prefix = ();
+		type OnSetCode = ();
 	}
 	impl Config<Instance1> for Test {
 		type Origin = Origin;
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index 5fb637f3e9f1..802118bfb069 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -222,6 +222,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 impl pallet_balances::Config for Test {
 	type MaxLocks = ();
diff --git a/frame/democracy/src/tests.rs b/frame/democracy/src/tests.rs
index 57e845ace9f2..4dd96d219b9e 100644
--- a/frame/democracy/src/tests.rs
+++ b/frame/democracy/src/tests.rs
@@ -103,6 +103,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 parameter_types! {
 	pub MaximumSchedulerWeight: Weight = Perbill::from_percent(80) * BlockWeights::get().max_block;
diff --git a/frame/election-provider-multi-phase/src/mock.rs b/frame/election-provider-multi-phase/src/mock.rs
index cebd5cf06e69..5a0a83354b26 100644
--- a/frame/election-provider-multi-phase/src/mock.rs
+++ b/frame/election-provider-multi-phase/src/mock.rs
@@ -161,6 +161,7 @@ impl frame_system::Config for Runtime {
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
+	type OnSetCode = ();
 }
 
 const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index 7f0a6afb2b10..4c84c72b0b30 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -1085,6 +1085,7 @@ mod tests {
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
 		type SS58Prefix = ();
+		type OnSetCode = ();
 	}
 
 	parameter_types! {
diff --git a/frame/elections/src/mock.rs b/frame/elections/src/mock.rs
index 287eaa27b196..3a9cca41ff0e 100644
--- a/frame/elections/src/mock.rs
+++ b/frame/elections/src/mock.rs
@@ -58,6 +58,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 
 parameter_types! {
diff --git a/frame/example-offchain-worker/src/tests.rs b/frame/example-offchain-worker/src/tests.rs
index e91b374adbe1..ee47aa5629fd 100644
--- a/frame/example-offchain-worker/src/tests.rs
+++ b/frame/example-offchain-worker/src/tests.rs
@@ -82,6 +82,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 
 type Extrinsic = TestXt<Call, ()>;
diff --git a/frame/example-parallel/src/tests.rs b/frame/example-parallel/src/tests.rs
index e82d75e63206..56cb73ebb08b 100644
--- a/frame/example-parallel/src/tests.rs
+++ b/frame/example-parallel/src/tests.rs
@@ -66,6 +66,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 
 parameter_types! {
diff --git a/frame/example/src/tests.rs b/frame/example/src/tests.rs
index ed866344a4b1..496cd5701fe5 100644
--- a/frame/example/src/tests.rs
+++ b/frame/example/src/tests.rs
@@ -76,6 +76,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index 277b20cf20bf..fc4f5be5dc95 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -670,6 +670,7 @@ mod tests {
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
 		type SS58Prefix = ();
+		type OnSetCode = ();
 	}
 
 	type Balance = u64;
diff --git a/frame/gilt/src/mock.rs b/frame/gilt/src/mock.rs
index 1abb92ed3dfa..f5c0d3a5aabe 100644
--- a/frame/gilt/src/mock.rs
+++ b/frame/gilt/src/mock.rs
@@ -70,6 +70,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = SS58Prefix;
+	type OnSetCode = ();
 }
 
 parameter_types! {
diff --git a/frame/grandpa/src/mock.rs b/frame/grandpa/src/mock.rs
index 3f450e18bc78..d59d0d19d0e8 100644
--- a/frame/grandpa/src/mock.rs
+++ b/frame/grandpa/src/mock.rs
@@ -97,6 +97,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 
 impl<C> frame_system::offchain::SendTransactionTypes<C> for Test
diff --git a/frame/identity/src/tests.rs b/frame/identity/src/tests.rs
index a996c989a918..937fa8f130d8 100644
--- a/frame/identity/src/tests.rs
+++ b/frame/identity/src/tests.rs
@@ -71,6 +71,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
diff --git a/frame/im-online/src/mock.rs b/frame/im-online/src/mock.rs
index 35028dd89df4..4f21012abc51 100644
--- a/frame/im-online/src/mock.rs
+++ b/frame/im-online/src/mock.rs
@@ -140,6 +140,7 @@ impl frame_system::Config for Runtime {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 
 parameter_types! {
diff --git a/frame/indices/src/mock.rs b/frame/indices/src/mock.rs
index 01db4b50f508..efaaa0212467 100644
--- a/frame/indices/src/mock.rs
+++ b/frame/indices/src/mock.rs
@@ -68,6 +68,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 
 parameter_types! {
diff --git a/frame/lottery/src/mock.rs b/frame/lottery/src/mock.rs
index a776896921a7..9015de5b0853 100644
--- a/frame/lottery/src/mock.rs
+++ b/frame/lottery/src/mock.rs
@@ -78,6 +78,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 
 parameter_types! {
diff --git a/frame/membership/src/lib.rs b/frame/membership/src/lib.rs
index e26af3ce9b71..96fc15b0509b 100644
--- a/frame/membership/src/lib.rs
+++ b/frame/membership/src/lib.rs
@@ -328,6 +328,7 @@ mod tests {
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
 		type SS58Prefix = ();
+		type OnSetCode = ();
 	}
 	ord_parameter_types! {
 		pub const One: u64 = 1;
diff --git a/frame/merkle-mountain-range/src/mock.rs b/frame/merkle-mountain-range/src/mock.rs
index 072724a58afe..3c8a5d284566 100644
--- a/frame/merkle-mountain-range/src/mock.rs
+++ b/frame/merkle-mountain-range/src/mock.rs
@@ -71,6 +71,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 
 impl Config for Test {
diff --git a/frame/multisig/src/tests.rs b/frame/multisig/src/tests.rs
index a3a3edc34f1a..118cfebdbdce 100644
--- a/frame/multisig/src/tests.rs
+++ b/frame/multisig/src/tests.rs
@@ -71,6 +71,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
diff --git a/frame/nicks/src/lib.rs b/frame/nicks/src/lib.rs
index 67e62a09da64..1afe55756777 100644
--- a/frame/nicks/src/lib.rs
+++ b/frame/nicks/src/lib.rs
@@ -292,6 +292,7 @@ mod tests {
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
 		type SS58Prefix = ();
+		type OnSetCode = ();
 	}
 	parameter_types! {
 		pub const ExistentialDeposit: u64 = 1;
diff --git a/frame/node-authorization/src/mock.rs b/frame/node-authorization/src/mock.rs
index 5118f07c7694..3f4f894cdf7e 100644
--- a/frame/node-authorization/src/mock.rs
+++ b/frame/node-authorization/src/mock.rs
@@ -70,6 +70,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 
 ord_parameter_types! {
diff --git a/frame/offences/benchmarking/src/mock.rs b/frame/offences/benchmarking/src/mock.rs
index 223d6d4d477a..a0a09e0fbb89 100644
--- a/frame/offences/benchmarking/src/mock.rs
+++ b/frame/offences/benchmarking/src/mock.rs
@@ -65,6 +65,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 parameter_types! {
 	pub const ExistentialDeposit: Balance = 10;
diff --git a/frame/offences/src/mock.rs b/frame/offences/src/mock.rs
index ab45bb0837b5..52dd55207af0 100644
--- a/frame/offences/src/mock.rs
+++ b/frame/offences/src/mock.rs
@@ -124,6 +124,7 @@ impl frame_system::Config for Runtime {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 
 parameter_types! {
diff --git a/frame/proxy/src/tests.rs b/frame/proxy/src/tests.rs
index 797a5ee3d469..6f3b1f35e2ad 100644
--- a/frame/proxy/src/tests.rs
+++ b/frame/proxy/src/tests.rs
@@ -73,6 +73,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
diff --git a/frame/randomness-collective-flip/src/lib.rs b/frame/randomness-collective-flip/src/lib.rs
index 5ef76a33c21f..724605c6238b 100644
--- a/frame/randomness-collective-flip/src/lib.rs
+++ b/frame/randomness-collective-flip/src/lib.rs
@@ -193,6 +193,7 @@ mod tests {
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
 		type SS58Prefix = ();
+		type OnSetCode = ();
 	}
 
 	fn new_test_ext() -> sp_io::TestExternalities {
diff --git a/frame/recovery/src/mock.rs b/frame/recovery/src/mock.rs
index 301dd8dba8dd..72dbc29fd716 100644
--- a/frame/recovery/src/mock.rs
+++ b/frame/recovery/src/mock.rs
@@ -70,6 +70,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 
 parameter_types! {
diff --git a/frame/scheduler/src/lib.rs b/frame/scheduler/src/lib.rs
index 9848c9853d0b..5332aedf7f13 100644
--- a/frame/scheduler/src/lib.rs
+++ b/frame/scheduler/src/lib.rs
@@ -76,8 +76,8 @@ pub trait Config: system::Config {
 	type Event: From<Event<Self>> + Into<<Self as system::Config>::Event>;
 
 	/// The aggregated origin which the dispatch will take.
-	type Origin: OriginTrait<PalletsOrigin =
-		Self::PalletsOrigin> + From<Self::PalletsOrigin> + IsType<<Self as system::Config>::Origin>;
+	type Origin: OriginTrait<PalletsOrigin = Self::PalletsOrigin>
+		+ From<Self::PalletsOrigin> + IsType<<Self as system::Config>::Origin>;
 
 	/// The caller origin, overarching type of all pallets origins.
 	type PalletsOrigin: From<system::RawOrigin<Self::AccountId>> + Codec + Clone + Eq;
@@ -835,6 +835,7 @@ mod tests {
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
 		type SS58Prefix = ();
+		type OnSetCode = ();
 	}
 	impl logger::Config for Test {
 		type Event = Event;
diff --git a/frame/scored-pool/src/mock.rs b/frame/scored-pool/src/mock.rs
index 76f9dd848d6c..1da665f43eae 100644
--- a/frame/scored-pool/src/mock.rs
+++ b/frame/scored-pool/src/mock.rs
@@ -79,6 +79,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 
 impl pallet_balances::Config for Test {
diff --git a/frame/session/benchmarking/src/mock.rs b/frame/session/benchmarking/src/mock.rs
index 53afeb620c26..cf2fa8a07cfe 100644
--- a/frame/session/benchmarking/src/mock.rs
+++ b/frame/session/benchmarking/src/mock.rs
@@ -67,6 +67,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 parameter_types! {
 	pub const ExistentialDeposit: Balance = 10;
diff --git a/frame/session/src/mock.rs b/frame/session/src/mock.rs
index b64359fccee3..3459ab73d6af 100644
--- a/frame/session/src/mock.rs
+++ b/frame/session/src/mock.rs
@@ -250,6 +250,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 
 impl pallet_timestamp::Config for Test {
diff --git a/frame/society/src/mock.rs b/frame/society/src/mock.rs
index ff80b50b6d35..f2d16423f3cc 100644
--- a/frame/society/src/mock.rs
+++ b/frame/society/src/mock.rs
@@ -91,6 +91,7 @@ impl frame_system::Config for Test {
 	type AccountData = pallet_balances::AccountData<u64>;
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 
 impl pallet_balances::Config for Test {
diff --git a/frame/staking/fuzzer/src/mock.rs b/frame/staking/fuzzer/src/mock.rs
index 8fe7975cef06..11d810a26e17 100644
--- a/frame/staking/fuzzer/src/mock.rs
+++ b/frame/staking/fuzzer/src/mock.rs
@@ -64,6 +64,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 parameter_types! {
 	pub const ExistentialDeposit: Balance = 10;
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index 1942e5eed0c6..188eda801095 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -150,6 +150,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 impl pallet_balances::Config for Test {
 	type MaxLocks = MaxLocks;
diff --git a/frame/sudo/src/mock.rs b/frame/sudo/src/mock.rs
index 9aac0a129907..568799e1fe63 100644
--- a/frame/sudo/src/mock.rs
+++ b/frame/sudo/src/mock.rs
@@ -151,6 +151,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 
 // Implement the logger module's `Config` on the Test runtime.
diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index 5387312819c8..d78688c88c3e 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -395,6 +395,7 @@ impl frame_system::Config for Runtime {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 impl pallet::Config for Runtime {
 	type Event = Event;
diff --git a/frame/support/test/tests/pallet_compatibility.rs b/frame/support/test/tests/pallet_compatibility.rs
index 95e1c027eb3f..a953b19607d9 100644
--- a/frame/support/test/tests/pallet_compatibility.rs
+++ b/frame/support/test/tests/pallet_compatibility.rs
@@ -225,6 +225,7 @@ impl frame_system::Config for Runtime {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 impl pallet::Config for Runtime {
 	type Event = Event;
diff --git a/frame/support/test/tests/pallet_compatibility_instance.rs b/frame/support/test/tests/pallet_compatibility_instance.rs
index 603c583ae217..5ce20012c736 100644
--- a/frame/support/test/tests/pallet_compatibility_instance.rs
+++ b/frame/support/test/tests/pallet_compatibility_instance.rs
@@ -217,6 +217,7 @@ impl frame_system::Config for Runtime {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 impl pallet::Config for Runtime {
 	type Event = Event;
diff --git a/frame/support/test/tests/pallet_instance.rs b/frame/support/test/tests/pallet_instance.rs
index 1bf4c1af0928..d71242e49e0f 100644
--- a/frame/support/test/tests/pallet_instance.rs
+++ b/frame/support/test/tests/pallet_instance.rs
@@ -260,6 +260,7 @@ impl frame_system::Config for Runtime {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 impl pallet::Config for Runtime {
 	type Event = Event;
diff --git a/frame/support/test/tests/pallet_version.rs b/frame/support/test/tests/pallet_version.rs
index b3436b7baed9..5c33d45aea64 100644
--- a/frame/support/test/tests/pallet_version.rs
+++ b/frame/support/test/tests/pallet_version.rs
@@ -166,6 +166,7 @@ impl frame_system::Config for Runtime {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 
 frame_support::construct_runtime!(
diff --git a/frame/support/test/tests/pallet_with_name_trait_is_valid.rs b/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
index 05cedbdb91a0..9fc7055ce1bc 100644
--- a/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
+++ b/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
@@ -141,6 +141,7 @@ mod tests {
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
 		type SS58Prefix = ();
+		type OnSetCode = ();
 	}
 
 	impl pallet_test::Trait for Runtime {
diff --git a/frame/system/benches/bench.rs b/frame/system/benches/bench.rs
index 3ebee534a64e..47980a88164e 100644
--- a/frame/system/benches/bench.rs
+++ b/frame/system/benches/bench.rs
@@ -89,6 +89,7 @@ impl system::Config for Runtime {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 
 impl module::Config for Runtime {
diff --git a/frame/system/benchmarking/src/mock.rs b/frame/system/benchmarking/src/mock.rs
index 23da1fee5617..253945a598bd 100644
--- a/frame/system/benchmarking/src/mock.rs
+++ b/frame/system/benchmarking/src/mock.rs
@@ -61,6 +61,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 
 impl crate::Config for Test {}
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index 9d3ecd6f41f5..cfe79128863f 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -140,6 +140,18 @@ pub type ConsumedWeight = PerDispatchClass<Weight>;
 
 pub use pallet::*;
 
+/// Do something when we should be setting the code.
+pub trait SetCode {
+	/// Set the code to the given blob.
+	fn set_code(code: Vec<u8>);
+}
+
+impl SetCode for () {
+	fn set_code(code: Vec<u8>) {
+		storage::unhashed::put_raw(well_known_keys::CODE, &code);
+	}
+}
+
 #[frame_support::pallet]
 pub mod pallet {
 	use crate::{*, pallet_prelude::*, self as frame_system};
@@ -253,6 +265,10 @@ pub mod pallet {
 		/// an identifier of the chain.
 		#[pallet::constant]
 		type SS58Prefix: Get<u8>;
+
+		/// What to do if the user wants the code set to something. Just use `()` unless you are in
+		/// cumulus.
+		type OnSetCode: SetCode;
 	}
 
 	#[pallet::pallet]
@@ -329,7 +345,7 @@ pub mod pallet {
 			ensure_root(origin)?;
 			Self::can_set_code(&code)?;
 
-			storage::unhashed::put_raw(well_known_keys::CODE, &code);
+			T::OnSetCode::set_code(code);
 			Self::deposit_event(Event::CodeUpdated);
 			Ok(().into())
 		}
@@ -348,7 +364,7 @@ pub mod pallet {
 			code: Vec<u8>,
 		) -> DispatchResultWithPostInfo {
 			ensure_root(origin)?;
-			storage::unhashed::put_raw(well_known_keys::CODE, &code);
+			T::OnSetCode::set_code(code);
 			Self::deposit_event(Event::CodeUpdated);
 			Ok(().into())
 		}
diff --git a/frame/system/src/mock.rs b/frame/system/src/mock.rs
index 43c7d8d25277..0f53532eb8f6 100644
--- a/frame/system/src/mock.rs
+++ b/frame/system/src/mock.rs
@@ -107,6 +107,7 @@ impl Config for Test {
 	type OnKilledAccount = RecordKilled;
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 
 pub type SysEvent = frame_system::Event<Test>;
diff --git a/frame/timestamp/src/lib.rs b/frame/timestamp/src/lib.rs
index d46755119685..dabf5a93c13d 100644
--- a/frame/timestamp/src/lib.rs
+++ b/frame/timestamp/src/lib.rs
@@ -352,6 +352,7 @@ mod tests {
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
 		type SS58Prefix = ();
+		type OnSetCode = ();
 	}
 	parameter_types! {
 		pub const MinimumPeriod: u64 = 5;
diff --git a/frame/tips/src/tests.rs b/frame/tips/src/tests.rs
index ef30962fc846..c57c427810d0 100644
--- a/frame/tips/src/tests.rs
+++ b/frame/tips/src/tests.rs
@@ -76,6 +76,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
index b2dc2c9859e0..278cabc40092 100644
--- a/frame/transaction-payment/src/lib.rs
+++ b/frame/transaction-payment/src/lib.rs
@@ -687,6 +687,7 @@ mod tests {
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
 		type SS58Prefix = ();
+		type OnSetCode = ();
 	}
 
 	parameter_types! {
diff --git a/frame/treasury/src/tests.rs b/frame/treasury/src/tests.rs
index 45fc3e629fb0..25bfc6af81de 100644
--- a/frame/treasury/src/tests.rs
+++ b/frame/treasury/src/tests.rs
@@ -77,6 +77,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
diff --git a/frame/utility/src/tests.rs b/frame/utility/src/tests.rs
index 3a8089519fac..f13e1b6ef778 100644
--- a/frame/utility/src/tests.rs
+++ b/frame/utility/src/tests.rs
@@ -111,6 +111,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
diff --git a/frame/vesting/src/lib.rs b/frame/vesting/src/lib.rs
index c02e9dc78c13..e5e6cb5069b8 100644
--- a/frame/vesting/src/lib.rs
+++ b/frame/vesting/src/lib.rs
@@ -464,6 +464,7 @@ mod tests {
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
 		type SS58Prefix = ();
+		type OnSetCode = ();
 	}
 	parameter_types! {
 		pub const MaxLocks: u32 = 10;
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index 460494bfbd93..837b3715c819 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -515,6 +515,7 @@ impl frame_system::Config for Runtime {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 	type SS58Prefix = ();
+	type OnSetCode = ();
 }
 
 impl pallet_timestamp::Config for Runtime {

From 9f5a73fbbf57b271a76e6784b05af02d32aed090 Mon Sep 17 00:00:00 2001
From: Keith Yeung <kungfukeith11@gmail.com>
Date: Thu, 1 Apr 2021 07:20:43 -0700
Subject: [PATCH 0587/1194] Add ChildTriePrefixIterator and methods (#8478)

* Make use of PrefixIterator underneath Storage[Key]Iterator

* Add ChildTriePrefixIterator and methods

* Add documentation on ChilTriePrefixIterator fields

* Deprecate Storage[Key]Iterator API instead of removing them

* Allow fetching for the prefix as an option for ChildTriePrefixIterator

* Rename prefix_fetch to fetch_previous_key

* fix implementation + test

* make gitdiff better

* Add test for storage_iter and storage_key_iter

Co-authored-by: thiolliere <gui.thiolliere@gmail.com>
---
 frame/support/src/storage/migration.rs |  93 ++++++++++-
 frame/support/src/storage/mod.rs       | 213 ++++++++++++++++++++++++-
 frame/tips/src/lib.rs                  |   6 +-
 3 files changed, 307 insertions(+), 5 deletions(-)

diff --git a/frame/support/src/storage/migration.rs b/frame/support/src/storage/migration.rs
index b29a0b83652d..b4a1a9225dd1 100644
--- a/frame/support/src/storage/migration.rs
+++ b/frame/support/src/storage/migration.rs
@@ -34,11 +34,14 @@ pub struct StorageIterator<T> {
 
 impl<T> StorageIterator<T> {
 	/// Construct iterator to iterate over map items in `module` for the map called `item`.
+	#[deprecated(note="Please use the storage_iter or storage_iter_with_suffix functions instead")]
 	pub fn new(module: &[u8], item: &[u8]) -> Self {
+		#[allow(deprecated)]
 		Self::with_suffix(module, item, &[][..])
 	}
 
 	/// Construct iterator to iterate over map items in `module` for the map called `item`.
+	#[deprecated(note="Please use the storage_iter or storage_iter_with_suffix functions instead")]
 	pub fn with_suffix(module: &[u8], item: &[u8], suffix: &[u8]) -> Self {
 		let mut prefix = Vec::new();
 		prefix.extend_from_slice(&Twox128::hash(module));
@@ -92,11 +95,14 @@ pub struct StorageKeyIterator<K, T, H: ReversibleStorageHasher> {
 
 impl<K, T, H: ReversibleStorageHasher> StorageKeyIterator<K, T, H> {
 	/// Construct iterator to iterate over map items in `module` for the map called `item`.
+	#[deprecated(note="Please use the storage_key_iter or storage_key_iter_with_suffix functions instead")]
 	pub fn new(module: &[u8], item: &[u8]) -> Self {
+		#[allow(deprecated)]
 		Self::with_suffix(module, item, &[][..])
 	}
 
 	/// Construct iterator to iterate over map items in `module` for the map called `item`.
+	#[deprecated(note="Please use the storage_key_iter or storage_key_iter_with_suffix functions instead")]
 	pub fn with_suffix(module: &[u8], item: &[u8], suffix: &[u8]) -> Self {
 		let mut prefix = Vec::new();
 		prefix.extend_from_slice(&Twox128::hash(module));
@@ -148,6 +154,58 @@ impl<K: Decode + Sized, T: Decode + Sized, H: ReversibleStorageHasher> Iterator
 	}
 }
 
+/// Construct iterator to iterate over map items in `module` for the map called `item`.
+pub fn storage_iter<T: Decode + Sized>(module: &[u8], item: &[u8]) -> PrefixIterator<(Vec<u8>, T)> {
+	storage_iter_with_suffix(module, item, &[][..])
+}
+
+/// Construct iterator to iterate over map items in `module` for the map called `item`.
+pub fn storage_iter_with_suffix<T: Decode + Sized>(
+	module: &[u8],
+	item: &[u8],
+	suffix: &[u8],
+) -> PrefixIterator<(Vec<u8>, T)> {
+	let mut prefix = Vec::new();
+	prefix.extend_from_slice(&Twox128::hash(module));
+	prefix.extend_from_slice(&Twox128::hash(item));
+	prefix.extend_from_slice(suffix);
+	let previous_key = prefix.clone();
+	let closure = |raw_key_without_prefix: &[u8], raw_value: &[u8]| {
+		let value = T::decode(&mut &raw_value[..])?;
+		Ok((raw_key_without_prefix.to_vec(), value))
+	};
+
+	PrefixIterator { prefix, previous_key, drain: false, closure }
+}
+
+/// Construct iterator to iterate over map items in `module` for the map called `item`.
+pub fn storage_key_iter<K: Decode + Sized, T: Decode + Sized, H: ReversibleStorageHasher>(
+	module: &[u8],
+	item: &[u8],
+) -> PrefixIterator<(K, T)> {
+	storage_key_iter_with_suffix::<K, T, H>(module, item, &[][..])
+}
+
+/// Construct iterator to iterate over map items in `module` for the map called `item`.
+pub fn storage_key_iter_with_suffix<K: Decode + Sized, T: Decode + Sized, H: ReversibleStorageHasher>(
+	module: &[u8],
+	item: &[u8],
+	suffix: &[u8],
+) -> PrefixIterator<(K, T)> {
+	let mut prefix = Vec::new();
+	prefix.extend_from_slice(&Twox128::hash(module));
+	prefix.extend_from_slice(&Twox128::hash(item));
+	prefix.extend_from_slice(suffix);
+	let previous_key = prefix.clone();
+	let closure = |raw_key_without_prefix: &[u8], raw_value: &[u8]| {
+		let mut key_material = H::reverse(raw_key_without_prefix);
+		let key = K::decode(&mut key_material)?;
+		let value = T::decode(&mut &raw_value[..])?;
+		Ok((key, value))
+	};
+	PrefixIterator { prefix, previous_key, drain: false, closure }
+}
+
 /// Get a particular value in storage by the `module`, the map's `item` name and the key `hash`.
 pub fn have_storage_value(module: &[u8], item: &[u8], hash: &[u8]) -> bool {
 	get_storage_value::<()>(module, item, hash).is_some()
@@ -294,7 +352,13 @@ mod tests {
 		hash::StorageHasher,
 	};
 	use sp_io::TestExternalities;
-	use super::{move_prefix, move_pallet, move_storage_from_pallet};
+	use super::{
+		move_prefix,
+		move_pallet,
+		move_storage_from_pallet,
+		storage_iter,
+		storage_key_iter,
+	};
 
 	struct OldPalletStorageValuePrefix;
 	impl frame_support::traits::StorageInstance for OldPalletStorageValuePrefix {
@@ -386,4 +450,31 @@ mod tests {
 			assert_eq!(NewStorageMap::iter().collect::<Vec<_>>(), vec![(1, 2), (3, 4)]);
 		})
 	}
+
+	#[test]
+	fn test_storage_iter() {
+		TestExternalities::new_empty().execute_with(|| {
+			OldStorageValue::put(3);
+			OldStorageMap::insert(1, 2);
+			OldStorageMap::insert(3, 4);
+
+			assert_eq!(
+				storage_key_iter::<i32, i32, Twox64Concat>(b"my_old_pallet", b"foo_map").collect::<Vec<_>>(),
+				vec![(1, 2), (3, 4)],
+			);
+
+			assert_eq!(
+				storage_iter(b"my_old_pallet", b"foo_map").drain().map(|t| t.1).collect::<Vec<i32>>(),
+				vec![2, 4],
+			);
+			assert_eq!(OldStorageMap::iter().collect::<Vec<_>>(), vec![]);
+
+			// Empty because storage iterator skips over the entry under the first key
+			assert_eq!(
+				storage_iter::<i32>(b"my_old_pallet", b"foo_value").drain().next(),
+				None
+			);
+			assert_eq!(OldStorageValue::get(), Some(3));
+		});
+	}
 }
diff --git a/frame/support/src/storage/mod.rs b/frame/support/src/storage/mod.rs
index d9820475a7e8..e00a3fe83182 100644
--- a/frame/support/src/storage/mod.rs
+++ b/frame/support/src/storage/mod.rs
@@ -17,9 +17,10 @@
 
 //! Stuff to do with the runtime's storage.
 
+use sp_core::storage::ChildInfo;
 use sp_std::prelude::*;
 use codec::{FullCodec, FullEncode, Encode, EncodeLike, Decode};
-use crate::hash::{Twox128, StorageHasher};
+use crate::hash::{Twox128, StorageHasher, ReversibleStorageHasher};
 use sp_runtime::generic::{Digest, DigestItem};
 pub use sp_runtime::TransactionOutcome;
 
@@ -519,6 +520,14 @@ pub struct PrefixIterator<T> {
 	closure: fn(&[u8], &[u8]) -> Result<T, codec::Error>,
 }
 
+impl<T> PrefixIterator<T> {
+	/// Mutate this iterator into a draining iterator; items iterated are removed from storage.
+	pub fn drain(mut self) -> Self {
+		self.drain = true;
+		self
+	}
+}
+
 impl<T> Iterator for PrefixIterator<T> {
 	type Item = T;
 
@@ -563,6 +572,133 @@ impl<T> Iterator for PrefixIterator<T> {
 	}
 }
 
+/// Iterate over a prefix of a child trie and decode raw_key and raw_value into `T`.
+///
+/// If any decoding fails it skips the key and continues to the next one.
+pub struct ChildTriePrefixIterator<T> {
+	/// The prefix iterated on
+	prefix: Vec<u8>,
+	/// child info for child trie
+	child_info: ChildInfo,
+	/// The last key iterated on
+	previous_key: Vec<u8>,
+	/// If true then values are removed while iterating
+	drain: bool,
+	/// Whether or not we should fetch the previous key
+	fetch_previous_key: bool,
+	/// Function that takes `(raw_key_without_prefix, raw_value)` and decode `T`.
+	/// `raw_key_without_prefix` is the raw storage key without the prefix iterated on.
+	closure: fn(&[u8], &[u8]) -> Result<T, codec::Error>,
+}
+
+impl<T> ChildTriePrefixIterator<T> {
+	/// Mutate this iterator into a draining iterator; items iterated are removed from storage.
+	pub fn drain(mut self) -> Self {
+		self.drain = true;
+		self
+	}
+}
+
+impl<T: Decode + Sized> ChildTriePrefixIterator<(Vec<u8>, T)> {
+	/// Construct iterator to iterate over child trie items in `child_info` with the prefix `prefix`.
+	///
+	/// NOTE: Iterator with [`Self::drain`] will remove any value who failed to decode
+	pub fn with_prefix(child_info: &ChildInfo, prefix: &[u8]) -> Self {
+		let prefix = prefix.to_vec();
+		let previous_key = prefix.clone();
+		let closure = |raw_key_without_prefix: &[u8], raw_value: &[u8]| {
+			let value = T::decode(&mut &raw_value[..])?;
+			Ok((raw_key_without_prefix.to_vec(), value))
+		};
+
+		Self {
+			prefix,
+			child_info: child_info.clone(),
+			previous_key,
+			drain: false,
+			fetch_previous_key: true,
+			closure,
+		}
+	}
+}
+
+impl<K: Decode + Sized, T: Decode + Sized> ChildTriePrefixIterator<(K, T)> {
+	/// Construct iterator to iterate over child trie items in `child_info` with the prefix `prefix`.
+	///
+	/// NOTE: Iterator with [`Self::drain`] will remove any key or value who failed to decode
+	pub fn with_prefix_over_key<H: ReversibleStorageHasher>(child_info: &ChildInfo, prefix: &[u8]) -> Self {
+		let prefix = prefix.to_vec();
+		let previous_key = prefix.clone();
+		let closure = |raw_key_without_prefix: &[u8], raw_value: &[u8]| {
+			let mut key_material = H::reverse(raw_key_without_prefix);
+			let key = K::decode(&mut key_material)?;
+			let value = T::decode(&mut &raw_value[..])?;
+			Ok((key, value))
+		};
+
+		Self {
+			prefix,
+			child_info: child_info.clone(),
+			previous_key,
+			drain: false,
+			fetch_previous_key: true,
+			closure,
+		 }
+	}
+}
+
+impl<T> Iterator for ChildTriePrefixIterator<T> {
+	type Item = T;
+
+	fn next(&mut self) -> Option<Self::Item> {
+		loop {
+			let maybe_next = if self.fetch_previous_key {
+				self.fetch_previous_key = false;
+				Some(self.previous_key.clone())
+			} else {
+				sp_io::default_child_storage::next_key(
+					&self.child_info.storage_key(),
+					&self.previous_key,
+				)
+					.filter(|n| n.starts_with(&self.prefix))
+			};
+			break match maybe_next {
+				Some(next) => {
+					self.previous_key = next;
+					let raw_value = match child::get_raw(&self.child_info, &self.previous_key) {
+						Some(raw_value) => raw_value,
+						None => {
+							log::error!(
+								"next_key returned a key with no value at {:?}",
+								self.previous_key,
+							);
+							continue
+						}
+					};
+					if self.drain {
+						child::kill(&self.child_info, &self.previous_key)
+					}
+					let raw_key_without_prefix = &self.previous_key[self.prefix.len()..];
+					let item = match (self.closure)(raw_key_without_prefix, &raw_value[..]) {
+						Ok(item) => item,
+						Err(e) => {
+							log::error!(
+								"(key, value) failed to decode at {:?}: {:?}",
+								self.previous_key,
+								e,
+							);
+							continue
+						}
+					};
+
+					Some(item)
+				}
+				None => None,
+			}
+		}
+	}
+}
+
 /// Trait for maps that store all its value after a unique prefix.
 ///
 /// By default the final prefix is:
@@ -689,6 +825,7 @@ impl<Hash: Encode> StorageAppend<DigestItem<Hash>> for Digest<Hash> {}
 mod test {
 	use super::*;
 	use sp_core::hashing::twox_128;
+	use crate::hash::Identity;
 	use sp_io::TestExternalities;
 	use generator::StorageValue as _;
 
@@ -825,4 +962,78 @@ mod test {
 			});
 		});
 	}
+
+	#[test]
+	fn child_trie_prefixed_map_works() {
+		TestExternalities::default().execute_with(|| {
+			let child_info_a = child::ChildInfo::new_default(b"a");
+			child::put(&child_info_a, &[1, 2, 3], &8u16);
+			child::put(&child_info_a, &[2], &8u16);
+			child::put(&child_info_a, &[2, 1, 3], &8u8);
+			child::put(&child_info_a, &[2, 2, 3], &8u16);
+			child::put(&child_info_a, &[3], &8u16);
+
+			assert_eq!(
+				ChildTriePrefixIterator::with_prefix(&child_info_a, &[2])
+					.collect::<Vec<(Vec<u8>, u16)>>(),
+				vec![
+					(vec![], 8),
+					(vec![2, 3], 8),
+				],
+			);
+
+			assert_eq!(
+				ChildTriePrefixIterator::with_prefix(&child_info_a, &[2])
+					.drain()
+					.collect::<Vec<(Vec<u8>, u16)>>(),
+				vec![
+					(vec![], 8),
+					(vec![2, 3], 8),
+				],
+			);
+
+			// The only remaining is the ones outside prefix
+			assert_eq!(
+				ChildTriePrefixIterator::with_prefix(&child_info_a, &[])
+					.collect::<Vec<(Vec<u8>, u8)>>(),
+				vec![
+					(vec![1, 2, 3], 8),
+					(vec![3], 8),
+				],
+			);
+
+			child::put(&child_info_a, &[1, 2, 3], &8u16);
+			child::put(&child_info_a, &[2], &8u16);
+			child::put(&child_info_a, &[2, 1, 3], &8u8);
+			child::put(&child_info_a, &[2, 2, 3], &8u16);
+			child::put(&child_info_a, &[3], &8u16);
+
+			assert_eq!(
+				ChildTriePrefixIterator::with_prefix_over_key::<Identity>(&child_info_a, &[2])
+					.collect::<Vec<(u16, u16)>>(),
+				vec![
+					(u16::decode(&mut &[2, 3][..]).unwrap(), 8),
+				],
+			);
+
+			assert_eq!(
+				ChildTriePrefixIterator::with_prefix_over_key::<Identity>(&child_info_a, &[2])
+					.drain()
+					.collect::<Vec<(u16, u16)>>(),
+				vec![
+					(u16::decode(&mut &[2, 3][..]).unwrap(), 8),
+				],
+			);
+
+			// The only remaining is the ones outside prefix
+			assert_eq!(
+				ChildTriePrefixIterator::with_prefix(&child_info_a, &[])
+					.collect::<Vec<(Vec<u8>, u8)>>(),
+				vec![
+					(vec![1, 2, 3], 8),
+					(vec![3], 8),
+				],
+			);
+		});
+	}
 }
diff --git a/frame/tips/src/lib.rs b/frame/tips/src/lib.rs
index 6d85df33f10c..da22bf0b1ffb 100644
--- a/frame/tips/src/lib.rs
+++ b/frame/tips/src/lib.rs
@@ -550,13 +550,13 @@ impl<T: Config> Module<T> {
 			tips: Vec<(AccountId, Balance)>,
 		}
 
-		use frame_support::{Twox64Concat, migration::StorageKeyIterator};
+		use frame_support::{Twox64Concat, migration::storage_key_iter};
 
-		for (hash, old_tip) in StorageKeyIterator::<
+		for (hash, old_tip) in storage_key_iter::<
 			T::Hash,
 			OldOpenTip<T::AccountId, BalanceOf<T>, T::BlockNumber, T::Hash>,
 			Twox64Concat,
-		>::new(b"Treasury", b"Tips").drain()
+		>(b"Treasury", b"Tips").drain()
 		{
 
 			let (finder, deposit, finders_fee) = match old_tip.finder {

From b5978187b9c9fbfcf535ab96161a92c0b330540b Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Thu, 1 Apr 2021 18:25:37 +0200
Subject: [PATCH 0588/1194] Add a feedback when response is successfully sent
 (#8510)

* Add a feedback when response is successfully sent

* Fix gp warp sync
---
 client/finality-grandpa-warp-sync/src/lib.rs  |  1 +
 client/network/src/block_request_handler.rs   |  1 +
 .../src/light_client_requests/handler.rs      | 14 ++++++-
 client/network/src/request_responses.rs       | 38 +++++++++++++++++++
 4 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/client/finality-grandpa-warp-sync/src/lib.rs b/client/finality-grandpa-warp-sync/src/lib.rs
index 52e18e38909c..a43aaf030568 100644
--- a/client/finality-grandpa-warp-sync/src/lib.rs
+++ b/client/finality-grandpa-warp-sync/src/lib.rs
@@ -135,6 +135,7 @@ impl<TBlock: BlockT, TBackend: Backend<TBlock>> GrandpaWarpSyncRequestHandler<TB
 		pending_response.send(OutgoingResponse {
 			result: Ok(proof.encode()),
 			reputation_changes: Vec::new(),
+			sent_feedback: None,
 		}).map_err(|_| HandleRequestError::SendResponse)
 	}
 
diff --git a/client/network/src/block_request_handler.rs b/client/network/src/block_request_handler.rs
index 2cc888c220f6..bfc44e646000 100644
--- a/client/network/src/block_request_handler.rs
+++ b/client/network/src/block_request_handler.rs
@@ -254,6 +254,7 @@ impl<B: BlockT> BlockRequestHandler<B> {
 		pending_response.send(OutgoingResponse {
 			result,
 			reputation_changes,
+			sent_feedback: None,
 		}).map_err(|_| HandleRequestError::SendResponse)
 	}
 
diff --git a/client/network/src/light_client_requests/handler.rs b/client/network/src/light_client_requests/handler.rs
index fe0a3cb187d5..cf2ef706863d 100644
--- a/client/network/src/light_client_requests/handler.rs
+++ b/client/network/src/light_client_requests/handler.rs
@@ -82,7 +82,12 @@ impl<B: Block> LightClientRequestHandler<B> {
 
 			match self.handle_request(peer, payload) {
 				Ok(response_data) => {
-					let response = OutgoingResponse { result: Ok(response_data), reputation_changes: Vec::new() };
+					let response = OutgoingResponse {
+						result: Ok(response_data),
+						reputation_changes: Vec::new(),
+						sent_feedback: None
+					};
+
 					match pending_response.send(response) {
 						Ok(()) => debug!(
 							target: LOG_TARGET,
@@ -110,7 +115,12 @@ impl<B: Block> LightClientRequestHandler<B> {
 						_ => Vec::new(),
 					};
 
-					let response = OutgoingResponse { result: Err(()), reputation_changes };
+					let response = OutgoingResponse {
+						result: Err(()),
+						reputation_changes,
+						sent_feedback: None
+					};
+
 					if pending_response.send(response).is_err() {
 						debug!(
 							target: LOG_TARGET,
diff --git a/client/network/src/request_responses.rs b/client/network/src/request_responses.rs
index e8ca2795ea79..1b23ee3699c9 100644
--- a/client/network/src/request_responses.rs
+++ b/client/network/src/request_responses.rs
@@ -133,9 +133,20 @@ pub struct OutgoingResponse {
 	///
 	/// `Err(())` if none is available e.g. due an error while handling the request.
 	pub result: Result<Vec<u8>, ()>,
+
 	/// Reputation changes accrued while handling the request. To be applied to the reputation of
 	/// the peer sending the request.
 	pub reputation_changes: Vec<ReputationChange>,
+
+	/// If provided, the `oneshot::Sender` will be notified when the request has been sent to the
+	/// peer.
+	///
+	/// > **Note**: Operating systems typically maintain a buffer of a few dozen kilobytes of
+	/// >			outgoing data for each TCP socket, and it is not possible for a user
+	/// >			application to inspect this buffer. This channel here is not actually notified
+	/// >			when the response has been fully sent out, but rather when it has fully been
+	/// >			written to the buffer managed by the operating system.
+	pub sent_feedback: Option<oneshot::Sender<()>>,
 }
 
 /// Event generated by the [`RequestResponsesBehaviour`].
@@ -240,6 +251,10 @@ pub struct RequestResponsesBehaviour {
 
 	/// Whenever an incoming request arrives, the arrival [`Instant`] is recorded here.
 	pending_responses_arrival_time: HashMap<ProtocolRequestId, Instant>,
+
+	/// Whenever a response is received on `pending_responses`, insert a channel to be notified
+	/// when the request has been sent out.
+	send_feedback: HashMap<ProtocolRequestId, oneshot::Sender<()>>,
 }
 
 /// Generated by the response builder and waiting to be processed.
@@ -284,6 +299,7 @@ impl RequestResponsesBehaviour {
 			pending_requests: Default::default(),
 			pending_responses: Default::default(),
 			pending_responses_arrival_time: Default::default(),
+			send_feedback: Default::default(),
 		})
 	}
 
@@ -463,6 +479,7 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 					response: OutgoingResponse {
 						result,
 						reputation_changes,
+						sent_feedback,
 					},
 				} = match outcome {
 					Some(outcome) => outcome,
@@ -483,6 +500,13 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 								 Dropping response",
 								request_id, protocol_name,
 							);
+						} else {
+							if let Some(sent_feedback) = sent_feedback {
+								self.send_feedback.insert(
+									(protocol_name, request_id).into(),
+									sent_feedback
+								);
+							}
 						}
 					}
 				}
@@ -668,6 +692,7 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 							self.pending_responses_arrival_time.remove(
 								&(protocol.clone(), request_id).into(),
 							);
+							self.send_feedback.remove(&(protocol.clone(), request_id).into());
 							let out = Event::InboundRequest {
 								peer,
 								protocol: protocol.clone(),
@@ -690,11 +715,18 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 									 failed; qed.",
 								);
 
+							if let Some(send_feedback) = self.send_feedback.remove(
+								&(protocol.clone(), request_id).into()
+							) {
+								let _ = send_feedback.send(());
+							}
+
 							let out = Event::InboundRequest {
 								peer,
 								protocol: protocol.clone(),
 								result: Ok(arrival_time),
 							};
+
 							return Poll::Ready(NetworkBehaviourAction::GenerateEvent(out));
 
 						}
@@ -914,11 +946,14 @@ mod tests {
 
 				pool.spawner().spawn_obj(async move {
 					while let Some(rq) = rx.next().await {
+						let (fb_tx, fb_rx) = oneshot::channel();
 						assert_eq!(rq.payload, b"this is a request");
 						let _ = rq.pending_response.send(super::OutgoingResponse {
 							result: Ok(b"this is a response".to_vec()),
 							reputation_changes: Vec::new(),
+							sent_feedback: Some(fb_tx),
 						});
+						fb_rx.await.unwrap();
 					}
 				}.boxed().into()).unwrap();
 
@@ -1005,6 +1040,7 @@ mod tests {
 						let _ = rq.pending_response.send(super::OutgoingResponse {
 							result: Ok(b"this response exceeds the limit".to_vec()),
 							reputation_changes: Vec::new(),
+							sent_feedback: None,
 						});
 					}
 				}.boxed().into()).unwrap();
@@ -1175,6 +1211,7 @@ mod tests {
 				.send(OutgoingResponse {
 					result: Ok(b"this is a response".to_vec()),
 					reputation_changes: Vec::new(),
+					sent_feedback: None,
 				})
 				.unwrap();
 			protocol_2_request.unwrap()
@@ -1182,6 +1219,7 @@ mod tests {
 				.send(OutgoingResponse {
 					result: Ok(b"this is a response".to_vec()),
 					reputation_changes: Vec::new(),
+					sent_feedback: None,
 				})
 				.unwrap();
 		}.boxed().into()).unwrap();

From 619947eae673d3d46731a89072c8df77fd1570ad Mon Sep 17 00:00:00 2001
From: ferrell-code <70108835+ferrell-code@users.noreply.github.com>
Date: Thu, 1 Apr 2021 17:46:41 -0400
Subject: [PATCH 0589/1194] tests for assets pallet (#8487)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* tests for assets

* Update frame/assets/src/tests.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update frame/assets/src/tests.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* add force asset status check

* remove TODO

* actually remove TODO

* add force asset status tests

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 frame/assets/src/tests.rs | 82 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 79 insertions(+), 3 deletions(-)

diff --git a/frame/assets/src/tests.rs b/frame/assets/src/tests.rs
index 953164a0b938..f4976af02362 100644
--- a/frame/assets/src/tests.rs
+++ b/frame/assets/src/tests.rs
@@ -492,9 +492,6 @@ fn set_metadata_should_work() {
 	});
 }
 
-// TODO: tests for force_set_metadata, force_clear_metadata, force_asset_status
-// https://github.com/paritytech/substrate/issues/8470
-
 #[test]
 fn freezer_should_work() {
 	new_test_ext().execute_with(|| {
@@ -556,3 +553,82 @@ fn imbalances_should_work() {
 		assert_eq!(Assets::total_supply(0), 30);
 	});
 }
+
+#[test]
+fn force_metadata_should_work() {
+	new_test_ext().execute_with(|| {
+		//force set metadata works
+		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
+		assert_ok!(Assets::force_set_metadata(Origin::root(), 0, vec![0u8; 10], vec![0u8; 10], 8, false));
+		assert!(Metadata::<Test>::contains_key(0));
+
+		//overwrites existing metadata
+		let asset_original_metadata = Metadata::<Test>::get(0);
+		assert_ok!(Assets::force_set_metadata(Origin::root(), 0, vec![1u8; 10], vec![1u8; 10], 8, false));
+		assert_ne!(Metadata::<Test>::get(0), asset_original_metadata);
+
+		//attempt to set metadata for non-existent asset class
+		assert_noop!(
+			Assets::force_set_metadata(Origin::root(), 1, vec![0u8; 10], vec![0u8; 10], 8, false),
+			Error::<Test>::Unknown
+		);
+
+		//string length limit check
+		let limit = StringLimit::get() as usize;
+		assert_noop!(
+			Assets::force_set_metadata(Origin::root(), 0, vec![0u8; limit + 1], vec![0u8; 10], 8, false),
+			Error::<Test>::BadMetadata
+		);
+		assert_noop!(
+			Assets::force_set_metadata(Origin::root(), 0, vec![0u8; 10], vec![0u8; limit + 1], 8, false),
+			Error::<Test>::BadMetadata
+		);
+
+		//force clear metadata works
+		assert!(Metadata::<Test>::contains_key(0));
+		assert_ok!(Assets::force_clear_metadata(Origin::root(), 0));
+		assert!(!Metadata::<Test>::contains_key(0));
+
+		//Error handles clearing non-existent asset class
+		assert_noop!(Assets::force_clear_metadata(Origin::root(), 1), Error::<Test>::Unknown);
+	});
+}
+
+#[test]
+fn force_asset_status_should_work(){
+	new_test_ext().execute_with(|| {
+		Balances::make_free_balance_be(&1, 10);
+		Balances::make_free_balance_be(&2, 10);
+		assert_ok!(Assets::create(Origin::signed(1), 0, 1, 30));
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 50));
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 2, 150));
+
+		//force asset status to change min_balance > balance 
+		assert_ok!(Assets::force_asset_status(Origin::root(), 0, 1, 1, 1, 1, 100, true, false));
+		assert_eq!(Assets::balance(0, 1), 50);
+
+		//account can recieve assets for balance < min_balance
+		assert_ok!(Assets::transfer(Origin::signed(2), 0, 1, 1));
+		assert_eq!(Assets::balance(0, 1), 51);
+
+		//account on outbound transfer will cleanup for balance < min_balance
+		assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 1));
+		assert_eq!(Assets::balance(0,1), 0);
+
+		//won't create new account with balance below min_balance
+		assert_noop!(Assets::transfer(Origin::signed(2), 0, 3, 50), TokenError::BelowMinimum);
+
+		//force asset status will not execute for non-existent class
+		assert_noop!(
+			Assets::force_asset_status(Origin::root(), 1, 1, 1, 1, 1, 90, true, false),
+			Error::<Test>::Unknown
+		);
+
+		//account drains to completion when funds dip below min_balance
+		assert_ok!(Assets::force_asset_status(Origin::root(), 0, 1, 1, 1, 1, 110, true, false));
+		assert_ok!(Assets::transfer(Origin::signed(2), 0, 1, 110));
+		assert_eq!(Assets::balance(0, 1), 200);
+		assert_eq!(Assets::balance(0, 2), 0);
+		assert_eq!(Assets::total_supply(0), 200);
+	});
+}

From 3dc169d526c12687944ffcd3d3c3b0adf4332db3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Fri, 2 Apr 2021 01:09:41 +0200
Subject: [PATCH 0590/1194] Make `SetCode::set_code` return a result (#8515)

---
 frame/system/src/lib.rs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index cfe79128863f..d8a50f9f7a18 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -94,7 +94,7 @@ use frame_support::{
 		Weight, RuntimeDbWeight, DispatchInfo, DispatchClass,
 		extract_actual_weight, PerDispatchClass,
 	},
-	dispatch::DispatchResultWithPostInfo,
+	dispatch::{DispatchResultWithPostInfo, DispatchResult},
 };
 use codec::{Encode, Decode, FullCodec, EncodeLike};
 
@@ -143,12 +143,13 @@ pub use pallet::*;
 /// Do something when we should be setting the code.
 pub trait SetCode {
 	/// Set the code to the given blob.
-	fn set_code(code: Vec<u8>);
+	fn set_code(code: Vec<u8>) -> DispatchResult;
 }
 
 impl SetCode for () {
-	fn set_code(code: Vec<u8>) {
+	fn set_code(code: Vec<u8>) -> DispatchResult {
 		storage::unhashed::put_raw(well_known_keys::CODE, &code);
+		Ok(())
 	}
 }
 
@@ -345,7 +346,7 @@ pub mod pallet {
 			ensure_root(origin)?;
 			Self::can_set_code(&code)?;
 
-			T::OnSetCode::set_code(code);
+			T::OnSetCode::set_code(code)?;
 			Self::deposit_event(Event::CodeUpdated);
 			Ok(().into())
 		}
@@ -364,7 +365,7 @@ pub mod pallet {
 			code: Vec<u8>,
 		) -> DispatchResultWithPostInfo {
 			ensure_root(origin)?;
-			T::OnSetCode::set_code(code);
+			T::OnSetCode::set_code(code)?;
 			Self::deposit_event(Event::CodeUpdated);
 			Ok(().into())
 		}

From fb8b68fbc54d6687008a6c9a080011f66edae5dd Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Fri, 2 Apr 2021 16:40:05 +0200
Subject: [PATCH 0591/1194] Another tweak to GrandPa warp sync (#8514)

* Another tweak to GrandPa warp sync

* Rename to WarpSyncFragment

* Ensure proof is minimal
---
 client/finality-grandpa-warp-sync/src/lib.rs  |  2 +-
 .../finality-grandpa-warp-sync/src/proof.rs   | 66 ++++++++++---------
 2 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/client/finality-grandpa-warp-sync/src/lib.rs b/client/finality-grandpa-warp-sync/src/lib.rs
index a43aaf030568..285a5fe736db 100644
--- a/client/finality-grandpa-warp-sync/src/lib.rs
+++ b/client/finality-grandpa-warp-sync/src/lib.rs
@@ -31,7 +31,7 @@ use sc_finality_grandpa::SharedAuthoritySet;
 
 mod proof;
 
-pub use proof::{AuthoritySetChangeProof, WarpSyncProof};
+pub use proof::{WarpSyncFragment, WarpSyncProof};
 
 /// Generates the appropriate [`RequestResponseConfig`] for a given chain configuration.
 pub fn request_response_config_for_chain<TBlock: BlockT, TBackend: Backend<TBlock> + 'static>(
diff --git a/client/finality-grandpa-warp-sync/src/proof.rs b/client/finality-grandpa-warp-sync/src/proof.rs
index 6b7002555d39..08effcf1c24b 100644
--- a/client/finality-grandpa-warp-sync/src/proof.rs
+++ b/client/finality-grandpa-warp-sync/src/proof.rs
@@ -24,7 +24,7 @@ use sp_blockchain::{Backend as BlockchainBackend, HeaderBackend};
 use sp_finality_grandpa::{AuthorityList, SetId, GRANDPA_ENGINE_ID};
 use sp_runtime::{
 	generic::BlockId,
-	traits::{Block as BlockT, NumberFor, One},
+	traits::{Block as BlockT, Header as HeaderT, NumberFor, One},
 };
 
 use crate::HandleRequestError;
@@ -34,7 +34,7 @@ const MAX_CHANGES_PER_WARP_SYNC_PROOF: usize = 256;
 
 /// A proof of an authority set change.
 #[derive(Decode, Encode)]
-pub struct AuthoritySetChangeProof<Block: BlockT> {
+pub struct WarpSyncFragment<Block: BlockT> {
 	/// The last block that the given authority set finalized. This block should contain a digest
 	/// signaling an authority set change from which we can fetch the next authority set.
 	pub header: Block::Header,
@@ -43,21 +43,11 @@ pub struct AuthoritySetChangeProof<Block: BlockT> {
 	pub justification: GrandpaJustification<Block>,
 }
 
-/// Represents the current state of the warp sync, namely whether it is considered
-/// finished, i.e. we have proved everything up until the latest authority set, or not.
-/// When the warp sync is finished we might optionally provide a justification for the
-/// latest finalized block, which should be checked against the latest authority set.
-#[derive(Debug, Decode, Encode)]
-pub enum WarpSyncFinished<Block: BlockT> {
-	No,
-	Yes(Option<GrandpaJustification<Block>>),
-}
-
 /// An accumulated proof of multiple authority set changes.
 #[derive(Decode, Encode)]
 pub struct WarpSyncProof<Block: BlockT> {
-	proofs: Vec<AuthoritySetChangeProof<Block>>,
-	is_finished: WarpSyncFinished<Block>,
+	proofs: Vec<WarpSyncFragment<Block>>,
+	is_finished: bool,
 }
 
 impl<Block: BlockT> WarpSyncProof<Block> {
@@ -130,16 +120,16 @@ impl<Block: BlockT> WarpSyncProof<Block> {
 
 			let justification = GrandpaJustification::<Block>::decode(&mut &justification[..])?;
 
-			proofs.push(AuthoritySetChangeProof {
+			proofs.push(WarpSyncFragment {
 				header: header.clone(),
 				justification,
 			});
 		}
 
 		let is_finished = if proof_limit_reached {
-			WarpSyncFinished::No
+			false
 		} else {
-			let latest =
+			let latest_justification =
 				sc_finality_grandpa::best_justification(backend)?.filter(|justification| {
 					// the existing best justification must be for a block higher than the
 					// last authority set change. if we didn't prove any authority set
@@ -153,7 +143,17 @@ impl<Block: BlockT> WarpSyncProof<Block> {
 					justification.target().0 >= limit
 				});
 
-			WarpSyncFinished::Yes(latest)
+			if let Some(latest_justification) = latest_justification {
+				let header = blockchain.header(BlockId::Hash(latest_justification.target().1))?
+					.expect("header hash corresponds to a justification in db; must exist in db as well; qed.");
+
+				proofs.push(WarpSyncFragment {
+					header,
+					justification: latest_justification,
+				})
+			}
+
+			true
 		};
 
 		Ok(WarpSyncProof {
@@ -175,26 +175,28 @@ impl<Block: BlockT> WarpSyncProof<Block> {
 		let mut current_set_id = set_id;
 		let mut current_authorities = authorities;
 
-		for proof in &self.proofs {
+		for (fragment_num, proof) in self.proofs.iter().enumerate() {
 			proof
 				.justification
 				.verify(current_set_id, &current_authorities)
 				.map_err(|err| HandleRequestError::InvalidProof(err.to_string()))?;
 
-			let scheduled_change = find_scheduled_change::<Block>(&proof.header).ok_or(
-				HandleRequestError::InvalidProof(
-					"Header is missing authority set change digest".to_string(),
-				),
-			)?;
-
-			current_authorities = scheduled_change.next_authorities;
-			current_set_id += 1;
-		}
+			if proof.justification.target().1 != proof.header.hash() {
+				return Err(HandleRequestError::InvalidProof(
+					"mismatch between header and justification".to_owned()
+				));
+			}
 
-		if let WarpSyncFinished::Yes(Some(ref justification)) = self.is_finished {
-			justification
-				.verify(current_set_id, &current_authorities)
-				.map_err(|err| HandleRequestError::InvalidProof(err.to_string()))?;
+			if let Some(scheduled_change) = find_scheduled_change::<Block>(&proof.header) {
+				current_authorities = scheduled_change.next_authorities;
+				current_set_id += 1;
+			} else if fragment_num != self.proofs.len() - 1 {
+				// Only the last fragment of the proof is allowed to be missing the authority
+				// set change.
+				return Err(HandleRequestError::InvalidProof(
+					"Header is missing authority set change digest".to_string(),
+				));
+			}
 		}
 
 		Ok((current_set_id, current_authorities))

From 14b3030f92546ad2cece4f1d060cbcf6edfd21e5 Mon Sep 17 00:00:00 2001
From: Andronik Ordian <write@reusable.software>
Date: Fri, 2 Apr 2021 21:50:35 +0200
Subject: [PATCH 0592/1194] upgrade wasmtime to 0.24.0 (#8356)

---
 Cargo.lock                          | 138 ++++++++++++++--------------
 client/executor/wasmtime/Cargo.toml |   2 +-
 2 files changed, 69 insertions(+), 71 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1ea9b2fda028..f038ec8bed2d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -428,7 +428,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "libc",
  "miniz_oxide",
- "object 0.23.0",
+ "object",
  "rustc-demangle",
 ]
 
@@ -964,18 +964,18 @@ checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba"
 
 [[package]]
 name = "cranelift-bforest"
-version = "0.69.0"
+version = "0.71.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4066fd63b502d73eb8c5fa6bcab9c7962b05cd580f6b149ee83a8e730d8ce7fb"
+checksum = "bcee7a5107071484772b89fdf37f0f460b7db75f476e43ea7a684fd942470bcf"
 dependencies = [
  "cranelift-entity",
 ]
 
 [[package]]
 name = "cranelift-codegen"
-version = "0.69.0"
+version = "0.71.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a54e4beb833a3c873a18a8fe735d73d732044004c7539a072c8faa35ccb0c60"
+checksum = "654ab96f0f1cab71c0d323618a58360a492da2c341eb2c1f977fc195c664001b"
 dependencies = [
  "byteorder",
  "cranelift-bforest",
@@ -993,9 +993,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-codegen-meta"
-version = "0.69.0"
+version = "0.71.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c54cac7cacb443658d8f0ff36a3545822613fa202c946c0891897843bc933810"
+checksum = "65994cfc5be9d5fd10c5fc30bcdddfa50c04bb79c91329287bff846434ff8f14"
 dependencies = [
  "cranelift-codegen-shared",
  "cranelift-entity",
@@ -1003,24 +1003,27 @@ dependencies = [
 
 [[package]]
 name = "cranelift-codegen-shared"
-version = "0.69.0"
+version = "0.71.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a109760aff76788b2cdaeefad6875a73c2b450be13906524f6c2a81e05b8d83c"
+checksum = "889d720b688b8b7df5e4903f9b788c3c59396050f5548e516e58ccb7312463ab"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "cranelift-entity"
-version = "0.69.0"
+version = "0.71.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b044234aa32531f89a08b487630ddc6744696ec04c8123a1ad388de837f5de3"
+checksum = "1a2e6884a363e42a9ba980193ea8603a4272f8a92bd8bbaf9f57a94dbea0ff96"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "cranelift-frontend"
-version = "0.69.0"
+version = "0.71.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5452b3e4e97538ee5ef2cc071301c69a86c7adf2770916b9d04e9727096abd93"
+checksum = "e6f41e2f9b57d2c030e249d0958f1cdc2c3cd46accf8c0438b3d1944e9153444"
 dependencies = [
  "cranelift-codegen",
  "log",
@@ -1030,25 +1033,24 @@ dependencies = [
 
 [[package]]
 name = "cranelift-native"
-version = "0.69.0"
+version = "0.71.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f68035c10b2e80f26cc29c32fa824380877f38483504c2a47b54e7da311caaf3"
+checksum = "aab70ba7575665375d31cbdea2462916ce58be887834e1b83c860b43b51af637"
 dependencies = [
  "cranelift-codegen",
- "raw-cpuid",
  "target-lexicon",
 ]
 
 [[package]]
 name = "cranelift-wasm"
-version = "0.69.0"
+version = "0.71.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a530eb9d1c95b3309deb24c3d179d8b0ba5837ed98914a429787c395f614949d"
+checksum = "f2fc3d2e70da6439adf97648dcdf81834363154f2907405345b6fbe7ca38918c"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
  "cranelift-frontend",
- "itertools 0.9.0",
+ "itertools 0.10.0",
  "log",
  "serde",
  "smallvec 1.6.1",
@@ -4555,20 +4557,14 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397"
+checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4"
 dependencies = [
  "crc32fast",
  "indexmap",
 ]
 
-[[package]]
-name = "object"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4"
-
 [[package]]
 name = "once_cell"
 version = "1.7.2"
@@ -6529,17 +6525,6 @@ dependencies = [
  "rand_core 0.5.1",
 ]
 
-[[package]]
-name = "raw-cpuid"
-version = "8.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fdf7d9dbd43f3d81d94a49c1c3df73cc2b3827995147e6cf7f89d4ec5483e73"
-dependencies = [
- "bitflags",
- "cc",
- "rustc_version",
-]
-
 [[package]]
 name = "rawpointer"
 version = "0.2.1"
@@ -6644,6 +6629,7 @@ checksum = "571f7f397d61c4755285cd37853fe8e03271c243424a907415909379659381c5"
 dependencies = [
  "log",
  "rustc-hash",
+ "serde",
  "smallvec 1.6.1",
 ]
 
@@ -10818,15 +10804,15 @@ dependencies = [
 
 [[package]]
 name = "wasmparser"
-version = "0.71.0"
+version = "0.76.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89a30c99437829ede826802bfcf28500cf58df00e66cb9114df98813bc145ff1"
+checksum = "755a9a4afe3f6cccbbe6d7e965eef44cf260b001f93e547eba84255c1d0187d8"
 
 [[package]]
 name = "wasmtime"
-version = "0.22.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7426055cb92bd9a1e9469b48154d8d6119cd8c498c8b70284e420342c05dc45d"
+checksum = "718cb52a9fdb7ab12471e9b9d051c9adfa6b5c504e0a1fea045e5eabc81eedd9"
 dependencies = [
  "anyhow",
  "backtrace",
@@ -10836,6 +10822,7 @@ dependencies = [
  "indexmap",
  "libc",
  "log",
+ "paste 1.0.4",
  "region",
  "rustc-demangle",
  "serde",
@@ -10844,6 +10831,7 @@ dependencies = [
  "wasmparser",
  "wasmtime-cache",
  "wasmtime-environ",
+ "wasmtime-fiber",
  "wasmtime-jit",
  "wasmtime-profiling",
  "wasmtime-runtime",
@@ -10853,9 +10841,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-cache"
-version = "0.22.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c01d9287e36921e46f5887a47007824ae5dbb9b7517a2d565660ab4471478709"
+checksum = "1f984df56c4adeba91540f9052db9f7a8b3b00cfaac1a023bee50a972f588b0c"
 dependencies = [
  "anyhow",
  "base64 0.13.0",
@@ -10874,27 +10862,28 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-cranelift"
-version = "0.22.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4134ed3a4316cd0de0e546c6004850afe472b0fa3fcdc2f2c15f8d449562d962"
+checksum = "2a05abbf94e03c2c8ee02254b1949320c4d45093de5d9d6ed4d9351d536075c9"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
  "cranelift-frontend",
  "cranelift-wasm",
+ "wasmparser",
  "wasmtime-environ",
 ]
 
 [[package]]
 name = "wasmtime-debug"
-version = "0.22.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91fa931df6dd8af2b02606307674d3bad23f55473d5f4c809dddf7e4c4dc411"
+checksum = "382eecd6281c6c1d1f3c904c3c143e671fc1a9573820cbfa777fba45ce2eda9c"
 dependencies = [
  "anyhow",
  "gimli",
  "more-asserts",
- "object 0.22.0",
+ "object",
  "target-lexicon",
  "thiserror",
  "wasmparser",
@@ -10903,9 +10892,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-environ"
-version = "0.22.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1098871dc3120aaf8190d79153e470658bb79f63ee9ca31716711e123c28220"
+checksum = "81011b2b833663d7e0ce34639459a0e301e000fc7331e0298b3a27c78d0cec60"
 dependencies = [
  "anyhow",
  "cfg-if 1.0.0",
@@ -10921,11 +10910,22 @@ dependencies = [
  "wasmparser",
 ]
 
+[[package]]
+name = "wasmtime-fiber"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d92da32e31af2e3d828f485f5f24651ed4d3b7f03a46ea6555eae6940d1402cd"
+dependencies = [
+ "cc",
+ "libc",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "wasmtime-jit"
-version = "0.22.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "738bfcd1561ede8bb174215776fd7d9a95d5f0a47ca3deabe0282c55f9a89f68"
+checksum = "9b5f649623859a12d361fe4cc4793de44f7c3ff34c322c5714289787e89650bb"
 dependencies = [
  "addr2line",
  "anyhow",
@@ -10938,7 +10938,7 @@ dependencies = [
  "gimli",
  "log",
  "more-asserts",
- "object 0.22.0",
+ "object",
  "rayon",
  "region",
  "serde",
@@ -10956,13 +10956,13 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-obj"
-version = "0.22.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e96d77f1801131c5e86d93e42a3cf8a35402107332c202c245c83f34888a906"
+checksum = "ef2e99cd9858f57fd062e9351e07881cedfc8597928385e02a48d9333b9e15a1"
 dependencies = [
  "anyhow",
  "more-asserts",
- "object 0.22.0",
+ "object",
  "target-lexicon",
  "wasmtime-debug",
  "wasmtime-environ",
@@ -10970,16 +10970,16 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-profiling"
-version = "0.22.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60bb672c9d894776d7b9250dd9b4fe890f8760201ee4f53e5f2da772b6c4debb"
+checksum = "e46c0a590e49278ba7f79ef217af9db4ecc671b50042c185093e22d73524abb2"
 dependencies = [
  "anyhow",
  "cfg-if 1.0.0",
  "gimli",
  "lazy_static",
  "libc",
- "object 0.22.0",
+ "object",
  "scroll",
  "serde",
  "target-lexicon",
@@ -10989,9 +10989,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-runtime"
-version = "0.22.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a978086740949eeedfefcee667b57a9e98d9a7fc0de382fcfa0da30369e3530d"
+checksum = "1438a09185fc7ca067caf1a80d7e5b398eefd4fb7630d94841448ade60feb3d0"
 dependencies = [
  "backtrace",
  "cc",
@@ -11206,18 +11206,18 @@ dependencies = [
 
 [[package]]
 name = "zstd"
-version = "0.5.4+zstd.1.4.7"
+version = "0.6.1+zstd.1.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69996ebdb1ba8b1517f61387a883857818a66c8a295f487b1ffd8fd9d2c82910"
+checksum = "5de55e77f798f205d8561b8fe2ef57abfb6e0ff2abe7fd3c089e119cdb5631a3"
 dependencies = [
  "zstd-safe",
 ]
 
 [[package]]
 name = "zstd-safe"
-version = "2.0.6+zstd.1.4.7"
+version = "3.0.1+zstd.1.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98aa931fb69ecee256d44589d19754e61851ae4769bf963b385119b1cc37a49e"
+checksum = "1387cabcd938127b30ce78c4bf00b30387dddf704e3f0881dbc4ff62b5566f8c"
 dependencies = [
  "libc",
  "zstd-sys",
@@ -11225,12 +11225,10 @@ dependencies = [
 
 [[package]]
 name = "zstd-sys"
-version = "1.4.18+zstd.1.4.7"
+version = "1.4.20+zstd.1.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1e6e8778706838f43f771d80d37787cb2fe06dafe89dd3aebaf6721b9eaec81"
+checksum = "ebd5b733d7cf2d9447e2c3e76a5589b4f5e5ae065c22a2bc0b023cbc331b6c8e"
 dependencies = [
  "cc",
- "glob",
- "itertools 0.9.0",
  "libc",
 ]
diff --git a/client/executor/wasmtime/Cargo.toml b/client/executor/wasmtime/Cargo.toml
index 051b314e4498..b9f2dd1a9d92 100644
--- a/client/executor/wasmtime/Cargo.toml
+++ b/client/executor/wasmtime/Cargo.toml
@@ -22,7 +22,7 @@ sp-wasm-interface = { version = "3.0.0", path = "../../../primitives/wasm-interf
 sp-runtime-interface = { version = "3.0.0", path = "../../../primitives/runtime-interface" }
 sp-core = { version = "3.0.0", path = "../../../primitives/core" }
 sp-allocator = { version = "3.0.0", path = "../../../primitives/allocator" }
-wasmtime = "0.22"
+wasmtime = "0.24.0"
 pwasm-utils = "0.14.0"
 
 [dev-dependencies]

From 2789fed95aab3ea83eb3ea5af9b6a5b3b5869ced Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Fri, 2 Apr 2021 23:58:30 +0200
Subject: [PATCH 0593/1194] Fixes `storage_hash` caching issue and enables
 better caching for Cumulus (#8518)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fixes `storage_hash` caching issue and enables better caching for Cumulus

There was a caching issue with `storage_hash` that resulted in not
reverting cached storage hashes when required. In Cumulus this resulted
in nodes failing to import new blocks after a runtime upgrade, because
they were using the old runtime version.

Besides that, this pr optimizes for the Cumulus use case. In particular
that we always import blocks first as non-best blocks and enact them
later. In current version of the caching that would mean we would always
throw away the complete cache of the latest imported block. Now, we
always update the cache for the first block of a new block height. This
enables us to use the cache if this block will enacted as best block
later. If there is a fork and that is enacted as best, we revert all the
changes to the cache.

* Apply suggestions from code review

Co-authored-by: Arkadiy Paronyan <arkady.paronyan@gmail.com>

* Indentation

* Update client/db/src/storage_cache.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

Co-authored-by: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
---
 client/db/src/lib.rs           |  94 +++++++++
 client/db/src/storage_cache.rs | 360 +++++++++++++++++++++++++--------
 2 files changed, 366 insertions(+), 88 deletions(-)

diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index 03a6ce220095..086a6ba1c68a 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -2744,6 +2744,100 @@ pub(crate) mod tests {
 		}
 	}
 
+	#[test]
+	fn storage_hash_is_cached_correctly() {
+		let backend = Backend::<Block>::new_test(10, 10);
+
+		let hash0 = {
+			let mut op = backend.begin_operation().unwrap();
+			backend.begin_state_operation(&mut op, BlockId::Hash(Default::default())).unwrap();
+			let mut header = Header {
+				number: 0,
+				parent_hash: Default::default(),
+				state_root: Default::default(),
+				digest: Default::default(),
+				extrinsics_root: Default::default(),
+			};
+
+			let storage = vec![(b"test".to_vec(), b"test".to_vec())];
+
+			header.state_root = op.old_state.storage_root(storage
+				.iter()
+				.map(|(x, y)| (&x[..], Some(&y[..])))
+			).0.into();
+			let hash = header.hash();
+
+			op.reset_storage(Storage {
+				top: storage.into_iter().collect(),
+				children_default: Default::default(),
+			}).unwrap();
+			op.set_block_data(
+				header.clone(),
+				Some(vec![]),
+				None,
+				NewBlockState::Best,
+			).unwrap();
+
+			backend.commit_operation(op).unwrap();
+
+			hash
+		};
+
+		let block0_hash = backend.state_at(BlockId::Hash(hash0))
+			.unwrap()
+			.storage_hash(&b"test"[..])
+			.unwrap();
+
+		let hash1 = {
+			let mut op = backend.begin_operation().unwrap();
+			backend.begin_state_operation(&mut op, BlockId::Number(0)).unwrap();
+			let mut header = Header {
+				number: 1,
+				parent_hash: hash0,
+				state_root: Default::default(),
+				digest: Default::default(),
+				extrinsics_root: Default::default(),
+			};
+
+			let storage = vec![(b"test".to_vec(), Some(b"test2".to_vec()))];
+
+			let (root, overlay) = op.old_state.storage_root(
+				storage.iter()
+					.map(|(k, v)| (&k[..], v.as_ref().map(|v| &v[..])))
+			);
+			op.update_db_storage(overlay).unwrap();
+			header.state_root = root.into();
+			let hash = header.hash();
+
+			op.update_storage(storage, Vec::new()).unwrap();
+			op.set_block_data(
+				header,
+				Some(vec![]),
+				None,
+				NewBlockState::Normal,
+			).unwrap();
+
+			backend.commit_operation(op).unwrap();
+
+			hash
+		};
+
+		{
+			let header = backend.blockchain().header(BlockId::Hash(hash1)).unwrap().unwrap();
+			let mut op = backend.begin_operation().unwrap();
+			backend.begin_state_operation(&mut op, BlockId::Hash(hash0)).unwrap();
+			op.set_block_data(header, None, None, NewBlockState::Best).unwrap();
+			backend.commit_operation(op).unwrap();
+		}
+
+		let block1_hash = backend.state_at(BlockId::Hash(hash1))
+			.unwrap()
+			.storage_hash(&b"test"[..])
+			.unwrap();
+
+		assert_ne!(block0_hash, block1_hash);
+	}
+
 	#[test]
 	fn test_finalize_non_sequential() {
 		let backend = Backend::<Block>::new_test(10, 10);
diff --git a/client/db/src/storage_cache.rs b/client/db/src/storage_cache.rs
index 2dde8d505822..37c7c253f59e 100644
--- a/client/db/src/storage_cache.rs
+++ b/client/db/src/storage_cache.rs
@@ -25,7 +25,6 @@ use std::sync::Arc;
 use std::hash::Hash as StdHash;
 use parking_lot::{Mutex, RwLock, RwLockUpgradableReadGuard};
 use linked_hash_map::{LinkedHashMap, Entry};
-use hash_db::Hasher;
 use sp_runtime::traits::{Block as BlockT, Header, HashFor, NumberFor};
 use sp_core::hexdisplay::HexDisplay;
 use sp_core::storage::ChildInfo;
@@ -50,6 +49,8 @@ pub struct Cache<B: BlockT> {
 	lru_child_storage: LRUMap<ChildStorageKey, Option<StorageValue>>,
 	/// Information on the modifications in recently committed blocks; specifically which keys
 	/// changed in which block. Ordered by block number.
+	///
+	/// The latest committed block is always at the front.
 	modifications: VecDeque<BlockChanges<B::Header>>,
 }
 
@@ -178,6 +179,7 @@ impl<B: BlockT> Cache<B> {
 					for a in &m.storage {
 						trace!("Reverting enacted key {:?}", HexDisplay::from(a));
 						self.lru_storage.remove(a);
+						self.lru_hashes.remove(a);
 					}
 					for a in &m.child_storage {
 						trace!("Reverting enacted child key {:?}", a);
@@ -218,6 +220,27 @@ impl<B: BlockT> Cache<B> {
 			self.modifications.clear();
 		}
 	}
+
+	fn add_modifications(&mut self, block_changes: BlockChanges<B::Header>) {
+		let insert_at = self.modifications.iter()
+			.enumerate()
+			.find(|(_, m)| m.number < block_changes.number)
+			.map(|(i, _)| i);
+
+		trace!("Inserting modifications at {:?}", insert_at);
+		if let Some(insert_at) = insert_at {
+			self.modifications.insert(insert_at, block_changes);
+		} else {
+			self.modifications.push_back(block_changes);
+		}
+	}
+
+	/// Returns if this is the first modification at the given block height.
+	///
+	/// If there already exists a modification for a higher block height, `false` is returned.
+	fn has_no_modification_at_block_height(&self, number: NumberFor<B>) -> bool {
+		self.modifications.get(0).map(|c| c.number < number).unwrap_or(true)
+	}
 }
 
 pub type SharedCache<B> = Arc<Mutex<Cache<B>>>;
@@ -247,15 +270,15 @@ pub fn new_shared_cache<B: BlockT>(
 	)
 }
 
-#[derive(Debug)]
 /// Accumulates a list of storage changed in a block.
-struct BlockChanges<B: Header> {
+#[derive(Debug)]
+struct BlockChanges<H: Header> {
 	/// Block number.
-	number: B::Number,
+	number: H::Number,
 	/// Block hash.
-	hash: B::Hash,
+	hash: H::Hash,
 	/// Parent block hash.
-	parent: B::Hash,
+	parent: H::Hash,
 	/// A set of modified storage keys.
 	storage: HashSet<StorageKey>,
 	/// A set of modified child storage keys.
@@ -265,7 +288,7 @@ struct BlockChanges<B: Header> {
 }
 
 /// Cached values specific to a state.
-struct LocalCache<H: Hasher> {
+struct LocalCache<B: BlockT> {
 	/// Storage cache.
 	///
 	/// `None` indicates that key is known to be missing.
@@ -273,19 +296,41 @@ struct LocalCache<H: Hasher> {
 	/// Storage hashes cache.
 	///
 	/// `None` indicates that key is known to be missing.
-	hashes: HashMap<StorageKey, Option<H::Out>>,
+	hashes: HashMap<StorageKey, Option<B::Hash>>,
 	/// Child storage cache.
 	///
 	/// `None` indicates that key is known to be missing.
 	child_storage: HashMap<ChildStorageKey, Option<StorageValue>>,
 }
 
+impl<B: BlockT> LocalCache<B> {
+	/// Commit all cached values to the given shared `Cache`.
+	///
+	/// After calling this method, the internal state is reset.
+	fn commit_to(&mut self, cache: &mut Cache<B>) {
+		trace!(
+			"Committing {} local, {} hashes to shared cache",
+			self.storage.len(),
+			self.hashes.len(),
+		);
+		for (k, v) in self.storage.drain() {
+			cache.lru_storage.add(k, v);
+		}
+		for (k, v) in self.child_storage.drain() {
+			cache.lru_child_storage.add(k, v);
+		}
+		for (k, v) in self.hashes.drain() {
+			cache.lru_hashes.add(k, OptionHOut(v));
+		}
+	}
+}
+
 /// Cache changes.
 pub struct CacheChanges<B: BlockT> {
 	/// Shared canonical state cache.
 	shared_cache: SharedCache<B>,
 	/// Local cache of values for this state.
-	local_cache: RwLock<LocalCache<HashFor<B>>>,
+	local_cache: RwLock<LocalCache<B>>,
 	/// Hash of the block on top of which this instance was created or
 	/// `None` if cache is disabled
 	pub parent_hash: Option<B::Hash>,
@@ -351,90 +396,105 @@ impl<B: BlockT> CacheChanges<B> {
 			.cloned()
 			.collect();
 
+		let has_no_modification_at_block_height = if let Some(num) = commit_number {
+			cache.has_no_modification_at_block_height(num)
+		} else {
+			false
+		};
+
 		let mut retracted = std::borrow::Cow::Borrowed(retracted);
-		if let Some(commit_hash) = &commit_hash {
-			if let Some(m) = cache.modifications.iter_mut().find(|m| &m.hash == commit_hash) {
-				if m.is_canon != is_best {
-					// Same block comitted twice with different state changes.
-					// Treat it as reenacted/retracted.
-					if is_best {
-						enacted.push(commit_hash.clone());
-					} else {
-						retracted.to_mut().push(commit_hash.clone());
-					}
+		let (update_cache, modification_index) = if let Some((i, m)) = commit_hash
+			.as_ref()
+			.and_then(|ch| cache.modifications.iter_mut().enumerate().find(|m| &m.1.hash == ch))
+		{
+			let res = if m.is_canon != is_best {
+				if is_best && i == 0 {
+					// The block was imported as the first block of a height as non-best block.
+					// Now it is enacted as best block and we need to update the modifications with
+					// these informations.
+					m.is_canon = is_best;
+
+					// If this is the best block now and also the latest we have imported,
+					// we only need to update the cache if there are any new changes.
+					!changes.is_empty() || !child_changes.is_empty()
+				} else if is_best {
+					enacted.push(m.hash.clone());
+					true
+				} else {
+					retracted.to_mut().push(m.hash.clone());
+					true
 				}
-			}
-		}
+			} else {
+				true
+			};
+
+			(res, Some(i))
+		} else {
+			(true, None)
+		};
+
 		cache.sync(&enacted, &retracted);
-		// Propagate cache only if committing on top of the latest canonical state
-		// blocks are ordered by number and only one block with a given number is marked as canonical
-		// (contributed to canonical state cache)
-		if let Some(_) = self.parent_hash {
-			let mut local_cache = self.local_cache.write();
-			if is_best {
-				trace!(
-					"Committing {} local, {} hashes, {} modified root entries, {} modified child entries",
-					local_cache.storage.len(),
-					local_cache.hashes.len(),
-					changes.len(),
-					child_changes.iter().map(|v|v.1.len()).sum::<usize>(),
-				);
-				for (k, v) in local_cache.storage.drain() {
-					cache.lru_storage.add(k, v);
-				}
-				for (k, v) in local_cache.child_storage.drain() {
-					cache.lru_child_storage.add(k, v);
-				}
-				for (k, v) in local_cache.hashes.drain() {
-					cache.lru_hashes.add(k, OptionHOut(v));
-				}
-			}
-		}
 
-		if let (
-			Some(ref number), Some(ref hash), Some(ref parent))
-				= (commit_number, commit_hash, self.parent_hash)
-		{
-			if cache.modifications.len() == STATE_CACHE_BLOCKS {
-				cache.modifications.pop_back();
+		if let (Some(ref parent_hash), true) = (self.parent_hash, update_cache) {
+			let commit_to_shared_cache = is_best || has_no_modification_at_block_height;
+			// Propagate cache only if committing on top of the latest canonical state
+			// blocks are ordered by number and only one block with a given number is
+			// marked as canonical (contributed to canonical state cache)
+			if commit_to_shared_cache {
+				self.local_cache.write().commit_to(cache);
 			}
-			let mut modifications = HashSet::new();
-			let mut child_modifications = HashSet::new();
-			child_changes.into_iter().for_each(|(sk, changes)|
+
+			if let (Some(ref number), Some(hash)) = (commit_number, commit_hash) {
+				if commit_to_shared_cache {
+					trace!(
+						"Committing {} modified root entries, {} modified child entries to shared cache",
+						changes.len(),
+						child_changes.iter().map(|v|v.1.len()).sum::<usize>(),
+					);
+				}
+
+				if cache.modifications.len() == STATE_CACHE_BLOCKS {
+					cache.modifications.pop_back();
+				}
+				let mut modifications = HashSet::new();
+				let mut child_modifications = HashSet::new();
+				child_changes.into_iter().for_each(|(sk, changes)|
+					for (k, v) in changes.into_iter() {
+						let k = (sk.clone(), k);
+						if commit_to_shared_cache {
+							cache.lru_child_storage.add(k.clone(), v);
+						}
+						child_modifications.insert(k);
+					}
+				);
 				for (k, v) in changes.into_iter() {
-					let k = (sk.clone(), k);
-					if is_best {
-						cache.lru_child_storage.add(k.clone(), v);
+					if commit_to_shared_cache {
+						cache.lru_hashes.remove(&k);
+						cache.lru_storage.add(k.clone(), v);
 					}
-					child_modifications.insert(k);
+					modifications.insert(k);
 				}
-			);
-			for (k, v) in changes.into_iter() {
-				if is_best {
-					cache.lru_hashes.remove(&k);
-					cache.lru_storage.add(k.clone(), v);
-				}
-				modifications.insert(k);
-			}
 
-			// Save modified storage. These are ordered by the block number in reverse.
-			let block_changes = BlockChanges {
-				storage: modifications,
-				child_storage: child_modifications,
-				number: *number,
-				hash: hash.clone(),
-				is_canon: is_best,
-				parent: parent.clone(),
-			};
-			let insert_at = cache.modifications.iter()
-				.enumerate()
-				.find(|(_, m)| m.number < *number)
-				.map(|(i, _)| i);
-			trace!("Inserting modifications at {:?}", insert_at);
-			if let Some(insert_at) = insert_at {
-				cache.modifications.insert(insert_at, block_changes);
-			} else {
-				cache.modifications.push_back(block_changes);
+				if let Some(modification_index) = modification_index {
+					trace!("Modifying modifications at {}", modification_index);
+					// Only modify the already stored block changes.
+					let mut block_changes = &mut cache.modifications[modification_index];
+					block_changes.is_canon = is_best;
+					block_changes.storage.extend(modifications);
+					block_changes.child_storage.extend(child_modifications);
+				} else {
+					// Save modified storage. These are ordered by the block number in reverse.
+					let block_changes = BlockChanges {
+						storage: modifications,
+						child_storage: child_modifications,
+						number: *number,
+						hash,
+						is_canon: is_best,
+						parent: parent_hash.clone(),
+					};
+
+					cache.add_modifications(block_changes);
+				}
 			}
 		}
 	}
@@ -473,7 +533,10 @@ impl<S: StateBackend<HashFor<B>>, B: BlockT> CachingState<S, B> {
 	) -> bool {
 		let mut parent = match *parent_hash {
 			None => {
-				trace!("Cache lookup skipped for {:?}: no parent hash", key.as_ref().map(HexDisplay::from));
+				trace!(
+					"Cache lookup skipped for {:?}: no parent hash",
+					key.as_ref().map(HexDisplay::from),
+				);
 				return false;
 			}
 			Some(ref parent) => parent,
@@ -492,13 +555,19 @@ impl<S: StateBackend<HashFor<B>>, B: BlockT> CachingState<S, B> {
 			}
 			if let Some(key) = key {
 				if m.storage.contains(key) {
-					trace!("Cache lookup skipped for {:?}: modified in a later block", HexDisplay::from(&key));
+					trace!(
+						"Cache lookup skipped for {:?}: modified in a later block",
+						HexDisplay::from(&key),
+					);
 					return false;
 				}
 			}
 			if let Some(child_key) = child_key {
 				if m.child_storage.contains(child_key) {
-					trace!("Cache lookup skipped for {:?}: modified in a later block", child_key);
+					trace!(
+						"Cache lookup skipped for {:?}: modified in a later block",
+						child_key,
+					);
 					return false;
 				}
 			}
@@ -1378,7 +1447,7 @@ mod tests {
 			false,
 		);
 
-		assert_eq!(shared.lock().lru_storage.get(&key).unwrap(), &Some(vec![1]));
+		assert_eq!(shared.lock().lru_storage.get(&key).unwrap(), &Some(vec![2]));
 
 		let mut s = CachingState::new(
 			InMemoryBackend::<BlakeTwo256>::default(),
@@ -1398,6 +1467,121 @@ mod tests {
 		);
 		assert_eq!(s.storage(&key).unwrap(), None);
 	}
+
+	#[test]
+	fn import_multiple_forks_as_non_best_caches_first_fork() {
+		sp_tracing::try_init_simple();
+
+		let root_parent = H256::random();
+		let key = H256::random()[..].to_vec();
+		let h1 = H256::random();
+		let h2a = H256::random();
+		let h2b = H256::random();
+		let h2c = H256::random();
+
+		for (commit_as_best, cached_value) in vec![(h2a, Some(vec![2])), (h2b, None), (h2c, None)] {
+			let shared = new_shared_cache::<Block>(256*1024, (0,1));
+
+			let mut s = CachingState::new(
+				InMemoryBackend::<BlakeTwo256>::default(),
+				shared.clone(),
+				Some(root_parent),
+			);
+			s.cache.sync_cache(
+				&[],
+				&[],
+				vec![(key.clone(), Some(vec![1]))],
+				vec![],
+				Some(h1),
+				Some(1),
+				true,
+			);
+			assert_eq!(shared.lock().lru_storage.get(&key).unwrap(), &Some(vec![1]));
+
+			{
+				let mut s = CachingState::new(
+					InMemoryBackend::<BlakeTwo256>::default(),
+					shared.clone(),
+					Some(h1),
+				);
+
+				// commit all forks as non-best
+				s.cache.sync_cache(
+					&[],
+					&[],
+					vec![(key.clone(), Some(vec![2]))],
+					vec![],
+					Some(h2a),
+					Some(2),
+					false,
+				);
+			}
+
+			{
+				let mut s = CachingState::new(
+					InMemoryBackend::<BlakeTwo256>::default(),
+					shared.clone(),
+					Some(h1),
+				);
+
+				s.cache.sync_cache(
+					&[],
+					&[],
+					vec![(key.clone(), Some(vec![3]))],
+					vec![],
+					Some(h2b),
+					Some(2),
+					false,
+				);
+			}
+
+			{
+				let mut s = CachingState::new(
+					InMemoryBackend::<BlakeTwo256>::default(),
+					shared.clone(),
+					Some(h1),
+				);
+
+				s.cache.sync_cache(
+					&[],
+					&[],
+					vec![(key.clone(), Some(vec![4]))],
+					vec![],
+					Some(h2c),
+					Some(2),
+					false,
+				);
+			}
+
+			// We should have the value of the first block cached.
+			assert_eq!(shared.lock().lru_storage.get(&key).unwrap(), &Some(vec![2]));
+
+			let mut s = CachingState::new(
+				InMemoryBackend::<BlakeTwo256>::default(),
+				shared.clone(),
+				Some(h1),
+			);
+
+			// commit again as best with no changes
+			s.cache.sync_cache(
+				&[],
+				&[],
+				vec![],
+				vec![],
+				Some(commit_as_best),
+				Some(2),
+				true,
+			);
+
+			let s = CachingState::new(
+				InMemoryBackend::<BlakeTwo256>::default(),
+				shared.clone(),
+				Some(commit_as_best),
+			);
+
+			assert_eq!(s.storage(&key).unwrap(), cached_value);
+		}
+	}
 }
 
 #[cfg(test)]

From 52d5e19f943d4e2ea1d302c20313fd43919ee826 Mon Sep 17 00:00:00 2001
From: Caio <c410.f3r@gmail.com>
Date: Sat, 3 Apr 2021 11:34:17 -0300
Subject: [PATCH 0594/1194] Pin jsonrpsee (#8524)

---
 Cargo.lock                                  | 17 +++++++++--------
 utils/frame/remote-externalities/Cargo.toml |  6 +++---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f038ec8bed2d..e5064b19a782 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2919,13 +2919,14 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-http-client"
-version = "0.2.0-alpha"
+version = "0.2.0-alpha.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "124797a4ea7430d0675db78e065e53316e3f1a3cbf0ee4d6dbdd42db7b08e193"
+checksum = "9b15fc3a0ef2e02d770aa1a221d3412443dcaedc43e27d80c957dd5bbd65321b"
 dependencies = [
  "async-trait",
  "futures 0.3.13",
  "hyper 0.13.10",
+ "hyper-rustls",
  "jsonrpsee-types",
  "jsonrpsee-utils",
  "log",
@@ -2938,9 +2939,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-proc-macros"
-version = "0.2.0-alpha.2"
+version = "0.2.0-alpha.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cb3f732ccbeafd15cefb59c7c7b5ac6c553c2653613b63e5e7feb7f06a219e9"
+checksum = "6bb4afbda476e2ee11cc6245055c498c116fc8002d2d60fe8338b6ee15d84c3a"
 dependencies = [
  "Inflector",
  "proc-macro2",
@@ -2950,9 +2951,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-types"
-version = "0.2.0-alpha.2"
+version = "0.2.0-alpha.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a8cd20c190e75dc56f7543b9d5713c3186351b301b5507ea6b85d8c403aac78"
+checksum = "c42a82588b5f7830e94341bb7e79d15f46070ab6f64dde1e3b3719721b61c5bf"
 dependencies = [
  "async-trait",
  "futures 0.3.13",
@@ -2965,9 +2966,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-utils"
-version = "0.2.0-alpha"
+version = "0.2.0-alpha.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0e45394ec3175a767c3c5bac584560e6ad9b56ebd73216c85ec8bab49619244"
+checksum = "e65c77838fce96bc554b4a3a159d0b9a2497319ae9305c66ee853998c7ed2fd3"
 dependencies = [
  "futures 0.3.13",
  "globset",
diff --git a/utils/frame/remote-externalities/Cargo.toml b/utils/frame/remote-externalities/Cargo.toml
index b8bee6380006..21e6542abcb4 100644
--- a/utils/frame/remote-externalities/Cargo.toml
+++ b/utils/frame/remote-externalities/Cargo.toml
@@ -13,10 +13,10 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-jsonrpsee-http-client = { version = "0.2.0-alpha", default-features = false, features = ["tokio02"] }
+jsonrpsee-http-client = { version = "=0.2.0-alpha.3", default-features = false, features = ["tokio02"] }
 # Needed by jsonrpsee-proc-macros: https://github.com/paritytech/jsonrpsee/issues/214
-jsonrpsee-types = "0.2.0-alpha.2"
-jsonrpsee-proc-macros = "0.2.0-alpha.2"
+jsonrpsee-types = "=0.2.0-alpha.3"
+jsonrpsee-proc-macros = "=0.2.0-alpha.3"
 
 hex-literal = "0.3.1"
 env_logger = "0.8.2"

From d19c0e103b44a6c4466f1f3f42427847e89386b6 Mon Sep 17 00:00:00 2001
From: Keith Yeung <kungfukeith11@gmail.com>
Date: Sat, 3 Apr 2021 13:06:25 -0700
Subject: [PATCH 0595/1194] Properly declare errors in pallets that use
 decl_module (#8523)

* Properly declare errors in pallets that use decl_module

* Remove extra error type declaration
---
 frame/lottery/src/lib.rs    | 2 ++
 frame/membership/src/lib.rs | 2 ++
 frame/tips/src/lib.rs       | 1 -
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/frame/lottery/src/lib.rs b/frame/lottery/src/lib.rs
index 94b7dd459889..fb675ad83519 100644
--- a/frame/lottery/src/lib.rs
+++ b/frame/lottery/src/lib.rs
@@ -209,6 +209,8 @@ decl_error! {
 
 decl_module! {
 	pub struct Module<T: Config> for enum Call where origin: T::Origin, system = frame_system {
+		type Error = Error<T>;
+
 		const ModuleId: ModuleId = T::ModuleId::get();
 		const MaxCalls: u32 = T::MaxCalls::get() as u32;
 
diff --git a/frame/membership/src/lib.rs b/frame/membership/src/lib.rs
index 96fc15b0509b..532a235ad36c 100644
--- a/frame/membership/src/lib.rs
+++ b/frame/membership/src/lib.rs
@@ -113,6 +113,8 @@ decl_module! {
 		for enum Call
 		where origin: T::Origin
 	{
+		type Error = Error<T, I>;
+
 		fn deposit_event() = default;
 
 		/// Add a member `who` to the set.
diff --git a/frame/tips/src/lib.rs b/frame/tips/src/lib.rs
index da22bf0b1ffb..015163ef6b51 100644
--- a/frame/tips/src/lib.rs
+++ b/frame/tips/src/lib.rs
@@ -195,7 +195,6 @@ decl_module! {
 		for enum Call
 		where origin: T::Origin
 	{
-
 		/// The period for which a tip remains open after is has achieved threshold tippers.
 		const TipCountdown: T::BlockNumber = T::TipCountdown::get();
 

From 2ab715feb19b5ce52cddfdbf3da048d511dee5f0 Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Sat, 3 Apr 2021 23:49:24 +0300
Subject: [PATCH 0596/1194] Fixed restoring state-db journals on startup
 (#8494)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fixed restoring state-db journals on startup

* Improved documentation a bit

* Update client/state-db/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 client/state-db/src/lib.rs          | 23 ++++++--
 client/state-db/src/noncanonical.rs | 88 +++++++++++++++++++++--------
 2 files changed, 83 insertions(+), 28 deletions(-)

diff --git a/client/state-db/src/lib.rs b/client/state-db/src/lib.rs
index 1f73f3cca35e..8961f2549b2d 100644
--- a/client/state-db/src/lib.rs
+++ b/client/state-db/src/lib.rs
@@ -16,16 +16,24 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-//! State database maintenance. Handles canonicalization and pruning in the database. The input to
-//! this module is a `ChangeSet` which is basically a list of key-value pairs (trie nodes) that
-//! were added or deleted during block execution.
+//! State database maintenance. Handles canonicalization and pruning in the database.
 //!
 //! # Canonicalization.
 //! Canonicalization window tracks a tree of blocks identified by header hash. The in-memory
-//! overlay allows to get any node that was inserted in any of the blocks within the window.
-//! The tree is journaled to the backing database and rebuilt on startup.
+//! overlay allows to get any trie node that was inserted in any of the blocks within the window.
+//! The overlay is journaled to the backing database and rebuilt on startup.
+//! There's a limit of 32 blocks that may have the same block number in the canonicalization window.
+//!
 //! Canonicalization function selects one root from the top of the tree and discards all other roots
-//! and their subtrees.
+//! and their subtrees. Upon canonicalization all trie nodes that were inserted in the block are added to
+//! the backing DB and block tracking is moved to the pruning window, where no forks are allowed.
+//!
+//! # Canonicalization vs Finality
+//! Database engine uses a notion of canonicality, rather then finality. A canonical block may not be yet finalized
+//! from the perspective of the consensus engine, but it still can't be reverted in the database. Most of the time
+//! during normal operation last canonical block is the same as last finalized. However if finality stall for a
+//! long duration for some reason, there's only a certain number of blocks that can fit in the non-canonical overlay,
+//! so canonicalization of an unfinalized block may be forced.
 //!
 //! # Pruning.
 //! See `RefWindow` for pruning algorithm details. `StateDb` prunes on each canonicalization until
@@ -89,6 +97,8 @@ pub enum Error<E: fmt::Debug> {
 	InvalidParent,
 	/// Invalid pruning mode specified. Contains expected mode.
 	InvalidPruningMode(String),
+	/// Too many unfinalized sibling blocks inserted.
+	TooManySiblingBlocks,
 }
 
 /// Pinning error type.
@@ -112,6 +122,7 @@ impl<E: fmt::Debug> fmt::Debug for Error<E> {
 			Error::InvalidBlockNumber => write!(f, "Trying to insert block with invalid number"),
 			Error::InvalidParent => write!(f, "Trying to insert block with unknown parent"),
 			Error::InvalidPruningMode(e) => write!(f, "Expected pruning mode: {}", e),
+			Error::TooManySiblingBlocks => write!(f, "Too many sibling blocks inserted"),
 		}
 	}
 }
diff --git a/client/state-db/src/noncanonical.rs b/client/state-db/src/noncanonical.rs
index 551bf5fb860c..8eaa8a02f567 100644
--- a/client/state-db/src/noncanonical.rs
+++ b/client/state-db/src/noncanonical.rs
@@ -30,6 +30,7 @@ use log::trace;
 
 const NON_CANONICAL_JOURNAL: &[u8] = b"noncanonical_journal";
 const LAST_CANONICAL: &[u8] = b"last_canonical";
+const MAX_BLOCKS_PER_LEVEL: u64 = 32;
 
 /// See module documentation.
 #[derive(parity_util_mem_derive::MallocSizeOf)]
@@ -162,28 +163,30 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 			let mut total: u64 = 0;
 			block += 1;
 			loop {
-				let mut index: u64 = 0;
 				let mut level = Vec::new();
-				loop {
+				for index in 0 .. MAX_BLOCKS_PER_LEVEL {
 					let journal_key = to_journal_key(block, index);
-					match db.get_meta(&journal_key).map_err(|e| Error::Db(e))? {
-						Some(record) => {
-							let record: JournalRecord<BlockHash, Key> = Decode::decode(&mut record.as_slice())?;
-							let inserted = record.inserted.iter().map(|(k, _)| k.clone()).collect();
-							let overlay = BlockOverlay {
-								hash: record.hash.clone(),
-								journal_key,
-								inserted: inserted,
-								deleted: record.deleted,
-							};
-							insert_values(&mut values, record.inserted);
-							trace!(target: "state-db", "Uncanonicalized journal entry {}.{} ({} inserted, {} deleted)", block, index, overlay.inserted.len(), overlay.deleted.len());
-							level.push(overlay);
-							parents.insert(record.hash, record.parent_hash);
-							index += 1;
-							total += 1;
-						},
-						None => break,
+					if let Some(record) = db.get_meta(&journal_key).map_err(|e| Error::Db(e))? {
+						let record: JournalRecord<BlockHash, Key> = Decode::decode(&mut record.as_slice())?;
+						let inserted = record.inserted.iter().map(|(k, _)| k.clone()).collect();
+						let overlay = BlockOverlay {
+							hash: record.hash.clone(),
+							journal_key,
+							inserted: inserted,
+							deleted: record.deleted,
+						};
+						insert_values(&mut values, record.inserted);
+						trace!(
+							target: "state-db",
+							"Uncanonicalized journal entry {}.{} ({} inserted, {} deleted)",
+							block,
+							index,
+							overlay.inserted.len(),
+							overlay.deleted.len()
+						);
+						level.push(overlay);
+						parents.insert(record.hash, record.parent_hash);
+						total += 1;
 					}
 				}
 				if level.is_empty() {
@@ -241,6 +244,10 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 				.expect("number is [front_block_number .. front_block_number + levels.len()) is asserted in precondition; qed")
 		};
 
+		if level.len() >= MAX_BLOCKS_PER_LEVEL as usize {
+			return Err(Error::TooManySiblingBlocks);
+		}
+
 		let index = level.len() as u64;
 		let journal_key = to_journal_key(number, index);
 
@@ -513,7 +520,7 @@ mod tests {
 	use std::io;
 	use sp_core::H256;
 	use super::{NonCanonicalOverlay, to_journal_key};
-	use crate::{ChangeSet, CommitSet};
+	use crate::{ChangeSet, CommitSet, MetaDb};
 	use crate::test::{make_db, make_changeset};
 
 	fn contains(overlay: &NonCanonicalOverlay<H256, H256>, key: u64) -> bool {
@@ -716,7 +723,6 @@ mod tests {
 
 	#[test]
 	fn complex_tree() {
-		use crate::MetaDb;
 		let mut db = make_db(&[]);
 
 		// - 1 - 1_1 - 1_1_1
@@ -958,4 +964,42 @@ mod tests {
 		assert!(!contains(&overlay, 1));
 		assert!(overlay.pinned.is_empty());
 	}
+
+	#[test]
+	fn restore_from_journal_after_canonicalize_no_first() {
+		// This test discards a branch that is journaled under a non-zero index on level 1,
+		// making sure all journals are loaded for each level even if some of them are missing.
+		let root = H256::random();
+		let h1 = H256::random();
+		let h2 = H256::random();
+		let h11 = H256::random();
+		let h21 = H256::random();
+		let mut db = make_db(&[]);
+		let mut overlay = NonCanonicalOverlay::<H256, H256>::new(&db).unwrap();
+		db.commit(&overlay.insert::<io::Error>(&root, 10, &H256::default(), make_changeset(&[], &[])).unwrap());
+		db.commit(&overlay.insert::<io::Error>(&h1, 11, &root, make_changeset(&[1], &[])).unwrap());
+		db.commit(&overlay.insert::<io::Error>(&h2, 11, &root, make_changeset(&[2], &[])).unwrap());
+		db.commit(&overlay.insert::<io::Error>(&h11, 12, &h1, make_changeset(&[11], &[])).unwrap());
+		db.commit(&overlay.insert::<io::Error>(&h21, 12, &h2, make_changeset(&[21], &[])).unwrap());
+		let mut commit = CommitSet::default();
+		overlay.canonicalize::<io::Error>(&root, &mut commit).unwrap();
+		overlay.canonicalize::<io::Error>(&h2, &mut commit).unwrap();  // h11 should stay in the DB
+		db.commit(&commit);
+		overlay.apply_pending();
+		assert_eq!(overlay.levels.len(), 1);
+		assert!(contains(&overlay, 21));
+		assert!(!contains(&overlay, 11));
+		assert!(db.get_meta(&to_journal_key(12, 1)).unwrap().is_some());
+		assert!(db.get_meta(&to_journal_key(12, 0)).unwrap().is_none());
+
+		// Restore into a new overlay and check that journaled value exists.
+		let mut overlay = NonCanonicalOverlay::<H256, H256>::new(&db).unwrap();
+		assert!(contains(&overlay, 21));
+
+		let mut commit = CommitSet::default();
+		overlay.canonicalize::<io::Error>(&h21, &mut commit).unwrap();  // h11 should stay in the DB
+		db.commit(&commit);
+		overlay.apply_pending();
+		assert!(!contains(&overlay, 21));
+	}
 }

From 67adfea6f6cf0a7cb1b4a955c17c2280c097a445 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Sun, 4 Apr 2021 13:42:11 +0200
Subject: [PATCH 0597/1194] Use `log::error!` for bad mandatory (#8521)

To make the life of people easier ;)
---
 frame/election-provider-multi-phase/src/unsigned.rs | 2 +-
 frame/system/src/extensions/check_weight.rs         | 6 ++----
 primitives/runtime/src/lib.rs                       | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/frame/election-provider-multi-phase/src/unsigned.rs b/frame/election-provider-multi-phase/src/unsigned.rs
index 280907ac5439..b54a7d75a0a2 100644
--- a/frame/election-provider-multi-phase/src/unsigned.rs
+++ b/frame/election-provider-multi-phase/src/unsigned.rs
@@ -650,7 +650,7 @@ mod tests {
 	#[test]
 	#[should_panic(expected = "Invalid unsigned submission must produce invalid block and \
 	                           deprive validator from their authoring reward.: \
-	                           DispatchError::Module { index: 2, error: 1, message: \
+	                           Module { index: 2, error: 1, message: \
 	                           Some(\"PreDispatchWrongWinnerCount\") }")]
 	fn unfeasible_solution_panics() {
 		ExtBuilder::default().build_and_execute(|| {
diff --git a/frame/system/src/extensions/check_weight.rs b/frame/system/src/extensions/check_weight.rs
index fc9898b778b8..a4ebeaea30c2 100644
--- a/frame/system/src/extensions/check_weight.rs
+++ b/frame/system/src/extensions/check_weight.rs
@@ -18,7 +18,7 @@
 use crate::{limits::BlockWeights, Config, Pallet};
 use codec::{Encode, Decode};
 use sp_runtime::{
-	traits::{SignedExtension, DispatchInfoOf, Dispatchable, PostDispatchInfoOf, Printable},
+	traits::{SignedExtension, DispatchInfoOf, Dispatchable, PostDispatchInfoOf},
 	transaction_validity::{
 		ValidTransaction, TransactionValidityError, InvalidTransaction, TransactionValidity,
 		TransactionPriority,
@@ -248,9 +248,7 @@ impl<T: Config + Send + Sync> SignedExtension for CheckWeight<T> where
 		// to them actually being useful. Block producers are thus not allowed to include mandatory
 		// extrinsics that result in error.
 		if let (DispatchClass::Mandatory, Err(e)) = (info.class, result) {
-			"Bad mandatory".print();
-			e.print();
-
+			log::error!(target: "runtime::system", "Bad mandatory: {:?}", e);
 			Err(InvalidTransaction::BadMandatory)?
 		}
 
diff --git a/primitives/runtime/src/lib.rs b/primitives/runtime/src/lib.rs
index 090c9781eb13..59d78bb89642 100644
--- a/primitives/runtime/src/lib.rs
+++ b/primitives/runtime/src/lib.rs
@@ -450,7 +450,7 @@ pub type DispatchResult = sp_std::result::Result<(), DispatchError>;
 pub type DispatchResultWithInfo<T> = sp_std::result::Result<T, DispatchErrorWithPostInfo<T>>;
 
 /// Reason why a dispatch call failed.
-#[derive(Eq, Clone, Copy, Encode, Decode, RuntimeDebug)]
+#[derive(Eq, Clone, Copy, Encode, Decode, Debug)]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 pub enum DispatchError {
 	/// Some error occurred.
@@ -535,7 +535,7 @@ impl From<crate::traits::StoredMapError> for DispatchError {
 }
 
 /// Description of what went wrong when trying to complete an operation on a token.
-#[derive(Eq, PartialEq, Clone, Copy, Encode, Decode, RuntimeDebug)]
+#[derive(Eq, PartialEq, Clone, Copy, Encode, Decode, Debug)]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 pub enum TokenError {
 	/// Funds are unavailable.

From cdc1bb10cf69115ad56fbf5b0ce2fa4ddf8dc02e Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Mon, 5 Apr 2021 14:30:30 +0200
Subject: [PATCH 0598/1194] Add nominators option to chain-spec-builder (#8502)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add nominators option to chain-spec-builder

* Update bin/utils/chain-spec-builder/src/main.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 bin/node/cli/src/chain_spec.rs           | 47 ++++++++----
 bin/node/runtime/src/lib.rs              |  6 +-
 bin/utils/chain-spec-builder/src/main.rs | 97 +++++++++++++++---------
 3 files changed, 98 insertions(+), 52 deletions(-)

diff --git a/bin/node/cli/src/chain_spec.rs b/bin/node/cli/src/chain_spec.rs
index c30710d236ac..96888bd4ce1e 100644
--- a/bin/node/cli/src/chain_spec.rs
+++ b/bin/node/cli/src/chain_spec.rs
@@ -23,9 +23,9 @@ use sp_core::{Pair, Public, crypto::UncheckedInto, sr25519};
 use serde::{Serialize, Deserialize};
 use node_runtime::{
 	AuthorityDiscoveryConfig, BabeConfig, BalancesConfig, ContractsConfig, CouncilConfig,
-	DemocracyConfig,GrandpaConfig, ImOnlineConfig, SessionConfig, SessionKeys, StakerStatus,
+	DemocracyConfig, GrandpaConfig, ImOnlineConfig, SessionConfig, SessionKeys, StakerStatus,
 	StakingConfig, ElectionsConfig, IndicesConfig, SocietyConfig, SudoConfig, SystemConfig,
-	TechnicalCommitteeConfig, wasm_binary_unwrap,
+	TechnicalCommitteeConfig, wasm_binary_unwrap, MAX_NOMINATIONS,
 };
 use node_runtime::Block;
 use node_runtime::constants::currency::*;
@@ -146,12 +146,7 @@ fn staging_testnet_config_genesis() -> GenesisConfig {
 
 	let endowed_accounts: Vec<AccountId> = vec![root_key.clone()];
 
-	testnet_genesis(
-		initial_authorities,
-		root_key,
-		Some(endowed_accounts),
-		false,
-	)
+	testnet_genesis(initial_authorities, vec![], root_key, Some(endowed_accounts), false)
 }
 
 /// Staging testnet config.
@@ -214,6 +209,7 @@ pub fn testnet_genesis(
 		ImOnlineId,
 		AuthorityDiscoveryId,
 	)>,
+	initial_nominators: Vec<AccountId>,
 	root_key: AccountId,
 	endowed_accounts: Option<Vec<AccountId>>,
 	enable_println: bool,
@@ -234,11 +230,31 @@ pub fn testnet_genesis(
 			get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
 		]
 	});
-	initial_authorities.iter().for_each(|x|
-		if !endowed_accounts.contains(&x.0) {
-			endowed_accounts.push(x.0.clone())
+	// endow all authorities and nominators.
+	initial_authorities.iter().map(|x| &x.0).chain(initial_nominators.iter()).for_each(|x| {
+		if !endowed_accounts.contains(&x) {
+			endowed_accounts.push(x.clone())
 		}
-	);
+	});
+
+	// stakers: all validators and nominators.
+	let mut rng = rand::thread_rng();
+	let stakers = initial_authorities
+		.iter()
+		.map(|x| (x.0.clone(), x.1.clone(), STASH, StakerStatus::Validator))
+		.chain(initial_nominators.iter().map(|x| {
+			use rand::{seq::SliceRandom, Rng};
+			let limit = (MAX_NOMINATIONS as usize).min(initial_authorities.len());
+			let count = rng.gen::<usize>() % limit;
+			let nominations = initial_authorities
+				.as_slice()
+				.choose_multiple(&mut rng, count)
+				.into_iter()
+				.map(|choice| choice.0.clone())
+				.collect::<Vec<_>>();
+			(x.clone(), x.clone(), STASH, StakerStatus::Nominator(nominations))
+		}))
+		.collect::<Vec<_>>();
 
 	let num_endowed_accounts = endowed_accounts.len();
 
@@ -271,11 +287,9 @@ pub fn testnet_genesis(
 		pallet_staking: StakingConfig {
 			validator_count: initial_authorities.len() as u32 * 2,
 			minimum_validator_count: initial_authorities.len() as u32,
-			stakers: initial_authorities.iter().map(|x| {
-				(x.0.clone(), x.1.clone(), STASH, StakerStatus::Validator)
-			}).collect(),
 			invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(),
 			slash_reward_fraction: Perbill::from_percent(10),
+			stakers,
 			.. Default::default()
 		},
 		pallet_democracy: DemocracyConfig::default(),
@@ -335,6 +349,7 @@ fn development_config_genesis() -> GenesisConfig {
 		vec![
 			authority_keys_from_seed("Alice"),
 		],
+		vec![],
 		get_account_id_from_seed::<sr25519::Public>("Alice"),
 		None,
 		true,
@@ -362,6 +377,7 @@ fn local_testnet_genesis() -> GenesisConfig {
 			authority_keys_from_seed("Alice"),
 			authority_keys_from_seed("Bob"),
 		],
+		vec![],
 		get_account_id_from_seed::<sr25519::Public>("Alice"),
 		None,
 		false,
@@ -395,6 +411,7 @@ pub(crate) mod tests {
 			vec![
 				authority_keys_from_seed("Alice"),
 			],
+			vec![],
 			get_account_id_from_seed::<sr25519::Public>("Alice"),
 			None,
 			false,
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 8f8f82648822..2d763979c7b9 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -472,8 +472,7 @@ parameter_types! {
 }
 
 impl pallet_staking::Config for Runtime {
-	const MAX_NOMINATIONS: u32 =
-		<NposCompactSolution16 as sp_npos_elections::CompactSolution>::LIMIT as u32;
+	const MAX_NOMINATIONS: u32 = MAX_NOMINATIONS;
 	type Currency = Balances;
 	type UnixTime = Timestamp;
 	type CurrencyToVote = U128CurrencyToVote;
@@ -527,6 +526,9 @@ sp_npos_elections::generate_solution_type!(
 	>(16)
 );
 
+pub const MAX_NOMINATIONS: u32 =
+	<NposCompactSolution16 as sp_npos_elections::CompactSolution>::LIMIT as u32;
+
 impl pallet_election_provider_multi_phase::Config for Runtime {
 	type Event = Event;
 	type Currency = Balances;
diff --git a/bin/utils/chain-spec-builder/src/main.rs b/bin/utils/chain-spec-builder/src/main.rs
index f3336b1d53a8..2aaef7c96d9a 100644
--- a/bin/utils/chain-spec-builder/src/main.rs
+++ b/bin/utils/chain-spec-builder/src/main.rs
@@ -41,6 +41,10 @@ enum ChainSpecBuilder {
 		/// Authority key seed.
 		#[structopt(long, short, required = true)]
 		authority_seeds: Vec<String>,
+		/// Active nominators (SS58 format), each backing a random subset of the aforementioned
+		/// authorities.
+		#[structopt(long, short, default_value = "0")]
+		nominator_accounts: Vec<String>,
 		/// Endowed account address (SS58 format).
 		#[structopt(long, short)]
 		endowed_accounts: Vec<String>,
@@ -57,6 +61,11 @@ enum ChainSpecBuilder {
 		/// The number of authorities.
 		#[structopt(long, short)]
 		authorities: usize,
+		/// The number of nominators backing the aforementioned authorities.
+		///
+		/// Will nominate a random subset of `authorities`.
+		#[structopt(long, short, default_value = "0")]
+		nominators: usize,
 		/// The number of endowed accounts.
 		#[structopt(long, short, default_value = "0")]
 		endowed: usize,
@@ -87,6 +96,7 @@ impl ChainSpecBuilder {
 
 fn genesis_constructor(
 	authority_seeds: &[String],
+	nominator_accounts: &[AccountId],
 	endowed_accounts: &[AccountId],
 	sudo_account: &AccountId,
 ) -> chain_spec::GenesisConfig {
@@ -100,6 +110,7 @@ fn genesis_constructor(
 
 	chain_spec::testnet_genesis(
 		authorities,
+		nominator_accounts.to_vec(),
 		sudo_account.clone(),
 		Some(endowed_accounts.to_vec()),
 		enable_println,
@@ -108,26 +119,28 @@ fn genesis_constructor(
 
 fn generate_chain_spec(
 	authority_seeds: Vec<String>,
+	nominator_accounts: Vec<String>,
 	endowed_accounts: Vec<String>,
 	sudo_account: String,
 ) -> Result<String, String> {
-	let parse_account = |address: &String| {
-		AccountId::from_string(address)
+	let parse_account = |address: String| {
+		AccountId::from_string(&address)
 			.map_err(|err| format!("Failed to parse account address: {:?}", err))
 	};
 
-	let endowed_accounts = endowed_accounts
-		.iter()
-		.map(parse_account)
-		.collect::<Result<Vec<_>, String>>()?;
+	let nominator_accounts =
+		nominator_accounts.into_iter().map(parse_account).collect::<Result<Vec<_>, String>>()?;
+
+	let endowed_accounts =
+		endowed_accounts.into_iter().map(parse_account).collect::<Result<Vec<_>, String>>()?;
 
-	let sudo_account = parse_account(&sudo_account)?;
+	let sudo_account = parse_account(sudo_account)?;
 
 	let chain_spec = chain_spec::ChainSpec::from_genesis(
 		"Custom",
 		"custom",
 		sc_chain_spec::ChainType::Live,
-		move || genesis_constructor(&authority_seeds, &endowed_accounts, &sudo_account),
+		move || genesis_constructor(&authority_seeds, &nominator_accounts, &endowed_accounts, &sudo_account),
 		vec![],
 		None,
 		None,
@@ -186,6 +199,7 @@ fn generate_authority_keys_and_store(
 
 fn print_seeds(
 	authority_seeds: &[String],
+	nominator_seeds: &[String],
 	endowed_seeds: &[String],
 	sudo_seed: &str,
 ) {
@@ -201,6 +215,12 @@ fn print_seeds(
 		);
 	}
 
+	println!("{}", header.paint("Nominator seeds"));
+
+	for (n, seed) in nominator_seeds.iter().enumerate() {
+		println!("{} //{}", entry.paint(format!("nom-{}:", n)), seed);
+	}
+
 	println!();
 
 	if !endowed_seeds.is_empty() {
@@ -220,34 +240,27 @@ fn print_seeds(
 }
 
 fn main() -> Result<(), String> {
-	#[cfg(build_type="debug")]
+	#[cfg(build_type = "debug")]
 	println!(
-		"The chain spec builder builds a chain specification that includes a Substrate runtime compiled as WASM. To \
-		 ensure proper functioning of the included runtime compile (or run) the chain spec builder binary in \
-		 `--release` mode.\n",
+		"The chain spec builder builds a chain specification that includes a Substrate runtime \
+		 compiled as WASM. To ensure proper functioning of the included runtime compile (or run) \
+		 the chain spec builder binary in `--release` mode.\n",
 	);
 
 	let builder = ChainSpecBuilder::from_args();
 	let chain_spec_path = builder.chain_spec_path().to_path_buf();
 
-	let (authority_seeds, endowed_accounts, sudo_account) = match builder {
-		ChainSpecBuilder::Generate { authorities, endowed, keystore_path, .. } => {
+	let (authority_seeds, nominator_accounts, endowed_accounts, sudo_account) = match builder {
+		ChainSpecBuilder::Generate { authorities, nominators, endowed, keystore_path, .. } => {
 			let authorities = authorities.max(1);
-			let rand_str = || -> String {
-				OsRng.sample_iter(&Alphanumeric)
-					.take(32)
-					.collect()
-			};
+			let rand_str = || -> String { OsRng.sample_iter(&Alphanumeric).take(32).collect() };
 
 			let authority_seeds = (0..authorities).map(|_| rand_str()).collect::<Vec<_>>();
+			let nominator_seeds = (0..nominators).map(|_| rand_str()).collect::<Vec<_>>();
 			let endowed_seeds = (0..endowed).map(|_| rand_str()).collect::<Vec<_>>();
 			let sudo_seed = rand_str();
 
-			print_seeds(
-				&authority_seeds,
-				&endowed_seeds,
-				&sudo_seed,
-			);
+			print_seeds(&authority_seeds, &nominator_seeds, &endowed_seeds, &sudo_seed);
 
 			if let Some(keystore_path) = keystore_path {
 				generate_authority_keys_and_store(
@@ -256,23 +269,37 @@ fn main() -> Result<(), String> {
 				)?;
 			}
 
-			let endowed_accounts = endowed_seeds.iter().map(|seed| {
-				chain_spec::get_account_id_from_seed::<sr25519::Public>(seed)
-					.to_ss58check()
-			}).collect();
+			let nominator_accounts = nominator_seeds
+				.into_iter()
+				.map(|seed| {
+					chain_spec::get_account_id_from_seed::<sr25519::Public>(&seed).to_ss58check()
+				})
+				.collect();
 
-			let sudo_account = chain_spec::get_account_id_from_seed::<sr25519::Public>(&sudo_seed)
-				.to_ss58check();
+			let endowed_accounts = endowed_seeds
+				.into_iter()
+				.map(|seed| {
+					chain_spec::get_account_id_from_seed::<sr25519::Public>(&seed).to_ss58check()
+				})
+				.collect();
 
-			(authority_seeds, endowed_accounts, sudo_account)
-		},
-		ChainSpecBuilder::New { authority_seeds, endowed_accounts, sudo_account, .. } => {
-			(authority_seeds, endowed_accounts, sudo_account)
-		},
+			let sudo_account =
+				chain_spec::get_account_id_from_seed::<sr25519::Public>(&sudo_seed).to_ss58check();
+
+			(authority_seeds, nominator_accounts, endowed_accounts, sudo_account)
+		}
+		ChainSpecBuilder::New {
+			authority_seeds,
+			nominator_accounts,
+			endowed_accounts,
+			sudo_account,
+			..
+		} => (authority_seeds, nominator_accounts, endowed_accounts, sudo_account),
 	};
 
 	let json = generate_chain_spec(
 		authority_seeds,
+		nominator_accounts,
 		endowed_accounts,
 		sudo_account,
 	)?;

From 89a1c7b5bf52ee75b562781e83062fe71bc304e0 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Mon, 5 Apr 2021 18:31:14 +0200
Subject: [PATCH 0599/1194] Adjust number of slots in sync requests channel
 (#8492)

---
 client/network/src/block_request_handler.rs | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/client/network/src/block_request_handler.rs b/client/network/src/block_request_handler.rs
index bfc44e646000..332635dbe790 100644
--- a/client/network/src/block_request_handler.rs
+++ b/client/network/src/block_request_handler.rs
@@ -121,14 +121,9 @@ impl<B: BlockT> BlockRequestHandler<B> {
 		client: Arc<dyn Client<B>>,
 		num_peer_hint: usize,
 	) -> (Self, ProtocolConfig) {
-		// Rate of arrival multiplied with the waiting time in the queue equals the queue length.
-		//
-		// An average Polkadot node serves less than 5 requests per second. The 95th percentile
-		// serving a request is less than 2 second. Thus one would estimate the queue length to be
-		// below 10.
-		//
-		// Choosing 20 as the queue length to give some additional buffer.
-		let (tx, request_receiver) = mpsc::channel(20);
+		// Reserve enough request slots for one request per peer when we are at the maximum
+		// number of peers.
+		let (tx, request_receiver) = mpsc::channel(num_peer_hint);
 
 		let mut protocol_config = generate_protocol_config(protocol_id);
 		protocol_config.inbound_queue = Some(tx);

From 701ff6f89f7a5f826920b0d9e17f18bf644d5248 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Mon, 5 Apr 2021 20:18:47 +0200
Subject: [PATCH 0600/1194] Clean up log levels in sc_network (#8529)

* Clean up log levels in sc_network

* Fix imports
---
 .../src/light_client_requests/handler.rs      |   4 +-
 client/network/src/protocol.rs                |  12 +-
 .../src/protocol/notifications/behaviour.rs   | 136 +++++++++---------
 client/network/src/service.rs                 |  12 +-
 client/network/src/transactions.rs            |   2 +-
 5 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/client/network/src/light_client_requests/handler.rs b/client/network/src/light_client_requests/handler.rs
index cf2ef706863d..c0932a466418 100644
--- a/client/network/src/light_client_requests/handler.rs
+++ b/client/network/src/light_client_requests/handler.rs
@@ -48,7 +48,7 @@ use std::{
 	collections::{BTreeMap},
 	sync::Arc,
 };
-use log::debug;
+use log::{trace, debug};
 
 const LOG_TARGET: &str = "light-client-request-handler";
 
@@ -89,7 +89,7 @@ impl<B: Block> LightClientRequestHandler<B> {
 					};
 
 					match pending_response.send(response) {
-						Ok(()) => debug!(
+						Ok(()) => trace!(
 							target: LOG_TARGET,
 							"Handled light client request from {}.",
 							peer,
diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index 84b5285b38ad..bbb87b5255d1 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -478,7 +478,7 @@ impl<B: BlockT> Protocol<B> {
 
 	/// Inform sync about new best imported block.
 	pub fn new_best_block_imported(&mut self, hash: B::Hash, number: NumberFor<B>) {
-		trace!(target: "sync", "New best block imported {:?}/#{}", hash, number);
+		debug!(target: "sync", "New best block imported {:?}/#{}", hash, number);
 
 		self.sync.update_chain_info(&hash, number);
 
@@ -522,7 +522,7 @@ impl<B: BlockT> Protocol<B> {
 		if self.important_peers.contains(&peer) {
 			warn!(target: "sync", "Reserved peer {} disconnected", peer);
 		} else {
-			trace!(target: "sync", "{} disconnected", peer);
+			debug!(target: "sync", "{} disconnected", peer);
 		}
 
 		if let Some(_peer_data) = self.peers.remove(&peer) {
@@ -1230,7 +1230,7 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 						let protobuf_response = match crate::schema::v1::BlockResponse::decode(&resp[..]) {
 							Ok(proto) => proto,
 							Err(e) => {
-								trace!(target: "sync", "Failed to decode block request to peer {:?}: {:?}.", id, e);
+								debug!(target: "sync", "Failed to decode block request to peer {:?}: {:?}.", id, e);
 								self.peerset_handle.report_peer(id.clone(), rep::BAD_MESSAGE);
 								self.behaviour.disconnect_peer(id, HARDCODED_PEERSETS_SYNC);
 								continue;
@@ -1241,7 +1241,7 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 					},
 					Poll::Ready(Ok(Err(e))) => {
 						peer.block_request.take();
-						trace!(target: "sync", "Block request to peer {:?} failed: {:?}.", id, e);
+						debug!(target: "sync", "Block request to peer {:?} failed: {:?}.", id, e);
 
 						match e {
 							RequestFailure::Network(OutboundFailure::Timeout) => {
@@ -1438,7 +1438,7 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 					if self.on_sync_peer_disconnected(peer_id.clone()).is_ok() {
 						CustomMessageOutcome::SyncDisconnected(peer_id)
 					} else {
-						log::debug!(
+						log::trace!(
 							target: "sync",
 							"Disconnected peer which had earlier been refused by on_sync_peer_connected {}",
 							peer_id
@@ -1476,7 +1476,7 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 						}
 					}
 					HARDCODED_PEERSETS_SYNC => {
-						debug!(
+						trace!(
 							target: "sync",
 							"Received sync for peer earlier refused by sync layer: {}",
 							peer_id
diff --git a/client/network/src/protocol/notifications/behaviour.rs b/client/network/src/protocol/notifications/behaviour.rs
index 08c4ec5d4f7b..6b17c5253f36 100644
--- a/client/network/src/protocol/notifications/behaviour.rs
+++ b/client/network/src/protocol/notifications/behaviour.rs
@@ -31,7 +31,7 @@ use libp2p::swarm::{
 	NotifyHandler,
 	PollParameters
 };
-use log::{debug, error, trace, warn};
+use log::{error, trace, warn};
 use parking_lot::RwLock;
 use rand::distributions::{Distribution as _, Uniform};
 use smallvec::SmallVec;
@@ -409,7 +409,7 @@ impl Notifications {
 
 	/// Disconnects the given peer if we are connected to it.
 	pub fn disconnect_peer(&mut self, peer_id: &PeerId, set_id: sc_peerset::SetId) {
-		debug!(target: "sub-libp2p", "External API => Disconnect({}, {:?})", peer_id, set_id);
+		trace!(target: "sub-libp2p", "External API => Disconnect({}, {:?})", peer_id, set_id);
 		self.disconnect_peer_inner(peer_id, set_id, None);
 	}
 
@@ -440,7 +440,7 @@ impl Notifications {
 				timer_deadline,
 				timer: _
 			} => {
-				debug!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
+				trace!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
 				self.peerset.dropped(set_id, peer_id.clone(), sc_peerset::DropReason::Unknown);
 				let backoff_until = Some(if let Some(ban) = ban {
 					cmp::max(timer_deadline, Instant::now() + ban)
@@ -457,11 +457,11 @@ impl Notifications {
 			// All open or opening connections are sent a `Close` message.
 			// If relevant, the external API is instantly notified.
 			PeerState::Enabled { mut connections } => {
-				debug!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
+				trace!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
 				self.peerset.dropped(set_id, peer_id.clone(), sc_peerset::DropReason::Unknown);
 
 				if connections.iter().any(|(_, s)| matches!(s, ConnectionState::Open(_))) {
-					debug!(target: "sub-libp2p", "External API <= Closed({}, {:?})", peer_id, set_id);
+					trace!(target: "sub-libp2p", "External API <= Closed({}, {:?})", peer_id, set_id);
 					let event = NotificationsOut::CustomProtocolClosed {
 						peer_id: peer_id.clone(),
 						set_id,
@@ -472,7 +472,7 @@ impl Notifications {
 				for (connec_id, connec_state) in connections.iter_mut()
 					.filter(|(_, s)| matches!(s, ConnectionState::Open(_)))
 				{
-					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close({:?})", peer_id, *connec_id, set_id);
+					trace!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close({:?})", peer_id, *connec_id, set_id);
 					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
 						peer_id: peer_id.clone(),
 						handler: NotifyHandler::One(*connec_id),
@@ -484,7 +484,7 @@ impl Notifications {
 				for (connec_id, connec_state) in connections.iter_mut()
 					.filter(|(_, s)| matches!(s, ConnectionState::Opening))
 				{
-					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close({:?})", peer_id, *connec_id, set_id);
+					trace!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close({:?})", peer_id, *connec_id, set_id);
 					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
 						peer_id: peer_id.clone(),
 						handler: NotifyHandler::One(*connec_id),
@@ -520,7 +520,7 @@ impl Notifications {
 				for (connec_id, connec_state) in connections.iter_mut()
 					.filter(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote))
 				{
-					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close({:?})", peer_id, *connec_id, set_id);
+					trace!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close({:?})", peer_id, *connec_id, set_id);
 					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
 						peer_id: peer_id.clone(),
 						handler: NotifyHandler::One(*connec_id),
@@ -573,7 +573,7 @@ impl Notifications {
 	) {
 		let notifs_sink = match self.peers.get(&(target.clone(), set_id)).and_then(|p| p.get_open()) {
 			None => {
-				debug!(target: "sub-libp2p",
+				trace!(target: "sub-libp2p",
 					"Tried to sent notification to {:?} without an open channel.",
 					target);
 				return
@@ -607,9 +607,9 @@ impl Notifications {
 			Entry::Occupied(entry) => entry,
 			Entry::Vacant(entry) => {
 				// If there's no entry in `self.peers`, start dialing.
-				debug!(target: "sub-libp2p", "PSM => Connect({}, {:?}): Starting to connect",
+				trace!(target: "sub-libp2p", "PSM => Connect({}, {:?}): Starting to connect",
 					entry.key().0, set_id);
-				debug!(target: "sub-libp2p", "Libp2p <= Dial {}", entry.key().0);
+				trace!(target: "sub-libp2p", "Libp2p <= Dial {}", entry.key().0);
 				// The `DialPeerCondition` ensures that dial attempts are de-duplicated
 				self.events.push_back(NetworkBehaviourAction::DialPeer {
 					peer_id: entry.key().0.clone(),
@@ -626,7 +626,7 @@ impl Notifications {
 			// Backoff (not expired) => PendingRequest
 			PeerState::Backoff { ref timer, ref timer_deadline } if *timer_deadline > now => {
 				let peer_id = occ_entry.key().0.clone();
-				debug!(target: "sub-libp2p", "PSM => Connect({}, {:?}): Will start to connect at \
+				trace!(target: "sub-libp2p", "PSM => Connect({}, {:?}): Will start to connect at \
 					until {:?}", peer_id, set_id, timer_deadline);
 				*occ_entry.into_mut() = PeerState::PendingRequest {
 					timer: *timer,
@@ -636,9 +636,9 @@ impl Notifications {
 
 			// Backoff (expired) => Requested
 			PeerState::Backoff { .. } => {
-				debug!(target: "sub-libp2p", "PSM => Connect({}, {:?}): Starting to connect",
+				trace!(target: "sub-libp2p", "PSM => Connect({}, {:?}): Starting to connect",
 					occ_entry.key().0, set_id);
-				debug!(target: "sub-libp2p", "Libp2p <= Dial {:?}", occ_entry.key());
+				trace!(target: "sub-libp2p", "Libp2p <= Dial {:?}", occ_entry.key());
 				// The `DialPeerCondition` ensures that dial attempts are de-duplicated
 				self.events.push_back(NetworkBehaviourAction::DialPeer {
 					peer_id: occ_entry.key().0.clone(),
@@ -653,7 +653,7 @@ impl Notifications {
 				backoff_until: Some(ref backoff)
 			} if *backoff > now => {
 				let peer_id = occ_entry.key().0.clone();
-				debug!(target: "sub-libp2p", "PSM => Connect({}, {:?}): But peer is backed-off until {:?}",
+				trace!(target: "sub-libp2p", "PSM => Connect({}, {:?}): But peer is backed-off until {:?}",
 					peer_id, set_id, backoff);
 
 				let delay_id = self.next_delay_id;
@@ -681,9 +681,9 @@ impl Notifications {
 				if let Some((connec_id, connec_state)) = connections.iter_mut()
 					.find(|(_, s)| matches!(s, ConnectionState::Closed))
 				{
-					debug!(target: "sub-libp2p", "PSM => Connect({}, {:?}): Enabling connections.",
+					trace!(target: "sub-libp2p", "PSM => Connect({}, {:?}): Enabling connections.",
 						occ_entry.key().0, set_id);
-					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open({:?})", peer_id, *connec_id, set_id);
+					trace!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open({:?})", peer_id, *connec_id, set_id);
 					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
 						peer_id: peer_id.clone(),
 						handler: NotifyHandler::One(*connec_id),
@@ -697,7 +697,7 @@ impl Notifications {
 					debug_assert!(connections.iter().any(|(_, s)| {
 						matches!(s, ConnectionState::OpeningThenClosing | ConnectionState::Closing)
 					}));
-					debug!(
+					trace!(
 						target: "sub-libp2p",
 						"PSM => Connect({}, {:?}): No connection in proper state. Delaying.",
 						occ_entry.key().0, set_id
@@ -731,7 +731,7 @@ impl Notifications {
 
 			// Incoming => Enabled
 			PeerState::Incoming { mut connections, .. } => {
-				debug!(target: "sub-libp2p", "PSM => Connect({}, {:?}): Enabling connections.",
+				trace!(target: "sub-libp2p", "PSM => Connect({}, {:?}): Enabling connections.",
 					occ_entry.key().0, set_id);
 				if let Some(inc) = self.incoming.iter_mut()
 					.find(|i| i.peer_id == occ_entry.key().0 && i.set_id == set_id && i.alive) {
@@ -745,7 +745,7 @@ impl Notifications {
 				for (connec_id, connec_state) in connections.iter_mut()
 					.filter(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote))
 				{
-					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open({:?})",
+					trace!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open({:?})",
 						occ_entry.key(), *connec_id, set_id);
 					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
 						peer_id: occ_entry.key().0.clone(),
@@ -793,7 +793,7 @@ impl Notifications {
 		let mut entry = match self.peers.entry((peer_id, set_id)) {
 			Entry::Occupied(entry) => entry,
 			Entry::Vacant(entry) => {
-				debug!(target: "sub-libp2p", "PSM => Drop({}, {:?}): Already disabled.",
+				trace!(target: "sub-libp2p", "PSM => Drop({}, {:?}): Already disabled.",
 					entry.key().0, set_id);
 				return
 			}
@@ -801,7 +801,7 @@ impl Notifications {
 
 		match mem::replace(entry.get_mut(), PeerState::Poisoned) {
 			st @ PeerState::Disabled { .. } | st @ PeerState::Backoff { .. } => {
-				debug!(target: "sub-libp2p", "PSM => Drop({}, {:?}): Already disabled.",
+				trace!(target: "sub-libp2p", "PSM => Drop({}, {:?}): Already disabled.",
 					entry.key().0, set_id);
 				*entry.into_mut() = st;
 			},
@@ -809,7 +809,7 @@ impl Notifications {
 			// DisabledPendingEnable => Disabled
 			PeerState::DisabledPendingEnable { connections, timer_deadline, timer: _ } => {
 				debug_assert!(!connections.is_empty());
-				debug!(target: "sub-libp2p",
+				trace!(target: "sub-libp2p",
 					"PSM => Drop({}, {:?}): Interrupting pending enabling.",
 					entry.key().0, set_id);
 				*entry.into_mut() = PeerState::Disabled {
@@ -820,14 +820,14 @@ impl Notifications {
 
 			// Enabled => Disabled
 			PeerState::Enabled { mut connections } => {
-				debug!(target: "sub-libp2p", "PSM => Drop({}, {:?}): Disabling connections.",
+				trace!(target: "sub-libp2p", "PSM => Drop({}, {:?}): Disabling connections.",
 					entry.key().0, set_id);
 
 				debug_assert!(connections.iter().any(|(_, s)|
 					matches!(s, ConnectionState::Opening | ConnectionState::Open(_))));
 
 				if connections.iter().any(|(_, s)| matches!(s, ConnectionState::Open(_))) {
-					debug!(target: "sub-libp2p", "External API <= Closed({}, {:?})", entry.key().0, set_id);
+					trace!(target: "sub-libp2p", "External API <= Closed({}, {:?})", entry.key().0, set_id);
 					let event = NotificationsOut::CustomProtocolClosed {
 						peer_id: entry.key().0.clone(),
 						set_id,
@@ -838,7 +838,7 @@ impl Notifications {
 				for (connec_id, connec_state) in connections.iter_mut()
 					.filter(|(_, s)| matches!(s, ConnectionState::Opening))
 				{
-					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close({:?})",
+					trace!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close({:?})",
 						entry.key(), *connec_id, set_id);
 					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
 						peer_id: entry.key().0.clone(),
@@ -851,7 +851,7 @@ impl Notifications {
 				for (connec_id, connec_state) in connections.iter_mut()
 					.filter(|(_, s)| matches!(s, ConnectionState::Open(_)))
 				{
-					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close({:?})",
+					trace!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close({:?})",
 						entry.key(), *connec_id, set_id);
 					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
 						peer_id: entry.key().0.clone(),
@@ -869,14 +869,14 @@ impl Notifications {
 				// We don't cancel dialing. Libp2p doesn't expose that on purpose, as other
 				// sub-systems (such as the discovery mechanism) may require dialing this peer as
 				// well at the same time.
-				debug!(target: "sub-libp2p", "PSM => Drop({}, {:?}): Not yet connected.",
+				trace!(target: "sub-libp2p", "PSM => Drop({}, {:?}): Not yet connected.",
 					entry.key().0, set_id);
 				entry.remove();
 			},
 
 			// PendingRequest => Backoff
 			PeerState::PendingRequest { timer, timer_deadline } => {
-				debug!(target: "sub-libp2p", "PSM => Drop({}, {:?}): Not yet connected",
+				trace!(target: "sub-libp2p", "PSM => Drop({}, {:?}): Not yet connected",
 					entry.key().0, set_id);
 				*entry.into_mut() = PeerState::Backoff { timer, timer_deadline }
 			},
@@ -906,13 +906,13 @@ impl Notifications {
 		};
 
 		if !incoming.alive {
-			debug!(target: "sub-libp2p", "PSM => Accept({:?}, {}, {:?}): Obsolete incoming",
+			trace!(target: "sub-libp2p", "PSM => Accept({:?}, {}, {:?}): Obsolete incoming",
 				index, incoming.peer_id, incoming.set_id);
 			match self.peers.get_mut(&(incoming.peer_id.clone(), incoming.set_id)) {
 				Some(PeerState::DisabledPendingEnable { .. }) |
 				Some(PeerState::Enabled { .. }) => {}
 				_ => {
-					debug!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})",
+					trace!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})",
 						incoming.peer_id, incoming.set_id);
 					self.peerset.dropped(incoming.set_id, incoming.peer_id, sc_peerset::DropReason::Unknown);
 				},
@@ -931,14 +931,14 @@ impl Notifications {
 		match mem::replace(state, PeerState::Poisoned) {
 			// Incoming => Enabled
 			PeerState::Incoming { mut connections, .. } => {
-				debug!(target: "sub-libp2p", "PSM => Accept({:?}, {}, {:?}): Enabling connections.",
+				trace!(target: "sub-libp2p", "PSM => Accept({:?}, {}, {:?}): Enabling connections.",
 					index, incoming.peer_id, incoming.set_id);
 
 				debug_assert!(connections.iter().any(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote)));
 				for (connec_id, connec_state) in connections.iter_mut()
 					.filter(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote))
 				{
-					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open({:?})",
+					trace!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open({:?})",
 						incoming.peer_id, *connec_id, incoming.set_id);
 					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
 						peer_id: incoming.peer_id.clone(),
@@ -971,7 +971,7 @@ impl Notifications {
 		};
 
 		if !incoming.alive {
-			debug!(target: "sub-libp2p", "PSM => Reject({:?}, {}, {:?}): Obsolete incoming, \
+			trace!(target: "sub-libp2p", "PSM => Reject({:?}, {}, {:?}): Obsolete incoming, \
 				ignoring", index, incoming.peer_id, incoming.set_id);
 			return
 		}
@@ -987,14 +987,14 @@ impl Notifications {
 		match mem::replace(state, PeerState::Poisoned) {
 			// Incoming => Disabled
 			PeerState::Incoming { mut connections, backoff_until } => {
-				debug!(target: "sub-libp2p", "PSM => Reject({:?}, {}, {:?}): Rejecting connections.",
+				trace!(target: "sub-libp2p", "PSM => Reject({:?}, {}, {:?}): Rejecting connections.",
 					index, incoming.peer_id, incoming.set_id);
 
 				debug_assert!(connections.iter().any(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote)));
 				for (connec_id, connec_state) in connections.iter_mut()
 					.filter(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote))
 				{
-					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close({:?})",
+					trace!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close({:?})",
 						incoming.peer_id, connec_id, incoming.set_id);
 					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
 						peer_id: incoming.peer_id.clone(),
@@ -1034,11 +1034,11 @@ impl NetworkBehaviour for Notifications {
 				// Requested | PendingRequest => Enabled
 				st @ &mut PeerState::Requested |
 				st @ &mut PeerState::PendingRequest { .. } => {
-					debug!(target: "sub-libp2p",
+					trace!(target: "sub-libp2p",
 						"Libp2p => Connected({}, {:?}, {:?}): Connection was requested by PSM.",
 						peer_id, set_id, endpoint
 					);
-					debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open({:?})", peer_id, *conn, set_id);
+					trace!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open({:?})", peer_id, *conn, set_id);
 					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
 						peer_id: peer_id.clone(),
 						handler: NotifyHandler::One(*conn),
@@ -1059,7 +1059,7 @@ impl NetworkBehaviour for Notifications {
 					} else {
 						None
 					};
-					debug!(target: "sub-libp2p",
+					trace!(target: "sub-libp2p",
 						"Libp2p => Connected({}, {:?}, {:?}, {:?}): Not requested by PSM, disabling.",
 						peer_id, set_id, endpoint, *conn);
 
@@ -1074,7 +1074,7 @@ impl NetworkBehaviour for Notifications {
 				PeerState::Disabled { connections, .. } |
 				PeerState::DisabledPendingEnable { connections, .. } |
 				PeerState::Enabled { connections, .. } => {
-					debug!(target: "sub-libp2p",
+					trace!(target: "sub-libp2p",
 						"Libp2p => Connected({}, {:?}, {:?}, {:?}): Secondary connection. Leaving closed.",
 						peer_id, set_id, endpoint, *conn);
 					connections.push((*conn, ConnectionState::Closed));
@@ -1096,7 +1096,7 @@ impl NetworkBehaviour for Notifications {
 			match mem::replace(entry.get_mut(), PeerState::Poisoned) {
 				// Disabled => Disabled | Backoff | Ø
 				PeerState::Disabled { mut connections, backoff_until } => {
-					debug!(target: "sub-libp2p", "Libp2p => Disconnected({}, {:?}, {:?}): Disabled.",
+					trace!(target: "sub-libp2p", "Libp2p => Disconnected({}, {:?}, {:?}): Disabled.",
 						peer_id, set_id, *conn);
 
 					if let Some(pos) = connections.iter().position(|(c, _)| *c == *conn) {
@@ -1137,7 +1137,7 @@ impl NetworkBehaviour for Notifications {
 
 				// DisabledPendingEnable => DisabledPendingEnable | Backoff
 				PeerState::DisabledPendingEnable { mut connections, timer_deadline, timer } => {
-					debug!(
+					trace!(
 						target: "sub-libp2p",
 						"Libp2p => Disconnected({}, {:?}, {:?}): Disabled but pending enable.",
 						peer_id, set_id, *conn
@@ -1152,7 +1152,7 @@ impl NetworkBehaviour for Notifications {
 					}
 
 					if connections.is_empty() {
-						debug!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
+						trace!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
 						self.peerset.dropped(set_id, peer_id.clone(), sc_peerset::DropReason::Unknown);
 						*entry.get_mut() = PeerState::Backoff { timer, timer_deadline };
 
@@ -1165,7 +1165,7 @@ impl NetworkBehaviour for Notifications {
 
 				// Incoming => Incoming | Disabled | Backoff | Ø
 				PeerState::Incoming { mut connections, backoff_until } => {
-					debug!(
+					trace!(
 						target: "sub-libp2p",
 						"Libp2p => Disconnected({}, {:?}, {:?}): OpenDesiredByRemote.",
 						peer_id, set_id, *conn
@@ -1236,7 +1236,7 @@ impl NetworkBehaviour for Notifications {
 				// Enabled => Enabled | Backoff
 				// Peers are always backed-off when disconnecting while Enabled.
 				PeerState::Enabled { mut connections } => {
-					debug!(
+					trace!(
 						target: "sub-libp2p",
 						"Libp2p => Disconnected({}, {:?}, {:?}): Enabled.",
 						peer_id, set_id, *conn
@@ -1260,7 +1260,7 @@ impl NetworkBehaviour for Notifications {
 								.next()
 							{
 								if pos <= replacement_pos {
-									debug!(
+									trace!(
 										target: "sub-libp2p",
 										"External API <= Sink replaced({}, {:?})",
 										peer_id, set_id
@@ -1273,7 +1273,7 @@ impl NetworkBehaviour for Notifications {
 									self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
 								}
 							} else {
-								debug!(
+								trace!(
 									target: "sub-libp2p", "External API <= Closed({}, {:?})",
 									peer_id, set_id
 								);
@@ -1292,7 +1292,7 @@ impl NetworkBehaviour for Notifications {
 					}
 
 					if connections.is_empty() {
-						debug!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
+						trace!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
 						self.peerset.dropped(set_id, peer_id.clone(), sc_peerset::DropReason::Unknown);
 						let ban_dur = Uniform::new(5, 10).sample(&mut rand::thread_rng());
 
@@ -1313,7 +1313,7 @@ impl NetworkBehaviour for Notifications {
 					} else if !connections.iter().any(|(_, s)|
 						matches!(s, ConnectionState::Opening | ConnectionState::Open(_)))
 					{
-						debug!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
+						trace!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
 						self.peerset.dropped(set_id, peer_id.clone(), sc_peerset::DropReason::Unknown);
 
 						*entry.get_mut() = PeerState::Disabled {
@@ -1351,7 +1351,7 @@ impl NetworkBehaviour for Notifications {
 	}
 
 	fn inject_dial_failure(&mut self, peer_id: &PeerId) {
-		debug!(target: "sub-libp2p", "Libp2p => Dial failure for {:?}", peer_id);
+		trace!(target: "sub-libp2p", "Libp2p => Dial failure for {:?}", peer_id);
 
 		for set_id in (0..self.notif_protocols.len()).map(sc_peerset::SetId::from) {
 			if let Entry::Occupied(mut entry) = self.peers.entry((peer_id.clone(), set_id)) {
@@ -1364,7 +1364,7 @@ impl NetworkBehaviour for Notifications {
 					// "Basic" situation: we failed to reach a peer that the peerset requested.
 					st @ PeerState::Requested |
 					st @ PeerState::PendingRequest { .. } => {
-						debug!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
+						trace!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
 						self.peerset.dropped(set_id, peer_id.clone(), sc_peerset::DropReason::Unknown);
 
 						let now = Instant::now();
@@ -1415,7 +1415,7 @@ impl NetworkBehaviour for Notifications {
 			NotifsHandlerOut::OpenDesiredByRemote { protocol_index } => {
 				let set_id = sc_peerset::SetId::from(protocol_index);
 
-				debug!(target: "sub-libp2p",
+				trace!(target: "sub-libp2p",
 					"Handler({:?}, {:?}]) => OpenDesiredByRemote({:?})",
 					source, connection, set_id);
 
@@ -1463,7 +1463,7 @@ impl NetworkBehaviour for Notifications {
 
 						if let Some((_, connec_state)) = connections.iter_mut().find(|(c, _)| *c == connection) {
 							if let ConnectionState::Closed = *connec_state {
-								debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open({:?})",
+								trace!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open({:?})",
 									source, connection, set_id);
 								self.events.push_back(NetworkBehaviourAction::NotifyHandler {
 									peer_id: source,
@@ -1503,7 +1503,7 @@ impl NetworkBehaviour for Notifications {
 								let incoming_id = self.next_incoming_index;
 								self.next_incoming_index.0 += 1;
 
-								debug!(target: "sub-libp2p", "PSM <= Incoming({}, {:?}).",
+								trace!(target: "sub-libp2p", "PSM <= Incoming({}, {:?}).",
 									source, incoming_id);
 								self.peerset.incoming(set_id, source.clone(), incoming_id);
 								self.incoming.push(IncomingPeer {
@@ -1539,7 +1539,7 @@ impl NetworkBehaviour for Notifications {
 					PeerState::DisabledPendingEnable { mut connections, timer, timer_deadline } => {
 						if let Some((_, connec_state)) = connections.iter_mut().find(|(c, _)| *c == connection) {
 							if let ConnectionState::Closed = *connec_state {
-								debug!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open({:?})",
+								trace!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open({:?})",
 									source, connection, set_id);
 								self.events.push_back(NetworkBehaviourAction::NotifyHandler {
 									peer_id: source.clone(),
@@ -1587,7 +1587,7 @@ impl NetworkBehaviour for Notifications {
 			NotifsHandlerOut::CloseDesired { protocol_index } => {
 				let set_id = sc_peerset::SetId::from(protocol_index);
 
-				debug!(target: "sub-libp2p",
+				trace!(target: "sub-libp2p",
 					"Handler({}, {:?}) => CloseDesired({:?})",
 					source, connection, set_id);
 
@@ -1622,7 +1622,7 @@ impl NetworkBehaviour for Notifications {
 						debug_assert!(matches!(connections[pos].1, ConnectionState::Open(_)));
 						connections[pos].1 = ConnectionState::Closing;
 
-						debug!(target: "sub-libp2p", "Handler({}, {:?}) <= Close({:?})", source, connection, set_id);
+						trace!(target: "sub-libp2p", "Handler({}, {:?}) <= Close({:?})", source, connection, set_id);
 						self.events.push_back(NetworkBehaviourAction::NotifyHandler {
 							peer_id: source.clone(),
 							handler: NotifyHandler::One(connection),
@@ -1641,7 +1641,7 @@ impl NetworkBehaviour for Notifications {
 							.next()
 						{
 							if pos <= replacement_pos {
-								debug!(target: "sub-libp2p", "External API <= Sink replaced({:?})", source);
+								trace!(target: "sub-libp2p", "External API <= Sink replaced({:?})", source);
 								let event = NotificationsOut::CustomProtocolReplaced {
 									peer_id: source,
 									set_id,
@@ -1655,7 +1655,7 @@ impl NetworkBehaviour for Notifications {
 						} else {
 							// List of open connections wasn't empty before but now it is.
 							if !connections.iter().any(|(_, s)| matches!(s, ConnectionState::Opening)) {
-								debug!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", source, set_id);
+								trace!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", source, set_id);
 								self.peerset.dropped(set_id, source.clone(), sc_peerset::DropReason::Refused);
 								*entry.into_mut() = PeerState::Disabled {
 									connections, backoff_until: None
@@ -1664,7 +1664,7 @@ impl NetworkBehaviour for Notifications {
 								*entry.into_mut() = PeerState::Enabled { connections };
 							}
 
-							debug!(target: "sub-libp2p", "External API <= Closed({}, {:?})", source, set_id);
+							trace!(target: "sub-libp2p", "External API <= Closed({}, {:?})", source, set_id);
 							let event = NotificationsOut::CustomProtocolClosed {
 								peer_id: source,
 								set_id,
@@ -1692,7 +1692,7 @@ impl NetworkBehaviour for Notifications {
 			NotifsHandlerOut::CloseResult { protocol_index } => {
 				let set_id = sc_peerset::SetId::from(protocol_index);
 
-				debug!(target: "sub-libp2p",
+				trace!(target: "sub-libp2p",
 					"Handler({}, {:?}) => CloseResult({:?})",
 					source, connection, set_id);
 
@@ -1724,7 +1724,7 @@ impl NetworkBehaviour for Notifications {
 
 			NotifsHandlerOut::OpenResultOk { protocol_index, received_handshake, notifications_sink, .. } => {
 				let set_id = sc_peerset::SetId::from(protocol_index);
-				debug!(target: "sub-libp2p",
+				trace!(target: "sub-libp2p",
 					"Handler({}, {:?}) => OpenResultOk({:?})",
 					source, connection, set_id);
 
@@ -1738,7 +1738,7 @@ impl NetworkBehaviour for Notifications {
 							*c == connection && matches!(s, ConnectionState::Opening))
 						{
 							if !any_open {
-								debug!(target: "sub-libp2p", "External API <= Open({:?})", source);
+								trace!(target: "sub-libp2p", "External API <= Open({:?})", source);
 								let event = NotificationsOut::CustomProtocolOpen {
 									peer_id: source,
 									set_id,
@@ -1785,7 +1785,7 @@ impl NetworkBehaviour for Notifications {
 
 			NotifsHandlerOut::OpenResultErr { protocol_index } => {
 				let set_id = sc_peerset::SetId::from(protocol_index);
-				debug!(target: "sub-libp2p",
+				trace!(target: "sub-libp2p",
 					"Handler({:?}, {:?}) => OpenResultErr({:?})",
 					source, connection, set_id);
 
@@ -1820,7 +1820,7 @@ impl NetworkBehaviour for Notifications {
 						if !connections.iter().any(|(_, s)|
 							matches!(s, ConnectionState::Opening | ConnectionState::Open(_)))
 						{
-							debug!(target: "sub-libp2p", "PSM <= Dropped({:?})", source);
+							trace!(target: "sub-libp2p", "PSM <= Dropped({:?})", source);
 							self.peerset.dropped(set_id, source.clone(), sc_peerset::DropReason::Refused);
 
 							*entry.into_mut() = PeerState::Disabled {
@@ -1946,12 +1946,12 @@ impl NetworkBehaviour for Notifications {
 
 			match peer_state {
 				PeerState::Backoff { timer, .. } if *timer == delay_id => {
-					debug!(target: "sub-libp2p", "Libp2p <= Clean up ban of {:?} from the state", peer_id);
+					trace!(target: "sub-libp2p", "Libp2p <= Clean up ban of {:?} from the state", peer_id);
 					self.peers.remove(&(peer_id, set_id));
 				}
 
 				PeerState::PendingRequest { timer, .. } if *timer == delay_id => {
-					debug!(target: "sub-libp2p", "Libp2p <= Dial {:?} now that ban has expired", peer_id);
+					trace!(target: "sub-libp2p", "Libp2p <= Dial {:?} now that ban has expired", peer_id);
 					// The `DialPeerCondition` ensures that dial attempts are de-duplicated
 					self.events.push_back(NetworkBehaviourAction::DialPeer {
 						peer_id,
@@ -1967,7 +1967,7 @@ impl NetworkBehaviour for Notifications {
 					if let Some((connec_id, connec_state)) = connections.iter_mut()
 						.find(|(_, s)| matches!(s, ConnectionState::Closed))
 					{
-						debug!(target: "sub-libp2p", "Handler({}, {:?}) <= Open({:?}) (ban expired)",
+						trace!(target: "sub-libp2p", "Handler({}, {:?}) <= Open({:?}) (ban expired)",
 							peer_id, *connec_id, set_id);
 						self.events.push_back(NetworkBehaviourAction::NotifyHandler {
 							peer_id: peer_id.clone(),
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 7ea66799bad3..7e7f2689eb23 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -79,7 +79,7 @@ use libp2p::swarm::{
 	SwarmEvent,
 	protocols_handler::NodeHandlerWrapperError
 };
-use log::{error, info, trace, warn};
+use log::{error, info, trace, debug, warn};
 use metrics::{Metrics, MetricSources, Histogram, HistogramVec};
 use parking_lot::Mutex;
 use sc_peerset::PeersetHandle;
@@ -1630,7 +1630,7 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 					this.event_streams.send(Event::Dht(event));
 				},
 				Poll::Ready(SwarmEvent::ConnectionEstablished { peer_id, endpoint, num_established }) => {
-					trace!(target: "sub-libp2p", "Libp2p => Connected({:?})", peer_id);
+					debug!(target: "sub-libp2p", "Libp2p => Connected({:?})", peer_id);
 
 					if let Some(metrics) = this.metrics.as_ref() {
 						let direction = match endpoint {
@@ -1645,7 +1645,7 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 					}
 				},
 				Poll::Ready(SwarmEvent::ConnectionClosed { peer_id, cause, endpoint, num_established }) => {
-					trace!(target: "sub-libp2p", "Libp2p => Disconnected({:?}, {:?})", peer_id, cause);
+					debug!(target: "sub-libp2p", "Libp2p => Disconnected({:?}, {:?})", peer_id, cause);
 					if let Some(metrics) = this.metrics.as_ref() {
 						let direction = match endpoint {
 							ConnectedPoint::Dialer { .. } => "out",
@@ -1722,7 +1722,7 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 					}
 				},
 				Poll::Ready(SwarmEvent::IncomingConnectionError { local_addr, send_back_addr, error }) => {
-					trace!(target: "sub-libp2p", "Libp2p => IncomingConnectionError({},{}): {}",
+					debug!(target: "sub-libp2p", "Libp2p => IncomingConnectionError({},{}): {}",
 						local_addr, send_back_addr, error);
 					if let Some(metrics) = this.metrics.as_ref() {
 						let reason = match error {
@@ -1736,7 +1736,7 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 					}
 				},
 				Poll::Ready(SwarmEvent::BannedPeer { peer_id, endpoint }) => {
-					trace!(target: "sub-libp2p", "Libp2p => BannedPeer({}). Connected via {:?}.",
+					debug!(target: "sub-libp2p", "Libp2p => BannedPeer({}). Connected via {:?}.",
 						peer_id, endpoint);
 					if let Some(metrics) = this.metrics.as_ref() {
 						metrics.incoming_connections_errors_total.with_label_values(&["banned"]).inc();
@@ -1765,7 +1765,7 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 					}
 				},
 				Poll::Ready(SwarmEvent::ListenerError { error }) => {
-					trace!(target: "sub-libp2p", "Libp2p => ListenerError: {}", error);
+					debug!(target: "sub-libp2p", "Libp2p => ListenerError: {}", error);
 					if let Some(metrics) = this.metrics.as_ref() {
 						metrics.listeners_errors_total.inc();
 					}
diff --git a/client/network/src/transactions.rs b/client/network/src/transactions.rs
index 20ac8314b747..b694182e6a23 100644
--- a/client/network/src/transactions.rs
+++ b/client/network/src/transactions.rs
@@ -360,7 +360,7 @@ impl<B: BlockT + 'static, H: ExHashT> TransactionsHandler<B, H> {
 	) {
 		// sending transaction to light node is considered a bad behavior
 		if matches!(self.local_role, config::Role::Light) {
-			trace!(target: "sync", "Peer {} is trying to send transactions to the light node", who);
+			debug!(target: "sync", "Peer {} is trying to send transactions to the light node", who);
 			self.service.disconnect_peer(who, self.protocol_name.clone());
 			self.service.report_peer(who, rep::UNEXPECTED_TRANSACTIONS);
 			return;

From 22193e0c73207857bef06e8c864b289384ef9a04 Mon Sep 17 00:00:00 2001
From: Liu-Cheng Xu <xuliuchengxlc@gmail.com>
Date: Tue, 6 Apr 2021 02:20:36 +0800
Subject: [PATCH 0601/1194] Add some trivial improvements to primitives runtime
 (#8528)

* Add some trivial improvements

* Finish primitives/runtime
---
 primitives/runtime/src/curve.rs               |  2 +-
 primitives/runtime/src/generic/digest.rs      | 65 +++++++++----------
 primitives/runtime/src/generic/era.rs         | 25 ++++---
 primitives/runtime/src/generic/header.rs      |  4 +-
 .../src/generic/unchecked_extrinsic.rs        | 12 ++--
 primitives/runtime/src/lib.rs                 | 53 +++++++--------
 primitives/runtime/src/multiaddress.rs        | 10 +--
 .../runtime/src/offchain/storage_lock.rs      |  6 +-
 primitives/runtime/src/traits.rs              |  3 +-
 .../runtime/src/transaction_validity.rs       | 26 +++-----
 10 files changed, 96 insertions(+), 110 deletions(-)

diff --git a/primitives/runtime/src/curve.rs b/primitives/runtime/src/curve.rs
index 09ca9a9c46af..06f7f2c7e3f0 100644
--- a/primitives/runtime/src/curve.rs
+++ b/primitives/runtime/src/curve.rs
@@ -40,7 +40,7 @@ impl<'a> PiecewiseLinear<'a> {
 	{
 		let n = n.min(d.clone());
 
-		if self.points.len() == 0 {
+		if self.points.is_empty() {
 			return N::zero()
 		}
 
diff --git a/primitives/runtime/src/generic/digest.rs b/primitives/runtime/src/generic/digest.rs
index dcdd90f4a639..8594393c7cde 100644
--- a/primitives/runtime/src/generic/digest.rs
+++ b/primitives/runtime/src/generic/digest.rs
@@ -40,7 +40,7 @@ pub struct Digest<Hash> {
 
 impl<Item> Default for Digest<Item> {
 	fn default() -> Self {
-		Digest { logs: Vec::new(), }
+		Self { logs: Vec::new(), }
 	}
 }
 
@@ -71,7 +71,6 @@ impl<Hash> Digest<Hash> {
 	}
 }
 
-
 /// Digest item that is able to encode/decode 'system' digest items and
 /// provide opaque access to other items.
 #[derive(PartialEq, Eq, Clone, RuntimeDebug)]
@@ -209,14 +208,14 @@ pub enum OpaqueDigestItemId<'a> {
 
 impl<Hash> DigestItem<Hash> {
 	/// Returns a 'referencing view' for this digest item.
-	pub fn dref<'a>(&'a self) -> DigestItemRef<'a, Hash> {
+	pub fn dref(&self) -> DigestItemRef<Hash> {
 		match *self {
-			DigestItem::ChangesTrieRoot(ref v) => DigestItemRef::ChangesTrieRoot(v),
-			DigestItem::PreRuntime(ref v, ref s) => DigestItemRef::PreRuntime(v, s),
-			DigestItem::Consensus(ref v, ref s) => DigestItemRef::Consensus(v, s),
-			DigestItem::Seal(ref v, ref s) => DigestItemRef::Seal(v, s),
-			DigestItem::ChangesTrieSignal(ref s) => DigestItemRef::ChangesTrieSignal(s),
-			DigestItem::Other(ref v) => DigestItemRef::Other(v),
+			Self::ChangesTrieRoot(ref v) => DigestItemRef::ChangesTrieRoot(v),
+			Self::PreRuntime(ref v, ref s) => DigestItemRef::PreRuntime(v, s),
+			Self::Consensus(ref v, ref s) => DigestItemRef::Consensus(v, s),
+			Self::Seal(ref v, ref s) => DigestItemRef::Seal(v, s),
+			Self::ChangesTrieSignal(ref s) => DigestItemRef::ChangesTrieSignal(s),
+			Self::Other(ref v) => DigestItemRef::Other(v),
 		}
 	}
 
@@ -298,25 +297,25 @@ impl<Hash: Decode> Decode for DigestItem<Hash> {
 	fn decode<I: Input>(input: &mut I) -> Result<Self, Error> {
 		let item_type: DigestItemType = Decode::decode(input)?;
 		match item_type {
-			DigestItemType::ChangesTrieRoot => Ok(DigestItem::ChangesTrieRoot(
+			DigestItemType::ChangesTrieRoot => Ok(Self::ChangesTrieRoot(
 				Decode::decode(input)?,
 			)),
 			DigestItemType::PreRuntime => {
 				let vals: (ConsensusEngineId, Vec<u8>) = Decode::decode(input)?;
-				Ok(DigestItem::PreRuntime(vals.0, vals.1))
+				Ok(Self::PreRuntime(vals.0, vals.1))
 			},
 			DigestItemType::Consensus => {
 				let vals: (ConsensusEngineId, Vec<u8>) = Decode::decode(input)?;
-				Ok(DigestItem::Consensus(vals.0, vals.1))
+				Ok(Self::Consensus(vals.0, vals.1))
 			}
 			DigestItemType::Seal => {
 				let vals: (ConsensusEngineId, Vec<u8>) = Decode::decode(input)?;
-				Ok(DigestItem::Seal(vals.0, vals.1))
+				Ok(Self::Seal(vals.0, vals.1))
 			},
-			DigestItemType::ChangesTrieSignal => Ok(DigestItem::ChangesTrieSignal(
+			DigestItemType::ChangesTrieSignal => Ok(Self::ChangesTrieSignal(
 				Decode::decode(input)?,
 			)),
-			DigestItemType::Other => Ok(DigestItem::Other(
+			DigestItemType::Other => Ok(Self::Other(
 				Decode::decode(input)?,
 			)),
 		}
@@ -327,7 +326,7 @@ impl<'a, Hash> DigestItemRef<'a, Hash> {
 	/// Cast this digest item into `ChangesTrieRoot`.
 	pub fn as_changes_trie_root(&self) -> Option<&'a Hash> {
 		match *self {
-			DigestItemRef::ChangesTrieRoot(ref changes_trie_root) => Some(changes_trie_root),
+			Self::ChangesTrieRoot(ref changes_trie_root) => Some(changes_trie_root),
 			_ => None,
 		}
 	}
@@ -335,7 +334,7 @@ impl<'a, Hash> DigestItemRef<'a, Hash> {
 	/// Cast this digest item into `PreRuntime`
 	pub fn as_pre_runtime(&self) -> Option<(ConsensusEngineId, &'a [u8])> {
 		match *self {
-			DigestItemRef::PreRuntime(consensus_engine_id, ref data) => Some((*consensus_engine_id, data)),
+			Self::PreRuntime(consensus_engine_id, ref data) => Some((*consensus_engine_id, data)),
 			_ => None,
 		}
 	}
@@ -343,7 +342,7 @@ impl<'a, Hash> DigestItemRef<'a, Hash> {
 	/// Cast this digest item into `Consensus`
 	pub fn as_consensus(&self) -> Option<(ConsensusEngineId, &'a [u8])> {
 		match *self {
-			DigestItemRef::Consensus(consensus_engine_id, ref data) => Some((*consensus_engine_id, data)),
+			Self::Consensus(consensus_engine_id, ref data) => Some((*consensus_engine_id, data)),
 			_ => None,
 		}
 	}
@@ -351,7 +350,7 @@ impl<'a, Hash> DigestItemRef<'a, Hash> {
 	/// Cast this digest item into `Seal`
 	pub fn as_seal(&self) -> Option<(ConsensusEngineId, &'a [u8])> {
 		match *self {
-			DigestItemRef::Seal(consensus_engine_id, ref data) => Some((*consensus_engine_id, data)),
+			Self::Seal(consensus_engine_id, ref data) => Some((*consensus_engine_id, data)),
 			_ => None,
 		}
 	}
@@ -359,7 +358,7 @@ impl<'a, Hash> DigestItemRef<'a, Hash> {
 	/// Cast this digest item into `ChangesTrieSignal`.
 	pub fn as_changes_trie_signal(&self) -> Option<&'a ChangesTrieSignal> {
 		match *self {
-			DigestItemRef::ChangesTrieSignal(ref changes_trie_signal) => Some(changes_trie_signal),
+			Self::ChangesTrieSignal(ref changes_trie_signal) => Some(changes_trie_signal),
 			_ => None,
 		}
 	}
@@ -367,7 +366,7 @@ impl<'a, Hash> DigestItemRef<'a, Hash> {
 	/// Cast this digest item into `PreRuntime`
 	pub fn as_other(&self) -> Option<&'a [u8]> {
 		match *self {
-			DigestItemRef::Other(ref data) => Some(data),
+			Self::Other(ref data) => Some(data),
 			_ => None,
 		}
 	}
@@ -376,11 +375,11 @@ impl<'a, Hash> DigestItemRef<'a, Hash> {
 	/// return the opaque data it contains.
 	pub fn try_as_raw(&self, id: OpaqueDigestItemId) -> Option<&'a [u8]> {
 		match (id, self) {
-			(OpaqueDigestItemId::Consensus(w), &DigestItemRef::Consensus(v, s)) |
-				(OpaqueDigestItemId::Seal(w), &DigestItemRef::Seal(v, s)) |
-				(OpaqueDigestItemId::PreRuntime(w), &DigestItemRef::PreRuntime(v, s))
+			(OpaqueDigestItemId::Consensus(w), &Self::Consensus(v, s)) |
+				(OpaqueDigestItemId::Seal(w), &Self::Seal(v, s)) |
+				(OpaqueDigestItemId::PreRuntime(w), &Self::PreRuntime(v, s))
 				if v == w => Some(&s[..]),
-			(OpaqueDigestItemId::Other, &DigestItemRef::Other(s)) => Some(&s[..]),
+			(OpaqueDigestItemId::Other, &Self::Other(s)) => Some(&s[..]),
 			_ => None,
 		}
 	}
@@ -432,27 +431,27 @@ impl<'a, Hash: Encode> Encode for DigestItemRef<'a, Hash> {
 		let mut v = Vec::new();
 
 		match *self {
-			DigestItemRef::ChangesTrieRoot(changes_trie_root) => {
+			Self::ChangesTrieRoot(changes_trie_root) => {
 				DigestItemType::ChangesTrieRoot.encode_to(&mut v);
 				changes_trie_root.encode_to(&mut v);
 			},
-			DigestItemRef::Consensus(val, data) => {
+			Self::Consensus(val, data) => {
 				DigestItemType::Consensus.encode_to(&mut v);
 				(val, data).encode_to(&mut v);
 			},
-			DigestItemRef::Seal(val, sig) => {
+			Self::Seal(val, sig) => {
 				DigestItemType::Seal.encode_to(&mut v);
 				(val, sig).encode_to(&mut v);
 			},
-			DigestItemRef::PreRuntime(val, data) => {
+			Self::PreRuntime(val, data) => {
 				DigestItemType::PreRuntime.encode_to(&mut v);
 				(val, data).encode_to(&mut v);
 			},
-			DigestItemRef::ChangesTrieSignal(changes_trie_signal) => {
+			Self::ChangesTrieSignal(changes_trie_signal) => {
 				DigestItemType::ChangesTrieSignal.encode_to(&mut v);
 				changes_trie_signal.encode_to(&mut v);
 			},
-			DigestItemRef::Other(val) => {
+			Self::Other(val) => {
 				DigestItemType::Other.encode_to(&mut v);
 				val.encode_to(&mut v);
 			},
@@ -466,7 +465,7 @@ impl ChangesTrieSignal {
 	/// Try to cast this signal to NewConfiguration.
 	pub fn as_new_configuration(&self) -> Option<&Option<ChangesTrieConfiguration>> {
 		match self {
-			ChangesTrieSignal::NewConfiguration(config) => Some(config),
+			Self::NewConfiguration(config) => Some(config),
 		}
 	}
 }
@@ -488,7 +487,7 @@ mod tests {
 		};
 
 		assert_eq!(
-			::serde_json::to_string(&digest).unwrap(),
+			serde_json::to_string(&digest).unwrap(),
 			r#"{"logs":["0x0204000000","0x000c010203","0x05746573740c010203"]}"#
 		);
 	}
diff --git a/primitives/runtime/src/generic/era.rs b/primitives/runtime/src/generic/era.rs
index 5bee170048b5..fbda688cc407 100644
--- a/primitives/runtime/src/generic/era.rs
+++ b/primitives/runtime/src/generic/era.rs
@@ -72,36 +72,33 @@ impl Era {
 		let quantize_factor = (period >> 12).max(1);
 		let quantized_phase = phase / quantize_factor * quantize_factor;
 
-		Era::Mortal(period, quantized_phase)
+		Self::Mortal(period, quantized_phase)
 	}
 
 	/// Create an "immortal" transaction.
 	pub fn immortal() -> Self {
-		Era::Immortal
+		Self::Immortal
 	}
 
 	/// `true` if this is an immortal transaction.
 	pub fn is_immortal(&self) -> bool {
-		match self {
-			Era::Immortal => true,
-			_ => false,
-		}
+		matches!(self, Self::Immortal)
 	}
 
 	/// Get the block number of the start of the era whose properties this object
 	/// describes that `current` belongs to.
 	pub fn birth(self, current: u64) -> u64 {
 		match self {
-			Era::Immortal => 0,
-			Era::Mortal(period, phase) => (current.max(phase) - phase) / period * period + phase,
+			Self::Immortal => 0,
+			Self::Mortal(period, phase) => (current.max(phase) - phase) / period * period + phase,
 		}
 	}
 
 	/// Get the block number of the first block at which the era has ended.
 	pub fn death(self, current: u64) -> u64 {
 		match self {
-			Era::Immortal => u64::max_value(),
-			Era::Mortal(period, _) => self.birth(current) + period,
+			Self::Immortal => u64::max_value(),
+			Self::Mortal(period, _) => self.birth(current) + period,
 		}
 	}
 }
@@ -109,8 +106,8 @@ impl Era {
 impl Encode for Era {
 	fn encode_to<T: Output + ?Sized>(&self, output: &mut T) {
 		match self {
-			Era::Immortal => output.push_byte(0),
-			Era::Mortal(period, phase) => {
+			Self::Immortal => output.push_byte(0),
+			Self::Mortal(period, phase) => {
 				let quantize_factor = (*period as u64 >> 12).max(1);
 				let encoded = (period.trailing_zeros() - 1).max(1).min(15) as u16 | ((phase / quantize_factor) << 4) as u16;
 				encoded.encode_to(output);
@@ -125,14 +122,14 @@ impl Decode for Era {
 	fn decode<I: Input>(input: &mut I) -> Result<Self, Error> {
 		let first = input.read_byte()?;
 		if first == 0 {
-			Ok(Era::Immortal)
+			Ok(Self::Immortal)
 		} else {
 			let encoded = first as u64 + ((input.read_byte()? as u64) << 8);
 			let period = 2 << (encoded % (1 << 4));
 			let quantize_factor = (period >> 12).max(1);
 			let phase = (encoded >> 4) * quantize_factor;
 			if period >= 4 && phase < period {
-				Ok(Era::Mortal(period, phase))
+				Ok(Self::Mortal(period, phase))
 			} else {
 				Err("Invalid period and phase".into())
 			}
diff --git a/primitives/runtime/src/generic/header.rs b/primitives/runtime/src/generic/header.rs
index 62f9908fbe58..69c5f5079688 100644
--- a/primitives/runtime/src/generic/header.rs
+++ b/primitives/runtime/src/generic/header.rs
@@ -91,7 +91,7 @@ impl<Number, Hash> Decode for Header<Number, Hash> where
 	Hash::Output: Decode,
 {
 	fn decode<I: Input>(input: &mut I) -> Result<Self, Error> {
-		Ok(Header {
+		Ok(Self {
 			parent_hash: Decode::decode(input)?,
 			number: <<Number as HasCompact>::Type>::decode(input)?.into(),
 			state_root: Decode::decode(input)?,
@@ -160,7 +160,7 @@ impl<Number, Hash> traits::Header for Header<Number, Hash> where
 		parent_hash: Self::Hash,
 		digest: Digest<Self::Hash>,
 	) -> Self {
-		Header {
+		Self {
 			number,
 			extrinsics_root,
 			state_root,
diff --git a/primitives/runtime/src/generic/unchecked_extrinsic.rs b/primitives/runtime/src/generic/unchecked_extrinsic.rs
index 5c87d2715509..d6164d0b51cc 100644
--- a/primitives/runtime/src/generic/unchecked_extrinsic.rs
+++ b/primitives/runtime/src/generic/unchecked_extrinsic.rs
@@ -70,7 +70,7 @@ impl<Address, Call, Signature, Extra: SignedExtension>
 		signature: Signature,
 		extra: Extra
 	) -> Self {
-		UncheckedExtrinsic {
+		Self {
 			signature: Some((signed, signature, extra)),
 			function,
 		}
@@ -78,7 +78,7 @@ impl<Address, Call, Signature, Extra: SignedExtension>
 
 	/// New instance of an unsigned extrinsic aka "inherent".
 	pub fn new_unsigned(function: Call) -> Self {
-		UncheckedExtrinsic {
+		Self {
 			signature: None,
 			function,
 		}
@@ -102,9 +102,9 @@ impl<Address, Call, Signature, Extra: SignedExtension> Extrinsic
 
 	fn new(function: Call, signed_data: Option<Self::SignaturePayload>) -> Option<Self> {
 		Some(if let Some((address, signature, extra)) = signed_data {
-			UncheckedExtrinsic::new_signed(function, address, signature, extra)
+			Self::new_signed(function, address, signature, extra)
 		} else {
-			UncheckedExtrinsic::new_unsigned(function)
+			Self::new_unsigned(function)
 		})
 	}
 }
@@ -238,7 +238,7 @@ where
 			return Err("Invalid transaction version".into());
 		}
 
-		Ok(UncheckedExtrinsic {
+		Ok(Self {
 			signature: if is_signed { Some(Decode::decode(input)?) } else { None },
 			function: Decode::decode(input)?,
 		})
@@ -327,7 +327,7 @@ where
 	Extra: SignedExtension,
 {
 	fn from(extrinsic: UncheckedExtrinsic<Address, Call, Signature, Extra>) -> Self {
-		OpaqueExtrinsic::from_bytes(extrinsic.encode().as_slice())
+		Self::from_bytes(extrinsic.encode().as_slice())
 			.expect(
 				"both OpaqueExtrinsic and UncheckedExtrinsic have encoding that is compatible with \
 				raw Vec<u8> encoding; qed"
diff --git a/primitives/runtime/src/lib.rs b/primitives/runtime/src/lib.rs
index 59d78bb89642..9f900bef9b10 100644
--- a/primitives/runtime/src/lib.rs
+++ b/primitives/runtime/src/lib.rs
@@ -245,7 +245,7 @@ pub enum MultiSignature {
 
 impl From<ed25519::Signature> for MultiSignature {
 	fn from(x: ed25519::Signature) -> Self {
-		MultiSignature::Ed25519(x)
+		Self::Ed25519(x)
 	}
 }
 
@@ -258,7 +258,7 @@ impl TryFrom<MultiSignature> for ed25519::Signature {
 
 impl From<sr25519::Signature> for MultiSignature {
 	fn from(x: sr25519::Signature) -> Self {
-		MultiSignature::Sr25519(x)
+		Self::Sr25519(x)
 	}
 }
 
@@ -271,7 +271,7 @@ impl TryFrom<MultiSignature> for sr25519::Signature {
 
 impl From<ecdsa::Signature> for MultiSignature {
 	fn from(x: ecdsa::Signature) -> Self {
-		MultiSignature::Ecdsa(x)
+		Self::Ecdsa(x)
 	}
 }
 
@@ -284,7 +284,7 @@ impl TryFrom<MultiSignature> for ecdsa::Signature {
 
 impl Default for MultiSignature {
 	fn default() -> Self {
-		MultiSignature::Ed25519(Default::default())
+		Self::Ed25519(Default::default())
 	}
 }
 
@@ -302,7 +302,7 @@ pub enum MultiSigner {
 
 impl Default for MultiSigner {
 	fn default() -> Self {
-		MultiSigner::Ed25519(Default::default())
+		Self::Ed25519(Default::default())
 	}
 }
 
@@ -317,9 +317,9 @@ impl<T: Into<H256>> crypto::UncheckedFrom<T> for MultiSigner {
 impl AsRef<[u8]> for MultiSigner {
 	fn as_ref(&self) -> &[u8] {
 		match *self {
-			MultiSigner::Ed25519(ref who) => who.as_ref(),
-			MultiSigner::Sr25519(ref who) => who.as_ref(),
-			MultiSigner::Ecdsa(ref who) => who.as_ref(),
+			Self::Ed25519(ref who) => who.as_ref(),
+			Self::Sr25519(ref who) => who.as_ref(),
+			Self::Ecdsa(ref who) => who.as_ref(),
 		}
 	}
 }
@@ -328,16 +328,16 @@ impl traits::IdentifyAccount for MultiSigner {
 	type AccountId = AccountId32;
 	fn into_account(self) -> AccountId32 {
 		match self {
-			MultiSigner::Ed25519(who) => <[u8; 32]>::from(who).into(),
-			MultiSigner::Sr25519(who) => <[u8; 32]>::from(who).into(),
-			MultiSigner::Ecdsa(who) => sp_io::hashing::blake2_256(&who.as_ref()[..]).into(),
+			Self::Ed25519(who) => <[u8; 32]>::from(who).into(),
+			Self::Sr25519(who) => <[u8; 32]>::from(who).into(),
+			Self::Ecdsa(who) => sp_io::hashing::blake2_256(who.as_ref()).into(),
 		}
 	}
 }
 
 impl From<ed25519::Public> for MultiSigner {
 	fn from(x: ed25519::Public) -> Self {
-		MultiSigner::Ed25519(x)
+		Self::Ed25519(x)
 	}
 }
 
@@ -350,7 +350,7 @@ impl TryFrom<MultiSigner> for ed25519::Public {
 
 impl From<sr25519::Public> for MultiSigner {
 	fn from(x: sr25519::Public) -> Self {
-		MultiSigner::Sr25519(x)
+		Self::Sr25519(x)
 	}
 }
 
@@ -363,7 +363,7 @@ impl TryFrom<MultiSigner> for sr25519::Public {
 
 impl From<ecdsa::Public> for MultiSigner {
 	fn from(x: ecdsa::Public) -> Self {
-		MultiSigner::Ecdsa(x)
+		Self::Ecdsa(x)
 	}
 }
 
@@ -378,9 +378,9 @@ impl TryFrom<MultiSigner> for ecdsa::Public {
 impl std::fmt::Display for MultiSigner {
 	fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {
 		match *self {
-			MultiSigner::Ed25519(ref who) => write!(fmt, "ed25519: {}", who),
-			MultiSigner::Sr25519(ref who) => write!(fmt, "sr25519: {}", who),
-			MultiSigner::Ecdsa(ref who) => write!(fmt, "ecdsa: {}", who),
+			Self::Ed25519(ref who) => write!(fmt, "ed25519: {}", who),
+			Self::Sr25519(ref who) => write!(fmt, "sr25519: {}", who),
+			Self::Ecdsa(ref who) => write!(fmt, "ecdsa: {}", who),
 		}
 	}
 }
@@ -389,9 +389,9 @@ impl Verify for MultiSignature {
 	type Signer = MultiSigner;
 	fn verify<L: Lazy<[u8]>>(&self, mut msg: L, signer: &AccountId32) -> bool {
 		match (self, signer) {
-			(MultiSignature::Ed25519(ref sig), who) => sig.verify(msg, &ed25519::Public::from_slice(who.as_ref())),
-			(MultiSignature::Sr25519(ref sig), who) => sig.verify(msg, &sr25519::Public::from_slice(who.as_ref())),
-			(MultiSignature::Ecdsa(ref sig), who) => {
+			(Self::Ed25519(ref sig), who) => sig.verify(msg, &ed25519::Public::from_slice(who.as_ref())),
+			(Self::Sr25519(ref sig), who) => sig.verify(msg, &sr25519::Public::from_slice(who.as_ref())),
+			(Self::Ecdsa(ref sig), who) => {
 				let m = sp_io::hashing::blake2_256(msg.get());
 				match sp_io::crypto::secp256k1_ecdsa_recover_compressed(sig.as_ref(), &m) {
 					Ok(pubkey) =>
@@ -424,13 +424,13 @@ impl Verify for AnySignature {
 
 impl From<sr25519::Signature> for AnySignature {
 	fn from(s: sr25519::Signature) -> Self {
-		AnySignature(s.into())
+		Self(s.into())
 	}
 }
 
 impl From<ed25519::Signature> for AnySignature {
 	fn from(s: ed25519::Signature) -> Self {
-		AnySignature(s.into())
+		Self(s.into())
 	}
 }
 
@@ -573,13 +573,13 @@ impl From<TokenError> for &'static str {
 
 impl From<TokenError> for DispatchError {
 	fn from(e: TokenError) -> DispatchError {
-		DispatchError::Token(e)
+		Self::Token(e)
 	}
 }
 
 impl From<&'static str> for DispatchError {
 	fn from(err: &'static str) -> DispatchError {
-		DispatchError::Other(err)
+		Self::Other(err)
 	}
 }
 
@@ -764,7 +764,7 @@ pub struct OpaqueExtrinsic(Vec<u8>);
 impl OpaqueExtrinsic {
 	/// Convert an encoded extrinsic to an `OpaqueExtrinsic`.
 	pub fn from_bytes(mut bytes: &[u8]) -> Result<Self, codec::Error> {
-		OpaqueExtrinsic::decode(&mut bytes)
+		Self::decode(&mut bytes)
 	}
 }
 
@@ -787,7 +787,6 @@ impl sp_std::fmt::Debug for OpaqueExtrinsic {
 	}
 }
 
-
 #[cfg(feature = "std")]
 impl ::serde::Serialize for OpaqueExtrinsic {
 	fn serialize<S>(&self, seq: S) -> Result<S::Ok, S::Error> where S: ::serde::Serializer {
@@ -814,7 +813,6 @@ pub fn print(print: impl traits::Printable) {
 	print.print();
 }
 
-
 /// Batching session.
 ///
 /// To be used in runtime only. Outside of runtime, just construct
@@ -947,7 +945,6 @@ mod tests {
 		assert!(multi_sig.verify(msg, &multi_signer.into_account()));
 	}
 
-
 	#[test]
 	#[should_panic(expected = "Signature verification has not been called")]
 	fn batching_still_finishes_when_not_called_directly() {
diff --git a/primitives/runtime/src/multiaddress.rs b/primitives/runtime/src/multiaddress.rs
index d09cd7acaf4d..e1a4c81a5f9a 100644
--- a/primitives/runtime/src/multiaddress.rs
+++ b/primitives/runtime/src/multiaddress.rs
@@ -45,9 +45,9 @@ where
 	fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
 		use sp_core::hexdisplay::HexDisplay;
 		match self {
-			MultiAddress::Raw(inner) => write!(f, "MultiAddress::Raw({})", HexDisplay::from(inner)),
-			MultiAddress::Address32(inner) => write!(f, "MultiAddress::Address32({})", HexDisplay::from(inner)),
-			MultiAddress::Address20(inner) => write!(f, "MultiAddress::Address20({})", HexDisplay::from(inner)),
+			Self::Raw(inner) => write!(f, "MultiAddress::Raw({})", HexDisplay::from(inner)),
+			Self::Address32(inner) => write!(f, "MultiAddress::Address32({})", HexDisplay::from(inner)),
+			Self::Address20(inner) => write!(f, "MultiAddress::Address20({})", HexDisplay::from(inner)),
 			_ => write!(f, "{:?}", self),
 		}
 	}
@@ -55,12 +55,12 @@ where
 
 impl<AccountId, AccountIndex> From<AccountId> for MultiAddress<AccountId, AccountIndex> {
 	fn from(a: AccountId) -> Self {
-		MultiAddress::Id(a)
+		Self::Id(a)
 	}
 }
 
 impl<AccountId: Default, AccountIndex> Default for MultiAddress<AccountId, AccountIndex> {
 	fn default() -> Self {
-		MultiAddress::Id(Default::default())
+		Self::Id(Default::default())
 	}
 }
diff --git a/primitives/runtime/src/offchain/storage_lock.rs b/primitives/runtime/src/offchain/storage_lock.rs
index 1529de4ab591..4bb979967843 100644
--- a/primitives/runtime/src/offchain/storage_lock.rs
+++ b/primitives/runtime/src/offchain/storage_lock.rs
@@ -158,7 +158,7 @@ impl<B: BlockNumberProvider> Clone for BlockAndTimeDeadline<B> {
 	fn clone(&self) -> Self {
 		Self {
 			block_number: self.block_number.clone(),
-			timestamp: self.timestamp.clone(),
+			timestamp: self.timestamp,
 		}
 	}
 }
@@ -202,7 +202,7 @@ impl<B: BlockNumberProvider> Default for BlockAndTime<B> {
 impl<B: BlockNumberProvider> Clone for BlockAndTime<B> {
 	fn clone(&self) -> Self {
 		Self {
-			expiration_block_number_offset: self.expiration_block_number_offset.clone(),
+			expiration_block_number_offset: self.expiration_block_number_offset,
 			expiration_duration: self.expiration_duration,
 			_phantom: core::marker::PhantomData::<B>,
 		}
@@ -386,7 +386,7 @@ impl<'a> StorageLock<'a, Time> {
 		Self {
 			value_ref: StorageValueRef::<'a>::persistent(key),
 			lockable: Time {
-				expiration_duration: expiration_duration,
+				expiration_duration,
 			},
 		}
 	}
diff --git a/primitives/runtime/src/traits.rs b/primitives/runtime/src/traits.rs
index 128c9a6eed0a..2c4572ac3511 100644
--- a/primitives/runtime/src/traits.rs
+++ b/primitives/runtime/src/traits.rs
@@ -19,7 +19,6 @@
 
 use sp_std::prelude::*;
 use sp_std::{self, marker::PhantomData, convert::{TryFrom, TryInto}, fmt::Debug};
-use sp_io;
 #[cfg(feature = "std")]
 use std::fmt::Display;
 #[cfg(feature = "std")]
@@ -111,7 +110,7 @@ impl Verify for sp_core::ecdsa::Signature {
 			self.as_ref(),
 			&sp_io::hashing::blake2_256(msg.get()),
 		) {
-			Ok(pubkey) => &signer.as_ref()[..] == &pubkey[..],
+			Ok(pubkey) => signer.as_ref() == &pubkey[..],
 			_ => false,
 		}
 	}
diff --git a/primitives/runtime/src/transaction_validity.rs b/primitives/runtime/src/transaction_validity.rs
index b0c3e4dd031c..0ee4b4861204 100644
--- a/primitives/runtime/src/transaction_validity.rs
+++ b/primitives/runtime/src/transaction_validity.rs
@@ -81,18 +81,12 @@ pub enum InvalidTransaction {
 impl InvalidTransaction {
 	/// Returns if the reason for the invalidity was block resource exhaustion.
 	pub fn exhausted_resources(&self) -> bool {
-		match self {
-			Self::ExhaustsResources => true,
-			_ => false,
-		}
+		matches!(self, Self::ExhaustsResources)
 	}
 
 	/// Returns if the reason for the invalidity was a mandatory call failing.
 	pub fn was_mandatory(&self) -> bool {
-		match self {
-			Self::BadMandatory => true,
-			_ => false,
-		}
+		matches!(self, Self::BadMandatory)
 	}
 }
 
@@ -209,15 +203,15 @@ impl std::fmt::Display for TransactionValidityError {
 /// Information on a transaction's validity and, if valid, on how it relates to other transactions.
 pub type TransactionValidity = Result<ValidTransaction, TransactionValidityError>;
 
-impl Into<TransactionValidity> for InvalidTransaction {
-	fn into(self) -> TransactionValidity {
-		Err(self.into())
+impl From<InvalidTransaction> for TransactionValidity {
+	fn from(invalid_transaction: InvalidTransaction) -> Self {
+		Err(TransactionValidityError::Invalid(invalid_transaction))
 	}
 }
 
-impl Into<TransactionValidity> for UnknownTransaction {
-	fn into(self) -> TransactionValidity {
-		Err(self.into())
+impl From<UnknownTransaction> for TransactionValidity {
+	fn from(unknown_transaction: UnknownTransaction) -> Self {
+		Err(TransactionValidityError::Unknown(unknown_transaction))
 	}
 }
 
@@ -285,7 +279,7 @@ pub struct ValidTransaction {
 
 impl Default for ValidTransaction {
 	fn default() -> Self {
-		ValidTransaction {
+		Self {
 			priority: 0,
 			requires: vec![],
 			provides: vec![],
@@ -311,7 +305,7 @@ impl ValidTransaction {
 	/// `provides` and `requires` tags, it will sum the priorities, take the minimum longevity and
 	/// the logic *And* of the propagate flags.
 	pub fn combine_with(mut self, mut other: ValidTransaction) -> Self {
-		ValidTransaction {
+		Self {
 			priority: self.priority.saturating_add(other.priority),
 			requires: { self.requires.append(&mut other.requires); self.requires },
 			provides: { self.provides.append(&mut other.provides); self.provides },

From d5f992fc3987301c67c1deccb1bbdccc8ae63cea Mon Sep 17 00:00:00 2001
From: Alexander Popiak <alexander.popiak@parity.io>
Date: Tue, 6 Apr 2021 12:09:04 +0200
Subject: [PATCH 0602/1194] add more notes on changing epoch duration (#8491)

* add more notes on changing epoch duration

* add note about changing slot duration
---
 bin/node-template/runtime/src/lib.rs | 2 ++
 bin/node/runtime/src/constants.rs    | 4 ++++
 bin/node/runtime/src/lib.rs          | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index 1453b54309e6..d72a558e1dd2 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -117,6 +117,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 /// Change this to adjust the block time.
 pub const MILLISECS_PER_BLOCK: u64 = 6000;
 
+// NOTE: Currently it is not possible to change the slot duration after the chain has started.
+//       Attempting to do so will brick block production.
 pub const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK;
 
 // Time is measured by number of blocks.
diff --git a/bin/node/runtime/src/constants.rs b/bin/node/runtime/src/constants.rs
index c549b1977d37..2f6ad002a928 100644
--- a/bin/node/runtime/src/constants.rs
+++ b/bin/node/runtime/src/constants.rs
@@ -54,11 +54,15 @@ pub mod time {
 	pub const MILLISECS_PER_BLOCK: Moment = 3000;
 	pub const SECS_PER_BLOCK: Moment = MILLISECS_PER_BLOCK / 1000;
 
+	// NOTE: Currently it is not possible to change the slot duration after the chain has started.
+	//       Attempting to do so will brick block production.
 	pub const SLOT_DURATION: Moment = MILLISECS_PER_BLOCK;
 
 	// 1 in 4 blocks (on average, not counting collisions) will be primary BABE blocks.
 	pub const PRIMARY_PROBABILITY: (u64, u64) = (1, 4);
 
+	// NOTE: Currently it is not possible to change the epoch duration after the chain has started.
+	//       Attempting to do so will brick block production.
 	pub const EPOCH_DURATION_IN_BLOCKS: BlockNumber = 10 * MINUTES;
 	pub const EPOCH_DURATION_IN_SLOTS: u64 = {
 		const SLOT_FILL_RATE: f64 = MILLISECS_PER_BLOCK as f64 / SLOT_DURATION as f64;
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 2d763979c7b9..448867b25cb1 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -326,6 +326,8 @@ impl pallet_scheduler::Config for Runtime {
 }
 
 parameter_types! {
+	// NOTE: Currently it is not possible to change the epoch duration after the chain has started.
+	//       Attempting to do so will brick block production.
 	pub const EpochDuration: u64 = EPOCH_DURATION_IN_SLOTS;
 	pub const ExpectedBlockTime: Moment = MILLISECS_PER_BLOCK;
 	pub const ReportLongevity: u64 =

From 1a6f537e7bb384e1a2724e5ec0e31309896ffcb4 Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Tue, 6 Apr 2021 14:04:32 +0300
Subject: [PATCH 0603/1194] Revert storage cache optimization (#8535)

* Revert "Fixes `storage_hash` caching issue and enables better caching for Cumulus (#8518)"

This reverts commit 85eef08bf23453a06758acbb4b17068ca982b8a2.

* Fix reverting storage_hash

* Restore test
---
 client/db/src/storage_cache.rs | 401 +++++++++++----------------------
 1 file changed, 130 insertions(+), 271 deletions(-)

diff --git a/client/db/src/storage_cache.rs b/client/db/src/storage_cache.rs
index 37c7c253f59e..8929972e26e6 100644
--- a/client/db/src/storage_cache.rs
+++ b/client/db/src/storage_cache.rs
@@ -25,6 +25,7 @@ use std::sync::Arc;
 use std::hash::Hash as StdHash;
 use parking_lot::{Mutex, RwLock, RwLockUpgradableReadGuard};
 use linked_hash_map::{LinkedHashMap, Entry};
+use hash_db::Hasher;
 use sp_runtime::traits::{Block as BlockT, Header, HashFor, NumberFor};
 use sp_core::hexdisplay::HexDisplay;
 use sp_core::storage::ChildInfo;
@@ -49,8 +50,6 @@ pub struct Cache<B: BlockT> {
 	lru_child_storage: LRUMap<ChildStorageKey, Option<StorageValue>>,
 	/// Information on the modifications in recently committed blocks; specifically which keys
 	/// changed in which block. Ordered by block number.
-	///
-	/// The latest committed block is always at the front.
 	modifications: VecDeque<BlockChanges<B::Header>>,
 }
 
@@ -200,6 +199,7 @@ impl<B: BlockT> Cache<B> {
 					for a in &m.storage {
 						trace!("Retracted key {:?}", HexDisplay::from(a));
 						self.lru_storage.remove(a);
+						self.lru_hashes.remove(a);
 					}
 					for a in &m.child_storage {
 						trace!("Retracted child key {:?}", a);
@@ -220,27 +220,6 @@ impl<B: BlockT> Cache<B> {
 			self.modifications.clear();
 		}
 	}
-
-	fn add_modifications(&mut self, block_changes: BlockChanges<B::Header>) {
-		let insert_at = self.modifications.iter()
-			.enumerate()
-			.find(|(_, m)| m.number < block_changes.number)
-			.map(|(i, _)| i);
-
-		trace!("Inserting modifications at {:?}", insert_at);
-		if let Some(insert_at) = insert_at {
-			self.modifications.insert(insert_at, block_changes);
-		} else {
-			self.modifications.push_back(block_changes);
-		}
-	}
-
-	/// Returns if this is the first modification at the given block height.
-	///
-	/// If there already exists a modification for a higher block height, `false` is returned.
-	fn has_no_modification_at_block_height(&self, number: NumberFor<B>) -> bool {
-		self.modifications.get(0).map(|c| c.number < number).unwrap_or(true)
-	}
 }
 
 pub type SharedCache<B> = Arc<Mutex<Cache<B>>>;
@@ -270,15 +249,15 @@ pub fn new_shared_cache<B: BlockT>(
 	)
 }
 
-/// Accumulates a list of storage changed in a block.
 #[derive(Debug)]
-struct BlockChanges<H: Header> {
+/// Accumulates a list of storage changed in a block.
+struct BlockChanges<B: Header> {
 	/// Block number.
-	number: H::Number,
+	number: B::Number,
 	/// Block hash.
-	hash: H::Hash,
+	hash: B::Hash,
 	/// Parent block hash.
-	parent: H::Hash,
+	parent: B::Hash,
 	/// A set of modified storage keys.
 	storage: HashSet<StorageKey>,
 	/// A set of modified child storage keys.
@@ -288,7 +267,7 @@ struct BlockChanges<H: Header> {
 }
 
 /// Cached values specific to a state.
-struct LocalCache<B: BlockT> {
+struct LocalCache<H: Hasher> {
 	/// Storage cache.
 	///
 	/// `None` indicates that key is known to be missing.
@@ -296,41 +275,19 @@ struct LocalCache<B: BlockT> {
 	/// Storage hashes cache.
 	///
 	/// `None` indicates that key is known to be missing.
-	hashes: HashMap<StorageKey, Option<B::Hash>>,
+	hashes: HashMap<StorageKey, Option<H::Out>>,
 	/// Child storage cache.
 	///
 	/// `None` indicates that key is known to be missing.
 	child_storage: HashMap<ChildStorageKey, Option<StorageValue>>,
 }
 
-impl<B: BlockT> LocalCache<B> {
-	/// Commit all cached values to the given shared `Cache`.
-	///
-	/// After calling this method, the internal state is reset.
-	fn commit_to(&mut self, cache: &mut Cache<B>) {
-		trace!(
-			"Committing {} local, {} hashes to shared cache",
-			self.storage.len(),
-			self.hashes.len(),
-		);
-		for (k, v) in self.storage.drain() {
-			cache.lru_storage.add(k, v);
-		}
-		for (k, v) in self.child_storage.drain() {
-			cache.lru_child_storage.add(k, v);
-		}
-		for (k, v) in self.hashes.drain() {
-			cache.lru_hashes.add(k, OptionHOut(v));
-		}
-	}
-}
-
 /// Cache changes.
 pub struct CacheChanges<B: BlockT> {
 	/// Shared canonical state cache.
 	shared_cache: SharedCache<B>,
 	/// Local cache of values for this state.
-	local_cache: RwLock<LocalCache<B>>,
+	local_cache: RwLock<LocalCache<HashFor<B>>>,
 	/// Hash of the block on top of which this instance was created or
 	/// `None` if cache is disabled
 	pub parent_hash: Option<B::Hash>,
@@ -396,105 +353,90 @@ impl<B: BlockT> CacheChanges<B> {
 			.cloned()
 			.collect();
 
-		let has_no_modification_at_block_height = if let Some(num) = commit_number {
-			cache.has_no_modification_at_block_height(num)
-		} else {
-			false
-		};
-
 		let mut retracted = std::borrow::Cow::Borrowed(retracted);
-		let (update_cache, modification_index) = if let Some((i, m)) = commit_hash
-			.as_ref()
-			.and_then(|ch| cache.modifications.iter_mut().enumerate().find(|m| &m.1.hash == ch))
-		{
-			let res = if m.is_canon != is_best {
-				if is_best && i == 0 {
-					// The block was imported as the first block of a height as non-best block.
-					// Now it is enacted as best block and we need to update the modifications with
-					// these informations.
-					m.is_canon = is_best;
-
-					// If this is the best block now and also the latest we have imported,
-					// we only need to update the cache if there are any new changes.
-					!changes.is_empty() || !child_changes.is_empty()
-				} else if is_best {
-					enacted.push(m.hash.clone());
-					true
-				} else {
-					retracted.to_mut().push(m.hash.clone());
-					true
+		if let Some(commit_hash) = &commit_hash {
+			if let Some(m) = cache.modifications.iter_mut().find(|m| &m.hash == commit_hash) {
+				if m.is_canon != is_best {
+					// Same block comitted twice with different state changes.
+					// Treat it as reenacted/retracted.
+					if is_best {
+						enacted.push(commit_hash.clone());
+					} else {
+						retracted.to_mut().push(commit_hash.clone());
+					}
 				}
-			} else {
-				true
-			};
-
-			(res, Some(i))
-		} else {
-			(true, None)
-		};
-
-		cache.sync(&enacted, &retracted);
-
-		if let (Some(ref parent_hash), true) = (self.parent_hash, update_cache) {
-			let commit_to_shared_cache = is_best || has_no_modification_at_block_height;
-			// Propagate cache only if committing on top of the latest canonical state
-			// blocks are ordered by number and only one block with a given number is
-			// marked as canonical (contributed to canonical state cache)
-			if commit_to_shared_cache {
-				self.local_cache.write().commit_to(cache);
 			}
-
-			if let (Some(ref number), Some(hash)) = (commit_number, commit_hash) {
-				if commit_to_shared_cache {
-					trace!(
-						"Committing {} modified root entries, {} modified child entries to shared cache",
-						changes.len(),
-						child_changes.iter().map(|v|v.1.len()).sum::<usize>(),
-					);
+		}
+		cache.sync(&enacted, &retracted);
+		// Propagate cache only if committing on top of the latest canonical state
+		// blocks are ordered by number and only one block with a given number is marked as canonical
+		// (contributed to canonical state cache)
+		if let Some(_) = self.parent_hash {
+			let mut local_cache = self.local_cache.write();
+			if is_best {
+				trace!(
+					"Committing {} local, {} hashes, {} modified root entries, {} modified child entries",
+					local_cache.storage.len(),
+					local_cache.hashes.len(),
+					changes.len(),
+					child_changes.iter().map(|v|v.1.len()).sum::<usize>(),
+				);
+				for (k, v) in local_cache.storage.drain() {
+					cache.lru_storage.add(k, v);
 				}
-
-				if cache.modifications.len() == STATE_CACHE_BLOCKS {
-					cache.modifications.pop_back();
+				for (k, v) in local_cache.child_storage.drain() {
+					cache.lru_child_storage.add(k, v);
 				}
-				let mut modifications = HashSet::new();
-				let mut child_modifications = HashSet::new();
-				child_changes.into_iter().for_each(|(sk, changes)|
-					for (k, v) in changes.into_iter() {
-						let k = (sk.clone(), k);
-						if commit_to_shared_cache {
-							cache.lru_child_storage.add(k.clone(), v);
-						}
-						child_modifications.insert(k);
-					}
-				);
+				for (k, v) in local_cache.hashes.drain() {
+					cache.lru_hashes.add(k, OptionHOut(v));
+				}
+			}
+		}
+
+		if let (
+			Some(ref number), Some(ref hash), Some(ref parent))
+				= (commit_number, commit_hash, self.parent_hash)
+		{
+			if cache.modifications.len() == STATE_CACHE_BLOCKS {
+				cache.modifications.pop_back();
+			}
+			let mut modifications = HashSet::new();
+			let mut child_modifications = HashSet::new();
+			child_changes.into_iter().for_each(|(sk, changes)|
 				for (k, v) in changes.into_iter() {
-					if commit_to_shared_cache {
-						cache.lru_hashes.remove(&k);
-						cache.lru_storage.add(k.clone(), v);
+					let k = (sk.clone(), k);
+					if is_best {
+						cache.lru_child_storage.add(k.clone(), v);
 					}
-					modifications.insert(k);
+					child_modifications.insert(k);
 				}
-
-				if let Some(modification_index) = modification_index {
-					trace!("Modifying modifications at {}", modification_index);
-					// Only modify the already stored block changes.
-					let mut block_changes = &mut cache.modifications[modification_index];
-					block_changes.is_canon = is_best;
-					block_changes.storage.extend(modifications);
-					block_changes.child_storage.extend(child_modifications);
-				} else {
-					// Save modified storage. These are ordered by the block number in reverse.
-					let block_changes = BlockChanges {
-						storage: modifications,
-						child_storage: child_modifications,
-						number: *number,
-						hash,
-						is_canon: is_best,
-						parent: parent_hash.clone(),
-					};
-
-					cache.add_modifications(block_changes);
+			);
+			for (k, v) in changes.into_iter() {
+				if is_best {
+					cache.lru_hashes.remove(&k);
+					cache.lru_storage.add(k.clone(), v);
 				}
+				modifications.insert(k);
+			}
+
+			// Save modified storage. These are ordered by the block number in reverse.
+			let block_changes = BlockChanges {
+				storage: modifications,
+				child_storage: child_modifications,
+				number: *number,
+				hash: hash.clone(),
+				is_canon: is_best,
+				parent: parent.clone(),
+			};
+			let insert_at = cache.modifications.iter()
+				.enumerate()
+				.find(|(_, m)| m.number < *number)
+				.map(|(i, _)| i);
+			trace!("Inserting modifications at {:?}", insert_at);
+			if let Some(insert_at) = insert_at {
+				cache.modifications.insert(insert_at, block_changes);
+			} else {
+				cache.modifications.push_back(block_changes);
 			}
 		}
 	}
@@ -533,10 +475,7 @@ impl<S: StateBackend<HashFor<B>>, B: BlockT> CachingState<S, B> {
 	) -> bool {
 		let mut parent = match *parent_hash {
 			None => {
-				trace!(
-					"Cache lookup skipped for {:?}: no parent hash",
-					key.as_ref().map(HexDisplay::from),
-				);
+				trace!("Cache lookup skipped for {:?}: no parent hash", key.as_ref().map(HexDisplay::from));
 				return false;
 			}
 			Some(ref parent) => parent,
@@ -555,19 +494,13 @@ impl<S: StateBackend<HashFor<B>>, B: BlockT> CachingState<S, B> {
 			}
 			if let Some(key) = key {
 				if m.storage.contains(key) {
-					trace!(
-						"Cache lookup skipped for {:?}: modified in a later block",
-						HexDisplay::from(&key),
-					);
+					trace!("Cache lookup skipped for {:?}: modified in a later block", HexDisplay::from(&key));
 					return false;
 				}
 			}
 			if let Some(child_key) = child_key {
 				if m.child_storage.contains(child_key) {
-					trace!(
-						"Cache lookup skipped for {:?}: modified in a later block",
-						child_key,
-					);
+					trace!("Cache lookup skipped for {:?}: modified in a later block", child_key);
 					return false;
 				}
 			}
@@ -1254,6 +1187,47 @@ mod tests {
 		assert_eq!(s.storage(&key).unwrap().unwrap(), vec![2]);
 	}
 
+	#[test]
+	fn reverts_storage_hash() {
+		let root_parent = H256::random();
+		let key = H256::random()[..].to_vec();
+		let h1a = H256::random();
+		let h1b = H256::random();
+
+		let shared = new_shared_cache::<Block>(256*1024, (0,1));
+		let mut backend = InMemoryBackend::<BlakeTwo256>::default();
+		backend.insert(std::iter::once((None, vec![(key.clone(), Some(vec![1]))])));
+
+		let mut s = CachingState::new(
+			backend.clone(),
+			shared.clone(),
+			Some(root_parent),
+		);
+		s.cache.sync_cache(
+			&[],
+			&[],
+			vec![(key.clone(), Some(vec![2]))],
+			vec![],
+			Some(h1a),
+			Some(1),
+			true,
+		);
+
+		let mut s = CachingState::new(
+			backend.clone(),
+			shared.clone(),
+			Some(root_parent),
+		);
+		s.cache.sync_cache(&[], &[h1a], vec![], vec![], Some(h1b), Some(1), true);
+
+		let s = CachingState::new(
+			backend.clone(),
+			shared.clone(),
+			Some(h1b),
+		);
+		assert_eq!(s.storage_hash(&key).unwrap().unwrap(), BlakeTwo256::hash(&vec![1]));
+	}
+
 	#[test]
 	fn should_track_used_size_correctly() {
 		let root_parent = H256::random();
@@ -1447,7 +1421,7 @@ mod tests {
 			false,
 		);
 
-		assert_eq!(shared.lock().lru_storage.get(&key).unwrap(), &Some(vec![2]));
+		assert_eq!(shared.lock().lru_storage.get(&key).unwrap(), &Some(vec![1]));
 
 		let mut s = CachingState::new(
 			InMemoryBackend::<BlakeTwo256>::default(),
@@ -1467,121 +1441,6 @@ mod tests {
 		);
 		assert_eq!(s.storage(&key).unwrap(), None);
 	}
-
-	#[test]
-	fn import_multiple_forks_as_non_best_caches_first_fork() {
-		sp_tracing::try_init_simple();
-
-		let root_parent = H256::random();
-		let key = H256::random()[..].to_vec();
-		let h1 = H256::random();
-		let h2a = H256::random();
-		let h2b = H256::random();
-		let h2c = H256::random();
-
-		for (commit_as_best, cached_value) in vec![(h2a, Some(vec![2])), (h2b, None), (h2c, None)] {
-			let shared = new_shared_cache::<Block>(256*1024, (0,1));
-
-			let mut s = CachingState::new(
-				InMemoryBackend::<BlakeTwo256>::default(),
-				shared.clone(),
-				Some(root_parent),
-			);
-			s.cache.sync_cache(
-				&[],
-				&[],
-				vec![(key.clone(), Some(vec![1]))],
-				vec![],
-				Some(h1),
-				Some(1),
-				true,
-			);
-			assert_eq!(shared.lock().lru_storage.get(&key).unwrap(), &Some(vec![1]));
-
-			{
-				let mut s = CachingState::new(
-					InMemoryBackend::<BlakeTwo256>::default(),
-					shared.clone(),
-					Some(h1),
-				);
-
-				// commit all forks as non-best
-				s.cache.sync_cache(
-					&[],
-					&[],
-					vec![(key.clone(), Some(vec![2]))],
-					vec![],
-					Some(h2a),
-					Some(2),
-					false,
-				);
-			}
-
-			{
-				let mut s = CachingState::new(
-					InMemoryBackend::<BlakeTwo256>::default(),
-					shared.clone(),
-					Some(h1),
-				);
-
-				s.cache.sync_cache(
-					&[],
-					&[],
-					vec![(key.clone(), Some(vec![3]))],
-					vec![],
-					Some(h2b),
-					Some(2),
-					false,
-				);
-			}
-
-			{
-				let mut s = CachingState::new(
-					InMemoryBackend::<BlakeTwo256>::default(),
-					shared.clone(),
-					Some(h1),
-				);
-
-				s.cache.sync_cache(
-					&[],
-					&[],
-					vec![(key.clone(), Some(vec![4]))],
-					vec![],
-					Some(h2c),
-					Some(2),
-					false,
-				);
-			}
-
-			// We should have the value of the first block cached.
-			assert_eq!(shared.lock().lru_storage.get(&key).unwrap(), &Some(vec![2]));
-
-			let mut s = CachingState::new(
-				InMemoryBackend::<BlakeTwo256>::default(),
-				shared.clone(),
-				Some(h1),
-			);
-
-			// commit again as best with no changes
-			s.cache.sync_cache(
-				&[],
-				&[],
-				vec![],
-				vec![],
-				Some(commit_as_best),
-				Some(2),
-				true,
-			);
-
-			let s = CachingState::new(
-				InMemoryBackend::<BlakeTwo256>::default(),
-				shared.clone(),
-				Some(commit_as_best),
-			);
-
-			assert_eq!(s.storage(&key).unwrap(), cached_value);
-		}
-	}
 }
 
 #[cfg(test)]

From 63f09f4085ad5f8a42bbacc60343ac6605463dc0 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Tue, 6 Apr 2021 14:35:12 +0200
Subject: [PATCH 0604/1194] Don't report confusing unsupported protocol errors
 (#8482)

---
 client/network/src/service.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 7e7f2689eb23..f8a3e2a7d394 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -1477,7 +1477,11 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 								let reason = match err {
 									ResponseFailure::Network(InboundFailure::Timeout) => "timeout",
 									ResponseFailure::Network(InboundFailure::UnsupportedProtocols) =>
-										"unsupported",
+										// `UnsupportedProtocols` is reported for every single
+										// inbound request whenever a request with an unsupported
+										// protocol is received. This is not reported in order to
+										// avoid confusions.
+										continue,
 									ResponseFailure::Network(InboundFailure::ResponseOmission) =>
 										"busy-omitted",
 									ResponseFailure::Network(InboundFailure::ConnectionClosed) =>

From 3362659a9d276469e67e83602c9485c7751b700c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 6 Apr 2021 15:08:04 +0200
Subject: [PATCH 0605/1194] Require `FullCodec` on frame_system::Call (#8540)

---
 frame/system/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index d8a50f9f7a18..536127e6726c 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -182,7 +182,7 @@ pub mod pallet {
 			+ OriginTrait<Call=Self::Call>;
 
 		/// The aggregated `Call` type.
-		type Call: Dispatchable + Debug;
+		type Call: Dispatchable + Debug + FullCodec;
 
 		/// Account index (aka nonce) type. This stores the number of previous transactions associated
 		/// with a sender account.

From a80b00aace8d1a3deaed127c3d5f2ea7d24f456d Mon Sep 17 00:00:00 2001
From: Vladimir Istyufeev <me@rcn.me>
Date: Tue, 6 Apr 2021 16:16:11 +0300
Subject: [PATCH 0606/1194] Add `check --features try-runtime` CI job (#8532)

---
 .gitlab-ci.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e9f17f54503f..81ff29d3249d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -238,6 +238,14 @@ cargo-check-subkey:
     - SKIP_WASM_BUILD=1 time cargo check --release
     - sccache -s
 
+cargo-check-try-runtime:
+  stage:                           test
+  <<:                              *docker-env
+  <<:                              *test-refs
+  script:
+    - time cargo check --features try-runtime
+    - sccache -s
+
 test-deterministic-wasm:
   stage:                           test
   <<:                              *docker-env

From 4973e7e933dfdefcfc32b88eeb83309787fa9f5f Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Tue, 6 Apr 2021 17:57:37 +0200
Subject: [PATCH 0607/1194] Fix account ref-counting in session (#8538)

* Fix account ref-counting in session.

* Avoid needless check

* fix compile

* put back in check and conversion

* Fix test to actually catch this error

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 frame/session/src/lib.rs   | 12 ++++++++----
 frame/session/src/tests.rs | 13 ++++++++-----
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs
index 3255bc20af4c..cbe70598a91b 100644
--- a/frame/session/src/lib.rs
+++ b/frame/session/src/lib.rs
@@ -750,11 +750,11 @@ impl<T: Config> Module<T> {
 		let who = T::ValidatorIdOf::convert(account.clone())
 			.ok_or(Error::<T>::NoAssociatedValidatorId)?;
 
-		frame_system::Pallet::<T>::inc_consumers(&account).map_err(|_| Error::<T>::NoAccount)?;
+		ensure!(frame_system::Pallet::<T>::can_inc_consumer(&account), Error::<T>::NoAccount);
 		let old_keys = Self::inner_set_keys(&who, keys)?;
-		if old_keys.is_some() {
-			let _ = frame_system::Pallet::<T>::dec_consumers(&account);
-			// ^^^ Defensive only; Consumers were incremented just before, so should never fail.
+		if old_keys.is_none() {
+			let assertion = frame_system::Pallet::<T>::inc_consumers(&account).is_ok();
+			debug_assert!(assertion, "can_inc_consumer() returned true; no change since; qed");
 		}
 
 		Ok(())
@@ -777,6 +777,10 @@ impl<T: Config> Module<T> {
 				Self::key_owner(*id, key).map_or(true, |owner| &owner == who),
 				Error::<T>::DuplicatedKey,
 			);
+		}
+
+		for id in T::Keys::key_ids() {
+			let key = keys.get_raw(*id);
 
 			if let Some(old) = old_keys.as_ref().map(|k| k.get_raw(*id)) {
 				if key == old {
diff --git a/frame/session/src/tests.rs b/frame/session/src/tests.rs
index a528b3293dac..f48388b5a002 100644
--- a/frame/session/src/tests.rs
+++ b/frame/session/src/tests.rs
@@ -18,8 +18,9 @@
 // Tests for the Session Pallet
 
 use super::*;
+use mock::Test;
 use codec::Decode;
-use frame_support::{traits::OnInitialize, assert_ok};
+use frame_support::{traits::OnInitialize, assert_ok, assert_noop};
 use sp_core::crypto::key_types::DUMMY;
 use sp_runtime::testing::UintAuthorityId;
 use mock::{
@@ -181,11 +182,14 @@ fn duplicates_are_not_allowed() {
 	new_test_ext().execute_with(|| {
 		System::set_block_number(1);
 		Session::on_initialize(1);
-		assert!(Session::set_keys(Origin::signed(4), UintAuthorityId(1).into(), vec![]).is_err());
-		assert!(Session::set_keys(Origin::signed(1), UintAuthorityId(10).into(), vec![]).is_ok());
+		assert_noop!(
+			Session::set_keys(Origin::signed(4), UintAuthorityId(1).into(), vec![]),
+			Error::<Test>::DuplicatedKey,
+		);
+		assert_ok!(Session::set_keys(Origin::signed(1), UintAuthorityId(10).into(), vec![]));
 
 		// is fine now that 1 has migrated off.
-		assert!(Session::set_keys(Origin::signed(4), UintAuthorityId(1).into(), vec![]).is_ok());
+		assert_ok!(Session::set_keys(Origin::signed(4), UintAuthorityId(1).into(), vec![]));
 	});
 }
 
@@ -357,7 +361,6 @@ fn return_true_if_more_than_third_is_disabled() {
 #[test]
 fn upgrade_keys() {
 	use frame_support::storage;
-	use mock::Test;
 	use sp_core::crypto::key_types::DUMMY;
 
 	// This test assumes certain mocks.

From 97f1b639df330f8a8b966362e34e4b720e8d7a32 Mon Sep 17 00:00:00 2001
From: Sergei Shulepov <sergei@parity.io>
Date: Tue, 6 Apr 2021 19:21:34 +0300
Subject: [PATCH 0608/1194] Opt-out from fast instance reuse and foundation for
 other refactorings (#8394)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Establish the runtime_blob module

Seed it with the existing contents of the `util` module.

* Port wasmtime mutable globals instrumentation into runtime blob APIs

* Opt-out from fast instance reuse

* Minor clean up

* Spaces

* Docs clean up

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Factor out the expects

* Fix the suggestion

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 Cargo.lock                                    |   1 +
 client/executor/common/Cargo.toml             |   1 +
 client/executor/common/src/lib.rs             |   2 +-
 .../data_segments_snapshot.rs}                |  55 +--
 .../src/runtime_blob/globals_snapshot.rs      | 110 ++++++
 .../executor/common/src/runtime_blob/mod.rs   |  57 ++++
 .../common/src/runtime_blob/runtime_blob.rs   |  93 +++++
 client/executor/src/wasm_runtime.rs           |  20 +-
 client/executor/wasmi/src/lib.rs              |   9 +-
 client/executor/wasmtime/src/imports.rs       |  32 +-
 .../executor/wasmtime/src/instance_wrapper.rs |  70 ++--
 .../src/instance_wrapper/globals_snapshot.rs  |  84 -----
 client/executor/wasmtime/src/lib.rs           |   7 +-
 client/executor/wasmtime/src/runtime.rs       | 319 ++++++++++++++----
 client/executor/wasmtime/src/util.rs          |  25 ++
 15 files changed, 596 insertions(+), 289 deletions(-)
 rename client/executor/common/src/{util.rs => runtime_blob/data_segments_snapshot.rs} (64%)
 create mode 100644 client/executor/common/src/runtime_blob/globals_snapshot.rs
 create mode 100644 client/executor/common/src/runtime_blob/mod.rs
 create mode 100644 client/executor/common/src/runtime_blob/runtime_blob.rs
 delete mode 100644 client/executor/wasmtime/src/instance_wrapper/globals_snapshot.rs

diff --git a/Cargo.lock b/Cargo.lock
index e5064b19a782..fc63b9d80bdf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7390,6 +7390,7 @@ dependencies = [
  "derive_more",
  "parity-scale-codec 2.0.1",
  "parity-wasm 0.41.0",
+ "pwasm-utils 0.14.0",
  "sp-allocator",
  "sp-core",
  "sp-serializer",
diff --git a/client/executor/common/Cargo.toml b/client/executor/common/Cargo.toml
index 7e13e37d33fb..95c090686e83 100644
--- a/client/executor/common/Cargo.toml
+++ b/client/executor/common/Cargo.toml
@@ -16,6 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 derive_more = "0.99.2"
 parity-wasm = "0.41.0"
+pwasm-utils = "0.14.0"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 wasmi = "0.6.2"
 sp-core = { version = "3.0.0", path = "../../../primitives/core" }
diff --git a/client/executor/common/src/lib.rs b/client/executor/common/src/lib.rs
index 050bad27d6c3..25e06314aba3 100644
--- a/client/executor/common/src/lib.rs
+++ b/client/executor/common/src/lib.rs
@@ -23,5 +23,5 @@
 
 pub mod error;
 pub mod sandbox;
-pub mod util;
 pub mod wasm_runtime;
+pub mod runtime_blob;
diff --git a/client/executor/common/src/util.rs b/client/executor/common/src/runtime_blob/data_segments_snapshot.rs
similarity index 64%
rename from client/executor/common/src/util.rs
rename to client/executor/common/src/runtime_blob/data_segments_snapshot.rs
index 5947be4469cd..3850ec6753be 100644
--- a/client/executor/common/src/util.rs
+++ b/client/executor/common/src/runtime_blob/data_segments_snapshot.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
@@ -16,53 +16,10 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-//! A set of utilities for resetting a wasm instance to its initial state.
-
 use crate::error::{self, Error};
+use super::RuntimeBlob;
 use std::mem;
-use parity_wasm::elements::{deserialize_buffer, DataSegment, Instruction, Module as RawModule};
-
-/// A bunch of information collected from a WebAssembly module.
-pub struct WasmModuleInfo {
-	raw_module: RawModule,
-}
-
-impl WasmModuleInfo {
-	/// Create `WasmModuleInfo` from the given wasm code.
-	///
-	/// Returns `None` if the wasm code cannot be deserialized.
-	pub fn new(wasm_code: &[u8]) -> Option<Self> {
-		let raw_module: RawModule = deserialize_buffer(wasm_code).ok()?;
-		Some(Self { raw_module })
-	}
-
-	/// Extract the data segments from the given wasm code.
-	///
-	/// Returns `Err` if the given wasm code cannot be deserialized.
-	fn data_segments(&self) -> Vec<DataSegment> {
-		self.raw_module
-			.data_section()
-			.map(|ds| ds.entries())
-			.unwrap_or(&[])
-			.to_vec()
-	}
-
-	/// The number of globals defined in locally in this module.
-	pub fn declared_globals_count(&self) -> u32 {
-		self.raw_module
-			.global_section()
-			.map(|gs| gs.entries().len() as u32)
-			.unwrap_or(0)
-	}
-
-	/// The number of imports of globals.
-	pub fn imported_globals_count(&self) -> u32 {
-		self.raw_module
-			.import_section()
-			.map(|is| is.globals() as u32)
-			.unwrap_or(0)
-	}
-}
+use parity_wasm::elements::Instruction;
 
 /// This is a snapshot of data segments specialzied for a particular instantiation.
 ///
@@ -75,7 +32,7 @@ pub struct DataSegmentsSnapshot {
 
 impl DataSegmentsSnapshot {
 	/// Create a snapshot from the data segments from the module.
-	pub fn take(module: &WasmModuleInfo) -> error::Result<Self> {
+	pub fn take(module: &RuntimeBlob) -> error::Result<Self> {
 		let data_segments = module
 			.data_segments()
 			.into_iter()
@@ -105,9 +62,7 @@ impl DataSegmentsSnapshot {
 						// if/when we gain those.
 						return Err(Error::ImportedGlobalsUnsupported);
 					}
-					insn => {
-						return Err(Error::InvalidInitializerExpression(format!("{:?}", insn)))
-					}
+					insn => return Err(Error::InvalidInitializerExpression(format!("{:?}", insn))),
 				};
 
 				Ok((offset, contents))
diff --git a/client/executor/common/src/runtime_blob/globals_snapshot.rs b/client/executor/common/src/runtime_blob/globals_snapshot.rs
new file mode 100644
index 000000000000..a43814e1d4e1
--- /dev/null
+++ b/client/executor/common/src/runtime_blob/globals_snapshot.rs
@@ -0,0 +1,110 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+use super::RuntimeBlob;
+
+/// Saved value of particular exported global.
+struct SavedValue<Global> {
+	/// The handle of this global which can be used to refer to this global.
+	handle: Global,
+	/// The global value that was observed during the snapshot creation.
+	value: sp_wasm_interface::Value,
+}
+
+/// An adapter for a wasm module instance that is focused on getting and setting globals.
+pub trait InstanceGlobals {
+	/// A handle to a global which can be used to get or set a global variable. This is supposed to
+	/// be a lightweight handle, like an index or an Rc-like smart-pointer, which is cheap to clone.
+	type Global: Clone;
+	/// Get a handle to a global by it's export name.
+	///
+	/// The requested export is must exist in the exported list, and it should be a mutable global.
+	fn get_global(&self, export_name: &str) -> Self::Global;
+	/// Get the current value of the global.
+	fn get_global_value(&self, global: &Self::Global) -> sp_wasm_interface::Value;
+	/// Update the current value of the global.
+	///
+	/// The global behind the handle is guaranteed to be mutable and the value to be the same type
+	/// as the global.
+	fn set_global_value(&self, global: &Self::Global, value: sp_wasm_interface::Value);
+}
+
+/// A set of exposed mutable globals.
+///
+/// This is set of globals required to create a [`GlobalsSnapshot`] and that are collected from
+/// a runtime blob that was instrumented by [`InstrumentModule::expose_mutable_globals`].
+///
+/// If the code wasn't instrumented then it would be empty and snapshot would do nothing.
+pub struct ExposedMutableGlobalsSet(Vec<String>);
+
+impl ExposedMutableGlobalsSet {
+	/// Collect the set from the given runtime blob. See the struct documentation for details.
+	pub fn collect(runtime_blob: &RuntimeBlob) -> Self {
+		let global_names = runtime_blob
+			.exported_internal_global_names()
+			.map(ToOwned::to_owned)
+			.collect();
+		Self(global_names)
+	}
+}
+
+/// A snapshot of a global variables values. This snapshot can be later used for restoring the
+/// values to the preserved state.
+///
+/// Technically, a snapshot stores only values of mutable global variables. This is because
+/// immutable global variables always have the same values.
+///
+/// We take it from an instance rather from a module because the start function could potentially
+/// change any of the mutable global values.
+pub struct GlobalsSnapshot<Global>(Vec<SavedValue<Global>>);
+
+impl<Global> GlobalsSnapshot<Global> {
+	/// Take a snapshot of global variables for a given instance.
+	///
+	/// # Panics
+	///
+	/// This function panics if the instance doesn't correspond to the module from which the
+	/// [`ExposedMutableGlobalsSet`] was collected.
+	pub fn take<Instance>(mutable_globals: &ExposedMutableGlobalsSet, instance: &Instance) -> Self
+	where
+		Instance: InstanceGlobals<Global = Global>,
+	{
+		let global_names = &mutable_globals.0;
+		let mut saved_values = Vec::with_capacity(global_names.len());
+
+		for global_name in global_names {
+			let handle = instance.get_global(global_name);
+			let value = instance.get_global_value(&handle);
+			saved_values.push(SavedValue { handle, value });
+		}
+
+		Self(saved_values)
+	}
+
+	/// Apply the snapshot to the given instance.
+	///
+	/// This instance must be the same that was used for creation of this snapshot.
+	pub fn apply<Instance>(&self, instance: &Instance)
+	where
+		Instance: InstanceGlobals<Global = Global>,
+	{
+		for saved_value in &self.0 {
+			instance.set_global_value(&saved_value.handle, saved_value.value);
+		}
+	}
+}
diff --git a/client/executor/common/src/runtime_blob/mod.rs b/client/executor/common/src/runtime_blob/mod.rs
new file mode 100644
index 000000000000..372df7bd97eb
--- /dev/null
+++ b/client/executor/common/src/runtime_blob/mod.rs
@@ -0,0 +1,57 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! This module allows for inspection and instrumentation, i.e. modifying the module to alter it's
+//! structure or behavior, of a wasm module.
+//!
+//! ## Instrumentation
+//!
+//! In ideal world, there would be no instrumentation. However, in the real world the execution
+//! engines we use are somewhat limited in their APIs or abilities.
+//!
+//! To give you some examples:
+//!
+//! - wasmi allows reaching to non-exported mutable globals so that we could reset them.
+//!   Wasmtime doesn’t support that.
+//!
+//!   We need to reset the globals because when we
+//!   execute the Substrate Runtime, we do not drop and create the instance anew, instead
+//!   we restore some selected parts of the state.
+//!
+//! - stack depth metering can be performed via instrumentation or deferred to the engine and say
+//!   be added directly in machine code. Implementing this in machine code is rather cumbersome so
+//!   instrumentation looks like a good solution.
+//!
+//!   Stack depth metering is needed to make a wasm blob
+//!   execution deterministic, which in turn is needed by the Parachain Validation Function in Polkadot.
+//!
+//! ## Inspection
+//!
+//! Inspection of a wasm module may be needed to extract some useful information, such as to extract
+//! data segment snapshot, which is helpful for quickly restoring the initial state of instances.
+//! Inspection can be also useful to prove that a wasm module possesses some properties, such as,
+//! is free of any floating point operations, which is a useful step towards making instances produced
+//! from such a module deterministic.
+
+mod data_segments_snapshot;
+mod globals_snapshot;
+mod runtime_blob;
+
+pub use data_segments_snapshot::DataSegmentsSnapshot;
+pub use globals_snapshot::{GlobalsSnapshot, ExposedMutableGlobalsSet, InstanceGlobals};
+pub use runtime_blob::RuntimeBlob;
diff --git a/client/executor/common/src/runtime_blob/runtime_blob.rs b/client/executor/common/src/runtime_blob/runtime_blob.rs
new file mode 100644
index 000000000000..d90a48fde0c8
--- /dev/null
+++ b/client/executor/common/src/runtime_blob/runtime_blob.rs
@@ -0,0 +1,93 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+use parity_wasm::elements::{DataSegment, Module as RawModule, deserialize_buffer, serialize};
+
+use crate::error::WasmError;
+
+/// A bunch of information collected from a WebAssembly module.
+#[derive(Clone)]
+pub struct RuntimeBlob {
+	raw_module: RawModule,
+}
+
+impl RuntimeBlob {
+	/// Create `RuntimeBlob` from the given wasm code.
+	///
+	/// Returns `Err` if the wasm code cannot be deserialized.
+	pub fn new(wasm_code: &[u8]) -> Result<Self, WasmError> {
+		let raw_module: RawModule = deserialize_buffer(wasm_code)
+			.map_err(|e| WasmError::Other(format!("cannot deserialize module: {:?}", e)))?;
+		Ok(Self { raw_module })
+	}
+
+	/// Extract the data segments from the given wasm code.
+	pub(super) fn data_segments(&self) -> Vec<DataSegment> {
+		self.raw_module
+			.data_section()
+			.map(|ds| ds.entries())
+			.unwrap_or(&[])
+			.to_vec()
+	}
+
+	/// The number of globals defined in locally in this module.
+	pub fn declared_globals_count(&self) -> u32 {
+		self.raw_module
+			.global_section()
+			.map(|gs| gs.entries().len() as u32)
+			.unwrap_or(0)
+	}
+
+	/// The number of imports of globals.
+	pub fn imported_globals_count(&self) -> u32 {
+		self.raw_module
+			.import_section()
+			.map(|is| is.globals() as u32)
+			.unwrap_or(0)
+	}
+
+	/// Perform an instrumentation that makes sure that the mutable globals are exported.
+	pub fn expose_mutable_globals(&mut self) {
+		pwasm_utils::export_mutable_globals(&mut self.raw_module, "exported_internal_global");
+	}
+
+	/// Returns an iterator of all globals which were exported by [`expose_mutable_globals`].
+	pub(super) fn exported_internal_global_names<'module>(
+		&'module self,
+	) -> impl Iterator<Item = &'module str> {
+		let exports = self
+			.raw_module
+			.export_section()
+			.map(|es| es.entries())
+			.unwrap_or(&[]);
+		exports.iter().filter_map(|export| match export.internal() {
+			parity_wasm::elements::Internal::Global(_)
+				if export.field().starts_with("exported_internal_global") =>
+			{
+				Some(export.field())
+			}
+			_ => None,
+		})
+	}
+
+	/// Consumes this runtime blob and serializes it.
+	pub fn serialize(self) -> Vec<u8> {
+		serialize(self.raw_module)
+			.expect("serializing into a vec should succeed; qed")
+	}
+}
diff --git a/client/executor/src/wasm_runtime.rs b/client/executor/src/wasm_runtime.rs
index 351a2b5f40f0..268a06018287 100644
--- a/client/executor/src/wasm_runtime.rs
+++ b/client/executor/src/wasm_runtime.rs
@@ -300,14 +300,22 @@ pub fn create_wasm_runtime_with_code(
 			.map(|runtime| -> Arc<dyn WasmModule> { Arc::new(runtime) })
 		}
 		#[cfg(feature = "wasmtime")]
-		WasmExecutionMethod::Compiled =>
+		WasmExecutionMethod::Compiled => {
+			let blob = sc_executor_common::runtime_blob::RuntimeBlob::new(code)?;
 			sc_executor_wasmtime::create_runtime(
-				code,
-				heap_pages,
+				sc_executor_wasmtime::CodeSupplyMode::Verbatim { blob },
+				sc_executor_wasmtime::Config {
+					heap_pages: heap_pages as u32,
+					allow_missing_func_imports,
+					cache_path: cache_path.map(ToOwned::to_owned),
+					semantics: sc_executor_wasmtime::Semantics {
+						fast_instance_reuse: true,
+						stack_depth_metering: false,
+					},
+				},
 				host_functions,
-				allow_missing_func_imports,
-				cache_path,
-			).map(|runtime| -> Arc<dyn WasmModule> { Arc::new(runtime) }),
+			).map(|runtime| -> Arc<dyn WasmModule> { Arc::new(runtime) })
+		},
 	}
 }
 
diff --git a/client/executor/wasmi/src/lib.rs b/client/executor/wasmi/src/lib.rs
index e6a6ef3a6103..0163e07e654b 100644
--- a/client/executor/wasmi/src/lib.rs
+++ b/client/executor/wasmi/src/lib.rs
@@ -36,7 +36,7 @@ use sc_executor_common::{
 	error::{Error, WasmError},
 	sandbox,
 };
-use sc_executor_common::util::{DataSegmentsSnapshot, WasmModuleInfo};
+use sc_executor_common::runtime_blob::{RuntimeBlob, DataSegmentsSnapshot};
 
 struct FunctionExecutor<'a> {
 	sandbox_store: sandbox::Store<wasmi::FuncRef>,
@@ -661,11 +661,8 @@ pub fn create_runtime(
 		)
 		.map_err(|e| WasmError::Instantiation(e.to_string()))?;
 
-		let data_segments_snapshot = DataSegmentsSnapshot::take(
-			&WasmModuleInfo::new(code)
-				.ok_or_else(|| WasmError::Other("cannot deserialize module".to_string()))?,
-		)
-		.map_err(|e| WasmError::Other(e.to_string()))?;
+		let data_segments_snapshot = DataSegmentsSnapshot::take(&RuntimeBlob::new(code)?)
+			.map_err(|e| WasmError::Other(e.to_string()))?;
 		let global_vals_snapshot = GlobalValsSnapshot::take(&instance);
 
 		(data_segments_snapshot, global_vals_snapshot)
diff --git a/client/executor/wasmtime/src/imports.rs b/client/executor/wasmtime/src/imports.rs
index 08cedd434e36..21b7728c323c 100644
--- a/client/executor/wasmtime/src/imports.rs
+++ b/client/executor/wasmtime/src/imports.rs
@@ -16,9 +16,9 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::state_holder;
+use crate::{state_holder, util};
 use sc_executor_common::error::WasmError;
-use sp_wasm_interface::{Function, Value, ValueType};
+use sp_wasm_interface::{Function, ValueType};
 use std::any::Any;
 use wasmtime::{
 	Extern, ExternType, Func, FuncType, ImportType, Limits, Memory, MemoryType, Module,
@@ -187,12 +187,12 @@ fn call_static(
 			qed
 			",
 		);
-		// `into_value` panics if it encounters a value that doesn't fit into the values
+		// `from_wasmtime_val` panics if it encounters a value that doesn't fit into the values
 		// available in substrate.
 		//
 		// This, however, cannot happen since the signature of this function is created from
 		// a `dyn Function` signature of which cannot have a non substrate value by definition.
-		let mut params = wasmtime_params.iter().cloned().map(into_value);
+		let mut params = wasmtime_params.iter().cloned().map(util::from_wasmtime_val);
 
 		std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
 			static_func.execute(&mut host_ctx, &mut params)
@@ -211,7 +211,7 @@ fn call_static(
 				"wasmtime function signature, therefore the number of results, should always \
 				correspond to the number of results returned by the host function",
 			);
-			wasmtime_results[0] = into_wasmtime_val(ret_val);
+			wasmtime_results[0] = util::into_wasmtime_val(ret_val);
 			Ok(())
 		}
 		Ok(None) => {
@@ -295,28 +295,6 @@ fn into_wasmtime_val_type(val_ty: ValueType) -> wasmtime::ValType {
 	}
 }
 
-/// Converts a `Val` into a substrate runtime interface `Value`.
-///
-/// Panics if the given value doesn't have a corresponding variant in `Value`.
-pub fn into_value(val: Val) -> Value {
-	match val {
-		Val::I32(v) => Value::I32(v),
-		Val::I64(v) => Value::I64(v),
-		Val::F32(f_bits) => Value::F32(f_bits),
-		Val::F64(f_bits) => Value::F64(f_bits),
-		_ => panic!("Given value type is unsupported by substrate"),
-	}
-}
-
-pub fn into_wasmtime_val(value: Value) -> wasmtime::Val {
-	match value {
-		Value::I32(v) => Val::I32(v),
-		Value::I64(v) => Val::I64(v),
-		Value::F32(f_bits) => Val::F32(f_bits),
-		Value::F64(f_bits) => Val::F64(f_bits),
-	}
-}
-
 /// Attempt to convert a opaque panic payload to a string.
 fn stringify_panic_payload(payload: Box<dyn Any + Send + 'static>) -> String {
 	match payload.downcast::<&'static str>() {
diff --git a/client/executor/wasmtime/src/instance_wrapper.rs b/client/executor/wasmtime/src/instance_wrapper.rs
index f0543a7ef950..fec88a472fb9 100644
--- a/client/executor/wasmtime/src/instance_wrapper.rs
+++ b/client/executor/wasmtime/src/instance_wrapper.rs
@@ -25,53 +25,11 @@ use crate::imports::Imports;
 use std::{slice, marker};
 use sc_executor_common::{
 	error::{Error, Result},
-	util::{WasmModuleInfo, DataSegmentsSnapshot},
+	runtime_blob,
 	wasm_runtime::InvokeMethod,
 };
 use sp_wasm_interface::{Pointer, WordSize, Value};
-use wasmtime::{Engine, Instance, Module, Memory, Table, Val, Func, Extern, Global, Store};
-use parity_wasm::elements;
-
-mod globals_snapshot;
-
-pub use globals_snapshot::GlobalsSnapshot;
-
-pub struct ModuleWrapper {
-	module: Module,
-	data_segments_snapshot: DataSegmentsSnapshot,
-}
-
-impl ModuleWrapper {
-	pub fn new(engine: &Engine, code: &[u8]) -> Result<Self> {
-		let mut raw_module: elements::Module = elements::deserialize_buffer(code)
-			.map_err(|e| Error::from(format!("cannot decode module: {}", e)))?;
-		pwasm_utils::export_mutable_globals(&mut raw_module, "exported_internal_global");
-		let instrumented_code = elements::serialize(raw_module)
-			.map_err(|e| Error::from(format!("cannot encode module: {}", e)))?;
-
-		let module = Module::new(engine, &instrumented_code)
-			.map_err(|e| Error::from(format!("cannot create module: {}", e)))?;
-
-		let module_info = WasmModuleInfo::new(code)
-			.ok_or_else(|| Error::from("cannot deserialize module".to_string()))?;
-
-		let data_segments_snapshot = DataSegmentsSnapshot::take(&module_info)
-			.map_err(|e| Error::from(format!("cannot take data segments snapshot: {}", e)))?;
-
-		Ok(Self {
-			module,
-			data_segments_snapshot,
-		})
-	}
-
-	pub fn module(&self) -> &Module {
-		&self.module
-	}
-
-	pub fn data_segments_snapshot(&self) -> &DataSegmentsSnapshot {
-		&self.data_segments_snapshot
-	}
-}
+use wasmtime::{Instance, Module, Memory, Table, Val, Func, Extern, Global, Store};
 
 /// Invoked entrypoint format.
 pub enum EntryPointType {
@@ -197,8 +155,8 @@ fn extern_func(extern_: &Extern) -> Option<&Func> {
 
 impl InstanceWrapper {
 	/// Create a new instance wrapper from the given wasm module.
-	pub fn new(store: &Store, module_wrapper: &ModuleWrapper, imports: &Imports, heap_pages: u32) -> Result<Self> {
-		let instance = Instance::new(store, &module_wrapper.module, &imports.externs)
+	pub fn new(store: &Store, module: &Module, imports: &Imports, heap_pages: u32) -> Result<Self> {
+		let instance = Instance::new(store, module, &imports.externs)
 			.map_err(|e| Error::from(format!("cannot instantiate: {}", e)))?;
 
 		let memory = match imports.memory_import_index {
@@ -462,3 +420,23 @@ impl InstanceWrapper {
 		}
 	}
 }
+
+impl runtime_blob::InstanceGlobals for InstanceWrapper {
+	type Global = wasmtime::Global;
+
+	fn get_global(&self, export_name: &str) -> Self::Global {
+		self.instance
+			.get_global(export_name)
+			.expect("get_global is guaranteed to be called with an export name of a global; qed")
+	}
+
+	fn get_global_value(&self, global: &Self::Global) -> Value {
+		util::from_wasmtime_val(global.get())
+	}
+
+	fn set_global_value(&self, global: &Self::Global, value: Value) {
+		global.set(util::into_wasmtime_val(value)).expect(
+			"the value is guaranteed to be of the same value; the global is guaranteed to be mutable; qed",
+		);
+	}
+}
diff --git a/client/executor/wasmtime/src/instance_wrapper/globals_snapshot.rs b/client/executor/wasmtime/src/instance_wrapper/globals_snapshot.rs
deleted file mode 100644
index a6b1ed394150..000000000000
--- a/client/executor/wasmtime/src/instance_wrapper/globals_snapshot.rs
+++ /dev/null
@@ -1,84 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-use super::InstanceWrapper;
-use sc_executor_common::error::{Result, Error};
-use sp_wasm_interface::Value;
-use crate::imports::{into_value, into_wasmtime_val};
-
-/// Saved value of particular exported global.
-struct SavedValue {
-	/// Index of the export.
-	index: usize,
-	/// Global value.
-	value: Value,
-}
-
-/// A snapshot of a global variables values. This snapshot can be used later for restoring the
-/// values to the preserved state.
-///
-/// Technically, a snapshot stores only values of mutable global variables. This is because
-/// immutable global variables always have the same values.
-pub struct GlobalsSnapshot(Vec<SavedValue>);
-
-impl GlobalsSnapshot {
-	/// Take a snapshot of global variables for a given instance.
-	pub fn take(instance_wrapper: &InstanceWrapper) -> Result<Self> {
-		let data = instance_wrapper.instance
-			.exports()
-			.enumerate()
-			.filter_map(|(index, export)| {
-				if export.name().starts_with("exported_internal_global") {
-					export.into_global().map(
-						|g| SavedValue { index, value: into_value(g.get()) }
-					)
-				} else { None }
-			})
-			.collect::<Vec<_>>();
-
-		Ok(Self(data))
-	}
-
-	/// Apply the snapshot to the given instance.
-	///
-	/// This instance must be the same that was used for creation of this snapshot.
-	pub fn apply(&self, instance_wrapper: &InstanceWrapper) -> Result<()> {
-		// This is a pointer over saved items, it moves forward when the loop value below takes over it's current value.
-		// Since both pointers (`current` and `index` below) are over ordered lists, they eventually hit all
-		// equal referenced values.
-		let mut current = 0;
-		for (index, export) in instance_wrapper.instance.exports().enumerate() {
-			if current >= self.0.len() { break; }
-			let current_saved = &self.0[current];
-			if index < current_saved.index { continue; }
-			else if index > current_saved.index { current += 1; continue; }
-			else {
-				export.into_global()
-					.ok_or_else(|| Error::Other(
-						"Wrong instance in GlobalsSnapshot::apply: what should be global is not global.".to_string()
-					))?
-					.set(into_wasmtime_val(current_saved.value))
-					.map_err(|_e| Error::Other(
-						"Wrong instance in GlobalsSnapshot::apply: global saved type does not matched applied.".to_string()
-					))?;
-			}
-		}
-
-		Ok(())
-	}
-}
diff --git a/client/executor/wasmtime/src/lib.rs b/client/executor/wasmtime/src/lib.rs
index db7776d4c584..3679c1524965 100644
--- a/client/executor/wasmtime/src/lib.rs
+++ b/client/executor/wasmtime/src/lib.rs
@@ -17,12 +17,11 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 ///! Defines a `WasmRuntime` that uses the Wasmtime JIT to execute.
-
 mod host;
-mod runtime;
-mod state_holder;
 mod imports;
 mod instance_wrapper;
+mod runtime;
+mod state_holder;
 mod util;
 
-pub use runtime::create_runtime;
+pub use runtime::{create_runtime, prepare_runtime_artifact, CodeSupplyMode, Config, Semantics};
diff --git a/client/executor/wasmtime/src/runtime.rs b/client/executor/wasmtime/src/runtime.rs
index 64ad5a1f4e49..103b37a681e8 100644
--- a/client/executor/wasmtime/src/runtime.rs
+++ b/client/executor/wasmtime/src/runtime.rs
@@ -20,27 +20,57 @@
 
 use crate::host::HostState;
 use crate::imports::{Imports, resolve_imports};
-use crate::instance_wrapper::{ModuleWrapper, InstanceWrapper, GlobalsSnapshot, EntryPoint};
+use crate::instance_wrapper::{InstanceWrapper, EntryPoint};
 use crate::state_holder;
 
-use std::rc::Rc;
+use std::{path::PathBuf, rc::Rc};
 use std::sync::Arc;
 use std::path::Path;
 use sc_executor_common::{
 	error::{Result, WasmError},
+	runtime_blob::{DataSegmentsSnapshot, ExposedMutableGlobalsSet, GlobalsSnapshot, RuntimeBlob},
 	wasm_runtime::{WasmModule, WasmInstance, InvokeMethod},
 };
 use sp_allocator::FreeingBumpHeapAllocator;
 use sp_runtime_interface::unpack_ptr_and_len;
 use sp_wasm_interface::{Function, Pointer, WordSize, Value};
-use wasmtime::{Config, Engine, Store};
+use wasmtime::{Engine, Store};
+
+enum Strategy {
+	FastInstanceReuse {
+		instance_wrapper: Rc<InstanceWrapper>,
+		globals_snapshot: GlobalsSnapshot<wasmtime::Global>,
+		data_segments_snapshot: Arc<DataSegmentsSnapshot>,
+		heap_base: u32,
+	},
+	RecreateInstance(InstanceCreator),
+}
+
+struct InstanceCreator {
+	store: Store,
+	module: Arc<wasmtime::Module>,
+	imports: Arc<Imports>,
+	heap_pages: u32,
+}
+
+impl InstanceCreator {
+	fn instantiate(&self) -> Result<InstanceWrapper> {
+		InstanceWrapper::new(&self.store, &*self.module, &*self.imports, self.heap_pages)
+	}
+}
+
+/// Data required for creating instances with the fast instance reuse strategy.
+struct InstanceSnapshotData {
+	mutable_globals: ExposedMutableGlobalsSet,
+	data_segments_snapshot: Arc<DataSegmentsSnapshot>,
+}
 
 /// A `WasmModule` implementation using wasmtime to compile the runtime module to machine code
 /// and execute the compiled code.
 pub struct WasmtimeRuntime {
-	module_wrapper: Arc<ModuleWrapper>,
-	heap_pages: u32,
-	allow_missing_func_imports: bool,
+	module: Arc<wasmtime::Module>,
+	snapshot_data: Option<InstanceSnapshotData>,
+	config: Config,
 	host_functions: Vec<&'static dyn Function>,
 	engine: Engine,
 }
@@ -51,41 +81,52 @@ impl WasmModule for WasmtimeRuntime {
 
 		// Scan all imports, find the matching host functions, and create stubs that adapt arguments
 		// and results.
+		//
+		// NOTE: Attentive reader may notice that this could've been moved in `WasmModule` creation.
+		//       However, I am not sure if that's a good idea since it would be pushing our luck further
+		//       by assuming that `Store` not only `Send` but also `Sync`.
 		let imports = resolve_imports(
 			&store,
-			self.module_wrapper.module(),
+			&self.module,
 			&self.host_functions,
-			self.heap_pages,
-			self.allow_missing_func_imports,
+			self.config.heap_pages,
+			self.config.allow_missing_func_imports,
 		)?;
 
-		let instance_wrapper =
-			InstanceWrapper::new(&store, &self.module_wrapper, &imports, self.heap_pages)?;
-		let heap_base = instance_wrapper.extract_heap_base()?;
-		let globals_snapshot = GlobalsSnapshot::take(&instance_wrapper)?;
-
-		Ok(Box::new(WasmtimeInstance {
-			store,
-			instance_wrapper: Rc::new(instance_wrapper),
-			module_wrapper: Arc::clone(&self.module_wrapper),
-			imports,
-			globals_snapshot,
-			heap_pages: self.heap_pages,
-			heap_base,
-		}))
+		let strategy = if let Some(ref snapshot_data) = self.snapshot_data {
+			let instance_wrapper =
+				InstanceWrapper::new(&store, &self.module, &imports, self.config.heap_pages)?;
+			let heap_base = instance_wrapper.extract_heap_base()?;
+
+			// This function panics if the instance was created from a runtime blob different from which
+			// the mutable globals were collected. Here, it is easy to see that there is only a single
+			// runtime blob and thus it's the same that was used for both creating the instance and
+			// collecting the mutable globals.
+			let globals_snapshot = GlobalsSnapshot::take(&snapshot_data.mutable_globals, &instance_wrapper);
+
+			Strategy::FastInstanceReuse {
+				instance_wrapper: Rc::new(instance_wrapper),
+				globals_snapshot,
+				data_segments_snapshot: snapshot_data.data_segments_snapshot.clone(),
+				heap_base,
+			}
+		} else {
+			Strategy::RecreateInstance(InstanceCreator {
+				imports: Arc::new(imports),
+				module: self.module.clone(),
+				store,
+				heap_pages: self.config.heap_pages,
+			})
+		};
+
+		Ok(Box::new(WasmtimeInstance { strategy }))
 	}
 }
 
 /// A `WasmInstance` implementation that reuses compiled module and spawns instances
 /// to execute the compiled code.
 pub struct WasmtimeInstance {
-	store: Store,
-	module_wrapper: Arc<ModuleWrapper>,
-	instance_wrapper: Rc<InstanceWrapper>,
-	globals_snapshot: GlobalsSnapshot,
-	imports: Imports,
-	heap_pages: u32,
-	heap_base: u32,
+	strategy: Strategy,
 }
 
 // This is safe because `WasmtimeInstance` does not leak reference to `self.imports`
@@ -94,29 +135,43 @@ unsafe impl Send for WasmtimeInstance {}
 
 impl WasmInstance for WasmtimeInstance {
 	fn call(&self, method: InvokeMethod, data: &[u8]) -> Result<Vec<u8>> {
-		let entrypoint = self.instance_wrapper.resolve_entrypoint(method)?;
-		let allocator = FreeingBumpHeapAllocator::new(self.heap_base);
-
-		self.module_wrapper
-			.data_segments_snapshot()
-			.apply(|offset, contents| {
-				self.instance_wrapper
-					.write_memory_from(Pointer::new(offset), contents)
-			})?;
-
-		self.globals_snapshot.apply(&*self.instance_wrapper)?;
-
-		perform_call(
-			data,
-			Rc::clone(&self.instance_wrapper),
-			entrypoint,
-			allocator,
-		)
+		match &self.strategy {
+			Strategy::FastInstanceReuse {
+				instance_wrapper,
+				globals_snapshot,
+				data_segments_snapshot,
+				heap_base,
+			} => {
+				let entrypoint = instance_wrapper.resolve_entrypoint(method)?;
+
+				data_segments_snapshot.apply(|offset, contents| {
+					instance_wrapper.write_memory_from(Pointer::new(offset), contents)
+				})?;
+				globals_snapshot.apply(&**instance_wrapper);
+				let allocator = FreeingBumpHeapAllocator::new(*heap_base);
+
+				perform_call(data, Rc::clone(&instance_wrapper), entrypoint, allocator)
+			}
+			Strategy::RecreateInstance(instance_creator) => {
+				let instance_wrapper = instance_creator.instantiate()?;
+				let heap_base = instance_wrapper.extract_heap_base()?;
+				let entrypoint = instance_wrapper.resolve_entrypoint(method)?;
+
+				let allocator = FreeingBumpHeapAllocator::new(heap_base);
+				perform_call(data, Rc::new(instance_wrapper), entrypoint, allocator)
+			}
+		}
 	}
 
 	fn get_global_const(&self, name: &str) -> Result<Option<Value>> {
-		let instance = InstanceWrapper::new(&self.store, &self.module_wrapper, &self.imports, self.heap_pages)?;
-		instance.get_global_val(name)
+		match &self.strategy {
+			Strategy::FastInstanceReuse {
+				instance_wrapper, ..
+			} => instance_wrapper.get_global_val(name),
+			Strategy::RecreateInstance(instance_creator) => {
+				instance_creator.instantiate()?.get_global_val(name)
+			}
+		}
 	}
 }
 
@@ -125,7 +180,7 @@ impl WasmInstance for WasmtimeInstance {
 /// In case of an error the caching will not be enabled.
 fn setup_wasmtime_caching(
 	cache_path: &Path,
-	config: &mut Config,
+	config: &mut wasmtime::Config,
 ) -> std::result::Result<(), String> {
 	use std::fs;
 
@@ -158,22 +213,99 @@ directory = \"{cache_dir}\"
 	Ok(())
 }
 
+fn common_config() -> wasmtime::Config {
+	let mut config = wasmtime::Config::new();
+	config.cranelift_opt_level(wasmtime::OptLevel::SpeedAndSize);
+	config
+}
+
+pub struct Semantics {
+	/// Enabling this will lead to some optimization shenanigans that make calling [`WasmInstance`]
+	/// extermely fast.
+	///
+	/// Primarily this is achieved by not recreating the instance for each call and performing a
+	/// bare minimum clean up: reapplying the data segments and restoring the values for global
+	/// variables. The vast majority of the linear memory is not restored, meaning that effects
+	/// of previous executions on the same [`WasmInstance`] can be observed there.
+	///
+	/// This is not a problem for a standard substrate runtime execution because it's up to the
+	/// runtime itself to make sure that it doesn't involve any non-determinism.
+	///
+	/// Since this feature depends on instrumentation, it can be set only if [`CodeSupplyMode::Verbatim`]
+	/// is used.
+	pub fast_instance_reuse: bool,
+
+	/// The WebAssembly standard defines a call/value stack but it doesn't say anything about its
+	/// size except that it has to be finite. The implementations are free to choose their own notion
+	/// of limit: some may count the number of calls or values, others would rely on the host machine
+	/// stack and trap on reaching a guard page.
+	///
+	/// This obviously is a source of non-determinism during execution. This feature can be used
+	/// to instrument the code so that it will count the depth of execution in some deterministic
+	/// way (the machine stack limit should be so high that the deterministic limit always triggers
+	/// first).
+	///
+	/// See [here][stack_height] for more details of the instrumentation
+	///
+	/// Since this feature depends on instrumentation, it can be set only if [`CodeSupplyMode::Verbatim`]
+	/// is used.
+	///
+	/// [stack_height]: https://github.com/paritytech/wasm-utils/blob/d9432baf/src/stack_height/mod.rs#L1-L50
+	pub stack_depth_metering: bool,
+	// Other things like nan canonicalization can be added here.
+}
+
+pub struct Config {
+	/// The number of wasm pages to be mounted after instantiation.
+	pub heap_pages: u32,
+
+	/// The WebAssembly standard requires all imports of an instantiated module to be resolved,
+	/// othewise, the instantiation fails. If this option is set to `true`, then this behavior is
+	/// overriden and imports that are requested by the module and not provided by the host functions
+	/// will be resolved using stubs. These stubs will trap upon a call.
+	pub allow_missing_func_imports: bool,
+
+	/// A directory in which wasmtime can store its compiled artifacts cache.
+	pub cache_path: Option<PathBuf>,
+
+	/// Tuning of various semantics of the wasmtime executor.
+	pub semantics: Semantics,
+}
+
+pub enum CodeSupplyMode<'a> {
+	/// The runtime is instantiated using the given runtime blob.
+	Verbatim {
+		// Rationale to take the `RuntimeBlob` here is so that the client will be able to reuse
+		// the blob e.g. if they did a prevalidation. If they didn't they can pass a `RuntimeBlob`
+		// instance and it will be used anyway in most cases, because we are going to do at least
+		// some instrumentations for both anticipated paths: substrate execution and PVF execution.
+		//
+		// Should there raise a need in performing no instrumentation and the client doesn't need
+		// to do any checks, then we can provide a `Cow` like semantics here: if we need the blob and
+		//  the user got `RuntimeBlob` then extract it, or otherwise create it from the given
+		// bytecode.
+		blob: RuntimeBlob,
+	},
+
+	/// The code is supplied in a form of a compiled artifact.
+	///
+	/// This assumes that the code is already prepared for execution and the same `Config` was used.
+	Artifact { compiled_artifact: &'a [u8] },
+}
+
 /// Create a new `WasmtimeRuntime` given the code. This function performs translation from Wasm to
 /// machine code, which can be computationally heavy.
 ///
 /// The `cache_path` designates where this executor implementation can put compiled artifacts.
 pub fn create_runtime(
-	code: &[u8],
-	heap_pages: u64,
+	code_supply_mode: CodeSupplyMode<'_>,
+	config: Config,
 	host_functions: Vec<&'static dyn Function>,
-	allow_missing_func_imports: bool,
-	cache_path: Option<&Path>,
 ) -> std::result::Result<WasmtimeRuntime, WasmError> {
 	// Create the engine, store and finally the module from the given code.
-	let mut config = Config::new();
-	config.cranelift_opt_level(wasmtime::OptLevel::SpeedAndSize);
-	if let Some(cache_path) = cache_path {
-		if let Err(reason) = setup_wasmtime_caching(cache_path, &mut config) {
+	let mut wasmtime_config = common_config();
+	if let Some(ref cache_path) = config.cache_path {
+		if let Err(reason) = setup_wasmtime_caching(cache_path, &mut wasmtime_config) {
 			log::warn!(
 				"failed to setup wasmtime cache. Performance may degrade significantly: {}.",
 				reason,
@@ -181,19 +313,76 @@ pub fn create_runtime(
 		}
 	}
 
-	let engine = Engine::new(&config);
-	let module_wrapper = ModuleWrapper::new(&engine, code)
-		.map_err(|e| WasmError::Other(format!("cannot create module: {}", e)))?;
+	let engine = Engine::new(&wasmtime_config);
+
+	let (module, snapshot_data) = match code_supply_mode {
+		CodeSupplyMode::Verbatim { mut blob } => {
+			instrument(&mut blob, &config.semantics);
+
+			if config.semantics.fast_instance_reuse {
+				let data_segments_snapshot = DataSegmentsSnapshot::take(&blob).map_err(|e| {
+					WasmError::Other(format!("cannot take data segments snapshot: {}", e))
+				})?;
+				let data_segments_snapshot = Arc::new(data_segments_snapshot);
+
+				let mutable_globals = ExposedMutableGlobalsSet::collect(&blob);
+
+				let module = wasmtime::Module::new(&engine, &blob.serialize())
+					.map_err(|e| WasmError::Other(format!("cannot create module: {}", e)))?;
+
+				(module, Some(InstanceSnapshotData {
+					data_segments_snapshot,
+					mutable_globals,
+				}))
+			} else {
+				let module = wasmtime::Module::new(&engine, &blob.serialize())
+					.map_err(|e| WasmError::Other(format!("cannot create module: {}", e)))?;
+				(module, None)
+			}
+		}
+		CodeSupplyMode::Artifact { compiled_artifact } => {
+			let module = wasmtime::Module::deserialize(&engine, compiled_artifact)
+				.map_err(|e| WasmError::Other(format!("cannot deserialize module: {}", e)))?;
+
+			(module, None)
+		}
+	};
 
 	Ok(WasmtimeRuntime {
-		module_wrapper: Arc::new(module_wrapper),
-		heap_pages: heap_pages as u32,
-		allow_missing_func_imports,
+		module: Arc::new(module),
+		snapshot_data,
+		config,
 		host_functions,
 		engine,
 	})
 }
 
+fn instrument(blob: &mut RuntimeBlob, semantics: &Semantics) {
+	if semantics.fast_instance_reuse {
+		blob.expose_mutable_globals();
+	}
+
+	if semantics.stack_depth_metering {
+		// TODO: implement deterministic stack metering https://github.com/paritytech/substrate/issues/8393
+	}
+}
+
+/// Takes a [`RuntimeBlob`] and precompiles it returning the serialized result of compilation. It
+/// can then be used for calling [`create_runtime`] avoiding long compilation times.
+pub fn prepare_runtime_artifact(
+	mut blob: RuntimeBlob,
+	semantics: &Semantics,
+) -> std::result::Result<Vec<u8>, WasmError> {
+	instrument(&mut blob, semantics);
+
+	let engine = Engine::new(&common_config());
+	let module = wasmtime::Module::new(&engine, &blob.serialize())
+		.map_err(|e| WasmError::Other(format!("cannot compile module: {}", e)))?;
+	module
+		.serialize()
+		.map_err(|e| WasmError::Other(format!("cannot serialize module: {}", e)))
+}
+
 fn perform_call(
 	data: &[u8],
 	instance_wrapper: Rc<InstanceWrapper>,
diff --git a/client/executor/wasmtime/src/util.rs b/client/executor/wasmtime/src/util.rs
index 1437c6f8509b..c294f66b5017 100644
--- a/client/executor/wasmtime/src/util.rs
+++ b/client/executor/wasmtime/src/util.rs
@@ -18,6 +18,8 @@
 
 use std::ops::Range;
 
+use sp_wasm_interface::Value;
+
 /// Construct a range from an offset to a data length after the offset.
 /// Returns None if the end of the range would exceed some maximum offset.
 pub fn checked_range(offset: usize, len: usize, max: usize) -> Option<Range<usize>> {
@@ -28,3 +30,26 @@ pub fn checked_range(offset: usize, len: usize, max: usize) -> Option<Range<usiz
 		None
 	}
 }
+
+/// Converts a [`wasmtime::Val`] into a substrate runtime interface [`Value`].
+///
+/// Panics if the given value doesn't have a corresponding variant in `Value`.
+pub fn from_wasmtime_val(val: wasmtime::Val) -> Value {
+	match val {
+		wasmtime::Val::I32(v) => Value::I32(v),
+		wasmtime::Val::I64(v) => Value::I64(v),
+		wasmtime::Val::F32(f_bits) => Value::F32(f_bits),
+		wasmtime::Val::F64(f_bits) => Value::F64(f_bits),
+		v => panic!("Given value type is unsupported by Substrate: {:?}", v),
+	}
+}
+
+/// Converts a sp_wasm_interface's [`Value`] into the corresponding variant in wasmtime's [`wasmtime::Val`].
+pub fn into_wasmtime_val(value: Value) -> wasmtime::Val {
+	match value {
+		Value::I32(v) => wasmtime::Val::I32(v),
+		Value::I64(v) => wasmtime::Val::I64(v),
+		Value::F32(f_bits) => wasmtime::Val::F32(f_bits),
+		Value::F64(f_bits) => wasmtime::Val::F64(f_bits),
+	}
+}

From f379cbe9d0bec1df5adb89b726642d9329b294d6 Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Tue, 6 Apr 2021 21:02:15 +0200
Subject: [PATCH 0609/1194] Bump codec. (#8548)

* Bump codec.

* Bump codec-derive

* Remove FullCodec bound on Call
---
 Cargo.lock              | 320 ++++++++++++++++++++--------------------
 frame/system/src/lib.rs |   2 +-
 2 files changed, 164 insertions(+), 158 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fc63b9d80bdf..093126e5ce8c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -156,6 +156,12 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
 
+[[package]]
+name = "arrayvec"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a2f58b0bb10c380af2b26e57212856b8c9a59e0925b4c20f4a174a49734eaf7"
+
 [[package]]
 name = "asn1_der"
 version = "0.6.3"
@@ -1662,7 +1668,7 @@ dependencies = [
  "futures-timer 3.0.2",
  "log",
  "num-traits",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parking_lot 0.11.1",
  "rand 0.8.3",
 ]
@@ -1708,7 +1714,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 name = "fork-tree"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
 ]
 
 [[package]]
@@ -1730,7 +1736,7 @@ dependencies = [
  "hex-literal",
  "linregress",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "paste 1.0.4",
  "serde",
  "sp-api",
@@ -1749,7 +1755,7 @@ dependencies = [
  "chrono",
  "frame-benchmarking",
  "handlebars",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sc-cli",
  "sc-client-db",
  "sc-executor",
@@ -1769,7 +1775,7 @@ version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sp-arithmetic",
  "sp-npos-elections",
  "sp-runtime",
@@ -1786,7 +1792,7 @@ dependencies = [
  "pallet-balances",
  "pallet-indices",
  "pallet-transaction-payment",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -1800,7 +1806,7 @@ dependencies = [
 name = "frame-metadata"
 version = "13.0.0"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-std",
@@ -1817,7 +1823,7 @@ dependencies = [
  "impl-trait-for-tuples",
  "log",
  "once_cell",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parity-util-mem",
  "paste 1.0.4",
  "pretty_assertions",
@@ -1872,7 +1878,7 @@ dependencies = [
  "frame-metadata",
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "pretty_assertions",
  "rustversion",
  "serde",
@@ -1893,7 +1899,7 @@ dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-externalities",
@@ -1911,7 +1917,7 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -1923,7 +1929,7 @@ dependencies = [
 name = "frame-system-rpc-runtime-api"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sp-api",
 ]
 
@@ -1932,7 +1938,7 @@ name = "frame-try-runtime"
 version = "0.9.0"
 dependencies = [
  "frame-support",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sp-api",
  "sp-runtime",
  "sp-std",
@@ -2654,7 +2660,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df170efa359aebdd5cb7fe78edcc67107748e4737bdca8a8fb40d15ea7a877ed"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
 ]
 
 [[package]]
@@ -4114,7 +4120,7 @@ dependencies = [
  "pallet-staking",
  "pallet-timestamp",
  "pallet-transaction-payment",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parking_lot 0.11.1",
  "platforms",
  "rand 0.7.3",
@@ -4187,7 +4193,7 @@ dependencies = [
  "pallet-timestamp",
  "pallet-transaction-payment",
  "pallet-treasury",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sc-executor",
  "sp-application-crypto",
  "sp-consensus-babe",
@@ -4209,7 +4215,7 @@ version = "0.8.0"
 dependencies = [
  "derive_more",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sc-cli",
  "sc-client-api",
  "sc-service",
@@ -4224,7 +4230,7 @@ name = "node-primitives"
 version = "2.0.0"
 dependencies = [
  "frame-system",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "pretty_assertions",
  "sp-application-crypto",
  "sp-core",
@@ -4332,7 +4338,7 @@ dependencies = [
  "pallet-treasury",
  "pallet-utility",
  "pallet-vesting",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-api",
  "sp-authority-discovery",
@@ -4411,7 +4417,7 @@ dependencies = [
  "pallet-timestamp",
  "pallet-transaction-payment",
  "pallet-transaction-payment-rpc-runtime-api",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-api",
  "sp-block-builder",
@@ -4450,7 +4456,7 @@ dependencies = [
  "pallet-timestamp",
  "pallet-transaction-payment",
  "pallet-treasury",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sc-block-builder",
  "sc-cli",
  "sc-client-api",
@@ -4625,7 +4631,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -4640,7 +4646,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -4657,7 +4663,7 @@ dependencies = [
  "lazy_static",
  "pallet-session",
  "pallet-timestamp",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parking_lot 0.11.1",
  "serde",
  "sp-application-crypto",
@@ -4675,7 +4681,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-session",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-application-crypto",
  "sp-authority-discovery",
@@ -4693,7 +4699,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "impl-trait-for-tuples",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-authorship",
  "sp-core",
@@ -4719,7 +4725,7 @@ dependencies = [
  "pallet-staking",
  "pallet-staking-reward-curve",
  "pallet-timestamp",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-application-crypto",
  "sp-consensus-babe",
@@ -4741,7 +4747,7 @@ dependencies = [
  "frame-system",
  "log",
  "pallet-transaction-payment",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -4758,7 +4764,7 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "pallet-treasury",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -4777,7 +4783,7 @@ dependencies = [
  "hex-literal",
  "log",
  "pallet-balances",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -4800,7 +4806,7 @@ dependencies = [
  "pallet-contracts-proc-macro",
  "pallet-randomness-collective-flip",
  "pallet-timestamp",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parity-wasm 0.41.0",
  "paste 1.0.4",
  "pretty_assertions",
@@ -4822,7 +4828,7 @@ name = "pallet-contracts-primitives"
 version = "3.0.0"
 dependencies = [
  "bitflags",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sp-runtime",
  "sp-std",
 ]
@@ -4845,7 +4851,7 @@ dependencies = [
  "jsonrpc-derive",
  "pallet-contracts-primitives",
  "pallet-contracts-rpc-runtime-api",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "serde_json",
  "sp-api",
@@ -4860,7 +4866,7 @@ name = "pallet-contracts-rpc-runtime-api"
 version = "3.0.0"
 dependencies = [
  "pallet-contracts-primitives",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sp-api",
  "sp-runtime",
  "sp-std",
@@ -4876,7 +4882,7 @@ dependencies = [
  "hex-literal",
  "pallet-balances",
  "pallet-scheduler",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -4897,7 +4903,7 @@ dependencies = [
  "hex-literal",
  "log",
  "pallet-balances",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parking_lot 0.11.1",
  "paste 1.0.4",
  "rand 0.7.3",
@@ -4921,7 +4927,7 @@ dependencies = [
  "frame-system",
  "hex-literal",
  "pallet-balances",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -4939,7 +4945,7 @@ dependencies = [
  "hex-literal",
  "log",
  "pallet-balances",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -4958,7 +4964,7 @@ dependencies = [
  "frame-system",
  "log",
  "pallet-balances",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -4974,7 +4980,7 @@ dependencies = [
  "frame-system",
  "lite-json",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -4989,7 +4995,7 @@ version = "2.0.1"
 dependencies = [
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -5006,7 +5012,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-arithmetic",
  "sp-core",
@@ -5032,7 +5038,7 @@ dependencies = [
  "pallet-staking",
  "pallet-staking-reward-curve",
  "pallet-timestamp",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-application-crypto",
  "sp-core",
@@ -5054,7 +5060,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -5072,7 +5078,7 @@ dependencies = [
  "log",
  "pallet-authorship",
  "pallet-session",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-application-crypto",
  "sp-core",
@@ -5090,7 +5096,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -5108,7 +5114,7 @@ dependencies = [
  "frame-support-test",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -5122,7 +5128,7 @@ version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -5141,7 +5147,7 @@ dependencies = [
  "frame-system",
  "hex-literal",
  "pallet-mmr-primitives",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -5157,7 +5163,7 @@ dependencies = [
  "frame-system",
  "hex-literal",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-api",
  "sp-core",
@@ -5173,7 +5179,7 @@ dependencies = [
  "jsonrpc-core-client",
  "jsonrpc-derive",
  "pallet-mmr-primitives",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "serde_json",
  "sp-api",
@@ -5191,7 +5197,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -5206,7 +5212,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -5221,7 +5227,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -5237,7 +5243,7 @@ dependencies = [
  "frame-system",
  "log",
  "pallet-balances",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -5263,7 +5269,7 @@ dependencies = [
  "pallet-staking",
  "pallet-staking-reward-curve",
  "pallet-timestamp",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -5281,7 +5287,7 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "pallet-utility",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -5295,7 +5301,7 @@ version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "safe-mix",
  "serde",
  "sp-core",
@@ -5312,7 +5318,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -5328,7 +5334,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -5344,7 +5350,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -5361,7 +5367,7 @@ dependencies = [
  "impl-trait-for-tuples",
  "lazy_static",
  "pallet-timestamp",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-application-crypto",
  "sp-core",
@@ -5386,7 +5392,7 @@ dependencies = [
  "pallet-staking",
  "pallet-staking-reward-curve",
  "pallet-timestamp",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "rand 0.7.3",
  "serde",
  "sp-core",
@@ -5404,7 +5410,7 @@ dependencies = [
  "frame-support-test",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "rand_chacha 0.2.2",
  "serde",
  "sp-core",
@@ -5428,7 +5434,7 @@ dependencies = [
  "pallet-session",
  "pallet-staking-reward-curve",
  "pallet-timestamp",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parking_lot 0.11.1",
  "paste 1.0.4",
  "rand_chacha 0.2.2",
@@ -5470,7 +5476,7 @@ version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -5485,7 +5491,7 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -5501,7 +5507,7 @@ dependencies = [
  "frame-system",
  "impl-trait-for-tuples",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-inherents",
@@ -5520,7 +5526,7 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "pallet-treasury",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -5536,7 +5542,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "serde_json",
  "smallvec 1.6.1",
@@ -5555,7 +5561,7 @@ dependencies = [
  "jsonrpc-core-client",
  "jsonrpc-derive",
  "pallet-transaction-payment-rpc-runtime-api",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sp-api",
  "sp-blockchain",
  "sp-core",
@@ -5568,7 +5574,7 @@ name = "pallet-transaction-payment-rpc-runtime-api"
 version = "3.0.0"
 dependencies = [
  "pallet-transaction-payment",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sp-api",
  "sp-runtime",
 ]
@@ -5582,7 +5588,7 @@ dependencies = [
  "frame-system",
  "impl-trait-for-tuples",
  "pallet-balances",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -5599,7 +5605,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -5617,7 +5623,7 @@ dependencies = [
  "frame-system",
  "hex-literal",
  "pallet-balances",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -5675,11 +5681,11 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec"
-version = "2.0.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cd3dab59b5cf4bc81069ade0fc470341a1ef3ad5fa73e5a8943bed2ec12b2e8"
+checksum = "731f4d179ed52b1c7eeb29baf29c604ea9301b889b23ce93660220a5465d5c6f"
 dependencies = [
- "arrayvec 0.5.2",
+ "arrayvec 0.7.0",
  "bitvec 0.20.2",
  "byte-slice-cast 1.0.0",
  "parity-scale-codec-derive",
@@ -5688,9 +5694,9 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec-derive"
-version = "2.0.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa04976a81fde04924b40cc4036c4d12841e8bb04325a5cf2ada75731a150a7d"
+checksum = "f44c5f94427bd0b5076e8f7e15ca3f60a4d8ac0077e4793884e6fdfd8915344e"
 dependencies = [
  "proc-macro-crate 0.1.5",
  "proc-macro2",
@@ -6684,7 +6690,7 @@ dependencies = [
  "jsonrpsee-proc-macros",
  "jsonrpsee-types",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -6889,7 +6895,7 @@ dependencies = [
  "futures-timer 3.0.2",
  "libp2p",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "prost",
  "prost-build",
  "quickcheck",
@@ -6916,7 +6922,7 @@ dependencies = [
  "futures 0.3.13",
  "futures-timer 3.0.2",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parking_lot 0.11.1",
  "sc-block-builder",
  "sc-client-api",
@@ -6938,7 +6944,7 @@ dependencies = [
 name = "sc-block-builder"
 version = "0.9.0"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sc-client-api",
  "sp-api",
  "sp-block-builder",
@@ -6956,7 +6962,7 @@ name = "sc-chain-spec"
 version = "3.0.0"
 dependencies = [
  "impl-trait-for-tuples",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sc-chain-spec-derive",
  "sc-consensus-babe",
  "sc-consensus-epochs",
@@ -6992,7 +6998,7 @@ dependencies = [
  "libp2p",
  "log",
  "names",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "rand 0.7.3",
  "regex",
  "rpassword",
@@ -7031,7 +7037,7 @@ dependencies = [
  "kvdb-memorydb",
  "lazy_static",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parking_lot 0.11.1",
  "sc-executor",
  "sp-api",
@@ -7068,7 +7074,7 @@ dependencies = [
  "linked-hash-map",
  "log",
  "parity-db",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parity-util-mem",
  "parking_lot 0.11.1",
  "quickcheck",
@@ -7111,7 +7117,7 @@ dependencies = [
  "futures-timer 3.0.2",
  "getrandom 0.2.2",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parking_lot 0.11.1",
  "sc-block-builder",
  "sc-client-api",
@@ -7157,7 +7163,7 @@ dependencies = [
  "num-bigint",
  "num-rational",
  "num-traits",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parking_lot 0.11.1",
  "pdqselect",
  "rand 0.7.3",
@@ -7233,7 +7239,7 @@ name = "sc-consensus-epochs"
 version = "0.9.0"
 dependencies = [
  "fork-tree",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sc-client-api",
  "sc-consensus",
  "sp-blockchain",
@@ -7252,7 +7258,7 @@ dependencies = [
  "jsonrpc-core-client",
  "jsonrpc-derive",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parking_lot 0.11.1",
  "sc-basic-authorship",
  "sc-client-api",
@@ -7288,7 +7294,7 @@ dependencies = [
  "futures 0.3.13",
  "futures-timer 3.0.2",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parking_lot 0.11.1",
  "sc-client-api",
  "sp-api",
@@ -7311,7 +7317,7 @@ dependencies = [
  "futures 0.3.13",
  "futures-timer 3.0.2",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sc-client-api",
  "sc-telemetry",
  "sp-api",
@@ -7353,7 +7359,7 @@ dependencies = [
  "lazy_static",
  "libsecp256k1",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parity-wasm 0.41.0",
  "parking_lot 0.11.1",
  "paste 1.0.4",
@@ -7388,7 +7394,7 @@ name = "sc-executor-common"
 version = "0.9.0"
 dependencies = [
  "derive_more",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parity-wasm 0.41.0",
  "pwasm-utils 0.14.0",
  "sp-allocator",
@@ -7404,7 +7410,7 @@ name = "sc-executor-wasmi"
 version = "0.9.0"
 dependencies = [
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sc-executor-common",
  "sp-allocator",
  "sp-core",
@@ -7419,7 +7425,7 @@ version = "0.9.0"
 dependencies = [
  "assert_matches",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parity-wasm 0.41.0",
  "pwasm-utils 0.14.0",
  "sc-executor-common",
@@ -7445,7 +7451,7 @@ dependencies = [
  "futures-timer 3.0.2",
  "linked-hash-map",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parking_lot 0.11.1",
  "pin-project 1.0.5",
  "rand 0.7.3",
@@ -7492,7 +7498,7 @@ dependencies = [
  "jsonrpc-pubsub",
  "lazy_static",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sc-block-builder",
  "sc-client-api",
  "sc-finality-grandpa",
@@ -7518,7 +7524,7 @@ dependencies = [
  "futures 0.3.13",
  "log",
  "num-traits",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parking_lot 0.11.1",
  "prost",
  "rand 0.8.3",
@@ -7578,7 +7584,7 @@ version = "3.0.0"
 dependencies = [
  "hash-db",
  "lazy_static",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parking_lot 0.11.1",
  "sc-client-api",
  "sc-executor",
@@ -7617,7 +7623,7 @@ dependencies = [
  "log",
  "lru",
  "nohash-hasher",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parking_lot 0.11.1",
  "pin-project 1.0.5",
  "prost",
@@ -7712,7 +7718,7 @@ dependencies = [
  "lazy_static",
  "log",
  "num_cpus",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parking_lot 0.11.1",
  "rand 0.7.3",
  "sc-block-builder",
@@ -7767,7 +7773,7 @@ dependencies = [
  "jsonrpc-pubsub",
  "lazy_static",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parking_lot 0.11.1",
  "sc-block-builder",
  "sc-cli",
@@ -7808,7 +7814,7 @@ dependencies = [
  "jsonrpc-derive",
  "jsonrpc-pubsub",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parking_lot 0.11.1",
  "serde",
  "serde_json",
@@ -7867,7 +7873,7 @@ dependencies = [
  "jsonrpc-pubsub",
  "lazy_static",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parity-util-mem",
  "parking_lot 0.11.1",
  "pin-project 1.0.5",
@@ -7930,7 +7936,7 @@ dependencies = [
  "futures 0.3.13",
  "hex-literal",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parking_lot 0.11.1",
  "sc-block-builder",
  "sc-client-api",
@@ -7962,7 +7968,7 @@ name = "sc-state-db"
 version = "0.9.0"
 dependencies = [
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parity-util-mem",
  "parity-util-mem-derive",
  "parking_lot 0.11.1",
@@ -8055,7 +8061,7 @@ dependencies = [
  "futures 0.3.13",
  "linked-hash-map",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parity-util-mem",
  "parking_lot 0.11.1",
  "retain_mut",
@@ -8080,7 +8086,7 @@ dependencies = [
  "hex",
  "intervalier",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parity-util-mem",
  "parking_lot 0.11.1",
  "sc-block-builder",
@@ -8508,7 +8514,7 @@ version = "3.0.0"
 dependencies = [
  "hash-db",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sp-api-proc-macro",
  "sp-core",
  "sp-runtime",
@@ -8536,7 +8542,7 @@ version = "2.0.1"
 dependencies = [
  "criterion",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "rustversion",
  "sc-block-builder",
  "sp-api",
@@ -8555,7 +8561,7 @@ dependencies = [
 name = "sp-application-crypto"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-core",
  "sp-io",
@@ -8581,7 +8587,7 @@ dependencies = [
  "criterion",
  "integer-sqrt",
  "num-traits",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "primitive-types",
  "rand 0.7.3",
  "serde",
@@ -8605,7 +8611,7 @@ dependencies = [
 name = "sp-authority-discovery"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sp-api",
  "sp-application-crypto",
  "sp-runtime",
@@ -8616,7 +8622,7 @@ dependencies = [
 name = "sp-authorship"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sp-inherents",
  "sp-runtime",
  "sp-std",
@@ -8626,7 +8632,7 @@ dependencies = [
 name = "sp-block-builder"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sp-api",
  "sp-inherents",
  "sp-runtime",
@@ -8640,7 +8646,7 @@ dependencies = [
  "futures 0.3.13",
  "log",
  "lru",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parking_lot 0.11.1",
  "sp-api",
  "sp-consensus",
@@ -8667,7 +8673,7 @@ dependencies = [
  "futures-timer 3.0.2",
  "libp2p",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parking_lot 0.11.1",
  "serde",
  "sp-api",
@@ -8689,7 +8695,7 @@ dependencies = [
 name = "sp-consensus-aura"
 version = "0.9.0"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sp-api",
  "sp-application-crypto",
  "sp-consensus",
@@ -8705,7 +8711,7 @@ name = "sp-consensus-babe"
 version = "0.9.0"
 dependencies = [
  "merlin",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-api",
  "sp-application-crypto",
@@ -8724,7 +8730,7 @@ dependencies = [
 name = "sp-consensus-pow"
 version = "0.9.0"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sp-api",
  "sp-core",
  "sp-runtime",
@@ -8735,7 +8741,7 @@ dependencies = [
 name = "sp-consensus-slots"
 version = "0.9.0"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sp-arithmetic",
  "sp-runtime",
 ]
@@ -8744,7 +8750,7 @@ dependencies = [
 name = "sp-consensus-vrf"
 version = "0.9.0"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "schnorrkel",
  "sp-core",
  "sp-runtime",
@@ -8772,7 +8778,7 @@ dependencies = [
  "log",
  "merlin",
  "num-traits",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parity-util-mem",
  "parking_lot 0.11.1",
  "pretty_assertions",
@@ -8822,7 +8828,7 @@ name = "sp-externalities"
 version = "0.9.0"
 dependencies = [
  "environmental",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sp-std",
  "sp-storage",
 ]
@@ -8833,7 +8839,7 @@ version = "3.0.0"
 dependencies = [
  "finality-grandpa",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-api",
  "sp-application-crypto",
@@ -8847,7 +8853,7 @@ dependencies = [
 name = "sp-inherents"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parking_lot 0.11.1",
  "sp-core",
  "sp-std",
@@ -8862,7 +8868,7 @@ dependencies = [
  "hash-db",
  "libsecp256k1",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parking_lot 0.11.1",
  "sp-core",
  "sp-externalities",
@@ -8895,7 +8901,7 @@ dependencies = [
  "derive_more",
  "futures 0.3.13",
  "merlin",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parking_lot 0.11.1",
  "rand 0.7.3",
  "rand_chacha 0.2.2",
@@ -8909,7 +8915,7 @@ dependencies = [
 name = "sp-npos-elections"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "rand 0.7.3",
  "serde",
  "sp-arithmetic",
@@ -8924,7 +8930,7 @@ dependencies = [
 name = "sp-npos-elections-compact"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "proc-macro-crate 1.0.0",
  "proc-macro2",
  "quote",
@@ -8939,7 +8945,7 @@ name = "sp-npos-elections-fuzzer"
 version = "2.0.0-alpha.5"
 dependencies = [
  "honggfuzz",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "rand 0.7.3",
  "sp-arithmetic",
  "sp-npos-elections",
@@ -8982,7 +8988,7 @@ dependencies = [
  "hash256-std-hasher",
  "impl-trait-for-tuples",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parity-util-mem",
  "paste 1.0.4",
  "rand 0.7.3",
@@ -9004,7 +9010,7 @@ name = "sp-runtime-interface"
 version = "3.0.0"
 dependencies = [
  "impl-trait-for-tuples",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "primitive-types",
  "rustversion",
  "sp-core",
@@ -9075,7 +9081,7 @@ name = "sp-sandbox"
 version = "0.9.0"
 dependencies = [
  "assert_matches",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sp-core",
  "sp-io",
  "sp-std",
@@ -9096,7 +9102,7 @@ dependencies = [
 name = "sp-session"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sp-api",
  "sp-core",
  "sp-runtime",
@@ -9108,7 +9114,7 @@ dependencies = [
 name = "sp-staking"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sp-runtime",
  "sp-std",
 ]
@@ -9121,7 +9127,7 @@ dependencies = [
  "hex-literal",
  "log",
  "num-traits",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parking_lot 0.11.1",
  "pretty_assertions",
  "rand 0.7.3",
@@ -9146,7 +9152,7 @@ name = "sp-storage"
 version = "3.0.0"
 dependencies = [
  "impl-serde",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "ref-cast",
  "serde",
  "sp-debug-derive",
@@ -9158,7 +9164,7 @@ name = "sp-tasks"
 version = "3.0.0"
 dependencies = [
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sp-core",
  "sp-externalities",
  "sp-io",
@@ -9170,7 +9176,7 @@ dependencies = [
 name = "sp-test-primitives"
 version = "2.0.0"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parity-util-mem",
  "serde",
  "sp-application-crypto",
@@ -9182,7 +9188,7 @@ dependencies = [
 name = "sp-timestamp"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sp-api",
  "sp-inherents",
  "sp-runtime",
@@ -9195,7 +9201,7 @@ name = "sp-tracing"
 version = "3.0.0"
 dependencies = [
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sp-std",
  "tracing",
  "tracing-core",
@@ -9209,7 +9215,7 @@ dependencies = [
  "derive_more",
  "futures 0.3.13",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-api",
  "sp-blockchain",
@@ -9225,7 +9231,7 @@ dependencies = [
  "hash-db",
  "hex-literal",
  "memory-db",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sp-core",
  "sp-runtime",
  "sp-std",
@@ -9251,7 +9257,7 @@ name = "sp-version"
 version = "3.0.0"
 dependencies = [
  "impl-serde",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "serde",
  "sp-runtime",
  "sp-std",
@@ -9262,7 +9268,7 @@ name = "sp-wasm-interface"
 version = "3.0.0"
 dependencies = [
  "impl-trait-for-tuples",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sp-std",
  "wasmi",
 ]
@@ -9437,7 +9443,7 @@ dependencies = [
  "futures 0.3.13",
  "jsonrpc-client-transports",
  "jsonrpc-core",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sc-rpc-api",
  "serde",
  "sp-storage",
@@ -9454,7 +9460,7 @@ dependencies = [
  "jsonrpc-core-client",
  "jsonrpc-derive",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sc-client-api",
  "sc-rpc-api",
  "sc-transaction-pool",
@@ -9491,7 +9497,7 @@ dependencies = [
  "futures 0.3.13",
  "hash-db",
  "hex",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sc-client-api",
  "sc-client-db",
  "sc-consensus",
@@ -9523,7 +9529,7 @@ dependencies = [
  "memory-db",
  "pallet-babe",
  "pallet-timestamp",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parity-util-mem",
  "sc-block-builder",
  "sc-executor",
@@ -9559,7 +9565,7 @@ name = "substrate-test-runtime-client"
 version = "2.0.0"
 dependencies = [
  "futures 0.3.13",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "sc-block-builder",
  "sc-client-api",
  "sc-consensus",
@@ -9580,7 +9586,7 @@ version = "2.0.0"
 dependencies = [
  "derive_more",
  "futures 0.3.13",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "parking_lot 0.11.1",
  "sc-transaction-graph",
  "sp-blockchain",
@@ -10292,7 +10298,7 @@ dependencies = [
  "hash-db",
  "keccak-hasher",
  "memory-db",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "trie-db",
  "trie-root",
  "trie-standardmap",
@@ -10385,7 +10391,7 @@ version = "0.9.0"
 dependencies = [
  "frame-try-runtime",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.0",
  "remote-externalities",
  "sc-cli",
  "sc-client-api",
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index 536127e6726c..d8a50f9f7a18 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -182,7 +182,7 @@ pub mod pallet {
 			+ OriginTrait<Call=Self::Call>;
 
 		/// The aggregated `Call` type.
-		type Call: Dispatchable + Debug + FullCodec;
+		type Call: Dispatchable + Debug;
 
 		/// Account index (aka nonce) type. This stores the number of previous transactions associated
 		/// with a sender account.

From 28dfa0b92da44e0bf0512d1cdf4f60c5d7509a39 Mon Sep 17 00:00:00 2001
From: Jonathan Brown <jbrown@acuity.social>
Date: Wed, 7 Apr 2021 15:05:24 +0700
Subject: [PATCH 0610/1194] Remove node-runtime dependency from node-rpc.
 (#8539)

* Remove node-runtime dependency from node-rpc.

The node-runtime dependency is not used and increases build times.

* update Cargo.lock
---
 Cargo.lock              | 1 -
 bin/node/rpc/Cargo.toml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 093126e5ce8c..290cad9e4711 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4244,7 +4244,6 @@ version = "2.0.0"
 dependencies = [
  "jsonrpc-core",
  "node-primitives",
- "node-runtime",
  "pallet-contracts-rpc",
  "pallet-mmr-rpc",
  "pallet-transaction-payment-rpc",
diff --git a/bin/node/rpc/Cargo.toml b/bin/node/rpc/Cargo.toml
index 7a25b6d8b0f6..fc1701d1856f 100644
--- a/bin/node/rpc/Cargo.toml
+++ b/bin/node/rpc/Cargo.toml
@@ -13,7 +13,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 jsonrpc-core = "15.1.0"
 node-primitives = { version = "2.0.0", path = "../primitives" }
-node-runtime = { version = "2.0.0", path = "../runtime" }
 pallet-contracts-rpc = { version = "3.0.0", path = "../../../frame/contracts/rpc/" }
 pallet-mmr-rpc = { version = "3.0.0", path = "../../../frame/merkle-mountain-range/rpc/" }
 pallet-transaction-payment-rpc = { version = "3.0.0", path = "../../../frame/transaction-payment/rpc/" }

From 4cdecafbea7abd133a2b8a8f95ceb807ca3d5e44 Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann <ben@gnunicorn.org>
Date: Wed, 7 Apr 2021 12:06:39 +0200
Subject: [PATCH 0611/1194] Let's put up monthly pre-release tags (#8552)

* trying to monthly tag for the first time
---
 .github/workflows/monthly-tag.yml | 40 +++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 .github/workflows/monthly-tag.yml

diff --git a/.github/workflows/monthly-tag.yml b/.github/workflows/monthly-tag.yml
new file mode 100644
index 000000000000..8e3733766483
--- /dev/null
+++ b/.github/workflows/monthly-tag.yml
@@ -0,0 +1,40 @@
+name: Monthly Snapshot Tag
+
+on:
+  schedule:
+    - cron: "0 1 1 * *"
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Take Snapshot
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get the tags by date
+        id: tags
+        run: |
+          echo "::set-output name=new::$(date +'monthly-%Y-%m')"
+          echo "::set-output name=old::$(date -d'1 month ago' +'monthly-%Y-%m')"
+      - name: Checkout branch "master"
+        uses: actions/checkout@v2
+        with:
+          ref: 'master'
+      - name: Generate changelog
+        id: changelog
+        run: |
+          echo "# Automatic snapshot pre-release ${{ steps.tags.outputs.new }}" > Changelog.md
+          echo "" >> Changelog.md
+          echo "## Changes since last snapshot (${{ steps.tags.outputs.old }})" >> Changelog.md
+          echo "" >> Changelog.md
+          GITHUB_DEPLOY_TOKEN=${{ secrets.GITHUB_TOKEN }} ./.maintain/gitlab/generate_changelog.sh ${{ steps.tags.outputs.old }} >>  Changelog.md
+      - name: Release snapshot
+        id: release-snapshot
+        uses: actions/create-release@latest
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ steps.tags.outputs.new }}
+          release_name: ${{ steps.tags.outputs.new }}
+          draft: false
+          prerelease: true
+          body_path: Changelog.md

From 49330a50a6f86585d79a4481966db58cfd6cac38 Mon Sep 17 00:00:00 2001
From: Martin Pugh <pugh@s3kr.it>
Date: Wed, 7 Apr 2021 12:52:02 +0200
Subject: [PATCH 0612/1194] fix monthly tags (#8554)

---
 .github/workflows/monthly-tag.yml      | 3 ++-
 .maintain/gitlab/generate_changelog.sh | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/monthly-tag.yml b/.github/workflows/monthly-tag.yml
index 8e3733766483..09c3decc26d8 100644
--- a/.github/workflows/monthly-tag.yml
+++ b/.github/workflows/monthly-tag.yml
@@ -19,6 +19,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           ref: 'master'
+          fetch-depth: 0
       - name: Generate changelog
         id: changelog
         run: |
@@ -26,7 +27,7 @@ jobs:
           echo "" >> Changelog.md
           echo "## Changes since last snapshot (${{ steps.tags.outputs.old }})" >> Changelog.md
           echo "" >> Changelog.md
-          GITHUB_DEPLOY_TOKEN=${{ secrets.GITHUB_TOKEN }} ./.maintain/gitlab/generate_changelog.sh ${{ steps.tags.outputs.old }} >>  Changelog.md
+          ./.maintain/gitlab/generate_changelog.sh ${{ steps.tags.outputs.old }} >>  Changelog.md
       - name: Release snapshot
         id: release-snapshot
         uses: actions/create-release@latest
diff --git a/.maintain/gitlab/generate_changelog.sh b/.maintain/gitlab/generate_changelog.sh
index a1190f2bf0bc..32ac1760a611 100755
--- a/.maintain/gitlab/generate_changelog.sh
+++ b/.maintain/gitlab/generate_changelog.sh
@@ -32,7 +32,7 @@ $line"
     runtime_changes="$runtime_changes
 $line"
   fi
-  if has_label 'paritytech/substrate' "$pr_id" 'D1-runtime-migration'; then
+  if has_label 'paritytech/substrate' "$pr_id" 'E1-runtime-migration'; then
     migrations="$migrations
 $line"
   fi

From 7bb59a6dab135d413be1632855fe09ffdcb2bd50 Mon Sep 17 00:00:00 2001
From: Martin Pugh <pugh@s3kr.it>
Date: Wed, 7 Apr 2021 13:24:54 +0200
Subject: [PATCH 0613/1194] Fix monthly tags #2 (#8557)

* fix monthly tags

* explicitly set GITHUB_TOKEN

* debug

* Update monthly-tag.yml

* Revert "debug"

This reverts commit 041735d1e5ee78fbb54a841f8fe87a0ba7f1098b and
9ed60840e1647f4e0a5797776a68f0faa0569713
---
 .github/workflows/monthly-tag.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/monthly-tag.yml b/.github/workflows/monthly-tag.yml
index 09c3decc26d8..8736a341cecf 100644
--- a/.github/workflows/monthly-tag.yml
+++ b/.github/workflows/monthly-tag.yml
@@ -22,6 +22,8 @@ jobs:
           fetch-depth: 0
       - name: Generate changelog
         id: changelog
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           echo "# Automatic snapshot pre-release ${{ steps.tags.outputs.new }}" > Changelog.md
           echo "" >> Changelog.md

From f29665683c3cfbad2638972ca652da7b34b5385b Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Wed, 7 Apr 2021 15:43:24 +0300
Subject: [PATCH 0614/1194] Drain blocks on peer disconnect (#8553)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Drain blocks on peer disconnect

* Finish comment

* Fixed test

* Update client/network/src/protocol/sync.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 client/network/src/protocol.rs      |  4 ++-
 client/network/src/protocol/sync.rs | 54 +++++++++++++++++++++++++----
 2 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index bbb87b5255d1..1ae1d48cba3c 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -526,7 +526,9 @@ impl<B: BlockT> Protocol<B> {
 		}
 
 		if let Some(_peer_data) = self.peers.remove(&peer) {
-			self.sync.peer_disconnected(&peer);
+			if let Some(sync::OnBlockData::Import(origin, blocks)) = self.sync.peer_disconnected(&peer) {
+				self.pending_messages.push_back(CustomMessageOutcome::BlockImport(origin, blocks));
+			}
 			Ok(())
 		} else {
 			Err(())
diff --git a/client/network/src/protocol/sync.rs b/client/network/src/protocol/sync.rs
index dd682bf348b0..6e07bd4c9697 100644
--- a/client/network/src/protocol/sync.rs
+++ b/client/network/src/protocol/sync.rs
@@ -738,10 +738,19 @@ impl<B: BlockT> ChainSync<B> {
 			// If our best queued is more than `MAX_BLOCKS_TO_LOOK_BACKWARDS` blocks away from the
 			// common number, the peer best number is higher than our best queued and the common
 			// number is smaller than the last finalized block number, we should do an ancestor
-			// search to find a better common block.
+			// search to find a better common block. If the queue is full we wait till all blocks are
+			// imported though.
 			if best_queued.saturating_sub(peer.common_number) > MAX_BLOCKS_TO_LOOK_BACKWARDS.into()
 				&& best_queued < peer.best_number && peer.common_number < last_finalized
+				&& queue.len() <= MAJOR_SYNC_BLOCKS.into()
 			{
+				trace!(
+					target: "sync",
+					"Peer {:?} common block {} too far behind of our best {}. Starting ancestry search.",
+					id,
+					peer.common_number,
+					best_queued,
+				);
 				let current = std::cmp::min(peer.best_number, best_queued);
 				peer.state = PeerSyncState::AncestorSearch {
 					current,
@@ -804,7 +813,7 @@ impl<B: BlockT> ChainSync<B> {
 		response: BlockResponse<B>
 	) -> Result<OnBlockData<B>, BadPeer> {
 		self.downloaded_blocks += response.blocks.len();
-		let mut new_blocks: Vec<IncomingBlock<B>> =
+		let new_blocks: Vec<IncomingBlock<B>> =
 			if let Some(peer) = self.peers.get_mut(who) {
 				let mut blocks = response.blocks;
 				if request.as_ref().map_or(false, |r| r.direction == message::Direction::Descending) {
@@ -970,6 +979,13 @@ impl<B: BlockT> ChainSync<B> {
 				return Err(BadPeer(who.clone(), rep::NOT_REQUESTED));
 			};
 
+		Ok(self.validate_and_queue_blocks(new_blocks))
+	}
+
+	fn validate_and_queue_blocks(
+		&mut self,
+		mut new_blocks: Vec<IncomingBlock<B>>,
+	) -> OnBlockData<B> {
 		let orig_len = new_blocks.len();
 		new_blocks.retain(|b| !self.queue_blocks.contains(&b.hash));
 		if new_blocks.len() != orig_len {
@@ -992,10 +1008,8 @@ impl<B: BlockT> ChainSync<B> {
 			);
 			self.on_block_queued(h, n)
 		}
-
 		self.queue_blocks.extend(new_blocks.iter().map(|b| b.hash));
-
-		Ok(OnBlockData::Import(origin, new_blocks))
+		OnBlockData::Import(origin, new_blocks)
 	}
 
 	/// Handle a response from the remote to a justification request that we made.
@@ -1353,7 +1367,7 @@ impl<B: BlockT> ChainSync<B> {
 					PreValidateBlockAnnounce::Failure { who, disconnect }
 				}
 				Err(e) => {
-					error!(
+					debug!(
 						target: "sync",
 						"💔 Block announcement validation of block {:?} errored: {}",
 						hash,
@@ -1542,11 +1556,34 @@ impl<B: BlockT> ChainSync<B> {
 	}
 
 	/// Call when a peer has disconnected.
-	pub fn peer_disconnected(&mut self, who: &PeerId) {
+	/// Canceled obsolete block request may result in some blocks being ready for
+	/// import, so this functions checks for such blocks and returns them.
+	pub fn peer_disconnected(&mut self, who: &PeerId) -> Option<OnBlockData<B>> {
 		self.blocks.clear_peer_download(who);
 		self.peers.remove(who);
 		self.extra_justifications.peer_disconnected(who);
 		self.pending_requests.set_all();
+		let blocks: Vec<_> = self.blocks
+			.drain(self.best_queued_number + One::one())
+			.into_iter()
+			.map(|block_data| {
+				let justifications =
+					legacy_justification_mapping(block_data.block.justification);
+				IncomingBlock {
+					hash: block_data.block.hash,
+					header: block_data.block.header,
+					body: block_data.block.body,
+					justifications,
+					origin: block_data.origin,
+					allow_missing_state: true,
+					import_existing: false,
+				}
+			}).collect();
+		if !blocks.is_empty() {
+			Some(self.validate_and_queue_blocks(blocks))
+		} else {
+			None
+		}
 	}
 
 	/// Restart the sync process. This will reset all pending block requests and return an iterator
@@ -2349,6 +2386,9 @@ mod test {
 					.for_each(|b| block_on(client.import_as_final(BlockOrigin::Own, b)).unwrap());
 		}
 
+		// "Wait" for the queue to clear
+		sync.queue_blocks.clear();
+
 		// Let peer2 announce that it finished syncing
 		send_block_announce(best_block.header().clone(), &peer_id2, &mut sync);
 

From a1574d36ef25b77bcc5d82e57659d5454fdf12d5 Mon Sep 17 00:00:00 2001
From: Seun Lanlege <seun@parity.io>
Date: Wed, 7 Apr 2021 13:54:31 +0100
Subject: [PATCH 0615/1194] Clean test runner up (#8485)

* bump scale-codec in test runner

* refactor config

* Update test-utils/test-runner/Cargo.toml

Co-authored-by: Andronik Ordian <write@reusable.software>

* bump cargo.lock

* add reasonable defaults

Co-authored-by: Andronik Ordian <write@reusable.software>
---
 Cargo.lock                              | 352 +++++++++++-------------
 bin/node/test-runner-example/Cargo.toml |   1 -
 bin/node/test-runner-example/src/lib.rs |  19 +-
 test-utils/test-runner/Cargo.toml       |   8 -
 test-utils/test-runner/src/lib.rs       |   6 +-
 test-utils/test-runner/src/node.rs      | 111 +-------
 test-utils/test-runner/src/utils.rs     |  98 ++++++-
 7 files changed, 272 insertions(+), 323 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 290cad9e4711..1824e956ced3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -502,16 +502,6 @@ version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
 
-[[package]]
-name = "bitvec"
-version = "0.17.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41262f11d771fd4a61aa3ce019fca363b4b6c282fca9da2a31186d3965a47a5c"
-dependencies = [
- "either",
- "radium 0.3.0",
-]
-
 [[package]]
 name = "bitvec"
 version = "0.20.2"
@@ -519,7 +509,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f682656975d3a682daff957be4ddeb65d6ad656737cd821f2d00685ae466af1"
 dependencies = [
  "funty",
- "radium 0.6.2",
+ "radium",
  "tap",
  "wyz",
 ]
@@ -675,12 +665,6 @@ version = "3.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe"
 
-[[package]]
-name = "byte-slice-cast"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3"
-
 [[package]]
 name = "byte-slice-cast"
 version = "1.0.0"
@@ -1668,7 +1652,7 @@ dependencies = [
  "futures-timer 3.0.2",
  "log",
  "num-traits",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parking_lot 0.11.1",
  "rand 0.8.3",
 ]
@@ -1714,7 +1698,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 name = "fork-tree"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
 ]
 
 [[package]]
@@ -1736,7 +1720,7 @@ dependencies = [
  "hex-literal",
  "linregress",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "paste 1.0.4",
  "serde",
  "sp-api",
@@ -1755,7 +1739,7 @@ dependencies = [
  "chrono",
  "frame-benchmarking",
  "handlebars",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sc-cli",
  "sc-client-db",
  "sc-executor",
@@ -1775,7 +1759,7 @@ version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sp-arithmetic",
  "sp-npos-elections",
  "sp-runtime",
@@ -1792,7 +1776,7 @@ dependencies = [
  "pallet-balances",
  "pallet-indices",
  "pallet-transaction-payment",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -1806,7 +1790,7 @@ dependencies = [
 name = "frame-metadata"
 version = "13.0.0"
 dependencies = [
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-std",
@@ -1823,7 +1807,7 @@ dependencies = [
  "impl-trait-for-tuples",
  "log",
  "once_cell",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parity-util-mem",
  "paste 1.0.4",
  "pretty_assertions",
@@ -1878,7 +1862,7 @@ dependencies = [
  "frame-metadata",
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "pretty_assertions",
  "rustversion",
  "serde",
@@ -1899,7 +1883,7 @@ dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-externalities",
@@ -1917,7 +1901,7 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -1929,7 +1913,7 @@ dependencies = [
 name = "frame-system-rpc-runtime-api"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sp-api",
 ]
 
@@ -1938,7 +1922,7 @@ name = "frame-try-runtime"
 version = "0.9.0"
 dependencies = [
  "frame-support",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sp-api",
  "sp-runtime",
  "sp-std",
@@ -2660,7 +2644,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df170efa359aebdd5cb7fe78edcc67107748e4737bdca8a8fb40d15ea7a877ed"
 dependencies = [
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
 ]
 
 [[package]]
@@ -4120,7 +4104,7 @@ dependencies = [
  "pallet-staking",
  "pallet-timestamp",
  "pallet-transaction-payment",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parking_lot 0.11.1",
  "platforms",
  "rand 0.7.3",
@@ -4193,7 +4177,7 @@ dependencies = [
  "pallet-timestamp",
  "pallet-transaction-payment",
  "pallet-treasury",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sc-executor",
  "sp-application-crypto",
  "sp-consensus-babe",
@@ -4215,7 +4199,7 @@ version = "0.8.0"
 dependencies = [
  "derive_more",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sc-cli",
  "sc-client-api",
  "sc-service",
@@ -4230,7 +4214,7 @@ name = "node-primitives"
 version = "2.0.0"
 dependencies = [
  "frame-system",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "pretty_assertions",
  "sp-application-crypto",
  "sp-core",
@@ -4337,7 +4321,7 @@ dependencies = [
  "pallet-treasury",
  "pallet-utility",
  "pallet-vesting",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-api",
  "sp-authority-discovery",
@@ -4416,7 +4400,7 @@ dependencies = [
  "pallet-timestamp",
  "pallet-transaction-payment",
  "pallet-transaction-payment-rpc-runtime-api",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-api",
  "sp-block-builder",
@@ -4455,7 +4439,7 @@ dependencies = [
  "pallet-timestamp",
  "pallet-transaction-payment",
  "pallet-treasury",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sc-block-builder",
  "sc-cli",
  "sc-client-api",
@@ -4630,7 +4614,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -4645,7 +4629,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -4662,7 +4646,7 @@ dependencies = [
  "lazy_static",
  "pallet-session",
  "pallet-timestamp",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parking_lot 0.11.1",
  "serde",
  "sp-application-crypto",
@@ -4680,7 +4664,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-session",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-application-crypto",
  "sp-authority-discovery",
@@ -4698,7 +4682,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "impl-trait-for-tuples",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-authorship",
  "sp-core",
@@ -4724,7 +4708,7 @@ dependencies = [
  "pallet-staking",
  "pallet-staking-reward-curve",
  "pallet-timestamp",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-application-crypto",
  "sp-consensus-babe",
@@ -4746,7 +4730,7 @@ dependencies = [
  "frame-system",
  "log",
  "pallet-transaction-payment",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -4763,7 +4747,7 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "pallet-treasury",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -4782,7 +4766,7 @@ dependencies = [
  "hex-literal",
  "log",
  "pallet-balances",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -4805,7 +4789,7 @@ dependencies = [
  "pallet-contracts-proc-macro",
  "pallet-randomness-collective-flip",
  "pallet-timestamp",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parity-wasm 0.41.0",
  "paste 1.0.4",
  "pretty_assertions",
@@ -4827,7 +4811,7 @@ name = "pallet-contracts-primitives"
 version = "3.0.0"
 dependencies = [
  "bitflags",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sp-runtime",
  "sp-std",
 ]
@@ -4850,7 +4834,7 @@ dependencies = [
  "jsonrpc-derive",
  "pallet-contracts-primitives",
  "pallet-contracts-rpc-runtime-api",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "serde_json",
  "sp-api",
@@ -4865,7 +4849,7 @@ name = "pallet-contracts-rpc-runtime-api"
 version = "3.0.0"
 dependencies = [
  "pallet-contracts-primitives",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sp-api",
  "sp-runtime",
  "sp-std",
@@ -4881,7 +4865,7 @@ dependencies = [
  "hex-literal",
  "pallet-balances",
  "pallet-scheduler",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -4902,7 +4886,7 @@ dependencies = [
  "hex-literal",
  "log",
  "pallet-balances",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parking_lot 0.11.1",
  "paste 1.0.4",
  "rand 0.7.3",
@@ -4926,7 +4910,7 @@ dependencies = [
  "frame-system",
  "hex-literal",
  "pallet-balances",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -4944,7 +4928,7 @@ dependencies = [
  "hex-literal",
  "log",
  "pallet-balances",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -4963,7 +4947,7 @@ dependencies = [
  "frame-system",
  "log",
  "pallet-balances",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -4979,7 +4963,7 @@ dependencies = [
  "frame-system",
  "lite-json",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -4994,7 +4978,7 @@ version = "2.0.1"
 dependencies = [
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -5011,7 +4995,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-arithmetic",
  "sp-core",
@@ -5037,7 +5021,7 @@ dependencies = [
  "pallet-staking",
  "pallet-staking-reward-curve",
  "pallet-timestamp",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-application-crypto",
  "sp-core",
@@ -5059,7 +5043,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -5077,7 +5061,7 @@ dependencies = [
  "log",
  "pallet-authorship",
  "pallet-session",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-application-crypto",
  "sp-core",
@@ -5095,7 +5079,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -5113,7 +5097,7 @@ dependencies = [
  "frame-support-test",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -5127,7 +5111,7 @@ version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -5146,7 +5130,7 @@ dependencies = [
  "frame-system",
  "hex-literal",
  "pallet-mmr-primitives",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -5162,7 +5146,7 @@ dependencies = [
  "frame-system",
  "hex-literal",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-api",
  "sp-core",
@@ -5178,7 +5162,7 @@ dependencies = [
  "jsonrpc-core-client",
  "jsonrpc-derive",
  "pallet-mmr-primitives",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "serde_json",
  "sp-api",
@@ -5196,7 +5180,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -5211,7 +5195,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -5226,7 +5210,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -5242,7 +5226,7 @@ dependencies = [
  "frame-system",
  "log",
  "pallet-balances",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -5268,7 +5252,7 @@ dependencies = [
  "pallet-staking",
  "pallet-staking-reward-curve",
  "pallet-timestamp",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -5286,7 +5270,7 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "pallet-utility",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -5300,7 +5284,7 @@ version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "safe-mix",
  "serde",
  "sp-core",
@@ -5317,7 +5301,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -5333,7 +5317,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -5349,7 +5333,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -5366,7 +5350,7 @@ dependencies = [
  "impl-trait-for-tuples",
  "lazy_static",
  "pallet-timestamp",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-application-crypto",
  "sp-core",
@@ -5391,7 +5375,7 @@ dependencies = [
  "pallet-staking",
  "pallet-staking-reward-curve",
  "pallet-timestamp",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "rand 0.7.3",
  "serde",
  "sp-core",
@@ -5409,7 +5393,7 @@ dependencies = [
  "frame-support-test",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "rand_chacha 0.2.2",
  "serde",
  "sp-core",
@@ -5433,7 +5417,7 @@ dependencies = [
  "pallet-session",
  "pallet-staking-reward-curve",
  "pallet-timestamp",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parking_lot 0.11.1",
  "paste 1.0.4",
  "rand_chacha 0.2.2",
@@ -5475,7 +5459,7 @@ version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -5490,7 +5474,7 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -5506,7 +5490,7 @@ dependencies = [
  "frame-system",
  "impl-trait-for-tuples",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-inherents",
@@ -5525,7 +5509,7 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "pallet-treasury",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -5541,7 +5525,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "serde_json",
  "smallvec 1.6.1",
@@ -5560,7 +5544,7 @@ dependencies = [
  "jsonrpc-core-client",
  "jsonrpc-derive",
  "pallet-transaction-payment-rpc-runtime-api",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sp-api",
  "sp-blockchain",
  "sp-core",
@@ -5573,7 +5557,7 @@ name = "pallet-transaction-payment-rpc-runtime-api"
 version = "3.0.0"
 dependencies = [
  "pallet-transaction-payment",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sp-api",
  "sp-runtime",
 ]
@@ -5587,7 +5571,7 @@ dependencies = [
  "frame-system",
  "impl-trait-for-tuples",
  "pallet-balances",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -5604,7 +5588,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -5622,7 +5606,7 @@ dependencies = [
  "frame-system",
  "hex-literal",
  "pallet-balances",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -5666,18 +5650,6 @@ dependencies = [
  "url 2.2.1",
 ]
 
-[[package]]
-name = "parity-scale-codec"
-version = "1.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4b26b16c7687c3075982af47719e481815df30bc544f7a6690763a25ca16e9d"
-dependencies = [
- "arrayvec 0.5.2",
- "bitvec 0.17.4",
- "byte-slice-cast 0.3.5",
- "serde",
-]
-
 [[package]]
 name = "parity-scale-codec"
 version = "2.1.0"
@@ -5685,8 +5657,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "731f4d179ed52b1c7eeb29baf29c604ea9301b889b23ce93660220a5465d5c6f"
 dependencies = [
  "arrayvec 0.7.0",
- "bitvec 0.20.2",
- "byte-slice-cast 1.0.0",
+ "bitvec",
+ "byte-slice-cast",
  "parity-scale-codec-derive",
  "serde",
 ]
@@ -6381,12 +6353,6 @@ dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "radium"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac"
-
 [[package]]
 name = "radium"
 version = "0.6.2"
@@ -6689,7 +6655,7 @@ dependencies = [
  "jsonrpsee-proc-macros",
  "jsonrpsee-types",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -6894,7 +6860,7 @@ dependencies = [
  "futures-timer 3.0.2",
  "libp2p",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "prost",
  "prost-build",
  "quickcheck",
@@ -6921,7 +6887,7 @@ dependencies = [
  "futures 0.3.13",
  "futures-timer 3.0.2",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parking_lot 0.11.1",
  "sc-block-builder",
  "sc-client-api",
@@ -6943,7 +6909,7 @@ dependencies = [
 name = "sc-block-builder"
 version = "0.9.0"
 dependencies = [
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sc-client-api",
  "sp-api",
  "sp-block-builder",
@@ -6961,7 +6927,7 @@ name = "sc-chain-spec"
 version = "3.0.0"
 dependencies = [
  "impl-trait-for-tuples",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sc-chain-spec-derive",
  "sc-consensus-babe",
  "sc-consensus-epochs",
@@ -6997,7 +6963,7 @@ dependencies = [
  "libp2p",
  "log",
  "names",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "rand 0.7.3",
  "regex",
  "rpassword",
@@ -7036,7 +7002,7 @@ dependencies = [
  "kvdb-memorydb",
  "lazy_static",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parking_lot 0.11.1",
  "sc-executor",
  "sp-api",
@@ -7073,7 +7039,7 @@ dependencies = [
  "linked-hash-map",
  "log",
  "parity-db",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parity-util-mem",
  "parking_lot 0.11.1",
  "quickcheck",
@@ -7116,7 +7082,7 @@ dependencies = [
  "futures-timer 3.0.2",
  "getrandom 0.2.2",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parking_lot 0.11.1",
  "sc-block-builder",
  "sc-client-api",
@@ -7162,7 +7128,7 @@ dependencies = [
  "num-bigint",
  "num-rational",
  "num-traits",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parking_lot 0.11.1",
  "pdqselect",
  "rand 0.7.3",
@@ -7238,7 +7204,7 @@ name = "sc-consensus-epochs"
 version = "0.9.0"
 dependencies = [
  "fork-tree",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sc-client-api",
  "sc-consensus",
  "sp-blockchain",
@@ -7257,7 +7223,7 @@ dependencies = [
  "jsonrpc-core-client",
  "jsonrpc-derive",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parking_lot 0.11.1",
  "sc-basic-authorship",
  "sc-client-api",
@@ -7293,7 +7259,7 @@ dependencies = [
  "futures 0.3.13",
  "futures-timer 3.0.2",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parking_lot 0.11.1",
  "sc-client-api",
  "sp-api",
@@ -7316,7 +7282,7 @@ dependencies = [
  "futures 0.3.13",
  "futures-timer 3.0.2",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sc-client-api",
  "sc-telemetry",
  "sp-api",
@@ -7358,7 +7324,7 @@ dependencies = [
  "lazy_static",
  "libsecp256k1",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parity-wasm 0.41.0",
  "parking_lot 0.11.1",
  "paste 1.0.4",
@@ -7393,7 +7359,7 @@ name = "sc-executor-common"
 version = "0.9.0"
 dependencies = [
  "derive_more",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parity-wasm 0.41.0",
  "pwasm-utils 0.14.0",
  "sp-allocator",
@@ -7409,7 +7375,7 @@ name = "sc-executor-wasmi"
 version = "0.9.0"
 dependencies = [
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sc-executor-common",
  "sp-allocator",
  "sp-core",
@@ -7424,7 +7390,7 @@ version = "0.9.0"
 dependencies = [
  "assert_matches",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parity-wasm 0.41.0",
  "pwasm-utils 0.14.0",
  "sc-executor-common",
@@ -7450,7 +7416,7 @@ dependencies = [
  "futures-timer 3.0.2",
  "linked-hash-map",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parking_lot 0.11.1",
  "pin-project 1.0.5",
  "rand 0.7.3",
@@ -7497,7 +7463,7 @@ dependencies = [
  "jsonrpc-pubsub",
  "lazy_static",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sc-block-builder",
  "sc-client-api",
  "sc-finality-grandpa",
@@ -7523,7 +7489,7 @@ dependencies = [
  "futures 0.3.13",
  "log",
  "num-traits",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parking_lot 0.11.1",
  "prost",
  "rand 0.8.3",
@@ -7583,7 +7549,7 @@ version = "3.0.0"
 dependencies = [
  "hash-db",
  "lazy_static",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parking_lot 0.11.1",
  "sc-client-api",
  "sc-executor",
@@ -7622,7 +7588,7 @@ dependencies = [
  "log",
  "lru",
  "nohash-hasher",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parking_lot 0.11.1",
  "pin-project 1.0.5",
  "prost",
@@ -7717,7 +7683,7 @@ dependencies = [
  "lazy_static",
  "log",
  "num_cpus",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parking_lot 0.11.1",
  "rand 0.7.3",
  "sc-block-builder",
@@ -7772,7 +7738,7 @@ dependencies = [
  "jsonrpc-pubsub",
  "lazy_static",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parking_lot 0.11.1",
  "sc-block-builder",
  "sc-cli",
@@ -7813,7 +7779,7 @@ dependencies = [
  "jsonrpc-derive",
  "jsonrpc-pubsub",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parking_lot 0.11.1",
  "serde",
  "serde_json",
@@ -7872,7 +7838,7 @@ dependencies = [
  "jsonrpc-pubsub",
  "lazy_static",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parity-util-mem",
  "parking_lot 0.11.1",
  "pin-project 1.0.5",
@@ -7935,7 +7901,7 @@ dependencies = [
  "futures 0.3.13",
  "hex-literal",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parking_lot 0.11.1",
  "sc-block-builder",
  "sc-client-api",
@@ -7967,7 +7933,7 @@ name = "sc-state-db"
 version = "0.9.0"
 dependencies = [
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parity-util-mem",
  "parity-util-mem-derive",
  "parking_lot 0.11.1",
@@ -8060,7 +8026,7 @@ dependencies = [
  "futures 0.3.13",
  "linked-hash-map",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parity-util-mem",
  "parking_lot 0.11.1",
  "retain_mut",
@@ -8085,7 +8051,7 @@ dependencies = [
  "hex",
  "intervalier",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parity-util-mem",
  "parking_lot 0.11.1",
  "sc-block-builder",
@@ -8513,7 +8479,7 @@ version = "3.0.0"
 dependencies = [
  "hash-db",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sp-api-proc-macro",
  "sp-core",
  "sp-runtime",
@@ -8541,7 +8507,7 @@ version = "2.0.1"
 dependencies = [
  "criterion",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "rustversion",
  "sc-block-builder",
  "sp-api",
@@ -8560,7 +8526,7 @@ dependencies = [
 name = "sp-application-crypto"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
@@ -8586,7 +8552,7 @@ dependencies = [
  "criterion",
  "integer-sqrt",
  "num-traits",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "primitive-types",
  "rand 0.7.3",
  "serde",
@@ -8610,7 +8576,7 @@ dependencies = [
 name = "sp-authority-discovery"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sp-api",
  "sp-application-crypto",
  "sp-runtime",
@@ -8621,7 +8587,7 @@ dependencies = [
 name = "sp-authorship"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sp-inherents",
  "sp-runtime",
  "sp-std",
@@ -8631,7 +8597,7 @@ dependencies = [
 name = "sp-block-builder"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sp-api",
  "sp-inherents",
  "sp-runtime",
@@ -8645,7 +8611,7 @@ dependencies = [
  "futures 0.3.13",
  "log",
  "lru",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parking_lot 0.11.1",
  "sp-api",
  "sp-consensus",
@@ -8672,7 +8638,7 @@ dependencies = [
  "futures-timer 3.0.2",
  "libp2p",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parking_lot 0.11.1",
  "serde",
  "sp-api",
@@ -8694,7 +8660,7 @@ dependencies = [
 name = "sp-consensus-aura"
 version = "0.9.0"
 dependencies = [
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sp-api",
  "sp-application-crypto",
  "sp-consensus",
@@ -8710,7 +8676,7 @@ name = "sp-consensus-babe"
 version = "0.9.0"
 dependencies = [
  "merlin",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-api",
  "sp-application-crypto",
@@ -8729,7 +8695,7 @@ dependencies = [
 name = "sp-consensus-pow"
 version = "0.9.0"
 dependencies = [
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sp-api",
  "sp-core",
  "sp-runtime",
@@ -8740,7 +8706,7 @@ dependencies = [
 name = "sp-consensus-slots"
 version = "0.9.0"
 dependencies = [
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sp-arithmetic",
  "sp-runtime",
 ]
@@ -8749,7 +8715,7 @@ dependencies = [
 name = "sp-consensus-vrf"
 version = "0.9.0"
 dependencies = [
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "schnorrkel",
  "sp-core",
  "sp-runtime",
@@ -8777,7 +8743,7 @@ dependencies = [
  "log",
  "merlin",
  "num-traits",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parity-util-mem",
  "parking_lot 0.11.1",
  "pretty_assertions",
@@ -8827,7 +8793,7 @@ name = "sp-externalities"
 version = "0.9.0"
 dependencies = [
  "environmental",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sp-std",
  "sp-storage",
 ]
@@ -8838,7 +8804,7 @@ version = "3.0.0"
 dependencies = [
  "finality-grandpa",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-api",
  "sp-application-crypto",
@@ -8852,7 +8818,7 @@ dependencies = [
 name = "sp-inherents"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parking_lot 0.11.1",
  "sp-core",
  "sp-std",
@@ -8867,7 +8833,7 @@ dependencies = [
  "hash-db",
  "libsecp256k1",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parking_lot 0.11.1",
  "sp-core",
  "sp-externalities",
@@ -8900,7 +8866,7 @@ dependencies = [
  "derive_more",
  "futures 0.3.13",
  "merlin",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parking_lot 0.11.1",
  "rand 0.7.3",
  "rand_chacha 0.2.2",
@@ -8914,7 +8880,7 @@ dependencies = [
 name = "sp-npos-elections"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "rand 0.7.3",
  "serde",
  "sp-arithmetic",
@@ -8929,7 +8895,7 @@ dependencies = [
 name = "sp-npos-elections-compact"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "proc-macro-crate 1.0.0",
  "proc-macro2",
  "quote",
@@ -8944,7 +8910,7 @@ name = "sp-npos-elections-fuzzer"
 version = "2.0.0-alpha.5"
 dependencies = [
  "honggfuzz",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "rand 0.7.3",
  "sp-arithmetic",
  "sp-npos-elections",
@@ -8987,7 +8953,7 @@ dependencies = [
  "hash256-std-hasher",
  "impl-trait-for-tuples",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parity-util-mem",
  "paste 1.0.4",
  "rand 0.7.3",
@@ -9009,7 +8975,7 @@ name = "sp-runtime-interface"
 version = "3.0.0"
 dependencies = [
  "impl-trait-for-tuples",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "primitive-types",
  "rustversion",
  "sp-core",
@@ -9080,7 +9046,7 @@ name = "sp-sandbox"
 version = "0.9.0"
 dependencies = [
  "assert_matches",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sp-core",
  "sp-io",
  "sp-std",
@@ -9101,7 +9067,7 @@ dependencies = [
 name = "sp-session"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sp-api",
  "sp-core",
  "sp-runtime",
@@ -9113,7 +9079,7 @@ dependencies = [
 name = "sp-staking"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sp-runtime",
  "sp-std",
 ]
@@ -9126,7 +9092,7 @@ dependencies = [
  "hex-literal",
  "log",
  "num-traits",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parking_lot 0.11.1",
  "pretty_assertions",
  "rand 0.7.3",
@@ -9151,7 +9117,7 @@ name = "sp-storage"
 version = "3.0.0"
 dependencies = [
  "impl-serde",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "ref-cast",
  "serde",
  "sp-debug-derive",
@@ -9163,7 +9129,7 @@ name = "sp-tasks"
 version = "3.0.0"
 dependencies = [
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sp-core",
  "sp-externalities",
  "sp-io",
@@ -9175,7 +9141,7 @@ dependencies = [
 name = "sp-test-primitives"
 version = "2.0.0"
 dependencies = [
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parity-util-mem",
  "serde",
  "sp-application-crypto",
@@ -9187,7 +9153,7 @@ dependencies = [
 name = "sp-timestamp"
 version = "3.0.0"
 dependencies = [
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sp-api",
  "sp-inherents",
  "sp-runtime",
@@ -9200,7 +9166,7 @@ name = "sp-tracing"
 version = "3.0.0"
 dependencies = [
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sp-std",
  "tracing",
  "tracing-core",
@@ -9214,7 +9180,7 @@ dependencies = [
  "derive_more",
  "futures 0.3.13",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-api",
  "sp-blockchain",
@@ -9230,7 +9196,7 @@ dependencies = [
  "hash-db",
  "hex-literal",
  "memory-db",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sp-core",
  "sp-runtime",
  "sp-std",
@@ -9256,7 +9222,7 @@ name = "sp-version"
 version = "3.0.0"
 dependencies = [
  "impl-serde",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "serde",
  "sp-runtime",
  "sp-std",
@@ -9267,7 +9233,7 @@ name = "sp-wasm-interface"
 version = "3.0.0"
 dependencies = [
  "impl-trait-for-tuples",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sp-std",
  "wasmi",
 ]
@@ -9442,7 +9408,7 @@ dependencies = [
  "futures 0.3.13",
  "jsonrpc-client-transports",
  "jsonrpc-core",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sc-rpc-api",
  "serde",
  "sp-storage",
@@ -9459,7 +9425,7 @@ dependencies = [
  "jsonrpc-core-client",
  "jsonrpc-derive",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sc-client-api",
  "sc-rpc-api",
  "sc-transaction-pool",
@@ -9496,7 +9462,7 @@ dependencies = [
  "futures 0.3.13",
  "hash-db",
  "hex",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sc-client-api",
  "sc-client-db",
  "sc-consensus",
@@ -9528,7 +9494,7 @@ dependencies = [
  "memory-db",
  "pallet-babe",
  "pallet-timestamp",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parity-util-mem",
  "sc-block-builder",
  "sc-executor",
@@ -9564,7 +9530,7 @@ name = "substrate-test-runtime-client"
 version = "2.0.0"
 dependencies = [
  "futures 0.3.13",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "sc-block-builder",
  "sc-client-api",
  "sc-consensus",
@@ -9585,7 +9551,7 @@ version = "2.0.0"
 dependencies = [
  "derive_more",
  "futures 0.3.13",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "parking_lot 0.11.1",
  "sc-transaction-graph",
  "sp-blockchain",
@@ -9719,20 +9685,14 @@ version = "0.9.0"
 dependencies = [
  "env_logger 0.7.1",
  "frame-system",
- "futures 0.1.31",
  "futures 0.3.13",
  "jsonrpc-core",
  "log",
- "node-cli",
- "parity-scale-codec 1.3.7",
- "rand 0.7.3",
  "sc-basic-authorship",
  "sc-cli",
  "sc-client-api",
- "sc-consensus-babe",
  "sc-consensus-manual-seal",
  "sc-executor",
- "sc-finality-grandpa",
  "sc-informant",
  "sc-network",
  "sc-rpc",
@@ -9744,7 +9704,6 @@ dependencies = [
  "sp-block-builder",
  "sp-blockchain",
  "sp-consensus",
- "sp-consensus-babe",
  "sp-core",
  "sp-externalities",
  "sp-inherents",
@@ -9775,7 +9734,6 @@ dependencies = [
  "pallet-balances",
  "pallet-sudo",
  "pallet-transaction-payment",
- "rand 0.8.3",
  "sc-client-api",
  "sc-consensus",
  "sc-consensus-babe",
@@ -10297,7 +10255,7 @@ dependencies = [
  "hash-db",
  "keccak-hasher",
  "memory-db",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "trie-db",
  "trie-root",
  "trie-standardmap",
@@ -10390,7 +10348,7 @@ version = "0.9.0"
 dependencies = [
  "frame-try-runtime",
  "log",
- "parity-scale-codec 2.1.0",
+ "parity-scale-codec",
  "remote-externalities",
  "sc-cli",
  "sc-client-api",
diff --git a/bin/node/test-runner-example/Cargo.toml b/bin/node/test-runner-example/Cargo.toml
index f94575e8e621..9d810ddbcfde 100644
--- a/bin/node/test-runner-example/Cargo.toml
+++ b/bin/node/test-runner-example/Cargo.toml
@@ -36,5 +36,4 @@ sp-api = { version = "3.0.0",  path = "../../../primitives/api" }
 sp-inherents = { version = "3.0.0", path = "../../../primitives/inherents" }
 sp-keystore = { version = "0.9.0", path = "../../../primitives/keystore" }
 
-rand = "0.8.3"
 log = "0.4.14"
diff --git a/bin/node/test-runner-example/src/lib.rs b/bin/node/test-runner-example/src/lib.rs
index 22cfffa7f23a..ac589437248e 100644
--- a/bin/node/test-runner-example/src/lib.rs
+++ b/bin/node/test-runner-example/src/lib.rs
@@ -18,9 +18,9 @@
 
 //! Basic example of end to end runtime tests.
 
-use test_runner::{Node, ChainInfo, SignatureVerificationOverride};
+use test_runner::{Node, ChainInfo, SignatureVerificationOverride, default_config};
 use grandpa::GrandpaBlockImport;
-use sc_service::{TFullBackend, TFullClient, Configuration, TaskManager, new_full_parts};
+use sc_service::{TFullBackend, TFullClient, Configuration, TaskManager, new_full_parts, TaskExecutor};
 use std::sync::Arc;
 use sp_inherents::InherentDataProviders;
 use sc_consensus_babe::BabeBlockImport;
@@ -29,6 +29,7 @@ use sp_keyring::sr25519::Keyring::Alice;
 use sp_consensus_babe::AuthorityId;
 use sc_consensus_manual_seal::{ConsensusDataProvider, consensus::babe::BabeConsensusDataProvider};
 use sp_runtime::{traits::IdentifyAccount, MultiSigner, generic::Era};
+use node_cli::chain_spec::development_config;
 
 type BlockImport<B, BE, C, SC> = BabeBlockImport<B, C, GrandpaBlockImport<BE, B, C, SC>>;
 
@@ -71,6 +72,10 @@ impl ChainInfo for NodeTemplateChainInfo {
 		)
 	}
 
+	fn config(task_executor: TaskExecutor) -> Configuration {
+		default_config(task_executor, Box::new(development_config()))
+	}
+
 	fn create_client_parts(
 		config: &Configuration,
 	) -> Result<
@@ -151,20 +156,10 @@ mod tests {
 	use super::*;
 	use test_runner::NodeConfig;
 	use log::LevelFilter;
-	use sc_client_api::execution_extensions::ExecutionStrategies;
-	use node_cli::chain_spec::development_config;
 
 	#[test]
 	fn test_runner() {
 		let config = NodeConfig {
-			execution_strategies: ExecutionStrategies {
-				syncing: sc_client_api::ExecutionStrategy::AlwaysWasm,
-				importing: sc_client_api::ExecutionStrategy::AlwaysWasm,
-				block_construction: sc_client_api::ExecutionStrategy::AlwaysWasm,
-				offchain_worker: sc_client_api::ExecutionStrategy::AlwaysWasm,
-				other: sc_client_api::ExecutionStrategy::AlwaysWasm,
-			},
-			chain_spec: Box::new(development_config()),
 			log_targets: vec![
 				("yamux", LevelFilter::Off),
 				("multistream_select", LevelFilter::Off),
diff --git a/test-utils/test-runner/Cargo.toml b/test-utils/test-runner/Cargo.toml
index 4d9d6125bd4e..9e1f9fee0218 100644
--- a/test-utils/test-runner/Cargo.toml
+++ b/test-utils/test-runner/Cargo.toml
@@ -43,18 +43,10 @@ sp-runtime-interface = { version = "3.0.0", path = "../../primitives/runtime-int
 # pallets
 frame-system = { version = "3.0.0", path = "../../frame/system" }
 
-parity-scale-codec = "1.3.1"
 env_logger = "0.7.1"
 log = "0.4.8"
-futures01 = { package = "futures", version = "0.1.29" }
 futures = { package = "futures", version = "0.3", features = ["compat"] }
-rand = "0.7"
 tokio = { version = "0.2", features = ["full"] }
 
 # Calling RPC
 jsonrpc-core = "15.1"
-[dev-dependencies]
-sc-finality-grandpa = { version = "0.9.0", path = "../../client/finality-grandpa" }
-sc-consensus-babe = { version = "0.9.0", path = "../../client/consensus/babe" }
-sp-consensus-babe = { version = "0.9.0", path = "../../primitives/consensus/babe" }
-node-cli = { version = "2.0.0", path = "../../bin/node/cli" }
diff --git a/test-utils/test-runner/src/lib.rs b/test-utils/test-runner/src/lib.rs
index 87ec4336d952..f76083d28172 100644
--- a/test-utils/test-runner/src/lib.rs
+++ b/test-utils/test-runner/src/lib.rs
@@ -228,7 +228,7 @@
 
 use manual_seal::consensus::ConsensusDataProvider;
 use sc_executor::NativeExecutionDispatch;
-use sc_service::{Configuration, TFullBackend, TFullClient, TaskManager};
+use sc_service::{Configuration, TFullBackend, TFullClient, TaskManager, TaskExecutor};
 use sp_api::{ConstructRuntimeApi, TransactionFor};
 use sp_consensus::{BlockImport, SelectChain};
 use sp_inherents::InherentDataProviders;
@@ -242,6 +242,7 @@ mod host_functions;
 
 pub use host_functions::*;
 pub use node::*;
+pub use utils::*;
 
 /// Wrapper trait for concrete type required by this testing framework.
 pub trait ChainInfo: Sized {
@@ -279,6 +280,9 @@ pub trait ChainInfo: Sized {
 	/// Signed extras, this function is caled in an externalities provided environment.
 	fn signed_extras(from: <Self::Runtime as frame_system::Config>::AccountId) -> Self::SignedExtras;
 
+	/// config factory
+	fn config(task_executor: TaskExecutor) -> Configuration;
+
 	/// Attempt to create client parts, including block import,
 	/// select chain strategy and consensus data provider.
 	fn create_client_parts(
diff --git a/test-utils/test-runner/src/node.rs b/test-utils/test-runner/src/node.rs
index 6965c6a804db..2e6fc97c582a 100644
--- a/test-utils/test-runner/src/node.rs
+++ b/test-utils/test-runner/src/node.rs
@@ -24,12 +24,10 @@ use manual_seal::{run_manual_seal, EngineCommand, ManualSealParams};
 use sc_cli::build_runtime;
 use sc_client_api::{
 	backend::{self, Backend}, CallExecutor, ExecutorProvider,
-	execution_extensions::ExecutionStrategies,
 };
 use sc_service::{
-	build_network, spawn_tasks, BuildNetworkParams, SpawnTasksParams, TFullBackend,
-	TFullCallExecutor, TFullClient, TaskManager, TaskType, ChainSpec, BasePath,
-	Configuration, DatabaseConfig, KeepBlocks, TransactionStorageMode, config::KeystoreConfig,
+	build_network, spawn_tasks, BuildNetworkParams, SpawnTasksParams,
+	TFullBackend, TFullCallExecutor, TFullClient, TaskManager, TaskType,
 };
 use sc_transaction_pool::BasicPool;
 use sp_api::{ApiExt, ConstructRuntimeApi, Core, Metadata, OverlayedChanges, StorageTransactionCache};
@@ -45,13 +43,8 @@ use sp_state_machine::Ext;
 use sp_transaction_pool::runtime_api::TaggedTransactionQueue;
 use sp_transaction_pool::TransactionPool;
 
-pub use crate::utils::{logger, base_path};
-use crate::ChainInfo;
+use crate::{ChainInfo, utils::logger};
 use log::LevelFilter;
-use sp_keyring::sr25519::Keyring::Alice;
-use sc_network::{multiaddr, config::{NetworkConfiguration, TransportConfig, Role}};
-use sc_informant::OutputFormat;
-use sc_executor::WasmExecutionMethod;
 
 /// This holds a reference to a running node on another thread,
 /// the node process is dropped when this struct is dropped
@@ -91,12 +84,6 @@ pub struct Node<T: ChainInfo> {
 pub struct NodeConfig {
 	/// A set of log targets you'd like to enable/disbale
 	pub log_targets: Vec<(&'static str, LevelFilter)>,
-
-	/// ChainSpec for the runtime
-	pub chain_spec: Box<dyn ChainSpec>,
-
-	/// wasm execution strategies.
-	pub execution_strategies: ExecutionStrategies,
 }
 
 type EventRecord<T> = frame_system::EventRecord<<T as frame_system::Config>::Event, <T as frame_system::Config>::Hash>;
@@ -114,100 +101,20 @@ impl<T: ChainInfo> Node<T> {
 				+ BlockBuilder<T::Block>
 				+ ApiExt<T::Block, StateBackend = <TFullBackend<T::Block> as Backend<T::Block>>::State>,
 	{
-		let NodeConfig { log_targets, mut chain_spec, execution_strategies } = node_config;
+		let NodeConfig { log_targets, } = node_config;
 		let tokio_runtime = build_runtime().unwrap();
-
-		// unbounded logs, should be fine, test is shortlived.
-		let (log_sink, log_stream) = mpsc::unbounded();
-
-		logger(log_targets, tokio_runtime.handle().clone(), log_sink);
 		let runtime_handle = tokio_runtime.handle().clone();
-
 		let task_executor = move |fut, task_type| match task_type {
 			TaskType::Async => runtime_handle.spawn(fut).map(drop),
 			TaskType::Blocking => runtime_handle
 				.spawn_blocking(move || futures::executor::block_on(fut))
 				.map(drop),
 		};
+		// unbounded logs, should be fine, test is shortlived.
+		let (log_sink, log_stream) = mpsc::unbounded();
 
-		let base_path = if let Some(base) = base_path() {
-			BasePath::new(base)
-		} else {
-			BasePath::new_temp_dir().expect("couldn't create a temp dir")
-		};
-		let root_path = base_path.path().to_path_buf().join("chains").join(chain_spec.id());
-
-		let key_seed = Alice.to_seed();
-		let storage = chain_spec
-			.as_storage_builder()
-			.build_storage()
-			.expect("could not build storage");
-
-		chain_spec.set_storage(storage);
-
-		let mut network_config = NetworkConfiguration::new(
-			format!("Test Node for: {}", key_seed),
-			"network/test/0.1",
-			Default::default(),
-			None,
-		);
-		let informant_output_format = OutputFormat { enable_color: false };
-
-		network_config.allow_non_globals_in_dht = true;
-
-		network_config
-			.listen_addresses
-			.push(multiaddr::Protocol::Memory(rand::random()).into());
-
-		network_config.transport = TransportConfig::MemoryOnly;
-
-		let config = Configuration {
-			impl_name: "test-node".to_string(),
-			impl_version: "0.1".to_string(),
-			role: Role::Authority,
-			task_executor: task_executor.into(),
-			transaction_pool: Default::default(),
-			network: network_config,
-			keystore: KeystoreConfig::Path {
-				path: root_path.join("key"),
-				password: None,
-			},
-			database: DatabaseConfig::RocksDb {
-				path: root_path.join("db"),
-				cache_size: 128,
-			},
-			state_cache_size: 16777216,
-			state_cache_child_ratio: None,
-			chain_spec,
-			wasm_method: WasmExecutionMethod::Interpreted,
-			execution_strategies,
-			rpc_http: None,
-			rpc_ws: None,
-			rpc_ipc: None,
-			rpc_ws_max_connections: None,
-			rpc_cors: None,
-			rpc_methods: Default::default(),
-			prometheus_config: None,
-			telemetry_endpoints: None,
-			telemetry_external_transport: None,
-			default_heap_pages: None,
-			offchain_worker: Default::default(),
-			force_authoring: false,
-			disable_grandpa: false,
-			dev_key_seed: Some(key_seed),
-			tracing_targets: None,
-			tracing_receiver: Default::default(),
-			max_runtime_instances: 8,
-			announce_block: true,
-			base_path: Some(base_path),
-			wasm_runtime_overrides: None,
-			informant_output_format,
-			disable_log_reloading: false,
-			keystore_remote: None,
-			keep_blocks: KeepBlocks::All,
-			state_pruning: Default::default(),
-			transaction_storage: TransactionStorageMode::BlockBody,
-		};
+		logger(log_targets, tokio_runtime.handle().clone(), log_sink);
+		let config = T::config(task_executor.into());
 
 		let (
 			client,
@@ -448,7 +355,7 @@ impl<T: ChainInfo> Node<T> {
 	/// Revert all blocks added since creation of the node.
 	pub fn clean(&self) {
 		// if a db path was specified, revert all blocks we've added
-		if let Some(_) = base_path() {
+		if let Some(_) = std::env::var("DB_BASE_PATH").ok() {
 			let diff = self.client.info().best_number - self.initial_block_number;
 			self.revert_blocks(diff);
 		}
diff --git a/test-utils/test-runner/src/utils.rs b/test-utils/test-runner/src/utils.rs
index 7cd512e2d486..d8ab3860f28a 100644
--- a/test-utils/test-runner/src/utils.rs
+++ b/test-utils/test-runner/src/utils.rs
@@ -20,10 +20,21 @@ use futures::{Sink, SinkExt};
 use std::fmt;
 use std::io::Write;
 use log::LevelFilter;
+use sc_service::{BasePath, ChainSpec, Configuration, TaskExecutor, DatabaseConfig, KeepBlocks, TransactionStorageMode};
+use sp_keyring::sr25519::Keyring::Alice;
+use sc_network::{multiaddr, config::{NetworkConfiguration, TransportConfig, Role}};
+use sc_informant::OutputFormat;
+use sc_service::config::KeystoreConfig;
+use sc_executor::WasmExecutionMethod;
+use sc_client_api::execution_extensions::ExecutionStrategies;
 
 /// Base db path gotten from env
-pub fn base_path() -> Option<String> {
-	std::env::var("DB_BASE_PATH").ok()
+pub fn base_path() -> BasePath {
+	if let Some(base) = std::env::var("DB_BASE_PATH").ok() {
+		BasePath::new(base)
+	} else {
+		BasePath::new_temp_dir().expect("couldn't create a temp dir")
+	}
 }
 
 /// Builds the global logger.
@@ -54,3 +65,86 @@ where
 	}
 	let _ = builder.is_test(true).try_init();
 }
+
+/// Produces a default configuration object, suitable for use with most set ups.
+pub fn default_config(task_executor: TaskExecutor, mut chain_spec: Box<dyn ChainSpec>) -> Configuration {
+	let base_path = base_path();
+	let root_path = base_path.path().to_path_buf().join("chains").join(chain_spec.id());
+
+	let storage = chain_spec
+		.as_storage_builder()
+		.build_storage()
+		.expect("could not build storage");
+
+	chain_spec.set_storage(storage);
+	let key_seed = Alice.to_seed();
+
+	let mut network_config = NetworkConfiguration::new(
+		format!("Test Node for: {}", key_seed),
+		"network/test/0.1",
+		Default::default(),
+		None,
+	);
+	let informant_output_format = OutputFormat { enable_color: false };
+	network_config.allow_non_globals_in_dht = true;
+
+	network_config
+		.listen_addresses
+		.push(multiaddr::Protocol::Memory(0).into());
+
+	network_config.transport = TransportConfig::MemoryOnly;
+
+	Configuration {
+		impl_name: "test-node".to_string(),
+		impl_version: "0.1".to_string(),
+		role: Role::Authority,
+		task_executor: task_executor.into(),
+		transaction_pool: Default::default(),
+		network: network_config,
+		keystore: KeystoreConfig::Path {
+			path: root_path.join("key"),
+			password: None,
+		},
+		database: DatabaseConfig::RocksDb {
+			path: root_path.join("db"),
+			cache_size: 128,
+		},
+		state_cache_size: 16777216,
+		state_cache_child_ratio: None,
+		chain_spec,
+		wasm_method: WasmExecutionMethod::Interpreted,
+		execution_strategies: ExecutionStrategies {
+			syncing: sc_client_api::ExecutionStrategy::AlwaysWasm,
+			importing: sc_client_api::ExecutionStrategy::AlwaysWasm,
+			block_construction: sc_client_api::ExecutionStrategy::AlwaysWasm,
+			offchain_worker: sc_client_api::ExecutionStrategy::AlwaysWasm,
+			other: sc_client_api::ExecutionStrategy::AlwaysWasm,
+		},
+		rpc_http: None,
+		rpc_ws: None,
+		rpc_ipc: None,
+		rpc_ws_max_connections: None,
+		rpc_cors: None,
+		rpc_methods: Default::default(),
+		prometheus_config: None,
+		telemetry_endpoints: None,
+		telemetry_external_transport: None,
+		default_heap_pages: None,
+		offchain_worker: Default::default(),
+		force_authoring: false,
+		disable_grandpa: false,
+		dev_key_seed: Some(key_seed),
+		tracing_targets: None,
+		tracing_receiver: Default::default(),
+		max_runtime_instances: 8,
+		announce_block: true,
+		base_path: Some(base_path),
+		wasm_runtime_overrides: None,
+		informant_output_format,
+		disable_log_reloading: false,
+		keystore_remote: None,
+		keep_blocks: KeepBlocks::All,
+		state_pruning: Default::default(),
+		transaction_storage: TransactionStorageMode::BlockBody,
+	}
+}

From 7eb671fa2532e618589c057e5ed50b06d5f9a44d Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Wed, 7 Apr 2021 14:58:23 +0200
Subject: [PATCH 0616/1194] Add an INDEX to the Instance trait (#8555)

* Add an index to the Instance trait

* Update frame/support/procedural/src/storage/instance_trait.rs
---
 frame/support/procedural/src/lib.rs                  |  4 ++++
 .../procedural/src/pallet/expand/instances.rs        |  5 +++--
 .../support/procedural/src/storage/instance_trait.rs | 12 ++++++++++--
 frame/support/src/instances.rs                       |  8 ++++----
 frame/support/src/traits/storage.rs                  |  2 ++
 5 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/frame/support/procedural/src/lib.rs b/frame/support/procedural/src/lib.rs
index 2aecc5b99392..ca6edddaffa1 100644
--- a/frame/support/procedural/src/lib.rs
+++ b/frame/support/procedural/src/lib.rs
@@ -421,3 +421,7 @@ pub fn require_transactional(attr: TokenStream, input: TokenStream) -> TokenStre
 pub fn crate_to_pallet_version(input: TokenStream) -> TokenStream {
 	pallet_version::crate_to_pallet_version(input).unwrap_or_else(|e| e.to_compile_error()).into()
 }
+
+/// The number of module instances supported by the runtime, starting at index 1,
+/// and up to `NUMBER_OF_INSTANCE`.
+pub(crate) const NUMBER_OF_INSTANCE: u8 = 16;
diff --git a/frame/support/procedural/src/pallet/expand/instances.rs b/frame/support/procedural/src/pallet/expand/instances.rs
index c60cd5ebe8d8..9f48563ab7e6 100644
--- a/frame/support/procedural/src/pallet/expand/instances.rs
+++ b/frame/support/procedural/src/pallet/expand/instances.rs
@@ -17,14 +17,15 @@
 
 use proc_macro2::Span;
 use crate::pallet::Def;
+use crate::NUMBER_OF_INSTANCE;
 
 /// * Provide inherent instance to be used by construct_runtime
-/// * Provide Instance0 .. Instance16 for instantiable pallet
+/// * Provide Instance1 ..= Instance16 for instantiable pallet
 pub fn expand_instances(def: &mut Def) -> proc_macro2::TokenStream {
 	let frame_support = &def.frame_support;
 	let inherent_ident = syn::Ident::new(crate::INHERENT_INSTANCE_NAME, Span::call_site());
 	let instances = if def.config.has_instance {
-		(0..16).map(|i| syn::Ident::new(&format!("Instance{}", i), Span::call_site())).collect()
+		(1..=NUMBER_OF_INSTANCE).map(|i| syn::Ident::new(&format!("Instance{}", i), Span::call_site())).collect()
 	} else {
 		vec![]
 	};
diff --git a/frame/support/procedural/src/storage/instance_trait.rs b/frame/support/procedural/src/storage/instance_trait.rs
index 5468c3d34419..a9e06c629904 100644
--- a/frame/support/procedural/src/storage/instance_trait.rs
+++ b/frame/support/procedural/src/storage/instance_trait.rs
@@ -21,8 +21,8 @@
 use proc_macro2::{TokenStream, Span};
 use quote::quote;
 use super::DeclStorageDefExt;
+use crate::NUMBER_OF_INSTANCE;
 
-const NUMBER_OF_INSTANCE: usize = 16;
 pub(crate) const INHERENT_INSTANCE_NAME: &str = "__InherentHiddenInstance";
 
 // Used to generate an instance implementation.
@@ -30,6 +30,8 @@ struct InstanceDef {
 	prefix: String,
 	instance_struct: syn::Ident,
 	doc: TokenStream,
+	// Index is same as instance number. Default is 0.
+	index: u8,
 }
 
 pub fn decl_and_impl(scrate: &TokenStream, def: &DeclStorageDefExt) -> TokenStream {
@@ -39,13 +41,14 @@ pub fn decl_and_impl(scrate: &TokenStream, def: &DeclStorageDefExt) -> TokenStre
 
 	// Implementation of instances.
 	if let Some(module_instance) = &def.module_instance {
-		let instance_defs = (0..NUMBER_OF_INSTANCE)
+		let instance_defs = (1..=NUMBER_OF_INSTANCE)
 			.map(|i| {
 				let name = format!("Instance{}", i);
 				InstanceDef {
 					instance_struct: syn::Ident::new(&name, proc_macro2::Span::call_site()),
 					prefix: name,
 					doc: quote!(#[doc=r"Module instance"]),
+					index: i,
 				}
 			})
 			.chain(
@@ -53,6 +56,7 @@ pub fn decl_and_impl(scrate: &TokenStream, def: &DeclStorageDefExt) -> TokenStre
 					prefix: String::new(),
 					instance_struct: ident.clone(),
 					doc: quote!(#[doc=r"Default module instance"]),
+					index: 0,
 				})
 			);
 
@@ -83,6 +87,8 @@ pub fn decl_and_impl(scrate: &TokenStream, def: &DeclStorageDefExt) -> TokenStre
 				/// instance.
 				#[doc(hidden)]
 			),
+			// This is just to make the type system happy. Not actually used.
+			index: 0,
 		};
 		impls.extend(create_and_impl_instance_struct(scrate, &instance_def, def));
 	}
@@ -116,6 +122,7 @@ fn create_and_impl_instance_struct(
 	let instance_struct = &instance_def.instance_struct;
 	let prefix = format!("{}{}", instance_def.prefix, def.crate_name.to_string());
 	let doc = &instance_def.doc;
+	let index = instance_def.index;
 
 	quote! {
 		// Those trait are derived because of wrong bounds for generics
@@ -129,6 +136,7 @@ fn create_and_impl_instance_struct(
 		pub struct #instance_struct;
 		impl #instance_trait for #instance_struct {
 			const PREFIX: &'static str = #prefix;
+			const INDEX: u8 = #index;
 		}
 	}
 }
diff --git a/frame/support/src/instances.rs b/frame/support/src/instances.rs
index 086ed9a6cc17..9908d16076a0 100644
--- a/frame/support/src/instances.rs
+++ b/frame/support/src/instances.rs
@@ -31,10 +31,6 @@
 //! NOTE: [`frame_support::pallet`] will reexport them inside the module, in order to make them
 //! accessible to [`frame_support::construct_runtime`].
 
-/// Instance0 to be used for instantiable pallet define with `pallet` macro.
-#[derive(Clone, Copy, PartialEq, Eq, crate::RuntimeDebugNoBound)]
-pub struct Instance0;
-
 /// Instance1 to be used for instantiable pallet define with `pallet` macro.
 #[derive(Clone, Copy, PartialEq, Eq, crate::RuntimeDebugNoBound)]
 pub struct Instance1;
@@ -94,3 +90,7 @@ pub struct Instance14;
 /// Instance15 to be used for instantiable pallet define with `pallet` macro.
 #[derive(Clone, Copy, PartialEq, Eq, crate::RuntimeDebugNoBound)]
 pub struct Instance15;
+
+/// Instance16 to be used for instantiable pallet define with `pallet` macro.
+#[derive(Clone, Copy, PartialEq, Eq, crate::RuntimeDebugNoBound)]
+pub struct Instance16;
diff --git a/frame/support/src/traits/storage.rs b/frame/support/src/traits/storage.rs
index 82e9c1e7a60f..c42e1abf73ea 100644
--- a/frame/support/src/traits/storage.rs
+++ b/frame/support/src/traits/storage.rs
@@ -26,6 +26,8 @@
 pub trait Instance: 'static {
 	/// Unique module prefix. E.g. "InstanceNMyModule" or "MyModule"
 	const PREFIX: &'static str;
+	/// Unique numerical identifier for an instance.
+	const INDEX: u8;
 }
 
 /// An instance of a storage in a pallet.

From 6c5b63a76a3b444e8de1a9ef601b30b61ba9f393 Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Wed, 7 Apr 2021 22:44:45 +0200
Subject: [PATCH 0617/1194] Support code blobs compressed with zstd (#8549)

* begin maybe-compressed-blob

* fix build

* implement blob compression / decompression

* add some tests

* decode -> decompress

* decompress code if compressed

* make API of compresseed blob crate take limit as parameter

* use new API in sc-executro

* wasm-builder: compress wasm

* fix typo

* simplify

* address review

* fix wasm_project.rs

* Update primitives/maybe-compressed-blob/Cargo.toml

Co-authored-by: Andronik Ordian <write@reusable.software>

Co-authored-by: Andronik Ordian <write@reusable.software>
---
 Cargo.lock                                  |  20 +++
 Cargo.toml                                  |   1 +
 client/executor/Cargo.toml                  |   1 +
 client/executor/src/wasm_runtime.rs         |   9 +-
 primitives/maybe-compressed-blob/Cargo.toml |  17 ++
 primitives/maybe-compressed-blob/README.md  |   3 +
 primitives/maybe-compressed-blob/src/lib.rs | 166 ++++++++++++++++++++
 utils/wasm-builder/Cargo.toml               |   1 +
 utils/wasm-builder/src/builder.rs           |   2 +-
 utils/wasm-builder/src/wasm_project.rs      |  62 +++++++-
 10 files changed, 274 insertions(+), 8 deletions(-)
 create mode 100644 primitives/maybe-compressed-blob/Cargo.toml
 create mode 100644 primitives/maybe-compressed-blob/README.md
 create mode 100644 primitives/maybe-compressed-blob/src/lib.rs

diff --git a/Cargo.lock b/Cargo.lock
index 1824e956ced3..9e6e30cf2d00 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6805,6 +6805,16 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd"
 
+[[package]]
+name = "ruzstd"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d425143485a37727c7a46e689bbe3b883a00f42b4a52c4ac0f44855c1009b00"
+dependencies = [
+ "byteorder",
+ "twox-hash",
+]
+
 [[package]]
 name = "rw-stream-sink"
 version = "0.2.1"
@@ -7337,6 +7347,7 @@ dependencies = [
  "sp-core",
  "sp-externalities",
  "sp-io",
+ "sp-maybe-compressed-blob",
  "sp-panic-handler",
  "sp-runtime",
  "sp-runtime-interface",
@@ -8876,6 +8887,14 @@ dependencies = [
  "sp-externalities",
 ]
 
+[[package]]
+name = "sp-maybe-compressed-blob"
+version = "3.0.0"
+dependencies = [
+ "ruzstd",
+ "zstd",
+]
+
 [[package]]
 name = "sp-npos-elections"
 version = "3.0.0"
@@ -9597,6 +9616,7 @@ dependencies = [
  "atty",
  "build-helper",
  "cargo_metadata",
+ "sp-maybe-compressed-blob",
  "tempfile",
  "toml",
  "walkdir",
diff --git a/Cargo.toml b/Cargo.toml
index 3e4787770e05..1b35c7181d17 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -154,6 +154,7 @@ members = [
 	"primitives/io",
 	"primitives/keyring",
 	"primitives/keystore",
+	"primitives/maybe-compressed-blob",
 	"primitives/npos-elections",
 	"primitives/npos-elections/compact",
 	"primitives/npos-elections/fuzzer",
diff --git a/client/executor/Cargo.toml b/client/executor/Cargo.toml
index f678029d0674..e9f0fa14d8e7 100644
--- a/client/executor/Cargo.toml
+++ b/client/executor/Cargo.toml
@@ -30,6 +30,7 @@ sp-api = { version = "3.0.0", path = "../../primitives/api" }
 sp-wasm-interface = { version = "3.0.0", path = "../../primitives/wasm-interface" }
 sp-runtime-interface = { version = "3.0.0", path = "../../primitives/runtime-interface" }
 sp-externalities = { version = "0.9.0", path = "../../primitives/externalities" }
+sp-maybe-compressed-blob = { version = "3.0.0", path = "../../primitives/maybe-compressed-blob" }
 sc-executor-common = { version = "0.9.0", path = "common" }
 sc-executor-wasmi = { version = "0.9.0", path = "wasmi" }
 sc-executor-wasmtime = { version = "0.9.0", path = "wasmtime", optional = true }
diff --git a/client/executor/src/wasm_runtime.rs b/client/executor/src/wasm_runtime.rs
index 268a06018287..53968a645c99 100644
--- a/client/executor/src/wasm_runtime.rs
+++ b/client/executor/src/wasm_runtime.rs
@@ -283,6 +283,11 @@ pub fn create_wasm_runtime_with_code(
 	allow_missing_func_imports: bool,
 	cache_path: Option<&Path>,
 ) -> Result<Arc<dyn WasmModule>, WasmError> {
+	use sp_maybe_compressed_blob::CODE_BLOB_BOMB_LIMIT;
+
+	let code = sp_maybe_compressed_blob::decompress(code, CODE_BLOB_BOMB_LIMIT)
+		.map_err(|e| WasmError::Other(format!("Decompression error: {:?}", e)))?;
+
 	match wasm_method {
 		WasmExecutionMethod::Interpreted => {
 			// Wasmi doesn't have any need in a cache directory.
@@ -292,7 +297,7 @@ pub fn create_wasm_runtime_with_code(
 			drop(cache_path);
 
 			sc_executor_wasmi::create_runtime(
-				code,
+				&code,
 				heap_pages,
 				host_functions,
 				allow_missing_func_imports,
@@ -301,7 +306,7 @@ pub fn create_wasm_runtime_with_code(
 		}
 		#[cfg(feature = "wasmtime")]
 		WasmExecutionMethod::Compiled => {
-			let blob = sc_executor_common::runtime_blob::RuntimeBlob::new(code)?;
+			let blob = sc_executor_common::runtime_blob::RuntimeBlob::new(&code)?;
 			sc_executor_wasmtime::create_runtime(
 				sc_executor_wasmtime::CodeSupplyMode::Verbatim { blob },
 				sc_executor_wasmtime::Config {
diff --git a/primitives/maybe-compressed-blob/Cargo.toml b/primitives/maybe-compressed-blob/Cargo.toml
new file mode 100644
index 000000000000..e647606f1595
--- /dev/null
+++ b/primitives/maybe-compressed-blob/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "sp-maybe-compressed-blob"
+version = "3.0.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
+license = "Apache-2.0"
+homepage = "https://substrate.dev"
+repository = "https://github.com/paritytech/substrate/"
+description = "Handling of blobs, usually Wasm code, which may be compresed"
+documentation = "https://docs.rs/sp-maybe-compressed-blob"
+readme = "README.md"
+
+[target.'cfg(not(target_os = "unknown"))'.dependencies]
+zstd = { version = "0.6.0", default-features = false }
+
+[target.'cfg(target_os = "unknown")'.dependencies]
+ruzstd = { version = "0.2.2" }
diff --git a/primitives/maybe-compressed-blob/README.md b/primitives/maybe-compressed-blob/README.md
new file mode 100644
index 000000000000..b5bb869c30e4
--- /dev/null
+++ b/primitives/maybe-compressed-blob/README.md
@@ -0,0 +1,3 @@
+Handling of blobs, typicaly validation code, which may be compressed.
+
+License: Apache-2.0
diff --git a/primitives/maybe-compressed-blob/src/lib.rs b/primitives/maybe-compressed-blob/src/lib.rs
new file mode 100644
index 000000000000..acd283e747f9
--- /dev/null
+++ b/primitives/maybe-compressed-blob/src/lib.rs
@@ -0,0 +1,166 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Handling of blobs that may be compressed, based on an 8-byte magic identifier
+//! at the head.
+
+use std::borrow::Cow;
+use std::io::Read;
+
+// An arbitrary prefix, that indicates a blob beginning with should be decompressed with
+// Zstd compression.
+//
+// This differs from the WASM magic bytes, so real WASM blobs will not have this prefix.
+const ZSTD_PREFIX: [u8; 8] = [82, 188, 83, 118, 70, 219, 142, 5];
+
+/// A recommendation for the bomb limit for code blobs.
+///
+/// This may be adjusted upwards in the future, but is set much higher than the
+/// expected maximum code size. When adjusting upwards, nodes should be updated
+/// before performing a runtime upgrade to a blob with larger compressed size.
+pub const CODE_BLOB_BOMB_LIMIT: usize = 50 * 1024 * 1024;
+
+/// A possible bomb was encountered.
+#[derive(Debug, Clone, PartialEq)]
+pub enum Error {
+	/// Decoded size was too large, and the code payload may be a bomb.
+	PossibleBomb,
+	/// The compressed value had an invalid format.
+	Invalid,
+}
+
+impl std::fmt::Display for Error {
+	fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+		match *self {
+			Error::PossibleBomb => write!(f, "Possible compression bomb encountered"),
+			Error::Invalid => write!(f, "Blob had invalid format"),
+		}
+	}
+}
+
+impl std::error::Error for Error { }
+
+fn read_from_decoder(
+	decoder: impl Read,
+	blob_len: usize,
+	bomb_limit: usize,
+) -> Result<Vec<u8>, Error> {
+	let mut decoder = decoder.take((bomb_limit + 1) as u64);
+
+	let mut buf = Vec::with_capacity(blob_len);
+	decoder.read_to_end(&mut buf).map_err(|_| Error::Invalid)?;
+
+	if buf.len() <= bomb_limit {
+		Ok(buf)
+	} else {
+		Err(Error::PossibleBomb)
+	}
+}
+
+#[cfg(not(target_os = "unknown"))]
+fn decompress_zstd(blob: &[u8], bomb_limit: usize) -> Result<Vec<u8>, Error> {
+	let decoder = zstd::Decoder::new(blob).map_err(|_| Error::Invalid)?;
+
+	read_from_decoder(decoder, blob.len(), bomb_limit)
+}
+
+#[cfg(target_os = "unknown")]
+fn decompress_zstd(mut blob: &[u8], bomb_limit: usize) -> Result<Vec<u8>, Error> {
+	let blob_len = blob.len();
+	let decoder = ruzstd::streaming_decoder::StreamingDecoder::new(&mut blob)
+		.map_err(|_| Error::Invalid)?;
+
+	read_from_decoder(decoder, blob_len, bomb_limit)
+}
+
+/// Decode a blob, if it indicates that it is compressed. Provide a `bomb_limit`, which
+/// is the limit of bytes which should be decompressed from the blob.
+pub fn decompress(blob: &[u8], bomb_limit: usize) -> Result<Cow<[u8]>, Error> {
+	if blob.starts_with(&ZSTD_PREFIX) {
+		decompress_zstd(&blob[ZSTD_PREFIX.len()..], bomb_limit).map(Into::into)
+	} else {
+		Ok(blob.into())
+	}
+}
+
+/// Encode a blob as compressed. If the blob's size is over the bomb limit,
+/// this will not compress the blob, as the decoder will not be able to be
+/// able to differentiate it from a compression bomb.
+#[cfg(not(target_os = "unknown"))]
+pub fn compress(blob: &[u8], bomb_limit: usize) -> Option<Vec<u8>> {
+	use std::io::Write;
+
+	if blob.len() > bomb_limit {
+		return None;
+	}
+
+	let mut buf = ZSTD_PREFIX.to_vec();
+
+	{
+		let mut v = zstd::Encoder::new(&mut buf, 3).ok()?.auto_finish();
+		v.write_all(blob).ok()?;
+	}
+
+	Some(buf)
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use std::io::Write;
+
+	const BOMB_LIMIT: usize = 10;
+
+	#[test]
+	fn refuse_to_encode_over_limit() {
+		let mut v = vec![0; BOMB_LIMIT + 1];
+		assert!(compress(&v, BOMB_LIMIT).is_none());
+
+		let _ = v.pop();
+		assert!(compress(&v, BOMB_LIMIT).is_some());
+	}
+
+	#[test]
+	fn compress_and_decompress() {
+		let v = vec![0; BOMB_LIMIT];
+
+		let compressed = compress(&v, BOMB_LIMIT).unwrap();
+
+		assert!(compressed.starts_with(&ZSTD_PREFIX));
+		assert_eq!(&decompress(&compressed, BOMB_LIMIT).unwrap()[..], &v[..])
+	}
+
+	#[test]
+	fn decompresses_only_when_magic() {
+		let v = vec![0; BOMB_LIMIT + 1];
+
+		assert_eq!(&decompress(&v, BOMB_LIMIT).unwrap()[..], &v[..]);
+	}
+
+	#[test]
+	fn possible_bomb_fails() {
+		let encoded_bigger_than_bomb = vec![0; BOMB_LIMIT + 1];
+		let mut buf = ZSTD_PREFIX.to_vec();
+
+		{
+			let mut v = zstd::Encoder::new(&mut buf, 3).unwrap().auto_finish();
+			v.write_all(&encoded_bigger_than_bomb[..]).unwrap();
+		}
+
+		assert_eq!(decompress(&buf[..], BOMB_LIMIT).err(), Some(Error::PossibleBomb));
+	}
+}
diff --git a/utils/wasm-builder/Cargo.toml b/utils/wasm-builder/Cargo.toml
index c9d165ce8a14..4ada31ee3335 100644
--- a/utils/wasm-builder/Cargo.toml
+++ b/utils/wasm-builder/Cargo.toml
@@ -21,3 +21,4 @@ walkdir = "2.3.1"
 wasm-gc-api = "0.1.11"
 atty = "0.2.13"
 ansi_term = "0.12.1"
+sp-maybe-compressed-blob = { version = "3.0.0", path = "../../primitives/maybe-compressed-blob" }
diff --git a/utils/wasm-builder/src/builder.rs b/utils/wasm-builder/src/builder.rs
index bfbc4030adfd..9e8216f04fed 100644
--- a/utils/wasm-builder/src/builder.rs
+++ b/utils/wasm-builder/src/builder.rs
@@ -217,7 +217,7 @@ fn generate_rerun_if_changed_instructions() {
 /// `project_cargo_toml` - The path to the `Cargo.toml` of the project that should be built.
 /// `default_rustflags` - Default `RUSTFLAGS` that will always be set for the build.
 /// `features_to_enable` - Features that should be enabled for the project.
-/// `wasm_binary_name` - The optional wasm binary name that is extended with `.compact.wasm`.
+/// `wasm_binary_name` - The optional wasm binary name that is extended with `.compact.compressed.wasm`.
 ///                      If `None`, the project name will be used.
 fn build_project(
 	file_name: PathBuf,
diff --git a/utils/wasm-builder/src/wasm_project.rs b/utils/wasm-builder/src/wasm_project.rs
index 039254657544..e0f805d4a2d7 100644
--- a/utils/wasm-builder/src/wasm_project.rs
+++ b/utils/wasm-builder/src/wasm_project.rs
@@ -114,7 +114,7 @@ pub(crate) fn create_and_compile(
 	);
 
 	build_project(&project, default_rustflags, cargo_cmd);
-	let (wasm_binary, bloaty) = compact_wasm_file(
+	let (wasm_binary, wasm_binary_compressed, bloaty) = compact_wasm_file(
 		&project,
 		project_cargo_toml,
 		wasm_binary_name,
@@ -124,9 +124,13 @@ pub(crate) fn create_and_compile(
 		copy_wasm_to_target_directory(project_cargo_toml, wasm_binary)
 	);
 
+	wasm_binary_compressed.as_ref().map(|wasm_binary_compressed|
+		copy_wasm_to_target_directory(project_cargo_toml, wasm_binary_compressed)
+	);
+
 	generate_rerun_if_changed_instructions(project_cargo_toml, &project, &wasm_workspace);
 
-	(wasm_binary, bloaty)
+	(wasm_binary_compressed.or(wasm_binary), bloaty)
 }
 
 /// Find the `Cargo.lock` relative to the `OUT_DIR` environment variable.
@@ -441,12 +445,12 @@ fn build_project(project: &Path, default_rustflags: &str, cargo_cmd: CargoComman
 	}
 }
 
-/// Compact the WASM binary using `wasm-gc`. Returns the path to the bloaty WASM binary.
+/// Compact the WASM binary using `wasm-gc` and compress it using zstd.
 fn compact_wasm_file(
 	project: &Path,
 	cargo_manifest: &Path,
 	wasm_binary_name: Option<String>,
-) -> (Option<WasmBinary>, WasmBinaryBloaty) {
+) -> (Option<WasmBinary>, Option<WasmBinary>, WasmBinaryBloaty) {
 	let is_release_build = is_release_build();
 	let target = if is_release_build { "release" } else { "debug" };
 	let default_wasm_binary_name = get_wasm_binary_name(cargo_manifest);
@@ -468,6 +472,25 @@ fn compact_wasm_file(
 		None
 	};
 
+	let wasm_compact_compressed_file = wasm_compact_file.as_ref()
+		.and_then(|compact_binary| {
+			let file_name = wasm_binary_name.clone()
+				.unwrap_or_else(|| default_wasm_binary_name.clone());
+
+			let wasm_compact_compressed_file = project.join(
+				format!(
+					"{}.compact.compressed.wasm",
+					file_name,
+				)
+			);
+
+			if compress_wasm(&compact_binary.0, &wasm_compact_compressed_file) {
+				Some(WasmBinary(wasm_compact_compressed_file))
+			} else {
+				None
+			}
+		});
+
 	let bloaty_file_name = if let Some(name) = wasm_binary_name {
 		format!("{}.wasm", name)
 	} else {
@@ -477,7 +500,36 @@ fn compact_wasm_file(
 	let bloaty_file = project.join(bloaty_file_name);
 	fs::copy(wasm_file, &bloaty_file).expect("Copying the bloaty file to the project dir.");
 
-	(wasm_compact_file, WasmBinaryBloaty(bloaty_file))
+	(
+		wasm_compact_file,
+		wasm_compact_compressed_file,
+		WasmBinaryBloaty(bloaty_file),
+	)
+}
+
+fn compress_wasm(
+	wasm_binary_path: &Path,
+	compressed_binary_out_path: &Path,
+) -> bool {
+	use sp_maybe_compressed_blob::CODE_BLOB_BOMB_LIMIT;
+
+	let data = fs::read(wasm_binary_path).expect("Failed to read WASM binary");
+	if let Some(compressed) = sp_maybe_compressed_blob::compress(
+		&data,
+		CODE_BLOB_BOMB_LIMIT,
+	) {
+		fs::write(compressed_binary_out_path, &compressed[..])
+			.expect("Failed to write WASM binary");
+
+		true
+	} else {
+		println!(
+			"cargo:warning=Writing uncompressed wasm. Exceeded maximum size {}",
+			CODE_BLOB_BOMB_LIMIT,
+		);
+
+		false
+	}
 }
 
 /// Custom wrapper for a [`cargo_metadata::Package`] to store it in

From 05445dc6d545095339c3977355f6d441b93685ba Mon Sep 17 00:00:00 2001
From: Falco Hirschenberger <falco.hirschenberger@gmail.com>
Date: Wed, 7 Apr 2021 23:40:28 +0200
Subject: [PATCH 0618/1194] Add more asserts and debug_asserts (#8541)

* Add more asserts and debug_asserts

fixing #8106

* Remove assignments

* convert debug_assert to runtime assert
---
 frame/balances/src/benchmarking.rs            |  3 +-
 frame/balances/src/tests.rs                   | 16 +++---
 frame/balances/src/tests_local.rs             |  6 ++-
 frame/balances/src/tests_reentrancy.rs        |  2 +-
 frame/bounties/src/tests.rs                   |  5 +-
 frame/contracts/src/wasm/mod.rs               | 54 +++++++++----------
 .../src/benchmarking.rs                       |  2 +-
 .../election-provider-multi-phase/src/lib.rs  |  4 +-
 frame/executive/src/lib.rs                    | 10 ++--
 frame/recovery/src/lib.rs                     |  3 +-
 frame/society/src/lib.rs                      |  3 +-
 frame/staking/src/tests.rs                    |  3 +-
 frame/tips/src/benchmarking.rs                |  2 +-
 frame/treasury/src/lib.rs                     | 11 ++--
 14 files changed, 66 insertions(+), 58 deletions(-)

diff --git a/frame/balances/src/benchmarking.rs b/frame/balances/src/benchmarking.rs
index 62959c4f1dc4..6e86d18d7c12 100644
--- a/frame/balances/src/benchmarking.rs
+++ b/frame/balances/src/benchmarking.rs
@@ -44,7 +44,8 @@ benchmarks_instance_pallet! {
 		let balance = existential_deposit.saturating_mul(ED_MULTIPLIER.into());
 		let _ = <Balances<T, I> as Currency<_>>::make_free_balance_be(&caller, balance);
 
-		// Transfer `e - 1` existential deposits + 1 unit, which guarantees to create one account, and reap this user.
+		// Transfer `e - 1` existential deposits + 1 unit, which guarantees to create one account,
+		// and reap this user.
 		let recipient: T::AccountId = account("recipient", 0, SEED);
 		let recipient_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(recipient.clone());
 		let transfer_amount = existential_deposit.saturating_mul((ED_MULTIPLIER - 1).into()) + 1u32.into();
diff --git a/frame/balances/src/tests.rs b/frame/balances/src/tests.rs
index 3eb70e401e7f..de12c39ededf 100644
--- a/frame/balances/src/tests.rs
+++ b/frame/balances/src/tests.rs
@@ -169,13 +169,13 @@ macro_rules! decl_tests {
 						&info_from_weight(1),
 						1,
 					).is_err());
-					assert!(<ChargeTransactionPayment<$test> as SignedExtension>::pre_dispatch(
+					assert_ok!(<ChargeTransactionPayment<$test> as SignedExtension>::pre_dispatch(
 						ChargeTransactionPayment::from(0),
 						&1,
 						CALL,
 						&info_from_weight(1),
 						1,
-					).is_ok());
+					));
 
 					Balances::set_lock(ID_1, &1, 10, WithdrawReasons::TRANSACTION_PAYMENT);
 					assert_ok!(<Balances as Currency<_>>::transfer(&1, &2, 1, AllowDeath));
@@ -394,7 +394,7 @@ macro_rules! decl_tests {
 		fn refunding_balance_should_work() {
 			<$ext_builder>::default().build().execute_with(|| {
 				let _ = Balances::deposit_creating(&1, 42);
-				assert!(Balances::mutate_account(&1, |a| a.reserved = 69).is_ok());
+				assert_ok!(Balances::mutate_account(&1, |a| a.reserved = 69));
 				Balances::unreserve(&1, 69);
 				assert_eq!(Balances::free_balance(1), 111);
 				assert_eq!(Balances::reserved_balance(1), 0);
@@ -669,7 +669,9 @@ macro_rules! decl_tests {
 					assert_eq!(Balances::reserved_balance(1), 50);
 
 					// Reserve some free balance
-					let _ = Balances::slash(&1, 1);
+					let res = Balances::slash(&1, 1);
+					assert_eq!(res, (NegativeImbalance::new(1), 0));
+
 					// The account should be dead.
 					assert_eq!(Balances::free_balance(1), 0);
 					assert_eq!(Balances::reserved_balance(1), 0);
@@ -727,7 +729,8 @@ macro_rules! decl_tests {
 						]
 					);
 
-					let _ = Balances::slash(&1, 1);
+					let res = Balances::slash(&1, 1);
+					assert_eq!(res, (NegativeImbalance::new(1), 0));
 
 					assert_eq!(
 						events(),
@@ -756,7 +759,8 @@ macro_rules! decl_tests {
 						]
 					);
 
-					let _ = Balances::slash(&1, 100);
+					let res = Balances::slash(&1, 100);
+					assert_eq!(res, (NegativeImbalance::new(100), 0));
 
 					assert_eq!(
 						events(),
diff --git a/frame/balances/src/tests_local.rs b/frame/balances/src/tests_local.rs
index f6f0bf8389a1..ac5adfd8d1f3 100644
--- a/frame/balances/src/tests_local.rs
+++ b/frame/balances/src/tests_local.rs
@@ -175,12 +175,14 @@ fn emit_events_with_no_existential_deposit_suicide_with_dust() {
 				]
 			);
 
-			let _ = Balances::slash(&1, 98);
+			let res = Balances::slash(&1, 98);
+			assert_eq!(res, (NegativeImbalance::new(98), 0));
 
 			// no events
 			assert_eq!(events(), []);
 
-			let _ = Balances::slash(&1, 1);
+			let res = Balances::slash(&1, 1);
+			assert_eq!(res, (NegativeImbalance::new(1), 0));
 
 			assert_eq!(
 				events(),
diff --git a/frame/balances/src/tests_reentrancy.rs b/frame/balances/src/tests_reentrancy.rs
index 4016cdb463c6..3d6a90929aee 100644
--- a/frame/balances/src/tests_reentrancy.rs
+++ b/frame/balances/src/tests_reentrancy.rs
@@ -105,7 +105,7 @@ impl pallet_transaction_payment::Config for Test {
 pub struct OnDustRemoval;
 impl OnUnbalanced<NegativeImbalance<Test>> for OnDustRemoval {
 	fn on_nonzero_unbalanced(amount: NegativeImbalance<Test>) {
-		let _ = Balances::resolve_into_existing(&1, amount);
+		assert_ok!(Balances::resolve_into_existing(&1, amount));
 	}
 }
 parameter_types! {
diff --git a/frame/bounties/src/tests.rs b/frame/bounties/src/tests.rs
index d676c940f5af..c3cfe531eccb 100644
--- a/frame/bounties/src/tests.rs
+++ b/frame/bounties/src/tests.rs
@@ -312,7 +312,7 @@ fn pot_underflow_should_not_diminish() {
 		<Treasury as OnInitialize<u64>>::on_initialize(2);
 		assert_eq!(Treasury::pot(), 100); // Pot hasn't changed
 
-		let _ = Balances::deposit_into_existing(&Treasury::account_id(), 100).unwrap();
+		assert_ok!(Balances::deposit_into_existing(&Treasury::account_id(), 100));
 		<Treasury as OnInitialize<u64>>::on_initialize(4);
 		assert_eq!(Balances::free_balance(3), 150); // Fund has been spent
 		assert_eq!(Treasury::pot(), 25); // Pot has finally changed
@@ -689,7 +689,8 @@ fn claim_handles_high_fee() {
 		<Treasury as OnInitialize<u64>>::on_initialize(5);
 
 		// make fee > balance
-		let _ = Balances::slash(&Bounties::bounty_account_id(0), 10);
+		let res = Balances::slash(&Bounties::bounty_account_id(0), 10);
+		assert_eq!(res.0.peek(), 10);
 
 		assert_ok!(Bounties::claim_bounty(Origin::signed(1), 0));
 
diff --git a/frame/contracts/src/wasm/mod.rs b/frame/contracts/src/wasm/mod.rs
index f7fde5ba1786..3f92320b94b7 100644
--- a/frame/contracts/src/wasm/mod.rs
+++ b/frame/contracts/src/wasm/mod.rs
@@ -254,7 +254,7 @@ mod tests {
 	use sp_core::H256;
 	use hex_literal::hex;
 	use sp_runtime::DispatchError;
-	use frame_support::{dispatch::DispatchResult, weights::Weight};
+	use frame_support::{assert_ok, dispatch::DispatchResult, weights::Weight};
 	use assert_matches::assert_matches;
 	use pallet_contracts_primitives::{ExecReturnValue, ReturnFlags, ExecError, ErrorOrigin};
 	use pretty_assertions::assert_eq;
@@ -597,12 +597,12 @@ mod tests {
 	#[test]
 	fn contract_transfer() {
 		let mut mock_ext = MockExt::default();
-		let _ = execute(
+		assert_ok!(execute(
 			CODE_TRANSFER,
 			vec![],
 			&mut mock_ext,
 			&mut GasMeter::new(GAS_LIMIT),
-		).unwrap();
+		));
 
 		assert_eq!(
 			&mock_ext.transfers,
@@ -663,12 +663,12 @@ mod tests {
 	#[test]
 	fn contract_call() {
 		let mut mock_ext = MockExt::default();
-		let _ = execute(
+		assert_ok!(execute(
 			CODE_CALL,
 			vec![],
 			&mut mock_ext,
 			&mut GasMeter::new(GAS_LIMIT),
-		).unwrap();
+		));
 
 		assert_eq!(
 			&mock_ext.transfers,
@@ -739,12 +739,12 @@ mod tests {
 	#[test]
 	fn contract_instantiate() {
 		let mut mock_ext = MockExt::default();
-		let _ = execute(
+		assert_ok!(execute(
 			CODE_INSTANTIATE,
 			vec![],
 			&mut mock_ext,
 			&mut GasMeter::new(GAS_LIMIT),
-		).unwrap();
+		));
 
 		assert_matches!(
 			&mock_ext.instantiates[..],
@@ -851,12 +851,12 @@ mod tests {
 	#[test]
 	fn contract_call_limited_gas() {
 		let mut mock_ext = MockExt::default();
-		let _ = execute(
+		assert_ok!(execute(
 			&CODE_TRANSFER_LIMITED_GAS,
 			vec![],
 			&mut mock_ext,
 			&mut GasMeter::new(GAS_LIMIT),
-		).unwrap();
+		));
 
 		assert_eq!(
 			&mock_ext.transfers,
@@ -994,12 +994,12 @@ mod tests {
 
 	#[test]
 	fn caller() {
-		let _ = execute(
+		assert_ok!(execute(
 			CODE_CALLER,
 			vec![],
 			MockExt::default(),
 			&mut GasMeter::new(GAS_LIMIT),
-		).unwrap();
+		));
 	}
 
 	/// calls `seal_address` and compares the result with the constant 69.
@@ -1047,12 +1047,12 @@ mod tests {
 
 	#[test]
 	fn address() {
-		let _ = execute(
+		assert_ok!(execute(
 			CODE_ADDRESS,
 			vec![],
 			MockExt::default(),
 			&mut GasMeter::new(GAS_LIMIT),
-		).unwrap();
+		));
 	}
 
 	const CODE_BALANCE: &str = r#"
@@ -1099,12 +1099,12 @@ mod tests {
 	#[test]
 	fn balance() {
 		let mut gas_meter = GasMeter::new(GAS_LIMIT);
-		let _ = execute(
+		assert_ok!(execute(
 			CODE_BALANCE,
 			vec![],
 			MockExt::default(),
 			&mut gas_meter,
-		).unwrap();
+		));
 	}
 
 	const CODE_GAS_PRICE: &str = r#"
@@ -1151,12 +1151,12 @@ mod tests {
 	#[test]
 	fn gas_price() {
 		let mut gas_meter = GasMeter::new(GAS_LIMIT);
-		let _ = execute(
+		assert_ok!(execute(
 			CODE_GAS_PRICE,
 			vec![],
 			MockExt::default(),
 			&mut gas_meter,
-		).unwrap();
+		));
 	}
 
 	const CODE_GAS_LEFT: &str = r#"
@@ -1258,12 +1258,12 @@ mod tests {
 	#[test]
 	fn value_transferred() {
 		let mut gas_meter = GasMeter::new(GAS_LIMIT);
-		let _ = execute(
+		assert_ok!(execute(
 			CODE_VALUE_TRANSFERRED,
 			vec![],
 			MockExt::default(),
 			&mut gas_meter,
-		).unwrap();
+		));
 	}
 
 	const CODE_RETURN_FROM_START_FN: &str = r#"
@@ -1346,12 +1346,12 @@ mod tests {
 	#[test]
 	fn now() {
 		let mut gas_meter = GasMeter::new(GAS_LIMIT);
-		let _ = execute(
+		assert_ok!(execute(
 			CODE_TIMESTAMP_NOW,
 			vec![],
 			MockExt::default(),
 			&mut gas_meter,
-		).unwrap();
+		));
 	}
 
 	const CODE_MINIMUM_BALANCE: &str = r#"
@@ -1397,12 +1397,12 @@ mod tests {
 	#[test]
 	fn minimum_balance() {
 		let mut gas_meter = GasMeter::new(GAS_LIMIT);
-		let _ = execute(
+		assert_ok!(execute(
 			CODE_MINIMUM_BALANCE,
 			vec![],
 			MockExt::default(),
 			&mut gas_meter,
-		).unwrap();
+		));
 	}
 
 	const CODE_TOMBSTONE_DEPOSIT: &str = r#"
@@ -1448,12 +1448,12 @@ mod tests {
 	#[test]
 	fn tombstone_deposit() {
 		let mut gas_meter = GasMeter::new(GAS_LIMIT);
-		let _ = execute(
+		assert_ok!(execute(
 			CODE_TOMBSTONE_DEPOSIT,
 			vec![],
 			MockExt::default(),
 			&mut gas_meter,
-		).unwrap();
+		));
 	}
 
 	const CODE_RANDOM: &str = r#"
@@ -1637,12 +1637,12 @@ mod tests {
 	fn deposit_event() {
 		let mut mock_ext = MockExt::default();
 		let mut gas_meter = GasMeter::new(GAS_LIMIT);
-		let _ = execute(
+		assert_ok!(execute(
 			CODE_DEPOSIT_EVENT,
 			vec![],
 			&mut mock_ext,
 			&mut gas_meter
-		).unwrap();
+		));
 
 		assert_eq!(mock_ext.events, vec![
 			(vec![H256::repeat_byte(0x33)],
diff --git a/frame/election-provider-multi-phase/src/benchmarking.rs b/frame/election-provider-multi-phase/src/benchmarking.rs
index 40c7e801ae78..90e90d427dc6 100644
--- a/frame/election-provider-multi-phase/src/benchmarking.rs
+++ b/frame/election-provider-multi-phase/src/benchmarking.rs
@@ -208,7 +208,7 @@ frame_benchmarking::benchmarks! {
 		// assume a queued solution is stored, regardless of where it comes from.
 		<QueuedSolution<T>>::put(ready_solution);
 	}: {
-		let _ = <MultiPhase<T> as ElectionProvider<T::AccountId, T::BlockNumber>>::elect();
+		assert_ok!(<MultiPhase<T> as ElectionProvider<T::AccountId, T::BlockNumber>>::elect());
 	} verify {
 		assert!(<MultiPhase<T>>::queued_solution().is_none());
 		assert!(<DesiredTargets<T>>::get().is_none());
diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index 5545b3961124..17978566a858 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -1411,7 +1411,7 @@ mod tests {
 			roll_to(30);
 			assert!(MultiPhase::current_phase().is_signed());
 
-			let _ = MultiPhase::elect().unwrap();
+			assert_ok!(MultiPhase::elect());
 
 			assert!(MultiPhase::current_phase().is_off());
 			assert!(MultiPhase::snapshot().is_none());
@@ -1434,7 +1434,7 @@ mod tests {
 			assert!(MultiPhase::current_phase().is_off());
 
 			// this module is now only capable of doing on-chain backup.
-			let _ = MultiPhase::elect().unwrap();
+			assert_ok!(MultiPhase::elect());
 
 			assert!(MultiPhase::current_phase().is_off());
 		});
diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index fc4f5be5dc95..97bdfbfdd526 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -553,25 +553,25 @@ mod tests {
 				#[weight = 100]
 				fn some_function(origin) {
 					// NOTE: does not make any different.
-					let _ = frame_system::ensure_signed(origin);
+					frame_system::ensure_signed(origin)?;
 				}
 				#[weight = (200, DispatchClass::Operational)]
 				fn some_root_operation(origin) {
-					let _ = frame_system::ensure_root(origin);
+					frame_system::ensure_root(origin)?;
 				}
 				#[weight = 0]
 				fn some_unsigned_message(origin) {
-					let _ = frame_system::ensure_none(origin);
+					frame_system::ensure_none(origin)?;
 				}
 
 				#[weight = 0]
 				fn allowed_unsigned(origin) {
-					let _ = frame_system::ensure_root(origin)?;
+					frame_system::ensure_root(origin)?;
 				}
 
 				#[weight = 0]
 				fn unallowed_unsigned(origin) {
-					let _ = frame_system::ensure_root(origin)?;
+					frame_system::ensure_root(origin)?;
 				}
 
 				// module hooks.
diff --git a/frame/recovery/src/lib.rs b/frame/recovery/src/lib.rs
index cb991e64945a..ceb2f5a68874 100644
--- a/frame/recovery/src/lib.rs
+++ b/frame/recovery/src/lib.rs
@@ -621,7 +621,8 @@ decl_module! {
 			let active_recovery = <ActiveRecoveries<T>>::take(&who, &rescuer).ok_or(Error::<T>::NotStarted)?;
 			// Move the reserved funds from the rescuer to the rescued account.
 			// Acts like a slashing mechanism for those who try to maliciously recover accounts.
-			let _ = T::Currency::repatriate_reserved(&rescuer, &who, active_recovery.deposit, BalanceStatus::Free);
+			let res = T::Currency::repatriate_reserved(&rescuer, &who, active_recovery.deposit, BalanceStatus::Free);
+			debug_assert!(res.is_ok());
 			Self::deposit_event(RawEvent::RecoveryClosed(who, rescuer));
 		}
 
diff --git a/frame/society/src/lib.rs b/frame/society/src/lib.rs
index 64caf328002a..171815e56eee 100644
--- a/frame/society/src/lib.rs
+++ b/frame/society/src/lib.rs
@@ -997,7 +997,8 @@ decl_module! {
 						match kind {
 							BidKind::Deposit(deposit) => {
 								// Slash deposit and move it to the society account
-								let _ = T::Currency::repatriate_reserved(&who, &Self::account_id(), deposit, BalanceStatus::Free);
+								let res = T::Currency::repatriate_reserved(&who, &Self::account_id(), deposit, BalanceStatus::Free);
+								debug_assert!(res.is_ok());
 							}
 							BidKind::Vouch(voucher, _) => {
 								// Ban the voucher from vouching again
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index 7a3ec19f8af2..05eb6fdc5e02 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -437,7 +437,8 @@ fn no_candidate_emergency_condition() {
 			<Staking as crate::Store>::MinimumValidatorCount::put(10);
 
 			// try to chill
-			let _ = Staking::chill(Origin::signed(10));
+			let res = Staking::chill(Origin::signed(10));
+			assert_ok!(res);
 
 			// trigger era
 			mock::start_active_era(1);
diff --git a/frame/tips/src/benchmarking.rs b/frame/tips/src/benchmarking.rs
index e6a0284d8230..6c304fabb5a2 100644
--- a/frame/tips/src/benchmarking.rs
+++ b/frame/tips/src/benchmarking.rs
@@ -23,7 +23,7 @@ use super::*;
 
 use frame_system::RawOrigin;
 use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
-use sp_runtime::{traits::{Saturating}};
+use sp_runtime::traits::Saturating;
 
 use crate::Module as TipsMod;
 
diff --git a/frame/treasury/src/lib.rs b/frame/treasury/src/lib.rs
index cef50706b517..d69462c92d1b 100644
--- a/frame/treasury/src/lib.rs
+++ b/frame/treasury/src/lib.rs
@@ -68,16 +68,16 @@ use serde::{Serialize, Deserialize};
 use sp_std::prelude::*;
 use frame_support::{decl_module, decl_storage, decl_event, ensure, print, decl_error};
 use frame_support::traits::{
-	Currency, Get, Imbalance, OnUnbalanced, ExistenceRequirement::{KeepAlive},
+	Currency, Get, Imbalance, OnUnbalanced, ExistenceRequirement::KeepAlive,
 	ReservableCurrency, WithdrawReasons
 };
 use sp_runtime::{Permill, ModuleId, RuntimeDebug, traits::{
 	Zero, StaticLookup, AccountIdConversion, Saturating
 }};
 use frame_support::weights::{Weight, DispatchClass};
-use frame_support::traits::{EnsureOrigin};
+use frame_support::traits::EnsureOrigin;
 use codec::{Encode, Decode};
-use frame_system::{ensure_signed};
+use frame_system::ensure_signed;
 pub use weights::WeightInfo;
 
 pub type BalanceOf<T, I=DefaultInstance> =
@@ -187,10 +187,7 @@ decl_storage! {
 			let account_id = <Module<T, I>>::account_id();
 			let min = T::Currency::minimum_balance();
 			if T::Currency::free_balance(&account_id) < min {
-				let _ = T::Currency::make_free_balance_be(
-					&account_id,
-					min,
-				);
+				let _ = T::Currency::make_free_balance_be(&account_id, min);
 			}
 		});
 	}

From fea6aa2e37c9d55b6b7f1ea359e05e0614adfd29 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Thu, 8 Apr 2021 12:54:46 +0200
Subject: [PATCH 0619/1194] Add PoV Tracking to Benchmarking Pipeline (#8559)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Added a function to estimate proof size for benchmarking

* integrate proof_size into benchmarking pipeline

* Update client/db/src/bench.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/db/src/bench.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* fix tests

* one more test

* Update bench.rs

* Update utils/frame/benchmarking-cli/src/writer.rs

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

* Update utils/frame/benchmarking-cli/src/command.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

Co-authored-by: arkpar <arkady.paronyan@gmail.com>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
---
 client/db/src/bench.rs                      | 48 +++++++++++++++++----
 frame/benchmarking/src/analysis.rs          |  5 +++
 frame/benchmarking/src/lib.rs               | 12 +++++-
 frame/benchmarking/src/utils.rs             |  6 +++
 primitives/externalities/src/lib.rs         | 10 +++++
 primitives/state-machine/src/backend.rs     |  5 +++
 primitives/state-machine/src/ext.rs         |  4 ++
 utils/frame/benchmarking-cli/src/command.rs |  7 +--
 utils/frame/benchmarking-cli/src/lib.rs     |  4 ++
 utils/frame/benchmarking-cli/src/writer.rs  |  1 +
 10 files changed, 90 insertions(+), 12 deletions(-)

diff --git a/client/db/src/bench.rs b/client/db/src/bench.rs
index f0c187bd379f..2704676207b0 100644
--- a/client/db/src/bench.rs
+++ b/client/db/src/bench.rs
@@ -23,7 +23,7 @@ use std::cell::{Cell, RefCell};
 use std::collections::HashMap;
 
 use hash_db::{Prefix, Hasher};
-use sp_trie::{MemoryDB, prefixed_key};
+use sp_trie::{MemoryDB, prefixed_key, StorageProof};
 use sp_core::{
 	storage::{ChildInfo, TrackedStorageKey},
 	hexdisplay::HexDisplay
@@ -31,9 +31,10 @@ use sp_core::{
 use sp_runtime::traits::{Block as BlockT, HashFor};
 use sp_runtime::Storage;
 use sp_state_machine::{
-	DBValue, backend::Backend as StateBackend, StorageCollection, ChildStorageCollection
+	DBValue, backend::Backend as StateBackend, StorageCollection, ChildStorageCollection, ProofRecorder,
 };
 use kvdb::{KeyValueDB, DBTransaction};
+use codec::Encode;
 use crate::storage_cache::{CachingState, SharedCache, new_shared_cache};
 
 type DbState<B> = sp_state_machine::TrieBackend<
@@ -44,14 +45,25 @@ type State<B> = CachingState<DbState<B>, B>;
 
 struct StorageDb<Block: BlockT> {
 	db: Arc<dyn KeyValueDB>,
+	proof_recorder: Option<ProofRecorder<HashFor<Block>>>,
 	_block: std::marker::PhantomData<Block>,
 }
 
 impl<Block: BlockT> sp_state_machine::Storage<HashFor<Block>> for StorageDb<Block> {
 	fn get(&self, key: &Block::Hash, prefix: Prefix) -> Result<Option<DBValue>, String> {
-		let key = prefixed_key::<HashFor<Block>>(key, prefix);
-		self.db.get(0, &key)
-			.map_err(|e| format!("Database backend error: {:?}", e))
+		let prefixed_key = prefixed_key::<HashFor<Block>>(key, prefix);
+		if let Some(recorder) = &self.proof_recorder {
+			if let Some(v) = recorder.read().get(&key) {
+				return Ok(v.clone());
+			}
+			let backend_value = self.db.get(0, &prefixed_key)
+				.map_err(|e| format!("Database backend error: {:?}", e))?;
+			recorder.write().insert(key.clone(), backend_value.clone());
+			Ok(backend_value)
+		} else {
+			self.db.get(0, &prefixed_key)
+				.map_err(|e| format!("Database backend error: {:?}", e))
+		}
 	}
 }
 
@@ -105,11 +117,12 @@ pub struct BenchmarkingState<B: BlockT> {
 	child_key_tracker: RefCell<HashMap<Vec<u8>, HashMap<Vec<u8>, KeyTracker>>>,
 	read_write_tracker: RefCell<ReadWriteTracker>,
 	whitelist: RefCell<Vec<TrackedStorageKey>>,
+	proof_recorder: Option<ProofRecorder<HashFor<B>>>,
 }
 
 impl<B: BlockT> BenchmarkingState<B> {
 	/// Create a new instance that creates a database in a temporary dir.
-	pub fn new(genesis: Storage, _cache_size_mb: Option<usize>) -> Result<Self, String> {
+	pub fn new(genesis: Storage, _cache_size_mb: Option<usize>, record_proof: bool) -> Result<Self, String> {
 		let mut root = B::Hash::default();
 		let mut mdb = MemoryDB::<HashFor<B>>::default();
 		sp_state_machine::TrieDBMut::<HashFor<B>>::new(&mut mdb, &mut root);
@@ -126,6 +139,7 @@ impl<B: BlockT> BenchmarkingState<B> {
 			child_key_tracker: Default::default(),
 			read_write_tracker: Default::default(),
 			whitelist: Default::default(),
+			proof_recorder: record_proof.then(Default::default),
 		};
 
 		state.add_whitelist_to_tracker();
@@ -153,7 +167,14 @@ impl<B: BlockT> BenchmarkingState<B> {
 			None => Arc::new(::kvdb_memorydb::create(1)),
 		};
 		self.db.set(Some(db.clone()));
-		let storage_db = Arc::new(StorageDb::<B> { db, _block: Default::default() });
+		if let Some(recorder) = &self.proof_recorder {
+			recorder.write().clear();
+		}
+		let storage_db = Arc::new(StorageDb::<B> {
+			db,
+			proof_recorder: self.proof_recorder.clone(),
+			_block: Default::default()
+		});
 		*self.state.borrow_mut() = Some(State::new(
 			DbState::<B>::new(storage_db, self.root.get()),
 			self.shared_cache.clone(),
@@ -495,6 +516,17 @@ impl<B: BlockT> StateBackend<HashFor<B>> for BenchmarkingState<B> {
 	fn usage_info(&self) -> sp_state_machine::UsageInfo {
 		self.state.borrow().as_ref().map_or(sp_state_machine::UsageInfo::empty(), |s| s.usage_info())
 	}
+
+	fn proof_size(&self) -> Option<u32> {
+		self.proof_recorder.as_ref().map(|recorder| {
+			let proof = StorageProof::new(recorder
+				.read()
+				.iter()
+				.filter_map(|(_k, v)| v.as_ref().map(|v| v.to_vec()))
+				.collect());
+			proof.encoded_size() as u32
+		})
+	}
 }
 
 impl<Block: BlockT> std::fmt::Debug for BenchmarkingState<Block> {
@@ -510,7 +542,7 @@ mod test {
 
 	#[test]
 	fn read_to_main_and_child_tries() {
-		let bench_state = BenchmarkingState::<crate::tests::Block>::new(Default::default(), None)
+		let bench_state = BenchmarkingState::<crate::tests::Block>::new(Default::default(), None, false)
 			.unwrap();
 
 		for _ in 0..2 {
diff --git a/frame/benchmarking/src/analysis.rs b/frame/benchmarking/src/analysis.rs
index a9657fd7b11a..7b6d8838fd21 100644
--- a/frame/benchmarking/src/analysis.rs
+++ b/frame/benchmarking/src/analysis.rs
@@ -38,6 +38,7 @@ pub enum BenchmarkSelector {
 	StorageRootTime,
 	Reads,
 	Writes,
+	ProofSize,
 }
 
 #[derive(Debug)]
@@ -86,6 +87,7 @@ impl Analysis {
 				BenchmarkSelector::StorageRootTime => result.storage_root_time,
 				BenchmarkSelector::Reads => result.reads.into(),
 				BenchmarkSelector::Writes => result.writes.into(),
+				BenchmarkSelector::ProofSize => result.proof_size.into(),
 			}
 		).collect();
 
@@ -126,6 +128,7 @@ impl Analysis {
 						BenchmarkSelector::StorageRootTime => result.storage_root_time,
 						BenchmarkSelector::Reads => result.reads.into(),
 						BenchmarkSelector::Writes => result.writes.into(),
+						BenchmarkSelector::ProofSize => result.proof_size.into(),
 					};
 					(result.components[i].1, data)
 				})
@@ -190,6 +193,7 @@ impl Analysis {
 					BenchmarkSelector::StorageRootTime => result.storage_root_time,
 					BenchmarkSelector::Reads => result.reads.into(),
 					BenchmarkSelector::Writes => result.writes.into(),
+					BenchmarkSelector::ProofSize => result.proof_size.into(),
 				})
 		}
 
@@ -370,6 +374,7 @@ mod tests {
 			repeat_reads: 0,
 			writes,
 			repeat_writes: 0,
+			proof_size: 0,
 		}
 	}
 
diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
index b134e79ca245..ea1bfbd68104 100644
--- a/frame/benchmarking/src/lib.rs
+++ b/frame/benchmarking/src/lib.rs
@@ -764,12 +764,21 @@ macro_rules! impl_benchmark {
 								"Start Benchmark: {:?}", c
 							);
 
+							let start_pov = $crate::benchmarking::proof_size();
 							let start_extrinsic = $crate::benchmarking::current_time();
 
 							closure_to_benchmark()?;
 
 							let finish_extrinsic = $crate::benchmarking::current_time();
-							let elapsed_extrinsic = finish_extrinsic - start_extrinsic;
+							let end_pov = $crate::benchmarking::proof_size();
+
+							// Calculate the diff caused by the benchmark.
+							let elapsed_extrinsic = finish_extrinsic.saturating_sub(start_extrinsic);
+							let diff_pov = match (start_pov, end_pov) {
+								(Some(start), Some(end)) => end.saturating_sub(start),
+								_ => Default::default(),
+							};
+
 							// Commit the changes to get proper write count
 							$crate::benchmarking::commit_db();
 							$crate::log::trace!(
@@ -796,6 +805,7 @@ macro_rules! impl_benchmark {
 								repeat_reads: read_write_count.1,
 								writes: read_write_count.2,
 								repeat_writes: read_write_count.3,
+								proof_size: diff_pov,
 							});
 						}
 
diff --git a/frame/benchmarking/src/utils.rs b/frame/benchmarking/src/utils.rs
index 1574e47454b5..2db7b2e95d9d 100644
--- a/frame/benchmarking/src/utils.rs
+++ b/frame/benchmarking/src/utils.rs
@@ -62,6 +62,7 @@ pub struct BenchmarkResults {
 	pub repeat_reads: u32,
 	pub writes: u32,
 	pub repeat_writes: u32,
+	pub proof_size: u32,
 }
 
 /// Configuration used to setup and run runtime benchmarks.
@@ -162,6 +163,11 @@ pub trait Benchmarking {
 		whitelist.retain(|x| x.key != remove);
 		self.set_whitelist(whitelist);
 	}
+
+	/// Get current estimated proof size.
+	fn proof_size(&self) -> Option<u32> {
+		self.proof_size()
+	}
 }
 
 /// The pallet benchmarking trait.
diff --git a/primitives/externalities/src/lib.rs b/primitives/externalities/src/lib.rs
index 1077f41048d5..c90881b76e26 100644
--- a/primitives/externalities/src/lib.rs
+++ b/primitives/externalities/src/lib.rs
@@ -281,6 +281,16 @@ pub trait Externalities: ExtensionStore {
 	///
 	/// Adds new storage keys to the DB tracking whitelist.
 	fn set_whitelist(&mut self, new: Vec<TrackedStorageKey>);
+
+	/// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+	/// Benchmarking related functionality and shouldn't be used anywhere else!
+	/// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+	///
+	/// Returns estimated proof size for the state queries so far.
+	/// Proof is reset on commit and wipe.
+	fn proof_size(&self) -> Option<u32> {
+		None
+	}
 }
 
 /// Extension for the [`Externalities`] trait.
diff --git a/primitives/state-machine/src/backend.rs b/primitives/state-machine/src/backend.rs
index eb1c566c6dde..1a8892f8dd14 100644
--- a/primitives/state-machine/src/backend.rs
+++ b/primitives/state-machine/src/backend.rs
@@ -245,6 +245,11 @@ pub trait Backend<H: Hasher>: sp_std::fmt::Debug {
 
 	/// Update the whitelist for tracking db reads/writes
 	fn set_whitelist(&self, _: Vec<TrackedStorageKey>) {}
+
+	/// Estimate proof size
+	fn proof_size(&self) -> Option<u32> {
+		unimplemented!()
+	}
 }
 
 impl<'a, T: Backend<H>, H: Hasher> Backend<H> for &'a T {
diff --git a/primitives/state-machine/src/ext.rs b/primitives/state-machine/src/ext.rs
index 65b7b638a9a2..424a3c6c421a 100644
--- a/primitives/state-machine/src/ext.rs
+++ b/primitives/state-machine/src/ext.rs
@@ -712,6 +712,10 @@ where
 	fn set_whitelist(&mut self, new: Vec<TrackedStorageKey>) {
 		self.backend.set_whitelist(new)
 	}
+
+	fn proof_size(&self) -> Option<u32> {
+		self.backend.proof_size()
+	}
 }
 
 /// Implement `Encode` by forwarding the stored raw vec.
diff --git a/utils/frame/benchmarking-cli/src/command.rs b/utils/frame/benchmarking-cli/src/command.rs
index 146b0aa84133..80d95d1c86dc 100644
--- a/utils/frame/benchmarking-cli/src/command.rs
+++ b/utils/frame/benchmarking-cli/src/command.rs
@@ -63,7 +63,7 @@ impl BenchmarkCmd {
 		let genesis_storage = spec.build_storage()?;
 		let mut changes = Default::default();
 		let cache_size = Some(self.database_cache_size as usize);
-		let state = BenchmarkingState::<BB>::new(genesis_storage, cache_size)?;
+		let state = BenchmarkingState::<BB>::new(genesis_storage, cache_size, self.record_proof)?;
 		let executor = NativeExecutor::<ExecDispatch>::new(
 			wasm_method,
 			self.heap_pages,
@@ -126,19 +126,20 @@ impl BenchmarkCmd {
 						// Print the table header
 						batch.results[0].components.iter().for_each(|param| print!("{:?},", param.0));
 
-						print!("extrinsic_time,storage_root_time,reads,repeat_reads,writes,repeat_writes\n");
+						print!("extrinsic_time_ns,storage_root_time_ns,reads,repeat_reads,writes,repeat_writes,proof_size_bytes\n");
 						// Print the values
 						batch.results.iter().for_each(|result| {
 							let parameters = &result.components;
 							parameters.iter().for_each(|param| print!("{:?},", param.1));
 							// Print extrinsic time and storage root time
-							print!("{:?},{:?},{:?},{:?},{:?},{:?}\n",
+							print!("{:?},{:?},{:?},{:?},{:?},{:?},{:?}\n",
 								result.extrinsic_time,
 								result.storage_root_time,
 								result.reads,
 								result.repeat_reads,
 								result.writes,
 								result.repeat_writes,
+								result.proof_size,
 							);
 						});
 
diff --git a/utils/frame/benchmarking-cli/src/lib.rs b/utils/frame/benchmarking-cli/src/lib.rs
index 6784b1ecabf4..9862a5a5b82a 100644
--- a/utils/frame/benchmarking-cli/src/lib.rs
+++ b/utils/frame/benchmarking-cli/src/lib.rs
@@ -97,6 +97,10 @@ pub struct BenchmarkCmd {
 	#[structopt(long)]
 	pub extra: bool,
 
+	/// Estimate PoV size.
+	#[structopt(long)]
+	pub record_proof: bool,
+
 	#[allow(missing_docs)]
 	#[structopt(flatten)]
 	pub shared_params: sc_cli::SharedParams,
diff --git a/utils/frame/benchmarking-cli/src/writer.rs b/utils/frame/benchmarking-cli/src/writer.rs
index aeed6ea1c9a8..6fd6cc6eefdc 100644
--- a/utils/frame/benchmarking-cli/src/writer.rs
+++ b/utils/frame/benchmarking-cli/src/writer.rs
@@ -421,6 +421,7 @@ mod test {
 					repeat_reads: 0,
 					writes: (base + slope * i).into(),
 					repeat_writes: 0,
+					proof_size: 0,
 				}
 			)
 		}

From 269087319cd7377f86a96ccf768a7167e4a4ce9a Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Thu, 8 Apr 2021 13:23:55 +0200
Subject: [PATCH 0620/1194] Add DefaultNoBound (#8542)

* Add DefaultNoBound

* Add tests

* Fix
---
 .../procedural/src/default_no_bound.rs        | 98 +++++++++++++++++++
 frame/support/procedural/src/lib.rs           |  7 ++
 frame/support/src/lib.rs                      | 19 ++++
 frame/support/test/tests/derive_no_bound.rs   | 69 +++++++++++--
 .../test/tests/derive_no_bound_ui/default.rs  | 10 ++
 .../tests/derive_no_bound_ui/default.stderr   |  7 ++
 6 files changed, 204 insertions(+), 6 deletions(-)
 create mode 100644 frame/support/procedural/src/default_no_bound.rs
 create mode 100644 frame/support/test/tests/derive_no_bound_ui/default.rs
 create mode 100644 frame/support/test/tests/derive_no_bound_ui/default.stderr

diff --git a/frame/support/procedural/src/default_no_bound.rs b/frame/support/procedural/src/default_no_bound.rs
new file mode 100644
index 000000000000..ed35e057f037
--- /dev/null
+++ b/frame/support/procedural/src/default_no_bound.rs
@@ -0,0 +1,98 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use syn::spanned::Spanned;
+
+/// Derive Clone but do not bound any generic.
+pub fn derive_default_no_bound(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+	let input: syn::DeriveInput = match syn::parse(input) {
+		Ok(input) => input,
+		Err(e) => return e.to_compile_error().into(),
+	};
+
+	let name = &input.ident;
+	let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();
+
+	let impl_ = match input.data {
+		syn::Data::Struct(struct_) => match struct_.fields {
+			syn::Fields::Named(named) => {
+				let fields = named.named.iter()
+					.map(|i| &i.ident)
+					.map(|i| quote::quote_spanned!(i.span() =>
+						#i: core::default::Default::default()
+					));
+
+				quote::quote!( Self { #( #fields, )* } )
+			},
+			syn::Fields::Unnamed(unnamed) => {
+				let fields = unnamed.unnamed.iter().enumerate()
+					.map(|(i, _)| syn::Index::from(i))
+					.map(|i| quote::quote_spanned!(i.span() =>
+						core::default::Default::default()
+					));
+
+				quote::quote!( Self ( #( #fields, )* ) )
+			},
+			syn::Fields::Unit => {
+				quote::quote!( Self )
+			}
+		},
+		syn::Data::Enum(enum_) => {
+			if let Some(first_variant) = enum_.variants.first() {
+				let variant_ident = &first_variant.ident;
+				match &first_variant.fields {
+					syn::Fields::Named(named) => {
+						let fields = named.named.iter()
+							.map(|i| &i.ident)
+							.map(|i| quote::quote_spanned!(i.span() =>
+								#i: core::default::Default::default()
+							));
+
+						quote::quote!( #name :: #ty_generics :: #variant_ident { #( #fields, )* } )
+					},
+					syn::Fields::Unnamed(unnamed) => {
+						let fields = unnamed.unnamed.iter().enumerate()
+							.map(|(i, _)| syn::Index::from(i))
+							.map(|i| quote::quote_spanned!(i.span() =>
+								core::default::Default::default()
+							));
+
+						quote::quote!( #name :: #ty_generics :: #variant_ident ( #( #fields, )* ) )
+					},
+					syn::Fields::Unit => quote::quote!( #name :: #ty_generics :: #variant_ident ),
+				}
+			} else {
+				quote::quote!( Self )
+			}
+
+		},
+		syn::Data::Union(_) => {
+			let msg = "Union type not supported by `derive(CloneNoBound)`";
+			return syn::Error::new(input.span(), msg).to_compile_error().into()
+		},
+	};
+
+	quote::quote!(
+		const _: () = {
+			impl #impl_generics core::default::Default for #name #ty_generics #where_clause {
+				fn default() -> Self {
+					#impl_
+				}
+			}
+		};
+	).into()
+}
diff --git a/frame/support/procedural/src/lib.rs b/frame/support/procedural/src/lib.rs
index ca6edddaffa1..4cedf798821a 100644
--- a/frame/support/procedural/src/lib.rs
+++ b/frame/support/procedural/src/lib.rs
@@ -27,6 +27,7 @@ mod transactional;
 mod debug_no_bound;
 mod clone_no_bound;
 mod partial_eq_no_bound;
+mod default_no_bound;
 
 pub(crate) use storage::INHERENT_INSTANCE_NAME;
 use proc_macro::TokenStream;
@@ -412,6 +413,12 @@ pub fn derive_eq_no_bound(input: TokenStream) -> TokenStream {
 	).into()
 }
 
+/// derive `Default` but do no bound any generic. Docs are at `frame_support::DefaultNoBound`.
+#[proc_macro_derive(DefaultNoBound)]
+pub fn derive_default_no_bound(input: TokenStream) -> TokenStream {
+	default_no_bound::derive_default_no_bound(input)
+}
+
 #[proc_macro_attribute]
 pub fn require_transactional(attr: TokenStream, input: TokenStream) -> TokenStream {
 	transactional::require_transactional(attr, input).unwrap_or_else(|e| e.to_compile_error().into())
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 362c4c5a0a73..dc5bb2f5b4f4 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -560,6 +560,25 @@ pub use frame_support_procedural::PartialEqNoBound;
 /// ```
 pub use frame_support_procedural::DebugNoBound;
 
+/// Derive [`Default`] but do not bound any generic.
+///
+/// This is useful for type generic over runtime:
+/// ```
+/// # use frame_support::DefaultNoBound;
+/// # use core::default::Default;
+/// trait Config {
+///		type C: Default;
+/// }
+///
+/// // Foo implements [`Default`] because `C` bounds [`Default`].
+/// // Otherwise compilation will fail with an output telling `c` doesn't implement [`Default`].
+/// #[derive(DefaultNoBound)]
+/// struct Foo<T: Config> {
+///		c: T::C,
+/// }
+/// ```
+pub use frame_support_procedural::DefaultNoBound;
+
 /// Assert the annotated function is executed within a storage transaction.
 ///
 /// The assertion is enabled for native execution and when `debug_assertions` are enabled.
diff --git a/frame/support/test/tests/derive_no_bound.rs b/frame/support/test/tests/derive_no_bound.rs
index b96fbcfba931..3081a332b72c 100644
--- a/frame/support/test/tests/derive_no_bound.rs
+++ b/frame/support/test/tests/derive_no_bound.rs
@@ -15,9 +15,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Tests for DebugNoBound, CloneNoBound, EqNoBound, PartialEqNoBound, and RuntimeDebugNoBound
+//! Tests for DebugNoBound, CloneNoBound, EqNoBound, PartialEqNoBound, DefaultNoBound, and
+//! RuntimeDebugNoBound
 
-use frame_support::{DebugNoBound, CloneNoBound, EqNoBound, PartialEqNoBound, RuntimeDebugNoBound};
+use frame_support::{
+	DebugNoBound, CloneNoBound, EqNoBound, PartialEqNoBound, RuntimeDebugNoBound, DefaultNoBound,
+};
 
 #[derive(RuntimeDebugNoBound)]
 struct Unnamed(u64);
@@ -29,7 +32,7 @@ fn runtime_debug_no_bound_display_correctly() {
 }
 
 trait Config {
-	type C: std::fmt::Debug + Clone + Eq + PartialEq;
+	type C: std::fmt::Debug + Clone + Eq + PartialEq + Default;
 }
 
 struct Runtime;
@@ -39,7 +42,7 @@ impl Config for Runtime {
 	type C = u32;
 }
 
-#[derive(DebugNoBound, CloneNoBound, EqNoBound, PartialEqNoBound)]
+#[derive(DebugNoBound, CloneNoBound, EqNoBound, PartialEqNoBound, DefaultNoBound)]
 struct StructNamed<T: Config, U, V> {
 	a: u32,
 	b: u64,
@@ -56,6 +59,12 @@ fn test_struct_named() {
 		phantom: Default::default(),
 	};
 
+	let a_default: StructNamed::<Runtime, ImplNone, ImplNone> = Default::default();
+	assert_eq!(a_default.a, 0);
+	assert_eq!(a_default.b, 0);
+	assert_eq!(a_default.c, 0);
+	assert_eq!(a_default.phantom, Default::default());
+
 	let a_2 = a_1.clone();
 	assert_eq!(a_2.a, 1);
 	assert_eq!(a_2.b, 2);
@@ -76,7 +85,7 @@ fn test_struct_named() {
 	assert!(b != a_1);
 }
 
-#[derive(DebugNoBound, CloneNoBound, EqNoBound, PartialEqNoBound)]
+#[derive(DebugNoBound, CloneNoBound, EqNoBound, PartialEqNoBound, DefaultNoBound)]
 struct StructUnnamed<T: Config, U, V>(u32, u64, T::C, core::marker::PhantomData<(U, V)>);
 
 #[test]
@@ -88,6 +97,12 @@ fn test_struct_unnamed() {
 		Default::default(),
 	);
 
+	let a_default: StructUnnamed::<Runtime, ImplNone, ImplNone> = Default::default();
+	assert_eq!(a_default.0, 0);
+	assert_eq!(a_default.1, 0);
+	assert_eq!(a_default.2, 0);
+	assert_eq!(a_default.3, Default::default());
+
 	let a_2 = a_1.clone();
 	assert_eq!(a_2.0, 1);
 	assert_eq!(a_2.1, 2);
@@ -108,7 +123,7 @@ fn test_struct_unnamed() {
 	assert!(b != a_1);
 }
 
-#[derive(DebugNoBound, CloneNoBound, EqNoBound, PartialEqNoBound)]
+#[derive(DebugNoBound, CloneNoBound, EqNoBound, PartialEqNoBound, DefaultNoBound)]
 enum Enum<T: Config, U, V> {
 	VariantUnnamed(u32, u64, T::C, core::marker::PhantomData<(U, V)>),
 	VariantNamed {
@@ -121,6 +136,32 @@ enum Enum<T: Config, U, V> {
 	VariantUnit2,
 }
 
+// enum that will have a named default.
+#[derive(DebugNoBound, CloneNoBound, EqNoBound, PartialEqNoBound, DefaultNoBound)]
+enum Enum2<T: Config> {
+	VariantNamed {
+		a: u32,
+		b: u64,
+		c: T::C,
+	},
+	VariantUnnamed(u32, u64, T::C),
+	VariantUnit,
+	VariantUnit2,
+}
+
+// enum that will have a unit default.
+#[derive(DebugNoBound, CloneNoBound, EqNoBound, PartialEqNoBound, DefaultNoBound)]
+enum Enum3<T: Config> {
+	VariantUnit,
+	VariantNamed {
+		a: u32,
+		b: u64,
+		c: T::C,
+	},
+	VariantUnnamed(u32, u64, T::C),
+	VariantUnit2,
+}
+
 #[test]
 fn test_enum() {
 	type TestEnum = Enum::<Runtime, ImplNone, ImplNone>;
@@ -131,6 +172,22 @@ fn test_enum() {
 	let variant_2 = TestEnum::VariantUnit;
 	let variant_3 = TestEnum::VariantUnit2;
 
+	let default: TestEnum = Default::default();
+	assert_eq!(
+		default,
+		// first variant is default.
+		TestEnum::VariantUnnamed(0, 0, 0, Default::default())
+	);
+
+	assert_eq!(
+		Enum2::<Runtime>::default(),
+		Enum2::<Runtime>::VariantNamed { a: 0, b: 0, c: 0},
+	);
+	assert_eq!(
+		Enum3::<Runtime>::default(),
+		Enum3::<Runtime>::VariantUnit,
+	);
+
 	assert!(variant_0 != variant_0_bis);
 	assert!(variant_1 != variant_1_bis);
 	assert!(variant_0 != variant_1);
diff --git a/frame/support/test/tests/derive_no_bound_ui/default.rs b/frame/support/test/tests/derive_no_bound_ui/default.rs
new file mode 100644
index 000000000000..0780a88e6753
--- /dev/null
+++ b/frame/support/test/tests/derive_no_bound_ui/default.rs
@@ -0,0 +1,10 @@
+trait Config {
+	type C;
+}
+
+#[derive(frame_support::DefaultNoBound)]
+struct Foo<T: Config> {
+	c: T::C,
+}
+
+fn main() {}
diff --git a/frame/support/test/tests/derive_no_bound_ui/default.stderr b/frame/support/test/tests/derive_no_bound_ui/default.stderr
new file mode 100644
index 000000000000..d58b5e918526
--- /dev/null
+++ b/frame/support/test/tests/derive_no_bound_ui/default.stderr
@@ -0,0 +1,7 @@
+error[E0277]: the trait bound `<T as Config>::C: std::default::Default` is not satisfied
+ --> $DIR/default.rs:7:2
+  |
+7 |     c: T::C,
+  |     ^ the trait `std::default::Default` is not implemented for `<T as Config>::C`
+  |
+  = note: required by `std::default::Default::default`

From c865c1e895d3e9872e2e8243af8065a9ec133fe9 Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Thu, 8 Apr 2021 15:13:12 +0200
Subject: [PATCH 0621/1194] remove real-overseer from polkadot compilation
 flags (#8560)

* remove real-overseer

* remove unneeded
---
 .maintain/gitlab/check_polkadot_companion_build.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.maintain/gitlab/check_polkadot_companion_build.sh b/.maintain/gitlab/check_polkadot_companion_build.sh
index c1fd7365237d..89780f082e45 100755
--- a/.maintain/gitlab/check_polkadot_companion_build.sh
+++ b/.maintain/gitlab/check_polkadot_companion_build.sh
@@ -89,7 +89,4 @@ fi
 diener patch --crates-to-patch ../ --substrate --path Cargo.toml
 
 # Test Polkadot pr or master branch with this Substrate commit.
-time cargo test --all --release --verbose --features=real-overseer
-
-cd parachain/test-parachains/adder/collator/
-time cargo test --release --verbose --locked --features=real-overseer
+time cargo test --all --release --verbose

From a566661711babc51f0d1bcd63179a576e84280b9 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Thu, 8 Apr 2021 18:41:23 +0200
Subject: [PATCH 0622/1194] Check every minute whether authority-discovery key
 has changed (#8575)

* Check every minute whether authority-discovery key has changed

* Fix test

* Fix comment

* Use HashSet for latest_published_keys

* More fixing

* God I'm tired, sorry
---
 client/authority-discovery/src/lib.rs         |  6 +++
 client/authority-discovery/src/worker.rs      | 45 +++++++++++++++----
 .../authority-discovery/src/worker/tests.rs   |  2 +-
 3 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/client/authority-discovery/src/lib.rs b/client/authority-discovery/src/lib.rs
index 818eb1beb3ff..469c0851f161 100644
--- a/client/authority-discovery/src/lib.rs
+++ b/client/authority-discovery/src/lib.rs
@@ -53,6 +53,11 @@ pub struct WorkerConfig {
 	///
 	/// By default this is set to 1 hour.
 	pub max_publish_interval: Duration,
+	/// Interval at which the keystore is queried. If the keys have changed, unconditionally
+	/// re-publish its addresses on the DHT.
+	///
+	/// By default this is set to 1 minute.
+	pub keystore_refresh_interval: Duration,
 	/// The maximum interval in which the node will query the DHT for new entries.
 	///
 	/// By default this is set to 10 minutes.
@@ -67,6 +72,7 @@ impl Default for WorkerConfig {
 			// not depend on the republishing process, thus publishing own external addresses should
 			// happen on an interval < 36h.
 			max_publish_interval: Duration::from_secs(1 * 60 * 60),
+			keystore_refresh_interval: Duration::from_secs(60),
 			// External addresses of remote authorities can change at any given point in time. The
 			// interval on which to trigger new queries for the current and next authorities is a trade
 			// off between efficiency and performance.
diff --git a/client/authority-discovery/src/worker.rs b/client/authority-discovery/src/worker.rs
index b1fb89669bf2..f05c6d460458 100644
--- a/client/authority-discovery/src/worker.rs
+++ b/client/authority-discovery/src/worker.rs
@@ -25,7 +25,7 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use futures::channel::mpsc;
-use futures::{FutureExt, Stream, StreamExt, stream::Fuse};
+use futures::{future, FutureExt, Stream, StreamExt, stream::Fuse};
 
 use addr_cache::AddrCache;
 use async_trait::async_trait;
@@ -44,7 +44,7 @@ use sc_network::{
 	PeerId,
 };
 use sp_authority_discovery::{AuthorityDiscoveryApi, AuthorityId, AuthoritySignature, AuthorityPair};
-use sp_core::crypto::{key_types, Pair};
+use sp_core::crypto::{key_types, CryptoTypePublicPair, Pair};
 use sp_keystore::CryptoStore;
 use sp_runtime::{traits::Block as BlockT, generic::BlockId};
 use sp_api::ProvideRuntimeApi;
@@ -109,6 +109,13 @@ pub struct Worker<Client, Network, Block, DhtEventStream> {
 
 	/// Interval to be proactive, publishing own addresses.
 	publish_interval: ExpIncInterval,
+	/// Pro-actively publish our own addresses at this interval, if the keys in the keystore
+	/// have changed.
+	publish_if_changed_interval: ExpIncInterval,
+	/// List of keys onto which addresses have been published at the latest publication.
+	/// Used to check whether they have changed.
+	latest_published_keys: HashSet<CryptoTypePublicPair>,
+
 	/// Interval at which to request addresses of authorities, refilling the pending lookups queue.
 	query_interval: ExpIncInterval,
 
@@ -160,6 +167,13 @@ where
 			config.max_query_interval,
 		);
 
+		// An `ExpIncInterval` is overkill here because the interval is constant, but consistency
+		// is more simple.
+		let publish_if_changed_interval = ExpIncInterval::new(
+			config.keystore_refresh_interval,
+			config.keystore_refresh_interval
+		);
+
 		let addr_cache = AddrCache::new();
 
 		let metrics = match prometheus_registry {
@@ -181,6 +195,8 @@ where
 			network,
 			dht_event_rx,
 			publish_interval,
+			publish_if_changed_interval,
+			latest_published_keys: HashSet::new(),
 			query_interval,
 			pending_lookups: Vec::new(),
 			in_flight_lookups: HashMap::new(),
@@ -212,8 +228,11 @@ where
 					self.process_message_from_service(msg);
 				},
 				// Publish own addresses.
-				_ = self.publish_interval.next().fuse() => {
-					if let Err(e) = self.publish_ext_addresses().await {
+				only_if_changed = future::select(
+					self.publish_interval.next().map(|_| false),
+					self.publish_if_changed_interval.next().map(|_| true)
+				).map(|e| e.factor_first().0).fuse() => {
+					if let Err(e) = self.publish_ext_addresses(only_if_changed).await {
 						error!(
 							target: LOG_TARGET,
 							"Failed to publish external addresses: {:?}", e,
@@ -262,7 +281,10 @@ where
 	}
 
 	/// Publish own public addresses.
-	async fn publish_ext_addresses(&mut self) -> Result<()> {
+	///
+	/// If `only_if_changed` is true, the function has no effect if the list of keys to publish
+	/// is equal to `self.latest_published_keys`.
+	async fn publish_ext_addresses(&mut self, only_if_changed: bool) -> Result<()> {
 		let key_store = match &self.role {
 			Role::PublishAndDiscover(key_store) => key_store,
 			Role::Discover => return Ok(()),
@@ -285,15 +307,20 @@ where
 		let keys = Worker::<Client, Network, Block, DhtEventStream>::get_own_public_keys_within_authority_set(
 			key_store.clone(),
 			self.client.as_ref(),
-		).await?.into_iter().map(Into::into).collect::<Vec<_>>();
+		).await?.into_iter().map(Into::into).collect::<HashSet<_>>();
 
+		if only_if_changed && keys == self.latest_published_keys {
+			return Ok(())
+		}
+
+		let keys_vec = keys.iter().cloned().collect::<Vec<_>>();
 		let signatures = key_store.sign_with_all(
 			key_types::AUTHORITY_DISCOVERY,
-			keys.clone(),
+			keys_vec.clone(),
 			serialized_addresses.as_slice(),
 		).await.map_err(|_| Error::Signing)?;
 
-		for (sign_result, key) in signatures.into_iter().zip(keys) {
+		for (sign_result, key) in signatures.into_iter().zip(keys_vec.iter()) {
 			let mut signed_addresses = vec![];
 
 			// Verify that all signatures exist for all provided keys.
@@ -313,6 +340,8 @@ where
 			);
 		}
 
+		self.latest_published_keys = keys;
+
 		Ok(())
 	}
 
diff --git a/client/authority-discovery/src/worker/tests.rs b/client/authority-discovery/src/worker/tests.rs
index 04f597aa26b0..b702cd8c4008 100644
--- a/client/authority-discovery/src/worker/tests.rs
+++ b/client/authority-discovery/src/worker/tests.rs
@@ -294,7 +294,7 @@ fn publish_discover_cycle() {
 			Default::default(),
 		);
 
-		worker.publish_ext_addresses().await.unwrap();
+		worker.publish_ext_addresses(false).await.unwrap();
 
 		// Expect authority discovery to put a new record onto the dht.
 		assert_eq!(network.put_value_call.lock().unwrap().len(), 1);

From 3297b9aa956b7461920753107e806504cb0256e9 Mon Sep 17 00:00:00 2001
From: Vladimir Istyufeev <me@rcn.me>
Date: Thu, 8 Apr 2021 20:14:36 +0300
Subject: [PATCH 0623/1194] Introduce `node-bench-regression-guard` to
 Substrate's pipeline (#8519)

* Integrate `node-bench-regression-guard` into the pipeline

* Apply @TriplEight's review suggestions
---
 .gitlab-ci.yml | 73 +++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 66 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 81ff29d3249d..451024b51b8e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,12 +60,15 @@ default:
     - kubernetes-parity-build
   interruptible:                   true
 
+.rust-info-script:                 &rust-info-script
+  - rustup show
+  - cargo --version
+  - sccache -s
+
 .docker-env:                       &docker-env
   image:                           "${CI_IMAGE}"
   before_script:
-    - rustup show
-    - cargo --version
-    - sccache -s
+    - *rust-info-script
   retry:
     max: 2
     when:
@@ -96,6 +99,14 @@ default:
     - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
     - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
 
+.test-refs-no-trigger-prs-only:   &test-refs-no-trigger-prs-only
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "pipeline"
+      when: never
+    - if: $CI_PIPELINE_SOURCE == "web"
+    - if: $CI_PIPELINE_SOURCE == "schedule"
+    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
+
 .build-refs:                       &build-refs
   rules:
     # .publish-refs with manual on PRs
@@ -124,6 +135,22 @@ default:
     # this job runs only on nightly pipeline with the mentioned variable, against `master` branch
     - if: $CI_COMMIT_REF_NAME == "master" && $CI_PIPELINE_SOURCE == "schedule" && $PIPELINE == "nightly"
 
+.merge-ref-into-master-script:     &merge-ref-into-master-script
+  - git fetch origin +master:master
+  - git fetch origin +$CI_COMMIT_REF_NAME:$CI_COMMIT_REF_NAME
+  - git checkout master
+  - git config user.email "ci@gitlab.parity.io"
+  - git merge $CI_COMMIT_REF_NAME --verbose --no-edit
+
+.cargo-check-benches-script:       &cargo-check-benches-script
+  - mkdir -p artifacts/benches/$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA
+  - SKIP_WASM_BUILD=1 time cargo +nightly check --benches --all
+  - 'cargo run --release -p node-bench -- ::node::import::native::sr25519::transfer_keep_alive::paritydb::small --json
+    | tee artifacts/benches/$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA/::node::import::native::sr25519::transfer_keep_alive::paritydb::small.json'
+  - 'cargo run --release -p node-bench -- ::trie::read::small --json
+    | tee artifacts/benches/$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA/::trie::read::small.json'
+  - sccache -s
+
 #### stage:                       .pre
 
 skip-if-draft:
@@ -223,11 +250,43 @@ cargo-check-benches:
   stage:                           test
   <<:                              *docker-env
   <<:                              *test-refs-no-trigger
+  <<:                              *collect-artifacts
   script:
-    - SKIP_WASM_BUILD=1 time cargo +nightly check --benches --all
-    - cargo run --release -p node-bench -- ::node::import::native::sr25519::transfer_keep_alive::paritydb::small
-    - cargo run --release -p node-bench -- ::trie::read::small
-    - sccache -s
+    - *cargo-check-benches-script
+
+cargo-check-benches-merged:
+  stage:                           test
+  <<:                              *docker-env
+  <<:                              *test-refs-no-trigger-prs-only
+  <<:                              *collect-artifacts
+  before_script:
+    - *merge-ref-into-master-script
+    - *rust-info-script
+  script:
+    - *cargo-check-benches-script
+
+node-bench-regression-guard:
+  # it's not belong to `build` semantically, but dag jobs can't depend on each other
+  # within the single stage - https://gitlab.com/gitlab-org/gitlab/-/issues/30632
+  # more: https://github.com/paritytech/substrate/pull/8519#discussion_r608012402
+  stage:                           build
+  <<:                              *docker-env
+  <<:                              *test-refs-no-trigger-prs-only
+  needs:
+    - job:                         cargo-check-benches-merged
+      artifacts:                   true
+    - project:                     $CI_PROJECT_PATH
+      job:                         cargo-check-benches
+      ref:                         master
+      artifacts:                   true
+  variables:
+    CI_IMAGE:                      "paritytech/node-bench-regression-guard:latest"
+  before_script: [""]
+  script:
+    - 'node-bench-regression-guard --reference artifacts/benches/master-* 
+       --compare-with artifacts/benches/$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA'
+  # FIXME: remove this when master will be populated with bench results artifacts
+  allow_failure:                   true
 
 cargo-check-subkey:
   stage:                           test

From b5c1c81235a27c04589360ea7c1bb525c9d2fde5 Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Thu, 8 Apr 2021 20:06:09 +0200
Subject: [PATCH 0624/1194] Allow lossless matching for Origin (#8576)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Allow lossless matching for Origin

Without these changes, it's difficult/impossible to not lose any filters
when making fine-grained matches against origin.

* whilespace

* Apply suggestions from code review

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 frame/support/src/origin.rs          | 40 ++++++++++++++++++++++++++++
 frame/support/src/traits/dispatch.rs |  6 +++++
 2 files changed, 46 insertions(+)

diff --git a/frame/support/src/origin.rs b/frame/support/src/origin.rs
index 19b24fb84bb1..6dd38eb1b2ab 100644
--- a/frame/support/src/origin.rs
+++ b/frame/support/src/origin.rs
@@ -246,6 +246,16 @@ macro_rules! impl_outer_origin {
 				&self.caller
 			}
 
+			fn try_with_caller<R>(
+				mut self,
+				f: impl FnOnce(Self::PalletsOrigin) -> Result<R, Self::PalletsOrigin>,
+			) -> Result<R, Self> {
+				match f(self.caller) {
+					Ok(r) => Ok(r),
+					Err(caller) => { self.caller = caller; Err(self) }
+				}
+			}
+
 			/// Create with system none origin and `frame-system::Config::BaseCallFilter`.
 			fn none() -> Self {
 				$system::RawOrigin::None.into()
@@ -299,6 +309,20 @@ macro_rules! impl_outer_origin {
 				$caller_name::system(x)
 			}
 		}
+
+		impl $crate::sp_std::convert::TryFrom<$caller_name> for $system::Origin<$runtime> {
+			type Error = $caller_name;
+			fn try_from(x: $caller_name)
+				-> $crate::sp_std::result::Result<$system::Origin<$runtime>, $caller_name>
+			{
+				if let $caller_name::system(l) = x {
+					Ok(l)
+				} else {
+					Err(x)
+				}
+			}
+		}
+
 		impl From<$system::Origin<$runtime>> for $name {
 			/// Convert to runtime origin:
 			/// * root origin is built with no filter
@@ -376,6 +400,22 @@ macro_rules! impl_outer_origin {
 						}
 					}
 				}
+
+				impl $crate::sp_std::convert::TryFrom<
+					$caller_name
+				> for $module::Origin < $( $generic )? $(, $module::$generic_instance )? > {
+					type Error = $caller_name;
+					fn try_from(x: $caller_name) -> $crate::sp_std::result::Result<
+						$module::Origin < $( $generic )? $(, $module::$generic_instance )? >,
+						$caller_name,
+					> {
+						if let $caller_name::[< $module $( _ $generic_instance )? >](l) = x {
+							Ok(l)
+						} else {
+							Err(x)
+						}
+					}
+				}
 			}
 		)*
 	}
diff --git a/frame/support/src/traits/dispatch.rs b/frame/support/src/traits/dispatch.rs
index 29dbaf105a05..6174238e3553 100644
--- a/frame/support/src/traits/dispatch.rs
+++ b/frame/support/src/traits/dispatch.rs
@@ -76,6 +76,12 @@ pub trait OriginTrait: Sized {
 	/// Get the caller.
 	fn caller(&self) -> &Self::PalletsOrigin;
 
+	/// Do something with the caller, consuming self but returning it if the caller was unused.
+	fn try_with_caller<R>(
+		self,
+		f: impl FnOnce(Self::PalletsOrigin) -> Result<R, Self::PalletsOrigin>,
+	) -> Result<R, Self>;
+
 	/// Create with system none origin and `frame-system::Config::BaseCallFilter`.
 	fn none() -> Self;
 

From 4898eb350d636d439827cb43f0f26e72e66492fa Mon Sep 17 00:00:00 2001
From: Vladimir Istyufeev <me@rcn.me>
Date: Thu, 8 Apr 2021 22:10:14 +0300
Subject: [PATCH 0625/1194] Disallow failure for `node-bench-regression-guard`
 job (#8577)

---
 .gitlab-ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 451024b51b8e..16b0a00b160e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -285,8 +285,6 @@ node-bench-regression-guard:
   script:
     - 'node-bench-regression-guard --reference artifacts/benches/master-* 
        --compare-with artifacts/benches/$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA'
-  # FIXME: remove this when master will be populated with bench results artifacts
-  allow_failure:                   true
 
 cargo-check-subkey:
   stage:                           test

From 35b74db34833c7e9787f33e700a8db32982e9e18 Mon Sep 17 00:00:00 2001
From: Xavier Lau <c.estlavie@icloud.com>
Date: Fri, 9 Apr 2021 17:15:40 +0800
Subject: [PATCH 0626/1194] `ModuleId` to `PalletId` - part of #8372 (#8477)

* `ModuleId` to `PalletId` - part of #8372

* fix doc

* move `PalletId` to `frame-support`

* fix compile

* fix tests

* `ModuleId` to `PalletId`

* subcommand `moduleid` to `palletid`
---
 Cargo.lock                                    |  1 +
 bin/node/runtime/src/lib.rs                   | 20 +++++++++----------
 frame/bounties/src/lib.rs                     |  4 ++--
 frame/bounties/src/tests.rs                   |  9 +++++----
 frame/elections-phragmen/src/lib.rs           | 14 ++++++-------
 frame/elections/src/lib.rs                    | 10 +++++-----
 frame/elections/src/mock.rs                   |  4 ++--
 frame/lottery/src/lib.rs                      | 12 +++++------
 frame/lottery/src/mock.rs                     |  4 ++--
 frame/society/src/lib.rs                      | 12 +++++------
 frame/society/src/mock.rs                     |  4 ++--
 frame/support/src/lib.rs                      | 11 ++++++++++
 frame/tips/src/lib.rs                         |  2 +-
 frame/tips/src/tests.rs                       | 12 +++++++----
 frame/treasury/src/lib.rs                     | 17 +++++++++-------
 frame/treasury/src/tests.rs                   |  7 +++----
 primitives/runtime/src/lib.rs                 |  8 --------
 utils/frame/frame-utilities-cli/Cargo.toml    |  1 +
 utils/frame/frame-utilities-cli/src/lib.rs    |  4 ++--
 .../src/{module_id.rs => pallet_id.rs}        | 16 +++++++--------
 20 files changed, 92 insertions(+), 80 deletions(-)
 rename utils/frame/frame-utilities-cli/src/{module_id.rs => pallet_id.rs} (88%)

diff --git a/Cargo.lock b/Cargo.lock
index 9e6e30cf2d00..933395f7f06b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9411,6 +9411,7 @@ dependencies = [
 name = "substrate-frame-cli"
 version = "3.0.0"
 dependencies = [
+ "frame-support",
  "frame-system",
  "sc-cli",
  "sp-core",
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 448867b25cb1..956675175a74 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -40,7 +40,7 @@ use frame_system::{
 	EnsureRoot, EnsureOneOf,
 	limits::{BlockWeights, BlockLength}
 };
-use frame_support::traits::InstanceFilter;
+use frame_support::{traits::InstanceFilter, PalletId};
 use codec::{Encode, Decode};
 use sp_core::{
 	crypto::KeyTypeId,
@@ -52,7 +52,7 @@ use node_primitives::{AccountIndex, Balance, BlockNumber, Hash, Index, Moment};
 use sp_api::impl_runtime_apis;
 use sp_runtime::{
 	Permill, Perbill, Perquintill, Percent, ApplyExtrinsicResult, impl_opaque_keys, generic,
-	create_runtime_str, ModuleId, FixedPointNumber,
+	create_runtime_str, FixedPointNumber,
 };
 use sp_runtime::curve::PiecewiseLinear;
 use sp_runtime::transaction_validity::{TransactionValidity, TransactionSource, TransactionPriority};
@@ -634,7 +634,7 @@ parameter_types! {
 	pub const TermDuration: BlockNumber = 7 * DAYS;
 	pub const DesiredMembers: u32 = 13;
 	pub const DesiredRunnersUp: u32 = 7;
-	pub const ElectionsPhragmenModuleId: LockIdentifier = *b"phrelect";
+	pub const ElectionsPhragmenPalletId: LockIdentifier = *b"phrelect";
 }
 
 // Make sure that there are no more than `MaxMembers` members elected via elections-phragmen.
@@ -642,7 +642,7 @@ const_assert!(DesiredMembers::get() <= CouncilMaxMembers::get());
 
 impl pallet_elections_phragmen::Config for Runtime {
 	type Event = Event;
-	type ModuleId = ElectionsPhragmenModuleId;
+	type PalletId = ElectionsPhragmenPalletId;
 	type Currency = Balances;
 	type ChangeMembers = Council;
 	// NOTE: this implies that council's genesis members cannot be set directly and must come from
@@ -705,7 +705,7 @@ parameter_types! {
 	pub const DataDepositPerByte: Balance = 1 * CENTS;
 	pub const BountyDepositBase: Balance = 1 * DOLLARS;
 	pub const BountyDepositPayoutDelay: BlockNumber = 1 * DAYS;
-	pub const TreasuryModuleId: ModuleId = ModuleId(*b"py/trsry");
+	pub const TreasuryPalletId: PalletId = PalletId(*b"py/trsry");
 	pub const BountyUpdatePeriod: BlockNumber = 14 * DAYS;
 	pub const MaximumReasonLength: u32 = 16384;
 	pub const BountyCuratorDeposit: Permill = Permill::from_percent(50);
@@ -713,7 +713,7 @@ parameter_types! {
 }
 
 impl pallet_treasury::Config for Runtime {
-	type ModuleId = TreasuryModuleId;
+	type PalletId = TreasuryPalletId;
 	type Currency = Balances;
 	type ApproveOrigin = EnsureOneOf<
 		AccountId,
@@ -970,12 +970,12 @@ parameter_types! {
 	pub const MaxLockDuration: BlockNumber = 36 * 30 * DAYS;
 	pub const ChallengePeriod: BlockNumber = 7 * DAYS;
 	pub const MaxCandidateIntake: u32 = 10;
-	pub const SocietyModuleId: ModuleId = ModuleId(*b"py/socie");
+	pub const SocietyPalletId: PalletId = PalletId(*b"py/socie");
 }
 
 impl pallet_society::Config for Runtime {
 	type Event = Event;
-	type ModuleId = SocietyModuleId;
+	type PalletId = SocietyPalletId;
 	type Currency = Balances;
 	type Randomness = RandomnessCollectiveFlip;
 	type CandidateDeposit = CandidateDeposit;
@@ -1013,13 +1013,13 @@ impl pallet_mmr::Config for Runtime {
 }
 
 parameter_types! {
-	pub const LotteryModuleId: ModuleId = ModuleId(*b"py/lotto");
+	pub const LotteryPalletId: PalletId = PalletId(*b"py/lotto");
 	pub const MaxCalls: usize = 10;
 	pub const MaxGenerateRandom: u32 = 10;
 }
 
 impl pallet_lottery::Config for Runtime {
-	type ModuleId = LotteryModuleId;
+	type PalletId = LotteryPalletId;
 	type Call = Call;
 	type Currency = Balances;
 	type Randomness = RandomnessCollectiveFlip;
diff --git a/frame/bounties/src/lib.rs b/frame/bounties/src/lib.rs
index dafa7cd61d05..419713ab5eff 100644
--- a/frame/bounties/src/lib.rs
+++ b/frame/bounties/src/lib.rs
@@ -677,14 +677,14 @@ impl<T: Config> Module<T> {
 	/// This actually does computation. If you need to keep using it, then make sure you cache the
 	/// value and only call this once.
 	pub fn account_id() -> T::AccountId {
-		T::ModuleId::get().into_account()
+		T::PalletId::get().into_account()
 	}
 
 	/// The account ID of a bounty account
 	pub fn bounty_account_id(id: BountyIndex) -> T::AccountId {
 		// only use two byte prefix to support 16 byte account id (used by test)
 		// "modl" ++ "py/trsry" ++ "bt" is 14 bytes, and two bytes remaining for bounty index
-		T::ModuleId::get().into_sub_account(("bt", id))
+		T::PalletId::get().into_sub_account(("bt", id))
 	}
 
 	fn create_bounty(
diff --git a/frame/bounties/src/tests.rs b/frame/bounties/src/tests.rs
index c3cfe531eccb..b202e4da3e84 100644
--- a/frame/bounties/src/tests.rs
+++ b/frame/bounties/src/tests.rs
@@ -24,12 +24,13 @@ use super::*;
 use std::cell::RefCell;
 
 use frame_support::{
-	assert_noop, assert_ok, parameter_types, weights::Weight, traits::OnInitialize
+	assert_noop, assert_ok, parameter_types, weights::Weight, traits::OnInitialize,
+	PalletId
 };
 
 use sp_core::H256;
 use sp_runtime::{
-	Perbill, ModuleId,
+	Perbill,
 	testing::Header,
 	traits::{BlakeTwo256, IdentityLookup, BadOrigin},
 };
@@ -103,11 +104,11 @@ parameter_types! {
 	pub const SpendPeriod: u64 = 2;
 	pub const Burn: Permill = Permill::from_percent(50);
 	pub const DataDepositPerByte: u64 = 1;
-	pub const TreasuryModuleId: ModuleId = ModuleId(*b"py/trsry");
+	pub const TreasuryPalletId: PalletId = PalletId(*b"py/trsry");
 }
 // impl pallet_treasury::Config for Test {
 impl pallet_treasury::Config for Test {
-	type ModuleId = TreasuryModuleId;
+	type PalletId = TreasuryPalletId;
 	type Currency = pallet_balances::Pallet<Test>;
 	type ApproveOrigin = frame_system::EnsureRoot<u128>;
 	type RejectOrigin = frame_system::EnsureRoot<u128>;
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index 4c84c72b0b30..6317bcebacce 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -175,7 +175,7 @@ pub trait Config: frame_system::Config {
 	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// Identifier for the elections-phragmen pallet's lock
-	type ModuleId: Get<LockIdentifier>;
+	type PalletId: Get<LockIdentifier>;
 
 	/// The currency that people are electing with.
 	type Currency:
@@ -375,7 +375,7 @@ decl_module! {
 		const DesiredMembers: u32 = T::DesiredMembers::get();
 		const DesiredRunnersUp: u32 = T::DesiredRunnersUp::get();
 		const TermDuration: T::BlockNumber = T::TermDuration::get();
-		const ModuleId: LockIdentifier = T::ModuleId::get();
+		const PalletId: LockIdentifier = T::PalletId::get();
 
 		/// Vote for a set of candidates for the upcoming round of election. This can be called to
 		/// set the initial votes, or update already existing votes.
@@ -452,7 +452,7 @@ decl_module! {
 			// Amount to be locked up.
 			let locked_stake = value.min(T::Currency::total_balance(&who));
 			T::Currency::set_lock(
-				T::ModuleId::get(),
+				T::PalletId::get(),
 				&who,
 				locked_stake,
 				WithdrawReasons::all(),
@@ -807,7 +807,7 @@ impl<T: Config> Module<T> {
 		let Voter { deposit, .. } = <Voting<T>>::take(who);
 
 		// remove storage, lock and unreserve.
-		T::Currency::remove_lock(T::ModuleId::get(), who);
+		T::Currency::remove_lock(T::PalletId::get(), who);
 
 		// NOTE: we could check the deposit amount before removing and skip if zero, but it will be
 		// a noop anyhow.
@@ -1158,11 +1158,11 @@ mod tests {
 	}
 
 	parameter_types! {
-		pub const ElectionsPhragmenModuleId: LockIdentifier = *b"phrelect";
+		pub const ElectionsPhragmenPalletId: LockIdentifier = *b"phrelect";
 	}
 
 	impl Config for Test {
-		type ModuleId = ElectionsPhragmenModuleId;
+		type PalletId = ElectionsPhragmenPalletId;
 		type Event = Event;
 		type Currency = Balances;
 		type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote;
@@ -1313,7 +1313,7 @@ mod tests {
 			.get(0)
 			.cloned()
 			.map(|lock| {
-				assert_eq!(lock.id, ElectionsPhragmenModuleId::get());
+				assert_eq!(lock.id, ElectionsPhragmenPalletId::get());
 				lock.amount
 			})
 			.unwrap_or_default()
diff --git a/frame/elections/src/lib.rs b/frame/elections/src/lib.rs
index d6b68bbf5a04..46ec62bf7517 100644
--- a/frame/elections/src/lib.rs
+++ b/frame/elections/src/lib.rs
@@ -156,7 +156,7 @@ pub trait Config: frame_system::Config {
 	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// Identifier for the elections pallet's lock
-	type ModuleId: Get<LockIdentifier>;
+	type PalletId: Get<LockIdentifier>;
 
 	/// The currency that people are electing with.
 	type Currency:
@@ -391,7 +391,7 @@ decl_module! {
 		/// The chunk size of the approval vector.
 		const APPROVAL_SET_SIZE: u32 = APPROVAL_SET_SIZE as u32;
 
-		const ModuleId: LockIdentifier = T::ModuleId::get();
+		const PalletId: LockIdentifier = T::PalletId::get();
 
 		fn deposit_event() = default;
 
@@ -491,7 +491,7 @@ decl_module! {
 			);
 
 			T::Currency::remove_lock(
-				T::ModuleId::get(),
+				T::PalletId::get(),
 				if valid { &who } else { &reporter }
 			);
 
@@ -529,7 +529,7 @@ decl_module! {
 
 			Self::remove_voter(&who, index);
 			T::Currency::unreserve(&who, T::VotingBond::get());
-			T::Currency::remove_lock(T::ModuleId::get(), &who);
+			T::Currency::remove_lock(T::PalletId::get(), &who);
 		}
 
 		/// Submit oneself for candidacy.
@@ -890,7 +890,7 @@ impl<T: Config> Module<T> {
 		}
 
 		T::Currency::set_lock(
-			T::ModuleId::get(),
+			T::PalletId::get(),
 			&who,
 			locked_balance,
 			WithdrawReasons::all(),
diff --git a/frame/elections/src/mock.rs b/frame/elections/src/mock.rs
index 3a9cca41ff0e..896fd40020e4 100644
--- a/frame/elections/src/mock.rs
+++ b/frame/elections/src/mock.rs
@@ -103,7 +103,7 @@ impl ChangeMembers<u64> for TestChangeMembers {
 }
 
 parameter_types!{
-	pub const ElectionModuleId: LockIdentifier = *b"py/elect";
+	pub const ElectionPalletId: LockIdentifier = *b"py/elect";
 }
 
 impl elections::Config for Test {
@@ -123,7 +123,7 @@ impl elections::Config for Test {
 	type InactiveGracePeriod = InactiveGracePeriod;
 	type VotingPeriod = VotingPeriod;
 	type DecayRatio = DecayRatio;
-	type ModuleId = ElectionModuleId;
+	type PalletId = ElectionPalletId;
 }
 
 pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;
diff --git a/frame/lottery/src/lib.rs b/frame/lottery/src/lib.rs
index fb675ad83519..a37238a2d9f8 100644
--- a/frame/lottery/src/lib.rs
+++ b/frame/lottery/src/lib.rs
@@ -56,7 +56,7 @@ pub mod weights;
 
 use sp_std::prelude::*;
 use sp_runtime::{
-	DispatchError, ModuleId,
+	DispatchError,
 	traits::{AccountIdConversion, Saturating, Zero},
 };
 use frame_support::{
@@ -66,7 +66,7 @@ use frame_support::{
 		Currency, ReservableCurrency, Get, EnsureOrigin, ExistenceRequirement::KeepAlive, Randomness,
 	},
 };
-use frame_support::weights::Weight;
+use frame_support::{weights::Weight, PalletId};
 use frame_system::ensure_signed;
 use codec::{Encode, Decode};
 pub use weights::WeightInfo;
@@ -76,7 +76,7 @@ type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Con
 /// The module's config trait.
 pub trait Config: frame_system::Config {
 	/// The Lottery's module id
-	type ModuleId: Get<ModuleId>;
+	type PalletId: Get<PalletId>;
 
 	/// A dispatchable call.
 	type Call: Parameter + Dispatchable<Origin=Self::Origin> + GetDispatchInfo + From<frame_system::Call<Self>>;
@@ -211,7 +211,7 @@ decl_module! {
 	pub struct Module<T: Config> for enum Call where origin: T::Origin, system = frame_system {
 		type Error = Error<T>;
 
-		const ModuleId: ModuleId = T::ModuleId::get();
+		const PalletId: PalletId = T::PalletId::get();
 		const MaxCalls: u32 = T::MaxCalls::get() as u32;
 
 		fn deposit_event() = default;
@@ -361,7 +361,7 @@ impl<T: Config> Module<T> {
 	/// This actually does computation. If you need to keep using it, then make sure you cache the
 	/// value and only call this once.
 	pub fn account_id() -> T::AccountId {
-		T::ModuleId::get().into_account()
+		T::PalletId::get().into_account()
 	}
 
 	/// Return the pot account and amount of money in the pot.
@@ -449,7 +449,7 @@ impl<T: Config> Module<T> {
 	// TODO: deal with randomness freshness
 	// https://github.com/paritytech/substrate/issues/8311
 	fn generate_random_number(seed: u32) -> u32 {
-		let (random_seed, _) = T::Randomness::random(&(T::ModuleId::get(), seed).encode());
+		let (random_seed, _) = T::Randomness::random(&(T::PalletId::get(), seed).encode());
 		let random_number = <u32>::decode(&mut random_seed.as_ref())
 			.expect("secure hashes should always be bigger than u32; qed");
 		random_number
diff --git a/frame/lottery/src/mock.rs b/frame/lottery/src/mock.rs
index 9015de5b0853..ca372cc37e24 100644
--- a/frame/lottery/src/mock.rs
+++ b/frame/lottery/src/mock.rs
@@ -96,13 +96,13 @@ impl pallet_balances::Config for Test {
 }
 
 parameter_types! {
-	pub const LotteryModuleId: ModuleId = ModuleId(*b"py/lotto");
+	pub const LotteryPalletId: PalletId = PalletId(*b"py/lotto");
 	pub const MaxCalls: usize = 2;
 	pub const MaxGenerateRandom: u32 = 10;
 }
 
 impl Config for Test {
-	type ModuleId = LotteryModuleId;
+	type PalletId = LotteryPalletId;
 	type Call = Call;
 	type Currency = Balances;
 	type Randomness = TestRandomness<Self>;
diff --git a/frame/society/src/lib.rs b/frame/society/src/lib.rs
index 171815e56eee..3b661386da23 100644
--- a/frame/society/src/lib.rs
+++ b/frame/society/src/lib.rs
@@ -254,13 +254,13 @@ mod tests;
 use rand_chacha::{rand_core::{RngCore, SeedableRng}, ChaChaRng};
 use sp_std::prelude::*;
 use codec::{Encode, Decode};
-use sp_runtime::{Percent, ModuleId, RuntimeDebug,
+use sp_runtime::{Percent, RuntimeDebug,
 	traits::{
 		StaticLookup, AccountIdConversion, Saturating, Zero, IntegerSquareRoot, Hash,
 		TrailingZeroInput, CheckedSub
 	}
 };
-use frame_support::{decl_error, decl_module, decl_storage, decl_event, ensure, dispatch::DispatchResult};
+use frame_support::{decl_error, decl_module, decl_storage, decl_event, ensure, dispatch::DispatchResult, PalletId};
 use frame_support::weights::Weight;
 use frame_support::traits::{
 	Currency, ReservableCurrency, Randomness, Get, ChangeMembers, BalanceStatus,
@@ -277,7 +277,7 @@ pub trait Config<I = DefaultInstance>: system::Config {
 	type Event: From<Event<Self, I>> + Into<<Self as system::Config>::Event>;
 
 	/// The societies's module id
-	type ModuleId: Get<ModuleId>;
+	type PalletId: Get<PalletId>;
 
 	/// The currency type used for bidding.
 	type Currency: ReservableCurrency<Self::AccountId>;
@@ -498,7 +498,7 @@ decl_module! {
 		const ChallengePeriod: T::BlockNumber = T::ChallengePeriod::get();
 
 		/// The societies's module id
-		const ModuleId: ModuleId = T::ModuleId::get();
+		const PalletId: PalletId = T::PalletId::get();
 
 		/// Maximum candidate intake per round.
 		const MaxCandidateIntake: u32 = T::MaxCandidateIntake::get();
@@ -1601,7 +1601,7 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 	/// This actually does computation. If you need to keep using it, then make sure you cache the
 	/// value and only call this once.
 	pub fn account_id() -> T::AccountId {
-		T::ModuleId::get().into_account()
+		T::PalletId::get().into_account()
 	}
 
 	/// The account ID of the payouts pot. This is where payouts are made from.
@@ -1609,7 +1609,7 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 	/// This actually does computation. If you need to keep using it, then make sure you cache the
 	/// value and only call this once.
 	pub fn payouts() -> T::AccountId {
-		T::ModuleId::get().into_sub_account(b"payouts")
+		T::PalletId::get().into_sub_account(b"payouts")
 	}
 
 	/// Return the duration of the lock, in blocks, with the given number of members.
diff --git a/frame/society/src/mock.rs b/frame/society/src/mock.rs
index f2d16423f3cc..aa46d40a14ae 100644
--- a/frame/society/src/mock.rs
+++ b/frame/society/src/mock.rs
@@ -58,7 +58,7 @@ parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 	pub const ExistentialDeposit: u64 = 1;
 	pub const MaxCandidateIntake: u32 = 10;
-	pub const SocietyModuleId: ModuleId = ModuleId(*b"py/socie");
+	pub const SocietyPalletId: PalletId = PalletId(*b"py/socie");
 	pub BlockWeights: frame_system::limits::BlockWeights =
 		frame_system::limits::BlockWeights::simple_max(1024);
 }
@@ -119,7 +119,7 @@ impl Config for Test {
 	type SuspensionJudgementOrigin = EnsureSignedBy<SuspensionJudgementSetAccount, u128>;
 	type ChallengePeriod = ChallengePeriod;
 	type MaxCandidateIntake = MaxCandidateIntake;
-	type ModuleId = SocietyModuleId;
+	type PalletId = SocietyPalletId;
 }
 
 pub struct EnvBuilder {
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index dc5bb2f5b4f4..13feab8ed3ba 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -80,6 +80,9 @@ pub use self::storage::{
 pub use self::dispatch::{Parameter, Callable};
 pub use sp_runtime::{self, ConsensusEngineId, print, traits::Printable};
 
+use codec::{Encode, Decode};
+use sp_runtime::TypeId;
+
 /// A unified log target for support operations.
 pub const LOG_TARGET: &'static str = "runtime::frame-support";
 
@@ -87,6 +90,14 @@ pub const LOG_TARGET: &'static str = "runtime::frame-support";
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub enum Never {}
 
+/// A pallet identifier. These are per pallet and should be stored in a registry somewhere.
+#[derive(Clone, Copy, Eq, PartialEq, Encode, Decode)]
+pub struct PalletId(pub [u8; 8]);
+
+impl TypeId for PalletId {
+	const TYPE_ID: [u8; 4] = *b"modl";
+}
+
 /// Generate a new type alias for [`storage::types::value::StorageValue`],
 /// [`storage::types::value::StorageMap`] and [`storage::types::value::StorageDoubleMap`].
 ///
diff --git a/frame/tips/src/lib.rs b/frame/tips/src/lib.rs
index 015163ef6b51..10b2b016837c 100644
--- a/frame/tips/src/lib.rs
+++ b/frame/tips/src/lib.rs
@@ -444,7 +444,7 @@ impl<T: Config> Module<T> {
 	/// This actually does computation. If you need to keep using it, then make sure you cache the
 	/// value and only call this once.
 	pub fn account_id() -> T::AccountId {
-		T::ModuleId::get().into_account()
+		T::PalletId::get().into_account()
 	}
 
 	/// Given a mutable reference to an `OpenTip`, insert the tip into it and check whether it
diff --git a/frame/tips/src/tests.rs b/frame/tips/src/tests.rs
index c57c427810d0..9524c136aafd 100644
--- a/frame/tips/src/tests.rs
+++ b/frame/tips/src/tests.rs
@@ -22,11 +22,15 @@
 use crate as tips;
 use super::*;
 use std::cell::RefCell;
-use frame_support::{assert_noop, assert_ok, parameter_types, weights::Weight, traits::Contains};
+use frame_support::{
+	assert_noop, assert_ok, parameter_types,
+	weights::Weight, traits::Contains,
+	PalletId
+};
 use sp_runtime::Permill;
 use sp_core::H256;
 use sp_runtime::{
-	Perbill, ModuleId,
+	Perbill,
 	testing::Header,
 	traits::{BlakeTwo256, IdentityLookup, BadOrigin},
 };
@@ -121,11 +125,11 @@ parameter_types! {
 	pub const SpendPeriod: u64 = 2;
 	pub const Burn: Permill = Permill::from_percent(50);
 	pub const DataDepositPerByte: u64 = 1;
-	pub const TreasuryModuleId: ModuleId = ModuleId(*b"py/trsry");
+	pub const TreasuryPalletId: PalletId = PalletId(*b"py/trsry");
 	pub const MaximumReasonLength: u32 = 16384;
 }
 impl pallet_treasury::Config for Test {
-	type ModuleId = TreasuryModuleId;
+	type PalletId = TreasuryPalletId;
 	type Currency = pallet_balances::Pallet<Test>;
 	type ApproveOrigin = frame_system::EnsureRoot<u128>;
 	type RejectOrigin = frame_system::EnsureRoot<u128>;
diff --git a/frame/treasury/src/lib.rs b/frame/treasury/src/lib.rs
index d69462c92d1b..bda4c761b55c 100644
--- a/frame/treasury/src/lib.rs
+++ b/frame/treasury/src/lib.rs
@@ -66,14 +66,17 @@ pub mod weights;
 #[cfg(feature = "std")]
 use serde::{Serialize, Deserialize};
 use sp_std::prelude::*;
-use frame_support::{decl_module, decl_storage, decl_event, ensure, print, decl_error};
+use frame_support::{decl_module, decl_storage, decl_event, ensure, print, decl_error, PalletId};
 use frame_support::traits::{
 	Currency, Get, Imbalance, OnUnbalanced, ExistenceRequirement::KeepAlive,
 	ReservableCurrency, WithdrawReasons
 };
-use sp_runtime::{Permill, ModuleId, RuntimeDebug, traits::{
-	Zero, StaticLookup, AccountIdConversion, Saturating
-}};
+use sp_runtime::{
+	Permill, RuntimeDebug,
+	traits::{
+		Zero, StaticLookup, AccountIdConversion, Saturating
+	}
+};
 use frame_support::weights::{Weight, DispatchClass};
 use frame_support::traits::EnsureOrigin;
 use codec::{Encode, Decode};
@@ -89,7 +92,7 @@ pub type NegativeImbalanceOf<T, I=DefaultInstance> =
 
 pub trait Config<I=DefaultInstance>: frame_system::Config {
 	/// The treasury's module id, used for deriving its sovereign account ID.
-	type ModuleId: Get<ModuleId>;
+	type PalletId: Get<PalletId>;
 
 	/// The staking balance.
 	type Currency: Currency<Self::AccountId> + ReservableCurrency<Self::AccountId>;
@@ -246,7 +249,7 @@ decl_module! {
 		const Burn: Permill = T::Burn::get();
 
 		/// The treasury's module id, used for deriving its sovereign account ID.
-		const ModuleId: ModuleId = T::ModuleId::get();
+		const PalletId: PalletId = T::PalletId::get();
 
 		type Error = Error<T, I>;
 
@@ -346,7 +349,7 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 	/// This actually does computation. If you need to keep using it, then make sure you cache the
 	/// value and only call this once.
 	pub fn account_id() -> T::AccountId {
-		T::ModuleId::get().into_account()
+		T::PalletId::get().into_account()
 	}
 
 	/// The needed bond for a proposal whose spend is `value`.
diff --git a/frame/treasury/src/tests.rs b/frame/treasury/src/tests.rs
index 25bfc6af81de..3ff9d63b1096 100644
--- a/frame/treasury/src/tests.rs
+++ b/frame/treasury/src/tests.rs
@@ -24,12 +24,11 @@ use super::*;
 use std::cell::RefCell;
 use frame_support::{
 	assert_noop, assert_ok, parameter_types,
-	traits::OnInitialize,
+	traits::OnInitialize, PalletId
 };
 
 use sp_core::H256;
 use sp_runtime::{
-	ModuleId,
 	testing::Header,
 	traits::{BlakeTwo256, IdentityLookup},
 };
@@ -99,13 +98,13 @@ parameter_types! {
 	pub const ProposalBondMinimum: u64 = 1;
 	pub const SpendPeriod: u64 = 2;
 	pub const Burn: Permill = Permill::from_percent(50);
-	pub const TreasuryModuleId: ModuleId = ModuleId(*b"py/trsry");
+	pub const TreasuryPalletId: PalletId = PalletId(*b"py/trsry");
 	pub const BountyUpdatePeriod: u32 = 20;
 	pub const BountyCuratorDeposit: Permill = Permill::from_percent(50);
 	pub const BountyValueMinimum: u64 = 1;
 }
 impl Config for Test {
-	type ModuleId = TreasuryModuleId;
+	type PalletId = TreasuryPalletId;
 	type Currency = pallet_balances::Pallet<Test>;
 	type ApproveOrigin = frame_system::EnsureRoot<u128>;
 	type RejectOrigin = frame_system::EnsureRoot<u128>;
diff --git a/primitives/runtime/src/lib.rs b/primitives/runtime/src/lib.rs
index 9f900bef9b10..51b89d484e6c 100644
--- a/primitives/runtime/src/lib.rs
+++ b/primitives/runtime/src/lib.rs
@@ -158,14 +158,6 @@ impl From<Justification> for Justifications {
 
 use traits::{Verify, Lazy};
 
-/// A module identifier. These are per module and should be stored in a registry somewhere.
-#[derive(Clone, Copy, Eq, PartialEq, Encode, Decode)]
-pub struct ModuleId(pub [u8; 8]);
-
-impl TypeId for ModuleId {
-	const TYPE_ID: [u8; 4] = *b"modl";
-}
-
 #[cfg(feature = "std")]
 pub use serde::{Serialize, Deserialize, de::DeserializeOwned};
 use crate::traits::IdentifyAccount;
diff --git a/utils/frame/frame-utilities-cli/Cargo.toml b/utils/frame/frame-utilities-cli/Cargo.toml
index cb37119edf0b..1fdf4e4cd9a9 100644
--- a/utils/frame/frame-utilities-cli/Cargo.toml
+++ b/utils/frame/frame-utilities-cli/Cargo.toml
@@ -16,6 +16,7 @@ sc-cli = { version = "0.9.0", path = "../../../client/cli" }
 sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
 structopt = "0.3.8"
 frame-system = { version = "3.0.0", path = "../../../frame/system" }
+frame-support = { version = "3.0.0", path = "../../../frame/support" }
 
 [dev-dependencies]
 
diff --git a/utils/frame/frame-utilities-cli/src/lib.rs b/utils/frame/frame-utilities-cli/src/lib.rs
index 2d6bf4ab9d8f..83f3e9ea00d4 100644
--- a/utils/frame/frame-utilities-cli/src/lib.rs
+++ b/utils/frame/frame-utilities-cli/src/lib.rs
@@ -17,7 +17,7 @@
 
 //! frame-system CLI utilities
 
-mod module_id;
+mod pallet_id;
 
-pub use module_id::ModuleIdCmd;
+pub use pallet_id::PalletIdCmd;
 
diff --git a/utils/frame/frame-utilities-cli/src/module_id.rs b/utils/frame/frame-utilities-cli/src/pallet_id.rs
similarity index 88%
rename from utils/frame/frame-utilities-cli/src/module_id.rs
rename to utils/frame/frame-utilities-cli/src/pallet_id.rs
index 187c2de1dd6d..09304979cb09 100644
--- a/utils/frame/frame-utilities-cli/src/module_id.rs
+++ b/utils/frame/frame-utilities-cli/src/pallet_id.rs
@@ -15,25 +15,25 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Implementation of the `moduleid` subcommand
+//! Implementation of the `palletid` subcommand
 
 use sc_cli::{
 	Error, utils::print_from_uri, CryptoSchemeFlag,
 	OutputTypeFlag, KeystoreParams, with_crypto_scheme,
 };
-use sp_runtime::ModuleId;
 use sp_runtime::traits::AccountIdConversion;
 use sp_core::crypto::{Ss58Codec, Ss58AddressFormat};
 use std::convert::{TryInto, TryFrom};
 use structopt::StructOpt;
+use frame_support::PalletId;
 
-/// The `moduleid` command
+/// The `palletid` command
 #[derive(Debug, StructOpt)]
 #[structopt(
-	name = "moduleid",
+	name = "palletid",
 	about = "Inspect a module ID address"
 )]
-pub struct ModuleIdCmd {
+pub struct PalletIdCmd {
 	/// The module ID used to derive the account
 	id: String,
 
@@ -60,7 +60,7 @@ pub struct ModuleIdCmd {
 	pub keystore_params: KeystoreParams,
 }
 
-impl ModuleIdCmd {
+impl PalletIdCmd {
 	/// runs the command
 	pub fn run<R>(&self) -> Result<(), Error>
 		where
@@ -74,9 +74,9 @@ impl ModuleIdCmd {
 
 		let id_fixed_array: [u8; 8] = self.id.as_bytes()
 			.try_into()
-			.map_err(|_| "Cannot convert argument to moduleid: argument should be 8-character string")?;
+			.map_err(|_| "Cannot convert argument to palletid: argument should be 8-character string")?;
 
-		let account_id: R::AccountId = ModuleId(id_fixed_array).into_account();
+		let account_id: R::AccountId = PalletId(id_fixed_array).into_account();
 
 		with_crypto_scheme!(
 			self.crypto_scheme.scheme,

From 787ea591eaf9cd2e8b0d638c87d9745762047aa3 Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Fri, 9 Apr 2021 11:38:03 +0200
Subject: [PATCH 0627/1194] Backing/GetBacking: Abstraction over pluralistic
 origins for XCM. (#8579)

* Backing/GetBacking: Abstraction over pluralistic origins for XCM.

* Update frame/support/src/traits/misc.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Update frame/support/src/traits/misc.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
---
 frame/collective/src/lib.rs      | 11 ++++++++++-
 frame/support/src/traits.rs      |  2 +-
 frame/support/src/traits/misc.rs | 15 +++++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/frame/collective/src/lib.rs b/frame/collective/src/lib.rs
index d5768e4f5cb8..5c33bff3006b 100644
--- a/frame/collective/src/lib.rs
+++ b/frame/collective/src/lib.rs
@@ -55,7 +55,7 @@ use frame_support::{
 		PostDispatchInfo,
 	},
 	ensure,
-	traits::{ChangeMembers, EnsureOrigin, Get, InitializeMembers},
+	traits::{ChangeMembers, EnsureOrigin, Get, InitializeMembers, GetBacking, Backing},
 	weights::{DispatchClass, GetDispatchInfo, Weight, Pays},
 };
 use frame_system::{self as system, ensure_signed, ensure_root};
@@ -165,6 +165,15 @@ pub enum RawOrigin<AccountId, I> {
 	_Phantom(sp_std::marker::PhantomData<I>),
 }
 
+impl<AccountId, I> GetBacking for RawOrigin<AccountId, I> {
+	fn get_backing(&self) -> Option<Backing> {
+		match self {
+			RawOrigin::Members(n, d) => Some(Backing { approvals: *n, eligible: *d }),
+			_ => None,
+		}
+	}
+}
+
 /// Origin for the collective module.
 pub type Origin<T, I=DefaultInstance> = RawOrigin<<T as frame_system::Config>::AccountId, I>;
 
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index ba4869d4b871..6fd40aa9ba74 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -46,7 +46,7 @@ pub use filter::{
 mod misc;
 pub use misc::{
 	Len, Get, GetDefault, HandleLifetime, TryDrop, Time, UnixTime, IsType, IsSubType, ExecuteBlock,
-	SameOrOther, OnNewAccount, OnKilledAccount, OffchainWorker,
+	SameOrOther, OnNewAccount, OnKilledAccount, OffchainWorker, GetBacking, Backing,
 };
 
 mod stored_map;
diff --git a/frame/support/src/traits/misc.rs b/frame/support/src/traits/misc.rs
index 2f219942907d..d5cc68840d13 100644
--- a/frame/support/src/traits/misc.rs
+++ b/frame/support/src/traits/misc.rs
@@ -269,3 +269,18 @@ pub trait OffchainWorker<BlockNumber> {
 	fn offchain_worker(_n: BlockNumber) {}
 }
 
+/// Some amount of backing from a group. The precise defintion of what it means to "back" something
+/// is left flexible.
+pub struct Backing {
+	/// The number of members of the group that back some motion.
+	pub approvals: u32,
+	/// The total count of group members.
+	pub eligible: u32,
+}
+
+/// Retrieve the backing from an object's ref.
+pub trait GetBacking {
+	/// Returns `Some` `Backing` if `self` represents a fractional/groupwise backing of some
+	/// implicit motion. `None` if it does not.
+	fn get_backing(&self) -> Option<Backing>;
+}

From 4ec1f7b8be450a962c7a4874478e1ff64baad42d Mon Sep 17 00:00:00 2001
From: Liu-Cheng Xu <xuliuchengxlc@gmail.com>
Date: Fri, 9 Apr 2021 19:37:40 +0800
Subject: [PATCH 0628/1194] Add trivial improvements to transaction pool
 (#8572)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add trival improvements to transaction pool

* .

* Add trival improvements to transaction pool

* Update client/transaction-pool/graph/src/future.rs

* Update client/transaction-pool/graph/src/base_pool.rs

* Fix transaction_debug test

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 .../transaction-pool/graph/src/base_pool.rs   | 41 +++++---------
 client/transaction-pool/graph/src/future.rs   | 24 ++++----
 client/transaction-pool/graph/src/listener.rs |  8 ++-
 client/transaction-pool/graph/src/pool.rs     | 27 +++++----
 client/transaction-pool/graph/src/ready.rs    |  8 +--
 client/transaction-pool/graph/src/rotator.rs  |  3 +-
 .../transaction-pool/graph/src/tracked_map.rs | 14 ++---
 .../graph/src/validated_pool.rs               | 56 +++++++++----------
 client/transaction-pool/src/lib.rs            |  4 +-
 9 files changed, 83 insertions(+), 102 deletions(-)

diff --git a/client/transaction-pool/graph/src/base_pool.rs b/client/transaction-pool/graph/src/base_pool.rs
index 445ef0adaf7b..9b644bbdb3b6 100644
--- a/client/transaction-pool/graph/src/base_pool.rs
+++ b/client/transaction-pool/graph/src/base_pool.rs
@@ -155,13 +155,13 @@ impl<Hash: Clone, Extrinsic: Clone> Transaction<Hash, Extrinsic> {
 	/// every reason to be commented. That's why we `Transaction` is not `Clone`,
 	/// but there's explicit `duplicate` method.
 	pub fn duplicate(&self) -> Self {
-		Transaction {
+		Self {
 			data: self.data.clone(),
-			bytes: self.bytes.clone(),
+			bytes: self.bytes,
 			hash: self.hash.clone(),
-			priority: self.priority.clone(),
+			priority: self.priority,
 			source: self.source,
-			valid_till: self.valid_till.clone(),
+			valid_till: self.valid_till,
 			requires: self.requires.clone(),
 			provides: self.provides.clone(),
 			propagate: self.propagate,
@@ -174,16 +174,9 @@ impl<Hash, Extrinsic> fmt::Debug for Transaction<Hash, Extrinsic> where
 	Extrinsic: fmt::Debug,
 {
 	fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-		fn print_tags(fmt: &mut fmt::Formatter, tags: &[Tag]) -> fmt::Result {
-			let mut it = tags.iter();
-			if let Some(t) = it.next() {
-				write!(fmt, "{}", HexDisplay::from(t))?;
-			}
-			for t in it {
-				write!(fmt, ",{}", HexDisplay::from(t))?;
-			}
-			Ok(())
-		}
+		let join_tags = |tags: &[Tag]| {
+			tags.iter().map(|tag| HexDisplay::from(tag).to_string()).collect::<Vec<_>>().join(", ")
+		};
 
 		write!(fmt, "Transaction {{ ")?;
 		write!(fmt, "hash: {:?}, ", &self.hash)?;
@@ -192,11 +185,8 @@ impl<Hash, Extrinsic> fmt::Debug for Transaction<Hash, Extrinsic> where
 		write!(fmt, "bytes: {:?}, ", &self.bytes)?;
 		write!(fmt, "propagate: {:?}, ", &self.propagate)?;
 		write!(fmt, "source: {:?}, ", &self.source)?;
-		write!(fmt, "requires: [")?;
-		print_tags(fmt, &self.requires)?;
-		write!(fmt, "], provides: [")?;
-		print_tags(fmt, &self.provides)?;
-		write!(fmt, "], ")?;
+		write!(fmt, "requires: [{}], ", join_tags(&self.requires))?;
+		write!(fmt, "provides: [{}], ", join_tags(&self.provides))?;
 		write!(fmt, "data: {:?}", &self.data)?;
 		write!(fmt, "}}")?;
 		Ok(())
@@ -239,7 +229,7 @@ impl<Hash: hash::Hash + Member + Serialize, Ex: std::fmt::Debug> Default for Bas
 impl<Hash: hash::Hash + Member + Serialize, Ex: std::fmt::Debug> BasePool<Hash, Ex> {
 	/// Create new pool given reject_future_transactions flag.
 	pub fn new(reject_future_transactions: bool) -> Self {
-		BasePool {
+		Self {
 			reject_future_transactions,
 			future: Default::default(),
 			ready: Default::default(),
@@ -320,13 +310,8 @@ impl<Hash: hash::Hash + Member + Serialize, Ex: std::fmt::Debug> BasePool<Hash,
 		let mut first = true;
 		let mut to_import = vec![tx];
 
-		loop {
-			// take first transaction from the list
-			let tx = match to_import.pop() {
-				Some(tx) => tx,
-				None => break,
-			};
-
+		// take first transaction from the list
+		while let Some(tx) = to_import.pop() {
 			// find transactions in Future that it unlocks
 			to_import.append(&mut self.future.satisfy_tags(&tx.transaction.provides));
 
@@ -1087,7 +1072,7 @@ mod tests {
 			}),
 			"Transaction { \
 hash: 4, priority: 1000, valid_till: 64, bytes: 1, propagate: true, \
-source: TransactionSource::External, requires: [03,02], provides: [04], data: [4]}".to_owned()
+source: TransactionSource::External, requires: [03, 02], provides: [04], data: [4]}".to_owned()
 		);
 	}
 
diff --git a/client/transaction-pool/graph/src/future.rs b/client/transaction-pool/graph/src/future.rs
index 98d49817e32a..9dcfd13808d9 100644
--- a/client/transaction-pool/graph/src/future.rs
+++ b/client/transaction-pool/graph/src/future.rs
@@ -47,24 +47,22 @@ impl<Hash: fmt::Debug, Ex: fmt::Debug> fmt::Debug for WaitingTransaction<Hash, E
 		write!(fmt, "WaitingTransaction {{ ")?;
 		write!(fmt, "imported_at: {:?}, ", self.imported_at)?;
 		write!(fmt, "transaction: {:?}, ", self.transaction)?;
-		write!(fmt, "missing_tags: {{")?;
-		let mut it = self.missing_tags.iter().map(|tag| HexDisplay::from(tag));
-		if let Some(tag) = it.next() {
-			write!(fmt, "{}", tag)?;
-		}
-		for tag in it {
-			write!(fmt, ", {}", tag)?;
-		}
-		write!(fmt, " }}}}")
+		write!(
+			fmt, 
+			"missing_tags: {{{}}}", 
+			self.missing_tags.iter()
+				.map(|tag| HexDisplay::from(tag).to_string()).collect::<Vec<_>>().join(", "),
+		)?;
+		write!(fmt, "}}")
 	}
 }
 
 impl<Hash, Ex> Clone for WaitingTransaction<Hash, Ex> {
 	fn clone(&self) -> Self {
-		WaitingTransaction {
+		Self {
 			transaction: self.transaction.clone(),
 			missing_tags: self.missing_tags.clone(),
-			imported_at: self.imported_at.clone(),
+			imported_at: self.imported_at,
 		}
 	}
 }
@@ -90,7 +88,7 @@ impl<Hash, Ex> WaitingTransaction<Hash, Ex> {
 			.cloned()
 			.collect();
 
-		WaitingTransaction {
+		Self {
 			transaction: Arc::new(transaction),
 			missing_tags,
 			imported_at: Instant::now(),
@@ -123,7 +121,7 @@ pub struct FutureTransactions<Hash: hash::Hash + Eq, Ex> {
 
 impl<Hash: hash::Hash + Eq, Ex> Default for FutureTransactions<Hash, Ex> {
 	fn default() -> Self {
-		FutureTransactions {
+		Self {
 			wanted_tags: Default::default(),
 			waiting: Default::default(),
 		}
diff --git a/client/transaction-pool/graph/src/listener.rs b/client/transaction-pool/graph/src/listener.rs
index d707c0a0f802..563243bf4594 100644
--- a/client/transaction-pool/graph/src/listener.rs
+++ b/client/transaction-pool/graph/src/listener.rs
@@ -20,12 +20,14 @@
 use std::{
 	collections::HashMap, hash, fmt::Debug,
 };
+
 use linked_hash_map::LinkedHashMap;
 use serde::Serialize;
-use crate::{watcher, ChainApi, ExtrinsicHash, BlockHash};
 use log::{debug, trace, warn};
 use sp_runtime::traits;
 
+use crate::{watcher, ChainApi, ExtrinsicHash, BlockHash};
+
 /// Extrinsic pool default listener.
 pub struct Listener<H: hash::Hash + Eq, C: ChainApi> {
 	watchers: HashMap<H, watcher::Sender<H, ExtrinsicHash<C>>>,
@@ -37,7 +39,7 @@ const MAX_FINALITY_WATCHERS: usize = 512;
 
 impl<H: hash::Hash + Eq + Debug, C: ChainApi> Default for Listener<H, C> {
 	fn default() -> Self {
-		Listener {
+		Self {
 			watchers: Default::default(),
 			finality_watchers: Default::default(),
 		}
@@ -115,7 +117,7 @@ impl<H: hash::Hash + traits::Member + Serialize, C: ChainApi> Listener<H, C> {
 		while self.finality_watchers.len() > MAX_FINALITY_WATCHERS {
 			if let Some((hash, txs)) = self.finality_watchers.pop_front() {
 				for tx in txs {
-					self.fire(&tx, |s| s.finality_timeout(hash.clone()));
+					self.fire(&tx, |s| s.finality_timeout(hash));
 				}
 			}
 		}
diff --git a/client/transaction-pool/graph/src/pool.rs b/client/transaction-pool/graph/src/pool.rs
index eee14049d41a..8a60ea80bca9 100644
--- a/client/transaction-pool/graph/src/pool.rs
+++ b/client/transaction-pool/graph/src/pool.rs
@@ -21,8 +21,6 @@ use std::{
 	sync::Arc,
 };
 
-use crate::{base_pool as base, watcher::Watcher};
-
 use futures::Future;
 use sp_runtime::{
 	generic::BlockId,
@@ -35,6 +33,7 @@ use sp_transaction_pool::error;
 use wasm_timer::Instant;
 use futures::channel::mpsc::Receiver;
 
+use crate::{base_pool as base, watcher::Watcher};
 use crate::validated_pool::ValidatedPool;
 pub use crate::validated_pool::{IsValidator, ValidatedTransaction};
 
@@ -111,7 +110,7 @@ pub struct Options {
 
 impl Default for Options {
 	fn default() -> Self {
-		Options {
+		Self {
 			ready: base::Limit {
 				count: 8192,
 				total_bytes: 20 * 1024 * 1024,
@@ -151,7 +150,7 @@ where
 impl<B: ChainApi> Pool<B> {
 	/// Create a new transaction pool.
 	pub fn new(options: Options, is_validator: IsValidator, api: Arc<B>) -> Self {
-		Pool {
+		Self {
 			validated_pool: Arc::new(ValidatedPool::new(options, is_validator, api)),
 		}
 	}
@@ -193,7 +192,7 @@ impl<B: ChainApi> Pool<B> {
 		res.expect("One extrinsic passed; one result returned; qed")
 	}
 
-	/// Import a single extrinsic and starts to watch their progress in the pool.
+	/// Import a single extrinsic and starts to watch its progress in the pool.
 	pub async fn submit_and_watch(
 		&self,
 		at: &BlockId<B::Block>,
@@ -242,8 +241,8 @@ impl<B: ChainApi> Pool<B> {
 
 		// Prune all transactions that provide given tags
 		let prune_status = self.validated_pool.prune_tags(in_pool_tags)?;
-		let pruned_transactions = hashes.into_iter().cloned()
-			.chain(prune_status.pruned.iter().map(|tx| tx.hash.clone()));
+		let pruned_transactions = hashes.iter().cloned()
+			.chain(prune_status.pruned.iter().map(|tx| tx.hash));
 		self.validated_pool.fire_pruned(at, pruned_transactions)
 	}
 
@@ -337,7 +336,7 @@ impl<B: ChainApi> Pool<B> {
 		// note that `known_imported_hashes` will be rejected here due to temporary ban.
 		let pruned_hashes = prune_status.pruned
 			.iter()
-			.map(|tx| tx.hash.clone()).collect::<Vec<_>>();
+			.map(|tx| tx.hash).collect::<Vec<_>>();
 		let pruned_transactions = prune_status.pruned
 			.into_iter()
 			.map(|tx| (tx.source, tx.data.clone()));
@@ -402,7 +401,7 @@ impl<B: ChainApi> Pool<B> {
 
 		let ignore_banned = matches!(check, CheckBannedBeforeVerify::No);
 		if let Err(err) = self.validated_pool.check_is_known(&hash, ignore_banned) {
-			return (hash.clone(), ValidatedTransaction::Invalid(hash, err.into()))
+			return (hash, ValidatedTransaction::Invalid(hash, err))
 		}
 
 		let validation_result = self.validated_pool.api().validate_transaction(
@@ -413,17 +412,17 @@ impl<B: ChainApi> Pool<B> {
 
 		let status = match validation_result {
 			Ok(status) => status,
-			Err(e) => return (hash.clone(), ValidatedTransaction::Invalid(hash, e)),
+			Err(e) => return (hash, ValidatedTransaction::Invalid(hash, e)),
 		};
 
 		let validity = match status {
 			Ok(validity) => {
 				if validity.provides.is_empty() {
-					ValidatedTransaction::Invalid(hash.clone(), error::Error::NoTagsProvided.into())
+					ValidatedTransaction::Invalid(hash, error::Error::NoTagsProvided.into())
 				} else {
 					ValidatedTransaction::valid_at(
 						block_number.saturated_into::<u64>(),
-						hash.clone(),
+						hash,
 						source,
 						xt,
 						bytes,
@@ -432,9 +431,9 @@ impl<B: ChainApi> Pool<B> {
 				}
 			},
 			Err(TransactionValidityError::Invalid(e)) =>
-				ValidatedTransaction::Invalid(hash.clone(), error::Error::InvalidTransaction(e).into()),
+				ValidatedTransaction::Invalid(hash, error::Error::InvalidTransaction(e).into()),
 			Err(TransactionValidityError::Unknown(e)) =>
-				ValidatedTransaction::Unknown(hash.clone(), error::Error::UnknownTransaction(e).into()),
+				ValidatedTransaction::Unknown(hash, error::Error::UnknownTransaction(e).into()),
 		};
 
 		(hash, validity)
diff --git a/client/transaction-pool/graph/src/ready.rs b/client/transaction-pool/graph/src/ready.rs
index c2af4f9cb914..4ede9241d81b 100644
--- a/client/transaction-pool/graph/src/ready.rs
+++ b/client/transaction-pool/graph/src/ready.rs
@@ -50,7 +50,7 @@ pub struct TransactionRef<Hash, Ex> {
 
 impl<Hash, Ex> Clone for TransactionRef<Hash, Ex> {
 	fn clone(&self) -> Self {
-		TransactionRef {
+		Self {
 			transaction: self.transaction.clone(),
 			insertion_id: self.insertion_id,
 		}
@@ -93,7 +93,7 @@ pub struct ReadyTx<Hash, Ex> {
 
 impl<Hash: Clone, Ex> Clone for ReadyTx<Hash, Ex> {
 	fn clone(&self) -> Self {
-		ReadyTx {
+		Self {
 			transaction: self.transaction.clone(),
 			unlocks: self.unlocks.clone(),
 			requires_offset: self.requires_offset,
@@ -128,7 +128,7 @@ impl<Hash, Ex> tracked_map::Size for ReadyTx<Hash, Ex> {
 
 impl<Hash: hash::Hash + Eq, Ex> Default for ReadyTransactions<Hash, Ex> {
 	fn default() -> Self {
-		ReadyTransactions {
+		Self {
 			insertion_id: Default::default(),
 			provided_tags: Default::default(),
 			ready: Default::default(),
@@ -259,7 +259,7 @@ impl<Hash: hash::Hash + Member + Serialize, Ex> ReadyTransactions<Hash, Ex> {
 	/// (i.e. the entire subgraph that this transaction is a start of will be removed).
 	/// All removed transactions are returned.
 	pub fn remove_subtree(&mut self, hashes: &[Hash]) -> Vec<Arc<Transaction<Hash, Ex>>> {
-		let to_remove = hashes.iter().cloned().collect::<Vec<_>>();
+		let to_remove = hashes.to_vec();
 		self.remove_subtree_with_tag_filter(to_remove, None)
 	}
 
diff --git a/client/transaction-pool/graph/src/rotator.rs b/client/transaction-pool/graph/src/rotator.rs
index 3d9b359fd365..4c800c767183 100644
--- a/client/transaction-pool/graph/src/rotator.rs
+++ b/client/transaction-pool/graph/src/rotator.rs
@@ -48,7 +48,7 @@ pub struct PoolRotator<Hash> {
 
 impl<Hash: hash::Hash + Eq> Default for PoolRotator<Hash> {
 	fn default() -> Self {
-		PoolRotator {
+		Self {
 			ban_time: Duration::from_secs(60 * 30),
 			banned_until: Default::default(),
 		}
@@ -78,7 +78,6 @@ impl<Hash: hash::Hash + Eq + Clone> PoolRotator<Hash> {
 		}
 	}
 
-
 	/// Bans extrinsic if it's stale.
 	///
 	/// Returns `true` if extrinsic is stale and got banned.
diff --git a/client/transaction-pool/graph/src/tracked_map.rs b/client/transaction-pool/graph/src/tracked_map.rs
index 9cd6ad84b483..98fd9e21b316 100644
--- a/client/transaction-pool/graph/src/tracked_map.rs
+++ b/client/transaction-pool/graph/src/tracked_map.rs
@@ -22,7 +22,7 @@ use std::{
 };
 use parking_lot::{RwLock, RwLockWriteGuard, RwLockReadGuard};
 
-/// Something that can report it's size.
+/// Something that can report its size.
 pub trait Size {
 	fn size(&self) -> usize;
 }
@@ -64,14 +64,14 @@ impl<K, V> TrackedMap<K, V> {
 	}
 
 	/// Lock map for read.
-	pub fn read<'a>(&'a self) -> TrackedMapReadAccess<'a, K, V> {
+	pub fn read(&self) -> TrackedMapReadAccess<K, V> {
 		TrackedMapReadAccess {
 			inner_guard: self.index.read(),
 		}
 	}
 
 	/// Lock map for write.
-	pub fn write<'a>(&'a self) -> TrackedMapWriteAccess<'a, K, V> {
+	pub fn write(&self) -> TrackedMapWriteAccess<K, V> {
 		TrackedMapWriteAccess {
 			inner_guard: self.index.write(),
 			bytes: &self.bytes,
@@ -90,7 +90,7 @@ where
 	K: Eq + std::hash::Hash
 {
 	/// Lock map for read.
-	pub fn read<'a>(&'a self) -> TrackedMapReadAccess<'a, K, V> {
+	pub fn read(&self) -> TrackedMapReadAccess<K, V> {
 		TrackedMapReadAccess {
 			inner_guard: self.0.read(),
 		}
@@ -136,10 +136,10 @@ where
 		let new_bytes = val.size();
 		self.bytes.fetch_add(new_bytes as isize, AtomicOrdering::Relaxed);
 		self.length.fetch_add(1, AtomicOrdering::Relaxed);
-		self.inner_guard.insert(key, val).and_then(|old_val| {
+		self.inner_guard.insert(key, val).map(|old_val| {
 			self.bytes.fetch_sub(old_val.size() as isize, AtomicOrdering::Relaxed);
 			self.length.fetch_sub(1, AtomicOrdering::Relaxed);
-			Some(old_val)
+			old_val
 		})
 	}
 
@@ -186,4 +186,4 @@ mod tests {
 		assert_eq!(map.bytes(), 1);
 		assert_eq!(map.len(), 1);
 	}
-}
\ No newline at end of file
+}
diff --git a/client/transaction-pool/graph/src/validated_pool.rs b/client/transaction-pool/graph/src/validated_pool.rs
index c02aab47d880..6042189e87e2 100644
--- a/client/transaction-pool/graph/src/validated_pool.rs
+++ b/client/transaction-pool/graph/src/validated_pool.rs
@@ -22,12 +22,7 @@ use std::{
 	sync::Arc,
 };
 
-use crate::base_pool as base;
-use crate::listener::Listener;
-use crate::rotator::PoolRotator;
-use crate::watcher::Watcher;
 use serde::Serialize;
-
 use parking_lot::{Mutex, RwLock};
 use sp_runtime::{
 	generic::BlockId,
@@ -39,7 +34,10 @@ use wasm_timer::Instant;
 use futures::channel::mpsc::{channel, Sender};
 use retain_mut::RetainMut;
 
-use crate::base_pool::PruneStatus;
+use crate::base_pool::{self as base, PruneStatus};
+use crate::listener::Listener;
+use crate::rotator::PoolRotator;
+use crate::watcher::Watcher;
 use crate::pool::{
 	EventStream, Options, ChainApi, BlockHash, ExtrinsicHash, ExtrinsicFor, TransactionFor,
 };
@@ -95,13 +93,13 @@ pub struct IsValidator(Box<dyn Fn() -> bool + Send + Sync>);
 
 impl From<bool> for IsValidator {
 	fn from(is_validator: bool) -> Self {
-		IsValidator(Box::new(move || is_validator))
+		Self(Box::new(move || is_validator))
 	}
 }
 
 impl From<Box<dyn Fn() -> bool + Send + Sync>> for IsValidator {
 	fn from(is_validator: Box<dyn Fn() -> bool + Send + Sync>) -> Self {
-		IsValidator(is_validator)
+		Self(is_validator)
 	}
 }
 
@@ -134,7 +132,7 @@ impl<B: ChainApi> ValidatedPool<B> {
 	/// Create a new transaction pool.
 	pub fn new(options: Options, is_validator: IsValidator, api: Arc<B>) -> Self {
 		let base_pool = base::BasePool::new(options.reject_future_transactions);
-		ValidatedPool {
+		Self {
 			is_validator,
 			options,
 			listener: Default::default(),
@@ -168,7 +166,7 @@ impl<B: ChainApi> ValidatedPool<B> {
 		if !ignore_banned && self.is_banned(tx_hash) {
 			Err(error::Error::TemporarilyBanned.into())
 		} else if self.pool.read().is_imported(tx_hash) {
-			Err(error::Error::AlreadyImported(Box::new(tx_hash.clone())).into())
+			Err(error::Error::AlreadyImported(Box::new(*tx_hash)).into())
 		} else {
 			Ok(())
 		}
@@ -209,7 +207,7 @@ impl<B: ChainApi> ValidatedPool<B> {
 				if let base::Imported::Ready { ref hash, .. } = imported {
 					self.import_notification_sinks.lock()
 						.retain_mut(|sink| {
-							match sink.try_send(hash.clone()) {
+							match sink.try_send(*hash) {
 								Ok(()) => true,
 								Err(e) => {
 									if e.is_full() {
@@ -225,15 +223,15 @@ impl<B: ChainApi> ValidatedPool<B> {
 
 				let mut listener = self.listener.write();
 				fire_events(&mut *listener, &imported);
-				Ok(imported.hash().clone())
+				Ok(*imported.hash())
 			},
 			ValidatedTransaction::Invalid(hash, err) => {
 				self.rotator.ban(&Instant::now(), std::iter::once(hash));
-				Err(err.into())
+				Err(err)
 			},
 			ValidatedTransaction::Unknown(hash, err) => {
 				self.listener.write().invalid(&hash, false);
-				Err(err.into())
+				Err(err)
 			},
 		}
 	}
@@ -258,9 +256,9 @@ impl<B: ChainApi> ValidatedPool<B> {
 			let removed = {
 				let mut pool = self.pool.write();
 				let removed = pool.enforce_limits(ready_limit, future_limit)
-					.into_iter().map(|x| x.hash.clone()).collect::<HashSet<_>>();
+					.into_iter().map(|x| x.hash).collect::<HashSet<_>>();
 				// ban all removed transactions
-				self.rotator.ban(&Instant::now(), removed.iter().map(|x| x.clone()));
+				self.rotator.ban(&Instant::now(), removed.iter().copied());
 				removed
 			};
 			if !removed.is_empty() {
@@ -295,9 +293,9 @@ impl<B: ChainApi> ValidatedPool<B> {
 			},
 			ValidatedTransaction::Invalid(hash, err) => {
 				self.rotator.ban(&Instant::now(), std::iter::once(hash));
-				Err(err.into())
+				Err(err)
 			},
-			ValidatedTransaction::Unknown(_, err) => Err(err.into()),
+			ValidatedTransaction::Unknown(_, err) => Err(err),
 		}
 	}
 
@@ -327,9 +325,9 @@ impl<B: ChainApi> ValidatedPool<B> {
 				// note we are not considering tx with hash invalid here - we just want
 				// to remove it along with dependent transactions and `remove_subtree()`
 				// does exactly what we need
-				let removed = pool.remove_subtree(&[hash.clone()]);
+				let removed = pool.remove_subtree(&[hash]);
 				for removed_tx in removed {
-					let removed_hash = removed_tx.hash.clone();
+					let removed_hash = removed_tx.hash;
 					let updated_transaction = updated_transactions.remove(&removed_hash);
 					let tx_to_resubmit = if let Some(updated_tx) = updated_transaction {
 						updated_tx
@@ -343,7 +341,7 @@ impl<B: ChainApi> ValidatedPool<B> {
 						ValidatedTransaction::Valid(transaction)
 					};
 
-					initial_statuses.insert(removed_hash.clone(), Status::Ready);
+					initial_statuses.insert(removed_hash, Status::Ready);
 					txs_to_resubmit.push((removed_hash, tx_to_resubmit));
 				}
 				// make sure to remove the hash even if it's not present in the pool any more.
@@ -370,7 +368,7 @@ impl<B: ChainApi> ValidatedPool<B> {
 										final_statuses.insert(hash, Status::Failed);
 									}
 									for tx in removed {
-										final_statuses.insert(tx.hash.clone(), Status::Dropped);
+										final_statuses.insert(tx.hash, Status::Dropped);
 									}
 								},
 								base::Imported::Future { .. } => {
@@ -400,7 +398,7 @@ impl<B: ChainApi> ValidatedPool<B> {
 				// queue, updating final statuses as required
 				if reject_future_transactions {
 					for future_tx in pool.clear_future() {
-						final_statuses.insert(future_tx.hash.clone(), Status::Dropped);
+						final_statuses.insert(future_tx.hash, Status::Dropped);
 					}
 				}
 
@@ -428,7 +426,7 @@ impl<B: ChainApi> ValidatedPool<B> {
 		self.pool.read().by_hashes(&hashes)
 			.into_iter()
 			.map(|existing_in_pool| existing_in_pool
-				.map(|transaction| transaction.provides.iter().cloned().collect()))
+				.map(|transaction| transaction.provides.to_vec()))
 			.collect()
 	}
 
@@ -477,7 +475,7 @@ impl<B: ChainApi> ValidatedPool<B> {
 			.into_iter()
 			.enumerate()
 			.filter_map(|(idx, r)| match r.map_err(error::IntoPoolError::into_pool_error) {
-				Err(Ok(error::Error::InvalidTransaction(_))) => Some(pruned_hashes[idx].clone()),
+				Err(Ok(error::Error::InvalidTransaction(_))) => Some(pruned_hashes[idx]),
 				_ => None,
 			});
 		// Fire `pruned` notifications for collected hashes and make sure to include
@@ -498,7 +496,7 @@ impl<B: ChainApi> ValidatedPool<B> {
 		hashes: impl Iterator<Item=ExtrinsicHash<B>>,
 	) -> Result<(), B::Error> {
 		let header_hash = self.api.block_id_to_hash(at)?
-			.ok_or_else(|| error::Error::InvalidBlockId(format!("{:?}", at)).into())?;
+			.ok_or_else(|| error::Error::InvalidBlockId(format!("{:?}", at)))?;
 		let mut listener = self.listener.write();
 		let mut set = HashSet::with_capacity(hashes.size_hint().0);
 		for h in hashes {
@@ -519,13 +517,13 @@ impl<B: ChainApi> ValidatedPool<B> {
 	/// See `prune_tags` if you want this.
 	pub fn clear_stale(&self, at: &BlockId<B::Block>) -> Result<(), B::Error> {
 		let block_number = self.api.block_id_to_number(at)?
-			.ok_or_else(|| error::Error::InvalidBlockId(format!("{:?}", at)).into())?
+			.ok_or_else(|| error::Error::InvalidBlockId(format!("{:?}", at)))?
 			.saturated_into::<u64>();
 		let now = Instant::now();
 		let to_remove = {
 			self.ready()
 				.filter(|tx| self.rotator.ban_if_stale(&now, block_number, &tx))
-				.map(|tx| tx.hash.clone())
+				.map(|tx| tx.hash)
 				.collect::<Vec<_>>()
 		};
 		let futures_to_remove: Vec<ExtrinsicHash<B>> = {
@@ -533,7 +531,7 @@ impl<B: ChainApi> ValidatedPool<B> {
 			let mut hashes = Vec::new();
 			for tx in p.futures() {
 				if self.rotator.ban_if_stale(&now, block_number, &tx) {
-					hashes.push(tx.hash.clone());
+					hashes.push(tx.hash);
 				}
 			}
 			hashes
diff --git a/client/transaction-pool/src/lib.rs b/client/transaction-pool/src/lib.rs
index b6f19ba37686..efd5a7a14342 100644
--- a/client/transaction-pool/src/lib.rs
+++ b/client/transaction-pool/src/lib.rs
@@ -167,7 +167,7 @@ impl<PoolApi, Block> BasicPool<PoolApi, Block>
 		let (revalidation_queue, background_task, notifier) =
 			revalidation::RevalidationQueue::new_test(pool_api.clone(), pool.clone());
 		(
-			BasicPool {
+			Self {
 				api: pool_api,
 				pool,
 				revalidation_queue: Arc::new(revalidation_queue),
@@ -203,7 +203,7 @@ impl<PoolApi, Block> BasicPool<PoolApi, Block>
 			spawner.spawn("txpool-background", background_task);
 		}
 
-		BasicPool {
+		Self {
 			api: pool_api,
 			pool,
 			revalidation_queue: Arc::new(revalidation_queue),

From e186f7cb6cc41023e3e0a2c84c17e58938b76296 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Fri, 9 Apr 2021 16:36:06 +0200
Subject: [PATCH 0629/1194] clean arithmetic and unify names with the new api
 (#8581)

---
 Cargo.lock                               |  1 +
 bin/node/runtime/src/impls.rs            |  2 +-
 frame/contracts/proc-macro/src/lib.rs    |  6 +--
 primitives/arithmetic/Cargo.toml         |  1 +
 primitives/arithmetic/src/biguint.rs     | 50 +++++++++++-------------
 primitives/arithmetic/src/fixed_point.rs |  2 +-
 6 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 933395f7f06b..abb151282cf4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8570,6 +8570,7 @@ dependencies = [
  "serde_json",
  "sp-debug-derive",
  "sp-std",
+ "static_assertions",
 ]
 
 [[package]]
diff --git a/bin/node/runtime/src/impls.rs b/bin/node/runtime/src/impls.rs
index 416266119cb0..ba8929b95920 100644
--- a/bin/node/runtime/src/impls.rs
+++ b/bin/node/runtime/src/impls.rs
@@ -74,7 +74,7 @@ mod multiplier_tests {
 		let m = max_normal() as f64;
 		// block weight always truncated to max weight
 		let block_weight = (block_weight as f64).min(m);
-		let v: f64 = AdjustmentVariable::get().to_fraction();
+		let v: f64 = AdjustmentVariable::get().to_float();
 
 		// Ideal saturation in terms of weight
 		let ss = target() as f64;
diff --git a/frame/contracts/proc-macro/src/lib.rs b/frame/contracts/proc-macro/src/lib.rs
index 6fc2fbe82e03..3b8b1ea5e663 100644
--- a/frame/contracts/proc-macro/src/lib.rs
+++ b/frame/contracts/proc-macro/src/lib.rs
@@ -117,17 +117,17 @@ fn format_weight(field: &Ident) -> TokenStream {
 		&if self.#field > 1_000_000_000 {
 			format!(
 				"{:.1?} ms",
-				Fixed::saturating_from_rational(self.#field, 1_000_000_000).to_fraction()
+				Fixed::saturating_from_rational(self.#field, 1_000_000_000).to_float()
 			)
 		} else if self.#field > 1_000_000 {
 			format!(
 				"{:.1?} µs",
-				Fixed::saturating_from_rational(self.#field, 1_000_000).to_fraction()
+				Fixed::saturating_from_rational(self.#field, 1_000_000).to_float()
 			)
 		} else if self.#field > 1_000 {
 			format!(
 				"{:.1?} ns",
-				Fixed::saturating_from_rational(self.#field, 1_000).to_fraction()
+				Fixed::saturating_from_rational(self.#field, 1_000).to_float()
 			)
 		} else {
 			format!("{} ps", self.#field)
diff --git a/primitives/arithmetic/Cargo.toml b/primitives/arithmetic/Cargo.toml
index 76751cdee81b..3c3b5a35c164 100644
--- a/primitives/arithmetic/Cargo.toml
+++ b/primitives/arithmetic/Cargo.toml
@@ -17,6 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 integer-sqrt = "0.1.2"
+static_assertions = "1.1.0"
 num-traits = { version = "0.2.8", default-features = false }
 sp-std = { version = "3.0.0", default-features = false, path = "../std" }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
diff --git a/primitives/arithmetic/src/biguint.rs b/primitives/arithmetic/src/biguint.rs
index 9813277506c4..906c4d0cfd31 100644
--- a/primitives/arithmetic/src/biguint.rs
+++ b/primitives/arithmetic/src/biguint.rs
@@ -33,6 +33,10 @@ const SHIFT: usize = 32;
 /// short form of _Base_. Analogous to the value 10 in base-10 decimal numbers.
 const B: Double = Single::max_value() as Double + 1;
 
+static_assertions::const_assert!(
+	sp_std::mem::size_of::<Double>() - sp_std::mem::size_of::<Single>() == SHIFT / 8
+);
+
 /// Splits a [`Double`] limb number into a tuple of two [`Single`] limb numbers.
 pub fn split(a: Double) -> (Single, Single) {
 	let al = a as Single;
@@ -187,6 +191,7 @@ impl BigUint {
 			let u = Double::from(self.checked_get(j).unwrap_or(0));
 			let v = Double::from(other.checked_get(j).unwrap_or(0));
 			let s = u + v + k;
+			// proof: any number % B will fit into `Single`.
 			w.set(j, (s % B) as Single);
 			k = s / B;
 		}
@@ -209,28 +214,24 @@ impl BigUint {
 			let s = {
 				let u = Double::from(self.checked_get(j).unwrap_or(0));
 				let v = Double::from(other.checked_get(j).unwrap_or(0));
-				let mut needs_borrow = false;
-				let mut t = 0;
 
-				if let Some(v1) = u.checked_sub(v) {
-					if let Some(v2) = v1.checked_sub(k) {
-						t = v2;
-						k = 0;
-					} else {
-						needs_borrow = true;
-					}
+				if let Some(v2) = u.checked_sub(v).and_then(|v1| v1.checked_sub(k)) {
+					// no borrow is needed. u - v - k can be computed as-is
+					let t = v2;
+					k = 0;
+
+					t
 				} else {
-					needs_borrow = true;
-				}
-				if needs_borrow {
-					t = u + B - v - k;
+					// borrow is needed. Add a `B` to u, before subtracting.
+					// PROOF: addition: `u + B < 2*B`, thus can fit in double.
+					// PROOF: subtraction: if `u - v - k < 0`, then `u + B - v - k < B`.
+					// NOTE: the order of operations is critical to ensure underflow won't happen.
+					let t = u + B - v - k;
 					k = 1;
+
+					t
 				}
-				t
 			};
-			// PROOF: t either comes from `v2`, or from `u + B - v - k`. The former is
-			// trivial. The latter will not overflow this branch will only happen if the sum of
-			// `u - v - k` part has been negative, hence `u + B - v - k < B`.
 			w.set(j, s as Single);
 		}
 
@@ -264,10 +265,9 @@ impl BigUint {
 			let mut k = 0;
 			for i in 0..m {
 				// PROOF: (B−1) × (B−1) + (B−1) + (B−1) = B^2 −1 < B^2. addition is safe.
-				let t =
-					mul_single(self.get(j), other.get(i))
-						+ Double::from(w.get(i + j))
-						+ Double::from(k);
+				let t = mul_single(self.get(j), other.get(i))
+					+ Double::from(w.get(i + j))
+					+ Double::from(k);
 				w.set(i + j, (t % B) as Single);
 				// PROOF: (B^2 - 1) / B < B. conversion is safe.
 				k = (t / B) as Single;
@@ -580,12 +580,6 @@ pub mod tests {
 		BigUint { digits: vec![1; n] }
 	}
 
-	#[test]
-	fn shift_check() {
-		let shift = sp_std::mem::size_of::<Double>() - sp_std::mem::size_of::<Single>();
-		assert_eq!(shift * 8, SHIFT);
-	}
-
 	#[test]
 	fn split_works() {
 		let a = SHIFT / 2;
@@ -732,12 +726,14 @@ pub mod tests {
 		let c = BigUint { digits: vec![1, 1, 2] };
 		let d = BigUint { digits: vec![0, 2] };
 		let e = BigUint { digits: vec![0, 1, 1, 2] };
+		let f = BigUint { digits: vec![7, 8] };
 
 		assert!(a.clone().div(&b, true).is_none());
 		assert!(c.clone().div(&a, true).is_none());
 		assert!(c.clone().div(&d, true).is_none());
 		assert!(e.clone().div(&a, true).is_none());
 
+		assert!(f.clone().div(&b, true).is_none());
 		assert!(c.clone().div(&b, true).is_some());
 	}
 
diff --git a/primitives/arithmetic/src/fixed_point.rs b/primitives/arithmetic/src/fixed_point.rs
index b837c360c7c5..3dd8b9a1f7ad 100644
--- a/primitives/arithmetic/src/fixed_point.rs
+++ b/primitives/arithmetic/src/fixed_point.rs
@@ -381,7 +381,7 @@ macro_rules! implement_fixed {
 			}
 
 			#[cfg(any(feature = "std", test))]
-			pub fn to_fraction(self) -> f64 {
+			pub fn to_float(self) -> f64 {
 				self.0 as f64 / <Self as FixedPointNumber>::DIV as f64
 			}
 		}

From 2425d14121a6988804a2c299477d7df32498f2d8 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Fri, 9 Apr 2021 17:22:47 +0200
Subject: [PATCH 0630/1194] Cap the warp sync proof by size, not by fragments
 (#8578)

* Cap the warp sync proof by size, not by fragments

* Add a final debug assert

* Check size after
---
 client/finality-grandpa-warp-sync/src/lib.rs  |  2 +-
 .../finality-grandpa-warp-sync/src/proof.rs   | 34 ++++++++++++-------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/client/finality-grandpa-warp-sync/src/lib.rs b/client/finality-grandpa-warp-sync/src/lib.rs
index 285a5fe736db..dca6c2ad1ba3 100644
--- a/client/finality-grandpa-warp-sync/src/lib.rs
+++ b/client/finality-grandpa-warp-sync/src/lib.rs
@@ -66,7 +66,7 @@ pub fn generate_request_response_config(protocol_id: ProtocolId) -> RequestRespo
 	RequestResponseConfig {
 		name: generate_protocol_name(protocol_id).into(),
 		max_request_size: 32,
-		max_response_size: 16 * 1024 * 1024,
+		max_response_size: proof::MAX_WARP_SYNC_PROOF_SIZE as u64,
 		request_timeout: Duration::from_secs(10),
 		inbound_queue: None,
 	}
diff --git a/client/finality-grandpa-warp-sync/src/proof.rs b/client/finality-grandpa-warp-sync/src/proof.rs
index 08effcf1c24b..26560c10fe40 100644
--- a/client/finality-grandpa-warp-sync/src/proof.rs
+++ b/client/finality-grandpa-warp-sync/src/proof.rs
@@ -29,8 +29,8 @@ use sp_runtime::{
 
 use crate::HandleRequestError;
 
-/// The maximum number of authority set change proofs to include in a single warp sync proof.
-const MAX_CHANGES_PER_WARP_SYNC_PROOF: usize = 256;
+/// The maximum size in bytes of the `WarpSyncProof`.
+pub(super) const MAX_WARP_SYNC_PROOF_SIZE: usize = 16 * 1024 * 1024;
 
 /// A proof of an authority set change.
 #[derive(Decode, Encode)]
@@ -53,7 +53,7 @@ pub struct WarpSyncProof<Block: BlockT> {
 impl<Block: BlockT> WarpSyncProof<Block> {
 	/// Generates a warp sync proof starting at the given block. It will generate authority set
 	/// change proofs for all changes that happened from `begin` until the current authority set
-	/// (capped by MAX_CHANGES_PER_WARP_SYNC_PROOF).
+	/// (capped by MAX_WARP_SYNC_PROOF_SIZE).
 	pub fn generate<Backend>(
 		backend: &Backend,
 		begin: Block::Hash,
@@ -88,14 +88,10 @@ impl<Block: BlockT> WarpSyncProof<Block> {
 		}
 
 		let mut proofs = Vec::new();
+		let mut proofs_encoded_len = 0;
 		let mut proof_limit_reached = false;
 
 		for (_, last_block) in set_changes.iter_from(begin_number) {
-			if proofs.len() >= MAX_CHANGES_PER_WARP_SYNC_PROOF {
-				proof_limit_reached = true;
-				break;
-			}
-
 			let header = blockchain.header(BlockId::Number(*last_block))?.expect(
 				"header number comes from previously applied set changes; must exist in db; qed.",
 			);
@@ -120,10 +116,22 @@ impl<Block: BlockT> WarpSyncProof<Block> {
 
 			let justification = GrandpaJustification::<Block>::decode(&mut &justification[..])?;
 
-			proofs.push(WarpSyncFragment {
+			let proof = WarpSyncFragment {
 				header: header.clone(),
 				justification,
-			});
+			};
+			let proof_size = proof.encoded_size();
+
+			// Check for the limit. We remove some bytes from the maximum size, because we're only
+			// counting the size of the `WarpSyncFragment`s. The extra margin is here to leave
+			// room for rest of the data (the size of the `Vec` and the boolean).
+			if proofs_encoded_len + proof_size >= MAX_WARP_SYNC_PROOF_SIZE - 50 {
+				proof_limit_reached = true;
+				break;
+			}
+
+			proofs_encoded_len += proof_size;
+			proofs.push(proof);
 		}
 
 		let is_finished = if proof_limit_reached {
@@ -156,10 +164,12 @@ impl<Block: BlockT> WarpSyncProof<Block> {
 			true
 		};
 
-		Ok(WarpSyncProof {
+		let final_outcome = WarpSyncProof {
 			proofs,
 			is_finished,
-		})
+		};
+		debug_assert!(final_outcome.encoded_size() <= MAX_WARP_SYNC_PROOF_SIZE);
+		Ok(final_outcome)
 	}
 
 	/// Verifies the warp sync proof starting at the given set id and with the given authorities.

From f6d19fa08bce50a6edc1e7ef4ba4b8ac0a1b5ea3 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Sat, 10 Apr 2021 14:31:45 +0200
Subject: [PATCH 0631/1194] Benchmark Transfer PoV Size with Increasing Numbers
 of Users (#8571)

* write benchmark for transfer increasing users

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs

Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
---
 frame/balances/src/benchmarking.rs | 33 ++++++++++++++++++++++++++++++
 frame/balances/src/weights.rs      | 24 +++++++++++-----------
 2 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/frame/balances/src/benchmarking.rs b/frame/balances/src/benchmarking.rs
index 6e86d18d7c12..f89775146b13 100644
--- a/frame/balances/src/benchmarking.rs
+++ b/frame/balances/src/benchmarking.rs
@@ -143,6 +143,39 @@ benchmarks_instance_pallet! {
 		assert_eq!(Balances::<T, I>::free_balance(&source), Zero::zero());
 		assert_eq!(Balances::<T, I>::free_balance(&recipient), transfer_amount);
 	}
+
+	// This benchmark performs the same operation as `transfer` in the worst case scenario,
+	// but additionally introduces many new users into the storage, increasing the the merkle
+	// trie and PoV size.
+	#[extra]
+	transfer_increasing_users {
+		// 1_000 is not very much, but this upper bound can be controlled by the CLI.
+		let u in 0 .. 1_000;
+		let existential_deposit = T::ExistentialDeposit::get();
+		let caller = whitelisted_caller();
+
+		// Give some multiple of the existential deposit + creation fee + transfer fee
+		let balance = existential_deposit.saturating_mul(ED_MULTIPLIER.into());
+		let _ = <Balances<T, I> as Currency<_>>::make_free_balance_be(&caller, balance);
+
+		// Transfer `e - 1` existential deposits + 1 unit, which guarantees to create one account,
+		// and reap this user.
+		let recipient: T::AccountId = account("recipient", 0, SEED);
+		let recipient_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(recipient.clone());
+		let transfer_amount = existential_deposit.saturating_mul((ED_MULTIPLIER - 1).into()) + 1u32.into();
+
+		// Create a bunch of users in storage.
+		for i in 0 .. u {
+			// The `account` function uses `blake2_256` to generate unique accounts, so these
+			// should be quite random and evenly distributed in the trie.
+			let new_user: T::AccountId = account("new_user", i, SEED);
+			let _ = <Balances<T, I> as Currency<_>>::make_free_balance_be(&new_user, balance);
+		}
+	}: transfer(RawOrigin::Signed(caller.clone()), recipient_lookup, transfer_amount)
+	verify {
+		assert_eq!(Balances::<T, I>::free_balance(&caller), Zero::zero());
+		assert_eq!(Balances::<T, I>::free_balance(&recipient), transfer_amount);
+	}
 }
 
 impl_benchmark_test_suite!(
diff --git a/frame/balances/src/weights.rs b/frame/balances/src/weights.rs
index 463ac7dd35c0..5f3cf2b6bd9a 100644
--- a/frame/balances/src/weights.rs
+++ b/frame/balances/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_balances
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2021-01-06, STEPS: \[50, \], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-04-08, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -55,27 +55,27 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn transfer() -> Weight {
-		(100_698_000 as Weight)
+		(81_909_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn transfer_keep_alive() -> Weight {
-		(69_407_000 as Weight)
+		(61_075_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_balance_creating() -> Weight {
-		(38_489_000 as Weight)
+		(32_255_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_balance_killing() -> Weight {
-		(48_458_000 as Weight)
+		(38_513_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_transfer() -> Weight {
-		(99_320_000 as Weight)
+		(80_448_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
@@ -84,27 +84,27 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn transfer() -> Weight {
-		(100_698_000 as Weight)
+		(81_909_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn transfer_keep_alive() -> Weight {
-		(69_407_000 as Weight)
+		(61_075_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_balance_creating() -> Weight {
-		(38_489_000 as Weight)
+		(32_255_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_balance_killing() -> Weight {
-		(48_458_000 as Weight)
+		(38_513_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_transfer() -> Weight {
-		(99_320_000 as Weight)
+		(80_448_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}

From 524b086372b3219f47275866a63b1c575b69a0f8 Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Sun, 11 Apr 2021 00:04:02 +0200
Subject: [PATCH 0632/1194] Purify `Contains`, add `IsInVec`, `All` and
 `SortedMembers` (#8589)

* IsInVec

* Purify `Contains`, introduce SortedMembers
---
 frame/democracy/src/tests.rs        |  4 ++--
 frame/elections-phragmen/src/lib.rs |  8 ++++++-
 frame/membership/src/lib.rs         |  8 ++++++-
 frame/support/src/lib.rs            |  5 ++++-
 frame/support/src/traits.rs         |  5 ++++-
 frame/support/src/traits/members.rs | 33 ++++++++++++++++++++++++++---
 frame/system/src/lib.rs             |  4 ++--
 frame/tips/src/lib.rs               |  4 ++--
 frame/tips/src/tests.rs             |  4 ++--
 9 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/frame/democracy/src/tests.rs b/frame/democracy/src/tests.rs
index 4dd96d219b9e..9df594ed0787 100644
--- a/frame/democracy/src/tests.rs
+++ b/frame/democracy/src/tests.rs
@@ -22,7 +22,7 @@ use super::*;
 use codec::Encode;
 use frame_support::{
 	assert_noop, assert_ok, parameter_types, ord_parameter_types,
-	traits::{Contains, OnInitialize, Filter},
+	traits::{SortedMembers, OnInitialize, Filter},
 	weights::Weight,
 };
 use sp_core::H256;
@@ -151,7 +151,7 @@ ord_parameter_types! {
 	pub const Six: u64 = 6;
 }
 pub struct OneToFive;
-impl Contains<u64> for OneToFive {
+impl SortedMembers<u64> for OneToFive {
 	fn sorted_members() -> Vec<u64> {
 		vec![1, 2, 3, 4, 5]
 	}
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index 6317bcebacce..c7fcb4cec830 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -107,7 +107,7 @@ use frame_support::{
 	traits::{
 		ChangeMembers, Contains, ContainsLengthBound, Currency, CurrencyToVote, Get,
 		InitializeMembers, LockIdentifier, LockableCurrency, OnUnbalanced, ReservableCurrency,
-		WithdrawReasons,
+		WithdrawReasons, SortedMembers,
 	},
 	weights::Weight,
 };
@@ -1015,6 +1015,12 @@ impl<T: Config> Contains<T::AccountId> for Module<T> {
 	fn contains(who: &T::AccountId) -> bool {
 		Self::is_member(who)
 	}
+}
+
+impl<T: Config> SortedMembers<T::AccountId> for Module<T> {
+	fn contains(who: &T::AccountId) -> bool {
+		Self::is_member(who)
+	}
 
 	fn sorted_members() -> Vec<T::AccountId> {
 		Self::members_ids()
diff --git a/frame/membership/src/lib.rs b/frame/membership/src/lib.rs
index 532a235ad36c..7ad7d6a5435e 100644
--- a/frame/membership/src/lib.rs
+++ b/frame/membership/src/lib.rs
@@ -26,7 +26,7 @@
 use sp_std::prelude::*;
 use frame_support::{
 	decl_module, decl_storage, decl_event, decl_error,
-	traits::{ChangeMembers, InitializeMembers, EnsureOrigin, Contains},
+	traits::{ChangeMembers, InitializeMembers, EnsureOrigin, Contains, SortedMembers},
 };
 use frame_system::ensure_signed;
 
@@ -267,6 +267,12 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 }
 
 impl<T: Config<I>, I: Instance> Contains<T::AccountId> for Module<T, I> {
+	fn contains(t: &T::AccountId) -> bool {
+		Self::members().binary_search(t).is_ok()
+	}
+}
+
+impl<T: Config<I>, I: Instance> SortedMembers<T::AccountId> for Module<T, I> {
 	fn sorted_members() -> Vec<T::AccountId> {
 		Self::members()
 	}
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 13feab8ed3ba..92ffe0cb0c24 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -459,13 +459,16 @@ macro_rules! ord_parameter_types {
 	);
 	() => ();
 	(IMPL $name:ident , $type:ty , $value:expr) => {
-		impl $crate::traits::Contains<$type> for $name {
+		impl $crate::traits::SortedMembers<$type> for $name {
 			fn contains(t: &$type) -> bool { &$value == t }
 			fn sorted_members() -> $crate::sp_std::prelude::Vec<$type> { vec![$value] }
 			fn count() -> usize { 1 }
 			#[cfg(feature = "runtime-benchmarks")]
 			fn add(_: &$type) {}
 		}
+		impl $crate::traits::Contains<$type> for $name {
+			fn contains(t: &$type) -> bool { &$value == t }
+		}
 	}
 }
 
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index 6fd40aa9ba74..7288f6c0d2b2 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -29,7 +29,10 @@ pub use tokens::imbalance::{Imbalance, OnUnbalanced, SignedImbalance};
 pub use tokens::{ExistenceRequirement, WithdrawReasons, BalanceStatus};
 
 mod members;
-pub use members::{Contains, ContainsLengthBound, InitializeMembers, ChangeMembers};
+pub use members::{
+	Contains, ContainsLengthBound, SortedMembers, InitializeMembers, ChangeMembers, All, IsInVec,
+	AsContains,
+};
 
 mod validation;
 pub use validation::{
diff --git a/frame/support/src/traits/members.rs b/frame/support/src/traits/members.rs
index d3ce6786af8c..35748ca9c0c0 100644
--- a/frame/support/src/traits/members.rs
+++ b/frame/support/src/traits/members.rs
@@ -17,16 +17,28 @@
 
 //! Traits for dealing with the idea of membership.
 
-use sp_std::prelude::*;
+use sp_std::{prelude::*, marker::PhantomData};
 
 /// A trait for querying whether a type can be said to "contain" a value.
-pub trait Contains<T: Ord> {
+pub trait Contains<T> {
 	/// Return `true` if this "contains" the given value `t`.
-	fn contains(t: &T) -> bool { Self::sorted_members().binary_search(t).is_ok() }
+	fn contains(t: &T) -> bool;
+}
+
+/// A `Contains` implementation which always returns `true`.
+pub struct All<T>(PhantomData<T>);
+impl<T: Ord> Contains<T> for All<T> {
+	fn contains(_: &T) -> bool { true }
+}
 
+/// A trait for a set which can enumerate its members in order.
+pub trait SortedMembers<T: Ord> {
 	/// Get a vector of all members in the set, ordered.
 	fn sorted_members() -> Vec<T>;
 
+	/// Return `true` if this "contains" the given value `t`.
+	fn contains(t: &T) -> bool { Self::sorted_members().binary_search(t).is_ok() }
+
 	/// Get the number of items in the set.
 	fn count() -> usize { Self::sorted_members().len() }
 
@@ -38,6 +50,21 @@ pub trait Contains<T: Ord> {
 	fn add(_t: &T) { unimplemented!() }
 }
 
+/// Adapter struct for turning an `OrderedMembership` impl into a `Contains` impl.
+pub struct AsContains<OM>(PhantomData<(OM,)>);
+impl<T: Ord + Eq, OM: SortedMembers<T>> Contains<T> for AsContains<OM> {
+	fn contains(t: &T) -> bool { OM::contains(t) }
+}
+
+/// Trivial utility for implementing `Contains`/`OrderedMembership` with a `Vec`.
+pub struct IsInVec<T>(PhantomData<T>);
+impl<X: Eq, T: super::Get<Vec<X>>> Contains<X> for IsInVec<T> {
+	fn contains(t: &X) -> bool { T::get().contains(t) }
+}
+impl<X: Ord + PartialOrd, T: super::Get<Vec<X>>> SortedMembers<X> for IsInVec<T> {
+	fn sorted_members() -> Vec<X> { let mut r = T::get(); r.sort(); r }
+}
+
 /// A trait for querying bound for the length of an implementation of `Contains`
 pub trait ContainsLengthBound {
 	/// Minimum number of elements contained
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index d8a50f9f7a18..bd6ef5eb5094 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -87,7 +87,7 @@ use sp_core::{ChangesTrieConfiguration, storage::well_known_keys};
 use frame_support::{
 	Parameter, storage,
 	traits::{
-		Contains, Get, PalletInfo, OnNewAccount, OnKilledAccount, HandleLifetime,
+		SortedMembers, Get, PalletInfo, OnNewAccount, OnKilledAccount, HandleLifetime,
 		StoredMap, EnsureOrigin, OriginTrait, Filter,
 	},
 	weights::{
@@ -870,7 +870,7 @@ impl<
 pub struct EnsureSignedBy<Who, AccountId>(sp_std::marker::PhantomData<(Who, AccountId)>);
 impl<
 	O: Into<Result<RawOrigin<AccountId>, O>> + From<RawOrigin<AccountId>>,
-	Who: Contains<AccountId>,
+	Who: SortedMembers<AccountId>,
 	AccountId: PartialEq + Clone + Ord + Default,
 > EnsureOrigin<O> for EnsureSignedBy<Who, AccountId> {
 	type Success = AccountId;
diff --git a/frame/tips/src/lib.rs b/frame/tips/src/lib.rs
index 10b2b016837c..b31468797ce4 100644
--- a/frame/tips/src/lib.rs
+++ b/frame/tips/src/lib.rs
@@ -68,7 +68,7 @@ use frame_support::traits::{
 use sp_runtime::{ Percent, RuntimeDebug, traits::{
 	Zero, AccountIdConversion, Hash, BadOrigin
 }};
-use frame_support::traits::{Contains, ContainsLengthBound, OnUnbalanced, EnsureOrigin};
+use frame_support::traits::{SortedMembers, ContainsLengthBound, OnUnbalanced, EnsureOrigin};
 use codec::{Encode, Decode};
 use frame_system::{self as system, ensure_signed};
 pub use weights::WeightInfo;
@@ -86,7 +86,7 @@ pub trait Config: frame_system::Config + pallet_treasury::Config {
 	/// Origin from which tippers must come.
 	///
 	/// `ContainsLengthBound::max_len` must be cost free (i.e. no storage read or heavy operation).
-	type Tippers: Contains<Self::AccountId> + ContainsLengthBound;
+	type Tippers: SortedMembers<Self::AccountId> + ContainsLengthBound;
 
 	/// The period for which a tip remains open after is has achieved threshold tippers.
 	type TipCountdown: Get<Self::BlockNumber>;
diff --git a/frame/tips/src/tests.rs b/frame/tips/src/tests.rs
index 9524c136aafd..cb0d4e6c47b4 100644
--- a/frame/tips/src/tests.rs
+++ b/frame/tips/src/tests.rs
@@ -24,7 +24,7 @@ use super::*;
 use std::cell::RefCell;
 use frame_support::{
 	assert_noop, assert_ok, parameter_types,
-	weights::Weight, traits::Contains,
+	weights::Weight, traits::SortedMembers,
 	PalletId
 };
 use sp_runtime::Permill;
@@ -98,7 +98,7 @@ thread_local! {
 	static TEN_TO_FOURTEEN: RefCell<Vec<u128>> = RefCell::new(vec![10,11,12,13,14]);
 }
 pub struct TenToFourteen;
-impl Contains<u128> for TenToFourteen {
+impl SortedMembers<u128> for TenToFourteen {
 	fn sorted_members() -> Vec<u128> {
 		TEN_TO_FOURTEEN.with(|v| {
 			v.borrow().clone()

From 44433f73aea020d421f4e4e26c725ea0ed945eed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Mon, 12 Apr 2021 19:37:35 +0200
Subject: [PATCH 0633/1194] Fix `parameter_types!` macro (#8594)

Make it work with different kinds of parameter types when
`static` is one of them.
---
 frame/support/src/lib.rs | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 92ffe0cb0c24..deedf0b62186 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -379,21 +379,20 @@ macro_rules! parameter_types {
 		}
 	};
 	(
-		$(
-			$( #[ $attr:meta ] )*
-			$vis:vis static $name:ident: $type:ty = $value:expr;
-		)*
+		$( #[ $attr:meta ] )*
+		$vis:vis static $name:ident: $type:ty = $value:expr;
+		$( $rest:tt )*
 	) => (
 		$crate::parameter_types_impl_thread_local!(
-			$(
-				$( #[ $attr ] )*
-				$vis static $name: $type = $value;
-			)*
+			$( #[ $attr ] )*
+			$vis static $name: $type = $value;
 		);
+		$crate::parameter_types!( $( $rest )* );
 	);
 }
 
 #[cfg(not(feature = "std"))]
+#[doc(inline)]
 #[macro_export]
 macro_rules! parameter_types_impl_thread_local {
 	( $( $any:tt )* ) => {
@@ -402,6 +401,7 @@ macro_rules! parameter_types_impl_thread_local {
 }
 
 #[cfg(feature = "std")]
+#[doc(inline)]
 #[macro_export]
 macro_rules! parameter_types_impl_thread_local {
 	(
@@ -1217,6 +1217,12 @@ pub mod tests {
 			assert_eq!(300, StorageParameter::get());
 		})
 	}
+
+	parameter_types! {
+		pub const BlockHashCount: u64 = 250;
+		pub static Members: Vec<u64> = vec![];
+		pub const Foo: Option<u64> = None;
+	}
 }
 
 /// Prelude to be used alongside pallet macro, for ease of use.

From e31813b12c6ce69383a998a5b87e01c6aa990d94 Mon Sep 17 00:00:00 2001
From: Keith Yeung <kungfukeith11@gmail.com>
Date: Mon, 12 Apr 2021 11:40:20 -0700
Subject: [PATCH 0634/1194] Fix buggy string comparison in OCW pallet example
 (#8602)

---
 frame/example-offchain-worker/src/lib.rs | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/frame/example-offchain-worker/src/lib.rs b/frame/example-offchain-worker/src/lib.rs
index a3c1441e1367..1ec2591f5ec6 100644
--- a/frame/example-offchain-worker/src/lib.rs
+++ b/frame/example-offchain-worker/src/lib.rs
@@ -612,18 +612,17 @@ impl<T: Config> Pallet<T> {
 	/// Returns `None` when parsing failed or `Some(price in cents)` when parsing is successful.
 	fn parse_price(price_str: &str) -> Option<u32> {
 		let val = lite_json::parse_json(price_str);
-		let price = val.ok().and_then(|v| match v {
+		let price = match val.ok()? {
 			JsonValue::Object(obj) => {
-				let mut chars = "USD".chars();
-				obj.into_iter()
-					.find(|(k, _)| k.iter().all(|k| Some(*k) == chars.next()))
-					.and_then(|v| match v.1 {
-						JsonValue::Number(number) => Some(number),
-						_ => None,
-					})
+				let (_, v) = obj.into_iter()
+					.find(|(k, _)| k.iter().copied().eq("USD".chars()))?;
+				match v {
+					JsonValue::Number(number) => number,
+					_ => return None,
+				}
 			},
-			_ => None
-		})?;
+			_ => return None,
+		};
 
 		let exp = price.fraction_length.checked_sub(2).unwrap_or(0);
 		Some(price.integer as u32 * 100 + (price.fraction / 10_u64.pow(exp)) as u32)

From fa21ba6f8eb6fb6dcd1770d8d1303b7a60df0aeb Mon Sep 17 00:00:00 2001
From: Chris D'Costa <chris.dcosta@totemaccounting.com>
Date: Mon, 12 Apr 2021 20:43:22 +0200
Subject: [PATCH 0635/1194] #8597 Update features resolver wasm build (#8598)

---
 utils/wasm-builder/src/wasm_project.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/utils/wasm-builder/src/wasm_project.rs b/utils/wasm-builder/src/wasm_project.rs
index e0f805d4a2d7..61988a9229fd 100644
--- a/utils/wasm-builder/src/wasm_project.rs
+++ b/utils/wasm-builder/src/wasm_project.rs
@@ -258,6 +258,7 @@ fn create_project_cargo_toml(
 	package.insert("name".into(), format!("{}-wasm", crate_name).into());
 	package.insert("version".into(), "1.0.0".into());
 	package.insert("edition".into(), "2018".into());
+	package.insert("resolver".into(), "2".into());
 
 	wasm_workspace_toml.insert("package".into(), package.into());
 
@@ -416,7 +417,7 @@ fn build_project(project: &Path, default_rustflags: &str, cargo_cmd: CargoComman
 		env::var(crate::WASM_BUILD_RUSTFLAGS_ENV).unwrap_or_default(),
 	);
 
-	build_cmd.args(&["-Zfeatures=build_dep", "rustc", "--target=wasm32-unknown-unknown"])
+	build_cmd.args(&["rustc", "--target=wasm32-unknown-unknown"])
 		.arg(format!("--manifest-path={}", manifest_path.display()))
 		.env("RUSTFLAGS", rustflags)
 		// Unset the `CARGO_TARGET_DIR` to prevent a cargo deadlock (cargo locks a target dir exclusive).

From 3a8f1df9192c6ec5f21520c1815281ba18a5a9a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Mon, 12 Apr 2021 21:11:23 +0200
Subject: [PATCH 0636/1194] Pallet macro support `frame_system::Config` with
 args (#8606)

---
 .../procedural/src/pallet/parse/config.rs     |  4 ++++
 frame/support/test/tests/pallet.rs            | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/frame/support/procedural/src/pallet/parse/config.rs b/frame/support/procedural/src/pallet/parse/config.rs
index 045f2bff50e4..79d4680752b9 100644
--- a/frame/support/procedural/src/pallet/parse/config.rs
+++ b/frame/support/procedural/src/pallet/parse/config.rs
@@ -126,6 +126,10 @@ impl syn::parse::Parse for ConfigBoundParse {
 		input.parse::<syn::Token![::]>()?;
 		input.parse::<keyword::Config>()?;
 
+		if input.peek(syn::token::Lt) {
+			input.parse::<syn::AngleBracketedGenericArguments>()?;
+		}
+
 		Ok(Self(ident))
 	}
 }
diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index d78688c88c3e..24a4990ddec4 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -365,6 +365,25 @@ pub mod pallet2 {
 	}
 }
 
+/// Test that the supertrait check works when we pass some parameter to the `frame_system::Config`.
+#[frame_support::pallet]
+pub mod pallet3 {
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config<Origin = ()> {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(_);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+}
+
 frame_support::parameter_types!(
 	pub const MyGetParam: u32= 10;
 	pub const MyGetParam2: u32= 11;

From a382d702f569ea66e508df292fa1d75cfa39cae0 Mon Sep 17 00:00:00 2001
From: Denis Pisarev <denis.pisarev@parity.io>
Date: Tue, 13 Apr 2021 01:29:21 +0200
Subject: [PATCH 0637/1194] WIP: fix Simnet trigger (#8493)

* CI: trigger guard [skip ci]

* CI: variables and dotenv [skip ci]

* CI: correct variable for simnet trigger

* CI: correct rules for simnet trigger

* fix linting issue :)

* CI: trigger simnet via API

Co-authored-by: radupopa2010 <radupopa2010@yahoo.com>
---
 .gitlab-ci.yml                       | 36 ++++++++++++----------
 .maintain/gitlab/trigger_pipeline.sh | 45 ++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 16 deletions(-)
 create mode 100755 .maintain/gitlab/trigger_pipeline.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 16b0a00b160e..c0d783801448 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,6 @@ stages:
   - build
   - publish
   - deploy
-  - flaming-fir
 
 workflow:
   rules:
@@ -84,7 +83,6 @@ default:
     - if: $CI_PIPELINE_SOURCE == "web"
     - if: $CI_PIPELINE_SOURCE == "schedule"
     - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME == "tags"
     - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
     - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
 
@@ -95,7 +93,6 @@ default:
     - if: $CI_PIPELINE_SOURCE == "web"
     - if: $CI_PIPELINE_SOURCE == "schedule"
     - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME == "tags"
     - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
     - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
 
@@ -114,7 +111,6 @@ default:
       when: never
     - if: $CI_PIPELINE_SOURCE == "web"
     - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME == "tags"
     - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
     - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
       when: manual
@@ -127,7 +123,6 @@ default:
     - if: $CI_PIPELINE_SOURCE == "web"
     - if: $CI_PIPELINE_SOURCE == "schedule"
     - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME == "tags"
     - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
 
 .nightly-pipeline:                 &nightly-pipeline
@@ -337,7 +332,7 @@ test-linux-stable:                 &test-linux
   script:
     # this job runs all tests in former runtime-benchmarks, frame-staking and wasmtime tests
     - time cargo test --workspace --locked --release --verbose --features runtime-benchmarks --manifest-path bin/node/cli/Cargo.toml
-    - time cargo test -p frame-support-test --features=conditional-storage --manifest-path frame/support/test/Cargo.toml
+    - time cargo test -p frame-support-test --features=conditional-storage --manifest-path frame/support/test/Cargo.toml # does not reuse cache 1 min 44 sec
     - SUBSTRATE_TEST_TIMEOUT=1 time cargo test -p substrate-test-utils --release --verbose --locked -- --ignored timeout
     - sccache -s
 
@@ -348,7 +343,6 @@ unleash-check:
     - if: $CI_PIPELINE_SOURCE == "pipeline"
       when: never
     - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME == "tags"
     - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
   script:
     - cargo install cargo-unleash ${CARGO_UNLEASH_INSTALL_PARAMS}
@@ -584,15 +578,16 @@ build-rust-doc:
     - buildah info
     - buildah push --format=v2s2 "$IMAGE_NAME:$VERSION"
     - buildah push --format=v2s2 "$IMAGE_NAME:latest"
-    # pass artifacts to the trigget-simnet job
-    - echo "VERSION=${VERSION}" > build.env
-    - echo "TRIGGERER=${CI_PROJECT_NAME}" >> build.env
   after_script:
     - buildah logout "$IMAGE_NAME"
+    # pass artifacts to the trigger-simnet job
+    - echo "IMAGE_NAME=${IMAGE_NAME}" > ./artifacts/$PRODUCT/build.env
+    - echo "IMAGE_TAG=${VERSION}" >> ./artifacts/$PRODUCT/build.env
 
 publish-docker-substrate:
   stage:                           publish
   <<:                              *build-push-docker-image
+  <<:                              *build-refs
   needs:
     - job:                         build-linux-substrate
       artifacts:                   true
@@ -603,7 +598,7 @@ publish-docker-substrate:
     reports:
       # this artifact is used in trigger-simnet job
       # https://docs.gitlab.com/ee/ci/multi_project_pipelines.html#with-variable-inheritance
-      dotenv: artifacts/substrate/build.env
+      dotenv: ./artifacts/substrate/build.env
 
 publish-docker-subkey:
   stage:                           publish
@@ -716,10 +711,19 @@ deploy-prometheus-alerting-rules:
 
 trigger-simnet:
   stage:                           deploy
-  <<:                              *nightly-pipeline
+  image:                           paritytech/tools:latest
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "web" && $CI_COMMIT_REF_NAME == "master"
+    - if: $CI_COMMIT_REF_NAME == "master"
   needs:
     - job:                         publish-docker-substrate
-  trigger:
-    project:                       parity/simnet
-    branch:                        master
-    strategy:                      depend
+  # `build.env` brings here `$IMAGE_NAME` and `$IMAGE_TAG` (`$VERSION` here, 
+  # i.e. `2643-0.8.29-5f689e0a-6b24dc54`).
+  variables:
+    TRGR_PROJECT:                  ${CI_PROJECT_NAME}
+    TRGR_REF:                      ${CI_COMMIT_REF_NAME}
+    # simnet project ID
+    DWNSTRM_ID:                    332
+  script:
+    # API trigger for a simnet job
+    - ./scripts/gitlab/trigger_pipeline.sh
diff --git a/.maintain/gitlab/trigger_pipeline.sh b/.maintain/gitlab/trigger_pipeline.sh
new file mode 100755
index 000000000000..a2678bfa4875
--- /dev/null
+++ b/.maintain/gitlab/trigger_pipeline.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+set -eu
+# API trigger another project's pipeline
+curl --silent \
+    -X POST \
+    -F "token=${CI_JOB_TOKEN}" \
+    -F "ref=master" \
+    -F "variables[TRGR_PROJECT]=${TRGR_PROJECT}" \
+    -F "variables[TRGR_REF]=${TRGR_REF}" \
+    -F "variables[IMAGE_NAME]=${IMAGE_NAME}" \
+    -F "variables[IMAGE_TAG]=${IMAGE_TAG}" \
+    "https://${CI_SERVER_HOST}/api/v4/projects/${DWNSTRM_ID}/trigger/pipeline" | \
+        tee pipeline
+
+PIPELINE_ID=$(cat pipeline | jq ".id")
+echo "\nWaiting on ${PIPELINE_ID} status..."
+
+# This part polls for the triggered pipeline status, the native
+# `trigger` job does not return this status via API.
+# This is a workaround for a Gitlab bug, waits here until
+# https://gitlab.com/gitlab-org/gitlab/-/issues/326137 gets fixed.
+# The timeout is 360 curls with 8 sec interval, roughly an hour.
+
+function get_status() {
+    curl --silent \
+        --header "PRIVATE-TOKEN: ${PIPELINE_TOKEN}" \
+        "https://${CI_SERVER_HOST}/api/v4/projects/${DWNSTRM_ID}/pipelines/${PIPELINE_ID}" | \
+            jq --raw-output ".status";
+}
+
+for i in $(seq 1 360); do
+    STATUS=$(get_status);
+    echo "Triggered pipeline status is ${STATUS}";
+    if [[ ${STATUS} =~ ^(pending|running|created)$ ]]; then
+        echo "Busy...";
+    elif [[ ${STATUS} =~ ^(failed|canceled|skipped|manual)$ ]]; then
+        exit 1;
+    elif [[ ${STATUS} =~ ^(success)$ ]]; then
+        exit 0;
+    else
+        exit 1;
+    fi
+sleep 8;
+done

From c80cc4e9cb096c78877a5f3ddc349aa832c0d708 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Tue, 13 Apr 2021 11:30:13 +0200
Subject: [PATCH 0638/1194] Ensure inherent are first (#8173)

* impl

* fix tests

* impl in execute_block

* fix tests

* add a test in frame-executive

* fix some panic warning

* use trait to get call from extrinsic

* remove unused

* fix test

* fix testing

* fix tests

* return index of extrinsic on error

* fix test

* Update primitives/inherents/src/lib.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* address comments

rename trait, and refactor

* refactor + doc improvment

* fix tests

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
---
 Cargo.lock                                    |   1 +
 frame/authorship/src/lib.rs                   |   4 +
 frame/executive/Cargo.toml                    |   1 +
 frame/executive/src/lib.rs                    | 109 +++++++-
 .../procedural/src/construct_runtime/mod.rs   |   5 +-
 frame/support/src/inherent.rs                 | 262 +++++++++++++++---
 frame/support/src/lib.rs                      |   8 +
 frame/support/src/traits.rs                   |   3 +-
 frame/support/src/traits/misc.rs              |  37 +++
 frame/support/test/tests/instance.rs          |   8 +
 frame/support/test/tests/pallet.rs            |   4 +
 frame/support/test/tests/pallet_instance.rs   |   4 +
 .../inherent_check_inner_span.stderr          |   5 +-
 .../tests/pallet_with_name_trait_is_valid.rs  |   4 +
 frame/timestamp/src/lib.rs                    |   4 +
 primitives/inherents/src/lib.rs               |  21 +-
 primitives/runtime/src/testing.rs             |   8 +
 17 files changed, 427 insertions(+), 61 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index abb151282cf4..47fad18c364f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1779,6 +1779,7 @@ dependencies = [
  "parity-scale-codec",
  "serde",
  "sp-core",
+ "sp-inherents",
  "sp-io",
  "sp-runtime",
  "sp-std",
diff --git a/frame/authorship/src/lib.rs b/frame/authorship/src/lib.rs
index 5e9955f59f9d..da4b66f229f1 100644
--- a/frame/authorship/src/lib.rs
+++ b/frame/authorship/src/lib.rs
@@ -392,6 +392,10 @@ impl<T: Config> ProvideInherent for Module<T> {
 			},
 		}
 	}
+
+	fn is_inherent(call: &Self::Call) -> bool {
+		matches!(call, Call::set_uncles(_))
+	}
 }
 
 #[cfg(test)]
diff --git a/frame/executive/Cargo.toml b/frame/executive/Cargo.toml
index 6a0042308736..97c5a5ffdc76 100644
--- a/frame/executive/Cargo.toml
+++ b/frame/executive/Cargo.toml
@@ -31,6 +31,7 @@ pallet-indices = { version = "3.0.0", path = "../indices" }
 pallet-balances = { version = "3.0.0", path = "../balances" }
 pallet-transaction-payment = { version = "3.0.0", path = "../transaction-payment" }
 sp-version = { version = "3.0.0", path = "../../primitives/version" }
+sp-inherents = { version = "3.0.0", path = "../../primitives/inherents" }
 
 [features]
 default = ["std"]
diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index 97bdfbfdd526..0102fdea7c0f 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -119,7 +119,10 @@
 use sp_std::{prelude::*, marker::PhantomData};
 use frame_support::{
 	weights::{GetDispatchInfo, DispatchInfo, DispatchClass},
-	traits::{OnInitialize, OnIdle, OnFinalize, OnRuntimeUpgrade, OffchainWorker, ExecuteBlock},
+	traits::{
+		OnInitialize, OnIdle, OnFinalize, OnRuntimeUpgrade, OffchainWorker, ExecuteBlock,
+		EnsureInherentsAreFirst,
+	},
 	dispatch::PostDispatchInfo,
 };
 use sp_runtime::{
@@ -153,7 +156,7 @@ pub struct Executive<System, Block, Context, UnsignedValidator, AllPallets, OnRu
 );
 
 impl<
-	System: frame_system::Config,
+	System: frame_system::Config + EnsureInherentsAreFirst<Block>,
 	Block: traits::Block<Header=System::Header, Hash=System::Hash>,
 	Context: Default,
 	UnsignedValidator,
@@ -181,7 +184,7 @@ where
 }
 
 impl<
-		System: frame_system::Config,
+		System: frame_system::Config + EnsureInherentsAreFirst<Block>,
 		Block: traits::Block<Header = System::Header, Hash = System::Hash>,
 		Context: Default,
 		UnsignedValidator,
@@ -311,6 +314,10 @@ where
 			&& <frame_system::Pallet<System>>::block_hash(n - System::BlockNumber::one()) == *header.parent_hash(),
 			"Parent hash should be valid.",
 		);
+
+		if let Err(i) = System::ensure_inherents_are_first(block) {
+			panic!("Invalid inherent position for extrinsic at index {}", i);
+		}
 	}
 
 	/// Actually execute all transitions for `block`.
@@ -543,7 +550,7 @@ mod tests {
 	mod custom {
 		use frame_support::weights::{Weight, DispatchClass};
 		use sp_runtime::transaction_validity::{
-			UnknownTransaction, TransactionSource, TransactionValidity
+			UnknownTransaction, TransactionSource, TransactionValidity, TransactionValidityError,
 		};
 
 		pub trait Config: frame_system::Config {}
@@ -574,6 +581,11 @@ mod tests {
 					frame_system::ensure_root(origin)?;
 				}
 
+				#[weight = 0]
+				fn inherent_call(origin) {
+					let _ = frame_system::ensure_none(origin)?;
+				}
+
 				// module hooks.
 				// one with block number arg and one without
 				fn on_initialize(n: T::BlockNumber) -> Weight {
@@ -600,16 +612,29 @@ mod tests {
 				}
 
 				#[weight = 0]
-				fn calculate_storage_root(origin) {
+				fn calculate_storage_root(_origin) {
 					let root = sp_io::storage::root();
 					sp_io::storage::set("storage_root".as_bytes(), &root);
 				}
 			}
 		}
 
+		impl<T: Config> sp_inherents::ProvideInherent for Module<T> {
+			type Call = Call<T>;
+			type Error = sp_inherents::MakeFatalError<()>;
+			const INHERENT_IDENTIFIER: [u8; 8] = *b"test1234";
+			fn create_inherent(_data: &sp_inherents::InherentData) -> Option<Self::Call> {
+				None
+			}
+			fn is_inherent(call: &Self::Call) -> bool {
+				*call == Call::<T>::inherent_call()
+			}
+		}
+
 		impl<T: Config> sp_runtime::traits::ValidateUnsigned for Module<T> {
 			type Call = Call<T>;
 
+			// Inherent call is not validated as unsigned
 			fn validate_unsigned(
 				_source: TransactionSource,
 				call: &Self::Call,
@@ -618,6 +643,18 @@ mod tests {
 					Call::allowed_unsigned(..) => Ok(Default::default()),
 					_ => UnknownTransaction::NoUnsignedValidator.into(),
 				}
+
+			}
+
+			// Inherent call is accepted for being dispatched
+			fn pre_dispatch(
+				call: &Self::Call,
+			) -> Result<(), TransactionValidityError> {
+				match call {
+					Call::allowed_unsigned(..) => Ok(()),
+					Call::inherent_call(..) => Ok(()),
+					_ => Err(UnknownTransaction::NoUnsignedValidator.into()),
+				}
 			}
 		}
 	}
@@ -630,7 +667,7 @@ mod tests {
 		{
 			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 			Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-			Custom: custom::{Pallet, Call, ValidateUnsigned},
+			Custom: custom::{Pallet, Call, ValidateUnsigned, Inherent},
 		}
 	);
 
@@ -718,12 +755,7 @@ mod tests {
 	);
 	type TestXt = sp_runtime::testing::TestXt<Call, SignedExtra>;
 	type TestBlock = Block<TestXt>;
-	type TestUncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<
-		<Runtime as frame_system::Config>::AccountId,
-		<Runtime as frame_system::Config>::Call,
-		(),
-		SignedExtra,
-	>;
+	type TestUncheckedExtrinsic = TestXt;
 
 	// Will contain `true` when the custom runtime logic was called.
 	const CUSTOM_ON_RUNTIME_KEY: &[u8] = &*b":custom:on_runtime";
@@ -1227,4 +1259,57 @@ mod tests {
 			Executive::execute_block(Block::new(header, vec![xt]));
 		});
 	}
+
+	#[test]
+	#[should_panic(expected = "Invalid inherent position for extrinsic at index 1")]
+	fn invalid_inherent_position_fail() {
+		let xt1 = TestXt::new(Call::Balances(BalancesCall::transfer(33, 0)), sign_extra(1, 0, 0));
+		let xt2 = TestXt::new(Call::Custom(custom::Call::inherent_call()), None);
+
+		let header = new_test_ext(1).execute_with(|| {
+			// Let's build some fake block.
+			Executive::initialize_block(&Header::new(
+				1,
+				H256::default(),
+				H256::default(),
+				[69u8; 32].into(),
+				Digest::default(),
+			));
+
+			Executive::apply_extrinsic(xt1.clone()).unwrap().unwrap();
+			Executive::apply_extrinsic(xt2.clone()).unwrap().unwrap();
+
+			Executive::finalize_block()
+		});
+
+		new_test_ext(1).execute_with(|| {
+			Executive::execute_block(Block::new(header, vec![xt1, xt2]));
+		});
+	}
+
+	#[test]
+	fn valid_inherents_position_works() {
+		let xt1 = TestXt::new(Call::Custom(custom::Call::inherent_call()), None);
+		let xt2 = TestXt::new(Call::Balances(BalancesCall::transfer(33, 0)), sign_extra(1, 0, 0));
+
+		let header = new_test_ext(1).execute_with(|| {
+			// Let's build some fake block.
+			Executive::initialize_block(&Header::new(
+				1,
+				H256::default(),
+				H256::default(),
+				[69u8; 32].into(),
+				Digest::default(),
+			));
+
+			Executive::apply_extrinsic(xt1.clone()).unwrap().unwrap();
+			Executive::apply_extrinsic(xt2.clone()).unwrap().unwrap();
+
+			Executive::finalize_block()
+		});
+
+		new_test_ext(1).execute_with(|| {
+			Executive::execute_block(Block::new(header, vec![xt1, xt2]));
+		});
+	}
 }
diff --git a/frame/support/procedural/src/construct_runtime/mod.rs b/frame/support/procedural/src/construct_runtime/mod.rs
index 0951dbdea987..e14f90197f06 100644
--- a/frame/support/procedural/src/construct_runtime/mod.rs
+++ b/frame/support/procedural/src/construct_runtime/mod.rs
@@ -167,6 +167,7 @@ fn construct_runtime_parsed(definition: RuntimeDefinition) -> Result<TokenStream
 	let metadata = decl_runtime_metadata(&name, pallets.iter(), &scrate, &unchecked_extrinsic);
 	let outer_config = decl_outer_config(&name, pallets.iter(), &scrate);
 	let inherent = decl_outer_inherent(
+		&name,
 		&block,
 		&unchecked_extrinsic,
 		pallets.iter(),
@@ -235,6 +236,7 @@ fn decl_validate_unsigned<'a>(
 }
 
 fn decl_outer_inherent<'a>(
+	runtime: &'a Ident,
 	block: &'a syn::TypePath,
 	unchecked_extrinsic: &'a syn::TypePath,
 	pallet_declarations: impl Iterator<Item = &'a Pallet>,
@@ -251,7 +253,8 @@ fn decl_outer_inherent<'a>(
 		#scrate::impl_outer_inherent!(
 			impl Inherents where
 				Block = #block,
-				UncheckedExtrinsic = #unchecked_extrinsic
+				UncheckedExtrinsic = #unchecked_extrinsic,
+				Runtime = #runtime,
 			{
 				#(#pallets_tokens)*
 			}
diff --git a/frame/support/src/inherent.rs b/frame/support/src/inherent.rs
index 3c201dff29c2..87e489bd8f4d 100644
--- a/frame/support/src/inherent.rs
+++ b/frame/support/src/inherent.rs
@@ -20,8 +20,10 @@ pub use crate::sp_std::vec::Vec;
 #[doc(hidden)]
 pub use crate::sp_runtime::traits::{Block as BlockT, Extrinsic};
 #[doc(hidden)]
-pub use sp_inherents::{InherentData, ProvideInherent, CheckInherentsResult, IsFatalError};
-
+pub use sp_inherents::{
+	InherentData, ProvideInherent, CheckInherentsResult, IsFatalError, InherentIdentifier,
+	MakeFatalError,
+};
 
 /// Implement the outer inherent.
 /// All given modules need to implement `ProvideInherent`.
@@ -30,7 +32,11 @@ pub use sp_inherents::{InherentData, ProvideInherent, CheckInherentsResult, IsFa
 ///
 /// ```nocompile
 /// impl_outer_inherent! {
-///     impl Inherents where Block = Block, UncheckedExtrinsic = UncheckedExtrinsic {
+///     impl Inherents where
+///         Block = Block,
+///         UncheckedExtrinsic = UncheckedExtrinsic,
+///         Runtime = Runtime,
+///     {
 ///         timestamp,
 ///         consensus,
 ///         aura,
@@ -42,7 +48,8 @@ macro_rules! impl_outer_inherent {
 	(
 		impl Inherents where
 			Block = $block:ident,
-			UncheckedExtrinsic = $uncheckedextrinsic:ident
+			UncheckedExtrinsic = $uncheckedextrinsic:ident,
+			Runtime = $runtime:ident,
 		{
 			$( $module:ident, )*
 		}
@@ -56,16 +63,19 @@ macro_rules! impl_outer_inherent {
 		impl InherentDataExt for $crate::inherent::InherentData {
 			fn create_extrinsics(&self) ->
 				$crate::inherent::Vec<<$block as $crate::inherent::BlockT>::Extrinsic> {
-				use $crate::inherent::{ProvideInherent, Extrinsic};
+				use $crate::inherent::ProvideInherent;
 
 				let mut inherents = Vec::new();
 
 				$(
 					if let Some(inherent) = $module::create_inherent(self) {
-						inherents.push($uncheckedextrinsic::new(
+						let inherent = <$uncheckedextrinsic as $crate::inherent::Extrinsic>::new(
 							inherent.into(),
 							None,
-						).expect("Runtime UncheckedExtrinsic is not Opaque, so it has to return `Some`; qed"));
+						).expect("Runtime UncheckedExtrinsic is not Opaque, so it has to return \
+							`Some`; qed");
+
+						inherents.push(inherent);
 					}
 				)*
 
@@ -74,41 +84,64 @@ macro_rules! impl_outer_inherent {
 
 			fn check_extrinsics(&self, block: &$block) -> $crate::inherent::CheckInherentsResult {
 				use $crate::inherent::{ProvideInherent, IsFatalError};
-				use $crate::traits::IsSubType;
+				use $crate::traits::{IsSubType, ExtrinsicCall};
 				use $crate::sp_runtime::traits::Block as _;
 
 				let mut result = $crate::inherent::CheckInherentsResult::new();
+
 				for xt in block.extrinsics() {
+					// Inherents are before any other extrinsics.
+					// And signed extrinsics are not inherents.
 					if $crate::inherent::Extrinsic::is_signed(xt).unwrap_or(false) {
 						break
 					}
 
+					let mut is_inherent = false;
+
 					$({
-						if let Some(call) = IsSubType::<_>::is_sub_type(&xt.function) {
-							if let Err(e) = $module::check_inherent(call, self) {
-								result.put_error(
-									$module::INHERENT_IDENTIFIER, &e
-								).expect("There is only one fatal error; qed");
-								if e.is_fatal_error() {
-									return result
+						let call = <$uncheckedextrinsic as ExtrinsicCall>::call(xt);
+						if let Some(call) = IsSubType::<_>::is_sub_type(call) {
+							if $module::is_inherent(call) {
+								is_inherent = true;
+								if let Err(e) = $module::check_inherent(call, self) {
+									result.put_error(
+										$module::INHERENT_IDENTIFIER, &e
+									).expect("There is only one fatal error; qed");
+									if e.is_fatal_error() {
+										return result
+									}
 								}
 							}
 						}
 					})*
+
+					// Inherents are before any other extrinsics.
+					// No module marked it as inherent thus it is not.
+					if !is_inherent {
+						break
+					}
 				}
 
 				$(
 					match $module::is_inherent_required(self) {
 						Ok(Some(e)) => {
 							let found = block.extrinsics().iter().any(|xt| {
-								if $crate::inherent::Extrinsic::is_signed(xt).unwrap_or(false) {
-									return false
+								let is_signed = $crate::inherent::Extrinsic::is_signed(xt)
+									.unwrap_or(false);
+
+								if !is_signed {
+									let call = <
+										$uncheckedextrinsic as ExtrinsicCall
+									>::call(xt);
+									if let Some(call) = IsSubType::<_>::is_sub_type(call) {
+										$module::is_inherent(&call)
+									} else {
+										false
+									}
+								} else {
+									// Signed extrinsics are not inherents.
+									false
 								}
-
-								let call: Option<&<$module as ProvideInherent>::Call> =
-									xt.function.is_sub_type();
-
-								call.is_some()
 							});
 
 							if !found {
@@ -135,6 +168,46 @@ macro_rules! impl_outer_inherent {
 				result
 			}
 		}
+
+		impl $crate::traits::EnsureInherentsAreFirst<$block> for $runtime {
+			fn ensure_inherents_are_first(block: &$block) -> Result<(), u32> {
+				use $crate::inherent::ProvideInherent;
+				use $crate::traits::{IsSubType, ExtrinsicCall};
+				use $crate::sp_runtime::traits::Block as _;
+
+				let mut first_signed_observed = false;
+
+				for (i, xt) in block.extrinsics().iter().enumerate() {
+					let is_signed = $crate::inherent::Extrinsic::is_signed(xt).unwrap_or(false);
+
+					let is_inherent = if is_signed {
+						// Signed extrinsics are not inherents.
+						false
+					} else {
+						let mut is_inherent = false;
+						$({
+							let call = <$uncheckedextrinsic as ExtrinsicCall>::call(xt);
+							if let Some(call) = IsSubType::<_>::is_sub_type(call) {
+								if $module::is_inherent(&call) {
+									is_inherent = true;
+								}
+							}
+						})*
+						is_inherent
+					};
+
+					if !is_inherent {
+						first_signed_observed = true;
+					}
+
+					if first_signed_observed && is_inherent {
+						return Err(i as u32)
+					}
+				}
+
+				Ok(())
+			}
+		}
 	};
 }
 
@@ -142,7 +215,6 @@ macro_rules! impl_outer_inherent {
 mod tests {
 	use super::*;
 	use sp_runtime::{traits, testing::{Header, self}};
-	use crate::traits::IsSubType;
 
 	#[derive(codec::Encode, codec::Decode, Clone, PartialEq, Eq, Debug, serde::Serialize)]
 	enum Call {
@@ -162,7 +234,7 @@ mod tests {
 		}
 	}
 
-	impl IsSubType<CallTest> for Call {
+	impl crate::traits::IsSubType<CallTest> for Call {
 		fn is_sub_type(&self) -> Option<&CallTest> {
 			match self {
 				Self::Test(test) => Some(test),
@@ -171,7 +243,7 @@ mod tests {
 		}
 	}
 
-	impl IsSubType<CallTest2> for Call {
+	impl crate::traits::IsSubType<CallTest2> for Call {
 		fn is_sub_type(&self) -> Option<&CallTest2> {
 			match self {
 				Self::Test2(test) => Some(test),
@@ -182,13 +254,13 @@ mod tests {
 
 	#[derive(codec::Encode, codec::Decode, Clone, PartialEq, Eq, Debug, serde::Serialize)]
 	enum CallTest {
-		Something,
-		SomethingElse,
+		OptionalInherent(bool),
+		NotInherent,
 	}
 
 	#[derive(codec::Encode, codec::Decode, Clone, PartialEq, Eq, Debug, serde::Serialize)]
 	enum CallTest2 {
-		Something,
+		RequiredInherent,
 	}
 
 	struct ModuleTest;
@@ -198,15 +270,20 @@ mod tests {
 		const INHERENT_IDENTIFIER: sp_inherents::InherentIdentifier = *b"test1235";
 
 		fn create_inherent(_: &InherentData) -> Option<Self::Call> {
-			Some(CallTest::Something)
+			Some(CallTest::OptionalInherent(true))
 		}
 
 		fn check_inherent(call: &Self::Call, _: &InherentData) -> Result<(), Self::Error> {
 			match call {
-				CallTest::Something => Ok(()),
-				CallTest::SomethingElse => Err(().into()),
+				CallTest::OptionalInherent(true) => Ok(()),
+				CallTest::OptionalInherent(false) => Err(().into()),
+				_ => unreachable!("other calls are not inherents"),
 			}
 		}
+
+		fn is_inherent(call: &Self::Call) -> bool {
+			matches!(call, CallTest::OptionalInherent(_))
+		}
 	}
 
 	struct ModuleTest2;
@@ -216,18 +293,23 @@ mod tests {
 		const INHERENT_IDENTIFIER: sp_inherents::InherentIdentifier = *b"test1234";
 
 		fn create_inherent(_: &InherentData) -> Option<Self::Call> {
-			Some(CallTest2::Something)
+			Some(CallTest2::RequiredInherent)
 		}
 
-		fn is_inherent_required(_: &InherentData) -> Result<Option<Self::Error>, Self::Error> { 
+		fn is_inherent_required(_: &InherentData) -> Result<Option<Self::Error>, Self::Error> {
 			Ok(Some(().into()))
 		}
+
+		fn is_inherent(call: &Self::Call) -> bool {
+			matches!(call, CallTest2::RequiredInherent)
+		}
 	}
 
 	type Block = testing::Block<Extrinsic>;
 
 	#[derive(codec::Encode, codec::Decode, Clone, PartialEq, Eq, Debug, serde::Serialize)]
 	struct Extrinsic {
+		signed: bool,
 		function: Call,
 	}
 
@@ -235,15 +317,34 @@ mod tests {
 		type Call = Call;
 		type SignaturePayload = ();
 
-		fn new(function: Call, _: Option<()>) -> Option<Self> {
-			Some(Self { function })
+		fn new(function: Call, signed_data: Option<()>) -> Option<Self> {
+			Some(Self {
+				function,
+				signed: signed_data.is_some(),
+			})
+		}
+
+		fn is_signed(&self) -> Option<bool> {
+			Some(self.signed)
+		}
+	}
+
+	impl crate::traits::ExtrinsicCall for Extrinsic {
+		fn call(&self) -> &Self::Call {
+			&self.function
 		}
 	}
 
 	parity_util_mem::malloc_size_of_is_0!(Extrinsic);
 
+	struct Runtime;
+
 	impl_outer_inherent! {
-		impl Inherents where Block = Block, UncheckedExtrinsic = Extrinsic {
+		impl Inherents where
+			Block = Block,
+			UncheckedExtrinsic = Extrinsic,
+			Runtime = Runtime,
+		{
 			ModuleTest,
 			ModuleTest2,
 		}
@@ -254,8 +355,8 @@ mod tests {
 		let inherents = InherentData::new().create_extrinsics();
 
 		let expected = vec![
-			Extrinsic { function: Call::Test(CallTest::Something) },
-			Extrinsic { function: Call::Test2(CallTest2::Something) },
+			Extrinsic { function: Call::Test(CallTest::OptionalInherent(true)), signed: false },
+			Extrinsic { function: Call::Test2(CallTest2::RequiredInherent), signed: false },
 		];
 		assert_eq!(expected, inherents);
 	}
@@ -265,8 +366,8 @@ mod tests {
 		let block = Block::new(
 			Header::new_from_number(1),
 			vec![
-				Extrinsic { function: Call::Test2(CallTest2::Something) },
-				Extrinsic { function: Call::Test(CallTest::Something) },
+				Extrinsic { function: Call::Test2(CallTest2::RequiredInherent), signed: false },
+				Extrinsic { function: Call::Test(CallTest::OptionalInherent(true)), signed: false },
 			],
 		);
 
@@ -275,8 +376,8 @@ mod tests {
 		let block = Block::new(
 			Header::new_from_number(1),
 			vec![
-				Extrinsic { function: Call::Test2(CallTest2::Something) },
-				Extrinsic { function: Call::Test(CallTest::SomethingElse) },
+				Extrinsic { function: Call::Test2(CallTest2::RequiredInherent), signed: false },
+				Extrinsic { function: Call::Test(CallTest::OptionalInherent(false)), signed: false },
 			],
 		);
 
@@ -287,9 +388,84 @@ mod tests {
 	fn required_inherents_enforced() {
 		let block = Block::new(
 			Header::new_from_number(1),
-			vec![Extrinsic { function: Call::Test(CallTest::Something) }],
+			vec![
+				Extrinsic { function: Call::Test(CallTest::OptionalInherent(true)), signed: false }
+			],
 		);
 
 		assert!(InherentData::new().check_extrinsics(&block).fatal_error());
 	}
+
+	#[test]
+	fn signed_are_not_inherent() {
+		let block = Block::new(
+			Header::new_from_number(1),
+			vec![
+				Extrinsic { function: Call::Test2(CallTest2::RequiredInherent), signed: false },
+				// NOTE: checking this call would fail, but it is not checked as it is not an
+				// inherent, because it is signed.
+				Extrinsic { function: Call::Test(CallTest::OptionalInherent(false)), signed: true },
+			],
+		);
+
+		assert!(InherentData::new().check_extrinsics(&block).ok());
+
+		let block = Block::new(
+			Header::new_from_number(1),
+			vec![
+				// NOTE: this is not considered an inherent, thus block is failing because of
+				// missing required inherent.
+				Extrinsic { function: Call::Test2(CallTest2::RequiredInherent), signed: true },
+			],
+		);
+
+		assert_eq!(
+			InherentData::new().check_extrinsics(&block).into_errors().collect::<Vec<_>>(),
+			vec![(*b"test1234", vec![])],
+		);
+	}
+
+	#[test]
+	fn inherent_first_works() {
+		use crate::traits::EnsureInherentsAreFirst;
+		let block = Block::new(
+			Header::new_from_number(1),
+			vec![
+				Extrinsic { function: Call::Test2(CallTest2::RequiredInherent), signed: false },
+				Extrinsic { function: Call::Test(CallTest::OptionalInherent(true)), signed: false },
+				Extrinsic { function: Call::Test(CallTest::NotInherent), signed: false },
+				Extrinsic { function: Call::Test(CallTest::NotInherent), signed: false },
+			],
+		);
+
+		assert!(Runtime::ensure_inherents_are_first(&block).is_ok());
+	}
+
+	#[test]
+	fn inherent_cannot_be_placed_after_non_inherent() {
+		use crate::traits::EnsureInherentsAreFirst;
+		let block = Block::new(
+			Header::new_from_number(1),
+			vec![
+				Extrinsic { function: Call::Test2(CallTest2::RequiredInherent), signed: false },
+				Extrinsic { function: Call::Test(CallTest::NotInherent), signed: false },
+				// This inherent is placed after non inherent: invalid
+				Extrinsic { function: Call::Test(CallTest::OptionalInherent(true)), signed: false },
+			],
+		);
+
+		assert_eq!(Runtime::ensure_inherents_are_first(&block).err().unwrap(), 2);
+
+		let block = Block::new(
+			Header::new_from_number(1),
+			vec![
+				Extrinsic { function: Call::Test2(CallTest2::RequiredInherent), signed: false },
+				Extrinsic { function: Call::Test(CallTest::OptionalInherent(true)), signed: true },
+				// This inherent is placed after non inherent: invalid
+				Extrinsic { function: Call::Test(CallTest::OptionalInherent(true)), signed: false },
+			],
+		);
+
+		assert_eq!(Runtime::ensure_inherents_are_first(&block).err().unwrap(), 2);
+	}
 }
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index deedf0b62186..ef5f64cfc24a 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -1939,6 +1939,10 @@ pub mod pallet_prelude {
 /// 		fn create_inherent(_data: &InherentData) -> Option<Self::Call> {
 /// 			unimplemented!();
 /// 		}
+///
+/// 		fn is_inherent(_call: &Self::Call) -> bool {
+/// 			unimplemented!();
+/// 		}
 /// 	}
 ///
 /// 	// Regular rust code needed for implementing ProvideInherent trait
@@ -2066,6 +2070,10 @@ pub mod pallet_prelude {
 /// 		fn create_inherent(_data: &InherentData) -> Option<Self::Call> {
 /// 			unimplemented!();
 /// 		}
+///
+/// 		fn is_inherent(_call: &Self::Call) -> bool {
+/// 			unimplemented!();
+/// 		}
 /// 	}
 ///
 /// 	// Regular rust code needed for implementing ProvideInherent trait
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index 7288f6c0d2b2..c629990dd662 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -49,7 +49,8 @@ pub use filter::{
 mod misc;
 pub use misc::{
 	Len, Get, GetDefault, HandleLifetime, TryDrop, Time, UnixTime, IsType, IsSubType, ExecuteBlock,
-	SameOrOther, OnNewAccount, OnKilledAccount, OffchainWorker, GetBacking, Backing,
+	SameOrOther, OnNewAccount, OnKilledAccount, OffchainWorker, GetBacking, Backing, ExtrinsicCall,
+	EnsureInherentsAreFirst,
 };
 
 mod stored_map;
diff --git a/frame/support/src/traits/misc.rs b/frame/support/src/traits/misc.rs
index d5cc68840d13..d3010358dd88 100644
--- a/frame/support/src/traits/misc.rs
+++ b/frame/support/src/traits/misc.rs
@@ -284,3 +284,40 @@ pub trait GetBacking {
 	/// implicit motion. `None` if it does not.
 	fn get_backing(&self) -> Option<Backing>;
 }
+
+
+
+/// A trait to ensure the inherent are before non-inherent in a block.
+///
+/// This is typically implemented on runtime, through `construct_runtime!`.
+pub trait EnsureInherentsAreFirst<Block> {
+	/// Ensure the position of inherent is correct, i.e. they are before non-inherents.
+	///
+	/// On error return the index of the inherent with invalid position (counting from 0).
+	fn ensure_inherents_are_first(block: &Block) -> Result<(), u32>;
+}
+
+/// An extrinsic on which we can get access to call.
+pub trait ExtrinsicCall: sp_runtime::traits::Extrinsic {
+	/// Get the call of the extrinsic.
+	fn call(&self) -> &Self::Call;
+}
+
+#[cfg(feature = "std")]
+impl<Call, Extra> ExtrinsicCall for sp_runtime::testing::TestXt<Call, Extra> where
+	Call: codec::Codec + Sync + Send,
+{
+	fn call(&self) -> &Self::Call {
+		&self.call
+	}
+}
+
+impl<Address, Call, Signature, Extra> ExtrinsicCall
+for sp_runtime::generic::UncheckedExtrinsic<Address, Call, Signature, Extra>
+where
+	Extra: sp_runtime::traits::SignedExtension,
+{
+	fn call(&self) -> &Self::Call {
+		&self.function
+	}
+}
diff --git a/frame/support/test/tests/instance.rs b/frame/support/test/tests/instance.rs
index e0dd1d1891d2..dbffead8ad2b 100644
--- a/frame/support/test/tests/instance.rs
+++ b/frame/support/test/tests/instance.rs
@@ -122,6 +122,10 @@ mod module1 {
 		fn check_inherent(_: &Self::Call, _: &InherentData) -> std::result::Result<(), Self::Error> {
 			unimplemented!();
 		}
+
+		fn is_inherent(_call: &Self::Call) -> bool {
+			unimplemented!();
+		}
 	}
 }
 
@@ -182,6 +186,10 @@ mod module2 {
 		fn check_inherent(_call: &Self::Call, _data: &InherentData) -> std::result::Result<(), Self::Error> {
 			unimplemented!();
 		}
+
+		fn is_inherent(_call: &Self::Call) -> bool {
+			unimplemented!();
+		}
 	}
 }
 
diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index 24a4990ddec4..04e8b2a8f187 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -288,6 +288,10 @@ pub mod pallet {
 			T::AccountId::from(SomeType6); // Test for where clause
 			unimplemented!();
 		}
+
+		fn is_inherent(_call: &Self::Call) -> bool {
+			unimplemented!();
+		}
 	}
 
 	#[derive(codec::Encode, sp_runtime::RuntimeDebug)]
diff --git a/frame/support/test/tests/pallet_instance.rs b/frame/support/test/tests/pallet_instance.rs
index d71242e49e0f..b181fe0bd6ee 100644
--- a/frame/support/test/tests/pallet_instance.rs
+++ b/frame/support/test/tests/pallet_instance.rs
@@ -170,6 +170,10 @@ pub mod pallet {
 		fn create_inherent(_data: &InherentData) -> Option<Self::Call> {
 			unimplemented!();
 		}
+
+		fn is_inherent(_call: &Self::Call) -> bool {
+			unimplemented!();
+		}
 	}
 
 	#[derive(codec::Encode, sp_runtime::RuntimeDebug)]
diff --git a/frame/support/test/tests/pallet_ui/inherent_check_inner_span.stderr b/frame/support/test/tests/pallet_ui/inherent_check_inner_span.stderr
index 75a522889ebd..bc34c55241a7 100644
--- a/frame/support/test/tests/pallet_ui/inherent_check_inner_span.stderr
+++ b/frame/support/test/tests/pallet_ui/inherent_check_inner_span.stderr
@@ -1,10 +1,11 @@
-error[E0046]: not all trait items implemented, missing: `Call`, `Error`, `INHERENT_IDENTIFIER`, `create_inherent`
+error[E0046]: not all trait items implemented, missing: `Call`, `Error`, `INHERENT_IDENTIFIER`, `create_inherent`, `is_inherent`
   --> $DIR/inherent_check_inner_span.rs:19:2
    |
 19 |     impl<T: Config> ProvideInherent for Pallet<T> {}
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `Call`, `Error`, `INHERENT_IDENTIFIER`, `create_inherent` in implementation
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `Call`, `Error`, `INHERENT_IDENTIFIER`, `create_inherent`, `is_inherent` in implementation
    |
    = help: implement the missing item: `type Call = Type;`
    = help: implement the missing item: `type Error = Type;`
    = help: implement the missing item: `const INHERENT_IDENTIFIER: [u8; 8] = value;`
    = help: implement the missing item: `fn create_inherent(_: &InherentData) -> std::option::Option<<Self as ProvideInherent>::Call> { todo!() }`
+   = help: implement the missing item: `fn is_inherent(_: &<Self as ProvideInherent>::Call) -> bool { todo!() }`
diff --git a/frame/support/test/tests/pallet_with_name_trait_is_valid.rs b/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
index 9fc7055ce1bc..3d96fe24d94c 100644
--- a/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
+++ b/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
@@ -81,6 +81,10 @@ impl<T: Trait> sp_inherents::ProvideInherent for Module<T> {
 	fn check_inherent(_: &Self::Call, _: &sp_inherents::InherentData) -> std::result::Result<(), Self::Error> {
 		unimplemented!();
 	}
+
+	fn is_inherent(_call: &Self::Call) -> bool {
+		unimplemented!();
+	}
 }
 
 #[cfg(test)]
diff --git a/frame/timestamp/src/lib.rs b/frame/timestamp/src/lib.rs
index dabf5a93c13d..301d993c09b7 100644
--- a/frame/timestamp/src/lib.rs
+++ b/frame/timestamp/src/lib.rs
@@ -241,6 +241,10 @@ pub mod pallet {
 				Ok(())
 			}
 		}
+
+		fn is_inherent(call: &Self::Call) -> bool {
+			matches!(call, Call::set(_))
+		}
 	}
 }
 
diff --git a/primitives/inherents/src/lib.rs b/primitives/inherents/src/lib.rs
index 0110db5680a1..facc62081046 100644
--- a/primitives/inherents/src/lib.rs
+++ b/primitives/inherents/src/lib.rs
@@ -423,8 +423,10 @@ pub trait ProvideInherent {
 	///
 	/// - `Err(_)` indicates that this function failed and further operations should be aborted.
 	///
-	/// CAUTION: This check has a bug when used in pallets that also provide unsigned transactions.
-	/// See <https://github.com/paritytech/substrate/issues/6243> for details.
+	/// NOTE: If inherent is required then the runtime asserts that the block contains at least
+	/// one inherent for which:
+	/// * type is [`Self::Call`],
+	/// * [`Self::is_inherent`] returns true.
 	fn is_inherent_required(_: &InherentData) -> Result<Option<Self::Error>, Self::Error> { Ok(None) }
 
 	/// Check whether the given inherent is valid. Checking the inherent is optional and can be
@@ -433,9 +435,24 @@ pub trait ProvideInherent {
 	/// When checking an inherent, the first parameter represents the inherent that is actually
 	/// included in the block by its author. Whereas the second parameter represents the inherent
 	/// data that the verifying node calculates.
+	///
+	/// NOTE: A block can contains multiple inherent.
 	fn check_inherent(_: &Self::Call, _: &InherentData) -> Result<(), Self::Error> {
 		Ok(())
 	}
+
+	/// Return whether the call is an inherent call.
+	///
+	/// NOTE: Signed extrinsics are not inherent, but signed extrinsic with the given call variant
+	/// can be dispatched.
+	///
+	/// # Warning
+	///
+	/// In FRAME, inherent are enforced to be before other extrinsics, for this reason,
+	/// pallets with unsigned transactions **must ensure** that no unsigned transaction call
+	/// is an inherent call, when implementing `ValidateUnsigned::validate_unsigned`.
+	/// Otherwise block producer can produce invalid blocks by including them after non inherent.
+	fn is_inherent(call: &Self::Call) -> bool;
 }
 
 #[cfg(test)]
diff --git a/primitives/runtime/src/testing.rs b/primitives/runtime/src/testing.rs
index b6d2641f0108..f473dc7028f4 100644
--- a/primitives/runtime/src/testing.rs
+++ b/primitives/runtime/src/testing.rs
@@ -303,6 +303,14 @@ impl<Call: Codec + Sync + Send, Extra> traits::Extrinsic for TestXt<Call, Extra>
 	}
 }
 
+impl<Call, Extra> traits::ExtrinsicMetadata for TestXt<Call, Extra> where
+	Call: Codec + Sync + Send,
+	Extra: SignedExtension<AccountId=u64, Call=Call>,
+{
+	type SignedExtensions = Extra;
+	const VERSION: u8 = 0u8;
+}
+
 impl<Origin, Call, Extra> Applyable for TestXt<Call, Extra> where
 	Call: 'static + Sized + Send + Sync + Clone + Eq + Codec + Debug + Dispatchable<Origin=Origin>,
 	Extra: SignedExtension<AccountId=u64, Call=Call>,

From 22012826b1dc065aae71eb8ceae9645a216b912e Mon Sep 17 00:00:00 2001
From: Chris D'Costa <chris.dcosta@totemaccounting.com>
Date: Tue, 13 Apr 2021 12:10:14 +0200
Subject: [PATCH 0639/1194] Change i8 to u8 on WithdrawReasons #8586 (#8591)

---
 frame/support/src/traits/tokens/misc.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frame/support/src/traits/tokens/misc.rs b/frame/support/src/traits/tokens/misc.rs
index 02f7ba384bd0..9871123abd59 100644
--- a/frame/support/src/traits/tokens/misc.rs
+++ b/frame/support/src/traits/tokens/misc.rs
@@ -126,7 +126,7 @@ pub enum BalanceStatus {
 bitflags::bitflags! {
 	/// Reasons for moving funds out of an account.
 	#[derive(Encode, Decode)]
-	pub struct WithdrawReasons: i8 {
+	pub struct WithdrawReasons: u8 {
 		/// In order to pay for (system) transaction costs.
 		const TRANSACTION_PAYMENT = 0b00000001;
 		/// In order to transfer ownership.

From 62eca6c35ff57ac545fca6ff0466ca4b368fbd3f Mon Sep 17 00:00:00 2001
From: Falco Hirschenberger <falco.hirschenberger@gmail.com>
Date: Tue, 13 Apr 2021 12:44:27 +0200
Subject: [PATCH 0640/1194] Change assert(is_err()) to assert_noop to check
 state consistency on errors (#8587)

* Change is_err() asserts in tests to assert_noop to check state consistency

fixes #8545

* Update frame/transaction-payment/src/lib.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Update frame/contracts/src/exec.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Update frame/democracy/src/benchmarking.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Update frame/transaction-payment/src/lib.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Don't assert no-changing state.

see: https://github.com/paritytech/substrate/pull/8587#issuecomment-817137906

* fix expected error

* Fix non-extrinsic-call asserts

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 frame/contracts/src/exec.rs                   |  8 ++-
 frame/democracy/src/benchmarking.rs           | 23 ++++---
 frame/democracy/src/tests/decoders.rs         |  9 +--
 .../democracy/src/tests/external_proposing.rs |  2 +-
 frame/democracy/src/tests/public_proposals.rs |  4 +-
 frame/democracy/src/tests/voting.rs           |  4 +-
 .../src/unsigned.rs                           | 14 ++---
 frame/executive/src/lib.rs                    |  6 +-
 frame/grandpa/src/tests.rs                    | 47 ++++++++++----
 frame/system/src/extensions/check_nonce.rs    | 22 +++++--
 frame/system/src/extensions/check_weight.rs   | 62 +++++++------------
 frame/system/src/tests.rs                     | 18 +++---
 frame/transaction-payment/src/lib.rs          | 38 +++++-------
 13 files changed, 142 insertions(+), 115 deletions(-)

diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index 27f70dea8c59..4649c12018b7 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -937,7 +937,7 @@ mod tests {
 	use super::*;
 	use crate::{
 		gas::GasMeter, tests::{ExtBuilder, Test, Event as MetaEvent},
-		storage::Storage,
+		storage::{Storage, ContractAbsentError},
 		tests::{
 			ALICE, BOB, CHARLIE,
 			test_utils::{place_contract, set_balance, get_balance},
@@ -945,6 +945,7 @@ mod tests {
 		exec::ExportedFunction::*,
 		Error, Weight, CurrentSchedule,
 	};
+	use frame_support::assert_noop;
 	use sp_runtime::DispatchError;
 	use assert_matches::assert_matches;
 	use std::{cell::RefCell, collections::HashMap, rc::Rc};
@@ -1571,7 +1572,10 @@ mod tests {
 			);
 
 			// Check that the account has not been created.
-			assert!(Storage::<Test>::code_hash(&instantiated_contract_address).is_err());
+			assert_noop!(
+				Storage::<Test>::code_hash(&instantiated_contract_address),
+				ContractAbsentError,
+			);
 			assert!(events().is_empty());
 		});
 	}
diff --git a/frame/democracy/src/benchmarking.rs b/frame/democracy/src/benchmarking.rs
index 40bc99ec12e0..78bf9863fd14 100644
--- a/frame/democracy/src/benchmarking.rs
+++ b/frame/democracy/src/benchmarking.rs
@@ -21,8 +21,9 @@ use super::*;
 
 use frame_benchmarking::{benchmarks, account, whitelist_account, impl_benchmark_test_suite};
 use frame_support::{
-	IterableStorageMap,
-	traits::{Currency, Get, EnsureOrigin, OnInitialize, UnfilteredDispatchable, schedule::DispatchTime},
+	assert_noop, assert_ok, IterableStorageMap,
+	traits::{Currency, Get, EnsureOrigin, OnInitialize, UnfilteredDispatchable,
+        schedule::DispatchTime},
 };
 use frame_system::{RawOrigin, Pallet as System, self, EventRecord};
 use sp_runtime::traits::{Bounded, One};
@@ -206,11 +207,14 @@ benchmarks! {
 		let origin = T::CancellationOrigin::successful_origin();
 		let referendum_index = add_referendum::<T>(0)?;
 		let call = Call::<T>::emergency_cancel(referendum_index);
-		assert!(Democracy::<T>::referendum_status(referendum_index).is_ok());
+		assert_ok!(Democracy::<T>::referendum_status(referendum_index));
 	}: { call.dispatch_bypass_filter(origin)? }
 	verify {
 		// Referendum has been canceled
-		assert!(Democracy::<T>::referendum_status(referendum_index).is_err());
+		assert_noop!(
+			Democracy::<T>::referendum_status(referendum_index),
+			Error::<T>::ReferendumInvalid,
+		);
 	}
 
 	blacklist {
@@ -224,18 +228,23 @@ benchmarks! {
 
 		// Place our proposal in the external queue, too.
 		let hash = T::Hashing::hash_of(&0);
-		assert!(Democracy::<T>::external_propose(T::ExternalOrigin::successful_origin(), hash.clone()).is_ok());
+		assert_ok!(
+            Democracy::<T>::external_propose(T::ExternalOrigin::successful_origin(), hash.clone())
+        );
 
 		// Add a referendum of our proposal.
 		let referendum_index = add_referendum::<T>(0)?;
-		assert!(Democracy::<T>::referendum_status(referendum_index).is_ok());
+		assert_ok!(Democracy::<T>::referendum_status(referendum_index));
 
 		let call = Call::<T>::blacklist(hash, Some(referendum_index));
 		let origin = T::BlacklistOrigin::successful_origin();
 	}: { call.dispatch_bypass_filter(origin)? }
 	verify {
 		// Referendum has been canceled
-		assert!(Democracy::<T>::referendum_status(referendum_index).is_err());
+		assert_noop!(
+            Democracy::<T>::referendum_status(referendum_index),
+            Error::<T>::ReferendumInvalid
+        );
 	}
 
 	// Worst case scenario, we external propose a previously blacklisted proposal
diff --git a/frame/democracy/src/tests/decoders.rs b/frame/democracy/src/tests/decoders.rs
index 52b61d8d9e7d..0331ea393447 100644
--- a/frame/democracy/src/tests/decoders.rs
+++ b/frame/democracy/src/tests/decoders.rs
@@ -58,12 +58,12 @@ fn pre_image() {
 		let key = Default::default();
 		let missing = PreimageStatus::Missing(0);
 		Preimages::<Test>::insert(key, missing);
-		assert!(Democracy::pre_image_data_len(key).is_err());
+		assert_noop!(Democracy::pre_image_data_len(key), Error::<Test>::PreimageMissing);
 		assert_eq!(Democracy::check_pre_image_is_missing(key), Ok(()));
 
 		Preimages::<Test>::remove(key);
-		assert!(Democracy::pre_image_data_len(key).is_err());
-		assert!(Democracy::check_pre_image_is_missing(key).is_err());
+		assert_noop!(Democracy::pre_image_data_len(key), Error::<Test>::PreimageMissing);
+		assert_noop!(Democracy::check_pre_image_is_missing(key), Error::<Test>::NotImminent);
 
 		for l in vec![0, 10, 100, 1000u32] {
 			let available = PreimageStatus::Available{
@@ -76,7 +76,8 @@ fn pre_image() {
 
 			Preimages::<Test>::insert(key, available);
 			assert_eq!(Democracy::pre_image_data_len(key), Ok(l));
-			assert!(Democracy::check_pre_image_is_missing(key).is_err());
+			assert_noop!(Democracy::check_pre_image_is_missing(key),
+				Error::<Test>::DuplicatePreimage);
 		}
 	})
 }
diff --git a/frame/democracy/src/tests/external_proposing.rs b/frame/democracy/src/tests/external_proposing.rs
index ff1a7a87da85..37654a5e9146 100644
--- a/frame/democracy/src/tests/external_proposing.rs
+++ b/frame/democracy/src/tests/external_proposing.rs
@@ -93,7 +93,7 @@ fn external_blacklisting_should_work() {
 		assert_ok!(Democracy::blacklist(Origin::root(), hash, None));
 
 		fast_forward_to(2);
-		assert!(Democracy::referendum_status(0).is_err());
+		assert_noop!(Democracy::referendum_status(0), Error::<Test>::ReferendumInvalid);
 
 		assert_noop!(
 			Democracy::external_propose(
diff --git a/frame/democracy/src/tests/public_proposals.rs b/frame/democracy/src/tests/public_proposals.rs
index 4785ef0a8946..4a4827ac7e9c 100644
--- a/frame/democracy/src/tests/public_proposals.rs
+++ b/frame/democracy/src/tests/public_proposals.rs
@@ -129,9 +129,9 @@ fn blacklisting_should_work() {
 		fast_forward_to(2);
 
 		let hash = set_balance_proposal_hash(4);
-		assert!(Democracy::referendum_status(0).is_ok());
+		assert_ok!(Democracy::referendum_status(0));
 		assert_ok!(Democracy::blacklist(Origin::root(), hash, Some(0)));
-		assert!(Democracy::referendum_status(0).is_err());
+		assert_noop!(Democracy::referendum_status(0), Error::<Test>::ReferendumInvalid);
 	});
 }
 
diff --git a/frame/democracy/src/tests/voting.rs b/frame/democracy/src/tests/voting.rs
index 207085ceb570..13072ebf87b1 100644
--- a/frame/democracy/src/tests/voting.rs
+++ b/frame/democracy/src/tests/voting.rs
@@ -80,12 +80,12 @@ fn single_proposal_should_work() {
 		fast_forward_to(3);
 
 		// referendum still running
-		assert!(Democracy::referendum_status(0).is_ok());
+		assert_ok!(Democracy::referendum_status(0));
 
 		// referendum runs during 2 and 3, ends @ start of 4.
 		fast_forward_to(4);
 
-		assert!(Democracy::referendum_status(0).is_err());
+		assert_noop!(Democracy::referendum_status(0), Error::<Test>::ReferendumInvalid);
 		assert!(pallet_scheduler::Agenda::<Test>::get(6)[0].is_some());
 
 		// referendum passes and wait another two blocks for enactment.
diff --git a/frame/election-provider-multi-phase/src/unsigned.rs b/frame/election-provider-multi-phase/src/unsigned.rs
index b54a7d75a0a2..6b0d237c6e0a 100644
--- a/frame/election-provider-multi-phase/src/unsigned.rs
+++ b/frame/election-provider-multi-phase/src/unsigned.rs
@@ -832,20 +832,20 @@ mod tests {
 			assert!(MultiPhase::try_acquire_offchain_lock(25).is_ok());
 
 			// next block: rejected.
-			assert!(MultiPhase::try_acquire_offchain_lock(26).is_err());
+			assert_noop!(MultiPhase::try_acquire_offchain_lock(26), "recently executed.");
 
 			// allowed after `OFFCHAIN_REPEAT`
 			assert!(MultiPhase::try_acquire_offchain_lock((26 + OFFCHAIN_REPEAT).into()).is_ok());
 
 			// a fork like situation: re-execute last 3.
-			assert!(
-				MultiPhase::try_acquire_offchain_lock((26 + OFFCHAIN_REPEAT - 3).into()).is_err()
+			assert_noop!(
+				MultiPhase::try_acquire_offchain_lock((26 + OFFCHAIN_REPEAT - 3).into()), "fork."
 			);
-			assert!(
-				MultiPhase::try_acquire_offchain_lock((26 + OFFCHAIN_REPEAT - 2).into()).is_err()
+			assert_noop!(
+				MultiPhase::try_acquire_offchain_lock((26 + OFFCHAIN_REPEAT - 2).into()), "fork."
 			);
-			assert!(
-				MultiPhase::try_acquire_offchain_lock((26 + OFFCHAIN_REPEAT - 1).into()).is_err()
+			assert_noop!(
+				MultiPhase::try_acquire_offchain_lock((26 + OFFCHAIN_REPEAT - 1).into()), "fork."
 			);
 		})
 	}
diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index 0102fdea7c0f..bc2783f76b5d 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -535,7 +535,7 @@ mod tests {
 		},
 	};
 	use frame_support::{
-		parameter_types,
+		assert_err, parameter_types,
 		weights::{Weight, RuntimeDbWeight, IdentityFee, WeightToFeePolynomial},
 		traits::{Currency, LockIdentifier, LockableCurrency, WithdrawReasons},
 	};
@@ -889,7 +889,9 @@ mod tests {
 				[69u8; 32].into(),
 				Digest::default(),
 			));
-			assert!(Executive::apply_extrinsic(xt).is_err());
+			assert_err!(Executive::apply_extrinsic(xt),
+				TransactionValidityError::Invalid(InvalidTransaction::Future)
+			);
 			assert_eq!(<frame_system::Pallet<Runtime>>::extrinsic_index(), Some(0));
 		});
 	}
diff --git a/frame/grandpa/src/tests.rs b/frame/grandpa/src/tests.rs
index 50462d33472a..92d2c6c751a2 100644
--- a/frame/grandpa/src/tests.rs
+++ b/frame/grandpa/src/tests.rs
@@ -24,7 +24,7 @@ use crate::mock::*;
 use codec::{Decode, Encode};
 use fg_primitives::ScheduledChange;
 use frame_support::{
-	assert_err, assert_ok,
+	assert_err, assert_ok, assert_noop,
 	traits::{Currency, OnFinalize, OneSessionHandler},
 	weights::{GetDispatchInfo, Pays},
 };
@@ -100,21 +100,27 @@ fn cannot_schedule_change_when_one_pending() {
 		initialize_block(1, Default::default());
 		Grandpa::schedule_change(to_authorities(vec![(4, 1), (5, 1), (6, 1)]), 1, None).unwrap();
 		assert!(<PendingChange<Test>>::exists());
-		assert!(Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, None).is_err());
+		assert_noop!(
+			Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, None),
+			Error::<Test>::ChangePending
+		);
 
 		Grandpa::on_finalize(1);
 		let header = System::finalize();
 
 		initialize_block(2, header.hash());
 		assert!(<PendingChange<Test>>::exists());
-		assert!(Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, None).is_err());
+		assert_noop!(
+			Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, None),
+			Error::<Test>::ChangePending
+		);
 
 		Grandpa::on_finalize(2);
 		let header = System::finalize();
 
 		initialize_block(3, header.hash());
 		assert!(!<PendingChange<Test>>::exists());
-		assert!(Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, None).is_ok());
+		assert_ok!(Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, None));
 
 		Grandpa::on_finalize(3);
 		let _header = System::finalize();
@@ -148,7 +154,10 @@ fn dispatch_forced_change() {
 		).unwrap();
 
 		assert!(<PendingChange<Test>>::exists());
-		assert!(Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, Some(0)).is_err());
+		assert_noop!(
+			Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, Some(0)),
+			Error::<Test>::ChangePending
+		);
 
 		Grandpa::on_finalize(1);
 		let mut header = System::finalize();
@@ -157,8 +166,14 @@ fn dispatch_forced_change() {
 			initialize_block(i, header.hash());
 			assert!(<PendingChange<Test>>::get().unwrap().forced.is_some());
 			assert_eq!(Grandpa::next_forced(), Some(11));
-			assert!(Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, None).is_err());
-			assert!(Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, Some(0)).is_err());
+			assert_noop!(
+				Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, None),
+				Error::<Test>::ChangePending
+			);
+			assert_noop!(
+				Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, Some(0)),
+				Error::<Test>::ChangePending
+			);
 
 			Grandpa::on_finalize(i);
 			header = System::finalize();
@@ -170,7 +185,7 @@ fn dispatch_forced_change() {
 			initialize_block(7, header.hash());
 			assert!(!<PendingChange<Test>>::exists());
 			assert_eq!(Grandpa::grandpa_authorities(), to_authorities(vec![(4, 1), (5, 1), (6, 1)]));
-			assert!(Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, None).is_ok());
+			assert_ok!(Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, None));
 			Grandpa::on_finalize(7);
 			header = System::finalize();
 		}
@@ -180,7 +195,10 @@ fn dispatch_forced_change() {
 			initialize_block(8, header.hash());
 			assert!(<PendingChange<Test>>::exists());
 			assert_eq!(Grandpa::grandpa_authorities(), to_authorities(vec![(4, 1), (5, 1), (6, 1)]));
-			assert!(Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, None).is_err());
+			assert_noop!(
+				Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, None),
+				Error::<Test>::ChangePending
+			);
 			Grandpa::on_finalize(8);
 			header = System::finalize();
 		}
@@ -192,7 +210,10 @@ fn dispatch_forced_change() {
 			assert!(!<PendingChange<Test>>::exists());
 			assert_eq!(Grandpa::grandpa_authorities(), to_authorities(vec![(5, 1)]));
 			assert_eq!(Grandpa::next_forced(), Some(11));
-			assert!(Grandpa::schedule_change(to_authorities(vec![(5, 1), (6, 1)]), 5, Some(0)).is_err());
+			assert_noop!(
+				Grandpa::schedule_change(to_authorities(vec![(5, 1), (6, 1)]), 5, Some(0)),
+				Error::<Test>::TooSoon
+			);
 			Grandpa::on_finalize(i);
 			header = System::finalize();
 		}
@@ -200,7 +221,7 @@ fn dispatch_forced_change() {
 		{
 			initialize_block(11, header.hash());
 			assert!(!<PendingChange<Test>>::exists());
-			assert!(Grandpa::schedule_change(to_authorities(vec![(5, 1), (6, 1), (7, 1)]), 5, Some(0)).is_ok());
+			assert_ok!(Grandpa::schedule_change(to_authorities(vec![(5, 1), (6, 1), (7, 1)]), 5, Some(0)));
 			assert_eq!(Grandpa::next_forced(), Some(21));
 			Grandpa::on_finalize(11);
 			header = System::finalize();
@@ -231,7 +252,7 @@ fn schedule_pause_only_when_live() {
 		initialize_block(2, Default::default());
 
 		// signaling a pause now should fail
-		assert!(Grandpa::schedule_pause(1).is_err());
+		assert_noop!(Grandpa::schedule_pause(1), Error::<Test>::PauseFailed);
 
 		Grandpa::on_finalize(2);
 		let _ = System::finalize();
@@ -250,7 +271,7 @@ fn schedule_resume_only_when_paused() {
 		initialize_block(1, Default::default());
 
 		// the set is currently live, resuming it is an error
-		assert!(Grandpa::schedule_resume(1).is_err());
+		assert_noop!(Grandpa::schedule_resume(1), Error::<Test>::ResumeFailed);
 
 		assert_eq!(
 			Grandpa::state(),
diff --git a/frame/system/src/extensions/check_nonce.rs b/frame/system/src/extensions/check_nonce.rs
index 3cb74a7ed918..cb25c3c02788 100644
--- a/frame/system/src/extensions/check_nonce.rs
+++ b/frame/system/src/extensions/check_nonce.rs
@@ -120,6 +120,7 @@ impl<T: Config> SignedExtension for CheckNonce<T> where
 mod tests {
 	use super::*;
 	use crate::mock::{Test, new_test_ext, CALL};
+	use frame_support::{assert_noop, assert_ok};
 
 	#[test]
 	fn signed_ext_check_nonce_works() {
@@ -134,14 +135,23 @@ mod tests {
 			let info = DispatchInfo::default();
 			let len = 0_usize;
 			// stale
-			assert!(CheckNonce::<Test>(0).validate(&1, CALL, &info, len).is_err());
-			assert!(CheckNonce::<Test>(0).pre_dispatch(&1, CALL, &info, len).is_err());
+			assert_noop!(
+				CheckNonce::<Test>(0).validate(&1, CALL, &info, len),
+				InvalidTransaction::Stale
+			);
+			assert_noop!(
+				CheckNonce::<Test>(0).pre_dispatch(&1, CALL, &info, len),
+				InvalidTransaction::Stale
+			);
 			// correct
-			assert!(CheckNonce::<Test>(1).validate(&1, CALL, &info, len).is_ok());
-			assert!(CheckNonce::<Test>(1).pre_dispatch(&1, CALL, &info, len).is_ok());
+			assert_ok!(CheckNonce::<Test>(1).validate(&1, CALL, &info, len));
+			assert_ok!(CheckNonce::<Test>(1).pre_dispatch(&1, CALL, &info, len));
 			// future
-			assert!(CheckNonce::<Test>(5).validate(&1, CALL, &info, len).is_ok());
-			assert!(CheckNonce::<Test>(5).pre_dispatch(&1, CALL, &info, len).is_err());
+			assert_ok!(CheckNonce::<Test>(5).validate(&1, CALL, &info, len));
+			assert_noop!(
+				CheckNonce::<Test>(5).pre_dispatch(&1, CALL, &info, len),
+				InvalidTransaction::Future
+			);
 		})
 	}
 }
diff --git a/frame/system/src/extensions/check_weight.rs b/frame/system/src/extensions/check_weight.rs
index a4ebeaea30c2..e01c91317615 100644
--- a/frame/system/src/extensions/check_weight.rs
+++ b/frame/system/src/extensions/check_weight.rs
@@ -26,7 +26,7 @@ use sp_runtime::{
 	DispatchResult,
 };
 use frame_support::{
-	traits::{Get},
+	traits::Get,
 	weights::{PostDispatchInfo, DispatchInfo, DispatchClass, priority::FrameTransactionPriority},
 };
 
@@ -281,8 +281,7 @@ mod tests {
 	use crate::{BlockWeight, AllExtrinsicsLen};
 	use crate::mock::{Test, CALL, new_test_ext, System};
 	use sp_std::marker::PhantomData;
-	use frame_support::{assert_ok, assert_noop};
-	use frame_support::weights::{Weight, Pays};
+	use frame_support::{assert_err, assert_ok, weights::{Weight, Pays}};
 
 	fn block_weights() -> crate::limits::BlockWeights {
 		<Test as crate::Config>::BlockWeights::get()
@@ -335,11 +334,7 @@ mod tests {
 				..Default::default()
 			};
 			let len = 0_usize;
-
-			assert_noop!(
-				CheckWeight::<Test>::do_validate(&max, len),
-				InvalidTransaction::ExhaustsResources
-			);
+			assert_err!(CheckWeight::<Test>::do_validate(&max, len), InvalidTransaction::ExhaustsResources);
 		});
 	}
 
@@ -371,10 +366,7 @@ mod tests {
 					..Default::default()
 				})
 			);
-			assert_noop!(
-				CheckWeight::<Test>::do_validate(&max, len),
-				InvalidTransaction::ExhaustsResources
-			);
+			assert_err!(CheckWeight::<Test>::do_validate(&max, len), InvalidTransaction::ExhaustsResources);
 		});
 	}
 
@@ -437,15 +429,13 @@ mod tests {
 			let dispatch_operational = DispatchInfo { weight: 251, class: DispatchClass::Operational, ..Default::default() };
 			let len = 0_usize;
 
-			assert_noop!(
-				CheckWeight::<Test>::do_pre_dispatch(&dispatch_normal, len),
+			assert_err!( CheckWeight::<Test>::do_pre_dispatch(&dispatch_normal, len),
 				InvalidTransaction::ExhaustsResources
 			);
 			// Thank goodness we can still do an operational transaction to possibly save the blockchain.
 			assert_ok!(CheckWeight::<Test>::do_pre_dispatch(&dispatch_operational, len));
 			// Not too much though
-			assert_noop!(
-				CheckWeight::<Test>::do_pre_dispatch(&dispatch_operational, len),
+			assert_err!(CheckWeight::<Test>::do_pre_dispatch(&dispatch_operational, len),
 				InvalidTransaction::ExhaustsResources
 			);
 			// Even with full block, validity of single transaction should be correct.
@@ -466,15 +456,19 @@ mod tests {
 				current_weight.set(normal_limit, DispatchClass::Normal)
 			});
 			// will not fit.
-			assert!(CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &normal, len).is_err());
+			assert_err!(CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &normal, len),
+				InvalidTransaction::ExhaustsResources
+			);
 			// will fit.
-			assert!(CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &op, len).is_ok());
+			assert_ok!(CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &op, len));
 
 			// likewise for length limit.
 			let len = 100_usize;
 			AllExtrinsicsLen::<Test>::put(normal_length_limit());
-			assert!(CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &normal, len).is_err());
-			assert!(CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &op, len).is_ok());
+			assert_err!(CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &normal, len),
+				InvalidTransaction::ExhaustsResources
+			);
+			assert_ok!(CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &op, len));
 		})
 	}
 
@@ -575,10 +569,7 @@ mod tests {
 			let pre = CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &info, len).unwrap();
 			assert_eq!(BlockWeight::<Test>::get().total(), info.weight + 256);
 
-			assert!(
-				CheckWeight::<Test>::post_dispatch(pre, &info, &post_info, len, &Ok(()))
-				.is_ok()
-			);
+			assert_ok!( CheckWeight::<Test>::post_dispatch(pre, &info, &post_info, len, &Ok(())));
 			assert_eq!(
 				BlockWeight::<Test>::get().total(),
 				post_info.actual_weight.unwrap() + 256,
@@ -607,10 +598,7 @@ mod tests {
 				info.weight + 128 + block_weights().get(DispatchClass::Normal).base_extrinsic,
 			);
 
-			assert!(
-				CheckWeight::<Test>::post_dispatch(pre, &info, &post_info, len, &Ok(()))
-				.is_ok()
-			);
+			assert_ok!(CheckWeight::<Test>::post_dispatch(pre, &info, &post_info, len, &Ok(())));
 			assert_eq!(
 				BlockWeight::<Test>::get().total(),
 				info.weight + 128 + block_weights().get(DispatchClass::Normal).base_extrinsic,
@@ -630,8 +618,7 @@ mod tests {
 				System::block_weight().total(),
 				weights.base_block
 			);
-			let r = CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &free, len);
-			assert!(r.is_ok());
+			assert_ok!(CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &free, len));
 			assert_eq!(
 				System::block_weight().total(),
 				weights.get(DispatchClass::Normal).base_extrinsic + weights.base_block
@@ -687,15 +674,14 @@ mod tests {
 		let mandatory2 = DispatchInfo { weight: 6, class: DispatchClass::Mandatory, ..Default::default() };
 
 		// when
-		let result1 = calculate_consumed_weight::<<Test as Config>::Call>(
-			maximum_weight.clone(), all_weight.clone(), &mandatory1
+		assert_ok!(
+			calculate_consumed_weight::<<Test as Config>::Call>(
+				maximum_weight.clone(), all_weight.clone(), &mandatory1
+			)
 		);
-		let result2 = calculate_consumed_weight::<<Test as Config>::Call>(
-			maximum_weight, all_weight, &mandatory2
+		assert_err!(
+			calculate_consumed_weight::<<Test as Config>::Call>( maximum_weight, all_weight, &mandatory2),
+			InvalidTransaction::ExhaustsResources
 		);
-
-		// then
-		assert!(result2.is_err());
-		assert!(result1.is_ok());
 	}
 }
diff --git a/frame/system/src/tests.rs b/frame/system/src/tests.rs
index 9f500e5a3b05..7ad4344ae5c2 100644
--- a/frame/system/src/tests.rs
+++ b/frame/system/src/tests.rs
@@ -19,7 +19,9 @@ use crate::*;
 use mock::{*, Origin};
 use sp_core::H256;
 use sp_runtime::{DispatchError, DispatchErrorWithPostInfo, traits::{Header, BlakeTwo256}};
-use frame_support::{assert_noop, weights::WithPostDispatchInfo, dispatch::PostDispatchInfo};
+use frame_support::{
+	assert_noop, assert_ok, weights::WithPostDispatchInfo, dispatch::PostDispatchInfo
+};
 
 #[test]
 fn origin_works() {
@@ -31,7 +33,7 @@ fn origin_works() {
 #[test]
 fn stored_map_works() {
 	new_test_ext().execute_with(|| {
-		assert!(System::insert(&0, 42).is_ok());
+		assert_ok!(System::insert(&0, 42));
 		assert!(!System::is_provider_required(&0));
 
 		assert_eq!(Account::<Test>::get(0), AccountInfo {
@@ -42,17 +44,17 @@ fn stored_map_works() {
 			data: 42,
 		});
 
-		assert!(System::inc_consumers(&0).is_ok());
+		assert_ok!(System::inc_consumers(&0));
 		assert!(System::is_provider_required(&0));
 
-		assert!(System::insert(&0, 69).is_ok());
+		assert_ok!(System::insert(&0, 69));
 		assert!(System::is_provider_required(&0));
 
 		System::dec_consumers(&0);
 		assert!(!System::is_provider_required(&0));
 
 		assert!(KILLED.with(|r| r.borrow().is_empty()));
-		assert!(System::remove(&0).is_ok());
+		assert_ok!(System::remove(&0));
 		assert_eq!(KILLED.with(|r| r.borrow().clone()), vec![0u64]);
 	});
 }
@@ -122,7 +124,7 @@ fn sufficient_cannot_support_consumer() {
 		assert_noop!(System::inc_consumers(&0), IncRefError::NoProviders);
 
 		assert_eq!(System::inc_providers(&0), IncRefStatus::Existed);
-		assert!(System::inc_consumers(&0).is_ok());
+		assert_ok!(System::inc_consumers(&0));
 		assert_noop!(System::dec_providers(&0), DecRefError::ConsumerRemaining);
 	});
 }
@@ -140,7 +142,7 @@ fn provider_required_to_support_consumer() {
 		assert_eq!(System::dec_providers(&0).unwrap(), DecRefStatus::Exists);
 		assert_eq!(System::account_nonce(&0), 1);
 
-		assert!(System::inc_consumers(&0).is_ok());
+		assert_ok!(System::inc_consumers(&0));
 		assert_noop!(System::dec_providers(&0), DecRefError::ConsumerRemaining);
 
 		System::dec_consumers(&0);
@@ -516,7 +518,7 @@ fn ensure_one_of_works() {
 
 	assert_eq!(ensure_root_or_signed(RawOrigin::Root).unwrap(), Either::Left(()));
 	assert_eq!(ensure_root_or_signed(RawOrigin::Signed(0)).unwrap(), Either::Right(0));
-	assert!(ensure_root_or_signed(RawOrigin::None).is_err())
+	assert!(ensure_root_or_signed(RawOrigin::None).is_err());
 }
 
 #[test]
diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
index 278cabc40092..ff6938683800 100644
--- a/frame/transaction-payment/src/lib.rs
+++ b/frame/transaction-payment/src/lib.rs
@@ -604,7 +604,7 @@ mod tests {
 	use frame_system as system;
 	use codec::Encode;
 	use frame_support::{
-		parameter_types,
+		assert_noop, assert_ok, parameter_types,
 		weights::{
 			DispatchClass, DispatchInfo, PostDispatchInfo, GetDispatchInfo, Weight,
 			WeightToFeePolynomial, WeightToFeeCoefficients, WeightToFeeCoefficient,
@@ -616,6 +616,7 @@ mod tests {
 	use sp_runtime::{
 		testing::{Header, TestXt},
 		traits::{BlakeTwo256, IdentityLookup},
+		transaction_validity::InvalidTransaction,
 		Perbill,
 	};
 	use std::cell::RefCell;
@@ -826,10 +827,9 @@ mod tests {
 				.unwrap();
 			assert_eq!(Balances::free_balance(1), 100 - 5 - 5 - 10);
 
-			assert!(
+			assert_ok!(
 				ChargeTransactionPayment::<Runtime>
 					::post_dispatch(pre, &info_from_weight(5), &default_post_info(), len, &Ok(()))
-					.is_ok()
 			);
 			assert_eq!(Balances::free_balance(1), 100 - 5 - 5 - 10);
 
@@ -838,10 +838,9 @@ mod tests {
 				.unwrap();
 			assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 100 - 5);
 
-			assert!(
+			assert_ok!(
 				ChargeTransactionPayment::<Runtime>
 					::post_dispatch(pre, &info_from_weight(100), &post_info_from_weight(50), len, &Ok(()))
-					.is_ok()
 			);
 			assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 50 - 5);
 		});
@@ -864,10 +863,9 @@ mod tests {
 			// 5 base fee, 10 byte fee, 3/2 * 100 weight fee, 5 tip
 			assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 150 - 5);
 
-			assert!(
+			assert_ok!(
 				ChargeTransactionPayment::<Runtime>
 					::post_dispatch(pre, &info_from_weight(100), &post_info_from_weight(50), len, &Ok(()))
-					.is_ok()
 			);
 			// 75 (3/2 of the returned 50 units of weight) is refunded
 			assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 75 - 5);
@@ -883,10 +881,9 @@ mod tests {
 			.execute_with(||
 		{
 			// maximum weight possible
-			assert!(
+			assert_ok!(
 				ChargeTransactionPayment::<Runtime>::from(0)
 					.pre_dispatch(&1, CALL, &info_from_weight(Weight::max_value()), 10)
-					.is_ok()
 			);
 			// fee will be proportional to what is the actual maximum weight in the runtime.
 			assert_eq!(
@@ -915,10 +912,9 @@ mod tests {
 				class: DispatchClass::Operational,
 				pays_fee: Pays::No,
 			};
-			assert!(
+			assert_ok!(
 				ChargeTransactionPayment::<Runtime>::from(0)
 					.validate(&1, CALL, &operational_transaction , len)
-					.is_ok()
 			);
 
 			// like a InsecureFreeNormal
@@ -927,10 +923,10 @@ mod tests {
 				class: DispatchClass::Normal,
 				pays_fee: Pays::Yes,
 			};
-			assert!(
+			assert_noop!(
 				ChargeTransactionPayment::<Runtime>::from(0)
-					.validate(&1, CALL, &free_transaction , len)
-					.is_err()
+					.validate(&1, CALL, &free_transaction , len),
+				TransactionValidityError::Invalid(InvalidTransaction::Payment),
 			);
 		});
 	}
@@ -947,10 +943,9 @@ mod tests {
 			NextFeeMultiplier::put(Multiplier::saturating_from_rational(3, 2));
 			let len = 10;
 
-			assert!(
+			assert_ok!(
 				ChargeTransactionPayment::<Runtime>::from(10) // tipped
 					.pre_dispatch(&1, CALL, &info_from_weight(3), len)
-					.is_ok()
 			);
 			assert_eq!(
 				Balances::free_balance(1),
@@ -1146,13 +1141,12 @@ mod tests {
 			assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 100 - 5);
 
 			// kill the account between pre and post dispatch
-			assert!(Balances::transfer(Some(2).into(), 3, Balances::free_balance(2)).is_ok());
+			assert_ok!(Balances::transfer(Some(2).into(), 3, Balances::free_balance(2)));
 			assert_eq!(Balances::free_balance(2), 0);
 
-			assert!(
+			assert_ok!(
 				ChargeTransactionPayment::<Runtime>
 					::post_dispatch(pre, &info_from_weight(100), &post_info_from_weight(50), len, &Ok(()))
-					.is_ok()
 			);
 			assert_eq!(Balances::free_balance(2), 0);
 			// Transfer Event
@@ -1180,10 +1174,9 @@ mod tests {
 				.unwrap();
 			assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 100 - 5);
 
-			assert!(
+			assert_ok!(
 				ChargeTransactionPayment::<Runtime>
 					::post_dispatch(pre, &info_from_weight(100), &post_info_from_weight(101), len, &Ok(()))
-					.is_ok()
 			);
 			assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 100 - 5);
 		});
@@ -1210,10 +1203,9 @@ mod tests {
 				.pre_dispatch(&user, CALL, &dispatch_info, len)
 				.unwrap();
 			assert_eq!(Balances::total_balance(&user), 0);
-			assert!(
+			assert_ok!(
 				ChargeTransactionPayment::<Runtime>
 					::post_dispatch(pre, &dispatch_info, &default_post_info(), len, &Ok(()))
-					.is_ok()
 			);
 			assert_eq!(Balances::total_balance(&user), 0);
 			// No events for such a scenario

From dcce8b4cfb461cbb2033021926e623b52c95fc74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Tue, 13 Apr 2021 13:26:52 +0200
Subject: [PATCH 0641/1194] contracts: Add RPC that allows instantiating of a
 contract (#8451)

* contracts: Add RPC that allows instantiating of a contract

* Encode `debug_message` as bytes because usage of `String` is forbidden

* Remove erroneous derive attribute

* Fix rpc tests for new `debug_message` encoding

* Fix typo

Co-authored-by: Andrew Jones <ascjones@gmail.com>

Co-authored-by: Andrew Jones <ascjones@gmail.com>
---
 Cargo.lock                                 |   2 +
 bin/node/rpc/src/lib.rs                    |   2 +-
 bin/node/runtime/src/lib.rs                |  16 +-
 frame/contracts/CHANGELOG.md               |   2 +
 frame/contracts/common/Cargo.toml          |   4 +
 frame/contracts/common/src/lib.rs          |  99 +++++---
 frame/contracts/rpc/runtime-api/src/lib.rs |  21 +-
 frame/contracts/rpc/src/lib.rs             | 261 ++++++++++++++-------
 frame/contracts/src/exec.rs                |  58 ++++-
 frame/contracts/src/gas.rs                 |   3 +-
 frame/contracts/src/lib.rs                 |  66 +++++-
 frame/contracts/src/rent.rs                |   7 +-
 frame/contracts/src/tests.rs               |  43 ++--
 frame/contracts/src/wasm/mod.rs            |  52 ++--
 frame/contracts/src/wasm/runtime.rs        |  16 +-
 primitives/core/src/lib.rs                 |   6 +
 16 files changed, 469 insertions(+), 189 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 47fad18c364f..14fd4778c639 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4813,6 +4813,8 @@ version = "3.0.0"
 dependencies = [
  "bitflags",
  "parity-scale-codec",
+ "serde",
+ "sp-core",
  "sp-runtime",
  "sp-std",
 ]
diff --git a/bin/node/rpc/src/lib.rs b/bin/node/rpc/src/lib.rs
index 1d9f88c8c914..885ecdd42f11 100644
--- a/bin/node/rpc/src/lib.rs
+++ b/bin/node/rpc/src/lib.rs
@@ -115,7 +115,7 @@ pub fn create_full<C, P, SC, B>(
 	C: ProvideRuntimeApi<Block> + HeaderBackend<Block> + AuxStore +
 		HeaderMetadata<Block, Error=BlockChainError> + Sync + Send + 'static,
 	C::Api: substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>,
-	C::Api: pallet_contracts_rpc::ContractsRuntimeApi<Block, AccountId, Balance, BlockNumber>,
+	C::Api: pallet_contracts_rpc::ContractsRuntimeApi<Block, AccountId, Balance, BlockNumber, Hash>,
 	C::Api: pallet_mmr_rpc::MmrRuntimeApi<Block, <Block as sp_runtime::traits::Block>::Hash>,
 	C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance>,
 	C::Api: BabeApi<Block>,
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 956675175a74..aaf470ed3376 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -1340,7 +1340,9 @@ impl_runtime_apis! {
 		}
 	}
 
-	impl pallet_contracts_rpc_runtime_api::ContractsApi<Block, AccountId, Balance, BlockNumber>
+	impl pallet_contracts_rpc_runtime_api::ContractsApi<
+		Block, AccountId, Balance, BlockNumber, Hash,
+	>
 		for Runtime
 	{
 		fn call(
@@ -1353,6 +1355,18 @@ impl_runtime_apis! {
 			Contracts::bare_call(origin, dest, value, gas_limit, input_data)
 		}
 
+		fn instantiate(
+			origin: AccountId,
+			endowment: Balance,
+			gas_limit: u64,
+			code: pallet_contracts_primitives::Code<Hash>,
+			data: Vec<u8>,
+			salt: Vec<u8>,
+		) -> pallet_contracts_primitives::ContractInstantiateResult<AccountId, BlockNumber>
+		{
+			Contracts::bare_instantiate(origin, endowment, gas_limit, code, data, salt, true)
+		}
+
 		fn get_storage(
 			address: AccountId,
 			key: [u8; 32],
diff --git a/frame/contracts/CHANGELOG.md b/frame/contracts/CHANGELOG.md
index efc3eb93c570..9660d903bfe8 100644
--- a/frame/contracts/CHANGELOG.md
+++ b/frame/contracts/CHANGELOG.md
@@ -20,6 +20,8 @@ In other words: Upgrading this pallet will not break pre-existing contracts.
 
 ### Added
 
+- Add new `instantiate` RPC that allows clients to dry-run contract instantiation.
+
 - Make storage and fields of `Schedule` private to the crate.
 [1](https://github.com/paritytech/substrate/pull/8359)
 
diff --git a/frame/contracts/common/Cargo.toml b/frame/contracts/common/Cargo.toml
index 050e18fc44d1..375f760b0a5c 100644
--- a/frame/contracts/common/Cargo.toml
+++ b/frame/contracts/common/Cargo.toml
@@ -16,13 +16,17 @@ targets = ["x86_64-unknown-linux-gnu"]
 # This crate should not rely on any of the frame primitives.
 bitflags = "1.0"
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+sp-core = { version = "3.0.0", path = "../../../primitives/core", default-features = false }
 sp-std = { version = "3.0.0", default-features = false, path = "../../../primitives/std" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
+serde = { version = "1", features = ["derive"], optional = true }
 
 [features]
 default = ["std"]
 std = [
 	"codec/std",
+	"sp-core/std",
 	"sp-runtime/std",
 	"sp-std/std",
+	"serde",
 ]
diff --git a/frame/contracts/common/src/lib.rs b/frame/contracts/common/src/lib.rs
index 2b325d63d628..17d4bec06b7c 100644
--- a/frame/contracts/common/src/lib.rs
+++ b/frame/contracts/common/src/lib.rs
@@ -21,18 +21,45 @@
 
 use bitflags::bitflags;
 use codec::{Decode, Encode};
+use sp_core::Bytes;
 use sp_runtime::{DispatchError, RuntimeDebug};
 use sp_std::prelude::*;
 
-/// Result type of a `bare_call` call.
+#[cfg(feature = "std")]
+use serde::{Serialize, Deserialize};
+
+/// Result type of a `bare_call` or `bare_instantiate` call.
 ///
-/// The result of a contract execution along with a gas consumed.
+/// It contains the execution result together with some auxiliary information.
 #[derive(Eq, PartialEq, Encode, Decode, RuntimeDebug)]
-pub struct ContractExecResult {
-	pub exec_result: ExecResult,
+#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
+pub struct ContractResult<T> {
+	/// How much gas was consumed during execution.
 	pub gas_consumed: u64,
+	/// An optional debug message. This message is only non-empty when explicitly requested
+	/// by the code that calls into the contract.
+	///
+	/// The contained bytes are valid UTF-8. This is not declared as `String` because
+	/// this type is not allowed within the runtime. A client should decode them in order
+	/// to present the message to its users.
+	///
+	/// # Note
+	///
+	/// The debug message is never generated during on-chain execution. It is reserved for
+	/// RPC calls.
+	pub debug_message: Bytes,
+	/// The execution result of the wasm code.
+	pub result: T,
 }
 
+/// Result type of a `bare_call` call.
+pub type ContractExecResult = ContractResult<Result<ExecReturnValue, DispatchError>>;
+
+/// Result type of a `bare_instantiate` call.
+pub type ContractInstantiateResult<AccountId, BlockNumber> =
+	ContractResult<Result<InstantiateReturnValue<AccountId, BlockNumber>, DispatchError>>;
+
 /// Result type of a `get_storage` call.
 pub type GetStorageResult = Result<Option<Vec<u8>>, ContractAccessError>;
 
@@ -50,6 +77,8 @@ pub enum ContractAccessError {
 }
 
 #[derive(Eq, PartialEq, Encode, Decode, RuntimeDebug)]
+#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
 pub enum RentProjection<BlockNumber> {
 	/// Eviction is projected to happen at the specified block number.
 	EvictionAt(BlockNumber),
@@ -62,6 +91,8 @@ pub enum RentProjection<BlockNumber> {
 bitflags! {
 	/// Flags used by a contract to customize exit behaviour.
 	#[derive(Encode, Decode)]
+	#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+	#[cfg_attr(feature = "std", serde(rename_all = "camelCase", transparent))]
 	pub struct ReturnFlags: u32 {
 		/// If this bit is set all changes made by the contract execution are rolled back.
 		const REVERT = 0x0000_0001;
@@ -70,11 +101,13 @@ bitflags! {
 
 /// Output of a contract call or instantiation which ran to completion.
 #[derive(PartialEq, Eq, Encode, Decode, RuntimeDebug)]
+#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
 pub struct ExecReturnValue {
 	/// Flags passed along by `seal_return`. Empty when `seal_return` was never called.
 	pub flags: ReturnFlags,
 	/// Buffer passed along by `seal_return`. Empty when `seal_return` was never called.
-	pub data: Vec<u8>,
+	pub data: Bytes,
 }
 
 impl ExecReturnValue {
@@ -84,40 +117,32 @@ impl ExecReturnValue {
 	}
 }
 
-/// Origin of the error.
-///
-/// Call or instantiate both called into other contracts and pass through errors happening
-/// in those to the caller. This enum is for the caller to distinguish whether the error
-/// happened during the execution of the callee or in the current execution context.
+/// The result of a successful contract instantiation.
 #[derive(PartialEq, Eq, Encode, Decode, RuntimeDebug)]
-pub enum ErrorOrigin {
-	/// Caller error origin.
+#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
+pub struct InstantiateReturnValue<AccountId, BlockNumber> {
+	/// The output of the called constructor.
+	pub result: ExecReturnValue,
+	/// The account id of the new contract.
+	pub account_id: AccountId,
+	/// Information about when and if the new project will be evicted.
 	///
-	/// The error happened in the current exeuction context rather than in the one
-	/// of the contract that is called into.
-	Caller,
-	/// The error happened during execution of the called contract.
-	Callee,
-}
-
-/// Error returned by contract exection.
-#[derive(PartialEq, Eq, Encode, Decode, RuntimeDebug)]
-pub struct ExecError {
-	/// The reason why the execution failed.
-	pub error: DispatchError,
-	/// Origin of the error.
-	pub origin: ErrorOrigin,
+	/// # Note
+	///
+	/// `None` if `bare_instantiate` was called with
+	/// `compute_projection` set to false. From the perspective of an RPC this means that
+	/// the runtime API did not request this value and this feature is therefore unsupported.
+	pub rent_projection: Option<RentProjection<BlockNumber>>,
 }
 
-impl<T: Into<DispatchError>> From<T> for ExecError {
-	fn from(error: T) -> Self {
-		Self {
-			error: error.into(),
-			origin: ErrorOrigin::Caller,
-		}
-	}
+/// Reference to an existing code hash or a new wasm module.
+#[derive(Eq, PartialEq, Encode, Decode, RuntimeDebug)]
+#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
+pub enum Code<Hash> {
+	/// A wasm module as raw bytes.
+	Upload(Bytes),
+	/// The code hash of an on-chain wasm blob.
+	Existing(Hash),
 }
-
-/// The result that is returned from contract execution. It either contains the output
-/// buffer or an error describing the reason for failure.
-pub type ExecResult = Result<ExecReturnValue, ExecError>;
diff --git a/frame/contracts/rpc/runtime-api/src/lib.rs b/frame/contracts/rpc/runtime-api/src/lib.rs
index 6f0399586fa2..943931ec0c84 100644
--- a/frame/contracts/rpc/runtime-api/src/lib.rs
+++ b/frame/contracts/rpc/runtime-api/src/lib.rs
@@ -25,18 +25,21 @@
 
 use codec::Codec;
 use sp_std::vec::Vec;
-use pallet_contracts_primitives::{ContractExecResult, GetStorageResult, RentProjectionResult};
+use pallet_contracts_primitives::{
+	ContractExecResult, GetStorageResult, RentProjectionResult, Code, ContractInstantiateResult,
+};
 
 sp_api::decl_runtime_apis! {
 	/// The API to interact with contracts without using executive.
-	pub trait ContractsApi<AccountId, Balance, BlockNumber> where
+	pub trait ContractsApi<AccountId, Balance, BlockNumber, Hash> where
 		AccountId: Codec,
 		Balance: Codec,
 		BlockNumber: Codec,
+		Hash: Codec,
 	{
 		/// Perform a call from a specified account to a given contract.
 		///
-		/// See the contracts' `call` dispatchable function for more details.
+		/// See [`pallet_contracts::Pallet::call`].
 		fn call(
 			origin: AccountId,
 			dest: AccountId,
@@ -45,6 +48,18 @@ sp_api::decl_runtime_apis! {
 			input_data: Vec<u8>,
 		) -> ContractExecResult;
 
+		/// Instantiate a new contract.
+		///
+		/// See [`pallet_contracts::Pallet::instantiate`].
+		fn instantiate(
+			origin: AccountId,
+			endowment: Balance,
+			gas_limit: u64,
+			code: Code<Hash>,
+			data: Vec<u8>,
+			salt: Vec<u8>,
+		) -> ContractInstantiateResult<AccountId, BlockNumber>;
+
 		/// Query a given storage key in a given contract.
 		///
 		/// Returns `Ok(Some(Vec<u8>))` if the storage value exists under the given key in the
diff --git a/frame/contracts/rpc/src/lib.rs b/frame/contracts/rpc/src/lib.rs
index e0a056906f74..dd9ec164a984 100644
--- a/frame/contracts/rpc/src/lib.rs
+++ b/frame/contracts/rpc/src/lib.rs
@@ -27,14 +27,13 @@ use serde::{Deserialize, Serialize};
 use sp_api::ProvideRuntimeApi;
 use sp_blockchain::HeaderBackend;
 use sp_core::{Bytes, H256};
-use sp_rpc::number;
+use sp_rpc::number::NumberOrHex;
 use sp_runtime::{
 	generic::BlockId,
 	traits::{Block as BlockT, Header as HeaderT},
-	DispatchError,
 };
 use std::convert::{TryFrom, TryInto};
-use pallet_contracts_primitives::ContractExecResult;
+use pallet_contracts_primitives::{Code, ContractExecResult, ContractInstantiateResult};
 
 pub use pallet_contracts_rpc_runtime_api::ContractsApi as ContractsRuntimeApi;
 
@@ -42,6 +41,8 @@ const RUNTIME_ERROR: i64 = 1;
 const CONTRACT_DOESNT_EXIST: i64 = 2;
 const CONTRACT_IS_A_TOMBSTONE: i64 = 3;
 
+pub type Weight = u64;
+
 /// A rough estimate of how much gas a decent hardware consumes per second,
 /// using native execution.
 /// This value is used to set the upper bound for maximal contract calls to
@@ -50,7 +51,11 @@ const CONTRACT_IS_A_TOMBSTONE: i64 = 3;
 /// As 1 gas is equal to 1 weight we base this on the conducted benchmarks which
 /// determined runtime weights:
 /// https://github.com/paritytech/substrate/pull/5446
-const GAS_PER_SECOND: u64 = 1_000_000_000_000;
+const GAS_PER_SECOND: Weight = 1_000_000_000_000;
+
+/// The maximum amount of weight that the call and instantiate rpcs are allowed to consume.
+/// This puts a ceiling on the weight limit that is supplied to the rpc as an argument.
+const GAS_LIMIT: Weight = 5 * GAS_PER_SECOND;
 
 /// A private newtype for converting `ContractAccessError` into an RPC error.
 struct ContractAccessError(pallet_contracts_primitives::ContractAccessError);
@@ -79,59 +84,27 @@ impl From<ContractAccessError> for Error {
 pub struct CallRequest<AccountId> {
 	origin: AccountId,
 	dest: AccountId,
-	value: number::NumberOrHex,
-	gas_limit: number::NumberOrHex,
+	value: NumberOrHex,
+	gas_limit: NumberOrHex,
 	input_data: Bytes,
 }
 
+/// A struct that encodes RPC parameters required to instantiate a new smart-contract.
 #[derive(Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
 #[serde(rename_all = "camelCase")]
-struct RpcContractExecSuccess {
-	/// The return flags. See `pallet_contracts_primitives::ReturnFlags`.
-	flags: u32,
-	/// Data as returned by the contract.
-	data: Bytes,
-}
-
-/// An RPC serializable result of contract execution
-#[derive(Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
-#[serde(rename_all = "camelCase")]
-pub struct RpcContractExecResult {
-	/// How much gas was consumed by the call. In case of an error this is the amount
-	/// that was used up until the error occurred.
-	gas_consumed: u64,
-	/// Additional dynamic human readable error information for debugging. An empty string
-	/// indicates that no additional information is available.
-	debug_message: String,
-	/// Indicates whether the contract execution was successful or not.
-	result: std::result::Result<RpcContractExecSuccess, DispatchError>,
-}
-
-impl From<ContractExecResult> for RpcContractExecResult {
-	fn from(r: ContractExecResult) -> Self {
-		match r.exec_result {
-			Ok(val) => RpcContractExecResult {
-				gas_consumed: r.gas_consumed,
-				debug_message: String::new(),
-				result: Ok(RpcContractExecSuccess {
-					flags: val.flags.bits(),
-					data: val.data.into(),
-				}),
-			},
-			Err(err) => RpcContractExecResult {
-				gas_consumed: r.gas_consumed,
-				debug_message: String::new(),
-				result: Err(err.error),
-			},
-		}
-	}
+pub struct InstantiateRequest<AccountId, Hash> {
+	origin: AccountId,
+	endowment: NumberOrHex,
+	gas_limit: NumberOrHex,
+	code: Code<Hash>,
+	data: Bytes,
+	salt: Bytes,
 }
 
 /// Contracts RPC methods.
 #[rpc]
-pub trait ContractsApi<BlockHash, BlockNumber, AccountId, Balance> {
+pub trait ContractsApi<BlockHash, BlockNumber, AccountId, Balance, Hash> {
 	/// Executes a call to a contract.
 	///
 	/// This call is performed locally without submitting any transactions. Thus executing this
@@ -143,7 +116,20 @@ pub trait ContractsApi<BlockHash, BlockNumber, AccountId, Balance> {
 		&self,
 		call_request: CallRequest<AccountId>,
 		at: Option<BlockHash>,
-	) -> Result<RpcContractExecResult>;
+	) -> Result<ContractExecResult>;
+
+	/// Instantiate a new contract.
+	///
+	/// This call is performed locally without submitting any transactions. Thus the contract
+	/// is not actually created.
+	///
+	/// This method is useful for UIs to dry-run contract instantiations.
+	#[rpc(name = "contracts_instantiate")]
+	fn instantiate(
+		&self,
+		instantiate_request: InstantiateRequest<AccountId, Hash>,
+		at: Option<BlockHash>,
+	) -> Result<ContractInstantiateResult<AccountId, BlockNumber>>;
 
 	/// Returns the value under a specified storage `key` in a contract given by `address` param,
 	/// or `None` if it is not set.
@@ -184,12 +170,13 @@ impl<C, B> Contracts<C, B> {
 		}
 	}
 }
-impl<C, Block, AccountId, Balance>
+impl<C, Block, AccountId, Balance, Hash>
 	ContractsApi<
 		<Block as BlockT>::Hash,
 		<<Block as BlockT>::Header as HeaderT>::Number,
 		AccountId,
 		Balance,
+		Hash,
 	> for Contracts<C, Block>
 where
 	Block: BlockT,
@@ -199,15 +186,17 @@ where
 		AccountId,
 		Balance,
 		<<Block as BlockT>::Header as HeaderT>::Number,
+		Hash,
 	>,
 	AccountId: Codec,
-	Balance: Codec + TryFrom<number::NumberOrHex>,
+	Balance: Codec + TryFrom<NumberOrHex>,
+	Hash: Codec,
 {
 	fn call(
 		&self,
 		call_request: CallRequest<AccountId>,
 		at: Option<<Block as BlockT>::Hash>,
-	) -> Result<RpcContractExecResult> {
+	) -> Result<ContractExecResult> {
 		let api = self.client.runtime_api();
 		let at = BlockId::hash(at.unwrap_or_else(||
 			// If the block hash is not supplied assume the best block.
@@ -221,37 +210,45 @@ where
 			input_data,
 		} = call_request;
 
-		// Make sure that value fits into the balance type.
-		let value: Balance = value.try_into().map_err(|_| Error {
-			code: ErrorCode::InvalidParams,
-			message: format!("{:?} doesn't fit into the balance type", value),
-			data: None,
-		})?;
-
-		// Make sure that gas_limit fits into 64 bits.
-		let gas_limit: u64 = gas_limit.try_into().map_err(|_| Error {
-			code: ErrorCode::InvalidParams,
-			message: format!("{:?} doesn't fit in 64 bit unsigned value", gas_limit),
-			data: None,
-		})?;
-
-		let max_gas_limit = 5 * GAS_PER_SECOND;
-		if gas_limit > max_gas_limit {
-			return Err(Error {
-				code: ErrorCode::InvalidParams,
-				message: format!(
-					"Requested gas limit is greater than maximum allowed: {} > {}",
-					gas_limit, max_gas_limit
-				),
-				data: None,
-			});
-		}
+		let value: Balance = decode_hex(value, "balance")?;
+		let gas_limit: Weight = decode_hex(gas_limit, "weight")?;
+		limit_gas(gas_limit)?;
 
 		let exec_result = api
 			.call(&at, origin, dest, value, gas_limit, input_data.to_vec())
 			.map_err(runtime_error_into_rpc_err)?;
 
-		Ok(exec_result.into())
+		Ok(exec_result)
+	}
+
+	fn instantiate(
+		&self,
+		instantiate_request: InstantiateRequest<AccountId, Hash>,
+		at: Option<<Block as BlockT>::Hash>,
+	) -> Result<ContractInstantiateResult<AccountId, <<Block as BlockT>::Header as HeaderT>::Number>> {
+		let api = self.client.runtime_api();
+		let at = BlockId::hash(at.unwrap_or_else(||
+			// If the block hash is not supplied assume the best block.
+			self.client.info().best_hash));
+
+		let InstantiateRequest {
+			origin,
+			endowment,
+			gas_limit,
+			code,
+			data,
+			salt,
+		} = instantiate_request;
+
+		let endowment: Balance = decode_hex(endowment, "balance")?;
+		let gas_limit: Weight = decode_hex(gas_limit, "weight")?;
+		limit_gas(gas_limit)?;
+
+		let exec_result = api
+			.instantiate(&at, origin, endowment, gas_limit, code, data.to_vec(), salt.to_vec())
+			.map_err(runtime_error_into_rpc_err)?;
+
+		Ok(exec_result)
 	}
 
 	fn get_storage(
@@ -300,16 +297,43 @@ where
 fn runtime_error_into_rpc_err(err: impl std::fmt::Debug) -> Error {
 	Error {
 		code: ErrorCode::ServerError(RUNTIME_ERROR),
-		message: "Runtime trapped".into(),
+		message: "Runtime error".into(),
 		data: Some(format!("{:?}", err).into()),
 	}
 }
 
+fn decode_hex<H: std::fmt::Debug + Copy, T: TryFrom<H>>(from: H, name: &str) -> Result<T> {
+	from.try_into().map_err(|_| Error {
+		code: ErrorCode::InvalidParams,
+		message: format!("{:?} does not fit into the {} type", from, name),
+		data: None,
+	})
+}
+
+fn limit_gas(gas_limit: Weight) -> Result<()> {
+	if gas_limit > GAS_LIMIT {
+		Err(Error {
+			code: ErrorCode::InvalidParams,
+			message: format!(
+				"Requested gas limit is greater than maximum allowed: {} > {}",
+				gas_limit, GAS_LIMIT
+			),
+			data: None,
+		})
+	} else {
+		Ok(())
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;
 	use sp_core::U256;
 
+	fn trim(json: &str) -> String {
+		json.chars().filter(|c| !c.is_whitespace()).collect()
+	}
+
 	#[test]
 	fn call_request_should_serialize_deserialize_properly() {
 		type Req = CallRequest<String>;
@@ -327,13 +351,84 @@ mod tests {
 	}
 
 	#[test]
-	fn result_should_serialize_deserialize_properly() {
+	fn instantiate_request_should_serialize_deserialize_properly() {
+		type Req = InstantiateRequest<String, String>;
+		let req: Req = serde_json::from_str(r#"
+		{
+			"origin": "5CiPPseXPECbkjWCa6MnjNokrgYjMqmKndv2rSnekmSK2DjL",
+			"endowment": "0x88",
+			"gasLimit": 42,
+			"code": { "existing": "0x1122" },
+			"data": "0x4299",
+			"salt": "0x9988"
+		}
+		"#).unwrap();
+
+		assert_eq!(req.origin, "5CiPPseXPECbkjWCa6MnjNokrgYjMqmKndv2rSnekmSK2DjL");
+		assert_eq!(req.endowment.into_u256(), 0x88.into());
+		assert_eq!(req.gas_limit.into_u256(), 42.into());
+		assert_eq!(&*req.data, [0x42, 0x99].as_ref());
+		assert_eq!(&*req.salt, [0x99, 0x88].as_ref());
+		let code = match req.code {
+			Code::Existing(hash) => hash,
+			_ => panic!("json encoded an existing hash"),
+		};
+		assert_eq!(&code, "0x1122");
+	}
+
+	#[test]
+	fn call_result_should_serialize_deserialize_properly() {
+		fn test(expected: &str) {
+			let res: ContractExecResult = serde_json::from_str(expected).unwrap();
+			let actual = serde_json::to_string(&res).unwrap();
+			assert_eq!(actual, trim(expected).as_str());
+		}
+		test(r#"{
+			"gasConsumed": 5000,
+			"debugMessage": "0x68656c704f6b",
+			"result": {
+			  "Ok": {
+				"flags": 5,
+				"data": "0x1234"
+			  }
+			}
+		}"#);
+		test(r#"{
+			"gasConsumed": 3400,
+			"debugMessage": "0x68656c70457272",
+			"result": {
+			  "Err": "BadOrigin"
+			}
+		}"#);
+	}
+
+	#[test]
+	fn instantiate_result_should_serialize_deserialize_properly() {
 		fn test(expected: &str) {
-			let res: RpcContractExecResult = serde_json::from_str(expected).unwrap();
+			let res: ContractInstantiateResult<String, u64> = serde_json::from_str(expected).unwrap();
 			let actual = serde_json::to_string(&res).unwrap();
-			assert_eq!(actual, expected);
+			assert_eq!(actual, trim(expected).as_str());
 		}
-		test(r#"{"gasConsumed":5000,"debugMessage":"helpOk","result":{"Ok":{"flags":5,"data":"0x1234"}}}"#);
-		test(r#"{"gasConsumed":3400,"debugMessage":"helpErr","result":{"Err":"BadOrigin"}}"#);
+		test(r#"{
+			"gasConsumed": 5000,
+			"debugMessage": "0x68656c704f6b",
+			"result": {
+			   "Ok": {
+				  "result": {
+					 "flags": 5,
+					 "data": "0x1234"
+				  },
+				  "accountId": "5CiPP",
+				  "rentProjection": null
+			   }
+			}
+		}"#);
+		test(r#"{
+			"gasConsumed": 3400,
+			"debugMessage": "0x68656c70457272",
+			"result": {
+			  "Err": "BadOrigin"
+			}
+		}"#);
 	}
 }
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index 4649c12018b7..be471ed0c72e 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -32,17 +32,52 @@ use frame_support::{
 	weights::Weight,
 	ensure,
 };
-use pallet_contracts_primitives::{ErrorOrigin, ExecError, ExecReturnValue, ExecResult, ReturnFlags};
+use pallet_contracts_primitives::{ExecReturnValue, ReturnFlags};
 
 pub type AccountIdOf<T> = <T as frame_system::Config>::AccountId;
 pub type MomentOf<T> = <<T as Config>::Time as Time>::Moment;
 pub type SeedOf<T> = <T as frame_system::Config>::Hash;
 pub type BlockNumberOf<T> = <T as frame_system::Config>::BlockNumber;
 pub type StorageKey = [u8; 32];
+pub type ExecResult = Result<ExecReturnValue, ExecError>;
 
 /// A type that represents a topic of an event. At the moment a hash is used.
 pub type TopicOf<T> = <T as frame_system::Config>::Hash;
 
+/// Origin of the error.
+///
+/// Call or instantiate both called into other contracts and pass through errors happening
+/// in those to the caller. This enum is for the caller to distinguish whether the error
+/// happened during the execution of the callee or in the current execution context.
+#[cfg_attr(test, derive(Debug, PartialEq))]
+pub enum ErrorOrigin {
+	/// Caller error origin.
+	///
+	/// The error happened in the current exeuction context rather than in the one
+	/// of the contract that is called into.
+	Caller,
+	/// The error happened during execution of the called contract.
+	Callee,
+}
+
+/// Error returned by contract exection.
+#[cfg_attr(test, derive(Debug, PartialEq))]
+pub struct ExecError {
+	/// The reason why the execution failed.
+	pub error: DispatchError,
+	/// Origin of the error.
+	pub origin: ErrorOrigin,
+}
+
+impl<T: Into<DispatchError>> From<T> for ExecError {
+	fn from(error: T) -> Self {
+		Self {
+			error: error.into(),
+			origin: ErrorOrigin::Caller,
+		}
+	}
+}
+
 /// Information needed for rent calculations that can be requested by a contract.
 #[derive(codec::Encode)]
 #[cfg_attr(test, derive(Debug, PartialEq))]
@@ -945,6 +980,7 @@ mod tests {
 		exec::ExportedFunction::*,
 		Error, Weight, CurrentSchedule,
 	};
+	use sp_core::Bytes;
 	use frame_support::assert_noop;
 	use sp_runtime::DispatchError;
 	use assert_matches::assert_matches;
@@ -1123,7 +1159,7 @@ mod tests {
 	}
 
 	fn exec_success() -> ExecResult {
-		Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: Vec::new() })
+		Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: Bytes(Vec::new()) })
 	}
 
 	#[test]
@@ -1186,7 +1222,7 @@ mod tests {
 
 		let return_ch = MockLoader::insert(
 			Call,
-			|_, _| Ok(ExecReturnValue { flags: ReturnFlags::REVERT, data: Vec::new() })
+			|_, _| Ok(ExecReturnValue { flags: ReturnFlags::REVERT, data: Bytes(Vec::new()) })
 		);
 
 		ExtBuilder::default().build().execute_with(|| {
@@ -1246,7 +1282,7 @@ mod tests {
 		let dest = BOB;
 		let return_ch = MockLoader::insert(
 			Call,
-			|_, _| Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: vec![1, 2, 3, 4] })
+			|_, _| Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: Bytes(vec![1, 2, 3, 4]) })
 		);
 
 		ExtBuilder::default().build().execute_with(|| {
@@ -1263,7 +1299,7 @@ mod tests {
 
 			let output = result.unwrap();
 			assert!(output.0.is_success());
-			assert_eq!(output.0.data, vec![1, 2, 3, 4]);
+			assert_eq!(output.0.data, Bytes(vec![1, 2, 3, 4]));
 		});
 	}
 
@@ -1275,7 +1311,7 @@ mod tests {
 		let dest = BOB;
 		let return_ch = MockLoader::insert(
 			Call,
-			|_, _| Ok(ExecReturnValue { flags: ReturnFlags::REVERT, data: vec![1, 2, 3, 4] })
+			|_, _| Ok(ExecReturnValue { flags: ReturnFlags::REVERT, data: Bytes(vec![1, 2, 3, 4]) })
 		);
 
 		ExtBuilder::default().build().execute_with(|| {
@@ -1292,7 +1328,7 @@ mod tests {
 
 			let output = result.unwrap();
 			assert!(!output.0.is_success());
-			assert_eq!(output.0.data, vec![1, 2, 3, 4]);
+			assert_eq!(output.0.data, Bytes(vec![1, 2, 3, 4]));
 		});
 	}
 
@@ -1512,7 +1548,7 @@ mod tests {
 	fn instantiation_work_with_success_output() {
 		let dummy_ch = MockLoader::insert(
 			Constructor,
-			|_, _| Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: vec![80, 65, 83, 83] })
+			|_, _| Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: Bytes(vec![80, 65, 83, 83]) })
 		);
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
@@ -1532,7 +1568,7 @@ mod tests {
 					vec![],
 					&[],
 				),
-				Ok((address, ref output)) if output.data == vec![80, 65, 83, 83] => address
+				Ok((address, ref output)) if output.data == Bytes(vec![80, 65, 83, 83]) => address
 			);
 
 			// Check that the newly created account has the expected code hash and
@@ -1548,7 +1584,7 @@ mod tests {
 	fn instantiation_fails_with_failing_output() {
 		let dummy_ch = MockLoader::insert(
 			Constructor,
-			|_, _| Ok(ExecReturnValue { flags: ReturnFlags::REVERT, data: vec![70, 65, 73, 76] })
+			|_, _| Ok(ExecReturnValue { flags: ReturnFlags::REVERT, data: Bytes(vec![70, 65, 73, 76]) })
 		);
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
@@ -1568,7 +1604,7 @@ mod tests {
 					vec![],
 					&[],
 				),
-				Ok((address, ref output)) if output.data == vec![70, 65, 73, 76] => address
+				Ok((address, ref output)) if output.data == Bytes(vec![70, 65, 73, 76]) => address
 			);
 
 			// Check that the account has not been created.
diff --git a/frame/contracts/src/gas.rs b/frame/contracts/src/gas.rs
index 80e608b217bd..21c1afbcd696 100644
--- a/frame/contracts/src/gas.rs
+++ b/frame/contracts/src/gas.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::{Config, Error};
+use crate::{Config, Error, exec::ExecError};
 use sp_std::marker::PhantomData;
 use sp_runtime::traits::Zero;
 use frame_support::{
@@ -24,7 +24,6 @@ use frame_support::{
 	},
 	weights::Weight,
 };
-use pallet_contracts_primitives::ExecError;
 use sp_core::crypto::UncheckedFrom;
 
 #[cfg(test)]
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index 46947ea9e1ae..2aa6b8f2ec7b 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -112,7 +112,7 @@ use crate::{
 	weights::WeightInfo,
 	wasm::PrefabWasmModule,
 };
-use sp_core::crypto::UncheckedFrom;
+use sp_core::{Bytes, crypto::UncheckedFrom};
 use sp_std::prelude::*;
 use sp_runtime::{
 	traits::{
@@ -127,6 +127,7 @@ use frame_support::{
 use frame_system::Pallet as System;
 use pallet_contracts_primitives::{
 	RentProjectionResult, GetStorageResult, ContractAccessError, ContractExecResult,
+	ContractInstantiateResult, Code, InstantiateReturnValue,
 };
 
 type CodeHash<T> = <T as frame_system::Config>::Hash;
@@ -666,8 +667,8 @@ where
 {
 	/// Perform a call to a specified contract.
 	///
-	/// This function is similar to `Self::call`, but doesn't perform any address lookups and better
-	/// suitable for calling directly from Rust.
+	/// This function is similar to [`Self::call`], but doesn't perform any address lookups
+	/// and better suitable for calling directly from Rust.
 	///
 	/// It returns the execution result and the amount of used weight.
 	pub fn bare_call(
@@ -683,8 +684,65 @@ where
 		let result = ctx.call(dest, value, &mut gas_meter, input_data);
 		let gas_consumed = gas_meter.gas_spent();
 		ContractExecResult {
-			exec_result: result.map(|r| r.0).map_err(|r| r.0),
+			result: result.map(|r| r.0).map_err(|r| r.0.error),
 			gas_consumed,
+			debug_message: Bytes(Vec::new()),
+		}
+	}
+
+	/// Instantiate a new contract.
+	///
+	/// This function is similar to [`Self::instantiate`], but doesn't perform any address lookups
+	/// and better suitable for calling directly from Rust.
+	///
+	/// It returns the execution result, account id and the amount of used weight.
+	///
+	/// If `compute_projection` is set to `true` the result also contains the rent projection.
+	/// This is optional because some non trivial and stateful work is performed to compute
+	/// the projection. See [`Self::rent_projection`].
+	pub fn bare_instantiate(
+		origin: T::AccountId,
+		endowment: BalanceOf<T>,
+		gas_limit: Weight,
+		code: Code<CodeHash<T>>,
+		data: Vec<u8>,
+		salt: Vec<u8>,
+		compute_projection: bool,
+	) -> ContractInstantiateResult<T::AccountId, T::BlockNumber> {
+		let mut gas_meter = GasMeter::new(gas_limit);
+		let schedule = <CurrentSchedule<T>>::get();
+		let mut ctx = ExecutionContext::<T, PrefabWasmModule<T>>::top_level(origin, &schedule);
+		let executable = match code {
+			Code::Upload(Bytes(binary)) => PrefabWasmModule::from_code(binary, &schedule),
+			Code::Existing(hash) => PrefabWasmModule::from_storage(hash, &schedule, &mut gas_meter),
+		};
+		let executable = match executable {
+			Ok(executable) => executable,
+			Err(error) => return ContractInstantiateResult {
+				result: Err(error.into()),
+				gas_consumed: gas_meter.gas_spent(),
+				debug_message: Bytes(Vec::new()),
+			}
+		};
+		let result = ctx.instantiate(endowment, &mut gas_meter, executable, data, &salt)
+			.and_then(|(account_id, result)| {
+				let rent_projection = if compute_projection {
+					Some(Rent::<T, PrefabWasmModule<T>>::compute_projection(&account_id)
+						.map_err(|_| <Error<T>>::NewContractNotFunded)?)
+				} else {
+					None
+				};
+
+				Ok(InstantiateReturnValue {
+					result,
+					account_id,
+					rent_projection,
+				})
+		});
+		ContractInstantiateResult {
+			result: result.map_err(|e| e.error),
+			gas_consumed: gas_meter.gas_spent(),
+			debug_message: Bytes(Vec::new()),
 		}
 	}
 
diff --git a/frame/contracts/src/rent.rs b/frame/contracts/src/rent.rs
index 8605451ad1ee..321fe151c300 100644
--- a/frame/contracts/src/rent.rs
+++ b/frame/contracts/src/rent.rs
@@ -388,7 +388,7 @@ where
 			None | Some(ContractInfo::Tombstone(_)) => return Err(IsTombstone),
 			Some(ContractInfo::Alive(contract)) => contract,
 		};
-		let module = PrefabWasmModule::from_storage_noinstr(alive_contract_info.code_hash)
+		let module = <PrefabWasmModule<T>>::from_storage_noinstr(alive_contract_info.code_hash)
 			.map_err(|_| IsTombstone)?;
 		let code_size = module.occupied_storage();
 		let current_block_number = <frame_system::Pallet<T>>::block_number();
@@ -399,8 +399,11 @@ where
 			&alive_contract_info,
 			code_size,
 		);
+
+		// We skip the eviction in case one is in order.
+		// Evictions should only be performed by [`try_eviction`].
 		let new_contract_info = Self::enact_verdict(
-			account, alive_contract_info, current_block_number, verdict, Some(module),
+			account, alive_contract_info, current_block_number, verdict, None,
 		);
 
 		// Check what happened after enaction of the verdict.
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index 802118bfb069..b72ef652ce26 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -30,6 +30,7 @@ use crate::{
 };
 use assert_matches::assert_matches;
 use codec::Encode;
+use sp_core::Bytes;
 use sp_runtime::{
 	traits::{BlakeTwo256, Hash, IdentityLookup, Convert},
 	testing::{Header, H256},
@@ -1886,7 +1887,7 @@ fn crypto_hashes() {
 					0,
 					GAS_LIMIT,
 					params,
-				).exec_result.unwrap();
+				).result.unwrap();
 				assert!(result.is_success());
 				let expected = hash_fn(input.as_ref());
 				assert_eq!(&result.data[..*expected_size], &*expected);
@@ -1921,7 +1922,7 @@ fn transfer_return_code() {
 			0,
 			GAS_LIMIT,
 			vec![],
-		).exec_result.unwrap();
+		).result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::BelowSubsistenceThreshold);
 
 		// Contract has enough total balance in order to not go below the subsistence
@@ -1935,7 +1936,7 @@ fn transfer_return_code() {
 			0,
 			GAS_LIMIT,
 			vec![],
-		).exec_result.unwrap();
+		).result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::TransferFailed);
 	});
 }
@@ -1969,7 +1970,7 @@ fn call_return_code() {
 			0,
 			GAS_LIMIT,
 			AsRef::<[u8]>::as_ref(&DJANGO).to_vec(),
-		).exec_result.unwrap();
+		).result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::NotCallable);
 
 		assert_ok!(
@@ -1992,7 +1993,7 @@ fn call_return_code() {
 			0,
 			GAS_LIMIT,
 			AsRef::<[u8]>::as_ref(&addr_django).iter().chain(&0u32.to_le_bytes()).cloned().collect(),
-		).exec_result.unwrap();
+		).result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::BelowSubsistenceThreshold);
 
 		// Contract has enough total balance in order to not go below the subsistence
@@ -2006,7 +2007,7 @@ fn call_return_code() {
 			0,
 			GAS_LIMIT,
 			AsRef::<[u8]>::as_ref(&addr_django).iter().chain(&0u32.to_le_bytes()).cloned().collect(),
-		).exec_result.unwrap();
+		).result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::TransferFailed);
 
 		// Contract has enough balance but callee reverts because "1" is passed.
@@ -2017,7 +2018,7 @@ fn call_return_code() {
 			0,
 			GAS_LIMIT,
 			AsRef::<[u8]>::as_ref(&addr_django).iter().chain(&1u32.to_le_bytes()).cloned().collect(),
-		).exec_result.unwrap();
+		).result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::CalleeReverted);
 
 		// Contract has enough balance but callee traps because "2" is passed.
@@ -2027,7 +2028,7 @@ fn call_return_code() {
 			0,
 			GAS_LIMIT,
 			AsRef::<[u8]>::as_ref(&addr_django).iter().chain(&2u32.to_le_bytes()).cloned().collect(),
-		).exec_result.unwrap();
+		).result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::CalleeTrapped);
 
 	});
@@ -2074,7 +2075,7 @@ fn instantiate_return_code() {
 			0,
 			GAS_LIMIT,
 			callee_hash.clone(),
-		).exec_result.unwrap();
+		).result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::BelowSubsistenceThreshold);
 
 		// Contract has enough total balance in order to not go below the subsistence
@@ -2088,7 +2089,7 @@ fn instantiate_return_code() {
 			0,
 			GAS_LIMIT,
 			callee_hash.clone(),
-		).exec_result.unwrap();
+		).result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::TransferFailed);
 
 		// Contract has enough balance but the passed code hash is invalid
@@ -2099,7 +2100,7 @@ fn instantiate_return_code() {
 			0,
 			GAS_LIMIT,
 			vec![0; 33],
-		).exec_result.unwrap();
+		).result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::CodeNotFound);
 
 		// Contract has enough balance but callee reverts because "1" is passed.
@@ -2109,7 +2110,7 @@ fn instantiate_return_code() {
 			0,
 			GAS_LIMIT,
 			callee_hash.iter().chain(&1u32.to_le_bytes()).cloned().collect(),
-		).exec_result.unwrap();
+		).result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::CalleeReverted);
 
 		// Contract has enough balance but callee traps because "2" is passed.
@@ -2119,7 +2120,7 @@ fn instantiate_return_code() {
 			0,
 			GAS_LIMIT,
 			callee_hash.iter().chain(&2u32.to_le_bytes()).cloned().collect(),
-		).exec_result.unwrap();
+		).result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::CalleeTrapped);
 
 	});
@@ -2209,7 +2210,7 @@ fn chain_extension_works() {
 		);
 		let gas_consumed = result.gas_consumed;
 		assert_eq!(TestExtension::last_seen_buffer(), vec![0, 99]);
-		assert_eq!(result.exec_result.unwrap().data, vec![0, 99]);
+		assert_eq!(result.result.unwrap().data, Bytes(vec![0, 99]));
 
 		// 1 = treat inputs as integer primitives and store the supplied integers
 		Contracts::bare_call(
@@ -2218,7 +2219,7 @@ fn chain_extension_works() {
 			0,
 			GAS_LIMIT,
 			vec![1],
-		).exec_result.unwrap();
+		).result.unwrap();
 		// those values passed in the fixture
 		assert_eq!(TestExtension::last_seen_inputs(), (4, 1, 16, 12));
 
@@ -2230,7 +2231,7 @@ fn chain_extension_works() {
 			GAS_LIMIT,
 			vec![2, 42],
 		);
-		assert_ok!(result.exec_result);
+		assert_ok!(result.result);
 		assert_eq!(result.gas_consumed, gas_consumed + 42);
 
 		// 3 = diverging chain extension call that sets flags to 0x1 and returns a fixed buffer
@@ -2240,9 +2241,9 @@ fn chain_extension_works() {
 			0,
 			GAS_LIMIT,
 			vec![3],
-		).exec_result.unwrap();
+		).result.unwrap();
 		assert_eq!(result.flags, ReturnFlags::REVERT);
-		assert_eq!(result.data, vec![42, 99]);
+		assert_eq!(result.data, Bytes(vec![42, 99]));
 	});
 }
 
@@ -2767,7 +2768,7 @@ fn reinstrument_does_charge() {
 			GAS_LIMIT,
 			zero.clone(),
 		);
-		assert!(result0.exec_result.unwrap().is_success());
+		assert!(result0.result.unwrap().is_success());
 
 		let result1 = Contracts::bare_call(
 			ALICE,
@@ -2776,7 +2777,7 @@ fn reinstrument_does_charge() {
 			GAS_LIMIT,
 			zero.clone(),
 		);
-		assert!(result1.exec_result.unwrap().is_success());
+		assert!(result1.result.unwrap().is_success());
 
 		// They should match because both where called with the same schedule.
 		assert_eq!(result0.gas_consumed, result1.gas_consumed);
@@ -2794,7 +2795,7 @@ fn reinstrument_does_charge() {
 			GAS_LIMIT,
 			zero.clone(),
 		);
-		assert!(result2.exec_result.unwrap().is_success());
+		assert!(result2.result.unwrap().is_success());
 		assert!(result2.gas_consumed > result1.gas_consumed);
 		assert_eq!(
 			result2.gas_consumed,
diff --git a/frame/contracts/src/wasm/mod.rs b/frame/contracts/src/wasm/mod.rs
index 3f92320b94b7..969336b59fa3 100644
--- a/frame/contracts/src/wasm/mod.rs
+++ b/frame/contracts/src/wasm/mod.rs
@@ -27,14 +27,13 @@ mod runtime;
 use crate::{
 	CodeHash, Schedule, Config,
 	wasm::env_def::FunctionImplProvider,
-	exec::{Ext, Executable, ExportedFunction},
+	exec::{Ext, Executable, ExportedFunction, ExecResult},
 	gas::GasMeter,
 };
 use sp_std::prelude::*;
 use sp_core::crypto::UncheckedFrom;
 use codec::{Encode, Decode};
 use frame_support::dispatch::DispatchError;
-use pallet_contracts_primitives::ExecResult;
 pub use self::runtime::{ReturnCode, Runtime, RuntimeToken};
 #[cfg(feature = "runtime-benchmarks")]
 pub use self::code_cache::reinstrument;
@@ -246,17 +245,20 @@ mod tests {
 	use super::*;
 	use crate::{
 		CodeHash, BalanceOf, Error, Pallet as Contracts,
-		exec::{Ext, StorageKey, AccountIdOf, Executable, SeedOf, BlockNumberOf, RentParams},
+		exec::{
+			Ext, StorageKey, AccountIdOf, Executable, SeedOf, BlockNumberOf,
+			RentParams, ExecError, ErrorOrigin,
+		},
 		gas::GasMeter,
 		tests::{Test, Call, ALICE, BOB},
 	};
 	use std::collections::HashMap;
-	use sp_core::H256;
+	use sp_core::{Bytes, H256};
 	use hex_literal::hex;
 	use sp_runtime::DispatchError;
 	use frame_support::{assert_ok, dispatch::DispatchResult, weights::Weight};
 	use assert_matches::assert_matches;
-	use pallet_contracts_primitives::{ExecReturnValue, ReturnFlags, ExecError, ErrorOrigin};
+	use pallet_contracts_primitives::{ExecReturnValue, ReturnFlags};
 	use pretty_assertions::assert_eq;
 
 	const GAS_LIMIT: Weight = 10_000_000_000;
@@ -336,7 +338,7 @@ mod tests {
 				Contracts::<Test>::contract_address(&ALICE, &code_hash, salt),
 				ExecReturnValue {
 					flags: ReturnFlags::empty(),
-					data: Vec::new(),
+					data: Bytes(Vec::new()),
 				},
 				0,
 			))
@@ -367,7 +369,7 @@ mod tests {
 			});
 			// Assume for now that it was just a plain transfer.
 			// TODO: Add tests for different call outcomes.
-			Ok((ExecReturnValue { flags: ReturnFlags::empty(), data: Vec::new() }, 0))
+			Ok((ExecReturnValue { flags: ReturnFlags::empty(), data: Bytes(Vec::new()) }, 0))
 		}
 		fn terminate(
 			&mut self,
@@ -946,7 +948,10 @@ mod tests {
 			&mut GasMeter::new(GAS_LIMIT),
 		).unwrap();
 
-		assert_eq!(output, ExecReturnValue { flags: ReturnFlags::empty(), data: [0x22; 32].to_vec() });
+		assert_eq!(output, ExecReturnValue {
+			flags: ReturnFlags::empty(),
+			data: Bytes([0x22; 32].to_vec())
+		});
 	}
 
 	/// calls `seal_caller` and compares the result with the constant 42.
@@ -1209,7 +1214,7 @@ mod tests {
 			&mut gas_meter,
 		).unwrap();
 
-		let gas_left = Weight::decode(&mut output.data.as_slice()).unwrap();
+		let gas_left = Weight::decode(&mut &*output.data).unwrap();
 		assert!(gas_left < GAS_LIMIT, "gas_left must be less than initial");
 		assert!(gas_left > gas_meter.gas_left(), "gas_left must be greater than final");
 	}
@@ -1299,7 +1304,13 @@ mod tests {
 			&mut GasMeter::new(GAS_LIMIT),
 		).unwrap();
 
-		assert_eq!(output, ExecReturnValue { flags: ReturnFlags::empty(), data: vec![1, 2, 3, 4] });
+		assert_eq!(
+			output,
+			ExecReturnValue {
+				flags: ReturnFlags::empty(),
+				data: Bytes(vec![1, 2, 3, 4])
+			}
+		);
 	}
 
 	const CODE_TIMESTAMP_NOW: &str = r#"
@@ -1526,7 +1537,10 @@ mod tests {
 			output,
 			ExecReturnValue {
 				flags: ReturnFlags::empty(),
-				data: hex!("000102030405060708090A0B0C0D0E0F000102030405060708090A0B0C0D0E0F").to_vec(),
+				data: Bytes(
+					hex!("000102030405060708090A0B0C0D0E0F000102030405060708090A0B0C0D0E0F")
+						.to_vec()
+				),
 			},
 		);
 	}
@@ -1601,10 +1615,10 @@ mod tests {
 			output,
 			ExecReturnValue {
 				flags: ReturnFlags::empty(),
-				data: (
+				data: Bytes((
 						hex!("000102030405060708090A0B0C0D0E0F000102030405060708090A0B0C0D0E0F"),
 						42u64,
-					).encode(),
+					).encode()),
 			},
 		);
 	}
@@ -1837,7 +1851,10 @@ mod tests {
 			&mut GasMeter::new(GAS_LIMIT),
 		).unwrap();
 
-		assert_eq!(output, ExecReturnValue { flags: ReturnFlags::empty(), data: hex!("445566778899").to_vec() });
+		assert_eq!(output, ExecReturnValue {
+			flags: ReturnFlags::empty(),
+			data: Bytes(hex!("445566778899").to_vec()),
+		});
 		assert!(output.is_success());
 	}
 
@@ -1850,7 +1867,10 @@ mod tests {
 			&mut GasMeter::new(GAS_LIMIT),
 		).unwrap();
 
-		assert_eq!(output, ExecReturnValue { flags: ReturnFlags::REVERT, data: hex!("5566778899").to_vec() });
+		assert_eq!(output, ExecReturnValue {
+			flags: ReturnFlags::REVERT,
+			data: Bytes(hex!("5566778899").to_vec()),
+		});
 		assert!(!output.is_success());
 	}
 
@@ -1962,7 +1982,7 @@ mod tests {
 			MockExt::default(),
 			&mut GasMeter::new(GAS_LIMIT),
 		).unwrap();
-		let rent_params = <RentParams<Test>>::default().encode();
+		let rent_params = Bytes(<RentParams<Test>>::default().encode());
 		assert_eq!(output, ExecReturnValue { flags: ReturnFlags::empty(), data: rent_params });
 	}
 }
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index f3757e4c2b10..bed56f409d57 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -19,7 +19,7 @@
 
 use crate::{
 	Config, CodeHash, BalanceOf, Error,
-	exec::{Ext, StorageKey, TopicOf},
+	exec::{Ext, StorageKey, TopicOf, ExecResult, ExecError},
 	gas::{GasMeter, Token, ChargedAmount},
 	wasm::env_def::ConvertibleToWasm,
 	schedule::HostFnWeights,
@@ -29,14 +29,14 @@ use frame_support::{dispatch::DispatchError, ensure, traits::Get, weights::Weigh
 use sp_std::prelude::*;
 use codec::{Decode, DecodeAll, Encode};
 use sp_runtime::traits::SaturatedConversion;
-use sp_core::crypto::UncheckedFrom;
+use sp_core::{Bytes, crypto::UncheckedFrom};
 use sp_io::hashing::{
 	keccak_256,
 	blake2_256,
 	blake2_128,
 	sha2_256,
 };
-use pallet_contracts_primitives::{ExecResult, ExecReturnValue, ReturnFlags, ExecError};
+use pallet_contracts_primitives::{ExecReturnValue, ReturnFlags};
 
 /// Every error that can be returned to a contract when it calls any of the host functions.
 ///
@@ -347,19 +347,19 @@ where
 					)?;
 					Ok(ExecReturnValue {
 						flags,
-						data,
+						data: Bytes(data),
 					})
 				},
 				TrapReason::Termination => {
 					Ok(ExecReturnValue {
 						flags: ReturnFlags::empty(),
-						data: Vec::new(),
+						data: Bytes(Vec::new()),
 					})
 				},
 				TrapReason::Restoration => {
 					Ok(ExecReturnValue {
 						flags: ReturnFlags::empty(),
-						data: Vec::new(),
+						data: Bytes(Vec::new()),
 					})
 				},
 				TrapReason::SupervisorError(error) => Err(error)?,
@@ -370,7 +370,7 @@ where
 		match sandbox_result {
 			// No traps were generated. Proceed normally.
 			Ok(_) => {
-				Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: Vec::new() })
+				Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: Bytes(Vec::new()) })
 			}
 			// `Error::Module` is returned only if instantiation or linking failed (i.e.
 			// wasm binary tried to import a function that is not provided by the host).
@@ -596,7 +596,7 @@ where
 
 	/// Fallible conversion of a `ExecResult` to `ReturnCode`.
 	fn exec_into_return_code(from: ExecResult) -> Result<ReturnCode, DispatchError> {
-		use pallet_contracts_primitives::ErrorOrigin::Callee;
+		use crate::exec::ErrorOrigin::Callee;
 
 		let ExecError { error, origin } = match from {
 			Ok(retval) => return Ok(retval.into()),
diff --git a/primitives/core/src/lib.rs b/primitives/core/src/lib.rs
index c72f38ea0827..1f1b88fe2f1c 100644
--- a/primitives/core/src/lib.rs
+++ b/primitives/core/src/lib.rs
@@ -148,6 +148,12 @@ impl Deref for Bytes {
 	fn deref(&self) -> &[u8] { &self.0[..] }
 }
 
+impl codec::WrapperTypeEncode for Bytes {}
+
+impl codec::WrapperTypeDecode for Bytes {
+	type Wrapped = Vec<u8>;
+}
+
 #[cfg(feature = "std")]
 impl sp_std::str::FromStr for Bytes {
 	type Err = bytes::FromHexError;

From e09d142dea114b2bc7ed1d95a97899412d88b091 Mon Sep 17 00:00:00 2001
From: Xiliang Chen <xlchen1291@gmail.com>
Date: Tue, 13 Apr 2021 23:52:20 +1200
Subject: [PATCH 0642/1194] expose set_timestamp for runtime benchmarks (#8601)

* expose set_timestamp for runtime benchmarks

* Update frame/timestamp/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
---
 frame/timestamp/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frame/timestamp/src/lib.rs b/frame/timestamp/src/lib.rs
index 301d993c09b7..ce6fd09bb782 100644
--- a/frame/timestamp/src/lib.rs
+++ b/frame/timestamp/src/lib.rs
@@ -258,7 +258,7 @@ impl<T: Config> Pallet<T> {
 	}
 
 	/// Set the timestamp to something in particular. Only used for tests.
-	#[cfg(feature = "std")]
+	#[cfg(any(feature = "runtime-benchmarks", feature = "std"))]
 	pub fn set_timestamp(now: T::Moment) {
 		Now::<T>::put(now);
 	}

From 565078a965698c425cd909db55abb3b381e27701 Mon Sep 17 00:00:00 2001
From: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
Date: Tue, 13 Apr 2021 15:17:32 +0200
Subject: [PATCH 0643/1194] Trim compact solution for length during preparation
 (#8317)

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
---
 bin/node/runtime/src/lib.rs                   |   6 +
 .../election-provider-multi-phase/src/lib.rs  |   9 +-
 .../election-provider-multi-phase/src/mock.rs |   2 +
 .../src/unsigned.rs                           | 170 +++++++++++++++++-
 4 files changed, 183 insertions(+), 4 deletions(-)

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index aaf470ed3376..b2a59d587db9 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -517,6 +517,11 @@ parameter_types! {
 		.get(DispatchClass::Normal)
 		.max_extrinsic.expect("Normal extrinsics have a weight limit configured; qed")
 		.saturating_sub(BlockExecutionWeight::get());
+	// Solution can occupy 90% of normal block size
+	pub MinerMaxLength: u32 = Perbill::from_rational(9u32, 10) *
+		*RuntimeBlockLength::get()
+		.max
+		.get(DispatchClass::Normal);
 }
 
 sp_npos_elections::generate_solution_type!(
@@ -539,6 +544,7 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
 	type SolutionImprovementThreshold = SolutionImprovementThreshold;
 	type MinerMaxIterations = MinerMaxIterations;
 	type MinerMaxWeight = MinerMaxWeight;
+	type MinerMaxLength = MinerMaxLength;
 	type MinerTxPriority = MultiPhaseUnsignedPriority;
 	type DataProvider = Staking;
 	type OnChainAccuracy = Perbill;
diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index 17978566a858..c59d68a33adb 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -534,12 +534,19 @@ pub mod pallet {
 		/// Maximum number of iteration of balancing that will be executed in the embedded miner of
 		/// the pallet.
 		type MinerMaxIterations: Get<u32>;
+
 		/// Maximum weight that the miner should consume.
 		///
 		/// The miner will ensure that the total weight of the unsigned solution will not exceed
-		/// this values, based on [`WeightInfo::submit_unsigned`].
+		/// this value, based on [`WeightInfo::submit_unsigned`].
 		type MinerMaxWeight: Get<Weight>;
 
+		/// Maximum length (bytes) that the mined solution should consume.
+		///
+		/// The miner will ensure that the total length of the unsigned solution will not exceed
+		/// this value.
+		type MinerMaxLength: Get<u32>;
+
 		/// Something that will provide the election data.
 		type DataProvider: ElectionDataProvider<Self::AccountId, Self::BlockNumber>;
 
diff --git a/frame/election-provider-multi-phase/src/mock.rs b/frame/election-provider-multi-phase/src/mock.rs
index 5a0a83354b26..79e6e952bfec 100644
--- a/frame/election-provider-multi-phase/src/mock.rs
+++ b/frame/election-provider-multi-phase/src/mock.rs
@@ -205,6 +205,7 @@ parameter_types! {
 	pub static MinerTxPriority: u64 = 100;
 	pub static SolutionImprovementThreshold: Perbill = Perbill::zero();
 	pub static MinerMaxWeight: Weight = BlockWeights::get().max_block;
+	pub static MinerMaxLength: u32 = 256;
 	pub static MockWeightInfo: bool = false;
 
 
@@ -277,6 +278,7 @@ impl crate::Config for Runtime {
 	type SolutionImprovementThreshold = SolutionImprovementThreshold;
 	type MinerMaxIterations = MinerMaxIterations;
 	type MinerMaxWeight = MinerMaxWeight;
+	type MinerMaxLength = MinerMaxLength;
 	type MinerTxPriority = MinerTxPriority;
 	type DataProvider = StakingMock;
 	type WeightInfo = DualMockWeightInfo;
diff --git a/frame/election-provider-multi-phase/src/unsigned.rs b/frame/election-provider-multi-phase/src/unsigned.rs
index 6b0d237c6e0a..26e51cf58b34 100644
--- a/frame/election-provider-multi-phase/src/unsigned.rs
+++ b/frame/election-provider-multi-phase/src/unsigned.rs
@@ -46,6 +46,8 @@ pub enum MinerError {
 	PreDispatchChecksFailed,
 	/// The solution generated from the miner is not feasible.
 	Feasibility(FeasibilityError),
+	/// There are no more voters to remove to trim the solution.
+	NoMoreVoters,
 }
 
 impl From<sp_npos_elections::Error> for MinerError {
@@ -177,8 +179,13 @@ impl<T: Config> Pallet<T> {
 			maximum_allowed_voters,
 		);
 
-		// trim weight.
-		let compact = Self::trim_compact(maximum_allowed_voters, compact, &voter_index)?;
+		// trim length and weight
+		let compact = Self::trim_compact_weight(maximum_allowed_voters, compact, &voter_index)?;
+		let compact = Self::trim_compact_length(
+			T::MinerMaxLength::get(),
+			compact,
+			&voter_index,
+		)?;
 
 		// re-calc score.
 		let winners = sp_npos_elections::to_without_backing(winners);
@@ -221,7 +228,7 @@ impl<T: Config> Pallet<T> {
 	///
 	/// Indeed, the score must be computed **after** this step. If this step reduces the score too
 	/// much or remove a winner, then the solution must be discarded **after** this step.
-	pub fn trim_compact<FN>(
+	pub fn trim_compact_weight<FN>(
 		maximum_allowed_voters: u32,
 		mut compact: CompactOf<T>,
 		voter_index: FN,
@@ -267,6 +274,50 @@ impl<T: Config> Pallet<T> {
 		}
 	}
 
+	/// Greedily reduce the size of the solution to fit into the block w.r.t length.
+	///
+	/// The length of the solution is largely a function of the number of voters. The number of
+	/// winners cannot be changed. Thus, to reduce the solution size, we need to strip voters.
+	///
+	/// Note that this solution is already computed, and winners are elected based on the merit of
+	/// the total stake in the system. Nevertheless, some of the voters may be removed here.
+	///
+	/// Sometimes, removing a voter can cause a validator to also be implicitly removed, if
+	/// that voter was the only backer of that winner. In such cases, this solution is invalid, which
+	/// will be caught prior to submission.
+	///
+	/// The score must be computed **after** this step. If this step reduces the score too much,
+	/// then the solution must be discarded.
+	pub fn trim_compact_length(
+		max_allowed_length: u32,
+		mut compact: CompactOf<T>,
+		voter_index: impl Fn(&T::AccountId) -> Option<CompactVoterIndexOf<T>>,
+	) -> Result<CompactOf<T>, MinerError> {
+		// short-circuit to avoid getting the voters if possible
+		// this involves a redundant encoding, but that should hopefully be relatively cheap
+		if (compact.encoded_size().saturated_into::<u32>()) <= max_allowed_length {
+			return Ok(compact);
+		}
+
+		// grab all voters and sort them by least stake.
+		let RoundSnapshot { voters, .. } =
+			Self::snapshot().ok_or(MinerError::SnapshotUnAvailable)?;
+		let mut voters_sorted = voters
+			.into_iter()
+			.map(|(who, stake, _)| (who.clone(), stake))
+			.collect::<Vec<_>>();
+		voters_sorted.sort_by_key(|(_, y)| *y);
+		voters_sorted.reverse();
+
+		while compact.encoded_size() > max_allowed_length.saturated_into() {
+			let (smallest_stake_voter, _) = voters_sorted.pop().ok_or(MinerError::NoMoreVoters)?;
+			let index = voter_index(&smallest_stake_voter).ok_or(MinerError::SnapshotUnAvailable)?;
+			compact.remove_voter(index);
+		}
+
+		Ok(compact)
+	}
+
 	/// Find the maximum `len` that a compact can have in order to fit into the block weight.
 	///
 	/// This only returns a value between zero and `size.nominators`.
@@ -506,6 +557,7 @@ mod tests {
 		Call, *,
 	};
 	use frame_support::{dispatch::Dispatchable, traits::OffchainWorker};
+	use helpers::voter_index_fn_linear;
 	use mock::Call as OuterCall;
 	use frame_election_provider_support::Assignment;
 	use sp_runtime::{traits::ValidateUnsigned, PerU16};
@@ -889,4 +941,116 @@ mod tests {
 			assert!(matches!(call, OuterCall::MultiPhase(Call::submit_unsigned(_, _))));
 		})
 	}
+
+	#[test]
+	fn trim_compact_length_does_not_modify_when_short_enough() {
+		let mut ext = ExtBuilder::default().build();
+		ext.execute_with(|| {
+			roll_to(25);
+
+			// given
+			let RoundSnapshot { voters, ..} = MultiPhase::snapshot().unwrap();
+			let RawSolution { mut compact, .. } = raw_solution();
+			let encoded_len = compact.encode().len() as u32;
+			let compact_clone = compact.clone();
+
+			// when
+			assert!(encoded_len < <Runtime as Config>::MinerMaxLength::get());
+
+			// then
+			compact = MultiPhase::trim_compact_length(
+				encoded_len,
+				compact,
+				voter_index_fn_linear::<Runtime>(&voters),
+			).unwrap();
+			assert_eq!(compact, compact_clone);
+		});
+	}
+
+	#[test]
+	fn trim_compact_length_modifies_when_too_long() {
+		let mut ext = ExtBuilder::default().build();
+		ext.execute_with(|| {
+			roll_to(25);
+
+			let RoundSnapshot { voters, ..} =
+				MultiPhase::snapshot().unwrap();
+
+			let RawSolution { mut compact, .. } = raw_solution();
+			let encoded_len = compact.encoded_size() as u32;
+			let compact_clone = compact.clone();
+
+			compact = MultiPhase::trim_compact_length(
+				encoded_len - 1,
+				compact,
+				voter_index_fn_linear::<Runtime>(&voters),
+			).unwrap();
+
+			assert_ne!(compact, compact_clone);
+			assert!((compact.encoded_size() as u32) < encoded_len);
+		});
+	}
+
+	#[test]
+	fn trim_compact_length_trims_lowest_stake() {
+		let mut ext = ExtBuilder::default().build();
+		ext.execute_with(|| {
+			roll_to(25);
+
+			let RoundSnapshot { voters, ..} =
+				MultiPhase::snapshot().unwrap();
+
+			let RawSolution { mut compact, .. } = raw_solution();
+			let encoded_len = compact.encoded_size() as u32;
+			let voter_count = compact.voter_count();
+			let min_stake_voter = voters.iter()
+				.map(|(id, weight, _)| (weight, id))
+				.min()
+				.map(|(_, id)| id)
+				.unwrap();
+
+
+			compact = MultiPhase::trim_compact_length(
+				encoded_len - 1,
+				compact,
+				voter_index_fn_linear::<Runtime>(&voters),
+			).unwrap();
+
+			assert_eq!(compact.voter_count(), voter_count - 1, "we must have removed exactly 1 voter");
+
+			let assignments = compact.into_assignment(
+				|voter| Some(voter as AccountId),
+				|target| Some(target as AccountId),
+			).unwrap();
+			assert!(
+				assignments.iter()
+					.all(|Assignment{ who, ..}| who != min_stake_voter),
+				"min_stake_voter must no longer be in the set of voters",
+			);
+		});
+	}
+
+	// all the other solution-generation functions end up delegating to `mine_solution`, so if we
+	// demonstrate that `mine_solution` solutions are all trimmed to an acceptable length, then
+	// we know that higher-level functions will all also have short-enough solutions.
+	#[test]
+	fn mine_solution_solutions_always_within_acceptable_length() {
+		let mut ext = ExtBuilder::default().build();
+		ext.execute_with(|| {
+			roll_to(25);
+
+			// how long would the default solution be?
+			let solution = MultiPhase::mine_solution(0).unwrap();
+			let max_length = <Runtime as Config>::MinerMaxLength::get();
+			let solution_size = solution.0.compact.encoded_size();
+			assert!(solution_size <= max_length as usize);
+
+			// now set the max size to less than the actual size and regenerate
+			<Runtime as Config>::MinerMaxLength::set(solution_size as u32 - 1);
+			let solution = MultiPhase::mine_solution(0).unwrap();
+			let max_length = <Runtime as Config>::MinerMaxLength::get();
+			let solution_size = solution.0.compact.encoded_size();
+			assert!(solution_size <= max_length as usize);
+		});
+	}
 }

From 94ea191e2dcb5239ac3d7c75c3697b645c0393e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Wed, 14 Apr 2021 09:58:26 +0100
Subject: [PATCH 0644/1194] build: update shell.nix (#8616)

---
 shell.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/shell.nix b/shell.nix
index 85bdce797cb8..a6a8d4187cd4 100644
--- a/shell.nix
+++ b/shell.nix
@@ -5,14 +5,13 @@ let
       rev = "57c8084c7ef41366993909c20491e359bbb90f54";
     });
   nixpkgs = import <nixpkgs> { overlays = [ mozillaOverlay ]; };
-  rust-nightly = with nixpkgs; ((rustChannelOf { date = "2020-10-23"; channel = "nightly"; }).rust.override {
+  rust-nightly = with nixpkgs; ((rustChannelOf { date = "2021-03-01"; channel = "nightly"; }).rust.override {
     targets = [ "wasm32-unknown-unknown" ];
   });
 in
 with nixpkgs; pkgs.mkShell {
   buildInputs = [
     clang
-    cmake
     pkg-config
     rust-nightly
   ] ++ stdenv.lib.optionals stdenv.isDarwin [

From 99f8e8c1a49e6cc3cfe0850f3ecad5804ce818f7 Mon Sep 17 00:00:00 2001
From: Vladislav <negigic@gmail.com>
Date: Wed, 14 Apr 2021 12:16:12 +0300
Subject: [PATCH 0645/1194] Add Sora network SS58 Address (#8261)

* Add Sora network SS58 Address

Signed-off-by: Vladislav Markushin <negigic@gmail.com>

* Update Sora network SS58 Address to `69`

Signed-off-by: Vladislav Markushin <negigic@gmail.com>

Co-authored-by: thiolliere <gui.thiolliere@gmail.com>
---
 primitives/core/src/crypto.rs | 2 ++
 ss58-registry.json            | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index aedfbd748650..3479fc28c635 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -586,6 +586,8 @@ ss58_address_format!(
 		(65, "aventus", "Aventus Chain mainnet, standard account (*25519).")
 	CrustAccount =>
 		(66, "crust", "Crust Network, standard account (*25519).")
+	SoraAccount =>
+		(69, "sora", "SORA Network, standard account (*25519).")
 	SocialAccount =>
 		(252, "social-network", "Social Network, standard account (*25519).")
 	// Note: 16384 and above are reserved.
diff --git a/ss58-registry.json b/ss58-registry.json
index 97b3b064e96d..624d0256a81f 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -478,6 +478,15 @@
 			"standardAccount": "*25519",
 			"website": "https://crust.network"
 		},
+		{
+			"prefix": 69,
+			"network": "sora",
+			"displayName": "SORA Network",
+			"symbols": ["XOR"],
+			"decimals": [18],
+			"standardAccount": "*25519",
+			"website": "https://sora.org"
+		},
 		{
 			"prefix": 252,
 			"network": "social-network",

From 46049fc56a42862a76f5e4ed31a092811019d4db Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Wed, 14 Apr 2021 11:44:09 +0200
Subject: [PATCH 0646/1194] Make non-validators listen on /ws by default
 (#8609)

* Make non-validators listen on /ws by default

* Fix WS path
---
 client/cli/src/config.rs                |  3 +++
 client/cli/src/params/network_params.rs | 36 ++++++++++++++++++-------
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/client/cli/src/config.rs b/client/cli/src/config.rs
index 289d6dc7cc39..a21a79afe9fd 100644
--- a/client/cli/src/config.rs
+++ b/client/cli/src/config.rs
@@ -159,6 +159,7 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 		&self,
 		chain_spec: &Box<dyn ChainSpec>,
 		is_dev: bool,
+		is_validator: bool,
 		net_config_dir: PathBuf,
 		client_id: &str,
 		node_name: &str,
@@ -169,6 +170,7 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 			network_params.network_config(
 				chain_spec,
 				is_dev,
+				is_validator,
 				Some(net_config_dir),
 				client_id,
 				node_name,
@@ -501,6 +503,7 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 			network: self.network_config(
 				&chain_spec,
 				is_dev,
+				is_validator,
 				net_config_dir,
 				client_id.as_str(),
 				self.node_name()?.as_str(),
diff --git a/client/cli/src/params/network_params.rs b/client/cli/src/params/network_params.rs
index f4a6e8d3982b..24245cd57a5e 100644
--- a/client/cli/src/params/network_params.rs
+++ b/client/cli/src/params/network_params.rs
@@ -22,7 +22,7 @@ use sc_network::{
 	multiaddr::Protocol,
 };
 use sc_service::{ChainSpec, ChainType, config::{Multiaddr, MultiaddrWithPeerId}};
-use std::path::PathBuf;
+use std::{borrow::Cow, path::PathBuf};
 use structopt::StructOpt;
 
 /// Parameters used to create the network configuration.
@@ -53,6 +53,10 @@ pub struct NetworkParams {
 	pub public_addr: Vec<Multiaddr>,
 
 	/// Listen on this multiaddress.
+	///
+	/// By default:
+	/// If `--validator` is passed: `/ip4/0.0.0.0/tcp/<port>` and `/ip6/[::]/tcp/<port>`.
+	/// Otherwise: `/ip4/0.0.0.0/tcp/<port>/ws` and `/ip6/[::]/tcp/<port>/ws`.
 	#[structopt(long = "listen-addr", value_name = "LISTEN_ADDR")]
 	pub listen_addr: Vec<Multiaddr>,
 
@@ -122,6 +126,7 @@ impl NetworkParams {
 		&self,
 		chain_spec: &Box<dyn ChainSpec>,
 		is_dev: bool,
+		is_validator: bool,
 		net_config_path: Option<PathBuf>,
 		client_id: &str,
 		node_name: &str,
@@ -131,14 +136,27 @@ impl NetworkParams {
 		let port = self.port.unwrap_or(default_listen_port);
 
 		let listen_addresses = if self.listen_addr.is_empty() {
-			vec![
-				Multiaddr::empty()
-					.with(Protocol::Ip6([0, 0, 0, 0, 0, 0, 0, 0].into()))
-					.with(Protocol::Tcp(port)),
-				Multiaddr::empty()
-					.with(Protocol::Ip4([0, 0, 0, 0].into()))
-					.with(Protocol::Tcp(port)),
-			]
+			if is_validator {
+				vec![
+					Multiaddr::empty()
+						.with(Protocol::Ip6([0, 0, 0, 0, 0, 0, 0, 0].into()))
+						.with(Protocol::Tcp(port)),
+					Multiaddr::empty()
+						.with(Protocol::Ip4([0, 0, 0, 0].into()))
+						.with(Protocol::Tcp(port)),
+				]
+			} else {
+				vec![
+					Multiaddr::empty()
+						.with(Protocol::Ip6([0, 0, 0, 0, 0, 0, 0, 0].into()))
+						.with(Protocol::Tcp(port))
+						.with(Protocol::Ws(Cow::Borrowed("/"))),
+					Multiaddr::empty()
+						.with(Protocol::Ip4([0, 0, 0, 0].into()))
+						.with(Protocol::Tcp(port))
+						.with(Protocol::Ws(Cow::Borrowed("/"))),
+				]
+			}
 		} else {
 			self.listen_addr.clone()
 		};

From bb799f4933c38aacaa90b9ad2e10e9742fc7a33d Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Wed, 14 Apr 2021 14:40:18 +0200
Subject: [PATCH 0647/1194] Increase metric only if actually publishing (#8618)

---
 client/authority-discovery/src/worker.rs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/client/authority-discovery/src/worker.rs b/client/authority-discovery/src/worker.rs
index f05c6d460458..fb1fb6ce5864 100644
--- a/client/authority-discovery/src/worker.rs
+++ b/client/authority-discovery/src/worker.rs
@@ -290,6 +290,15 @@ where
 			Role::Discover => return Ok(()),
 		};
 
+		let keys = Worker::<Client, Network, Block, DhtEventStream>::get_own_public_keys_within_authority_set(
+			key_store.clone(),
+			self.client.as_ref(),
+		).await?.into_iter().map(Into::into).collect::<HashSet<_>>();
+
+		if only_if_changed && keys == self.latest_published_keys {
+			return Ok(())
+		}
+
 		let addresses = self.addresses_to_publish();
 
 		if let Some(metrics) = &self.metrics {
@@ -304,15 +313,6 @@ where
 			.encode(&mut serialized_addresses)
 			.map_err(Error::EncodingProto)?;
 
-		let keys = Worker::<Client, Network, Block, DhtEventStream>::get_own_public_keys_within_authority_set(
-			key_store.clone(),
-			self.client.as_ref(),
-		).await?.into_iter().map(Into::into).collect::<HashSet<_>>();
-
-		if only_if_changed && keys == self.latest_published_keys {
-			return Ok(())
-		}
-
 		let keys_vec = keys.iter().cloned().collect::<Vec<_>>();
 		let signatures = key_store.sign_with_all(
 			key_types::AUTHORITY_DISCOVERY,

From 3b0c289402c76409e1f655f1e64aae1c3dc3f3b7 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Wed, 14 Apr 2021 15:19:33 +0200
Subject: [PATCH 0648/1194] Fix debug_assertion failing in authority discovery
 (#8599)

* Fix debug_assertion failing in authority discovery

* Improve test

* Change the map_or for invalid addresses

* Remove debug_assertion
---
 .../src/worker/addr_cache.rs                  | 126 +++++++++++++++++-
 1 file changed, 122 insertions(+), 4 deletions(-)

diff --git a/client/authority-discovery/src/worker/addr_cache.rs b/client/authority-discovery/src/worker/addr_cache.rs
index 13b259fbbb10..7cefff1aaff0 100644
--- a/client/authority-discovery/src/worker/addr_cache.rs
+++ b/client/authority-discovery/src/worker/addr_cache.rs
@@ -24,6 +24,9 @@ use sc_network::PeerId;
 
 /// Cache for [`AuthorityId`] -> [`Vec<Multiaddr>`] and [`PeerId`] -> [`AuthorityId`] mappings.
 pub(super) struct AddrCache {
+	// The addresses found in `authority_id_to_addresses` are guaranteed to always match
+	// the peerids found in `peer_id_to_authority_id`. In other words, these two hashmaps
+	// are similar to a bi-directional map.
 	authority_id_to_addresses: HashMap<AuthorityId, Vec<Multiaddr>>,
 	peer_id_to_authority_id: HashMap<PeerId, AuthorityId>,
 }
@@ -43,17 +46,44 @@ impl AddrCache {
 			return;
 		}
 
+		addresses.sort_unstable_by(|a, b| a.as_ref().cmp(b.as_ref()));
+
 		// Insert into `self.peer_id_to_authority_id`.
 		let peer_ids = addresses.iter()
 			.map(|a| peer_id_from_multiaddr(a))
 			.filter_map(|peer_id| peer_id);
-		for peer_id in  peer_ids {
-			self.peer_id_to_authority_id.insert(peer_id, authority_id.clone());
+		for peer_id in peer_ids.clone() {
+			let former_auth = match self.peer_id_to_authority_id.insert(peer_id, authority_id.clone()) {
+				Some(a) if a != authority_id => a,
+				_ => continue,
+			};
+
+			// PeerId was associated to a different authority id before.
+			// Remove corresponding authority from `self.authority_id_to_addresses`.
+			let former_auth_addrs = match self.authority_id_to_addresses.get_mut(&former_auth) {
+				Some(a) => a,
+				None => { debug_assert!(false); continue }
+			};
+			former_auth_addrs.retain(|a| peer_id_from_multiaddr(a).map_or(true, |p| p != peer_id));
 		}
 
 		// Insert into `self.authority_id_to_addresses`.
-		addresses.sort_unstable_by(|a, b| a.as_ref().cmp(b.as_ref()));
-		self.authority_id_to_addresses.insert(authority_id, addresses);
+		for former_addr in
+			self.authority_id_to_addresses.insert(authority_id.clone(), addresses.clone()).unwrap_or_default()
+		{
+			// Must remove from `self.peer_id_to_authority_id` any PeerId formerly associated
+			// to that authority but that can't be found in its new addresses.
+
+			let peer_id = match peer_id_from_multiaddr(&former_addr) {
+				Some(p) => p,
+				None => continue,
+			};
+
+			if !peer_ids.clone().any(|p| p == peer_id) {
+				let _old_auth = self.peer_id_to_authority_id.remove(&peer_id);
+				debug_assert!(_old_auth.is_some());
+			}
+		}
 	}
 
 	/// Returns the number of authority IDs in the cache.
@@ -144,6 +174,25 @@ mod tests {
 		}
 	}
 
+	#[derive(Clone, Debug)]
+	struct TestMultiaddrsSamePeerCombo(Multiaddr, Multiaddr);
+
+	impl Arbitrary for TestMultiaddrsSamePeerCombo {
+		fn arbitrary(g: &mut Gen) -> Self {
+			let seed = (0..32).map(|_| u8::arbitrary(g)).collect::<Vec<_>>();
+			let peer_id = PeerId::from_multihash(
+				Multihash::wrap(multihash::Code::Sha2_256.into(), &seed).unwrap()
+			).unwrap();
+			let multiaddr1 = "/ip6/2001:db8:0:0:0:0:0:2/tcp/30333".parse::<Multiaddr>()
+				.unwrap()
+				.with(Protocol::P2p(peer_id.clone().into()));
+			let multiaddr2 = "/ip6/2002:db8:0:0:0:0:0:2/tcp/30133".parse::<Multiaddr>()
+				.unwrap()
+				.with(Protocol::P2p(peer_id.into()));
+			TestMultiaddrsSamePeerCombo(multiaddr1, multiaddr2)
+		}
+	}
+
 	#[test]
 	fn retains_only_entries_of_provided_authority_ids() {
 		fn property(
@@ -190,4 +239,73 @@ mod tests {
 			.max_tests(10)
 			.quickcheck(property as fn(_, _, _) -> TestResult)
 	}
+
+	#[test]
+	fn keeps_consistency_between_authority_id_and_peer_id() {
+		fn property(
+			authority1: TestAuthorityId,
+			authority2: TestAuthorityId,
+			multiaddr1: TestMultiaddr,
+			multiaddr2: TestMultiaddr,
+			multiaddr3: TestMultiaddrsSamePeerCombo,
+		) -> TestResult {
+			let authority1 = authority1.0;
+			let authority2 = authority2.0;
+			let multiaddr1 = multiaddr1.0;
+			let multiaddr2 = multiaddr2.0;
+			let TestMultiaddrsSamePeerCombo(multiaddr3, multiaddr4) = multiaddr3;
+
+			let mut cache = AddrCache::new();
+
+			cache.insert(authority1.clone(), vec![multiaddr1.clone()]);
+			cache.insert(authority1.clone(), vec![multiaddr2.clone(), multiaddr3.clone(), multiaddr4.clone()]);
+
+			assert_eq!(
+				None,
+				cache.get_authority_id_by_peer_id(&peer_id_from_multiaddr(&multiaddr1).unwrap())
+			);
+			assert_eq!(
+				Some(&authority1),
+				cache.get_authority_id_by_peer_id(&peer_id_from_multiaddr(&multiaddr2).unwrap())
+			);
+			assert_eq!(
+				Some(&authority1),
+				cache.get_authority_id_by_peer_id(&peer_id_from_multiaddr(&multiaddr3).unwrap())
+			);
+			assert_eq!(
+				Some(&authority1),
+				cache.get_authority_id_by_peer_id(&peer_id_from_multiaddr(&multiaddr4).unwrap())
+			);
+
+			cache.insert(authority2.clone(), vec![multiaddr2.clone()]);
+
+			assert_eq!(
+				Some(&authority2),
+				cache.get_authority_id_by_peer_id(&peer_id_from_multiaddr(&multiaddr2).unwrap())
+			);
+			assert_eq!(
+				Some(&authority1),
+				cache.get_authority_id_by_peer_id(&peer_id_from_multiaddr(&multiaddr3).unwrap())
+			);
+			assert_eq!(cache.get_addresses_by_authority_id(&authority1).unwrap().len(), 2);
+
+			cache.insert(authority2.clone(), vec![multiaddr2.clone(), multiaddr3.clone()]);
+
+			assert_eq!(
+				Some(&authority2),
+				cache.get_authority_id_by_peer_id(&peer_id_from_multiaddr(&multiaddr2).unwrap())
+			);
+			assert_eq!(
+				Some(&authority2),
+				cache.get_authority_id_by_peer_id(&peer_id_from_multiaddr(&multiaddr3).unwrap())
+			);
+			assert!(cache.get_addresses_by_authority_id(&authority1).unwrap().is_empty());
+
+			TestResult::passed()
+		}
+
+		QuickCheck::new()
+			.max_tests(10)
+			.quickcheck(property as fn(_, _, _, _, _) -> TestResult)
+	}
 }

From a76aadc4b28311418ee114e23b07da46ecccecfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Wed, 14 Apr 2021 19:56:22 +0200
Subject: [PATCH 0649/1194] Introduce a "dynamic" block size limit for
 proposing (#8588)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Introduce a "dynamic" block size limit for proposing

This adds support for using a dynamic block size limit per call to
`propose`. This is required for Cumulus/Parachains to always use stay in
the limits of the maximum allowed PoV size.

As described in the docs, the block limit is only checked in the process
of pushing transactions. As we normally do some other operations in
`on_finalize`, it can happen that the block size still grows when there
is some proof being collected (as we do for parachains). This means,
that the given block limit needs to be rather conservative on the actual
value and should not be the upper limit.

* Update client/basic-authorship/src/basic_authorship.rs

Co-authored-by: Andronik Ordian <write@reusable.software>

* More future proof encoded size updating

* Use `ProofRecorderInner`

* Update client/basic-authorship/src/basic_authorship.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Update client/basic-authorship/src/basic_authorship.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Update client/basic-authorship/src/basic_authorship.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Update client/consensus/slots/src/lib.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Update client/consensus/slots/src/slots.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Update client/basic-authorship/src/basic_authorship.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Update client/basic-authorship/src/basic_authorship.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Update client/basic-authorship/src/basic_authorship.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

Co-authored-by: Andronik Ordian <write@reusable.software>
Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
---
 bin/node/bench/src/construct.rs               |   1 +
 bin/node/cli/src/service.rs                   |   1 +
 .../basic-authorship/src/basic_authorship.rs  | 181 +++++++++++++++---
 client/basic-authorship/src/lib.rs            |   3 +-
 client/block-builder/src/lib.rs               |  19 ++
 client/consensus/aura/src/lib.rs              |   2 +
 client/consensus/babe/src/tests.rs            |   1 +
 .../consensus/manual-seal/src/seal_block.rs   |   1 +
 client/consensus/pow/src/lib.rs               |   1 +
 client/consensus/slots/src/lib.rs             |   4 +-
 client/consensus/slots/src/slots.rs           |   7 +
 client/db/src/bench.rs                        |  29 +--
 .../api/proc-macro/src/impl_runtime_apis.rs   |  12 +-
 .../proc-macro/src/mock_impl_runtime_apis.rs  |   4 +
 primitives/api/src/lib.rs                     |   5 +-
 primitives/consensus/common/src/evaluation.rs |   8 -
 primitives/consensus/common/src/lib.rs        |   8 +
 .../state-machine/src/proving_backend.rs      | 127 ++++++++++--
 test-utils/runtime/src/lib.rs                 |   2 +-
 19 files changed, 336 insertions(+), 80 deletions(-)

diff --git a/bin/node/bench/src/construct.rs b/bin/node/bench/src/construct.rs
index 8469ec62893b..652466231714 100644
--- a/bin/node/bench/src/construct.rs
+++ b/bin/node/bench/src/construct.rs
@@ -171,6 +171,7 @@ impl core::Benchmark for ConstructionBenchmark {
 				inherent_data_providers.create_inherent_data().expect("Create inherent data failed"),
 				Default::default(),
 				std::time::Duration::from_secs(20),
+				None,
 			),
 		).map(|r| r.block).expect("Proposing failed");
 
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index ce0ffb2cecc0..5fa7aa00df56 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -679,6 +679,7 @@ mod tests {
 						inherent_data,
 						digest,
 						std::time::Duration::from_secs(1),
+						None,
 					).await
 				}).expect("Error making test block").block;
 
diff --git a/client/basic-authorship/src/basic_authorship.rs b/client/basic-authorship/src/basic_authorship.rs
index 910abfad5ae1..c8277d3b5d32 100644
--- a/client/basic-authorship/src/basic_authorship.rs
+++ b/client/basic-authorship/src/basic_authorship.rs
@@ -22,7 +22,7 @@
 
 use std::{pin::Pin, time, sync::Arc};
 use sc_client_api::backend;
-use codec::Decode;
+use codec::{Decode, Encode};
 use sp_consensus::{evaluation, Proposal, ProofRecording, DisableProofRecording, EnableProofRecording};
 use sp_core::traits::SpawnNamed;
 use sp_inherents::InherentData;
@@ -42,14 +42,14 @@ use std::marker::PhantomData;
 use prometheus_endpoint::Registry as PrometheusRegistry;
 use sc_proposer_metrics::MetricsLink as PrometheusMetrics;
 
-/// Default maximum block size in bytes used by [`Proposer`].
+/// Default block size limit in bytes used by [`Proposer`].
 ///
-/// Can be overwritten by [`ProposerFactory::set_maximum_block_size`].
+/// Can be overwritten by [`ProposerFactory::set_block_size_limit`].
 ///
 /// Be aware that there is also an upper packet size on what the networking code
 /// will accept. If the block doesn't fit in such a package, it can not be
 /// transferred to other nodes.
-pub const DEFAULT_MAX_BLOCK_SIZE: usize = 4 * 1024 * 1024 + 512;
+pub const DEFAULT_BLOCK_SIZE_LIMIT: usize = 4 * 1024 * 1024 + 512;
 
 /// Proposer factory.
 pub struct ProposerFactory<A, B, C, PR> {
@@ -60,8 +60,14 @@ pub struct ProposerFactory<A, B, C, PR> {
 	transaction_pool: Arc<A>,
 	/// Prometheus Link,
 	metrics: PrometheusMetrics,
-	max_block_size: usize,
+	/// The default block size limit.
+	///
+	/// If no `block_size_limit` is passed to [`Proposer::propose`], this block size limit will be
+	/// used.
+	default_block_size_limit: usize,
 	telemetry: Option<TelemetryHandle>,
+	/// When estimating the block size, should the proof be included?
+	include_proof_in_block_size_estimation: bool,
 	/// phantom member to pin the `Backend`/`ProofRecording` type.
 	_phantom: PhantomData<(B, PR)>,
 }
@@ -81,9 +87,10 @@ impl<A, B, C> ProposerFactory<A, B, C, DisableProofRecording> {
 			spawn_handle: Box::new(spawn_handle),
 			transaction_pool,
 			metrics: PrometheusMetrics::new(prometheus),
-			max_block_size: DEFAULT_MAX_BLOCK_SIZE,
+			default_block_size_limit: DEFAULT_BLOCK_SIZE_LIMIT,
 			telemetry,
 			client,
+			include_proof_in_block_size_estimation: false,
 			_phantom: PhantomData,
 		}
 	}
@@ -93,6 +100,9 @@ impl<A, B, C> ProposerFactory<A, B, C, EnableProofRecording> {
 	/// Create a new proposer factory with proof recording enabled.
 	///
 	/// Each proposer created by this instance will record a proof while building a block.
+	///
+	/// This will also include the proof into the estimation of the block size. This can be disabled
+	/// by calling [`ProposerFactory::disable_proof_in_block_size_estimation`].
 	pub fn with_proof_recording(
 		spawn_handle: impl SpawnNamed + 'static,
 		client: Arc<C>,
@@ -101,24 +111,32 @@ impl<A, B, C> ProposerFactory<A, B, C, EnableProofRecording> {
 		telemetry: Option<TelemetryHandle>,
 	) -> Self {
 		ProposerFactory {
-			spawn_handle: Box::new(spawn_handle),
 			client,
+			spawn_handle: Box::new(spawn_handle),
 			transaction_pool,
 			metrics: PrometheusMetrics::new(prometheus),
-			max_block_size: DEFAULT_MAX_BLOCK_SIZE,
+			default_block_size_limit: DEFAULT_BLOCK_SIZE_LIMIT,
 			telemetry,
+			include_proof_in_block_size_estimation: true,
 			_phantom: PhantomData,
 		}
 	}
+
+	/// Disable the proof inclusion when estimating the block size.
+	pub fn disable_proof_in_block_size_estimation(&mut self) {
+		self.include_proof_in_block_size_estimation = false;
+	}
 }
 
 impl<A, B, C, PR> ProposerFactory<A, B, C, PR> {
-	/// Set the maximum block size in bytes.
+	/// Set the default block size limit in bytes.
+	///
+	/// The default value for the block size limit is:
+	/// [`DEFAULT_BLOCK_SIZE_LIMIT`].
 	///
-	/// The default value for the maximum block size is:
-	/// [`DEFAULT_MAX_BLOCK_SIZE`].
-	pub fn set_maximum_block_size(&mut self, size: usize) {
-		self.max_block_size = size;
+	/// If there is no block size limit passed to [`Proposer::propose`], this value will be used.
+	pub fn set_default_block_size_limit(&mut self, limit: usize) {
+		self.default_block_size_limit = limit;
 	}
 }
 
@@ -152,9 +170,10 @@ impl<B, Block, C, A, PR> ProposerFactory<A, B, C, PR>
 			transaction_pool: self.transaction_pool.clone(),
 			now,
 			metrics: self.metrics.clone(),
-			max_block_size: self.max_block_size,
+			default_block_size_limit: self.default_block_size_limit,
 			telemetry: self.telemetry.clone(),
 			_phantom: PhantomData,
+			include_proof_in_block_size_estimation: self.include_proof_in_block_size_estimation,
 		};
 
 		proposer
@@ -195,7 +214,8 @@ pub struct Proposer<B, Block: BlockT, C, A: TransactionPool, PR> {
 	transaction_pool: Arc<A>,
 	now: Box<dyn Fn() -> time::Instant + Send + Sync>,
 	metrics: PrometheusMetrics,
-	max_block_size: usize,
+	default_block_size_limit: usize,
+	include_proof_in_block_size_estimation: bool,
 	telemetry: Option<TelemetryHandle>,
 	_phantom: PhantomData<(B, PR)>,
 }
@@ -225,6 +245,7 @@ impl<A, B, Block, C, PR> sp_consensus::Proposer<Block> for
 		inherent_data: InherentData,
 		inherent_digests: DigestFor<Block>,
 		max_duration: time::Duration,
+		block_size_limit: Option<usize>,
 	) -> Self::Proposal {
 		let (tx, rx) = oneshot::channel();
 		let spawn_handle = self.spawn_handle.clone();
@@ -236,6 +257,7 @@ impl<A, B, Block, C, PR> sp_consensus::Proposer<Block> for
 				inherent_data,
 				inherent_digests,
 				deadline,
+				block_size_limit,
 			).await;
 			if tx.send(res).is_err() {
 				trace!("Could not send block production result to proposer!");
@@ -264,6 +286,7 @@ impl<A, B, Block, C, PR> Proposer<B, Block, C, A, PR>
 		inherent_data: InherentData,
 		inherent_digests: DigestFor<Block>,
 		deadline: time::Instant,
+		block_size_limit: Option<usize>,
 	) -> Result<Proposal<Block, backend::TransactionFor<B, Block>, PR::Proof>, sp_blockchain::Error> {
 		/// If the block is full we will attempt to push at most
 		/// this number of transactions before quitting for real.
@@ -297,7 +320,9 @@ impl<A, B, Block, C, PR> Proposer<B, Block, C, A, PR>
 		let mut unqueue_invalid = Vec::new();
 
 		let mut t1 = self.transaction_pool.ready_at(self.parent_number).fuse();
-		let mut t2 = futures_timer::Delay::new(deadline.saturating_duration_since((self.now)()) / 8).fuse();
+		let mut t2 = futures_timer::Delay::new(
+			deadline.saturating_duration_since((self.now)()) / 8,
+		).fuse();
 
 		let pending_iterator = select! {
 			res = t1 => res,
@@ -311,8 +336,13 @@ impl<A, B, Block, C, PR> Proposer<B, Block, C, A, PR>
 			},
 		};
 
+		let block_size_limit = block_size_limit.unwrap_or(self.default_block_size_limit);
+
 		debug!("Attempting to push transactions from the pool.");
 		debug!("Pool status: {:?}", self.transaction_pool.status());
+		let mut transaction_pushed = false;
+		let mut hit_block_size_limit = false;
+
 		for pending_tx in pending_iterator {
 			if (self.now)() > deadline {
 				debug!(
@@ -324,9 +354,30 @@ impl<A, B, Block, C, PR> Proposer<B, Block, C, A, PR>
 
 			let pending_tx_data = pending_tx.data().clone();
 			let pending_tx_hash = pending_tx.hash().clone();
+
+			let block_size = block_builder.estimate_block_size(
+				self.include_proof_in_block_size_estimation,
+			);
+			if block_size + pending_tx_data.encoded_size() > block_size_limit {
+				if skipped < MAX_SKIPPED_TRANSACTIONS {
+					skipped += 1;
+					debug!(
+						"Transaction would overflow the block size limit, \
+						 but will try {} more transactions before quitting.",
+						MAX_SKIPPED_TRANSACTIONS - skipped,
+					);
+					continue;
+				} else {
+					debug!("Reached block size limit, proceeding with proposing.");
+					hit_block_size_limit = true;
+					break;
+				}
+			}
+
 			trace!("[{:?}] Pushing to the block.", pending_tx_hash);
 			match sc_block_builder::BlockBuilder::push(&mut block_builder, pending_tx_data) {
 				Ok(()) => {
+					transaction_pushed = true;
 					debug!("[{:?}] Pushed to the block.", pending_tx_hash);
 				}
 				Err(ApplyExtrinsicFailed(Validity(e)))
@@ -356,6 +407,13 @@ impl<A, B, Block, C, PR> Proposer<B, Block, C, A, PR>
 			}
 		}
 
+		if hit_block_size_limit && !transaction_pushed {
+			warn!(
+				"Hit block size limit of `{}` without including any transaction!",
+				block_size_limit,
+			);
+		}
+
 		self.transaction_pool.remove_invalid(&unqueue_invalid);
 
 		let (block, storage_changes, proof) = block_builder.build()?.into_inner();
@@ -367,7 +425,8 @@ impl<A, B, Block, C, PR> Proposer<B, Block, C, A, PR>
 			}
 		);
 
-		info!("🎁 Prepared block for proposing at {} [hash: {:?}; parent_hash: {}; extrinsics ({}): [{}]]",
+		info!(
+			"🎁 Prepared block for proposing at {} [hash: {:?}; parent_hash: {}; extrinsics ({}): [{}]]",
 			block.header().number(),
 			<Block as BlockT>::Hash::from(block.header().hash()),
 			block.header().parent_hash(),
@@ -394,7 +453,6 @@ impl<A, B, Block, C, PR> Proposer<B, Block, C, A, PR>
 			&block,
 			&self.parent_hash,
 			self.parent_number,
-			self.max_block_size,
 		) {
 			error!("Failed to evaluate authored block: {:?}", err);
 		}
@@ -421,6 +479,7 @@ mod tests {
 	use sp_runtime::traits::NumberFor;
 	use sc_client_api::Backend;
 	use futures::executor::block_on;
+	use sp_consensus::Environment;
 
 	const SOURCE: TransactionSource = TransactionSource::External;
 
@@ -494,7 +553,7 @@ mod tests {
 		// when
 		let deadline = time::Duration::from_secs(3);
 		let block = block_on(
-			proposer.propose(Default::default(), Default::default(), deadline)
+			proposer.propose(Default::default(), Default::default(), deadline, None)
 		).map(|r| r.block).unwrap();
 
 		// then
@@ -540,7 +599,7 @@ mod tests {
 
 		let deadline = time::Duration::from_secs(1);
 		block_on(
-			proposer.propose(Default::default(), Default::default(), deadline)
+			proposer.propose(Default::default(), Default::default(), deadline, None)
 		).map(|r| r.block).unwrap();
 	}
 
@@ -587,7 +646,7 @@ mod tests {
 
 		let deadline = time::Duration::from_secs(9);
 		let proposal = block_on(
-			proposer.propose(Default::default(), Default::default(), deadline),
+			proposer.propose(Default::default(), Default::default(), deadline, None),
 		).unwrap();
 
 		assert_eq!(proposal.block.extrinsics().len(), 1);
@@ -669,7 +728,7 @@ mod tests {
 			// when
 			let deadline = time::Duration::from_secs(9);
 			let block = block_on(
-				proposer.propose(Default::default(), Default::default(), deadline)
+				proposer.propose(Default::default(), Default::default(), deadline, None)
 			).map(|r| r.block).unwrap();
 
 			// then
@@ -704,4 +763,82 @@ mod tests {
 		let block = propose_block(&client, 1, 2, 5);
 		block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	}
+
+	#[test]
+	fn should_cease_building_block_when_block_limit_is_reached() {
+		let client = Arc::new(substrate_test_runtime_client::new());
+		let spawner = sp_core::testing::TaskExecutor::new();
+		let txpool = BasicPool::new_full(
+			Default::default(),
+			true.into(),
+			None,
+			spawner.clone(),
+			client.clone(),
+		);
+		let genesis_header = client.header(&BlockId::Number(0u64))
+			.expect("header get error")
+			.expect("there should be header");
+
+		let extrinsics_num = 4;
+		let extrinsics = (0..extrinsics_num)
+			.map(|v| Extrinsic::IncludeData(vec![v as u8; 10]))
+			.collect::<Vec<_>>();
+
+		let block_limit = genesis_header.encoded_size()
+			+ extrinsics.iter().take(extrinsics_num - 1).map(Encode::encoded_size).sum::<usize>()
+			+ Vec::<Extrinsic>::new().encoded_size();
+
+		block_on(
+			txpool.submit_at(&BlockId::number(0), SOURCE, extrinsics)
+		).unwrap();
+
+		block_on(txpool.maintain(chain_event(genesis_header.clone())));
+
+		let mut proposer_factory = ProposerFactory::new(
+			spawner.clone(),
+			client.clone(),
+			txpool.clone(),
+			None,
+			None,
+		);
+
+		let proposer = block_on(proposer_factory.init(&genesis_header)).unwrap();
+
+		// Give it enough time
+		let deadline = time::Duration::from_secs(300);
+		let block = block_on(
+			proposer.propose(Default::default(), Default::default(), deadline, Some(block_limit))
+		).map(|r| r.block).unwrap();
+
+		// Based on the block limit, one transaction shouldn't be included.
+		assert_eq!(block.extrinsics().len(), extrinsics_num - 1);
+
+		let proposer = block_on(proposer_factory.init(&genesis_header)).unwrap();
+
+		let block = block_on(
+			proposer.propose(Default::default(), Default::default(), deadline, None,
+		)).map(|r| r.block).unwrap();
+
+		// Without a block limit we should include all of them
+		assert_eq!(block.extrinsics().len(), extrinsics_num);
+
+		let mut proposer_factory = ProposerFactory::with_proof_recording(
+			spawner.clone(),
+			client.clone(),
+			txpool.clone(),
+			None,
+			None,
+		);
+
+		let proposer = block_on(proposer_factory.init(&genesis_header)).unwrap();
+
+		// Give it enough time
+		let block = block_on(
+			proposer.propose(Default::default(), Default::default(), deadline, Some(block_limit))
+		).map(|r| r.block).unwrap();
+
+		// The block limit didn't changed, but we now include the proof in the estimation of the
+		// block size and thus, one less transaction should fit into the limit.
+		assert_eq!(block.extrinsics().len(), extrinsics_num - 2);
+	}
 }
diff --git a/client/basic-authorship/src/lib.rs b/client/basic-authorship/src/lib.rs
index acaf85db7633..133b833cdddc 100644
--- a/client/basic-authorship/src/lib.rs
+++ b/client/basic-authorship/src/lib.rs
@@ -62,6 +62,7 @@
 //! 	Default::default(),
 //! 	Default::default(),
 //! 	Duration::from_secs(2),
+//! 	None,
 //! );
 //!
 //! // We wait until the proposition is performed.
@@ -72,4 +73,4 @@
 
 mod basic_authorship;
 
-pub use crate::basic_authorship::{ProposerFactory, Proposer, DEFAULT_MAX_BLOCK_SIZE};
+pub use crate::basic_authorship::{ProposerFactory, Proposer, DEFAULT_BLOCK_SIZE_LIMIT};
diff --git a/client/block-builder/src/lib.rs b/client/block-builder/src/lib.rs
index 4893072a7137..7d391f8fb85b 100644
--- a/client/block-builder/src/lib.rs
+++ b/client/block-builder/src/lib.rs
@@ -135,6 +135,8 @@ pub struct BlockBuilder<'a, Block: BlockT, A: ProvideRuntimeApi<Block>, B> {
 	block_id: BlockId<Block>,
 	parent_hash: Block::Hash,
 	backend: &'a B,
+	/// The estimated size of the block header.
+	estimated_header_size: usize,
 }
 
 impl<'a, Block, A, B> BlockBuilder<'a, Block, A, B>
@@ -165,6 +167,8 @@ where
 			inherent_digests,
 		);
 
+		let estimated_header_size = header.encoded_size();
+
 		let mut api = api.runtime_api();
 
 		if record_proof.yes() {
@@ -183,6 +187,7 @@ where
 			api,
 			block_id,
 			backend,
+			estimated_header_size,
 		})
 	}
 
@@ -270,6 +275,20 @@ where
 			))
 		}).map_err(|e| Error::Application(Box::new(e)))
 	}
+
+	/// Estimate the size of the block in the current state.
+	///
+	/// If `include_proof` is `true`, the estimated size of the storage proof will be added
+	/// to the estimation.
+	pub fn estimate_block_size(&self, include_proof: bool) -> usize {
+		let size = self.estimated_header_size + self.extrinsics.encoded_size();
+
+		if include_proof {
+			size + self.api.proof_recorder().map(|pr| pr.estimate_encoded_size()).unwrap_or(0)
+		} else {
+			size
+		}
+	}
 }
 
 #[cfg(test)]
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index 77dac0f75448..3c72f359f8f1 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -629,6 +629,7 @@ mod tests {
 			_: InherentData,
 			digests: DigestFor<TestBlock>,
 			_: Duration,
+			_: Option<usize>,
 		) -> Self::Proposal {
 			let r = self.1.new_block(digests).unwrap().build().map_err(|e| e.into());
 
@@ -887,6 +888,7 @@ mod tests {
 				ends_at: Instant::now() + Duration::from_secs(100),
 				inherent_data: InherentData::new(),
 				duration: Duration::from_millis(1000),
+				block_size_limit: None,
 			},
 		)).unwrap();
 
diff --git a/client/consensus/babe/src/tests.rs b/client/consensus/babe/src/tests.rs
index 839d38b94a93..9949da61da57 100644
--- a/client/consensus/babe/src/tests.rs
+++ b/client/consensus/babe/src/tests.rs
@@ -182,6 +182,7 @@ impl Proposer<TestBlock> for DummyProposer {
 		_: InherentData,
 		pre_digests: DigestFor<TestBlock>,
 		_: Duration,
+		_: Option<usize>,
 	) -> Self::Proposal {
 		self.propose_with(pre_digests)
 	}
diff --git a/client/consensus/manual-seal/src/seal_block.rs b/client/consensus/manual-seal/src/seal_block.rs
index 23a560cebd54..b21630f0377e 100644
--- a/client/consensus/manual-seal/src/seal_block.rs
+++ b/client/consensus/manual-seal/src/seal_block.rs
@@ -127,6 +127,7 @@ pub async fn seal_block<B, BI, SC, C, E, P>(
 			id.clone(),
 			digest,
 			Duration::from_secs(MAX_PROPOSAL_DURATION),
+			None,
 		).map_err(|err| Error::StringError(format!("{:?}", err))).await?;
 
 		if proposal.block.extrinsics().len() == inherents_len && !create_empty {
diff --git a/client/consensus/pow/src/lib.rs b/client/consensus/pow/src/lib.rs
index ea2e30afdc48..bcbc2009321b 100644
--- a/client/consensus/pow/src/lib.rs
+++ b/client/consensus/pow/src/lib.rs
@@ -669,6 +669,7 @@ pub fn start_mining_worker<Block, C, S, Algorithm, E, SO, CAW>(
 				inherent_data,
 				inherent_digest,
 				build_time.clone(),
+				None,
 			).await {
 				Ok(x) => x,
 				Err(err) => {
diff --git a/client/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs
index c1f13fea1f9e..5157f381e6f4 100644
--- a/client/consensus/slots/src/lib.rs
+++ b/client/consensus/slots/src/lib.rs
@@ -313,6 +313,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 				logs,
 			},
 			proposing_remaining_duration.mul_f32(0.98),
+			None,
 		).map_err(|e| sp_consensus::Error::ClientImport(format!("{:?}", e)));
 
 		let proposal = match futures::future::select(proposing, proposing_remaining).await {
@@ -535,7 +536,7 @@ pub enum Error<T> where T: Debug {
 	SlotDurationInvalid(SlotDuration<T>),
 }
 
-/// A slot duration. Create with `get_or_compute`.
+/// A slot duration. Create with [`get_or_compute`](Self::get_or_compute).
 // The internal member should stay private here to maintain invariants of
 // `get_or_compute`.
 #[derive(Clone, Copy, Debug, Encode, Decode, Hash, PartialOrd, Ord, PartialEq, Eq)]
@@ -793,6 +794,7 @@ mod test {
 			timestamp: Default::default(),
 			inherent_data: Default::default(),
 			ends_at: Instant::now(),
+			block_size_limit: None,
 		}
 	}
 
diff --git a/client/consensus/slots/src/slots.rs b/client/consensus/slots/src/slots.rs
index d7ed1eda64c0..4057a6d0d15a 100644
--- a/client/consensus/slots/src/slots.rs
+++ b/client/consensus/slots/src/slots.rs
@@ -58,6 +58,10 @@ pub struct SlotInfo {
 	pub inherent_data: InherentData,
 	/// Slot duration.
 	pub duration: Duration,
+	/// Some potential block size limit for the block to be authored at this slot.
+	///
+	/// For more information see [`Proposer::propose`](sp_consensus::Proposer::propose).
+	pub block_size_limit: Option<usize>,
 }
 
 impl SlotInfo {
@@ -69,12 +73,14 @@ impl SlotInfo {
 		timestamp: sp_timestamp::Timestamp,
 		inherent_data: InherentData,
 		duration: Duration,
+		block_size_limit: Option<usize>,
 	) -> Self {
 		Self {
 			slot,
 			timestamp,
 			inherent_data,
 			duration,
+			block_size_limit,
 			ends_at: Instant::now() + time_until_next(timestamp.as_duration(), duration),
 		}
 	}
@@ -147,6 +153,7 @@ impl<SC: SlotCompatible> Slots<SC> {
 					timestamp,
 					inherent_data,
 					self.slot_duration,
+					None,
 				))
 			}
 		}
diff --git a/client/db/src/bench.rs b/client/db/src/bench.rs
index 2704676207b0..a2501891b31e 100644
--- a/client/db/src/bench.rs
+++ b/client/db/src/bench.rs
@@ -23,7 +23,7 @@ use std::cell::{Cell, RefCell};
 use std::collections::HashMap;
 
 use hash_db::{Prefix, Hasher};
-use sp_trie::{MemoryDB, prefixed_key, StorageProof};
+use sp_trie::{MemoryDB, prefixed_key};
 use sp_core::{
 	storage::{ChildInfo, TrackedStorageKey},
 	hexdisplay::HexDisplay
@@ -34,7 +34,6 @@ use sp_state_machine::{
 	DBValue, backend::Backend as StateBackend, StorageCollection, ChildStorageCollection, ProofRecorder,
 };
 use kvdb::{KeyValueDB, DBTransaction};
-use codec::Encode;
 use crate::storage_cache::{CachingState, SharedCache, new_shared_cache};
 
 type DbState<B> = sp_state_machine::TrieBackend<
@@ -45,7 +44,7 @@ type State<B> = CachingState<DbState<B>, B>;
 
 struct StorageDb<Block: BlockT> {
 	db: Arc<dyn KeyValueDB>,
-	proof_recorder: Option<ProofRecorder<HashFor<Block>>>,
+	proof_recorder: Option<ProofRecorder<Block::Hash>>,
 	_block: std::marker::PhantomData<Block>,
 }
 
@@ -53,12 +52,12 @@ impl<Block: BlockT> sp_state_machine::Storage<HashFor<Block>> for StorageDb<Bloc
 	fn get(&self, key: &Block::Hash, prefix: Prefix) -> Result<Option<DBValue>, String> {
 		let prefixed_key = prefixed_key::<HashFor<Block>>(key, prefix);
 		if let Some(recorder) = &self.proof_recorder {
-			if let Some(v) = recorder.read().get(&key) {
+			if let Some(v) = recorder.get(&key) {
 				return Ok(v.clone());
 			}
 			let backend_value = self.db.get(0, &prefixed_key)
 				.map_err(|e| format!("Database backend error: {:?}", e))?;
-			recorder.write().insert(key.clone(), backend_value.clone());
+			recorder.record(key.clone(), backend_value.clone());
 			Ok(backend_value)
 		} else {
 			self.db.get(0, &prefixed_key)
@@ -117,7 +116,7 @@ pub struct BenchmarkingState<B: BlockT> {
 	child_key_tracker: RefCell<HashMap<Vec<u8>, HashMap<Vec<u8>, KeyTracker>>>,
 	read_write_tracker: RefCell<ReadWriteTracker>,
 	whitelist: RefCell<Vec<TrackedStorageKey>>,
-	proof_recorder: Option<ProofRecorder<HashFor<B>>>,
+	proof_recorder: Option<ProofRecorder<B::Hash>>,
 }
 
 impl<B: BlockT> BenchmarkingState<B> {
@@ -164,12 +163,10 @@ impl<B: BlockT> BenchmarkingState<B> {
 		*self.state.borrow_mut() = None;
 		let db = match self.db.take() {
 			Some(db) => db,
-			None => Arc::new(::kvdb_memorydb::create(1)),
+			None => Arc::new(kvdb_memorydb::create(1)),
 		};
 		self.db.set(Some(db.clone()));
-		if let Some(recorder) = &self.proof_recorder {
-			recorder.write().clear();
-		}
+		self.proof_recorder.as_ref().map(|r| r.reset());
 		let storage_db = Arc::new(StorageDb::<B> {
 			db,
 			proof_recorder: self.proof_recorder.clone(),
@@ -429,7 +426,8 @@ impl<B: BlockT> StateBackend<HashFor<B>> for BenchmarkingState<B> {
 		None
 	}
 
-	fn commit(&self,
+	fn commit(
+		&self,
 		storage_root: <HashFor<B> as Hasher>::Out,
 		mut transaction: Self::Transaction,
 		main_storage_changes: StorageCollection,
@@ -518,14 +516,7 @@ impl<B: BlockT> StateBackend<HashFor<B>> for BenchmarkingState<B> {
 	}
 
 	fn proof_size(&self) -> Option<u32> {
-		self.proof_recorder.as_ref().map(|recorder| {
-			let proof = StorageProof::new(recorder
-				.read()
-				.iter()
-				.filter_map(|(_k, v)| v.as_ref().map(|v| v.to_vec()))
-				.collect());
-			proof.encoded_size() as u32
-		})
+		self.proof_recorder.as_ref().map(|recorder| recorder.estimate_encoded_size() as u32)
 	}
 }
 
diff --git a/primitives/api/proc-macro/src/impl_runtime_apis.rs b/primitives/api/proc-macro/src/impl_runtime_apis.rs
index 2be8545a81d1..642da2c465e6 100644
--- a/primitives/api/proc-macro/src/impl_runtime_apis.rs
+++ b/primitives/api/proc-macro/src/impl_runtime_apis.rs
@@ -282,16 +282,14 @@ fn generate_runtime_api_base_structures() -> Result<TokenStream> {
 				self.recorder = Some(Default::default());
 			}
 
+			fn proof_recorder(&self) -> Option<#crate_::ProofRecorder<Block>> {
+				self.recorder.clone()
+			}
+
 			fn extract_proof(&mut self) -> Option<#crate_::StorageProof> {
 				self.recorder
 					.take()
-					.map(|recorder| {
-						let trie_nodes = recorder.read()
-							.iter()
-							.filter_map(|(_k, v)| v.as_ref().map(|v| v.to_vec()))
-							.collect();
-						#crate_::StorageProof::new(trie_nodes)
-					})
+					.map(|recorder| recorder.to_storage_proof())
 			}
 
 			fn into_storage_changes(
diff --git a/primitives/api/proc-macro/src/mock_impl_runtime_apis.rs b/primitives/api/proc-macro/src/mock_impl_runtime_apis.rs
index 62a03a59baac..383cd4f635ea 100644
--- a/primitives/api/proc-macro/src/mock_impl_runtime_apis.rs
+++ b/primitives/api/proc-macro/src/mock_impl_runtime_apis.rs
@@ -102,6 +102,10 @@ fn implement_common_api_traits(
 				unimplemented!("`extract_proof` not implemented for runtime api mocks")
 			}
 
+			fn proof_recorder(&self) -> Option<#crate_::ProofRecorder<#block_type>> {
+				unimplemented!("`proof_recorder` not implemented for runtime api mocks")
+			}
+
 			fn into_storage_changes(
 				&self,
 				_: &Self::StateBackend,
diff --git a/primitives/api/src/lib.rs b/primitives/api/src/lib.rs
index afb9af343ba6..155bb899a2ed 100644
--- a/primitives/api/src/lib.rs
+++ b/primitives/api/src/lib.rs
@@ -362,7 +362,7 @@ pub use sp_api_proc_macro::mock_impl_runtime_apis;
 
 /// A type that records all accessed trie nodes and generates a proof out of it.
 #[cfg(feature = "std")]
-pub type ProofRecorder<B> = sp_state_machine::ProofRecorder<HashFor<B>>;
+pub type ProofRecorder<B> = sp_state_machine::ProofRecorder<<B as BlockT>::Hash>;
 
 /// A type that is used as cache for the storage transactions.
 #[cfg(feature = "std")]
@@ -471,6 +471,9 @@ pub trait ApiExt<Block: BlockT> {
 	/// If `record_proof` was not called before, this will return `None`.
 	fn extract_proof(&mut self) -> Option<StorageProof>;
 
+	/// Returns the current active proof recorder.
+	fn proof_recorder(&self) -> Option<ProofRecorder<Block>>;
+
 	/// Convert the api object into the storage changes that were done while executing runtime
 	/// api functions.
 	///
diff --git a/primitives/consensus/common/src/evaluation.rs b/primitives/consensus/common/src/evaluation.rs
index be930fa4a001..c18c8b127f99 100644
--- a/primitives/consensus/common/src/evaluation.rs
+++ b/primitives/consensus/common/src/evaluation.rs
@@ -39,9 +39,6 @@ pub enum Error {
 	/// Proposal had wrong number.
 	#[error("Proposal had wrong number. Expected {expected:?}, got {got:?}")]
 	WrongNumber { expected: BlockNumber, got: BlockNumber },
-	/// Proposal exceeded the maximum size.
-	#[error("Proposal size {block_size} exceeds maximum allowed size of {max_block_size}.")]
-	ProposalTooLarge { block_size: usize, max_block_size: usize },
 }
 
 /// Attempt to evaluate a substrate block as a node block, returning error
@@ -50,17 +47,12 @@ pub fn evaluate_initial<Block: BlockT>(
 	proposal: &Block,
 	parent_hash: &<Block as BlockT>::Hash,
 	parent_number: <<Block as BlockT>::Header as HeaderT>::Number,
-	max_block_size: usize,
 ) -> Result<()> {
 
 	let encoded = Encode::encode(proposal);
 	let proposal = Block::decode(&mut &encoded[..])
 		.map_err(|e| Error::BadProposalFormat(e))?;
 
-	if encoded.len() > max_block_size {
-		return Err(Error::ProposalTooLarge { max_block_size, block_size: encoded.len() })
-	}
-
 	if *parent_hash != *proposal.header().parent_hash() {
 		return Err(Error::WrongParentHash {
 			expected: format!("{:?}", *parent_hash),
diff --git a/primitives/consensus/common/src/lib.rs b/primitives/consensus/common/src/lib.rs
index 27a43dbe0220..642b6b12e7d6 100644
--- a/primitives/consensus/common/src/lib.rs
+++ b/primitives/consensus/common/src/lib.rs
@@ -196,6 +196,13 @@ pub trait Proposer<B: BlockT> {
 	/// a maximum duration for building this proposal is given. If building the proposal takes
 	/// longer than this maximum, the proposal will be very likely discarded.
 	///
+	/// If `block_size_limit` is given, the proposer should push transactions until the block size
+	/// limit is hit. Depending on the `finalize_block` implementation of the runtime, it probably
+	/// incorporates other operations (that are happening after the block limit is hit). So,
+	/// when the block size estimation also includes a proof that is recorded alongside the block
+	/// production, the proof can still grow. This means that the `block_size_limit` should not be
+	/// the hard limit of what is actually allowed.
+	///
 	/// # Return
 	///
 	/// Returns a future that resolves to a [`Proposal`] or to [`Error`].
@@ -204,6 +211,7 @@ pub trait Proposer<B: BlockT> {
 		inherent_data: InherentData,
 		inherent_digests: DigestFor<B>,
 		max_duration: Duration,
+		block_size_limit: Option<usize>,
 	) -> Self::Proposal;
 }
 
diff --git a/primitives/state-machine/src/proving_backend.rs b/primitives/state-machine/src/proving_backend.rs
index 6b87aa12eb1a..28672659fa10 100644
--- a/primitives/state-machine/src/proving_backend.rs
+++ b/primitives/state-machine/src/proving_backend.rs
@@ -17,9 +17,9 @@
 
 //! Proving state machine backend.
 
-use std::{sync::Arc, collections::HashMap};
+use std::{sync::Arc, collections::{HashMap, hash_map::Entry}};
 use parking_lot::RwLock;
-use codec::{Decode, Codec};
+use codec::{Decode, Codec, Encode};
 use log::debug;
 use hash_db::{Hasher, HashDB, EMPTY_PREFIX, Prefix};
 use sp_trie::{
@@ -109,9 +109,69 @@ impl<'a, S, H> ProvingBackendRecorder<'a, S, H>
 	}
 }
 
-/// Global proof recorder, act as a layer over a hash db for recording queried
-/// data.
-pub type ProofRecorder<H> = Arc<RwLock<HashMap<<H as Hasher>::Out, Option<DBValue>>>>;
+#[derive(Default)]
+struct ProofRecorderInner<Hash> {
+	/// All the records that we have stored so far.
+	records: HashMap<Hash, Option<DBValue>>,
+	/// The encoded size of all recorded values.
+	encoded_size: usize,
+}
+
+/// Global proof recorder, act as a layer over a hash db for recording queried data.
+#[derive(Clone, Default)]
+pub struct ProofRecorder<Hash> {
+	inner: Arc<RwLock<ProofRecorderInner<Hash>>>,
+}
+
+impl<Hash: std::hash::Hash + Eq> ProofRecorder<Hash> {
+	/// Record the given `key` => `val` combination.
+	pub fn record(&self, key: Hash, val: Option<DBValue>) {
+		let mut inner = self.inner.write();
+		let encoded_size = if let Entry::Vacant(entry) = inner.records.entry(key) {
+			let encoded_size = val.as_ref().map(Encode::encoded_size).unwrap_or(0);
+
+			entry.insert(val);
+			encoded_size
+		} else {
+			0
+		};
+
+		inner.encoded_size += encoded_size;
+	}
+
+	/// Returns the value at the given `key`.
+	pub fn get(&self, key: &Hash) -> Option<Option<DBValue>> {
+		self.inner.read().records.get(key).cloned()
+	}
+
+	/// Returns the estimated encoded size of the proof.
+	///
+	/// The estimation is maybe bigger (by in maximum 4 bytes), but never smaller than the actual
+	/// encoded proof.
+	pub fn estimate_encoded_size(&self) -> usize {
+		let inner = self.inner.read();
+		inner.encoded_size
+			+ codec::Compact(inner.records.len() as u32).encoded_size()
+	}
+
+	/// Convert into a [`StorageProof`].
+	pub fn to_storage_proof(&self) -> StorageProof {
+		let trie_nodes = self.inner.read()
+			.records
+			.iter()
+			.filter_map(|(_k, v)| v.as_ref().map(|v| v.to_vec()))
+			.collect();
+
+		StorageProof::new(trie_nodes)
+	}
+
+	/// Reset the internal state.
+	pub fn reset(&self) {
+		let mut inner = self.inner.write();
+		inner.records.clear();
+		inner.encoded_size = 0;
+	}
+}
 
 /// Patricia trie-based backend which also tracks all touched storage trie values.
 /// These can be sent to remote node and used as a proof of execution.
@@ -122,7 +182,7 @@ pub struct ProvingBackend<'a, S: 'a + TrieBackendStorage<H>, H: 'a + Hasher> (
 /// Trie backend storage with its proof recorder.
 pub struct ProofRecorderBackend<'a, S: 'a + TrieBackendStorage<H>, H: 'a + Hasher> {
 	backend: &'a S,
-	proof_recorder: ProofRecorder<H>,
+	proof_recorder: ProofRecorder<H::Out>,
 }
 
 impl<'a, S: 'a + TrieBackendStorage<H>, H: 'a + Hasher> ProvingBackend<'a, S, H>
@@ -137,7 +197,7 @@ impl<'a, S: 'a + TrieBackendStorage<H>, H: 'a + Hasher> ProvingBackend<'a, S, H>
 	/// Create new proving backend with the given recorder.
 	pub fn new_with_recorder(
 		backend: &'a TrieBackend<S, H>,
-		proof_recorder: ProofRecorder<H>,
+		proof_recorder: ProofRecorder<H::Out>,
 	) -> Self {
 		let essence = backend.essence();
 		let root = essence.root().clone();
@@ -150,12 +210,7 @@ impl<'a, S: 'a + TrieBackendStorage<H>, H: 'a + Hasher> ProvingBackend<'a, S, H>
 
 	/// Extracting the gathered unordered proof.
 	pub fn extract_proof(&self) -> StorageProof {
-		let trie_nodes = self.0.essence().backend_storage().proof_recorder
-			.read()
-			.iter()
-			.filter_map(|(_k, v)| v.as_ref().map(|v| v.to_vec()))
-			.collect();
-		StorageProof::new(trie_nodes)
+		self.0.essence().backend_storage().proof_recorder.to_storage_proof()
 	}
 }
 
@@ -165,11 +220,12 @@ impl<'a, S: 'a + TrieBackendStorage<H>, H: 'a + Hasher> TrieBackendStorage<H>
 	type Overlay = S::Overlay;
 
 	fn get(&self, key: &H::Out, prefix: Prefix) -> Result<Option<DBValue>, String> {
-		if let Some(v) = self.proof_recorder.read().get(key) {
-			return Ok(v.clone());
+		if let Some(v) = self.proof_recorder.get(key) {
+			return Ok(v);
 		}
-		let backend_value =  self.backend.get(key, prefix)?;
-		self.proof_recorder.write().insert(key.clone(), backend_value.clone());
+
+		let backend_value = self.backend.get(key, prefix)?;
+		self.proof_recorder.record(key.clone(), backend_value.clone());
 		Ok(backend_value)
 	}
 }
@@ -343,8 +399,8 @@ mod tests {
 		assert_eq!(trie_backend.storage(b"key").unwrap(), proving_backend.storage(b"key").unwrap());
 		assert_eq!(trie_backend.pairs(), proving_backend.pairs());
 
-		let (trie_root, mut trie_mdb) = trie_backend.storage_root(::std::iter::empty());
-		let (proving_root, mut proving_mdb) = proving_backend.storage_root(::std::iter::empty());
+		let (trie_root, mut trie_mdb) = trie_backend.storage_root(std::iter::empty());
+		let (proving_root, mut proving_mdb) = proving_backend.storage_root(std::iter::empty());
 		assert_eq!(trie_root, proving_root);
 		assert_eq!(trie_mdb.drain(), proving_mdb.drain());
 	}
@@ -405,7 +461,7 @@ mod tests {
 		));
 
 		let trie = in_memory.as_trie_backend().unwrap();
-		let trie_root = trie.storage_root(::std::iter::empty()).0;
+		let trie_root = trie.storage_root(std::iter::empty()).0;
 		assert_eq!(in_memory_root, trie_root);
 		(0..64).for_each(|i| assert_eq!(
 			trie.storage(&[i]).unwrap().unwrap(),
@@ -440,4 +496,35 @@ mod tests {
 			vec![64]
 		);
 	}
+
+	#[test]
+	fn storage_proof_encoded_size_estimation_works() {
+		let trie_backend = test_trie();
+		let backend = test_proving(&trie_backend);
+
+		let check_estimation = |backend: &ProvingBackend<'_, PrefixedMemoryDB<BlakeTwo256>, BlakeTwo256>| {
+			let storage_proof = backend.extract_proof();
+			let estimation = backend.0.essence()
+				.backend_storage()
+				.proof_recorder
+				.estimate_encoded_size();
+
+			assert_eq!(storage_proof.encoded_size(), estimation);
+		};
+
+		assert_eq!(backend.storage(b"key").unwrap(), Some(b"value".to_vec()));
+		check_estimation(&backend);
+
+		assert_eq!(backend.storage(b"value1").unwrap(), Some(vec![42]));
+		check_estimation(&backend);
+
+		assert_eq!(backend.storage(b"value2").unwrap(), Some(vec![24]));
+		check_estimation(&backend);
+
+		assert!(backend.storage(b"doesnotexist").unwrap().is_none());
+		check_estimation(&backend);
+
+		assert!(backend.storage(b"doesnotexist2").unwrap().is_none());
+		check_estimation(&backend);
+	}
 }
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index 837b3715c819..150bc403732c 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -190,7 +190,7 @@ impl BlindCheckable for Extrinsic {
 					Err(InvalidTransaction::BadProof.into())
 				}
 			},
-			Extrinsic::IncludeData(_) => Err(InvalidTransaction::BadProof.into()),
+			Extrinsic::IncludeData(v) => Ok(Extrinsic::IncludeData(v)),
 			Extrinsic::StorageChange(key, value) => Ok(Extrinsic::StorageChange(key, value)),
 			Extrinsic::ChangesTrieConfigUpdate(new_config) =>
 				Ok(Extrinsic::ChangesTrieConfigUpdate(new_config)),

From c93ef27486e5f14696e5b6d36edafea7936edbc8 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Thu, 15 Apr 2021 12:42:47 +0200
Subject: [PATCH 0650/1194] Properly close notification substreams (#8534)

* Properly close notification substreams

* Some debug asserts

* Fix state inconsistency

* Remove erroneous debug_assert!

* Some comments
---
 .../src/protocol/notifications/handler.rs     | 291 +++++++++++++++---
 .../notifications/upgrade/notifications.rs    |  74 ++++-
 2 files changed, 300 insertions(+), 65 deletions(-)

diff --git a/client/network/src/protocol/notifications/handler.rs b/client/network/src/protocol/notifications/handler.rs
index 99677cc45e54..2b350cd7fcfc 100644
--- a/client/network/src/protocol/notifications/handler.rs
+++ b/client/network/src/protocol/notifications/handler.rs
@@ -159,6 +159,16 @@ enum State {
 	Closed {
 		/// True if an outgoing substream is still in the process of being opened.
 		pending_opening: bool,
+
+		/// Outbound substream that has been accepted by the remote. Being closed.
+		out_substream_closing: Option<NotificationsOutSubstream<NegotiatedSubstream>>,
+
+		/// Substream opened by the remote. Being closed.
+		in_substream_closing: Option<NotificationsInSubstream<NegotiatedSubstream>>,
+
+		/// Substream re-opened by the remote. Not to be closed after `in_substream_closing` has
+		/// been closed.
+		in_substream_reopened: Option<NotificationsInSubstream<NegotiatedSubstream>>,
 	},
 
 	/// Protocol is in the "Closed" state. A [`NotifsHandlerOut::OpenDesiredByRemote`] has been
@@ -167,6 +177,9 @@ enum State {
 		/// Substream opened by the remote and that hasn't been accepted/rejected yet.
 		in_substream: NotificationsInSubstream<NegotiatedSubstream>,
 
+		/// Outbound substream that has been accepted by the remote. Being closed.
+		out_substream_closing: Option<NotificationsOutSubstream<NegotiatedSubstream>>,
+
 		/// See [`State::Closed::pending_opening`].
 		pending_opening: bool,
 	},
@@ -177,8 +190,15 @@ enum State {
 	/// A [`NotifsHandlerOut::OpenResultOk`] or a [`NotifsHandlerOut::OpenResultErr`] event must
 	/// be emitted when transitionning to respectively [`State::Open`] or [`State::Closed`].
 	Opening {
-		/// Substream opened by the remote. If `Some`, has been accepted.
-		in_substream: Option<NotificationsInSubstream<NegotiatedSubstream>>,
+		/// Outbound substream that has been accepted by the remote. Being closed. An outbound
+		/// substream request has been emitted towards libp2p if and only if this field is `None`.
+		out_substream_closing: Option<NotificationsOutSubstream<NegotiatedSubstream>>,
+
+		/// Substream re-opened by the remote. Has been accepted.
+		in_substream_reopened: Option<NotificationsInSubstream<NegotiatedSubstream>>,
+
+		/// Substream opened by the remote. Being closed.
+		in_substream_closing: Option<NotificationsInSubstream<NegotiatedSubstream>>,
 	},
 
 	/// Protocol is in the "Open" state.
@@ -227,6 +247,9 @@ impl IntoProtocolsHandler for NotifsHandlerProto {
 					handshake,
 					state: State::Closed {
 						pending_opening: false,
+						in_substream_closing: None,
+						in_substream_reopened: None,
+						out_substream_closing: None,
 					},
 					max_notification_size: max_size,
 				}
@@ -487,7 +510,16 @@ impl ProtocolsHandler for NotifsHandler {
 	) {
 		let mut protocol_info = &mut self.protocols[protocol_index];
 		match protocol_info.state {
-			State::Closed { pending_opening } => {
+			State::Closed {
+				ref mut pending_opening,
+				ref mut out_substream_closing,
+				ref mut in_substream_closing,
+				ref mut in_substream_reopened
+			}
+				if in_substream_closing.is_none() && in_substream_reopened.is_none()
+			=> {
+				debug_assert!(!(out_substream_closing.is_some() && *pending_opening));
+
 				self.events_queue.push_back(ProtocolsHandlerEvent::Custom(
 					NotifsHandlerOut::OpenDesiredByRemote {
 						protocol_index,
@@ -496,9 +528,31 @@ impl ProtocolsHandler for NotifsHandler {
 
 				protocol_info.state = State::OpenDesiredByRemote {
 					in_substream: new_substream,
-					pending_opening,
+					out_substream_closing: out_substream_closing.take(),
+					pending_opening: *pending_opening,
 				};
 			},
+
+			State::Opening { ref mut in_substream_closing, ref mut in_substream_reopened, .. } => {
+				*in_substream_closing = None;
+
+				// Create `handshake_message` on a separate line to be sure that the
+				// lock is released as soon as possible.
+				let handshake_message = protocol_info.handshake.read().clone();
+				new_substream.send_handshake(handshake_message);
+				*in_substream_reopened = Some(new_substream);
+			},
+
+			State::Open { ref mut in_substream, .. } if in_substream.is_none() => {
+				// Create `handshake_message` on a separate line to be sure that the
+				// lock is released as soon as possible.
+				let handshake_message = protocol_info.handshake.read().clone();
+				new_substream.send_handshake(handshake_message);
+				*in_substream = Some(new_substream);
+			},
+
+			State::Closed { .. } |
+			State::Open { .. } |
 			State::OpenDesiredByRemote { .. } => {
 				// If a substream already exists, silently drop the new one.
 				// Note that we drop the substream, which will send an equivalent to a
@@ -509,19 +563,6 @@ impl ProtocolsHandler for NotifsHandler {
 				// to do.
 				return;
 			},
-			State::Opening { ref mut in_substream, .. } |
-			State::Open { ref mut in_substream, .. } => {
-				if in_substream.is_some() {
-					// Same remark as above.
-					return;
-				}
-
-				// Create `handshake_message` on a separate line to be sure that the
-				// lock is released as soon as possible.
-				let handshake_message = protocol_info.handshake.read().clone();
-				new_substream.send_handshake(handshake_message);
-				*in_substream = Some(new_substream);
-			},
 		}
 	}
 
@@ -531,16 +572,24 @@ impl ProtocolsHandler for NotifsHandler {
 		protocol_index: Self::OutboundOpenInfo
 	) {
 		match self.protocols[protocol_index].state {
-			State::Closed { ref mut pending_opening } |
-			State::OpenDesiredByRemote { ref mut pending_opening, .. } => {
+			State::Closed { ref mut pending_opening, ref mut out_substream_closing, .. } |
+			State::OpenDesiredByRemote { ref mut pending_opening, ref mut out_substream_closing, .. } => {
+				debug_assert!(out_substream_closing.is_none());
 				debug_assert!(*pending_opening);
+				*out_substream_closing = Some(substream);
 				*pending_opening = false;
 			}
 			State::Open { .. } => {
 				error!(target: "sub-libp2p", "☎️ State mismatch in notifications handler");
 				debug_assert!(false);
 			}
-			State::Opening { ref mut in_substream } => {
+			State::Opening {
+				ref mut in_substream_reopened, ref mut in_substream_closing,
+				ref mut out_substream_closing
+			} => {
+				debug_assert!(out_substream_closing.is_none());
+				debug_assert!(!(in_substream_reopened.is_some() && in_substream_closing.is_some()));
+
 				let (async_tx, async_rx) = mpsc::channel(ASYNC_NOTIFICATIONS_BUFFER_SIZE);
 				let (sync_tx, sync_rx) = mpsc::channel(SYNC_NOTIFICATIONS_BUFFER_SIZE);
 				let notifications_sink = NotificationsSink {
@@ -554,7 +603,7 @@ impl ProtocolsHandler for NotifsHandler {
 				self.protocols[protocol_index].state = State::Open {
 					notifications_sink_rx: stream::select(async_rx.fuse(), sync_rx.fuse()).peekable(),
 					out_substream: Some(substream),
-					in_substream: in_substream.take(),
+					in_substream: in_substream_reopened.take().or(in_substream_closing.take()),
 				};
 
 				self.events_queue.push_back(ProtocolsHandlerEvent::Custom(
@@ -574,8 +623,13 @@ impl ProtocolsHandler for NotifsHandler {
 			NotifsHandlerIn::Open { protocol_index } => {
 				let protocol_info = &mut self.protocols[protocol_index];
 				match &mut protocol_info.state {
-					State::Closed { pending_opening } => {
-						if !*pending_opening {
+					State::Closed {
+						ref mut pending_opening,
+						ref mut in_substream_closing,
+						ref mut in_substream_reopened,
+						ref mut out_substream_closing
+					} => {
+						if !*pending_opening && out_substream_closing.is_none() {
 							let proto = NotificationsOut::new(
 								protocol_info.name.clone(),
 								protocol_info.handshake.read().clone(),
@@ -588,14 +642,31 @@ impl ProtocolsHandler for NotifsHandler {
 							});
 						}
 
+						debug_assert!(!(in_substream_reopened.is_some() && in_substream_closing.is_some()));
 						protocol_info.state = State::Opening {
-							in_substream: None,
+							in_substream_closing: in_substream_closing.take(),
+							in_substream_reopened: in_substream_reopened.take(),
+							out_substream_closing: out_substream_closing.take(),
 						};
 					},
-					State::OpenDesiredByRemote { pending_opening, in_substream } => {
+
+					State::OpenDesiredByRemote { ..  } => {
+						// The state change is done in two steps because of borrowing issues.
+						let (pending_opening, out_substream_closing, mut in_substream) = match
+							mem::replace(&mut protocol_info.state,
+								State::Opening {
+									in_substream_closing: None, in_substream_reopened: None,
+									out_substream_closing: None,
+								})
+						{
+							State::OpenDesiredByRemote { pending_opening, out_substream_closing, in_substream, .. } =>
+								(pending_opening, out_substream_closing, in_substream),
+							_ => unreachable!()
+						};
+
 						let handshake_message = protocol_info.handshake.read().clone();
 
-						if !*pending_opening {
+						if !pending_opening && out_substream_closing.is_none() {
 							let proto = NotificationsOut::new(
 								protocol_info.name.clone(),
 								handshake_message.clone(),
@@ -610,17 +681,13 @@ impl ProtocolsHandler for NotifsHandler {
 
 						in_substream.send_handshake(handshake_message);
 
-						// The state change is done in two steps because of borrowing issues.
-						let in_substream = match
-							mem::replace(&mut protocol_info.state, State::Opening { in_substream: None })
-						{
-							State::OpenDesiredByRemote { in_substream, .. } => in_substream,
-							_ => unreachable!()
-						};
 						protocol_info.state = State::Opening {
-							in_substream: Some(in_substream),
+							out_substream_closing,
+							in_substream_closing: None,
+							in_substream_reopened: Some(in_substream),
 						};
 					},
+
 					State::Opening { .. } |
 					State::Open { .. } => {
 						// As documented, it is forbidden to send an `Open` while there is already
@@ -632,15 +699,30 @@ impl ProtocolsHandler for NotifsHandler {
 			},
 
 			NotifsHandlerIn::Close { protocol_index } => {
-				match self.protocols[protocol_index].state {
-					State::Open { .. } => {
+				match &mut self.protocols[protocol_index].state {
+					State::Open { in_substream, out_substream, .. } => {
+						if let Some(in_substream) = in_substream.as_mut() {
+							in_substream.set_close_desired();
+						}
 						self.protocols[protocol_index].state = State::Closed {
+							in_substream_closing: in_substream.take(),
+							in_substream_reopened: None,
+							out_substream_closing: out_substream.take(),
 							pending_opening: false,
 						};
 					},
-					State::Opening { .. } => {
+					State::Opening { in_substream_closing, in_substream_reopened, out_substream_closing } => {
+						debug_assert!(!(in_substream_reopened.is_some() && in_substream_closing.is_some()));
+
+						let pending_opening = out_substream_closing.is_none();
+						if let Some(in_substream_reopened) = in_substream_reopened.as_mut() {
+							in_substream_reopened.set_close_desired();
+						}
 						self.protocols[protocol_index].state = State::Closed {
-							pending_opening: true,
+							in_substream_closing: in_substream_reopened.take().or(in_substream_closing.take()),
+							in_substream_reopened: None,
+							out_substream_closing: out_substream_closing.take(),
+							pending_opening,
 						};
 
 						self.events_queue.push_back(ProtocolsHandlerEvent::Custom(
@@ -649,8 +731,23 @@ impl ProtocolsHandler for NotifsHandler {
 							}
 						));
 					},
-					State::OpenDesiredByRemote { pending_opening, .. } => {
+					State::OpenDesiredByRemote { .. } => {
+						let (mut in_substream, pending_opening, out_substream_closing) = match mem::replace(
+							&mut self.protocols[protocol_index].state,
+							State::Closed { pending_opening: false, in_substream_closing: None,
+											in_substream_reopened: None, out_substream_closing: None,
+										}
+						) {
+							State::OpenDesiredByRemote { in_substream, pending_opening, out_substream_closing } =>
+								(in_substream, pending_opening, out_substream_closing),
+							_ => unreachable!("Can only enter this branch after OpenDesiredByRemote; qed")
+						};
+
+						in_substream.set_close_desired();
 						self.protocols[protocol_index].state = State::Closed {
+							in_substream_closing: Some(in_substream),
+							in_substream_reopened: None,
+							out_substream_closing,
 							pending_opening,
 						};
 					}
@@ -672,14 +769,30 @@ impl ProtocolsHandler for NotifsHandler {
 		_: ProtocolsHandlerUpgrErr<NotificationsHandshakeError>
 	) {
 		match self.protocols[num].state {
-			State::Closed { ref mut pending_opening } |
-			State::OpenDesiredByRemote { ref mut pending_opening, .. } => {
+			State::Closed { ref mut pending_opening, ref mut out_substream_closing, .. } |
+			State::OpenDesiredByRemote { ref mut pending_opening, ref mut out_substream_closing, .. } => {
+				debug_assert!(out_substream_closing.is_none());
 				debug_assert!(*pending_opening);
 				*pending_opening = false;
 			}
 
-			State::Opening { .. } => {
+			State::Opening {
+				ref mut out_substream_closing,
+				ref mut in_substream_closing,
+				ref mut in_substream_reopened,
+				..
+			} => {
+				debug_assert!(!(in_substream_reopened.is_some() && in_substream_closing.is_some()));
+				debug_assert!(out_substream_closing.is_none());
+
+				if let Some(in_substream_reopened) = in_substream_reopened.as_mut() {
+					in_substream_reopened.set_close_desired();
+				}
+
 				self.protocols[num].state = State::Closed {
+					out_substream_closing: None,
+					in_substream_closing: in_substream_reopened.take().or(in_substream_closing.take()),
+					in_substream_reopened: None,
 					pending_opening: false,
 				};
 
@@ -788,15 +901,67 @@ impl ProtocolsHandler for NotifsHandler {
 			}
 		}
 
+		// Try close outbound substreams that are marked for closing.
+		for protocol_index in 0..self.protocols.len() {
+			match &mut self.protocols[protocol_index].state {
+				State::Closed { out_substream_closing: ref mut substream @ Some(_), .. } |
+				State::OpenDesiredByRemote { out_substream_closing: ref mut substream @ Some(_), .. } |
+				State::Opening { out_substream_closing: ref mut substream @ Some(_), .. } => {
+					match Sink::poll_close(Pin::new(substream.as_mut().unwrap()), cx) {
+						Poll::Pending => {},
+						Poll::Ready(_) => {
+							*substream = None;
+
+							if matches!(self.protocols[protocol_index].state, State::Opening { .. }) {
+								let protocol_info = &mut self.protocols[protocol_index];
+								let proto = NotificationsOut::new(
+									protocol_info.name.clone(),
+									protocol_info.handshake.read().clone(),
+									protocol_info.max_notification_size
+								);
+
+								self.events_queue.push_back(ProtocolsHandlerEvent::OutboundSubstreamRequest {
+									protocol: SubstreamProtocol::new(proto, protocol_index)
+										.with_timeout(OPEN_TIMEOUT),
+								});
+							}
+						}
+					}
+				}
+				_ => {}
+			}
+
+			if let State::Closed {
+				pending_opening,
+				out_substream_closing: None,
+				in_substream_closing,
+				in_substream_reopened: ref mut in_substream_reopened @ Some(_),
+				..
+			} = &mut self.protocols[protocol_index].state {
+				debug_assert!(!*pending_opening);
+				debug_assert!(in_substream_closing.is_none());
+
+				self.events_queue.push_back(ProtocolsHandlerEvent::Custom(
+					NotifsHandlerOut::OpenDesiredByRemote {
+						protocol_index,
+					}
+				));
+
+				self.protocols[protocol_index].state = State::OpenDesiredByRemote {
+					in_substream: in_substream_reopened.take()
+						.expect("The if let above ensures that this is Some ; qed"),
+					out_substream_closing: None,
+					pending_opening: false,
+				};
+			}
+		}
+
 		// Poll inbound substreams.
 		for protocol_index in 0..self.protocols.len() {
 			// Inbound substreams being closed is always tolerated, except for the
 			// `OpenDesiredByRemote` state which might need to be switched back to `Closed`.
 			match &mut self.protocols[protocol_index].state {
-				State::Closed { .. } |
-				State::Open { in_substream: None, .. } |
-				State::Opening { in_substream: None } => {}
-
+				State::Open { in_substream: None, .. } => {}
 				State::Open { in_substream: in_substream @ Some(_), .. } => {
 					match Stream::poll_next(Pin::new(in_substream.as_mut().unwrap()), cx) {
 						Poll::Pending => {},
@@ -812,13 +977,16 @@ impl ProtocolsHandler for NotifsHandler {
 					}
 				}
 
-				State::OpenDesiredByRemote { in_substream, pending_opening } => {
+				State::OpenDesiredByRemote { in_substream, pending_opening, out_substream_closing } => {
 					match NotificationsInSubstream::poll_process(Pin::new(in_substream), cx) {
 						Poll::Pending => {},
 						Poll::Ready(Ok(void)) => match void {},
 						Poll::Ready(Err(_)) => {
 							self.protocols[protocol_index].state = State::Closed {
 								pending_opening: *pending_opening,
+								in_substream_closing: None,
+								in_substream_reopened: None,
+								out_substream_closing: out_substream_closing.take(),
 							};
 							return Poll::Ready(ProtocolsHandlerEvent::Custom(
 								NotifsHandlerOut::CloseDesired { protocol_index }
@@ -827,13 +995,40 @@ impl ProtocolsHandler for NotifsHandler {
 					}
 				}
 
-				State::Opening { in_substream: in_substream @ Some(_), .. } => {
+				State::Opening { in_substream_closing: None, in_substream_reopened: None, .. } |
+				State::Closed { in_substream_closing: None, in_substream_reopened: None, .. } => {}
+
+				State::Opening {
+					in_substream_closing: ref mut in_substream @ Some(_),
+					in_substream_reopened: None,
+					..
+				} |
+				State::Opening {
+					in_substream_closing: None,
+					in_substream_reopened: ref mut in_substream @ Some(_),
+					..
+				} |
+				State::Closed {
+					in_substream_closing: ref mut in_substream @ Some(_),
+					in_substream_reopened: None,
+					..
+				} |
+				State::Closed {
+					in_substream_closing: None,
+					in_substream_reopened: ref mut in_substream @ Some(_),
+					..
+				} => {
 					match NotificationsInSubstream::poll_process(Pin::new(in_substream.as_mut().unwrap()), cx) {
 						Poll::Pending => {},
 						Poll::Ready(Ok(void)) => match void {},
 						Poll::Ready(Err(_)) => *in_substream = None,
 					}
 				}
+
+				State::Opening { in_substream_closing: Some(_), in_substream_reopened: Some(_), .. } |
+				State::Closed { in_substream_closing: Some(_), in_substream_reopened: Some(_), .. } => {
+					debug_assert!(false);
+				}
 			}
 		}
 
diff --git a/client/network/src/protocol/notifications/upgrade/notifications.rs b/client/network/src/protocol/notifications/upgrade/notifications.rs
index eba96441bcfd..f76472a0de2c 100644
--- a/client/network/src/protocol/notifications/upgrade/notifications.rs
+++ b/client/network/src/protocol/notifications/upgrade/notifications.rs
@@ -88,10 +88,11 @@ enum NotificationsInSubstreamHandshake {
 	PendingSend(Vec<u8>),
 	/// Handshake message was pushed in the socket. Still need to flush.
 	Flush,
-	/// Handshake message successfully sent and flushed.
-	Sent,
-	/// Remote has closed their writing side. We close our own writing side in return.
-	ClosingInResponseToRemote,
+	/// Ready to receive notifications. Handshake message successfully sent and flushed, or
+	/// sending side closed before handshake sent.
+	Normal { write_side_open: bool },
+	/// Closing our writing side.
+	Closing { remote_write_open: bool },
 	/// Both our side and the remote have closed their writing side.
 	BothSidesClosed,
 }
@@ -169,8 +170,30 @@ where TSubstream: AsyncRead + AsyncWrite + Unpin + Send + 'static,
 impl<TSubstream> NotificationsInSubstream<TSubstream>
 where TSubstream: AsyncRead + AsyncWrite + Unpin,
 {
+	/// Closes the writing side of the substream, indicating to the remote that we would like this
+	/// substream to be closed.
+	pub fn set_close_desired(&mut self) {
+		match self.handshake {
+			NotificationsInSubstreamHandshake::PendingSend(_) |
+			NotificationsInSubstreamHandshake::Flush |
+			NotificationsInSubstreamHandshake::NotSent |
+			NotificationsInSubstreamHandshake::Normal { write_side_open: true } => {
+				self.handshake = NotificationsInSubstreamHandshake::Closing { remote_write_open: true };
+			}
+			NotificationsInSubstreamHandshake::Normal { write_side_open: false } |
+			NotificationsInSubstreamHandshake::Closing { .. } |
+			NotificationsInSubstreamHandshake::BothSidesClosed => {}
+		}
+	}
+
 	/// Sends the handshake in order to inform the remote that we accept the substream.
+	///
+	/// Has no effect if `set_close_desired` has been called.
 	pub fn send_handshake(&mut self, message: impl Into<Vec<u8>>) {
+		if matches!(self.handshake, NotificationsInSubstreamHandshake::Normal { write_side_open: false }) {
+			return;
+		}
+
 		if !matches!(self.handshake, NotificationsInSubstreamHandshake::NotSent) {
 			error!(target: "sub-libp2p", "Tried to send handshake twice");
 			return;
@@ -185,7 +208,7 @@ where TSubstream: AsyncRead + AsyncWrite + Unpin,
 		let mut this = self.project();
 
 		loop {
-			match mem::replace(this.handshake, NotificationsInSubstreamHandshake::Sent) {
+			match mem::replace(this.handshake, NotificationsInSubstreamHandshake::NotSent) {
 				NotificationsInSubstreamHandshake::PendingSend(msg) =>
 					match Sink::poll_ready(this.socket.as_mut(), cx) {
 						Poll::Ready(_) => {
@@ -203,16 +226,28 @@ where TSubstream: AsyncRead + AsyncWrite + Unpin,
 				NotificationsInSubstreamHandshake::Flush =>
 					match Sink::poll_flush(this.socket.as_mut(), cx)? {
 						Poll::Ready(()) =>
-							*this.handshake = NotificationsInSubstreamHandshake::Sent,
+							*this.handshake = NotificationsInSubstreamHandshake::Normal { write_side_open: true },
 						Poll::Pending => {
 							*this.handshake = NotificationsInSubstreamHandshake::Flush;
 							return Poll::Pending
 						}
 					},
 
+				NotificationsInSubstreamHandshake::Closing { remote_write_open } =>
+					match Sink::poll_close(this.socket.as_mut(), cx)? {
+						Poll::Ready(()) => if remote_write_open {
+							*this.handshake = NotificationsInSubstreamHandshake::Normal { write_side_open: false }
+						} else {
+							*this.handshake = NotificationsInSubstreamHandshake::BothSidesClosed;
+						},
+						Poll::Pending => {
+							*this.handshake = NotificationsInSubstreamHandshake::Closing { remote_write_open };
+							return Poll::Pending
+						}
+					},
+
 				st @ NotificationsInSubstreamHandshake::NotSent |
-				st @ NotificationsInSubstreamHandshake::Sent |
-				st @ NotificationsInSubstreamHandshake::ClosingInResponseToRemote |
+				st @ NotificationsInSubstreamHandshake::Normal { .. } |
 				st @ NotificationsInSubstreamHandshake::BothSidesClosed => {
 					*this.handshake = st;
 					return Poll::Pending;
@@ -232,7 +267,7 @@ where TSubstream: AsyncRead + AsyncWrite + Unpin,
 
 		// This `Stream` implementation first tries to send back the handshake if necessary.
 		loop {
-			match mem::replace(this.handshake, NotificationsInSubstreamHandshake::Sent) {
+			match mem::replace(this.handshake, NotificationsInSubstreamHandshake::NotSent) {
 				NotificationsInSubstreamHandshake::NotSent => {
 					*this.handshake = NotificationsInSubstreamHandshake::NotSent;
 					return Poll::Pending
@@ -254,34 +289,39 @@ where TSubstream: AsyncRead + AsyncWrite + Unpin,
 				NotificationsInSubstreamHandshake::Flush =>
 					match Sink::poll_flush(this.socket.as_mut(), cx)? {
 						Poll::Ready(()) =>
-							*this.handshake = NotificationsInSubstreamHandshake::Sent,
+							*this.handshake = NotificationsInSubstreamHandshake::Normal { write_side_open: true },
 						Poll::Pending => {
 							*this.handshake = NotificationsInSubstreamHandshake::Flush;
 							return Poll::Pending
 						}
 					},
 
-				NotificationsInSubstreamHandshake::Sent => {
+				NotificationsInSubstreamHandshake::Normal { write_side_open } => {
 					match Stream::poll_next(this.socket.as_mut(), cx) {
-						Poll::Ready(None) => *this.handshake =
-							NotificationsInSubstreamHandshake::ClosingInResponseToRemote,
+						Poll::Ready(None) if write_side_open =>
+							*this.handshake =
+								NotificationsInSubstreamHandshake::Closing { remote_write_open: false },
+						Poll::Ready(None) =>
+							*this.handshake = NotificationsInSubstreamHandshake::BothSidesClosed,
 						Poll::Ready(Some(msg)) => {
-							*this.handshake = NotificationsInSubstreamHandshake::Sent;
+							*this.handshake = NotificationsInSubstreamHandshake::Normal { write_side_open };
 							return Poll::Ready(Some(msg))
 						},
 						Poll::Pending => {
-							*this.handshake = NotificationsInSubstreamHandshake::Sent;
+							*this.handshake = NotificationsInSubstreamHandshake::Normal { write_side_open };
 							return Poll::Pending
 						},
 					}
 				},
 
-				NotificationsInSubstreamHandshake::ClosingInResponseToRemote =>
+				NotificationsInSubstreamHandshake::Closing { remote_write_open } =>
 					match Sink::poll_close(this.socket.as_mut(), cx)? {
+						Poll::Ready(()) if remote_write_open =>
+							*this.handshake = NotificationsInSubstreamHandshake::Normal { write_side_open: false },
 						Poll::Ready(()) =>
 							*this.handshake = NotificationsInSubstreamHandshake::BothSidesClosed,
 						Poll::Pending => {
-							*this.handshake = NotificationsInSubstreamHandshake::ClosingInResponseToRemote;
+							*this.handshake = NotificationsInSubstreamHandshake::Closing { remote_write_open };
 							return Poll::Pending
 						}
 					},

From 8c4e2968b25c8d0ab9f7d47c9361bcc43e501ec5 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Fri, 16 Apr 2021 08:06:05 +0200
Subject: [PATCH 0651/1194] BoundedVec + Shims for Append/DecodeLength (#8556)

* prototype for shawn

* Clean and document it

* Add more docs

* Move imports

* Some changes for easier compat.

* revert exmaple pallet

* rename

* BoundedVec for AccountLocks (#8580)

* Example with balances

* Fix tests

* Make it indexable

* fix

* Fix tests

* fix test

* Fix collective as well

* Fix test

* Update frame/support/src/storage/mod.rs

Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>

* Repot and add for value

* Add for map and double map

* Final touches.

* Update frame/support/src/storage/bounded_vec.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Add a few more tests

* Add import

Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
---
 frame/collective/src/lib.rs                   |  19 +-
 frame/democracy/src/tests.rs                  |   3 +-
 frame/support/src/lib.rs                      |  20 +-
 frame/support/src/storage/bounded_vec.rs      | 470 ++++++++++++++++++
 frame/support/src/storage/mod.rs              |  14 +-
 frame/support/src/storage/types/double_map.rs |  47 +-
 frame/support/src/storage/types/map.rs        |  31 +-
 frame/support/src/storage/types/value.rs      |  23 +-
 8 files changed, 597 insertions(+), 30 deletions(-)
 create mode 100644 frame/support/src/storage/bounded_vec.rs

diff --git a/frame/collective/src/lib.rs b/frame/collective/src/lib.rs
index 5c33bff3006b..6284617e89bd 100644
--- a/frame/collective/src/lib.rs
+++ b/frame/collective/src/lib.rs
@@ -48,13 +48,12 @@ use sp_io::storage;
 use sp_runtime::{RuntimeDebug, traits::Hash};
 
 use frame_support::{
+	decl_error, decl_event, decl_module, decl_storage, ensure, BoundedVec,
 	codec::{Decode, Encode},
-	decl_error, decl_event, decl_module, decl_storage,
 	dispatch::{
 		DispatchError, DispatchResult, DispatchResultWithPostInfo, Dispatchable, Parameter,
 		PostDispatchInfo,
 	},
-	ensure,
 	traits::{ChangeMembers, EnsureOrigin, Get, InitializeMembers, GetBacking, Backing},
 	weights::{DispatchClass, GetDispatchInfo, Weight, Pays},
 };
@@ -195,7 +194,7 @@ pub struct Votes<AccountId, BlockNumber> {
 decl_storage! {
 	trait Store for Module<T: Config<I>, I: Instance=DefaultInstance> as Collective {
 		/// The hashes of the active proposals.
-		pub Proposals get(fn proposals): Vec<T::Hash>;
+		pub Proposals get(fn proposals): BoundedVec<T::Hash, T::MaxProposals>;
 		/// Actual proposal for a given hash, if it's current.
 		pub ProposalOf get(fn proposal_of):
 			map hasher(identity) T::Hash => Option<<T as Config<I>>::Proposal>;
@@ -471,11 +470,7 @@ decl_module! {
 			} else {
 				let active_proposals =
 					<Proposals<T, I>>::try_mutate(|proposals| -> Result<usize, DispatchError> {
-						proposals.push(proposal_hash);
-						ensure!(
-							proposals.len() <= T::MaxProposals::get() as usize,
-							Error::<T, I>::TooManyProposals
-						);
+						proposals.try_push(proposal_hash).map_err(|_| Error::<T, I>::TooManyProposals)?;
 						Ok(proposals.len())
 					})?;
 				let index = Self::proposal_count();
@@ -1086,7 +1081,7 @@ mod tests {
 	fn motions_basic_environment_works() {
 		new_test_ext().execute_with(|| {
 			assert_eq!(Collective::members(), vec![1, 2, 3]);
-			assert_eq!(Collective::proposals(), Vec::<H256>::new());
+			assert_eq!(*Collective::proposals(), Vec::<H256>::new());
 		});
 	}
 
@@ -1316,7 +1311,7 @@ mod tests {
 			let hash = proposal.blake2_256().into();
 			let end = 4;
 			assert_ok!(Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone()), proposal_len));
-			assert_eq!(Collective::proposals(), vec![hash]);
+			assert_eq!(*Collective::proposals(), vec![hash]);
 			assert_eq!(Collective::proposal_of(&hash), Some(proposal));
 			assert_eq!(
 				Collective::voting(&hash),
@@ -1577,9 +1572,9 @@ mod tests {
 			assert_ok!(Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone()), proposal_len));
 			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 0, false));
 			assert_ok!(Collective::close(Origin::signed(2), hash.clone(), 0, proposal_weight, proposal_len));
-			assert_eq!(Collective::proposals(), vec![]);
+			assert_eq!(*Collective::proposals(), vec![]);
 			assert_ok!(Collective::propose(Origin::signed(1), 2, Box::new(proposal.clone()), proposal_len));
-			assert_eq!(Collective::proposals(), vec![hash]);
+			assert_eq!(*Collective::proposals(), vec![hash]);
 		});
 	}
 
diff --git a/frame/democracy/src/tests.rs b/frame/democracy/src/tests.rs
index 9df594ed0787..73bbb5481dad 100644
--- a/frame/democracy/src/tests.rs
+++ b/frame/democracy/src/tests.rs
@@ -120,9 +120,10 @@ impl pallet_scheduler::Config for Test {
 }
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
+	pub const MaxLocks: u32 = 10;
 }
 impl pallet_balances::Config for Test {
-	type MaxLocks = ();
+	type MaxLocks = MaxLocks;
 	type Balance = u64;
 	type Event = Event;
 	type DustRemoval = ();
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index ef5f64cfc24a..6740e0db5a0e 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -75,7 +75,8 @@ pub use self::hash::{
 };
 pub use self::storage::{
 	StorageValue, StorageMap, StorageDoubleMap, StoragePrefixedMap, IterableStorageMap,
-	IterableStorageDoubleMap, migration
+	IterableStorageDoubleMap, migration,
+	bounded_vec::{self, BoundedVec},
 };
 pub use self::dispatch::{Parameter, Callable};
 pub use sp_runtime::{self, ConsensusEngineId, print, traits::Printable};
@@ -112,20 +113,20 @@ impl TypeId for PalletId {
 ///
 /// // generate a double map from `(u32, u32)` (with hasher `Twox64Concat`) to `Vec<u8>`
 /// generate_storage_alias!(
-///		OtherPrefix, OtherStorageName => DoubleMap<
+/// 	OtherPrefix, OtherStorageName => DoubleMap<
 /// 		(u32, u32),
 /// 		(u32, u32),
 /// 		Vec<u8>
-///		>
+/// 	>
 /// );
 ///
 /// // generate a map from `Config::AccountId` (with hasher `Twox64Concat`) to `Vec<u8>`
 /// trait Config { type AccountId: codec::FullCodec; }
 /// generate_storage_alias!(
-///		Prefix, GenericStorage<T: Config> => Map<(Twox64Concat, T::AccountId), Vec<u8>>
+/// 	Prefix, GenericStorage<T: Config> => Map<(Twox64Concat, T::AccountId), Vec<u8>>
 /// );
 /// # fn main() {}
-///```
+/// ```
 #[macro_export]
 macro_rules! generate_storage_alias {
 	// without generic for $name.
@@ -143,7 +144,7 @@ macro_rules! generate_storage_alias {
 	($pallet:ident, $name:ident => DoubleMap<($key1:ty, $hasher1:ty), ($key2:ty, $hasher2:ty), $value:ty>) => {
 		$crate::paste::paste! {
 			$crate::generate_storage_alias!(@GENERATE_INSTANCE_STRUCT $pallet, $name);
-			type $name = $crate::storage::types::StorageMap<
+			type $name = $crate::storage::types::StorageDoubleMap<
 				[<$name Instance>],
 				$hasher1,
 				$key1,
@@ -178,12 +179,11 @@ macro_rules! generate_storage_alias {
 	(
 		$pallet:ident,
 		$name:ident<$t:ident : $bounds:tt>
-		=> DoubleMap<($key1:ty, $hasher1:ty), ($key2:ty, $hasher2:ty), $value:ty>)
-	=> {
+		=> DoubleMap<($key1:ty, $hasher1:ty), ($key2:ty, $hasher2:ty), $value:ty>) => {
 		$crate::paste::paste! {
 			$crate::generate_storage_alias!(@GENERATE_INSTANCE_STRUCT $pallet, $name);
 			#[allow(type_alias_bounds)]
-			type $name<$t : $bounds> = $crate::storage::types::StorageMap<
+			type $name<$t : $bounds> = $crate::storage::types::StorageDoubleMap<
 				[<$name Instance>],
 				$key1,
 				$hasher1,
@@ -213,7 +213,7 @@ macro_rules! generate_storage_alias {
 				const STORAGE_PREFIX: &'static str = stringify!($name);
 			}
 		}
-	}
+	};
 }
 
 /// Create new implementations of the [`Get`](crate::traits::Get) trait.
diff --git a/frame/support/src/storage/bounded_vec.rs b/frame/support/src/storage/bounded_vec.rs
new file mode 100644
index 000000000000..44e3f30a7b31
--- /dev/null
+++ b/frame/support/src/storage/bounded_vec.rs
@@ -0,0 +1,470 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Traits, types and structs to support putting a bounded vector into storage, as a raw value, map
+//! or a double map.
+
+use sp_std::prelude::*;
+use sp_std::{convert::TryFrom, marker::PhantomData};
+use codec::{FullCodec, Encode, EncodeLike, Decode};
+use crate::{
+	traits::Get,
+	storage::{generator, StorageDecodeLength, StorageValue, StorageMap, StorageDoubleMap},
+};
+
+/// Marker trait for types `T` that can be stored in storage as `BoundedVec<T, _>`.
+pub trait BoundedVecValue: FullCodec + Clone + sp_std::fmt::Debug {}
+impl<T: FullCodec + Clone + sp_std::fmt::Debug> BoundedVecValue for T {}
+
+/// A bounded vector.
+///
+/// It has implementations for efficient append and length decoding, as with a normal `Vec<_>`, once
+/// put into storage as a raw value, map or double-map.
+///
+/// As the name suggests, the length of the queue is always bounded. All internal operations ensure
+/// this bound is respected.
+#[derive(Encode, Decode, crate::DefaultNoBound, crate::CloneNoBound, crate::DebugNoBound)]
+pub struct BoundedVec<T: BoundedVecValue, S: Get<u32>>(Vec<T>, PhantomData<S>);
+
+// NOTE: we could also implement this as:
+// impl<T: Value, S1: Get<u32>, S2: Get<u32>> PartialEq<BoundedVec<T, S2>> for BoundedVec<T, S1>
+// to allow comparison of bounded vectors with different bounds.
+impl<T: PartialEq + BoundedVecValue, S: Get<u32>> PartialEq for BoundedVec<T, S> {
+	fn eq(&self, rhs: &Self) -> bool {
+		self.0 == rhs.0
+	}
+}
+impl<T: Eq + PartialEq + BoundedVecValue, S: Get<u32>> Eq for BoundedVec<T, S> {}
+
+impl<T: BoundedVecValue, S: Get<u32>> BoundedVec<T, S> {
+	/// Get the bound of the type in `usize`.
+	pub fn bound() -> usize {
+		S::get() as usize
+	}
+
+	/// Create `Self` from `t` without any checks.
+	///
+	/// # WARNING
+	///
+	/// Only use when you are sure you know what you are doing.
+	fn unchecked_from(t: Vec<T>) -> Self {
+		Self(t, Default::default())
+	}
+
+	/// Create `Self` from `t` without any checks. Logs warnings if the bound is not being
+	/// respected. The additional scope can be used to indicate where a potential overflow is
+	/// happening.
+	///
+	/// # WARNING
+	///
+	/// Only use when you are sure you know what you are doing.
+	pub fn force_from(t: Vec<T>, scope: Option<&'static str>) -> Self {
+		if t.len() > Self::bound() {
+			log::warn!(
+				target: crate::LOG_TARGET,
+				"length of a bounded vector in scope {} is not respected.",
+				scope.unwrap_or("UNKNOWN"),
+			);
+		}
+
+		Self::unchecked_from(t)
+	}
+
+	/// Consume self, and return the inner `Vec`. Henceforth, the `Vec<_>` can be altered in an
+	/// arbitrary way. At some point, if the reverse conversion is required, `TryFrom<Vec<_>>` can
+	/// be used.
+	///
+	/// This is useful for cases if you need access to an internal API of the inner `Vec<_>` which
+	/// is not provided by the wrapper `BoundedVec`.
+	pub fn into_inner(self) -> Vec<T> {
+		debug_assert!(self.0.len() <= Self::bound());
+		self.0
+	}
+
+	/// Consumes self and mutates self via the given `mutate` function.
+	///
+	/// If the outcome of mutation is within bounds, `Some(Self)` is returned. Else, `None` is
+	/// returned.
+	///
+	/// This is essentially a *consuming* shorthand [`Self::into_inner`] -> `...` ->
+	/// [`Self::try_from`].
+	pub fn try_mutate(mut self, mut mutate: impl FnMut(&mut Vec<T>)) -> Option<Self> {
+		mutate(&mut self.0);
+		(self.0.len() <= Self::bound()).then(move || self)
+	}
+
+	/// Exactly the same semantics as [`Vec::insert`], but returns an `Err` (and is a noop) if the
+	/// new length of the vector exceeds `S`.
+	///
+	/// # Panics
+	///
+	/// Panics if `index > len`.
+	pub fn try_insert(&mut self, index: usize, element: T) -> Result<(), ()> {
+		if self.len() < Self::bound() {
+			self.0.insert(index, element);
+			Ok(())
+		} else {
+			Err(())
+		}
+	}
+
+	/// Exactly the same semantics as [`Vec::push`], but returns an `Err` (and is a noop) if the
+	/// new length of the vector exceeds `S`.
+	///
+	/// # Panics
+	///
+	/// Panics if the new capacity exceeds isize::MAX bytes.
+	pub fn try_push(&mut self, element: T) -> Result<(), ()> {
+		if self.len() < Self::bound() {
+			self.0.push(element);
+			Ok(())
+		} else {
+			Err(())
+		}
+	}
+
+	/// Exactly the same semantics as [`Vec::remove`].
+	///
+	/// # Panics
+	///
+	/// Panics if `index` is out of bounds.
+	pub fn remove(&mut self, index: usize) {
+		self.0.remove(index);
+	}
+
+	/// Exactly the same semantics as [`Vec::swap_remove`].
+	///
+	/// # Panics
+	///
+	/// Panics if `index` is out of bounds.
+	pub fn swap_remove(&mut self, index: usize) {
+		self.0.swap_remove(index);
+	}
+
+	/// Exactly the same semantics as [`Vec::retain`].
+	pub fn retain<F: FnMut(&T) -> bool>(&mut self, f: F) {
+		self.0.retain(f)
+	}
+}
+
+impl<T: BoundedVecValue, S: Get<u32>> TryFrom<Vec<T>> for BoundedVec<T, S> {
+	type Error = ();
+	fn try_from(t: Vec<T>) -> Result<Self, Self::Error> {
+		if t.len() <= Self::bound() {
+			Ok(Self::unchecked_from(t))
+		} else {
+			Err(())
+		}
+	}
+}
+
+// It is okay to give a non-mutable reference of the inner vec to anyone.
+impl<T: BoundedVecValue, S: Get<u32>> AsRef<Vec<T>> for BoundedVec<T, S> {
+	fn as_ref(&self) -> &Vec<T> {
+		&self.0
+	}
+}
+
+// will allow for immutable all operations of `Vec<T>` on `BoundedVec<T>`.
+impl<T: BoundedVecValue, S: Get<u32>> sp_std::ops::Deref for BoundedVec<T, S> {
+	type Target = Vec<T>;
+
+	fn deref(&self) -> &Self::Target {
+		&self.0
+	}
+}
+
+// Allows for indexing similar to a normal `Vec`. Can panic if out of bound.
+impl<T: BoundedVecValue, S: Get<u32>> sp_std::ops::Index<usize> for BoundedVec<T, S> {
+	type Output = T;
+	fn index(&self, index: usize) -> &Self::Output {
+		self.get(index).expect("index out of bound")
+	}
+}
+
+impl<T: BoundedVecValue, S: Get<u32>> sp_std::iter::IntoIterator for BoundedVec<T, S> {
+	type Item = T;
+	type IntoIter = sp_std::vec::IntoIter<T>;
+	fn into_iter(self) -> Self::IntoIter {
+		self.0.into_iter()
+	}
+}
+
+impl<T: BoundedVecValue, S: Get<u32>> codec::DecodeLength for BoundedVec<T, S> {
+	fn len(self_encoded: &[u8]) -> Result<usize, codec::Error> {
+		// `BoundedVec<T, _>` stored just a `Vec<T>`, thus the length is at the beginning in
+		// `Compact` form, and same implementation as `Vec<T>` can be used.
+		<Vec<T> as codec::DecodeLength>::len(self_encoded)
+	}
+}
+
+impl<T: BoundedVecValue, S: Get<u32>> StorageDecodeLength for BoundedVec<T, S> {}
+
+/// Storage value that is *maybe* capable of [`StorageAppend`].
+pub trait TryAppendValue<T: BoundedVecValue, S: Get<u32>> {
+	/// Try and append the `item` into the storage item.
+	///
+	/// This might fail if bounds are not respected.
+	fn try_append<LikeT: EncodeLike<T>>(item: LikeT) -> Result<(), ()>;
+}
+
+/// Storage map that is *maybe* capable of [`StorageAppend`].
+pub trait TryAppendMap<K: FullCodec, T: BoundedVecValue, S: Get<u32>> {
+	/// Try and append the `item` into the storage map at the given `key`.
+	///
+	/// This might fail if bounds are not respected.
+	fn try_append<LikeK: EncodeLike<K> + Clone, LikeT: EncodeLike<T>>(
+		key: LikeK,
+		item: LikeT,
+	) -> Result<(), ()>;
+}
+
+/// Storage double map that is *maybe* capable of [`StorageAppend`].
+pub trait TryAppendDoubleMap<K1: FullCodec, K2: FullCodec, T: BoundedVecValue, S: Get<u32>> {
+	/// Try and append the `item` into the storage double map at the given `key`.
+	///
+	/// This might fail if bounds are not respected.
+	fn try_append<
+		LikeK1: EncodeLike<K1> + Clone,
+		LikeK2: EncodeLike<K2> + Clone,
+		LikeT: EncodeLike<T>,
+	>(
+		key1: LikeK1,
+		key2: LikeK2,
+		item: LikeT,
+	) -> Result<(), ()>;
+}
+
+impl<T: BoundedVecValue, S: Get<u32>, StorageValueT: generator::StorageValue<BoundedVec<T, S>>>
+	TryAppendValue<T, S> for StorageValueT
+{
+	fn try_append<LikeT: EncodeLike<T>>(item: LikeT) -> Result<(), ()> {
+		let bound = BoundedVec::<T, S>::bound();
+		let current = Self::decode_len().unwrap_or_default();
+		if current < bound {
+			// NOTE: we cannot reuse the implementation for `Vec<T>` here because we never want to
+			// mark `BoundedVec<T, S>` as `StorageAppend`.
+			let key = Self::storage_value_final_key();
+			sp_io::storage::append(&key, item.encode());
+			Ok(())
+		} else {
+			Err(())
+		}
+	}
+}
+
+impl<
+		K: FullCodec,
+		T: BoundedVecValue,
+		S: Get<u32>,
+		StorageMapT: generator::StorageMap<K, BoundedVec<T, S>>,
+	> TryAppendMap<K, T, S> for StorageMapT
+{
+	fn try_append<LikeK: EncodeLike<K> + Clone, LikeT: EncodeLike<T>>(
+		key: LikeK,
+		item: LikeT,
+	) -> Result<(), ()> {
+		let bound = BoundedVec::<T, S>::bound();
+		let current = Self::decode_len(key.clone()).unwrap_or_default();
+		if current < bound {
+			let key = Self::storage_map_final_key(key);
+			sp_io::storage::append(&key, item.encode());
+			Ok(())
+		} else {
+			Err(())
+		}
+	}
+}
+
+impl<
+		K1: FullCodec,
+		K2: FullCodec,
+		T: BoundedVecValue,
+		S: Get<u32>,
+		StorageDoubleMapT: generator::StorageDoubleMap<K1, K2, BoundedVec<T, S>>,
+	> TryAppendDoubleMap<K1, K2, T, S> for StorageDoubleMapT
+{
+	fn try_append<
+		LikeK1: EncodeLike<K1> + Clone,
+		LikeK2: EncodeLike<K2> + Clone,
+		LikeT: EncodeLike<T>,
+	>(
+		key1: LikeK1,
+		key2: LikeK2,
+		item: LikeT,
+	) -> Result<(), ()> {
+		let bound = BoundedVec::<T, S>::bound();
+		let current = Self::decode_len(key1.clone(), key2.clone()).unwrap_or_default();
+		if current < bound {
+			let double_map_key = Self::storage_double_map_final_key(key1, key2);
+			sp_io::storage::append(&double_map_key, item.encode());
+			Ok(())
+		} else {
+			Err(())
+		}
+	}
+}
+
+#[cfg(test)]
+pub mod test {
+	use super::*;
+	use sp_io::TestExternalities;
+	use sp_std::convert::TryInto;
+	use crate::{assert_ok, Twox128};
+
+	crate::parameter_types! {
+		pub const Seven: u32 = 7;
+		pub const Four: u32 = 4;
+	}
+
+	crate::generate_storage_alias! { Prefix, Foo => Value<BoundedVec<u32, Seven>> }
+	crate::generate_storage_alias! { Prefix, FooMap => Map<(u32, Twox128), BoundedVec<u32, Seven>> }
+	crate::generate_storage_alias! {
+		Prefix,
+		FooDoubleMap => DoubleMap<(u32, Twox128), (u32, Twox128), BoundedVec<u32, Seven>>
+	}
+
+	#[test]
+	fn decode_len_works() {
+		TestExternalities::default().execute_with(|| {
+			let bounded: BoundedVec<u32, Seven> = vec![1, 2, 3].try_into().unwrap();
+			Foo::put(bounded);
+			assert_eq!(Foo::decode_len().unwrap(), 3);
+		});
+
+		TestExternalities::default().execute_with(|| {
+			let bounded: BoundedVec<u32, Seven> = vec![1, 2, 3].try_into().unwrap();
+			FooMap::insert(1, bounded);
+			assert_eq!(FooMap::decode_len(1).unwrap(), 3);
+			assert!(FooMap::decode_len(0).is_none());
+			assert!(FooMap::decode_len(2).is_none());
+		});
+
+		TestExternalities::default().execute_with(|| {
+			let bounded: BoundedVec<u32, Seven> = vec![1, 2, 3].try_into().unwrap();
+			FooDoubleMap::insert(1, 1, bounded);
+			assert_eq!(FooDoubleMap::decode_len(1, 1).unwrap(), 3);
+			assert!(FooDoubleMap::decode_len(2, 1).is_none());
+			assert!(FooDoubleMap::decode_len(1, 2).is_none());
+			assert!(FooDoubleMap::decode_len(2, 2).is_none());
+		});
+	}
+
+	#[test]
+	fn try_append_works() {
+		TestExternalities::default().execute_with(|| {
+			let bounded: BoundedVec<u32, Seven> = vec![1, 2, 3].try_into().unwrap();
+			Foo::put(bounded);
+			assert_ok!(Foo::try_append(4));
+			assert_ok!(Foo::try_append(5));
+			assert_ok!(Foo::try_append(6));
+			assert_ok!(Foo::try_append(7));
+			assert_eq!(Foo::decode_len().unwrap(), 7);
+			assert!(Foo::try_append(8).is_err());
+		});
+
+		TestExternalities::default().execute_with(|| {
+			let bounded: BoundedVec<u32, Seven> = vec![1, 2, 3].try_into().unwrap();
+			FooMap::insert(1, bounded);
+
+			assert_ok!(FooMap::try_append(1, 4));
+			assert_ok!(FooMap::try_append(1, 5));
+			assert_ok!(FooMap::try_append(1, 6));
+			assert_ok!(FooMap::try_append(1, 7));
+			assert_eq!(FooMap::decode_len(1).unwrap(), 7);
+			assert!(FooMap::try_append(1, 8).is_err());
+
+			// append to a non-existing
+			assert!(FooMap::get(2).is_none());
+			assert_ok!(FooMap::try_append(2, 4));
+			assert_eq!(FooMap::get(2).unwrap(), BoundedVec::<u32, Seven>::unchecked_from(vec![4]));
+			assert_ok!(FooMap::try_append(2, 5));
+			assert_eq!(
+				FooMap::get(2).unwrap(),
+				BoundedVec::<u32, Seven>::unchecked_from(vec![4, 5])
+			);
+		});
+
+		TestExternalities::default().execute_with(|| {
+			let bounded: BoundedVec<u32, Seven> = vec![1, 2, 3].try_into().unwrap();
+			FooDoubleMap::insert(1, 1, bounded);
+
+			assert_ok!(FooDoubleMap::try_append(1, 1, 4));
+			assert_ok!(FooDoubleMap::try_append(1, 1, 5));
+			assert_ok!(FooDoubleMap::try_append(1, 1, 6));
+			assert_ok!(FooDoubleMap::try_append(1, 1, 7));
+			assert_eq!(FooDoubleMap::decode_len(1, 1).unwrap(), 7);
+			assert!(FooDoubleMap::try_append(1, 1, 8).is_err());
+
+			// append to a non-existing
+			assert!(FooDoubleMap::get(2, 1).is_none());
+			assert_ok!(FooDoubleMap::try_append(2, 1, 4));
+			assert_eq!(
+				FooDoubleMap::get(2, 1).unwrap(),
+				BoundedVec::<u32, Seven>::unchecked_from(vec![4])
+			);
+			assert_ok!(FooDoubleMap::try_append(2, 1, 5));
+			assert_eq!(
+				FooDoubleMap::get(2, 1).unwrap(),
+				BoundedVec::<u32, Seven>::unchecked_from(vec![4, 5])
+			);
+		});
+	}
+
+	#[test]
+	fn try_insert_works() {
+		let mut bounded: BoundedVec<u32, Four> = vec![1, 2, 3].try_into().unwrap();
+		bounded.try_insert(1, 0).unwrap();
+		assert_eq!(*bounded, vec![1, 0, 2, 3]);
+
+		assert!(bounded.try_insert(0, 9).is_err());
+		assert_eq!(*bounded, vec![1, 0, 2, 3]);
+	}
+
+	#[test]
+	#[should_panic(expected = "insertion index (is 9) should be <= len (is 3)")]
+	fn try_inert_panics_if_oob() {
+		let mut bounded: BoundedVec<u32, Four> = vec![1, 2, 3].try_into().unwrap();
+		bounded.try_insert(9, 0).unwrap();
+	}
+
+	#[test]
+	fn try_push_works() {
+		let mut bounded: BoundedVec<u32, Four> = vec![1, 2, 3].try_into().unwrap();
+		bounded.try_push(0).unwrap();
+		assert_eq!(*bounded, vec![1, 2, 3, 0]);
+
+		assert!(bounded.try_push(9).is_err());
+	}
+
+	#[test]
+	fn deref_coercion_works() {
+		let bounded: BoundedVec<u32, Seven> = vec![1, 2, 3].try_into().unwrap();
+		// these methods come from deref-ed vec.
+		assert_eq!(bounded.len(), 3);
+		assert!(bounded.iter().next().is_some());
+		assert!(!bounded.is_empty());
+	}
+
+	#[test]
+	fn try_mutate_works() {
+		let bounded: BoundedVec<u32, Seven> = vec![1, 2, 3, 4, 5, 6].try_into().unwrap();
+		let bounded = bounded.try_mutate(|v| v.push(7)).unwrap();
+		assert_eq!(bounded.len(), 7);
+		assert!(bounded.try_mutate(|v| v.push(8)).is_none());
+	}
+}
diff --git a/frame/support/src/storage/mod.rs b/frame/support/src/storage/mod.rs
index e00a3fe83182..adcf44a64620 100644
--- a/frame/support/src/storage/mod.rs
+++ b/frame/support/src/storage/mod.rs
@@ -20,12 +20,16 @@
 use sp_core::storage::ChildInfo;
 use sp_std::prelude::*;
 use codec::{FullCodec, FullEncode, Encode, EncodeLike, Decode};
-use crate::hash::{Twox128, StorageHasher, ReversibleStorageHasher};
+use crate::{
+	hash::{Twox128, StorageHasher, ReversibleStorageHasher},
+	traits::Get,
+};
 use sp_runtime::generic::{Digest, DigestItem};
 pub use sp_runtime::TransactionOutcome;
 
 pub mod unhashed;
 pub mod hashed;
+pub mod bounded_vec;
 pub mod child;
 #[doc(hidden)]
 pub mod generator;
@@ -806,19 +810,21 @@ pub trait StorageDecodeLength: private::Sealed + codec::DecodeLength {
 /// outside of this crate.
 mod private {
 	use super::*;
+	use bounded_vec::{BoundedVecValue, BoundedVec};
 
 	pub trait Sealed {}
 
 	impl<T: Encode> Sealed for Vec<T> {}
 	impl<Hash: Encode> Sealed for Digest<Hash> {}
+	impl<T: BoundedVecValue, S: Get<u32>> Sealed for BoundedVec<T, S> {}
 }
 
 impl<T: Encode> StorageAppend<T> for Vec<T> {}
 impl<T: Encode> StorageDecodeLength for Vec<T> {}
 
-/// We abuse the fact that SCALE does not put any marker into the encoding, i.e.
-/// we only encode the internal vec and we can append to this vec. We have a test that ensures
-/// that if the `Digest` format ever changes, we need to remove this here.
+/// We abuse the fact that SCALE does not put any marker into the encoding, i.e. we only encode the
+/// internal vec and we can append to this vec. We have a test that ensures that if the `Digest`
+/// format ever changes, we need to remove this here.
 impl<Hash: Encode> StorageAppend<DigestItem<Hash>> for Digest<Hash> {}
 
 #[cfg(test)]
diff --git a/frame/support/src/storage/types/double_map.rs b/frame/support/src/storage/types/double_map.rs
index f0b5f66eff05..184d96b3a54f 100644
--- a/frame/support/src/storage/types/double_map.rs
+++ b/frame/support/src/storage/types/double_map.rs
@@ -22,9 +22,10 @@ use codec::{FullCodec, Decode, EncodeLike, Encode};
 use crate::{
 	storage::{
 		StorageAppend, StorageDecodeLength,
+		bounded_vec::{BoundedVec, BoundedVecValue},
 		types::{OptionQuery, QueryKindTrait, OnEmptyGetter},
 	},
-	traits::{GetDefault, StorageInstance},
+	traits::{GetDefault, StorageInstance, Get},
 };
 use frame_metadata::{DefaultByteGetter, StorageEntryModifier};
 use sp_std::vec::Vec;
@@ -102,6 +103,50 @@ where
 	}
 }
 
+impl<Prefix, Hasher1, Key1, Hasher2, Key2, QueryKind, OnEmpty, VecValue, VecBound>
+	StorageDoubleMap<
+		Prefix,
+		Hasher1,
+		Key1,
+		Hasher2,
+		Key2,
+		BoundedVec<VecValue, VecBound>,
+		QueryKind,
+		OnEmpty,
+	> where
+	Prefix: StorageInstance,
+	Hasher1: crate::hash::StorageHasher,
+	Hasher2: crate::hash::StorageHasher,
+	Key1: FullCodec,
+	Key2: FullCodec,
+	QueryKind: QueryKindTrait<BoundedVec<VecValue, VecBound>, OnEmpty>,
+	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
+	VecValue: BoundedVecValue,
+	VecBound: Get<u32>,
+{
+	/// Try and append the given item to the double map in the storage.
+	///
+	/// Is only available if `Value` of the map is [`BoundedVec`].
+	pub fn try_append<EncodeLikeItem, EncodeLikeKey1, EncodeLikeKey2>(
+		key1: EncodeLikeKey1,
+		key2: EncodeLikeKey2,
+		item: EncodeLikeItem,
+	) -> Result<(), ()>
+	where
+		EncodeLikeKey1: EncodeLike<Key1> + Clone,
+		EncodeLikeKey2: EncodeLike<Key2> + Clone,
+		EncodeLikeItem: EncodeLike<VecValue>,
+	{
+		<
+			Self
+			as
+			crate::storage::bounded_vec::TryAppendDoubleMap<Key1, Key2, VecValue, VecBound>
+		>::try_append(
+			key1, key2, item,
+		)
+	}
+}
+
 impl<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty>
 	StorageDoubleMap<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty>
 where
diff --git a/frame/support/src/storage/types/map.rs b/frame/support/src/storage/types/map.rs
index 4af28a77cf2b..187323b4ad1e 100644
--- a/frame/support/src/storage/types/map.rs
+++ b/frame/support/src/storage/types/map.rs
@@ -22,9 +22,10 @@ use codec::{FullCodec, Decode, EncodeLike, Encode};
 use crate::{
 	storage::{
 		StorageAppend, StorageDecodeLength,
+		bounded_vec::{BoundedVec, BoundedVecValue},
 		types::{OptionQuery, QueryKindTrait, OnEmptyGetter},
 	},
-	traits::{GetDefault, StorageInstance},
+	traits::{GetDefault, StorageInstance, Get},
 };
 use frame_metadata::{DefaultByteGetter, StorageEntryModifier};
 use sp_std::prelude::*;
@@ -91,6 +92,34 @@ where
 	}
 }
 
+impl<Prefix, Hasher, Key, QueryKind, OnEmpty, VecValue, VecBound>
+	StorageMap<Prefix, Hasher, Key, BoundedVec<VecValue, VecBound>, QueryKind, OnEmpty>
+where
+	Prefix: StorageInstance,
+	Hasher: crate::hash::StorageHasher,
+	Key: FullCodec,
+	QueryKind: QueryKindTrait<BoundedVec<VecValue, VecBound>, OnEmpty>,
+	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
+	VecValue: BoundedVecValue,
+	VecBound: Get<u32>,
+{
+	/// Try and append the given item to the map in the storage.
+	///
+	/// Is only available if `Value` of the map is [`BoundedVec`].
+	pub fn try_append<EncodeLikeItem, EncodeLikeKey>(
+		key: EncodeLikeKey,
+		item: EncodeLikeItem,
+	) -> Result<(), ()>
+	where
+		EncodeLikeKey: EncodeLike<Key> + Clone,
+		EncodeLikeItem: EncodeLike<VecValue>,
+	{
+		<Self as crate::storage::bounded_vec::TryAppendMap<Key, VecValue, VecBound>>::try_append(
+			key, item,
+		)
+	}
+}
+
 impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty>
 	StorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty>
 where
diff --git a/frame/support/src/storage/types/value.rs b/frame/support/src/storage/types/value.rs
index 39f718956eb6..d536d76d76b8 100644
--- a/frame/support/src/storage/types/value.rs
+++ b/frame/support/src/storage/types/value.rs
@@ -21,9 +21,10 @@ use codec::{FullCodec, Decode, EncodeLike, Encode};
 use crate::{
 	storage::{
 		StorageAppend, StorageDecodeLength,
+		bounded_vec::{BoundedVec, BoundedVecValue},
 		types::{OptionQuery, QueryKindTrait, OnEmptyGetter},
 	},
-	traits::{GetDefault, StorageInstance},
+	traits::{GetDefault, StorageInstance, Get},
 };
 use frame_metadata::{DefaultByteGetter, StorageEntryModifier};
 
@@ -60,6 +61,26 @@ where
 	}
 }
 
+impl<Prefix, QueryKind, OnEmpty, VecValue, VecBound>
+	StorageValue<Prefix, BoundedVec<VecValue, VecBound>, QueryKind, OnEmpty>
+where
+	Prefix: StorageInstance,
+	QueryKind: QueryKindTrait<BoundedVec<VecValue, VecBound>, OnEmpty>,
+	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
+	VecValue: BoundedVecValue,
+	VecBound: Get<u32>,
+{
+	/// Try and append the given item to the value in the storage.
+	///
+	/// Is only available if `Value` of the storage is [`BoundedVec`].
+	pub fn try_append<EncodeLikeItem>(item: EncodeLikeItem) -> Result<(), ()>
+	where
+		EncodeLikeItem: EncodeLike<VecValue>,
+	{
+		<Self as crate::storage::bounded_vec::TryAppendValue<VecValue, VecBound>>::try_append(item)
+	}
+}
+
 impl<Prefix, Value, QueryKind, OnEmpty> StorageValue<Prefix, Value, QueryKind, OnEmpty>
 where
 	Prefix: StorageInstance,

From 0ce623a5530aa029ac287cec121ccde327103490 Mon Sep 17 00:00:00 2001
From: Daniel Olano <daniel@olanod.com>
Date: Fri, 16 Apr 2021 10:51:26 +0200
Subject: [PATCH 0652/1194] Make pallet Assets instantiable (#8483)

* Make pallet Assets instantiable

* use instantiable benchmarks

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 frame/assets/src/benchmarking.rs    | 176 +++++++++----------
 frame/assets/src/extra_mutator.rs   |  37 ++--
 frame/assets/src/functions.rs       |  97 ++++++-----
 frame/assets/src/impl_fungibles.rs  |  35 ++--
 frame/assets/src/impl_stored_map.rs |  10 +-
 frame/assets/src/lib.rs             | 257 +++++++++++++++-------------
 frame/assets/src/types.rs           |   5 +-
 7 files changed, 332 insertions(+), 285 deletions(-)

diff --git a/frame/assets/src/benchmarking.rs b/frame/assets/src/benchmarking.rs
index 227d45623d68..0d80ec5923d2 100644
--- a/frame/assets/src/benchmarking.rs
+++ b/frame/assets/src/benchmarking.rs
@@ -24,7 +24,7 @@ use super::*;
 use sp_runtime::traits::Bounded;
 use frame_system::RawOrigin as SystemOrigin;
 use frame_benchmarking::{
-	benchmarks, account, whitelisted_caller, whitelist_account, impl_benchmark_test_suite
+	benchmarks_instance_pallet, account, whitelisted_caller, whitelist_account, impl_benchmark_test_suite
 };
 use frame_support::traits::Get;
 use frame_support::{traits::EnsureOrigin, dispatch::UnfilteredDispatchable};
@@ -33,13 +33,13 @@ use crate::Pallet as Assets;
 
 const SEED: u32 = 0;
 
-fn create_default_asset<T: Config>(is_sufficient: bool)
+fn create_default_asset<T: Config<I>, I: 'static>(is_sufficient: bool)
 	-> (T::AccountId, <T::Lookup as StaticLookup>::Source)
 {
 	let caller: T::AccountId = whitelisted_caller();
 	let caller_lookup = T::Lookup::unlookup(caller.clone());
 	let root = SystemOrigin::Root.into();
-	assert!(Assets::<T>::force_create(
+	assert!(Assets::<T, I>::force_create(
 		root,
 		Default::default(),
 		caller_lookup.clone(),
@@ -49,14 +49,14 @@ fn create_default_asset<T: Config>(is_sufficient: bool)
 	(caller, caller_lookup)
 }
 
-fn create_default_minted_asset<T: Config>(is_sufficient: bool, amount: T::Balance)
+fn create_default_minted_asset<T: Config<I>, I: 'static>(is_sufficient: bool, amount: T::Balance)
 	-> (T::AccountId, <T::Lookup as StaticLookup>::Source)
 {
-	let (caller, caller_lookup)  = create_default_asset::<T>(is_sufficient);
+	let (caller, caller_lookup)  = create_default_asset::<T, I>(is_sufficient);
 	if !is_sufficient {
 		T::Currency::make_free_balance_be(&caller, T::Currency::minimum_balance());
 	}
-	assert!(Assets::<T>::mint(
+	assert!(Assets::<T, I>::mint(
 		SystemOrigin::Signed(caller.clone()).into(),
 		Default::default(),
 		caller_lookup.clone(),
@@ -65,42 +65,42 @@ fn create_default_minted_asset<T: Config>(is_sufficient: bool, amount: T::Balanc
 	(caller, caller_lookup)
 }
 
-fn swap_is_sufficient<T: Config>(s: &mut bool) {
-	Asset::<T>::mutate(&T::AssetId::default(), |maybe_a|
+fn swap_is_sufficient<T: Config<I>, I: 'static>(s: &mut bool) {
+	Asset::<T, I>::mutate(&T::AssetId::default(), |maybe_a|
 		if let Some(ref mut a) = maybe_a { sp_std::mem::swap(s, &mut a.is_sufficient) }
 	);
 }
 
-fn add_consumers<T: Config>(minter: T::AccountId, n: u32) {
+fn add_consumers<T: Config<I>, I: 'static>(minter: T::AccountId, n: u32) {
 	let origin = SystemOrigin::Signed(minter);
 	let mut s = false;
-	swap_is_sufficient::<T>(&mut s);
+	swap_is_sufficient::<T, I>(&mut s);
 	for i in 0..n {
 		let target = account("consumer", i, SEED);
 		T::Currency::make_free_balance_be(&target, T::Currency::minimum_balance());
 		let target_lookup = T::Lookup::unlookup(target);
-		assert!(Assets::<T>::mint(origin.clone().into(), Default::default(), target_lookup, 100u32.into()).is_ok());
+		assert!(Assets::<T, I>::mint(origin.clone().into(), Default::default(), target_lookup, 100u32.into()).is_ok());
 	}
-	swap_is_sufficient::<T>(&mut s);
+	swap_is_sufficient::<T, I>(&mut s);
 }
 
-fn add_sufficients<T: Config>(minter: T::AccountId, n: u32) {
+fn add_sufficients<T: Config<I>, I: 'static>(minter: T::AccountId, n: u32) {
 	let origin = SystemOrigin::Signed(minter);
 	let mut s = true;
-	swap_is_sufficient::<T>(&mut s);
+	swap_is_sufficient::<T, I>(&mut s);
 	for i in 0..n {
 		let target = account("sufficient", i, SEED);
 		let target_lookup = T::Lookup::unlookup(target);
-		assert!(Assets::<T>::mint(origin.clone().into(), Default::default(), target_lookup, 100u32.into()).is_ok());
+		assert!(Assets::<T, I>::mint(origin.clone().into(), Default::default(), target_lookup, 100u32.into()).is_ok());
 	}
-	swap_is_sufficient::<T>(&mut s);
+	swap_is_sufficient::<T, I>(&mut s);
 }
 
-fn add_approvals<T: Config>(minter: T::AccountId, n: u32) {
+fn add_approvals<T: Config<I>, I: 'static>(minter: T::AccountId, n: u32) {
 	T::Currency::deposit_creating(&minter, T::ApprovalDeposit::get() * n.into());
 	let minter_lookup = T::Lookup::unlookup(minter.clone());
 	let origin = SystemOrigin::Signed(minter);
-	Assets::<T>::mint(
+	Assets::<T, I>::mint(
 		origin.clone().into(),
 		Default::default(),
 		minter_lookup,
@@ -110,7 +110,7 @@ fn add_approvals<T: Config>(minter: T::AccountId, n: u32) {
 		let target = account("approval", i, SEED);
 		T::Currency::make_free_balance_be(&target, T::Currency::minimum_balance());
 		let target_lookup = T::Lookup::unlookup(target);
-		Assets::<T>::approve_transfer(
+		Assets::<T, I>::approve_transfer(
 			origin.clone().into(),
 			Default::default(),
 			target_lookup,
@@ -119,7 +119,7 @@ fn add_approvals<T: Config>(minter: T::AccountId, n: u32) {
 	}
 }
 
-fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
+fn assert_last_event<T: Config<I>, I: 'static>(generic_event: <T as Config<I>>::Event) {
 	let events = frame_system::Pallet::<T>::events();
 	let system_event: <T as frame_system::Config>::Event = generic_event.into();
 	// compare to the last event record
@@ -127,7 +127,7 @@ fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
 	assert_eq!(event, &system_event);
 }
 
-fn assert_event<T: Config>(generic_event: <T as Config>::Event) {
+fn assert_event<T: Config<I>, I: 'static>(generic_event: <T as Config<I>>::Event) {
 	let system_event: <T as frame_system::Config>::Event = generic_event.into();
 	let events = frame_system::Pallet::<T>::events();
 	assert!(events.iter().any(|event_record| {
@@ -135,14 +135,14 @@ fn assert_event<T: Config>(generic_event: <T as Config>::Event) {
 	}));
 }
 
-benchmarks! {
+benchmarks_instance_pallet! {
 	create {
 		let caller: T::AccountId = whitelisted_caller();
 		let caller_lookup = T::Lookup::unlookup(caller.clone());
-		T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T>::max_value());
+		T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T, I>::max_value());
 	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, 1u32.into())
 	verify {
-		assert_last_event::<T>(Event::Created(Default::default(), caller.clone(), caller).into());
+		assert_last_event::<T, I>(Event::Created(Default::default(), caller.clone(), caller).into());
 	}
 
 	force_create {
@@ -150,127 +150,127 @@ benchmarks! {
 		let caller_lookup = T::Lookup::unlookup(caller.clone());
 	}: _(SystemOrigin::Root, Default::default(), caller_lookup, true, 1u32.into())
 	verify {
-		assert_last_event::<T>(Event::ForceCreated(Default::default(), caller).into());
+		assert_last_event::<T, I>(Event::ForceCreated(Default::default(), caller).into());
 	}
 
 	destroy {
 		let c in 0 .. 5_000;
 		let s in 0 .. 5_000;
 		let a in 0 .. 5_00;
-		let (caller, _) = create_default_asset::<T>(true);
-		add_consumers::<T>(caller.clone(), c);
-		add_sufficients::<T>(caller.clone(), s);
-		add_approvals::<T>(caller.clone(), a);
-		let witness = Asset::<T>::get(T::AssetId::default()).unwrap().destroy_witness();
+		let (caller, _) = create_default_asset::<T, I>(true);
+		add_consumers::<T, I>(caller.clone(), c);
+		add_sufficients::<T, I>(caller.clone(), s);
+		add_approvals::<T, I>(caller.clone(), a);
+		let witness = Asset::<T, I>::get(T::AssetId::default()).unwrap().destroy_witness();
 	}: _(SystemOrigin::Signed(caller), Default::default(), witness)
 	verify {
-		assert_last_event::<T>(Event::Destroyed(Default::default()).into());
+		assert_last_event::<T, I>(Event::Destroyed(Default::default()).into());
 	}
 
 	mint {
-		let (caller, caller_lookup) = create_default_asset::<T>(true);
+		let (caller, caller_lookup) = create_default_asset::<T, I>(true);
 		let amount = T::Balance::from(100u32);
 	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, amount)
 	verify {
-		assert_last_event::<T>(Event::Issued(Default::default(), caller, amount).into());
+		assert_last_event::<T, I>(Event::Issued(Default::default(), caller, amount).into());
 	}
 
 	burn {
 		let amount = T::Balance::from(100u32);
-		let (caller, caller_lookup) = create_default_minted_asset::<T>(true, amount);
+		let (caller, caller_lookup) = create_default_minted_asset::<T, I>(true, amount);
 	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, amount)
 	verify {
-		assert_last_event::<T>(Event::Burned(Default::default(), caller, amount).into());
+		assert_last_event::<T, I>(Event::Burned(Default::default(), caller, amount).into());
 	}
 
 	transfer {
 		let amount = T::Balance::from(100u32);
-		let (caller, caller_lookup) = create_default_minted_asset::<T>(true, amount);
+		let (caller, caller_lookup) = create_default_minted_asset::<T, I>(true, amount);
 		let target: T::AccountId = account("target", 0, SEED);
 		let target_lookup = T::Lookup::unlookup(target.clone());
 	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), target_lookup, amount)
 	verify {
-		assert_last_event::<T>(Event::Transferred(Default::default(), caller, target, amount).into());
+		assert_last_event::<T, I>(Event::Transferred(Default::default(), caller, target, amount).into());
 	}
 
 	transfer_keep_alive {
 		let mint_amount = T::Balance::from(200u32);
 		let amount = T::Balance::from(100u32);
-		let (caller, caller_lookup) = create_default_minted_asset::<T>(true, mint_amount);
+		let (caller, caller_lookup) = create_default_minted_asset::<T, I>(true, mint_amount);
 		let target: T::AccountId = account("target", 0, SEED);
 		let target_lookup = T::Lookup::unlookup(target.clone());
 	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), target_lookup, amount)
 	verify {
 		assert!(frame_system::Pallet::<T>::account_exists(&caller));
-		assert_last_event::<T>(Event::Transferred(Default::default(), caller, target, amount).into());
+		assert_last_event::<T, I>(Event::Transferred(Default::default(), caller, target, amount).into());
 	}
 
 	force_transfer {
 		let amount = T::Balance::from(100u32);
-		let (caller, caller_lookup) = create_default_minted_asset::<T>(true, amount);
+		let (caller, caller_lookup) = create_default_minted_asset::<T, I>(true, amount);
 		let target: T::AccountId = account("target", 0, SEED);
 		let target_lookup = T::Lookup::unlookup(target.clone());
 	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, target_lookup, amount)
 	verify {
-		assert_last_event::<T>(
+		assert_last_event::<T, I>(
 			Event::Transferred(Default::default(), caller, target, amount).into()
 		);
 	}
 
 	freeze {
-		let (caller, caller_lookup) = create_default_minted_asset::<T>(true, 100u32.into());
+		let (caller, caller_lookup) = create_default_minted_asset::<T, I>(true, 100u32.into());
 	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup)
 	verify {
-		assert_last_event::<T>(Event::Frozen(Default::default(), caller).into());
+		assert_last_event::<T, I>(Event::Frozen(Default::default(), caller).into());
 	}
 
 	thaw {
-		let (caller, caller_lookup) = create_default_minted_asset::<T>(true, 100u32.into());
-		Assets::<T>::freeze(
+		let (caller, caller_lookup) = create_default_minted_asset::<T, I>(true, 100u32.into());
+		Assets::<T, I>::freeze(
 			SystemOrigin::Signed(caller.clone()).into(),
 			Default::default(),
 			caller_lookup.clone(),
 		)?;
 	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup)
 	verify {
-		assert_last_event::<T>(Event::Thawed(Default::default(), caller).into());
+		assert_last_event::<T, I>(Event::Thawed(Default::default(), caller).into());
 	}
 
 	freeze_asset {
-		let (caller, caller_lookup) = create_default_minted_asset::<T>(true, 100u32.into());
+		let (caller, caller_lookup) = create_default_minted_asset::<T, I>(true, 100u32.into());
 	}: _(SystemOrigin::Signed(caller.clone()), Default::default())
 	verify {
-		assert_last_event::<T>(Event::AssetFrozen(Default::default()).into());
+		assert_last_event::<T, I>(Event::AssetFrozen(Default::default()).into());
 	}
 
 	thaw_asset {
-		let (caller, caller_lookup) = create_default_minted_asset::<T>(true, 100u32.into());
-		Assets::<T>::freeze_asset(
+		let (caller, caller_lookup) = create_default_minted_asset::<T, I>(true, 100u32.into());
+		Assets::<T, I>::freeze_asset(
 			SystemOrigin::Signed(caller.clone()).into(),
 			Default::default(),
 		)?;
 	}: _(SystemOrigin::Signed(caller.clone()), Default::default())
 	verify {
-		assert_last_event::<T>(Event::AssetThawed(Default::default()).into());
+		assert_last_event::<T, I>(Event::AssetThawed(Default::default()).into());
 	}
 
 	transfer_ownership {
-		let (caller, _) = create_default_asset::<T>(true);
+		let (caller, _) = create_default_asset::<T, I>(true);
 		let target: T::AccountId = account("target", 0, SEED);
 		let target_lookup = T::Lookup::unlookup(target.clone());
 	}: _(SystemOrigin::Signed(caller), Default::default(), target_lookup)
 	verify {
-		assert_last_event::<T>(Event::OwnerChanged(Default::default(), target).into());
+		assert_last_event::<T, I>(Event::OwnerChanged(Default::default(), target).into());
 	}
 
 	set_team {
-		let (caller, _) = create_default_asset::<T>(true);
+		let (caller, _) = create_default_asset::<T, I>(true);
 		let target0 = T::Lookup::unlookup(account("target", 0, SEED));
 		let target1 = T::Lookup::unlookup(account("target", 1, SEED));
 		let target2 = T::Lookup::unlookup(account("target", 2, SEED));
 	}: _(SystemOrigin::Signed(caller), Default::default(), target0.clone(), target1.clone(), target2.clone())
 	verify {
-		assert_last_event::<T>(Event::TeamChanged(
+		assert_last_event::<T, I>(Event::TeamChanged(
 			Default::default(),
 			account("target", 0, SEED),
 			account("target", 1, SEED),
@@ -286,23 +286,23 @@ benchmarks! {
 		let symbol = vec![0u8; s as usize];
 		let decimals = 12;
 
-		let (caller, _) = create_default_asset::<T>(true);
-		T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T>::max_value());
+		let (caller, _) = create_default_asset::<T, I>(true);
+		T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T, I>::max_value());
 	}: _(SystemOrigin::Signed(caller), Default::default(), name.clone(), symbol.clone(), decimals)
 	verify {
 		let id = Default::default();
-		assert_last_event::<T>(Event::MetadataSet(id, name, symbol, decimals, false).into());
+		assert_last_event::<T, I>(Event::MetadataSet(id, name, symbol, decimals, false).into());
 	}
 
 	clear_metadata {
-		let (caller, _) = create_default_asset::<T>(true);
-		T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T>::max_value());
+		let (caller, _) = create_default_asset::<T, I>(true);
+		T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T, I>::max_value());
 		let dummy = vec![0u8; T::StringLimit::get() as usize];
 		let origin = SystemOrigin::Signed(caller.clone()).into();
-		Assets::<T>::set_metadata(origin, Default::default(), dummy.clone(), dummy, 12)?;
+		Assets::<T, I>::set_metadata(origin, Default::default(), dummy.clone(), dummy, 12)?;
 	}: _(SystemOrigin::Signed(caller), Default::default())
 	verify {
-		assert_last_event::<T>(Event::MetadataCleared(Default::default()).into());
+		assert_last_event::<T, I>(Event::MetadataCleared(Default::default()).into());
 	}
 
 	force_set_metadata {
@@ -313,10 +313,10 @@ benchmarks! {
 		let symbol = vec![0u8; s as usize];
 		let decimals = 12;
 
-		create_default_asset::<T>(true);
+		create_default_asset::<T, I>(true);
 
 		let origin = T::ForceOrigin::successful_origin();
-		let call = Call::<T>::force_set_metadata(
+		let call = Call::<T, I>::force_set_metadata(
 			Default::default(),
 			name.clone(),
 			symbol.clone(),
@@ -326,28 +326,28 @@ benchmarks! {
 	}: { call.dispatch_bypass_filter(origin)? }
 	verify {
 		let id = Default::default();
-		assert_last_event::<T>(Event::MetadataSet(id, name, symbol, decimals, false).into());
+		assert_last_event::<T, I>(Event::MetadataSet(id, name, symbol, decimals, false).into());
 	}
 
 	force_clear_metadata {
-		let (caller, _) = create_default_asset::<T>(true);
-		T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T>::max_value());
+		let (caller, _) = create_default_asset::<T, I>(true);
+		T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T, I>::max_value());
 		let dummy = vec![0u8; T::StringLimit::get() as usize];
 		let origin = SystemOrigin::Signed(caller.clone()).into();
-		Assets::<T>::set_metadata(origin, Default::default(), dummy.clone(), dummy, 12)?;
+		Assets::<T, I>::set_metadata(origin, Default::default(), dummy.clone(), dummy, 12)?;
 
 		let origin = T::ForceOrigin::successful_origin();
-		let call = Call::<T>::force_clear_metadata(Default::default());
+		let call = Call::<T, I>::force_clear_metadata(Default::default());
 	}: { call.dispatch_bypass_filter(origin)? }
 	verify {
-		assert_last_event::<T>(Event::MetadataCleared(Default::default()).into());
+		assert_last_event::<T, I>(Event::MetadataCleared(Default::default()).into());
 	}
 
 	force_asset_status {
-		let (caller, caller_lookup) = create_default_asset::<T>(true);
+		let (caller, caller_lookup) = create_default_asset::<T, I>(true);
 
 		let origin = T::ForceOrigin::successful_origin();
-		let call = Call::<T>::force_asset_status(
+		let call = Call::<T, I>::force_asset_status(
 			Default::default(),
 			caller_lookup.clone(),
 			caller_lookup.clone(),
@@ -359,12 +359,12 @@ benchmarks! {
 		);
 	}: { call.dispatch_bypass_filter(origin)? }
 	verify {
-		assert_last_event::<T>(Event::AssetStatusChanged(Default::default()).into());
+		assert_last_event::<T, I>(Event::AssetStatusChanged(Default::default()).into());
 	}
 
 	approve_transfer {
-		let (caller, _) = create_default_minted_asset::<T>(true, 100u32.into());
-		T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T>::max_value());
+		let (caller, _) = create_default_minted_asset::<T, I>(true, 100u32.into());
+		T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T, I>::max_value());
 
 		let id = Default::default();
 		let delegate: T::AccountId = account("delegate", 0, SEED);
@@ -372,12 +372,12 @@ benchmarks! {
 		let amount = 100u32.into();
 	}: _(SystemOrigin::Signed(caller.clone()), id, delegate_lookup, amount)
 	verify {
-		assert_last_event::<T>(Event::ApprovedTransfer(id, caller, delegate, amount).into());
+		assert_last_event::<T, I>(Event::ApprovedTransfer(id, caller, delegate, amount).into());
 	}
 
 	transfer_approved {
-		let (owner, owner_lookup) = create_default_minted_asset::<T>(true, 100u32.into());
-		T::Currency::make_free_balance_be(&owner, DepositBalanceOf::<T>::max_value());
+		let (owner, owner_lookup) = create_default_minted_asset::<T, I>(true, 100u32.into());
+		T::Currency::make_free_balance_be(&owner, DepositBalanceOf::<T, I>::max_value());
 
 		let id = Default::default();
 		let delegate: T::AccountId = account("delegate", 0, SEED);
@@ -385,44 +385,44 @@ benchmarks! {
 		let delegate_lookup = T::Lookup::unlookup(delegate.clone());
 		let amount = 100u32.into();
 		let origin = SystemOrigin::Signed(owner.clone()).into();
-		Assets::<T>::approve_transfer(origin, id, delegate_lookup.clone(), amount)?;
+		Assets::<T, I>::approve_transfer(origin, id, delegate_lookup.clone(), amount)?;
 
 		let dest: T::AccountId = account("dest", 0, SEED);
 		let dest_lookup = T::Lookup::unlookup(dest.clone());
 	}: _(SystemOrigin::Signed(delegate.clone()), id, owner_lookup, dest_lookup, amount)
 	verify {
 		assert!(T::Currency::reserved_balance(&owner).is_zero());
-		assert_event::<T>(Event::Transferred(id, owner, dest, amount).into());
+		assert_event::<T, I>(Event::Transferred(id, owner, dest, amount).into());
 	}
 
 	cancel_approval {
-		let (caller, _) = create_default_minted_asset::<T>(true, 100u32.into());
-		T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T>::max_value());
+		let (caller, _) = create_default_minted_asset::<T, I>(true, 100u32.into());
+		T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T, I>::max_value());
 
 		let id = Default::default();
 		let delegate: T::AccountId = account("delegate", 0, SEED);
 		let delegate_lookup = T::Lookup::unlookup(delegate.clone());
 		let amount = 100u32.into();
 		let origin = SystemOrigin::Signed(caller.clone()).into();
-		Assets::<T>::approve_transfer(origin, id, delegate_lookup.clone(), amount)?;
+		Assets::<T, I>::approve_transfer(origin, id, delegate_lookup.clone(), amount)?;
 	}: _(SystemOrigin::Signed(caller.clone()), id, delegate_lookup)
 	verify {
-		assert_last_event::<T>(Event::ApprovalCancelled(id, caller, delegate).into());
+		assert_last_event::<T, I>(Event::ApprovalCancelled(id, caller, delegate).into());
 	}
 
 	force_cancel_approval {
-		let (caller, caller_lookup) = create_default_minted_asset::<T>(true, 100u32.into());
-		T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T>::max_value());
+		let (caller, caller_lookup) = create_default_minted_asset::<T, I>(true, 100u32.into());
+		T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T, I>::max_value());
 
 		let id = Default::default();
 		let delegate: T::AccountId = account("delegate", 0, SEED);
 		let delegate_lookup = T::Lookup::unlookup(delegate.clone());
 		let amount = 100u32.into();
 		let origin = SystemOrigin::Signed(caller.clone()).into();
-		Assets::<T>::approve_transfer(origin, id, delegate_lookup.clone(), amount)?;
+		Assets::<T, I>::approve_transfer(origin, id, delegate_lookup.clone(), amount)?;
 	}: _(SystemOrigin::Signed(caller.clone()), id, caller_lookup, delegate_lookup)
 	verify {
-		assert_last_event::<T>(Event::ApprovalCancelled(id, caller, delegate).into());
+		assert_last_event::<T, I>(Event::ApprovalCancelled(id, caller, delegate).into());
 	}
 }
 
diff --git a/frame/assets/src/extra_mutator.rs b/frame/assets/src/extra_mutator.rs
index 26a9a3f357c5..d86d78ce3e37 100644
--- a/frame/assets/src/extra_mutator.rs
+++ b/frame/assets/src/extra_mutator.rs
@@ -25,20 +25,23 @@ use super::*;
 /// any uncommitted changes (see `commit` function) will be automatically committed to storage when
 /// dropped. Changes, even after committed, may be reverted to their original values with the
 /// `revert` function.
-pub struct ExtraMutator<T: Config> {
+pub struct ExtraMutator<T: Config<I>, I: 'static = ()> {
 	id: T::AssetId,
 	who: T::AccountId,
 	original: T::Extra,
 	pending: Option<T::Extra>,
 }
 
-impl<T: Config> Drop for ExtraMutator<T> {
+impl<T: Config<I>, I: 'static> Drop for ExtraMutator<T, I> {
 	fn drop(&mut self) {
-		debug_assert!(self.commit().is_ok(), "attempt to write to non-existent asset account");
+		debug_assert!(
+			self.commit().is_ok(),
+			"attempt to write to non-existent asset account"
+		);
 	}
 }
 
-impl<T: Config> sp_std::ops::Deref for ExtraMutator<T> {
+impl<T: Config<I>, I: 'static> sp_std::ops::Deref for ExtraMutator<T, I> {
 	type Target = T::Extra;
 	fn deref(&self) -> &T::Extra {
 		match self.pending {
@@ -48,7 +51,7 @@ impl<T: Config> sp_std::ops::Deref for ExtraMutator<T> {
 	}
 }
 
-impl<T: Config> sp_std::ops::DerefMut for ExtraMutator<T> {
+impl<T: Config<I>, I: 'static> sp_std::ops::DerefMut for ExtraMutator<T, I> {
 	fn deref_mut(&mut self) -> &mut T::Extra {
 		if self.pending.is_none() {
 			self.pending = Some(self.original.clone());
@@ -57,15 +60,16 @@ impl<T: Config> sp_std::ops::DerefMut for ExtraMutator<T> {
 	}
 }
 
-impl<T: Config> ExtraMutator<T> {
-	pub(super) fn maybe_new(id: T::AssetId, who: impl sp_std::borrow::Borrow<T::AccountId>)
-		-> Option<ExtraMutator<T>>
-	{
-		if Account::<T>::contains_key(id, who.borrow()) {
-			Some(ExtraMutator::<T> {
+impl<T: Config<I>, I: 'static> ExtraMutator<T, I> {
+	pub(super) fn maybe_new(
+		id: T::AssetId,
+		who: impl sp_std::borrow::Borrow<T::AccountId>,
+	) -> Option<ExtraMutator<T, I>> {
+		if Account::<T, I>::contains_key(id, who.borrow()) {
+			Some(ExtraMutator::<T, I> {
 				id,
 				who: who.borrow().clone(),
-				original: Account::<T>::get(id, who.borrow()).extra,
+				original: Account::<T, I>::get(id, who.borrow()).extra,
 				pending: None,
 			})
 		} else {
@@ -73,18 +77,17 @@ impl<T: Config> ExtraMutator<T> {
 		}
 	}
 
-
 	/// Commit any changes to storage.
 	pub fn commit(&mut self) -> Result<(), ()> {
 		if let Some(extra) = self.pending.take() {
-			Account::<T>::try_mutate_exists(self.id, self.who.borrow(), |maybe_account|
+			Account::<T, I>::try_mutate_exists(self.id, self.who.borrow(), |maybe_account| {
 				if let Some(ref mut account) = maybe_account {
 					account.extra = extra;
 					Ok(())
 				} else {
 					Err(())
 				}
-			)
+			})
 		} else {
 			Ok(())
 		}
@@ -93,13 +96,13 @@ impl<T: Config> ExtraMutator<T> {
 	/// Revert any changes, even those already committed by `self` and drop self.
 	pub fn revert(mut self) -> Result<(), ()> {
 		self.pending = None;
-		Account::<T>::try_mutate_exists(self.id, self.who.borrow(), |maybe_account|
+		Account::<T, I>::try_mutate_exists(self.id, self.who.borrow(), |maybe_account| {
 			if let Some(ref mut account) = maybe_account {
 				account.extra = self.original.clone();
 				Ok(())
 			} else {
 				Err(())
 			}
-		)
+		})
 	}
 }
diff --git a/frame/assets/src/functions.rs b/frame/assets/src/functions.rs
index 197b010b6eb8..3f2abe0617e1 100644
--- a/frame/assets/src/functions.rs
+++ b/frame/assets/src/functions.rs
@@ -20,37 +20,40 @@
 use super::*;
 
 // The main implementation block for the module.
-impl<T: Config> Pallet<T> {
+impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	// Public immutables
 
 	/// Return the extra "sid-car" data for `id`/`who`, or `None` if the account doesn't exist.
-	pub fn adjust_extra(id: T::AssetId, who: impl sp_std::borrow::Borrow<T::AccountId>)
-		-> Option<ExtraMutator<T>>
-	{
+	pub fn adjust_extra(
+		id: T::AssetId,
+		who: impl sp_std::borrow::Borrow<T::AccountId>,
+	) -> Option<ExtraMutator<T, I>> {
 		ExtraMutator::maybe_new(id, who)
 	}
 
 	/// Get the asset `id` balance of `who`.
 	pub fn balance(id: T::AssetId, who: impl sp_std::borrow::Borrow<T::AccountId>) -> T::Balance {
-		Account::<T>::get(id, who.borrow()).balance
+		Account::<T, I>::get(id, who.borrow()).balance
 	}
 
 	/// Get the total supply of an asset `id`.
 	pub fn total_supply(id: T::AssetId) -> T::Balance {
-		Asset::<T>::get(id).map(|x| x.supply).unwrap_or_else(Zero::zero)
+		Asset::<T, I>::get(id)
+			.map(|x| x.supply)
+			.unwrap_or_else(Zero::zero)
 	}
 
 	pub(super) fn new_account(
 		who: &T::AccountId,
-		d: &mut AssetDetails<T::Balance, T::AccountId, DepositBalanceOf<T>>,
+		d: &mut AssetDetails<T::Balance, T::AccountId, DepositBalanceOf<T, I>>,
 	) -> Result<bool, DispatchError> {
-		let accounts = d.accounts.checked_add(1).ok_or(Error::<T>::Overflow)?;
+		let accounts = d.accounts.checked_add(1).ok_or(Error::<T, I>::Overflow)?;
 		let is_sufficient = if d.is_sufficient {
 			frame_system::Pallet::<T>::inc_sufficients(who);
 			d.sufficients += 1;
 			true
 		} else {
-			frame_system::Pallet::<T>::inc_consumers(who).map_err(|_| Error::<T>::NoProvider)?;
+			frame_system::Pallet::<T>::inc_consumers(who).map_err(|_| Error::<T, I>::NoProvider)?;
 			false
 		};
 		d.accounts = accounts;
@@ -60,7 +63,7 @@ impl<T: Config> Pallet<T> {
 	pub(super) fn dead_account(
 		what: T::AssetId,
 		who: &T::AccountId,
-		d: &mut AssetDetails<T::Balance, T::AccountId, DepositBalanceOf<T>>,
+		d: &mut AssetDetails<T::Balance, T::AccountId, DepositBalanceOf<T, I>>,
 		sufficient: bool,
 	) {
 		if sufficient {
@@ -73,15 +76,19 @@ impl<T: Config> Pallet<T> {
 		T::Freezer::died(what, who)
 	}
 
-	pub(super) fn can_increase(id: T::AssetId, who: &T::AccountId, amount: T::Balance) -> DepositConsequence {
-		let details = match Asset::<T>::get(id) {
+	pub(super) fn can_increase(
+		id: T::AssetId,
+		who: &T::AccountId,
+		amount: T::Balance,
+	) -> DepositConsequence {
+		let details = match Asset::<T, I>::get(id) {
 			Some(details) => details,
 			None => return DepositConsequence::UnknownAsset,
 		};
 		if details.supply.checked_add(&amount).is_none() {
 			return DepositConsequence::Overflow
 		}
-		let account = Account::<T>::get(id, who);
+		let account = Account::<T, I>::get(id, who);
 		if account.balance.checked_add(&amount).is_none() {
 			return DepositConsequence::Overflow
 		}
@@ -108,7 +115,7 @@ impl<T: Config> Pallet<T> {
 		keep_alive: bool,
 	) -> WithdrawConsequence<T::Balance> {
 		use WithdrawConsequence::*;
-		let details = match Asset::<T>::get(id) {
+		let details = match Asset::<T, I>::get(id) {
 			Some(details) => details,
 			None => return UnknownAsset,
 		};
@@ -118,7 +125,7 @@ impl<T: Config> Pallet<T> {
 		if details.is_frozen {
 			return Frozen
 		}
-		let account = Account::<T>::get(id, who);
+		let account = Account::<T, I>::get(id, who);
 		if account.is_frozen {
 			return Frozen
 		}
@@ -155,19 +162,21 @@ impl<T: Config> Pallet<T> {
 		id: T::AssetId,
 		who: &T::AccountId,
 		keep_alive: bool,
-	) -> Result<T::Balance, Error<T>> {
-		let details = match Asset::<T>::get(id) {
+	) -> Result<T::Balance, Error<T, I>> {
+		let details = match Asset::<T, I>::get(id) {
 			Some(details) => details,
-			None => return Err(Error::<T>::Unknown),
+			None => return Err(Error::<T, I>::Unknown),
 		};
-		ensure!(!details.is_frozen, Error::<T>::Frozen);
+		ensure!(!details.is_frozen, Error::<T, I>::Frozen);
 
-		let account = Account::<T>::get(id, who);
-		ensure!(!account.is_frozen, Error::<T>::Frozen);
+		let account = Account::<T, I>::get(id, who);
+		ensure!(!account.is_frozen, Error::<T, I>::Frozen);
 
 		let amount = if let Some(frozen) = T::Freezer::frozen_balance(id, who) {
 			// Frozen balance: account CANNOT be deleted
-			let required = frozen.checked_add(&details.min_balance).ok_or(Error::<T>::Overflow)?;
+			let required = frozen
+				.checked_add(&details.min_balance)
+				.ok_or(Error::<T, I>::Overflow)?;
 			account.balance.saturating_sub(required)
 		} else {
 			let is_provider = false;
@@ -204,9 +213,8 @@ impl<T: Config> Pallet<T> {
 		amount: T::Balance,
 		f: DebitFlags,
 	) -> Result<T::Balance, DispatchError> {
-		let actual = Self::reducible_balance(id, target, f.keep_alive)?
-			.min(amount);
-		ensure!(f.best_effort || actual >= amount, Error::<T>::BalanceLow);
+		let actual = Self::reducible_balance(id, target, f.keep_alive)?.min(amount);
+		ensure!(f.best_effort || actual >= amount, Error::<T, I>::BalanceLow);
 
 		let conseq = Self::can_decrease(id, target, actual, f.keep_alive);
 		let actual = match conseq.into_result() {
@@ -263,7 +271,10 @@ impl<T: Config> Pallet<T> {
 	) -> DispatchResult {
 		Self::increase_balance(id, beneficiary, amount, |details| -> DispatchResult {
 			if let Some(check_issuer) = maybe_check_issuer {
-				ensure!(&check_issuer == &details.issuer, Error::<T>::NoPermission);
+				ensure!(
+					&check_issuer == &details.issuer,
+					Error::<T, I>::NoPermission
+				);
 			}
 			debug_assert!(T::Balance::max_value() - details.supply >= amount, "checked in prep; qed");
 			details.supply = details.supply.saturating_add(amount);
@@ -283,17 +294,19 @@ impl<T: Config> Pallet<T> {
 		id: T::AssetId,
 		beneficiary: &T::AccountId,
 		amount: T::Balance,
-		check: impl FnOnce(&mut AssetDetails<T::Balance, T::AccountId, DepositBalanceOf<T>>) -> DispatchResult,
+		check: impl FnOnce(
+			&mut AssetDetails<T::Balance, T::AccountId, DepositBalanceOf<T, I>>,
+		) -> DispatchResult,
 	) -> DispatchResult {
 		if amount.is_zero() { return Ok(()) }
 
 		Self::can_increase(id, beneficiary, amount).into_result()?;
-		Asset::<T>::try_mutate(id, |maybe_details| -> DispatchResult {
-			let details = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
+		Asset::<T, I>::try_mutate(id, |maybe_details| -> DispatchResult {
+			let details = maybe_details.as_mut().ok_or(Error::<T, I>::Unknown)?;
 
 			check(details)?;
 
-			Account::<T>::try_mutate(id, beneficiary, |t| -> DispatchResult {
+			Account::<T, I>::try_mutate(id, beneficiary, |t| -> DispatchResult {
 				let new_balance = t.balance.saturating_add(amount);
 				ensure!(new_balance >= details.min_balance, TokenError::BelowMinimum);
 				if t.balance.is_zero() {
@@ -324,7 +337,7 @@ impl<T: Config> Pallet<T> {
 		let actual = Self::decrease_balance(id, target, amount, f, |actual, details| {
 			// Check admin rights.
 			if let Some(check_admin) = maybe_check_admin {
-				ensure!(&check_admin == &details.admin, Error::<T>::NoPermission);
+				ensure!(&check_admin == &details.admin, Error::<T, I>::NoPermission);
 			}
 
 			debug_assert!(details.supply >= actual, "checked in prep; qed");
@@ -351,19 +364,19 @@ impl<T: Config> Pallet<T> {
 		f: DebitFlags,
 		check: impl FnOnce(
 			T::Balance,
-			&mut AssetDetails<T::Balance, T::AccountId, DepositBalanceOf<T>>,
+			&mut AssetDetails<T::Balance, T::AccountId, DepositBalanceOf<T, I>>,
 		) -> DispatchResult,
 	) -> Result<T::Balance, DispatchError> {
 		if amount.is_zero() { return Ok(amount) }
 
 		let actual = Self::prep_debit(id, target, amount, f)?;
 
-		Asset::<T>::try_mutate(id, |maybe_details| -> DispatchResult {
-			let details = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
+		Asset::<T, I>::try_mutate(id, |maybe_details| -> DispatchResult {
+			let details = maybe_details.as_mut().ok_or(Error::<T, I>::Unknown)?;
 
 			check(actual, details)?;
 
-			Account::<T>::try_mutate_exists(id, target, |maybe_account| -> DispatchResult {
+			Account::<T, I>::try_mutate_exists(id, target, |maybe_account| -> DispatchResult {
 				let mut account = maybe_account.take().unwrap_or_default();
 				debug_assert!(account.balance >= actual, "checked in prep; qed");
 
@@ -411,14 +424,14 @@ impl<T: Config> Pallet<T> {
 		let debit = Self::prep_debit(id, &source, amount, f.into())?;
 		let (credit, maybe_burn) = Self::prep_credit(id, &dest, amount, debit, f.burn_dust)?;
 
-		let mut source_account = Account::<T>::get(id, &source);
+		let mut source_account = Account::<T, I>::get(id, &source);
 
-		Asset::<T>::try_mutate(id, |maybe_details| -> DispatchResult {
-			let details = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
+		Asset::<T, I>::try_mutate(id, |maybe_details| -> DispatchResult {
+			let details = maybe_details.as_mut().ok_or(Error::<T, I>::Unknown)?;
 
 			// Check admin rights.
 			if let Some(need_admin) = maybe_need_admin {
-				ensure!(&need_admin == &details.admin, Error::<T>::NoPermission);
+				ensure!(&need_admin == &details.admin, Error::<T, I>::NoPermission);
 			}
 
 			// Skip if source == dest
@@ -437,7 +450,7 @@ impl<T: Config> Pallet<T> {
 			debug_assert!(source_account.balance >= debit, "checked in prep; qed");
 			source_account.balance = source_account.balance.saturating_sub(debit);
 
-			Account::<T>::try_mutate(id, &dest, |a| -> DispatchResult {
+			Account::<T, I>::try_mutate(id, &dest, |a| -> DispatchResult {
 				// Calculate new balance; this will not saturate since it's already checked in prep.
 				debug_assert!(a.balance.checked_add(&credit).is_some(), "checked in prep; qed");
 				let new_balance = a.balance.saturating_add(credit);
@@ -455,9 +468,9 @@ impl<T: Config> Pallet<T> {
 			if source_account.balance < details.min_balance {
 				debug_assert!(source_account.balance.is_zero(), "checked in prep; qed");
 				Self::dead_account(id, &source, details, source_account.sufficient);
-				Account::<T>::remove(id, &source);
+				Account::<T, I>::remove(id, &source);
 			} else {
-				Account::<T>::insert(id, &source, &source_account)
+				Account::<T, I>::insert(id, &source, &source_account)
 			}
 
 			Ok(())
diff --git a/frame/assets/src/impl_fungibles.rs b/frame/assets/src/impl_fungibles.rs
index a4cff9b7e9a6..d0ab13072a88 100644
--- a/frame/assets/src/impl_fungibles.rs
+++ b/frame/assets/src/impl_fungibles.rs
@@ -19,23 +19,24 @@
 
 use super::*;
 
-impl<T: Config> fungibles::Inspect<<T as SystemConfig>::AccountId> for Pallet<T> {
+impl<T: Config<I>, I: 'static> fungibles::Inspect<<T as SystemConfig>::AccountId> for Pallet<T, I> {
 	type AssetId = T::AssetId;
 	type Balance = T::Balance;
 
 	fn total_issuance(asset: Self::AssetId) -> Self::Balance {
-		Asset::<T>::get(asset).map(|x| x.supply).unwrap_or_else(Zero::zero)
+		Asset::<T, I>::get(asset)
+			.map(|x| x.supply)
+			.unwrap_or_else(Zero::zero)
 	}
 
 	fn minimum_balance(asset: Self::AssetId) -> Self::Balance {
-		Asset::<T>::get(asset).map(|x| x.min_balance).unwrap_or_else(Zero::zero)
+		Asset::<T, I>::get(asset)
+			.map(|x| x.min_balance)
+			.unwrap_or_else(Zero::zero)
 	}
 
-	fn balance(
-		asset: Self::AssetId,
-		who: &<T as SystemConfig>::AccountId,
-	) -> Self::Balance {
-		Pallet::<T>::balance(asset, who)
+	fn balance(asset: Self::AssetId, who: &<T as SystemConfig>::AccountId) -> Self::Balance {
+		Pallet::<T, I>::balance(asset, who)
 	}
 
 	fn reducible_balance(
@@ -43,7 +44,7 @@ impl<T: Config> fungibles::Inspect<<T as SystemConfig>::AccountId> for Pallet<T>
 		who: &<T as SystemConfig>::AccountId,
 		keep_alive: bool,
 	) -> Self::Balance {
-		Pallet::<T>::reducible_balance(asset, who, keep_alive).unwrap_or(Zero::zero())
+		Pallet::<T, I>::reducible_balance(asset, who, keep_alive).unwrap_or(Zero::zero())
 	}
 
 	fn can_deposit(
@@ -51,7 +52,7 @@ impl<T: Config> fungibles::Inspect<<T as SystemConfig>::AccountId> for Pallet<T>
 		who: &<T as SystemConfig>::AccountId,
 		amount: Self::Balance,
 	) -> DepositConsequence {
-		Pallet::<T>::can_increase(asset, who, amount)
+		Pallet::<T, I>::can_increase(asset, who, amount)
 	}
 
 	fn can_withdraw(
@@ -59,11 +60,11 @@ impl<T: Config> fungibles::Inspect<<T as SystemConfig>::AccountId> for Pallet<T>
 		who: &<T as SystemConfig>::AccountId,
 		amount: Self::Balance,
 	) -> WithdrawConsequence<Self::Balance> {
-		Pallet::<T>::can_decrease(asset, who, amount, false)
+		Pallet::<T, I>::can_decrease(asset, who, amount, false)
 	}
 }
 
-impl<T: Config> fungibles::Mutate<<T as SystemConfig>::AccountId> for Pallet<T> {
+impl<T: Config<I>, I: 'static> fungibles::Mutate<<T as SystemConfig>::AccountId> for Pallet<T, I> {
 	fn mint_into(
 		asset: Self::AssetId,
 		who: &<T as SystemConfig>::AccountId,
@@ -97,7 +98,7 @@ impl<T: Config> fungibles::Mutate<<T as SystemConfig>::AccountId> for Pallet<T>
 	}
 }
 
-impl<T: Config> fungibles::Transfer<T::AccountId> for Pallet<T> {
+impl<T: Config<I>, I: 'static> fungibles::Transfer<T::AccountId> for Pallet<T, I> {
 	fn transfer(
 		asset: Self::AssetId,
 		source: &T::AccountId,
@@ -114,13 +115,15 @@ impl<T: Config> fungibles::Transfer<T::AccountId> for Pallet<T> {
 	}
 }
 
-impl<T: Config> fungibles::Unbalanced<T::AccountId> for Pallet<T> {
+impl<T: Config<I>, I: 'static> fungibles::Unbalanced<T::AccountId> for Pallet<T, I> {
 	fn set_balance(_: Self::AssetId, _: &T::AccountId, _: Self::Balance) -> DispatchResult {
 		unreachable!("set_balance is not used if other functions are impl'd");
 	}
 	fn set_total_issuance(id: T::AssetId, amount: Self::Balance) {
-		Asset::<T>::mutate_exists(id, |maybe_asset| if let Some(ref mut asset) = maybe_asset {
-			asset.supply = amount
+		Asset::<T, I>::mutate_exists(id, |maybe_asset| {
+			if let Some(ref mut asset) = maybe_asset {
+				asset.supply = amount
+			}
 		});
 	}
 	fn decrease_balance(asset: T::AssetId, who: &T::AccountId, amount: Self::Balance)
diff --git a/frame/assets/src/impl_stored_map.rs b/frame/assets/src/impl_stored_map.rs
index a8a6f95557df..6e91e5c1322f 100644
--- a/frame/assets/src/impl_stored_map.rs
+++ b/frame/assets/src/impl_stored_map.rs
@@ -19,11 +19,11 @@
 
 use super::*;
 
-impl<T: Config> StoredMap<(T::AssetId, T::AccountId), T::Extra> for Pallet<T> {
+impl<T: Config<I>, I: 'static> StoredMap<(T::AssetId, T::AccountId), T::Extra> for Pallet<T, I> {
 	fn get(id_who: &(T::AssetId, T::AccountId)) -> T::Extra {
 		let &(id, ref who) = id_who;
-		if Account::<T>::contains_key(id, who) {
-			Account::<T>::get(id, who).extra
+		if Account::<T, I>::contains_key(id, who) {
+			Account::<T, I>::get(id, who).extra
 		} else {
 			Default::default()
 		}
@@ -34,13 +34,13 @@ impl<T: Config> StoredMap<(T::AssetId, T::AccountId), T::Extra> for Pallet<T> {
 		f: impl FnOnce(&mut Option<T::Extra>) -> Result<R, E>,
 	) -> Result<R, E> {
 		let &(id, ref who) = id_who;
-		let mut maybe_extra = Some(Account::<T>::get(id, who).extra);
+		let mut maybe_extra = Some(Account::<T, I>::get(id, who).extra);
 		let r = f(&mut maybe_extra)?;
 		// They want to write some value or delete it.
 		// If the account existed and they want to write a value, then we write.
 		// If the account didn't exist and they want to delete it, then we let it pass.
 		// Otherwise, we fail.
-		Account::<T>::try_mutate_exists(id, who, |maybe_account| {
+		Account::<T, I>::try_mutate_exists(id, who, |maybe_account| {
 			if let Some(extra) = maybe_extra {
 				// They want to write a value. Let this happen only if the account actually exists.
 				if let Some(ref mut account) = maybe_account {
diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index 2a162c2c936b..e8dfd50f4086 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -165,13 +165,13 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
-	pub struct Pallet<T>(_);
+	pub struct Pallet<T, I = ()>(_);
 
 	#[pallet::config]
 	/// The module configuration trait.
-	pub trait Config: frame_system::Config {
+	pub trait Config<I: 'static = ()>: frame_system::Config {
 		/// The overarching event type.
-		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
+		type Event: From<Event<Self, I>> + IsType<<Self as frame_system::Config>::Event>;
 
 		/// The units in which we record balances.
 		type Balance: Member + Parameter + AtLeast32BitUnsigned + Default + Copy;
@@ -187,17 +187,17 @@ pub mod pallet {
 		type ForceOrigin: EnsureOrigin<Self::Origin>;
 
 		/// The basic amount of funds that must be reserved for an asset.
-		type AssetDeposit: Get<DepositBalanceOf<Self>>;
+		type AssetDeposit: Get<DepositBalanceOf<Self, I>>;
 
 		/// The basic amount of funds that must be reserved when adding metadata to your asset.
-		type MetadataDepositBase: Get<DepositBalanceOf<Self>>;
+		type MetadataDepositBase: Get<DepositBalanceOf<Self, I>>;
 
 		/// The additional funds that must be reserved for the number of bytes you store in your
 		/// metadata.
-		type MetadataDepositPerByte: Get<DepositBalanceOf<Self>>;
+		type MetadataDepositPerByte: Get<DepositBalanceOf<Self, I>>;
 
 		/// The amount of funds that must be reserved when creating a new approval.
-		type ApprovalDeposit: Get<DepositBalanceOf<Self>>;
+		type ApprovalDeposit: Get<DepositBalanceOf<Self, I>>;
 
 		/// The maximum length of a name or symbol stored on-chain.
 		type StringLimit: Get<u32>;
@@ -215,16 +215,16 @@ pub mod pallet {
 
 	#[pallet::storage]
 	/// Details of an asset.
-	pub(super) type Asset<T: Config> = StorageMap<
+	pub(super) type Asset<T: Config<I>, I: 'static = ()> = StorageMap<
 		_,
 		Blake2_128Concat,
 		T::AssetId,
-		AssetDetails<T::Balance, T::AccountId, DepositBalanceOf<T>>,
+		AssetDetails<T::Balance, T::AccountId, DepositBalanceOf<T, I>>,
 	>;
 
 	#[pallet::storage]
 	/// The number of units of assets held by any given account.
-	pub(super) type Account<T: Config> = StorageDoubleMap<
+	pub(super) type Account<T: Config<I>, I: 'static = ()> = StorageDoubleMap<
 		_,
 		Blake2_128Concat,
 		T::AssetId,
@@ -237,30 +237,34 @@ pub mod pallet {
 	#[pallet::storage]
 	/// Approved balance transfers. First balance is the amount approved for transfer. Second
 	/// is the amount of `T::Currency` reserved for storing this.
-	pub(super) type Approvals<T: Config> = StorageDoubleMap<
+	pub(super) type Approvals<T: Config<I>, I: 'static = ()> = StorageDoubleMap<
 		_,
 		Blake2_128Concat,
 		T::AssetId,
 		Blake2_128Concat,
 		ApprovalKey<T::AccountId>,
-		Approval<T::Balance, DepositBalanceOf<T>>,
+		Approval<T::Balance, DepositBalanceOf<T, I>>,
 		OptionQuery,
 	>;
 
 	#[pallet::storage]
 	/// Metadata of an asset.
-	pub(super) type Metadata<T: Config> = StorageMap<
+	pub(super) type Metadata<T: Config<I>, I: 'static = ()> = StorageMap<
 		_,
 		Blake2_128Concat,
 		T::AssetId,
-		AssetMetadata<DepositBalanceOf<T>>,
+		AssetMetadata<DepositBalanceOf<T, I>>,
 		ValueQuery,
 	>;
 
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
-	#[pallet::metadata(T::AccountId = "AccountId", T::Balance = "Balance", T::AssetId = "AssetId")]
-	pub enum Event<T: Config> {
+	#[pallet::metadata(
+		T::AccountId = "AccountId",
+		T::Balance = "Balance",
+		T::AssetId = "AssetId"
+	)]
+	pub enum Event<T: Config<I>, I: 'static = ()> {
 		/// Some asset class was created. \[asset_id, creator, owner\]
 		Created(T::AssetId, T::AccountId, T::AccountId),
 		/// Some assets were issued. \[asset_id, owner, total_supply\]
@@ -305,7 +309,7 @@ pub mod pallet {
 	}
 
 	#[pallet::error]
-	pub enum Error<T> {
+	pub enum Error<T, I = ()> {
 		/// Account balance must be greater than or equal to the transfer amount.
 		BalanceLow,
 		/// Balance should be non-zero.
@@ -335,10 +339,10 @@ pub mod pallet {
 	}
 
 	#[pallet::hooks]
-	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+	impl<T: Config<I>, I: 'static> Hooks<BlockNumberFor<T>> for Pallet<T, I> {}
 
 	#[pallet::call]
-	impl<T: Config> Pallet<T> {
+	impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		/// Issue a new class of fungible assets from a public origin.
 		///
 		/// This new asset class has no assets initially and its owner is the origin.
@@ -368,26 +372,29 @@ pub mod pallet {
 			let owner = ensure_signed(origin)?;
 			let admin = T::Lookup::lookup(admin)?;
 
-			ensure!(!Asset::<T>::contains_key(id), Error::<T>::InUse);
-			ensure!(!min_balance.is_zero(), Error::<T>::MinBalanceZero);
+			ensure!(!Asset::<T, I>::contains_key(id), Error::<T, I>::InUse);
+			ensure!(!min_balance.is_zero(), Error::<T, I>::MinBalanceZero);
 
 			let deposit = T::AssetDeposit::get();
 			T::Currency::reserve(&owner, deposit)?;
 
-			Asset::<T>::insert(id, AssetDetails {
-				owner: owner.clone(),
-				issuer: admin.clone(),
-				admin: admin.clone(),
-				freezer: admin.clone(),
-				supply: Zero::zero(),
-				deposit,
-				min_balance,
-				is_sufficient: false,
-				accounts: 0,
-				sufficients: 0,
-				approvals: 0,
-				is_frozen: false,
-			});
+			Asset::<T, I>::insert(
+				id,
+				AssetDetails {
+					owner: owner.clone(),
+					issuer: admin.clone(),
+					admin: admin.clone(),
+					freezer: admin.clone(),
+					supply: Zero::zero(),
+					deposit,
+					min_balance,
+					is_sufficient: false,
+					accounts: 0,
+					sufficients: 0,
+					approvals: 0,
+					is_frozen: false,
+				},
+			);
 			Self::deposit_event(Event::Created(id, owner, admin));
 			Ok(())
 		}
@@ -424,23 +431,26 @@ pub mod pallet {
 			T::ForceOrigin::ensure_origin(origin)?;
 			let owner = T::Lookup::lookup(owner)?;
 
-			ensure!(!Asset::<T>::contains_key(id), Error::<T>::InUse);
-			ensure!(!min_balance.is_zero(), Error::<T>::MinBalanceZero);
-
-			Asset::<T>::insert(id, AssetDetails {
-				owner: owner.clone(),
-				issuer: owner.clone(),
-				admin: owner.clone(),
-				freezer: owner.clone(),
-				supply: Zero::zero(),
-				deposit: Zero::zero(),
-				min_balance,
-				is_sufficient,
-				accounts: 0,
-				sufficients: 0,
-				approvals: 0,
-				is_frozen: false,
-			});
+			ensure!(!Asset::<T, I>::contains_key(id), Error::<T, I>::InUse);
+			ensure!(!min_balance.is_zero(), Error::<T, I>::MinBalanceZero);
+
+			Asset::<T, I>::insert(
+				id,
+				AssetDetails {
+					owner: owner.clone(),
+					issuer: owner.clone(),
+					admin: owner.clone(),
+					freezer: owner.clone(),
+					supply: Zero::zero(),
+					deposit: Zero::zero(),
+					min_balance,
+					is_sufficient,
+					accounts: 0,
+					sufficients: 0,
+					approvals: 0,
+					is_frozen: false,
+				},
+			);
 			Self::deposit_event(Event::ForceCreated(id, owner));
 			Ok(())
 		}
@@ -473,25 +483,28 @@ pub mod pallet {
 				Ok(_) => None,
 				Err(origin) => Some(ensure_signed(origin)?),
 			};
-			Asset::<T>::try_mutate_exists(id, |maybe_details| {
-				let mut details = maybe_details.take().ok_or(Error::<T>::Unknown)?;
+			Asset::<T, I>::try_mutate_exists(id, |maybe_details| {
+				let mut details = maybe_details.take().ok_or(Error::<T, I>::Unknown)?;
 				if let Some(check_owner) = maybe_check_owner {
-					ensure!(details.owner == check_owner, Error::<T>::NoPermission);
+					ensure!(details.owner == check_owner, Error::<T, I>::NoPermission);
 				}
-				ensure!(details.accounts == witness.accounts, Error::<T>::BadWitness);
-				ensure!(details.sufficients == witness.sufficients, Error::<T>::BadWitness);
-				ensure!(details.approvals == witness.approvals, Error::<T>::BadWitness);
+				ensure!(details.accounts == witness.accounts, Error::<T, I>::BadWitness);
+				ensure!(details.sufficients == witness.sufficients, Error::<T, I>::BadWitness);
+				ensure!(details.approvals == witness.approvals, Error::<T, I>::BadWitness);
 
-				for (who, v) in Account::<T>::drain_prefix(id) {
+				for (who, v) in Account::<T, I>::drain_prefix(id) {
 					Self::dead_account(id, &who, &mut details, v.sufficient);
 				}
 				debug_assert_eq!(details.accounts, 0);
 				debug_assert_eq!(details.sufficients, 0);
 
-				let metadata = Metadata::<T>::take(&id);
-				T::Currency::unreserve(&details.owner, details.deposit.saturating_add(metadata.deposit));
+				let metadata = Metadata::<T, I>::take(&id);
+				T::Currency::unreserve(
+					&details.owner,
+					details.deposit.saturating_add(metadata.deposit),
+				);
 
-				Approvals::<T>::remove_prefix(&id);
+				Approvals::<T, I>::remove_prefix(&id);
 				Self::deposit_event(Event::Destroyed(id));
 
 				// NOTE: could use postinfo to reflect the actual number of accounts/sufficient/approvals
@@ -685,14 +698,17 @@ pub mod pallet {
 		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
 
-			let d = Asset::<T>::get(id).ok_or(Error::<T>::Unknown)?;
-			ensure!(&origin == &d.freezer, Error::<T>::NoPermission);
+			let d = Asset::<T, I>::get(id).ok_or(Error::<T, I>::Unknown)?;
+			ensure!(&origin == &d.freezer, Error::<T, I>::NoPermission);
 			let who = T::Lookup::lookup(who)?;
-			ensure!(Account::<T>::contains_key(id, &who), Error::<T>::BalanceZero);
+			ensure!(
+				Account::<T, I>::contains_key(id, &who),
+				Error::<T, I>::BalanceZero
+			);
 
-			Account::<T>::mutate(id, &who, |a| a.is_frozen = true);
+			Account::<T, I>::mutate(id, &who, |a| a.is_frozen = true);
 
-			Self::deposit_event(Event::<T>::Frozen(id, who));
+			Self::deposit_event(Event::<T, I>::Frozen(id, who));
 			Ok(())
 		}
 
@@ -715,14 +731,17 @@ pub mod pallet {
 		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
 
-			let details = Asset::<T>::get(id).ok_or(Error::<T>::Unknown)?;
-			ensure!(&origin == &details.admin, Error::<T>::NoPermission);
+			let details = Asset::<T, I>::get(id).ok_or(Error::<T, I>::Unknown)?;
+			ensure!(&origin == &details.admin, Error::<T, I>::NoPermission);
 			let who = T::Lookup::lookup(who)?;
-			ensure!(Account::<T>::contains_key(id, &who), Error::<T>::BalanceZero);
+			ensure!(
+				Account::<T, I>::contains_key(id, &who),
+				Error::<T, I>::BalanceZero
+			);
 
-			Account::<T>::mutate(id, &who, |a| a.is_frozen = false);
+			Account::<T, I>::mutate(id, &who, |a| a.is_frozen = false);
 
-			Self::deposit_event(Event::<T>::Thawed(id, who));
+			Self::deposit_event(Event::<T, I>::Thawed(id, who));
 			Ok(())
 		}
 
@@ -742,13 +761,13 @@ pub mod pallet {
 		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
 
-			Asset::<T>::try_mutate(id, |maybe_details| {
-				let d = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
-				ensure!(&origin == &d.freezer, Error::<T>::NoPermission);
+			Asset::<T, I>::try_mutate(id, |maybe_details| {
+				let d = maybe_details.as_mut().ok_or(Error::<T, I>::Unknown)?;
+				ensure!(&origin == &d.freezer, Error::<T, I>::NoPermission);
 
 				d.is_frozen = true;
 
-				Self::deposit_event(Event::<T>::AssetFrozen(id));
+				Self::deposit_event(Event::<T, I>::AssetFrozen(id));
 				Ok(())
 			})
 		}
@@ -769,13 +788,13 @@ pub mod pallet {
 		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
 
-			Asset::<T>::try_mutate(id, |maybe_details| {
-				let d = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
-				ensure!(&origin == &d.admin, Error::<T>::NoPermission);
+			Asset::<T, I>::try_mutate(id, |maybe_details| {
+				let d = maybe_details.as_mut().ok_or(Error::<T, I>::Unknown)?;
+				ensure!(&origin == &d.admin, Error::<T, I>::NoPermission);
 
 				d.is_frozen = false;
 
-				Self::deposit_event(Event::<T>::AssetThawed(id));
+				Self::deposit_event(Event::<T, I>::AssetThawed(id));
 				Ok(())
 			})
 		}
@@ -799,12 +818,14 @@ pub mod pallet {
 			let origin = ensure_signed(origin)?;
 			let owner = T::Lookup::lookup(owner)?;
 
-			Asset::<T>::try_mutate(id, |maybe_details| {
-				let details = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
-				ensure!(&origin == &details.owner, Error::<T>::NoPermission);
-				if details.owner == owner { return Ok(()) }
+			Asset::<T, I>::try_mutate(id, |maybe_details| {
+				let details = maybe_details.as_mut().ok_or(Error::<T, I>::Unknown)?;
+				ensure!(&origin == &details.owner, Error::<T, I>::NoPermission);
+				if details.owner == owner {
+					return Ok(());
+				}
 
-				let metadata_deposit = Metadata::<T>::get(id).deposit;
+				let metadata_deposit = Metadata::<T, I>::get(id).deposit;
 				let deposit = details.deposit + metadata_deposit;
 
 				// Move the deposit to the new owner.
@@ -842,9 +863,9 @@ pub mod pallet {
 			let admin = T::Lookup::lookup(admin)?;
 			let freezer = T::Lookup::lookup(freezer)?;
 
-			Asset::<T>::try_mutate(id, |maybe_details| {
-				let details = maybe_details.as_mut().ok_or(Error::<T>::Unknown)?;
-				ensure!(&origin == &details.owner, Error::<T>::NoPermission);
+			Asset::<T, I>::try_mutate(id, |maybe_details| {
+				let details = maybe_details.as_mut().ok_or(Error::<T, I>::Unknown)?;
+				ensure!(&origin == &details.owner, Error::<T, I>::NoPermission);
 
 				details.issuer = issuer.clone();
 				details.admin = admin.clone();
@@ -881,14 +902,17 @@ pub mod pallet {
 		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
 
-			ensure!(name.len() <= T::StringLimit::get() as usize, Error::<T>::BadMetadata);
-			ensure!(symbol.len() <= T::StringLimit::get() as usize, Error::<T>::BadMetadata);
+			ensure!(name.len() <= T::StringLimit::get() as usize, Error::<T, I>::BadMetadata);
+			ensure!(symbol.len() <= T::StringLimit::get() as usize, Error::<T, I>::BadMetadata);
 
-			let d = Asset::<T>::get(id).ok_or(Error::<T>::Unknown)?;
-			ensure!(&origin == &d.owner, Error::<T>::NoPermission);
+			let d = Asset::<T, I>::get(id).ok_or(Error::<T, I>::Unknown)?;
+			ensure!(&origin == &d.owner, Error::<T, I>::NoPermission);
 
-			Metadata::<T>::try_mutate_exists(id, |metadata| {
-				ensure!(metadata.as_ref().map_or(true, |m| !m.is_frozen), Error::<T>::NoPermission);
+			Metadata::<T, I>::try_mutate_exists(id, |metadata| {
+				ensure!(
+					metadata.as_ref().map_or(true, |m| !m.is_frozen),
+					Error::<T, I>::NoPermission
+				);
 
 				let old_deposit = metadata.take().map_or(Zero::zero(), |m| m.deposit);
 				let new_deposit = T::MetadataDepositPerByte::get()
@@ -932,11 +956,11 @@ pub mod pallet {
 		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
 
-			let d = Asset::<T>::get(id).ok_or(Error::<T>::Unknown)?;
-			ensure!(&origin == &d.owner, Error::<T>::NoPermission);
+			let d = Asset::<T, I>::get(id).ok_or(Error::<T, I>::Unknown)?;
+			ensure!(&origin == &d.owner, Error::<T, I>::NoPermission);
 
-			Metadata::<T>::try_mutate_exists(id, |metadata| {
-				let deposit = metadata.take().ok_or(Error::<T>::Unknown)?.deposit;
+			Metadata::<T, I>::try_mutate_exists(id, |metadata| {
+				let deposit = metadata.take().ok_or(Error::<T, I>::Unknown)?.deposit;
 				T::Currency::unreserve(&d.owner, deposit);
 				Self::deposit_event(Event::MetadataCleared(id));
 				Ok(())
@@ -968,11 +992,11 @@ pub mod pallet {
 		) -> DispatchResult {
 			T::ForceOrigin::ensure_origin(origin)?;
 
-			ensure!(name.len() <= T::StringLimit::get() as usize, Error::<T>::BadMetadata);
-			ensure!(symbol.len() <= T::StringLimit::get() as usize, Error::<T>::BadMetadata);
+			ensure!(name.len() <= T::StringLimit::get() as usize, Error::<T, I>::BadMetadata);
+			ensure!(symbol.len() <= T::StringLimit::get() as usize, Error::<T, I>::BadMetadata);
 
-			ensure!(Asset::<T>::contains_key(id), Error::<T>::Unknown);
-			Metadata::<T>::try_mutate_exists(id, |metadata| {
+			ensure!(Asset::<T, I>::contains_key(id), Error::<T, I>::Unknown);
+			Metadata::<T, I>::try_mutate_exists(id, |metadata| {
 				let deposit = metadata.take().map_or(Zero::zero(), |m| m.deposit);
 				*metadata = Some(AssetMetadata {
 					deposit,
@@ -1005,9 +1029,9 @@ pub mod pallet {
 		) -> DispatchResult {
 			T::ForceOrigin::ensure_origin(origin)?;
 
-			let d = Asset::<T>::get(id).ok_or(Error::<T>::Unknown)?;
-			Metadata::<T>::try_mutate_exists(id, |metadata| {
-				let deposit = metadata.take().ok_or(Error::<T>::Unknown)?.deposit;
+			let d = Asset::<T, I>::get(id).ok_or(Error::<T, I>::Unknown)?;
+			Metadata::<T, I>::try_mutate_exists(id, |metadata| {
+				let deposit = metadata.take().ok_or(Error::<T, I>::Unknown)?.deposit;
 				T::Currency::unreserve(&d.owner, deposit);
 				Self::deposit_event(Event::MetadataCleared(id));
 				Ok(())
@@ -1050,8 +1074,8 @@ pub mod pallet {
 		) -> DispatchResult {
 			T::ForceOrigin::ensure_origin(origin)?;
 
-			Asset::<T>::try_mutate(id, |maybe_asset| {
-				let mut asset = maybe_asset.take().ok_or(Error::<T>::Unknown)?;
+			Asset::<T, I>::try_mutate(id, |maybe_asset| {
+				let mut asset = maybe_asset.take().ok_or(Error::<T, I>::Unknown)?;
 				asset.owner = T::Lookup::lookup(owner)?;
 				asset.issuer = T::Lookup::lookup(issuer)?;
 				asset.admin = T::Lookup::lookup(admin)?;
@@ -1097,7 +1121,7 @@ pub mod pallet {
 			let delegate = T::Lookup::lookup(delegate)?;
 
 			let key = ApprovalKey { owner, delegate };
-			Approvals::<T>::try_mutate(id, &key, |maybe_approved| -> DispatchResult {
+			Approvals::<T, I>::try_mutate(id, &key, |maybe_approved| -> DispatchResult {
 				let mut approved = maybe_approved.take().unwrap_or_default();
 				let deposit_required = T::ApprovalDeposit::get();
 				if approved.deposit < deposit_required {
@@ -1135,7 +1159,7 @@ pub mod pallet {
 			let owner = ensure_signed(origin)?;
 			let delegate = T::Lookup::lookup(delegate)?;
 			let key = ApprovalKey { owner, delegate };
-			let approval = Approvals::<T>::take(id, &key).ok_or(Error::<T>::Unknown)?;
+			let approval = Approvals::<T, I>::take(id, &key).ok_or(Error::<T, I>::Unknown)?;
 			T::Currency::unreserve(&key.owner, approval.deposit);
 
 			Self::deposit_event(Event::ApprovalCancelled(id, key.owner, key.delegate));
@@ -1166,8 +1190,8 @@ pub mod pallet {
 				.map(|_| ())
 				.or_else(|origin| -> DispatchResult {
 					let origin = ensure_signed(origin)?;
-					let d = Asset::<T>::get(id).ok_or(Error::<T>::Unknown)?;
-					ensure!(&origin == &d.admin, Error::<T>::NoPermission);
+					let d = Asset::<T, I>::get(id).ok_or(Error::<T, I>::Unknown)?;
+					ensure!(&origin == &d.admin, Error::<T, I>::NoPermission);
 					Ok(())
 				})?;
 
@@ -1175,7 +1199,7 @@ pub mod pallet {
 			let delegate = T::Lookup::lookup(delegate)?;
 
 			let key = ApprovalKey { owner, delegate };
-			let approval = Approvals::<T>::take(id, &key).ok_or(Error::<T>::Unknown)?;
+			let approval = Approvals::<T, I>::take(id, &key).ok_or(Error::<T, I>::Unknown)?;
 			T::Currency::unreserve(&key.owner, approval.deposit);
 
 			Self::deposit_event(Event::ApprovalCancelled(id, key.owner, key.delegate));
@@ -1213,9 +1237,12 @@ pub mod pallet {
 			let destination = T::Lookup::lookup(destination)?;
 
 			let key = ApprovalKey { owner, delegate };
-			Approvals::<T>::try_mutate_exists(id, &key, |maybe_approved| -> DispatchResult {
-				let mut approved = maybe_approved.take().ok_or(Error::<T>::Unapproved)?;
-				let remaining = approved.amount.checked_sub(&amount).ok_or(Error::<T>::Unapproved)?;
+			Approvals::<T, I>::try_mutate_exists(id, &key, |maybe_approved| -> DispatchResult {
+				let mut approved = maybe_approved.take().ok_or(Error::<T, I>::Unapproved)?;
+				let remaining = approved
+					.amount
+					.checked_sub(&amount)
+					.ok_or(Error::<T, I>::Unapproved)?;
 
 				let f = TransferFlags {
 					keep_alive: false,
diff --git a/frame/assets/src/types.rs b/frame/assets/src/types.rs
index 7e0e235b1b7e..f3f17c00a218 100644
--- a/frame/assets/src/types.rs
+++ b/frame/assets/src/types.rs
@@ -15,11 +15,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Various basic tyoes for use in the assets pallet.
+//! Various basic types for use in the assets pallet.
 
 use super::*;
 
-pub(super) type DepositBalanceOf<T> = <<T as Config>::Currency as Currency<<T as SystemConfig>::AccountId>>::Balance;
+pub(super) type DepositBalanceOf<T, I = ()> =
+	<<T as Config<I>>::Currency as Currency<<T as SystemConfig>::AccountId>>::Balance;
 
 #[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug)]
 pub struct AssetDetails<

From 982df173190685bb18b7ed46b860e36387b9a7a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Fri, 16 Apr 2021 12:42:37 +0200
Subject: [PATCH 0653/1194] Remove `serde` requirement from FRAME macros
 (#8628)

* Remove `serde` requirement from FRAME macros

Currently there is some implicit requirement on `serde` being present in
the `Cargo.toml` of a pallet when `GenesisConfig` is used. This pr
removes this requirement by using the serde attribute `serde(crate = "..")`.

* build a unique reexport of serde in impl_opaque_keys, by abusing paste doc concatenation

* Optimize

Co-authored-by: thiolliere <gui.thiolliere@gmail.com>
---
 Cargo.lock                                    | 36 -------------------
 bin/node-template/runtime/Cargo.toml          |  2 --
 bin/node/runtime/Cargo.toml                   |  2 --
 frame/assets/Cargo.toml                       |  2 --
 frame/atomic-swap/Cargo.toml                  |  2 --
 frame/aura/Cargo.toml                         |  2 --
 frame/authority-discovery/Cargo.toml          |  2 --
 frame/babe/Cargo.toml                         |  2 --
 frame/balances/Cargo.toml                     |  2 --
 frame/bounties/Cargo.toml                     |  2 --
 frame/collective/Cargo.toml                   |  2 --
 .../election-provider-multi-phase/Cargo.toml  |  2 --
 frame/elections-phragmen/Cargo.toml           |  2 --
 frame/elections/Cargo.toml                    |  2 --
 frame/example-offchain-worker/Cargo.toml      |  2 --
 frame/example/Cargo.toml                      |  2 --
 frame/executive/Cargo.toml                    |  2 --
 frame/gilt/Cargo.toml                         |  2 --
 frame/grandpa/Cargo.toml                      |  2 --
 frame/identity/Cargo.toml                     |  2 --
 frame/im-online/Cargo.toml                    |  2 --
 frame/indices/Cargo.toml                      |  2 --
 frame/membership/Cargo.toml                   |  2 --
 frame/merkle-mountain-range/Cargo.toml        |  2 --
 frame/multisig/Cargo.toml                     |  2 --
 frame/nicks/Cargo.toml                        |  2 --
 frame/node-authorization/Cargo.toml           |  2 --
 frame/proxy/Cargo.toml                        |  2 --
 frame/recovery/Cargo.toml                     |  2 --
 frame/scheduler/Cargo.toml                    |  2 --
 frame/scored-pool/Cargo.toml                  |  2 --
 frame/session/Cargo.toml                      |  2 --
 frame/society/Cargo.toml                      |  2 --
 frame/staking/src/lib.rs                      |  6 ++--
 frame/sudo/Cargo.toml                         |  2 --
 .../src/pallet/expand/genesis_config.rs       |  3 ++
 .../src/storage/genesis_config/mod.rs         |  2 ++
 frame/support/src/genesis_config.rs           |  3 ++
 frame/timestamp/Cargo.toml                    |  2 --
 frame/treasury/src/lib.rs                     |  4 +--
 frame/utility/Cargo.toml                      |  2 --
 frame/vesting/Cargo.toml                      |  2 --
 primitives/runtime/src/traits.rs              | 31 +++++++++-------
 43 files changed, 29 insertions(+), 128 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 14fd4778c639..cec17f7f9676 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1777,7 +1777,6 @@ dependencies = [
  "pallet-indices",
  "pallet-transaction-payment",
  "parity-scale-codec",
- "serde",
  "sp-core",
  "sp-inherents",
  "sp-io",
@@ -4323,7 +4322,6 @@ dependencies = [
  "pallet-utility",
  "pallet-vesting",
  "parity-scale-codec",
- "serde",
  "sp-api",
  "sp-authority-discovery",
  "sp-block-builder",
@@ -4402,7 +4400,6 @@ dependencies = [
  "pallet-transaction-payment",
  "pallet-transaction-payment-rpc-runtime-api",
  "parity-scale-codec",
- "serde",
  "sp-api",
  "sp-block-builder",
  "sp-consensus-aura",
@@ -4616,7 +4613,6 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "parity-scale-codec",
- "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -4631,7 +4627,6 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "parity-scale-codec",
- "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -4649,7 +4644,6 @@ dependencies = [
  "pallet-timestamp",
  "parity-scale-codec",
  "parking_lot 0.11.1",
- "serde",
  "sp-application-crypto",
  "sp-consensus-aura",
  "sp-core",
@@ -4666,7 +4660,6 @@ dependencies = [
  "frame-system",
  "pallet-session",
  "parity-scale-codec",
- "serde",
  "sp-application-crypto",
  "sp-authority-discovery",
  "sp-core",
@@ -4710,7 +4703,6 @@ dependencies = [
  "pallet-staking-reward-curve",
  "pallet-timestamp",
  "parity-scale-codec",
- "serde",
  "sp-application-crypto",
  "sp-consensus-babe",
  "sp-consensus-vrf",
@@ -4732,7 +4724,6 @@ dependencies = [
  "log",
  "pallet-transaction-payment",
  "parity-scale-codec",
- "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -4749,7 +4740,6 @@ dependencies = [
  "pallet-balances",
  "pallet-treasury",
  "parity-scale-codec",
- "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -4768,7 +4758,6 @@ dependencies = [
  "log",
  "pallet-balances",
  "parity-scale-codec",
- "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -4893,7 +4882,6 @@ dependencies = [
  "parking_lot 0.11.1",
  "paste 1.0.4",
  "rand 0.7.3",
- "serde",
  "sp-arithmetic",
  "sp-core",
  "sp-io",
@@ -4914,7 +4902,6 @@ dependencies = [
  "hex-literal",
  "pallet-balances",
  "parity-scale-codec",
- "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -4932,7 +4919,6 @@ dependencies = [
  "log",
  "pallet-balances",
  "parity-scale-codec",
- "serde",
  "sp-core",
  "sp-io",
  "sp-npos-elections",
@@ -4951,7 +4937,6 @@ dependencies = [
  "log",
  "pallet-balances",
  "parity-scale-codec",
- "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -4967,7 +4952,6 @@ dependencies = [
  "lite-json",
  "log",
  "parity-scale-codec",
- "serde",
  "sp-core",
  "sp-io",
  "sp-keystore",
@@ -4999,7 +4983,6 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "parity-scale-codec",
- "serde",
  "sp-arithmetic",
  "sp-core",
  "sp-io",
@@ -5025,7 +5008,6 @@ dependencies = [
  "pallet-staking-reward-curve",
  "pallet-timestamp",
  "parity-scale-codec",
- "serde",
  "sp-application-crypto",
  "sp-core",
  "sp-finality-grandpa",
@@ -5047,7 +5029,6 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "parity-scale-codec",
- "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5065,7 +5046,6 @@ dependencies = [
  "pallet-authorship",
  "pallet-session",
  "parity-scale-codec",
- "serde",
  "sp-application-crypto",
  "sp-core",
  "sp-io",
@@ -5083,7 +5063,6 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "parity-scale-codec",
- "serde",
  "sp-core",
  "sp-io",
  "sp-keyring",
@@ -5115,7 +5094,6 @@ dependencies = [
  "frame-support",
  "frame-system",
  "parity-scale-codec",
- "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5134,7 +5112,6 @@ dependencies = [
  "hex-literal",
  "pallet-mmr-primitives",
  "parity-scale-codec",
- "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5184,7 +5161,6 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "parity-scale-codec",
- "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5199,7 +5175,6 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "parity-scale-codec",
- "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5214,7 +5189,6 @@ dependencies = [
  "frame-system",
  "log",
  "parity-scale-codec",
- "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5274,7 +5248,6 @@ dependencies = [
  "pallet-balances",
  "pallet-utility",
  "parity-scale-codec",
- "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5305,7 +5278,6 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "parity-scale-codec",
- "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5321,7 +5293,6 @@ dependencies = [
  "frame-system",
  "log",
  "parity-scale-codec",
- "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5337,7 +5308,6 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "parity-scale-codec",
- "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5354,7 +5324,6 @@ dependencies = [
  "lazy_static",
  "pallet-timestamp",
  "parity-scale-codec",
- "serde",
  "sp-application-crypto",
  "sp-core",
  "sp-io",
@@ -5398,7 +5367,6 @@ dependencies = [
  "pallet-balances",
  "parity-scale-codec",
  "rand_chacha 0.2.2",
- "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5463,7 +5431,6 @@ dependencies = [
  "frame-support",
  "frame-system",
  "parity-scale-codec",
- "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5494,7 +5461,6 @@ dependencies = [
  "impl-trait-for-tuples",
  "log",
  "parity-scale-codec",
- "serde",
  "sp-core",
  "sp-inherents",
  "sp-io",
@@ -5592,7 +5558,6 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "parity-scale-codec",
- "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5610,7 +5575,6 @@ dependencies = [
  "hex-literal",
  "pallet-balances",
  "parity-scale-codec",
- "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
diff --git a/bin/node-template/runtime/Cargo.toml b/bin/node-template/runtime/Cargo.toml
index 5bba2a4e970b..8f7d39f18bc4 100644
--- a/bin/node-template/runtime/Cargo.toml
+++ b/bin/node-template/runtime/Cargo.toml
@@ -23,7 +23,6 @@ frame-system = { version = "3.0.0", default-features = false, path = "../../../f
 pallet-timestamp = { version = "3.0.0", default-features = false, path = "../../../frame/timestamp" }
 pallet-transaction-payment = { version = "3.0.0", default-features = false, path = "../../../frame/transaction-payment" }
 frame-executive = { version = "3.0.0", default-features = false, path = "../../../frame/executive" }
-serde = { version = "1.0.101", optional = true, features = ["derive"] }
 sp-api = { version = "3.0.0", default-features = false, path = "../../../primitives/api" }
 sp-block-builder = { path = "../../../primitives/block-builder", default-features = false, version = "3.0.0"}
 sp-consensus-aura = { version = "0.9.0", default-features = false, path = "../../../primitives/consensus/aura" }
@@ -67,7 +66,6 @@ std = [
 	"pallet-timestamp/std",
 	"pallet-transaction-payment-rpc-runtime-api/std",
 	"pallet-transaction-payment/std",
-	"serde",
 	"sp-api/std",
 	"sp-block-builder/std",
 	"sp-consensus-aura/std",
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index f0cad60f2614..edf7109bacb7 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -15,7 +15,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 # third-party dependencies
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.102", optional = true }
 static_assertions = "1.1.0"
 hex-literal = { version = "0.3.1", optional = true }
 log = { version = "0.4.14", default-features = false }
@@ -133,7 +132,6 @@ std = [
 	"sp-core/std",
 	"pallet-randomness-collective-flip/std",
 	"sp-std/std",
-	"serde",
 	"pallet-session/std",
 	"sp-api/std",
 	"sp-runtime/std",
diff --git a/frame/assets/Cargo.toml b/frame/assets/Cargo.toml
index b62e8bac8ccc..7137cf1d789a 100644
--- a/frame/assets/Cargo.toml
+++ b/frame/assets/Cargo.toml
@@ -13,7 +13,6 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 # Needed for various traits. In our case, `OnFinalize`.
@@ -33,7 +32,6 @@ pallet-balances = { version = "3.0.0", path = "../balances" }
 [features]
 default = ["std"]
 std = [
-	"serde",
 	"codec/std",
 	"sp-std/std",
 	"sp-runtime/std",
diff --git a/frame/atomic-swap/Cargo.toml b/frame/atomic-swap/Cargo.toml
index a3b62d65e56a..4fd1284893f9 100644
--- a/frame/atomic-swap/Cargo.toml
+++ b/frame/atomic-swap/Cargo.toml
@@ -13,7 +13,6 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
@@ -28,7 +27,6 @@ pallet-balances = { version = "3.0.0", path = "../balances" }
 [features]
 default = ["std"]
 std = [
-	"serde",
 	"codec/std",
 	"frame-support/std",
 	"frame-system/std",
diff --git a/frame/aura/Cargo.toml b/frame/aura/Cargo.toml
index 6cae6c94c9a8..5b247b008de2 100644
--- a/frame/aura/Cargo.toml
+++ b/frame/aura/Cargo.toml
@@ -16,7 +16,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 sp-application-crypto = { version = "3.0.0", default-features = false, path = "../../primitives/application-crypto" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-serde = { version = "1.0.101", optional = true }
 pallet-session = { version = "3.0.0", default-features = false, path = "../session" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
@@ -36,7 +35,6 @@ std = [
 	"sp-application-crypto/std",
 	"codec/std",
 	"sp-std/std",
-	"serde",
 	"sp-runtime/std",
 	"frame-support/std",
 	"sp-consensus-aura/std",
diff --git a/frame/authority-discovery/Cargo.toml b/frame/authority-discovery/Cargo.toml
index 85844cf716f0..25fec9118230 100644
--- a/frame/authority-discovery/Cargo.toml
+++ b/frame/authority-discovery/Cargo.toml
@@ -17,7 +17,6 @@ sp-authority-discovery = { version = "3.0.0", default-features = false, path = "
 sp-application-crypto = { version = "3.0.0", default-features = false, path = "../../primitives/application-crypto" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-serde = { version = "1.0.101", optional = true }
 pallet-session = { version = "3.0.0", features = ["historical" ], path = "../session", default-features = false }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
@@ -35,7 +34,6 @@ std = [
 	"sp-authority-discovery/std",
 	"codec/std",
 	"sp-std/std",
-	"serde",
 	"pallet-session/std",
 	"sp-runtime/std",
 	"frame-support/std",
diff --git a/frame/babe/Cargo.toml b/frame/babe/Cargo.toml
index f7bebce98acf..64497eafe715 100644
--- a/frame/babe/Cargo.toml
+++ b/frame/babe/Cargo.toml
@@ -20,7 +20,6 @@ frame-system = { version = "3.0.0", default-features = false, path = "../system"
 pallet-authorship = { version = "3.0.0", default-features = false, path = "../authorship" }
 pallet-session = { version = "3.0.0", default-features = false, path = "../session" }
 pallet-timestamp = { version = "3.0.0", default-features = false, path = "../timestamp" }
-serde = { version = "1.0.101", optional = true }
 sp-application-crypto = { version = "3.0.0", default-features = false, path = "../../primitives/application-crypto" }
 sp-consensus-babe = { version = "0.9.0", default-features = false, path = "../../primitives/consensus/babe" }
 sp-consensus-vrf = { version = "0.9.0", default-features = false, path = "../../primitives/consensus/vrf" }
@@ -49,7 +48,6 @@ std = [
 	"pallet-authorship/std",
 	"pallet-session/std",
 	"pallet-timestamp/std",
-	"serde",
 	"sp-application-crypto/std",
 	"sp-consensus-babe/std",
 	"sp-consensus-vrf/std",
diff --git a/frame/balances/Cargo.toml b/frame/balances/Cargo.toml
index 22c4ef0976f5..116a52151583 100644
--- a/frame/balances/Cargo.toml
+++ b/frame/balances/Cargo.toml
@@ -13,7 +13,6 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
@@ -30,7 +29,6 @@ pallet-transaction-payment = { version = "3.0.0", path = "../transaction-payment
 [features]
 default = ["std"]
 std = [
-	"serde",
 	"codec/std",
 	"sp-std/std",
 	"sp-runtime/std",
diff --git a/frame/bounties/Cargo.toml b/frame/bounties/Cargo.toml
index ff1a3a680709..1845f77e97a9 100644
--- a/frame/bounties/Cargo.toml
+++ b/frame/bounties/Cargo.toml
@@ -13,7 +13,6 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
@@ -32,7 +31,6 @@ pallet-balances = { version = "3.0.0", path = "../balances" }
 [features]
 default = ["std"]
 std = [
-	"serde",
 	"codec/std",
 	"sp-std/std",
 	"sp-runtime/std",
diff --git a/frame/collective/Cargo.toml b/frame/collective/Cargo.toml
index b8f825cc5293..c4940c87f827 100644
--- a/frame/collective/Cargo.toml
+++ b/frame/collective/Cargo.toml
@@ -13,7 +13,6 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
@@ -34,7 +33,6 @@ std = [
 	"codec/std",
 	"sp-core/std",
 	"sp-std/std",
-	"serde",
 	"sp-io/std",
 	"frame-support/std",
 	"sp-runtime/std",
diff --git a/frame/election-provider-multi-phase/Cargo.toml b/frame/election-provider-multi-phase/Cargo.toml
index 4b5178faa8e8..dcb9c9b0e75b 100644
--- a/frame/election-provider-multi-phase/Cargo.toml
+++ b/frame/election-provider-multi-phase/Cargo.toml
@@ -14,7 +14,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 static_assertions = "1.1.0"
-serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 log = { version = "0.4.14", default-features = false }
 
@@ -48,7 +47,6 @@ frame-benchmarking = { version = "3.1.0", path = "../benchmarking" }
 [features]
 default = ["std"]
 std = [
-	"serde",
 	"codec/std",
 	"log/std",
 
diff --git a/frame/elections-phragmen/Cargo.toml b/frame/elections-phragmen/Cargo.toml
index 89723cb85fbe..32ae9968c7bf 100644
--- a/frame/elections-phragmen/Cargo.toml
+++ b/frame/elections-phragmen/Cargo.toml
@@ -14,7 +14,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.101", optional = true }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
 sp-npos-elections = { version = "3.0.0", default-features = false, path = "../../primitives/npos-elections" }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
@@ -33,7 +32,6 @@ substrate-test-utils = { version = "3.0.0", path = "../../test-utils" }
 [features]
 default = ["std"]
 std = [
-	"serde",
 	"codec/std",
 	"frame-support/std",
 	"sp-runtime/std",
diff --git a/frame/elections/Cargo.toml b/frame/elections/Cargo.toml
index ac3c709300f5..d4b84f5bb156 100644
--- a/frame/elections/Cargo.toml
+++ b/frame/elections/Cargo.toml
@@ -13,7 +13,6 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
@@ -32,7 +31,6 @@ std = [
 	"codec/std",
 	"sp-core/std",
 	"sp-std/std",
-	"serde",
 	"sp-io/std",
 	"frame-support/std",
 	"sp-runtime/std",
diff --git a/frame/example-offchain-worker/Cargo.toml b/frame/example-offchain-worker/Cargo.toml
index 3718da643da6..ea9fb9699ec6 100644
--- a/frame/example-offchain-worker/Cargo.toml
+++ b/frame/example-offchain-worker/Cargo.toml
@@ -16,7 +16,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-serde = { version = "1.0.101", optional = true }
 sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
 sp-keystore = { version = "0.9.0", path = "../../primitives/keystore", optional = true }
 sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
@@ -31,7 +30,6 @@ std = [
 	"codec/std",
 	"frame-support/std",
 	"frame-system/std",
-	"serde",
 	"lite-json/std",
 	"sp-core/std",
 	"sp-io/std",
diff --git a/frame/example/Cargo.toml b/frame/example/Cargo.toml
index e24616bc84cf..258648b52e5b 100644
--- a/frame/example/Cargo.toml
+++ b/frame/example/Cargo.toml
@@ -13,7 +13,6 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
@@ -36,7 +35,6 @@ std = [
 	"frame-system/std",
 	"log/std",
 	"pallet-balances/std",
-	"serde",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std"
diff --git a/frame/executive/Cargo.toml b/frame/executive/Cargo.toml
index 97c5a5ffdc76..a923f926a096 100644
--- a/frame/executive/Cargo.toml
+++ b/frame/executive/Cargo.toml
@@ -16,7 +16,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-serde = { version = "1.0.101", optional = true }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
 sp-tracing = { version = "3.0.0", default-features = false, path = "../../primitives/tracing" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
@@ -42,7 +41,6 @@ std = [
 	"codec/std",
 	"frame-support/std",
 	"frame-system/std",
-	"serde",
 	"sp-core/std",
 	"sp-runtime/std",
 	"sp-tracing/std",
diff --git a/frame/gilt/Cargo.toml b/frame/gilt/Cargo.toml
index 4df0dc49aaf9..0b40f6ad4d6d 100644
--- a/frame/gilt/Cargo.toml
+++ b/frame/gilt/Cargo.toml
@@ -13,7 +13,6 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
@@ -30,7 +29,6 @@ pallet-balances = { version = "3.0.0", path = "../balances" }
 [features]
 default = ["std"]
 std = [
-	"serde",
 	"codec/std",
 	"sp-std/std",
 	"sp-runtime/std",
diff --git a/frame/grandpa/Cargo.toml b/frame/grandpa/Cargo.toml
index 547e3966d52a..a602e8b6dadd 100644
--- a/frame/grandpa/Cargo.toml
+++ b/frame/grandpa/Cargo.toml
@@ -13,7 +13,6 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-application-crypto = { version = "3.0.0", default-features = false, path = "../../primitives/application-crypto" }
 sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
@@ -44,7 +43,6 @@ frame-election-provider-support = { version = "3.0.0", path = "../election-provi
 [features]
 default = ["std"]
 std = [
-	"serde",
 	"codec/std",
 	"frame-benchmarking/std",
 	"sp-application-crypto/std",
diff --git a/frame/identity/Cargo.toml b/frame/identity/Cargo.toml
index 08109fda2584..fce79c56f80a 100644
--- a/frame/identity/Cargo.toml
+++ b/frame/identity/Cargo.toml
@@ -13,7 +13,6 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 enumflags2 = { version = "0.6.2" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
@@ -30,7 +29,6 @@ pallet-balances = { version = "3.0.0", path = "../balances" }
 [features]
 default = ["std"]
 std = [
-	"serde",
 	"codec/std",
 	"sp-std/std",
 	"sp-io/std",
diff --git a/frame/im-online/Cargo.toml b/frame/im-online/Cargo.toml
index 4c5b4a8863bc..2e816a6bb856 100644
--- a/frame/im-online/Cargo.toml
+++ b/frame/im-online/Cargo.toml
@@ -18,7 +18,6 @@ pallet-authorship = { version = "3.0.0", default-features = false, path = "../au
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-serde = { version = "1.0.101", optional = true }
 sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
 sp-staking = { version = "3.0.0", default-features = false, path = "../../primitives/staking" }
@@ -39,7 +38,6 @@ std = [
 	"codec/std",
 	"sp-core/std",
 	"sp-std/std",
-	"serde",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-staking/std",
diff --git a/frame/indices/Cargo.toml b/frame/indices/Cargo.toml
index ce9b2053ff18..4b60ec8bc3ca 100644
--- a/frame/indices/Cargo.toml
+++ b/frame/indices/Cargo.toml
@@ -13,7 +13,6 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-keyring = { version = "3.0.0", optional = true, path = "../../primitives/keyring" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
@@ -31,7 +30,6 @@ pallet-balances = { version = "3.0.0", path = "../balances" }
 [features]
 default = ["std"]
 std = [
-	"serde",
 	"sp-keyring",
 	"codec/std",
 	"sp-core/std",
diff --git a/frame/membership/Cargo.toml b/frame/membership/Cargo.toml
index 37e7aa2cb824..b11e0a2b68e4 100644
--- a/frame/membership/Cargo.toml
+++ b/frame/membership/Cargo.toml
@@ -13,7 +13,6 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
@@ -27,7 +26,6 @@ sp-core = { version = "3.0.0", path = "../../primitives/core" }
 [features]
 default = ["std"]
 std = [
-	"serde",
 	"codec/std",
 	"sp-runtime/std",
 	"sp-std/std",
diff --git a/frame/merkle-mountain-range/Cargo.toml b/frame/merkle-mountain-range/Cargo.toml
index 8861ba5c0c8b..6ca451c4ab48 100644
--- a/frame/merkle-mountain-range/Cargo.toml
+++ b/frame/merkle-mountain-range/Cargo.toml
@@ -18,7 +18,6 @@ frame-support = { version = "3.0.0", default-features = false, path = "../suppor
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 mmr-lib = { package = "ckb-merkle-mountain-range", default-features = false, version = "0.3.1" }
 pallet-mmr-primitives = { version = "3.0.0", default-features = false, path = "./primitives" }
-serde = { version = "1.0.101", optional = true }
 sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
 sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
@@ -37,7 +36,6 @@ std = [
 	"frame-system/std",
 	"mmr-lib/std",
 	"pallet-mmr-primitives/std",
-	"serde",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
diff --git a/frame/multisig/Cargo.toml b/frame/multisig/Cargo.toml
index e48f80567f67..7657f64c819f 100644
--- a/frame/multisig/Cargo.toml
+++ b/frame/multisig/Cargo.toml
@@ -13,7 +13,6 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
@@ -31,7 +30,6 @@ pallet-balances = { version = "3.0.0", path = "../balances" }
 [features]
 default = ["std"]
 std = [
-	"serde",
 	"codec/std",
 	"sp-runtime/std",
 	"frame-support/std",
diff --git a/frame/nicks/Cargo.toml b/frame/nicks/Cargo.toml
index 6c8b609b401c..12db6f905f2e 100644
--- a/frame/nicks/Cargo.toml
+++ b/frame/nicks/Cargo.toml
@@ -13,7 +13,6 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
@@ -28,7 +27,6 @@ pallet-balances = { version = "3.0.0", path = "../balances" }
 [features]
 default = ["std"]
 std = [
-	"serde",
 	"codec/std",
 	"sp-std/std",
 	"sp-io/std",
diff --git a/frame/node-authorization/Cargo.toml b/frame/node-authorization/Cargo.toml
index 786eb84d1e52..6e657758e8e9 100644
--- a/frame/node-authorization/Cargo.toml
+++ b/frame/node-authorization/Cargo.toml
@@ -12,7 +12,6 @@ description = "FRAME pallet for node authorization"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
@@ -25,7 +24,6 @@ log = { version = "0.4.14", default-features = false }
 [features]
 default = ["std"]
 std = [
-	"serde",
 	"codec/std",
 	"frame-support/std",
 	"frame-system/std",
diff --git a/frame/proxy/Cargo.toml b/frame/proxy/Cargo.toml
index 2934b9953b31..d8f7afe433cb 100644
--- a/frame/proxy/Cargo.toml
+++ b/frame/proxy/Cargo.toml
@@ -13,7 +13,6 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
@@ -32,7 +31,6 @@ pallet-utility = { version = "3.0.0", path = "../utility" }
 [features]
 default = ["std"]
 std = [
-	"serde",
 	"codec/std",
 	"sp-runtime/std",
 	"frame-support/std",
diff --git a/frame/recovery/Cargo.toml b/frame/recovery/Cargo.toml
index 1f8003bd4d05..acfd2f613f83 100644
--- a/frame/recovery/Cargo.toml
+++ b/frame/recovery/Cargo.toml
@@ -13,7 +13,6 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 enumflags2 = { version = "0.6.2" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
@@ -29,7 +28,6 @@ pallet-balances = { version = "3.0.0", path = "../balances" }
 [features]
 default = ["std"]
 std = [
-	"serde",
 	"codec/std",
 	"sp-std/std",
 	"sp-io/std",
diff --git a/frame/scheduler/Cargo.toml b/frame/scheduler/Cargo.toml
index 4d82133b6af9..8fb5d148662b 100644
--- a/frame/scheduler/Cargo.toml
+++ b/frame/scheduler/Cargo.toml
@@ -10,7 +10,6 @@ description = "FRAME example pallet"
 readme = "README.md"
 
 [dependencies]
-serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
@@ -28,7 +27,6 @@ substrate-test-utils = { version = "3.0.0", path = "../../test-utils" }
 [features]
 default = ["std"]
 std = [
-	"serde",
 	"codec/std",
 	"sp-runtime/std",
 	"frame-benchmarking/std",
diff --git a/frame/scored-pool/Cargo.toml b/frame/scored-pool/Cargo.toml
index 97e3a954d7e2..0b2f4a819883 100644
--- a/frame/scored-pool/Cargo.toml
+++ b/frame/scored-pool/Cargo.toml
@@ -14,7 +14,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.101", optional = true }
 sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
@@ -29,7 +28,6 @@ sp-core = { version = "3.0.0", path = "../../primitives/core" }
 default = ["std"]
 std = [
 	"codec/std",
-	"serde",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
diff --git a/frame/session/Cargo.toml b/frame/session/Cargo.toml
index 52b8ebbdf478..44e1f2f67858 100644
--- a/frame/session/Cargo.toml
+++ b/frame/session/Cargo.toml
@@ -13,7 +13,6 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
@@ -35,7 +34,6 @@ lazy_static = "1.4.0"
 default = ["std", "historical"]
 historical = ["sp-trie"]
 std = [
-	"serde",
 	"codec/std",
 	"sp-std/std",
 	"sp-io/std",
diff --git a/frame/society/Cargo.toml b/frame/society/Cargo.toml
index a3c6dcadab86..f9c299006198 100644
--- a/frame/society/Cargo.toml
+++ b/frame/society/Cargo.toml
@@ -13,7 +13,6 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
@@ -31,7 +30,6 @@ pallet-balances = { version = "3.0.0", path = "../balances" }
 default = ["std"]
 std = [
 	"codec/std",
-	"serde",
 	"sp-runtime/std",
 	"rand_chacha/std",
 	"sp-std/std",
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index c28dbc87bccd..c938dceb76e4 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -313,8 +313,6 @@ use sp_staking::{
 	SessionIndex,
 	offence::{OnOffenceHandler, OffenceDetails, Offence, ReportOffence, OffenceError},
 };
-#[cfg(feature = "std")]
-use sp_runtime::{Serialize, Deserialize};
 use frame_system::{
 	self as system, ensure_signed, ensure_root,
 	offchain::SendTransactionTypes,
@@ -380,7 +378,7 @@ pub struct EraRewardPoints<AccountId: Ord> {
 
 /// Indicates the initial status of the staker.
 #[derive(RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
 pub enum StakerStatus<AccountId> {
 	/// Chilling.
 	Idle,
@@ -793,7 +791,7 @@ pub trait Config: frame_system::Config + SendTransactionTypes<Call<Self>> {
 
 /// Mode of era-forcing.
 #[derive(Copy, Clone, PartialEq, Eq, Encode, Decode, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
 pub enum Forcing {
 	/// Not forcing anything - just let whatever happen.
 	NotForcing,
diff --git a/frame/sudo/Cargo.toml b/frame/sudo/Cargo.toml
index c1b841c30c6a..a73dfaeb1d98 100644
--- a/frame/sudo/Cargo.toml
+++ b/frame/sudo/Cargo.toml
@@ -13,7 +13,6 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
@@ -27,7 +26,6 @@ sp-core = { version = "3.0.0", path = "../../primitives/core" }
 [features]
 default = ["std"]
 std = [
-	"serde",
 	"codec/std",
 	"sp-std/std",
 	"sp-io/std",
diff --git a/frame/support/procedural/src/pallet/expand/genesis_config.rs b/frame/support/procedural/src/pallet/expand/genesis_config.rs
index cc35451b646f..23ccdfa5ddc9 100644
--- a/frame/support/procedural/src/pallet/expand/genesis_config.rs
+++ b/frame/support/procedural/src/pallet/expand/genesis_config.rs
@@ -29,6 +29,8 @@ pub fn expand_genesis_config(def: &mut Def) -> proc_macro2::TokenStream {
 	let genesis_config_item = &mut def.item.content.as_mut()
 		.expect("Checked by def parser").1[genesis_config.index];
 
+	let serde_crate = format!("{}::serde", frame_support);
+
 	match genesis_config_item {
 		syn::Item::Enum(syn::ItemEnum { attrs, ..}) |
 		syn::Item::Struct(syn::ItemStruct { attrs, .. }) |
@@ -50,6 +52,7 @@ pub fn expand_genesis_config(def: &mut Def) -> proc_macro2::TokenStream {
 			attrs.push(syn::parse_quote!( #[serde(deny_unknown_fields)] ));
 			attrs.push(syn::parse_quote!( #[serde(bound(serialize = ""))] ));
 			attrs.push(syn::parse_quote!( #[serde(bound(deserialize = ""))] ));
+			attrs.push(syn::parse_quote!( #[serde(crate = #serde_crate)] ));
 		},
 		_ => unreachable!("Checked by genesis_config parser"),
 	}
diff --git a/frame/support/procedural/src/storage/genesis_config/mod.rs b/frame/support/procedural/src/storage/genesis_config/mod.rs
index 87dfabcefbaa..6dfa5a13fe5b 100644
--- a/frame/support/procedural/src/storage/genesis_config/mod.rs
+++ b/frame/support/procedural/src/storage/genesis_config/mod.rs
@@ -65,6 +65,7 @@ fn decl_genesis_config_and_impl_default(
 	let genesis_struct = &genesis_config.genesis_struct;
 	let genesis_impl = &genesis_config.genesis_impl;
 	let genesis_where_clause = &genesis_config.genesis_where_clause;
+	let serde_crate = format!("{}::serde", scrate);
 
 	quote!(
 		/// Genesis config for the module, allow to build genesis storage.
@@ -72,6 +73,7 @@ fn decl_genesis_config_and_impl_default(
 		#[cfg(feature = "std")]
 		#[serde(rename_all = "camelCase")]
 		#[serde(deny_unknown_fields)]
+		#[serde(crate = #serde_crate)]
 		#serde_bug_bound
 		pub struct GenesisConfig#genesis_struct_decl #genesis_where_clause {
 			#( #config_fields )*
diff --git a/frame/support/src/genesis_config.rs b/frame/support/src/genesis_config.rs
index 3f7f943603e4..e6ba86f9fe92 100644
--- a/frame/support/src/genesis_config.rs
+++ b/frame/support/src/genesis_config.rs
@@ -76,10 +76,13 @@ macro_rules! impl_outer_config {
 		}
 
 		$crate::paste::item! {
+			#[cfg(any(feature = "std", test))]
+			use $crate::serde as __genesis_config_serde_import__;
 			#[cfg(any(feature = "std", test))]
 			#[derive($crate::serde::Serialize, $crate::serde::Deserialize, Default)]
 			#[serde(rename_all = "camelCase")]
 			#[serde(deny_unknown_fields)]
+			#[serde(crate = "__genesis_config_serde_import__")]
 			pub struct $main {
 				$(
 					pub [< $snake $(_ $instance )? >]: $config,
diff --git a/frame/timestamp/Cargo.toml b/frame/timestamp/Cargo.toml
index 01aa6ff3cf26..05ea8e40c662 100644
--- a/frame/timestamp/Cargo.toml
+++ b/frame/timestamp/Cargo.toml
@@ -15,7 +15,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 
 [dependencies]
-serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io", optional = true }
@@ -41,7 +40,6 @@ std = [
 	"sp-runtime/std",
 	"frame-benchmarking/std",
 	"frame-support/std",
-	"serde",
 	"frame-system/std",
 	"sp-timestamp/std",
 	"log/std",
diff --git a/frame/treasury/src/lib.rs b/frame/treasury/src/lib.rs
index bda4c761b55c..7de193dd6984 100644
--- a/frame/treasury/src/lib.rs
+++ b/frame/treasury/src/lib.rs
@@ -63,8 +63,6 @@ mod benchmarking;
 
 pub mod weights;
 
-#[cfg(feature = "std")]
-use serde::{Serialize, Deserialize};
 use sp_std::prelude::*;
 use frame_support::{decl_module, decl_storage, decl_event, ensure, print, decl_error, PalletId};
 use frame_support::traits::{
@@ -158,7 +156,7 @@ pub trait SpendFunds<T: Config<I>, I=DefaultInstance> {
 pub type ProposalIndex = u32;
 
 /// A spending proposal.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
 #[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug)]
 pub struct Proposal<AccountId, Balance> {
 	/// The account proposing it.
diff --git a/frame/utility/Cargo.toml b/frame/utility/Cargo.toml
index f55cff4d653c..1eb92df4ecaa 100644
--- a/frame/utility/Cargo.toml
+++ b/frame/utility/Cargo.toml
@@ -13,7 +13,6 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
@@ -31,7 +30,6 @@ pallet-balances = { version = "3.0.0", path = "../balances" }
 [features]
 default = ["std"]
 std = [
-	"serde",
 	"codec/std",
 	"sp-runtime/std",
 	"frame-support/std",
diff --git a/frame/vesting/Cargo.toml b/frame/vesting/Cargo.toml
index e1335237eb50..25890fea038d 100644
--- a/frame/vesting/Cargo.toml
+++ b/frame/vesting/Cargo.toml
@@ -13,7 +13,6 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 enumflags2 = { version = "0.6.2" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
@@ -32,7 +31,6 @@ hex-literal = "0.3.1"
 [features]
 default = ["std"]
 std = [
-	"serde",
 	"codec/std",
 	"sp-std/std",
 	"sp-runtime/std",
diff --git a/primitives/runtime/src/traits.rs b/primitives/runtime/src/traits.rs
index 2c4572ac3511..41820d8cb4a1 100644
--- a/primitives/runtime/src/traits.rs
+++ b/primitives/runtime/src/traits.rs
@@ -1217,19 +1217,24 @@ macro_rules! impl_opaque_keys {
 			)*
 		}
 	) => {
-		$( #[ $attr ] )*
-		#[derive(
-			Default, Clone, PartialEq, Eq,
-			$crate::codec::Encode,
-			$crate::codec::Decode,
-			$crate::RuntimeDebug,
-		)]
-		#[cfg_attr(feature = "std", derive($crate::serde::Serialize, $crate::serde::Deserialize))]
-		pub struct $name {
-			$(
-				$( #[ $inner_attr ] )*
-				pub $field: <$type as $crate::BoundToRuntimeAppPublic>::Public,
-			)*
+		$crate::paste::paste! {
+			#[cfg(feature = "std")]
+			use $crate::serde as [< __opaque_keys_serde_import__ $name >];
+			$( #[ $attr ] )*
+				#[derive(
+					Default, Clone, PartialEq, Eq,
+					$crate::codec::Encode,
+					$crate::codec::Decode,
+					$crate::RuntimeDebug,
+				)]
+			#[cfg_attr(feature = "std", derive($crate::serde::Serialize, $crate::serde::Deserialize))]
+			#[cfg_attr(feature = "std", serde(crate = "__opaque_keys_serde_import__" $name))]
+			pub struct $name {
+				$(
+					$( #[ $inner_attr ] )*
+						pub $field: <$type as $crate::BoundToRuntimeAppPublic>::Public,
+				)*
+			}
 		}
 
 		impl $name {

From 22f09c602704aeee2b59b14f427f73f6cb8b5e2f Mon Sep 17 00:00:00 2001
From: Denis Pisarev <denis.pisarev@parity.io>
Date: Fri, 16 Apr 2021 21:35:08 +0200
Subject: [PATCH 0654/1194] CI updates (#8633)

* CI: opt bench jobs; add bench to triggered job

* CI: no need in manual builds; build=publish

* CI: more logs to the trigger job

* CI: DAGs and louts
---
 .gitlab-ci.yml                       | 47 ++++++++++------------------
 .maintain/gitlab/trigger_pipeline.sh | 19 ++++++-----
 2 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c0d783801448..9de2f79b03bc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -105,18 +105,6 @@ default:
     - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
 
 .build-refs:                       &build-refs
-  rules:
-    # .publish-refs with manual on PRs
-    - if: $CI_PIPELINE_SOURCE == "pipeline"
-      when: never
-    - if: $CI_PIPELINE_SOURCE == "web"
-    - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
-      when: manual
-      allow_failure: true
-
-.publish-refs:                     &publish-refs
   rules:
     - if: $CI_PIPELINE_SOURCE == "pipeline"
       when: never
@@ -131,11 +119,13 @@ default:
     - if: $CI_COMMIT_REF_NAME == "master" && $CI_PIPELINE_SOURCE == "schedule" && $PIPELINE == "nightly"
 
 .merge-ref-into-master-script:     &merge-ref-into-master-script
-  - git fetch origin +master:master
-  - git fetch origin +$CI_COMMIT_REF_NAME:$CI_COMMIT_REF_NAME
-  - git checkout master
-  - git config user.email "ci@gitlab.parity.io"
-  - git merge $CI_COMMIT_REF_NAME --verbose --no-edit
+  - if [ $CI_COMMIT_REF_NAME != "master" ]; then
+      git fetch origin +master:master;
+      git fetch origin +$CI_COMMIT_REF_NAME:$CI_COMMIT_REF_NAME;
+      git checkout master;
+      git config user.email "ci@gitlab.parity.io";
+      git merge $CI_COMMIT_REF_NAME --verbose --no-edit;
+    fi
 
 .cargo-check-benches-script:       &cargo-check-benches-script
   - mkdir -p artifacts/benches/$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA
@@ -244,17 +234,10 @@ cargo-deny:
 cargo-check-benches:
   stage:                           test
   <<:                              *docker-env
-  <<:                              *test-refs-no-trigger
-  <<:                              *collect-artifacts
-  script:
-    - *cargo-check-benches-script
-
-cargo-check-benches-merged:
-  stage:                           test
-  <<:                              *docker-env
-  <<:                              *test-refs-no-trigger-prs-only
+  <<:                              *test-refs
   <<:                              *collect-artifacts
   before_script:
+    # merges in the master branch on PRs
     - *merge-ref-into-master-script
     - *rust-info-script
   script:
@@ -268,8 +251,10 @@ node-bench-regression-guard:
   <<:                              *docker-env
   <<:                              *test-refs-no-trigger-prs-only
   needs:
-    - job:                         cargo-check-benches-merged
+    # this is a DAG
+    - job:                         cargo-check-benches
       artifacts:                   true
+    # this does not like a DAG, just polls the artifact
     - project:                     $CI_PROJECT_PATH
       job:                         cargo-check-benches
       ref:                         master
@@ -550,7 +535,7 @@ build-rust-doc:
 #### stage:                        publish
 
 .build-push-docker-image:          &build-push-docker-image
-  <<:                              *publish-refs
+  <<:                              *build-refs
   <<:                              *kubernetes-build
   image:                           quay.io/buildah/stable
   variables:                       &docker-build-vars
@@ -612,7 +597,7 @@ publish-docker-subkey:
 
 publish-s3-release:
   stage:                           publish
-  <<:                              *publish-refs
+  <<:                              *build-refs
   <<:                              *kubernetes-build
   needs:
     - job:                         build-linux-substrate
@@ -641,7 +626,7 @@ publish-s3-doc:
       artifacts:                   true
     - job:                         build-linux-substrate
       artifacts:                   false
-  <<:                              *publish-refs
+  <<:                              *build-refs
   <<:                              *kubernetes-build
   variables:
     GIT_STRATEGY:                  none
@@ -713,6 +698,8 @@ trigger-simnet:
   stage:                           deploy
   image:                           paritytech/tools:latest
   rules:
+    - if: $CI_PIPELINE_SOURCE == "pipeline"
+      when: never
     - if: $CI_PIPELINE_SOURCE == "web" && $CI_COMMIT_REF_NAME == "master"
     - if: $CI_COMMIT_REF_NAME == "master"
   needs:
diff --git a/.maintain/gitlab/trigger_pipeline.sh b/.maintain/gitlab/trigger_pipeline.sh
index a2678bfa4875..dd9da8102d53 100755
--- a/.maintain/gitlab/trigger_pipeline.sh
+++ b/.maintain/gitlab/trigger_pipeline.sh
@@ -2,6 +2,8 @@
 
 set -eu
 # API trigger another project's pipeline
+echo "Triggering Simnet pipeline."
+
 curl --silent \
     -X POST \
     -F "token=${CI_JOB_TOKEN}" \
@@ -14,10 +16,11 @@ curl --silent \
         tee pipeline
 
 PIPELINE_ID=$(cat pipeline | jq ".id")
-echo "\nWaiting on ${PIPELINE_ID} status..."
+PIPELINE_URL=$(cat pipeline | jq ".web_url")
+echo
+echo "Simnet pipeline ${PIPELINE_URL} was successfully triggered."
+echo "Now we're polling it to obtain the distinguished status."
 
-# This part polls for the triggered pipeline status, the native
-# `trigger` job does not return this status via API.
 # This is a workaround for a Gitlab bug, waits here until
 # https://gitlab.com/gitlab-org/gitlab/-/issues/326137 gets fixed.
 # The timeout is 360 curls with 8 sec interval, roughly an hour.
@@ -29,17 +32,19 @@ function get_status() {
             jq --raw-output ".status";
 }
 
+echo "Waiting on ${PIPELINE_ID} status..."
+
 for i in $(seq 1 360); do
     STATUS=$(get_status);
     echo "Triggered pipeline status is ${STATUS}";
     if [[ ${STATUS} =~ ^(pending|running|created)$ ]]; then
-        echo "Busy...";
+        echo "${STATUS}"...";
     elif [[ ${STATUS} =~ ^(failed|canceled|skipped|manual)$ ]]; then
-        exit 1;
+        echo "Oh noes! Something's broken in: ${PIPELINE_URL}"; exit 1;
     elif [[ ${STATUS} =~ ^(success)$ ]]; then
-        exit 0;
+        echo "Look how green it is: ${PIPELINE_URL}"; exit 0;
     else
-        exit 1;
+        echo "Something else has happened in ${PIPELINE_URL}"; exit 1;
     fi
 sleep 8;
 done

From 9531a1ac16753bcd9c7829e5b9e0582198c9bf01 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Sat, 17 Apr 2021 17:01:31 +0200
Subject: [PATCH 0655/1194] fix doc and dyn (#8631)

---
 frame/support/src/lib.rs                 | 4 ++--
 frame/support/src/storage/bounded_vec.rs | 6 +++---
 primitives/externalities/src/lib.rs      | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 6740e0db5a0e..5aa688ba28c3 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -99,8 +99,8 @@ impl TypeId for PalletId {
 	const TYPE_ID: [u8; 4] = *b"modl";
 }
 
-/// Generate a new type alias for [`storage::types::value::StorageValue`],
-/// [`storage::types::value::StorageMap`] and [`storage::types::value::StorageDoubleMap`].
+/// Generate a new type alias for [`storage::types::StorageValue`],
+/// [`storage::types::StorageMap`] and [`storage::types::StorageDoubleMap`].
 ///
 /// Useful for creating a *storage-like* struct for test and migrations.
 ///
diff --git a/frame/support/src/storage/bounded_vec.rs b/frame/support/src/storage/bounded_vec.rs
index 44e3f30a7b31..9fcfe4035294 100644
--- a/frame/support/src/storage/bounded_vec.rs
+++ b/frame/support/src/storage/bounded_vec.rs
@@ -214,7 +214,7 @@ impl<T: BoundedVecValue, S: Get<u32>> codec::DecodeLength for BoundedVec<T, S> {
 
 impl<T: BoundedVecValue, S: Get<u32>> StorageDecodeLength for BoundedVec<T, S> {}
 
-/// Storage value that is *maybe* capable of [`StorageAppend`].
+/// Storage value that is *maybe* capable of [`StorageAppend`](crate::storage::StorageAppend).
 pub trait TryAppendValue<T: BoundedVecValue, S: Get<u32>> {
 	/// Try and append the `item` into the storage item.
 	///
@@ -222,7 +222,7 @@ pub trait TryAppendValue<T: BoundedVecValue, S: Get<u32>> {
 	fn try_append<LikeT: EncodeLike<T>>(item: LikeT) -> Result<(), ()>;
 }
 
-/// Storage map that is *maybe* capable of [`StorageAppend`].
+/// Storage map that is *maybe* capable of [`StorageAppend`](crate::storage::StorageAppend).
 pub trait TryAppendMap<K: FullCodec, T: BoundedVecValue, S: Get<u32>> {
 	/// Try and append the `item` into the storage map at the given `key`.
 	///
@@ -233,7 +233,7 @@ pub trait TryAppendMap<K: FullCodec, T: BoundedVecValue, S: Get<u32>> {
 	) -> Result<(), ()>;
 }
 
-/// Storage double map that is *maybe* capable of [`StorageAppend`].
+/// Storage double map that is *maybe* capable of [`StorageAppend`](crate::storage::StorageAppend).
 pub trait TryAppendDoubleMap<K1: FullCodec, K2: FullCodec, T: BoundedVecValue, S: Get<u32>> {
 	/// Try and append the `item` into the storage double map at the given `key`.
 	///
diff --git a/primitives/externalities/src/lib.rs b/primitives/externalities/src/lib.rs
index c90881b76e26..ce5a0990d738 100644
--- a/primitives/externalities/src/lib.rs
+++ b/primitives/externalities/src/lib.rs
@@ -312,7 +312,7 @@ pub trait ExternalitiesExt {
 
 impl ExternalitiesExt for &mut dyn Externalities {
 	fn extension<T: Any + Extension>(&mut self) -> Option<&mut T> {
-		self.extension_by_type_id(TypeId::of::<T>()).and_then(Any::downcast_mut)
+		self.extension_by_type_id(TypeId::of::<T>()).and_then(<dyn Any>::downcast_mut)
 	}
 
 	fn register_extension<T: Extension>(&mut self, ext: T) -> Result<(), Error> {

From 6a76627bd900443c4a9639e7b21f92816ed9b8b9 Mon Sep 17 00:00:00 2001
From: ferrell-code <70108835+ferrell-code@users.noreply.github.com>
Date: Sat, 17 Apr 2021 22:23:27 -0400
Subject: [PATCH 0656/1194] Authority Discovery to FRAME v2 (#8620)

* migrate to new macro

* formatting

* Apply suggestions from code review

* Update frame/authority-discovery/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
---
 frame/authority-discovery/src/lib.rs | 115 +++++++++++++++++++--------
 1 file changed, 84 insertions(+), 31 deletions(-)

diff --git a/frame/authority-discovery/src/lib.rs b/frame/authority-discovery/src/lib.rs
index 93466d4f3509..6b7608b10c3b 100644
--- a/frame/authority-discovery/src/lib.rs
+++ b/frame/authority-discovery/src/lib.rs
@@ -15,45 +15,87 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! # Authority discovery module.
+//! # Authority discovery pallet.
 //!
-//! This module is used by the `client/authority-discovery` and by polkadot's parachain logic
+//! This pallet is used by the `client/authority-discovery` and by polkadot's parachain logic
 //! to retrieve the current and the next set of authorities.
 
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use sp_std::prelude::*;
-use frame_support::{decl_module, decl_storage, traits::OneSessionHandler};
+use frame_support::traits::OneSessionHandler;
+#[cfg(feature = "std")]
+use frame_support::traits::GenesisBuild;
 use sp_authority_discovery::AuthorityId;
 
-/// The module's config trait.
-pub trait Config: frame_system::Config + pallet_session::Config {}
+pub use pallet::*;
 
-decl_storage! {
-	trait Store for Module<T: Config> as AuthorityDiscovery {
-		/// Keys of the current authority set.
-		Keys get(fn keys): Vec<AuthorityId>;
-		/// Keys of the next authority set.
-		NextKeys get(fn next_keys): Vec<AuthorityId>;
-	}
-	add_extra_genesis {
-		config(keys): Vec<AuthorityId>;
-		build(|config| Module::<T>::initialize_keys(&config.keys))
+#[frame_support::pallet]
+pub mod pallet {
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+	use super::*;
+
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(_);
+
+	#[pallet::config]
+	/// The pallet's config trait.
+	pub trait Config: frame_system::Config + pallet_session::Config {}
+
+	#[pallet::storage]
+	#[pallet::getter(fn keys)]
+	/// Keys of the current authority set.
+	pub(super) type Keys<T: Config> = StorageValue<
+		_,
+		Vec<AuthorityId>,
+		ValueQuery,
+	>;
+	
+	#[pallet::storage]
+	#[pallet::getter(fn next_keys)]
+	/// Keys of the next authority set.
+	pub(super) type NextKeys<T: Config> = StorageValue<
+		_,
+		Vec<AuthorityId>,
+		ValueQuery,
+	>;
+
+	#[pallet::genesis_config]
+	pub struct GenesisConfig {
+		pub keys: Vec<AuthorityId>,
 	}
-}
 
-decl_module! {
-	pub struct Module<T: Config> for enum Call where origin: T::Origin {
+	#[cfg(feature = "std")]
+	impl Default for GenesisConfig {
+		fn default() -> Self {
+			Self {
+				keys: Default::default(),
+			}
+		}
+	}
+	#[pallet::genesis_build]
+	impl<T: Config> GenesisBuild<T> for GenesisConfig {
+		fn build(&self) {
+			Pallet::<T>::initialize_keys(&self.keys)
+		}
 	}
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
 }
 
-impl<T: Config> Module<T> {
+impl<T: Config> Pallet<T> {
 	/// Retrieve authority identifiers of the current and next authority set
 	/// sorted and deduplicated.
 	pub fn authorities() -> Vec<AuthorityId> {
-		let mut keys = Keys::get();
-		let next = NextKeys::get();
+		let mut keys = Keys::<T>::get();
+		let next = NextKeys::<T>::get();
 
 		keys.extend(next);
 		keys.sort();
@@ -64,28 +106,28 @@ impl<T: Config> Module<T> {
 
 	/// Retrieve authority identifiers of the current authority set in the original order.
 	pub fn current_authorities() -> Vec<AuthorityId> {
-		Keys::get()
+		Keys::<T>::get()
 	}
 
 	/// Retrieve authority identifiers of the next authority set in the original order.
 	pub fn next_authorities() -> Vec<AuthorityId> {
-		NextKeys::get()
+		NextKeys::<T>::get()
 	}
 
 	fn initialize_keys(keys: &[AuthorityId]) {
 		if !keys.is_empty() {
-			assert!(Keys::get().is_empty(), "Keys are already initialized!");
-			Keys::put(keys);
-			NextKeys::put(keys);
+			assert!(Keys::<T>::get().is_empty(), "Keys are already initialized!");
+			Keys::<T>::put(keys);
+			NextKeys::<T>::put(keys);
 		}
 	}
 }
 
-impl<T: Config> sp_runtime::BoundToRuntimeAppPublic for Module<T> {
+impl<T: Config> sp_runtime::BoundToRuntimeAppPublic for Pallet<T> {
 	type Public = AuthorityId;
 }
 
-impl<T: Config> OneSessionHandler<T::AccountId> for Module<T> {
+impl<T: Config> OneSessionHandler<T::AccountId> for Pallet<T> {
 	type Key = AuthorityId;
 
 	fn on_genesis_session<'a, I: 'a>(authorities: I)
@@ -102,9 +144,9 @@ impl<T: Config> OneSessionHandler<T::AccountId> for Module<T> {
 		// Remember who the authorities are for the new and next session.
 		if changed {
 			let keys = validators.map(|x| x.1);
-			Keys::put(keys.collect::<Vec<_>>());
+			Keys::<T>::put(keys.collect::<Vec<_>>());
 			let next_keys = queued_validators.map(|x| x.1);
-			NextKeys::put(next_keys.collect::<Vec<_>>());
+			NextKeys::<T>::put(next_keys.collect::<Vec<_>>());
 		}
 	}
 
@@ -113,6 +155,17 @@ impl<T: Config> OneSessionHandler<T::AccountId> for Module<T> {
 	}
 }
 
+#[cfg(feature = "std")]
+impl GenesisConfig {
+	/// Direct implementation of `GenesisBuild::assimilate_storage`.
+	pub fn assimilate_storage<T: Config>(
+		&self,
+		storage: &mut sp_runtime::Storage
+	) -> Result<(), String> {
+		<Self as GenesisBuild<T>>::assimilate_storage(self, storage)
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use crate as pallet_authority_discovery;
@@ -221,7 +274,7 @@ mod tests {
 
 	#[test]
 	fn authorities_returns_current_and_next_authority_set() {
-		// The whole authority discovery module ignores account ids, but we still need them for
+		// The whole authority discovery pallet ignores account ids, but we still need them for
 		// `pallet_session::OneSessionHandler::on_new_session`, thus its safe to use the same value
 		// everywhere.
 		let account_id = AuthorityPair::from_seed_slice(vec![10; 32].as_ref()).unwrap().public();

From 46a64ac817ec909c66203a7e0715ee111762d3f7 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Sun, 18 Apr 2021 06:52:05 +0200
Subject: [PATCH 0657/1194] Add benchmarks for pallet-membership (#8596)

* Add benchmakrs for membership

* Update frame/membership/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Make it all work

* Add mock weights

* Update frame/membership/src/lib.rs

* Update frame/membership/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_membership --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/membership/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_membership --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/membership/src/weights.rs --template=./.maintain/frame-weight-template.hbs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
---
 Cargo.lock                                   |   2 +
 bin/node/runtime/Cargo.toml                  |   1 +
 bin/node/runtime/src/lib.rs                  |   3 +
 frame/benchmarking/src/lib.rs                |  10 +
 frame/elections-phragmen/src/benchmarking.rs |  10 +-
 frame/im-online/src/weights.rs               |   5 -
 frame/membership/Cargo.toml                  |  15 +-
 frame/membership/src/lib.rs                  | 212 ++++++++++++++++++-
 frame/membership/src/weights.rs              | 159 ++++++++++++++
 9 files changed, 392 insertions(+), 25 deletions(-)
 create mode 100644 frame/membership/src/weights.rs

diff --git a/Cargo.lock b/Cargo.lock
index cec17f7f9676..f02830e0c8ad 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5091,8 +5091,10 @@ dependencies = [
 name = "pallet-membership"
 version = "3.0.0"
 dependencies = [
+ "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "log",
  "parity-scale-codec",
  "sp-core",
  "sp-io",
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index edf7109bacb7..9d7218696654 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -180,6 +180,7 @@ runtime-benchmarks = [
 	"pallet-im-online/runtime-benchmarks",
 	"pallet-indices/runtime-benchmarks",
 	"pallet-lottery/runtime-benchmarks",
+	"pallet-membership/runtime-benchmarks",
 	"pallet-mmr/runtime-benchmarks",
 	"pallet-multisig/runtime-benchmarks",
 	"pallet-proxy/runtime-benchmarks",
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index b2a59d587db9..648bbff63304 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -698,6 +698,8 @@ impl pallet_membership::Config<pallet_membership::Instance1> for Runtime {
 	type PrimeOrigin = EnsureRootOrHalfCouncil;
 	type MembershipInitialized = TechnicalCommittee;
 	type MembershipChanged = TechnicalCommittee;
+	type MaxMembers = TechnicalMaxMembers;
+	type WeightInfo = pallet_membership::weights::SubstrateWeight<Runtime>;
 }
 
 parameter_types! {
@@ -1500,6 +1502,7 @@ impl_runtime_apis! {
 			add_benchmark!(params, batches, pallet_im_online, ImOnline);
 			add_benchmark!(params, batches, pallet_indices, Indices);
 			add_benchmark!(params, batches, pallet_lottery, Lottery);
+			add_benchmark!(params, batches, pallet_membership, TechnicalMembership);
 			add_benchmark!(params, batches, pallet_mmr, Mmr);
 			add_benchmark!(params, batches, pallet_multisig, Multisig);
 			add_benchmark!(params, batches, pallet_offences, OffencesBench::<Runtime>);
diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
index ea1bfbd68104..63f65db36665 100644
--- a/frame/benchmarking/src/lib.rs
+++ b/frame/benchmarking/src/lib.rs
@@ -42,6 +42,16 @@ pub use sp_storage::TrackedStorageKey;
 #[doc(hidden)]
 pub use log;
 
+/// Whitelist the given account.
+#[macro_export]
+macro_rules! whitelist {
+	($acc:ident) => {
+		frame_benchmarking::benchmarking::add_to_whitelist(
+			frame_system::Account::<T>::hashed_key_for(&$acc).into()
+		);
+	};
+}
+
 /// Construct pallet benchmarks for weighing dispatchables.
 ///
 /// Works around the idea of complexity parameters, named by a single letter (which is usually
diff --git a/frame/elections-phragmen/src/benchmarking.rs b/frame/elections-phragmen/src/benchmarking.rs
index cfdcd8020795..39e04dcc2dab 100644
--- a/frame/elections-phragmen/src/benchmarking.rs
+++ b/frame/elections-phragmen/src/benchmarking.rs
@@ -22,7 +22,7 @@
 use super::*;
 
 use frame_system::RawOrigin;
-use frame_benchmarking::{benchmarks, account, impl_benchmark_test_suite};
+use frame_benchmarking::{benchmarks, account, whitelist, impl_benchmark_test_suite};
 use frame_support::traits::OnInitialize;
 
 use crate::Module as Elections;
@@ -33,14 +33,6 @@ const MAX_CANDIDATES: u32 = 200;
 
 type Lookup<T> = <<T as frame_system::Config>::Lookup as StaticLookup>::Source;
 
-macro_rules! whitelist {
-	($acc:ident) => {
-		frame_benchmarking::benchmarking::add_to_whitelist(
-			frame_system::Account::<T>::hashed_key_for(&$acc).into()
-		);
-	};
-}
-
 /// grab new account with infinite balance.
 fn endowed_account<T: Config>(name: &'static str, index: u32) -> T::AccountId {
 	let account: T::AccountId = account(name, index, 0);
diff --git a/frame/im-online/src/weights.rs b/frame/im-online/src/weights.rs
index 147ce11682b7..83ec294e8edb 100644
--- a/frame/im-online/src/weights.rs
+++ b/frame/im-online/src/weights.rs
@@ -44,7 +44,6 @@ use sp_std::marker::PhantomData;
 /// Weight functions needed for pallet_im_online.
 pub trait WeightInfo {
 	fn validate_unsigned_and_then_heartbeat(k: u32, e: u32, ) -> Weight;
-	
 }
 
 /// Weights for pallet_im_online using the Substrate node and recommended hardware.
@@ -56,9 +55,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 			.saturating_add((481_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
-	
 }
 
 // For backwards compatibility and tests
@@ -69,7 +66,5 @@ impl WeightInfo for () {
 			.saturating_add((481_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
-	
 }
diff --git a/frame/membership/Cargo.toml b/frame/membership/Cargo.toml
index b11e0a2b68e4..37f9552598cc 100644
--- a/frame/membership/Cargo.toml
+++ b/frame/membership/Cargo.toml
@@ -14,11 +14,14 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
+log = { version = "0.4.0", default-features = false }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+
+frame-benchmarking = { version = "3.1.0", optional = true, default-features = false, path = "../benchmarking" }
 
 [dev-dependencies]
 sp-core = { version = "3.0.0", path = "../../primitives/core" }
@@ -27,10 +30,18 @@ sp-core = { version = "3.0.0", path = "../../primitives/core" }
 default = ["std"]
 std = [
 	"codec/std",
-	"sp-runtime/std",
+	"log/std",
 	"sp-std/std",
 	"sp-io/std",
+	"sp-runtime/std",
 	"frame-support/std",
 	"frame-system/std",
+	"frame-benchmarking/std",
+]
+runtime-benchmarks = [
+	"frame-benchmarking",
+	"sp-runtime/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
 ]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/membership/src/lib.rs b/frame/membership/src/lib.rs
index 7ad7d6a5435e..62c9e5eae1a6 100644
--- a/frame/membership/src/lib.rs
+++ b/frame/membership/src/lib.rs
@@ -18,7 +18,7 @@
 //! # Membership Module
 //!
 //! Allows control of membership of a set of `AccountId`s, useful for managing membership of of a
-//! collective. A prime member may be set.
+//! collective. A prime member may be set
 
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
@@ -26,11 +26,14 @@
 use sp_std::prelude::*;
 use frame_support::{
 	decl_module, decl_storage, decl_event, decl_error,
-	traits::{ChangeMembers, InitializeMembers, EnsureOrigin, Contains, SortedMembers},
+	traits::{ChangeMembers, InitializeMembers, EnsureOrigin, Contains, SortedMembers, Get},
 };
 use frame_system::ensure_signed;
 
-pub trait Config<I=DefaultInstance>: frame_system::Config {
+pub mod weights;
+pub use weights::WeightInfo;
+
+pub trait Config<I = DefaultInstance>: frame_system::Config {
 	/// The overarching event type.
 	type Event: From<Event<Self, I>> + Into<<Self as frame_system::Config>::Event>;
 
@@ -56,6 +59,16 @@ pub trait Config<I=DefaultInstance>: frame_system::Config {
 
 	/// The receiver of the signal for when the membership has changed.
 	type MembershipChanged: ChangeMembers<Self::AccountId>;
+
+	/// The maximum number of members that this membership can have.
+	///
+	/// This is used for benchmarking. Re-run the benchmarks if this changes.
+	///
+	/// This is not enforced in the code; the membership size can exceed this limit.
+	type MaxMembers: Get<u32>;
+
+	/// Weight information for extrinsics in this pallet.
+	type WeightInfo: WeightInfo;
 }
 
 decl_storage! {
@@ -127,6 +140,8 @@ decl_module! {
 			let mut members = <Members<T, I>>::get();
 			let location = members.binary_search(&who).err().ok_or(Error::<T, I>::AlreadyMember)?;
 			members.insert(location, who.clone());
+
+			Self::maybe_warn_max_members(&members);
 			<Members<T, I>>::put(&members);
 
 			T::MembershipChanged::change_members_sorted(&[who], &[], &members[..]);
@@ -144,6 +159,8 @@ decl_module! {
 			let mut members = <Members<T, I>>::get();
 			let location = members.binary_search(&who).ok().ok_or(Error::<T, I>::NotMember)?;
 			members.remove(location);
+
+			Self::maybe_warn_max_members(&members);
 			<Members<T, I>>::put(&members);
 
 			T::MembershipChanged::change_members_sorted(&[], &[who], &members[..]);
@@ -168,6 +185,8 @@ decl_module! {
 			let _ = members.binary_search(&add).err().ok_or(Error::<T, I>::AlreadyMember)?;
 			members[location] = add.clone();
 			members.sort();
+
+			Self::maybe_warn_max_members(&members);
 			<Members<T, I>>::put(&members);
 
 			T::MembershipChanged::change_members_sorted(
@@ -193,10 +212,10 @@ decl_module! {
 			<Members<T, I>>::mutate(|m| {
 				T::MembershipChanged::set_members_sorted(&members[..], m);
 				Self::rejig_prime(&members);
+				Self::maybe_warn_max_members(&members);
 				*m = members;
 			});
 
-
 			Self::deposit_event(RawEvent::MembersReset);
 		}
 
@@ -215,6 +234,8 @@ decl_module! {
 				let _ = members.binary_search(&new).err().ok_or(Error::<T, I>::AlreadyMember)?;
 				members[location] = new.clone();
 				members.sort();
+
+				Self::maybe_warn_max_members(&members);
 				<Members<T, I>>::put(&members);
 
 				T::MembershipChanged::change_members_sorted(
@@ -264,6 +285,17 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 			}
 		}
 	}
+
+	fn maybe_warn_max_members(members: &[T::AccountId]) {
+		if members.len() as u32 > T::MaxMembers::get() {
+			log::error!(
+				target: "runtime::membership",
+				"maximum number of members used for weight is exceeded, weights can be underestimated [{} > {}].",
+				members.len(),
+				T::MaxMembers::get(),
+			)
+		}
+	}
 }
 
 impl<T: Config<I>, I: Instance> Contains<T::AccountId> for Module<T, I> {
@@ -282,6 +314,149 @@ impl<T: Config<I>, I: Instance> SortedMembers<T::AccountId> for Module<T, I> {
 	}
 }
 
+#[cfg(feature = "runtime-benchmarks")]
+mod benchmark {
+	use super::{*, Module as Membership};
+	use frame_system::RawOrigin;
+	use frame_support::{traits::EnsureOrigin, assert_ok};
+	use frame_benchmarking::{benchmarks_instance, whitelist, account, impl_benchmark_test_suite};
+
+	const SEED: u32 = 0;
+
+	fn set_members<T: Config<I>, I: Instance>(members: Vec<T::AccountId>, prime: Option<usize>) {
+		let reset_origin = T::ResetOrigin::successful_origin();
+		let prime_origin = T::PrimeOrigin::successful_origin();
+
+		assert_ok!(<Membership<T, _>>::reset_members(reset_origin, members.clone()));
+		if let Some(prime) = prime.map(|i| members[i].clone()) {
+			assert_ok!(<Membership<T, _>>::set_prime(prime_origin, prime));
+		} else {
+			assert_ok!(<Membership<T, _>>::clear_prime(prime_origin));
+		}
+	}
+
+	benchmarks_instance! {
+		add_member {
+			let m in 1 .. T::MaxMembers::get();
+
+			let members = (0..m).map(|i| account("member", i, SEED)).collect::<Vec<T::AccountId>>();
+			set_members::<T, I>(members.clone(), None);
+			let new_member = account::<T::AccountId>("add", m, SEED);
+		}: {
+			assert_ok!(<Membership<T, _>>::add_member(T::AddOrigin::successful_origin(), new_member.clone()));
+		}
+		verify {
+			assert!(<Members<T, _>>::get().contains(&new_member));
+			#[cfg(test)] crate::tests::clean();
+		}
+
+		// the case of no prime or the prime being removed is surely cheaper than the case of
+		// reporting a new prime via `MembershipChanged`.
+		remove_member {
+			let m in 2 .. T::MaxMembers::get();
+
+			let members = (0..m).map(|i| account("member", i, SEED)).collect::<Vec<T::AccountId>>();
+			set_members::<T, I>(members.clone(), Some(members.len() - 1));
+
+			let to_remove = members.first().cloned().unwrap();
+		}: {
+			assert_ok!(<Membership<T, _>>::remove_member(T::RemoveOrigin::successful_origin(), to_remove.clone()));
+		} verify {
+			assert!(!<Members<T, _>>::get().contains(&to_remove));
+			// prime is rejigged
+			assert!(<Prime<T, _>>::get().is_some() && T::MembershipChanged::get_prime().is_some());
+			#[cfg(test)] crate::tests::clean();
+		}
+
+		// we remove a non-prime to make sure it needs to be set again.
+		swap_member {
+			let m in 2 .. T::MaxMembers::get();
+
+			let members = (0..m).map(|i| account("member", i, SEED)).collect::<Vec<T::AccountId>>();
+			set_members::<T, I>(members.clone(), Some(members.len() - 1));
+			let add = account::<T::AccountId>("member", m, SEED);
+			let remove = members.first().cloned().unwrap();
+		}: {
+			assert_ok!(<Membership<T, _>>::swap_member(
+				T::SwapOrigin::successful_origin(),
+				remove.clone(),
+				add.clone(),
+			));
+		} verify {
+			assert!(!<Members<T, _>>::get().contains(&remove));
+			assert!(<Members<T, _>>::get().contains(&add));
+			// prime is rejigged
+			assert!(<Prime<T, _>>::get().is_some() && T::MembershipChanged::get_prime().is_some());
+			#[cfg(test)] crate::tests::clean();
+		}
+
+		// er keep the prime common between incoming and outgoing to make sure it is rejigged.
+		reset_member {
+			let m in 1 .. T::MaxMembers::get();
+
+			let members = (1..m+1).map(|i| account("member", i, SEED)).collect::<Vec<T::AccountId>>();
+			set_members::<T, I>(members.clone(), Some(members.len() - 1));
+			let mut new_members = (m..2*m).map(|i| account("member", i, SEED)).collect::<Vec<T::AccountId>>();
+		}: {
+			assert_ok!(<Membership<T, _>>::reset_members(T::ResetOrigin::successful_origin(), new_members.clone()));
+		} verify {
+			new_members.sort();
+			assert_eq!(<Members<T, _>>::get(), new_members);
+			// prime is rejigged
+			assert!(<Prime<T, _>>::get().is_some() && T::MembershipChanged::get_prime().is_some());
+			#[cfg(test)] crate::tests::clean();
+		}
+
+		change_key {
+			let m in 1 .. T::MaxMembers::get();
+
+			// worse case would be to change the prime
+			let members = (0..m).map(|i| account("member", i, SEED)).collect::<Vec<T::AccountId>>();
+			let prime = members.last().cloned().unwrap();
+			set_members::<T, I>(members.clone(), Some(members.len() - 1));
+
+			let add = account::<T::AccountId>("member", m, SEED);
+			whitelist!(prime);
+		}: {
+			assert_ok!(<Membership<T, _>>::change_key(RawOrigin::Signed(prime.clone()).into(), add.clone()));
+		} verify {
+			assert!(!<Members<T, _>>::get().contains(&prime));
+			assert!(<Members<T, _>>::get().contains(&add));
+			// prime is rejigged
+			assert_eq!(<Prime<T, _>>::get().unwrap(), add);
+			#[cfg(test)] crate::tests::clean();
+		}
+
+		set_prime {
+			let m in 1 .. T::MaxMembers::get();
+			let members = (0..m).map(|i| account("member", i, SEED)).collect::<Vec<T::AccountId>>();
+			let prime = members.last().cloned().unwrap();
+			set_members::<T, I>(members, None);
+		}: {
+			assert_ok!(<Membership<T, _>>::set_prime(T::PrimeOrigin::successful_origin(), prime));
+		} verify {
+			assert!(<Prime<T, _>>::get().is_some());
+			assert!(<T::MembershipChanged>::get_prime().is_some());
+			#[cfg(test)] crate::tests::clean();
+		}
+
+		clear_prime {
+			let m in 1 .. T::MaxMembers::get();
+			let members = (0..m).map(|i| account("member", i, SEED)).collect::<Vec<T::AccountId>>();
+			let prime = members.last().cloned().unwrap();
+			set_members::<T, I>(members, None);
+		}: {
+			assert_ok!(<Membership<T, _>>::clear_prime(T::PrimeOrigin::successful_origin()));
+		} verify {
+			assert!(<Prime<T, _>>::get().is_none());
+			assert!(<T::MembershipChanged>::get_prime().is_none());
+			#[cfg(test)] crate::tests::clean();
+		}
+	}
+
+	impl_benchmark_test_suite!(Membership, crate::tests::new_bench_ext(), crate::tests::Test,);
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;
@@ -308,11 +483,13 @@ mod tests {
 
 	parameter_types! {
 		pub const BlockHashCount: u64 = 250;
+		pub const MaxMembers: u32 = 10;
 		pub BlockWeights: frame_system::limits::BlockWeights =
 			frame_system::limits::BlockWeights::simple_max(1024);
 		pub static Members: Vec<u64> = vec![];
 		pub static Prime: Option<u64> = None;
 	}
+
 	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
 		type BlockWeights = ();
@@ -349,7 +526,7 @@ mod tests {
 	pub struct TestChangeMembers;
 	impl ChangeMembers<u64> for TestChangeMembers {
 		fn change_members_sorted(incoming: &[u64], outgoing: &[u64], new: &[u64]) {
-			let mut old_plus_incoming = MEMBERS.with(|m| m.borrow().to_vec());
+			let mut old_plus_incoming = Members::get();
 			old_plus_incoming.extend_from_slice(incoming);
 			old_plus_incoming.sort();
 			let mut new_plus_outgoing = new.to_vec();
@@ -357,13 +534,17 @@ mod tests {
 			new_plus_outgoing.sort();
 			assert_eq!(old_plus_incoming, new_plus_outgoing);
 
-			MEMBERS.with(|m| *m.borrow_mut() = new.to_vec());
-			PRIME.with(|p| *p.borrow_mut() = None);
+			Members::set(new.to_vec());
+			Prime::set(None);
 		}
 		fn set_prime(who: Option<u64>) {
-			PRIME.with(|p| *p.borrow_mut() = who);
+			Prime::set(who);
+		}
+		fn get_prime() -> Option<u64> {
+			Prime::get()
 		}
 	}
+
 	impl InitializeMembers<u64> for TestChangeMembers {
 		fn initialize_members(members: &[u64]) {
 			MEMBERS.with(|m| *m.borrow_mut() = members.to_vec());
@@ -379,9 +560,11 @@ mod tests {
 		type PrimeOrigin = EnsureSignedBy<Five, u64>;
 		type MembershipInitialized = TestChangeMembers;
 		type MembershipChanged = TestChangeMembers;
+		type MaxMembers = MaxMembers;
+		type WeightInfo = ();
 	}
 
-	fn new_test_ext() -> sp_io::TestExternalities {
+	pub(crate) fn new_test_ext() -> sp_io::TestExternalities {
 		let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
 		// We use default for brevity, but you can configure as desired if needed.
 		pallet_membership::GenesisConfig::<Test>{
@@ -391,6 +574,17 @@ mod tests {
 		t.into()
 	}
 
+	#[cfg(feature = "runtime-benchmarks")]
+	pub(crate) fn new_bench_ext() -> sp_io::TestExternalities {
+		frame_system::GenesisConfig::default().build_storage::<Test>().unwrap().into()
+	}
+
+	#[cfg(feature = "runtime-benchmarks")]
+	pub(crate) fn clean() {
+		Members::set(vec![]);
+		Prime::set(None);
+	}
+
 	#[test]
 	fn query_membership_works() {
 		new_test_ext().execute_with(|| {
diff --git a/frame/membership/src/weights.rs b/frame/membership/src/weights.rs
new file mode 100644
index 000000000000..fbdb44caec84
--- /dev/null
+++ b/frame/membership/src/weights.rs
@@ -0,0 +1,159 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Autogenerated weights for pallet_membership
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-04-17, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
+
+// Executed Command:
+// target/release/substrate
+// benchmark
+// --chain=dev
+// --steps=50
+// --repeat=20
+// --pallet=pallet_membership
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./frame/membership/src/weights.rs
+// --template=./.maintain/frame-weight-template.hbs
+
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for pallet_membership.
+pub trait WeightInfo {
+	fn add_member(m: u32, ) -> Weight;
+	fn remove_member(m: u32, ) -> Weight;
+	fn swap_member(m: u32, ) -> Weight;
+	fn reset_member(m: u32, ) -> Weight;
+	fn change_key(m: u32, ) -> Weight;
+	fn set_prime(m: u32, ) -> Weight;
+	fn clear_prime(m: u32, ) -> Weight;
+}
+
+/// Weights for pallet_membership using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	fn add_member(m: u32, ) -> Weight {
+		(25_448_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((257_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+	}
+	fn remove_member(m: u32, ) -> Weight {
+		(31_317_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((215_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+	}
+	fn swap_member(m: u32, ) -> Weight {
+		(31_208_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((229_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+	}
+	fn reset_member(m: u32, ) -> Weight {
+		(31_673_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((455_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+	}
+	fn change_key(m: u32, ) -> Weight {
+		(33_499_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((226_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(4 as Weight))
+	}
+	fn set_prime(m: u32, ) -> Weight {
+		(8_865_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((124_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+	}
+	fn clear_prime(m: u32, ) -> Weight {
+		(3_397_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((1_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+	}
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+	fn add_member(m: u32, ) -> Weight {
+		(25_448_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((257_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+	}
+	fn remove_member(m: u32, ) -> Weight {
+		(31_317_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((215_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+	}
+	fn swap_member(m: u32, ) -> Weight {
+		(31_208_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((229_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+	}
+	fn reset_member(m: u32, ) -> Weight {
+		(31_673_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((455_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+	}
+	fn change_key(m: u32, ) -> Weight {
+		(33_499_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((226_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
+	}
+	fn set_prime(m: u32, ) -> Weight {
+		(8_865_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((124_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+	}
+	fn clear_prime(m: u32, ) -> Weight {
+		(3_397_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((1_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+	}
+}

From 4b9a6bb0b24fb202e97ffd7a9c02ed6793122a06 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Sun, 18 Apr 2021 10:04:45 +0200
Subject: [PATCH 0658/1194] Update to libp2p 0.37 (#8625)

* Update to libp2p 0.37

* Line widths

* Fix tests
---
 Cargo.lock                                    | 115 ++++++++----------
 bin/node/browser-testing/Cargo.toml           |   4 +-
 bin/node/cli/Cargo.toml                       |   2 +-
 client/authority-discovery/Cargo.toml         |   2 +-
 client/cli/Cargo.toml                         |   2 +-
 client/network-gossip/Cargo.toml              |   2 +-
 client/network/Cargo.toml                     |   6 +-
 client/network/src/discovery.rs               |  30 +++--
 client/network/src/peer_info.rs               |  30 +++--
 client/network/src/protocol.rs                |  16 ++-
 .../src/protocol/notifications/tests.rs       |  22 ++--
 client/network/src/request_responses.rs       |  32 +++--
 client/network/src/service.rs                 | 108 ++++++++--------
 client/network/src/utils.rs                   |   5 +
 client/network/test/Cargo.toml                |   2 +-
 client/peerset/Cargo.toml                     |   2 +-
 client/telemetry/Cargo.toml                   |   2 +-
 primitives/consensus/common/Cargo.toml        |   2 +-
 utils/browser/Cargo.toml                      |   4 +-
 19 files changed, 220 insertions(+), 168 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f02830e0c8ad..67e08475dc71 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -164,22 +164,9 @@ checksum = "5a2f58b0bb10c380af2b26e57212856b8c9a59e0925b4c20f4a174a49734eaf7"
 
 [[package]]
 name = "asn1_der"
-version = "0.6.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fce6b6a0ffdafebd82c87e79e3f40e8d2c523e5fea5566ff6b90509bf98d638"
-dependencies = [
- "asn1_der_derive",
-]
-
-[[package]]
-name = "asn1_der_derive"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d0864d84b8e07b145449be9a8537db86bf9de5ce03b913214694643b4743502"
-dependencies = [
- "quote",
- "syn",
-]
+checksum = "9d6e24d2cce90c53b948c46271bfb053e4bdc2db9b5d3f65e20f8cf28a1b7fc3"
 
 [[package]]
 name = "assert_cmd"
@@ -2777,9 +2764,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.47"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cfb73131c35423a367daf8cbd24100af0d077668c8c2943f0e7dd775fef0f65"
+checksum = "2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -3104,9 +3091,9 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
 
 [[package]]
 name = "libp2p"
-version = "0.36.0"
+version = "0.37.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe5759b526f75102829c15e4d8566603b4bf502ed19b5f35920d98113873470d"
+checksum = "08053fbef67cd777049ef7a95ebaca2ece370b4ed7712c3fa404d69a88cb741b"
 dependencies = [
  "atomic",
  "bytes 1.0.1",
@@ -3143,9 +3130,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-core"
-version = "0.28.1"
+version = "0.28.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1e1797734bbd4c453664fefb029628f77c356ffc5bce98f06b18a7db3ebb0f7"
+checksum = "71dd51b562e14846e65bad00e5808d0644376e6588668c490d3c48e1dfeb4a9a"
 dependencies = [
  "asn1_der",
  "bs58",
@@ -3188,9 +3175,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-dns"
-version = "0.28.0"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9712eb3e9f7dcc77cc5ca7d943b6a85ce4b1faaf91a67e003442412a26d6d6f8"
+checksum = "62e63dab8b5ff35e0c101a3e51e843ba782c07bbb1682f5fd827622e0d02b98b"
 dependencies = [
  "async-std-resolver",
  "futures 0.3.13",
@@ -3202,9 +3189,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-floodsub"
-version = "0.28.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "897645f99e9b396df256a6aa8ba8c4bc019ac6b7c62556f624b5feea9acc82bb"
+checksum = "48a9b570f6766301d9c4aa00fce3554cad1598e2f466debbc4dde909028417cf"
 dependencies = [
  "cuckoofilter",
  "fnv",
@@ -3220,9 +3207,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-gossipsub"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "794b0c85f5df1acbc1fc38414d37272594811193b6325c76d3931c3e3f5df8c0"
+checksum = "73cb9a89a301afde1e588c73f7e9131e12a5388725f290a9047b878862db1b53"
 dependencies = [
  "asynchronous-codec 0.6.0",
  "base64 0.13.0",
@@ -3246,9 +3233,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-identify"
-version = "0.28.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f88ebc841d744979176ab4b8b294a3e655a7ba4ef26a905d073a52b49ed4dff5"
+checksum = "5f668f00efd9883e8b7bcc582eaf0164615792608f886f6577da18bcbeea0a46"
 dependencies = [
  "futures 0.3.13",
  "libp2p-core",
@@ -3262,9 +3249,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-kad"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbb5b90b6bda749023a85f60b49ea74b387c25f17d8df541ae72a3c75dd52e63"
+checksum = "b07312ebe5ee4fd2404447a0609814574df55c65d4e20838b957bbd34907d820"
 dependencies = [
  "arrayvec 0.5.2",
  "asynchronous-codec 0.6.0",
@@ -3288,9 +3275,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-mdns"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be28ca13bb648d249a9baebd750ebc64ce7040ddd5f0ce1035ff1f4549fb596d"
+checksum = "c221897b3fd7f215de7ecfec215c5eba598e5b61c605b5f8b56fe8a4fb507724"
 dependencies = [
  "async-io",
  "data-encoding",
@@ -3349,9 +3336,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-ping"
-version = "0.28.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dea10fc5209260915ea65b78f612d7ff78a29ab288e7aa3250796866af861c45"
+checksum = "bf4bfaffac63bf3c7ec11ed9d8879d455966ddea7e78ee14737f0b6dce0d1cd1"
 dependencies = [
  "futures 0.3.13",
  "libp2p-core",
@@ -3395,9 +3382,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-relay"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ff268be6a9d6f3c6cca3b81bbab597b15217f9ad8787c6c40fc548c1af7cd24"
+checksum = "0b8786aca3f18671d8776289706a5521f6c9124a820f69e358de214b9939440d"
 dependencies = [
  "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
@@ -3418,9 +3405,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-request-response"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "725367dd2318c54c5ab1a6418592e5b01c63b0dedfbbfb8389220b2bcf691899"
+checksum = "1cdbe172f08e6d0f95fa8634e273d4c4268c4063de2e33e7435194b0130c62e3"
 dependencies = [
  "async-trait",
  "bytes 1.0.1",
@@ -3438,9 +3425,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-swarm"
-version = "0.28.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75c26980cadd7c25d89071cb23e1f7f5df4863128cc91d83c6ddc72338cecafa"
+checksum = "1e04d8e1eef675029ec728ba14e8d0da7975d84b6679b699b4ae91a1de9c3a92"
 dependencies = [
  "either",
  "futures 0.3.13",
@@ -3454,9 +3441,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-swarm-derive"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c564ebaa36a64839f51eaddb0243aaaa29ce64affb56129193cc3248b72af273"
+checksum = "365b0a699fea5168676840567582a012ea297b1ca02eee467e58301b9c9c5eed"
 dependencies = [
  "quote",
  "syn",
@@ -3493,9 +3480,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-wasm-ext"
-version = "0.28.0"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6df65fc13f6188edf7e6927b086330448b3ca27af86b49748c6d299d7c8d9040"
+checksum = "cef45d61e43c313531b5e903e4e8415212ff6338e0c54c47da5b9b412b5760de"
 dependencies = [
  "futures 0.3.13",
  "js-sys",
@@ -3525,9 +3512,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-yamux"
-version = "0.31.0"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d6144cc94143fb0a8dd1e7c2fbcc32a2808168bcd1d69920635424d5993b7b"
+checksum = "f35da42cfc6d5cb0dcf3ad6881bc68d146cdf38f98655e09e33fbba4d13eabc4"
 dependencies = [
  "futures 0.3.13",
  "libp2p-core",
@@ -6176,9 +6163,9 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.24"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
+checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec"
 dependencies = [
  "unicode-xid",
 ]
@@ -9608,9 +9595,9 @@ checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2"
 
 [[package]]
 name = "syn"
-version = "1.0.62"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "123a78a3596b24fee53a6464ce52d8ecbf62241e6294c7e7fe12086cd161f512"
+checksum = "48fe99c6bd8b1cc636890bcc071842de909d902c81ac7dab53ba33c421ab8ffb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10618,9 +10605,9 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.71"
+version = "0.2.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ee1280240b7c461d6a0071313e08f34a60b0365f14260362e5a2b17d1d31aa7"
+checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9"
 dependencies = [
  "cfg-if 1.0.0",
  "serde",
@@ -10630,9 +10617,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.71"
+version = "0.2.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b7d8b6942b8bb3a9b0e73fc79b98095a27de6fa247615e59d096754a3bc2aa8"
+checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae"
 dependencies = [
  "bumpalo",
  "lazy_static",
@@ -10657,9 +10644,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.71"
+version = "0.2.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ac38da8ef716661f0f36c0d8320b89028efe10c7c0afde65baffb496ce0d3b"
+checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -10667,9 +10654,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.71"
+version = "0.2.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc053ec74d454df287b9374ee8abb36ffd5acb95ba87da3ba5b7d3fe20eb401e"
+checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10680,9 +10667,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.71"
+version = "0.2.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d6f8ec44822dd71f5f221a5847fb34acd9060535c1211b70a05844c0f6383b1"
+checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489"
 
 [[package]]
 name = "wasm-bindgen-test"
@@ -11127,15 +11114,15 @@ dependencies = [
 
 [[package]]
 name = "yamux"
-version = "0.8.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cc7bd8c983209ed5d527f44b01c41b7dc146fd960c61cf9e1d25399841dc271"
+checksum = "e7d9028f208dd5e63c614be69f115c1b53cacc1111437d4c765185856666c107"
 dependencies = [
  "futures 0.3.13",
  "log",
  "nohash-hasher",
  "parking_lot 0.11.1",
- "rand 0.7.3",
+ "rand 0.8.3",
  "static_assertions",
 ]
 
diff --git a/bin/node/browser-testing/Cargo.toml b/bin/node/browser-testing/Cargo.toml
index 292ee2cab6bf..93bf8f5131e3 100644
--- a/bin/node/browser-testing/Cargo.toml
+++ b/bin/node/browser-testing/Cargo.toml
@@ -8,11 +8,11 @@ license = "Apache-2.0"
 
 [dependencies]
 futures-timer = "3.0.2"
-libp2p = { version = "0.36.0", default-features = false }
+libp2p = { version = "0.37.1", default-features = false }
 jsonrpc-core = "15.0.0"
 serde = "1.0.106"
 serde_json = "1.0.48"
-wasm-bindgen = { version = "=0.2.71", features = ["serde-serialize"] }
+wasm-bindgen = { version = "=0.2.73", features = ["serde-serialize"] }
 wasm-bindgen-futures = "0.4.18"
 wasm-bindgen-test = "0.3.18"
 futures = "0.3.9"
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index 9449edfbf6e0..f552d3fff36c 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -102,7 +102,7 @@ node-inspect = { version = "0.8.0", optional = true, path = "../inspect" }
 try-runtime-cli = { version = "0.9.0", optional = true, path = "../../../utils/frame/try-runtime/cli" }
 
 # WASM-specific dependencies
-wasm-bindgen = { version = "0.2.57", optional = true }
+wasm-bindgen = { version = "0.2.73", optional = true }
 wasm-bindgen-futures = { version = "0.4.18", optional = true }
 browser-utils = { package = "substrate-browser-utils", path = "../../../utils/browser", optional = true, version = "0.9.0"}
 libp2p-wasm-ext = { version = "0.28", features = ["websocket"], optional = true }
diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml
index 4a92186c444b..e3727e093d00 100644
--- a/client/authority-discovery/Cargo.toml
+++ b/client/authority-discovery/Cargo.toml
@@ -23,7 +23,7 @@ derive_more = "0.99.2"
 either = "1.5.3"
 futures = "0.3.9"
 futures-timer = "3.0.1"
-libp2p = { version = "0.36.0", default-features = false, features = ["kad"] }
+libp2p = { version = "0.37.1", default-features = false, features = ["kad"] }
 log = "0.4.8"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
 prost = "0.7"
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index 55748ffb3d90..00a56e5fa9b8 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -18,7 +18,7 @@ regex = "1.4.2"
 tokio = { version = "0.2.21", features = [ "signal", "rt-core", "rt-threaded", "blocking" ] }
 futures = "0.3.9"
 fdlimit = "0.2.1"
-libp2p = "0.36.0"
+libp2p = "0.37.1"
 parity-scale-codec = "2.0.0"
 hex = "0.4.2"
 rand = "0.7.3"
diff --git a/client/network-gossip/Cargo.toml b/client/network-gossip/Cargo.toml
index a72e65ab3f57..fc5fb9a29ce9 100644
--- a/client/network-gossip/Cargo.toml
+++ b/client/network-gossip/Cargo.toml
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 futures = "0.3.9"
 futures-timer = "3.0.1"
-libp2p = { version = "0.36.0", default-features = false }
+libp2p = { version = "0.37.1", default-features = false }
 log = "0.4.8"
 lru = "0.6.5"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.9.0", path = "../../utils/prometheus" }
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index 604165d10074..3740ebceb638 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -63,17 +63,17 @@ wasm-timer = "0.2"
 zeroize = "1.2.0"
 
 [dependencies.libp2p]
-version = "0.36.0"
+version = "0.37.1"
 
 [target.'cfg(target_os = "unknown")'.dependencies.libp2p]
-version = "0.36.0"
+version = "0.37.1"
 default-features = false
 features = ["identify", "kad", "mdns", "mplex", "noise", "ping", "request-response", "tcp-async-io", "websocket", "yamux"]
 
 
 [dev-dependencies]
 assert_matches = "1.3"
-libp2p = { version = "0.36.0", default-features = false }
+libp2p = { version = "0.37.1", default-features = false }
 quickcheck = "1.0.3"
 rand = "0.7.2"
 sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
diff --git a/client/network/src/discovery.rs b/client/network/src/discovery.rs
index b7c791e39267..f6273c9fb3e0 100644
--- a/client/network/src/discovery.rs
+++ b/client/network/src/discovery.rs
@@ -573,9 +573,19 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 		}
 	}
 
-	fn inject_expired_listen_addr(&mut self, addr: &Multiaddr) {
+	fn inject_expired_external_addr(&mut self, addr: &Multiaddr) {
+		let with_peer_id = addr.clone()
+			.with(Protocol::P2p(self.local_peer_id.clone().into()));
+		self.known_external_addresses.remove(&with_peer_id);
+
+		for k in self.kademlias.values_mut() {
+			NetworkBehaviour::inject_expired_external_addr(k, addr)
+		}
+	}
+
+	fn inject_expired_listen_addr(&mut self, id: ListenerId, addr: &Multiaddr) {
 		for k in self.kademlias.values_mut() {
-			NetworkBehaviour::inject_expired_listen_addr(k, addr)
+			NetworkBehaviour::inject_expired_listen_addr(k, id, addr)
 		}
 	}
 
@@ -585,9 +595,15 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 		}
 	}
 
-	fn inject_new_listen_addr(&mut self, addr: &Multiaddr) {
+	fn inject_new_listener(&mut self, id: ListenerId) {
+		for k in self.kademlias.values_mut() {
+			NetworkBehaviour::inject_new_listener(k, id)
+		}
+	}
+
+	fn inject_new_listen_addr(&mut self, id: ListenerId, addr: &Multiaddr) {
 		for k in self.kademlias.values_mut() {
-			NetworkBehaviour::inject_new_listen_addr(k, addr)
+			NetworkBehaviour::inject_new_listen_addr(k, id, addr)
 		}
 	}
 
@@ -892,7 +908,7 @@ mod tests {
 				first_swarm_peer_id_and_addr = Some((keypair.public().into_peer_id(), listen_addr.clone()))
 			}
 
-			Swarm::listen_on(&mut swarm, listen_addr.clone()).unwrap();
+			swarm.listen_on(listen_addr.clone()).unwrap();
 			(swarm, listen_addr)
 		}).collect::<Vec<_>>();
 
@@ -915,13 +931,13 @@ mod tests {
 								DiscoveryOut::UnroutablePeer(other) | DiscoveryOut::Discovered(other) => {
 									// Call `add_self_reported_address` to simulate identify happening.
 									let addr = swarms.iter().find_map(|(s, a)|
-										if s.local_peer_id == other {
+										if s.behaviour().local_peer_id == other {
 											Some(a.clone())
 										} else {
 											None
 										})
 										.unwrap();
-									swarms[swarm_n].0.add_self_reported_address(
+									swarms[swarm_n].0.behaviour_mut().add_self_reported_address(
 										&other,
 										[protocol_name_from_protocol_id(&protocol_id)].iter(),
 										addr,
diff --git a/client/network/src/peer_info.rs b/client/network/src/peer_info.rs
index 28b913ea4019..e7ff848b067c 100644
--- a/client/network/src/peer_info.rs
+++ b/client/network/src/peer_info.rs
@@ -23,7 +23,7 @@ use libp2p::core::connection::{ConnectionId, ListenerId};
 use libp2p::core::{ConnectedPoint, either::EitherOutput, PeerId, PublicKey};
 use libp2p::swarm::{IntoProtocolsHandler, IntoProtocolsHandlerSelect, ProtocolsHandler};
 use libp2p::swarm::{NetworkBehaviour, NetworkBehaviourAction, PollParameters};
-use libp2p::identify::{Identify, IdentifyEvent, IdentifyInfo};
+use libp2p::identify::{Identify, IdentifyConfig, IdentifyEvent, IdentifyInfo};
 use libp2p::ping::{Ping, PingConfig, PingEvent, PingSuccess};
 use log::{debug, trace, error};
 use smallvec::SmallVec;
@@ -86,8 +86,9 @@ impl PeerInfoBehaviour {
 		local_public_key: PublicKey,
 	) -> Self {
 		let identify = {
-			let proto_version = "/substrate/1.0".to_string();
-			Identify::new(proto_version, user_agent, local_public_key)
+			let cfg = IdentifyConfig::new("/substrate/1.0".to_string(), local_public_key)
+				.with_agent_version(user_agent);
+			Identify::new(cfg)
 		};
 
 		PeerInfoBehaviour {
@@ -253,14 +254,19 @@ impl NetworkBehaviour for PeerInfoBehaviour {
 		self.identify.inject_dial_failure(peer_id);
 	}
 
-	fn inject_new_listen_addr(&mut self, addr: &Multiaddr) {
-		self.ping.inject_new_listen_addr(addr);
-		self.identify.inject_new_listen_addr(addr);
+	fn inject_new_listener(&mut self, id: ListenerId) {
+		self.ping.inject_new_listener(id);
+		self.identify.inject_new_listener(id);
 	}
 
-	fn inject_expired_listen_addr(&mut self, addr: &Multiaddr) {
-		self.ping.inject_expired_listen_addr(addr);
-		self.identify.inject_expired_listen_addr(addr);
+	fn inject_new_listen_addr(&mut self, id: ListenerId, addr: &Multiaddr) {
+		self.ping.inject_new_listen_addr(id, addr);
+		self.identify.inject_new_listen_addr(id, addr);
+	}
+
+	fn inject_expired_listen_addr(&mut self, id: ListenerId, addr: &Multiaddr) {
+		self.ping.inject_expired_listen_addr(id, addr);
+		self.identify.inject_expired_listen_addr(id, addr);
 	}
 
 	fn inject_new_external_addr(&mut self, addr: &Multiaddr) {
@@ -268,6 +274,11 @@ impl NetworkBehaviour for PeerInfoBehaviour {
 		self.identify.inject_new_external_addr(addr);
 	}
 
+	fn inject_expired_external_addr(&mut self, addr: &Multiaddr) {
+		self.ping.inject_expired_external_addr(addr);
+		self.identify.inject_expired_external_addr(addr);
+	}
+
 	fn inject_listener_error(&mut self, id: ListenerId, err: &(dyn error::Error + 'static)) {
 		self.ping.inject_listener_error(id, err);
 		self.identify.inject_listener_error(id, err);
@@ -323,6 +334,7 @@ impl NetworkBehaviour for PeerInfoBehaviour {
 						}
 						IdentifyEvent::Error { peer_id, error } =>
 							debug!(target: "sub-libp2p", "Identification with peer {:?} failed => {}", peer_id, error),
+						IdentifyEvent::Pushed { .. } => {}
 						IdentifyEvent::Sent { .. } => {}
 					}
 				},
diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index 1ae1d48cba3c..94980947e2a8 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -1523,18 +1523,26 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 		self.behaviour.inject_dial_failure(peer_id)
 	}
 
-	fn inject_new_listen_addr(&mut self, addr: &Multiaddr) {
-		self.behaviour.inject_new_listen_addr(addr)
+	fn inject_new_listener(&mut self, id: ListenerId) {
+		self.behaviour.inject_new_listener(id)
 	}
 
-	fn inject_expired_listen_addr(&mut self, addr: &Multiaddr) {
-		self.behaviour.inject_expired_listen_addr(addr)
+	fn inject_new_listen_addr(&mut self, id: ListenerId, addr: &Multiaddr) {
+		self.behaviour.inject_new_listen_addr(id, addr)
+	}
+
+	fn inject_expired_listen_addr(&mut self, id: ListenerId, addr: &Multiaddr) {
+		self.behaviour.inject_expired_listen_addr(id, addr)
 	}
 
 	fn inject_new_external_addr(&mut self, addr: &Multiaddr) {
 		self.behaviour.inject_new_external_addr(addr)
 	}
 
+	fn inject_expired_external_addr(&mut self, addr: &Multiaddr) {
+		self.behaviour.inject_expired_external_addr(addr)
+	}
+
 	fn inject_listener_error(&mut self, id: ListenerId, err: &(dyn std::error::Error + 'static)) {
 		self.behaviour.inject_listener_error(id, err);
 	}
diff --git a/client/network/src/protocol/notifications/tests.rs b/client/network/src/protocol/notifications/tests.rs
index f159a8e63178..8efe897afec3 100644
--- a/client/network/src/protocol/notifications/tests.rs
+++ b/client/network/src/protocol/notifications/tests.rs
@@ -97,7 +97,7 @@ fn build_nodes() -> (Swarm<CustomProtoWithAddr>, Swarm<CustomProtoWithAddr>) {
 			behaviour,
 			keypairs[index].public().into_peer_id()
 		);
-		Swarm::listen_on(&mut swarm, addrs[index].clone()).unwrap();
+		swarm.listen_on(addrs[index].clone()).unwrap();
 		out.push(swarm);
 	}
 
@@ -192,18 +192,26 @@ impl NetworkBehaviour for CustomProtoWithAddr {
 		self.inner.inject_dial_failure(peer_id)
 	}
 
-	fn inject_new_listen_addr(&mut self, addr: &Multiaddr) {
-		self.inner.inject_new_listen_addr(addr)
+	fn inject_new_listener(&mut self, id: ListenerId) {
+		self.inner.inject_new_listener(id)
 	}
 
-	fn inject_expired_listen_addr(&mut self, addr: &Multiaddr) {
-		self.inner.inject_expired_listen_addr(addr)
+	fn inject_new_listen_addr(&mut self, id: ListenerId, addr: &Multiaddr) {
+		self.inner.inject_new_listen_addr(id, addr)
+	}
+
+	fn inject_expired_listen_addr(&mut self, id: ListenerId, addr: &Multiaddr) {
+		self.inner.inject_expired_listen_addr(id, addr)
 	}
 
 	fn inject_new_external_addr(&mut self, addr: &Multiaddr) {
 		self.inner.inject_new_external_addr(addr)
 	}
 
+	fn inject_expired_external_addr(&mut self, addr: &Multiaddr) {
+		self.inner.inject_expired_external_addr(addr)
+	}
+
 	fn inject_listener_error(&mut self, id: ListenerId, err: &(dyn error::Error + 'static)) {
 		self.inner.inject_listener_error(id, err);
 	}
@@ -245,7 +253,7 @@ fn reconnect_after_disconnect() {
 						ServiceState::NotConnected => {
 							service1_state = ServiceState::FirstConnec;
 							if service2_state == ServiceState::FirstConnec {
-								service1.disconnect_peer(
+								service1.behaviour_mut().disconnect_peer(
 									Swarm::local_peer_id(&service2),
 									sc_peerset::SetId::from(0)
 								);
@@ -267,7 +275,7 @@ fn reconnect_after_disconnect() {
 						ServiceState::NotConnected => {
 							service2_state = ServiceState::FirstConnec;
 							if service1_state == ServiceState::FirstConnec {
-								service1.disconnect_peer(
+								service1.behaviour_mut().disconnect_peer(
 									Swarm::local_peer_id(&service2),
 									sc_peerset::SetId::from(0)
 								);
diff --git a/client/network/src/request_responses.rs b/client/network/src/request_responses.rs
index 1b23ee3699c9..3762cf70e71d 100644
--- a/client/network/src/request_responses.rs
+++ b/client/network/src/request_responses.rs
@@ -428,9 +428,15 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 		}
 	}
 
-	fn inject_expired_listen_addr(&mut self, addr: &Multiaddr) {
+	fn inject_expired_external_addr(&mut self, addr: &Multiaddr) {
 		for (p, _) in self.protocols.values_mut() {
-			NetworkBehaviour::inject_expired_listen_addr(p, addr)
+			NetworkBehaviour::inject_expired_external_addr(p, addr)
+		}
+	}
+
+	fn inject_expired_listen_addr(&mut self, id: ListenerId, addr: &Multiaddr) {
+		for (p, _) in self.protocols.values_mut() {
+			NetworkBehaviour::inject_expired_listen_addr(p, id, addr)
 		}
 	}
 
@@ -440,9 +446,15 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 		}
 	}
 
-	fn inject_new_listen_addr(&mut self, addr: &Multiaddr) {
+	fn inject_new_listener(&mut self, id: ListenerId) {
+		for (p, _) in self.protocols.values_mut() {
+			NetworkBehaviour::inject_new_listener(p, id)
+		}
+	}
+
+	fn inject_new_listen_addr(&mut self, id: ListenerId, addr: &Multiaddr) {
 		for (p, _) in self.protocols.values_mut() {
-			NetworkBehaviour::inject_new_listen_addr(p, addr)
+			NetworkBehaviour::inject_new_listen_addr(p, id, addr)
 		}
 	}
 
@@ -930,7 +942,7 @@ mod tests {
 		let mut swarm = Swarm::new(transport, behaviour, keypair.public().into_peer_id());
 		let listen_addr: Multiaddr = format!("/memory/{}", rand::random::<u64>()).parse().unwrap();
 
-		Swarm::listen_on(&mut swarm, listen_addr.clone()).unwrap();
+		swarm.listen_on(listen_addr.clone()).unwrap();
 		(swarm, listen_addr)
 	}
 
@@ -1000,7 +1012,7 @@ mod tests {
 				match swarm.next_event().await {
 					SwarmEvent::ConnectionEstablished { peer_id, .. } => {
 						let (sender, receiver) = oneshot::channel();
-						swarm.send_request(
+						swarm.behaviour_mut().send_request(
 							&peer_id,
 							protocol_name,
 							b"this is a request".to_vec(),
@@ -1090,7 +1102,7 @@ mod tests {
 				match swarm.next_event().await {
 					SwarmEvent::ConnectionEstablished { peer_id, .. } => {
 						let (sender, receiver) = oneshot::channel();
-						swarm.send_request(
+						swarm.behaviour_mut().send_request(
 							&peer_id,
 							protocol_name,
 							b"this is a request".to_vec(),
@@ -1182,7 +1194,7 @@ mod tests {
 
 		// Ask swarm 1 to dial swarm 2. There isn't any discovery mechanism in place in this test,
 		// so they wouldn't connect to each other.
-		Swarm::dial_addr(&mut swarm_1, listen_add_2).unwrap();
+		swarm_1.dial_addr(listen_add_2).unwrap();
 
 		// Run swarm 2 in the background, receiving two requests.
 		pool.spawner().spawn_obj(
@@ -1235,14 +1247,14 @@ mod tests {
 						SwarmEvent::ConnectionEstablished { peer_id, .. } => {
 							let (sender_1, receiver_1) = oneshot::channel();
 							let (sender_2, receiver_2) = oneshot::channel();
-							swarm_1.send_request(
+							swarm_1.behaviour_mut().send_request(
 								&peer_id,
 								protocol_name_1,
 								b"this is a request".to_vec(),
 								sender_1,
 								IfDisconnected::ImmediateError,
 							);
-							swarm_1.send_request(
+							swarm_1.behaviour_mut().send_request(
 								&peer_id,
 								protocol_name_2,
 								b"this is a request".to_vec(),
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index f8a3e2a7d394..e856c6ddf721 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -465,47 +465,47 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 
 	/// Returns the number of peers we're connected to.
 	pub fn num_connected_peers(&self) -> usize {
-		self.network_service.user_protocol().num_connected_peers()
+		self.network_service.behaviour().user_protocol().num_connected_peers()
 	}
 
 	/// Returns the number of peers we're connected to and that are being queried.
 	pub fn num_active_peers(&self) -> usize {
-		self.network_service.user_protocol().num_active_peers()
+		self.network_service.behaviour().user_protocol().num_active_peers()
 	}
 
 	/// Current global sync state.
 	pub fn sync_state(&self) -> SyncState {
-		self.network_service.user_protocol().sync_state()
+		self.network_service.behaviour().user_protocol().sync_state()
 	}
 
 	/// Target sync block number.
 	pub fn best_seen_block(&self) -> Option<NumberFor<B>> {
-		self.network_service.user_protocol().best_seen_block()
+		self.network_service.behaviour().user_protocol().best_seen_block()
 	}
 
 	/// Number of peers participating in syncing.
 	pub fn num_sync_peers(&self) -> u32 {
-		self.network_service.user_protocol().num_sync_peers()
+		self.network_service.behaviour().user_protocol().num_sync_peers()
 	}
 
 	/// Number of blocks in the import queue.
 	pub fn num_queued_blocks(&self) -> u32 {
-		self.network_service.user_protocol().num_queued_blocks()
+		self.network_service.behaviour().user_protocol().num_queued_blocks()
 	}
 
 	/// Returns the number of downloaded blocks.
 	pub fn num_downloaded_blocks(&self) -> usize {
-		self.network_service.user_protocol().num_downloaded_blocks()
+		self.network_service.behaviour().user_protocol().num_downloaded_blocks()
 	}
 
 	/// Number of active sync requests.
 	pub fn num_sync_requests(&self) -> usize {
-		self.network_service.user_protocol().num_sync_requests()
+		self.network_service.behaviour().user_protocol().num_sync_requests()
 	}
 
 	/// Adds an address for a node.
 	pub fn add_known_address(&mut self, peer_id: PeerId, addr: Multiaddr) {
-		self.network_service.add_known_address(peer_id, addr);
+		self.network_service.behaviour_mut().add_known_address(peer_id, addr);
 	}
 
 	/// Return a `NetworkService` that can be shared through the code base and can be used to
@@ -516,12 +516,12 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 
 	/// You must call this when a new block is finalized by the client.
 	pub fn on_block_finalized(&mut self, hash: B::Hash, header: B::Header) {
-		self.network_service.user_protocol_mut().on_block_finalized(hash, &header);
+		self.network_service.behaviour_mut().user_protocol_mut().on_block_finalized(hash, &header);
 	}
 
 	/// Inform the network service about new best imported block.
 	pub fn new_best_block_imported(&mut self, hash: B::Hash, number: NumberFor<B>) {
-		self.network_service.user_protocol_mut().new_best_block_imported(hash, number);
+		self.network_service.behaviour_mut().user_protocol_mut().new_best_block_imported(hash, number);
 	}
 
 	/// Returns the local `PeerId`.
@@ -542,15 +542,15 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 	/// everywhere about this. Please don't use this function to retrieve actual information.
 	pub fn network_state(&mut self) -> NetworkState {
 		let swarm = &mut self.network_service;
-		let open = swarm.user_protocol().open_peers().cloned().collect::<Vec<_>>();
+		let open = swarm.behaviour_mut().user_protocol().open_peers().cloned().collect::<Vec<_>>();
 
 		let connected_peers = {
 			let swarm = &mut *swarm;
 			open.iter().filter_map(move |peer_id| {
-				let known_addresses = NetworkBehaviour::addresses_of_peer(&mut **swarm, peer_id)
+				let known_addresses = NetworkBehaviour::addresses_of_peer(swarm.behaviour_mut(), peer_id)
 					.into_iter().collect();
 
-				let endpoint = if let Some(e) = swarm.node(peer_id).map(|i| i.endpoint()) {
+				let endpoint = if let Some(e) = swarm.behaviour_mut().node(peer_id).map(|i| i.endpoint()) {
 					e.clone().into()
 				} else {
 					error!(target: "sub-libp2p", "Found state inconsistency between custom protocol \
@@ -560,9 +560,9 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 
 				Some((peer_id.to_base58(), NetworkStatePeer {
 					endpoint,
-					version_string: swarm.node(peer_id)
+					version_string: swarm.behaviour_mut().node(peer_id)
 						.and_then(|i| i.client_version().map(|s| s.to_owned())),
-					latest_ping_time: swarm.node(peer_id).and_then(|i| i.latest_ping()),
+					latest_ping_time: swarm.behaviour_mut().node(peer_id).and_then(|i| i.latest_ping()),
 					known_addresses,
 				}))
 			}).collect()
@@ -570,14 +570,14 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 
 		let not_connected_peers = {
 			let swarm = &mut *swarm;
-			swarm.known_peers().into_iter()
+			swarm.behaviour_mut().known_peers().into_iter()
 				.filter(|p| open.iter().all(|n| n != p))
 				.map(move |peer_id| {
 					(peer_id.to_base58(), NetworkStateNotConnectedPeer {
-						version_string: swarm.node(&peer_id)
+						version_string: swarm.behaviour_mut().node(&peer_id)
 							.and_then(|i| i.client_version().map(|s| s.to_owned())),
-						latest_ping_time: swarm.node(&peer_id).and_then(|i| i.latest_ping()),
-						known_addresses: NetworkBehaviour::addresses_of_peer(&mut **swarm, &peer_id)
+						latest_ping_time: swarm.behaviour_mut().node(&peer_id).and_then(|i| i.latest_ping()),
+						known_addresses: NetworkBehaviour::addresses_of_peer(swarm.behaviour_mut(), &peer_id)
 							.into_iter().collect(),
 					})
 				})
@@ -585,8 +585,8 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 		};
 
 		let peer_id = Swarm::<B>::local_peer_id(&swarm).to_base58();
-		let listened_addresses = Swarm::<B>::listeners(&swarm).cloned().collect();
-		let external_addresses = Swarm::<B>::external_addresses(&swarm)
+		let listened_addresses = swarm.listeners().cloned().collect();
+		let external_addresses = swarm.external_addresses()
 			.map(|r| &r.addr)
 			.cloned()
 			.collect();
@@ -597,13 +597,13 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 			external_addresses,
 			connected_peers,
 			not_connected_peers,
-			peerset: swarm.user_protocol_mut().peerset_debug_info(),
+			peerset: swarm.behaviour_mut().user_protocol_mut().peerset_debug_info(),
 		}
 	}
 
 	/// Get currently connected peers.
 	pub fn peers_debug_info(&mut self) -> Vec<(PeerId, PeerInfo<B>)> {
-		self.network_service.user_protocol_mut()
+		self.network_service.behaviour_mut().user_protocol_mut()
 			.peers_info()
 			.map(|(id, info)| (id.clone(), info.clone()))
 			.collect()
@@ -1354,7 +1354,7 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 		// Check for new incoming light client requests.
 		if let Some(light_client_rqs) = this.light_client_rqs.as_mut() {
 			while let Poll::Ready(Some(rq)) = light_client_rqs.poll_next_unpin(cx) {
-				let result = this.network_service.light_client_request(rq);
+				let result = this.network_service.behaviour_mut().light_client_request(rq);
 				match result {
 					Ok(()) => {},
 					Err(light_client_requests::sender::SendRequestError::TooManyRequests) => {
@@ -1393,46 +1393,46 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 
 			match msg {
 				ServiceToWorkerMsg::AnnounceBlock(hash, data) =>
-					this.network_service.user_protocol_mut().announce_block(hash, data),
+					this.network_service.behaviour_mut().user_protocol_mut().announce_block(hash, data),
 				ServiceToWorkerMsg::RequestJustification(hash, number) =>
-					this.network_service.user_protocol_mut().request_justification(&hash, number),
+					this.network_service.behaviour_mut().user_protocol_mut().request_justification(&hash, number),
 				ServiceToWorkerMsg::PropagateTransaction(hash) =>
 					this.tx_handler_controller.propagate_transaction(hash),
 				ServiceToWorkerMsg::PropagateTransactions =>
 					this.tx_handler_controller.propagate_transactions(),
 				ServiceToWorkerMsg::GetValue(key) =>
-					this.network_service.get_value(&key),
+					this.network_service.behaviour_mut().get_value(&key),
 				ServiceToWorkerMsg::PutValue(key, value) =>
-					this.network_service.put_value(key, value),
+					this.network_service.behaviour_mut().put_value(key, value),
 				ServiceToWorkerMsg::SetReservedOnly(reserved_only) =>
-					this.network_service.user_protocol_mut().set_reserved_only(reserved_only),
+					this.network_service.behaviour_mut().user_protocol_mut().set_reserved_only(reserved_only),
 				ServiceToWorkerMsg::SetReserved(peers) =>
-					this.network_service.user_protocol_mut().set_reserved_peers(peers),
+					this.network_service.behaviour_mut().user_protocol_mut().set_reserved_peers(peers),
 				ServiceToWorkerMsg::AddReserved(peer_id) =>
-					this.network_service.user_protocol_mut().add_reserved_peer(peer_id),
+					this.network_service.behaviour_mut().user_protocol_mut().add_reserved_peer(peer_id),
 				ServiceToWorkerMsg::RemoveReserved(peer_id) =>
-					this.network_service.user_protocol_mut().remove_reserved_peer(peer_id),
+					this.network_service.behaviour_mut().user_protocol_mut().remove_reserved_peer(peer_id),
 				ServiceToWorkerMsg::AddSetReserved(protocol, peer_id) =>
-					this.network_service.user_protocol_mut().add_set_reserved_peer(protocol, peer_id),
+					this.network_service.behaviour_mut().user_protocol_mut().add_set_reserved_peer(protocol, peer_id),
 				ServiceToWorkerMsg::RemoveSetReserved(protocol, peer_id) =>
-					this.network_service.user_protocol_mut().remove_set_reserved_peer(protocol, peer_id),
+					this.network_service.behaviour_mut().user_protocol_mut().remove_set_reserved_peer(protocol, peer_id),
 				ServiceToWorkerMsg::AddKnownAddress(peer_id, addr) =>
-					this.network_service.add_known_address(peer_id, addr),
+					this.network_service.behaviour_mut().add_known_address(peer_id, addr),
 				ServiceToWorkerMsg::AddToPeersSet(protocol, peer_id) =>
-					this.network_service.user_protocol_mut().add_to_peers_set(protocol, peer_id),
+					this.network_service.behaviour_mut().user_protocol_mut().add_to_peers_set(protocol, peer_id),
 				ServiceToWorkerMsg::RemoveFromPeersSet(protocol, peer_id) =>
-					this.network_service.user_protocol_mut().remove_from_peers_set(protocol, peer_id),
+					this.network_service.behaviour_mut().user_protocol_mut().remove_from_peers_set(protocol, peer_id),
 				ServiceToWorkerMsg::SyncFork(peer_ids, hash, number) =>
-					this.network_service.user_protocol_mut().set_sync_fork_request(peer_ids, &hash, number),
+					this.network_service.behaviour_mut().user_protocol_mut().set_sync_fork_request(peer_ids, &hash, number),
 				ServiceToWorkerMsg::EventStream(sender) =>
 					this.event_streams.push(sender),
 				ServiceToWorkerMsg::Request { target, protocol, request, pending_response, connect } => {
-					this.network_service.send_request(&target, &protocol, request, pending_response, connect);
+					this.network_service.behaviour_mut().send_request(&target, &protocol, request, pending_response, connect);
 				},
 				ServiceToWorkerMsg::DisconnectPeer(who, protocol_name) =>
-					this.network_service.user_protocol_mut().disconnect_peer(&who, &protocol_name),
+					this.network_service.behaviour_mut().user_protocol_mut().disconnect_peer(&who, &protocol_name),
 				ServiceToWorkerMsg::NewBestBlockImported(hash, number) =>
-					this.network_service.user_protocol_mut().new_best_block_imported(hash, number),
+					this.network_service.behaviour_mut().user_protocol_mut().new_best_block_imported(hash, number),
 			}
 		}
 
@@ -1777,7 +1777,7 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 			};
 		}
 
-		let num_connected_peers = this.network_service.user_protocol_mut().num_connected_peers();
+		let num_connected_peers = this.network_service.behaviour_mut().user_protocol_mut().num_connected_peers();
 
 		// Update the variables shared with the `NetworkService`.
 		this.num_connected.store(num_connected_peers, Ordering::Relaxed);
@@ -1789,7 +1789,7 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 			*this.external_addresses.lock() = external_addresses;
 		}
 
-		let is_major_syncing = match this.network_service.user_protocol_mut().sync_state() {
+		let is_major_syncing = match this.network_service.behaviour_mut().user_protocol_mut().sync_state() {
 			SyncState::Idle => false,
 			SyncState::Downloading => true,
 		};
@@ -1799,21 +1799,25 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 		this.is_major_syncing.store(is_major_syncing, Ordering::Relaxed);
 
 		if let Some(metrics) = this.metrics.as_ref() {
-			for (proto, buckets) in this.network_service.num_entries_per_kbucket() {
+			for (proto, buckets) in this.network_service.behaviour_mut().num_entries_per_kbucket() {
 				for (lower_ilog2_bucket_bound, num_entries) in buckets {
 					metrics.kbuckets_num_nodes
 						.with_label_values(&[&proto.as_ref(), &lower_ilog2_bucket_bound.to_string()])
 						.set(num_entries as u64);
 				}
 			}
-			for (proto, num_entries) in this.network_service.num_kademlia_records() {
+			for (proto, num_entries) in this.network_service.behaviour_mut().num_kademlia_records() {
 				metrics.kademlia_records_count.with_label_values(&[&proto.as_ref()]).set(num_entries as u64);
 			}
-			for (proto, num_entries) in this.network_service.kademlia_records_total_size() {
+			for (proto, num_entries) in this.network_service.behaviour_mut().kademlia_records_total_size() {
 				metrics.kademlia_records_sizes_total.with_label_values(&[&proto.as_ref()]).set(num_entries as u64);
 			}
-			metrics.peerset_num_discovered.set(this.network_service.user_protocol().num_discovered_peers() as u64);
-			metrics.peerset_num_requested.set(this.network_service.user_protocol().requested_peers().count() as u64);
+			metrics.peerset_num_discovered.set(
+				this.network_service.behaviour_mut().user_protocol().num_discovered_peers() as u64
+			);
+			metrics.peerset_num_requested.set(
+				this.network_service.behaviour_mut().user_protocol().requested_peers().count() as u64
+			);
 			metrics.pending_connections.set(
 				Swarm::network_info(&this.network_service).connection_counters().num_pending() as u64
 			);
@@ -1841,13 +1845,13 @@ impl<'a, B: BlockT> Link<B> for NetworkLink<'a, B> {
 		count: usize,
 		results: Vec<(Result<BlockImportResult<NumberFor<B>>, BlockImportError>, B::Hash)>
 	) {
-		self.protocol.user_protocol_mut().on_blocks_processed(imported, count, results)
+		self.protocol.behaviour_mut().user_protocol_mut().on_blocks_processed(imported, count, results)
 	}
 	fn justification_imported(&mut self, who: PeerId, hash: &B::Hash, number: NumberFor<B>, success: bool) {
-		self.protocol.user_protocol_mut().justification_import_result(who, hash.clone(), number, success);
+		self.protocol.behaviour_mut().user_protocol_mut().justification_import_result(who, hash.clone(), number, success);
 	}
 	fn request_justification(&mut self, hash: &B::Hash, number: NumberFor<B>) {
-		self.protocol.user_protocol_mut().request_justification(hash, number)
+		self.protocol.behaviour_mut().user_protocol_mut().request_justification(hash, number)
 	}
 }
 
diff --git a/client/network/src/utils.rs b/client/network/src/utils.rs
index 02673ef49fb4..b2ae03777e65 100644
--- a/client/network/src/utils.rs
+++ b/client/network/src/utils.rs
@@ -59,6 +59,11 @@ impl<T: Hash + Eq> LruHashSet<T> {
 		}
 		false
 	}
+
+	/// Removes an element from the set if it is present.
+	pub fn remove(&mut self, e: &T) -> bool {
+		self.set.remove(e)
+	}
 }
 
 #[cfg(test)]
diff --git a/client/network/test/Cargo.toml b/client/network/test/Cargo.toml
index 4fc1aa740040..18a8d5cf8ca0 100644
--- a/client/network/test/Cargo.toml
+++ b/client/network/test/Cargo.toml
@@ -20,7 +20,7 @@ parking_lot = "0.11.1"
 futures = "0.3.9"
 futures-timer = "3.0.1"
 rand = "0.7.2"
-libp2p = { version = "0.36.0", default-features = false }
+libp2p = { version = "0.37.1", default-features = false }
 sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
 sc-consensus = { version = "0.9.0", path = "../../consensus/common" }
 sc-client-api = { version = "3.0.0", path = "../../api" }
diff --git a/client/peerset/Cargo.toml b/client/peerset/Cargo.toml
index 984bfc5e835f..5910116ec01c 100644
--- a/client/peerset/Cargo.toml
+++ b/client/peerset/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 futures = "0.3.9"
-libp2p = { version = "0.36.0", default-features = false }
+libp2p = { version = "0.37.1", default-features = false }
 sp-utils = { version = "3.0.0", path = "../../primitives/utils"}
 log = "0.4.8"
 serde_json = "1.0.41"
diff --git a/client/telemetry/Cargo.toml b/client/telemetry/Cargo.toml
index ab02104c15c3..6e6ae408247a 100644
--- a/client/telemetry/Cargo.toml
+++ b/client/telemetry/Cargo.toml
@@ -18,7 +18,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 parking_lot = "0.11.1"
 futures = "0.3.9"
 wasm-timer = "0.2.5"
-libp2p = { version = "0.36.0", default-features = false, features = ["dns-async-std", "tcp-async-io", "wasm-ext", "websocket"] }
+libp2p = { version = "0.37.1", default-features = false, features = ["dns-async-std", "tcp-async-io", "wasm-ext", "websocket"] }
 log = "0.4.8"
 pin-project = "1.0.4"
 rand = "0.7.2"
diff --git a/primitives/consensus/common/Cargo.toml b/primitives/consensus/common/Cargo.toml
index 6c3ae5fc060b..038a28ddab35 100644
--- a/primitives/consensus/common/Cargo.toml
+++ b/primitives/consensus/common/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 thiserror = "1.0.21"
-libp2p = { version = "0.36.0", default-features = false }
+libp2p = { version = "0.37.1", default-features = false }
 log = "0.4.8"
 sp-core = { path= "../../core", version = "3.0.0"}
 sp-inherents = { version = "3.0.0", path = "../../inherents" }
diff --git a/utils/browser/Cargo.toml b/utils/browser/Cargo.toml
index 3a11df62dc25..31403a5e6fa9 100644
--- a/utils/browser/Cargo.toml
+++ b/utils/browser/Cargo.toml
@@ -16,10 +16,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 futures = { version = "0.3", features = ["compat"] }
 futures01 = { package = "futures", version = "0.1.29" }
 log = "0.4.8"
-libp2p-wasm-ext = { version = "0.28", features = ["websocket"] }
+libp2p-wasm-ext = { version = "0.28.1", features = ["websocket"] }
 console_error_panic_hook = "0.1.6"
 js-sys = "0.3.34"
-wasm-bindgen = "0.2.57"
+wasm-bindgen = "0.2.73"
 wasm-bindgen-futures = "0.4.18"
 kvdb-web = "0.9.0"
 sp-database = { version = "3.0.0", path = "../../primitives/database" }

From 3a19eb63dcb05a0c1978d5f63632b2e9ef895eb2 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Mon, 19 Apr 2021 12:09:23 +0200
Subject: [PATCH 0659/1194] Make pallet macro generate accessor to PalletInfo
 information on pallet placeholder (#8630)

* generate accessor to PalletInfo information on pallet placeholder

* remove unused

* use trait, and add tests

* less verbose doc

* add PalletInfoAccess to prelude for ease usage
---
 .../src/pallet/expand/pallet_struct.rs        | 23 +++++++++++++++++++
 frame/support/src/lib.rs                      |  6 ++++-
 frame/support/src/traits.rs                   |  2 +-
 frame/support/src/traits/metadata.rs          | 10 ++++++++
 frame/support/test/tests/pallet.rs            | 11 +++++++++
 frame/support/test/tests/pallet_instance.rs   | 15 ++++++++++++
 .../tests/pallet_with_name_trait_is_valid.rs  |  2 +-
 frame/support/test/tests/system.rs            |  2 +-
 8 files changed, 67 insertions(+), 4 deletions(-)

diff --git a/frame/support/procedural/src/pallet/expand/pallet_struct.rs b/frame/support/procedural/src/pallet/expand/pallet_struct.rs
index fd3230edd1e7..556c6515d470 100644
--- a/frame/support/procedural/src/pallet/expand/pallet_struct.rs
+++ b/frame/support/procedural/src/pallet/expand/pallet_struct.rs
@@ -23,6 +23,7 @@ use crate::pallet::{Def, parse::helper::get_doc_literals};
 /// * Implement ModuleErrorMetadata on Pallet
 /// * declare Module type alias for construct_runtime
 /// * replace the first field type of `struct Pallet` with `PhantomData` if it is `_`
+/// * implementation of `PalletInfoAccess` information
 pub fn expand_pallet_struct(def: &mut Def) -> proc_macro2::TokenStream {
 	let frame_support = &def.frame_support;
 	let frame_system = &def.frame_system;
@@ -134,5 +135,27 @@ pub fn expand_pallet_struct(def: &mut Def) -> proc_macro2::TokenStream {
 					.put_into_storage::<<T as #frame_system::Config>::PalletInfo, Self>();
 			}
 		}
+
+		// Implement `PalletInfoAccess` for `Pallet`
+		impl<#type_impl_gen> #frame_support::traits::PalletInfoAccess
+			for #pallet_ident<#type_use_gen>
+			#config_where_clause
+		{
+			fn index() -> usize {
+				<
+					<T as #frame_system::Config>::PalletInfo as #frame_support::traits::PalletInfo
+				>::index::<Self>()
+					.expect("Pallet is part of the runtime because pallet `Config` trait is \
+						implemented by the runtime")
+			}
+
+			fn name() -> &'static str {
+				<
+					<T as #frame_system::Config>::PalletInfo as #frame_support::traits::PalletInfo
+				>::name::<Self>()
+					.expect("Pallet is part of the runtime because pallet `Config` trait is \
+						implemented by the runtime")
+			}
+		}
 	)
 }
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 5aa688ba28c3..72c90018f755 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -1234,7 +1234,7 @@ pub mod pallet_prelude {
 		EqNoBound, PartialEqNoBound, RuntimeDebugNoBound, DebugNoBound, CloneNoBound, Twox256,
 		Twox128, Blake2_256, Blake2_128, Identity, Twox64Concat, Blake2_128Concat, ensure,
 		RuntimeDebug, storage,
-		traits::{Get, Hooks, IsType, GetPalletVersion, EnsureOrigin},
+		traits::{Get, Hooks, IsType, GetPalletVersion, EnsureOrigin, PalletInfoAccess},
 		dispatch::{DispatchResultWithPostInfo, Parameter, DispatchError, DispatchResult},
 		weights::{DispatchClass, Pays, Weight},
 		storage::types::{StorageValue, StorageMap, StorageDoubleMap, ValueQuery, OptionQuery},
@@ -1362,6 +1362,10 @@ pub mod pallet_prelude {
 ///
 /// It declare `type Module` type alias for `Pallet`, used by [`construct_runtime`].
 ///
+/// It implements [`traits::PalletInfoAccess`] on `Pallet` to ease access to pallet informations
+/// given by [`frame_support::traits::PalletInfo`].
+/// (The implementation use the associated type `frame_system::Config::PalletInfo`).
+///
 /// If attribute generate_store then macro create the trait `Store` and implement it on `Pallet`.
 ///
 /// # Hooks: `#[pallet::hooks]` mandatory
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index c629990dd662..7ee2b0a56094 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -61,7 +61,7 @@ pub use randomness::Randomness;
 mod metadata;
 pub use metadata::{
 	CallMetadata, GetCallMetadata, GetCallName, PalletInfo, PalletVersion, GetPalletVersion,
-	PALLET_VERSION_STORAGE_KEY_POSTFIX,
+	PALLET_VERSION_STORAGE_KEY_POSTFIX, PalletInfoAccess,
 };
 
 mod hooks;
diff --git a/frame/support/src/traits/metadata.rs b/frame/support/src/traits/metadata.rs
index ff4507dce9c9..b13a0464b30c 100644
--- a/frame/support/src/traits/metadata.rs
+++ b/frame/support/src/traits/metadata.rs
@@ -31,6 +31,16 @@ pub trait PalletInfo {
 	fn name<P: 'static>() -> Option<&'static str>;
 }
 
+/// Provides information about the pallet setup in the runtime.
+///
+/// Access the information provided by [`PalletInfo`] for a specific pallet.
+pub trait PalletInfoAccess {
+	/// Index of the pallet as configured in the runtime.
+	fn index() -> usize;
+	/// Name of the pallet as configured in the runtime.
+	fn name() -> &'static str;
+}
+
 /// The function and pallet name of the Call.
 #[derive(Clone, Eq, PartialEq, Default, RuntimeDebug)]
 pub struct CallMetadata {
diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index 04e8b2a8f187..8fc056a2f36a 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -861,3 +861,14 @@ fn metadata() {
 
 	pretty_assertions::assert_eq!(pallet_metadata, expected_pallet_metadata);
 }
+
+#[test]
+fn test_pallet_info_access() {
+	assert_eq!(<System as frame_support::traits::PalletInfoAccess>::name(), "System");
+	assert_eq!(<Example as frame_support::traits::PalletInfoAccess>::name(), "Example");
+	assert_eq!(<Example2 as frame_support::traits::PalletInfoAccess>::name(), "Example2");
+
+	assert_eq!(<System as frame_support::traits::PalletInfoAccess>::index(), 0);
+	assert_eq!(<Example as frame_support::traits::PalletInfoAccess>::index(), 1);
+	assert_eq!(<Example2 as frame_support::traits::PalletInfoAccess>::index(), 2);
+}
diff --git a/frame/support/test/tests/pallet_instance.rs b/frame/support/test/tests/pallet_instance.rs
index b181fe0bd6ee..232a25ff5bf2 100644
--- a/frame/support/test/tests/pallet_instance.rs
+++ b/frame/support/test/tests/pallet_instance.rs
@@ -712,3 +712,18 @@ fn metadata() {
 	pretty_assertions::assert_eq!(pallet_metadata, expected_pallet_metadata);
 	pretty_assertions::assert_eq!(pallet_instance1_metadata, expected_pallet_instance1_metadata);
 }
+
+#[test]
+fn test_pallet_info_access() {
+	assert_eq!(<System as frame_support::traits::PalletInfoAccess>::name(), "System");
+	assert_eq!(<Example as frame_support::traits::PalletInfoAccess>::name(), "Example");
+	assert_eq!(<Instance1Example as frame_support::traits::PalletInfoAccess>::name(), "Instance1Example");
+	assert_eq!(<Example2 as frame_support::traits::PalletInfoAccess>::name(), "Example2");
+	assert_eq!(<Instance1Example2 as frame_support::traits::PalletInfoAccess>::name(), "Instance1Example2");
+
+	assert_eq!(<System as frame_support::traits::PalletInfoAccess>::index(), 0);
+	assert_eq!(<Example as frame_support::traits::PalletInfoAccess>::index(), 1);
+	assert_eq!(<Instance1Example as frame_support::traits::PalletInfoAccess>::index(), 2);
+	assert_eq!(<Example2 as frame_support::traits::PalletInfoAccess>::index(), 3);
+	assert_eq!(<Instance1Example2 as frame_support::traits::PalletInfoAccess>::index(), 4);
+}
diff --git a/frame/support/test/tests/pallet_with_name_trait_is_valid.rs b/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
index 3d96fe24d94c..99c00b535fa0 100644
--- a/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
+++ b/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
@@ -46,7 +46,7 @@ frame_support::decl_module! {
 		const Foo: u32 = u32::max_value();
 
 		#[weight = 0]
-		fn accumulate_dummy(origin, increase_by: T::Balance) {
+		fn accumulate_dummy(_origin, _increase_by: T::Balance) {
 			unimplemented!();
 		}
 
diff --git a/frame/support/test/tests/system.rs b/frame/support/test/tests/system.rs
index 19858731b3a0..c4d7cf01ae21 100644
--- a/frame/support/test/tests/system.rs
+++ b/frame/support/test/tests/system.rs
@@ -36,7 +36,7 @@ pub trait Config: 'static + Eq + Clone {
 frame_support::decl_module! {
 	pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {
 		#[weight = 0]
-		fn noop(origin) {}
+		fn noop(_origin) {}
 	}
 }
 

From 282d57c0745b530fe7a9ebaffcd6ac36c09d0554 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Mon, 19 Apr 2021 12:47:46 +0200
Subject: [PATCH 0660/1194] Update dependencies of pallet_contracts (#8637)

* Update parity-wasm

* Cleanup Cargo.toml files

- Sort dependencies
- Remove minor and fix version where they are not necessary

* Update pretty_assertions

* Update rand
---
 Cargo.lock                                 | 74 +++++++++++++++++-----
 frame/contracts/Cargo.toml                 | 36 ++++++-----
 frame/contracts/common/Cargo.toml          |  7 +-
 frame/contracts/rpc/Cargo.toml             | 20 +++---
 frame/contracts/rpc/runtime-api/Cargo.toml |  8 ++-
 frame/contracts/src/benchmarking/code.rs   | 22 +++----
 frame/contracts/src/tests.rs               | 12 ++--
 frame/contracts/src/wasm/env_def/macros.rs | 14 ++--
 frame/contracts/src/wasm/prepare.rs        |  8 +--
 9 files changed, 125 insertions(+), 76 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 67e08475dc71..679aaafcc259 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1314,6 +1314,12 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "diff"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499"
+
 [[package]]
 name = "difference"
 version = "2.0.0"
@@ -1797,7 +1803,7 @@ dependencies = [
  "parity-scale-codec",
  "parity-util-mem",
  "paste 1.0.4",
- "pretty_assertions",
+ "pretty_assertions 0.6.1",
  "serde",
  "smallvec 1.6.1",
  "sp-arithmetic",
@@ -1850,7 +1856,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "parity-scale-codec",
- "pretty_assertions",
+ "pretty_assertions 0.6.1",
  "rustversion",
  "serde",
  "sp-core",
@@ -4202,7 +4208,7 @@ version = "2.0.0"
 dependencies = [
  "frame-system",
  "parity-scale-codec",
- "pretty_assertions",
+ "pretty_assertions 0.6.1",
  "sp-application-crypto",
  "sp-core",
  "sp-runtime",
@@ -4767,19 +4773,19 @@ dependencies = [
  "pallet-randomness-collective-flip",
  "pallet-timestamp",
  "parity-scale-codec",
- "parity-wasm 0.41.0",
+ "parity-wasm 0.42.2",
  "paste 1.0.4",
- "pretty_assertions",
- "pwasm-utils 0.16.0",
- "rand 0.7.3",
- "rand_pcg",
+ "pretty_assertions 0.7.2",
+ "pwasm-utils 0.17.0",
+ "rand 0.8.3",
+ "rand_pcg 0.3.0",
  "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
  "sp-sandbox",
  "sp-std",
- "wasmi-validation",
+ "wasmi-validation 0.4.0",
  "wat",
 ]
 
@@ -5698,6 +5704,12 @@ version = "0.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ddfc878dac00da22f8f61e7af3157988424567ab01d9920b962ef7dcbd7cd865"
 
+[[package]]
+name = "parity-wasm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92"
+
 [[package]]
 name = "parity-ws"
 version = "0.10.0"
@@ -6094,6 +6106,18 @@ dependencies = [
  "output_vt100",
 ]
 
+[[package]]
+name = "pretty_assertions"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cab0e7c02cf376875e9335e0ba1da535775beb5450d21e1dffca068818ed98b"
+dependencies = [
+ "ansi_term 0.12.1",
+ "ctor",
+ "diff",
+ "output_vt100",
+]
+
 [[package]]
 name = "primitive-types"
 version = "0.9.0"
@@ -6257,13 +6281,13 @@ dependencies = [
 
 [[package]]
 name = "pwasm-utils"
-version = "0.16.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c8ac87af529432d3a4f0e2b3bbf08af49f28f09cc73ed7e551161bdaef5f78d"
+checksum = "51992bc74c0f34f759ff97fb303602e60343afc83693769c91aa17724442809e"
 dependencies = [
  "byteorder",
  "log",
- "parity-wasm 0.41.0",
+ "parity-wasm 0.42.2",
 ]
 
 [[package]]
@@ -6349,7 +6373,7 @@ dependencies = [
  "rand_chacha 0.2.2",
  "rand_core 0.5.1",
  "rand_hc 0.2.0",
- "rand_pcg",
+ "rand_pcg 0.2.1",
 ]
 
 [[package]]
@@ -6453,6 +6477,15 @@ dependencies = [
  "rand_core 0.5.1",
 ]
 
+[[package]]
+name = "rand_pcg"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7de198537002b913568a3847e53535ace266f93526caf5c360ec41d72c5787f0"
+dependencies = [
+ "rand_core 0.6.2",
+]
+
 [[package]]
 name = "rawpointer"
 version = "0.2.1"
@@ -8714,7 +8747,7 @@ dependencies = [
  "parity-scale-codec",
  "parity-util-mem",
  "parking_lot 0.11.1",
- "pretty_assertions",
+ "pretty_assertions 0.6.1",
  "primitive-types",
  "rand 0.7.3",
  "rand_chacha 0.2.2",
@@ -9070,7 +9103,7 @@ dependencies = [
  "num-traits",
  "parity-scale-codec",
  "parking_lot 0.11.1",
- "pretty_assertions",
+ "pretty_assertions 0.6.1",
  "rand 0.7.3",
  "smallvec 1.6.1",
  "sp-core",
@@ -10733,7 +10766,7 @@ dependencies = [
  "num-rational",
  "num-traits",
  "parity-wasm 0.41.0",
- "wasmi-validation",
+ "wasmi-validation 0.3.0",
 ]
 
 [[package]]
@@ -10745,6 +10778,15 @@ dependencies = [
  "parity-wasm 0.41.0",
 ]
 
+[[package]]
+name = "wasmi-validation"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb8e860796d8be48efef530b60eebf84e74a88bce107374fffb0da97d504b8"
+dependencies = [
+ "parity-wasm 0.42.2",
+]
+
 [[package]]
 name = "wasmparser"
 version = "0.76.0"
diff --git a/frame/contracts/Cargo.toml b/frame/contracts/Cargo.toml
index 018a8a5df672..ba8069604a77 100644
--- a/frame/contracts/Cargo.toml
+++ b/frame/contracts/Cargo.toml
@@ -14,35 +14,39 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+log = { version = "0.4", default-features = false }
+parity-wasm = { version = "0.42", default-features = false }
+pwasm-utils = { version = "0.17", default-features = false }
+serde = { version = "1", optional = true, features = ["derive"] }
+wasmi-validation = { version = "0.4", default-features = false }
+
+# Only used in benchmarking to generate random contract code
+rand = { version = "0.8", optional = true, default-features = false }
+rand_pcg = { version = "0.3", optional = true }
+
+# Substrate Dependencies
 frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 pallet-contracts-primitives = { version = "3.0.0", default-features = false, path = "common" }
 pallet-contracts-proc-macro = { version = "3.0.0", path = "proc-macro" }
-parity-wasm = { version = "0.41.0", default-features = false }
-pwasm-utils = { version = "0.16", default-features = false }
-serde = { version = "1.0.101", optional = true, features = ["derive"] }
 sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
 sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
 sp-sandbox = { version = "0.9.0", default-features = false, path = "../../primitives/sandbox" }
-wasmi-validation = { version = "0.3.0", default-features = false }
-log = { version = "0.4.14", default-features = false }
-
-# Only used in benchmarking to generate random contract code
-rand = { version = "0.7.0", optional = true, default-features = false }
-rand_pcg = { version = "0.2.1", optional = true }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 
 [dev-dependencies]
-assert_matches = "1.3.0"
-hex-literal = "0.3.1"
+assert_matches = "1"
+hex-literal = "0.3"
+paste = "1"
+pretty_assertions = "0.7"
+wat = "1"
+
+# Substrate Dependencies
 pallet-balances = { version = "3.0.0", path = "../balances" }
 pallet-timestamp = { version = "3.0.0", path = "../timestamp" }
 pallet-randomness-collective-flip = { version = "3.0.0", path = "../randomness-collective-flip" }
-paste = "1.0"
-pretty_assertions = "0.6.1"
-wat = "1.0"
 
 [features]
 default = ["std"]
diff --git a/frame/contracts/common/Cargo.toml b/frame/contracts/common/Cargo.toml
index 375f760b0a5c..154ceeb89134 100644
--- a/frame/contracts/common/Cargo.toml
+++ b/frame/contracts/common/Cargo.toml
@@ -13,13 +13,14 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-# This crate should not rely on any of the frame primitives.
 bitflags = "1.0"
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive"] }
+serde = { version = "1", features = ["derive"], optional = true }
+
+# Substrate Dependencies (This crate should not rely on frame)
 sp-core = { version = "3.0.0", path = "../../../primitives/core", default-features = false }
 sp-std = { version = "3.0.0", default-features = false, path = "../../../primitives/std" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
-serde = { version = "1", features = ["derive"], optional = true }
 
 [features]
 default = ["std"]
diff --git a/frame/contracts/rpc/Cargo.toml b/frame/contracts/rpc/Cargo.toml
index d0068e3e421c..dbd4356acc4a 100644
--- a/frame/contracts/rpc/Cargo.toml
+++ b/frame/contracts/rpc/Cargo.toml
@@ -13,18 +13,20 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "2.0.0" }
-jsonrpc-core = "15.1.0"
-jsonrpc-core-client = "15.1.0"
-jsonrpc-derive = "15.1.0"
+codec = { package = "parity-scale-codec", version = "2" }
+jsonrpc-core = "15"
+jsonrpc-core-client = "15"
+jsonrpc-derive = "15"
+serde = { version = "1", features = ["derive"] }
+
+# Substrate Dependencies
+pallet-contracts-primitives = { version = "3.0.0", path = "../common" }
+pallet-contracts-rpc-runtime-api = { version = "3.0.0", path = "./runtime-api" }
+sp-api = { version = "3.0.0", path = "../../../primitives/api" }
 sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
 sp-core = { version = "3.0.0", path = "../../../primitives/core" }
 sp-rpc = { version = "3.0.0", path = "../../../primitives/rpc" }
-serde = { version = "1.0.101", features = ["derive"] }
 sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
-sp-api = { version = "3.0.0", path = "../../../primitives/api" }
-pallet-contracts-primitives = { version = "3.0.0", path = "../common" }
-pallet-contracts-rpc-runtime-api = { version = "3.0.0", path = "./runtime-api" }
 
 [dev-dependencies]
-serde_json = "1.0.41"
+serde_json = "1"
diff --git a/frame/contracts/rpc/runtime-api/Cargo.toml b/frame/contracts/rpc/runtime-api/Cargo.toml
index 32de637f1082..8ce1c13e667e 100644
--- a/frame/contracts/rpc/runtime-api/Cargo.toml
+++ b/frame/contracts/rpc/runtime-api/Cargo.toml
@@ -13,11 +13,13 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+codec = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive"] }
+
+# Substrate Dependencies
+pallet-contracts-primitives = { version = "3.0.0", default-features = false, path = "../../common" }
 sp-api = { version = "3.0.0", default-features = false, path = "../../../../primitives/api" }
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "3.0.0", default-features = false, path = "../../../../primitives/std" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../../../primitives/runtime" }
-pallet-contracts-primitives = { version = "3.0.0", default-features = false, path = "../../common" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../../../primitives/std" }
 
 [features]
 default = ["std"]
diff --git a/frame/contracts/src/benchmarking/code.rs b/frame/contracts/src/benchmarking/code.rs
index 118ce038fc22..74c678f54874 100644
--- a/frame/contracts/src/benchmarking/code.rs
+++ b/frame/contracts/src/benchmarking/code.rs
@@ -128,14 +128,14 @@ where
 		let mut contract = parity_wasm::builder::module()
 			// deploy function (first internal function)
 			.function()
-				.signature().with_return_type(None).build()
+				.signature().build()
 				.with_body(def.deploy_body.unwrap_or_else(||
 					FuncBody::new(Vec::new(), Instructions::empty())
 				))
 				.build()
 			// call function (second internal function)
 			.function()
-				.signature().with_return_type(None).build()
+				.signature().build()
 				.with_body(def.call_body.unwrap_or_else(||
 					FuncBody::new(Vec::new(), Instructions::empty())
 				))
@@ -147,7 +147,7 @@ where
 		if let Some(body) = def.aux_body {
 			let mut signature = contract
 				.function()
-				.signature().with_return_type(None);
+				.signature();
 			for _ in 0 .. def.aux_arg_num {
 				signature = signature.with_param(ValueType::I64);
 			}
@@ -166,7 +166,7 @@ where
 		for func in def.imported_functions {
 			let sig = parity_wasm::builder::signature()
 				.with_params(func.params)
-				.with_return_type(func.return_type)
+				.with_results(func.return_type.into_iter().collect())
 				.build_sig();
 			let sig = contract.push_signature(sig);
 			contract = contract.import()
@@ -450,11 +450,11 @@ pub mod body {
 						vec![Instruction::I32Const(current as i32)]
 					},
 					DynInstr::RandomUnaligned(low, high) => {
-						let unaligned = rng.gen_range(*low, *high) | 1;
+						let unaligned = rng.gen_range(*low..*high) | 1;
 						vec![Instruction::I32Const(unaligned as i32)]
 					},
 					DynInstr::RandomI32(low, high) => {
-						vec![Instruction::I32Const(rng.gen_range(*low, *high))]
+						vec![Instruction::I32Const(rng.gen_range(*low..*high))]
 					},
 					DynInstr::RandomI32Repeated(num) => {
 						(&mut rng).sample_iter(Standard).take(*num).map(|val|
@@ -469,19 +469,19 @@ pub mod body {
 						.collect()
 					},
 					DynInstr::RandomGetLocal(low, high) => {
-						vec![Instruction::GetLocal(rng.gen_range(*low, *high))]
+						vec![Instruction::GetLocal(rng.gen_range(*low..*high))]
 					},
 					DynInstr::RandomSetLocal(low, high) => {
-						vec![Instruction::SetLocal(rng.gen_range(*low, *high))]
+						vec![Instruction::SetLocal(rng.gen_range(*low..*high))]
 					},
 					DynInstr::RandomTeeLocal(low, high) => {
-						vec![Instruction::TeeLocal(rng.gen_range(*low, *high))]
+						vec![Instruction::TeeLocal(rng.gen_range(*low..*high))]
 					},
 					DynInstr::RandomGetGlobal(low, high) => {
-						vec![Instruction::GetGlobal(rng.gen_range(*low, *high))]
+						vec![Instruction::GetGlobal(rng.gen_range(*low..*high))]
 					},
 					DynInstr::RandomSetGlobal(low, high) => {
-						vec![Instruction::SetGlobal(rng.gen_range(*low, *high))]
+						vec![Instruction::SetGlobal(rng.gen_range(*low..*high))]
 					},
 				}
 			)
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index b72ef652ce26..a36e96dfe12b 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -836,16 +836,16 @@ fn signed_claim_surcharge_contract_removals() {
 #[test]
 fn claim_surcharge_malus() {
 	// Test surcharge malus for inherent
-	claim_surcharge(9, |addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(), true);
 	claim_surcharge(8, |addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(), true);
 	claim_surcharge(7, |addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(), true);
-	claim_surcharge(6, |addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(), false);
+	claim_surcharge(6, |addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(), true);
+	claim_surcharge(5, |addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(), false);
 
 	// Test surcharge malus for signed
-	claim_surcharge(9, |addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(), true);
-	claim_surcharge(8, |addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(), false);
+	claim_surcharge(8, |addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(), true);
 	claim_surcharge(7, |addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(), false);
 	claim_surcharge(6, |addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(), false);
+	claim_surcharge(5, |addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(), false);
 }
 
 /// Claim surcharge with the given trigger_call at the given blocks.
@@ -1732,7 +1732,7 @@ fn self_destruct_works() {
 				EventRecord {
 					phase: Phase::Initialization,
 					event: Event::pallet_balances(
-						pallet_balances::Event::Transfer(addr.clone(), DJANGO, 93_654)
+						pallet_balances::Event::Transfer(addr.clone(), DJANGO, 93_086)
 					),
 					topics: vec![],
 				},
@@ -1755,7 +1755,7 @@ fn self_destruct_works() {
 
 			// check that the beneficiary (django) got remaining balance
 			// some rent was deducted before termination
-			assert_eq!(Balances::free_balance(DJANGO), 1_093_654);
+			assert_eq!(Balances::free_balance(DJANGO), 1_093_086);
 		});
 }
 
diff --git a/frame/contracts/src/wasm/env_def/macros.rs b/frame/contracts/src/wasm/env_def/macros.rs
index cfb529d2932b..10d61bab1bb2 100644
--- a/frame/contracts/src/wasm/env_def/macros.rs
+++ b/frame/contracts/src/wasm/env_def/macros.rs
@@ -28,15 +28,15 @@ macro_rules! convert_args {
 macro_rules! gen_signature {
 	( ( $( $params: ty ),* ) ) => (
 		{
-			parity_wasm::elements::FunctionType::new(convert_args!($($params),*), None)
+			parity_wasm::elements::FunctionType::new(convert_args!($($params),*), vec![])
 		}
 	);
 
 	( ( $( $params: ty ),* ) -> $returns: ty ) => (
 		{
-			parity_wasm::elements::FunctionType::new(convert_args!($($params),*), Some({
+			parity_wasm::elements::FunctionType::new(convert_args!($($params),*), vec![{
 				use $crate::wasm::env_def::ConvertibleToWasm; <$returns>::VALUE_TYPE
-			}))
+			}])
 		}
 	);
 }
@@ -301,12 +301,12 @@ mod tests {
 	fn macro_gen_signature() {
 		assert_eq!(
 			gen_signature!((i32)),
-			FunctionType::new(vec![ValueType::I32], None),
+			FunctionType::new(vec![ValueType::I32], vec![]),
 		);
 
 		assert_eq!(
 			gen_signature!( (i32, u32) -> u32 ),
-			FunctionType::new(vec![ValueType::I32, ValueType::I32], Some(ValueType::I32)),
+			FunctionType::new(vec![ValueType::I32, ValueType::I32], vec![ValueType::I32]),
 		);
 	}
 
@@ -348,10 +348,10 @@ mod tests {
 		);
 
 		assert!(
-			Env::can_satisfy(b"seal0", b"seal_gas",&FunctionType::new(vec![ValueType::I32], None))
+			Env::can_satisfy(b"seal0", b"seal_gas",&FunctionType::new(vec![ValueType::I32], vec![]))
 		);
 		assert!(
-			!Env::can_satisfy(b"seal0", b"not_exists", &FunctionType::new(vec![], None))
+			!Env::can_satisfy(b"seal0", b"not_exists", &FunctionType::new(vec![], vec![]))
 		);
 	}
 }
diff --git a/frame/contracts/src/wasm/prepare.rs b/frame/contracts/src/wasm/prepare.rs
index 15556b0c5cd0..9509371c9412 100644
--- a/frame/contracts/src/wasm/prepare.rs
+++ b/frame/contracts/src/wasm/prepare.rs
@@ -152,8 +152,8 @@ impl<'a, T: Config> ContractModule<'a, T> {
 			for wasm_type in type_section.types() {
 				match wasm_type {
 					Type::Function(func_type) => {
-						let return_type = func_type.return_type();
-						for value_type in func_type.params().iter().chain(return_type.iter()) {
+						let return_type = func_type.results().get(0);
+						for value_type in func_type.params().iter().chain(return_type) {
 							match value_type {
 								ValueType::F32 | ValueType::F64 =>
 									return Err("use of floating point type in function types is forbidden"),
@@ -279,9 +279,7 @@ impl<'a, T: Config> ContractModule<'a, T> {
 			let Type::Function(ref func_ty) = types
 				.get(func_ty_idx as usize)
 				.ok_or_else(|| "function has a non-existent type")?;
-			if !func_ty.params().is_empty() ||
-				!(func_ty.return_type().is_none() ||
-					func_ty.return_type() == Some(ValueType::I32)) {
+			if !(func_ty.params().is_empty() && func_ty.results().is_empty()) {
 				return Err("entry point has wrong signature");
 			}
 		}

From c5506801e760337e779657b6fdcb6f9d3e6e334a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Mon, 19 Apr 2021 21:29:43 +0100
Subject: [PATCH 0661/1194] client: remove time unit from block time loaded
 message (#8639)

---
 client/consensus/slots/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs
index 5157f381e6f4..1436f5f5c2c2 100644
--- a/client/consensus/slots/src/lib.rs
+++ b/client/consensus/slots/src/lib.rs
@@ -584,7 +584,7 @@ impl<T: Clone + Send + Sync + 'static> SlotDuration<T> {
 					cb(client.runtime_api(), &BlockId::number(Zero::zero()))?;
 
 				info!(
-					"⏱  Loaded block-time = {:?} milliseconds from genesis on first-launch",
+					"⏱  Loaded block-time = {:?} from genesis on first-launch",
 					genesis_slot_duration.slot_duration()
 				);
 

From ebf25918c482a2b594018f80a155be7d04661aa9 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Tue, 20 Apr 2021 15:42:11 +0200
Subject: [PATCH 0662/1194] Enable --no-private-ipv4 by default for live chains
 (#8642)

* Enable --no-private-ipv4 by default for live chains

* Make the selection a bit easier to read

* Update client/cli/src/params/network_params.rs

Co-authored-by: Andronik Ordian <write@reusable.software>

Co-authored-by: Andronik Ordian <write@reusable.software>
---
 client/cli/src/params/network_params.rs | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/client/cli/src/params/network_params.rs b/client/cli/src/params/network_params.rs
index 24245cd57a5e..d4dcd6ebaa79 100644
--- a/client/cli/src/params/network_params.rs
+++ b/client/cli/src/params/network_params.rs
@@ -64,12 +64,19 @@ pub struct NetworkParams {
 	#[structopt(long = "port", value_name = "PORT", conflicts_with_all = &[ "listen-addr" ])]
 	pub port: Option<u16>,
 
-	/// Forbid connecting to private IPv4 addresses (as specified in
+	/// Always forbid connecting to private IPv4 addresses (as specified in
 	/// [RFC1918](https://tools.ietf.org/html/rfc1918)), unless the address was passed with
-	/// `--reserved-nodes` or `--bootnodes`.
-	#[structopt(long = "no-private-ipv4")]
+	/// `--reserved-nodes` or `--bootnodes`. Enabled by default for chains marked as "live" in
+	/// their chain specifications.
+	#[structopt(long = "no-private-ipv4", conflicts_with_all = &["allow-private-ipv4"])]
 	pub no_private_ipv4: bool,
 
+	/// Always accept connecting to private IPv4 addresses (as specified in
+	/// [RFC1918](https://tools.ietf.org/html/rfc1918)). Enabled by default for chains marked as
+	/// "local" in their chain specifications, or when `--dev` is passed.
+	#[structopt(long = "allow-private-ipv4", conflicts_with_all = &["no-private-ipv4"])]
+	pub allow_private_ipv4: bool,
+
 	/// Specify the number of outgoing connections we're trying to maintain.
 	#[structopt(long = "out-peers", value_name = "COUNT", default_value = "25")]
 	pub out_peers: u32,
@@ -173,6 +180,13 @@ impl NetworkParams {
 			|| is_dev
 			|| matches!(chain_type, ChainType::Local | ChainType::Development);
 
+		let allow_private_ipv4 = match (self.allow_private_ipv4, self.no_private_ipv4) {
+			(true, true) => unreachable!("`*_private_ipv4` flags are mutually exclusive; qed"),
+			(true, false) => true,
+			(false, true) => false,
+			(false, false) => is_dev || matches!(chain_type, ChainType::Local | ChainType::Development),
+		};
+
 		NetworkConfiguration {
 			boot_nodes,
 			net_config_path,
@@ -195,7 +209,7 @@ impl NetworkParams {
 			client_version: client_id.to_string(),
 			transport: TransportConfig::Normal {
 				enable_mdns: !is_dev && !self.no_mdns,
-				allow_private_ipv4: !self.no_private_ipv4,
+				allow_private_ipv4,
 				wasm_external_transport: None,
 			},
 			max_parallel_downloads: self.max_parallel_downloads,

From 681f18875a5901b8d66cf6725b8077beb0a95989 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Tue, 20 Apr 2021 15:42:58 +0200
Subject: [PATCH 0663/1194] Authority-discovery no longer publishes non-global
 IP addresses (#8643)

* Authority-discovery no longer publishes non-global IP addresses

* Cargo.lock

* Update client/authority-discovery/src/lib.rs

Co-authored-by: Andronik Ordian <write@reusable.software>

Co-authored-by: Andronik Ordian <write@reusable.software>
---
 Cargo.lock                               |  1 +
 bin/node/cli/src/service.rs              |  7 ++++++-
 client/authority-discovery/Cargo.toml    |  1 +
 client/authority-discovery/src/lib.rs    |  9 +++++++++
 client/authority-discovery/src/worker.rs | 24 +++++++++++++++++++++---
 5 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 679aaafcc259..8f8c306d78e7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6857,6 +6857,7 @@ dependencies = [
  "either",
  "futures 0.3.13",
  "futures-timer 3.0.2",
+ "ip_network",
  "libp2p",
  "log",
  "parity-scale-codec",
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index 5fa7aa00df56..b00451267d96 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -218,6 +218,7 @@ pub fn new_full_base(
 	} = new_partial(&config)?;
 
 	let shared_voter_state = rpc_setup;
+	let auth_disc_publish_non_global_ips = config.network.allow_non_globals_in_dht;
 
 	config.network.extra_sets.push(grandpa::grandpa_peers_set_config());
 
@@ -320,7 +321,11 @@ pub fn new_full_base(
 				Event::Dht(e) => Some(e),
 				_ => None,
 			}});
-		let (authority_discovery_worker, _service) = sc_authority_discovery::new_worker_and_service(
+		let (authority_discovery_worker, _service) = sc_authority_discovery::new_worker_and_service_with_config(
+			sc_authority_discovery::WorkerConfig {
+				publish_non_global_ips: auth_disc_publish_non_global_ips,
+				..Default::default()
+			},
 			client.clone(),
 			network.clone(),
 			Box::pin(dht_event_stream),
diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml
index e3727e093d00..5b5baa999c8b 100644
--- a/client/authority-discovery/Cargo.toml
+++ b/client/authority-discovery/Cargo.toml
@@ -23,6 +23,7 @@ derive_more = "0.99.2"
 either = "1.5.3"
 futures = "0.3.9"
 futures-timer = "3.0.1"
+ip_network = "0.3.4"
 libp2p = { version = "0.37.1", default-features = false, features = ["kad"] }
 log = "0.4.8"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
diff --git a/client/authority-discovery/src/lib.rs b/client/authority-discovery/src/lib.rs
index 469c0851f161..ab6338963da4 100644
--- a/client/authority-discovery/src/lib.rs
+++ b/client/authority-discovery/src/lib.rs
@@ -62,6 +62,14 @@ pub struct WorkerConfig {
 	///
 	/// By default this is set to 10 minutes.
 	pub max_query_interval: Duration,
+
+	/// If `false`, the node won't publish on the DHT multiaddresses that contain non-global
+	/// IP addresses (such as 10.0.0.1).
+	///
+	/// Recommended: `false` for live chains, and `true` for local chains or for testing.
+	///
+	/// Defaults to `true` to avoid the surprise factor.
+	pub publish_non_global_ips: bool,
 }
 
 impl Default for WorkerConfig {
@@ -81,6 +89,7 @@ impl Default for WorkerConfig {
 			// comparing `authority_discovery_authority_addresses_requested_total` and
 			// `authority_discovery_dht_event_received`.
 			max_query_interval: Duration::from_secs(10 * 60),
+			publish_non_global_ips: true,
 		}
 	}
 }
diff --git a/client/authority-discovery/src/worker.rs b/client/authority-discovery/src/worker.rs
index fb1fb6ce5864..3b76215dc24c 100644
--- a/client/authority-discovery/src/worker.rs
+++ b/client/authority-discovery/src/worker.rs
@@ -30,6 +30,7 @@ use futures::{future, FutureExt, Stream, StreamExt, stream::Fuse};
 use addr_cache::AddrCache;
 use async_trait::async_trait;
 use codec::Decode;
+use ip_network::IpNetwork;
 use libp2p::{core::multiaddr, multihash::{Multihash, Hasher}};
 use log::{debug, error, log_enabled};
 use prometheus_endpoint::{Counter, CounterVec, Gauge, Opts, U64, register};
@@ -115,6 +116,8 @@ pub struct Worker<Client, Network, Block, DhtEventStream> {
 	/// List of keys onto which addresses have been published at the latest publication.
 	/// Used to check whether they have changed.
 	latest_published_keys: HashSet<CryptoTypePublicPair>,
+	/// Same value as in the configuration.
+	publish_non_global_ips: bool,
 
 	/// Interval at which to request addresses of authorities, refilling the pending lookups queue.
 	query_interval: ExpIncInterval,
@@ -197,6 +200,7 @@ where
 			publish_interval,
 			publish_if_changed_interval,
 			latest_published_keys: HashSet::new(),
+			publish_non_global_ips: config.publish_non_global_ips,
 			query_interval,
 			pending_lookups: Vec::new(),
 			in_flight_lookups: HashMap::new(),
@@ -267,10 +271,24 @@ where
 		}
 	}
 
-	fn addresses_to_publish(&self) -> impl ExactSizeIterator<Item = Multiaddr> {
+	fn addresses_to_publish(&self) -> impl Iterator<Item = Multiaddr> {
 		let peer_id: Multihash = self.network.local_peer_id().into();
+		let publish_non_global_ips = self.publish_non_global_ips;
 		self.network.external_addresses()
 			.into_iter()
+			.filter(move |a| {
+				if publish_non_global_ips {
+					return true;
+				}
+
+				a.iter().all(|p| match p {
+					// The `ip_network` library is used because its `is_global()` method is stable,
+					// while `is_global()` in the standard library currently isn't.
+					multiaddr::Protocol::Ip4(ip) if !IpNetwork::from(ip).is_global() => false,
+					multiaddr::Protocol::Ip6(ip) if !IpNetwork::from(ip).is_global() => false,
+					_ => true,
+				})
+			})
 			.map(move |a| {
 				if a.iter().any(|p| matches!(p, multiaddr::Protocol::P2p(_))) {
 					a
@@ -299,7 +317,7 @@ where
 			return Ok(())
 		}
 
-		let addresses = self.addresses_to_publish();
+		let addresses = self.addresses_to_publish().map(|a| a.to_vec()).collect::<Vec<_>>();
 
 		if let Some(metrics) = &self.metrics {
 			metrics.publish.inc();
@@ -309,7 +327,7 @@ where
 		}
 
 		let mut serialized_addresses = vec![];
-		schema::AuthorityAddresses { addresses: addresses.map(|a| a.to_vec()).collect() }
+		schema::AuthorityAddresses { addresses }
 			.encode(&mut serialized_addresses)
 			.map_err(Error::EncodingProto)?;
 

From 322b26a401ccdde0ef5eeb994bc420331aacb489 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Tue, 20 Apr 2021 20:39:07 +0200
Subject: [PATCH 0664/1194] Revert "Properly close notification substreams
 (#8534)" (#8646)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c93ef27486e5f14696e5b6d36edafea7936edbc8.

Co-authored-by: André Silva <andrerfosilva@gmail.com>
---
 .../src/protocol/notifications/handler.rs     | 291 +++---------------
 .../notifications/upgrade/notifications.rs    |  74 +----
 2 files changed, 65 insertions(+), 300 deletions(-)

diff --git a/client/network/src/protocol/notifications/handler.rs b/client/network/src/protocol/notifications/handler.rs
index 2b350cd7fcfc..99677cc45e54 100644
--- a/client/network/src/protocol/notifications/handler.rs
+++ b/client/network/src/protocol/notifications/handler.rs
@@ -159,16 +159,6 @@ enum State {
 	Closed {
 		/// True if an outgoing substream is still in the process of being opened.
 		pending_opening: bool,
-
-		/// Outbound substream that has been accepted by the remote. Being closed.
-		out_substream_closing: Option<NotificationsOutSubstream<NegotiatedSubstream>>,
-
-		/// Substream opened by the remote. Being closed.
-		in_substream_closing: Option<NotificationsInSubstream<NegotiatedSubstream>>,
-
-		/// Substream re-opened by the remote. Not to be closed after `in_substream_closing` has
-		/// been closed.
-		in_substream_reopened: Option<NotificationsInSubstream<NegotiatedSubstream>>,
 	},
 
 	/// Protocol is in the "Closed" state. A [`NotifsHandlerOut::OpenDesiredByRemote`] has been
@@ -177,9 +167,6 @@ enum State {
 		/// Substream opened by the remote and that hasn't been accepted/rejected yet.
 		in_substream: NotificationsInSubstream<NegotiatedSubstream>,
 
-		/// Outbound substream that has been accepted by the remote. Being closed.
-		out_substream_closing: Option<NotificationsOutSubstream<NegotiatedSubstream>>,
-
 		/// See [`State::Closed::pending_opening`].
 		pending_opening: bool,
 	},
@@ -190,15 +177,8 @@ enum State {
 	/// A [`NotifsHandlerOut::OpenResultOk`] or a [`NotifsHandlerOut::OpenResultErr`] event must
 	/// be emitted when transitionning to respectively [`State::Open`] or [`State::Closed`].
 	Opening {
-		/// Outbound substream that has been accepted by the remote. Being closed. An outbound
-		/// substream request has been emitted towards libp2p if and only if this field is `None`.
-		out_substream_closing: Option<NotificationsOutSubstream<NegotiatedSubstream>>,
-
-		/// Substream re-opened by the remote. Has been accepted.
-		in_substream_reopened: Option<NotificationsInSubstream<NegotiatedSubstream>>,
-
-		/// Substream opened by the remote. Being closed.
-		in_substream_closing: Option<NotificationsInSubstream<NegotiatedSubstream>>,
+		/// Substream opened by the remote. If `Some`, has been accepted.
+		in_substream: Option<NotificationsInSubstream<NegotiatedSubstream>>,
 	},
 
 	/// Protocol is in the "Open" state.
@@ -247,9 +227,6 @@ impl IntoProtocolsHandler for NotifsHandlerProto {
 					handshake,
 					state: State::Closed {
 						pending_opening: false,
-						in_substream_closing: None,
-						in_substream_reopened: None,
-						out_substream_closing: None,
 					},
 					max_notification_size: max_size,
 				}
@@ -510,16 +487,7 @@ impl ProtocolsHandler for NotifsHandler {
 	) {
 		let mut protocol_info = &mut self.protocols[protocol_index];
 		match protocol_info.state {
-			State::Closed {
-				ref mut pending_opening,
-				ref mut out_substream_closing,
-				ref mut in_substream_closing,
-				ref mut in_substream_reopened
-			}
-				if in_substream_closing.is_none() && in_substream_reopened.is_none()
-			=> {
-				debug_assert!(!(out_substream_closing.is_some() && *pending_opening));
-
+			State::Closed { pending_opening } => {
 				self.events_queue.push_back(ProtocolsHandlerEvent::Custom(
 					NotifsHandlerOut::OpenDesiredByRemote {
 						protocol_index,
@@ -528,31 +496,9 @@ impl ProtocolsHandler for NotifsHandler {
 
 				protocol_info.state = State::OpenDesiredByRemote {
 					in_substream: new_substream,
-					out_substream_closing: out_substream_closing.take(),
-					pending_opening: *pending_opening,
+					pending_opening,
 				};
 			},
-
-			State::Opening { ref mut in_substream_closing, ref mut in_substream_reopened, .. } => {
-				*in_substream_closing = None;
-
-				// Create `handshake_message` on a separate line to be sure that the
-				// lock is released as soon as possible.
-				let handshake_message = protocol_info.handshake.read().clone();
-				new_substream.send_handshake(handshake_message);
-				*in_substream_reopened = Some(new_substream);
-			},
-
-			State::Open { ref mut in_substream, .. } if in_substream.is_none() => {
-				// Create `handshake_message` on a separate line to be sure that the
-				// lock is released as soon as possible.
-				let handshake_message = protocol_info.handshake.read().clone();
-				new_substream.send_handshake(handshake_message);
-				*in_substream = Some(new_substream);
-			},
-
-			State::Closed { .. } |
-			State::Open { .. } |
 			State::OpenDesiredByRemote { .. } => {
 				// If a substream already exists, silently drop the new one.
 				// Note that we drop the substream, which will send an equivalent to a
@@ -563,6 +509,19 @@ impl ProtocolsHandler for NotifsHandler {
 				// to do.
 				return;
 			},
+			State::Opening { ref mut in_substream, .. } |
+			State::Open { ref mut in_substream, .. } => {
+				if in_substream.is_some() {
+					// Same remark as above.
+					return;
+				}
+
+				// Create `handshake_message` on a separate line to be sure that the
+				// lock is released as soon as possible.
+				let handshake_message = protocol_info.handshake.read().clone();
+				new_substream.send_handshake(handshake_message);
+				*in_substream = Some(new_substream);
+			},
 		}
 	}
 
@@ -572,24 +531,16 @@ impl ProtocolsHandler for NotifsHandler {
 		protocol_index: Self::OutboundOpenInfo
 	) {
 		match self.protocols[protocol_index].state {
-			State::Closed { ref mut pending_opening, ref mut out_substream_closing, .. } |
-			State::OpenDesiredByRemote { ref mut pending_opening, ref mut out_substream_closing, .. } => {
-				debug_assert!(out_substream_closing.is_none());
+			State::Closed { ref mut pending_opening } |
+			State::OpenDesiredByRemote { ref mut pending_opening, .. } => {
 				debug_assert!(*pending_opening);
-				*out_substream_closing = Some(substream);
 				*pending_opening = false;
 			}
 			State::Open { .. } => {
 				error!(target: "sub-libp2p", "☎️ State mismatch in notifications handler");
 				debug_assert!(false);
 			}
-			State::Opening {
-				ref mut in_substream_reopened, ref mut in_substream_closing,
-				ref mut out_substream_closing
-			} => {
-				debug_assert!(out_substream_closing.is_none());
-				debug_assert!(!(in_substream_reopened.is_some() && in_substream_closing.is_some()));
-
+			State::Opening { ref mut in_substream } => {
 				let (async_tx, async_rx) = mpsc::channel(ASYNC_NOTIFICATIONS_BUFFER_SIZE);
 				let (sync_tx, sync_rx) = mpsc::channel(SYNC_NOTIFICATIONS_BUFFER_SIZE);
 				let notifications_sink = NotificationsSink {
@@ -603,7 +554,7 @@ impl ProtocolsHandler for NotifsHandler {
 				self.protocols[protocol_index].state = State::Open {
 					notifications_sink_rx: stream::select(async_rx.fuse(), sync_rx.fuse()).peekable(),
 					out_substream: Some(substream),
-					in_substream: in_substream_reopened.take().or(in_substream_closing.take()),
+					in_substream: in_substream.take(),
 				};
 
 				self.events_queue.push_back(ProtocolsHandlerEvent::Custom(
@@ -623,13 +574,8 @@ impl ProtocolsHandler for NotifsHandler {
 			NotifsHandlerIn::Open { protocol_index } => {
 				let protocol_info = &mut self.protocols[protocol_index];
 				match &mut protocol_info.state {
-					State::Closed {
-						ref mut pending_opening,
-						ref mut in_substream_closing,
-						ref mut in_substream_reopened,
-						ref mut out_substream_closing
-					} => {
-						if !*pending_opening && out_substream_closing.is_none() {
+					State::Closed { pending_opening } => {
+						if !*pending_opening {
 							let proto = NotificationsOut::new(
 								protocol_info.name.clone(),
 								protocol_info.handshake.read().clone(),
@@ -642,31 +588,14 @@ impl ProtocolsHandler for NotifsHandler {
 							});
 						}
 
-						debug_assert!(!(in_substream_reopened.is_some() && in_substream_closing.is_some()));
 						protocol_info.state = State::Opening {
-							in_substream_closing: in_substream_closing.take(),
-							in_substream_reopened: in_substream_reopened.take(),
-							out_substream_closing: out_substream_closing.take(),
+							in_substream: None,
 						};
 					},
-
-					State::OpenDesiredByRemote { ..  } => {
-						// The state change is done in two steps because of borrowing issues.
-						let (pending_opening, out_substream_closing, mut in_substream) = match
-							mem::replace(&mut protocol_info.state,
-								State::Opening {
-									in_substream_closing: None, in_substream_reopened: None,
-									out_substream_closing: None,
-								})
-						{
-							State::OpenDesiredByRemote { pending_opening, out_substream_closing, in_substream, .. } =>
-								(pending_opening, out_substream_closing, in_substream),
-							_ => unreachable!()
-						};
-
+					State::OpenDesiredByRemote { pending_opening, in_substream } => {
 						let handshake_message = protocol_info.handshake.read().clone();
 
-						if !pending_opening && out_substream_closing.is_none() {
+						if !*pending_opening {
 							let proto = NotificationsOut::new(
 								protocol_info.name.clone(),
 								handshake_message.clone(),
@@ -681,13 +610,17 @@ impl ProtocolsHandler for NotifsHandler {
 
 						in_substream.send_handshake(handshake_message);
 
+						// The state change is done in two steps because of borrowing issues.
+						let in_substream = match
+							mem::replace(&mut protocol_info.state, State::Opening { in_substream: None })
+						{
+							State::OpenDesiredByRemote { in_substream, .. } => in_substream,
+							_ => unreachable!()
+						};
 						protocol_info.state = State::Opening {
-							out_substream_closing,
-							in_substream_closing: None,
-							in_substream_reopened: Some(in_substream),
+							in_substream: Some(in_substream),
 						};
 					},
-
 					State::Opening { .. } |
 					State::Open { .. } => {
 						// As documented, it is forbidden to send an `Open` while there is already
@@ -699,30 +632,15 @@ impl ProtocolsHandler for NotifsHandler {
 			},
 
 			NotifsHandlerIn::Close { protocol_index } => {
-				match &mut self.protocols[protocol_index].state {
-					State::Open { in_substream, out_substream, .. } => {
-						if let Some(in_substream) = in_substream.as_mut() {
-							in_substream.set_close_desired();
-						}
+				match self.protocols[protocol_index].state {
+					State::Open { .. } => {
 						self.protocols[protocol_index].state = State::Closed {
-							in_substream_closing: in_substream.take(),
-							in_substream_reopened: None,
-							out_substream_closing: out_substream.take(),
 							pending_opening: false,
 						};
 					},
-					State::Opening { in_substream_closing, in_substream_reopened, out_substream_closing } => {
-						debug_assert!(!(in_substream_reopened.is_some() && in_substream_closing.is_some()));
-
-						let pending_opening = out_substream_closing.is_none();
-						if let Some(in_substream_reopened) = in_substream_reopened.as_mut() {
-							in_substream_reopened.set_close_desired();
-						}
+					State::Opening { .. } => {
 						self.protocols[protocol_index].state = State::Closed {
-							in_substream_closing: in_substream_reopened.take().or(in_substream_closing.take()),
-							in_substream_reopened: None,
-							out_substream_closing: out_substream_closing.take(),
-							pending_opening,
+							pending_opening: true,
 						};
 
 						self.events_queue.push_back(ProtocolsHandlerEvent::Custom(
@@ -731,23 +649,8 @@ impl ProtocolsHandler for NotifsHandler {
 							}
 						));
 					},
-					State::OpenDesiredByRemote { .. } => {
-						let (mut in_substream, pending_opening, out_substream_closing) = match mem::replace(
-							&mut self.protocols[protocol_index].state,
-							State::Closed { pending_opening: false, in_substream_closing: None,
-											in_substream_reopened: None, out_substream_closing: None,
-										}
-						) {
-							State::OpenDesiredByRemote { in_substream, pending_opening, out_substream_closing } =>
-								(in_substream, pending_opening, out_substream_closing),
-							_ => unreachable!("Can only enter this branch after OpenDesiredByRemote; qed")
-						};
-
-						in_substream.set_close_desired();
+					State::OpenDesiredByRemote { pending_opening, .. } => {
 						self.protocols[protocol_index].state = State::Closed {
-							in_substream_closing: Some(in_substream),
-							in_substream_reopened: None,
-							out_substream_closing,
 							pending_opening,
 						};
 					}
@@ -769,30 +672,14 @@ impl ProtocolsHandler for NotifsHandler {
 		_: ProtocolsHandlerUpgrErr<NotificationsHandshakeError>
 	) {
 		match self.protocols[num].state {
-			State::Closed { ref mut pending_opening, ref mut out_substream_closing, .. } |
-			State::OpenDesiredByRemote { ref mut pending_opening, ref mut out_substream_closing, .. } => {
-				debug_assert!(out_substream_closing.is_none());
+			State::Closed { ref mut pending_opening } |
+			State::OpenDesiredByRemote { ref mut pending_opening, .. } => {
 				debug_assert!(*pending_opening);
 				*pending_opening = false;
 			}
 
-			State::Opening {
-				ref mut out_substream_closing,
-				ref mut in_substream_closing,
-				ref mut in_substream_reopened,
-				..
-			} => {
-				debug_assert!(!(in_substream_reopened.is_some() && in_substream_closing.is_some()));
-				debug_assert!(out_substream_closing.is_none());
-
-				if let Some(in_substream_reopened) = in_substream_reopened.as_mut() {
-					in_substream_reopened.set_close_desired();
-				}
-
+			State::Opening { .. } => {
 				self.protocols[num].state = State::Closed {
-					out_substream_closing: None,
-					in_substream_closing: in_substream_reopened.take().or(in_substream_closing.take()),
-					in_substream_reopened: None,
 					pending_opening: false,
 				};
 
@@ -901,67 +788,15 @@ impl ProtocolsHandler for NotifsHandler {
 			}
 		}
 
-		// Try close outbound substreams that are marked for closing.
-		for protocol_index in 0..self.protocols.len() {
-			match &mut self.protocols[protocol_index].state {
-				State::Closed { out_substream_closing: ref mut substream @ Some(_), .. } |
-				State::OpenDesiredByRemote { out_substream_closing: ref mut substream @ Some(_), .. } |
-				State::Opening { out_substream_closing: ref mut substream @ Some(_), .. } => {
-					match Sink::poll_close(Pin::new(substream.as_mut().unwrap()), cx) {
-						Poll::Pending => {},
-						Poll::Ready(_) => {
-							*substream = None;
-
-							if matches!(self.protocols[protocol_index].state, State::Opening { .. }) {
-								let protocol_info = &mut self.protocols[protocol_index];
-								let proto = NotificationsOut::new(
-									protocol_info.name.clone(),
-									protocol_info.handshake.read().clone(),
-									protocol_info.max_notification_size
-								);
-
-								self.events_queue.push_back(ProtocolsHandlerEvent::OutboundSubstreamRequest {
-									protocol: SubstreamProtocol::new(proto, protocol_index)
-										.with_timeout(OPEN_TIMEOUT),
-								});
-							}
-						}
-					}
-				}
-				_ => {}
-			}
-
-			if let State::Closed {
-				pending_opening,
-				out_substream_closing: None,
-				in_substream_closing,
-				in_substream_reopened: ref mut in_substream_reopened @ Some(_),
-				..
-			} = &mut self.protocols[protocol_index].state {
-				debug_assert!(!*pending_opening);
-				debug_assert!(in_substream_closing.is_none());
-
-				self.events_queue.push_back(ProtocolsHandlerEvent::Custom(
-					NotifsHandlerOut::OpenDesiredByRemote {
-						protocol_index,
-					}
-				));
-
-				self.protocols[protocol_index].state = State::OpenDesiredByRemote {
-					in_substream: in_substream_reopened.take()
-						.expect("The if let above ensures that this is Some ; qed"),
-					out_substream_closing: None,
-					pending_opening: false,
-				};
-			}
-		}
-
 		// Poll inbound substreams.
 		for protocol_index in 0..self.protocols.len() {
 			// Inbound substreams being closed is always tolerated, except for the
 			// `OpenDesiredByRemote` state which might need to be switched back to `Closed`.
 			match &mut self.protocols[protocol_index].state {
-				State::Open { in_substream: None, .. } => {}
+				State::Closed { .. } |
+				State::Open { in_substream: None, .. } |
+				State::Opening { in_substream: None } => {}
+
 				State::Open { in_substream: in_substream @ Some(_), .. } => {
 					match Stream::poll_next(Pin::new(in_substream.as_mut().unwrap()), cx) {
 						Poll::Pending => {},
@@ -977,16 +812,13 @@ impl ProtocolsHandler for NotifsHandler {
 					}
 				}
 
-				State::OpenDesiredByRemote { in_substream, pending_opening, out_substream_closing } => {
+				State::OpenDesiredByRemote { in_substream, pending_opening } => {
 					match NotificationsInSubstream::poll_process(Pin::new(in_substream), cx) {
 						Poll::Pending => {},
 						Poll::Ready(Ok(void)) => match void {},
 						Poll::Ready(Err(_)) => {
 							self.protocols[protocol_index].state = State::Closed {
 								pending_opening: *pending_opening,
-								in_substream_closing: None,
-								in_substream_reopened: None,
-								out_substream_closing: out_substream_closing.take(),
 							};
 							return Poll::Ready(ProtocolsHandlerEvent::Custom(
 								NotifsHandlerOut::CloseDesired { protocol_index }
@@ -995,40 +827,13 @@ impl ProtocolsHandler for NotifsHandler {
 					}
 				}
 
-				State::Opening { in_substream_closing: None, in_substream_reopened: None, .. } |
-				State::Closed { in_substream_closing: None, in_substream_reopened: None, .. } => {}
-
-				State::Opening {
-					in_substream_closing: ref mut in_substream @ Some(_),
-					in_substream_reopened: None,
-					..
-				} |
-				State::Opening {
-					in_substream_closing: None,
-					in_substream_reopened: ref mut in_substream @ Some(_),
-					..
-				} |
-				State::Closed {
-					in_substream_closing: ref mut in_substream @ Some(_),
-					in_substream_reopened: None,
-					..
-				} |
-				State::Closed {
-					in_substream_closing: None,
-					in_substream_reopened: ref mut in_substream @ Some(_),
-					..
-				} => {
+				State::Opening { in_substream: in_substream @ Some(_), .. } => {
 					match NotificationsInSubstream::poll_process(Pin::new(in_substream.as_mut().unwrap()), cx) {
 						Poll::Pending => {},
 						Poll::Ready(Ok(void)) => match void {},
 						Poll::Ready(Err(_)) => *in_substream = None,
 					}
 				}
-
-				State::Opening { in_substream_closing: Some(_), in_substream_reopened: Some(_), .. } |
-				State::Closed { in_substream_closing: Some(_), in_substream_reopened: Some(_), .. } => {
-					debug_assert!(false);
-				}
 			}
 		}
 
diff --git a/client/network/src/protocol/notifications/upgrade/notifications.rs b/client/network/src/protocol/notifications/upgrade/notifications.rs
index f76472a0de2c..eba96441bcfd 100644
--- a/client/network/src/protocol/notifications/upgrade/notifications.rs
+++ b/client/network/src/protocol/notifications/upgrade/notifications.rs
@@ -88,11 +88,10 @@ enum NotificationsInSubstreamHandshake {
 	PendingSend(Vec<u8>),
 	/// Handshake message was pushed in the socket. Still need to flush.
 	Flush,
-	/// Ready to receive notifications. Handshake message successfully sent and flushed, or
-	/// sending side closed before handshake sent.
-	Normal { write_side_open: bool },
-	/// Closing our writing side.
-	Closing { remote_write_open: bool },
+	/// Handshake message successfully sent and flushed.
+	Sent,
+	/// Remote has closed their writing side. We close our own writing side in return.
+	ClosingInResponseToRemote,
 	/// Both our side and the remote have closed their writing side.
 	BothSidesClosed,
 }
@@ -170,30 +169,8 @@ where TSubstream: AsyncRead + AsyncWrite + Unpin + Send + 'static,
 impl<TSubstream> NotificationsInSubstream<TSubstream>
 where TSubstream: AsyncRead + AsyncWrite + Unpin,
 {
-	/// Closes the writing side of the substream, indicating to the remote that we would like this
-	/// substream to be closed.
-	pub fn set_close_desired(&mut self) {
-		match self.handshake {
-			NotificationsInSubstreamHandshake::PendingSend(_) |
-			NotificationsInSubstreamHandshake::Flush |
-			NotificationsInSubstreamHandshake::NotSent |
-			NotificationsInSubstreamHandshake::Normal { write_side_open: true } => {
-				self.handshake = NotificationsInSubstreamHandshake::Closing { remote_write_open: true };
-			}
-			NotificationsInSubstreamHandshake::Normal { write_side_open: false } |
-			NotificationsInSubstreamHandshake::Closing { .. } |
-			NotificationsInSubstreamHandshake::BothSidesClosed => {}
-		}
-	}
-
 	/// Sends the handshake in order to inform the remote that we accept the substream.
-	///
-	/// Has no effect if `set_close_desired` has been called.
 	pub fn send_handshake(&mut self, message: impl Into<Vec<u8>>) {
-		if matches!(self.handshake, NotificationsInSubstreamHandshake::Normal { write_side_open: false }) {
-			return;
-		}
-
 		if !matches!(self.handshake, NotificationsInSubstreamHandshake::NotSent) {
 			error!(target: "sub-libp2p", "Tried to send handshake twice");
 			return;
@@ -208,7 +185,7 @@ where TSubstream: AsyncRead + AsyncWrite + Unpin,
 		let mut this = self.project();
 
 		loop {
-			match mem::replace(this.handshake, NotificationsInSubstreamHandshake::NotSent) {
+			match mem::replace(this.handshake, NotificationsInSubstreamHandshake::Sent) {
 				NotificationsInSubstreamHandshake::PendingSend(msg) =>
 					match Sink::poll_ready(this.socket.as_mut(), cx) {
 						Poll::Ready(_) => {
@@ -226,28 +203,16 @@ where TSubstream: AsyncRead + AsyncWrite + Unpin,
 				NotificationsInSubstreamHandshake::Flush =>
 					match Sink::poll_flush(this.socket.as_mut(), cx)? {
 						Poll::Ready(()) =>
-							*this.handshake = NotificationsInSubstreamHandshake::Normal { write_side_open: true },
+							*this.handshake = NotificationsInSubstreamHandshake::Sent,
 						Poll::Pending => {
 							*this.handshake = NotificationsInSubstreamHandshake::Flush;
 							return Poll::Pending
 						}
 					},
 
-				NotificationsInSubstreamHandshake::Closing { remote_write_open } =>
-					match Sink::poll_close(this.socket.as_mut(), cx)? {
-						Poll::Ready(()) => if remote_write_open {
-							*this.handshake = NotificationsInSubstreamHandshake::Normal { write_side_open: false }
-						} else {
-							*this.handshake = NotificationsInSubstreamHandshake::BothSidesClosed;
-						},
-						Poll::Pending => {
-							*this.handshake = NotificationsInSubstreamHandshake::Closing { remote_write_open };
-							return Poll::Pending
-						}
-					},
-
 				st @ NotificationsInSubstreamHandshake::NotSent |
-				st @ NotificationsInSubstreamHandshake::Normal { .. } |
+				st @ NotificationsInSubstreamHandshake::Sent |
+				st @ NotificationsInSubstreamHandshake::ClosingInResponseToRemote |
 				st @ NotificationsInSubstreamHandshake::BothSidesClosed => {
 					*this.handshake = st;
 					return Poll::Pending;
@@ -267,7 +232,7 @@ where TSubstream: AsyncRead + AsyncWrite + Unpin,
 
 		// This `Stream` implementation first tries to send back the handshake if necessary.
 		loop {
-			match mem::replace(this.handshake, NotificationsInSubstreamHandshake::NotSent) {
+			match mem::replace(this.handshake, NotificationsInSubstreamHandshake::Sent) {
 				NotificationsInSubstreamHandshake::NotSent => {
 					*this.handshake = NotificationsInSubstreamHandshake::NotSent;
 					return Poll::Pending
@@ -289,39 +254,34 @@ where TSubstream: AsyncRead + AsyncWrite + Unpin,
 				NotificationsInSubstreamHandshake::Flush =>
 					match Sink::poll_flush(this.socket.as_mut(), cx)? {
 						Poll::Ready(()) =>
-							*this.handshake = NotificationsInSubstreamHandshake::Normal { write_side_open: true },
+							*this.handshake = NotificationsInSubstreamHandshake::Sent,
 						Poll::Pending => {
 							*this.handshake = NotificationsInSubstreamHandshake::Flush;
 							return Poll::Pending
 						}
 					},
 
-				NotificationsInSubstreamHandshake::Normal { write_side_open } => {
+				NotificationsInSubstreamHandshake::Sent => {
 					match Stream::poll_next(this.socket.as_mut(), cx) {
-						Poll::Ready(None) if write_side_open =>
-							*this.handshake =
-								NotificationsInSubstreamHandshake::Closing { remote_write_open: false },
-						Poll::Ready(None) =>
-							*this.handshake = NotificationsInSubstreamHandshake::BothSidesClosed,
+						Poll::Ready(None) => *this.handshake =
+							NotificationsInSubstreamHandshake::ClosingInResponseToRemote,
 						Poll::Ready(Some(msg)) => {
-							*this.handshake = NotificationsInSubstreamHandshake::Normal { write_side_open };
+							*this.handshake = NotificationsInSubstreamHandshake::Sent;
 							return Poll::Ready(Some(msg))
 						},
 						Poll::Pending => {
-							*this.handshake = NotificationsInSubstreamHandshake::Normal { write_side_open };
+							*this.handshake = NotificationsInSubstreamHandshake::Sent;
 							return Poll::Pending
 						},
 					}
 				},
 
-				NotificationsInSubstreamHandshake::Closing { remote_write_open } =>
+				NotificationsInSubstreamHandshake::ClosingInResponseToRemote =>
 					match Sink::poll_close(this.socket.as_mut(), cx)? {
-						Poll::Ready(()) if remote_write_open =>
-							*this.handshake = NotificationsInSubstreamHandshake::Normal { write_side_open: false },
 						Poll::Ready(()) =>
 							*this.handshake = NotificationsInSubstreamHandshake::BothSidesClosed,
 						Poll::Pending => {
-							*this.handshake = NotificationsInSubstreamHandshake::Closing { remote_write_open };
+							*this.handshake = NotificationsInSubstreamHandshake::ClosingInResponseToRemote;
 							return Poll::Pending
 						}
 					},

From bc022b4a57e7ad862cecf2757cc1410e798f6fe1 Mon Sep 17 00:00:00 2001
From: Niklas Adolfsson <niklasadolfsson1@gmail.com>
Date: Wed, 21 Apr 2021 12:59:15 +0200
Subject: [PATCH 0665/1194] update jsonrpsee to 0.2.0-alpha.5 (#8644)

---
 Cargo.lock                                  | 38 +++++++++++----------
 utils/frame/remote-externalities/Cargo.toml |  6 ++--
 utils/frame/remote-externalities/src/lib.rs |  4 +--
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8f8c306d78e7..80bb79a0eca5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -449,6 +449,12 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
 
+[[package]]
+name = "beef"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6736e2428df2ca2848d846c43e88745121a6654696e349ce0054a420815a7409"
+
 [[package]]
 name = "bincode"
 version = "1.3.2"
@@ -2902,12 +2908,12 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-http-client"
-version = "0.2.0-alpha.3"
+version = "0.2.0-alpha.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b15fc3a0ef2e02d770aa1a221d3412443dcaedc43e27d80c957dd5bbd65321b"
+checksum = "7e3a49473ea266be8e9f23e20a7bfa4349109b42319d72cc0b8a101e18fa6466"
 dependencies = [
  "async-trait",
- "futures 0.3.13",
+ "fnv",
  "hyper 0.13.10",
  "hyper-rustls",
  "jsonrpsee-types",
@@ -2916,17 +2922,17 @@ dependencies = [
  "serde",
  "serde_json",
  "thiserror",
- "unicase",
  "url 2.2.1",
 ]
 
 [[package]]
 name = "jsonrpsee-proc-macros"
-version = "0.2.0-alpha.3"
+version = "0.2.0-alpha.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bb4afbda476e2ee11cc6245055c498c116fc8002d2d60fe8338b6ee15d84c3a"
+checksum = "b0cbaee9ca6440e191545a68c7bf28db0ff918359a904e37a6e7cf7edd132f5a"
 dependencies = [
  "Inflector",
+ "proc-macro-crate 1.0.0",
  "proc-macro2",
  "quote",
  "syn",
@@ -2934,32 +2940,29 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-types"
-version = "0.2.0-alpha.3"
+version = "0.2.0-alpha.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c42a82588b5f7830e94341bb7e79d15f46070ab6f64dde1e3b3719721b61c5bf"
+checksum = "e4ce2de6884fb4abee16eca02329a1eec1eb8df8aed751a8e929083820c78ce7"
 dependencies = [
  "async-trait",
- "futures 0.3.13",
+ "beef",
+ "futures-channel",
+ "futures-util",
  "log",
  "serde",
  "serde_json",
- "smallvec 1.6.1",
  "thiserror",
 ]
 
 [[package]]
 name = "jsonrpsee-utils"
-version = "0.2.0-alpha.3"
+version = "0.2.0-alpha.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e65c77838fce96bc554b4a3a159d0b9a2497319ae9305c66ee853998c7ed2fd3"
+checksum = "3b22199cccd81d9ef601be86bedc5bef67aeacbbfddace031d4931c60fca96e9"
 dependencies = [
- "futures 0.3.13",
- "globset",
+ "futures-util",
  "hyper 0.13.10",
  "jsonrpsee-types",
- "lazy_static",
- "log",
- "unicase",
 ]
 
 [[package]]
@@ -6642,7 +6645,6 @@ dependencies = [
  "hex-literal",
  "jsonrpsee-http-client",
  "jsonrpsee-proc-macros",
- "jsonrpsee-types",
  "log",
  "parity-scale-codec",
  "sp-core",
diff --git a/utils/frame/remote-externalities/Cargo.toml b/utils/frame/remote-externalities/Cargo.toml
index 21e6542abcb4..06789442a8c5 100644
--- a/utils/frame/remote-externalities/Cargo.toml
+++ b/utils/frame/remote-externalities/Cargo.toml
@@ -13,10 +13,8 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-jsonrpsee-http-client = { version = "=0.2.0-alpha.3", default-features = false, features = ["tokio02"] }
-# Needed by jsonrpsee-proc-macros: https://github.com/paritytech/jsonrpsee/issues/214
-jsonrpsee-types = "=0.2.0-alpha.3"
-jsonrpsee-proc-macros = "=0.2.0-alpha.3"
+jsonrpsee-http-client = { version = "=0.2.0-alpha.5", default-features = false, features = ["tokio02"] }
+jsonrpsee-proc-macros = "=0.2.0-alpha.5"
 
 hex-literal = "0.3.1"
 env_logger = "0.8.2"
diff --git a/utils/frame/remote-externalities/src/lib.rs b/utils/frame/remote-externalities/src/lib.rs
index 8cca728c1ffa..3ec16ea1982c 100644
--- a/utils/frame/remote-externalities/src/lib.rs
+++ b/utils/frame/remote-externalities/src/lib.rs
@@ -113,7 +113,7 @@ use sp_core::{
 	storage::{StorageKey, StorageData},
 };
 use codec::{Encode, Decode};
-use jsonrpsee_http_client::{HttpClient, HttpConfig};
+use jsonrpsee_http_client::{HttpClient, HttpClientBuilder};
 
 use sp_runtime::traits::Block as BlockT;
 
@@ -173,7 +173,7 @@ impl<B: BlockT> Default for OnlineConfig<B> {
 impl<B: BlockT> OnlineConfig<B> {
 	/// Return a new http rpc client.
 	fn rpc(&self) -> HttpClient {
-		HttpClient::new(&self.uri, HttpConfig { max_request_body_size: u32::MAX })
+		HttpClientBuilder::default().max_request_body_size(u32::MAX).build(&self.uri)
 			.expect("valid HTTP url; qed")
 	}
 }

From 788b0bff09e9ceb3894672cc5eb64542328419de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Thu, 22 Apr 2021 12:44:35 +0200
Subject: [PATCH 0666/1194] contracts: Allow () -> (i32) for backwards
 compatibility (#8656)

---
 frame/contracts/src/wasm/prepare.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frame/contracts/src/wasm/prepare.rs b/frame/contracts/src/wasm/prepare.rs
index 9509371c9412..633edd4aaf8a 100644
--- a/frame/contracts/src/wasm/prepare.rs
+++ b/frame/contracts/src/wasm/prepare.rs
@@ -273,13 +273,17 @@ impl<'a, T: Config> ContractModule<'a, T> {
 
 			// Then check the signature.
 			// Both "call" and "deploy" has a () -> () function type.
+			// We still support () -> (i32) for backwards compatibility.
 			let func_ty_idx = func_entries.get(fn_idx as usize)
 				.ok_or_else(|| "export refers to non-existent function")?
 				.type_ref();
 			let Type::Function(ref func_ty) = types
 				.get(func_ty_idx as usize)
 				.ok_or_else(|| "function has a non-existent type")?;
-			if !(func_ty.params().is_empty() && func_ty.results().is_empty()) {
+			if !(
+				func_ty.params().is_empty() &&
+				(func_ty.results().is_empty() || func_ty.results() == [ValueType::I32])
+			) {
 				return Err("entry point has wrong signature");
 			}
 		}

From c580df6638c72acdacc2b2f4e302dd96b26d4707 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomusdrw@users.noreply.github.com>
Date: Thu, 22 Apr 2021 23:37:03 +0200
Subject: [PATCH 0667/1194] Off-chain indexing is independent from workers
 (#8659)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Pff-chain indexing is independent from worker.

* Remove unauthorized changes.

* 🤦
---
 .../cli/src/params/offchain_worker_params.rs  | 19 ++++++++-----------
 client/db/src/lib.rs                          |  6 ++++++
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/client/cli/src/params/offchain_worker_params.rs b/client/cli/src/params/offchain_worker_params.rs
index ef39a1ed41be..b41a5d562526 100644
--- a/client/cli/src/params/offchain_worker_params.rs
+++ b/client/cli/src/params/offchain_worker_params.rs
@@ -23,14 +23,13 @@
 //! targeted at handling input parameter parsing providing
 //! a reasonable abstraction.
 
-use structopt::StructOpt;
-use sc_service::config::OffchainWorkerConfig;
 use sc_network::config::Role;
+use sc_service::config::OffchainWorkerConfig;
+use structopt::StructOpt;
 
 use crate::error;
 use crate::OffchainWorkerEnabled;
 
-
 /// Offchain worker related parameters.
 #[derive(Debug, StructOpt)]
 pub struct OffchainWorkerParams {
@@ -59,11 +58,7 @@ pub struct OffchainWorkerParams {
 
 impl OffchainWorkerParams {
 	/// Load spec to `Configuration` from `OffchainWorkerParams` and spec factory.
-	pub fn offchain_worker(
-		&self,
-		role: &Role,
-	) -> error::Result<OffchainWorkerConfig>
-	{
+	pub fn offchain_worker(&self, role: &Role) -> error::Result<OffchainWorkerConfig> {
 		let enabled = match (&self.enabled, role) {
 			(OffchainWorkerEnabled::WhenValidating, Role::Authority { .. }) => true,
 			(OffchainWorkerEnabled::Always, _) => true,
@@ -71,8 +66,10 @@ impl OffchainWorkerParams {
 			(OffchainWorkerEnabled::WhenValidating, _) => false,
 		};
 
-		let indexing_enabled = enabled && self.indexing_enabled;
-
-		Ok(OffchainWorkerConfig { enabled, indexing_enabled })
+		let indexing_enabled = self.indexing_enabled;
+		Ok(OffchainWorkerConfig {
+			enabled,
+			indexing_enabled,
+		})
 	}
 }
diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index 086a6ba1c68a..c7bac13e719d 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -699,7 +699,9 @@ pub struct BlockImportOperation<Block: BlockT> {
 
 impl<Block: BlockT> BlockImportOperation<Block> {
 	fn apply_offchain(&mut self, transaction: &mut Transaction<DbHash>) {
+		let mut count = 0;
 		for ((prefix, key), value_operation) in self.offchain_storage_updates.drain(..) {
+			count += 1;
 			let key = crate::offchain::concatenate_prefix_and_key(&prefix, &key);
 			match value_operation {
 				OffchainOverlayedChange::SetValue(val) =>
@@ -708,6 +710,10 @@ impl<Block: BlockT> BlockImportOperation<Block> {
 					transaction.remove(columns::OFFCHAIN, &key),
 			}
 		}
+
+		if count > 0 {
+			log::debug!(target: "sc_offchain", "Applied {} offchain indexing changes.", count);
+		}
 	}
 
 	fn apply_aux(&mut self, transaction: &mut Transaction<DbHash>) {

From 4551b3c5052f05d283b77bda0a06fe8331cd8a55 Mon Sep 17 00:00:00 2001
From: Xiliang Chen <xlchen1291@gmail.com>
Date: Fri, 23 Apr 2021 10:02:54 +1200
Subject: [PATCH 0668/1194] impl Zero and One for fixed point numbers (#8647)

* impl Zero and One for fixed point numbers

* update librocksdb-sys to support M1

* fix build

* trigger CI
---
 Cargo.lock                               | 42 +++++++++++-------------
 bin/node/executor/tests/fees.rs          |  2 +-
 bin/node/runtime/src/impls.rs            |  2 +-
 frame/transaction-payment/src/lib.rs     |  2 +-
 primitives/arithmetic/src/fixed_point.rs | 33 ++++++++++---------
 5 files changed, 39 insertions(+), 42 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 80bb79a0eca5..b468d0227863 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -467,26 +467,21 @@ dependencies = [
 
 [[package]]
 name = "bindgen"
-version = "0.54.0"
+version = "0.57.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66c0bb6167449588ff70803f4127f0684f9063097eca5016f37eb52b92c2cf36"
+checksum = "fd4865004a46a0aafb2a0a5eb19d3c9fc46ee5f063a6cfc605c69ac9ecf5263d"
 dependencies = [
  "bitflags",
  "cexpr",
- "cfg-if 0.1.10",
  "clang-sys",
- "clap",
- "env_logger 0.7.1",
  "lazy_static",
  "lazycell",
- "log",
  "peeking_take_while",
  "proc-macro2",
  "quote",
  "regex",
  "rustc-hash",
  "shlex",
- "which 3.1.1",
 ]
 
 [[package]]
@@ -849,13 +844,13 @@ dependencies = [
 
 [[package]]
 name = "clang-sys"
-version = "0.29.3"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe6837df1d5cba2397b835c8530f51723267e16abbf83892e9e5af4f0e5dd10a"
+checksum = "853eda514c284c2287f4bf20ae614f8781f40a81d32ecda6e91449304dfe077c"
 dependencies = [
  "glob",
  "libc",
- "libloading",
+ "libloading 0.7.0",
 ]
 
 [[package]]
@@ -1935,7 +1930,7 @@ checksum = "03d47dad3685eceed8488986cad3d5027165ea5edb164331770e2059555f10a5"
 dependencies = [
  "lazy_static",
  "libc",
- "libloading",
+ "libloading 0.5.2",
  "winapi 0.3.9",
 ]
 
@@ -3092,6 +3087,16 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "libloading"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a"
+dependencies = [
+ "cfg-if 1.0.0",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "libm"
 version = "0.2.1"
@@ -3534,9 +3539,9 @@ dependencies = [
 
 [[package]]
 name = "librocksdb-sys"
-version = "6.11.4"
+version = "6.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b56f651c204634b936be2f92dbb42c36867e00ff7fe2405591f3b9fa66f09"
+checksum = "5da125e1c0f22c7cae785982115523a0738728498547f415c9054cb17c7e89f9"
 dependencies = [
  "bindgen",
  "cc",
@@ -6236,7 +6241,7 @@ dependencies = [
  "prost",
  "prost-types",
  "tempfile",
- "which 4.0.2",
+ "which",
 ]
 
 [[package]]
@@ -11053,15 +11058,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "which"
-version = "3.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "which"
 version = "4.0.2"
diff --git a/bin/node/executor/tests/fees.rs b/bin/node/executor/tests/fees.rs
index ad24db03f983..5474adbd32a8 100644
--- a/bin/node/executor/tests/fees.rs
+++ b/bin/node/executor/tests/fees.rs
@@ -21,7 +21,7 @@ use frame_support::{
 	weights::{GetDispatchInfo, constants::ExtrinsicBaseWeight, IdentityFee, WeightToFeePolynomial},
 };
 use sp_core::NeverNativeValue;
-use sp_runtime::{Perbill, FixedPointNumber};
+use sp_runtime::{Perbill, traits::One};
 use node_runtime::{
 	CheckedExtrinsic, Call, Runtime, Balances, TransactionPayment, Multiplier,
 	TransactionByteFee,
diff --git a/bin/node/runtime/src/impls.rs b/bin/node/runtime/src/impls.rs
index ba8929b95920..1d1488e2fae9 100644
--- a/bin/node/runtime/src/impls.rs
+++ b/bin/node/runtime/src/impls.rs
@@ -29,7 +29,7 @@ impl OnUnbalanced<NegativeImbalance> for Author {
 
 #[cfg(test)]
 mod multiplier_tests {
-	use sp_runtime::{assert_eq_error_rate, FixedPointNumber, traits::Convert};
+	use sp_runtime::{assert_eq_error_rate, FixedPointNumber, traits::{Convert, One, Zero}};
 	use pallet_transaction_payment::{Multiplier, TargetedFeeAdjustment};
 
 	use crate::{
diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
index ff6938683800..9ee172931f4e 100644
--- a/frame/transaction-payment/src/lib.rs
+++ b/frame/transaction-payment/src/lib.rs
@@ -615,7 +615,7 @@ mod tests {
 	use sp_core::H256;
 	use sp_runtime::{
 		testing::{Header, TestXt},
-		traits::{BlakeTwo256, IdentityLookup},
+		traits::{BlakeTwo256, IdentityLookup, One},
 		transaction_validity::InvalidTransaction,
 		Perbill,
 	};
diff --git a/primitives/arithmetic/src/fixed_point.rs b/primitives/arithmetic/src/fixed_point.rs
index 3dd8b9a1f7ad..ec2c28f35f1c 100644
--- a/primitives/arithmetic/src/fixed_point.rs
+++ b/primitives/arithmetic/src/fixed_point.rs
@@ -57,7 +57,7 @@ pub trait FixedPointNumber:
 	+ Saturating + Bounded
 	+ Eq + PartialEq + Ord + PartialOrd
 	+ CheckedSub + CheckedAdd + CheckedMul + CheckedDiv
-	+ Add + Sub + Div + Mul
+	+ Add + Sub + Div + Mul + Zero + One
 {
 	/// The underlying data type used for this fixed point number.
 	type Inner: Debug + One + CheckedMul + CheckedDiv + FixedPointOperand;
@@ -195,21 +195,6 @@ pub trait FixedPointNumber:
 		Self::one().checked_div(&self)
 	}
 
-	/// Returns zero.
-	fn zero() -> Self {
-		Self::from_inner(Self::Inner::zero())
-	}
-
-	/// Checks if the number is zero.
-	fn is_zero(&self) -> bool {
-		self.into_inner() == Self::Inner::zero()
-	}
-
-	/// Returns one.
-	fn one() -> Self {
-		Self::from_inner(Self::DIV)
-	}
-
 	/// Checks if the number is one.
 	fn is_one(&self) -> bool {
 		self.into_inner() == Self::Inner::one()
@@ -514,6 +499,22 @@ macro_rules! implement_fixed {
 			}
 		}
 
+		impl Zero for $name {
+			fn zero() -> Self {
+				Self::from_inner(<Self as FixedPointNumber>::Inner::zero())
+			}
+
+			fn is_zero(&self) -> bool {
+				self.into_inner() == <Self as FixedPointNumber>::Inner::zero()
+			}
+		}
+
+		impl One for $name {
+			fn one() -> Self {
+				Self::from_inner(Self::DIV)
+			}
+		}
+
 		impl sp_std::fmt::Debug for $name {
 			#[cfg(feature = "std")]
 			fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {

From 20b1a0e3f8a883148a99de2275fce1271733a83f Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Fri, 23 Apr 2021 09:12:34 +0200
Subject: [PATCH 0669/1194] migrate pallet-elections-phragmen to attribute
 macros (#8044)

* All done

* Fix benchmarks

* Apply suggestions from code review

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Fix metadata.

* Fix build

* Add migrations

* Fix

* Update frame/elections-phragmen/src/migrations/v4.rs

* Better migeation test

* More test

* Fix warn

* Update frame/elections-phragmen/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Fix test

* early exit

* Fix

* Fix build

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
---
 Cargo.lock                                    |   2 +-
 bin/node/runtime/Cargo.toml                   |   2 +-
 frame/elections-phragmen/CHANGELOG.md         |  13 +-
 frame/elections-phragmen/Cargo.toml           |   7 +-
 frame/elections-phragmen/src/benchmarking.rs  |  13 +-
 frame/elections-phragmen/src/lib.rs           | 582 ++++++++++--------
 .../elections-phragmen/src/migrations/mod.rs  |  23 +
 .../{migrations_3_0_0.rs => migrations/v3.rs} |   0
 frame/elections-phragmen/src/migrations/v4.rs | 110 ++++
 9 files changed, 477 insertions(+), 275 deletions(-)
 create mode 100644 frame/elections-phragmen/src/migrations/mod.rs
 rename frame/elections-phragmen/src/{migrations_3_0_0.rs => migrations/v3.rs} (100%)
 create mode 100644 frame/elections-phragmen/src/migrations/v4.rs

diff --git a/Cargo.lock b/Cargo.lock
index b468d0227863..a438e7273ae4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4911,7 +4911,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-elections-phragmen"
-version = "3.0.0"
+version = "4.0.0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index 9d7218696654..512f32d66a66 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -57,7 +57,7 @@ pallet-contracts-primitives = { version = "3.0.0", default-features = false, pat
 pallet-contracts-rpc-runtime-api = { version = "3.0.0", default-features = false, path = "../../../frame/contracts/rpc/runtime-api/" }
 pallet-democracy = { version = "3.0.0", default-features = false, path = "../../../frame/democracy" }
 pallet-election-provider-multi-phase = { version = "3.0.0", default-features = false, path = "../../../frame/election-provider-multi-phase" }
-pallet-elections-phragmen = { version = "3.0.0", default-features = false, path = "../../../frame/elections-phragmen" }
+pallet-elections-phragmen = { version = "4.0.0", default-features = false, path = "../../../frame/elections-phragmen" }
 pallet-gilt = { version = "3.0.0", default-features = false, path = "../../../frame/gilt" }
 pallet-grandpa = { version = "3.0.0", default-features = false, path = "../../../frame/grandpa" }
 pallet-im-online = { version = "3.0.0", default-features = false, path = "../../../frame/im-online" }
diff --git a/frame/elections-phragmen/CHANGELOG.md b/frame/elections-phragmen/CHANGELOG.md
index 3d48448fa55e..231de1d2e475 100644
--- a/frame/elections-phragmen/CHANGELOG.md
+++ b/frame/elections-phragmen/CHANGELOG.md
@@ -4,7 +4,18 @@ All notable changes to this crate will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this crate adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [3.0.0] - UNRELEASED
+## [4.0.0] - UNRELEASED
+
+### Added
+
+### Changed
+\[**Needs Migration**\] [migrate pallet-elections-phragmen to attribute macros](https://github.com/paritytech/substrate/pull/8044)
+
+### Fixed
+
+### Security
+
+## [3.0.0]
 
 ### Added
 [Add slashing events to elections-phragmen](https://github.com/paritytech/substrate/pull/7543)
diff --git a/frame/elections-phragmen/Cargo.toml b/frame/elections-phragmen/Cargo.toml
index 32ae9968c7bf..aa2b564f73f2 100644
--- a/frame/elections-phragmen/Cargo.toml
+++ b/frame/elections-phragmen/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-elections-phragmen"
-version = "3.0.0"
+version = "4.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -16,14 +16,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
 sp-npos-elections = { version = "3.0.0", default-features = false, path = "../../primitives/npos-elections" }
+sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
 frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
-sp-io = { version = "3.0.0", path = "../../primitives/io" }
 hex-literal = "0.3.1"
 pallet-balances = { version = "3.0.0", path = "../balances" }
 sp-core = { version = "3.0.0", path = "../../primitives/core" }
@@ -38,6 +39,8 @@ std = [
 	"sp-npos-elections/std",
 	"frame-system/std",
 	"sp-std/std",
+	"sp-io/std",
+	"sp-core/std",
 	"log/std",
 ]
 runtime-benchmarks = [
diff --git a/frame/elections-phragmen/src/benchmarking.rs b/frame/elections-phragmen/src/benchmarking.rs
index 39e04dcc2dab..3534a62ac3ce 100644
--- a/frame/elections-phragmen/src/benchmarking.rs
+++ b/frame/elections-phragmen/src/benchmarking.rs
@@ -23,9 +23,9 @@ use super::*;
 
 use frame_system::RawOrigin;
 use frame_benchmarking::{benchmarks, account, whitelist, impl_benchmark_test_suite};
-use frame_support::traits::OnInitialize;
+use frame_support::{traits::OnInitialize, dispatch::DispatchResultWithPostInfo};
 
-use crate::Module as Elections;
+use crate::Pallet as Elections;
 
 const BALANCE_FACTOR: u32 = 250;
 const MAX_VOTERS: u32 = 500;
@@ -87,11 +87,12 @@ fn submit_candidates_with_self_vote<T: Config>(c: u32, prefix: &'static str)
 	Ok(candidates)
 }
 
-
 /// Submit one voter.
-fn submit_voter<T: Config>(caller: T::AccountId, votes: Vec<T::AccountId>, stake: BalanceOf<T>)
-	-> frame_support::dispatch::DispatchResult
-{
+fn submit_voter<T: Config>(
+	caller: T::AccountId,
+	votes: Vec<T::AccountId>,
+	stake: BalanceOf<T>,
+) -> DispatchResultWithPostInfo {
 	<Elections<T>>::vote(RawOrigin::Signed(caller).into(), votes, stake)
 }
 
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index c7fcb4cec830..dafcc3dd5910 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -100,10 +100,7 @@
 
 use codec::{Decode, Encode};
 use frame_support::{
-	decl_error, decl_event, decl_module, decl_storage,
-	dispatch::{DispatchResultWithPostInfo, WithPostDispatchInfo},
-	ensure,
-	storage::{IterableStorageMap, StorageMap},
+	dispatch::{WithPostDispatchInfo},
 	traits::{
 		ChangeMembers, Contains, ContainsLengthBound, Currency, CurrencyToVote, Get,
 		InitializeMembers, LockIdentifier, LockableCurrency, OnUnbalanced, ReservableCurrency,
@@ -111,7 +108,6 @@ use frame_support::{
 	},
 	weights::Weight,
 };
-use frame_system::{ensure_root, ensure_signed};
 use sp_npos_elections::{ElectionResult, ExtendedBalance};
 use sp_runtime::{
 	traits::{Saturating, StaticLookup, Zero},
@@ -123,7 +119,8 @@ mod benchmarking;
 pub mod weights;
 pub use weights::WeightInfo;
 
-pub mod migrations_3_0_0;
+/// All migrations.
+pub mod migrations;
 
 /// The maximum votes allowed per voter.
 pub const MAXIMUM_VOTE: usize = 16;
@@ -170,213 +167,97 @@ pub struct SeatHolder<AccountId, Balance> {
 	pub deposit: Balance,
 }
 
-pub trait Config: frame_system::Config {
-	/// The overarching event type.c
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
+pub use pallet::*;
 
-	/// Identifier for the elections-phragmen pallet's lock
-	type PalletId: Get<LockIdentifier>;
-
-	/// The currency that people are electing with.
-	type Currency:
-		LockableCurrency<Self::AccountId, Moment=Self::BlockNumber> +
-		ReservableCurrency<Self::AccountId>;
-
-	/// What to do when the members change.
-	type ChangeMembers: ChangeMembers<Self::AccountId>;
-
-	/// What to do with genesis members
-	type InitializeMembers: InitializeMembers<Self::AccountId>;
-
-	/// Convert a balance into a number used for election calculation.
-	/// This must fit into a `u64` but is allowed to be sensibly lossy.
-	type CurrencyToVote: CurrencyToVote<BalanceOf<Self>>;
-
-	/// How much should be locked up in order to submit one's candidacy.
-	type CandidacyBond: Get<BalanceOf<Self>>;
-
-	/// Base deposit associated with voting.
-	///
-	/// This should be sensibly high to economically ensure the pallet cannot be attacked by
-	/// creating a gigantic number of votes.
-	type VotingBondBase: Get<BalanceOf<Self>>;
-
-	/// The amount of bond that need to be locked for each vote (32 bytes).
-	type VotingBondFactor: Get<BalanceOf<Self>>;
+#[frame_support::pallet]
+pub mod pallet {
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+	use super::*;
 
-	/// Handler for the unbalanced reduction when a candidate has lost (and is not a runner-up)
-	type LoserCandidate: OnUnbalanced<NegativeImbalanceOf<Self>>;
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		type Event: From<Event<Self>>
+			+ IsType<<Self as frame_system::Config>::Event>;
 
-	/// Handler for the unbalanced reduction when a member has been kicked.
-	type KickedMember: OnUnbalanced<NegativeImbalanceOf<Self>>;
+		/// Identifier for the elections-phragmen pallet's lock
+		#[pallet::constant]
+		type PalletId: Get<LockIdentifier>;
 
-	/// Number of members to elect.
-	type DesiredMembers: Get<u32>;
+		/// The currency that people are electing with.
+		type Currency: LockableCurrency<Self::AccountId, Moment = Self::BlockNumber>
+			+ ReservableCurrency<Self::AccountId>;
 
-	/// Number of runners_up to keep.
-	type DesiredRunnersUp: Get<u32>;
+		/// What to do when the members change.
+		type ChangeMembers: ChangeMembers<Self::AccountId>;
 
-	/// How long each seat is kept. This defines the next block number at which an election
-	/// round will happen. If set to zero, no elections are ever triggered and the module will
-	/// be in passive mode.
-	type TermDuration: Get<Self::BlockNumber>;
+		/// What to do with genesis members
+		type InitializeMembers: InitializeMembers<Self::AccountId>;
 
-	/// Weight information for extrinsics in this pallet.
-	type WeightInfo: WeightInfo;
-}
+		/// Convert a balance into a number used for election calculation.
+		/// This must fit into a `u64` but is allowed to be sensibly lossy.
+		type CurrencyToVote: CurrencyToVote<BalanceOf<Self>>;
 
-decl_storage! {
-	trait Store for Module<T: Config> as PhragmenElection {
-		/// The current elected members.
-		///
-		/// Invariant: Always sorted based on account id.
-		pub Members get(fn members): Vec<SeatHolder<T::AccountId, BalanceOf<T>>>;
+		/// How much should be locked up in order to submit one's candidacy.
+		#[pallet::constant]
+		type CandidacyBond: Get<BalanceOf<Self>>;
 
-		/// The current reserved runners-up.
+		/// Base deposit associated with voting.
 		///
-		/// Invariant: Always sorted based on rank (worse to best). Upon removal of a member, the
-		/// last (i.e. _best_) runner-up will be replaced.
-		pub RunnersUp get(fn runners_up): Vec<SeatHolder<T::AccountId, BalanceOf<T>>>;
+		/// This should be sensibly high to economically ensure the pallet cannot be attacked by
+		/// creating a gigantic number of votes.
+		#[pallet::constant]
+		type VotingBondBase: Get<BalanceOf<Self>>;
 
-		/// The present candidate list. A current member or runner-up can never enter this vector
-		/// and is always implicitly assumed to be a candidate.
-		///
-		/// Second element is the deposit.
-		///
-		/// Invariant: Always sorted based on account id.
-		pub Candidates get(fn candidates): Vec<(T::AccountId, BalanceOf<T>)>;
+		/// The amount of bond that need to be locked for each vote (32 bytes).
+		#[pallet::constant]
+		type VotingBondFactor: Get<BalanceOf<Self>>;
 
-		/// The total number of vote rounds that have happened, excluding the upcoming one.
-		pub ElectionRounds get(fn election_rounds): u32 = Zero::zero();
+		/// Handler for the unbalanced reduction when a candidate has lost (and is not a runner-up)
+		type LoserCandidate: OnUnbalanced<NegativeImbalanceOf<Self>>;
 
-		/// Votes and locked stake of a particular voter.
-		///
-		/// TWOX-NOTE: SAFE as `AccountId` is a crypto hash.
-		pub Voting get(fn voting): map hasher(twox_64_concat) T::AccountId => Voter<T::AccountId, BalanceOf<T>>;
-	} add_extra_genesis {
-		config(members): Vec<(T::AccountId, BalanceOf<T>)>;
-		build(|config: &GenesisConfig<T>| {
-			assert!(
-				config.members.len() as u32 <= T::DesiredMembers::get(),
-				"Cannot accept more than DesiredMembers genesis member",
-			);
-			let members = config.members.iter().map(|(ref member, ref stake)| {
-				// make sure they have enough stake.
-				assert!(
-					T::Currency::free_balance(member) >= *stake,
-					"Genesis member does not have enough stake.",
-				);
+		/// Handler for the unbalanced reduction when a member has been kicked.
+		type KickedMember: OnUnbalanced<NegativeImbalanceOf<Self>>;
 
-				// Note: all members will only vote for themselves, hence they must be given exactly
-				// their own stake as total backing. Any sane election should behave as such.
-				// Nonetheless, stakes will be updated for term 1 onwards according to the election.
-				Members::<T>::mutate(|members| {
-					match members.binary_search_by(|m| m.who.cmp(member)) {
-						Ok(_) => panic!("Duplicate member in elections-phragmen genesis: {}", member),
-						Err(pos) => members.insert(
-							pos,
-							SeatHolder { who: member.clone(), stake: *stake, deposit: Zero::zero() },
-						),
-					}
-				});
+		/// Number of members to elect.
+		#[pallet::constant]
+		type DesiredMembers: Get<u32>;
 
-				// set self-votes to make persistent. Genesis voters don't have any bond, nor do
-				// they have any lock. NOTE: this means that we will still try to remove a lock once
-				// this genesis voter is removed, and for now it is okay because remove_lock is noop
-				// if lock is not there.
-				<Voting<T>>::insert(
-					&member,
-					Voter { votes: vec![member.clone()], stake: *stake, deposit: Zero::zero() },
-				);
+		/// Number of runners_up to keep.
+		#[pallet::constant]
+		type DesiredRunnersUp: Get<u32>;
 
-				member.clone()
-			}).collect::<Vec<T::AccountId>>();
+		/// How long each seat is kept. This defines the next block number at which an election
+		/// round will happen. If set to zero, no elections are ever triggered and the module will
+		/// be in passive mode.
+		#[pallet::constant]
+		type TermDuration: Get<Self::BlockNumber>;
 
-			// report genesis members to upstream, if any.
-			T::InitializeMembers::initialize_members(&members);
-		})
+		/// Weight information for extrinsics in this pallet.
+		type WeightInfo: WeightInfo;
 	}
-}
 
-decl_error! {
-	pub enum Error for Module<T: Config> {
-		/// Cannot vote when no candidates or members exist.
-		UnableToVote,
-		/// Must vote for at least one candidate.
-		NoVotes,
-		/// Cannot vote more than candidates.
-		TooManyVotes,
-		/// Cannot vote more than maximum allowed.
-		MaximumVotesExceeded,
-		/// Cannot vote with stake less than minimum balance.
-		LowBalance,
-		/// Voter can not pay voting bond.
-		UnableToPayBond,
-		/// Must be a voter.
-		MustBeVoter,
-		/// Cannot report self.
-		ReportSelf,
-		/// Duplicated candidate submission.
-		DuplicatedCandidate,
-		/// Member cannot re-submit candidacy.
-		MemberSubmit,
-		/// Runner cannot re-submit candidacy.
-		RunnerUpSubmit,
-		/// Candidate does not have enough funds.
-		InsufficientCandidateFunds,
-		/// Not a member.
-		NotMember,
-		/// The provided count of number of candidates is incorrect.
-		InvalidWitnessData,
-		/// The provided count of number of votes is incorrect.
-		InvalidVoteCount,
-		/// The renouncing origin presented a wrong `Renouncing` parameter.
-		InvalidRenouncing,
-		/// Prediction regarding replacement after member removal is wrong.
-		InvalidReplacement,
-	}
-}
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(PhantomData<T>);
 
-decl_event!(
-	pub enum Event<T> where Balance = BalanceOf<T>, <T as frame_system::Config>::AccountId {
-		/// A new term with \[new_members\]. This indicates that enough candidates existed to run the
-		/// election, not that enough have has been elected. The inner value must be examined for
-		/// this purpose. A `NewTerm(\[\])` indicates that some candidates got their bond slashed and
-		/// none were elected, whilst `EmptyTerm` means that no candidates existed to begin with.
-		NewTerm(Vec<(AccountId, Balance)>),
-		/// No (or not enough) candidates existed for this round. This is different from
-		/// `NewTerm(\[\])`. See the description of `NewTerm`.
-		EmptyTerm,
-		/// Internal error happened while trying to perform election.
-		ElectionError,
-		/// A \[member\] has been removed. This should always be followed by either `NewTerm` or
-		/// `EmptyTerm`.
-		MemberKicked(AccountId),
-		/// Someone has renounced their candidacy.
-		Renounced(AccountId),
-		/// A \[candidate\] was slashed by \[amount\] due to failing to obtain a seat as member or
-		/// runner-up.
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+		/// What to do at the end of each block.
 		///
-		/// Note that old members and runners-up are also candidates.
-		CandidateSlashed(AccountId, Balance),
-		/// A \[seat holder\] was slashed by \[amount\] by being forcefully removed from the set.
-		SeatHolderSlashed(AccountId, Balance),
+		/// Checks if an election needs to happen or not.
+		fn on_initialize(n: T::BlockNumber) -> Weight {
+			let term_duration = T::TermDuration::get();
+			if !term_duration.is_zero() && (n % term_duration).is_zero() {
+				Self::do_phragmen()
+			} else {
+				0
+			}
+		}
 	}
-);
-
-decl_module! {
-	pub struct Module<T: Config> for enum Call where origin: T::Origin {
-		type Error = Error<T>;
-		fn deposit_event() = default;
-
-		const CandidacyBond: BalanceOf<T> = T::CandidacyBond::get();
-		const VotingBondBase: BalanceOf<T> = T::VotingBondBase::get();
-		const VotingBondFactor: BalanceOf<T> = T::VotingBondFactor::get();
-		const DesiredMembers: u32 = T::DesiredMembers::get();
-		const DesiredRunnersUp: u32 = T::DesiredRunnersUp::get();
-		const TermDuration: T::BlockNumber = T::TermDuration::get();
-		const PalletId: LockIdentifier = T::PalletId::get();
 
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
 		/// Vote for a set of candidates for the upcoming round of election. This can be called to
 		/// set the initial votes, or update already existing votes.
 		///
@@ -400,16 +281,16 @@ decl_module! {
 		/// # <weight>
 		/// We assume the maximum weight among all 3 cases: vote_equal, vote_more and vote_less.
 		/// # </weight>
-		#[weight =
+		#[pallet::weight(
 			T::WeightInfo::vote_more(votes.len() as u32)
 			.max(T::WeightInfo::vote_less(votes.len() as u32))
 			.max(T::WeightInfo::vote_equal(votes.len() as u32))
-		]
-		fn vote(
-			origin,
+		)]
+		pub(crate) fn vote(
+			origin: OriginFor<T>,
 			votes: Vec<T::AccountId>,
-			#[compact] value: BalanceOf<T>,
-		) {
+			#[pallet::compact] value: BalanceOf<T>,
+		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
 
 			// votes should not be empty and more than `MAXIMUM_VOTE` in any case.
@@ -423,9 +304,8 @@ decl_module! {
 			// can never submit a vote of there are no members, and cannot submit more votes than
 			// all potential vote targets.
 			// addition is valid: candidates, members and runners-up will never overlap.
-			let allowed_votes = candidates_count
-				.saturating_add(members_count)
-				.saturating_add(runners_up_count);
+			let allowed_votes =
+				candidates_count.saturating_add(members_count).saturating_add(runners_up_count);
 			ensure!(!allowed_votes.is_zero(), Error::<T>::UnableToVote);
 			ensure!(votes.len() <= allowed_votes, Error::<T>::TooManyVotes);
 
@@ -438,15 +318,16 @@ decl_module! {
 				Ordering::Greater => {
 					// Must reserve a bit more.
 					let to_reserve = new_deposit - old_deposit;
-					T::Currency::reserve(&who, to_reserve).map_err(|_| Error::<T>::UnableToPayBond)?;
-				},
-				Ordering::Equal => {},
+					T::Currency::reserve(&who, to_reserve)
+						.map_err(|_| Error::<T>::UnableToPayBond)?;
+				}
+				Ordering::Equal => {}
 				Ordering::Less => {
 					// Must unreserve a bit.
 					let to_unreserve = old_deposit - new_deposit;
 					let _remainder = T::Currency::unreserve(&who, to_unreserve);
 					debug_assert!(_remainder.is_zero());
-				},
+				}
 			};
 
 			// Amount to be locked up.
@@ -459,6 +340,7 @@ decl_module! {
 			);
 
 			Voting::<T>::insert(&who, Voter { votes, deposit: new_deposit, stake: locked_stake });
+			Ok(None.into())
 		}
 
 		/// Remove `origin` as a voter.
@@ -466,11 +348,12 @@ decl_module! {
 		/// This removes the lock and returns the deposit.
 		///
 		/// The dispatch origin of this call must be signed and be a voter.
-		#[weight = T::WeightInfo::remove_voter()]
-		fn remove_voter(origin) {
+		#[pallet::weight(T::WeightInfo::remove_voter())]
+		pub(crate) fn remove_voter(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
 			ensure!(Self::is_voter(&who), Error::<T>::MustBeVoter);
 			Self::do_remove_voter(&who);
+			Ok(None.into())
 		}
 
 		/// Submit oneself for candidacy. A fixed amount of deposit is recorded.
@@ -488,15 +371,15 @@ decl_module! {
 		/// # <weight>
 		/// The number of current candidates must be provided as witness data.
 		/// # </weight>
-		#[weight = T::WeightInfo::submit_candidacy(*candidate_count)]
-		fn submit_candidacy(origin, #[compact] candidate_count: u32) {
+		#[pallet::weight(T::WeightInfo::submit_candidacy(*candidate_count))]
+		pub(crate) fn submit_candidacy(
+			origin: OriginFor<T>,
+			#[pallet::compact] candidate_count: u32,
+		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
 
 			let actual_count = <Candidates<T>>::decode_len().unwrap_or(0);
-			ensure!(
-				actual_count as u32 <= candidate_count,
-				Error::<T>::InvalidWitnessData,
-			);
+			ensure!(actual_count as u32 <= candidate_count, Error::<T>::InvalidWitnessData,);
 
 			let index = Self::is_candidate(&who).err().ok_or(Error::<T>::DuplicatedCandidate)?;
 
@@ -507,6 +390,7 @@ decl_module! {
 				.map_err(|_| Error::<T>::InsufficientCandidateFunds)?;
 
 			<Candidates<T>>::mutate(|c| c.insert(index, (who, T::CandidacyBond::get())));
+			Ok(None.into())
 		}
 
 		/// Renounce one's intention to be a candidate for the next election round. 3 potential
@@ -518,27 +402,30 @@ decl_module! {
 		///   origin is removed as a runner-up.
 		/// - `origin` is a current member. In this case, the deposit is unreserved and origin is
 		///   removed as a member, consequently not being a candidate for the next round anymore.
-		///   Similar to [`remove_members`], if replacement runners exists, they are immediately used.
-		///   If the prime is renouncing, then no prime will exist until the next round.
+		///   Similar to [`remove_members`], if replacement runners exists, they are immediately
+		///   used. If the prime is renouncing, then no prime will exist until the next round.
 		///
 		/// The dispatch origin of this call must be signed, and have one of the above roles.
 		///
 		/// # <weight>
 		/// The type of renouncing must be provided as witness data.
 		/// # </weight>
-		#[weight =  match *renouncing {
+		#[pallet::weight(match *renouncing {
 			Renouncing::Candidate(count) => T::WeightInfo::renounce_candidacy_candidate(count),
 			Renouncing::Member => T::WeightInfo::renounce_candidacy_members(),
 			Renouncing::RunnerUp => T::WeightInfo::renounce_candidacy_runners_up(),
-		}]
-		fn renounce_candidacy(origin, renouncing: Renouncing) {
+		})]
+		pub(crate) fn renounce_candidacy(
+			origin: OriginFor<T>,
+			renouncing: Renouncing,
+		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
 			match renouncing {
 				Renouncing::Member => {
 					let _ = Self::remove_and_replace_member(&who, false)
 						.map_err(|_| Error::<T>::InvalidRenouncing)?;
-					Self::deposit_event(RawEvent::Renounced(who));
-				},
+					Self::deposit_event(Event::Renounced(who));
+				}
 				Renouncing::RunnerUp => {
 					<RunnersUp<T>>::try_mutate::<_, Error<T>, _>(|runners_up| {
 						let index = runners_up
@@ -549,7 +436,7 @@ decl_module! {
 						let SeatHolder { deposit, .. } = runners_up.remove(index);
 						let _remainder = T::Currency::unreserve(&who, deposit);
 						debug_assert!(_remainder.is_zero());
-						Self::deposit_event(RawEvent::Renounced(who));
+						Self::deposit_event(Event::Renounced(who));
 						Ok(())
 					})?;
 				}
@@ -562,11 +449,12 @@ decl_module! {
 						let (_removed, deposit) = candidates.remove(index);
 						let _remainder = T::Currency::unreserve(&who, deposit);
 						debug_assert!(_remainder.is_zero());
-						Self::deposit_event(RawEvent::Renounced(who));
+						Self::deposit_event(Event::Renounced(who));
 						Ok(())
 					})?;
 				}
 			};
+			Ok(None.into())
 		}
 
 		/// Remove a particular member from the set. This is effective immediately and the bond of
@@ -583,13 +471,13 @@ decl_module! {
 		/// If we have a replacement, we use a small weight. Else, since this is a root call and
 		/// will go into phragmen, we assume full block for now.
 		/// # </weight>
-		#[weight = if *has_replacement {
+		#[pallet::weight(if *has_replacement {
 			T::WeightInfo::remove_member_with_replacement()
 		} else {
 			T::BlockWeights::get().max_block
-		}]
-		fn remove_member(
-			origin,
+		})]
+		pub(crate) fn remove_member(
+			origin: OriginFor<T>,
 			who: <T::Lookup as StaticLookup>::Source,
 			has_replacement: bool,
 		) -> DispatchResultWithPostInfo {
@@ -601,13 +489,13 @@ decl_module! {
 				// In both cases, we will change more weight than need. Refund and abort.
 				return Err(Error::<T>::InvalidReplacement.with_weight(
 					// refund. The weight value comes from a benchmark which is special to this.
-					T::WeightInfo::remove_member_wrong_refund()
+					T::WeightInfo::remove_member_wrong_refund(),
 				));
 			}
 
 			let had_replacement = Self::remove_and_replace_member(&who, true)?;
 			debug_assert_eq!(has_replacement, had_replacement);
-			Self::deposit_event(RawEvent::MemberKicked(who.clone()));
+			Self::deposit_event(Event::MemberKicked(who.clone()));
 
 			if !had_replacement {
 				Self::do_phragmen();
@@ -627,36 +515,197 @@ decl_module! {
 		/// # <weight>
 		/// The total number of voters and those that are defunct must be provided as witness data.
 		/// # </weight>
-		#[weight = T::WeightInfo::clean_defunct_voters(*_num_voters, *_num_defunct)]
-		fn clean_defunct_voters(origin, _num_voters: u32, _num_defunct: u32) {
+		#[pallet::weight(T::WeightInfo::clean_defunct_voters(*_num_voters, *_num_defunct))]
+		pub(crate) fn clean_defunct_voters(
+			origin: OriginFor<T>,
+			_num_voters: u32,
+			_num_defunct: u32,
+		) -> DispatchResultWithPostInfo {
 			let _ = ensure_root(origin)?;
 			<Voting<T>>::iter()
 				.filter(|(_, x)| Self::is_defunct_voter(&x.votes))
-				.for_each(|(dv, _)| {
-					Self::do_remove_voter(&dv)
-				})
+				.for_each(|(dv, _)| Self::do_remove_voter(&dv));
+
+			Ok(None.into())
 		}
+	}
 
-		/// What to do at the end of each block.
+	#[pallet::event]
+	#[pallet::metadata(
+		<T as frame_system::Config>::AccountId = "AccountId",
+		BalanceOf<T> = "Balance",
+		Vec<(<T as frame_system::Config>::AccountId, BalanceOf<T>)> = "Vec<(AccountId, Balance)>",
+	)]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	pub enum Event<T: Config> {
+		/// A new term with \[new_members\]. This indicates that enough candidates existed to run
+		/// the election, not that enough have has been elected. The inner value must be examined
+		/// for this purpose. A `NewTerm(\[\])` indicates that some candidates got their bond
+		/// slashed and none were elected, whilst `EmptyTerm` means that no candidates existed to
+		/// begin with.
+		NewTerm(Vec<(<T as frame_system::Config>::AccountId, BalanceOf<T>)>),
+		/// No (or not enough) candidates existed for this round. This is different from
+		/// `NewTerm(\[\])`. See the description of `NewTerm`.
+		EmptyTerm,
+		/// Internal error happened while trying to perform election.
+		ElectionError,
+		/// A \[member\] has been removed. This should always be followed by either `NewTerm` or
+		/// `EmptyTerm`.
+		MemberKicked(<T as frame_system::Config>::AccountId),
+		/// Someone has renounced their candidacy.
+		Renounced(<T as frame_system::Config>::AccountId),
+		/// A \[candidate\] was slashed by \[amount\] due to failing to obtain a seat as member or
+		/// runner-up.
 		///
-		/// Checks if an election needs to happen or not.
-		fn on_initialize(n: T::BlockNumber) -> Weight {
-			let term_duration = T::TermDuration::get();
-			if !term_duration.is_zero() && (n % term_duration).is_zero() {
-				Self::do_phragmen()
-			} else {
-				0
-			}
+		/// Note that old members and runners-up are also candidates.
+		CandidateSlashed(<T as frame_system::Config>::AccountId, BalanceOf<T>),
+		/// A \[seat holder\] was slashed by \[amount\] by being forcefully removed from the set.
+		SeatHolderSlashed(<T as frame_system::Config>::AccountId, BalanceOf<T>),
+	}
+
+	#[deprecated(note = "use `Event` instead")]
+	pub type RawEvent<T> = Event<T>;
+
+	#[pallet::error]
+	pub enum Error<T> {
+		/// Cannot vote when no candidates or members exist.
+		UnableToVote,
+		/// Must vote for at least one candidate.
+		NoVotes,
+		/// Cannot vote more than candidates.
+		TooManyVotes,
+		/// Cannot vote more than maximum allowed.
+		MaximumVotesExceeded,
+		/// Cannot vote with stake less than minimum balance.
+		LowBalance,
+		/// Voter can not pay voting bond.
+		UnableToPayBond,
+		/// Must be a voter.
+		MustBeVoter,
+		/// Cannot report self.
+		ReportSelf,
+		/// Duplicated candidate submission.
+		DuplicatedCandidate,
+		/// Member cannot re-submit candidacy.
+		MemberSubmit,
+		/// Runner cannot re-submit candidacy.
+		RunnerUpSubmit,
+		/// Candidate does not have enough funds.
+		InsufficientCandidateFunds,
+		/// Not a member.
+		NotMember,
+		/// The provided count of number of candidates is incorrect.
+		InvalidWitnessData,
+		/// The provided count of number of votes is incorrect.
+		InvalidVoteCount,
+		/// The renouncing origin presented a wrong `Renouncing` parameter.
+		InvalidRenouncing,
+		/// Prediction regarding replacement after member removal is wrong.
+		InvalidReplacement,
+	}
+
+	/// The current elected members.
+	///
+	/// Invariant: Always sorted based on account id.
+	#[pallet::storage]
+	#[pallet::getter(fn members)]
+	pub type Members<T: Config> =
+		StorageValue<_, Vec<SeatHolder<T::AccountId, BalanceOf<T>>>, ValueQuery>;
+
+	/// The current reserved runners-up.
+	///
+	/// Invariant: Always sorted based on rank (worse to best). Upon removal of a member, the
+	/// last (i.e. _best_) runner-up will be replaced.
+	#[pallet::storage]
+	#[pallet::getter(fn runners_up)]
+	pub type RunnersUp<T: Config> =
+		StorageValue<_, Vec<SeatHolder<T::AccountId, BalanceOf<T>>>, ValueQuery>;
+
+	/// The present candidate list. A current member or runner-up can never enter this vector
+	/// and is always implicitly assumed to be a candidate.
+	///
+	/// Second element is the deposit.
+	///
+	/// Invariant: Always sorted based on account id.
+	#[pallet::storage]
+	#[pallet::getter(fn candidates)]
+	pub type Candidates<T: Config> = StorageValue<_, Vec<(T::AccountId, BalanceOf<T>)>, ValueQuery>;
+
+	/// The total number of vote rounds that have happened, excluding the upcoming one.
+	#[pallet::storage]
+	#[pallet::getter(fn election_rounds)]
+	pub type ElectionRounds<T: Config> = StorageValue<_, u32, ValueQuery>;
+
+	/// Votes and locked stake of a particular voter.
+	///
+	/// TWOX-NOTE: SAFE as `AccountId` is a crypto hash.
+	#[pallet::storage]
+	#[pallet::getter(fn voting)]
+	pub type Voting<T: Config> =
+		StorageMap<_, Twox64Concat, T::AccountId, Voter<T::AccountId, BalanceOf<T>>, ValueQuery>;
+
+	#[pallet::genesis_config]
+	pub struct GenesisConfig<T: Config> {
+		pub members: Vec<(T::AccountId, BalanceOf<T>)>,
+	}
+
+	#[cfg(feature = "std")]
+	impl<T: Config> Default for GenesisConfig<T> {
+		fn default() -> Self {
+			Self { members: Default::default() }
+		}
+	}
+
+	#[pallet::genesis_build]
+	impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+		fn build(&self) {
+			assert!(
+				self.members.len() as u32 <= T::DesiredMembers::get(),
+				"Cannot accept more than DesiredMembers genesis member",
+			);
+			let members = self.members.iter().map(|(ref member, ref stake)| {
+				// make sure they have enough stake.
+				assert!(
+					T::Currency::free_balance(member) >= *stake,
+					"Genesis member does not have enough stake.",
+				);
+
+				// Note: all members will only vote for themselves, hence they must be given exactly
+				// their own stake as total backing. Any sane election should behave as such.
+				// Nonetheless, stakes will be updated for term 1 onwards according to the election.
+				Members::<T>::mutate(|members| {
+					match members.binary_search_by(|m| m.who.cmp(member)) {
+						Ok(_) => panic!("Duplicate member in elections-phragmen genesis: {}", member),
+						Err(pos) => members.insert(
+							pos,
+							SeatHolder { who: member.clone(), stake: *stake, deposit: Zero::zero() },
+						),
+					}
+				});
+
+				// set self-votes to make persistent. Genesis voters don't have any bond, nor do
+				// they have any lock. NOTE: this means that we will still try to remove a lock once
+				// this genesis voter is removed, and for now it is okay because remove_lock is noop
+				// if lock is not there.
+				<Voting<T>>::insert(
+					&member,
+					Voter { votes: vec![member.clone()], stake: *stake, deposit: Zero::zero() },
+				);
+
+				member.clone()
+			}).collect::<Vec<T::AccountId>>();
+
+			// report genesis members to upstream, if any.
+			T::InitializeMembers::initialize_members(&members);
 		}
 	}
 }
 
-impl<T: Config> Module<T> {
+impl<T: Config> Pallet<T> {
 	/// The deposit value of `count` votes.
 	fn deposit_of(count: usize) -> BalanceOf<T> {
-		T::VotingBondBase::get().saturating_add(
-			T::VotingBondFactor::get().saturating_mul((count as u32).into())
-		)
+		T::VotingBondBase::get()
+			.saturating_add(T::VotingBondFactor::get().saturating_mul((count as u32).into()))
 	}
 
 	/// Attempts to remove a member `who`. If a runner-up exists, it is used as the replacement.
@@ -691,7 +740,7 @@ impl<T: Config> Module<T> {
 				let (imbalance, _remainder) = T::Currency::slash_reserved(who, removed.deposit);
 				debug_assert!(_remainder.is_zero());
 				T::LoserCandidate::on_unbalanced(imbalance);
-				Self::deposit_event(RawEvent::SeatHolderSlashed(who.clone(), removed.deposit));
+				Self::deposit_event(Event::SeatHolderSlashed(who.clone(), removed.deposit));
 			} else {
 				T::Currency::unreserve(who, removed.deposit);
 			}
@@ -829,7 +878,7 @@ impl<T: Config> Module<T> {
 		candidates_and_deposit.append(&mut Self::implicit_candidates_with_deposit());
 
 		if candidates_and_deposit.len().is_zero() {
-			Self::deposit_event(RawEvent::EmptyTerm);
+			Self::deposit_event(Event::EmptyTerm);
 			return T::DbWeight::get().reads(5);
 		}
 
@@ -956,7 +1005,7 @@ impl<T: Config> Module<T> {
 				{
 					let (imbalance, _) = T::Currency::slash_reserved(c, *d);
 					T::LoserCandidate::on_unbalanced(imbalance);
-					Self::deposit_event(RawEvent::CandidateSlashed(c.clone(), *d));
+					Self::deposit_event(Event::CandidateSlashed(c.clone(), *d));
 				}
 			});
 
@@ -996,28 +1045,28 @@ impl<T: Config> Module<T> {
 			// clean candidates.
 			<Candidates<T>>::kill();
 
-			Self::deposit_event(RawEvent::NewTerm(new_members_sorted_by_id));
-			ElectionRounds::mutate(|v| *v += 1);
+			Self::deposit_event(Event::NewTerm(new_members_sorted_by_id));
+			<ElectionRounds<T>>::mutate(|v| *v += 1);
 		}).map_err(|e| {
 			log::error!(
 				target: "runtime::elections-phragmen",
 				"Failed to run election [{:?}].",
 				e,
 			);
-			Self::deposit_event(RawEvent::ElectionError);
+			Self::deposit_event(Event::ElectionError);
 		});
 
 		T::WeightInfo::election_phragmen(weight_candidates, weight_voters, weight_edges)
 	}
 }
 
-impl<T: Config> Contains<T::AccountId> for Module<T> {
+impl<T: Config> Contains<T::AccountId> for Pallet<T> {
 	fn contains(who: &T::AccountId) -> bool {
 		Self::is_member(who)
 	}
 }
 
-impl<T: Config> SortedMembers<T::AccountId> for Module<T> {
+impl<T: Config> SortedMembers<T::AccountId> for Pallet<T> {
 	fn contains(who: &T::AccountId) -> bool {
 		Self::is_member(who)
 	}
@@ -1039,8 +1088,10 @@ impl<T: Config> SortedMembers<T::AccountId> for Module<T> {
 	}
 }
 
-impl<T: Config> ContainsLengthBound for Module<T> {
-	fn min_len() -> usize { 0 }
+impl<T: Config> ContainsLengthBound for Pallet<T> {
+	fn min_len() -> usize {
+		0
+	}
 
 	/// Implementation uses a parameter type so calling is cost-free.
 	fn max_len() -> usize {
@@ -1051,15 +1102,18 @@ impl<T: Config> ContainsLengthBound for Module<T> {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use frame_support::{assert_ok, assert_noop, parameter_types,
-		traits::OnInitialize,
+	use frame_support::{
+		assert_ok, assert_noop, parameter_types, traits::OnInitialize,
+		dispatch::DispatchResultWithPostInfo,
 	};
 	use substrate_test_utils::assert_eq_uvec;
 	use sp_core::H256;
 	use sp_runtime::{
-		testing::Header, BuildStorage, DispatchResult,
+		BuildStorage,
+		testing::Header,
 		traits::{BlakeTwo256, IdentityLookup},
 	};
+	use frame_system::ensure_signed;
 	use crate as elections_phragmen;
 
 	parameter_types! {
@@ -1375,11 +1429,11 @@ mod tests {
 		ensure_members_has_approval_stake();
 	}
 
-	fn submit_candidacy(origin: Origin) -> DispatchResult {
+	fn submit_candidacy(origin: Origin) -> DispatchResultWithPostInfo {
 		Elections::submit_candidacy(origin, Elections::candidates().len() as u32)
 	}
 
-	fn vote(origin: Origin, votes: Vec<u64>, stake: u64) -> DispatchResult {
+	fn vote(origin: Origin, votes: Vec<u64>, stake: u64) -> DispatchResultWithPostInfo {
 		// historical note: helper function was created in a period of time in which the API of vote
 		// call was changing. Currently it is a wrapper for the original call and does not do much.
 		// Nonetheless, totally harmless.
@@ -2080,7 +2134,7 @@ mod tests {
 
 			assert_eq!(
 				System::events().iter().last().unwrap().event,
-				Event::elections_phragmen(RawEvent::EmptyTerm),
+				Event::elections_phragmen(super::Event::EmptyTerm),
 			)
 		})
 	}
@@ -2099,7 +2153,7 @@ mod tests {
 
 			assert_eq!(
 				System::events().iter().last().unwrap().event,
-				Event::elections_phragmen(RawEvent::NewTerm(vec![(4, 40), (5, 50)])),
+				Event::elections_phragmen(super::Event::NewTerm(vec![(4, 40), (5, 50)])),
 			);
 
 			assert_eq!(members_and_stake(), vec![(4, 40), (5, 50)]);
@@ -2113,7 +2167,7 @@ mod tests {
 
 			assert_eq!(
 				System::events().iter().last().unwrap().event,
-				Event::elections_phragmen(RawEvent::NewTerm(vec![])),
+				Event::elections_phragmen(super::Event::NewTerm(vec![])),
 			);
 
 			// outgoing have lost their bond.
@@ -2186,7 +2240,7 @@ mod tests {
 
 			assert_eq!(
 				System::events().iter().last().unwrap().event,
-				Event::elections_phragmen(RawEvent::NewTerm(vec![])),
+				Event::elections_phragmen(super::Event::NewTerm(vec![])),
 			)
 		});
 	}
@@ -2546,7 +2600,7 @@ mod tests {
 			assert_eq!(balances(&5), (45, 2));
 
 			assert!(System::events().iter().any(|event| {
-				event.event == Event::elections_phragmen(RawEvent::NewTerm(vec![(4, 40), (5, 50)]))
+				event.event == Event::elections_phragmen(super::Event::NewTerm(vec![(4, 40), (5, 50)]))
 			}));
 		})
 	}
diff --git a/frame/elections-phragmen/src/migrations/mod.rs b/frame/elections-phragmen/src/migrations/mod.rs
new file mode 100644
index 000000000000..9a1f86a1ad7c
--- /dev/null
+++ b/frame/elections-phragmen/src/migrations/mod.rs
@@ -0,0 +1,23 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! All migrations of this pallet.
+
+/// Version 3.
+pub mod v3;
+/// Version 4.
+pub mod v4;
diff --git a/frame/elections-phragmen/src/migrations_3_0_0.rs b/frame/elections-phragmen/src/migrations/v3.rs
similarity index 100%
rename from frame/elections-phragmen/src/migrations_3_0_0.rs
rename to frame/elections-phragmen/src/migrations/v3.rs
diff --git a/frame/elections-phragmen/src/migrations/v4.rs b/frame/elections-phragmen/src/migrations/v4.rs
new file mode 100644
index 000000000000..f704b203d34c
--- /dev/null
+++ b/frame/elections-phragmen/src/migrations/v4.rs
@@ -0,0 +1,110 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Migrations to version [`4.0.0`], as denoted by the changelog.
+
+use frame_support::{
+	weights::Weight,
+	traits::{GetPalletVersion, PalletVersion, Get},
+};
+
+/// The old prefix.
+pub const OLD_PREFIX: &[u8] = b"PhragmenElection";
+
+/// Migrate the entire storage of this pallet to a new prefix.
+///
+/// This new prefix must be the same as the one set in construct_runtime. For safety, use
+/// `PalletInfo` to get it, as:
+/// `<Runtime as frame_system::Config>::PalletInfo::name::<ElectionsPhragmenPallet>`.
+///
+/// The old storage prefix, `PhragmenElection` is hardcoded in the migration code.
+pub fn migrate<
+	T: frame_system::Config,
+	P: GetPalletVersion,
+	N: AsRef<str>,
+>(new_pallet_name: N) -> Weight {
+	if new_pallet_name.as_ref().as_bytes() == OLD_PREFIX {
+		log::info!(
+			target: "runtime::elections-phragmen",
+			"New pallet name is equal to the old prefix. No migration needs to be done.",
+		);
+		return 0;
+	}
+	let maybe_storage_version = <P as GetPalletVersion>::storage_version();
+	log::info!(
+		target: "runtime::elections-phragmen",
+		"Running migration to v4 for elections-phragmen with storage version {:?}",
+		maybe_storage_version,
+	);
+
+	match maybe_storage_version {
+		Some(storage_version) if storage_version <= PalletVersion::new(3, 0, 0) => {
+			log::info!("new prefix: {}", new_pallet_name.as_ref());
+			frame_support::storage::migration::move_pallet(
+				OLD_PREFIX,
+				new_pallet_name.as_ref().as_bytes(),
+			);
+			<T as frame_system::Config>::BlockWeights::get().max_block
+		}
+		_ => {
+			log::warn!(
+				target: "runtime::elections-phragmen",
+				"Attempted to apply migration to v4 but failed because storage version is {:?}",
+				maybe_storage_version,
+			);
+			0
+		},
+	}
+}
+
+/// Some checks prior to migration. This can be linked to
+/// [`frame_support::traits::OnRuntimeUpgrade::pre_upgrade`] for further testing.
+///
+/// Panics if anything goes wrong.
+pub fn pre_migration<P: GetPalletVersion, N: AsRef<str>>(new: N) {
+	let new = new.as_ref();
+	log::info!("pre-migration elections-phragmen test with new = {}", new);
+
+	// the next key must exist, and start with the hash of `OLD_PREFIX`.
+	let next_key = sp_io::storage::next_key(OLD_PREFIX).unwrap();
+	assert!(next_key.starts_with(&sp_io::hashing::twox_128(OLD_PREFIX)));
+
+	// ensure nothing is stored in the new prefix.
+	assert!(
+		sp_io::storage::next_key(new.as_bytes()).map_or(
+			// either nothing is there
+			true,
+			// or we ensure that it has no common prefix with twox_128(new).
+			|next_key| !next_key.starts_with(&sp_io::hashing::twox_128(new.as_bytes()))
+		),
+		"unexpected next_key({}) = {:?}",
+		new,
+		sp_core::hexdisplay::HexDisplay::from(&sp_io::storage::next_key(new.as_bytes()).unwrap())
+	);
+	// ensure storage version is 3.
+	assert!(<P as GetPalletVersion>::storage_version().unwrap().major == 3);
+}
+
+/// Some checks for after migration. This can be linked to
+/// [`frame_support::traits::OnRuntimeUpgrade::post_upgrade`] for further testing.
+///
+/// Panics if anything goes wrong.
+pub fn post_migration<P : GetPalletVersion>() {
+	log::info!("post-migration elections-phragmen");
+	// ensure we've been updated to v4 by the automatic write of crate version -> storage version.
+	assert!(<P as GetPalletVersion>::storage_version().unwrap().major == 4);
+}

From bb22414e9729fa6ffc3b3126c57d3a9f2b85a2ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Fri, 23 Apr 2021 15:22:39 +0200
Subject: [PATCH 0670/1194] Use host max log level when initializing the
 `RuntimeLogger` (#8655)

* Use host max log level when initializing the `RuntimeLogger`

This should fix performance problems introduced by logging under certain
circumstances. Before we always called into the host and the host was
doing the log filtering, now as the correct max log level is set, we
don't call into the host for every log line to check if it should be
logged. However, we would still call into the host to determine if
something should be logged when `something=trace` is given as we don't
forward the log targets that are enabled.

* Finish the pr
---
 primitives/core/src/lib.rs               | 49 +++++++++++++++++++++++-
 primitives/io/src/lib.rs                 |  7 +++-
 primitives/runtime/src/runtime_logger.rs | 43 ++++++++++-----------
 test-utils/runtime/src/lib.rs            |  2 +-
 4 files changed, 75 insertions(+), 26 deletions(-)

diff --git a/primitives/core/src/lib.rs b/primitives/core/src/lib.rs
index 1f1b88fe2f1c..8f97d59f2194 100644
--- a/primitives/core/src/lib.rs
+++ b/primitives/core/src/lib.rs
@@ -281,7 +281,7 @@ pub trait TypeId {
 
 /// A log level matching the one from `log` crate.
 ///
-/// Used internally by `sp_io::log` method.
+/// Used internally by `sp_io::logging::log` method.
 #[derive(Encode, Decode, PassByEnum, Copy, Clone)]
 pub enum LogLevel {
 	/// `Error` log level.
@@ -334,6 +334,53 @@ impl From<LogLevel> for log::Level {
 	}
 }
 
+/// Log level filter that expresses which log levels should be filtered.
+///
+/// This enum matches the [`log::LogLevelFilter`] enum.
+#[derive(Encode, Decode, PassByEnum, Copy, Clone)]
+pub enum LogLevelFilter {
+	/// `Off` log level filter.
+	Off = 0,
+	/// `Error` log level filter.
+	Error = 1,
+	/// `Warn` log level filter.
+	Warn = 2,
+	/// `Info` log level filter.
+	Info = 3,
+	/// `Debug` log level filter.
+	Debug = 4,
+	/// `Trace` log level filter.
+	Trace = 5,
+}
+
+impl From<LogLevelFilter> for log::LevelFilter {
+	fn from(l: LogLevelFilter) -> Self {
+		use self::LogLevelFilter::*;
+		match l {
+			Off => Self::Off,
+			Error => Self::Error,
+			Warn => Self::Warn,
+			Info => Self::Info,
+			Debug => Self::Debug,
+			Trace => Self::Trace,
+		}
+	}
+}
+
+impl From<log::LevelFilter> for LogLevelFilter {
+	fn from(l: log::LevelFilter) -> Self {
+		use log::LevelFilter::*;
+		match l {
+			Off => Self::Off,
+			Error => Self::Error,
+			Warn => Self::Warn,
+			Info => Self::Info,
+			Debug => Self::Debug,
+			Trace => Self::Trace,
+		}
+	}
+}
+
 /// Encodes the given value into a buffer and returns the pointer and the length as a single `u64`.
 ///
 /// When Substrate calls into Wasm it expects a fixed signature for functions exported
diff --git a/primitives/io/src/lib.rs b/primitives/io/src/lib.rs
index e123008e5a02..a7ad4c16c386 100644
--- a/primitives/io/src/lib.rs
+++ b/primitives/io/src/lib.rs
@@ -47,7 +47,7 @@ use sp_core::{
 use sp_keystore::{KeystoreExt, SyncCryptoStore};
 
 use sp_core::{
-	OpaquePeerId, crypto::KeyTypeId, ed25519, sr25519, ecdsa, H256, LogLevel,
+	OpaquePeerId, crypto::KeyTypeId, ed25519, sr25519, ecdsa, H256, LogLevel, LogLevelFilter,
 	offchain::{
 		Timestamp, HttpRequestId, HttpRequestStatus, HttpError, StorageKind, OpaqueNetworkState,
 	},
@@ -1082,6 +1082,11 @@ pub trait Logging {
 			)
 		}
 	}
+
+	/// Returns the max log level used by the host.
+	fn max_level() -> LogLevelFilter {
+		log::max_level().into()
+	}
 }
 
 #[derive(Encode, Decode)]
diff --git a/primitives/runtime/src/runtime_logger.rs b/primitives/runtime/src/runtime_logger.rs
index e27dc828cdbc..f74704390174 100644
--- a/primitives/runtime/src/runtime_logger.rs
+++ b/primitives/runtime/src/runtime_logger.rs
@@ -40,22 +40,15 @@ impl RuntimeLogger {
 		static LOGGER: RuntimeLogger = RuntimeLogger;
 		let _ = log::set_logger(&LOGGER);
 
-		// Set max level to `TRACE` to ensure we propagate
-		// all log entries to the native side that will do the
-		// final filtering on what should be printed.
-		//
-		// If we don't set any level, logging is disabled
-		// completly.
-		log::set_max_level(log::LevelFilter::Trace);
+		// Use the same max log level as used by the host.
+		log::set_max_level(sp_io::logging::max_level().into());
 	}
 }
 
 impl log::Log for RuntimeLogger {
-	fn enabled(&self, _metadata: &log::Metadata) -> bool {
-		// to avoid calling to host twice, we pass everything
-		// and let the host decide what to print.
-		// If someone is initializing the logger they should
-		// know what they are doing.
+	fn enabled(&self, _: &log::Metadata) -> bool {
+		// The final filtering is done by the host. This is not perfect, as we would still call into
+		// the host for log lines that will be thrown away.
 		true
 	}
 
@@ -81,11 +74,13 @@ mod tests {
 		TestClientBuilder, runtime::TestAPI,
 	};
 	use sp_api::{ProvideRuntimeApi, BlockId};
+	use std::{env, str::FromStr};
 
 	#[test]
-	fn ensure_runtime_logger_works() {
-		if std::env::var("RUN_TEST").is_ok() {
+	fn ensure_runtime_logger_respects_host_max_log_level() {
+		if env::var("RUN_TEST").is_ok() {
 			sp_tracing::try_init_simple();
+			log::set_max_level(log::LevelFilter::from_str(&env::var("RUST_LOG").unwrap()).unwrap());
 
 			let client = TestClientBuilder::new()
 				.set_execution_strategy(ExecutionStrategy::AlwaysWasm).build();
@@ -93,16 +88,18 @@ mod tests {
 			let block_id = BlockId::Number(0);
 			runtime_api.do_trace_log(&block_id).expect("Logging should not fail");
 		} else {
-			let executable = std::env::current_exe().unwrap();
-			let output = std::process::Command::new(executable)
-				.env("RUN_TEST", "1")
-				.env("RUST_LOG", "trace")
-				.args(&["--nocapture", "ensure_runtime_logger_works"])
-				.output()
-				.unwrap();
+			for (level, should_print) in &[("trace", true), ("info", false)] {
+				let executable = std::env::current_exe().unwrap();
+				let output = std::process::Command::new(executable)
+					.env("RUN_TEST", "1")
+					.env("RUST_LOG", level)
+					.args(&["--nocapture", "ensure_runtime_logger_respects_host_max_log_level"])
+					.output()
+					.unwrap();
 
-			let output = dbg!(String::from_utf8(output.stderr).unwrap());
-			assert!(output.contains("Hey I'm runtime"));
+				let output = String::from_utf8(output.stderr).unwrap();
+				assert!(output.contains("Hey I'm runtime") == *should_print);
+			}
 		}
 	}
 }
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index 150bc403732c..dfd0ee6ae125 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -1019,7 +1019,7 @@ cfg_if! {
 				}
 
 				fn do_trace_log() {
-					log::error!("Hey I'm runtime: {}", log::STATIC_MAX_LEVEL);
+					log::trace!("Hey I'm runtime: {}", log::STATIC_MAX_LEVEL);
 				}
 			}
 

From 8060a437dc01cc247a757fb318a46f81c8e40d5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Garillot?=
 <4142+huitseeker@users.noreply.github.com>
Date: Fri, 23 Apr 2021 09:36:10 -0400
Subject: [PATCH 0671/1194] Simplify some Option / Result / ? operator patterns
 (#8653)

* Simplify some Option / Result / ? operator patterns

When those match a combinator exactly.

Tool-aided by [comby-rust](https://github.com/huitseeker/comby-rust).

* adjust after review

* adjust post-review
---
 .maintain/node-template-release/src/main.rs     |  3 +--
 client/api/src/cht.rs                           |  9 +++------
 client/api/src/in_mem.rs                        | 12 ++++--------
 client/api/src/notifications.rs                 | 15 +++++++--------
 client/consensus/aura/src/import_queue.rs       | 11 +++--------
 client/consensus/babe/src/verification.rs       |  6 ++----
 client/consensus/manual-seal/src/seal_block.rs  |  5 +----
 client/consensus/slots/src/lib.rs               |  5 +----
 client/consensus/slots/src/slots.rs             |  5 +----
 client/db/src/changes_tries_storage.rs          |  6 ++----
 client/db/src/utils.rs                          |  6 ++----
 client/finality-grandpa/src/import.rs           |  8 ++------
 client/finality-grandpa/src/lib.rs              | 17 ++++++++---------
 client/light/src/fetcher.rs                     |  5 +----
 client/offchain/src/api/http.rs                 |  5 +----
 client/peerset/src/peersstate.rs                |  6 +-----
 client/rpc/src/state/state_light.rs             |  7 ++-----
 client/service/src/client/client.rs             | 12 ++++--------
 client/service/src/lib.rs                       | 12 +++++-------
 client/state-db/src/noncanonical.rs             |  6 ++----
 client/telemetry/src/lib.rs                     |  5 +----
 client/tracing/src/lib.rs                       |  2 +-
 client/transaction-pool/graph/src/pool.rs       |  5 +----
 client/transaction-pool/graph/src/ready.rs      |  5 +----
 frame/assets/src/functions.rs                   |  5 +----
 frame/authorship/src/lib.rs                     |  5 +----
 frame/contracts/src/gas.rs                      |  5 +----
 frame/contracts/src/migration.rs                |  6 +-----
 frame/contracts/src/rent.rs                     |  5 +----
 frame/democracy/src/lib.rs                      | 15 +++------------
 frame/grandpa/src/lib.rs                        | 12 ++----------
 frame/staking/src/lib.rs                        |  7 ++-----
 frame/support/src/storage/generator/value.rs    |  6 ++----
 primitives/api/proc-macro/src/utils.rs          |  3 +--
 primitives/consensus/common/src/block_import.rs |  7 ++-----
 utils/frame/rpc/system/src/lib.rs               |  5 +----
 utils/frame/try-runtime/cli/src/lib.rs          |  6 ++----
 37 files changed, 77 insertions(+), 188 deletions(-)

diff --git a/.maintain/node-template-release/src/main.rs b/.maintain/node-template-release/src/main.rs
index a1d85bf33fe3..bf37797419bc 100644
--- a/.maintain/node-template-release/src/main.rs
+++ b/.maintain/node-template-release/src/main.rs
@@ -99,8 +99,7 @@ fn replace_path_dependencies_with_git(cargo_toml_path: &Path, commit_id: &str, c
 		let deps_rewritten = dependencies
 			.iter()
 			.filter_map(|(k, v)| v.clone().try_into::<toml::value::Table>().ok().map(move |v| (k, v)))
-			.filter(|t| t.1.contains_key("path"))
-			.filter(|t| {
+			.filter(|t| t.1.contains_key("path") && {
 				// if the path does not exists, we need to add this as git dependency
 				t.1.get("path").unwrap().as_str().map(|path| !cargo_toml_path.join(path).exists()).unwrap_or(false)
 			})
diff --git a/client/api/src/cht.rs b/client/api/src/cht.rs
index 8fec00403bde..96a5a272916e 100644
--- a/client/api/src/cht.rs
+++ b/client/api/src/cht.rs
@@ -218,12 +218,9 @@ pub fn for_each_cht_group<Header, I, F, P>(
 	let mut current_cht_num = None;
 	let mut current_cht_blocks = Vec::new();
 	for block in blocks {
-		let new_cht_num = match block_to_cht_number(cht_size, block) {
-			Some(new_cht_num) => new_cht_num,
-			None => return Err(ClientError::Backend(format!(
-				"Cannot compute CHT root for the block #{}", block)).into()
-			),
-		};
+		let new_cht_num = block_to_cht_number(cht_size, block).ok_or_else(|| ClientError::Backend(format!(
+				"Cannot compute CHT root for the block #{}", block))
+			)?;
 
 		let advance_to_next_cht = current_cht_num.is_some() && current_cht_num != Some(new_cht_num);
 		if advance_to_next_cht {
diff --git a/client/api/src/in_mem.rs b/client/api/src/in_mem.rs
index 930ae39c4b52..409b5f52b5d3 100644
--- a/client/api/src/in_mem.rs
+++ b/client/api/src/in_mem.rs
@@ -226,10 +226,8 @@ impl<Block: BlockT> Blockchain<Block> {
 
 	/// Set an existing block as head.
 	pub fn set_head(&self, id: BlockId<Block>) -> sp_blockchain::Result<()> {
-		let header = match self.header(id)? {
-			Some(h) => h,
-			None => return Err(sp_blockchain::Error::UnknownBlock(format!("{}", id))),
-		};
+		let header = self.header(id)?
+			.ok_or_else(|| sp_blockchain::Error::UnknownBlock(format!("{}", id)))?;
 
 		self.apply_head(&header)
 	}
@@ -760,10 +758,8 @@ impl<Block: BlockT> backend::Backend<Block> for Backend<Block> where Block::Hash
 			_ => {},
 		}
 
-		match self.blockchain.id(block).and_then(|id| self.states.read().get(&id).cloned()) {
-			Some(state) => Ok(state),
-			None => Err(sp_blockchain::Error::UnknownBlock(format!("{}", block))),
-		}
+		self.blockchain.id(block).and_then(|id| self.states.read().get(&id).cloned())
+			.ok_or_else(|| sp_blockchain::Error::UnknownBlock(format!("{}", block)))
 	}
 
 	fn revert(
diff --git a/client/api/src/notifications.rs b/client/api/src/notifications.rs
index bfd419ec9a58..b043a332d667 100644
--- a/client/api/src/notifications.rs
+++ b/client/api/src/notifications.rs
@@ -51,19 +51,18 @@ impl StorageChangeSet {
 			.map(move |(k,v)| (None, k, v.as_ref()));
 		let children = self.child_changes
 			.iter()
-			.filter_map(move |(sk, changes)| {
-				if let Some(cf) = self.child_filters.as_ref() {
-					if let Some(filter) = cf.get(sk) {
-						Some(changes
+			.filter_map(move |(sk, changes)| 
+				self.child_filters.as_ref().and_then(|cf|
+					cf.get(sk).map(|filter| changes
 							.iter()
 							.filter(move |&(key, _)| match filter {
 								Some(ref filter) => filter.contains(key),
 								None => true,
 							})
-							.map(move |(k,v)| (Some(sk), k, v.as_ref())))
-					} else { None }
-				} else { None	}
-			})
+							.map(move |(k,v)| (Some(sk), k, v.as_ref()))
+					)
+				)
+			)
 			.flatten();
 		top.chain(children)
 	}
diff --git a/client/consensus/aura/src/import_queue.rs b/client/consensus/aura/src/import_queue.rs
index 736c89aff6b0..0ec95d9412c2 100644
--- a/client/consensus/aura/src/import_queue.rs
+++ b/client/consensus/aura/src/import_queue.rs
@@ -72,10 +72,7 @@ fn check_header<C, B: BlockT, P: Pair>(
 	C: sc_client_api::backend::AuxStore,
 	P::Public: Encode + Decode + PartialEq + Clone,
 {
-	let seal = match header.digest_mut().pop() {
-		Some(x) => x,
-		None => return Err(Error::HeaderUnsealed(hash)),
-	};
+	let seal = header.digest_mut().pop().ok_or_else(|| Error::HeaderUnsealed(hash))?;
 
 	let sig = seal.as_aura_seal().ok_or_else(|| {
 		aura_err(Error::HeaderBadSeal(hash))
@@ -89,10 +86,8 @@ fn check_header<C, B: BlockT, P: Pair>(
 	} else {
 		// check the signature is valid under the expected authority and
 		// chain state.
-		let expected_author = match slot_author::<P>(slot, &authorities) {
-			None => return Err(Error::SlotAuthorNotFound),
-			Some(author) => author,
-		};
+		let expected_author = slot_author::<P>(slot, &authorities)
+			.ok_or_else(|| Error::SlotAuthorNotFound)?;
 
 		let pre_hash = header.hash();
 
diff --git a/client/consensus/babe/src/verification.rs b/client/consensus/babe/src/verification.rs
index 53dfd9ed10ce..469286f5110d 100644
--- a/client/consensus/babe/src/verification.rs
+++ b/client/consensus/babe/src/verification.rs
@@ -71,10 +71,8 @@ pub(super) fn check_header<B: BlockT + Sized>(
 	let pre_digest = pre_digest.map(Ok).unwrap_or_else(|| find_pre_digest::<B>(&header))?;
 
 	trace!(target: "babe", "Checking header");
-	let seal = match header.digest_mut().pop() {
-		Some(x) => x,
-		None => return Err(babe_err(Error::HeaderUnsealed(header.hash()))),
-	};
+	let seal = header.digest_mut().pop()
+		.ok_or_else(|| babe_err(Error::HeaderUnsealed(header.hash())))?;
 
 	let sig = seal.as_babe_seal().ok_or_else(|| {
 		babe_err(Error::HeaderBadSeal(header.hash()))
diff --git a/client/consensus/manual-seal/src/seal_block.rs b/client/consensus/manual-seal/src/seal_block.rs
index b21630f0377e..a8050efb9a07 100644
--- a/client/consensus/manual-seal/src/seal_block.rs
+++ b/client/consensus/manual-seal/src/seal_block.rs
@@ -104,10 +104,7 @@ pub async fn seal_block<B, BI, SC, C, E, P>(
 		// or fetch the best_block.
 		let parent = match parent_hash {
 			Some(hash) => {
-				match client.header(BlockId::Hash(hash))? {
-					Some(header) => header,
-					None => return Err(Error::BlockNotFound(format!("{}", hash))),
-				}
+				client.header(BlockId::Hash(hash))?.ok_or_else(|| Error::BlockNotFound(format!("{}", hash)))?
 			}
 			None => select_chain.best_chain()?
 		};
diff --git a/client/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs
index 1436f5f5c2c2..c1638fb56632 100644
--- a/client/consensus/slots/src/lib.rs
+++ b/client/consensus/slots/src/lib.rs
@@ -256,10 +256,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 			return None;
 		}
 
-		let claim = match self.claim_slot(&chain_head, slot, &epoch_data) {
-			None => return None,
-			Some(claim) => claim,
-		};
+		let claim = self.claim_slot(&chain_head, slot, &epoch_data)?;
 
 		if self.should_backoff(slot, &chain_head) {
 			return None;
diff --git a/client/consensus/slots/src/slots.rs b/client/consensus/slots/src/slots.rs
index 4057a6d0d15a..1d89ba3bf992 100644
--- a/client/consensus/slots/src/slots.rs
+++ b/client/consensus/slots/src/slots.rs
@@ -135,10 +135,7 @@ impl<SC: SlotCompatible> Slots<SC> {
 				Err(err) => return Err(sp_consensus::Error::InherentData(err)),
 			};
 			let result = self.timestamp_extractor.extract_timestamp_and_slot(&inherent_data);
-			let (timestamp, slot, offset) = match result {
-				Ok(v) => v,
-				Err(err) => return Err(err),
-			};
+			let (timestamp, slot, offset) = result?;
 			// reschedule delay for next slot.
 			let ends_in = offset +
 				time_until_next(timestamp.as_duration(), self.slot_duration);
diff --git a/client/db/src/changes_tries_storage.rs b/client/db/src/changes_tries_storage.rs
index 8051adc1832b..860ca4173051 100644
--- a/client/db/src/changes_tries_storage.rs
+++ b/client/db/src/changes_tries_storage.rs
@@ -503,10 +503,8 @@ fn read_tries_meta<Block: BlockT>(
 	meta_column: u32,
 ) -> ClientResult<ChangesTriesMeta<Block>> {
 	match db.get(meta_column, meta_keys::CHANGES_TRIES_META) {
-		Some(h) => match Decode::decode(&mut &h[..]) {
-			Ok(h) => Ok(h),
-			Err(err) => Err(ClientError::Backend(format!("Error decoding changes tries metadata: {}", err))),
-		},
+		Some(h) => Decode::decode(&mut &h[..])
+			.map_err(|err| ClientError::Backend(format!("Error decoding changes tries metadata: {}", err))),
 		None => Ok(ChangesTriesMeta {
 			oldest_digest_range: None,
 			oldest_pruned_digest_range_end: Zero::zero(),
diff --git a/client/db/src/utils.rs b/client/db/src/utils.rs
index 590b994d50e8..7f82cb848912 100644
--- a/client/db/src/utils.rs
+++ b/client/db/src/utils.rs
@@ -395,10 +395,8 @@ pub fn read_meta<Block>(db: &dyn Database<DbHash>, col_header: u32) -> Result<
 	};
 
 	let load_meta_block = |desc, key| -> Result<_, sp_blockchain::Error> {
-		if let Some(Some(header)) = match db.get(COLUMN_META, key) {
-				Some(id) => db.get(col_header, &id).map(|b| Block::Header::decode(&mut &b[..]).ok()),
-				None => None,
-			}
+		if let Some(Some(header)) = db.get(COLUMN_META, key)
+			.and_then(|id| db.get(col_header, &id).map(|b| Block::Header::decode(&mut &b[..]).ok()))
 		{
 			let hash = header.hash();
 			debug!(
diff --git a/client/finality-grandpa/src/import.rs b/client/finality-grandpa/src/import.rs
index b2fcca019bcb..482859b1f79e 100644
--- a/client/finality-grandpa/src/import.rs
+++ b/client/finality-grandpa/src/import.rs
@@ -289,14 +289,10 @@ where
 			fn consume(
 				mut self,
 			) -> Option<(AuthoritySet<H, N>, SharedDataLocked<'a, AuthoritySet<H, N>>)> {
-				if let Some(old) = self.old.take() {
-					Some((
+				self.old.take().map(|old| (
 						old,
 						self.guard.take().expect("only taken on deconstruction; qed"),
-					))
-				} else {
-					None
-				}
+				))
 			}
 		}
 
diff --git a/client/finality-grandpa/src/lib.rs b/client/finality-grandpa/src/lib.rs
index fb9ecaa2c137..e1c3a2c13154 100644
--- a/client/finality-grandpa/src/lib.rs
+++ b/client/finality-grandpa/src/lib.rs
@@ -1134,13 +1134,12 @@ fn local_authority_id(
 	voters: &VoterSet<AuthorityId>,
 	keystore: Option<&SyncCryptoStorePtr>,
 ) -> Option<AuthorityId> {
-	match keystore {
-		Some(keystore) => voters
-			.iter()
-			.find(|(p, _)| {
-				SyncCryptoStore::has_keys(&**keystore, &[(p.to_raw_vec(), AuthorityId::ID)])
-			})
-			.map(|(p, _)| p.clone()),
-		None => None,
-	}
+	keystore.and_then(|keystore| { 
+		voters
+		.iter()
+		.find(|(p, _)| {
+			SyncCryptoStore::has_keys(&**keystore, &[(p.to_raw_vec(), AuthorityId::ID)])
+		})
+		.map(|(p, _)| p.clone()) 
+	})
 }
diff --git a/client/light/src/fetcher.rs b/client/light/src/fetcher.rs
index b71c4871803d..e39cfe07fbf5 100644
--- a/client/light/src/fetcher.rs
+++ b/client/light/src/fetcher.rs
@@ -330,10 +330,7 @@ impl<'a, H, Number, Hash> ChangesTrieRootsStorage<H, Number> for RootsStorage<'a
 			self.prev_roots.get(&Number::unique_saturated_from(block)).cloned()
 		} else {
 			let index: Option<usize> = block.checked_sub(&self.roots.0).and_then(|index| index.checked_into());
-			match index {
-				Some(index) => self.roots.1.get(index as usize).cloned(),
-				None => None,
-			}
+			index.and_then(|index| self.roots.1.get(index as usize).cloned())
 		};
 
 		Ok(root.map(|root| {
diff --git a/client/offchain/src/api/http.rs b/client/offchain/src/api/http.rs
index dbe8e55b3646..f03f7a93b856 100644
--- a/client/offchain/src/api/http.rs
+++ b/client/offchain/src/api/http.rs
@@ -183,10 +183,7 @@ impl HttpApi {
 	) -> Result<(), HttpError> {
 		// Extract the request from the list.
 		// Don't forget to add it back if necessary when returning.
-		let mut request = match self.requests.remove(&request_id) {
-			None => return Err(HttpError::Invalid),
-			Some(r) => r,
-		};
+		let mut request = self.requests.remove(&request_id).ok_or_else(|| HttpError::Invalid)?;
 
 		let mut deadline = timestamp::deadline_to_future(deadline);
 		// Closure that writes data to a sender, taking the deadline into account. Can return `Ok`
diff --git a/client/peerset/src/peersstate.rs b/client/peerset/src/peersstate.rs
index c200d2729e16..309c7e6b8f97 100644
--- a/client/peerset/src/peersstate.rs
+++ b/client/peerset/src/peersstate.rs
@@ -272,15 +272,11 @@ impl PeersState {
 			})
 			.map(|(peer_id, _)| peer_id.clone());
 
-		if let Some(peer_id) = outcome {
-			Some(NotConnectedPeer {
+		outcome.map(move |peer_id| NotConnectedPeer {
 				state: self,
 				set,
 				peer_id: Cow::Owned(peer_id),
 			})
-		} else {
-			None
-		}
 	}
 
 	/// Returns `true` if there is a free outgoing slot available related to this set.
diff --git a/client/rpc/src/state/state_light.rs b/client/rpc/src/state/state_light.rs
index c8c921345877..4bc4b0772784 100644
--- a/client/rpc/src/state/state_light.rs
+++ b/client/rpc/src/state/state_light.rs
@@ -722,13 +722,10 @@ fn maybe_share_remote_request<Block: BlockT, Requests, V, IssueRequest, IssueReq
 fn display_error<F, T>(future: F) -> impl std::future::Future<Output=Result<T, ()>> where
 	F: std::future::Future<Output=Result<T, Error>>
 {
-	future.then(|result| ready(match result {
-		Ok(result) => Ok(result),
-		Err(err) => {
+	future.then(|result| ready(result.or_else(|err| {
 			warn!("Remote request for subscription data has failed with: {:?}", err);
 			Err(())
-		},
-	}))
+		})))
 }
 
 /// Convert successful future result into Ok(Some(result)) and error into Ok(None),
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index f975961c3b4e..f05a2751995d 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -585,10 +585,8 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		&dyn PrunableStateChangesTrieStorage<Block>,
 		Vec<(NumberFor<Block>, Option<(NumberFor<Block>, Block::Hash)>, ChangesTrieConfiguration)>,
 	)> {
-		let storage = match self.backend.changes_trie_storage() {
-			Some(storage) => storage,
-			None => return Err(sp_blockchain::Error::ChangesTriesNotSupported),
-		};
+		let storage = self.backend.changes_trie_storage()
+			.ok_or_else(|| sp_blockchain::Error::ChangesTriesNotSupported)?;
 
 		let mut configs = Vec::with_capacity(1);
 		let mut current = last;
@@ -1153,10 +1151,8 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 	/// Gets the uncles of the block with `target_hash` going back `max_generation` ancestors.
 	pub fn uncles(&self, target_hash: Block::Hash, max_generation: NumberFor<Block>) -> sp_blockchain::Result<Vec<Block::Hash>> {
 		let load_header = |id: Block::Hash| -> sp_blockchain::Result<Block::Header> {
-			match self.backend.blockchain().header(BlockId::Hash(id))? {
-				Some(hdr) => Ok(hdr),
-				None => Err(Error::UnknownBlock(format!("{:?}", id))),
-			}
+			self.backend.blockchain().header(BlockId::Hash(id))?
+				.ok_or_else(|| Error::UnknownBlock(format!("{:?}", id)))
 		};
 
 		let genesis_hash = self.backend.blockchain().info().genesis_hash;
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index 4ca784558dbf..db5f296953e3 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -391,9 +391,8 @@ fn start_rpc_servers<
 ) -> Result<Box<dyn std::any::Any + Send + Sync>, error::Error> {
 	fn maybe_start_server<T, F>(address: Option<SocketAddr>, mut start: F) -> Result<Option<T>, io::Error>
 		where F: FnMut(&SocketAddr) -> Result<T, io::Error>,
-	{
-		Ok(match address {
-			Some(mut address) => Some(start(&address)
+		{
+			address.map(|mut address| start(&address)
 				.or_else(|e| match e.kind() {
 					io::ErrorKind::AddrInUse |
 					io::ErrorKind::PermissionDenied => {
@@ -402,10 +401,9 @@ fn start_rpc_servers<
 						start(&address)
 					},
 					_ => Err(e),
-				})?),
-			None => None,
-		})
-	}
+				}
+			) ).transpose()
+		}
 
 	fn deny_unsafe(addr: &SocketAddr, methods: &RpcMethods) -> sc_rpc::DenyUnsafe {
 		let is_exposed_addr = !addr.ip().is_loopback();
diff --git a/client/state-db/src/noncanonical.rs b/client/state-db/src/noncanonical.rs
index 8eaa8a02f567..3f0c7d132f74 100644
--- a/client/state-db/src/noncanonical.rs
+++ b/client/state-db/src/noncanonical.rs
@@ -150,10 +150,8 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 	pub fn new<D: MetaDb>(db: &D) -> Result<NonCanonicalOverlay<BlockHash, Key>, Error<D::Error>> {
 		let last_canonicalized = db.get_meta(&to_meta_key(LAST_CANONICAL, &()))
 			.map_err(|e| Error::Db(e))?;
-		let last_canonicalized = match last_canonicalized {
-			Some(buffer) => Some(<(BlockHash, u64)>::decode(&mut buffer.as_slice())?),
-			None => None,
-		};
+		let last_canonicalized = last_canonicalized
+			.map(|buffer| <(BlockHash, u64)>::decode(&mut buffer.as_slice())).transpose()?;
 		let mut levels = VecDeque::new();
 		let mut parents = HashMap::new();
 		let mut values = HashMap::new();
diff --git a/client/telemetry/src/lib.rs b/client/telemetry/src/lib.rs
index 8d3b605db01a..5c233d54903d 100644
--- a/client/telemetry/src/lib.rs
+++ b/client/telemetry/src/lib.rs
@@ -389,10 +389,7 @@ impl Telemetry {
 	/// The `connection_message` argument is a JSON object that is sent every time the connection
 	/// (re-)establishes.
 	pub fn start_telemetry(&mut self, connection_message: ConnectionMessage) -> Result<()> {
-		let endpoints = match self.endpoints.take() {
-			Some(x) => x,
-			None => return Err(Error::TelemetryAlreadyInitialized),
-		};
+		let endpoints = self.endpoints.take().ok_or_else(|| Error::TelemetryAlreadyInitialized)?;
 
 		self.register_sender
 			.unbounded_send(Register::Telemetry {
diff --git a/client/tracing/src/lib.rs b/client/tracing/src/lib.rs
index 41947d4c0ed8..54620d30bb56 100644
--- a/client/tracing/src/lib.rs
+++ b/client/tracing/src/lib.rs
@@ -246,7 +246,7 @@ fn parse_target(s: &str) -> (String, Level) {
 		Some(i) => {
 			let target = s[0..i].to_string();
 			if s.len() > i {
-				let level = s[i + 1..s.len()].parse::<Level>().unwrap_or(Level::TRACE);
+				let level = s[i + 1..].parse::<Level>().unwrap_or(Level::TRACE);
 				(target, level)
 			} else {
 				(target, Level::TRACE)
diff --git a/client/transaction-pool/graph/src/pool.rs b/client/transaction-pool/graph/src/pool.rs
index 8a60ea80bca9..7f9bc3c757f1 100644
--- a/client/transaction-pool/graph/src/pool.rs
+++ b/client/transaction-pool/graph/src/pool.rs
@@ -322,10 +322,7 @@ impl<B: ChainApi> Pool<B> {
 	) -> Result<(), B::Error> {
 		log::debug!(target: "txpool", "Pruning at {:?}", at);
 		// Prune all transactions that provide given tags
-		let prune_status = match self.validated_pool.prune_tags(tags) {
-			Ok(prune_status) => prune_status,
-			Err(e) => return Err(e),
-		};
+		let prune_status = self.validated_pool.prune_tags(tags)?;
 
 		// Make sure that we don't revalidate extrinsics that were part of the recently
 		// imported block. This is especially important for UTXO-like chains cause the
diff --git a/client/transaction-pool/graph/src/ready.rs b/client/transaction-pool/graph/src/ready.rs
index 4ede9241d81b..7946f49e6a17 100644
--- a/client/transaction-pool/graph/src/ready.rs
+++ b/client/transaction-pool/graph/src/ready.rs
@@ -527,12 +527,9 @@ impl<Hash: hash::Hash + Member, Ex> Iterator for BestIterator<Hash, Ex> {
 					satisfied += 1;
 					Some((satisfied, tx_ref))
 				// then get from the pool
-				} else if let Some(next) = self.all.read().get(hash) {
-					Some((next.requires_offset + 1, next.transaction.clone()))
 				} else {
-					None
+					self.all.read().get(hash).map(|next| (next.requires_offset + 1, next.transaction.clone()))
 				};
-
 				if let Some((satisfied, tx_ref)) = res {
 					self.best_or_awaiting(satisfied, tx_ref)
 				}
diff --git a/frame/assets/src/functions.rs b/frame/assets/src/functions.rs
index 3f2abe0617e1..13c92f781b07 100644
--- a/frame/assets/src/functions.rs
+++ b/frame/assets/src/functions.rs
@@ -163,10 +163,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		who: &T::AccountId,
 		keep_alive: bool,
 	) -> Result<T::Balance, Error<T, I>> {
-		let details = match Asset::<T, I>::get(id) {
-			Some(details) => details,
-			None => return Err(Error::<T, I>::Unknown),
-		};
+		let details = Asset::<T, I>::get(id).ok_or_else(|| Error::<T, I>::Unknown)?;
 		ensure!(!details.is_frozen, Error::<T, I>::Frozen);
 
 		let account = Account::<T, I>::get(id, who);
diff --git a/frame/authorship/src/lib.rs b/frame/authorship/src/lib.rs
index da4b66f229f1..a7803319c539 100644
--- a/frame/authorship/src/lib.rs
+++ b/frame/authorship/src/lib.rs
@@ -490,10 +490,7 @@ mod tests {
 			let pre_runtime_digests = header.digest.logs.iter().filter_map(|d| d.as_pre_runtime());
 			let seals = header.digest.logs.iter().filter_map(|d| d.as_seal());
 
-			let author = match AuthorGiven::find_author(pre_runtime_digests) {
-				None => return Err("no author"),
-				Some(author) => author,
-			};
+			let author = AuthorGiven::find_author(pre_runtime_digests).ok_or_else(|| "no author")?;
 
 			for (id, seal) in seals {
 				if id == TEST_ID {
diff --git a/frame/contracts/src/gas.rs b/frame/contracts/src/gas.rs
index 21c1afbcd696..31cc5fad30c9 100644
--- a/frame/contracts/src/gas.rs
+++ b/frame/contracts/src/gas.rs
@@ -127,10 +127,7 @@ where
 		}
 
 		let amount = token.calculate_amount(metadata);
-		let new_value = match self.gas_left.checked_sub(amount) {
-			None => None,
-			Some(val) => Some(val),
-		};
+		let new_value = self.gas_left.checked_sub(amount);
 
 		// We always consume the gas even if there is not enough gas.
 		self.gas_left = new_value.unwrap_or_else(Zero::zero);
diff --git a/frame/contracts/src/migration.rs b/frame/contracts/src/migration.rs
index 2e10f4b7ff68..4fc138d3f3da 100644
--- a/frame/contracts/src/migration.rs
+++ b/frame/contracts/src/migration.rs
@@ -26,16 +26,12 @@ pub fn migrate<T: Config>() -> Weight {
 		Some(version) if version == PalletVersion::new(3, 0, 0) => {
 			weight = weight.saturating_add(T::DbWeight::get().reads_writes(1, 1));
 			let _ = <CurrentSchedule<T>>::translate::<u32, _>(|version| {
-				if let Some(version) = version {
-					Some(Schedule {
+				version.map(|version| Schedule {
 						version: version.saturating_add(1),
 						// Default limits were not decreased. Therefore it is OK to overwrite
 						// the schedule with the new defaults.
 						.. Default::default()
 					})
-				} else {
-					None
-				}
 			});
 		}
 		_ => (),
diff --git a/frame/contracts/src/rent.rs b/frame/contracts/src/rent.rs
index 321fe151c300..6e268c48bc82 100644
--- a/frame/contracts/src/rent.rs
+++ b/frame/contracts/src/rent.rs
@@ -407,10 +407,7 @@ where
 		);
 
 		// Check what happened after enaction of the verdict.
-		let alive_contract_info = match new_contract_info.map_err(|_| IsTombstone)? {
-			None => return Err(IsTombstone),
-			Some(contract) => contract,
-		};
+		let alive_contract_info = new_contract_info.map_err(|_| IsTombstone)?.ok_or_else(|| IsTombstone)?;
 
 		// Compute how much would the fee per block be with the *updated* balance.
 		let total_balance = T::Currency::total_balance(account);
diff --git a/frame/democracy/src/lib.rs b/frame/democracy/src/lib.rs
index b3b37b0b34b6..351204bfcb58 100644
--- a/frame/democracy/src/lib.rs
+++ b/frame/democracy/src/lib.rs
@@ -1653,10 +1653,7 @@ impl<T: Config> Module<T> {
 		// To decode the enum variant we only need the first byte.
 		let mut buf = [0u8; 1];
 		let key = <Preimages<T>>::hashed_key_for(proposal_hash);
-		let bytes = match sp_io::storage::read(&key, &mut buf, 0) {
-			Some(bytes) => bytes,
-			None => return Err(Error::<T>::NotImminent.into()),
-		};
+		let bytes = sp_io::storage::read(&key, &mut buf, 0).ok_or_else(|| Error::<T>::NotImminent)?;
 		// The value may be smaller that 1 byte.
 		let mut input = &buf[0..buf.len().min(bytes as usize)];
 
@@ -1684,10 +1681,7 @@ impl<T: Config> Module<T> {
 		// * at most 5 bytes to decode a `Compact<u32>`
 		let mut buf = [0u8; 6];
 		let key = <Preimages<T>>::hashed_key_for(proposal_hash);
-		let bytes = match sp_io::storage::read(&key, &mut buf, 0) {
-			Some(bytes) => bytes,
-			None => return Err(Error::<T>::PreimageMissing.into()),
-		};
+		let bytes = sp_io::storage::read(&key, &mut buf, 0).ok_or_else(|| Error::<T>::PreimageMissing)?;
 		// The value may be smaller that 6 bytes.
 		let mut input = &buf[0..buf.len().min(bytes as usize)];
 
@@ -1761,10 +1755,7 @@ impl<T: Config> Module<T> {
 fn decode_compact_u32_at(key: &[u8]) -> Option<u32> {
 	// `Compact<u32>` takes at most 5 bytes.
 	let mut buf = [0u8; 5];
-	let bytes = match sp_io::storage::read(&key, &mut buf, 0) {
-		Some(bytes) => bytes,
-		None => return None,
-	};
+	let bytes = sp_io::storage::read(&key, &mut buf, 0)?;
 	// The value may be smaller than 5 bytes.
 	let mut input = &buf[0..buf.len().min(bytes as usize)];
 	match codec::Compact::<u32>::decode(&mut input) {
diff --git a/frame/grandpa/src/lib.rs b/frame/grandpa/src/lib.rs
index eb3dc4f110ac..7cfc1d61baf2 100644
--- a/frame/grandpa/src/lib.rs
+++ b/frame/grandpa/src/lib.rs
@@ -518,21 +518,13 @@ impl<T: Config> Module<T> {
 			None
 		} else {
 			let session_index =
-				if let Some(session_id) = Self::session_for_set(set_id - 1) {
-					session_id
-				} else {
-					return Err(Error::<T>::InvalidEquivocationProof.into());
-				};
+				Self::session_for_set(set_id - 1).ok_or_else(|| Error::<T>::InvalidEquivocationProof)?;
 
 			Some(session_index)
 		};
 
 		let set_id_session_index =
-			if let Some(session_id) = Self::session_for_set(set_id) {
-				session_id
-			} else {
-				return Err(Error::<T>::InvalidEquivocationProof.into());
-			};
+			Self::session_for_set(set_id).ok_or_else(|| Error::<T>::InvalidEquivocationProof)?;
 
 		// check that the session id for the membership proof is within the
 		// bounds of the set id reported in the equivocation.
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index c938dceb76e4..4252eae50d9b 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -2736,11 +2736,8 @@ impl<T: Config> Convert<T::AccountId, Option<Exposure<T::AccountId, BalanceOf<T>
 	for ExposureOf<T>
 {
 	fn convert(validator: T::AccountId) -> Option<Exposure<T::AccountId, BalanceOf<T>>> {
-		if let Some(active_era) = <Module<T>>::active_era() {
-			Some(<Module<T>>::eras_stakers(active_era.index, &validator))
-		} else {
-			None
-		}
+		<Module<T>>::active_era()
+			.map(|active_era| <Module<T>>::eras_stakers(active_era.index, &validator))
 	}
 }
 
diff --git a/frame/support/src/storage/generator/value.rs b/frame/support/src/storage/generator/value.rs
index 093dcb305e64..e07c952320aa 100644
--- a/frame/support/src/storage/generator/value.rs
+++ b/frame/support/src/storage/generator/value.rs
@@ -77,10 +77,8 @@ impl<T: FullCodec, G: StorageValue<T>> storage::StorageValue<T> for G {
 		let key = Self::storage_value_final_key();
 
 		// attempt to get the length directly.
-		let maybe_old = match unhashed::get_raw(&key) {
-			Some(old_data) => Some(O::decode(&mut &old_data[..]).map_err(|_| ())?),
-			None => None,
-		};
+		let maybe_old = unhashed::get_raw(&key)
+			.map(|old_data| O::decode(&mut &old_data[..]).map_err(|_| ())).transpose()?;
 		let maybe_new = f(maybe_old);
 		if let Some(new) = maybe_new.as_ref() {
 			new.using_encoded(|d| unhashed::put_raw(&key, d));
diff --git a/primitives/api/proc-macro/src/utils.rs b/primitives/api/proc-macro/src/utils.rs
index 2e4ccf8ff4ed..aa3c69d46a29 100644
--- a/primitives/api/proc-macro/src/utils.rs
+++ b/primitives/api/proc-macro/src/utils.rs
@@ -195,7 +195,7 @@ pub fn extract_all_signature_types(items: &[ImplItem]) -> Vec<Type> {
 			ImplItem::Method(method) => Some(&method.sig),
 			_ => None,
 		})
-		.map(|sig| {
+		.flat_map(|sig| {
 			let ret_ty = match &sig.output {
 				ReturnType::Default => None,
 				ReturnType::Type(_, ty) => Some((**ty).clone()),
@@ -209,7 +209,6 @@ pub fn extract_all_signature_types(items: &[ImplItem]) -> Vec<Type> {
 				_ => (**ty).clone(),
 			}).chain(ret_ty)
 		})
-		.flatten()
 		.collect()
 }
 
diff --git a/primitives/consensus/common/src/block_import.rs b/primitives/consensus/common/src/block_import.rs
index 8d01da64b4cd..6e4fb9886501 100644
--- a/primitives/consensus/common/src/block_import.rs
+++ b/primitives/consensus/common/src/block_import.rs
@@ -237,13 +237,10 @@ impl<Block: BlockT, Transaction> BlockImportParams<Block, Transaction> {
 	pub fn take_intermediate<T: 'static>(&mut self, key: &[u8]) -> Result<Box<T>, Error> {
 		let (k, v) = self.intermediates.remove_entry(key).ok_or(Error::NoIntermediate)?;
 
-		match v.downcast::<T>() {
-			Ok(v) => Ok(v),
-			Err(v) => {
+		v.downcast::<T>().or_else(|v| {
 				self.intermediates.insert(k, v);
 				Err(Error::InvalidIntermediate)
-			},
-		}
+		})
 	}
 
 	/// Get a reference to a given intermediate.
diff --git a/utils/frame/rpc/system/src/lib.rs b/utils/frame/rpc/system/src/lib.rs
index 57c0cda9cca3..bbc51a28a59c 100644
--- a/utils/frame/rpc/system/src/lib.rs
+++ b/utils/frame/rpc/system/src/lib.rs
@@ -207,10 +207,7 @@ where
 		let call_data = account.encode();
 		let future_best_header = future_best_header
 			.and_then(move |maybe_best_header| ready(
-				match maybe_best_header {
-					Some(best_header) => Ok(best_header),
-					None => Err(ClientError::UnknownBlock(format!("{}", best_hash))),
-				}
+				maybe_best_header.ok_or_else(|| { ClientError::UnknownBlock(format!("{}", best_hash)) })
 			));
 		let future_nonce = future_best_header.and_then(move |best_header|
 			fetcher.remote_call(RemoteCallRequest {
diff --git a/utils/frame/try-runtime/cli/src/lib.rs b/utils/frame/try-runtime/cli/src/lib.rs
index 8e407f3b2d73..4d265c099597 100644
--- a/utils/frame/try-runtime/cli/src/lib.rs
+++ b/utils/frame/try-runtime/cli/src/lib.rs
@@ -169,10 +169,8 @@ impl TryRuntimeCmd {
 					uri: url.into(),
 					state_snapshot: snapshot_path.as_ref().map(SnapshotConfig::new),
 					modules: modules.clone().unwrap_or_default(),
-					at: match block_at {
-						Some(b) => Some(b.parse().map_err(|e| format!("Could not parse hash: {:?}", e))?),
-						None => None,
-					},
+					at: block_at.as_ref()
+						.map(|b| b.parse().map_err(|e| format!("Could not parse hash: {:?}", e))).transpose()?,
 					..Default::default()
 				})),
 			};

From 4cbeeca68750d40c8899a3a0fb6058886034862d Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Mon, 26 Apr 2021 10:42:09 -0400
Subject: [PATCH 0672/1194] Add BoundedVec to Treasury Pallet (#8665)

* bounded treasury approvals

* update benchmarks

* update configs

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_treasury --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/treasury/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* fix weight param

Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
---
 bin/node/runtime/src/lib.rs        |  2 ++
 frame/bounties/src/tests.rs        |  2 ++
 frame/tips/src/tests.rs            |  2 ++
 frame/treasury/src/benchmarking.rs |  6 +++--
 frame/treasury/src/lib.rs          | 20 +++++++++-----
 frame/treasury/src/tests.rs        | 19 ++++++++++++++
 frame/treasury/src/weights.rs      | 42 ++++++++++++++++--------------
 7 files changed, 66 insertions(+), 27 deletions(-)

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 648bbff63304..2eaea18f2a62 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -718,6 +718,7 @@ parameter_types! {
 	pub const MaximumReasonLength: u32 = 16384;
 	pub const BountyCuratorDeposit: Permill = Permill::from_percent(50);
 	pub const BountyValueMinimum: Balance = 5 * DOLLARS;
+	pub const MaxApprovals: u32 = 100;
 }
 
 impl pallet_treasury::Config for Runtime {
@@ -742,6 +743,7 @@ impl pallet_treasury::Config for Runtime {
 	type BurnDestination = ();
 	type SpendFunds = Bounties;
 	type WeightInfo = pallet_treasury::weights::SubstrateWeight<Runtime>;
+	type MaxApprovals = MaxApprovals;
 }
 
 impl pallet_bounties::Config for Runtime {
diff --git a/frame/bounties/src/tests.rs b/frame/bounties/src/tests.rs
index b202e4da3e84..e90b1f565a4c 100644
--- a/frame/bounties/src/tests.rs
+++ b/frame/bounties/src/tests.rs
@@ -105,6 +105,7 @@ parameter_types! {
 	pub const Burn: Permill = Permill::from_percent(50);
 	pub const DataDepositPerByte: u64 = 1;
 	pub const TreasuryPalletId: PalletId = PalletId(*b"py/trsry");
+	pub const MaxApprovals: u32 = 100;
 }
 // impl pallet_treasury::Config for Test {
 impl pallet_treasury::Config for Test {
@@ -121,6 +122,7 @@ impl pallet_treasury::Config for Test {
 	type BurnDestination = ();  // Just gets burned.
 	type WeightInfo = ();
 	type SpendFunds = Bounties;
+	type MaxApprovals = MaxApprovals;
 }
 parameter_types! {
 	pub const BountyDepositBase: u64 = 80;
diff --git a/frame/tips/src/tests.rs b/frame/tips/src/tests.rs
index cb0d4e6c47b4..3b11e105c6d0 100644
--- a/frame/tips/src/tests.rs
+++ b/frame/tips/src/tests.rs
@@ -127,6 +127,7 @@ parameter_types! {
 	pub const DataDepositPerByte: u64 = 1;
 	pub const TreasuryPalletId: PalletId = PalletId(*b"py/trsry");
 	pub const MaximumReasonLength: u32 = 16384;
+	pub const MaxApprovals: u32 = 100;
 }
 impl pallet_treasury::Config for Test {
 	type PalletId = TreasuryPalletId;
@@ -142,6 +143,7 @@ impl pallet_treasury::Config for Test {
 	type BurnDestination = ();  // Just gets burned.
 	type WeightInfo = ();
 	type SpendFunds = ();
+	type MaxApprovals = MaxApprovals;
 }
 parameter_types! {
 	pub const TipCountdown: u64 = 1;
diff --git a/frame/treasury/src/benchmarking.rs b/frame/treasury/src/benchmarking.rs
index 119516fe2741..64ecbebe0bff 100644
--- a/frame/treasury/src/benchmarking.rs
+++ b/frame/treasury/src/benchmarking.rs
@@ -55,7 +55,7 @@ fn create_approved_proposals<T: Config<I>, I: Instance>(n: u32) -> Result<(), &'
 		let proposal_id = <ProposalCount<I>>::get() - 1;
 		Treasury::<T, I>::approve_proposal(RawOrigin::Root.into(), proposal_id)?;
 	}
-	ensure!(<Approvals<I>>::get().len() == n as usize, "Not all approved");
+	ensure!(<Approvals<T, I>>::get().len() == n as usize, "Not all approved");
 	Ok(())
 }
 
@@ -85,6 +85,8 @@ benchmarks_instance! {
 	}: _(RawOrigin::Root, proposal_id)
 
 	approve_proposal {
+		let p in 0 .. T::MaxApprovals::get() - 1;
+		create_approved_proposals::<T, _>(p)?;
 		let (caller, value, beneficiary_lookup) = setup_proposal::<T, _>(SEED);
 		Treasury::<T, _>::propose_spend(
 			RawOrigin::Signed(caller).into(),
@@ -95,7 +97,7 @@ benchmarks_instance! {
 	}: _(RawOrigin::Root, proposal_id)
 
 	on_initialize_proposals {
-		let p in 0 .. 100;
+		let p in 0 .. T::MaxApprovals::get();
 		setup_pot_account::<T, _>();
 		create_approved_proposals::<T, _>(p)?;
 	}: {
diff --git a/frame/treasury/src/lib.rs b/frame/treasury/src/lib.rs
index 7de193dd6984..473a570a8725 100644
--- a/frame/treasury/src/lib.rs
+++ b/frame/treasury/src/lib.rs
@@ -64,10 +64,13 @@ mod benchmarking;
 pub mod weights;
 
 use sp_std::prelude::*;
-use frame_support::{decl_module, decl_storage, decl_event, ensure, print, decl_error, PalletId};
+use frame_support::{
+	decl_module, decl_storage, decl_event, ensure, print, decl_error,
+	PalletId, BoundedVec, bounded_vec::TryAppendValue,
+};
 use frame_support::traits::{
 	Currency, Get, Imbalance, OnUnbalanced, ExistenceRequirement::KeepAlive,
-	ReservableCurrency, WithdrawReasons
+	ReservableCurrency, WithdrawReasons,
 };
 use sp_runtime::{
 	Permill, RuntimeDebug,
@@ -128,6 +131,9 @@ pub trait Config<I=DefaultInstance>: frame_system::Config {
 
 	/// Runtime hooks to external pallet using treasury to compute spend funds.
 	type SpendFunds: SpendFunds<Self, I>;
+
+	/// The maximum number of approvals that can wait in the spending queue.
+	type MaxApprovals: Get<u32>;
 }
 
 /// A trait to allow the Treasury Pallet to spend it's funds for other purposes.
@@ -180,7 +186,7 @@ decl_storage! {
 			=> Option<Proposal<T::AccountId, BalanceOf<T, I>>>;
 
 		/// Proposal indices that have been approved but not yet awarded.
-		pub Approvals get(fn approvals): Vec<ProposalIndex>;
+		pub Approvals get(fn approvals): BoundedVec<ProposalIndex, T::MaxApprovals>;
 	}
 	add_extra_genesis {
 		build(|_config| {
@@ -225,6 +231,8 @@ decl_error! {
 		InsufficientProposersBalance,
 		/// No proposal or bounty at that index.
 		InvalidIndex,
+		/// Too many approvals in the queue.
+		TooManyApprovals,
 	}
 }
 
@@ -313,12 +321,12 @@ decl_module! {
 		/// - DbReads: `Proposals`, `Approvals`
 		/// - DbWrite: `Approvals`
 		/// # </weight>
-		#[weight = (T::WeightInfo::approve_proposal(), DispatchClass::Operational)]
+		#[weight = (T::WeightInfo::approve_proposal(T::MaxApprovals::get()), DispatchClass::Operational)]
 		pub fn approve_proposal(origin, #[compact] proposal_id: ProposalIndex) {
 			T::ApproveOrigin::ensure_origin(origin)?;
 
 			ensure!(<Proposals<T, I>>::contains_key(proposal_id), Error::<T, I>::InvalidIndex);
-			Approvals::<I>::append(proposal_id);
+			Approvals::<T, I>::try_append(proposal_id).map_err(|_| Error::<T, I>::TooManyApprovals)?;
 		}
 
 		/// # <weight>
@@ -365,7 +373,7 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 
 		let mut missed_any = false;
 		let mut imbalance = <PositiveImbalanceOf<T, I>>::zero();
-		let proposals_len = Approvals::<I>::mutate(|v| {
+		let proposals_len = Approvals::<T, I>::mutate(|v| {
 			let proposals_approvals_len = v.len() as u32;
 			v.retain(|&index| {
 				// Should always be true, but shouldn't panic if false or we're screwed.
diff --git a/frame/treasury/src/tests.rs b/frame/treasury/src/tests.rs
index 3ff9d63b1096..cb6d4903a573 100644
--- a/frame/treasury/src/tests.rs
+++ b/frame/treasury/src/tests.rs
@@ -102,6 +102,7 @@ parameter_types! {
 	pub const BountyUpdatePeriod: u32 = 20;
 	pub const BountyCuratorDeposit: Permill = Permill::from_percent(50);
 	pub const BountyValueMinimum: u64 = 1;
+	pub const MaxApprovals: u32 = 100;
 }
 impl Config for Test {
 	type PalletId = TreasuryPalletId;
@@ -117,6 +118,7 @@ impl Config for Test {
 	type BurnDestination = ();  // Just gets burned.
 	type WeightInfo = ();
 	type SpendFunds = ();
+	type MaxApprovals = MaxApprovals;
 }
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
@@ -359,3 +361,20 @@ fn genesis_funding_works() {
 		assert_eq!(Treasury::pot(), initial_funding - Balances::minimum_balance());
 	});
 }
+
+#[test]
+fn max_approvals_limited() {
+	new_test_ext().execute_with(|| {
+		Balances::make_free_balance_be(&Treasury::account_id(), u64::max_value());
+		Balances::make_free_balance_be(&0, u64::max_value());
+
+		for _ in 0 .. MaxApprovals::get() {
+			assert_ok!(Treasury::propose_spend(Origin::signed(0), 100, 3));
+			assert_ok!(Treasury::approve_proposal(Origin::root(), 0));
+		}
+
+		// One too many will fail
+		assert_ok!(Treasury::propose_spend(Origin::signed(0), 100, 3));
+		assert_noop!(Treasury::approve_proposal(Origin::root(), 0), Error::<Test, _>::TooManyApprovals);
+	});
+}
diff --git a/frame/treasury/src/weights.rs b/frame/treasury/src/weights.rs
index b8a5625bf062..9d627f1c287e 100644
--- a/frame/treasury/src/weights.rs
+++ b/frame/treasury/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,12 +17,12 @@
 
 //! Autogenerated weights for pallet_treasury
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-12-16, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-04-26, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
-// ./target/release/substrate
+// target/release/substrate
 // benchmark
 // --chain=dev
 // --steps=50
@@ -46,7 +46,7 @@ use sp_std::marker::PhantomData;
 pub trait WeightInfo {
 	fn propose_spend() -> Weight;
 	fn reject_proposal() -> Weight;
-	fn approve_proposal() -> Weight;
+	fn approve_proposal(p: u32, ) -> Weight;
 	fn on_initialize_proposals(p: u32, ) -> Weight;
 }
 
@@ -54,24 +54,26 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn propose_spend() -> Weight {
-		(59_986_000 as Weight)
+		(45_393_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn reject_proposal() -> Weight {
-		(48_300_000 as Weight)
+		(42_796_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
-	fn approve_proposal() -> Weight {
-		(14_054_000 as Weight)
+	fn approve_proposal(p: u32, ) -> Weight {
+		(14_153_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((94_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn on_initialize_proposals(p: u32, ) -> Weight {
-		(86_038_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((78_781_000 as Weight).saturating_mul(p as Weight))
+		(51_633_000 as Weight)
+			// Standard Error: 42_000
+			.saturating_add((65_705_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(p as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
@@ -82,24 +84,26 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn propose_spend() -> Weight {
-		(59_986_000 as Weight)
+		(45_393_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn reject_proposal() -> Weight {
-		(48_300_000 as Weight)
+		(42_796_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
-	fn approve_proposal() -> Weight {
-		(14_054_000 as Weight)
+	fn approve_proposal(p: u32, ) -> Weight {
+		(14_153_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((94_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn on_initialize_proposals(p: u32, ) -> Weight {
-		(86_038_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((78_781_000 as Weight).saturating_mul(p as Weight))
+		(51_633_000 as Weight)
+			// Standard Error: 42_000
+			.saturating_add((65_705_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(p as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))

From 926c1ec0a6739b035f5211f8fd664d17612a4127 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michi@parity.io>
Date: Tue, 27 Apr 2021 09:17:38 +0200
Subject: [PATCH 0673/1194] Upgrade `cargo_metadata` to 0.13.1 (#8670)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Upgrade `cargo_metadata` to 0.13.1

* Update utils/wasm-builder/src/wasm_project.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 Cargo.lock                             | 14 ++++++++++++--
 utils/wasm-builder/Cargo.toml          |  2 +-
 utils/wasm-builder/src/wasm_project.rs |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a438e7273ae4..f9902c2802fa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -700,6 +700,15 @@ version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"
 
+[[package]]
+name = "camino"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4648c6d00a709aa069a236adcaae4f605a6241c72bf5bee79331a4b625921a9"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "cargo-platform"
 version = "0.1.1"
@@ -711,10 +720,11 @@ dependencies = [
 
 [[package]]
 name = "cargo_metadata"
-version = "0.12.3"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7714a157da7991e23d90686b9524b9e12e0407a108647f52e9328f4b3d51ac7f"
+checksum = "081e3f0755c1f380c2d010481b6fa2e02973586d5f2b24eebb7a2a1d98b143d8"
 dependencies = [
+ "camino",
  "cargo-platform",
  "semver 0.11.0",
  "semver-parser 0.10.2",
diff --git a/utils/wasm-builder/Cargo.toml b/utils/wasm-builder/Cargo.toml
index 4ada31ee3335..09c86ca76cc1 100644
--- a/utils/wasm-builder/Cargo.toml
+++ b/utils/wasm-builder/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 build-helper = "0.1.1"
-cargo_metadata = "0.12.0"
+cargo_metadata = "0.13.1"
 tempfile = "3.1.0"
 toml = "0.5.4"
 walkdir = "2.3.1"
diff --git a/utils/wasm-builder/src/wasm_project.rs b/utils/wasm-builder/src/wasm_project.rs
index 61988a9229fd..58161f53113f 100644
--- a/utils/wasm-builder/src/wasm_project.rs
+++ b/utils/wasm-builder/src/wasm_project.rs
@@ -109,7 +109,7 @@ pub(crate) fn create_and_compile(
 		project_cargo_toml,
 		&wasm_workspace,
 		&crate_metadata,
-		&crate_metadata.workspace_root,
+		crate_metadata.workspace_root.as_ref(),
 		features_to_enable,
 	);
 

From 0856e0729c5f9cd5d398b93680ab154fe486e588 Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Tue, 27 Apr 2021 14:33:59 +0200
Subject: [PATCH 0674/1194] Introduce macro for building Contains impl based on
 a match (#8675)

* Introduce macro for building Contains impl based on a match

* Fixes
---
 frame/support/src/traits/members.rs | 30 +++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/frame/support/src/traits/members.rs b/frame/support/src/traits/members.rs
index 35748ca9c0c0..125f096fa92e 100644
--- a/frame/support/src/traits/members.rs
+++ b/frame/support/src/traits/members.rs
@@ -31,6 +31,36 @@ impl<T: Ord> Contains<T> for All<T> {
 	fn contains(_: &T) -> bool { true }
 }
 
+/// Create a type which implements the `Contains` trait for a particular type with syntax similar
+/// to `matches!`.
+#[macro_export]
+macro_rules! match_type {
+	( pub type $n:ident: impl Contains<$t:ty> = { $phead:pat $( | $ptail:pat )* } ; ) => {
+		pub struct $n;
+		impl $crate::traits::Contains<$t> for $n {
+			fn contains(l: &$t) -> bool {
+				matches!(l, $phead $( | $ptail )* )
+			}
+		}
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+
+	match_type! {
+		pub type OneOrTenToTwenty: impl Contains<u8> = { 1 | 10..=20 };
+	}
+
+	#[test]
+	fn match_type_works() {
+		for i in 0..=255 {
+			assert_eq!(OneOrTenToTwenty::contains(&i), i == 1 || i >= 10 && i <= 20);
+		}
+	}
+}
+
 /// A trait for a set which can enumerate its members in order.
 pub trait SortedMembers<T: Ord> {
 	/// Get a vector of all members in the set, ordered.

From acd17418855e56082abe202680dd437f169b2c49 Mon Sep 17 00:00:00 2001
From: Erasmus Hagen <erasmus@degeist.com>
Date: Wed, 28 Apr 2021 09:59:40 +0200
Subject: [PATCH 0675/1194] Update slashing.rs (#8676)

Link was a dead-end
---
 frame/staking/src/slashing.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frame/staking/src/slashing.rs b/frame/staking/src/slashing.rs
index 2b2ac61356c4..fd0a63b288ab 100644
--- a/frame/staking/src/slashing.rs
+++ b/frame/staking/src/slashing.rs
@@ -47,7 +47,7 @@
 //! has multiple misbehaviors. However, accounting for such cases is necessary
 //! to deter a class of "rage-quit" attacks.
 //!
-//! Based on research at <https://research.web3.foundation/en/latest/polkadot/slashing/npos/>
+//! Based on research at <https://w3f-research.readthedocs.io/en/latest/polkadot/slashing/npos.html>
 
 use super::{
 	EraIndex, Config, Module, Store, BalanceOf, Exposure, Perbill, SessionInterface,

From 6181e37a799f67f8bc035c319fb5186261c76551 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= <jon.haggblad@gmail.com>
Date: Wed, 28 Apr 2021 12:59:50 +0200
Subject: [PATCH 0676/1194] Support sending and receiving multiple
 Justifications (#8266)

* client/network: support sending multiple justifications

* network: flag support for multiple justifications in protobuf request

* Update client/network/src/protocol.rs

Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>

* network: update comment on protobuf field

Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
---
 client/network/src/block_request_handler.rs   | 50 +++++++++++++------
 .../src/light_client_requests/sender.rs       |  1 +
 client/network/src/protocol.rs                |  7 +++
 client/network/src/protocol/message.rs        |  4 +-
 client/network/src/protocol/sync.rs           | 22 +++++---
 client/network/src/protocol/sync/blocks.rs    |  1 +
 client/network/src/schema/api.v1.proto        | 10 ++++
 7 files changed, 71 insertions(+), 24 deletions(-)

diff --git a/client/network/src/block_request_handler.rs b/client/network/src/block_request_handler.rs
index 332635dbe790..633b6b5935ed 100644
--- a/client/network/src/block_request_handler.rs
+++ b/client/network/src/block_request_handler.rs
@@ -80,6 +80,7 @@ struct SeenRequestsKey<B: BlockT> {
 	max_blocks: usize,
 	direction: Direction,
 	attributes: BlockAttributes,
+	support_multiple_justifications: bool,
 }
 
 impl<B: BlockT> Hash for SeenRequestsKey<B> {
@@ -180,12 +181,15 @@ impl<B: BlockT> BlockRequestHandler<B> {
 
 		let attributes = BlockAttributes::from_be_u32(request.fields)?;
 
+		let support_multiple_justifications = request.support_multiple_justifications;
+
 		let key = SeenRequestsKey {
 			peer: *peer,
 			max_blocks,
 			direction,
 			from: from_block_id.clone(),
 			attributes,
+			support_multiple_justifications,
 		};
 
 		let mut reputation_changes = Vec::new();
@@ -221,6 +225,7 @@ impl<B: BlockT> BlockRequestHandler<B> {
 				from_block_id,
 				direction,
 				max_blocks,
+				support_multiple_justifications,
 			)?;
 
 			// If any of the blocks contains nay data, we can consider it as successful request.
@@ -259,6 +264,7 @@ impl<B: BlockT> BlockRequestHandler<B> {
 		mut block_id: BlockId<B>,
 		direction: Direction,
 		max_blocks: usize,
+		support_multiple_justifications: bool,
 	) -> Result<BlockResponse, HandleRequestError> {
 		let get_header = attributes.contains(BlockAttributes::HEADER);
 		let get_body = attributes.contains(BlockAttributes::BODY);
@@ -277,22 +283,33 @@ impl<B: BlockT> BlockRequestHandler<B> {
 				None
 			};
 
-			// TODO: In a follow up PR tracked by https://github.com/paritytech/substrate/issues/8172
-			// we want to send/receive all justifications.
-			// For now we keep compatibility by selecting precisely the GRANDPA one, and not just
-			// the first one. When sending we could have just taken the first one, since we don't
-			// expect there to be any other kind currently, but when receiving we need to add the
-			// engine ID tag.
-			// The ID tag is hardcoded here to avoid depending on the GRANDPA crate, and will be
-			// removed when resolving the above issue.
-			let justification = justifications.and_then(|just| just.into_justification(*b"FRNK"));
-
-			let is_empty_justification = justification
-				.as_ref()
-				.map(|j| j.is_empty())
-				.unwrap_or(false);
-
-			let justification = justification.unwrap_or_default();
+			let (justifications, justification, is_empty_justification) =
+				if support_multiple_justifications {
+					let justifications = match justifications {
+						Some(v) => v.encode(),
+						None => Vec::new(),
+					};
+					(justifications, Vec::new(), false)
+				} else {
+					// For now we keep compatibility by selecting precisely the GRANDPA one, and not just
+					// the first one. When sending we could have just taken the first one, since we don't
+					// expect there to be any other kind currently, but when receiving we need to add the
+					// engine ID tag.
+					// The ID tag is hardcoded here to avoid depending on the GRANDPA crate, and will be
+					// removed once we remove the backwards compatibility.
+					// See: https://github.com/paritytech/substrate/issues/8172
+					let justification =
+						justifications.and_then(|just| just.into_justification(*b"FRNK"));
+
+					let is_empty_justification = justification
+						.as_ref()
+						.map(|j| j.is_empty())
+						.unwrap_or(false);
+
+					let justification = justification.unwrap_or_default();
+
+					(Vec::new(), justification, is_empty_justification)
+				};
 
 			let body = if get_body {
 				match self.client.block_body(&BlockId::Hash(hash))? {
@@ -320,6 +337,7 @@ impl<B: BlockT> BlockRequestHandler<B> {
 				message_queue: Vec::new(),
 				justification,
 				is_empty_justification,
+				justifications,
 			};
 
 			total_size += block_data.body.len();
diff --git a/client/network/src/light_client_requests/sender.rs b/client/network/src/light_client_requests/sender.rs
index 652f465d6f25..bf832ea13aed 100644
--- a/client/network/src/light_client_requests/sender.rs
+++ b/client/network/src/light_client_requests/sender.rs
@@ -722,6 +722,7 @@ impl<B: Block> Request<B> {
 					to_block: Default::default(),
 					direction: schema::v1::Direction::Ascending as i32,
 					max_blocks: 1,
+					support_multiple_justifications: true,
 				};
 
 				let mut buf = Vec::with_capacity(rq.encoded_len());
diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index 94980947e2a8..ff64b9d599c0 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -580,6 +580,11 @@ impl<B: BlockT> Protocol<B> {
 				} else {
 					None
 				},
+				justifications: if !block_data.justifications.is_empty() {
+					Some(DecodeAll::decode_all(&mut block_data.justifications.as_ref())?)
+				} else {
+					None
+				},
 			})
 		}).collect::<Result<Vec<_>, codec::Error>>();
 
@@ -908,6 +913,7 @@ impl<B: BlockT> Protocol<B> {
 						receipt: None,
 						message_queue: None,
 						justification: None,
+						justifications: None,
 					},
 				],
 			},
@@ -1123,6 +1129,7 @@ fn prepare_block_request<B: BlockT>(
 		to_block: request.to.map(|h| h.encode()).unwrap_or_default(),
 		direction: request.direction as i32,
 		max_blocks: request.max.unwrap_or(0),
+		support_multiple_justifications: true,
 	};
 
 	CustomMessageOutcome::BlockRequest {
diff --git a/client/network/src/protocol/message.rs b/client/network/src/protocol/message.rs
index 7564804400fb..dc6beac99aa0 100644
--- a/client/network/src/protocol/message.rs
+++ b/client/network/src/protocol/message.rs
@@ -168,7 +168,7 @@ impl<H: HeaderT> generic::BlockAnnounce<H> {
 pub mod generic {
 	use bitflags::bitflags;
 	use codec::{Encode, Decode, Input, Output};
-	use sp_runtime::EncodedJustification;
+	use sp_runtime::{EncodedJustification, Justifications};
 	use super::{
 		RemoteReadResponse, Transactions, Direction,
 		RequestId, BlockAttributes, RemoteCallResponse, ConsensusEngineId,
@@ -254,6 +254,8 @@ pub mod generic {
 		pub message_queue: Option<Vec<u8>>,
 		/// Justification if requested.
 		pub justification: Option<EncodedJustification>,
+		/// Justifications if requested.
+		pub justifications: Option<Justifications>,
 	}
 
 	/// Identifies starting point of a block sequence.
diff --git a/client/network/src/protocol/sync.rs b/client/network/src/protocol/sync.rs
index 6e07bd4c9697..d3ab2912a9dc 100644
--- a/client/network/src/protocol/sync.rs
+++ b/client/network/src/protocol/sync.rs
@@ -833,8 +833,9 @@ impl<B: BlockT> ChainSync<B> {
 								.drain(self.best_queued_number + One::one())
 								.into_iter()
 								.map(|block_data| {
-									let justifications =
-										legacy_justification_mapping(block_data.block.justification);
+									let justifications = block_data.block.justifications.or(
+										legacy_justification_mapping(block_data.block.justification)
+									);
 									IncomingBlock {
 										hash: block_data.block.hash,
 										header: block_data.block.header,
@@ -854,11 +855,14 @@ impl<B: BlockT> ChainSync<B> {
 							}
 							validate_blocks::<B>(&blocks, who, Some(request))?;
 							blocks.into_iter().map(|b| {
+								let justifications = b.justifications.or(
+									legacy_justification_mapping(b.justification)
+								);
 								IncomingBlock {
 									hash: b.hash,
 									header: b.header,
 									body: b.body,
-									justifications: legacy_justification_mapping(b.justification),
+									justifications,
 									origin: Some(who.clone()),
 									allow_missing_state: true,
 									import_existing: false,
@@ -963,11 +967,14 @@ impl<B: BlockT> ChainSync<B> {
 					// When request.is_none() this is a block announcement. Just accept blocks.
 					validate_blocks::<B>(&blocks, who, None)?;
 					blocks.into_iter().map(|b| {
+						let justifications = b.justifications.or(
+							legacy_justification_mapping(b.justification)
+						);
 						IncomingBlock {
 							hash: b.hash,
 							header: b.header,
 							body: b.body,
-							justifications: legacy_justification_mapping(b.justification),
+							justifications,
 							origin: Some(who.clone()),
 							allow_missing_state: true,
 							import_existing: false,
@@ -1043,7 +1050,7 @@ impl<B: BlockT> ChainSync<B> {
 					return Err(BadPeer(who, rep::BAD_JUSTIFICATION));
 				}
 
-				block.justification
+				block.justifications.or(legacy_justification_mapping(block.justification))
 			} else {
 				// we might have asked the peer for a justification on a block that we assumed it
 				// had but didn't (regardless of whether it had a justification for it or not).
@@ -1058,7 +1065,7 @@ impl<B: BlockT> ChainSync<B> {
 
 			if let Some((peer, hash, number, j)) = self
 				.extra_justifications
-				.on_response(who, legacy_justification_mapping(justification))
+				.on_response(who, justification)
 			{
 				return Ok(OnBlockJustification::Import { peer, hash, number, justifications: j })
 			}
@@ -1655,7 +1662,7 @@ impl<B: BlockT> ChainSync<B> {
 // This is purely during a backwards compatible transitionary period and should be removed
 // once we can assume all nodes can send and receive multiple Justifications
 // The ID tag is hardcoded here to avoid depending on the GRANDPA crate.
-// TODO: https://github.com/paritytech/substrate/issues/8172
+// See: https://github.com/paritytech/substrate/issues/8172
 fn legacy_justification_mapping(justification: Option<EncodedJustification>) -> Option<Justifications> {
 	justification.map(|just| (*b"FRNK", just).into())
 }
@@ -2163,6 +2170,7 @@ mod test {
 					receipt: None,
 					message_queue: None,
 					justification: None,
+					justifications: None,
 				}
 			).collect(),
 		}
diff --git a/client/network/src/protocol/sync/blocks.rs b/client/network/src/protocol/sync/blocks.rs
index 60492f24ed8c..81f9cffacaab 100644
--- a/client/network/src/protocol/sync/blocks.rs
+++ b/client/network/src/protocol/sync/blocks.rs
@@ -228,6 +228,7 @@ mod test {
 			message_queue: None,
 			receipt: None,
 			justification: None,
+			justifications: None,
 		}).collect()
 	}
 
diff --git a/client/network/src/schema/api.v1.proto b/client/network/src/schema/api.v1.proto
index a933c5811c10..23d585b05e9c 100644
--- a/client/network/src/schema/api.v1.proto
+++ b/client/network/src/schema/api.v1.proto
@@ -29,6 +29,10 @@ message BlockRequest {
 	Direction direction = 5;
 	// Maximum number of blocks to return. An implementation defined maximum is used when unspecified.
 	uint32 max_blocks = 6; // optional
+	// Indicate to the receiver that we support multiple justifications. If the responder also
+	// supports this it will populate the multiple justifications field in `BlockData` instead of
+	// the single justification field.
+	bool support_multiple_justifications = 7; // optional
 }
 
 // Response to `BlockRequest`
@@ -56,5 +60,11 @@ message BlockData {
 	// doesn't make in possible to differentiate between a lack of justification and an empty
 	// justification.
 	bool is_empty_justification = 7; // optional, false if absent
+	// Justifications if requested.
+	// Unlike the field for a single justification, this field does not required an associated
+	// boolean to differentiate between the lack of justifications and empty justification(s). This
+	// is because empty justifications, like all justifications, are paired with a non-empty
+	// consensus engine ID.
+	bytes justifications = 8; // optional
 }
 

From 37e97cfec065fe4acc9712b4dd9a79ec1936fa7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= <jon.haggblad@gmail.com>
Date: Wed, 28 Apr 2021 13:13:39 +0200
Subject: [PATCH 0677/1194] grandpa-rpc: allow proving finality of blocks from
 latest authority set (#8585)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* grandpa: use new latest stored justification in prove_finality

* grandpa: include end in range in FinalityProof::unknown_headers

* grandpa: typo in comment

* grandpa: remove ProvableJustification

* grandpa: revert unnecessary changes

* grandpa: extend AuthoritySetChangeId and cleanup get_set_id

* grandpa: move check_finality_proof to the test module

* grandpa: warn on missing authority set changes data

* grandpa: add missing use statement

* grandpa: simplify finality_proof tests

* grandpa: additional tests for finality_proof

Co-authored-by: André Silva <andrerfosilva@gmail.com>
---
 client/finality-grandpa/src/authorities.rs    |  60 +-
 client/finality-grandpa/src/finality_proof.rs | 515 ++++++++++--------
 2 files changed, 344 insertions(+), 231 deletions(-)

diff --git a/client/finality-grandpa/src/authorities.rs b/client/finality-grandpa/src/authorities.rs
index 056460ac9ed8..194911e1f104 100644
--- a/client/finality-grandpa/src/authorities.rs
+++ b/client/finality-grandpa/src/authorities.rs
@@ -18,6 +18,10 @@
 
 //! Utilities for dealing with authorities, authority sets, and handoffs.
 
+use std::cmp::Ord;
+use std::fmt::Debug;
+use std::ops::Add;
+
 use fork_tree::ForkTree;
 use parking_lot::MappedMutexGuard;
 use finality_grandpa::voter_set::VoterSet;
@@ -27,9 +31,7 @@ use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_INFO};
 use sp_finality_grandpa::{AuthorityId, AuthorityList};
 use sc_consensus::shared_data::{SharedData, SharedDataLocked};
 
-use std::cmp::Ord;
-use std::fmt::Debug;
-use std::ops::Add;
+use crate::SetId;
 
 /// Error type returned on operations on the `AuthoritySet`.
 #[derive(Debug, derive_more::Display)]
@@ -684,6 +686,20 @@ impl<H, N: Add<Output=N> + Clone> PendingChange<H, N> {
 #[derive(Debug, Encode, Decode, Clone, PartialEq)]
 pub struct AuthoritySetChanges<N>(Vec<(u64, N)>);
 
+/// The response when querying for a set id for a specific block. Either we get a set id
+/// together with a block number for the last block in the set, or that the requested block is in the
+/// latest set, or that we don't know what set id the given block belongs to.
+#[derive(Debug, PartialEq)]
+pub enum AuthoritySetChangeId<N> {
+	/// The requested block is in the latest set.
+	Latest,
+	/// Tuple containing the set id and the last block number of that set.
+	Set(SetId, N),
+	/// We don't know which set id the request block belongs to (this can only happen due to missing
+	/// data).
+	Unknown,
+}
+
 impl<N> From<Vec<(u64, N)>> for AuthoritySetChanges<N> {
 	fn from(changes: Vec<(u64, N)>) -> AuthoritySetChanges<N> {
 		AuthoritySetChanges(changes)
@@ -699,7 +715,15 @@ impl<N: Ord + Clone> AuthoritySetChanges<N> {
 		self.0.push((set_id, block_number));
 	}
 
-	pub(crate) fn get_set_id(&self, block_number: N) -> Option<(u64, N)> {
+	pub(crate) fn get_set_id(&self, block_number: N) -> AuthoritySetChangeId<N> {
+		if self.0
+			.last()
+			.map(|last_auth_change| last_auth_change.1 < block_number)
+			.unwrap_or(false)
+		{
+			return AuthoritySetChangeId::Latest;
+		}
+
 		let idx = self.0
 			.binary_search_by_key(&block_number, |(_, n)| n.clone())
 			.unwrap_or_else(|b| b);
@@ -711,16 +735,16 @@ impl<N: Ord + Clone> AuthoritySetChanges<N> {
 				let (prev_set_id, _) = self.0[idx - 1usize];
 				if set_id != prev_set_id + 1u64 {
 					// Without the preceding set_id we don't have a well-defined start.
-					return None;
+					return AuthoritySetChangeId::Unknown;
 				}
 			} else if set_id != 0 {
 				// If this is the first index, yet not the first set id then it's not well-defined
 				// that we are in the right set id.
-				return None;
+				return AuthoritySetChangeId::Unknown;
 			}
-			Some((set_id, block_number))
+			AuthoritySetChangeId::Set(set_id, block_number)
 		} else {
-			None
+			AuthoritySetChangeId::Unknown
 		}
 	}
 
@@ -1660,11 +1684,11 @@ mod tests {
 		authority_set_changes.append(1, 81);
 		authority_set_changes.append(2, 121);
 
-		assert_eq!(authority_set_changes.get_set_id(20), Some((0, 41)));
-		assert_eq!(authority_set_changes.get_set_id(40), Some((0, 41)));
-		assert_eq!(authority_set_changes.get_set_id(41), Some((0, 41)));
-		assert_eq!(authority_set_changes.get_set_id(42), Some((1, 81)));
-		assert_eq!(authority_set_changes.get_set_id(141), None);
+		assert_eq!(authority_set_changes.get_set_id(20), AuthoritySetChangeId::Set(0, 41));
+		assert_eq!(authority_set_changes.get_set_id(40), AuthoritySetChangeId::Set(0, 41));
+		assert_eq!(authority_set_changes.get_set_id(41), AuthoritySetChangeId::Set(0, 41));
+		assert_eq!(authority_set_changes.get_set_id(42), AuthoritySetChangeId::Set(1, 81));
+		assert_eq!(authority_set_changes.get_set_id(141), AuthoritySetChangeId::Latest);
 	}
 
 	#[test]
@@ -1674,11 +1698,11 @@ mod tests {
 		authority_set_changes.append(3, 81);
 		authority_set_changes.append(4, 121);
 
-		assert_eq!(authority_set_changes.get_set_id(20), None);
-		assert_eq!(authority_set_changes.get_set_id(40), None);
-		assert_eq!(authority_set_changes.get_set_id(41), None);
-		assert_eq!(authority_set_changes.get_set_id(42), Some((3, 81)));
-		assert_eq!(authority_set_changes.get_set_id(141), None);
+		assert_eq!(authority_set_changes.get_set_id(20), AuthoritySetChangeId::Unknown);
+		assert_eq!(authority_set_changes.get_set_id(40), AuthoritySetChangeId::Unknown);
+		assert_eq!(authority_set_changes.get_set_id(41), AuthoritySetChangeId::Unknown);
+		assert_eq!(authority_set_changes.get_set_id(42), AuthoritySetChangeId::Set(3, 81));
+		assert_eq!(authority_set_changes.get_set_id(141), AuthoritySetChangeId::Latest);
 	}
 
 	#[test]
diff --git a/client/finality-grandpa/src/finality_proof.rs b/client/finality-grandpa/src/finality_proof.rs
index 80ba8cee9101..6735d91ba8b7 100644
--- a/client/finality-grandpa/src/finality_proof.rs
+++ b/client/finality-grandpa/src/finality_proof.rs
@@ -36,23 +36,23 @@
 //! finality proof (that finalizes some block C that is ancestor of the B and descendant
 //! of the U) could be returned.
 
-use log::trace;
+use log::{trace, warn};
 use std::sync::Arc;
 
-use finality_grandpa::BlockNumberOps;
 use parity_scale_codec::{Encode, Decode};
-use sp_blockchain::{Backend as BlockchainBackend, Error as ClientError, Result as ClientResult};
+use sp_blockchain::{Backend as BlockchainBackend, HeaderBackend};
+use sp_finality_grandpa::GRANDPA_ENGINE_ID;
 use sp_runtime::{
-	EncodedJustification, generic::BlockId,
+	generic::BlockId,
 	traits::{NumberFor, Block as BlockT, Header as HeaderT, One},
 };
 use sc_client_api::backend::Backend;
-use sp_finality_grandpa::{AuthorityId, GRANDPA_ENGINE_ID};
 
-use crate::authorities::AuthoritySetChanges;
-use crate::justification::GrandpaJustification;
-use crate::SharedAuthoritySet;
-use crate::VoterSet;
+use crate::{
+	SharedAuthoritySet, best_justification,
+	authorities::{AuthoritySetChangeId, AuthoritySetChanges},
+	justification::GrandpaJustification,
+};
 
 const MAX_UNKNOWN_HEADERS: usize = 100_000;
 
@@ -97,14 +97,13 @@ where
 impl<B, Block> FinalityProofProvider<B, Block>
 where
 	Block: BlockT,
-	NumberFor<Block>: BlockNumberOps,
 	B: Backend<Block> + Send + Sync + 'static,
 {
 	/// Prove finality for the given block number by returning a Justification for the last block of
 	/// the authority set.
 	pub fn prove_finality(
 		&self,
-		block: NumberFor<Block>
+		block: NumberFor<Block>,
 	) -> Result<Option<Vec<u8>>, FinalityProofError> {
 		let authority_set_changes = if let Some(changes) = self
 			.shared_authority_set
@@ -116,8 +115,8 @@ where
 			return Ok(None);
 		};
 
-		prove_finality::<_, _, GrandpaJustification<Block>>(
-			&*self.backend.blockchain(),
+		prove_finality(
+			&*self.backend,
 			authority_set_changes,
 			block,
 		)
@@ -151,19 +150,19 @@ pub enum FinalityProofError {
 	Client(sp_blockchain::Error),
 }
 
-fn prove_finality<Block, B, J>(
-	blockchain: &B,
+fn prove_finality<Block, B>(
+	backend: &B,
 	authority_set_changes: AuthoritySetChanges<NumberFor<Block>>,
 	block: NumberFor<Block>,
 ) -> Result<Option<Vec<u8>>, FinalityProofError>
 where
 	Block: BlockT,
-	B: BlockchainBackend<Block>,
-	J: ProvableJustification<Block::Header>,
+	B: Backend<Block>,
 {
-	// Early-return if we sure that there are no blocks finalized AFTER begin block
-	let info = blockchain.info();
-	if info.finalized_number <= block {
+	// Early-return if we are sure that there are no blocks finalized that cover the requested
+	// block.
+	let info = backend.blockchain().info();
+	if info.finalized_number < block {
 		let err = format!(
 			"Requested finality proof for descendant of #{} while we only have finalized #{}.",
 			block,
@@ -173,45 +172,60 @@ where
 		return Err(FinalityProofError::BlockNotYetFinalized);
 	}
 
-	// Get set_id the block belongs to, and the last block of the set which should contain a
-	// Justification we can use to prove the requested block.
-	let (_, last_block_for_set) = if let Some(id) = authority_set_changes.get_set_id(block) {
-		id
-	} else {
-		trace!(
-			target: "afg",
-			"AuthoritySetChanges does not cover the requested block #{}. \
-			Maybe the subscription API is more appropriate.",
-			block,
-		);
-		return Err(FinalityProofError::BlockNotInAuthoritySetChanges);
-	};
-
-	// Get the Justification stored at the last block of the set
-	let last_block_for_set_id = BlockId::Number(last_block_for_set);
-	let justification =
-		if let Some(grandpa_justification) = blockchain.justifications(last_block_for_set_id)?
-			.and_then(|justifications| justifications.into_justification(GRANDPA_ENGINE_ID))
-		{
-			grandpa_justification
-		} else {
-			trace!(
+	let (justification, just_block) = match authority_set_changes.get_set_id(block) {
+		AuthoritySetChangeId::Latest => {
+			if let Some(justification) = best_justification(backend)?
+				.map(|j: GrandpaJustification<Block>| (j.encode(), j.target().0))
+			{
+				justification
+			} else {
+				trace!(
+					target: "afg",
+					"No justification found for the latest finalized block. \
+					Returning empty proof.",
+				);
+				return Ok(None);
+			}
+		}
+		AuthoritySetChangeId::Set(_, last_block_for_set) => {
+			let last_block_for_set_id = BlockId::Number(last_block_for_set);
+			let justification = if let Some(grandpa_justification) = backend
+				.blockchain()
+				.justifications(last_block_for_set_id)?
+				.and_then(|justifications| justifications.into_justification(GRANDPA_ENGINE_ID))
+			{
+				grandpa_justification
+			} else {
+				trace!(
+					target: "afg",
+					"No justification found when making finality proof for {}. \
+					Returning empty proof.",
+					block,
+				);
+				return Ok(None);
+			};
+			(justification, last_block_for_set)
+		}
+		AuthoritySetChangeId::Unknown => {
+			warn!(
 				target: "afg",
-				"No justification found when making finality proof for {}. Returning empty proof.",
+				"AuthoritySetChanges does not cover the requested block #{} due to missing data. \
+				 You need to resync to populate AuthoritySetChanges properly.",
 				block,
 			);
-			return Ok(None);
-		};
+			return Err(FinalityProofError::BlockNotInAuthoritySetChanges);
+		}
+	};
 
 	// Collect all headers from the requested block until the last block of the set
 	let unknown_headers = {
 		let mut headers = Vec::new();
 		let mut current = block + One::one();
 		loop {
-			if current >= last_block_for_set || headers.len() >= MAX_UNKNOWN_HEADERS {
+			if current > just_block || headers.len() >= MAX_UNKNOWN_HEADERS {
 				break;
 			}
-			headers.push(blockchain.expect_header(BlockId::Number(current))?);
+			headers.push(backend.blockchain().expect_header(BlockId::Number(current))?);
 			current += One::one();
 		}
 		headers
@@ -219,7 +233,7 @@ where
 
 	Ok(Some(
 		FinalityProof {
-			block: blockchain.expect_block_hash_from_id(&last_block_for_set_id)?,
+			block: backend.blockchain().expect_block_hash_from_id(&BlockId::Number(just_block))?,
 			justification,
 			unknown_headers,
 		}
@@ -227,96 +241,48 @@ where
 	))
 }
 
-/// Check GRANDPA proof-of-finality for the given block.
-///
-/// Returns the vector of headers that MUST be validated + imported
-/// AND if at least one of those headers is invalid, all other MUST be considered invalid.
-///
-/// This is currently not used, and exists primarily as an example of how to check finality proofs.
-#[cfg(test)]
-fn check_finality_proof<Header: HeaderT, J>(
-	current_set_id: u64,
-	current_authorities: sp_finality_grandpa::AuthorityList,
-	remote_proof: Vec<u8>,
-) -> ClientResult<FinalityProof<Header>>
-where
-	J: ProvableJustification<Header>,
-{
-	let proof = FinalityProof::<Header>::decode(&mut &remote_proof[..])
-		.map_err(|_| ClientError::BadJustification("failed to decode finality proof".into()))?;
-
-	let justification: J = Decode::decode(&mut &proof.justification[..])
-		.map_err(|_| ClientError::JustificationDecode)?;
-	justification.verify(current_set_id, &current_authorities)?;
-
-	Ok(proof)
-}
-
-/// Justification used to prove block finality.
-pub trait ProvableJustification<Header: HeaderT>: Encode + Decode {
-	/// Verify justification with respect to authorities set and authorities set id.
-	fn verify(&self, set_id: u64, authorities: &[(AuthorityId, u64)]) -> ClientResult<()>;
-
-	/// Decode and verify justification.
-	fn decode_and_verify(
-		justification: &EncodedJustification,
-		set_id: u64,
-		authorities: &[(AuthorityId, u64)],
-	) -> ClientResult<Self> {
-		let justification =
-			Self::decode(&mut &**justification).map_err(|_| ClientError::JustificationDecode)?;
-		justification.verify(set_id, authorities)?;
-		Ok(justification)
-	}
-}
-
-impl<Block: BlockT> ProvableJustification<Block::Header> for GrandpaJustification<Block>
-where
-	NumberFor<Block>: BlockNumberOps,
-{
-	fn verify(&self, set_id: u64, authorities: &[(AuthorityId, u64)]) -> ClientResult<()> {
-		let authorities = VoterSet::new(authorities.iter().cloned()).ok_or(
-			ClientError::Consensus(sp_consensus::Error::InvalidAuthoritiesSet),
-		)?;
-
-		GrandpaJustification::verify_with_voter_set(self, set_id, &authorities)
-	}
-}
-
 #[cfg(test)]
 pub(crate) mod tests {
 	use super::*;
-	use crate::authorities::AuthoritySetChanges;
+	use crate::{
+		authorities::AuthoritySetChanges, BlockNumberOps, ClientError, SetId,
+	};
+	use futures::executor::block_on;
+	use sc_block_builder::BlockBuilderProvider;
+	use sc_client_api::{apply_aux, LockImportRun};
+	use sp_consensus::BlockOrigin;
 	use sp_core::crypto::Public;
-	use sp_runtime::Justifications;
-	use sp_finality_grandpa::AuthorityList;
-	use sc_client_api::NewBlockState;
-	use sc_client_api::in_mem::Blockchain as InMemoryBlockchain;
-	use substrate_test_runtime_client::runtime::{Block, Header, H256};
-
-	pub(crate) type FinalityProof = super::FinalityProof<Header>;
-
-	#[derive(Debug, PartialEq, Encode, Decode)]
-	pub struct TestJustification(pub (u64, AuthorityList), pub Vec<u8>);
-
-	impl ProvableJustification<Header> for TestJustification {
-		fn verify(&self, set_id: u64, authorities: &[(AuthorityId, u64)]) -> ClientResult<()> {
-			if (self.0).0 != set_id || (self.0).1 != authorities {
-				return Err(ClientError::BadJustification("test".into()));
-			}
+	use sp_finality_grandpa::{AuthorityId, GRANDPA_ENGINE_ID as ID};
+	use sp_keyring::Ed25519Keyring;
+	use substrate_test_runtime_client::{
+		runtime::{Block, Header, H256},
+		Backend as TestBackend, ClientBlockImportExt, ClientExt, DefaultTestClientBuilderExt,
+		TestClient, TestClientBuilder, TestClientBuilderExt,
+	};
 
-			Ok(())
-		}
+	/// Check GRANDPA proof-of-finality for the given block.
+	///
+	/// Returns the vector of headers that MUST be validated + imported
+	/// AND if at least one of those headers is invalid, all other MUST be considered invalid.
+	fn check_finality_proof<Block: BlockT>(
+		current_set_id: SetId,
+		current_authorities: sp_finality_grandpa::AuthorityList,
+		remote_proof: Vec<u8>,
+	) -> sp_blockchain::Result<super::FinalityProof<Block::Header>>
+	where
+		NumberFor<Block>: BlockNumberOps,
+	{
+		let proof = super::FinalityProof::<Block::Header>::decode(&mut &remote_proof[..])
+			.map_err(|_| ClientError::BadJustification("failed to decode finality proof".into()))?;
+
+		let justification: GrandpaJustification<Block> = Decode::decode(&mut &proof.justification[..])
+			.map_err(|_| ClientError::JustificationDecode)?;
+		justification.verify(current_set_id, &current_authorities)?;
+
+		Ok(proof)
 	}
 
-	#[derive(Debug, PartialEq, Encode, Decode)]
-	pub struct TestBlockJustification(TestJustification, u64, H256);
-
-	impl ProvableJustification<Header> for TestBlockJustification {
-		fn verify(&self, set_id: u64, authorities: &[(AuthorityId, u64)]) -> ClientResult<()> {
-			self.0.verify(set_id, authorities)
-		}
-	}
+	pub(crate) type FinalityProof = super::FinalityProof<Header>;
 
 	fn header(number: u64) -> Header {
 		let parent_hash = match number {
@@ -332,57 +298,64 @@ pub(crate) mod tests {
 		)
 	}
 
-	fn test_blockchain() -> InMemoryBlockchain<Block> {
-		use sp_finality_grandpa::GRANDPA_ENGINE_ID as ID;
-		let blockchain = InMemoryBlockchain::<Block>::new();
-		let just0 = Some(Justifications::from((ID, vec![0])));
-		let just1 = Some(Justifications::from((ID, vec![1])));
-		let just2 = None;
-		let just3 = Some(Justifications::from((ID, vec![3])));
-		blockchain.insert(header(0).hash(), header(0), just0, None, NewBlockState::Final).unwrap();
-		blockchain.insert(header(1).hash(), header(1), just1, None, NewBlockState::Final).unwrap();
-		blockchain.insert(header(2).hash(), header(2), just2, None, NewBlockState::Best).unwrap();
-		blockchain.insert(header(3).hash(), header(3), just3, None, NewBlockState::Final).unwrap();
-		blockchain
+	fn test_blockchain(
+		number_of_blocks: u64,
+		to_finalize: &[u64],
+	) -> (Arc<TestClient>, Arc<TestBackend>, Vec<Block>) {
+		let builder = TestClientBuilder::new();
+		let backend = builder.backend();
+		let mut client = Arc::new(builder.build());
+
+		let mut blocks = Vec::new();
+		for _ in 0..number_of_blocks {
+			let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
+			block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
+			blocks.push(block);
+		}
+
+		for block in to_finalize {
+			client.finalize_block(BlockId::Number(*block), None).unwrap();
+		}
+		(client, backend, blocks)
+	}
+
+	fn store_best_justification(client: &TestClient, just: &GrandpaJustification<Block>) {
+		client.lock_import_and_run(|import_op| {
+			crate::aux_schema::update_best_justification(
+				just,
+				|insert| apply_aux(import_op, insert, &[]),
+			)
+		})
+		.unwrap();
 	}
 
 	#[test]
 	fn finality_proof_fails_if_no_more_last_finalized_blocks() {
-		use sp_finality_grandpa::GRANDPA_ENGINE_ID as ID;
-		let blockchain = test_blockchain();
-		let just1 = Some(Justifications::from((ID, vec![1])));
-		let just2 = Some(Justifications::from((ID, vec![2])));
-		blockchain.insert(header(4).hash(), header(4), just1, None, NewBlockState::Best).unwrap();
-		blockchain.insert(header(5).hash(), header(5), just2, None, NewBlockState::Best).unwrap();
+		let (_, backend, _) = test_blockchain(6, &[4]);
+		let authority_set_changes = AuthoritySetChanges::empty();
 
-		let mut authority_set_changes = AuthoritySetChanges::empty();
-		authority_set_changes.append(0, 5);
-
-		// The last finalized block is 3, so we cannot provide further justifications.
-		let proof_of_4 = prove_finality::<_, _, TestJustification>(
-			&blockchain,
+		// The last finalized block is 4, so we cannot provide further justifications.
+		let proof_of_5 = prove_finality(
+			&*backend,
 			authority_set_changes,
-			*header(4).number(),
+			5,
 		);
-		assert!(matches!(proof_of_4, Err(FinalityProofError::BlockNotYetFinalized)));
+		assert!(matches!(proof_of_5, Err(FinalityProofError::BlockNotYetFinalized)));
 	}
 
 	#[test]
 	fn finality_proof_is_none_if_no_justification_known() {
-		let blockchain = test_blockchain();
-		blockchain
-			.insert(header(4).hash(), header(4), None, None, NewBlockState::Final)
-			.unwrap();
+		let (_, backend, _) = test_blockchain(6, &[4]);
 
 		let mut authority_set_changes = AuthoritySetChanges::empty();
 		authority_set_changes.append(0, 4);
 
 		// Block 4 is finalized without justification
 		// => we can't prove finality of 3
-		let proof_of_3 = prove_finality::<_, _, TestJustification>(
-			&blockchain,
+		let proof_of_3 = prove_finality(
+			&*backend,
 			authority_set_changes,
-			*header(3).number(),
+			3,
 		)
 		.unwrap();
 		assert_eq!(proof_of_3, None);
@@ -391,7 +364,7 @@ pub(crate) mod tests {
 	#[test]
 	fn finality_proof_check_fails_when_proof_decode_fails() {
 		// When we can't decode proof from Vec<u8>
-		check_finality_proof::<_, TestJustification>(
+		check_finality_proof::<Block>(
 			1,
 			vec![(AuthorityId::from_slice(&[3u8; 32]), 1u64)],
 			vec![42],
@@ -402,92 +375,208 @@ pub(crate) mod tests {
 	#[test]
 	fn finality_proof_check_fails_when_proof_is_empty() {
 		// When decoded proof has zero length
-		check_finality_proof::<_, TestJustification>(
+		check_finality_proof::<Block>(
 			1,
 			vec![(AuthorityId::from_slice(&[3u8; 32]), 1u64)],
-			Vec::<TestJustification>::new().encode(),
+			Vec::<GrandpaJustification<Block>>::new().encode(),
 		)
 		.unwrap_err();
 	}
 
 	#[test]
-	fn finality_proof_check_works() {
-		let auth = vec![(AuthorityId::from_slice(&[3u8; 32]), 1u64)];
+	fn finality_proof_check_fails_with_incomplete_justification() {
+		let (client, _, blocks) = test_blockchain(8, &[4, 5, 8]);
+
+		// Create a commit without precommits
+		let commit = finality_grandpa::Commit {
+			target_hash: blocks[7].hash(),
+			target_number: *blocks[7].header().number(),
+			precommits: Vec::new(),
+		};
+		let grandpa_just = GrandpaJustification::from_commit(&client, 8, commit).unwrap();
+
 		let finality_proof = FinalityProof {
 			block: header(2).hash(),
-			justification: TestJustification((1, auth.clone()), vec![7]).encode(),
+			justification: grandpa_just.encode(),
 			unknown_headers: Vec::new(),
 		};
-		let proof = check_finality_proof::<_, TestJustification>(
+
+		check_finality_proof::<Block>(
 			1,
-			auth.clone(),
+			vec![(AuthorityId::from_slice(&[3u8; 32]), 1u64)],
 			finality_proof.encode(),
-		)
-		.unwrap();
-		assert_eq!(proof, finality_proof);
+		).unwrap_err();
+	}
+
+	fn create_commit<S, Id>(
+		block: Block,
+		round: u64,
+		set_id: SetId,
+		auth: &[Ed25519Keyring]
+	) -> finality_grandpa::Commit<H256, u64, S, Id>
+	where
+		Id: From<sp_core::ed25519::Public>,
+		S: From<sp_core::ed25519::Signature>,
+	{
+		let mut precommits = Vec::new();
+
+		for voter in auth {
+			let precommit = finality_grandpa::Precommit {
+				target_hash: block.hash(),
+				target_number: *block.header().number(),
+			};
+
+			let msg = finality_grandpa::Message::Precommit(precommit.clone());
+			let encoded = sp_finality_grandpa::localized_payload(round, set_id, &msg);
+			let signature = voter.sign(&encoded[..]).into();
+
+			let signed_precommit = finality_grandpa::SignedPrecommit {
+				precommit,
+				signature,
+				id: voter.public().into(),
+			};
+			precommits.push(signed_precommit);
+		}
+
+		finality_grandpa::Commit {
+			target_hash: block.hash(),
+			target_number: *block.header().number(),
+			precommits,
+		}
+	}
+
+	#[test]
+	fn finality_proof_check_works_with_correct_justification() {
+		let (client, _, blocks) = test_blockchain(8, &[4, 5, 8]);
+
+		let alice = Ed25519Keyring::Alice;
+		let set_id = 1;
+		let round = 8;
+		let commit = create_commit(blocks[7].clone(), round, set_id, &[alice]);
+		let grandpa_just = GrandpaJustification::from_commit(&client, round, commit).unwrap();
+
+		let finality_proof = FinalityProof {
+			block: header(2).hash(),
+			justification: grandpa_just.encode(),
+			unknown_headers: Vec::new(),
+		};
+		assert_eq!(
+			finality_proof,
+			check_finality_proof::<Block>(
+				set_id,
+				vec![(alice.public().into(), 1u64)],
+				finality_proof.encode(),
+			)
+			.unwrap(),
+		);
 	}
 
 	#[test]
 	fn finality_proof_using_authority_set_changes_fails_with_undefined_start() {
-		use sp_finality_grandpa::GRANDPA_ENGINE_ID as ID;
-		let blockchain = test_blockchain();
-		let auth = vec![(AuthorityId::from_slice(&[1u8; 32]), 1u64)];
-		let grandpa_just4 = TestJustification((0, auth.clone()), vec![4]).encode();
-		let grandpa_just7 = TestJustification((1, auth.clone()), vec![7]).encode();
-		let just4 = Some(Justifications::from((ID, grandpa_just4)));
-		let just7 = Some(Justifications::from((ID, grandpa_just7)));
-		blockchain.insert(header(4).hash(), header(4), just4, None, NewBlockState::Final).unwrap();
-		blockchain.insert(header(5).hash(), header(5), None, None, NewBlockState::Final).unwrap();
-		blockchain.insert(header(6).hash(), header(6), None, None, NewBlockState::Final).unwrap();
-		blockchain.insert(header(7).hash(), header(7), just7, None, NewBlockState::Final).unwrap();
+		let (_, backend, _) = test_blockchain(8, &[4, 5, 8]);
 
 		// We have stored the correct block number for the relevant set, but as we are missing the
 		// block for the preceding set the start is not well-defined.
 		let mut authority_set_changes = AuthoritySetChanges::empty();
-		authority_set_changes.append(1, 7);
+		authority_set_changes.append(1, 8);
 
-		let proof_of_5 = prove_finality::<_, _, TestJustification>(
-			&blockchain,
+		let proof_of_6 = prove_finality(
+			&*backend,
 			authority_set_changes,
-			*header(5).number(),
+			6,
 		);
-		assert!(matches!(proof_of_5, Err(FinalityProofError::BlockNotInAuthoritySetChanges)));
+		assert!(matches!(proof_of_6, Err(FinalityProofError::BlockNotInAuthoritySetChanges)));
 	}
 
 	#[test]
 	fn finality_proof_using_authority_set_changes_works() {
-		use sp_finality_grandpa::GRANDPA_ENGINE_ID as ID;
-		let blockchain = test_blockchain();
-		let auth = vec![(AuthorityId::from_slice(&[1u8; 32]), 1u64)];
-		let grandpa_just4 = TestJustification((0, auth.clone()), vec![4]).encode();
-		let grandpa_just7 = TestJustification((1, auth.clone()), vec![7]).encode();
-		let just4 = Some(Justifications::from((ID, grandpa_just4)));
-		let just7 = Some(Justifications::from((ID, grandpa_just7.clone())));
-		blockchain.insert(header(4).hash(), header(4), just4, None, NewBlockState::Final) .unwrap();
-		blockchain.insert(header(5).hash(), header(5), None, None, NewBlockState::Final) .unwrap();
-		blockchain.insert(header(6).hash(), header(6), None, None, NewBlockState::Final).unwrap();
-		blockchain.insert(header(7).hash(), header(7), just7, None, NewBlockState::Final).unwrap();
+		let (client, backend, blocks) = test_blockchain(8, &[4, 5]);
+		let block7 = &blocks[6];
+		let block8 = &blocks[7];
+
+		let round = 8;
+		let commit = create_commit(block8.clone(), round, 1, &[Ed25519Keyring::Alice]);
+		let grandpa_just8 = GrandpaJustification::from_commit(&client, round, commit).unwrap();
 
+		client.finalize_block(
+			BlockId::Number(8),
+			Some((ID, grandpa_just8.encode().clone()))
+		)
+		.unwrap();
+
+		// Authority set change at block 8, so the justification stored there will be used in the
+		// FinalityProof for block 6
 		let mut authority_set_changes = AuthoritySetChanges::empty();
-		authority_set_changes.append(0, 4);
-		authority_set_changes.append(1, 7);
+		authority_set_changes.append(0, 5);
+		authority_set_changes.append(1, 8);
+
+		let proof_of_6: FinalityProof = Decode::decode(
+			&mut &prove_finality(
+				&*backend,
+				authority_set_changes.clone(),
+				6,
+			)
+			.unwrap()
+			.unwrap()[..],
+		)
+		.unwrap();
+		assert_eq!(
+			proof_of_6,
+			FinalityProof {
+				block: block8.hash(),
+				justification: grandpa_just8.encode(),
+				unknown_headers: vec![block7.header().clone(), block8.header().clone()],
+			},
+		);
+	}
+
+	#[test]
+	fn finality_proof_in_last_set_fails_without_latest() {
+		let (_, backend, _) = test_blockchain(8, &[4, 5, 8]);
+
+		// No recent authority set change, so we are in the latest set, and we will try to pickup
+		// the best stored justification, for which there is none in this case.
+		let mut authority_set_changes = AuthoritySetChanges::empty();
+		authority_set_changes.append(0, 5);
+
+		assert!(matches!(
+			prove_finality(&*backend, authority_set_changes, 6),
+			Ok(None),
+		));
+	}
+
+	#[test]
+	fn finality_proof_in_last_set_using_latest_justification_works() {
+		let (client, backend, blocks) = test_blockchain(8, &[4, 5, 8]);
+		let block7 = &blocks[6];
+		let block8 = &blocks[7];
+
+		let round = 8;
+		let commit = create_commit(block8.clone(), round, 1, &[Ed25519Keyring::Alice]);
+		let grandpa_just8 = GrandpaJustification::from_commit(&client, round, commit).unwrap();
+		store_best_justification(&client, &grandpa_just8);
+
+		// No recent authority set change, so we are in the latest set, and will pickup the best
+		// stored justification
+		let mut authority_set_changes = AuthoritySetChanges::empty();
+		authority_set_changes.append(0, 5);
 
-		let proof_of_5: FinalityProof = Decode::decode(
-			&mut &prove_finality::<_, _, TestJustification>(
-				&blockchain,
+		let proof_of_6: FinalityProof = Decode::decode(
+			&mut &prove_finality(
+				&*backend,
 				authority_set_changes,
-				*header(5).number(),
+				6,
 			)
 			.unwrap()
 			.unwrap()[..],
 		)
 		.unwrap();
 		assert_eq!(
-			proof_of_5,
+			proof_of_6,
 			FinalityProof {
-				block: header(7).hash(),
-				justification: grandpa_just7,
-				unknown_headers: vec![header(6)],
+				block: block8.hash(),
+				justification: grandpa_just8.encode(),
+				unknown_headers: vec![block7.header().clone(), block8.header().clone()],
 			}
 		);
 	}

From febdc30aca650c36080c513ef16cf66853a95481 Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Wed, 28 Apr 2021 18:25:00 +0200
Subject: [PATCH 0678/1194] Remove unneeded `Ord` bound from All, Contains
 supports tuples (#8691)

* Remove unneeded `Ord` bound from All

* Fixes

* Contains supports tuples
---
 frame/support/src/traits/members.rs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/frame/support/src/traits/members.rs b/frame/support/src/traits/members.rs
index 125f096fa92e..8b9c2c90f541 100644
--- a/frame/support/src/traits/members.rs
+++ b/frame/support/src/traits/members.rs
@@ -27,10 +27,20 @@ pub trait Contains<T> {
 
 /// A `Contains` implementation which always returns `true`.
 pub struct All<T>(PhantomData<T>);
-impl<T: Ord> Contains<T> for All<T> {
+impl<T> Contains<T> for All<T> {
 	fn contains(_: &T) -> bool { true }
 }
 
+#[impl_trait_for_tuples::impl_for_tuples(30)]
+impl<T> Contains<T> for Tuple {
+	fn contains(t: &T) -> bool {
+		for_tuples!( #(
+			if Tuple::contains(t) { return true }
+		)* );
+		false
+	}
+}
+
 /// Create a type which implements the `Contains` trait for a particular type with syntax similar
 /// to `matches!`.
 #[macro_export]

From 3c216fa957d69318ad08932c2739181c7d03260c Mon Sep 17 00:00:00 2001
From: Hernando Castano <HCastano@users.noreply.github.com>
Date: Wed, 28 Apr 2021 16:36:28 -0400
Subject: [PATCH 0679/1194] Bump `jsonrpsee` to `alpha.6` release (#8690)

---
 Cargo.lock                                  | 16 ++++++++--------
 utils/frame/remote-externalities/Cargo.toml |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f9902c2802fa..d2dadcaf5692 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2913,9 +2913,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-http-client"
-version = "0.2.0-alpha.5"
+version = "0.2.0-alpha.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e3a49473ea266be8e9f23e20a7bfa4349109b42319d72cc0b8a101e18fa6466"
+checksum = "2737440f37efa10e5ef7beeec43d059d29dc92640978be21fcdcef481a2edb0d"
 dependencies = [
  "async-trait",
  "fnv",
@@ -2932,9 +2932,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-proc-macros"
-version = "0.2.0-alpha.5"
+version = "0.2.0-alpha.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0cbaee9ca6440e191545a68c7bf28db0ff918359a904e37a6e7cf7edd132f5a"
+checksum = "5784ee8bb31988fa2c7a755fe31b0e21aa51894a67e5c99b6d4470f0253bf31a"
 dependencies = [
  "Inflector",
  "proc-macro-crate 1.0.0",
@@ -2945,9 +2945,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-types"
-version = "0.2.0-alpha.5"
+version = "0.2.0-alpha.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4ce2de6884fb4abee16eca02329a1eec1eb8df8aed751a8e929083820c78ce7"
+checksum = "bab3dabceeeeb865897661d532d47202eaae71cd2c606f53cb69f1fbc0555a51"
 dependencies = [
  "async-trait",
  "beef",
@@ -2961,9 +2961,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-utils"
-version = "0.2.0-alpha.5"
+version = "0.2.0-alpha.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b22199cccd81d9ef601be86bedc5bef67aeacbbfddace031d4931c60fca96e9"
+checksum = "d63cf4d423614e71fd144a8691208539d2b23d8373e069e2fbe023c5eba5e922"
 dependencies = [
  "futures-util",
  "hyper 0.13.10",
diff --git a/utils/frame/remote-externalities/Cargo.toml b/utils/frame/remote-externalities/Cargo.toml
index 06789442a8c5..7d372e8648ee 100644
--- a/utils/frame/remote-externalities/Cargo.toml
+++ b/utils/frame/remote-externalities/Cargo.toml
@@ -13,8 +13,8 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-jsonrpsee-http-client = { version = "=0.2.0-alpha.5", default-features = false, features = ["tokio02"] }
-jsonrpsee-proc-macros = "=0.2.0-alpha.5"
+jsonrpsee-http-client = { version = "=0.2.0-alpha.6", default-features = false, features = ["tokio02"] }
+jsonrpsee-proc-macros = "=0.2.0-alpha.6"
 
 hex-literal = "0.3.1"
 env_logger = "0.8.2"

From dc9acd2d74a5451a63e34060a4c7869021780b3e Mon Sep 17 00:00:00 2001
From: Roman Proskuryakov <humbug@deeptown.org>
Date: Thu, 29 Apr 2021 13:37:05 +0000
Subject: [PATCH 0680/1194] Fix reliance on non-empty NodeInfo::endpoints
 (#8684)

* Use as_deref instead of .map in Node::client_version

* Fix reliance on non-empty NodeInfo::endpoints
---
 client/network/src/peer_info.rs | 8 +++++---
 client/network/src/service.rs   | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/client/network/src/peer_info.rs b/client/network/src/peer_info.rs
index e7ff848b067c..39bbd1d87046 100644
--- a/client/network/src/peer_info.rs
+++ b/client/network/src/peer_info.rs
@@ -138,13 +138,15 @@ pub struct Node<'a>(&'a NodeInfo);
 
 impl<'a> Node<'a> {
 	/// Returns the endpoint of an established connection to the peer.
-	pub fn endpoint(&self) -> &'a ConnectedPoint {
-		&self.0.endpoints[0] // `endpoints` are non-empty by definition
+	///
+	/// Returns `None` if we are disconnected from the node.
+	pub fn endpoint(&self) -> Option<&'a ConnectedPoint> {
+		self.0.endpoints.get(0)
 	}
 
 	/// Returns the latest version information we know of.
 	pub fn client_version(&self) -> Option<&'a str> {
-		self.0.client_version.as_ref().map(|s| &s[..])
+		self.0.client_version.as_deref()
 	}
 
 	/// Returns the latest ping time we know of for this node. `None` if we never successfully
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index e856c6ddf721..4ad5053d9b28 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -550,7 +550,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 				let known_addresses = NetworkBehaviour::addresses_of_peer(swarm.behaviour_mut(), peer_id)
 					.into_iter().collect();
 
-				let endpoint = if let Some(e) = swarm.behaviour_mut().node(peer_id).map(|i| i.endpoint()) {
+				let endpoint = if let Some(e) = swarm.behaviour_mut().node(peer_id).map(|i| i.endpoint()).flatten() {
 					e.clone().into()
 				} else {
 					error!(target: "sub-libp2p", "Found state inconsistency between custom protocol \

From 70ef0afc86cdef0cba09336acffb08bff08540aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomusdrw@users.noreply.github.com>
Date: Thu, 29 Apr 2021 17:23:03 +0200
Subject: [PATCH 0681/1194] subkey: display SS58 encoding of public key (#8674)

* Add SS58 public key encoding.

* [Companion] Update Cargo.toml subkey version, readme to reflect new output (#8694)

* Update Cargo.toml

* update cargo, readme for subkey

Co-authored-by: Dan Shields <danwshields@gmail.com>

Co-authored-by: Dan Shields <35669742+NukeManDan@users.noreply.github.com>
Co-authored-by: Dan Shields <danwshields@gmail.com>
---
 Cargo.lock                       |   2 +-
 bin/utils/subkey/Cargo.toml      |   2 +-
 bin/utils/subkey/README.adoc     |  24 ++++---
 bin/utils/subkey/src/lib.rs      |   2 +-
 client/cli/src/commands/utils.rs | 112 +++++++++++++++++++++----------
 5 files changed, 94 insertions(+), 48 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d2dadcaf5692..8c21d575b858 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9364,7 +9364,7 @@ dependencies = [
 
 [[package]]
 name = "subkey"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "sc-cli",
  "structopt",
diff --git a/bin/utils/subkey/Cargo.toml b/bin/utils/subkey/Cargo.toml
index b0c71a4fc332..1adbd88c7217 100644
--- a/bin/utils/subkey/Cargo.toml
+++ b/bin/utils/subkey/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "subkey"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
diff --git a/bin/utils/subkey/README.adoc b/bin/utils/subkey/README.adoc
index b82213777e93..7c2a9cca0eb1 100644
--- a/bin/utils/subkey/README.adoc
+++ b/bin/utils/subkey/README.adoc
@@ -20,10 +20,15 @@ You can inspect a given URI (mnemonic, seed, public key, or address) and recover
 
 ```bash
 subkey inspect <mnemonic,seed,pubkey,address>
-
-OUTPUT:
-  Public key (hex): 0x461edcf1ba99e43f50dec4bdeb3d1a2cf521ad7c3cd0eeee5cd3314e50fd424c
-  Address (SS58): 5DeeNqcAcaHDSed2HYnqMDK7JHcvxZ5QUE9EKmjc5snvU6wF
+```
+_Example Output_:
+```
+Secret Key URI `` is account:
+  Secret seed:       0xfac7959dbfe72f052e5a0c3c8d6530f202b02fd8f9f5ca3580ec8deb7797479e
+  Public key (hex):  0x46ebddef8cd9bb167dc30878d7113b7e168e6f0646beffd77d69d39bad76b47a
+  Public key (SS58): 5DfhGyQdFobKM8NsWvEeAKk5EQQgYe9AydgJ7rMB6E1EqRzV
+  Account ID:        0x46ebddef8cd9bb167dc30878d7113b7e168e6f0646beffd77d69d39bad76b47a
+  SS58 Address:      5DfhGyQdFobKM8NsWvEeAKk5EQQgYe9AydgJ7rMB6E1EqRzV
 ```
 
 === Signing
@@ -32,8 +37,9 @@ OUTPUT:
 
 ```bash
 echo -n <msg> | subkey sign --suri <seed,mnemonic>
-
-OUTPUT:
+```
+_Example Output_:
+```
 a69da4a6ccbf81dbbbfad235fa12cf8528c18012b991ae89214de8d20d29c1280576ced6eb38b7406d1b7e03231df6dd4a5257546ddad13259356e1c3adfb509
 ```
 
@@ -73,11 +79,13 @@ Will output a signed and encoded `UncheckedMortalCompactExtrinsic` as hex.
 
 ```bash
 subkey module-id "py/trsry" --network kusama
-
-OUTPUT:
+```
+_Example Output_:
+```
 Public Key URI `F3opxRbN5ZbjJNU511Kj2TLuzFcDq9BGduA9TgiECafpg29` is account:
   Network ID/version: kusama
   Public key (hex):   0x6d6f646c70792f74727372790000000000000000000000000000000000000000
+  Public key (SS58):  F3opxRbN5ZbjJNU511Kj2TLuzFcDq9BGduA9TgiECafpg29
   Account ID:         0x6d6f646c70792f74727372790000000000000000000000000000000000000000
   SS58 Address:       F3opxRbN5ZbjJNU511Kj2TLuzFcDq9BGduA9TgiECafpg29
 ```
diff --git a/bin/utils/subkey/src/lib.rs b/bin/utils/subkey/src/lib.rs
index e7243fbd43e4..5e9f04418a6b 100644
--- a/bin/utils/subkey/src/lib.rs
+++ b/bin/utils/subkey/src/lib.rs
@@ -52,7 +52,7 @@ pub enum Subkey {
 	Verify(VerifyCmd),
 }
 
-/// Run the subkey command, given the apropriate runtime.
+/// Run the subkey command, given the appropriate runtime.
 pub fn run() -> Result<(), Error> {
 	match Subkey::from_args() {
 		Subkey::GenerateNodeKey(cmd) => cmd.run(),
diff --git a/client/cli/src/commands/utils.rs b/client/cli/src/commands/utils.rs
index 1bbff392eca4..69372e624095 100644
--- a/client/cli/src/commands/utils.rs
+++ b/client/cli/src/commands/utils.rs
@@ -5,7 +5,7 @@
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or 
+// the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
 // This program is distributed in the hope that it will be useful,
@@ -17,15 +17,19 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! subcommand utilities
-use std::{io::Read, path::PathBuf, convert::TryFrom};
-use sp_core::{
-	Pair, hexdisplay::HexDisplay,
-	crypto::{Ss58Codec, Ss58AddressFormat},
+use crate::{
+	error::{self, Error},
+	OutputType,
 };
-use sp_runtime::{MultiSigner, traits::IdentifyAccount};
-use crate::{OutputType, error::{self, Error}};
 use serde_json::json;
-use sp_core::crypto::{SecretString, Zeroize, ExposeSecret};
+use sp_core::crypto::{ExposeSecret, SecretString, Zeroize};
+use sp_core::{
+	crypto::{Ss58AddressFormat, Ss58Codec},
+	hexdisplay::HexDisplay,
+	Pair,
+};
+use sp_runtime::{traits::IdentifyAccount, MultiSigner};
+use std::{convert::TryFrom, io::Read, path::PathBuf};
 
 /// Public key type for Runtime
 pub type PublicFor<P> = <P as sp_core::Pair>::Public;
@@ -37,9 +41,7 @@ pub fn read_uri(uri: Option<&String>) -> error::Result<String> {
 	let uri = if let Some(uri) = uri {
 		let file = PathBuf::from(&uri);
 		if file.is_file() {
-			std::fs::read_to_string(uri)?
-				.trim_end()
-				.to_owned()
+			std::fs::read_to_string(uri)?.trim_end().to_owned()
 		} else {
 			uri.into()
 		}
@@ -78,25 +80,34 @@ pub fn print_from_uri<Pair>(
 					"secretPhrase": uri,
 					"secretSeed": format_seed::<Pair>(seed),
 					"publicKey": format_public_key::<Pair>(public_key.clone()),
+					"ss58PublicKey": public_key.to_ss58check_with_version(network_override),
 					"accountId": format_account_id::<Pair>(public_key),
 					"ss58Address": pair.public().into().into_account().to_ss58check_with_version(network_override),
 				});
-				println!("{}", serde_json::to_string_pretty(&json).expect("Json pretty print failed"));
-			},
+				println!(
+					"{}",
+					serde_json::to_string_pretty(&json).expect("Json pretty print failed")
+				);
+			}
 			OutputType::Text => {
 				println!(
 					"Secret phrase `{}` is account:\n  \
-					Secret seed:      {}\n  \
-					Public key (hex): {}\n  \
-					Account ID:       {}\n  \
-					SS58 Address:     {}",
+					Secret seed:       {}\n  \
+					Public key (hex):  {}\n  \
+					Public key (SS58): {}\n  \
+					Account ID:        {}\n  \
+					SS58 Address:      {}",
 					uri,
 					format_seed::<Pair>(seed),
 					format_public_key::<Pair>(public_key.clone()),
+					public_key.to_ss58check_with_version(network_override),
 					format_account_id::<Pair>(public_key),
-					pair.public().into().into_account().to_ss58check_with_version(network_override),
+					pair.public()
+						.into()
+						.into_account()
+						.to_ss58check_with_version(network_override),
 				);
-			},
+			}
 		}
 	} else if let Ok((pair, seed)) = Pair::from_string_with_seed(uri, password.clone()) {
 		let public_key = pair.public();
@@ -108,25 +119,38 @@ pub fn print_from_uri<Pair>(
 					"secretKeyUri": uri,
 					"secretSeed": if let Some(seed) = seed { format_seed::<Pair>(seed) } else { "n/a".into() },
 					"publicKey": format_public_key::<Pair>(public_key.clone()),
+					"ss58PublicKey": public_key.to_ss58check_with_version(network_override),
 					"accountId": format_account_id::<Pair>(public_key),
 					"ss58Address": pair.public().into().into_account().to_ss58check_with_version(network_override),
 				});
-				println!("{}", serde_json::to_string_pretty(&json).expect("Json pretty print failed"));
-			},
+				println!(
+					"{}",
+					serde_json::to_string_pretty(&json).expect("Json pretty print failed")
+				);
+			}
 			OutputType::Text => {
 				println!(
 					"Secret Key URI `{}` is account:\n  \
-					Secret seed:      {}\n  \
-					Public key (hex): {}\n  \
-					Account ID:       {}\n  \
-					SS58 Address:     {}",
+					Secret seed:       {}\n  \
+					Public key (hex):  {}\n  \
+					Public key (SS58): {}\n  \
+					Account ID:        {}\n  \
+					SS58 Address:      {}",
 					uri,
-					if let Some(seed) = seed { format_seed::<Pair>(seed) } else { "n/a".into() },
+					if let Some(seed) = seed {
+						format_seed::<Pair>(seed)
+					} else {
+						"n/a".into()
+					},
 					format_public_key::<Pair>(public_key.clone()),
+					public_key.to_ss58check_with_version(network_override),
 					format_account_id::<Pair>(public_key),
-					pair.public().into().into_account().to_ss58check_with_version(network_override),
+					pair.public()
+						.into()
+						.into_account()
+						.to_ss58check_with_version(network_override),
 				);
-			},
+			}
 		}
 	} else if let Ok((public_key, network)) = Pair::Public::from_string_with_version(uri) {
 		let network_override = network_override.unwrap_or(network);
@@ -137,22 +161,28 @@ pub fn print_from_uri<Pair>(
 					"publicKeyUri": uri,
 					"networkId": String::from(network_override),
 					"publicKey": format_public_key::<Pair>(public_key.clone()),
+					"ss58PublicKey": public_key.to_ss58check_with_version(network_override),
 					"accountId": format_account_id::<Pair>(public_key.clone()),
 					"ss58Address": public_key.to_ss58check_with_version(network_override),
 				});
 
-				println!("{}", serde_json::to_string_pretty(&json).expect("Json pretty print failed"));
-			},
+				println!(
+					"{}",
+					serde_json::to_string_pretty(&json).expect("Json pretty print failed")
+				);
+			}
 			OutputType::Text => {
 				println!(
 					"Public Key URI `{}` is account:\n  \
 					 Network ID/version: {}\n  \
 					 Public key (hex):   {}\n  \
+					 Public key (SS58):  {}\n  \
 					 Account ID:         {}\n  \
 					 SS58 Address:       {}",
 					uri,
 					String::from(network_override),
 					format_public_key::<Pair>(public_key.clone()),
+					public_key.to_ss58check_with_version(network_override),
 					format_account_id::<Pair>(public_key.clone()),
 					public_key.to_ss58check_with_version(network_override),
 				);
@@ -185,20 +215,26 @@ where
 			let json = json!({
 				"networkId": String::from(network_override),
 				"publicKey": format_public_key::<Pair>(public_key.clone()),
+				"ss58PublicKey": public_key.to_ss58check_with_version(network_override),
 				"accountId": format_account_id::<Pair>(public_key.clone()),
 				"ss58Address": public_key.to_ss58check_with_version(network_override),
 			});
 
-			println!("{}", serde_json::to_string_pretty(&json).expect("Json pretty print failed"));
-		},
+			println!(
+				"{}",
+				serde_json::to_string_pretty(&json).expect("Json pretty print failed")
+			);
+		}
 		OutputType::Text => {
 			println!(
 				"Network ID/version: {}\n  \
 				 Public key (hex):   {}\n  \
+				 Public key (SS58):  {}\n  \
 				 Account ID:         {}\n  \
 				 SS58 Address:       {}",
 				String::from(network_override),
 				format_public_key::<Pair>(public_key.clone()),
+				public_key.to_ss58check_with_version(network_override),
 				format_account_id::<Pair>(public_key.clone()),
 				public_key.to_ss58check_with_version(network_override),
 			);
@@ -234,10 +270,13 @@ fn format_public_key<P: sp_core::Pair>(public_key: PublicFor<P>) -> String {
 
 /// formats public key as accountId as hex
 fn format_account_id<P: sp_core::Pair>(public_key: PublicFor<P>) -> String
-	where
-		PublicFor<P>: Into<MultiSigner>,
+where
+	PublicFor<P>: Into<MultiSigner>,
 {
-	format!("0x{}", HexDisplay::from(&public_key.into().into_account().as_ref()))
+	format!(
+		"0x{}",
+		HexDisplay::from(&public_key.into().into_account().as_ref())
+	)
 }
 
 /// helper method for decoding hex
@@ -255,7 +294,7 @@ pub fn read_message(msg: Option<&String>, should_decode: bool) -> Result<Vec<u8>
 	match msg {
 		Some(m) => {
 			message = decode_hex(m)?;
-		},
+		}
 		None => {
 			std::io::stdin().lock().read_to_end(&mut message)?;
 			if should_decode {
@@ -266,7 +305,6 @@ pub fn read_message(msg: Option<&String>, should_decode: bool) -> Result<Vec<u8>
 	Ok(message)
 }
 
-
 /// Allows for calling $method with appropriate crypto impl.
 #[macro_export]
 macro_rules! with_crypto_scheme {

From dab7d56ec50e1af7e79239820667e907366eed9a Mon Sep 17 00:00:00 2001
From: tgmichel <telmo@purestake.com>
Date: Sat, 1 May 2021 08:02:47 +0200
Subject: [PATCH 0682/1194] Add future transactions pool accessor to
 ValidatedPool (#8673)

---
 client/transaction-pool/graph/src/validated_pool.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/client/transaction-pool/graph/src/validated_pool.rs b/client/transaction-pool/graph/src/validated_pool.rs
index 6042189e87e2..2e4db1248619 100644
--- a/client/transaction-pool/graph/src/validated_pool.rs
+++ b/client/transaction-pool/graph/src/validated_pool.rs
@@ -610,6 +610,13 @@ impl<B: ChainApi> ValidatedPool<B> {
 		self.pool.read().ready()
 	}
 
+	/// Returns a Vec of hashes and extrinsics in the future pool.
+	pub fn futures(&self) -> Vec<(ExtrinsicHash<B>, ExtrinsicFor<B>)> {
+		self.pool.read().futures()
+			.map(|tx| (tx.hash.clone(), tx.data.clone()))
+			.collect()
+	}
+
 	/// Returns pool status.
 	pub fn status(&self) -> PoolStatus {
 		self.pool.read().status()

From b15187cd02055978a30f9a15830d49628b510cf4 Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Sun, 2 May 2021 15:27:50 +0200
Subject: [PATCH 0683/1194] Put BoundedVec in pallet prelude (#8710)

---
 frame/support/src/lib.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 72c90018f755..12f651cb3dae 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -1238,6 +1238,7 @@ pub mod pallet_prelude {
 		dispatch::{DispatchResultWithPostInfo, Parameter, DispatchError, DispatchResult},
 		weights::{DispatchClass, Pays, Weight},
 		storage::types::{StorageValue, StorageMap, StorageDoubleMap, ValueQuery, OptionQuery},
+		storage::bounded_vec::{BoundedVec, BoundedVecValue},
 	};
 	pub use codec::{Encode, Decode};
 	pub use sp_inherents::{InherentData, InherentIdentifier, ProvideInherent};

From c96e57dd50f93f2b633fb6c907c239178051082d Mon Sep 17 00:00:00 2001
From: ferrell-code <70108835+ferrell-code@users.noreply.github.com>
Date: Sun, 2 May 2021 22:43:56 -0400
Subject: [PATCH 0684/1194] Upgrade authorship pallet to Frame-v2 (#8663)

* first commit

* get to compile

* fix deprecated grandpa

* formatting

* module to pallet

* add authorship pallet to mocks

* Fix upgrade of storage.

Co-authored-by: Xiliang Chen <xlchen1291@gmail.com>

* trigger CI

* put back doc

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Xiliang Chen <xlchen1291@gmail.com>
---
 frame/authorship/src/lib.rs       | 171 ++++++++++++++++--------------
 frame/babe/src/equivocation.rs    |   2 +-
 frame/babe/src/mock.rs            |   1 +
 frame/grandpa/src/equivocation.rs |   2 +-
 frame/grandpa/src/mock.rs         |   1 +
 frame/staking/src/lib.rs          |   2 +-
 frame/staking/src/mock.rs         |   1 +
 frame/staking/src/tests.rs        |   2 +-
 8 files changed, 101 insertions(+), 81 deletions(-)

diff --git a/frame/authorship/src/lib.rs b/frame/authorship/src/lib.rs
index a7803319c539..4243ae55718a 100644
--- a/frame/authorship/src/lib.rs
+++ b/frame/authorship/src/lib.rs
@@ -23,43 +23,18 @@
 
 use sp_std::{result, prelude::*};
 use sp_std::collections::btree_set::BTreeSet;
-use frame_support::{decl_module, decl_storage, decl_error, dispatch, ensure};
+use frame_support::dispatch;
 use frame_support::traits::{FindAuthor, VerifySeal, Get};
 use codec::{Encode, Decode};
-use frame_system::ensure_none;
 use sp_runtime::traits::{Header as HeaderT, One, Zero};
-use frame_support::weights::{Weight, DispatchClass};
 use sp_inherents::{InherentIdentifier, ProvideInherent, InherentData};
 use sp_authorship::{INHERENT_IDENTIFIER, UnclesInherentData, InherentError};
 
 const MAX_UNCLES: usize = 10;
 
-pub trait Config: frame_system::Config {
-	/// Find the author of a block.
-	type FindAuthor: FindAuthor<Self::AccountId>;
-	/// The number of blocks back we should accept uncles.
-	/// This means that we will deal with uncle-parents that are
-	/// `UncleGenerations + 1` before `now`.
-	type UncleGenerations: Get<Self::BlockNumber>;
-	/// A filter for uncles within a block. This is for implementing
-	/// further constraints on what uncles can be included, other than their ancestry.
-	///
-	/// For PoW, as long as the seals are checked, there is no need to use anything
-	/// but the `VerifySeal` implementation as the filter. This is because the cost of making many equivocating
-	/// uncles is high.
-	///
-	/// For PoS, there is no such limitation, so a further constraint must be imposed
-	/// beyond a seal check in order to prevent an arbitrary number of
-	/// equivocating uncles from being included.
-	///
-	/// The `OnePerAuthorPerHeight` filter is good for many slot-based PoS
-	/// engines.
-	type FilterUncle: FilterUncle<Self::Header, Self::AccountId>;
-	/// An event handler for authored blocks.
-	type EventHandler: EventHandler<Self::AccountId, Self::BlockNumber>;
-}
+pub use pallet::*;
 
-/// An event handler for the authorship module. There is a dummy implementation
+/// An event handler for the authorship pallet. There is a dummy implementation
 /// for `()`, which does nothing.
 #[impl_trait_for_tuples::impl_for_tuples(30)]
 pub trait EventHandler<Author, BlockNumber> {
@@ -150,41 +125,45 @@ enum UncleEntryItem<BlockNumber, Hash, Author> {
 	InclusionHeight(BlockNumber),
 	Uncle(Hash, Option<Author>),
 }
+#[frame_support::pallet]
+pub mod pallet {
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+	use super::*;
 
-decl_storage! {
-	trait Store for Module<T: Config> as Authorship {
-		/// Uncles
-		Uncles: Vec<UncleEntryItem<T::BlockNumber, T::Hash, T::AccountId>>;
-		/// Author of current block.
-		Author: Option<T::AccountId>;
-		/// Whether uncles were already set in this block.
-		DidSetUncles: bool;
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		/// Find the author of a block.
+		type FindAuthor: FindAuthor<Self::AccountId>;
+		/// The number of blocks back we should accept uncles.
+		/// This means that we will deal with uncle-parents that are
+		/// `UncleGenerations + 1` before `now`.
+		type UncleGenerations: Get<Self::BlockNumber>;
+		/// A filter for uncles within a block. This is for implementing
+		/// further constraints on what uncles can be included, other than their ancestry.
+		///
+		/// For PoW, as long as the seals are checked, there is no need to use anything
+		/// but the `VerifySeal` implementation as the filter. This is because the cost of making many equivocating
+		/// uncles is high.
+		///
+		/// For PoS, there is no such limitation, so a further constraint must be imposed
+		/// beyond a seal check in order to prevent an arbitrary number of
+		/// equivocating uncles from being included.
+		///
+		/// The `OnePerAuthorPerHeight` filter is good for many slot-based PoS
+		/// engines.
+		type FilterUncle: FilterUncle<Self::Header, Self::AccountId>;
+		/// An event handler for authored blocks.
+		type EventHandler: EventHandler<Self::AccountId, Self::BlockNumber>;
 	}
-}
 
-decl_error! {
-	/// Error for the authorship module.
-	pub enum Error for Module<T: Config> {
-		/// The uncle parent not in the chain.
-		InvalidUncleParent,
-		/// Uncles already set in the block.
-		UnclesAlreadySet,
-		/// Too many uncles.
-		TooManyUncles,
-		/// The uncle is genesis.
-		GenesisUncle,
-		/// The uncle is too high in chain.
-		TooHighUncle,
-		/// The uncle is already included.
-		UncleAlreadyIncluded,
-		/// The uncle isn't recent enough to be included.
-		OldUncle,
-	}
-}
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(_);
 
-decl_module! {
-	pub struct Module<T: Config> for enum Call where origin: T::Origin {
-		type Error = Error<T>;
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
 
 		fn on_initialize(now: T::BlockNumber) -> Weight {
 			let uncle_generations = T::UncleGenerations::get();
@@ -194,50 +173,88 @@ decl_module! {
 				Self::prune_old_uncles(minimum_height)
 			}
 
-			<Self as Store>::DidSetUncles::put(false);
+			<DidSetUncles<T>>::put(false);
 
 			T::EventHandler::note_author(Self::author());
 
 			0
 		}
 
-		fn on_finalize() {
+		fn on_finalize(_: T::BlockNumber) {
 			// ensure we never go to trie with these values.
-			<Self as Store>::Author::kill();
-			<Self as Store>::DidSetUncles::kill();
+			<Author<T>>::kill();
+			<DidSetUncles<T>>::kill();
 		}
+	}
+
+	#[pallet::storage]
+	/// Uncles
+	pub(super) type Uncles<T: Config> = StorageValue<
+		_,
+		Vec<UncleEntryItem<T::BlockNumber, T::Hash, T::AccountId>>,
+		ValueQuery,
+	>;
+
+	#[pallet::storage]
+	/// Author of current block.
+	pub(super) type Author<T: Config> = StorageValue<_, T::AccountId, OptionQuery>;
+
+	#[pallet::storage]
+	/// Whether uncles were already set in this block.
+	pub(super) type DidSetUncles<T: Config> = StorageValue<_, bool, ValueQuery>;
+
+
+	#[pallet::error]
+	pub enum Error<T> {
+		/// The uncle parent not in the chain.
+		InvalidUncleParent,
+		/// Uncles already set in the block.
+		UnclesAlreadySet,
+		/// Too many uncles.
+		TooManyUncles,
+		/// The uncle is genesis.
+		GenesisUncle,
+		/// The uncle is too high in chain.
+		TooHighUncle,
+		/// The uncle is already included.
+		UncleAlreadyIncluded,
+		/// The uncle isn't recent enough to be included.
+		OldUncle,
+	}
 
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
 		/// Provide a set of uncles.
-		#[weight = (0, DispatchClass::Mandatory)]
-		fn set_uncles(origin, new_uncles: Vec<T::Header>) -> dispatch::DispatchResult {
+		#[pallet::weight((0, DispatchClass::Mandatory))]
+		fn set_uncles(origin: OriginFor<T>, new_uncles: Vec<T::Header>) -> DispatchResult {
 			ensure_none(origin)?;
 			ensure!(new_uncles.len() <= MAX_UNCLES, Error::<T>::TooManyUncles);
 
-			if <Self as Store>::DidSetUncles::get() {
+			if <DidSetUncles<T>>::get() {
 				Err(Error::<T>::UnclesAlreadySet)?
 			}
-			<Self as Store>::DidSetUncles::put(true);
+			<DidSetUncles<T>>::put(true);
 
 			Self::verify_and_import_uncles(new_uncles)
 		}
 	}
 }
 
-impl<T: Config> Module<T> {
+impl<T: Config> Pallet<T> {
 	/// Fetch the author of the block.
 	///
 	/// This is safe to invoke in `on_initialize` implementations, as well
 	/// as afterwards.
 	pub fn author() -> T::AccountId {
 		// Check the memoized storage value.
-		if let Some(author) = <Self as Store>::Author::get() {
+		if let Some(author) = <Author<T>>::get() {
 			return author;
 		}
 
 		let digest = <frame_system::Pallet<T>>::digest();
 		let pre_runtime_digests = digest.logs.iter().filter_map(|d| d.as_pre_runtime());
 		if let Some(author) = T::FindAuthor::find_author(pre_runtime_digests) {
-			<Self as Store>::Author::put(&author);
+			<Author<T>>::put(&author);
 			author
 		} else {
 			Default::default()
@@ -247,7 +264,7 @@ impl<T: Config> Module<T> {
 	fn verify_and_import_uncles(new_uncles: Vec<T::Header>) -> dispatch::DispatchResult {
 		let now = <frame_system::Pallet<T>>::block_number();
 
-		let mut uncles = <Self as Store>::Uncles::get();
+		let mut uncles = <Uncles<T>>::get();
 		uncles.push(UncleEntryItem::InclusionHeight(now));
 
 		let mut acc: <T::FilterUncle as FilterUncle<_, _>>::Accumulator = Default::default();
@@ -268,7 +285,7 @@ impl<T: Config> Module<T> {
 			uncles.push(UncleEntryItem::Uncle(hash, author));
 		}
 
-		<Self as Store>::Uncles::put(&uncles);
+		<Uncles<T>>::put(&uncles);
 		Ok(())
 	}
 
@@ -325,7 +342,7 @@ impl<T: Config> Module<T> {
 	}
 
 	fn prune_old_uncles(minimum_height: T::BlockNumber) {
-		let mut uncles = <Self as Store>::Uncles::get();
+		let mut uncles = <Uncles<T>>::get();
 		let prune_entries = uncles.iter().take_while(|item| match item {
 			UncleEntryItem::Uncle(_, _) => true,
 			UncleEntryItem::InclusionHeight(height) => height < &minimum_height,
@@ -333,11 +350,11 @@ impl<T: Config> Module<T> {
 		let prune_index = prune_entries.count();
 
 		let _ = uncles.drain(..prune_index);
-		<Self as Store>::Uncles::put(uncles);
+		<Uncles<T>>::put(uncles);
 	}
 }
 
-impl<T: Config> ProvideInherent for Module<T> {
+impl<T: Config> ProvideInherent for Pallet<T> {
 	type Call = Call<T>;
 	type Error = InherentError;
 	const INHERENT_IDENTIFIER: InherentIdentifier = INHERENT_IDENTIFIER;
@@ -347,7 +364,7 @@ impl<T: Config> ProvideInherent for Module<T> {
 		let mut set_uncles = Vec::new();
 
 		if !uncles.is_empty() {
-			let prev_uncles = <Self as Store>::Uncles::get();
+			let prev_uncles = <Uncles<T>>::get();
 			let mut existing_hashes: Vec<_> = prev_uncles.into_iter().filter_map(|entry|
 				match entry {
 					UncleEntryItem::InclusionHeight(_) => None,
@@ -458,7 +475,7 @@ mod tests {
 		pub const UncleGenerations: u64 = 5;
 	}
 
-	impl Config for Test {
+	impl pallet::Config for Test {
 		type FindAuthor = AuthorGiven;
 		type UncleGenerations = UncleGenerations;
 		type FilterUncle = SealVerify<VerifyBlock>;
diff --git a/frame/babe/src/equivocation.rs b/frame/babe/src/equivocation.rs
index 154faa49f0b2..0fd74882c1b7 100644
--- a/frame/babe/src/equivocation.rs
+++ b/frame/babe/src/equivocation.rs
@@ -175,7 +175,7 @@ where
 	}
 
 	fn block_author() -> Option<T::AccountId> {
-		Some(<pallet_authorship::Module<T>>::author())
+		Some(<pallet_authorship::Pallet<T>>::author())
 	}
 }
 
diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index 39831eceb75b..d01a67f40396 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -52,6 +52,7 @@ frame_support::construct_runtime!(
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Authorship: pallet_authorship::{Pallet, Call, Storage, Inherent},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
 		Historical: pallet_session_historical::{Pallet},
 		Offences: pallet_offences::{Pallet, Call, Storage, Event},
diff --git a/frame/grandpa/src/equivocation.rs b/frame/grandpa/src/equivocation.rs
index 8ab86b2fed06..441311ebc542 100644
--- a/frame/grandpa/src/equivocation.rs
+++ b/frame/grandpa/src/equivocation.rs
@@ -186,7 +186,7 @@ where
 	}
 
 	fn block_author() -> Option<T::AccountId> {
-		Some(<pallet_authorship::Module<T>>::author())
+		Some(<pallet_authorship::Pallet<T>>::author())
 	}
 }
 
diff --git a/frame/grandpa/src/mock.rs b/frame/grandpa/src/mock.rs
index d59d0d19d0e8..b13c431dc5b9 100644
--- a/frame/grandpa/src/mock.rs
+++ b/frame/grandpa/src/mock.rs
@@ -52,6 +52,7 @@ frame_support::construct_runtime!(
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Authorship: pallet_authorship::{Pallet, Call, Storage, Inherent},
 		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
 		Staking: pallet_staking::{Pallet, Call, Config<T>, Storage, Event<T>},
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 4252eae50d9b..b1d6ba6bd9cf 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -2709,7 +2709,7 @@ where
 	}
 	fn note_uncle(author: T::AccountId, _age: T::BlockNumber) {
 		Self::reward_by_ids(vec![
-			(<pallet_authorship::Module<T>>::author(), 2),
+			(<pallet_authorship::Pallet<T>>::author(), 2),
 			(author, 1)
 		])
 	}
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index 188eda801095..c8556a806a41 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -96,6 +96,7 @@ frame_support::construct_runtime!(
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Authorship: pallet_authorship::{Pallet, Call, Storage, Inherent},
 		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
 		Staking: staking::{Pallet, Call, Config<T>, Storage, Event<T>},
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index 05eb6fdc5e02..634504ccb687 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -2007,7 +2007,7 @@ fn reward_from_authorship_event_handler_works() {
 	ExtBuilder::default().build_and_execute(|| {
 		use pallet_authorship::EventHandler;
 
-		assert_eq!(<pallet_authorship::Module<Test>>::author(), 11);
+		assert_eq!(<pallet_authorship::Pallet<Test>>::author(), 11);
 
 		<Module<Test>>::note_author(11);
 		<Module<Test>>::note_uncle(21, 1);

From 6fa36db7379f850abbde9ea3f2299b265583a8d5 Mon Sep 17 00:00:00 2001
From: Squirrel <gilescope@gmail.com>
Date: Mon, 3 May 2021 04:35:18 +0100
Subject: [PATCH 0685/1194] fixed typos (#8664)

---
 docs/Upgrading-2.0-to-3.0.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/Upgrading-2.0-to-3.0.md b/docs/Upgrading-2.0-to-3.0.md
index bc4a15eb15f2..f1f6f31e9203 100644
--- a/docs/Upgrading-2.0-to-3.0.md
+++ b/docs/Upgrading-2.0-to-3.0.md
@@ -20,11 +20,11 @@ We'll be taking the diff from 2.0.1 to 3.0.0 on `bin/node` as the baseline of wh
 
 ### Versions upgrade
 
-First and foremost you have to upgrade the version pf the dependencies of course, that's `0.8.x -> 0.9.0` and `2.0.x -> 3.0.0` for all `sc-`, `sp-`, `frame-`, and `pallet-` coming from Parity. Further more this release also upgraded its own dependencies, most notably, we are now using `parity-scale-codec 2.0`, `parking_lot 0.11` and `substrate-wasm-builder 3.0.0` (as build dependency). All other dependency upgrades should resolve automatically or are just internal. However you might see some error that another dependency/type you have as a dependency and one of our upgraded crates don't match up, if so please check the version of said dependency - we've probably ugraded it.
+First and foremost you have to upgrade the version pf the dependencies of course, that's `0.8.x -> 0.9.0` and `2.0.x -> 3.0.0` for all `sc-`, `sp-`, `frame-`, and `pallet-` coming from Parity. Further more this release also upgraded its own dependencies, most notably, we are now using `parity-scale-codec 2.0`, `parking_lot 0.11` and `substrate-wasm-builder 3.0.0` (as build dependency). All other dependency upgrades should resolve automatically or are just internal. However you might see some error that another dependency/type you have as a dependency and one of our upgraded crates don't match up, if so please check the version of said dependency - we've probably upgraded it.
 
 ### WASM-Builder
 
-The new version of wasm-builder has gotten a bit smarter and a lot faster (you should definitly switch). Once you've upgraded the dependency, in most cases you just have to remove the now obsolete `with_wasm_builder_from_crates_or_path`-function and you are good to go:
+The new version of wasm-builder has gotten a bit smarter and a lot faster (you should definitely switch). Once you've upgraded the dependency, in most cases you just have to remove the now obsolete `with_wasm_builder_from_crates_or_path`-function and you are good to go:
 
 ```diff: rust
 --- a/bin/node/runtime/build.rs
@@ -244,7 +244,7 @@ Finality Tracker has been removed in favor of a different approach to handle the
 
 #### (changes) Elections Phragmen
 
-The pallet has been moved to a new system in which the exact amount of deposit for each voter, candidate, member, or runner-up is now deposited on-chain. Moreover, the concept of a `defunct_voter` is removed, since votes now have adequet deposit associated with them. A number of configuration parameters has changed to reflect this, as shown below:
+The pallet has been moved to a new system in which the exact amount of deposit for each voter, candidate, member, or runner-up is now deposited on-chain. Moreover, the concept of a `defunct_voter` is removed, since votes now have adequate deposit associated with them. A number of configuration parameters has changed to reflect this, as shown below:
 
 ```diff=
  parameter_types! {
@@ -439,7 +439,7 @@ and add the new service:
 
 The telemetry subsystem has seen a few fixes and refactorings to allow for a more flexible handling, in particular in regards to parachains. Most notably `sc_service::spawn_tasks` now returns the `telemetry_connection_notifier` as the second member of the tuple, (`let (_rpc_handlers, telemetry_connection_notifier) = sc_service::spawn_tasks(`), which should be passed to `telemetry_on_connect` of `new_full_base` now: `telemetry_on_connect: telemetry_connection_notifier.map(|x| x.on_connect_stream()),` (see the service-section below for a full diff).
 
-On the browser-side, this complicates setup a tiny bit, yet not terribly. Instead of `init_console_log`,  we now use `init_logging_and_telemetry` and need to make sure we spawn the runner for its handleat the end (the other changes are formatting and cosmetics):
+On the browser-side, this complicates setup a tiny bit, yet not terribly. Instead of `init_console_log`,  we now use `init_logging_and_telemetry` and need to make sure we spawn the runner for its handle at the end (the other changes are formatting and cosmetics):
 
 ```diff
 --- a/bin/node/cli/src/browser.rs

From 8f0cfda6f38e11e19daad7e40eb761b34c49b4d0 Mon Sep 17 00:00:00 2001
From: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
Date: Mon, 3 May 2021 09:26:35 +0200
Subject: [PATCH 0686/1194] Refactor election solution trimming for efficiency
 (#8614)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Refactor election solution trimming for efficiency

The previous version always trimmed the `CompactOf<T>` instance,
which was intrinsically inefficient: that's a packed data structure,
which is naturally expensive to edit. It's much easier to edit
the unpacked data structures: the `voters` and `assignments` lists.

* rework length-trim tests to work with the new interface

Test suite now compiles. Tests still don't pass because the macro
generating the compact structure still generates `unimplemented!()`
for the actual `compact_length_of` implementation.

* simplify

* add a fuzzer which can validate `Compact::encoded_size_for`

The `Compact` solution type is generated distinctly for each runtime,
and has both three type parameters and a built-in limit to the number
of candidates that each voter can vote for. Finally, they have an
optional `#[compact]` attribute which changes the encoding behavior.

The assignment truncation algorithm we're using depends on the ability
to efficiently and accurately determine how much space a `Compact`
solution will take once encoded.

Together, these two facts imply that simple unit tests are not
sufficient to validate the behavior of `Compact::encoded_size_for`.
This commit adds such a fuzzer. It is designed such that it is possible
to add a new fuzzer to the family by simply adjusting the
`generate_solution_type` macro invocation as desired, and making a
few minor documentation edits.

Of course, the fuzzer still fails for now: the generated implementation
for `encoded_size_for` is still `unimplemented!()`. However, once
the macro is updated appropriately, this fuzzer family should allow
us to gain confidence in the correctness of the generated code.

* Revert "add a fuzzer which can validate `Compact::encoded_size_for`"

This reverts commit 916038790887e64217c6a46e9a6d281386762bfb.

The design of `Compact::encoded_size_for` is flawed. When `#[compact]`
mode is enabled, every integer in the dataset is encoded using run-
length encoding. This means that it is impossible to compute the final
length faster than actually encoding the data structure, because the
encoded length of every field varies with the actual value stored.

Given that we won't be adding that method to the trait, we won't be
needing a fuzzer to validate its performance.

* revert changes to `trait CompactSolution`

If `CompactSolution::encoded_size_for` can't be implemented in the
way that we wanted, there's no point in adding it.

* WIP: restructure trim_assignments_length by actually encoding

This is not as efficient as what we'd hoped for, but it should still
be better than what it's replacing. Overall efficiency of
`fn trim_assignments_length` is now `O(edges * lg assignments.len())`.

* fix compiler errors

* don't sort voters, just assignments

Sorting the `voters` list causes lots of problems; an invariant that
we need to maintain is that an index into the voters list has a stable
meaning.

Luckily, it turns out that there is no need for the assignments list
to correspond to the voters list. That isn't an invariant, though previously
I'd thought that it was.

This simplifies things; we can just leave the voters list alone,
and sort the assignments list the way that is convenient.

* WIP: add `IndexAssignment` type to speed up repeatedly creating `Compact`

Next up: `impl<'a, T> From<&'a [IndexAssignmentOf<T>]> for Compact`,
in the proc-macro which makes `Compact`. Should be a pretty straightforward
adaptation of `from_assignment`.

* Add IndexAssignment and conversion method to CompactSolution

This involves a bit of duplication of types from
`election-provider-multi-phase`; we'll clean those up shortly.

I'm not entirely happy that we had to add a `from_index_assignments`
method to `CompactSolution`, but we couldn't define
`trait CompactSolution: TryFrom<&'a [Self::IndexAssignment]` because
that made trait lookup recursive, and I didn't want to propagate
`CompactSolutionOf<T> + TryFrom<&[IndexAssignmentOf<T>]>` everywhere
that compact solutions are specified.

* use `CompactSolution::from_index_assignment` and clean up dead code

* get rid of `from_index_assignments` in favor of `TryFrom`

* cause `pallet-election-provider-multi-phase` tests to compile successfully

Mostly that's just updating the various test functions to keep track of
refactorings elsewhere, though in a few places we needed to refactor some
test-only helpers as well.

* fix infinite binary search loop

Turns out that moving `low` and `high` into an averager function is a
bad idea, because the averager gets copies of those values, which
of course are never updated. Can't use mutable references, because
we want to read them elsewhere in the code. Just compute the average
directly; life is better that way.

* fix a test failure

* fix the rest of test failures

* remove unguarded subtraction

* fix npos-elections tests compilation

* ensure we use sp_std::vec::Vec in assignments

* add IndexAssignmentOf to sp_npos_elections

* move miner types to `unsigned`

* use stable sort

* rewrap some long comments

* use existing cache instead of building a dedicated stake map

* generalize the TryFrom bound on CompactSolution

* undo adding sp-core dependency

* consume assignments to produce index_assignments

* Add a test of Assignment -> IndexAssignment -> Compact

* fix `IndexAssignmentOf` doc

* move compact test from sp-npos-elections-compact to sp-npos-elections

This means that we can put the mocking parts of that into a proper
mock package, put the test into a test package among other tests.

Having the mocking parts in a mock package enables us to create a
benchmark (which is treated as a separate crate) import them.

* rename assignments -> sorted_assignments

* sort after reducing to avoid potential re-sort issues

* add runtime benchmark, fix critical binary search error

"Why don't you add a benchmark?", he said. "It'll be good practice,
and can help demonstrate that this isn't blowing up the runtime."

He was absolutely right.

The biggest discovery is that adding a parametric benchmark means that
you get a bunch of new test cases, for free. This is excellent, because
those test cases uncovered a binary search bug. Fixing that simplified
that part of the code nicely.

The other nice thing you get from a parametric benchmark is data about
what each parameter does. In this case, `f` is the size factor: what
percent of the votes (by size) should be removed. 0 means that we should
keep everything, 95 means that we should trim down to 5% of original size
or less.

```
Median Slopes Analysis
========
-- Extrinsic Time --

Model:
Time ~=     3846
    + v    0.015
    + t        0
    + a    0.192
    + d        0
    + f        0
              µs

Min Squares Analysis
========
-- Extrinsic Time --

Data points distribution:
    v     t     a     d     f   mean µs  sigma µs       %
<snip>
 6000  1600  3000   800     0      4385     75.87    1.7%
 6000  1600  3000   800     9      4089     46.28    1.1%
 6000  1600  3000   800    18      3793     36.45    0.9%
 6000  1600  3000   800    27      3365     41.13    1.2%
 6000  1600  3000   800    36      3096     7.498    0.2%
 6000  1600  3000   800    45      2774     17.96    0.6%
 6000  1600  3000   800    54      2057     37.94    1.8%
 6000  1600  3000   800    63      1885     2.515    0.1%
 6000  1600  3000   800    72      1591     3.203    0.2%
 6000  1600  3000   800    81      1219     25.72    2.1%
 6000  1600  3000   800    90       859     5.295    0.6%
 6000  1600  3000   800    95     684.6     2.969    0.4%

Quality and confidence:
param     error
v         0.008
t         0.029
a         0.008
d         0.044
f         0.185

Model:
Time ~=     3957
    + v    0.009
    + t        0
    + a    0.185
    + d        0
    + f        0
              µs
```

What's nice about this is the clear negative correlation between
amount removed and total time. The more we remove, the less total
time things take.
---
 .../election-provider-multi-phase/Cargo.toml  |   6 +-
 .../src/benchmarking.rs                       |  72 +++-
 .../src/helpers.rs                            |  12 +
 .../election-provider-multi-phase/src/mock.rs |  74 +++-
 .../src/unsigned.rs                           | 335 ++++++++++--------
 primitives/npos-elections/Cargo.toml          |   1 +
 .../compact/src/index_assignment.rs           |  76 ++++
 primitives/npos-elections/compact/src/lib.rs  |  27 +-
 primitives/npos-elections/src/assignments.rs  | 208 +++++++++++
 primitives/npos-elections/src/helpers.rs      |   7 +-
 primitives/npos-elections/src/lib.rs          | 154 +-------
 primitives/npos-elections/src/mock.rs         | 189 ++++++++--
 primitives/npos-elections/src/tests.rs        |  63 ++--
 13 files changed, 871 insertions(+), 353 deletions(-)
 create mode 100644 primitives/npos-elections/compact/src/index_assignment.rs
 create mode 100644 primitives/npos-elections/src/assignments.rs

diff --git a/frame/election-provider-multi-phase/Cargo.toml b/frame/election-provider-multi-phase/Cargo.toml
index dcb9c9b0e75b..643c768ce870 100644
--- a/frame/election-provider-multi-phase/Cargo.toml
+++ b/frame/election-provider-multi-phase/Cargo.toml
@@ -20,7 +20,7 @@ log = { version = "0.4.14", default-features = false }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 
-sp-io ={ version = "3.0.0", default-features = false, path = "../../primitives/io" }
+sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
 sp-npos-elections = { version = "3.0.0", default-features = false, path = "../../primitives/npos-elections" }
@@ -37,8 +37,9 @@ parking_lot = "0.11.0"
 rand = { version = "0.7.3" }
 hex-literal = "0.3.1"
 substrate-test-utils = { version = "3.0.0", path = "../../test-utils" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
 sp-io = { version = "3.0.0", path = "../../primitives/io" }
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-npos-elections = { version = "3.0.0", default-features = false, features = [ "mocks" ], path = "../../primitives/npos-elections" }
 sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
 frame-election-provider-support = { version = "3.0.0", features = ["runtime-benchmarks"], path = "../election-provider-support" }
 pallet-balances = { version = "3.0.0", path = "../balances" }
@@ -64,5 +65,6 @@ std = [
 runtime-benchmarks = [
 	"frame-benchmarking",
 	"rand",
+	"sp-npos-elections/mocks",
 ]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/election-provider-multi-phase/src/benchmarking.rs b/frame/election-provider-multi-phase/src/benchmarking.rs
index 90e90d427dc6..4eade8e184e7 100644
--- a/frame/election-provider-multi-phase/src/benchmarking.rs
+++ b/frame/election-provider-multi-phase/src/benchmarking.rs
@@ -18,15 +18,16 @@
 //! Two phase election pallet benchmarking.
 
 use super::*;
-use crate::Pallet as MultiPhase;
+use crate::{Pallet as MultiPhase, unsigned::IndexAssignmentOf};
 use frame_benchmarking::impl_benchmark_test_suite;
 use frame_support::{assert_ok, traits::OnInitialize};
 use frame_system::RawOrigin;
 use rand::{prelude::SliceRandom, rngs::SmallRng, SeedableRng};
 use frame_election_provider_support::Assignment;
-use sp_arithmetic::traits::One;
+use sp_arithmetic::{per_things::Percent, traits::One};
+use sp_npos_elections::IndexAssignment;
 use sp_runtime::InnerOf;
-use sp_std::convert::TryInto;
+use sp_std::convert::{TryFrom, TryInto};
 
 const SEED: u32 = 999;
 
@@ -135,7 +136,7 @@ fn solution_with_size<T: Config>(
 		.collect::<Vec<_>>();
 
 	let compact =
-		<CompactOf<T>>::from_assignment(assignments, &voter_index, &target_index).unwrap();
+		<CompactOf<T>>::from_assignment(&assignments, &voter_index, &target_index).unwrap();
 	let score = compact.clone().score(&winners, stake_of, voter_at, target_at).unwrap();
 	let round = <MultiPhase<T>>::round();
 
@@ -254,6 +255,69 @@ frame_benchmarking::benchmarks! {
 		assert!(<MultiPhase<T>>::queued_solution().is_some());
 	}
 
+	#[extra]
+	trim_assignments_length {
+		// number of votes in snapshot.
+		let v in (T::BenchmarkingConfig::VOTERS[0]) .. T::BenchmarkingConfig::VOTERS[1];
+		// number of targets in snapshot.
+		let t in (T::BenchmarkingConfig::TARGETS[0]) .. T::BenchmarkingConfig::TARGETS[1];
+		// number of assignments, i.e. compact.len(). This means the active nominators, thus must be
+		// a subset of `v` component.
+		let a in (T::BenchmarkingConfig::ACTIVE_VOTERS[0]) .. T::BenchmarkingConfig::ACTIVE_VOTERS[1];
+		// number of desired targets. Must be a subset of `t` component.
+		let d in (T::BenchmarkingConfig::DESIRED_TARGETS[0]) .. T::BenchmarkingConfig::DESIRED_TARGETS[1];
+		// Subtract this percentage from the actual encoded size
+		let f in 0 .. 95;
+
+		// Compute a random solution, then work backwards to get the lists of voters, targets, and assignments
+		let witness = SolutionOrSnapshotSize { voters: v, targets: t };
+		let RawSolution { compact, .. } = solution_with_size::<T>(witness, a, d);
+		let RoundSnapshot { voters, targets } = MultiPhase::<T>::snapshot().unwrap();
+		let voter_at = helpers::voter_at_fn::<T>(&voters);
+		let target_at = helpers::target_at_fn::<T>(&targets);
+		let mut assignments = compact.into_assignment(voter_at, target_at).unwrap();
+
+		// make a voter cache and some helper functions for access
+		let cache = helpers::generate_voter_cache::<T>(&voters);
+		let voter_index = helpers::voter_index_fn::<T>(&cache);
+		let target_index = helpers::target_index_fn::<T>(&targets);
+
+		// sort assignments by decreasing voter stake
+		assignments.sort_by_key(|crate::unsigned::Assignment::<T> { who, .. }| {
+			let stake = cache.get(&who).map(|idx| {
+				let (_, stake, _) = voters[*idx];
+				stake
+			}).unwrap_or_default();
+			sp_std::cmp::Reverse(stake)
+		});
+
+		let mut index_assignments = assignments
+			.into_iter()
+			.map(|assignment| IndexAssignment::new(&assignment, &voter_index, &target_index))
+			.collect::<Result<Vec<_>, _>>()
+			.unwrap();
+
+		let encoded_size_of = |assignments: &[IndexAssignmentOf<T>]| {
+			CompactOf::<T>::try_from(assignments).map(|compact| compact.encoded_size())
+		};
+
+		let desired_size = Percent::from_percent(100 - f.saturated_into::<u8>())
+			.mul_ceil(encoded_size_of(index_assignments.as_slice()).unwrap());
+		log!(trace, "desired_size = {}", desired_size);
+	}: {
+		MultiPhase::<T>::trim_assignments_length(
+			desired_size.saturated_into(),
+			&mut index_assignments,
+			&encoded_size_of,
+		).unwrap();
+	} verify {
+		let compact = CompactOf::<T>::try_from(index_assignments.as_slice()).unwrap();
+		let encoding = compact.encode();
+		log!(trace, "encoded size prediction = {}", encoded_size_of(index_assignments.as_slice()).unwrap());
+		log!(trace, "actual encoded size = {}", encoding.len());
+		assert!(encoding.len() <= desired_size);
+	}
+
 	// This is checking a valid solution. The worse case is indeed a valid solution.
 	feasibility_check {
 		// number of votes in snapshot.
diff --git a/frame/election-provider-multi-phase/src/helpers.rs b/frame/election-provider-multi-phase/src/helpers.rs
index 7894f71800fd..bf5b360499cb 100644
--- a/frame/election-provider-multi-phase/src/helpers.rs
+++ b/frame/election-provider-multi-phase/src/helpers.rs
@@ -62,6 +62,18 @@ pub fn voter_index_fn<T: Config>(
 	}
 }
 
+/// Create a function that returns the index of a voter in the snapshot.
+///
+/// Same as [`voter_index_fn`] but the returned function owns all its necessary data; nothing is
+/// borrowed.
+pub fn voter_index_fn_owned<T: Config>(
+	cache: BTreeMap<T::AccountId, usize>,
+) -> impl Fn(&T::AccountId) -> Option<CompactVoterIndexOf<T>> {
+	move |who| {
+		cache.get(who).and_then(|i| <usize as TryInto<CompactVoterIndexOf<T>>>::try_into(*i).ok())
+	}
+}
+
 /// Same as [`voter_index_fn`], but the returning index is converted into usize, if possible.
 ///
 /// ## Warning
diff --git a/frame/election-provider-multi-phase/src/mock.rs b/frame/election-provider-multi-phase/src/mock.rs
index 79e6e952bfec..f3cf00f2ca0c 100644
--- a/frame/election-provider-multi-phase/src/mock.rs
+++ b/frame/election-provider-multi-phase/src/mock.rs
@@ -17,6 +17,7 @@
 
 use super::*;
 use crate as multi_phase;
+use multi_phase::unsigned::{IndexAssignmentOf, Voter};
 pub use frame_support::{assert_noop, assert_ok};
 use frame_support::{
 	parameter_types,
@@ -41,7 +42,7 @@ use sp_runtime::{
 	traits::{BlakeTwo256, IdentityLookup},
 	PerU16,
 };
-use std::sync::Arc;
+use std::{convert::TryFrom, sync::Arc};
 
 pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;
 pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<AccountId, Call, (), ()>;
@@ -95,6 +96,63 @@ pub fn roll_to_with_ocw(n: u64) {
 	}
 }
 
+pub struct TrimHelpers {
+	pub voters: Vec<Voter<Runtime>>,
+	pub assignments: Vec<IndexAssignmentOf<Runtime>>,
+	pub encoded_size_of:
+		Box<dyn Fn(&[IndexAssignmentOf<Runtime>]) -> Result<usize, sp_npos_elections::Error>>,
+	pub voter_index: Box<
+		dyn Fn(
+			&<Runtime as frame_system::Config>::AccountId,
+		) -> Option<CompactVoterIndexOf<Runtime>>,
+	>,
+}
+
+/// Helpers for setting up trimming tests.
+///
+/// Assignments are pre-sorted in reverse order of stake.
+pub fn trim_helpers() -> TrimHelpers {
+	let RoundSnapshot { voters, targets } = MultiPhase::snapshot().unwrap();
+	let stakes: std::collections::HashMap<_, _> =
+		voters.iter().map(|(id, stake, _)| (*id, *stake)).collect();
+
+	// Compute the size of a compact solution comprised of the selected arguments.
+	//
+	// This function completes in `O(edges)`; it's expensive, but linear.
+	let encoded_size_of = Box::new(|assignments: &[IndexAssignmentOf<Runtime>]| {
+		CompactOf::<Runtime>::try_from(assignments).map(|compact| compact.encoded_size())
+	});
+	let cache = helpers::generate_voter_cache::<Runtime>(&voters);
+	let voter_index = helpers::voter_index_fn_owned::<Runtime>(cache);
+	let target_index = helpers::target_index_fn::<Runtime>(&targets);
+
+	let desired_targets = MultiPhase::desired_targets().unwrap();
+
+	let ElectionResult { mut assignments, .. } = seq_phragmen::<_, CompactAccuracyOf<Runtime>>(
+		desired_targets as usize,
+		targets.clone(),
+		voters.clone(),
+		None,
+	)
+	.unwrap();
+
+	// sort by decreasing order of stake
+	assignments.sort_unstable_by_key(|assignment| {
+		std::cmp::Reverse(stakes.get(&assignment.who).cloned().unwrap_or_default())
+	});
+
+	// convert to IndexAssignment
+	let assignments = assignments
+		.iter()
+		.map(|assignment| {
+			IndexAssignmentOf::<Runtime>::new(assignment, &voter_index, &target_index)
+		})
+		.collect::<Result<Vec<_>, _>>()
+		.expect("test assignments don't contain any voters with too many votes");
+
+	TrimHelpers { voters, assignments, encoded_size_of, voter_index: Box::new(voter_index) }
+}
+
 /// Spit out a verifiable raw solution.
 ///
 /// This is a good example of what an offchain miner would do.
@@ -102,12 +160,6 @@ pub fn raw_solution() -> RawSolution<CompactOf<Runtime>> {
 	let RoundSnapshot { voters, targets } = MultiPhase::snapshot().unwrap();
 	let desired_targets = MultiPhase::desired_targets().unwrap();
 
-	// closures
-	let cache = helpers::generate_voter_cache::<Runtime>(&voters);
-	let voter_index = helpers::voter_index_fn_linear::<Runtime>(&voters);
-	let target_index = helpers::target_index_fn_linear::<Runtime>(&targets);
-	let stake_of = helpers::stake_of_fn::<Runtime>(&voters, &cache);
-
 	let ElectionResult { winners, assignments } = seq_phragmen::<_, CompactAccuracyOf<Runtime>>(
 		desired_targets as usize,
 		targets.clone(),
@@ -116,6 +168,12 @@ pub fn raw_solution() -> RawSolution<CompactOf<Runtime>> {
 	)
 	.unwrap();
 
+	// closures
+	let cache = helpers::generate_voter_cache::<Runtime>(&voters);
+	let voter_index = helpers::voter_index_fn_linear::<Runtime>(&voters);
+	let target_index = helpers::target_index_fn_linear::<Runtime>(&targets);
+	let stake_of = helpers::stake_of_fn::<Runtime>(&voters, &cache);
+
 	let winners = to_without_backing(winners);
 
 	let score = {
@@ -123,7 +181,7 @@ pub fn raw_solution() -> RawSolution<CompactOf<Runtime>> {
 		to_supports(&winners, &staked).unwrap().evaluate()
 	};
 	let compact =
-		<CompactOf<Runtime>>::from_assignment(assignments, &voter_index, &target_index).unwrap();
+		<CompactOf<Runtime>>::from_assignment(&assignments, &voter_index, &target_index).unwrap();
 
 	let round = MultiPhase::round();
 	RawSolution { compact, score, round }
diff --git a/frame/election-provider-multi-phase/src/unsigned.rs b/frame/election-provider-multi-phase/src/unsigned.rs
index 26e51cf58b34..8ab3a81aa3d2 100644
--- a/frame/election-provider-multi-phase/src/unsigned.rs
+++ b/frame/election-provider-multi-phase/src/unsigned.rs
@@ -25,7 +25,7 @@ use sp_npos_elections::{
 	assignment_staked_to_ratio_normalized,
 };
 use sp_runtime::{offchain::storage::StorageValueRef, traits::TrailingZeroInput};
-use sp_std::cmp::Ordering;
+use sp_std::{cmp::Ordering, convert::TryFrom};
 
 /// Storage key used to store the persistent offchain worker status.
 pub(crate) const OFFCHAIN_HEAD_DB: &[u8] = b"parity/multi-phase-unsigned-election";
@@ -34,6 +34,23 @@ pub(crate) const OFFCHAIN_HEAD_DB: &[u8] = b"parity/multi-phase-unsigned-electio
 /// within a window of 5 blocks.
 pub(crate) const OFFCHAIN_REPEAT: u32 = 5;
 
+/// A voter's fundamental data: their ID, their stake, and the list of candidates for whom they
+/// voted.
+pub type Voter<T> = (
+	<T as frame_system::Config>::AccountId,
+	sp_npos_elections::VoteWeight,
+	Vec<<T as frame_system::Config>::AccountId>,
+);
+
+/// The relative distribution of a voter's stake among the winning targets.
+pub type Assignment<T> = sp_npos_elections::Assignment<
+	<T as frame_system::Config>::AccountId,
+	CompactAccuracyOf<T>,
+>;
+
+/// The [`IndexAssignment`][sp_npos_elections::IndexAssignment] type specialized for a particular runtime `T`.
+pub type IndexAssignmentOf<T> = sp_npos_elections::IndexAssignmentOf<CompactOf<T>>;
+
 #[derive(Debug, Eq, PartialEq)]
 pub enum MinerError {
 	/// An internal error in the NPoS elections crate.
@@ -144,7 +161,7 @@ impl<T: Config> Pallet<T> {
 			Self::snapshot().ok_or(MinerError::SnapshotUnAvailable)?;
 		let desired_targets = Self::desired_targets().ok_or(MinerError::SnapshotUnAvailable)?;
 
-		// closures.
+		// now make some helper closures.
 		let cache = helpers::generate_voter_cache::<T>(&voters);
 		let voter_index = helpers::voter_index_fn::<T>(&cache);
 		let target_index = helpers::target_index_fn::<T>(&targets);
@@ -152,41 +169,71 @@ impl<T: Config> Pallet<T> {
 		let target_at = helpers::target_at_fn::<T>(&targets);
 		let stake_of = helpers::stake_of_fn::<T>(&voters, &cache);
 
+		// Compute the size of a compact solution comprised of the selected arguments.
+		//
+		// This function completes in `O(edges)`; it's expensive, but linear.
+		let encoded_size_of = |assignments: &[IndexAssignmentOf<T>]| {
+			CompactOf::<T>::try_from(assignments).map(|compact| compact.encoded_size())
+		};
+
 		let ElectionResult { assignments, winners } = election_result;
 
-		// convert to staked and reduce.
-		let mut staked = assignment_ratio_to_staked_normalized(assignments, &stake_of)
-			.map_err::<MinerError, _>(Into::into)?;
-		sp_npos_elections::reduce(&mut staked);
+		// Reduce (requires round-trip to staked form)
+		let sorted_assignments = {
+			// convert to staked and reduce.
+			let mut staked = assignment_ratio_to_staked_normalized(assignments, &stake_of)?;
+
+			// we reduce before sorting in order to ensure that the reduction process doesn't
+			// accidentally change the sort order
+			sp_npos_elections::reduce(&mut staked);
+
+			// Sort the assignments by reversed voter stake. This ensures that we can efficiently
+			// truncate the list.
+			staked.sort_by_key(
+				|sp_npos_elections::StakedAssignment::<T::AccountId> { who, .. }| {
+					// though staked assignments are expressed in terms of absolute stake, we'd
+					// still need to iterate over all votes in order to actually compute the total
+					// stake. it should be faster to look it up from the cache.
+					let stake = cache
+						.get(who)
+						.map(|idx| {
+							let (_, stake, _) = voters[*idx];
+							stake
+						})
+						.unwrap_or_default();
+					sp_std::cmp::Reverse(stake)
+				},
+			);
+
+			// convert back.
+			assignment_staked_to_ratio_normalized(staked)?
+		};
 
-		// convert back to ration and make compact.
-		let ratio = assignment_staked_to_ratio_normalized(staked)?;
-		let compact = <CompactOf<T>>::from_assignment(ratio, &voter_index, &target_index)?;
+		// convert to `IndexAssignment`. This improves the runtime complexity of repeatedly
+		// converting to `Compact`.
+		let mut index_assignments = sorted_assignments
+			.into_iter()
+			.map(|assignment| IndexAssignmentOf::<T>::new(&assignment, &voter_index, &target_index))
+			.collect::<Result<Vec<_>, _>>()?;
 
+		// trim assignments list for weight and length.
 		let size =
 			SolutionOrSnapshotSize { voters: voters.len() as u32, targets: targets.len() as u32 };
-		let maximum_allowed_voters = Self::maximum_voter_for_weight::<T::WeightInfo>(
+		Self::trim_assignments_weight(
 			desired_targets,
 			size,
 			T::MinerMaxWeight::get(),
+			&mut index_assignments,
 		);
-
-		log!(
-			debug,
-			"initial solution voters = {}, snapshot = {:?}, maximum_allowed(capped) = {}",
-			compact.voter_count(),
-			size,
-			maximum_allowed_voters,
-		);
-
-		// trim length and weight
-		let compact = Self::trim_compact_weight(maximum_allowed_voters, compact, &voter_index)?;
-		let compact = Self::trim_compact_length(
+		Self::trim_assignments_length(
 			T::MinerMaxLength::get(),
-			compact,
-			&voter_index,
+			&mut index_assignments,
+			&encoded_size_of,
 		)?;
 
+		// now make compact.
+		let compact = CompactOf::<T>::try_from(&index_assignments)?;
+
 		// re-calc score.
 		let winners = sp_npos_elections::to_without_backing(winners);
 		let score = compact.clone().score(&winners, stake_of, voter_at, target_at)?;
@@ -212,15 +259,14 @@ impl<T: Config> Pallet<T> {
 		}
 	}
 
-	/// Greedily reduce the size of the a solution to fit into the block, w.r.t. weight.
+	/// Greedily reduce the size of the solution to fit into the block w.r.t. weight.
 	///
 	/// The weight of the solution is foremost a function of the number of voters (i.e.
-	/// `compact.len()`). Aside from this, the other components of the weight are invariant. The
+	/// `assignments.len()`). Aside from this, the other components of the weight are invariant. The
 	/// number of winners shall not be changed (otherwise the solution is invalid) and the
 	/// `ElectionSize` is merely a representation of the total number of stakers.
 	///
-	/// Thus, we reside to stripping away some voters. This means only changing the `compact`
-	/// struct.
+	/// Thus, we reside to stripping away some voters from the `assignments`.
 	///
 	/// Note that the solution is already computed, and the winners are elected based on the merit
 	/// of the entire stake in the system. Nonetheless, some of the voters will be removed further
@@ -228,50 +274,24 @@ impl<T: Config> Pallet<T> {
 	///
 	/// Indeed, the score must be computed **after** this step. If this step reduces the score too
 	/// much or remove a winner, then the solution must be discarded **after** this step.
-	pub fn trim_compact_weight<FN>(
-		maximum_allowed_voters: u32,
-		mut compact: CompactOf<T>,
-		voter_index: FN,
-	) -> Result<CompactOf<T>, MinerError>
-	where
-		for<'r> FN: Fn(&'r T::AccountId) -> Option<CompactVoterIndexOf<T>>,
-	{
-		match compact.voter_count().checked_sub(maximum_allowed_voters as usize) {
-			Some(to_remove) if to_remove > 0 => {
-				// grab all voters and sort them by least stake.
-				let RoundSnapshot { voters, .. } =
-					Self::snapshot().ok_or(MinerError::SnapshotUnAvailable)?;
-				let mut voters_sorted = voters
-					.into_iter()
-					.map(|(who, stake, _)| (who.clone(), stake))
-					.collect::<Vec<_>>();
-				voters_sorted.sort_by_key(|(_, y)| *y);
-
-				// start removing from the least stake. Iterate until we know enough have been
-				// removed.
-				let mut removed = 0;
-				for (maybe_index, _stake) in
-					voters_sorted.iter().map(|(who, stake)| (voter_index(&who), stake))
-				{
-					let index = maybe_index.ok_or(MinerError::SnapshotUnAvailable)?;
-					if compact.remove_voter(index) {
-						removed += 1
-					}
-
-					if removed >= to_remove {
-						break;
-					}
-				}
-
-				log!(debug, "removed {} voter to meet the max weight limit.", to_remove);
-				Ok(compact)
-			}
-			_ => {
-				// nada, return as-is
-				log!(debug, "didn't remove any voter for weight limits.");
-				Ok(compact)
-			}
-		}
+	fn trim_assignments_weight(
+		desired_targets: u32,
+		size: SolutionOrSnapshotSize,
+		max_weight: Weight,
+		assignments: &mut Vec<IndexAssignmentOf<T>>,
+	) {
+		let maximum_allowed_voters = Self::maximum_voter_for_weight::<T::WeightInfo>(
+			desired_targets,
+			size,
+			max_weight,
+		);
+		let removing: usize = assignments.len().saturating_sub(maximum_allowed_voters.saturated_into());
+		log!(
+			debug,
+			"from {} assignments, truncating to {} for weight, removing {}",
+			assignments.len(), maximum_allowed_voters, removing,
+		);
+		assignments.truncate(maximum_allowed_voters as usize);
 	}
 
 	/// Greedily reduce the size of the solution to fit into the block w.r.t length.
@@ -283,39 +303,62 @@ impl<T: Config> Pallet<T> {
 	/// the total stake in the system. Nevertheless, some of the voters may be removed here.
 	///
 	/// Sometimes, removing a voter can cause a validator to also be implicitly removed, if
-	/// that voter was the only backer of that winner. In such cases, this solution is invalid, which
-	/// will be caught prior to submission.
+	/// that voter was the only backer of that winner. In such cases, this solution is invalid,
+	/// which will be caught prior to submission.
 	///
 	/// The score must be computed **after** this step. If this step reduces the score too much,
 	/// then the solution must be discarded.
-	pub fn trim_compact_length(
+	pub(crate) fn trim_assignments_length(
 		max_allowed_length: u32,
-		mut compact: CompactOf<T>,
-		voter_index: impl Fn(&T::AccountId) -> Option<CompactVoterIndexOf<T>>,
-	) -> Result<CompactOf<T>, MinerError> {
-		// short-circuit to avoid getting the voters if possible
-		// this involves a redundant encoding, but that should hopefully be relatively cheap
-		if (compact.encoded_size().saturated_into::<u32>()) <= max_allowed_length {
-			return Ok(compact);
+		assignments: &mut Vec<IndexAssignmentOf<T>>,
+		encoded_size_of: impl Fn(&[IndexAssignmentOf<T>]) -> Result<usize, sp_npos_elections::Error>,
+	) -> Result<(), MinerError> {
+		// Perform a binary search for the max subset of which can fit into the allowed
+		// length. Having discovered that, we can truncate efficiently.
+		let max_allowed_length: usize = max_allowed_length.saturated_into();
+		let mut high = assignments.len();
+		let mut low = 0;
+
+		while high - low > 1 {
+			let test = (high + low) / 2;
+			if encoded_size_of(&assignments[..test])? <= max_allowed_length {
+				low = test;
+			} else {
+				high = test;
+			}
 		}
+		let maximum_allowed_voters =
+			if encoded_size_of(&assignments[..low + 1])? <= max_allowed_length {
+				low + 1
+			} else {
+				low
+			};
+
+		// ensure our postconditions are correct
+		debug_assert!(
+			encoded_size_of(&assignments[..maximum_allowed_voters]).unwrap() <= max_allowed_length
+		);
+		debug_assert!(if maximum_allowed_voters < assignments.len() {
+			encoded_size_of(&assignments[..maximum_allowed_voters + 1]).unwrap()
+				> max_allowed_length
+		} else {
+			true
+		});
 
-		// grab all voters and sort them by least stake.
-		let RoundSnapshot { voters, .. } =
-			Self::snapshot().ok_or(MinerError::SnapshotUnAvailable)?;
-		let mut voters_sorted = voters
-			.into_iter()
-			.map(|(who, stake, _)| (who.clone(), stake))
-			.collect::<Vec<_>>();
-		voters_sorted.sort_by_key(|(_, y)| *y);
-		voters_sorted.reverse();
-
-		while compact.encoded_size() > max_allowed_length.saturated_into() {
-			let (smallest_stake_voter, _) = voters_sorted.pop().ok_or(MinerError::NoMoreVoters)?;
-			let index = voter_index(&smallest_stake_voter).ok_or(MinerError::SnapshotUnAvailable)?;
-			compact.remove_voter(index);
-		}
+		// NOTE: before this point, every access was immutable.
+		// after this point, we never error.
+		// check before edit.
 
-		Ok(compact)
+		log!(
+			debug,
+			"from {} assignments, truncating to {} for length, removing {}",
+			assignments.len(),
+			maximum_allowed_voters,
+			assignments.len().saturating_sub(maximum_allowed_voters),
+		);
+		assignments.truncate(maximum_allowed_voters);
+
+		Ok(())
 	}
 
 	/// Find the maximum `len` that a compact can have in order to fit into the block weight.
@@ -552,16 +595,20 @@ mod max_weight {
 
 #[cfg(test)]
 mod tests {
-	use super::{
-		mock::{Origin, *},
-		Call, *,
+	use super::*;
+	use crate::{
+		mock::{
+			assert_noop, assert_ok, ExtBuilder, Extrinsic, MinerMaxWeight, MultiPhase, Origin,
+			roll_to_with_ocw, roll_to, Runtime, TestCompact, TrimHelpers, trim_helpers, witness,
+		},
 	};
 	use frame_support::{dispatch::Dispatchable, traits::OffchainWorker};
-	use helpers::voter_index_fn_linear;
 	use mock::Call as OuterCall;
-	use frame_election_provider_support::Assignment;
+	use sp_npos_elections::IndexAssignment;
 	use sp_runtime::{traits::ValidateUnsigned, PerU16};
 
+	type Assignment = crate::unsigned::Assignment<Runtime>;
+
 	#[test]
 	fn validate_unsigned_retracts_wrong_phase() {
 		ExtBuilder::default().desired_targets(0).build_and_execute(|| {
@@ -943,88 +990,86 @@ mod tests {
 	}
 
 	#[test]
-	fn trim_compact_length_does_not_modify_when_short_enough() {
+	fn trim_assignments_length_does_not_modify_when_short_enough() {
 		let mut ext = ExtBuilder::default().build();
 		ext.execute_with(|| {
 			roll_to(25);
 
 			// given
-			let RoundSnapshot { voters, ..} = MultiPhase::snapshot().unwrap();
-			let RawSolution { mut compact, .. } = raw_solution();
-			let encoded_len = compact.encode().len() as u32;
+			let TrimHelpers {
+				mut assignments,
+				encoded_size_of,
+				..
+			} = trim_helpers();
+			let compact = CompactOf::<Runtime>::try_from(assignments.as_slice()).unwrap();
+			let encoded_len = compact.encoded_size() as u32;
 			let compact_clone = compact.clone();
 
 			// when
-			assert!(encoded_len < <Runtime as Config>::MinerMaxLength::get());
+			MultiPhase::trim_assignments_length(encoded_len, &mut assignments, encoded_size_of).unwrap();
 
 			// then
-			compact = MultiPhase::trim_compact_length(
-				encoded_len,
-				compact,
-				voter_index_fn_linear::<Runtime>(&voters),
-			).unwrap();
+			let compact = CompactOf::<Runtime>::try_from(assignments.as_slice()).unwrap();
 			assert_eq!(compact, compact_clone);
 		});
 	}
 
 	#[test]
-	fn trim_compact_length_modifies_when_too_long() {
+	fn trim_assignments_length_modifies_when_too_long() {
 		let mut ext = ExtBuilder::default().build();
 		ext.execute_with(|| {
 			roll_to(25);
 
-			let RoundSnapshot { voters, ..} =
-				MultiPhase::snapshot().unwrap();
-
-			let RawSolution { mut compact, .. } = raw_solution();
-			let encoded_len = compact.encoded_size() as u32;
+			// given
+			let TrimHelpers {
+				mut assignments,
+				encoded_size_of,
+				..
+			} = trim_helpers();
+			let compact = CompactOf::<Runtime>::try_from(assignments.as_slice()).unwrap();
+			let encoded_len = compact.encoded_size();
 			let compact_clone = compact.clone();
 
-			compact = MultiPhase::trim_compact_length(
-				encoded_len - 1,
-				compact,
-				voter_index_fn_linear::<Runtime>(&voters),
-			).unwrap();
+			// when
+			MultiPhase::trim_assignments_length(encoded_len as u32 - 1, &mut assignments, encoded_size_of).unwrap();
 
+			// then
+			let compact = CompactOf::<Runtime>::try_from(assignments.as_slice()).unwrap();
 			assert_ne!(compact, compact_clone);
-			assert!((compact.encoded_size() as u32) < encoded_len);
+			assert!(compact.encoded_size() < encoded_len);
 		});
 	}
 
 	#[test]
-	fn trim_compact_length_trims_lowest_stake() {
+	fn trim_assignments_length_trims_lowest_stake() {
 		let mut ext = ExtBuilder::default().build();
 		ext.execute_with(|| {
 			roll_to(25);
 
-			let RoundSnapshot { voters, ..} =
-				MultiPhase::snapshot().unwrap();
-
-			let RawSolution { mut compact, .. } = raw_solution();
+			// given
+			let TrimHelpers {
+				voters,
+				mut assignments,
+				encoded_size_of,
+				voter_index,
+			} = trim_helpers();
+			let compact = CompactOf::<Runtime>::try_from(assignments.as_slice()).unwrap();
 			let encoded_len = compact.encoded_size() as u32;
-			let voter_count = compact.voter_count();
+			let count = assignments.len();
 			let min_stake_voter = voters.iter()
 				.map(|(id, weight, _)| (weight, id))
 				.min()
-				.map(|(_, id)| id)
+				.and_then(|(_, id)| voter_index(id))
 				.unwrap();
 
+			// when
+			MultiPhase::trim_assignments_length(encoded_len - 1, &mut assignments, encoded_size_of).unwrap();
 
-			compact = MultiPhase::trim_compact_length(
-				encoded_len - 1,
-				compact,
-				voter_index_fn_linear::<Runtime>(&voters),
-			).unwrap();
-
-			assert_eq!(compact.voter_count(), voter_count - 1, "we must have removed exactly 1 voter");
-
-			let assignments = compact.into_assignment(
-				|voter| Some(voter as AccountId),
-				|target| Some(target as AccountId),
-			).unwrap();
+			// then
+			assert_eq!(assignments.len(), count - 1, "we must have removed exactly one assignment");
 			assert!(
 				assignments.iter()
-					.all(|Assignment{ who, ..}| who != min_stake_voter),
+					.all(|IndexAssignment{ who, ..}| *who != min_stake_voter),
 				"min_stake_voter must no longer be in the set of voters",
 			);
 		});
diff --git a/primitives/npos-elections/Cargo.toml b/primitives/npos-elections/Cargo.toml
index 79d46743cd75..5bca1e0bb859 100644
--- a/primitives/npos-elections/Cargo.toml
+++ b/primitives/npos-elections/Cargo.toml
@@ -28,6 +28,7 @@ sp-runtime = { version = "3.0.0", path = "../runtime" }
 [features]
 default = ["std"]
 bench = []
+mocks = []
 std = [
 	"codec/std",
 	"serde",
diff --git a/primitives/npos-elections/compact/src/index_assignment.rs b/primitives/npos-elections/compact/src/index_assignment.rs
new file mode 100644
index 000000000000..6aeef1442236
--- /dev/null
+++ b/primitives/npos-elections/compact/src/index_assignment.rs
@@ -0,0 +1,76 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Code generation for getting the compact representation from the `IndexAssignment` type.
+
+use crate::field_name_for;
+use proc_macro2::TokenStream as TokenStream2;
+use quote::quote;
+
+pub(crate) fn from_impl(count: usize) -> TokenStream2 {
+	let from_impl_single = {
+		let name = field_name_for(1);
+		quote!(1 => compact.#name.push(
+			(
+				*who,
+				distribution[0].0,
+			)
+		),)
+	};
+
+	let from_impl_double = {
+		let name = field_name_for(2);
+		quote!(2 => compact.#name.push(
+			(
+				*who,
+				(
+					distribution[0].0,
+					distribution[0].1,
+				),
+				distribution[1].0,
+			)
+		),)
+	};
+
+	let from_impl_rest = (3..=count)
+		.map(|c| {
+			let inner = (0..c - 1)
+				.map(|i| quote!((distribution[#i].0, distribution[#i].1),))
+				.collect::<TokenStream2>();
+
+			let field_name = field_name_for(c);
+			let last_index = c - 1;
+			let last = quote!(distribution[#last_index].0);
+
+			quote!(
+				#c => compact.#field_name.push(
+					(
+						*who,
+						[#inner],
+						#last,
+					)
+				),
+			)
+	})
+		.collect::<TokenStream2>();
+
+	quote!(
+		#from_impl_single
+		#from_impl_double
+		#from_impl_rest
+	)
+}
diff --git a/primitives/npos-elections/compact/src/lib.rs b/primitives/npos-elections/compact/src/lib.rs
index e558ae89ca93..e49518cc25cc 100644
--- a/primitives/npos-elections/compact/src/lib.rs
+++ b/primitives/npos-elections/compact/src/lib.rs
@@ -25,6 +25,7 @@ use syn::parse::{Parse, ParseStream, Result};
 
 mod assignment;
 mod codec;
+mod index_assignment;
 
 // prefix used for struct fields in compact.
 const PREFIX: &'static str = "votes";
@@ -177,6 +178,7 @@ fn struct_def(
 
 	let from_impl = assignment::from_impl(count);
 	let into_impl = assignment::into_impl(count, weight_type.clone());
+	let from_index_impl = index_assignment::from_impl(count);
 
 	Ok(quote! (
 		/// A struct to encode a election assignment in a compact way.
@@ -223,7 +225,7 @@ fn struct_def(
 			}
 
 			fn from_assignment<FV, FT, A>(
-				assignments: _npos::sp_std::prelude::Vec<_npos::Assignment<A, #weight_type>>,
+				assignments: &[_npos::Assignment<A, #weight_type>],
 				index_of_voter: FV,
 				index_of_target: FT,
 			) -> Result<Self, _npos::Error>
@@ -256,6 +258,29 @@ fn struct_def(
 				Ok(assignments)
 			}
 		}
+		type __IndexAssignment = _npos::IndexAssignment<
+			<#ident as _npos::CompactSolution>::Voter,
+			<#ident as _npos::CompactSolution>::Target,
+			<#ident as _npos::CompactSolution>::Accuracy,
+		>;
+		impl<'a> _npos::sp_std::convert::TryFrom<&'a [__IndexAssignment]> for #ident {
+			type Error = _npos::Error;
+			fn try_from(index_assignments: &'a [__IndexAssignment]) -> Result<Self, Self::Error> {
+				let mut compact =  #ident::default();
+
+				for _npos::IndexAssignment { who, distribution } in index_assignments {
+					match distribution.len() {
+						0 => {}
+						#from_index_impl
+						_ => {
+							return Err(_npos::Error::CompactTargetOverflow);
+						}
+					}
+				};
+
+				Ok(compact)
+			}
+		}
 	))
 }
 
diff --git a/primitives/npos-elections/src/assignments.rs b/primitives/npos-elections/src/assignments.rs
new file mode 100644
index 000000000000..aacd01a03069
--- /dev/null
+++ b/primitives/npos-elections/src/assignments.rs
@@ -0,0 +1,208 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Structs and helpers for distributing a voter's stake among various winners.
+
+use crate::{Error, ExtendedBalance, IdentifierT, PerThing128, __OrInvalidIndex};
+use codec::{Encode, Decode};
+use sp_arithmetic::{traits::{Bounded, Zero}, Normalizable, PerThing};
+use sp_core::RuntimeDebug;
+use sp_std::vec::Vec;
+
+/// A voter's stake assignment among a set of targets, represented as ratios.
+#[derive(RuntimeDebug, Clone, Default)]
+#[cfg_attr(feature = "std", derive(PartialEq, Eq, Encode, Decode))]
+pub struct Assignment<AccountId, P: PerThing> {
+	/// Voter's identifier.
+	pub who: AccountId,
+	/// The distribution of the voter's stake.
+	pub distribution: Vec<(AccountId, P)>,
+}
+
+impl<AccountId: IdentifierT, P: PerThing128> Assignment<AccountId, P> {
+	/// Convert from a ratio assignment into one with absolute values aka. [`StakedAssignment`].
+	///
+	/// It needs `stake` which is the total budget of the voter.
+	///
+	/// Note that this might create _un-normalized_ assignments, due to accuracy loss of `P`. Call
+	/// site might compensate by calling `try_normalize()` on the returned `StakedAssignment` as a
+	/// post-precessing.
+	///
+	/// If an edge ratio is [`Bounded::min_value()`], it is dropped. This edge can never mean
+	/// anything useful.
+	pub fn into_staked(self, stake: ExtendedBalance) -> StakedAssignment<AccountId> {
+		let distribution = self
+			.distribution
+			.into_iter()
+			.filter_map(|(target, p)| {
+				// if this ratio is zero, then skip it.
+				if p.is_zero() {
+					None
+				} else {
+					// NOTE: this mul impl will always round to the nearest number, so we might both
+					// overflow and underflow.
+					let distribution_stake = p * stake;
+					Some((target, distribution_stake))
+				}
+			})
+			.collect::<Vec<(AccountId, ExtendedBalance)>>();
+
+		StakedAssignment {
+			who: self.who,
+			distribution,
+		}
+	}
+
+	/// Try and normalize this assignment.
+	///
+	/// If `Ok(())` is returned, then the assignment MUST have been successfully normalized to 100%.
+	///
+	/// ### Errors
+	///
+	/// This will return only if the internal `normalize` fails. This can happen if sum of
+	/// `self.distribution.map(|p| p.deconstruct())` fails to fit inside `UpperOf<P>`. A user of
+	/// this crate may statically assert that this can never happen and safely `expect` this to
+	/// return `Ok`.
+	pub fn try_normalize(&mut self) -> Result<(), &'static str> {
+		self.distribution
+			.iter()
+			.map(|(_, p)| *p)
+			.collect::<Vec<_>>()
+			.normalize(P::one())
+			.map(|normalized_ratios|
+				self.distribution
+					.iter_mut()
+					.zip(normalized_ratios)
+					.for_each(|((_, old), corrected)| { *old = corrected; })
+			)
+	}
+}
+
+/// A voter's stake assignment among a set of targets, represented as absolute values in the scale
+/// of [`ExtendedBalance`].
+#[derive(RuntimeDebug, Clone, Default)]
+#[cfg_attr(feature = "std", derive(PartialEq, Eq, Encode, Decode))]
+pub struct StakedAssignment<AccountId> {
+	/// Voter's identifier
+	pub who: AccountId,
+	/// The distribution of the voter's stake.
+	pub distribution: Vec<(AccountId, ExtendedBalance)>,
+}
+
+impl<AccountId> StakedAssignment<AccountId> {
+	/// Converts self into the normal [`Assignment`] type.
+	///
+	/// NOTE: This will always round down, and thus the results might be less than a full 100% `P`.
+	/// Use a normalization post-processing to fix this. The data type returned here will
+	/// potentially get used to create a compact type; a compact type requires sum of ratios to be
+	/// less than 100% upon un-compacting.
+	///
+	/// If an edge stake is so small that it cannot be represented in `T`, it is ignored. This edge
+	/// can never be re-created and does not mean anything useful anymore.
+	pub fn into_assignment<P: PerThing>(self) -> Assignment<AccountId, P>
+	where
+		AccountId: IdentifierT,
+	{
+		let stake = self.total();
+		let distribution = self.distribution
+			.into_iter()
+			.filter_map(|(target, w)| {
+				let per_thing = P::from_rational(w, stake);
+				if per_thing == Bounded::min_value() {
+					None
+				} else {
+					Some((target, per_thing))
+				}
+			})
+			.collect::<Vec<(AccountId, P)>>();
+
+		Assignment {
+			who: self.who,
+			distribution,
+		}
+	}
+
+	/// Try and normalize this assignment.
+	///
+	/// If `Ok(())` is returned, then the assignment MUST have been successfully normalized to
+	/// `stake`.
+	///
+	/// NOTE: current implementation of `.normalize` is almost safe to `expect()` upon. The only
+	/// error case is when the input cannot fit in `T`, or the sum of input cannot fit in `T`.
+	/// Sadly, both of these are dependent upon the implementation of `VoteLimit`, i.e. the limit of
+	/// edges per voter which is enforced from upstream. Hence, at this crate, we prefer returning a
+	/// result and a use the name prefix `try_`.
+	pub fn try_normalize(&mut self, stake: ExtendedBalance) -> Result<(), &'static str> {
+		self.distribution
+			.iter()
+			.map(|(_, ref weight)| *weight)
+			.collect::<Vec<_>>()
+			.normalize(stake)
+			.map(|normalized_weights|
+				self.distribution
+					.iter_mut()
+					.zip(normalized_weights.into_iter())
+					.for_each(|((_, weight), corrected)| { *weight = corrected; })
+			)
+	}
+
+	/// Get the total stake of this assignment (aka voter budget).
+	pub fn total(&self) -> ExtendedBalance {
+		self.distribution.iter().fold(Zero::zero(), |a, b| a.saturating_add(b.1))
+	}
+}
+/// The [`IndexAssignment`] type is an intermediate between the assignments list
+/// ([`&[Assignment<T>]`][Assignment]) and `CompactOf<T>`.
+///
+/// The voter and target identifiers have already been replaced with appropriate indices,
+/// making it fast to repeatedly encode into a `CompactOf<T>`. This property turns out
+/// to be important when trimming for compact length.
+#[derive(RuntimeDebug, Clone, Default)]
+#[cfg_attr(feature = "std", derive(PartialEq, Eq, Encode, Decode))]
+pub struct IndexAssignment<VoterIndex, TargetIndex, P: PerThing> {
+	/// Index of the voter among the voters list.
+	pub who: VoterIndex,
+	/// The distribution of the voter's stake among winning targets.
+	///
+	/// Targets are identified by their index in the canonical list.
+	pub distribution: Vec<(TargetIndex, P)>,
+}
+
+impl<VoterIndex, TargetIndex, P: PerThing> IndexAssignment<VoterIndex, TargetIndex, P> {
+	pub fn new<AccountId: IdentifierT>(
+		assignment: &Assignment<AccountId, P>,
+		voter_index: impl Fn(&AccountId) -> Option<VoterIndex>,
+		target_index: impl Fn(&AccountId) -> Option<TargetIndex>,
+	) -> Result<Self, Error> {
+		Ok(Self {
+			who: voter_index(&assignment.who).or_invalid_index()?,
+			distribution: assignment
+				.distribution
+				.iter()
+				.map(|(target, proportion)| Some((target_index(target)?, proportion.clone())))
+				.collect::<Option<Vec<_>>>()
+				.or_invalid_index()?,
+		})
+	}
+}
+
+/// A type alias for [`IndexAssignment`] made from [`crate::CompactSolution`].
+pub type IndexAssignmentOf<C> = IndexAssignment<
+	<C as crate::CompactSolution>::Voter,
+	<C as crate::CompactSolution>::Target,
+	<C as crate::CompactSolution>::Accuracy,
+>;
diff --git a/primitives/npos-elections/src/helpers.rs b/primitives/npos-elections/src/helpers.rs
index 091efdd36ea5..9fdf76118f89 100644
--- a/primitives/npos-elections/src/helpers.rs
+++ b/primitives/npos-elections/src/helpers.rs
@@ -72,10 +72,9 @@ pub fn assignment_staked_to_ratio_normalized<A: IdentifierT, P: PerThing128>(
 	staked: Vec<StakedAssignment<A>>,
 ) -> Result<Vec<Assignment<A, P>>, Error> {
 	let mut ratio = staked.into_iter().map(|a| a.into_assignment()).collect::<Vec<_>>();
-	ratio
-		.iter_mut()
-		.map(|a| a.try_normalize().map_err(|err| Error::ArithmeticError(err)))
-		.collect::<Result<_, _>>()?;
+	for assignment in ratio.iter_mut() {
+		assignment.try_normalize().map_err(|err| Error::ArithmeticError(err))?;
+	}
 	Ok(ratio)
 }
 
diff --git a/primitives/npos-elections/src/lib.rs b/primitives/npos-elections/src/lib.rs
index 05505d06f201..c1cf41a40f2b 100644
--- a/primitives/npos-elections/src/lib.rs
+++ b/primitives/npos-elections/src/lib.rs
@@ -99,6 +99,7 @@ mod mock;
 #[cfg(test)]
 mod tests;
 
+mod assignments;
 pub mod phragmen;
 pub mod balancing;
 pub mod phragmms;
@@ -107,6 +108,7 @@ pub mod reduce;
 pub mod helpers;
 pub mod pjr;
 
+pub use assignments::{Assignment, IndexAssignment, StakedAssignment, IndexAssignmentOf};
 pub use reduce::reduce;
 pub use helpers::*;
 pub use phragmen::*;
@@ -139,7 +141,10 @@ impl<T> __OrInvalidIndex<T> for Option<T> {
 /// A common interface for all compact solutions.
 ///
 /// See [`sp-npos-elections-compact`] for more info.
-pub trait CompactSolution: Sized {
+pub trait CompactSolution
+where
+	Self: Sized + for<'a> sp_std::convert::TryFrom<&'a [IndexAssignmentOf<Self>], Error = Error>,
+{
 	/// The maximum number of votes that are allowed.
 	const LIMIT: usize;
 
@@ -164,9 +169,9 @@ pub trait CompactSolution: Sized {
 	/// The weight/accuracy type of each vote.
 	type Accuracy: PerThing128;
 
-	/// Build self from a `assignments: Vec<Assignment<A, Self::Accuracy>>`.
+	/// Build self from a list of assignments.
 	fn from_assignment<FV, FT, A>(
-		assignments: Vec<Assignment<A, Self::Accuracy>>,
+		assignments: &[Assignment<A, Self::Accuracy>],
 		voter_index: FV,
 		target_index: FT,
 	) -> Result<Self, Error>
@@ -455,149 +460,6 @@ pub struct ElectionResult<AccountId, P: PerThing> {
 	pub assignments: Vec<Assignment<AccountId, P>>,
 }
 
-/// A voter's stake assignment among a set of targets, represented as ratios.
-#[derive(RuntimeDebug, Clone, Default)]
-#[cfg_attr(feature = "std", derive(PartialEq, Eq, Encode, Decode))]
-pub struct Assignment<AccountId, P: PerThing> {
-	/// Voter's identifier.
-	pub who: AccountId,
-	/// The distribution of the voter's stake.
-	pub distribution: Vec<(AccountId, P)>,
-}
-
-impl<AccountId: IdentifierT, P: PerThing128> Assignment<AccountId, P> {
-	/// Convert from a ratio assignment into one with absolute values aka. [`StakedAssignment`].
-	///
-	/// It needs `stake` which is the total budget of the voter.
-	///
-	/// Note that this might create _un-normalized_ assignments, due to accuracy loss of `P`. Call
-	/// site might compensate by calling `try_normalize()` on the returned `StakedAssignment` as a
-	/// post-precessing.
-	///
-	/// If an edge ratio is [`Bounded::min_value()`], it is dropped. This edge can never mean
-	/// anything useful.
-	pub fn into_staked(self, stake: ExtendedBalance) -> StakedAssignment<AccountId> {
-		let distribution = self
-			.distribution
-			.into_iter()
-			.filter_map(|(target, p)| {
-				// if this ratio is zero, then skip it.
-				if p.is_zero() {
-					None
-				} else {
-					// NOTE: this mul impl will always round to the nearest number, so we might both
-					// overflow and underflow.
-					let distribution_stake = p * stake;
-					Some((target, distribution_stake))
-				}
-			})
-			.collect::<Vec<(AccountId, ExtendedBalance)>>();
-
-		StakedAssignment {
-			who: self.who,
-			distribution,
-		}
-	}
-
-	/// Try and normalize this assignment.
-	///
-	/// If `Ok(())` is returned, then the assignment MUST have been successfully normalized to 100%.
-	///
-	/// ### Errors
-	///
-	/// This will return only if the internal `normalize` fails. This can happen if sum of
-	/// `self.distribution.map(|p| p.deconstruct())` fails to fit inside `UpperOf<P>`. A user of
-	/// this crate may statically assert that this can never happen and safely `expect` this to
-	/// return `Ok`.
-	pub fn try_normalize(&mut self) -> Result<(), &'static str> {
-		self.distribution
-			.iter()
-			.map(|(_, p)| *p)
-			.collect::<Vec<_>>()
-			.normalize(P::one())
-			.map(|normalized_ratios|
-				self.distribution
-					.iter_mut()
-					.zip(normalized_ratios)
-					.for_each(|((_, old), corrected)| { *old = corrected; })
-			)
-	}
-}
-
-/// A voter's stake assignment among a set of targets, represented as absolute values in the scale
-/// of [`ExtendedBalance`].
-#[derive(RuntimeDebug, Clone, Default)]
-#[cfg_attr(feature = "std", derive(PartialEq, Eq, Encode, Decode))]
-pub struct StakedAssignment<AccountId> {
-	/// Voter's identifier
-	pub who: AccountId,
-	/// The distribution of the voter's stake.
-	pub distribution: Vec<(AccountId, ExtendedBalance)>,
-}
-
-impl<AccountId> StakedAssignment<AccountId> {
-	/// Converts self into the normal [`Assignment`] type.
-	///
-	/// NOTE: This will always round down, and thus the results might be less than a full 100% `P`.
-	/// Use a normalization post-processing to fix this. The data type returned here will
-	/// potentially get used to create a compact type; a compact type requires sum of ratios to be
-	/// less than 100% upon un-compacting.
-	///
-	/// If an edge stake is so small that it cannot be represented in `T`, it is ignored. This edge
-	/// can never be re-created and does not mean anything useful anymore.
-	pub fn into_assignment<P: PerThing>(self) -> Assignment<AccountId, P>
-	where
-		AccountId: IdentifierT,
-	{
-		let stake = self.total();
-		let distribution = self.distribution
-			.into_iter()
-			.filter_map(|(target, w)| {
-				let per_thing = P::from_rational(w, stake);
-				if per_thing == Bounded::min_value() {
-					None
-				} else {
-					Some((target, per_thing))
-				}
-			})
-			.collect::<Vec<(AccountId, P)>>();
-
-		Assignment {
-			who: self.who,
-			distribution,
-		}
-	}
-
-	/// Try and normalize this assignment.
-	///
-	/// If `Ok(())` is returned, then the assignment MUST have been successfully normalized to
-	/// `stake`.
-	///
-	/// NOTE: current implementation of `.normalize` is almost safe to `expect()` upon. The only
-	/// error case is when the input cannot fit in `T`, or the sum of input cannot fit in `T`.
-	/// Sadly, both of these are dependent upon the implementation of `VoteLimit`, i.e. the limit of
-	/// edges per voter which is enforced from upstream. Hence, at this crate, we prefer returning a
-	/// result and a use the name prefix `try_`.
-	pub fn try_normalize(&mut self, stake: ExtendedBalance) -> Result<(), &'static str> {
-		self.distribution
-			.iter()
-			.map(|(_, ref weight)| *weight)
-			.collect::<Vec<_>>()
-			.normalize(stake)
-			.map(|normalized_weights|
-				self.distribution
-					.iter_mut()
-					.zip(normalized_weights.into_iter())
-					.for_each(|((_, weight), corrected)| { *weight = corrected; })
-			)
-	}
-
-	/// Get the total stake of this assignment (aka voter budget).
-	pub fn total(&self) -> ExtendedBalance {
-		self.distribution.iter().fold(Zero::zero(), |a, b| a.saturating_add(b.1))
-	}
-}
-
 /// A structure to demonstrate the election result from the perspective of the candidate, i.e. how
 /// much support each candidate is receiving.
 ///
diff --git a/primitives/npos-elections/src/mock.rs b/primitives/npos-elections/src/mock.rs
index 14e4139c5d32..363550ed8efc 100644
--- a/primitives/npos-elections/src/mock.rs
+++ b/primitives/npos-elections/src/mock.rs
@@ -17,9 +17,15 @@
 
 //! Mock file for npos-elections.
 
-#![cfg(test)]
+#![cfg(any(test, mocks))]
 
-use crate::*;
+use std::{
+	collections::{HashSet, HashMap},
+	convert::TryInto,
+	hash::Hash,
+};
+
+use rand::{self, Rng, seq::SliceRandom};
 use sp_arithmetic::{
 	traits::{One, SaturatedConversion, Zero},
 	PerThing,
@@ -27,6 +33,24 @@ use sp_arithmetic::{
 use sp_runtime::assert_eq_error_rate;
 use sp_std::collections::btree_map::BTreeMap;
 
+use crate::{Assignment, ElectionResult, ExtendedBalance, PerThing128, VoteWeight, seq_phragmen};
+
+sp_npos_elections_compact::generate_solution_type!(
+	#[compact]
+	pub struct Compact::<VoterIndex = u32, TargetIndex = u16, Accuracy = Accuracy>(16)
+);
+
+pub type AccountId = u64;
+/// The candidate mask allows easy disambiguation between voters and candidates: accounts
+/// for which this bit is set are candidates, and without it, are voters.
+pub const CANDIDATE_MASK: AccountId = 1 << ((std::mem::size_of::<AccountId>() * 8) - 1);
+pub type CandidateId = AccountId;
+
+pub type Accuracy = sp_runtime::Perbill;
+
+pub type MockAssignment = crate::Assignment<AccountId, Accuracy>;
+pub type Voter = (AccountId, VoteWeight, Vec<AccountId>);
+
 #[derive(Default, Debug)]
 pub(crate) struct _Candidate<A> {
 	who: A,
@@ -60,8 +84,6 @@ pub(crate) struct _Support<A> {
 pub(crate) type _Assignment<A> = (A, f64);
 pub(crate) type _SupportMap<A> = BTreeMap<A, _Support<A>>;
 
-pub(crate) type AccountId = u64;
-
 #[derive(Debug, Clone)]
 pub(crate) struct _ElectionResult<A: Clone> {
 	pub winners: Vec<(A, ExtendedBalance)>,
@@ -72,14 +94,13 @@ pub(crate) fn auto_generate_self_voters<A: Clone>(candidates: &[A]) -> Vec<(A, V
 	candidates.iter().map(|c| (c.clone(), vec![c.clone()])).collect()
 }
 
-pub(crate) fn elect_float<A, FS>(
+pub(crate) fn elect_float<A>(
 	candidate_count: usize,
 	initial_candidates: Vec<A>,
 	initial_voters: Vec<(A, Vec<A>)>,
-	stake_of: FS,
+	stake_of: impl Fn(&A) -> VoteWeight,
 ) -> Option<_ElectionResult<A>> where
 	A: Default + Ord + Copy,
-	for<'r> FS: Fn(&'r A) -> VoteWeight,
 {
 	let mut elected_candidates: Vec<(A, ExtendedBalance)>;
 	let mut assigned: Vec<(A, Vec<_Assignment<A>>)>;
@@ -299,16 +320,15 @@ pub(crate) fn do_equalize_float<A>(
 
 
 pub(crate) fn create_stake_of(stakes: &[(AccountId, VoteWeight)])
-	-> Box<dyn Fn(&AccountId) -> VoteWeight>
+	-> impl Fn(&AccountId) -> VoteWeight
 {
 	let mut storage = BTreeMap::<AccountId, VoteWeight>::new();
 	stakes.iter().for_each(|s| { storage.insert(s.0, s.1); });
-	let stake_of = move |who: &AccountId| -> VoteWeight { storage.get(who).unwrap().to_owned() };
-	Box::new(stake_of)
+	move |who: &AccountId| -> VoteWeight { storage.get(who).unwrap().to_owned() }
 }
 
 
-pub fn check_assignments_sum<T: PerThing>(assignments: Vec<Assignment<AccountId, T>>) {
+pub fn check_assignments_sum<T: PerThing>(assignments: &[Assignment<AccountId, T>]) {
 	for Assignment { distribution, .. } in assignments {
 		let mut sum: u128 = Zero::zero();
 		distribution.iter().for_each(|(_, p)| sum += p.deconstruct().saturated_into::<u128>());
@@ -316,12 +336,16 @@ pub fn check_assignments_sum<T: PerThing>(assignments: Vec<Assignment<AccountId,
 	}
 }
 
-pub(crate) fn run_and_compare<Output: PerThing128>(
+pub(crate) fn run_and_compare<Output: PerThing128, FS>(
 	candidates: Vec<AccountId>,
 	voters: Vec<(AccountId, Vec<AccountId>)>,
-	stake_of: &Box<dyn Fn(&AccountId) -> VoteWeight>,
+	stake_of: FS,
 	to_elect: usize,
-) {
+)
+where
+	Output: PerThing128,
+	FS: Fn(&AccountId) -> VoteWeight,
+{
 	// run fixed point code.
 	let ElectionResult { winners, assignments } = seq_phragmen::<_, Output>(
 		to_elect,
@@ -340,10 +364,10 @@ pub(crate) fn run_and_compare<Output: PerThing128>(
 
 	assert_eq!(winners.iter().map(|(x, _)| x).collect::<Vec<_>>(), truth_value.winners.iter().map(|(x, _)| x).collect::<Vec<_>>());
 
-	for Assignment { who, distribution } in assignments.clone() {
-		if let Some(float_assignments) = truth_value.assignments.iter().find(|x| x.0 == who) {
+	for Assignment { who, distribution } in assignments.iter() {
+		if let Some(float_assignments) = truth_value.assignments.iter().find(|x| x.0 == *who) {
 			for (candidate, per_thingy) in distribution {
-				if let Some(float_assignment) = float_assignments.1.iter().find(|x| x.0 == candidate ) {
+				if let Some(float_assignment) = float_assignments.1.iter().find(|x| x.0 == *candidate ) {
 					assert_eq_error_rate!(
 						Output::from_float(float_assignment.1).deconstruct(),
 						per_thingy.deconstruct(),
@@ -362,15 +386,13 @@ pub(crate) fn run_and_compare<Output: PerThing128>(
 		}
 	}
 
-	check_assignments_sum(assignments);
+	check_assignments_sum(&assignments);
 }
 
-pub(crate) fn build_support_map_float<FS>(
+pub(crate) fn build_support_map_float(
 	result: &mut _ElectionResult<AccountId>,
-	stake_of: FS,
-) -> _SupportMap<AccountId>
-	where for<'r> FS: Fn(&'r AccountId) -> VoteWeight
-{
+	stake_of: impl Fn(&AccountId) -> VoteWeight,
+) -> _SupportMap<AccountId> {
 	let mut supports = <_SupportMap<AccountId>>::new();
 	result.winners
 		.iter()
@@ -393,3 +415,124 @@ pub(crate) fn build_support_map_float<FS>(
 	}
 	supports
 }
+
+/// Generate voter and assignment lists. Makes no attempt to be realistic about winner or assignment fairness.
+///
+/// Maintains these invariants:
+///
+/// - candidate ids have `CANDIDATE_MASK` bit set
+/// - voter ids do not have `CANDIDATE_MASK` bit set
+/// - assignments have the same ordering as voters
+/// - `assignments.distribution.iter().map(|(_, frac)| frac).sum() == One::one()`
+/// - a coherent set of winners is chosen.
+/// - the winner set is a subset of the candidate set.
+/// - `assignments.distribution.iter().all(|(who, _)| winners.contains(who))`
+pub fn generate_random_votes(
+	candidate_count: usize,
+	voter_count: usize,
+	mut rng: impl Rng,
+) -> (Vec<Voter>, Vec<MockAssignment>, Vec<CandidateId>) {
+	// cache for fast generation of unique candidate and voter ids
+	let mut used_ids = HashSet::with_capacity(candidate_count + voter_count);
+
+	// candidates are easy: just a completely random set of IDs
+	let mut candidates: Vec<AccountId> = Vec::with_capacity(candidate_count);
+	while candidates.len() < candidate_count {
+		let mut new = || rng.gen::<AccountId>() | CANDIDATE_MASK;
+		let mut id = new();
+		// insert returns `false` when the value was already present
+		while !used_ids.insert(id) {
+			id = new();
+		}
+		candidates.push(id);
+	}
+
+	// voters are random ids, random weights, random selection from the candidates
+	let mut voters = Vec::with_capacity(voter_count);
+	while voters.len() < voter_count {
+		let mut new = || rng.gen::<AccountId>() & !CANDIDATE_MASK;
+		let mut id = new();
+		// insert returns `false` when the value was already present
+		while !used_ids.insert(id) {
+			id = new();
+		}
+
+		let vote_weight = rng.gen();
+
+		// it's not interesting if a voter chooses 0 or all candidates, so rule those cases out.
+		// also, let's not generate any cases which result in a compact overflow.
+		let n_candidates_chosen = rng.gen_range(1, candidates.len().min(16));
+
+		let mut chosen_candidates = Vec::with_capacity(n_candidates_chosen);
+		chosen_candidates.extend(candidates.choose_multiple(&mut rng, n_candidates_chosen));
+		voters.push((id, vote_weight, chosen_candidates));
+	}
+
+	// always generate a sensible number of winners: elections are uninteresting if nobody wins,
+	// or everybody wins
+	let num_winners = rng.gen_range(1, candidate_count);
+	let mut winners: HashSet<AccountId> = HashSet::with_capacity(num_winners);
+	winners.extend(candidates.choose_multiple(&mut rng, num_winners));
+	assert_eq!(winners.len(), num_winners);
+
+	let mut assignments = Vec::with_capacity(voters.len());
+	for (voter_id, _, votes) in voters.iter() {
+		let chosen_winners = votes.iter().filter(|vote| winners.contains(vote)).cloned();
+		let num_chosen_winners = chosen_winners.clone().count();
+
+		// distribute the available stake randomly
+		let stake_distribution = if num_chosen_winners == 0 {
+			Vec::new()
+		} else {
+			let mut available_stake = 1000;
+			let mut stake_distribution = Vec::with_capacity(num_chosen_winners);
+			for _ in 0..num_chosen_winners - 1 {
+				let stake = rng.gen_range(0, available_stake);
+				stake_distribution.push(Accuracy::from_perthousand(stake));
+				available_stake -= stake;
+			}
+			stake_distribution.push(Accuracy::from_perthousand(available_stake));
+			stake_distribution.shuffle(&mut rng);
+			stake_distribution
+		};
+
+		assignments.push(MockAssignment {
+			who: *voter_id,
+			distribution: chosen_winners.zip(stake_distribution).collect(),
+		});
+	}
+
+	(voters, assignments, candidates)
+}
+
+fn generate_cache<Voters, Item>(voters: Voters) -> HashMap<Item, usize>
+where
+	Voters: Iterator<Item = Item>,
+	Item: Hash + Eq + Copy,
+{
+	let mut cache = HashMap::new();
+	for (idx, voter_id) in voters.enumerate() {
+		cache.insert(voter_id, idx);
+	}
+	cache
+}
+
+/// Create a function that returns the index of a voter in the voters list.
+pub fn make_voter_fn<VoterIndex>(voters: &[Voter]) -> impl Fn(&AccountId) -> Option<VoterIndex>
+where
+	usize: TryInto<VoterIndex>,
+{
+	let cache = generate_cache(voters.iter().map(|(id, _, _)| *id));
+	move |who| cache.get(who).cloned().and_then(|i| i.try_into().ok())
+}
+
+/// Create a function that returns the index of a candidate in the candidates list.
+pub fn make_target_fn<TargetIndex>(
+	candidates: &[CandidateId],
+) -> impl Fn(&CandidateId) -> Option<TargetIndex>
+where
+	usize: TryInto<TargetIndex>,
+{
+	let cache = generate_cache(candidates.iter().cloned());
+	move |who| cache.get(who).cloned().and_then(|i| i.try_into().ok())
+}
diff --git a/primitives/npos-elections/src/tests.rs b/primitives/npos-elections/src/tests.rs
index 6304e50ec586..06505721fd23 100644
--- a/primitives/npos-elections/src/tests.rs
+++ b/primitives/npos-elections/src/tests.rs
@@ -19,11 +19,13 @@
 
 use crate::{
 	balancing, helpers::*, is_score_better, mock::*, seq_phragmen, seq_phragmen_core, setup_inputs,
-	to_support_map, to_supports, Assignment, ElectionResult, ExtendedBalance, StakedAssignment,
-	Support, Voter, EvaluateSupport,
+	to_support_map, to_supports, Assignment, CompactSolution, ElectionResult, ExtendedBalance,
+	IndexAssignment, StakedAssignment, Support, Voter, EvaluateSupport,
 };
+use rand::{self, SeedableRng};
 use sp_arithmetic::{PerU16, Perbill, Percent, Permill};
 use substrate_test_utils::assert_eq_uvec;
+use std::convert::TryInto;
 
 #[test]
 fn float_phragmen_poc_works() {
@@ -423,10 +425,10 @@ fn phragmen_poc_2_works() {
 		(4, 500),
 	]);
 
-	run_and_compare::<Perbill>(candidates.clone(), voters.clone(), &stake_of, 2);
-	run_and_compare::<Permill>(candidates.clone(), voters.clone(), &stake_of, 2);
-	run_and_compare::<Percent>(candidates.clone(), voters.clone(), &stake_of, 2);
-	run_and_compare::<PerU16>(candidates, voters, &stake_of, 2);
+	run_and_compare::<Perbill, _>(candidates.clone(), voters.clone(), &stake_of, 2);
+	run_and_compare::<Permill, _>(candidates.clone(), voters.clone(), &stake_of, 2);
+	run_and_compare::<Percent, _>(candidates.clone(), voters.clone(), &stake_of, 2);
+	run_and_compare::<PerU16, _>(candidates, voters, &stake_of, 2);
 }
 
 #[test]
@@ -444,10 +446,10 @@ fn phragmen_poc_3_works() {
 		(4, 1000),
 	]);
 
-	run_and_compare::<Perbill>(candidates.clone(), voters.clone(), &stake_of, 2);
-	run_and_compare::<Permill>(candidates.clone(), voters.clone(), &stake_of, 2);
-	run_and_compare::<Percent>(candidates.clone(), voters.clone(), &stake_of, 2);
-	run_and_compare::<PerU16>(candidates, voters, &stake_of, 2);
+	run_and_compare::<Perbill, _>(candidates.clone(), voters.clone(), &stake_of, 2);
+	run_and_compare::<Permill, _>(candidates.clone(), voters.clone(), &stake_of, 2);
+	run_and_compare::<Percent, _>(candidates.clone(), voters.clone(), &stake_of, 2);
+	run_and_compare::<PerU16, _>(candidates, voters, &stake_of, 2);
 }
 
 #[test]
@@ -475,7 +477,7 @@ fn phragmen_accuracy_on_large_scale_only_candidates() {
 
 	assert_eq_uvec!(winners, vec![(1, 18446744073709551614u128), (5, 18446744073709551613u128)]);
 	assert_eq!(assignments.len(), 2);
-	check_assignments_sum(assignments);
+	check_assignments_sum(&assignments);
 }
 
 #[test]
@@ -527,7 +529,7 @@ fn phragmen_accuracy_on_large_scale_voters_and_candidates() {
 		]
 	);
 
-	check_assignments_sum(assignments);
+	check_assignments_sum(&assignments);
 }
 
 #[test]
@@ -549,7 +551,7 @@ fn phragmen_accuracy_on_small_scale_self_vote() {
 	).unwrap();
 
 	assert_eq_uvec!(winners, vec![(20, 2), (10, 1), (30, 1)]);
-	check_assignments_sum(assignments);
+	check_assignments_sum(&assignments);
 }
 
 #[test]
@@ -580,7 +582,7 @@ fn phragmen_accuracy_on_small_scale_no_self_vote() {
 	).unwrap();
 
 	assert_eq_uvec!(winners, vec![(20, 2), (10, 1), (30, 1)]);
-	check_assignments_sum(assignments);
+	check_assignments_sum(&assignments);
 
 }
 
@@ -615,7 +617,7 @@ fn phragmen_large_scale_test() {
 	).unwrap();
 
 	assert_eq_uvec!(to_without_backing(winners.clone()), vec![24, 22]);
-	check_assignments_sum(assignments);
+	check_assignments_sum(&assignments);
 }
 
 #[test]
@@ -663,7 +665,7 @@ fn phragmen_large_scale_test_2() {
 		],
 	);
 
-	check_assignments_sum(assignments);
+	check_assignments_sum(&assignments);
 }
 
 #[test]
@@ -696,7 +698,7 @@ fn phragmen_linear_equalize() {
 		(130, 1000),
 	]);
 
-	run_and_compare::<Perbill>(candidates, voters, &stake_of, 2);
+	run_and_compare::<Perbill, _>(candidates, voters, &stake_of, 2);
 }
 
 #[test]
@@ -1355,7 +1357,7 @@ mod solution_type {
 		};
 
 		let compacted = TestSolutionCompact::from_assignment(
-			assignments.clone(),
+			&assignments,
 			voter_index,
 			target_index,
 		).unwrap();
@@ -1518,7 +1520,7 @@ mod solution_type {
 		];
 
 		let compacted = TestSolutionCompact::from_assignment(
-			assignments.clone(),
+			&assignments,
 			voter_index,
 			target_index,
 		);
@@ -1549,7 +1551,7 @@ mod solution_type {
 		};
 
 		let compacted = TestSolutionCompact::from_assignment(
-			assignments.clone(),
+			&assignments,
 			voter_index,
 			target_index,
 		).unwrap();
@@ -1564,3 +1566,24 @@ mod solution_type {
 		);
 	}
 }
+
+#[test]
+fn index_assignments_generate_same_compact_as_plain_assignments() {
+	let rng = rand::rngs::SmallRng::seed_from_u64(0);
+
+	let (voters, assignments, candidates) = generate_random_votes(1000, 2500, rng);
+	let voter_index = make_voter_fn(&voters);
+	let target_index = make_target_fn(&candidates);
+
+	let compact = Compact::from_assignment(&assignments, &voter_index, &target_index).unwrap();
+
+	let index_assignments = assignments
+		.into_iter()
+		.map(|assignment| IndexAssignment::new(&assignment, &voter_index, &target_index))
+		.collect::<Result<Vec<_>, _>>()
+		.unwrap();
+
+	let index_compact = index_assignments.as_slice().try_into().unwrap();
+
+	assert_eq!(compact, index_compact);
+}

From 57402708ebbf17de587fecba3db525d7c66707c3 Mon Sep 17 00:00:00 2001
From: Lohann Paterno Coutinho Ferreira <developer@lohann.dev>
Date: Mon, 3 May 2021 04:53:09 -0300
Subject: [PATCH 0687/1194] Remove Offence delay (#8414)

* Removed can_report api from OnOffenceHandler

* Removed DeferredOffences and create a storage migration

* Removed missing comments

* Mock set_deferred_offences and deferred_offences methods

* OnOffenceHandler::on_offence always succeed

* Fix benchmark tests

* Fix runtime-benchmark cfg methods

* Removed 'applied' attribute from Offence event

* refactor deprecated deferred offences getter

* Validate if offences are submited after on_runtime_upgrade

* update changelog

* Remove empty lines

* Fix remove_deferred_storage weights

* Remove Offence::on_runtime_upgrade benchmark

* Revert CHANGELOG.md update

* Deprecate DeferredOffenceOf type

* Update copyright

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Add migration logs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Fix migration log

* Remove unused import

* Add migration tests

* rustfmt

* use generate_storage_alias! macro

* Refactor should_resubmit_deferred_offences test

* Replace spaces by tabs

* Refactor should_resubmit_deferred_offences test

* Removed WeightSoftLimit

* Removed WeightSoftLimit from tests and mocks

* Remove unused imports

* Apply suggestions from code review

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
---
 bin/node/runtime/src/lib.rs             |   6 --
 frame/babe/src/mock.rs                  |   7 --
 frame/grandpa/src/mock.rs               |   6 --
 frame/offences/benchmarking/src/lib.rs  |  48 +----------
 frame/offences/benchmarking/src/mock.rs |   7 +-
 frame/offences/src/lib.rs               |  96 +++-------------------
 frame/offences/src/migration.rs         |  99 +++++++++++++++++++++++
 frame/offences/src/mock.rs              |  33 ++------
 frame/offences/src/tests.rs             | 103 +-----------------------
 frame/staking/src/lib.rs                |  17 +---
 frame/staking/src/mock.rs               |   4 +-
 frame/staking/src/tests.rs              |   6 +-
 primitives/staking/src/offence.rs       |  14 +---
 13 files changed, 132 insertions(+), 314 deletions(-)
 create mode 100644 frame/offences/src/migration.rs

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 2eaea18f2a62..498593e57a1f 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -896,16 +896,10 @@ impl pallet_im_online::Config for Runtime {
 	type WeightInfo = pallet_im_online::weights::SubstrateWeight<Runtime>;
 }
 
-parameter_types! {
-	pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) *
-		RuntimeBlockWeights::get().max_block;
-}
-
 impl pallet_offences::Config for Runtime {
 	type Event = Event;
 	type IdentificationTuple = pallet_session::historical::IdentificationTuple<Self>;
 	type OnOffenceHandler = Staking;
-	type WeightSoftLimit = OffencesWeightSoftLimit;
 }
 
 impl pallet_authority_discovery::Config for Runtime {}
diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index d01a67f40396..40ee782e721d 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -29,7 +29,6 @@ use frame_system::InitKind;
 use frame_support::{
 	parameter_types,
 	traits::{KeyOwnerProofSystem, OnInitialize},
-	weights::Weight,
 };
 use sp_io;
 use sp_core::{H256, U256, crypto::{IsWrappedBy, KeyTypeId, Pair}};
@@ -215,16 +214,10 @@ impl pallet_staking::Config for Test {
 	type WeightInfo = ();
 }
 
-parameter_types! {
-	pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60)
-		* BlockWeights::get().max_block;
-}
-
 impl pallet_offences::Config for Test {
 	type Event = Event;
 	type IdentificationTuple = pallet_session::historical::IdentificationTuple<Self>;
 	type OnOffenceHandler = Staking;
-	type WeightSoftLimit = OffencesWeightSoftLimit;
 }
 
 parameter_types! {
diff --git a/frame/grandpa/src/mock.rs b/frame/grandpa/src/mock.rs
index b13c431dc5b9..e26020b60034 100644
--- a/frame/grandpa/src/mock.rs
+++ b/frame/grandpa/src/mock.rs
@@ -25,7 +25,6 @@ use codec::Encode;
 use frame_support::{
 	parameter_types,
 	traits::{KeyOwnerProofSystem, OnFinalize, OnInitialize},
-	weights::Weight,
 };
 use pallet_staking::EraIndex;
 use sp_core::{crypto::KeyTypeId, H256};
@@ -221,15 +220,10 @@ impl pallet_staking::Config for Test {
 	type WeightInfo = ();
 }
 
-parameter_types! {
-	pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * BlockWeights::get().max_block;
-}
-
 impl pallet_offences::Config for Test {
 	type Event = Event;
 	type IdentificationTuple = pallet_session::historical::IdentificationTuple<Self>;
 	type OnOffenceHandler = Staking;
-	type WeightSoftLimit = OffencesWeightSoftLimit;
 }
 
 parameter_types! {
diff --git a/frame/offences/benchmarking/src/lib.rs b/frame/offences/benchmarking/src/lib.rs
index 08517a4ac8df..4e5160c6673f 100644
--- a/frame/offences/benchmarking/src/lib.rs
+++ b/frame/offences/benchmarking/src/lib.rs
@@ -26,13 +26,13 @@ use sp_std::vec;
 
 use frame_system::{RawOrigin, Pallet as System, Config as SystemConfig};
 use frame_benchmarking::{benchmarks, account, impl_benchmark_test_suite};
-use frame_support::traits::{Currency, OnInitialize, ValidatorSet, ValidatorSetWithIdentification};
+use frame_support::traits::{Currency, ValidatorSet, ValidatorSetWithIdentification};
 
 use sp_runtime::{
 	Perbill,
 	traits::{Convert, StaticLookup, Saturating, UniqueSaturatedInto},
 };
-use sp_staking::offence::{ReportOffence, Offence, OffenceDetails};
+use sp_staking::offence::{ReportOffence, Offence};
 
 use pallet_balances::Config as BalancesConfig;
 use pallet_babe::BabeEquivocationOffence;
@@ -51,7 +51,6 @@ const SEED: u32 = 0;
 const MAX_REPORTERS: u32 = 100;
 const MAX_OFFENDERS: u32 = 100;
 const MAX_NOMINATORS: u32 = 100;
-const MAX_DEFERRED_OFFENCES: u32 = 100;
 
 pub struct Pallet<T: Config>(Offences<T>);
 
@@ -271,8 +270,6 @@ benchmarks! {
 		);
 	}
 	verify {
-		// make sure the report was not deferred
-		assert!(Offences::<T>::deferred_offences().is_empty());
 		let bond_amount: u32 = UniqueSaturatedInto::<u32>::unique_saturated_into(bond_amount::<T>());
 		let slash_amount = slash_fraction * bond_amount;
 		let reward_amount = slash_amount * (1 + n) / 2;
@@ -306,7 +303,6 @@ benchmarks! {
 					pallet_offences::Event::Offence(
 						UnresponsivenessOffence::<T>::ID,
 						0_u32.to_le_bytes().to_vec(),
-						true
 					)
 				).into()))
 		);
@@ -336,8 +332,6 @@ benchmarks! {
 		let _ = Offences::<T>::report_offence(reporters, offence);
 	}
 	verify {
-		// make sure the report was not deferred
-		assert!(Offences::<T>::deferred_offences().is_empty());
 		// make sure that all slashes have been applied
 		assert_eq!(
 			System::<T>::event_count(), 0
@@ -372,8 +366,6 @@ benchmarks! {
 		let _ = Offences::<T>::report_offence(reporters, offence);
 	}
 	verify {
-		// make sure the report was not deferred
-		assert!(Offences::<T>::deferred_offences().is_empty());
 		// make sure that all slashes have been applied
 		assert_eq!(
 			System::<T>::event_count(), 0
@@ -383,42 +375,6 @@ benchmarks! {
 			+ n // nominators slashed
 		);
 	}
-
-	on_initialize {
-		let d in 1 .. MAX_DEFERRED_OFFENCES;
-		let o = 10;
-		let n = 100;
-
-		let mut deferred_offences = vec![];
-		let offenders = make_offenders::<T>(o, n)?.0;
-		let offence_details = offenders.into_iter()
-			.map(|offender| OffenceDetails {
-				offender: T::convert(offender),
-				reporters: vec![],
-			})
-			.collect::<Vec<_>>();
-
-		for i in 0 .. d {
-			let fractions = offence_details.iter()
-				.map(|_| Perbill::from_percent(100 * (i + 1) / MAX_DEFERRED_OFFENCES))
-				.collect::<Vec<_>>();
-			deferred_offences.push((offence_details.clone(), fractions.clone(), 0u32));
-		}
-
-		Offences::<T>::set_deferred_offences(deferred_offences);
-		assert!(!Offences::<T>::deferred_offences().is_empty());
-	}: {
-		Offences::<T>::on_initialize(0u32.into());
-	}
-	verify {
-		// make sure that all deferred offences were reported with Ok status.
-		assert!(Offences::<T>::deferred_offences().is_empty());
-		assert_eq!(
-			System::<T>::event_count(), d * (0
-			+ o // offenders slashed
-			+ o * n // nominators slashed
-		));
-	}
 }
 
 impl_benchmark_test_suite!(
diff --git a/frame/offences/benchmarking/src/mock.rs b/frame/offences/benchmarking/src/mock.rs
index a0a09e0fbb89..9047120923ad 100644
--- a/frame/offences/benchmarking/src/mock.rs
+++ b/frame/offences/benchmarking/src/mock.rs
@@ -22,7 +22,7 @@
 use super::*;
 use frame_support::{
 	parameter_types,
-	weights::{Weight, constants::WEIGHT_PER_SECOND},
+	weights::constants::WEIGHT_PER_SECOND,
 };
 use frame_system as system;
 use sp_runtime::{
@@ -189,15 +189,10 @@ impl pallet_im_online::Config for Test {
 	type WeightInfo = ();
 }
 
-parameter_types! {
-	pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * BlockWeights::get().max_block;
-}
-
 impl pallet_offences::Config for Test {
 	type Event = Event;
 	type IdentificationTuple = pallet_session::historical::IdentificationTuple<Self>;
 	type OnOffenceHandler = Staking;
-	type WeightSoftLimit = OffencesWeightSoftLimit;
 }
 
 impl<T> frame_system::offchain::SendTransactionTypes<T> for Test where Call: From<T> {
diff --git a/frame/offences/src/lib.rs b/frame/offences/src/lib.rs
index 2765c0aaa0ea..cd25ca1ef1dc 100644
--- a/frame/offences/src/lib.rs
+++ b/frame/offences/src/lib.rs
@@ -24,12 +24,13 @@
 
 mod mock;
 mod tests;
+mod migration;
 
 use sp_std::vec::Vec;
 use frame_support::{
-	decl_module, decl_event, decl_storage, Parameter, traits::Get, weights::Weight,
+	decl_module, decl_event, decl_storage, Parameter, weights::Weight,
 };
-use sp_runtime::{traits::{Hash, Zero}, Perbill};
+use sp_runtime::{traits::Hash, Perbill};
 use sp_staking::{
 	SessionIndex,
 	offence::{Offence, ReportOffence, Kind, OnOffenceHandler, OffenceDetails, OffenceError},
@@ -42,13 +43,6 @@ type OpaqueTimeSlot = Vec<u8>;
 /// A type alias for a report identifier.
 type ReportIdOf<T> = <T as frame_system::Config>::Hash;
 
-/// Type of data stored as a deferred offence
-pub type DeferredOffenceOf<T> = (
-	Vec<OffenceDetails<<T as frame_system::Config>::AccountId, <T as Config>::IdentificationTuple>>,
-	Vec<Perbill>,
-	SessionIndex,
-);
-
 pub trait WeightInfo {
 	fn report_offence_im_online(r: u32, o: u32, n: u32, ) -> Weight;
 	fn report_offence_grandpa(r: u32, n: u32, ) -> Weight;
@@ -71,10 +65,6 @@ pub trait Config: frame_system::Config {
 	type IdentificationTuple: Parameter + Ord;
 	/// A handler called for every offence report.
 	type OnOffenceHandler: OnOffenceHandler<Self::AccountId, Self::IdentificationTuple, Weight>;
-	/// The a soft limit on maximum weight that may be consumed while dispatching deferred offences in
-	/// `on_initialize`.
-	/// Note it's going to be exceeded before we stop adding to it, so it has to be set conservatively.
-	type WeightSoftLimit: Get<Weight>;
 }
 
 decl_storage! {
@@ -84,10 +74,6 @@ decl_storage! {
 			map hasher(twox_64_concat) ReportIdOf<T>
 			=> Option<OffenceDetails<T::AccountId, T::IdentificationTuple>>;
 
-		/// Deferred reports that have been rejected by the offence handler and need to be submitted
-		/// at a later time.
-		DeferredOffences get(fn deferred_offences): Vec<DeferredOffenceOf<T>>;
-
 		/// A vector of reports of the same kind that happened at the same time slot.
 		ConcurrentReportsIndex:
 			double_map hasher(twox_64_concat) Kind, hasher(twox_64_concat) OpaqueTimeSlot
@@ -106,10 +92,9 @@ decl_storage! {
 decl_event!(
 	pub enum Event {
 		/// There is an offence reported of the given `kind` happened at the `session_index` and
-		/// (kind-specific) time slot. This event is not deposited for duplicate slashes. last
-		/// element indicates of the offence was applied (true) or queued (false)
-		/// \[kind, timeslot, applied\].
-		Offence(Kind, OpaqueTimeSlot, bool),
+		/// (kind-specific) time slot. This event is not deposited for duplicate slashes.
+		/// \[kind, timeslot\].
+		Offence(Kind, OpaqueTimeSlot),
 	}
 );
 
@@ -117,42 +102,8 @@ decl_module! {
 	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		fn deposit_event() = default;
 
-		fn on_initialize(now: T::BlockNumber) -> Weight {
-			// only decode storage if we can actually submit anything again.
-			if !T::OnOffenceHandler::can_report() {
-				return 0;
-			}
-
-			let limit = T::WeightSoftLimit::get();
-			let mut consumed = Weight::zero();
-
-			<DeferredOffences<T>>::mutate(|deferred| {
-				deferred.retain(|(offences, perbill, session)| {
-					if consumed >= limit {
-						true
-					} else {
-						// keep those that fail to be reported again. An error log is emitted here; this
-						// should not happen if staking's `can_report` is implemented properly.
-						match T::OnOffenceHandler::on_offence(&offences, &perbill, *session) {
-							Ok(weight) => {
-								consumed += weight;
-								false
-							},
-							Err(_) => {
-								log::error!(
-									target: "runtime::offences",
-									"re-submitting a deferred slash returned Err at {:?}. \
-									 This should not happen with pallet-staking",
-									now,
-								);
-								true
-							},
-						}
-					}
-				})
-			});
-
-			consumed
+		fn on_runtime_upgrade() -> Weight {
+			migration::remove_deferred_storage::<T>()
 		}
 	}
 }
@@ -187,14 +138,14 @@ where
 		let slash_perbill: Vec<_> = (0..concurrent_offenders.len())
 			.map(|_| new_fraction.clone()).collect();
 
-		let applied = Self::report_or_store_offence(
+		T::OnOffenceHandler::on_offence(
 			&concurrent_offenders,
 			&slash_perbill,
 			offence.session_index(),
 		);
 
 		// Deposit the event.
-		Self::deposit_event(Event::Offence(O::ID, time_slot.encode(), applied));
+		Self::deposit_event(Event::Offence(O::ID, time_slot.encode()));
 
 		Ok(())
 	}
@@ -210,28 +161,6 @@ where
 }
 
 impl<T: Config> Module<T> {
-	/// Tries (without checking) to report an offence. Stores them in [`DeferredOffences`] in case
-	/// it fails. Returns false in case it has to store the offence.
-	fn report_or_store_offence(
-		concurrent_offenders: &[OffenceDetails<T::AccountId, T::IdentificationTuple>],
-		slash_perbill: &[Perbill],
-		session_index: SessionIndex,
-	) -> bool {
-		match T::OnOffenceHandler::on_offence(
-			&concurrent_offenders,
-			&slash_perbill,
-			session_index,
-		) {
-			Ok(_) => true,
-			Err(_) => {
-				<DeferredOffences<T>>::mutate(|d|
-					d.push((concurrent_offenders.to_vec(), slash_perbill.to_vec(), session_index))
-				);
-				false
-			}
-		}
-	}
-
 	/// Compute the ID for the given report properties.
 	///
 	/// The report id depends on the offence kind, time slot and the id of offender.
@@ -285,11 +214,6 @@ impl<T: Config> Module<T> {
 			None
 		}
 	}
-
-	#[cfg(feature = "runtime-benchmarks")]
-	pub fn set_deferred_offences(offences: Vec<DeferredOffenceOf<T>>) {
-		<DeferredOffences<T>>::put(offences);
-	}
 }
 
 struct TriageOutcome<T: Config> {
diff --git a/frame/offences/src/migration.rs b/frame/offences/src/migration.rs
new file mode 100644
index 000000000000..ce8a125e7e1a
--- /dev/null
+++ b/frame/offences/src/migration.rs
@@ -0,0 +1,99 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use super::{Config, OffenceDetails, Perbill, SessionIndex};
+use frame_support::{traits::Get, weights::Weight, generate_storage_alias};
+use sp_staking::offence::OnOffenceHandler;
+use sp_std::vec::Vec;
+
+/// Type of data stored as a deferred offence
+type DeferredOffenceOf<T> = (
+	Vec<
+		OffenceDetails<
+			<T as frame_system::Config>::AccountId,
+			<T as Config>::IdentificationTuple,
+		>,
+	>,
+	Vec<Perbill>,
+	SessionIndex,
+);
+
+// Deferred reports that have been rejected by the offence handler and need to be submitted
+// at a later time.
+generate_storage_alias!(
+	Offences,
+	DeferredOffences<T: Config> => Value<Vec<DeferredOffenceOf<T>>>
+);
+
+pub fn remove_deferred_storage<T: Config>() -> Weight {
+	let mut weight = T::DbWeight::get().reads_writes(1, 1);
+	let deferred = <DeferredOffences<T>>::take();
+	log::info!(target: "runtime::offences", "have {} deferred offences, applying.", deferred.len());
+	for (offences, perbill, session) in deferred.iter() {
+		let consumed = T::OnOffenceHandler::on_offence(&offences, &perbill, *session);
+		weight = weight.saturating_add(consumed);
+	}
+
+	weight
+}
+
+#[cfg(test)]
+mod test {
+	use super::*;
+	use crate::mock::{new_test_ext, with_on_offence_fractions, Offences, Runtime as T};
+	use frame_support::traits::OnRuntimeUpgrade;
+	use sp_runtime::Perbill;
+	use sp_staking::offence::OffenceDetails;
+
+	#[test]
+	fn should_resubmit_deferred_offences() {
+		new_test_ext().execute_with(|| {
+			// given
+			assert_eq!(<DeferredOffences<T>>::get().len(), 0);
+			with_on_offence_fractions(|f| {
+				assert_eq!(f.clone(), vec![]);
+			});
+
+			let offence_details = OffenceDetails::<
+				<T as frame_system::Config>::AccountId,
+				<T as Config>::IdentificationTuple,
+			> {
+				offender: 5,
+				reporters: vec![],
+			};
+
+			// push deferred offence
+			<DeferredOffences<T>>::append((
+				vec![offence_details],
+				vec![Perbill::from_percent(5 + 1 * 100 / 5)],
+				1,
+			));
+
+			// when
+			assert_eq!(
+				Offences::on_runtime_upgrade(),
+				<T as frame_system::Config>::DbWeight::get().reads_writes(1, 2),
+			);
+
+			// then
+			assert!(!<DeferredOffences<T>>::exists());
+			with_on_offence_fractions(|f| {
+				assert_eq!(f.clone(), vec![Perbill::from_percent(5 + 1 * 100 / 5)]);
+			});
+		})
+	}
+}
diff --git a/frame/offences/src/mock.rs b/frame/offences/src/mock.rs
index 52dd55207af0..4176a54d9ece 100644
--- a/frame/offences/src/mock.rs
+++ b/frame/offences/src/mock.rs
@@ -40,7 +40,6 @@ pub struct OnOffenceHandler;
 
 thread_local! {
 	pub static ON_OFFENCE_PERBILL: RefCell<Vec<Perbill>> = RefCell::new(Default::default());
-	pub static CAN_REPORT: RefCell<bool> = RefCell::new(true);
 	pub static OFFENCE_WEIGHT: RefCell<Weight> = RefCell::new(Default::default());
 }
 
@@ -51,37 +50,21 @@ impl<Reporter, Offender>
 		_offenders: &[OffenceDetails<Reporter, Offender>],
 		slash_fraction: &[Perbill],
 		_offence_session: SessionIndex,
-	) -> Result<Weight, ()> {
-		if <Self as offence::OnOffenceHandler<Reporter, Offender, Weight>>::can_report() {
-			ON_OFFENCE_PERBILL.with(|f| {
-				*f.borrow_mut() = slash_fraction.to_vec();
-			});
-
-			Ok(OFFENCE_WEIGHT.with(|w| *w.borrow()))
-		} else {
-			Err(())
-		}
-	}
+	) -> Weight {
+		ON_OFFENCE_PERBILL.with(|f| {
+			*f.borrow_mut() = slash_fraction.to_vec();
+		});
 
-	fn can_report() -> bool {
-		CAN_REPORT.with(|c| *c.borrow())
+		OFFENCE_WEIGHT.with(|w| *w.borrow())
 	}
 }
 
-pub fn set_can_report(can_report: bool) {
-	CAN_REPORT.with(|c| *c.borrow_mut() = can_report);
-}
-
 pub fn with_on_offence_fractions<R, F: FnOnce(&mut Vec<Perbill>) -> R>(f: F) -> R {
 	ON_OFFENCE_PERBILL.with(|fractions| {
 		f(&mut *fractions.borrow_mut())
 	})
 }
 
-pub fn set_offence_weight(new: Weight) {
-	OFFENCE_WEIGHT.with(|w| *w.borrow_mut() = new);
-}
-
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
@@ -127,16 +110,10 @@ impl frame_system::Config for Runtime {
 	type OnSetCode = ();
 }
 
-parameter_types! {
-	pub OffencesWeightSoftLimit: Weight =
-		Perbill::from_percent(60) * BlockWeights::get().max_block;
-}
-
 impl Config for Runtime {
 	type Event = Event;
 	type IdentificationTuple = u64;
 	type OnOffenceHandler = OnOffenceHandler;
-	type WeightSoftLimit = OffencesWeightSoftLimit;
 }
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
diff --git a/frame/offences/src/tests.rs b/frame/offences/src/tests.rs
index 2b7c500dfa2d..f7bd90fe93e6 100644
--- a/frame/offences/src/tests.rs
+++ b/frame/offences/src/tests.rs
@@ -22,10 +22,9 @@
 use super::*;
 use crate::mock::{
 	Offences, System, Offence, Event, KIND, new_test_ext, with_on_offence_fractions,
-	offence_reports, set_can_report, set_offence_weight,
+	offence_reports,
 };
 use sp_runtime::Perbill;
-use frame_support::traits::OnInitialize;
 use frame_system::{EventRecord, Phase};
 
 #[test]
@@ -132,7 +131,7 @@ fn should_deposit_event() {
 			System::events(),
 			vec![EventRecord {
 				phase: Phase::Initialization,
-				event: Event::offences(crate::Event::Offence(KIND, time_slot.encode(), true)),
+				event: Event::offences(crate::Event::Offence(KIND, time_slot.encode())),
 				topics: vec![],
 			}]
 		);
@@ -167,7 +166,7 @@ fn doesnt_deposit_event_for_dups() {
 			System::events(),
 			vec![EventRecord {
 				phase: Phase::Initialization,
-				event: Event::offences(crate::Event::Offence(KIND, time_slot.encode(), true)),
+				event: Event::offences(crate::Event::Offence(KIND, time_slot.encode())),
 				topics: vec![],
 			}]
 		);
@@ -285,99 +284,3 @@ fn should_properly_count_offences() {
 		);
 	});
 }
-
-#[test]
-fn should_queue_and_resubmit_rejected_offence() {
-	new_test_ext().execute_with(|| {
-		set_can_report(false);
-
-		// will get deferred
-		let offence = Offence {
-			validator_set_count: 5,
-			time_slot: 42,
-			offenders: vec![5],
-		};
-		Offences::report_offence(vec![], offence).unwrap();
-		assert_eq!(Offences::deferred_offences().len(), 1);
-		// event also indicates unapplied.
-		assert_eq!(
-			System::events(),
-			vec![EventRecord {
-				phase: Phase::Initialization,
-				event: Event::offences(crate::Event::Offence(KIND, 42u128.encode(), false)),
-				topics: vec![],
-			}]
-		);
-
-		// will not dequeue
-		Offences::on_initialize(2);
-
-		// again
-		let offence = Offence {
-			validator_set_count: 5,
-			time_slot: 62,
-			offenders: vec![5],
-		};
-		Offences::report_offence(vec![], offence).unwrap();
-		assert_eq!(Offences::deferred_offences().len(), 2);
-
-		set_can_report(true);
-
-		// can be submitted
-		let offence = Offence {
-			validator_set_count: 5,
-			time_slot: 72,
-			offenders: vec![5],
-		};
-		Offences::report_offence(vec![], offence).unwrap();
-		assert_eq!(Offences::deferred_offences().len(), 2);
-
-		Offences::on_initialize(3);
-		assert_eq!(Offences::deferred_offences().len(), 0);
-	})
-}
-
-#[test]
-fn weight_soft_limit_is_used() {
-	new_test_ext().execute_with(|| {
-		set_can_report(false);
-		// Only 2 can fit in one block
-		set_offence_weight(<mock::Runtime as Config>::WeightSoftLimit::get() / 2);
-
-		// Queue 3 offences
-		// #1
-		let offence = Offence {
-			validator_set_count: 5,
-			time_slot: 42,
-			offenders: vec![5],
-		};
-		Offences::report_offence(vec![], offence).unwrap();
-		// #2
-		let offence = Offence {
-			validator_set_count: 5,
-			time_slot: 62,
-			offenders: vec![5],
-		};
-		Offences::report_offence(vec![], offence).unwrap();
-		// #3
-		let offence = Offence {
-			validator_set_count: 5,
-			time_slot: 72,
-			offenders: vec![5],
-		};
-		Offences::report_offence(vec![], offence).unwrap();
-		// 3 are queued
-		assert_eq!(Offences::deferred_offences().len(), 3);
-
-		// Allow reporting
-		set_can_report(true);
-
-		Offences::on_initialize(3);
-		// Two are completed, one is left in the queue
-		assert_eq!(Offences::deferred_offences().len(), 1);
-
-		Offences::on_initialize(4);
-		// All are done now
-		assert_eq!(Offences::deferred_offences().len(), 0);
-	})
-}
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index b1d6ba6bd9cf..67726f69228f 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -2765,11 +2765,7 @@ where
 		>],
 		slash_fraction: &[Perbill],
 		slash_session: SessionIndex,
-	) -> Result<Weight, ()> {
-		if !Self::can_report() {
-			return Err(());
-		}
-
+	) -> Weight {
 		let reward_proportion = SlashRewardFraction::get();
 		let mut consumed_weight: Weight = 0;
 		let mut add_db_reads_writes = |reads, writes| {
@@ -2781,7 +2777,7 @@ where
 			add_db_reads_writes(1, 0);
 			if active_era.is_none() {
 				// this offence need not be re-submitted.
-				return Ok(consumed_weight)
+				return consumed_weight
 			}
 			active_era.expect("value checked not to be `None`; qed").index
 		};
@@ -2806,7 +2802,7 @@ where
 			match eras.iter().rev().filter(|&&(_, ref sesh)| sesh <= &slash_session).next() {
 				Some(&(ref slash_era, _)) => *slash_era,
 				// before bonding period. defensive - should be filtered out.
-				None => return Ok(consumed_weight),
+				None => return consumed_weight,
 			}
 		};
 
@@ -2874,12 +2870,7 @@ where
 			}
 		}
 
-		Ok(consumed_weight)
-	}
-
-	fn can_report() -> bool {
-		// TODO: https://github.com/paritytech/substrate/issues/8343
-		true
+		consumed_weight
 	}
 }
 
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index c8556a806a41..4027ac1f670b 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -715,7 +715,7 @@ pub(crate) fn on_offence_in_era(
 	let bonded_eras = crate::BondedEras::get();
 	for &(bonded_era, start_session) in bonded_eras.iter() {
 		if bonded_era == era {
-			let _ = Staking::on_offence(offenders, slash_fraction, start_session).unwrap();
+			let _ = Staking::on_offence(offenders, slash_fraction, start_session);
 			return;
 		} else if bonded_era > era {
 			break;
@@ -728,7 +728,7 @@ pub(crate) fn on_offence_in_era(
 				offenders,
 				slash_fraction,
 				Staking::eras_start_session_index(era).unwrap()
-			).unwrap();
+			);
 	} else {
 		panic!("cannot slash in era {}", era);
 	}
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index 634504ccb687..ec5a61d46885 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -3510,7 +3510,7 @@ fn offences_weight_calculated_correctly() {
 	ExtBuilder::default().nominate(true).build_and_execute(|| {
 		// On offence with zero offenders: 4 Reads, 1 Write
 		let zero_offence_weight = <Test as frame_system::Config>::DbWeight::get().reads_writes(4, 1);
-		assert_eq!(Staking::on_offence(&[], &[Perbill::from_percent(50)], 0), Ok(zero_offence_weight));
+		assert_eq!(Staking::on_offence(&[], &[Perbill::from_percent(50)], 0), zero_offence_weight);
 
 		// On Offence with N offenders, Unapplied: 4 Reads, 1 Write + 4 Reads, 5 Writes
 		let n_offence_unapplied_weight = <Test as frame_system::Config>::DbWeight::get().reads_writes(4, 1)
@@ -3523,7 +3523,7 @@ fn offences_weight_calculated_correctly() {
 					reporters: vec![],
 				}
 			).collect();
-		assert_eq!(Staking::on_offence(&offenders, &[Perbill::from_percent(50)], 0), Ok(n_offence_unapplied_weight));
+		assert_eq!(Staking::on_offence(&offenders, &[Perbill::from_percent(50)], 0), n_offence_unapplied_weight);
 
 		// On Offence with one offenders, Applied
 		let one_offender = [
@@ -3544,7 +3544,7 @@ fn offences_weight_calculated_correctly() {
 			// `reward_cost` * reporters (1)
 			+ <Test as frame_system::Config>::DbWeight::get().reads_writes(2, 2);
 
-		assert_eq!(Staking::on_offence(&one_offender, &[Perbill::from_percent(50)], 0), Ok(one_offence_unapplied_weight));
+		assert_eq!(Staking::on_offence(&one_offender, &[Perbill::from_percent(50)], 0), one_offence_unapplied_weight);
 	});
 }
 
diff --git a/primitives/staking/src/offence.rs b/primitives/staking/src/offence.rs
index 0212d1bd8f2f..ab72ecda042c 100644
--- a/primitives/staking/src/offence.rs
+++ b/primitives/staking/src/offence.rs
@@ -159,13 +159,7 @@ pub trait OnOffenceHandler<Reporter, Offender, Res> {
 		offenders: &[OffenceDetails<Reporter, Offender>],
 		slash_fraction: &[Perbill],
 		session: SessionIndex,
-	) -> Result<Res, ()>;
-
-	/// Can an offence be reported now or not. This is an method to short-circuit a call into
-	/// `on_offence`. Ideally, a correct implementation should return `false` if `on_offence` will
-	/// return `Err`. Nonetheless, this is up to the implementation and this trait cannot guarantee
-	/// it.
-	fn can_report() -> bool;
+	) -> Res;
 }
 
 impl<Reporter, Offender, Res: Default> OnOffenceHandler<Reporter, Offender, Res> for () {
@@ -173,11 +167,9 @@ impl<Reporter, Offender, Res: Default> OnOffenceHandler<Reporter, Offender, Res>
 		_offenders: &[OffenceDetails<Reporter, Offender>],
 		_slash_fraction: &[Perbill],
 		_session: SessionIndex,
-	) -> Result<Res, ()> {
-		Ok(Default::default())
+	) -> Res {
+		Default::default()
 	}
-
-	fn can_report() -> bool { true }
 }
 
 /// A details about an offending authority for a particular kind of offence.

From bd8c1cae434dd6050833555e14967e3cd936e004 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Mon, 3 May 2021 10:57:25 +0200
Subject: [PATCH 0688/1194] make custom on runtime upgrade prior to pallet ones
 (#8687)

---
 frame/executive/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index bc2783f76b5d..36ad11360fd3 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -206,10 +206,10 @@ where
 	/// Execute all `OnRuntimeUpgrade` of this runtime, and return the aggregate weight.
 	pub fn execute_on_runtime_upgrade() -> frame_support::weights::Weight {
 		let mut weight = 0;
+		weight = weight.saturating_add(COnRuntimeUpgrade::on_runtime_upgrade());
 		weight = weight.saturating_add(
 			<frame_system::Pallet<System> as OnRuntimeUpgrade>::on_runtime_upgrade(),
 		);
-		weight = weight.saturating_add(COnRuntimeUpgrade::on_runtime_upgrade());
 		weight = weight.saturating_add(<AllPallets as OnRuntimeUpgrade>::on_runtime_upgrade());
 
 		weight

From 92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941 Mon Sep 17 00:00:00 2001
From: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
Date: Mon, 3 May 2021 12:49:04 +0200
Subject: [PATCH 0689/1194] Multi-phase elections solution resubmission (#8290)

* not climate

* explain the intent of the bool in the unsigned phase

* remove glob imports from unsigned.rs

* add OffchainRepeat parameter to ElectionProviderMultiPhase

* migrate core logic from #7976

This is a much smaller diff than that PR contained, but I think
it contains all the essentials.

* improve formatting

* fix test build failures

* cause test to pass

* Apply suggestions from code review

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* collapse imports

* threshold acquired directly within try_acquire_offchain_lock

* add test of resubmission after interval

* add test that ocw can regenerate a failed cache when resubmitting

* ensure that OCW solutions are of the correct round

This should help prevent stale cached solutions from persisting
past the election for which they are intended.

* add test of pre-dispatch round check

* use `RawSolution.round` instead of redundantly externally

* unpack imports

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* rename `OFFCHAIN_HEAD_DB` -> `OFFCHAIN_LOCK`

* rename `mine_call` -> `mine_checked_call`

* eliminate extraneous comma

* check cached call is current before submitting

* remove unused consts introduced by bad merge.

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* resubmit when our solution beats queued solution

* clear call cache if solution fails to submit

* use local storage; clear on ElectionFinalized

* Revert "use local storage; clear on ElectionFinalized"

This reverts commit 4b46a9388532d0c09b337dc7c7edf76044a6cee8.

* BROKEN: try to filter local events in OCW

* use local storage; simplify score fetching

* fix event filter

* mutate storage instead of setting it

* StorageValueRef::local isn't actually implemented yet

* add logging for some events of interest in OCW miner

* rename kill_solution -> kill_ocw_solution to avoid ambiguity

* defensive err instead of unreachable given unreachable code

* doc punctuation

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* distinguish miner errors between "out of date" and "call invalid"

* downgrade info logs -> debug

* ensure encoded call decodes as a call

* fix semantics of validation of pre-dispatch failure for wrong round

* move score check within `and_then`

* add test that offchain workers clear their cache after election

* ensure that bad ocw submissions are not retained for resubmission

* simplify fn ocw_solution_exists

* add feasibility check when restoring cached solution

should address https://github.com/paritytech/substrate/pull/8290/files#r617533358

restructures how the checks are sequenced, which simplifies legibility.

* simplify checks again

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
---
 bin/node/runtime/src/lib.rs                   |   2 +
 .../election-provider-multi-phase/src/lib.rs  |  82 +++-
 .../election-provider-multi-phase/src/mock.rs |   4 +-
 .../src/unsigned.rs                           | 387 +++++++++++++++---
 4 files changed, 391 insertions(+), 84 deletions(-)

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 498593e57a1f..a8240679aeae 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -471,6 +471,7 @@ parameter_types! {
 	pub const SlashDeferDuration: pallet_staking::EraIndex = 24 * 7; // 1/4 the bonding duration.
 	pub const RewardCurve: &'static PiecewiseLinear<'static> = &REWARD_CURVE;
 	pub const MaxNominatorRewardedPerValidator: u32 = 256;
+	pub OffchainRepeat: BlockNumber = 5;
 }
 
 impl pallet_staking::Config for Runtime {
@@ -542,6 +543,7 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
 	type SignedPhase = SignedPhase;
 	type UnsignedPhase = UnsignedPhase;
 	type SolutionImprovementThreshold = SolutionImprovementThreshold;
+	type OffchainRepeat = OffchainRepeat;
 	type MinerMaxIterations = MinerMaxIterations;
 	type MinerMaxWeight = MinerMaxWeight;
 	type MinerMaxLength = MinerMaxLength;
diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index c59d68a33adb..e4fed277cf4f 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -194,10 +194,6 @@
 //! **Score based on (byte) size**: We should always prioritize small solutions over bigger ones, if
 //! there is a tie. Even more harsh should be to enforce the bound of the `reduce` algorithm.
 //!
-//! **Offchain resubmit**: Essentially port <https://github.com/paritytech/substrate/pull/7976> to
-//! this pallet as well. The `OFFCHAIN_REPEAT` also needs to become an adjustable parameter of the
-//! pallet.
-//!
 //! **Make the number of nominators configurable from the runtime**. Remove `sp_npos_elections`
 //! dependency from staking and the compact solution type. It should be generated at runtime, there
 //! it should be encoded how many votes each nominators have. Essentially translate
@@ -224,7 +220,7 @@ use frame_support::{
 use frame_system::{ensure_none, offchain::SendTransactionTypes};
 use frame_election_provider_support::{ElectionDataProvider, ElectionProvider, onchain};
 use sp_npos_elections::{
-	assignment_ratio_to_staked_normalized, is_score_better, CompactSolution, ElectionScore,
+	assignment_ratio_to_staked_normalized, CompactSolution, ElectionScore,
 	EvaluateSupport, PerThing128, Supports, VoteWeight,
 };
 use sp_runtime::{
@@ -235,7 +231,10 @@ use sp_runtime::{
 	DispatchError, PerThing, Perbill, RuntimeDebug, SaturatedConversion,
 	traits::Bounded,
 };
-use sp_std::prelude::*;
+use sp_std::{
+	convert::TryInto,
+	prelude::*,
+};
 use sp_arithmetic::{
 	UpperOf,
 	traits::{Zero, CheckedAdd},
@@ -304,8 +303,16 @@ pub enum Phase<Bn> {
 	Off,
 	/// Signed phase is open.
 	Signed,
-	/// Unsigned phase. First element is whether it is open or not, second the starting block
+	/// Unsigned phase. First element is whether it is active or not, second the starting block
 	/// number.
+	///
+	/// We do not yet check whether the unsigned phase is active or passive. The intent is for the
+	/// blockchain to be able to declare: "I believe that there exists an adequate signed solution,"
+	/// advising validators not to bother running the unsigned offchain worker.
+	///
+	/// As validator nodes are free to edit their OCW code, they could simply ignore this advisory
+	/// and always compute their own solution. However, by default, when the unsigned phase is passive,
+	/// the offchain workers will not bother running.
 	Unsigned((bool, Bn)),
 }
 
@@ -316,27 +323,27 @@ impl<Bn> Default for Phase<Bn> {
 }
 
 impl<Bn: PartialEq + Eq> Phase<Bn> {
-	/// Weather the phase is signed or not.
+	/// Whether the phase is signed or not.
 	pub fn is_signed(&self) -> bool {
 		matches!(self, Phase::Signed)
 	}
 
-	/// Weather the phase is unsigned or not.
+	/// Whether the phase is unsigned or not.
 	pub fn is_unsigned(&self) -> bool {
 		matches!(self, Phase::Unsigned(_))
 	}
 
-	/// Weather the phase is unsigned and open or not, with specific start.
+	/// Whether the phase is unsigned and open or not, with specific start.
 	pub fn is_unsigned_open_at(&self, at: Bn) -> bool {
 		matches!(self, Phase::Unsigned((true, real)) if *real == at)
 	}
 
-	/// Weather the phase is unsigned and open or not.
+	/// Whether the phase is unsigned and open or not.
 	pub fn is_unsigned_open(&self) -> bool {
 		matches!(self, Phase::Unsigned((true, _)))
 	}
 
-	/// Weather the phase is off or not.
+	/// Whether the phase is off or not.
 	pub fn is_off(&self) -> bool {
 		matches!(self, Phase::Off)
 	}
@@ -512,7 +519,7 @@ pub mod pallet {
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config + SendTransactionTypes<Call<Self>> {
-		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
+		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event> + TryInto<Event<Self>>;
 
 		/// Currency type.
 		type Currency: ReservableCurrency<Self::AccountId> + Currency<Self::AccountId>;
@@ -529,6 +536,13 @@ pub mod pallet {
 		#[pallet::constant]
 		type SolutionImprovementThreshold: Get<Perbill>;
 
+		/// The repeat threshold of the offchain worker.
+		///
+		/// For example, if it is 5, that means that at least 5 blocks will elapse between attempts
+		/// to submit the worker's solution.
+		#[pallet::constant]
+		type OffchainRepeat: Get<Self::BlockNumber>;
+
 		/// The priority of the unsigned transaction submitted in the unsigned-phase
 		type MinerTxPriority: Get<TransactionPriority>;
 		/// Maximum number of iteration of balancing that will be executed in the embedded miner of
@@ -638,16 +652,38 @@ pub mod pallet {
 			}
 		}
 
-		fn offchain_worker(n: T::BlockNumber) {
-			// We only run the OCW in the first block of the unsigned phase.
-			if Self::current_phase().is_unsigned_open_at(n) {
-				match Self::try_acquire_offchain_lock(n) {
-					Ok(_) => {
-						let outcome = Self::mine_check_and_submit().map_err(ElectionError::from);
-						log!(info, "mine_check_and_submit execution done: {:?}", outcome);
-					}
-					Err(why) => log!(warn, "denied offchain worker: {:?}", why),
+		fn offchain_worker(now: T::BlockNumber) {
+			match Self::current_phase() {
+				Phase::Unsigned((true, opened)) if opened == now => {
+					// mine a new solution, cache it, and attempt to submit it
+					let initial_output = Self::try_acquire_offchain_lock(now)
+						.and_then(|_| Self::mine_check_save_submit());
+					log!(info, "initial OCW output at {:?}: {:?}", now, initial_output);
+				}
+				Phase::Unsigned((true, opened)) if opened < now => {
+					// keep trying to submit solutions. worst case, we note that the stored solution
+					// is better than our cached/computed one, and decide not to submit after all.
+					//
+					// the offchain_lock prevents us from spamming submissions too often.
+					let resubmit_output = Self::try_acquire_offchain_lock(now)
+						.and_then(|_| Self::restore_or_compute_then_maybe_submit());
+					log!(info, "resubmit OCW output at {:?}: {:?}", now, resubmit_output);
 				}
+				_ => {}
+			}
+			// after election finalization, clear OCW solution storage
+			if <frame_system::Pallet<T>>::events()
+				.into_iter()
+				.filter_map(|event_record| {
+					let local_event = <T as Config>::Event::from(event_record.event);
+					local_event.try_into().ok()
+				})
+				.find(|event| {
+					matches!(event, Event::ElectionFinalized(_))
+				})
+				.is_some()
+			{
+				unsigned::kill_ocw_solution::<T>();
 			}
 		}
 
@@ -784,6 +820,8 @@ pub mod pallet {
 		PreDispatchWrongWinnerCount,
 		/// Submission was too weak, score-wise.
 		PreDispatchWeakSubmission,
+		/// OCW submitted solution for wrong round
+		OcwCallWrongEra,
 	}
 
 	#[pallet::origin]
diff --git a/frame/election-provider-multi-phase/src/mock.rs b/frame/election-provider-multi-phase/src/mock.rs
index f3cf00f2ca0c..f57836178d49 100644
--- a/frame/election-provider-multi-phase/src/mock.rs
+++ b/frame/election-provider-multi-phase/src/mock.rs
@@ -61,6 +61,7 @@ frame_support::construct_runtime!(
 
 pub(crate) type Balance = u64;
 pub(crate) type AccountId = u64;
+pub(crate) type BlockNumber = u32;
 pub(crate) type VoterIndex = u32;
 pub(crate) type TargetIndex = u16;
 
@@ -262,11 +263,11 @@ parameter_types! {
 	pub static MinerMaxIterations: u32 = 5;
 	pub static MinerTxPriority: u64 = 100;
 	pub static SolutionImprovementThreshold: Perbill = Perbill::zero();
+	pub static OffchainRepeat: BlockNumber = 5;
 	pub static MinerMaxWeight: Weight = BlockWeights::get().max_block;
 	pub static MinerMaxLength: u32 = 256;
 	pub static MockWeightInfo: bool = false;
 
-
 	pub static EpochLength: u64 = 30;
 }
 
@@ -334,6 +335,7 @@ impl crate::Config for Runtime {
 	type SignedPhase = SignedPhase;
 	type UnsignedPhase = UnsignedPhase;
 	type SolutionImprovementThreshold = SolutionImprovementThreshold;
+	type OffchainRepeat = OffchainRepeat;
 	type MinerMaxIterations = MinerMaxIterations;
 	type MinerMaxWeight = MinerMaxWeight;
 	type MinerMaxLength = MinerMaxLength;
diff --git a/frame/election-provider-multi-phase/src/unsigned.rs b/frame/election-provider-multi-phase/src/unsigned.rs
index 8ab3a81aa3d2..ebeae3dc472f 100644
--- a/frame/election-provider-multi-phase/src/unsigned.rs
+++ b/frame/election-provider-multi-phase/src/unsigned.rs
@@ -17,22 +17,27 @@
 
 //! The unsigned phase implementation.
 
-use crate::*;
-use frame_support::dispatch::DispatchResult;
+use crate::{
+	helpers, Call, CompactAccuracyOf, CompactOf, Config,
+	ElectionCompute, Error, FeasibilityError, Pallet, RawSolution, ReadySolution, RoundSnapshot,
+	SolutionOrSnapshotSize, Weight, WeightInfo,
+};
+use codec::{Encode, Decode};
+use frame_support::{dispatch::DispatchResult, ensure, traits::Get};
 use frame_system::offchain::SubmitTransaction;
+use sp_arithmetic::Perbill;
 use sp_npos_elections::{
-	seq_phragmen, CompactSolution, ElectionResult, assignment_ratio_to_staked_normalized,
-	assignment_staked_to_ratio_normalized,
+	CompactSolution, ElectionResult, ElectionScore, assignment_ratio_to_staked_normalized,
+	assignment_staked_to_ratio_normalized, is_score_better, seq_phragmen,
 };
-use sp_runtime::{offchain::storage::StorageValueRef, traits::TrailingZeroInput};
-use sp_std::{cmp::Ordering, convert::TryFrom};
+use sp_runtime::{offchain::storage::StorageValueRef, traits::TrailingZeroInput, SaturatedConversion};
+use sp_std::{cmp::Ordering, convert::TryFrom, vec::Vec};
 
 /// Storage key used to store the persistent offchain worker status.
-pub(crate) const OFFCHAIN_HEAD_DB: &[u8] = b"parity/multi-phase-unsigned-election";
+pub(crate) const OFFCHAIN_LOCK: &[u8] = b"parity/multi-phase-unsigned-election";
 
-/// The repeat threshold of the offchain worker. This means we won't run the offchain worker twice
-/// within a window of 5 blocks.
-pub(crate) const OFFCHAIN_REPEAT: u32 = 5;
+/// Storage key used to cache the solution `call`.
+pub(crate) const OFFCHAIN_CACHED_CALL: &[u8] = b"parity/multi-phase-unsigned-election/call";
 
 /// A voter's fundamental data: their ID, their stake, and the list of candidates for whom they
 /// voted.
@@ -63,6 +68,16 @@ pub enum MinerError {
 	PreDispatchChecksFailed,
 	/// The solution generated from the miner is not feasible.
 	Feasibility(FeasibilityError),
+	/// Something went wrong fetching the lock.
+	Lock(&'static str),
+	/// Cannot restore a solution that was not stored.
+	NoStoredSolution,
+	/// Cached solution does not match the current round.
+	SolutionOutOfDate,
+	/// Cached solution is not a `submit_unsigned` call.
+	SolutionCallInvalid,
+	/// Failed to store a solution.
+	FailedToStoreSolution,
 	/// There are no more voters to remove to trim the solution.
 	NoMoreVoters,
 }
@@ -79,25 +94,142 @@ impl From<FeasibilityError> for MinerError {
 	}
 }
 
+/// Save a given call into OCW storage.
+fn save_solution<T: Config>(call: &Call<T>) -> Result<(), MinerError> {
+	let storage = StorageValueRef::persistent(&OFFCHAIN_CACHED_CALL);
+	match storage.mutate::<_, (), _>(|_| Ok(call.clone())) {
+		Ok(Ok(_)) => Ok(()),
+		Ok(Err(_)) => Err(MinerError::FailedToStoreSolution),
+		Err(_) => {
+			// this branch should be unreachable according to the definition of `StorageValueRef::mutate`:
+			// that function should only ever `Err` if the closure we pass it return an error.
+			// however, for safety in case the definition changes, we do not optimize the branch away
+			// or panic.
+			Err(MinerError::FailedToStoreSolution)
+		},
+	}
+}
+
+/// Get a saved solution from OCW storage if it exists.
+fn restore_solution<T: Config>() -> Result<Call<T>, MinerError> {
+	StorageValueRef::persistent(&OFFCHAIN_CACHED_CALL)
+		.get()
+		.flatten()
+		.ok_or(MinerError::NoStoredSolution)
+}
+
+/// Clear a saved solution from OCW storage.
+pub(super) fn kill_ocw_solution<T: Config>() {
+	let mut storage = StorageValueRef::persistent(&OFFCHAIN_CACHED_CALL);
+	storage.clear();
+}
+
+/// `true` when OCW storage contains a solution
+///
+/// More precise than `restore_solution::<T>().is_ok()`; that invocation will return `false`
+/// if a solution exists but cannot be decoded, whereas this just checks whether an item is present.
+#[cfg(test)]
+fn ocw_solution_exists<T: Config>() -> bool {
+	StorageValueRef::persistent(&OFFCHAIN_CACHED_CALL).get::<Call<T>>().is_some()
+}
+
 impl<T: Config> Pallet<T> {
-	/// Mine a new solution, and submit it back to the chain as an unsigned transaction.
-	pub fn mine_check_and_submit() -> Result<(), MinerError> {
+	/// Attempt to restore a solution from cache. Otherwise, compute it fresh. Either way, submit
+	/// if our call's score is greater than that of the cached solution.
+	pub fn restore_or_compute_then_maybe_submit() -> Result<(), MinerError> {
+		log!(
+			debug,
+			"OCW attempting to restore or compute an unsigned solution for the current election"
+		);
+
+		let call = restore_solution::<T>()
+			.and_then(|call| {
+				// ensure the cached call is still current before submitting
+				if let Call::submit_unsigned(solution, _) = &call {
+					// prevent errors arising from state changes in a forkful chain
+					Self::basic_checks(solution, "restored")?;
+					Ok(call)
+				} else {
+					Err(MinerError::SolutionCallInvalid)
+				}
+			})
+			.or_else::<MinerError, _>(|_| {
+				// if not present or cache invalidated, regenerate
+				let (call, _) = Self::mine_checked_call()?;
+				save_solution(&call)?;
+				Ok(call)
+			})?;
+
+		// the runtime will catch it and reject the transaction if the phase is wrong, but it's
+		// cheap and easy to check it here to ease the workload on the runtime, so:
+		if !Self::current_phase().is_unsigned_open() {
+			// don't bother submitting; it's not an error, we're just too late.
+			return Ok(());
+		}
+
+		// in case submission fails for any reason, `submit_call` kills the stored solution
+		Self::submit_call(call)
+	}
+
+	/// Mine a new solution, cache it, and submit it back to the chain as an unsigned transaction.
+	pub fn mine_check_save_submit() -> Result<(), MinerError> {
+		log!(
+			debug,
+			"OCW attempting to compute an unsigned solution for the current election"
+		);
+
+		let (call, _) = Self::mine_checked_call()?;
+		save_solution(&call)?;
+		Self::submit_call(call)
+	}
+
+	/// Mine a new solution as a call. Performs all checks.
+	fn mine_checked_call() -> Result<(Call<T>, ElectionScore), MinerError> {
 		let iters = Self::get_balancing_iters();
 		// get the solution, with a load of checks to ensure if submitted, IT IS ABSOLUTELY VALID.
 		let (raw_solution, witness) = Self::mine_and_check(iters)?;
+
 		let score = raw_solution.score.clone();
+		let call: Call<T> = Call::submit_unsigned(raw_solution, witness).into();
 
-		let call: <T as frame_system::offchain::SendTransactionTypes<Call<T>>>::OverarchingCall =
-			Call::submit_unsigned(raw_solution, witness).into();
 		log!(
-			info,
-			"mined a solution with score {:?} and size {}",
+			debug,
+			"OCW mined a solution with score {:?} and size {}",
 			score,
 			call.using_encoded(|b| b.len())
 		);
 
-		SubmitTransaction::<T, Call<T>>::submit_unsigned_transaction(call)
-			.map_err(|_| MinerError::PoolSubmissionFailed)
+		Ok((call, score))
+	}
+
+	fn submit_call(call: Call<T>) -> Result<(), MinerError> {
+		log!(
+			debug,
+			"OCW submitting a solution as an unsigned transaction",
+		);
+
+		SubmitTransaction::<T, Call<T>>::submit_unsigned_transaction(call.into())
+			.map_err(|_| {
+				kill_ocw_solution::<T>();
+				MinerError::PoolSubmissionFailed
+			})
+	}
+
+	// perform basic checks of a solution's validity
+	//
+	// Performance: note that it internally clones the provided solution.
+	fn basic_checks(raw_solution: &RawSolution<CompactOf<T>>, solution_type: &str) -> Result<(), MinerError> {
+		Self::unsigned_pre_dispatch_checks(raw_solution).map_err(|err| {
+			log!(warn, "pre-dispatch checks fialed for {} solution: {:?}", solution_type, err);
+			MinerError::PreDispatchChecksFailed
+		})?;
+
+		Self::feasibility_check(raw_solution.clone(), ElectionCompute::Unsigned).map_err(|err| {
+			log!(warn, "feasibility check failed for {} solution: {:?}", solution_type, err);
+			err
+		})?;
+
+		Ok(())
 	}
 
 	/// Mine a new npos solution, with all the relevant checks to make sure that it will be accepted
@@ -105,26 +237,12 @@ impl<T: Config> Pallet<T> {
 	///
 	/// If you want an unchecked solution, use [`Pallet::mine_solution`].
 	/// If you want a checked solution and submit it at the same time, use
-	/// [`Pallet::mine_check_and_submit`].
+	/// [`Pallet::mine_check_save_submit`].
 	pub fn mine_and_check(
 		iters: usize,
 	) -> Result<(RawSolution<CompactOf<T>>, SolutionOrSnapshotSize), MinerError> {
 		let (raw_solution, witness) = Self::mine_solution(iters)?;
-
-		// ensure that this will pass the pre-dispatch checks
-		Self::unsigned_pre_dispatch_checks(&raw_solution).map_err(|e| {
-			log!(warn, "pre-dispatch-checks failed for mined solution: {:?}", e);
-			MinerError::PreDispatchChecksFailed
-		})?;
-
-		// ensure that this is a feasible solution
-		let _ = Self::feasibility_check(raw_solution.clone(), ElectionCompute::Unsigned).map_err(
-			|e| {
-				log!(warn, "feasibility-check failed for mined solution: {:?}", e);
-				MinerError::from(e)
-			},
-		)?;
-
+		Self::basic_checks(&raw_solution, "mined")?;
 		Ok((raw_solution, witness))
 	}
 
@@ -439,12 +557,14 @@ impl<T: Config> Pallet<T> {
 	/// not.
 	///
 	/// This essentially makes sure that we don't run on previous blocks in case of a re-org, and we
-	/// don't run twice within a window of length [`OFFCHAIN_REPEAT`].
+	/// don't run twice within a window of length `threshold`.
 	///
 	/// Returns `Ok(())` if offchain worker should happen, `Err(reason)` otherwise.
-	pub(crate) fn try_acquire_offchain_lock(now: T::BlockNumber) -> Result<(), &'static str> {
-		let storage = StorageValueRef::persistent(&OFFCHAIN_HEAD_DB);
-		let threshold = T::BlockNumber::from(OFFCHAIN_REPEAT);
+	pub(crate) fn try_acquire_offchain_lock(
+		now: T::BlockNumber,
+	) -> Result<(), MinerError> {
+		let threshold = T::OffchainRepeat::get();
+		let storage = StorageValueRef::persistent(&OFFCHAIN_LOCK);
 
 		let mutate_stat =
 			storage.mutate::<_, &'static str, _>(|maybe_head: Option<Option<T::BlockNumber>>| {
@@ -468,9 +588,9 @@ impl<T: Config> Pallet<T> {
 			// all good
 			Ok(Ok(_)) => Ok(()),
 			// failed to write.
-			Ok(Err(_)) => Err("failed to write to offchain db."),
+			Ok(Err(_)) => Err(MinerError::Lock("failed to write to offchain db.")),
 			// fork etc.
-			Err(why) => Err(why),
+			Err(why) => Err(MinerError::Lock(why)),
 		}
 	}
 
@@ -487,6 +607,9 @@ impl<T: Config> Pallet<T> {
 		// ensure solution is timely. Don't panic yet. This is a cheap check.
 		ensure!(Self::current_phase().is_unsigned_open(), Error::<T>::PreDispatchEarlySubmission);
 
+		// ensure round is current
+		ensure!(Self::round() == solution.round, Error::<T>::OcwCallWrongEra);
+
 		// ensure correct number of winners.
 		ensure!(
 			Self::desired_targets().unwrap_or_default()
@@ -511,7 +634,8 @@ impl<T: Config> Pallet<T> {
 #[cfg(test)]
 mod max_weight {
 	#![allow(unused_variables)]
-	use super::{mock::*, *};
+	use super::*;
+	use crate::mock::MultiPhase;
 
 	struct TestWeight;
 	impl crate::weights::WeightInfo for TestWeight {
@@ -597,13 +721,15 @@ mod max_weight {
 mod tests {
 	use super::*;
 	use crate::{
+		CurrentPhase, InvalidTransaction, Phase, QueuedSolution, TransactionSource,
+		TransactionValidityError,
 		mock::{
-			assert_noop, assert_ok, ExtBuilder, Extrinsic, MinerMaxWeight, MultiPhase, Origin,
-			roll_to_with_ocw, roll_to, Runtime, TestCompact, TrimHelpers, trim_helpers, witness,
+			Call as OuterCall, ExtBuilder, Extrinsic, MinerMaxWeight, MultiPhase, Origin, Runtime,
+			TestCompact, TrimHelpers, roll_to, roll_to_with_ocw, trim_helpers, witness,
 		},
 	};
-	use frame_support::{dispatch::Dispatchable, traits::OffchainWorker};
-	use mock::Call as OuterCall;
+	use frame_benchmarking::Zero;
+	use frame_support::{assert_noop, assert_ok, dispatch::Dispatchable, traits::OffchainWorker};
 	use sp_npos_elections::IndexAssignment;
 	use sp_runtime::{traits::ValidateUnsigned, PerU16};
 
@@ -845,7 +971,7 @@ mod tests {
 			assert!(MultiPhase::current_phase().is_unsigned());
 
 			assert_eq!(
-				MultiPhase::mine_check_and_submit().unwrap_err(),
+				MultiPhase::mine_check_save_submit().unwrap_err(),
 				MinerError::PreDispatchChecksFailed,
 			);
 		})
@@ -924,6 +1050,8 @@ mod tests {
 	fn ocw_check_prevent_duplicate() {
 		let (mut ext, _) = ExtBuilder::default().build_offchainify(0);
 		ext.execute_with(|| {
+			let offchain_repeat = <Runtime as Config>::OffchainRepeat::get();
+
 			roll_to(25);
 			assert!(MultiPhase::current_phase().is_unsigned());
 
@@ -931,21 +1059,15 @@ mod tests {
 			assert!(MultiPhase::try_acquire_offchain_lock(25).is_ok());
 
 			// next block: rejected.
-			assert_noop!(MultiPhase::try_acquire_offchain_lock(26), "recently executed.");
+			assert_noop!(MultiPhase::try_acquire_offchain_lock(26), MinerError::Lock("recently executed."));
 
 			// allowed after `OFFCHAIN_REPEAT`
-			assert!(MultiPhase::try_acquire_offchain_lock((26 + OFFCHAIN_REPEAT).into()).is_ok());
+			assert!(MultiPhase::try_acquire_offchain_lock((26 + offchain_repeat).into()).is_ok());
 
 			// a fork like situation: re-execute last 3.
-			assert_noop!(
-				MultiPhase::try_acquire_offchain_lock((26 + OFFCHAIN_REPEAT - 3).into()), "fork."
-			);
-			assert_noop!(
-				MultiPhase::try_acquire_offchain_lock((26 + OFFCHAIN_REPEAT - 2).into()), "fork."
-			);
-			assert_noop!(
-				MultiPhase::try_acquire_offchain_lock((26 + OFFCHAIN_REPEAT - 1).into()), "fork."
-			);
+			assert!(MultiPhase::try_acquire_offchain_lock((26 + offchain_repeat - 3).into()).is_err());
+			assert!(MultiPhase::try_acquire_offchain_lock((26 + offchain_repeat - 2).into()).is_err());
+			assert!(MultiPhase::try_acquire_offchain_lock((26 + offchain_repeat - 1).into()).is_err());
 		})
 	}
 
@@ -958,19 +1080,131 @@ mod tests {
 
 			// we must clear the offchain storage to ensure the offchain execution check doesn't get
 			// in the way.
-			let mut storage = StorageValueRef::persistent(&OFFCHAIN_HEAD_DB);
+			let mut storage = StorageValueRef::persistent(&OFFCHAIN_LOCK);
 
 			MultiPhase::offchain_worker(24);
 			assert!(pool.read().transactions.len().is_zero());
 			storage.clear();
 
+			// creates, caches, submits without expecting previous cache value
+			MultiPhase::offchain_worker(25);
+			assert_eq!(pool.read().transactions.len(), 1);
+			// assume that the tx has been processed
+			pool.try_write().unwrap().transactions.clear();
+
+			// locked, but also, has previously cached.
 			MultiPhase::offchain_worker(26);
 			assert!(pool.read().transactions.len().is_zero());
+		})
+	}
+
+	#[test]
+	fn ocw_clears_cache_after_election() {
+		let (mut ext, _pool) = ExtBuilder::default().build_offchainify(0);
+		ext.execute_with(|| {
+			roll_to(25);
+			assert_eq!(MultiPhase::current_phase(), Phase::Unsigned((true, 25)));
+
+			// we must clear the offchain storage to ensure the offchain execution check doesn't get
+			// in the way.
+			let mut storage = StorageValueRef::persistent(&OFFCHAIN_LOCK);
 			storage.clear();
 
-			// submits!
+			assert!(!ocw_solution_exists::<Runtime>(), "no solution should be present before we mine one");
+
+			// creates and cache a solution
 			MultiPhase::offchain_worker(25);
-			assert!(!pool.read().transactions.len().is_zero());
+			assert!(ocw_solution_exists::<Runtime>(), "a solution must be cached after running the worker");
+
+			// after an election, the solution must be cleared
+			// we don't actually care about the result of the election
+			roll_to(26);
+			let _ = MultiPhase::do_elect();
+			MultiPhase::offchain_worker(26);
+			assert!(!ocw_solution_exists::<Runtime>(), "elections must clear the ocw cache");
+		})
+	}
+
+	#[test]
+	fn ocw_resubmits_after_offchain_repeat() {
+		let (mut ext, pool) = ExtBuilder::default().build_offchainify(0);
+		ext.execute_with(|| {
+			const BLOCK: u64 = 25;
+			let block_plus = |delta: i32| ((BLOCK as i32) + delta) as u64;
+			let offchain_repeat = <Runtime as Config>::OffchainRepeat::get();
+
+			roll_to(BLOCK);
+			assert_eq!(MultiPhase::current_phase(), Phase::Unsigned((true, BLOCK)));
+
+			// we must clear the offchain storage to ensure the offchain execution check doesn't get
+			// in the way.
+			let mut storage = StorageValueRef::persistent(&OFFCHAIN_LOCK);
+
+			MultiPhase::offchain_worker(block_plus(-1));
+			assert!(pool.read().transactions.len().is_zero());
+			storage.clear();
+
+			// creates, caches, submits without expecting previous cache value
+			MultiPhase::offchain_worker(BLOCK);
+			assert_eq!(pool.read().transactions.len(), 1);
+			let tx_cache = pool.read().transactions[0].clone();
+			// assume that the tx has been processed
+			pool.try_write().unwrap().transactions.clear();
+
+			// attempts to resubmit the tx after the threshold has expired
+			// note that we have to add 1: the semantics forbid resubmission at
+			// BLOCK + offchain_repeat
+			MultiPhase::offchain_worker(block_plus(1 + offchain_repeat as i32));
+			assert_eq!(pool.read().transactions.len(), 1);
+
+			// resubmitted tx is identical to first submission
+			let tx = &pool.read().transactions[0];
+			assert_eq!(&tx_cache, tx);
+		})
+	}
+
+	#[test]
+	fn ocw_regenerates_and_resubmits_after_offchain_repeat() {
+		let (mut ext, pool) = ExtBuilder::default().build_offchainify(0);
+		ext.execute_with(|| {
+			const BLOCK: u64 = 25;
+			let block_plus = |delta: i32| ((BLOCK as i32) + delta) as u64;
+			let offchain_repeat = <Runtime as Config>::OffchainRepeat::get();
+
+			roll_to(BLOCK);
+			assert_eq!(MultiPhase::current_phase(), Phase::Unsigned((true, BLOCK)));
+
+			// we must clear the offchain storage to ensure the offchain execution check doesn't get
+			// in the way.
+			let mut storage = StorageValueRef::persistent(&OFFCHAIN_LOCK);
+
+			MultiPhase::offchain_worker(block_plus(-1));
+			assert!(pool.read().transactions.len().is_zero());
+			storage.clear();
+
+			// creates, caches, submits without expecting previous cache value
+			MultiPhase::offchain_worker(BLOCK);
+			assert_eq!(pool.read().transactions.len(), 1);
+			let tx_cache = pool.read().transactions[0].clone();
+			// assume that the tx has been processed
+			pool.try_write().unwrap().transactions.clear();
+
+			// remove the cached submitted tx
+			// this ensures that when the resubmit window rolls around, we're ready to regenerate
+			// from scratch if necessary
+			let mut call_cache = StorageValueRef::persistent(&OFFCHAIN_CACHED_CALL);
+			assert!(matches!(call_cache.get::<Call<Runtime>>(), Some(Some(_call))));
+			call_cache.clear();
+
+			// attempts to resubmit the tx after the threshold has expired
+			// note that we have to add 1: the semantics forbid resubmission at
+			// BLOCK + offchain_repeat
+			MultiPhase::offchain_worker(block_plus(1 + offchain_repeat as i32));
+			assert_eq!(pool.read().transactions.len(), 1);
+
+			// resubmitted tx is identical to first submission
+			let tx = &pool.read().transactions[0];
+			assert_eq!(&tx_cache, tx);
 		})
 	}
 
@@ -985,7 +1219,38 @@ mod tests {
 			let encoded = pool.read().transactions[0].clone();
 			let extrinsic: Extrinsic = Decode::decode(&mut &*encoded).unwrap();
 			let call = extrinsic.call;
-			assert!(matches!(call, OuterCall::MultiPhase(Call::submit_unsigned(_, _))));
+			assert!(matches!(call, OuterCall::MultiPhase(Call::submit_unsigned(..))));
+		})
+	}
+
+	#[test]
+	fn ocw_solution_must_have_correct_round() {
+		let (mut ext, pool) = ExtBuilder::default().build_offchainify(0);
+		ext.execute_with(|| {
+			roll_to_with_ocw(25);
+			assert_eq!(MultiPhase::current_phase(), Phase::Unsigned((true, 25)));
+			// OCW must have submitted now
+			// now, before we check the call, update the round
+			<crate::Round<Runtime>>::mutate(|round| *round += 1);
+
+			let encoded = pool.read().transactions[0].clone();
+			let extrinsic = Extrinsic::decode(&mut &*encoded).unwrap();
+			let call = match extrinsic.call {
+				OuterCall::MultiPhase(call @ Call::submit_unsigned(..)) => call,
+				_ => panic!("bad call: unexpected submission"),
+			};
+
+			// Custom(3) maps to PreDispatchChecksFailed
+			let pre_dispatch_check_error = TransactionValidityError::Invalid(InvalidTransaction::Custom(3));
+			assert_eq!(
+				<MultiPhase as ValidateUnsigned>::validate_unsigned(TransactionSource::Local, &call)
+					.unwrap_err(),
+				pre_dispatch_check_error,
+			);
+			assert_eq!(
+				<MultiPhase as ValidateUnsigned>::pre_dispatch(&call).unwrap_err(),
+				pre_dispatch_check_error,
+			);
 		})
 	}
 

From d2f66e041b30c9101ce2ef191c49d5eba02b2773 Mon Sep 17 00:00:00 2001
From: Roman Proskuryakov <humbug@deeptown.org>
Date: Mon, 3 May 2021 12:17:57 +0000
Subject: [PATCH 0690/1194] Add a JSON-RPC layer for reserved nodes (#8704)

* Add boilerplate for JSON-RPC layer for reserved nodes

* Add more boilerplate for JSON-RPC layer for reserved nodes

* Make JSON-RPC layer for reserved nodes async

* Use more realistic data in reserver_peers tests

* Make JSON-RPC layer for reserved nodes blocking

* Apply tomaka's suggestion to reduce .into_iter() for an iter

Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>

Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
---
 client/network/src/protocol.rs                        |  5 +++++
 .../network/src/protocol/notifications/behaviour.rs   |  5 +++++
 client/network/src/service.rs                         |  5 +++++
 client/peerset/src/lib.rs                             |  5 +++++
 client/rpc-api/src/system/mod.rs                      |  4 ++++
 client/rpc/src/system/mod.rs                          |  8 ++++++++
 client/rpc/src/system/tests.rs                        | 11 +++++++++++
 client/service/src/lib.rs                             |  8 ++++++++
 8 files changed, 51 insertions(+)

diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index ff64b9d599c0..e0fa7a1cb467 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -1014,6 +1014,11 @@ impl<B: BlockT> Protocol<B> {
 		self.peerset_handle.remove_reserved_peer(HARDCODED_PEERSETS_SYNC, peer.clone());
 	}
 
+	/// Returns the list of reserved peers.
+	pub fn reserved_peers(&self) -> impl Iterator<Item = &PeerId> {
+		self.behaviour.reserved_peers(HARDCODED_PEERSETS_SYNC)
+	}
+
 	/// Adds a `PeerId` to the list of reserved peers for syncing purposes.
 	pub fn add_reserved_peer(&self, peer: PeerId) {
 		self.peerset_handle.add_reserved_peer(HARDCODED_PEERSETS_SYNC, peer.clone());
diff --git a/client/network/src/protocol/notifications/behaviour.rs b/client/network/src/protocol/notifications/behaviour.rs
index 6b17c5253f36..e1ed61722c54 100644
--- a/client/network/src/protocol/notifications/behaviour.rs
+++ b/client/network/src/protocol/notifications/behaviour.rs
@@ -555,6 +555,11 @@ impl Notifications {
 			.map(|((id, _), _)| id)
 	}
 
+	/// Returns the list of reserved peers.
+	pub fn reserved_peers<'a>(&'a self, set_id: sc_peerset::SetId) -> impl Iterator<Item = &'a PeerId> + 'a {
+		self.peerset.reserved_peers(set_id)
+	}
+
 	/// Sends a notification to a peer.
 	///
 	/// Has no effect if the custom protocol is not open with the given peer.
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 4ad5053d9b28..99036c5effad 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -619,6 +619,11 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 	pub fn add_reserved_peer(&self, peer: String) -> Result<(), String> {
 		self.service.add_reserved_peer(peer)
 	}
+
+	/// Returns the list of reserved peers.
+	pub fn reserved_peers(&self) -> impl Iterator<Item = &PeerId> {
+		self.network_service.behaviour().user_protocol().reserved_peers()
+	}
 }
 
 impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
diff --git a/client/peerset/src/lib.rs b/client/peerset/src/lib.rs
index 153e097dc8b4..eefab81b851d 100644
--- a/client/peerset/src/lib.rs
+++ b/client/peerset/src/lib.rs
@@ -379,6 +379,11 @@ impl Peerset {
 		}
 	}
 
+	/// Returns the list of reserved peers.
+	pub fn reserved_peers(&self, set_id: SetId) -> impl Iterator<Item = &PeerId> {
+		self.reserved_nodes[set_id.0].0.iter()
+	}
+
 	/// Adds a node to the given set. The peerset will, if possible and not already the case,
 	/// try to connect to it.
 	///
diff --git a/client/rpc-api/src/system/mod.rs b/client/rpc-api/src/system/mod.rs
index 2e8a7aa12633..4252ef20ac22 100644
--- a/client/rpc-api/src/system/mod.rs
+++ b/client/rpc-api/src/system/mod.rs
@@ -102,6 +102,10 @@ pub trait SystemApi<Hash, Number> {
 	fn system_remove_reserved_peer(&self, peer_id: String)
 		-> Compat<BoxFuture<'static, Result<(), jsonrpc_core::Error>>>;
 
+	/// Returns the list of reserved peers
+	#[rpc(name = "system_reservedPeers", returns = "Vec<String>")]
+	fn system_reserved_peers(&self) -> Receiver<Vec<String>>;
+
 	/// Returns the roles the node is running as.
 	#[rpc(name = "system_nodeRoles", returns = "Vec<NodeRole>")]
 	fn system_node_roles(&self) -> Receiver<Vec<NodeRole>>;
diff --git a/client/rpc/src/system/mod.rs b/client/rpc/src/system/mod.rs
index 240de6c62876..b721dbf0c936 100644
--- a/client/rpc/src/system/mod.rs
+++ b/client/rpc/src/system/mod.rs
@@ -66,6 +66,8 @@ pub enum Request<B: traits::Block> {
 	NetworkAddReservedPeer(String, oneshot::Sender<Result<()>>),
 	/// Must return any potential parse error.
 	NetworkRemoveReservedPeer(String, oneshot::Sender<Result<()>>),
+	/// Must return the list of reserved peers
+	NetworkReservedPeers(oneshot::Sender<Vec<String>>),
 	/// Must return the node role.
 	NodeRoles(oneshot::Sender<Vec<NodeRole>>),
 	/// Must return the state of the node syncing.
@@ -187,6 +189,12 @@ impl<B: traits::Block> SystemApi<B::Hash, <B::Header as HeaderT>::Number> for Sy
 		}.boxed().compat()
 	}
 
+	fn system_reserved_peers(&self) -> Receiver<Vec<String>> {
+		let (tx, rx) = oneshot::channel();
+		let _ = self.send_back.unbounded_send(Request::NetworkReservedPeers(tx));
+		Receiver(Compat::new(rx))
+	}
+
 	fn system_node_roles(&self) -> Receiver<Vec<NodeRole>> {
 		let (tx, rx) = oneshot::channel();
 		let _ = self.send_back.unbounded_send(Request::NodeRoles(tx));
diff --git a/client/rpc/src/system/tests.rs b/client/rpc/src/system/tests.rs
index c19640350103..41d6029ddde2 100644
--- a/client/rpc/src/system/tests.rs
+++ b/client/rpc/src/system/tests.rs
@@ -104,6 +104,9 @@ fn api<T: Into<Option<Status>>>(sync: T) -> System<Block> {
 						Err(s) => sender.send(Err(error::Error::MalformattedPeerArg(s.to_string()))),
 					};
 				}
+				Request::NetworkReservedPeers(sender) => {
+					let _ = sender.send(vec!["QmSk5HQbn6LhUwDiNMseVUjuRYhEtYj4aUZ6WfWoGURpdV".to_string()]);
+				}
 				Request::NodeRoles(sender) => {
 					let _ = sender.send(vec![NodeRole::Authority]);
 				}
@@ -337,6 +340,14 @@ fn system_network_remove_reserved() {
 	assert!(runtime.block_on(bad_fut).is_err());
 }
 
+#[test]
+fn system_network_reserved_peers() {
+	assert_eq!(
+		wait_receiver(api(None).system_reserved_peers()),
+		vec!["QmSk5HQbn6LhUwDiNMseVUjuRYhEtYj4aUZ6WfWoGURpdV".to_string()]
+	);
+}
+
 #[test]
 fn test_add_reset_log_filter() {
 	const EXPECTED_BEFORE_ADD: &'static str = "EXPECTED_BEFORE_ADD";
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index db5f296953e3..da05f99506a9 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -302,6 +302,14 @@ async fn build_network_future<
 							))),
 						};
 					}
+					sc_rpc::system::Request::NetworkReservedPeers(sender) => {
+						let reserved_peers = network.reserved_peers();
+						let reserved_peers = reserved_peers
+							.map(|peer_id| peer_id.to_base58())
+							.collect();
+
+						let _ = sender.send(reserved_peers);
+					}
 					sc_rpc::system::Request::NodeRoles(sender) => {
 						use sc_rpc::system::NodeRole;
 

From ec180313e410915ed5e319358628260f9d1f3b53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Mon, 3 May 2021 16:39:25 +0200
Subject: [PATCH 0691/1194] Rework inherent data client side (#8526)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Lol

* Yeah

* Moare

* adaasda

* Convert AURA to new pallet macro

* AURA: Switch to `CurrentSlot` instead of `LastTimestamp`

This switches AURA to use `CurrentSlot` instead of `LastTimestamp`.

* Add missing file

* Update frame/aura/src/migrations.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Remove the runtime side provide inherent code

* Use correct weight

* Add TODO

* Remove the Inherent from AURA

* :facepalm:

* Remove unused stuff

* Update primitives authorship

* Fix babe inherent data provider

* Fix consensus-uncles

* Fix BABE

* Do some further changes to authorship primitives... :D

* More work

* Make it compile the happy path

* Make it async!

* Take hash

* More stuff

* Hacks

* Revert "Hacks"

This reverts commit cfffad88668cfdebf632a59c4fbfada001ef8251.

* Fix

* Make `execute_block` return the final block header

* Move Aura digest stuff

* Make it possible to disable equivocation checking

* Fix fix fix

* Some refactorings

* Comment

* Fixes fixes fixes

* More cleanups

* Some love

* Better love

* Make slot duration being exposed as `Duration` to the outside

* Some slot info love

* Add `build_aura_worker` utility function

* Copy copy copy

* Some stuff

* Start fixing pow

* Fix pow

* Remove some bounds

* More work

* Make grandpa work

* Make slots use `async_trait`

* Introduce `SharedData`

* Add test and fix bugs

* Switch to `SharedData`

* Make grandpa tests working

* More Babe work

* Make grandpa work

* Introduce `SharedData`

* Add test and fix bugs

* Switch to `SharedData`

* Make grandpa tests working

* More Babe work

* Make it async

* Fix fix

* Use `async_trait` in sc-consensus-slots

This makes the code a little bit easier to read and also expresses that
there can always only be one call at a time to `on_slot`.

* Make grandpa tests compile

* More Babe tests work

* Fix network test

* Start fixing service test

* Finish service-test

* Fix sc-consensus-aura

* Fix fix fix

* More fixes

* Make everything compile *yeah*

* Make manual-seal compile

* More fixes

* Start fixing Aura

* Fix Aura tests

* Fix Babe tests

* Make everything compile

* Move code around and switch to async_trait

* Fix Babe

* Docs docs docs

* Move to FRAME

* Fix fix fix

* Make everything compile

* Last cleanups

* Fix integration test

* Change slot usage of the timestamp

* We really need to switch to `impl-trait-for-tuples`

* Update primitives/inherents/src/lib.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Update primitives/inherents/src/lib.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Update primitives/inherents/src/lib.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Some extra logging

* Remove dbg!

* Update primitives/consensus/common/src/import_queue/basic_queue.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
---
 Cargo.lock                                    |  29 +-
 bin/node-template/node/Cargo.toml             |   1 +
 bin/node-template/node/src/service.rs         |  61 ++-
 bin/node/bench/src/construct.rs               |   8 +-
 bin/node/cli/Cargo.toml                       |   4 +-
 bin/node/cli/src/service.rs                   |  88 +++-
 bin/node/test-runner-example/Cargo.toml       |   1 +
 bin/node/test-runner-example/src/lib.rs       |  30 +-
 client/consensus/aura/Cargo.toml              |   2 +-
 client/consensus/aura/src/import_queue.rs     | 130 ++---
 client/consensus/aura/src/lib.rs              | 135 +++--
 client/consensus/babe/Cargo.toml              |   2 +-
 client/consensus/babe/src/lib.rs              | 201 ++++----
 client/consensus/babe/src/tests.rs            |  45 +-
 .../manual-seal/src/consensus/babe.rs         |  44 +-
 client/consensus/manual-seal/src/lib.rs       |  60 ++-
 .../consensus/manual-seal/src/seal_block.rs   |  36 +-
 client/consensus/pow/Cargo.toml               |   1 -
 client/consensus/pow/src/lib.rs               | 261 +++++-----
 client/consensus/slots/Cargo.toml             |   1 +
 client/consensus/slots/src/lib.rs             | 210 ++++----
 client/consensus/slots/src/slots.rs           |  96 ++--
 client/consensus/uncles/Cargo.toml            |   5 +-
 client/consensus/uncles/src/lib.rs            |  55 +-
 client/service/src/client/client.rs           |  24 +-
 client/service/src/lib.rs                     |   2 -
 frame/authorship/Cargo.toml                   |   2 -
 frame/authorship/src/lib.rs                   |  13 +-
 frame/executive/src/lib.rs                    |   2 +-
 frame/support/src/inherent.rs                 |  64 ++-
 frame/support/src/lib.rs                      |   6 +-
 frame/support/test/Cargo.toml                 |   2 -
 frame/support/test/tests/instance.rs          |   6 +-
 frame/support/test/tests/pallet.rs            |   4 +-
 frame/support/test/tests/pallet_instance.rs   |   4 +-
 .../tests/pallet_with_name_trait_is_valid.rs  |  15 +-
 frame/timestamp/src/lib.rs                    |  25 +-
 primitives/authorship/Cargo.toml              |   2 +
 primitives/authorship/src/lib.rs              |  53 +-
 primitives/consensus/aura/Cargo.toml          |   2 +
 primitives/consensus/aura/src/inherents.rs    |  69 +--
 primitives/consensus/babe/Cargo.toml          |   6 +-
 primitives/consensus/babe/src/inherents.rs    |  73 +--
 .../common/src/import_queue/basic_queue.rs    |   1 -
 primitives/inherents/Cargo.toml               |  10 +-
 primitives/inherents/src/client_side.rs       | 125 +++++
 primitives/inherents/src/lib.rs               | 482 +++++++-----------
 primitives/timestamp/Cargo.toml               |   8 +
 primitives/timestamp/src/lib.rs               | 137 ++++-
 test-utils/runtime/src/system.rs              |   8 +-
 test-utils/test-runner/src/lib.rs             |  13 +-
 test-utils/test-runner/src/node.rs            |   4 +-
 52 files changed, 1498 insertions(+), 1170 deletions(-)
 create mode 100644 primitives/inherents/src/client_side.rs

diff --git a/Cargo.lock b/Cargo.lock
index 8c21d575b858..34c2d93102b3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -344,9 +344,9 @@ checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0"
 
 [[package]]
 name = "async-trait"
-version = "0.1.47"
+version = "0.1.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e098e9c493fdf92832223594d9a164f96bdf17ba81a42aff86f85c76768726a"
+checksum = "36ea56748e10732c49404c153638a15ec3d6211ec5ff35d9bb20e13b93576adf"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1871,7 +1871,6 @@ dependencies = [
  "rustversion",
  "serde",
  "sp-core",
- "sp-inherents",
  "sp-io",
  "sp-runtime",
  "sp-state-machine",
@@ -4130,6 +4129,7 @@ dependencies = [
  "sc-consensus-babe",
  "sc-consensus-epochs",
  "sc-consensus-slots",
+ "sc-consensus-uncles",
  "sc-finality-grandpa",
  "sc-finality-grandpa-warp-sync",
  "sc-keystore",
@@ -4145,6 +4145,7 @@ dependencies = [
  "serde_json",
  "soketto",
  "sp-authority-discovery",
+ "sp-authorship",
  "sp-consensus",
  "sp-consensus-babe",
  "sp-core",
@@ -4384,6 +4385,7 @@ dependencies = [
  "sp-finality-grandpa",
  "sp-inherents",
  "sp-runtime",
+ "sp-timestamp",
  "sp-transaction-pool",
  "structopt",
  "substrate-build-script-utils",
@@ -4691,7 +4693,6 @@ dependencies = [
  "serde",
  "sp-authorship",
  "sp-core",
- "sp-inherents",
  "sp-io",
  "sp-runtime",
  "sp-std",
@@ -7287,7 +7288,6 @@ dependencies = [
  "sp-core",
  "sp-inherents",
  "sp-runtime",
- "sp-timestamp",
  "substrate-prometheus-endpoint",
 ]
 
@@ -7298,6 +7298,7 @@ dependencies = [
  "async-trait",
  "futures 0.3.13",
  "futures-timer 3.0.2",
+ "impl-trait-for-tuples",
  "log",
  "parity-scale-codec",
  "sc-client-api",
@@ -7322,13 +7323,10 @@ dependencies = [
 name = "sc-consensus-uncles"
 version = "0.9.0"
 dependencies = [
- "log",
  "sc-client-api",
  "sp-authorship",
- "sp-consensus",
- "sp-core",
- "sp-inherents",
  "sp-runtime",
+ "thiserror",
 ]
 
 [[package]]
@@ -8606,6 +8604,7 @@ dependencies = [
 name = "sp-authorship"
 version = "3.0.0"
 dependencies = [
+ "async-trait",
  "parity-scale-codec",
  "sp-inherents",
  "sp-runtime",
@@ -8679,6 +8678,7 @@ dependencies = [
 name = "sp-consensus-aura"
 version = "0.9.0"
 dependencies = [
+ "async-trait",
  "parity-scale-codec",
  "sp-api",
  "sp-application-crypto",
@@ -8694,6 +8694,7 @@ dependencies = [
 name = "sp-consensus-babe"
 version = "0.9.0"
 dependencies = [
+ "async-trait",
  "merlin",
  "parity-scale-codec",
  "serde",
@@ -8837,9 +8838,12 @@ dependencies = [
 name = "sp-inherents"
 version = "3.0.0"
 dependencies = [
+ "async-trait",
+ "futures 0.3.13",
+ "impl-trait-for-tuples",
  "parity-scale-codec",
- "parking_lot 0.11.1",
  "sp-core",
+ "sp-runtime",
  "sp-std",
  "thiserror",
 ]
@@ -9180,11 +9184,15 @@ dependencies = [
 name = "sp-timestamp"
 version = "3.0.0"
 dependencies = [
+ "async-trait",
+ "futures-timer 3.0.2",
+ "log",
  "parity-scale-codec",
  "sp-api",
  "sp-inherents",
  "sp-runtime",
  "sp-std",
+ "thiserror",
  "wasm-timer",
 ]
 
@@ -9778,6 +9786,7 @@ dependencies = [
  "sp-keyring",
  "sp-keystore",
  "sp-runtime",
+ "sp-timestamp",
  "test-runner",
 ]
 
diff --git a/bin/node-template/node/Cargo.toml b/bin/node-template/node/Cargo.toml
index e53320c94051..d45241362fd2 100644
--- a/bin/node-template/node/Cargo.toml
+++ b/bin/node-template/node/Cargo.toml
@@ -35,6 +35,7 @@ sc-finality-grandpa = { version = "0.9.0", path = "../../../client/finality-gran
 sp-finality-grandpa = { version = "3.0.0", path = "../../../primitives/finality-grandpa" }
 sc-client-api = { version = "3.0.0", path = "../../../client/api" }
 sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
+sp-timestamp = { version = "3.0.0", path = "../../../primitives/timestamp" }
 
 # These dependencies are used for the node template's RPCs
 jsonrpc-core = "15.1.0"
diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
index 197a495b438b..c73956d885bf 100644
--- a/bin/node-template/node/src/service.rs
+++ b/bin/node-template/node/src/service.rs
@@ -1,11 +1,9 @@
 //! Service and ServiceFactory implementation. Specialized wrapper over substrate service.
 
-use std::sync::Arc;
-use std::time::Duration;
+use std::{sync::Arc, time::Duration};
 use sc_client_api::{ExecutorProvider, RemoteBackend};
 use node_template_runtime::{self, opaque::Block, RuntimeApi};
 use sc_service::{error::Error as ServiceError, Configuration, TaskManager};
-use sp_inherents::InherentDataProviders;
 use sc_executor::native_executor_instance;
 pub use sc_executor::NativeExecutor;
 use sp_consensus_aura::sr25519::AuthorityPair as AuraPair;
@@ -13,6 +11,7 @@ use sc_consensus_aura::{ImportQueueParams, StartAuraParams, SlotProportion};
 use sc_finality_grandpa::SharedVoterState;
 use sc_keystore::LocalKeystore;
 use sc_telemetry::{Telemetry, TelemetryWorker};
+use sp_consensus::SlotData;
 
 // Our native executor instance.
 native_executor_instance!(
@@ -45,7 +44,6 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 		return Err(ServiceError::Other(
 			format!("Remote Keystores are not supported.")))
 	}
-	let inherent_data_providers = InherentDataProviders::new();
 
 	let telemetry = config.telemetry_endpoints.clone()
 		.filter(|x| !x.is_empty())
@@ -90,15 +88,26 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 		grandpa_block_import.clone(), client.clone(),
 	);
 
-	let import_queue = sc_consensus_aura::import_queue::<AuraPair, _, _, _, _, _>(
+	let slot_duration = sc_consensus_aura::slot_duration(&*client)?.slot_duration();
+
+	let import_queue = sc_consensus_aura::import_queue::<AuraPair, _, _, _, _, _, _>(
 		ImportQueueParams {
 			block_import: aura_block_import.clone(),
 			justification_import: Some(Box::new(grandpa_block_import.clone())),
 			client: client.clone(),
-			inherent_data_providers: inherent_data_providers.clone(),
+			create_inherent_data_providers: move |_, ()| async move {
+				let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
+
+				let slot =
+					sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(
+						*timestamp,
+						slot_duration,
+					);
+
+				Ok((timestamp, slot))
+			},
 			spawner: &task_manager.spawn_essential_handle(),
 			can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()),
-			slot_duration: sc_consensus_aura::slot_duration(&*client)?,
 			registry: config.prometheus_registry(),
 			check_for_equivocation: Default::default(),
 			telemetry: telemetry.as_ref().map(|x| x.handle()),
@@ -113,7 +122,6 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 		keystore_container,
 		select_chain,
 		transaction_pool,
-		inherent_data_providers,
 		other: (aura_block_import, grandpa_link, telemetry),
 	})
 }
@@ -135,7 +143,6 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		mut keystore_container,
 		select_chain,
 		transaction_pool,
-		inherent_data_providers,
 		other: (block_import, grandpa_link, mut telemetry),
 	} = new_partial(&config)?;
 
@@ -220,14 +227,27 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		let can_author_with =
 			sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone());
 
-		let aura = sc_consensus_aura::start_aura::<AuraPair, _, _, _, _, _, _, _, _,_>(
+		let slot_duration = sc_consensus_aura::slot_duration(&*client)?;
+		let raw_slot_duration = slot_duration.slot_duration();
+
+		let aura = sc_consensus_aura::start_aura::<AuraPair, _, _, _, _, _, _, _, _, _, _>(
 			StartAuraParams {
-				slot_duration: sc_consensus_aura::slot_duration(&*client)?,
+				slot_duration,
 				client: client.clone(),
 				select_chain,
 				block_import,
 				proposer_factory,
-				inherent_data_providers: inherent_data_providers.clone(),
+				create_inherent_data_providers: move |_, ()| async move {
+					let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
+
+					let slot =
+						sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(
+							*timestamp,
+							raw_slot_duration,
+						);
+
+					Ok((timestamp, slot))
+				},
 				force_authoring,
 				backoff_authoring_blocks,
 				keystore: keystore_container.sync_keystore(),
@@ -338,15 +358,26 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		client.clone(),
 	);
 
-	let import_queue = sc_consensus_aura::import_queue::<AuraPair, _, _, _, _, _>(
+	let slot_duration = sc_consensus_aura::slot_duration(&*client)?.slot_duration();
+
+	let import_queue = sc_consensus_aura::import_queue::<AuraPair, _, _, _, _, _, _>(
 		ImportQueueParams {
 			block_import: aura_block_import.clone(),
 			justification_import: Some(Box::new(grandpa_block_import.clone())),
 			client: client.clone(),
-			inherent_data_providers: InherentDataProviders::new(),
+			create_inherent_data_providers: move |_, ()| async move {
+				let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
+
+				let slot =
+					sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(
+						*timestamp,
+						slot_duration,
+					);
+
+				Ok((timestamp, slot))
+			},
 			spawner: &task_manager.spawn_essential_handle(),
 			can_author_with: sp_consensus::NeverCanAuthor,
-			slot_duration: sc_consensus_aura::slot_duration(&*client)?,
 			registry: config.prometheus_registry(),
 			check_for_equivocation: Default::default(),
 			telemetry: telemetry.as_ref().map(|x| x.handle()),
diff --git a/bin/node/bench/src/construct.rs b/bin/node/bench/src/construct.rs
index 652466231714..3dce8966f7a1 100644
--- a/bin/node/bench/src/construct.rs
+++ b/bin/node/bench/src/construct.rs
@@ -49,6 +49,7 @@ use sp_transaction_pool::{
 	TxHash,
 };
 use sp_consensus::{Environment, Proposer};
+use sp_inherents::InherentDataProvider;
 
 use crate::{
 	common::SizeType,
@@ -153,10 +154,7 @@ impl core::Benchmark for ConstructionBenchmark {
 			None,
 			None,
 		);
-		let inherent_data_providers = sp_inherents::InherentDataProviders::new();
-		inherent_data_providers
-			.register_provider(sp_timestamp::InherentDataProvider)
-			.expect("Failed to register timestamp data provider");
+		let timestamp_provider = sp_timestamp::InherentDataProvider::from_system_time();
 
 		let start = std::time::Instant::now();
 
@@ -168,7 +166,7 @@ impl core::Benchmark for ConstructionBenchmark {
 
 		let _block = futures::executor::block_on(
 			proposer.propose(
-				inherent_data_providers.create_inherent_data().expect("Create inherent data failed"),
+				timestamp_provider.create_inherent_data().expect("Create inherent data failed"),
 				Default::default(),
 				std::time::Duration::from_secs(20),
 				None,
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index f552d3fff36c..ccba896a2068 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -49,7 +49,8 @@ sp-consensus-babe = { version = "0.9.0", path = "../../../primitives/consensus/b
 grandpa-primitives = { version = "3.0.0", package = "sp-finality-grandpa", path = "../../../primitives/finality-grandpa" }
 sp-core = { version = "3.0.0", path = "../../../primitives/core" }
 sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
-sp-timestamp = { version = "3.0.0", default-features = false, path = "../../../primitives/timestamp" }
+sp-timestamp = { version = "3.0.0", path = "../../../primitives/timestamp" }
+sp-authorship = { version = "3.0.0", path = "../../../primitives/authorship" }
 sp-inherents = { version = "3.0.0", path = "../../../primitives/inherents" }
 sp-keyring = { version = "3.0.0", path = "../../../primitives/keyring" }
 sp-keystore = { version = "0.9.0", path = "../../../primitives/keystore" }
@@ -65,6 +66,7 @@ sc-transaction-pool = { version = "3.0.0", path = "../../../client/transaction-p
 sc-network = { version = "0.9.0", path = "../../../client/network" }
 sc-consensus-slots = { version = "0.9.0", path = "../../../client/consensus/slots" }
 sc-consensus-babe = { version = "0.9.0", path = "../../../client/consensus/babe" }
+sc-consensus-uncles = { version = "0.9.0", path = "../../../client/consensus/uncles" }
 grandpa = { version = "0.9.0", package = "sc-finality-grandpa", path = "../../../client/finality-grandpa" }
 sc-client-db = { version = "0.9.0", default-features = false, path = "../../../client/db" }
 sc-offchain = { version = "3.0.0", path = "../../../client/offchain" }
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index b00451267d96..a13f8be9af13 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -27,7 +27,6 @@ use node_runtime::RuntimeApi;
 use sc_service::{
 	config::Configuration, error::Error as ServiceError, RpcHandlers, TaskManager,
 };
-use sp_inherents::InherentDataProviders;
 use sc_network::{Event, NetworkService};
 use sp_runtime::traits::Block as BlockT;
 use futures::prelude::*;
@@ -109,15 +108,29 @@ pub fn new_partial(
 		client.clone(),
 	)?;
 
-	let inherent_data_providers = sp_inherents::InherentDataProviders::new();
-
+	let slot_duration = babe_link.config().slot_duration();
 	let import_queue = sc_consensus_babe::import_queue(
 		babe_link.clone(),
 		block_import.clone(),
 		Some(Box::new(justification_import)),
 		client.clone(),
 		select_chain.clone(),
-		inherent_data_providers.clone(),
+		move |_, ()| {
+			async move {
+				let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
+
+				let slot =
+					sp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_duration(
+						*timestamp,
+						slot_duration,
+					);
+
+				let uncles =
+					sp_authorship::InherentDataProvider::<<Block as BlockT>::Header>::check_inherents();
+
+				Ok((timestamp, slot, uncles))
+			}
+		},
 		&task_manager.spawn_essential_handle(),
 		config.prometheus_registry(),
 		sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()),
@@ -183,14 +196,12 @@ pub fn new_partial(
 		select_chain,
 		import_queue,
 		transaction_pool,
-		inherent_data_providers,
 		other: (rpc_extensions_builder, import_setup, rpc_setup, telemetry),
 	})
 }
 
 pub struct NewFullBase {
 	pub task_manager: TaskManager,
-	pub inherent_data_providers: InherentDataProviders,
 	pub client: Arc<FullClient>,
 	pub network: Arc<NetworkService<Block, <Block as BlockT>::Hash>>,
 	pub network_status_sinks: sc_service::NetworkStatusSinks<Block>,
@@ -213,7 +224,6 @@ pub fn new_full_base(
 		keystore_container,
 		select_chain,
 		transaction_pool,
-		inherent_data_providers,
 		other: (rpc_extensions_builder, import_setup, rpc_setup, mut telemetry),
 	} = new_partial(&config)?;
 
@@ -291,6 +301,8 @@ pub fn new_full_base(
 		let can_author_with =
 			sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone());
 
+		let client_clone = client.clone();
+		let slot_duration = babe_link.config().slot_duration();
 		let babe_config = sc_consensus_babe::BabeParams {
 			keystore: keystore_container.sync_keystore(),
 			client: client.clone(),
@@ -298,7 +310,25 @@ pub fn new_full_base(
 			env: proposer,
 			block_import,
 			sync_oracle: network.clone(),
-			inherent_data_providers: inherent_data_providers.clone(),
+			create_inherent_data_providers: move |parent, ()| {
+				let client_clone = client_clone.clone();
+				async move {
+					let uncles = sc_consensus_uncles::create_uncles_inherent_data_provider(
+						&*client_clone,
+						parent,
+					)?;
+
+					let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
+
+					let slot =
+						sp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_duration(
+							*timestamp,
+							slot_duration,
+						);
+
+					Ok((timestamp, slot, uncles))
+				}
+			},
 			force_authoring,
 			backoff_authoring_blocks,
 			babe_link,
@@ -383,7 +413,6 @@ pub fn new_full_base(
 	network_starter.start_network();
 	Ok(NewFullBase {
 		task_manager,
-		inherent_data_providers,
 		client,
 		network,
 		network_status_sinks,
@@ -463,15 +492,27 @@ pub fn new_light_base(
 		client.clone(),
 	)?;
 
-	let inherent_data_providers = sp_inherents::InherentDataProviders::new();
-
+	let slot_duration = babe_link.config().slot_duration();
 	let import_queue = sc_consensus_babe::import_queue(
 		babe_link,
 		babe_block_import,
 		Some(Box::new(justification_import)),
 		client.clone(),
 		select_chain.clone(),
-		inherent_data_providers.clone(),
+		move |_, ()| async move {
+			let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
+
+			let slot =
+				sp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_duration(
+					*timestamp,
+					slot_duration,
+				);
+
+			let uncles =
+				sp_authorship::InherentDataProvider::<<Block as BlockT>::Header>::check_inherents();
+
+			Ok((timestamp, slot, uncles))
+		},
 		&task_manager.spawn_essential_handle(),
 		config.prometheus_registry(),
 		sp_consensus::NeverCanAuthor,
@@ -568,6 +609,7 @@ mod tests {
 	use sp_transaction_pool::{MaintainedTransactionPool, ChainEvent};
 	use sc_client_api::BlockBackend;
 	use sc_keystore::LocalKeystore;
+	use sp_inherents::InherentDataProvider;
 
 	type AccountPublic = <Signature as Verify>::Signer;
 
@@ -597,7 +639,7 @@ mod tests {
 			|config| {
 				let mut setup_handles = None;
 				let NewFullBase {
-					task_manager, inherent_data_providers, client, network, transaction_pool, ..
+					task_manager, client, network, transaction_pool, ..
 				} = new_full_base(config,
 					|
 						block_import: &sc_consensus_babe::BabeBlockImport<Block, _, _>,
@@ -610,17 +652,13 @@ mod tests {
 				let node = sc_service_test::TestNetComponents::new(
 					task_manager, client, network, transaction_pool
 				);
-				Ok((node, (inherent_data_providers, setup_handles.unwrap())))
+				Ok((node, setup_handles.unwrap()))
 			},
 			|config| {
 				let (keep_alive, _, client, network, transaction_pool) = new_light_base(config)?;
 				Ok(sc_service_test::TestNetComponents::new(keep_alive, client, network, transaction_pool))
 			},
-			|service, &mut (ref inherent_data_providers, (ref mut block_import, ref babe_link))| {
-				let mut inherent_data = inherent_data_providers
-					.create_inherent_data()
-					.expect("Creates inherent data.");
-
+			|service, &mut (ref mut block_import, ref babe_link)| {
 				let parent_id = BlockId::number(service.client().chain_info().best_number);
 				let parent_header = service.client().header(&parent_id).unwrap().unwrap();
 				let parent_hash = parent_header.hash();
@@ -648,11 +686,6 @@ mod tests {
 				// even though there's only one authority some slots might be empty,
 				// so we must keep trying the next slots until we can claim one.
 				let (babe_pre_digest, epoch_descriptor) = loop {
-					inherent_data.replace_data(
-						sp_timestamp::INHERENT_IDENTIFIER,
-						&(slot * SLOT_DURATION),
-					);
-
 					let epoch_descriptor = babe_link.epoch_changes().shared_data().epoch_descriptor_for_child_of(
 						descendent_query(&*service.client()),
 						&parent_hash,
@@ -676,6 +709,13 @@ mod tests {
 					slot += 1;
 				};
 
+				let inherent_data = (
+					sp_timestamp::InherentDataProvider::new(
+						std::time::Duration::from_millis(SLOT_DURATION * slot).into(),
+					),
+					sp_consensus_babe::inherents::InherentDataProvider::new(slot.into()),
+				).create_inherent_data().expect("Creates inherent data");
+
 				digest.push(<DigestItem as CompatibleDigestItem>::babe_pre_digest(babe_pre_digest));
 
 				let new_block = futures::executor::block_on(async move {
diff --git a/bin/node/test-runner-example/Cargo.toml b/bin/node/test-runner-example/Cargo.toml
index 9d810ddbcfde..7b8658203132 100644
--- a/bin/node/test-runner-example/Cargo.toml
+++ b/bin/node/test-runner-example/Cargo.toml
@@ -32,6 +32,7 @@ sc-consensus = { version = "0.9.0", path = "../../../client/consensus/common" }
 
 sp-runtime = { path = "../../../primitives/runtime", version = "3.0.0" }
 sp-keyring = { version = "3.0.0", path = "../../../primitives/keyring" }
+sp-timestamp = { version = "3.0.0", path = "../../../primitives/timestamp" }
 sp-api = { version = "3.0.0",  path = "../../../primitives/api" }
 sp-inherents = { version = "3.0.0", path = "../../../primitives/inherents" }
 sp-keystore = { version = "0.9.0", path = "../../../primitives/keystore" }
diff --git a/bin/node/test-runner-example/src/lib.rs b/bin/node/test-runner-example/src/lib.rs
index ac589437248e..8a5fbdad885c 100644
--- a/bin/node/test-runner-example/src/lib.rs
+++ b/bin/node/test-runner-example/src/lib.rs
@@ -22,7 +22,7 @@ use test_runner::{Node, ChainInfo, SignatureVerificationOverride, default_config
 use grandpa::GrandpaBlockImport;
 use sc_service::{TFullBackend, TFullClient, Configuration, TaskManager, new_full_parts, TaskExecutor};
 use std::sync::Arc;
-use sp_inherents::InherentDataProviders;
+use sp_inherents::CreateInherentDataProviders;
 use sc_consensus_babe::BabeBlockImport;
 use sp_keystore::SyncCryptoStorePtr;
 use sp_keyring::sr25519::Keyring::Alice;
@@ -59,6 +59,10 @@ impl ChainInfo for NodeTemplateChainInfo {
 		Self::SelectChain,
 	>;
 	type SignedExtras = node_runtime::SignedExtra;
+	type InherentDataProviders = (
+		sp_timestamp::InherentDataProvider,
+		sp_consensus_babe::inherents::InherentDataProvider,
+	);
 
 	fn signed_extras(from: <Self::Runtime as frame_system::Config>::AccountId) -> Self::SignedExtras {
 		(
@@ -84,7 +88,11 @@ impl ChainInfo for NodeTemplateChainInfo {
 			Arc<TFullBackend<Self::Block>>,
 			SyncCryptoStorePtr,
 			TaskManager,
-			InherentDataProviders,
+			Box<dyn CreateInherentDataProviders<
+				Self::Block,
+				(),
+				InherentDataProviders = Self::InherentDataProviders
+			>>,
 			Option<
 				Box<
 					dyn ConsensusDataProvider<
@@ -105,7 +113,6 @@ impl ChainInfo for NodeTemplateChainInfo {
 			new_full_parts::<Self::Block, Self::RuntimeApi, Self::Executor>(config, None)?;
 		let client = Arc::new(client);
 
-		let inherent_providers = InherentDataProviders::new();
 		let select_chain = sc_consensus::LongestChain::new(backend.clone());
 
 		let (grandpa_block_import, ..) =
@@ -116,8 +123,9 @@ impl ChainInfo for NodeTemplateChainInfo {
 				None
 			)?;
 
+		let slot_duration = sc_consensus_babe::Config::get_or_compute(&*client)?;
 		let (block_import, babe_link) = sc_consensus_babe::block_import(
-			sc_consensus_babe::Config::get_or_compute(&*client)?,
+			slot_duration.clone(),
 			grandpa_block_import,
 			client.clone(),
 		)?;
@@ -125,7 +133,6 @@ impl ChainInfo for NodeTemplateChainInfo {
 		let consensus_data_provider = BabeConsensusDataProvider::new(
 			client.clone(),
 			keystore.sync_keystore(),
-			&inherent_providers,
 			babe_link.epoch_changes().clone(),
 			vec![(AuthorityId::from(Alice.public()), 1000)],
 		)
@@ -136,7 +143,18 @@ impl ChainInfo for NodeTemplateChainInfo {
 			backend,
 			keystore.sync_keystore(),
 			task_manager,
-			inherent_providers,
+			Box::new(move |_, _| {
+				let slot_duration = slot_duration.clone();
+				async move {
+					let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
+					let slot = sp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_duration(
+						*timestamp,
+						slot_duration.slot_duration(),
+					);
+
+					Ok((timestamp, slot))
+				}
+			}),
 			Some(Box::new(consensus_data_provider)),
 			select_chain,
 			block_import,
diff --git a/client/consensus/aura/Cargo.toml b/client/consensus/aura/Cargo.toml
index b2301fa9c5de..27c1534032f4 100644
--- a/client/consensus/aura/Cargo.toml
+++ b/client/consensus/aura/Cargo.toml
@@ -33,7 +33,6 @@ sp-version = { version = "3.0.0", path = "../../../primitives/version" }
 sc-consensus-slots = { version = "0.9.0", path = "../slots" }
 sp-api = { version = "3.0.0", path = "../../../primitives/api" }
 sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
-sp-timestamp = { version = "3.0.0", path = "../../../primitives/timestamp" }
 sp-keystore = { version = "0.9.0", path = "../../../primitives/keystore" }
 sc-telemetry = { version = "3.0.0", path = "../../telemetry" }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0"}
@@ -43,6 +42,7 @@ async-trait = "0.1.42"
 getrandom = { version = "0.2", features = ["js"], optional = true }
 
 [dev-dependencies]
+sp-timestamp = { version = "3.0.0", path = "../../../primitives/timestamp" }
 sp-keyring = { version = "3.0.0", path = "../../../primitives/keyring" }
 sp-tracing = { version = "3.0.0", path = "../../../primitives/tracing" }
 sc-executor = { version = "0.9.0", path = "../../executor" }
diff --git a/client/consensus/aura/src/import_queue.rs b/client/consensus/aura/src/import_queue.rs
index 0ec95d9412c2..6bf9f69722ca 100644
--- a/client/consensus/aura/src/import_queue.rs
+++ b/client/consensus/aura/src/import_queue.rs
@@ -18,19 +18,15 @@
 
 //! Module implementing the logic for verifying and importing AuRa blocks.
 
-use crate::{
-	AuthorityId, find_pre_digest, slot_author, aura_err, Error, AuraSlotCompatible, SlotDuration,
-	register_aura_inherent_data_provider, authorities,
-};
+use crate::{AuthorityId, find_pre_digest, slot_author, aura_err, Error, authorities};
 use std::{
-	sync::Arc, time::Duration, thread, marker::PhantomData, hash::Hash, fmt::Debug,
-	collections::HashMap,
+	sync::Arc, marker::PhantomData, hash::Hash, fmt::Debug, collections::HashMap,
 };
 use log::{debug, info, trace};
 use prometheus_endpoint::Registry;
 use codec::{Encode, Decode, Codec};
 use sp_consensus::{
-	BlockImport, CanAuthorWith, ForkChoiceStrategy, BlockImportParams, SlotData,
+	BlockImport, CanAuthorWith, ForkChoiceStrategy, BlockImportParams,
 	BlockOrigin, Error as ConsensusError, BlockCheckParams, ImportResult,
 	import_queue::{
 		Verifier, BasicQueue, DefaultImportQueue, BoxJustificationImport,
@@ -43,10 +39,9 @@ use sp_runtime::{generic::{BlockId, OpaqueDigestItemId}, Justifications};
 use sp_runtime::traits::{Block as BlockT, Header, DigestItemFor, Zero};
 use sp_api::ProvideRuntimeApi;
 use sp_core::crypto::Pair;
-use sp_inherents::{InherentDataProviders, InherentData};
-use sp_timestamp::InherentError as TIError;
-use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_TRACE, CONSENSUS_DEBUG, CONSENSUS_INFO};
-use sc_consensus_slots::{CheckedHeader, SlotCompatible, check_equivocation};
+use sp_inherents::{CreateInherentDataProviders, InherentDataProvider as _};
+use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_TRACE, CONSENSUS_DEBUG};
+use sc_consensus_slots::{CheckedHeader, check_equivocation, InherentDataProviderExt};
 use sp_consensus_slots::Slot;
 use sp_api::ApiExt;
 use sp_consensus_aura::{
@@ -118,26 +113,26 @@ fn check_header<C, B: BlockT, P: Pair>(
 }
 
 /// A verifier for Aura blocks.
-pub struct AuraVerifier<C, P, CAW> {
+pub struct AuraVerifier<C, P, CAW, IDP> {
 	client: Arc<C>,
 	phantom: PhantomData<P>,
-	inherent_data_providers: InherentDataProviders,
+	create_inherent_data_providers: IDP,
 	can_author_with: CAW,
 	check_for_equivocation: CheckForEquivocation,
 	telemetry: Option<TelemetryHandle>,
 }
 
-impl<C, P, CAW> AuraVerifier<C, P, CAW> {
+impl<C, P, CAW, IDP> AuraVerifier<C, P, CAW, IDP> {
 	pub(crate) fn new(
 		client: Arc<C>,
-		inherent_data_providers: InherentDataProviders,
+		create_inherent_data_providers: IDP,
 		can_author_with: CAW,
 		check_for_equivocation: CheckForEquivocation,
 		telemetry: Option<TelemetryHandle>,
 	) -> Self {
 		Self {
 			client,
-			inherent_data_providers,
+			create_inherent_data_providers,
 			can_author_with,
 			check_for_equivocation,
 			telemetry,
@@ -146,22 +141,22 @@ impl<C, P, CAW> AuraVerifier<C, P, CAW> {
 	}
 }
 
-impl<C, P, CAW> AuraVerifier<C, P, CAW> where
+impl<C, P, CAW, IDP> AuraVerifier<C, P, CAW, IDP> where
 	P: Send + Sync + 'static,
 	CAW: Send + Sync + 'static,
+	IDP: Send,
 {
-	fn check_inherents<B: BlockT>(
+	async fn check_inherents<B: BlockT>(
 		&self,
 		block: B,
 		block_id: BlockId<B>,
-		inherent_data: InherentData,
-		timestamp_now: u64,
+		inherent_data: sp_inherents::InherentData,
+		create_inherent_data_providers: IDP::InherentDataProviders,
 	) -> Result<(), Error<B>> where
 		C: ProvideRuntimeApi<B>, C::Api: BlockBuilderApi<B>,
 		CAW: CanAuthorWith<B>,
+		IDP: CreateInherentDataProviders<B, ()>,
 	{
-		const MAX_TIMESTAMP_DRIFT_SECS: u64 = 60;
-
 		if let Err(e) = self.can_author_with.can_author_with(&block_id) {
 			debug!(
 				target: "aura",
@@ -179,44 +174,20 @@ impl<C, P, CAW> AuraVerifier<C, P, CAW> where
 		).map_err(|e| Error::Client(e.into()))?;
 
 		if !inherent_res.ok() {
-			inherent_res
-				.into_errors()
-				.try_for_each(|(i, e)| match TIError::try_from(&i, &e) {
-					Some(TIError::ValidAtTimestamp(timestamp)) => {
-						// halt import until timestamp is valid.
-						// reject when too far ahead.
-						if timestamp > timestamp_now + MAX_TIMESTAMP_DRIFT_SECS {
-							return Err(Error::TooFarInFuture);
-						}
-
-						let diff = timestamp.saturating_sub(timestamp_now);
-						info!(
-							target: "aura",
-							"halting for block {} seconds in the future",
-							diff
-						);
-						telemetry!(
-							self.telemetry;
-							CONSENSUS_INFO;
-							"aura.halting_for_future_block";
-							"diff" => ?diff
-						);
-						thread::sleep(Duration::from_secs(diff));
-						Ok(())
-					},
-					Some(TIError::Other(e)) => Err(Error::Runtime(e.into())),
-					None => Err(Error::DataProvider(
-						self.inherent_data_providers.error_to_string(&i, &e)
-					)),
-				})
-		} else {
-			Ok(())
+			for (i, e) in inherent_res.into_errors() {
+				match create_inherent_data_providers.try_handle_error(&i, &e).await {
+					Some(res) => res.map_err(Error::Inherent)?,
+					None => return Err(Error::UnknownInherentError(i)),
+				}
+			}
 		}
+
+		Ok(())
 	}
 }
 
 #[async_trait::async_trait]
-impl<B: BlockT, C, P, CAW> Verifier<B> for AuraVerifier<C, P, CAW> where
+impl<B: BlockT, C, P, CAW, IDP> Verifier<B> for AuraVerifier<C, P, CAW, IDP> where
 	C: ProvideRuntimeApi<B> +
 		Send +
 		Sync +
@@ -229,6 +200,8 @@ impl<B: BlockT, C, P, CAW> Verifier<B> for AuraVerifier<C, P, CAW> where
 	P::Public: Send + Sync + Hash + Eq + Clone + Decode + Encode + Debug + 'static,
 	P::Signature: Encode + Decode,
 	CAW: CanAuthorWith<B> + Send + Sync + 'static,
+	IDP: CreateInherentDataProviders<B, ()> + Send + Sync,
+	IDP::InherentDataProviders: InherentDataProviderExt + Send + Sync,
 {
 	async fn verify(
 		&mut self,
@@ -237,16 +210,24 @@ impl<B: BlockT, C, P, CAW> Verifier<B> for AuraVerifier<C, P, CAW> where
 		justifications: Option<Justifications>,
 		mut body: Option<Vec<B::Extrinsic>>,
 	) -> Result<(BlockImportParams<B, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String> {
-		let mut inherent_data = self.inherent_data_providers
-			.create_inherent_data()
-			.map_err(|e| e.into_string())?;
-		let (timestamp_now, slot_now, _) = AuraSlotCompatible.extract_timestamp_and_slot(&inherent_data)
-			.map_err(|e| format!("Could not extract timestamp and slot: {:?}", e))?;
 		let hash = header.hash();
 		let parent_hash = *header.parent_hash();
 		let authorities = authorities(self.client.as_ref(), &BlockId::Hash(parent_hash))
 			.map_err(|e| format!("Could not fetch authorities at {:?}: {:?}", parent_hash, e))?;
 
+		let create_inherent_data_providers = self.create_inherent_data_providers
+			.create_inherent_data_providers(
+				parent_hash,
+				(),
+			)
+			.await
+			.map_err(|e| Error::<B>::Client(sp_blockchain::Error::Application(e)))?;
+
+		let mut inherent_data = create_inherent_data_providers.create_inherent_data()
+			.map_err(Error::<B>::Inherent)?;
+
+		let slot_now = create_inherent_data_providers.slot();
+
 		// we add one to allow for some small drift.
 		// FIXME #1019 in the future, alter this queue to allow deferring of
 		// headers
@@ -264,9 +245,10 @@ impl<B: BlockT, C, P, CAW> Verifier<B> for AuraVerifier<C, P, CAW> where
 				// to check that the internally-set timestamp in the inherents
 				// actually matches the slot set in the seal.
 				if let Some(inner_body) = body.take() {
-					inherent_data.aura_replace_inherent_data(slot);
 					let block = B::new(pre_header.clone(), inner_body);
 
+					inherent_data.aura_replace_inherent_data(slot);
+
 					// skip the inherents verification if the runtime API is old.
 					if self.client
 						.runtime_api()
@@ -280,8 +262,8 @@ impl<B: BlockT, C, P, CAW> Verifier<B> for AuraVerifier<C, P, CAW> where
 							block.clone(),
 							BlockId::Hash(parent_hash),
 							inherent_data,
-							*timestamp_now,
-						).map_err(|e| e.to_string())?;
+							create_inherent_data_providers,
+						).await.map_err(|e| e.to_string())?;
 					}
 
 					let (_, inner_body) = block.deconstruct();
@@ -480,15 +462,15 @@ impl Default for CheckForEquivocation {
 }
 
 /// Parameters of [`import_queue`].
-pub struct ImportQueueParams<'a, Block, I, C, S, CAW> {
+pub struct ImportQueueParams<'a, Block, I, C, S, CAW, CIDP> {
 	/// The block import to use.
 	pub block_import: I,
 	/// The justification import.
 	pub justification_import: Option<BoxJustificationImport<Block>>,
 	/// The client to interact with the chain.
 	pub client: Arc<C>,
-	/// The inherent data provider, to create the inherent data.
-	pub inherent_data_providers: InherentDataProviders,
+	/// Something that can create the inherent data providers.
+	pub create_inherent_data_providers: CIDP,
 	/// The spawner to spawn background tasks.
 	pub spawner: &'a S,
 	/// The prometheus registry.
@@ -497,26 +479,23 @@ pub struct ImportQueueParams<'a, Block, I, C, S, CAW> {
 	pub can_author_with: CAW,
 	/// Should we check for equivocation?
 	pub check_for_equivocation: CheckForEquivocation,
-	/// The duration of one slot.
-	pub slot_duration: SlotDuration,
 	/// Telemetry instance used to report telemetry metrics.
 	pub telemetry: Option<TelemetryHandle>,
 }
 
 /// Start an import queue for the Aura consensus algorithm.
-pub fn import_queue<'a, P, Block, I, C, S, CAW>(
+pub fn import_queue<'a, P, Block, I, C, S, CAW, CIDP>(
 	ImportQueueParams {
 		block_import,
 		justification_import,
 		client,
-		inherent_data_providers,
+		create_inherent_data_providers,
 		spawner,
 		registry,
 		can_author_with,
 		check_for_equivocation,
-		slot_duration,
 		telemetry,
-	}: ImportQueueParams<'a, Block, I, C, S, CAW>
+	}: ImportQueueParams<'a, Block, I, C, S, CAW, CIDP>
 ) -> Result<DefaultImportQueue<Block, C>, sp_consensus::Error> where
 	Block: BlockT,
 	C::Api: BlockBuilderApi<Block> + AuraApi<Block, AuthorityId<P>> + ApiExt<Block>,
@@ -538,13 +517,14 @@ pub fn import_queue<'a, P, Block, I, C, S, CAW>(
 	P::Signature: Encode + Decode,
 	S: sp_core::traits::SpawnEssentialNamed,
 	CAW: CanAuthorWith<Block> + Send + Sync + 'static,
+	CIDP: CreateInherentDataProviders<Block, ()> + Sync + Send + 'static,
+	CIDP::InherentDataProviders: InherentDataProviderExt + Send + Sync,
 {
-	register_aura_inherent_data_provider(&inherent_data_providers, slot_duration.slot_duration())?;
 	initialize_authorities_cache(&*client)?;
 
-	let verifier = AuraVerifier::<_, P, _>::new(
+	let verifier = AuraVerifier::<_, P, _, _>::new(
 		client,
-		inherent_data_providers,
+		create_inherent_data_providers,
 		can_author_with,
 		check_for_equivocation,
 		telemetry,
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index 3c72f359f8f1..ce254799d61f 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -31,7 +31,8 @@
 //! NOTE: Aura itself is designed to be generic over the crypto used.
 #![forbid(missing_docs, unsafe_code)]
 use std::{
-	sync::Arc, marker::PhantomData, hash::Hash, fmt::Debug, pin::Pin, convert::{TryFrom, TryInto},
+	sync::Arc, marker::PhantomData, hash::Hash, fmt::Debug, pin::Pin,
+	convert::{TryFrom, TryInto},
 };
 
 use futures::prelude::*;
@@ -41,7 +42,7 @@ use codec::{Encode, Decode, Codec};
 
 use sp_consensus::{
 	BlockImport, Environment, Proposer, CanAuthorWith, ForkChoiceStrategy, BlockImportParams,
-	BlockOrigin, Error as ConsensusError, SelectChain, SlotData,
+	BlockOrigin, Error as ConsensusError, SelectChain,
 };
 use sc_client_api::{backend::AuxStore, BlockOf};
 use sp_blockchain::{Result as CResult, well_known_cache_keys, ProvideCache, HeaderBackend};
@@ -52,10 +53,11 @@ use sp_runtime::traits::{Block as BlockT, Header, DigestItemFor, Zero, Member};
 use sp_api::ProvideRuntimeApi;
 use sp_core::crypto::Pair;
 use sp_keystore::{SyncCryptoStorePtr, SyncCryptoStore};
-use sp_inherents::{InherentDataProviders, InherentData};
-use sp_timestamp::TimestampInherentData;
-use sc_consensus_slots::{SlotInfo, SlotCompatible, StorageChanges, BackoffAuthoringBlocksStrategy};
+use sp_inherents::CreateInherentDataProviders;
 use sc_telemetry::TelemetryHandle;
+use sc_consensus_slots::{
+	SlotInfo, BackoffAuthoringBlocksStrategy, InherentDataProviderExt, StorageChanges,
+};
 use sp_consensus_slots::Slot;
 
 mod import_queue;
@@ -64,7 +66,7 @@ pub use sp_consensus_aura::{
 	ConsensusLog, AuraApi, AURA_ENGINE_ID, digests::CompatibleDigestItem,
 	inherents::{
 		InherentType as AuraInherent,
-		AuraInherentData, INHERENT_IDENTIFIER, InherentDataProvider,
+		INHERENT_IDENTIFIER, InherentDataProvider,
 	},
 };
 pub use sp_consensus::SyncOracle;
@@ -103,24 +105,8 @@ fn slot_author<P: Pair>(slot: Slot, authorities: &[AuthorityId<P>]) -> Option<&A
 	Some(current_author)
 }
 
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
-struct AuraSlotCompatible;
-
-impl SlotCompatible for AuraSlotCompatible {
-	fn extract_timestamp_and_slot(
-		&self,
-		data: &InherentData,
-	) -> Result<(sp_timestamp::Timestamp, AuraInherent, std::time::Duration), sp_consensus::Error> {
-		data.timestamp_inherent_data()
-			.and_then(|t| data.aura_inherent_data().map(|a| (t, a)))
-			.map_err(Into::into)
-			.map_err(sp_consensus::Error::InherentData)
-			.map(|(x, y)| (x, y, Default::default()))
-	}
-}
-
 /// Parameters of [`start_aura`].
-pub struct StartAuraParams<C, SC, I, PF, SO, BS, CAW> {
+pub struct StartAuraParams<C, SC, I, PF, SO, BS, CAW, IDP> {
 	/// The duration of a slot.
 	pub slot_duration: SlotDuration,
 	/// The client to interact with the chain.
@@ -133,8 +119,8 @@ pub struct StartAuraParams<C, SC, I, PF, SO, BS, CAW> {
 	pub proposer_factory: PF,
 	/// The sync oracle that can give us the current sync status.
 	pub sync_oracle: SO,
-	/// The inherent data providers to create the inherent data.
-	pub inherent_data_providers: InherentDataProviders,
+	/// Something that can create the inherent data providers.
+	pub create_inherent_data_providers: IDP,
 	/// Should we force the authoring of blocks?
 	pub force_authoring: bool,
 	/// The backoff strategy when we miss slots.
@@ -154,7 +140,7 @@ pub struct StartAuraParams<C, SC, I, PF, SO, BS, CAW> {
 }
 
 /// Start the aura worker. The returned future should be run in a futures executor.
-pub fn start_aura<P, B, C, SC, PF, I, SO, CAW, BS, Error>(
+pub fn start_aura<P, B, C, SC, PF, I, SO, CAW, BS, Error, IDP>(
 	StartAuraParams {
 		slot_duration,
 		client,
@@ -162,14 +148,14 @@ pub fn start_aura<P, B, C, SC, PF, I, SO, CAW, BS, Error>(
 		block_import,
 		proposer_factory,
 		sync_oracle,
-		inherent_data_providers,
+		create_inherent_data_providers,
 		force_authoring,
 		backoff_authoring_blocks,
 		keystore,
 		can_author_with,
 		block_proposal_slot_portion,
 		telemetry,
-	}: StartAuraParams<C, SC, I, PF, SO, BS, CAW>,
+	}: StartAuraParams<C, SC, I, PF, SO, BS, CAW, IDP>,
 ) -> Result<impl Future<Output = ()>, sp_consensus::Error> where
 	B: BlockT,
 	C: ProvideRuntimeApi<B> + BlockOf + ProvideCache<B> + AuxStore + HeaderBackend<B> + Send + Sync,
@@ -185,6 +171,8 @@ pub fn start_aura<P, B, C, SC, PF, I, SO, CAW, BS, Error>(
 	SO: SyncOracle + Send + Sync + Clone,
 	CAW: CanAuthorWith<B> + Send,
 	BS: BackoffAuthoringBlocksStrategy<NumberFor<B>> + Send + 'static,
+	IDP: CreateInherentDataProviders<B, ()> + Send,
+	IDP::InherentDataProviders: InherentDataProviderExt + Send,
 {
 	let worker = build_aura_worker::<P, _, _, _, _, _, _, _>(BuildAuraWorkerParams {
 		client: client.clone(),
@@ -198,18 +186,12 @@ pub fn start_aura<P, B, C, SC, PF, I, SO, CAW, BS, Error>(
 		block_proposal_slot_portion,
 	});
 
-	register_aura_inherent_data_provider(
-		&inherent_data_providers,
-		slot_duration.slot_duration()
-	)?;
-
-	Ok(sc_consensus_slots::start_slot_worker::<_, _, _, _, _, AuraSlotCompatible, _, _>(
+	Ok(sc_consensus_slots::start_slot_worker(
 		slot_duration,
 		select_chain,
 		worker,
 		sync_oracle,
-		inherent_data_providers,
-		AuraSlotCompatible,
+		create_inherent_data_providers,
 		can_author_with,
 	))
 }
@@ -278,8 +260,8 @@ pub fn build_aura_worker<P, B, C, PF, I, SO, BS, Error>(
 		force_authoring,
 		backoff_authoring_blocks,
 		telemetry,
-		_key_type: PhantomData::<P>,
 		block_proposal_slot_portion,
+		_key_type: PhantomData::<P>,
 	}
 }
 
@@ -452,8 +434,7 @@ where
 
 	fn proposing_remaining_duration(
 		&self,
-		head: &B::Header,
-		slot_info: &SlotInfo,
+		slot_info: &SlotInfo<B>,
 	) -> std::time::Duration {
 		let max_proposing = slot_info.duration.mul_f32(self.block_proposal_slot_portion.get());
 
@@ -464,11 +445,11 @@ where
 		let slot_remaining = std::cmp::min(slot_remaining, max_proposing);
 
 		// If parent is genesis block, we don't require any lenience factor.
-		if head.number().is_zero() {
+		if slot_info.chain_head.number().is_zero() {
 			return slot_remaining
 		}
 
-		let parent_slot = match find_pre_digest::<B, P::Signature>(head) {
+		let parent_slot = match find_pre_digest::<B, P::Signature>(&slot_info.chain_head) {
 			Err(_) => return slot_remaining,
 			Ok(d) => d,
 		};
@@ -509,15 +490,15 @@ enum Error<B: BlockT> {
 	SlotAuthorNotFound,
 	#[display(fmt = "Bad signature on {:?}", _0)]
 	BadSignature(B::Hash),
-	#[display(fmt = "Rejecting block too far in future")]
-	TooFarInFuture,
 	Client(sp_blockchain::Error),
-	DataProvider(String),
-	Runtime(String),
 	#[display(fmt = "Slot number must increase: parent slot: {}, this slot: {}", _0, _1)]
 	SlotMustIncrease(Slot, Slot),
 	#[display(fmt = "Parent ({}) of {} unavailable. Cannot import", _0, _1)]
 	ParentUnavailable(B::Hash, B::Hash),
+	#[display(fmt = "Unknown inherent error for identifier: {}", "String::from_utf8_lossy(_0)")]
+	UnknownInherentError(sp_inherents::InherentIdentifier),
+	#[display(fmt = "Inherent error: {}", _0)]
+	Inherent(sp_inherents::Error),
 }
 
 impl<B: BlockT> std::convert::From<Error<B>> for String {
@@ -543,21 +524,6 @@ fn find_pre_digest<B: BlockT, Signature: Codec>(header: &B::Header) -> Result<Sl
 	pre_digest.ok_or_else(|| aura_err(Error::NoDigestFound))
 }
 
-/// Register the aura inherent data provider, if not registered already.
-fn register_aura_inherent_data_provider(
-	inherent_data_providers: &InherentDataProviders,
-	slot_duration: std::time::Duration,
-) -> Result<(), sp_consensus::Error> {
-	if !inherent_data_providers.has_provider(&INHERENT_IDENTIFIER) {
-		inherent_data_providers
-			.register_provider(InherentDataProvider::new(slot_duration))
-			.map_err(Into::into)
-			.map_err(sp_consensus::Error::InherentData)
-	} else {
-		Ok(())
-	}
-}
-
 fn authorities<A, B, C>(client: &C, at: &BlockId<B>) -> Result<Vec<A>, ConsensusError> where
 	A: Codec + Debug,
 	B: BlockT,
@@ -580,7 +546,7 @@ mod tests {
 	use super::*;
 	use sp_consensus::{
 		NoNetwork as DummyOracle, Proposal, AlwaysCanAuthor, DisableProofRecording,
-		import_queue::BoxJustificationImport,
+		import_queue::BoxJustificationImport, SlotData,
 	};
 	use sc_network_test::{Block as TestBlock, *};
 	use sp_runtime::traits::{Block as BlockT, DigestFor};
@@ -596,6 +562,8 @@ mod tests {
 	use substrate_test_runtime_client::{TestClient, runtime::{Header, H256}};
 	use sc_keystore::LocalKeystore;
 	use sp_application_crypto::key_types::AURA;
+	use sp_inherents::InherentData;
+	use sp_timestamp::InherentDataProvider as TimestampInherentDataProvider;
 
 	type Error = sp_blockchain::Error;
 
@@ -643,7 +611,16 @@ mod tests {
 
 	const SLOT_DURATION: u64 = 1000;
 
-	type AuraVerifier = import_queue::AuraVerifier<PeersFullClient, AuthorityPair, AlwaysCanAuthor>;
+	type AuraVerifier = import_queue::AuraVerifier<
+		PeersFullClient,
+		AuthorityPair,
+		AlwaysCanAuthor,
+		Box<dyn CreateInherentDataProviders<
+			TestBlock,
+			(),
+			InherentDataProviders = (TimestampInherentDataProvider, InherentDataProvider)
+		>>
+	>;
 	type AuraPeer = Peer<(), PeersClient>;
 
 	pub struct AuraTestNet {
@@ -668,16 +645,19 @@ mod tests {
 			match client {
 				PeersClient::Full(client, _) => {
 					let slot_duration = slot_duration(&*client).expect("slot duration available");
-					let inherent_data_providers = InherentDataProviders::new();
-					register_aura_inherent_data_provider(
-						&inherent_data_providers,
-						slot_duration.slot_duration()
-					).expect("Registers aura inherent data provider");
 
 					assert_eq!(slot_duration.slot_duration().as_millis() as u64, SLOT_DURATION);
 					import_queue::AuraVerifier::new(
 						client,
-						inherent_data_providers,
+						Box::new(|_, _| async {
+							let timestamp = TimestampInherentDataProvider::from_system_time();
+							let slot = InherentDataProvider::from_timestamp_and_duration(
+								*timestamp,
+								Duration::from_secs(6),
+							);
+
+							Ok((timestamp, slot))
+						}),
 						AlwaysCanAuthor,
 						CheckForEquivocation::Yes,
 						None,
@@ -746,19 +726,22 @@ mod tests {
 
 			let slot_duration = slot_duration(&*client).expect("slot duration available");
 
-			let inherent_data_providers = InherentDataProviders::new();
-			register_aura_inherent_data_provider(
-				&inherent_data_providers, slot_duration.slot_duration()
-			).expect("Registers aura inherent data provider");
-
-			aura_futures.push(start_aura::<AuthorityPair, _, _, _, _, _, _, _, _, _>(StartAuraParams {
+			aura_futures.push(start_aura::<AuthorityPair, _, _, _, _, _, _, _, _, _, _>(StartAuraParams {
 				slot_duration,
 				block_import: client.clone(),
 				select_chain,
 				client,
 				proposer_factory: environ,
 				sync_oracle: DummyOracle,
-				inherent_data_providers,
+				create_inherent_data_providers: |_, _| async {
+					let timestamp = TimestampInherentDataProvider::from_system_time();
+					let slot = InherentDataProvider::from_timestamp_and_duration(
+						*timestamp,
+						Duration::from_secs(6),
+					);
+
+					Ok((timestamp, slot))
+				},
 				force_authoring: false,
 				backoff_authoring_blocks: Some(BackoffAuthoringOnFinalizedHeadLagging::default()),
 				keystore,
@@ -881,13 +864,13 @@ mod tests {
 		let head = client.header(&BlockId::Number(0)).unwrap().unwrap();
 
 		let res = futures::executor::block_on(worker.on_slot(
-			head,
 			SlotInfo {
 				slot: 0.into(),
 				timestamp: 0.into(),
 				ends_at: Instant::now() + Duration::from_secs(100),
 				inherent_data: InherentData::new(),
 				duration: Duration::from_millis(1000),
+				chain_head: head,
 				block_size_limit: None,
 			},
 		)).unwrap();
diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml
index b04caeb3ee9d..c69544bc06c9 100644
--- a/client/consensus/babe/Cargo.toml
+++ b/client/consensus/babe/Cargo.toml
@@ -26,7 +26,6 @@ serde = { version = "1.0.104", features = ["derive"] }
 sp-version = { version = "3.0.0", path = "../../../primitives/version" }
 sp-io = { version = "3.0.0", path = "../../../primitives/io" }
 sp-inherents = { version = "3.0.0", path = "../../../primitives/inherents" }
-sp-timestamp = { version = "3.0.0", path = "../../../primitives/timestamp" }
 sc-telemetry = { version = "3.0.0", path = "../../telemetry" }
 sc-keystore = { version = "3.0.0", path = "../../keystore" }
 sc-client-api = { version = "3.0.0", path = "../../api" }
@@ -56,6 +55,7 @@ retain_mut = "0.1.2"
 async-trait = "0.1.42"
 
 [dev-dependencies]
+sp-timestamp = { version = "3.0.0", path = "../../../primitives/timestamp" }
 sp-keyring = { version = "3.0.0", path = "../../../primitives/keyring" }
 sp-tracing = { version = "3.0.0", path = "../../../primitives/tracing" }
 sc-executor = { version = "0.9.0", path = "../../executor" }
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index c3f1929c2ea8..3bdeaabf614d 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -77,7 +77,7 @@ pub use sp_consensus::SyncOracle;
 pub use sc_consensus_slots::SlotProportion;
 use std::{
 	collections::HashMap, sync::Arc, u64, pin::Pin, borrow::Cow, convert::TryInto,
-	time::{Duration, Instant},
+	time::Duration,
 };
 use sp_consensus::{ImportResult, CanAuthorWith, import_queue::BoxJustificationImport};
 use sp_core::crypto::Public;
@@ -89,7 +89,7 @@ use sp_runtime::{
 };
 use sp_api::{ProvideRuntimeApi, NumberFor};
 use parking_lot::Mutex;
-use sp_inherents::{InherentDataProviders, InherentData};
+use sp_inherents::{CreateInherentDataProviders, InherentDataProvider, InherentData};
 use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_TRACE, CONSENSUS_DEBUG};
 use sp_consensus::{
 	BlockImport, Environment, Proposer, BlockCheckParams,
@@ -97,7 +97,6 @@ use sp_consensus::{
 	SelectChain, SlotData, import_queue::{Verifier, BasicQueue, DefaultImportQueue, CacheKeyId},
 };
 use sp_consensus_babe::inherents::BabeInherentData;
-use sp_timestamp::TimestampInherentData;
 use sc_client_api::{
 	backend::AuxStore, BlockchainEvents, ProvideUncles,
 };
@@ -110,8 +109,8 @@ use futures::prelude::*;
 use log::{debug, info, log, trace, warn};
 use prometheus_endpoint::Registry;
 use sc_consensus_slots::{
-	SlotInfo, SlotCompatible, StorageChanges, CheckedHeader, check_equivocation,
-	BackoffAuthoringBlocksStrategy
+	SlotInfo, StorageChanges, CheckedHeader, check_equivocation,
+	BackoffAuthoringBlocksStrategy, InherentDataProviderExt,
 };
 use sc_consensus_epochs::{
 	descendent_query, SharedEpochChanges, EpochChangesFor, Epoch as EpochT, ViableEpochDescriptor,
@@ -270,15 +269,19 @@ pub enum Error<B: BlockT> {
 	/// Parent block has no associated weight
 	#[display(fmt = "Parent block of {} has no associated weight", _0)]
 	ParentBlockNoAssociatedWeight(B::Hash),
+	/// Check inherents error
 	#[display(fmt = "Checking inherents failed: {}", _0)]
-	/// Check Inherents error
-	CheckInherents(String),
+	CheckInherents(sp_inherents::Error),
+	/// Unhandled check inherents error
+	#[display(fmt = "Checking inherents unhandled error: {}", "String::from_utf8_lossy(_0)")]
+	CheckInherentsUnhandled(sp_inherents::InherentIdentifier),
+	/// Create inherents error.
+	#[display(fmt = "Creating inherents failed: {}", _0)]
+	CreateInherents(sp_inherents::Error),
 	/// Client error
 	Client(sp_blockchain::Error),
 	/// Runtime Api error.
 	RuntimeApi(sp_api::ApiError),
-	/// Runtime error
-	Runtime(sp_inherents::Error),
 	/// Fork tree error
 	ForkTree(Box<fork_tree::Error<sp_blockchain::Error>>),
 }
@@ -360,7 +363,7 @@ impl std::ops::Deref for Config {
 }
 
 /// Parameters for BABE.
-pub struct BabeParams<B: BlockT, C, E, I, SO, SC, CAW, BS> {
+pub struct BabeParams<B: BlockT, C, E, I, SO, SC, CAW, BS, IDP> {
 	/// The keystore that manages the keys of the node.
 	pub keystore: SyncCryptoStorePtr,
 
@@ -381,8 +384,8 @@ pub struct BabeParams<B: BlockT, C, E, I, SO, SC, CAW, BS> {
 	/// A sync oracle
 	pub sync_oracle: SO,
 
-	/// Providers for inherent data.
-	pub inherent_data_providers: InherentDataProviders,
+	/// Something that can create the inherent data providers.
+	pub create_inherent_data_providers: IDP,
 
 	/// Force authoring of blocks even if we are offline
 	pub force_authoring: bool,
@@ -408,21 +411,21 @@ pub struct BabeParams<B: BlockT, C, E, I, SO, SC, CAW, BS> {
 }
 
 /// Start the babe worker.
-pub fn start_babe<B, C, SC, E, I, SO, CAW, BS, Error>(BabeParams {
+pub fn start_babe<B, C, SC, E, I, SO, CAW, BS, Error, IDP>(BabeParams {
 	keystore,
 	client,
 	select_chain,
 	env,
 	block_import,
 	sync_oracle,
-	inherent_data_providers,
+	create_inherent_data_providers,
 	force_authoring,
 	backoff_authoring_blocks,
 	babe_link,
 	can_author_with,
 	block_proposal_slot_portion,
 	telemetry,
-}: BabeParams<B, C, E, I, SO, SC, CAW, BS>) -> Result<
+}: BabeParams<B, C, E, I, SO, SC, CAW, BS, IDP>) -> Result<
 	BabeWorker<B>,
 	sp_consensus::Error,
 > where
@@ -440,6 +443,8 @@ pub fn start_babe<B, C, SC, E, I, SO, CAW, BS, Error>(BabeParams {
 	SO: SyncOracle + Send + Sync + Clone + 'static,
 	CAW: CanAuthorWith<B> + Send + Sync + 'static,
 	BS: BackoffAuthoringBlocksStrategy<NumberFor<B>> + Send + 'static,
+	IDP: CreateInherentDataProviders<B, ()> + Send + Sync + 'static,
+	IDP::InherentDataProviders: InherentDataProviderExt + Send,
 {
 	const HANDLE_BUFFER_SIZE: usize = 1024;
 
@@ -461,21 +466,13 @@ pub fn start_babe<B, C, SC, E, I, SO, CAW, BS, Error>(BabeParams {
 		telemetry,
 	};
 
-	register_babe_inherent_data_provider(&inherent_data_providers, config.slot_duration())?;
-	sc_consensus_uncles::register_uncles_inherent_data_provider(
-		client.clone(),
-		select_chain.clone(),
-		&inherent_data_providers,
-	)?;
-
 	info!(target: "babe", "👶 Starting BABE Authorship worker");
 	let inner = sc_consensus_slots::start_slot_worker(
 		config.0.clone(),
 		select_chain,
 		worker,
 		sync_oracle,
-		inherent_data_providers,
-		babe_link.time_source,
+		create_inherent_data_providers,
 		can_author_with,
 	);
 
@@ -813,23 +810,22 @@ where
 
 	fn proposing_remaining_duration(
 		&self,
-		parent_head: &B::Header,
-		slot_info: &SlotInfo,
+		slot_info: &SlotInfo<B>,
 	) -> std::time::Duration {
 		let max_proposing = slot_info.duration.mul_f32(self.block_proposal_slot_portion.get());
 
 		let slot_remaining = slot_info.ends_at
-			.checked_duration_since(Instant::now())
+			.checked_duration_since(std::time::Instant::now())
 			.unwrap_or_default();
 
 		let slot_remaining = std::cmp::min(slot_remaining, max_proposing);
 
 		// If parent is genesis block, we don't require any lenience factor.
-		if parent_head.number().is_zero() {
+		if slot_info.chain_head.number().is_zero() {
 			return slot_remaining
 		}
 
-		let parent_slot = match find_pre_digest::<B>(parent_head) {
+		let parent_slot = match find_pre_digest::<B>(&slot_info.chain_head) {
 			Err(_) => return slot_remaining,
 			Ok(d) => d.slot(),
 		};
@@ -913,27 +909,9 @@ fn find_next_config_digest<B: BlockT>(header: &B::Header)
 	Ok(config_digest)
 }
 
-#[derive(Default, Clone)]
-struct TimeSource(Arc<Mutex<(Option<Duration>, Vec<(Instant, u64)>)>>);
-
-impl SlotCompatible for TimeSource {
-	fn extract_timestamp_and_slot(
-		&self,
-		data: &InherentData,
-	) -> Result<(sp_timestamp::Timestamp, Slot, std::time::Duration), sp_consensus::Error> {
-		trace!(target: "babe", "extract timestamp");
-		data.timestamp_inherent_data()
-			.and_then(|t| data.babe_inherent_data().map(|a| (t, a)))
-			.map_err(Into::into)
-			.map_err(sp_consensus::Error::InherentData)
-			.map(|(x, y)| (x, y, self.0.lock().0.take().unwrap_or_default()))
-	}
-}
-
 /// State that must be shared between the import queue and the authoring logic.
 #[derive(Clone)]
 pub struct BabeLink<Block: BlockT> {
-	time_source: TimeSource,
 	epoch_changes: SharedEpochChanges<Block, Epoch>,
 	config: Config,
 }
@@ -951,30 +929,31 @@ impl<Block: BlockT> BabeLink<Block> {
 }
 
 /// A verifier for Babe blocks.
-pub struct BabeVerifier<Block: BlockT, Client, SelectChain, CAW> {
+pub struct BabeVerifier<Block: BlockT, Client, SelectChain, CAW, CIDP> {
 	client: Arc<Client>,
 	select_chain: SelectChain,
-	inherent_data_providers: sp_inherents::InherentDataProviders,
+	create_inherent_data_providers: CIDP,
 	config: Config,
 	epoch_changes: SharedEpochChanges<Block, Epoch>,
-	time_source: TimeSource,
 	can_author_with: CAW,
 	telemetry: Option<TelemetryHandle>,
 }
 
-impl<Block, Client, SelectChain, CAW> BabeVerifier<Block, Client, SelectChain, CAW>
+impl<Block, Client, SelectChain, CAW, CIDP> BabeVerifier<Block, Client, SelectChain, CAW, CIDP>
 where
 	Block: BlockT,
 	Client: AuxStore + HeaderBackend<Block> + HeaderMetadata<Block> + ProvideRuntimeApi<Block>,
 	Client::Api: BlockBuilderApi<Block> + BabeApi<Block>,
 	SelectChain: sp_consensus::SelectChain<Block>,
 	CAW: CanAuthorWith<Block>,
+	CIDP: CreateInherentDataProviders<Block, ()>,
 {
-	fn check_inherents(
+	async fn check_inherents(
 		&self,
 		block: Block,
 		block_id: BlockId<Block>,
 		inherent_data: InherentData,
+		create_inherent_data_providers: CIDP::InherentDataProviders,
 	) -> Result<(), Error<Block>> {
 		if let Err(e) = self.can_author_with.can_author_with(&block_id) {
 			debug!(
@@ -993,14 +972,15 @@ where
 		).map_err(Error::RuntimeApi)?;
 
 		if !inherent_res.ok() {
-			inherent_res
-				.into_errors()
-				.try_for_each(|(i, e)| {
-					Err(Error::CheckInherents(self.inherent_data_providers.error_to_string(&i, &e)))
-				})
-		} else {
-			Ok(())
+			for (i, e) in inherent_res.into_errors() {
+				match create_inherent_data_providers.try_handle_error(&i, &e).await {
+					Some(res) => res.map_err(|e| Error::CheckInherents(e))?,
+					None => return Err(Error::CheckInherentsUnhandled(i)),
+				}
+			}
 		}
+
+		Ok(())
 	}
 
 	fn check_and_report_equivocation(
@@ -1085,8 +1065,8 @@ where
 }
 
 #[async_trait::async_trait]
-impl<Block, Client, SelectChain, CAW> Verifier<Block>
-	for BabeVerifier<Block, Client, SelectChain, CAW>
+impl<Block, Client, SelectChain, CAW, CIDP> Verifier<Block>
+	for BabeVerifier<Block, Client, SelectChain, CAW, CIDP>
 where
 	Block: BlockT,
 	Client: HeaderMetadata<Block, Error = sp_blockchain::Error> + HeaderBackend<Block> + ProvideRuntimeApi<Block>
@@ -1094,6 +1074,8 @@ where
 	Client::Api: BlockBuilderApi<Block> + BabeApi<Block>,
 	SelectChain: sp_consensus::SelectChain<Block>,
 	CAW: CanAuthorWith<Block> + Send + Sync,
+	CIDP: CreateInherentDataProviders<Block, ()> + Send + Sync,
+	CIDP::InherentDataProviders: InherentDataProviderExt + Send + Sync,
 {
 	async fn verify(
 		&mut self,
@@ -1111,46 +1093,51 @@ where
 			body,
 		);
 
+		let hash = header.hash();
+		let parent_hash = *header.parent_hash();
+
 		debug!(target: "babe", "We have {:?} logs in this header", header.digest().logs().len());
-		let mut inherent_data = self
-			.inherent_data_providers
-			.create_inherent_data()
-			.map_err(Error::<Block>::Runtime)?;
 
-		let (_, slot_now, _) = self.time_source.extract_timestamp_and_slot(&inherent_data)
-			.map_err(Error::<Block>::Extraction)?;
+		let create_inherent_data_providers = self
+			.create_inherent_data_providers
+			.create_inherent_data_providers(parent_hash, ())
+			.await
+			.map_err(|e| Error::<Block>::Client(sp_consensus::Error::from(e).into()))?;
 
-		let hash = header.hash();
-		let parent_hash = *header.parent_hash();
+		let slot_now = create_inherent_data_providers.slot();
 
 		let parent_header_metadata = self.client.header_metadata(parent_hash)
 			.map_err(Error::<Block>::FetchParentHeader)?;
 
 		let pre_digest = find_pre_digest::<Block>(&header)?;
-		let epoch_changes = self.epoch_changes.shared_data();
-		let epoch_descriptor = epoch_changes.epoch_descriptor_for_child_of(
-			descendent_query(&*self.client),
-			&parent_hash,
-			parent_header_metadata.number,
-			pre_digest.slot(),
-		)
+		let (check_header, epoch_descriptor) = {
+			let epoch_changes = self.epoch_changes.shared_data();
+			let epoch_descriptor = epoch_changes.epoch_descriptor_for_child_of(
+				descendent_query(&*self.client),
+				&parent_hash,
+				parent_header_metadata.number,
+				pre_digest.slot(),
+			)
 			.map_err(|e| Error::<Block>::ForkTree(Box::new(e)))?
 			.ok_or_else(|| Error::<Block>::FetchEpoch(parent_hash))?;
-		let viable_epoch = epoch_changes.viable_epoch(
-			&epoch_descriptor,
-			|slot| Epoch::genesis(&self.config, slot)
-		).ok_or_else(|| Error::<Block>::FetchEpoch(parent_hash))?;
-
-		// We add one to the current slot to allow for some small drift.
-		// FIXME #1019 in the future, alter this queue to allow deferring of headers
-		let v_params = verification::VerificationParams {
-			header: header.clone(),
-			pre_digest: Some(pre_digest),
-			slot_now: slot_now + 1,
-			epoch: viable_epoch.as_ref(),
+			let viable_epoch = epoch_changes.viable_epoch(
+				&epoch_descriptor,
+				|slot| Epoch::genesis(&self.config, slot)
+			).ok_or_else(|| Error::<Block>::FetchEpoch(parent_hash))?;
+
+			// We add one to the current slot to allow for some small drift.
+			// FIXME #1019 in the future, alter this queue to allow deferring of headers
+			let v_params = verification::VerificationParams {
+				header: header.clone(),
+				pre_digest: Some(pre_digest),
+				slot_now: slot_now + 1,
+				epoch: viable_epoch.as_ref(),
+			};
+
+			(verification::check_header::<Block>(v_params)?, epoch_descriptor)
 		};
 
-		match verification::check_header::<Block>(v_params)? {
+		match check_header {
 			CheckedHeader::Checked(pre_header, verified_info) => {
 				let babe_pre_digest = verified_info.pre_digest.as_babe_pre_digest()
 					.expect("check_header always returns a pre-digest digest item; qed");
@@ -1173,6 +1160,8 @@ where
 				// to check that the internally-set timestamp in the inherents
 				// actually matches the slot set in the seal.
 				if let Some(inner_body) = body.take() {
+					let mut inherent_data = create_inherent_data_providers.create_inherent_data()
+						.map_err(Error::<Block>::CreateInherents)?;
 					inherent_data.babe_replace_inherent_data(slot);
 					let block = Block::new(pre_header.clone(), inner_body);
 
@@ -1180,7 +1169,8 @@ where
 						block.clone(),
 						BlockId::Hash(parent_hash),
 						inherent_data,
-					)?;
+						create_inherent_data_providers,
+					).await?;
 
 					let (_, inner_body) = block.deconstruct();
 					body = Some(inner_body);
@@ -1220,22 +1210,6 @@ where
 	}
 }
 
-/// Register the babe inherent data provider, if not registered already.
-pub fn register_babe_inherent_data_provider(
-	inherent_data_providers: &InherentDataProviders,
-	slot_duration: Duration,
-) -> Result<(), sp_consensus::Error> {
-	debug!(target: "babe", "Registering");
-	if !inherent_data_providers.has_provider(&sp_consensus_babe::inherents::INHERENT_IDENTIFIER) {
-		inherent_data_providers
-			.register_provider(sp_consensus_babe::inherents::InherentDataProvider::new(slot_duration))
-			.map_err(Into::into)
-			.map_err(sp_consensus::Error::InherentData)
-	} else {
-		Ok(())
-	}
-}
-
 /// A block-import handler for BABE.
 ///
 /// This scans each imported block for epoch change signals. The signals are
@@ -1579,13 +1553,13 @@ pub fn block_import<Client, Block: BlockT, I>(
 	config: Config,
 	wrapped_block_import: I,
 	client: Arc<Client>,
-) -> ClientResult<(BabeBlockImport<Block, Client, I>, BabeLink<Block>)> where
+) -> ClientResult<(BabeBlockImport<Block, Client, I>, BabeLink<Block>)>
+where
 	Client: AuxStore + HeaderBackend<Block> + HeaderMetadata<Block, Error = sp_blockchain::Error>,
 {
 	let epoch_changes = aux_schema::load_epoch_changes::<Block, _>(&*client, &config)?;
 	let link = BabeLink {
 		epoch_changes: epoch_changes.clone(),
-		time_source: Default::default(),
 		config: config.clone(),
 	};
 
@@ -1616,13 +1590,13 @@ pub fn block_import<Client, Block: BlockT, I>(
 ///
 /// The block import object provided must be the `BabeBlockImport` or a wrapper
 /// of it, otherwise crucial import logic will be omitted.
-pub fn import_queue<Block: BlockT, Client, SelectChain, Inner, CAW>(
+pub fn import_queue<Block: BlockT, Client, SelectChain, Inner, CAW, CIDP>(
 	babe_link: BabeLink<Block>,
 	block_import: Inner,
 	justification_import: Option<BoxJustificationImport<Block>>,
 	client: Arc<Client>,
 	select_chain: SelectChain,
-	inherent_data_providers: InherentDataProviders,
+	create_inherent_data_providers: CIDP,
 	spawner: &impl sp_core::traits::SpawnEssentialNamed,
 	registry: Option<&Registry>,
 	can_author_with: CAW,
@@ -1636,15 +1610,14 @@ pub fn import_queue<Block: BlockT, Client, SelectChain, Inner, CAW>(
 	Client::Api: BlockBuilderApi<Block> + BabeApi<Block> + ApiExt<Block>,
 	SelectChain: sp_consensus::SelectChain<Block> + 'static,
 	CAW: CanAuthorWith<Block> + Send + Sync + 'static,
+	CIDP: CreateInherentDataProviders<Block, ()> + Send + Sync + 'static,
+	CIDP::InherentDataProviders: InherentDataProviderExt + Send + Sync,
 {
-	register_babe_inherent_data_provider(&inherent_data_providers, babe_link.config.slot_duration())?;
-
 	let verifier = BabeVerifier {
 		select_chain,
-		inherent_data_providers,
+		create_inherent_data_providers,
 		config: babe_link.config,
 		epoch_changes: babe_link.epoch_changes,
-		time_source: babe_link.time_source,
 		can_author_with,
 		telemetry,
 		client,
diff --git a/client/consensus/babe/src/tests.rs b/client/consensus/babe/src/tests.rs
index 9949da61da57..d042f25399ee 100644
--- a/client/consensus/babe/src/tests.rs
+++ b/client/consensus/babe/src/tests.rs
@@ -28,7 +28,10 @@ use sp_keystore::{
 	SyncCryptoStore,
 	vrf::make_transcript as transcript_from_data,
 };
-use sp_consensus_babe::{AuthorityPair, Slot, AllowedSlots, make_transcript, make_transcript_data};
+use sp_consensus_babe::{
+	AuthorityPair, Slot, AllowedSlots, make_transcript, make_transcript_data,
+	inherents::InherentDataProvider,
+};
 use sc_consensus_slots::BackoffAuthoringOnFinalizedHeadLagging;
 use sc_block_builder::{BlockBuilder, BlockBuilderProvider};
 use sp_consensus::{
@@ -48,6 +51,7 @@ use rand_chacha::{
 use sc_keystore::LocalKeystore;
 use sp_application_crypto::key_types::BABE;
 use futures::executor::block_on;
+use sp_timestamp::InherentDataProvider as TimestampInherentDataProvider;
 
 type Item = DigestItem<Hash>;
 
@@ -235,7 +239,17 @@ type TestSelectChain = substrate_test_runtime_client::LongestChain<
 >;
 
 pub struct TestVerifier {
-	inner: BabeVerifier<TestBlock, PeersFullClient, TestSelectChain, AlwaysCanAuthor>,
+	inner: BabeVerifier<
+		TestBlock,
+		PeersFullClient,
+		TestSelectChain,
+		AlwaysCanAuthor,
+		Box<dyn CreateInherentDataProviders<
+			TestBlock,
+			(),
+			InherentDataProviders = (TimestampInherentDataProvider, InherentDataProvider)
+		>>
+	>,
 	mutator: Mutator,
 }
 
@@ -253,13 +267,12 @@ impl Verifier<TestBlock> for TestVerifier {
 	) -> Result<(BlockImportParams<TestBlock, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String> {
 		// apply post-sealing mutations (i.e. stripping seal, if desired).
 		(self.mutator)(&mut header, Stage::PostSeal);
-		self.inner.verify(dbg!(origin), header, justifications, body).await
+		self.inner.verify(origin, header, justifications, body).await
 	}
 }
 
 pub struct PeerData {
 	link: BabeLink<TestBlock>,
-	inherent_data_providers: InherentDataProviders,
 	block_import: Mutex<
 		Option<BoxBlockImport<TestBlock, TransactionFor<substrate_test_runtime_client::Backend, TestBlock>>>
 	>,
@@ -286,7 +299,6 @@ impl TestNetFactory for BabeTestNet {
 		)
 	{
 		let client = client.as_full().expect("only full clients are tested");
-		let inherent_data_providers = InherentDataProviders::new();
 
 		let config = Config::get_or_compute(&*client).expect("config available");
 		let (block_import, link) = crate::block_import(
@@ -303,7 +315,7 @@ impl TestNetFactory for BabeTestNet {
 		(
 			BlockImportAdapter::new(block_import),
 			None,
-			Some(PeerData { link, inherent_data_providers, block_import: data_block_import }),
+			Some(PeerData { link, block_import: data_block_import }),
 		)
 	}
 
@@ -329,10 +341,17 @@ impl TestNetFactory for BabeTestNet {
 			inner: BabeVerifier {
 				client: client.clone(),
 				select_chain: longest_chain,
-				inherent_data_providers: data.inherent_data_providers.clone(),
+				create_inherent_data_providers: Box::new(|_, _| async {
+					let timestamp = TimestampInherentDataProvider::from_system_time();
+					let slot = InherentDataProvider::from_timestamp_and_duration(
+						*timestamp,
+						Duration::from_secs(6),
+					);
+
+					Ok((timestamp, slot))
+				}),
 				config: data.link.config.clone(),
 				epoch_changes: data.link.epoch_changes.clone(),
-				time_source: data.link.time_source.clone(),
 				can_author_with: AlwaysCanAuthor,
 				telemetry: None,
 			},
@@ -440,7 +459,15 @@ fn run_one_test(
 			client,
 			env: environ,
 			sync_oracle: DummyOracle,
-			inherent_data_providers: data.inherent_data_providers.clone(),
+			create_inherent_data_providers: Box::new(|_, _| async {
+				let timestamp = TimestampInherentDataProvider::from_system_time();
+				let slot = InherentDataProvider::from_timestamp_and_duration(
+					*timestamp,
+					Duration::from_secs(6),
+				);
+
+				Ok((timestamp, slot))
+			}),
 			force_authoring: false,
 			backoff_authoring_blocks: Some(BackoffAuthoringOnFinalizedHeadLagging::default()),
 			babe_link: data.link.clone(),
diff --git a/client/consensus/manual-seal/src/consensus/babe.rs b/client/consensus/manual-seal/src/consensus/babe.rs
index d627ea2a25c3..29fea05d8366 100644
--- a/client/consensus/manual-seal/src/consensus/babe.rs
+++ b/client/consensus/manual-seal/src/consensus/babe.rs
@@ -24,8 +24,8 @@ use codec::Encode;
 use std::{borrow::Cow, sync::{Arc, atomic}, time::SystemTime};
 use sc_client_api::AuxStore;
 use sc_consensus_babe::{
-	Config, Epoch, authorship, CompatibleDigestItem, BabeIntermediate,
-	register_babe_inherent_data_provider, INTERMEDIATE_KEY, find_pre_digest,
+	Config, Epoch, authorship, CompatibleDigestItem, BabeIntermediate, INTERMEDIATE_KEY,
+	find_pre_digest,
 };
 use sc_consensus_epochs::{SharedEpochChanges, descendent_query, ViableEpochDescriptor, EpochHeader};
 use sp_keystore::SyncCryptoStorePtr;
@@ -38,12 +38,12 @@ use sp_consensus_babe::{
 	BabeApi, inherents::BabeInherentData, ConsensusLog, BABE_ENGINE_ID, AuthorityId,
 	digests::{PreDigest, SecondaryPlainPreDigest, NextEpochDescriptor}, BabeAuthorityWeight,
 };
-use sp_inherents::{InherentDataProviders, InherentData, ProvideInherentData, InherentIdentifier};
+use sp_inherents::{InherentData, InherentDataProvider, InherentIdentifier};
 use sp_runtime::{
 	traits::{DigestItemFor, DigestFor, Block as BlockT, Zero, Header},
 	generic::{Digest, BlockId},
 };
-use sp_timestamp::{InherentType, InherentError, INHERENT_IDENTIFIER, TimestampInherentData};
+use sp_timestamp::{InherentType, INHERENT_IDENTIFIER, TimestampInherentData};
 
 /// Provides BABE-compatible predigests and BlockImportParams.
 /// Intended for use with BABE runtimes.
@@ -73,7 +73,6 @@ impl<B, C> BabeConsensusDataProvider<B, C>
 	pub fn new(
 		client: Arc<C>,
 		keystore: SyncCryptoStorePtr,
-		provider: &InherentDataProviders,
 		epoch_changes: SharedEpochChanges<B, Epoch>,
 		authorities: Vec<(AuthorityId, BabeAuthorityWeight)>,
 	) -> Result<Self, Error> {
@@ -82,10 +81,6 @@ impl<B, C> BabeConsensusDataProvider<B, C>
 		}
 
 		let config = Config::get_or_compute(&*client)?;
-		let timestamp_provider = SlotTimestampProvider::new(client.clone())?;
-
-		provider.register_provider(timestamp_provider)?;
-		register_babe_inherent_data_provider(provider, config.slot_duration())?;
 
 		Ok(Self {
 			config,
@@ -131,7 +126,8 @@ impl<B, C> ConsensusDataProvider<B> for BabeConsensusDataProvider<B, C>
 	type Transaction = TransactionFor<C, B>;
 
 	fn create_digest(&self, parent: &B::Header, inherents: &InherentData) -> Result<DigestFor<B>, Error> {
-		let slot = inherents.babe_inherent_data()?;
+		let slot = inherents.babe_inherent_data()?
+			.ok_or_else(|| Error::StringError("No babe inherent data".into()))?;
 		let epoch = self.epoch(parent, slot)?;
 
 		// this is a dev node environment, we should always be able to claim a slot.
@@ -194,7 +190,8 @@ impl<B, C> ConsensusDataProvider<B> for BabeConsensusDataProvider<B, C>
 		params: &mut BlockImportParams<B, Self::Transaction>,
 		inherents: &InherentData
 	) -> Result<(), Error> {
-		let slot = inherents.babe_inherent_data()?;
+		let slot = inherents.babe_inherent_data()?
+			.ok_or_else(|| Error::StringError("No babe inherent data".into()))?;
 		let epoch_changes = self.epoch_changes.shared_data();
 		let mut epoch_descriptor = epoch_changes
 			.epoch_descriptor_for_child_of(
@@ -216,7 +213,9 @@ impl<B, C> ConsensusDataProvider<B> for BabeConsensusDataProvider<B, C>
 
 		if !has_authority {
 			log::info!(target: "manual-seal", "authority not found");
-			let slot = *inherents.timestamp_inherent_data()? / self.config.slot_duration;
+			let timestamp = inherents.timestamp_inherent_data()?
+				.ok_or_else(|| Error::StringError("No timestamp inherent data".into()))?;
+			let slot = *timestamp / self.config.slot_duration;
 			// manually hard code epoch descriptor
 			epoch_descriptor = match epoch_descriptor {
 				ViableEpochDescriptor::Signaled(identifier, _header) => {
@@ -243,14 +242,14 @@ impl<B, C> ConsensusDataProvider<B> for BabeConsensusDataProvider<B, C>
 
 /// Provide duration since unix epoch in millisecond for timestamp inherent.
 /// Mocks the timestamp inherent to always produce the timestamp for the next babe slot.
-struct SlotTimestampProvider {
+pub struct SlotTimestampProvider {
 	time: atomic::AtomicU64,
 	slot_duration: u64
 }
 
 impl SlotTimestampProvider {
-	/// create a new mocked time stamp provider.
-	fn new<B, C>(client: Arc<C>) -> Result<Self, Error>
+	/// Create a new mocked time stamp provider.
+	pub fn new<B, C>(client: Arc<C>) -> Result<Self, Error>
 		where
 			B: BlockT,
 			C: AuxStore + HeaderBackend<B> + ProvideRuntimeApi<B>,
@@ -281,11 +280,8 @@ impl SlotTimestampProvider {
 	}
 }
 
-impl ProvideInherentData for SlotTimestampProvider {
-	fn inherent_identifier(&self) -> &'static InherentIdentifier {
-		&INHERENT_IDENTIFIER
-	}
-
+#[async_trait::async_trait]
+impl InherentDataProvider for SlotTimestampProvider {
 	fn provide_inherent_data(&self, inherent_data: &mut InherentData) -> Result<(), sp_inherents::Error> {
 		// we update the time here.
 		let duration: InherentType = self.time.fetch_add(
@@ -296,7 +292,11 @@ impl ProvideInherentData for SlotTimestampProvider {
 		Ok(())
 	}
 
-	fn error_to_string(&self, error: &[u8]) -> Option<String> {
-		InherentError::try_from(&INHERENT_IDENTIFIER, error).map(|e| format!("{:?}", e))
+	async fn try_handle_error(
+		&self,
+		_: &InherentIdentifier,
+		_: &[u8],
+	) -> Option<Result<(), sp_inherents::Error>> {
+		None
 	}
 }
diff --git a/client/consensus/manual-seal/src/lib.rs b/client/consensus/manual-seal/src/lib.rs
index a5351c63bc3b..45628e90a6f9 100644
--- a/client/consensus/manual-seal/src/lib.rs
+++ b/client/consensus/manual-seal/src/lib.rs
@@ -26,7 +26,7 @@ use sp_consensus::{
 	import_queue::{Verifier, BasicQueue, CacheKeyId, BoxBlockImport},
 };
 use sp_blockchain::HeaderBackend;
-use sp_inherents::InherentDataProviders;
+use sp_inherents::CreateInherentDataProviders;
 use sp_runtime::{traits::Block as BlockT, Justifications, ConsensusEngineId};
 use sc_client_api::backend::{Backend as ClientBackend, Finalizer};
 use sc_transaction_pool::txpool;
@@ -94,7 +94,7 @@ pub fn import_queue<Block, Transaction>(
 }
 
 /// Params required to start the instant sealing authorship task.
-pub struct ManualSealParams<B: BlockT, BI, E, C: ProvideRuntimeApi<B>, A: txpool::ChainApi, SC, CS> {
+pub struct ManualSealParams<B: BlockT, BI, E, C: ProvideRuntimeApi<B>, A: txpool::ChainApi, SC, CS, CIDP> {
 	/// Block import instance for well. importing blocks.
 	pub block_import: BI,
 
@@ -117,12 +117,12 @@ pub struct ManualSealParams<B: BlockT, BI, E, C: ProvideRuntimeApi<B>, A: txpool
 	/// Digest provider for inclusion in blocks.
 	pub consensus_data_provider: Option<Box<dyn ConsensusDataProvider<B, Transaction = TransactionFor<C, B>>>>,
 
-	/// Provider for inherents to include in blocks.
-	pub inherent_data_providers: InherentDataProviders,
+	/// Something that can create the inherent data providers.
+	pub create_inherent_data_providers: CIDP,
 }
 
 /// Params required to start the manual sealing authorship task.
-pub struct InstantSealParams<B: BlockT, BI, E, C: ProvideRuntimeApi<B>, A: txpool::ChainApi, SC> {
+pub struct InstantSealParams<B: BlockT, BI, E, C: ProvideRuntimeApi<B>, A: txpool::ChainApi, SC, CIDP> {
 	/// Block import instance for well. importing blocks.
 	pub block_import: BI,
 
@@ -141,12 +141,12 @@ pub struct InstantSealParams<B: BlockT, BI, E, C: ProvideRuntimeApi<B>, A: txpoo
 	/// Digest provider for inclusion in blocks.
 	pub consensus_data_provider: Option<Box<dyn ConsensusDataProvider<B, Transaction = TransactionFor<C, B>>>>,
 
-	/// Provider for inherents to include in blocks.
-	pub inherent_data_providers: InherentDataProviders,
+	/// Something that can create the inherent data providers.
+	pub create_inherent_data_providers: CIDP,
 }
 
 /// Creates the background authorship task for the manual seal engine.
-pub async fn run_manual_seal<B, BI, CB, E, C, A, SC, CS>(
+pub async fn run_manual_seal<B, BI, CB, E, C, A, SC, CS, CIDP>(
 	ManualSealParams {
 		mut block_import,
 		mut env,
@@ -154,10 +154,9 @@ pub async fn run_manual_seal<B, BI, CB, E, C, A, SC, CS>(
 		pool,
 		mut commands_stream,
 		select_chain,
-		inherent_data_providers,
 		consensus_data_provider,
-		..
-	}: ManualSealParams<B, BI, E, C, A, SC, CS>
+		create_inherent_data_providers,
+	}: ManualSealParams<B, BI, E, C, A, SC, CS, CIDP>
 )
 	where
 		A: txpool::ChainApi<Block=B> + 'static,
@@ -171,6 +170,7 @@ pub async fn run_manual_seal<B, BI, CB, E, C, A, SC, CS>(
 		CS: Stream<Item=EngineCommand<<B as BlockT>::Hash>> + Unpin + 'static,
 		SC: SelectChain<B> + 'static,
 		TransactionFor<C, B>: 'static,
+		CIDP: CreateInherentDataProviders<B, ()>,
 {
 	while let Some(command) = commands_stream.next().await {
 		match command {
@@ -189,10 +189,10 @@ pub async fn run_manual_seal<B, BI, CB, E, C, A, SC, CS>(
 						env: &mut env,
 						select_chain: &select_chain,
 						block_import: &mut block_import,
-						inherent_data_provider: &inherent_data_providers,
 						consensus_data_provider: consensus_data_provider.as_ref().map(|p| &**p),
 						pool: pool.clone(),
 						client: client.clone(),
+						create_inherent_data_providers: &create_inherent_data_providers,
 					}
 				).await;
 			}
@@ -215,7 +215,7 @@ pub async fn run_manual_seal<B, BI, CB, E, C, A, SC, CS>(
 /// runs the background authorship task for the instant seal engine.
 /// instant-seal creates a new block for every transaction imported into
 /// the transaction pool.
-pub async fn run_instant_seal<B, BI, CB, E, C, A, SC>(
+pub async fn run_instant_seal<B, BI, CB, E, C, A, SC, CIDP>(
 	InstantSealParams {
 		block_import,
 		env,
@@ -223,9 +223,8 @@ pub async fn run_instant_seal<B, BI, CB, E, C, A, SC>(
 		pool,
 		select_chain,
 		consensus_data_provider,
-		inherent_data_providers,
-		..
-	}: InstantSealParams<B, BI, E, C, A, SC>
+		create_inherent_data_providers,
+	}: InstantSealParams<B, BI, E, C, A, SC, CIDP>
 )
 	where
 		A: txpool::ChainApi<Block=B> + 'static,
@@ -238,6 +237,7 @@ pub async fn run_instant_seal<B, BI, CB, E, C, A, SC>(
 		E::Proposer: Proposer<B, Transaction = TransactionFor<C, B>>,
 		SC: SelectChain<B> + 'static,
 		TransactionFor<C, B>: 'static,
+		CIDP: CreateInherentDataProviders<B, ()>,
 {
 	// instant-seal creates blocks as soon as transactions are imported
 	// into the transaction pool.
@@ -261,7 +261,7 @@ pub async fn run_instant_seal<B, BI, CB, E, C, A, SC>(
 			commands_stream,
 			select_chain,
 			consensus_data_provider,
-			inherent_data_providers,
+			create_inherent_data_providers,
 		}
 	).await
 }
@@ -280,7 +280,6 @@ mod tests {
 	use sp_transaction_pool::{TransactionPool, MaintainedTransactionPool, TransactionSource};
 	use sp_runtime::generic::BlockId;
 	use sp_consensus::ImportedAux;
-	use sp_inherents::InherentDataProviders;
 	use sc_basic_authorship::ProposerFactory;
 	use sc_client_api::BlockBackend;
 
@@ -295,7 +294,6 @@ mod tests {
 		let builder = TestClientBuilder::new();
 		let (client, select_chain) = builder.build_with_longest_chain();
 		let client = Arc::new(client);
-		let inherent_data_providers = InherentDataProviders::new();
 		let spawner = sp_core::testing::TaskExecutor::new();
 		let pool = Arc::new(BasicPool::with_revalidation_type(
 			Options::default(), true.into(), api(), None, RevalidationType::Full, spawner.clone(),
@@ -330,7 +328,7 @@ mod tests {
 				pool: pool.pool().clone(),
 				commands_stream,
 				select_chain,
-				inherent_data_providers,
+				create_inherent_data_providers: |_, _| async { Ok(()) },
 				consensus_data_provider: None,
 			}
 		);
@@ -367,10 +365,14 @@ mod tests {
 		let builder = TestClientBuilder::new();
 		let (client, select_chain) = builder.build_with_longest_chain();
 		let client = Arc::new(client);
-		let inherent_data_providers = InherentDataProviders::new();
 		let spawner = sp_core::testing::TaskExecutor::new();
 		let pool = Arc::new(BasicPool::with_revalidation_type(
-			Options::default(), true.into(), api(), None, RevalidationType::Full, spawner.clone(),
+			Options::default(),
+			true.into(),
+			api(),
+			None,
+			RevalidationType::Full,
+			spawner.clone(),
 		));
 		let env = ProposerFactory::new(
 			spawner.clone(),
@@ -390,7 +392,7 @@ mod tests {
 				commands_stream,
 				select_chain,
 				consensus_data_provider: None,
-				inherent_data_providers,
+				create_inherent_data_providers: |_, _| async { Ok(()) },
 			}
 		);
 		std::thread::spawn(|| {
@@ -442,11 +444,15 @@ mod tests {
 		let builder = TestClientBuilder::new();
 		let (client, select_chain) = builder.build_with_longest_chain();
 		let client = Arc::new(client);
-		let inherent_data_providers = InherentDataProviders::new();
 		let pool_api = api();
 		let spawner = sp_core::testing::TaskExecutor::new();
 		let pool = Arc::new(BasicPool::with_revalidation_type(
-			Options::default(), true.into(), pool_api.clone(), None, RevalidationType::Full, spawner.clone(),
+			Options::default(),
+			true.into(),
+			pool_api.clone(),
+			None,
+			RevalidationType::Full,
+			spawner.clone(),
 		));
 		let env = ProposerFactory::new(
 			spawner.clone(),
@@ -466,7 +472,7 @@ mod tests {
 				commands_stream,
 				select_chain,
 				consensus_data_provider: None,
-				inherent_data_providers,
+				create_inherent_data_providers: |_, _| async { Ok(()) },
 			}
 		);
 		std::thread::spawn(|| {
@@ -528,7 +534,7 @@ mod tests {
 		pool_api.add_block(block, true);
 		pool_api.increment_nonce(Alice.into());
 
-		assert!(pool.submit_one(&BlockId::Number(1), SOURCE, uxt(Alice, 2)).await.is_ok());
+		assert!(pool.submit_one(&BlockId::Number(1), SOURCE, uxt(Bob, 0)).await.is_ok());
 		let (tx2, rx2) = futures::channel::oneshot::channel();
 		assert!(sink.send(EngineCommand::SealNewBlock {
 			parent_hash: Some(created_block.hash),
diff --git a/client/consensus/manual-seal/src/seal_block.rs b/client/consensus/manual-seal/src/seal_block.rs
index a8050efb9a07..6f2b613cd939 100644
--- a/client/consensus/manual-seal/src/seal_block.rs
+++ b/client/consensus/manual-seal/src/seal_block.rs
@@ -33,14 +33,14 @@ use sp_consensus::{
 use sp_blockchain::HeaderBackend;
 use std::collections::HashMap;
 use std::time::Duration;
-use sp_inherents::InherentDataProviders;
+use sp_inherents::{CreateInherentDataProviders, InherentDataProvider};
 use sp_api::{ProvideRuntimeApi, TransactionFor};
 
 /// max duration for creating a proposal in secs
 pub const MAX_PROPOSAL_DURATION: u64 = 10;
 
 /// params for sealing a new block
-pub struct SealBlockParams<'a, B: BlockT, BI, SC, C: ProvideRuntimeApi<B>, E, P: txpool::ChainApi> {
+pub struct SealBlockParams<'a, B: BlockT, BI, SC, C: ProvideRuntimeApi<B>, E, P: txpool::ChainApi, CIDP> {
 	/// if true, empty blocks(without extrinsics) will be created.
 	/// otherwise, will return Error::EmptyTransactionPool.
 	pub create_empty: bool,
@@ -62,12 +62,12 @@ pub struct SealBlockParams<'a, B: BlockT, BI, SC, C: ProvideRuntimeApi<B>, E, P:
 	pub consensus_data_provider: Option<&'a dyn ConsensusDataProvider<B, Transaction = TransactionFor<C, B>>>,
 	/// block import object
 	pub block_import: &'a mut BI,
-	/// inherent data provider
-	pub inherent_data_provider: &'a InherentDataProviders,
+	/// Something that can create the inherent data providers.
+	pub create_inherent_data_providers: &'a CIDP,
 }
 
 /// seals a new block with the given params
-pub async fn seal_block<B, BI, SC, C, E, P>(
+pub async fn seal_block<B, BI, SC, C, E, P, CIDP>(
 	SealBlockParams {
 		create_empty,
 		finalize,
@@ -77,11 +77,10 @@ pub async fn seal_block<B, BI, SC, C, E, P>(
 		select_chain,
 		block_import,
 		env,
-		inherent_data_provider,
+		create_inherent_data_providers,
 		consensus_data_provider: digest_provider,
 		mut sender,
-		..
-	}: SealBlockParams<'_, B, BI, SC, C, E, P>
+	}: SealBlockParams<'_, B, BI, SC, C, E, P, CIDP>
 )
 	where
 		B: BlockT,
@@ -93,6 +92,7 @@ pub async fn seal_block<B, BI, SC, C, E, P>(
 		P: txpool::ChainApi<Block=B>,
 		SC: SelectChain<B>,
 		TransactionFor<C, B>: 'static,
+		CIDP: CreateInherentDataProviders<B, ()>,
 {
 	let future = async {
 		if pool.validated_pool().status().ready == 0 && !create_empty {
@@ -109,19 +109,29 @@ pub async fn seal_block<B, BI, SC, C, E, P>(
 			None => select_chain.best_chain()?
 		};
 
+		let inherent_data_providers =
+			create_inherent_data_providers
+				.create_inherent_data_providers(
+					parent.hash(),
+					(),
+				)
+				.await
+				.map_err(|e| Error::Other(e))?;
+
+		let inherent_data = inherent_data_providers.create_inherent_data()?;
+
 		let proposer = env.init(&parent)
 			.map_err(|err| Error::StringError(format!("{:?}", err))).await?;
-		let id = inherent_data_provider.create_inherent_data()?;
-		let inherents_len = id.len();
+		let inherents_len = inherent_data.len();
 
 		let digest = if let Some(digest_provider) = digest_provider {
-			digest_provider.create_digest(&parent, &id)?
+			digest_provider.create_digest(&parent, &inherent_data)?
 		} else {
 			Default::default()
 		};
 
 		let proposal = proposer.propose(
-			id.clone(),
+			inherent_data.clone(),
 			digest,
 			Duration::from_secs(MAX_PROPOSAL_DURATION),
 			None,
@@ -139,7 +149,7 @@ pub async fn seal_block<B, BI, SC, C, E, P>(
 		params.storage_changes = Some(proposal.storage_changes);
 
 		if let Some(digest_provider) = digest_provider {
-			digest_provider.append_block_import(&parent, &mut params, &id)?;
+			digest_provider.append_block_import(&parent, &mut params, &inherent_data)?;
 		}
 
 		match block_import.import_block(params, HashMap::new()).await? {
diff --git a/client/consensus/pow/Cargo.toml b/client/consensus/pow/Cargo.toml
index 86b0b1df54e2..443b852c41e5 100644
--- a/client/consensus/pow/Cargo.toml
+++ b/client/consensus/pow/Cargo.toml
@@ -27,7 +27,6 @@ log = "0.4.8"
 futures = { version = "0.3.1", features = ["compat"] }
 futures-timer = "3.0.1"
 parking_lot = "0.11.1"
-sp-timestamp = { version = "3.0.0", path = "../../../primitives/timestamp" }
 derive_more = "0.99.2"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0"}
 async-trait = "0.1.42"
diff --git a/client/consensus/pow/src/lib.rs b/client/consensus/pow/src/lib.rs
index bcbc2009321b..b12bad7bac22 100644
--- a/client/consensus/pow/src/lib.rs
+++ b/client/consensus/pow/src/lib.rs
@@ -39,7 +39,7 @@ use std::{
 	sync::Arc, borrow::Cow, collections::HashMap, marker::PhantomData,
 	cmp::Ordering, time::Duration,
 };
-use futures::{prelude::*, future::Either};
+use futures::{Future, StreamExt};
 use parking_lot::Mutex;
 use sc_client_api::{BlockOf, backend::AuxStore, BlockchainEvents};
 use sp_blockchain::{HeaderBackend, ProvideCache, well_known_cache_keys::Id as CacheKeyId};
@@ -49,7 +49,7 @@ use sp_runtime::generic::{BlockId, Digest, DigestItem};
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT};
 use sp_api::ProvideRuntimeApi;
 use sp_consensus_pow::{Seal, TotalDifficulty, POW_ENGINE_ID};
-use sp_inherents::{InherentDataProviders, InherentData};
+use sp_inherents::{CreateInherentDataProviders, InherentDataProvider};
 use sp_consensus::{
 	BlockImportParams, BlockOrigin, ForkChoiceStrategy, SyncOracle, Environment, Proposer,
 	SelectChain, Error as ConsensusError, CanAuthorWith, BlockImport, BlockCheckParams, ImportResult,
@@ -61,7 +61,6 @@ use codec::{Encode, Decode};
 use prometheus_endpoint::Registry;
 use sc_client_api;
 use log::*;
-use sp_timestamp::{InherentError as TIError, TimestampInherentData};
 
 use crate::worker::UntilImportedOrTimeout;
 
@@ -92,7 +91,12 @@ pub enum Error<B: BlockT> {
 	#[display(fmt = "Creating inherents failed: {}", _0)]
 	CreateInherents(sp_inherents::Error),
 	#[display(fmt = "Checking inherents failed: {}", _0)]
-	CheckInherents(String),
+	CheckInherents(sp_inherents::Error),
+	#[display(
+		fmt = "Checking inherents unknown error for identifier: {:?}",
+		"String::from_utf8_lossy(_0)",
+	)]
+	CheckInherentsUnknownError(sp_inherents::InherentIdentifier),
 	#[display(fmt = "Multiple pre-runtime digests")]
 	MultiplePreRuntimeDigests,
 	Client(sp_blockchain::Error),
@@ -200,18 +204,18 @@ pub trait PowAlgorithm<B: BlockT> {
 }
 
 /// A block importer for PoW.
-pub struct PowBlockImport<B: BlockT, I, C, S, Algorithm, CAW> {
+pub struct PowBlockImport<B: BlockT, I, C, S, Algorithm, CAW, CIDP> {
 	algorithm: Algorithm,
 	inner: I,
 	select_chain: S,
 	client: Arc<C>,
-	inherent_data_providers: sp_inherents::InherentDataProviders,
+	create_inherent_data_providers: Arc<CIDP>,
 	check_inherents_after: <<B as BlockT>::Header as HeaderT>::Number,
 	can_author_with: CAW,
 }
 
-impl<B: BlockT, I: Clone, C, S: Clone, Algorithm: Clone, CAW: Clone> Clone
-	for PowBlockImport<B, I, C, S, Algorithm, CAW>
+impl<B: BlockT, I: Clone, C, S: Clone, Algorithm: Clone, CAW: Clone, CIDP> Clone
+	for PowBlockImport<B, I, C, S, Algorithm, CAW, CIDP>
 {
 	fn clone(&self) -> Self {
 		Self {
@@ -219,14 +223,14 @@ impl<B: BlockT, I: Clone, C, S: Clone, Algorithm: Clone, CAW: Clone> Clone
 			inner: self.inner.clone(),
 			select_chain: self.select_chain.clone(),
 			client: self.client.clone(),
-			inherent_data_providers: self.inherent_data_providers.clone(),
+			create_inherent_data_providers: self.create_inherent_data_providers.clone(),
 			check_inherents_after: self.check_inherents_after.clone(),
 			can_author_with: self.can_author_with.clone(),
 		}
 	}
 }
 
-impl<B, I, C, S, Algorithm, CAW> PowBlockImport<B, I, C, S, Algorithm, CAW> where
+impl<B, I, C, S, Algorithm, CAW, CIDP> PowBlockImport<B, I, C, S, Algorithm, CAW, CIDP> where
 	B: BlockT,
 	I: BlockImport<B, Transaction = sp_api::TransactionFor<C, B>> + Send + Sync,
 	I::Error: Into<ConsensusError>,
@@ -234,6 +238,7 @@ impl<B, I, C, S, Algorithm, CAW> PowBlockImport<B, I, C, S, Algorithm, CAW> wher
 	C::Api: BlockBuilderApi<B>,
 	Algorithm: PowAlgorithm<B>,
 	CAW: CanAuthorWith<B>,
+	CIDP: CreateInherentDataProviders<B, ()>,
 {
 	/// Create a new block import suitable to be used in PoW
 	pub fn new(
@@ -242,7 +247,7 @@ impl<B, I, C, S, Algorithm, CAW> PowBlockImport<B, I, C, S, Algorithm, CAW> wher
 		algorithm: Algorithm,
 		check_inherents_after: <<B as BlockT>::Header as HeaderT>::Number,
 		select_chain: S,
-		inherent_data_providers: sp_inherents::InherentDataProviders,
+		create_inherent_data_providers: CIDP,
 		can_author_with: CAW,
 	) -> Self {
 		Self {
@@ -251,20 +256,17 @@ impl<B, I, C, S, Algorithm, CAW> PowBlockImport<B, I, C, S, Algorithm, CAW> wher
 			algorithm,
 			check_inherents_after,
 			select_chain,
-			inherent_data_providers,
+			create_inherent_data_providers: Arc::new(create_inherent_data_providers),
 			can_author_with,
 		}
 	}
 
-	fn check_inherents(
+	async fn check_inherents(
 		&self,
 		block: B,
 		block_id: BlockId<B>,
-		inherent_data: InherentData,
-		timestamp_now: u64,
+		inherent_data_providers: CIDP::InherentDataProviders,
 	) -> Result<(), Error<B>> {
-		const MAX_TIMESTAMP_DRIFT_SECS: u64 = 60;
-
 		if *block.header().number() < self.check_inherents_after {
 			return Ok(())
 		}
@@ -279,6 +281,9 @@ impl<B, I, C, S, Algorithm, CAW> PowBlockImport<B, I, C, S, Algorithm, CAW> wher
 			return Ok(())
 		}
 
+		let inherent_data = inherent_data_providers.create_inherent_data()
+			.map_err(|e| Error::CreateInherents(e))?;
+
 		let inherent_res = self.client.runtime_api().check_inherents(
 			&block_id,
 			block,
@@ -286,38 +291,32 @@ impl<B, I, C, S, Algorithm, CAW> PowBlockImport<B, I, C, S, Algorithm, CAW> wher
 		).map_err(|e| Error::Client(e.into()))?;
 
 		if !inherent_res.ok() {
-			inherent_res
-				.into_errors()
-				.try_for_each(|(i, e)| match TIError::try_from(&i, &e) {
-					Some(TIError::ValidAtTimestamp(timestamp)) => {
-						if timestamp > timestamp_now + MAX_TIMESTAMP_DRIFT_SECS {
-							return Err(Error::TooFarInFuture);
-						}
-
-						Ok(())
-					},
-					Some(TIError::Other(e)) => Err(Error::Runtime(e)),
-					None => Err(Error::CheckInherents(
-						self.inherent_data_providers.error_to_string(&i, &e)
-					)),
-				})
-		} else {
-			Ok(())
+			for (identifier, error) in inherent_res.into_errors() {
+				match inherent_data_providers.try_handle_error(&identifier, &error).await {
+					Some(res) => res.map_err(Error::CheckInherents)?,
+					None => return Err(Error::CheckInherentsUnknownError(identifier)),
+				}
+			}
 		}
+
+		Ok(())
 	}
 }
 
 #[async_trait::async_trait]
-impl<B, I, C, S, Algorithm, CAW> BlockImport<B> for PowBlockImport<B, I, C, S, Algorithm, CAW> where
+impl<B, I, C, S, Algorithm, CAW, CIDP> BlockImport<B>
+	for PowBlockImport<B, I, C, S, Algorithm, CAW, CIDP>
+where
 	B: BlockT,
 	I: BlockImport<B, Transaction = sp_api::TransactionFor<C, B>> + Send + Sync,
 	I::Error: Into<ConsensusError>,
 	S: SelectChain<B>,
 	C: ProvideRuntimeApi<B> + Send + Sync + HeaderBackend<B> + AuxStore + ProvideCache<B> + BlockOf,
 	C::Api: BlockBuilderApi<B>,
-	Algorithm: PowAlgorithm<B> + Send,
+	Algorithm: PowAlgorithm<B> + Send + Sync,
 	Algorithm::Difficulty: 'static + Send,
-	CAW: CanAuthorWith<B> + Send,
+	CAW: CanAuthorWith<B> + Send + Sync,
+	CIDP: CreateInherentDataProviders<B, ()> + Send + Sync,
 {
 	type Error = ConsensusError;
 	type Transaction = sp_api::TransactionFor<C, B>;
@@ -343,18 +342,16 @@ impl<B, I, C, S, Algorithm, CAW> BlockImport<B> for PowBlockImport<B, I, C, S, A
 		let mut aux = PowAux::read::<_, B>(self.client.as_ref(), &parent_hash)?;
 
 		if let Some(inner_body) = block.body.take() {
-			let inherent_data = self.inherent_data_providers
-				.create_inherent_data().map_err(|e| e.into_string())?;
-			let timestamp_now = inherent_data.timestamp_inherent_data().map_err(|e| e.into_string())?;
-
 			let check_block = B::new(block.header.clone(), inner_body);
 
 			self.check_inherents(
 				check_block.clone(),
 				BlockId::Hash(parent_hash),
-				inherent_data,
-				*timestamp_now,
-			)?;
+				self.create_inherent_data_providers.create_inherent_data_providers(
+					parent_hash,
+					(),
+				).await?,
+			).await?;
 
 			block.body = Some(check_block.deconstruct().1);
 		}
@@ -475,7 +472,7 @@ impl<B: BlockT, Algorithm> Verifier<B> for PowVerifier<B, Algorithm> where
 		import_block.justifications = justifications;
 		import_block.intermediates.insert(
 			Cow::from(INTERMEDIATE_KEY),
-			Box::new(intermediate) as Box<_>,
+			Box::new(intermediate) as Box<_>
 		);
 		import_block.post_hash = Some(hash);
 
@@ -483,20 +480,6 @@ impl<B: BlockT, Algorithm> Verifier<B> for PowVerifier<B, Algorithm> where
 	}
 }
 
-/// Register the PoW inherent data provider, if not registered already.
-pub fn register_pow_inherent_data_provider(
-	inherent_data_providers: &InherentDataProviders,
-) -> Result<(), sp_consensus::Error> {
-	if !inherent_data_providers.has_provider(&sp_timestamp::INHERENT_IDENTIFIER) {
-		inherent_data_providers
-			.register_provider(sp_timestamp::InherentDataProvider)
-			.map_err(Into::into)
-			.map_err(sp_consensus::Error::InherentData)
-	} else {
-		Ok(())
-	}
-}
-
 /// The PoW import queue type.
 pub type PowImportQueue<B, Transaction> = BasicQueue<B, Transaction>;
 
@@ -505,7 +488,6 @@ pub fn import_queue<B, Transaction, Algorithm>(
 	block_import: BoxBlockImport<B, Transaction>,
 	justification_import: Option<BoxJustificationImport<B>>,
 	algorithm: Algorithm,
-	inherent_data_providers: InherentDataProviders,
 	spawner: &impl sp_core::traits::SpawnEssentialNamed,
 	registry: Option<&Registry>,
 ) -> Result<
@@ -517,8 +499,6 @@ pub fn import_queue<B, Transaction, Algorithm>(
 	Algorithm: PowAlgorithm<B> + Clone + Send + Sync + 'static,
 	Algorithm::Difficulty: Send,
 {
-	register_pow_inherent_data_provider(&inherent_data_providers)?;
-
 	let verifier = PowVerifier::new(algorithm);
 
 	Ok(BasicQueue::new(
@@ -539,7 +519,7 @@ pub fn import_queue<B, Transaction, Algorithm>(
 ///
 /// `pre_runtime` is a parameter that allows a custom additional pre-runtime digest to be inserted
 /// for blocks being built. This can encode authorship information, or just be a graffiti.
-pub fn start_mining_worker<Block, C, S, Algorithm, E, SO, CAW>(
+pub fn start_mining_worker<Block, C, S, Algorithm, E, SO, CAW, CIDP>(
 	block_import: BoxBlockImport<Block, sp_api::TransactionFor<C, Block>>,
 	client: Arc<C>,
 	select_chain: S,
@@ -547,7 +527,7 @@ pub fn start_mining_worker<Block, C, S, Algorithm, E, SO, CAW>(
 	mut env: E,
 	mut sync_oracle: SO,
 	pre_runtime: Option<Vec<u8>>,
-	inherent_data_providers: sp_inherents::InherentDataProviders,
+	create_inherent_data_providers: CIDP,
 	timeout: Duration,
 	build_time: Duration,
 	can_author_with: CAW,
@@ -565,12 +545,9 @@ pub fn start_mining_worker<Block, C, S, Algorithm, E, SO, CAW>(
 	E::Proposer: Proposer<Block, Transaction = sp_api::TransactionFor<C, Block>>,
 	SO: SyncOracle + Clone + Send + Sync + 'static,
 	CAW: CanAuthorWith<Block> + Clone + Send + 'static,
+	CIDP: CreateInherentDataProviders<Block, ()>,
 {
-	if let Err(_) = register_pow_inherent_data_provider(&inherent_data_providers) {
-		warn!("Registering inherent data provider for timestamp failed");
-	}
-
-	let timer = UntilImportedOrTimeout::new(client.import_notification_stream(), timeout);
+	let mut timer = UntilImportedOrTimeout::new(client.import_notification_stream(), timeout);
 	let worker = Arc::new(Mutex::new(MiningWorker::<Block, Algorithm, C, _> {
 		build: None,
 		algorithm: algorithm.clone(),
@@ -578,81 +555,97 @@ pub fn start_mining_worker<Block, C, S, Algorithm, E, SO, CAW>(
 	}));
 	let worker_ret = worker.clone();
 
-	let task = timer.for_each(move |()| {
-		let worker = worker.clone();
+	let task = async move {
+		loop {
+			if timer.next().await.is_none() {
+				break;
+			}
 
-		if sync_oracle.is_major_syncing() {
-			debug!(target: "pow", "Skipping proposal due to sync.");
-			worker.lock().on_major_syncing();
-			return Either::Left(future::ready(()))
-		}
+			if sync_oracle.is_major_syncing() {
+				debug!(target: "pow", "Skipping proposal due to sync.");
+				worker.lock().on_major_syncing();
+				return;
+			}
 
-		let best_header = match select_chain.best_chain() {
-			Ok(x) => x,
-			Err(err) => {
+			let best_header = match select_chain.best_chain() {
+				Ok(x) => x,
+				Err(err) => {
+					warn!(
+						target: "pow",
+						"Unable to pull new block for authoring. \
+						 Select best chain error: {:?}",
+						err
+					);
+					return;
+				},
+			};
+			let best_hash = best_header.hash();
+
+			if let Err(err) = can_author_with.can_author_with(&BlockId::Hash(best_hash)) {
 				warn!(
 					target: "pow",
-					"Unable to pull new block for authoring. \
-					 Select best chain error: {:?}",
-					err
+					"Skipping proposal `can_author_with` returned: {} \
+					 Probably a node update is required!",
+					err,
 				);
-				return Either::Left(future::ready(()))
-			},
-		};
-		let best_hash = best_header.hash();
+				return;
+			}
 
-		if let Err(err) = can_author_with.can_author_with(&BlockId::Hash(best_hash)) {
-			warn!(
-				target: "pow",
-				"Skipping proposal `can_author_with` returned: {} \
-				 Probably a node update is required!",
-				err,
-			);
-			return Either::Left(future::ready(()))
-		}
+			if worker.lock().best_hash() == Some(best_hash) {
+				return;
+			}
 
-		if worker.lock().best_hash() == Some(best_hash) {
-			return Either::Left(future::ready(()))
-		}
+			// The worker is locked for the duration of the whole proposing period. Within this period,
+			// the mining target is outdated and useless anyway.
 
-		// The worker is locked for the duration of the whole proposing period. Within this period,
-		// the mining target is outdated and useless anyway.
+			let difficulty = match algorithm.difficulty(best_hash) {
+				Ok(x) => x,
+				Err(err) => {
+					warn!(
+						target: "pow",
+						"Unable to propose new block for authoring. \
+						 Fetch difficulty failed: {:?}",
+						err,
+					);
+					return;
+				},
+			};
 
-		let difficulty = match algorithm.difficulty(best_hash) {
-			Ok(x) => x,
-			Err(err) => {
-				warn!(
-					target: "pow",
-					"Unable to propose new block for authoring. \
-					 Fetch difficulty failed: {:?}",
-					err,
-				);
-				return Either::Left(future::ready(()))
-			},
-		};
+			let inherent_data_providers =
+				match create_inherent_data_providers.create_inherent_data_providers(best_hash, ()).await {
+					Ok(x) => x,
+					Err(err) => {
+						warn!(
+							target: "pow",
+							"Unable to propose new block for authoring. \
+							 Creating inherent data providers failed: {:?}",
+							err,
+						);
+						return;
+					},
+				};
 
-		let awaiting_proposer = env.init(&best_header);
-		let inherent_data = match inherent_data_providers.create_inherent_data() {
-			Ok(x) => x,
-			Err(err) => {
-				warn!(
-					target: "pow",
-					"Unable to propose new block for authoring. \
-					 Creating inherent data failed: {:?}",
-					err,
-				);
-				return Either::Left(future::ready(()))
-			},
-		};
-		let mut inherent_digest = Digest::<Block::Hash>::default();
-		if let Some(pre_runtime) = &pre_runtime {
-			inherent_digest.push(DigestItem::PreRuntime(POW_ENGINE_ID, pre_runtime.to_vec()));
-		}
+			let inherent_data = match inherent_data_providers.create_inherent_data() {
+				Ok(r) => r,
+				Err(e) => {
+					warn!(
+						target: "pow",
+						"Unable to propose new block for authoring. \
+						 Creating inherent data failed: {:?}",
+						e,
+					);
+					return;
+				},
+			};
+
+			let mut inherent_digest = Digest::<Block::Hash>::default();
+			if let Some(pre_runtime) = &pre_runtime {
+				inherent_digest.push(DigestItem::PreRuntime(POW_ENGINE_ID, pre_runtime.to_vec()));
+			}
 
-		let pre_runtime = pre_runtime.clone();
+			let pre_runtime = pre_runtime.clone();
 
-		Either::Right(async move {
-			let proposer = match awaiting_proposer.await {
+			let proposer = match env.init(&best_header).await {
 				Ok(x) => x,
 				Err(err) => {
 					warn!(
@@ -694,8 +687,8 @@ pub fn start_mining_worker<Block, C, S, Algorithm, E, SO, CAW>(
 			};
 
 			worker.lock().on_build(build);
-		})
-	});
+		}
+	};
 
 	(worker_ret, task)
 }
diff --git a/client/consensus/slots/Cargo.toml b/client/consensus/slots/Cargo.toml
index 64beea50fcf6..51382198f508 100644
--- a/client/consensus/slots/Cargo.toml
+++ b/client/consensus/slots/Cargo.toml
@@ -33,6 +33,7 @@ futures = "0.3.9"
 futures-timer = "3.0.1"
 log = "0.4.11"
 thiserror = "1.0.21"
+impl-trait-for-tuples = "0.2.1"
 async-trait = "0.1.42"
 
 [dev-dependencies]
diff --git a/client/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs
index c1638fb56632..4ef0093a185e 100644
--- a/client/consensus/slots/src/lib.rs
+++ b/client/consensus/slots/src/lib.rs
@@ -23,7 +23,7 @@
 //! provides generic functionality for slots.
 
 #![forbid(unsafe_code)]
-#![deny(missing_docs)]
+#![warn(missing_docs)]
 
 mod slots;
 mod aux_schema;
@@ -41,12 +41,13 @@ use sp_api::{ProvideRuntimeApi, ApiRef};
 use sp_arithmetic::traits::BaseArithmetic;
 use sp_consensus::{BlockImport, Proposer, SyncOracle, SelectChain, CanAuthorWith, SlotData};
 use sp_consensus_slots::Slot;
-use sp_inherents::{InherentData, InherentDataProviders};
+use sp_inherents::CreateInherentDataProviders;
 use sp_runtime::{
 	generic::BlockId,
-	traits::{Block as BlockT, Header, HashFor, NumberFor}
+	traits::{Block as BlockT, Header as HeaderT, HashFor, NumberFor}
 };
 use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_DEBUG, CONSENSUS_WARN, CONSENSUS_INFO};
+use sp_timestamp::Timestamp;
 
 /// The changes that need to applied to the storage to create the state for a block.
 ///
@@ -75,8 +76,7 @@ pub trait SlotWorker<B: BlockT, Proof> {
 	/// the slot. Otherwise `None` is returned.
 	async fn on_slot(
 		&mut self,
-		chain_head: B::Header,
-		slot_info: SlotInfo,
+		slot_info: SlotInfo<B>,
 	) -> Option<SlotResult<B, Proof>>;
 }
 
@@ -187,21 +187,19 @@ pub trait SimpleSlotWorker<B: BlockT> {
 	/// Remaining duration for proposing.
 	fn proposing_remaining_duration(
 		&self,
-		head: &B::Header,
-		slot_info: &SlotInfo,
+		slot_info: &SlotInfo<B>,
 	) -> Duration;
 
 	/// Implements [`SlotWorker::on_slot`].
 	async fn on_slot(
 		&mut self,
-		chain_head: B::Header,
-		slot_info: SlotInfo,
+		slot_info: SlotInfo<B>,
 	) -> Option<SlotResult<B, <Self::Proposer as Proposer<B>>::Proof>> {
 		let (timestamp, slot) = (slot_info.timestamp, slot_info.slot);
 		let telemetry = self.telemetry();
 		let logging_target = self.logging_target();
 
-		let proposing_remaining_duration = self.proposing_remaining_duration(&chain_head, &slot_info);
+		let proposing_remaining_duration = self.proposing_remaining_duration(&slot_info);
 
 		let proposing_remaining = if proposing_remaining_duration == Duration::default() {
 			debug!(
@@ -215,13 +213,13 @@ pub trait SimpleSlotWorker<B: BlockT> {
 			Delay::new(proposing_remaining_duration)
 		};
 
-		let epoch_data = match self.epoch_data(&chain_head, slot) {
+		let epoch_data = match self.epoch_data(&slot_info.chain_head, slot) {
 			Ok(epoch_data) => epoch_data,
 			Err(err) => {
 				warn!(
 					target: logging_target,
 					"Unable to fetch epoch data at block {:?}: {:?}",
-					chain_head.hash(),
+					slot_info.chain_head.hash(),
 					err,
 				);
 
@@ -229,7 +227,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 					telemetry;
 					CONSENSUS_WARN;
 					"slots.unable_fetching_authorities";
-					"slot" => ?chain_head.hash(),
+					"slot" => ?slot_info.chain_head.hash(),
 					"err" => ?err,
 				);
 
@@ -237,7 +235,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 			}
 		};
 
-		self.notify_slot(&chain_head, slot, &epoch_data);
+		self.notify_slot(&slot_info.chain_head, slot, &epoch_data);
 
 		let authorities_len = self.authorities_len(&epoch_data);
 
@@ -256,9 +254,9 @@ pub trait SimpleSlotWorker<B: BlockT> {
 			return None;
 		}
 
-		let claim = self.claim_slot(&chain_head, slot, &epoch_data)?;
+		let claim = self.claim_slot(&slot_info.chain_head, slot, &epoch_data)?;
 
-		if self.should_backoff(slot, &chain_head) {
+		if self.should_backoff(slot, &slot_info.chain_head) {
 			return None;
 		}
 
@@ -266,7 +264,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 			target: self.logging_target(),
 			"Starting authorship at slot {}; timestamp = {}",
 			slot,
-			timestamp,
+			*timestamp,
 		);
 
 		telemetry!(
@@ -277,7 +275,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 			"timestamp" => *timestamp,
 		);
 
-		let proposer = match self.proposer(&chain_head).await {
+		let proposer = match self.proposer(&slot_info.chain_head).await {
 			Ok(p) => p,
 			Err(err) => {
 				warn!(
@@ -422,94 +420,119 @@ pub trait SimpleSlotWorker<B: BlockT> {
 impl<B: BlockT, T: SimpleSlotWorker<B> + Send> SlotWorker<B, <T::Proposer as Proposer<B>>::Proof> for T {
 	async fn on_slot(
 		&mut self,
-		chain_head: B::Header,
-		slot_info: SlotInfo,
+		slot_info: SlotInfo<B>,
 	) -> Option<SlotResult<B, <T::Proposer as Proposer<B>>::Proof>> {
-		SimpleSlotWorker::on_slot(self, chain_head, slot_info).await
+		SimpleSlotWorker::on_slot(self, slot_info).await
 	}
 }
 
-/// Slot compatible inherent data.
-pub trait SlotCompatible {
-	/// Extract timestamp and slot from inherent data.
-	fn extract_timestamp_and_slot(
-		&self,
-		inherent: &InherentData,
-	) -> Result<(sp_timestamp::Timestamp, Slot, std::time::Duration), sp_consensus::Error>;
+/// Slot specific extension that the inherent data provider needs to implement.
+pub trait InherentDataProviderExt {
+	/// The current timestamp that will be found in the [`InherentData`].
+	fn timestamp(&self) -> Timestamp;
+
+	/// The current slot that will be found in the [`InherentData`].
+	fn slot(&self) -> Slot;
+}
+
+impl<T, S, P> InherentDataProviderExt for (T, S, P)
+where
+	T: Deref<Target = Timestamp>,
+	S: Deref<Target = Slot>,
+{
+	fn timestamp(&self) -> Timestamp {
+		*self.0.deref()
+	}
+
+	fn slot(&self) -> Slot {
+		*self.1.deref()
+	}
+}
+
+impl<T, S, P, R> InherentDataProviderExt for (T, S, P, R)
+where
+	T: Deref<Target = Timestamp>,
+	S: Deref<Target = Slot>,
+{
+	fn timestamp(&self) -> Timestamp {
+		*self.0.deref()
+	}
+
+	fn slot(&self) -> Slot {
+		*self.1.deref()
+	}
+}
+
+impl<T, S> InherentDataProviderExt for (T, S)
+where
+	T: Deref<Target = Timestamp>,
+	S: Deref<Target = Slot>,
+{
+	fn timestamp(&self) -> Timestamp {
+		*self.0.deref()
+	}
+
+	fn slot(&self) -> Slot {
+		*self.1.deref()
+	}
 }
 
 /// Start a new slot worker.
 ///
 /// Every time a new slot is triggered, `worker.on_slot` is called and the future it returns is
 /// polled until completion, unless we are major syncing.
-pub fn start_slot_worker<B, C, W, T, SO, SC, CAW, Proof>(
+pub async fn start_slot_worker<B, C, W, T, SO, CAW, CIDP, Proof>(
 	slot_duration: SlotDuration<T>,
 	client: C,
 	mut worker: W,
 	mut sync_oracle: SO,
-	inherent_data_providers: InherentDataProviders,
-	timestamp_extractor: SC,
+	create_inherent_data_providers: CIDP,
 	can_author_with: CAW,
-) -> impl Future<Output = ()>
+)
 where
 	B: BlockT,
 	C: SelectChain<B>,
 	W: SlotWorker<B, Proof>,
 	SO: SyncOracle + Send,
-	SC: SlotCompatible + Unpin,
 	T: SlotData + Clone,
 	CAW: CanAuthorWith<B> + Send,
+	CIDP: CreateInherentDataProviders<B, ()> + Send,
+	CIDP::InherentDataProviders: InherentDataProviderExt + Send,
 {
 	let SlotDuration(slot_duration) = slot_duration;
 
-	// rather than use a timer interval, we schedule our waits ourselves
-	let mut slots = Slots::<SC>::new(
+	let mut slots = Slots::new(
 		slot_duration.slot_duration(),
-		inherent_data_providers,
-		timestamp_extractor,
+		create_inherent_data_providers,
+		client,
 	);
 
-	async move {
-		loop {
-			let slot_info = match slots.next_slot().await {
-				Ok(slot) => slot,
-				Err(err) => {
-					debug!(target: "slots", "Faulty timer: {:?}", err);
-					return
-				},
-			};
-
-			// only propose when we are not syncing.
-			if sync_oracle.is_major_syncing() {
-				debug!(target: "slots", "Skipping proposal slot due to sync.");
-				continue;
+	loop {
+		let slot_info = match slots.next_slot().await {
+			Ok(r) => r,
+			Err(e) => {
+				warn!(target: "slots", "Error while polling for next slot: {:?}", e);
+				return;
 			}
+		};
 
-			let slot = slot_info.slot;
-			let chain_head = match client.best_chain() {
-				Ok(x) => x,
-				Err(e) => {
-					warn!(
-						target: "slots",
-						"Unable to author block in slot {}. No best block header: {:?}",
-						slot,
-						e,
-					);
-					continue;
-				}
-			};
+		if sync_oracle.is_major_syncing() {
+			debug!(target: "slots", "Skipping proposal slot due to sync.");
+			continue;
+		}
 
-			if let Err(err) = can_author_with.can_author_with(&BlockId::Hash(chain_head.hash())) {
-				warn!(
-					target: "slots",
-					"Unable to author block in slot {},. `can_author_with` returned: {} \
-					Probably a node update is required!",
-					slot,
-					err,
-				);
-			} else {
-				worker.on_slot(chain_head, slot_info).await;
-			}
+		if let Err(err) = can_author_with
+			.can_author_with(&BlockId::Hash(slot_info.chain_head.hash()))
+		{
+			warn!(
+				target: "slots",
+				"Unable to author block in slot {},. `can_author_with` returned: {} \
+				Probably a node update is required!",
+				slot_info.slot,
+				err,
+			);
+		} else {
+			let _ = worker.on_slot(slot_info).await;
 		}
 	}
 }
@@ -627,7 +650,10 @@ impl SlotProportion {
 /// to parent. If the number of skipped slots is greated than 0 this method will apply
 /// an exponential backoff of at most `2^7 * slot_duration`, if no slots were skipped
 /// this method will return `None.`
-pub fn slot_lenience_exponential(parent_slot: Slot, slot_info: &SlotInfo) -> Option<Duration> {
+pub fn slot_lenience_exponential<Block: BlockT>(
+	parent_slot: Slot,
+	slot_info: &SlotInfo<Block>,
+) -> Option<Duration> {
 	// never give more than 2^this times the lenience.
 	const BACKOFF_CAP: u64 = 7;
 
@@ -656,7 +682,10 @@ pub fn slot_lenience_exponential(parent_slot: Slot, slot_info: &SlotInfo) -> Opt
 /// to parent. If the number of skipped slots is greated than 0 this method will apply
 /// a linear backoff of at most `20 * slot_duration`, if no slots were skipped
 /// this method will return `None.`
-pub fn slot_lenience_linear(parent_slot: Slot, slot_info: &SlotInfo) -> Option<Duration> {
+pub fn slot_lenience_linear<Block: BlockT>(
+	parent_slot: u64,
+	slot_info: &SlotInfo<Block>,
+) -> Option<Duration> {
 	// never give more than 20 times more lenience.
 	const BACKOFF_CAP: u64 = 20;
 
@@ -777,20 +806,27 @@ impl<N> BackoffAuthoringBlocksStrategy<N> for () {
 
 #[cfg(test)]
 mod test {
+	use super::*;
 	use std::time::{Duration, Instant};
-	use crate::{BackoffAuthoringOnFinalizedHeadLagging, BackoffAuthoringBlocksStrategy};
-	use substrate_test_runtime_client::runtime::Block;
+	use substrate_test_runtime_client::runtime::{Block, Header};
 	use sp_api::NumberFor;
 
 	const SLOT_DURATION: Duration = Duration::from_millis(6000);
 
-	fn slot(slot: u64) -> super::slots::SlotInfo {
+	fn slot(slot: u64) -> super::slots::SlotInfo<Block> {
 		super::slots::SlotInfo {
 			slot: slot.into(),
 			duration: SLOT_DURATION,
 			timestamp: Default::default(),
 			inherent_data: Default::default(),
 			ends_at: Instant::now(),
+			chain_head: Header::new(
+				1,
+				Default::default(),
+				Default::default(),
+				Default::default(),
+				Default::default(),
+			),
 			block_size_limit: None,
 		}
 	}
@@ -798,20 +834,20 @@ mod test {
 	#[test]
 	fn linear_slot_lenience() {
 		// if no slots are skipped there should be no lenience
-		assert_eq!(super::slot_lenience_linear(1.into(), &slot(2)), None);
+		assert_eq!(super::slot_lenience_linear(1u64.into(), &slot(2)), None);
 
 		// otherwise the lenience is incremented linearly with
 		// the number of skipped slots.
 		for n in 3..=22 {
 			assert_eq!(
-				super::slot_lenience_linear(1.into(), &slot(n)),
+				super::slot_lenience_linear(1u64.into(), &slot(n)),
 				Some(SLOT_DURATION * (n - 2) as u32),
 			);
 		}
 
 		// but we cap it to a maximum of 20 slots
 		assert_eq!(
-			super::slot_lenience_linear(1.into(), &slot(23)),
+			super::slot_lenience_linear(1u64.into(), &slot(23)),
 			Some(SLOT_DURATION * 20),
 		);
 	}
@@ -819,24 +855,24 @@ mod test {
 	#[test]
 	fn exponential_slot_lenience() {
 		// if no slots are skipped there should be no lenience
-		assert_eq!(super::slot_lenience_exponential(1.into(), &slot(2)), None);
+		assert_eq!(super::slot_lenience_exponential(1u64.into(), &slot(2)), None);
 
 		// otherwise the lenience is incremented exponentially every two slots
 		for n in 3..=17 {
 			assert_eq!(
-				super::slot_lenience_exponential(1.into(), &slot(n)),
+				super::slot_lenience_exponential(1u64.into(), &slot(n)),
 				Some(SLOT_DURATION * 2u32.pow((n / 2 - 1) as u32)),
 			);
 		}
 
 		// but we cap it to a maximum of 14 slots
 		assert_eq!(
-			super::slot_lenience_exponential(1.into(), &slot(18)),
+			super::slot_lenience_exponential(1u64.into(), &slot(18)),
 			Some(SLOT_DURATION * 2u32.pow(7)),
 		);
 
 		assert_eq!(
-			super::slot_lenience_exponential(1.into(), &slot(19)),
+			super::slot_lenience_exponential(1u64.into(), &slot(19)),
 			Some(SLOT_DURATION * 2u32.pow(7)),
 		);
 	}
diff --git a/client/consensus/slots/src/slots.rs b/client/consensus/slots/src/slots.rs
index 1d89ba3bf992..b5ce71dfbf4c 100644
--- a/client/consensus/slots/src/slots.rs
+++ b/client/consensus/slots/src/slots.rs
@@ -20,9 +20,10 @@
 //!
 //! This is used instead of `futures_timer::Interval` because it was unreliable.
 
-use super::{SlotCompatible, Slot};
-use sp_consensus::Error;
-use sp_inherents::{InherentData, InherentDataProviders};
+use super::{Slot, InherentDataProviderExt};
+use sp_consensus::{Error, SelectChain};
+use sp_inherents::{InherentData, CreateInherentDataProviders, InherentDataProvider};
+use sp_runtime::traits::{Block as BlockT, Header as HeaderT};
 
 use std::time::{Duration, Instant};
 use futures_timer::Delay;
@@ -38,19 +39,19 @@ pub fn duration_now() -> Duration {
 	))
 }
 
-/// Returns the duration until the next slot, based on current duration since
-pub fn time_until_next(now: Duration, slot_duration: Duration) -> Duration {
+/// Returns the duration until the next slot from now.
+pub fn time_until_next(slot_duration: Duration) -> Duration {
 	let remaining_full_millis = slot_duration.as_millis()
-		- (now.as_millis() % slot_duration.as_millis())
+		- (duration_now().as_millis() % slot_duration.as_millis())
 		- 1;
 	Duration::from_millis(remaining_full_millis as u64)
 }
 
 /// Information about a slot.
-pub struct SlotInfo {
-	/// The slot number.
+pub struct SlotInfo<B: BlockT> {
+	/// The slot number as found in the inherent data.
 	pub slot: Slot,
-	/// Current timestamp.
+	/// Current timestamp as found in the inherent data.
 	pub timestamp: sp_timestamp::Timestamp,
 	/// The instant at which the slot ends.
 	pub ends_at: Instant,
@@ -58,13 +59,15 @@ pub struct SlotInfo {
 	pub inherent_data: InherentData,
 	/// Slot duration.
 	pub duration: Duration,
+	/// The chain header this slot is based on.
+	pub chain_head: B::Header,
 	/// Some potential block size limit for the block to be authored at this slot.
 	///
 	/// For more information see [`Proposer::propose`](sp_consensus::Proposer::propose).
 	pub block_size_limit: Option<usize>,
 }
 
-impl SlotInfo {
+impl<B: BlockT> SlotInfo<B> {
 	/// Create a new [`SlotInfo`].
 	///
 	/// `ends_at` is calculated using `timestamp` and `duration`.
@@ -73,6 +76,7 @@ impl SlotInfo {
 		timestamp: sp_timestamp::Timestamp,
 		inherent_data: InherentData,
 		duration: Duration,
+		chain_head: B::Header,
 		block_size_limit: Option<usize>,
 	) -> Self {
 		Self {
@@ -80,46 +84,55 @@ impl SlotInfo {
 			timestamp,
 			inherent_data,
 			duration,
+			chain_head,
 			block_size_limit,
-			ends_at: Instant::now() + time_until_next(timestamp.as_duration(), duration),
+			ends_at: Instant::now() + time_until_next(duration),
 		}
 	}
 }
 
 /// A stream that returns every time there is a new slot.
-pub(crate) struct Slots<SC> {
+pub(crate) struct Slots<Block, C, IDP> {
 	last_slot: Slot,
 	slot_duration: Duration,
 	inner_delay: Option<Delay>,
-	inherent_data_providers: InherentDataProviders,
-	timestamp_extractor: SC,
+	create_inherent_data_providers: IDP,
+	client: C,
+	_phantom: std::marker::PhantomData<Block>,
 }
 
-impl<SC> Slots<SC> {
+impl<Block, C, IDP> Slots<Block, C, IDP> {
 	/// Create a new `Slots` stream.
 	pub fn new(
 		slot_duration: Duration,
-		inherent_data_providers: InherentDataProviders,
-		timestamp_extractor: SC,
+		create_inherent_data_providers: IDP,
+		client: C,
 	) -> Self {
 		Slots {
 			last_slot: 0.into(),
 			slot_duration,
 			inner_delay: None,
-			inherent_data_providers,
-			timestamp_extractor,
+			create_inherent_data_providers,
+			client,
+			_phantom: Default::default(),
 		}
 	}
 }
 
-impl<SC: SlotCompatible> Slots<SC> {
+impl<Block, C, IDP> Slots<Block, C, IDP>
+where
+	Block: BlockT,
+	C: SelectChain<Block>,
+	IDP: CreateInherentDataProviders<Block, ()>,
+	IDP::InherentDataProviders: crate::InherentDataProviderExt,
+{
 	/// Returns a future that fires when the next slot starts.
-	pub async fn next_slot(&mut self) -> Result<SlotInfo, Error> {
+	pub async fn next_slot(&mut self) -> Result<SlotInfo<Block>, Error> {
 		loop {
 			self.inner_delay = match self.inner_delay.take() {
 				None => {
 					// schedule wait.
-					let wait_dur = time_until_next(duration_now(), self.slot_duration);
+					let wait_dur = time_until_next(self.slot_duration);
 					Some(Delay::new(wait_dur))
 				}
 				Some(d) => Some(d),
@@ -130,15 +143,39 @@ impl<SC: SlotCompatible> Slots<SC> {
 			}
 			// timeout has fired.
 
-			let inherent_data = match self.inherent_data_providers.create_inherent_data() {
-				Ok(id) => id,
-				Err(err) => return Err(sp_consensus::Error::InherentData(err)),
+			let ends_at = Instant::now() + time_until_next(self.slot_duration);
+
+			let chain_head = match self.client.best_chain() {
+				Ok(x) => x,
+				Err(e) => {
+					log::warn!(
+						target: "slots",
+						"Unable to author block in slot. No best block header: {:?}",
+						e,
+					);
+					// Let's try at the next slot..
+					self.inner_delay.take();
+					continue;
+				}
 			};
-			let result = self.timestamp_extractor.extract_timestamp_and_slot(&inherent_data);
-			let (timestamp, slot, offset) = result?;
+
+			let inherent_data_providers = self.create_inherent_data_providers
+				.create_inherent_data_providers(chain_head.hash(), ())
+				.await?;
+
+			if Instant::now() > ends_at {
+				log::warn!(
+					target: "slots",
+					"Creating inherent data providers took more time than we had left for the slot.",
+				);
+			}
+
+			let timestamp = inherent_data_providers.timestamp();
+			let slot = inherent_data_providers.slot();
+			let inherent_data = inherent_data_providers.create_inherent_data()?;
+
 			// reschedule delay for next slot.
-			let ends_in = offset +
-				time_until_next(timestamp.as_duration(), self.slot_duration);
+			let ends_in = time_until_next(self.slot_duration);
 			self.inner_delay = Some(Delay::new(ends_in));
 
 			// never yield the same slot twice.
@@ -150,6 +187,7 @@ impl<SC: SlotCompatible> Slots<SC> {
 					timestamp,
 					inherent_data,
 					self.slot_duration,
+					chain_head,
 					None,
 				))
 			}
diff --git a/client/consensus/uncles/Cargo.toml b/client/consensus/uncles/Cargo.toml
index 14a8c850562c..ab88d4496fec 100644
--- a/client/consensus/uncles/Cargo.toml
+++ b/client/consensus/uncles/Cargo.toml
@@ -14,9 +14,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 sc-client-api = { version = "3.0.0", path = "../../api" }
-sp-core = { version = "3.0.0", path = "../../../primitives/core" }
 sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
 sp-authorship = { version = "3.0.0", path = "../../../primitives/authorship" }
-sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
-sp-inherents = { version = "3.0.0", path = "../../../primitives/inherents" }
-log = "0.4.8"
+thiserror = "1.0.21"
diff --git a/client/consensus/uncles/src/lib.rs b/client/consensus/uncles/src/lib.rs
index f38849300d0d..cfae0528a627 100644
--- a/client/consensus/uncles/src/lib.rs
+++ b/client/consensus/uncles/src/lib.rs
@@ -17,51 +17,28 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Uncles functionality for Substrate.
-#![forbid(unsafe_code, missing_docs)]
 
-use sp_consensus::SelectChain;
-use sp_inherents::{InherentDataProviders};
-use log::warn;
 use sc_client_api::ProvideUncles;
-use sp_runtime::traits::{Block as BlockT, Header};
-use std::sync::Arc;
-use sp_authorship;
+use sp_runtime::{traits::Block as BlockT, generic::BlockId};
+
+#[derive(Debug, thiserror::Error)]
+pub enum Error<B: BlockT> {
+	#[error("Could not retrieve the block hash for block id: {0:?}")]
+	NoHashForBlockId(BlockId<B>),
+}
 
 /// Maximum uncles generations we may provide to the runtime.
 const MAX_UNCLE_GENERATIONS: u32 = 8;
 
-/// Register uncles inherent data provider, if not registered already.
-pub fn register_uncles_inherent_data_provider<B, C, SC>(
-	client: Arc<C>,
-	select_chain: SC,
-	inherent_data_providers: &InherentDataProviders,
-) -> Result<(), sp_consensus::Error> where
+/// Create a new [`sp_authorship::InherentDataProvider`] at the given block.
+pub fn create_uncles_inherent_data_provider<B, C>(
+	client: &C,
+	parent: B::Hash,
+) -> Result<sp_authorship::InherentDataProvider<B::Header>, sc_client_api::blockchain::Error> where
 	B: BlockT,
-	C: ProvideUncles<B> + Send + Sync + 'static,
-	SC: SelectChain<B> + 'static,
+	C: ProvideUncles<B>,
 {
-	if !inherent_data_providers.has_provider(&sp_authorship::INHERENT_IDENTIFIER) {
-		inherent_data_providers
-			.register_provider(sp_authorship::InherentDataProvider::new(move || {
-				{
-					let chain_head = match select_chain.best_chain() {
-						Ok(x) => x,
-						Err(e) => {
-							warn!(target: "uncles", "Unable to get chain head: {:?}", e);
-							return Vec::new();
-						}
-					};
-					match client.uncles(chain_head.hash(), MAX_UNCLE_GENERATIONS.into()) {
-						Ok(uncles) => uncles,
-						Err(e) => {
-							warn!(target: "uncles", "Unable to get uncles: {:?}", e);
-							Vec::new()
-						}
-					}
-				}
-			}))
-		.map_err(|err| sp_consensus::Error::InherentData(err.into()))?;
-	}
-	Ok(())
-}
+	let uncles = client.uncles(parent, MAX_UNCLE_GENERATIONS.into())?;
 
+	Ok(sp_authorship::InherentDataProvider::new(uncles))
+}
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index f05a2751995d..a958cb6865c7 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -44,8 +44,8 @@ use sp_runtime::{
 	Justification, Justifications, BuildStorage,
 	generic::{BlockId, SignedBlock, DigestItem},
 	traits::{
-		Block as BlockT, Header as HeaderT, Zero, NumberFor,
-		HashFor, SaturatedConversion, One, DigestFor, UniqueSaturatedInto,
+		Block as BlockT, Header as HeaderT, Zero, NumberFor, HashFor, SaturatedConversion, One,
+		DigestFor,
 	},
 };
 use sp_state_machine::{
@@ -1149,14 +1149,20 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 	}
 
 	/// Gets the uncles of the block with `target_hash` going back `max_generation` ancestors.
-	pub fn uncles(&self, target_hash: Block::Hash, max_generation: NumberFor<Block>) -> sp_blockchain::Result<Vec<Block::Hash>> {
+	pub fn uncles(
+		&self,
+		target_hash: Block::Hash,
+		max_generation: NumberFor<Block>,
+	) -> sp_blockchain::Result<Vec<Block::Hash>> {
 		let load_header = |id: Block::Hash| -> sp_blockchain::Result<Block::Header> {
 			self.backend.blockchain().header(BlockId::Hash(id))?
 				.ok_or_else(|| Error::UnknownBlock(format!("{:?}", id)))
 		};
 
 		let genesis_hash = self.backend.blockchain().info().genesis_hash;
-		if genesis_hash == target_hash { return Ok(Vec::new()); }
+		if genesis_hash == target_hash {
+			return Ok(Vec::new());
+		}
 
 		let mut current_hash = target_hash;
 		let mut current = load_header(current_hash)?;
@@ -1164,14 +1170,20 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		let mut ancestor = load_header(ancestor_hash)?;
 		let mut uncles = Vec::new();
 
-		for _generation in 0u32..UniqueSaturatedInto::<u32>::unique_saturated_into(max_generation) {
+		let mut generation: NumberFor<Block> = Zero::zero();
+		while generation < max_generation {
 			let children = self.backend.blockchain().children(ancestor_hash)?;
 			uncles.extend(children.into_iter().filter(|h| h != &current_hash));
 			current_hash = ancestor_hash;
-			if genesis_hash == current_hash { break; }
+
+			if genesis_hash == current_hash {
+				break;
+			}
+
 			current = ancestor;
 			ancestor_hash = *current.parent_hash();
 			ancestor = load_header(ancestor_hash)?;
+			generation += One::one();
 		}
 		trace!("Collected {} uncles", uncles.len());
 		Ok(uncles)
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index da05f99506a9..0e47b775e4a4 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -176,8 +176,6 @@ pub struct PartialComponents<Client, Backend, SelectChain, ImportQueue, Transact
 	pub import_queue: ImportQueue,
 	/// A shared transaction pool.
 	pub transaction_pool: Arc<TransactionPool>,
-	/// A registry of all providers of `InherentData`.
-	pub inherent_data_providers: sp_inherents::InherentDataProviders,
 	/// Everything else that needs to be passed into the main build function.
 	pub other: Other,
 }
diff --git a/frame/authorship/Cargo.toml b/frame/authorship/Cargo.toml
index 3bbbe9749c63..56c56e23dfc8 100644
--- a/frame/authorship/Cargo.toml
+++ b/frame/authorship/Cargo.toml
@@ -14,7 +14,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-inherents = { version = "3.0.0", default-features = false, path = "../../primitives/inherents" }
 sp-authorship = { version = "3.0.0", default-features = false, path = "../../primitives/authorship" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
@@ -31,7 +30,6 @@ serde = { version = "1.0.101" }
 default = ["std"]
 std = [
 	"codec/std",
-	"sp-inherents/std",
 	"sp-runtime/std",
 	"sp-std/std",
 	"frame-support/std",
diff --git a/frame/authorship/src/lib.rs b/frame/authorship/src/lib.rs
index 4243ae55718a..b00f412808a1 100644
--- a/frame/authorship/src/lib.rs
+++ b/frame/authorship/src/lib.rs
@@ -21,13 +21,13 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use sp_std::{result, prelude::*};
-use sp_std::collections::btree_set::BTreeSet;
-use frame_support::dispatch;
-use frame_support::traits::{FindAuthor, VerifySeal, Get};
+use sp_std::{result, prelude::*, collections::btree_set::BTreeSet};
+use frame_support::{
+	dispatch, traits::{FindAuthor, VerifySeal, Get},
+	inherent::{InherentData, ProvideInherent, InherentIdentifier},
+};
 use codec::{Encode, Decode};
 use sp_runtime::traits::{Header as HeaderT, One, Zero};
-use sp_inherents::{InherentIdentifier, ProvideInherent, InherentData};
 use sp_authorship::{INHERENT_IDENTIFIER, UnclesInherentData, InherentError};
 
 const MAX_UNCLES: usize = 10;
@@ -293,8 +293,7 @@ impl<T: Config> Pallet<T> {
 		uncle: &T::Header,
 		existing_uncles: I,
 		accumulator: &mut <T::FilterUncle as FilterUncle<T::Header, T::AccountId>>::Accumulator,
-	) -> Result<Option<T::AccountId>, dispatch::DispatchError>
-	{
+	) -> Result<Option<T::AccountId>, dispatch::DispatchError> {
 		let now = <frame_system::Pallet<T>>::block_number();
 
 		let (minimum_height, maximum_height) = {
diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index 36ad11360fd3..c630fb639960 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -619,7 +619,7 @@ mod tests {
 			}
 		}
 
-		impl<T: Config> sp_inherents::ProvideInherent for Module<T> {
+		impl<T: Config> frame_support::inherent::ProvideInherent for Module<T> {
 			type Call = Call<T>;
 			type Error = sp_inherents::MakeFatalError<()>;
 			const INHERENT_IDENTIFIER: [u8; 8] = *b"test1234";
diff --git a/frame/support/src/inherent.rs b/frame/support/src/inherent.rs
index 87e489bd8f4d..4ce5958adbe9 100644
--- a/frame/support/src/inherent.rs
+++ b/frame/support/src/inherent.rs
@@ -19,14 +19,70 @@
 pub use crate::sp_std::vec::Vec;
 #[doc(hidden)]
 pub use crate::sp_runtime::traits::{Block as BlockT, Extrinsic};
-#[doc(hidden)]
+
 pub use sp_inherents::{
-	InherentData, ProvideInherent, CheckInherentsResult, IsFatalError, InherentIdentifier,
-	MakeFatalError,
+	InherentData, CheckInherentsResult, IsFatalError, InherentIdentifier, MakeFatalError,
 };
 
+/// A pallet that provides or verifies an inherent extrinsic.
+///
+/// The pallet may provide the inherent, verify an inherent, or both provide and verify.
+pub trait ProvideInherent {
+	/// The call type of the pallet.
+	type Call;
+	/// The error returned by `check_inherent`.
+	type Error: codec::Encode + IsFatalError;
+	/// The inherent identifier used by this inherent.
+	const INHERENT_IDENTIFIER: self::InherentIdentifier;
+
+	/// Create an inherent out of the given `InherentData`.
+	fn create_inherent(data: &InherentData) -> Option<Self::Call>;
+
+	/// Determines whether this inherent is required in this block.
+	///
+	/// - `Ok(None)` indicates that this inherent is not required in this block. The default
+	/// implementation returns this.
+	///
+	/// - `Ok(Some(e))` indicates that this inherent is required in this block. The
+	/// `impl_outer_inherent!`, will call this function from its `check_extrinsics`.
+	/// If the inherent is not present, it will return `e`.
+	///
+	/// - `Err(_)` indicates that this function failed and further operations should be aborted.
+	///
+	/// NOTE: If inherent is required then the runtime asserts that the block contains at least
+	/// one inherent for which:
+	/// * type is [`Self::Call`],
+	/// * [`Self::is_inherent`] returns true.
+	fn is_inherent_required(_: &InherentData) -> Result<Option<Self::Error>, Self::Error> { Ok(None) }
+
+	/// Check whether the given inherent is valid. Checking the inherent is optional and can be
+	/// omitted by using the default implementation.
+	///
+	/// When checking an inherent, the first parameter represents the inherent that is actually
+	/// included in the block by its author. Whereas the second parameter represents the inherent
+	/// data that the verifying node calculates.
+	///
+	/// NOTE: A block can contains multiple inherent.
+	fn check_inherent(_: &Self::Call, _: &InherentData) -> Result<(), Self::Error> {
+		Ok(())
+	}
+
+	/// Return whether the call is an inherent call.
+	///
+	/// NOTE: Signed extrinsics are not inherent, but signed extrinsic with the given call variant
+	/// can be dispatched.
+	///
+	/// # Warning
+	///
+	/// In FRAME, inherent are enforced to be before other extrinsics, for this reason,
+	/// pallets with unsigned transactions **must ensure** that no unsigned transaction call
+	/// is an inherent call, when implementing `ValidateUnsigned::validate_unsigned`.
+	/// Otherwise block producer can produce invalid blocks by including them after non inherent.
+	fn is_inherent(call: &Self::Call) -> bool;
+}
+
 /// Implement the outer inherent.
-/// All given modules need to implement `ProvideInherent`.
+/// All given modules need to implement [`ProvideInherent`].
 ///
 /// # Example
 ///
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 12f651cb3dae..77163755ac56 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -1229,8 +1229,8 @@ pub mod tests {
 pub mod pallet_prelude {
 	pub use sp_std::marker::PhantomData;
 	#[cfg(feature = "std")]
-	pub use frame_support::traits::GenesisBuild;
-	pub use frame_support::{
+	pub use crate::traits::GenesisBuild;
+	pub use crate::{
 		EqNoBound, PartialEqNoBound, RuntimeDebugNoBound, DebugNoBound, CloneNoBound, Twox256,
 		Twox128, Blake2_256, Blake2_128, Identity, Twox64Concat, Blake2_128Concat, ensure,
 		RuntimeDebug, storage,
@@ -1241,7 +1241,7 @@ pub mod pallet_prelude {
 		storage::bounded_vec::{BoundedVec, BoundedVecValue},
 	};
 	pub use codec::{Encode, Decode};
-	pub use sp_inherents::{InherentData, InherentIdentifier, ProvideInherent};
+	pub use crate::inherent::{InherentData, InherentIdentifier, ProvideInherent};
 	pub use sp_runtime::{
 		traits::{MaybeSerializeDeserialize, Member, ValidateUnsigned},
 		transaction_validity::{
diff --git a/frame/support/test/Cargo.toml b/frame/support/test/Cargo.toml
index 7d2f0ec463a3..85236a20f60e 100644
--- a/frame/support/test/Cargo.toml
+++ b/frame/support/test/Cargo.toml
@@ -17,7 +17,6 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
 sp-io = { version = "3.0.0", path = "../../../primitives/io", default-features = false }
 sp-state-machine = { version = "0.9.0", optional = true, path = "../../../primitives/state-machine" }
 frame-support = { version = "3.0.0", default-features = false, path = "../" }
-sp-inherents = { version = "3.0.0", default-features = false, path = "../../../primitives/inherents" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
 sp-core = { version = "3.0.0", default-features = false, path = "../../../primitives/core" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../../primitives/std" }
@@ -35,7 +34,6 @@ std = [
 	"sp-io/std",
 	"frame-support/std",
 	"frame-system/std",
-	"sp-inherents/std",
 	"sp-core/std",
 	"sp-std/std",
 	"sp-runtime/std",
diff --git a/frame/support/test/tests/instance.rs b/frame/support/test/tests/instance.rs
index dbffead8ad2b..077763ac9128 100644
--- a/frame/support/test/tests/instance.rs
+++ b/frame/support/test/tests/instance.rs
@@ -26,8 +26,8 @@ use frame_support::{
 		StorageEntryMetadata, StorageHasher,
 	},
 	StorageValue, StorageMap, StorageDoubleMap,
+	inherent::{ProvideInherent, InherentData, InherentIdentifier, MakeFatalError},
 };
-use sp_inherents::{ProvideInherent, InherentData, InherentIdentifier, MakeFatalError};
 use sp_core::{H256, sr25519};
 
 mod system;
@@ -112,7 +112,7 @@ mod module1 {
 		T::BlockNumber: From<u32>
 	{
 		type Call = Call<T, I>;
-		type Error = MakeFatalError<sp_inherents::Error>;
+		type Error = MakeFatalError<()>;
 		const INHERENT_IDENTIFIER: InherentIdentifier = INHERENT_IDENTIFIER;
 
 		fn create_inherent(_data: &InherentData) -> Option<Self::Call> {
@@ -176,7 +176,7 @@ mod module2 {
 
 	impl<T: Config<I>, I: Instance> ProvideInherent for Module<T, I> {
 		type Call = Call<T, I>;
-		type Error = MakeFatalError<sp_inherents::Error>;
+		type Error = MakeFatalError<()>;
 		const INHERENT_IDENTIFIER: InherentIdentifier = INHERENT_IDENTIFIER;
 
 		fn create_inherent(_data: &InherentData) -> Option<Self::Call> {
diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index 8fc056a2f36a..4944ded2dbec 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -299,13 +299,13 @@ pub mod pallet {
 	pub enum InherentError {
 	}
 
-	impl sp_inherents::IsFatalError for InherentError {
+	impl frame_support::inherent::IsFatalError for InherentError {
 		fn is_fatal_error(&self) -> bool {
 			unimplemented!();
 		}
 	}
 
-	pub const INHERENT_IDENTIFIER: sp_inherents::InherentIdentifier = *b"testpall";
+	pub const INHERENT_IDENTIFIER: InherentIdentifier = *b"testpall";
 }
 
 // Test that a pallet with non generic event and generic genesis_config is correctly handled
diff --git a/frame/support/test/tests/pallet_instance.rs b/frame/support/test/tests/pallet_instance.rs
index 232a25ff5bf2..f0143b9c40d6 100644
--- a/frame/support/test/tests/pallet_instance.rs
+++ b/frame/support/test/tests/pallet_instance.rs
@@ -181,13 +181,13 @@ pub mod pallet {
 	pub enum InherentError {
 	}
 
-	impl sp_inherents::IsFatalError for InherentError {
+	impl frame_support::inherent::IsFatalError for InherentError {
 		fn is_fatal_error(&self) -> bool {
 			unimplemented!();
 		}
 	}
 
-	pub const INHERENT_IDENTIFIER: sp_inherents::InherentIdentifier = *b"testpall";
+	pub const INHERENT_IDENTIFIER: frame_support::inherent::InherentIdentifier = *b"testpall";
 }
 
 // Test that a instantiable pallet with a generic genesis_config is correctly handled
diff --git a/frame/support/test/tests/pallet_with_name_trait_is_valid.rs b/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
index 99c00b535fa0..e7f44c4b9651 100644
--- a/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
+++ b/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
@@ -67,18 +67,21 @@ impl<T: Trait> sp_runtime::traits::ValidateUnsigned for Module<T> {
 	}
 }
 
-pub const INHERENT_IDENTIFIER: sp_inherents::InherentIdentifier = *b"12345678";
+pub const INHERENT_IDENTIFIER: frame_support::inherent::InherentIdentifier = *b"12345678";
 
-impl<T: Trait> sp_inherents::ProvideInherent for Module<T> {
+impl<T: Trait> frame_support::inherent::ProvideInherent for Module<T> {
 	type Call = Call<T>;
-	type Error = sp_inherents::MakeFatalError<sp_inherents::Error>;
-	const INHERENT_IDENTIFIER: sp_inherents::InherentIdentifier = INHERENT_IDENTIFIER;
+	type Error = frame_support::inherent::MakeFatalError<()>;
+	const INHERENT_IDENTIFIER: frame_support::inherent::InherentIdentifier = INHERENT_IDENTIFIER;
 
-	fn create_inherent(_data: &sp_inherents::InherentData) -> Option<Self::Call> {
+	fn create_inherent(_data: &frame_support::inherent::InherentData) -> Option<Self::Call> {
 		unimplemented!();
 	}
 
-	fn check_inherent(_: &Self::Call, _: &sp_inherents::InherentData) -> std::result::Result<(), Self::Error> {
+	fn check_inherent(
+		_: &Self::Call,
+		_: &frame_support::inherent::InherentData,
+	) -> std::result::Result<(), Self::Error> {
 		unimplemented!();
 	}
 
diff --git a/frame/timestamp/src/lib.rs b/frame/timestamp/src/lib.rs
index ce6fd09bb782..7c553b1e4b82 100644
--- a/frame/timestamp/src/lib.rs
+++ b/frame/timestamp/src/lib.rs
@@ -96,14 +96,8 @@ mod benchmarking;
 pub mod weights;
 
 use sp_std::{result, cmp};
-use sp_inherents::InherentData;
 use frame_support::traits::{Time, UnixTime, OnTimestampSet};
-use sp_runtime::{
-	RuntimeString,
-	traits::{
-		AtLeast32Bit, Zero, SaturatedConversion, Scale,
-	}
-};
+use sp_runtime::traits::{AtLeast32Bit, Zero, SaturatedConversion, Scale};
 use sp_timestamp::{
 	InherentError, INHERENT_IDENTIFIER, InherentType,
 };
@@ -213,8 +207,9 @@ pub mod pallet {
 		const INHERENT_IDENTIFIER: InherentIdentifier = INHERENT_IDENTIFIER;
 
 		fn create_inherent(data: &InherentData) -> Option<Self::Call> {
-			let inherent_data = extract_inherent_data(data)
-				.expect("Gets and decodes timestamp inherent data");
+			let inherent_data = data.get_data::<InherentType>(&INHERENT_IDENTIFIER)
+				.expect("Timestamp inherent data not correctly encoded")
+				.expect("Timestamp inherent data must be provided");
 			let data = (*inherent_data).saturated_into::<T::Moment>();
 
 			let next_time = cmp::max(data, Self::now() + T::MinimumPeriod::get());
@@ -230,11 +225,13 @@ pub mod pallet {
 				_ => return Ok(()),
 			};
 
-			let data = extract_inherent_data(data).map_err(|e| InherentError::Other(e))?;
+			let data = data.get_data::<InherentType>(&INHERENT_IDENTIFIER)
+				.expect("Timestamp inherent data not correctly encoded")
+				.expect("Timestamp inherent data must be provided");
 
 			let minimum = (Self::now() + T::MinimumPeriod::get()).saturated_into::<u64>();
 			if t > *(data + MAX_TIMESTAMP_DRIFT_MILLIS) {
-				Err(InherentError::Other("Timestamp too far in future to accept".into()))
+				Err(InherentError::TooFarInFuture)
 			} else if t < minimum {
 				Err(InherentError::ValidAtTimestamp(minimum.into()))
 			} else {
@@ -264,12 +261,6 @@ impl<T: Config> Pallet<T> {
 	}
 }
 
-fn extract_inherent_data(data: &InherentData) -> Result<InherentType, RuntimeString> {
-	data.get_data::<InherentType>(&INHERENT_IDENTIFIER)
-		.map_err(|_| RuntimeString::from("Invalid timestamp inherent data encoding."))?
-		.ok_or_else(|| "Timestamp inherent data is not provided.".into())
-}
-
 impl<T: Config> Time for Pallet<T> {
 	type Moment = T::Moment;
 
diff --git a/primitives/authorship/Cargo.toml b/primitives/authorship/Cargo.toml
index 5455902fddc3..a9428f8422f5 100644
--- a/primitives/authorship/Cargo.toml
+++ b/primitives/authorship/Cargo.toml
@@ -17,6 +17,7 @@ sp-inherents = { version = "3.0.0", default-features = false, path = "../inheren
 sp-runtime = { version = "3.0.0", default-features = false, path = "../runtime" }
 sp-std = { version = "3.0.0", default-features = false, path = "../std" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+async-trait = { version = "0.1.48", optional = true }
 
 [features]
 default = [ "std" ]
@@ -25,4 +26,5 @@ std = [
 	"sp-std/std",
 	"sp-inherents/std",
 	"sp-runtime/std",
+	"async-trait",
 ]
diff --git a/primitives/authorship/src/lib.rs b/primitives/authorship/src/lib.rs
index 7bf6769951b2..1350fa17ff30 100644
--- a/primitives/authorship/src/lib.rs
+++ b/primitives/authorship/src/lib.rs
@@ -23,7 +23,7 @@ use sp_std::{result::Result, prelude::*};
 
 use codec::{Encode, Decode};
 use sp_inherents::{Error, InherentIdentifier, InherentData, IsFatalError};
-use sp_runtime::RuntimeString;
+use sp_runtime::{RuntimeString, traits::Header as HeaderT};
 
 /// The identifier for the `uncles` inherent.
 pub const INHERENT_IDENTIFIER: InherentIdentifier = *b"uncles00";
@@ -44,12 +44,12 @@ impl IsFatalError for InherentError {
 }
 
 /// Auxiliary trait to extract uncles inherent data.
-pub trait UnclesInherentData<H: Decode> {
+pub trait UnclesInherentData<H> {
 	/// Get uncles.
 	fn uncles(&self) -> Result<Vec<H>, Error>;
 }
 
-impl<H: Decode> UnclesInherentData<H> for InherentData {
+impl<H: HeaderT> UnclesInherentData<H> for InherentData {
 	fn uncles(&self) -> Result<Vec<H>, Error> {
 		Ok(self.get_data(&INHERENT_IDENTIFIER)?.unwrap_or_default())
 	}
@@ -57,36 +57,43 @@ impl<H: Decode> UnclesInherentData<H> for InherentData {
 
 /// Provider for inherent data.
 #[cfg(feature = "std")]
-pub struct InherentDataProvider<F, H> {
-	inner: F,
-	_marker: std::marker::PhantomData<H>,
+pub struct InherentDataProvider<H> {
+	uncles: Vec<H>,
 }
 
 #[cfg(feature = "std")]
-impl<F, H> InherentDataProvider<F, H> {
-	pub fn new(uncles_oracle: F) -> Self {
-		InherentDataProvider { inner: uncles_oracle, _marker: Default::default() }
+impl<H> InherentDataProvider<H> {
+	/// Create a new inherent data provider with the given `uncles`.
+	pub fn new(uncles: Vec<H>) -> Self {
+		InherentDataProvider { uncles }
+	}
+
+	/// Create a new instance that is usable for checking inherents.
+	///
+	/// This will always return an empty vec of uncles.
+	pub fn check_inherents() -> Self {
+		Self { uncles: Vec::new() }
 	}
 }
 
 #[cfg(feature = "std")]
-impl<F, H: Encode + std::fmt::Debug> sp_inherents::ProvideInherentData for InherentDataProvider<F, H>
-where F: Fn() -> Vec<H>
-{
-	fn inherent_identifier(&self) -> &'static InherentIdentifier {
-		&INHERENT_IDENTIFIER
+#[async_trait::async_trait]
+impl<H: HeaderT> sp_inherents::InherentDataProvider for InherentDataProvider<H> {
+	fn provide_inherent_data(&self, inherent_data: &mut InherentData) -> Result<(), Error> {
+		inherent_data.put_data(INHERENT_IDENTIFIER, &self.uncles)
 	}
 
-	fn provide_inherent_data(&self, inherent_data: &mut InherentData) -> Result<(), Error> {
-		let uncles = (self.inner)();
-		if !uncles.is_empty() {
-			inherent_data.put_data(INHERENT_IDENTIFIER, &uncles)
-		} else {
-			Ok(())
+	async fn try_handle_error(
+		&self,
+		identifier: &InherentIdentifier,
+		error: &[u8],
+	) -> Option<Result<(), Error>> {
+		if *identifier != INHERENT_IDENTIFIER {
+			return None
 		}
-	}
 
-	fn error_to_string(&self, _error: &[u8]) -> Option<String> {
-		Some(format!("no further information"))
+		let error = InherentError::decode(&mut &error[..]).ok()?;
+
+		Some(Err(Error::Application(Box::from(format!("{:?}", error)))))
 	}
 }
diff --git a/primitives/consensus/aura/Cargo.toml b/primitives/consensus/aura/Cargo.toml
index 105c74bb317d..2ae4259a21e5 100644
--- a/primitives/consensus/aura/Cargo.toml
+++ b/primitives/consensus/aura/Cargo.toml
@@ -22,6 +22,7 @@ sp-inherents = { version = "3.0.0", default-features = false, path = "../../inhe
 sp-timestamp = { version = "3.0.0", default-features = false, path = "../../timestamp" }
 sp-consensus-slots = { version = "0.9.0", default-features = false, path = "../slots" }
 sp-consensus = { version = "0.9.0", path = "../common", optional = true }
+async-trait = { version = "0.1.48", optional = true }
 
 [features]
 default = ["std"]
@@ -35,4 +36,5 @@ std = [
 	"sp-timestamp/std",
 	"sp-consensus-slots/std",
 	"sp-consensus",
+	"async-trait",
 ]
diff --git a/primitives/consensus/aura/src/inherents.rs b/primitives/consensus/aura/src/inherents.rs
index 32af901311a3..294f544f6725 100644
--- a/primitives/consensus/aura/src/inherents.rs
+++ b/primitives/consensus/aura/src/inherents.rs
@@ -19,9 +19,6 @@
 
 use sp_inherents::{InherentIdentifier, InherentData, Error};
 
-#[cfg(feature = "std")]
-use sp_inherents::{InherentDataProviders, ProvideInherentData};
-
 /// The Aura inherent identifier.
 pub const INHERENT_IDENTIFIER: InherentIdentifier = *b"auraslot";
 
@@ -31,15 +28,14 @@ pub type InherentType = sp_consensus_slots::Slot;
 /// Auxiliary trait to extract Aura inherent data.
 pub trait AuraInherentData {
 	/// Get aura inherent data.
-	fn aura_inherent_data(&self) ->Result<InherentType, Error>;
+	fn aura_inherent_data(&self) ->Result<Option<InherentType>, Error>;
 	/// Replace aura inherent data.
 	fn aura_replace_inherent_data(&mut self, new: InherentType);
 }
 
 impl AuraInherentData for InherentData {
-	fn aura_inherent_data(&self) ->Result<InherentType, Error> {
+	fn aura_inherent_data(&self) ->Result<Option<InherentType>, Error> {
 		self.get_data(&INHERENT_IDENTIFIER)
-			.and_then(|r| r.ok_or_else(|| "Aura inherent data not found".into()))
 	}
 
 	fn aura_replace_inherent_data(&mut self, new: InherentType) {
@@ -51,50 +47,59 @@ impl AuraInherentData for InherentData {
 // TODO: Remove in the future. https://github.com/paritytech/substrate/issues/8029
 #[cfg(feature = "std")]
 pub struct InherentDataProvider {
-	slot_duration: std::time::Duration,
+	slot: InherentType,
 }
 
 #[cfg(feature = "std")]
 impl InherentDataProvider {
-	pub fn new(slot_duration: std::time::Duration) -> Self {
+	/// Create a new instance with the given slot.
+	pub fn new(slot: InherentType) -> Self {
 		Self {
-			slot_duration
+			slot,
 		}
 	}
-}
 
-#[cfg(feature = "std")]
-impl ProvideInherentData for InherentDataProvider {
-	fn on_register(
-		&self,
-		providers: &InherentDataProviders,
-	) ->Result<(), Error> {
-		if !providers.has_provider(&sp_timestamp::INHERENT_IDENTIFIER) {
-			// Add the timestamp inherent data provider, as we require it.
-			providers.register_provider(sp_timestamp::InherentDataProvider)
-		} else {
-			Ok(())
+	/// Creates the inherent data provider by calculating the slot from the given
+	/// `timestamp` and `duration`.
+	pub fn from_timestamp_and_duration(
+		timestamp: sp_timestamp::Timestamp,
+		duration: std::time::Duration,
+	) -> Self {
+		let slot = InherentType::from(
+			(timestamp.as_duration().as_millis() / duration.as_millis()) as u64
+		);
+
+		Self {
+			slot,
 		}
 	}
+}
+
+#[cfg(feature = "std")]
+impl sp_std::ops::Deref for InherentDataProvider {
+	type Target = InherentType;
 
-	fn inherent_identifier(&self) -> &'static InherentIdentifier {
-		&INHERENT_IDENTIFIER
+	fn deref(&self) -> &Self::Target {
+		&self.slot
 	}
+}
 
+#[cfg(feature = "std")]
+#[async_trait::async_trait]
+impl sp_inherents::InherentDataProvider for InherentDataProvider {
 	fn provide_inherent_data(
 		&self,
 		inherent_data: &mut InherentData,
 	) ->Result<(), Error> {
-		use sp_timestamp::TimestampInherentData;
-
-		let timestamp = inherent_data.timestamp_inherent_data()?;
-		let slot = *timestamp / self.slot_duration.as_millis() as u64;
-		inherent_data.put_data(INHERENT_IDENTIFIER, &slot)
+		inherent_data.put_data(INHERENT_IDENTIFIER, &self.slot)
 	}
 
-	fn error_to_string(&self, error: &[u8]) -> Option<String> {
-		use codec::Decode;
-
-		sp_inherents::Error::decode(&mut &error[..]).map(|e| e.into_string()).ok()
+	async fn try_handle_error(
+		&self,
+		_: &InherentIdentifier,
+		_: &[u8],
+	) -> Option<Result<(), Error>> {
+		// There is no error anymore
+		None
 	}
 }
diff --git a/primitives/consensus/babe/Cargo.toml b/primitives/consensus/babe/Cargo.toml
index a8ab03dcdaa4..0fc09e11032b 100644
--- a/primitives/consensus/babe/Cargo.toml
+++ b/primitives/consensus/babe/Cargo.toml
@@ -25,8 +25,9 @@ sp-core = { version = "3.0.0", default-features = false, path = "../../core" }
 sp-inherents = { version = "3.0.0", default-features = false, path = "../../inherents" }
 sp-keystore = { version = "0.9.0", default-features = false, path = "../../keystore", optional = true }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../runtime" }
-sp-timestamp = { version = "3.0.0", default-features = false, path = "../../timestamp" }
+sp-timestamp = { version = "3.0.0", path = "../../timestamp", optional = true }
 serde = { version = "1.0.123", features = ["derive"], optional = true }
+async-trait = { version = "0.1.48", optional = true }
 
 [features]
 default = ["std"]
@@ -43,6 +44,7 @@ std = [
 	"sp-inherents/std",
 	"sp-keystore",
 	"sp-runtime/std",
-	"sp-timestamp/std",
 	"serde",
+	"sp-timestamp",
+	"async-trait",
 ]
diff --git a/primitives/consensus/babe/src/inherents.rs b/primitives/consensus/babe/src/inherents.rs
index 4c7c55f1cfd5..e160ca8644bc 100644
--- a/primitives/consensus/babe/src/inherents.rs
+++ b/primitives/consensus/babe/src/inherents.rs
@@ -17,14 +17,8 @@
 
 //! Inherents for BABE
 
-use sp_inherents::{Error, InherentData, InherentIdentifier};
-#[cfg(feature = "std")]
-use sp_inherents::{InherentDataProviders, ProvideInherentData};
-#[cfg(feature = "std")]
-use sp_timestamp::TimestampInherentData;
+use sp_inherents::{InherentData, InherentIdentifier, Error};
 
-#[cfg(feature = "std")]
-use codec::Decode;
 use sp_std::result::Result;
 
 /// The BABE inherent identifier.
@@ -35,15 +29,14 @@ pub type InherentType = sp_consensus_slots::Slot;
 /// Auxiliary trait to extract BABE inherent data.
 pub trait BabeInherentData {
 	/// Get BABE inherent data.
-	fn babe_inherent_data(&self) -> Result<InherentType, Error>;
+	fn babe_inherent_data(&self) -> Result<Option<InherentType>, Error>;
 	/// Replace BABE inherent data.
 	fn babe_replace_inherent_data(&mut self, new: InherentType);
 }
 
 impl BabeInherentData for InherentData {
-	fn babe_inherent_data(&self) -> Result<InherentType, Error> {
+	fn babe_inherent_data(&self) -> Result<Option<InherentType>, Error> {
 		self.get_data(&INHERENT_IDENTIFIER)
-			.and_then(|r| r.ok_or_else(|| "BABE inherent data not found".into()))
 	}
 
 	fn babe_replace_inherent_data(&mut self, new: InherentType) {
@@ -55,39 +48,59 @@ impl BabeInherentData for InherentData {
 // TODO: Remove in the future. https://github.com/paritytech/substrate/issues/8029
 #[cfg(feature = "std")]
 pub struct InherentDataProvider {
-	slot_duration: std::time::Duration,
+	slot: InherentType,
 }
 
 #[cfg(feature = "std")]
 impl InherentDataProvider {
-	/// Constructs `Self`
-	pub fn new(slot_duration: std::time::Duration) -> Self {
-		Self { slot_duration }
+	/// Create new inherent data provider from the given `slot`.
+	pub fn new(slot: InherentType) -> Self {
+		Self { slot }
 	}
-}
 
-#[cfg(feature = "std")]
-impl ProvideInherentData for InherentDataProvider {
-	fn on_register(&self, providers: &InherentDataProviders) -> Result<(), Error> {
-		if !providers.has_provider(&sp_timestamp::INHERENT_IDENTIFIER) {
-			// Add the timestamp inherent data provider, as we require it.
-			providers.register_provider(sp_timestamp::InherentDataProvider)
-		} else {
-			Ok(())
+	/// Creates the inherent data provider by calculating the slot from the given
+	/// `timestamp` and `duration`.
+	pub fn from_timestamp_and_duration(
+		timestamp: sp_timestamp::Timestamp,
+		duration: std::time::Duration,
+	) -> Self {
+		let slot = InherentType::from(
+			(timestamp.as_duration().as_millis() / duration.as_millis()) as u64
+		);
+
+		Self {
+			slot,
 		}
 	}
 
-	fn inherent_identifier(&self) -> &'static InherentIdentifier {
-		&INHERENT_IDENTIFIER
+	/// Returns the `slot` of this inherent data provider.
+	pub fn slot(&self) -> InherentType {
+		self.slot
 	}
+}
 
+#[cfg(feature = "std")]
+impl sp_std::ops::Deref for InherentDataProvider {
+	type Target = InherentType;
+
+	fn deref(&self) -> &Self::Target {
+		&self.slot
+	}
+}
+
+#[cfg(feature = "std")]
+#[async_trait::async_trait]
+impl sp_inherents::InherentDataProvider for InherentDataProvider {
 	fn provide_inherent_data(&self, inherent_data: &mut InherentData) -> Result<(), Error> {
-		let timestamp = inherent_data.timestamp_inherent_data()?;
-		let slot = *timestamp / self.slot_duration.as_millis() as u64;
-		inherent_data.put_data(INHERENT_IDENTIFIER, &slot)
+		inherent_data.put_data(INHERENT_IDENTIFIER, &self.slot)
 	}
 
-	fn error_to_string(&self, error: &[u8]) -> Option<String> {
-		Error::decode(&mut &error[..]).map(|e| e.into_string()).ok()
+	async fn try_handle_error(
+		&self,
+		_: &InherentIdentifier,
+		_: &[u8],
+	) -> Option<Result<(), Error>> {
+		// There is no error anymore
+		None
 	}
 }
diff --git a/primitives/consensus/common/src/import_queue/basic_queue.rs b/primitives/consensus/common/src/import_queue/basic_queue.rs
index 7998ba1b3ec7..55fc2eac40ca 100644
--- a/primitives/consensus/common/src/import_queue/basic_queue.rs
+++ b/primitives/consensus/common/src/import_queue/basic_queue.rs
@@ -402,7 +402,6 @@ async fn import_many_blocks<B: BlockT, V: Verifier<B>, Transaction: Send + 'stat
 
 /// A future that will always `yield` on the first call of `poll` but schedules the current task for
 /// re-execution.
-
 ///
 /// This is done by getting the waker and calling `wake_by_ref` followed by returning `Pending`.
 /// The next time the `poll` is called, it will return `Ready`.
diff --git a/primitives/inherents/Cargo.toml b/primitives/inherents/Cargo.toml
index c0e74c0fb99f..54ce09306e19 100644
--- a/primitives/inherents/Cargo.toml
+++ b/primitives/inherents/Cargo.toml
@@ -15,18 +15,24 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 
 [dependencies]
-parking_lot = { version = "0.11.1", optional = true }
 sp-std = { version = "3.0.0", default-features = false, path = "../std" }
 sp-core = { version = "3.0.0", default-features = false, path = "../core" }
+sp-runtime = { version = "3.0.0", path = "../runtime", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.21", optional = true }
+impl-trait-for-tuples = "0.2.0"
+async-trait = { version = "0.1.30", optional = true }
+
+[dev-dependencies]
+futures = "0.3.9"
 
 [features]
 default = [ "std" ]
 std = [
-	"parking_lot",
 	"sp-std/std",
 	"codec/std",
 	"sp-core/std",
 	"thiserror",
+	"sp-runtime",
+	"async-trait",
 ]
diff --git a/primitives/inherents/src/client_side.rs b/primitives/inherents/src/client_side.rs
new file mode 100644
index 000000000000..38639c5de322
--- /dev/null
+++ b/primitives/inherents/src/client_side.rs
@@ -0,0 +1,125 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::{InherentData, Error, InherentIdentifier};
+use sp_runtime::traits::Block as BlockT;
+
+/// Something that can create inherent data providers.
+///
+/// It is possible for the caller to provide custom arguments to the callee by setting the
+/// `ExtraArgs` generic parameter.
+///
+/// The crate already provides some convience implementations of this trait for
+/// `Box<dyn CreateInherentDataProviders>` and closures. So, it should not be required to implement
+/// this trait manually.
+#[async_trait::async_trait]
+pub trait CreateInherentDataProviders<Block: BlockT, ExtraArgs>: Send + Sync {
+	/// The inherent data providers that will be created.
+	type InherentDataProviders: InherentDataProvider;
+
+	/// Create the inherent data providers at the given `parent` block using the given `extra_args`.
+	async fn create_inherent_data_providers(
+		&self,
+		parent: Block::Hash,
+		extra_args: ExtraArgs,
+	) -> Result<Self::InherentDataProviders, Box<dyn std::error::Error + Send + Sync>>;
+}
+
+#[async_trait::async_trait]
+impl<F, Block, IDP, ExtraArgs, Fut> CreateInherentDataProviders<Block, ExtraArgs> for F
+where
+	Block: BlockT,
+	F: Fn(Block::Hash, ExtraArgs) -> Fut + Sync + Send,
+	Fut: std::future::Future<Output = Result<IDP, Box<dyn std::error::Error + Send + Sync>>> + Send + 'static,
+	IDP: InherentDataProvider + 'static,
+	ExtraArgs: Send + 'static,
+{
+	type InherentDataProviders = IDP;
+
+	async fn create_inherent_data_providers(
+		&self,
+		parent: Block::Hash,
+		extra_args: ExtraArgs,
+	) -> Result<Self::InherentDataProviders, Box<dyn std::error::Error + Send + Sync>> {
+		(*self)(parent, extra_args).await
+	}
+}
+
+#[async_trait::async_trait]
+impl<Block: BlockT, ExtraArgs: Send, IDPS: InherentDataProvider>
+	CreateInherentDataProviders<Block, ExtraArgs>
+	for Box<dyn CreateInherentDataProviders<Block, ExtraArgs, InherentDataProviders = IDPS>>
+{
+	type InherentDataProviders = IDPS;
+
+	async fn create_inherent_data_providers(
+		&self,
+		parent: Block::Hash,
+		extra_args: ExtraArgs,
+	) -> Result<Self::InherentDataProviders, Box<dyn std::error::Error + Send + Sync>> {
+		(**self).create_inherent_data_providers(parent, extra_args).await
+	}
+}
+
+/// Something that provides inherent data.
+#[async_trait::async_trait]
+pub trait InherentDataProvider: Send + Sync {
+	/// Convenience function for creating [`InherentData`].
+	///
+	/// Basically maps around [`Self::provide_inherent_data`].
+	fn create_inherent_data(&self) -> Result<InherentData, Error> {
+		let mut inherent_data = InherentData::new();
+		self.provide_inherent_data(&mut inherent_data)?;
+		Ok(inherent_data)
+	}
+
+	/// Provide inherent data that should be included in a block.
+	///
+	/// The data should be stored in the given `InherentData` structure.
+	fn provide_inherent_data(&self, inherent_data: &mut InherentData) -> Result<(), Error>;
+
+	/// Convert the given encoded error to a string.
+	///
+	/// If the given error could not be decoded, `None` should be returned.
+	async fn try_handle_error(
+		&self,
+		identifier: &InherentIdentifier,
+		error: &[u8],
+	) -> Option<Result<(), Error>>;
+}
+
+#[impl_trait_for_tuples::impl_for_tuples(30)]
+#[async_trait::async_trait]
+impl InherentDataProvider for Tuple {
+	for_tuples!( where #( Tuple: Send + Sync )* );
+	fn provide_inherent_data(&self, inherent_data: &mut InherentData) -> Result<(), Error> {
+		for_tuples!( #( Tuple.provide_inherent_data(inherent_data)?; )* );
+		Ok(())
+	}
+
+	async fn try_handle_error(
+		&self,
+		identifier: &InherentIdentifier,
+		error: &[u8],
+	) -> Option<Result<(), Error>> {
+		for_tuples!( #(
+			if let Some(r) = Tuple.try_handle_error(identifier, error).await { return Some(r) }
+		)* );
+
+		None
+	}
+}
diff --git a/primitives/inherents/src/lib.rs b/primitives/inherents/src/lib.rs
index facc62081046..f0b5fdc940a9 100644
--- a/primitives/inherents/src/lib.rs
+++ b/primitives/inherents/src/lib.rs
@@ -15,21 +15,149 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Provides types and traits for creating and checking inherents.
+//! Substrate inherent extrinsics
 //!
-//! Each inherent is added to a produced block. Each runtime decides on which inherents it
-//! wants to attach to its blocks. All data that is required for the runtime to create the inherents
-//! is stored in the `InherentData`. This `InherentData` is constructed by the node and given to
-//! the runtime.
+//! Inherent extrinsics are extrinsics that are inherently added to each block. However, it is up to
+//! runtime implementation to require an inherent for each block or to make it optional. Inherents
+//! are mainly used to pass data from the block producer to the runtime. So, inherents require some
+//! part that is running on the client side and some part that is running on the runtime side. Any
+//! data that is required by an inherent is passed as [`InherentData`] from the client to the runtime
+//! when the inherents are constructed.
 //!
-//! Types that provide data for inherents, should implement `InherentDataProvider` and need to be
-//! registered at `InherentDataProviders`.
+//! The process of constructing and applying inherents is the following:
 //!
-//! In the runtime, modules need to implement `ProvideInherent` when they can create and/or check
-//! inherents. By implementing `ProvideInherent`, a module is not enforced to create an inherent.
-//! A module can also just check given inherents. For using a module as inherent provider, it needs
-//! to be registered by the `construct_runtime!` macro. The macro documentation gives more
-//! information on how that is done.
+//! 1. The block producer first creates the [`InherentData`] by using the inherent data providers
+//! that are created by [`CreateInherentDataProviders`].
+//!
+//! 2. The [`InherentData`] is passed to the `inherent_extrinsics` function of the `BlockBuilder`
+//! runtime api. This will call the runtime which will create all the inherents that should be
+//! applied to the block.
+//!
+//! 3. Apply each inherent to the block like any normal extrinsic.
+//!
+//! On block import the inherents in the block are checked by calling the `check_inherents` runtime
+//! API. This will also pass an instance of [`InherentData`] which the runtime can use to validate
+//! all inherents. If some inherent data isn't required for validating an inherent, it can be
+//! omitted when providing the inherent data providers for block import.
+//!
+//! # Providing inherent data
+//!
+//! To provide inherent data from the client side, [`InherentDataProvider`] should be implemented.
+//!
+//! ```
+//! use codec::Decode;
+//! use sp_inherents::{InherentIdentifier, InherentData};
+//!
+//! // This needs to be unique for the runtime.
+//! const INHERENT_IDENTIFIER: InherentIdentifier = *b"testinh0";
+//!
+//! /// Some custom inherent data provider
+//! struct InherentDataProvider;
+//!
+//! #[async_trait::async_trait]
+//! impl sp_inherents::InherentDataProvider for InherentDataProvider {
+//! 	fn provide_inherent_data(
+//! 		&self,
+//! 		inherent_data: &mut InherentData,
+//! 	) -> Result<(), sp_inherents::Error> {
+//! 		// We can insert any data that implements [`codec::Encode`].
+//! 		inherent_data.put_data(INHERENT_IDENTIFIER, &"hello")
+//! 	}
+//!
+//! 	/// When validating the inherents, the runtime implementation can throw errors. We support
+//! 	/// two error modes, fatal and non-fatal errors. A fatal error means that the block is invalid
+//! 	/// and this function here should return `Err(_)` to not import the block. Non-fatal errors
+//! 	/// are allowed to be handled here in this function and the function should return `Ok(())`
+//! 	/// if it could be handled. A non-fatal error is for example that a block is in the future
+//! 	/// from the point of view of the local node. In such a case the block import for example
+//! 	/// should be delayed until the block is valid.
+//! 	///
+//! 	/// If this functions returns `None`, it means that it is not responsible for this error or
+//! 	/// that the error could not be interpreted.
+//! 	async fn try_handle_error(
+//! 		&self,
+//! 		identifier: &InherentIdentifier,
+//! 		mut error: &[u8],
+//! 	) -> Option<Result<(), sp_inherents::Error>> {
+//! 		// Check if this error belongs to us.
+//! 		if *identifier != INHERENT_IDENTIFIER {
+//! 			return None;
+//! 		}
+//!
+//! 		// For demonstration purposes we are using a `String` as error type. In real
+//! 		// implementations it is advised to not use `String`.
+//! 		Some(Err(
+//! 			sp_inherents::Error::Application(Box::from(String::decode(&mut error).ok()?))
+//! 		))
+//! 	}
+//! }
+//! ```
+//!
+//! In the service the relevant inherent data providers need to be passed the block production and
+//! the block import. As already highlighted above, the providers can be different between import
+//! and production.
+//!
+//! ```
+//! # use sp_runtime::testing::ExtrinsicWrapper;
+//! # use sp_inherents::{InherentIdentifier, InherentData};
+//! # use futures::FutureExt;
+//! # type Block = sp_runtime::testing::Block<ExtrinsicWrapper<()>>;
+//! # const INHERENT_IDENTIFIER: InherentIdentifier = *b"testinh0";
+//! # struct InherentDataProvider;
+//! # #[async_trait::async_trait]
+//! # impl sp_inherents::InherentDataProvider for InherentDataProvider {
+//! # 	fn provide_inherent_data(&self, inherent_data: &mut InherentData) -> Result<(), sp_inherents::Error> {
+//! # 		inherent_data.put_data(INHERENT_IDENTIFIER, &"hello")
+//! # 	}
+//! # 	async fn try_handle_error(
+//! # 		&self,
+//! # 		_: &InherentIdentifier,
+//! # 		_: &[u8],
+//! # 	) -> Option<Result<(), sp_inherents::Error>> {
+//! # 		None
+//! # 	}
+//! # }
+//!
+//! async fn cool_consensus_block_production(
+//! 	// The second parameter to the trait are parameters that depend on what the caller
+//! 	// can provide on extra data.
+//! 	_: impl sp_inherents::CreateInherentDataProviders<Block, ()>,
+//! ) {
+//! 	// do cool stuff
+//! }
+//!
+//! async fn cool_consensus_block_import(
+//! 	_: impl sp_inherents::CreateInherentDataProviders<Block, ()>,
+//! ) {
+//! 	// do cool stuff
+//! }
+//!
+//! async fn build_service(is_validator: bool) {
+//! 	// For block import we don't pass any inherent data provider, because our runtime
+//! 	// does not need any inherent data to validate the inherents.
+//! 	let block_import = cool_consensus_block_import(|_parent, ()| async { Ok(()) });
+//!
+//! 	let block_production = if is_validator {
+//! 		// For block production we want to provide our inherent data provider
+//! 		cool_consensus_block_production(|_parent, ()| async {
+//!			Ok(InherentDataProvider)
+//! 		}).boxed()
+//! 	} else {
+//! 		futures::future::pending().boxed()
+//! 	};
+//!
+//! 	futures::pin_mut!(block_import);
+//!
+//! 	futures::future::select(block_import, block_production).await;
+//! }
+//! ```
+//!
+//! # Creating the inherent
+//!
+//! As the inherents are created by the runtime, it depends on the runtime implementation on how
+//! to create the inherents. As already described above the client side passes the [`InherentData`]
+//! and expects the runtime to construct the inherents out of it. When validating the inherents,
+//! [`CheckInherentsResult`] is used to communicate the result client side.
 
 #![cfg_attr(not(feature = "std"), no_std)]
 #![warn(missing_docs)]
@@ -39,42 +167,34 @@ use codec::{Encode, Decode};
 use sp_std::{collections::btree_map::{BTreeMap, IntoIter, Entry}, vec::Vec};
 
 #[cfg(feature = "std")]
-use parking_lot::RwLock;
-
-#[cfg(feature = "std")]
-use std::{sync::Arc, format};
+mod client_side;
 
-/// An error that can occur within the inherent data system.
 #[cfg(feature = "std")]
-#[derive(Debug, Encode, Decode, thiserror::Error)]
-#[error("Inherents: {0}")]
-pub struct Error(String);
-
-#[cfg(feature = "std")]
-impl<T: Into<String>> From<T> for Error {
-	fn from(data: T) -> Error {
-		Self(data.into())
-	}
-}
-
-#[cfg(feature = "std")]
-impl Error {
-	/// Convert this error into a `String`.
-	pub fn into_string(self) -> String {
-		self.0
-	}
-}
-
-/// An error that can occur within the inherent data system.
-#[derive(Encode, sp_core::RuntimeDebug)]
-#[cfg(not(feature = "std"))]
-pub struct Error(&'static str);
-
-#[cfg(not(feature = "std"))]
-impl From<&'static str> for Error {
-	fn from(data: &'static str) -> Error {
-		Self(data)
-	}
+pub use client_side::*;
+
+/// Errors that occur in context of inherents.
+#[derive(Debug)]
+#[cfg_attr(feature = "std", derive(thiserror::Error))]
+#[allow(missing_docs)]
+pub enum Error {
+	#[cfg_attr(
+		feature = "std",
+		error("Inherent data already exists for identifier: {}", "String::from_utf8_lossy(_0)")
+	)]
+	InherentDataExists(InherentIdentifier),
+	#[cfg_attr(
+		feature = "std",
+		error("Failed to decode inherent data for identifier: {}", "String::from_utf8_lossy(_1)")
+	)]
+	DecodingFailed(#[cfg_attr(feature = "std", source)] codec::Error, InherentIdentifier),
+	#[cfg_attr(
+		feature = "std",
+		error("There was already a fatal error reported and no other errors are allowed")
+	)]
+	FatalErrorReported,
+	#[cfg(feature = "std")]
+	#[error(transparent)]
+	Application(#[from] Box<dyn std::error::Error + Send + Sync>),
 }
 
 /// An identifier for an inherent.
@@ -112,7 +232,7 @@ impl InherentData {
 				Ok(())
 			},
 			Entry::Occupied(_) => {
-				Err("Inherent with same identifier already exists!".into())
+				Err(Error::InherentDataExists(identifier))
 			}
 		}
 	}
@@ -142,9 +262,7 @@ impl InherentData {
 		match self.data.get(identifier) {
 			Some(inherent) =>
 				I::decode(&mut &inherent[..])
-					.map_err(|_| {
-						"Could not decode requested inherent type!".into()
-					})
+					.map_err(|e| Error::DecodingFailed(e, *identifier))
 					.map(Some),
 			None => Ok(None)
 		}
@@ -203,7 +321,7 @@ impl CheckInherentsResult {
 	) -> Result<(), Error> {
 		// Don't accept any other error
 		if self.fatal_error {
-			return Err("No other errors are accepted after an hard error!".into())
+			return Err(Error::FatalErrorReported)
 		}
 
 		if error.is_fatal_error() {
@@ -257,118 +375,6 @@ impl PartialEq for CheckInherentsResult {
 	}
 }
 
-/// All `InherentData` providers.
-#[cfg(feature = "std")]
-#[derive(Clone, Default)]
-pub struct InherentDataProviders {
-	providers: Arc<RwLock<Vec<Box<dyn ProvideInherentData + Send + Sync>>>>,
-}
-
-#[cfg(feature = "std")]
-impl InherentDataProviders {
-	/// Create a new instance.
-	pub fn new() -> Self {
-		Self::default()
-	}
-
-	/// Register an `InherentData` provider.
-	///
-	/// The registration order is preserved and this order will also be used when creating the
-	/// inherent data.
-	///
-	/// # Result
-	///
-	/// Will return an error, if a provider with the same identifier already exists.
-	pub fn register_provider<P: ProvideInherentData + Send + Sync +'static>(
-		&self,
-		provider: P,
-	) -> Result<(), Error> {
-		if self.has_provider(&provider.inherent_identifier()) {
-			Err(
-				format!(
-					"Inherent data provider with identifier {:?} already exists!",
-					&provider.inherent_identifier()
-				).into()
-			)
-		} else {
-			provider.on_register(self)?;
-			self.providers.write().push(Box::new(provider));
-			Ok(())
-		}
-	}
-
-	/// Returns if a provider for the given identifier exists.
-	pub fn has_provider(&self, identifier: &InherentIdentifier) -> bool {
-		self.providers.read().iter().any(|p| p.inherent_identifier() == identifier)
-	}
-
-	/// Create inherent data.
-	pub fn create_inherent_data(&self) -> Result<InherentData, Error> {
-		let mut data = InherentData::new();
-		self.providers.read().iter().try_for_each(|p| {
-			p.provide_inherent_data(&mut data)
-				.map_err(|e| format!("Error for `{:?}`: {:?}", p.inherent_identifier(), e))
-		})?;
-		Ok(data)
-	}
-
-	/// Converts a given encoded error into a `String`.
-	///
-	/// Useful if the implementation encounters an error for an identifier it does not know.
-	pub fn error_to_string(&self, identifier: &InherentIdentifier, error: &[u8]) -> String {
-		let res = self.providers.read().iter().filter_map(|p|
-			if p.inherent_identifier() == identifier {
-				Some(
-					p.error_to_string(error)
-						.unwrap_or_else(|| error_to_string_fallback(identifier))
-				)
-			} else {
-				None
-			}
-		).next();
-
-		match res {
-			Some(res) => res,
-			None => format!(
-				"Error while checking inherent of type \"{}\", but this inherent type is unknown.",
-				String::from_utf8_lossy(identifier)
-			)
-		}
-	}
-}
-
-/// Something that provides inherent data.
-#[cfg(feature = "std")]
-pub trait ProvideInherentData {
-	/// Is called when this inherent data provider is registered at the given
-	/// `InherentDataProviders`.
-	fn on_register(&self, _: &InherentDataProviders) -> Result<(), Error> {
-		Ok(())
-	}
-
-	/// The identifier of the inherent for that data will be provided.
-	fn inherent_identifier(&self) -> &'static InherentIdentifier;
-
-	/// Provide inherent data that should be included in a block.
-	///
-	/// The data should be stored in the given `InherentData` structure.
-	fn provide_inherent_data(&self, inherent_data: &mut InherentData) -> Result<(), Error>;
-
-	/// Convert the given encoded error to a string.
-	///
-	/// If the given error could not be decoded, `None` should be returned.
-	fn error_to_string(&self, error: &[u8]) -> Option<String>;
-}
-
-/// A fallback function, if the decoding of an error fails.
-#[cfg(feature = "std")]
-fn error_to_string_fallback(identifier: &InherentIdentifier) -> String {
-	format!(
-		"Error while checking inherent of type \"{}\", but error could not be decoded.",
-		String::from_utf8_lossy(identifier)
-	)
-}
-
 /// Did we encounter a fatal error while checking an inherent?
 ///
 /// A fatal error is everything that fails while checking an inherent error, e.g. the inherent
@@ -382,9 +388,9 @@ pub trait IsFatalError {
 	fn is_fatal_error(&self) -> bool;
 }
 
-/// Auxiliary to make any given error resolve to `is_fatal_error() == true`.
-#[derive(Encode)]
-pub struct MakeFatalError<E: codec::Encode>(E);
+/// Auxiliary to make any given error resolve to `is_fatal_error() == true` for [`IsFatalError`].
+#[derive(codec::Encode)]
+pub struct MakeFatalError<E>(E);
 
 impl<E: codec::Encode> From<E> for MakeFatalError<E> {
 	fn from(err: E) -> Self {
@@ -398,63 +404,6 @@ impl<E: codec::Encode> IsFatalError for MakeFatalError<E> {
 	}
 }
 
-/// A pallet that provides or verifies an inherent extrinsic.
-///
-/// The pallet may provide the inherent, verify an inherent, or both provide and verify.
-pub trait ProvideInherent {
-	/// The call type of the pallet.
-	type Call;
-	/// The error returned by `check_inherent`.
-	type Error: codec::Encode + IsFatalError;
-	/// The inherent identifier used by this inherent.
-	const INHERENT_IDENTIFIER: self::InherentIdentifier;
-
-	/// Create an inherent out of the given `InherentData`.
-	fn create_inherent(data: &InherentData) -> Option<Self::Call>;
-
-	/// Determines whether this inherent is required in this block.
-	///
-	/// - `Ok(None)` indicates that this inherent is not required in this block. The default
-	/// implementation returns this.
-	///
-	/// - `Ok(Some(e))` indicates that this inherent is required in this block. The
-	/// `impl_outer_inherent!`, will call this function from its `check_extrinsics`.
-	/// If the inherent is not present, it will return `e`.
-	///
-	/// - `Err(_)` indicates that this function failed and further operations should be aborted.
-	///
-	/// NOTE: If inherent is required then the runtime asserts that the block contains at least
-	/// one inherent for which:
-	/// * type is [`Self::Call`],
-	/// * [`Self::is_inherent`] returns true.
-	fn is_inherent_required(_: &InherentData) -> Result<Option<Self::Error>, Self::Error> { Ok(None) }
-
-	/// Check whether the given inherent is valid. Checking the inherent is optional and can be
-	/// omitted by using the default implementation.
-	///
-	/// When checking an inherent, the first parameter represents the inherent that is actually
-	/// included in the block by its author. Whereas the second parameter represents the inherent
-	/// data that the verifying node calculates.
-	///
-	/// NOTE: A block can contains multiple inherent.
-	fn check_inherent(_: &Self::Call, _: &InherentData) -> Result<(), Self::Error> {
-		Ok(())
-	}
-
-	/// Return whether the call is an inherent call.
-	///
-	/// NOTE: Signed extrinsics are not inherent, but signed extrinsic with the given call variant
-	/// can be dispatched.
-	///
-	/// # Warning
-	///
-	/// In FRAME, inherent are enforced to be before other extrinsics, for this reason,
-	/// pallets with unsigned transactions **must ensure** that no unsigned transaction call
-	/// is an inherent call, when implementing `ValidateUnsigned::validate_unsigned`.
-	/// Otherwise block producer can produce invalid blocks by including them after non inherent.
-	fn is_inherent(call: &Self::Call) -> bool;
-}
-
 #[cfg(test)]
 mod tests {
 	use super::*;
@@ -496,93 +445,34 @@ mod tests {
 	}
 
 	#[derive(Clone)]
-	struct TestInherentDataProvider {
-		registered: Arc<RwLock<bool>>,
-	}
-
-	impl TestInherentDataProvider {
-		fn new() -> Self {
-			let inst = Self {
-				registered: Default::default(),
-			};
-
-			// just make sure
-			assert!(!inst.is_registered());
-
-			inst
-		}
-
-		fn is_registered(&self) -> bool {
-			*self.registered.read()
-		}
-	}
+	struct TestInherentDataProvider;
 
 	const ERROR_TO_STRING: &str = "Found error!";
 
-	impl ProvideInherentData for TestInherentDataProvider {
-		fn on_register(&self, _: &InherentDataProviders) -> Result<(), Error> {
-			*self.registered.write() = true;
-			Ok(())
-		}
-
-		fn inherent_identifier(&self) -> &'static InherentIdentifier {
-			&TEST_INHERENT_0
-		}
-
+	#[async_trait::async_trait]
+	impl InherentDataProvider for TestInherentDataProvider {
 		fn provide_inherent_data(&self, data: &mut InherentData) -> Result<(), Error> {
 			data.put_data(TEST_INHERENT_0, &42)
 		}
 
-		fn error_to_string(&self, _: &[u8]) -> Option<String> {
-			Some(ERROR_TO_STRING.into())
+		async fn try_handle_error(
+			&self,
+			_: &InherentIdentifier,
+			_: &[u8],
+		) -> Option<Result<(), Error>> {
+			Some(Err(Error::Application(Box::from(ERROR_TO_STRING))))
 		}
 	}
 
 	#[test]
-	fn registering_inherent_provider() {
-		let provider = TestInherentDataProvider::new();
-		let providers = InherentDataProviders::new();
+	fn create_inherent_data() {
+		let provider = TestInherentDataProvider;
 
-		providers.register_provider(provider.clone()).unwrap();
-		assert!(provider.is_registered());
-		assert!(providers.has_provider(provider.inherent_identifier()));
-
-		// Second time should fail
-		assert!(providers.register_provider(provider.clone()).is_err());
-	}
-
-	#[test]
-	fn create_inherent_data_from_all_providers() {
-		let provider = TestInherentDataProvider::new();
-		let providers = InherentDataProviders::new();
-
-		providers.register_provider(provider.clone()).unwrap();
-		assert!(provider.is_registered());
-
-		let inherent_data = providers.create_inherent_data().unwrap();
-
-		assert_eq!(
-			inherent_data.get_data::<u32>(provider.inherent_identifier()).unwrap().unwrap(),
-			42u32
-		);
-	}
-
-	#[test]
-	fn encoded_error_to_string() {
-		let provider = TestInherentDataProvider::new();
-		let providers = InherentDataProviders::new();
-
-		providers.register_provider(provider.clone()).unwrap();
-		assert!(provider.is_registered());
+		let inherent_data = provider.create_inherent_data().unwrap();
 
 		assert_eq!(
-			&providers.error_to_string(&TEST_INHERENT_0, &[1, 2]), ERROR_TO_STRING
-		);
-
-		assert!(
-			providers
-				.error_to_string(&TEST_INHERENT_1, &[1, 2])
-				.contains("inherent type is unknown")
+			inherent_data.get_data::<u32>(&TEST_INHERENT_0).unwrap().unwrap(),
+			42u32,
 		);
 	}
 
diff --git a/primitives/timestamp/Cargo.toml b/primitives/timestamp/Cargo.toml
index f3e9a331cfd3..3fc8e76f40f1 100644
--- a/primitives/timestamp/Cargo.toml
+++ b/primitives/timestamp/Cargo.toml
@@ -19,6 +19,10 @@ sp-runtime = { version = "3.0.0", default-features = false, path = "../runtime"
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-inherents = { version = "3.0.0", default-features = false, path = "../inherents" }
 wasm-timer = { version = "0.2", optional = true }
+thiserror = { version = "1.0.21", optional = true }
+log = { version = "0.4.8", optional = true }
+futures-timer = { version = "3.0.2", optional = true }
+async-trait = { version = "0.1.48", optional = true }
 
 [features]
 default = [ "std" ]
@@ -29,4 +33,8 @@ std = [
 	"codec/std",
 	"sp-inherents/std",
 	"wasm-timer",
+	"thiserror",
+	"log",
+	"futures-timer",
+	"async-trait",
 ]
diff --git a/primitives/timestamp/src/lib.rs b/primitives/timestamp/src/lib.rs
index 846ba67aec73..542522c9b850 100644
--- a/primitives/timestamp/src/lib.rs
+++ b/primitives/timestamp/src/lib.rs
@@ -20,13 +20,9 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use codec::{Encode, Decode};
-#[cfg(feature = "std")]
-use sp_inherents::ProvideInherentData;
 use sp_inherents::{InherentIdentifier, IsFatalError, InherentData};
 use sp_std::time::Duration;
 
-use sp_runtime::RuntimeString;
-
 /// The identifier for the `timestamp` inherent.
 pub const INHERENT_IDENTIFIER: InherentIdentifier = *b"timstap0";
 
@@ -46,9 +42,14 @@ impl Timestamp {
 	}
 
 	/// Returns `self` as [`Duration`].
-	pub fn as_duration(&self) -> Duration {
+	pub fn as_duration(self) -> Duration {
 		Duration::from_millis(self.0)
 	}
+
+	/// Checked subtraction that returns `None` on an underflow.
+	pub fn checked_sub(self, other: Self) -> Option<Self> {
+		self.0.checked_sub(other.0).map(Self)
+	}
 }
 
 impl sp_std::ops::Deref for Timestamp {
@@ -114,20 +115,22 @@ impl From<Duration> for Timestamp {
 
 /// Errors that can occur while checking the timestamp inherent.
 #[derive(Encode, sp_runtime::RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Decode))]
+#[cfg_attr(feature = "std", derive(Decode, thiserror::Error))]
 pub enum InherentError {
 	/// The timestamp is valid in the future.
 	/// This is a non-fatal-error and will not stop checking the inherents.
+	#[cfg_attr(feature = "std", error("Block will be valid at {0}."))]
 	ValidAtTimestamp(InherentType),
-	/// Some other error.
-	Other(RuntimeString),
+	/// The block timestamp is too far in the future
+	#[cfg_attr(feature = "std", error("The timestamp of the block is too far in the future."))]
+	TooFarInFuture,
 }
 
 impl IsFatalError for InherentError {
 	fn is_fatal_error(&self) -> bool {
 		match self {
 			InherentError::ValidAtTimestamp(_) => false,
-			InherentError::Other(_) => true,
+			InherentError::TooFarInFuture => true,
 		}
 	}
 }
@@ -147,43 +150,123 @@ impl InherentError {
 /// Auxiliary trait to extract timestamp inherent data.
 pub trait TimestampInherentData {
 	/// Get timestamp inherent data.
-	fn timestamp_inherent_data(&self) -> Result<InherentType, sp_inherents::Error>;
+	fn timestamp_inherent_data(&self) -> Result<Option<InherentType>, sp_inherents::Error>;
 }
 
 impl TimestampInherentData for InherentData {
-	fn timestamp_inherent_data(&self) -> Result<InherentType, sp_inherents::Error> {
+	fn timestamp_inherent_data(&self) -> Result<Option<InherentType>, sp_inherents::Error> {
 		self.get_data(&INHERENT_IDENTIFIER)
-			.and_then(|r| r.ok_or_else(|| "Timestamp inherent data not found".into()))
 	}
 }
 
+/// The current timestamp using the system time.
+///
+/// This timestamp is the time since the UNIX epoch.
+#[cfg(feature = "std")]
+fn current_timestamp() -> std::time::Duration {
+	use wasm_timer::SystemTime;
+
+	let now = SystemTime::now();
+	now.duration_since(SystemTime::UNIX_EPOCH)
+		.expect("Current time is always after unix epoch; qed")
+}
+
 /// Provide duration since unix epoch in millisecond for timestamp inherent.
 #[cfg(feature = "std")]
-pub struct InherentDataProvider;
+pub struct InherentDataProvider {
+	max_drift: InherentType,
+	timestamp: InherentType,
+}
 
 #[cfg(feature = "std")]
-impl ProvideInherentData for InherentDataProvider {
-	fn inherent_identifier(&self) -> &'static InherentIdentifier {
-		&INHERENT_IDENTIFIER
+impl InherentDataProvider {
+	/// Create `Self` while using the system time to get the timestamp.
+	pub fn from_system_time() -> Self {
+		Self {
+			max_drift: std::time::Duration::from_secs(60).into(),
+			timestamp: current_timestamp().into(),
+		}
+	}
+
+	/// Create `Self` using the given `timestamp`.
+	pub fn new(timestamp: InherentType) -> Self {
+		Self {
+			max_drift: std::time::Duration::from_secs(60).into(),
+			timestamp,
+		}
+	}
+
+	/// With the given maximum drift.
+	///
+	/// By default the maximum drift is 60 seconds.
+	///
+	/// The maximum drift is used when checking the inherents of a runtime. If the current timestamp
+	/// plus the maximum drift is smaller than the timestamp in the block, the block will be rejected
+	/// as being too far in the future.
+	pub fn with_max_drift(mut self, max_drift: std::time::Duration) -> Self {
+		self.max_drift = max_drift.into();
+		self
 	}
 
+	/// Returns the timestamp of this inherent data provider.
+	pub fn timestamp(&self) -> InherentType {
+		self.timestamp
+	}
+}
+
+#[cfg(feature = "std")]
+impl sp_std::ops::Deref for InherentDataProvider {
+	type Target = InherentType;
+
+	fn deref(&self) -> &Self::Target {
+		&self.timestamp
+	}
+}
+
+#[cfg(feature = "std")]
+#[async_trait::async_trait]
+impl sp_inherents::InherentDataProvider for InherentDataProvider {
 	fn provide_inherent_data(
 		&self,
 		inherent_data: &mut InherentData,
 	) -> Result<(), sp_inherents::Error> {
-		use wasm_timer::SystemTime;
-
-		let now = SystemTime::now();
-		now.duration_since(SystemTime::UNIX_EPOCH)
-			.map_err(|_| {
-				"Current time is before unix epoch".into()
-			}).and_then(|d| {
-				inherent_data.put_data(INHERENT_IDENTIFIER, &InherentType::from(d))
-			})
+		inherent_data.put_data(INHERENT_IDENTIFIER, &InherentType::from(self.timestamp))
 	}
 
-	fn error_to_string(&self, error: &[u8]) -> Option<String> {
-		InherentError::try_from(&INHERENT_IDENTIFIER, error).map(|e| format!("{:?}", e))
+	async fn try_handle_error(
+		&self,
+		identifier: &InherentIdentifier,
+		error: &[u8],
+	) -> Option<Result<(), sp_inherents::Error>> {
+		if *identifier != INHERENT_IDENTIFIER {
+			return None
+		}
+
+		match InherentError::try_from(&INHERENT_IDENTIFIER, error)? {
+			InherentError::ValidAtTimestamp(valid) => {
+				let max_drift = self.max_drift;
+				let timestamp = self.timestamp;
+				// halt import until timestamp is valid.
+				// reject when too far ahead.
+				if valid > timestamp + max_drift {
+					return Some(Err(
+						sp_inherents::Error::Application(Box::from(InherentError::TooFarInFuture))
+					))
+				}
+
+				let diff = valid.checked_sub(timestamp).unwrap_or_default();
+				log::info!(
+					target: "timestamp",
+					"halting for block {} milliseconds in the future",
+					diff.0,
+				);
+
+				futures_timer::Delay::new(diff.as_duration()).await;
+
+				Some(Ok(()))
+			},
+			o => Some(Err(sp_inherents::Error::Application(Box::from(o)))),
+		}
 	}
 }
 
diff --git a/test-utils/runtime/src/system.rs b/test-utils/runtime/src/system.rs
index 704df1ad9ef7..33ef7b12d8db 100644
--- a/test-utils/runtime/src/system.rs
+++ b/test-utils/runtime/src/system.rs
@@ -107,11 +107,11 @@ pub fn polish_block(block: &mut Block) {
 	execute_block_with_state_root_handler(block, Mode::Overwrite);
 }
 
-pub fn execute_block(mut block: Block) {
-	execute_block_with_state_root_handler(&mut block, Mode::Verify);
+pub fn execute_block(mut block: Block) -> Header {
+	execute_block_with_state_root_handler(&mut block, Mode::Verify)
 }
 
-fn execute_block_with_state_root_handler(block: &mut Block, mode: Mode) {
+fn execute_block_with_state_root_handler(block: &mut Block, mode: Mode) -> Header {
 	let header = &mut block.header;
 
 	initialize_block(header);
@@ -142,6 +142,8 @@ fn execute_block_with_state_root_handler(block: &mut Block, mode: Mode) {
 			"Transaction trie root must be valid.",
 		);
 	}
+
+	new_header
 }
 
 /// The block executor.
diff --git a/test-utils/test-runner/src/lib.rs b/test-utils/test-runner/src/lib.rs
index f76083d28172..000d3efc3e96 100644
--- a/test-utils/test-runner/src/lib.rs
+++ b/test-utils/test-runner/src/lib.rs
@@ -231,7 +231,7 @@ use sc_executor::NativeExecutionDispatch;
 use sc_service::{Configuration, TFullBackend, TFullClient, TaskManager, TaskExecutor};
 use sp_api::{ConstructRuntimeApi, TransactionFor};
 use sp_consensus::{BlockImport, SelectChain};
-use sp_inherents::InherentDataProviders;
+use sp_inherents::{CreateInherentDataProviders, InherentDataProvider};
 use sp_keystore::SyncCryptoStorePtr;
 use sp_runtime::traits::{Block as BlockT, SignedExtension};
 use std::sync::Arc;
@@ -277,6 +277,9 @@ pub trait ChainInfo: Sized {
 	/// The signed extras required by the runtime
 	type SignedExtras: SignedExtension;
 
+	/// The inherent data providers.
+	type InherentDataProviders: InherentDataProvider + 'static;
+
 	/// Signed extras, this function is caled in an externalities provided environment.
 	fn signed_extras(from: <Self::Runtime as frame_system::Config>::AccountId) -> Self::SignedExtras;
 
@@ -293,7 +296,13 @@ pub trait ChainInfo: Sized {
 			Arc<TFullBackend<Self::Block>>,
 			SyncCryptoStorePtr,
 			TaskManager,
-			InherentDataProviders,
+			Box<
+				dyn CreateInherentDataProviders<
+					Self::Block,
+					(),
+					InherentDataProviders = Self::InherentDataProviders
+				>
+			>,
 			Option<
 				Box<
 					dyn ConsensusDataProvider<
diff --git a/test-utils/test-runner/src/node.rs b/test-utils/test-runner/src/node.rs
index 2e6fc97c582a..50c9c54ea18f 100644
--- a/test-utils/test-runner/src/node.rs
+++ b/test-utils/test-runner/src/node.rs
@@ -121,7 +121,7 @@ impl<T: ChainInfo> Node<T> {
 			backend,
 			keystore,
 			mut task_manager,
-			inherent_data_providers,
+			create_inherent_data_providers,
 			consensus_data_provider,
 			select_chain,
 			block_import,
@@ -198,7 +198,7 @@ impl<T: ChainInfo> Node<T> {
 			commands_stream,
 			select_chain,
 			consensus_data_provider,
-			inherent_data_providers,
+			create_inherent_data_providers,
 		});
 
 		// spawn the authorship task as an essential task.

From 7b4d55be81c4f35ef9812dad8d0349f43dcce105 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Mon, 3 May 2021 19:18:35 +0200
Subject: [PATCH 0692/1194] Fix too generous error detection in behaviour.rs
 (#8717)

---
 client/network/src/protocol/notifications/behaviour.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/network/src/protocol/notifications/behaviour.rs b/client/network/src/protocol/notifications/behaviour.rs
index e1ed61722c54..d5112a9f981d 100644
--- a/client/network/src/protocol/notifications/behaviour.rs
+++ b/client/network/src/protocol/notifications/behaviour.rs
@@ -1703,6 +1703,7 @@ impl NetworkBehaviour for Notifications {
 
 				match self.peers.get_mut(&(source.clone(), set_id)) {
 					// Move the connection from `Closing` to `Closed`.
+					Some(PeerState::Incoming { connections, .. }) |
 					Some(PeerState::DisabledPendingEnable { connections, .. }) |
 					Some(PeerState::Disabled { connections, .. }) |
 					Some(PeerState::Enabled { connections, .. }) => {

From 4993b70159a60f8ec39292e397bf6df0b0c74ac7 Mon Sep 17 00:00:00 2001
From: ferrell-code <70108835+ferrell-code@users.noreply.github.com>
Date: Tue, 4 May 2021 04:44:58 -0400
Subject: [PATCH 0693/1194] Update Identity pallet to Frame V2 (#8697)

* bump pallet to frame v2

* line width

* get benchmarking ot compile

* fix benchmarking now

* should actually fix benchmark

* make docs prettier

* add dependency

* add metadata

* Update frame/identity/src/benchmarking.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
---
 frame/identity/src/benchmarking.rs |   2 +-
 frame/identity/src/lib.rs          | 397 +++++++++++++++--------------
 frame/identity/src/tests.rs        |   2 +-
 3 files changed, 213 insertions(+), 188 deletions(-)

diff --git a/frame/identity/src/benchmarking.rs b/frame/identity/src/benchmarking.rs
index 372abc72a97d..42f2538adafc 100644
--- a/frame/identity/src/benchmarking.rs
+++ b/frame/identity/src/benchmarking.rs
@@ -24,7 +24,7 @@ use super::*;
 use frame_system::{EventRecord, RawOrigin};
 use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
 use sp_runtime::traits::Bounded;
-
+use frame_support::{ensure, traits::Get};
 use crate::Pallet as Identity;
 
 const SEED: u32 = 0;
diff --git a/frame/identity/src/lib.rs b/frame/identity/src/lib.rs
index 880d20279592..7c7bacbef56e 100644
--- a/frame/identity/src/lib.rs
+++ b/frame/identity/src/lib.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! # Identity Module
+//! # Identity Pallet
 //!
 //! - [`Config`]
 //! - [`Call`]
@@ -81,61 +81,16 @@ use sp_std::prelude::*;
 use sp_std::{fmt::Debug, ops::Add, iter::once};
 use enumflags2::BitFlags;
 use codec::{Encode, Decode};
-use sp_runtime::{DispatchError, RuntimeDebug, DispatchResult};
+use sp_runtime::RuntimeDebug;
 use sp_runtime::traits::{StaticLookup, Zero, AppendZerosInput, Saturating};
-use frame_support::{
-	decl_module, decl_event, decl_storage, ensure, decl_error,
-	dispatch::DispatchResultWithPostInfo,
-	traits::{Currency, ReservableCurrency, OnUnbalanced, Get, BalanceStatus, EnsureOrigin},
-};
-use frame_system::ensure_signed;
+use frame_support::traits::{Currency, ReservableCurrency, OnUnbalanced, BalanceStatus};
 pub use weights::WeightInfo;
 
+pub use pallet::*;
+
 type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
 
-pub trait Config: frame_system::Config {
-	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
-
-	/// The currency trait.
-	type Currency: ReservableCurrency<Self::AccountId>;
-
-	/// The amount held on deposit for a registered identity.
-	type BasicDeposit: Get<BalanceOf<Self>>;
-
-	/// The amount held on deposit per additional field for a registered identity.
-	type FieldDeposit: Get<BalanceOf<Self>>;
-
-	/// The amount held on deposit for a registered subaccount. This should account for the fact
-	/// that one storage item's value will increase by the size of an account ID, and there will be
-	/// another trie item whose value is the size of an account ID plus 32 bytes.
-	type SubAccountDeposit: Get<BalanceOf<Self>>;
-
-	/// The maximum number of sub-accounts allowed per identified account.
-	type MaxSubAccounts: Get<u32>;
-
-	/// Maximum number of additional fields that may be stored in an ID. Needed to bound the I/O
-	/// required to access an identity, but can be pretty high.
-	type MaxAdditionalFields: Get<u32>;
-
-	/// Maxmimum number of registrars allowed in the system. Needed to bound the complexity
-	/// of, e.g., updating judgements.
-	type MaxRegistrars: Get<u32>;
-
-	/// What to do with slashed funds.
-	type Slashed: OnUnbalanced<NegativeImbalanceOf<Self>>;
-
-	/// The origin which may forcibly set or remove a name. Root can always do this.
-	type ForceOrigin: EnsureOrigin<Self::Origin>;
-
-	/// The origin which may add or remove registrars. Root can always do this.
-	type RegistrarOrigin: EnsureOrigin<Self::Origin>;
-
-	/// Weight information for extrinsics in this pallet.
-	type WeightInfo: WeightInfo;
-}
-
 /// Either underlying data blob if it is at most 32 bytes, or a hash of it. If the data is greater
 /// than 32-bytes then it will be truncated when encoding.
 ///
@@ -398,65 +353,120 @@ pub struct RegistrarInfo<
 	pub fields: IdentityFields,
 }
 
-decl_storage! {
-	trait Store for Module<T: Config> as Identity {
-		/// Information that is pertinent to identify the entity behind an account.
-		///
-		/// TWOX-NOTE: OK ― `AccountId` is a secure hash.
-		pub IdentityOf get(fn identity):
-			map hasher(twox_64_concat) T::AccountId => Option<Registration<BalanceOf<T>>>;
+#[frame_support::pallet]
+pub mod pallet {
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+	use super::*;
 
-		/// The super-identity of an alternative "sub" identity together with its name, within that
-		/// context. If the account is not some other account's sub-identity, then just `None`.
-		pub SuperOf get(fn super_of):
-			map hasher(blake2_128_concat) T::AccountId => Option<(T::AccountId, Data)>;
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		/// The overarching event type.
+		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
 
-		/// Alternative "sub" identities of this account.
-		///
-		/// The first item is the deposit, the second is a vector of the accounts.
-		///
-		/// TWOX-NOTE: OK ― `AccountId` is a secure hash.
-		pub SubsOf get(fn subs_of):
-			map hasher(twox_64_concat) T::AccountId => (BalanceOf<T>, Vec<T::AccountId>);
+		/// The currency trait.
+		type Currency: ReservableCurrency<Self::AccountId>;
 
-		/// The set of registrars. Not expected to get very big as can only be added through a
-		/// special origin (likely a council motion).
-		///
-		/// The index into this can be cast to `RegistrarIndex` to get a valid value.
-		pub Registrars get(fn registrars): Vec<Option<RegistrarInfo<BalanceOf<T>, T::AccountId>>>;
-	}
-}
+		/// The amount held on deposit for a registered identity
+		#[pallet::constant]
+		type BasicDeposit: Get<BalanceOf<Self>>;
 
-decl_event!(
-	pub enum Event<T> where AccountId = <T as frame_system::Config>::AccountId, Balance = BalanceOf<T> {
-		/// A name was set or reset (which will remove all judgements). \[who\]
-		IdentitySet(AccountId),
-		/// A name was cleared, and the given balance returned. \[who, deposit\]
-		IdentityCleared(AccountId, Balance),
-		/// A name was removed and the given balance slashed. \[who, deposit\]
-		IdentityKilled(AccountId, Balance),
-		/// A judgement was asked from a registrar. \[who, registrar_index\]
-		JudgementRequested(AccountId, RegistrarIndex),
-		/// A judgement request was retracted. \[who, registrar_index\]
-		JudgementUnrequested(AccountId, RegistrarIndex),
-		/// A judgement was given by a registrar. \[target, registrar_index\]
-		JudgementGiven(AccountId, RegistrarIndex),
-		/// A registrar was added. \[registrar_index\]
-		RegistrarAdded(RegistrarIndex),
-		/// A sub-identity was added to an identity and the deposit paid. \[sub, main, deposit\]
-		SubIdentityAdded(AccountId, AccountId, Balance),
-		/// A sub-identity was removed from an identity and the deposit freed.
-		/// \[sub, main, deposit\]
-		SubIdentityRemoved(AccountId, AccountId, Balance),
-		/// A sub-identity was cleared, and the given deposit repatriated from the
-		/// main identity account to the sub-identity account. \[sub, main, deposit\]
-		SubIdentityRevoked(AccountId, AccountId, Balance),
+		/// The amount held on deposit per additional field for a registered identity.
+		#[pallet::constant]
+		type FieldDeposit: Get<BalanceOf<Self>>;
+
+		/// The amount held on deposit for a registered subaccount. This should account for the fact
+		/// that one storage item's value will increase by the size of an account ID, and there will be
+		/// another trie item whose value is the size of an account ID plus 32 bytes.
+		#[pallet::constant]
+		type SubAccountDeposit: Get<BalanceOf<Self>>;
+
+
+		/// The maximum number of sub-accounts allowed per identified account.
+		#[pallet::constant]
+		type MaxSubAccounts: Get<u32>;
+
+		/// Maximum number of additional fields that may be stored in an ID. Needed to bound the I/O
+		/// required to access an identity, but can be pretty high.
+		#[pallet::constant]
+		type MaxAdditionalFields: Get<u32>;
+
+		/// Maxmimum number of registrars allowed in the system. Needed to bound the complexity
+		/// of, e.g., updating judgements.
+		#[pallet::constant]
+		type MaxRegistrars: Get<u32>;
+
+		/// What to do with slashed funds.
+		type Slashed: OnUnbalanced<NegativeImbalanceOf<Self>>;
+
+		/// The origin which may forcibly set or remove a name. Root can always do this.
+		type ForceOrigin: EnsureOrigin<Self::Origin>;
+
+		/// The origin which may add or remove registrars. Root can always do this.
+		type RegistrarOrigin: EnsureOrigin<Self::Origin>;
+
+		/// Weight information for extrinsics in this pallet.
+		type WeightInfo: WeightInfo;
 	}
-);
 
-decl_error! {
-	/// Error for the identity module.
-	pub enum Error for Module<T: Config> {
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(_);
+
+	/// Information that is pertinent to identify the entity behind an account.
+	///
+	/// TWOX-NOTE: OK ― `AccountId` is a secure hash.
+	#[pallet::storage]
+	#[pallet::getter(fn identity)]
+	pub(super) type IdentityOf<T: Config> = StorageMap<
+		_,
+		Twox64Concat,
+		T::AccountId,
+		Registration<BalanceOf<T>>,
+		OptionQuery,
+	>;
+
+	/// The super-identity of an alternative "sub" identity together with its name, within that
+	/// context. If the account is not some other account's sub-identity, then just `None`.
+	#[pallet::storage]
+	#[pallet::getter(fn super_of)]
+	pub(super) type SuperOf<T: Config> = StorageMap<
+		_,
+		Blake2_128Concat,
+		T::AccountId,
+		(T::AccountId, Data),
+		OptionQuery,
+	>;
+
+	/// Alternative "sub" identities of this account.
+	///
+	/// The first item is the deposit, the second is a vector of the accounts.
+	///
+	/// TWOX-NOTE: OK ― `AccountId` is a secure hash.
+	#[pallet::storage]
+	#[pallet::getter(fn subs_of)]
+	pub(super) type SubsOf<T: Config> = StorageMap<
+		_,
+		Twox64Concat,
+		T::AccountId,
+		(BalanceOf<T>, Vec<T::AccountId>),
+		ValueQuery,
+	>;
+
+	/// The set of registrars. Not expected to get very big as can only be added through a
+	/// special origin (likely a council motion).
+	///
+	/// The index into this can be cast to `RegistrarIndex` to get a valid value.
+	#[pallet::storage]
+	#[pallet::getter(fn registrars)]
+	pub(super) type Registrars<T: Config> = StorageValue<
+		_,
+		Vec<Option<RegistrarInfo<BalanceOf<T>, T::AccountId>>>,
+		ValueQuery,
+	>;
+
+	#[pallet::error]
+	pub enum Error<T> {
 		/// Too many subs-accounts.
 		TooManySubAccounts,
 		/// Account isn't found.
@@ -490,37 +500,44 @@ decl_error! {
 		/// Sub-account isn't owned by sender.
 		NotOwned
 	}
-}
-
-decl_module! {
-	/// Identity module declaration.
-	pub struct Module<T: Config> for enum Call where origin: T::Origin {
-		/// The amount held on deposit for a registered identity.
-		const BasicDeposit: BalanceOf<T> = T::BasicDeposit::get();
-
-		/// The amount held on deposit per additional field for a registered identity.
-		const FieldDeposit: BalanceOf<T> = T::FieldDeposit::get();
-
-		/// The amount held on deposit for a registered subaccount. This should account for the fact
-		/// that one storage item's value will increase by the size of an account ID, and there will be
-		/// another trie item whose value is the size of an account ID plus 32 bytes.
-		const SubAccountDeposit: BalanceOf<T> = T::SubAccountDeposit::get();
-
-		/// The maximum number of sub-accounts allowed per identified account.
-		const MaxSubAccounts: u32 = T::MaxSubAccounts::get();
-
-		/// Maximum number of additional fields that may be stored in an ID. Needed to bound the I/O
-		/// required to access an identity, but can be pretty high.
-		const MaxAdditionalFields: u32 = T::MaxAdditionalFields::get();
-
-		/// Maxmimum number of registrars allowed in the system. Needed to bound the complexity
-		/// of, e.g., updating judgements.
-		const MaxRegistrars: u32 = T::MaxRegistrars::get();
 
-		type Error = Error<T>;
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	#[pallet::metadata(
+		T::AccountId = "AccountId",
+		BalanceOf<T> = "Balance"
+	)]
+	pub enum Event<T: Config> {
+		/// A name was set or reset (which will remove all judgements). \[who\]
+		IdentitySet(T::AccountId),
+		/// A name was cleared, and the given balance returned. \[who, deposit\]
+		IdentityCleared(T::AccountId, BalanceOf<T>),
+		/// A name was removed and the given balance slashed. \[who, deposit\]
+		IdentityKilled(T::AccountId, BalanceOf<T>),
+		/// A judgement was asked from a registrar. \[who, registrar_index\]
+		JudgementRequested(T::AccountId, RegistrarIndex),
+		/// A judgement request was retracted. \[who, registrar_index\]
+		JudgementUnrequested(T::AccountId, RegistrarIndex),
+		/// A judgement was given by a registrar. \[target, registrar_index\]
+		JudgementGiven(T::AccountId, RegistrarIndex),
+		/// A registrar was added. \[registrar_index\]
+		RegistrarAdded(RegistrarIndex),
+		/// A sub-identity was added to an identity and the deposit paid. \[sub, main, deposit\]
+		SubIdentityAdded(T::AccountId, T::AccountId, BalanceOf<T>),
+		/// A sub-identity was removed from an identity and the deposit freed.
+		/// \[sub, main, deposit\]
+		SubIdentityRemoved(T::AccountId, T::AccountId, BalanceOf<T>),
+		/// A sub-identity was cleared, and the given deposit repatriated from the
+		/// main identity account to the sub-identity account. \[sub, main, deposit\]
+		SubIdentityRevoked(T::AccountId, T::AccountId, BalanceOf<T>),
+	}
 
-		fn deposit_event() = default;
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
 
+	#[pallet::call]
+	/// Identity pallet declaration.
+	impl<T: Config> Pallet<T> {
 		/// Add a registrar to the system.
 		///
 		/// The dispatch origin for this call must be `T::RegistrarOrigin`.
@@ -534,8 +551,8 @@ decl_module! {
 		/// - One storage mutation (codec `O(R)`).
 		/// - One event.
 		/// # </weight>
-		#[weight = T::WeightInfo::add_registrar(T::MaxRegistrars::get()) ]
-		fn add_registrar(origin, account: T::AccountId) -> DispatchResultWithPostInfo {
+		#[pallet::weight(T::WeightInfo::add_registrar(T::MaxRegistrars::get()))]
+		pub(super) fn add_registrar(origin: OriginFor<T>, account: T::AccountId) -> DispatchResultWithPostInfo {
 			T::RegistrarOrigin::ensure_origin(origin)?;
 
 			let (i, registrar_count) = <Registrars<T>>::try_mutate(
@@ -548,7 +565,7 @@ decl_module! {
 				}
 			)?;
 
-			Self::deposit_event(RawEvent::RegistrarAdded(i));
+			Self::deposit_event(Event::RegistrarAdded(i));
 
 			Ok(Some(T::WeightInfo::add_registrar(registrar_count as u32)).into())
 		}
@@ -572,11 +589,11 @@ decl_module! {
 		/// - One storage mutation (codec-read `O(X' + R)`, codec-write `O(X + R)`).
 		/// - One event.
 		/// # </weight>
-		#[weight =  T::WeightInfo::set_identity(
+		#[pallet::weight( T::WeightInfo::set_identity(
 			T::MaxRegistrars::get().into(), // R
 			T::MaxAdditionalFields::get().into(), // X
-		)]
-		fn set_identity(origin, info: IdentityInfo) -> DispatchResultWithPostInfo {
+		))]
+		pub(super) fn set_identity(origin: OriginFor<T>, info: IdentityInfo) -> DispatchResultWithPostInfo {
 			let sender = ensure_signed(origin)?;
 			let extra_fields = info.additional.len() as u32;
 			ensure!(extra_fields <= T::MaxAdditionalFields::get(), Error::<T>::TooManyFields);
@@ -604,7 +621,7 @@ decl_module! {
 
 			let judgements = id.judgements.len();
 			<IdentityOf<T>>::insert(&sender, id);
-			Self::deposit_event(RawEvent::IdentitySet(sender));
+			Self::deposit_event(Event::IdentitySet(sender));
 
 			Ok(Some(T::WeightInfo::set_identity(
 				judgements as u32, // R
@@ -639,10 +656,10 @@ decl_module! {
 		// N storage items for N sub accounts. Right now the weight on this function
 		// is a large overestimate due to the fact that it could potentially write
 		// to 2 x T::MaxSubAccounts::get().
-		#[weight = T::WeightInfo::set_subs_old(T::MaxSubAccounts::get()) // P: Assume max sub accounts removed.
+		#[pallet::weight(T::WeightInfo::set_subs_old(T::MaxSubAccounts::get()) // P: Assume max sub accounts removed.
 			.saturating_add(T::WeightInfo::set_subs_new(subs.len() as u32)) // S: Assume all subs are new.
-		]
-		fn set_subs(origin, subs: Vec<(T::AccountId, Data)>) -> DispatchResultWithPostInfo {
+		)]
+		pub(super) fn set_subs(origin: OriginFor<T>, subs: Vec<(T::AccountId, Data)>) -> DispatchResultWithPostInfo {
 			let sender = ensure_signed(origin)?;
 			ensure!(<IdentityOf<T>>::contains_key(&sender), Error::<T>::NotFound);
 			ensure!(subs.len() <= T::MaxSubAccounts::get() as usize, Error::<T>::TooManySubAccounts);
@@ -700,12 +717,12 @@ decl_module! {
 		/// - `2` storage reads and `S + 2` storage deletions.
 		/// - One event.
 		/// # </weight>
-		#[weight = T::WeightInfo::clear_identity(
+		#[pallet::weight(T::WeightInfo::clear_identity(
 			T::MaxRegistrars::get().into(), // R
 			T::MaxSubAccounts::get().into(), // S
 			T::MaxAdditionalFields::get().into(), // X
-		)]
-		fn clear_identity(origin) -> DispatchResultWithPostInfo {
+		))]
+		pub(super) fn clear_identity(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
 			let sender = ensure_signed(origin)?;
 
 			let (subs_deposit, sub_ids) = <SubsOf<T>>::take(&sender);
@@ -718,7 +735,7 @@ decl_module! {
 			let err_amount = T::Currency::unreserve(&sender, deposit.clone());
 			debug_assert!(err_amount.is_zero());
 
-			Self::deposit_event(RawEvent::IdentityCleared(sender, deposit));
+			Self::deposit_event(Event::IdentityCleared(sender, deposit));
 
 			Ok(Some(T::WeightInfo::clear_identity(
 				id.judgements.len() as u32, // R
@@ -750,13 +767,13 @@ decl_module! {
 		/// - Storage: 1 read `O(R)`, 1 mutate `O(X + R)`.
 		/// - One event.
 		/// # </weight>
-		#[weight = T::WeightInfo::request_judgement(
+		#[pallet::weight(T::WeightInfo::request_judgement(
 			T::MaxRegistrars::get().into(), // R
 			T::MaxAdditionalFields::get().into(), // X
-		)]
-		fn request_judgement(origin,
-			#[compact] reg_index: RegistrarIndex,
-			#[compact] max_fee: BalanceOf<T>,
+		))]
+		pub(super) fn request_judgement(origin: OriginFor<T>,
+			#[pallet::compact] reg_index: RegistrarIndex,
+			#[pallet::compact] max_fee: BalanceOf<T>,
 		) -> DispatchResultWithPostInfo {
 			let sender = ensure_signed(origin)?;
 			let registrars = <Registrars<T>>::get();
@@ -781,7 +798,7 @@ decl_module! {
 			let extra_fields = id.info.additional.len();
 			<IdentityOf<T>>::insert(&sender, id);
 
-			Self::deposit_event(RawEvent::JudgementRequested(sender, reg_index));
+			Self::deposit_event(Event::JudgementRequested(sender, reg_index));
 
 			Ok(Some(T::WeightInfo::request_judgement(
 				judgements as u32,
@@ -806,11 +823,11 @@ decl_module! {
 		/// - One storage mutation `O(R + X)`.
 		/// - One event
 		/// # </weight>
-		#[weight = T::WeightInfo::cancel_request(
+		#[pallet::weight(T::WeightInfo::cancel_request(
 			T::MaxRegistrars::get().into(), // R
 			T::MaxAdditionalFields::get().into(), // X
-		)]
-		fn cancel_request(origin, reg_index: RegistrarIndex) -> DispatchResultWithPostInfo {
+		))]
+		pub(super) fn cancel_request(origin: OriginFor<T>, reg_index: RegistrarIndex) -> DispatchResultWithPostInfo {
 			let sender = ensure_signed(origin)?;
 			let mut id = <IdentityOf<T>>::get(&sender).ok_or(Error::<T>::NoIdentity)?;
 
@@ -828,7 +845,7 @@ decl_module! {
 			let extra_fields = id.info.additional.len();
 			<IdentityOf<T>>::insert(&sender, id);
 
-			Self::deposit_event(RawEvent::JudgementUnrequested(sender, reg_index));
+			Self::deposit_event(Event::JudgementUnrequested(sender, reg_index));
 
 			Ok(Some(T::WeightInfo::cancel_request(
 				judgements as u32,
@@ -849,10 +866,10 @@ decl_module! {
 		/// - One storage mutation `O(R)`.
 		/// - Benchmark: 7.315 + R * 0.329 µs (min squares analysis)
 		/// # </weight>
-		#[weight = T::WeightInfo::set_fee(T::MaxRegistrars::get())] // R
-		fn set_fee(origin,
-			#[compact] index: RegistrarIndex,
-			#[compact] fee: BalanceOf<T>,
+		#[pallet::weight(T::WeightInfo::set_fee(T::MaxRegistrars::get()))] // R
+		pub(super) fn set_fee(origin: OriginFor<T>,
+			#[pallet::compact] index: RegistrarIndex,
+			#[pallet::compact] fee: BalanceOf<T>,
 		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
 
@@ -879,9 +896,9 @@ decl_module! {
 		/// - One storage mutation `O(R)`.
 		/// - Benchmark: 8.823 + R * 0.32 µs (min squares analysis)
 		/// # </weight>
-		#[weight = T::WeightInfo::set_account_id(T::MaxRegistrars::get())] // R
-		fn set_account_id(origin,
-			#[compact] index: RegistrarIndex,
+		#[pallet::weight(T::WeightInfo::set_account_id(T::MaxRegistrars::get()))] // R
+		pub(super) fn set_account_id(origin: OriginFor<T>,
+			#[pallet::compact] index: RegistrarIndex,
 			new: T::AccountId,
 		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
@@ -909,9 +926,9 @@ decl_module! {
 		/// - One storage mutation `O(R)`.
 		/// - Benchmark: 7.464 + R * 0.325 µs (min squares analysis)
 		/// # </weight>
-		#[weight = T::WeightInfo::set_fields(T::MaxRegistrars::get())] // R
-		fn set_fields(origin,
-			#[compact] index: RegistrarIndex,
+		#[pallet::weight(T::WeightInfo::set_fields(T::MaxRegistrars::get()))] // R
+		pub(super) fn set_fields(origin: OriginFor<T>,
+			#[pallet::compact] index: RegistrarIndex,
 			fields: IdentityFields,
 		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
@@ -947,12 +964,12 @@ decl_module! {
 		/// - Storage: 1 read `O(R)`, 1 mutate `O(R + X)`.
 		/// - One event.
 		/// # </weight>
-		#[weight = T::WeightInfo::provide_judgement(
+		#[pallet::weight(T::WeightInfo::provide_judgement(
 			T::MaxRegistrars::get().into(), // R
 			T::MaxAdditionalFields::get().into(), // X
-		)]
-		fn provide_judgement(origin,
-			#[compact] reg_index: RegistrarIndex,
+		))]
+		pub(super) fn provide_judgement(origin: OriginFor<T>,
+			#[pallet::compact] reg_index: RegistrarIndex,
 			target: <T::Lookup as StaticLookup>::Source,
 			judgement: Judgement<BalanceOf<T>>,
 		) -> DispatchResultWithPostInfo {
@@ -980,7 +997,7 @@ decl_module! {
 			let judgements = id.judgements.len();
 			let extra_fields = id.info.additional.len();
 			<IdentityOf<T>>::insert(&target, id);
-			Self::deposit_event(RawEvent::JudgementGiven(target, reg_index));
+			Self::deposit_event(Event::JudgementGiven(target, reg_index));
 
 			Ok(Some(T::WeightInfo::provide_judgement(
 				judgements as u32,
@@ -1007,12 +1024,14 @@ decl_module! {
 		/// - `S + 2` storage mutations.
 		/// - One event.
 		/// # </weight>
-		#[weight = T::WeightInfo::kill_identity(
+		#[pallet::weight(T::WeightInfo::kill_identity(
 			T::MaxRegistrars::get().into(), // R
 			T::MaxSubAccounts::get().into(), // S
 			T::MaxAdditionalFields::get().into(), // X
-		)]
-		fn kill_identity(origin, target: <T::Lookup as StaticLookup>::Source) -> DispatchResultWithPostInfo {
+		))]
+		pub(super) fn kill_identity(
+			origin: OriginFor<T>, target: <T::Lookup as StaticLookup>::Source
+		) -> DispatchResultWithPostInfo {
 			T::ForceOrigin::ensure_origin(origin)?;
 
 			// Figure out who we're meant to be clearing.
@@ -1027,7 +1046,7 @@ decl_module! {
 			// Slash their deposit from them.
 			T::Slashed::on_unbalanced(T::Currency::slash_reserved(&target, deposit).0);
 
-			Self::deposit_event(RawEvent::IdentityKilled(target, deposit));
+			Self::deposit_event(Event::IdentityKilled(target, deposit));
 
 			Ok(Some(T::WeightInfo::kill_identity(
 				id.judgements.len() as u32, // R
@@ -1043,8 +1062,8 @@ decl_module! {
 		///
 		/// The dispatch origin for this call must be _Signed_ and the sender must have a registered
 		/// sub identity of `sub`.
-		#[weight = T::WeightInfo::add_sub(T::MaxSubAccounts::get())]
-		fn add_sub(origin, sub: <T::Lookup as StaticLookup>::Source, data: Data) -> DispatchResult {
+		#[pallet::weight(T::WeightInfo::add_sub(T::MaxSubAccounts::get()))]
+		pub(super) fn add_sub(origin: OriginFor<T>, sub: <T::Lookup as StaticLookup>::Source, data: Data) -> DispatchResult {
 			let sender = ensure_signed(origin)?;
 			let sub = T::Lookup::lookup(sub)?;
 			ensure!(IdentityOf::<T>::contains_key(&sender), Error::<T>::NoIdentity);
@@ -1062,7 +1081,7 @@ decl_module! {
 				sub_ids.push(sub.clone());
 				*subs_deposit = subs_deposit.saturating_add(deposit);
 
-				Self::deposit_event(RawEvent::SubIdentityAdded(sub, sender.clone(), deposit));
+				Self::deposit_event(Event::SubIdentityAdded(sub, sender.clone(), deposit));
 				Ok(())
 			})
 		}
@@ -1071,13 +1090,16 @@ decl_module! {
 		///
 		/// The dispatch origin for this call must be _Signed_ and the sender must have a registered
 		/// sub identity of `sub`.
-		#[weight = T::WeightInfo::rename_sub(T::MaxSubAccounts::get())]
-		fn rename_sub(origin, sub: <T::Lookup as StaticLookup>::Source, data: Data) {
+		#[pallet::weight(T::WeightInfo::rename_sub(T::MaxSubAccounts::get()))]
+		pub(super) fn rename_sub(
+			origin: OriginFor<T>, sub: <T::Lookup as StaticLookup>::Source, data: Data
+		) -> DispatchResult {
 			let sender = ensure_signed(origin)?;
 			let sub = T::Lookup::lookup(sub)?;
 			ensure!(IdentityOf::<T>::contains_key(&sender), Error::<T>::NoIdentity);
 			ensure!(SuperOf::<T>::get(&sub).map_or(false, |x| x.0 == sender), Error::<T>::NotOwned);
 			SuperOf::<T>::insert(&sub, (sender, data));
+			Ok(())
 		}
 
 		/// Remove the given account from the sender's subs.
@@ -1087,8 +1109,8 @@ decl_module! {
 		///
 		/// The dispatch origin for this call must be _Signed_ and the sender must have a registered
 		/// sub identity of `sub`.
-		#[weight = T::WeightInfo::remove_sub(T::MaxSubAccounts::get())]
-		fn remove_sub(origin, sub: <T::Lookup as StaticLookup>::Source) {
+		#[pallet::weight(T::WeightInfo::remove_sub(T::MaxSubAccounts::get()))]
+		pub(super) fn remove_sub(origin: OriginFor<T>, sub: <T::Lookup as StaticLookup>::Source) -> DispatchResult {
 			let sender = ensure_signed(origin)?;
 			ensure!(IdentityOf::<T>::contains_key(&sender), Error::<T>::NoIdentity);
 			let sub = T::Lookup::lookup(sub)?;
@@ -1101,8 +1123,9 @@ decl_module! {
 				*subs_deposit -= deposit;
 				let err_amount = T::Currency::unreserve(&sender, deposit);
 				debug_assert!(err_amount.is_zero());
-				Self::deposit_event(RawEvent::SubIdentityRemoved(sub, sender, deposit));
+				Self::deposit_event(Event::SubIdentityRemoved(sub, sender, deposit));
 			});
+			Ok(())
 		}
 
 		/// Remove the sender as a sub-account.
@@ -1115,8 +1138,8 @@ decl_module! {
 		///
 		/// NOTE: This should not normally be used, but is provided in the case that the non-
 		/// controller of an account is maliciously registered as a sub-account.
-		#[weight = T::WeightInfo::quit_sub(T::MaxSubAccounts::get())]
-		fn quit_sub(origin) {
+		#[pallet::weight(T::WeightInfo::quit_sub(T::MaxSubAccounts::get()))]
+		pub(super) fn quit_sub(origin: OriginFor<T>) -> DispatchResult {
 			let sender = ensure_signed(origin)?;
 			let (sup, _) = SuperOf::<T>::take(&sender).ok_or(Error::<T>::NotSub)?;
 			SubsOf::<T>::mutate(&sup, |(ref mut subs_deposit, ref mut sub_ids)| {
@@ -1124,13 +1147,15 @@ decl_module! {
 				let deposit = T::SubAccountDeposit::get().min(*subs_deposit);
 				*subs_deposit -= deposit;
 				let _ = T::Currency::repatriate_reserved(&sup, &sender, deposit, BalanceStatus::Free);
-				Self::deposit_event(RawEvent::SubIdentityRevoked(sender, sup.clone(), deposit));
+				Self::deposit_event(Event::SubIdentityRevoked(sender, sup.clone(), deposit));
 			});
+			Ok(())
 		}
 	}
+
 }
 
-impl<T: Config> Module<T> {
+impl<T: Config> Pallet<T> {
 	/// Get the subs of an account.
 	pub fn subs(who: &T::AccountId) -> Vec<(T::AccountId, Data)> {
 		SubsOf::<T>::get(who).1
diff --git a/frame/identity/src/tests.rs b/frame/identity/src/tests.rs
index 937fa8f130d8..2bfad79640c2 100644
--- a/frame/identity/src/tests.rs
+++ b/frame/identity/src/tests.rs
@@ -107,7 +107,7 @@ type EnsureTwoOrRoot = EnsureOneOf<
 	EnsureRoot<u64>,
 	EnsureSignedBy<Two, u64>
 >;
-impl Config for Test {
+impl pallet_identity::Config for Test {
 	type Event = Event;
 	type Currency = Balances;
 	type Slashed = ();

From ab405b2a90b640a5e2ef4c533d46687ce3aac5a6 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Tue, 4 May 2021 11:04:49 +0200
Subject: [PATCH 0694/1194] Add some builder functions for NonDefaultSetConfig
 (#8712)

---
 client/network/src/config.rs | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/client/network/src/config.rs b/client/network/src/config.rs
index a6ce295e4622..3864b77d88be 100644
--- a/client/network/src/config.rs
+++ b/client/network/src/config.rs
@@ -530,6 +530,9 @@ impl Default for SetConfig {
 }
 
 /// Extension to [`SetConfig`] for sets that aren't the default set.
+///
+/// > **Note**: As new fields might be added in the future, please consider using the `new` method
+/// >			and modifiers instead of creating this struct manually.
 #[derive(Clone, Debug)]
 pub struct NonDefaultSetConfig {
 	/// Name of the notifications protocols of this set. A substream on this set will be
@@ -544,6 +547,34 @@ pub struct NonDefaultSetConfig {
 	pub set_config: SetConfig,
 }
 
+impl NonDefaultSetConfig {
+	/// Creates a new [`NonDefaultSetConfig`]. Zero slots and accepts only reserved nodes.
+	pub fn new(notifications_protocol: Cow<'static, str>, max_notification_size: u64) -> Self {
+		NonDefaultSetConfig {
+			notifications_protocol,
+			max_notification_size,
+			set_config: SetConfig {
+				in_peers: 0,
+				out_peers: 0,
+				reserved_nodes: Vec::new(),
+				non_reserved_mode: NonReservedPeerMode::Deny,
+			},
+		}
+	}
+
+	/// Modifies the configuration to allow non-reserved nodes.
+	pub fn allow_non_reserved(&mut self, in_peers: u32, out_peers: u32) {
+		self.set_config.in_peers = in_peers;
+		self.set_config.out_peers = out_peers;
+		self.set_config.non_reserved_mode = NonReservedPeerMode::Accept;
+	}
+
+	/// Add a node to the list of reserved nodes.
+	pub fn add_reserved(&mut self, peer: MultiaddrWithPeerId) {
+		self.set_config.reserved_nodes.push(peer);
+	}
+}
+
 /// Configuration for the transport layer.
 #[derive(Clone, Debug)]
 pub enum TransportConfig {

From cbd09f63251a347ac0ab6aab56967e5fc7d5dbf1 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Tue, 4 May 2021 05:17:52 -0400
Subject: [PATCH 0695/1194] Improve `BoundedVec` API (#8707)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* improve bounded vec api

* Update frame/support/src/storage/bounded_vec.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Update frame/support/src/storage/bounded_vec.rs

* Update frame/support/src/storage/bounded_vec.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 frame/support/src/storage/bounded_vec.rs | 48 ++++++++++++++++++++++--
 1 file changed, 44 insertions(+), 4 deletions(-)

diff --git a/frame/support/src/storage/bounded_vec.rs b/frame/support/src/storage/bounded_vec.rs
index 9fcfe4035294..5b253f76333b 100644
--- a/frame/support/src/storage/bounded_vec.rs
+++ b/frame/support/src/storage/bounded_vec.rs
@@ -21,6 +21,7 @@
 use sp_std::prelude::*;
 use sp_std::{convert::TryFrom, marker::PhantomData};
 use codec::{FullCodec, Encode, EncodeLike, Decode};
+use core::{ops::{Index, IndexMut}, slice::SliceIndex};
 use crate::{
 	traits::Get,
 	storage::{generator, StorageDecodeLength, StorageValue, StorageMap, StorageDoubleMap},
@@ -179,6 +180,18 @@ impl<T: BoundedVecValue, S: Get<u32>> AsRef<Vec<T>> for BoundedVec<T, S> {
 	}
 }
 
+impl<T: BoundedVecValue, S: Get<u32>> AsRef<[T]> for BoundedVec<T, S> {
+	fn as_ref(&self) -> &[T] {
+		&self.0
+	}
+}
+
+impl<T: BoundedVecValue, S: Get<u32>> AsMut<[T]> for BoundedVec<T, S> {
+	fn as_mut(&mut self) -> &mut [T] {
+		&mut self.0
+	}
+}
+
 // will allow for immutable all operations of `Vec<T>` on `BoundedVec<T>`.
 impl<T: BoundedVecValue, S: Get<u32>> sp_std::ops::Deref for BoundedVec<T, S> {
 	type Target = Vec<T>;
@@ -189,10 +202,19 @@ impl<T: BoundedVecValue, S: Get<u32>> sp_std::ops::Deref for BoundedVec<T, S> {
 }
 
 // Allows for indexing similar to a normal `Vec`. Can panic if out of bound.
-impl<T: BoundedVecValue, S: Get<u32>> sp_std::ops::Index<usize> for BoundedVec<T, S> {
-	type Output = T;
-	fn index(&self, index: usize) -> &Self::Output {
-		self.get(index).expect("index out of bound")
+impl<T: BoundedVecValue, S: Get<u32>, I: SliceIndex<[T]>> Index<I> for BoundedVec<T, S> {
+	type Output = I::Output;
+
+	#[inline]
+	fn index(&self, index: I) -> &Self::Output {
+		self.0.index(index)
+	}
+}
+
+impl<T: BoundedVecValue, S: Get<u32>, I: SliceIndex<[T]>> IndexMut<I> for BoundedVec<T, S> {
+	#[inline]
+	fn index_mut(&mut self, index: I) -> &mut Self::Output {
+		self.0.index_mut(index)
 	}
 }
 
@@ -212,6 +234,12 @@ impl<T: BoundedVecValue, S: Get<u32>> codec::DecodeLength for BoundedVec<T, S> {
 	}
 }
 
+impl<T: BoundedVecValue + PartialEq, S: Get<u32>> PartialEq<Vec<T>> for BoundedVec<T, S> {
+	fn eq(&self, other: &Vec<T>) -> bool {
+		&self.0 == other
+	}
+}
+
 impl<T: BoundedVecValue, S: Get<u32>> StorageDecodeLength for BoundedVec<T, S> {}
 
 /// Storage value that is *maybe* capable of [`StorageAppend`](crate::storage::StorageAppend).
@@ -467,4 +495,16 @@ pub mod test {
 		assert_eq!(bounded.len(), 7);
 		assert!(bounded.try_mutate(|v| v.push(8)).is_none());
 	}
+
+	#[test]
+	fn slice_indexing_works() {
+		let bounded: BoundedVec<u32, Seven> = vec![1, 2, 3, 4, 5, 6].try_into().unwrap();
+		assert_eq!(&bounded[0..=2], &[1, 2, 3]);
+	}
+
+	#[test]
+	fn vec_eq_works() {
+		let bounded: BoundedVec<u32, Seven> = vec![1, 2, 3, 4, 5, 6].try_into().unwrap();
+		assert_eq!(bounded, vec![1, 2, 3, 4, 5, 6]);
+	}
 }

From 5f73ba1f67c33d7e92a66e78a3cfd1132fa5a7ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Tue, 4 May 2021 10:29:44 +0100
Subject: [PATCH 0696/1194] primitives: remove random_seed from BlockBuilder
 API (#8718)

* primitives: remove random_seed from BlockBuilderApi

* node: remove random_seed

* primitives: bump BlockBuilderApi version

* client: rpc: fix test
---
 bin/node-template/runtime/src/lib.rs |  4 ----
 bin/node/runtime/src/lib.rs          |  6 +-----
 client/rpc/src/state/tests.rs        |  2 +-
 primitives/block-builder/src/lib.rs  | 10 +++++-----
 test-utils/runtime/src/lib.rs        |  8 --------
 5 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index d72a558e1dd2..178918266a7f 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -367,10 +367,6 @@ impl_runtime_apis! {
 		) -> sp_inherents::CheckInherentsResult {
 			data.check_extrinsics(&block)
 		}
-
-		fn random_seed() -> <Block as BlockT>::Hash {
-			RandomnessCollectiveFlip::random_seed().0
-		}
 	}
 
 	impl sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> for Runtime {
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index a8240679aeae..2e5430149373 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -32,7 +32,7 @@ use frame_support::{
 		DispatchClass,
 	},
 	traits::{
-		Currency, Imbalance, KeyOwnerProofSystem, OnUnbalanced, Randomness, LockIdentifier,
+		Currency, Imbalance, KeyOwnerProofSystem, OnUnbalanced, LockIdentifier,
 		U128CurrencyToVote,
 	},
 };
@@ -1228,10 +1228,6 @@ impl_runtime_apis! {
 		fn check_inherents(block: Block, data: InherentData) -> CheckInherentsResult {
 			data.check_extrinsics(&block)
 		}
-
-		fn random_seed() -> <Block as BlockT>::Hash {
-			pallet_babe::RandomnessFromOneEpochAgo::<Runtime>::random_seed().0
-		}
 	}
 
 	impl sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> for Runtime {
diff --git a/client/rpc/src/state/tests.rs b/client/rpc/src/state/tests.rs
index b5d30b341390..cfc27c7bf525 100644
--- a/client/rpc/src/state/tests.rs
+++ b/client/rpc/src/state/tests.rs
@@ -467,7 +467,7 @@ fn should_return_runtime_version() {
 
 	let result = "{\"specName\":\"test\",\"implName\":\"parity-test\",\"authoringVersion\":1,\
 		\"specVersion\":2,\"implVersion\":2,\"apis\":[[\"0xdf6acb689907609b\",3],\
-		[\"0x37e397fc7c91f5e4\",1],[\"0xd2bc9897eed08f15\",2],[\"0x40fe3ad401f8959a\",4],\
+		[\"0x37e397fc7c91f5e4\",1],[\"0xd2bc9897eed08f15\",2],[\"0x40fe3ad401f8959a\",5],\
 		[\"0xc6e9a76309f39b09\",1],[\"0xdd718d5cc53262d4\",1],[\"0xcbca25e39f142387\",2],\
 		[\"0xf78b278be53f454c\",2],[\"0xab3c0572291feb8b\",1],[\"0xbc9d89904f5b923f\",1]],\
 		\"transactionVersion\":1}";
diff --git a/primitives/block-builder/src/lib.rs b/primitives/block-builder/src/lib.rs
index f51d041c9f1c..3741b1920064 100644
--- a/primitives/block-builder/src/lib.rs
+++ b/primitives/block-builder/src/lib.rs
@@ -19,29 +19,29 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
+use sp_inherents::{CheckInherentsResult, InherentData};
 use sp_runtime::{traits::Block as BlockT, ApplyExtrinsicResult};
 
-use sp_inherents::{InherentData, CheckInherentsResult};
-
 sp_api::decl_runtime_apis! {
 	/// The `BlockBuilder` api trait that provides the required functionality for building a block.
-	#[api_version(4)]
+	#[api_version(5)]
 	pub trait BlockBuilder {
 		/// Apply the given extrinsic.
 		///
 		/// Returns an inclusion outcome which specifies if this extrinsic is included in
 		/// this block or not.
 		fn apply_extrinsic(extrinsic: <Block as BlockT>::Extrinsic) -> ApplyExtrinsicResult;
+
 		/// Finish the current block.
 		#[renamed("finalise_block", 3)]
 		fn finalize_block() -> <Block as BlockT>::Header;
+
 		/// Generate inherent extrinsics. The inherent data will vary from chain to chain.
 		fn inherent_extrinsics(
 			inherent: InherentData,
 		) -> sp_std::vec::Vec<<Block as BlockT>::Extrinsic>;
+
 		/// Check that the inherents are valid. The inherent data will vary from chain to chain.
 		fn check_inherents(block: Block, data: InherentData) -> CheckInherentsResult;
-		/// Generate a random seed.
-		fn random_seed() -> <Block as BlockT>::Hash;
 	}
 }
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index dfd0ee6ae125..4afb313eef35 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -665,10 +665,6 @@ cfg_if! {
 				fn check_inherents(_block: Block, _data: InherentData) -> CheckInherentsResult {
 					CheckInherentsResult::new()
 				}
-
-				fn random_seed() -> <Block as BlockT>::Hash {
-					unimplemented!()
-				}
 			}
 
 			impl self::TestAPI<Block> for Runtime {
@@ -922,10 +918,6 @@ cfg_if! {
 				fn check_inherents(_block: Block, _data: InherentData) -> CheckInherentsResult {
 					CheckInherentsResult::new()
 				}
-
-				fn random_seed() -> <Block as BlockT>::Hash {
-					unimplemented!()
-				}
 			}
 
 			impl self::TestAPI<Block> for Runtime {

From b094edafd1cd5d26e49ecbf92b0ce7553cfad717 Mon Sep 17 00:00:00 2001
From: Dan Shields <35669742+NukeManDan@users.noreply.github.com>
Date: Tue, 4 May 2021 03:50:31 -0600
Subject: [PATCH 0697/1194] Change to use the same subcommand syntax as subkey
 (#8678)

* Change to use the same subcommand syntax as subkey

* Update client/cli/src/commands/inspect_key.rs

* revert to InspectKeyCmd struct
---
 bin/node/cli/src/cli.rs                | 2 +-
 bin/node/inspect/src/cli.rs            | 2 +-
 bin/node/inspect/src/command.rs        | 6 +++---
 client/cli/src/commands/inspect_key.rs | 2 +-
 client/cli/src/commands/key.rs         | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bin/node/cli/src/cli.rs b/bin/node/cli/src/cli.rs
index 9b80a3e34529..03d6a2db8af5 100644
--- a/bin/node/cli/src/cli.rs
+++ b/bin/node/cli/src/cli.rs
@@ -41,7 +41,7 @@ pub enum Subcommand {
 		name = "inspect",
 		about = "Decode given block or extrinsic using current native runtime."
 	)]
-	Inspect(node_inspect::cli::InspectCmd),
+	Inspect(node_inspect::cli::InspectKeyCmd),
 
 	/// The custom benchmark subcommmand benchmarking runtime pallets.
 	#[structopt(name = "benchmark", about = "Benchmark runtime pallets.")]
diff --git a/bin/node/inspect/src/cli.rs b/bin/node/inspect/src/cli.rs
index abdbedc296d0..03f52034acb4 100644
--- a/bin/node/inspect/src/cli.rs
+++ b/bin/node/inspect/src/cli.rs
@@ -24,7 +24,7 @@ use structopt::StructOpt;
 
 /// The `inspect` command used to print decoded chain data.
 #[derive(Debug, StructOpt)]
-pub struct InspectCmd {
+pub struct InspectKeyCmd {
 	#[allow(missing_docs)]
 	#[structopt(flatten)]
 	pub command: InspectSubCmd,
diff --git a/bin/node/inspect/src/command.rs b/bin/node/inspect/src/command.rs
index 9c14a71375f5..b4ab2df48d3b 100644
--- a/bin/node/inspect/src/command.rs
+++ b/bin/node/inspect/src/command.rs
@@ -18,14 +18,14 @@
 
 //! Command ran by the CLI
 
-use crate::cli::{InspectCmd, InspectSubCmd};
+use crate::cli::{InspectKeyCmd, InspectSubCmd};
 use crate::Inspector;
 use sc_cli::{CliConfiguration, ImportParams, Result, SharedParams};
 use sc_service::{new_full_client, Configuration, NativeExecutionDispatch};
 use sp_runtime::traits::Block;
 use std::str::FromStr;
 
-impl InspectCmd {
+impl InspectKeyCmd {
 	/// Run the inspect command, passing the inspector.
 	pub fn run<B, RA, EX>(&self, config: Configuration) -> Result<()>
 	where
@@ -54,7 +54,7 @@ impl InspectCmd {
 	}
 }
 
-impl CliConfiguration for InspectCmd {
+impl CliConfiguration for InspectKeyCmd {
 	fn shared_params(&self) -> &SharedParams {
 		&self.shared_params
 	}
diff --git a/client/cli/src/commands/inspect_key.rs b/client/cli/src/commands/inspect_key.rs
index 2642eee88adc..a60b6cd93a76 100644
--- a/client/cli/src/commands/inspect_key.rs
+++ b/client/cli/src/commands/inspect_key.rs
@@ -25,7 +25,7 @@ use structopt::StructOpt;
 /// The `inspect` command
 #[derive(Debug, StructOpt)]
 #[structopt(
-	name = "inspect-key",
+	name = "inspect",
 	about = "Gets a public key and a SS58 address from the provided Secret URI"
 )]
 pub struct InspectKeyCmd {
diff --git a/client/cli/src/commands/key.rs b/client/cli/src/commands/key.rs
index 546454159718..34602657da94 100644
--- a/client/cli/src/commands/key.rs
+++ b/client/cli/src/commands/key.rs
@@ -39,7 +39,7 @@ pub enum KeySubcommand {
 	Generate(GenerateCmd),
 
 	/// Gets a public key and a SS58 address from the provided Secret URI
-	InspectKey(InspectKeyCmd),
+	Inspect(InspectKeyCmd),
 
 	/// Print the peer ID corresponding to the node key in the given file
 	InspectNodeKey(InspectNodeKeyCmd),
@@ -54,7 +54,7 @@ impl KeySubcommand {
 		match self {
 			KeySubcommand::GenerateNodeKey(cmd) => cmd.run(),
 			KeySubcommand::Generate(cmd) => cmd.run(),
-			KeySubcommand::InspectKey(cmd) => cmd.run(),
+			KeySubcommand::Inspect(cmd) => cmd.run(),
 			KeySubcommand::Insert(cmd) => cmd.run(cli),
 			KeySubcommand::InspectNodeKey(cmd) => cmd.run(),
 		}

From e708448d696ed9c107b6c89fa81d03867dd319bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 4 May 2021 13:34:52 +0200
Subject: [PATCH 0698/1194] Set max log level when changing the log directives
 via RPC (#8721)

Before this pr changing the log directives would not change the max log
level. This means that if the node was started with `info` logging and
some `trace` logging was enabled, this `trace` wouldn't be logged. To
fix this we also need to update the max log level. This max log level is
used by the log macros to early return.
---
 client/rpc/src/system/tests.rs           | 56 +++++++++++-------------
 client/tracing/src/logging/directives.rs | 11 ++---
 client/tracing/src/logging/mod.rs        | 24 ++++++----
 3 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/client/rpc/src/system/tests.rs b/client/rpc/src/system/tests.rs
index 41d6029ddde2..6e22004cd65f 100644
--- a/client/rpc/src/system/tests.rs
+++ b/client/rpc/src/system/tests.rs
@@ -24,10 +24,7 @@ use substrate_test_runtime_client::runtime::Block;
 use assert_matches::assert_matches;
 use futures::prelude::*;
 use sp_utils::mpsc::tracing_unbounded;
-use std::{
-	process::{Stdio, Command}, env, io::{BufReader, BufRead, Write},
-	sync::{Arc, Mutex}, thread, time::Duration
-};
+use std::{process::{Stdio, Command}, env, io::{BufReader, BufRead, Write}, thread};
 
 struct Status {
 	pub peers: usize,
@@ -352,6 +349,7 @@ fn system_network_reserved_peers() {
 fn test_add_reset_log_filter() {
 	const EXPECTED_BEFORE_ADD: &'static str = "EXPECTED_BEFORE_ADD";
 	const EXPECTED_AFTER_ADD: &'static str = "EXPECTED_AFTER_ADD";
+	const EXPECTED_WITH_TRACE: &'static str = "EXPECTED_WITH_TRACE";
 
 	// Enter log generation / filter reload
 	if std::env::var("TEST_LOG_FILTER").is_ok() {
@@ -359,12 +357,17 @@ fn test_add_reset_log_filter() {
 		for line in std::io::stdin().lock().lines() {
 			let line = line.expect("Failed to read bytes");
 			if line.contains("add_reload") {
-				api(None).system_add_log_filter("test_after_add".into()).expect("`system_add_log_filter` failed");
+				api(None).system_add_log_filter("test_after_add".into())
+					.expect("`system_add_log_filter` failed");
+			} else if line.contains("add_trace") {
+				api(None).system_add_log_filter("test_before_add=trace".into())
+					.expect("`system_add_log_filter` failed");
 			} else if line.contains("reset") {
 				api(None).system_reset_log_filter().expect("`system_reset_log_filter` failed");
 			} else if line.contains("exit") {
 				return;
 			}
+			log::trace!(target: "test_before_add", "{}", EXPECTED_WITH_TRACE);
 			log::debug!(target: "test_before_add", "{}", EXPECTED_BEFORE_ADD);
 			log::debug!(target: "test_after_add", "{}", EXPECTED_AFTER_ADD);
 		}
@@ -384,44 +387,35 @@ fn test_add_reset_log_filter() {
 	let mut child_out = BufReader::new(child_stderr);
 	let mut child_in = child_process.stdin.take().expect("Could not get child stdin");
 
-	let child_out_str = Arc::new(Mutex::new(String::new()));
-	let shared = child_out_str.clone();
-
-	let _handle = thread::spawn(move || {
+	let mut read_line = || {
 		let mut line = String::new();
-		while let Ok(_) = child_out.read_line(&mut line) {
-			shared.lock().unwrap().push_str(&line);
-			line.clear();
-		}
-	});
+		child_out.read_line(&mut line).expect("Reading a line");
+		line
+	};
 
 	// Initiate logs loop in child process
 	child_in.write(b"\n").unwrap();
-	thread::sleep(Duration::from_millis(100));
-	let test1_str = child_out_str.lock().unwrap().clone();
-	// Assert that only the first target is present
-	assert!(test1_str.contains(EXPECTED_BEFORE_ADD));
-	assert!(!test1_str.contains(EXPECTED_AFTER_ADD));
-	child_out_str.lock().unwrap().clear();
+	assert!(read_line().contains(EXPECTED_BEFORE_ADD));
 
 	// Initiate add directive & reload in child process
 	child_in.write(b"add_reload\n").unwrap();
-	thread::sleep(Duration::from_millis(100));
-	let test2_str = child_out_str.lock().unwrap().clone();
-	// Assert that both targets are now present
-	assert!(test2_str.contains(EXPECTED_BEFORE_ADD));
-	assert!(test2_str.contains(EXPECTED_AFTER_ADD));
-	child_out_str.lock().unwrap().clear();
+	assert!(read_line().contains(EXPECTED_BEFORE_ADD));
+	assert!(read_line().contains(EXPECTED_AFTER_ADD));
+
+	// Check that increasing the max log level works
+	child_in.write(b"add_trace\n").unwrap();
+	assert!(read_line().contains(EXPECTED_WITH_TRACE));
+	assert!(read_line().contains(EXPECTED_BEFORE_ADD));
+	assert!(read_line().contains(EXPECTED_AFTER_ADD));
 
 	// Initiate logs filter reset in child process
 	child_in.write(b"reset\n").unwrap();
-	thread::sleep(Duration::from_millis(100));
-	let test3_str = child_out_str.lock().unwrap().clone();
-	// Assert that only the first target is present as it was initially
-	assert!(test3_str.contains(EXPECTED_BEFORE_ADD));
-	assert!(!test3_str.contains(EXPECTED_AFTER_ADD));
+	assert!(read_line().contains(EXPECTED_BEFORE_ADD));
 
 	// Return from child process
 	child_in.write(b"exit\n").unwrap();
 	assert!(child_process.wait().expect("Error waiting for child process").success());
+
+	// Check for EOF
+	assert_eq!(child_out.read_line(&mut String::new()).unwrap(), 0);
 }
diff --git a/client/tracing/src/logging/directives.rs b/client/tracing/src/logging/directives.rs
index 39dee2b061f0..0e6d949a4139 100644
--- a/client/tracing/src/logging/directives.rs
+++ b/client/tracing/src/logging/directives.rs
@@ -81,11 +81,12 @@ pub fn reload_filter() -> Result<(), String> {
 			}
 		}
 	}
-	env_filter = env_filter.add_directive(
-		"sc_tracing=trace"
-			.parse()
-			.expect("provided directive is valid"),
-	);
+
+	// Set the max logging level for the `log` macros.
+	let max_level_hint =
+		tracing_subscriber::Layer::<tracing_subscriber::FmtSubscriber>::max_level_hint(&env_filter);
+	log::set_max_level(super::to_log_level_filter(max_level_hint));
+
 	log::debug!(target: "tracing", "Reloading log filter with: {}", env_filter);
 	FILTER_RELOAD_HANDLE
 		.get()
diff --git a/client/tracing/src/logging/mod.rs b/client/tracing/src/logging/mod.rs
index 1023879e3d7f..c3cc3e085101 100644
--- a/client/tracing/src/logging/mod.rs
+++ b/client/tracing/src/logging/mod.rs
@@ -70,6 +70,20 @@ macro_rules! enable_log_reloading {
 	}};
 }
 
+/// Convert a `Option<LevelFilter>` to a [`log::LevelFilter`].
+///
+/// `None` is interpreted as `Info`.
+fn to_log_level_filter(level_filter: Option<LevelFilter>) -> log::LevelFilter {
+	match level_filter {
+		Some(LevelFilter::INFO) | None => log::LevelFilter::Info,
+		Some(LevelFilter::TRACE) => log::LevelFilter::Trace,
+		Some(LevelFilter::WARN) => log::LevelFilter::Warn,
+		Some(LevelFilter::ERROR) => log::LevelFilter::Error,
+		Some(LevelFilter::DEBUG) => log::LevelFilter::Debug,
+		Some(LevelFilter::OFF) => log::LevelFilter::Off,
+	}
+}
+
 /// Common implementation to get the subscriber.
 fn prepare_subscriber<N, E, F, W>(
 	directives: &str,
@@ -134,15 +148,7 @@ where
 	}
 
 	let max_level_hint = Layer::<FmtSubscriber>::max_level_hint(&env_filter);
-
-	let max_level = match max_level_hint {
-		Some(LevelFilter::INFO) | None => log::LevelFilter::Info,
-		Some(LevelFilter::TRACE) => log::LevelFilter::Trace,
-		Some(LevelFilter::WARN) => log::LevelFilter::Warn,
-		Some(LevelFilter::ERROR) => log::LevelFilter::Error,
-		Some(LevelFilter::DEBUG) => log::LevelFilter::Debug,
-		Some(LevelFilter::OFF) => log::LevelFilter::Off,
-	};
+	let max_level = to_log_level_filter(max_level_hint);
 
 	tracing_log::LogTracer::builder()
 		.with_max_level(max_level)

From 6bfdabac50f85d6a95d3567a98523431398e6968 Mon Sep 17 00:00:00 2001
From: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
Date: Tue, 4 May 2021 15:57:32 +0200
Subject: [PATCH 0699/1194] implement BoundedEncodedLen (#8720)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* implement BoundedEncodedLen

* update header

* update imports

* use impl_for_tuples instead of a custom macro

* remove redundant where clause

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* impl for Compact<T>

* impl BoundedEncodedLen for BoundedVec (#8727)

* impl BoundedEncodedLen for bool

* explicitly implement BoundedEncodedLen for each Compact form

Turns out that u16 doesn't play nicely with the pattern; those values
take two extra bytes, where all other cases take one. :(

* rename BoundedEncodedLen -> MaxEncodedLen

* add tests of compact encoded length

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 frame/support/src/storage/bounded_vec.rs    |  17 ++-
 frame/support/src/traits.rs                 |   3 +
 frame/support/src/traits/max_encoded_len.rs | 132 ++++++++++++++++++++
 3 files changed, 151 insertions(+), 1 deletion(-)
 create mode 100644 frame/support/src/traits/max_encoded_len.rs

diff --git a/frame/support/src/storage/bounded_vec.rs b/frame/support/src/storage/bounded_vec.rs
index 5b253f76333b..f441ba39b884 100644
--- a/frame/support/src/storage/bounded_vec.rs
+++ b/frame/support/src/storage/bounded_vec.rs
@@ -23,7 +23,7 @@ use sp_std::{convert::TryFrom, marker::PhantomData};
 use codec::{FullCodec, Encode, EncodeLike, Decode};
 use core::{ops::{Index, IndexMut}, slice::SliceIndex};
 use crate::{
-	traits::Get,
+	traits::{Get, MaxEncodedLen},
 	storage::{generator, StorageDecodeLength, StorageValue, StorageMap, StorageDoubleMap},
 };
 
@@ -347,6 +347,21 @@ impl<
 	}
 }
 
+impl<T, S> MaxEncodedLen for BoundedVec<T, S>
+where
+	T: BoundedVecValue + MaxEncodedLen,
+	S: Get<u32>,
+	BoundedVec<T, S>: Encode,
+{
+	fn max_encoded_len() -> usize {
+		// BoundedVec<T, S> encodes like Vec<T> which encodes like [T], which is a compact u32
+		// plus each item in the slice:
+		// https://substrate.dev/rustdocs/v3.0.0/src/parity_scale_codec/codec.rs.html#798-808
+		codec::Compact::<u32>::max_encoded_len()
+			.saturating_add(Self::bound().saturating_mul(T::max_encoded_len()))
+	}
+}
+
 #[cfg(test)]
 pub mod test {
 	use super::*;
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index 7ee2b0a56094..d15356c1e1b0 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -80,3 +80,6 @@ pub use dispatch::{EnsureOrigin, OriginTrait, UnfilteredDispatchable};
 
 mod voting;
 pub use voting::{CurrencyToVote, SaturatingCurrencyToVote, U128CurrencyToVote};
+
+mod max_encoded_len;
+pub use max_encoded_len::MaxEncodedLen;
diff --git a/frame/support/src/traits/max_encoded_len.rs b/frame/support/src/traits/max_encoded_len.rs
new file mode 100644
index 000000000000..2cf9007d4d62
--- /dev/null
+++ b/frame/support/src/traits/max_encoded_len.rs
@@ -0,0 +1,132 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use codec::{Compact, Encode};
+use impl_trait_for_tuples::impl_for_tuples;
+use sp_std::{mem, marker::PhantomData};
+
+/// Items implementing `MaxEncodedLen` have a statically known maximum encoded size.
+///
+/// Some containers, such as `BoundedVec`, have enforced size limits and this trait
+/// can be implemented accurately. Other containers, such as `StorageMap`, do not have enforced size
+/// limits. For those containers, it is necessary to make a documented assumption about the maximum
+/// usage, and compute the max encoded length based on that assumption.
+pub trait MaxEncodedLen: Encode {
+	/// Upper bound, in bytes, of the maximum encoded size of this item.
+	fn max_encoded_len() -> usize;
+}
+
+macro_rules! impl_primitives {
+	( $($t:ty),+ ) => {
+		$(
+			impl MaxEncodedLen for $t {
+				fn max_encoded_len() -> usize {
+					mem::size_of::<$t>()
+				}
+			}
+		)+
+	};
+}
+
+impl_primitives!(u8, u16, u32, u64, u128, i8, i16, i32, i64, i128, bool);
+
+macro_rules! impl_compact {
+	($( $t:ty => $e:expr; )*) => {
+		$(
+			impl MaxEncodedLen for Compact<$t> {
+				fn max_encoded_len() -> usize {
+					$e
+				}
+			}
+		)*
+	};
+}
+
+impl_compact!(
+	// https://github.com/paritytech/parity-scale-codec/blob/f0341dabb01aa9ff0548558abb6dcc5c31c669a1/src/compact.rs#L261
+	u8 => 2;
+	// https://github.com/paritytech/parity-scale-codec/blob/f0341dabb01aa9ff0548558abb6dcc5c31c669a1/src/compact.rs#L291
+	u16 => 4;
+	// https://github.com/paritytech/parity-scale-codec/blob/f0341dabb01aa9ff0548558abb6dcc5c31c669a1/src/compact.rs#L326
+	u32 => 5;
+	// https://github.com/paritytech/parity-scale-codec/blob/f0341dabb01aa9ff0548558abb6dcc5c31c669a1/src/compact.rs#L369
+	u64 => 9;
+	// https://github.com/paritytech/parity-scale-codec/blob/f0341dabb01aa9ff0548558abb6dcc5c31c669a1/src/compact.rs#L413
+	u128 => 17;
+);
+
+// impl_for_tuples for values 19 and higher fails because that's where the WrapperTypeEncode impl stops.
+#[impl_for_tuples(18)]
+impl MaxEncodedLen for Tuple {
+	fn max_encoded_len() -> usize {
+		let mut len: usize = 0;
+		for_tuples!( #( len = len.saturating_add(Tuple::max_encoded_len()); )* );
+		len
+	}
+}
+
+impl<T: MaxEncodedLen, const N: usize> MaxEncodedLen for [T; N] {
+	fn max_encoded_len() -> usize {
+		T::max_encoded_len().saturating_mul(N)
+	}
+}
+
+impl<T: MaxEncodedLen> MaxEncodedLen for Option<T> {
+	fn max_encoded_len() -> usize {
+		T::max_encoded_len().saturating_add(1)
+	}
+}
+
+impl<T, E> MaxEncodedLen for Result<T, E>
+where
+	T: MaxEncodedLen,
+	E: MaxEncodedLen,
+{
+	fn max_encoded_len() -> usize {
+		T::max_encoded_len().max(E::max_encoded_len()).saturating_add(1)
+	}
+}
+
+impl<T> MaxEncodedLen for PhantomData<T> {
+	fn max_encoded_len() -> usize {
+		0
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+
+	macro_rules! test_compact_length {
+		($(fn $name:ident($t:ty);)*) => {
+			$(
+				#[test]
+				fn $name() {
+					assert_eq!(Compact(<$t>::MAX).encode().len(), Compact::<$t>::max_encoded_len());
+				}
+			)*
+		};
+	}
+
+	test_compact_length!(
+		fn compact_u8(u8);
+		fn compact_u16(u16);
+		fn compact_u32(u32);
+		fn compact_u64(u64);
+		fn compact_u128(u128);
+	);
+}

From 780fffbb4017d2d20e7d64236ba7c78f411b12af Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Tue, 4 May 2021 21:57:26 +0200
Subject: [PATCH 0700/1194] add test for store trait (#8711)

---
 frame/support/test/tests/pallet.rs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index 4944ded2dbec..3bde38c78e2c 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -509,6 +509,15 @@ fn instance_expand() {
 	let _: pallet::__InherentHiddenInstance = ();
 }
 
+#[test]
+fn trait_store_expand() {
+	TestExternalities::default().execute_with(|| {
+		<pallet::Pallet<Runtime> as pallet::Store>::Value::get();
+		<pallet::Pallet<Runtime> as pallet::Store>::Map::get(1);
+		<pallet::Pallet<Runtime> as pallet::Store>::DoubleMap::get(1, 2);
+	})
+}
+
 #[test]
 fn pallet_expand_deposit_event() {
 	TestExternalities::default().execute_with(|| {

From a604906c340c90e22fb20a8d77bcb3fee86c73c1 Mon Sep 17 00:00:00 2001
From: drewstone <drewstone329@gmail.com>
Date: Tue, 4 May 2021 23:22:42 +0300
Subject: [PATCH 0701/1194] Update lib.rs (#8730)

Make system migrations public.
---
 frame/system/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index bd6ef5eb5094..c3fe68842009 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -655,7 +655,7 @@ pub mod pallet {
 	}
 }
 
-mod migrations {
+pub mod migrations {
 	use super::*;
 
 	#[allow(dead_code)]

From a8ada8a654a1e50d855345d07f5f8f8cbce0a818 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 4 May 2021 23:57:18 +0200
Subject: [PATCH 0702/1194] Let the clone wars begin! (#8731)

Sprinkle some `Clone` onto the cli commands.
---
 client/cli/src/commands/build_spec_cmd.rs        | 2 +-
 client/cli/src/commands/check_block_cmd.rs       | 2 +-
 client/cli/src/commands/export_blocks_cmd.rs     | 2 +-
 client/cli/src/commands/export_state_cmd.rs      | 2 +-
 client/cli/src/commands/generate.rs              | 2 +-
 client/cli/src/commands/insert_key.rs            | 2 +-
 client/cli/src/commands/purge_chain_cmd.rs       | 2 +-
 client/cli/src/commands/run_cmd.rs               | 2 +-
 client/cli/src/commands/sign.rs                  | 2 +-
 client/cli/src/commands/vanity.rs                | 2 +-
 client/cli/src/commands/verify.rs                | 2 +-
 client/cli/src/params/database_params.rs         | 2 +-
 client/cli/src/params/import_params.rs           | 4 ++--
 client/cli/src/params/keystore_params.rs         | 2 +-
 client/cli/src/params/mod.rs                     | 8 ++++----
 client/cli/src/params/network_params.rs          | 2 +-
 client/cli/src/params/node_key_params.rs         | 2 +-
 client/cli/src/params/offchain_worker_params.rs  | 2 +-
 client/cli/src/params/pruning_params.rs          | 2 +-
 client/cli/src/params/shared_params.rs           | 2 +-
 client/cli/src/params/transaction_pool_params.rs | 2 +-
 21 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/client/cli/src/commands/build_spec_cmd.rs b/client/cli/src/commands/build_spec_cmd.rs
index 3d66e752b81e..78ad3b64724d 100644
--- a/client/cli/src/commands/build_spec_cmd.rs
+++ b/client/cli/src/commands/build_spec_cmd.rs
@@ -27,7 +27,7 @@ use structopt::StructOpt;
 use std::io::Write;
 
 /// The `build-spec` command used to build a specification.
-#[derive(Debug, StructOpt)]
+#[derive(Debug, StructOpt, Clone)]
 pub struct BuildSpecCmd {
 	/// Force raw genesis storage output.
 	#[structopt(long = "raw")]
diff --git a/client/cli/src/commands/check_block_cmd.rs b/client/cli/src/commands/check_block_cmd.rs
index 74e2d34f975b..a47245de0f78 100644
--- a/client/cli/src/commands/check_block_cmd.rs
+++ b/client/cli/src/commands/check_block_cmd.rs
@@ -25,7 +25,7 @@ use std::{fmt::Debug, str::FromStr, sync::Arc};
 use structopt::StructOpt;
 
 /// The `check-block` command used to validate blocks.
-#[derive(Debug, StructOpt)]
+#[derive(Debug, StructOpt, Clone)]
 pub struct CheckBlockCmd {
 	/// Block hash or number
 	#[structopt(value_name = "HASH or NUMBER")]
diff --git a/client/cli/src/commands/export_blocks_cmd.rs b/client/cli/src/commands/export_blocks_cmd.rs
index 55f05d9d7f30..4153c80a0545 100644
--- a/client/cli/src/commands/export_blocks_cmd.rs
+++ b/client/cli/src/commands/export_blocks_cmd.rs
@@ -34,7 +34,7 @@ use std::sync::Arc;
 use structopt::StructOpt;
 
 /// The `export-blocks` command used to export blocks.
-#[derive(Debug, StructOpt)]
+#[derive(Debug, StructOpt, Clone)]
 pub struct ExportBlocksCmd {
 	/// Output file name or stdout if unspecified.
 	#[structopt(parse(from_os_str))]
diff --git a/client/cli/src/commands/export_state_cmd.rs b/client/cli/src/commands/export_state_cmd.rs
index 2211b3131a01..e154c3a50221 100644
--- a/client/cli/src/commands/export_state_cmd.rs
+++ b/client/cli/src/commands/export_state_cmd.rs
@@ -27,7 +27,7 @@ use sc_client_api::{StorageProvider, UsageProvider};
 
 /// The `export-state` command used to export the state of a given block into
 /// a chain spec.
-#[derive(Debug, StructOpt)]
+#[derive(Debug, StructOpt, Clone)]
 pub struct ExportStateCmd {
 	/// Block hash or number.
 	#[structopt(value_name = "HASH or NUMBER")]
diff --git a/client/cli/src/commands/generate.rs b/client/cli/src/commands/generate.rs
index 08b5f2077236..42214d2f5e45 100644
--- a/client/cli/src/commands/generate.rs
+++ b/client/cli/src/commands/generate.rs
@@ -24,7 +24,7 @@ use crate::{
 };
 
 /// The `generate` command
-#[derive(Debug, StructOpt)]
+#[derive(Debug, StructOpt, Clone)]
 #[structopt(name = "generate", about = "Generate a random account")]
 pub struct GenerateCmd {
 	/// The number of words in the phrase to generate. One of 12 (default), 15, 18, 21 and 24.
diff --git a/client/cli/src/commands/insert_key.rs b/client/cli/src/commands/insert_key.rs
index 6e4324deed04..f166db85c156 100644
--- a/client/cli/src/commands/insert_key.rs
+++ b/client/cli/src/commands/insert_key.rs
@@ -29,7 +29,7 @@ use sc_keystore::LocalKeystore;
 use sc_service::config::{KeystoreConfig, BasePath};
 
 /// The `insert` command
-#[derive(Debug, StructOpt)]
+#[derive(Debug, StructOpt, Clone)]
 #[structopt(
 	name = "insert",
 	about = "Insert a key to the keystore of a node."
diff --git a/client/cli/src/commands/purge_chain_cmd.rs b/client/cli/src/commands/purge_chain_cmd.rs
index 1902d92e6345..c61e21a6a5ad 100644
--- a/client/cli/src/commands/purge_chain_cmd.rs
+++ b/client/cli/src/commands/purge_chain_cmd.rs
@@ -26,7 +26,7 @@ use std::io::{self, Write};
 use structopt::StructOpt;
 
 /// The `purge-chain` command used to remove the whole chain.
-#[derive(Debug, StructOpt)]
+#[derive(Debug, StructOpt, Clone)]
 pub struct PurgeChainCmd {
 	/// Skip interactive prompt by answering yes automatically.
 	#[structopt(short = "y")]
diff --git a/client/cli/src/commands/run_cmd.rs b/client/cli/src/commands/run_cmd.rs
index bb6f77819d7a..9ef14cfa02b8 100644
--- a/client/cli/src/commands/run_cmd.rs
+++ b/client/cli/src/commands/run_cmd.rs
@@ -35,7 +35,7 @@ use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 use structopt::StructOpt;
 
 /// The `run` command used to run a node.
-#[derive(Debug, StructOpt)]
+#[derive(Debug, StructOpt, Clone)]
 pub struct RunCmd {
 	/// Enable validator mode.
 	///
diff --git a/client/cli/src/commands/sign.rs b/client/cli/src/commands/sign.rs
index a39e14697b99..5d487861428f 100644
--- a/client/cli/src/commands/sign.rs
+++ b/client/cli/src/commands/sign.rs
@@ -22,7 +22,7 @@ use structopt::StructOpt;
 use sp_core::crypto::SecretString;
 
 /// The `sign` command
-#[derive(Debug, StructOpt)]
+#[derive(Debug, StructOpt, Clone)]
 #[structopt(
 	name = "sign",
 	about = "Sign a message, with a given (secret) key"
diff --git a/client/cli/src/commands/vanity.rs b/client/cli/src/commands/vanity.rs
index da47e8bb26cc..ce1f079db878 100644
--- a/client/cli/src/commands/vanity.rs
+++ b/client/cli/src/commands/vanity.rs
@@ -29,7 +29,7 @@ use sp_runtime::traits::IdentifyAccount;
 use utils::print_from_uri;
 
 /// The `vanity` command
-#[derive(Debug, StructOpt)]
+#[derive(Debug, StructOpt, Clone)]
 #[structopt(
 	name = "vanity",
 	about = "Generate a seed that provides a vanity address"
diff --git a/client/cli/src/commands/verify.rs b/client/cli/src/commands/verify.rs
index f5bd5a06060c..c6ce3ef9d69c 100644
--- a/client/cli/src/commands/verify.rs
+++ b/client/cli/src/commands/verify.rs
@@ -23,7 +23,7 @@ use sp_core::{Public, crypto::Ss58Codec};
 use structopt::StructOpt;
 
 /// The `verify` command
-#[derive(Debug, StructOpt)]
+#[derive(Debug, StructOpt, Clone)]
 #[structopt(
 	name = "verify",
 	about = "Verify a signature for a message, provided on STDIN, with a given (public or secret) key"
diff --git a/client/cli/src/params/database_params.rs b/client/cli/src/params/database_params.rs
index 3d5aca10d581..d468f1555556 100644
--- a/client/cli/src/params/database_params.rs
+++ b/client/cli/src/params/database_params.rs
@@ -21,7 +21,7 @@ use structopt::StructOpt;
 use sc_service::TransactionStorageMode;
 
 /// Parameters for block import.
-#[derive(Debug, StructOpt)]
+#[derive(Debug, StructOpt, Clone)]
 pub struct DatabaseParams {
 	/// Select database backend to use.
 	#[structopt(
diff --git a/client/cli/src/params/import_params.rs b/client/cli/src/params/import_params.rs
index 7409dbf79dc0..a1d8c1f8834c 100644
--- a/client/cli/src/params/import_params.rs
+++ b/client/cli/src/params/import_params.rs
@@ -28,7 +28,7 @@ use structopt::StructOpt;
 use std::path::PathBuf;
 
 /// Parameters for block import.
-#[derive(Debug, StructOpt)]
+#[derive(Debug, StructOpt, Clone)]
 pub struct ImportParams {
 	#[allow(missing_docs)]
 	#[structopt(flatten)]
@@ -125,7 +125,7 @@ impl ImportParams {
 }
 
 /// Execution strategies parameters.
-#[derive(Debug, StructOpt)]
+#[derive(Debug, StructOpt, Clone)]
 pub struct ExecutionStrategiesParams {
 	/// The means of execution used when calling into the runtime for importing blocks as
 	/// part of an initial sync.
diff --git a/client/cli/src/params/keystore_params.rs b/client/cli/src/params/keystore_params.rs
index d75cdebc5a56..2975c9bf5041 100644
--- a/client/cli/src/params/keystore_params.rs
+++ b/client/cli/src/params/keystore_params.rs
@@ -27,7 +27,7 @@ use sp_core::crypto::SecretString;
 const DEFAULT_KEYSTORE_CONFIG_PATH: &'static str = "keystore";
 
 /// Parameters of the keystore
-#[derive(Debug, StructOpt)]
+#[derive(Debug, StructOpt, Clone)]
 pub struct KeystoreParams {
 	/// Specify custom URIs to connect to for keystore-services
 	#[structopt(long = "keystore-uri")]
diff --git a/client/cli/src/params/mod.rs b/client/cli/src/params/mod.rs
index 8308b123f71f..0769e5a87adc 100644
--- a/client/cli/src/params/mod.rs
+++ b/client/cli/src/params/mod.rs
@@ -75,7 +75,7 @@ impl GenericNumber {
 }
 
 /// Wrapper type that is either a `Hash` or the number of a `Block`.
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct BlockNumberOrHash(String);
 
 impl FromStr for BlockNumberOrHash {
@@ -119,7 +119,7 @@ impl BlockNumberOrHash {
 
 
 /// Optional flag for specifying crypto algorithm
-#[derive(Debug, StructOpt)]
+#[derive(Debug, StructOpt, Clone)]
 pub struct CryptoSchemeFlag {
 	/// cryptography scheme
 	#[structopt(
@@ -133,7 +133,7 @@ pub struct CryptoSchemeFlag {
 }
 
 /// Optional flag for specifying output type
-#[derive(Debug, StructOpt)]
+#[derive(Debug, StructOpt, Clone)]
 pub struct OutputTypeFlag {
 	/// output format
 	#[structopt(
@@ -147,7 +147,7 @@ pub struct OutputTypeFlag {
 }
 
 /// Optional flag for specifying network scheme
-#[derive(Debug, StructOpt)]
+#[derive(Debug, StructOpt, Clone)]
 pub struct NetworkSchemeFlag {
 	/// network address format
 	#[structopt(
diff --git a/client/cli/src/params/network_params.rs b/client/cli/src/params/network_params.rs
index d4dcd6ebaa79..7549c76378be 100644
--- a/client/cli/src/params/network_params.rs
+++ b/client/cli/src/params/network_params.rs
@@ -26,7 +26,7 @@ use std::{borrow::Cow, path::PathBuf};
 use structopt::StructOpt;
 
 /// Parameters used to create the network configuration.
-#[derive(Debug, StructOpt)]
+#[derive(Debug, StructOpt, Clone)]
 pub struct NetworkParams {
 	/// Specify a list of bootnodes.
 	#[structopt(long = "bootnodes", value_name = "ADDR")]
diff --git a/client/cli/src/params/node_key_params.rs b/client/cli/src/params/node_key_params.rs
index d43c87804dd3..d5823341aa69 100644
--- a/client/cli/src/params/node_key_params.rs
+++ b/client/cli/src/params/node_key_params.rs
@@ -31,7 +31,7 @@ const NODE_KEY_ED25519_FILE: &str = "secret_ed25519";
 
 /// Parameters used to create the `NodeKeyConfig`, which determines the keypair
 /// used for libp2p networking.
-#[derive(Debug, StructOpt)]
+#[derive(Debug, StructOpt, Clone)]
 pub struct NodeKeyParams {
 	/// The secret key to use for libp2p networking.
 	///
diff --git a/client/cli/src/params/offchain_worker_params.rs b/client/cli/src/params/offchain_worker_params.rs
index b41a5d562526..a6d65e4027a2 100644
--- a/client/cli/src/params/offchain_worker_params.rs
+++ b/client/cli/src/params/offchain_worker_params.rs
@@ -31,7 +31,7 @@ use crate::error;
 use crate::OffchainWorkerEnabled;
 
 /// Offchain worker related parameters.
-#[derive(Debug, StructOpt)]
+#[derive(Debug, StructOpt, Clone)]
 pub struct OffchainWorkerParams {
 	/// Should execute offchain workers on every block.
 	///
diff --git a/client/cli/src/params/pruning_params.rs b/client/cli/src/params/pruning_params.rs
index 987b8527e6fa..32abaa9a755b 100644
--- a/client/cli/src/params/pruning_params.rs
+++ b/client/cli/src/params/pruning_params.rs
@@ -21,7 +21,7 @@ use sc_service::{PruningMode, Role, KeepBlocks};
 use structopt::StructOpt;
 
 /// Parameters to define the pruning mode
-#[derive(Debug, StructOpt)]
+#[derive(Debug, StructOpt, Clone)]
 pub struct PruningParams {
 	/// Specify the state pruning mode, a number of blocks to keep or 'archive'.
 	///
diff --git a/client/cli/src/params/shared_params.rs b/client/cli/src/params/shared_params.rs
index 45ce41846bf1..c0317c280a9d 100644
--- a/client/cli/src/params/shared_params.rs
+++ b/client/cli/src/params/shared_params.rs
@@ -22,7 +22,7 @@ use structopt::StructOpt;
 use crate::arg_enums::TracingReceiver;
 
 /// Shared parameters used by all `CoreParams`.
-#[derive(Debug, StructOpt)]
+#[derive(Debug, StructOpt, Clone)]
 pub struct SharedParams {
 	/// Specify the chain specification.
 	///
diff --git a/client/cli/src/params/transaction_pool_params.rs b/client/cli/src/params/transaction_pool_params.rs
index bf0ed53e531c..feea19c97c2d 100644
--- a/client/cli/src/params/transaction_pool_params.rs
+++ b/client/cli/src/params/transaction_pool_params.rs
@@ -20,7 +20,7 @@ use sc_service::config::TransactionPoolOptions;
 use structopt::StructOpt;
 
 /// Parameters used to create the pool configuration.
-#[derive(Debug, StructOpt)]
+#[derive(Debug, StructOpt, Clone)]
 pub struct TransactionPoolParams {
 	/// Maximum number of transactions in the transaction pool.
 	#[structopt(long = "pool-limit", value_name = "COUNT", default_value = "8192")]

From aba876001651506f85c14baf26e006b36092e1a0 Mon Sep 17 00:00:00 2001
From: mattrutherford <44339188+mattrutherford@users.noreply.github.com>
Date: Wed, 5 May 2021 08:44:36 +0100
Subject: [PATCH 0703/1194] RPC to trace execution of specified block (#7780)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add filter reload handle

* add RPC, move logging module from cli to tracing

* remove dup fn

* working example

* Update client/rpc-api/src/system/mod.rs

Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>

* Prefer "set" to "reload"

* Re-enable the commented out features of the logger

* Remove duplicate code

* cleanup

* unneeded lvar

* Bump to latest patch release

* Add new CLI option to disable log filter reloading,

Move profiling CLI options to SharedParams

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Applied suggestions from reviews

* Fix calls to init_logger()

* Handle errors when parsing logging directives

* Deny `system_setLogFilter` RPC by default

* One more time

* Don't ignore parse errors for log directives set via CLI or RPC

* Improve docs

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/cli/src/config.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* fix merge errors

* include default directives with system_setLogFilter RPC,

implement system_rawSetLogFilter RPC to exclude defaults

* docs etc...

* update test

* refactor: rename fn

* Add a test for system_set_log_filter – NOTE: the code should likely change to return an error when bad directives are passed

* Update client/cli/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Address review grumbles

* Add doc note on panicking behaviour

* print all invalid directives before panic

* change RPCs to: addLogFilter and resetLogFilter

* make CLI log directives default

* add comments

* restore previous behaviour to panic when hard-coded directives are invalid

* change/refactor directive parsing

* fix line width

* add test for log filter reloading

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* finish up suggestions from code review

* improve test

* change expect message

* change fn name

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* add docs, remove unused fn

* propagate Err on invalid log directive

* Update tracing-subscriber version

* Improve docs for `disable_log_reloading` CLI param

* WIP implementation: RPC and trace capturing

* WIP

* fix incorrect number of digest items

* return errors

* add From impl for Values, rename structs

* fixes

* implement option to choose targets for traces

* rename fn

* fix EnvFilter and add root span

* fix root span

* add docs, remove unnecessary traits

* fix regression on parent_id introduced in 83284b9fd9e85657b031ee263bfae9d1141e027b

* fix line width

* remove unused

* include block hash, parent hash & targets in response

* move types from sp-tracing into sp-rpc

move block and parent hash into root of BlockTrace

* switch from log::trace to tracing::trace in state-machine

* use unsigned integer type to represent Ext::id in traces

* ensure id is unique by implementing Subscriber

tracing_subscriber::FmtSubscriber does not guarantee
unique ids

* indentation

* fix typo

* update types

* add sp_io::storage events

* Change response format

- update types
- record distinct timestamps
- sort spans by first entered

* convert to HexDisplay, refactor

* Sort out fallout from merge

* Update client/rpc-api/src/state/mod.rs

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Exit early unless the node runs with --rpc-methods=Unsafe

* Better error handling

* Use wasm-timer

* revert trace alteration in `state-machine` and remove events in `sp_io::storage`

Resolve in follow-up PR

* Review feedback: less collects

* Without Arcs

* Fix span exit

* typo

* cleanup

* Add a few debug messages to tracing module

* Structure traces state-machine/ext; Dispatchable extrinsics spans not working

* Correctly encode Option storage values

* Remove test field for Put and Get

* Try out some changes to dispatch macro

* Add various log messages in dispatch

* Add span dispatch span to new proc macro

* Remove debug messages in dispatch

* Trivial clean up

* Structure remaining state-machine traces (ChangesRoot*)

* Removed unnesecary tracing targets

* Remove log

* New cargo.lock post merge

* Add logging for wasm_overrides

* remove temp logs

* remove temp logs

* remove unused dep

* remove temp logs

* add logging to wasm_overrides

* add logging to state_tracing

* add logging for spans to substrate (includes timings)

* Skip serializing some event fields; Remove most storage traces

* Bring back all ext.rs traces

* Do not skip bool values in events

* Skip serializing span values

* Serialize span values; remove some trace events in ext

* Remove more trace events

* Delete commented out traces

* Remove all unused traces

* Add event filtering

* Fix typo

* wip - change response types to be more efficient

missing import

type

* Serialize struct fields as camelCase

* Add back in event filtering

* Remove name field from event

* Sort spans by time entered

* Sort spans in ASCending order

* Add storage keys target param to rpc

* Limit payload size; improve hash fields; include storage keys

- cleanup event_key_filter
- better block hash representation
- limit payload size
- cleanup based on andrews comments

* Error when serialized payload is to big

* Import MAX_PAYLOAD from rpc-servers

* Clean up ext.rs

* Misc. cleaning and comments

* Strict ordering span Id; no span sort; adjust for rpc base payload

* Add RPC docs to rpc-api/src/state/mod

* Make params bullet points

* Update primitives/rpc/src/tracing.rs

* Put all tracing logic within trace

* Remove attr.record in new_span

* Add back value record in new_span

* restore result collection in ext

* Revert "Add back value record in new_span"

This reverts commit baf1a735f23e5eef1bf6264adfabb788910fa661.

* 🤦

* more 🤦

* Update docs; Try fix line width issues

* Improve docs

* Improve docs

* Remove default key filters + add key recs to docs

* Try restore old traces

* Add back doc comment

* Clean up newlines in ext.rs

* More new line remova;
l

* Use FxHashMap

* Try use EnvFilter directives for event filtering

* Remove directive, filter events by fields

* Use trace metadata correctly

* Try EnvFilter directive with all default targets

* Revert "Try EnvFilter directive with all default targets"

This reverts commit 4cc6ebc721d207c3b846444174f89d45038525ac.

* Clean up clippy warning

* Incorporate Niklas feedback

* Update trace/log macro calls to have better syntx

* Use Ordering::Relaxed

* Improve patch and filter doc comment

* Clean up `BlockSubscriber::new`

* Try optimize `BlockSubscriber::enabled`

* Apply suggestions from code review

Co-authored-by: David <dvdplm@gmail.com>

* Apply suggestions from code review

Co-authored-by: David <dvdplm@gmail.com>

* Use contains_key

* use heuristic for payload size

* Add error tupe for client::tracing::block

* Minor tweaks

* Make a note about `--features with-tracing`

* Add CURL example to RPC docs

* Link to substrate-archibe wasm

* Trivial doc clean up based on David feedback

* Explicit result type name

* Respect line length

* Use the error

* Don't print timings when spans close

* Fix failing sc-rpc-api

* Update  sp-tracing inner-line doc

* Update client/tracing/src/block/mod.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/service/src/client/call_executor.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/service/src/client/call_executor.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/tracing/src/block/mod.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/tracing/src/block/mod.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Address some review grumbles

* Update primitives/state-machine/src/ext.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Use result_encoded structure fields in ext.rs

* Use value key for ext put

* Add notes about tracing key names matter

Co-authored-by: Matt <mattrutherford@users.noreply.github.com>
Co-authored-by: David <dvdplm@gmail.com>
Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: emostov <32168567+emostov@users.noreply.github.com>
---
 Cargo.lock                                 |  35 ++-
 client/rpc-api/Cargo.toml                  |   1 +
 client/rpc-api/src/state/mod.rs            | 114 +++++++
 client/rpc-servers/src/lib.rs              |   2 +-
 client/rpc/Cargo.toml                      |   1 +
 client/rpc/src/state/mod.rs                |  34 ++-
 client/rpc/src/state/state_full.rs         |  34 ++-
 client/rpc/src/state/state_light.rs        |   9 +
 client/rpc/src/system/mod.rs               |   1 +
 client/service/src/client/call_executor.rs |  15 +-
 client/service/src/client/wasm_override.rs |  12 +
 client/tracing/Cargo.toml                  |  14 +-
 client/tracing/src/block/mod.rs            | 338 +++++++++++++++++++++
 client/tracing/src/lib.rs                  |  52 +++-
 client/tracing/src/logging/mod.rs          |   3 +
 primitives/rpc/Cargo.toml                  |   2 +
 primitives/rpc/src/lib.rs                  |   1 +
 primitives/rpc/src/tracing.rs              |  98 ++++++
 primitives/state-machine/Cargo.toml        |   2 +
 primitives/state-machine/src/ext.rs        |  39 ++-
 primitives/state-machine/src/lib.rs        |   4 +-
 primitives/tracing/Cargo.toml              |  10 +
 primitives/tracing/README.md               |   2 +-
 primitives/tracing/src/lib.rs              |  44 +--
 primitives/tracing/src/types.rs            |   2 -
 25 files changed, 803 insertions(+), 66 deletions(-)
 create mode 100644 client/tracing/src/block/mod.rs
 create mode 100644 primitives/rpc/src/tracing.rs

diff --git a/Cargo.lock b/Cargo.lock
index 34c2d93102b3..4f7bce5aaa3c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7777,6 +7777,7 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-state-machine",
+ "sp-tracing",
  "sp-transaction-pool",
  "sp-utils",
  "sp-version",
@@ -7803,6 +7804,7 @@ dependencies = [
  "sp-core",
  "sp-rpc",
  "sp-runtime",
+ "sp-tracing",
  "sp-transaction-pool",
  "sp-version",
 ]
@@ -8009,16 +8011,26 @@ dependencies = [
  "parking_lot 0.11.1",
  "regex",
  "rustc-hash",
+ "sc-client-api",
+ "sc-rpc-server",
+ "sc-telemetry",
  "sc-tracing-proc-macro",
  "serde",
  "serde_json",
+ "sp-api",
+ "sp-block-builder",
+ "sp-blockchain",
+ "sp-core",
+ "sp-rpc",
+ "sp-runtime",
+ "sp-storage",
  "sp-tracing",
  "thiserror",
  "tracing",
- "tracing-core",
  "tracing-log",
  "tracing-subscriber",
  "wasm-bindgen",
+ "wasm-timer",
  "web-sys",
 ]
 
@@ -8408,6 +8420,15 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 
+[[package]]
+name = "slog"
+version = "2.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8347046d4ebd943127157b94d63abb990fcf729dc4e9978927fdf4ac3c998d06"
+dependencies = [
+ "erased-serde",
+]
+
 [[package]]
 name = "smallvec"
 version = "0.6.14"
@@ -8971,9 +8992,11 @@ dependencies = [
 name = "sp-rpc"
 version = "3.0.0"
 dependencies = [
+ "rustc-hash",
  "serde",
  "serde_json",
  "sp-core",
+ "tracing-core",
 ]
 
 [[package]]
@@ -9135,6 +9158,7 @@ dependencies = [
  "sp-std",
  "sp-trie",
  "thiserror",
+ "tracing",
  "trie-db",
  "trie-root",
 ]
@@ -9200,8 +9224,13 @@ dependencies = [
 name = "sp-tracing"
 version = "3.0.0"
 dependencies = [
+ "erased-serde",
  "log",
  "parity-scale-codec",
+ "parking_lot 0.10.2",
+ "serde",
+ "serde_json",
+ "slog",
  "sp-std",
  "tracing",
  "tracing-core",
@@ -10206,9 +10235,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.13"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8a9bd1db7706f2373a190b0d067146caa39350c486f3d455b0e33b431f94c07"
+checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/client/rpc-api/Cargo.toml b/client/rpc-api/Cargo.toml
index d213decdbc77..662f4bd16fd4 100644
--- a/client/rpc-api/Cargo.toml
+++ b/client/rpc-api/Cargo.toml
@@ -30,3 +30,4 @@ serde = { version = "1.0.101", features = ["derive"] }
 serde_json = "1.0.41"
 sp-transaction-pool = { version = "3.0.0", path = "../../primitives/transaction-pool" }
 sp-rpc = { version = "3.0.0", path = "../../primitives/rpc" }
+sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
diff --git a/client/rpc-api/src/state/mod.rs b/client/rpc-api/src/state/mod.rs
index aae2dcb5ae7d..0ebc553b4117 100644
--- a/client/rpc-api/src/state/mod.rs
+++ b/client/rpc-api/src/state/mod.rs
@@ -136,4 +136,118 @@ pub trait StateApi<Hash> {
 	fn unsubscribe_storage(
 		&self, metadata: Option<Self::Metadata>, id: SubscriptionId
 	) -> RpcResult<bool>;
+
+	/// The `state_traceBlock` RPC provides a way to trace the re-execution of a single
+	/// block, collecting Spans and Events from both the client and the relevant WASM runtime.
+	/// The Spans and Events are conceptually equivalent to those from the [Tracing][1] crate.
+	///
+	/// The structure of the traces follows that of the block execution pipeline, so meaningful
+	/// interpretation of the traces requires an understanding of the Substrate chain's block
+	/// execution.
+	///
+	/// [Link to conceptual map of trace structure for Polkadot and Kusama block execution.][2]
+	///
+	/// [1]: https://crates.io/crates/tracing
+	/// [2]: https://docs.google.com/drawings/d/1vZoJo9jaXlz0LmrdTOgHck9_1LsfuQPRmTr-5g1tOis/edit?usp=sharing
+	///
+	/// ## Node requirements
+	///
+	/// - Fully synced archive node (i.e. a node that is not actively doing a "major" sync).
+	/// - [Tracing enabled WASM runtimes](#creating-tracing-enabled-wasm-runtimes) for all runtime versions
+	/// for which tracing is desired.
+	///
+	/// ## Node recommendations
+	///
+	/// - Use fast SSD disk storage.
+	/// - Run node flags to increase DB read speed (i.e. `--state-cache-size`, `--db-cache`).
+	///
+	/// ## Creating tracing enabled WASM runtimes
+	///
+	/// - Checkout commit of chain version to compile with WASM traces
+	/// - [diener][1] can help to peg commit of substrate to what the chain expects.
+	/// - Navigate to the `runtime` folder/package of the chain
+	/// - Add feature `with-tracing = ["frame-executive/with-tracing", "sp-io/with-tracing"]`
+	/// under `[features]` to the `runtime` packages' `Cargo.toml`.
+	/// - Compile the runtime with `cargo build --release --features with-tracing`
+	/// - Tracing-enabled WASM runtime should be found in `./target/release/wbuild/{{chain}}-runtime`
+	/// and be called something like `{{your_chain}}_runtime.compact.wasm`. This can be
+	/// renamed/modified however you like, as long as it retains the `.wasm` extension.
+	/// - Run the node with the wasm blob overrides by placing them in a folder with all your runtimes,
+	/// and passing the path of this folder to your chain, e.g.:
+	/// 	- `./target/release/polkadot --wasm-runtime-overrides /home/user/my-custom-wasm-runtimes`
+	///
+	/// You can also find some pre-built tracing enabled wasm runtimes in [substrate-archive][2]
+	///
+	/// [Source.][3]
+	///
+	/// [1]: https://crates.io/crates/diener
+	/// [2]: https://github.com/paritytech/substrate-archive/tree/master/wasm-tracing
+	/// [3]: https://github.com/paritytech/substrate-archive/wiki
+	///
+	/// ## RPC Usage
+	///
+	/// The RPC allows for two filtering mechanisms: tracing targets and storage key prefixes.
+	/// The filtering of spans and events takes place after they are all collected; so while filters
+	/// do not reduce time for actual block re-execution, they reduce the response payload size.
+	///
+	/// Note: storage events primarily come from _primitives/state-machine/src/ext.rs_.
+	/// The default filters can be overridden, see the [params section](#params) for details.
+	///
+	/// ### `curl` example
+	///
+	/// ```text
+	/// curl \
+	/// 	-H "Content-Type: application/json" \
+	/// 	-d '{"id":1, "jsonrpc":"2.0", "method": "state_traceBlock", \
+	///		"params": ["0xb246acf1adea1f801ce15c77a5fa7d8f2eb8fed466978bcee172cc02cf64e264"]}' \
+	/// 	http://localhost:9933/
+	/// ```
+	///
+	/// ### Params
+	///
+	/// - `block_hash` (param index 0): Hash of the block to trace.
+	/// - `targets` (param index 1): String of comma separated (no spaces) targets. Specified
+	/// 	targets match with trace targets by prefix (i.e if a target is in the beginning
+	/// 	of a trace target it is considered a match). If an empty string is specified no
+	/// 	targets will be filtered out. The majority of targets correspond to Rust module names,
+	/// 	and the ones that do not are typically "hardcoded" into span or event location
+	/// 	somewhere in the Substrate source code. ("Non-hardcoded" targets typically come from frame
+	/// 	support macros.)
+	/// - `storage_keys` (param index 2): String of comma separated (no spaces) hex encoded
+	/// 	(no `0x` prefix) storage keys. If an empty string is specified no events will
+	/// 	be filtered out. If anything other than an empty string is specified, events
+	/// 	will be filtered by storage key (so non-storage events will **not** show up).
+	/// 	You can specify any length of a storage key prefix (i.e. if a specified storage
+	/// 	key is in the beginning of an events storage key it is considered a match).
+	/// 	Example: for balance tracking on Polkadot & Kusama you would likely want
+	///		to track changes to account balances with the frame_system::Account storage item,
+	///		which is a map from `AccountId` to `AccountInfo`. The key filter for this would be
+	///		the storage prefix for the map:
+	///		`26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da9`
+	/// 	Additionally you would want to track the extrinsic index, which is under the
+	///		`:extrinsic_index` key. The key for this would be the aforementioned string as bytes
+	///		in hex: `3a65787472696e7369635f696e646578`.
+	///		The following are some resources to learn more about storage keys in substrate:
+	///		[substrate storage][1], [transparent keys in substrate][2],
+	///		[querying substrate storage via rpc][3].
+	///
+	///		[1]: https://substrate.dev/docs/en/knowledgebase/advanced/storage#storage-map-key
+	///		[2]: https://www.shawntabrizi.com/substrate/transparent-keys-in-substrate/
+	///		[3]: https://www.shawntabrizi.com/substrate/querying-substrate-storage-via-rpc/
+	///
+	/// ### Maximum payload size
+	///
+	/// The maximum payload size allowed is 15mb. Payloads over this size will return a
+	/// object with a simple error message. If you run into issues with payload size you can
+	/// narrow down the traces using a smaller set of targets and/or storage keys.
+	///
+	/// If you are having issues with maximum payload size you can use the flag
+	/// `-lstate_tracing=trace` to get some logging during tracing.
+	#[rpc(name = "state_traceBlock")]
+	fn trace_block(
+		&self,
+		block: Hash,
+		targets: Option<String>,
+		storage_keys: Option<String>,
+	) -> FutureResult<sp_rpc::tracing::TraceBlockResponse>;
 }
diff --git a/client/rpc-servers/src/lib.rs b/client/rpc-servers/src/lib.rs
index 26d3cb1b7816..be6abea67b05 100644
--- a/client/rpc-servers/src/lib.rs
+++ b/client/rpc-servers/src/lib.rs
@@ -28,7 +28,7 @@ use log::error;
 use pubsub::PubSubMetadata;
 
 /// Maximal payload accepted by RPC servers.
-const MAX_PAYLOAD: usize = 15 * 1024 * 1024;
+pub const MAX_PAYLOAD: usize = 15 * 1024 * 1024;
 
 /// Default maximum number of connections for WS RPC servers.
 const WS_MAX_CONNECTIONS: usize = 100;
diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml
index 203bb0e525d8..a352e5fc387b 100644
--- a/client/rpc/Cargo.toml
+++ b/client/rpc/Cargo.toml
@@ -41,6 +41,7 @@ sc-tracing = { version = "3.0.0", path = "../tracing" }
 hash-db = { version = "0.15.2", default-features = false }
 parking_lot = "0.11.1"
 lazy_static = { version = "1.4.0", optional = true }
+sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
 
 [dev-dependencies]
 assert_matches = "1.3.0"
diff --git a/client/rpc/src/state/mod.rs b/client/rpc/src/state/mod.rs
index a3d83ae250d0..dc36c2f561e5 100644
--- a/client/rpc/src/state/mod.rs
+++ b/client/rpc/src/state/mod.rs
@@ -40,7 +40,9 @@ use self::error::{Error, FutureResult};
 
 pub use sc_rpc_api::state::*;
 pub use sc_rpc_api::child_state::*;
-use sc_client_api::{ExecutorProvider, StorageProvider, BlockchainEvents, Backend, ProofProvider};
+use sc_client_api::{
+	ExecutorProvider, StorageProvider, BlockchainEvents, Backend, BlockBackend, ProofProvider
+};
 use sp_blockchain::{HeaderMetadata, HeaderBackend};
 
 const STORAGE_KEYS_PAGED_MAX_COUNT: u32 = 1000;
@@ -165,6 +167,14 @@ pub trait StateBackend<Block: BlockT, Client>: Send + Sync + 'static
 		_meta: Option<crate::Metadata>,
 		id: SubscriptionId,
 	) -> RpcResult<bool>;
+
+	/// Trace storage changes for block
+	fn trace_block(
+		&self,
+		block: Block::Hash,
+		targets: Option<String>,
+		storage_keys: Option<String>,
+	) -> FutureResult<sp_rpc::tracing::TraceBlockResponse>;
 }
 
 /// Create new state API that works on full node.
@@ -176,9 +186,10 @@ pub fn new_full<BE, Block: BlockT, Client>(
 	where
 		Block: BlockT + 'static,
 		BE: Backend<Block> + 'static,
-		Client: ExecutorProvider<Block> + StorageProvider<Block, BE> + ProofProvider<Block> + HeaderBackend<Block>
+		Client: ExecutorProvider<Block> + StorageProvider<Block, BE> + ProofProvider<Block>
 			+ HeaderMetadata<Block, Error = sp_blockchain::Error> + BlockchainEvents<Block>
-			+ CallApiAt<Block> + ProvideRuntimeApi<Block> + Send + Sync + 'static,
+			+ CallApiAt<Block> + HeaderBackend<Block>
+			+ BlockBackend<Block> + ProvideRuntimeApi<Block> + Send + Sync + 'static,
 		Client::Api: Metadata<Block>,
 {
 	let child_backend = Box::new(
@@ -346,6 +357,23 @@ impl<Block, Client> StateApi<Block::Hash> for State<Block, Client>
 	) -> RpcResult<bool> {
 		self.backend.unsubscribe_runtime_version(meta, id)
 	}
+
+	/// Re-execute the given block with the tracing targets given in `targets`
+	/// and capture all state changes.
+	///
+	/// Note: requires the node to run with `--rpc-methods=Unsafe`.
+	/// Note: requires runtimes compiled with wasm tracing support, `--features with-tracing`.
+	fn trace_block(
+		&self, block: Block::Hash,
+		targets: Option<String>,
+		storage_keys: Option<String>
+	) -> FutureResult<sp_rpc::tracing::TraceBlockResponse> {
+		if let Err(err) = self.deny_unsafe.check_if_safe() {
+			return Box::new(result(Err(err.into())))
+		}
+
+		self.backend.trace_block(block, targets, storage_keys)
+	}
 }
 
 /// Child state backend API.
diff --git a/client/rpc/src/state/state_full.rs b/client/rpc/src/state/state_full.rs
index a55903484adc..c75106512d33 100644
--- a/client/rpc/src/state/state_full.rs
+++ b/client/rpc/src/state/state_full.rs
@@ -27,9 +27,10 @@ use jsonrpc_pubsub::{typed::Subscriber, SubscriptionId, manager::SubscriptionMan
 use rpc::{Result as RpcResult, futures::{stream, Future, Sink, Stream, future::result}};
 
 use sc_rpc_api::state::ReadProof;
-use sc_client_api::backend::Backend;
-use sp_blockchain::{Result as ClientResult, Error as ClientError, HeaderMetadata, CachedHeaderMetadata, HeaderBackend};
-use sc_client_api::BlockchainEvents;
+use sp_blockchain::{
+	Result as ClientResult, Error as ClientError, HeaderMetadata, CachedHeaderMetadata,
+	HeaderBackend
+};
 use sp_core::{
 	Bytes, storage::{well_known_keys, StorageKey, StorageData, StorageChangeSet,
 	ChildInfo, ChildType, PrefixedStorageKey},
@@ -43,7 +44,10 @@ use sp_api::{Metadata, ProvideRuntimeApi, CallApiAt};
 
 use super::{StateBackend, ChildStateBackend, error::{FutureResult, Error, Result}, client_err};
 use std::marker::PhantomData;
-use sc_client_api::{CallExecutor, StorageProvider, ExecutorProvider, ProofProvider};
+use sc_client_api::{
+	Backend, BlockBackend, BlockchainEvents, CallExecutor, StorageProvider, ExecutorProvider,
+	ProofProvider
+};
 
 /// Ranges to query in state_queryStorage.
 struct QueryStorageRange<Block: BlockT> {
@@ -69,7 +73,7 @@ pub struct FullState<BE, Block: BlockT, Client> {
 impl<BE, Block: BlockT, Client> FullState<BE, Block, Client>
 	where
 		BE: Backend<Block>,
-		Client: StorageProvider<Block, BE> + HeaderBackend<Block>
+		Client: StorageProvider<Block, BE> + HeaderBackend<Block> + BlockBackend<Block>
 			+ HeaderMetadata<Block, Error = sp_blockchain::Error>,
 		Block: BlockT + 'static,
 {
@@ -221,9 +225,11 @@ impl<BE, Block: BlockT, Client> FullState<BE, Block, Client>
 impl<BE, Block, Client> StateBackend<Block, Client> for FullState<BE, Block, Client> where
 	Block: BlockT + 'static,
 	BE: Backend<Block> + 'static,
-	Client: ExecutorProvider<Block> + StorageProvider<Block, BE> + ProofProvider<Block> + HeaderBackend<Block>
+	Client: ExecutorProvider<Block> + StorageProvider<Block, BE>
+		+ ProofProvider<Block> + HeaderBackend<Block>
 		+ HeaderMetadata<Block, Error = sp_blockchain::Error> + BlockchainEvents<Block>
 		+ CallApiAt<Block> + ProvideRuntimeApi<Block>
+		+ BlockBackend<Block>
 		+ Send + Sync + 'static,
 	Client::Api: Metadata<Block>,
 {
@@ -527,12 +533,26 @@ impl<BE, Block, Client> StateBackend<Block, Client> for FullState<BE, Block, Cli
 	) -> RpcResult<bool> {
 		Ok(self.subscriptions.cancel(id))
 	}
+
+	fn trace_block(
+		&self,
+		block: Block::Hash,
+		targets: Option<String>,
+		storage_keys: Option<String>,
+	) -> FutureResult<sp_rpc::tracing::TraceBlockResponse> {
+		Box::new(result(
+			sc_tracing::block::BlockExecutor::new(self.client.clone(), block, targets, storage_keys)
+				.trace_block()
+				.map_err(|e| invalid_block::<Block>(block, None, e.to_string()))
+		))
+	}
 }
 
 impl<BE, Block, Client> ChildStateBackend<Block, Client> for FullState<BE, Block, Client> where
 	Block: BlockT + 'static,
 	BE: Backend<Block> + 'static,
-	Client: ExecutorProvider<Block> + StorageProvider<Block, BE> + HeaderBackend<Block>
+	Client: ExecutorProvider<Block> + StorageProvider<Block, BE>
+		+ HeaderBackend<Block> + BlockBackend<Block>
 		+ HeaderMetadata<Block, Error = sp_blockchain::Error> + BlockchainEvents<Block>
 		+ CallApiAt<Block> + ProvideRuntimeApi<Block>
 		+ Send + Sync + 'static,
diff --git a/client/rpc/src/state/state_light.rs b/client/rpc/src/state/state_light.rs
index 4bc4b0772784..21b99befc051 100644
--- a/client/rpc/src/state/state_light.rs
+++ b/client/rpc/src/state/state_light.rs
@@ -474,6 +474,15 @@ impl<Block, F, Client> StateBackend<Block, Client> for LightState<Block, F, Clie
 	) -> RpcResult<bool> {
 		Ok(self.subscriptions.cancel(id))
 	}
+
+	fn trace_block(
+		&self,
+		_block: Block::Hash,
+		_targets: Option<String>,
+		_storage_keys: Option<String>,
+	) -> FutureResult<sp_rpc::tracing::TraceBlockResponse> {
+		Box::new(result(Err(client_err(ClientError::NotAvailableOnLightClient))))
+	}
 }
 
 impl<Block, F, Client> ChildStateBackend<Block, Client> for LightState<Block, F, Client>
diff --git a/client/rpc/src/system/mod.rs b/client/rpc/src/system/mod.rs
index b721dbf0c936..248c2dcfed3c 100644
--- a/client/rpc/src/system/mod.rs
+++ b/client/rpc/src/system/mod.rs
@@ -34,6 +34,7 @@ pub use sc_rpc_api::system::*;
 pub use self::helpers::{SystemInfo, Health, PeerInfo, NodeRole, SyncState};
 pub use self::gen_client::Client as SystemClient;
 
+/// Early exit for RPCs that require `--rpc-methods=Unsafe` to be enabled
 macro_rules! bail_if_unsafe {
 	($value: expr) => {
 		if let Err(err) = $value.check_if_safe() {
diff --git a/client/service/src/client/call_executor.rs b/client/service/src/client/call_executor.rs
index 176c68096e97..b48ff028cda0 100644
--- a/client/service/src/client/call_executor.rs
+++ b/client/service/src/client/call_executor.rs
@@ -81,15 +81,24 @@ where
 		Block: BlockT,
 		B: backend::Backend<Block>,
 	{
-		let code = self.wasm_override
+		let code = if let Some(d) = self.wasm_override
 			.as_ref()
 			.map::<sp_blockchain::Result<Option<RuntimeCode>>, _>(|o| {
 				let spec = self.runtime_version(id)?.spec_version;
 				Ok(o.get(&spec, onchain_code.heap_pages))
 			})
 			.transpose()?
-			.flatten()
-			.unwrap_or(onchain_code);
+			.flatten() {
+			log::debug!(target: "wasm_overrides", "using WASM override for block {}", id);
+			d
+		} else {
+			log::debug!(
+				target: "wasm_overrides",
+				"No WASM override available for block {}, using onchain code",
+				id
+			);
+			onchain_code
+		};
 
 		Ok(code)
 	}
diff --git a/client/service/src/client/wasm_override.rs b/client/service/src/client/wasm_override.rs
index aca29694fca8..06a719c346ca 100644
--- a/client/service/src/client/wasm_override.rs
+++ b/client/service/src/client/wasm_override.rs
@@ -161,7 +161,19 @@ where
 				Some("wasm") => {
 					let wasm = WasmBlob::new(fs::read(&path).map_err(handle_err)?);
 					let version = Self::runtime_version(executor, &wasm, Some(128))?;
+					log::info!(
+						target: "wasm_overrides",
+						"Found wasm override in file: `{:?}`, version: {}",
+						path.to_str(),
+						version,
+					);
 					if let Some(_duplicate) = overrides.insert(version.spec_version, wasm) {
+						log::info!(
+							target: "wasm_overrides",
+							"Found duplicate spec version for runtime in file: `{:?}`, version: {}",
+							path.to_str(),
+							version,
+						);
 						duplicates.push(format!("{}", path.display()));
 					}
 				}
diff --git a/client/tracing/Cargo.toml b/client/tracing/Cargo.toml
index d84f89b9bce7..a455cd8ab95c 100644
--- a/client/tracing/Cargo.toml
+++ b/client/tracing/Cargo.toml
@@ -15,22 +15,32 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 ansi_term = "0.12.1"
 atty = "0.2.13"
-erased-serde = "0.3.9"
 lazy_static = "1.4.0"
 log = { version = "0.4.8" }
 once_cell = "1.4.1"
 parking_lot = "0.11.1"
 regex = "1.4.2"
 rustc-hash = "1.1.0"
+erased-serde = "0.3.9"
 serde = "1.0.101"
 serde_json = "1.0.41"
 thiserror = "1.0.21"
 tracing = "0.1.25"
-tracing-core = "0.1.17"
 tracing-log = "0.1.1"
 tracing-subscriber = "0.2.15"
 sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
+sp-rpc = { version = "3.0.0", path = "../../primitives/rpc" }
+sp-block-builder = { version = "3.0.0", path = "../../primitives/block-builder" }
+sp-storage = { version = "3.0.0", path = "../../primitives/storage" }
+sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
+sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
+sp-api = { version = "3.0.0", path = "../../primitives/api" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sc-telemetry = { version = "3.0.0", path = "../telemetry" }
+sc-client-api = { version = "3.0.0", path = "../api" }
 sc-tracing-proc-macro = { version = "3.0.0", path = "./proc-macro" }
+sc-rpc-server =  { version = "3.0.0", path = "../rpc-servers" }
+wasm-timer = "0.2"
 
 [target.'cfg(target_os = "unknown")'.dependencies]
 wasm-bindgen = "0.2.67"
diff --git a/client/tracing/src/block/mod.rs b/client/tracing/src/block/mod.rs
new file mode 100644
index 000000000000..70e74b1d8278
--- /dev/null
+++ b/client/tracing/src/block/mod.rs
@@ -0,0 +1,338 @@
+// Copyright 2021 Parity Technologies (UK) Ltd.
+// This file is part of Substrate.
+
+// Substrate is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Substrate is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Utilities for tracing block execution
+
+use std::{collections::HashMap, sync::{Arc, atomic::{AtomicU64, Ordering}}, time::Instant};
+
+use parking_lot::Mutex;
+use tracing::{Dispatch, dispatcher, Subscriber, Level, span::{Attributes, Record, Id}};
+use tracing_subscriber::CurrentSpan;
+
+use sc_client_api::BlockBackend;
+use sc_rpc_server::MAX_PAYLOAD;
+use sp_api::{Core, Metadata, ProvideRuntimeApi, Encode};
+use sp_blockchain::HeaderBackend;
+use sp_runtime::{
+	generic::BlockId,
+	traits::{Block as BlockT, Header},
+};
+use sp_rpc::tracing::{BlockTrace, Span, TraceError, TraceBlockResponse};
+use sp_tracing::{WASM_NAME_KEY, WASM_TARGET_KEY, WASM_TRACE_IDENTIFIER};
+use sp_core::hexdisplay::HexDisplay;
+use crate::{SpanDatum, TraceEvent, Values};
+
+// Heuristic for average event size in bytes.
+const AVG_EVENT: usize = 600 * 8;
+// Heuristic for average span size in bytes.
+const AVG_SPAN: usize = 100 * 8;
+// Estimate of the max base RPC payload size when the Id is bound as a u64. If strings
+// are used for the RPC Id this may need to be adjusted. Note: The base payload
+// does not include the RPC result.
+//
+// The estimate is based on the JSONRPC response message which has the following format:
+// `{"jsonrpc":"2.0","result":[],"id":18446744073709551615}`.
+//
+// We care about the total size of the payload because jsonrpc-server will simply ignore
+// messages larger than `sc_rpc_server::MAX_PAYLOAD` and the caller will not get any
+// response.
+const BASE_PAYLOAD: usize = 100;
+// Default to only pallet, frame support and state related traces
+const DEFAULT_TARGETS: &str = "pallet,frame,state";
+const TRACE_TARGET: &str = "block_trace";
+// The name of a field required for all events.
+const REQUIRED_EVENT_FIELD: &str  = "method";
+
+/// Tracing Block Result type alias
+pub type TraceBlockResult<T> = Result<T, Error>;
+
+/// Tracing Block error
+#[derive(Debug, thiserror::Error)]
+#[allow(missing_docs)]
+#[non_exhaustive]
+pub enum Error {
+	#[error("Invalid block Id: {0}")]
+	InvalidBlockId(#[from] sp_blockchain::Error),
+	#[error("Missing block component: {0}")]
+	MissingBlockComponent(String),
+	#[error("Dispatch error: {0}")]
+	Dispatch(String)
+}
+
+struct BlockSubscriber {
+	targets: Vec<(String, Level)>,
+	next_id: AtomicU64,
+	current_span: CurrentSpan,
+	spans: Mutex<HashMap<Id, SpanDatum>>,
+	events: Mutex<Vec<TraceEvent>>,
+}
+
+impl BlockSubscriber {
+	fn new(targets: &str) -> Self {
+		let next_id = AtomicU64::new(1);
+		let mut targets: Vec<_> = targets
+			.split(',')
+			.map(crate::parse_target)
+			.collect();
+		// Ensure that WASM traces are always enabled
+		// Filtering happens when decoding the actual target / level
+		targets.push((WASM_TRACE_IDENTIFIER.to_owned(), Level::TRACE));
+		BlockSubscriber {
+			targets,
+			next_id,
+			current_span: CurrentSpan::default(),
+			spans: Mutex::new(HashMap::new()),
+			events: Mutex::new(Vec::new()),
+		}
+	}
+}
+
+impl Subscriber for BlockSubscriber {
+	fn enabled(&self, metadata: &tracing::Metadata<'_>) -> bool {
+		if !metadata.is_span() && !metadata.fields().field(REQUIRED_EVENT_FIELD).is_some() {
+			return false;
+		}
+		for (target, level) in &self.targets {
+			if metadata.level() <= level && metadata.target().starts_with(target) {
+				return true;
+			}
+		}
+		false
+	}
+
+	fn new_span(&self, attrs: &Attributes<'_>) -> Id {
+		let id = Id::from_u64(self.next_id.fetch_add(1, Ordering::Relaxed));
+		let mut values = Values::default();
+		attrs.record(&mut values);
+		let parent_id = attrs.parent().cloned()
+			.or_else(|| self.current_span.id());
+		let span = SpanDatum {
+			id: id.clone(),
+			parent_id,
+			name: attrs.metadata().name().to_owned(),
+			target: attrs.metadata().target().to_owned(),
+			level: *attrs.metadata().level(),
+			line: attrs.metadata().line().unwrap_or(0),
+			start_time: Instant::now(),
+			values,
+			overall_time: Default::default()
+		};
+
+		self.spans.lock().insert(id.clone(), span);
+		id
+	}
+
+	fn record(&self, span: &Id, values: &Record<'_>) {
+		let mut span_data = self.spans.lock();
+		if let Some(s) = span_data.get_mut(span) {
+			values.record(&mut s.values);
+		}
+	}
+
+	fn record_follows_from(&self, _span: &Id, _follows: &Id) {
+		// Not currently used
+		unimplemented!("record_follows_from is not implemented");
+	}
+
+	fn event(&self, event: &tracing::Event<'_>) {
+		let mut values = crate::Values::default();
+		event.record(&mut values);
+		let parent_id = event.parent().cloned()
+			.or_else(|| self.current_span.id());
+		let trace_event = TraceEvent {
+			name: event.metadata().name().to_owned(),
+			target: event.metadata().target().to_owned(),
+			level: *event.metadata().level(),
+			values,
+			parent_id,
+		};
+		self.events.lock().push(trace_event);
+	}
+
+	fn enter(&self, id: &Id) {
+		self.current_span.enter(id.clone());
+	}
+
+	fn exit(&self, span: &Id) {
+		if self.spans.lock().contains_key(span) {
+			self.current_span.exit();
+		}
+	}
+}
+
+/// Holds a reference to the client in order to execute the given block.
+/// Records spans & events for the supplied targets (eg. "pallet,frame,state") and
+/// only records events with the specified hex encoded storage key prefixes.
+/// Note: if `targets` or `storage_keys` is an empty string then nothing is
+/// filtered out.
+pub struct BlockExecutor<Block: BlockT, Client> {
+	client: Arc<Client>,
+	block: Block::Hash,
+	targets: Option<String>,
+	storage_keys: Option<String>,
+}
+
+impl<Block, Client> BlockExecutor<Block, Client>
+	where
+		Block: BlockT + 'static,
+		Client: HeaderBackend<Block> + BlockBackend<Block> + ProvideRuntimeApi<Block>
+		+ Send + Sync + 'static,
+		Client::Api: Metadata<Block>,
+{
+	/// Create a new `BlockExecutor`
+	pub fn new(
+		client: Arc<Client>,
+		block: Block::Hash,
+		targets: Option<String>,
+		storage_keys: Option<String>,
+	) -> Self {
+		Self { client, block, targets, storage_keys }
+	}
+
+	/// Execute block, record all spans and events belonging to `Self::targets`
+	/// and filter out events which do not have keys starting with one of the
+	/// prefixes in `Self::storage_keys`.
+	pub fn trace_block(&self) -> TraceBlockResult<TraceBlockResponse> {
+		tracing::debug!(target: "state_tracing", "Tracing block: {}", self.block);
+		// Prepare the block
+		let id = BlockId::Hash(self.block);
+		let mut header = self.client.header(id)
+			.map_err(|e| Error::InvalidBlockId(e))?
+			.ok_or_else(|| Error::MissingBlockComponent("Header not found".to_string()))?;
+		let extrinsics = self.client.block_body(&id)
+			.map_err(|e| Error::InvalidBlockId(e))?
+			.ok_or_else(|| Error::MissingBlockComponent("Extrinsics not found".to_string()))?;
+		tracing::debug!(target: "state_tracing", "Found {} extrinsics", extrinsics.len());
+		let parent_hash = *header.parent_hash();
+		let parent_id = BlockId::Hash(parent_hash);
+		// Remove all `Seal`s as they are added by the consensus engines after building the block.
+		// On import they are normally removed by the consensus engine.
+		header.digest_mut().logs.retain(|d| d.as_seal().is_none());
+		let block = Block::new(header, extrinsics);
+
+		let targets = if let Some(t) = &self.targets { t } else { DEFAULT_TARGETS };
+		let block_subscriber = BlockSubscriber::new(targets);
+		let dispatch = Dispatch::new(block_subscriber);
+
+		{
+			let dispatcher_span = tracing::debug_span!(
+				target: "state_tracing",
+				"execute_block",
+				extrinsics_len = block.extrinsics().len(),
+			);
+			let _guard = dispatcher_span.enter();
+			if let Err(e) = dispatcher::with_default(&dispatch, || {
+				let span = tracing::info_span!(
+					target: TRACE_TARGET,
+					"trace_block",
+				);
+				let _enter = span.enter();
+				self.client.runtime_api().execute_block(&parent_id, block)
+			}) {
+				return Err(Error::Dispatch(format!("Failed to collect traces and execute block: {:?}", e).to_string()));
+			}
+		}
+
+		let block_subscriber = dispatch.downcast_ref::<BlockSubscriber>()
+			.ok_or(Error::Dispatch(
+				"Cannot downcast Dispatch to BlockSubscriber after tracing block".to_string()
+			))?;
+		let spans: Vec<_> = block_subscriber.spans
+			.lock()
+			.drain()
+			// Patch wasm identifiers
+			.filter_map(|(_, s)| patch_and_filter(SpanDatum::from(s), targets))
+			.collect();
+		let events: Vec<_> = block_subscriber.events
+			.lock()
+			.drain(..)
+			.filter(|e| self.storage_keys
+				.as_ref()
+				.map(|keys| event_key_filter(e, keys))
+				.unwrap_or(false)
+			)
+			.map(|s| s.into())
+			.collect();
+		tracing::debug!(target: "state_tracing", "Captured {} spans and {} events", spans.len(), events.len());
+
+		let approx_payload_size = BASE_PAYLOAD + events.len() * AVG_EVENT + spans.len() * AVG_SPAN;
+		let response = if approx_payload_size > MAX_PAYLOAD {
+				TraceBlockResponse::TraceError(TraceError {
+					error:
+						"Payload likely exceeds max payload size of RPC server.".to_string()
+				})
+		} else {
+			TraceBlockResponse::BlockTrace(BlockTrace {
+				block_hash: block_id_as_string(id),
+				parent_hash: block_id_as_string(parent_id),
+				tracing_targets: targets.to_string(),
+				storage_keys: self.storage_keys.clone().unwrap_or_default(),
+				spans,
+				events,
+			})
+		};
+
+		Ok(response)
+	}
+}
+
+fn event_key_filter(event: &TraceEvent, storage_keys: &str) -> bool {
+	event.values.string_values.get("key")
+		.and_then(|key| Some(check_target(storage_keys, key, &event.level)))
+		.unwrap_or(false)
+}
+
+/// Filter out spans that do not match our targets and if the span is from WASM update its `name`
+/// and `target` fields to the WASM values for those fields.
+//
+// The `tracing` crate requires trace metadata to be static. This does not work for wasm code in
+// substrate, as it is regularly updated with new code from on-chain events. The workaround for this
+// is for substrate's WASM tracing wrappers to put the `name` and `target` data in the `values` map
+// (normally they would be in the static metadata assembled at compile time). Here, if a special
+// WASM `name` or `target` key is found in the `values` we remove it and put the key value pair in
+// the span's metadata, making it consistent with spans that come from native code.
+fn patch_and_filter(mut span: SpanDatum, targets: &str) -> Option<Span> {
+	if span.name == WASM_TRACE_IDENTIFIER {
+		span.values.bool_values.insert("wasm".to_owned(), true);
+		if let Some(n) = span.values.string_values.remove(WASM_NAME_KEY) {
+			span.name = n;
+		}
+		if let Some(t) = span.values.string_values.remove(WASM_TARGET_KEY) {
+			span.target = t;
+		}
+		if !check_target(targets, &span.target, &span.level) {
+			return None;
+		}
+	}
+	Some(span.into())
+}
+
+/// Check if a `target` matches any `targets` by prefix
+fn check_target(targets: &str, target: &str, level: &Level) -> bool {
+	for (t, l) in targets.split(',').map(crate::parse_target) {
+		if target.starts_with(t.as_str()) && level <= &l {
+			return true;
+		}
+	}
+	false
+}
+
+fn block_id_as_string<T: BlockT>(block_id: BlockId<T>) -> String {
+	 match block_id {
+		BlockId::Hash(h) => HexDisplay::from(&h.encode()).to_string(),
+		BlockId::Number(n) =>  HexDisplay::from(&n.encode()).to_string()
+	}
+}
diff --git a/client/tracing/src/lib.rs b/client/tracing/src/lib.rs
index 54620d30bb56..72992a9ab05f 100644
--- a/client/tracing/src/lib.rs
+++ b/client/tracing/src/lib.rs
@@ -29,6 +29,7 @@
 #![warn(missing_docs)]
 
 pub mod logging;
+pub mod block;
 
 use rustc_hash::FxHashMap;
 use std::fmt;
@@ -86,7 +87,7 @@ pub trait TraceHandler: Send + Sync {
 #[derive(Debug)]
 pub struct TraceEvent {
 	/// Name of the event.
-	pub name: &'static str,
+	pub name: String,
 	/// Target of the event.
 	pub target: String,
 	/// Level of the event.
@@ -123,13 +124,13 @@ pub struct SpanDatum {
 /// Holds associated values for a tracing span
 #[derive(Default, Clone, Debug)]
 pub struct Values {
-	/// HashMap of `bool` values
+	/// FxHashMap of `bool` values
 	pub bool_values: FxHashMap<String, bool>,
-	/// HashMap of `i64` values
+	/// FxHashMap of `i64` values
 	pub i64_values: FxHashMap<String, i64>,
-	/// HashMap of `u64` values
+	/// FxHashMap of `u64` values
 	pub u64_values: FxHashMap<String, u64>,
-	/// HashMap of `String` values
+	/// FxHashMap of `String` values
 	pub string_values: FxHashMap<String, String>,
 }
 
@@ -265,7 +266,7 @@ impl<S: Subscriber> Layer<S> for ProfilingLayer {
 			parent_id: attrs.parent().cloned().or_else(|| self.current_span.id()),
 			name: attrs.metadata().name().to_owned(),
 			target: attrs.metadata().target().to_owned(),
-			level: attrs.metadata().level().clone(),
+			level: *attrs.metadata().level(),
 			line: attrs.metadata().line().unwrap_or(0),
 			start_time: Instant::now(),
 			overall_time: ZERO_DURATION,
@@ -285,9 +286,9 @@ impl<S: Subscriber> Layer<S> for ProfilingLayer {
 		let mut values = Values::default();
 		event.record(&mut values);
 		let trace_event = TraceEvent {
-			name: event.metadata().name(),
+			name: event.metadata().name().to_owned(),
 			target: event.metadata().target().to_owned(),
-			level: event.metadata().level().clone(),
+			level: *event.metadata().level(),
 			values,
 			parent_id: event.parent().cloned().or_else(|| self.current_span.id()),
 		};
@@ -304,7 +305,6 @@ impl<S: Subscriber> Layer<S> for ProfilingLayer {
 	}
 
 	fn on_exit(&self, span: &Id, _ctx: Context<S>) {
-		self.current_span.exit();
 		let end_time = Instant::now();
 		let span_datum = {
 			let mut span_data = self.span_data.lock();
@@ -312,6 +312,8 @@ impl<S: Subscriber> Layer<S> for ProfilingLayer {
 		};
 
 		if let Some(mut span_datum) = span_datum {
+			// If `span_datum` is `None` we don't exit (we'd be exiting the parent span)
+			self.current_span.exit();
 			span_datum.overall_time += end_time - span_datum.start_time;
 			if span_datum.name == WASM_TRACE_IDENTIFIER {
 				span_datum.values.bool_values.insert("wasm".to_owned(), true);
@@ -330,9 +332,7 @@ impl<S: Subscriber> Layer<S> for ProfilingLayer {
 		};
 	}
 
-	fn on_close(&self, span: Id, ctx: Context<S>) {
-		self.on_exit(&span, ctx)
-	}
+	fn on_close(&self, _span: Id, _ctx: Context<S>) {}
 }
 
 /// TraceHandler for sending span data to the logger
@@ -385,6 +385,32 @@ impl TraceHandler for LogTraceHandler {
 	}
 }
 
+impl From<TraceEvent> for sp_rpc::tracing::Event {
+	fn from(trace_event: TraceEvent) -> Self {
+		let data = sp_rpc::tracing::Data {
+			string_values: trace_event.values.string_values
+		};
+		sp_rpc::tracing::Event {
+			target: trace_event.target,
+			data,
+			parent_id: trace_event.parent_id.map(|id| id.into_u64())
+		}
+	}
+}
+
+impl From<SpanDatum> for sp_rpc::tracing::Span {
+	fn from(span_datum: SpanDatum) -> Self {
+		let wasm = span_datum.values.bool_values.get("wasm").is_some();
+		sp_rpc::tracing::Span {
+			id: span_datum.id.into_u64(),
+			parent_id: span_datum.parent_id.map(|id| id.into_u64()),
+			name: span_datum.name,
+			target: span_datum.target,
+			wasm,
+		}
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;
@@ -555,7 +581,7 @@ mod tests {
 						break;
 					}
 				}
-				// gard2 and span2 dropped / exited
+				// guard2 and span2 dropped / exited
 			});
 
 			// wait for Event to be dispatched and stored
diff --git a/client/tracing/src/logging/mod.rs b/client/tracing/src/logging/mod.rs
index c3cc3e085101..49bcfc4abfb4 100644
--- a/client/tracing/src/logging/mod.rs
+++ b/client/tracing/src/logging/mod.rs
@@ -177,6 +177,9 @@ where
 	};
 	let builder = FmtSubscriber::builder().with_env_filter(env_filter);
 
+	#[cfg(not(target_os = "unknown"))]
+	let builder = builder.with_span_events(format::FmtSpan::NONE);
+
 	#[cfg(not(target_os = "unknown"))]
 	let builder = builder.with_writer(std::io::stderr as _);
 
diff --git a/primitives/rpc/Cargo.toml b/primitives/rpc/Cargo.toml
index de7e2bd882e7..9a502c99d311 100644
--- a/primitives/rpc/Cargo.toml
+++ b/primitives/rpc/Cargo.toml
@@ -15,6 +15,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", features = ["derive"] }
 sp-core = { version = "3.0.0", path = "../core" }
+tracing-core = "0.1.17"
+rustc-hash = "1.1.0"
 
 [dev-dependencies]
 serde_json = "1.0.41"
diff --git a/primitives/rpc/src/lib.rs b/primitives/rpc/src/lib.rs
index 822aba4ba196..ea7118479943 100644
--- a/primitives/rpc/src/lib.rs
+++ b/primitives/rpc/src/lib.rs
@@ -21,6 +21,7 @@
 
 pub mod number;
 pub mod list;
+pub mod tracing;
 
 /// A util function to assert the result of serialization and deserialization is the same.
 #[cfg(test)]
diff --git a/primitives/rpc/src/tracing.rs b/primitives/rpc/src/tracing.rs
new file mode 100644
index 000000000000..1062ec1d9ebe
--- /dev/null
+++ b/primitives/rpc/src/tracing.rs
@@ -0,0 +1,98 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Types for working with tracing data
+
+use serde::{Serialize, Deserialize};
+
+use rustc_hash::FxHashMap;
+
+/// Container for all related spans and events for the block being traced.
+#[derive(Serialize, Deserialize, Clone, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct BlockTrace {
+	/// Hash of the block being traced
+	pub block_hash: String,
+	/// Parent hash
+	pub parent_hash: String,
+	/// Module targets that were recorded by the tracing subscriber.
+	/// Empty string means record all targets.
+	pub tracing_targets: String,
+	/// Storage key targets used to filter out events that do not have one of the storage keys.
+	/// Empty string means do not filter out any events.
+	pub storage_keys: String,
+	/// Vec of tracing spans
+	pub spans: Vec<Span>,
+	/// Vec of tracing events
+	pub events: Vec<Event>,
+}
+
+/// Represents a tracing event, complete with recorded data.
+#[derive(Serialize, Deserialize, Clone, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct Event {
+	/// Event target
+	pub target: String,
+	/// Associated data
+	pub data: Data,
+	/// Parent id, if it exists
+	pub parent_id: Option<u64>,
+}
+
+/// Represents a single instance of a tracing span.
+///
+/// Exiting a span does not imply that the span will not be re-entered.
+#[derive(Serialize, Deserialize, Clone, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct Span {
+	/// id for this span
+	pub id: u64,
+	/// id of the parent span, if any
+	pub parent_id: Option<u64>,
+	/// Name of this span
+	pub name: String,
+	/// Target, typically module
+	pub target: String,
+	/// Indicates if the span is from wasm
+	pub wasm: bool,
+}
+
+/// Holds associated values for a tracing span.
+#[derive(Serialize, Deserialize, Default, Clone, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct Data {
+	/// HashMap of `String` values recorded while tracing
+	pub string_values: FxHashMap<String, String>,
+}
+
+/// Error response for the `state_traceBlock` RPC.
+#[derive(Serialize, Deserialize, Default, Clone, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct TraceError {
+	/// Error message
+    pub error: String,
+}
+
+/// Response for the `state_traceBlock` RPC.
+#[derive(Serialize, Deserialize, Clone, Debug)]
+#[serde(rename_all = "camelCase")]
+pub enum TraceBlockResponse {
+	/// Error block tracing response
+	TraceError(TraceError),
+	/// Successful block tracing response
+	BlockTrace(BlockTrace)
+}
diff --git a/primitives/state-machine/Cargo.toml b/primitives/state-machine/Cargo.toml
index 9db850cfe0b9..79fccef08c19 100644
--- a/primitives/state-machine/Cargo.toml
+++ b/primitives/state-machine/Cargo.toml
@@ -29,6 +29,7 @@ rand = { version = "0.7.2", optional = true }
 sp-externalities = { version = "0.9.0", path = "../externalities", default-features = false }
 smallvec = "1.4.1"
 sp-std = { version = "3.0.0", default-features = false, path = "../std" }
+tracing = { version = "0.1.22", optional = true }
 
 [dev-dependencies]
 hex-literal = "0.3.1"
@@ -52,4 +53,5 @@ std = [
 	"parking_lot",
 	"rand",
 	"sp-panic-handler",
+	"tracing"
 ]
diff --git a/primitives/state-machine/src/ext.rs b/primitives/state-machine/src/ext.rs
index 424a3c6c421a..43793d3c815d 100644
--- a/primitives/state-machine/src/ext.rs
+++ b/primitives/state-machine/src/ext.rs
@@ -201,11 +201,22 @@ where
 		let _guard = guard();
 		let result = self.overlay.storage(key).map(|x| x.map(|x| x.to_vec())).unwrap_or_else(||
 			self.backend.storage(key).expect(EXT_NOT_ALLOWED_TO_FAIL));
-		trace!(target: "state", "{:04x}: Get {}={:?}",
-			self.id,
-			HexDisplay::from(&key),
-			result.as_ref().map(HexDisplay::from)
+
+		// NOTE: be careful about touching the key names – used outside substrate!
+		trace!(
+			target: "state",
+			method = "Get",
+			ext_id = self.id,
+			key = %HexDisplay::from(&key),
+			result = ?result.as_ref().map(HexDisplay::from),
+			result_encoded = %HexDisplay::from(
+				&result
+					.as_ref()
+					.map(|v| EncodeOpaqueValue(v.clone()))
+					.encode()
+			),
 		);
+
 		result
 	}
 
@@ -354,17 +365,27 @@ where
 	}
 
 	fn place_storage(&mut self, key: StorageKey, value: Option<StorageValue>) {
-		trace!(target: "state", "{:04x}: Put {}={:?}",
-			self.id,
-			HexDisplay::from(&key),
-			value.as_ref().map(HexDisplay::from)
-		);
 		let _guard = guard();
 		if is_child_storage_key(&key) {
 			warn!(target: "trie", "Refuse to directly set child storage key");
 			return;
 		}
 
+		// NOTE: be careful about touching the key names – used outside substrate!
+		trace!(
+			target: "state",
+			method = "Put",
+			ext_id = self.id,
+			key = %HexDisplay::from(&key),
+			value = ?value.as_ref().map(HexDisplay::from),
+			value_encoded = %HexDisplay::from(
+				&value
+					.as_ref()
+					.map(|v| EncodeOpaqueValue(v.clone()))
+					.encode()
+			),
+		);
+
 		self.mark_dirty();
 		self.overlay.set_storage(key, value);
 	}
diff --git a/primitives/state-machine/src/lib.rs b/primitives/state-machine/src/lib.rs
index 0a664840df85..a6f1fb1f0e78 100644
--- a/primitives/state-machine/src/lib.rs
+++ b/primitives/state-machine/src/lib.rs
@@ -46,7 +46,9 @@ pub use std_reexport::*;
 #[cfg(feature = "std")]
 pub use execution::*;
 #[cfg(feature = "std")]
-pub use log::{debug, warn, trace, error as log_error};
+pub use log::{debug, warn, error as log_error};
+#[cfg(feature = "std")]
+pub use tracing::trace;
 
 /// In no_std we skip logs for state_machine, this macro
 /// is a noops.
diff --git a/primitives/tracing/Cargo.toml b/primitives/tracing/Cargo.toml
index 4fc70bd1b70d..6c4d70b109cd 100644
--- a/primitives/tracing/Cargo.toml
+++ b/primitives/tracing/Cargo.toml
@@ -24,6 +24,11 @@ tracing = { version = "0.1.25", default-features = false }
 tracing-core = { version = "0.1.17", default-features = false }
 log = { version = "0.4.8", optional = true }
 tracing-subscriber = { version = "0.2.15", optional = true, features = ["tracing-log"] }
+parking_lot = { version = "0.10.0", optional = true }
+erased-serde = { version = "0.3.9", optional = true }
+serde = { version = "1.0.101", optional = true }
+serde_json = { version = "1.0.41", optional = true }
+slog = { version = "2.5.2", features = ["nested-values"], optional = true }
 
 [features]
 default = [ "std" ]
@@ -39,4 +44,9 @@ std = [
 	"sp-std/std",
 	"log",
 	"tracing-subscriber",
+	"parking_lot",
+	"erased-serde",
+	"serde",
+	"serde_json",
+	"slog"
 ]
diff --git a/primitives/tracing/README.md b/primitives/tracing/README.md
index a93c97ff62fa..d66bb90016c7 100644
--- a/primitives/tracing/README.md
+++ b/primitives/tracing/README.md
@@ -1,6 +1,6 @@
 Substrate tracing primitives and macros.
 
-To trace functions or invidual code in Substrate, this crate provides [`within_span`]
+To trace functions or individual code in Substrate, this crate provides [`within_span`]
 and [`enter_span`]. See the individual docs for how to use these macros.
 
 Note that to allow traces from wasm execution environment there are
diff --git a/primitives/tracing/src/lib.rs b/primitives/tracing/src/lib.rs
index 227e1ee994ec..95eb4d056670 100644
--- a/primitives/tracing/src/lib.rs
+++ b/primitives/tracing/src/lib.rs
@@ -28,14 +28,36 @@
 //! Additionally, we have a const: `WASM_TRACE_IDENTIFIER`, which holds a span name used
 //! to signal that the 'actual' span name and target should be retrieved instead from
 //! the associated Fields mentioned above.
+//!
+//! Note: The `tracing` crate requires trace metadata to be static. This does not work
+//! for wasm code in substrate, as it is regularly updated with new code from on-chain
+//! events. The workaround for this is for the wasm tracing wrappers to put the
+//! `name` and `target` data in the `values` map (normally they would be in the static
+//! metadata assembled at compile time).
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
+#[cfg(feature = "std")]
+use tracing;
+pub use tracing::{
+    debug, debug_span, error, error_span, event, info, info_span, Level, span, Span,
+    trace, trace_span, warn, warn_span,
+};
+
+pub use crate::types::{
+    WasmEntryAttributes, WasmFieldName, WasmFields, WasmLevel, WasmMetadata, WasmValue,
+	WasmValuesSet
+};
+#[cfg(feature = "std")]
+pub use crate::types::{
+    WASM_NAME_KEY, WASM_TARGET_KEY, WASM_TRACE_IDENTIFIER
+};
+
 /// Tracing facilities and helpers.
 ///
 /// This is modeled after the `tracing`/`tracing-core` interface and uses that more or
 /// less directly for the native side. Because of certain optimisations the these crates
-/// have done, the wasm implementation diverges slightly and is optimised for thtat use
+/// have done, the wasm implementation diverges slightly and is optimised for that use
 /// case (like being able to cross the wasm/native boundary via scale codecs).
 ///
 /// One of said optimisations is that all macros will yield to a `noop` in non-std unless
@@ -86,23 +108,9 @@
 /// and call `set_tracing_subscriber` at the very beginning of your execution –
 /// the default subscriber is doing nothing, so any spans or events happening before
 /// will not be recorded!
-///
 
 mod types;
 
-#[cfg(feature = "std")]
-use tracing;
-
-pub use tracing::{
-	debug, debug_span, error, error_span, info, info_span, trace, trace_span, warn, warn_span,
-	span, event, Level, Span,
-};
-
-pub use crate::types::{
-	WasmMetadata, WasmEntryAttributes, WasmValuesSet, WasmValue, WasmFields, WasmLevel, WasmFieldName
-};
-
-
 /// Try to init a simple tracing subscriber with log compatibility layer.
 /// Ignores any error. Useful for testing.
 #[cfg(feature = "std")]
@@ -112,12 +120,6 @@ pub fn try_init_simple() {
 		.with_writer(std::io::stderr).try_init();
 }
 
-#[cfg(feature = "std")]
-pub use crate::types::{
-	WASM_NAME_KEY, WASM_TARGET_KEY, WASM_TRACE_IDENTIFIER
-};
-
-
 /// Runs given code within a tracing span, measuring it's execution time.
 ///
 /// If tracing is not enabled, the code is still executed. Pass in level and name or
diff --git a/primitives/tracing/src/types.rs b/primitives/tracing/src/types.rs
index 44f6b2f7ffc5..9fdcdfb52639 100644
--- a/primitives/tracing/src/types.rs
+++ b/primitives/tracing/src/types.rs
@@ -53,8 +53,6 @@ impl From<&tracing_core::Level> for WasmLevel {
 	}
 }
 
-
-
 impl core::default::Default for WasmLevel {
 	fn default() -> Self {
 		WasmLevel::TRACE

From 0f849efc2616685f0e32fec3cc5ccd174ff142ac Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Wed, 5 May 2021 12:01:55 +0200
Subject: [PATCH 0704/1194] Fix panic in election-provider offchain worker.
 (#8732)

---
 .../src/unsigned.rs                           | 68 ++++++++++++++++---
 1 file changed, 58 insertions(+), 10 deletions(-)

diff --git a/frame/election-provider-multi-phase/src/unsigned.rs b/frame/election-provider-multi-phase/src/unsigned.rs
index ebeae3dc472f..66b985c8efb9 100644
--- a/frame/election-provider-multi-phase/src/unsigned.rs
+++ b/frame/election-provider-multi-phase/src/unsigned.rs
@@ -437,6 +437,11 @@ impl<T: Config> Pallet<T> {
 		let mut high = assignments.len();
 		let mut low = 0;
 
+		// not much we can do if assignments are already empty.
+		if high == low {
+			return Ok(());
+		}
+
 		while high - low > 1 {
 			let test = (high + low) / 2;
 			if encoded_size_of(&assignments[..test])? <= max_allowed_length {
@@ -446,13 +451,13 @@ impl<T: Config> Pallet<T> {
 			}
 		}
 		let maximum_allowed_voters =
-			if encoded_size_of(&assignments[..low + 1])? <= max_allowed_length {
+			if low < assignments.len() && encoded_size_of(&assignments[..low + 1])? <= max_allowed_length {
 				low + 1
 			} else {
 				low
 			};
 
-		// ensure our postconditions are correct
+		// ensure our post-conditions are correct
 		debug_assert!(
 			encoded_size_of(&assignments[..maximum_allowed_voters]).unwrap() <= max_allowed_length
 		);
@@ -1256,8 +1261,7 @@ mod tests {
 
 	#[test]
 	fn trim_assignments_length_does_not_modify_when_short_enough() {
-		let mut ext = ExtBuilder::default().build();
-		ext.execute_with(|| {
+		ExtBuilder::default().build_and_execute(|| {
 			roll_to(25);
 
 			// given
@@ -1281,8 +1285,7 @@ mod tests {
 
 	#[test]
 	fn trim_assignments_length_modifies_when_too_long() {
-		let mut ext = ExtBuilder::default().build();
-		ext.execute_with(|| {
+		ExtBuilder::default().build().execute_with(|| {
 			roll_to(25);
 
 			// given
@@ -1307,8 +1310,7 @@ mod tests {
 
 	#[test]
 	fn trim_assignments_length_trims_lowest_stake() {
-		let mut ext = ExtBuilder::default().build();
-		ext.execute_with(|| {
+		ExtBuilder::default().build().execute_with(|| {
 			roll_to(25);
 
 			// given
@@ -1340,13 +1342,59 @@ mod tests {
 		});
 	}
 
+	#[test]
+	fn trim_assignments_length_wont_panic() {
+		// we shan't panic if assignments are initially empty.
+		ExtBuilder::default().build_and_execute(|| {
+			let encoded_size_of = Box::new(|assignments: &[IndexAssignmentOf<Runtime>]| {
+				CompactOf::<Runtime>::try_from(assignments).map(|compact| compact.encoded_size())
+			});
+
+			let mut assignments = vec![];
+
+			// since we have 16 fields, we need to store the length fields of 16 vecs, thus 16 bytes
+			// minimum.
+			let min_compact_size = encoded_size_of(&assignments).unwrap();
+			assert_eq!(min_compact_size, CompactOf::<Runtime>::LIMIT);
+
+			// all of this should not panic.
+			MultiPhase::trim_assignments_length(0, &mut assignments, encoded_size_of.clone())
+				.unwrap();
+			MultiPhase::trim_assignments_length(1, &mut assignments, encoded_size_of.clone())
+				.unwrap();
+			MultiPhase::trim_assignments_length(
+				min_compact_size as u32,
+				&mut assignments,
+				encoded_size_of,
+			)
+			.unwrap();
+		});
+
+		// or when we trim it to zero.
+		ExtBuilder::default().build_and_execute(|| {
+			// we need snapshot for `trim_helpers` to work.
+			roll_to(25);
+			let TrimHelpers { mut assignments, encoded_size_of, .. } = trim_helpers();
+			assert!(assignments.len() > 0);
+
+			// trim to min compact size.
+			let min_compact_size = CompactOf::<Runtime>::LIMIT as u32;
+			MultiPhase::trim_assignments_length(
+				min_compact_size,
+				&mut assignments,
+				encoded_size_of,
+			)
+			.unwrap();
+			assert_eq!(assignments.len(), 0);
+		});
+	}
+
 	// all the other solution-generation functions end up delegating to `mine_solution`, so if we
 	// demonstrate that `mine_solution` solutions are all trimmed to an acceptable length, then
 	// we know that higher-level functions will all also have short-enough solutions.
 	#[test]
 	fn mine_solution_solutions_always_within_acceptable_length() {
-		let mut ext = ExtBuilder::default().build();
-		ext.execute_with(|| {
+		ExtBuilder::default().build_and_execute(|| {
 			roll_to(25);
 
 			// how long would the default solution be?

From 22a86fa02a9810cfccb6b12fa6d0cc6f1592255b Mon Sep 17 00:00:00 2001
From: Shaun Wang <spxwang@gmail.com>
Date: Thu, 6 May 2021 02:03:21 +1200
Subject: [PATCH 0705/1194] Migrate pallet-im-online to pallet attribute macro.
 (#8714)

* Migrate pallet-im-online to pallet attribute macro.

* Move validate_unsigned into pallet macro.

* fix metadata

* fix test

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
---
 frame/im-online/src/benchmarking.rs    |   2 +-
 frame/im-online/src/lib.rs             | 397 ++++++++++++++-----------
 frame/im-online/src/tests.rs           |   4 +-
 frame/offences/benchmarking/src/lib.rs |   2 +-
 4 files changed, 222 insertions(+), 183 deletions(-)

diff --git a/frame/im-online/src/benchmarking.rs b/frame/im-online/src/benchmarking.rs
index 287a2c6fd3a7..5ab4d16c7fe0 100644
--- a/frame/im-online/src/benchmarking.rs
+++ b/frame/im-online/src/benchmarking.rs
@@ -29,7 +29,7 @@ use sp_runtime::traits::{ValidateUnsigned, Zero};
 use sp_runtime::transaction_validity::TransactionSource;
 use frame_support::traits::UnfilteredDispatchable;
 
-use crate::Module as ImOnline;
+use crate::Pallet as ImOnline;
 
 const MAX_KEYS: u32 = 1000;
 const MAX_EXTERNAL_ADDRESSES: u32 = 100;
diff --git a/frame/im-online/src/lib.rs b/frame/im-online/src/lib.rs
index d8f3fdc854b1..0290c564ec59 100644
--- a/frame/im-online/src/lib.rs
+++ b/frame/im-online/src/lib.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! # I'm online Module
+//! # I'm online Pallet
 //!
 //! If the local node is a validator (i.e. contains an authority key), this module
 //! gossips a heartbeat transaction with each new session. The heartbeat functions
@@ -32,7 +32,7 @@
 //!
 //! - [`Config`]
 //! - [`Call`]
-//! - [`Module`]
+//! - [`Pallet`]
 //!
 //! ## Interface
 //!
@@ -54,7 +54,7 @@
 //! 		#[weight = 0]
 //! 		pub fn is_online(origin, authority_index: u32) -> dispatch::DispatchResult {
 //! 			let _sender = ensure_signed(origin)?;
-//! 			let _is_online = <im_online::Module<T>>::is_online(authority_index);
+//! 			let _is_online = <im_online::Pallet<T>>::is_online(authority_index);
 //! 			Ok(())
 //! 		}
 //! 	}
@@ -81,27 +81,19 @@ use sp_std::prelude::*;
 use sp_std::convert::TryInto;
 use sp_runtime::{
 	offchain::storage::StorageValueRef,
-	traits::{AtLeast32BitUnsigned, Convert, Member, Saturating},
-	transaction_validity::{
-		InvalidTransaction, TransactionPriority, TransactionSource, TransactionValidity,
-		ValidTransaction,
-	},
+	traits::{AtLeast32BitUnsigned, Convert, Saturating},
 	Perbill, Percent, RuntimeDebug,
 };
 use sp_staking::{
 	SessionIndex,
 	offence::{ReportOffence, Offence, Kind},
 };
-use frame_support::{
-	decl_error, decl_event, decl_module, decl_storage,
-	traits::{
-		EstimateNextSessionRotation, Get, OneSessionHandler, ValidatorSet,
-		ValidatorSetWithIdentification,
-	},
-	Parameter,
+use frame_support::traits::{
+	EstimateNextSessionRotation, OneSessionHandler, ValidatorSet, ValidatorSetWithIdentification,
 };
-use frame_system::{ensure_none, offchain::{SendTransactionTypes, SubmitTransaction}};
+use frame_system::offchain::{SendTransactionTypes, SubmitTransaction};
 pub use weights::WeightInfo;
+pub use pallet::*;
 
 pub mod sr25519 {
 	mod app_sr25519 {
@@ -238,108 +230,152 @@ pub type IdentificationTuple<T> = (
 		ValidatorSetWithIdentification<<T as frame_system::Config>::AccountId>>::Identification,
 );
 
-pub trait Config: SendTransactionTypes<Call<Self>> + frame_system::Config {
-	/// The identifier type for an authority.
-	type AuthorityId: Member + Parameter + RuntimeAppPublic + Default + Ord;
-
-	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
-
-	/// A type for retrieving the validators supposed to be online in a session.
-	type ValidatorSet: ValidatorSetWithIdentification<Self::AccountId>;
-
-	/// A trait that allows us to estimate the current session progress and also the
-	/// average session length.
-	///
-	/// This parameter is used to determine the longevity of `heartbeat` transaction and a
-	/// rough time when we should start considering sending heartbeats, since the workers
-	/// avoids sending them at the very beginning of the session, assuming there is a
-	/// chance the authority will produce a block and they won't be necessary.
-	type NextSessionRotation: EstimateNextSessionRotation<Self::BlockNumber>;
-
-	/// A type that gives us the ability to submit unresponsiveness offence reports.
-	type ReportUnresponsiveness: ReportOffence<
-		Self::AccountId,
-		IdentificationTuple<Self>,
-		UnresponsivenessOffence<IdentificationTuple<Self>>,
-	>;
+type OffchainResult<T, A> = Result<A, OffchainErr<<T as frame_system::Config>::BlockNumber>>;
 
-	/// A configuration for base priority of unsigned transactions.
-	///
-	/// This is exposed so that it can be tuned for particular runtime, when
-	/// multiple pallets send unsigned transactions.
-	type UnsignedPriority: Get<TransactionPriority>;
+#[frame_support::pallet]
+pub mod pallet {
+	use frame_support::{pallet_prelude::*, traits::Get};
+	use frame_system::{pallet_prelude::*, ensure_none};
+	use sp_runtime::{
+		traits::{Member, MaybeSerializeDeserialize},
+		transaction_validity::{
+			InvalidTransaction, TransactionPriority, TransactionSource, TransactionValidity, ValidTransaction,
+		},
+	};
+	use frame_support::Parameter;
+	use super::*;
+
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(_);
+
+	#[pallet::config]
+	pub trait Config: SendTransactionTypes<Call<Self>> + frame_system::Config {
+		/// The identifier type for an authority.
+		type AuthorityId: Member + Parameter + RuntimeAppPublic + Default + Ord + MaybeSerializeDeserialize;
+
+		/// The overarching event type.
+		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
+
+		/// A type for retrieving the validators supposed to be online in a session.
+		type ValidatorSet: ValidatorSetWithIdentification<Self::AccountId>;
+
+		/// A trait that allows us to estimate the current session progress and also the
+		/// average session length.
+		///
+		/// This parameter is used to determine the longevity of `heartbeat` transaction and a
+		/// rough time when we should start considering sending heartbeats, since the workers
+		/// avoids sending them at the very beginning of the session, assuming there is a
+		/// chance the authority will produce a block and they won't be necessary.
+		type NextSessionRotation: EstimateNextSessionRotation<Self::BlockNumber>;
+
+		/// A type that gives us the ability to submit unresponsiveness offence reports.
+		type ReportUnresponsiveness: ReportOffence<
+			Self::AccountId,
+			IdentificationTuple<Self>,
+			UnresponsivenessOffence<IdentificationTuple<Self>>,
+		>;
+
+		/// A configuration for base priority of unsigned transactions.
+		///
+		/// This is exposed so that it can be tuned for particular runtime, when
+		/// multiple pallets send unsigned transactions.
+		type UnsignedPriority: Get<TransactionPriority>;
 
-	/// Weight information for extrinsics in this pallet.
-	type WeightInfo: WeightInfo;
-}
+		/// Weight information for extrinsics in this pallet.
+		type WeightInfo: WeightInfo;
+	}
 
-decl_event!(
-	pub enum Event<T> where
-		<T as Config>::AuthorityId,
-		IdentificationTuple = IdentificationTuple<T>,
-	{
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	#[pallet::metadata(T::AuthorityId = "AuthorityId", Vec<IdentificationTuple<T>> = "Vec<IdentificationTuple>")]
+	pub enum Event<T: Config> {
 		/// A new heartbeat was received from `AuthorityId` \[authority_id\]
-		HeartbeatReceived(AuthorityId),
+		HeartbeatReceived(T::AuthorityId),
 		/// At the end of the session, no offence was committed.
 		AllGood,
 		/// At the end of the session, at least one validator was found to be \[offline\].
-		SomeOffline(Vec<IdentificationTuple>),
+		SomeOffline(Vec<IdentificationTuple<T>>),
 	}
-);
 
-decl_storage! {
-	trait Store for Module<T: Config> as ImOnline {
-		/// The block number after which it's ok to send heartbeats in the current
-		/// session.
-		///
-		/// At the beginning of each session we set this to a value that should fall
-		/// roughly in the middle of the session duration. The idea is to first wait for
-		/// the validators to produce a block in the current session, so that the
-		/// heartbeat later on will not be necessary.
-		///
-		/// This value will only be used as a fallback if we fail to get a proper session
-		/// progress estimate from `NextSessionRotation`, as those estimates should be
-		/// more accurate then the value we calculate for `HeartbeatAfter`.
-		HeartbeatAfter get(fn heartbeat_after): T::BlockNumber;
-
-		/// The current set of keys that may issue a heartbeat.
-		Keys get(fn keys): Vec<T::AuthorityId>;
-
-		/// For each session index, we keep a mapping of `AuthIndex` to
-		/// `offchain::OpaqueNetworkState`.
-		ReceivedHeartbeats get(fn received_heartbeats):
-			double_map hasher(twox_64_concat) SessionIndex, hasher(twox_64_concat) AuthIndex
-			=> Option<Vec<u8>>;
-
-		/// For each session index, we keep a mapping of `ValidatorId<T>` to the
-		/// number of blocks authored by the given authority.
-		AuthoredBlocks get(fn authored_blocks):
-			double_map hasher(twox_64_concat) SessionIndex, hasher(twox_64_concat) ValidatorId<T>
-			=> u32;
-	}
-	add_extra_genesis {
-		config(keys): Vec<T::AuthorityId>;
-		build(|config| Module::<T>::initialize_keys(&config.keys))
-	}
-}
-
-decl_error! {
-	/// Error for the im-online module.
-	pub enum Error for Module<T: Config> {
+	#[pallet::error]
+	pub enum Error<T> {
 		/// Non existent public key.
 		InvalidKey,
 		/// Duplicated heartbeat.
 		DuplicatedHeartbeat,
 	}
-}
 
-decl_module! {
-	pub struct Module<T: Config> for enum Call where origin: T::Origin {
-		type Error = Error<T>;
+	/// The block number after which it's ok to send heartbeats in the current
+	/// session.
+	///
+	/// At the beginning of each session we set this to a value that should fall
+	/// roughly in the middle of the session duration. The idea is to first wait for
+	/// the validators to produce a block in the current session, so that the
+	/// heartbeat later on will not be necessary.
+	///
+	/// This value will only be used as a fallback if we fail to get a proper session
+	/// progress estimate from `NextSessionRotation`, as those estimates should be
+	/// more accurate then the value we calculate for `HeartbeatAfter`.
+	#[pallet::storage]
+	#[pallet::getter(fn heartbeat_after)]
+	pub(crate) type HeartbeatAfter<T: Config> = StorageValue<_, T::BlockNumber, ValueQuery>;
+
+	/// The current set of keys that may issue a heartbeat.
+	#[pallet::storage]
+	#[pallet::getter(fn keys)]
+	pub(crate) type Keys<T: Config> = StorageValue<_, Vec<T::AuthorityId>, ValueQuery>;
+
+	/// For each session index, we keep a mapping of `AuthIndex` to
+	/// `offchain::OpaqueNetworkState`.
+	#[pallet::storage]
+	#[pallet::getter(fn received_heartbeats)]
+	pub(crate) type ReceivedHeartbeats<T> = StorageDoubleMap<
+		_,
+		Twox64Concat,
+		SessionIndex,
+		Twox64Concat,
+		AuthIndex,
+		Vec<u8>,
+	>;
+
+	/// For each session index, we keep a mapping of `ValidatorId<T>` to the
+	/// number of blocks authored by the given authority.
+	#[pallet::storage]
+	#[pallet::getter(fn authored_blocks)]
+	pub(crate) type AuthoredBlocks<T: Config> = StorageDoubleMap<
+		_,
+		Twox64Concat,
+		SessionIndex,
+		Twox64Concat,
+		ValidatorId<T>,
+		u32,
+		ValueQuery,
+	>;
+
+	#[pallet::genesis_config]
+	pub struct GenesisConfig<T: Config> {
+		pub keys: Vec<T::AuthorityId>,
+	}
+
+	#[cfg(feature = "std")]
+	impl<T: Config> Default for GenesisConfig<T> {
+		fn default() -> Self {
+			GenesisConfig {
+				keys: Default::default(),
+			}
+		}
+	}
 
-		fn deposit_event() = default;
+	#[pallet::genesis_build]
+	impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+		fn build(&self) {
+			Pallet::<T>::initialize_keys(&self.keys);
+		}
+	}
 
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
 		/// # <weight>
 		/// - Complexity: `O(K + E)` where K is length of `Keys` (heartbeat.validators_len)
 		///   and E is length of `heartbeat.network_state.external_address`
@@ -351,21 +387,21 @@ decl_module! {
 		/// # </weight>
 		// NOTE: the weight includes the cost of validate_unsigned as it is part of the cost to
 		// import block with such an extrinsic.
-		#[weight = <T as Config>::WeightInfo::validate_unsigned_and_then_heartbeat(
+		#[pallet::weight(<T as Config>::WeightInfo::validate_unsigned_and_then_heartbeat(
 			heartbeat.validators_len as u32,
 			heartbeat.network_state.external_addresses.len() as u32,
-		)]
-		fn heartbeat(
-			origin,
+		))]
+		pub fn heartbeat(
+			origin: OriginFor<T>,
 			heartbeat: Heartbeat<T::BlockNumber>,
 			// since signature verification is done in `validate_unsigned`
 			// we can skip doing it here again.
 			_signature: <T::AuthorityId as RuntimeAppPublic>::Signature,
-		) {
+		) -> DispatchResultWithPostInfo {
 			ensure_none(origin)?;
 
 			let current_session = T::ValidatorSet::session_index();
-			let exists = <ReceivedHeartbeats>::contains_key(
+			let exists = ReceivedHeartbeats::<T>::contains_key(
 				&current_session,
 				&heartbeat.authority_index
 			);
@@ -375,20 +411,24 @@ decl_module! {
 				Self::deposit_event(Event::<T>::HeartbeatReceived(public.clone()));
 
 				let network_state = heartbeat.network_state.encode();
-				<ReceivedHeartbeats>::insert(
+				ReceivedHeartbeats::<T>::insert(
 					&current_session,
 					&heartbeat.authority_index,
 					&network_state
 				);
+
+				Ok(().into())
 			} else if exists {
 				Err(Error::<T>::DuplicatedHeartbeat)?
 			} else {
 				Err(Error::<T>::InvalidKey)?
 			}
 		}
+	}
 
-		// Runs after every block.
-		fn offchain_worker(now: T::BlockNumber) {
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+		fn offchain_worker(now: BlockNumberFor<T>) {
 			// Only send messages if we are a potential validator.
 			if sp_io::offchain::is_validator() {
 				for res in Self::send_heartbeats(now).into_iter().flatten() {
@@ -410,15 +450,69 @@ decl_module! {
 			}
 		}
 	}
-}
 
-type OffchainResult<T, A> = Result<A, OffchainErr<<T as frame_system::Config>::BlockNumber>>;
+	/// Invalid transaction custom error. Returned when validators_len field in heartbeat is incorrect.
+	pub(crate) const INVALID_VALIDATORS_LEN: u8 = 10;
+
+	#[pallet::validate_unsigned]
+	impl<T: Config> ValidateUnsigned for Pallet<T> {
+		type Call = Call<T>;
+
+		fn validate_unsigned(_source: TransactionSource, call: &Self::Call) -> TransactionValidity {
+			if let Call::heartbeat(heartbeat, signature) = call {
+				if <Pallet<T>>::is_online(heartbeat.authority_index) {
+					// we already received a heartbeat for this authority
+					return InvalidTransaction::Stale.into();
+				}
+
+				// check if session index from heartbeat is recent
+				let current_session = T::ValidatorSet::session_index();
+				if heartbeat.session_index != current_session {
+					return InvalidTransaction::Stale.into();
+				}
+
+				// verify that the incoming (unverified) pubkey is actually an authority id
+				let keys = Keys::<T>::get();
+				if keys.len() as u32 != heartbeat.validators_len {
+					return InvalidTransaction::Custom(INVALID_VALIDATORS_LEN).into();
+				}
+				let authority_id = match keys.get(heartbeat.authority_index as usize) {
+					Some(id) => id,
+					None => return InvalidTransaction::BadProof.into(),
+				};
+
+				// check signature (this is expensive so we do it last).
+				let signature_valid = heartbeat.using_encoded(|encoded_heartbeat| {
+					authority_id.verify(&encoded_heartbeat, &signature)
+				});
+
+				if !signature_valid {
+					return InvalidTransaction::BadProof.into();
+				}
+
+				ValidTransaction::with_tag_prefix("ImOnline")
+					.priority(T::UnsignedPriority::get())
+					.and_provides((current_session, authority_id))
+					.longevity(
+						TryInto::<u64>::try_into(
+							T::NextSessionRotation::average_session_length() / 2u32.into(),
+						)
+						.unwrap_or(64_u64),
+					)
+					.propagate(true)
+					.build()
+			} else {
+				InvalidTransaction::Call.into()
+			}
+		}
+	}
+}
 
 /// Keep track of number of authored blocks per authority, uncles are counted as
 /// well since they're a valid proof of being online.
 impl<
 	T: Config + pallet_authorship::Config,
-> pallet_authorship::EventHandler<ValidatorId<T>, T::BlockNumber> for Module<T>
+> pallet_authorship::EventHandler<ValidatorId<T>, T::BlockNumber> for Pallet<T>
 {
 	fn note_author(author: ValidatorId<T>) {
 		Self::note_authorship(author);
@@ -429,7 +523,7 @@ impl<
 	}
 }
 
-impl<T: Config> Module<T> {
+impl<T: Config> Pallet<T> {
 	/// Returns `true` if a heartbeat has been received for the authority at
 	/// `authority_index` in the authorities series or if the authority has
 	/// authored at least one block, during the current session. Otherwise
@@ -449,8 +543,8 @@ impl<T: Config> Module<T> {
 	fn is_online_aux(authority_index: AuthIndex, authority: &ValidatorId<T>) -> bool {
 		let current_session = T::ValidatorSet::session_index();
 
-		<ReceivedHeartbeats>::contains_key(&current_session, &authority_index) ||
-			<AuthoredBlocks<T>>::get(
+		ReceivedHeartbeats::<T>::contains_key(&current_session, &authority_index) ||
+			AuthoredBlocks::<T>::get(
 				&current_session,
 				authority,
 			) != 0
@@ -460,14 +554,14 @@ impl<T: Config> Module<T> {
 	/// the authorities series, during the current session. Otherwise `false`.
 	pub fn received_heartbeat_in_current_session(authority_index: AuthIndex) -> bool {
 		let current_session = T::ValidatorSet::session_index();
-		<ReceivedHeartbeats>::contains_key(&current_session, &authority_index)
+		ReceivedHeartbeats::<T>::contains_key(&current_session, &authority_index)
 	}
 
 	/// Note that the given authority has authored a block in the current session.
 	fn note_authorship(author: ValidatorId<T>) {
 		let current_session = T::ValidatorSet::session_index();
 
-		<AuthoredBlocks<T>>::mutate(
+		AuthoredBlocks::<T>::mutate(
 			&current_session,
 			author,
 			|authored| *authored += 1,
@@ -648,11 +742,11 @@ impl<T: Config> Module<T> {
 	}
 }
 
-impl<T: Config> sp_runtime::BoundToRuntimeAppPublic for Module<T> {
+impl<T: Config> sp_runtime::BoundToRuntimeAppPublic for Pallet<T> {
 	type Public = T::AuthorityId;
 }
 
-impl<T: Config> OneSessionHandler<T::AccountId> for Module<T> {
+impl<T: Config> OneSessionHandler<T::AccountId> for Pallet<T> {
 	type Key = T::AuthorityId;
 
 	fn on_genesis_session<'a, I: 'a>(validators: I)
@@ -693,13 +787,13 @@ impl<T: Config> OneSessionHandler<T::AccountId> for Module<T> {
 		// Remove all received heartbeats and number of authored blocks from the
 		// current session, they have already been processed and won't be needed
 		// anymore.
-		<ReceivedHeartbeats>::remove_prefix(&T::ValidatorSet::session_index());
-		<AuthoredBlocks<T>>::remove_prefix(&T::ValidatorSet::session_index());
+		ReceivedHeartbeats::<T>::remove_prefix(&T::ValidatorSet::session_index());
+		AuthoredBlocks::<T>::remove_prefix(&T::ValidatorSet::session_index());
 
 		if offenders.is_empty() {
-			Self::deposit_event(RawEvent::AllGood);
+			Self::deposit_event(Event::<T>::AllGood);
 		} else {
-			Self::deposit_event(RawEvent::SomeOffline(offenders.clone()));
+			Self::deposit_event(Event::<T>::SomeOffline(offenders.clone()));
 
 			let validator_set_count = keys.len() as u32;
 			let offence = UnresponsivenessOffence { session_index, validator_set_count, offenders };
@@ -714,61 +808,6 @@ impl<T: Config> OneSessionHandler<T::AccountId> for Module<T> {
 	}
 }
 
-/// Invalid transaction custom error. Returned when validators_len field in heartbeat is incorrect.
-const INVALID_VALIDATORS_LEN: u8 = 10;
-
-impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
-	type Call = Call<T>;
-
-	fn validate_unsigned(_source: TransactionSource, call: &Self::Call) -> TransactionValidity {
-		if let Call::heartbeat(heartbeat, signature) = call {
-			if <Module<T>>::is_online(heartbeat.authority_index) {
-				// we already received a heartbeat for this authority
-				return InvalidTransaction::Stale.into();
-			}
-
-			// check if session index from heartbeat is recent
-			let current_session = T::ValidatorSet::session_index();
-			if heartbeat.session_index != current_session {
-				return InvalidTransaction::Stale.into();
-			}
-
-			// verify that the incoming (unverified) pubkey is actually an authority id
-			let keys = Keys::<T>::get();
-			if keys.len() as u32 != heartbeat.validators_len {
-				return InvalidTransaction::Custom(INVALID_VALIDATORS_LEN).into();
-			}
-			let authority_id = match keys.get(heartbeat.authority_index as usize) {
-				Some(id) => id,
-				None => return InvalidTransaction::BadProof.into(),
-			};
-
-			// check signature (this is expensive so we do it last).
-			let signature_valid = heartbeat.using_encoded(|encoded_heartbeat| {
-				authority_id.verify(&encoded_heartbeat, &signature)
-			});
-
-			if !signature_valid {
-				return InvalidTransaction::BadProof.into();
-			}
-
-			ValidTransaction::with_tag_prefix("ImOnline")
-				.priority(T::UnsignedPriority::get())
-				.and_provides((current_session, authority_id))
-				.longevity(
-					TryInto::<u64>::try_into(
-						T::NextSessionRotation::average_session_length() / 2u32.into(),
-					)
-					.unwrap_or(64_u64),
-				)
-				.propagate(true)
-				.build()
-		} else {
-			InvalidTransaction::Call.into()
-		}
-	}
-}
-
 /// An offence that is filed if a validator didn't send a heartbeat message.
 #[derive(RuntimeDebug)]
 #[cfg_attr(feature = "std", derive(Clone, PartialEq, Eq))]
diff --git a/frame/im-online/src/tests.rs b/frame/im-online/src/tests.rs
index f447a2ade548..5ce931875b9a 100644
--- a/frame/im-online/src/tests.rs
+++ b/frame/im-online/src/tests.rs
@@ -29,7 +29,7 @@ use sp_core::offchain::{
 	testing::{TestOffchainExt, TestTransactionPoolExt},
 };
 use frame_support::{dispatch, assert_noop};
-use sp_runtime::{testing::UintAuthorityId, transaction_validity::TransactionValidityError};
+use sp_runtime::{testing::UintAuthorityId, transaction_validity::{TransactionValidityError, InvalidTransaction}};
 
 #[test]
 fn test_unresponsiveness_slash_fraction() {
@@ -114,7 +114,7 @@ fn heartbeat(
 	authority_index: u32,
 	id: UintAuthorityId,
 	validators: Vec<u64>,
-) -> dispatch::DispatchResult {
+) -> dispatch::DispatchResultWithPostInfo {
 	use frame_support::unsigned::ValidateUnsigned;
 
 	let heartbeat = Heartbeat {
diff --git a/frame/offences/benchmarking/src/lib.rs b/frame/offences/benchmarking/src/lib.rs
index 4e5160c6673f..f65bdddd36d0 100644
--- a/frame/offences/benchmarking/src/lib.rs
+++ b/frame/offences/benchmarking/src/lib.rs
@@ -37,7 +37,7 @@ use sp_staking::offence::{ReportOffence, Offence};
 use pallet_balances::Config as BalancesConfig;
 use pallet_babe::BabeEquivocationOffence;
 use pallet_grandpa::{GrandpaEquivocationOffence, GrandpaTimeSlot};
-use pallet_im_online::{Config as ImOnlineConfig, Module as ImOnline, UnresponsivenessOffence};
+use pallet_im_online::{Config as ImOnlineConfig, Pallet as ImOnline, UnresponsivenessOffence};
 use pallet_offences::{Config as OffencesConfig, Module as Offences};
 use pallet_session::historical::{Config as HistoricalConfig, IdentificationTuple};
 use pallet_session::{Config as SessionConfig, SessionManager};

From b1f4ef1a6dbd25a340c08e6b63d4f54afc962412 Mon Sep 17 00:00:00 2001
From: Aten <jincxmain@gmail.com>
Date: Wed, 5 May 2021 22:41:30 +0800
Subject: [PATCH 0706/1194] remove patract ss58version for it's useless now
 (#8738)

---
 primitives/core/src/crypto.rs | 2 --
 ss58-registry.json            | 9 ---------
 2 files changed, 11 deletions(-)

diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index 3479fc28c635..f5b7606be558 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -540,8 +540,6 @@ ss58_address_format!(
 		(25, "alphaville", "ZERO testnet, standard account (*25519).")
 	JupiterAccount =>
 		(26, "jupiter", "Jupiter testnet, standard account (*25519).")
-	PatractAccount =>
-		(27, "patract", "Patract mainnet, standard account (*25519).")
 	SubsocialAccount =>
 		(28, "subsocial", "Subsocial network, standard account (*25519).")
 	DhiwayAccount =>
diff --git a/ss58-registry.json b/ss58-registry.json
index 624d0256a81f..a0d762f50eae 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -253,15 +253,6 @@
 			"standardAccount": "*25519",
 			"website": "https://jupiter.patract.io"
 		},
-		{
-			"prefix": 27,
-			"network": "patract",
-			"displayName": "Patract",
-			"symbols": ["pDOT", "pKSM"],
-			"decimals": [10, 12],
-			"standardAccount": "*25519",
-			"website": "https://patract.network"
-		},
 		{
 			"prefix": 28,
 			"network": "subsocial",

From 7fdd8e8ba32f3d47d2dc31fecf12c59e1e764296 Mon Sep 17 00:00:00 2001
From: Shaun Wang <spxwang@gmail.com>
Date: Thu, 6 May 2021 03:12:20 +1200
Subject: [PATCH 0707/1194] Migrate pallet-nicks to pallet attribute macro.
 (#8723)

* Migrate pallet-nicks to pallet attribute macro.

* Fix constants.
---
 frame/nicks/src/lib.rs | 150 ++++++++++++++++++++++-------------------
 1 file changed, 79 insertions(+), 71 deletions(-)

diff --git a/frame/nicks/src/lib.rs b/frame/nicks/src/lib.rs
index 1afe55756777..a6d2415ab96e 100644
--- a/frame/nicks/src/lib.rs
+++ b/frame/nicks/src/lib.rs
@@ -15,16 +15,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! # Nicks Module
+//! # Nicks Pallet
 //!
 //! - [`Config`]
 //! - [`Call`]
 //!
 //! ## Overview
 //!
-//! Nicks is an example module for keeping track of account names on-chain. It makes no effort to
+//! Nicks is an example pallet for keeping track of account names on-chain. It makes no effort to
 //! create a name hierarchy, be a DNS replacement or provide reverse lookups. Furthermore, the
-//! weights attached to this module's dispatchable functions are for demonstration purposes only and
+//! weights attached to this pallet's dispatchable functions are for demonstration purposes only and
 //! have not been designed to be economically secure. Do not use this pallet as-is in production.
 //!
 //! ## Interface
@@ -45,63 +45,64 @@ use sp_std::prelude::*;
 use sp_runtime::{
 	traits::{StaticLookup, Zero}
 };
-use frame_support::{
-	decl_module, decl_event, decl_storage, ensure, decl_error,
-	traits::{Currency, EnsureOrigin, ReservableCurrency, OnUnbalanced, Get},
-};
-use frame_system::ensure_signed;
+use frame_support::traits::{Currency, ReservableCurrency, OnUnbalanced};
+pub use pallet::*;
 
 type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
 
-pub trait Config: frame_system::Config {
-	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
+#[frame_support::pallet]
+pub mod pallet {
+	use frame_system::{ensure_signed, pallet_prelude::*};
+	use frame_support::{ensure, pallet_prelude::*, traits::{EnsureOrigin, Get}};
+	use super::*;
 
-	/// The currency trait.
-	type Currency: ReservableCurrency<Self::AccountId>;
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		/// The overarching event type.
+		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
 
-	/// Reservation fee.
-	type ReservationFee: Get<BalanceOf<Self>>;
+		/// The currency trait.
+		type Currency: ReservableCurrency<Self::AccountId>;
 
-	/// What to do with slashed funds.
-	type Slashed: OnUnbalanced<NegativeImbalanceOf<Self>>;
+		/// Reservation fee.
+		#[pallet::constant]
+		type ReservationFee: Get<BalanceOf<Self>>;
 
-	/// The origin which may forcibly set or remove a name. Root can always do this.
-	type ForceOrigin: EnsureOrigin<Self::Origin>;
+		/// What to do with slashed funds.
+		type Slashed: OnUnbalanced<NegativeImbalanceOf<Self>>;
 
-	/// The minimum length a name may be.
-	type MinLength: Get<usize>;
+		/// The origin which may forcibly set or remove a name. Root can always do this.
+		type ForceOrigin: EnsureOrigin<Self::Origin>;
 
-	/// The maximum length a name may be.
-	type MaxLength: Get<usize>;
-}
+		/// The minimum length a name may be.
+		#[pallet::constant]
+		type MinLength: Get<u32>;
 
-decl_storage! {
-	trait Store for Module<T: Config> as Nicks {
-		/// The lookup table for names.
-		NameOf: map hasher(twox_64_concat) T::AccountId => Option<(Vec<u8>, BalanceOf<T>)>;
+		/// The maximum length a name may be.
+		#[pallet::constant]
+		type MaxLength: Get<u32>;
 	}
-}
 
-decl_event!(
-	pub enum Event<T> where AccountId = <T as frame_system::Config>::AccountId, Balance = BalanceOf<T> {
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	#[pallet::metadata(T::AccountId = "AccountId", BalanceOf<T> = "Balance")]
+	pub enum Event<T: Config> {
 		/// A name was set. \[who\]
-		NameSet(AccountId),
+		NameSet(T::AccountId),
 		/// A name was forcibly set. \[target\]
-		NameForced(AccountId),
+		NameForced(T::AccountId),
 		/// A name was changed. \[who\]
-		NameChanged(AccountId),
+		NameChanged(T::AccountId),
 		/// A name was cleared, and the given balance returned. \[who, deposit\]
-		NameCleared(AccountId, Balance),
+		NameCleared(T::AccountId, BalanceOf<T>),
 		/// A name was removed and the given balance slashed. \[target, deposit\]
-		NameKilled(AccountId, Balance),
+		NameKilled(T::AccountId, BalanceOf<T>),
 	}
-);
 
-decl_error! {
-	/// Error for the nicks module.
-	pub enum Error for Module<T: Config> {
+	/// Error for the nicks pallet.
+	#[pallet::error]
+	pub enum Error<T> {
 		/// A name is too short.
 		TooShort,
 		/// A name is too long.
@@ -109,24 +110,20 @@ decl_error! {
 		/// An account isn't named.
 		Unnamed,
 	}
-}
-
-decl_module! {
-	/// Nicks module declaration.
-	pub struct Module<T: Config> for enum Call where origin: T::Origin {
-		type Error = Error<T>;
-
-		fn deposit_event() = default;
 
-		/// Reservation fee.
-		const ReservationFee: BalanceOf<T> = T::ReservationFee::get();
+	/// The lookup table for names.
+	#[pallet::storage]
+	pub(super) type NameOf<T: Config> = StorageMap<_, Twox64Concat, T::AccountId, (Vec<u8>, BalanceOf<T>)>;
 
-		/// The minimum length a name may be.
-		const MinLength: u32 = T::MinLength::get() as u32;
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(_);
 
-		/// The maximum length a name may be.
-		const MaxLength: u32 = T::MaxLength::get() as u32;
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
 
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
 		/// Set an account's name. The name should be a UTF-8-encoded string by convention, though
 		/// we don't check it.
 		///
@@ -143,24 +140,25 @@ decl_module! {
 		/// - One storage read/write.
 		/// - One event.
 		/// # </weight>
-		#[weight = 50_000_000]
-		fn set_name(origin, name: Vec<u8>) {
+		#[pallet::weight(50_000_000)]
+		pub(super) fn set_name(origin: OriginFor<T>, name: Vec<u8>) -> DispatchResultWithPostInfo {
 			let sender = ensure_signed(origin)?;
 
-			ensure!(name.len() >= T::MinLength::get(), Error::<T>::TooShort);
-			ensure!(name.len() <= T::MaxLength::get(), Error::<T>::TooLong);
+			ensure!(name.len() >= T::MinLength::get() as usize, Error::<T>::TooShort);
+			ensure!(name.len() <= T::MaxLength::get() as usize, Error::<T>::TooLong);
 
 			let deposit = if let Some((_, deposit)) = <NameOf<T>>::get(&sender) {
-				Self::deposit_event(RawEvent::NameChanged(sender.clone()));
+				Self::deposit_event(Event::<T>::NameChanged(sender.clone()));
 				deposit
 			} else {
 				let deposit = T::ReservationFee::get();
 				T::Currency::reserve(&sender, deposit.clone())?;
-				Self::deposit_event(RawEvent::NameSet(sender.clone()));
+				Self::deposit_event(Event::<T>::NameSet(sender.clone()));
 				deposit
 			};
 
 			<NameOf<T>>::insert(&sender, (name, deposit));
+			Ok(().into())
 		}
 
 		/// Clear an account's name and return the deposit. Fails if the account was not named.
@@ -173,8 +171,8 @@ decl_module! {
 		/// - One storage read/write.
 		/// - One event.
 		/// # </weight>
-		#[weight = 70_000_000]
-		fn clear_name(origin) {
+		#[pallet::weight(70_000_000)]
+		pub(super) fn clear_name(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
 			let sender = ensure_signed(origin)?;
 
 			let deposit = <NameOf<T>>::take(&sender).ok_or(Error::<T>::Unnamed)?.1;
@@ -182,7 +180,8 @@ decl_module! {
 			let err_amount = T::Currency::unreserve(&sender, deposit.clone());
 			debug_assert!(err_amount.is_zero());
 
-			Self::deposit_event(RawEvent::NameCleared(sender, deposit));
+			Self::deposit_event(Event::<T>::NameCleared(sender, deposit));
+			Ok(().into())
 		}
 
 		/// Remove an account's name and take charge of the deposit.
@@ -198,8 +197,11 @@ decl_module! {
 		/// - One storage read/write.
 		/// - One event.
 		/// # </weight>
-		#[weight = 70_000_000]
-		fn kill_name(origin, target: <T::Lookup as StaticLookup>::Source) {
+		#[pallet::weight(70_000_000)]
+		pub(super) fn kill_name(
+			origin: OriginFor<T>,
+			target: <T::Lookup as StaticLookup>::Source
+		) -> DispatchResultWithPostInfo {
 			T::ForceOrigin::ensure_origin(origin)?;
 
 			// Figure out who we're meant to be clearing.
@@ -209,7 +211,8 @@ decl_module! {
 			// Slash their deposit from them.
 			T::Slashed::on_unbalanced(T::Currency::slash_reserved(&target, deposit.clone()).0);
 
-			Self::deposit_event(RawEvent::NameKilled(target, deposit));
+			Self::deposit_event(Event::<T>::NameKilled(target, deposit));
+			Ok(().into())
 		}
 
 		/// Set a third-party account's name with no deposit.
@@ -224,15 +227,20 @@ decl_module! {
 		/// - One storage read/write.
 		/// - One event.
 		/// # </weight>
-		#[weight = 70_000_000]
-		fn force_name(origin, target: <T::Lookup as StaticLookup>::Source, name: Vec<u8>) {
+		#[pallet::weight(70_000_000)]
+		pub(super) fn force_name(
+			origin: OriginFor<T>,
+			target: <T::Lookup as StaticLookup>::Source,
+			name: Vec<u8>
+		) -> DispatchResultWithPostInfo {
 			T::ForceOrigin::ensure_origin(origin)?;
 
 			let target = T::Lookup::lookup(target)?;
 			let deposit = <NameOf<T>>::get(&target).map(|x| x.1).unwrap_or_else(Zero::zero);
 			<NameOf<T>>::insert(&target, (name, deposit));
 
-			Self::deposit_event(RawEvent::NameForced(target));
+			Self::deposit_event(Event::<T>::NameForced(target));
+			Ok(().into())
 		}
 	}
 }
@@ -308,8 +316,8 @@ mod tests {
 	}
 	parameter_types! {
 		pub const ReservationFee: u64 = 2;
-		pub const MinLength: usize = 3;
-		pub const MaxLength: usize = 16;
+		pub const MinLength: u32 = 3;
+		pub const MaxLength: u32 = 16;
 	}
 	ord_parameter_types! {
 		pub const One: u64 = 1;

From 37effc7ebc924394c00affbaba88f62f690b86e7 Mon Sep 17 00:00:00 2001
From: Roman Proskuryakov <humbug@deeptown.org>
Date: Wed, 5 May 2021 15:33:52 +0000
Subject: [PATCH 0708/1194] Add a readme about feature metered for sp-utils
 (#8736)

---
 primitives/utils/README.md  | 19 ++++++++++++++++++-
 primitives/utils/src/lib.rs | 17 +++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/primitives/utils/README.md b/primitives/utils/README.md
index b0e04a3f4f19..2da70f09ccbc 100644
--- a/primitives/utils/README.md
+++ b/primitives/utils/README.md
@@ -1,3 +1,20 @@
 Utilities Primitives for Substrate
 
-License: Apache-2.0
\ No newline at end of file
+## Features
+
+### metered
+
+This feature changes the behaviour of the function `mpsc::tracing_unbounded`.
+With the disabled feature this function is an alias to `futures::channel::mpsc::unbounded`.
+However, when the feature is enabled it creates wrapper types to `UnboundedSender<T>`
+and `UnboundedReceiver<T>` to register every `send`/`received`/`dropped` action happened on
+the channel.
+
+Also this feature creates and registers a prometheus vector with name `unbounded_channel_len` and labels:
+
+| Label        | Description                                   |
+| ------------ | --------------------------------------------- |
+| entity       | Name of channel passed to `tracing_unbounded` |
+| action       | One of `send`/`received`/`dropped`            |
+
+License: Apache-2.0
diff --git a/primitives/utils/src/lib.rs b/primitives/utils/src/lib.rs
index 430ec1ecb6f6..6461361c96d1 100644
--- a/primitives/utils/src/lib.rs
+++ b/primitives/utils/src/lib.rs
@@ -16,6 +16,23 @@
 // limitations under the License.
 
 //! Utilities Primitives for Substrate
+//!
+//! # Features
+//!
+//! ## metered
+//!
+//! This feature changes the behaviour of the function `mpsc::tracing_unbounded`.
+//! With the disabled feature this function is an alias to `futures::channel::mpsc::unbounded`.
+//! However, when the feature is enabled it creates wrapper types to `UnboundedSender<T>`
+//! and `UnboundedReceiver<T>` to register every `send`/`received`/`dropped` action happened on
+//! the channel.
+//!
+//! Also this feature creates and registers a prometheus vector with name `unbounded_channel_len` and labels:
+//!
+//! | Label        | Description                                   |
+//! | ------------ | --------------------------------------------- |
+//! | entity       | Name of channel passed to `tracing_unbounded` |
+//! | action       | One of `send`/`received`/`dropped`            |
 
 pub mod metrics;
 pub mod mpsc;

From e5437efefa82bd8eb567f1245f0a7443ac4e4fe7 Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Wed, 5 May 2021 19:16:34 +0300
Subject: [PATCH 0709/1194] Added client function to delete a recent block
 (#8533)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Implemented recent block removal

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 client/api/src/backend.rs           |   6 +
 client/api/src/in_mem.rs            |   7 +
 client/api/src/leaves.rs            |   4 +-
 client/db/src/lib.rs                |  86 +++++++++++
 client/light/src/backend.rs         |   7 +
 client/state-db/src/lib.rs          |  17 +++
 client/state-db/src/noncanonical.rs | 215 ++++++++++++++++++++++------
 7 files changed, 294 insertions(+), 48 deletions(-)

diff --git a/client/api/src/backend.rs b/client/api/src/backend.rs
index 14841d8d3e96..09e9e0cb2e17 100644
--- a/client/api/src/backend.rs
+++ b/client/api/src/backend.rs
@@ -475,6 +475,12 @@ pub trait Backend<Block: BlockT>: AuxStore + Send + Sync {
 		revert_finalized: bool,
 	) -> sp_blockchain::Result<(NumberFor<Block>, HashSet<Block::Hash>)>;
 
+	/// Discard non-best, unfinalized leaf block.
+	fn remove_leaf_block(
+		&self,
+		hash: &Block::Hash,
+	) -> sp_blockchain::Result<()>;
+
 	/// Insert auxiliary data into key-value store.
 	fn insert_aux<
 		'a,
diff --git a/client/api/src/in_mem.rs b/client/api/src/in_mem.rs
index 409b5f52b5d3..d756e1cc0bbc 100644
--- a/client/api/src/in_mem.rs
+++ b/client/api/src/in_mem.rs
@@ -770,6 +770,13 @@ impl<Block: BlockT> backend::Backend<Block> for Backend<Block> where Block::Hash
 		Ok((Zero::zero(), HashSet::new()))
 	}
 
+	fn remove_leaf_block(
+		&self,
+		_hash: &Block::Hash,
+	) -> sp_blockchain::Result<()> {
+		Ok(())
+	}
+
 	fn get_import_lock(&self) -> &RwLock<()> {
 		&self.import_lock
 	}
diff --git a/client/api/src/leaves.rs b/client/api/src/leaves.rs
index 47cac8b186f4..0474d5bb8fe1 100644
--- a/client/api/src/leaves.rs
+++ b/client/api/src/leaves.rs
@@ -216,8 +216,8 @@ impl<H, N> LeafSet<H, N> where
 		self.pending_removed.clear();
 	}
 
-	#[cfg(test)]
-	fn contains(&self, number: N, hash: H) -> bool {
+	/// Check if given block is a leaf.
+	pub fn contains(&self, number: N, hash: H) -> bool {
 		self.storage.get(&Reverse(number)).map_or(false, |hashes| hashes.contains(&hash))
 	}
 
diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index c7bac13e719d..94535cf28aea 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -623,6 +623,7 @@ impl<Block: BlockT> HeaderMetadata<Block> for BlockchainDb<Block> {
 	}
 
 	fn remove_header_metadata(&self, hash: Block::Hash) {
+		self.header_cache.lock().remove(&hash);
 		self.header_metadata_cache.remove_header_metadata(hash);
 	}
 }
@@ -1972,6 +1973,59 @@ impl<Block: BlockT> sc_client_api::backend::Backend<Block> for Backend<Block> {
 		Ok((reverted, reverted_finalized))
 	}
 
+	fn remove_leaf_block(
+		&self,
+		hash: &Block::Hash,
+	) -> ClientResult<()> {
+		let best_hash = self.blockchain.info().best_hash;
+
+		if best_hash == *hash {
+			return Err(
+				sp_blockchain::Error::Backend(
+					format!("Can't remove best block {:?}", hash)
+				)
+			)
+		}
+
+		let hdr = self.blockchain.header_metadata(hash.clone())?;
+		if !self.have_state_at(&hash, hdr.number) {
+			return Err(
+				sp_blockchain::Error::UnknownBlock(
+					format!("State already discarded for {:?}", hash)
+				)
+			)
+		}
+
+		let mut leaves = self.blockchain.leaves.write();
+		if !leaves.contains(hdr.number, *hash) {
+			return Err(
+				sp_blockchain::Error::Backend(
+					format!("Can't remove non-leaf block {:?}", hash)
+				)
+			)
+		}
+
+		let mut transaction = Transaction::new();
+		if let Some(commit) = self.storage.state_db.remove(hash) {
+			apply_state_commit(&mut transaction, commit);
+		}
+		transaction.remove(columns::KEY_LOOKUP, hash.as_ref());
+		let changes_trie_cache_ops = self.changes_tries_storage.revert(
+			&mut transaction,
+			&cache::ComplexBlockId::new(
+				*hash,
+				hdr.number,
+			),
+		)?;
+
+		self.changes_tries_storage.post_commit(Some(changes_trie_cache_ops));
+		leaves.revert(hash.clone(), hdr.number);
+		leaves.prepare_transaction(&mut transaction, columns::META, meta_keys::LEAF_PREFIX);
+		self.storage.db.commit(transaction)?;
+		self.blockchain().remove_header_metadata(*hash);
+		Ok(())
+	}
+
 	fn blockchain(&self) -> &BlockchainDb<Block> {
 		&self.blockchain
 	}
@@ -3008,4 +3062,36 @@ pub(crate) mod tests {
 			}
 		}
 	}
+
+	#[test]
+	fn remove_leaf_block_works() {
+		let backend = Backend::<Block>::new_test_with_tx_storage(
+			2,
+			10,
+			TransactionStorageMode::StorageChain
+		);
+		let mut blocks = Vec::new();
+		let mut prev_hash = Default::default();
+		for i in 0 .. 2 {
+			let hash = insert_block(&backend, i, prev_hash, None, Default::default(), vec![i.into()], None);
+			blocks.push(hash);
+			prev_hash = hash;
+		}
+
+		// insert a fork at block 2, which becomes best block
+		let best_hash = insert_block(
+			&backend,
+			1,
+			blocks[0],
+			None,
+			sp_core::H256::random(),
+			vec![42.into()],
+			None
+		);
+		assert!(backend.remove_leaf_block(&best_hash).is_err());
+		assert!(backend.have_state_at(&prev_hash, 1));
+		backend.remove_leaf_block(&prev_hash).unwrap();
+		assert_eq!(None, backend.blockchain().header(BlockId::hash(prev_hash.clone())).unwrap());
+		assert!(!backend.have_state_at(&prev_hash, 1));
+	}
 }
diff --git a/client/light/src/backend.rs b/client/light/src/backend.rs
index 621ada13ff61..d6f86209afe9 100644
--- a/client/light/src/backend.rs
+++ b/client/light/src/backend.rs
@@ -246,6 +246,13 @@ impl<S, Block> ClientBackend<Block> for Backend<S, HashFor<Block>>
 		Err(ClientError::NotAvailableOnLightClient)
 	}
 
+	fn remove_leaf_block(
+		&self,
+		_hash: &Block::Hash,
+	) -> ClientResult<()> {
+		Err(ClientError::NotAvailableOnLightClient)
+	}
+
 	fn get_import_lock(&self) -> &RwLock<()> {
 		&self.import_lock
 	}
diff --git a/client/state-db/src/lib.rs b/client/state-db/src/lib.rs
index 8961f2549b2d..1340442061ab 100644
--- a/client/state-db/src/lib.rs
+++ b/client/state-db/src/lib.rs
@@ -364,6 +364,17 @@ impl<BlockHash: Hash + MallocSizeOf, Key: Hash + MallocSizeOf> StateDbSync<Block
 		}
 	}
 
+	fn remove(&mut self, hash: &BlockHash) -> Option<CommitSet<Key>> {
+		match self.mode {
+			PruningMode::ArchiveAll => {
+				Some(CommitSet::default())
+			},
+			PruningMode::ArchiveCanonical | PruningMode::Constrained(_) => {
+				self.non_canonical.remove(hash)
+			},
+		}
+	}
+
 	fn pin(&mut self, hash: &BlockHash) -> Result<(), PinError> {
 		match self.mode {
 			PruningMode::ArchiveAll => Ok(()),
@@ -509,6 +520,12 @@ impl<BlockHash: Hash + MallocSizeOf, Key: Hash + MallocSizeOf> StateDb<BlockHash
 		self.db.write().revert_one()
 	}
 
+	/// Remove specified non-canonical block.
+	/// Returns a database commit or `None` if not possible.
+	pub fn remove(&self, hash: &BlockHash) -> Option<CommitSet<Key>> {
+		self.db.write().remove(hash)
+	}
+
 	/// Returns last finalized block number.
 	pub fn best_canonical(&self) -> Option<u64> {
 		return self.db.read().best_canonical()
diff --git a/client/state-db/src/noncanonical.rs b/client/state-db/src/noncanonical.rs
index 3f0c7d132f74..1a680b16ffbe 100644
--- a/client/state-db/src/noncanonical.rs
+++ b/client/state-db/src/noncanonical.rs
@@ -36,7 +36,7 @@ const MAX_BLOCKS_PER_LEVEL: u64 = 32;
 #[derive(parity_util_mem_derive::MallocSizeOf)]
 pub struct NonCanonicalOverlay<BlockHash: Hash, Key: Hash> {
 	last_canonicalized: Option<(BlockHash, u64)>,
-	levels: VecDeque<Vec<BlockOverlay<BlockHash, Key>>>,
+	levels: VecDeque<OverlayLevel<BlockHash, Key>>,
 	parents: HashMap<BlockHash, BlockHash>,
 	pending_canonicalizations: Vec<BlockHash>,
 	pending_insertions: Vec<BlockHash>,
@@ -46,6 +46,36 @@ pub struct NonCanonicalOverlay<BlockHash: Hash, Key: Hash> {
 	pinned_insertions: HashMap<BlockHash, (Vec<Key>, u32)>,
 }
 
+#[derive(parity_util_mem_derive::MallocSizeOf)]
+#[cfg_attr(test, derive(PartialEq, Debug))]
+struct OverlayLevel<BlockHash: Hash, Key: Hash> {
+	blocks: Vec<BlockOverlay<BlockHash, Key>>,
+	used_indicies: u64, // Bitmask of available journal indicies.
+}
+
+impl<BlockHash: Hash, Key: Hash> OverlayLevel<BlockHash, Key> {
+	fn push(&mut self, overlay: BlockOverlay<BlockHash, Key>) {
+		self.used_indicies |= 1 << overlay.journal_index;
+		self.blocks.push(overlay)
+	}
+
+	fn available_index(&self) -> u64 {
+		self.used_indicies.trailing_ones() as u64
+	}
+
+	fn remove(&mut self, index: usize) -> BlockOverlay<BlockHash, Key> {
+		self.used_indicies &= !(1 << self.blocks[index].journal_index);
+		self.blocks.remove(index)
+	}
+
+	fn new() -> OverlayLevel<BlockHash, Key> {
+		OverlayLevel {
+			blocks: Vec::new(),
+			used_indicies: 0,
+		}
+	}
+}
+
 #[derive(Encode, Decode)]
 struct JournalRecord<BlockHash: Hash, Key: Hash> {
 	hash: BlockHash,
@@ -62,6 +92,7 @@ fn to_journal_key(block: u64, index: u64) -> Vec<u8> {
 #[derive(parity_util_mem_derive::MallocSizeOf)]
 struct BlockOverlay<BlockHash: Hash, Key: Hash> {
 	hash: BlockHash,
+	journal_index: u64,
 	journal_key: Vec<u8>,
 	inserted: Vec<Key>,
 	deleted: Vec<Key>,
@@ -93,7 +124,7 @@ fn discard_values<Key: Hash>(values: &mut HashMap<Key, (u32, DBValue)>, inserted
 }
 
 fn discard_descendants<BlockHash: Hash, Key: Hash>(
-	levels: &mut (&mut [Vec<BlockOverlay<BlockHash, Key>>], &mut [Vec<BlockOverlay<BlockHash, Key>>]),
+	levels: &mut (&mut [OverlayLevel<BlockHash, Key>], &mut [OverlayLevel<BlockHash, Key>]),
 	mut values: &mut HashMap<Key, (u32, DBValue)>,
 	parents: &mut HashMap<BlockHash, BlockHash>,
 	pinned: &HashMap<BlockHash, u32>,
@@ -111,36 +142,32 @@ fn discard_descendants<BlockHash: Hash, Key: Hash>(
 	};
 	let mut pinned_children = 0;
 	if let Some(level) = first {
-		*level = level.drain(..).filter_map(|overlay| {
-			let parent = parents.get(&overlay.hash)
-				.expect("there is a parent entry for each entry in levels; qed");
-
-			if parent == hash {
-				let mut num_pinned = discard_descendants(
-					&mut remainder,
-					values,
-					parents,
-					pinned,
-					pinned_insertions,
-					&overlay.hash
-				);
-				if pinned.contains_key(&overlay.hash) {
-					num_pinned += 1;
-				}
-				if num_pinned != 0 {
-					// save to be discarded later.
-					pinned_insertions.insert(overlay.hash.clone(), (overlay.inserted, num_pinned));
-					pinned_children += num_pinned;
-				} else {
-					// discard immediately.
-					parents.remove(&overlay.hash);
-					discard_values(&mut values, overlay.inserted);
-				}
-				None
+		while let Some(i) = level.blocks.iter().position(|overlay| parents.get(&overlay.hash)
+			.expect("there is a parent entry for each entry in levels; qed")
+			== hash)
+		{
+			let overlay = level.remove(i);
+			let mut num_pinned = discard_descendants(
+				&mut remainder,
+				values,
+				parents,
+				pinned,
+				pinned_insertions,
+				&overlay.hash
+			);
+			if pinned.contains_key(&overlay.hash) {
+				num_pinned += 1;
+			}
+			if num_pinned != 0 {
+				// save to be discarded later.
+				pinned_insertions.insert(overlay.hash.clone(), (overlay.inserted, num_pinned));
+				pinned_children += num_pinned;
 			} else {
-				Some(overlay)
+				// discard immediately.
+				parents.remove(&overlay.hash);
+				discard_values(&mut values, overlay.inserted);
 			}
-		}).collect();
+		}
 	}
 	pinned_children
 }
@@ -161,7 +188,7 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 			let mut total: u64 = 0;
 			block += 1;
 			loop {
-				let mut level = Vec::new();
+				let mut level = OverlayLevel::new();
 				for index in 0 .. MAX_BLOCKS_PER_LEVEL {
 					let journal_key = to_journal_key(block, index);
 					if let Some(record) = db.get_meta(&journal_key).map_err(|e| Error::Db(e))? {
@@ -169,6 +196,7 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 						let inserted = record.inserted.iter().map(|(k, _)| k.clone()).collect();
 						let overlay = BlockOverlay {
 							hash: record.hash.clone(),
+							journal_index: index,
 							journal_key,
 							inserted: inserted,
 							deleted: record.deleted,
@@ -187,7 +215,7 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 						total += 1;
 					}
 				}
-				if level.is_empty() {
+				if level.blocks.is_empty() {
 					break;
 				}
 				levels.push_back(level);
@@ -235,23 +263,24 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 			}
 		}
 		let level = if self.levels.is_empty() || number == front_block_number + self.levels.len() as u64 {
-			self.levels.push_back(Vec::new());
+			self.levels.push_back(OverlayLevel::new());
 			self.levels.back_mut().expect("can't be empty after insertion; qed")
 		} else {
 			self.levels.get_mut((number - front_block_number) as usize)
 				.expect("number is [front_block_number .. front_block_number + levels.len()) is asserted in precondition; qed")
 		};
 
-		if level.len() >= MAX_BLOCKS_PER_LEVEL as usize {
+		if level.blocks.len() >= MAX_BLOCKS_PER_LEVEL as usize {
 			return Err(Error::TooManySiblingBlocks);
 		}
 
-		let index = level.len() as u64;
+		let index = level.available_index();
 		let journal_key = to_journal_key(number, index);
 
 		let inserted = changeset.inserted.iter().map(|(k, _)| k.clone()).collect();
 		let overlay = BlockOverlay {
 			hash: hash.clone(),
+			journal_index: index,
 			journal_key: journal_key.clone(),
 			inserted: inserted,
 			deleted: changeset.deleted.clone(),
@@ -279,7 +308,7 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 		hash: &BlockHash
 	) {
 		if let Some(level) = self.levels.get(level_index) {
-			level.iter().for_each(|overlay| {
+			level.blocks.iter().for_each(|overlay| {
 				let parent = self.parents.get(&overlay.hash).expect("there is a parent entry for each entry in levels; qed").clone();
 				if parent == *hash {
 					discarded_journals.push(overlay.journal_key.clone());
@@ -310,7 +339,7 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 		let start = self.last_canonicalized_block_number().unwrap_or(0);
 		self.levels
 			.get(self.pending_canonicalizations.len())
-			.map(|level| level.iter().map(|r| (r.hash.clone(), start)).collect())
+			.map(|level| level.blocks.iter().map(|r| (r.hash.clone(), start)).collect())
 			.unwrap_or_default()
 	}
 
@@ -323,14 +352,14 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 	) -> Result<(), Error<E>> {
 		trace!(target: "state-db", "Canonicalizing {:?}", hash);
 		let level = self.levels.get(self.pending_canonicalizations.len()).ok_or_else(|| Error::InvalidBlock)?;
-		let index = level
+		let index = level.blocks
 			.iter()
 			.position(|overlay| overlay.hash == *hash)
 			.ok_or_else(|| Error::InvalidBlock)?;
 
 		let mut discarded_journals = Vec::new();
 		let mut discarded_blocks = Vec::new();
-		for (i, overlay) in level.iter().enumerate() {
+		for (i, overlay) in level.blocks.iter().enumerate() {
 			if i != index {
 				self.discard_journals(
 					self.pending_canonicalizations.len() + 1,
@@ -344,7 +373,7 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 		}
 
 		// get the one we need to canonicalize
-		let overlay = &level[index];
+		let overlay = &level.blocks[index];
 		commit.data.inserted.extend(overlay.inserted.iter()
 			.map(|k| (k.clone(), self.values.get(k).expect("For each key in overlays there's a value in values").1.clone())));
 		commit.data.deleted.extend(overlay.deleted.clone());
@@ -363,13 +392,13 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 		for hash in self.pending_canonicalizations.drain(..) {
 			trace!(target: "state-db", "Post canonicalizing {:?}", hash);
 			let level = self.levels.pop_front().expect("Hash validity is checked in `canonicalize`");
-			let index = level
+			let index = level.blocks
 				.iter()
 				.position(|overlay| overlay.hash == hash)
 				.expect("Hash validity is checked in `canonicalize`");
 
 			// discard unfinalized overlays and values
-			for (i, overlay) in level.into_iter().enumerate() {
+			for (i, overlay) in level.blocks.into_iter().enumerate() {
 				let mut pinned_children = if i != index {
 					discard_descendants(
 						&mut self.levels.as_mut_slices(),
@@ -421,7 +450,7 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 	pub fn revert_one(&mut self) -> Option<CommitSet<Key>> {
 		self.levels.pop_back().map(|level| {
 			let mut commit = CommitSet::default();
-			for overlay in level.into_iter() {
+			for overlay in level.blocks.into_iter() {
 				commit.meta.deleted.push(overlay.journal_key);
 				self.parents.remove(&overlay.hash);
 				discard_values(&mut self.values, overlay.inserted);
@@ -430,6 +459,36 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 		})
 	}
 
+	/// Revert a single block. Returns commit set that deletes the journal or `None` if not possible.
+	pub fn remove(&mut self, hash: &BlockHash) -> Option<CommitSet<Key>> {
+		let mut commit = CommitSet::default();
+		let level_count = self.levels.len();
+		for (level_index, level) in self.levels.iter_mut().enumerate().rev() {
+			let index = match level.blocks.iter().position(|overlay| &overlay.hash == hash) {
+				Some(index) => index,
+				None => continue,
+			};
+			// Check that it does not have any children
+			if (level_index != level_count - 1) && self.parents.values().any(|h| h == hash) {
+				log::debug!(target: "state-db", "Trying to remove block {:?} with children", hash);
+				return None;
+			}
+			let overlay = level.remove(index);
+			commit.meta.deleted.push(overlay.journal_key);
+			self.parents.remove(&overlay.hash);
+			discard_values(&mut self.values, overlay.inserted);
+			break;
+		}
+		if self.levels.back().map_or(false, |l| l.blocks.is_empty()) {
+			self.levels.pop_back();
+		}
+		if !commit.meta.deleted.is_empty() {
+			Some(commit)
+		} else {
+			None
+		}
+	}
+
 	fn revert_insertions(&mut self) {
 		self.pending_insertions.reverse();
 		for hash in self.pending_insertions.drain(..) {
@@ -437,12 +496,13 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 			// find a level. When iterating insertions backwards the hash is always last in the level.
 			let level_index =
 				self.levels.iter().position(|level|
-					level.last().expect("Hash is added in `insert` in reverse order").hash == hash)
+					level.blocks.last().expect("Hash is added in `insert` in reverse order").hash == hash)
 				.expect("Hash is added in insert");
 
-			let	overlay = self.levels[level_index].pop().expect("Empty levels are not allowed in self.levels");
+			let overlay_index = self.levels[level_index].blocks.len() - 1;
+			let overlay = self.levels[level_index].remove(overlay_index);
 			discard_values(&mut self.values, overlay.inserted);
-			if self.levels[level_index].is_empty() {
+			if self.levels[level_index].blocks.is_empty() {
 				debug_assert_eq!(level_index, self.levels.len() - 1);
 				self.levels.pop_back();
 			}
@@ -1000,4 +1060,67 @@ mod tests {
 		overlay.apply_pending();
 		assert!(!contains(&overlay, 21));
 	}
+
+	#[test]
+	fn index_reuse() {
+		// This test discards a branch that is journaled under a non-zero index on level 1,
+		// making sure all journals are loaded for each level even if some of them are missing.
+		let root = H256::random();
+		let h1 = H256::random();
+		let h2 = H256::random();
+		let h11 = H256::random();
+		let h21 = H256::random();
+		let mut db = make_db(&[]);
+		let mut overlay = NonCanonicalOverlay::<H256, H256>::new(&db).unwrap();
+		db.commit(&overlay.insert::<io::Error>(&root, 10, &H256::default(), make_changeset(&[], &[])).unwrap());
+		db.commit(&overlay.insert::<io::Error>(&h1, 11, &root, make_changeset(&[1], &[])).unwrap());
+		db.commit(&overlay.insert::<io::Error>(&h2, 11, &root, make_changeset(&[2], &[])).unwrap());
+		db.commit(&overlay.insert::<io::Error>(&h11, 12, &h1, make_changeset(&[11], &[])).unwrap());
+		db.commit(&overlay.insert::<io::Error>(&h21, 12, &h2, make_changeset(&[21], &[])).unwrap());
+		let mut commit = CommitSet::default();
+		overlay.canonicalize::<io::Error>(&root, &mut commit).unwrap();
+		overlay.canonicalize::<io::Error>(&h2, &mut commit).unwrap();  // h11 should stay in the DB
+		db.commit(&commit);
+		overlay.apply_pending();
+
+		// add another block at top level. It should reuse journal index 0 of previously discarded block
+		let h22 = H256::random(); 
+		db.commit(&overlay.insert::<io::Error>(&h22, 12, &h2, make_changeset(&[22], &[])).unwrap());
+		assert_eq!(overlay.levels[0].blocks[0].journal_index, 1);
+		assert_eq!(overlay.levels[0].blocks[1].journal_index, 0);
+
+		// Restore into a new overlay and check that journaled value exists.
+		let overlay = NonCanonicalOverlay::<H256, H256>::new(&db).unwrap();
+		assert_eq!(overlay.parents.len(), 2);
+		assert!(contains(&overlay, 21));
+		assert!(contains(&overlay, 22));
+	}
+
+	#[test]
+	fn remove_works() {
+		let root = H256::random();
+		let h1 = H256::random();
+		let h2 = H256::random();
+		let h11 = H256::random();
+		let h21 = H256::random();
+		let mut db = make_db(&[]);
+		let mut overlay = NonCanonicalOverlay::<H256, H256>::new(&db).unwrap();
+		db.commit(&overlay.insert::<io::Error>(&root, 10, &H256::default(), make_changeset(&[], &[])).unwrap());
+		db.commit(&overlay.insert::<io::Error>(&h1, 11, &root, make_changeset(&[1], &[])).unwrap());
+		db.commit(&overlay.insert::<io::Error>(&h2, 11, &root, make_changeset(&[2], &[])).unwrap());
+		db.commit(&overlay.insert::<io::Error>(&h11, 12, &h1, make_changeset(&[11], &[])).unwrap());
+		db.commit(&overlay.insert::<io::Error>(&h21, 12, &h2, make_changeset(&[21], &[])).unwrap());
+		assert!(overlay.remove(&h1).is_none());
+		assert!(overlay.remove(&h2).is_none());
+		assert_eq!(overlay.levels.len(), 3);
+
+		db.commit(&overlay.remove(&h11).unwrap());
+		assert!(!contains(&overlay, 11));
+
+		db.commit(&overlay.remove(&h21).unwrap());
+		assert_eq!(overlay.levels.len(), 2);
+
+		db.commit(&overlay.remove(&h2).unwrap());
+		assert!(!contains(&overlay, 2));
+	}
 }

From bc43ad44618ba8757fc280c0bb79ddce9228f62f Mon Sep 17 00:00:00 2001
From: ddorgan <david@parity.io>
Date: Thu, 6 May 2021 08:43:53 +0100
Subject: [PATCH 0710/1194] Make some alerts warnings instead of critical
 (#8739)

---
 .maintain/monitoring/alerting-rules/alerting-rule-tests.yaml | 4 ++--
 .maintain/monitoring/alerting-rules/alerting-rules.yaml      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.maintain/monitoring/alerting-rules/alerting-rule-tests.yaml b/.maintain/monitoring/alerting-rules/alerting-rule-tests.yaml
index 40a489bd09cf..7ad916f02215 100644
--- a/.maintain/monitoring/alerting-rules/alerting-rule-tests.yaml
+++ b/.maintain/monitoring/alerting-rules/alerting-rule-tests.yaml
@@ -175,7 +175,7 @@ tests:
                       polkadot-abcdef01234-abcdef has been monotonically
                       increasing for more than 10 minutes."
                 - exp_labels:
-                      severity: critical
+                      severity: warning
                       pod: polkadot-abcdef01234-abcdef
                       instance: polkadot-abcdef01234-abcdef
                       job: polkadot
@@ -190,7 +190,7 @@ tests:
             # same. Thus expect an alert.
             exp_alerts:
                 - exp_labels:
-                      severity: critical
+                      severity: warning
                       pod: polkadot-abcdef01234-abcdef
                       instance: polkadot-abcdef01234-abcdef
                       job: polkadot
diff --git a/.maintain/monitoring/alerting-rules/alerting-rules.yaml b/.maintain/monitoring/alerting-rules/alerting-rules.yaml
index 1aed87ad84f8..bc3243d732b4 100644
--- a/.maintain/monitoring/alerting-rules/alerting-rules.yaml
+++ b/.maintain/monitoring/alerting-rules/alerting-rules.yaml
@@ -74,7 +74,7 @@ groups:
     increase(polkadot_sub_txpool_validations_finished[5m]) > 0'
     for: 30m
     labels:
-      severity: critical
+      severity: warning
     annotations:
       message: 'The transaction pool size on node {{ $labels.instance }} has
       been monotonically increasing for more than 30 minutes.'
@@ -83,7 +83,7 @@ groups:
     polkadot_sub_txpool_validations_finished > 10000'
     for: 5m
     labels:
-      severity: critical
+      severity: warning
     annotations:
       message: 'The transaction pool size on node {{ $labels.instance }} has
       been above 10_000 for more than 5 minutes.'

From 9df2f1029edf00b66429579960653cdffa9625fa Mon Sep 17 00:00:00 2001
From: Alexander Popiak <alexander.popiak@parity.io>
Date: Thu, 6 May 2021 12:56:24 +0200
Subject: [PATCH 0711/1194] derive Encode and Decode for BigUint (#8744)

---
 primitives/arithmetic/src/biguint.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/primitives/arithmetic/src/biguint.rs b/primitives/arithmetic/src/biguint.rs
index 906c4d0cfd31..bfbd57f57013 100644
--- a/primitives/arithmetic/src/biguint.rs
+++ b/primitives/arithmetic/src/biguint.rs
@@ -19,6 +19,7 @@
 
 use num_traits::{Zero, One};
 use sp_std::{cmp::Ordering, ops, prelude::*, vec, cell::RefCell, convert::TryFrom};
+use codec::{Encode, Decode};
 
 // A sensible value for this would be half of the dword size of the host machine. Since the
 // runtime is compiled to 32bit webassembly, using 32 and 64 for single and double respectively
@@ -78,7 +79,7 @@ fn div_single(a: Double, b: Single) -> (Double, Single) {
 }
 
 /// Simple wrapper around an infinitely large integer, represented as limbs of [`Single`].
-#[derive(Clone, Default)]
+#[derive(Encode, Decode, Clone, Default)]
 pub struct BigUint {
 	/// digits (limbs) of this number (sorted as msb -> lsb).
 	pub(crate) digits: Vec<Single>,

From 06e10c6d487b20d2e411c0681fd63e98c9537006 Mon Sep 17 00:00:00 2001
From: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
Date: Thu, 6 May 2021 13:01:42 +0200
Subject: [PATCH 0712/1194] BoundedVec MaxEncodedLen microoptimization (#8746)

---
 frame/support/src/storage/bounded_vec.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frame/support/src/storage/bounded_vec.rs b/frame/support/src/storage/bounded_vec.rs
index f441ba39b884..868be980e808 100644
--- a/frame/support/src/storage/bounded_vec.rs
+++ b/frame/support/src/storage/bounded_vec.rs
@@ -357,7 +357,7 @@ where
 		// BoundedVec<T, S> encodes like Vec<T> which encodes like [T], which is a compact u32
 		// plus each item in the slice:
 		// https://substrate.dev/rustdocs/v3.0.0/src/parity_scale_codec/codec.rs.html#798-808
-		codec::Compact::<u32>::max_encoded_len()
+		codec::Compact(S::get()).encoded_size()
 			.saturating_add(Self::bound().saturating_mul(T::max_encoded_len()))
 	}
 }

From 19f732797701fa8fe2e357b397c2bec09e15509b Mon Sep 17 00:00:00 2001
From: Veniamin <VeniaminHrapov@gmail.com>
Date: Thu, 6 May 2021 15:16:30 +0300
Subject: [PATCH 0713/1194] equilibrium added ss58 prefix (#8342)

Co-authored-by: Veniamin <benjamin@eosdt.com>
---
 primitives/core/src/crypto.rs | 3 +++
 ss58-registry.json            | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index f5b7606be558..7446ab25ce4b 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -584,10 +584,13 @@ ss58_address_format!(
 		(65, "aventus", "Aventus Chain mainnet, standard account (*25519).")
 	CrustAccount =>
 		(66, "crust", "Crust Network, standard account (*25519).")
+	EquilibriumAccount =>
+		(67, "equilibrium", "Equilibrium Network, standard account (*25519).")
 	SoraAccount =>
 		(69, "sora", "SORA Network, standard account (*25519).")
 	SocialAccount =>
 		(252, "social-network", "Social Network, standard account (*25519).")
+
 	// Note: 16384 and above are reserved.
 );
 
diff --git a/ss58-registry.json b/ss58-registry.json
index a0d762f50eae..43d0117f24f9 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -470,6 +470,15 @@
 			"website": "https://crust.network"
 		},
 		{
+			"prefix": 67,
+			"network": "equilibrium",
+			"displayName": "Equilibrium Network",
+			"symbols": ["Unknown", "USD", "EQ", "ETH", "BTC", "EOS", "DOT", "CRV"],
+			"decimals": [0,9,9,9,9,9,9,9],
+			"standardAccount": "*25519",
+			"website": "https://equilibrium.io"
+    },
+    {
 			"prefix": 69,
 			"network": "sora",
 			"displayName": "SORA Network",

From f78e1edd3aef25bd6eb9a872e9bdb6b542076df3 Mon Sep 17 00:00:00 2001
From: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
Date: Thu, 6 May 2021 15:54:13 +0200
Subject: [PATCH 0714/1194] Add `BoundedBTreeMap` to `frame_support::storage`
 (#8745)

* Add `BoundedBTreeMap` to `frame_support::storage`

Part of https://github.com/paritytech/substrate/issues/8719.

* max_encoded_len will never encode length > bound

* requiring users to maintain an unchecked invariant is unsafe

* only impl debug when std

* add some marker traits

* add tests
---
 .../support/src/storage/bounded_btree_map.rs  | 421 ++++++++++++++++++
 frame/support/src/storage/bounded_vec.rs      |  23 +-
 frame/support/src/storage/mod.rs              |   2 +
 3 files changed, 431 insertions(+), 15 deletions(-)
 create mode 100644 frame/support/src/storage/bounded_btree_map.rs

diff --git a/frame/support/src/storage/bounded_btree_map.rs b/frame/support/src/storage/bounded_btree_map.rs
new file mode 100644
index 000000000000..7fd0d175fda9
--- /dev/null
+++ b/frame/support/src/storage/bounded_btree_map.rs
@@ -0,0 +1,421 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Traits, types and structs to support a bounded BTreeMap.
+
+use sp_std::{
+	borrow::Borrow, collections::btree_map::BTreeMap, convert::TryFrom, fmt, marker::PhantomData,
+	ops::Deref,
+};
+use crate::{
+	storage::StorageDecodeLength,
+	traits::{Get, MaxEncodedLen},
+};
+use codec::{Encode, Decode};
+
+/// A bounded map based on a B-Tree.
+///
+/// B-Trees represent a fundamental compromise between cache-efficiency and actually minimizing
+/// the amount of work performed in a search. See [`BTreeMap`] for more details.
+///
+/// Unlike a standard `BTreeMap`, there is a static, enforced upper limit to the number of items
+/// in the map. All internal operations ensure this bound is respected.
+#[derive(Encode, Decode)]
+pub struct BoundedBTreeMap<K, V, S>(BTreeMap<K, V>, PhantomData<S>);
+
+impl<K, V, S> BoundedBTreeMap<K, V, S>
+where
+	S: Get<u32>,
+{
+	/// Get the bound of the type in `usize`.
+	pub fn bound() -> usize {
+		S::get() as usize
+	}
+}
+
+impl<K, V, S> BoundedBTreeMap<K, V, S>
+where
+	K: Ord,
+	S: Get<u32>,
+{
+	/// Create a new `BoundedBTreeMap`.
+	///
+	/// Does not allocate.
+	pub fn new() -> Self {
+		BoundedBTreeMap(BTreeMap::new(), PhantomData)
+	}
+
+	/// Create `Self` from a primitive `BTreeMap` without any checks.
+	unsafe fn unchecked_from(map: BTreeMap<K, V>) -> Self {
+		Self(map, Default::default())
+	}
+
+	/// Create `Self` from a primitive `BTreeMap` without any checks.
+	///
+	/// Logs warnings if the bound is not being respected. The scope is mentioned in the log message
+	/// to indicate where overflow is happening.
+	///
+	/// # Example
+	///
+	/// ```
+	/// # use sp_std::collections::btree_map::BTreeMap;
+	/// # use frame_support::{parameter_types, storage::bounded_btree_map::BoundedBTreeMap};
+	/// parameter_types! {
+	/// 	pub const Size: u32 = 5;
+	/// }
+	/// let mut map = BTreeMap::new();
+	/// map.insert("foo", 1);
+	/// map.insert("bar", 2);
+	/// let bounded_map = unsafe {BoundedBTreeMap::<_, _, Size>::force_from(map, "demo")};
+	/// ```
+	pub unsafe fn force_from<Scope>(map: BTreeMap<K, V>, scope: Scope) -> Self
+	where
+		Scope: Into<Option<&'static str>>,
+	{
+		if map.len() > Self::bound() {
+			log::warn!(
+				target: crate::LOG_TARGET,
+				"length of a bounded btreemap in scope {} is not respected.",
+				scope.into().unwrap_or("UNKNOWN"),
+			);
+		}
+
+		Self::unchecked_from(map)
+	}
+
+	/// Consume self, and return the inner `BTreeMap`.
+	///
+	/// This is useful when a mutating API of the inner type is desired, and closure-based mutation
+	/// such as provided by [`try_mutate`][Self::try_mutate] is inconvenient.
+	pub fn into_inner(self) -> BTreeMap<K, V> {
+		debug_assert!(self.0.len() <= Self::bound());
+		self.0
+	}
+
+	/// Consumes self and mutates self via the given `mutate` function.
+	///
+	/// If the outcome of mutation is within bounds, `Some(Self)` is returned. Else, `None` is
+	/// returned.
+	///
+	/// This is essentially a *consuming* shorthand [`Self::into_inner`] -> `...` ->
+	/// [`Self::try_from`].
+	pub fn try_mutate(mut self, mut mutate: impl FnMut(&mut BTreeMap<K, V>)) -> Option<Self> {
+		mutate(&mut self.0);
+		(self.0.len() <= Self::bound()).then(move || self)
+	}
+
+	// Clears the map, removing all elements.
+	pub fn clear(&mut self) {
+		self.0.clear()
+	}
+
+	/// Return a mutable reference to the value corresponding to the key.
+	///
+	/// The key may be any borrowed form of the map's key type, but the ordering on the borrowed
+	/// form _must_ match the ordering on the key type.
+	pub fn get_mut<Q>(&mut self, key: &Q) -> Option<&mut V>
+	where
+		K: Borrow<Q>,
+		Q: Ord + ?Sized,
+	{
+		self.0.get_mut(key)
+	}
+
+	/// Exactly the same semantics as [`BTreeMap::insert`], but returns an `Err` (and is a noop) if the
+	/// new length of the map exceeds `S`.
+	pub fn try_insert(&mut self, key: K, value: V) -> Result<(), ()> {
+		if self.len() < Self::bound() {
+			self.0.insert(key, value);
+			Ok(())
+		} else {
+			Err(())
+		}
+	}
+
+	/// Remove a key from the map, returning the value at the key if the key was previously in the map.
+	///
+	/// The key may be any borrowed form of the map's key type, but the ordering on the borrowed
+	/// form _must_ match the ordering on the key type.
+	pub fn remove<Q>(&mut self, key: &Q) -> Option<V>
+	where
+		K: Borrow<Q>,
+		Q: Ord + ?Sized,
+	{
+		self.0.remove(key)
+	}
+
+	/// Remove a key from the map, returning the value at the key if the key was previously in the map.
+	///
+	/// The key may be any borrowed form of the map's key type, but the ordering on the borrowed
+	/// form _must_ match the ordering on the key type.
+	pub fn remove_entry<Q>(&mut self, key: &Q) -> Option<(K, V)>
+	where
+		K: Borrow<Q>,
+		Q: Ord + ?Sized,
+	{
+		self.0.remove_entry(key)
+	}
+}
+
+impl<K, V, S> Default for BoundedBTreeMap<K, V, S>
+where
+	K: Ord,
+	S: Get<u32>,
+{
+	fn default() -> Self {
+		Self::new()
+	}
+}
+
+impl<K, V, S> Clone for BoundedBTreeMap<K, V, S>
+where
+	BTreeMap<K, V>: Clone,
+{
+	fn clone(&self) -> Self {
+		BoundedBTreeMap(self.0.clone(), PhantomData)
+	}
+}
+
+#[cfg(feature = "std")]
+impl<K, V, S> fmt::Debug for BoundedBTreeMap<K, V, S>
+where
+	BTreeMap<K, V>: fmt::Debug,
+	S: Get<u32>,
+{
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		f.debug_tuple("BoundedBTreeMap").field(&self.0).field(&Self::bound()).finish()
+	}
+}
+
+impl<K, V, S> PartialEq for BoundedBTreeMap<K, V, S>
+where
+	BTreeMap<K, V>: PartialEq,
+{
+	fn eq(&self, other: &Self) -> bool {
+		self.0 == other.0
+	}
+}
+
+impl<K, V, S> Eq for BoundedBTreeMap<K, V, S> where BTreeMap<K, V>: Eq {}
+
+impl<K, V, S> PartialEq<BTreeMap<K, V>> for BoundedBTreeMap<K, V, S>
+where
+	BTreeMap<K, V>: PartialEq,
+{
+	fn eq(&self, other: &BTreeMap<K, V>) -> bool {
+		self.0 == *other
+	}
+}
+
+impl<K, V, S> PartialOrd for BoundedBTreeMap<K, V, S>
+where
+	BTreeMap<K, V>: PartialOrd,
+{
+	fn partial_cmp(&self, other: &Self) -> Option<sp_std::cmp::Ordering> {
+		self.0.partial_cmp(&other.0)
+	}
+}
+
+impl<K, V, S> Ord for BoundedBTreeMap<K, V, S>
+where
+	BTreeMap<K, V>: Ord,
+{
+	fn cmp(&self, other: &Self) -> sp_std::cmp::Ordering {
+		self.0.cmp(&other.0)
+	}
+}
+
+impl<K, V, S> IntoIterator for BoundedBTreeMap<K, V, S> {
+	type Item = (K, V);
+	type IntoIter = sp_std::collections::btree_map::IntoIter<K, V>;
+
+	fn into_iter(self) -> Self::IntoIter {
+		self.0.into_iter()
+	}
+}
+
+impl<K, V, S> MaxEncodedLen for BoundedBTreeMap<K, V, S>
+where
+	K: MaxEncodedLen,
+	V: MaxEncodedLen,
+	S: Get<u32>,
+{
+	fn max_encoded_len() -> usize {
+		Self::bound()
+			.saturating_mul(K::max_encoded_len().saturating_add(V::max_encoded_len()))
+			.saturating_add(codec::Compact(S::get()).encoded_size())
+	}
+}
+
+impl<K, V, S> Deref for BoundedBTreeMap<K, V, S>
+where
+	K: Ord,
+{
+	type Target = BTreeMap<K, V>;
+
+	fn deref(&self) -> &Self::Target {
+		&self.0
+	}
+}
+
+impl<K, V, S> AsRef<BTreeMap<K, V>> for BoundedBTreeMap<K, V, S>
+where
+	K: Ord,
+{
+	fn as_ref(&self) -> &BTreeMap<K, V> {
+		&self.0
+	}
+}
+
+impl<K, V, S> From<BoundedBTreeMap<K, V, S>> for BTreeMap<K, V>
+where
+	K: Ord,
+{
+	fn from(map: BoundedBTreeMap<K, V, S>) -> Self {
+		map.0
+	}
+}
+
+impl<K, V, S> TryFrom<BTreeMap<K, V>> for BoundedBTreeMap<K, V, S>
+where
+	K: Ord,
+	S: Get<u32>,
+{
+	type Error = ();
+
+	fn try_from(value: BTreeMap<K, V>) -> Result<Self, Self::Error> {
+		(value.len() <= Self::bound()).then(move || BoundedBTreeMap(value, PhantomData)).ok_or(())
+	}
+}
+
+impl<K, V, S> codec::DecodeLength for BoundedBTreeMap<K, V, S> {
+	fn len(self_encoded: &[u8]) -> Result<usize, codec::Error> {
+		// `BoundedBTreeMap<K, V, S>` is stored just a `BTreeMap<K, V>`, which is stored as a
+		// `Compact<u32>` with its length followed by an iteration of its items. We can just use
+		// the underlying implementation.
+		<BTreeMap<K, V> as codec::DecodeLength>::len(self_encoded)
+	}
+}
+
+impl<K, V, S> StorageDecodeLength for BoundedBTreeMap<K, V, S> {}
+
+impl<K, V, S> codec::EncodeLike<BTreeMap<K, V>> for BoundedBTreeMap<K, V, S> where
+	BTreeMap<K, V>: Encode
+{
+}
+
+#[cfg(test)]
+pub mod test {
+	use super::*;
+	use sp_io::TestExternalities;
+	use sp_std::convert::TryInto;
+	use crate::Twox128;
+
+	crate::parameter_types! {
+		pub const Seven: u32 = 7;
+		pub const Four: u32 = 4;
+	}
+
+	crate::generate_storage_alias! { Prefix, Foo => Value<BoundedBTreeMap<u32, (), Seven>> }
+	crate::generate_storage_alias! { Prefix, FooMap => Map<(u32, Twox128), BoundedBTreeMap<u32, (), Seven>> }
+	crate::generate_storage_alias! {
+		Prefix,
+		FooDoubleMap => DoubleMap<(u32, Twox128), (u32, Twox128), BoundedBTreeMap<u32, (), Seven>>
+	}
+
+	fn map_from_keys<K>(keys: &[K]) -> BTreeMap<K, ()>
+	where
+		K: Ord + Copy,
+	{
+		keys.iter().copied().zip(std::iter::repeat(())).collect()
+	}
+
+	fn boundedmap_from_keys<K, S>(keys: &[K]) -> BoundedBTreeMap<K, (), S>
+	where
+		K: Ord + Copy,
+		S: Get<u32>,
+	{
+		map_from_keys(keys).try_into().unwrap()
+	}
+
+	#[test]
+	fn decode_len_works() {
+		TestExternalities::default().execute_with(|| {
+			let bounded = boundedmap_from_keys::<u32, Seven>(&[1, 2, 3]);
+			Foo::put(bounded);
+			assert_eq!(Foo::decode_len().unwrap(), 3);
+		});
+
+		TestExternalities::default().execute_with(|| {
+			let bounded = boundedmap_from_keys::<u32, Seven>(&[1, 2, 3]);
+			FooMap::insert(1, bounded);
+			assert_eq!(FooMap::decode_len(1).unwrap(), 3);
+			assert!(FooMap::decode_len(0).is_none());
+			assert!(FooMap::decode_len(2).is_none());
+		});
+
+		TestExternalities::default().execute_with(|| {
+			let bounded = boundedmap_from_keys::<u32, Seven>(&[1, 2, 3]);
+			FooDoubleMap::insert(1, 1, bounded);
+			assert_eq!(FooDoubleMap::decode_len(1, 1).unwrap(), 3);
+			assert!(FooDoubleMap::decode_len(2, 1).is_none());
+			assert!(FooDoubleMap::decode_len(1, 2).is_none());
+			assert!(FooDoubleMap::decode_len(2, 2).is_none());
+		});
+	}
+
+	#[test]
+	fn try_insert_works() {
+		let mut bounded = boundedmap_from_keys::<u32, Four>(&[1, 2, 3]);
+		bounded.try_insert(0, ()).unwrap();
+		assert_eq!(*bounded, map_from_keys(&[1, 0, 2, 3]));
+
+		assert!(bounded.try_insert(9, ()).is_err());
+		assert_eq!(*bounded, map_from_keys(&[1, 0, 2, 3]));
+	}
+
+	#[test]
+	fn deref_coercion_works() {
+		let bounded = boundedmap_from_keys::<u32, Seven>(&[1, 2, 3]);
+		// these methods come from deref-ed vec.
+		assert_eq!(bounded.len(), 3);
+		assert!(bounded.iter().next().is_some());
+		assert!(!bounded.is_empty());
+	}
+
+	#[test]
+	fn try_mutate_works() {
+		let bounded = boundedmap_from_keys::<u32, Seven>(&[1, 2, 3, 4, 5, 6]);
+		let bounded = bounded
+			.try_mutate(|v| {
+				v.insert(7, ());
+			})
+			.unwrap();
+		assert_eq!(bounded.len(), 7);
+		assert!(bounded
+			.try_mutate(|v| {
+				v.insert(8, ());
+			})
+			.is_none());
+	}
+
+	#[test]
+	fn btree_map_eq_works() {
+		let bounded = boundedmap_from_keys::<u32, Seven>(&[1, 2, 3, 4, 5, 6]);
+		assert_eq!(bounded, map_from_keys(&[1, 2, 3, 4, 5, 6]));
+	}
+}
diff --git a/frame/support/src/storage/bounded_vec.rs b/frame/support/src/storage/bounded_vec.rs
index 868be980e808..8aecf2dc100b 100644
--- a/frame/support/src/storage/bounded_vec.rs
+++ b/frame/support/src/storage/bounded_vec.rs
@@ -58,22 +58,14 @@ impl<T: BoundedVecValue, S: Get<u32>> BoundedVec<T, S> {
 	}
 
 	/// Create `Self` from `t` without any checks.
-	///
-	/// # WARNING
-	///
-	/// Only use when you are sure you know what you are doing.
-	fn unchecked_from(t: Vec<T>) -> Self {
+	unsafe fn unchecked_from(t: Vec<T>) -> Self {
 		Self(t, Default::default())
 	}
 
 	/// Create `Self` from `t` without any checks. Logs warnings if the bound is not being
 	/// respected. The additional scope can be used to indicate where a potential overflow is
 	/// happening.
-	///
-	/// # WARNING
-	///
-	/// Only use when you are sure you know what you are doing.
-	pub fn force_from(t: Vec<T>, scope: Option<&'static str>) -> Self {
+	pub unsafe fn force_from(t: Vec<T>, scope: Option<&'static str>) -> Self {
 		if t.len() > Self::bound() {
 			log::warn!(
 				target: crate::LOG_TARGET,
@@ -166,7 +158,8 @@ impl<T: BoundedVecValue, S: Get<u32>> TryFrom<Vec<T>> for BoundedVec<T, S> {
 	type Error = ();
 	fn try_from(t: Vec<T>) -> Result<Self, Self::Error> {
 		if t.len() <= Self::bound() {
-			Ok(Self::unchecked_from(t))
+			// explicit check just above
+			Ok(unsafe {Self::unchecked_from(t)})
 		} else {
 			Err(())
 		}
@@ -434,11 +427,11 @@ pub mod test {
 			// append to a non-existing
 			assert!(FooMap::get(2).is_none());
 			assert_ok!(FooMap::try_append(2, 4));
-			assert_eq!(FooMap::get(2).unwrap(), BoundedVec::<u32, Seven>::unchecked_from(vec![4]));
+			assert_eq!(FooMap::get(2).unwrap(), unsafe {BoundedVec::<u32, Seven>::unchecked_from(vec![4])});
 			assert_ok!(FooMap::try_append(2, 5));
 			assert_eq!(
 				FooMap::get(2).unwrap(),
-				BoundedVec::<u32, Seven>::unchecked_from(vec![4, 5])
+				unsafe {BoundedVec::<u32, Seven>::unchecked_from(vec![4, 5])}
 			);
 		});
 
@@ -458,12 +451,12 @@ pub mod test {
 			assert_ok!(FooDoubleMap::try_append(2, 1, 4));
 			assert_eq!(
 				FooDoubleMap::get(2, 1).unwrap(),
-				BoundedVec::<u32, Seven>::unchecked_from(vec![4])
+				unsafe {BoundedVec::<u32, Seven>::unchecked_from(vec![4])}
 			);
 			assert_ok!(FooDoubleMap::try_append(2, 1, 5));
 			assert_eq!(
 				FooDoubleMap::get(2, 1).unwrap(),
-				BoundedVec::<u32, Seven>::unchecked_from(vec![4, 5])
+				unsafe {BoundedVec::<u32, Seven>::unchecked_from(vec![4, 5])}
 			);
 		});
 	}
diff --git a/frame/support/src/storage/mod.rs b/frame/support/src/storage/mod.rs
index adcf44a64620..1eed6f0c4a7f 100644
--- a/frame/support/src/storage/mod.rs
+++ b/frame/support/src/storage/mod.rs
@@ -29,6 +29,7 @@ pub use sp_runtime::TransactionOutcome;
 
 pub mod unhashed;
 pub mod hashed;
+pub mod bounded_btree_map;
 pub mod bounded_vec;
 pub mod child;
 #[doc(hidden)]
@@ -817,6 +818,7 @@ mod private {
 	impl<T: Encode> Sealed for Vec<T> {}
 	impl<Hash: Encode> Sealed for Digest<Hash> {}
 	impl<T: BoundedVecValue, S: Get<u32>> Sealed for BoundedVec<T, S> {}
+	impl<K, V, S> Sealed for bounded_btree_map::BoundedBTreeMap<K, V, S> {}
 }
 
 impl<T: Encode> StorageAppend<T> for Vec<T> {}

From 462653636821f542fd99beed25e817b7f14c38c9 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Thu, 6 May 2021 16:01:01 +0200
Subject: [PATCH 0715/1194] Allow fallback names for protocols (#8682)

* Allow fallback names for protocols

* Apply suggestions from code review

Co-authored-by: Roman Proskuryakov <humbug@deeptown.org>

* Fix some issues

* Fix compilation after merging master

Co-authored-by: Roman Proskuryakov <humbug@deeptown.org>
---
 .../src/communication/tests.rs                |   3 +
 client/finality-grandpa/src/lib.rs            |   5 +-
 client/network-gossip/src/bridge.rs           |   4 +-
 client/network/src/behaviour.rs               |  10 +-
 client/network/src/config.rs                  |   8 +
 client/network/src/gossip/tests.rs            |   2 +
 client/network/src/protocol.rs                |  26 ++-
 client/network/src/protocol/event.rs          |   9 +
 client/network/src/protocol/notifications.rs  |   2 +-
 .../src/protocol/notifications/behaviour.rs   |  40 ++++-
 .../src/protocol/notifications/handler.rs     |  84 +++++----
 .../src/protocol/notifications/tests.rs       |   9 +-
 .../src/protocol/notifications/upgrade.rs     |   2 +
 .../notifications/upgrade/notifications.rs    | 165 ++++++++++++------
 client/network/src/service.rs                 |   3 +-
 client/network/src/service/tests.rs           |  79 +++++++++
 client/network/src/transactions.rs            |   3 +-
 client/network/test/src/lib.rs                |   1 +
 18 files changed, 340 insertions(+), 115 deletions(-)

diff --git a/client/finality-grandpa/src/communication/tests.rs b/client/finality-grandpa/src/communication/tests.rs
index dc37a1615f41..bfc5b1d10a41 100644
--- a/client/finality-grandpa/src/communication/tests.rs
+++ b/client/finality-grandpa/src/communication/tests.rs
@@ -295,6 +295,7 @@ fn good_commit_leads_to_relay() {
 					let _ = sender.unbounded_send(NetworkEvent::NotificationStreamOpened {
 						remote: sender_id.clone(),
 						protocol: GRANDPA_PROTOCOL_NAME.into(),
+						negotiated_fallback: None,
 						role: ObservedRole::Full,
 					});
 
@@ -308,6 +309,7 @@ fn good_commit_leads_to_relay() {
 					let _ = sender.unbounded_send(NetworkEvent::NotificationStreamOpened {
 						remote: receiver_id.clone(),
 						protocol: GRANDPA_PROTOCOL_NAME.into(),
+						negotiated_fallback: None,
 						role: ObservedRole::Full,
 					});
 
@@ -442,6 +444,7 @@ fn bad_commit_leads_to_report() {
 					let _ = sender.unbounded_send(NetworkEvent::NotificationStreamOpened {
 						remote: sender_id.clone(),
 						protocol: GRANDPA_PROTOCOL_NAME.into(),
+						negotiated_fallback: None,
 						role: ObservedRole::Full,
 					});
 					let _ = sender.unbounded_send(NetworkEvent::NotificationsReceived {
diff --git a/client/finality-grandpa/src/lib.rs b/client/finality-grandpa/src/lib.rs
index e1c3a2c13154..672b08d0b714 100644
--- a/client/finality-grandpa/src/lib.rs
+++ b/client/finality-grandpa/src/lib.rs
@@ -690,6 +690,7 @@ pub struct GrandpaParams<Block: BlockT, C, N, SC, VR> {
 pub fn grandpa_peers_set_config() -> sc_network::config::NonDefaultSetConfig {
 	sc_network::config::NonDefaultSetConfig {
 		notifications_protocol: communication::GRANDPA_PROTOCOL_NAME.into(),
+		fallback_names: Vec::new(),
 		// Notifications reach ~256kiB in size at the time of writing on Kusama and Polkadot.
 		max_notification_size: 1024 * 1024,
 		set_config: sc_network::config::SetConfig {
@@ -1134,12 +1135,12 @@ fn local_authority_id(
 	voters: &VoterSet<AuthorityId>,
 	keystore: Option<&SyncCryptoStorePtr>,
 ) -> Option<AuthorityId> {
-	keystore.and_then(|keystore| { 
+	keystore.and_then(|keystore| {
 		voters
 		.iter()
 		.find(|(p, _)| {
 			SyncCryptoStore::has_keys(&**keystore, &[(p.to_raw_vec(), AuthorityId::ID)])
 		})
-		.map(|(p, _)| p.clone()) 
+		.map(|(p, _)| p.clone())
 	})
 }
diff --git a/client/network-gossip/src/bridge.rs b/client/network-gossip/src/bridge.rs
index 235ac98dc396..fd9aac96c010 100644
--- a/client/network-gossip/src/bridge.rs
+++ b/client/network-gossip/src/bridge.rs
@@ -188,7 +188,7 @@ impl<B: BlockT> Future for GossipEngine<B> {
 							Event::SyncDisconnected { remote } => {
 								this.network.remove_set_reserved(remote, this.protocol.clone());
 							}
-							Event::NotificationStreamOpened { remote, protocol, role } => {
+							Event::NotificationStreamOpened { remote, protocol, role, .. } => {
 								if protocol != this.protocol {
 									continue;
 								}
@@ -416,6 +416,7 @@ mod tests {
 			Event::NotificationStreamOpened {
 				remote: remote_peer.clone(),
 				protocol: protocol.clone(),
+				negotiated_fallback: None,
 				role: ObservedRole::Authority,
 			}
 		).expect("Event stream is unbounded; qed.");
@@ -575,6 +576,7 @@ mod tests {
 				Event::NotificationStreamOpened {
 					remote: remote_peer.clone(),
 					protocol: protocol.clone(),
+					negotiated_fallback: None,
 					role: ObservedRole::Authority,
 				}
 			).expect("Event stream is unbounded; qed.");
diff --git a/client/network/src/behaviour.rs b/client/network/src/behaviour.rs
index a73685ed3bf3..17c38b6f9545 100644
--- a/client/network/src/behaviour.rs
+++ b/client/network/src/behaviour.rs
@@ -124,6 +124,11 @@ pub enum BehaviourOut<B: BlockT> {
 		remote: PeerId,
 		/// The concerned protocol. Each protocol uses a different substream.
 		protocol: Cow<'static, str>,
+		/// If the negotiation didn't use the main name of the protocol (the one in
+		/// `notifications_protocol`), then this field contains which name has actually been
+		/// used.
+		/// See also [`crate::Event::NotificationStreamOpened`].
+		negotiated_fallback: Option<Cow<'static, str>>,
 		/// Object that permits sending notifications to the peer.
 		notifications_sink: NotificationsSink,
 		/// Role of the remote.
@@ -324,10 +329,13 @@ Behaviour<B> {
 					&target, &self.block_request_protocol_name, buf, pending_response, IfDisconnected::ImmediateError,
 				);
 			},
-			CustomMessageOutcome::NotificationStreamOpened { remote, protocol, roles, notifications_sink } => {
+			CustomMessageOutcome::NotificationStreamOpened {
+				remote, protocol, negotiated_fallback, roles, notifications_sink
+			} => {
 				self.events.push_back(BehaviourOut::NotificationStreamOpened {
 					remote,
 					protocol,
+					negotiated_fallback,
 					role: reported_roles_to_observed_role(roles),
 					notifications_sink: notifications_sink.clone(),
 				});
diff --git a/client/network/src/config.rs b/client/network/src/config.rs
index 3864b77d88be..77618f277114 100644
--- a/client/network/src/config.rs
+++ b/client/network/src/config.rs
@@ -541,6 +541,13 @@ pub struct NonDefaultSetConfig {
 	/// > **Note**: This field isn't present for the default set, as this is handled internally
 	/// >           by the networking code.
 	pub notifications_protocol: Cow<'static, str>,
+	/// If the remote reports that it doesn't support the protocol indicated in the
+	/// `notifications_protocol` field, then each of these fallback names will be tried one by
+	/// one.
+	///
+	/// If a fallback is used, it will be reported in
+	/// [`crate::Event::NotificationStreamOpened::negotiated_fallback`].
+	pub fallback_names: Vec<Cow<'static, str>>,
 	/// Maximum allowed size of single notifications.
 	pub max_notification_size: u64,
 	/// Base configuration.
@@ -553,6 +560,7 @@ impl NonDefaultSetConfig {
 		NonDefaultSetConfig {
 			notifications_protocol,
 			max_notification_size,
+			fallback_names: Vec::new(),
 			set_config: SetConfig {
 				in_peers: 0,
 				out_peers: 0,
diff --git a/client/network/src/gossip/tests.rs b/client/network/src/gossip/tests.rs
index b000cf575ddb..19ac002aac86 100644
--- a/client/network/src/gossip/tests.rs
+++ b/client/network/src/gossip/tests.rs
@@ -159,6 +159,7 @@ fn build_nodes_one_proto()
 		extra_sets: vec![
 			config::NonDefaultSetConfig {
 				notifications_protocol: PROTOCOL_NAME,
+				fallback_names: Vec::new(),
 				max_notification_size: 1024 * 1024,
 				set_config: Default::default()
 			}
@@ -173,6 +174,7 @@ fn build_nodes_one_proto()
 		extra_sets: vec![
 			config::NonDefaultSetConfig {
 				notifications_protocol: PROTOCOL_NAME,
+				fallback_names: Vec::new(),
 				max_notification_size: 1024 * 1024,
 				set_config: config::SetConfig {
 					reserved_nodes: vec![config::MultiaddrWithPeerId {
diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index e0fa7a1cb467..6dafd8b85f35 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -362,12 +362,24 @@ impl<B: BlockT> Protocol<B> {
 				genesis_hash,
 			).encode();
 
+			let sync_protocol_config = notifications::ProtocolConfig {
+				name: block_announces_protocol,
+				fallback_names: Vec::new(),
+				handshake: block_announces_handshake,
+				max_notification_size: MAX_BLOCK_ANNOUNCE_SIZE,
+			};
+
 			Notifications::new(
 				peerset,
-				iter::once((block_announces_protocol, block_announces_handshake, MAX_BLOCK_ANNOUNCE_SIZE))
+				iter::once(sync_protocol_config)
 					.chain(network_config.extra_sets.iter()
 						.zip(notifications_protocols_handshakes)
-						.map(|(s, hs)| (s.notifications_protocol.clone(), hs, s.max_notification_size))
+						.map(|(s, hs)| notifications::ProtocolConfig {
+							name: s.notifications_protocol.clone(),
+							fallback_names: s.fallback_names.clone(),
+							handshake: hs,
+							max_notification_size: s.max_notification_size,
+						})
 					),
 			)
 		};
@@ -1154,6 +1166,8 @@ pub enum CustomMessageOutcome<B: BlockT> {
 	NotificationStreamOpened {
 		remote: PeerId,
 		protocol: Cow<'static, str>,
+		/// See [`crate::Event::NotificationStreamOpened::negotiated_fallback`].
+		negotiated_fallback: Option<Cow<'static, str>>,
 		roles: Roles,
 		notifications_sink: NotificationsSink
 	},
@@ -1346,9 +1360,13 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 		};
 
 		let outcome = match event {
-			NotificationsOut::CustomProtocolOpen { peer_id, set_id, received_handshake, notifications_sink, .. } => {
+			NotificationsOut::CustomProtocolOpen {
+				peer_id, set_id, received_handshake, notifications_sink, negotiated_fallback
+			} => {
 				// Set number 0 is hardcoded the default set of peers we sync from.
 				if set_id == HARDCODED_PEERSETS_SYNC {
+					debug_assert!(negotiated_fallback.is_none());
+
 					// `received_handshake` can be either a `Status` message if received from the
 					// legacy substream ,or a `BlockAnnouncesHandshake` if received from the block
 					// announces substream.
@@ -1408,6 +1426,7 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 							CustomMessageOutcome::NotificationStreamOpened {
 								remote: peer_id,
 								protocol: self.notification_protocols[usize::from(set_id) - NUM_HARDCODED_PEERSETS].clone(),
+								negotiated_fallback,
 								roles,
 								notifications_sink,
 							},
@@ -1419,6 +1438,7 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 							CustomMessageOutcome::NotificationStreamOpened {
 								remote: peer_id,
 								protocol: self.notification_protocols[usize::from(set_id) - NUM_HARDCODED_PEERSETS].clone(),
+								negotiated_fallback,
 								roles: peer.info.roles,
 								notifications_sink,
 							}
diff --git a/client/network/src/protocol/event.rs b/client/network/src/protocol/event.rs
index fb2e3b33dd68..c13980b3f430 100644
--- a/client/network/src/protocol/event.rs
+++ b/client/network/src/protocol/event.rs
@@ -67,7 +67,16 @@ pub enum Event {
 		/// Node we opened the substream with.
 		remote: PeerId,
 		/// The concerned protocol. Each protocol uses a different substream.
+		/// This is always equal to the value of
+		/// [`crate::config::NonDefaultSetConfig::notifications_protocol`] of one of the
+		/// configured sets.
 		protocol: Cow<'static, str>,
+		/// If the negotiation didn't use the main name of the protocol (the one in
+		/// `notifications_protocol`), then this field contains which name has actually been
+		/// used.
+		/// Always contains a value equal to the value in
+		/// [`crate::config::NonDefaultSetConfig::fallback_names`].
+		negotiated_fallback: Option<Cow<'static, str>>,
 		/// Role of the remote.
 		role: ObservedRole,
 	},
diff --git a/client/network/src/protocol/notifications.rs b/client/network/src/protocol/notifications.rs
index ef25795758b8..8739eb4948b7 100644
--- a/client/network/src/protocol/notifications.rs
+++ b/client/network/src/protocol/notifications.rs
@@ -19,7 +19,7 @@
 //! Implementation of libp2p's `NetworkBehaviour` trait that establishes communications and opens
 //! notifications substreams.
 
-pub use self::behaviour::{Notifications, NotificationsOut};
+pub use self::behaviour::{Notifications, NotificationsOut, ProtocolConfig};
 pub use self::handler::{NotifsHandlerError, NotificationsSink, Ready};
 
 mod behaviour;
diff --git a/client/network/src/protocol/notifications/behaviour.rs b/client/network/src/protocol/notifications/behaviour.rs
index d5112a9f981d..0a883543de52 100644
--- a/client/network/src/protocol/notifications/behaviour.rs
+++ b/client/network/src/protocol/notifications/behaviour.rs
@@ -17,7 +17,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::protocol::notifications::{
-	handler::{NotificationsSink, NotifsHandlerProto, NotifsHandlerOut, NotifsHandlerIn}
+	handler::{self, NotificationsSink, NotifsHandlerProto, NotifsHandlerOut, NotifsHandlerIn}
 };
 
 use bytes::BytesMut;
@@ -95,10 +95,8 @@ use wasm_timer::Instant;
 /// accommodates for any number of connections.
 ///
 pub struct Notifications {
-	/// Notification protocols. Entries are only ever added and not removed.
-	/// Contains, for each protocol, the protocol name and the message to send as part of the
-	/// initial handshake.
-	notif_protocols: Vec<(Cow<'static, str>, Arc<RwLock<Vec<u8>>>, u64)>,
+	/// Notification protocols. Entries never change after initialization.
+	notif_protocols: Vec<handler::ProtocolConfig>,
 
 	/// Receiver for instructions about who to connect to or disconnect from.
 	peerset: sc_peerset::Peerset,
@@ -130,6 +128,19 @@ pub struct Notifications {
 	events: VecDeque<NetworkBehaviourAction<NotifsHandlerIn, NotificationsOut>>,
 }
 
+/// Configuration for a notifications protocol.
+#[derive(Debug, Clone)]
+pub struct ProtocolConfig {
+	/// Name of the protocol.
+	pub name: Cow<'static, str>,
+	/// Names of the protocol to use if the main one isn't available.
+	pub fallback_names: Vec<Cow<'static, str>>,
+	/// Handshake of the protocol.
+	pub handshake: Vec<u8>,
+	/// Maximum allowed size for a notification.
+	pub max_notification_size: u64,
+}
+
 /// Identifier for a delay firing.
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 struct DelayId(u64);
@@ -311,6 +322,9 @@ pub enum NotificationsOut {
 		peer_id: PeerId,
 		/// Peerset set ID the substream is tied to.
 		set_id: sc_peerset::SetId,
+		/// If `Some`, a fallback protocol name has been used rather the main protocol name.
+		/// Always matches one of the fallback names passed at initialization.
+		negotiated_fallback: Option<Cow<'static, str>>,
 		/// Handshake that was sent to us.
 		/// This is normally a "Status" message, but this is out of the concern of this code.
 		received_handshake: Vec<u8>,
@@ -358,10 +372,15 @@ impl Notifications {
 	/// Creates a `CustomProtos`.
 	pub fn new(
 		peerset: sc_peerset::Peerset,
-		notif_protocols: impl Iterator<Item = (Cow<'static, str>, Vec<u8>, u64)>,
+		notif_protocols: impl Iterator<Item = ProtocolConfig>,
 	) -> Self {
 		let notif_protocols = notif_protocols
-			.map(|(n, hs, sz)| (n, Arc::new(RwLock::new(hs)), sz))
+			.map(|cfg| handler::ProtocolConfig {
+				name: cfg.name,
+				fallback_names: cfg.fallback_names,
+				handshake: Arc::new(RwLock::new(cfg.handshake)),
+				max_notification_size: cfg.max_notification_size,
+			})
 			.collect::<Vec<_>>();
 
 		assert!(!notif_protocols.is_empty());
@@ -385,7 +404,7 @@ impl Notifications {
 		handshake_message: impl Into<Vec<u8>>
 	) {
 		if let Some(p) = self.notif_protocols.get_mut(usize::from(set_id)) {
-			*p.1.write() = handshake_message.into();
+			*p.handshake.write() = handshake_message.into();
 		} else {
 			log::error!(target: "sub-libp2p", "Unknown handshake change set: {:?}", set_id);
 			debug_assert!(false);
@@ -1728,7 +1747,9 @@ impl NetworkBehaviour for Notifications {
 				}
 			}
 
-			NotifsHandlerOut::OpenResultOk { protocol_index, received_handshake, notifications_sink, .. } => {
+			NotifsHandlerOut::OpenResultOk {
+				protocol_index, negotiated_fallback, received_handshake, notifications_sink, ..
+			} => {
 				let set_id = sc_peerset::SetId::from(protocol_index);
 				trace!(target: "sub-libp2p",
 					"Handler({}, {:?}) => OpenResultOk({:?})",
@@ -1748,6 +1769,7 @@ impl NetworkBehaviour for Notifications {
 								let event = NotificationsOut::CustomProtocolOpen {
 									peer_id: source,
 									set_id,
+									negotiated_fallback,
 									received_handshake,
 									notifications_sink: notifications_sink.clone(),
 								};
diff --git a/client/network/src/protocol/notifications/handler.rs b/client/network/src/protocol/notifications/handler.rs
index 99677cc45e54..3d38182c3c9d 100644
--- a/client/network/src/protocol/notifications/handler.rs
+++ b/client/network/src/protocol/notifications/handler.rs
@@ -110,7 +110,7 @@ const INITIAL_KEEPALIVE_TIME: Duration = Duration::from_secs(5);
 pub struct NotifsHandlerProto {
 	/// Name of protocols, prototypes for upgrades for inbound substreams, and the message we
 	/// send or respond with in the handshake.
-	protocols: Vec<(Cow<'static, str>, NotificationsIn, Arc<RwLock<Vec<u8>>>, u64)>,
+	protocols: Vec<ProtocolConfig>,
 }
 
 /// The actual handler once the connection has been established.
@@ -135,20 +135,27 @@ pub struct NotifsHandler {
 	>,
 }
 
+/// Configuration for a notifications protocol.
+#[derive(Debug, Clone)]
+pub struct ProtocolConfig {
+	/// Name of the protocol.
+	pub name: Cow<'static, str>,
+	/// Names of the protocol to use if the main one isn't available.
+	pub fallback_names: Vec<Cow<'static, str>>,
+	/// Handshake of the protocol. The `RwLock` is locked every time a new substream is opened.
+	pub handshake: Arc<RwLock<Vec<u8>>>,
+	/// Maximum allowed size for a notification.
+	pub max_notification_size: u64,
+}
+
 /// Fields specific for each individual protocol.
 struct Protocol {
-	/// Name of the protocol.
-	name: Cow<'static, str>,
+	/// Other fields.
+	config: ProtocolConfig,
 
 	/// Prototype for the inbound upgrade.
 	in_upgrade: NotificationsIn,
 
-	/// Handshake to send when opening a substream or receiving an open request.
-	handshake: Arc<RwLock<Vec<u8>>>,
-
-	/// Maximum allowed size of individual notifications.
-	max_notification_size: u64,
-
 	/// Current state of the substreams for this protocol.
 	state: State,
 }
@@ -214,21 +221,25 @@ impl IntoProtocolsHandler for NotifsHandlerProto {
 
 	fn inbound_protocol(&self) -> UpgradeCollec<NotificationsIn> {
 		self.protocols.iter()
-			.map(|(_, p, _, _)| p.clone())
+			.map(|cfg| NotificationsIn::new(cfg.name.clone(), cfg.fallback_names.clone(), cfg.max_notification_size))
 			.collect::<UpgradeCollec<_>>()
 	}
 
 	fn into_handler(self, peer_id: &PeerId, connected_point: &ConnectedPoint) -> Self::Handler {
 		NotifsHandler {
-			protocols: self.protocols.into_iter().map(|(name, in_upgrade, handshake, max_size)| {
+			protocols: self.protocols.into_iter().map(|config| {
+				let in_upgrade = NotificationsIn::new(
+					config.name.clone(),
+					config.fallback_names.clone(),
+					config.max_notification_size
+				);
+
 				Protocol {
-					name,
+					config,
 					in_upgrade,
-					handshake,
 					state: State::Closed {
 						pending_opening: false,
 					},
-					max_notification_size: max_size,
 				}
 			}).collect(),
 			peer_id: peer_id.clone(),
@@ -271,6 +282,8 @@ pub enum NotifsHandlerOut {
 	OpenResultOk {
 		/// Index of the protocol in the list of protocols passed at initialization.
 		protocol_index: usize,
+		/// Name of the protocol that was actually negotiated, if the default one wasn't available.
+		negotiated_fallback: Option<Cow<'static, str>>,
 		/// The endpoint of the connection that is open for custom protocols.
 		endpoint: ConnectedPoint,
 		/// Handshake that was sent to us.
@@ -445,18 +458,10 @@ impl NotifsHandlerProto {
 	/// is always the same whether we open a substream ourselves or respond to handshake from
 	/// the remote.
 	pub fn new(
-		list: impl Into<Vec<(Cow<'static, str>, Arc<RwLock<Vec<u8>>>, u64)>>,
+		list: impl Into<Vec<ProtocolConfig>>,
 	) -> Self {
-		let protocols =	list
-			.into()
-			.into_iter()
-			.map(|(proto_name, msg, max_notif_size)| {
-				(proto_name.clone(), NotificationsIn::new(proto_name, max_notif_size), msg, max_notif_size)
-			})
-			.collect();
-
 		NotifsHandlerProto {
-			protocols,
+			protocols: list.into(),
 		}
 	}
 }
@@ -481,7 +486,7 @@ impl ProtocolsHandler for NotifsHandler {
 
 	fn inject_fully_negotiated_inbound(
 		&mut self,
-		((_remote_handshake, mut new_substream), protocol_index):
+		(mut in_substream_open, protocol_index):
 			<Self::InboundProtocol as InboundUpgrade<NegotiatedSubstream>>::Output,
 		(): ()
 	) {
@@ -495,7 +500,7 @@ impl ProtocolsHandler for NotifsHandler {
 				));
 
 				protocol_info.state = State::OpenDesiredByRemote {
-					in_substream: new_substream,
+					in_substream: in_substream_open.substream,
 					pending_opening,
 				};
 			},
@@ -518,16 +523,16 @@ impl ProtocolsHandler for NotifsHandler {
 
 				// Create `handshake_message` on a separate line to be sure that the
 				// lock is released as soon as possible.
-				let handshake_message = protocol_info.handshake.read().clone();
-				new_substream.send_handshake(handshake_message);
-				*in_substream = Some(new_substream);
+				let handshake_message = protocol_info.config.handshake.read().clone();
+				in_substream_open.substream.send_handshake(handshake_message);
+				*in_substream = Some(in_substream_open.substream);
 			},
 		}
 	}
 
 	fn inject_fully_negotiated_outbound(
 		&mut self,
-		(handshake, substream): <Self::OutboundProtocol as OutboundUpgrade<NegotiatedSubstream>>::Output,
+		new_open: <Self::OutboundProtocol as OutboundUpgrade<NegotiatedSubstream>>::Output,
 		protocol_index: Self::OutboundOpenInfo
 	) {
 		match self.protocols[protocol_index].state {
@@ -553,15 +558,16 @@ impl ProtocolsHandler for NotifsHandler {
 
 				self.protocols[protocol_index].state = State::Open {
 					notifications_sink_rx: stream::select(async_rx.fuse(), sync_rx.fuse()).peekable(),
-					out_substream: Some(substream),
+					out_substream: Some(new_open.substream),
 					in_substream: in_substream.take(),
 				};
 
 				self.events_queue.push_back(ProtocolsHandlerEvent::Custom(
 					NotifsHandlerOut::OpenResultOk {
 						protocol_index,
+						negotiated_fallback: new_open.negotiated_fallback,
 						endpoint: self.endpoint.clone(),
-						received_handshake: handshake,
+						received_handshake: new_open.handshake,
 						notifications_sink
 					}
 				));
@@ -577,9 +583,10 @@ impl ProtocolsHandler for NotifsHandler {
 					State::Closed { pending_opening } => {
 						if !*pending_opening {
 							let proto = NotificationsOut::new(
-								protocol_info.name.clone(),
-								protocol_info.handshake.read().clone(),
-								protocol_info.max_notification_size
+								protocol_info.config.name.clone(),
+								protocol_info.config.fallback_names.clone(),
+								protocol_info.config.handshake.read().clone(),
+								protocol_info.config.max_notification_size
 							);
 
 							self.events_queue.push_back(ProtocolsHandlerEvent::OutboundSubstreamRequest {
@@ -593,13 +600,14 @@ impl ProtocolsHandler for NotifsHandler {
 						};
 					},
 					State::OpenDesiredByRemote { pending_opening, in_substream } => {
-						let handshake_message = protocol_info.handshake.read().clone();
+						let handshake_message = protocol_info.config.handshake.read().clone();
 
 						if !*pending_opening {
 							let proto = NotificationsOut::new(
-								protocol_info.name.clone(),
+								protocol_info.config.name.clone(),
+								protocol_info.config.fallback_names.clone(),
 								handshake_message.clone(),
-								protocol_info.max_notification_size,
+								protocol_info.config.max_notification_size,
 							);
 
 							self.events_queue.push_back(ProtocolsHandlerEvent::OutboundSubstreamRequest {
diff --git a/client/network/src/protocol/notifications/tests.rs b/client/network/src/protocol/notifications/tests.rs
index 8efe897afec3..4c7461c94b20 100644
--- a/client/network/src/protocol/notifications/tests.rs
+++ b/client/network/src/protocol/notifications/tests.rs
@@ -18,7 +18,7 @@
 
 #![cfg(test)]
 
-use crate::protocol::notifications::{Notifications, NotificationsOut};
+use crate::protocol::notifications::{Notifications, NotificationsOut, ProtocolConfig};
 
 use futures::prelude::*;
 use libp2p::{PeerId, Multiaddr, Transport};
@@ -80,7 +80,12 @@ fn build_nodes() -> (Swarm<CustomProtoWithAddr>, Swarm<CustomProtoWithAddr>) {
 		});
 
 		let behaviour = CustomProtoWithAddr {
-			inner: Notifications::new(peerset, iter::once(("/foo".into(), Vec::new(), 1024 * 1024))),
+			inner: Notifications::new(peerset, iter::once(ProtocolConfig {
+				name: "/foo".into(),
+				fallback_names: Vec::new(),
+				handshake: Vec::new(),
+				max_notification_size: 1024 * 1024
+			})),
 			addrs: addrs
 				.iter()
 				.enumerate()
diff --git a/client/network/src/protocol/notifications/upgrade.rs b/client/network/src/protocol/notifications/upgrade.rs
index b23e5eab06d9..35ae6917272a 100644
--- a/client/network/src/protocol/notifications/upgrade.rs
+++ b/client/network/src/protocol/notifications/upgrade.rs
@@ -19,8 +19,10 @@
 pub use self::collec::UpgradeCollec;
 pub use self::notifications::{
 	NotificationsIn,
+	NotificationsInOpen,
 	NotificationsInSubstream,
 	NotificationsOut,
+	NotificationsOutOpen,
 	NotificationsOutSubstream,
 	NotificationsHandshakeError,
 	NotificationsOutError,
diff --git a/client/network/src/protocol/notifications/upgrade/notifications.rs b/client/network/src/protocol/notifications/upgrade/notifications.rs
index eba96441bcfd..e2ef26c81eba 100644
--- a/client/network/src/protocol/notifications/upgrade/notifications.rs
+++ b/client/network/src/protocol/notifications/upgrade/notifications.rs
@@ -41,7 +41,7 @@ use futures::prelude::*;
 use asynchronous_codec::Framed;
 use libp2p::core::{UpgradeInfo, InboundUpgrade, OutboundUpgrade, upgrade};
 use log::error;
-use std::{borrow::Cow, convert::{Infallible, TryFrom as _}, io, iter, mem, pin::Pin, task::{Context, Poll}};
+use std::{borrow::Cow, convert::{Infallible, TryFrom as _}, io, mem, pin::Pin, task::{Context, Poll}, vec};
 use unsigned_varint::codec::UviBytes;
 
 /// Maximum allowed size of the two handshake messages, in bytes.
@@ -52,7 +52,8 @@ const MAX_HANDSHAKE_SIZE: usize = 1024;
 #[derive(Debug, Clone)]
 pub struct NotificationsIn {
 	/// Protocol name to use when negotiating the substream.
-	protocol_name: Cow<'static, str>,
+	/// The first one is the main name, while the other ones are fall backs.
+	protocol_names: Vec<Cow<'static, str>>,
 	/// Maximum allowed size for a single notification.
 	max_notification_size: u64,
 }
@@ -62,7 +63,8 @@ pub struct NotificationsIn {
 #[derive(Debug, Clone)]
 pub struct NotificationsOut {
 	/// Protocol name to use when negotiating the substream.
-	protocol_name: Cow<'static, str>,
+	/// The first one is the main name, while the other ones are fall backs.
+	protocol_names: Vec<Cow<'static, str>>,
 	/// Message to send when we start the handshake.
 	initial_message: Vec<u8>,
 	/// Maximum allowed size for a single notification.
@@ -106,51 +108,54 @@ pub struct NotificationsOutSubstream<TSubstream> {
 
 impl NotificationsIn {
 	/// Builds a new potential upgrade.
-	pub fn new(protocol_name: impl Into<Cow<'static, str>>, max_notification_size: u64) -> Self {
+	pub fn new(
+		main_protocol_name: impl Into<Cow<'static, str>>,
+		fallback_names: Vec<Cow<'static, str>>,
+		max_notification_size: u64
+	) -> Self {
+		let mut protocol_names = fallback_names;
+		protocol_names.insert(0, main_protocol_name.into());
+
 		NotificationsIn {
-			protocol_name: protocol_name.into(),
+			protocol_names,
 			max_notification_size,
 		}
 	}
 }
 
 impl UpgradeInfo for NotificationsIn {
-	type Info = Cow<'static, [u8]>;
-	type InfoIter = iter::Once<Self::Info>;
+	type Info = StringProtocolName;
+	type InfoIter = vec::IntoIter<Self::Info>;
 
 	fn protocol_info(&self) -> Self::InfoIter {
-		let bytes: Cow<'static, [u8]> = match &self.protocol_name {
-			Cow::Borrowed(s) => Cow::Borrowed(s.as_bytes()),
-			Cow::Owned(s) => Cow::Owned(s.as_bytes().to_vec())
-		};
-		iter::once(bytes)
+		self.protocol_names.iter().cloned().map(StringProtocolName).collect::<Vec<_>>().into_iter()
 	}
 }
 
 impl<TSubstream> InboundUpgrade<TSubstream> for NotificationsIn
 where TSubstream: AsyncRead + AsyncWrite + Unpin + Send + 'static,
 {
-	type Output = (Vec<u8>, NotificationsInSubstream<TSubstream>);
+	type Output = NotificationsInOpen<TSubstream>;
 	type Future = Pin<Box<dyn Future<Output = Result<Self::Output, Self::Error>> + Send>>;
 	type Error = NotificationsHandshakeError;
 
 	fn upgrade_inbound(
 		self,
 		mut socket: TSubstream,
-		_: Self::Info,
+		negotiated_name: Self::Info,
 	) -> Self::Future {
 		Box::pin(async move {
-			let initial_message_len = unsigned_varint::aio::read_usize(&mut socket).await?;
-			if initial_message_len > MAX_HANDSHAKE_SIZE {
+			let handshake_len = unsigned_varint::aio::read_usize(&mut socket).await?;
+			if handshake_len > MAX_HANDSHAKE_SIZE {
 				return Err(NotificationsHandshakeError::TooLarge {
-					requested: initial_message_len,
+					requested: handshake_len,
 					max: MAX_HANDSHAKE_SIZE,
 				});
 			}
 
-			let mut initial_message = vec![0u8; initial_message_len];
-			if !initial_message.is_empty() {
-				socket.read_exact(&mut initial_message).await?;
+			let mut handshake = vec![0u8; handshake_len];
+			if !handshake.is_empty() {
+				socket.read_exact(&mut handshake).await?;
 			}
 
 			let mut codec = UviBytes::default();
@@ -161,11 +166,30 @@ where TSubstream: AsyncRead + AsyncWrite + Unpin + Send + 'static,
 				handshake: NotificationsInSubstreamHandshake::NotSent,
 			};
 
-			Ok((initial_message, substream))
+			Ok(NotificationsInOpen {
+				handshake,
+				negotiated_fallback: if negotiated_name.0 == self.protocol_names[0] {
+					None
+				} else {
+					Some(negotiated_name.0)
+				},
+				substream,
+			})
 		})
 	}
 }
 
+/// Yielded by the [`NotificationsIn`] after a successfuly upgrade.
+pub struct NotificationsInOpen<TSubstream> {
+	/// Handshake sent by the remote.
+	pub handshake: Vec<u8>,
+	/// If the negotiated name is not the "main" protocol name but a fallback, contains the
+	/// name of the negotiated fallback.
+	pub negotiated_fallback: Option<Cow<'static, str>>,
+	/// Implementation of `Stream` that allows receives messages from the substream.
+	pub substream: NotificationsInSubstream<TSubstream>,
+}
+
 impl<TSubstream> NotificationsInSubstream<TSubstream>
 where TSubstream: AsyncRead + AsyncWrite + Unpin,
 {
@@ -296,7 +320,8 @@ where TSubstream: AsyncRead + AsyncWrite + Unpin,
 impl NotificationsOut {
 	/// Builds a new potential upgrade.
 	pub fn new(
-		protocol_name: impl Into<Cow<'static, str>>,
+		main_protocol_name: impl Into<Cow<'static, str>>,
+		fallback_names: Vec<Cow<'static, str>>,
 		initial_message: impl Into<Vec<u8>>,
 		max_notification_size: u64,
 	) -> Self {
@@ -305,38 +330,47 @@ impl NotificationsOut {
 			error!(target: "sub-libp2p", "Outbound networking handshake is above allowed protocol limit");
 		}
 
+		let mut protocol_names = fallback_names;
+		protocol_names.insert(0, main_protocol_name.into());
+
 		NotificationsOut {
-			protocol_name: protocol_name.into(),
+			protocol_names,
 			initial_message,
 			max_notification_size,
 		}
 	}
 }
 
+/// Implementation of the `ProtocolName` trait, where the protocol name is a string.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct StringProtocolName(Cow<'static, str>);
+
+impl upgrade::ProtocolName for StringProtocolName {
+	fn protocol_name(&self) -> &[u8] {
+		self.0.as_bytes()
+	}
+}
+
 impl UpgradeInfo for NotificationsOut {
-	type Info = Cow<'static, [u8]>;
-	type InfoIter = iter::Once<Self::Info>;
+	type Info = StringProtocolName;
+	type InfoIter = vec::IntoIter<Self::Info>;
 
 	fn protocol_info(&self) -> Self::InfoIter {
-		let bytes: Cow<'static, [u8]> = match &self.protocol_name {
-			Cow::Borrowed(s) => Cow::Borrowed(s.as_bytes()),
-			Cow::Owned(s) => Cow::Owned(s.as_bytes().to_vec())
-		};
-		iter::once(bytes)
+		self.protocol_names.iter().cloned().map(StringProtocolName).collect::<Vec<_>>().into_iter()
 	}
 }
 
 impl<TSubstream> OutboundUpgrade<TSubstream> for NotificationsOut
 where TSubstream: AsyncRead + AsyncWrite + Unpin + Send + 'static,
 {
-	type Output = (Vec<u8>, NotificationsOutSubstream<TSubstream>);
+	type Output = NotificationsOutOpen<TSubstream>;
 	type Future = Pin<Box<dyn Future<Output = Result<Self::Output, Self::Error>> + Send>>;
 	type Error = NotificationsHandshakeError;
 
 	fn upgrade_outbound(
 		self,
 		mut socket: TSubstream,
-		_: Self::Info,
+		negotiated_name: Self::Info,
 	) -> Self::Future {
 		Box::pin(async move {
 			upgrade::write_with_len_prefix(&mut socket, &self.initial_message).await?;
@@ -358,13 +392,32 @@ where TSubstream: AsyncRead + AsyncWrite + Unpin + Send + 'static,
 			let mut codec = UviBytes::default();
 			codec.set_max_len(usize::try_from(self.max_notification_size).unwrap_or(usize::max_value()));
 
-			Ok((handshake, NotificationsOutSubstream {
-				socket: Framed::new(socket, codec),
-			}))
+			Ok(NotificationsOutOpen {
+				handshake,
+				negotiated_fallback: if negotiated_name.0 == self.protocol_names[0] {
+					None
+				} else {
+					Some(negotiated_name.0)
+				},
+				substream: NotificationsOutSubstream {
+					socket: Framed::new(socket, codec),
+				}
+			})
 		})
 	}
 }
 
+/// Yielded by the [`NotificationsOut`] after a successfuly upgrade.
+pub struct NotificationsOutOpen<TSubstream> {
+	/// Handshake returned by the remote.
+	pub handshake: Vec<u8>,
+	/// If the negotiated name is not the "main" protocol name but a fallback, contains the
+	/// name of the negotiated fallback.
+	pub negotiated_fallback: Option<Cow<'static, str>>,
+	/// Implementation of `Sink` that allows sending messages on the substream.
+	pub substream: NotificationsOutSubstream<TSubstream>,
+}
+
 impl<TSubstream> Sink<Vec<u8>> for NotificationsOutSubstream<TSubstream>
 	where TSubstream: AsyncRead + AsyncWrite + Unpin,
 {
@@ -436,7 +489,7 @@ pub enum NotificationsOutError {
 
 #[cfg(test)]
 mod tests {
-	use super::{NotificationsIn, NotificationsOut};
+	use super::{NotificationsIn, NotificationsInOpen, NotificationsOut, NotificationsOutOpen};
 
 	use async_std::net::{TcpListener, TcpStream};
 	use futures::{prelude::*, channel::oneshot};
@@ -450,9 +503,9 @@ mod tests {
 
 		let client = async_std::task::spawn(async move {
 			let socket = TcpStream::connect(listener_addr_rx.await.unwrap()).await.unwrap();
-			let (handshake, mut substream) = upgrade::apply_outbound(
+			let NotificationsOutOpen { handshake, mut substream, .. } = upgrade::apply_outbound(
 				socket,
-				NotificationsOut::new(PROTO_NAME, &b"initial message"[..], 1024 * 1024),
+				NotificationsOut::new(PROTO_NAME, Vec::new(), &b"initial message"[..], 1024 * 1024),
 				upgrade::Version::V1
 			).await.unwrap();
 
@@ -465,12 +518,12 @@ mod tests {
 			listener_addr_tx.send(listener.local_addr().unwrap()).unwrap();
 
 			let (socket, _) = listener.accept().await.unwrap();
-			let (initial_message, mut substream) = upgrade::apply_inbound(
+			let NotificationsInOpen { handshake, mut substream, .. } = upgrade::apply_inbound(
 				socket,
-				NotificationsIn::new(PROTO_NAME, 1024 * 1024)
+				NotificationsIn::new(PROTO_NAME, Vec::new(), 1024 * 1024)
 			).await.unwrap();
 
-			assert_eq!(initial_message, b"initial message");
+			assert_eq!(handshake, b"initial message");
 			substream.send_handshake(&b"hello world"[..]);
 
 			let msg = substream.next().await.unwrap().unwrap();
@@ -489,9 +542,9 @@ mod tests {
 
 		let client = async_std::task::spawn(async move {
 			let socket = TcpStream::connect(listener_addr_rx.await.unwrap()).await.unwrap();
-			let (handshake, mut substream) = upgrade::apply_outbound(
+			let NotificationsOutOpen { handshake, mut substream, .. } = upgrade::apply_outbound(
 				socket,
-				NotificationsOut::new(PROTO_NAME, vec![], 1024 * 1024),
+				NotificationsOut::new(PROTO_NAME, Vec::new(), vec![], 1024 * 1024),
 				upgrade::Version::V1
 			).await.unwrap();
 
@@ -504,12 +557,12 @@ mod tests {
 			listener_addr_tx.send(listener.local_addr().unwrap()).unwrap();
 
 			let (socket, _) = listener.accept().await.unwrap();
-			let (initial_message, mut substream) = upgrade::apply_inbound(
+			let NotificationsInOpen { handshake, mut substream, .. } = upgrade::apply_inbound(
 				socket,
-				NotificationsIn::new(PROTO_NAME, 1024 * 1024)
+				NotificationsIn::new(PROTO_NAME, Vec::new(), 1024 * 1024)
 			).await.unwrap();
 
-			assert!(initial_message.is_empty());
+			assert!(handshake.is_empty());
 			substream.send_handshake(vec![]);
 
 			let msg = substream.next().await.unwrap().unwrap();
@@ -528,7 +581,7 @@ mod tests {
 			let socket = TcpStream::connect(listener_addr_rx.await.unwrap()).await.unwrap();
 			let outcome = upgrade::apply_outbound(
 				socket,
-				NotificationsOut::new(PROTO_NAME, &b"hello"[..], 1024 * 1024),
+				NotificationsOut::new(PROTO_NAME, Vec::new(), &b"hello"[..], 1024 * 1024),
 				upgrade::Version::V1
 			).await;
 
@@ -543,12 +596,12 @@ mod tests {
 			listener_addr_tx.send(listener.local_addr().unwrap()).unwrap();
 
 			let (socket, _) = listener.accept().await.unwrap();
-			let (initial_msg, substream) = upgrade::apply_inbound(
+			let NotificationsInOpen { handshake, substream, .. } = upgrade::apply_inbound(
 				socket,
-				NotificationsIn::new(PROTO_NAME, 1024 * 1024)
+				NotificationsIn::new(PROTO_NAME, Vec::new(), 1024 * 1024)
 			).await.unwrap();
 
-			assert_eq!(initial_msg, b"hello");
+			assert_eq!(handshake, b"hello");
 
 			// We successfully upgrade to the protocol, but then close the substream.
 			drop(substream);
@@ -567,7 +620,7 @@ mod tests {
 			let ret = upgrade::apply_outbound(
 				socket,
 				// We check that an initial message that is too large gets refused.
-				NotificationsOut::new(PROTO_NAME, (0..32768).map(|_| 0).collect::<Vec<_>>(), 1024 * 1024),
+				NotificationsOut::new(PROTO_NAME, Vec::new(), (0..32768).map(|_| 0).collect::<Vec<_>>(), 1024 * 1024),
 				upgrade::Version::V1
 			).await;
 			assert!(ret.is_err());
@@ -580,7 +633,7 @@ mod tests {
 			let (socket, _) = listener.accept().await.unwrap();
 			let ret = upgrade::apply_inbound(
 				socket,
-				NotificationsIn::new(PROTO_NAME, 1024 * 1024)
+				NotificationsIn::new(PROTO_NAME, Vec::new(), 1024 * 1024)
 			).await;
 			assert!(ret.is_err());
 		});
@@ -597,7 +650,7 @@ mod tests {
 			let socket = TcpStream::connect(listener_addr_rx.await.unwrap()).await.unwrap();
 			let ret = upgrade::apply_outbound(
 				socket,
-				NotificationsOut::new(PROTO_NAME, &b"initial message"[..], 1024 * 1024),
+				NotificationsOut::new(PROTO_NAME, Vec::new(), &b"initial message"[..], 1024 * 1024),
 				upgrade::Version::V1
 			).await;
 			assert!(ret.is_err());
@@ -608,11 +661,11 @@ mod tests {
 			listener_addr_tx.send(listener.local_addr().unwrap()).unwrap();
 
 			let (socket, _) = listener.accept().await.unwrap();
-			let (initial_message, mut substream) = upgrade::apply_inbound(
+			let NotificationsInOpen { handshake, mut substream, .. } = upgrade::apply_inbound(
 				socket,
-				NotificationsIn::new(PROTO_NAME, 1024 * 1024)
+				NotificationsIn::new(PROTO_NAME, Vec::new(), 1024 * 1024)
 			).await.unwrap();
-			assert_eq!(initial_message, b"initial message");
+			assert_eq!(handshake, b"initial message");
 
 			// We check that a handshake that is too large gets refused.
 			substream.send_handshake((0..32768).map(|_| 0).collect::<Vec<_>>());
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 99036c5effad..03b71b8c86f5 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -1541,7 +1541,7 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 					}
 				},
 				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::NotificationStreamOpened {
-					remote, protocol, notifications_sink, role
+					remote, protocol, negotiated_fallback, notifications_sink, role
 				})) => {
 					if let Some(metrics) = this.metrics.as_ref() {
 						metrics.notifications_streams_opened_total
@@ -1554,6 +1554,7 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 					this.event_streams.send(Event::NotificationStreamOpened {
 						remote,
 						protocol,
+						negotiated_fallback,
 						role,
 					});
 				},
diff --git a/client/network/src/service/tests.rs b/client/network/src/service/tests.rs
index dd4a0597cbcb..4e5bba8f7d33 100644
--- a/client/network/src/service/tests.rs
+++ b/client/network/src/service/tests.rs
@@ -159,6 +159,7 @@ fn build_nodes_one_proto()
 		extra_sets: vec![
 			config::NonDefaultSetConfig {
 				notifications_protocol: PROTOCOL_NAME,
+				fallback_names: Vec::new(),
 				max_notification_size: 1024 * 1024,
 				set_config: Default::default()
 			}
@@ -172,6 +173,7 @@ fn build_nodes_one_proto()
 		extra_sets: vec![
 			config::NonDefaultSetConfig {
 				notifications_protocol: PROTOCOL_NAME,
+				fallback_names: Vec::new(),
 				max_notification_size: 1024 * 1024,
 				set_config: config::SetConfig {
 					reserved_nodes: vec![config::MultiaddrWithPeerId {
@@ -328,6 +330,7 @@ fn lots_of_incoming_peers_works() {
 		extra_sets: vec![
 			config::NonDefaultSetConfig {
 				notifications_protocol: PROTOCOL_NAME,
+				fallback_names: Vec::new(),
 				max_notification_size: 1024 * 1024,
 				set_config: config::SetConfig {
 					in_peers: u32::max_value(),
@@ -353,6 +356,7 @@ fn lots_of_incoming_peers_works() {
 			extra_sets: vec![
 				config::NonDefaultSetConfig {
 					notifications_protocol: PROTOCOL_NAME,
+					fallback_names: Vec::new(),
 					max_notification_size: 1024 * 1024,
 					set_config: config::SetConfig {
 						reserved_nodes: vec![config::MultiaddrWithPeerId {
@@ -456,6 +460,81 @@ fn notifications_back_pressure() {
 	});
 }
 
+#[test]
+fn fallback_name_working() {
+	// Node 1 supports the protocols "new" and "old". Node 2 only supports "old". Checks whether
+	// they can connect.
+
+	const NEW_PROTOCOL_NAME: Cow<'static, str> =
+		Cow::Borrowed("/new-shiny-protocol-that-isnt-PROTOCOL_NAME");
+
+	let listen_addr = config::build_multiaddr![Memory(rand::random::<u64>())];
+
+	let (node1, mut events_stream1) = build_test_full_node(config::NetworkConfiguration {
+		extra_sets: vec![
+			config::NonDefaultSetConfig {
+				notifications_protocol: NEW_PROTOCOL_NAME.clone(),
+				fallback_names: vec![PROTOCOL_NAME],
+				max_notification_size: 1024 * 1024,
+				set_config: Default::default()
+			}
+		],
+		listen_addresses: vec![listen_addr.clone()],
+		transport: config::TransportConfig::MemoryOnly,
+		.. config::NetworkConfiguration::new_local()
+	});
+
+	let (_, mut events_stream2) = build_test_full_node(config::NetworkConfiguration {
+		extra_sets: vec![
+			config::NonDefaultSetConfig {
+				notifications_protocol: PROTOCOL_NAME,
+				fallback_names: Vec::new(),
+				max_notification_size: 1024 * 1024,
+				set_config: config::SetConfig {
+					reserved_nodes: vec![config::MultiaddrWithPeerId {
+						multiaddr: listen_addr,
+						peer_id: node1.local_peer_id().clone(),
+					}],
+					.. Default::default()
+				}
+			}
+		],
+		listen_addresses: vec![],
+		transport: config::TransportConfig::MemoryOnly,
+		.. config::NetworkConfiguration::new_local()
+	});
+
+	let receiver = async_std::task::spawn(async move {
+		// Wait for the `NotificationStreamOpened`.
+		loop {
+			match events_stream2.next().await.unwrap() {
+				Event::NotificationStreamOpened { protocol, negotiated_fallback, .. } => {
+					assert_eq!(protocol, PROTOCOL_NAME);
+					assert_eq!(negotiated_fallback, None);
+					break
+				},
+				_ => {}
+			};
+		}
+	});
+
+	async_std::task::block_on(async move {
+		// Wait for the `NotificationStreamOpened`.
+		loop {
+			match events_stream1.next().await.unwrap() {
+				Event::NotificationStreamOpened { protocol, negotiated_fallback, .. } => {
+					assert_eq!(protocol, NEW_PROTOCOL_NAME);
+					assert_eq!(negotiated_fallback, Some(PROTOCOL_NAME));
+					break
+				},
+				_ => {}
+			};
+		}
+
+		receiver.await;
+	});
+}
+
 #[test]
 #[should_panic(expected = "don't match the transport")]
 fn ensure_listen_addresses_consistent_with_transport_memory() {
diff --git a/client/network/src/transactions.rs b/client/network/src/transactions.rs
index b694182e6a23..8a7dd78c834c 100644
--- a/client/network/src/transactions.rs
+++ b/client/network/src/transactions.rs
@@ -136,6 +136,7 @@ impl TransactionsHandlerPrototype {
 	pub fn set_config(&self) -> config::NonDefaultSetConfig {
 		config::NonDefaultSetConfig {
 			notifications_protocol: self.protocol_name.clone(),
+			fallback_names: Vec::new(),
 			max_notification_size: MAX_TRANSACTIONS_SIZE,
 			set_config: config::SetConfig {
 				in_peers: 0,
@@ -318,7 +319,7 @@ impl<B: BlockT + 'static, H: ExHashT> TransactionsHandler<B, H> {
 				}
 			},
 
-			Event::NotificationStreamOpened { remote, protocol, role } if protocol == self.protocol_name => {
+			Event::NotificationStreamOpened { remote, protocol, role, .. } if protocol == self.protocol_name => {
 				let _was_in = self.peers.insert(remote, Peer {
 					known_transactions: LruHashSet::new(NonZeroUsize::new(MAX_KNOWN_TRANSACTIONS)
 						.expect("Constant is nonzero")),
diff --git a/client/network/test/src/lib.rs b/client/network/test/src/lib.rs
index 689eca8aac5d..8e56005dad25 100644
--- a/client/network/test/src/lib.rs
+++ b/client/network/test/src/lib.rs
@@ -742,6 +742,7 @@ pub trait TestNetFactory: Sized where <Self::BlockImport as BlockImport<Block>>:
 		network_config.extra_sets = config.notifications_protocols.into_iter().map(|p| {
 			NonDefaultSetConfig {
 				notifications_protocol: p,
+				fallback_names: Vec::new(),
 				max_notification_size: 1024 * 1024,
 				set_config: Default::default()
 			}

From 75957575080a6eacfbdf8995b63f2693ee33efe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Fri, 7 May 2021 00:15:08 +0200
Subject: [PATCH 0716/1194] Fix the calculation of the time until the next slot
 (#8753)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix the calculation of the time until the next slot

* Update client/consensus/slots/src/slots.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
---
 client/consensus/slots/src/slots.rs | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/client/consensus/slots/src/slots.rs b/client/consensus/slots/src/slots.rs
index b5ce71dfbf4c..665f7c58ba94 100644
--- a/client/consensus/slots/src/slots.rs
+++ b/client/consensus/slots/src/slots.rs
@@ -40,11 +40,12 @@ pub fn duration_now() -> Duration {
 }
 
 /// Returns the duration until the next slot from now.
-pub fn time_until_next(slot_duration: Duration) -> Duration {
-	let remaining_full_millis = slot_duration.as_millis()
-		- (duration_now().as_millis() % slot_duration.as_millis())
-		- 1;
-	Duration::from_millis(remaining_full_millis as u64)
+pub fn time_until_next_slot(slot_duration: Duration) -> Duration {
+	let now = duration_now().as_millis();
+
+	let next_slot = (now + slot_duration.as_millis()) / slot_duration.as_millis();
+	let remaining_millis = next_slot * slot_duration.as_millis() - now;
+	Duration::from_millis(remaining_millis as u64)
 }
 
 /// Information about a slot.
@@ -86,7 +87,7 @@ impl<B: BlockT> SlotInfo<B> {
 			duration,
 			chain_head,
 			block_size_limit,
-			ends_at: Instant::now() + time_until_next(duration),
+			ends_at: Instant::now() + time_until_next_slot(duration),
 		}
 	}
 }
@@ -132,7 +133,7 @@ where
 			self.inner_delay = match self.inner_delay.take() {
 				None => {
 					// schedule wait.
-					let wait_dur = time_until_next(self.slot_duration);
+					let wait_dur = time_until_next_slot(self.slot_duration);
 					Some(Delay::new(wait_dur))
 				}
 				Some(d) => Some(d),
@@ -143,7 +144,12 @@ where
 			}
 			// timeout has fired.
 
-			let ends_at = Instant::now() + time_until_next(self.slot_duration);
+			let ends_in = time_until_next_slot(self.slot_duration);
+
+			// reschedule delay for next slot.
+			self.inner_delay = Some(Delay::new(ends_in));
+
+			let ends_at = Instant::now() + ends_in;
 
 			let chain_head = match self.client.best_chain() {
 				Ok(x) => x,
@@ -174,10 +180,6 @@ where
 			let slot = inherent_data_providers.slot();
 			let inherent_data = inherent_data_providers.create_inherent_data()?;
 
-			// reschedule delay for next slot.
-			let ends_in = time_until_next(self.slot_duration);
-			self.inner_delay = Some(Delay::new(ends_in));
-
 			// never yield the same slot twice.
 			if slot > self.last_slot {
 				self.last_slot = slot;

From a1eaececfd60c7c763d418a015804804604c22d4 Mon Sep 17 00:00:00 2001
From: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
Date: Fri, 7 May 2021 10:18:09 +0200
Subject: [PATCH 0717/1194] `#[derive(MaxEncodedLen)]` (#8737)

* impl #[derive(MaxEncodedLen)] for structs

* impl #[derive(MaxEncodedLen)] for enums, unions

* break long comments onto multiple lines

* add doc for public item

* add examples to macro documentation

* move MaxEncodedLen macro docs, un-ignore doc-tests
---
 frame/support/procedural/src/lib.rs           |   7 +
 .../support/procedural/src/max_encoded_len.rs | 133 ++++++++++++++++
 frame/support/src/traits.rs                   |  28 ++++
 frame/support/test/tests/max_encoded_len.rs   | 149 ++++++++++++++++++
 .../support/test/tests/max_encoded_len_ui.rs  |  26 +++
 .../tests/max_encoded_len_ui/not_encode.rs    |   6 +
 .../max_encoded_len_ui/not_encode.stderr      |  13 ++
 .../test/tests/max_encoded_len_ui/not_mel.rs  |  14 ++
 .../tests/max_encoded_len_ui/not_mel.stderr   |  21 +++
 .../test/tests/max_encoded_len_ui/union.rs    |  10 ++
 .../tests/max_encoded_len_ui/union.stderr     |  11 ++
 .../max_encoded_len_ui/unsupported_variant.rs |  12 ++
 .../unsupported_variant.stderr                |  12 ++
 13 files changed, 442 insertions(+)
 create mode 100644 frame/support/procedural/src/max_encoded_len.rs
 create mode 100644 frame/support/test/tests/max_encoded_len.rs
 create mode 100644 frame/support/test/tests/max_encoded_len_ui.rs
 create mode 100644 frame/support/test/tests/max_encoded_len_ui/not_encode.rs
 create mode 100644 frame/support/test/tests/max_encoded_len_ui/not_encode.stderr
 create mode 100644 frame/support/test/tests/max_encoded_len_ui/not_mel.rs
 create mode 100644 frame/support/test/tests/max_encoded_len_ui/not_mel.stderr
 create mode 100644 frame/support/test/tests/max_encoded_len_ui/union.rs
 create mode 100644 frame/support/test/tests/max_encoded_len_ui/union.stderr
 create mode 100644 frame/support/test/tests/max_encoded_len_ui/unsupported_variant.rs
 create mode 100644 frame/support/test/tests/max_encoded_len_ui/unsupported_variant.stderr

diff --git a/frame/support/procedural/src/lib.rs b/frame/support/procedural/src/lib.rs
index 4cedf798821a..069339a9794c 100644
--- a/frame/support/procedural/src/lib.rs
+++ b/frame/support/procedural/src/lib.rs
@@ -28,6 +28,7 @@ mod debug_no_bound;
 mod clone_no_bound;
 mod partial_eq_no_bound;
 mod default_no_bound;
+mod max_encoded_len;
 
 pub(crate) use storage::INHERENT_INSTANCE_NAME;
 use proc_macro::TokenStream;
@@ -432,3 +433,9 @@ pub fn crate_to_pallet_version(input: TokenStream) -> TokenStream {
 /// The number of module instances supported by the runtime, starting at index 1,
 /// and up to `NUMBER_OF_INSTANCE`.
 pub(crate) const NUMBER_OF_INSTANCE: u8 = 16;
+
+/// Derive `MaxEncodedLen`.
+#[proc_macro_derive(MaxEncodedLen)]
+pub fn derive_max_encoded_len(input: TokenStream) -> TokenStream {
+	max_encoded_len::derive_max_encoded_len(input)
+}
diff --git a/frame/support/procedural/src/max_encoded_len.rs b/frame/support/procedural/src/max_encoded_len.rs
new file mode 100644
index 000000000000..72efa446b3f4
--- /dev/null
+++ b/frame/support/procedural/src/max_encoded_len.rs
@@ -0,0 +1,133 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use frame_support_procedural_tools::generate_crate_access_2018;
+use quote::{quote, quote_spanned};
+use syn::{
+	Data, DeriveInput, Fields, GenericParam, Generics, TraitBound, Type, TypeParamBound,
+	parse_quote, spanned::Spanned,
+};
+
+/// impl for `#[derive(MaxEncodedLen)]`
+pub fn derive_max_encoded_len(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+	let input: DeriveInput = match syn::parse(input) {
+		Ok(input) => input,
+		Err(e) => return e.to_compile_error().into(),
+	};
+
+	let mel_trait = match max_encoded_len_trait() {
+		Ok(mel_trait) => mel_trait,
+		Err(e) => return e.to_compile_error().into(),
+	};
+
+	let name = &input.ident;
+	let generics = add_trait_bounds(input.generics, mel_trait.clone());
+	let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
+
+	let data_expr = data_length_expr(&input.data);
+
+	quote::quote!(
+		const _: () = {
+			impl #impl_generics #mel_trait for #name #ty_generics #where_clause {
+				fn max_encoded_len() -> usize {
+					#data_expr
+				}
+			}
+		};
+	)
+	.into()
+}
+
+fn max_encoded_len_trait() -> syn::Result<TraitBound> {
+	let frame_support = generate_crate_access_2018("frame-support")?;
+	Ok(parse_quote!(#frame_support::traits::MaxEncodedLen))
+}
+
+// Add a bound `T: MaxEncodedLen` to every type parameter T.
+fn add_trait_bounds(mut generics: Generics, mel_trait: TraitBound) -> Generics {
+	for param in &mut generics.params {
+		if let GenericParam::Type(ref mut type_param) = *param {
+			type_param.bounds.push(TypeParamBound::Trait(mel_trait.clone()));
+		}
+	}
+	generics
+}
+
+/// generate an expression to sum up the max encoded length from several fields
+fn fields_length_expr(fields: &Fields) -> proc_macro2::TokenStream {
+	let type_iter: Box<dyn Iterator<Item = &Type>> = match fields {
+		Fields::Named(ref fields) => Box::new(fields.named.iter().map(|field| &field.ty)),
+		Fields::Unnamed(ref fields) => Box::new(fields.unnamed.iter().map(|field| &field.ty)),
+		Fields::Unit => Box::new(std::iter::empty()),
+	};
+	// expands to an expression like
+	//
+	//   0
+	//     .saturating_add(<type of first field>::max_encoded_len())
+	//     .saturating_add(<type of second field>::max_encoded_len())
+	//
+	// We match the span of each field to the span of the corresponding
+	// `max_encoded_len` call. This way, if one field's type doesn't implement
+	// `MaxEncodedLen`, the compiler's error message will underline which field
+	// caused the issue.
+	let expansion = type_iter.map(|ty| {
+		quote_spanned! {
+			ty.span() => .saturating_add(<#ty>::max_encoded_len())
+		}
+	});
+	quote! {
+		0_usize #( #expansion )*
+	}
+}
+
+// generate an expression to sum up the max encoded length of each field
+fn data_length_expr(data: &Data) -> proc_macro2::TokenStream {
+	match *data {
+		Data::Struct(ref data) => fields_length_expr(&data.fields),
+		Data::Enum(ref data) => {
+			// We need an expression expanded for each variant like
+			//
+			//   0
+			//     .max(<variant expression>)
+			//     .max(<variant expression>)
+			//     .saturating_add(1)
+			//
+			// The 1 derives from the discriminant; see
+			// https://github.com/paritytech/parity-scale-codec/
+			//   blob/f0341dabb01aa9ff0548558abb6dcc5c31c669a1/derive/src/encode.rs#L211-L216
+			//
+			// Each variant expression's sum is computed the way an equivalent struct's would be.
+
+			let expansion = data.variants.iter().map(|variant| {
+				let variant_expression = fields_length_expr(&variant.fields);
+				quote! {
+					.max(#variant_expression)
+				}
+			});
+
+			quote! {
+				0_usize #( #expansion )* .saturating_add(1)
+			}
+		}
+		Data::Union(ref data) => {
+			// https://github.com/paritytech/parity-scale-codec/
+			//   blob/f0341dabb01aa9ff0548558abb6dcc5c31c669a1/derive/src/encode.rs#L290-L293
+			syn::Error::new(data.union_token.span(), "Union types are not supported")
+				.to_compile_error()
+		}
+	}
+}
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index d15356c1e1b0..2d7fb3db7366 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -82,4 +82,32 @@ mod voting;
 pub use voting::{CurrencyToVote, SaturatingCurrencyToVote, U128CurrencyToVote};
 
 mod max_encoded_len;
+// This looks like an overlapping import/export, but it isn't:
+// macros and traits live in distinct namespaces.
 pub use max_encoded_len::MaxEncodedLen;
+/// Derive [`MaxEncodedLen`][max_encoded_len::MaxEncodedLen].
+///
+/// # Examples
+///
+/// ```
+/// # use codec::Encode;
+/// # use frame_support::traits::MaxEncodedLen;
+/// #[derive(Encode, MaxEncodedLen)]
+/// struct TupleStruct(u8, u32);
+///
+/// assert_eq!(TupleStruct::max_encoded_len(), u8::max_encoded_len() + u32::max_encoded_len());
+/// ```
+///
+/// ```
+/// # use codec::Encode;
+/// # use frame_support::traits::MaxEncodedLen;
+/// #[derive(Encode, MaxEncodedLen)]
+/// enum GenericEnum<T> {
+/// 	A,
+/// 	B(T),
+/// }
+///
+/// assert_eq!(GenericEnum::<u8>::max_encoded_len(), u8::max_encoded_len() + u8::max_encoded_len());
+/// assert_eq!(GenericEnum::<u128>::max_encoded_len(), u8::max_encoded_len() + u128::max_encoded_len());
+/// ```
+pub use frame_support_procedural::MaxEncodedLen;
diff --git a/frame/support/test/tests/max_encoded_len.rs b/frame/support/test/tests/max_encoded_len.rs
new file mode 100644
index 000000000000..e9e74929108d
--- /dev/null
+++ b/frame/support/test/tests/max_encoded_len.rs
@@ -0,0 +1,149 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Tests for MaxEncodedLen derive macro
+
+use frame_support::traits::MaxEncodedLen;
+use codec::{Compact, Encode};
+
+// These structs won't even compile if the macro isn't working right.
+
+#[derive(Encode, MaxEncodedLen)]
+struct Primitives {
+	bool: bool,
+	eight: u8,
+}
+
+#[test]
+fn primitives_max_length() {
+	assert_eq!(Primitives::max_encoded_len(), 2);
+}
+
+#[derive(Encode, MaxEncodedLen)]
+struct Composites {
+	fixed_size_array: [u8; 128],
+	tuple: (u128, u128),
+}
+
+#[test]
+fn composites_max_length() {
+	assert_eq!(Composites::max_encoded_len(), 128 + 16 + 16);
+}
+
+#[derive(Encode, MaxEncodedLen)]
+struct Generic<T> {
+	one: T,
+	two: T,
+}
+
+#[test]
+fn generic_max_length() {
+	assert_eq!(Generic::<u8>::max_encoded_len(), u8::max_encoded_len() * 2);
+	assert_eq!(Generic::<u32>::max_encoded_len(), u32::max_encoded_len() * 2);
+}
+
+#[derive(Encode, MaxEncodedLen)]
+struct TwoGenerics<T, U> {
+	t: T,
+	u: U,
+}
+
+#[test]
+fn two_generics_max_length() {
+	assert_eq!(
+		TwoGenerics::<u8, u16>::max_encoded_len(),
+		u8::max_encoded_len() + u16::max_encoded_len()
+	);
+	assert_eq!(
+		TwoGenerics::<Compact<u64>, [u16; 8]>::max_encoded_len(),
+		Compact::<u64>::max_encoded_len() + <[u16; 8]>::max_encoded_len()
+	);
+}
+
+#[derive(Encode, MaxEncodedLen)]
+struct UnitStruct;
+
+#[test]
+fn unit_struct_max_length() {
+	assert_eq!(UnitStruct::max_encoded_len(), 0);
+}
+
+#[derive(Encode, MaxEncodedLen)]
+struct TupleStruct(u8, u32);
+
+#[test]
+fn tuple_struct_max_length() {
+	assert_eq!(TupleStruct::max_encoded_len(), u8::max_encoded_len() + u32::max_encoded_len());
+}
+
+#[derive(Encode, MaxEncodedLen)]
+struct TupleGeneric<T>(T, T);
+
+#[test]
+fn tuple_generic_max_length() {
+	assert_eq!(TupleGeneric::<u8>::max_encoded_len(), u8::max_encoded_len() * 2);
+	assert_eq!(TupleGeneric::<u32>::max_encoded_len(), u32::max_encoded_len() * 2);
+}
+
+#[derive(Encode, MaxEncodedLen)]
+#[allow(unused)]
+enum UnitEnum {
+	A,
+	B,
+}
+
+#[test]
+fn unit_enum_max_length() {
+	assert_eq!(UnitEnum::max_encoded_len(), 1);
+}
+
+#[derive(Encode, MaxEncodedLen)]
+#[allow(unused)]
+enum TupleEnum {
+	A(u32),
+	B,
+}
+
+#[test]
+fn tuple_enum_max_length() {
+	assert_eq!(TupleEnum::max_encoded_len(), 1 + u32::max_encoded_len());
+}
+
+#[derive(Encode, MaxEncodedLen)]
+#[allow(unused)]
+enum StructEnum {
+	A { sixty_four: u64, one_twenty_eight: u128 },
+	B,
+}
+
+#[test]
+fn struct_enum_max_length() {
+	assert_eq!(StructEnum::max_encoded_len(), 1 + u64::max_encoded_len() + u128::max_encoded_len());
+}
+
+// ensure that enums take the max of variant length, not the sum
+#[derive(Encode, MaxEncodedLen)]
+#[allow(unused)]
+enum EnumMaxNotSum {
+	A(u32),
+	B(u32),
+}
+
+#[test]
+fn enum_max_not_sum_max_length() {
+	assert_eq!(EnumMaxNotSum::max_encoded_len(), 1 + u32::max_encoded_len());
+}
diff --git a/frame/support/test/tests/max_encoded_len_ui.rs b/frame/support/test/tests/max_encoded_len_ui.rs
new file mode 100644
index 000000000000..c5c0489da924
--- /dev/null
+++ b/frame/support/test/tests/max_encoded_len_ui.rs
@@ -0,0 +1,26 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#[rustversion::attr(not(stable), ignore)]
+#[test]
+fn derive_no_bound_ui() {
+	// As trybuild is using `cargo check`, we don't need the real WASM binaries.
+	std::env::set_var("SKIP_WASM_BUILD", "1");
+
+	let t = trybuild::TestCases::new();
+	t.compile_fail("tests/max_encoded_len_ui/*.rs");
+}
diff --git a/frame/support/test/tests/max_encoded_len_ui/not_encode.rs b/frame/support/test/tests/max_encoded_len_ui/not_encode.rs
new file mode 100644
index 000000000000..ed6fe94471e5
--- /dev/null
+++ b/frame/support/test/tests/max_encoded_len_ui/not_encode.rs
@@ -0,0 +1,6 @@
+use frame_support::traits::MaxEncodedLen;
+
+#[derive(MaxEncodedLen)]
+struct NotEncode;
+
+fn main() {}
diff --git a/frame/support/test/tests/max_encoded_len_ui/not_encode.stderr b/frame/support/test/tests/max_encoded_len_ui/not_encode.stderr
new file mode 100644
index 000000000000..f4dbeac04084
--- /dev/null
+++ b/frame/support/test/tests/max_encoded_len_ui/not_encode.stderr
@@ -0,0 +1,13 @@
+error[E0277]: the trait bound `NotEncode: WrapperTypeEncode` is not satisfied
+  --> $DIR/not_encode.rs:3:10
+   |
+3  | #[derive(MaxEncodedLen)]
+   |          ^^^^^^^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `NotEncode`
+   |
+  ::: $WORKSPACE/frame/support/src/traits/max_encoded_len.rs
+   |
+   | pub trait MaxEncodedLen: Encode {
+   |                          ------ required by this bound in `MaxEncodedLen`
+   |
+   = note: required because of the requirements on the impl of `frame_support::dispatch::Encode` for `NotEncode`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/frame/support/test/tests/max_encoded_len_ui/not_mel.rs b/frame/support/test/tests/max_encoded_len_ui/not_mel.rs
new file mode 100644
index 000000000000..6116f30e5272
--- /dev/null
+++ b/frame/support/test/tests/max_encoded_len_ui/not_mel.rs
@@ -0,0 +1,14 @@
+use codec::Encode;
+use frame_support::traits::MaxEncodedLen;
+
+#[derive(Encode)]
+struct NotMel;
+
+#[derive(Encode, MaxEncodedLen)]
+struct Generic<T> {
+	t: T,
+}
+
+fn main() {
+	let _ = Generic::<NotMel>::max_encoded_len();
+}
diff --git a/frame/support/test/tests/max_encoded_len_ui/not_mel.stderr b/frame/support/test/tests/max_encoded_len_ui/not_mel.stderr
new file mode 100644
index 000000000000..0aabd4b2a393
--- /dev/null
+++ b/frame/support/test/tests/max_encoded_len_ui/not_mel.stderr
@@ -0,0 +1,21 @@
+error[E0599]: the function or associated item `max_encoded_len` exists for struct `Generic<NotMel>`, but its trait bounds were not satisfied
+  --> $DIR/not_mel.rs:13:29
+   |
+5  | struct NotMel;
+   | -------------- doesn't satisfy `NotMel: MaxEncodedLen`
+...
+8  | struct Generic<T> {
+   | -----------------
+   | |
+   | function or associated item `max_encoded_len` not found for this
+   | doesn't satisfy `Generic<NotMel>: MaxEncodedLen`
+...
+13 |     let _ = Generic::<NotMel>::max_encoded_len();
+   |                                ^^^^^^^^^^^^^^^ function or associated item cannot be called on `Generic<NotMel>` due to unsatisfied trait bounds
+   |
+   = note: the following trait bounds were not satisfied:
+           `NotMel: MaxEncodedLen`
+           which is required by `Generic<NotMel>: MaxEncodedLen`
+   = help: items from traits can only be used if the trait is implemented and in scope
+   = note: the following trait defines an item `max_encoded_len`, perhaps you need to implement it:
+           candidate #1: `MaxEncodedLen`
diff --git a/frame/support/test/tests/max_encoded_len_ui/union.rs b/frame/support/test/tests/max_encoded_len_ui/union.rs
new file mode 100644
index 000000000000..c685b6939e9b
--- /dev/null
+++ b/frame/support/test/tests/max_encoded_len_ui/union.rs
@@ -0,0 +1,10 @@
+use codec::Encode;
+use frame_support::traits::MaxEncodedLen;
+
+#[derive(Encode, MaxEncodedLen)]
+union Union {
+	a: u8,
+	b: u16,
+}
+
+fn main() {}
diff --git a/frame/support/test/tests/max_encoded_len_ui/union.stderr b/frame/support/test/tests/max_encoded_len_ui/union.stderr
new file mode 100644
index 000000000000..bc5519d674d9
--- /dev/null
+++ b/frame/support/test/tests/max_encoded_len_ui/union.stderr
@@ -0,0 +1,11 @@
+error: Union types are not supported
+ --> $DIR/union.rs:5:1
+  |
+5 | union Union {
+  | ^^^^^
+
+error: Union types are not supported.
+ --> $DIR/union.rs:5:1
+  |
+5 | union Union {
+  | ^^^^^
diff --git a/frame/support/test/tests/max_encoded_len_ui/unsupported_variant.rs b/frame/support/test/tests/max_encoded_len_ui/unsupported_variant.rs
new file mode 100644
index 000000000000..675f62c168a6
--- /dev/null
+++ b/frame/support/test/tests/max_encoded_len_ui/unsupported_variant.rs
@@ -0,0 +1,12 @@
+use codec::Encode;
+use frame_support::traits::MaxEncodedLen;
+
+#[derive(Encode)]
+struct NotMel;
+
+#[derive(Encode, MaxEncodedLen)]
+enum UnsupportedVariant {
+	NotMel(NotMel),
+}
+
+fn main() {}
diff --git a/frame/support/test/tests/max_encoded_len_ui/unsupported_variant.stderr b/frame/support/test/tests/max_encoded_len_ui/unsupported_variant.stderr
new file mode 100644
index 000000000000..aa10b5e4cc15
--- /dev/null
+++ b/frame/support/test/tests/max_encoded_len_ui/unsupported_variant.stderr
@@ -0,0 +1,12 @@
+error[E0599]: no function or associated item named `max_encoded_len` found for struct `NotMel` in the current scope
+ --> $DIR/unsupported_variant.rs:9:9
+  |
+5 | struct NotMel;
+  | -------------- function or associated item `max_encoded_len` not found for this
+...
+9 |     NotMel(NotMel),
+  |            ^^^^^^ function or associated item not found in `NotMel`
+  |
+  = help: items from traits can only be used if the trait is implemented and in scope
+  = note: the following trait defines an item `max_encoded_len`, perhaps you need to implement it:
+          candidate #1: `MaxEncodedLen`

From d8425ae08add1895966921d46f8989c310d08c03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Fri, 7 May 2021 14:37:30 +0200
Subject: [PATCH 0718/1194] contracts: Refactor the exec module (#8604)

* contracts: Add default implementation for Executable::occupied_storage()

* contracts: Refactor the exec module

* Let runtime specify the backing type of the call stack

This removes the need for a runtime check of the specified
`MaxDepth`. We can now garantuee that we don't need to
allocate when a new call frame is pushed.

* Fix doc typo

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_contracts --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/contracts/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Review nits

* Fix defect in contract info caching behaviour

* Add more docs

* Fix wording and typos

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
---
 Cargo.lock                              |    1 +
 bin/node/runtime/src/lib.rs             |    3 +-
 frame/contracts/Cargo.toml              |    1 +
 frame/contracts/src/benchmarking/mod.rs |   28 +-
 frame/contracts/src/chain_extension.rs  |    6 +-
 frame/contracts/src/exec.rs             | 1392 ++++++++++++++---------
 frame/contracts/src/gas.rs              |  140 +--
 frame/contracts/src/lib.rs              |   69 +-
 frame/contracts/src/rent.rs             |    7 +-
 frame/contracts/src/storage.rs          |  116 +-
 frame/contracts/src/tests.rs            |   75 +-
 frame/contracts/src/wasm/code_cache.rs  |    6 +-
 frame/contracts/src/wasm/mod.rs         |  262 +----
 frame/contracts/src/wasm/runtime.rs     |  212 ++--
 frame/contracts/src/weights.rs          | 1364 +++++++++++-----------
 15 files changed, 1942 insertions(+), 1740 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4f7bce5aaa3c..f11953213d01 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4799,6 +4799,7 @@ dependencies = [
  "rand 0.8.3",
  "rand_pcg 0.3.0",
  "serde",
+ "smallvec 1.6.1",
  "sp-core",
  "sp-io",
  "sp-runtime",
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 2e5430149373..05f75b14b960 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -782,7 +782,6 @@ parameter_types! {
 	pub RentFraction: Perbill = Perbill::from_rational(1u32, 30 * DAYS);
 	pub const SurchargeReward: Balance = 150 * MILLICENTS;
 	pub const SignedClaimHandicap: u32 = 2;
-	pub const MaxDepth: u32 = 32;
 	pub const MaxValueSize: u32 = 16 * 1024;
 	// The lazy deletion runs inside on_initialize.
 	pub DeletionWeightLimit: Weight = AVERAGE_ON_INITIALIZE_RATIO *
@@ -809,7 +808,7 @@ impl pallet_contracts::Config for Runtime {
 	type DepositPerStorageItem = DepositPerStorageItem;
 	type RentFraction = RentFraction;
 	type SurchargeReward = SurchargeReward;
-	type MaxDepth = MaxDepth;
+	type CallStack = [pallet_contracts::Frame<Self>; 31];
 	type MaxValueSize = MaxValueSize;
 	type WeightPrice = pallet_transaction_payment::Module<Self>;
 	type WeightInfo = pallet_contracts::weights::SubstrateWeight<Self>;
diff --git a/frame/contracts/Cargo.toml b/frame/contracts/Cargo.toml
index ba8069604a77..9381f3be5c93 100644
--- a/frame/contracts/Cargo.toml
+++ b/frame/contracts/Cargo.toml
@@ -18,6 +18,7 @@ log = { version = "0.4", default-features = false }
 parity-wasm = { version = "0.42", default-features = false }
 pwasm-utils = { version = "0.17", default-features = false }
 serde = { version = "1", optional = true, features = ["derive"] }
+smallvec = { version = "1", default-features = false, features = ["const_generics"] }
 wasmi-validation = { version = "0.4", default-features = false }
 
 # Only used in benchmarking to generate random contract code
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index 3db04d3caf3d..107f35e61081 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -166,16 +166,17 @@ where
 
 	/// Store the supplied storage items into this contracts storage.
 	fn store(&self, items: &Vec<(StorageKey, Vec<u8>)>) -> Result<(), &'static str> {
-		let info = self.alive_info()?;
+		let mut info = self.alive_info()?;
 		for item in items {
 			Storage::<T>::write(
-				&self.account_id,
-				&info.trie_id,
+				<System<T>>::block_number(),
+				&mut info,
 				&item.0,
 				Some(item.1.clone()),
 			)
 			.map_err(|_| "Failed to write storage to restoration dest")?;
 		}
+		<ContractInfoOf<T>>::insert(&self.account_id, ContractInfo::Alive(info.clone()));
 		Ok(())
 	}
 
@@ -1148,16 +1149,17 @@ benchmarks! {
 			.. Default::default()
 		});
 		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
-		let trie_id = instance.alive_info()?.trie_id;
+		let mut info = instance.alive_info()?;
 		for key in keys {
 			Storage::<T>::write(
-				&instance.account_id,
-				&trie_id,
+				<System<T>>::block_number(),
+				&mut info,
 				key.as_slice().try_into().map_err(|e| "Key has wrong length")?,
 				Some(vec![42; T::MaxValueSize::get() as usize])
 			)
 			.map_err(|_| "Failed to write to storage during setup.")?;
 		}
+		<ContractInfoOf<T>>::insert(&instance.account_id, ContractInfo::Alive(info.clone()));
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -1193,16 +1195,17 @@ benchmarks! {
 			.. Default::default()
 		});
 		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
-		let trie_id = instance.alive_info()?.trie_id;
+		let mut info = instance.alive_info()?;
 		for key in keys {
 			Storage::<T>::write(
-				&instance.account_id,
-				&trie_id,
+				<System<T>>::block_number(),
+				&mut info,
 				key.as_slice().try_into().map_err(|e| "Key has wrong length")?,
 				Some(vec![])
 			)
 			.map_err(|_| "Failed to write to storage during setup.")?;
 		}
+		<ContractInfoOf<T>>::insert(&instance.account_id, ContractInfo::Alive(info.clone()));
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -1238,14 +1241,15 @@ benchmarks! {
 			.. Default::default()
 		});
 		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
-		let trie_id = instance.alive_info()?.trie_id;
+		let mut info = instance.alive_info()?;
 		Storage::<T>::write(
-			&instance.account_id,
-			&trie_id,
+			<System<T>>::block_number(),
+			&mut info,
 			key.as_slice().try_into().map_err(|e| "Key has wrong length")?,
 			Some(vec![42u8; (n * 1024) as usize])
 		)
 		.map_err(|_| "Failed to write to storage during setup.")?;
+		<ContractInfoOf<T>>::insert(&instance.account_id, ContractInfo::Alive(info.clone()));
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
diff --git a/frame/contracts/src/chain_extension.rs b/frame/contracts/src/chain_extension.rs
index 4ac5300d57d7..d2839dfdbc2e 100644
--- a/frame/contracts/src/chain_extension.rs
+++ b/frame/contracts/src/chain_extension.rs
@@ -56,7 +56,7 @@
 
 use crate::{
 	Error,
-	wasm::{Runtime, RuntimeToken},
+	wasm::{Runtime, RuntimeCosts},
 };
 use codec::Decode;
 use frame_support::weights::Weight;
@@ -171,7 +171,7 @@ where
 	///
 	/// Weight is synonymous with gas in substrate.
 	pub fn charge_weight(&mut self, amount: Weight) -> Result<()> {
-		self.inner.runtime.charge_gas(RuntimeToken::ChainExtension(amount)).map(|_| ())
+		self.inner.runtime.charge_gas(RuntimeCosts::ChainExtension(amount)).map(|_| ())
 	}
 
 	/// Grants access to the execution environment of the current contract call.
@@ -349,7 +349,7 @@ where
 			buffer,
 			allow_skip,
 			|len| {
-				weight_per_byte.map(|w| RuntimeToken::ChainExtension(w.saturating_mul(len.into())))
+				weight_per_byte.map(|w| RuntimeCosts::ChainExtension(w.saturating_mul(len.into())))
 			},
 		)
 	}
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index be471ed0c72e..eea6acf1bfb4 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -17,22 +17,25 @@
 
 use crate::{
 	CodeHash, Event, Config, Pallet as Contracts,
-	TrieId, BalanceOf, ContractInfo, gas::GasMeter, rent::Rent, storage::{self, Storage},
-	Error, ContractInfoOf, Schedule, AliveContractInfo,
+	BalanceOf, ContractInfo, gas::GasMeter, rent::Rent, storage::Storage,
+	Error, ContractInfoOf, Schedule, AliveContractInfo, AccountCounter,
 };
 use sp_core::crypto::UncheckedFrom;
 use sp_std::{
 	prelude::*,
 	marker::PhantomData,
+	mem,
 };
-use sp_runtime::{Perbill, traits::{Bounded, Zero, Convert, Saturating}};
+use sp_runtime::{Perbill, traits::{Convert, Saturating}};
 use frame_support::{
 	dispatch::{DispatchResult, DispatchError},
+	storage::{with_transaction, TransactionOutcome},
 	traits::{ExistenceRequirement, Currency, Time, Randomness, Get},
 	weights::Weight,
 	ensure,
 };
-use pallet_contracts_primitives::{ExecReturnValue, ReturnFlags};
+use pallet_contracts_primitives::{ExecReturnValue};
+use smallvec::{SmallVec, Array};
 
 pub type AccountIdOf<T> = <T as frame_system::Config>::AccountId;
 pub type MomentOf<T> = <<T as Config>::Time as Time>::Moment;
@@ -113,14 +116,18 @@ where
 	T: Config,
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
+	/// Derive new `RentParams` from the passed in data.
+	///
+	/// `value` is added to the current free and total balance of the contracts' account.
 	fn new<E: Executable<T>>(
 		account_id: &T::AccountId,
+		value: &BalanceOf<T>,
 		contract: &AliveContractInfo<T>,
 		executable: &E
 	) -> Self {
 		Self {
-			total_balance: T::Currency::total_balance(account_id),
-			free_balance: T::Currency::free_balance(account_id),
+			total_balance: T::Currency::total_balance(account_id).saturating_add(*value),
+			free_balance: T::Currency::free_balance(account_id).saturating_add(*value),
 			subsistence_threshold: <Contracts<T>>::subsistence_threshold(),
 			deposit_per_contract: T::DepositPerContract::get(),
 			deposit_per_storage_byte: T::DepositPerStorageByte::get(),
@@ -168,15 +175,20 @@ impl<T: Config> Default for RentParams<T> {
 pub trait Ext: sealing::Sealed {
 	type T: Config;
 
-	/// Returns the storage entry of the executing account by the given `key`.
+	/// Call (possibly transferring some amount of funds) into the specified account.
 	///
-	/// Returns `None` if the `key` wasn't previously set by `set_storage` or
-	/// was deleted.
-	fn get_storage(&self, key: &StorageKey) -> Option<Vec<u8>>;
-
-	/// Sets the storage entry by the given key to the specified value. If `value` is `None` then
-	/// the storage entry is deleted.
-	fn set_storage(&mut self, key: StorageKey, value: Option<Vec<u8>>) -> DispatchResult;
+	/// Returns the original code size of the called contract.
+	///
+	/// # Return Value
+	///
+	/// Result<(ExecReturnValue, CodeSize), (ExecError, CodeSize)>
+	fn call(
+		&mut self,
+		gas_limit: Weight,
+		to: AccountIdOf<Self::T>,
+		value: BalanceOf<Self::T>,
+		input_data: Vec<u8>,
+	) -> Result<(ExecReturnValue, u32), (ExecError, u32)>;
 
 	/// Instantiate a contract from the given code.
 	///
@@ -189,20 +201,13 @@ pub trait Ext: sealing::Sealed {
 	/// Result<(AccountId, ExecReturnValue, CodeSize), (ExecError, CodeSize)>
 	fn instantiate(
 		&mut self,
+		gas_limit: Weight,
 		code: CodeHash<Self::T>,
 		value: BalanceOf<Self::T>,
-		gas_meter: &mut GasMeter<Self::T>,
 		input_data: Vec<u8>,
 		salt: &[u8],
 	) -> Result<(AccountIdOf<Self::T>, ExecReturnValue, u32), (ExecError, u32)>;
 
-	/// Transfer some amount of funds into the specified account.
-	fn transfer(
-		&mut self,
-		to: &AccountIdOf<Self::T>,
-		value: BalanceOf<Self::T>,
-	) -> DispatchResult;
-
 	/// Transfer all funds to `beneficiary` and delete the contract.
 	///
 	/// Returns the original code size of the terminated contract.
@@ -220,21 +225,6 @@ pub trait Ext: sealing::Sealed {
 		beneficiary: &AccountIdOf<Self::T>,
 	) -> Result<u32, (DispatchError, u32)>;
 
-	/// Call (possibly transferring some amount of funds) into the specified account.
-	///
-	/// Returns the original code size of the called contract.
-	///
-	/// # Return Value
-	///
-	/// Result<(ExecReturnValue, CodeSize), (ExecError, CodeSize)>
-	fn call(
-		&mut self,
-		to: &AccountIdOf<Self::T>,
-		value: BalanceOf<Self::T>,
-		gas_meter: &mut GasMeter<Self::T>,
-		input_data: Vec<u8>,
-	) -> Result<(ExecReturnValue, u32), (ExecError, u32)>;
-
 	/// Restores the given destination contract sacrificing the current one.
 	///
 	/// Since this function removes the self contract eagerly, if succeeded, no further actions should
@@ -254,6 +244,23 @@ pub trait Ext: sealing::Sealed {
 		delta: Vec<StorageKey>,
 	) -> Result<(u32, u32), (DispatchError, u32, u32)>;
 
+	/// Transfer some amount of funds into the specified account.
+	fn transfer(
+		&mut self,
+		to: &AccountIdOf<Self::T>,
+		value: BalanceOf<Self::T>,
+	) -> DispatchResult;
+
+	/// Returns the storage entry of the executing account by the given `key`.
+	///
+	/// Returns `None` if the `key` wasn't previously set by `set_storage` or
+	/// was deleted.
+	fn get_storage(&mut self, key: &StorageKey) -> Option<Vec<u8>>;
+
+	/// Sets the storage entry by the given key to the specified value. If `value` is `None` then
+	/// the storage entry is deleted.
+	fn set_storage(&mut self, key: StorageKey, value: Option<Vec<u8>>) -> DispatchResult;
+
 	/// Returns a reference to the account id of the caller.
 	fn caller(&self) -> &AccountIdOf<Self::T>;
 
@@ -289,7 +296,7 @@ pub trait Ext: sealing::Sealed {
 	fn set_rent_allowance(&mut self, rent_allowance: BalanceOf<Self::T>);
 
 	/// Rent allowance of the contract
-	fn rent_allowance(&self) -> BalanceOf<Self::T>;
+	fn rent_allowance(&mut self) -> BalanceOf<Self::T>;
 
 	/// Returns the current block number.
 	fn block_number(&self) -> BlockNumberOf<Self::T>;
@@ -305,10 +312,13 @@ pub trait Ext: sealing::Sealed {
 
 	/// Information needed for rent calculations.
 	fn rent_params(&self) -> &RentParams<Self::T>;
+
+	/// Get a mutable reference to the nested gas meter.
+	fn gas_meter(&mut self) -> &mut GasMeter<Self::T>;
 }
 
 /// Describes the different functions that can be exported by an [`Executable`].
-#[cfg_attr(test, derive(Clone, Copy, PartialEq))]
+#[derive(Clone, Copy, PartialEq)]
 pub enum ExportedFunction {
 	/// The constructor function which is executed on deployment of a contract.
 	Constructor,
@@ -359,15 +369,23 @@ pub trait Executable<T: Config>: Sized {
 	/// all of its emitted storage changes.
 	fn execute<E: Ext<T = T>>(
 		self,
-		ext: E,
+		ext: &mut E,
 		function: &ExportedFunction,
 		input_data: Vec<u8>,
-		gas_meter: &mut GasMeter<T>,
 	) -> ExecResult;
 
 	/// The code hash of the executable.
 	fn code_hash(&self) -> &CodeHash<T>;
 
+	/// Size of the instrumented code in bytes.
+	fn code_len(&self) -> u32;
+
+	/// Sum of instrumented and pristine code len.
+	fn aggregate_code_len(&self) -> u32;
+
+	// The number of contracts using this executable.
+	fn refcount(&self) -> u32;
+
 	/// The storage that is occupied by the instrumented executable and its pristine source.
 	///
 	/// The returned size is already divided by the number of users who share the code.
@@ -378,456 +396,685 @@ pub trait Executable<T: Config>: Sized {
 	/// This works with the current in-memory value of refcount. When calling any contract
 	/// without refetching this from storage the result can be inaccurate as it might be
 	/// working with a stale value. Usually this inaccuracy is tolerable.
-	fn occupied_storage(&self) -> u32;
-
-	/// Size of the instrumented code in bytes.
-	fn code_len(&self) -> u32;
-
-	/// Sum of instrumented and pristine code len.
-	fn aggregate_code_len(&self) -> u32;
-
-	// The number of contracts using this executable.
-	fn refcount(&self) -> u32;
+	fn occupied_storage(&self) -> u32 {
+		// We disregard the size of the struct itself as the size is completely
+		// dominated by the code size.
+		let len = self.aggregate_code_len();
+		len.checked_div(self.refcount()).unwrap_or(len)
+	}
 }
 
-pub struct ExecutionContext<'a, T: Config + 'a, E> {
-	caller: Option<&'a ExecutionContext<'a, T, E>>,
-	self_account: T::AccountId,
-	self_trie_id: Option<TrieId>,
-	depth: usize,
+/// The complete call stack of a contract execution.
+///
+/// The call stack is initiated by either a signed origin or one of the contract RPC calls.
+/// This type implements `Ext` and by that exposes the business logic of contract execution to
+/// the runtime module which interfaces with the contract (the wasm blob) itself.
+pub struct Stack<'a, T: Config, E> {
+	/// The account id of a plain account that initiated the call stack.
+	///
+	/// # Note
+	///
+	/// Please note that it is possible that the id belongs to a contract rather than a plain
+	/// account when being called through one of the contract RPCs where the client can freely
+	/// choose the origin. This usually makes no sense but is still possible.
+	origin: T::AccountId,
+	/// The cost schedule used when charging from the gas meter.
 	schedule: &'a Schedule<T>,
+	/// The gas meter where costs are charged to.
+	gas_meter: &'a mut GasMeter<T>,
+	/// The timestamp at the point of call stack instantiation.
 	timestamp: MomentOf<T>,
+	/// The block number at the time of call stack instantiation.
 	block_number: T::BlockNumber,
+	/// The account counter is cached here when accessed. It is written back when the call stack
+	/// finishes executing.
+	account_counter: Option<u64>,
+	/// The actual call stack. One entry per nested contract called/instantiated.
+	/// This does **not** include the [`Self::first_frame`].
+	frames: SmallVec<T::CallStack>,
+	/// Statically guarantee that each call stack has at least one frame.
+	first_frame: Frame<T>,
+	/// No executable is held by the struct but influences its behaviour.
 	_phantom: PhantomData<E>,
 }
 
-impl<'a, T, E> ExecutionContext<'a, T, E>
-where
-	T: Config,
-	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
-	E: Executable<T>,
-{
-	/// Create the top level execution context.
+/// Represents one entry in the call stack.
+///
+/// For each nested contract call or instantiate one frame is created. It holds specific
+/// information for the said call and caches the in-storage `ContractInfo` data structure.
+pub struct Frame<T: Config> {
+	/// The account id of the executing contract.
+	account_id: T::AccountId,
+	/// The cached in-storage data of the contract.
+	contract_info: CachedContract<T>,
+	/// The amount of balance transferred by the caller as part of the call.
+	value_transferred: BalanceOf<T>,
+	/// Snapshotted rent information that can be copied to the contract if requested.
+	rent_params: RentParams<T>,
+	/// Determines whether this is a call or instantiate frame.
+	entry_point: ExportedFunction,
+	/// The gas meter capped to the supplied gas limit.
+	nested_meter: GasMeter<T>,
+}
+
+/// Parameter passed in when creating a new `Frame`.
+///
+/// It determines whether the new frame is for a call or an instantiate.
+enum FrameArgs<'a, T: Config, E> {
+	Call {
+		/// The account id of the contract that is to be called.
+		dest: T::AccountId,
+		/// If `None` the contract info needs to be reloaded from storage.
+		cached_info: Option<AliveContractInfo<T>>,
+	},
+	Instantiate {
+		/// The contract or signed origin which instantiates the new contract.
+		sender: T::AccountId,
+		/// The seed that should be used to derive a new trie id for the contract.
+		trie_seed: u64,
+		/// The executable whose `deploy` function is run.
+		executable: E,
+		/// A salt used in the contract address deriviation of the new contract.
+		salt: &'a [u8],
+	},
+}
+
+/// Describes the different states of a contract as contained in a `Frame`.
+enum CachedContract<T: Config> {
+	/// The cached contract is up to date with the in-storage value.
+	Cached(AliveContractInfo<T>),
+	/// A recursive call into the same contract did write to the contract info.
 	///
-	/// The specified `origin` address will be used as `sender` for. The `origin` must be a regular
-	/// account (not a contract).
-	pub fn top_level(origin: T::AccountId, schedule: &'a Schedule<T>) -> Self {
-		ExecutionContext {
-			caller: None,
-			self_trie_id: None,
-			self_account: origin,
-			depth: 0,
-			schedule,
-			timestamp: T::Time::now(),
-			block_number: <frame_system::Pallet<T>>::block_number(),
-			_phantom: Default::default(),
-		}
+	/// In this case the cached contract is stale and needs to be reloaded from storage.
+	Invalidated,
+	/// The current contract executed `terminate` or `restore_to` and removed the contract.
+	///
+	/// In this case a reload is neither allowed nor possible. Please note that recursive
+	/// calls cannot remove a contract as this is checked and denied.
+	Terminated,
+}
+
+impl<T: Config> Frame<T> {
+	/// Return the `contract_info` of the current contract.
+	fn contract_info(&mut self) -> &mut AliveContractInfo<T> {
+		self.contract_info.as_alive(&self.account_id)
 	}
 
-	fn nested<'b, 'c: 'b>(&'c self, dest: T::AccountId, trie_id: TrieId)
-		-> ExecutionContext<'b, T, E>
-	{
-		ExecutionContext {
-			caller: Some(self),
-			self_trie_id: Some(trie_id),
-			self_account: dest,
-			depth: self.depth + 1,
-			schedule: self.schedule,
-			timestamp: self.timestamp.clone(),
-			block_number: self.block_number.clone(),
-			_phantom: Default::default(),
+	/// Invalidate and return the `contract_info` of the current contract.
+	fn invalidate(&mut self) -> AliveContractInfo<T> {
+		self.contract_info.invalidate(&self.account_id)
+	}
+
+	/// Terminate and return the `contract_info` of the current contract.
+	///
+	/// # Note
+	///
+	/// Under no circumstances the contract is allowed to access the `contract_info` after
+	/// a call to this function. This would constitute a programming error in the exec module.
+	fn terminate(&mut self) -> AliveContractInfo<T> {
+		self.contract_info.terminate(&self.account_id)
+	}
+}
+
+/// Extract the contract info after loading it from storage.
+///
+/// This assumes that `load` was executed before calling this macro.
+macro_rules! get_cached_or_panic_after_load {
+	($c:expr) => {{
+		if let CachedContract::Cached(contract) = $c {
+			contract
+		} else {
+			panic!(
+				"It is impossible to remove a contract that is on the call stack;\
+				See implementations of terminate and restore_to;\
+				Therefore fetching a contract will never fail while using an account id
+				that is currently active on the call stack;\
+				qed"
+			);
 		}
+	}}
+}
+
+impl<T: Config> CachedContract<T> {
+	/// Load the `contract_info` from storage if necessary.
+	fn load(&mut self, account_id: &T::AccountId) {
+		if let CachedContract::Invalidated = self {
+			let contract = <ContractInfoOf<T>>::get(&account_id)
+				.and_then(|contract| contract.get_alive());
+			if let Some(contract) = contract {
+				*self = CachedContract::Cached(contract);
+			}
+		}
+	}
+
+	/// Return the cached contract_info as alive contract info.
+	fn as_alive(&mut self, account_id: &T::AccountId) -> &mut AliveContractInfo<T> {
+		self.load(account_id);
+		get_cached_or_panic_after_load!(self)
 	}
 
-	/// Make a call to the specified address, optionally transferring some funds.
+	/// Invalidate and return the contract info.
+	fn invalidate(&mut self, account_id: &T::AccountId) -> AliveContractInfo<T> {
+		self.load(account_id);
+		get_cached_or_panic_after_load!(mem::replace(self, Self::Invalidated))
+	}
+
+	/// Terminate and return the contract info.
+	fn terminate(&mut self, account_id: &T::AccountId) -> AliveContractInfo<T> {
+		self.load(account_id);
+		get_cached_or_panic_after_load!(mem::replace(self, Self::Terminated))
+	}
+}
+
+impl<'a, T, E> Stack<'a, T, E>
+where
+	T: Config,
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
+	E: Executable<T>,
+{
+	/// Create an run a new call stack by calling into `dest`.
 	///
 	/// # Return Value
 	///
 	/// Result<(ExecReturnValue, CodeSize), (ExecError, CodeSize)>
-	pub fn call(
-		&mut self,
+	pub fn run_call(
+		origin: T::AccountId,
 		dest: T::AccountId,
+		gas_meter: &'a mut GasMeter<T>,
+		schedule: &'a Schedule<T>,
 		value: BalanceOf<T>,
-		gas_meter: &mut GasMeter<T>,
 		input_data: Vec<u8>,
 	) -> Result<(ExecReturnValue, u32), (ExecError, u32)> {
-		if self.depth == T::MaxDepth::get() as usize {
-			return Err((Error::<T>::MaxCallDepthReached.into(), 0));
-		}
+		let (mut stack, executable) = Self::new(
+			FrameArgs::Call{dest, cached_info: None},
+			origin,
+			gas_meter,
+			schedule,
+			value,
+		)?;
+		stack.run(executable, input_data)
+	}
 
-		let contract = <ContractInfoOf<T>>::get(&dest)
-			.and_then(|contract| contract.get_alive())
-			.ok_or((Error::<T>::NotCallable.into(), 0))?;
+	/// Create and run a new call stack by instantiating a new contract.
+	///
+	/// # Return Value
+	///
+	/// Result<(NewContractAccountId, ExecReturnValue), ExecError)>
+	pub fn run_instantiate(
+		origin: T::AccountId,
+		executable: E,
+		gas_meter: &'a mut GasMeter<T>,
+		schedule: &'a Schedule<T>,
+		value: BalanceOf<T>,
+		input_data: Vec<u8>,
+		salt: &[u8],
+	) -> Result<(T::AccountId, ExecReturnValue), ExecError> {
+		let (mut stack, executable) = Self::new(
+			FrameArgs::Instantiate {
+				sender: origin.clone(),
+				trie_seed: Self::initial_trie_seed(),
+				executable,
+				salt,
+			},
+			origin,
+			gas_meter,
+			schedule,
+			value,
+		).map_err(|(e, _code_len)| e)?;
+		let account_id = stack.top_frame().account_id.clone();
+		stack.run(executable, input_data)
+			.map(|(ret, _code_len)| (account_id, ret))
+			.map_err(|(err, _code_len)| err)
+	}
 
-		let executable = E::from_storage(contract.code_hash, &self.schedule, gas_meter)
-			.map_err(|e| (e.into(), 0))?;
-		let code_len = executable.code_len();
-
-		// This charges the rent and denies access to a contract that is in need of
-		// eviction by returning `None`. We cannot evict eagerly here because those
-		// changes would be rolled back in case this contract is called by another
-		// contract.
-		// See: https://github.com/paritytech/substrate/issues/6439#issuecomment-648754324
-		let contract = Rent::<T, E>::charge(&dest, contract, executable.occupied_storage())
-			.map_err(|e| (e.into(), code_len))?
-			.ok_or((Error::<T>::NotCallable.into(), code_len))?;
-
-		let transactor_kind = self.transactor_kind();
-		let caller = self.self_account.clone();
-
-		let result = self.with_nested_context(dest.clone(), contract.trie_id.clone(), |nested| {
-			if value > BalanceOf::<T>::zero() {
-				transfer::<T>(
-					TransferCause::Call,
-					transactor_kind,
-					&caller,
-					&dest,
-					value,
-				)?
+	/// Create a new call stack.
+	fn new(
+		args: FrameArgs<T, E>,
+		origin: T::AccountId,
+		gas_meter: &'a mut GasMeter<T>,
+		schedule: &'a Schedule<T>,
+		value: BalanceOf<T>,
+	) -> Result<(Self, E), (ExecError, u32)> {
+		let (first_frame, executable) = Self::new_frame(args, value, gas_meter, 0, &schedule)?;
+		let stack = Self {
+			origin,
+			schedule,
+			gas_meter,
+			timestamp: T::Time::now(),
+			block_number: <frame_system::Pallet<T>>::block_number(),
+			account_counter: None,
+			first_frame,
+			frames: Default::default(),
+			_phantom: Default::default(),
+		};
+
+		Ok((stack, executable))
+	}
+
+	/// Construct a new frame.
+	///
+	/// This does not take `self` because when constructing the first frame `self` is
+	/// not initialized, yet.
+	fn new_frame(
+		frame_args: FrameArgs<T, E>,
+		value_transferred: BalanceOf<T>,
+		gas_meter: &mut GasMeter<T>,
+		gas_limit: Weight,
+		schedule: &Schedule<T>
+	) -> Result<(Frame<T>, E), (ExecError, u32)> {
+		let (account_id, contract_info, executable, entry_point) = match frame_args {
+			FrameArgs::Call{dest, cached_info} => {
+				let contract = if let Some(contract) = cached_info {
+					contract
+				} else {
+					<ContractInfoOf<T>>::get(&dest)
+						.and_then(|contract| contract.get_alive())
+						.ok_or((Error::<T>::NotCallable.into(), 0))?
+				};
+
+				let executable = E::from_storage(contract.code_hash, schedule, gas_meter)
+					.map_err(|e| (e.into(), 0))?;
+
+				// This charges the rent and denies access to a contract that is in need of
+				// eviction by returning `None`. We cannot evict eagerly here because those
+				// changes would be rolled back in case this contract is called by another
+				// contract.
+				// See: https://github.com/paritytech/substrate/issues/6439#issuecomment-648754324
+				let contract = Rent::<T, E>
+					::charge(&dest, contract, executable.occupied_storage())
+					.map_err(|e| (e.into(), executable.code_len()))?
+					.ok_or((Error::<T>::NotCallable.into(), executable.code_len()))?;
+				(dest, contract, executable, ExportedFunction::Call)
+			}
+			FrameArgs::Instantiate{sender, trie_seed, executable, salt} => {
+				let account_id = <Contracts<T>>::contract_address(
+					&sender, executable.code_hash(), &salt,
+				);
+				let trie_id = Storage::<T>::generate_trie_id(&account_id, trie_seed);
+				let contract = Storage::<T>::new_contract(
+					&account_id,
+					trie_id,
+					executable.code_hash().clone(),
+				).map_err(|e| (e.into(), executable.code_len()))?;
+				(account_id, contract, executable, ExportedFunction::Constructor)
 			}
+		};
+
+		let frame = Frame {
+			rent_params: RentParams::new(
+				&account_id, &value_transferred, &contract_info, &executable,
+			),
+			value_transferred,
+			contract_info: CachedContract::Cached(contract_info),
+			account_id,
+			entry_point,
+			nested_meter: gas_meter.nested(gas_limit)
+				.map_err(|e| (e.into(), executable.code_len()))?,
+		};
+
+		Ok((frame, executable))
+	}
 
-			let call_context = nested.new_call_context(
-				caller, &dest, value, &contract, &executable,
+	/// Create a subsequent nested frame.
+	fn push_frame(
+		&mut self,
+		frame_args: FrameArgs<T, E>,
+		value_transferred: BalanceOf<T>,
+		gas_limit: Weight,
+	) -> Result<E, (ExecError, u32)> {
+		if self.frames.len() == T::CallStack::size() {
+			return Err((Error::<T>::MaxCallDepthReached.into(), 0));
+		}
+
+		// We need to make sure that changes made to the contract info are not discarded.
+		// See the `in_memory_changes_not_discarded` test for more information.
+		// We do not store on instantiate because we do not allow to call into a contract
+		// from its own constructor.
+		let frame = self.top_frame();
+		if let (CachedContract::Cached(contract), ExportedFunction::Call) =
+			(&frame.contract_info, frame.entry_point)
+		{
+			<ContractInfoOf<T>>::insert(
+				frame.account_id.clone(),
+				ContractInfo::Alive(contract.clone()),
 			);
+		}
 
-			let output = executable.execute(
-				call_context,
-				&ExportedFunction::Call,
-				input_data,
-				gas_meter,
-			).map_err(|e| ExecError { error: e.error, origin: ErrorOrigin::Callee })?;
-			Ok(output)
-		}).map_err(|e| (e, code_len))?;
-		Ok((result, code_len))
+		let nested_meter = &mut self.frames
+			.last_mut()
+			.unwrap_or(&mut self.first_frame)
+			.nested_meter;
+		let (frame, executable) = Self::new_frame(
+			frame_args,
+			value_transferred,
+			nested_meter,
+			gas_limit,
+			self.schedule,
+		)?;
+		self.frames.push(frame);
+		Ok(executable)
 	}
 
-	pub fn instantiate(
+	/// Run the current (top) frame.
+	///
+	/// This can be either a call or an instantiate.
+	fn run(
 		&mut self,
-		endowment: BalanceOf<T>,
-		gas_meter: &mut GasMeter<T>,
 		executable: E,
-		input_data: Vec<u8>,
-		salt: &[u8],
-	) -> Result<(T::AccountId, ExecReturnValue), ExecError> {
-		if self.depth == T::MaxDepth::get() as usize {
-			Err(Error::<T>::MaxCallDepthReached)?
-		}
-
-		let transactor_kind = self.transactor_kind();
-		let caller = self.self_account.clone();
-		let dest = Contracts::<T>::contract_address(&caller, executable.code_hash(), salt);
-
-		let output = frame_support::storage::with_transaction(|| {
-			// Generate the trie id in a new transaction to only increment the counter on success.
-			let dest_trie_id = Storage::<T>::generate_trie_id(&dest);
-
-			let output = self.with_nested_context(dest.clone(), dest_trie_id, |nested| {
-				let contract = Storage::<T>::place_contract(
-					&dest,
-					nested
-						.self_trie_id
-						.clone()
-						.expect("the nested context always has to have self_trie_id"),
-					executable.code_hash().clone()
-				)?;
-
-				// Send funds unconditionally here. If the `endowment` is below existential_deposit
-				// then error will be returned here.
-				transfer::<T>(
-					TransferCause::Instantiate,
-					transactor_kind,
-					&caller,
-					&dest,
-					endowment,
-				)?;
-
-				// Cache the value before calling into the constructor because that
-				// consumes the value. If the constructor creates additional contracts using
-				// the same code hash we still charge the "1 block rent" as if they weren't
-				// spawned. This is OK as overcharging is always safe.
-				let occupied_storage = executable.occupied_storage();
-
-				let call_context = nested.new_call_context(
-					caller.clone(),
-					&dest,
-					endowment,
-					&contract,
-					&executable,
-				);
+		input_data: Vec<u8>
+	) -> Result<(ExecReturnValue, u32), (ExecError, u32)> {
+		let entry_point = self.top_frame().entry_point;
+		let do_transaction = || {
+			// Cache the value before calling into the constructor because that
+			// consumes the value. If the constructor creates additional contracts using
+			// the same code hash we still charge the "1 block rent" as if they weren't
+			// spawned. This is OK as overcharging is always safe.
+			let occupied_storage = executable.occupied_storage();
+			let code_len = executable.code_len();
+
+			// Every call or instantiate also optionally transferres balance.
+			self.initial_transfer().map_err(|e| (ExecError::from(e), 0))?;
+
+			// Call into the wasm blob.
+			let output = executable.execute(
+				self,
+				&entry_point,
+				input_data,
+			).map_err(|e| (ExecError { error: e.error, origin: ErrorOrigin::Callee }, code_len))?;
 
-				let output = executable.execute(
-					call_context,
-					&ExportedFunction::Constructor,
-					input_data,
-					gas_meter,
-				).map_err(|e| ExecError { error: e.error, origin: ErrorOrigin::Callee })?;
+			// Additional work needs to be performed in case of an instantiation.
+			if output.is_success() && entry_point == ExportedFunction::Constructor {
+				let frame = self.top_frame_mut();
+				let account_id = frame.account_id.clone();
 
-				// We need to re-fetch the contract because changes are written to storage
-				// eagerly during execution.
-				let contract = <ContractInfoOf<T>>::get(&dest)
-					.and_then(|contract| contract.get_alive())
-					.ok_or(Error::<T>::NotCallable)?;
+				// It is not allowed to terminate a contract inside its constructor.
+				if let CachedContract::Terminated = frame.contract_info {
+					return Err((Error::<T>::TerminatedInConstructor.into(), code_len));
+				}
 
 				// Collect the rent for the first block to prevent the creation of very large
 				// contracts that never intended to pay for even one block.
 				// This also makes sure that it is above the subsistence threshold
 				// in order to keep up the guarantuee that we always leave a tombstone behind
 				// with the exception of a contract that called `seal_terminate`.
-				Rent::<T, E>::charge(&dest, contract, occupied_storage)?
-					.ok_or(Error::<T>::NewContractNotFunded)?;
+				let contract = Rent::<T, E>
+					::charge(&account_id, frame.invalidate(), occupied_storage)
+					.map_err(|e| (e.into(), code_len))?
+					.ok_or((Error::<T>::NewContractNotFunded.into(), code_len))?;
+				frame.contract_info = CachedContract::Cached(contract);
 
 				// Deposit an instantiation event.
-				deposit_event::<T>(vec![], Event::Instantiated(caller.clone(), dest.clone()));
+				deposit_event::<T>(vec![], Event::Instantiated(
+					self.caller().clone(),
+					account_id,
+				));
+			}
 
-				Ok(output)
-			});
+			Ok((output, code_len))
+		};
 
-			use frame_support::storage::TransactionOutcome::*;
+		// All changes performed by the contract are executed under a storage transaction.
+		// This allows for roll back on error. Changes to the cached contract_info are
+		// comitted or rolled back when popping the frame.
+		let (success, output) = with_transaction(|| {
+			let output = do_transaction();
 			match output {
-				Ok(_) => Commit(output),
-				Err(_) => Rollback(output),
+				Ok((ref result, _)) if result.is_success() => {
+					TransactionOutcome::Commit((true, output))
+				},
+				_ => TransactionOutcome::Rollback((false, output)),
 			}
-		})?;
+		});
+		self.pop_frame(success);
+		output
+	}
 
-		Ok((dest, output))
+	/// Remove the current (top) frame from the stack.
+	///
+	/// This is called after running the current frame. It commits cached values to storage
+	/// and invalidates all stale references to it that might exist further down the call stack.
+	fn pop_frame(&mut self, persist: bool) {
+		// Revert the account counter in case of a failed instantiation.
+		if !persist && self.top_frame().entry_point == ExportedFunction::Constructor {
+			self.account_counter.as_mut().map(|c| *c = c.wrapping_sub(1));
+		}
+
+		// Pop the current frame from the stack and return it in case it needs to interact
+		// with duplicates that might exist on the stack.
+		let frame = self.frames.pop();
+
+		if let Some(frame) = frame {
+			let prev = self.top_frame_mut();
+			let account_id = &frame.account_id;
+			prev.nested_meter.absorb_nested(frame.nested_meter);
+			// Only gas counter changes are persisted in case of a failure.
+			if !persist {
+				return;
+			}
+			if let CachedContract::Cached(contract) = frame.contract_info {
+				// optimization: Predecessor is the same contract.
+				// We can just copy the contract into the predecessor without a storage write.
+				// This is possible when there is no other contract in-between that could
+				// trigger a rollback.
+				if prev.account_id == *account_id {
+					prev.contract_info = CachedContract::Cached(contract);
+					return;
+				}
+
+				// Predecessor is a different contract: We persist the info and invalidate the first
+				// stale cache we find. This triggers a reload from storage on next use. We skip(1)
+				// because that case is already handled by the optimization above. Only the first
+				// cache needs to be invalidated because that one will invalidate the next cache
+				// when it is popped from the stack.
+				<ContractInfoOf<T>>::insert(account_id, ContractInfo::Alive(contract));
+				if let Some(c) = self.frames_mut().skip(1).find(|f| f.account_id == *account_id) {
+					c.contract_info = CachedContract::Invalidated;
+				}
+			}
+		} else {
+			// Write back to the root gas meter.
+			self.gas_meter.absorb_nested(mem::take(&mut self.first_frame.nested_meter));
+			// Only gas counter changes are persisted in case of a failure.
+			if !persist {
+				return;
+			}
+			if let CachedContract::Cached(contract) = &self.first_frame.contract_info {
+				<ContractInfoOf<T>>::insert(
+					&self.first_frame.account_id,
+					ContractInfo::Alive(contract.clone())
+				);
+			}
+			if let Some(counter) = self.account_counter {
+				<AccountCounter<T>>::set(counter);
+			}
+		}
 	}
 
-	fn new_call_context<'b>(
-		&'b mut self,
-		caller: T::AccountId,
-		dest: &T::AccountId,
+	/// Transfer some funds from `from` to `to`.
+	///
+	/// We only allow allow for draining all funds of the sender if `allow_death` is
+	/// is specified as `true`. Otherwise, any transfer that would bring the sender below the
+	/// subsistence threshold (for contracts) or the existential deposit (for plain accounts)
+	/// results in an error.
+	fn transfer(
+		sender_is_contract: bool,
+		allow_death: bool,
+		from: &T::AccountId,
+		to: &T::AccountId,
 		value: BalanceOf<T>,
-		contract: &AliveContractInfo<T>,
-		executable: &E,
-	) -> CallContext<'b, 'a, T, E> {
-		let timestamp = self.timestamp.clone();
-		let block_number = self.block_number.clone();
-		CallContext {
-			ctx: self,
-			caller,
-			value_transferred: value,
-			timestamp,
-			block_number,
-			rent_params: RentParams::new(dest, contract, executable),
-			_phantom: Default::default(),
+	) -> DispatchResult {
+		if value == 0u32.into() {
+			return Ok(());
 		}
+
+		let existence_requirement = match (allow_death, sender_is_contract) {
+			(true, _) => ExistenceRequirement::AllowDeath,
+			(false, true) => {
+				ensure!(
+					T::Currency::total_balance(from).saturating_sub(value) >=
+						Contracts::<T>::subsistence_threshold(),
+					Error::<T>::BelowSubsistenceThreshold,
+				);
+				ExistenceRequirement::KeepAlive
+			},
+			(false, false) => ExistenceRequirement::KeepAlive,
+		};
+
+		T::Currency::transfer(from, to, value, existence_requirement)
+			.map_err(|_| Error::<T>::TransferFailed)?;
+
+		Ok(())
 	}
 
-	/// Execute the given closure within a nested execution context.
-	fn with_nested_context<F>(&mut self, dest: T::AccountId, trie_id: TrieId, func: F)
-		-> ExecResult
-		where F: FnOnce(&mut ExecutionContext<T, E>) -> ExecResult
-	{
-		use frame_support::storage::TransactionOutcome::*;
-		let mut nested = self.nested(dest, trie_id);
-		frame_support::storage::with_transaction(|| {
-			let output = func(&mut nested);
-			match output {
-				Ok(ref rv) if !rv.flags.contains(ReturnFlags::REVERT) => Commit(output),
-				_ => Rollback(output),
-			}
-		})
+	// The transfer as performed by a call or instantiate.
+	fn initial_transfer(&self) -> DispatchResult {
+		Self::transfer(
+			self.caller_is_origin(),
+			false,
+			self.caller(),
+			&self.top_frame().account_id,
+			self.top_frame().value_transferred,
+		)
 	}
 
-	/// Returns whether a contract, identified by address, is currently live in the execution
-	/// stack, meaning it is in the middle of an execution.
-	fn is_live(&self, account: &T::AccountId) -> bool {
-		&self.self_account == account ||
-			self.caller.map_or(false, |caller| caller.is_live(account))
+	/// Wether the caller is the initiator of the call stack.
+	fn caller_is_origin(&self) -> bool {
+		!self.frames.is_empty()
 	}
 
-	fn transactor_kind(&self) -> TransactorKind {
-		if self.depth == 0 {
-			debug_assert!(self.self_trie_id.is_none());
-			debug_assert!(self.caller.is_none());
-			debug_assert!(ContractInfoOf::<T>::get(&self.self_account).is_none());
-			TransactorKind::PlainAccount
-		} else {
-			TransactorKind::Contract
-		}
+	/// Reference to the current (top) frame.
+	fn top_frame(&self) -> &Frame<T> {
+		self.frames.last().unwrap_or(&self.first_frame)
 	}
-}
 
-/// Describes whether we deal with a contract or a plain account.
-enum TransactorKind {
-	/// Transaction was initiated from a plain account. That can be either be through a
-	/// signed transaction or through RPC.
-	PlainAccount,
-	/// The call was initiated by a contract account.
-	Contract,
-}
+	/// Mutable reference to the current (top) frame.
+	fn top_frame_mut(&mut self) -> &mut Frame<T> {
+		self.frames.last_mut().unwrap_or(&mut self.first_frame)
+	}
 
-/// Describes possible transfer causes.
-enum TransferCause {
-	Call,
-	Instantiate,
-	Terminate,
-}
+	/// Iterator over all frames.
+	///
+	/// The iterator starts with the top frame and ends with the root frame.
+	fn frames(&self) -> impl Iterator<Item=&Frame<T>> {
+		sp_std::iter::once(&self.first_frame)
+			.chain(&self.frames)
+			.rev()
+	}
 
-/// Transfer some funds from `transactor` to `dest`.
-///
-/// We only allow allow for draining all funds of the sender if `cause` is
-/// is specified as `Terminate`. Otherwise, any transfer that would bring the sender below the
-/// subsistence threshold (for contracts) or the existential deposit (for plain accounts)
-/// results in an error.
-fn transfer<T: Config>(
-	cause: TransferCause,
-	origin: TransactorKind,
-	transactor: &T::AccountId,
-	dest: &T::AccountId,
-	value: BalanceOf<T>,
-) -> DispatchResult
-where
-	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
-{
-	use self::TransferCause::*;
-	use self::TransactorKind::*;
-
-	// Only seal_terminate is allowed to bring the sender below the subsistence
-	// threshold or even existential deposit.
-	let existence_requirement = match (cause, origin) {
-		(Terminate, _) => ExistenceRequirement::AllowDeath,
-		(_, Contract) => {
-			ensure!(
-				T::Currency::total_balance(transactor).saturating_sub(value) >=
-					Contracts::<T>::subsistence_threshold(),
-				Error::<T>::BelowSubsistenceThreshold,
-			);
-			ExistenceRequirement::KeepAlive
-		},
-		(_, PlainAccount) => ExistenceRequirement::KeepAlive,
-	};
+	/// Same as `frames` but with a mutable reference as iterator item.
+	fn frames_mut(&mut self) -> impl Iterator<Item=&mut Frame<T>> {
+		sp_std::iter::once(&mut self.first_frame)
+			.chain(&mut self.frames)
+			.rev()
+	}
 
-	T::Currency::transfer(transactor, dest, value, existence_requirement)
-		.map_err(|_| Error::<T>::TransferFailed)?;
+	/// Returns whether the current contract is on the stack multiple times.
+	fn is_recursive(&self) -> bool {
+		let account_id = &self.top_frame().account_id;
+		self.frames().skip(1).any(|f| &f.account_id == account_id)
+	}
 
-	Ok(())
-}
+	/// Increments the cached account id and returns the value to be used for the trie_id.
+	fn next_trie_seed(&mut self) -> u64 {
+		let next = if let Some(current) = self.account_counter {
+			current + 1
+		} else {
+			Self::initial_trie_seed()
+		};
+		self.account_counter = Some(next);
+		next
+	}
 
-/// A context that is active within a call.
-///
-/// This context has some invariants that must be held at all times. Specifically:
-///`ctx` always points to a context of an alive contract. That implies that it has an existent
-/// `self_trie_id`.
-///
-/// Be advised that there are brief time spans where these invariants could be invalidated.
-/// For example, when a contract requests self-termination the contract is removed eagerly. That
-/// implies that the control won't be returned to the contract anymore, but there is still some code
-/// on the path of the return from that call context. Therefore, care must be taken in these
-/// situations.
-struct CallContext<'a, 'b: 'a, T: Config + 'b, E> {
-	ctx: &'a mut ExecutionContext<'b, T, E>,
-	caller: T::AccountId,
-	value_transferred: BalanceOf<T>,
-	timestamp: MomentOf<T>,
-	block_number: T::BlockNumber,
-	rent_params: RentParams<T>,
-	_phantom: PhantomData<E>,
+	/// The account seed to be used to instantiate the account counter cache.
+	fn initial_trie_seed() -> u64 {
+		<AccountCounter<T>>::get().wrapping_add(1)
+	}
 }
 
-impl<'a, 'b: 'a, T, E> Ext for CallContext<'a, 'b, T, E>
+impl<'a, T, E> Ext for Stack<'a, T, E>
 where
-	T: Config + 'b,
+	T: Config,
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 	E: Executable<T>,
 {
 	type T = T;
 
-	fn get_storage(&self, key: &StorageKey) -> Option<Vec<u8>> {
-		let trie_id = self.ctx.self_trie_id.as_ref().expect(
-			"`ctx.self_trie_id` points to an alive contract within the `CallContext`;\
-				it cannot be `None`;\
-				expect can't fail;\
-				qed",
-		);
-		Storage::<T>::read(trie_id, key)
-	}
-
-	fn set_storage(&mut self, key: StorageKey, value: Option<Vec<u8>>) -> DispatchResult {
-		let trie_id = self.ctx.self_trie_id.as_ref().expect(
-			"`ctx.self_trie_id` points to an alive contract within the `CallContext`;\
-				it cannot be `None`;\
-				expect can't fail;\
-				qed",
-		);
-		// write panics if the passed account is not alive.
-		// the contract must be in the alive state within the `CallContext`;\
-		// the contract cannot be absent in storage;
-		// write cannot return `None`;
-		// qed
-		Storage::<T>::write(&self.ctx.self_account, trie_id, &key, value)
+	fn call(
+		&mut self,
+		gas_limit: Weight,
+		to: T::AccountId,
+		value: BalanceOf<T>,
+		input_data: Vec<u8>,
+	) -> Result<(ExecReturnValue, u32), (ExecError, u32)> {
+		// We ignore instantiate frames in our search for a cached contract.
+		// Otherwise it would be possible to recursively call a contract from its own
+		// constructor: We disallow calling not fully constructed contracts.
+		let cached_info = self
+			.frames()
+			.find(|f| f.entry_point == ExportedFunction::Call && f.account_id == to)
+			.and_then(|f| {
+				match &f.contract_info {
+					CachedContract::Cached(contract) => Some(contract.clone()),
+					_ => None,
+				}
+			});
+		let executable = self.push_frame(
+			FrameArgs::Call{dest: to, cached_info},
+			value,
+			gas_limit
+		)?;
+		self.run(executable, input_data)
 	}
 
 	fn instantiate(
 		&mut self,
+		gas_limit: Weight,
 		code_hash: CodeHash<T>,
 		endowment: BalanceOf<T>,
-		gas_meter: &mut GasMeter<T>,
 		input_data: Vec<u8>,
 		salt: &[u8],
 	) -> Result<(AccountIdOf<T>, ExecReturnValue, u32), (ExecError, u32)> {
-		let executable = E::from_storage(code_hash, &self.ctx.schedule, gas_meter)
+		let executable = E::from_storage(code_hash, &self.schedule, self.gas_meter())
 			.map_err(|e| (e.into(), 0))?;
-		let code_len = executable.code_len();
-		self.ctx.instantiate(endowment, gas_meter, executable, input_data, salt)
-			.map(|r| (r.0, r.1, code_len))
-			.map_err(|e| (e, code_len))
-	}
-
-	fn transfer(
-		&mut self,
-		to: &T::AccountId,
-		value: BalanceOf<T>,
-	) -> DispatchResult {
-		transfer::<T>(
-			TransferCause::Call,
-			TransactorKind::Contract,
-			&self.ctx.self_account.clone(),
-			to,
-			value,
-		)
+		let trie_seed = self.next_trie_seed();
+		let executable = self.push_frame(
+			FrameArgs::Instantiate {
+				sender: self.top_frame().account_id.clone(),
+				trie_seed,
+				executable,
+				salt,
+			},
+			endowment,
+			gas_limit,
+		)?;
+		let account_id = self.top_frame().account_id.clone();
+		self.run(executable, input_data)
+			.map(|(ret, code_len)| (account_id, ret, code_len))
 	}
 
 	fn terminate(
 		&mut self,
 		beneficiary: &AccountIdOf<Self::T>,
 	) -> Result<u32, (DispatchError, u32)> {
-		let self_id = self.ctx.self_account.clone();
-		let value = T::Currency::free_balance(&self_id);
-		if let Some(caller_ctx) = self.ctx.caller {
-			if caller_ctx.is_live(&self_id) {
-				return Err((Error::<T>::ReentranceDenied.into(), 0));
-			}
+		if self.is_recursive() {
+			return Err((Error::<T>::ReentranceDenied.into(), 0));
 		}
-		transfer::<T>(
-			TransferCause::Terminate,
-			TransactorKind::Contract,
-			&self_id,
+		let frame = self.top_frame_mut();
+		let info = frame.terminate();
+		Storage::<T>::queue_trie_for_deletion(&info).map_err(|e| (e, 0))?;
+		<Stack<'a, T, E>>::transfer(
+			true,
+			true,
+			&frame.account_id,
 			beneficiary,
-			value,
+			T::Currency::free_balance(&frame.account_id),
 		).map_err(|e| (e, 0))?;
-		if let Some(ContractInfo::Alive(info)) = ContractInfoOf::<T>::take(&self_id) {
-			Storage::<T>::queue_trie_for_deletion(&info).map_err(|e| (e, 0))?;
-			let code_len = E::remove_user(info.code_hash);
-			Contracts::<T>::deposit_event(Event::Terminated(self_id, beneficiary.clone()));
-			Ok(code_len)
-		} else {
-			panic!(
-				"this function is only invoked by in the context of a contract;\
-				this contract is therefore alive;\
-				qed"
-			);
-		}
-	}
-
-	fn call(
-		&mut self,
-		to: &T::AccountId,
-		value: BalanceOf<T>,
-		gas_meter: &mut GasMeter<T>,
-		input_data: Vec<u8>,
-	) -> Result<(ExecReturnValue, u32), (ExecError, u32)> {
-		self.ctx.call(to.clone(), value, gas_meter, input_data)
+		ContractInfoOf::<T>::remove(&frame.account_id);
+		let code_len = E::remove_user(info.code_hash);
+		Contracts::<T>::deposit_event(
+			Event::Terminated(frame.account_id.clone(), beneficiary.clone()),
+		);
+		Ok(code_len)
 	}
 
 	fn restore_to(
@@ -837,14 +1084,13 @@ where
 		rent_allowance: BalanceOf<Self::T>,
 		delta: Vec<StorageKey>,
 	) -> Result<(u32, u32), (DispatchError, u32, u32)> {
-		if let Some(caller_ctx) = self.ctx.caller {
-			if caller_ctx.is_live(&self.ctx.self_account) {
-				return Err((Error::<T>::ReentranceDenied.into(), 0, 0));
-			}
+		if self.is_recursive() {
+			return Err((Error::<T>::ReentranceDenied.into(), 0, 0));
 		}
-
+		let origin_contract = self.top_frame_mut().contract_info().clone();
 		let result = Rent::<T, E>::restore_to(
-			self.ctx.self_account.clone(),
+			&self.top_frame().account_id,
+			origin_contract,
 			dest.clone(),
 			code_hash.clone(),
 			rent_allowance,
@@ -854,30 +1100,51 @@ where
 			deposit_event::<Self::T>(
 				vec![],
 				Event::Restored(
-					self.ctx.self_account.clone(),
+					self.top_frame().account_id.clone(),
 					dest,
 					code_hash,
 					rent_allowance,
 				),
 			);
+			self.top_frame_mut().terminate();
 		}
 		result
 	}
 
+	fn transfer(
+		&mut self,
+		to: &T::AccountId,
+		value: BalanceOf<T>,
+	) -> DispatchResult {
+		Self::transfer(true, false, &self.top_frame().account_id, to, value)
+	}
+
+	fn get_storage(&mut self, key: &StorageKey) -> Option<Vec<u8>> {
+		Storage::<T>::read(&self.top_frame_mut().contract_info().trie_id, key)
+	}
+
+	fn set_storage(&mut self, key: StorageKey, value: Option<Vec<u8>>) -> DispatchResult {
+		let block_number = self.block_number;
+		let frame = self.top_frame_mut();
+		Storage::<T>::write(
+			block_number, frame.contract_info(), &key, value,
+		)
+	}
+
 	fn address(&self) -> &T::AccountId {
-		&self.ctx.self_account
+		&self.top_frame().account_id
 	}
 
 	fn caller(&self) -> &T::AccountId {
-		&self.caller
+		self.frames().nth(1).map(|f| &f.account_id).unwrap_or(&self.origin)
 	}
 
 	fn balance(&self) -> BalanceOf<T> {
-		T::Currency::free_balance(&self.ctx.self_account)
+		T::Currency::free_balance(&self.top_frame().account_id)
 	}
 
 	fn value_transferred(&self) -> BalanceOf<T> {
-		self.value_transferred
+		self.top_frame().value_transferred
 	}
 
 	fn random(&self, subject: &[u8]) -> (SeedOf<T>, BlockNumberOf<T>) {
@@ -899,24 +1166,16 @@ where
 	fn deposit_event(&mut self, topics: Vec<T::Hash>, data: Vec<u8>) {
 		deposit_event::<Self::T>(
 			topics,
-			Event::ContractEmitted(self.ctx.self_account.clone(), data)
+			Event::ContractEmitted(self.top_frame().account_id.clone(), data)
 		);
 	}
 
 	fn set_rent_allowance(&mut self, rent_allowance: BalanceOf<T>) {
-		if let Err(storage::ContractAbsentError) =
-			Storage::<T>::set_rent_allowance(&self.ctx.self_account, rent_allowance)
-		{
-			panic!(
-				"`self_account` points to an alive contract within the `CallContext`;
-					set_rent_allowance cannot return `Err`; qed"
-			);
-		}
+		self.top_frame_mut().contract_info().rent_allowance = rent_allowance;
 	}
 
-	fn rent_allowance(&self) -> BalanceOf<T> {
-		Storage::<T>::rent_allowance(&self.ctx.self_account)
-			.unwrap_or_else(|_| <BalanceOf<T>>::max_value()) // Must never be triggered actually
+	fn rent_allowance(&mut self) -> BalanceOf<T> {
+		self.top_frame_mut().contract_info().rent_allowance
 	}
 
 	fn block_number(&self) -> T::BlockNumber { self.block_number }
@@ -930,11 +1189,15 @@ where
 	}
 
 	fn schedule(&self) -> &Schedule<Self::T> {
-		&self.ctx.schedule
+		&self.schedule
 	}
 
 	fn rent_params(&self) -> &RentParams<Self::T> {
-		&self.rent_params
+		&self.top_frame().rent_params
+	}
+
+	fn gas_meter(&mut self) -> &mut GasMeter<Self::T> {
+		&mut self.top_frame_mut().nested_meter
 	}
 }
 
@@ -953,7 +1216,7 @@ mod sealing {
 
 	pub trait Sealed {}
 
-	impl<'a, 'b: 'a, T: Config, E> Sealed for CallContext<'a, 'b, T, E> {}
+	impl<'a, T: Config, E> Sealed for Stack<'a, T, E> {}
 
 	#[cfg(test)]
 	impl Sealed for crate::wasm::MockExt {}
@@ -972,7 +1235,7 @@ mod tests {
 	use super::*;
 	use crate::{
 		gas::GasMeter, tests::{ExtBuilder, Test, Event as MetaEvent},
-		storage::{Storage, ContractAbsentError},
+		storage::Storage,
 		tests::{
 			ALICE, BOB, CHARLIE,
 			test_utils::{place_contract, set_balance, get_balance},
@@ -981,13 +1244,13 @@ mod tests {
 		Error, Weight, CurrentSchedule,
 	};
 	use sp_core::Bytes;
-	use frame_support::assert_noop;
 	use sp_runtime::DispatchError;
 	use assert_matches::assert_matches;
 	use std::{cell::RefCell, collections::HashMap, rc::Rc};
 	use pretty_assertions::{assert_eq, assert_ne};
+	use pallet_contracts_primitives::ReturnFlags;
 
-	type MockContext<'a> = ExecutionContext<'a, Test, MockExecutable>;
+	type MockStack<'a> = Stack<'a, Test, MockExecutable>;
 
 	const GAS_LIMIT: Weight = 10_000_000_000;
 
@@ -1008,7 +1271,6 @@ mod tests {
 	struct MockCtx<'a> {
 		ext: &'a mut dyn Ext<T = Test>,
 		input_data: Vec<u8>,
-		gas_meter: &'a mut GasMeter<Test>,
 	}
 
 	#[derive(Clone)]
@@ -1028,8 +1290,8 @@ mod tests {
 	impl MockLoader {
 		fn insert(
 			func_type: ExportedFunction,
-			f: impl Fn(MockCtx, &MockExecutable,
-		) -> ExecResult + 'static) -> CodeHash<Test> {
+			f: impl Fn(MockCtx, &MockExecutable) -> ExecResult + 'static,
+		) -> CodeHash<Test> {
 			LOADER.with(|loader| {
 				let mut loader = loader.borrow_mut();
 				// Generate code hashes as monotonically increasing values.
@@ -1118,19 +1380,17 @@ mod tests {
 
 		fn execute<E: Ext<T = Test>>(
 			self,
-			mut ext: E,
+			ext: &mut E,
 			function: &ExportedFunction,
 			input_data: Vec<u8>,
-			gas_meter: &mut GasMeter<Test>,
 		) -> ExecResult {
 			if let &Constructor = function {
 				MockLoader::increment_refcount(self.code_hash);
 			}
 			if function == &self.func_type {
 				(self.func)(MockCtx {
-					ext: &mut ext,
+					ext,
 					input_data,
-					gas_meter,
 				}, &self)
 			} else {
 				exec_success()
@@ -1141,10 +1401,6 @@ mod tests {
 			&self.code_hash
 		}
 
-		fn occupied_storage(&self) -> u32 {
-			0
-		}
-
 		fn code_len(&self) -> u32 {
 			0
 		}
@@ -1162,6 +1418,10 @@ mod tests {
 		Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: Bytes(Vec::new()) })
 	}
 
+	fn exec_trapped() -> ExecResult {
+		Err(ExecError { error: <Error<Test>>::ContractTrapped.into(), origin: ErrorOrigin::Callee })
+	}
+
 	#[test]
 	fn it_works() {
 		thread_local! {
@@ -1177,11 +1437,12 @@ mod tests {
 
 		ExtBuilder::default().build().execute_with(|| {
 			let schedule = <CurrentSchedule<Test>>::get();
-			let mut ctx = MockContext::top_level(ALICE, &schedule);
 			place_contract(&BOB, exec_ch);
 
 			assert_matches!(
-				ctx.call(BOB, value, &mut gas_meter, vec![]),
+				MockStack::run_call(
+					ALICE, BOB, &mut gas_meter, &schedule, value, vec![],
+				),
 				Ok(_)
 			);
 		});
@@ -1200,9 +1461,9 @@ mod tests {
 			set_balance(&origin, 100);
 			set_balance(&dest, 0);
 
-			super::transfer::<Test>(
-				super::TransferCause::Call,
-				super::TransactorKind::PlainAccount,
+			MockStack::transfer(
+				true,
+				false,
 				&origin,
 				&dest,
 				55,
@@ -1227,15 +1488,16 @@ mod tests {
 
 		ExtBuilder::default().build().execute_with(|| {
 			let schedule = <CurrentSchedule<Test>>::get();
-			let mut ctx = MockContext::top_level(origin.clone(), &schedule);
 			place_contract(&BOB, return_ch);
 			set_balance(&origin, 100);
 			let balance = get_balance(&dest);
 
-			let output = ctx.call(
+			let output = MockStack::run_call(
+				origin.clone(),
 				dest.clone(),
-				55,
 				&mut GasMeter::<Test>::new(GAS_LIMIT),
+				&schedule,
+				55,
 				vec![],
 			).unwrap();
 
@@ -1257,9 +1519,9 @@ mod tests {
 		ExtBuilder::default().build().execute_with(|| {
 			set_balance(&origin, 0);
 
-			let result = super::transfer::<Test>(
-				super::TransferCause::Call,
-				super::TransactorKind::PlainAccount,
+			let result = MockStack::transfer(
+				false,
+				false,
 				&origin,
 				&dest,
 				100,
@@ -1287,13 +1549,14 @@ mod tests {
 
 		ExtBuilder::default().build().execute_with(|| {
 			let schedule = <CurrentSchedule<Test>>::get();
-			let mut ctx = MockContext::top_level(origin, &schedule);
 			place_contract(&BOB, return_ch);
 
-			let result = ctx.call(
+			let result = MockStack::run_call(
+				origin,
 				dest,
-				0,
 				&mut GasMeter::<Test>::new(GAS_LIMIT),
+				&schedule,
+				0,
 				vec![],
 			);
 
@@ -1316,13 +1579,14 @@ mod tests {
 
 		ExtBuilder::default().build().execute_with(|| {
 			let schedule = <CurrentSchedule<Test>>::get();
-			let mut ctx = MockContext::top_level(origin, &schedule);
-			place_contract(&BOB, return_ch);
+			place_contract(&dest, return_ch);
 
-			let result = ctx.call(
+			let result = MockStack::run_call(
+				origin,
 				dest,
-				0,
 				&mut GasMeter::<Test>::new(GAS_LIMIT),
+				&schedule,
+				0,
 				vec![],
 			);
 
@@ -1342,13 +1606,14 @@ mod tests {
 		// This one tests passing the input data into a contract via call.
 		ExtBuilder::default().build().execute_with(|| {
 			let schedule = <CurrentSchedule<Test>>::get();
-			let mut ctx = MockContext::top_level(ALICE, &schedule);
 			place_contract(&BOB, input_data_ch);
 
-			let result = ctx.call(
+			let result = MockStack::run_call(
+				ALICE,
 				BOB,
-				0,
 				&mut GasMeter::<Test>::new(GAS_LIMIT),
+				&schedule,
+				0,
 				vec![1, 2, 3, 4],
 			);
 			assert_matches!(result, Ok(_));
@@ -1366,7 +1631,6 @@ mod tests {
 		ExtBuilder::default().build().execute_with(|| {
 			let schedule = <CurrentSchedule<Test>>::get();
 			let subsistence = Contracts::<Test>::subsistence_threshold();
-			let mut ctx = MockContext::top_level(ALICE, &schedule);
 			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
 			let executable = MockExecutable::from_storage(
 				input_data_ch, &schedule, &mut gas_meter
@@ -1374,10 +1638,12 @@ mod tests {
 
 			set_balance(&ALICE, subsistence * 10);
 
-			let result = ctx.instantiate(
-				subsistence * 3,
-				&mut gas_meter,
+			let result = MockStack::run_instantiate(
+				ALICE,
 				executable,
+				&mut gas_meter,
+				&schedule,
+				subsistence * 3,
 				vec![1, 2, 3, 4],
 				&[],
 			);
@@ -1395,7 +1661,7 @@ mod tests {
 		let value = Default::default();
 		let recurse_ch = MockLoader::insert(Call, |ctx, _| {
 			// Try to call into yourself.
-			let r = ctx.ext.call(&BOB, 0, ctx.gas_meter, vec![]);
+			let r = ctx.ext.call(0, BOB, 0, vec![]);
 
 			REACHED_BOTTOM.with(|reached_bottom| {
 				let mut reached_bottom = reached_bottom.borrow_mut();
@@ -1418,14 +1684,15 @@ mod tests {
 
 		ExtBuilder::default().build().execute_with(|| {
 			let schedule = <CurrentSchedule<Test>>::get();
-			let mut ctx = MockContext::top_level(ALICE, &schedule);
 			set_balance(&BOB, 1);
 			place_contract(&BOB, recurse_ch);
 
-			let result = ctx.call(
+			let result = MockStack::run_call(
+				ALICE,
 				BOB,
-				value,
 				&mut GasMeter::<Test>::new(GAS_LIMIT),
+				&schedule,
+				value,
 				vec![],
 			);
 
@@ -1451,7 +1718,7 @@ mod tests {
 
 			// Call into CHARLIE contract.
 			assert_matches!(
-				ctx.ext.call(&CHARLIE, 0, ctx.gas_meter, vec![]),
+				ctx.ext.call(0, CHARLIE, 0, vec![]),
 				Ok(_)
 			);
 			exec_success()
@@ -1466,14 +1733,15 @@ mod tests {
 
 		ExtBuilder::default().build().execute_with(|| {
 			let schedule = <CurrentSchedule<Test>>::get();
-			let mut ctx = MockContext::top_level(origin.clone(), &schedule);
 			place_contract(&dest, bob_ch);
 			place_contract(&CHARLIE, charlie_ch);
 
-			let result = ctx.call(
+			let result = MockStack::run_call(
+				origin.clone(),
 				dest.clone(),
-				0,
 				&mut GasMeter::<Test>::new(GAS_LIMIT),
+				&schedule,
+				0,
 				vec![],
 			);
 
@@ -1492,7 +1760,7 @@ mod tests {
 
 			// Call into charlie contract.
 			assert_matches!(
-				ctx.ext.call(&CHARLIE, 0, ctx.gas_meter, vec![]),
+				ctx.ext.call(0, CHARLIE, 0, vec![]),
 				Ok(_)
 			);
 			exec_success()
@@ -1504,14 +1772,15 @@ mod tests {
 
 		ExtBuilder::default().build().execute_with(|| {
 			let schedule = <CurrentSchedule<Test>>::get();
-			let mut ctx = MockContext::top_level(ALICE, &schedule);
 			place_contract(&BOB, bob_ch);
 			place_contract(&CHARLIE, charlie_ch);
 
-			let result = ctx.call(
+			let result = MockStack::run_call(
+				ALICE,
 				BOB,
-				0,
 				&mut GasMeter::<Test>::new(GAS_LIMIT),
+				&schedule,
+				0,
 				vec![],
 			);
 
@@ -1525,17 +1794,18 @@ mod tests {
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
 			let schedule = <CurrentSchedule<Test>>::get();
-			let mut ctx = MockContext::top_level(ALICE, &schedule);
 			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
 			let executable = MockExecutable::from_storage(
 				dummy_ch, &schedule, &mut gas_meter
 			).unwrap();
 
 			assert_matches!(
-				ctx.instantiate(
-					0, // <- zero endowment
-					&mut gas_meter,
+				MockStack::run_instantiate(
+					ALICE,
 					executable,
+					&mut gas_meter,
+					&schedule,
+					0, // <- zero endowment
 					vec![],
 					&[],
 				),
@@ -1553,7 +1823,6 @@ mod tests {
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
 			let schedule = <CurrentSchedule<Test>>::get();
-			let mut ctx = MockContext::top_level(ALICE, &schedule);
 			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
 			let executable = MockExecutable::from_storage(
 				dummy_ch, &schedule, &mut gas_meter
@@ -1561,10 +1830,12 @@ mod tests {
 			set_balance(&ALICE, 1000);
 
 			let instantiated_contract_address = assert_matches!(
-				ctx.instantiate(
-					100,
-					&mut gas_meter,
+				MockStack::run_instantiate(
+					ALICE,
 					executable,
+					&mut gas_meter,
+					&schedule,
+					100,
 					vec![],
 					&[],
 				),
@@ -1589,7 +1860,6 @@ mod tests {
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
 			let schedule = <CurrentSchedule<Test>>::get();
-			let mut ctx = MockContext::top_level(ALICE, &schedule);
 			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
 			let executable = MockExecutable::from_storage(
 				dummy_ch, &schedule, &mut gas_meter
@@ -1597,10 +1867,12 @@ mod tests {
 			set_balance(&ALICE, 1000);
 
 			let instantiated_contract_address = assert_matches!(
-				ctx.instantiate(
-					100,
-					&mut gas_meter,
+				MockStack::run_instantiate(
+					ALICE,
 					executable,
+					&mut gas_meter,
+					&schedule,
+					100,
 					vec![],
 					&[],
 				),
@@ -1608,10 +1880,7 @@ mod tests {
 			);
 
 			// Check that the account has not been created.
-			assert_noop!(
-				Storage::<Test>::code_hash(&instantiated_contract_address),
-				ContractAbsentError,
-			);
+			assert!(Storage::<Test>::code_hash(&instantiated_contract_address).is_none());
 			assert!(events().is_empty());
 		});
 	}
@@ -1626,9 +1895,9 @@ mod tests {
 			move |ctx, _| {
 				// Instantiate a contract and save it's address in `instantiated_contract_address`.
 				let (address, output, _) = ctx.ext.instantiate(
+					0,
 					dummy_ch,
 					Contracts::<Test>::subsistence_threshold() * 3,
-					ctx.gas_meter,
 					vec![],
 					&[48, 49, 50],
 				).unwrap();
@@ -1640,12 +1909,13 @@ mod tests {
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
 			let schedule = <CurrentSchedule<Test>>::get();
-			let mut ctx = MockContext::top_level(ALICE, &schedule);
 			set_balance(&ALICE, Contracts::<Test>::subsistence_threshold() * 100);
 			place_contract(&BOB, instantiator_ch);
 
 			assert_matches!(
-				ctx.call(BOB, 20, &mut GasMeter::<Test>::new(GAS_LIMIT), vec![]),
+				MockStack::run_call(
+					ALICE, BOB, &mut GasMeter::<Test>::new(GAS_LIMIT), &schedule, 20, vec![],
+				),
 				Ok(_)
 			);
 
@@ -1671,9 +1941,9 @@ mod tests {
 				// Instantiate a contract and save it's address in `instantiated_contract_address`.
 				assert_matches!(
 					ctx.ext.instantiate(
+						0,
 						dummy_ch,
 						15u64,
-						ctx.gas_meter,
 						vec![],
 						&[],
 					),
@@ -1689,13 +1959,14 @@ mod tests {
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
 			let schedule = <CurrentSchedule<Test>>::get();
-			let mut ctx = MockContext::top_level(ALICE, &schedule);
 			set_balance(&ALICE, 1000);
 			set_balance(&BOB, 100);
 			place_contract(&BOB, instantiator_ch);
 
 			assert_matches!(
-				ctx.call(BOB, 20, &mut GasMeter::<Test>::new(GAS_LIMIT), vec![]),
+				MockStack::run_call(
+					ALICE, BOB, &mut GasMeter::<Test>::new(GAS_LIMIT), &schedule, 20, vec![],
+				),
 				Ok(_)
 			);
 
@@ -1717,7 +1988,6 @@ mod tests {
 			.build()
 			.execute_with(|| {
 				let schedule = <CurrentSchedule<Test>>::get();
-				let mut ctx = MockContext::top_level(ALICE, &schedule);
 				let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
 				let executable = MockExecutable::from_storage(
 					terminate_ch, &schedule, &mut gas_meter
@@ -1725,14 +1995,16 @@ mod tests {
 				set_balance(&ALICE, 1000);
 
 				assert_eq!(
-					ctx.instantiate(
-						100,
-						&mut gas_meter,
+					MockStack::run_instantiate(
+						ALICE,
 						executable,
+						&mut gas_meter,
+						&schedule,
+						100,
 						vec![],
 						&[],
 					),
-					Err(Error::<Test>::NotCallable.into())
+					Err(Error::<Test>::TerminatedInConstructor.into())
 				);
 
 				assert_eq!(
@@ -1756,17 +2028,18 @@ mod tests {
 		ExtBuilder::default().build().execute_with(|| {
 			let subsistence = Contracts::<Test>::subsistence_threshold();
 			let schedule = <CurrentSchedule<Test>>::get();
-			let mut ctx = MockContext::top_level(ALICE, &schedule);
 			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
 			let executable = MockExecutable::from_storage(
 				rent_allowance_ch, &schedule, &mut gas_meter
 			).unwrap();
 			set_balance(&ALICE, subsistence * 10);
 
-			let result = ctx.instantiate(
-				subsistence * 5,
-				&mut gas_meter,
+			let result = MockStack::run_instantiate(
+				ALICE,
 				executable,
+				&mut gas_meter,
+				&schedule,
+				subsistence * 5,
 				vec![],
 				&[],
 			);
@@ -1781,21 +2054,22 @@ mod tests {
 			let contract = <ContractInfoOf<Test>>::get(address)
 				.and_then(|c| c.get_alive())
 				.unwrap();
-			assert_eq!(ctx.ext.rent_params(), &RentParams::new(address, &contract, executable));
+			assert_eq!(ctx.ext.rent_params(), &RentParams::new(address, &0, &contract, executable));
 			exec_success()
 		});
 
 		ExtBuilder::default().build().execute_with(|| {
 			let subsistence = Contracts::<Test>::subsistence_threshold();
 			let schedule = <CurrentSchedule<Test>>::get();
-			let mut ctx = MockContext::top_level(ALICE, &schedule);
 			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
 			set_balance(&ALICE, subsistence * 10);
 			place_contract(&BOB, code_hash);
-			ctx.call(
+			MockStack::run_call(
+				ALICE,
 				BOB,
-				0,
 				&mut gas_meter,
+				&schedule,
+				0,
 				vec![],
 			).unwrap();
 		});
@@ -1809,7 +2083,7 @@ mod tests {
 			let contract = <ContractInfoOf<Test>>::get(address)
 				.and_then(|c| c.get_alive())
 				.unwrap();
-			let rent_params = RentParams::new(address, &contract, executable);
+			let rent_params = RentParams::new(address, &0, &contract, executable);
 
 			// Changing the allowance during the call: rent params stay unchanged.
 			let allowance = 42;
@@ -1821,9 +2095,9 @@ mod tests {
 			// This is also not reflected in the rent params.
 			assert_eq!(MockLoader::refcount(&executable.code_hash), 1);
 			ctx.ext.instantiate(
+				0,
 				executable.code_hash,
 				subsistence * 25,
-				&mut GasMeter::<Test>::new(GAS_LIMIT),
 				vec![],
 				&[],
 			).unwrap();
@@ -1836,16 +2110,100 @@ mod tests {
 		ExtBuilder::default().build().execute_with(|| {
 			let subsistence = Contracts::<Test>::subsistence_threshold();
 			let schedule = <CurrentSchedule<Test>>::get();
-			let mut ctx = MockContext::top_level(ALICE, &schedule);
 			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
 			set_balance(&ALICE, subsistence * 100);
 			place_contract(&BOB, code_hash);
-			ctx.call(
+			MockStack::run_call(
+				ALICE,
 				BOB,
-				subsistence * 50,
 				&mut gas_meter,
+				&schedule,
+				subsistence * 50,
 				vec![],
 			).unwrap();
 		});
 	}
+
+	#[test]
+	fn in_memory_changes_not_discarded() {
+		// Call stack: BOB -> CHARLIE (trap) -> BOB' (success)
+		// This tests verfies some edge case of the contract info cache:
+		// We change some value in our contract info before calling into a contract
+		// that calls into ourself. This triggers a case where BOBs contract info
+		// is written to storage and invalidated by the successful execution of BOB'.
+		// The trap of CHARLIE reverts the storage changes to BOB. When the root BOB regains
+		// control it reloads its contract info from storage. We check that changes that
+		// are made before calling into CHARLIE are not discarded.
+		let code_bob = MockLoader::insert(Call, |ctx, _| {
+			if ctx.input_data[0] == 0 {
+				let original_allowance = ctx.ext.rent_allowance();
+				let changed_allowance = <BalanceOf<Test>>::max_value() / 2;
+				assert_ne!(original_allowance, changed_allowance);
+				ctx.ext.set_rent_allowance(changed_allowance);
+				assert_eq!(
+					ctx.ext.call(0, CHARLIE, 0, vec![]).map(|v| v.0).map_err(|e| e.0),
+					exec_trapped()
+				);
+				assert_eq!(ctx.ext.rent_allowance(), changed_allowance);
+				assert_ne!(ctx.ext.rent_allowance(), original_allowance);
+			}
+			exec_success()
+		});
+		let code_charlie = MockLoader::insert(Call, |ctx, _| {
+			assert!(ctx.ext.call(0, BOB, 0, vec![99]).is_ok());
+			exec_trapped()
+		});
+
+		// This one tests passing the input data into a contract via call.
+		ExtBuilder::default().build().execute_with(|| {
+			let schedule = <CurrentSchedule<Test>>::get();
+			place_contract(&BOB, code_bob);
+			place_contract(&CHARLIE, code_charlie);
+
+			let result = MockStack::run_call(
+				ALICE,
+				BOB,
+				&mut GasMeter::<Test>::new(GAS_LIMIT),
+				&schedule,
+				0,
+				vec![0],
+			);
+			assert_matches!(result, Ok(_));
+		});
+	}
+
+	#[test]
+	fn recursive_call_during_constructor_fails() {
+		let code = MockLoader::insert(Constructor, |ctx, executable| {
+			let my_hash = <Contracts<Test>>::contract_address(&ALICE, &executable.code_hash, &[]);
+			assert_matches!(
+				ctx.ext.call(0, my_hash, 0, vec![]),
+				Err((ExecError{error, ..}, _)) if error == <Error<Test>>::NotCallable.into()
+			);
+			exec_success()
+		});
+
+		// This one tests passing the input data into a contract via instantiate.
+		ExtBuilder::default().build().execute_with(|| {
+			let schedule = <CurrentSchedule<Test>>::get();
+			let subsistence = Contracts::<Test>::subsistence_threshold();
+			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
+			let executable = MockExecutable::from_storage(
+				code, &schedule, &mut gas_meter
+			).unwrap();
+
+			set_balance(&ALICE, subsistence * 10);
+
+			let result = MockStack::run_instantiate(
+				ALICE,
+				executable,
+				&mut gas_meter,
+				&schedule,
+				subsistence * 3,
+				vec![],
+				&[],
+			);
+			assert_matches!(result, Ok(_));
+		});
+	}
 }
diff --git a/frame/contracts/src/gas.rs b/frame/contracts/src/gas.rs
index 31cc5fad30c9..21b9cce38c2b 100644
--- a/frame/contracts/src/gas.rs
+++ b/frame/contracts/src/gas.rs
@@ -55,12 +55,7 @@ impl<T: Any + Debug + PartialEq + Eq> TestAuxiliaries for T {}
 /// for consistency). If inlined there should be no observable difference compared
 /// to a hand-written code.
 pub trait Token<T: Config>: Copy + Clone + TestAuxiliaries {
-	/// Metadata type, which the token can require for calculating the amount
-	/// of gas to charge. Can be a some configuration type or
-	/// just the `()`.
-	type Metadata;
-
-	/// Calculate amount of gas that should be taken by this token.
+	/// Return the amount of gas that should be taken by this token.
 	///
 	/// This function should be really lightweight and must not fail. It is not
 	/// expected that implementors will query the storage or do any kinds of heavy operations.
@@ -68,7 +63,7 @@ pub trait Token<T: Config>: Copy + Clone + TestAuxiliaries {
 	/// That said, implementors of this function still can run into overflows
 	/// while calculating the amount. In this case it is ok to use saturating operations
 	/// since on overflow they will return `max_value` which should consume all gas.
-	fn calculate_amount(&self, metadata: &Self::Metadata) -> Weight;
+	fn weight(&self) -> Weight;
 }
 
 /// A wrapper around a type-erased trait object of what used to be a `Token`.
@@ -87,6 +82,18 @@ pub struct GasMeter<T: Config> {
 	tokens: Vec<ErasedToken>,
 }
 
+impl<T: Config> Default for GasMeter<T> {
+	fn default() -> Self {
+		Self {
+			gas_limit: Default::default(),
+			gas_left: Default::default(),
+			_phantom: Default::default(),
+			#[cfg(test)]
+			tokens: Default::default(),
+		}
+	}
+}
+
 impl<T: Config> GasMeter<T>
 where
 	T::AccountId: UncheckedFrom<<T as frame_system::Config>::Hash> + AsRef<[u8]>
@@ -101,6 +108,33 @@ where
 		}
 	}
 
+	/// Create a new gas meter by removing gas from the current meter.
+	///
+	/// # Note
+	///
+	/// Passing `0` as amount is interpreted as "all remaining gas".
+	pub fn nested(&mut self, amount: Weight) -> Result<Self, DispatchError> {
+		let amount = if amount == 0 {
+			self.gas_left
+		} else {
+			amount
+		};
+
+		// NOTE that it is ok to allocate all available gas since it still ensured
+		// by `charge` that it doesn't reach zero.
+		if self.gas_left < amount {
+			Err(<Error<T>>::OutOfGas.into())
+		} else {
+			self.gas_left = self.gas_left - amount;
+			Ok(GasMeter::new(amount))
+		}
+	}
+
+	/// Absorb the remaining gas of a nested meter after we are done using it.
+	pub fn absorb_nested(&mut self, nested: Self) {
+		self.gas_left += nested.gas_left;
+	}
+
 	/// Account for used gas.
 	///
 	/// Amount is calculated by the given `token`.
@@ -111,11 +145,7 @@ where
 	/// NOTE that amount is always consumed, i.e. if there is not enough gas
 	/// then the counter will be set to zero.
 	#[inline]
-	pub fn charge<Tok: Token<T>>(
-		&mut self,
-		metadata: &Tok::Metadata,
-		token: Tok,
-	) -> Result<ChargedAmount, DispatchError> {
+	pub fn charge<Tok: Token<T>>(&mut self, token: Tok) -> Result<ChargedAmount, DispatchError> {
 		#[cfg(test)]
 		{
 			// Unconditionally add the token to the storage.
@@ -126,7 +156,7 @@ where
 			self.tokens.push(erased_tok);
 		}
 
-		let amount = token.calculate_amount(metadata);
+		let amount = token.weight();
 		let new_value = self.gas_left.checked_sub(amount);
 
 		// We always consume the gas even if there is not enough gas.
@@ -142,13 +172,8 @@ where
 	///
 	/// This is when a maximum a priori amount was charged and then should be partially
 	/// refunded to match the actual amount.
-	pub fn adjust_gas<Tok: Token<T>>(
-		&mut self,
-		charged_amount: ChargedAmount,
-		metadata: &Tok::Metadata,
-		token: Tok,
-	) {
-		let adjustment = charged_amount.0.saturating_sub(token.calculate_amount(metadata));
+	pub fn adjust_gas<Tok: Token<T>>(&mut self, charged_amount: ChargedAmount, token: Tok) {
+		let adjustment = charged_amount.0.saturating_sub(token.weight());
 		self.gas_left = self.gas_left.saturating_add(adjustment).min(self.gas_limit);
 	}
 
@@ -161,34 +186,6 @@ where
 		self.gas_left = self.gas_left.saturating_add(amount.0).min(self.gas_limit)
 	}
 
-	/// Allocate some amount of gas and perform some work with
-	/// a newly created nested gas meter.
-	///
-	/// Invokes `f` with either the gas meter that has `amount` gas left or
-	/// with `None`, if this gas meter has not enough gas to allocate given `amount`.
-	///
-	/// All unused gas in the nested gas meter is returned to this gas meter.
-	pub fn with_nested<R, F: FnOnce(Option<&mut GasMeter<T>>) -> R>(
-		&mut self,
-		amount: Weight,
-		f: F,
-	) -> R {
-		// NOTE that it is ok to allocate all available gas since it still ensured
-		// by `charge` that it doesn't reach zero.
-		if self.gas_left < amount {
-			f(None)
-		} else {
-			self.gas_left = self.gas_left - amount;
-			let mut nested = GasMeter::new(amount);
-
-			let r = f(Some(&mut nested));
-
-			self.gas_left = self.gas_left + nested.gas_left;
-
-			r
-		}
-	}
-
 	/// Returns how much gas was used.
 	pub fn gas_spent(&self) -> Weight {
 		self.gas_limit - self.gas_left
@@ -269,24 +266,7 @@ mod tests {
 	#[derive(Copy, Clone, PartialEq, Eq, Debug)]
 	struct SimpleToken(u64);
 	impl Token<Test> for SimpleToken {
-		type Metadata = ();
-		fn calculate_amount(&self, _metadata: &()) -> u64 { self.0 }
-	}
-
-	struct MultiplierTokenMetadata {
-		multiplier: u64,
-	}
-	/// A simple token that charges for the given amount multiplied to
-	/// a multiplier taken from a given metadata.
-	#[derive(Copy, Clone, PartialEq, Eq, Debug)]
-	struct MultiplierToken(u64);
-
-	impl Token<Test> for MultiplierToken {
-		type Metadata = MultiplierTokenMetadata;
-		fn calculate_amount(&self, metadata: &MultiplierTokenMetadata) -> u64 {
-			// Probably you want to use saturating mul in production code.
-			self.0 * metadata.multiplier
-		}
+		fn weight(&self) -> u64 { self.0 }
 	}
 
 	#[test]
@@ -295,34 +275,20 @@ mod tests {
 		assert_eq!(gas_meter.gas_left(), 50000);
 	}
 
-	#[test]
-	fn simple() {
-		let mut gas_meter = GasMeter::<Test>::new(50000);
-
-		let result = gas_meter
-			.charge(&MultiplierTokenMetadata { multiplier: 3 }, MultiplierToken(10));
-		assert!(!result.is_err());
-
-		assert_eq!(gas_meter.gas_left(), 49_970);
-	}
-
 	#[test]
 	fn tracing() {
 		let mut gas_meter = GasMeter::<Test>::new(50000);
-		assert!(!gas_meter.charge(&(), SimpleToken(1)).is_err());
-		assert!(!gas_meter
-			.charge(&MultiplierTokenMetadata { multiplier: 3 }, MultiplierToken(10))
-			.is_err());
+		assert!(!gas_meter.charge(SimpleToken(1)).is_err());
 
-		let mut tokens = gas_meter.tokens()[0..2].iter();
-		match_tokens!(tokens, SimpleToken(1), MultiplierToken(10),);
+		let mut tokens = gas_meter.tokens().iter();
+		match_tokens!(tokens, SimpleToken(1),);
 	}
 
 	// This test makes sure that nothing can be executed if there is no gas.
 	#[test]
 	fn refuse_to_execute_anything_if_zero() {
 		let mut gas_meter = GasMeter::<Test>::new(0);
-		assert!(gas_meter.charge(&(), SimpleToken(1)).is_err());
+		assert!(gas_meter.charge(SimpleToken(1)).is_err());
 	}
 
 	// Make sure that if the gas meter is charged by exceeding amount then not only an error
@@ -335,10 +301,10 @@ mod tests {
 		let mut gas_meter = GasMeter::<Test>::new(200);
 
 		// The first charge is should lead to OOG.
-		assert!(gas_meter.charge(&(), SimpleToken(300)).is_err());
+		assert!(gas_meter.charge(SimpleToken(300)).is_err());
 
 		// The gas meter is emptied at this moment, so this should also fail.
-		assert!(gas_meter.charge(&(), SimpleToken(1)).is_err());
+		assert!(gas_meter.charge(SimpleToken(1)).is_err());
 	}
 
 
@@ -347,6 +313,6 @@ mod tests {
 	#[test]
 	fn charge_exact_amount() {
 		let mut gas_meter = GasMeter::<Test>::new(25);
-		assert!(!gas_meter.charge(&(), SimpleToken(25)).is_err());
+		assert!(!gas_meter.charge(SimpleToken(25)).is_err());
 	}
 }
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index 2aa6b8f2ec7b..33844a41cc7c 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -103,10 +103,10 @@ pub mod weights;
 #[cfg(test)]
 mod tests;
 
-pub use crate::{pallet::*, schedule::Schedule};
+pub use crate::{pallet::*, schedule::Schedule, exec::Frame};
 use crate::{
 	gas::GasMeter,
-	exec::{ExecutionContext, Executable},
+	exec::{Stack as ExecStack, Executable},
 	rent::Rent,
 	storage::{Storage, DeletedContract, ContractInfo, AliveContractInfo, TombstoneContractInfo},
 	weights::WeightInfo,
@@ -210,9 +210,12 @@ pub mod pallet {
 		#[pallet::constant]
 		type SurchargeReward: Get<BalanceOf<Self>>;
 
-		/// The maximum nesting level of a call/instantiate stack.
-		#[pallet::constant]
-		type MaxDepth: Get<u32>;
+		/// The type of the call stack determines the maximum nesting depth of contract calls.
+		///
+		/// The allowed depth is `CallStack::size() + 1`.
+		/// Therefore a size of `0` means that a contract cannot use call or instantiate.
+		/// In other words only the origin called "root contract" is allowed to execute then.
+		type CallStack: smallvec::Array<Item=Frame<Self>>;
 
 		/// The maximum size of a storage value and event payload in bytes.
 		#[pallet::constant]
@@ -313,8 +316,9 @@ pub mod pallet {
 			let dest = T::Lookup::lookup(dest)?;
 			let mut gas_meter = GasMeter::new(gas_limit);
 			let schedule = <CurrentSchedule<T>>::get();
-			let mut ctx = ExecutionContext::<T, PrefabWasmModule<T>>::top_level(origin, &schedule);
-			let (result, code_len) = match ctx.call(dest, value, &mut gas_meter, data) {
+			let (result, code_len) = match ExecStack::<T, PrefabWasmModule<T>>::run_call(
+				origin, dest, &mut gas_meter, &schedule, value, data
+			) {
 				Ok((output, len)) => (Ok(output), len),
 				Err((err, len)) => (Err(err), len),
 			};
@@ -365,9 +369,9 @@ pub mod pallet {
 			let executable = PrefabWasmModule::from_code(code, &schedule)?;
 			let code_len = executable.code_len();
 			ensure!(code_len <= T::MaxCodeSize::get(), Error::<T>::CodeTooLarge);
-			let mut ctx = ExecutionContext::<T, PrefabWasmModule<T>>::top_level(origin, &schedule);
-			let result = ctx.instantiate(endowment, &mut gas_meter, executable, data, &salt)
-				.map(|(_address, output)| output);
+			let result = ExecStack::<T, PrefabWasmModule<T>>::run_instantiate(
+				origin, executable, &mut gas_meter, &schedule, endowment, data, &salt,
+			).map(|(_address, output)| output);
 			gas_meter.into_dispatch_result(
 				result,
 				T::WeightInfo::instantiate_with_code(code_len / 1024, salt.len() as u32 / 1024)
@@ -395,10 +399,10 @@ pub mod pallet {
 			let mut gas_meter = GasMeter::new(gas_limit);
 			let schedule = <CurrentSchedule<T>>::get();
 			let executable = PrefabWasmModule::from_storage(code_hash, &schedule, &mut gas_meter)?;
-			let mut ctx = ExecutionContext::<T, PrefabWasmModule<T>>::top_level(origin, &schedule);
 			let code_len = executable.code_len();
-			let result = ctx.instantiate(endowment, &mut gas_meter, executable, data, &salt)
-				.map(|(_address, output)| output);
+			let result = ExecStack::<T, PrefabWasmModule<T>>::run_instantiate(
+				origin, executable, &mut gas_meter, &schedule, endowment, data, &salt,
+			).map(|(_address, output)| output);
 			gas_meter.into_dispatch_result(
 				result,
 				T::WeightInfo::instantiate(code_len / 1024, salt.len() as u32 / 1024),
@@ -606,6 +610,10 @@ pub mod pallet {
 		StorageExhausted,
 		/// A contract with the same AccountId already exists.
 		DuplicateContract,
+		/// A contract self destructed in its constructor.
+		///
+		/// This can be triggered by a call to `seal_terminate` or `seal_restore_to`.
+		TerminatedInConstructor,
 	}
 
 	/// Current cost schedule for contracts.
@@ -680,8 +688,9 @@ where
 	) -> ContractExecResult {
 		let mut gas_meter = GasMeter::new(gas_limit);
 		let schedule = <CurrentSchedule<T>>::get();
-		let mut ctx = ExecutionContext::<T, PrefabWasmModule<T>>::top_level(origin, &schedule);
-		let result = ctx.call(dest, value, &mut gas_meter, input_data);
+		let result = ExecStack::<T, PrefabWasmModule<T>>::run_call(
+			origin, dest, &mut gas_meter, &schedule, value, input_data,
+		);
 		let gas_consumed = gas_meter.gas_spent();
 		ContractExecResult {
 			result: result.map(|r| r.0).map_err(|r| r.0.error),
@@ -711,7 +720,6 @@ where
 	) -> ContractInstantiateResult<T::AccountId, T::BlockNumber> {
 		let mut gas_meter = GasMeter::new(gas_limit);
 		let schedule = <CurrentSchedule<T>>::get();
-		let mut ctx = ExecutionContext::<T, PrefabWasmModule<T>>::top_level(origin, &schedule);
 		let executable = match code {
 			Code::Upload(Bytes(binary)) => PrefabWasmModule::from_code(binary, &schedule),
 			Code::Existing(hash) => PrefabWasmModule::from_storage(hash, &schedule, &mut gas_meter),
@@ -724,20 +732,21 @@ where
 				debug_message: Bytes(Vec::new()),
 			}
 		};
-		let result = ctx.instantiate(endowment, &mut gas_meter, executable, data, &salt)
-			.and_then(|(account_id, result)| {
-				let rent_projection = if compute_projection {
-					Some(Rent::<T, PrefabWasmModule<T>>::compute_projection(&account_id)
-						.map_err(|_| <Error<T>>::NewContractNotFunded)?)
-				} else {
-					None
-				};
-
-				Ok(InstantiateReturnValue {
-					result,
-					account_id,
-					rent_projection,
-				})
+		let result = ExecStack::<T, PrefabWasmModule<T>>::run_instantiate(
+			origin, executable, &mut gas_meter, &schedule, endowment, data, &salt,
+		).and_then(|(account_id, result)| {
+			let rent_projection = if compute_projection {
+				Some(Rent::<T, PrefabWasmModule<T>>::compute_projection(&account_id)
+					.map_err(|_| <Error<T>>::NewContractNotFunded)?)
+			} else {
+				None
+			};
+
+			Ok(InstantiateReturnValue {
+				result,
+				account_id,
+				rent_projection,
+			})
 		});
 		ContractInstantiateResult {
 			result: result.map_err(|e| e.error),
diff --git a/frame/contracts/src/rent.rs b/frame/contracts/src/rent.rs
index 6e268c48bc82..d57a3004aa0c 100644
--- a/frame/contracts/src/rent.rs
+++ b/frame/contracts/src/rent.rs
@@ -460,16 +460,13 @@ where
 	///
 	/// Result<(CallerCodeSize, DestCodeSize), (DispatchError, CallerCodeSize, DestCodesize)>
 	pub fn restore_to(
-		origin: T::AccountId,
+		origin: &T::AccountId,
+		mut origin_contract: AliveContractInfo<T>,
 		dest: T::AccountId,
 		code_hash: CodeHash<T>,
 		rent_allowance: BalanceOf<T>,
 		delta: Vec<crate::exec::StorageKey>,
 	) -> Result<(u32, u32), (DispatchError, u32, u32)> {
-		let mut origin_contract = <ContractInfoOf<T>>::get(&origin)
-			.and_then(|c| c.get_alive())
-			.ok_or((Error::<T>::InvalidSourceContract.into(), 0, 0))?;
-
 		let child_trie_info = origin_contract.child_trie_info();
 
 		let current_block = <frame_system::Pallet<T>>::block_number();
diff --git a/frame/contracts/src/storage.rs b/frame/contracts/src/storage.rs
index d78551f8f170..bb3553529bef 100644
--- a/frame/contracts/src/storage.rs
+++ b/frame/contracts/src/storage.rs
@@ -19,8 +19,7 @@
 
 use crate::{
 	exec::{AccountIdOf, StorageKey},
-	BalanceOf, CodeHash, ContractInfoOf, Config, TrieId,
-	AccountCounter, DeletionQueue, Error,
+	BalanceOf, CodeHash, ContractInfoOf, Config, TrieId, DeletionQueue, Error,
 	weights::WeightInfo,
 };
 use codec::{Codec, Encode, Decode};
@@ -61,7 +60,9 @@ impl<T: Config> ContractInfo<T> {
 			None
 		}
 	}
+
 	/// If contract is alive then return some reference to alive info
+	#[cfg(test)]
 	pub fn as_alive(&self) -> Option<&AliveContractInfo<T>> {
 		if let ContractInfo::Alive(ref alive) = self {
 			Some(alive)
@@ -144,11 +145,6 @@ impl<T: Config> From<AliveContractInfo<T>> for ContractInfo<T> {
 	}
 }
 
-/// An error that means that the account requested either doesn't exist or represents a tombstone
-/// account.
-#[cfg_attr(test, derive(PartialEq, Eq, Debug))]
-pub struct ContractAbsentError;
-
 #[derive(Encode, Decode)]
 pub struct DeletedContract {
 	pair_count: u32,
@@ -177,25 +173,14 @@ where
 	/// This function also updates the bookkeeping info such as: number of total non-empty pairs a
 	/// contract owns, the last block the storage was written to, etc. That's why, in contrast to
 	/// `read`, this function also requires the `account` ID.
-	///
-	/// If the contract specified by the id `account` doesn't exist `Err` is returned.`
-	///
-	/// # Panics
-	///
-	/// Panics iff the `account` specified is not alive and in storage.
 	pub fn write(
-		account: &AccountIdOf<T>,
-		trie_id: &TrieId,
+		block_number: T::BlockNumber,
+		new_info: &mut AliveContractInfo<T>,
 		key: &StorageKey,
 		opt_new_value: Option<Vec<u8>>,
 	) -> DispatchResult {
-		let mut new_info = match <ContractInfoOf<T>>::get(account) {
-			Some(ContractInfo::Alive(alive)) => alive,
-			None | Some(ContractInfo::Tombstone(_)) => panic!("Contract not found"),
-		};
-
 		let hashed_key = blake2_256(key);
-		let child_trie_info = &child_trie_info(&trie_id);
+		let child_trie_info = &child_trie_info(&new_info.trie_id);
 
 		let opt_prev_len = child::len(&child_trie_info, &hashed_key);
 
@@ -225,8 +210,7 @@ where
 			.and_then(|val| val.checked_add(new_value_len))
 			.ok_or_else(|| Error::<T>::StorageExhausted)?;
 
-		new_info.last_write = Some(<frame_system::Pallet<T>>::block_number());
-		<ContractInfoOf<T>>::insert(&account, ContractInfo::Alive(new_info));
+		new_info.last_write = Some(block_number);
 
 		// Finally, perform the change on the storage.
 		match opt_new_value {
@@ -237,65 +221,35 @@ where
 		Ok(())
 	}
 
-	/// Returns the rent allowance set for the contract give by the account id.
-	pub fn rent_allowance(
-		account: &AccountIdOf<T>,
-	) -> Result<BalanceOf<T>, ContractAbsentError>
-	{
-		<ContractInfoOf<T>>::get(account)
-			.and_then(|i| i.as_alive().map(|i| i.rent_allowance))
-			.ok_or(ContractAbsentError)
-	}
-
-	/// Set the rent allowance for the contract given by the account id.
-	///
-	/// Returns `Err` if the contract doesn't exist or is a tombstone.
-	pub fn set_rent_allowance(
-		account: &AccountIdOf<T>,
-		rent_allowance: BalanceOf<T>,
-	) -> Result<(), ContractAbsentError> {
-		<ContractInfoOf<T>>::mutate(account, |maybe_contract_info| match maybe_contract_info {
-			Some(ContractInfo::Alive(ref mut alive_info)) => {
-				alive_info.rent_allowance = rent_allowance;
-				Ok(())
-			}
-			_ => Err(ContractAbsentError),
-		})
-	}
-
 	/// Creates a new contract descriptor in the storage with the given code hash at the given address.
 	///
 	/// Returns `Err` if there is already a contract (or a tombstone) exists at the given address.
-	pub fn place_contract(
+	pub fn new_contract(
 		account: &AccountIdOf<T>,
 		trie_id: TrieId,
 		ch: CodeHash<T>,
 	) -> Result<AliveContractInfo<T>, DispatchError> {
-		<ContractInfoOf<T>>::try_mutate(account, |existing| {
-			if existing.is_some() {
-				return Err(Error::<T>::DuplicateContract.into());
-			}
+		if <ContractInfoOf<T>>::contains_key(account) {
+			return Err(Error::<T>::DuplicateContract.into());
+		}
 
-			let contract = AliveContractInfo::<T> {
-				code_hash: ch,
-				storage_size: 0,
-				trie_id,
-				deduct_block:
-					// We want to charge rent for the first block in advance. Therefore we
-					// treat the contract as if it was created in the last block and then
-					// charge rent for it during instantiation.
-					<frame_system::Pallet<T>>::block_number().saturating_sub(1u32.into()),
-				rent_allowance: <BalanceOf<T>>::max_value(),
-				rent_payed: <BalanceOf<T>>::zero(),
-				pair_count: 0,
-				last_write: None,
-				_reserved: None,
-			};
-
-			*existing = Some(contract.clone().into());
-
-			Ok(contract)
-		})
+		let contract = AliveContractInfo::<T> {
+			code_hash: ch,
+			storage_size: 0,
+			trie_id,
+			deduct_block:
+				// We want to charge rent for the first block in advance. Therefore we
+				// treat the contract as if it was created in the last block and then
+				// charge rent for it during instantiation.
+				<frame_system::Pallet<T>>::block_number().saturating_sub(1u32.into()),
+			rent_allowance: <BalanceOf<T>>::max_value(),
+			rent_payed: <BalanceOf<T>>::zero(),
+			pair_count: 0,
+			last_write: None,
+			_reserved: None,
+		};
+
+		Ok(contract)
 	}
 
 	/// Push a contract's trie to the deletion queue for lazy removal.
@@ -397,16 +351,9 @@ where
 
 	/// This generator uses inner counter for account id and applies the hash over `AccountId +
 	/// accountid_counter`.
-	pub fn generate_trie_id(account_id: &AccountIdOf<T>) -> TrieId {
-		// Note that skipping a value due to error is not an issue here.
-		// We only need uniqueness, not sequence.
-		let new_seed = <AccountCounter<T>>::mutate(|v| {
-			*v = v.wrapping_add(1);
-			*v
-		});
-
+	pub fn generate_trie_id(account_id: &AccountIdOf<T>, seed: u64) -> TrieId {
 		let buf: Vec<_> = account_id.as_ref().iter()
-			.chain(&new_seed.to_le_bytes())
+			.chain(&seed.to_le_bytes())
 			.cloned()
 			.collect();
 		T::Hashing::hash(&buf).as_ref().into()
@@ -414,11 +361,10 @@ where
 
 	/// Returns the code hash of the contract specified by `account` ID.
 	#[cfg(test)]
-	pub fn code_hash(account: &AccountIdOf<T>) -> Result<CodeHash<T>, ContractAbsentError>
+	pub fn code_hash(account: &AccountIdOf<T>) -> Option<CodeHash<T>>
 	{
 		<ContractInfoOf<T>>::get(account)
 			.and_then(|i| i.as_alive().map(|i| i.code_hash))
-			.ok_or(ContractAbsentError)
 	}
 
 	/// Fill up the queue in order to exercise the limits during testing.
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index a36e96dfe12b..ef3d65f506c5 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -23,7 +23,7 @@ use crate::{
 		Result as ExtensionResult, Environment, ChainExtension, Ext, SysConfig, RetVal,
 		UncheckedFrom, InitState, ReturnFlags,
 	},
-	exec::{AccountIdOf, Executable}, wasm::PrefabWasmModule,
+	exec::{AccountIdOf, Executable, Frame}, wasm::PrefabWasmModule,
 	weights::WeightInfo,
 	wasm::ReturnCode as RuntimeReturnCode,
 	storage::RawAliveContractInfo,
@@ -69,27 +69,37 @@ frame_support::construct_runtime!(
 
 #[macro_use]
 pub mod test_utils {
-	use super::{Test, Balances};
+	use super::{Test, Balances, System};
 	use crate::{
 		ContractInfoOf, CodeHash,
-		storage::Storage,
+		storage::{Storage, ContractInfo},
 		exec::{StorageKey, AccountIdOf},
 		Pallet as Contracts,
+		TrieId, AccountCounter,
 	};
 	use frame_support::traits::Currency;
 
 	pub fn set_storage(addr: &AccountIdOf<Test>, key: &StorageKey, value: Option<Vec<u8>>) {
-		let contract_info = <ContractInfoOf::<Test>>::get(&addr).unwrap().get_alive().unwrap();
-		Storage::<Test>::write(addr, &contract_info.trie_id, key, value).unwrap();
+		let mut contract_info = <ContractInfoOf::<Test>>::get(&addr).unwrap().get_alive().unwrap();
+		let block_number = System::block_number();
+		Storage::<Test>::write(block_number, &mut contract_info, key, value).unwrap();
 	}
 	pub fn get_storage(addr: &AccountIdOf<Test>, key: &StorageKey) -> Option<Vec<u8>> {
 		let contract_info = <ContractInfoOf::<Test>>::get(&addr).unwrap().get_alive().unwrap();
 		Storage::<Test>::read(&contract_info.trie_id, key)
 	}
+	pub fn generate_trie_id(address: &AccountIdOf<Test>) -> TrieId {
+		let seed = <AccountCounter<Test>>::mutate(|counter| {
+			*counter += 1;
+			*counter
+		});
+		Storage::<Test>::generate_trie_id(address, seed)
+	}
 	pub fn place_contract(address: &AccountIdOf<Test>, code_hash: CodeHash<Test>) {
-		let trie_id = Storage::<Test>::generate_trie_id(address);
+		let trie_id = generate_trie_id(address);
 		set_balance(address, Contracts::<Test>::subsistence_threshold() * 10);
-		Storage::<Test>::place_contract(&address, trie_id, code_hash).unwrap();
+		let contract = Storage::<Test>::new_contract(&address, trie_id, code_hash).unwrap();
+		<ContractInfoOf<Test>>::insert(address, ContractInfo::Alive(contract));
 	}
 	pub fn set_balance(who: &AccountIdOf<Test>, amount: u64) {
 		let imbalance = Balances::deposit_creating(who, amount);
@@ -251,7 +261,6 @@ parameter_types! {
 	pub const DepositPerStorageItem: u64 = 10_000;
 	pub RentFraction: Perbill = Perbill::from_rational(4u32, 10_000u32);
 	pub const SurchargeReward: u64 = 500_000;
-	pub const MaxDepth: u32 = 100;
 	pub const MaxValueSize: u32 = 16_384;
 	pub const DeletionQueueDepth: u32 = 1024;
 	pub const DeletionWeightLimit: Weight = 500_000_000_000;
@@ -281,7 +290,7 @@ impl Config for Test {
 	type DepositPerStorageItem = DepositPerStorageItem;
 	type RentFraction = RentFraction;
 	type SurchargeReward = SurchargeReward;
-	type MaxDepth = MaxDepth;
+	type CallStack = [Frame<Self>; 31];
 	type MaxValueSize = MaxValueSize;
 	type WeightPrice = Self;
 	type WeightInfo = ();
@@ -379,8 +388,8 @@ fn account_removal_does_not_remove_storage() {
 	use self::test_utils::{set_storage, get_storage};
 
 	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let trie_id1 = Storage::<Test>::generate_trie_id(&ALICE);
-		let trie_id2 = Storage::<Test>::generate_trie_id(&BOB);
+		let trie_id1 = test_utils::generate_trie_id(&ALICE);
+		let trie_id2 = test_utils::generate_trie_id(&BOB);
 		let key1 = &[1; 32];
 		let key2 = &[2; 32];
 
@@ -1835,7 +1844,7 @@ fn cannot_self_destruct_in_constructor() {
 					vec![],
 					vec![],
 				),
-				Error::<Test>::NotCallable,
+				Error::<Test>::TerminatedInConstructor,
 			);
 		});
 }
@@ -2326,18 +2335,18 @@ fn lazy_removal_partial_remove_works() {
 		);
 
 		let addr = Contracts::contract_address(&ALICE, &hash, &[]);
-		let info = <ContractInfoOf::<Test>>::get(&addr).unwrap().get_alive().unwrap();
-		let trie = &info.child_trie_info();
+		let mut info = <ContractInfoOf::<Test>>::get(&addr).unwrap().get_alive().unwrap();
 
 		// Put value into the contracts child trie
 		for val in &vals {
 			Storage::<Test>::write(
-				&addr,
-				&info.trie_id,
+				System::block_number(),
+				&mut info,
 				&val.0,
 				Some(val.2.clone()),
 			).unwrap();
 		}
+		<ContractInfoOf<Test>>::insert(&addr, ContractInfo::Alive(info.clone()));
 
 		// Terminate the contract
 		assert_ok!(Contracts::call(
@@ -2351,9 +2360,11 @@ fn lazy_removal_partial_remove_works() {
 		// Contract info should be gone
 		assert!(!<ContractInfoOf::<Test>>::contains_key(&addr));
 
+		let trie = info.child_trie_info();
+
 		// But value should be still there as the lazy removal did not run, yet.
 		for val in &vals {
-			assert_eq!(child::get::<u32>(trie, &blake2_256(&val.0)), Some(val.1));
+			assert_eq!(child::get::<u32>(&trie, &blake2_256(&val.0)), Some(val.1));
 		}
 
 		trie.clone()
@@ -2407,8 +2418,7 @@ fn lazy_removal_does_no_run_on_full_block() {
 		);
 
 		let addr = Contracts::contract_address(&ALICE, &hash, &[]);
-		let info = <ContractInfoOf::<Test>>::get(&addr).unwrap().get_alive().unwrap();
-		let trie = &info.child_trie_info();
+		let mut info = <ContractInfoOf::<Test>>::get(&addr).unwrap().get_alive().unwrap();
 		let max_keys = 30;
 
 		// Create some storage items for the contract.
@@ -2420,12 +2430,13 @@ fn lazy_removal_does_no_run_on_full_block() {
 		// Put value into the contracts child trie
 		for val in &vals {
 			Storage::<Test>::write(
-				&addr,
-				&info.trie_id,
+				System::block_number(),
+				&mut info,
 				&val.0,
 				Some(val.2.clone()),
 			).unwrap();
 		}
+		<ContractInfoOf<Test>>::insert(&addr, ContractInfo::Alive(info.clone()));
 
 		// Terminate the contract
 		assert_ok!(Contracts::call(
@@ -2439,9 +2450,11 @@ fn lazy_removal_does_no_run_on_full_block() {
 		// Contract info should be gone
 		assert!(!<ContractInfoOf::<Test>>::contains_key(&addr));
 
+		let trie = info.child_trie_info();
+
 		// But value should be still there as the lazy removal did not run, yet.
 		for val in &vals {
-			assert_eq!(child::get::<u32>(trie, &blake2_256(&val.0)), Some(val.1));
+			assert_eq!(child::get::<u32>(&trie, &blake2_256(&val.0)), Some(val.1));
 		}
 
 		// Fill up the block which should prevent the lazy storage removal from running.
@@ -2458,7 +2471,7 @@ fn lazy_removal_does_no_run_on_full_block() {
 
 		// All the keys are still in place
 		for val in &vals {
-			assert_eq!(child::get::<u32>(trie, &blake2_256(&val.0)), Some(val.1));
+			assert_eq!(child::get::<u32>(&trie, &blake2_256(&val.0)), Some(val.1));
 		}
 
 		// Run the lazy removal directly which disregards the block limits
@@ -2466,7 +2479,7 @@ fn lazy_removal_does_no_run_on_full_block() {
 
 		// Now the keys should be gone
 		for val in &vals {
-			assert_eq!(child::get::<u32>(trie, &blake2_256(&val.0)), None);
+			assert_eq!(child::get::<u32>(&trie, &blake2_256(&val.0)), None);
 		}
 	});
 }
@@ -2491,8 +2504,7 @@ fn lazy_removal_does_not_use_all_weight() {
 		);
 
 		let addr = Contracts::contract_address(&ALICE, &hash, &[]);
-		let info = <ContractInfoOf::<Test>>::get(&addr).unwrap().get_alive().unwrap();
-		let trie = &info.child_trie_info();
+		let mut info = <ContractInfoOf::<Test>>::get(&addr).unwrap().get_alive().unwrap();
 		let weight_limit = 5_000_000_000;
 		let (weight_per_key, max_keys) = Storage::<Test>::deletion_budget(1, weight_limit);
 
@@ -2505,12 +2517,13 @@ fn lazy_removal_does_not_use_all_weight() {
 		// Put value into the contracts child trie
 		for val in &vals {
 			Storage::<Test>::write(
-				&addr,
-				&info.trie_id,
+				System::block_number(),
+				&mut info,
 				&val.0,
 				Some(val.2.clone()),
 			).unwrap();
 		}
+		<ContractInfoOf<Test>>::insert(&addr, ContractInfo::Alive(info.clone()));
 
 		// Terminate the contract
 		assert_ok!(Contracts::call(
@@ -2524,9 +2537,11 @@ fn lazy_removal_does_not_use_all_weight() {
 		// Contract info should be gone
 		assert!(!<ContractInfoOf::<Test>>::contains_key(&addr));
 
+		let trie = info.child_trie_info();
+
 		// But value should be still there as the lazy removal did not run, yet.
 		for val in &vals {
-			assert_eq!(child::get::<u32>(trie, &blake2_256(&val.0)), Some(val.1));
+			assert_eq!(child::get::<u32>(&trie, &blake2_256(&val.0)), Some(val.1));
 		}
 
 		// Run the lazy removal
@@ -2537,7 +2552,7 @@ fn lazy_removal_does_not_use_all_weight() {
 
 		// All the keys are removed
 		for val in vals {
-			assert_eq!(child::get::<u32>(trie, &blake2_256(&val.0)), None);
+			assert_eq!(child::get::<u32>(&trie, &blake2_256(&val.0)), None);
 		}
 	});
 }
diff --git a/frame/contracts/src/wasm/code_cache.rs b/frame/contracts/src/wasm/code_cache.rs
index f9513afe51f4..e81e595697aa 100644
--- a/frame/contracts/src/wasm/code_cache.rs
+++ b/frame/contracts/src/wasm/code_cache.rs
@@ -137,7 +137,7 @@ where
 			// in the storage.
 			//
 			// We need to re-instrument the code with the latest schedule here.
-			gas_meter.charge(&(), InstrumentToken(prefab_module.original_code_len))?;
+			gas_meter.charge(InstrumentToken(prefab_module.original_code_len))?;
 			private::reinstrument(&mut prefab_module, schedule)?;
 		}
 	}
@@ -194,9 +194,7 @@ fn increment_64(refcount: &mut u64) {
 struct InstrumentToken(u32);
 
 impl<T: Config> Token<T> for InstrumentToken {
-	type Metadata = ();
-
-	fn calculate_amount(&self, _metadata: &Self::Metadata) -> Weight {
+	fn weight(&self) -> Weight {
 		T::WeightInfo::instrument(self.0 / 1024)
 	}
 }
diff --git a/frame/contracts/src/wasm/mod.rs b/frame/contracts/src/wasm/mod.rs
index 969336b59fa3..f30a30ae8725 100644
--- a/frame/contracts/src/wasm/mod.rs
+++ b/frame/contracts/src/wasm/mod.rs
@@ -34,7 +34,7 @@ use sp_std::prelude::*;
 use sp_core::crypto::UncheckedFrom;
 use codec::{Encode, Decode};
 use frame_support::dispatch::DispatchError;
-pub use self::runtime::{ReturnCode, Runtime, RuntimeToken};
+pub use self::runtime::{ReturnCode, Runtime, RuntimeCosts};
 #[cfg(feature = "runtime-benchmarks")]
 pub use self::code_cache::reinstrument;
 #[cfg(test)]
@@ -172,10 +172,9 @@ where
 
 	fn execute<E: Ext<T = T>>(
 		self,
-		mut ext: E,
+		ext: &mut E,
 		function: &ExportedFunction,
 		input_data: Vec<u8>,
-		gas_meter: &mut GasMeter<E::T>,
 	) -> ExecResult {
 		let memory =
 			sp_sandbox::Memory::new(self.initial, Some(self.maximum))
@@ -196,10 +195,9 @@ where
 		});
 
 		let mut runtime = Runtime::new(
-			&mut ext,
+			ext,
 			input_data,
 			memory,
-			gas_meter,
 		);
 
 		// We store before executing so that the code hash is available in the constructor.
@@ -220,13 +218,6 @@ where
 		&self.code_hash
 	}
 
-	fn occupied_storage(&self) -> u32 {
-		// We disregard the size of the struct itself as the size is completely
-		// dominated by the code size.
-		let len = self.aggregate_code_len();
-		len.checked_div(self.refcount as u32).unwrap_or(len)
-	}
-
 	fn code_len(&self) -> u32 {
 		self.code.len() as u32
 	}
@@ -260,8 +251,7 @@ mod tests {
 	use assert_matches::assert_matches;
 	use pallet_contracts_primitives::{ExecReturnValue, ReturnFlags};
 	use pretty_assertions::assert_eq;
-
-	const GAS_LIMIT: Weight = 10_000_000_000;
+	use sp_std::borrow::BorrowMut;
 
 	#[derive(Debug, PartialEq, Eq)]
 	struct DispatchEntry(Call);
@@ -295,7 +285,6 @@ mod tests {
 		data: Vec<u8>,
 	}
 
-	#[derive(Default)]
 	pub struct MockExt {
 		storage: HashMap<StorageKey, Vec<u8>>,
 		rent_allowance: u64,
@@ -307,23 +296,48 @@ mod tests {
 		events: Vec<(Vec<H256>, Vec<u8>)>,
 		schedule: Schedule<Test>,
 		rent_params: RentParams<Test>,
+		gas_meter: GasMeter<Test>,
+	}
+
+	impl Default for MockExt {
+		fn default() -> Self {
+			Self {
+				storage: Default::default(),
+				rent_allowance: Default::default(),
+				instantiates: Default::default(),
+				terminations: Default::default(),
+				transfers: Default::default(),
+				restores: Default::default(),
+				events: Default::default(),
+				schedule: Default::default(),
+				rent_params: Default::default(),
+				gas_meter: GasMeter::new(10_000_000_000),
+			}
+		}
 	}
 
 	impl Ext for MockExt {
 		type T = Test;
 
-		fn get_storage(&self, key: &StorageKey) -> Option<Vec<u8>> {
-			self.storage.get(key).cloned()
-		}
-		fn set_storage(&mut self, key: StorageKey, value: Option<Vec<u8>>) -> DispatchResult {
-			*self.storage.entry(key).or_insert(Vec::new()) = value.unwrap_or(Vec::new());
-			Ok(())
+		fn call(
+			&mut self,
+			_gas_limit: Weight,
+			to: AccountIdOf<Self::T>,
+			value: u64,
+			data: Vec<u8>,
+		) -> Result<(ExecReturnValue, u32), (ExecError, u32)> {
+			self.transfers.push(TransferEntry {
+				to,
+				value,
+				data: data,
+			});
+			Ok((ExecReturnValue { flags: ReturnFlags::empty(), data: Bytes(Vec::new()) }, 0))
 		}
 		fn instantiate(
 			&mut self,
+			gas_limit: Weight,
 			code_hash: CodeHash<Test>,
 			endowment: u64,
-			gas_meter: &mut GasMeter<Test>,
 			data: Vec<u8>,
 			salt: &[u8],
 		) -> Result<(AccountIdOf<Self::T>, ExecReturnValue, u32), (ExecError, u32)> {
@@ -331,7 +345,7 @@ mod tests {
 				code_hash: code_hash.clone(),
 				endowment,
 				data: data.to_vec(),
-				gas_left: gas_meter.gas_left(),
+				gas_left: gas_limit,
 				salt: salt.to_vec(),
 			});
 			Ok((
@@ -355,22 +369,6 @@ mod tests {
 			});
 			Ok(())
 		}
-		fn call(
-			&mut self,
-			to: &AccountIdOf<Self::T>,
-			value: u64,
-			_gas_meter: &mut GasMeter<Test>,
-			data: Vec<u8>,
-		) -> Result<(ExecReturnValue, u32), (ExecError, u32)> {
-			self.transfers.push(TransferEntry {
-				to: to.clone(),
-				value,
-				data: data,
-			});
-			// Assume for now that it was just a plain transfer.
-			// TODO: Add tests for different call outcomes.
-			Ok((ExecReturnValue { flags: ReturnFlags::empty(), data: Bytes(Vec::new()) }, 0))
-		}
 		fn terminate(
 			&mut self,
 			beneficiary: &AccountIdOf<Self::T>,
@@ -395,6 +393,13 @@ mod tests {
 			});
 			Ok((0, 0))
 		}
+		fn get_storage(&mut self, key: &StorageKey) -> Option<Vec<u8>> {
+			self.storage.get(key).cloned()
+		}
+		fn set_storage(&mut self, key: StorageKey, value: Option<Vec<u8>>) -> DispatchResult {
+			*self.storage.entry(key).or_insert(Vec::new()) = value.unwrap_or(Vec::new());
+			Ok(())
+		}
 		fn caller(&self) -> &AccountIdOf<Self::T> {
 			&ALICE
 		}
@@ -425,7 +430,7 @@ mod tests {
 		fn set_rent_allowance(&mut self, rent_allowance: u64) {
 			self.rent_allowance = rent_allowance;
 		}
-		fn rent_allowance(&self) -> u64 {
+		fn rent_allowance(&mut self) -> u64 {
 			self.rent_allowance
 		}
 		fn block_number(&self) -> u64 { 121 }
@@ -439,127 +444,22 @@ mod tests {
 		fn rent_params(&self) -> &RentParams<Self::T> {
 			&self.rent_params
 		}
-	}
-
-	impl Ext for &mut MockExt {
-		type T = <MockExt as Ext>::T;
-
-		fn get_storage(&self, key: &[u8; 32]) -> Option<Vec<u8>> {
-			(**self).get_storage(key)
-		}
-		fn set_storage(&mut self, key: [u8; 32], value: Option<Vec<u8>>) -> DispatchResult {
-			(**self).set_storage(key, value)
-		}
-		fn instantiate(
-			&mut self,
-			code: CodeHash<Test>,
-			value: u64,
-			gas_meter: &mut GasMeter<Test>,
-			input_data: Vec<u8>,
-			salt: &[u8],
-		) -> Result<(AccountIdOf<Self::T>, ExecReturnValue, u32), (ExecError, u32)> {
-			(**self).instantiate(code, value, gas_meter, input_data, salt)
-		}
-		fn transfer(
-			&mut self,
-			to: &AccountIdOf<Self::T>,
-			value: u64,
-		) -> Result<(), DispatchError> {
-			(**self).transfer(to, value)
-		}
-		fn terminate(
-			&mut self,
-			beneficiary: &AccountIdOf<Self::T>,
-		) -> Result<u32, (DispatchError, u32)> {
-			(**self).terminate(beneficiary)
-		}
-		fn call(
-			&mut self,
-			to: &AccountIdOf<Self::T>,
-			value: u64,
-			gas_meter: &mut GasMeter<Test>,
-			input_data: Vec<u8>,
-		) -> Result<(ExecReturnValue, u32), (ExecError, u32)> {
-			(**self).call(to, value, gas_meter, input_data)
-		}
-		fn restore_to(
-			&mut self,
-			dest: AccountIdOf<Self::T>,
-			code_hash: H256,
-			rent_allowance: u64,
-			delta: Vec<StorageKey>,
-		) -> Result<(u32, u32), (DispatchError, u32, u32)> {
-			(**self).restore_to(
-				dest,
-				code_hash,
-				rent_allowance,
-				delta,
-			)
-		}
-		fn caller(&self) -> &AccountIdOf<Self::T> {
-			(**self).caller()
-		}
-		fn address(&self) -> &AccountIdOf<Self::T> {
-			(**self).address()
-		}
-		fn balance(&self) -> u64 {
-			(**self).balance()
-		}
-		fn value_transferred(&self) -> u64 {
-			(**self).value_transferred()
-		}
-		fn now(&self) -> &u64 {
-			(**self).now()
-		}
-		fn minimum_balance(&self) -> u64 {
-			(**self).minimum_balance()
-		}
-		fn tombstone_deposit(&self) -> u64 {
-			(**self).tombstone_deposit()
-		}
-		fn random(&self, subject: &[u8]) -> (SeedOf<Self::T>, BlockNumberOf<Self::T>) {
-			(**self).random(subject)
-		}
-		fn deposit_event(&mut self, topics: Vec<H256>, data: Vec<u8>) {
-			(**self).deposit_event(topics, data)
-		}
-		fn set_rent_allowance(&mut self, rent_allowance: u64) {
-			(**self).set_rent_allowance(rent_allowance)
-		}
-		fn rent_allowance(&self) -> u64 {
-			(**self).rent_allowance()
-		}
-		fn block_number(&self) -> u64 {
-			(**self).block_number()
-		}
-		fn max_value_size(&self) -> u32 {
-			(**self).max_value_size()
-		}
-		fn get_weight_price(&self, weight: Weight) -> BalanceOf<Self::T> {
-			(**self).get_weight_price(weight)
-		}
-		fn schedule(&self) -> &Schedule<Self::T> {
-			(**self).schedule()
-		}
-		fn rent_params(&self) -> &RentParams<Self::T> {
-			(**self).rent_params()
+		fn gas_meter(&mut self) -> &mut GasMeter<Self::T> {
+			&mut self.gas_meter
 		}
 	}
 
-	fn execute<E: Ext>(
+	fn execute<E: BorrowMut<MockExt>>(
 		wat: &str,
 		input_data: Vec<u8>,
-		ext: E,
-		gas_meter: &mut GasMeter<E::T>,
+		mut ext: E,
 	) -> ExecResult
-	where
-		<E::T as frame_system::Config>::AccountId:
-			UncheckedFrom<<E::T as frame_system::Config>::Hash> + AsRef<[u8]>
 	{
 		let wasm = wat::parse_str(wat).unwrap();
 		let schedule = crate::Schedule::default();
-		let executable = PrefabWasmModule::<E::T>::from_code(wasm, &schedule).unwrap();
-		executable.execute(ext, &ExportedFunction::Call, input_data, gas_meter)
+		let executable = PrefabWasmModule::<<MockExt as Ext>::T>::from_code(wasm, &schedule)
+			.unwrap();
+		executable.execute(ext.borrow_mut(), &ExportedFunction::Call, input_data)
 	}
 
 	const CODE_TRANSFER: &str = r#"
@@ -603,7 +503,6 @@ mod tests {
 			CODE_TRANSFER,
 			vec![],
 			&mut mock_ext,
-			&mut GasMeter::new(GAS_LIMIT),
 		));
 
 		assert_eq!(
@@ -669,7 +568,6 @@ mod tests {
 			CODE_CALL,
 			vec![],
 			&mut mock_ext,
-			&mut GasMeter::new(GAS_LIMIT),
 		));
 
 		assert_eq!(
@@ -745,7 +643,6 @@ mod tests {
 			CODE_INSTANTIATE,
 			vec![],
 			&mut mock_ext,
-			&mut GasMeter::new(GAS_LIMIT),
 		));
 
 		assert_matches!(
@@ -794,7 +691,6 @@ mod tests {
 			CODE_TERMINATE,
 			vec![],
 			&mut mock_ext,
-			&mut GasMeter::new(GAS_LIMIT),
 		).unwrap();
 
 		assert_eq!(
@@ -857,7 +753,6 @@ mod tests {
 			&CODE_TRANSFER_LIMITED_GAS,
 			vec![],
 			&mut mock_ext,
-			&mut GasMeter::new(GAS_LIMIT),
 		));
 
 		assert_eq!(
@@ -945,7 +840,6 @@ mod tests {
 			CODE_GET_STORAGE,
 			vec![],
 			mock_ext,
-			&mut GasMeter::new(GAS_LIMIT),
 		).unwrap();
 
 		assert_eq!(output, ExecReturnValue {
@@ -1003,7 +897,6 @@ mod tests {
 			CODE_CALLER,
 			vec![],
 			MockExt::default(),
-			&mut GasMeter::new(GAS_LIMIT),
 		));
 	}
 
@@ -1056,7 +949,6 @@ mod tests {
 			CODE_ADDRESS,
 			vec![],
 			MockExt::default(),
-			&mut GasMeter::new(GAS_LIMIT),
 		));
 	}
 
@@ -1103,12 +995,10 @@ mod tests {
 
 	#[test]
 	fn balance() {
-		let mut gas_meter = GasMeter::new(GAS_LIMIT);
 		assert_ok!(execute(
 			CODE_BALANCE,
 			vec![],
 			MockExt::default(),
-			&mut gas_meter,
 		));
 	}
 
@@ -1155,12 +1045,10 @@ mod tests {
 
 	#[test]
 	fn gas_price() {
-		let mut gas_meter = GasMeter::new(GAS_LIMIT);
 		assert_ok!(execute(
 			CODE_GAS_PRICE,
 			vec![],
 			MockExt::default(),
-			&mut gas_meter,
 		));
 	}
 
@@ -1205,18 +1093,19 @@ mod tests {
 
 	#[test]
 	fn gas_left() {
-		let mut gas_meter = GasMeter::new(GAS_LIMIT);
+		let mut ext = MockExt::default();
+		let gas_limit = ext.gas_meter.gas_left();
 
 		let output = execute(
 			CODE_GAS_LEFT,
 			vec![],
-			MockExt::default(),
-			&mut gas_meter,
+			&mut ext,
 		).unwrap();
 
 		let gas_left = Weight::decode(&mut &*output.data).unwrap();
-		assert!(gas_left < GAS_LIMIT, "gas_left must be less than initial");
-		assert!(gas_left > gas_meter.gas_left(), "gas_left must be greater than final");
+		let actual_left = ext.gas_meter.gas_left();
+		assert!(gas_left < gas_limit, "gas_left must be less than initial");
+		assert!(gas_left > actual_left, "gas_left must be greater than final");
 	}
 
 	const CODE_VALUE_TRANSFERRED: &str = r#"
@@ -1262,12 +1151,10 @@ mod tests {
 
 	#[test]
 	fn value_transferred() {
-		let mut gas_meter = GasMeter::new(GAS_LIMIT);
 		assert_ok!(execute(
 			CODE_VALUE_TRANSFERRED,
 			vec![],
 			MockExt::default(),
-			&mut gas_meter,
 		));
 	}
 
@@ -1301,7 +1188,6 @@ mod tests {
 			CODE_RETURN_FROM_START_FN,
 			vec![],
 			MockExt::default(),
-			&mut GasMeter::new(GAS_LIMIT),
 		).unwrap();
 
 		assert_eq!(
@@ -1356,12 +1242,10 @@ mod tests {
 
 	#[test]
 	fn now() {
-		let mut gas_meter = GasMeter::new(GAS_LIMIT);
 		assert_ok!(execute(
 			CODE_TIMESTAMP_NOW,
 			vec![],
 			MockExt::default(),
-			&mut gas_meter,
 		));
 	}
 
@@ -1407,12 +1291,10 @@ mod tests {
 
 	#[test]
 	fn minimum_balance() {
-		let mut gas_meter = GasMeter::new(GAS_LIMIT);
 		assert_ok!(execute(
 			CODE_MINIMUM_BALANCE,
 			vec![],
 			MockExt::default(),
-			&mut gas_meter,
 		));
 	}
 
@@ -1458,12 +1340,10 @@ mod tests {
 
 	#[test]
 	fn tombstone_deposit() {
-		let mut gas_meter = GasMeter::new(GAS_LIMIT);
 		assert_ok!(execute(
 			CODE_TOMBSTONE_DEPOSIT,
 			vec![],
 			MockExt::default(),
-			&mut gas_meter,
 		));
 	}
 
@@ -1523,13 +1403,10 @@ mod tests {
 
 	#[test]
 	fn random() {
-		let mut gas_meter = GasMeter::new(GAS_LIMIT);
-
 		let output = execute(
 			CODE_RANDOM,
 			vec![],
 			MockExt::default(),
-			&mut gas_meter,
 		).unwrap();
 
 		// The mock ext just returns the same data that was passed as the subject.
@@ -1601,13 +1478,10 @@ mod tests {
 
 	#[test]
 	fn random_v1() {
-		let mut gas_meter = GasMeter::new(GAS_LIMIT);
-
 		let output = execute(
 			CODE_RANDOM_V1,
 			vec![],
 			MockExt::default(),
-			&mut gas_meter,
 		).unwrap();
 
 		// The mock ext just returns the same data that was passed as the subject.
@@ -1650,12 +1524,10 @@ mod tests {
 	#[test]
 	fn deposit_event() {
 		let mut mock_ext = MockExt::default();
-		let mut gas_meter = GasMeter::new(GAS_LIMIT);
 		assert_ok!(execute(
 			CODE_DEPOSIT_EVENT,
 			vec![],
 			&mut mock_ext,
-			&mut gas_meter
 		));
 
 		assert_eq!(mock_ext.events, vec![
@@ -1663,7 +1535,7 @@ mod tests {
 			vec![0x00, 0x01, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe5, 0x14, 0x00])
 		]);
 
-		assert!(gas_meter.gas_left() > 0);
+		assert!(mock_ext.gas_meter.gas_left() > 0);
 	}
 
 	const CODE_DEPOSIT_EVENT_MAX_TOPICS: &str = r#"
@@ -1693,17 +1565,14 @@ mod tests {
 )
 "#;
 
+	/// Checks that the runtime traps if there are more than `max_topic_events` topics.
 	#[test]
 	fn deposit_event_max_topics() {
-		// Checks that the runtime traps if there are more than `max_topic_events` topics.
-		let mut gas_meter = GasMeter::new(GAS_LIMIT);
-
 		assert_eq!(
 			execute(
 				CODE_DEPOSIT_EVENT_MAX_TOPICS,
 				vec![],
 				MockExt::default(),
-				&mut gas_meter
 			),
 			Err(ExecError {
 				error: Error::<Test>::TooManyTopics.into(),
@@ -1738,17 +1607,14 @@ mod tests {
 )
 "#;
 
+	/// Checks that the runtime traps if there are duplicates.
 	#[test]
 	fn deposit_event_duplicates() {
-		// Checks that the runtime traps if there are duplicates.
-		let mut gas_meter = GasMeter::new(GAS_LIMIT);
-
 		assert_eq!(
 			execute(
 				CODE_DEPOSIT_EVENT_DUPLICATES,
 				vec![],
 				MockExt::default(),
-				&mut gas_meter
 			),
 			Err(ExecError {
 				error: Error::<Test>::DuplicateTopics.into(),
@@ -1806,7 +1672,6 @@ mod tests {
 			CODE_BLOCK_NUMBER,
 			vec![],
 			MockExt::default(),
-			&mut GasMeter::new(GAS_LIMIT),
 		).unwrap();
 	}
 
@@ -1848,7 +1713,6 @@ mod tests {
 			CODE_RETURN_WITH_DATA,
 			hex!("00000000445566778899").to_vec(),
 			MockExt::default(),
-			&mut GasMeter::new(GAS_LIMIT),
 		).unwrap();
 
 		assert_eq!(output, ExecReturnValue {
@@ -1864,7 +1728,6 @@ mod tests {
 			CODE_RETURN_WITH_DATA,
 			hex!("010000005566778899").to_vec(),
 			MockExt::default(),
-			&mut GasMeter::new(GAS_LIMIT),
 		).unwrap();
 
 		assert_eq!(output, ExecReturnValue {
@@ -1897,7 +1760,6 @@ mod tests {
 			CODE_OUT_OF_BOUNDS_ACCESS,
 			vec![],
 			&mut mock_ext,
-			&mut GasMeter::new(GAS_LIMIT),
 		);
 
 		assert_eq!(
@@ -1932,7 +1794,6 @@ mod tests {
 			CODE_DECODE_FAILURE,
 			vec![],
 			&mut mock_ext,
-			&mut GasMeter::new(GAS_LIMIT),
 		);
 
 		assert_eq!(
@@ -1980,7 +1841,6 @@ mod tests {
 			CODE_RENT_PARAMS,
 			vec![],
 			MockExt::default(),
-			&mut GasMeter::new(GAS_LIMIT),
 		).unwrap();
 		let rent_params = Bytes(<RentParams<Test>>::default().encode());
 		assert_eq!(output, ExecReturnValue { flags: ReturnFlags::empty(), data: rent_params });
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index bed56f409d57..da8784b23cdc 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -20,7 +20,7 @@
 use crate::{
 	Config, CodeHash, BalanceOf, Error,
 	exec::{Ext, StorageKey, TopicOf, ExecResult, ExecError},
-	gas::{GasMeter, Token, ChargedAmount},
+	gas::{Token, ChargedAmount},
 	wasm::env_def::ConvertibleToWasm,
 	schedule::HostFnWeights,
 };
@@ -28,7 +28,6 @@ use parity_wasm::elements::ValueType;
 use frame_support::{dispatch::DispatchError, ensure, traits::Get, weights::Weight};
 use sp_std::prelude::*;
 use codec::{Decode, DecodeAll, Encode};
-use sp_runtime::traits::SaturatedConversion;
 use sp_core::{Bytes, crypto::UncheckedFrom};
 use sp_io::hashing::{
 	keccak_256,
@@ -132,7 +131,7 @@ impl<T: Into<DispatchError>> From<T> for TrapReason {
 
 #[cfg_attr(test, derive(Debug, PartialEq, Eq))]
 #[derive(Copy, Clone)]
-pub enum RuntimeToken {
+pub enum RuntimeCosts {
 	/// Charge the gas meter with the cost of a metering block. The charged costs are
 	/// the supplied cost of the block plus the overhead of the metering itself.
 	MeteringBlock(u32),
@@ -220,15 +219,14 @@ pub enum RuntimeToken {
 	RentParams,
 }
 
-impl<T: Config> Token<T> for RuntimeToken
-where
-	T::AccountId: UncheckedFrom<T::Hash>, T::AccountId: AsRef<[u8]>
-{
-	type Metadata = HostFnWeights<T>;
-
-	fn calculate_amount(&self, s: &Self::Metadata) -> Weight {
-		use self::RuntimeToken::*;
-		match *self {
+impl RuntimeCosts {
+	fn token<T>(&self, s: &HostFnWeights<T>) -> RuntimeToken
+	where
+		T: Config,
+		T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
+	{
+		use self::RuntimeCosts::*;
+		let weight = match *self {
 			MeteringBlock(amount) => s.gas.saturating_add(amount.into()),
 			Caller => s.caller,
 			Address => s.address,
@@ -287,14 +285,37 @@ where
 			ChainExtension(amount) => amount,
 			CopyIn(len) => s.return_per_byte.saturating_mul(len.into()),
 			RentParams => s.rent_params,
+		};
+		RuntimeToken {
+			#[cfg(test)]
+			_created_from: *self,
+			weight,
 		}
 	}
 }
 
+#[cfg_attr(test, derive(Debug, PartialEq, Eq))]
+#[derive(Copy, Clone)]
+struct RuntimeToken {
+	#[cfg(test)]
+	_created_from: RuntimeCosts,
+	weight: Weight,
+}
+
+impl<T> Token<T> for RuntimeToken
+where
+	T: Config,
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
+{
+	fn weight(&self) -> Weight {
+		self.weight
+	}
+}
+
 /// This is only appropriate when writing out data of constant size that does not depend on user
 /// input. In this case the costs for this copy was already charged as part of the token at
 /// the beginning of the API entry point.
-fn already_charged(_: u32) -> Option<RuntimeToken> {
+fn already_charged(_: u32) -> Option<RuntimeCosts> {
 	None
 }
 
@@ -303,7 +324,6 @@ pub struct Runtime<'a, E: Ext + 'a> {
 	ext: &'a mut E,
 	input_data: Option<Vec<u8>>,
 	memory: sp_sandbox::Memory,
-	gas_meter: &'a mut GasMeter<E::T>,
 	trap_reason: Option<TrapReason>,
 }
 
@@ -317,13 +337,11 @@ where
 		ext: &'a mut E,
 		input_data: Vec<u8>,
 		memory: sp_sandbox::Memory,
-		gas_meter: &'a mut GasMeter<E::T>,
 	) -> Self {
 		Runtime {
 			ext,
 			input_data: Some(input_data),
 			memory,
-			gas_meter,
 			trap_reason: None,
 		}
 	}
@@ -406,21 +424,16 @@ where
 	/// Charge the gas meter with the specified token.
 	///
 	/// Returns `Err(HostError)` if there is not enough gas.
-	pub fn charge_gas<Tok>(&mut self, token: Tok) -> Result<ChargedAmount, DispatchError>
-	where
-		Tok: Token<E::T, Metadata=HostFnWeights<E::T>>,
-	{
-		self.gas_meter.charge(&self.ext.schedule().host_fn_weights, token)
+	pub fn charge_gas(&mut self, costs: RuntimeCosts) -> Result<ChargedAmount, DispatchError> {
+		let token = costs.token(&self.ext.schedule().host_fn_weights);
+		self.ext.gas_meter().charge(token)
 	}
 
 	/// Correct previously charged gas amount.
-	pub fn adjust_gas<Tok>(&mut self, charged_amount: ChargedAmount, adjusted_amount: Tok)
-	where
-		Tok: Token<E::T, Metadata=HostFnWeights<E::T>>,
-	{
-		self.gas_meter.adjust_gas(
+	pub fn adjust_gas(&mut self, charged_amount: ChargedAmount, adjusted_amount: RuntimeCosts) {
+		let adjusted_amount = adjusted_amount.token(&self.ext.schedule().host_fn_weights);
+		self.ext.gas_meter().adjust_gas(
 			charged_amount,
-			&self.ext.schedule().host_fn_weights,
 			adjusted_amount,
 		);
 	}
@@ -474,11 +487,11 @@ where
 	pub fn read_sandbox_memory_as<D: Decode>(&mut self, ptr: u32, len: u32)
 	-> Result<D, DispatchError>
 	{
-		let amount = self.charge_gas(RuntimeToken::CopyIn(len))?;
+		let amount = self.charge_gas(RuntimeCosts::CopyIn(len))?;
 		let buf = self.read_sandbox_memory(ptr, len)?;
 		let decoded = D::decode_all(&mut &buf[..])
 			.map_err(|_| DispatchError::from(Error::<E::T>::DecodingFailed))?;
-		self.gas_meter.refund(amount);
+		self.ext.gas_meter().refund(amount);
 		Ok(decoded)
 	}
 
@@ -507,7 +520,7 @@ where
 		out_len_ptr: u32,
 		buf: &[u8],
 		allow_skip: bool,
-		create_token: impl FnOnce(u32) -> Option<RuntimeToken>,
+		create_token: impl FnOnce(u32) -> Option<RuntimeCosts>,
 	) -> Result<(), DispatchError>
 	{
 		if allow_skip && out_ptr == u32::max_value() {
@@ -521,8 +534,8 @@ where
 			Err(Error::<E::T>::OutputBufferTooSmall)?
 		}
 
-		if let Some(token) = create_token(buf_len) {
-			self.charge_gas(token)?;
+		if let Some(costs) = create_token(buf_len) {
+			self.charge_gas(costs)?;
 		}
 
 		self.memory.set(out_ptr, buf).and_then(|_| {
@@ -631,7 +644,7 @@ define_env!(Env, <E: Ext>,
 	//
 	// - amount: How much gas is used.
 	[seal0] gas(ctx, amount: u32) => {
-		ctx.charge_gas(RuntimeToken::MeteringBlock(amount))?;
+		ctx.charge_gas(RuntimeCosts::MeteringBlock(amount))?;
 		Ok(())
 	},
 
@@ -651,7 +664,7 @@ define_env!(Env, <E: Ext>,
 	// - If value length exceeds the configured maximum value length of a storage entry.
 	// - Upon trying to set an empty storage entry (value length is 0).
 	[seal0] seal_set_storage(ctx, key_ptr: u32, value_ptr: u32, value_len: u32) => {
-		ctx.charge_gas(RuntimeToken::SetStorage(value_len))?;
+		ctx.charge_gas(RuntimeCosts::SetStorage(value_len))?;
 		if value_len > ctx.ext.max_value_size() {
 			Err(Error::<E::T>::ValueTooLarge)?;
 		}
@@ -667,7 +680,7 @@ define_env!(Env, <E: Ext>,
 	//
 	// - `key_ptr`: pointer into the linear memory where the location to clear the value is placed.
 	[seal0] seal_clear_storage(ctx, key_ptr: u32) => {
-		ctx.charge_gas(RuntimeToken::ClearStorage)?;
+		ctx.charge_gas(RuntimeCosts::ClearStorage)?;
 		let mut key: StorageKey = [0; 32];
 		ctx.read_sandbox_memory_into_buf(key_ptr, &mut key)?;
 		ctx.ext.set_storage(key, None).map_err(Into::into)
@@ -686,12 +699,12 @@ define_env!(Env, <E: Ext>,
 	//
 	// `ReturnCode::KeyNotFound`
 	[seal0] seal_get_storage(ctx, key_ptr: u32, out_ptr: u32, out_len_ptr: u32) -> ReturnCode => {
-		ctx.charge_gas(RuntimeToken::GetStorageBase)?;
+		ctx.charge_gas(RuntimeCosts::GetStorageBase)?;
 		let mut key: StorageKey = [0; 32];
 		ctx.read_sandbox_memory_into_buf(key_ptr, &mut key)?;
 		if let Some(value) = ctx.ext.get_storage(&key) {
 			ctx.write_sandbox_output(out_ptr, out_len_ptr, &value, false, |len| {
-				Some(RuntimeToken::GetStorageCopyOut(len))
+				Some(RuntimeCosts::GetStorageCopyOut(len))
 			})?;
 			Ok(ReturnCode::Success)
 		} else {
@@ -721,7 +734,7 @@ define_env!(Env, <E: Ext>,
 		value_ptr: u32,
 		value_len: u32
 	) -> ReturnCode => {
-		ctx.charge_gas(RuntimeToken::Transfer)?;
+		ctx.charge_gas(RuntimeCosts::Transfer)?;
 		let callee: <<E as Ext>::T as frame_system::Config>::AccountId =
 			ctx.read_sandbox_memory_as(account_ptr, account_len)?;
 		let value: BalanceOf<<E as Ext>::T> =
@@ -780,45 +793,27 @@ define_env!(Env, <E: Ext>,
 		output_ptr: u32,
 		output_len_ptr: u32
 	) -> ReturnCode => {
-		ctx.charge_gas(RuntimeToken::CallBase(input_data_len))?;
+		ctx.charge_gas(RuntimeCosts::CallBase(input_data_len))?;
 		let callee: <<E as Ext>::T as frame_system::Config>::AccountId =
 			ctx.read_sandbox_memory_as(callee_ptr, callee_len)?;
 		let value: BalanceOf<<E as Ext>::T> = ctx.read_sandbox_memory_as(value_ptr, value_len)?;
 		let input_data = ctx.read_sandbox_memory(input_data_ptr, input_data_len)?;
 		if value > 0u32.into() {
-			ctx.charge_gas(RuntimeToken::CallSurchargeTransfer)?;
+			ctx.charge_gas(RuntimeCosts::CallSurchargeTransfer)?;
 		}
 		let charged = ctx.charge_gas(
-			RuntimeToken::CallSurchargeCodeSize(<E::T as Config>::MaxCodeSize::get())
+			RuntimeCosts::CallSurchargeCodeSize(<E::T as Config>::MaxCodeSize::get())
 		)?;
-		let nested_gas_limit = if gas == 0 {
-			ctx.gas_meter.gas_left()
-		} else {
-			gas.saturated_into()
-		};
 		let ext = &mut ctx.ext;
-		let call_outcome = ctx.gas_meter.with_nested(nested_gas_limit, |nested_meter| {
-			match nested_meter {
-				Some(nested_meter) => {
-					ext.call(
-						&callee,
-						value,
-						nested_meter,
-						input_data,
-					)
-				}
-				// there is not enough gas to allocate for the nested call.
-				None => Err((Error::<<E as Ext>::T>::OutOfGas.into(), 0)),
-			}
-		});
+		let call_outcome = ext.call(gas, callee, value, input_data);
 		let code_len = match &call_outcome {
 			Ok((_, len)) => len,
 			Err((_, len)) => len,
 		};
-		ctx.adjust_gas(charged, RuntimeToken::CallSurchargeCodeSize(*code_len));
+		ctx.adjust_gas(charged, RuntimeCosts::CallSurchargeCodeSize(*code_len));
 		if let Ok((output, _)) = &call_outcome {
 			ctx.write_sandbox_output(output_ptr, output_len_ptr, &output.data, true, |len| {
-				Some(RuntimeToken::CallCopyOut(len))
+				Some(RuntimeCosts::CallCopyOut(len))
 			})?;
 		}
 		Ok(Runtime::<E>::exec_into_return_code(call_outcome.map(|r| r.0).map_err(|r| r.0))?)
@@ -885,41 +880,22 @@ define_env!(Env, <E: Ext>,
 		salt_ptr: u32,
 		salt_len: u32
 	) -> ReturnCode => {
-		ctx.charge_gas(RuntimeToken::InstantiateBase {input_data_len, salt_len})?;
+		ctx.charge_gas(RuntimeCosts::InstantiateBase {input_data_len, salt_len})?;
 		let code_hash: CodeHash<<E as Ext>::T> =
 			ctx.read_sandbox_memory_as(code_hash_ptr, code_hash_len)?;
 		let value: BalanceOf<<E as Ext>::T> = ctx.read_sandbox_memory_as(value_ptr, value_len)?;
 		let input_data = ctx.read_sandbox_memory(input_data_ptr, input_data_len)?;
 		let salt = ctx.read_sandbox_memory(salt_ptr, salt_len)?;
 		let charged = ctx.charge_gas(
-			RuntimeToken::InstantiateSurchargeCodeSize(<E::T as Config>::MaxCodeSize::get())
+			RuntimeCosts::InstantiateSurchargeCodeSize(<E::T as Config>::MaxCodeSize::get())
 		)?;
-		let nested_gas_limit = if gas == 0 {
-			ctx.gas_meter.gas_left()
-		} else {
-			gas.saturated_into()
-		};
 		let ext = &mut ctx.ext;
-		let instantiate_outcome = ctx.gas_meter.with_nested(nested_gas_limit, |nested_meter| {
-			match nested_meter {
-				Some(nested_meter) => {
-					ext.instantiate(
-						code_hash,
-						value,
-						nested_meter,
-						input_data,
-						&salt,
-					)
-				}
-				// there is not enough gas to allocate for the nested call.
-				None => Err((Error::<<E as Ext>::T>::OutOfGas.into(), 0)),
-			}
-		});
+		let instantiate_outcome = ext.instantiate(gas, code_hash, value, input_data, &salt);
 		let code_len = match &instantiate_outcome {
 			Ok((_, _, code_len)) => code_len,
 			Err((_, code_len)) => code_len,
 		};
-		ctx.adjust_gas(charged, RuntimeToken::InstantiateSurchargeCodeSize(*code_len));
+		ctx.adjust_gas(charged, RuntimeCosts::InstantiateSurchargeCodeSize(*code_len));
 		if let Ok((address, output, _)) = &instantiate_outcome {
 			if !output.flags.contains(ReturnFlags::REVERT) {
 				ctx.write_sandbox_output(
@@ -927,7 +903,7 @@ define_env!(Env, <E: Ext>,
 				)?;
 			}
 			ctx.write_sandbox_output(output_ptr, output_len_ptr, &output.data, true, |len| {
-				Some(RuntimeToken::InstantiateCopyOut(len))
+				Some(RuntimeCosts::InstantiateCopyOut(len))
 			})?;
 		}
 		Ok(Runtime::<E>::exec_into_return_code(
@@ -956,18 +932,18 @@ define_env!(Env, <E: Ext>,
 		beneficiary_ptr: u32,
 		beneficiary_len: u32
 	) => {
-		ctx.charge_gas(RuntimeToken::Terminate)?;
+		ctx.charge_gas(RuntimeCosts::Terminate)?;
 		let beneficiary: <<E as Ext>::T as frame_system::Config>::AccountId =
 			ctx.read_sandbox_memory_as(beneficiary_ptr, beneficiary_len)?;
 
 		let charged = ctx.charge_gas(
-			RuntimeToken::TerminateSurchargeCodeSize(<E::T as Config>::MaxCodeSize::get())
+			RuntimeCosts::TerminateSurchargeCodeSize(<E::T as Config>::MaxCodeSize::get())
 		)?;
 		let (result, code_len) = match ctx.ext.terminate(&beneficiary) {
 			Ok(len) => (Ok(()), len),
 			Err((err, len)) => (Err(err), len),
 		};
-		ctx.adjust_gas(charged, RuntimeToken::TerminateSurchargeCodeSize(code_len));
+		ctx.adjust_gas(charged, RuntimeCosts::TerminateSurchargeCodeSize(code_len));
 		result?;
 		Err(TrapReason::Termination)
 	},
@@ -983,10 +959,10 @@ define_env!(Env, <E: Ext>,
 	//
 	// This function can only be called once. Calling it multiple times will trigger a trap.
 	[seal0] seal_input(ctx, out_ptr: u32, out_len_ptr: u32) => {
-		ctx.charge_gas(RuntimeToken::InputBase)?;
+		ctx.charge_gas(RuntimeCosts::InputBase)?;
 		if let Some(input) = ctx.input_data.take() {
 			ctx.write_sandbox_output(out_ptr, out_len_ptr, &input, false, |len| {
-				Some(RuntimeToken::InputCopyOut(len))
+				Some(RuntimeCosts::InputCopyOut(len))
 			})?;
 			Ok(())
 		} else {
@@ -1012,7 +988,7 @@ define_env!(Env, <E: Ext>,
 	//
 	// Using a reserved bit triggers a trap.
 	[seal0] seal_return(ctx, flags: u32, data_ptr: u32, data_len: u32) => {
-		ctx.charge_gas(RuntimeToken::Return(data_len))?;
+		ctx.charge_gas(RuntimeCosts::Return(data_len))?;
 		Err(TrapReason::Return(ReturnData {
 			flags,
 			data: ctx.read_sandbox_memory(data_ptr, data_len)?,
@@ -1030,7 +1006,7 @@ define_env!(Env, <E: Ext>,
 	// extrinsic will be returned. Otherwise, if this call is initiated by another contract then the
 	// address of the contract will be returned. The value is encoded as T::AccountId.
 	[seal0] seal_caller(ctx, out_ptr: u32, out_len_ptr: u32) => {
-		ctx.charge_gas(RuntimeToken::Caller)?;
+		ctx.charge_gas(RuntimeCosts::Caller)?;
 		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.ext.caller().encode(), false, already_charged
 		)?)
@@ -1043,7 +1019,7 @@ define_env!(Env, <E: Ext>,
 	// `out_ptr`. This call overwrites it with the size of the value. If the available
 	// space at `out_ptr` is less than the size of the value a trap is triggered.
 	[seal0] seal_address(ctx, out_ptr: u32, out_len_ptr: u32) => {
-		ctx.charge_gas(RuntimeToken::Address)?;
+		ctx.charge_gas(RuntimeCosts::Address)?;
 		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.ext.address().encode(), false, already_charged
 		)?)
@@ -1063,7 +1039,7 @@ define_env!(Env, <E: Ext>,
 	// It is recommended to avoid specifying very small values for `gas` as the prices for a single
 	// gas can be smaller than one.
 	[seal0] seal_weight_to_fee(ctx, gas: u64, out_ptr: u32, out_len_ptr: u32) => {
-		ctx.charge_gas(RuntimeToken::WeightToFee)?;
+		ctx.charge_gas(RuntimeCosts::WeightToFee)?;
 		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.ext.get_weight_price(gas).encode(), false, already_charged
 		)?)
@@ -1078,9 +1054,10 @@ define_env!(Env, <E: Ext>,
 	//
 	// The data is encoded as Gas.
 	[seal0] seal_gas_left(ctx, out_ptr: u32, out_len_ptr: u32) => {
-		ctx.charge_gas(RuntimeToken::GasLeft)?;
+		ctx.charge_gas(RuntimeCosts::GasLeft)?;
+		let gas_left = &ctx.ext.gas_meter().gas_left().encode();
 		Ok(ctx.write_sandbox_output(
-			out_ptr, out_len_ptr, &ctx.gas_meter.gas_left().encode(), false, already_charged
+			out_ptr, out_len_ptr, &gas_left, false, already_charged,
 		)?)
 	},
 
@@ -1093,7 +1070,7 @@ define_env!(Env, <E: Ext>,
 	//
 	// The data is encoded as T::Balance.
 	[seal0] seal_balance(ctx, out_ptr: u32, out_len_ptr: u32) => {
-		ctx.charge_gas(RuntimeToken::Balance)?;
+		ctx.charge_gas(RuntimeCosts::Balance)?;
 		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.ext.balance().encode(), false, already_charged
 		)?)
@@ -1108,7 +1085,7 @@ define_env!(Env, <E: Ext>,
 	//
 	// The data is encoded as T::Balance.
 	[seal0] seal_value_transferred(ctx, out_ptr: u32, out_len_ptr: u32) => {
-		ctx.charge_gas(RuntimeToken::ValueTransferred)?;
+		ctx.charge_gas(RuntimeCosts::ValueTransferred)?;
 		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.ext.value_transferred().encode(), false, already_charged
 		)?)
@@ -1127,7 +1104,7 @@ define_env!(Env, <E: Ext>,
 	//
 	// This function is deprecated. Users should migrate to the version in the "seal1" module.
 	[seal0] seal_random(ctx, subject_ptr: u32, subject_len: u32, out_ptr: u32, out_len_ptr: u32) => {
-		ctx.charge_gas(RuntimeToken::Random)?;
+		ctx.charge_gas(RuntimeCosts::Random)?;
 		if subject_len > ctx.ext.schedule().limits.subject_len {
 			Err(Error::<E::T>::RandomSubjectTooLong)?;
 		}
@@ -1159,7 +1136,7 @@ define_env!(Env, <E: Ext>,
 	// call this on later blocks until the block number returned is later than the latest
 	// commitment.
 	[seal1] seal_random(ctx, subject_ptr: u32, subject_len: u32, out_ptr: u32, out_len_ptr: u32) => {
-		ctx.charge_gas(RuntimeToken::Random)?;
+		ctx.charge_gas(RuntimeCosts::Random)?;
 		if subject_len > ctx.ext.schedule().limits.subject_len {
 			Err(Error::<E::T>::RandomSubjectTooLong)?;
 		}
@@ -1176,7 +1153,7 @@ define_env!(Env, <E: Ext>,
 	// `out_ptr`. This call overwrites it with the size of the value. If the available
 	// space at `out_ptr` is less than the size of the value a trap is triggered.
 	[seal0] seal_now(ctx, out_ptr: u32, out_len_ptr: u32) => {
-		ctx.charge_gas(RuntimeToken::Now)?;
+		ctx.charge_gas(RuntimeCosts::Now)?;
 		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.ext.now().encode(), false, already_charged
 		)?)
@@ -1186,7 +1163,7 @@ define_env!(Env, <E: Ext>,
 	//
 	// The data is encoded as T::Balance.
 	[seal0] seal_minimum_balance(ctx, out_ptr: u32, out_len_ptr: u32) => {
-		ctx.charge_gas(RuntimeToken::MinimumBalance)?;
+		ctx.charge_gas(RuntimeCosts::MinimumBalance)?;
 		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.ext.minimum_balance().encode(), false, already_charged
 		)?)
@@ -1208,7 +1185,7 @@ define_env!(Env, <E: Ext>,
 	// below the sum of existential deposit and the tombstone deposit. The sum
 	// is commonly referred as subsistence threshold in code.
 	[seal0] seal_tombstone_deposit(ctx, out_ptr: u32, out_len_ptr: u32) => {
-		ctx.charge_gas(RuntimeToken::TombstoneDeposit)?;
+		ctx.charge_gas(RuntimeCosts::TombstoneDeposit)?;
 		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.ext.tombstone_deposit().encode(), false, already_charged
 		)?)
@@ -1256,7 +1233,7 @@ define_env!(Env, <E: Ext>,
 		delta_ptr: u32,
 		delta_count: u32
 	) => {
-		ctx.charge_gas(RuntimeToken::RestoreTo(delta_count))?;
+		ctx.charge_gas(RuntimeCosts::RestoreTo(delta_count))?;
 		let dest: <<E as Ext>::T as frame_system::Config>::AccountId =
 			ctx.read_sandbox_memory_as(dest_ptr, dest_len)?;
 		let code_hash: CodeHash<<E as Ext>::T> =
@@ -1290,7 +1267,7 @@ define_env!(Env, <E: Ext>,
 		};
 
 		let max_len = <E::T as Config>::MaxCodeSize::get();
-		let charged = ctx.charge_gas(RuntimeToken::RestoreToSurchargeCodeSize {
+		let charged = ctx.charge_gas(RuntimeCosts::RestoreToSurchargeCodeSize {
 			caller_code: max_len,
 			tombstone_code: max_len,
 		})?;
@@ -1300,7 +1277,7 @@ define_env!(Env, <E: Ext>,
 			Ok((code, tomb)) => (Ok(()), code, tomb),
 			Err((err, code, tomb)) => (Err(err), code, tomb),
 		};
-		ctx.adjust_gas(charged, RuntimeToken::RestoreToSurchargeCodeSize {
+		ctx.adjust_gas(charged, RuntimeCosts::RestoreToSurchargeCodeSize {
 			caller_code,
 			tombstone_code,
 		});
@@ -1341,7 +1318,7 @@ define_env!(Env, <E: Ext>,
 		let num_topic = topics_len
 			.checked_div(sp_std::mem::size_of::<TopicOf<E::T>>() as u32)
 			.ok_or_else(|| "Zero sized topics are not allowed")?;
-		ctx.charge_gas(RuntimeToken::DepositEvent {
+		ctx.charge_gas(RuntimeCosts::DepositEvent {
 			num_topic,
 			len: data_len,
 		})?;
@@ -1379,7 +1356,7 @@ define_env!(Env, <E: Ext>,
 	//   Should be decodable as a `T::Balance`. Traps otherwise.
 	// - value_len: length of the value buffer.
 	[seal0] seal_set_rent_allowance(ctx, value_ptr: u32, value_len: u32) => {
-		ctx.charge_gas(RuntimeToken::SetRentAllowance)?;
+		ctx.charge_gas(RuntimeCosts::SetRentAllowance)?;
 		let value: BalanceOf<<E as Ext>::T> =
 			ctx.read_sandbox_memory_as(value_ptr, value_len)?;
 		ctx.ext.set_rent_allowance(value);
@@ -1396,9 +1373,10 @@ define_env!(Env, <E: Ext>,
 	//
 	// The data is encoded as T::Balance.
 	[seal0] seal_rent_allowance(ctx, out_ptr: u32, out_len_ptr: u32) => {
-		ctx.charge_gas(RuntimeToken::RentAllowance)?;
+		ctx.charge_gas(RuntimeCosts::RentAllowance)?;
+		let rent_allowance = ctx.ext.rent_allowance().encode();
 		Ok(ctx.write_sandbox_output(
-			out_ptr, out_len_ptr, &ctx.ext.rent_allowance().encode(), false, already_charged
+			out_ptr, out_len_ptr, &rent_allowance, false, already_charged
 		)?)
 	},
 
@@ -1420,7 +1398,7 @@ define_env!(Env, <E: Ext>,
 	// `out_ptr`. This call overwrites it with the size of the value. If the available
 	// space at `out_ptr` is less than the size of the value a trap is triggered.
 	[seal0] seal_block_number(ctx, out_ptr: u32, out_len_ptr: u32) => {
-		ctx.charge_gas(RuntimeToken::BlockNumber)?;
+		ctx.charge_gas(RuntimeCosts::BlockNumber)?;
 		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.ext.block_number().encode(), false, already_charged
 		)?)
@@ -1447,7 +1425,7 @@ define_env!(Env, <E: Ext>,
 	//                 data is placed. The function will write the result
 	//                 directly into this buffer.
 	[seal0] seal_hash_sha2_256(ctx, input_ptr: u32, input_len: u32, output_ptr: u32) => {
-		ctx.charge_gas(RuntimeToken::HashSha256(input_len))?;
+		ctx.charge_gas(RuntimeCosts::HashSha256(input_len))?;
 		Ok(ctx.compute_hash_on_intermediate_buffer(sha2_256, input_ptr, input_len, output_ptr)?)
 	},
 
@@ -1472,7 +1450,7 @@ define_env!(Env, <E: Ext>,
 	//                 data is placed. The function will write the result
 	//                 directly into this buffer.
 	[seal0] seal_hash_keccak_256(ctx, input_ptr: u32, input_len: u32, output_ptr: u32) => {
-		ctx.charge_gas(RuntimeToken::HashKeccak256(input_len))?;
+		ctx.charge_gas(RuntimeCosts::HashKeccak256(input_len))?;
 		Ok(ctx.compute_hash_on_intermediate_buffer(keccak_256, input_ptr, input_len, output_ptr)?)
 	},
 
@@ -1497,7 +1475,7 @@ define_env!(Env, <E: Ext>,
 	//                 data is placed. The function will write the result
 	//                 directly into this buffer.
 	[seal0] seal_hash_blake2_256(ctx, input_ptr: u32, input_len: u32, output_ptr: u32) => {
-		ctx.charge_gas(RuntimeToken::HashBlake256(input_len))?;
+		ctx.charge_gas(RuntimeCosts::HashBlake256(input_len))?;
 		Ok(ctx.compute_hash_on_intermediate_buffer(blake2_256, input_ptr, input_len, output_ptr)?)
 	},
 
@@ -1522,7 +1500,7 @@ define_env!(Env, <E: Ext>,
 	//                 data is placed. The function will write the result
 	//                 directly into this buffer.
 	[seal0] seal_hash_blake2_128(ctx, input_ptr: u32, input_len: u32, output_ptr: u32) => {
-		ctx.charge_gas(RuntimeToken::HashBlake128(input_len))?;
+		ctx.charge_gas(RuntimeCosts::HashBlake128(input_len))?;
 		Ok(ctx.compute_hash_on_intermediate_buffer(blake2_128, input_ptr, input_len, output_ptr)?)
 	},
 
@@ -1574,7 +1552,7 @@ define_env!(Env, <E: Ext>,
 	// started execution. Any change to those values that happens due to actions of the
 	// current call or contracts that are called by this contract are not considered.
 	[seal0] seal_rent_params(ctx, out_ptr: u32, out_len_ptr: u32) => {
-		ctx.charge_gas(RuntimeToken::RentParams)?;
+		ctx.charge_gas(RuntimeCosts::RentParams)?;
 		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.ext.rent_params().encode(), false, already_charged
 		)?)
diff --git a/frame/contracts/src/weights.rs b/frame/contracts/src/weights.rs
index dd9f082a18dc..a4cf9b41553b 100644
--- a/frame/contracts/src/weights.rs
+++ b/frame/contracts/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_contracts
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-02-18, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2021-04-23, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -153,1251 +153,1321 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn on_initialize() -> Weight {
-		(3_850_000 as Weight)
+		(3_610_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 	}
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
-		(52_925_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((2_297_000 as Weight).saturating_mul(k as Weight))
+		(0 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((2_307_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
-		(434_698_000 as Weight)
-			// Standard Error: 210_000
-			.saturating_add((166_559_000 as Weight).saturating_mul(q as Weight))
+		(18_635_000 as Weight)
+			// Standard Error: 8_000
+			.saturating_add((33_246_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn instrument(c: u32, ) -> Weight {
-		(29_918_000 as Weight)
-			// Standard Error: 185_000
-			.saturating_add((123_774_000 as Weight).saturating_mul(c as Weight))
+		(36_950_000 as Weight)
+			// Standard Error: 198_000
+			.saturating_add((116_526_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn update_schedule() -> Weight {
-		(29_795_000 as Weight)
+		(28_095_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight {
-		(225_834_000 as Weight)
-			// Standard Error: 144_000
-			.saturating_add((165_632_000 as Weight).saturating_mul(c as Weight))
+		(230_039_000 as Weight)
+			// Standard Error: 143_000
+			.saturating_add((157_483_000 as Weight).saturating_mul(c as Weight))
 			// Standard Error: 9_000
-			.saturating_add((2_563_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((2_992_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
-			.saturating_add(T::DbWeight::get().writes(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn instantiate(c: u32, s: u32, ) -> Weight {
-		(190_482_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((8_724_000 as Weight).saturating_mul(c as Weight))
+		(203_983_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((8_639_000 as Weight).saturating_mul(c as Weight))
 			// Standard Error: 1_000
-			.saturating_add((2_512_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((2_918_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
-			.saturating_add(T::DbWeight::get().writes(4 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn call(c: u32, ) -> Weight {
-		(195_414_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((3_920_000 as Weight).saturating_mul(c as Weight))
+		(198_905_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((3_913_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn claim_surcharge(c: u32, ) -> Weight {
-		(336_867_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((5_262_000 as Weight).saturating_mul(c as Weight))
+		(132_586_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((4_732_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn seal_caller(r: u32, ) -> Weight {
-		(143_935_000 as Weight)
-			// Standard Error: 128_000
-			.saturating_add((266_876_000 as Weight).saturating_mul(r as Weight))
+		(179_629_000 as Weight)
+			// Standard Error: 318_000
+			.saturating_add((250_628_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_address(r: u32, ) -> Weight {
-		(150_342_000 as Weight)
-			// Standard Error: 127_000
-			.saturating_add((266_051_000 as Weight).saturating_mul(r as Weight))
+		(144_806_000 as Weight)
+			// Standard Error: 71_000
+			.saturating_add((251_588_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(144_833_000 as Weight)
-			// Standard Error: 124_000
-			.saturating_add((259_279_000 as Weight).saturating_mul(r as Weight))
+		(151_919_000 as Weight)
+			// Standard Error: 90_000
+			.saturating_add((243_733_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_balance(r: u32, ) -> Weight {
-		(152_032_000 as Weight)
-			// Standard Error: 218_000
-			.saturating_add((573_038_000 as Weight).saturating_mul(r as Weight))
+		(157_448_000 as Weight)
+			// Standard Error: 211_000
+			.saturating_add((559_875_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(148_831_000 as Weight)
-			// Standard Error: 147_000
-			.saturating_add((260_718_000 as Weight).saturating_mul(r as Weight))
+		(145_161_000 as Weight)
+			// Standard Error: 71_000
+			.saturating_add((246_729_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(142_925_000 as Weight)
-			// Standard Error: 130_000
-			.saturating_add((260_426_000 as Weight).saturating_mul(r as Weight))
+		(147_920_000 as Weight)
+			// Standard Error: 60_000
+			.saturating_add((245_135_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(143_151_000 as Weight)
-			// Standard Error: 119_000
-			.saturating_add((260_964_000 as Weight).saturating_mul(r as Weight))
+		(141_105_000 as Weight)
+			// Standard Error: 138_000
+			.saturating_add((247_840_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(155_126_000 as Weight)
-			// Standard Error: 225_000
-			.saturating_add((599_056_000 as Weight).saturating_mul(r as Weight))
+		(147_393_000 as Weight)
+			// Standard Error: 77_000
+			.saturating_add((247_593_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_block_number(r: u32, ) -> Weight {
-		(144_566_000 as Weight)
-			// Standard Error: 110_000
-			.saturating_add((257_620_000 as Weight).saturating_mul(r as Weight))
+		(151_560_000 as Weight)
+			// Standard Error: 92_000
+			.saturating_add((242_469_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_now(r: u32, ) -> Weight {
-		(147_274_000 as Weight)
-			// Standard Error: 115_000
-			.saturating_add((258_627_000 as Weight).saturating_mul(r as Weight))
+		(145_917_000 as Weight)
+			// Standard Error: 80_000
+			.saturating_add((244_335_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_rent_params(r: u32, ) -> Weight {
-		(168_575_000 as Weight)
-			// Standard Error: 394_000
-			.saturating_add((397_754_000 as Weight).saturating_mul(r as Weight))
+		(150_399_000 as Weight)
+			// Standard Error: 90_000
+			.saturating_add((381_505_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(148_102_000 as Weight)
-			// Standard Error: 201_000
-			.saturating_add((537_088_000 as Weight).saturating_mul(r as Weight))
+		(152_906_000 as Weight)
+			// Standard Error: 418_000
+			.saturating_add((486_338_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_gas(r: u32, ) -> Weight {
-		(125_122_000 as Weight)
-			// Standard Error: 89_000
-			.saturating_add((122_350_000 as Weight).saturating_mul(r as Weight))
+		(130_020_000 as Weight)
+			// Standard Error: 48_000
+			.saturating_add((120_792_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_input(r: u32, ) -> Weight {
-		(137_334_000 as Weight)
-			// Standard Error: 99_000
-			.saturating_add((7_359_000 as Weight).saturating_mul(r as Weight))
+		(142_031_000 as Weight)
+			// Standard Error: 83_000
+			.saturating_add((7_205_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(145_094_000 as Weight)
+		(151_770_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((283_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((247_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_return(r: u32, ) -> Weight {
-		(127_544_000 as Weight)
-			// Standard Error: 138_000
-			.saturating_add((4_640_000 as Weight).saturating_mul(r as Weight))
+		(131_023_000 as Weight)
+			// Standard Error: 69_000
+			.saturating_add((4_823_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(137_517_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((783_000 as Weight).saturating_mul(n as Weight))
+		(142_885_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((751_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_terminate(r: u32, ) -> Weight {
-		(138_292_000 as Weight)
-			// Standard Error: 689_000
-			.saturating_add((111_698_000 as Weight).saturating_mul(r as Weight))
+		(142_165_000 as Weight)
+			// Standard Error: 100_000
+			.saturating_add((99_133_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
-			.saturating_add(T::DbWeight::get().writes((5 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_terminate_per_code_kb(c: u32, ) -> Weight {
-		(263_507_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((8_409_000 as Weight).saturating_mul(c as Weight))
+		(243_348_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((8_560_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
 	fn seal_restore_to(r: u32, ) -> Weight {
-		(232_291_000 as Weight)
-			// Standard Error: 301_000
-			.saturating_add((136_379_000 as Weight).saturating_mul(r as Weight))
+		(171_766_000 as Weight)
+			// Standard Error: 372_000
+			.saturating_add((100_243_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(r as Weight)))
-			.saturating_add(T::DbWeight::get().writes((6 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes((5 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_restore_to_per_code_kb_delta(c: u32, t: u32, d: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 162_000
-			.saturating_add((8_619_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 162_000
-			.saturating_add((4_877_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 1_433_000
-			.saturating_add((3_762_810_000 as Weight).saturating_mul(d as Weight))
+		(112_646_000 as Weight)
+			// Standard Error: 142_000
+			.saturating_add((7_922_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 142_000
+			.saturating_add((3_590_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 1_255_000
+			.saturating_add((3_716_501_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(T::DbWeight::get().reads(8 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
 			.saturating_add(T::DbWeight::get().writes(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
 	}
 	fn seal_random(r: u32, ) -> Weight {
-		(153_634_000 as Weight)
-			// Standard Error: 267_000
-			.saturating_add((650_160_000 as Weight).saturating_mul(r as Weight))
+		(152_470_000 as Weight)
+			// Standard Error: 146_000
+			.saturating_add((619_676_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(137_080_000 as Weight)
-			// Standard Error: 1_009_000
-			.saturating_add((949_228_000 as Weight).saturating_mul(r as Weight))
+		(151_008_000 as Weight)
+			// Standard Error: 167_000
+			.saturating_add((899_677_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_259_129_000 as Weight)
-			// Standard Error: 2_542_000
-			.saturating_add((609_859_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 501_000
-			.saturating_add((249_496_000 as Weight).saturating_mul(n as Weight))
+		(1_227_526_000 as Weight)
+			// Standard Error: 2_767_000
+			.saturating_add((586_284_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 545_000
+			.saturating_add((247_578_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(170_417_000 as Weight)
-			// Standard Error: 434_000
-			.saturating_add((721_511_000 as Weight).saturating_mul(r as Weight))
+		(142_734_000 as Weight)
+			// Standard Error: 53_000
+			.saturating_add((167_026_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(1_870_542_000 as Weight)
-			// Standard Error: 26_871_000
-			.saturating_add((18_312_239_000 as Weight).saturating_mul(r as Weight))
+		(21_198_000 as Weight)
+			// Standard Error: 2_062_000
+			.saturating_add((3_836_800_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(1_763_732_000 as Weight)
-			// Standard Error: 258_000
-			.saturating_add((74_848_000 as Weight).saturating_mul(n as Weight))
+		(589_829_000 as Weight)
+			// Standard Error: 223_000
+			.saturating_add((71_242_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn seal_clear_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_745_000
-			.saturating_add((2_316_433_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 1_950_000
+			.saturating_add((1_267_479_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_get_storage(r: u32, ) -> Weight {
-		(87_218_000 as Weight)
-			// Standard Error: 745_000
-			.saturating_add((948_121_000 as Weight).saturating_mul(r as Weight))
+		(3_466_000 as Weight)
+			// Standard Error: 1_248_000
+			.saturating_add((920_416_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(719_050_000 as Weight)
-			// Standard Error: 266_000
-			.saturating_add((154_812_000 as Weight).saturating_mul(n as Weight))
+		(618_423_000 as Weight)
+			// Standard Error: 231_000
+			.saturating_add((153_218_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_transfer(r: u32, ) -> Weight {
-		(19_439_000 as Weight)
-			// Standard Error: 2_468_000
-			.saturating_add((5_674_822_000 as Weight).saturating_mul(r as Weight))
+		(76_247_000 as Weight)
+			// Standard Error: 2_153_000
+			.saturating_add((5_509_779_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 7_465_000
-			.saturating_add((11_066_530_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 8_294_000
+			.saturating_add((11_951_311_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().reads((200 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_call_per_code_transfer_input_output_kb(c: u32, t: u32, i: u32, o: u32, ) -> Weight {
-		(9_916_288_000 as Weight)
-			// Standard Error: 552_000
-			.saturating_add((397_842_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 229_902_000
-			.saturating_add((5_243_673_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 72_000
-			.saturating_add((59_737_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 77_000
-			.saturating_add((82_259_000 as Weight).saturating_mul(o as Weight))
+		(10_875_657_000 as Weight)
+			// Standard Error: 253_000
+			.saturating_add((392_140_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 105_395_000
+			.saturating_add((3_581_966_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 33_000
+			.saturating_add((59_352_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 35_000
+			.saturating_add((79_149_000 as Weight).saturating_mul(o as Weight))
 			.saturating_add(T::DbWeight::get().reads(206 as Weight))
+			.saturating_add(T::DbWeight::get().writes(101 as Weight))
 			.saturating_add(T::DbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 32_016_000
-			.saturating_add((22_206_489_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 31_795_000
+			.saturating_add((21_908_561_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes((300 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_instantiate_per_code_input_output_salt_kb(c: u32, i: u32, o: u32, s: u32, ) -> Weight {
-		(9_991_947_000 as Weight)
-			// Standard Error: 637_000
-			.saturating_add((881_981_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 90_000
-			.saturating_add((63_638_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 90_000
-			.saturating_add((87_288_000 as Weight).saturating_mul(o as Weight))
-			// Standard Error: 90_000
-			.saturating_add((311_808_000 as Weight).saturating_mul(s as Weight))
+		(10_580_308_000 as Weight)
+			// Standard Error: 611_000
+			.saturating_add((875_153_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 86_000
+			.saturating_add((62_540_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 86_000
+			.saturating_add((83_080_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 86_000
+			.saturating_add((350_970_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(207 as Weight))
-			.saturating_add(T::DbWeight::get().writes(203 as Weight))
+			.saturating_add(T::DbWeight::get().writes(204 as Weight))
 	}
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(132_452_000 as Weight)
-			// Standard Error: 227_000
-			.saturating_add((239_671_000 as Weight).saturating_mul(r as Weight))
+		(143_987_000 as Weight)
+			// Standard Error: 90_000
+			.saturating_add((232_215_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(756_802_000 as Weight)
-			// Standard Error: 48_000
-			.saturating_add((429_454_000 as Weight).saturating_mul(n as Weight))
+		(762_075_000 as Weight)
+			// Standard Error: 64_000
+			.saturating_add((475_112_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(139_440_000 as Weight)
-			// Standard Error: 128_000
-			.saturating_add((249_514_000 as Weight).saturating_mul(r as Weight))
+		(145_456_000 as Weight)
+			// Standard Error: 203_000
+			.saturating_add((241_831_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(658_595_000 as Weight)
-			// Standard Error: 35_000
-			.saturating_add((343_814_000 as Weight).saturating_mul(n as Weight))
+		(660_371_000 as Weight)
+			// Standard Error: 30_000
+			.saturating_add((342_147_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(138_124_000 as Weight)
-			// Standard Error: 140_000
-			.saturating_add((223_189_000 as Weight).saturating_mul(r as Weight))
+		(149_472_000 as Weight)
+			// Standard Error: 101_000
+			.saturating_add((212_899_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(689_667_000 as Weight)
-			// Standard Error: 41_000
-			.saturating_add((160_006_000 as Weight).saturating_mul(n as Weight))
+		(643_371_000 as Weight)
+			// Standard Error: 31_000
+			.saturating_add((159_244_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(140_225_000 as Weight)
-			// Standard Error: 156_000
-			.saturating_add((223_696_000 as Weight).saturating_mul(r as Weight))
+		(147_732_000 as Weight)
+			// Standard Error: 91_000
+			.saturating_add((210_975_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(693_756_000 as Weight)
-			// Standard Error: 40_000
-			.saturating_add((159_996_000 as Weight).saturating_mul(n as Weight))
+		(684_085_000 as Weight)
+			// Standard Error: 38_000
+			.saturating_add((159_213_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(24_250_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((3_134_000 as Weight).saturating_mul(r as Weight))
+		(25_332_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((3_087_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(26_509_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((161_556_000 as Weight).saturating_mul(r as Weight))
+		(27_404_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((136_046_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(26_499_000 as Weight)
-			// Standard Error: 59_000
-			.saturating_add((233_755_000 as Weight).saturating_mul(r as Weight))
+		(27_422_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((204_925_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(24_175_000 as Weight)
+		(25_289_000 as Weight)
 			// Standard Error: 16_000
-			.saturating_add((12_450_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((12_375_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(24_219_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((12_058_000 as Weight).saturating_mul(r as Weight))
+		(25_278_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((11_447_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(24_146_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((6_017_000 as Weight).saturating_mul(r as Weight))
+		(25_283_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((5_615_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(24_229_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((13_726_000 as Weight).saturating_mul(r as Weight))
+		(25_377_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((13_248_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(24_219_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((15_115_000 as Weight).saturating_mul(r as Weight))
+		(25_318_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((14_962_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(34_981_000 as Weight)
+		(37_040_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((156_000 as Weight).saturating_mul(e as Weight))
+			.saturating_add((150_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(24_599_000 as Weight)
-			// Standard Error: 102_000
-			.saturating_add((95_771_000 as Weight).saturating_mul(r as Weight))
+		(25_529_000 as Weight)
+			// Standard Error: 114_000
+			.saturating_add((91_613_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(32_584_000 as Weight)
-			// Standard Error: 176_000
-			.saturating_add((193_216_000 as Weight).saturating_mul(r as Weight))
+		(33_242_000 as Weight)
+			// Standard Error: 188_000
+			.saturating_add((191_383_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(240_739_000 as Weight)
-			// Standard Error: 6_000
-			.saturating_add((3_407_000 as Weight).saturating_mul(p as Weight))
+		(228_146_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((3_917_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(41_963_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((3_110_000 as Weight).saturating_mul(r as Weight))
+		(44_304_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((3_146_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(41_956_000 as Weight)
-			// Standard Error: 9_000
-			.saturating_add((3_460_000 as Weight).saturating_mul(r as Weight))
+		(44_314_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((3_474_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(42_002_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((4_591_000 as Weight).saturating_mul(r as Weight))
+		(44_234_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((4_725_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(27_646_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((7_821_000 as Weight).saturating_mul(r as Weight))
+		(28_754_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((7_898_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(27_615_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((11_807_000 as Weight).saturating_mul(r as Weight))
+		(28_737_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((8_531_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(27_106_000 as Weight)
-			// Standard Error: 78_000
-			.saturating_add((2_952_000 as Weight).saturating_mul(r as Weight))
+		(27_338_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((3_499_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(24_956_000 as Weight)
-			// Standard Error: 3_541_000
-			.saturating_add((2_332_414_000 as Weight).saturating_mul(r as Weight))
+		(25_943_000 as Weight)
+			// Standard Error: 299_000
+			.saturating_add((2_094_164_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(24_183_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((5_166_000 as Weight).saturating_mul(r as Weight))
+		(25_269_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((5_135_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(24_142_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((5_146_000 as Weight).saturating_mul(r as Weight))
+		(25_281_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((5_069_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(24_161_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((5_807_000 as Weight).saturating_mul(r as Weight))
+		(25_243_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((5_809_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(24_167_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((5_288_000 as Weight).saturating_mul(r as Weight))
+		(25_259_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((5_120_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(24_252_000 as Weight)
-			// Standard Error: 9_000
-			.saturating_add((5_091_000 as Weight).saturating_mul(r as Weight))
+		(25_249_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((5_167_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(24_243_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((5_076_000 as Weight).saturating_mul(r as Weight))
+		(25_247_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((5_118_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(24_227_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((5_135_000 as Weight).saturating_mul(r as Weight))
+		(25_285_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((5_051_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(24_278_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((7_124_000 as Weight).saturating_mul(r as Weight))
+		(25_312_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((7_207_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(24_254_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((7_067_000 as Weight).saturating_mul(r as Weight))
+		(25_311_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((6_982_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(24_220_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((7_122_000 as Weight).saturating_mul(r as Weight))
+		(25_327_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((7_009_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(24_221_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((7_221_000 as Weight).saturating_mul(r as Weight))
+		(25_318_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((7_180_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(24_259_000 as Weight)
+		(25_330_000 as Weight)
 			// Standard Error: 13_000
-			.saturating_add((7_135_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((7_065_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(24_245_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((7_193_000 as Weight).saturating_mul(r as Weight))
+		(25_284_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((7_192_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(24_289_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((7_023_000 as Weight).saturating_mul(r as Weight))
+		(25_310_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((7_080_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(24_239_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((7_065_000 as Weight).saturating_mul(r as Weight))
+		(25_262_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((7_079_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(24_256_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((7_119_000 as Weight).saturating_mul(r as Weight))
+		(25_295_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((7_151_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(24_240_000 as Weight)
+		(25_326_000 as Weight)
 			// Standard Error: 18_000
-			.saturating_add((7_225_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((7_200_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(24_266_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((6_996_000 as Weight).saturating_mul(r as Weight))
+		(25_320_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((7_020_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(24_265_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((6_974_000 as Weight).saturating_mul(r as Weight))
+		(25_303_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((7_189_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(24_232_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((7_103_000 as Weight).saturating_mul(r as Weight))
+		(25_311_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((7_054_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(24_245_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((12_915_000 as Weight).saturating_mul(r as Weight))
+		(25_342_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((12_860_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(24_177_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((12_232_000 as Weight).saturating_mul(r as Weight))
+		(25_307_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((12_162_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(24_171_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((12_939_000 as Weight).saturating_mul(r as Weight))
+		(25_354_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((12_855_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(24_788_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((11_657_000 as Weight).saturating_mul(r as Weight))
+		(25_319_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((11_982_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(24_252_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((7_003_000 as Weight).saturating_mul(r as Weight))
+		(25_351_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((7_124_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(24_263_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((7_005_000 as Weight).saturating_mul(r as Weight))
+		(25_333_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((7_060_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(24_239_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((7_020_000 as Weight).saturating_mul(r as Weight))
+		(25_332_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((7_080_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(24_212_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((7_172_000 as Weight).saturating_mul(r as Weight))
+		(25_279_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((7_193_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(24_220_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((7_246_000 as Weight).saturating_mul(r as Weight))
+		(25_315_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((7_157_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(24_213_000 as Weight)
+		(25_354_000 as Weight)
 			// Standard Error: 14_000
-			.saturating_add((7_191_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((7_238_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(24_221_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((7_192_000 as Weight).saturating_mul(r as Weight))
+		(25_353_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((7_160_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(24_235_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((7_106_000 as Weight).saturating_mul(r as Weight))
+		(25_363_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((7_192_000 as Weight).saturating_mul(r as Weight))
 	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn on_initialize() -> Weight {
-		(3_850_000 as Weight)
+		(3_610_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 	}
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
-		(52_925_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((2_297_000 as Weight).saturating_mul(k as Weight))
+		(0 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((2_307_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
-		(434_698_000 as Weight)
-			// Standard Error: 210_000
-			.saturating_add((166_559_000 as Weight).saturating_mul(q as Weight))
+		(18_635_000 as Weight)
+			// Standard Error: 8_000
+			.saturating_add((33_246_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn instrument(c: u32, ) -> Weight {
-		(29_918_000 as Weight)
-			// Standard Error: 185_000
-			.saturating_add((123_774_000 as Weight).saturating_mul(c as Weight))
+		(36_950_000 as Weight)
+			// Standard Error: 198_000
+			.saturating_add((116_526_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn update_schedule() -> Weight {
-		(29_795_000 as Weight)
+		(28_095_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight {
-		(225_834_000 as Weight)
-			// Standard Error: 144_000
-			.saturating_add((165_632_000 as Weight).saturating_mul(c as Weight))
+		(230_039_000 as Weight)
+			// Standard Error: 143_000
+			.saturating_add((157_483_000 as Weight).saturating_mul(c as Weight))
 			// Standard Error: 9_000
-			.saturating_add((2_563_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((2_992_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn instantiate(c: u32, s: u32, ) -> Weight {
-		(190_482_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((8_724_000 as Weight).saturating_mul(c as Weight))
+		(203_983_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((8_639_000 as Weight).saturating_mul(c as Weight))
 			// Standard Error: 1_000
-			.saturating_add((2_512_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((2_918_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn call(c: u32, ) -> Weight {
-		(195_414_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((3_920_000 as Weight).saturating_mul(c as Weight))
+		(198_905_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((3_913_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn claim_surcharge(c: u32, ) -> Weight {
-		(336_867_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((5_262_000 as Weight).saturating_mul(c as Weight))
+		(132_586_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((4_732_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn seal_caller(r: u32, ) -> Weight {
-		(143_935_000 as Weight)
-			// Standard Error: 128_000
-			.saturating_add((266_876_000 as Weight).saturating_mul(r as Weight))
+		(179_629_000 as Weight)
+			// Standard Error: 318_000
+			.saturating_add((250_628_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_address(r: u32, ) -> Weight {
-		(150_342_000 as Weight)
-			// Standard Error: 127_000
-			.saturating_add((266_051_000 as Weight).saturating_mul(r as Weight))
+		(144_806_000 as Weight)
+			// Standard Error: 71_000
+			.saturating_add((251_588_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(144_833_000 as Weight)
-			// Standard Error: 124_000
-			.saturating_add((259_279_000 as Weight).saturating_mul(r as Weight))
+		(151_919_000 as Weight)
+			// Standard Error: 90_000
+			.saturating_add((243_733_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_balance(r: u32, ) -> Weight {
-		(152_032_000 as Weight)
-			// Standard Error: 218_000
-			.saturating_add((573_038_000 as Weight).saturating_mul(r as Weight))
+		(157_448_000 as Weight)
+			// Standard Error: 211_000
+			.saturating_add((559_875_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(148_831_000 as Weight)
-			// Standard Error: 147_000
-			.saturating_add((260_718_000 as Weight).saturating_mul(r as Weight))
+		(145_161_000 as Weight)
+			// Standard Error: 71_000
+			.saturating_add((246_729_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(142_925_000 as Weight)
-			// Standard Error: 130_000
-			.saturating_add((260_426_000 as Weight).saturating_mul(r as Weight))
+		(147_920_000 as Weight)
+			// Standard Error: 60_000
+			.saturating_add((245_135_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(143_151_000 as Weight)
-			// Standard Error: 119_000
-			.saturating_add((260_964_000 as Weight).saturating_mul(r as Weight))
+		(141_105_000 as Weight)
+			// Standard Error: 138_000
+			.saturating_add((247_840_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(155_126_000 as Weight)
-			// Standard Error: 225_000
-			.saturating_add((599_056_000 as Weight).saturating_mul(r as Weight))
+		(147_393_000 as Weight)
+			// Standard Error: 77_000
+			.saturating_add((247_593_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_block_number(r: u32, ) -> Weight {
-		(144_566_000 as Weight)
-			// Standard Error: 110_000
-			.saturating_add((257_620_000 as Weight).saturating_mul(r as Weight))
+		(151_560_000 as Weight)
+			// Standard Error: 92_000
+			.saturating_add((242_469_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_now(r: u32, ) -> Weight {
-		(147_274_000 as Weight)
-			// Standard Error: 115_000
-			.saturating_add((258_627_000 as Weight).saturating_mul(r as Weight))
+		(145_917_000 as Weight)
+			// Standard Error: 80_000
+			.saturating_add((244_335_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_rent_params(r: u32, ) -> Weight {
-		(168_575_000 as Weight)
-			// Standard Error: 394_000
-			.saturating_add((397_754_000 as Weight).saturating_mul(r as Weight))
+		(150_399_000 as Weight)
+			// Standard Error: 90_000
+			.saturating_add((381_505_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(148_102_000 as Weight)
-			// Standard Error: 201_000
-			.saturating_add((537_088_000 as Weight).saturating_mul(r as Weight))
+		(152_906_000 as Weight)
+			// Standard Error: 418_000
+			.saturating_add((486_338_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_gas(r: u32, ) -> Weight {
-		(125_122_000 as Weight)
-			// Standard Error: 89_000
-			.saturating_add((122_350_000 as Weight).saturating_mul(r as Weight))
+		(130_020_000 as Weight)
+			// Standard Error: 48_000
+			.saturating_add((120_792_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_input(r: u32, ) -> Weight {
-		(137_334_000 as Weight)
-			// Standard Error: 99_000
-			.saturating_add((7_359_000 as Weight).saturating_mul(r as Weight))
+		(142_031_000 as Weight)
+			// Standard Error: 83_000
+			.saturating_add((7_205_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(145_094_000 as Weight)
+		(151_770_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((283_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((247_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_return(r: u32, ) -> Weight {
-		(127_544_000 as Weight)
-			// Standard Error: 138_000
-			.saturating_add((4_640_000 as Weight).saturating_mul(r as Weight))
+		(131_023_000 as Weight)
+			// Standard Error: 69_000
+			.saturating_add((4_823_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(137_517_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((783_000 as Weight).saturating_mul(n as Weight))
+		(142_885_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((751_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_terminate(r: u32, ) -> Weight {
-		(138_292_000 as Weight)
-			// Standard Error: 689_000
-			.saturating_add((111_698_000 as Weight).saturating_mul(r as Weight))
+		(142_165_000 as Weight)
+			// Standard Error: 100_000
+			.saturating_add((99_133_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
-			.saturating_add(RocksDbWeight::get().writes((5 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_terminate_per_code_kb(c: u32, ) -> Weight {
-		(263_507_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((8_409_000 as Weight).saturating_mul(c as Weight))
+		(243_348_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((8_560_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}
 	fn seal_restore_to(r: u32, ) -> Weight {
-		(232_291_000 as Weight)
-			// Standard Error: 301_000
-			.saturating_add((136_379_000 as Weight).saturating_mul(r as Weight))
+		(171_766_000 as Weight)
+			// Standard Error: 372_000
+			.saturating_add((100_243_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((4 as Weight).saturating_mul(r as Weight)))
-			.saturating_add(RocksDbWeight::get().writes((6 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((5 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_restore_to_per_code_kb_delta(c: u32, t: u32, d: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 162_000
-			.saturating_add((8_619_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 162_000
-			.saturating_add((4_877_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 1_433_000
-			.saturating_add((3_762_810_000 as Weight).saturating_mul(d as Weight))
+		(112_646_000 as Weight)
+			// Standard Error: 142_000
+			.saturating_add((7_922_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 142_000
+			.saturating_add((3_590_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 1_255_000
+			.saturating_add((3_716_501_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(RocksDbWeight::get().reads(8 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(7 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
 	}
 	fn seal_random(r: u32, ) -> Weight {
-		(153_634_000 as Weight)
-			// Standard Error: 267_000
-			.saturating_add((650_160_000 as Weight).saturating_mul(r as Weight))
+		(152_470_000 as Weight)
+			// Standard Error: 146_000
+			.saturating_add((619_676_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(137_080_000 as Weight)
-			// Standard Error: 1_009_000
-			.saturating_add((949_228_000 as Weight).saturating_mul(r as Weight))
+		(151_008_000 as Weight)
+			// Standard Error: 167_000
+			.saturating_add((899_677_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_259_129_000 as Weight)
-			// Standard Error: 2_542_000
-			.saturating_add((609_859_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 501_000
-			.saturating_add((249_496_000 as Weight).saturating_mul(n as Weight))
+		(1_227_526_000 as Weight)
+			// Standard Error: 2_767_000
+			.saturating_add((586_284_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 545_000
+			.saturating_add((247_578_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(170_417_000 as Weight)
-			// Standard Error: 434_000
-			.saturating_add((721_511_000 as Weight).saturating_mul(r as Weight))
+		(142_734_000 as Weight)
+			// Standard Error: 53_000
+			.saturating_add((167_026_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(1_870_542_000 as Weight)
-			// Standard Error: 26_871_000
-			.saturating_add((18_312_239_000 as Weight).saturating_mul(r as Weight))
+		(21_198_000 as Weight)
+			// Standard Error: 2_062_000
+			.saturating_add((3_836_800_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(1_763_732_000 as Weight)
-			// Standard Error: 258_000
-			.saturating_add((74_848_000 as Weight).saturating_mul(n as Weight))
+		(589_829_000 as Weight)
+			// Standard Error: 223_000
+			.saturating_add((71_242_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn seal_clear_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_745_000
-			.saturating_add((2_316_433_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 1_950_000
+			.saturating_add((1_267_479_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_get_storage(r: u32, ) -> Weight {
-		(87_218_000 as Weight)
-			// Standard Error: 745_000
-			.saturating_add((948_121_000 as Weight).saturating_mul(r as Weight))
+		(3_466_000 as Weight)
+			// Standard Error: 1_248_000
+			.saturating_add((920_416_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(719_050_000 as Weight)
-			// Standard Error: 266_000
-			.saturating_add((154_812_000 as Weight).saturating_mul(n as Weight))
+		(618_423_000 as Weight)
+			// Standard Error: 231_000
+			.saturating_add((153_218_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_transfer(r: u32, ) -> Weight {
-		(19_439_000 as Weight)
-			// Standard Error: 2_468_000
-			.saturating_add((5_674_822_000 as Weight).saturating_mul(r as Weight))
+		(76_247_000 as Weight)
+			// Standard Error: 2_153_000
+			.saturating_add((5_509_779_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
-			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 7_465_000
-			.saturating_add((11_066_530_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 8_294_000
+			.saturating_add((11_951_311_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((200 as Weight).saturating_mul(r as Weight)))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_call_per_code_transfer_input_output_kb(c: u32, t: u32, i: u32, o: u32, ) -> Weight {
-		(9_916_288_000 as Weight)
-			// Standard Error: 552_000
-			.saturating_add((397_842_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 229_902_000
-			.saturating_add((5_243_673_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 72_000
-			.saturating_add((59_737_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 77_000
-			.saturating_add((82_259_000 as Weight).saturating_mul(o as Weight))
+		(10_875_657_000 as Weight)
+			// Standard Error: 253_000
+			.saturating_add((392_140_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 105_395_000
+			.saturating_add((3_581_966_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 33_000
+			.saturating_add((59_352_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 35_000
+			.saturating_add((79_149_000 as Weight).saturating_mul(o as Weight))
 			.saturating_add(RocksDbWeight::get().reads(206 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(101 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 32_016_000
-			.saturating_add((22_206_489_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 31_795_000
+			.saturating_add((21_908_561_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
-			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((300 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_instantiate_per_code_input_output_salt_kb(c: u32, i: u32, o: u32, s: u32, ) -> Weight {
-		(9_991_947_000 as Weight)
-			// Standard Error: 637_000
-			.saturating_add((881_981_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 90_000
-			.saturating_add((63_638_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 90_000
-			.saturating_add((87_288_000 as Weight).saturating_mul(o as Weight))
-			// Standard Error: 90_000
-			.saturating_add((311_808_000 as Weight).saturating_mul(s as Weight))
+		(10_580_308_000 as Weight)
+			// Standard Error: 611_000
+			.saturating_add((875_153_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 86_000
+			.saturating_add((62_540_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 86_000
+			.saturating_add((83_080_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 86_000
+			.saturating_add((350_970_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(207 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(203 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(204 as Weight))
 	}
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(132_452_000 as Weight)
-			// Standard Error: 227_000
-			.saturating_add((239_671_000 as Weight).saturating_mul(r as Weight))
+		(143_987_000 as Weight)
+			// Standard Error: 90_000
+			.saturating_add((232_215_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(756_802_000 as Weight)
-			// Standard Error: 48_000
-			.saturating_add((429_454_000 as Weight).saturating_mul(n as Weight))
+		(762_075_000 as Weight)
+			// Standard Error: 64_000
+			.saturating_add((475_112_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(139_440_000 as Weight)
-			// Standard Error: 128_000
-			.saturating_add((249_514_000 as Weight).saturating_mul(r as Weight))
+		(145_456_000 as Weight)
+			// Standard Error: 203_000
+			.saturating_add((241_831_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(658_595_000 as Weight)
-			// Standard Error: 35_000
-			.saturating_add((343_814_000 as Weight).saturating_mul(n as Weight))
+		(660_371_000 as Weight)
+			// Standard Error: 30_000
+			.saturating_add((342_147_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(138_124_000 as Weight)
-			// Standard Error: 140_000
-			.saturating_add((223_189_000 as Weight).saturating_mul(r as Weight))
+		(149_472_000 as Weight)
+			// Standard Error: 101_000
+			.saturating_add((212_899_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(689_667_000 as Weight)
-			// Standard Error: 41_000
-			.saturating_add((160_006_000 as Weight).saturating_mul(n as Weight))
+		(643_371_000 as Weight)
+			// Standard Error: 31_000
+			.saturating_add((159_244_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(140_225_000 as Weight)
-			// Standard Error: 156_000
-			.saturating_add((223_696_000 as Weight).saturating_mul(r as Weight))
+		(147_732_000 as Weight)
+			// Standard Error: 91_000
+			.saturating_add((210_975_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(693_756_000 as Weight)
-			// Standard Error: 40_000
-			.saturating_add((159_996_000 as Weight).saturating_mul(n as Weight))
+		(684_085_000 as Weight)
+			// Standard Error: 38_000
+			.saturating_add((159_213_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(24_250_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((3_134_000 as Weight).saturating_mul(r as Weight))
+		(25_332_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((3_087_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(26_509_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((161_556_000 as Weight).saturating_mul(r as Weight))
+		(27_404_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((136_046_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(26_499_000 as Weight)
-			// Standard Error: 59_000
-			.saturating_add((233_755_000 as Weight).saturating_mul(r as Weight))
+		(27_422_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((204_925_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(24_175_000 as Weight)
+		(25_289_000 as Weight)
 			// Standard Error: 16_000
-			.saturating_add((12_450_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((12_375_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(24_219_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((12_058_000 as Weight).saturating_mul(r as Weight))
+		(25_278_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((11_447_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(24_146_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((6_017_000 as Weight).saturating_mul(r as Weight))
+		(25_283_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((5_615_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(24_229_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((13_726_000 as Weight).saturating_mul(r as Weight))
+		(25_377_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((13_248_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(24_219_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((15_115_000 as Weight).saturating_mul(r as Weight))
+		(25_318_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((14_962_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(34_981_000 as Weight)
+		(37_040_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((156_000 as Weight).saturating_mul(e as Weight))
+			.saturating_add((150_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(24_599_000 as Weight)
-			// Standard Error: 102_000
-			.saturating_add((95_771_000 as Weight).saturating_mul(r as Weight))
+		(25_529_000 as Weight)
+			// Standard Error: 114_000
+			.saturating_add((91_613_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(32_584_000 as Weight)
-			// Standard Error: 176_000
-			.saturating_add((193_216_000 as Weight).saturating_mul(r as Weight))
+		(33_242_000 as Weight)
+			// Standard Error: 188_000
+			.saturating_add((191_383_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(240_739_000 as Weight)
-			// Standard Error: 6_000
-			.saturating_add((3_407_000 as Weight).saturating_mul(p as Weight))
+		(228_146_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((3_917_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(41_963_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((3_110_000 as Weight).saturating_mul(r as Weight))
+		(44_304_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((3_146_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(41_956_000 as Weight)
-			// Standard Error: 9_000
-			.saturating_add((3_460_000 as Weight).saturating_mul(r as Weight))
+		(44_314_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((3_474_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(42_002_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((4_591_000 as Weight).saturating_mul(r as Weight))
+		(44_234_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((4_725_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(27_646_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((7_821_000 as Weight).saturating_mul(r as Weight))
+		(28_754_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((7_898_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(27_615_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((11_807_000 as Weight).saturating_mul(r as Weight))
+		(28_737_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((8_531_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(27_106_000 as Weight)
-			// Standard Error: 78_000
-			.saturating_add((2_952_000 as Weight).saturating_mul(r as Weight))
+		(27_338_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((3_499_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(24_956_000 as Weight)
-			// Standard Error: 3_541_000
-			.saturating_add((2_332_414_000 as Weight).saturating_mul(r as Weight))
+		(25_943_000 as Weight)
+			// Standard Error: 299_000
+			.saturating_add((2_094_164_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(24_183_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((5_166_000 as Weight).saturating_mul(r as Weight))
+		(25_269_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((5_135_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(24_142_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((5_146_000 as Weight).saturating_mul(r as Weight))
+		(25_281_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((5_069_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(24_161_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((5_807_000 as Weight).saturating_mul(r as Weight))
+		(25_243_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((5_809_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(24_167_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((5_288_000 as Weight).saturating_mul(r as Weight))
+		(25_259_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((5_120_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(24_252_000 as Weight)
-			// Standard Error: 9_000
-			.saturating_add((5_091_000 as Weight).saturating_mul(r as Weight))
+		(25_249_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((5_167_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(24_243_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((5_076_000 as Weight).saturating_mul(r as Weight))
+		(25_247_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((5_118_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(24_227_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((5_135_000 as Weight).saturating_mul(r as Weight))
+		(25_285_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((5_051_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(24_278_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((7_124_000 as Weight).saturating_mul(r as Weight))
+		(25_312_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((7_207_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(24_254_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((7_067_000 as Weight).saturating_mul(r as Weight))
+		(25_311_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((6_982_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(24_220_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((7_122_000 as Weight).saturating_mul(r as Weight))
+		(25_327_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((7_009_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(24_221_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((7_221_000 as Weight).saturating_mul(r as Weight))
+		(25_318_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((7_180_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(24_259_000 as Weight)
+		(25_330_000 as Weight)
 			// Standard Error: 13_000
-			.saturating_add((7_135_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((7_065_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(24_245_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((7_193_000 as Weight).saturating_mul(r as Weight))
+		(25_284_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((7_192_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(24_289_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((7_023_000 as Weight).saturating_mul(r as Weight))
+		(25_310_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((7_080_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(24_239_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((7_065_000 as Weight).saturating_mul(r as Weight))
+		(25_262_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((7_079_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(24_256_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((7_119_000 as Weight).saturating_mul(r as Weight))
+		(25_295_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((7_151_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(24_240_000 as Weight)
+		(25_326_000 as Weight)
 			// Standard Error: 18_000
-			.saturating_add((7_225_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((7_200_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(24_266_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((6_996_000 as Weight).saturating_mul(r as Weight))
+		(25_320_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((7_020_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(24_265_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((6_974_000 as Weight).saturating_mul(r as Weight))
+		(25_303_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((7_189_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(24_232_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((7_103_000 as Weight).saturating_mul(r as Weight))
+		(25_311_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((7_054_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(24_245_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((12_915_000 as Weight).saturating_mul(r as Weight))
+		(25_342_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((12_860_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(24_177_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((12_232_000 as Weight).saturating_mul(r as Weight))
+		(25_307_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((12_162_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(24_171_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((12_939_000 as Weight).saturating_mul(r as Weight))
+		(25_354_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((12_855_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(24_788_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((11_657_000 as Weight).saturating_mul(r as Weight))
+		(25_319_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((11_982_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(24_252_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((7_003_000 as Weight).saturating_mul(r as Weight))
+		(25_351_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((7_124_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(24_263_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((7_005_000 as Weight).saturating_mul(r as Weight))
+		(25_333_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((7_060_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(24_239_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((7_020_000 as Weight).saturating_mul(r as Weight))
+		(25_332_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((7_080_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(24_212_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((7_172_000 as Weight).saturating_mul(r as Weight))
+		(25_279_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((7_193_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(24_220_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((7_246_000 as Weight).saturating_mul(r as Weight))
+		(25_315_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((7_157_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(24_213_000 as Weight)
+		(25_354_000 as Weight)
 			// Standard Error: 14_000
-			.saturating_add((7_191_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((7_238_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(24_221_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((7_192_000 as Weight).saturating_mul(r as Weight))
+		(25_353_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((7_160_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(24_235_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((7_106_000 as Weight).saturating_mul(r as Weight))
+		(25_363_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((7_192_000 as Weight).saturating_mul(r as Weight))
 	}
 }

From de2423492815fa60017fd7c2c14a490bcdba0441 Mon Sep 17 00:00:00 2001
From: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
Date: Fri, 7 May 2021 22:04:16 +0200
Subject: [PATCH 0719/1194] Relax `BoundedVec` trait restrictions (#8749)

* requiring users to maintain an unchecked invariant is unsafe

* relax trait restrictions on BoundedVec<T, S>

A normal `Vec<T>` can do many things without any particular trait
bounds on `T`. This commit relaxes the bounds on `BoundedVec<T, S>`
to give it similar capabilities.
---
 frame/support/src/lib.rs                      |   2 +-
 frame/support/src/storage/bounded_vec.rs      | 232 +++++++++++-------
 frame/support/src/storage/mod.rs              |   9 +-
 frame/support/src/storage/types/double_map.rs |   6 +-
 frame/support/src/storage/types/map.rs        |   4 +-
 frame/support/src/storage/types/value.rs      |   4 +-
 6 files changed, 149 insertions(+), 108 deletions(-)

diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 77163755ac56..7539c3c93829 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -1238,7 +1238,7 @@ pub mod pallet_prelude {
 		dispatch::{DispatchResultWithPostInfo, Parameter, DispatchError, DispatchResult},
 		weights::{DispatchClass, Pays, Weight},
 		storage::types::{StorageValue, StorageMap, StorageDoubleMap, ValueQuery, OptionQuery},
-		storage::bounded_vec::{BoundedVec, BoundedVecValue},
+		storage::bounded_vec::BoundedVec,
 	};
 	pub use codec::{Encode, Decode};
 	pub use crate::inherent::{InherentData, InherentIdentifier, ProvideInherent};
diff --git a/frame/support/src/storage/bounded_vec.rs b/frame/support/src/storage/bounded_vec.rs
index 8aecf2dc100b..6bb6ea541c33 100644
--- a/frame/support/src/storage/bounded_vec.rs
+++ b/frame/support/src/storage/bounded_vec.rs
@@ -19,18 +19,17 @@
 //! or a double map.
 
 use sp_std::prelude::*;
-use sp_std::{convert::TryFrom, marker::PhantomData};
+use sp_std::{convert::TryFrom, fmt, marker::PhantomData};
 use codec::{FullCodec, Encode, EncodeLike, Decode};
-use core::{ops::{Index, IndexMut}, slice::SliceIndex};
+use core::{
+	ops::{Deref, Index, IndexMut},
+	slice::SliceIndex,
+};
 use crate::{
 	traits::{Get, MaxEncodedLen},
 	storage::{generator, StorageDecodeLength, StorageValue, StorageMap, StorageDoubleMap},
 };
 
-/// Marker trait for types `T` that can be stored in storage as `BoundedVec<T, _>`.
-pub trait BoundedVecValue: FullCodec + Clone + sp_std::fmt::Debug {}
-impl<T: FullCodec + Clone + sp_std::fmt::Debug> BoundedVecValue for T {}
-
 /// A bounded vector.
 ///
 /// It has implementations for efficient append and length decoding, as with a normal `Vec<_>`, once
@@ -38,30 +37,55 @@ impl<T: FullCodec + Clone + sp_std::fmt::Debug> BoundedVecValue for T {}
 ///
 /// As the name suggests, the length of the queue is always bounded. All internal operations ensure
 /// this bound is respected.
-#[derive(Encode, Decode, crate::DefaultNoBound, crate::CloneNoBound, crate::DebugNoBound)]
-pub struct BoundedVec<T: BoundedVecValue, S: Get<u32>>(Vec<T>, PhantomData<S>);
+#[derive(Encode, Decode)]
+pub struct BoundedVec<T, S>(Vec<T>, PhantomData<S>);
 
-// NOTE: we could also implement this as:
-// impl<T: Value, S1: Get<u32>, S2: Get<u32>> PartialEq<BoundedVec<T, S2>> for BoundedVec<T, S1>
-// to allow comparison of bounded vectors with different bounds.
-impl<T: PartialEq + BoundedVecValue, S: Get<u32>> PartialEq for BoundedVec<T, S> {
-	fn eq(&self, rhs: &Self) -> bool {
-		self.0 == rhs.0
+impl<T, S> BoundedVec<T, S> {
+	/// Create `Self` from `t` without any checks.
+	unsafe fn unchecked_from(t: Vec<T>) -> Self {
+		Self(t, Default::default())
+	}
+
+	/// Consume self, and return the inner `Vec`. Henceforth, the `Vec<_>` can be altered in an
+	/// arbitrary way. At some point, if the reverse conversion is required, `TryFrom<Vec<_>>` can
+	/// be used.
+	///
+	/// This is useful for cases if you need access to an internal API of the inner `Vec<_>` which
+	/// is not provided by the wrapper `BoundedVec`.
+	pub fn into_inner(self) -> Vec<T> {
+		self.0
+	}
+
+	/// Exactly the same semantics as [`Vec::remove`].
+	///
+	/// # Panics
+	///
+	/// Panics if `index` is out of bounds.
+	pub fn remove(&mut self, index: usize) {
+		self.0.remove(index);
+	}
+
+	/// Exactly the same semantics as [`Vec::swap_remove`].
+	///
+	/// # Panics
+	///
+	/// Panics if `index` is out of bounds.
+	pub fn swap_remove(&mut self, index: usize) {
+		self.0.swap_remove(index);
+	}
+
+	/// Exactly the same semantics as [`Vec::retain`].
+	pub fn retain<F: FnMut(&T) -> bool>(&mut self, f: F) {
+		self.0.retain(f)
 	}
 }
-impl<T: Eq + PartialEq + BoundedVecValue, S: Get<u32>> Eq for BoundedVec<T, S> {}
 
-impl<T: BoundedVecValue, S: Get<u32>> BoundedVec<T, S> {
+impl<T, S: Get<u32>> BoundedVec<T, S> {
 	/// Get the bound of the type in `usize`.
 	pub fn bound() -> usize {
 		S::get() as usize
 	}
 
-	/// Create `Self` from `t` without any checks.
-	unsafe fn unchecked_from(t: Vec<T>) -> Self {
-		Self(t, Default::default())
-	}
-
 	/// Create `Self` from `t` without any checks. Logs warnings if the bound is not being
 	/// respected. The additional scope can be used to indicate where a potential overflow is
 	/// happening.
@@ -77,17 +101,6 @@ impl<T: BoundedVecValue, S: Get<u32>> BoundedVec<T, S> {
 		Self::unchecked_from(t)
 	}
 
-	/// Consume self, and return the inner `Vec`. Henceforth, the `Vec<_>` can be altered in an
-	/// arbitrary way. At some point, if the reverse conversion is required, `TryFrom<Vec<_>>` can
-	/// be used.
-	///
-	/// This is useful for cases if you need access to an internal API of the inner `Vec<_>` which
-	/// is not provided by the wrapper `BoundedVec`.
-	pub fn into_inner(self) -> Vec<T> {
-		debug_assert!(self.0.len() <= Self::bound());
-		self.0
-	}
-
 	/// Consumes self and mutates self via the given `mutate` function.
 	///
 	/// If the outcome of mutation is within bounds, `Some(Self)` is returned. Else, `None` is
@@ -129,37 +142,42 @@ impl<T: BoundedVecValue, S: Get<u32>> BoundedVec<T, S> {
 			Err(())
 		}
 	}
+}
 
-	/// Exactly the same semantics as [`Vec::remove`].
-	///
-	/// # Panics
-	///
-	/// Panics if `index` is out of bounds.
-	pub fn remove(&mut self, index: usize) {
-		self.0.remove(index);
+impl<T, S> Default for BoundedVec<T, S> {
+	fn default() -> Self {
+		// the bound cannot be below 0, which is satisfied by an empty vector
+		unsafe { Self::unchecked_from(Vec::default()) }
 	}
+}
 
-	/// Exactly the same semantics as [`Vec::swap_remove`].
-	///
-	/// # Panics
-	///
-	/// Panics if `index` is out of bounds.
-	pub fn swap_remove(&mut self, index: usize) {
-		self.0.swap_remove(index);
+#[cfg(feature = "std")]
+impl<T, S> fmt::Debug for BoundedVec<T, S>
+where
+	T: fmt::Debug,
+	S: Get<u32>,
+{
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		f.debug_tuple("BoundedVec").field(&self.0).field(&Self::bound()).finish()
 	}
+}
 
-	/// Exactly the same semantics as [`Vec::retain`].
-	pub fn retain<F: FnMut(&T) -> bool>(&mut self, f: F) {
-		self.0.retain(f)
+impl<T, S> Clone for BoundedVec<T, S>
+where
+	T: Clone,
+{
+	fn clone(&self) -> Self {
+		// bound is retained
+		unsafe { Self::unchecked_from(self.0.clone()) }
 	}
 }
 
-impl<T: BoundedVecValue, S: Get<u32>> TryFrom<Vec<T>> for BoundedVec<T, S> {
+impl<T, S: Get<u32>> TryFrom<Vec<T>> for BoundedVec<T, S> {
 	type Error = ();
 	fn try_from(t: Vec<T>) -> Result<Self, Self::Error> {
 		if t.len() <= Self::bound() {
 			// explicit check just above
-			Ok(unsafe {Self::unchecked_from(t)})
+			Ok(unsafe { Self::unchecked_from(t) })
 		} else {
 			Err(())
 		}
@@ -167,26 +185,26 @@ impl<T: BoundedVecValue, S: Get<u32>> TryFrom<Vec<T>> for BoundedVec<T, S> {
 }
 
 // It is okay to give a non-mutable reference of the inner vec to anyone.
-impl<T: BoundedVecValue, S: Get<u32>> AsRef<Vec<T>> for BoundedVec<T, S> {
+impl<T, S> AsRef<Vec<T>> for BoundedVec<T, S> {
 	fn as_ref(&self) -> &Vec<T> {
 		&self.0
 	}
 }
 
-impl<T: BoundedVecValue, S: Get<u32>> AsRef<[T]> for BoundedVec<T, S> {
+impl<T, S> AsRef<[T]> for BoundedVec<T, S> {
 	fn as_ref(&self) -> &[T] {
 		&self.0
 	}
 }
 
-impl<T: BoundedVecValue, S: Get<u32>> AsMut<[T]> for BoundedVec<T, S> {
+impl<T, S> AsMut<[T]> for BoundedVec<T, S> {
 	fn as_mut(&mut self) -> &mut [T] {
 		&mut self.0
 	}
 }
 
 // will allow for immutable all operations of `Vec<T>` on `BoundedVec<T>`.
-impl<T: BoundedVecValue, S: Get<u32>> sp_std::ops::Deref for BoundedVec<T, S> {
+impl<T, S> Deref for BoundedVec<T, S> {
 	type Target = Vec<T>;
 
 	fn deref(&self) -> &Self::Target {
@@ -195,7 +213,10 @@ impl<T: BoundedVecValue, S: Get<u32>> sp_std::ops::Deref for BoundedVec<T, S> {
 }
 
 // Allows for indexing similar to a normal `Vec`. Can panic if out of bound.
-impl<T: BoundedVecValue, S: Get<u32>, I: SliceIndex<[T]>> Index<I> for BoundedVec<T, S> {
+impl<T, S, I> Index<I> for BoundedVec<T, S>
+where
+	I: SliceIndex<[T]>,
+{
 	type Output = I::Output;
 
 	#[inline]
@@ -204,14 +225,17 @@ impl<T: BoundedVecValue, S: Get<u32>, I: SliceIndex<[T]>> Index<I> for BoundedVe
 	}
 }
 
-impl<T: BoundedVecValue, S: Get<u32>, I: SliceIndex<[T]>> IndexMut<I> for BoundedVec<T, S> {
+impl<T, S, I> IndexMut<I> for BoundedVec<T, S>
+where
+	I: SliceIndex<[T]>,
+{
 	#[inline]
 	fn index_mut(&mut self, index: I) -> &mut Self::Output {
 		self.0.index_mut(index)
 	}
 }
 
-impl<T: BoundedVecValue, S: Get<u32>> sp_std::iter::IntoIterator for BoundedVec<T, S> {
+impl<T, S> sp_std::iter::IntoIterator for BoundedVec<T, S> {
 	type Item = T;
 	type IntoIter = sp_std::vec::IntoIter<T>;
 	fn into_iter(self) -> Self::IntoIter {
@@ -219,7 +243,7 @@ impl<T: BoundedVecValue, S: Get<u32>> sp_std::iter::IntoIterator for BoundedVec<
 	}
 }
 
-impl<T: BoundedVecValue, S: Get<u32>> codec::DecodeLength for BoundedVec<T, S> {
+impl<T, S> codec::DecodeLength for BoundedVec<T, S> {
 	fn len(self_encoded: &[u8]) -> Result<usize, codec::Error> {
 		// `BoundedVec<T, _>` stored just a `Vec<T>`, thus the length is at the beginning in
 		// `Compact` form, and same implementation as `Vec<T>` can be used.
@@ -227,16 +251,30 @@ impl<T: BoundedVecValue, S: Get<u32>> codec::DecodeLength for BoundedVec<T, S> {
 	}
 }
 
-impl<T: BoundedVecValue + PartialEq, S: Get<u32>> PartialEq<Vec<T>> for BoundedVec<T, S> {
+// NOTE: we could also implement this as:
+// impl<T: Value, S1: Get<u32>, S2: Get<u32>> PartialEq<BoundedVec<T, S2>> for BoundedVec<T, S1>
+// to allow comparison of bounded vectors with different bounds.
+impl<T, S> PartialEq for BoundedVec<T, S>
+where
+	T: PartialEq,
+{
+	fn eq(&self, rhs: &Self) -> bool {
+		self.0 == rhs.0
+	}
+}
+
+impl<T: PartialEq, S: Get<u32>> PartialEq<Vec<T>> for BoundedVec<T, S> {
 	fn eq(&self, other: &Vec<T>) -> bool {
 		&self.0 == other
 	}
 }
 
-impl<T: BoundedVecValue, S: Get<u32>> StorageDecodeLength for BoundedVec<T, S> {}
+impl<T, S> Eq for BoundedVec<T, S> where T: Eq {}
+
+impl<T, S> StorageDecodeLength for BoundedVec<T, S> {}
 
 /// Storage value that is *maybe* capable of [`StorageAppend`](crate::storage::StorageAppend).
-pub trait TryAppendValue<T: BoundedVecValue, S: Get<u32>> {
+pub trait TryAppendValue<T: Encode, S: Get<u32>> {
 	/// Try and append the `item` into the storage item.
 	///
 	/// This might fail if bounds are not respected.
@@ -244,7 +282,7 @@ pub trait TryAppendValue<T: BoundedVecValue, S: Get<u32>> {
 }
 
 /// Storage map that is *maybe* capable of [`StorageAppend`](crate::storage::StorageAppend).
-pub trait TryAppendMap<K: FullCodec, T: BoundedVecValue, S: Get<u32>> {
+pub trait TryAppendMap<K: FullCodec, T: Encode, S: Get<u32>> {
 	/// Try and append the `item` into the storage map at the given `key`.
 	///
 	/// This might fail if bounds are not respected.
@@ -255,7 +293,7 @@ pub trait TryAppendMap<K: FullCodec, T: BoundedVecValue, S: Get<u32>> {
 }
 
 /// Storage double map that is *maybe* capable of [`StorageAppend`](crate::storage::StorageAppend).
-pub trait TryAppendDoubleMap<K1: FullCodec, K2: FullCodec, T: BoundedVecValue, S: Get<u32>> {
+pub trait TryAppendDoubleMap<K1: FullCodec, K2: FullCodec, T: Encode, S: Get<u32>> {
 	/// Try and append the `item` into the storage double map at the given `key`.
 	///
 	/// This might fail if bounds are not respected.
@@ -270,8 +308,12 @@ pub trait TryAppendDoubleMap<K1: FullCodec, K2: FullCodec, T: BoundedVecValue, S
 	) -> Result<(), ()>;
 }
 
-impl<T: BoundedVecValue, S: Get<u32>, StorageValueT: generator::StorageValue<BoundedVec<T, S>>>
-	TryAppendValue<T, S> for StorageValueT
+impl<T, S, StorageValueT> TryAppendValue<T, S> for StorageValueT
+where
+	BoundedVec<T, S>: FullCodec,
+	T: Encode,
+	S: Get<u32>,
+	StorageValueT: generator::StorageValue<BoundedVec<T, S>>,
 {
 	fn try_append<LikeT: EncodeLike<T>>(item: LikeT) -> Result<(), ()> {
 		let bound = BoundedVec::<T, S>::bound();
@@ -288,12 +330,13 @@ impl<T: BoundedVecValue, S: Get<u32>, StorageValueT: generator::StorageValue<Bou
 	}
 }
 
-impl<
-		K: FullCodec,
-		T: BoundedVecValue,
-		S: Get<u32>,
-		StorageMapT: generator::StorageMap<K, BoundedVec<T, S>>,
-	> TryAppendMap<K, T, S> for StorageMapT
+impl<K, T, S, StorageMapT> TryAppendMap<K, T, S> for StorageMapT
+where
+	K: FullCodec,
+	BoundedVec<T, S>: FullCodec,
+	T: Encode,
+	S: Get<u32>,
+	StorageMapT: generator::StorageMap<K, BoundedVec<T, S>>,
 {
 	fn try_append<LikeK: EncodeLike<K> + Clone, LikeT: EncodeLike<T>>(
 		key: LikeK,
@@ -311,13 +354,14 @@ impl<
 	}
 }
 
-impl<
-		K1: FullCodec,
-		K2: FullCodec,
-		T: BoundedVecValue,
-		S: Get<u32>,
-		StorageDoubleMapT: generator::StorageDoubleMap<K1, K2, BoundedVec<T, S>>,
-	> TryAppendDoubleMap<K1, K2, T, S> for StorageDoubleMapT
+impl<K1, K2, T, S, StorageDoubleMapT> TryAppendDoubleMap<K1, K2, T, S> for StorageDoubleMapT
+where
+	K1: FullCodec,
+	K2: FullCodec,
+	BoundedVec<T, S>: FullCodec,
+	T: Encode,
+	S: Get<u32>,
+	StorageDoubleMapT: generator::StorageDoubleMap<K1, K2, BoundedVec<T, S>>,
 {
 	fn try_append<
 		LikeK1: EncodeLike<K1> + Clone,
@@ -342,7 +386,7 @@ impl<
 
 impl<T, S> MaxEncodedLen for BoundedVec<T, S>
 where
-	T: BoundedVecValue + MaxEncodedLen,
+	T: MaxEncodedLen,
 	S: Get<u32>,
 	BoundedVec<T, S>: Encode,
 {
@@ -350,7 +394,8 @@ where
 		// BoundedVec<T, S> encodes like Vec<T> which encodes like [T], which is a compact u32
 		// plus each item in the slice:
 		// https://substrate.dev/rustdocs/v3.0.0/src/parity_scale_codec/codec.rs.html#798-808
-		codec::Compact(S::get()).encoded_size()
+		codec::Compact(S::get())
+			.encoded_size()
 			.saturating_add(Self::bound().saturating_mul(T::max_encoded_len()))
 	}
 }
@@ -427,12 +472,13 @@ pub mod test {
 			// append to a non-existing
 			assert!(FooMap::get(2).is_none());
 			assert_ok!(FooMap::try_append(2, 4));
-			assert_eq!(FooMap::get(2).unwrap(), unsafe {BoundedVec::<u32, Seven>::unchecked_from(vec![4])});
+			assert_eq!(FooMap::get(2).unwrap(), unsafe {
+				BoundedVec::<u32, Seven>::unchecked_from(vec![4])
+			});
 			assert_ok!(FooMap::try_append(2, 5));
-			assert_eq!(
-				FooMap::get(2).unwrap(),
-				unsafe {BoundedVec::<u32, Seven>::unchecked_from(vec![4, 5])}
-			);
+			assert_eq!(FooMap::get(2).unwrap(), unsafe {
+				BoundedVec::<u32, Seven>::unchecked_from(vec![4, 5])
+			});
 		});
 
 		TestExternalities::default().execute_with(|| {
@@ -449,15 +495,13 @@ pub mod test {
 			// append to a non-existing
 			assert!(FooDoubleMap::get(2, 1).is_none());
 			assert_ok!(FooDoubleMap::try_append(2, 1, 4));
-			assert_eq!(
-				FooDoubleMap::get(2, 1).unwrap(),
-				unsafe {BoundedVec::<u32, Seven>::unchecked_from(vec![4])}
-			);
+			assert_eq!(FooDoubleMap::get(2, 1).unwrap(), unsafe {
+				BoundedVec::<u32, Seven>::unchecked_from(vec![4])
+			});
 			assert_ok!(FooDoubleMap::try_append(2, 1, 5));
-			assert_eq!(
-				FooDoubleMap::get(2, 1).unwrap(),
-				unsafe {BoundedVec::<u32, Seven>::unchecked_from(vec![4, 5])}
-			);
+			assert_eq!(FooDoubleMap::get(2, 1).unwrap(), unsafe {
+				BoundedVec::<u32, Seven>::unchecked_from(vec![4, 5])
+			});
 		});
 	}
 
diff --git a/frame/support/src/storage/mod.rs b/frame/support/src/storage/mod.rs
index 1eed6f0c4a7f..8abe4048615d 100644
--- a/frame/support/src/storage/mod.rs
+++ b/frame/support/src/storage/mod.rs
@@ -20,10 +20,7 @@
 use sp_core::storage::ChildInfo;
 use sp_std::prelude::*;
 use codec::{FullCodec, FullEncode, Encode, EncodeLike, Decode};
-use crate::{
-	hash::{Twox128, StorageHasher, ReversibleStorageHasher},
-	traits::Get,
-};
+use crate::hash::{Twox128, StorageHasher, ReversibleStorageHasher};
 use sp_runtime::generic::{Digest, DigestItem};
 pub use sp_runtime::TransactionOutcome;
 
@@ -811,13 +808,13 @@ pub trait StorageDecodeLength: private::Sealed + codec::DecodeLength {
 /// outside of this crate.
 mod private {
 	use super::*;
-	use bounded_vec::{BoundedVecValue, BoundedVec};
+	use bounded_vec::BoundedVec;
 
 	pub trait Sealed {}
 
 	impl<T: Encode> Sealed for Vec<T> {}
 	impl<Hash: Encode> Sealed for Digest<Hash> {}
-	impl<T: BoundedVecValue, S: Get<u32>> Sealed for BoundedVec<T, S> {}
+	impl<T, S> Sealed for BoundedVec<T, S> {}
 	impl<K, V, S> Sealed for bounded_btree_map::BoundedBTreeMap<K, V, S> {}
 }
 
diff --git a/frame/support/src/storage/types/double_map.rs b/frame/support/src/storage/types/double_map.rs
index 184d96b3a54f..70b0c19f7624 100644
--- a/frame/support/src/storage/types/double_map.rs
+++ b/frame/support/src/storage/types/double_map.rs
@@ -18,11 +18,11 @@
 //! Storage map type. Implements StorageDoubleMap, StorageIterableDoubleMap,
 //! StoragePrefixedDoubleMap traits and their methods directly.
 
-use codec::{FullCodec, Decode, EncodeLike, Encode};
+use codec::{Decode, Encode, EncodeLike, FullCodec};
 use crate::{
 	storage::{
 		StorageAppend, StorageDecodeLength,
-		bounded_vec::{BoundedVec, BoundedVecValue},
+		bounded_vec::BoundedVec,
 		types::{OptionQuery, QueryKindTrait, OnEmptyGetter},
 	},
 	traits::{GetDefault, StorageInstance, Get},
@@ -121,7 +121,7 @@ impl<Prefix, Hasher1, Key1, Hasher2, Key2, QueryKind, OnEmpty, VecValue, VecBoun
 	Key2: FullCodec,
 	QueryKind: QueryKindTrait<BoundedVec<VecValue, VecBound>, OnEmpty>,
 	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
-	VecValue: BoundedVecValue,
+	VecValue: FullCodec,
 	VecBound: Get<u32>,
 {
 	/// Try and append the given item to the double map in the storage.
diff --git a/frame/support/src/storage/types/map.rs b/frame/support/src/storage/types/map.rs
index 187323b4ad1e..b9c3044f93f0 100644
--- a/frame/support/src/storage/types/map.rs
+++ b/frame/support/src/storage/types/map.rs
@@ -22,7 +22,7 @@ use codec::{FullCodec, Decode, EncodeLike, Encode};
 use crate::{
 	storage::{
 		StorageAppend, StorageDecodeLength,
-		bounded_vec::{BoundedVec, BoundedVecValue},
+		bounded_vec::BoundedVec,
 		types::{OptionQuery, QueryKindTrait, OnEmptyGetter},
 	},
 	traits::{GetDefault, StorageInstance, Get},
@@ -100,7 +100,7 @@ where
 	Key: FullCodec,
 	QueryKind: QueryKindTrait<BoundedVec<VecValue, VecBound>, OnEmpty>,
 	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
-	VecValue: BoundedVecValue,
+	VecValue: FullCodec,
 	VecBound: Get<u32>,
 {
 	/// Try and append the given item to the map in the storage.
diff --git a/frame/support/src/storage/types/value.rs b/frame/support/src/storage/types/value.rs
index d536d76d76b8..6a92a2a632c7 100644
--- a/frame/support/src/storage/types/value.rs
+++ b/frame/support/src/storage/types/value.rs
@@ -21,7 +21,7 @@ use codec::{FullCodec, Decode, EncodeLike, Encode};
 use crate::{
 	storage::{
 		StorageAppend, StorageDecodeLength,
-		bounded_vec::{BoundedVec, BoundedVecValue},
+		bounded_vec::BoundedVec,
 		types::{OptionQuery, QueryKindTrait, OnEmptyGetter},
 	},
 	traits::{GetDefault, StorageInstance, Get},
@@ -67,7 +67,7 @@ where
 	Prefix: StorageInstance,
 	QueryKind: QueryKindTrait<BoundedVec<VecValue, VecBound>, OnEmpty>,
 	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
-	VecValue: BoundedVecValue,
+	VecValue: FullCodec,
 	VecBound: Get<u32>,
 {
 	/// Try and append the given item to the value in the storage.

From d47d16207b6aa6f4682e056953d114eebc2ffbf6 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Sat, 8 May 2021 04:39:06 -0400
Subject: [PATCH 0720/1194] fix spelling (#8760)

---
 frame/collective/src/lib.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frame/collective/src/lib.rs b/frame/collective/src/lib.rs
index 6284617e89bd..76e410697823 100644
--- a/frame/collective/src/lib.rs
+++ b/frame/collective/src/lib.rs
@@ -24,9 +24,9 @@
 //! calculations, but enforces this neither in `set_members` nor in `change_members_sorted`.
 //!
 //! A "prime" member may be set to help determine the default vote behavior based on chain
-//! config. If `PreimDefaultVote` is used, the prime vote acts as the default vote in case of any
+//! config. If `PrimeDefaultVote` is used, the prime vote acts as the default vote in case of any
 //! abstentions after the voting period. If `MoreThanMajorityThenPrimeDefaultVote` is used, then
-//! abstentations will first follow the majority of the collective voting, and then the prime
+//! abstentions will first follow the majority of the collective voting, and then the prime
 //! member.
 //!
 //! Voting happens through motions comprising a proposal (i.e. a curried dispatchable) plus a
@@ -105,7 +105,7 @@ impl DefaultVote for PrimeDefaultVote {
 }
 
 /// First see if yes vote are over majority of the whole collective. If so, set the default vote
-/// as yes. Otherwise, use the prime meber's vote as the default vote.
+/// as yes. Otherwise, use the prime member's vote as the default vote.
 pub struct MoreThanMajorityThenPrimeDefaultVote;
 
 impl DefaultVote for MoreThanMajorityThenPrimeDefaultVote {

From aef7eb593be1c43bf539ebfc1ac5e385d1dd1d6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Sun, 9 May 2021 21:17:42 +0200
Subject: [PATCH 0721/1194] Remove unneeded trait bounds (#8765)

Before we required these trait bounds because of some bug in rustc, but
now as this bug is fixed they can be removed.
---
 .../api/proc-macro/src/impl_runtime_apis.rs   | 23 ++-----------------
 .../runtime/client/src/block_builder_ext.rs   |  4 ----
 test-utils/runtime/client/src/lib.rs          |  3 ---
 test-utils/runtime/client/src/trait_tests.rs  | 14 +++--------
 4 files changed, 5 insertions(+), 39 deletions(-)

diff --git a/primitives/api/proc-macro/src/impl_runtime_apis.rs b/primitives/api/proc-macro/src/impl_runtime_apis.rs
index 642da2c465e6..85ba0788105d 100644
--- a/primitives/api/proc-macro/src/impl_runtime_apis.rs
+++ b/primitives/api/proc-macro/src/impl_runtime_apis.rs
@@ -202,11 +202,7 @@ fn generate_runtime_api_base_structures() -> Result<TokenStream> {
 		pub struct RuntimeApi {}
 		/// Implements all runtime apis for the client side.
 		#[cfg(any(feature = "std", test))]
-		pub struct RuntimeApiImpl<Block: #crate_::BlockT, C: #crate_::CallApiAt<Block> + 'static>
-			where
-				// Rust bug: https://github.com/rust-lang/rust/issues/24159
-				C::StateBackend: #crate_::StateBackend<#crate_::HashFor<Block>>,
-		{
+		pub struct RuntimeApiImpl<Block: #crate_::BlockT, C: #crate_::CallApiAt<Block> + 'static> {
 			call: &'static C,
 			commit_on_success: std::cell::RefCell<bool>,
 			initialized_block: std::cell::RefCell<Option<#crate_::BlockId<Block>>>,
@@ -223,25 +219,16 @@ fn generate_runtime_api_base_structures() -> Result<TokenStream> {
 		#[cfg(any(feature = "std", test))]
 		unsafe impl<Block: #crate_::BlockT, C: #crate_::CallApiAt<Block>> Send
 			for RuntimeApiImpl<Block, C>
-				where
-					// Rust bug: https://github.com/rust-lang/rust/issues/24159
-					C::StateBackend: #crate_::StateBackend<#crate_::HashFor<Block>>,
 		{}
 
 		#[cfg(any(feature = "std", test))]
 		unsafe impl<Block: #crate_::BlockT, C: #crate_::CallApiAt<Block>> Sync
 			for RuntimeApiImpl<Block, C>
-				where
-					// Rust bug: https://github.com/rust-lang/rust/issues/24159
-					C::StateBackend: #crate_::StateBackend<#crate_::HashFor<Block>>,
 		{}
 
 		#[cfg(any(feature = "std", test))]
 		impl<Block: #crate_::BlockT, C: #crate_::CallApiAt<Block>> #crate_::ApiExt<Block> for
 			RuntimeApiImpl<Block, C>
-				where
-					// Rust bug: https://github.com/rust-lang/rust/issues/24159
-					C::StateBackend: #crate_::StateBackend<#crate_::HashFor<Block>>,
 		{
 			type StateBackend = C::StateBackend;
 
@@ -319,8 +306,6 @@ fn generate_runtime_api_base_structures() -> Result<TokenStream> {
 			for RuntimeApi
 				where
 					C: #crate_::CallApiAt<Block> + 'static,
-					// Rust bug: https://github.com/rust-lang/rust/issues/24159
-					C::StateBackend: #crate_::StateBackend<#crate_::HashFor<Block>>,
 		{
 			type RuntimeApi = RuntimeApiImpl<Block, C>;
 
@@ -339,11 +324,7 @@ fn generate_runtime_api_base_structures() -> Result<TokenStream> {
 		}
 
 		#[cfg(any(feature = "std", test))]
-		impl<Block: #crate_::BlockT, C: #crate_::CallApiAt<Block>> RuntimeApiImpl<Block, C>
-			where
-				// Rust bug: https://github.com/rust-lang/rust/issues/24159
-				C::StateBackend: #crate_::StateBackend<#crate_::HashFor<Block>>,
-		{
+		impl<Block: #crate_::BlockT, C: #crate_::CallApiAt<Block>> RuntimeApiImpl<Block, C> {
 			fn call_api_at<
 				R: #crate_::Encode + #crate_::Decode + PartialEq,
 				F: FnOnce(
diff --git a/test-utils/runtime/client/src/block_builder_ext.rs b/test-utils/runtime/client/src/block_builder_ext.rs
index bb0f2d400bfc..0d3211fa05a9 100644
--- a/test-utils/runtime/client/src/block_builder_ext.rs
+++ b/test-utils/runtime/client/src/block_builder_ext.rs
@@ -20,7 +20,6 @@
 use sp_api::{ApiExt, ProvideRuntimeApi};
 use sp_core::ChangesTrieConfiguration;
 use sc_client_api::backend;
-use sp_runtime::traits::HashFor;
 
 use sc_block_builder::BlockBuilderApi;
 
@@ -49,9 +48,6 @@ impl<'a, A, B> BlockBuilderExt for sc_block_builder::BlockBuilder<'a, substrate_
 			StateBackend = backend::StateBackendFor<B, substrate_test_runtime::Block>
 		>,
 	B: backend::Backend<substrate_test_runtime::Block>,
-	// Rust bug: https://github.com/rust-lang/rust/issues/24159
-	backend::StateBackendFor<B, substrate_test_runtime::Block>:
-		sp_api::StateBackend<HashFor<substrate_test_runtime::Block>>,
 {
 	fn push_transfer(&mut self, transfer: substrate_test_runtime::Transfer) -> Result<(), sp_blockchain::Error> {
 		self.push(transfer.into_signed_tx())
diff --git a/test-utils/runtime/client/src/lib.rs b/test-utils/runtime/client/src/lib.rs
index c8d11c9b6222..5a66cde62e56 100644
--- a/test-utils/runtime/client/src/lib.rs
+++ b/test-utils/runtime/client/src/lib.rs
@@ -249,9 +249,6 @@ impl<B> TestClientBuilderExt<B> for TestClientBuilder<
 	B
 > where
 	B: sc_client_api::backend::Backend<substrate_test_runtime::Block> + 'static,
-	// Rust bug: https://github.com/rust-lang/rust/issues/24159
-	<B as sc_client_api::backend::Backend<substrate_test_runtime::Block>>::State:
-		sp_api::StateBackend<HashFor<substrate_test_runtime::Block>>,
 {
 	fn genesis_init_mut(&mut self) -> &mut GenesisParameters {
 		Self::genesis_init_mut(self)
diff --git a/test-utils/runtime/client/src/trait_tests.rs b/test-utils/runtime/client/src/trait_tests.rs
index 32d94dd618a7..797c7ec089bd 100644
--- a/test-utils/runtime/client/src/trait_tests.rs
+++ b/test-utils/runtime/client/src/trait_tests.rs
@@ -30,16 +30,13 @@ use sc_client_api::blockchain::{Backend as BlockChainBackendT, HeaderBackend};
 use sp_consensus::BlockOrigin;
 use substrate_test_runtime::{self, Transfer};
 use sp_runtime::generic::BlockId;
-use sp_runtime::traits::{Block as BlockT, HashFor};
+use sp_runtime::traits::Block as BlockT;
 use sc_block_builder::BlockBuilderProvider;
 use futures::executor::block_on;
 
 /// helper to test the `leaves` implementation for various backends
 pub fn test_leaves_for_backend<B: 'static>(backend: Arc<B>) where
 	B: backend::Backend<substrate_test_runtime::Block>,
-	// Rust bug: https://github.com/rust-lang/rust/issues/24159
-	backend::StateBackendFor<B, substrate_test_runtime::Block>:
-		sp_api::StateBackend<HashFor<substrate_test_runtime::Block>>,
 {
 	// block tree:
 	// G -> A1 -> A2 -> A3 -> A4 -> A5
@@ -206,9 +203,6 @@ pub fn test_leaves_for_backend<B: 'static>(backend: Arc<B>) where
 /// helper to test the `children` implementation for various backends
 pub fn test_children_for_backend<B: 'static>(backend: Arc<B>) where
 	B: backend::LocalBackend<substrate_test_runtime::Block>,
-	// Rust bug: https://github.com/rust-lang/rust/issues/24159
-	<B as backend::Backend<substrate_test_runtime::Block>>::State:
-		sp_api::StateBackend<HashFor<substrate_test_runtime::Block>>,
 {
 	// block tree:
 	// G -> A1 -> A2 -> A3 -> A4 -> A5
@@ -334,11 +328,9 @@ pub fn test_children_for_backend<B: 'static>(backend: Arc<B>) where
 	assert_eq!(vec![b3.hash(), c3.hash()], children4);
 }
 
-pub fn test_blockchain_query_by_number_gets_canonical<B: 'static>(backend: Arc<B>) where
+pub fn test_blockchain_query_by_number_gets_canonical<B: 'static>(backend: Arc<B>)
+where
 	B: backend::LocalBackend<substrate_test_runtime::Block>,
-	// Rust bug: https://github.com/rust-lang/rust/issues/24159
-	<B as backend::Backend<substrate_test_runtime::Block>>::State:
-		sp_api::StateBackend<HashFor<substrate_test_runtime::Block>>,
 {
 	// block tree:
 	// G -> A1 -> A2 -> A3 -> A4 -> A5

From 0aad5b8a42f05e7d302d9342ccc9df6d0fb3f677 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Sun, 9 May 2021 21:37:41 +0200
Subject: [PATCH 0722/1194] Two bugfixes to authority-discovery (#8768)

---
 client/authority-discovery/src/worker/addr_cache.rs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/client/authority-discovery/src/worker/addr_cache.rs b/client/authority-discovery/src/worker/addr_cache.rs
index 7cefff1aaff0..c9b0711803ba 100644
--- a/client/authority-discovery/src/worker/addr_cache.rs
+++ b/client/authority-discovery/src/worker/addr_cache.rs
@@ -42,10 +42,6 @@ impl AddrCache {
 	/// Inserts the given [`AuthorityId`] and [`Vec<Multiaddr>`] pair for future lookups by
 	/// [`AuthorityId`] or [`PeerId`].
 	pub fn insert(&mut self, authority_id: AuthorityId, mut addresses: Vec<Multiaddr>) {
-		if addresses.is_empty() {
-			return;
-		}
-
 		addresses.sort_unstable_by(|a, b| a.as_ref().cmp(b.as_ref()));
 
 		// Insert into `self.peer_id_to_authority_id`.
@@ -80,8 +76,7 @@ impl AddrCache {
 			};
 
 			if !peer_ids.clone().any(|p| p == peer_id) {
-				let _old_auth = self.peer_id_to_authority_id.remove(&peer_id);
-				debug_assert!(_old_auth.is_some());
+				self.peer_id_to_authority_id.remove(&peer_id);
 			}
 		}
 	}

From 92a7a12bd8c813a41e6532dfe17adc75cdb8027d Mon Sep 17 00:00:00 2001
From: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
Date: Mon, 10 May 2021 09:49:45 +0200
Subject: [PATCH 0723/1194] Add `BoundedBTreeSet` (#8750)

* Add `BoundedBTreeSet`

Part of https://github.com/paritytech/substrate/issues/8719

* fix copy-pasta errors

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
---
 .../support/src/storage/bounded_btree_set.rs  | 407 ++++++++++++++++++
 frame/support/src/storage/mod.rs              |   2 +
 2 files changed, 409 insertions(+)
 create mode 100644 frame/support/src/storage/bounded_btree_set.rs

diff --git a/frame/support/src/storage/bounded_btree_set.rs b/frame/support/src/storage/bounded_btree_set.rs
new file mode 100644
index 000000000000..586ecca4c85e
--- /dev/null
+++ b/frame/support/src/storage/bounded_btree_set.rs
@@ -0,0 +1,407 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Traits, types and structs to support a bounded `BTreeSet`.
+
+use sp_std::{
+	borrow::Borrow, collections::btree_set::BTreeSet, convert::TryFrom, fmt, marker::PhantomData,
+	ops::Deref,
+};
+use crate::{
+	storage::StorageDecodeLength,
+	traits::{Get, MaxEncodedLen},
+};
+use codec::{Encode, Decode};
+
+/// A bounded set based on a B-Tree.
+///
+/// B-Trees represent a fundamental compromise between cache-efficiency and actually minimizing
+/// the amount of work performed in a search. See [`BTreeSet`] for more details.
+///
+/// Unlike a standard `BTreeSet`, there is a static, enforced upper limit to the number of items
+/// in the set. All internal operations ensure this bound is respected.
+#[derive(Encode, Decode)]
+pub struct BoundedBTreeSet<T, S>(BTreeSet<T>, PhantomData<S>);
+
+impl<T, S> BoundedBTreeSet<T, S>
+where
+	S: Get<u32>,
+{
+	/// Get the bound of the type in `usize`.
+	pub fn bound() -> usize {
+		S::get() as usize
+	}
+}
+
+impl<T, S> BoundedBTreeSet<T, S>
+where
+	T: Ord,
+	S: Get<u32>,
+{
+	/// Create a new `BoundedBTreeSet`.
+	///
+	/// Does not allocate.
+	pub fn new() -> Self {
+		BoundedBTreeSet(BTreeSet::new(), PhantomData)
+	}
+
+	/// Create `Self` from a primitive `BTreeSet` without any checks.
+	unsafe fn unchecked_from(set: BTreeSet<T>) -> Self {
+		Self(set, Default::default())
+	}
+
+	/// Create `Self` from a primitive `BTreeSet` without any checks.
+	///
+	/// Logs warnings if the bound is not being respected. The scope is mentioned in the log message
+	/// to indicate where overflow is happening.
+	///
+	/// # Example
+	///
+	/// ```
+	/// # use sp_std::collections::btree_set::BTreeSet;
+	/// # use frame_support::{parameter_types, storage::bounded_btree_set::BoundedBTreeSet};
+	/// parameter_types! {
+	/// 	pub const Size: u32 = 5;
+	/// }
+	/// let mut set = BTreeSet::new();
+	/// set.insert("foo");
+	/// set.insert("bar");
+	/// let bounded_set = unsafe {BoundedBTreeSet::<_, Size>::force_from(set, "demo")};
+	/// ```
+	pub unsafe fn force_from<Scope>(set: BTreeSet<T>, scope: Scope) -> Self
+	where
+		Scope: Into<Option<&'static str>>,
+	{
+		if set.len() > Self::bound() {
+			log::warn!(
+				target: crate::LOG_TARGET,
+				"length of a bounded btreeset in scope {} is not respected.",
+				scope.into().unwrap_or("UNKNOWN"),
+			);
+		}
+
+		Self::unchecked_from(set)
+	}
+
+	/// Consume self, and return the inner `BTreeSet`.
+	///
+	/// This is useful when a mutating API of the inner type is desired, and closure-based mutation
+	/// such as provided by [`try_mutate`][Self::try_mutate] is inconvenient.
+	pub fn into_inner(self) -> BTreeSet<T> {
+		debug_assert!(self.0.len() <= Self::bound());
+		self.0
+	}
+
+	/// Consumes self and mutates self via the given `mutate` function.
+	///
+	/// If the outcome of mutation is within bounds, `Some(Self)` is returned. Else, `None` is
+	/// returned.
+	///
+	/// This is essentially a *consuming* shorthand [`Self::into_inner`] -> `...` ->
+	/// [`Self::try_from`].
+	pub fn try_mutate(mut self, mut mutate: impl FnMut(&mut BTreeSet<T>)) -> Option<Self> {
+		mutate(&mut self.0);
+		(self.0.len() <= Self::bound()).then(move || self)
+	}
+
+	// Clears the set, removing all elements.
+	pub fn clear(&mut self) {
+		self.0.clear()
+	}
+
+	/// Exactly the same semantics as [`BTreeSet::insert`], but returns an `Err` (and is a noop) if the
+	/// new length of the set exceeds `S`.
+	pub fn try_insert(&mut self, item: T) -> Result<(), ()> {
+		if self.len() < Self::bound() {
+			self.0.insert(item);
+			Ok(())
+		} else {
+			Err(())
+		}
+	}
+
+	/// Remove an item from the set, returning whether it was previously in the set.
+	///
+	/// The item may be any borrowed form of the set's item type, but the ordering on the borrowed
+	/// form _must_ match the ordering on the item type.
+	pub fn remove<Q>(&mut self, item: &Q) -> bool
+	where
+		T: Borrow<Q>,
+		Q: Ord + ?Sized,
+	{
+		self.0.remove(item)
+	}
+
+	/// Removes and returns the value in the set, if any, that is equal to the given one.
+	///
+	/// The value may be any borrowed form of the set's value type, but the ordering on the borrowed
+	/// form _must_ match the ordering on the value type.
+	pub fn take<Q>(&mut self, value: &Q) -> Option<T>
+	where
+		T: Borrow<Q> + Ord,
+		Q: Ord + ?Sized,
+	{
+		self.0.take(value)
+	}
+}
+
+impl<T, S> Default for BoundedBTreeSet<T, S>
+where
+	T: Ord,
+	S: Get<u32>,
+{
+	fn default() -> Self {
+		Self::new()
+	}
+}
+
+impl<T, S> Clone for BoundedBTreeSet<T, S>
+where
+	BTreeSet<T>: Clone,
+{
+	fn clone(&self) -> Self {
+		BoundedBTreeSet(self.0.clone(), PhantomData)
+	}
+}
+
+#[cfg(feature = "std")]
+impl<T, S> fmt::Debug for BoundedBTreeSet<T, S>
+where
+	BTreeSet<T>: fmt::Debug,
+	S: Get<u32>,
+{
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		f.debug_tuple("BoundedBTreeSet").field(&self.0).field(&Self::bound()).finish()
+	}
+}
+
+impl<T, S> PartialEq for BoundedBTreeSet<T, S>
+where
+	BTreeSet<T>: PartialEq,
+{
+	fn eq(&self, other: &Self) -> bool {
+		self.0 == other.0
+	}
+}
+
+impl<T, S> Eq for BoundedBTreeSet<T, S> where BTreeSet<T>: Eq {}
+
+impl<T, S> PartialEq<BTreeSet<T>> for BoundedBTreeSet<T, S>
+where
+	BTreeSet<T>: PartialEq,
+{
+	fn eq(&self, other: &BTreeSet<T>) -> bool {
+		self.0 == *other
+	}
+}
+
+impl<T, S> PartialOrd for BoundedBTreeSet<T, S>
+where
+	BTreeSet<T>: PartialOrd,
+{
+	fn partial_cmp(&self, other: &Self) -> Option<sp_std::cmp::Ordering> {
+		self.0.partial_cmp(&other.0)
+	}
+}
+
+impl<T, S> Ord for BoundedBTreeSet<T, S>
+where
+	BTreeSet<T>: Ord,
+{
+	fn cmp(&self, other: &Self) -> sp_std::cmp::Ordering {
+		self.0.cmp(&other.0)
+	}
+}
+
+impl<T, S> IntoIterator for BoundedBTreeSet<T, S> {
+	type Item = T;
+	type IntoIter = sp_std::collections::btree_set::IntoIter<T>;
+
+	fn into_iter(self) -> Self::IntoIter {
+		self.0.into_iter()
+	}
+}
+
+impl<T, S> MaxEncodedLen for BoundedBTreeSet<T, S>
+where
+	T: MaxEncodedLen,
+	S: Get<u32>,
+{
+	fn max_encoded_len() -> usize {
+		Self::bound()
+			.saturating_mul(T::max_encoded_len())
+			.saturating_add(codec::Compact(S::get()).encoded_size())
+	}
+}
+
+impl<T, S> Deref for BoundedBTreeSet<T, S>
+where
+	T: Ord,
+{
+	type Target = BTreeSet<T>;
+
+	fn deref(&self) -> &Self::Target {
+		&self.0
+	}
+}
+
+impl<T, S> AsRef<BTreeSet<T>> for BoundedBTreeSet<T, S>
+where
+	T: Ord,
+{
+	fn as_ref(&self) -> &BTreeSet<T> {
+		&self.0
+	}
+}
+
+impl<T, S> From<BoundedBTreeSet<T, S>> for BTreeSet<T>
+where
+	T: Ord,
+{
+	fn from(set: BoundedBTreeSet<T, S>) -> Self {
+		set.0
+	}
+}
+
+impl<T, S> TryFrom<BTreeSet<T>> for BoundedBTreeSet<T, S>
+where
+	T: Ord,
+	S: Get<u32>,
+{
+	type Error = ();
+
+	fn try_from(value: BTreeSet<T>) -> Result<Self, Self::Error> {
+		(value.len() <= Self::bound()).then(move || BoundedBTreeSet(value, PhantomData)).ok_or(())
+	}
+}
+
+impl<T, S> codec::DecodeLength for BoundedBTreeSet<T, S> {
+	fn len(self_encoded: &[u8]) -> Result<usize, codec::Error> {
+		// `BoundedBTreeSet<T, S>` is stored just a `BTreeSet<T>`, which is stored as a
+		// `Compact<u32>` with its length followed by an iteration of its items. We can just use
+		// the underlying implementation.
+		<BTreeSet<T> as codec::DecodeLength>::len(self_encoded)
+	}
+}
+
+impl<T, S> StorageDecodeLength for BoundedBTreeSet<T, S> {}
+
+impl<T, S> codec::EncodeLike<BTreeSet<T>> for BoundedBTreeSet<T, S> where
+	BTreeSet<T>: Encode
+{}
+
+#[cfg(test)]
+pub mod test {
+	use super::*;
+	use sp_io::TestExternalities;
+	use sp_std::convert::TryInto;
+	use crate::Twox128;
+
+	crate::parameter_types! {
+		pub const Seven: u32 = 7;
+		pub const Four: u32 = 4;
+	}
+
+	crate::generate_storage_alias! { Prefix, Foo => Value<BoundedBTreeSet<u32, Seven>> }
+	crate::generate_storage_alias! { Prefix, FooMap => Map<(u32, Twox128), BoundedBTreeSet<u32, Seven>> }
+	crate::generate_storage_alias! {
+		Prefix,
+		FooDoubleMap => DoubleMap<(u32, Twox128), (u32, Twox128), BoundedBTreeSet<u32, Seven>>
+	}
+
+	fn map_from_keys<T>(keys: &[T]) -> BTreeSet<T>
+	where
+		T: Ord + Copy,
+	{
+		keys.iter().copied().collect()
+	}
+
+	fn boundedmap_from_keys<T, S>(keys: &[T]) -> BoundedBTreeSet<T, S>
+	where
+		T: Ord + Copy,
+		S: Get<u32>,
+	{
+		map_from_keys(keys).try_into().unwrap()
+	}
+
+	#[test]
+	fn decode_len_works() {
+		TestExternalities::default().execute_with(|| {
+			let bounded = boundedmap_from_keys::<u32, Seven>(&[1, 2, 3]);
+			Foo::put(bounded);
+			assert_eq!(Foo::decode_len().unwrap(), 3);
+		});
+
+		TestExternalities::default().execute_with(|| {
+			let bounded = boundedmap_from_keys::<u32, Seven>(&[1, 2, 3]);
+			FooMap::insert(1, bounded);
+			assert_eq!(FooMap::decode_len(1).unwrap(), 3);
+			assert!(FooMap::decode_len(0).is_none());
+			assert!(FooMap::decode_len(2).is_none());
+		});
+
+		TestExternalities::default().execute_with(|| {
+			let bounded = boundedmap_from_keys::<u32, Seven>(&[1, 2, 3]);
+			FooDoubleMap::insert(1, 1, bounded);
+			assert_eq!(FooDoubleMap::decode_len(1, 1).unwrap(), 3);
+			assert!(FooDoubleMap::decode_len(2, 1).is_none());
+			assert!(FooDoubleMap::decode_len(1, 2).is_none());
+			assert!(FooDoubleMap::decode_len(2, 2).is_none());
+		});
+	}
+
+	#[test]
+	fn try_insert_works() {
+		let mut bounded = boundedmap_from_keys::<u32, Four>(&[1, 2, 3]);
+		bounded.try_insert(0).unwrap();
+		assert_eq!(*bounded, map_from_keys(&[1, 0, 2, 3]));
+
+		assert!(bounded.try_insert(9).is_err());
+		assert_eq!(*bounded, map_from_keys(&[1, 0, 2, 3]));
+	}
+
+	#[test]
+	fn deref_coercion_works() {
+		let bounded = boundedmap_from_keys::<u32, Seven>(&[1, 2, 3]);
+		// these methods come from deref-ed vec.
+		assert_eq!(bounded.len(), 3);
+		assert!(bounded.iter().next().is_some());
+		assert!(!bounded.is_empty());
+	}
+
+	#[test]
+	fn try_mutate_works() {
+		let bounded = boundedmap_from_keys::<u32, Seven>(&[1, 2, 3, 4, 5, 6]);
+		let bounded = bounded
+			.try_mutate(|v| {
+				v.insert(7);
+			})
+			.unwrap();
+		assert_eq!(bounded.len(), 7);
+		assert!(bounded
+			.try_mutate(|v| {
+				v.insert(8);
+			})
+			.is_none());
+	}
+
+	#[test]
+	fn btree_map_eq_works() {
+		let bounded = boundedmap_from_keys::<u32, Seven>(&[1, 2, 3, 4, 5, 6]);
+		assert_eq!(bounded, map_from_keys(&[1, 2, 3, 4, 5, 6]));
+	}
+}
diff --git a/frame/support/src/storage/mod.rs b/frame/support/src/storage/mod.rs
index 8abe4048615d..437dd28060f7 100644
--- a/frame/support/src/storage/mod.rs
+++ b/frame/support/src/storage/mod.rs
@@ -27,6 +27,7 @@ pub use sp_runtime::TransactionOutcome;
 pub mod unhashed;
 pub mod hashed;
 pub mod bounded_btree_map;
+pub mod bounded_btree_set;
 pub mod bounded_vec;
 pub mod child;
 #[doc(hidden)]
@@ -816,6 +817,7 @@ mod private {
 	impl<Hash: Encode> Sealed for Digest<Hash> {}
 	impl<T, S> Sealed for BoundedVec<T, S> {}
 	impl<K, V, S> Sealed for bounded_btree_map::BoundedBTreeMap<K, V, S> {}
+	impl<T, S> Sealed for bounded_btree_set::BoundedBTreeSet<T, S> {}
 }
 
 impl<T: Encode> StorageAppend<T> for Vec<T> {}

From efd262f1a791be0a7986b25bd302338a590b46d3 Mon Sep 17 00:00:00 2001
From: Shaun Wang <spxwang@gmail.com>
Date: Mon, 10 May 2021 20:14:02 +1200
Subject: [PATCH 0724/1194] Add arithmetic dispatch errors. (#8726)

* Add arithmetic dispatch errors.

* Replace custom overflow errors.

* Replace custom underflow and division by zero errors.

* Replace overflow/underflow in token error.

* Add token and arithmetic errors in dispatch error equality test.

* Trigger CI.
---
 frame/assets/README.md                        |  3 +-
 frame/assets/src/functions.rs                 |  6 +--
 frame/assets/src/lib.rs                       |  4 +-
 frame/balances/src/lib.rs                     | 14 +++--
 frame/balances/src/tests.rs                   |  4 +-
 frame/democracy/src/lib.rs                    | 12 ++---
 frame/lottery/src/lib.rs                      |  8 ++-
 frame/recovery/src/lib.rs                     | 10 ++--
 .../src/traits/tokens/fungible/balanced.rs    |  4 +-
 .../src/traits/tokens/fungibles/balanced.rs   |  4 +-
 frame/support/src/traits/tokens/misc.rs       | 28 +++++-----
 primitives/runtime/src/lib.rs                 | 51 ++++++++++++++++---
 12 files changed, 88 insertions(+), 60 deletions(-)

diff --git a/frame/assets/README.md b/frame/assets/README.md
index 44c4eedc31be..f8583a5c91d7 100644
--- a/frame/assets/README.md
+++ b/frame/assets/README.md
@@ -71,6 +71,7 @@ Import the Assets module and types and derive your runtime's configuration trait
 use pallet_assets as assets;
 use frame_support::{decl_module, dispatch, ensure};
 use frame_system::ensure_signed;
+use sp_runtime::ArithmeticError;
 
 pub trait Config: assets::Config { }
 
@@ -84,7 +85,7 @@ decl_module! {
 			const COUNT_AIRDROP_RECIPIENTS: u64 = 2;
 			const TOKENS_FIXED_SUPPLY: u64 = 100;
 
-			ensure!(!COUNT_AIRDROP_RECIPIENTS.is_zero(), "Divide by zero error.");
+			ensure!(!COUNT_AIRDROP_RECIPIENTS.is_zero(), ArithmeticError::DivisionByZero);
 
 			let asset_id = Self::next_asset_id();
 
diff --git a/frame/assets/src/functions.rs b/frame/assets/src/functions.rs
index 13c92f781b07..c6b5391cff86 100644
--- a/frame/assets/src/functions.rs
+++ b/frame/assets/src/functions.rs
@@ -47,7 +47,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		who: &T::AccountId,
 		d: &mut AssetDetails<T::Balance, T::AccountId, DepositBalanceOf<T, I>>,
 	) -> Result<bool, DispatchError> {
-		let accounts = d.accounts.checked_add(1).ok_or(Error::<T, I>::Overflow)?;
+		let accounts = d.accounts.checked_add(1).ok_or(ArithmeticError::Overflow)?;
 		let is_sufficient = if d.is_sufficient {
 			frame_system::Pallet::<T>::inc_sufficients(who);
 			d.sufficients += 1;
@@ -162,7 +162,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		id: T::AssetId,
 		who: &T::AccountId,
 		keep_alive: bool,
-	) -> Result<T::Balance, Error<T, I>> {
+	) -> Result<T::Balance, DispatchError> {
 		let details = Asset::<T, I>::get(id).ok_or_else(|| Error::<T, I>::Unknown)?;
 		ensure!(!details.is_frozen, Error::<T, I>::Frozen);
 
@@ -173,7 +173,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 			// Frozen balance: account CANNOT be deleted
 			let required = frozen
 				.checked_add(&details.min_balance)
-				.ok_or(Error::<T, I>::Overflow)?;
+				.ok_or(ArithmeticError::Overflow)?;
 			account.balance.saturating_sub(required)
 		} else {
 			let is_provider = false;
diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index e8dfd50f4086..3a2b1a6ce21d 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -140,7 +140,7 @@ pub use types::*;
 
 use sp_std::{prelude::*, borrow::Borrow};
 use sp_runtime::{
-	RuntimeDebug, TokenError, traits::{
+	RuntimeDebug, TokenError, ArithmeticError, traits::{
 		AtLeast32BitUnsigned, Zero, StaticLookup, Saturating, CheckedSub, CheckedAdd, Bounded,
 		StoredMapError,
 	}
@@ -326,8 +326,6 @@ pub mod pallet {
 		BadWitness,
 		/// Minimum balance should be non-zero.
 		MinBalanceZero,
-		/// A mint operation lead to an overflow.
-		Overflow,
 		/// No provider reference exists to allow a non-zero balance of a non-self-sufficient asset.
 		NoProvider,
 		/// Invalid metadata given.
diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index 35841c504adf..0bfe43623c5d 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -171,7 +171,7 @@ use frame_support::{
 #[cfg(feature = "std")]
 use frame_support::traits::GenesisBuild;
 use sp_runtime::{
-	RuntimeDebug, DispatchResult, DispatchError,
+	RuntimeDebug, DispatchResult, DispatchError, ArithmeticError,
 	traits::{
 		Zero, AtLeast32BitUnsigned, StaticLookup, CheckedAdd, CheckedSub,
 		MaybeSerializeDeserialize, Saturating, Bounded, StoredMapError,
@@ -402,8 +402,6 @@ pub mod pallet {
 		VestingBalance,
 		/// Account liquidity restrictions prevent withdrawal
 		LiquidityRestrictions,
-		/// Got an overflow after adding
-		Overflow,
 		/// Balance too low to send value
 		InsufficientBalance,
 		/// Value too low to create account due to existential deposit
@@ -909,10 +907,10 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 						match status {
 							Status::Free => to_account.free = to_account.free
 								.checked_add(&actual)
-								.ok_or(Error::<T, I>::Overflow)?,
+								.ok_or(ArithmeticError::Overflow)?,
 							Status::Reserved => to_account.reserved = to_account.reserved
 								.checked_add(&actual)
-								.ok_or(Error::<T, I>::Overflow)?,
+								.ok_or(ArithmeticError::Overflow)?,
 						}
 						from_account.reserved -= actual;
 						Ok(actual)
@@ -1332,7 +1330,7 @@ impl<T: Config<I>, I: 'static> Currency<T::AccountId> for Pallet<T, I> where
 
 						// NOTE: total stake being stored in the same type means that this could never overflow
 						// but better to be safe than sorry.
-						to_account.free = to_account.free.checked_add(&value).ok_or(Error::<T, I>::Overflow)?;
+						to_account.free = to_account.free.checked_add(&value).ok_or(ArithmeticError::Overflow)?;
 
 						let ed = T::ExistentialDeposit::get();
 						ensure!(to_account.total() >= ed, Error::<T, I>::ExistentialDeposit);
@@ -1431,7 +1429,7 @@ impl<T: Config<I>, I: 'static> Currency<T::AccountId> for Pallet<T, I> where
 
 		Self::try_mutate_account(who, |account, is_new| -> Result<Self::PositiveImbalance, DispatchError> {
 			ensure!(!is_new, Error::<T, I>::DeadAccount);
-			account.free = account.free.checked_add(&value).ok_or(Error::<T, I>::Overflow)?;
+			account.free = account.free.checked_add(&value).ok_or(ArithmeticError::Overflow)?;
 			Ok(PositiveImbalance::new(value))
 		})
 	}
@@ -1554,7 +1552,7 @@ impl<T: Config<I>, I: 'static> ReservableCurrency<T::AccountId> for Pallet<T, I>
 
 		Self::try_mutate_account(who, |account, _| -> DispatchResult {
 			account.free = account.free.checked_sub(&value).ok_or(Error::<T, I>::InsufficientBalance)?;
-			account.reserved = account.reserved.checked_add(&value).ok_or(Error::<T, I>::Overflow)?;
+			account.reserved = account.reserved.checked_add(&value).ok_or(ArithmeticError::Overflow)?;
 			Self::ensure_can_withdraw(&who, value.clone(), WithdrawReasons::RESERVE, account.free)
 		})?;
 
diff --git a/frame/balances/src/tests.rs b/frame/balances/src/tests.rs
index de12c39ededf..39de13399043 100644
--- a/frame/balances/src/tests.rs
+++ b/frame/balances/src/tests.rs
@@ -24,7 +24,7 @@ macro_rules! decl_tests {
 	($test:ty, $ext_builder:ty, $existential_deposit:expr) => {
 
 		use crate::*;
-		use sp_runtime::{FixedPointNumber, traits::{SignedExtension, BadOrigin}};
+		use sp_runtime::{ArithmeticError, FixedPointNumber, traits::{SignedExtension, BadOrigin}};
 		use frame_support::{
 			assert_noop, assert_storage_noop, assert_ok, assert_err, StorageValue,
 			traits::{
@@ -523,7 +523,7 @@ macro_rules! decl_tests {
 
 				assert_err!(
 					Balances::transfer(Some(1).into(), 2, u64::max_value()),
-					Error::<$test, _>::Overflow,
+					ArithmeticError::Overflow,
 				);
 
 				assert_eq!(Balances::free_balance(1), u64::max_value());
diff --git a/frame/democracy/src/lib.rs b/frame/democracy/src/lib.rs
index 351204bfcb58..6fdff1aa5a6a 100644
--- a/frame/democracy/src/lib.rs
+++ b/frame/democracy/src/lib.rs
@@ -154,7 +154,7 @@
 
 use sp_std::prelude::*;
 use sp_runtime::{
-	DispatchResult, DispatchError, RuntimeDebug,
+	DispatchResult, DispatchError, ArithmeticError, RuntimeDebug,
 	traits::{Zero, Hash, Dispatchable, Saturating, Bounded},
 };
 use codec::{Encode, Decode, Input};
@@ -510,10 +510,6 @@ decl_error! {
 		NoPermission,
 		/// The account is already delegating.
 		AlreadyDelegating,
-		/// An unexpected integer overflow occurred.
-		Overflow,
-		/// An unexpected integer underflow occurred.
-		Underflow,
 		/// Too high a balance was provided that the account cannot afford.
 		InsufficientFunds,
 		/// The account is not currently delegating.
@@ -1252,7 +1248,7 @@ impl<T: Config> Module<T> {
 				match votes.binary_search_by_key(&ref_index, |i| i.0) {
 					Ok(i) => {
 						// Shouldn't be possible to fail, but we handle it gracefully.
-						status.tally.remove(votes[i].1).ok_or(Error::<T>::Underflow)?;
+						status.tally.remove(votes[i].1).ok_or(ArithmeticError::Underflow)?;
 						if let Some(approve) = votes[i].1.as_standard() {
 							status.tally.reduce(approve, *delegations);
 						}
@@ -1264,7 +1260,7 @@ impl<T: Config> Module<T> {
 					}
 				}
 				// Shouldn't be possible to fail, but we handle it gracefully.
-				status.tally.add(vote).ok_or(Error::<T>::Overflow)?;
+				status.tally.add(vote).ok_or(ArithmeticError::Overflow)?;
 				if let Some(approve) = vote.as_standard() {
 					status.tally.increase(approve, *delegations);
 				}
@@ -1300,7 +1296,7 @@ impl<T: Config> Module<T> {
 					Some(ReferendumInfo::Ongoing(mut status)) => {
 						ensure!(matches!(scope, UnvoteScope::Any), Error::<T>::NoPermission);
 						// Shouldn't be possible to fail, but we handle it gracefully.
-						status.tally.remove(votes[i].1).ok_or(Error::<T>::Underflow)?;
+						status.tally.remove(votes[i].1).ok_or(ArithmeticError::Underflow)?;
 						if let Some(approve) = votes[i].1.as_standard() {
 							status.tally.reduce(approve, *delegations);
 						}
diff --git a/frame/lottery/src/lib.rs b/frame/lottery/src/lib.rs
index a37238a2d9f8..a7782de02902 100644
--- a/frame/lottery/src/lib.rs
+++ b/frame/lottery/src/lib.rs
@@ -56,7 +56,7 @@ pub mod weights;
 
 use sp_std::prelude::*;
 use sp_runtime::{
-	DispatchError,
+	DispatchError, ArithmeticError,
 	traits::{AccountIdConversion, Saturating, Zero},
 };
 use frame_support::{
@@ -188,8 +188,6 @@ decl_event!(
 
 decl_error! {
 	pub enum Error for Module<T: Config> {
-		/// An overflow has occurred.
-		Overflow,
 		/// A lottery has not been configured.
 		NotConfigured,
 		/// A lottery is already in progress.
@@ -278,7 +276,7 @@ decl_module! {
 			Lottery::<T>::try_mutate(|lottery| -> DispatchResult {
 				ensure!(lottery.is_none(), Error::<T>::InProgress);
 				let index = LotteryIndex::get();
-				let new_index = index.checked_add(1).ok_or(Error::<T>::Overflow)?;
+				let new_index = index.checked_add(1).ok_or(ArithmeticError::Overflow)?;
 				let start = frame_system::Pallet::<T>::block_number();
 				// Use new_index to more easily track everything with the current state.
 				*lottery = Some(LotteryConfig {
@@ -400,7 +398,7 @@ impl<T: Config> Module<T> {
 		ensure!(T::ValidateCall::validate_call(call), Error::<T>::InvalidCall);
 		let call_index = Self::call_to_index(call)?;
 		let ticket_count = TicketsCount::get();
-		let new_ticket_count = ticket_count.checked_add(1).ok_or(Error::<T>::Overflow)?;
+		let new_ticket_count = ticket_count.checked_add(1).ok_or(ArithmeticError::Overflow)?;
 		// Try to update the participant status
 		Participants::<T>::try_mutate(&caller, |(lottery_index, participating_calls)| -> DispatchResult {
 			let index = LotteryIndex::get();
diff --git a/frame/recovery/src/lib.rs b/frame/recovery/src/lib.rs
index ceb2f5a68874..cf81e7b033c7 100644
--- a/frame/recovery/src/lib.rs
+++ b/frame/recovery/src/lib.rs
@@ -154,7 +154,7 @@
 use sp_std::prelude::*;
 use sp_runtime::{
 	traits::{Dispatchable, SaturatedConversion, CheckedAdd, CheckedMul},
-	DispatchResult
+	DispatchResult, ArithmeticError,
 };
 use codec::{Encode, Decode};
 
@@ -313,8 +313,6 @@ decl_error! {
 		Threshold,
 		/// There are still active recovery attempts that need to be closed
 		StillActive,
-		/// There was an overflow in a calculation
-		Overflow,
 		/// This account is already set up for recovery
 		AlreadyProxy,
 		/// Some internal state is broken.
@@ -443,10 +441,10 @@ decl_module! {
 			// Total deposit is base fee + number of friends * factor fee
 			let friend_deposit = T::FriendDepositFactor::get()
 				.checked_mul(&friends.len().saturated_into())
-				.ok_or(Error::<T>::Overflow)?;
+				.ok_or(ArithmeticError::Overflow)?;
 			let total_deposit = T::ConfigDepositBase::get()
 				.checked_add(&friend_deposit)
-				.ok_or(Error::<T>::Overflow)?;
+				.ok_or(ArithmeticError::Overflow)?;
 			// Reserve the deposit
 			T::Currency::reserve(&who, total_deposit)?;
 			// Create the recovery configuration
@@ -581,7 +579,7 @@ decl_module! {
 			let current_block_number = <system::Pallet<T>>::block_number();
 			let recoverable_block_number = active_recovery.created
 				.checked_add(&recovery_config.delay_period)
-				.ok_or(Error::<T>::Overflow)?;
+				.ok_or(ArithmeticError::Overflow)?;
 			ensure!(recoverable_block_number <= current_block_number, Error::<T>::DelayPeriod);
 			// Make sure the threshold is met
 			ensure!(
diff --git a/frame/support/src/traits/tokens/fungible/balanced.rs b/frame/support/src/traits/tokens/fungible/balanced.rs
index 19bdb4f245ee..1cd0fcf0ca41 100644
--- a/frame/support/src/traits/tokens/fungible/balanced.rs
+++ b/frame/support/src/traits/tokens/fungible/balanced.rs
@@ -20,7 +20,7 @@
 
 use super::*;
 use sp_std::marker::PhantomData;
-use sp_runtime::{TokenError, traits::{CheckedAdd, Zero}};
+use sp_runtime::{TokenError, ArithmeticError, traits::{CheckedAdd, Zero}};
 use super::super::Imbalance as ImbalanceT;
 use crate::traits::misc::{SameOrOther, TryDrop};
 use crate::dispatch::{DispatchResult, DispatchError};
@@ -221,7 +221,7 @@ pub trait Unbalanced<AccountId>: Inspect<AccountId> {
 		-> Result<Self::Balance, DispatchError>
 	{
 		let old_balance = Self::balance(who);
-		let new_balance = old_balance.checked_add(&amount).ok_or(TokenError::Overflow)?;
+		let new_balance = old_balance.checked_add(&amount).ok_or(ArithmeticError::Overflow)?;
 		if new_balance < Self::minimum_balance() {
 			Err(TokenError::BelowMinimum)?
 		}
diff --git a/frame/support/src/traits/tokens/fungibles/balanced.rs b/frame/support/src/traits/tokens/fungibles/balanced.rs
index efb21300bcaa..a1016f8c1195 100644
--- a/frame/support/src/traits/tokens/fungibles/balanced.rs
+++ b/frame/support/src/traits/tokens/fungibles/balanced.rs
@@ -20,7 +20,7 @@
 
 use super::*;
 use sp_std::marker::PhantomData;
-use sp_runtime::{TokenError, traits::{Zero, CheckedAdd}};
+use sp_runtime::{ArithmeticError, TokenError, traits::{Zero, CheckedAdd}};
 use sp_arithmetic::traits::Saturating;
 use crate::dispatch::{DispatchError, DispatchResult};
 use crate::traits::misc::{SameOrOther, TryDrop};
@@ -236,7 +236,7 @@ pub trait Unbalanced<AccountId>: Inspect<AccountId> {
 		-> Result<Self::Balance, DispatchError>
 	{
 		let old_balance = Self::balance(asset, who);
-		let new_balance = old_balance.checked_add(&amount).ok_or(TokenError::Overflow)?;
+		let new_balance = old_balance.checked_add(&amount).ok_or(ArithmeticError::Overflow)?;
 		if new_balance < Self::minimum_balance(asset) {
 			Err(TokenError::BelowMinimum)?
 		}
diff --git a/frame/support/src/traits/tokens/misc.rs b/frame/support/src/traits/tokens/misc.rs
index 9871123abd59..342c69c8bb15 100644
--- a/frame/support/src/traits/tokens/misc.rs
+++ b/frame/support/src/traits/tokens/misc.rs
@@ -20,7 +20,7 @@
 use codec::{Encode, Decode, FullCodec};
 use sp_core::RuntimeDebug;
 use sp_arithmetic::traits::{Zero, AtLeast32BitUnsigned};
-use sp_runtime::TokenError;
+use sp_runtime::{DispatchError, ArithmeticError, TokenError};
 
 /// One of a number of consequences of withdrawing a fungible from an account.
 #[derive(Copy, Clone, Eq, PartialEq)]
@@ -50,17 +50,17 @@ pub enum WithdrawConsequence<Balance> {
 }
 
 impl<Balance: Zero> WithdrawConsequence<Balance> {
-	/// Convert the type into a `Result` with `TokenError` as the error or the additional `Balance`
+	/// Convert the type into a `Result` with `DispatchError` as the error or the additional `Balance`
 	/// by which the account will be reduced.
-	pub fn into_result(self) -> Result<Balance, TokenError> {
+	pub fn into_result(self) -> Result<Balance, DispatchError> {
 		use WithdrawConsequence::*;
 		match self {
-			NoFunds => Err(TokenError::NoFunds),
-			WouldDie => Err(TokenError::WouldDie),
-			UnknownAsset => Err(TokenError::UnknownAsset),
-			Underflow => Err(TokenError::Underflow),
-			Overflow => Err(TokenError::Overflow),
-			Frozen => Err(TokenError::Frozen),
+			NoFunds => Err(TokenError::NoFunds.into()),
+			WouldDie => Err(TokenError::WouldDie.into()),
+			UnknownAsset => Err(TokenError::UnknownAsset.into()),
+			Underflow => Err(ArithmeticError::Underflow.into()),
+			Overflow => Err(ArithmeticError::Overflow.into()),
+			Frozen => Err(TokenError::Frozen.into()),
 			ReducedToZero(result) => Ok(result),
 			Success => Ok(Zero::zero()),
 		}
@@ -90,13 +90,13 @@ pub enum DepositConsequence {
 
 impl DepositConsequence {
 	/// Convert the type into a `Result` with `TokenError` as the error.
-	pub fn into_result(self) -> Result<(), TokenError> {
+	pub fn into_result(self) -> Result<(), DispatchError> {
 		use DepositConsequence::*;
 		Err(match self {
-			BelowMinimum => TokenError::BelowMinimum,
-			CannotCreate => TokenError::CannotCreate,
-			UnknownAsset => TokenError::UnknownAsset,
-			Overflow => TokenError::Overflow,
+			BelowMinimum => TokenError::BelowMinimum.into(),
+			CannotCreate => TokenError::CannotCreate.into(),
+			UnknownAsset => TokenError::UnknownAsset.into(),
+			Overflow => ArithmeticError::Overflow.into(),
 			Success => return Ok(()),
 		})
 	}
diff --git a/primitives/runtime/src/lib.rs b/primitives/runtime/src/lib.rs
index 51b89d484e6c..0ae69e93980a 100644
--- a/primitives/runtime/src/lib.rs
+++ b/primitives/runtime/src/lib.rs
@@ -468,6 +468,8 @@ pub enum DispatchError {
 	NoProviders,
 	/// An error to do with tokens.
 	Token(TokenError),
+	/// An arithmetic error.
+	Arithmetic(ArithmeticError),
 }
 
 /// Result of a `Dispatchable` which contains the `DispatchResult` and additional information about
@@ -542,10 +544,6 @@ pub enum TokenError {
 	UnknownAsset,
 	/// Funds exist but are frozen.
 	Frozen,
-	/// An underflow would occur.
-	Underflow,
-	/// An overflow would occur.
-	Overflow,
 }
 
 impl From<TokenError> for &'static str {
@@ -557,8 +555,6 @@ impl From<TokenError> for &'static str {
 			TokenError::CannotCreate => "Account cannot be created",
 			TokenError::UnknownAsset => "The asset in question is unknown",
 			TokenError::Frozen => "Funds exist but are frozen",
-			TokenError::Underflow => "An underflow would occur",
-			TokenError::Overflow => "An overflow would occur",
 		}
 	}
 }
@@ -569,6 +565,34 @@ impl From<TokenError> for DispatchError {
 	}
 }
 
+/// Arithmetic errors.
+#[derive(Eq, PartialEq, Clone, Copy, Encode, Decode, Debug)]
+#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+pub enum ArithmeticError {
+	/// Underflow.
+	Underflow,
+	/// Overflow.
+	Overflow,
+	/// Division by zero.
+	DivisionByZero,
+}
+
+impl From<ArithmeticError> for &'static str {
+	fn from(e: ArithmeticError) -> &'static str {
+		match e {
+			ArithmeticError::Underflow => "An underflow would occur",
+			ArithmeticError::Overflow => "An overflow would occur",
+			ArithmeticError::DivisionByZero => "Division by zero",
+		}
+	}
+}
+
+impl From<ArithmeticError> for DispatchError {
+	fn from(e: ArithmeticError) -> DispatchError {
+		Self::Arithmetic(e)
+	}
+}
+
 impl From<&'static str> for DispatchError {
 	fn from(err: &'static str) -> DispatchError {
 		Self::Other(err)
@@ -585,6 +609,7 @@ impl From<DispatchError> for &'static str {
 			DispatchError::ConsumerRemaining => "Consumer remaining",
 			DispatchError::NoProviders => "No providers",
 			DispatchError::Token(e) => e.into(),
+			DispatchError::Arithmetic(e) => e.into(),
 		}
 	}
 }
@@ -616,6 +641,10 @@ impl traits::Printable for DispatchError {
 			Self::Token(e) => {
 				"Token error: ".print();
 				<&'static str>::from(*e).print();
+			},
+			Self::Arithmetic(e) => {
+				"Arithmetic error: ".print();
+				<&'static str>::from(*e).print();
 			}
 		}
 	}
@@ -643,6 +672,7 @@ impl PartialEq for DispatchError {
 
 			(Token(l), Token(r)) => l == r,
 			(Other(l), Other(r)) => l == r,
+			(Arithmetic(l), Arithmetic(r)) => l == r,
 
 			(
 				Module { index: index_l, error: error_l, .. },
@@ -903,6 +933,15 @@ mod tests {
 			Module { index: 2, error: 1, message: None },
 			ConsumerRemaining,
 			NoProviders,
+			Token(TokenError::NoFunds),
+			Token(TokenError::WouldDie),
+			Token(TokenError::BelowMinimum),
+			Token(TokenError::CannotCreate),
+			Token(TokenError::UnknownAsset),
+			Token(TokenError::Frozen),
+			Arithmetic(ArithmeticError::Overflow),
+			Arithmetic(ArithmeticError::Underflow),
+			Arithmetic(ArithmeticError::DivisionByZero),
 		];
 		for (i, variant) in variants.iter().enumerate() {
 			for (j, other_variant) in variants.iter().enumerate() {

From 10b9da5b6759c51ac9f9ac9bb6c4634c2e25b544 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Mon, 10 May 2021 12:18:21 +0200
Subject: [PATCH 0725/1194] Increase the number of external IPs in cache
 (#8771)

---
 client/network/src/discovery.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/network/src/discovery.rs b/client/network/src/discovery.rs
index f6273c9fb3e0..1ddbf41d2b55 100644
--- a/client/network/src/discovery.rs
+++ b/client/network/src/discovery.rs
@@ -71,7 +71,7 @@ use sp_core::hexdisplay::HexDisplay;
 /// Maximum number of known external addresses that we will cache.
 /// This only affects whether we will log whenever we (re-)discover
 /// a given address.
-const MAX_KNOWN_EXTERNAL_ADDRESSES: usize = 32;
+const MAX_KNOWN_EXTERNAL_ADDRESSES: usize = 64;
 
 /// `DiscoveryBehaviour` configuration.
 ///

From 3f110196163b5ec03bac5ee188d60bedf3ebd91d Mon Sep 17 00:00:00 2001
From: Shaun Wang <spxwang@gmail.com>
Date: Tue, 11 May 2021 01:55:25 +1200
Subject: [PATCH 0726/1194] Update pallet macro migrations. (#8766)

* Update pallet macro migrations.

* Revert dispatchable call visibility changes.

* fmt
---
 frame/babe/src/lib.rs        |  4 ++--
 frame/im-online/src/lib.rs   |  4 ++--
 frame/im-online/src/tests.rs |  2 +-
 frame/nicks/src/lib.rs       | 16 ++++++++--------
 frame/timestamp/src/lib.rs   |  4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/frame/babe/src/lib.rs b/frame/babe/src/lib.rs
index fb1e32e5350b..6eecf2675291 100644
--- a/frame/babe/src/lib.rs
+++ b/frame/babe/src/lib.rs
@@ -401,10 +401,10 @@ pub mod pallet {
 		pub fn plan_config_change(
 			origin: OriginFor<T>,
 			config: NextConfigDescriptor,
-		) -> DispatchResultWithPostInfo {
+		) -> DispatchResult {
 			ensure_root(origin)?;
 			PendingEpochConfigChange::<T>::put(config);
-			Ok(().into())
+			Ok(())
 		}
 	}
 }
diff --git a/frame/im-online/src/lib.rs b/frame/im-online/src/lib.rs
index 0290c564ec59..bddb286fad73 100644
--- a/frame/im-online/src/lib.rs
+++ b/frame/im-online/src/lib.rs
@@ -397,7 +397,7 @@ pub mod pallet {
 			// since signature verification is done in `validate_unsigned`
 			// we can skip doing it here again.
 			_signature: <T::AuthorityId as RuntimeAppPublic>::Signature,
-		) -> DispatchResultWithPostInfo {
+		) -> DispatchResult {
 			ensure_none(origin)?;
 
 			let current_session = T::ValidatorSet::session_index();
@@ -417,7 +417,7 @@ pub mod pallet {
 					&network_state
 				);
 
-				Ok(().into())
+				Ok(())
 			} else if exists {
 				Err(Error::<T>::DuplicatedHeartbeat)?
 			} else {
diff --git a/frame/im-online/src/tests.rs b/frame/im-online/src/tests.rs
index 5ce931875b9a..f100bd71c34f 100644
--- a/frame/im-online/src/tests.rs
+++ b/frame/im-online/src/tests.rs
@@ -114,7 +114,7 @@ fn heartbeat(
 	authority_index: u32,
 	id: UintAuthorityId,
 	validators: Vec<u64>,
-) -> dispatch::DispatchResultWithPostInfo {
+) -> dispatch::DispatchResult {
 	use frame_support::unsigned::ValidateUnsigned;
 
 	let heartbeat = Heartbeat {
diff --git a/frame/nicks/src/lib.rs b/frame/nicks/src/lib.rs
index a6d2415ab96e..45a0dc477b1d 100644
--- a/frame/nicks/src/lib.rs
+++ b/frame/nicks/src/lib.rs
@@ -141,7 +141,7 @@ pub mod pallet {
 		/// - One event.
 		/// # </weight>
 		#[pallet::weight(50_000_000)]
-		pub(super) fn set_name(origin: OriginFor<T>, name: Vec<u8>) -> DispatchResultWithPostInfo {
+		pub(super) fn set_name(origin: OriginFor<T>, name: Vec<u8>) -> DispatchResult {
 			let sender = ensure_signed(origin)?;
 
 			ensure!(name.len() >= T::MinLength::get() as usize, Error::<T>::TooShort);
@@ -158,7 +158,7 @@ pub mod pallet {
 			};
 
 			<NameOf<T>>::insert(&sender, (name, deposit));
-			Ok(().into())
+			Ok(())
 		}
 
 		/// Clear an account's name and return the deposit. Fails if the account was not named.
@@ -172,7 +172,7 @@ pub mod pallet {
 		/// - One event.
 		/// # </weight>
 		#[pallet::weight(70_000_000)]
-		pub(super) fn clear_name(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
+		pub(super) fn clear_name(origin: OriginFor<T>) -> DispatchResult {
 			let sender = ensure_signed(origin)?;
 
 			let deposit = <NameOf<T>>::take(&sender).ok_or(Error::<T>::Unnamed)?.1;
@@ -181,7 +181,7 @@ pub mod pallet {
 			debug_assert!(err_amount.is_zero());
 
 			Self::deposit_event(Event::<T>::NameCleared(sender, deposit));
-			Ok(().into())
+			Ok(())
 		}
 
 		/// Remove an account's name and take charge of the deposit.
@@ -201,7 +201,7 @@ pub mod pallet {
 		pub(super) fn kill_name(
 			origin: OriginFor<T>,
 			target: <T::Lookup as StaticLookup>::Source
-		) -> DispatchResultWithPostInfo {
+		) -> DispatchResult {
 			T::ForceOrigin::ensure_origin(origin)?;
 
 			// Figure out who we're meant to be clearing.
@@ -212,7 +212,7 @@ pub mod pallet {
 			T::Slashed::on_unbalanced(T::Currency::slash_reserved(&target, deposit.clone()).0);
 
 			Self::deposit_event(Event::<T>::NameKilled(target, deposit));
-			Ok(().into())
+			Ok(())
 		}
 
 		/// Set a third-party account's name with no deposit.
@@ -232,7 +232,7 @@ pub mod pallet {
 			origin: OriginFor<T>,
 			target: <T::Lookup as StaticLookup>::Source,
 			name: Vec<u8>
-		) -> DispatchResultWithPostInfo {
+		) -> DispatchResult {
 			T::ForceOrigin::ensure_origin(origin)?;
 
 			let target = T::Lookup::lookup(target)?;
@@ -240,7 +240,7 @@ pub mod pallet {
 			<NameOf<T>>::insert(&target, (name, deposit));
 
 			Self::deposit_event(Event::<T>::NameForced(target));
-			Ok(().into())
+			Ok(())
 		}
 	}
 }
diff --git a/frame/timestamp/src/lib.rs b/frame/timestamp/src/lib.rs
index 7c553b1e4b82..dde635c6a8a3 100644
--- a/frame/timestamp/src/lib.rs
+++ b/frame/timestamp/src/lib.rs
@@ -183,7 +183,7 @@ pub mod pallet {
 			T::WeightInfo::set(),
 			DispatchClass::Mandatory
 		))]
-		pub(super) fn set(origin: OriginFor<T>, #[pallet::compact] now: T::Moment) -> DispatchResultWithPostInfo {
+		pub(super) fn set(origin: OriginFor<T>, #[pallet::compact] now: T::Moment) -> DispatchResult {
 			ensure_none(origin)?;
 			assert!(!DidUpdate::<T>::exists(), "Timestamp must be updated only once in the block");
 			let prev = Self::now();
@@ -196,7 +196,7 @@ pub mod pallet {
 
 			<T::OnTimestampSet as OnTimestampSet<_>>::on_timestamp_set(now);
 
-			Ok(().into())
+			Ok(())
 		}
 	}
 

From 60eb0c69fa264dd758c91e3d81ac68ef75036b8e Mon Sep 17 00:00:00 2001
From: Sergei Shulepov <sergei@parity.io>
Date: Mon, 10 May 2021 19:42:55 +0200
Subject: [PATCH 0727/1194] Make Allocator trait pub (#8777)

We need this in order to be able to assemble more fine grained host
function sets.

E.g. we don't want to use `SubstrateHostFunctions` for PVF. We would
better whitelist certain host functions. However, we cannot do that
because we cannot refer to the `Allocator` runtime interface.

I have not been able to find the reason why it wasn't made `pub` in the
first place, but do not see any reason why not to.
---
 primitives/io/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/primitives/io/src/lib.rs b/primitives/io/src/lib.rs
index a7ad4c16c386..35daaa398990 100644
--- a/primitives/io/src/lib.rs
+++ b/primitives/io/src/lib.rs
@@ -1051,7 +1051,7 @@ pub trait Offchain {
 
 /// Wasm only interface that provides functions for calling into the allocator.
 #[runtime_interface(wasm_only)]
-trait Allocator {
+pub trait Allocator {
 	/// Malloc the given number of bytes and return the pointer to the allocated memory location.
 	fn malloc(&mut self, size: u32) -> Pointer<u8> {
 		self.allocate_memory(size).expect("Failed to allocate memory")

From 8d1dd4295e8361f85f49a12a2983650440a300c5 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Tue, 11 May 2021 12:34:35 +0200
Subject: [PATCH 0728/1194] Don't remove addresses from
 known_external_addresses (#8778)

* Don't remove addresses from known_external_addresses

* Remove `remove`
---
 client/network/src/discovery.rs | 7 +++----
 client/network/src/utils.rs     | 5 -----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/client/network/src/discovery.rs b/client/network/src/discovery.rs
index 1ddbf41d2b55..0f2a501bcdef 100644
--- a/client/network/src/discovery.rs
+++ b/client/network/src/discovery.rs
@@ -71,7 +71,7 @@ use sp_core::hexdisplay::HexDisplay;
 /// Maximum number of known external addresses that we will cache.
 /// This only affects whether we will log whenever we (re-)discover
 /// a given address.
-const MAX_KNOWN_EXTERNAL_ADDRESSES: usize = 64;
+const MAX_KNOWN_EXTERNAL_ADDRESSES: usize = 32;
 
 /// `DiscoveryBehaviour` configuration.
 ///
@@ -574,9 +574,8 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 	}
 
 	fn inject_expired_external_addr(&mut self, addr: &Multiaddr) {
-		let with_peer_id = addr.clone()
-			.with(Protocol::P2p(self.local_peer_id.clone().into()));
-		self.known_external_addresses.remove(&with_peer_id);
+		// We intentionally don't remove the element from `known_external_addresses` in order
+		// to not print the log line again.
 
 		for k in self.kademlias.values_mut() {
 			NetworkBehaviour::inject_expired_external_addr(k, addr)
diff --git a/client/network/src/utils.rs b/client/network/src/utils.rs
index b2ae03777e65..02673ef49fb4 100644
--- a/client/network/src/utils.rs
+++ b/client/network/src/utils.rs
@@ -59,11 +59,6 @@ impl<T: Hash + Eq> LruHashSet<T> {
 		}
 		false
 	}
-
-	/// Removes an element from the set if it is present.
-	pub fn remove(&mut self, e: &T) -> bool {
-		self.set.remove(e)
-	}
 }
 
 #[cfg(test)]

From 34315dddbaf13c6282199c32e3b1a9b1b26cf4b1 Mon Sep 17 00:00:00 2001
From: Wei Tang <wei@that.world>
Date: Tue, 11 May 2021 13:25:50 +0200
Subject: [PATCH 0729/1194] pow: fix docs on mining worker (#8759)

* pow: fix docs on mining worker

* typo: miner -> mining

* Switch to proper Rust intra-doc link
---
 client/consensus/pow/README.md  | 12 ++++++++++--
 client/consensus/pow/src/lib.rs | 16 ++++++++++++----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/client/consensus/pow/README.md b/client/consensus/pow/README.md
index a335ec367047..8dba30fc5a38 100644
--- a/client/consensus/pow/README.md
+++ b/client/consensus/pow/README.md
@@ -3,7 +3,15 @@ Proof of work consensus for Substrate.
 To use this engine, you can need to have a struct that implements
 `PowAlgorithm`. After that, pass an instance of the struct, along
 with other necessary client references to `import_queue` to setup
-the queue. Use the `start_mine` function for basic CPU mining.
+the queue.
+
+This library also comes with an async mining worker, which can be
+started via the `start_mining_worker` function. It returns a worker
+handle together with a future. The future must be pulled. Through
+the worker handle, you can pull the metadata needed to start the
+mining process via `MiningWorker::metadata`, and then do the actual
+mining on a standalone thread. Finally, when a seal is found, call
+`MiningWorker::submit` to build the block.
 
 The auxiliary storage for PoW engine only stores the total difficulty.
 For other storage requirements for particular PoW algorithm (such as
@@ -13,4 +21,4 @@ for the auxiliary storage. It is also possible to just use the runtime
 as the storage, but it is not recommended as it won't work well with light
 clients.
 
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/client/consensus/pow/src/lib.rs b/client/consensus/pow/src/lib.rs
index b12bad7bac22..17cdae48cdb6 100644
--- a/client/consensus/pow/src/lib.rs
+++ b/client/consensus/pow/src/lib.rs
@@ -19,14 +19,22 @@
 //! Proof of work consensus for Substrate.
 //!
 //! To use this engine, you can need to have a struct that implements
-//! `PowAlgorithm`. After that, pass an instance of the struct, along
-//! with other necessary client references to `import_queue` to setup
-//! the queue. Use the `start_mine` function for basic CPU mining.
+//! [`PowAlgorithm`]. After that, pass an instance of the struct, along
+//! with other necessary client references to [`import_queue`] to setup
+//! the queue.
+//!
+//! This library also comes with an async mining worker, which can be
+//! started via the [`start_mining_worker`] function. It returns a worker
+//! handle together with a future. The future must be pulled. Through
+//! the worker handle, you can pull the metadata needed to start the
+//! mining process via [`MiningWorker::metadata`], and then do the actual
+//! mining on a standalone thread. Finally, when a seal is found, call
+//! [`MiningWorker::submit`] to build the block.
 //!
 //! The auxiliary storage for PoW engine only stores the total difficulty.
 //! For other storage requirements for particular PoW algorithm (such as
 //! the actual difficulty for each particular blocks), you can take a client
-//! reference in your `PowAlgorithm` implementation, and use a separate prefix
+//! reference in your [`PowAlgorithm`] implementation, and use a separate prefix
 //! for the auxiliary storage. It is also possible to just use the runtime
 //! as the storage, but it is not recommended as it won't work well with light
 //! clients.

From 4ff92f10058cfe1b379362673dd369e33a919e66 Mon Sep 17 00:00:00 2001
From: Dan Shields <35669742+NukeManDan@users.noreply.github.com>
Date: Tue, 11 May 2021 23:47:10 -0600
Subject: [PATCH 0730/1194] revert changes: InspectKeyCmd back to InspectCmd
 where appropriate (#8787)

---
 bin/node/cli/src/cli.rs         | 2 +-
 bin/node/inspect/src/cli.rs     | 2 +-
 bin/node/inspect/src/command.rs | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/node/cli/src/cli.rs b/bin/node/cli/src/cli.rs
index 03d6a2db8af5..9b80a3e34529 100644
--- a/bin/node/cli/src/cli.rs
+++ b/bin/node/cli/src/cli.rs
@@ -41,7 +41,7 @@ pub enum Subcommand {
 		name = "inspect",
 		about = "Decode given block or extrinsic using current native runtime."
 	)]
-	Inspect(node_inspect::cli::InspectKeyCmd),
+	Inspect(node_inspect::cli::InspectCmd),
 
 	/// The custom benchmark subcommmand benchmarking runtime pallets.
 	#[structopt(name = "benchmark", about = "Benchmark runtime pallets.")]
diff --git a/bin/node/inspect/src/cli.rs b/bin/node/inspect/src/cli.rs
index 03f52034acb4..abdbedc296d0 100644
--- a/bin/node/inspect/src/cli.rs
+++ b/bin/node/inspect/src/cli.rs
@@ -24,7 +24,7 @@ use structopt::StructOpt;
 
 /// The `inspect` command used to print decoded chain data.
 #[derive(Debug, StructOpt)]
-pub struct InspectKeyCmd {
+pub struct InspectCmd {
 	#[allow(missing_docs)]
 	#[structopt(flatten)]
 	pub command: InspectSubCmd,
diff --git a/bin/node/inspect/src/command.rs b/bin/node/inspect/src/command.rs
index b4ab2df48d3b..9c14a71375f5 100644
--- a/bin/node/inspect/src/command.rs
+++ b/bin/node/inspect/src/command.rs
@@ -18,14 +18,14 @@
 
 //! Command ran by the CLI
 
-use crate::cli::{InspectKeyCmd, InspectSubCmd};
+use crate::cli::{InspectCmd, InspectSubCmd};
 use crate::Inspector;
 use sc_cli::{CliConfiguration, ImportParams, Result, SharedParams};
 use sc_service::{new_full_client, Configuration, NativeExecutionDispatch};
 use sp_runtime::traits::Block;
 use std::str::FromStr;
 
-impl InspectKeyCmd {
+impl InspectCmd {
 	/// Run the inspect command, passing the inspector.
 	pub fn run<B, RA, EX>(&self, config: Configuration) -> Result<()>
 	where
@@ -54,7 +54,7 @@ impl InspectKeyCmd {
 	}
 }
 
-impl CliConfiguration for InspectKeyCmd {
+impl CliConfiguration for InspectCmd {
 	fn shared_params(&self) -> &SharedParams {
 		&self.shared_params
 	}

From 972e493910fdd3e59c881c75f65a238aec68f34b Mon Sep 17 00:00:00 2001
From: Shaun Wang <spxwang@gmail.com>
Date: Thu, 13 May 2021 00:17:03 +1200
Subject: [PATCH 0731/1194] frame system: add event util functions for tests.
 (#8734)

* frame system: add event util functions for tests.

* URemove unused fn.

* Apply review suggestions.
---
 frame/assets/src/benchmarking.rs       | 12 +-----
 frame/assets/src/tests.rs              | 11 +----
 frame/balances/src/tests.rs            | 24 +++--------
 frame/balances/src/tests_reentrancy.rs | 59 ++++----------------------
 frame/bounties/src/benchmarking.rs     |  8 +---
 frame/collective/src/benchmarking.rs   |  7 +--
 frame/democracy/src/benchmarking.rs    |  8 +---
 frame/elections-phragmen/src/lib.rs    | 24 +++--------
 frame/identity/src/benchmarking.rs     |  8 +---
 frame/multisig/src/tests.rs            | 10 +----
 frame/proxy/src/benchmarking.rs        |  8 +---
 frame/proxy/src/tests.rs               | 42 ++++++++----------
 frame/sudo/src/tests.rs                | 15 +++----
 frame/system/src/lib.rs                | 12 ++++++
 frame/system/src/tests.rs              | 11 +++++
 frame/transaction-payment/src/lib.rs   |  8 +---
 frame/utility/src/benchmarking.rs      |  8 +---
 frame/utility/src/tests.rs             | 16 ++-----
 18 files changed, 85 insertions(+), 206 deletions(-)

diff --git a/frame/assets/src/benchmarking.rs b/frame/assets/src/benchmarking.rs
index 0d80ec5923d2..c6925df9ad88 100644
--- a/frame/assets/src/benchmarking.rs
+++ b/frame/assets/src/benchmarking.rs
@@ -120,19 +120,11 @@ fn add_approvals<T: Config<I>, I: 'static>(minter: T::AccountId, n: u32) {
 }
 
 fn assert_last_event<T: Config<I>, I: 'static>(generic_event: <T as Config<I>>::Event) {
-	let events = frame_system::Pallet::<T>::events();
-	let system_event: <T as frame_system::Config>::Event = generic_event.into();
-	// compare to the last event record
-	let frame_system::EventRecord { event, .. } = &events[events.len() - 1];
-	assert_eq!(event, &system_event);
+	frame_system::Pallet::<T>::assert_last_event(generic_event.into());
 }
 
 fn assert_event<T: Config<I>, I: 'static>(generic_event: <T as Config<I>>::Event) {
-	let system_event: <T as frame_system::Config>::Event = generic_event.into();
-	let events = frame_system::Pallet::<T>::events();
-	assert!(events.iter().any(|event_record| {
-		matches!(&event_record, frame_system::EventRecord { event, .. } if &system_event == event)
-	}));
+	frame_system::Pallet::<T>::assert_has_event(generic_event.into());
 }
 
 benchmarks_instance_pallet! {
diff --git a/frame/assets/src/tests.rs b/frame/assets/src/tests.rs
index f4976af02362..3ee8f9a9cfa4 100644
--- a/frame/assets/src/tests.rs
+++ b/frame/assets/src/tests.rs
@@ -23,10 +23,6 @@ use sp_runtime::TokenError;
 use frame_support::{assert_ok, assert_noop, traits::Currency};
 use pallet_balances::Error as BalancesError;
 
-fn last_event() -> mock::Event {
-	frame_system::Pallet::<Test>::events().pop().expect("Event expected").event
-}
-
 #[test]
 fn basic_minting_should_work() {
 	new_test_ext().execute_with(|| {
@@ -401,10 +397,7 @@ fn transferring_less_than_one_unit_is_fine() {
 		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
 		assert_eq!(Assets::balance(0, 1), 100);
 		assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 0));
-		assert_eq!(
-			last_event(),
-			mock::Event::pallet_assets(crate::Event::Transferred(0, 1, 2, 0)),
-		);
+		System::assert_last_event(mock::Event::pallet_assets(crate::Event::Transferred(0, 1, 2, 0)));
 	});
 }
 
@@ -603,7 +596,7 @@ fn force_asset_status_should_work(){
 		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 50));
 		assert_ok!(Assets::mint(Origin::signed(1), 0, 2, 150));
 
-		//force asset status to change min_balance > balance 
+		//force asset status to change min_balance > balance
 		assert_ok!(Assets::force_asset_status(Origin::root(), 0, 1, 1, 1, 1, 100, true, false));
 		assert_eq!(Assets::balance(0, 1), 50);
 
diff --git a/frame/balances/src/tests.rs b/frame/balances/src/tests.rs
index 39de13399043..38a49df37bdf 100644
--- a/frame/balances/src/tests.rs
+++ b/frame/balances/src/tests.rs
@@ -54,10 +54,6 @@ macro_rules! decl_tests {
 			evt
 		}
 
-		fn last_event() -> Event {
-			system::Pallet::<Test>::events().pop().expect("Event expected").event
-		}
-
 		#[test]
 		fn basic_locking_should_work() {
 			<$ext_builder>::default().existential_deposit(1).monied(true).build().execute_with(|| {
@@ -467,9 +463,8 @@ macro_rules! decl_tests {
 				let _ = Balances::deposit_creating(&2, 1);
 				assert_ok!(Balances::reserve(&1, 110));
 				assert_ok!(Balances::repatriate_reserved(&1, &2, 41, Status::Free), 0);
-				assert_eq!(
-					last_event(),
-					Event::pallet_balances(crate::Event::ReserveRepatriated(1, 2, 41, Status::Free)),
+				System::assert_last_event(
+					Event::pallet_balances(crate::Event::ReserveRepatriated(1, 2, 41, Status::Free))
 				);
 				assert_eq!(Balances::reserved_balance(1), 69);
 				assert_eq!(Balances::free_balance(1), 0);
@@ -688,27 +683,18 @@ macro_rules! decl_tests {
 					System::set_block_number(2);
 					assert_ok!(Balances::reserve(&1, 10));
 
-					assert_eq!(
-						last_event(),
-						Event::pallet_balances(crate::Event::Reserved(1, 10)),
-					);
+					System::assert_last_event(Event::pallet_balances(crate::Event::Reserved(1, 10)));
 
 					System::set_block_number(3);
 					assert!(Balances::unreserve(&1, 5).is_zero());
 
-					assert_eq!(
-						last_event(),
-						Event::pallet_balances(crate::Event::Unreserved(1, 5)),
-					);
+					System::assert_last_event(Event::pallet_balances(crate::Event::Unreserved(1, 5)));
 
 					System::set_block_number(4);
 					assert_eq!(Balances::unreserve(&1, 6), 1);
 
 					// should only unreserve 5
-					assert_eq!(
-						last_event(),
-						Event::pallet_balances(crate::Event::Unreserved(1, 5)),
-					);
+					System::assert_last_event(Event::pallet_balances(crate::Event::Unreserved(1, 5)));
 				});
 		}
 
diff --git a/frame/balances/src/tests_reentrancy.rs b/frame/balances/src/tests_reentrancy.rs
index 3d6a90929aee..91ad51446c19 100644
--- a/frame/balances/src/tests_reentrancy.rs
+++ b/frame/balances/src/tests_reentrancy.rs
@@ -46,10 +46,6 @@ use frame_system::RawOrigin;
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
-fn last_event() -> Event {
-	system::Pallet::<Test>::events().pop().expect("Event expected").event
-}
-
 frame_support::construct_runtime!(
 	pub enum Test where
 		Block = Block,
@@ -189,23 +185,8 @@ fn transfer_dust_removal_tst1_should_work() {
 			// Number of events expected is 8
 			assert_eq!(System::events().len(), 11);
 
-			assert!(
-				System::events().iter().any(
-					|er|
-					er.event == Event::pallet_balances(
-						crate::Event::Transfer(2, 3, 450),
-					),
-				),
-			);
-
-			assert!(
-				System::events().iter().any(
-					|er|
-					er.event == Event::pallet_balances(
-						crate::Event::DustLost(2, 50)
-					),
-				),
-			);
+			System::assert_has_event(Event::pallet_balances(crate::Event::Transfer(2, 3, 450)));
+			System::assert_has_event(Event::pallet_balances(crate::Event::DustLost(2, 50)));
 		}
 	);
 }
@@ -236,23 +217,8 @@ fn transfer_dust_removal_tst2_should_work() {
 			// Number of events expected is 8
 			assert_eq!(System::events().len(), 9);
 
-			assert!(
-				System::events().iter().any(
-					|er|
-					er.event == Event::pallet_balances(
-						crate::Event::Transfer(2, 1, 450),
-					),
-				),
-			);
-
-			assert!(
-				System::events().iter().any(
-					|er|
-					er.event == Event::pallet_balances(
-						crate::Event::DustLost(2, 50),
-					),
-				),
-			);
+			System::assert_has_event(Event::pallet_balances(crate::Event::Transfer(2, 1, 450)));
+			System::assert_has_event(Event::pallet_balances(crate::Event::DustLost(2, 50)));
 		}
 	);
 }
@@ -292,20 +258,11 @@ fn repatriating_reserved_balance_dust_removal_should_work() {
 			// Number of events expected is 10
 			assert_eq!(System::events().len(), 10);
 
-			assert!(
-				System::events().iter().any(
-					|er|
-					er.event == Event::pallet_balances(
-						crate::Event::ReserveRepatriated(2, 1, 450, Status::Free),
-					),
-				),
-			);
-
-			assert_eq!(
-				last_event(),
-				Event::pallet_balances(crate::Event::DustLost(2, 50)),
-			);
+			System::assert_has_event(Event::pallet_balances(
+				crate::Event::ReserveRepatriated(2, 1, 450, Status::Free),
+			));
 
+			System::assert_last_event(Event::pallet_balances(crate::Event::DustLost(2, 50)));
 		}
 	);
 }
diff --git a/frame/bounties/src/benchmarking.rs b/frame/bounties/src/benchmarking.rs
index cb7933079763..b07427db284b 100644
--- a/frame/bounties/src/benchmarking.rs
+++ b/frame/bounties/src/benchmarking.rs
@@ -22,7 +22,7 @@
 use super::*;
 
 use sp_runtime::traits::Bounded;
-use frame_system::{EventRecord, RawOrigin};
+use frame_system::RawOrigin;
 use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
 use frame_support::traits::OnInitialize;
 
@@ -84,11 +84,7 @@ fn setup_pot_account<T: Config>() {
 }
 
 fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
-	let events = frame_system::Pallet::<T>::events();
-	let system_event: <T as frame_system::Config>::Event = generic_event.into();
-	// compare to the last event record
-	let EventRecord { event, .. } = &events[events.len() - 1];
-	assert_eq!(event, &system_event);
+	frame_system::Pallet::<T>::assert_last_event(generic_event.into());
 }
 
 const MAX_BYTES: u32 = 16384;
diff --git a/frame/collective/src/benchmarking.rs b/frame/collective/src/benchmarking.rs
index cd4fcfba5fe1..1f78f07cf923 100644
--- a/frame/collective/src/benchmarking.rs
+++ b/frame/collective/src/benchmarking.rs
@@ -20,7 +20,6 @@
 use super::*;
 
 use frame_system::RawOrigin as SystemOrigin;
-use frame_system::EventRecord;
 use frame_benchmarking::{
 	benchmarks_instance,
 	account,
@@ -39,11 +38,7 @@ const SEED: u32 = 0;
 const MAX_BYTES: u32 = 1_024;
 
 fn assert_last_event<T: Config<I>, I: Instance>(generic_event: <T as Config<I>>::Event) {
-	let events = System::<T>::events();
-	let system_event: <T as frame_system::Config>::Event = generic_event.into();
-	// compare to the last event record
-	let EventRecord { event, .. } = &events[events.len() - 1];
-	assert_eq!(event, &system_event);
+	frame_system::Pallet::<T>::assert_last_event(generic_event.into());
 }
 
 benchmarks_instance! {
diff --git a/frame/democracy/src/benchmarking.rs b/frame/democracy/src/benchmarking.rs
index 78bf9863fd14..2e7af74b22d5 100644
--- a/frame/democracy/src/benchmarking.rs
+++ b/frame/democracy/src/benchmarking.rs
@@ -25,7 +25,7 @@ use frame_support::{
 	traits::{Currency, Get, EnsureOrigin, OnInitialize, UnfilteredDispatchable,
         schedule::DispatchTime},
 };
-use frame_system::{RawOrigin, Pallet as System, self, EventRecord};
+use frame_system::{RawOrigin, Pallet as System, self};
 use sp_runtime::traits::{Bounded, One};
 
 use crate::Pallet as Democracy;
@@ -36,11 +36,7 @@ const MAX_SECONDERS: u32 = 100;
 const MAX_BYTES: u32 = 16_384;
 
 fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
-	let events = System::<T>::events();
-	let system_event: <T as frame_system::Config>::Event = generic_event.into();
-	// compare to the last event record
-	let EventRecord { event, .. } = &events[events.len() - 1];
-	assert_eq!(event, &system_event);
+	frame_system::Pallet::<T>::assert_last_event(generic_event.into());
 }
 
 fn funded_account<T: Config>(name: &'static str, index: u32) -> T::AccountId {
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index dafcc3dd5910..9efe8c826091 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -2132,10 +2132,7 @@ mod tests {
 			System::set_block_number(5);
 			Elections::on_initialize(System::block_number());
 
-			assert_eq!(
-				System::events().iter().last().unwrap().event,
-				Event::elections_phragmen(super::Event::EmptyTerm),
-			)
+			System::assert_last_event(Event::elections_phragmen(super::Event::EmptyTerm));
 		})
 	}
 
@@ -2151,10 +2148,7 @@ mod tests {
 			System::set_block_number(5);
 			Elections::on_initialize(System::block_number());
 
-			assert_eq!(
-				System::events().iter().last().unwrap().event,
-				Event::elections_phragmen(super::Event::NewTerm(vec![(4, 40), (5, 50)])),
-			);
+			System::assert_last_event(Event::elections_phragmen(super::Event::NewTerm(vec![(4, 40), (5, 50)])));
 
 			assert_eq!(members_and_stake(), vec![(4, 40), (5, 50)]);
 			assert_eq!(runners_up_and_stake(), vec![]);
@@ -2165,10 +2159,7 @@ mod tests {
 			System::set_block_number(10);
 			Elections::on_initialize(System::block_number());
 
-			assert_eq!(
-				System::events().iter().last().unwrap().event,
-				Event::elections_phragmen(super::Event::NewTerm(vec![])),
-			);
+			System::assert_last_event(Event::elections_phragmen(super::Event::NewTerm(vec![])));
 
 			// outgoing have lost their bond.
 			assert_eq!(balances(&4), (37, 0));
@@ -2238,10 +2229,7 @@ mod tests {
 			assert_eq!(Elections::election_rounds(), 1);
 			assert!(members_ids().is_empty());
 
-			assert_eq!(
-				System::events().iter().last().unwrap().event,
-				Event::elections_phragmen(super::Event::NewTerm(vec![])),
-			)
+			System::assert_last_event(Event::elections_phragmen(super::Event::NewTerm(vec![])));
 		});
 	}
 
@@ -2599,9 +2587,7 @@ mod tests {
 			// 5 is an outgoing loser. will also get slashed.
 			assert_eq!(balances(&5), (45, 2));
 
-			assert!(System::events().iter().any(|event| {
-				event.event == Event::elections_phragmen(super::Event::NewTerm(vec![(4, 40), (5, 50)]))
-			}));
+			System::assert_has_event(Event::elections_phragmen(super::Event::NewTerm(vec![(4, 40), (5, 50)])));
 		})
 	}
 
diff --git a/frame/identity/src/benchmarking.rs b/frame/identity/src/benchmarking.rs
index 42f2538adafc..0cd2d50529dd 100644
--- a/frame/identity/src/benchmarking.rs
+++ b/frame/identity/src/benchmarking.rs
@@ -21,7 +21,7 @@
 
 use super::*;
 
-use frame_system::{EventRecord, RawOrigin};
+use frame_system::RawOrigin;
 use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
 use sp_runtime::traits::Bounded;
 use frame_support::{ensure, traits::Get};
@@ -30,11 +30,7 @@ use crate::Pallet as Identity;
 const SEED: u32 = 0;
 
 fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
-	let events = frame_system::Pallet::<T>::events();
-	let system_event: <T as frame_system::Config>::Event = generic_event.into();
-	// compare to the last event record
-	let EventRecord { event, .. } = &events[events.len() - 1];
-	assert_eq!(event, &system_event);
+	frame_system::Pallet::<T>::assert_last_event(generic_event.into());
 }
 
 // Adds `r` registrars to the Identity Pallet. These registrars will have set fees and fields.
diff --git a/frame/multisig/src/tests.rs b/frame/multisig/src/tests.rs
index 118cfebdbdce..d6eb949888d1 100644
--- a/frame/multisig/src/tests.rs
+++ b/frame/multisig/src/tests.rs
@@ -124,14 +124,6 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 	ext
 }
 
-fn last_event() -> Event {
-	system::Pallet::<Test>::events().pop().map(|e| e.event).expect("Event expected")
-}
-
-fn expect_event<E: Into<Event>>(e: E) {
-	assert_eq!(last_event(), e.into());
-}
-
 fn now() -> Timepoint<u64> {
 	Multisig::timepoint()
 }
@@ -433,7 +425,7 @@ fn multisig_2_of_3_cannot_reissue_same_call() {
 		assert_ok!(Multisig::as_multi(Origin::signed(3), 2, vec![1, 2], Some(now()), data.clone(), false, call_weight));
 
 		let err = DispatchError::from(BalancesError::<Test, _>::InsufficientBalance).stripped();
-		expect_event(RawEvent::MultisigExecuted(3, now(), multi, hash, Err(err)));
+		System::assert_last_event(RawEvent::MultisigExecuted(3, now(), multi, hash, Err(err)).into());
 	});
 }
 
diff --git a/frame/proxy/src/benchmarking.rs b/frame/proxy/src/benchmarking.rs
index 4027fcbafa0d..336a80dd4ac5 100644
--- a/frame/proxy/src/benchmarking.rs
+++ b/frame/proxy/src/benchmarking.rs
@@ -20,7 +20,7 @@
 #![cfg(feature = "runtime-benchmarks")]
 
 use super::*;
-use frame_system::{RawOrigin, EventRecord};
+use frame_system::RawOrigin;
 use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
 use sp_runtime::traits::Bounded;
 use crate::Pallet as Proxy;
@@ -28,11 +28,7 @@ use crate::Pallet as Proxy;
 const SEED: u32 = 0;
 
 fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
-	let events = frame_system::Pallet::<T>::events();
-	let system_event: <T as frame_system::Config>::Event = generic_event.into();
-	// compare to the last event record
-	let EventRecord { event, .. } = &events[events.len() - 1];
-	assert_eq!(event, &system_event);
+	frame_system::Pallet::<T>::assert_last_event(generic_event.into());
 }
 
 fn add_proxies<T: Config>(n: u32, maybe_who: Option<T::AccountId>) -> Result<(), &'static str> {
diff --git a/frame/proxy/src/tests.rs b/frame/proxy/src/tests.rs
index 6f3b1f35e2ad..0b34edb43e73 100644
--- a/frame/proxy/src/tests.rs
+++ b/frame/proxy/src/tests.rs
@@ -164,14 +164,6 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 	ext
 }
 
-fn last_event() -> Event {
-	system::Pallet::<Test>::events().pop().expect("Event expected").event
-}
-
-fn expect_event<E: Into<Event>>(e: E) {
-	assert_eq!(last_event(), e.into());
-}
-
 fn last_events(n: usize) -> Vec<Event> {
 	system::Pallet::<Test>::events().into_iter().rev().take(n).rev().map(|e| e.event).collect()
 }
@@ -311,11 +303,11 @@ fn filtering_works() {
 
 		let call = Box::new(Call::Balances(BalancesCall::transfer(6, 1)));
 		assert_ok!(Proxy::proxy(Origin::signed(2), 1, None, call.clone()));
-		expect_event(ProxyEvent::ProxyExecuted(Ok(())));
+		System::assert_last_event(ProxyEvent::ProxyExecuted(Ok(())).into());
 		assert_ok!(Proxy::proxy(Origin::signed(3), 1, None, call.clone()));
-		expect_event(ProxyEvent::ProxyExecuted(Ok(())));
+		System::assert_last_event(ProxyEvent::ProxyExecuted(Ok(())).into());
 		assert_ok!(Proxy::proxy(Origin::signed(4), 1, None, call.clone()));
-		expect_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
+		System::assert_last_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)).into());
 
 		let derivative_id = Utility::derivative_account_id(1, 0);
 		assert!(Balances::mutate_account(&derivative_id, |a| a.free = 1000).is_ok());
@@ -323,17 +315,17 @@ fn filtering_works() {
 
 		let call = Box::new(Call::Utility(UtilityCall::as_derivative(0, inner.clone())));
 		assert_ok!(Proxy::proxy(Origin::signed(2), 1, None, call.clone()));
-		expect_event(ProxyEvent::ProxyExecuted(Ok(())));
+		System::assert_last_event(ProxyEvent::ProxyExecuted(Ok(())).into());
 		assert_ok!(Proxy::proxy(Origin::signed(3), 1, None, call.clone()));
-		expect_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
+		System::assert_last_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)).into());
 		assert_ok!(Proxy::proxy(Origin::signed(4), 1, None, call.clone()));
-		expect_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
+		System::assert_last_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)).into());
 
 		let call = Box::new(Call::Utility(UtilityCall::batch(vec![*inner])));
 		assert_ok!(Proxy::proxy(Origin::signed(2), 1, None, call.clone()));
 		expect_events(vec![UtilityEvent::BatchCompleted.into(), ProxyEvent::ProxyExecuted(Ok(())).into()]);
 		assert_ok!(Proxy::proxy(Origin::signed(3), 1, None, call.clone()));
-		expect_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
+		System::assert_last_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)).into());
 		assert_ok!(Proxy::proxy(Origin::signed(4), 1, None, call.clone()));
 		expect_events(vec![
 			UtilityEvent::BatchInterrupted(0, DispatchError::BadOrigin).into(),
@@ -345,7 +337,7 @@ fn filtering_works() {
 		assert_ok!(Proxy::proxy(Origin::signed(2), 1, None, call.clone()));
 		expect_events(vec![UtilityEvent::BatchCompleted.into(), ProxyEvent::ProxyExecuted(Ok(())).into()]);
 		assert_ok!(Proxy::proxy(Origin::signed(3), 1, None, call.clone()));
-		expect_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
+		System::assert_last_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)).into());
 		assert_ok!(Proxy::proxy(Origin::signed(4), 1, None, call.clone()));
 		expect_events(vec![
 			UtilityEvent::BatchInterrupted(0, DispatchError::BadOrigin).into(),
@@ -354,9 +346,9 @@ fn filtering_works() {
 
 		let call = Box::new(Call::Proxy(ProxyCall::remove_proxies()));
 		assert_ok!(Proxy::proxy(Origin::signed(3), 1, None, call.clone()));
-		expect_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
+		System::assert_last_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)).into());
 		assert_ok!(Proxy::proxy(Origin::signed(4), 1, None, call.clone()));
-		expect_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
+		System::assert_last_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)).into());
 		assert_ok!(Proxy::proxy(Origin::signed(2), 1, None, call.clone()));
 		expect_events(vec![BalancesEvent::<Test>::Unreserved(1, 5).into(), ProxyEvent::ProxyExecuted(Ok(())).into()]);
 	});
@@ -413,18 +405,18 @@ fn proxying_works() {
 			Error::<Test>::NotProxy
 		);
 		assert_ok!(Proxy::proxy(Origin::signed(2), 1, None, call.clone()));
-		expect_event(ProxyEvent::ProxyExecuted(Ok(())));
+		System::assert_last_event(ProxyEvent::ProxyExecuted(Ok(())).into());
 		assert_eq!(Balances::free_balance(6), 1);
 
 		let call = Box::new(Call::System(SystemCall::set_code(vec![])));
 		assert_ok!(Proxy::proxy(Origin::signed(3), 1, None, call.clone()));
-		expect_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
+		System::assert_last_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)).into());
 
 		let call = Box::new(Call::Balances(BalancesCall::transfer_keep_alive(6, 1)));
 		assert_ok!(Call::Proxy(super::Call::proxy(1, None, call.clone())).dispatch(Origin::signed(2)));
-		expect_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
+		System::assert_last_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)).into());
 		assert_ok!(Proxy::proxy(Origin::signed(3), 1, None, call.clone()));
-		expect_event(ProxyEvent::ProxyExecuted(Ok(())));
+		System::assert_last_event(ProxyEvent::ProxyExecuted(Ok(())).into());
 		assert_eq!(Balances::free_balance(6), 2);
 	});
 }
@@ -434,7 +426,7 @@ fn anonymous_works() {
 	new_test_ext().execute_with(|| {
 		assert_ok!(Proxy::anonymous(Origin::signed(1), ProxyType::Any, 0, 0));
 		let anon = Proxy::anonymous_account(&1, &ProxyType::Any, 0, None);
-		expect_event(ProxyEvent::AnonymousCreated(anon.clone(), 1, ProxyType::Any, 0));
+		System::assert_last_event(ProxyEvent::AnonymousCreated(anon.clone(), 1, ProxyType::Any, 0).into());
 
 		// other calls to anonymous allowed as long as they're not exactly the same.
 		assert_ok!(Proxy::anonymous(Origin::signed(1), ProxyType::JustTransfer, 0, 0));
@@ -451,13 +443,13 @@ fn anonymous_works() {
 		let call = Box::new(Call::Balances(BalancesCall::transfer(6, 1)));
 		assert_ok!(Balances::transfer(Origin::signed(3), anon, 5));
 		assert_ok!(Proxy::proxy(Origin::signed(1), anon, None, call));
-		expect_event(ProxyEvent::ProxyExecuted(Ok(())));
+		System::assert_last_event(ProxyEvent::ProxyExecuted(Ok(())).into());
 		assert_eq!(Balances::free_balance(6), 1);
 
 		let call = Box::new(Call::Proxy(ProxyCall::kill_anonymous(1, ProxyType::Any, 0, 1, 0)));
 		assert_ok!(Proxy::proxy(Origin::signed(2), anon2, None, call.clone()));
 		let de = DispatchError::from(Error::<Test>::NoPermission).stripped();
-		expect_event(ProxyEvent::ProxyExecuted(Err(de)));
+		System::assert_last_event(ProxyEvent::ProxyExecuted(Err(de)).into());
 		assert_noop!(
 			Proxy::kill_anonymous(Origin::signed(1), 1, ProxyType::Any, 0, 1, 0),
 			Error::<Test>::NoPermission
diff --git a/frame/sudo/src/tests.rs b/frame/sudo/src/tests.rs
index 780e07676b29..2f824ae6a394 100644
--- a/frame/sudo/src/tests.rs
+++ b/frame/sudo/src/tests.rs
@@ -58,8 +58,7 @@ fn sudo_emits_events_correctly() {
 		// Should emit event to indicate success when called with the root `key` and `call` is `Ok`.
 		let call = Box::new(Call::Logger(LoggerCall::privileged_i32_log(42, 1)));
 		assert_ok!(Sudo::sudo(Origin::signed(1), call));
-		let expected_event = TestEvent::sudo(Event::Sudid(Ok(())));
-		assert!(System::events().iter().any(|a| a.event == expected_event));
+		System::assert_has_event(TestEvent::sudo(Event::Sudid(Ok(()))));
 	})
 }
 
@@ -97,8 +96,7 @@ fn sudo_unchecked_weight_emits_events_correctly() {
 		// Should emit event to indicate success when called with the root `key` and `call` is `Ok`.
 		let call = Box::new(Call::Logger(LoggerCall::privileged_i32_log(42, 1)));
 		assert_ok!(Sudo::sudo_unchecked_weight(Origin::signed(1), call, 1_000));
-		let expected_event = TestEvent::sudo(Event::Sudid(Ok(())));
-		assert!(System::events().iter().any(|a| a.event == expected_event));
+		System::assert_has_event(TestEvent::sudo(Event::Sudid(Ok(()))));
 	})
 }
 
@@ -124,12 +122,10 @@ fn set_key_emits_events_correctly() {
 
 		// A root `key` can change the root `key`.
 		assert_ok!(Sudo::set_key(Origin::signed(1), 2));
-		let expected_event = TestEvent::sudo(Event::KeyChanged(1));
-		assert!(System::events().iter().any(|a| a.event == expected_event));
+		System::assert_has_event(TestEvent::sudo(Event::KeyChanged(1)));
 		// Double check.
 		assert_ok!(Sudo::set_key(Origin::signed(2), 4));
-		let expected_event = TestEvent::sudo(Event::KeyChanged(2));
-		assert!(System::events().iter().any(|a| a.event == expected_event));
+		System::assert_has_event(TestEvent::sudo(Event::KeyChanged(2)));
 	});
 }
 
@@ -164,7 +160,6 @@ fn sudo_as_emits_events_correctly() {
 		// A non-privileged function will work when passed to `sudo_as` with the root `key`.
 		let call = Box::new(Call::Logger(LoggerCall::non_privileged_log(42, 1)));
 		assert_ok!(Sudo::sudo_as(Origin::signed(1), 2, call));
-		let expected_event = TestEvent::sudo(Event::SudoAsDone(Ok(())));
-		assert!(System::events().iter().any(|a| a.event == expected_event));
+		System::assert_has_event(TestEvent::sudo(Event::SudoAsDone(Ok(()))));
 	});
 }
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index c3fe68842009..8595b94c08de 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -1449,6 +1449,18 @@ impl<T: Config> Pallet<T> {
 		<EventTopics<T>>::remove_all();
 	}
 
+	/// Assert the given `event` exists.
+	#[cfg(any(feature = "std", feature = "runtime-benchmarks", test))]
+	pub fn assert_has_event(event: T::Event) {
+		assert!(Self::events().iter().any(|record| record.event == event))
+	}
+
+	/// Assert the last event equal to the given `event`.
+	#[cfg(any(feature = "std", feature = "runtime-benchmarks", test))]
+	pub fn assert_last_event(event: T::Event) {
+		assert_eq!(Self::events().last().expect("events expected").event, event);
+	}
+
 	/// Return the chain's current runtime version.
 	pub fn runtime_version() -> RuntimeVersion { T::Version::get() }
 
diff --git a/frame/system/src/tests.rs b/frame/system/src/tests.rs
index 7ad4344ae5c2..25f67d7a1a49 100644
--- a/frame/system/src/tests.rs
+++ b/frame/system/src/tests.rs
@@ -374,6 +374,17 @@ fn deposit_event_topics() {
 	});
 }
 
+#[test]
+fn event_util_functions_should_work() {
+	new_test_ext().execute_with(|| {
+		System::set_block_number(1);
+		System::deposit_event(SysEvent::CodeUpdated);
+
+		System::assert_has_event(SysEvent::CodeUpdated.into());
+		System::assert_last_event(SysEvent::CodeUpdated.into());
+	});
+}
+
 #[test]
 fn prunes_block_hash_mappings() {
 	new_test_ext().execute_with(|| {
diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
index 9ee172931f4e..9e4c97c56d63 100644
--- a/frame/transaction-payment/src/lib.rs
+++ b/frame/transaction-payment/src/lib.rs
@@ -1150,13 +1150,9 @@ mod tests {
 			);
 			assert_eq!(Balances::free_balance(2), 0);
 			// Transfer Event
-			assert!(System::events().iter().any(|event| {
-				event.event == Event::pallet_balances(pallet_balances::Event::Transfer(2, 3, 80))
-			}));
+			System::assert_has_event(Event::pallet_balances(pallet_balances::Event::Transfer(2, 3, 80)));
 			// Killed Event
-			assert!(System::events().iter().any(|event| {
-				event.event == Event::system(system::Event::KilledAccount(2))
-			}));
+			System::assert_has_event(Event::system(system::Event::KilledAccount(2)));
 		});
 	}
 
diff --git a/frame/utility/src/benchmarking.rs b/frame/utility/src/benchmarking.rs
index de7f48d625c5..44019e48c1eb 100644
--- a/frame/utility/src/benchmarking.rs
+++ b/frame/utility/src/benchmarking.rs
@@ -20,17 +20,13 @@
 #![cfg(feature = "runtime-benchmarks")]
 
 use super::*;
-use frame_system::{RawOrigin, EventRecord};
+use frame_system::RawOrigin;
 use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
 
 const SEED: u32 = 0;
 
 fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
-	let events = frame_system::Pallet::<T>::events();
-	let system_event: <T as frame_system::Config>::Event = generic_event.into();
-	// compare to the last event record
-	let EventRecord { event, .. } = &events[events.len() - 1];
-	assert_eq!(event, &system_event);
+	frame_system::Pallet::<T>::assert_last_event(generic_event.into());
 }
 
 benchmarks! {
diff --git a/frame/utility/src/tests.rs b/frame/utility/src/tests.rs
index f13e1b6ef778..1828418bd7fb 100644
--- a/frame/utility/src/tests.rs
+++ b/frame/utility/src/tests.rs
@@ -171,14 +171,6 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 	ext
 }
 
-fn last_event() -> Event {
-	frame_system::Pallet::<Test>::events().pop().map(|e| e.event).expect("Event expected")
-}
-
-fn expect_event<E: Into<Event>>(e: E) {
-	assert_eq!(last_event(), e.into());
-}
-
 #[test]
 fn as_derivative_works() {
 	new_test_ext().execute_with(|| {
@@ -313,7 +305,7 @@ fn batch_with_signed_filters() {
 				Call::Balances(pallet_balances::Call::transfer_keep_alive(2, 1))
 			]),
 		);
-		expect_event(utility::Event::BatchInterrupted(0, DispatchError::BadOrigin));
+		System::assert_last_event(utility::Event::BatchInterrupted(0, DispatchError::BadOrigin).into());
 	});
 }
 
@@ -387,7 +379,7 @@ fn batch_handles_weight_refund() {
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(Origin::signed(1));
 		assert_ok!(result);
-		expect_event(utility::Event::BatchInterrupted(1, DispatchError::Other("")));
+		System::assert_last_event(utility::Event::BatchInterrupted(1, DispatchError::Other("")).into());
 		// No weight is refunded
 		assert_eq!(extract_actual_weight(&result, &info), info.weight);
 
@@ -400,7 +392,7 @@ fn batch_handles_weight_refund() {
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(Origin::signed(1));
 		assert_ok!(result);
-		expect_event(utility::Event::BatchInterrupted(1, DispatchError::Other("")));
+		System::assert_last_event(utility::Event::BatchInterrupted(1, DispatchError::Other("")).into());
 		assert_eq!(extract_actual_weight(&result, &info), info.weight - diff * batch_len);
 
 		// Partial batch completion
@@ -411,7 +403,7 @@ fn batch_handles_weight_refund() {
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(Origin::signed(1));
 		assert_ok!(result);
-		expect_event(utility::Event::BatchInterrupted(1, DispatchError::Other("")));
+		System::assert_last_event(utility::Event::BatchInterrupted(1, DispatchError::Other("")).into());
 		assert_eq!(
 			extract_actual_weight(&result, &info),
 			// Real weight is 2 calls at end_weight

From 5be1f4016526580d4885ac99eec6644b56c863af Mon Sep 17 00:00:00 2001
From: Shaun Wang <spxwang@gmail.com>
Date: Thu, 13 May 2021 00:44:19 +1200
Subject: [PATCH 0732/1194] Migrate pallet-lottery to pallet attribute macro
 (#8762)

* Migrate pallet-lottery to pallet attribute macro.

* Fix metadata inconsistency.

* fix

* Use DispatchResult in call returns.
---
 bin/node/runtime/src/lib.rs       |   2 +-
 frame/lottery/src/benchmarking.rs |  26 +--
 frame/lottery/src/lib.rs          | 304 ++++++++++++++++--------------
 frame/lottery/src/mock.rs         |   2 +-
 frame/lottery/src/tests.rs        |  40 ++--
 5 files changed, 198 insertions(+), 176 deletions(-)

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 05f75b14b960..52eb5e42bd4d 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -1019,7 +1019,7 @@ impl pallet_mmr::Config for Runtime {
 
 parameter_types! {
 	pub const LotteryPalletId: PalletId = PalletId(*b"py/lotto");
-	pub const MaxCalls: usize = 10;
+	pub const MaxCalls: u32 = 10;
 	pub const MaxGenerateRandom: u32 = 10;
 }
 
diff --git a/frame/lottery/src/benchmarking.rs b/frame/lottery/src/benchmarking.rs
index a2b8946ecc49..8fe91088b84e 100644
--- a/frame/lottery/src/benchmarking.rs
+++ b/frame/lottery/src/benchmarking.rs
@@ -22,11 +22,11 @@
 use super::*;
 
 use frame_system::RawOrigin;
-use frame_support::traits::{OnInitialize, UnfilteredDispatchable};
+use frame_support::traits::{EnsureOrigin, OnInitialize, UnfilteredDispatchable};
 use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
 use sp_runtime::traits::{Bounded, Zero};
 
-use crate::Module as Lottery;
+use crate::Pallet as Lottery;
 
 // Set up and start a lottery
 fn setup_lottery<T: Config>(repeat: bool) -> Result<(), &'static str> {
@@ -36,7 +36,7 @@ fn setup_lottery<T: Config>(repeat: bool) -> Result<(), &'static str> {
 	// Calls will be maximum length...
 	let mut calls = vec![
 		frame_system::Call::<T>::set_code(vec![]).into();
-		T::MaxCalls::get().saturating_sub(1)
+		T::MaxCalls::get().saturating_sub(1) as usize
 	];
 	// Last call will be the match for worst case scenario.
 	calls.push(frame_system::Call::<T>::remark(vec![]).into());
@@ -56,10 +56,10 @@ benchmarks! {
 			&frame_system::Call::<T>::set_code(vec![]).into()
 		)?;
 		let already_called: (u32, Vec<CallIndex>) = (
-			LotteryIndex::get(),
+			LotteryIndex::<T>::get(),
 			vec![
 				set_code_index;
-				T::MaxCalls::get().saturating_sub(1)
+				T::MaxCalls::get().saturating_sub(1) as usize
 			],
 		);
 		Participants::<T>::insert(&caller, already_called);
@@ -67,7 +67,7 @@ benchmarks! {
 		let call = frame_system::Call::<T>::remark(vec![]);
 	}: _(RawOrigin::Signed(caller), Box::new(call.into()))
 	verify {
-		assert_eq!(TicketsCount::get(), 1);
+		assert_eq!(TicketsCount::<T>::get(), 1);
 	}
 
 	set_calls {
@@ -76,11 +76,11 @@ benchmarks! {
 
 		let call = Call::<T>::set_calls(calls);
 		let origin = T::ManagerOrigin::successful_origin();
-		assert!(CallIndices::get().is_empty());
+		assert!(CallIndices::<T>::get().is_empty());
 	}: { call.dispatch_bypass_filter(origin)? }
 	verify {
 		if !n.is_zero() {
-			assert!(!CallIndices::get().is_empty());
+			assert!(!CallIndices::<T>::get().is_empty());
 		}
 	}
 
@@ -120,7 +120,7 @@ benchmarks! {
 		// Kill user account for worst case
 		T::Currency::make_free_balance_be(&winner, 0u32.into());
 		// Assert that lotto is set up for winner
-		assert_eq!(TicketsCount::get(), 1);
+		assert_eq!(TicketsCount::<T>::get(), 1);
 		assert!(!Lottery::<T>::pot().1.is_zero());
 	}: {
 		// Generate `MaxGenerateRandom` numbers for worst case scenario
@@ -132,7 +132,7 @@ benchmarks! {
 	}
 	verify {
 		assert!(crate::Lottery::<T>::get().is_none());
-		assert_eq!(TicketsCount::get(), 0);
+		assert_eq!(TicketsCount::<T>::get(), 0);
 		assert_eq!(Lottery::<T>::pot().1, 0u32.into());
 		assert!(!T::Currency::free_balance(&winner).is_zero())
 	}
@@ -151,7 +151,7 @@ benchmarks! {
 		// Kill user account for worst case
 		T::Currency::make_free_balance_be(&winner, 0u32.into());
 		// Assert that lotto is set up for winner
-		assert_eq!(TicketsCount::get(), 1);
+		assert_eq!(TicketsCount::<T>::get(), 1);
 		assert!(!Lottery::<T>::pot().1.is_zero());
 	}: {
 		// Generate `MaxGenerateRandom` numbers for worst case scenario
@@ -163,8 +163,8 @@ benchmarks! {
 	}
 	verify {
 		assert!(crate::Lottery::<T>::get().is_some());
-		assert_eq!(LotteryIndex::get(), 2);
-		assert_eq!(TicketsCount::get(), 0);
+		assert_eq!(LotteryIndex::<T>::get(), 2);
+		assert_eq!(TicketsCount::<T>::get(), 0);
 		assert_eq!(Lottery::<T>::pot().1, 0u32.into());
 		assert!(!T::Currency::free_balance(&winner).is_zero())
 	}
diff --git a/frame/lottery/src/lib.rs b/frame/lottery/src/lib.rs
index a7782de02902..5d6940c93b3e 100644
--- a/frame/lottery/src/lib.rs
+++ b/frame/lottery/src/lib.rs
@@ -60,58 +60,18 @@ use sp_runtime::{
 	traits::{AccountIdConversion, Saturating, Zero},
 };
 use frame_support::{
-	Parameter, decl_module, decl_error, decl_event, decl_storage, ensure, RuntimeDebug,
+	ensure, PalletId, RuntimeDebug,
 	dispatch::{Dispatchable, DispatchResult, GetDispatchInfo},
 	traits::{
-		Currency, ReservableCurrency, Get, EnsureOrigin, ExistenceRequirement::KeepAlive, Randomness,
+		Currency, ReservableCurrency, Get, ExistenceRequirement::KeepAlive, Randomness,
 	},
 };
-use frame_support::{weights::Weight, PalletId};
-use frame_system::ensure_signed;
 use codec::{Encode, Decode};
 pub use weights::WeightInfo;
+pub use pallet::*;
 
 type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 
-/// The module's config trait.
-pub trait Config: frame_system::Config {
-	/// The Lottery's module id
-	type PalletId: Get<PalletId>;
-
-	/// A dispatchable call.
-	type Call: Parameter + Dispatchable<Origin=Self::Origin> + GetDispatchInfo + From<frame_system::Call<Self>>;
-
-	/// The currency trait.
-	type Currency: ReservableCurrency<Self::AccountId>;
-
-	/// Something that provides randomness in the runtime.
-	type Randomness: Randomness<Self::Hash, Self::BlockNumber>;
-
-	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
-
-	/// The manager origin.
-	type ManagerOrigin: EnsureOrigin<Self::Origin>;
-
-	/// The max number of calls available in a single lottery.
-	type MaxCalls: Get<usize>;
-
-	/// Used to determine if a call would be valid for purchasing a ticket.
-	///
-	/// Be conscious of the implementation used here. We assume at worst that
-	/// a vector of `MaxCalls` indices are queried for any call validation.
-	/// You may need to provide a custom benchmark if this assumption is broken.
-	type ValidateCall: ValidateCall<Self>;
-
-	/// Number of time we should try to generate a random number that has no modulo bias.
-	/// The larger this number, the more potential computation is used for picking the winner,
-	/// but also the more likely that the chosen winner is done fairly.
-	type MaxGenerateRandom: Get<u32>;
-
-	/// Weight information for extrinsics in this pallet.
-	type WeightInfo: WeightInfo;
-}
-
 // Any runtime call can be encoded into two bytes which represent the pallet and call index.
 // We use this to uniquely match someone's incoming call with the calls configured for the lottery.
 type CallIndex = (u8, u8);
@@ -139,9 +99,9 @@ impl<T: Config> ValidateCall<T> for () {
 	fn validate_call(_: &<T as Config>::Call) -> bool { false }
 }
 
-impl<T: Config> ValidateCall<T> for Module<T> {
+impl<T: Config> ValidateCall<T> for Pallet<T> {
 	fn validate_call(call: &<T as Config>::Call) -> bool {
-		let valid_calls = CallIndices::get();
+		let valid_calls = CallIndices::<T>::get();
 		let call_index = match Self::call_to_index(&call) {
 			Ok(call_index) => call_index,
 			Err(_) => return false,
@@ -150,44 +110,74 @@ impl<T: Config> ValidateCall<T> for Module<T> {
 	}
 }
 
-decl_storage! {
-	trait Store for Module<T: Config> as Lottery {
-		LotteryIndex: u32;
-		/// The configuration for the current lottery.
-		Lottery: Option<LotteryConfig<T::BlockNumber, BalanceOf<T>>>;
-		/// Users who have purchased a ticket. (Lottery Index, Tickets Purchased)
-		Participants: map hasher(twox_64_concat) T::AccountId => (u32, Vec<CallIndex>);
-		/// Total number of tickets sold.
-		TicketsCount: u32;
-		/// Each ticket's owner.
+#[frame_support::pallet]
+pub mod pallet {
+	use frame_support::{Parameter, pallet_prelude::*, traits::EnsureOrigin, weights::Weight};
+	use frame_system::{ensure_signed, pallet_prelude::*};
+	use super::*;
+
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(_);
+
+	/// The pallet's config trait.
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		/// The Lottery's pallet id
+		#[pallet::constant]
+		type PalletId: Get<PalletId>;
+
+		/// A dispatchable call.
+		type Call: Parameter + Dispatchable<Origin=Self::Origin> + GetDispatchInfo + From<frame_system::Call<Self>>;
+
+		/// The currency trait.
+		type Currency: ReservableCurrency<Self::AccountId>;
+
+		/// Something that provides randomness in the runtime.
+		type Randomness: Randomness<Self::Hash, Self::BlockNumber>;
+
+		/// The overarching event type.
+		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
+
+		/// The manager origin.
+		type ManagerOrigin: EnsureOrigin<Self::Origin>;
+
+		/// The max number of calls available in a single lottery.
+		#[pallet::constant]
+		type MaxCalls: Get<u32>;
+
+		/// Used to determine if a call would be valid for purchasing a ticket.
 		///
-		/// May have residual storage from previous lotteries. Use `TicketsCount` to see which ones
-		/// are actually valid ticket mappings.
-		Tickets: map hasher(twox_64_concat) u32 => Option<T::AccountId>;
-		/// The calls stored in this pallet to be used in an active lottery if configured
-		/// by `Config::ValidateCall`.
-		CallIndices: Vec<CallIndex>;
+		/// Be conscious of the implementation used here. We assume at worst that
+		/// a vector of `MaxCalls` indices are queried for any call validation.
+		/// You may need to provide a custom benchmark if this assumption is broken.
+		type ValidateCall: ValidateCall<Self>;
+
+		/// Number of time we should try to generate a random number that has no modulo bias.
+		/// The larger this number, the more potential computation is used for picking the winner,
+		/// but also the more likely that the chosen winner is done fairly.
+		type MaxGenerateRandom: Get<u32>;
+
+		/// Weight information for extrinsics in this pallet.
+		type WeightInfo: WeightInfo;
 	}
-}
 
-decl_event!(
-	pub enum Event<T> where
-		<T as frame_system::Config>::AccountId,
-		Balance = BalanceOf<T>,
-	{
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	#[pallet::metadata(T::AccountId = "AccountId", BalanceOf<T> = "Balance")]
+	pub enum Event<T: Config> {
 		/// A lottery has been started!
 		LotteryStarted,
 		/// A new set of calls have been set!
 		CallsUpdated,
 		/// A winner has been chosen!
-		Winner(AccountId, Balance),
+		Winner(T::AccountId, BalanceOf<T>),
 		/// A ticket has been bought!
-		TicketBought(AccountId, CallIndex),
+		TicketBought(T::AccountId, CallIndex),
 	}
-);
 
-decl_error! {
-	pub enum Error for Module<T: Config> {
+	#[pallet::error]
+	pub enum Error<T> {
 		/// A lottery has not been configured.
 		NotConfigured,
 		/// A lottery is already in progress.
@@ -203,17 +193,84 @@ decl_error! {
 		/// Failed to encode calls
 		EncodingFailed,
 	}
-}
 
-decl_module! {
-	pub struct Module<T: Config> for enum Call where origin: T::Origin, system = frame_system {
-		type Error = Error<T>;
+	#[pallet::storage]
+	pub(crate) type LotteryIndex<T> = StorageValue<_, u32, ValueQuery>;
+
+	/// The configuration for the current lottery.
+	#[pallet::storage]
+	pub(crate) type Lottery<T: Config> = StorageValue<_, LotteryConfig<T::BlockNumber, BalanceOf<T>>>;
+
+	/// Users who have purchased a ticket. (Lottery Index, Tickets Purchased)
+	#[pallet::storage]
+	pub(crate) type Participants<T: Config> = StorageMap<
+		_,
+		Twox64Concat, T::AccountId,
+		(u32, Vec<CallIndex>),
+		ValueQuery,
+	>;
+
+	/// Total number of tickets sold.
+	#[pallet::storage]
+	pub(crate) type TicketsCount<T> = StorageValue<_, u32, ValueQuery>;
+
+	/// Each ticket's owner.
+	///
+	/// May have residual storage from previous lotteries. Use `TicketsCount` to see which ones
+	/// are actually valid ticket mappings.
+	#[pallet::storage]
+	pub(crate) type Tickets<T: Config> = StorageMap<_, Twox64Concat, u32, T::AccountId>;
+
+	/// The calls stored in this pallet to be used in an active lottery if configured
+	/// by `Config::ValidateCall`.
+	#[pallet::storage]
+	pub(crate) type CallIndices<T> = StorageValue<_, Vec<CallIndex>, ValueQuery>;
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+		fn on_initialize(n: T::BlockNumber) -> Weight {
+			Lottery::<T>::mutate(|mut lottery| -> Weight {
+				if let Some(config) = &mut lottery {
+					let payout_block = config.start
+						.saturating_add(config.length)
+						.saturating_add(config.delay);
+					if payout_block <= n {
+						let (lottery_account, lottery_balance) = Self::pot();
+						let ticket_count = TicketsCount::<T>::get();
 
-		const PalletId: PalletId = T::PalletId::get();
-		const MaxCalls: u32 = T::MaxCalls::get() as u32;
+						let winning_number = Self::choose_winner(ticket_count);
+						let winner = Tickets::<T>::get(winning_number).unwrap_or(lottery_account);
+						// Not much we can do if this fails...
+						let res = T::Currency::transfer(&Self::account_id(), &winner, lottery_balance, KeepAlive);
+						debug_assert!(res.is_ok());
+
+						Self::deposit_event(Event::<T>::Winner(winner, lottery_balance));
+
+						TicketsCount::<T>::kill();
 
-		fn deposit_event() = default;
+						if config.repeat {
+							// If lottery should repeat, increment index by 1.
+							LotteryIndex::<T>::mutate(|index| *index = index.saturating_add(1));
+							// Set a new start with the current block.
+							config.start = n;
+							return T::WeightInfo::on_initialize_repeat()
+						} else {
+							// Else, kill the lottery storage.
+							*lottery = None;
+							return T::WeightInfo::on_initialize_end()
+						}
+						// We choose not need to kill Participants and Tickets to avoid a large number
+						// of writes at one time. Instead, data persists between lotteries, but is not used
+						// if it is not relevant.
+					}
+				}
+				return T::DbWeight::get().reads(1)
+			})
+		}
+	}
 
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
 		/// Buy a ticket to enter the lottery.
 		///
 		/// This extrinsic acts as a passthrough function for `call`. In all
@@ -225,15 +282,16 @@ decl_module! {
 		/// should listen for the `TicketBought` event.
 		///
 		/// This extrinsic must be called by a signed origin.
-		#[weight =
+		#[pallet::weight(
 			T::WeightInfo::buy_ticket()
 				.saturating_add(call.get_dispatch_info().weight)
-		]
-		fn buy_ticket(origin, call: Box<<T as Config>::Call>) {
+		)]
+		pub(crate) fn buy_ticket(origin: OriginFor<T>, call: Box<<T as Config>::Call>) -> DispatchResult {
 			let caller = ensure_signed(origin.clone())?;
 			call.clone().dispatch(origin).map_err(|e| e.error)?;
 
 			let _ = Self::do_buy_ticket(&caller, &call);
+			Ok(())
 		}
 
 		/// Set calls in storage which can be used to purchase a lottery ticket.
@@ -242,17 +300,18 @@ decl_module! {
 		/// provided by this pallet, which uses storage to determine the valid calls.
 		///
 		/// This extrinsic must be called by the Manager origin.
-		#[weight = T::WeightInfo::set_calls(calls.len() as u32)]
-		fn set_calls(origin, calls: Vec<<T as Config>::Call>) {
+		#[pallet::weight(T::WeightInfo::set_calls(calls.len() as u32))]
+		pub(crate) fn set_calls(origin: OriginFor<T>, calls: Vec<<T as Config>::Call>) -> DispatchResult {
 			T::ManagerOrigin::ensure_origin(origin)?;
-			ensure!(calls.len() <= T::MaxCalls::get(), Error::<T>::TooManyCalls);
+			ensure!(calls.len() <= T::MaxCalls::get() as usize, Error::<T>::TooManyCalls);
 			if calls.is_empty() {
-				CallIndices::kill();
+				CallIndices::<T>::kill();
 			} else {
 				let indices = Self::calls_to_indices(&calls)?;
-				CallIndices::put(indices);
+				CallIndices::<T>::put(indices);
 			}
-			Self::deposit_event(RawEvent::CallsUpdated);
+			Self::deposit_event(Event::<T>::CallsUpdated);
+			Ok(())
 		}
 
 		/// Start a lottery using the provided configuration.
@@ -265,17 +324,18 @@ decl_module! {
 		/// * `length`: How long the lottery should run for starting at the current block.
 		/// * `delay`: How long after the lottery end we should wait before picking a winner.
 		/// * `repeat`: If the lottery should repeat when completed.
-		#[weight = T::WeightInfo::start_lottery()]
-		fn start_lottery(origin,
+		#[pallet::weight(T::WeightInfo::start_lottery())]
+		pub(crate) fn start_lottery(
+			origin: OriginFor<T>,
 			price: BalanceOf<T>,
 			length: T::BlockNumber,
 			delay: T::BlockNumber,
 			repeat: bool,
-		) {
+		) -> DispatchResult {
 			T::ManagerOrigin::ensure_origin(origin)?;
 			Lottery::<T>::try_mutate(|lottery| -> DispatchResult {
 				ensure!(lottery.is_none(), Error::<T>::InProgress);
-				let index = LotteryIndex::get();
+				let index = LotteryIndex::<T>::get();
 				let new_index = index.checked_add(1).ok_or(ArithmeticError::Overflow)?;
 				let start = frame_system::Pallet::<T>::block_number();
 				// Use new_index to more easily track everything with the current state.
@@ -286,7 +346,7 @@ decl_module! {
 					delay,
 					repeat,
 				});
-				LotteryIndex::put(new_index);
+				LotteryIndex::<T>::put(new_index);
 				Ok(())
 			})?;
 			// Make sure pot exists.
@@ -294,66 +354,28 @@ decl_module! {
 			if T::Currency::total_balance(&lottery_account).is_zero() {
 				T::Currency::deposit_creating(&lottery_account, T::Currency::minimum_balance());
 			}
-			Self::deposit_event(RawEvent::LotteryStarted);
+			Self::deposit_event(Event::<T>::LotteryStarted);
+			Ok(())
 		}
 
 		/// If a lottery is repeating, you can use this to stop the repeat.
 		/// The lottery will continue to run to completion.
 		///
 		/// This extrinsic must be called by the `ManagerOrigin`.
-		#[weight = T::WeightInfo::stop_repeat()]
-		fn stop_repeat(origin) {
+		#[pallet::weight(T::WeightInfo::stop_repeat())]
+		pub(crate) fn stop_repeat(origin: OriginFor<T>) -> DispatchResult {
 			T::ManagerOrigin::ensure_origin(origin)?;
 			Lottery::<T>::mutate(|mut lottery| {
 				if let Some(config) = &mut lottery {
 					config.repeat = false
 				}
 			});
-		}
-
-		fn on_initialize(n: T::BlockNumber) -> Weight {
-			Lottery::<T>::mutate(|mut lottery| -> Weight {
-				if let Some(config) = &mut lottery {
-					let payout_block = config.start
-						.saturating_add(config.length)
-						.saturating_add(config.delay);
-					if payout_block <= n {
-						let (lottery_account, lottery_balance) = Self::pot();
-						let ticket_count = TicketsCount::get();
-
-						let winning_number = Self::choose_winner(ticket_count);
-						let winner = Tickets::<T>::get(winning_number).unwrap_or(lottery_account);
-						// Not much we can do if this fails...
-						let res = T::Currency::transfer(&Self::account_id(), &winner, lottery_balance, KeepAlive);
-						debug_assert!(res.is_ok());
-
-						Self::deposit_event(RawEvent::Winner(winner, lottery_balance));
-
-						TicketsCount::kill();
-
-						if config.repeat {
-							// If lottery should repeat, increment index by 1.
-							LotteryIndex::mutate(|index| *index = index.saturating_add(1));
-							// Set a new start with the current block.
-							config.start = n;
-							return T::WeightInfo::on_initialize_repeat()
-						} else {
-							// Else, kill the lottery storage.
-							*lottery = None;
-							return T::WeightInfo::on_initialize_end()
-						}
-						// We choose not need to kill Participants and Tickets to avoid a large number
-						// of writes at one time. Instead, data persists between lotteries, but is not used
-						// if it is not relevant.
-					}
-				}
-				return T::DbWeight::get().reads(1)
-			})
+			Ok(())
 		}
 	}
 }
 
-impl<T: Config> Module<T> {
+impl<T: Config> Pallet<T> {
 	/// The account ID of the lottery pot.
 	///
 	/// This actually does computation. If you need to keep using it, then make sure you cache the
@@ -397,11 +419,11 @@ impl<T: Config> Module<T> {
 		ensure!(block_number < config.start.saturating_add(config.length), Error::<T>::AlreadyEnded);
 		ensure!(T::ValidateCall::validate_call(call), Error::<T>::InvalidCall);
 		let call_index = Self::call_to_index(call)?;
-		let ticket_count = TicketsCount::get();
+		let ticket_count = TicketsCount::<T>::get();
 		let new_ticket_count = ticket_count.checked_add(1).ok_or(ArithmeticError::Overflow)?;
 		// Try to update the participant status
 		Participants::<T>::try_mutate(&caller, |(lottery_index, participating_calls)| -> DispatchResult {
-			let index = LotteryIndex::get();
+			let index = LotteryIndex::<T>::get();
 			// If lottery index doesn't match, then reset participating calls and index.
 			if *lottery_index != index {
 				*participating_calls = Vec::new();
@@ -413,13 +435,13 @@ impl<T: Config> Module<T> {
 			// Check user has enough funds and send it to the Lottery account.
 			T::Currency::transfer(caller, &Self::account_id(), config.price, KeepAlive)?;
 			// Create a new ticket.
-			TicketsCount::put(new_ticket_count);
+			TicketsCount::<T>::put(new_ticket_count);
 			Tickets::<T>::insert(ticket_count, caller.clone());
 			participating_calls.push(call_index);
 			Ok(())
 		})?;
 
-		Self::deposit_event(RawEvent::TicketBought(caller.clone(), call_index));
+		Self::deposit_event(Event::<T>::TicketBought(caller.clone(), call_index));
 
 		Ok(())
 	}
diff --git a/frame/lottery/src/mock.rs b/frame/lottery/src/mock.rs
index ca372cc37e24..b668fba85951 100644
--- a/frame/lottery/src/mock.rs
+++ b/frame/lottery/src/mock.rs
@@ -97,7 +97,7 @@ impl pallet_balances::Config for Test {
 
 parameter_types! {
 	pub const LotteryPalletId: PalletId = PalletId(*b"py/lotto");
-	pub const MaxCalls: usize = 2;
+	pub const MaxCalls: u32 = 2;
 	pub const MaxGenerateRandom: u32 = 10;
 }
 
diff --git a/frame/lottery/src/tests.rs b/frame/lottery/src/tests.rs
index 03c542d5000d..38994b2864c6 100644
--- a/frame/lottery/src/tests.rs
+++ b/frame/lottery/src/tests.rs
@@ -32,7 +32,7 @@ fn initial_state() {
 		assert_eq!(Balances::free_balance(Lottery::account_id()), 0);
 		assert!(crate::Lottery::<Test>::get().is_none());
 		assert_eq!(Participants::<Test>::get(&1), (0, vec![]));
-		assert_eq!(TicketsCount::get(), 0);
+		assert_eq!(TicketsCount::<Test>::get(), 0);
 		assert!(Tickets::<Test>::get(0).is_none());
 	});
 }
@@ -61,7 +61,7 @@ fn basic_end_to_end_works() {
 		// 20 from the transfer, 10 from buying a ticket
 		assert_eq!(Balances::free_balance(&1), 100 - 20 - 10);
 		assert_eq!(Participants::<Test>::get(&1).1.len(), 1);
-		assert_eq!(TicketsCount::get(), 1);
+		assert_eq!(TicketsCount::<Test>::get(), 1);
 		// 1 owns the 0 ticket
 		assert_eq!(Tickets::<Test>::get(0), Some(1));
 
@@ -69,21 +69,21 @@ fn basic_end_to_end_works() {
 		assert_ok!(Lottery::buy_ticket(Origin::signed(2), call.clone()));
 		assert_ok!(Lottery::buy_ticket(Origin::signed(3), call.clone()));
 		assert_ok!(Lottery::buy_ticket(Origin::signed(4), call.clone()));
-		assert_eq!(TicketsCount::get(), 4);
+		assert_eq!(TicketsCount::<Test>::get(), 4);
 
 		// Go to end
 		run_to_block(20);
 		assert_ok!(Lottery::buy_ticket(Origin::signed(5), call.clone()));
 		// Ticket isn't bought
-		assert_eq!(TicketsCount::get(), 4);
+		assert_eq!(TicketsCount::<Test>::get(), 4);
 
 		// Go to payout
 		run_to_block(25);
 		// User 1 wins
 		assert_eq!(Balances::free_balance(&1), 70 + 40);
 		// Lottery is reset and restarted
-		assert_eq!(TicketsCount::get(), 0);
-		assert_eq!(LotteryIndex::get(), 2);
+		assert_eq!(TicketsCount::<Test>::get(), 0);
+		assert_eq!(LotteryIndex::<Test>::get(), 2);
 		assert_eq!(
 			crate::Lottery::<Test>::get().unwrap(),
 			LotteryConfig {
@@ -100,7 +100,7 @@ fn basic_end_to_end_works() {
 #[test]
 fn set_calls_works() {
 	new_test_ext().execute_with(|| {
-		assert!(!CallIndices::exists());
+		assert!(!CallIndices::<Test>::exists());
 
 		let calls = vec![
 			Call::Balances(BalancesCall::force_transfer(0, 0, 0)),
@@ -108,7 +108,7 @@ fn set_calls_works() {
 		];
 
 		assert_ok!(Lottery::set_calls(Origin::root(), calls));
-		assert!(CallIndices::exists());
+		assert!(CallIndices::<Test>::exists());
 
 		let too_many_calls = vec![
 			Call::Balances(BalancesCall::force_transfer(0, 0, 0)),
@@ -123,7 +123,7 @@ fn set_calls_works() {
 
 		// Clear calls
 		assert_ok!(Lottery::set_calls(Origin::root(), vec![]));
-		assert!(CallIndices::get().is_empty());
+		assert!(CallIndices::<Test>::get().is_empty());
 	});
 }
 
@@ -161,7 +161,7 @@ fn buy_ticket_works_as_simple_passthrough() {
 		// This is just a basic transfer then
 		assert_ok!(Lottery::buy_ticket(Origin::signed(1), call.clone()));
 		assert_eq!(Balances::free_balance(&1), 100 - 20);
-		assert_eq!(TicketsCount::get(), 0);
+		assert_eq!(TicketsCount::<Test>::get(), 0);
 
 		// Lottery is set up, but too expensive to enter, so `do_buy_ticket` fails.
 		let calls = vec![
@@ -174,7 +174,7 @@ fn buy_ticket_works_as_simple_passthrough() {
 		assert_ok!(Lottery::start_lottery(Origin::root(), 60, 10, 5, false));
 		assert_ok!(Lottery::buy_ticket(Origin::signed(1), call.clone()));
 		assert_eq!(Balances::free_balance(&1), 100 - 20 - 20);
-		assert_eq!(TicketsCount::get(), 0);
+		assert_eq!(TicketsCount::<Test>::get(), 0);
 
 		// If call would fail, the whole thing still fails the same
 		let fail_call = Box::new(Call::Balances(BalancesCall::transfer(2, 1000)));
@@ -192,11 +192,11 @@ fn buy_ticket_works_as_simple_passthrough() {
 		// User can call other txs, but doesn't get a ticket
 		let remark_call = Box::new(Call::System(SystemCall::remark(b"hello, world!".to_vec())));
 		assert_ok!(Lottery::buy_ticket(Origin::signed(2), remark_call));
-		assert_eq!(TicketsCount::get(), 0);
+		assert_eq!(TicketsCount::<Test>::get(), 0);
 
 		let successful_call = Box::new(Call::Balances(BalancesCall::transfer(2, 1)));
 		assert_ok!(Lottery::buy_ticket(Origin::signed(2), successful_call));
-		assert_eq!(TicketsCount::get(), 1);
+		assert_eq!(TicketsCount::<Test>::get(), 1);
 	});
 }
 
@@ -214,7 +214,7 @@ fn buy_ticket_works() {
 		// Can't buy ticket before start
 		let call = Box::new(Call::Balances(BalancesCall::transfer(2, 1)));
 		assert_ok!(Lottery::buy_ticket(Origin::signed(1), call.clone()));
-		assert_eq!(TicketsCount::get(), 0);
+		assert_eq!(TicketsCount::<Test>::get(), 0);
 
 		// Start lottery
 		assert_ok!(Lottery::start_lottery(Origin::root(), 1, 20, 5, false));
@@ -222,28 +222,28 @@ fn buy_ticket_works() {
 		// Go to start, buy ticket for transfer
 		run_to_block(5);
 		assert_ok!(Lottery::buy_ticket(Origin::signed(1), call));
-		assert_eq!(TicketsCount::get(), 1);
+		assert_eq!(TicketsCount::<Test>::get(), 1);
 
 		// Can't buy another of the same ticket (even if call is slightly changed)
 		let call = Box::new(Call::Balances(BalancesCall::transfer(3, 30)));
 		assert_ok!(Lottery::buy_ticket(Origin::signed(1), call));
-		assert_eq!(TicketsCount::get(), 1);
+		assert_eq!(TicketsCount::<Test>::get(), 1);
 
 		// Buy ticket for remark
 		let call = Box::new(Call::System(SystemCall::remark(b"hello, world!".to_vec())));
 		assert_ok!(Lottery::buy_ticket(Origin::signed(1), call.clone()));
-		assert_eq!(TicketsCount::get(), 2);
+		assert_eq!(TicketsCount::<Test>::get(), 2);
 
 		// Go to end, can't buy tickets anymore
 		run_to_block(20);
 		assert_ok!(Lottery::buy_ticket(Origin::signed(2), call.clone()));
-		assert_eq!(TicketsCount::get(), 2);
+		assert_eq!(TicketsCount::<Test>::get(), 2);
 
 		// Go to payout, can't buy tickets when there is no lottery open
 		run_to_block(25);
 		assert_ok!(Lottery::buy_ticket(Origin::signed(2), call.clone()));
-		assert_eq!(TicketsCount::get(), 0);
-		assert_eq!(LotteryIndex::get(), 1);
+		assert_eq!(TicketsCount::<Test>::get(), 0);
+		assert_eq!(LotteryIndex::<Test>::get(), 1);
 	});
 }
 

From a5ed21ec0f22f9dbdf2ec5fdf66640ce64980f7b Mon Sep 17 00:00:00 2001
From: Nikolay Volf <nikvolf@gmail.com>
Date: Wed, 12 May 2021 16:48:01 +0400
Subject: [PATCH 0733/1194] update environmental (#8789)

---
 Cargo.lock                          | 4 ++--
 primitives/externalities/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f11953213d01..71cb808d83d4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1534,9 +1534,9 @@ dependencies = [
 
 [[package]]
 name = "environmental"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6576a1755ddffd988788025e75bce9e74b018f7cc226198fe931d077911c6d7e"
+checksum = "68b91989ae21441195d7d9b9993a2f9295c7e1a8c96255d8b729accddc124797"
 
 [[package]]
 name = "erased-serde"
diff --git a/primitives/externalities/Cargo.toml b/primitives/externalities/Cargo.toml
index 05de1837dc1d..8552f50ec71b 100644
--- a/primitives/externalities/Cargo.toml
+++ b/primitives/externalities/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 sp-storage = { version = "3.0.0", path = "../storage", default-features = false }
 sp-std = { version = "3.0.0", path = "../std", default-features = false }
-environmental = { version = "1.1.2", default-features = false }
+environmental = { version = "1.1.3", default-features = false }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 
 [features]

From 53782aef1c7e950319957c8822333a9254c5a6f9 Mon Sep 17 00:00:00 2001
From: Shaun Wang <spxwang@gmail.com>
Date: Thu, 13 May 2021 00:50:22 +1200
Subject: [PATCH 0734/1194] Migrate pallet-recovery to pallet attribute macro
 (#8761)

* Migrate pallet-recovery to pallet attribute macro.

* Fix metadata inconsistency.

* Use DispatchResult as call returns.

* Apply review suggestions.
---
 frame/recovery/src/lib.rs | 265 ++++++++++++++++++++------------------
 1 file changed, 143 insertions(+), 122 deletions(-)

diff --git a/frame/recovery/src/lib.rs b/frame/recovery/src/lib.rs
index cf81e7b033c7..89b6b6692647 100644
--- a/frame/recovery/src/lib.rs
+++ b/frame/recovery/src/lib.rs
@@ -152,19 +152,16 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use sp_std::prelude::*;
-use sp_runtime::{
-	traits::{Dispatchable, SaturatedConversion, CheckedAdd, CheckedMul},
-	DispatchResult, ArithmeticError,
-};
+use sp_runtime::traits::{Dispatchable, SaturatedConversion, CheckedAdd, CheckedMul};
 use codec::{Encode, Decode};
 
 use frame_support::{
-	decl_module, decl_event, decl_storage, decl_error, ensure,
-	Parameter, RuntimeDebug, weights::GetDispatchInfo,
-	traits::{Currency, ReservableCurrency, Get, BalanceStatus},
+	RuntimeDebug, weights::GetDispatchInfo,
+	traits::{Currency, ReservableCurrency, BalanceStatus},
 	dispatch::PostDispatchInfo,
 };
-use frame_system::{self as system, ensure_signed, ensure_root};
+
+pub use pallet::*;
 
 #[cfg(test)]
 mod mock;
@@ -174,41 +171,6 @@ mod tests;
 type BalanceOf<T> =
 	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 
-/// Configuration trait.
-pub trait Config: frame_system::Config {
-	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
-
-	/// The overarching call type.
-	type Call: Parameter + Dispatchable<Origin=Self::Origin, PostInfo=PostDispatchInfo> + GetDispatchInfo;
-
-	/// The currency mechanism.
-	type Currency: ReservableCurrency<Self::AccountId>;
-
-	/// The base amount of currency needed to reserve for creating a recovery configuration.
-	///
-	/// This is held for an additional storage item whose value size is
-	/// `2 + sizeof(BlockNumber, Balance)` bytes.
-	type ConfigDepositBase: Get<BalanceOf<Self>>;
-
-	/// The amount of currency needed per additional user when creating a recovery configuration.
-	///
-	/// This is held for adding `sizeof(AccountId)` bytes more into a pre-existing storage value.
-	type FriendDepositFactor: Get<BalanceOf<Self>>;
-
-	/// The maximum amount of friends allowed in a recovery configuration.
-	type MaxFriends: Get<u16>;
-
-	/// The base amount of currency needed to reserve for starting a recovery.
-	///
-	/// This is primarily held for deterring malicious recovery attempts, and should
-	/// have a value large enough that a bad actor would choose not to place this
-	/// deposit. It also acts to fund additional storage item whose value size is
-	/// `sizeof(BlockNumber, Balance + T * AccountId)` bytes. Where T is a configurable
-	/// threshold.
-	type RecoveryDeposit: Get<BalanceOf<Self>>;
-}
-
 /// An active recovery process.
 #[derive(Clone, Eq, PartialEq, Encode, Decode, Default, RuntimeDebug)]
 pub struct ActiveRecovery<BlockNumber, Balance, AccountId> {
@@ -236,55 +198,82 @@ pub struct RecoveryConfig<BlockNumber, Balance, AccountId> {
 	threshold: u16,
 }
 
-decl_storage! {
-	trait Store for Module<T: Config> as Recovery {
-		/// The set of recoverable accounts and their recovery configuration.
-		pub Recoverable get(fn recovery_config):
-			map hasher(twox_64_concat) T::AccountId
-			=> Option<RecoveryConfig<T::BlockNumber, BalanceOf<T>, T::AccountId>>;
+#[frame_support::pallet]
+pub mod pallet {
+	use frame_support::{ensure, Parameter, pallet_prelude::*, traits::Get};
+	use frame_system::{pallet_prelude::*, ensure_signed, ensure_root};
+	use sp_runtime::ArithmeticError;
+	use super::*;
+
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(_);
+
+	/// Configuration trait.
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		/// The overarching event type.
+		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
 
-		/// Active recovery attempts.
+		/// The overarching call type.
+		type Call: Parameter + Dispatchable<Origin=Self::Origin, PostInfo=PostDispatchInfo> + GetDispatchInfo;
+
+		/// The currency mechanism.
+		type Currency: ReservableCurrency<Self::AccountId>;
+
+		/// The base amount of currency needed to reserve for creating a recovery configuration.
 		///
-		/// First account is the account to be recovered, and the second account
-		/// is the user trying to recover the account.
-		pub ActiveRecoveries get(fn active_recovery):
-			double_map hasher(twox_64_concat) T::AccountId, hasher(twox_64_concat) T::AccountId =>
-			Option<ActiveRecovery<T::BlockNumber, BalanceOf<T>, T::AccountId>>;
+		/// This is held for an additional storage item whose value size is
+		/// `2 + sizeof(BlockNumber, Balance)` bytes.
+		#[pallet::constant]
+		type ConfigDepositBase: Get<BalanceOf<Self>>;
 
-		/// The list of allowed proxy accounts.
+		/// The amount of currency needed per additional user when creating a recovery configuration.
 		///
-		/// Map from the user who can access it to the recovered account.
-		pub Proxy get(fn proxy):
-			map hasher(blake2_128_concat) T::AccountId => Option<T::AccountId>;
+		/// This is held for adding `sizeof(AccountId)` bytes more into a pre-existing storage value.
+		#[pallet::constant]
+		type FriendDepositFactor: Get<BalanceOf<Self>>;
+
+		/// The maximum amount of friends allowed in a recovery configuration.
+		#[pallet::constant]
+		type MaxFriends: Get<u16>;
+
+		/// The base amount of currency needed to reserve for starting a recovery.
+		///
+		/// This is primarily held for deterring malicious recovery attempts, and should
+		/// have a value large enough that a bad actor would choose not to place this
+		/// deposit. It also acts to fund additional storage item whose value size is
+		/// `sizeof(BlockNumber, Balance + T * AccountId)` bytes. Where T is a configurable
+		/// threshold.
+		#[pallet::constant]
+		type RecoveryDeposit: Get<BalanceOf<Self>>;
 	}
-}
 
-decl_event! {
 	/// Events type.
-	pub enum Event<T> where
-		AccountId = <T as system::Config>::AccountId,
-	{
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	#[pallet::metadata(T::AccountId = "AccountId")]
+	pub enum Event<T: Config> {
 		/// A recovery process has been set up for an \[account\].
-		RecoveryCreated(AccountId),
+		RecoveryCreated(T::AccountId),
 		/// A recovery process has been initiated for lost account by rescuer account.
 		/// \[lost, rescuer\]
-		RecoveryInitiated(AccountId, AccountId),
+		RecoveryInitiated(T::AccountId, T::AccountId),
 		/// A recovery process for lost account by rescuer account has been vouched for by sender.
 		/// \[lost, rescuer, sender\]
-		RecoveryVouched(AccountId, AccountId, AccountId),
+		RecoveryVouched(T::AccountId, T::AccountId, T::AccountId),
 		/// A recovery process for lost account by rescuer account has been closed.
 		/// \[lost, rescuer\]
-		RecoveryClosed(AccountId, AccountId),
+		RecoveryClosed(T::AccountId, T::AccountId),
 		/// Lost account has been successfully recovered by rescuer account.
 		/// \[lost, rescuer\]
-		AccountRecovered(AccountId, AccountId),
+		AccountRecovered(T::AccountId, T::AccountId),
 		/// A recovery process has been removed for an \[account\].
-		RecoveryRemoved(AccountId),
+		RecoveryRemoved(T::AccountId),
 	}
-}
 
-decl_error! {
-	pub enum Error for Module<T: Config> {
+	#[pallet::error]
+	pub enum Error<T> {
 		/// User is not allowed to make a call on behalf of this account
 		NotAllowed,
 		/// Threshold must be greater than zero
@@ -318,27 +307,41 @@ decl_error! {
 		/// Some internal state is broken.
 		BadState,
 	}
-}
 
-decl_module! {
-	pub struct Module<T: Config> for enum Call where origin: T::Origin {
-		type Error = Error<T>;
+	/// The set of recoverable accounts and their recovery configuration.
+	#[pallet::storage]
+	#[pallet::getter(fn recovery_config)]
+	pub type Recoverable<T: Config> = StorageMap<
+		_,
+		Twox64Concat, T::AccountId,
+		RecoveryConfig<T::BlockNumber, BalanceOf<T>, T::AccountId>,
+	>;
 
-		/// The base amount of currency needed to reserve for creating a recovery configuration.
-		const ConfigDepositBase: BalanceOf<T> = T::ConfigDepositBase::get();
-
-		/// The amount of currency needed per additional user when creating a recovery configuration.
-		const FriendDepositFactor: BalanceOf<T> = T::FriendDepositFactor::get();
-
-		/// The maximum amount of friends allowed in a recovery configuration.
-		const MaxFriends: u16 = T::MaxFriends::get();
-
-		/// The base amount of currency needed to reserve for starting a recovery.
-		const RecoveryDeposit: BalanceOf<T> = T::RecoveryDeposit::get();
+	/// Active recovery attempts.
+	///
+	/// First account is the account to be recovered, and the second account
+	/// is the user trying to recover the account.
+	#[pallet::storage]
+	#[pallet::getter(fn active_recovery)]
+	pub type ActiveRecoveries<T: Config>= StorageDoubleMap<
+		_,
+		Twox64Concat, T::AccountId,
+		Twox64Concat, T::AccountId,
+		ActiveRecovery<T::BlockNumber, BalanceOf<T>, T::AccountId>,
+	>;
+
+	/// The list of allowed proxy accounts.
+	///
+	/// Map from the user who can access it to the recovered account.
+	#[pallet::storage]
+	#[pallet::getter(fn proxy)]
+	pub type Proxy<T: Config> = StorageMap<_, Blake2_128Concat, T::AccountId, T::AccountId>;
 
-		/// Deposit one of this module's events by using the default implementation.
-		fn deposit_event() = default;
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
 
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
 		/// Send a call through a recovered account.
 		///
 		/// The dispatch origin for this call must be _Signed_ and registered to
@@ -352,7 +355,7 @@ decl_module! {
 		/// - The weight of the `call` + 10,000.
 		/// - One storage lookup to check account is recovered by `who`. O(1)
 		/// # </weight>
-		#[weight = {
+		#[pallet::weight({
 			let dispatch_info = call.get_dispatch_info();
 			(
 				dispatch_info.weight
@@ -361,8 +364,9 @@ decl_module! {
 					.saturating_add(T::DbWeight::get().reads_writes(1, 1)),
 				dispatch_info.class,
 			)
-		}]
-		fn as_recovered(origin,
+		})]
+		pub(crate) fn as_recovered(
+			origin: OriginFor<T>,
 			account: T::AccountId,
 			call: Box<<T as Config>::Call>
 		) -> DispatchResult {
@@ -387,12 +391,17 @@ decl_module! {
 		/// - One storage write O(1)
 		/// - One event
 		/// # </weight>
-		#[weight = 0]
-		fn set_recovered(origin, lost: T::AccountId, rescuer: T::AccountId) {
+		#[pallet::weight(30_000_000)]
+		pub(crate) fn set_recovered(
+			origin: OriginFor<T>,
+			lost: T::AccountId,
+			rescuer: T::AccountId,
+		) -> DispatchResult {
 			ensure_root(origin)?;
 			// Create the recovery storage item.
 			<Proxy<T>>::insert(&rescuer, &lost);
-			Self::deposit_event(RawEvent::AccountRecovered(lost, rescuer));
+			Self::deposit_event(Event::<T>::AccountRecovered(lost, rescuer));
+			Ok(())
 		}
 
 		/// Create a recovery configuration for your account. This makes your account recoverable.
@@ -422,12 +431,13 @@ decl_module! {
 		///
 		/// Total Complexity: O(F + X)
 		/// # </weight>
-		#[weight = 100_000_000]
-		fn create_recovery(origin,
+		#[pallet::weight(100_000_000)]
+		pub(crate) fn create_recovery(
+			origin: OriginFor<T>,
 			friends: Vec<T::AccountId>,
 			threshold: u16,
 			delay_period: T::BlockNumber
-		) {
+		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			// Check account is not already set up for recovery
 			ensure!(!<Recoverable<T>>::contains_key(&who), Error::<T>::AlreadyRecoverable);
@@ -457,7 +467,8 @@ decl_module! {
 			// Create the recovery configuration storage item
 			<Recoverable<T>>::insert(&who, recovery_config);
 
-			Self::deposit_event(RawEvent::RecoveryCreated(who));
+			Self::deposit_event(Event::<T>::RecoveryCreated(who));
+			Ok(())
 		}
 
 		/// Initiate the process for recovering a recoverable account.
@@ -482,8 +493,8 @@ decl_module! {
 		///
 		/// Total Complexity: O(F + X)
 		/// # </weight>
-		#[weight = 100_000_000]
-		fn initiate_recovery(origin, account: T::AccountId) {
+		#[pallet::weight(100_000_000)]
+		pub(crate) fn initiate_recovery(origin: OriginFor<T>, account: T::AccountId) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			// Check that the account is recoverable
 			ensure!(<Recoverable<T>>::contains_key(&account), Error::<T>::NotRecoverable);
@@ -494,13 +505,14 @@ decl_module! {
 			T::Currency::reserve(&who, recovery_deposit)?;
 			// Create an active recovery status
 			let recovery_status = ActiveRecovery {
-				created: <system::Pallet<T>>::block_number(),
+				created: <frame_system::Pallet<T>>::block_number(),
 				deposit: recovery_deposit,
 				friends: vec![],
 			};
 			// Create the active recovery storage item
 			<ActiveRecoveries<T>>::insert(&account, &who, recovery_status);
-			Self::deposit_event(RawEvent::RecoveryInitiated(account, who));
+			Self::deposit_event(Event::<T>::RecoveryInitiated(account, who));
+			Ok(())
 		}
 
 		/// Allow a "friend" of a recoverable account to vouch for an active recovery
@@ -528,8 +540,12 @@ decl_module! {
 		///
 		/// Total Complexity: O(F + logF + V + logV)
 		/// # </weight>
-		#[weight = 100_000_000]
-		fn vouch_recovery(origin, lost: T::AccountId, rescuer: T::AccountId) {
+		#[pallet::weight(100_000_000)]
+		pub(crate) fn vouch_recovery(
+			origin: OriginFor<T>,
+			lost: T::AccountId,
+			rescuer: T::AccountId
+		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			// Get the recovery configuration for the lost account.
 			let recovery_config = Self::recovery_config(&lost).ok_or(Error::<T>::NotRecoverable)?;
@@ -544,7 +560,8 @@ decl_module! {
 			}
 			// Update storage with the latest details
 			<ActiveRecoveries<T>>::insert(&lost, &rescuer, active_recovery);
-			Self::deposit_event(RawEvent::RecoveryVouched(lost, rescuer, who));
+			Self::deposit_event(Event::<T>::RecoveryVouched(lost, rescuer, who));
+			Ok(())
 		}
 
 		/// Allow a successful rescuer to claim their recovered account.
@@ -567,8 +584,8 @@ decl_module! {
 		///
 		/// Total Complexity: O(F + V)
 		/// # </weight>
-		#[weight = 100_000_000]
-		fn claim_recovery(origin, account: T::AccountId) {
+		#[pallet::weight(100_000_000)]
+		pub(crate) fn claim_recovery(origin: OriginFor<T>, account: T::AccountId) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			// Get the recovery configuration for the lost account
 			let recovery_config = Self::recovery_config(&account).ok_or(Error::<T>::NotRecoverable)?;
@@ -576,7 +593,7 @@ decl_module! {
 			let active_recovery = Self::active_recovery(&account, &who).ok_or(Error::<T>::NotStarted)?;
 			ensure!(!Proxy::<T>::contains_key(&who), Error::<T>::AlreadyProxy);
 			// Make sure the delay period has passed
-			let current_block_number = <system::Pallet<T>>::block_number();
+			let current_block_number = <frame_system::Pallet<T>>::block_number();
 			let recoverable_block_number = active_recovery.created
 				.checked_add(&recovery_config.delay_period)
 				.ok_or(ArithmeticError::Overflow)?;
@@ -586,10 +603,11 @@ decl_module! {
 				recovery_config.threshold as usize <= active_recovery.friends.len(),
 				Error::<T>::Threshold
 			);
-			system::Pallet::<T>::inc_consumers(&who).map_err(|_| Error::<T>::BadState)?;
+			frame_system::Pallet::<T>::inc_consumers(&who).map_err(|_| Error::<T>::BadState)?;
 			// Create the recovery storage item
 			Proxy::<T>::insert(&who, &account);
-			Self::deposit_event(RawEvent::AccountRecovered(account, who));
+			Self::deposit_event(Event::<T>::AccountRecovered(account, who));
+			Ok(())
 		}
 
 		/// As the controller of a recoverable account, close an active recovery
@@ -612,8 +630,8 @@ decl_module! {
 		///
 		/// Total Complexity: O(V + X)
 		/// # </weight>
-		#[weight = 30_000_000]
-		fn close_recovery(origin, rescuer: T::AccountId) {
+		#[pallet::weight(30_000_000)]
+		pub(crate) fn close_recovery(origin: OriginFor<T>, rescuer: T::AccountId) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			// Take the active recovery process started by the rescuer for this account.
 			let active_recovery = <ActiveRecoveries<T>>::take(&who, &rescuer).ok_or(Error::<T>::NotStarted)?;
@@ -621,7 +639,8 @@ decl_module! {
 			// Acts like a slashing mechanism for those who try to maliciously recover accounts.
 			let res = T::Currency::repatriate_reserved(&rescuer, &who, active_recovery.deposit, BalanceStatus::Free);
 			debug_assert!(res.is_ok());
-			Self::deposit_event(RawEvent::RecoveryClosed(who, rescuer));
+			Self::deposit_event(Event::<T>::RecoveryClosed(who, rescuer));
+			Ok(())
 		}
 
 		/// Remove the recovery process for your account. Recovered accounts are still accessible.
@@ -645,8 +664,8 @@ decl_module! {
 		///
 		/// Total Complexity: O(F + X)
 		/// # </weight>
-		#[weight = 30_000_000]
-		fn remove_recovery(origin) {
+		#[pallet::weight(30_000_000)]
+		pub(crate) fn remove_recovery(origin: OriginFor<T>) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			// Check there are no active recoveries
 			let mut active_recoveries = <ActiveRecoveries<T>>::iter_prefix_values(&who);
@@ -656,7 +675,8 @@ decl_module! {
 
 			// Unreserve the initial deposit for the recovery configuration.
 			T::Currency::unreserve(&who, recovery_config.deposit);
-			Self::deposit_event(RawEvent::RecoveryRemoved(who));
+			Self::deposit_event(Event::<T>::RecoveryRemoved(who));
+			Ok(())
 		}
 
 		/// Cancel the ability to use `as_recovered` for `account`.
@@ -670,18 +690,19 @@ decl_module! {
 		/// # <weight>
 		/// - One storage mutation to check account is recovered by `who`. O(1)
 		/// # </weight>
-		#[weight = 0]
-		fn cancel_recovered(origin, account: T::AccountId) {
+		#[pallet::weight(30_000_000)]
+		pub(crate) fn cancel_recovered(origin: OriginFor<T>, account: T::AccountId) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			// Check `who` is allowed to make a call on behalf of `account`
 			ensure!(Self::proxy(&who) == Some(account), Error::<T>::NotAllowed);
 			Proxy::<T>::remove(&who);
-			system::Pallet::<T>::dec_consumers(&who);
+			frame_system::Pallet::<T>::dec_consumers(&who);
+			Ok(())
 		}
 	}
 }
 
-impl<T: Config> Module<T> {
+impl<T: Config> Pallet<T> {
 	/// Check that friends list is sorted and has no duplicates.
 	fn is_sorted_and_unique(friends: &Vec<T::AccountId>) -> bool {
 		friends.windows(2).all(|w| w[0] < w[1])

From ef0e22e11535abaa393122209f83ed02a068a464 Mon Sep 17 00:00:00 2001
From: Sergei Shulepov <sergei@parity.io>
Date: Wed, 12 May 2021 15:39:08 +0200
Subject: [PATCH 0735/1194] Embed runtime version as a custom section (#8688)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* emit a custom section from impl_runtime_apis!

This change emits a custom section from the impl_runtime_apis! proc macro.

Each implemented API will result to emitting a link section `runtime_apis`.
During linking all sections with this name will be concatenated and
placed into the final wasm binary under the same name.

* Introduce `runtime_version` proc macro

This macro takes an existing `RuntimeVersion` const declaration, parses
it and emits the version information in form of a linking section.
Ultimately such a linking section will result into a custom wasm
section.

* Parse custom wasm section for runtime version

* Apply suggestions from code review

Co-authored-by: David <dvdplm@gmail.com>

* Fix sc-executor integration tests

* Nits

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Refactor apis section deserialization

* Fix version decoding

* Reuse uncompressed value for CallInWasm

* Log on decompression error

* Simplify if

* Reexport proc-macro from sp_version

* Merge ReadRuntimeVersionExt

* Export `read_embedded_version`

* Fix test

* Simplify searching for custom section

Co-authored-by: David <dvdplm@gmail.com>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 Cargo.lock                                    |  17 +-
 Cargo.toml                                    |   1 +
 bin/node-template/runtime/src/lib.rs          |   1 +
 bin/node/runtime/src/lib.rs                   |   1 +
 client/executor/Cargo.toml                    |   1 -
 client/executor/common/Cargo.toml             |   1 +
 .../common/src/runtime_blob/runtime_blob.rs   |  25 ++
 client/executor/src/integration_tests/mod.rs  |  99 +++----
 client/executor/src/lib.rs                    |  26 +-
 client/executor/src/native_executor.rs        | 179 +++++------
 client/executor/src/wasm_runtime.rs           | 141 ++++++---
 client/executor/wasmi/src/lib.rs              |  21 +-
 frame/system/src/tests.rs                     |  22 +-
 .../api/proc-macro/src/impl_runtime_apis.rs   |  16 +-
 primitives/api/src/lib.rs                     |  43 +++
 primitives/core/src/traits.rs                 |  61 ++--
 primitives/io/Cargo.toml                      |   2 +
 primitives/io/src/lib.rs                      |  51 ++--
 primitives/runtime-interface/test/Cargo.toml  |   1 +
 primitives/runtime-interface/test/src/lib.rs  |  19 +-
 primitives/state-machine/src/lib.rs           |  12 +-
 primitives/version/Cargo.toml                 |   1 +
 primitives/version/proc-macro/Cargo.toml      |  26 ++
 .../proc-macro/src/decl_runtime_version.rs    | 279 ++++++++++++++++++
 primitives/version/proc-macro/src/lib.rs      |  32 ++
 primitives/version/src/lib.rs                 |  45 +++
 test-utils/runtime/src/lib.rs                 |   1 +
 27 files changed, 834 insertions(+), 290 deletions(-)
 create mode 100644 primitives/version/proc-macro/Cargo.toml
 create mode 100644 primitives/version/proc-macro/src/decl_runtime_version.rs
 create mode 100644 primitives/version/proc-macro/src/lib.rs

diff --git a/Cargo.lock b/Cargo.lock
index 71cb808d83d4..9019acfcbb23 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7353,7 +7353,6 @@ dependencies = [
  "sp-core",
  "sp-externalities",
  "sp-io",
- "sp-maybe-compressed-blob",
  "sp-panic-handler",
  "sp-runtime",
  "sp-runtime-interface",
@@ -7381,6 +7380,7 @@ dependencies = [
  "pwasm-utils 0.14.0",
  "sp-allocator",
  "sp-core",
+ "sp-maybe-compressed-blob",
  "sp-serializer",
  "sp-wasm-interface",
  "thiserror",
@@ -8883,6 +8883,7 @@ dependencies = [
  "sp-core",
  "sp-externalities",
  "sp-keystore",
+ "sp-maybe-compressed-blob",
  "sp-runtime-interface",
  "sp-state-machine",
  "sp-std",
@@ -9063,6 +9064,7 @@ name = "sp-runtime-interface-test"
 version = "2.0.0"
 dependencies = [
  "sc-executor",
+ "sc-executor-common",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -9291,6 +9293,19 @@ dependencies = [
  "serde",
  "sp-runtime",
  "sp-std",
+ "sp-version-proc-macro",
+]
+
+[[package]]
+name = "sp-version-proc-macro"
+version = "3.0.0"
+dependencies = [
+ "parity-scale-codec",
+ "proc-macro-crate 1.0.0",
+ "proc-macro2",
+ "quote",
+ "sp-version",
+ "syn",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 1b35c7181d17..9d7017be1d0d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -182,6 +182,7 @@ members = [
 	"primitives/trie",
 	"primitives/utils",
 	"primitives/version",
+	"primitives/version/proc-macro",
 	"primitives/wasm-interface",
 	"test-utils/client",
 	"test-utils/derive",
diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index 178918266a7f..b928f8d3410e 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -94,6 +94,7 @@ pub mod opaque {
 
 // To learn more about runtime versioning and what each of the following value means:
 //   https://substrate.dev/docs/en/knowledgebase/runtime/upgrades#runtime-versioning
+#[sp_version::runtime_version]
 pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("node-template"),
 	impl_name: create_runtime_str!("node-template"),
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 52eb5e42bd4d..a20437c25659 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -105,6 +105,7 @@ pub fn wasm_binary_unwrap() -> &'static [u8] {
 }
 
 /// Runtime version.
+#[sp_version::runtime_version]
 pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("node"),
 	impl_name: create_runtime_str!("substrate-node"),
diff --git a/client/executor/Cargo.toml b/client/executor/Cargo.toml
index e9f0fa14d8e7..f678029d0674 100644
--- a/client/executor/Cargo.toml
+++ b/client/executor/Cargo.toml
@@ -30,7 +30,6 @@ sp-api = { version = "3.0.0", path = "../../primitives/api" }
 sp-wasm-interface = { version = "3.0.0", path = "../../primitives/wasm-interface" }
 sp-runtime-interface = { version = "3.0.0", path = "../../primitives/runtime-interface" }
 sp-externalities = { version = "0.9.0", path = "../../primitives/externalities" }
-sp-maybe-compressed-blob = { version = "3.0.0", path = "../../primitives/maybe-compressed-blob" }
 sc-executor-common = { version = "0.9.0", path = "common" }
 sc-executor-wasmi = { version = "0.9.0", path = "wasmi" }
 sc-executor-wasmtime = { version = "0.9.0", path = "wasmtime", optional = true }
diff --git a/client/executor/common/Cargo.toml b/client/executor/common/Cargo.toml
index 95c090686e83..9f9ec989431f 100644
--- a/client/executor/common/Cargo.toml
+++ b/client/executor/common/Cargo.toml
@@ -22,6 +22,7 @@ wasmi = "0.6.2"
 sp-core = { version = "3.0.0", path = "../../../primitives/core" }
 sp-allocator = { version = "3.0.0", path = "../../../primitives/allocator" }
 sp-wasm-interface = { version = "3.0.0", path = "../../../primitives/wasm-interface" }
+sp-maybe-compressed-blob = { version = "3.0.0", path = "../../../primitives/maybe-compressed-blob" }
 sp-serializer = { version = "3.0.0", path = "../../../primitives/serializer" }
 thiserror = "1.0.21"
 
diff --git a/client/executor/common/src/runtime_blob/runtime_blob.rs b/client/executor/common/src/runtime_blob/runtime_blob.rs
index d90a48fde0c8..6541f9f5d966 100644
--- a/client/executor/common/src/runtime_blob/runtime_blob.rs
+++ b/client/executor/common/src/runtime_blob/runtime_blob.rs
@@ -27,6 +27,17 @@ pub struct RuntimeBlob {
 }
 
 impl RuntimeBlob {
+	/// Create `RuntimeBlob` from the given wasm code. Will attempt to decompress the code before
+	/// deserializing it.
+	///
+	/// See [`sp_maybe_compressed_blob`] for details about decompression.
+	pub fn uncompress_if_needed(wasm_code: &[u8]) -> Result<Self, WasmError> {
+		use sp_maybe_compressed_blob::CODE_BLOB_BOMB_LIMIT;
+		let wasm_code = sp_maybe_compressed_blob::decompress(wasm_code, CODE_BLOB_BOMB_LIMIT)
+			.map_err(|e| WasmError::Other(format!("Decompression error: {:?}", e)))?;
+		Self::new(&wasm_code)
+	}
+
 	/// Create `RuntimeBlob` from the given wasm code.
 	///
 	/// Returns `Err` if the wasm code cannot be deserialized.
@@ -85,9 +96,23 @@ impl RuntimeBlob {
 		})
 	}
 
+	/// Scans the wasm blob for the first section with the name that matches the given. Returns the
+	/// contents of the custom section if found or `None` otherwise.
+	pub fn custom_section_contents(&self, section_name: &str) -> Option<&[u8]> {
+		self.raw_module
+			.custom_sections()
+			.find(|cs| cs.name() == section_name)
+			.map(|cs| cs.payload())
+		}
+
 	/// Consumes this runtime blob and serializes it.
 	pub fn serialize(self) -> Vec<u8> {
 		serialize(self.raw_module)
 			.expect("serializing into a vec should succeed; qed")
 	}
+
+	/// Destructure this structure into the underlying parity-wasm Module.
+	pub fn into_inner(self) -> RawModule {
+		self.raw_module
+	}
 }
diff --git a/client/executor/src/integration_tests/mod.rs b/client/executor/src/integration_tests/mod.rs
index d08f830f40da..fb39429dfdb2 100644
--- a/client/executor/src/integration_tests/mod.rs
+++ b/client/executor/src/integration_tests/mod.rs
@@ -17,18 +17,20 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 mod sandbox;
 
+use std::sync::Arc;
 use codec::{Encode, Decode};
 use hex_literal::hex;
 use sp_core::{
 	blake2_128, blake2_256, ed25519, sr25519, map, Pair,
 	offchain::{OffchainWorkerExt, OffchainDbExt, testing},
-	traits::{Externalities, CallInWasm},
+	traits::Externalities,
 };
 use sc_runtime_test::wasm_binary_unwrap;
 use sp_state_machine::TestExternalities as CoreTestExternalities;
 use sp_trie::{TrieConfiguration, trie_types::Layout};
 use sp_wasm_interface::HostFunctions as _;
 use sp_runtime::traits::BlakeTwo256;
+use sc_executor_common::{wasm_runtime::WasmModule, runtime_blob::RuntimeBlob};
 use tracing_subscriber::layer::SubscriberExt;
 
 use crate::WasmExecutionMethod;
@@ -77,13 +79,12 @@ fn call_in_wasm<E: Externalities>(
 		8,
 		None,
 	);
-	executor.call_in_wasm(
-		&wasm_binary_unwrap()[..],
-		None,
+	executor.uncached_call(
+		RuntimeBlob::uncompress_if_needed(&wasm_binary_unwrap()[..]).unwrap(),
+		ext,
+		true,
 		function,
 		call_data,
-		ext,
-		sp_core::traits::MissingHostFunctions::Allow,
 	)
 }
 
@@ -541,28 +542,37 @@ fn should_trap_when_heap_exhausted(wasm_method: WasmExecutionMethod) {
 		None,
 	);
 
-	let err = executor.call_in_wasm(
-		&wasm_binary_unwrap()[..],
-		None,
-		"test_exhaust_heap",
-		&[0],
-		&mut ext.ext(),
-		sp_core::traits::MissingHostFunctions::Allow,
-	).unwrap_err();
+	let err = executor
+		.uncached_call(
+			RuntimeBlob::uncompress_if_needed(&wasm_binary_unwrap()[..]).unwrap(),
+			&mut ext.ext(),
+			true,
+			"test_exhaust_heap",
+			&[0],
+		)
+		.unwrap_err();
 
 	assert!(err.contains("Allocator ran out of space"));
 }
 
-test_wasm_execution!(returns_mutable_static);
-fn returns_mutable_static(wasm_method: WasmExecutionMethod) {
-	let runtime = crate::wasm_runtime::create_wasm_runtime_with_code(
+fn mk_test_runtime(wasm_method: WasmExecutionMethod, pages: u64) -> Arc<dyn WasmModule> {
+	let blob = RuntimeBlob::uncompress_if_needed(&wasm_binary_unwrap()[..])
+		.expect("failed to create a runtime blob out of test runtime");
+
+	crate::wasm_runtime::create_wasm_runtime_with_code(
 		wasm_method,
-		1024,
-		&wasm_binary_unwrap()[..],
+		pages,
+		blob,
 		HostFunctions::host_functions(),
 		true,
 		None,
-	).expect("Creates runtime");
+	)
+	.expect("failed to instantiate wasm runtime")
+}
+
+test_wasm_execution!(returns_mutable_static);
+fn returns_mutable_static(wasm_method: WasmExecutionMethod) {
+	let runtime = mk_test_runtime(wasm_method, 1024);
 
 	let instance = runtime.new_instance().unwrap();
 	let res = instance.call_export("returns_mutable_static", &[0]).unwrap();
@@ -589,14 +599,7 @@ fn restoration_of_globals(wasm_method: WasmExecutionMethod) {
 	// to our allocator algorithm there are inefficiencies.
 	const REQUIRED_MEMORY_PAGES: u64 = 32;
 
-	let runtime = crate::wasm_runtime::create_wasm_runtime_with_code(
-		wasm_method,
-		REQUIRED_MEMORY_PAGES,
-		&wasm_binary_unwrap()[..],
-		HostFunctions::host_functions(),
-		true,
-		None,
-	).expect("Creates runtime");
+	let runtime = mk_test_runtime(wasm_method, REQUIRED_MEMORY_PAGES);
 	let instance = runtime.new_instance().unwrap();
 
 	// On the first invocation we allocate approx. 768KB (75%) of stack and then trap.
@@ -610,14 +613,7 @@ fn restoration_of_globals(wasm_method: WasmExecutionMethod) {
 
 test_wasm_execution!(interpreted_only heap_is_reset_between_calls);
 fn heap_is_reset_between_calls(wasm_method: WasmExecutionMethod) {
-	let runtime = crate::wasm_runtime::create_wasm_runtime_with_code(
-		wasm_method,
-		1024,
-		&wasm_binary_unwrap()[..],
-		HostFunctions::host_functions(),
-		true,
-		None,
-	).expect("Creates runtime");
+	let runtime = mk_test_runtime(wasm_method, 1024);
 	let instance = runtime.new_instance().unwrap();
 
 	let heap_base = instance.get_global_const("__heap_base")
@@ -642,27 +638,27 @@ fn parallel_execution(wasm_method: WasmExecutionMethod) {
 		8,
 		None,
 	));
-	let code_hash = blake2_256(wasm_binary_unwrap()).to_vec();
-	let threads: Vec<_> = (0..8).map(|_|
-		{
+	let threads: Vec<_> = (0..8)
+		.map(|_| {
 			let executor = executor.clone();
-			let code_hash = code_hash.clone();
 			std::thread::spawn(move || {
 				let mut ext = TestExternalities::default();
 				let mut ext = ext.ext();
 				assert_eq!(
-					executor.call_in_wasm(
-						&wasm_binary_unwrap()[..],
-						Some(code_hash.clone()),
-						"test_twox_128",
-						&[0],
-						&mut ext,
-						sp_core::traits::MissingHostFunctions::Allow,
-					).unwrap(),
+					executor
+						.uncached_call(
+							RuntimeBlob::uncompress_if_needed(&wasm_binary_unwrap()[..]).unwrap(),
+							&mut ext,
+							true,
+							"test_twox_128",
+							&[0],
+						)
+						.unwrap(),
 					hex!("99e9d85137db46ef4bbea33613baafd5").to_vec().encode(),
 				);
 			})
-		}).collect();
+		})
+		.collect();
 
 	for t in threads.into_iter() {
 		t.join().unwrap();
@@ -671,9 +667,7 @@ fn parallel_execution(wasm_method: WasmExecutionMethod) {
 
 test_wasm_execution!(wasm_tracing_should_work);
 fn wasm_tracing_should_work(wasm_method: WasmExecutionMethod) {
-
-	use std::sync::{Arc, Mutex};
-
+	use std::sync::Mutex;
 	use sc_tracing::{SpanDatum, TraceEvent};
 
 	struct TestTraceHandler(Arc<Mutex<Vec<SpanDatum>>>);
@@ -779,6 +773,5 @@ fn panic_in_spawned_instance_panics_on_joining_its_result(wasm_method: WasmExecu
 		&mut ext,
 	).unwrap_err();
 
-	dbg!(&error_result);
 	assert!(format!("{}", error_result).contains("Spawned task"));
 }
diff --git a/client/executor/src/lib.rs b/client/executor/src/lib.rs
index c30015a86b20..c0cbf9c94daf 100644
--- a/client/executor/src/lib.rs
+++ b/client/executor/src/lib.rs
@@ -38,14 +38,17 @@ mod wasm_runtime;
 mod integration_tests;
 
 pub use wasmi;
-pub use native_executor::{with_externalities_safe, NativeExecutor, WasmExecutor, NativeExecutionDispatch};
+pub use native_executor::{
+	with_externalities_safe, NativeExecutor, WasmExecutor, NativeExecutionDispatch,
+};
 pub use sp_version::{RuntimeVersion, NativeVersion};
 pub use codec::Codec;
 #[doc(hidden)]
-pub use sp_core::traits::{Externalities, CallInWasm};
+pub use sp_core::traits::{Externalities};
 #[doc(hidden)]
 pub use sp_wasm_interface;
 pub use wasm_runtime::WasmExecutionMethod;
+pub use wasm_runtime::read_embedded_version;
 
 pub use sc_executor_common::{error, sandbox};
 
@@ -68,7 +71,7 @@ mod tests {
 	use sc_runtime_test::wasm_binary_unwrap;
 	use sp_io::TestExternalities;
 	use sp_wasm_interface::HostFunctions;
-	use sp_core::traits::CallInWasm;
+	use sc_executor_common::runtime_blob::RuntimeBlob;
 
 	#[test]
 	fn call_in_interpreted_wasm_works() {
@@ -82,14 +85,15 @@ mod tests {
 			8,
 			None,
 		);
-		let res = executor.call_in_wasm(
-			&wasm_binary_unwrap()[..],
-			None,
-			"test_empty_return",
-			&[],
-			&mut ext,
-			sp_core::traits::MissingHostFunctions::Allow,
-		).unwrap();
+		let res = executor
+			.uncached_call(
+				RuntimeBlob::uncompress_if_needed(&wasm_binary_unwrap()[..]).unwrap(),
+				&mut ext,
+				true,
+				"test_empty_return",
+				&[],
+			)
+			.unwrap();
 		assert_eq!(res, vec![0u8; 0]);
 	}
 }
diff --git a/client/executor/src/native_executor.rs b/client/executor/src/native_executor.rs
index 6df651e1b776..760e0c066bee 100644
--- a/client/executor/src/native_executor.rs
+++ b/client/executor/src/native_executor.rs
@@ -33,14 +33,14 @@ use sp_version::{NativeVersion, RuntimeVersion};
 use codec::{Decode, Encode};
 use sp_core::{
 	NativeOrEncoded,
-	traits::{
-		CodeExecutor, Externalities, RuntimeCode, MissingHostFunctions,
-		RuntimeSpawnExt, RuntimeSpawn,
-	},
+	traits::{CodeExecutor, Externalities, RuntimeCode, RuntimeSpawnExt, RuntimeSpawn},
 };
 use log::trace;
 use sp_wasm_interface::{HostFunctions, Function};
-use sc_executor_common::wasm_runtime::{WasmInstance, WasmModule, InvokeMethod};
+use sc_executor_common::{
+	wasm_runtime::{WasmInstance, WasmModule, InvokeMethod},
+	runtime_blob::RuntimeBlob,
+};
 use sp_externalities::ExternalitiesExt as _;
 use sp_tasks::new_async_externalities;
 
@@ -188,64 +188,81 @@ impl WasmExecutor {
 			Err(e) => Err(e),
 		}
 	}
+
+	/// Perform a call into the given runtime.
+	///
+	/// The runtime is passed as a [`RuntimeBlob`]. The runtime will be isntantiated with the
+	/// parameters this `WasmExecutor` was initialized with.
+	///
+	/// In case of problems with during creation of the runtime or instantation, a `Err` is returned.
+	/// that describes the message.
+	#[doc(hidden)] // We use this function for tests across multiple crates.
+	pub fn uncached_call(
+		&self,
+		runtime_blob: RuntimeBlob,
+		ext: &mut dyn Externalities,
+		allow_missing_host_functions: bool,
+		export_name: &str,
+		call_data: &[u8],
+	) -> std::result::Result<Vec<u8>, String> {
+		let module = crate::wasm_runtime::create_wasm_runtime_with_code(
+			self.method,
+			self.default_heap_pages,
+			runtime_blob,
+			self.host_functions.to_vec(),
+			allow_missing_host_functions,
+			self.cache_path.as_deref(),
+		)
+		.map_err(|e| format!("Failed to create module: {:?}", e))?;
+
+		let instance = module
+			.new_instance()
+			.map_err(|e| format!("Failed to create instance: {:?}", e))?;
+
+		let instance = AssertUnwindSafe(instance);
+		let mut ext = AssertUnwindSafe(ext);
+		let module = AssertUnwindSafe(module);
+
+		with_externalities_safe(&mut **ext, move || {
+			preregister_builtin_ext(module.clone());
+			instance.call_export(export_name, call_data)
+		})
+		.and_then(|r| r)
+		.map_err(|e| e.to_string())
+	}
 }
 
-impl sp_core::traits::CallInWasm for WasmExecutor {
-	fn call_in_wasm(
+impl sp_core::traits::ReadRuntimeVersion for WasmExecutor {
+	fn read_runtime_version(
 		&self,
 		wasm_code: &[u8],
-		code_hash: Option<Vec<u8>>,
-		method: &str,
-		call_data: &[u8],
 		ext: &mut dyn Externalities,
-		missing_host_functions: MissingHostFunctions,
 	) -> std::result::Result<Vec<u8>, String> {
-		let allow_missing_host_functions = missing_host_functions.allowed();
-
-		if let Some(hash) = code_hash {
-			let code = RuntimeCode {
-				code_fetcher: &sp_core::traits::WrappedRuntimeCode(wasm_code.into()),
-				hash,
-				heap_pages: None,
-			};
+		let runtime_blob = RuntimeBlob::uncompress_if_needed(&wasm_code)
+			.map_err(|e| format!("Failed to create runtime blob: {:?}", e))?;
+
+		if let Some(version) = crate::wasm_runtime::read_embedded_version(&runtime_blob)
+			.map_err(|e| format!("Failed to read the static section: {:?}", e))
+			.map(|v| v.map(|v| v.encode()))?
+		{
+			return Ok(version);
+		}
 
-			self.with_instance(&code, ext, allow_missing_host_functions, |module, instance, _, mut ext| {
-				with_externalities_safe(
-					&mut **ext,
-					move || {
-						RuntimeInstanceSpawn::register_on_externalities(module.clone());
-						instance.call_export(method, call_data)
-					}
-				)
-			}).map_err(|e| e.to_string())
-		} else {
-			let module = crate::wasm_runtime::create_wasm_runtime_with_code(
-				self.method,
-				self.default_heap_pages,
-				&wasm_code,
-				self.host_functions.to_vec(),
-				allow_missing_host_functions,
-				self.cache_path.as_deref(),
-			)
-				.map_err(|e| format!("Failed to create module: {:?}", e))?;
-
-			let instance = module.new_instance()
-				.map_err(|e| format!("Failed to create instance: {:?}", e))?;
-
-			let instance = AssertUnwindSafe(instance);
-			let mut ext = AssertUnwindSafe(ext);
-			let module = AssertUnwindSafe(module);
+		// If the blob didn't have embedded runtime version section, we fallback to the legacy
+		// way of fetching the verison: i.e. instantiating the given instance and calling
+		// `Core_version` on it.
 
-			with_externalities_safe(
-				&mut **ext,
-				move || {
-					RuntimeInstanceSpawn::register_on_externalities(module.clone());
-					instance.call_export(method, call_data)
-				}
-			)
-			.and_then(|r| r)
-			.map_err(|e| e.to_string())
-		}
+		self.uncached_call(
+			runtime_blob,
+			ext,
+			// If a runtime upgrade introduces new host functions that are not provided by
+			// the node, we should not fail at instantiation. Otherwise nodes that are
+			// updated could run this successfully and it could lead to a storage root
+			// mismatch when importing this block.
+			true,
+			"Core_version",
+			&[],
+		)
 	}
 }
 
@@ -436,29 +453,25 @@ impl RuntimeInstanceSpawn {
 		ext.extension::<sp_core::traits::TaskExecutorExt>()
 			.map(move |task_ext| Self::new(module, task_ext.clone()))
 	}
+}
 
-	/// Register new `RuntimeSpawnExt` on current externalities.
-	///
-	/// This extensions will spawn instances from provided `module`.
-	pub fn register_on_externalities(module: Arc<dyn WasmModule>) {
-		sp_externalities::with_externalities(
-			move |mut ext| {
-				if let Some(runtime_spawn) =
-					Self::with_externalities_and_module(module.clone(), ext)
-				{
-					if let Err(e) = ext.register_extension(
-						RuntimeSpawnExt(Box::new(runtime_spawn))
-					) {
-						trace!(
-							target: "executor",
-							"Failed to register `RuntimeSpawnExt` instance on externalities: {:?}",
-							e,
-						)
-					}
-				}
+/// Pre-registers the built-in extensions to the currently effective externalities.
+///
+/// Meant to be called each time before calling into the runtime.
+fn preregister_builtin_ext(module: Arc<dyn WasmModule>) {
+	sp_externalities::with_externalities(move |mut ext| {
+		if let Some(runtime_spawn) =
+			RuntimeInstanceSpawn::with_externalities_and_module(module, ext)
+		{
+			if let Err(e) = ext.register_extension(RuntimeSpawnExt(Box::new(runtime_spawn))) {
+				trace!(
+					target: "executor",
+					"Failed to register `RuntimeSpawnExt` instance on externalities: {:?}",
+					e,
+				)
 			}
-		);
-	}
+		}
+	});
 }
 
 impl<D: NativeExecutionDispatch + 'static> CodeExecutor for NativeExecutor<D> {
@@ -506,7 +519,7 @@ impl<D: NativeExecutionDispatch + 'static> CodeExecutor for NativeExecutor<D> {
 						with_externalities_safe(
 							&mut **ext,
 							move || {
-								RuntimeInstanceSpawn::register_on_externalities(module.clone());
+								preregister_builtin_ext(module.clone());
 								instance.call_export(method, data).map(NativeOrEncoded::Encoded)
 							}
 						)
@@ -557,17 +570,13 @@ impl<D: NativeExecutionDispatch> Clone for NativeExecutor<D> {
 	}
 }
 
-impl<D: NativeExecutionDispatch> sp_core::traits::CallInWasm for NativeExecutor<D> {
-	fn call_in_wasm(
+impl<D: NativeExecutionDispatch> sp_core::traits::ReadRuntimeVersion for NativeExecutor<D> {
+	fn read_runtime_version(
 		&self,
-		wasm_blob: &[u8],
-		code_hash: Option<Vec<u8>>,
-		method: &str,
-		call_data: &[u8],
+		wasm_code: &[u8],
 		ext: &mut dyn Externalities,
-		missing_host_functions: MissingHostFunctions,
 	) -> std::result::Result<Vec<u8>, String> {
-		self.wasm.call_in_wasm(wasm_blob, code_hash, method, call_data, ext, missing_host_functions)
+		self.wasm.read_runtime_version(wasm_code, ext)
 	}
 }
 
diff --git a/client/executor/src/wasm_runtime.rs b/client/executor/src/wasm_runtime.rs
index 53968a645c99..23e88f944090 100644
--- a/client/executor/src/wasm_runtime.rs
+++ b/client/executor/src/wasm_runtime.rs
@@ -29,7 +29,10 @@ use sp_core::traits::{Externalities, RuntimeCode, FetchRuntimeCode};
 use sp_version::RuntimeVersion;
 use std::panic::AssertUnwindSafe;
 use std::path::{Path, PathBuf};
-use sc_executor_common::wasm_runtime::{WasmModule, WasmInstance};
+use sc_executor_common::{
+	wasm_runtime::{WasmModule, WasmInstance},
+	runtime_blob::RuntimeBlob,
+};
 
 use sp_wasm_interface::Function;
 
@@ -235,6 +238,9 @@ impl RuntimeCache {
 			None =>  {
 				let code = runtime_code.fetch_runtime_code().ok_or(WasmError::CodeNotFound)?;
 
+				#[cfg(not(target_os = "unknown"))]
+				let time = std::time::Instant::now();
+
 				let result = create_versioned_wasm_runtime(
 					&code,
 					code_hash.clone(),
@@ -246,9 +252,22 @@ impl RuntimeCache {
 					self.max_runtime_instances,
 					self.cache_path.as_deref(),
 				);
-				if let Err(ref err) = result {
-					log::warn!(target: "wasm-runtime", "Cannot create a runtime: {:?}", err);
+
+				match result {
+					Ok(ref result) => {
+						#[cfg(not(target_os = "unknown"))]
+						log::debug!(
+							target: "wasm-runtime",
+							"Prepared new runtime version {:?} in {} ms.",
+							result.version,
+							time.elapsed().as_millis(),
+						);
+					}
+					Err(ref err) => {
+						log::warn!(target: "wasm-runtime", "Cannot create a runtime: {:?}", err);
+					}
 				}
+
 				Arc::new(result?)
 			}
 		};
@@ -278,16 +297,11 @@ impl RuntimeCache {
 pub fn create_wasm_runtime_with_code(
 	wasm_method: WasmExecutionMethod,
 	heap_pages: u64,
-	code: &[u8],
+	blob: RuntimeBlob,
 	host_functions: Vec<&'static dyn Function>,
 	allow_missing_func_imports: bool,
 	cache_path: Option<&Path>,
 ) -> Result<Arc<dyn WasmModule>, WasmError> {
-	use sp_maybe_compressed_blob::CODE_BLOB_BOMB_LIMIT;
-
-	let code = sp_maybe_compressed_blob::decompress(code, CODE_BLOB_BOMB_LIMIT)
-		.map_err(|e| WasmError::Other(format!("Decompression error: {:?}", e)))?;
-
 	match wasm_method {
 		WasmExecutionMethod::Interpreted => {
 			// Wasmi doesn't have any need in a cache directory.
@@ -297,7 +311,7 @@ pub fn create_wasm_runtime_with_code(
 			drop(cache_path);
 
 			sc_executor_wasmi::create_runtime(
-				&code,
+				blob,
 				heap_pages,
 				host_functions,
 				allow_missing_func_imports,
@@ -306,7 +320,6 @@ pub fn create_wasm_runtime_with_code(
 		}
 		#[cfg(feature = "wasmtime")]
 		WasmExecutionMethod::Compiled => {
-			let blob = sc_executor_common::runtime_blob::RuntimeBlob::new(&code)?;
 			sc_executor_wasmtime::create_runtime(
 				sc_executor_wasmtime::CodeSupplyMode::Verbatim { blob },
 				sc_executor_wasmtime::Config {
@@ -343,6 +356,55 @@ fn decode_version(version: &[u8]) -> Result<RuntimeVersion, WasmError> {
 	}
 }
 
+fn decode_runtime_apis(apis: &[u8]) -> Result<Vec<([u8; 8], u32)>, WasmError> {
+	use std::convert::TryFrom;
+	use sp_api::RUNTIME_API_INFO_SIZE;
+
+	apis.chunks(RUNTIME_API_INFO_SIZE)
+		.map(|chunk| {
+			// `chunk` can be less than `RUNTIME_API_INFO_SIZE` if the total length of `apis` doesn't
+			// completely divide by `RUNTIME_API_INFO_SIZE`.
+			<[u8; RUNTIME_API_INFO_SIZE]>::try_from(chunk)
+				.map(sp_api::deserialize_runtime_api_info)
+				.map_err(|_| {
+					WasmError::Other(format!(
+						"a clipped runtime api info declaration"
+					))
+				})
+		})
+		.collect::<Result<Vec<_>, WasmError>>()
+}
+
+/// Take the runtime blob and scan it for the custom wasm sections containing the version information
+/// and construct the `RuntimeVersion` from them.
+///
+/// If there are no such sections, it returns `None`. If there is an error during decoding those
+/// sections, `Err` will be returned.
+pub fn read_embedded_version(
+	blob: &RuntimeBlob,
+) -> Result<Option<RuntimeVersion>, WasmError> {
+	if let Some(version_section) = blob.custom_section_contents("runtime_version") {
+		// We do not use `decode_version` here because the runtime_version section is not supposed
+		// to ever contain a legacy version. Apart from that `decode_version` relies on presence
+		// of a special API in the `apis` field to treat the input as a non-legacy version. However
+		// the structure found in the `runtime_version` always contain an empty `apis` field. Therefore
+		// the version read will be mistakingly treated as an legacy one.
+		let mut decoded_version = sp_api::RuntimeVersion::decode(&mut &version_section[..])
+			.map_err(|_|
+				WasmError::Instantiation("failed to decode verison section".into())
+			)?;
+
+		// Don't stop on this and check if there is a special section that encodes all runtime APIs.
+		if let Some(apis_section) = blob.custom_section_contents("runtime_apis") {
+			decoded_version.apis = decode_runtime_apis(apis_section)?.into();
+		}
+
+		Ok(Some(decoded_version))
+	} else {
+		Ok(None)
+	}
+}
+
 fn create_versioned_wasm_runtime(
 	code: &[u8],
 	code_hash: Vec<u8>,
@@ -354,41 +416,44 @@ fn create_versioned_wasm_runtime(
 	max_instances: usize,
 	cache_path: Option<&Path>,
 ) -> Result<VersionedRuntime, WasmError> {
-	#[cfg(not(target_os = "unknown"))]
-	let time = std::time::Instant::now();
+	// The incoming code may be actually compressed. We decompress it here and then work with
+	// the uncompressed code from now on.
+	let blob = sc_executor_common::runtime_blob::RuntimeBlob::uncompress_if_needed(&code)?;
+
+	// Use the runtime blob to scan if there is any metadata embedded into the wasm binary pertaining
+	// to runtime version. We do it before consuming the runtime blob for creating the runtime.
+	let mut version: Option<_> = read_embedded_version(&blob)?;
+
 	let runtime = create_wasm_runtime_with_code(
 		wasm_method,
 		heap_pages,
-		&code,
+		blob,
 		host_functions,
 		allow_missing_func_imports,
 		cache_path,
 	)?;
 
-	// Call to determine runtime version.
-	let version_result = {
-		// `ext` is already implicitly handled as unwind safe, as we store it in a global variable.
-		let mut ext = AssertUnwindSafe(ext);
-
-		// The following unwind safety assertion is OK because if the method call panics, the
-		// runtime will be dropped.
-		let runtime = AssertUnwindSafe(runtime.as_ref());
-		crate::native_executor::with_externalities_safe(
-			&mut **ext,
-			move || runtime.new_instance()?.call("Core_version".into(), &[])
-		).map_err(|_| WasmError::Instantiation("panic in call to get runtime version".into()))?
-	};
-	let version = match version_result {
-		Ok(version) => Some(decode_version(&version)?),
-		Err(_) => None,
-	};
-	#[cfg(not(target_os = "unknown"))]
-	log::debug!(
-		target: "wasm-runtime",
-		"Prepared new runtime version {:?} in {} ms.",
-		version,
-		time.elapsed().as_millis(),
-	);
+	// If the runtime blob doesn't embed the runtime version then use the legacy version query
+	// mechanism: call the runtime.
+	if version.is_none() {
+		// Call to determine runtime version.
+		let version_result = {
+			// `ext` is already implicitly handled as unwind safe, as we store it in a global variable.
+			let mut ext = AssertUnwindSafe(ext);
+
+			// The following unwind safety assertion is OK because if the method call panics, the
+			// runtime will be dropped.
+			let runtime = AssertUnwindSafe(runtime.as_ref());
+			crate::native_executor::with_externalities_safe(
+				&mut **ext,
+				move || runtime.new_instance()?.call("Core_version".into(), &[])
+			).map_err(|_| WasmError::Instantiation("panic in call to get runtime version".into()))?
+		};
+
+		if let Ok(version_buf) = version_result {
+			version = Some(decode_version(&version_buf)?)
+		}
+	}
 
 	let mut instances = Vec::with_capacity(max_instances);
 	instances.resize_with(max_instances, || Mutex::new(None));
diff --git a/client/executor/wasmi/src/lib.rs b/client/executor/wasmi/src/lib.rs
index 0163e07e654b..953c5e5178a6 100644
--- a/client/executor/wasmi/src/lib.rs
+++ b/client/executor/wasmi/src/lib.rs
@@ -641,18 +641,18 @@ impl WasmModule for WasmiRuntime {
 /// Create a new `WasmiRuntime` given the code. This function loads the module and
 /// stores it in the instance.
 pub fn create_runtime(
-	code: &[u8],
+	blob: RuntimeBlob,
 	heap_pages: u64,
 	host_functions: Vec<&'static dyn Function>,
 	allow_missing_func_imports: bool,
 ) -> Result<WasmiRuntime, WasmError> {
-	let module = Module::from_buffer(&code).map_err(|_| WasmError::InvalidModule)?;
+	let data_segments_snapshot = DataSegmentsSnapshot::take(&blob)
+		.map_err(|e| WasmError::Other(e.to_string()))?;
 
-	// Extract the data segments from the wasm code.
-	//
-	// A return of this error actually indicates that there is a problem in logic, since
-	// we just loaded and validated the `module` above.
-	let (data_segments_snapshot, global_vals_snapshot) = {
+	let module = Module::from_parity_wasm_module(blob.into_inner())
+		.map_err(|_| WasmError::InvalidModule)?;
+
+	let global_vals_snapshot = {
 		let (instance, _, _) = instantiate_module(
 			heap_pages as usize,
 			&module,
@@ -660,12 +660,7 @@ pub fn create_runtime(
 			allow_missing_func_imports,
 		)
 		.map_err(|e| WasmError::Instantiation(e.to_string()))?;
-
-		let data_segments_snapshot = DataSegmentsSnapshot::take(&RuntimeBlob::new(code)?)
-			.map_err(|e| WasmError::Other(e.to_string()))?;
-		let global_vals_snapshot = GlobalValsSnapshot::take(&instance);
-
-		(data_segments_snapshot, global_vals_snapshot)
+		GlobalValsSnapshot::take(&instance)
 	};
 
 	Ok(WasmiRuntime {
diff --git a/frame/system/src/tests.rs b/frame/system/src/tests.rs
index 25f67d7a1a49..df28e2c118c2 100644
--- a/frame/system/src/tests.rs
+++ b/frame/system/src/tests.rs
@@ -420,17 +420,13 @@ fn prunes_block_hash_mappings() {
 
 #[test]
 fn set_code_checks_works() {
-	struct CallInWasm(Vec<u8>);
+	struct ReadRuntimeVersion(Vec<u8>);
 
-	impl sp_core::traits::CallInWasm for CallInWasm {
-		fn call_in_wasm(
+	impl sp_core::traits::ReadRuntimeVersion for ReadRuntimeVersion {
+		fn read_runtime_version(
 			&self,
-			_: &[u8],
-			_: Option<Vec<u8>>,
-			_: &str,
-			_: &[u8],
-			_: &mut dyn sp_externalities::Externalities,
-			_: sp_core::traits::MissingHostFunctions,
+			_wasm_code: &[u8],
+			_ext: &mut dyn sp_externalities::Externalities,
 		) -> Result<Vec<u8>, String> {
 			Ok(self.0.clone())
 		}
@@ -452,10 +448,10 @@ fn set_code_checks_works() {
 			impl_version,
 			..Default::default()
 		};
-		let call_in_wasm = CallInWasm(version.encode());
+		let read_runtime_version = ReadRuntimeVersion(version.encode());
 
 		let mut ext = new_test_ext();
-		ext.register_extension(sp_core::traits::CallInWasmExt::new(call_in_wasm));
+		ext.register_extension(sp_core::traits::ReadRuntimeVersionExt::new(read_runtime_version));
 		ext.execute_with(|| {
 			let res = System::set_code(
 				RawOrigin::Root.into(),
@@ -471,7 +467,7 @@ fn set_code_checks_works() {
 fn set_code_with_real_wasm_blob() {
 	let executor = substrate_test_runtime_client::new_native_executor();
 	let mut ext = new_test_ext();
-	ext.register_extension(sp_core::traits::CallInWasmExt::new(executor));
+	ext.register_extension(sp_core::traits::ReadRuntimeVersionExt::new(executor));
 	ext.execute_with(|| {
 		System::set_block_number(1);
 		System::set_code(
@@ -494,7 +490,7 @@ fn set_code_with_real_wasm_blob() {
 fn runtime_upgraded_with_set_storage() {
 	let executor = substrate_test_runtime_client::new_native_executor();
 	let mut ext = new_test_ext();
-	ext.register_extension(sp_core::traits::CallInWasmExt::new(executor));
+	ext.register_extension(sp_core::traits::ReadRuntimeVersionExt::new(executor));
 	ext.execute_with(|| {
 		System::set_storage(
 			RawOrigin::Root.into(),
diff --git a/primitives/api/proc-macro/src/impl_runtime_apis.rs b/primitives/api/proc-macro/src/impl_runtime_apis.rs
index 85ba0788105d..e918724c0f5b 100644
--- a/primitives/api/proc-macro/src/impl_runtime_apis.rs
+++ b/primitives/api/proc-macro/src/impl_runtime_apis.rs
@@ -633,8 +633,11 @@ fn generate_api_impl_for_runtime_api(impls: &[ItemImpl]) -> Result<TokenStream>
 /// runtime apis.
 fn generate_runtime_api_versions(impls: &[ItemImpl]) -> Result<TokenStream> {
 	let mut result = Vec::with_capacity(impls.len());
+	let mut sections = Vec::with_capacity(impls.len());
 	let mut processed_traits = HashSet::new();
 
+	let c = generate_crate_access(HIDDEN_INCLUDES_ID);
+
 	for impl_ in impls {
 		let mut path = extend_with_runtime_decl_path(
 			extract_impl_trait(&impl_, RequireQualifiedTraitPath::Yes)?.clone(),
@@ -667,12 +670,21 @@ fn generate_runtime_api_versions(impls: &[ItemImpl]) -> Result<TokenStream> {
 			#( #attrs )*
 			(#id, #version)
 		));
-	}
 
-	let c = generate_crate_access(HIDDEN_INCLUDES_ID);
+		sections.push(quote!(
+			#( #attrs )*
+			const _: () = {
+				// All sections with the same name are going to be merged by concatenation.
+				#[link_section = "runtime_apis"]
+				static SECTION_CONTENTS: [u8; 12] = #c::serialize_runtime_api_info(#id, #version);
+			};
+		));
+	}
 
 	Ok(quote!(
 		const RUNTIME_API_VERSIONS: #c::ApisVec = #c::create_apis_vec!([ #( #result ),* ]);
+
+		#( #sections )*
 	))
 }
 
diff --git a/primitives/api/src/lib.rs b/primitives/api/src/lib.rs
index 155bb899a2ed..97342377a76c 100644
--- a/primitives/api/src/lib.rs
+++ b/primitives/api/src/lib.rs
@@ -613,6 +613,49 @@ pub trait RuntimeApiInfo {
 	const VERSION: u32;
 }
 
+/// The number of bytes required to encode a [`RuntimeApiInfo`].
+///
+/// 8 bytes for `ID` and 4 bytes for a version.
+pub const RUNTIME_API_INFO_SIZE: usize = 12;
+
+/// Crude and simple way to serialize the `RuntimeApiInfo` into a bunch of bytes.
+pub const fn serialize_runtime_api_info(id: [u8; 8], version: u32) -> [u8; RUNTIME_API_INFO_SIZE] {
+	let version = version.to_le_bytes();
+
+	let mut r = [0; RUNTIME_API_INFO_SIZE];
+	r[0] = id[0];
+	r[1] = id[1];
+	r[2] = id[2];
+	r[3] = id[3];
+	r[4] = id[4];
+	r[5] = id[5];
+	r[6] = id[6];
+	r[7] = id[7];
+
+	r[8] = version[0];
+	r[9] = version[1];
+	r[10] = version[2];
+	r[11] = version[3];
+	r
+}
+
+/// Deserialize the runtime API info serialized by [`serialize_runtime_api_info`].
+pub fn deserialize_runtime_api_info(bytes: [u8; RUNTIME_API_INFO_SIZE]) -> ([u8; 8], u32) {
+	use sp_std::convert::TryInto;
+
+	let id: [u8; 8] = bytes[0..8]
+		.try_into()
+		.expect("the source slice size is equal to the dest array length; qed");
+
+	let version = u32::from_le_bytes(
+		bytes[8..12]
+			.try_into()
+			.expect("the source slice size is equal to the array length; qed"),
+	);
+
+	(id, version)
+}
+
 #[derive(codec::Encode, codec::Decode)]
 pub struct OldRuntimeVersion {
 	pub spec_name: RuntimeString,
diff --git a/primitives/core/src/traits.rs b/primitives/core/src/traits.rs
index 90f8060f9a56..948830cf5ca6 100644
--- a/primitives/core/src/traits.rs
+++ b/primitives/core/src/traits.rs
@@ -26,7 +26,7 @@ use std::{
 pub use sp_externalities::{Externalities, ExternalitiesExt};
 
 /// Code execution engine.
-pub trait CodeExecutor: Sized + Send + Sync + CallInWasm + Clone + 'static {
+pub trait CodeExecutor: Sized + Send + Sync + ReadRuntimeVersion + Clone + 'static {
 	/// Externalities error type.
 	type Error: Display + Debug + Send + Sync + 'static;
 
@@ -123,53 +123,42 @@ impl std::fmt::Display for CodeNotFound {
 	}
 }
 
-/// `Allow` or `Disallow` missing host functions when instantiating a WASM blob.
-#[derive(Clone, Copy, Debug)]
-pub enum MissingHostFunctions {
-	/// Any missing host function will be replaced by a stub that returns an error when
-	/// being called.
-	Allow,
-	/// Any missing host function will result in an error while instantiating the WASM blob,
-	Disallow,
-}
-
-impl MissingHostFunctions {
-	/// Are missing host functions allowed?
-	pub fn allowed(self) -> bool {
-		matches!(self, Self::Allow)
-	}
-}
-
-/// Something that can call a method in a WASM blob.
-pub trait CallInWasm: Send + Sync {
-	/// Call the given `method` in the given `wasm_blob` using `call_data` (SCALE encoded arguments)
-	/// to decode the arguments for the method.
+/// A trait that allows reading version information from the binary.
+pub trait ReadRuntimeVersion: Send + Sync {
+	/// Reads the runtime version information from the given wasm code.
 	///
-	/// Returns the SCALE encoded return value of the method.
+	/// The version information may be embedded into the wasm binary itself. If it is not present,
+	/// then this function may fallback to the legacy way of reading the version.
 	///
-	/// # Note
+	/// The legacy mechanism involves instantiating the passed wasm runtime and calling `Core_version`
+	/// on it. This is a very expensive operation.
 	///
-	/// If `code_hash` is `Some(_)` the `wasm_code` module and instance will be cached internally,
-	/// otherwise it is thrown away after the call.
-	fn call_in_wasm(
+	/// `ext` is only needed in case the calling into runtime happens. Otherwise it is ignored.
+	///
+	/// Compressed wasm blobs are supported and will be decompressed if needed. If uncompression fails,
+	/// the error is returned.
+	///
+	/// # Errors
+	///
+	/// If the version information present in binary, but is corrupted - returns an error.
+	///
+	/// Otherwise, if there is no version information present, and calling into the runtime takes
+	/// place, then an error would be returned if `Core_version` is not provided.
+	fn read_runtime_version(
 		&self,
 		wasm_code: &[u8],
-		code_hash: Option<Vec<u8>>,
-		method: &str,
-		call_data: &[u8],
 		ext: &mut dyn Externalities,
-		missing_host_functions: MissingHostFunctions,
 	) -> Result<Vec<u8>, String>;
 }
 
 sp_externalities::decl_extension! {
-	/// The call-in-wasm extension to register/retrieve from the externalities.
-	pub struct CallInWasmExt(Box<dyn CallInWasm>);
+	/// An extension that provides functionality to read version information from a given wasm blob.
+	pub struct ReadRuntimeVersionExt(Box<dyn ReadRuntimeVersion>);
 }
 
-impl CallInWasmExt {
-	/// Creates a new instance of `Self`.
-	pub fn new<T: CallInWasm + 'static>(inner: T) -> Self {
+impl ReadRuntimeVersionExt {
+	/// Creates a new instance of the extension given a version determinator instance.
+	pub fn new<T: ReadRuntimeVersion + 'static>(inner: T) -> Self {
 		Self(Box::new(inner))
 	}
 }
diff --git a/primitives/io/Cargo.toml b/primitives/io/Cargo.toml
index cbbda1807cc2..e63fcb909573 100644
--- a/primitives/io/Cargo.toml
+++ b/primitives/io/Cargo.toml
@@ -24,6 +24,7 @@ libsecp256k1 = { version = "0.3.4", optional = true }
 sp-state-machine = { version = "0.9.0", optional = true, path = "../state-machine" }
 sp-wasm-interface = { version = "3.0.0", path = "../wasm-interface", default-features = false }
 sp-runtime-interface = { version = "3.0.0", default-features = false, path = "../runtime-interface" }
+sp-maybe-compressed-blob = { version = "3.0.0", optional = true, path = "../maybe-compressed-blob" }
 sp-trie = { version = "3.0.0", optional = true, path = "../trie" }
 sp-externalities = { version = "0.9.0", optional = true, path = "../externalities" }
 sp-tracing = { version = "3.0.0", default-features = false, path = "../tracing" }
@@ -47,6 +48,7 @@ std = [
 	"sp-runtime-interface/std",
 	"sp-externalities",
 	"sp-wasm-interface/std",
+	"sp-maybe-compressed-blob",
 	"sp-tracing/std",
 	"tracing/std",
 	"tracing-core/std",
diff --git a/primitives/io/src/lib.rs b/primitives/io/src/lib.rs
index 35daaa398990..72695f2156b6 100644
--- a/primitives/io/src/lib.rs
+++ b/primitives/io/src/lib.rs
@@ -38,7 +38,7 @@ use tracing;
 #[cfg(feature = "std")]
 use sp_core::{
 	crypto::Pair,
-	traits::{CallInWasmExt, TaskExecutorExt, RuntimeSpawnExt},
+	traits::{TaskExecutorExt, RuntimeSpawnExt},
 	offchain::{OffchainDbExt, OffchainWorkerExt, TransactionPoolExt},
 	hexdisplay::HexDisplay,
 	storage::ChildInfo,
@@ -70,6 +70,8 @@ mod batch_verifier;
 #[cfg(feature = "std")]
 use batch_verifier::BatchVerifier;
 
+const LOG_TARGET: &str = "runtime::io";
+
 /// Error verifying ECDSA signature
 #[derive(Encode, Decode)]
 pub enum EcdsaVerifyError {
@@ -432,6 +434,9 @@ pub trait Trie {
 /// Interface that provides miscellaneous functions for communicating between the runtime and the node.
 #[runtime_interface]
 pub trait Misc {
+	// NOTE: We use the target 'runtime' for messages produced by general printing functions, instead
+	// of LOG_TARGET.
+
 	/// Print a number.
 	fn print_num(val: u64) {
 		log::debug!(target: "runtime", "{}", val);
@@ -456,28 +461,34 @@ pub trait Misc {
 	///
 	/// # Performance
 	///
-	/// Calling this function is very expensive and should only be done very occasionally.
-	/// For getting the runtime version, it requires instantiating the wasm blob and calling a
-	/// function in this blob.
+	/// This function may be very expensive to call depending on the wasm binary. It may be
+	/// relatively cheap if the wasm binary contains version information. In that case, uncompression
+	/// of the wasm blob is the dominating factor.
+	///
+	/// If the wasm binary does not have the version information attached, then a legacy mechanism
+	/// may be involved. This means that a runtime call will be performed to query the version.
+	///
+	/// Calling into the runtime may be incredible expensive and should be approached with care.
 	fn runtime_version(&mut self, wasm: &[u8]) -> Option<Vec<u8>> {
-		// Create some dummy externalities, `Core_version` should not write data anyway.
+		use sp_core::traits::ReadRuntimeVersionExt;
+
 		let mut ext = sp_state_machine::BasicExternalities::default();
 
-		self.extension::<CallInWasmExt>()
-			.expect("No `CallInWasmExt` associated for the current context!")
-			.call_in_wasm(
-				wasm,
-				None,
-				"Core_version",
-				&[],
-				&mut ext,
-				// If a runtime upgrade introduces new host functions that are not provided by
-				// the node, we should not fail at instantiation. Otherwise nodes that are
-				// updated could run this successfully and it could lead to a storage root
-				// mismatch when importing this block.
-				sp_core::traits::MissingHostFunctions::Allow,
-			)
-			.ok()
+		match self
+			.extension::<ReadRuntimeVersionExt>()
+			.expect("No `ReadRuntimeVersionExt` associated for the current context!")
+			.read_runtime_version(wasm, &mut ext)
+		{
+			Ok(v) => Some(v),
+			Err(err) => {
+				log::debug!(
+					target: LOG_TARGET,
+					"cannot read version from the given runtime: {}",
+					err,
+				);
+				None
+			}
+		}
 	}
 }
 
diff --git a/primitives/runtime-interface/test/Cargo.toml b/primitives/runtime-interface/test/Cargo.toml
index 8b6c9cbe5df0..fb9b3c4b71ed 100644
--- a/primitives/runtime-interface/test/Cargo.toml
+++ b/primitives/runtime-interface/test/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 sp-runtime-interface = { version = "3.0.0", path = "../" }
 sc-executor = { version = "0.9.0", path = "../../../client/executor" }
+sc-executor-common = { version = "0.9.0", path = "../../../client/executor/common" }
 sp-runtime-interface-test-wasm = { version = "2.0.0", path = "../test-wasm" }
 sp-runtime-interface-test-wasm-deprecated = { version = "2.0.0", path = "../test-wasm-deprecated" }
 sp-state-machine = { version = "0.9.0", path = "../../state-machine" }
diff --git a/primitives/runtime-interface/test/src/lib.rs b/primitives/runtime-interface/test/src/lib.rs
index 442699766348..a021a93939a1 100644
--- a/primitives/runtime-interface/test/src/lib.rs
+++ b/primitives/runtime-interface/test/src/lib.rs
@@ -24,7 +24,7 @@ use sp_runtime_interface_test_wasm::{wasm_binary_unwrap, test_api::HostFunctions
 use sp_runtime_interface_test_wasm_deprecated::wasm_binary_unwrap as wasm_binary_deprecated_unwrap;
 
 use sp_wasm_interface::HostFunctions as HostFunctionsT;
-use sc_executor::CallInWasm;
+use sc_executor_common::runtime_blob::RuntimeBlob;
 
 use std::{collections::HashSet, sync::{Arc, Mutex}};
 
@@ -46,14 +46,15 @@ fn call_wasm_method_with_result<HF: HostFunctionsT>(
 		8,
 		None,
 	);
-	executor.call_in_wasm(
-		binary,
-		None,
-		method,
-		&[],
-		&mut ext_ext,
-		sp_core::traits::MissingHostFunctions::Disallow,
-	).map_err(|e| format!("Failed to execute `{}`: {}", method, e))?;
+	executor
+		.uncached_call(
+			RuntimeBlob::uncompress_if_needed(binary).expect("Failed to parse binary"),
+			&mut ext_ext,
+			false,
+			method,
+			&[],
+		)
+		.map_err(|e| format!("Failed to execute `{}`: {}", method, e))?;
 	Ok(ext)
 }
 
diff --git a/primitives/state-machine/src/lib.rs b/primitives/state-machine/src/lib.rs
index a6f1fb1f0e78..479184b4b990 100644
--- a/primitives/state-machine/src/lib.rs
+++ b/primitives/state-machine/src/lib.rs
@@ -178,7 +178,7 @@ mod execution {
 	use codec::{Decode, Encode, Codec};
 	use sp_core::{
 		storage::ChildInfo, NativeOrEncoded, NeverNativeValue, hexdisplay::HexDisplay,
-		traits::{CodeExecutor, CallInWasmExt, RuntimeCode, SpawnNamed},
+		traits::{CodeExecutor, ReadRuntimeVersionExt, RuntimeCode, SpawnNamed},
 	};
 	use sp_externalities::Extensions;
 
@@ -339,7 +339,7 @@ mod execution {
 			runtime_code: &'a RuntimeCode,
 			spawn_handle: impl SpawnNamed + Send + 'static,
 		) -> Self {
-			extensions.register(CallInWasmExt::new(exec.clone()));
+			extensions.register(ReadRuntimeVersionExt::new(exec.clone()));
 			extensions.register(sp_core::traits::TaskExecutorExt::new(spawn_handle));
 
 			Self {
@@ -943,15 +943,11 @@ mod tests {
 		}
 	}
 
-	impl sp_core::traits::CallInWasm for DummyCodeExecutor {
-		fn call_in_wasm(
+	impl sp_core::traits::ReadRuntimeVersion for DummyCodeExecutor {
+		fn read_runtime_version(
 			&self,
 			_: &[u8],
-			_: Option<Vec<u8>>,
-			_: &str,
-			_: &[u8],
 			_: &mut dyn Externalities,
-			_: sp_core::traits::MissingHostFunctions,
 		) -> std::result::Result<Vec<u8>, String> {
 			unimplemented!("Not required in tests.")
 		}
diff --git a/primitives/version/Cargo.toml b/primitives/version/Cargo.toml
index bfb9a742c868..b50da9e9eacf 100644
--- a/primitives/version/Cargo.toml
+++ b/primitives/version/Cargo.toml
@@ -20,6 +20,7 @@ serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "3.0.0", default-features = false, path = "../std" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../runtime" }
+sp-version-proc-macro = { version = "3.0.0", default-features = false, path = "proc-macro" }
 
 [features]
 default = ["std"]
diff --git a/primitives/version/proc-macro/Cargo.toml b/primitives/version/proc-macro/Cargo.toml
new file mode 100644
index 000000000000..ea3144090c70
--- /dev/null
+++ b/primitives/version/proc-macro/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "sp-version-proc-macro"
+version = "3.0.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
+license = "Apache-2.0"
+homepage = "https://substrate.dev"
+repository = "https://github.com/paritytech/substrate/"
+description = "Macro for defining a runtime version."
+documentation = "https://docs.rs/sp-api-proc-macro"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+proc-macro = true
+
+[dependencies]
+quote = "1.0.3"
+syn = { version = "1.0.58", features = ["full", "fold", "extra-traits", "visit"] }
+proc-macro2 = "1.0.6"
+proc-macro-crate = "1.0.0"
+codec = { package = "parity-scale-codec", version = "2.0.0", features = [ "derive" ] }
+
+[dev-dependencies]
+sp-version = { version = "3.0.0", path = ".." }
diff --git a/primitives/version/proc-macro/src/decl_runtime_version.rs b/primitives/version/proc-macro/src/decl_runtime_version.rs
new file mode 100644
index 000000000000..6df0b71b202c
--- /dev/null
+++ b/primitives/version/proc-macro/src/decl_runtime_version.rs
@@ -0,0 +1,279 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use codec::Encode;
+use syn::{
+	Expr, ExprLit, FieldValue, ItemConst, Lit,
+	parse::{Result, Error},
+	parse_macro_input,
+	spanned::Spanned as _,
+};
+use quote::quote;
+use proc_macro2::{TokenStream, Span};
+
+/// This macro accepts a `const` item that has a struct initializer expression of `RuntimeVersion`-like type.
+/// The macro will pass through this declaration and append an item declaration that will
+/// lead to emitting a wasm custom section with the contents of `RuntimeVersion`.
+pub fn decl_runtime_version_impl(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+	let item = parse_macro_input!(input as ItemConst);
+	decl_runtime_version_impl_inner(item)
+		.unwrap_or_else(|e| e.to_compile_error())
+		.into()
+}
+
+fn decl_runtime_version_impl_inner(item: ItemConst) -> Result<TokenStream> {
+	let runtime_version = ParseRuntimeVersion::parse_expr(&*item.expr)?.build(item.expr.span())?;
+	let link_section =
+		generate_emit_link_section_decl(&runtime_version.encode(), "runtime_version");
+
+	Ok(quote! {
+		#item
+		#link_section
+	})
+}
+
+/// This is a duplicate of `sp_version::RuntimeVersion`. We cannot unfortunately use the original
+/// declaration, because if we directly depend on `sp_version` from this proc-macro cargo will
+/// enable `std` feature even for `no_std` wasm runtime builds.
+///
+/// One difference from the original definition is the `apis` field. Since we don't actually parse
+/// `apis` from this macro it will always be emitteed as empty. An empty vector can be encoded as
+/// a zero-byte, thus `u8` is sufficient here.
+#[derive(Encode)]
+struct RuntimeVersion {
+	spec_name: String,
+	impl_name: String,
+	authoring_version: u32,
+	spec_version: u32,
+	impl_version: u32,
+	apis: u8,
+	transaction_version: u32,
+}
+
+#[derive(Default, Debug)]
+struct ParseRuntimeVersion {
+	spec_name: Option<String>,
+	impl_name: Option<String>,
+	authoring_version: Option<u32>,
+	spec_version: Option<u32>,
+	impl_version: Option<u32>,
+	transaction_version: Option<u32>,
+}
+
+impl ParseRuntimeVersion {
+	fn parse_expr(init_expr: &Expr) -> Result<ParseRuntimeVersion> {
+		let init_expr = match init_expr {
+			Expr::Struct(ref e) => e,
+			_ => {
+				return Err(Error::new(
+					init_expr.span(),
+					"expected a struct initializer expression",
+				));
+			}
+		};
+
+		let mut parsed = ParseRuntimeVersion::default();
+		for field_value in init_expr.fields.iter() {
+			parsed.parse_field_value(field_value)?;
+		}
+		Ok(parsed)
+	}
+
+	fn parse_field_value(&mut self, field_value: &FieldValue) -> Result<()> {
+		let field_name = match field_value.member {
+			syn::Member::Named(ref ident) => ident,
+			syn::Member::Unnamed(_) => {
+				return Err(Error::new(
+					field_value.span(),
+					"only named members must be used",
+				));
+			}
+		};
+
+		fn parse_once<T>(
+			value: &mut Option<T>,
+			field: &FieldValue,
+			parser: impl FnOnce(&Expr) -> Result<T>,
+		) -> Result<()> {
+			if value.is_some() {
+				return Err(Error::new(
+					field.span(),
+					"field is already initialized before",
+				));
+			} else {
+				*value = Some(parser(&field.expr)?);
+				Ok(())
+			}
+		}
+
+		if field_name == "spec_name" {
+			parse_once(&mut self.spec_name, field_value, Self::parse_str_literal)?;
+		} else if field_name == "impl_name" {
+			parse_once(&mut self.impl_name, field_value, Self::parse_str_literal)?;
+		} else if field_name == "authoring_version" {
+			parse_once(
+				&mut self.authoring_version,
+				field_value,
+				Self::parse_num_literal,
+			)?;
+		} else if field_name == "spec_version" {
+			parse_once(&mut self.spec_version, field_value, Self::parse_num_literal)?;
+		} else if field_name == "impl_version" {
+			parse_once(&mut self.impl_version, field_value, Self::parse_num_literal)?;
+		} else if field_name == "transaction_version" {
+			parse_once(
+				&mut self.transaction_version,
+				field_value,
+				Self::parse_num_literal,
+			)?;
+		} else if field_name == "apis" {
+			// Intentionally ignored
+			//
+			// The definition will pass through for the declaration, however, it won't get into
+			// the "runtime_version" custom section. `impl_runtime_apis` is responsible for generating
+			// a custom section with the supported runtime apis descriptor.
+		} else {
+			return Err(Error::new(field_name.span(), "unknown field"));
+		}
+
+		Ok(())
+	}
+
+	fn parse_num_literal(expr: &Expr) -> Result<u32> {
+		let lit = match *expr {
+			Expr::Lit(ExprLit {
+				lit: Lit::Int(ref lit),
+				..
+			}) => lit,
+			_ => {
+				return Err(Error::new(
+					expr.span(),
+					"only numeric literals (e.g. `10`) are supported here",
+				));
+			}
+		};
+		lit.base10_parse::<u32>()
+	}
+
+	fn parse_str_literal(expr: &Expr) -> Result<String> {
+		let mac = match *expr {
+			Expr::Macro(syn::ExprMacro { ref mac, .. }) => mac,
+			_ => {
+				return Err(Error::new(
+					expr.span(),
+					"a macro expression is expected here",
+				));
+			}
+		};
+
+		let lit: ExprLit = mac.parse_body().map_err(|e| {
+			Error::new(
+				e.span(),
+				format!(
+					"a single literal argument is expected, but parsing is failed: {}",
+					e
+				),
+			)
+		})?;
+
+		match lit.lit {
+			Lit::Str(ref lit) => Ok(lit.value()),
+			_ => Err(Error::new(
+				lit.span(),
+				"only string literals are supported here",
+			)),
+		}
+	}
+
+	fn build(self, span: Span) -> Result<RuntimeVersion> {
+		macro_rules! required {
+			($e:expr) => {
+				$e.ok_or_else(||
+					{
+						Error::new(
+							span,
+							format!("required field '{}' is missing", stringify!($e)),
+						)
+					}
+				)?
+			};
+		}
+
+		let Self {
+			spec_name,
+			impl_name,
+			authoring_version,
+			spec_version,
+			impl_version,
+			transaction_version,
+		} = self;
+
+		Ok(RuntimeVersion {
+			spec_name: required!(spec_name),
+			impl_name: required!(impl_name),
+			authoring_version: required!(authoring_version),
+			spec_version: required!(spec_version),
+			impl_version: required!(impl_version),
+			transaction_version: required!(transaction_version),
+			apis: 0,
+		})
+	}
+}
+
+fn generate_emit_link_section_decl(contents: &[u8], section_name: &str) -> TokenStream {
+	let len = contents.len();
+	quote! {
+		const _: () = {
+			#[link_section = #section_name]
+			static SECTION_CONTENTS: [u8; #len] = [#(#contents),*];
+		};
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use codec::DecodeAll;
+	use std::borrow::Cow;
+
+	#[test]
+	fn version_can_be_deserialized() {
+		let version_bytes = RuntimeVersion {
+			spec_name: "hello".to_string(),
+			impl_name: "world".to_string(),
+			authoring_version: 10,
+			spec_version: 265,
+			impl_version: 1,
+			apis: 0,
+			transaction_version: 2,
+		}
+		.encode();
+
+		assert_eq!(
+			sp_version::RuntimeVersion::decode_all(&mut &version_bytes[..]).unwrap(),
+			sp_version::RuntimeVersion {
+				spec_name: "hello".into(),
+				impl_name: "world".into(),
+				authoring_version: 10,
+				spec_version: 265,
+				impl_version: 1,
+				apis: Cow::Owned(vec![]),
+				transaction_version: 2,
+			},
+		);
+	}
+}
diff --git a/primitives/version/proc-macro/src/lib.rs b/primitives/version/proc-macro/src/lib.rs
new file mode 100644
index 000000000000..9a6d4d60bbf9
--- /dev/null
+++ b/primitives/version/proc-macro/src/lib.rs
@@ -0,0 +1,32 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! A proc-macro that generates a custom wasm section from a given RuntimeVersion declaration
+//!
+//! This macro is re-exported from the `sp_version::runtime_version` and intended to be used from
+//! there. Documentation can also be found there.
+
+#![recursion_limit = "512"]
+
+use proc_macro::TokenStream;
+
+mod decl_runtime_version;
+
+#[proc_macro_attribute]
+pub fn runtime_version(_: TokenStream, input: TokenStream) -> TokenStream {
+	decl_runtime_version::decl_runtime_version_impl(input)
+}
diff --git a/primitives/version/src/lib.rs b/primitives/version/src/lib.rs
index 24a1b85ed0c3..603989f5d2f6 100644
--- a/primitives/version/src/lib.rs
+++ b/primitives/version/src/lib.rs
@@ -35,6 +35,51 @@ pub use sp_std;
 #[cfg(feature = "std")]
 use sp_runtime::{traits::Block as BlockT, generic::BlockId};
 
+/// An attribute that accepts a version declaration of a runtime and generates a custom wasm section
+/// with the equivalent contents.
+///
+/// The custom section allows to read the version of the runtime without having to execute any code.
+/// Instead, the generated custom section can be relatively easily parsed from the wasm binary. The
+/// identifier of the custom section is "runtime_version".
+///
+/// A shortcoming of this macro is that it is unable to embed information regarding supported APIs.
+/// This is supported by the `construct_runtime!` macro.
+///
+/// This macro accepts a const item like the following:
+///
+/// ```rust
+/// use sp_version::{create_runtime_str, RuntimeVersion};
+///
+/// #[sp_version::runtime_version]
+/// pub const VERSION: RuntimeVersion = RuntimeVersion {
+/// 	spec_name: create_runtime_str!("test"),
+/// 	impl_name: create_runtime_str!("test"),
+/// 	authoring_version: 10,
+/// 	spec_version: 265,
+/// 	impl_version: 1,
+/// 	apis: RUNTIME_API_VERSIONS,
+/// 	transaction_version: 2,
+/// };
+///
+/// # const RUNTIME_API_VERSIONS: sp_version::ApisVec = sp_version::create_apis_vec!([]);
+/// ```
+///
+/// It will pass it through and add code required for emitting a custom section. The information that
+/// will go into the custom section is parsed from the item declaration. Due to that, the macro is
+/// somewhat rigid in terms of the code it accepts. There are the following considerations:
+///
+/// - The `spec_name` and `impl_name` must be set by a macro-like expression. The name of the macro
+///   doesn't matter though.
+///
+/// - `authoring_version`, `spec_version`, `impl_version` and `transaction_version` must be set
+///   by a literal. Literal must be an integer. No other expressions are allowed there. In particular,
+///   you can't supply a constant variable.
+///
+/// - `apis` doesn't have any specific constraints. This is because this information doesn't get into
+///   the custom section and is not parsed.
+///
+pub use sp_version_proc_macro::runtime_version;
+
 /// The identity of a particular API interface that the runtime might provide.
 pub type ApiId = [u8; 8];
 
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index 4afb313eef35..7ee1072a7b83 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -92,6 +92,7 @@ pub fn wasm_binary_logging_disabled_unwrap() -> &'static [u8] {
 }
 
 /// Test runtime version.
+#[sp_version::runtime_version]
 pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("test"),
 	impl_name: create_runtime_str!("parity-test"),

From c6a4752539fe8c8254ae60110808123ad239a2bf Mon Sep 17 00:00:00 2001
From: Andrew Jones <ascjones@gmail.com>
Date: Wed, 12 May 2021 17:35:33 +0100
Subject: [PATCH 0736/1194] Remove grandpa `StoredPendingChange` shim (#8788)

* Remove grandpa StoredPendingChange shim

* Unused import
---
 frame/grandpa/src/lib.rs   | 29 +----------------------------
 frame/grandpa/src/tests.rs | 18 +-----------------
 2 files changed, 2 insertions(+), 45 deletions(-)

diff --git a/frame/grandpa/src/lib.rs b/frame/grandpa/src/lib.rs
index 7cfc1d61baf2..6c78b2c8d01f 100644
--- a/frame/grandpa/src/lib.rs
+++ b/frame/grandpa/src/lib.rs
@@ -107,21 +107,8 @@ pub trait WeightInfo {
 	fn note_stalled() -> Weight;
 }
 
-/// A stored pending change, old format.
-// TODO: remove shim
-// https://github.com/paritytech/substrate/issues/1614
-#[derive(Encode, Decode)]
-pub struct OldStoredPendingChange<N> {
-	/// The block number this was scheduled at.
-	pub scheduled_at: N,
-	/// The delay in blocks until it will be applied.
-	pub delay: N,
-	/// The next authority set.
-	pub next_authorities: AuthorityList,
-}
-
 /// A stored pending change.
-#[derive(Encode)]
+#[derive(Encode, Decode)]
 pub struct StoredPendingChange<N> {
 	/// The block number this was scheduled at.
 	pub scheduled_at: N,
@@ -134,20 +121,6 @@ pub struct StoredPendingChange<N> {
 	pub forced: Option<N>,
 }
 
-impl<N: Decode> Decode for StoredPendingChange<N> {
-	fn decode<I: codec::Input>(value: &mut I) -> core::result::Result<Self, codec::Error> {
-		let old = OldStoredPendingChange::decode(value)?;
-		let forced = <Option<N>>::decode(value).unwrap_or(None);
-
-		Ok(StoredPendingChange {
-			scheduled_at: old.scheduled_at,
-			delay: old.delay,
-			next_authorities: old.next_authorities,
-			forced,
-		})
-	}
-}
-
 /// Current state of the GRANDPA authority set. State transitions must happen in
 /// the same order of states defined below, e.g. `Paused` implies a prior
 /// `PendingPause`.
diff --git a/frame/grandpa/src/tests.rs b/frame/grandpa/src/tests.rs
index 92d2c6c751a2..0692102771bf 100644
--- a/frame/grandpa/src/tests.rs
+++ b/frame/grandpa/src/tests.rs
@@ -21,7 +21,7 @@
 
 use super::{Call, Event, *};
 use crate::mock::*;
-use codec::{Decode, Encode};
+use codec::Encode;
 use fg_primitives::ScheduledChange;
 use frame_support::{
 	assert_err, assert_ok, assert_noop,
@@ -127,22 +127,6 @@ fn cannot_schedule_change_when_one_pending() {
 	});
 }
 
-#[test]
-fn new_decodes_from_old() {
-	let old = OldStoredPendingChange {
-		scheduled_at: 5u32,
-		delay: 100u32,
-		next_authorities: to_authorities(vec![(1, 5), (2, 10), (3, 2)]),
-	};
-
-	let encoded = old.encode();
-	let new = StoredPendingChange::<u32>::decode(&mut &encoded[..]).unwrap();
-	assert!(new.forced.is_none());
-	assert_eq!(new.scheduled_at, old.scheduled_at);
-	assert_eq!(new.delay, old.delay);
-	assert_eq!(new.next_authorities, old.next_authorities);
-}
-
 #[test]
 fn dispatch_forced_change() {
 	new_test_ext(vec![(1, 1), (2, 1), (3, 1)]).execute_with(|| {

From af14d493bec4d6ecdfd7b309df6c82d5d978469c Mon Sep 17 00:00:00 2001
From: stanly-johnson <stanlyjohnson@outlook.com>
Date: Wed, 12 May 2021 22:08:46 +0530
Subject: [PATCH 0737/1194] Migrate pallet-offences to pallet attribute macro
 (#8763)

* update to pallet macro

* fixes

* fix tests

* remove unwanted generic

* fix conflict

* Fix storage and tabs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
---
 frame/offences/benchmarking/src/lib.rs |   2 +-
 frame/offences/src/lib.rs              | 138 +++++++++++++++----------
 frame/offences/src/mock.rs             |   2 +-
 3 files changed, 85 insertions(+), 57 deletions(-)

diff --git a/frame/offences/benchmarking/src/lib.rs b/frame/offences/benchmarking/src/lib.rs
index f65bdddd36d0..e27c66c75a66 100644
--- a/frame/offences/benchmarking/src/lib.rs
+++ b/frame/offences/benchmarking/src/lib.rs
@@ -38,7 +38,7 @@ use pallet_balances::Config as BalancesConfig;
 use pallet_babe::BabeEquivocationOffence;
 use pallet_grandpa::{GrandpaEquivocationOffence, GrandpaTimeSlot};
 use pallet_im_online::{Config as ImOnlineConfig, Pallet as ImOnline, UnresponsivenessOffence};
-use pallet_offences::{Config as OffencesConfig, Module as Offences};
+use pallet_offences::{Config as OffencesConfig, Pallet as Offences};
 use pallet_session::historical::{Config as HistoricalConfig, IdentificationTuple};
 use pallet_session::{Config as SessionConfig, SessionManager};
 use pallet_staking::{
diff --git a/frame/offences/src/lib.rs b/frame/offences/src/lib.rs
index cd25ca1ef1dc..84a7414927d6 100644
--- a/frame/offences/src/lib.rs
+++ b/frame/offences/src/lib.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! # Offences Module
+//! # Offences Pallet
 //!
 //! Tracks reported offences
 
@@ -26,16 +26,16 @@ mod mock;
 mod tests;
 mod migration;
 
-use sp_std::vec::Vec;
-use frame_support::{
-	decl_module, decl_event, decl_storage, Parameter, weights::Weight,
-};
+use sp_std::prelude::*;
+use frame_support::weights::Weight;
 use sp_runtime::{traits::Hash, Perbill};
 use sp_staking::{
-	SessionIndex,
-	offence::{Offence, ReportOffence, Kind, OnOffenceHandler, OffenceDetails, OffenceError},
+	offence::{Kind, Offence, OffenceDetails, OffenceError, OnOffenceHandler, ReportOffence},
+	SessionIndex
 };
-use codec::{Encode, Decode};
+use codec::{Decode, Encode};
+
+pub use pallet::*;
 
 /// A binary blob which represents a SCALE codec-encoded `O::TimeSlot`.
 type OpaqueTimeSlot = Vec<u8>;
@@ -57,59 +57,87 @@ impl WeightInfo for () {
 	fn on_initialize(_d: u32, ) -> Weight { 1_000_000_000 }
 }
 
-/// Offences trait
-pub trait Config: frame_system::Config {
-	/// The overarching event type.
-	type Event: From<Event> + Into<<Self as frame_system::Config>::Event>;
-	/// Full identification of the validator.
-	type IdentificationTuple: Parameter + Ord;
-	/// A handler called for every offence report.
-	type OnOffenceHandler: OnOffenceHandler<Self::AccountId, Self::IdentificationTuple, Weight>;
-}
-
-decl_storage! {
-	trait Store for Module<T: Config> as Offences {
-		/// The primary structure that holds all offence records keyed by report identifiers.
-		Reports get(fn reports):
-			map hasher(twox_64_concat) ReportIdOf<T>
-			=> Option<OffenceDetails<T::AccountId, T::IdentificationTuple>>;
-
-		/// A vector of reports of the same kind that happened at the same time slot.
-		ConcurrentReportsIndex:
-			double_map hasher(twox_64_concat) Kind, hasher(twox_64_concat) OpaqueTimeSlot
-			=> Vec<ReportIdOf<T>>;
-
-		/// Enumerates all reports of a kind along with the time they happened.
-		///
-		/// All reports are sorted by the time of offence.
-		///
-		/// Note that the actual type of this mapping is `Vec<u8>`, this is because values of
-		/// different types are not supported at the moment so we are doing the manual serialization.
-		ReportsByKindIndex: map hasher(twox_64_concat) Kind => Vec<u8>; // (O::TimeSlot, ReportIdOf<T>)
+#[frame_support::pallet]
+pub mod pallet {
+	use super::*;
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(_);
+
+	/// The pallet's config trait.
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		/// The overarching event type.
+		type Event: From<Event> + IsType<<Self as frame_system::Config>::Event>;
+		/// Full identification of the validator.
+		type IdentificationTuple: Parameter + Ord;
+		/// A handler called for every offence report.
+		type OnOffenceHandler: OnOffenceHandler<Self::AccountId, Self::IdentificationTuple, Weight>;
 	}
-}
 
-decl_event!(
+	/// The primary structure that holds all offence records keyed by report identifiers.
+	#[pallet::storage]
+	#[pallet::getter(fn reports)]
+	pub type Reports<T: Config> = StorageMap<
+		_,
+		Twox64Concat,
+		ReportIdOf<T>,
+		OffenceDetails<T::AccountId, T::IdentificationTuple>,
+	>;
+
+	/// A vector of reports of the same kind that happened at the same time slot.
+	#[pallet::storage]
+	pub type ConcurrentReportsIndex<T: Config> = StorageDoubleMap<
+		_,
+		Twox64Concat,
+		Kind,
+		Twox64Concat,
+		OpaqueTimeSlot,
+		Vec<ReportIdOf<T>>,
+		ValueQuery,
+	>;
+
+	/// Enumerates all reports of a kind along with the time they happened.
+	///
+	/// All reports are sorted by the time of offence.
+	///
+	/// Note that the actual type of this mapping is `Vec<u8>`, this is because values of
+	/// different types are not supported at the moment so we are doing the manual serialization.
+	#[pallet::storage]
+	pub type ReportsByKindIndex<T> = StorageMap<
+		_,
+		Twox64Concat,
+		Kind,
+		Vec<u8>, // (O::TimeSlot, ReportIdOf<T>)
+		ValueQuery,
+	>;
+
+	/// Events type.
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
 	pub enum Event {
 		/// There is an offence reported of the given `kind` happened at the `session_index` and
 		/// (kind-specific) time slot. This event is not deposited for duplicate slashes.
 		/// \[kind, timeslot\].
 		Offence(Kind, OpaqueTimeSlot),
 	}
-);
-
-decl_module! {
-	pub struct Module<T: Config> for enum Call where origin: T::Origin {
-		fn deposit_event() = default;
 
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
 		fn on_runtime_upgrade() -> Weight {
 			migration::remove_deferred_storage::<T>()
 		}
 	}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
 }
 
 impl<T: Config, O: Offence<T::IdentificationTuple>>
-	ReportOffence<T::AccountId, T::IdentificationTuple, O> for Module<T>
+	ReportOffence<T::AccountId, T::IdentificationTuple, O> for Pallet<T>
 where
 	T::IdentificationTuple: Clone,
 {
@@ -120,11 +148,9 @@ where
 
 		// Go through all offenders in the offence report and find all offenders that were spotted
 		// in unique reports.
-		let TriageOutcome { concurrent_offenders } = match Self::triage_offence_report::<O>(
-			reporters,
-			&time_slot,
-			offenders,
-		) {
+		let TriageOutcome {
+			concurrent_offenders,
+		} = match Self::triage_offence_report::<O>(reporters, &time_slot, offenders) {
 			Some(triage) => triage,
 			// The report contained only duplicates, so there is no need to slash again.
 			None => return Err(OffenceError::DuplicateReport),
@@ -136,7 +162,8 @@ where
 		let new_fraction = O::slash_fraction(offenders_count, validator_set_count);
 
 		let slash_perbill: Vec<_> = (0..concurrent_offenders.len())
-			.map(|_| new_fraction.clone()).collect();
+			.map(|_| new_fraction.clone())
+			.collect();
 
 		T::OnOffenceHandler::on_offence(
 			&concurrent_offenders,
@@ -160,7 +187,7 @@ where
 	}
 }
 
-impl<T: Config> Module<T> {
+impl<T: Config> Pallet<T> {
 	/// Compute the ID for the given report properties.
 	///
 	/// The report id depends on the offence kind, time slot and the id of offender.
@@ -200,7 +227,8 @@ impl<T: Config> Module<T> {
 
 		if any_new {
 			// Load report details for the all reports happened at the same time.
-			let concurrent_offenders = storage.concurrent_reports
+			let concurrent_offenders = storage
+				.concurrent_reports
 				.iter()
 				.filter_map(|report_id| <Reports<T>>::get(report_id))
 				.collect::<Vec<_>>();
@@ -238,7 +266,7 @@ impl<T: Config, O: Offence<T::IdentificationTuple>> ReportIndexStorage<T, O> {
 	fn load(time_slot: &O::TimeSlot) -> Self {
 		let opaque_time_slot = time_slot.encode();
 
-		let same_kind_reports = <ReportsByKindIndex>::get(&O::ID);
+		let same_kind_reports = ReportsByKindIndex::<T>::get(&O::ID);
 		let same_kind_reports =
 			Vec::<(O::TimeSlot, ReportIdOf<T>)>::decode(&mut &same_kind_reports[..])
 				.unwrap_or_default();
@@ -272,7 +300,7 @@ impl<T: Config, O: Offence<T::IdentificationTuple>> ReportIndexStorage<T, O> {
 
 	/// Dump the indexes to the storage.
 	fn save(self) {
-		<ReportsByKindIndex>::insert(&O::ID, self.same_kind_reports.encode());
+		ReportsByKindIndex::<T>::insert(&O::ID, self.same_kind_reports.encode());
 		<ConcurrentReportsIndex<T>>::insert(
 			&O::ID,
 			&self.opaque_time_slot,
diff --git a/frame/offences/src/mock.rs b/frame/offences/src/mock.rs
index 4176a54d9ece..e7655d7ee29a 100644
--- a/frame/offences/src/mock.rs
+++ b/frame/offences/src/mock.rs
@@ -31,7 +31,7 @@ use sp_runtime::testing::Header;
 use sp_runtime::traits::{IdentityLookup, BlakeTwo256};
 use sp_core::H256;
 use frame_support::{
-	parameter_types, StorageMap, StorageDoubleMap,
+	parameter_types,
 	weights::{Weight, constants::{WEIGHT_PER_SECOND, RocksDbWeight}},
 };
 use crate as offences;

From c5f1ca65def34d2ab7ef4cade43624652e03712e Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Thu, 13 May 2021 16:53:30 +0300
Subject: [PATCH 0738/1194] Maintain fork_targets (#8791)

* Maintain fork_targets

* Added a test
---
 client/network/src/protocol/sync.rs | 69 ++++++++++++++++++++++-------
 1 file changed, 54 insertions(+), 15 deletions(-)

diff --git a/client/network/src/protocol/sync.rs b/client/network/src/protocol/sync.rs
index d3ab2912a9dc..f1b744c89a99 100644
--- a/client/network/src/protocol/sync.rs
+++ b/client/network/src/protocol/sync.rs
@@ -1543,21 +1543,23 @@ impl<B: BlockT> ChainSync<B> {
 			return PollBlockAnnounceValidation::ImportHeader { is_best, announce, who }
 		}
 
-		trace!(
-			target: "sync",
-			"Added sync target for block announced from {}: {} {:?}",
-			who,
-			hash,
-			announce.summary(),
-		);
-		self.fork_targets
-			.entry(hash.clone())
-			.or_insert_with(|| ForkTarget {
-				number,
-				parent_hash: Some(*announce.header.parent_hash()),
-				peers: Default::default(),
-			})
-			.peers.insert(who.clone());
+		if self.status().state == SyncState::Idle {
+			trace!(
+				target: "sync",
+				"Added sync target for block announced from {}: {} {:?}",
+				who,
+				hash,
+				announce.summary(),
+			);
+			self.fork_targets
+				.entry(hash.clone())
+				.or_insert_with(|| ForkTarget {
+					number,
+					parent_hash: Some(*announce.header.parent_hash()),
+					peers: Default::default(),
+				})
+				.peers.insert(who.clone());
+		}
 
 		PollBlockAnnounceValidation::Nothing { is_best, who, announce }
 	}
@@ -1570,6 +1572,10 @@ impl<B: BlockT> ChainSync<B> {
 		self.peers.remove(who);
 		self.extra_justifications.peer_disconnected(who);
 		self.pending_requests.set_all();
+		self.fork_targets.retain(|_, target| {
+			target.peers.remove(who);
+			!target.peers.is_empty()
+		});
 		let blocks: Vec<_> = self.blocks
 			.drain(self.best_queued_number + One::one())
 			.into_iter()
@@ -2572,4 +2578,37 @@ mod test {
 			&peer_id1,
 		);
 	}
+
+	#[test]
+	fn removes_target_fork_on_disconnect() {
+		sp_tracing::try_init_simple();
+		let mut client = Arc::new(TestClientBuilder::new().build());
+		let blocks = (0..3)
+			.map(|_| build_block(&mut client, None, false))
+			.collect::<Vec<_>>();
+
+		let info = client.info();
+
+		let mut sync = ChainSync::new(
+			Roles::AUTHORITY,
+			client.clone(),
+			&info,
+			Box::new(DefaultBlockAnnounceValidator),
+			1,
+		);
+
+		let peer_id1 = PeerId::random();
+		let common_block = blocks[1].clone();
+		// Connect the node we will sync from
+		sync.new_peer(peer_id1.clone(), common_block.hash(), *common_block.header().number()).unwrap();
+
+		// Create a "new" header and announce it
+		let mut header = blocks[0].header().clone();
+		header.number = 4;
+		send_block_announce(header, &peer_id1, &mut sync);
+		assert!(sync.fork_targets.len() == 1);
+
+		sync.peer_disconnected(&peer_id1);
+		assert!(sync.fork_targets.len() == 0);
+	}
 }

From e8f8a5d45b4e96c73871d6f441fc168d73953a35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Thu, 13 May 2021 21:56:11 +0200
Subject: [PATCH 0739/1194] contracts: Move `Schedule` from Storage to `Config`
 (#8773)

* Move `Schedule` from Storage to Config

* Updated CHANGELOG

* Fix nits from review

* Fix migration

* Print the debug buffer as tracing message

* Use `debug` instead of `trace` and update README

* Add additional assert to test

* Rename `schedule_version` to `instruction_weights_version`

* Fixed typo

* Added more comments to wat fixtures

* Add clarification for the `debug_message` field
---
 bin/node/cli/src/chain_spec.rs                |   13 +-
 bin/node/runtime/src/lib.rs                   |   11 +-
 bin/node/testing/src/genesis.rs               |    5 +-
 bin/utils/chain-spec-builder/src/main.rs      |    3 -
 frame/contracts/CHANGELOG.md                  |    4 +
 frame/contracts/README.md                     |   23 +-
 frame/contracts/common/src/lib.rs             |   30 +-
 frame/contracts/fixtures/caller_contract.wat  |    1 -
 .../fixtures/debug_message_invalid_utf8.wat   |   18 +
 .../debug_message_logging_disabled.wat        |   28 +
 .../fixtures/debug_message_works.wat          |   28 +
 frame/contracts/src/benchmarking/code.rs      |    7 +-
 frame/contracts/src/benchmarking/mod.rs       |   93 +-
 frame/contracts/src/exec.rs                   |  190 ++-
 frame/contracts/src/lib.rs                    |  160 +-
 frame/contracts/src/migration.rs              |   23 +-
 frame/contracts/src/schedule.rs               |   81 +-
 frame/contracts/src/tests.rs                  |  148 +-
 frame/contracts/src/wasm/code_cache.rs        |   10 +-
 frame/contracts/src/wasm/mod.rs               |   91 +-
 frame/contracts/src/wasm/prepare.rs           |   42 +-
 frame/contracts/src/wasm/runtime.rs           |   52 +-
 frame/contracts/src/weights.rs                | 1460 +++++++++--------
 23 files changed, 1465 insertions(+), 1056 deletions(-)
 create mode 100644 frame/contracts/fixtures/debug_message_invalid_utf8.wat
 create mode 100644 frame/contracts/fixtures/debug_message_logging_disabled.wat
 create mode 100644 frame/contracts/fixtures/debug_message_works.wat

diff --git a/bin/node/cli/src/chain_spec.rs b/bin/node/cli/src/chain_spec.rs
index 96888bd4ce1e..d46a7797a702 100644
--- a/bin/node/cli/src/chain_spec.rs
+++ b/bin/node/cli/src/chain_spec.rs
@@ -22,7 +22,7 @@ use sc_chain_spec::ChainSpecExtension;
 use sp_core::{Pair, Public, crypto::UncheckedInto, sr25519};
 use serde::{Serialize, Deserialize};
 use node_runtime::{
-	AuthorityDiscoveryConfig, BabeConfig, BalancesConfig, ContractsConfig, CouncilConfig,
+	AuthorityDiscoveryConfig, BabeConfig, BalancesConfig, CouncilConfig,
 	DemocracyConfig, GrandpaConfig, ImOnlineConfig, SessionConfig, SessionKeys, StakerStatus,
 	StakingConfig, ElectionsConfig, IndicesConfig, SocietyConfig, SudoConfig, SystemConfig,
 	TechnicalCommitteeConfig, wasm_binary_unwrap, MAX_NOMINATIONS,
@@ -146,7 +146,7 @@ fn staging_testnet_config_genesis() -> GenesisConfig {
 
 	let endowed_accounts: Vec<AccountId> = vec![root_key.clone()];
 
-	testnet_genesis(initial_authorities, vec![], root_key, Some(endowed_accounts), false)
+	testnet_genesis(initial_authorities, vec![], root_key, Some(endowed_accounts))
 }
 
 /// Staging testnet config.
@@ -212,7 +212,6 @@ pub fn testnet_genesis(
 	initial_nominators: Vec<AccountId>,
 	root_key: AccountId,
 	endowed_accounts: Option<Vec<AccountId>>,
-	enable_println: bool,
 ) -> GenesisConfig {
 	let mut endowed_accounts: Vec<AccountId> = endowed_accounts.unwrap_or_else(|| {
 		vec![
@@ -308,11 +307,6 @@ pub fn testnet_genesis(
 						.collect(),
 			phantom: Default::default(),
 		},
-		pallet_contracts: ContractsConfig {
-			// println should only be enabled on development chains
-			current_schedule: pallet_contracts::Schedule::default()
-				.enable_println(enable_println),
-		},
 		pallet_sudo: SudoConfig {
 			key: root_key,
 		},
@@ -352,7 +346,6 @@ fn development_config_genesis() -> GenesisConfig {
 		vec![],
 		get_account_id_from_seed::<sr25519::Public>("Alice"),
 		None,
-		true,
 	)
 }
 
@@ -380,7 +373,6 @@ fn local_testnet_genesis() -> GenesisConfig {
 		vec![],
 		get_account_id_from_seed::<sr25519::Public>("Alice"),
 		None,
-		false,
 	)
 }
 
@@ -414,7 +406,6 @@ pub(crate) mod tests {
 			vec![],
 			get_account_id_from_seed::<sr25519::Public>("Alice"),
 			None,
-			false,
 		)
 	}
 
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index a20437c25659..a570329dcfce 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -793,7 +793,7 @@ parameter_types! {
 			<Runtime as pallet_contracts::Config>::WeightInfo::on_initialize_per_queue_item(1) -
 			<Runtime as pallet_contracts::Config>::WeightInfo::on_initialize_per_queue_item(0)
 		)) / 5) as u32;
-	pub MaxCodeSize: u32 = 128 * 1024;
+	pub Schedule: pallet_contracts::Schedule<Runtime> = Default::default();
 }
 
 impl pallet_contracts::Config for Runtime {
@@ -810,13 +810,12 @@ impl pallet_contracts::Config for Runtime {
 	type RentFraction = RentFraction;
 	type SurchargeReward = SurchargeReward;
 	type CallStack = [pallet_contracts::Frame<Self>; 31];
-	type MaxValueSize = MaxValueSize;
 	type WeightPrice = pallet_transaction_payment::Module<Self>;
 	type WeightInfo = pallet_contracts::weights::SubstrateWeight<Self>;
 	type ChainExtension = ();
 	type DeletionQueueDepth = DeletionQueueDepth;
 	type DeletionWeightLimit = DeletionWeightLimit;
-	type MaxCodeSize = MaxCodeSize;
+	type Schedule = Schedule;
 }
 
 impl pallet_sudo::Config for Runtime {
@@ -1114,7 +1113,7 @@ construct_runtime!(
 		TechnicalMembership: pallet_membership::<Instance1>::{Pallet, Call, Storage, Event<T>, Config<T>},
 		Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event, ValidateUnsigned},
 		Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>},
-		Contracts: pallet_contracts::{Pallet, Call, Config<T>, Storage, Event<T>},
+		Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>},
 		Sudo: pallet_sudo::{Pallet, Call, Config<T>, Storage, Event<T>},
 		ImOnline: pallet_im_online::{Pallet, Call, Storage, Event<T>, ValidateUnsigned, Config<T>},
 		AuthorityDiscovery: pallet_authority_discovery::{Pallet, Call, Config},
@@ -1354,7 +1353,7 @@ impl_runtime_apis! {
 			gas_limit: u64,
 			input_data: Vec<u8>,
 		) -> pallet_contracts_primitives::ContractExecResult {
-			Contracts::bare_call(origin, dest, value, gas_limit, input_data)
+			Contracts::bare_call(origin, dest, value, gas_limit, input_data, true)
 		}
 
 		fn instantiate(
@@ -1366,7 +1365,7 @@ impl_runtime_apis! {
 			salt: Vec<u8>,
 		) -> pallet_contracts_primitives::ContractInstantiateResult<AccountId, BlockNumber>
 		{
-			Contracts::bare_instantiate(origin, endowment, gas_limit, code, data, salt, true)
+			Contracts::bare_instantiate(origin, endowment, gas_limit, code, data, salt, true, true)
 		}
 
 		fn get_storage(
diff --git a/bin/node/testing/src/genesis.rs b/bin/node/testing/src/genesis.rs
index 25b728ebe193..905c2f4d70bb 100644
--- a/bin/node/testing/src/genesis.rs
+++ b/bin/node/testing/src/genesis.rs
@@ -22,7 +22,7 @@ use crate::keyring::*;
 use sp_keyring::{Ed25519Keyring, Sr25519Keyring};
 use node_runtime::{
 	GenesisConfig, BalancesConfig, SessionConfig, StakingConfig, SystemConfig,
-	GrandpaConfig, IndicesConfig, ContractsConfig, SocietyConfig, wasm_binary_unwrap,
+	GrandpaConfig, IndicesConfig, SocietyConfig, wasm_binary_unwrap,
 	AccountId, StakerStatus, BabeConfig, BABE_GENESIS_EPOCH_CONFIG,
 };
 use node_runtime::constants::currency::*;
@@ -97,9 +97,6 @@ pub fn config_endowed(
 			invulnerables: vec![alice(), bob(), charlie()],
 			.. Default::default()
 		},
-		pallet_contracts: ContractsConfig {
-			current_schedule: Default::default(),
-		},
 		pallet_babe: BabeConfig {
 			authorities: vec![],
 			epoch_config: Some(BABE_GENESIS_EPOCH_CONFIG),
diff --git a/bin/utils/chain-spec-builder/src/main.rs b/bin/utils/chain-spec-builder/src/main.rs
index 2aaef7c96d9a..a3f8eaa1f854 100644
--- a/bin/utils/chain-spec-builder/src/main.rs
+++ b/bin/utils/chain-spec-builder/src/main.rs
@@ -106,14 +106,11 @@ fn genesis_constructor(
 		.map(chain_spec::authority_keys_from_seed)
 		.collect::<Vec<_>>();
 
-	let enable_println = true;
-
 	chain_spec::testnet_genesis(
 		authorities,
 		nominator_accounts.to_vec(),
 		sudo_account.clone(),
 		Some(endowed_accounts.to_vec()),
-		enable_println,
 	)
 }
 
diff --git a/frame/contracts/CHANGELOG.md b/frame/contracts/CHANGELOG.md
index 9660d903bfe8..80615aaec879 100644
--- a/frame/contracts/CHANGELOG.md
+++ b/frame/contracts/CHANGELOG.md
@@ -20,7 +20,11 @@ In other words: Upgrading this pallet will not break pre-existing contracts.
 
 ### Added
 
+- Replaced `seal_println` with `seal_debug_message` which allows output to an RPC client.
+[1](https://github.com/paritytech/substrate/pull/8773)
+
 - Add new `instantiate` RPC that allows clients to dry-run contract instantiation.
+[1](https://github.com/paritytech/substrate/pull/8451)
 
 - Make storage and fields of `Schedule` private to the crate.
 [1](https://github.com/paritytech/substrate/pull/8359)
diff --git a/frame/contracts/README.md b/frame/contracts/README.md
index 6c987165990b..0b34a55ff42f 100644
--- a/frame/contracts/README.md
+++ b/frame/contracts/README.md
@@ -59,17 +59,26 @@ writing WebAssembly based smart contracts in the Rust programming language.
 
 ## Debugging
 
-Contracts can emit messages to the node console when run on a development chain through the
-`seal_println` API. This is exposed in ink! via
+Contracts can emit messages to the client when called as RPC through the `seal_debug_message`
+API. This is exposed in ink! via
 [`ink_env::debug_println()`](https://docs.rs/ink_env/latest/ink_env/fn.debug_println.html).
 
-In order to see these messages the log level for the `runtime::contracts` target needs to be raised
-to at least the `info` level which is the default. However, those messages are easy to overlook
-because of the noise generated by block production. A good starting point for contract debugging
-could be:
+Those messages are gathered into an internal buffer and send to the RPC client.
+It is up the the individual client if and how those messages are presented to the user.
+
+This buffer is also printed as a debug message. In order to see these messages on the node
+console the log level for the `runtime::contracts` target needs to be raised to at least
+the `debug` level. However, those messages are easy to overlook because of the noise generated
+by block production. A good starting point for observing them on the console is:
 
 ```bash
-cargo run --release -- --dev --tmp -lerror,runtime::contracts
+cargo run --release -- --dev --tmp -lerror,runtime::contracts=debug
 ```
 
+This raises the log level of `runtime::contracts` to `debug` and all other targets
+to `error` in order to prevent them from spamming the console.
+
+`--dev`: Use a dev chain spec
+`--tmp`: Use temporary storage for chain data (the chain state is deleted on exit)
+
 License: Apache-2.0
diff --git a/frame/contracts/common/src/lib.rs b/frame/contracts/common/src/lib.rs
index 17d4bec06b7c..04c541a59a39 100644
--- a/frame/contracts/common/src/lib.rs
+++ b/frame/contracts/common/src/lib.rs
@@ -37,18 +37,22 @@ use serde::{Serialize, Deserialize};
 pub struct ContractResult<T> {
 	/// How much gas was consumed during execution.
 	pub gas_consumed: u64,
-	/// An optional debug message. This message is only non-empty when explicitly requested
-	/// by the code that calls into the contract.
+	/// An optional debug message. This message is only filled when explicitly requested
+	/// by the code that calls into the contract. Otherwise it is empty.
 	///
 	/// The contained bytes are valid UTF-8. This is not declared as `String` because
-	/// this type is not allowed within the runtime. A client should decode them in order
-	/// to present the message to its users.
+	/// this type is not allowed within the runtime.
+	///
+	/// Clients should not make any assumptions about the format of the buffer.
+	/// They should just display it as-is. It is **not** only a collection of log lines
+	/// provided by a contract but a formatted buffer with different sections.
 	///
 	/// # Note
 	///
 	/// The debug message is never generated during on-chain execution. It is reserved for
 	/// RPC calls.
-	pub debug_message: Bytes,
+	#[cfg_attr(feature = "std", serde(with = "as_string"))]
+	pub debug_message: Vec<u8>,
 	/// The execution result of the wasm code.
 	pub result: T,
 }
@@ -146,3 +150,19 @@ pub enum Code<Hash> {
 	/// The code hash of an on-chain wasm blob.
 	Existing(Hash),
 }
+
+#[cfg(feature = "std")]
+mod as_string {
+	use super::*;
+	use serde::{Serializer, Deserializer, ser::Error};
+
+	pub fn serialize<S: Serializer>(bytes: &Vec<u8>, serializer: S) -> Result<S::Ok, S::Error> {
+		std::str::from_utf8(bytes)
+			.map_err(|e| S::Error::custom(format!("Debug buffer contains invalid UTF8: {}", e)))?
+			.serialize(serializer)
+	}
+
+	pub fn deserialize<'de, D: Deserializer<'de>>(deserializer: D) -> Result<Vec<u8>, D::Error> {
+		Ok(String::deserialize(deserializer)?.into_bytes())
+	}
+}
diff --git a/frame/contracts/fixtures/caller_contract.wat b/frame/contracts/fixtures/caller_contract.wat
index d6564117b721..9c7cdf62abfc 100644
--- a/frame/contracts/fixtures/caller_contract.wat
+++ b/frame/contracts/fixtures/caller_contract.wat
@@ -5,7 +5,6 @@
 	(import "seal0" "seal_instantiate" (func $seal_instantiate
 		(param i32 i32 i64 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32) (result i32)
 	))
-	(import "seal0" "seal_println" (func $seal_println (param i32 i32)))
 	(import "env" "memory" (memory 1 1))
 
 	(func $assert (param i32)
diff --git a/frame/contracts/fixtures/debug_message_invalid_utf8.wat b/frame/contracts/fixtures/debug_message_invalid_utf8.wat
new file mode 100644
index 000000000000..c60371076440
--- /dev/null
+++ b/frame/contracts/fixtures/debug_message_invalid_utf8.wat
@@ -0,0 +1,18 @@
+;; Emit a "Hello World!" debug message
+(module
+	(import "seal0" "seal_debug_message" (func $seal_debug_message (param i32 i32) (result i32)))
+	(import "env" "memory" (memory 1 1))
+
+	(data (i32.const 0) "\fc")
+
+	(func (export "call")
+		(call $seal_debug_message
+			(i32.const 0)	;; Pointer to the text buffer
+			(i32.const 12)	;; The size of the buffer
+		)
+		;; the above call traps because we supplied invalid utf8
+		unreachable
+	)
+
+	(func (export "deploy"))
+)
diff --git a/frame/contracts/fixtures/debug_message_logging_disabled.wat b/frame/contracts/fixtures/debug_message_logging_disabled.wat
new file mode 100644
index 000000000000..cfe238943ad0
--- /dev/null
+++ b/frame/contracts/fixtures/debug_message_logging_disabled.wat
@@ -0,0 +1,28 @@
+;; Emit a "Hello World!" debug message but assume that logging is disabled.
+(module
+	(import "seal0" "seal_debug_message" (func $seal_debug_message (param i32 i32) (result i32)))
+	(import "env" "memory" (memory 1 1))
+
+	(data (i32.const 0) "Hello World!")
+
+	(func $assert_eq (param i32 i32)
+		(block $ok
+			(br_if $ok
+				(i32.eq (get_local 0) (get_local 1))
+			)
+			(unreachable)
+		)
+	)
+
+	(func (export "call")
+		(call $assert_eq
+			(call $seal_debug_message
+				(i32.const 0)	;; Pointer to the text buffer
+				(i32.const 12)	;; The size of the buffer
+			)
+			(i32.const 9)	;; LoggingDisabled return code
+		)
+	)
+
+	(func (export "deploy"))
+)
diff --git a/frame/contracts/fixtures/debug_message_works.wat b/frame/contracts/fixtures/debug_message_works.wat
new file mode 100644
index 000000000000..61933c232961
--- /dev/null
+++ b/frame/contracts/fixtures/debug_message_works.wat
@@ -0,0 +1,28 @@
+;; Emit a "Hello World!" debug message
+(module
+	(import "seal0" "seal_debug_message" (func $seal_debug_message (param i32 i32) (result i32)))
+	(import "env" "memory" (memory 1 1))
+
+	(data (i32.const 0) "Hello World!")
+
+	(func $assert_eq (param i32 i32)
+		(block $ok
+			(br_if $ok
+				(i32.eq (get_local 0) (get_local 1))
+			)
+			(unreachable)
+		)
+	)
+
+	(func (export "call")
+		(call $assert_eq
+			(call $seal_debug_message
+				(i32.const 0)	;; Pointer to the text buffer
+				(i32.const 12)	;; The size of the buffer
+			)
+			(i32.const 0)	;; success return code
+		)
+	)
+
+	(func (export "deploy"))
+)
diff --git a/frame/contracts/src/benchmarking/code.rs b/frame/contracts/src/benchmarking/code.rs
index 74c678f54874..811ba71bdea7 100644
--- a/frame/contracts/src/benchmarking/code.rs
+++ b/frame/contracts/src/benchmarking/code.rs
@@ -24,7 +24,7 @@
 //! we define this simple definition of a contract that can be passed to `create_code` that
 //! compiles it down into a `WasmModule` that can be used as a contract's code.
 
-use crate::{Config, CurrentSchedule};
+use crate::Config;
 use parity_wasm::elements::{
 	Instruction, Instructions, FuncBody, ValueType, BlockType, Section, CustomSection,
 };
@@ -33,6 +33,7 @@ use sp_core::crypto::UncheckedFrom;
 use sp_runtime::traits::Hash;
 use sp_sandbox::{EnvironmentDefinitionBuilder, Memory};
 use sp_std::{prelude::*, convert::TryFrom, borrow::ToOwned};
+use frame_support::traits::Get;
 
 /// Pass to `create_code` in order to create a compiled `WasmModule`.
 ///
@@ -223,7 +224,7 @@ where
 		if def.inject_stack_metering {
 			code = inject_limiter(
 				code,
-				<CurrentSchedule<T>>::get().limits.stack_height
+				T::Schedule::get().limits.stack_height
 			)
 			.unwrap();
 		}
@@ -503,5 +504,5 @@ where
 	T: Config,
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
-	<CurrentSchedule<T>>::get().limits.memory_pages
+	T::Schedule::get().limits.memory_pages
 }
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index 107f35e61081..cab80d63bbce 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -290,7 +290,7 @@ benchmarks! {
 
 	on_initialize_per_trie_key {
 		let k in 0..1024;
-		let instance = ContractWithStorage::<T>::new(k, T::MaxValueSize::get())?;
+		let instance = ContractWithStorage::<T>::new(k, T::Schedule::get().limits.payload_len)?;
 		Storage::<T>::queue_trie_for_deletion(&instance.contract.alive_info()?)?;
 	}: {
 		Storage::<T>::process_deletion_queue_batch(Weight::max_value())
@@ -311,23 +311,15 @@ benchmarks! {
 	// first time after a new schedule was deployed: For every new schedule a contract needs
 	// to re-run the instrumentation once.
 	instrument {
-		let c in 0 .. T::MaxCodeSize::get() / 1024;
+		let c in 0 .. T::Schedule::get().limits.code_len / 1024;
 		let WasmModule { code, hash, .. } = WasmModule::<T>::sized(c * 1024);
 		Contracts::<T>::store_code_raw(code)?;
 		let mut module = PrefabWasmModule::from_storage_noinstr(hash)?;
-		let schedule = <CurrentSchedule<T>>::get();
+		let schedule = T::Schedule::get();
 	}: {
 		Contracts::<T>::reinstrument_module(&mut module, &schedule)?;
 	}
 
-	// This extrinsic is pretty much constant as it is only a simple setter.
-	update_schedule {
-		let schedule = Schedule {
-			version: 1,
-			.. Default::default()
-		};
-	}: _(RawOrigin::Root, schedule)
-
 	// This constructs a contract that is maximal expensive to instrument.
 	// It creates a maximum number of metering blocks per byte.
 	// The size of the salt influences the runtime because is is hashed in order to
@@ -340,7 +332,7 @@ benchmarks! {
 	// We cannot let `c` grow to the maximum code size because the code is not allowed
 	// to be larger than the maximum size **after instrumentation**.
 	instantiate_with_code {
-		let c in 0 .. Perbill::from_percent(50).mul_ceil(T::MaxCodeSize::get() / 1024);
+		let c in 0 .. Perbill::from_percent(50).mul_ceil(T::Schedule::get().limits.code_len / 1024);
 		let s in 0 .. code::max_pages::<T>() * 64;
 		let salt = vec![42u8; (s * 1024) as usize];
 		let endowment = caller_funding::<T>() / 3u32.into();
@@ -363,7 +355,7 @@ benchmarks! {
 	// `c`: Size of the code in kilobytes.
 	// `s`: Size of the salt in kilobytes.
 	instantiate {
-		let c in 0 .. T::MaxCodeSize::get() / 1024;
+		let c in 0 .. T::Schedule::get().limits.code_len / 1024;
 		let s in 0 .. code::max_pages::<T>() * 64;
 		let salt = vec![42u8; (s * 1024) as usize];
 		let endowment = caller_funding::<T>() / 3u32.into();
@@ -390,7 +382,7 @@ benchmarks! {
 	// part of `seal_input`.
 	// `c`: Size of the code in kilobytes.
 	call {
-		let c in 0 .. T::MaxCodeSize::get() / 1024;
+		let c in 0 .. T::Schedule::get().limits.code_len / 1024;
 		let data = vec![42u8; 1024];
 		let instance = Contract::<T>::with_caller(
 			whitelisted_caller(), WasmModule::dummy_with_bytes(c * 1024), vec![], Endow::CollectRent
@@ -423,7 +415,7 @@ benchmarks! {
 	// the reward for removing them.
 	// `c`: Size of the code of the contract that should be evicted.
 	claim_surcharge {
-		let c in 0 .. T::MaxCodeSize::get() / 1024;
+		let c in 0 .. T::Schedule::get().limits.code_len / 1024;
 		let instance = Contract::<T>::with_caller(
 			whitelisted_caller(), WasmModule::dummy_with_bytes(c * 1024), vec![], Endow::CollectRent
 		)?;
@@ -730,7 +722,7 @@ benchmarks! {
 	}
 
 	seal_terminate_per_code_kb {
-		let c in 0 .. T::MaxCodeSize::get() / 1024;
+		let c in 0 .. T::Schedule::get().limits.code_len / 1024;
 		let beneficiary = account::<T::AccountId>("beneficiary", 0, 0);
 		let beneficiary_bytes = beneficiary.encode();
 		let beneficiary_len = beneficiary_bytes.len();
@@ -771,7 +763,7 @@ benchmarks! {
 		// Restore just moves the trie id from origin to destination and therefore
 		// does not depend on the size of the destination contract. However, to not
 		// trigger any edge case we won't use an empty contract as destination.
-		let mut tombstone = ContractWithStorage::<T>::new(10, T::MaxValueSize::get())?;
+		let mut tombstone = ContractWithStorage::<T>::new(10, T::Schedule::get().limits.payload_len)?;
 		tombstone.evict()?;
 
 		let dest = tombstone.contract.account_id.encode();
@@ -847,14 +839,14 @@ benchmarks! {
 	// `t`: Code size of tombstone contract
 	// `d`: Number of supplied delta keys
 	seal_restore_to_per_code_kb_delta {
-		let c in 0 .. T::MaxCodeSize::get() / 1024;
-		let t in 0 .. T::MaxCodeSize::get() / 1024;
+		let c in 0 .. T::Schedule::get().limits.code_len / 1024;
+		let t in 0 .. T::Schedule::get().limits.code_len / 1024;
 		let d in 0 .. API_BENCHMARK_BATCHES;
 		let mut tombstone = ContractWithStorage::<T>::with_code(
 			WasmModule::<T>::dummy_with_bytes(t * 1024), 0, 0
 		)?;
 		tombstone.evict()?;
-		let delta = create_storage::<T>(d * API_BENCHMARK_BATCH_SIZE, T::MaxValueSize::get())?;
+		let delta = create_storage::<T>(d * API_BENCHMARK_BATCH_SIZE, T::Schedule::get().limits.payload_len)?;
 
 		let dest = tombstone.contract.account_id.encode();
 		let dest_len = dest.len();
@@ -938,7 +930,7 @@ benchmarks! {
 	seal_random {
 		let r in 0 .. API_BENCHMARK_BATCHES;
 		let pages = code::max_pages::<T>();
-		let subject_len = <CurrentSchedule<T>>::get().limits.subject_len;
+		let subject_len = T::Schedule::get().limits.subject_len;
 		assert!(subject_len < 1024);
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
@@ -994,8 +986,8 @@ benchmarks! {
 	// `t`: Number of topics
 	// `n`: Size of event payload in kb
 	seal_deposit_event_per_topic_and_kb {
-		let t in 0 .. <CurrentSchedule<T>>::get().limits.event_topics;
-		let n in 0 .. T::MaxValueSize::get() / 1024;
+		let t in 0 .. T::Schedule::get().limits.event_topics;
+		let n in 0 .. T::Schedule::get().limits.payload_len / 1024;
 		let mut topics = (0..API_BENCHMARK_BATCH_SIZE)
 			.map(|n| (n * t..n * t + t).map(|i| T::Hashing::hash_of(&i)).collect::<Vec<_>>().encode())
 			.peekable();
@@ -1055,6 +1047,31 @@ benchmarks! {
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
+	// The size of the supplied message does not influence the weight because as it is never
+	// processed during on-chain execution: It is only ever read during debugging which happens
+	// when the contract is called as RPC where weights do not matter.
+	seal_debug_message {
+		let r in 0 .. API_BENCHMARK_BATCHES;
+		let max_bytes = code::max_pages::<T>() * 64 * 1024;
+		let code = WasmModule::<T>::from(ModuleDefinition {
+			memory: Some(ImportedMemory { min_pages: 1, max_pages: 1 }),
+			imported_functions: vec![ImportedFunction {
+				name: "seal_debug_message",
+				params: vec![ValueType::I32, ValueType::I32],
+				return_type: Some(ValueType::I32),
+			}],
+			call_body: Some(body::repeated(r * API_BENCHMARK_BATCH_SIZE, &[
+				Instruction::I32Const(0), // value_ptr
+				Instruction::I32Const(max_bytes as i32), // value_len
+				Instruction::Call(0),
+				Instruction::Drop,
+			])),
+			.. Default::default()
+		});
+		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
+		let origin = RawOrigin::Signed(instance.caller.clone());
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
+
 	// Only the overhead of calling the function itself with minimal arguments.
 	// The contract is a bit more complex because I needs to use different keys in order
 	// to generate unique storage accesses. However, it is still dominated by the storage
@@ -1091,7 +1108,7 @@ benchmarks! {
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	seal_set_storage_per_kb {
-		let n in 0 .. T::MaxValueSize::get() / 1024;
+		let n in 0 .. T::Schedule::get().limits.payload_len / 1024;
 		let key = T::Hashing::hash_of(&1u32).as_ref().to_vec();
 		let key_len = key.len();
 		let code = WasmModule::<T>::from(ModuleDefinition {
@@ -1155,7 +1172,7 @@ benchmarks! {
 				<System<T>>::block_number(),
 				&mut info,
 				key.as_slice().try_into().map_err(|e| "Key has wrong length")?,
-				Some(vec![42; T::MaxValueSize::get() as usize])
+				Some(vec![42; T::Schedule::get().limits.payload_len as usize])
 			)
 			.map_err(|_| "Failed to write to storage during setup.")?;
 		}
@@ -1210,7 +1227,7 @@ benchmarks! {
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	seal_get_storage_per_kb {
-		let n in 0 .. T::MaxValueSize::get() / 1024;
+		let n in 0 .. T::Schedule::get().limits.payload_len / 1024;
 		let key = T::Hashing::hash_of(&1u32).as_ref().to_vec();
 		let key_len = key.len();
 		let code = WasmModule::<T>::from(ModuleDefinition {
@@ -1227,7 +1244,7 @@ benchmarks! {
 				},
 				DataSegment {
 					offset: key_len as u32,
-					value: T::MaxValueSize::get().to_le_bytes().into(),
+					value: T::Schedule::get().limits.payload_len.to_le_bytes().into(),
 				},
 			],
 			call_body: Some(body::repeated(API_BENCHMARK_BATCH_SIZE, &[
@@ -1363,7 +1380,7 @@ benchmarks! {
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	seal_call_per_code_transfer_input_output_kb {
-		let c in 0 .. T::MaxCodeSize::get() / 1024;
+		let c in 0 .. T::Schedule::get().limits.code_len / 1024;
 		let t in 0 .. 1;
 		let i in 0 .. code::max_pages::<T>() * 64;
 		let o in 0 .. (code::max_pages::<T>() - 1) * 64;
@@ -1560,7 +1577,7 @@ benchmarks! {
 	}
 
 	seal_instantiate_per_code_input_output_salt_kb {
-		let c in 0 .. T::MaxCodeSize::get() / 1024;
+		let c in 0 .. T::Schedule::get().limits.code_len / 1024;
 		let i in 0 .. (code::max_pages::<T>() - 1) * 64;
 		let o in 0 .. (code::max_pages::<T>() - 1) * 64;
 		let s in 0 .. (code::max_pages::<T>() - 1) * 64;
@@ -1927,7 +1944,7 @@ benchmarks! {
 
 	// w_br_table_per_entry = w_bench
 	instr_br_table_per_entry {
-		let e in 1 .. <CurrentSchedule<T>>::get().limits.br_table_size;
+		let e in 1 .. T::Schedule::get().limits.br_table_size;
 		let entry: Vec<u32> = [0, 1].iter()
 			.cloned()
 			.cycle()
@@ -1983,7 +2000,7 @@ benchmarks! {
 	// w_call_indrect = w_bench - 3 * w_param
 	instr_call_indirect {
 		let r in 0 .. INSTR_BENCHMARK_BATCHES;
-		let num_elements = <CurrentSchedule<T>>::get().limits.table_size;
+		let num_elements = T::Schedule::get().limits.table_size;
 		use self::code::TableSegment;
 		let mut sbox = Sandbox::from(&WasmModule::<T>::from(ModuleDefinition {
 			// We need to make use of the stack here in order to trigger stack height
@@ -2013,8 +2030,8 @@ benchmarks! {
 	// linearly depend on the amount of parameters to this function.
 	// Please note that this is not necessary with a direct call.
 	instr_call_indirect_per_param {
-		let p in 0 .. <CurrentSchedule<T>>::get().limits.parameters;
-		let num_elements = <CurrentSchedule<T>>::get().limits.table_size;
+		let p in 0 .. T::Schedule::get().limits.parameters;
+		let num_elements = T::Schedule::get().limits.table_size;
 		use self::code::TableSegment;
 		let mut sbox = Sandbox::from(&WasmModule::<T>::from(ModuleDefinition {
 			// We need to make use of the stack here in order to trigger stack height
@@ -2044,7 +2061,7 @@ benchmarks! {
 	// w_local_get = w_bench - 1 * w_param
 	instr_local_get {
 		let r in 0 .. INSTR_BENCHMARK_BATCHES;
-		let max_locals = <CurrentSchedule<T>>::get().limits.stack_height;
+		let max_locals = T::Schedule::get().limits.stack_height;
 		let mut call_body = body::repeated_dyn(r * INSTR_BENCHMARK_BATCH_SIZE, vec![
 			RandomGetLocal(0, max_locals),
 			Regular(Instruction::Drop),
@@ -2061,7 +2078,7 @@ benchmarks! {
 	// w_local_set = w_bench - 1 * w_param
 	instr_local_set {
 		let r in 0 .. INSTR_BENCHMARK_BATCHES;
-		let max_locals = <CurrentSchedule<T>>::get().limits.stack_height;
+		let max_locals = T::Schedule::get().limits.stack_height;
 		let mut call_body = body::repeated_dyn(r * INSTR_BENCHMARK_BATCH_SIZE, vec![
 			RandomI64Repeated(1),
 			RandomSetLocal(0, max_locals),
@@ -2078,7 +2095,7 @@ benchmarks! {
 	// w_local_tee = w_bench - 2 * w_param
 	instr_local_tee {
 		let r in 0 .. INSTR_BENCHMARK_BATCHES;
-		let max_locals = <CurrentSchedule<T>>::get().limits.stack_height;
+		let max_locals = T::Schedule::get().limits.stack_height;
 		let mut call_body = body::repeated_dyn(r * INSTR_BENCHMARK_BATCH_SIZE, vec![
 			RandomI64Repeated(1),
 			RandomTeeLocal(0, max_locals),
@@ -2096,7 +2113,7 @@ benchmarks! {
 	// w_global_get = w_bench - 1 * w_param
 	instr_global_get {
 		let r in 0 .. INSTR_BENCHMARK_BATCHES;
-		let max_globals = <CurrentSchedule<T>>::get().limits.globals;
+		let max_globals = T::Schedule::get().limits.globals;
 		let mut sbox = Sandbox::from(&WasmModule::<T>::from(ModuleDefinition {
 			call_body: Some(body::repeated_dyn(r * INSTR_BENCHMARK_BATCH_SIZE, vec![
 				RandomGetGlobal(0, max_globals),
@@ -2112,7 +2129,7 @@ benchmarks! {
 	// w_global_set = w_bench - 1 * w_param
 	instr_global_set {
 		let r in 0 .. INSTR_BENCHMARK_BATCHES;
-		let max_globals = <CurrentSchedule<T>>::get().limits.globals;
+		let max_globals = T::Schedule::get().limits.globals;
 		let mut sbox = Sandbox::from(&WasmModule::<T>::from(ModuleDefinition {
 			call_body: Some(body::repeated_dyn(r * INSTR_BENCHMARK_BATCH_SIZE, vec![
 				RandomI64Repeated(1),
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index eea6acf1bfb4..793b4c4bf291 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -315,6 +315,16 @@ pub trait Ext: sealing::Sealed {
 
 	/// Get a mutable reference to the nested gas meter.
 	fn gas_meter(&mut self) -> &mut GasMeter<Self::T>;
+
+	/// Append a string to the debug buffer.
+	///
+	/// It is added as-is without any additional new line.
+	///
+	/// This is a no-op if debug message recording is disabled which is always the case
+	/// when the code is executing on-chain.
+	///
+	/// Returns `true` if debug message recording is enabled. Otherwise `false` is returned.
+	fn append_debug_buffer(&mut self, msg: &str) -> bool;
 }
 
 /// Describes the different functions that can be exported by an [`Executable`].
@@ -434,6 +444,11 @@ pub struct Stack<'a, T: Config, E> {
 	frames: SmallVec<T::CallStack>,
 	/// Statically guarantee that each call stack has at least one frame.
 	first_frame: Frame<T>,
+	/// A text buffer used to output human readable information.
+	///
+	/// All the bytes added to this field should be valid UTF-8. The buffer has no defined
+	/// structure and is intended to be shown to users as-is for debugging purposes.
+	debug_message: Option<&'a mut Vec<u8>>,
 	/// No executable is held by the struct but influences its behaviour.
 	_phantom: PhantomData<E>,
 }
@@ -442,6 +457,11 @@ pub struct Stack<'a, T: Config, E> {
 ///
 /// For each nested contract call or instantiate one frame is created. It holds specific
 /// information for the said call and caches the in-storage `ContractInfo` data structure.
+///
+/// # Note
+///
+/// This is an internal data structure. It is exposed to the public for the sole reason
+/// of specifying [`Config::CallStack`].
 pub struct Frame<T: Config> {
 	/// The account id of the executing contract.
 	account_id: T::AccountId,
@@ -574,6 +594,11 @@ where
 {
 	/// Create an run a new call stack by calling into `dest`.
 	///
+	/// # Note
+	///
+	/// `debug_message` should only ever be set to `Some` when executing as an RPC because
+	/// it adds allocations and could be abused to drive the runtime into an OOM panic.
+	///
 	/// # Return Value
 	///
 	/// Result<(ExecReturnValue, CodeSize), (ExecError, CodeSize)>
@@ -584,6 +609,7 @@ where
 		schedule: &'a Schedule<T>,
 		value: BalanceOf<T>,
 		input_data: Vec<u8>,
+		debug_message: Option<&'a mut Vec<u8>>,
 	) -> Result<(ExecReturnValue, u32), (ExecError, u32)> {
 		let (mut stack, executable) = Self::new(
 			FrameArgs::Call{dest, cached_info: None},
@@ -591,12 +617,18 @@ where
 			gas_meter,
 			schedule,
 			value,
+			debug_message,
 		)?;
 		stack.run(executable, input_data)
 	}
 
 	/// Create and run a new call stack by instantiating a new contract.
 	///
+	/// # Note
+	///
+	/// `debug_message` should only ever be set to `Some` when executing as an RPC because
+	/// it adds allocations and could be abused to drive the runtime into an OOM panic.
+	///
 	/// # Return Value
 	///
 	/// Result<(NewContractAccountId, ExecReturnValue), ExecError)>
@@ -608,6 +640,7 @@ where
 		value: BalanceOf<T>,
 		input_data: Vec<u8>,
 		salt: &[u8],
+		debug_message: Option<&'a mut Vec<u8>>,
 	) -> Result<(T::AccountId, ExecReturnValue), ExecError> {
 		let (mut stack, executable) = Self::new(
 			FrameArgs::Instantiate {
@@ -620,6 +653,7 @@ where
 			gas_meter,
 			schedule,
 			value,
+			debug_message,
 		).map_err(|(e, _code_len)| e)?;
 		let account_id = stack.top_frame().account_id.clone();
 		stack.run(executable, input_data)
@@ -634,6 +668,7 @@ where
 		gas_meter: &'a mut GasMeter<T>,
 		schedule: &'a Schedule<T>,
 		value: BalanceOf<T>,
+		debug_message: Option<&'a mut Vec<u8>>,
 	) -> Result<(Self, E), (ExecError, u32)> {
 		let (first_frame, executable) = Self::new_frame(args, value, gas_meter, 0, &schedule)?;
 		let stack = Self {
@@ -645,6 +680,7 @@ where
 			account_counter: None,
 			first_frame,
 			frames: Default::default(),
+			debug_message,
 			_phantom: Default::default(),
 		};
 
@@ -841,6 +877,7 @@ where
 
 		// Pop the current frame from the stack and return it in case it needs to interact
 		// with duplicates that might exist on the stack.
+		// A `None` means that we are returning from the `first_frame`.
 		let frame = self.frames.pop();
 
 		if let Some(frame) = frame {
@@ -872,6 +909,13 @@ where
 				}
 			}
 		} else {
+			if let Some(message) = &self.debug_message {
+				log::debug!(
+					target: "runtime::contracts",
+					"Debug Message: {}",
+					core::str::from_utf8(message).unwrap_or("<Invalid UTF8>"),
+				);
+			}
 			// Write back to the root gas meter.
 			self.gas_meter.absorb_nested(mem::take(&mut self.first_frame.nested_meter));
 			// Only gas counter changes are persisted in case of a failure.
@@ -1181,7 +1225,7 @@ where
 	fn block_number(&self) -> T::BlockNumber { self.block_number }
 
 	fn max_value_size(&self) -> u32 {
-		T::MaxValueSize::get()
+		T::Schedule::get().limits.payload_len
 	}
 
 	fn get_weight_price(&self, weight: Weight) -> BalanceOf<Self::T> {
@@ -1199,6 +1243,17 @@ where
 	fn gas_meter(&mut self) -> &mut GasMeter<Self::T> {
 		&mut self.top_frame_mut().nested_meter
 	}
+
+	fn append_debug_buffer(&mut self, msg: &str) -> bool {
+		if let Some(buffer) = &mut self.debug_message {
+			if !msg.is_empty() {
+				buffer.extend(msg.as_bytes());
+			}
+			true
+		} else {
+			false
+		}
+	}
 }
 
 fn deposit_event<T: Config>(
@@ -1241,7 +1296,7 @@ mod tests {
 			test_utils::{place_contract, set_balance, get_balance},
 		},
 		exec::ExportedFunction::*,
-		Error, Weight, CurrentSchedule,
+		Error, Weight,
 	};
 	use sp_core::Bytes;
 	use sp_runtime::DispatchError;
@@ -1436,12 +1491,12 @@ mod tests {
 		});
 
 		ExtBuilder::default().build().execute_with(|| {
-			let schedule = <CurrentSchedule<Test>>::get();
+			let schedule = <Test as Config>::Schedule::get();
 			place_contract(&BOB, exec_ch);
 
 			assert_matches!(
 				MockStack::run_call(
-					ALICE, BOB, &mut gas_meter, &schedule, value, vec![],
+					ALICE, BOB, &mut gas_meter, &schedule, value, vec![], None,
 				),
 				Ok(_)
 			);
@@ -1487,7 +1542,7 @@ mod tests {
 		);
 
 		ExtBuilder::default().build().execute_with(|| {
-			let schedule = <CurrentSchedule<Test>>::get();
+			let schedule = <Test as Config>::Schedule::get();
 			place_contract(&BOB, return_ch);
 			set_balance(&origin, 100);
 			let balance = get_balance(&dest);
@@ -1499,6 +1554,7 @@ mod tests {
 				&schedule,
 				55,
 				vec![],
+				None,
 			).unwrap();
 
 			assert!(!output.0.is_success());
@@ -1548,7 +1604,7 @@ mod tests {
 		);
 
 		ExtBuilder::default().build().execute_with(|| {
-			let schedule = <CurrentSchedule<Test>>::get();
+			let schedule = <Test as Config>::Schedule::get();
 			place_contract(&BOB, return_ch);
 
 			let result = MockStack::run_call(
@@ -1558,6 +1614,7 @@ mod tests {
 				&schedule,
 				0,
 				vec![],
+				None,
 			);
 
 			let output = result.unwrap();
@@ -1578,8 +1635,8 @@ mod tests {
 		);
 
 		ExtBuilder::default().build().execute_with(|| {
-			let schedule = <CurrentSchedule<Test>>::get();
-			place_contract(&dest, return_ch);
+			let schedule = <Test as Config>::Schedule::get();
+			place_contract(&BOB, return_ch);
 
 			let result = MockStack::run_call(
 				origin,
@@ -1588,6 +1645,7 @@ mod tests {
 				&schedule,
 				0,
 				vec![],
+				None,
 			);
 
 			let output = result.unwrap();
@@ -1605,7 +1663,7 @@ mod tests {
 
 		// This one tests passing the input data into a contract via call.
 		ExtBuilder::default().build().execute_with(|| {
-			let schedule = <CurrentSchedule<Test>>::get();
+			let schedule = <Test as Config>::Schedule::get();
 			place_contract(&BOB, input_data_ch);
 
 			let result = MockStack::run_call(
@@ -1615,6 +1673,7 @@ mod tests {
 				&schedule,
 				0,
 				vec![1, 2, 3, 4],
+				None,
 			);
 			assert_matches!(result, Ok(_));
 		});
@@ -1629,7 +1688,7 @@ mod tests {
 
 		// This one tests passing the input data into a contract via instantiate.
 		ExtBuilder::default().build().execute_with(|| {
-			let schedule = <CurrentSchedule<Test>>::get();
+			let schedule = <Test as Config>::Schedule::get();
 			let subsistence = Contracts::<Test>::subsistence_threshold();
 			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
 			let executable = MockExecutable::from_storage(
@@ -1646,6 +1705,7 @@ mod tests {
 				subsistence * 3,
 				vec![1, 2, 3, 4],
 				&[],
+				None,
 			);
 			assert_matches!(result, Ok(_));
 		});
@@ -1683,7 +1743,7 @@ mod tests {
 		});
 
 		ExtBuilder::default().build().execute_with(|| {
-			let schedule = <CurrentSchedule<Test>>::get();
+			let schedule = <Test as Config>::Schedule::get();
 			set_balance(&BOB, 1);
 			place_contract(&BOB, recurse_ch);
 
@@ -1694,6 +1754,7 @@ mod tests {
 				&schedule,
 				value,
 				vec![],
+				None,
 			);
 
 			assert_matches!(result, Ok(_));
@@ -1732,7 +1793,7 @@ mod tests {
 		});
 
 		ExtBuilder::default().build().execute_with(|| {
-			let schedule = <CurrentSchedule<Test>>::get();
+			let schedule = <Test as Config>::Schedule::get();
 			place_contract(&dest, bob_ch);
 			place_contract(&CHARLIE, charlie_ch);
 
@@ -1743,6 +1804,7 @@ mod tests {
 				&schedule,
 				0,
 				vec![],
+				None,
 			);
 
 			assert_matches!(result, Ok(_));
@@ -1771,7 +1833,7 @@ mod tests {
 		});
 
 		ExtBuilder::default().build().execute_with(|| {
-			let schedule = <CurrentSchedule<Test>>::get();
+			let schedule = <Test as Config>::Schedule::get();
 			place_contract(&BOB, bob_ch);
 			place_contract(&CHARLIE, charlie_ch);
 
@@ -1782,6 +1844,7 @@ mod tests {
 				&schedule,
 				0,
 				vec![],
+				None,
 			);
 
 			assert_matches!(result, Ok(_));
@@ -1793,7 +1856,7 @@ mod tests {
 		let dummy_ch = MockLoader::insert(Constructor, |_, _| exec_success());
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
-			let schedule = <CurrentSchedule<Test>>::get();
+			let schedule = <Test as Config>::Schedule::get();
 			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
 			let executable = MockExecutable::from_storage(
 				dummy_ch, &schedule, &mut gas_meter
@@ -1808,6 +1871,7 @@ mod tests {
 					0, // <- zero endowment
 					vec![],
 					&[],
+					None,
 				),
 				Err(_)
 			);
@@ -1822,7 +1886,7 @@ mod tests {
 		);
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
-			let schedule = <CurrentSchedule<Test>>::get();
+			let schedule = <Test as Config>::Schedule::get();
 			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
 			let executable = MockExecutable::from_storage(
 				dummy_ch, &schedule, &mut gas_meter
@@ -1838,6 +1902,7 @@ mod tests {
 					100,
 					vec![],
 					&[],
+					None,
 				),
 				Ok((address, ref output)) if output.data == Bytes(vec![80, 65, 83, 83]) => address
 			);
@@ -1859,7 +1924,7 @@ mod tests {
 		);
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
-			let schedule = <CurrentSchedule<Test>>::get();
+			let schedule = <Test as Config>::Schedule::get();
 			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
 			let executable = MockExecutable::from_storage(
 				dummy_ch, &schedule, &mut gas_meter
@@ -1875,6 +1940,7 @@ mod tests {
 					100,
 					vec![],
 					&[],
+					None,
 				),
 				Ok((address, ref output)) if output.data == Bytes(vec![70, 65, 73, 76]) => address
 			);
@@ -1908,13 +1974,13 @@ mod tests {
 		});
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
-			let schedule = <CurrentSchedule<Test>>::get();
+			let schedule = <Test as Config>::Schedule::get();
 			set_balance(&ALICE, Contracts::<Test>::subsistence_threshold() * 100);
 			place_contract(&BOB, instantiator_ch);
 
 			assert_matches!(
 				MockStack::run_call(
-					ALICE, BOB, &mut GasMeter::<Test>::new(GAS_LIMIT), &schedule, 20, vec![],
+					ALICE, BOB, &mut GasMeter::<Test>::new(GAS_LIMIT), &schedule, 20, vec![], None,
 				),
 				Ok(_)
 			);
@@ -1958,14 +2024,14 @@ mod tests {
 		});
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
-			let schedule = <CurrentSchedule<Test>>::get();
+			let schedule = <Test as Config>::Schedule::get();
 			set_balance(&ALICE, 1000);
 			set_balance(&BOB, 100);
 			place_contract(&BOB, instantiator_ch);
 
 			assert_matches!(
 				MockStack::run_call(
-					ALICE, BOB, &mut GasMeter::<Test>::new(GAS_LIMIT), &schedule, 20, vec![],
+					ALICE, BOB, &mut GasMeter::<Test>::new(GAS_LIMIT), &schedule, 20, vec![], None,
 				),
 				Ok(_)
 			);
@@ -1987,7 +2053,7 @@ mod tests {
 			.existential_deposit(15)
 			.build()
 			.execute_with(|| {
-				let schedule = <CurrentSchedule<Test>>::get();
+				let schedule = <Test as Config>::Schedule::get();
 				let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
 				let executable = MockExecutable::from_storage(
 					terminate_ch, &schedule, &mut gas_meter
@@ -2003,6 +2069,7 @@ mod tests {
 						100,
 						vec![],
 						&[],
+						None,
 					),
 					Err(Error::<Test>::TerminatedInConstructor.into())
 				);
@@ -2027,7 +2094,7 @@ mod tests {
 
 		ExtBuilder::default().build().execute_with(|| {
 			let subsistence = Contracts::<Test>::subsistence_threshold();
-			let schedule = <CurrentSchedule<Test>>::get();
+			let schedule = <Test as Config>::Schedule::get();
 			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
 			let executable = MockExecutable::from_storage(
 				rent_allowance_ch, &schedule, &mut gas_meter
@@ -2042,6 +2109,7 @@ mod tests {
 				subsistence * 5,
 				vec![],
 				&[],
+				None,
 			);
 			assert_matches!(result, Ok(_));
 		});
@@ -2060,7 +2128,7 @@ mod tests {
 
 		ExtBuilder::default().build().execute_with(|| {
 			let subsistence = Contracts::<Test>::subsistence_threshold();
-			let schedule = <CurrentSchedule<Test>>::get();
+			let schedule = <Test as Config>::Schedule::get();
 			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
 			set_balance(&ALICE, subsistence * 10);
 			place_contract(&BOB, code_hash);
@@ -2071,6 +2139,7 @@ mod tests {
 				&schedule,
 				0,
 				vec![],
+				None,
 			).unwrap();
 		});
 	}
@@ -2109,7 +2178,7 @@ mod tests {
 
 		ExtBuilder::default().build().execute_with(|| {
 			let subsistence = Contracts::<Test>::subsistence_threshold();
-			let schedule = <CurrentSchedule<Test>>::get();
+			let schedule = <Test as Config>::Schedule::get();
 			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
 			set_balance(&ALICE, subsistence * 100);
 			place_contract(&BOB, code_hash);
@@ -2120,6 +2189,7 @@ mod tests {
 				&schedule,
 				subsistence * 50,
 				vec![],
+				None,
 			).unwrap();
 		});
 	}
@@ -2156,7 +2226,7 @@ mod tests {
 
 		// This one tests passing the input data into a contract via call.
 		ExtBuilder::default().build().execute_with(|| {
-			let schedule = <CurrentSchedule<Test>>::get();
+			let schedule = <Test as Config>::Schedule::get();
 			place_contract(&BOB, code_bob);
 			place_contract(&CHARLIE, code_charlie);
 
@@ -2167,6 +2237,7 @@ mod tests {
 				&schedule,
 				0,
 				vec![0],
+				None,
 			);
 			assert_matches!(result, Ok(_));
 		});
@@ -2174,10 +2245,9 @@ mod tests {
 
 	#[test]
 	fn recursive_call_during_constructor_fails() {
-		let code = MockLoader::insert(Constructor, |ctx, executable| {
-			let my_hash = <Contracts<Test>>::contract_address(&ALICE, &executable.code_hash, &[]);
+		let code = MockLoader::insert(Constructor, |ctx, _| {
 			assert_matches!(
-				ctx.ext.call(0, my_hash, 0, vec![]),
+				ctx.ext.call(0, ctx.ext.address().clone(), 0, vec![]),
 				Err((ExecError{error, ..}, _)) if error == <Error<Test>>::NotCallable.into()
 			);
 			exec_success()
@@ -2185,7 +2255,7 @@ mod tests {
 
 		// This one tests passing the input data into a contract via instantiate.
 		ExtBuilder::default().build().execute_with(|| {
-			let schedule = <CurrentSchedule<Test>>::get();
+			let schedule = <Test as Config>::Schedule::get();
 			let subsistence = Contracts::<Test>::subsistence_threshold();
 			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
 			let executable = MockExecutable::from_storage(
@@ -2202,8 +2272,70 @@ mod tests {
 				subsistence * 3,
 				vec![],
 				&[],
+				None,
 			);
 			assert_matches!(result, Ok(_));
 		});
 	}
+
+	#[test]
+	fn printing_works() {
+		let code_hash = MockLoader::insert(Call, |ctx, _| {
+			ctx.ext.append_debug_buffer("This is a test");
+			ctx.ext.append_debug_buffer("More text");
+			exec_success()
+		});
+
+		let mut debug_buffer = Vec::new();
+
+		ExtBuilder::default().build().execute_with(|| {
+			let subsistence = Contracts::<Test>::subsistence_threshold();
+			let schedule = <Test as Config>::Schedule::get();
+			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
+			set_balance(&ALICE, subsistence * 10);
+			place_contract(&BOB, code_hash);
+			MockStack::run_call(
+				ALICE,
+				BOB,
+				&mut gas_meter,
+				&schedule,
+				0,
+				vec![],
+				Some(&mut debug_buffer),
+			).unwrap();
+		});
+
+		assert_eq!(&String::from_utf8(debug_buffer).unwrap(), "This is a testMore text");
+	}
+
+	#[test]
+	fn printing_works_on_fail() {
+		let code_hash = MockLoader::insert(Call, |ctx, _| {
+			ctx.ext.append_debug_buffer("This is a test");
+			ctx.ext.append_debug_buffer("More text");
+			exec_trapped()
+		});
+
+		let mut debug_buffer = Vec::new();
+
+		ExtBuilder::default().build().execute_with(|| {
+			let subsistence = Contracts::<Test>::subsistence_threshold();
+			let schedule = <Test as Config>::Schedule::get();
+			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
+			set_balance(&ALICE, subsistence * 10);
+			place_contract(&BOB, code_hash);
+			let result = MockStack::run_call(
+				ALICE,
+				BOB,
+				&mut gas_meter,
+				&schedule,
+				0,
+				vec![],
+				Some(&mut debug_buffer),
+			);
+			assert!(result.is_err());
+		});
+
+		assert_eq!(&String::from_utf8(debug_buffer).unwrap(), "This is a testMore text");
+	}
 }
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index 33844a41cc7c..67c5acee8f4a 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -59,9 +59,6 @@
 //!
 //! ### Dispatchable functions
 //!
-//! * [`Pallet::update_schedule`] -
-//! ([Root Origin](https://substrate.dev/docs/en/knowledgebase/runtime/origin) Only) -
-//! Set a new [`Schedule`].
 //! * [`Pallet::instantiate_with_code`] - Deploys a new contract from the supplied wasm binary,
 //! optionally transferring
 //! some balance. This instantiates a new smart contract account with the supplied code and
@@ -160,6 +157,21 @@ pub mod pallet {
 		/// Handler for rent payments.
 		type RentPayment: OnUnbalanced<NegativeImbalanceOf<Self>>;
 
+		/// Used to answer contracts' queries regarding the current weight price. This is **not**
+		/// used to calculate the actual fee and is only for informational purposes.
+		type WeightPrice: Convert<Weight, BalanceOf<Self>>;
+
+		/// Describes the weights of the dispatchables of this module and is also used to
+		/// construct a default cost schedule.
+		type WeightInfo: WeightInfo;
+
+		/// Type that allows the runtime authors to add new host functions for a contract to call.
+		type ChainExtension: chain_extension::ChainExtension<Self>;
+
+		/// Cost schedule and limits.
+		#[pallet::constant]
+		type Schedule: Get<Schedule<Self>>;
+
 		/// Number of block delay an extrinsic claim surcharge has.
 		///
 		/// When claim surcharge is called by an extrinsic the rent is checked
@@ -217,21 +229,6 @@ pub mod pallet {
 		/// In other words only the origin called "root contract" is allowed to execute then.
 		type CallStack: smallvec::Array<Item=Frame<Self>>;
 
-		/// The maximum size of a storage value and event payload in bytes.
-		#[pallet::constant]
-		type MaxValueSize: Get<u32>;
-
-		/// Used to answer contracts' queries regarding the current weight price. This is **not**
-		/// used to calculate the actual fee and is only for informational purposes.
-		type WeightPrice: Convert<Weight, BalanceOf<Self>>;
-
-		/// Describes the weights of the dispatchables of this module and is also used to
-		/// construct a default cost schedule.
-		type WeightInfo: WeightInfo;
-
-		/// Type that allows the runtime authors to add new host functions for a contract to call.
-		type ChainExtension: chain_extension::ChainExtension<Self>;
-
 		/// The maximum number of tries that can be queued for deletion.
 		#[pallet::constant]
 		type DeletionQueueDepth: Get<u32>;
@@ -239,12 +236,6 @@ pub mod pallet {
 		/// The maximum amount of weight that can be consumed per block for lazy trie removal.
 		#[pallet::constant]
 		type DeletionWeightLimit: Get<Weight>;
-
-		/// The maximum length of a contract code in bytes. This limit applies to the instrumented
-		/// version of the code. Therefore `instantiate_with_code` can fail even when supplying
-		/// a wasm binary below this maximum size.
-		#[pallet::constant]
-		type MaxCodeSize: Get<u32>;
 	}
 
 	#[pallet::pallet]
@@ -277,26 +268,6 @@ pub mod pallet {
 		T::AccountId: UncheckedFrom<T::Hash>,
 		T::AccountId: AsRef<[u8]>,
 	{
-		/// Updates the schedule for metering contracts.
-		///
-		/// The schedule's version cannot be less than the version of the stored schedule.
-		/// If a schedule does not change the instruction weights the version does not
-		/// need to be increased. Therefore we allow storing a schedule that has the same
-		/// version as the stored one.
-		#[pallet::weight(T::WeightInfo::update_schedule())]
-		pub fn update_schedule(
-			origin: OriginFor<T>,
-			schedule: Schedule<T>
-		) -> DispatchResultWithPostInfo {
-			ensure_root(origin)?;
-			if <CurrentSchedule<T>>::get().version > schedule.version {
-				Err(Error::<T>::InvalidScheduleVersion)?
-			}
-			Self::deposit_event(Event::ScheduleUpdated(schedule.version));
-			CurrentSchedule::put(schedule);
-			Ok(().into())
-		}
-
 		/// Makes a call to an account, optionally transferring some balance.
 		///
 		/// * If the account is a smart-contract account, the associated code will be
@@ -304,7 +275,9 @@ pub mod pallet {
 		/// * If the account is a regular account, any value will be transferred.
 		/// * If no account exists and the call value is not less than `existential_deposit`,
 		/// a regular account will be created and any value will be transferred.
-		#[pallet::weight(T::WeightInfo::call(T::MaxCodeSize::get() / 1024).saturating_add(*gas_limit))]
+		#[pallet::weight(T::WeightInfo::call(T::Schedule::get().limits.code_len / 1024)
+			.saturating_add(*gas_limit)
+		)]
 		pub fn call(
 			origin: OriginFor<T>,
 			dest: <T::Lookup as StaticLookup>::Source,
@@ -315,9 +288,9 @@ pub mod pallet {
 			let origin = ensure_signed(origin)?;
 			let dest = T::Lookup::lookup(dest)?;
 			let mut gas_meter = GasMeter::new(gas_limit);
-			let schedule = <CurrentSchedule<T>>::get();
+			let schedule = T::Schedule::get();
 			let (result, code_len) = match ExecStack::<T, PrefabWasmModule<T>>::run_call(
-				origin, dest, &mut gas_meter, &schedule, value, data
+				origin, dest, &mut gas_meter, &schedule, value, data, None,
 			) {
 				Ok((output, len)) => (Ok(output), len),
 				Err((err, len)) => (Err(err), len),
@@ -363,14 +336,14 @@ pub mod pallet {
 		) -> DispatchResultWithPostInfo {
 			let origin = ensure_signed(origin)?;
 			let code_len = code.len() as u32;
-			ensure!(code_len <= T::MaxCodeSize::get(), Error::<T>::CodeTooLarge);
+			ensure!(code_len <= T::Schedule::get().limits.code_len, Error::<T>::CodeTooLarge);
 			let mut gas_meter = GasMeter::new(gas_limit);
-			let schedule = <CurrentSchedule<T>>::get();
+			let schedule = T::Schedule::get();
 			let executable = PrefabWasmModule::from_code(code, &schedule)?;
 			let code_len = executable.code_len();
-			ensure!(code_len <= T::MaxCodeSize::get(), Error::<T>::CodeTooLarge);
+			ensure!(code_len <= T::Schedule::get().limits.code_len, Error::<T>::CodeTooLarge);
 			let result = ExecStack::<T, PrefabWasmModule<T>>::run_instantiate(
-				origin, executable, &mut gas_meter, &schedule, endowment, data, &salt,
+				origin, executable, &mut gas_meter, &schedule, endowment, data, &salt, None,
 			).map(|(_address, output)| output);
 			gas_meter.into_dispatch_result(
 				result,
@@ -384,8 +357,10 @@ pub mod pallet {
 		/// code deployment step. Instead, the `code_hash` of an on-chain deployed wasm binary
 		/// must be supplied.
 		#[pallet::weight(
-			T::WeightInfo::instantiate(T::MaxCodeSize::get() / 1024, salt.len() as u32 / 1024)
-				.saturating_add(*gas_limit)
+			T::WeightInfo::instantiate(
+				T::Schedule::get().limits.code_len / 1024, salt.len() as u32 / 1024
+			)
+			.saturating_add(*gas_limit)
 		)]
 		pub fn instantiate(
 			origin: OriginFor<T>,
@@ -397,11 +372,11 @@ pub mod pallet {
 		) -> DispatchResultWithPostInfo {
 			let origin = ensure_signed(origin)?;
 			let mut gas_meter = GasMeter::new(gas_limit);
-			let schedule = <CurrentSchedule<T>>::get();
+			let schedule = T::Schedule::get();
 			let executable = PrefabWasmModule::from_storage(code_hash, &schedule, &mut gas_meter)?;
 			let code_len = executable.code_len();
 			let result = ExecStack::<T, PrefabWasmModule<T>>::run_instantiate(
-				origin, executable, &mut gas_meter, &schedule, endowment, data, &salt,
+				origin, executable, &mut gas_meter, &schedule, endowment, data, &salt, None,
 			).map(|(_address, output)| output);
 			gas_meter.into_dispatch_result(
 				result,
@@ -418,7 +393,7 @@ pub mod pallet {
 		///
 		/// If contract is not evicted as a result of this call, [`Error::ContractNotEvictable`]
 		/// is returned and the sender is not eligible for the reward.
-		#[pallet::weight(T::WeightInfo::claim_surcharge(T::MaxCodeSize::get() / 1024))]
+		#[pallet::weight(T::WeightInfo::claim_surcharge(T::Schedule::get().limits.code_len / 1024))]
 		pub fn claim_surcharge(
 			origin: OriginFor<T>,
 			dest: T::AccountId,
@@ -614,12 +589,10 @@ pub mod pallet {
 		///
 		/// This can be triggered by a call to `seal_terminate` or `seal_restore_to`.
 		TerminatedInConstructor,
+		/// The debug message specified to `seal_debug_message` does contain invalid UTF-8.
+		DebugMessageInvalidUTF8,
 	}
 
-	/// Current cost schedule for contracts.
-	#[pallet::storage]
-	pub(crate) type CurrentSchedule<T: Config> = StorageValue<_, Schedule<T>, ValueQuery>;
-
 	/// A mapping from an original code hash to the original code, untouched by instrumentation.
 	#[pallet::storage]
 	pub(crate) type PristineCode<T: Config> = StorageMap<_, Identity, CodeHash<T>, Vec<u8>>;
@@ -644,29 +617,6 @@ pub mod pallet {
 	/// stored in said trie. Therefore this operation is performed lazily in `on_initialize`.
 	#[pallet::storage]
 	pub(crate) type DeletionQueue<T: Config> = StorageValue<_, Vec<DeletedContract>, ValueQuery>;
-
-
-	#[pallet::genesis_config]
-	pub struct GenesisConfig<T: Config> {
-		#[doc = "Current cost schedule for contracts."]
-		pub current_schedule: Schedule<T>,
-	}
-
-	#[cfg(feature = "std")]
-	impl<T: Config> Default for GenesisConfig<T> {
-		fn default() -> Self {
-			Self {
-				current_schedule: Default::default(),
-			}
-		}
-	}
-
-	#[pallet::genesis_build]
-	impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
-		fn build(&self) {
-			<CurrentSchedule<T>>::put(&self.current_schedule);
-		}
-	}
 }
 
 impl<T: Config> Pallet<T>
@@ -678,6 +628,12 @@ where
 	/// This function is similar to [`Self::call`], but doesn't perform any address lookups
 	/// and better suitable for calling directly from Rust.
 	///
+	/// # Note
+	///
+	/// `debug` should only ever be set to `true` when executing as an RPC because
+	/// it adds allocations and could be abused to drive the runtime into an OOM panic.
+	/// If set to `true` it returns additional human readable debugging information.
+	///
 	/// It returns the execution result and the amount of used weight.
 	pub fn bare_call(
 		origin: T::AccountId,
@@ -685,17 +641,22 @@ where
 		value: BalanceOf<T>,
 		gas_limit: Weight,
 		input_data: Vec<u8>,
+		debug: bool,
 	) -> ContractExecResult {
 		let mut gas_meter = GasMeter::new(gas_limit);
-		let schedule = <CurrentSchedule<T>>::get();
+		let schedule = T::Schedule::get();
+		let mut debug_message = if debug {
+			Some(Vec::new())
+		} else {
+			None
+		};
 		let result = ExecStack::<T, PrefabWasmModule<T>>::run_call(
-			origin, dest, &mut gas_meter, &schedule, value, input_data,
+			origin, dest, &mut gas_meter, &schedule, value, input_data, debug_message.as_mut(),
 		);
-		let gas_consumed = gas_meter.gas_spent();
 		ContractExecResult {
 			result: result.map(|r| r.0).map_err(|r| r.0.error),
-			gas_consumed,
-			debug_message: Bytes(Vec::new()),
+			gas_consumed: gas_meter.gas_spent(),
+			debug_message: debug_message.unwrap_or_default(),
 		}
 	}
 
@@ -709,6 +670,12 @@ where
 	/// If `compute_projection` is set to `true` the result also contains the rent projection.
 	/// This is optional because some non trivial and stateful work is performed to compute
 	/// the projection. See [`Self::rent_projection`].
+	///
+	/// # Note
+	///
+	/// `debug` should only ever be set to `true` when executing as an RPC because
+	/// it adds allocations and could be abused to drive the runtime into an OOM panic.
+	/// If set to `true` it returns additional human readable debugging information.
 	pub fn bare_instantiate(
 		origin: T::AccountId,
 		endowment: BalanceOf<T>,
@@ -717,9 +684,10 @@ where
 		data: Vec<u8>,
 		salt: Vec<u8>,
 		compute_projection: bool,
+		debug: bool,
 	) -> ContractInstantiateResult<T::AccountId, T::BlockNumber> {
 		let mut gas_meter = GasMeter::new(gas_limit);
-		let schedule = <CurrentSchedule<T>>::get();
+		let schedule = T::Schedule::get();
 		let executable = match code {
 			Code::Upload(Bytes(binary)) => PrefabWasmModule::from_code(binary, &schedule),
 			Code::Existing(hash) => PrefabWasmModule::from_storage(hash, &schedule, &mut gas_meter),
@@ -729,11 +697,17 @@ where
 			Err(error) => return ContractInstantiateResult {
 				result: Err(error.into()),
 				gas_consumed: gas_meter.gas_spent(),
-				debug_message: Bytes(Vec::new()),
+				debug_message: Vec::new(),
 			}
 		};
+		let mut debug_message = if debug {
+			Some(Vec::new())
+		} else {
+			None
+		};
 		let result = ExecStack::<T, PrefabWasmModule<T>>::run_instantiate(
-			origin, executable, &mut gas_meter, &schedule, endowment, data, &salt,
+			origin, executable, &mut gas_meter, &schedule,
+			endowment, data, &salt, debug_message.as_mut(),
 		).and_then(|(account_id, result)| {
 			let rent_projection = if compute_projection {
 				Some(Rent::<T, PrefabWasmModule<T>>::compute_projection(&account_id)
@@ -751,7 +725,7 @@ where
 		ContractInstantiateResult {
 			result: result.map_err(|e| e.error),
 			gas_consumed: gas_meter.gas_spent(),
-			debug_message: Bytes(Vec::new()),
+			debug_message: debug_message.unwrap_or_default(),
 		}
 	}
 
@@ -822,7 +796,7 @@ where
 	/// Store code for benchmarks which does not check nor instrument the code.
 	#[cfg(feature = "runtime-benchmarks")]
 	fn store_code_raw(code: Vec<u8>) -> frame_support::dispatch::DispatchResult {
-		let schedule = <CurrentSchedule<T>>::get();
+		let schedule = T::Schedule::get();
 		PrefabWasmModule::store_code_unchecked(code, &schedule)?;
 		Ok(())
 	}
diff --git a/frame/contracts/src/migration.rs b/frame/contracts/src/migration.rs
index 4fc138d3f3da..8c5c06fde7ab 100644
--- a/frame/contracts/src/migration.rs
+++ b/frame/contracts/src/migration.rs
@@ -15,24 +15,23 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::{Config, Weight, CurrentSchedule, Pallet, Schedule};
-use frame_support::traits::{GetPalletVersion, PalletVersion, Get};
+use crate::{Config, Weight, Pallet};
+use frame_support::{
+	storage::migration,
+	traits::{GetPalletVersion, PalletVersion, PalletInfoAccess, Get},
+};
 
 pub fn migrate<T: Config>() -> Weight {
 	let mut weight: Weight = 0;
 
 	match <Pallet<T>>::storage_version() {
-		// Replace the schedule with the new default and increment its version.
 		Some(version) if version == PalletVersion::new(3, 0, 0) => {
-			weight = weight.saturating_add(T::DbWeight::get().reads_writes(1, 1));
-			let _ = <CurrentSchedule<T>>::translate::<u32, _>(|version| {
-				version.map(|version| Schedule {
-						version: version.saturating_add(1),
-						// Default limits were not decreased. Therefore it is OK to overwrite
-						// the schedule with the new defaults.
-						.. Default::default()
-					})
-			});
+			weight = weight.saturating_add(T::DbWeight::get().writes(1));
+			migration::remove_storage_prefix(
+				<Pallet<T>>::name().as_bytes(),
+				b"CurrentSchedule",
+				b"",
+			);
 		}
 		_ => (),
 	}
diff --git a/frame/contracts/src/schedule.rs b/frame/contracts/src/schedule.rs
index 90c396c62777..a94a08e27d79 100644
--- a/frame/contracts/src/schedule.rs
+++ b/frame/contracts/src/schedule.rs
@@ -42,27 +42,12 @@ pub const INSTR_BENCHMARK_BATCH_SIZE: u32 = 1_000;
 /// Definition of the cost schedule and other parameterizations for the wasm vm.
 ///
 /// Its fields are private to the crate in order to allow addition of new contract
-/// callable functions without bumping to a new major version. A genesis config should
-/// rely on public functions of this type.
+/// callable functions without bumping to a new major version. The supplied [`Config::Schedule`]
+/// should rely on public functions of this type.
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "std", serde(bound(serialize = "", deserialize = "")))]
 #[derive(Clone, Encode, Decode, PartialEq, Eq, ScheduleDebug)]
 pub struct Schedule<T: Config> {
-	/// Version of the schedule.
-	///
-	/// # Note
-	///
-	/// Must be incremented whenever the [`self.instruction_weights`] are changed. The
-	/// reason is that changes to instruction weights require a re-instrumentation
-	/// of all contracts which are triggered by a version comparison on call.
-	/// Changes to other parts of the schedule should not increment the version in
-	/// order to avoid unnecessary re-instrumentations.
-	pub(crate) version: u32,
-
-	/// Whether the `seal_println` function is allowed to be used contracts.
-	/// MUST only be enabled for `dev` chains, NOT for production chains
-	pub(crate) enable_println: bool,
-
 	/// Describes the upper limits on various metrics.
 	pub(crate) limits: Limits,
 
@@ -73,12 +58,31 @@ pub struct Schedule<T: Config> {
 	pub(crate) host_fn_weights: HostFnWeights<T>,
 }
 
+impl<T: Config> Schedule<T> {
+	/// Set the version of the instruction weights.
+	///
+	/// # Note
+	///
+	/// Should be incremented whenever any instruction weight is changed. The
+	/// reason is that changes to instruction weights require a re-instrumentation
+	/// in order to apply the changes to an already deployed code. The re-instrumentation
+	/// is triggered by comparing the version of the current schedule with the the code was
+	/// instrumented with. Changes usually happen when pallet_contracts is re-benchmarked.
+	///
+	/// Changes to other parts of the schedule should not increment the version in
+	/// order to avoid unnecessary re-instrumentations.
+	pub fn set_instruction_weights_version(&mut self, version: u32) {
+		self.instruction_weights.version = version;
+	}
+}
+
 /// Describes the upper limits on various metrics.
 ///
 /// # Note
 ///
-/// The values in this struct should only ever be increased for a deployed chain. The reason
-/// is that decreasing those values will break existing contracts which are above the new limits.
+/// The values in this struct should never be decreased. The reason is that decreasing those
+/// values will break existing contracts which are above the new limits when a
+/// re-instrumentation is triggered.
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 #[derive(Clone, Encode, Decode, PartialEq, Eq, RuntimeDebug)]
 pub struct Limits {
@@ -121,6 +125,17 @@ pub struct Limits {
 
 	/// The maximum length of a subject in bytes used for PRNG generation.
 	pub subject_len: u32,
+
+	/// The maximum nesting level of the call stack.
+	pub call_depth: u32,
+
+	/// The maximum size of a storage value and event payload in bytes.
+	pub payload_len: u32,
+
+	/// The maximum length of a contract code in bytes. This limit applies to the instrumented
+	/// version of the code. Therefore `instantiate_with_code` can fail even when supplying
+	/// a wasm binary below this maximum size.
+	pub code_len: u32,
 }
 
 impl Limits {
@@ -153,6 +168,10 @@ impl Limits {
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 #[derive(Clone, Encode, Decode, PartialEq, Eq, WeightDebug)]
 pub struct InstructionWeights<T: Config> {
+	/// Version of the instruction weights.
+	///
+	/// See [`Schedule::set_instruction_weights_version`].
+	pub(crate) version: u32,
 	pub i64const: u32,
 	pub i64load: u32,
 	pub i64store: u32,
@@ -291,6 +310,9 @@ pub struct HostFnWeights<T: Config> {
 	/// Weight per byte of an event deposited through `seal_deposit_event`.
 	pub deposit_event_per_byte: Weight,
 
+	/// Weight of calling `seal_debug_message`.
+	pub debug_message: Weight,
+
 	/// Weight of calling `seal_set_rent_allowance`.
 	pub set_rent_allowance: Weight,
 
@@ -454,8 +476,6 @@ macro_rules! cost_byte_batched {
 impl<T: Config> Default for Schedule<T> {
 	fn default() -> Self {
 		Self {
-			version: 0,
-			enable_println: false,
 			limits: Default::default(),
 			instruction_weights: Default::default(),
 			host_fn_weights: Default::default(),
@@ -476,6 +496,9 @@ impl Default for Limits {
 			table_size: 4096,
 			br_table_size: 256,
 			subject_len: 32,
+			call_depth: 32,
+			payload_len: 16 * 1024,
+			code_len: 128 * 1024,
 		}
 	}
 }
@@ -484,6 +507,7 @@ impl<T: Config> Default for InstructionWeights<T> {
 	fn default() -> Self {
 		let max_pages = Limits::default().memory_pages;
 		Self {
+			version: 2,
 			i64const: cost_instr!(instr_i64const, 1),
 			i64load: cost_instr!(instr_i64load, 2),
 			i64store: cost_instr!(instr_i64store, 2),
@@ -569,6 +593,7 @@ impl<T: Config> Default for HostFnWeights<T> {
 			deposit_event: cost_batched!(seal_deposit_event),
 			deposit_event_per_topic: cost_batched_args!(seal_deposit_event_per_topic_and_kb, 1, 0),
 			deposit_event_per_byte: cost_byte_batched_args!(seal_deposit_event_per_topic_and_kb, 0, 1),
+			debug_message: cost_batched!(seal_debug_message),
 			set_rent_allowance: cost_batched!(seal_set_rent_allowance),
 			set_storage: cost_batched!(seal_set_storage),
 			set_storage_per_byte: cost_byte_batched!(seal_set_storage_per_kb),
@@ -606,20 +631,6 @@ struct ScheduleRules<'a, T: Config> {
 }
 
 impl<T: Config> Schedule<T> {
-	/// Allow contracts to call `seal_println` in order to print messages to the console.
-	///
-	/// This should only ever be activated in development chains. The printed messages
-	/// can be observed on the console by setting the environment variable
-	/// `RUST_LOG=runtime=debug` when running the node.
-	///
-	/// # Note
-	///
-	/// Is set to `false` by default.
-	pub fn enable_println(mut self, enable: bool) -> Self {
-		self.enable_println = enable;
-		self
-	}
-
 	pub(crate) fn rules(&self, module: &elements::Module) -> impl rules::Rules + '_ {
 		ScheduleRules {
 			schedule: &self,
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index ef3d65f506c5..a1308767fb65 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -40,7 +40,7 @@ use sp_io::hashing::blake2_256;
 use frame_support::{
 	assert_ok, assert_err, assert_err_ignore_postinfo,
 	parameter_types, assert_storage_noop,
-	traits::{Currency, ReservableCurrency, OnInitialize, GenesisBuild},
+	traits::{Currency, ReservableCurrency, OnInitialize},
 	weights::{Weight, PostDispatchInfo, DispatchClass, constants::WEIGHT_PER_SECOND},
 	dispatch::DispatchErrorWithPostInfo,
 	storage::child,
@@ -63,7 +63,7 @@ frame_support::construct_runtime!(
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
 		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
 		Randomness: pallet_randomness_collective_flip::{Pallet, Call, Storage},
-		Contracts: pallet_contracts::{Pallet, Call, Config<T>, Storage, Event<T>},
+		Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>},
 	}
 );
 
@@ -265,6 +265,7 @@ parameter_types! {
 	pub const DeletionQueueDepth: u32 = 1024;
 	pub const DeletionWeightLimit: Weight = 500_000_000_000;
 	pub const MaxCodeSize: u32 = 2 * 1024;
+	pub MySchedule: Schedule<Test> = <Schedule<Test>>::default();
 }
 
 parameter_types! {
@@ -291,13 +292,12 @@ impl Config for Test {
 	type RentFraction = RentFraction;
 	type SurchargeReward = SurchargeReward;
 	type CallStack = [Frame<Self>; 31];
-	type MaxValueSize = MaxValueSize;
 	type WeightPrice = Self;
 	type WeightInfo = ();
 	type ChainExtension = TestExtension;
 	type DeletionQueueDepth = DeletionQueueDepth;
 	type DeletionWeightLimit = DeletionWeightLimit;
-	type MaxCodeSize = MaxCodeSize;
+	type Schedule = MySchedule;
 }
 
 pub const ALICE: AccountId32 = AccountId32::new([1u8; 32]);
@@ -331,12 +331,6 @@ impl ExtBuilder {
 		pallet_balances::GenesisConfig::<Test> {
 			balances: vec![],
 		}.assimilate_storage(&mut t).unwrap();
-		pallet_contracts::GenesisConfig {
-			current_schedule: Schedule::<Test> {
-				enable_println: true,
-				..Default::default()
-			},
-		}.assimilate_storage(&mut t).unwrap();
 		let mut ext = sp_io::TestExternalities::new(t);
 		ext.execute_with(|| System::set_block_number(1));
 		ext
@@ -564,7 +558,7 @@ fn deposit_event_max_value_limit() {
 				addr.clone(),
 				0,
 				GAS_LIMIT * 2, // we are copying a huge buffer,
-				<Test as Config>::MaxValueSize::get().encode(),
+				<Test as Config>::Schedule::get().limits.payload_len.encode(),
 			));
 
 			// Call contract with too large a storage value.
@@ -574,7 +568,7 @@ fn deposit_event_max_value_limit() {
 					addr,
 					0,
 					GAS_LIMIT,
-					(<Test as Config>::MaxValueSize::get() + 1).encode(),
+					(<Test as Config>::Schedule::get().limits.payload_len + 1).encode(),
 				),
 				Error::<Test>::ValueTooLarge,
 			);
@@ -1544,7 +1538,7 @@ fn storage_max_value_limit() {
 				addr.clone(),
 				0,
 				GAS_LIMIT * 2, // we are copying a huge buffer
-				<Test as Config>::MaxValueSize::get().encode(),
+				<Test as Config>::Schedule::get().limits.payload_len.encode(),
 			));
 
 			// Call contract with too large a storage value.
@@ -1554,7 +1548,7 @@ fn storage_max_value_limit() {
 					addr,
 					0,
 					GAS_LIMIT,
-					(<Test as Config>::MaxValueSize::get() + 1).encode(),
+					(<Test as Config>::Schedule::get().limits.payload_len + 1).encode(),
 				),
 				Error::<Test>::ValueTooLarge,
 			);
@@ -1896,6 +1890,7 @@ fn crypto_hashes() {
 					0,
 					GAS_LIMIT,
 					params,
+					false,
 				).result.unwrap();
 				assert!(result.is_success());
 				let expected = hash_fn(input.as_ref());
@@ -1931,6 +1926,7 @@ fn transfer_return_code() {
 			0,
 			GAS_LIMIT,
 			vec![],
+			false,
 		).result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::BelowSubsistenceThreshold);
 
@@ -1945,6 +1941,7 @@ fn transfer_return_code() {
 			0,
 			GAS_LIMIT,
 			vec![],
+			false,
 		).result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::TransferFailed);
 	});
@@ -1979,6 +1976,7 @@ fn call_return_code() {
 			0,
 			GAS_LIMIT,
 			AsRef::<[u8]>::as_ref(&DJANGO).to_vec(),
+			false,
 		).result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::NotCallable);
 
@@ -2002,6 +2000,7 @@ fn call_return_code() {
 			0,
 			GAS_LIMIT,
 			AsRef::<[u8]>::as_ref(&addr_django).iter().chain(&0u32.to_le_bytes()).cloned().collect(),
+			false,
 		).result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::BelowSubsistenceThreshold);
 
@@ -2016,6 +2015,7 @@ fn call_return_code() {
 			0,
 			GAS_LIMIT,
 			AsRef::<[u8]>::as_ref(&addr_django).iter().chain(&0u32.to_le_bytes()).cloned().collect(),
+			false,
 		).result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::TransferFailed);
 
@@ -2027,6 +2027,7 @@ fn call_return_code() {
 			0,
 			GAS_LIMIT,
 			AsRef::<[u8]>::as_ref(&addr_django).iter().chain(&1u32.to_le_bytes()).cloned().collect(),
+			false,
 		).result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::CalleeReverted);
 
@@ -2037,6 +2038,7 @@ fn call_return_code() {
 			0,
 			GAS_LIMIT,
 			AsRef::<[u8]>::as_ref(&addr_django).iter().chain(&2u32.to_le_bytes()).cloned().collect(),
+			false,
 		).result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::CalleeTrapped);
 
@@ -2084,6 +2086,7 @@ fn instantiate_return_code() {
 			0,
 			GAS_LIMIT,
 			callee_hash.clone(),
+			false,
 		).result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::BelowSubsistenceThreshold);
 
@@ -2098,6 +2101,7 @@ fn instantiate_return_code() {
 			0,
 			GAS_LIMIT,
 			callee_hash.clone(),
+			false,
 		).result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::TransferFailed);
 
@@ -2109,6 +2113,7 @@ fn instantiate_return_code() {
 			0,
 			GAS_LIMIT,
 			vec![0; 33],
+			false,
 		).result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::CodeNotFound);
 
@@ -2119,6 +2124,7 @@ fn instantiate_return_code() {
 			0,
 			GAS_LIMIT,
 			callee_hash.iter().chain(&1u32.to_le_bytes()).cloned().collect(),
+			false,
 		).result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::CalleeReverted);
 
@@ -2129,6 +2135,7 @@ fn instantiate_return_code() {
 			0,
 			GAS_LIMIT,
 			callee_hash.iter().chain(&2u32.to_le_bytes()).cloned().collect(),
+			false,
 		).result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::CalleeTrapped);
 
@@ -2216,6 +2223,7 @@ fn chain_extension_works() {
 			0,
 			GAS_LIMIT,
 			vec![0, 99],
+			false,
 		);
 		let gas_consumed = result.gas_consumed;
 		assert_eq!(TestExtension::last_seen_buffer(), vec![0, 99]);
@@ -2228,6 +2236,7 @@ fn chain_extension_works() {
 			0,
 			GAS_LIMIT,
 			vec![1],
+			false,
 		).result.unwrap();
 		// those values passed in the fixture
 		assert_eq!(TestExtension::last_seen_inputs(), (4, 1, 16, 12));
@@ -2239,6 +2248,7 @@ fn chain_extension_works() {
 			0,
 			GAS_LIMIT,
 			vec![2, 42],
+			false,
 		);
 		assert_ok!(result.result);
 		assert_eq!(result.gas_consumed, gas_consumed + 42);
@@ -2250,6 +2260,7 @@ fn chain_extension_works() {
 			0,
 			GAS_LIMIT,
 			vec![3],
+			false,
 		).result.unwrap();
 		assert_eq!(result.flags, ReturnFlags::REVERT);
 		assert_eq!(result.data, Bytes(vec![42, 99]));
@@ -2782,6 +2793,7 @@ fn reinstrument_does_charge() {
 			0,
 			GAS_LIMIT,
 			zero.clone(),
+			false,
 		);
 		assert!(result0.result.unwrap().is_success());
 
@@ -2791,15 +2803,17 @@ fn reinstrument_does_charge() {
 			0,
 			GAS_LIMIT,
 			zero.clone(),
+			false,
 		);
 		assert!(result1.result.unwrap().is_success());
 
 		// They should match because both where called with the same schedule.
 		assert_eq!(result0.gas_consumed, result1.gas_consumed);
 
-		// Update the schedule version but keep the rest the same
-		crate::CurrentSchedule::mutate(|old: &mut Schedule<Test>| {
-			old.version += 1;
+		// We cannot change the schedule. Instead, we decrease the version of the deployed
+		// contract below the current schedule's version.
+		crate::CodeStorage::mutate(&code_hash, |code: &mut Option<PrefabWasmModule<Test>>| {
+			code.as_mut().unwrap().decrement_version();
 		});
 
 		// This call should trigger reinstrumentation
@@ -2809,6 +2823,7 @@ fn reinstrument_does_charge() {
 			0,
 			GAS_LIMIT,
 			zero.clone(),
+			false,
 		);
 		assert!(result2.result.unwrap().is_success());
 		assert!(result2.gas_consumed > result1.gas_consumed);
@@ -2818,3 +2833,102 @@ fn reinstrument_does_charge() {
 		);
 	});
 }
+
+#[test]
+fn debug_message_works() {
+	let (wasm, code_hash) = compile_module::<Test>("debug_message_works").unwrap();
+
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
+		assert_ok!(
+			Contracts::instantiate_with_code(
+				Origin::signed(ALICE),
+				30_000,
+				GAS_LIMIT,
+				wasm,
+				vec![],
+				vec![],
+			),
+		);
+		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+		let result = Contracts::bare_call(
+			ALICE,
+			addr,
+			0,
+			GAS_LIMIT,
+			vec![],
+			true,
+		);
+
+		assert_matches!(result.result, Ok(_));
+		assert_eq!(std::str::from_utf8(&result.debug_message).unwrap(), "Hello World!");
+	});
+}
+
+#[test]
+fn debug_message_logging_disabled() {
+	let (wasm, code_hash) = compile_module::<Test>("debug_message_logging_disabled").unwrap();
+
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
+		assert_ok!(
+			Contracts::instantiate_with_code(
+				Origin::signed(ALICE),
+				30_000,
+				GAS_LIMIT,
+				wasm,
+				vec![],
+				vec![],
+			),
+		);
+		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+		// disable logging by passing `false`
+		let result = Contracts::bare_call(
+			ALICE,
+			addr.clone(),
+			0,
+			GAS_LIMIT,
+			vec![],
+			false,
+		);
+		assert_matches!(result.result, Ok(_));
+		// the dispatchables always run without debugging
+		assert_ok!(Contracts::call(
+			Origin::signed(ALICE),
+			addr,
+			0,
+			GAS_LIMIT,
+			vec![],
+		));
+		assert!(result.debug_message.is_empty());
+	});
+}
+
+#[test]
+fn debug_message_invalid_utf8() {
+	let (wasm, code_hash) = compile_module::<Test>("debug_message_invalid_utf8").unwrap();
+
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
+		assert_ok!(
+			Contracts::instantiate_with_code(
+				Origin::signed(ALICE),
+				30_000,
+				GAS_LIMIT,
+				wasm,
+				vec![],
+				vec![],
+			),
+		);
+		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+		let result = Contracts::bare_call(
+			ALICE,
+			addr,
+			0,
+			GAS_LIMIT,
+			vec![],
+			true,
+		);
+		assert_err!(result.result, <Error<Test>>::DebugMessageInvalidUTF8);
+	});
+}
diff --git a/frame/contracts/src/wasm/code_cache.rs b/frame/contracts/src/wasm/code_cache.rs
index e81e595697aa..8df604cdb0e1 100644
--- a/frame/contracts/src/wasm/code_cache.rs
+++ b/frame/contracts/src/wasm/code_cache.rs
@@ -132,11 +132,9 @@ where
 	prefab_module.code_hash = code_hash;
 
 	if let Some((schedule, gas_meter)) = reinstrument {
-		if prefab_module.schedule_version < schedule.version {
-			// The current schedule version is greater than the version of the one cached
-			// in the storage.
-			//
-			// We need to re-instrument the code with the latest schedule here.
+		if prefab_module.instruction_weights_version < schedule.instruction_weights.version {
+			// The instruction weights have changed.
+			// We need to re-instrument the code with the new instruction weights.
 			gas_meter.charge(InstrumentToken(prefab_module.original_code_len))?;
 			private::reinstrument(&mut prefab_module, schedule)?;
 		}
@@ -158,7 +156,7 @@ mod private {
 		let original_code = <PristineCode<T>>::get(&prefab_module.code_hash)
 			.ok_or_else(|| Error::<T>::CodeNotFound)?;
 		prefab_module.code = prepare::reinstrument_contract::<T>(original_code, schedule)?;
-		prefab_module.schedule_version = schedule.version;
+		prefab_module.instruction_weights_version = schedule.instruction_weights.version;
 		<CodeStorage<T>>::insert(&prefab_module.code_hash, &*prefab_module);
 		Ok(())
 	}
diff --git a/frame/contracts/src/wasm/mod.rs b/frame/contracts/src/wasm/mod.rs
index f30a30ae8725..04e9bf2d905b 100644
--- a/frame/contracts/src/wasm/mod.rs
+++ b/frame/contracts/src/wasm/mod.rs
@@ -45,16 +45,16 @@ pub use tests::MockExt;
 /// # Note
 ///
 /// This data structure is mostly immutable once created and stored. The exceptions that
-/// can be changed by calling a contract are `refcount`, `schedule_version` and `code`.
+/// can be changed by calling a contract are `refcount`, `instruction_weights_version` and `code`.
 /// `refcount` can change when a contract instantiates a new contract or self terminates.
-/// `schedule_version` and `code` when a contract with an outdated instrumention is called.
-/// Therefore one must be careful when holding any in-memory representation of this type while
-/// calling into a contract as those fields can get out of date.
+/// `instruction_weights_version` and `code` when a contract with an outdated instrumention is
+/// called. Therefore one must be careful when holding any in-memory representation of this
+/// type while calling into a contract as those fields can get out of date.
 #[derive(Clone, Encode, Decode)]
 pub struct PrefabWasmModule<T: Config> {
-	/// Version of the schedule with which the code was instrumented.
+	/// Version of the instruction weights with which the code was instrumented.
 	#[codec(compact)]
-	schedule_version: u32,
+	instruction_weights_version: u32,
 	/// Initial memory size of a contract's sandbox.
 	#[codec(compact)]
 	initial: u32,
@@ -140,6 +140,12 @@ where
 	pub fn refcount(&self) -> u64 {
 		self.refcount
 	}
+
+	/// Decrement instruction_weights_version by 1. Panics if it is already 0.
+	#[cfg(test)]
+	pub fn decrement_version(&mut self) {
+		self.instruction_weights_version = self.instruction_weights_version.checked_sub(1).unwrap();
+	}
 }
 
 impl<T: Config> Executable<T> for PrefabWasmModule<T>
@@ -297,6 +303,7 @@ mod tests {
 		schedule: Schedule<Test>,
 		rent_params: RentParams<Test>,
 		gas_meter: GasMeter<Test>,
+		debug_buffer: Vec<u8>,
 	}
 
 	impl Default for MockExt {
@@ -312,6 +319,7 @@ mod tests {
 				schedule: Default::default(),
 				rent_params: Default::default(),
 				gas_meter: GasMeter::new(10_000_000_000),
+				debug_buffer: Default::default(),
 			}
 		}
 	}
@@ -447,6 +455,10 @@ mod tests {
 		fn gas_meter(&mut self) -> &mut GasMeter<Self::T> {
 			&mut self.gas_meter
 		}
+		fn append_debug_buffer(&mut self, msg: &str) -> bool {
+			self.debug_buffer.extend(msg.as_bytes());
+			true
+		}
 	}
 
 	fn execute<E: BorrowMut<MockExt>>(
@@ -1845,4 +1857,71 @@ mod tests {
 		let rent_params = Bytes(<RentParams<Test>>::default().encode());
 		assert_eq!(output, ExecReturnValue { flags: ReturnFlags::empty(), data: rent_params });
 	}
+
+	const CODE_DEBUG_MESSAGE: &str = r#"
+(module
+	(import "seal0" "seal_debug_message" (func $seal_debug_message (param i32 i32) (result i32)))
+	(import "env" "memory" (memory 1 1))
+
+	(data (i32.const 0) "Hello World!")
+
+	(func (export "call")
+		(call $seal_debug_message
+			(i32.const 0)	;; Pointer to the text buffer
+			(i32.const 12)	;; The size of the buffer
+		)
+		drop
+	)
+
+	(func (export "deploy"))
+)
+"#;
+
+	#[test]
+	fn debug_message_works() {
+		let mut ext = MockExt::default();
+		execute(
+			CODE_DEBUG_MESSAGE,
+			vec![],
+			&mut ext,
+		).unwrap();
+
+		assert_eq!(std::str::from_utf8(&ext.debug_buffer).unwrap(), "Hello World!");
+	}
+
+	const CODE_DEBUG_MESSAGE_FAIL: &str = r#"
+	(module
+		(import "seal0" "seal_debug_message" (func $seal_debug_message (param i32 i32) (result i32)))
+		(import "env" "memory" (memory 1 1))
+
+		(data (i32.const 0) "\fc")
+
+		(func (export "call")
+			(call $seal_debug_message
+				(i32.const 0)	;; Pointer to the text buffer
+				(i32.const 1)	;; The size of the buffer
+			)
+			drop
+		)
+
+		(func (export "deploy"))
+	)
+	"#;
+
+		#[test]
+		fn debug_message_invalid_utf8_fails() {
+			let mut ext = MockExt::default();
+			let result = execute(
+				CODE_DEBUG_MESSAGE_FAIL,
+				vec![],
+				&mut ext,
+			);
+			assert_eq!(
+				result,
+				Err(ExecError {
+					error: Error::<Test>::DebugMessageInvalidUTF8.into(),
+					origin: ErrorOrigin::Caller,
+				})
+			);
+		}
 }
diff --git a/frame/contracts/src/wasm/prepare.rs b/frame/contracts/src/wasm/prepare.rs
index 633edd4aaf8a..e595c3255593 100644
--- a/frame/contracts/src/wasm/prepare.rs
+++ b/frame/contracts/src/wasm/prepare.rs
@@ -343,12 +343,6 @@ impl<'a, T: Config> ContractModule<'a, T> {
 				.get(*type_idx as usize)
 				.ok_or_else(|| "validation: import entry points to a non-existent type")?;
 
-			// We disallow importing `seal_println` unless debug features are enabled,
-			// which should only be allowed on a dev chain
-			if !self.schedule.enable_println && import.field().as_bytes() == b"seal_println" {
-				return Err("module imports `seal_println` but debug features disabled");
-			}
-
 			if !T::ChainExtension::enabled() &&
 				import.field().as_bytes() == b"seal_call_chain_extension"
 			{
@@ -439,7 +433,7 @@ fn do_preparation<C: ImportSatisfyCheck, T: Config>(
 		schedule,
 	)?;
 	Ok(PrefabWasmModule {
-		schedule_version: schedule.version,
+		instruction_weights_version: schedule.instruction_weights.version,
 		initial,
 		maximum,
 		_reserved: None,
@@ -505,7 +499,7 @@ pub mod benchmarking {
 		let contract_module = ContractModule::new(&original_code, schedule)?;
 		let memory_limits = get_memory_limits(contract_module.scan_imports::<()>(&[])?, schedule)?;
 		Ok(PrefabWasmModule {
-			schedule_version: schedule.version,
+			instruction_weights_version: schedule.instruction_weights.version,
 			initial: memory_limits.0,
 			maximum: memory_limits.1,
 			_reserved: None,
@@ -547,8 +541,6 @@ mod tests {
 
 			// new version of nop with other data type for argumebt
 			[seal1] nop(_ctx, _unused: i32) => { unreachable!(); },
-
-			[seal0] seal_println(_ctx, _ptr: u32, _len: u32) => { unreachable!(); },
 		);
 	}
 
@@ -938,36 +930,6 @@ mod tests {
 			"#,
 			Err("module imports a non-existent function")
 		);
-
-		prepare_test!(seal_println_debug_disabled,
-			r#"
-			(module
-				(import "seal0" "seal_println" (func $seal_println (param i32 i32)))
-
-				(func (export "call"))
-				(func (export "deploy"))
-			)
-			"#,
-			Err("module imports `seal_println` but debug features disabled")
-		);
-
-		#[test]
-		fn seal_println_debug_enabled() {
-			let wasm = wat::parse_str(
-				r#"
-				(module
-					(import "seal0" "seal_println" (func $seal_println (param i32 i32)))
-
-					(func (export "call"))
-					(func (export "deploy"))
-				)
-				"#
-			).unwrap();
-			let mut schedule = Schedule::default();
-			schedule.enable_println = true;
-			let r = do_preparation::<env::Test, crate::tests::Test>(wasm, &schedule);
-			assert_matches::assert_matches!(r, Ok(_));
-		}
 	}
 
 	mod entrypoints {
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index da8784b23cdc..0935dbe9cbe3 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -71,6 +71,9 @@ pub enum ReturnCode {
 	/// The contract that was called is either no contract at all (a plain account)
 	/// or is a tombstone.
 	NotCallable = 8,
+	/// The call to `seal_debug_message` had no effect because debug message
+	/// recording was disabled.
+	LoggingDisabled = 9,
 }
 
 impl ConvertibleToWasm for ReturnCode {
@@ -175,6 +178,8 @@ pub enum RuntimeCosts {
 	Random,
 	/// Weight of calling `seal_deposit_event` with the given number of topics and event size.
 	DepositEvent{num_topic: u32, len: u32},
+	/// Weight of calling `seal_debug_message`.
+	DebugMessage,
 	/// Weight of calling `seal_set_rent_allowance`.
 	SetRentAllowance,
 	/// Weight of calling `seal_set_storage` for the given storage item size.
@@ -255,6 +260,7 @@ impl RuntimeCosts {
 			DepositEvent{num_topic, len} => s.deposit_event
 				.saturating_add(s.deposit_event_per_topic.saturating_mul(num_topic.into()))
 				.saturating_add(s.deposit_event_per_byte.saturating_mul(len.into())),
+			DebugMessage => s.debug_message,
 			SetRentAllowance => s.set_rent_allowance,
 			SetStorage(len) => s.set_storage
 				.saturating_add(s.set_storage_per_byte.saturating_mul(len.into())),
@@ -802,7 +808,7 @@ define_env!(Env, <E: Ext>,
 			ctx.charge_gas(RuntimeCosts::CallSurchargeTransfer)?;
 		}
 		let charged = ctx.charge_gas(
-			RuntimeCosts::CallSurchargeCodeSize(<E::T as Config>::MaxCodeSize::get())
+			RuntimeCosts::CallSurchargeCodeSize(<E::T as Config>::Schedule::get().limits.code_len)
 		)?;
 		let ext = &mut ctx.ext;
 		let call_outcome = ext.call(gas, callee, value, input_data);
@@ -887,7 +893,9 @@ define_env!(Env, <E: Ext>,
 		let input_data = ctx.read_sandbox_memory(input_data_ptr, input_data_len)?;
 		let salt = ctx.read_sandbox_memory(salt_ptr, salt_len)?;
 		let charged = ctx.charge_gas(
-			RuntimeCosts::InstantiateSurchargeCodeSize(<E::T as Config>::MaxCodeSize::get())
+			RuntimeCosts::InstantiateSurchargeCodeSize(
+				<E::T as Config>::Schedule::get().limits.code_len
+			)
 		)?;
 		let ext = &mut ctx.ext;
 		let instantiate_outcome = ext.instantiate(gas, code_hash, value, input_data, &salt);
@@ -937,7 +945,9 @@ define_env!(Env, <E: Ext>,
 			ctx.read_sandbox_memory_as(beneficiary_ptr, beneficiary_len)?;
 
 		let charged = ctx.charge_gas(
-			RuntimeCosts::TerminateSurchargeCodeSize(<E::T as Config>::MaxCodeSize::get())
+			RuntimeCosts::TerminateSurchargeCodeSize(
+				<E::T as Config>::Schedule::get().limits.code_len
+			)
 		)?;
 		let (result, code_len) = match ctx.ext.terminate(&beneficiary) {
 			Ok(len) => (Ok(()), len),
@@ -1266,7 +1276,7 @@ define_env!(Env, <E: Ext>,
 			delta
 		};
 
-		let max_len = <E::T as Config>::MaxCodeSize::get();
+		let max_len = <E::T as Config>::Schedule::get().limits.code_len;
 		let charged = ctx.charge_gas(RuntimeCosts::RestoreToSurchargeCodeSize {
 			caller_code: max_len,
 			tombstone_code: max_len,
@@ -1380,15 +1390,33 @@ define_env!(Env, <E: Ext>,
 		)?)
 	},
 
-	// Prints utf8 encoded string from the data buffer.
-	// Only available on `--dev` chains.
-	// This function may be removed at any time, superseded by a more general contract debugging feature.
-	[seal0] seal_println(ctx, str_ptr: u32, str_len: u32) => {
-		let data = ctx.read_sandbox_memory(str_ptr, str_len)?;
-		if let Ok(utf8) = core::str::from_utf8(&data) {
-			log::info!(target: "runtime::contracts", "seal_println: {}", utf8);
+	// Emit a custom debug message.
+	//
+	// No newlines are added to the supplied message.
+	// Specifying invalid UTF-8 triggers a trap.
+	//
+	// This is a no-op if debug message recording is disabled which is always the case
+	// when the code is executing on-chain. The message is interpreted as UTF-8 and
+	// appended to the debug buffer which is then supplied to the calling RPC client.
+	//
+	// # Note
+	//
+	// Even though no action is taken when debug message recording is disabled there is still
+	// a non trivial overhead (and weight cost) associated with calling this function. Contract
+	// languages should remove calls to this function (either at runtime or compile time) when
+	// not being executed as an RPC. For example, they could allow users to disable logging
+	// through compile time flags (cargo features) for on-chain deployment. Additionally, the
+	// return value of this function can be cached in order to prevent further calls at runtime.
+	[seal0] seal_debug_message(ctx, str_ptr: u32, str_len: u32) -> ReturnCode => {
+		ctx.charge_gas(RuntimeCosts::DebugMessage)?;
+		if ctx.ext.append_debug_buffer("") {
+			let data = ctx.read_sandbox_memory(str_ptr, str_len)?;
+			let msg = core::str::from_utf8(&data)
+				.map_err(|_| <Error<E::T>>::DebugMessageInvalidUTF8)?;
+			ctx.ext.append_debug_buffer(msg);
+			return Ok(ReturnCode::Success);
 		}
-		Ok(())
+		Ok(ReturnCode::LoggingDisabled)
 	},
 
 	// Stores the current block number of the current contract into the supplied buffer.
diff --git a/frame/contracts/src/weights.rs b/frame/contracts/src/weights.rs
index a4cf9b41553b..ea3f424dd98c 100644
--- a/frame/contracts/src/weights.rs
+++ b/frame/contracts/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_contracts
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-04-23, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-05-10, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -48,7 +48,6 @@ pub trait WeightInfo {
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight;
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight;
 	fn instrument(c: u32, ) -> Weight;
-	fn update_schedule() -> Weight;
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight;
 	fn instantiate(c: u32, s: u32, ) -> Weight;
 	fn call(c: u32, ) -> Weight;
@@ -78,6 +77,7 @@ pub trait WeightInfo {
 	fn seal_deposit_event(r: u32, ) -> Weight;
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight;
 	fn seal_set_rent_allowance(r: u32, ) -> Weight;
+	fn seal_debug_message(r: u32, ) -> Weight;
 	fn seal_set_storage(r: u32, ) -> Weight;
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight;
 	fn seal_clear_storage(r: u32, ) -> Weight;
@@ -153,1321 +153,1325 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn on_initialize() -> Weight {
-		(3_610_000 as Weight)
+		(3_676_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 	}
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((2_307_000 as Weight).saturating_mul(k as Weight))
+			.saturating_add((2_259_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
-		(18_635_000 as Weight)
-			// Standard Error: 8_000
-			.saturating_add((33_246_000 as Weight).saturating_mul(q as Weight))
+		(0 as Weight)
+			// Standard Error: 33_000
+			.saturating_add((35_157_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn instrument(c: u32, ) -> Weight {
-		(36_950_000 as Weight)
-			// Standard Error: 198_000
-			.saturating_add((116_526_000 as Weight).saturating_mul(c as Weight))
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn update_schedule() -> Weight {
-		(28_095_000 as Weight)
+		(42_341_000 as Weight)
+			// Standard Error: 190_000
+			.saturating_add((95_696_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight {
-		(230_039_000 as Weight)
-			// Standard Error: 143_000
-			.saturating_add((157_483_000 as Weight).saturating_mul(c as Weight))
+		(178_191_000 as Weight)
+			// Standard Error: 141_000
+			.saturating_add((135_736_000 as Weight).saturating_mul(c as Weight))
 			// Standard Error: 9_000
-			.saturating_add((2_992_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(T::DbWeight::get().reads(6 as Weight))
+			.saturating_add((1_867_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn instantiate(c: u32, s: u32, ) -> Weight {
-		(203_983_000 as Weight)
+		(183_874_000 as Weight)
 			// Standard Error: 11_000
-			.saturating_add((8_639_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((8_659_000 as Weight).saturating_mul(c as Weight))
 			// Standard Error: 1_000
-			.saturating_add((2_918_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(T::DbWeight::get().reads(6 as Weight))
+			.saturating_add((1_781_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn call(c: u32, ) -> Weight {
-		(198_905_000 as Weight)
+		(186_051_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((3_913_000 as Weight).saturating_mul(c as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add((3_919_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn claim_surcharge(c: u32, ) -> Weight {
-		(132_586_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((4_732_000 as Weight).saturating_mul(c as Weight))
+		(133_967_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((4_733_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn seal_caller(r: u32, ) -> Weight {
-		(179_629_000 as Weight)
-			// Standard Error: 318_000
-			.saturating_add((250_628_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(131_758_000 as Weight)
+			// Standard Error: 361_000
+			.saturating_add((249_131_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_address(r: u32, ) -> Weight {
-		(144_806_000 as Weight)
-			// Standard Error: 71_000
-			.saturating_add((251_588_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(141_100_000 as Weight)
+			// Standard Error: 73_000
+			.saturating_add((245_593_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(151_919_000 as Weight)
-			// Standard Error: 90_000
-			.saturating_add((243_733_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(141_578_000 as Weight)
+			// Standard Error: 76_000
+			.saturating_add((240_505_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_balance(r: u32, ) -> Weight {
-		(157_448_000 as Weight)
-			// Standard Error: 211_000
-			.saturating_add((559_875_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(144_329_000 as Weight)
+			// Standard Error: 197_000
+			.saturating_add((529_903_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(145_161_000 as Weight)
-			// Standard Error: 71_000
-			.saturating_add((246_729_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(137_318_000 as Weight)
+			// Standard Error: 77_000
+			.saturating_add((239_623_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(147_920_000 as Weight)
-			// Standard Error: 60_000
-			.saturating_add((245_135_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(138_343_000 as Weight)
+			// Standard Error: 260_000
+			.saturating_add((241_997_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(141_105_000 as Weight)
-			// Standard Error: 138_000
-			.saturating_add((247_840_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(138_989_000 as Weight)
+			// Standard Error: 77_000
+			.saturating_add((239_424_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(147_393_000 as Weight)
-			// Standard Error: 77_000
-			.saturating_add((247_593_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(140_118_000 as Weight)
+			// Standard Error: 83_000
+			.saturating_add((240_866_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_block_number(r: u32, ) -> Weight {
-		(151_560_000 as Weight)
-			// Standard Error: 92_000
-			.saturating_add((242_469_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(139_962_000 as Weight)
+			// Standard Error: 69_000
+			.saturating_add((239_267_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_now(r: u32, ) -> Weight {
-		(145_917_000 as Weight)
-			// Standard Error: 80_000
-			.saturating_add((244_335_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(139_652_000 as Weight)
+			// Standard Error: 69_000
+			.saturating_add((240_282_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_rent_params(r: u32, ) -> Weight {
-		(150_399_000 as Weight)
-			// Standard Error: 90_000
-			.saturating_add((381_505_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(136_806_000 as Weight)
+			// Standard Error: 104_000
+			.saturating_add((359_911_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(152_906_000 as Weight)
-			// Standard Error: 418_000
-			.saturating_add((486_338_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(6 as Weight))
+		(148_086_000 as Weight)
+			// Standard Error: 116_000
+			.saturating_add((470_271_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_gas(r: u32, ) -> Weight {
-		(130_020_000 as Weight)
-			// Standard Error: 48_000
-			.saturating_add((120_792_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(123_560_000 as Weight)
+			// Standard Error: 295_000
+			.saturating_add((119_119_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_input(r: u32, ) -> Weight {
-		(142_031_000 as Weight)
+		(132_420_000 as Weight)
 			// Standard Error: 83_000
-			.saturating_add((7_205_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add((6_835_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(151_770_000 as Weight)
+		(142_119_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((247_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add((245_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_return(r: u32, ) -> Weight {
-		(131_023_000 as Weight)
-			// Standard Error: 69_000
-			.saturating_add((4_823_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(121_030_000 as Weight)
+			// Standard Error: 68_000
+			.saturating_add((4_444_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(142_885_000 as Weight)
+		(131_704_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((751_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add((756_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_terminate(r: u32, ) -> Weight {
-		(142_165_000 as Weight)
-			// Standard Error: 100_000
-			.saturating_add((99_133_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(132_544_000 as Weight)
+			// Standard Error: 113_000
+			.saturating_add((97_343_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_terminate_per_code_kb(c: u32, ) -> Weight {
-		(243_348_000 as Weight)
-			// Standard Error: 6_000
-			.saturating_add((8_560_000 as Weight).saturating_mul(c as Weight))
-			.saturating_add(T::DbWeight::get().reads(7 as Weight))
+		(234_751_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((8_482_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
 	fn seal_restore_to(r: u32, ) -> Weight {
-		(171_766_000 as Weight)
-			// Standard Error: 372_000
-			.saturating_add((100_243_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(156_439_000 as Weight)
+			// Standard Error: 1_068_000
+			.saturating_add((96_724_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((5 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_restore_to_per_code_kb_delta(c: u32, t: u32, d: u32, ) -> Weight {
-		(112_646_000 as Weight)
-			// Standard Error: 142_000
-			.saturating_add((7_922_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 142_000
-			.saturating_add((3_590_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 1_255_000
-			.saturating_add((3_716_501_000 as Weight).saturating_mul(d as Weight))
-			.saturating_add(T::DbWeight::get().reads(8 as Weight))
+		(101_920_000 as Weight)
+			// Standard Error: 162_000
+			.saturating_add((7_588_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 162_000
+			.saturating_add((3_475_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 1_431_000
+			.saturating_add((3_733_137_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
 			.saturating_add(T::DbWeight::get().writes(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
 	}
 	fn seal_random(r: u32, ) -> Weight {
-		(152_470_000 as Weight)
-			// Standard Error: 146_000
-			.saturating_add((619_676_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(6 as Weight))
+		(151_598_000 as Weight)
+			// Standard Error: 168_000
+			.saturating_add((608_967_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(151_008_000 as Weight)
-			// Standard Error: 167_000
-			.saturating_add((899_677_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(149_224_000 as Weight)
+			// Standard Error: 205_000
+			.saturating_add((896_074_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_227_526_000 as Weight)
-			// Standard Error: 2_767_000
-			.saturating_add((586_284_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 545_000
-			.saturating_add((247_578_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(1_198_650_000 as Weight)
+			// Standard Error: 2_742_000
+			.saturating_add((566_152_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 540_000
+			.saturating_add((248_898_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(142_734_000 as Weight)
-			// Standard Error: 53_000
-			.saturating_add((167_026_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(133_149_000 as Weight)
+			// Standard Error: 72_000
+			.saturating_add((163_281_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn seal_debug_message(r: u32, ) -> Weight {
+		(126_413_000 as Weight)
+			// Standard Error: 127_000
+			.saturating_add((128_176_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(21_198_000 as Weight)
-			// Standard Error: 2_062_000
-			.saturating_add((3_836_800_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(0 as Weight)
+			// Standard Error: 1_710_000
+			.saturating_add((3_933_779_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(589_829_000 as Weight)
-			// Standard Error: 223_000
-			.saturating_add((71_242_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(6 as Weight))
+		(582_721_000 as Weight)
+			// Standard Error: 228_000
+			.saturating_add((71_341_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn seal_clear_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 1_950_000
-			.saturating_add((1_267_479_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			// Standard Error: 2_470_000
+			.saturating_add((1_281_241_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_get_storage(r: u32, ) -> Weight {
-		(3_466_000 as Weight)
-			// Standard Error: 1_248_000
-			.saturating_add((920_416_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(11_848_000 as Weight)
+			// Standard Error: 1_028_000
+			.saturating_add((934_213_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(618_423_000 as Weight)
-			// Standard Error: 231_000
-			.saturating_add((153_218_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(6 as Weight))
+		(602_494_000 as Weight)
+			// Standard Error: 255_000
+			.saturating_add((152_885_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_transfer(r: u32, ) -> Weight {
-		(76_247_000 as Weight)
-			// Standard Error: 2_153_000
-			.saturating_add((5_509_779_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(0 as Weight)
+			// Standard Error: 1_746_000
+			.saturating_add((5_264_601_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 8_294_000
-			.saturating_add((11_951_311_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(6 as Weight))
+			// Standard Error: 13_325_000
+			.saturating_add((11_706_784_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((200 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_call_per_code_transfer_input_output_kb(c: u32, t: u32, i: u32, o: u32, ) -> Weight {
-		(10_875_657_000 as Weight)
-			// Standard Error: 253_000
-			.saturating_add((392_140_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 105_395_000
-			.saturating_add((3_581_966_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 33_000
-			.saturating_add((59_352_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 35_000
-			.saturating_add((79_149_000 as Weight).saturating_mul(o as Weight))
-			.saturating_add(T::DbWeight::get().reads(206 as Weight))
+		(9_518_851_000 as Weight)
+			// Standard Error: 349_000
+			.saturating_add((391_414_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 145_480_000
+			.saturating_add((4_113_632_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 46_000
+			.saturating_add((60_888_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 49_000
+			.saturating_add((79_489_000 as Weight).saturating_mul(o as Weight))
+			.saturating_add(T::DbWeight::get().reads(205 as Weight))
 			.saturating_add(T::DbWeight::get().writes(101 as Weight))
 			.saturating_add(T::DbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 31_795_000
-			.saturating_add((21_908_561_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(6 as Weight))
+			// Standard Error: 39_418_000
+			.saturating_add((21_356_322_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes((300 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_instantiate_per_code_input_output_salt_kb(c: u32, i: u32, o: u32, s: u32, ) -> Weight {
-		(10_580_308_000 as Weight)
-			// Standard Error: 611_000
-			.saturating_add((875_153_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 86_000
-			.saturating_add((62_540_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 86_000
-			.saturating_add((83_080_000 as Weight).saturating_mul(o as Weight))
-			// Standard Error: 86_000
-			.saturating_add((350_970_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(T::DbWeight::get().reads(207 as Weight))
+		(12_419_243_000 as Weight)
+			// Standard Error: 1_454_000
+			.saturating_add((848_075_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 206_000
+			.saturating_add((61_500_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 206_000
+			.saturating_add((82_895_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 206_000
+			.saturating_add((236_893_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(206 as Weight))
 			.saturating_add(T::DbWeight::get().writes(204 as Weight))
 	}
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(143_987_000 as Weight)
-			// Standard Error: 90_000
-			.saturating_add((232_215_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(129_427_000 as Weight)
+			// Standard Error: 110_000
+			.saturating_add((227_721_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(762_075_000 as Weight)
-			// Standard Error: 64_000
-			.saturating_add((475_112_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(0 as Weight)
+			// Standard Error: 202_000
+			.saturating_add((494_366_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(145_456_000 as Weight)
-			// Standard Error: 203_000
-			.saturating_add((241_831_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(133_222_000 as Weight)
+			// Standard Error: 330_000
+			.saturating_add((237_008_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(660_371_000 as Weight)
-			// Standard Error: 30_000
-			.saturating_add((342_147_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(1_245_757_000 as Weight)
+			// Standard Error: 77_000
+			.saturating_add((339_755_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(149_472_000 as Weight)
-			// Standard Error: 101_000
-			.saturating_add((212_899_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(133_091_000 as Weight)
+			// Standard Error: 126_000
+			.saturating_add((208_234_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(643_371_000 as Weight)
-			// Standard Error: 31_000
-			.saturating_add((159_244_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(799_510_000 as Weight)
+			// Standard Error: 49_000
+			.saturating_add((158_583_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(147_732_000 as Weight)
-			// Standard Error: 91_000
-			.saturating_add((210_975_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(130_180_000 as Weight)
+			// Standard Error: 83_000
+			.saturating_add((206_505_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(684_085_000 as Weight)
-			// Standard Error: 38_000
-			.saturating_add((159_213_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(965_700_000 as Weight)
+			// Standard Error: 64_000
+			.saturating_add((154_387_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(25_332_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((3_087_000 as Weight).saturating_mul(r as Weight))
+		(20_233_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((3_445_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(27_404_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((136_046_000 as Weight).saturating_mul(r as Weight))
+		(29_798_000 as Weight)
+			// Standard Error: 1_137_000
+			.saturating_add((137_787_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(27_422_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((204_925_000 as Weight).saturating_mul(r as Weight))
+		(22_914_000 as Weight)
+			// Standard Error: 701_000
+			.saturating_add((205_918_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(25_289_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((12_375_000 as Weight).saturating_mul(r as Weight))
+		(20_225_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((12_545_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(25_278_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((11_447_000 as Weight).saturating_mul(r as Weight))
+		(20_196_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((12_677_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(25_283_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((5_615_000 as Weight).saturating_mul(r as Weight))
+		(20_204_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((6_920_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(25_377_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((13_248_000 as Weight).saturating_mul(r as Weight))
+		(20_220_000 as Weight)
+			// Standard Error: 30_000
+			.saturating_add((15_209_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(25_318_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((14_962_000 as Weight).saturating_mul(r as Weight))
+		(20_262_000 as Weight)
+			// Standard Error: 37_000
+			.saturating_add((15_909_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(37_040_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((150_000 as Weight).saturating_mul(e as Weight))
+		(35_644_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((82_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(25_529_000 as Weight)
-			// Standard Error: 114_000
-			.saturating_add((91_613_000 as Weight).saturating_mul(r as Weight))
+		(20_566_000 as Weight)
+			// Standard Error: 79_000
+			.saturating_add((91_776_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(33_242_000 as Weight)
-			// Standard Error: 188_000
-			.saturating_add((191_383_000 as Weight).saturating_mul(r as Weight))
+		(28_243_000 as Weight)
+			// Standard Error: 207_000
+			.saturating_add((169_342_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(228_146_000 as Weight)
+		(206_233_000 as Weight)
 			// Standard Error: 4_000
-			.saturating_add((3_917_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((4_685_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(44_304_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((3_146_000 as Weight).saturating_mul(r as Weight))
+		(37_775_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((3_553_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(44_314_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((3_474_000 as Weight).saturating_mul(r as Weight))
+		(37_836_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((3_745_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(44_234_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((4_725_000 as Weight).saturating_mul(r as Weight))
+		(37_816_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((4_929_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(28_754_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((7_898_000 as Weight).saturating_mul(r as Weight))
+		(23_385_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((7_494_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(28_737_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((8_531_000 as Weight).saturating_mul(r as Weight))
+		(23_334_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((8_306_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(27_338_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((3_499_000 as Weight).saturating_mul(r as Weight))
+		(22_311_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((3_548_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(25_943_000 as Weight)
-			// Standard Error: 299_000
-			.saturating_add((2_094_164_000 as Weight).saturating_mul(r as Weight))
+		(20_789_000 as Weight)
+			// Standard Error: 269_000
+			.saturating_add((2_070_923_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(25_269_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((5_135_000 as Weight).saturating_mul(r as Weight))
+		(20_196_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((5_132_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(25_281_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((5_069_000 as Weight).saturating_mul(r as Weight))
+		(20_215_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((5_053_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(25_243_000 as Weight)
-			// Standard Error: 9_000
-			.saturating_add((5_809_000 as Weight).saturating_mul(r as Weight))
+		(20_257_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((5_891_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(25_259_000 as Weight)
+		(20_263_000 as Weight)
 			// Standard Error: 13_000
-			.saturating_add((5_120_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((5_438_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(25_249_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((5_167_000 as Weight).saturating_mul(r as Weight))
+		(20_214_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((4_882_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(25_247_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((5_118_000 as Weight).saturating_mul(r as Weight))
+		(20_152_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((4_946_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(25_285_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((5_051_000 as Weight).saturating_mul(r as Weight))
+		(20_216_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((4_974_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(25_312_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((7_207_000 as Weight).saturating_mul(r as Weight))
+		(20_195_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((7_463_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(25_311_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((6_982_000 as Weight).saturating_mul(r as Weight))
+		(20_170_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((7_425_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(25_327_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((7_009_000 as Weight).saturating_mul(r as Weight))
+		(20_208_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((7_424_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(25_318_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((7_180_000 as Weight).saturating_mul(r as Weight))
+		(20_244_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((7_391_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(25_330_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((7_065_000 as Weight).saturating_mul(r as Weight))
+		(20_218_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((7_384_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(25_284_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((7_192_000 as Weight).saturating_mul(r as Weight))
+		(20_208_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((7_392_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(25_310_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((7_080_000 as Weight).saturating_mul(r as Weight))
+		(20_201_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((7_375_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(25_262_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((7_079_000 as Weight).saturating_mul(r as Weight))
+		(20_213_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((7_460_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(25_295_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((7_151_000 as Weight).saturating_mul(r as Weight))
+		(20_141_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((7_498_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(25_326_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((7_200_000 as Weight).saturating_mul(r as Weight))
+		(20_213_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((7_373_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(25_320_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((7_020_000 as Weight).saturating_mul(r as Weight))
+		(20_137_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((7_325_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(25_303_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((7_189_000 as Weight).saturating_mul(r as Weight))
+		(20_148_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((7_389_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(25_311_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((7_054_000 as Weight).saturating_mul(r as Weight))
+		(20_152_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((7_264_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(25_342_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((12_860_000 as Weight).saturating_mul(r as Weight))
+		(20_153_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((13_755_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(25_307_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((12_162_000 as Weight).saturating_mul(r as Weight))
+		(20_135_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((12_845_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(25_354_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((12_855_000 as Weight).saturating_mul(r as Weight))
+		(20_203_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((13_792_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(25_319_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((11_982_000 as Weight).saturating_mul(r as Weight))
+		(20_110_000 as Weight)
+			// Standard Error: 30_000
+			.saturating_add((12_880_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(25_351_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((7_124_000 as Weight).saturating_mul(r as Weight))
+		(20_098_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((7_416_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(25_333_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((7_060_000 as Weight).saturating_mul(r as Weight))
+		(20_156_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((7_428_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(25_332_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((7_080_000 as Weight).saturating_mul(r as Weight))
+		(20_163_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((7_343_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(25_279_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((7_193_000 as Weight).saturating_mul(r as Weight))
+		(20_167_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((7_610_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(25_315_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((7_157_000 as Weight).saturating_mul(r as Weight))
+		(20_192_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((7_660_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(25_354_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((7_238_000 as Weight).saturating_mul(r as Weight))
+		(20_162_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((7_652_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(25_353_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((7_160_000 as Weight).saturating_mul(r as Weight))
+		(20_151_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((7_890_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(25_363_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((7_192_000 as Weight).saturating_mul(r as Weight))
+		(20_154_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((7_434_000 as Weight).saturating_mul(r as Weight))
 	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn on_initialize() -> Weight {
-		(3_610_000 as Weight)
+		(3_676_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 	}
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((2_307_000 as Weight).saturating_mul(k as Weight))
+			.saturating_add((2_259_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
-		(18_635_000 as Weight)
-			// Standard Error: 8_000
-			.saturating_add((33_246_000 as Weight).saturating_mul(q as Weight))
+		(0 as Weight)
+			// Standard Error: 33_000
+			.saturating_add((35_157_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn instrument(c: u32, ) -> Weight {
-		(36_950_000 as Weight)
-			// Standard Error: 198_000
-			.saturating_add((116_526_000 as Weight).saturating_mul(c as Weight))
-			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-	}
-	fn update_schedule() -> Weight {
-		(28_095_000 as Weight)
+		(42_341_000 as Weight)
+			// Standard Error: 190_000
+			.saturating_add((95_696_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight {
-		(230_039_000 as Weight)
-			// Standard Error: 143_000
-			.saturating_add((157_483_000 as Weight).saturating_mul(c as Weight))
+		(178_191_000 as Weight)
+			// Standard Error: 141_000
+			.saturating_add((135_736_000 as Weight).saturating_mul(c as Weight))
 			// Standard Error: 9_000
-			.saturating_add((2_992_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
+			.saturating_add((1_867_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn instantiate(c: u32, s: u32, ) -> Weight {
-		(203_983_000 as Weight)
+		(183_874_000 as Weight)
 			// Standard Error: 11_000
-			.saturating_add((8_639_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((8_659_000 as Weight).saturating_mul(c as Weight))
 			// Standard Error: 1_000
-			.saturating_add((2_918_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
+			.saturating_add((1_781_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn call(c: u32, ) -> Weight {
-		(198_905_000 as Weight)
+		(186_051_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((3_913_000 as Weight).saturating_mul(c as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add((3_919_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn claim_surcharge(c: u32, ) -> Weight {
-		(132_586_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((4_732_000 as Weight).saturating_mul(c as Weight))
+		(133_967_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((4_733_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn seal_caller(r: u32, ) -> Weight {
-		(179_629_000 as Weight)
-			// Standard Error: 318_000
-			.saturating_add((250_628_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(131_758_000 as Weight)
+			// Standard Error: 361_000
+			.saturating_add((249_131_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_address(r: u32, ) -> Weight {
-		(144_806_000 as Weight)
-			// Standard Error: 71_000
-			.saturating_add((251_588_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(141_100_000 as Weight)
+			// Standard Error: 73_000
+			.saturating_add((245_593_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(151_919_000 as Weight)
-			// Standard Error: 90_000
-			.saturating_add((243_733_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(141_578_000 as Weight)
+			// Standard Error: 76_000
+			.saturating_add((240_505_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_balance(r: u32, ) -> Weight {
-		(157_448_000 as Weight)
-			// Standard Error: 211_000
-			.saturating_add((559_875_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(144_329_000 as Weight)
+			// Standard Error: 197_000
+			.saturating_add((529_903_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(145_161_000 as Weight)
-			// Standard Error: 71_000
-			.saturating_add((246_729_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(137_318_000 as Weight)
+			// Standard Error: 77_000
+			.saturating_add((239_623_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(147_920_000 as Weight)
-			// Standard Error: 60_000
-			.saturating_add((245_135_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(138_343_000 as Weight)
+			// Standard Error: 260_000
+			.saturating_add((241_997_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(141_105_000 as Weight)
-			// Standard Error: 138_000
-			.saturating_add((247_840_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(138_989_000 as Weight)
+			// Standard Error: 77_000
+			.saturating_add((239_424_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(147_393_000 as Weight)
-			// Standard Error: 77_000
-			.saturating_add((247_593_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(140_118_000 as Weight)
+			// Standard Error: 83_000
+			.saturating_add((240_866_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_block_number(r: u32, ) -> Weight {
-		(151_560_000 as Weight)
-			// Standard Error: 92_000
-			.saturating_add((242_469_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(139_962_000 as Weight)
+			// Standard Error: 69_000
+			.saturating_add((239_267_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_now(r: u32, ) -> Weight {
-		(145_917_000 as Weight)
-			// Standard Error: 80_000
-			.saturating_add((244_335_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(139_652_000 as Weight)
+			// Standard Error: 69_000
+			.saturating_add((240_282_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_rent_params(r: u32, ) -> Weight {
-		(150_399_000 as Weight)
-			// Standard Error: 90_000
-			.saturating_add((381_505_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(136_806_000 as Weight)
+			// Standard Error: 104_000
+			.saturating_add((359_911_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(152_906_000 as Weight)
-			// Standard Error: 418_000
-			.saturating_add((486_338_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
+		(148_086_000 as Weight)
+			// Standard Error: 116_000
+			.saturating_add((470_271_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_gas(r: u32, ) -> Weight {
-		(130_020_000 as Weight)
-			// Standard Error: 48_000
-			.saturating_add((120_792_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(123_560_000 as Weight)
+			// Standard Error: 295_000
+			.saturating_add((119_119_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_input(r: u32, ) -> Weight {
-		(142_031_000 as Weight)
+		(132_420_000 as Weight)
 			// Standard Error: 83_000
-			.saturating_add((7_205_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add((6_835_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(151_770_000 as Weight)
+		(142_119_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((247_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add((245_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_return(r: u32, ) -> Weight {
-		(131_023_000 as Weight)
-			// Standard Error: 69_000
-			.saturating_add((4_823_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(121_030_000 as Weight)
+			// Standard Error: 68_000
+			.saturating_add((4_444_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(142_885_000 as Weight)
+		(131_704_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((751_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add((756_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_terminate(r: u32, ) -> Weight {
-		(142_165_000 as Weight)
-			// Standard Error: 100_000
-			.saturating_add((99_133_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(132_544_000 as Weight)
+			// Standard Error: 113_000
+			.saturating_add((97_343_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_terminate_per_code_kb(c: u32, ) -> Weight {
-		(243_348_000 as Weight)
-			// Standard Error: 6_000
-			.saturating_add((8_560_000 as Weight).saturating_mul(c as Weight))
-			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
+		(234_751_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((8_482_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}
 	fn seal_restore_to(r: u32, ) -> Weight {
-		(171_766_000 as Weight)
-			// Standard Error: 372_000
-			.saturating_add((100_243_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(156_439_000 as Weight)
+			// Standard Error: 1_068_000
+			.saturating_add((96_724_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((4 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((5 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_restore_to_per_code_kb_delta(c: u32, t: u32, d: u32, ) -> Weight {
-		(112_646_000 as Weight)
-			// Standard Error: 142_000
-			.saturating_add((7_922_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 142_000
-			.saturating_add((3_590_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 1_255_000
-			.saturating_add((3_716_501_000 as Weight).saturating_mul(d as Weight))
-			.saturating_add(RocksDbWeight::get().reads(8 as Weight))
+		(101_920_000 as Weight)
+			// Standard Error: 162_000
+			.saturating_add((7_588_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 162_000
+			.saturating_add((3_475_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 1_431_000
+			.saturating_add((3_733_137_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(7 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
 	}
 	fn seal_random(r: u32, ) -> Weight {
-		(152_470_000 as Weight)
-			// Standard Error: 146_000
-			.saturating_add((619_676_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
+		(151_598_000 as Weight)
+			// Standard Error: 168_000
+			.saturating_add((608_967_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(151_008_000 as Weight)
-			// Standard Error: 167_000
-			.saturating_add((899_677_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(149_224_000 as Weight)
+			// Standard Error: 205_000
+			.saturating_add((896_074_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_227_526_000 as Weight)
-			// Standard Error: 2_767_000
-			.saturating_add((586_284_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 545_000
-			.saturating_add((247_578_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(1_198_650_000 as Weight)
+			// Standard Error: 2_742_000
+			.saturating_add((566_152_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 540_000
+			.saturating_add((248_898_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(142_734_000 as Weight)
-			// Standard Error: 53_000
-			.saturating_add((167_026_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(133_149_000 as Weight)
+			// Standard Error: 72_000
+			.saturating_add((163_281_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn seal_debug_message(r: u32, ) -> Weight {
+		(126_413_000 as Weight)
+			// Standard Error: 127_000
+			.saturating_add((128_176_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(21_198_000 as Weight)
-			// Standard Error: 2_062_000
-			.saturating_add((3_836_800_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(0 as Weight)
+			// Standard Error: 1_710_000
+			.saturating_add((3_933_779_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(589_829_000 as Weight)
-			// Standard Error: 223_000
-			.saturating_add((71_242_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
+		(582_721_000 as Weight)
+			// Standard Error: 228_000
+			.saturating_add((71_341_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn seal_clear_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 1_950_000
-			.saturating_add((1_267_479_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			// Standard Error: 2_470_000
+			.saturating_add((1_281_241_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_get_storage(r: u32, ) -> Weight {
-		(3_466_000 as Weight)
-			// Standard Error: 1_248_000
-			.saturating_add((920_416_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(11_848_000 as Weight)
+			// Standard Error: 1_028_000
+			.saturating_add((934_213_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(618_423_000 as Weight)
-			// Standard Error: 231_000
-			.saturating_add((153_218_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
+		(602_494_000 as Weight)
+			// Standard Error: 255_000
+			.saturating_add((152_885_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_transfer(r: u32, ) -> Weight {
-		(76_247_000 as Weight)
-			// Standard Error: 2_153_000
-			.saturating_add((5_509_779_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(0 as Weight)
+			// Standard Error: 1_746_000
+			.saturating_add((5_264_601_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 8_294_000
-			.saturating_add((11_951_311_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
+			// Standard Error: 13_325_000
+			.saturating_add((11_706_784_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((200 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_call_per_code_transfer_input_output_kb(c: u32, t: u32, i: u32, o: u32, ) -> Weight {
-		(10_875_657_000 as Weight)
-			// Standard Error: 253_000
-			.saturating_add((392_140_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 105_395_000
-			.saturating_add((3_581_966_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 33_000
-			.saturating_add((59_352_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 35_000
-			.saturating_add((79_149_000 as Weight).saturating_mul(o as Weight))
-			.saturating_add(RocksDbWeight::get().reads(206 as Weight))
+		(9_518_851_000 as Weight)
+			// Standard Error: 349_000
+			.saturating_add((391_414_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 145_480_000
+			.saturating_add((4_113_632_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 46_000
+			.saturating_add((60_888_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 49_000
+			.saturating_add((79_489_000 as Weight).saturating_mul(o as Weight))
+			.saturating_add(RocksDbWeight::get().reads(205 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(101 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 31_795_000
-			.saturating_add((21_908_561_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
+			// Standard Error: 39_418_000
+			.saturating_add((21_356_322_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((300 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_instantiate_per_code_input_output_salt_kb(c: u32, i: u32, o: u32, s: u32, ) -> Weight {
-		(10_580_308_000 as Weight)
-			// Standard Error: 611_000
-			.saturating_add((875_153_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 86_000
-			.saturating_add((62_540_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 86_000
-			.saturating_add((83_080_000 as Weight).saturating_mul(o as Weight))
-			// Standard Error: 86_000
-			.saturating_add((350_970_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(RocksDbWeight::get().reads(207 as Weight))
+		(12_419_243_000 as Weight)
+			// Standard Error: 1_454_000
+			.saturating_add((848_075_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 206_000
+			.saturating_add((61_500_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 206_000
+			.saturating_add((82_895_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 206_000
+			.saturating_add((236_893_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(206 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(204 as Weight))
 	}
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(143_987_000 as Weight)
-			// Standard Error: 90_000
-			.saturating_add((232_215_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(129_427_000 as Weight)
+			// Standard Error: 110_000
+			.saturating_add((227_721_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(762_075_000 as Weight)
-			// Standard Error: 64_000
-			.saturating_add((475_112_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(0 as Weight)
+			// Standard Error: 202_000
+			.saturating_add((494_366_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(145_456_000 as Weight)
-			// Standard Error: 203_000
-			.saturating_add((241_831_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(133_222_000 as Weight)
+			// Standard Error: 330_000
+			.saturating_add((237_008_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(660_371_000 as Weight)
-			// Standard Error: 30_000
-			.saturating_add((342_147_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(1_245_757_000 as Weight)
+			// Standard Error: 77_000
+			.saturating_add((339_755_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(149_472_000 as Weight)
-			// Standard Error: 101_000
-			.saturating_add((212_899_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(133_091_000 as Weight)
+			// Standard Error: 126_000
+			.saturating_add((208_234_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(643_371_000 as Weight)
-			// Standard Error: 31_000
-			.saturating_add((159_244_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(799_510_000 as Weight)
+			// Standard Error: 49_000
+			.saturating_add((158_583_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(147_732_000 as Weight)
-			// Standard Error: 91_000
-			.saturating_add((210_975_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(130_180_000 as Weight)
+			// Standard Error: 83_000
+			.saturating_add((206_505_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(684_085_000 as Weight)
-			// Standard Error: 38_000
-			.saturating_add((159_213_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(965_700_000 as Weight)
+			// Standard Error: 64_000
+			.saturating_add((154_387_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(25_332_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((3_087_000 as Weight).saturating_mul(r as Weight))
+		(20_233_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((3_445_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(27_404_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((136_046_000 as Weight).saturating_mul(r as Weight))
+		(29_798_000 as Weight)
+			// Standard Error: 1_137_000
+			.saturating_add((137_787_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(27_422_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((204_925_000 as Weight).saturating_mul(r as Weight))
+		(22_914_000 as Weight)
+			// Standard Error: 701_000
+			.saturating_add((205_918_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(25_289_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((12_375_000 as Weight).saturating_mul(r as Weight))
+		(20_225_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((12_545_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(25_278_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((11_447_000 as Weight).saturating_mul(r as Weight))
+		(20_196_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((12_677_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(25_283_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((5_615_000 as Weight).saturating_mul(r as Weight))
+		(20_204_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((6_920_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(25_377_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((13_248_000 as Weight).saturating_mul(r as Weight))
+		(20_220_000 as Weight)
+			// Standard Error: 30_000
+			.saturating_add((15_209_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(25_318_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((14_962_000 as Weight).saturating_mul(r as Weight))
+		(20_262_000 as Weight)
+			// Standard Error: 37_000
+			.saturating_add((15_909_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(37_040_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((150_000 as Weight).saturating_mul(e as Weight))
+		(35_644_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((82_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(25_529_000 as Weight)
-			// Standard Error: 114_000
-			.saturating_add((91_613_000 as Weight).saturating_mul(r as Weight))
+		(20_566_000 as Weight)
+			// Standard Error: 79_000
+			.saturating_add((91_776_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(33_242_000 as Weight)
-			// Standard Error: 188_000
-			.saturating_add((191_383_000 as Weight).saturating_mul(r as Weight))
+		(28_243_000 as Weight)
+			// Standard Error: 207_000
+			.saturating_add((169_342_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(228_146_000 as Weight)
+		(206_233_000 as Weight)
 			// Standard Error: 4_000
-			.saturating_add((3_917_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((4_685_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(44_304_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((3_146_000 as Weight).saturating_mul(r as Weight))
+		(37_775_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((3_553_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(44_314_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((3_474_000 as Weight).saturating_mul(r as Weight))
+		(37_836_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((3_745_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(44_234_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((4_725_000 as Weight).saturating_mul(r as Weight))
+		(37_816_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((4_929_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(28_754_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((7_898_000 as Weight).saturating_mul(r as Weight))
+		(23_385_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((7_494_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(28_737_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((8_531_000 as Weight).saturating_mul(r as Weight))
+		(23_334_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((8_306_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(27_338_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((3_499_000 as Weight).saturating_mul(r as Weight))
+		(22_311_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((3_548_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(25_943_000 as Weight)
-			// Standard Error: 299_000
-			.saturating_add((2_094_164_000 as Weight).saturating_mul(r as Weight))
+		(20_789_000 as Weight)
+			// Standard Error: 269_000
+			.saturating_add((2_070_923_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(25_269_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((5_135_000 as Weight).saturating_mul(r as Weight))
+		(20_196_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((5_132_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(25_281_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((5_069_000 as Weight).saturating_mul(r as Weight))
+		(20_215_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((5_053_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(25_243_000 as Weight)
-			// Standard Error: 9_000
-			.saturating_add((5_809_000 as Weight).saturating_mul(r as Weight))
+		(20_257_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((5_891_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(25_259_000 as Weight)
+		(20_263_000 as Weight)
 			// Standard Error: 13_000
-			.saturating_add((5_120_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((5_438_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(25_249_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((5_167_000 as Weight).saturating_mul(r as Weight))
+		(20_214_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((4_882_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(25_247_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((5_118_000 as Weight).saturating_mul(r as Weight))
+		(20_152_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((4_946_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(25_285_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((5_051_000 as Weight).saturating_mul(r as Weight))
+		(20_216_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((4_974_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(25_312_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((7_207_000 as Weight).saturating_mul(r as Weight))
+		(20_195_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((7_463_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(25_311_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((6_982_000 as Weight).saturating_mul(r as Weight))
+		(20_170_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((7_425_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(25_327_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((7_009_000 as Weight).saturating_mul(r as Weight))
+		(20_208_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((7_424_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(25_318_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((7_180_000 as Weight).saturating_mul(r as Weight))
+		(20_244_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((7_391_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(25_330_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((7_065_000 as Weight).saturating_mul(r as Weight))
+		(20_218_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((7_384_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(25_284_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((7_192_000 as Weight).saturating_mul(r as Weight))
+		(20_208_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((7_392_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(25_310_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((7_080_000 as Weight).saturating_mul(r as Weight))
+		(20_201_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((7_375_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(25_262_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((7_079_000 as Weight).saturating_mul(r as Weight))
+		(20_213_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((7_460_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(25_295_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((7_151_000 as Weight).saturating_mul(r as Weight))
+		(20_141_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((7_498_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(25_326_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((7_200_000 as Weight).saturating_mul(r as Weight))
+		(20_213_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((7_373_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(25_320_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((7_020_000 as Weight).saturating_mul(r as Weight))
+		(20_137_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((7_325_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(25_303_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((7_189_000 as Weight).saturating_mul(r as Weight))
+		(20_148_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((7_389_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(25_311_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((7_054_000 as Weight).saturating_mul(r as Weight))
+		(20_152_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((7_264_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(25_342_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((12_860_000 as Weight).saturating_mul(r as Weight))
+		(20_153_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((13_755_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(25_307_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((12_162_000 as Weight).saturating_mul(r as Weight))
+		(20_135_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((12_845_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(25_354_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((12_855_000 as Weight).saturating_mul(r as Weight))
+		(20_203_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((13_792_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(25_319_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((11_982_000 as Weight).saturating_mul(r as Weight))
+		(20_110_000 as Weight)
+			// Standard Error: 30_000
+			.saturating_add((12_880_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(25_351_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((7_124_000 as Weight).saturating_mul(r as Weight))
+		(20_098_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((7_416_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(25_333_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((7_060_000 as Weight).saturating_mul(r as Weight))
+		(20_156_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((7_428_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(25_332_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((7_080_000 as Weight).saturating_mul(r as Weight))
+		(20_163_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((7_343_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(25_279_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((7_193_000 as Weight).saturating_mul(r as Weight))
+		(20_167_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((7_610_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(25_315_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((7_157_000 as Weight).saturating_mul(r as Weight))
+		(20_192_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((7_660_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(25_354_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((7_238_000 as Weight).saturating_mul(r as Weight))
+		(20_162_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((7_652_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(25_353_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((7_160_000 as Weight).saturating_mul(r as Weight))
+		(20_151_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((7_890_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(25_363_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((7_192_000 as Weight).saturating_mul(r as Weight))
+		(20_154_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((7_434_000 as Weight).saturating_mul(r as Weight))
 	}
 }

From a76cc733f4fe895d8be002ce13fdae0ca1ba555e Mon Sep 17 00:00:00 2001
From: Roman Proskuryakov <humbug@deeptown.org>
Date: Thu, 13 May 2021 20:16:32 +0000
Subject: [PATCH 0740/1194] Fix warning: trait objects without an explicit dyn
 are deprecated (#8798)

---
 client/chain-spec/src/extension.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/chain-spec/src/extension.rs b/client/chain-spec/src/extension.rs
index c0352529f867..2a6126e4ce2c 100644
--- a/client/chain-spec/src/extension.rs
+++ b/client/chain-spec/src/extension.rs
@@ -233,7 +233,7 @@ impl<B, E> Extension for Forks<B, E> where
 
 	fn get<T: 'static>(&self) -> Option<&T> {
 		match TypeId::of::<T>() {
-			x if x == TypeId::of::<E>() => Any::downcast_ref(&self.base),
+			x if x == TypeId::of::<E>() => <dyn Any>::downcast_ref(&self.base),
 			_ => self.base.get(),
 		}
 	}
@@ -252,7 +252,7 @@ impl<B, E> Extension for Forks<B, E> where
 		<<Self::Forks as IsForks>::Extension as Group>::Fork: Extension,
 	{
 		if TypeId::of::<BlockNumber>() == TypeId::of::<B>() {
-			Any::downcast_ref(&self.for_type::<T>()?).cloned()
+			<dyn Any>::downcast_ref(&self.for_type::<T>()?).cloned()
 		} else {
 			self.get::<Forks<BlockNumber, <Self::Forks as IsForks>::Extension>>()?
 				.for_type()
@@ -275,7 +275,7 @@ impl <E: Extension> GetExtension for E {
 /// Helper function that queries an extension by type from `GetExtension`
 /// trait object.
 pub fn get_extension<T: 'static>(e: &dyn GetExtension) -> Option<&T> {
-	Any::downcast_ref(GetExtension::get_any(e, TypeId::of::<T>()))
+	<dyn Any>::downcast_ref(GetExtension::get_any(e, TypeId::of::<T>()))
 }
 
 #[cfg(test)]

From bcd649ffca9efc93f8b4ac1506ec8117b71e1aac Mon Sep 17 00:00:00 2001
From: Keith Yeung <kungfukeith11@gmail.com>
Date: Fri, 14 May 2021 02:44:29 -0700
Subject: [PATCH 0741/1194] Implement StorageNMap (#8635)

* Implement StorageNMap

* Change copyright date to 2021

* Rewrite keys to use impl_for_tuples instead of recursion

* Implement prefix iteration on StorageNMap

* Implement EncodeLike for key arguments

* Rename KeyGenerator::Arg to KeyGenerator::KArg

* Support StorageNMap in decl_storage and #[pallet::storage] macros

* Use StorageNMap in assets pallet

* Support migrate_keys in StorageNMap

* Reduce line characters on select files

* Refactor crate imports in decl_storage macros

* Some more line char reductions and doc comment update

* Update UI test expectations

* Revert whitespace changes to untouched files

* Generate Key struct instead of a 1-tuple when only 1 pair of key and hasher is provided

* Revert formatting changes to unrelated files

* Introduce KeyGeneratorInner

* Add tests for StorageNMap in FRAMEv2 pallet macro

* Small fixes to unit tests for StorageNMap

* Bump runtime metadata version

* Remove unused import

* Update tests to use runtime metadata v13

* Introduce and use EncodeLikeTuple as a trait bound for KArg

* Add some rustdocs

* Revert usage of StorageNMap in assets pallet

* Make use of ext::PunctuatedTrailing

* Add rustdoc for final_hash

* Fix StorageNMap proc macro expansions for single key cases

* Create associated const in KeyGenerator for hasher metadata

* Refactor code according to comments from Basti

* Add module docs for generator/nmap.rs

* Re-export storage::Key as NMapKey in pallet prelude

* Seal the EncodeLikeTuple trait

* Extract sealing code out of key.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 frame/metadata/src/lib.rs                     |  17 +-
 .../procedural/src/pallet/expand/storage.rs   |  47 +
 .../procedural/src/pallet/parse/storage.rs    |  79 +-
 .../src/storage/genesis_config/builder_def.rs |  15 +
 .../genesis_config/genesis_config_def.rs      |   4 +
 .../src/storage/genesis_config/mod.rs         |   6 +-
 .../support/procedural/src/storage/getters.rs |  18 +-
 .../procedural/src/storage/instance_trait.rs  |   3 +-
 .../procedural/src/storage/metadata.rs        |  24 +-
 frame/support/procedural/src/storage/mod.rs   |  87 +-
 frame/support/procedural/src/storage/parse.rs |  34 +-
 .../src/storage/print_pallet_upgrade.rs       |   9 +
 .../procedural/src/storage/storage_struct.rs  |  40 +-
 frame/support/src/lib.rs                      |   9 +-
 frame/support/src/storage/generator/mod.rs    |   2 +
 frame/support/src/storage/generator/nmap.rs   | 541 ++++++++++
 frame/support/src/storage/mod.rs              | 186 +++-
 frame/support/src/storage/types/key.rs        | 957 +++++++++++++++++
 frame/support/src/storage/types/mod.rs        |  19 +-
 frame/support/src/storage/types/nmap.rs       | 995 ++++++++++++++++++
 frame/support/test/tests/construct_runtime.rs |   2 +-
 frame/support/test/tests/pallet.rs            |  87 +-
 .../test/tests/pallet_compatibility.rs        |   2 +-
 .../tests/pallet_compatibility_instance.rs    |   2 +-
 frame/support/test/tests/pallet_instance.rs   |  73 +-
 .../pallet_ui/storage_not_storage_type.stderr |   2 +-
 26 files changed, 3210 insertions(+), 50 deletions(-)
 create mode 100755 frame/support/src/storage/generator/nmap.rs
 create mode 100755 frame/support/src/storage/types/key.rs
 create mode 100755 frame/support/src/storage/types/nmap.rs

diff --git a/frame/metadata/src/lib.rs b/frame/metadata/src/lib.rs
index a63da82ca00d..ba232a88f11c 100644
--- a/frame/metadata/src/lib.rs
+++ b/frame/metadata/src/lib.rs
@@ -300,6 +300,11 @@ pub enum StorageEntryType {
 		value: DecodeDifferentStr,
 		key2_hasher: StorageHasher,
 	},
+	NMap {
+		keys: DecodeDifferentArray<&'static str, StringBuf>,
+		hashers: DecodeDifferentArray<StorageHasher>,
+		value: DecodeDifferentStr,
+	},
 }
 
 /// A storage entry modifier.
@@ -364,8 +369,10 @@ pub enum RuntimeMetadata {
 	V10(RuntimeMetadataDeprecated),
 	/// Version 11 for runtime metadata. No longer used.
 	V11(RuntimeMetadataDeprecated),
-	/// Version 12 for runtime metadata.
-	V12(RuntimeMetadataV12),
+	/// Version 12 for runtime metadata. No longer used.
+	V12(RuntimeMetadataDeprecated),
+	/// Version 13 for runtime metadata.
+	V13(RuntimeMetadataV13),
 }
 
 /// Enum that should fail.
@@ -389,7 +396,7 @@ impl Decode for RuntimeMetadataDeprecated {
 /// The metadata of a runtime.
 #[derive(Eq, Encode, PartialEq, RuntimeDebug)]
 #[cfg_attr(feature = "std", derive(Decode, Serialize))]
-pub struct RuntimeMetadataV12 {
+pub struct RuntimeMetadataV13 {
 	/// Metadata of all the modules.
 	pub modules: DecodeDifferentArray<ModuleMetadata>,
 	/// Metadata of the extrinsic.
@@ -397,7 +404,7 @@ pub struct RuntimeMetadataV12 {
 }
 
 /// The latest version of the metadata.
-pub type RuntimeMetadataLastVersion = RuntimeMetadataV12;
+pub type RuntimeMetadataLastVersion = RuntimeMetadataV13;
 
 /// All metadata about an runtime module.
 #[derive(Clone, PartialEq, Eq, Encode, RuntimeDebug)]
@@ -425,6 +432,6 @@ impl Into<sp_core::OpaqueMetadata> for RuntimeMetadataPrefixed {
 
 impl Into<RuntimeMetadataPrefixed> for RuntimeMetadataLastVersion {
 	fn into(self) -> RuntimeMetadataPrefixed {
-		RuntimeMetadataPrefixed(META_RESERVED, RuntimeMetadata::V12(self))
+		RuntimeMetadataPrefixed(META_RESERVED, RuntimeMetadata::V13(self))
 	}
 }
diff --git a/frame/support/procedural/src/pallet/expand/storage.rs b/frame/support/procedural/src/pallet/expand/storage.rs
index 86fb84b339b2..c78e93e1d639 100644
--- a/frame/support/procedural/src/pallet/expand/storage.rs
+++ b/frame/support/procedural/src/pallet/expand/storage.rs
@@ -90,6 +90,9 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 				Metadata::DoubleMap { .. } => quote::quote_spanned!(storage.attr_span =>
 					#frame_support::storage::types::StorageDoubleMapMetadata
 				),
+				Metadata::NMap { .. } => quote::quote_spanned!(storage.attr_span =>
+					#frame_support::storage::types::StorageNMapMetadata
+				),
 			};
 
 			let ty = match &storage.metadata {
@@ -126,6 +129,24 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 							value: #frame_support::metadata::DecodeDifferent::Encode(#value),
 						}
 					)
+				},
+				Metadata::NMap { keys, value, .. } => {
+					let keys = keys
+						.iter()
+						.map(|key| clean_type_string(&quote::quote!(#key).to_string()))
+						.collect::<Vec<_>>();
+					let value = clean_type_string(&quote::quote!(#value).to_string());
+					quote::quote_spanned!(storage.attr_span =>
+						#frame_support::metadata::StorageEntryType::NMap {
+							keys: #frame_support::metadata::DecodeDifferent::Encode(&[
+								#( #keys, )*
+							]),
+							hashers: #frame_support::metadata::DecodeDifferent::Encode(
+								<#full_ident as #metadata_trait>::HASHERS,
+							),
+							value: #frame_support::metadata::DecodeDifferent::Encode(#value),
+						}
+					)
 				}
 			};
 
@@ -227,6 +248,32 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 						}
 					)
 				},
+				Metadata::NMap { keygen, value, .. } => {
+					let query = match storage.query_kind.as_ref().expect("Checked by def") {
+						QueryKind::OptionQuery => quote::quote_spanned!(storage.attr_span =>
+							Option<#value>
+						),
+						QueryKind::ValueQuery => quote::quote!(#value),
+					};
+					quote::quote_spanned!(storage.attr_span =>
+						#(#cfg_attrs)*
+						impl<#type_impl_gen> #pallet_ident<#type_use_gen> #completed_where_clause {
+							#( #docs )*
+							pub fn #getter<KArg>(key: KArg) -> #query
+							where
+								KArg: #frame_support::storage::types::EncodeLikeTuple<
+									<#keygen as #frame_support::storage::types::KeyGenerator>::KArg
+								>
+									+ #frame_support::storage::types::TupleToEncodedIter,
+							{
+								<
+									#full_ident as
+									#frame_support::storage::StorageNMap<#keygen, #value>
+								>::get(key)
+							}
+						}
+					)
+				}
 			}
 		} else {
 			Default::default()
diff --git a/frame/support/procedural/src/pallet/parse/storage.rs b/frame/support/procedural/src/pallet/parse/storage.rs
index 41ef337b7661..80c2e10a2520 100644
--- a/frame/support/procedural/src/pallet/parse/storage.rs
+++ b/frame/support/procedural/src/pallet/parse/storage.rs
@@ -50,7 +50,7 @@ impl syn::parse::Parse for PalletStorageAttr {
 }
 
 /// The value and key types used by storages. Needed to expand metadata.
-pub enum Metadata{
+pub enum Metadata {
 	Value { value: syn::GenericArgument },
 	Map { value: syn::GenericArgument, key: syn::GenericArgument },
 	DoubleMap {
@@ -58,6 +58,11 @@ pub enum Metadata{
 		key1: syn::GenericArgument,
 		key2: syn::GenericArgument
 	},
+	NMap {
+		keys: Vec<syn::Type>,
+		keygen: syn::GenericArgument,
+		value: syn::GenericArgument,
+	},
 }
 
 pub enum QueryKind {
@@ -115,6 +120,64 @@ fn retrieve_arg(
 	}
 }
 
+/// Parse the 2nd type argument to `StorageNMap` and return its keys.
+fn collect_keys(keygen: &syn::GenericArgument) -> syn::Result<Vec<syn::Type>> {
+	if let syn::GenericArgument::Type(syn::Type::Tuple(tup)) = keygen {
+		tup
+			.elems
+			.iter()
+			.map(extract_key)
+			.collect::<syn::Result<Vec<_>>>()
+	} else if let syn::GenericArgument::Type(ty) = keygen {
+		Ok(vec![extract_key(ty)?])
+	} else {
+		let msg = format!("Invalid pallet::storage, expected tuple of Key structs or Key struct");
+		Err(syn::Error::new(keygen.span(), msg))
+	}
+}
+
+/// In `Key<H, K>`, extract K and return it.
+fn extract_key(ty: &syn::Type) -> syn::Result<syn::Type> {
+	let typ = if let syn::Type::Path(typ) = ty {
+		typ
+	} else {
+		let msg = "Invalid pallet::storage, expected type path";
+		return Err(syn::Error::new(ty.span(), msg));
+	};
+
+	let key_struct = typ.path.segments.last().ok_or_else(|| {
+		let msg = "Invalid pallet::storage, expected type path with at least one segment";
+		syn::Error::new(typ.path.span(), msg)
+	})?;
+	if key_struct.ident != "Key" && key_struct.ident != "NMapKey" {
+		let msg = "Invalid pallet::storage, expected Key or NMapKey struct";
+		return Err(syn::Error::new(key_struct.ident.span(), msg));
+	}
+
+	let ty_params = if let syn::PathArguments::AngleBracketed(args) = &key_struct.arguments {
+		args
+	} else {
+		let msg = "Invalid pallet::storage, expected angle bracketed arguments";
+		return Err(syn::Error::new(key_struct.arguments.span(), msg));
+	};
+
+	if ty_params.args.len() != 2 {
+		let msg = format!("Invalid pallet::storage, unexpected number of generic arguments \
+			for Key struct, expected 2 args, found {}", ty_params.args.len());
+		return Err(syn::Error::new(ty_params.span(), msg));
+	}
+
+	let key = match &ty_params.args[1] {
+		syn::GenericArgument::Type(key_ty) => key_ty.clone(),
+		_ => {
+			let msg = "Invalid pallet::storage, expected type";
+			return Err(syn::Error::new(ty_params.args[1].span(), msg));
+		}
+	};
+
+	Ok(key)
+}
+
 impl StorageDef {
 	pub fn try_from(
 		attr_span: proc_macro2::Span,
@@ -177,11 +240,21 @@ impl StorageDef {
 					value: retrieve_arg(&typ.path.segments[0], 5)?,
 				}
 			}
+			"StorageNMap" => {
+				query_kind = retrieve_arg(&typ.path.segments[0], 3);
+				let keygen = retrieve_arg(&typ.path.segments[0], 1)?;
+				let keys = collect_keys(&keygen)?;
+				Metadata::NMap {
+					keys,
+					keygen,
+					value: retrieve_arg(&typ.path.segments[0], 2)?,
+				}
+			}
 			found => {
 				let msg = format!(
 					"Invalid pallet::storage, expected ident: `StorageValue` or \
-					`StorageMap` or `StorageDoubleMap` in order to expand metadata, found \
-					`{}`",
+					`StorageMap` or `StorageDoubleMap` or `StorageNMap` in order \
+					to expand metadata, found `{}`",
 					found,
 				);
 				return Err(syn::Error::new(item.ty.span(), msg));
diff --git a/frame/support/procedural/src/storage/genesis_config/builder_def.rs b/frame/support/procedural/src/storage/genesis_config/builder_def.rs
index 0cbfa04787f7..5b73928951cf 100644
--- a/frame/support/procedural/src/storage/genesis_config/builder_def.rs
+++ b/frame/support/procedural/src/storage/genesis_config/builder_def.rs
@@ -120,6 +120,21 @@ impl BuilderDef {
 							});
 						}}
 					},
+					StorageLineTypeDef::NMap(map) => {
+						let key_tuple = map.to_key_tuple();
+						let key_arg = if map.keys.len() == 1 {
+							quote!((k,))
+						} else {
+							quote!(k)
+						};
+						quote!{{
+							#data
+							let data: &#scrate::sp_std::vec::Vec<(#key_tuple, #value_type)> = data;
+							data.iter().for_each(|(k, v)| {
+								<#storage_struct as #scrate::#storage_trait>::insert(#key_arg, v);
+							});
+						}}
+					},
 				});
 			}
 		}
diff --git a/frame/support/procedural/src/storage/genesis_config/genesis_config_def.rs b/frame/support/procedural/src/storage/genesis_config/genesis_config_def.rs
index 300e47bc850e..c54349136cf0 100644
--- a/frame/support/procedural/src/storage/genesis_config/genesis_config_def.rs
+++ b/frame/support/procedural/src/storage/genesis_config/genesis_config_def.rs
@@ -104,6 +104,10 @@ impl GenesisConfigDef {
 
 					parse_quote!( Vec<(#key1, #key2, #value_type)> )
 				},
+				StorageLineTypeDef::NMap(map) => {
+					let key_tuple = map.to_key_tuple();
+					parse_quote!( Vec<(#key_tuple, #value_type)> )
+				}
 			};
 
 			let default = line.default_value.as_ref()
diff --git a/frame/support/procedural/src/storage/genesis_config/mod.rs b/frame/support/procedural/src/storage/genesis_config/mod.rs
index 6dfa5a13fe5b..abc7af729f06 100644
--- a/frame/support/procedural/src/storage/genesis_config/mod.rs
+++ b/frame/support/procedural/src/storage/genesis_config/mod.rs
@@ -177,10 +177,8 @@ fn impl_build_storage(
 	}
 }
 
-pub fn genesis_config_and_build_storage(
-	scrate: &TokenStream,
-	def: &DeclStorageDefExt,
-) -> TokenStream {
+pub fn genesis_config_and_build_storage(def: &DeclStorageDefExt) -> TokenStream {
+	let scrate = &def.hidden_crate;
 	let builders = BuilderDef::from_def(scrate, def);
 	if !builders.blocks.is_empty() {
 		let genesis_config = match GenesisConfigDef::from_def(def) {
diff --git a/frame/support/procedural/src/storage/getters.rs b/frame/support/procedural/src/storage/getters.rs
index 65a3519033aa..32155239acdc 100644
--- a/frame/support/procedural/src/storage/getters.rs
+++ b/frame/support/procedural/src/storage/getters.rs
@@ -21,7 +21,8 @@ use proc_macro2::TokenStream;
 use quote::quote;
 use super::{DeclStorageDefExt, StorageLineTypeDef};
 
-pub fn impl_getters(scrate: &TokenStream, def: &DeclStorageDefExt) -> TokenStream {
+pub fn impl_getters(def: &DeclStorageDefExt) -> TokenStream {
+	let scrate = &def.hidden_crate;
 	let mut getters = TokenStream::new();
 
 	for (get_fn, line) in def.storage_lines.iter()
@@ -65,6 +66,21 @@ pub fn impl_getters(scrate: &TokenStream, def: &DeclStorageDefExt) -> TokenStrea
 					}
 				}
 			},
+			StorageLineTypeDef::NMap(map) => {
+				let keygen = map.to_keygen_struct(&def.hidden_crate);
+				let value = &map.value;
+				quote!{
+					pub fn #get_fn<KArg>(key: KArg) -> #value
+					where
+						KArg: #scrate::storage::types::EncodeLikeTuple<
+							<#keygen as #scrate::storage::types::KeyGenerator>::KArg
+						>
+							+ #scrate::storage::types::TupleToEncodedIter,
+					{
+						<#storage_struct as #scrate::#storage_trait>::get(key)
+					}
+				}
+			}
 		};
 		getters.extend(getter);
 	}
diff --git a/frame/support/procedural/src/storage/instance_trait.rs b/frame/support/procedural/src/storage/instance_trait.rs
index a9e06c629904..55f6ef478054 100644
--- a/frame/support/procedural/src/storage/instance_trait.rs
+++ b/frame/support/procedural/src/storage/instance_trait.rs
@@ -34,7 +34,8 @@ struct InstanceDef {
 	index: u8,
 }
 
-pub fn decl_and_impl(scrate: &TokenStream, def: &DeclStorageDefExt) -> TokenStream {
+pub fn decl_and_impl(def: &DeclStorageDefExt) -> TokenStream {
+	let scrate = &def.hidden_crate;
 	let mut impls = TokenStream::new();
 
 	impls.extend(reexport_instance_trait(scrate, def));
diff --git a/frame/support/procedural/src/storage/metadata.rs b/frame/support/procedural/src/storage/metadata.rs
index c321386ae1dc..8a42dd4308d1 100644
--- a/frame/support/procedural/src/storage/metadata.rs
+++ b/frame/support/procedural/src/storage/metadata.rs
@@ -63,6 +63,27 @@ fn storage_line_metadata_type(scrate: &TokenStream, line: &StorageLineDefExt) ->
 				}
 			}
 		},
+		StorageLineTypeDef::NMap(map) => {
+			let keys = map.keys
+				.iter()
+				.map(|key| clean_type_string(&quote!(#key).to_string()))
+				.collect::<Vec<_>>();
+			let hashers = map.hashers
+				.iter()
+				.map(|hasher| hasher.to_storage_hasher_struct())
+				.collect::<Vec<_>>();
+			quote!{
+				#scrate::metadata::StorageEntryType::NMap {
+					keys: #scrate::metadata::DecodeDifferent::Encode(&[
+						#( #keys, )*
+					]),
+					hashers: #scrate::metadata::DecodeDifferent::Encode(&[
+						#( #scrate::metadata::StorageHasher::#hashers, )*
+					]),
+					value: #scrate::metadata::DecodeDifferent::Encode(#value_type),
+				}
+			}
+		}
 	}
 }
 
@@ -140,7 +161,8 @@ fn default_byte_getter(
 	(struct_def, struct_instance)
 }
 
-pub fn impl_metadata(scrate: &TokenStream, def: &DeclStorageDefExt) -> TokenStream {
+pub fn impl_metadata(def: &DeclStorageDefExt) -> TokenStream {
+	let scrate = &def.hidden_crate;
 	let mut entries = TokenStream::new();
 	let mut default_byte_getter_struct_defs = TokenStream::new();
 
diff --git a/frame/support/procedural/src/storage/mod.rs b/frame/support/procedural/src/storage/mod.rs
index 2f9625d2c941..71bcf704f0d7 100644
--- a/frame/support/procedural/src/storage/mod.rs
+++ b/frame/support/procedural/src/storage/mod.rs
@@ -70,7 +70,9 @@ impl syn::parse::Parse for DeclStorageDef {
 /// Extended version of `DeclStorageDef` with useful precomputed value.
 pub struct DeclStorageDefExt {
 	/// Name of the module used to import hidden imports.
-	hidden_crate: Option<syn::Ident>,
+	hidden_crate: proc_macro2::TokenStream,
+	/// Hidden imports used by the module.
+	hidden_imports: proc_macro2::TokenStream,
 	/// Visibility of store trait.
 	visibility: syn::Visibility,
 	/// Name of store trait: usually `Store`.
@@ -108,9 +110,15 @@ pub struct DeclStorageDefExt {
 
 impl From<DeclStorageDef> for DeclStorageDefExt {
 	fn from(mut def: DeclStorageDef) -> Self {
+		let hidden_crate_name = def.hidden_crate.as_ref().map(|i| i.to_string())
+			.unwrap_or_else(|| "decl_storage".to_string());
+	
+		let hidden_crate = generate_crate_access(&hidden_crate_name, "frame-support");
+		let hidden_imports = generate_hidden_includes(&hidden_crate_name, "frame-support");
+
 		let storage_lines = def.storage_lines.drain(..).collect::<Vec<_>>();
 		let storage_lines = storage_lines.into_iter()
-			.map(|line| StorageLineDefExt::from_def(line, &def))
+			.map(|line| StorageLineDefExt::from_def(line, &def, &hidden_crate))
 			.collect();
 
 		let (
@@ -144,7 +152,8 @@ impl From<DeclStorageDef> for DeclStorageDefExt {
 		);
 
 		Self {
-			hidden_crate: def.hidden_crate,
+			hidden_crate,
+			hidden_imports,
 			visibility: def.visibility,
 			store_trait: def.store_trait,
 			module_name: def.module_name,
@@ -230,7 +239,11 @@ pub struct StorageLineDefExt {
 }
 
 impl StorageLineDefExt {
-	fn from_def(storage_def: StorageLineDef, def: &DeclStorageDef) -> Self {
+	fn from_def(
+		storage_def: StorageLineDef,
+		def: &DeclStorageDef,
+		hidden_crate: &proc_macro2::TokenStream,
+	) -> Self {
 		let is_generic = match &storage_def.storage_type {
 			StorageLineTypeDef::Simple(value) => {
 				ext::type_contains_ident(&value, &def.module_runtime_generic)
@@ -244,12 +257,17 @@ impl StorageLineDefExt {
 					|| ext::type_contains_ident(&map.key2, &def.module_runtime_generic)
 					|| ext::type_contains_ident(&map.value, &def.module_runtime_generic)
 			}
+			StorageLineTypeDef::NMap(map) => {
+				map.keys.iter().any(|key| ext::type_contains_ident(key, &def.module_runtime_generic))
+					|| ext::type_contains_ident(&map.value, &def.module_runtime_generic)
+			}
 		};
 
 		let query_type = match &storage_def.storage_type {
 			StorageLineTypeDef::Simple(value) => value.clone(),
 			StorageLineTypeDef::Map(map) => map.value.clone(),
 			StorageLineTypeDef::DoubleMap(map) => map.value.clone(),
+			StorageLineTypeDef::NMap(map) => map.value.clone(),
 		};
 		let is_option = ext::extract_type_option(&query_type).is_some();
 		let value_type = ext::extract_type_option(&query_type).unwrap_or_else(|| query_type.clone());
@@ -295,6 +313,10 @@ impl StorageLineDefExt {
 				let key2 = &map.key2;
 				quote!( StorageDoubleMap<#key1, #key2, #value_type> )
 			},
+			StorageLineTypeDef::NMap(map) => {
+				let keygen = map.to_keygen_struct(hidden_crate);
+				quote!( StorageNMap<#keygen, #value_type> )
+			}
 		};
 
 		let storage_trait = quote!( storage::#storage_trait_truncated );
@@ -332,6 +354,7 @@ impl StorageLineDefExt {
 pub enum StorageLineTypeDef {
 	Map(MapDef),
 	DoubleMap(Box<DoubleMapDef>),
+	NMap(NMapDef),
 	Simple(syn::Type),
 }
 
@@ -351,6 +374,42 @@ pub struct DoubleMapDef {
 	pub value: syn::Type,
 }
 
+pub struct NMapDef {
+	pub hashers: Vec<HasherKind>,
+	pub keys: Vec<syn::Type>,
+	pub value: syn::Type,
+}
+
+impl NMapDef {
+	fn to_keygen_struct(&self, scrate: &proc_macro2::TokenStream) -> proc_macro2::TokenStream {
+		if self.keys.len() == 1 {
+			let hasher = &self.hashers[0].to_storage_hasher_struct();
+			let key = &self.keys[0];
+			return quote!( #scrate::storage::types::Key<#scrate::#hasher, #key> );
+		}
+
+		let key_hasher = self.keys.iter().zip(&self.hashers).map(|(key, hasher)| {
+			let hasher = hasher.to_storage_hasher_struct();
+			quote!( #scrate::storage::types::Key<#scrate::#hasher, #key> )
+		})
+		.collect::<Vec<_>>();
+		quote!(( #(#key_hasher,)* ))
+	}
+
+	fn to_key_tuple(&self) -> proc_macro2::TokenStream {
+		if self.keys.len() == 1 {
+			let key = &self.keys[0];
+			return quote!(#key);
+		}
+
+		let tuple = self.keys.iter().map(|key| {
+			quote!(#key)
+		})
+		.collect::<Vec<_>>();
+		quote!(( #(#tuple,)* ))
+	}
+}
+
 pub struct ExtraGenesisLineDef {
 	attrs: Vec<syn::Attribute>,
 	name: syn::Ident,
@@ -402,26 +461,24 @@ pub fn decl_storage_impl(input: proc_macro::TokenStream) -> proc_macro::TokenStr
 
 	print_pallet_upgrade::maybe_print_pallet_upgrade(&def_ext);
 
-	let hidden_crate_name = def_ext.hidden_crate.as_ref().map(|i| i.to_string())
-		.unwrap_or_else(|| "decl_storage".to_string());
-
-	let scrate = generate_crate_access(&hidden_crate_name, "frame-support");
-	let scrate_decl = generate_hidden_includes(&hidden_crate_name, "frame-support");
-
+	let scrate = &def_ext.hidden_crate;
+	let scrate_decl = &def_ext.hidden_imports;
 	let store_trait = store_trait::decl_and_impl(&def_ext);
-	let getters = getters::impl_getters(&scrate, &def_ext);
-	let metadata = metadata::impl_metadata(&scrate, &def_ext);
-	let instance_trait = instance_trait::decl_and_impl(&scrate, &def_ext);
-	let genesis_config = genesis_config::genesis_config_and_build_storage(&scrate, &def_ext);
-	let storage_struct = storage_struct::decl_and_impl(&scrate, &def_ext);
+	let getters = getters::impl_getters(&def_ext);
+	let metadata = metadata::impl_metadata(&def_ext);
+	let instance_trait = instance_trait::decl_and_impl(&def_ext);
+	let genesis_config = genesis_config::genesis_config_and_build_storage(&def_ext);
+	let storage_struct = storage_struct::decl_and_impl(&def_ext);
 
 	quote!(
 		use #scrate::{
 			StorageValue as _,
 			StorageMap as _,
 			StorageDoubleMap as _,
+			StorageNMap as _,
 			StoragePrefixedMap as _,
 			IterableStorageMap as _,
+			IterableStorageNMap as _,
 			IterableStorageDoubleMap as _,
 		};
 
diff --git a/frame/support/procedural/src/storage/parse.rs b/frame/support/procedural/src/storage/parse.rs
index 2ff7f1fbf38c..93a1b844a84a 100644
--- a/frame/support/procedural/src/storage/parse.rs
+++ b/frame/support/procedural/src/storage/parse.rs
@@ -29,6 +29,7 @@ mod keyword {
 	syn::custom_keyword!(get);
 	syn::custom_keyword!(map);
 	syn::custom_keyword!(double_map);
+	syn::custom_keyword!(nmap);
 	syn::custom_keyword!(opaque_blake2_256);
 	syn::custom_keyword!(opaque_blake2_128);
 	syn::custom_keyword!(blake2_128_concat);
@@ -199,6 +200,7 @@ impl_parse_for_opt!(DeclStorageBuild => keyword::build);
 enum DeclStorageType {
 	Map(DeclStorageMap),
 	DoubleMap(Box<DeclStorageDoubleMap>),
+	NMap(DeclStorageNMap),
 	Simple(syn::Type),
 }
 
@@ -208,6 +210,8 @@ impl syn::parse::Parse for DeclStorageType {
 			Ok(Self::Map(input.parse()?))
 		} else if input.peek(keyword::double_map) {
 			Ok(Self::DoubleMap(input.parse()?))
+		} else if input.peek(keyword::nmap) {
+			Ok(Self::NMap(input.parse()?))
 		} else {
 			Ok(Self::Simple(input.parse()?))
 		}
@@ -235,7 +239,21 @@ struct DeclStorageDoubleMap {
 	pub value: syn::Type,
 }
 
-#[derive(ToTokens, Debug)]
+#[derive(Parse, ToTokens, Debug)]
+struct DeclStorageKey {
+	pub hasher: Opt<SetHasher>,
+	pub key: syn::Type,
+}
+
+#[derive(Parse, ToTokens, Debug)]
+struct DeclStorageNMap {
+	pub map_keyword: keyword::nmap,
+	pub storage_keys: ext::PunctuatedTrailing<DeclStorageKey, Token![,]>,
+	pub ass_keyword: Token![=>],
+	pub value: syn::Type,
+}
+
+#[derive(Clone, ToTokens, Debug)]
 enum Hasher {
 	Blake2_256(keyword::opaque_blake2_256),
 	Blake2_128(keyword::opaque_blake2_128),
@@ -291,7 +309,7 @@ impl syn::parse::Parse for Opt<DeclStorageDefault> {
 	}
 }
 
-#[derive(Parse, ToTokens, Debug)]
+#[derive(Clone, Parse, ToTokens, Debug)]
 struct SetHasher {
 	pub hasher_keyword: keyword::hasher,
 	pub inner: ext::Parens<Hasher>,
@@ -495,6 +513,18 @@ fn parse_storage_line_defs(
 					value: map.value,
 				})
 			),
+			DeclStorageType::NMap(map) => super::StorageLineTypeDef::NMap(
+				super::NMapDef {
+					hashers: map
+						.storage_keys
+						.inner
+						.iter()
+						.map(|pair| Ok(pair.hasher.inner.clone().ok_or_else(no_hasher_error)?.into()))
+						.collect::<Result<Vec<_>, syn::Error>>()?,
+					keys: map.storage_keys.inner.iter().map(|pair| pair.key.clone()).collect(),
+					value: map.value,
+				}
+			),
 			DeclStorageType::Simple(expr) => super::StorageLineTypeDef::Simple(expr),
 		};
 
diff --git a/frame/support/procedural/src/storage/print_pallet_upgrade.rs b/frame/support/procedural/src/storage/print_pallet_upgrade.rs
index 447d13898e8d..a6f64a588b63 100644
--- a/frame/support/procedural/src/storage/print_pallet_upgrade.rs
+++ b/frame/support/procedural/src/storage/print_pallet_upgrade.rs
@@ -239,6 +239,15 @@ pub fn maybe_print_pallet_upgrade(def: &super::DeclStorageDefExt) {
 					comma_default_value_getter_name = comma_default_value_getter_name,
 				)
 			},
+			StorageLineTypeDef::NMap(map) => {
+				format!("StorageNMap<_, {keygen}, {value_type}{comma_query_kind}\
+					{comma_default_value_getter_name}>",
+					keygen = map.to_keygen_struct(&def.hidden_crate),
+					value_type = to_cleaned_string(&value_type),
+					comma_query_kind = comma_query_kind,
+					comma_default_value_getter_name = comma_default_value_getter_name,
+				)
+			}
 			StorageLineTypeDef::Simple(_) => {
 				format!("StorageValue<_, {value_type}{comma_query_kind}\
 					{comma_default_value_getter_name}>",
diff --git a/frame/support/procedural/src/storage/storage_struct.rs b/frame/support/procedural/src/storage/storage_struct.rs
index 9c049789f9bd..51b55bdc4f13 100644
--- a/frame/support/procedural/src/storage/storage_struct.rs
+++ b/frame/support/procedural/src/storage/storage_struct.rs
@@ -47,7 +47,8 @@ fn from_query_to_optional_value(is_option: bool) -> TokenStream {
 	}
 }
 
-pub fn decl_and_impl(scrate: &TokenStream, def: &DeclStorageDefExt) -> TokenStream {
+pub fn decl_and_impl(def: &DeclStorageDefExt) -> TokenStream {
+	let scrate = &def.hidden_crate;
 	let mut impls = TokenStream::new();
 
 	for line in &def.storage_lines {
@@ -199,6 +200,43 @@ pub fn decl_and_impl(scrate: &TokenStream, def: &DeclStorageDefExt) -> TokenStre
 							#from_optional_value_to_query
 						}
 
+						fn from_query_to_optional_value(v: Self::Query) -> Option<#value_type> {
+							#from_query_to_optional_value
+						}
+					}
+				)
+			},
+			StorageLineTypeDef::NMap(_) => {
+				quote!(
+					impl<#impl_trait> #scrate::storage::StoragePrefixedMap<#value_type>
+						for #storage_struct #optional_storage_where_clause
+					{
+						fn module_prefix() -> &'static [u8] {
+							<#instance_or_inherent as #scrate::traits::Instance>::PREFIX.as_bytes()
+						}
+
+						fn storage_prefix() -> &'static [u8] {
+							#storage_name_bstr
+						}
+					}
+
+					impl<#impl_trait> #scrate::#storage_generator_trait for #storage_struct
+					#optional_storage_where_clause
+					{
+						type Query = #query_type;
+
+						fn module_prefix() -> &'static [u8] {
+							<#instance_or_inherent as #scrate::traits::Instance>::PREFIX.as_bytes()
+						}
+
+						fn storage_prefix() -> &'static [u8] {
+							#storage_name_bstr
+						}
+
+						fn from_optional_value_to_query(v: Option<#value_type>) -> Self::Query {
+							#from_optional_value_to_query
+						}
+
 						fn from_query_to_optional_value(v: Self::Query) -> Option<#value_type> {
 							#from_query_to_optional_value
 						}
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 7539c3c93829..d87ab8e6ed46 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -74,8 +74,8 @@ pub use self::hash::{
 	StorageHasher, ReversibleStorageHasher
 };
 pub use self::storage::{
-	StorageValue, StorageMap, StorageDoubleMap, StoragePrefixedMap, IterableStorageMap,
-	IterableStorageDoubleMap, migration,
+	StorageValue, StorageMap, StorageDoubleMap, StorageNMap, StoragePrefixedMap,
+	IterableStorageMap, IterableStorageDoubleMap, IterableStorageNMap, migration,
 	bounded_vec::{self, BoundedVec},
 };
 pub use self::dispatch::{Parameter, Callable};
@@ -1237,7 +1237,10 @@ pub mod pallet_prelude {
 		traits::{Get, Hooks, IsType, GetPalletVersion, EnsureOrigin, PalletInfoAccess},
 		dispatch::{DispatchResultWithPostInfo, Parameter, DispatchError, DispatchResult},
 		weights::{DispatchClass, Pays, Weight},
-		storage::types::{StorageValue, StorageMap, StorageDoubleMap, ValueQuery, OptionQuery},
+		storage::types::{
+			Key as NMapKey, StorageDoubleMap, StorageMap, StorageNMap, StorageValue, ValueQuery,
+			OptionQuery,
+		},
 		storage::bounded_vec::BoundedVec,
 	};
 	pub use codec::{Encode, Decode};
diff --git a/frame/support/src/storage/generator/mod.rs b/frame/support/src/storage/generator/mod.rs
index 86eafe86f43f..578831314c1f 100644
--- a/frame/support/src/storage/generator/mod.rs
+++ b/frame/support/src/storage/generator/mod.rs
@@ -25,10 +25,12 @@
 //! This is internal api and is subject to change.
 
 mod map;
+mod nmap;
 mod double_map;
 mod value;
 
 pub use map::StorageMap;
+pub use nmap::StorageNMap;
 pub use double_map::StorageDoubleMap;
 pub use value::StorageValue;
 
diff --git a/frame/support/src/storage/generator/nmap.rs b/frame/support/src/storage/generator/nmap.rs
new file mode 100755
index 000000000000..d1f00adda5e5
--- /dev/null
+++ b/frame/support/src/storage/generator/nmap.rs
@@ -0,0 +1,541 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Generator for `StorageNMap` used by `decl_storage` and storage types.
+//!
+//! By default each key value is stored at:
+//! ```nocompile
+//! Twox128(pallet_prefix) ++ Twox128(storage_prefix)
+//!     ++ Hasher1(encode(key1)) ++ Hasher2(encode(key2)) ++ ... ++ HasherN(encode(keyN))
+//! ```
+//!
+//! # Warning
+//!
+//! If the keys are not trusted (e.g. can be set by a user), a cryptographic `hasher` such as
+//! `blake2_256` must be used.  Otherwise, other values in storage with the same prefix can
+//! be compromised.
+
+use crate::{
+	hash::{StorageHasher, Twox128},
+	storage::{
+		self,
+		types::{
+			EncodeLikeTuple, HasKeyPrefix, HasReversibleKeyPrefix, KeyGenerator,
+			ReversibleKeyGenerator, TupleToEncodedIter,
+		},
+		unhashed, PrefixIterator, StorageAppend,
+	},
+	Never,
+};
+use codec::{Decode, Encode, EncodeLike, FullCodec};
+#[cfg(not(feature = "std"))]
+use sp_std::prelude::*;
+
+/// Generator for `StorageNMap` used by `decl_storage` and storage types.
+///
+/// By default each key value is stored at:
+/// ```nocompile
+/// Twox128(pallet_prefix) ++ Twox128(storage_prefix)
+///     ++ Hasher1(encode(key1)) ++ Hasher2(encode(key2)) ++ ... ++ HasherN(encode(keyN))
+/// ```
+///
+/// # Warning
+///
+/// If the keys are not trusted (e.g. can be set by a user), a cryptographic `hasher` such as
+/// `blake2_256` must be used.  Otherwise, other values in storage with the same prefix can
+/// be compromised.
+pub trait StorageNMap<K: KeyGenerator, V: FullCodec> {
+	/// The type that get/take returns.
+	type Query;
+
+	/// Module prefix. Used for generating final key.
+	fn module_prefix() -> &'static [u8];
+
+	/// Storage prefix. Used for generating final key.
+	fn storage_prefix() -> &'static [u8];
+
+	/// The full prefix; just the hash of `module_prefix` concatenated to the hash of
+	/// `storage_prefix`.
+	fn prefix_hash() -> Vec<u8> {
+		let module_prefix_hashed = Twox128::hash(Self::module_prefix());
+		let storage_prefix_hashed = Twox128::hash(Self::storage_prefix());
+
+		let mut result =
+			Vec::with_capacity(module_prefix_hashed.len() + storage_prefix_hashed.len());
+
+		result.extend_from_slice(&module_prefix_hashed[..]);
+		result.extend_from_slice(&storage_prefix_hashed[..]);
+
+		result
+	}
+
+	/// Convert an optional value retrieved from storage to the type queried.
+	fn from_optional_value_to_query(v: Option<V>) -> Self::Query;
+
+	/// Convert a query to an optional value into storage.
+	fn from_query_to_optional_value(v: Self::Query) -> Option<V>;
+
+	/// Generate a partial key used in top storage.
+	fn storage_n_map_partial_key<KP>(key: KP) -> Vec<u8>
+	where
+		K: HasKeyPrefix<KP>,
+	{
+		let module_prefix_hashed = Twox128::hash(Self::module_prefix());
+		let storage_prefix_hashed = Twox128::hash(Self::storage_prefix());
+		let key_hashed = <K as HasKeyPrefix<KP>>::partial_key(key);
+
+		let mut final_key = Vec::with_capacity(
+			module_prefix_hashed.len() + storage_prefix_hashed.len() + key_hashed.len(),
+		);
+
+		final_key.extend_from_slice(&module_prefix_hashed[..]);
+		final_key.extend_from_slice(&storage_prefix_hashed[..]);
+		final_key.extend_from_slice(key_hashed.as_ref());
+
+		final_key
+	}
+
+	/// Generate the full key used in top storage.
+	fn storage_n_map_final_key<KG, KArg>(key: KArg) -> Vec<u8>
+	where
+		KG: KeyGenerator,
+		KArg: EncodeLikeTuple<KG::KArg> + TupleToEncodedIter,
+	{
+		let module_prefix_hashed = Twox128::hash(Self::module_prefix());
+		let storage_prefix_hashed = Twox128::hash(Self::storage_prefix());
+		let key_hashed = KG::final_key(key);
+
+		let mut final_key = Vec::with_capacity(
+			module_prefix_hashed.len() + storage_prefix_hashed.len() + key_hashed.len(),
+		);
+
+		final_key.extend_from_slice(&module_prefix_hashed[..]);
+		final_key.extend_from_slice(&storage_prefix_hashed[..]);
+		final_key.extend_from_slice(key_hashed.as_ref());
+
+		final_key
+	}
+}
+
+impl<K, V, G> storage::StorageNMap<K, V> for G
+where
+	K: KeyGenerator,
+	V: FullCodec,
+	G: StorageNMap<K, V>,
+{
+	type Query = G::Query;
+
+	fn hashed_key_for<KArg: EncodeLikeTuple<K::KArg> + TupleToEncodedIter>(key: KArg) -> Vec<u8> {
+		Self::storage_n_map_final_key::<K, _>(key)
+	}
+
+	fn contains_key<KArg: EncodeLikeTuple<K::KArg> + TupleToEncodedIter>(key: KArg) -> bool {
+		unhashed::exists(&Self::storage_n_map_final_key::<K, _>(key))
+	}
+
+	fn get<KArg: EncodeLikeTuple<K::KArg> + TupleToEncodedIter>(key: KArg) -> Self::Query {
+		G::from_optional_value_to_query(unhashed::get(&Self::storage_n_map_final_key::<K, _>(key)))
+	}
+
+	fn try_get<KArg: EncodeLikeTuple<K::KArg> + TupleToEncodedIter>(key: KArg) -> Result<V, ()> {
+		unhashed::get(&Self::storage_n_map_final_key::<K, _>(key)).ok_or(())
+	}
+
+	fn take<KArg: EncodeLikeTuple<K::KArg> + TupleToEncodedIter>(key: KArg) -> Self::Query {
+		let final_key = Self::storage_n_map_final_key::<K, _>(key);
+
+		let value = unhashed::take(&final_key);
+		G::from_optional_value_to_query(value)
+	}
+
+	fn swap<KOther, KArg1, KArg2>(key1: KArg1, key2: KArg2)
+	where
+		KOther: KeyGenerator,
+		KArg1: EncodeLikeTuple<K::KArg> + TupleToEncodedIter,
+		KArg2: EncodeLikeTuple<KOther::KArg> + TupleToEncodedIter,
+	{
+		let final_x_key = Self::storage_n_map_final_key::<K, _>(key1);
+		let final_y_key = Self::storage_n_map_final_key::<KOther, _>(key2);
+
+		let v1 = unhashed::get_raw(&final_x_key);
+		if let Some(val) = unhashed::get_raw(&final_y_key) {
+			unhashed::put_raw(&final_x_key, &val);
+		} else {
+			unhashed::kill(&final_x_key);
+		}
+		if let Some(val) = v1 {
+			unhashed::put_raw(&final_y_key, &val);
+		} else {
+			unhashed::kill(&final_y_key);
+		}
+	}
+
+	fn insert<KArg, VArg>(key: KArg, val: VArg)
+	where
+		KArg: EncodeLikeTuple<K::KArg> + TupleToEncodedIter,
+		VArg: EncodeLike<V>,
+	{
+		unhashed::put(&Self::storage_n_map_final_key::<K, _>(key), &val);
+	}
+
+	fn remove<KArg: EncodeLikeTuple<K::KArg> + TupleToEncodedIter>(key: KArg) {
+		unhashed::kill(&Self::storage_n_map_final_key::<K, _>(key));
+	}
+
+	fn remove_prefix<KP>(partial_key: KP)
+	where
+		K: HasKeyPrefix<KP>,
+	{
+		unhashed::kill_prefix(&Self::storage_n_map_partial_key(partial_key));
+	}
+
+	fn iter_prefix_values<KP>(partial_key: KP) -> PrefixIterator<V>
+	where
+		K: HasKeyPrefix<KP>,
+	{
+		let prefix = Self::storage_n_map_partial_key(partial_key);
+		PrefixIterator {
+			prefix: prefix.clone(),
+			previous_key: prefix,
+			drain: false,
+			closure: |_raw_key, mut raw_value| V::decode(&mut raw_value),
+		}
+	}
+
+	fn mutate<KArg, R, F>(key: KArg, f: F) -> R
+	where
+		KArg: EncodeLikeTuple<K::KArg> + TupleToEncodedIter,
+		F: FnOnce(&mut Self::Query) -> R,
+	{
+		Self::try_mutate(key, |v| Ok::<R, Never>(f(v)))
+			.expect("`Never` can not be constructed; qed")
+	}
+
+	fn try_mutate<KArg, R, E, F>(key: KArg, f: F) -> Result<R, E>
+	where
+		KArg: EncodeLikeTuple<K::KArg> + TupleToEncodedIter,
+		F: FnOnce(&mut Self::Query) -> Result<R, E>
+	{
+		let final_key = Self::storage_n_map_final_key::<K, _>(key);
+		let mut val = G::from_optional_value_to_query(unhashed::get(final_key.as_ref()));
+
+		let ret = f(&mut val);
+		if ret.is_ok() {
+			match G::from_query_to_optional_value(val) {
+				Some(ref val) => unhashed::put(final_key.as_ref(), val),
+				None => unhashed::kill(final_key.as_ref()),
+			}
+		}
+		ret
+	}
+
+	fn mutate_exists<KArg, R, F>(key: KArg, f: F) -> R
+	where
+		KArg: EncodeLikeTuple<K::KArg> + TupleToEncodedIter,
+		F: FnOnce(&mut Option<V>) -> R,
+	{
+		Self::try_mutate_exists(key, |v| Ok::<R, Never>(f(v)))
+			.expect("`Never` can not be constructed; qed")
+	}
+
+	fn try_mutate_exists<KArg, R, E, F>(key: KArg, f: F) -> Result<R, E>
+	where
+		KArg: EncodeLikeTuple<K::KArg> + TupleToEncodedIter,
+		F: FnOnce(&mut Option<V>) -> Result<R, E>,
+	{
+		let final_key = Self::storage_n_map_final_key::<K, _>(key);
+		let mut val = unhashed::get(final_key.as_ref());
+
+		let ret = f(&mut val);
+		if ret.is_ok() {
+			match val {
+				Some(ref val) => unhashed::put(final_key.as_ref(), val),
+				None => unhashed::kill(final_key.as_ref()),
+			}
+		}
+		ret
+	}
+
+	fn append<Item, EncodeLikeItem, KArg>(key: KArg, item: EncodeLikeItem)
+	where
+		KArg: EncodeLikeTuple<K::KArg> + TupleToEncodedIter,
+		Item: Encode,
+		EncodeLikeItem: EncodeLike<Item>,
+		V: StorageAppend<Item>,
+	{
+		let final_key = Self::storage_n_map_final_key::<K, _>(key);
+		sp_io::storage::append(&final_key, item.encode());
+	}
+
+	fn migrate_keys<KArg>(key: KArg, hash_fns: K::HArg) -> Option<V>
+	where
+		KArg: EncodeLikeTuple<K::KArg> + TupleToEncodedIter,
+	{
+		let old_key = {
+			let module_prefix_hashed = Twox128::hash(Self::module_prefix());
+			let storage_prefix_hashed = Twox128::hash(Self::storage_prefix());
+			let key_hashed = K::migrate_key(&key, hash_fns);
+
+			let mut final_key = Vec::with_capacity(
+				module_prefix_hashed.len() + storage_prefix_hashed.len() + key_hashed.len(),
+			);
+
+			final_key.extend_from_slice(&module_prefix_hashed[..]);
+			final_key.extend_from_slice(&storage_prefix_hashed[..]);
+			final_key.extend_from_slice(key_hashed.as_ref());
+
+			final_key
+		};
+		unhashed::take(old_key.as_ref()).map(|value| {
+			unhashed::put(Self::storage_n_map_final_key::<K, _>(key).as_ref(), &value);
+			value
+		})
+	}
+}
+
+impl<K: ReversibleKeyGenerator, V: FullCodec, G: StorageNMap<K, V>>
+	storage::IterableStorageNMap<K, V> for G
+{
+	type Iterator = PrefixIterator<(K::Key, V)>;
+
+	fn iter_prefix<KP>(kp: KP) -> PrefixIterator<(<K as HasKeyPrefix<KP>>::Suffix, V)>
+	where
+		K: HasReversibleKeyPrefix<KP>,
+	{
+		let prefix = G::storage_n_map_partial_key(kp);
+		PrefixIterator {
+			prefix: prefix.clone(),
+			previous_key: prefix,
+			drain: false,
+			closure: |raw_key_without_prefix, mut raw_value| {
+				let partial_key = K::decode_partial_key(raw_key_without_prefix)?;
+				Ok((partial_key, V::decode(&mut raw_value)?))
+			},
+		}
+	}
+
+	fn drain_prefix<KP>(kp: KP) -> PrefixIterator<(<K as HasKeyPrefix<KP>>::Suffix, V)>
+	where
+		K: HasReversibleKeyPrefix<KP>,
+	{
+		let mut iter = Self::iter_prefix(kp);
+		iter.drain = true;
+		iter
+	}
+
+	fn iter() -> Self::Iterator {
+		let prefix = G::prefix_hash();
+		Self::Iterator {
+			prefix: prefix.clone(),
+			previous_key: prefix,
+			drain: false,
+			closure: |raw_key_without_prefix, mut raw_value| {
+				let (final_key, _) = K::decode_final_key(raw_key_without_prefix)?;
+				Ok((final_key, V::decode(&mut raw_value)?))
+			},
+		}
+	}
+
+	fn drain() -> Self::Iterator {
+		let mut iterator = Self::iter();
+		iterator.drain = true;
+		iterator
+	}
+
+	fn translate<O: Decode, F: FnMut(K::Key, O) -> Option<V>>(mut f: F) {
+		let prefix = G::prefix_hash();
+		let mut previous_key = prefix.clone();
+		while let Some(next) =
+			sp_io::storage::next_key(&previous_key).filter(|n| n.starts_with(&prefix))
+		{
+			previous_key = next;
+			let value = match unhashed::get::<O>(&previous_key) {
+				Some(value) => value,
+				None => {
+					log::error!("Invalid translate: fail to decode old value");
+					continue;
+				}
+			};
+
+			let final_key = match K::decode_final_key(&previous_key[prefix.len()..]) {
+				Ok((final_key, _)) => final_key,
+				Err(_) => {
+					log::error!("Invalid translate: fail to decode key");
+					continue;
+				}
+			};
+
+			match f(final_key, value) {
+				Some(new) => unhashed::put::<V>(&previous_key, &new),
+				None => unhashed::kill(&previous_key),
+			}
+		}
+	}
+}
+
+/// Test iterators for StorageNMap
+#[cfg(test)]
+mod test_iterators {
+	use crate::{
+		hash::StorageHasher,
+		storage::{generator::StorageNMap, unhashed, IterableStorageNMap},
+	};
+	use codec::{Decode, Encode};
+
+	pub trait Config: 'static {
+		type Origin;
+		type BlockNumber;
+		type PalletInfo: crate::traits::PalletInfo;
+		type DbWeight: crate::traits::Get<crate::weights::RuntimeDbWeight>;
+	}
+
+	crate::decl_module! {
+		pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {}
+	}
+
+	#[derive(PartialEq, Eq, Clone, Encode, Decode)]
+	struct NoDef(u32);
+
+	crate::decl_storage! {
+		trait Store for Module<T: Config> as Test {
+			NMap: nmap hasher(blake2_128_concat) u16, hasher(twox_64_concat) u32 => u64;
+		}
+	}
+
+	fn key_before_prefix(mut prefix: Vec<u8>) -> Vec<u8> {
+		let last = prefix.iter_mut().last().unwrap();
+		assert!(*last != 0, "mock function not implemented for this prefix");
+		*last -= 1;
+		prefix
+	}
+
+	fn key_after_prefix(mut prefix: Vec<u8>) -> Vec<u8> {
+		let last = prefix.iter_mut().last().unwrap();
+		assert!(
+			*last != 255,
+			"mock function not implemented for this prefix"
+		);
+		*last += 1;
+		prefix
+	}
+
+	#[test]
+	fn n_map_reversible_reversible_iteration() {
+		sp_io::TestExternalities::default().execute_with(|| {
+			// All map iterator
+			let prefix = NMap::prefix_hash();
+
+			unhashed::put(&key_before_prefix(prefix.clone()), &1u64);
+			unhashed::put(&key_after_prefix(prefix.clone()), &1u64);
+
+			for i in 0..4 {
+				NMap::insert((i as u16, i as u32), i as u64);
+			}
+
+			assert_eq!(
+				NMap::iter().collect::<Vec<_>>(),
+				vec![((3, 3), 3), ((0, 0), 0), ((2, 2), 2), ((1, 1), 1)],
+			);
+
+			assert_eq!(NMap::iter_values().collect::<Vec<_>>(), vec![3, 0, 2, 1],);
+
+			assert_eq!(
+				NMap::drain().collect::<Vec<_>>(),
+				vec![((3, 3), 3), ((0, 0), 0), ((2, 2), 2), ((1, 1), 1)],
+			);
+
+			assert_eq!(NMap::iter().collect::<Vec<_>>(), vec![]);
+			assert_eq!(
+				unhashed::get(&key_before_prefix(prefix.clone())),
+				Some(1u64)
+			);
+			assert_eq!(unhashed::get(&key_after_prefix(prefix.clone())), Some(1u64));
+
+			// Prefix iterator
+			let k1 = 3 << 8;
+			let prefix = NMap::storage_n_map_partial_key((k1,));
+
+			unhashed::put(&key_before_prefix(prefix.clone()), &1u64);
+			unhashed::put(&key_after_prefix(prefix.clone()), &1u64);
+
+			for i in 0..4 {
+				NMap::insert((k1, i as u32), i as u64);
+			}
+
+			assert_eq!(
+				NMap::iter_prefix((k1,)).collect::<Vec<_>>(),
+				vec![(1, 1), (2, 2), (0, 0), (3, 3)],
+			);
+
+			assert_eq!(
+				NMap::iter_prefix_values((k1,)).collect::<Vec<_>>(),
+				vec![1, 2, 0, 3],
+			);
+
+			assert_eq!(
+				NMap::drain_prefix((k1,)).collect::<Vec<_>>(),
+				vec![(1, 1), (2, 2), (0, 0), (3, 3)],
+			);
+
+			assert_eq!(NMap::iter_prefix((k1,)).collect::<Vec<_>>(), vec![]);
+			assert_eq!(
+				unhashed::get(&key_before_prefix(prefix.clone())),
+				Some(1u64)
+			);
+			assert_eq!(unhashed::get(&key_after_prefix(prefix.clone())), Some(1u64));
+
+			// Translate
+			let prefix = NMap::prefix_hash();
+
+			unhashed::put(&key_before_prefix(prefix.clone()), &1u64);
+			unhashed::put(&key_after_prefix(prefix.clone()), &1u64);
+			for i in 0..4 {
+				NMap::insert((i as u16, i as u32), i as u64);
+			}
+
+			// Wrong key1
+			unhashed::put(&[prefix.clone(), vec![1, 2, 3]].concat(), &3u64.encode());
+
+			// Wrong key2
+			unhashed::put(
+				&[
+					prefix.clone(),
+					crate::Blake2_128Concat::hash(&1u16.encode()),
+				]
+				.concat(),
+				&3u64.encode(),
+			);
+
+			// Wrong value
+			unhashed::put(
+				&[
+					prefix.clone(),
+					crate::Blake2_128Concat::hash(&1u16.encode()),
+					crate::Twox64Concat::hash(&2u32.encode()),
+				]
+				.concat(),
+				&vec![1],
+			);
+
+			NMap::translate(|(_k1, _k2), v: u64| Some(v * 2));
+			assert_eq!(
+				NMap::iter().collect::<Vec<_>>(),
+				vec![((3, 3), 6), ((0, 0), 0), ((2, 2), 4), ((1, 1), 2)],
+			);
+		})
+	}
+}
diff --git a/frame/support/src/storage/mod.rs b/frame/support/src/storage/mod.rs
index 437dd28060f7..b779e064ac20 100644
--- a/frame/support/src/storage/mod.rs
+++ b/frame/support/src/storage/mod.rs
@@ -20,9 +20,16 @@
 use sp_core::storage::ChildInfo;
 use sp_std::prelude::*;
 use codec::{FullCodec, FullEncode, Encode, EncodeLike, Decode};
-use crate::hash::{Twox128, StorageHasher, ReversibleStorageHasher};
+use crate::{
+	hash::{Twox128, StorageHasher, ReversibleStorageHasher},
+	storage::types::{
+		EncodeLikeTuple, HasKeyPrefix, HasReversibleKeyPrefix, KeyGenerator,
+		ReversibleKeyGenerator, TupleToEncodedIter,
+	},
+};
 use sp_runtime::generic::{Digest, DigestItem};
 pub use sp_runtime::TransactionOutcome;
+pub use types::Key;
 
 pub mod unhashed;
 pub mod hashed;
@@ -359,6 +366,39 @@ pub trait IterableStorageDoubleMap<
 	fn translate<O: Decode, F: FnMut(K1, K2, O) -> Option<V>>(f: F);
 }
 
+/// A strongly-typed map with arbitrary number of keys in storage whose keys and values can be
+/// iterated over.
+pub trait IterableStorageNMap<K: ReversibleKeyGenerator, V: FullCodec>: StorageNMap<K, V> {
+	/// The type that iterates over all `(key1, (key2, (key3, ... (keyN, ()))), value)` tuples
+	type Iterator: Iterator<Item = (K::Key, V)>;
+
+	/// Enumerate all elements in the map with prefix key `kp` in no particular order. If you add or
+	/// remove values whose prefix is `kp` to the map while doing this, you'll get undefined
+	/// results.
+	fn iter_prefix<KP>(kp: KP) -> PrefixIterator<(<K as HasKeyPrefix<KP>>::Suffix, V)>
+	where K: HasReversibleKeyPrefix<KP>;
+
+	/// Remove all elements from the map with prefix key `kp` and iterate through them in no
+	/// particular order. If you add elements with prefix key `kp` to the map while doing this,
+	/// you'll get undefined results.
+	fn drain_prefix<KP>(kp: KP) -> PrefixIterator<(<K as HasKeyPrefix<KP>>::Suffix, V)>
+	where K: HasReversibleKeyPrefix<KP>;
+
+	/// Enumerate all elements in the map in no particular order. If you add or remove values to
+	/// the map while doing this, you'll get undefined results.
+	fn iter() -> Self::Iterator;
+
+	/// Remove all elements from the map and iterate through them in no particular order. If you
+	/// add elements to the map while doing this, you'll get undefined results.
+	fn drain() -> Self::Iterator;
+
+	/// Translate the values of all elements by a function `f`, in the map in no particular order.
+	/// By returning `None` from `f` for an element, you'll remove it from the map.
+	///
+	/// NOTE: If a value fail to decode because storage is corrupted then it is skipped.
+	fn translate<O: Decode, F: FnMut(K::Key, O) -> Option<V>>(f: F);
+}
+
 /// An implementation of a map with a two keys.
 ///
 /// It provides an important ability to efficiently remove all entries
@@ -510,6 +550,121 @@ pub trait StorageDoubleMap<K1: FullEncode, K2: FullEncode, V: FullCodec> {
 	>(key1: KeyArg1, key2: KeyArg2) -> Option<V>;
 }
 
+/// An implementation of a map with an arbitrary number of keys.
+///
+/// Details of implementation can be found at [`generator::StorageNMap`].
+pub trait StorageNMap<K: KeyGenerator, V: FullCodec> {
+	/// The type that get/take returns.
+	type Query;
+
+	/// Get the storage key used to fetch a value corresponding to a specific key.
+	fn hashed_key_for<KArg: EncodeLikeTuple<K::KArg> + TupleToEncodedIter>(key: KArg) -> Vec<u8>;
+
+	/// Does the value (explicitly) exist in storage?
+	fn contains_key<KArg: EncodeLikeTuple<K::KArg> + TupleToEncodedIter>(key: KArg) -> bool;
+
+	/// Load the value associated with the given key from the map.
+	fn get<KArg: EncodeLikeTuple<K::KArg> + TupleToEncodedIter>(key: KArg) -> Self::Query;
+
+	/// Try to get the value for the given key from the map.
+	///
+	/// Returns `Ok` if it exists, `Err` if not.
+	fn try_get<KArg: EncodeLikeTuple<K::KArg> + TupleToEncodedIter>(key: KArg) -> Result<V, ()>;
+
+	/// Swap the values of two keys.
+	fn swap<KOther, KArg1, KArg2>(key1: KArg1, key2: KArg2)
+	where
+		KOther: KeyGenerator,
+		KArg1: EncodeLikeTuple<K::KArg> + TupleToEncodedIter,
+		KArg2: EncodeLikeTuple<KOther::KArg> + TupleToEncodedIter;
+
+	/// Store a value to be associated with the given key from the map.
+	fn insert<KArg, VArg>(key: KArg, val: VArg)
+	where
+		KArg: EncodeLikeTuple<K::KArg> + TupleToEncodedIter,
+		VArg: EncodeLike<V>;
+
+	/// Remove the value under a key.
+	fn remove<KArg: EncodeLikeTuple<K::KArg> + TupleToEncodedIter>(key: KArg);
+
+	/// Remove all values under the partial prefix key.
+	fn remove_prefix<KP>(partial_key: KP) where K: HasKeyPrefix<KP>;
+
+	/// Iterate over values that share the partial prefix key.
+	fn iter_prefix_values<KP>(partial_key: KP) -> PrefixIterator<V> where K: HasKeyPrefix<KP>;
+
+	/// Mutate the value under a key.
+	fn mutate<KArg, R, F>(key: KArg, f: F) -> R
+	where
+		KArg: EncodeLikeTuple<K::KArg> + TupleToEncodedIter,
+		F: FnOnce(&mut Self::Query) -> R;
+
+	/// Mutate the item, only if an `Ok` value is returned.
+	fn try_mutate<KArg, R, E, F>(key: KArg, f: F) -> Result<R, E>
+	where
+		KArg: EncodeLikeTuple<K::KArg> + TupleToEncodedIter,
+		F: FnOnce(&mut Self::Query) -> Result<R, E>;
+
+	/// Mutate the value under a key.
+	///
+	/// Deletes the item if mutated to a `None`.
+	fn mutate_exists<KArg, R, F>(key: KArg, f: F) -> R
+	where
+		KArg: EncodeLikeTuple<K::KArg> + TupleToEncodedIter,
+		F: FnOnce(&mut Option<V>) -> R;
+
+	/// Mutate the item, only if an `Ok` value is returned. Deletes the item if mutated to a `None`.
+	fn try_mutate_exists<KArg, R, E, F>(key: KArg, f: F) -> Result<R, E>
+	where
+		KArg: EncodeLikeTuple<K::KArg> + TupleToEncodedIter,
+		F: FnOnce(&mut Option<V>) -> Result<R, E>;
+
+	/// Take the value under a key.
+	fn take<KArg: EncodeLikeTuple<K::KArg> + TupleToEncodedIter>(key: KArg) -> Self::Query;
+
+	/// Append the given items to the value in the storage.
+	///
+	/// `V` is required to implement `codec::EncodeAppend`.
+	///
+	/// # Warning
+	///
+	/// If the storage item is not encoded properly, the storage will be overwritten
+	/// and set to `[item]`. Any default value set for the storage item will be ignored
+	/// on overwrite.
+	fn append<Item, EncodeLikeItem, KArg>(key: KArg, item: EncodeLikeItem)
+	where
+		KArg: EncodeLikeTuple<K::KArg> + TupleToEncodedIter,
+		Item: Encode,
+		EncodeLikeItem: EncodeLike<Item>,
+		V: StorageAppend<Item>;
+
+	/// Read the length of the storage value without decoding the entire value under the
+	/// given `key`.
+	///
+	/// `V` is required to implement [`StorageDecodeLength`].
+	///
+	/// If the value does not exists or it fails to decode the length, `None` is returned.
+	/// Otherwise `Some(len)` is returned.
+	///
+	/// # Warning
+	///
+	/// `None` does not mean that `get()` does not return a value. The default value is completly
+	/// ignored by this function.
+	fn decode_len<KArg: EncodeLikeTuple<K::KArg> + TupleToEncodedIter>(key: KArg) -> Option<usize>
+	where
+		V: StorageDecodeLength,
+	{
+		V::decode_len(&Self::hashed_key_for(key))
+	}
+
+	/// Migrate an item with the given `key` from defunct `hash_fns` to the current hashers.
+	///
+	/// If the key doesn't exist, then it's a no-op. If it does, then it returns its value.
+	fn migrate_keys<KArg>(key: KArg, hash_fns: K::HArg) -> Option<V>
+	where
+		KArg: EncodeLikeTuple<K::KArg> + TupleToEncodedIter;
+}
+
 /// Iterate over a prefix and decode raw_key and raw_value into `T`.
 ///
 /// If any decoding fails it skips it and continues to the next key.
@@ -806,7 +961,7 @@ pub trait StorageDecodeLength: private::Sealed + codec::DecodeLength {
 }
 
 /// Provides `Sealed` trait to prevent implementing trait `StorageAppend` & `StorageDecodeLength`
-/// outside of this crate.
+/// & `EncodeLikeTuple` outside of this crate.
 mod private {
 	use super::*;
 	use bounded_vec::BoundedVec;
@@ -818,6 +973,33 @@ mod private {
 	impl<T, S> Sealed for BoundedVec<T, S> {}
 	impl<K, V, S> Sealed for bounded_btree_map::BoundedBTreeMap<K, V, S> {}
 	impl<T, S> Sealed for bounded_btree_set::BoundedBTreeSet<T, S> {}
+
+	macro_rules! impl_sealed_for_tuple {
+		($($elem:ident),+) => {
+			paste::paste! {
+				impl<$($elem: Encode,)+> Sealed for ($($elem,)+) {}
+				impl<$($elem: Encode,)+> Sealed for &($($elem,)+) {}
+			}
+		};
+	}
+
+	impl_sealed_for_tuple!(A);
+	impl_sealed_for_tuple!(A, B);
+	impl_sealed_for_tuple!(A, B, C);
+	impl_sealed_for_tuple!(A, B, C, D);
+	impl_sealed_for_tuple!(A, B, C, D, E);
+	impl_sealed_for_tuple!(A, B, C, D, E, F);
+	impl_sealed_for_tuple!(A, B, C, D, E, F, G);
+	impl_sealed_for_tuple!(A, B, C, D, E, F, G, H);
+	impl_sealed_for_tuple!(A, B, C, D, E, F, G, H, I);
+	impl_sealed_for_tuple!(A, B, C, D, E, F, G, H, I, J);
+	impl_sealed_for_tuple!(A, B, C, D, E, F, G, H, I, J, K);
+	impl_sealed_for_tuple!(A, B, C, D, E, F, G, H, I, J, K, L);
+	impl_sealed_for_tuple!(A, B, C, D, E, F, G, H, I, J, K, L, M);
+	impl_sealed_for_tuple!(A, B, C, D, E, F, G, H, I, J, K, L, M, O);
+	impl_sealed_for_tuple!(A, B, C, D, E, F, G, H, I, J, K, L, M, O, P);
+	impl_sealed_for_tuple!(A, B, C, D, E, F, G, H, I, J, K, L, M, O, P, Q);
+	impl_sealed_for_tuple!(A, B, C, D, E, F, G, H, I, J, K, L, M, O, P, Q, R);
 }
 
 impl<T: Encode> StorageAppend<T> for Vec<T> {}
diff --git a/frame/support/src/storage/types/key.rs b/frame/support/src/storage/types/key.rs
new file mode 100755
index 000000000000..fb3c69ff20cd
--- /dev/null
+++ b/frame/support/src/storage/types/key.rs
@@ -0,0 +1,957 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Storage key type.
+
+use crate::hash::{ReversibleStorageHasher, StorageHasher};
+use codec::{Encode, EncodeLike, FullCodec};
+use paste::paste;
+use sp_std::prelude::*;
+
+/// A type used exclusively by storage maps as their key type.
+///
+/// The final key generated has the following form:
+/// ```nocompile
+/// Hasher1(encode(key1))
+///     ++ Hasher2(encode(key2))
+///     ++ ...
+///     ++ HasherN(encode(keyN))
+/// ```
+pub struct Key<Hasher, KeyType>(core::marker::PhantomData<(Hasher, KeyType)>);
+
+/// A trait that contains the current key as an associated type.
+pub trait KeyGenerator {
+	type Key: EncodeLike<Self::Key>;
+	type KArg: Encode;
+	type HashFn: FnOnce(&[u8]) -> Vec<u8>;
+	type HArg;
+
+	const HASHER_METADATA: &'static [frame_metadata::StorageHasher];
+
+	/// Given a `key` tuple, calculate the final key by encoding each element individuallly and
+	/// hashing them using the corresponding hasher in the `KeyGenerator`.
+	fn final_key<KArg: EncodeLikeTuple<Self::KArg> + TupleToEncodedIter>(key: KArg) -> Vec<u8>;
+	/// Given a `key` tuple, migrate the keys from using the old hashers as given by `hash_fns`
+	/// to using the newer hashers as specified by this `KeyGenerator`.
+	fn migrate_key<KArg: EncodeLikeTuple<Self::KArg> + TupleToEncodedIter>(
+		key: &KArg,
+		hash_fns: Self::HArg,
+	) -> Vec<u8>;
+}
+
+/// A trait containing methods that are only implemented on the Key struct instead of the entire tuple.
+pub trait KeyGeneratorInner: KeyGenerator {
+	type Hasher: StorageHasher;
+
+	/// Hash a given `encoded` byte slice using the `KeyGenerator`'s associated `StorageHasher`.
+	fn final_hash(encoded: &[u8]) -> Vec<u8>;
+}
+
+impl<H: StorageHasher, K: FullCodec> KeyGenerator for Key<H, K> {
+	type Key = K;
+	type KArg = (K,);
+	type HashFn = Box<dyn FnOnce(&[u8]) -> Vec<u8>>;
+	type HArg = (Self::HashFn,);
+
+	const HASHER_METADATA: &'static [frame_metadata::StorageHasher] = &[H::METADATA];
+
+	fn final_key<KArg: EncodeLikeTuple<Self::KArg> + TupleToEncodedIter>(key: KArg) -> Vec<u8> {
+		H::hash(
+			&key.to_encoded_iter()
+				.next()
+				.expect("should have at least one element!"),
+		)
+		.as_ref()
+		.to_vec()
+	}
+
+	fn migrate_key<KArg: EncodeLikeTuple<Self::KArg> + TupleToEncodedIter>(
+		key: &KArg,
+		hash_fns: Self::HArg,
+	) -> Vec<u8> {
+		(hash_fns.0)(
+			&key.to_encoded_iter()
+				.next()
+				.expect("should have at least one element!"),
+		)
+	}
+}
+
+impl<H: StorageHasher, K: FullCodec> KeyGeneratorInner for Key<H, K> {
+	type Hasher = H;
+
+	fn final_hash(encoded: &[u8]) -> Vec<u8> {
+		H::hash(encoded).as_ref().to_vec()
+	}
+}
+
+#[impl_trait_for_tuples::impl_for_tuples(2, 18)]
+#[tuple_types_custom_trait_bound(KeyGeneratorInner)]
+impl KeyGenerator for Tuple {
+	for_tuples!( type Key = ( #(Tuple::Key),* ); );
+	for_tuples!( type KArg = ( #(Tuple::Key),* ); );
+	for_tuples!( type HArg = ( #(Tuple::HashFn),* ); );
+	type HashFn = Box<dyn FnOnce(&[u8]) -> Vec<u8>>;
+
+	const HASHER_METADATA: &'static [frame_metadata::StorageHasher] = &[
+		for_tuples!( #(Tuple::Hasher::METADATA),* )
+	];
+
+	fn final_key<KArg: EncodeLikeTuple<Self::KArg> + TupleToEncodedIter>(key: KArg) -> Vec<u8> {
+		let mut final_key = Vec::new();
+		let mut iter = key.to_encoded_iter();
+		for_tuples!(
+			#(
+				let next_encoded = iter.next().expect("KArg number should be equal to Key number");
+				final_key.extend_from_slice(&Tuple::final_hash(&next_encoded));
+			)*
+		);
+		final_key
+	}
+
+	fn migrate_key<KArg: EncodeLikeTuple<Self::KArg> + TupleToEncodedIter>(
+		key: &KArg,
+		hash_fns: Self::HArg,
+	) -> Vec<u8> {
+		let mut migrated_key = Vec::new();
+		let mut iter = key.to_encoded_iter();
+		for_tuples!(
+			#(
+				let next_encoded = iter.next().expect("KArg number should be equal to Key number");
+				migrated_key.extend_from_slice(&(hash_fns.Tuple)(&next_encoded));
+			)*
+		);
+		migrated_key
+	}
+}
+
+/// Marker trait to indicate that each element in the tuple encodes like the corresponding element
+/// in another tuple.
+///
+/// This trait is sealed.
+pub trait EncodeLikeTuple<T>: crate::storage::private::Sealed {}
+
+macro_rules! impl_encode_like_tuples {
+	($($elem:ident),+) => {
+		paste! {
+			impl<$($elem: Encode,)+ $([<$elem $elem>]: Encode + EncodeLike<$elem>,)+>
+				EncodeLikeTuple<($($elem,)+)> for
+				($([<$elem $elem>],)+) {}
+			impl<$($elem: Encode,)+ $([<$elem $elem>]: Encode + EncodeLike<$elem>,)+>
+				EncodeLikeTuple<($($elem,)+)> for
+				&($([<$elem $elem>],)+) {}
+		}
+	};
+}
+
+impl_encode_like_tuples!(A);
+impl_encode_like_tuples!(A, B);
+impl_encode_like_tuples!(A, B, C);
+impl_encode_like_tuples!(A, B, C, D);
+impl_encode_like_tuples!(A, B, C, D, E);
+impl_encode_like_tuples!(A, B, C, D, E, F);
+impl_encode_like_tuples!(A, B, C, D, E, F, G);
+impl_encode_like_tuples!(A, B, C, D, E, F, G, H);
+impl_encode_like_tuples!(A, B, C, D, E, F, G, H, I);
+impl_encode_like_tuples!(A, B, C, D, E, F, G, H, I, J);
+impl_encode_like_tuples!(A, B, C, D, E, F, G, H, I, J, K);
+impl_encode_like_tuples!(A, B, C, D, E, F, G, H, I, J, K, L);
+impl_encode_like_tuples!(A, B, C, D, E, F, G, H, I, J, K, L, M);
+impl_encode_like_tuples!(A, B, C, D, E, F, G, H, I, J, K, L, M, O);
+impl_encode_like_tuples!(A, B, C, D, E, F, G, H, I, J, K, L, M, O, P);
+impl_encode_like_tuples!(A, B, C, D, E, F, G, H, I, J, K, L, M, O, P, Q);
+impl_encode_like_tuples!(A, B, C, D, E, F, G, H, I, J, K, L, M, O, P, Q, R);
+
+/// Trait to indicate that a tuple can be converted into an iterator of a vector of encoded bytes.
+pub trait TupleToEncodedIter {
+	fn to_encoded_iter(&self) -> sp_std::vec::IntoIter<Vec<u8>>;
+}
+
+#[impl_trait_for_tuples::impl_for_tuples(1, 18)]
+#[tuple_types_custom_trait_bound(Encode)]
+impl TupleToEncodedIter for Tuple {
+	fn to_encoded_iter(&self) -> sp_std::vec::IntoIter<Vec<u8>> {
+		[for_tuples!( #(self.Tuple.encode()),* )]
+			.to_vec()
+			.into_iter()
+	}
+}
+
+impl<T: TupleToEncodedIter> TupleToEncodedIter for &T {
+	fn to_encoded_iter(&self) -> sp_std::vec::IntoIter<Vec<u8>> {
+		(*self).to_encoded_iter()
+	}
+}
+
+/// A trait that indicates the hashers for the keys generated are all reversible.
+pub trait ReversibleKeyGenerator: KeyGenerator {
+	type ReversibleHasher;
+	fn decode_final_key(key_material: &[u8]) -> Result<(Self::Key, &[u8]), codec::Error>;
+}
+
+impl<H: ReversibleStorageHasher, K: FullCodec> ReversibleKeyGenerator for Key<H, K> {
+	type ReversibleHasher = H;
+
+	fn decode_final_key(key_material: &[u8]) -> Result<(Self::Key, &[u8]), codec::Error> {
+		let mut current_key_material = Self::ReversibleHasher::reverse(key_material);
+		let key = K::decode(&mut current_key_material)?;
+		Ok((key, current_key_material))
+	}
+}
+
+#[impl_trait_for_tuples::impl_for_tuples(2, 18)]
+#[tuple_types_custom_trait_bound(ReversibleKeyGenerator + KeyGeneratorInner)]
+impl ReversibleKeyGenerator for Tuple {
+	for_tuples!( type ReversibleHasher = ( #(Tuple::ReversibleHasher),* ); );
+
+	fn decode_final_key(key_material: &[u8]) -> Result<(Self::Key, &[u8]), codec::Error> {
+		let mut current_key_material = key_material;
+		Ok((
+			(for_tuples! {
+				#({
+					let (key, material) = Tuple::decode_final_key(current_key_material)?;
+					current_key_material = material;
+					key
+				}),*
+			}),
+			current_key_material,
+		))
+	}
+}
+
+/// Trait indicating whether a KeyGenerator has the prefix P.
+pub trait HasKeyPrefix<P>: KeyGenerator {
+	type Suffix;
+
+	fn partial_key(prefix: P) -> Vec<u8>;
+}
+
+/// Trait indicating whether a ReversibleKeyGenerator has the prefix P.
+pub trait HasReversibleKeyPrefix<P>: ReversibleKeyGenerator + HasKeyPrefix<P> {
+	fn decode_partial_key(key_material: &[u8]) -> Result<Self::Suffix, codec::Error>;
+}
+
+macro_rules! impl_key_prefix_for {
+	(($($keygen:ident),+), ($($prefix:ident),+), ($($suffix:ident),+)) => {
+		paste! {
+			impl<$($keygen: FullCodec,)+ $( [<$keygen $keygen>]: StorageHasher),+>
+				HasKeyPrefix<($($prefix),+)> for
+				($(Key<[<$keygen $keygen>], $keygen>),+)
+			{
+				type Suffix = ($($suffix),+);
+
+				fn partial_key(prefix: ($($prefix),+)) -> Vec<u8> {
+					<($(Key<[<$prefix $prefix>], $prefix>),+)>::final_key(prefix)
+				}
+			}
+
+			impl<$($keygen: FullCodec,)+ $( [<$keygen $keygen>]: ReversibleStorageHasher),+>
+				HasReversibleKeyPrefix<($($prefix),+)> for
+				($(Key<[<$keygen $keygen>], $keygen>),+)
+			{
+				fn decode_partial_key(key_material: &[u8]) -> Result<Self::Suffix, codec::Error> {
+					<($(Key<[<$suffix $suffix>], $suffix>),+)>::decode_final_key(key_material).map(|k| k.0)
+				}
+			}
+		}
+	};
+	(($($keygen:ident),+), $prefix:ident, ($($suffix:ident),+)) => {
+		paste! {
+			impl<$($keygen: FullCodec,)+ $( [<$keygen $keygen>]: StorageHasher),+>
+				HasKeyPrefix<($prefix,)> for
+				($(Key<[<$keygen $keygen>], $keygen>),+)
+			{
+				type Suffix = ($($suffix),+);
+
+				fn partial_key(prefix: ($prefix,)) -> Vec<u8> {
+					<Key<[<$prefix $prefix>], $prefix>>::final_key(prefix)
+				}
+			}
+
+			impl<$($keygen: FullCodec,)+ $( [<$keygen $keygen>]: ReversibleStorageHasher),+>
+				HasReversibleKeyPrefix<($prefix,)> for
+				($(Key<[<$keygen $keygen>], $keygen>),+)
+			{
+				fn decode_partial_key(key_material: &[u8]) -> Result<Self::Suffix, codec::Error> {
+					<($(Key<[<$suffix $suffix>], $suffix>),+)>::decode_final_key(key_material).map(|k| k.0)
+				}
+			}
+		}
+	};
+	(($($keygen:ident),+), ($($prefix:ident),+), $suffix:ident) => {
+		paste! {
+			impl<$($keygen: FullCodec,)+ $( [<$keygen $keygen>]: StorageHasher),+>
+				HasKeyPrefix<($($prefix),+)> for
+				($(Key<[<$keygen $keygen>], $keygen>),+)
+			{
+				type Suffix = $suffix;
+
+				fn partial_key(prefix: ($($prefix),+)) -> Vec<u8> {
+					<($(Key<[<$prefix $prefix>], $prefix>),+)>::final_key(prefix)
+				}
+			}
+
+			impl<$($keygen: FullCodec,)+ $( [<$keygen $keygen>]: ReversibleStorageHasher),+>
+				HasReversibleKeyPrefix<($($prefix),+)> for
+				($(Key<[<$keygen $keygen>], $keygen>),+)
+			{
+				fn decode_partial_key(key_material: &[u8]) -> Result<Self::Suffix, codec::Error> {
+					<Key<[<$suffix $suffix>], $suffix>>::decode_final_key(key_material).map(|k| k.0)
+				}
+			}
+		}
+	};
+}
+
+impl<A: FullCodec, B: FullCodec, X: StorageHasher, Y: StorageHasher> HasKeyPrefix<(A,)>
+	for (Key<X, A>, Key<Y, B>)
+{
+	type Suffix = B;
+
+	fn partial_key(prefix: (A,)) -> Vec<u8> {
+		<Key<X, A>>::final_key(prefix)
+	}
+}
+
+impl<A: FullCodec, B: FullCodec, X: ReversibleStorageHasher, Y: ReversibleStorageHasher>
+	HasReversibleKeyPrefix<(A,)> for (Key<X, A>, Key<Y, B>)
+{
+	fn decode_partial_key(key_material: &[u8]) -> Result<B, codec::Error> {
+		<Key<Y, B>>::decode_final_key(key_material).map(|k| k.0)
+	}
+}
+
+impl_key_prefix_for!((A, B, C), (A, B), C);
+impl_key_prefix_for!((A, B, C), A, (B, C));
+impl_key_prefix_for!((A, B, C, D), (A, B, C), D);
+impl_key_prefix_for!((A, B, C, D), (A, B), (C, D));
+impl_key_prefix_for!((A, B, C, D), A, (B, C, D));
+impl_key_prefix_for!((A, B, C, D, E), (A, B, C, D), E);
+impl_key_prefix_for!((A, B, C, D, E), (A, B, C), (D, E));
+impl_key_prefix_for!((A, B, C, D, E), (A, B), (C, D, E));
+impl_key_prefix_for!((A, B, C, D, E), A, (B, C, D, E));
+impl_key_prefix_for!((A, B, C, D, E, F), (A, B, C, D, E), F);
+impl_key_prefix_for!((A, B, C, D, E, F), (A, B, C, D), (E, F));
+impl_key_prefix_for!((A, B, C, D, E, F), (A, B, C), (D, E, F));
+impl_key_prefix_for!((A, B, C, D, E, F), (A, B), (C, D, E, F));
+impl_key_prefix_for!((A, B, C, D, E, F), A, (B, C, D, E, F));
+impl_key_prefix_for!((A, B, C, D, E, F, G), (A, B, C, D, E, F), G);
+impl_key_prefix_for!((A, B, C, D, E, F, G), (A, B, C, D, E), (F, G));
+impl_key_prefix_for!((A, B, C, D, E, F, G), (A, B, C, D), (E, F, G));
+impl_key_prefix_for!((A, B, C, D, E, F, G), (A, B, C), (D, E, F, G));
+impl_key_prefix_for!((A, B, C, D, E, F, G), (A, B), (C, D, E, F, G));
+impl_key_prefix_for!((A, B, C, D, E, F, G), A, (B, C, D, E, F, G));
+impl_key_prefix_for!((A, B, C, D, E, F, G, H), (A, B, C, D, E, F, G), H);
+impl_key_prefix_for!((A, B, C, D, E, F, G, H), (A, B, C, D, E, F), (G, H));
+impl_key_prefix_for!((A, B, C, D, E, F, G, H), (A, B, C, D, E), (F, G, H));
+impl_key_prefix_for!((A, B, C, D, E, F, G, H), (A, B, C, D), (E, F, G, H));
+impl_key_prefix_for!((A, B, C, D, E, F, G, H), (A, B, C), (D, E, F, G, H));
+impl_key_prefix_for!((A, B, C, D, E, F, G, H), (A, B), (C, D, E, F, G, H));
+impl_key_prefix_for!((A, B, C, D, E, F, G, H), A, (B, C, D, E, F, G, H));
+impl_key_prefix_for!((A, B, C, D, E, F, G, H, I), (A, B, C, D, E, F, G, H), I);
+impl_key_prefix_for!((A, B, C, D, E, F, G, H, I), (A, B, C, D, E, F, G), (H, I));
+impl_key_prefix_for!((A, B, C, D, E, F, G, H, I), (A, B, C, D, E, F), (G, H, I));
+impl_key_prefix_for!((A, B, C, D, E, F, G, H, I), (A, B, C, D, E), (F, G, H, I));
+impl_key_prefix_for!((A, B, C, D, E, F, G, H, I), (A, B, C, D), (E, F, G, H, I));
+impl_key_prefix_for!((A, B, C, D, E, F, G, H, I), (A, B, C), (D, E, F, G, H, I));
+impl_key_prefix_for!((A, B, C, D, E, F, G, H, I), (A, B), (C, D, E, F, G, H, I));
+impl_key_prefix_for!((A, B, C, D, E, F, G, H, I), A, (B, C, D, E, F, G, H, I));
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J),
+	(A, B, C, D, E, F, G, H, I),
+	J
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J),
+	(A, B, C, D, E, F, G, H),
+	(I, J)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J),
+	(A, B, C, D, E, F, G),
+	(H, I, J)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J),
+	(A, B, C, D, E, F),
+	(G, H, I, J)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J),
+	(A, B, C, D, E),
+	(F, G, H, I, J)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J),
+	(A, B, C, D),
+	(E, F, G, H, I, J)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J),
+	(A, B, C),
+	(D, E, F, G, H, I, J)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J),
+	(A, B),
+	(C, D, E, F, G, H, I, J)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J),
+	A,
+	(B, C, D, E, F, G, H, I, J)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K),
+	(A, B, C, D, E, F, G, H, I, J),
+	K
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K),
+	(A, B, C, D, E, F, G, H, I),
+	(J, K)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K),
+	(A, B, C, D, E, F, G, H),
+	(I, J, K)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K),
+	(A, B, C, D, E, F, G),
+	(H, I, J, K)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K),
+	(A, B, C, D, E, F),
+	(G, H, I, J, K)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K),
+	(A, B, C, D, E),
+	(F, G, H, I, J, K)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K),
+	(A, B, C, D),
+	(E, F, G, H, I, J, K)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K),
+	(A, B, C),
+	(D, E, F, G, H, I, J, K)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K),
+	(A, B),
+	(C, D, E, F, G, H, I, J, K)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K),
+	A,
+	(B, C, D, E, F, G, H, I, J, K)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L),
+	(A, B, C, D, E, F, G, H, I, J, K),
+	L
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L),
+	(A, B, C, D, E, F, G, H, I, J),
+	(K, L)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L),
+	(A, B, C, D, E, F, G, H, I),
+	(J, K, L)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L),
+	(A, B, C, D, E, F, G, H),
+	(I, J, K, L)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L),
+	(A, B, C, D, E, F, G),
+	(H, I, J, K, L)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L),
+	(A, B, C, D, E, F),
+	(G, H, I, J, K, L)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L),
+	(A, B, C, D, E),
+	(F, G, H, I, J, K, L)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L),
+	(A, B, C, D),
+	(E, F, G, H, I, J, K, L)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L),
+	(A, B, C),
+	(D, E, F, G, H, I, J, K, L)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L),
+	(A, B),
+	(C, D, E, F, G, H, I, J, K, L)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L),
+	A,
+	(B, C, D, E, F, G, H, I, J, K, L)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M),
+	(A, B, C, D, E, F, G, H, I, J, K, L),
+	M
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M),
+	(A, B, C, D, E, F, G, H, I, J, K),
+	(L, M)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M),
+	(A, B, C, D, E, F, G, H, I, J),
+	(K, L, M)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M),
+	(A, B, C, D, E, F, G, H, I),
+	(J, K, L, M)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M),
+	(A, B, C, D, E, F, G, H),
+	(I, J, K, L, M)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M),
+	(A, B, C, D, E, F, G),
+	(H, I, J, K, L, M)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M),
+	(A, B, C, D, E, F),
+	(G, H, I, J, K, L, M)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M),
+	(A, B, C, D, E),
+	(F, G, H, I, J, K, L, M)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M),
+	(A, B, C, D),
+	(E, F, G, H, I, J, K, L, M)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M),
+	(A, B, C),
+	(D, E, F, G, H, I, J, K, L, M)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M),
+	(A, B),
+	(C, D, E, F, G, H, I, J, K, L, M)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M),
+	A,
+	(B, C, D, E, F, G, H, I, J, K, L, M)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
+	(A, B, C, D, E, F, G, H, I, J, K, L, M),
+	N
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
+	(A, B, C, D, E, F, G, H, I, J, K, L),
+	(M, N)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
+	(A, B, C, D, E, F, G, H, I, J, K),
+	(L, M, N)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
+	(A, B, C, D, E, F, G, H, I, J),
+	(K, L, M, N)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
+	(A, B, C, D, E, F, G, H, I),
+	(J, K, L, M, N)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
+	(A, B, C, D, E, F, G, H),
+	(I, J, K, L, M, N)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
+	(A, B, C, D, E, F, G),
+	(H, I, J, K, L, M, N)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
+	(A, B, C, D, E, F),
+	(G, H, I, J, K, L, M, N)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
+	(A, B, C, D, E),
+	(F, G, H, I, J, K, L, M, N)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
+	(A, B, C, D),
+	(E, F, G, H, I, J, K, L, M, N)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
+	(A, B, C),
+	(D, E, F, G, H, I, J, K, L, M, N)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
+	(A, B),
+	(C, D, E, F, G, H, I, J, K, L, M, N)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
+	A,
+	(B, C, D, E, F, G, H, I, J, K, L, M, N)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
+	O
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
+	(A, B, C, D, E, F, G, H, I, J, K, L, M),
+	(N, O)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
+	(A, B, C, D, E, F, G, H, I, J, K, L),
+	(M, N, O)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
+	(A, B, C, D, E, F, G, H, I, J, K),
+	(L, M, N, O)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
+	(A, B, C, D, E, F, G, H, I, J),
+	(K, L, M, N, O)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
+	(A, B, C, D, E, F, G, H, I),
+	(J, K, L, M, N, O)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
+	(A, B, C, D, E, F, G, H),
+	(I, J, K, L, M, N, O)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
+	(A, B, C, D, E, F, G),
+	(H, I, J, K, L, M, N, O)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
+	(A, B, C, D, E, F),
+	(G, H, I, J, K, L, M, N, O)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
+	(A, B, C, D, E),
+	(F, G, H, I, J, K, L, M, N, O)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
+	(A, B, C, D),
+	(E, F, G, H, I, J, K, L, M, N, O)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
+	(A, B, C),
+	(D, E, F, G, H, I, J, K, L, M, N, O)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
+	(A, B),
+	(C, D, E, F, G, H, I, J, K, L, M, N, O)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
+	A,
+	(B, C, D, E, F, G, H, I, J, K, L, M, N, O)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
+	P
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
+	(O, P)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
+	(A, B, C, D, E, F, G, H, I, J, K, L, M),
+	(N, O, P)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
+	(A, B, C, D, E, F, G, H, I, J, K, L),
+	(M, N, O, P)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
+	(A, B, C, D, E, F, G, H, I, J, K),
+	(L, M, N, O, P)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
+	(A, B, C, D, E, F, G, H, I, J),
+	(K, L, M, N, O, P)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
+	(A, B, C, D, E, F, G, H, I),
+	(J, K, L, M, N, O, P)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
+	(A, B, C, D, E, F, G, H),
+	(I, J, K, L, M, N, O, P)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
+	(A, B, C, D, E, F, G),
+	(H, I, J, K, L, M, N, O, P)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
+	(A, B, C, D, E, F),
+	(G, H, I, J, K, L, M, N, O, P)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
+	(A, B, C, D, E),
+	(F, G, H, I, J, K, L, M, N, O, P)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
+	(A, B, C, D),
+	(E, F, G, H, I, J, K, L, M, N, O, P)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
+	(A, B, C),
+	(D, E, F, G, H, I, J, K, L, M, N, O, P)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
+	(A, B),
+	(C, D, E, F, G, H, I, J, K, L, M, N, O, P)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
+	A,
+	(B, C, D, E, F, G, H, I, J, K, L, M, N, O, P)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
+	Q
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
+	(P, Q)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
+	(O, P, Q)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
+	(A, B, C, D, E, F, G, H, I, J, K, L, M),
+	(N, O, P, Q)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
+	(A, B, C, D, E, F, G, H, I, J, K, L),
+	(M, N, O, P, Q)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
+	(A, B, C, D, E, F, G, H, I, J, K),
+	(L, M, N, O, P, Q)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
+	(A, B, C, D, E, F, G, H, I, J),
+	(K, L, M, N, O, P, Q)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
+	(A, B, C, D, E, F, G, H, I),
+	(J, K, L, M, N, O, P, Q)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
+	(A, B, C, D, E, F, G, H),
+	(I, J, K, L, M, N, O, P, Q)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
+	(A, B, C, D, E, F, G),
+	(H, I, J, K, L, M, N, O, P, Q)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
+	(A, B, C, D, E, F),
+	(G, H, I, J, K, L, M, N, O, P, Q)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
+	(A, B, C, D, E),
+	(F, G, H, I, J, K, L, M, N, O, P, Q)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
+	(A, B, C, D),
+	(E, F, G, H, I, J, K, L, M, N, O, P, Q)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
+	(A, B, C),
+	(D, E, F, G, H, I, J, K, L, M, N, O, P, Q)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
+	(A, B),
+	(C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
+	A,
+	(B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
+	R
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
+	(Q, R)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
+	(P, Q, R)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
+	(O, P, Q, R)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
+	(A, B, C, D, E, F, G, H, I, J, K, L, M),
+	(N, O, P, Q, R)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
+	(A, B, C, D, E, F, G, H, I, J, K, L),
+	(M, N, O, P, Q, R)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
+	(A, B, C, D, E, F, G, H, I, J, K),
+	(L, M, N, O, P, Q, R)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
+	(A, B, C, D, E, F, G, H, I, J),
+	(K, L, M, N, O, P, Q, R)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
+	(A, B, C, D, E, F, G, H, I),
+	(J, K, L, M, N, O, P, Q, R)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
+	(A, B, C, D, E, F, G, H),
+	(I, J, K, L, M, N, O, P, Q, R)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
+	(A, B, C, D, E, F, G),
+	(H, I, J, K, L, M, N, O, P, Q, R)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
+	(A, B, C, D, E, F),
+	(G, H, I, J, K, L, M, N, O, P, Q, R)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
+	(A, B, C, D, E),
+	(F, G, H, I, J, K, L, M, N, O, P, Q, R)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
+	(A, B, C, D),
+	(E, F, G, H, I, J, K, L, M, N, O, P, Q, R)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
+	(A, B, C),
+	(D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
+	(A, B),
+	(C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R)
+);
+impl_key_prefix_for!(
+	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
+	A,
+	(B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R)
+);
diff --git a/frame/support/src/storage/types/mod.rs b/frame/support/src/storage/types/mod.rs
index 5bb6684b7925..5b7aa61d3769 100644
--- a/frame/support/src/storage/types/mod.rs
+++ b/frame/support/src/storage/types/mod.rs
@@ -21,13 +21,20 @@
 use codec::FullCodec;
 use frame_metadata::{DefaultByte, StorageEntryModifier};
 
-mod value;
-mod map;
 mod double_map;
+mod key;
+mod map;
+mod nmap;
+mod value;
 
-pub use value::{StorageValue, StorageValueMetadata};
-pub use map::{StorageMap, StorageMapMetadata};
 pub use double_map::{StorageDoubleMap, StorageDoubleMapMetadata};
+pub use key::{
+	EncodeLikeTuple, HasKeyPrefix, HasReversibleKeyPrefix, Key, KeyGenerator,
+	ReversibleKeyGenerator, TupleToEncodedIter,
+};
+pub use map::{StorageMap, StorageMapMetadata};
+pub use nmap::{StorageNMap, StorageNMapMetadata};
+pub use value::{StorageValue, StorageValueMetadata};
 
 /// Trait implementing how the storage optional value is converted into the queried type.
 ///
@@ -104,5 +111,5 @@ impl<Value: FullCodec, OnEmpty: crate::traits::Get<Value>> DefaultByte
 		OnEmpty::get().encode()
 	}
 }
-unsafe impl <Value, OnEmpty: crate::traits::Get<Value>> Send for OnEmptyGetter<Value, OnEmpty> {}
-unsafe impl <Value, OnEmpty: crate::traits::Get<Value>> Sync for OnEmptyGetter<Value, OnEmpty> {}
+unsafe impl<Value, OnEmpty: crate::traits::Get<Value>> Send for OnEmptyGetter<Value, OnEmpty> {}
+unsafe impl<Value, OnEmpty: crate::traits::Get<Value>> Sync for OnEmptyGetter<Value, OnEmpty> {}
diff --git a/frame/support/src/storage/types/nmap.rs b/frame/support/src/storage/types/nmap.rs
new file mode 100755
index 000000000000..1a2b6d4d55dc
--- /dev/null
+++ b/frame/support/src/storage/types/nmap.rs
@@ -0,0 +1,995 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Storage map type. Implements StorageDoubleMap, StorageIterableDoubleMap,
+//! StoragePrefixedDoubleMap traits and their methods directly.
+
+use crate::{
+	storage::{
+		types::{
+			EncodeLikeTuple, HasKeyPrefix, HasReversibleKeyPrefix, OnEmptyGetter,
+			OptionQuery, QueryKindTrait, TupleToEncodedIter,
+		},
+		KeyGenerator, PrefixIterator, StorageAppend, StorageDecodeLength,
+	},
+	traits::{GetDefault, StorageInstance},
+};
+use codec::{Decode, Encode, EncodeLike, FullCodec};
+use frame_metadata::{DefaultByteGetter, StorageEntryModifier};
+use sp_std::prelude::*;
+
+/// A type that allow to store values for an arbitrary number of keys in the form of
+/// `(Key<Hasher1, key1>, Key<Hasher2, key2>, ..., Key<HasherN, keyN>)`.
+///
+/// Each value is stored at:
+/// ```nocompile
+/// Twox128(Prefix::pallet_prefix())
+///		++ Twox128(Prefix::STORAGE_PREFIX)
+///		++ Hasher1(encode(key1))
+///		++ Hasher2(encode(key2))
+/// 	++ ...
+/// 	++ HasherN(encode(keyN))
+/// ```
+///
+/// # Warning
+///
+/// If the keys are not trusted (e.g. can be set by a user), a cryptographic `hasher`
+/// such as `blake2_128_concat` must be used for the key hashers. Otherwise, other values
+/// in storage can be compromised.
+pub struct StorageNMap<Prefix, Key, Value, QueryKind = OptionQuery, OnEmpty = GetDefault>(
+	core::marker::PhantomData<(Prefix, Key, Value, QueryKind, OnEmpty)>,
+);
+
+impl<Prefix, Key, Value, QueryKind, OnEmpty> crate::storage::generator::StorageNMap<Key, Value>
+	for StorageNMap<Prefix, Key, Value, QueryKind, OnEmpty>
+where
+	Prefix: StorageInstance,
+	Key: super::key::KeyGenerator,
+	Value: FullCodec,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
+{
+	type Query = QueryKind::Query;
+	fn module_prefix() -> &'static [u8] {
+		Prefix::pallet_prefix().as_bytes()
+	}
+	fn storage_prefix() -> &'static [u8] {
+		Prefix::STORAGE_PREFIX.as_bytes()
+	}
+	fn from_optional_value_to_query(v: Option<Value>) -> Self::Query {
+		QueryKind::from_optional_value_to_query(v)
+	}
+	fn from_query_to_optional_value(v: Self::Query) -> Option<Value> {
+		QueryKind::from_query_to_optional_value(v)
+	}
+}
+
+impl<Prefix, Key, Value, QueryKind, OnEmpty> crate::storage::StoragePrefixedMap<Value>
+	for StorageNMap<Prefix, Key, Value, QueryKind, OnEmpty>
+where
+	Prefix: StorageInstance,
+	Key: super::key::KeyGenerator,
+	Value: FullCodec,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
+{
+	fn module_prefix() -> &'static [u8] {
+		<Self as crate::storage::generator::StorageNMap<Key, Value>>::module_prefix()
+	}
+	fn storage_prefix() -> &'static [u8] {
+		<Self as crate::storage::generator::StorageNMap<Key, Value>>::storage_prefix()
+	}
+}
+
+impl<Prefix, Key, Value, QueryKind, OnEmpty> StorageNMap<Prefix, Key, Value, QueryKind, OnEmpty>
+where
+	Prefix: StorageInstance,
+	Key: super::key::KeyGenerator,
+	Value: FullCodec,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
+{
+	/// Get the storage key used to fetch a value corresponding to a specific key.
+	pub fn hashed_key_for<KArg: EncodeLikeTuple<Key::KArg> + TupleToEncodedIter>(key: KArg) -> Vec<u8> {
+		<Self as crate::storage::StorageNMap<Key, Value>>::hashed_key_for(key)
+	}
+
+	/// Does the value (explicitly) exist in storage?
+	pub fn contains_key<KArg: EncodeLikeTuple<Key::KArg> + TupleToEncodedIter>(key: KArg) -> bool {
+		<Self as crate::storage::StorageNMap<Key, Value>>::contains_key(key)
+	}
+
+	/// Load the value associated with the given key from the map.
+	pub fn get<KArg: EncodeLikeTuple<Key::KArg> + TupleToEncodedIter>(key: KArg) -> QueryKind::Query {
+		<Self as crate::storage::StorageNMap<Key, Value>>::get(key)
+	}
+
+	/// Try to get the value for the given key from the map.
+	///
+	/// Returns `Ok` if it exists, `Err` if not.
+	pub fn try_get<KArg: EncodeLikeTuple<Key::KArg> + TupleToEncodedIter>(
+		key: KArg,
+	) -> Result<Value, ()> {
+		<Self as crate::storage::StorageNMap<Key, Value>>::try_get(key)
+	}
+
+	/// Take a value from storage, removing it afterwards.
+	pub fn take<KArg: EncodeLikeTuple<Key::KArg> + TupleToEncodedIter>(key: KArg) -> QueryKind::Query {
+		<Self as crate::storage::StorageNMap<Key, Value>>::take(key)
+	}
+
+	/// Swap the values of two key-pairs.
+	pub fn swap<KOther, KArg1, KArg2>(key1: KArg1, key2: KArg2)
+	where
+		KOther: KeyGenerator,
+		KArg1: EncodeLikeTuple<Key::KArg> + TupleToEncodedIter,
+		KArg2: EncodeLikeTuple<KOther::KArg> + TupleToEncodedIter,
+	{
+		<Self as crate::storage::StorageNMap<Key, Value>>::swap::<KOther, _, _>(key1, key2)
+	}
+
+	/// Store a value to be associated with the given keys from the map.
+	pub fn insert<KArg, VArg>(key: KArg, val: VArg)
+	where
+		KArg: EncodeLikeTuple<Key::KArg> + TupleToEncodedIter,
+		VArg: EncodeLike<Value>,
+	{
+		<Self as crate::storage::StorageNMap<Key, Value>>::insert(key, val)
+	}
+
+	/// Remove the value under the given keys.
+	pub fn remove<KArg: EncodeLikeTuple<Key::KArg> + TupleToEncodedIter>(key: KArg) {
+		<Self as crate::storage::StorageNMap<Key, Value>>::remove(key)
+	}
+
+	/// Remove all values under the first key.
+	pub fn remove_prefix<KP>(partial_key: KP)
+	where
+		Key: HasKeyPrefix<KP>,
+	{
+		<Self as crate::storage::StorageNMap<Key, Value>>::remove_prefix(partial_key)
+	}
+
+	/// Iterate over values that share the first key.
+	pub fn iter_prefix_values<KP>(partial_key: KP) -> PrefixIterator<Value>
+	where
+		Key: HasKeyPrefix<KP>,
+	{
+		<Self as crate::storage::StorageNMap<Key, Value>>::iter_prefix_values(partial_key)
+	}
+
+	/// Mutate the value under the given keys.
+	pub fn mutate<KArg, R, F>(key: KArg, f: F) -> R
+	where
+		KArg: EncodeLikeTuple<Key::KArg> + TupleToEncodedIter,
+		F: FnOnce(&mut QueryKind::Query) -> R,
+	{
+		<Self as crate::storage::StorageNMap<Key, Value>>::mutate(key, f)
+	}
+
+	/// Mutate the value under the given keys when the closure returns `Ok`.
+	pub fn try_mutate<KArg, R, E, F>(key: KArg, f: F) -> Result<R, E>
+	where
+		KArg: EncodeLikeTuple<Key::KArg> + TupleToEncodedIter,
+		F: FnOnce(&mut QueryKind::Query) -> Result<R, E>,
+	{
+		<Self as crate::storage::StorageNMap<Key, Value>>::try_mutate(key, f)
+	}
+
+	/// Mutate the value under the given keys. Deletes the item if mutated to a `None`.
+	pub fn mutate_exists<KArg, R, F>(key: KArg, f: F) -> R
+	where
+		KArg: EncodeLikeTuple<Key::KArg> + TupleToEncodedIter,
+		F: FnOnce(&mut Option<Value>) -> R,
+	{
+		<Self as crate::storage::StorageNMap<Key, Value>>::mutate_exists(key, f)
+	}
+
+	/// Mutate the item, only if an `Ok` value is returned. Deletes the item if mutated to a `None`.
+	pub fn try_mutate_exists<KArg, R, E, F>(key: KArg, f: F) -> Result<R, E>
+	where
+		KArg: EncodeLikeTuple<Key::KArg> + TupleToEncodedIter,
+		F: FnOnce(&mut Option<Value>) -> Result<R, E>,
+	{
+		<Self as crate::storage::StorageNMap<Key, Value>>::try_mutate_exists(key, f)
+	}
+
+	/// Append the given item to the value in the storage.
+	///
+	/// `Value` is required to implement [`StorageAppend`].
+	///
+	/// # Warning
+	///
+	/// If the storage item is not encoded properly, the storage will be overwritten
+	/// and set to `[item]`. Any default value set for the storage item will be ignored
+	/// on overwrite.
+	pub fn append<Item, EncodeLikeItem, KArg>(key: KArg, item: EncodeLikeItem)
+	where
+		KArg: EncodeLikeTuple<Key::KArg> + TupleToEncodedIter,
+		Item: Encode,
+		EncodeLikeItem: EncodeLike<Item>,
+		Value: StorageAppend<Item>,
+	{
+		<Self as crate::storage::StorageNMap<Key, Value>>::append(key, item)
+	}
+
+	/// Read the length of the storage value without decoding the entire value under the
+	/// given `key1` and `key2`.
+	///
+	/// `Value` is required to implement [`StorageDecodeLength`].
+	///
+	/// If the value does not exists or it fails to decode the length, `None` is returned.
+	/// Otherwise `Some(len)` is returned.
+	///
+	/// # Warning
+	///
+	/// `None` does not mean that `get()` does not return a value. The default value is completly
+	/// ignored by this function.
+	pub fn decode_len<KArg: EncodeLikeTuple<Key::KArg> + TupleToEncodedIter>(key: KArg) -> Option<usize>
+	where
+		Value: StorageDecodeLength,
+	{
+		<Self as crate::storage::StorageNMap<Key, Value>>::decode_len(key)
+	}
+
+	/// Migrate an item with the given `key` from defunct `hash_fns` to the current hashers.
+	///
+	/// If the key doesn't exist, then it's a no-op. If it does, then it returns its value.
+	pub fn migrate_keys<KArg>(key: KArg, hash_fns: Key::HArg) -> Option<Value>
+	where
+		KArg: EncodeLikeTuple<Key::KArg> + TupleToEncodedIter
+	{
+		<Self as crate::storage::StorageNMap<Key, Value>>::migrate_keys::<_>(key, hash_fns)
+	}
+
+	/// Remove all value of the storage.
+	pub fn remove_all() {
+		<Self as crate::storage::StoragePrefixedMap<Value>>::remove_all()
+	}
+
+	/// Iter over all value of the storage.
+	///
+	/// NOTE: If a value failed to decode becaues storage is corrupted then it is skipped.
+	pub fn iter_values() -> crate::storage::PrefixIterator<Value> {
+		<Self as crate::storage::StoragePrefixedMap<Value>>::iter_values()
+	}
+
+	/// Translate the values of all elements by a function `f`, in the map in no particular order.
+	/// By returning `None` from `f` for an element, you'll remove it from the map.
+	///
+	/// NOTE: If a value fail to decode because storage is corrupted then it is skipped.
+	///
+	/// # Warning
+	///
+	/// This function must be used with care, before being updated the storage still contains the
+	/// old type, thus other calls (such as `get`) will fail at decoding it.
+	///
+	/// # Usage
+	///
+	/// This would typically be called inside the module implementation of on_runtime_upgrade.
+	pub fn translate_values<OldValue: Decode, F: FnMut(OldValue) -> Option<Value>>(f: F) {
+		<Self as crate::storage::StoragePrefixedMap<Value>>::translate_values(f)
+	}
+}
+
+impl<Prefix, Key, Value, QueryKind, OnEmpty> StorageNMap<Prefix, Key, Value, QueryKind, OnEmpty>
+where
+	Prefix: StorageInstance,
+	Key: super::key::ReversibleKeyGenerator,
+	Value: FullCodec,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
+{
+	/// Enumerate all elements in the map with prefix key `kp` in no particular order.
+	///
+	/// If you add or remove values whose prefix key is `kp` to the map while doing this, you'll get
+	/// undefined results.
+	pub fn iter_prefix<KP>(
+		kp: KP,
+	) -> crate::storage::PrefixIterator<(<Key as HasKeyPrefix<KP>>::Suffix, Value)>
+	where
+		Key: HasReversibleKeyPrefix<KP>,
+	{
+		<Self as crate::storage::IterableStorageNMap<Key, Value>>::iter_prefix(kp)
+	}
+
+	/// Remove all elements from the map with prefix key `kp` and iterate through them in no
+	/// particular order.
+	///
+	/// If you add elements with prefix key `k1` to the map while doing this, you'll get undefined
+	/// results.
+	pub fn drain_prefix<KP>(
+		kp: KP,
+	) -> crate::storage::PrefixIterator<(<Key as HasKeyPrefix<KP>>::Suffix, Value)>
+	where
+		Key: HasReversibleKeyPrefix<KP>,
+	{
+		<Self as crate::storage::IterableStorageNMap<Key, Value>>::drain_prefix(kp)
+	}
+
+	/// Enumerate all elements in the map in no particular order.
+	///
+	/// If you add or remove values to the map while doing this, you'll get undefined results.
+	pub fn iter() -> crate::storage::PrefixIterator<(Key::Key, Value)> {
+		<Self as crate::storage::IterableStorageNMap<Key, Value>>::iter()
+	}
+
+	/// Remove all elements from the map and iterate through them in no particular order.
+	///
+	/// If you add elements to the map while doing this, you'll get undefined results.
+	pub fn drain() -> crate::storage::PrefixIterator<(Key::Key, Value)> {
+		<Self as crate::storage::IterableStorageNMap<Key, Value>>::drain()
+	}
+
+	/// Translate the values of all elements by a function `f`, in the map in no particular order.
+	///
+	/// By returning `None` from `f` for an element, you'll remove it from the map.
+	///
+	/// NOTE: If a value fail to decode because storage is corrupted then it is skipped.
+	pub fn translate<O: Decode, F: FnMut(Key::Key, O) -> Option<Value>>(f: F) {
+		<Self as crate::storage::IterableStorageNMap<Key, Value>>::translate(f)
+	}
+}
+
+/// Part of storage metadata for a storage n map.
+///
+/// NOTE: Generic hashers is supported.
+pub trait StorageNMapMetadata {
+	const MODIFIER: StorageEntryModifier;
+	const NAME: &'static str;
+	const DEFAULT: DefaultByteGetter;
+	const HASHERS: &'static [frame_metadata::StorageHasher];
+}
+
+impl<Prefix, Key, Value, QueryKind, OnEmpty> StorageNMapMetadata
+	for StorageNMap<Prefix, Key, Value, QueryKind, OnEmpty>
+where
+	Prefix: StorageInstance,
+	Key: super::key::KeyGenerator,
+	Value: FullCodec,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
+{
+	const MODIFIER: StorageEntryModifier = QueryKind::METADATA;
+	const NAME: &'static str = Prefix::STORAGE_PREFIX;
+	const DEFAULT: DefaultByteGetter = DefaultByteGetter(
+		&OnEmptyGetter::<QueryKind::Query, OnEmpty>(core::marker::PhantomData),
+	);
+	const HASHERS: &'static [frame_metadata::StorageHasher] = Key::HASHER_METADATA;
+}
+
+#[cfg(test)]
+mod test {
+	use super::*;
+	use crate::hash::*;
+	use crate::storage::types::{Key, ValueQuery};
+	use frame_metadata::StorageEntryModifier;
+	use sp_io::{hashing::twox_128, TestExternalities};
+
+	struct Prefix;
+	impl StorageInstance for Prefix {
+		fn pallet_prefix() -> &'static str {
+			"test"
+		}
+		const STORAGE_PREFIX: &'static str = "foo";
+	}
+
+	struct ADefault;
+	impl crate::traits::Get<u32> for ADefault {
+		fn get() -> u32 {
+			98
+		}
+	}
+
+	#[test]
+	fn test_1_key() {
+		type A = StorageNMap<Prefix, Key<Blake2_128Concat, u16>, u32, OptionQuery>;
+		type AValueQueryWithAnOnEmpty =
+			StorageNMap<Prefix, Key<Blake2_128Concat, u16>, u32, ValueQuery, ADefault>;
+		type B = StorageNMap<Prefix, Key<Blake2_256, u16>, u32, ValueQuery>;
+		type C = StorageNMap<Prefix, Key<Blake2_128Concat, u16>, u8, ValueQuery>;
+		type WithLen = StorageNMap<Prefix, Key<Blake2_128Concat, u16>, Vec<u32>>;
+
+		TestExternalities::default().execute_with(|| {
+			let mut k: Vec<u8> = vec![];
+			k.extend(&twox_128(b"test"));
+			k.extend(&twox_128(b"foo"));
+			k.extend(&3u16.blake2_128_concat());
+			assert_eq!(A::hashed_key_for((&3,)).to_vec(), k);
+
+			assert_eq!(A::contains_key((3,)), false);
+			assert_eq!(A::get((3,)), None);
+			assert_eq!(AValueQueryWithAnOnEmpty::get((3,)), 98);
+
+			A::insert((3,), 10);
+			assert_eq!(A::contains_key((3,)), true);
+			assert_eq!(A::get((3,)), Some(10));
+			assert_eq!(AValueQueryWithAnOnEmpty::get((3,)), 10);
+
+			A::swap::<Key<Blake2_128Concat, u16>, _, _>((3,), (2,));
+			assert_eq!(A::contains_key((3,)), false);
+			assert_eq!(A::contains_key((2,)), true);
+			assert_eq!(A::get((3,)), None);
+			assert_eq!(AValueQueryWithAnOnEmpty::get((3,)), 98);
+			assert_eq!(A::get((2,)), Some(10));
+			assert_eq!(AValueQueryWithAnOnEmpty::get((2,)), 10);
+
+			A::remove((2,));
+			assert_eq!(A::contains_key((2,)), false);
+			assert_eq!(A::get((2,)), None);
+
+			AValueQueryWithAnOnEmpty::mutate((2,), |v| *v = *v * 2);
+			AValueQueryWithAnOnEmpty::mutate((2,), |v| *v = *v * 2);
+			assert_eq!(A::contains_key((2,)), true);
+			assert_eq!(A::get((2,)), Some(98 * 4));
+
+			A::remove((2,));
+			let _: Result<(), ()> = AValueQueryWithAnOnEmpty::try_mutate((2,), |v| {
+				*v = *v * 2;
+				Ok(())
+			});
+			let _: Result<(), ()> = AValueQueryWithAnOnEmpty::try_mutate((2,), |v| {
+				*v = *v * 2;
+				Ok(())
+			});
+			assert_eq!(A::contains_key((2,)), true);
+			assert_eq!(A::get((2,)), Some(98 * 4));
+
+			A::remove((2,));
+			let _: Result<(), ()> = AValueQueryWithAnOnEmpty::try_mutate((2,), |v| {
+				*v = *v * 2;
+				Err(())
+			});
+			assert_eq!(A::contains_key((2,)), false);
+
+			A::remove((2,));
+			AValueQueryWithAnOnEmpty::mutate_exists((2,), |v| {
+				assert!(v.is_none());
+				*v = Some(10);
+			});
+			assert_eq!(A::contains_key((2,)), true);
+			assert_eq!(A::get((2,)), Some(10));
+			AValueQueryWithAnOnEmpty::mutate_exists((2,), |v| {
+				*v = Some(v.unwrap() * 10);
+			});
+			assert_eq!(A::contains_key((2,)), true);
+			assert_eq!(A::get((2,)), Some(100));
+
+			A::remove((2,));
+			let _: Result<(), ()> = AValueQueryWithAnOnEmpty::try_mutate_exists((2,), |v| {
+				assert!(v.is_none());
+				*v = Some(10);
+				Ok(())
+			});
+			assert_eq!(A::contains_key((2,)), true);
+			assert_eq!(A::get((2,)), Some(10));
+			let _: Result<(), ()> = AValueQueryWithAnOnEmpty::try_mutate_exists((2,), |v| {
+				*v = Some(v.unwrap() * 10);
+				Ok(())
+			});
+			assert_eq!(A::contains_key((2,)), true);
+			assert_eq!(A::get((2,)), Some(100));
+			assert_eq!(A::try_get((2,)), Ok(100));
+			let _: Result<(), ()> = AValueQueryWithAnOnEmpty::try_mutate_exists((2,), |v| {
+				*v = Some(v.unwrap() * 10);
+				Err(())
+			});
+			assert_eq!(A::contains_key((2,)), true);
+			assert_eq!(A::get((2,)), Some(100));
+
+			A::insert((2,), 10);
+			assert_eq!(A::take((2,)), Some(10));
+			assert_eq!(A::contains_key((2,)), false);
+			assert_eq!(AValueQueryWithAnOnEmpty::take((2,)), 98);
+			assert_eq!(A::contains_key((2,)), false);
+			assert_eq!(A::try_get((2,)), Err(()));
+
+			B::insert((2,), 10);
+			assert_eq!(
+				A::migrate_keys((2,), (Box::new(|key| Blake2_256::hash(key).to_vec()),),),
+				Some(10)
+			);
+			assert_eq!(A::contains_key((2,)), true);
+			assert_eq!(A::get((2,)), Some(10));
+
+			A::insert((3,), 10);
+			A::insert((4,), 10);
+			A::remove_all();
+			assert_eq!(A::contains_key((3,)), false);
+			assert_eq!(A::contains_key((4,)), false);
+
+			A::insert((3,), 10);
+			A::insert((4,), 10);
+			assert_eq!(A::iter_values().collect::<Vec<_>>(), vec![10, 10]);
+
+			C::insert((3,), 10);
+			C::insert((4,), 10);
+			A::translate_values::<u8, _>(|v| Some((v * 2).into()));
+			assert_eq!(A::iter().collect::<Vec<_>>(), vec![(4, 20), (3, 20)]);
+
+			A::insert((3,), 10);
+			A::insert((4,), 10);
+			assert_eq!(A::iter().collect::<Vec<_>>(), vec![(4, 10), (3, 10)]);
+			assert_eq!(A::drain().collect::<Vec<_>>(), vec![(4, 10), (3, 10)]);
+			assert_eq!(A::iter().collect::<Vec<_>>(), vec![]);
+
+			C::insert((3,), 10);
+			C::insert((4,), 10);
+			A::translate::<u8, _>(|k1, v| Some((k1 as u16 * v as u16).into()));
+			assert_eq!(A::iter().collect::<Vec<_>>(), vec![(4, 40), (3, 30)]);
+
+			assert_eq!(A::MODIFIER, StorageEntryModifier::Optional);
+			assert_eq!(
+				AValueQueryWithAnOnEmpty::MODIFIER,
+				StorageEntryModifier::Default
+			);
+			assert_eq!(A::NAME, "foo");
+			assert_eq!(
+				AValueQueryWithAnOnEmpty::DEFAULT.0.default_byte(),
+				98u32.encode()
+			);
+			assert_eq!(A::DEFAULT.0.default_byte(), Option::<u32>::None.encode());
+
+			WithLen::remove_all();
+			assert_eq!(WithLen::decode_len((3,)), None);
+			WithLen::append((0,), 10);
+			assert_eq!(WithLen::decode_len((0,)), Some(1));
+		});
+	}
+
+	#[test]
+	fn test_2_keys() {
+		type A = StorageNMap<
+			Prefix,
+			(Key<Blake2_128Concat, u16>, Key<Twox64Concat, u8>),
+			u32,
+			OptionQuery,
+		>;
+		type AValueQueryWithAnOnEmpty = StorageNMap<
+			Prefix,
+			(Key<Blake2_128Concat, u16>, Key<Twox64Concat, u8>),
+			u32,
+			ValueQuery,
+			ADefault,
+		>;
+		type B = StorageNMap<Prefix, (Key<Blake2_256, u16>, Key<Twox128, u8>), u32, ValueQuery>;
+		type C = StorageNMap<
+			Prefix,
+			(Key<Blake2_128Concat, u16>, Key<Twox64Concat, u8>),
+			u8,
+			ValueQuery,
+		>;
+		type WithLen =
+			StorageNMap<Prefix, (Key<Blake2_128Concat, u16>, Key<Twox64Concat, u8>), Vec<u32>>;
+
+		TestExternalities::default().execute_with(|| {
+			let mut k: Vec<u8> = vec![];
+			k.extend(&twox_128(b"test"));
+			k.extend(&twox_128(b"foo"));
+			k.extend(&3u16.blake2_128_concat());
+			k.extend(&30u8.twox_64_concat());
+			assert_eq!(A::hashed_key_for((3, 30)).to_vec(), k);
+
+			assert_eq!(A::contains_key((3, 30)), false);
+			assert_eq!(A::get((3, 30)), None);
+			assert_eq!(AValueQueryWithAnOnEmpty::get((3, 30)), 98);
+
+			A::insert((3, 30), 10);
+			assert_eq!(A::contains_key((3, 30)), true);
+			assert_eq!(A::get((3, 30)), Some(10));
+			assert_eq!(AValueQueryWithAnOnEmpty::get((3, 30)), 10);
+
+			A::swap::<(Key<Blake2_128Concat, u16>, Key<Twox64Concat, u8>), _, _>((3, 30), (2, 20));
+			assert_eq!(A::contains_key((3, 30)), false);
+			assert_eq!(A::contains_key((2, 20)), true);
+			assert_eq!(A::get((3, 30)), None);
+			assert_eq!(AValueQueryWithAnOnEmpty::get((3, 30)), 98);
+			assert_eq!(A::get((2, 20)), Some(10));
+			assert_eq!(AValueQueryWithAnOnEmpty::get((2, 20)), 10);
+
+			A::remove((2, 20));
+			assert_eq!(A::contains_key((2, 20)), false);
+			assert_eq!(A::get((2, 20)), None);
+
+			AValueQueryWithAnOnEmpty::mutate((2, 20), |v| *v = *v * 2);
+			AValueQueryWithAnOnEmpty::mutate((2, 20), |v| *v = *v * 2);
+			assert_eq!(A::contains_key((2, 20)), true);
+			assert_eq!(A::get((2, 20)), Some(98 * 4));
+
+			A::remove((2, 20));
+			let _: Result<(), ()> = AValueQueryWithAnOnEmpty::try_mutate((2, 20), |v| {
+				*v = *v * 2;
+				Err(())
+			});
+			assert_eq!(A::contains_key((2, 20)), false);
+
+			A::remove((2, 20));
+			let _: Result<(), ()> = AValueQueryWithAnOnEmpty::try_mutate((2, 20), |v| {
+				*v = *v * 2;
+				Err(())
+			});
+			assert_eq!(A::contains_key((2, 20)), false);
+
+			A::remove((2, 20));
+			AValueQueryWithAnOnEmpty::mutate_exists((2, 20), |v| {
+				assert!(v.is_none());
+				*v = Some(10);
+			});
+			assert_eq!(A::contains_key((2, 20)), true);
+			assert_eq!(A::get((2, 20)), Some(10));
+			AValueQueryWithAnOnEmpty::mutate_exists((2, 20), |v| {
+				*v = Some(v.unwrap() * 10);
+			});
+			assert_eq!(A::contains_key((2, 20)), true);
+			assert_eq!(A::get((2, 20)), Some(100));
+
+			A::remove((2, 20));
+			let _: Result<(), ()> = AValueQueryWithAnOnEmpty::try_mutate_exists((2, 20), |v| {
+				assert!(v.is_none());
+				*v = Some(10);
+				Ok(())
+			});
+			assert_eq!(A::contains_key((2, 20)), true);
+			assert_eq!(A::get((2, 20)), Some(10));
+			let _: Result<(), ()> = AValueQueryWithAnOnEmpty::try_mutate_exists((2, 20), |v| {
+				*v = Some(v.unwrap() * 10);
+				Ok(())
+			});
+			assert_eq!(A::contains_key((2, 20)), true);
+			assert_eq!(A::get((2, 20)), Some(100));
+			assert_eq!(A::try_get((2, 20)), Ok(100));
+			let _: Result<(), ()> = AValueQueryWithAnOnEmpty::try_mutate_exists((2, 20), |v| {
+				*v = Some(v.unwrap() * 10);
+				Err(())
+			});
+			assert_eq!(A::contains_key((2, 20)), true);
+			assert_eq!(A::get((2, 20)), Some(100));
+
+			A::insert((2, 20), 10);
+			assert_eq!(A::take((2, 20)), Some(10));
+			assert_eq!(A::contains_key((2, 20)), false);
+			assert_eq!(AValueQueryWithAnOnEmpty::take((2, 20)), 98);
+			assert_eq!(A::contains_key((2, 20)), false);
+			assert_eq!(A::try_get((2, 20)), Err(()));
+
+			B::insert((2, 20), 10);
+			assert_eq!(
+				A::migrate_keys(
+					(2, 20),
+					(
+						Box::new(|key| Blake2_256::hash(key).to_vec()),
+						Box::new(|key| Twox128::hash(key).to_vec()),
+					),
+				),
+				Some(10)
+			);
+			assert_eq!(A::contains_key((2, 20)), true);
+			assert_eq!(A::get((2, 20)), Some(10));
+
+			A::insert((3, 30), 10);
+			A::insert((4, 40), 10);
+			A::remove_all();
+			assert_eq!(A::contains_key((3, 30)), false);
+			assert_eq!(A::contains_key((4, 40)), false);
+
+			A::insert((3, 30), 10);
+			A::insert((4, 40), 10);
+			assert_eq!(A::iter_values().collect::<Vec<_>>(), vec![10, 10]);
+
+			C::insert((3, 30), 10);
+			C::insert((4, 40), 10);
+			A::translate_values::<u8, _>(|v| Some((v * 2).into()));
+			assert_eq!(
+				A::iter().collect::<Vec<_>>(),
+				vec![((4, 40), 20), ((3, 30), 20)]
+			);
+
+			A::insert((3, 30), 10);
+			A::insert((4, 40), 10);
+			assert_eq!(
+				A::iter().collect::<Vec<_>>(),
+				vec![((4, 40), 10), ((3, 30), 10)]
+			);
+			assert_eq!(
+				A::drain().collect::<Vec<_>>(),
+				vec![((4, 40), 10), ((3, 30), 10)]
+			);
+			assert_eq!(A::iter().collect::<Vec<_>>(), vec![]);
+
+			C::insert((3, 30), 10);
+			C::insert((4, 40), 10);
+			A::translate::<u8, _>(|(k1, k2), v| Some((k1 * k2 as u16 * v as u16).into()));
+			assert_eq!(
+				A::iter().collect::<Vec<_>>(),
+				vec![((4, 40), 1600), ((3, 30), 900)]
+			);
+
+			assert_eq!(A::MODIFIER, StorageEntryModifier::Optional);
+			assert_eq!(
+				AValueQueryWithAnOnEmpty::MODIFIER,
+				StorageEntryModifier::Default
+			);
+			assert_eq!(A::NAME, "foo");
+			assert_eq!(
+				AValueQueryWithAnOnEmpty::DEFAULT.0.default_byte(),
+				98u32.encode()
+			);
+			assert_eq!(A::DEFAULT.0.default_byte(), Option::<u32>::None.encode());
+
+			WithLen::remove_all();
+			assert_eq!(WithLen::decode_len((3, 30)), None);
+			WithLen::append((0, 100), 10);
+			assert_eq!(WithLen::decode_len((0, 100)), Some(1));
+
+			A::insert((3, 30), 11);
+			A::insert((3, 31), 12);
+			A::insert((4, 40), 13);
+			A::insert((4, 41), 14);
+			assert_eq!(
+				A::iter_prefix_values((3,)).collect::<Vec<_>>(),
+				vec![12, 11]
+			);
+			assert_eq!(
+				A::iter_prefix_values((4,)).collect::<Vec<_>>(),
+				vec![13, 14]
+			);
+		});
+	}
+
+	#[test]
+	fn test_3_keys() {
+		type A = StorageNMap<
+			Prefix,
+			(
+				Key<Blake2_128Concat, u16>,
+				Key<Blake2_128Concat, u16>,
+				Key<Twox64Concat, u16>,
+			),
+			u32,
+			OptionQuery,
+		>;
+		type AValueQueryWithAnOnEmpty = StorageNMap<
+			Prefix,
+			(
+				Key<Blake2_128Concat, u16>,
+				Key<Blake2_128Concat, u16>,
+				Key<Twox64Concat, u16>,
+			),
+			u32,
+			ValueQuery,
+			ADefault,
+		>;
+		type B = StorageNMap<
+			Prefix,
+			(
+				Key<Blake2_256, u16>,
+				Key<Blake2_256, u16>,
+				Key<Twox128, u16>,
+			),
+			u32,
+			ValueQuery,
+		>;
+		type C = StorageNMap<
+			Prefix,
+			(
+				Key<Blake2_128Concat, u16>,
+				Key<Blake2_128Concat, u16>,
+				Key<Twox64Concat, u16>,
+			),
+			u8,
+			ValueQuery,
+		>;
+		type WithLen = StorageNMap<
+			Prefix,
+			(
+				Key<Blake2_128Concat, u16>,
+				Key<Blake2_128Concat, u16>,
+				Key<Twox64Concat, u16>,
+			),
+			Vec<u32>,
+		>;
+
+		TestExternalities::default().execute_with(|| {
+			let mut k: Vec<u8> = vec![];
+			k.extend(&twox_128(b"test"));
+			k.extend(&twox_128(b"foo"));
+			k.extend(&1u16.blake2_128_concat());
+			k.extend(&10u16.blake2_128_concat());
+			k.extend(&100u16.twox_64_concat());
+			assert_eq!(A::hashed_key_for((1, 10, 100)).to_vec(), k);
+
+			assert_eq!(A::contains_key((1, 10, 100)), false);
+			assert_eq!(A::get((1, 10, 100)), None);
+			assert_eq!(AValueQueryWithAnOnEmpty::get((1, 10, 100)), 98);
+
+			A::insert((1, 10, 100), 30);
+			assert_eq!(A::contains_key((1, 10, 100)), true);
+			assert_eq!(A::get((1, 10, 100)), Some(30));
+			assert_eq!(AValueQueryWithAnOnEmpty::get((1, 10, 100)), 30);
+
+			A::swap::<
+				(
+					Key<Blake2_128Concat, u16>,
+					Key<Blake2_128Concat, u16>,
+					Key<Twox64Concat, u16>,
+				),
+				_,
+				_,
+			>((1, 10, 100), (2, 20, 200));
+			assert_eq!(A::contains_key((1, 10, 100)), false);
+			assert_eq!(A::contains_key((2, 20, 200)), true);
+			assert_eq!(A::get((1, 10, 100)), None);
+			assert_eq!(AValueQueryWithAnOnEmpty::get((1, 10, 100)), 98);
+			assert_eq!(A::get((2, 20, 200)), Some(30));
+			assert_eq!(AValueQueryWithAnOnEmpty::get((2, 20, 200)), 30);
+
+			A::remove((2, 20, 200));
+			assert_eq!(A::contains_key((2, 20, 200)), false);
+			assert_eq!(A::get((2, 20, 200)), None);
+
+			AValueQueryWithAnOnEmpty::mutate((2, 20, 200), |v| *v = *v * 2);
+			AValueQueryWithAnOnEmpty::mutate((2, 20, 200), |v| *v = *v * 2);
+			assert_eq!(A::contains_key((2, 20, 200)), true);
+			assert_eq!(A::get((2, 20, 200)), Some(98 * 4));
+
+			A::remove((2, 20, 200));
+			let _: Result<(), ()> = AValueQueryWithAnOnEmpty::try_mutate((2, 20, 200), |v| {
+				*v = *v * 2;
+				Err(())
+			});
+			assert_eq!(A::contains_key((2, 20, 200)), false);
+
+			A::remove((2, 20, 200));
+			AValueQueryWithAnOnEmpty::mutate_exists((2, 20, 200), |v| {
+				assert!(v.is_none());
+				*v = Some(10);
+			});
+			assert_eq!(A::contains_key((2, 20, 200)), true);
+			assert_eq!(A::get((2, 20, 200)), Some(10));
+			AValueQueryWithAnOnEmpty::mutate_exists((2, 20, 200), |v| {
+				*v = Some(v.unwrap() * 10);
+			});
+			assert_eq!(A::contains_key((2, 20, 200)), true);
+			assert_eq!(A::get((2, 20, 200)), Some(100));
+
+			A::remove((2, 20, 200));
+			let _: Result<(), ()> =
+				AValueQueryWithAnOnEmpty::try_mutate_exists((2, 20, 200), |v| {
+					assert!(v.is_none());
+					*v = Some(10);
+					Ok(())
+				});
+			assert_eq!(A::contains_key((2, 20, 200)), true);
+			assert_eq!(A::get((2, 20, 200)), Some(10));
+			let _: Result<(), ()> =
+				AValueQueryWithAnOnEmpty::try_mutate_exists((2, 20, 200), |v| {
+					*v = Some(v.unwrap() * 10);
+					Ok(())
+				});
+			assert_eq!(A::contains_key((2, 20, 200)), true);
+			assert_eq!(A::get((2, 20, 200)), Some(100));
+			assert_eq!(A::try_get((2, 20, 200)), Ok(100));
+			let _: Result<(), ()> =
+				AValueQueryWithAnOnEmpty::try_mutate_exists((2, 20, 200), |v| {
+					*v = Some(v.unwrap() * 10);
+					Err(())
+				});
+			assert_eq!(A::contains_key((2, 20, 200)), true);
+			assert_eq!(A::get((2, 20, 200)), Some(100));
+
+			A::insert((2, 20, 200), 10);
+			assert_eq!(A::take((2, 20, 200)), Some(10));
+			assert_eq!(A::contains_key((2, 20, 200)), false);
+			assert_eq!(AValueQueryWithAnOnEmpty::take((2, 20, 200)), 98);
+			assert_eq!(A::contains_key((2, 20, 200)), false);
+			assert_eq!(A::try_get((2, 20, 200)), Err(()));
+
+			B::insert((2, 20, 200), 10);
+			assert_eq!(
+				A::migrate_keys(
+					(2, 20, 200),
+					(
+						Box::new(|key| Blake2_256::hash(key).to_vec()),
+						Box::new(|key| Blake2_256::hash(key).to_vec()),
+						Box::new(|key| Twox128::hash(key).to_vec()),
+					),
+				),
+				Some(10)
+			);
+			assert_eq!(A::contains_key((2, 20, 200)), true);
+			assert_eq!(A::get((2, 20, 200)), Some(10));
+
+			A::insert((3, 30, 300), 10);
+			A::insert((4, 40, 400), 10);
+			A::remove_all();
+			assert_eq!(A::contains_key((3, 30, 300)), false);
+			assert_eq!(A::contains_key((4, 40, 400)), false);
+
+			A::insert((3, 30, 300), 10);
+			A::insert((4, 40, 400), 10);
+			assert_eq!(A::iter_values().collect::<Vec<_>>(), vec![10, 10]);
+
+			C::insert((3, 30, 300), 10);
+			C::insert((4, 40, 400), 10);
+			A::translate_values::<u8, _>(|v| Some((v * 2).into()));
+			assert_eq!(
+				A::iter().collect::<Vec<_>>(),
+				vec![((4, 40, 400), 20), ((3, 30, 300), 20)]
+			);
+
+			A::insert((3, 30, 300), 10);
+			A::insert((4, 40, 400), 10);
+			assert_eq!(
+				A::iter().collect::<Vec<_>>(),
+				vec![((4, 40, 400), 10), ((3, 30, 300), 10)]
+			);
+			assert_eq!(
+				A::drain().collect::<Vec<_>>(),
+				vec![((4, 40, 400), 10), ((3, 30, 300), 10)]
+			);
+			assert_eq!(A::iter().collect::<Vec<_>>(), vec![]);
+
+			C::insert((3, 30, 300), 10);
+			C::insert((4, 40, 400), 10);
+			A::translate::<u8, _>(|(k1, k2, k3), v| {
+				Some((k1 * k2 as u16 * v as u16 / k3 as u16).into())
+			});
+			assert_eq!(
+				A::iter().collect::<Vec<_>>(),
+				vec![((4, 40, 400), 4), ((3, 30, 300), 3)]
+			);
+
+			assert_eq!(A::MODIFIER, StorageEntryModifier::Optional);
+			assert_eq!(
+				AValueQueryWithAnOnEmpty::MODIFIER,
+				StorageEntryModifier::Default
+			);
+			assert_eq!(A::NAME, "foo");
+			assert_eq!(
+				AValueQueryWithAnOnEmpty::DEFAULT.0.default_byte(),
+				98u32.encode()
+			);
+			assert_eq!(A::DEFAULT.0.default_byte(), Option::<u32>::None.encode());
+
+			WithLen::remove_all();
+			assert_eq!(WithLen::decode_len((3, 30, 300)), None);
+			WithLen::append((0, 100, 1000), 10);
+			assert_eq!(WithLen::decode_len((0, 100, 1000)), Some(1));
+
+			A::insert((3, 30, 300), 11);
+			A::insert((3, 30, 301), 12);
+			A::insert((4, 40, 400), 13);
+			A::insert((4, 40, 401), 14);
+			assert_eq!(
+				A::iter_prefix_values((3,)).collect::<Vec<_>>(),
+				vec![11, 12]
+			);
+			assert_eq!(
+				A::iter_prefix_values((4,)).collect::<Vec<_>>(),
+				vec![14, 13]
+			);
+			assert_eq!(
+				A::iter_prefix_values((3, 30)).collect::<Vec<_>>(),
+				vec![11, 12]
+			);
+			assert_eq!(
+				A::iter_prefix_values((4, 40)).collect::<Vec<_>>(),
+				vec![14, 13]
+			);
+		});
+	}
+}
diff --git a/frame/support/test/tests/construct_runtime.rs b/frame/support/test/tests/construct_runtime.rs
index a1ec744e4273..76e28a3b152f 100644
--- a/frame/support/test/tests/construct_runtime.rs
+++ b/frame/support/test/tests/construct_runtime.rs
@@ -505,7 +505,7 @@ fn test_metadata() {
 			signed_extensions: vec![DecodeDifferent::Encode("UnitSignedExtension")],
 		},
 	};
-	pretty_assertions::assert_eq!(Runtime::metadata().1, RuntimeMetadata::V12(expected_metadata));
+	pretty_assertions::assert_eq!(Runtime::metadata().1, RuntimeMetadata::V13(expected_metadata));
 }
 
 #[test]
diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index 3bde38c78e2c..5db5856fd9d9 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -217,6 +217,21 @@ pub mod pallet {
 	#[pallet::storage]
 	pub type DoubleMap2<T> = StorageDoubleMap<_, Twox64Concat, u16, Blake2_128Concat, u32, u64>;
 
+	#[pallet::storage]
+	#[pallet::getter(fn nmap)]
+	pub type NMap<T> = StorageNMap<_, storage::Key<Blake2_128Concat, u8>, u32>;
+
+	#[pallet::storage]
+	#[pallet::getter(fn nmap2)]
+	pub type NMap2<T> = StorageNMap<
+		_,
+		(
+			NMapKey<Twox64Concat, u16>,
+			NMapKey<Blake2_128Concat, u32>,
+		),
+		u64,
+	>;
+
 	#[pallet::storage]
 	#[pallet::getter(fn conditional_value)]
 	#[cfg(feature = "conditional-storage")]
@@ -239,6 +254,18 @@ pub mod pallet {
 		u32,
 	>;
 
+	#[cfg(feature = "conditional-storage")]
+	#[pallet::storage]
+	#[pallet::getter(fn conditional_nmap)]
+	pub type ConditionalNMap<T> = StorageNMap<
+		_,
+		(
+			storage::Key<Blake2_128Concat, u8>,
+			storage::Key<Twox64Concat, u16>,
+		),
+		u32,
+	>;
+
 	#[pallet::genesis_config]
 	#[derive(Default)]
 	pub struct GenesisConfig {
@@ -578,11 +605,25 @@ fn storage_expand() {
 		assert_eq!(unhashed::get::<u64>(&k), Some(3u64));
 		assert_eq!(&k[..32], &<pallet::DoubleMap2<Runtime>>::final_prefix());
 
+		pallet::NMap::<Runtime>::insert((&1,), &3);
+		let mut k = [twox_128(b"Example"), twox_128(b"NMap")].concat();
+		k.extend(1u8.using_encoded(blake2_128_concat));
+		assert_eq!(unhashed::get::<u32>(&k), Some(3u32));
+		assert_eq!(&k[..32], &<pallet::NMap<Runtime>>::final_prefix());
+
+		pallet::NMap2::<Runtime>::insert((&1, &2), &3);
+		let mut k = [twox_128(b"Example"), twox_128(b"NMap2")].concat();
+		k.extend(1u16.using_encoded(twox_64_concat));
+		k.extend(2u32.using_encoded(blake2_128_concat));
+		assert_eq!(unhashed::get::<u64>(&k), Some(3u64));
+		assert_eq!(&k[..32], &<pallet::NMap2<Runtime>>::final_prefix());
+
 		#[cfg(feature = "conditional-storage")]
 		{
 			pallet::ConditionalValue::<Runtime>::put(1);
 			pallet::ConditionalMap::<Runtime>::insert(1, 2);
 			pallet::ConditionalDoubleMap::<Runtime>::insert(1, 2, 3);
+			pallet::ConditionalNMap::<Runtime>::insert((1, 2), 3);
 		}
 	})
 }
@@ -708,6 +749,36 @@ fn metadata() {
 					default: DecodeDifferent::Decoded(vec![0]),
 					documentation: DecodeDifferent::Decoded(vec![]),
 				},
+				StorageEntryMetadata {
+					name: DecodeDifferent::Decoded("NMap".to_string()),
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::NMap {
+						keys: DecodeDifferent::Decoded(vec!["u8".to_string()]),
+						hashers: DecodeDifferent::Decoded(vec![
+							StorageHasher::Blake2_128Concat,
+						]),
+						value: DecodeDifferent::Decoded("u32".to_string()),
+					},
+					default: DecodeDifferent::Decoded(vec![0]),
+					documentation: DecodeDifferent::Decoded(vec![]),
+				},
+				StorageEntryMetadata {
+					name: DecodeDifferent::Decoded("NMap2".to_string()),
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::NMap {
+						keys: DecodeDifferent::Decoded(vec![
+							"u16".to_string(),
+							"u32".to_string(),
+						]),
+						hashers: DecodeDifferent::Decoded(vec![
+							StorageHasher::Twox64Concat,
+							StorageHasher::Blake2_128Concat,
+						]),
+						value: DecodeDifferent::Decoded("u64".to_string()),
+					},
+					default: DecodeDifferent::Decoded(vec![0]),
+					documentation: DecodeDifferent::Decoded(vec![]),
+				},
 				#[cfg(feature = "conditional-storage")] StorageEntryMetadata {
 					name: DecodeDifferent::Decoded("ConditionalValue".to_string()),
 					modifier: StorageEntryModifier::Optional,
@@ -740,6 +811,20 @@ fn metadata() {
 					default: DecodeDifferent::Decoded(vec![0]),
 					documentation: DecodeDifferent::Decoded(vec![]),
 				},
+				#[cfg(feature = "conditional-storage")] StorageEntryMetadata {
+					name: DecodeDifferent::Decoded("ConditionalNMap".to_string()),
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::NMap {
+						keys: DecodeDifferent::Decoded(vec!["u8".to_string(), "u16".to_string()]),
+						hashers: DecodeDifferent::Decoded(vec![
+							StorageHasher::Blake2_128Concat,
+							StorageHasher::Twox64Concat,
+						]),
+						value: DecodeDifferent::Decoded("u32".to_string()),
+					},
+					default: DecodeDifferent::Decoded(vec![0]),
+					documentation: DecodeDifferent::Decoded(vec![]),
+				},
 			]),
 		})),
 		calls: Some(DecodeDifferent::Decoded(vec![
@@ -857,7 +942,7 @@ fn metadata() {
 	};
 
 	let metadata = match Runtime::metadata().1 {
-		RuntimeMetadata::V12(metadata) => metadata,
+		RuntimeMetadata::V13(metadata) => metadata,
 		_ => panic!("metadata has been bump, test needs to be updated"),
 	};
 
diff --git a/frame/support/test/tests/pallet_compatibility.rs b/frame/support/test/tests/pallet_compatibility.rs
index a953b19607d9..130014f1e9eb 100644
--- a/frame/support/test/tests/pallet_compatibility.rs
+++ b/frame/support/test/tests/pallet_compatibility.rs
@@ -266,7 +266,7 @@ mod test {
 	fn metadata() {
 		let metadata = Runtime::metadata();
 		let modules = match metadata.1 {
-			frame_metadata::RuntimeMetadata::V12(frame_metadata::RuntimeMetadataV12 {
+			frame_metadata::RuntimeMetadata::V13(frame_metadata::RuntimeMetadataV13 {
 				modules: frame_metadata::DecodeDifferent::Encode(m),
 				..
 			}) => m,
diff --git a/frame/support/test/tests/pallet_compatibility_instance.rs b/frame/support/test/tests/pallet_compatibility_instance.rs
index 5ce20012c736..d80d9ba3dff7 100644
--- a/frame/support/test/tests/pallet_compatibility_instance.rs
+++ b/frame/support/test/tests/pallet_compatibility_instance.rs
@@ -281,7 +281,7 @@ mod test {
 	fn metadata() {
 		let metadata = Runtime::metadata();
 		let modules = match metadata.1 {
-			frame_metadata::RuntimeMetadata::V12(frame_metadata::RuntimeMetadataV12 {
+			frame_metadata::RuntimeMetadata::V13(frame_metadata::RuntimeMetadataV13 {
 				modules: frame_metadata::DecodeDifferent::Encode(m),
 				..
 			}) => m,
diff --git a/frame/support/test/tests/pallet_instance.rs b/frame/support/test/tests/pallet_instance.rs
index f0143b9c40d6..46ff301f6712 100644
--- a/frame/support/test/tests/pallet_instance.rs
+++ b/frame/support/test/tests/pallet_instance.rs
@@ -134,6 +134,21 @@ pub mod pallet {
 	pub type DoubleMap2<T, I = ()> =
 		StorageDoubleMap<_, Twox64Concat, u16, Blake2_128Concat, u32, u64>;
 
+	#[pallet::storage]
+	#[pallet::getter(fn nmap)]
+	pub type NMap<T, I = ()> = StorageNMap<_, storage::Key<Blake2_128Concat, u8>, u32>;
+
+	#[pallet::storage]
+	#[pallet::getter(fn nmap2)]
+	pub type NMap2<T, I = ()> = StorageNMap<
+		_,
+		(
+			storage::Key<Twox64Concat, u16>,
+			storage::Key<Blake2_128Concat, u32>,
+		),
+		u64,
+	>;
+
 	#[pallet::genesis_config]
 	#[derive(Default)]
 	pub struct GenesisConfig {
@@ -447,6 +462,19 @@ fn storage_expand() {
 		k.extend(2u32.using_encoded(blake2_128_concat));
 		assert_eq!(unhashed::get::<u64>(&k), Some(3u64));
 		assert_eq!(&k[..32], &<pallet::DoubleMap2<Runtime>>::final_prefix());
+
+		<pallet::NMap<Runtime>>::insert((&1,), &3);
+		let mut k = [twox_128(b"Example"), twox_128(b"NMap")].concat();
+		k.extend(1u8.using_encoded(blake2_128_concat));
+		assert_eq!(unhashed::get::<u32>(&k), Some(3u32));
+		assert_eq!(&k[..32], &<pallet::NMap<Runtime>>::final_prefix());
+
+		<pallet::NMap2<Runtime>>::insert((&1, &2), &3);
+		let mut k = [twox_128(b"Example"), twox_128(b"NMap2")].concat();
+		k.extend(1u16.using_encoded(twox_64_concat));
+		k.extend(2u32.using_encoded(blake2_128_concat));
+		assert_eq!(unhashed::get::<u64>(&k), Some(3u64));
+		assert_eq!(&k[..32], &<pallet::NMap2<Runtime>>::final_prefix());
 	});
 
 	TestExternalities::default().execute_with(|| {
@@ -479,6 +507,19 @@ fn storage_expand() {
 		k.extend(2u32.using_encoded(blake2_128_concat));
 		assert_eq!(unhashed::get::<u64>(&k), Some(3u64));
 		assert_eq!(&k[..32], &<pallet::DoubleMap2<Runtime, pallet::Instance1>>::final_prefix());
+
+		<pallet::NMap<Runtime, pallet::Instance1>>::insert((&1,), &3);
+		let mut k = [twox_128(b"Instance1Example"), twox_128(b"NMap")].concat();
+		k.extend(1u8.using_encoded(blake2_128_concat));
+		assert_eq!(unhashed::get::<u32>(&k), Some(3u32));
+		assert_eq!(&k[..32], &<pallet::NMap<Runtime, pallet::Instance1>>::final_prefix());
+
+		<pallet::NMap2<Runtime, pallet::Instance1>>::insert((&1, &2), &3);
+		let mut k = [twox_128(b"Instance1Example"), twox_128(b"NMap2")].concat();
+		k.extend(1u16.using_encoded(twox_64_concat));
+		k.extend(2u32.using_encoded(blake2_128_concat));
+		assert_eq!(unhashed::get::<u64>(&k), Some(3u64));
+		assert_eq!(&k[..32], &<pallet::NMap2<Runtime, pallet::Instance1>>::final_prefix());
 	});
 }
 
@@ -617,6 +658,36 @@ fn metadata() {
 					default: DecodeDifferent::Decoded(vec![0]),
 					documentation: DecodeDifferent::Decoded(vec![]),
 				},
+				StorageEntryMetadata {
+					name: DecodeDifferent::Decoded("NMap".to_string()),
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::NMap {
+						keys: DecodeDifferent::Decoded(vec!["u8".to_string()]),
+						hashers: DecodeDifferent::Decoded(vec![
+							StorageHasher::Blake2_128Concat,
+						]),
+						value: DecodeDifferent::Decoded("u32".to_string()),
+					},
+					default: DecodeDifferent::Decoded(vec![0]),
+					documentation: DecodeDifferent::Decoded(vec![]),
+				},
+				StorageEntryMetadata {
+					name: DecodeDifferent::Decoded("NMap2".to_string()),
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::NMap {
+						keys: DecodeDifferent::Decoded(vec![
+							"u16".to_string(),
+							"u32".to_string(),
+						]),
+						hashers: DecodeDifferent::Decoded(vec![
+							StorageHasher::Twox64Concat,
+							StorageHasher::Blake2_128Concat,
+						]),
+						value: DecodeDifferent::Decoded("u64".to_string()),
+					},
+					default: DecodeDifferent::Decoded(vec![0]),
+					documentation: DecodeDifferent::Decoded(vec![]),
+				},
 			]),
 		})),
 		calls: Some(DecodeDifferent::Decoded(vec![
@@ -696,7 +767,7 @@ fn metadata() {
 
 
 	let metadata = match Runtime::metadata().1 {
-		RuntimeMetadata::V12(metadata) => metadata,
+		RuntimeMetadata::V13(metadata) => metadata,
 		_ => panic!("metadata has been bump, test needs to be updated"),
 	};
 
diff --git a/frame/support/test/tests/pallet_ui/storage_not_storage_type.stderr b/frame/support/test/tests/pallet_ui/storage_not_storage_type.stderr
index ec4bde22ac7a..73fda6094247 100644
--- a/frame/support/test/tests/pallet_ui/storage_not_storage_type.stderr
+++ b/frame/support/test/tests/pallet_ui/storage_not_storage_type.stderr
@@ -1,4 +1,4 @@
-error: Invalid pallet::storage, expected ident: `StorageValue` or `StorageMap` or `StorageDoubleMap` in order to expand metadata, found `u8`
+error: Invalid pallet::storage, expected ident: `StorageValue` or `StorageMap` or `StorageDoubleMap` or `StorageNMap` in order to expand metadata, found `u8`
   --> $DIR/storage_not_storage_type.rs:19:16
    |
 19 |     type Foo<T> = u8;

From e547f92dc754403c27eb84df9953246e6be1ceed Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Fri, 14 May 2021 16:17:10 +0200
Subject: [PATCH 0742/1194] Add more debug_assert to networking (#8807)

* Add more debug_assertsudo dnf update to networking

* Swap the lines
---
 client/network/src/service.rs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 03b71b8c86f5..9bcde11e4b0d 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -1549,7 +1549,9 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 					}
 					{
 						let mut peers_notifications_sinks = this.peers_notifications_sinks.lock();
-						peers_notifications_sinks.insert((remote.clone(), protocol.clone()), notifications_sink);
+						let _previous_value = peers_notifications_sinks
+							.insert((remote.clone(), protocol.clone()), notifications_sink);
+						debug_assert!(_previous_value.is_none());
 					}
 					this.event_streams.send(Event::NotificationStreamOpened {
 						remote,
@@ -1569,6 +1571,7 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 							target: "sub-libp2p",
 							"NotificationStreamReplaced for non-existing substream"
 						);
+						debug_assert!(false);
 					}
 
 					// TODO: Notifications might have been lost as a result of the previous
@@ -1603,7 +1606,9 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 					});
 					{
 						let mut peers_notifications_sinks = this.peers_notifications_sinks.lock();
-						peers_notifications_sinks.remove(&(remote.clone(), protocol));
+						let _previous_value = peers_notifications_sinks
+							.remove(&(remote.clone(), protocol));
+						debug_assert!(_previous_value.is_some());
 					}
 				},
 				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::NotificationsReceived { remote, messages })) => {

From 8d02bb0bfc6136f6a3c805db19f51e43090a7cd4 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Fri, 14 May 2021 16:31:03 +0200
Subject: [PATCH 0743/1194] Small improvement to network log line (#8811)

* Small improvement to network log line

* Use {:?} for the set_id
---
 client/network/src/protocol/notifications/behaviour.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/network/src/protocol/notifications/behaviour.rs b/client/network/src/protocol/notifications/behaviour.rs
index 0a883543de52..84f15c8be352 100644
--- a/client/network/src/protocol/notifications/behaviour.rs
+++ b/client/network/src/protocol/notifications/behaviour.rs
@@ -1765,7 +1765,7 @@ impl NetworkBehaviour for Notifications {
 							*c == connection && matches!(s, ConnectionState::Opening))
 						{
 							if !any_open {
-								trace!(target: "sub-libp2p", "External API <= Open({:?})", source);
+								trace!(target: "sub-libp2p", "External API <= Open({}, {:?})", source, set_id);
 								let event = NotificationsOut::CustomProtocolOpen {
 									peer_id: source,
 									set_id,

From 87a3e7e1d175604fde4f37fd8b72e15a246e6810 Mon Sep 17 00:00:00 2001
From: Andronik Ordian <write@reusable.software>
Date: Sat, 15 May 2021 14:08:52 +0200
Subject: [PATCH 0744/1194] frame/session/benchmarking: fix invalid feature
 declaration (#8818)

---
 frame/session/benchmarking/Cargo.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frame/session/benchmarking/Cargo.toml b/frame/session/benchmarking/Cargo.toml
index 0c83347b1991..9754c16f3756 100644
--- a/frame/session/benchmarking/Cargo.toml
+++ b/frame/session/benchmarking/Cargo.toml
@@ -38,7 +38,6 @@ default = ["std"]
 std = [
 	"sp-std/std",
 	"sp-session/std",
-	"frame-election-provider-support/std",
 	"sp-runtime/std",
 	"frame-system/std",
 	"frame-benchmarking/std",

From 0564923c56b97f6d3f1ea35be6850b65090bd450 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Sat, 15 May 2021 14:21:16 +0200
Subject: [PATCH 0745/1194] Add names to offchain worker threads (#8820)

* Add names to offchain worker threads

* Compilation
---
 client/offchain/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/offchain/src/lib.rs b/client/offchain/src/lib.rs
index 26975edbd6b6..9879b857283a 100644
--- a/client/offchain/src/lib.rs
+++ b/client/offchain/src/lib.rs
@@ -94,7 +94,7 @@ impl<Client, Block: traits::Block> OffchainWorkers<Client, Block> {
 		Self {
 			client,
 			_block: PhantomData,
-			thread_pool: Mutex::new(ThreadPool::new(num_cpus::get())),
+			thread_pool: Mutex::new(ThreadPool::with_name("offchain-worker".into(), num_cpus::get())),
 			shared_client,
 		}
 	}

From cf2d93115f72c70375157a89b75b046cdf491bd0 Mon Sep 17 00:00:00 2001
From: Ayush Mishra <ayushmishra2005@gmail.com>
Date: Sun, 16 May 2021 01:13:58 +0530
Subject: [PATCH 0746/1194] Improve match statement (#8817)

---
 client/db/src/lib.rs                              |  5 +----
 primitives/core/src/crypto.rs                     | 15 +++------------
 .../runtime_interface/bare_function_interface.rs  |  5 +----
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index 94535cf28aea..c684245be356 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -335,10 +335,7 @@ impl DatabaseSettingsSrc {
 	}
 	/// Check if database supports internal ref counting for state data.
 	pub fn supports_ref_counting(&self) -> bool {
-		match self {
-			DatabaseSettingsSrc::ParityDb { .. } => true,
-			_ => false,
-		}
+		matches!(self, DatabaseSettingsSrc::ParityDb { .. })
 	}
 }
 
diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index 7446ab25ce4b..80209a25c411 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -161,18 +161,12 @@ impl DeriveJunction {
 
 	/// Return `true` if the junction is soft.
 	pub fn is_soft(&self) -> bool {
-		match *self {
-			DeriveJunction::Soft(_) => true,
-			_ => false,
-		}
+		matches!(*self, DeriveJunction::Soft(_))
 	}
 
 	/// Return `true` if the junction is hard.
 	pub fn is_hard(&self) -> bool {
-		match *self {
-			DeriveJunction::Hard(_) => true,
-			_ => false,
-		}
+		matches!(*self, DeriveJunction::Hard(_))
 	}
 }
 
@@ -401,10 +395,7 @@ macro_rules! ss58_address_format {
 
 			/// Whether the address is custom.
 			pub fn is_custom(&self) -> bool {
-				match self {
-					Self::Custom(_) => true,
-					_ => false,
-				}
+				matches!(self, Self::Custom(_))
 			}
 		}
 
diff --git a/primitives/runtime-interface/proc-macro/src/runtime_interface/bare_function_interface.rs b/primitives/runtime-interface/proc-macro/src/runtime_interface/bare_function_interface.rs
index c5d0073e3fb6..d17067d990c3 100644
--- a/primitives/runtime-interface/proc-macro/src/runtime_interface/bare_function_interface.rs
+++ b/primitives/runtime-interface/proc-macro/src/runtime_interface/bare_function_interface.rs
@@ -239,8 +239,5 @@ fn generate_call_to_trait(
 
 /// Returns if the given `Signature` takes a `self` argument.
 fn takes_self_argument(sig: &Signature) -> bool {
-	match sig.inputs.first() {
-		Some(FnArg::Receiver(_)) => true,
-		_ => false,
-	}
+	matches!(sig.inputs.first(), Some(FnArg::Receiver(_)))
 }

From 66c85aeb29fbf4786e76be328cf73241f72c2f18 Mon Sep 17 00:00:00 2001
From: Keith Yeung <kungfukeith11@gmail.com>
Date: Sun, 16 May 2021 23:27:06 -0700
Subject: [PATCH 0747/1194] Use StorageNMap for Approvals in assets pallet
 (#8816)

* Use StorageNMap for Approvals in assets pallet

* Use EncodeLike on HashKeyPrefix trait bounds

* Add comments clarifying AccountId roles

* Properly document the keys in the Approvals storage

* Fix line width
---
 frame/assets/src/lib.rs                | 42 +++++++--------
 frame/assets/src/types.rs              |  9 ----
 frame/support/src/storage/types/key.rs | 74 +++++++++++++++++---------
 3 files changed, 68 insertions(+), 57 deletions(-)

diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index 3a2b1a6ce21d..9cdd4c0b914e 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -237,12 +237,14 @@ pub mod pallet {
 	#[pallet::storage]
 	/// Approved balance transfers. First balance is the amount approved for transfer. Second
 	/// is the amount of `T::Currency` reserved for storing this.
-	pub(super) type Approvals<T: Config<I>, I: 'static = ()> = StorageDoubleMap<
+	/// First key is the asset ID, second key is the owner and third key is the delegate.
+	pub(super) type Approvals<T: Config<I>, I: 'static = ()> = StorageNMap<
 		_,
-		Blake2_128Concat,
-		T::AssetId,
-		Blake2_128Concat,
-		ApprovalKey<T::AccountId>,
+		(
+			NMapKey<Blake2_128Concat, T::AssetId>,
+			NMapKey<Blake2_128Concat, T::AccountId>, // owner
+			NMapKey<Blake2_128Concat, T::AccountId>, // delegate
+		),
 		Approval<T::Balance, DepositBalanceOf<T, I>>,
 		OptionQuery,
 	>;
@@ -502,7 +504,7 @@ pub mod pallet {
 					details.deposit.saturating_add(metadata.deposit),
 				);
 
-				Approvals::<T, I>::remove_prefix(&id);
+				Approvals::<T, I>::remove_prefix((&id,));
 				Self::deposit_event(Event::Destroyed(id));
 
 				// NOTE: could use postinfo to reflect the actual number of accounts/sufficient/approvals
@@ -1118,19 +1120,18 @@ pub mod pallet {
 			let owner = ensure_signed(origin)?;
 			let delegate = T::Lookup::lookup(delegate)?;
 
-			let key = ApprovalKey { owner, delegate };
-			Approvals::<T, I>::try_mutate(id, &key, |maybe_approved| -> DispatchResult {
+			Approvals::<T, I>::try_mutate((id, &owner, &delegate), |maybe_approved| -> DispatchResult {
 				let mut approved = maybe_approved.take().unwrap_or_default();
 				let deposit_required = T::ApprovalDeposit::get();
 				if approved.deposit < deposit_required {
-					T::Currency::reserve(&key.owner, deposit_required - approved.deposit)?;
+					T::Currency::reserve(&owner, deposit_required - approved.deposit)?;
 					approved.deposit = deposit_required;
 				}
 				approved.amount = approved.amount.saturating_add(amount);
 				*maybe_approved = Some(approved);
 				Ok(())
 			})?;
-			Self::deposit_event(Event::ApprovedTransfer(id, key.owner, key.delegate, amount));
+			Self::deposit_event(Event::ApprovedTransfer(id, owner, delegate, amount));
 
 			Ok(())
 		}
@@ -1156,11 +1157,10 @@ pub mod pallet {
 		) -> DispatchResult {
 			let owner = ensure_signed(origin)?;
 			let delegate = T::Lookup::lookup(delegate)?;
-			let key = ApprovalKey { owner, delegate };
-			let approval = Approvals::<T, I>::take(id, &key).ok_or(Error::<T, I>::Unknown)?;
-			T::Currency::unreserve(&key.owner, approval.deposit);
+			let approval = Approvals::<T, I>::take((id, &owner, &delegate)).ok_or(Error::<T, I>::Unknown)?;
+			T::Currency::unreserve(&owner, approval.deposit);
 
-			Self::deposit_event(Event::ApprovalCancelled(id, key.owner, key.delegate));
+			Self::deposit_event(Event::ApprovalCancelled(id, owner, delegate));
 			Ok(())
 		}
 
@@ -1196,11 +1196,10 @@ pub mod pallet {
 			let owner = T::Lookup::lookup(owner)?;
 			let delegate = T::Lookup::lookup(delegate)?;
 
-			let key = ApprovalKey { owner, delegate };
-			let approval = Approvals::<T, I>::take(id, &key).ok_or(Error::<T, I>::Unknown)?;
-			T::Currency::unreserve(&key.owner, approval.deposit);
+			let approval = Approvals::<T, I>::take((id, &owner, &delegate)).ok_or(Error::<T, I>::Unknown)?;
+			T::Currency::unreserve(&owner, approval.deposit);
 
-			Self::deposit_event(Event::ApprovalCancelled(id, key.owner, key.delegate));
+			Self::deposit_event(Event::ApprovalCancelled(id, owner, delegate));
 			Ok(())
 		}
 
@@ -1234,8 +1233,7 @@ pub mod pallet {
 			let owner = T::Lookup::lookup(owner)?;
 			let destination = T::Lookup::lookup(destination)?;
 
-			let key = ApprovalKey { owner, delegate };
-			Approvals::<T, I>::try_mutate_exists(id, &key, |maybe_approved| -> DispatchResult {
+			Approvals::<T, I>::try_mutate_exists((id, &owner, delegate), |maybe_approved| -> DispatchResult {
 				let mut approved = maybe_approved.take().ok_or(Error::<T, I>::Unapproved)?;
 				let remaining = approved
 					.amount
@@ -1247,10 +1245,10 @@ pub mod pallet {
 					best_effort: false,
 					burn_dust: false
 				};
-				Self::do_transfer(id, &key.owner, &destination, amount, None, f)?;
+				Self::do_transfer(id, &owner, &destination, amount, None, f)?;
 
 				if remaining.is_zero() {
-					T::Currency::unreserve(&key.owner, approved.deposit);
+					T::Currency::unreserve(&owner, approved.deposit);
 				} else {
 					approved.amount = remaining;
 					*maybe_approved = Some(approved);
diff --git a/frame/assets/src/types.rs b/frame/assets/src/types.rs
index f3f17c00a218..0cfcb64e137f 100644
--- a/frame/assets/src/types.rs
+++ b/frame/assets/src/types.rs
@@ -65,15 +65,6 @@ impl<Balance, AccountId, DepositBalance> AssetDetails<Balance, AccountId, Deposi
 	}
 }
 
-/// A pair to act as a key for the approval storage map.
-#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug)]
-pub struct ApprovalKey<AccountId> {
-	/// The owner of the funds that are being approved.
-	pub(super) owner: AccountId,
-	/// The party to whom transfer of the funds is being delegated.
-	pub(super) delegate: AccountId,
-}
-
 /// Data concerning an approval.
 #[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default)]
 pub struct Approval<Balance, DepositBalance> {
diff --git a/frame/support/src/storage/types/key.rs b/frame/support/src/storage/types/key.rs
index fb3c69ff20cd..5eb608233b85 100755
--- a/frame/support/src/storage/types/key.rs
+++ b/frame/support/src/storage/types/key.rs
@@ -248,19 +248,23 @@ pub trait HasReversibleKeyPrefix<P>: ReversibleKeyGenerator + HasKeyPrefix<P> {
 macro_rules! impl_key_prefix_for {
 	(($($keygen:ident),+), ($($prefix:ident),+), ($($suffix:ident),+)) => {
 		paste! {
-			impl<$($keygen: FullCodec,)+ $( [<$keygen $keygen>]: StorageHasher),+>
-				HasKeyPrefix<($($prefix),+)> for
-				($(Key<[<$keygen $keygen>], $keygen>),+)
-			{
+			impl<
+				$($keygen: FullCodec,)+
+				$( [<$keygen $keygen>]: StorageHasher,)+
+				$( [<KArg $prefix>]: EncodeLike<$prefix> ),+
+			> HasKeyPrefix<($( [<KArg $prefix>] ),+)> for ($(Key<[<$keygen $keygen>], $keygen>),+) {
 				type Suffix = ($($suffix),+);
 
-				fn partial_key(prefix: ($($prefix),+)) -> Vec<u8> {
+				fn partial_key(prefix: ($( [<KArg $prefix>] ),+)) -> Vec<u8> {
 					<($(Key<[<$prefix $prefix>], $prefix>),+)>::final_key(prefix)
 				}
 			}
 
-			impl<$($keygen: FullCodec,)+ $( [<$keygen $keygen>]: ReversibleStorageHasher),+>
-				HasReversibleKeyPrefix<($($prefix),+)> for
+			impl<
+				$($keygen: FullCodec,)+
+				$( [<$keygen $keygen>]: ReversibleStorageHasher,)+
+				$( [<KArg $prefix>]: EncodeLike<$prefix> ),+
+			> HasReversibleKeyPrefix<($( [<KArg $prefix>] ),+)> for
 				($(Key<[<$keygen $keygen>], $keygen>),+)
 			{
 				fn decode_partial_key(key_material: &[u8]) -> Result<Self::Suffix, codec::Error> {
@@ -271,19 +275,23 @@ macro_rules! impl_key_prefix_for {
 	};
 	(($($keygen:ident),+), $prefix:ident, ($($suffix:ident),+)) => {
 		paste! {
-			impl<$($keygen: FullCodec,)+ $( [<$keygen $keygen>]: StorageHasher),+>
-				HasKeyPrefix<($prefix,)> for
-				($(Key<[<$keygen $keygen>], $keygen>),+)
-			{
+			impl<
+				$($keygen: FullCodec,)+
+				$( [<$keygen $keygen>]: StorageHasher,)+
+				[<KArg $prefix>]: EncodeLike<$prefix>
+			> HasKeyPrefix<( [<KArg $prefix>] ,)> for ($(Key<[<$keygen $keygen>], $keygen>),+) {
 				type Suffix = ($($suffix),+);
 
-				fn partial_key(prefix: ($prefix,)) -> Vec<u8> {
+				fn partial_key(prefix: ( [<KArg $prefix>] ,)) -> Vec<u8> {
 					<Key<[<$prefix $prefix>], $prefix>>::final_key(prefix)
 				}
 			}
 
-			impl<$($keygen: FullCodec,)+ $( [<$keygen $keygen>]: ReversibleStorageHasher),+>
-				HasReversibleKeyPrefix<($prefix,)> for
+			impl<
+				$($keygen: FullCodec,)+
+				$( [<$keygen $keygen>]: ReversibleStorageHasher,)+
+				[<KArg $prefix>]: EncodeLike<$prefix>
+			> HasReversibleKeyPrefix<( [<KArg $prefix>] ,)> for
 				($(Key<[<$keygen $keygen>], $keygen>),+)
 			{
 				fn decode_partial_key(key_material: &[u8]) -> Result<Self::Suffix, codec::Error> {
@@ -294,19 +302,23 @@ macro_rules! impl_key_prefix_for {
 	};
 	(($($keygen:ident),+), ($($prefix:ident),+), $suffix:ident) => {
 		paste! {
-			impl<$($keygen: FullCodec,)+ $( [<$keygen $keygen>]: StorageHasher),+>
-				HasKeyPrefix<($($prefix),+)> for
-				($(Key<[<$keygen $keygen>], $keygen>),+)
-			{
+			impl<
+				$($keygen: FullCodec,)+
+				$( [<$keygen $keygen>]: StorageHasher,)+
+				$( [<KArg $prefix>]: EncodeLike<$prefix>),+
+			> HasKeyPrefix<($( [<KArg $prefix>] ),+)> for ($(Key<[<$keygen $keygen>], $keygen>),+) {
 				type Suffix = $suffix;
 
-				fn partial_key(prefix: ($($prefix),+)) -> Vec<u8> {
+				fn partial_key(prefix: ($( [<KArg $prefix>] ),+)) -> Vec<u8> {
 					<($(Key<[<$prefix $prefix>], $prefix>),+)>::final_key(prefix)
 				}
 			}
 
-			impl<$($keygen: FullCodec,)+ $( [<$keygen $keygen>]: ReversibleStorageHasher),+>
-				HasReversibleKeyPrefix<($($prefix),+)> for
+			impl<
+				$($keygen: FullCodec,)+
+				$( [<$keygen $keygen>]: ReversibleStorageHasher,)+
+				$( [<KArg $prefix>]: EncodeLike<$prefix> ),+
+			> HasReversibleKeyPrefix<($( [<KArg $prefix>] ),+)> for
 				($(Key<[<$keygen $keygen>], $keygen>),+)
 			{
 				fn decode_partial_key(key_material: &[u8]) -> Result<Self::Suffix, codec::Error> {
@@ -317,18 +329,28 @@ macro_rules! impl_key_prefix_for {
 	};
 }
 
-impl<A: FullCodec, B: FullCodec, X: StorageHasher, Y: StorageHasher> HasKeyPrefix<(A,)>
-	for (Key<X, A>, Key<Y, B>)
+impl<A, B, X, Y, KArg> HasKeyPrefix<(KArg,)> for (Key<X, A>, Key<Y, B>)
+where
+	A: FullCodec,
+	B: FullCodec,
+	X: StorageHasher,
+	Y: StorageHasher,
+	KArg: EncodeLike<A>,
 {
 	type Suffix = B;
 
-	fn partial_key(prefix: (A,)) -> Vec<u8> {
+	fn partial_key(prefix: (KArg,)) -> Vec<u8> {
 		<Key<X, A>>::final_key(prefix)
 	}
 }
 
-impl<A: FullCodec, B: FullCodec, X: ReversibleStorageHasher, Y: ReversibleStorageHasher>
-	HasReversibleKeyPrefix<(A,)> for (Key<X, A>, Key<Y, B>)
+impl<A, B, X, Y, KArg> HasReversibleKeyPrefix<(KArg,)> for (Key<X, A>, Key<Y, B>)
+where
+	A: FullCodec,
+	B: FullCodec,
+	X: ReversibleStorageHasher,
+	Y: ReversibleStorageHasher,
+	KArg: EncodeLike<A>,
 {
 	fn decode_partial_key(key_material: &[u8]) -> Result<B, codec::Error> {
 		<Key<Y, B>>::decode_final_key(key_material).map(|k| k.0)

From 17f4f08c65e4456733b750c7ceceff23be93b175 Mon Sep 17 00:00:00 2001
From: Frederik Schulz <mustermeiszer@posteo.de>
Date: Mon, 17 May 2021 11:59:10 +0200
Subject: [PATCH 0748/1194] Extends ChildStateBackend and ChildStateAPI with
 ReadProofs (#8812)

* Extends ChildStateBackend and ChildStateAPI with ReadProofs

The following changes integrate the existing `read_child_proof`
from the `ProofProvider` into the ChildStateBackend, so that a
read proof can be generated from a full client via an rpc call.

* Cleanup formatting
---
 client/rpc-api/src/child_state/mod.rs | 10 ++++++++++
 client/rpc/src/state/mod.rs           | 18 ++++++++++++++++++
 client/rpc/src/state/state_full.rs    | 27 +++++++++++++++++++++++++++
 client/rpc/src/state/state_light.rs   |  9 +++++++++
 4 files changed, 64 insertions(+)

diff --git a/client/rpc-api/src/child_state/mod.rs b/client/rpc-api/src/child_state/mod.rs
index 7efff7422596..cffb1590c7f4 100644
--- a/client/rpc-api/src/child_state/mod.rs
+++ b/client/rpc-api/src/child_state/mod.rs
@@ -23,6 +23,7 @@ use sp_core::storage::{StorageKey, PrefixedStorageKey, StorageData};
 use crate::state::error::FutureResult;
 
 pub use self::gen_client::Client as ChildStateClient;
+use crate::state::ReadProof;
 
 /// Substrate child state API
 ///
@@ -68,4 +69,13 @@ pub trait ChildStateApi<Hash> {
 		key: StorageKey,
 		hash: Option<Hash>
 	) -> FutureResult<Option<u64>>;
+
+	/// Returns proof of storage for child key entries at a specific block's state.
+	#[rpc(name = "state_getChildReadProof")]
+	fn read_child_proof(
+		&self,
+		child_storage_key: PrefixedStorageKey,
+		keys: Vec<StorageKey>,
+		hash: Option<Hash>,
+	) -> FutureResult<ReadProof<Hash>>;
 }
diff --git a/client/rpc/src/state/mod.rs b/client/rpc/src/state/mod.rs
index dc36c2f561e5..803fc6797ee9 100644
--- a/client/rpc/src/state/mod.rs
+++ b/client/rpc/src/state/mod.rs
@@ -382,6 +382,14 @@ pub trait ChildStateBackend<Block: BlockT, Client>: Send + Sync + 'static
 		Block: BlockT + 'static,
 		Client: Send + Sync + 'static,
 {
+	/// Returns proof of storage for a child key entries at a specific block's state.
+	fn read_child_proof(
+		&self,
+		block: Option<Block::Hash>,
+		storage_key: PrefixedStorageKey,
+		keys: Vec<StorageKey>,
+	) -> FutureResult<ReadProof<Block::Hash>>;
+
 	/// Returns the keys with prefix from a child storage,
 	/// leave prefix empty to get all the keys.
 	fn storage_keys(
@@ -431,6 +439,15 @@ impl<Block, Client> ChildStateApi<Block::Hash> for ChildState<Block, Client>
 {
 	type Metadata = crate::Metadata;
 
+	fn read_child_proof(
+		&self,
+		child_storage_key: PrefixedStorageKey,
+		keys: Vec<StorageKey>,
+		block: Option<Block::Hash>,
+	) -> FutureResult<ReadProof<Block::Hash>> {
+		self.backend.read_child_proof(block, child_storage_key, keys)
+	}
+
 	fn storage(
 		&self,
 		storage_key: PrefixedStorageKey,
@@ -466,6 +483,7 @@ impl<Block, Client> ChildStateApi<Block::Hash> for ChildState<Block, Client>
 	) -> FutureResult<Option<u64>> {
 		self.backend.storage_size(block, storage_key, key)
 	}
+
 }
 
 fn client_err(err: sp_blockchain::Error) -> Error {
diff --git a/client/rpc/src/state/state_full.rs b/client/rpc/src/state/state_full.rs
index c75106512d33..bea7ddfbb3b7 100644
--- a/client/rpc/src/state/state_full.rs
+++ b/client/rpc/src/state/state_full.rs
@@ -552,12 +552,39 @@ impl<BE, Block, Client> ChildStateBackend<Block, Client> for FullState<BE, Block
 	Block: BlockT + 'static,
 	BE: Backend<Block> + 'static,
 	Client: ExecutorProvider<Block> + StorageProvider<Block, BE>
+		+ ProofProvider<Block>
 		+ HeaderBackend<Block> + BlockBackend<Block>
 		+ HeaderMetadata<Block, Error = sp_blockchain::Error> + BlockchainEvents<Block>
 		+ CallApiAt<Block> + ProvideRuntimeApi<Block>
 		+ Send + Sync + 'static,
 	Client::Api: Metadata<Block>,
 {
+	fn read_child_proof(
+		&self,
+		block: Option<Block::Hash>,
+		storage_key: PrefixedStorageKey,
+		keys: Vec<StorageKey>,
+	) -> FutureResult<ReadProof<Block::Hash>> {
+		Box::new(result(
+			self.block_or_best(block)
+				.and_then(|block| {
+					let child_info = match ChildType::from_prefixed_key(&storage_key) {
+						Some((ChildType::ParentKeyId, storage_key)) => ChildInfo::new_default(storage_key),
+						None => return Err(sp_blockchain::Error::InvalidChildStorageKey),
+					};
+					self.client
+						.read_child_proof(
+							&BlockId::Hash(block),
+							&child_info,
+							&mut keys.iter().map(|key| key.0.as_ref()),
+						)
+						.map(|proof| proof.iter_nodes().map(|node| node.into()).collect())
+						.map(|proof| ReadProof { at: block, proof })
+				})
+				.map_err(client_err),
+		))
+	}
+
 	fn storage_keys(
 		&self,
 		block: Option<Block::Hash>,
diff --git a/client/rpc/src/state/state_light.rs b/client/rpc/src/state/state_light.rs
index 21b99befc051..09fefd2e02c4 100644
--- a/client/rpc/src/state/state_light.rs
+++ b/client/rpc/src/state/state_light.rs
@@ -491,6 +491,15 @@ impl<Block, F, Client> ChildStateBackend<Block, Client> for LightState<Block, F,
 		Client: BlockchainEvents<Block> + HeaderBackend<Block> + Send + Sync + 'static,
 		F: Fetcher<Block> + 'static
 {
+	fn read_child_proof(
+		&self,
+		_block: Option<Block::Hash>,
+		_storage_key: PrefixedStorageKey,
+		_keys: Vec<StorageKey>,
+	) -> FutureResult<ReadProof<Block::Hash>> {
+		Box::new(result(Err(client_err(ClientError::NotAvailableOnLightClient))))
+	}
+
 	fn storage_keys(
 		&self,
 		_block: Option<Block::Hash>,

From 6d78dbdaad38cf7c1c62184393411ab537197791 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Mon, 17 May 2021 15:44:24 +0200
Subject: [PATCH 0749/1194] Allow to specify some max number of values for
 storages in pallet macro. (#8735)

* implement max_values + storages info

* some formatting + doc

* rename StoragesInfo -> PalletStorageInfo

* merge both StorageInfoTrait and PalletStorageInfo

I think it is more future proof. In the future some storage could make
use of multiple prefix. Like one to store how much value has been
inserted, etc...

* Update frame/support/procedural/src/storage/parse.rs

Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>

* Update frame/support/procedural/src/storage/storage_struct.rs

Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>

* Fix max_size using hasher information

hasher now expose `max_len` which allows to computes their maximum len.
For hasher without concatenation, it is the size of the hash part,
for hasher with concatenation, it is the size of the hash part + max
encoded len of the key.

* fix tests

* fix ui tests

Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
---
 frame/support/procedural/src/lib.rs           |  14 +-
 .../src/pallet/expand/pallet_struct.rs        |  44 ++-
 .../src/pallet/parse/pallet_struct.rs         |  76 +++--
 frame/support/procedural/src/storage/mod.rs   |  13 +
 frame/support/procedural/src/storage/parse.rs |  34 ++
 .../procedural/src/storage/storage_info.rs    |  57 ++++
 .../procedural/src/storage/storage_struct.rs  | 158 +++++++++
 frame/support/src/hash.rs                     |  38 +++
 frame/support/src/lib.rs                      |  25 +-
 frame/support/src/storage/types/double_map.rs |  96 ++++--
 frame/support/src/storage/types/key.rs        |  27 +-
 frame/support/src/storage/types/map.rs        |  81 +++--
 frame/support/src/storage/types/mod.rs        |   2 +-
 frame/support/src/storage/types/nmap.rs       |  72 ++++-
 frame/support/src/storage/types/value.rs      |  27 +-
 frame/support/src/traits.rs                   |   4 +-
 frame/support/src/traits/misc.rs              |  15 +
 frame/support/src/traits/storage.rs           |  29 ++
 frame/support/test/tests/decl_storage.rs      | 299 +++++++++++++++---
 frame/support/test/tests/pallet.rs            | 114 ++++++-
 frame/support/test/tests/pallet_instance.rs   |   2 +-
 .../pallet_ui/duplicate_store_attr.stderr     |   6 +-
 .../pallet_ui/storage_info_unsatisfied.rs     |  27 ++
 .../pallet_ui/storage_info_unsatisfied.stderr |   8 +
 .../storage_info_unsatisfied_nmap.rs          |  27 ++
 .../storage_info_unsatisfied_nmap.stderr      |   9 +
 26 files changed, 1158 insertions(+), 146 deletions(-)
 create mode 100644 frame/support/procedural/src/storage/storage_info.rs
 create mode 100644 frame/support/test/tests/pallet_ui/storage_info_unsatisfied.rs
 create mode 100644 frame/support/test/tests/pallet_ui/storage_info_unsatisfied.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.rs
 create mode 100644 frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.stderr

diff --git a/frame/support/procedural/src/lib.rs b/frame/support/procedural/src/lib.rs
index 069339a9794c..6b163ed5d79e 100644
--- a/frame/support/procedural/src/lib.rs
+++ b/frame/support/procedural/src/lib.rs
@@ -156,6 +156,9 @@ use proc_macro::TokenStream;
 /// * \[optional\] `config(#field_name)`: `field_name` is optional if get is set.
 /// Will include the item in `GenesisConfig`.
 /// * \[optional\] `build(#closure)`: Closure called with storage overlays.
+/// * \[optional\] `max_values(#expr)`: `expr` is an expression returning a `u32`. It is used to
+/// implement `StorageInfoTrait`. Note this attribute is not available for storage value as the maximum
+/// number of values is 1.
 /// * `#type`: Storage type.
 /// * \[optional\] `#default`: Value returned when none.
 ///
@@ -234,11 +237,20 @@ use proc_macro::TokenStream;
 /// add_extra_genesis {
 /// 	config(phantom): std::marker::PhantomData<I>,
 /// }
-/// ...
+/// ```
 ///
 /// This adds a field to your `GenesisConfig` with the name `phantom` that you can initialize with
 /// `Default::default()`.
 ///
+/// ## PoV information
+///
+/// To implement the trait `StorageInfoTrait` for storages an additional attribute can be used
+/// `generate_storage_info`:
+/// ```nocompile
+/// decl_storage! { generate_storage_info
+/// 	trait Store for ...
+/// }
+/// ```
 #[proc_macro]
 pub fn decl_storage(input: TokenStream) -> TokenStream {
 	storage::decl_storage_impl(input)
diff --git a/frame/support/procedural/src/pallet/expand/pallet_struct.rs b/frame/support/procedural/src/pallet/expand/pallet_struct.rs
index 556c6515d470..b655227cfc10 100644
--- a/frame/support/procedural/src/pallet/expand/pallet_struct.rs
+++ b/frame/support/procedural/src/pallet/expand/pallet_struct.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::pallet::{Def, parse::helper::get_doc_literals};
+use crate::pallet::{Def, expand::merge_where_clauses, parse::helper::get_doc_literals};
 
 /// * Add derive trait on Pallet
 /// * Implement GetPalletVersion on Pallet
@@ -24,6 +24,7 @@ use crate::pallet::{Def, parse::helper::get_doc_literals};
 /// * declare Module type alias for construct_runtime
 /// * replace the first field type of `struct Pallet` with `PhantomData` if it is `_`
 /// * implementation of `PalletInfoAccess` information
+/// * implementation of `StorageInfoTrait` on Pallet
 pub fn expand_pallet_struct(def: &mut Def) -> proc_macro2::TokenStream {
 	let frame_support = &def.frame_support;
 	let frame_system = &def.frame_system;
@@ -33,6 +34,10 @@ pub fn expand_pallet_struct(def: &mut Def) -> proc_macro2::TokenStream {
 	let pallet_ident = &def.pallet_struct.pallet;
 	let config_where_clause = &def.config.where_clause;
 
+	let mut storages_where_clauses = vec![&def.config.where_clause];
+	storages_where_clauses.extend(def.storages.iter().map(|storage| &storage.where_clause));
+	let storages_where_clauses = merge_where_clauses(&storages_where_clauses);
+
 	let pallet_item = {
 		let pallet_module_items = &mut def.item.content.as_mut().expect("Checked by def").1;
 		let item = &mut pallet_module_items[def.pallet_struct.index];
@@ -97,6 +102,41 @@ pub fn expand_pallet_struct(def: &mut Def) -> proc_macro2::TokenStream {
 		)
 	};
 
+	let storage_info = if let Some(storage_info_span) = def.pallet_struct.generate_storage_info {
+		let storage_names = &def.storages.iter().map(|storage| &storage.ident).collect::<Vec<_>>();
+		let storage_cfg_attrs = &def.storages.iter()
+			.map(|storage| &storage.cfg_attrs)
+			.collect::<Vec<_>>();
+
+		quote::quote_spanned!(storage_info_span =>
+			impl<#type_impl_gen> #frame_support::traits::StorageInfoTrait
+				for #pallet_ident<#type_use_gen>
+				#storages_where_clauses
+			{
+				fn storage_info()
+					-> #frame_support::sp_std::vec::Vec<#frame_support::traits::StorageInfo>
+				{
+					let mut res = #frame_support::sp_std::vec![];
+
+					#(
+						#(#storage_cfg_attrs)*
+						{
+							let mut storage_info = <
+								#storage_names<#type_use_gen>
+								as #frame_support::traits::StorageInfoTrait
+							>::storage_info();
+							res.append(&mut storage_info);
+						}
+					)*
+
+					res
+				}
+			}
+		)
+	} else {
+		Default::default()
+	};
+
 	quote::quote_spanned!(def.pallet_struct.attr_span =>
 		#module_error_metadata
 
@@ -157,5 +197,7 @@ pub fn expand_pallet_struct(def: &mut Def) -> proc_macro2::TokenStream {
 						implemented by the runtime")
 			}
 		}
+
+		#storage_info
 	)
 }
diff --git a/frame/support/procedural/src/pallet/parse/pallet_struct.rs b/frame/support/procedural/src/pallet/parse/pallet_struct.rs
index 6c2c90bd61a5..ba85da2d9e68 100644
--- a/frame/support/procedural/src/pallet/parse/pallet_struct.rs
+++ b/frame/support/procedural/src/pallet/parse/pallet_struct.rs
@@ -24,6 +24,7 @@ mod keyword {
 	syn::custom_keyword!(pallet);
 	syn::custom_keyword!(Pallet);
 	syn::custom_keyword!(generate_store);
+	syn::custom_keyword!(generate_storage_info);
 	syn::custom_keyword!(Store);
 }
 
@@ -39,12 +40,30 @@ pub struct PalletStructDef {
 	pub store: Option<(syn::Visibility, keyword::Store)>,
 	/// The span of the pallet::pallet attribute.
 	pub attr_span: proc_macro2::Span,
+	/// Whether to specify the storages max encoded len when implementing `StorageInfoTrait`.
+	/// Contains the span of the attribute.
+	pub generate_storage_info: Option<proc_macro2::Span>,
 }
 
-/// Parse for `#[pallet::generate_store($vis trait Store)]`
-pub struct PalletStructAttr {
-	vis: syn::Visibility,
-	keyword: keyword::Store,
+/// Parse for one variant of:
+/// * `#[pallet::generate_store($vis trait Store)]`
+/// * `#[pallet::generate_storage_info]`
+pub enum PalletStructAttr {
+	GenerateStore {
+		span: proc_macro2::Span,
+		vis: syn::Visibility,
+		keyword: keyword::Store,
+	},
+	GenerateStorageInfoTrait(proc_macro2::Span),
+}
+
+impl PalletStructAttr {
+	fn span(&self) -> proc_macro2::Span {
+		match self {
+			Self::GenerateStore { span, .. } => *span,
+			Self::GenerateStorageInfoTrait(span) => *span,
+		}
+	}
 }
 
 impl syn::parse::Parse for PalletStructAttr {
@@ -54,14 +73,23 @@ impl syn::parse::Parse for PalletStructAttr {
 		syn::bracketed!(content in input);
 		content.parse::<keyword::pallet>()?;
 		content.parse::<syn::Token![::]>()?;
-		content.parse::<keyword::generate_store>()?;
-
-		let generate_content;
-		syn::parenthesized!(generate_content in content);
-		let vis = generate_content.parse::<syn::Visibility>()?;
-		generate_content.parse::<syn::Token![trait]>()?;
-		let keyword = generate_content.parse::<keyword::Store>()?;
-		Ok(Self { vis, keyword })
+
+		let lookahead = content.lookahead1();
+		if lookahead.peek(keyword::generate_store) {
+			let span = content.parse::<keyword::generate_store>()?.span();
+
+			let generate_content;
+			syn::parenthesized!(generate_content in content);
+			let vis = generate_content.parse::<syn::Visibility>()?;
+			generate_content.parse::<syn::Token![trait]>()?;
+			let keyword = generate_content.parse::<keyword::Store>()?;
+			Ok(Self::GenerateStore { vis, keyword, span })
+		} else if lookahead.peek(keyword::generate_storage_info) {
+			let span = content.parse::<keyword::generate_storage_info>()?.span();
+			Ok(Self::GenerateStorageInfoTrait(span))
+		} else {
+			Err(lookahead.error())
+		}
 	}
 }
 
@@ -78,12 +106,24 @@ impl PalletStructDef {
 			return Err(syn::Error::new(item.span(), msg));
 		};
 
-		let mut event_attrs: Vec<PalletStructAttr> = helper::take_item_pallet_attrs(&mut item.attrs)?;
-		if event_attrs.len() > 1 {
-			let msg = "Invalid pallet::pallet, multiple argument pallet::generate_store found";
-			return Err(syn::Error::new(event_attrs[1].keyword.span(), msg));
+		let mut store = None;
+		let mut generate_storage_info = None;
+
+		let struct_attrs: Vec<PalletStructAttr> = helper::take_item_pallet_attrs(&mut item.attrs)?;
+		for attr in struct_attrs {
+			match attr {
+				PalletStructAttr::GenerateStore { vis, keyword, .. } if store.is_none() => {
+					store = Some((vis, keyword));
+				},
+				PalletStructAttr::GenerateStorageInfoTrait(span) if generate_storage_info.is_none() => {
+					generate_storage_info = Some(span);
+				},
+				attr => {
+					let msg = "Unexpected duplicated attribute";
+					return Err(syn::Error::new(attr.span(), msg));
+				},
+			}
 		}
-		let store = event_attrs.pop().map(|attr| (attr.vis, attr.keyword));
 
 		let pallet = syn::parse2::<keyword::Pallet>(item.ident.to_token_stream())?;
 
@@ -100,6 +140,6 @@ impl PalletStructDef {
 		let mut instances = vec![];
 		instances.push(helper::check_type_def_gen_no_bounds(&item.generics, item.ident.span())?);
 
-		Ok(Self { index, instances, pallet, store, attr_span })
+		Ok(Self { index, instances, pallet, store, attr_span, generate_storage_info })
 	}
 }
diff --git a/frame/support/procedural/src/storage/mod.rs b/frame/support/procedural/src/storage/mod.rs
index 71bcf704f0d7..3a1915e43144 100644
--- a/frame/support/procedural/src/storage/mod.rs
+++ b/frame/support/procedural/src/storage/mod.rs
@@ -18,6 +18,7 @@
 //! `decl_storage` input definition and expansion.
 
 mod storage_struct;
+mod storage_info;
 mod parse;
 mod store_trait;
 mod getters;
@@ -35,6 +36,8 @@ use frame_support_procedural_tools::{
 
 /// All information contained in input of decl_storage
 pub struct DeclStorageDef {
+	/// Whether to generate the storage info
+	generate_storage_info: bool,
 	/// Name of the module used to import hidden imports.
 	hidden_crate: Option<syn::Ident>,
 	/// Visibility of store trait.
@@ -69,6 +72,8 @@ impl syn::parse::Parse for DeclStorageDef {
 
 /// Extended version of `DeclStorageDef` with useful precomputed value.
 pub struct DeclStorageDefExt {
+	/// Whether to generate the storage info
+	generate_storage_info: bool,
 	/// Name of the module used to import hidden imports.
 	hidden_crate: proc_macro2::TokenStream,
 	/// Hidden imports used by the module.
@@ -154,6 +159,7 @@ impl From<DeclStorageDef> for DeclStorageDefExt {
 		Self {
 			hidden_crate,
 			hidden_imports,
+			generate_storage_info: def.generate_storage_info,
 			visibility: def.visibility,
 			store_trait: def.store_trait,
 			module_name: def.module_name,
@@ -193,6 +199,8 @@ pub struct StorageLineDef {
 	getter: Option<syn::Ident>,
 	/// The name of the field to be used in genesis config if any.
 	config: Option<syn::Ident>,
+	/// The given max values with `max_values` attribute, or a none if not specified.
+	max_values: Option<syn::Expr>,
 	/// The build function of the storage if any.
 	build: Option<syn::Expr>,
 	/// Default value of genesis config field and also for storage when no value available.
@@ -210,6 +218,8 @@ pub struct StorageLineDefExt {
 	getter: Option<syn::Ident>,
 	/// The name of the field to be used in genesis config if any.
 	config: Option<syn::Ident>,
+	/// The given max values with `max_values` attribute, or a none if not specified.
+	max_values: Option<syn::Expr>,
 	/// The build function of the storage if any.
 	build: Option<syn::Expr>,
 	/// Default value of genesis config field and also for storage when no value available.
@@ -333,6 +343,7 @@ impl StorageLineDefExt {
 			name: storage_def.name,
 			getter: storage_def.getter,
 			config: storage_def.config,
+			max_values: storage_def.max_values,
 			build: storage_def.build,
 			default_value: storage_def.default_value,
 			storage_type: storage_def.storage_type,
@@ -469,6 +480,7 @@ pub fn decl_storage_impl(input: proc_macro::TokenStream) -> proc_macro::TokenStr
 	let instance_trait = instance_trait::decl_and_impl(&def_ext);
 	let genesis_config = genesis_config::genesis_config_and_build_storage(&def_ext);
 	let storage_struct = storage_struct::decl_and_impl(&def_ext);
+	let storage_info = storage_info::impl_storage_info(&def_ext);
 
 	quote!(
 		use #scrate::{
@@ -489,5 +501,6 @@ pub fn decl_storage_impl(input: proc_macro::TokenStream) -> proc_macro::TokenStr
 		#instance_trait
 		#genesis_config
 		#storage_struct
+		#storage_info
 	).into()
 }
diff --git a/frame/support/procedural/src/storage/parse.rs b/frame/support/procedural/src/storage/parse.rs
index 93a1b844a84a..ca97b7957c10 100644
--- a/frame/support/procedural/src/storage/parse.rs
+++ b/frame/support/procedural/src/storage/parse.rs
@@ -21,10 +21,12 @@ use frame_support_procedural_tools::{ToTokens, Parse, syn_ext as ext};
 use syn::{Ident, Token, spanned::Spanned};
 
 mod keyword {
+	syn::custom_keyword!(generate_storage_info);
 	syn::custom_keyword!(hiddencrate);
 	syn::custom_keyword!(add_extra_genesis);
 	syn::custom_keyword!(extra_genesis_skip_phantom_data_field);
 	syn::custom_keyword!(config);
+	syn::custom_keyword!(max_values);
 	syn::custom_keyword!(build);
 	syn::custom_keyword!(get);
 	syn::custom_keyword!(map);
@@ -73,6 +75,7 @@ macro_rules! impl_parse_for_opt {
 /// Parsing usage only
 #[derive(Parse, ToTokens, Debug)]
 struct StorageDefinition {
+	pub generate_storage_info: Opt<GenerateStorageInfo>,
 	pub hidden_crate: Opt<SpecificHiddenCrate>,
 	pub visibility: syn::Visibility,
 	pub trait_token: Token![trait],
@@ -97,6 +100,12 @@ struct StorageDefinition {
 	pub extra_genesis: Opt<AddExtraGenesis>,
 }
 
+#[derive(Parse, ToTokens, Debug)]
+struct GenerateStorageInfo {
+	pub keyword: keyword::generate_storage_info,
+}
+impl_parse_for_opt!(GenerateStorageInfo => keyword::generate_storage_info);
+
 #[derive(Parse, ToTokens, Debug)]
 struct SpecificHiddenCrate {
 	pub keyword: keyword::hiddencrate,
@@ -160,6 +169,7 @@ struct DeclStorageLine {
 	pub name: Ident,
 	pub getter: Opt<DeclStorageGetter>,
 	pub config: Opt<DeclStorageConfig>,
+	pub max_values: Opt<DeclStorageMaxValues>,
 	pub build: Opt<DeclStorageBuild>,
 	pub coldot_token: Token![:],
 	pub storage_type: DeclStorageType,
@@ -188,6 +198,13 @@ struct DeclStorageConfig {
 
 impl_parse_for_opt!(DeclStorageConfig => keyword::config);
 
+#[derive(Parse, ToTokens, Debug)]
+struct DeclStorageMaxValues {
+	pub max_values_keyword: keyword::max_values,
+	pub expr: ext::Parens<syn::Expr>,
+}
+impl_parse_for_opt!(DeclStorageMaxValues => keyword::max_values);
+
 #[derive(Parse, ToTokens, Debug)]
 struct DeclStorageBuild {
 	pub build_keyword: keyword::build,
@@ -437,6 +454,7 @@ pub fn parse(input: syn::parse::ParseStream) -> syn::Result<super::DeclStorageDe
 	let storage_lines = parse_storage_line_defs(def.content.content.inner.into_iter())?;
 
 	Ok(super::DeclStorageDef {
+		generate_storage_info: def.generate_storage_info.inner.is_some(),
 		hidden_crate: def.hidden_crate.inner.map(|i| i.ident.content),
 		visibility: def.visibility,
 		module_name: def.module_ident,
@@ -490,6 +508,21 @@ fn parse_storage_line_defs(
 			})?;
 		}
 
+		let max_values = match &line.storage_type {
+			DeclStorageType::Map(_) | DeclStorageType::DoubleMap(_) | DeclStorageType::NMap(_) => {
+				line.max_values.inner.map(|i| i.expr.content)
+			},
+			DeclStorageType::Simple(_) => {
+				if let Some(max_values) = line.max_values.inner {
+					let msg = "unexpected max_values attribute for storage value.";
+					let span = max_values.max_values_keyword.span();
+					return Err(syn::Error::new(span, msg));
+				} else {
+					Some(syn::parse_quote!(1u32))
+				}
+			},
+		};
+
 		let span = line.storage_type.span();
 		let no_hasher_error = || syn::Error::new(
 			span,
@@ -534,6 +567,7 @@ fn parse_storage_line_defs(
 			name: line.name,
 			getter,
 			config,
+			max_values,
 			build: line.build.inner.map(|o| o.expr.content),
 			default_value: line.default_value.inner.map(|o| o.expr),
 			storage_type,
diff --git a/frame/support/procedural/src/storage/storage_info.rs b/frame/support/procedural/src/storage/storage_info.rs
new file mode 100644
index 000000000000..ed07ccbfc71d
--- /dev/null
+++ b/frame/support/procedural/src/storage/storage_info.rs
@@ -0,0 +1,57 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Implementation of trait `StorageInfoTrait` on module structure.
+
+use proc_macro2::TokenStream;
+use quote::quote;
+use super::DeclStorageDefExt;
+
+pub fn impl_storage_info(def: &DeclStorageDefExt) -> TokenStream {
+	if !def.generate_storage_info {
+		return Default::default()
+	}
+
+	let scrate = &def.hidden_crate;
+
+	let mut res_append_storage = TokenStream::new();
+
+	for line in def.storage_lines.iter() {
+		let storage_struct = &line.storage_struct;
+
+		res_append_storage.extend(quote!(
+			let mut storage_info = <
+				#storage_struct as #scrate::traits::StorageInfoTrait
+			>::storage_info();
+			res.append(&mut storage_info);
+		));
+	}
+
+	let module_struct = &def.module_struct;
+	let module_impl = &def.module_impl;
+	let where_clause = &def.where_clause;
+
+	quote!(
+		impl#module_impl #scrate::traits::StorageInfoTrait for #module_struct #where_clause {
+			fn storage_info() -> #scrate::sp_std::vec::Vec<#scrate::traits::StorageInfo> {
+				let mut res = #scrate::sp_std::vec![];
+				#res_append_storage
+				res
+			}
+		}
+	)
+}
diff --git a/frame/support/procedural/src/storage/storage_struct.rs b/frame/support/procedural/src/storage/storage_struct.rs
index 51b55bdc4f13..c1af0ee0701f 100644
--- a/frame/support/procedural/src/storage/storage_struct.rs
+++ b/frame/support/procedural/src/storage/storage_struct.rs
@@ -245,9 +245,167 @@ pub fn decl_and_impl(def: &DeclStorageDefExt) -> TokenStream {
 			}
 		};
 
+		let max_values = if let Some(max_values) = &line.max_values {
+			quote::quote!({
+				let max_values: u32 = (|| #max_values)();
+				Some(max_values)
+			})
+		} else {
+			quote::quote!(None)
+		};
+
+		let storage_info_impl = if def.generate_storage_info {
+			match &line.storage_type {
+				StorageLineTypeDef::Simple(_) => {
+					quote!(
+						impl<#impl_trait> #scrate::traits::StorageInfoTrait for #storage_struct
+						#optional_storage_where_clause
+						{
+							fn storage_info()
+								-> #scrate::sp_std::vec::Vec<#scrate::traits::StorageInfo>
+							{
+								use #scrate::sp_runtime::SaturatedConversion;
+
+								let max_size = <
+									#value_type as #scrate::traits::MaxEncodedLen
+								>::max_encoded_len()
+									.saturated_into();
+
+								#scrate::sp_std::vec![
+									#scrate::traits::StorageInfo {
+										prefix: <
+											#storage_struct as #scrate::#storage_generator_trait
+										>::storage_value_final_key(),
+										max_values: Some(1),
+										max_size: Some(max_size),
+									}
+								]
+							}
+						}
+					)
+				},
+				StorageLineTypeDef::Map(map) => {
+					let key = &map.key;
+					quote!(
+						impl<#impl_trait> #scrate::traits::StorageInfoTrait for #storage_struct
+						#optional_storage_where_clause
+						{
+							fn storage_info()
+								-> #scrate::sp_std::vec::Vec<#scrate::traits::StorageInfo>
+							{
+								use #scrate::sp_runtime::SaturatedConversion;
+								use #scrate::StorageHasher;
+
+								let key_max_size = <
+									Self as #scrate::storage::generator::StorageMap<_, _>
+								>::Hasher::max_len::<#key>();
+
+								let max_size = <
+									#value_type as #scrate::traits::MaxEncodedLen
+								>::max_encoded_len()
+									.saturating_add(key_max_size)
+									.saturated_into();
+
+								#scrate::sp_std::vec![
+									#scrate::traits::StorageInfo {
+										prefix: <
+											#storage_struct
+											as #scrate::storage::StoragePrefixedMap<#value_type>
+										>::final_prefix(),
+										max_values: #max_values,
+										max_size: Some(max_size),
+									}
+								]
+							}
+						}
+					)
+				},
+				StorageLineTypeDef::DoubleMap(map) => {
+					let key1 = &map.key1;
+					let key2 = &map.key2;
+					quote!(
+						impl<#impl_trait> #scrate::traits::StorageInfoTrait for #storage_struct
+						#optional_storage_where_clause
+						{
+							fn storage_info()
+								-> #scrate::sp_std::vec::Vec<#scrate::traits::StorageInfo>
+							{
+								use #scrate::sp_runtime::SaturatedConversion;
+								use #scrate::StorageHasher;
+
+								let key1_max_size = <
+									Self as #scrate::storage::generator::StorageDoubleMap<_, _, _>
+								>::Hasher1::max_len::<#key1>();
+
+								let key2_max_size = <
+									Self as #scrate::storage::generator::StorageDoubleMap<_, _, _>
+								>::Hasher2::max_len::<#key2>();
+
+								let max_size = <
+									#value_type as #scrate::traits::MaxEncodedLen
+								>::max_encoded_len()
+									.saturating_add(key1_max_size)
+									.saturating_add(key2_max_size)
+									.saturated_into();
+
+								#scrate::sp_std::vec![
+									#scrate::traits::StorageInfo {
+										prefix: <
+											#storage_struct
+											as #scrate::storage::StoragePrefixedMap<#value_type>
+										>::final_prefix(),
+										max_values: #max_values,
+										max_size: Some(max_size),
+									}
+								]
+							}
+						}
+					)
+				},
+				StorageLineTypeDef::NMap(map) => {
+					let key = &map.to_keygen_struct(scrate);
+					quote!(
+						impl<#impl_trait> #scrate::traits::StorageInfoTrait for #storage_struct
+						#optional_storage_where_clause
+						{
+							fn storage_info()
+								-> #scrate::sp_std::vec::Vec<#scrate::traits::StorageInfo>
+							{
+								use #scrate::sp_runtime::SaturatedConversion;
+
+								let key_max_size = <
+									#key as #scrate::storage::types::KeyGeneratorMaxEncodedLen
+								>::key_max_encoded_len();
+
+								let max_size = <
+									#value_type as #scrate::traits::MaxEncodedLen
+								>::max_encoded_len()
+									.saturating_add(key_max_size)
+									.saturated_into();
+
+								#scrate::sp_std::vec![
+									#scrate::traits::StorageInfo {
+										prefix: <
+											#storage_struct
+											as #scrate::storage::StoragePrefixedMap<#value_type>
+										>::final_prefix(),
+										max_values: #max_values,
+										max_size: Some(max_size),
+									}
+								]
+							}
+						}
+					)
+				},
+			}
+		} else {
+			TokenStream::default()
+		};
+
 		impls.extend(quote!(
 			#struct_decl
 			#struct_impl
+			#storage_info_impl
 		))
 	}
 
diff --git a/frame/support/src/hash.rs b/frame/support/src/hash.rs
index 22ccbeb6ceee..5c4bfb34f5f9 100644
--- a/frame/support/src/hash.rs
+++ b/frame/support/src/hash.rs
@@ -20,6 +20,7 @@
 use codec::Codec;
 use sp_std::prelude::Vec;
 use sp_io::hashing::{blake2_128, blake2_256, twox_64, twox_128, twox_256};
+use crate::traits::MaxEncodedLen;
 
 // This trait must be kept coherent with frame-support-procedural HasherKind usage
 pub trait Hashable: Sized {
@@ -59,6 +60,9 @@ pub trait StorageHasher: 'static {
 	const METADATA: frame_metadata::StorageHasher;
 	type Output: AsRef<[u8]>;
 	fn hash(x: &[u8]) -> Self::Output;
+
+	/// The max length of the final hash, for the given key type.
+	fn max_len<K: MaxEncodedLen>() -> usize;
 }
 
 /// Hasher to use to hash keys to insert to storage.
@@ -79,6 +83,9 @@ impl StorageHasher for Identity {
 	fn hash(x: &[u8]) -> Vec<u8> {
 		x.to_vec()
 	}
+	fn max_len<K: MaxEncodedLen>() -> usize {
+		K::max_encoded_len()
+	}
 }
 impl ReversibleStorageHasher for Identity {
 	fn reverse(x: &[u8]) -> &[u8] {
@@ -98,6 +105,9 @@ impl StorageHasher for Twox64Concat {
 			.cloned()
 			.collect::<Vec<_>>()
 	}
+	fn max_len<K: MaxEncodedLen>() -> usize {
+		K::max_encoded_len().saturating_add(8)
+	}
 }
 impl ReversibleStorageHasher for Twox64Concat {
 	fn reverse(x: &[u8]) -> &[u8] {
@@ -121,6 +131,9 @@ impl StorageHasher for Blake2_128Concat {
 			.cloned()
 			.collect::<Vec<_>>()
 	}
+	fn max_len<K: MaxEncodedLen>() -> usize {
+		K::max_encoded_len().saturating_add(16)
+	}
 }
 impl ReversibleStorageHasher for Blake2_128Concat {
 	fn reverse(x: &[u8]) -> &[u8] {
@@ -140,6 +153,9 @@ impl StorageHasher for Blake2_128 {
 	fn hash(x: &[u8]) -> [u8; 16] {
 		blake2_128(x)
 	}
+	fn max_len<K: MaxEncodedLen>() -> usize {
+		16
+	}
 }
 
 /// Hash storage keys with blake2 256
@@ -150,6 +166,9 @@ impl StorageHasher for Blake2_256 {
 	fn hash(x: &[u8]) -> [u8; 32] {
 		blake2_256(x)
 	}
+	fn max_len<K: MaxEncodedLen>() -> usize {
+		32
+	}
 }
 
 /// Hash storage keys with twox 128
@@ -160,6 +179,9 @@ impl StorageHasher for Twox128 {
 	fn hash(x: &[u8]) -> [u8; 16] {
 		twox_128(x)
 	}
+	fn max_len<K: MaxEncodedLen>() -> usize {
+		16
+	}
 }
 
 /// Hash storage keys with twox 256
@@ -170,6 +192,9 @@ impl StorageHasher for Twox256 {
 	fn hash(x: &[u8]) -> [u8; 32] {
 		twox_256(x)
 	}
+	fn max_len<K: MaxEncodedLen>() -> usize {
+		32
+	}
 }
 
 #[cfg(test)]
@@ -187,4 +212,17 @@ mod tests {
 		let r = Blake2_128Concat::hash(b"foo");
 		assert_eq!(r.split_at(16), (&blake2_128(b"foo")[..], &b"foo"[..]))
 	}
+
+	#[test]
+	fn max_lengths() {
+		use codec::Encode;
+		let encoded_0u32 = &0u32.encode()[..];
+		assert_eq!(Twox64Concat::hash(encoded_0u32).len(), Twox64Concat::max_len::<u32>());
+		assert_eq!(Twox128::hash(encoded_0u32).len(), Twox128::max_len::<u32>());
+		assert_eq!(Twox256::hash(encoded_0u32).len(), Twox256::max_len::<u32>());
+		assert_eq!(Blake2_128::hash(encoded_0u32).len(), Blake2_128::max_len::<u32>());
+		assert_eq!(Blake2_128Concat::hash(encoded_0u32).len(), Blake2_128Concat::max_len::<u32>());
+		assert_eq!(Blake2_256::hash(encoded_0u32).len(), Blake2_256::max_len::<u32>());
+		assert_eq!(Identity::hash(encoded_0u32).len(), Identity::max_len::<u32>());
+	}
 }
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index d87ab8e6ed46..0f96cdd02319 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -1234,7 +1234,10 @@ pub mod pallet_prelude {
 		EqNoBound, PartialEqNoBound, RuntimeDebugNoBound, DebugNoBound, CloneNoBound, Twox256,
 		Twox128, Blake2_256, Blake2_128, Identity, Twox64Concat, Blake2_128Concat, ensure,
 		RuntimeDebug, storage,
-		traits::{Get, Hooks, IsType, GetPalletVersion, EnsureOrigin, PalletInfoAccess},
+		traits::{
+			Get, Hooks, IsType, GetPalletVersion, EnsureOrigin, PalletInfoAccess, StorageInfoTrait,
+			ConstU32, GetDefault,
+		},
 		dispatch::{DispatchResultWithPostInfo, Parameter, DispatchError, DispatchResult},
 		weights::{DispatchClass, Pays, Weight},
 		storage::types::{
@@ -1346,6 +1349,17 @@ pub mod pallet_prelude {
 /// Thus when defining a storage named `Foo`, it can later be accessed from `Pallet` using
 /// `<Pallet as Store>::Foo`.
 ///
+/// To generate the full storage info (used for PoV calculation) use the attribute
+/// `#[pallet::set_storage_max_encoded_len]`, e.g.:
+/// ```ignore
+/// #[pallet::pallet]
+/// #[pallet::set_storage_max_encoded_len]
+/// pub struct Pallet<T>(_);
+/// ```
+///
+/// This require all storage to implement the trait [`traits::StorageInfoTrait`], thus all keys
+/// and value types must bound [`traits::MaxEncodedLen`].
+///
 /// ### Macro expansion:
 ///
 /// The macro add this attribute to the struct definition:
@@ -1370,7 +1384,14 @@ pub mod pallet_prelude {
 /// given by [`frame_support::traits::PalletInfo`].
 /// (The implementation use the associated type `frame_system::Config::PalletInfo`).
 ///
-/// If attribute generate_store then macro create the trait `Store` and implement it on `Pallet`.
+/// It implements [`traits::StorageInfoTrait`] on `Pallet` which give information about all storages.
+///
+/// If the attribute generate_store is set then the macro creates the trait `Store` and implements
+/// it on `Pallet`.
+///
+/// If the attribute set_storage_max_encoded_len is set then the macro call
+/// [`traits::StorageInfoTrait`] for each storage in the implementation of
+/// [`traits::StorageInfoTrait`] for the pallet.
 ///
 /// # Hooks: `#[pallet::hooks]` mandatory
 ///
diff --git a/frame/support/src/storage/types/double_map.rs b/frame/support/src/storage/types/double_map.rs
index 70b0c19f7624..8c23354817f4 100644
--- a/frame/support/src/storage/types/double_map.rs
+++ b/frame/support/src/storage/types/double_map.rs
@@ -21,14 +21,15 @@
 use codec::{Decode, Encode, EncodeLike, FullCodec};
 use crate::{
 	storage::{
-		StorageAppend, StorageDecodeLength,
+		StorageAppend, StorageDecodeLength, StoragePrefixedMap,
 		bounded_vec::BoundedVec,
 		types::{OptionQuery, QueryKindTrait, OnEmptyGetter},
 	},
-	traits::{GetDefault, StorageInstance, Get},
+	traits::{GetDefault, StorageInstance, Get, MaxEncodedLen, StorageInfo},
 };
 use frame_metadata::{DefaultByteGetter, StorageEntryModifier};
-use sp_std::vec::Vec;
+use sp_arithmetic::traits::SaturatedConversion;
+use sp_std::prelude::*;
 
 /// A type that allow to store values for `(key1, key2)` couple. Similar to `StorageMap` but allow
 /// to iterate and remove value associated to first key.
@@ -47,14 +48,24 @@ use sp_std::vec::Vec;
 /// such as `blake2_128_concat` must be used for Hasher1 (resp. Hasher2). Otherwise, other values
 /// in storage can be compromised.
 pub struct StorageDoubleMap<
-	Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind=OptionQuery, OnEmpty=GetDefault
+	Prefix,
+	Hasher1,
+	Key1,
+	Hasher2,
+	Key2,
+	Value,
+	QueryKind=OptionQuery,
+	OnEmpty=GetDefault,
+	MaxValues=GetDefault,
 >(
-	core::marker::PhantomData<(Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty)>
+	core::marker::PhantomData<
+		(Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty, MaxValues)
+	>
 );
 
-impl<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty>
+impl<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty, MaxValues>
 	crate::storage::generator::StorageDoubleMap<Key1, Key2, Value> for
-	StorageDoubleMap<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty>
+	StorageDoubleMap<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty, MaxValues>
 where
 	Prefix: StorageInstance,
 	Hasher1: crate::hash::StorageHasher,
@@ -63,7 +74,8 @@ where
 	Key2: FullCodec,
 	Value: FullCodec,
 	QueryKind: QueryKindTrait<Value, OnEmpty>,
-	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static
+	OnEmpty: Get<QueryKind::Query> + 'static,
+	MaxValues: Get<Option<u32>>,
 {
 	type Query = QueryKind::Query;
 	type Hasher1 = Hasher1;
@@ -82,9 +94,9 @@ where
 	}
 }
 
-impl<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty>
-	crate::storage::StoragePrefixedMap<Value> for
-	StorageDoubleMap<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty>
+impl<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty, MaxValues>
+	StoragePrefixedMap<Value> for
+	StorageDoubleMap<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty, MaxValues>
 where
 	Prefix: StorageInstance,
 	Hasher1: crate::hash::StorageHasher,
@@ -93,7 +105,8 @@ where
 	Key2: FullCodec,
 	Value: FullCodec,
 	QueryKind: QueryKindTrait<Value, OnEmpty>,
-	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static
+	OnEmpty: Get<QueryKind::Query> + 'static,
+	MaxValues: Get<Option<u32>>,
 {
 	fn module_prefix() -> &'static [u8] {
 		<Self as crate::storage::generator::StorageDoubleMap<Key1, Key2, Value>>::module_prefix()
@@ -103,7 +116,7 @@ where
 	}
 }
 
-impl<Prefix, Hasher1, Key1, Hasher2, Key2, QueryKind, OnEmpty, VecValue, VecBound>
+impl<Prefix, Hasher1, Key1, Hasher2, Key2, QueryKind, OnEmpty, MaxValues, VecValue, VecBound>
 	StorageDoubleMap<
 		Prefix,
 		Hasher1,
@@ -113,6 +126,7 @@ impl<Prefix, Hasher1, Key1, Hasher2, Key2, QueryKind, OnEmpty, VecValue, VecBoun
 		BoundedVec<VecValue, VecBound>,
 		QueryKind,
 		OnEmpty,
+		MaxValues,
 	> where
 	Prefix: StorageInstance,
 	Hasher1: crate::hash::StorageHasher,
@@ -120,7 +134,8 @@ impl<Prefix, Hasher1, Key1, Hasher2, Key2, QueryKind, OnEmpty, VecValue, VecBoun
 	Key1: FullCodec,
 	Key2: FullCodec,
 	QueryKind: QueryKindTrait<BoundedVec<VecValue, VecBound>, OnEmpty>,
-	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
+	OnEmpty: Get<QueryKind::Query> + 'static,
+	MaxValues: Get<Option<u32>>,
 	VecValue: FullCodec,
 	VecBound: Get<u32>,
 {
@@ -147,8 +162,8 @@ impl<Prefix, Hasher1, Key1, Hasher2, Key2, QueryKind, OnEmpty, VecValue, VecBoun
 	}
 }
 
-impl<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty>
-	StorageDoubleMap<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty>
+impl<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty, MaxValues>
+	StorageDoubleMap<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty, MaxValues>
 where
 	Prefix: StorageInstance,
 	Hasher1: crate::hash::StorageHasher,
@@ -157,7 +172,8 @@ where
 	Key2: FullCodec,
 	Value: FullCodec,
 	QueryKind: QueryKindTrait<Value, OnEmpty>,
-	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static
+	OnEmpty: Get<QueryKind::Query> + 'static,
+	MaxValues: Get<Option<u32>>,
 {
 	/// Get the storage key used to fetch a value corresponding to a specific key.
 	pub fn hashed_key_for<KArg1, KArg2>(k1: KArg1, k2: KArg2) -> Vec<u8>
@@ -376,8 +392,8 @@ where
 	}
 }
 
-impl<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty>
-	StorageDoubleMap<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty>
+impl<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty, MaxValues>
+	StorageDoubleMap<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty, MaxValues>
 where
 	Prefix: StorageInstance,
 	Hasher1: crate::hash::StorageHasher + crate::ReversibleStorageHasher,
@@ -386,7 +402,8 @@ where
 	Key2: FullCodec,
 	Value: FullCodec,
 	QueryKind: QueryKindTrait<Value, OnEmpty>,
-	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static
+	OnEmpty: Get<QueryKind::Query> + 'static,
+	MaxValues: Get<Option<u32>>,
 {
 	/// Enumerate all elements in the map with first key `k1` in no particular order.
 	///
@@ -440,8 +457,10 @@ pub trait StorageDoubleMapMetadata {
 	const HASHER2: frame_metadata::StorageHasher;
 }
 
-impl<Prefix, Hasher1, Hasher2, Key1, Key2, Value, QueryKind, OnEmpty> StorageDoubleMapMetadata
-	for StorageDoubleMap<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty> where
+impl<Prefix, Hasher1, Hasher2, Key1, Key2, Value, QueryKind, OnEmpty, MaxValues>
+	StorageDoubleMapMetadata for
+	StorageDoubleMap<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty, MaxValues>
+where
 	Prefix: StorageInstance,
 	Hasher1: crate::hash::StorageHasher,
 	Hasher2: crate::hash::StorageHasher,
@@ -449,7 +468,8 @@ impl<Prefix, Hasher1, Hasher2, Key1, Key2, Value, QueryKind, OnEmpty> StorageDou
 	Key2: FullCodec,
 	Value: FullCodec,
 	QueryKind: QueryKindTrait<Value, OnEmpty>,
-	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static
+	OnEmpty: Get<QueryKind::Query> + 'static,
+	MaxValues: Get<Option<u32>>,
 {
 	const MODIFIER: StorageEntryModifier = QueryKind::METADATA;
 	const HASHER1: frame_metadata::StorageHasher = Hasher1::METADATA;
@@ -459,6 +479,36 @@ impl<Prefix, Hasher1, Hasher2, Key1, Key2, Value, QueryKind, OnEmpty> StorageDou
 		DefaultByteGetter(&OnEmptyGetter::<QueryKind::Query, OnEmpty>(core::marker::PhantomData));
 }
 
+impl<Prefix, Hasher1, Hasher2, Key1, Key2, Value, QueryKind, OnEmpty, MaxValues>
+	crate::traits::StorageInfoTrait for
+	StorageDoubleMap<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty, MaxValues>
+where
+	Prefix: StorageInstance,
+	Hasher1: crate::hash::StorageHasher,
+	Hasher2: crate::hash::StorageHasher,
+	Key1: FullCodec + MaxEncodedLen,
+	Key2: FullCodec + MaxEncodedLen,
+	Value: FullCodec + MaxEncodedLen,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: Get<QueryKind::Query> + 'static,
+	MaxValues: Get<Option<u32>>,
+{
+	fn storage_info() -> Vec<StorageInfo> {
+		vec![
+			StorageInfo {
+				prefix: Self::final_prefix(),
+				max_values: MaxValues::get(),
+				max_size: Some(
+					Hasher1::max_len::<Key1>()
+						.saturating_add(Hasher2::max_len::<Key2>())
+						.saturating_add(Value::max_encoded_len())
+						.saturated_into(),
+				),
+			}
+		]
+	}
+}
+
 #[cfg(test)]
 mod test {
 	use super::*;
diff --git a/frame/support/src/storage/types/key.rs b/frame/support/src/storage/types/key.rs
index 5eb608233b85..79fc33a24e83 100755
--- a/frame/support/src/storage/types/key.rs
+++ b/frame/support/src/storage/types/key.rs
@@ -17,7 +17,7 @@
 
 //! Storage key type.
 
-use crate::hash::{ReversibleStorageHasher, StorageHasher};
+use crate::{hash::{ReversibleStorageHasher, StorageHasher}, traits::MaxEncodedLen};
 use codec::{Encode, EncodeLike, FullCodec};
 use paste::paste;
 use sp_std::prelude::*;
@@ -53,6 +53,11 @@ pub trait KeyGenerator {
 	) -> Vec<u8>;
 }
 
+/// The maximum length used by the key in storage.
+pub trait KeyGeneratorMaxEncodedLen: KeyGenerator {
+	fn key_max_encoded_len() -> usize;
+}
+
 /// A trait containing methods that are only implemented on the Key struct instead of the entire tuple.
 pub trait KeyGeneratorInner: KeyGenerator {
 	type Hasher: StorageHasher;
@@ -91,6 +96,12 @@ impl<H: StorageHasher, K: FullCodec> KeyGenerator for Key<H, K> {
 	}
 }
 
+impl<H: StorageHasher, K: FullCodec + MaxEncodedLen> KeyGeneratorMaxEncodedLen for Key<H, K> {
+	fn key_max_encoded_len() -> usize {
+		H::max_len::<K>()
+	}
+}
+
 impl<H: StorageHasher, K: FullCodec> KeyGeneratorInner for Key<H, K> {
 	type Hasher = H;
 
@@ -139,6 +150,20 @@ impl KeyGenerator for Tuple {
 	}
 }
 
+#[impl_trait_for_tuples::impl_for_tuples(2, 18)]
+#[tuple_types_custom_trait_bound(KeyGeneratorInner + KeyGeneratorMaxEncodedLen)]
+impl KeyGeneratorMaxEncodedLen for Tuple {
+	fn key_max_encoded_len() -> usize {
+		let mut len = 0usize;
+		for_tuples!(
+			#(
+				len = len.saturating_add(Tuple::key_max_encoded_len());
+			)*
+		);
+		len
+	}
+}
+
 /// Marker trait to indicate that each element in the tuple encodes like the corresponding element
 /// in another tuple.
 ///
diff --git a/frame/support/src/storage/types/map.rs b/frame/support/src/storage/types/map.rs
index b9c3044f93f0..ac2817c6887f 100644
--- a/frame/support/src/storage/types/map.rs
+++ b/frame/support/src/storage/types/map.rs
@@ -21,13 +21,14 @@
 use codec::{FullCodec, Decode, EncodeLike, Encode};
 use crate::{
 	storage::{
-		StorageAppend, StorageDecodeLength,
+		StorageAppend, StorageDecodeLength, StoragePrefixedMap,
 		bounded_vec::BoundedVec,
 		types::{OptionQuery, QueryKindTrait, OnEmptyGetter},
 	},
-	traits::{GetDefault, StorageInstance, Get},
+	traits::{GetDefault, StorageInstance, Get, MaxEncodedLen, StorageInfo},
 };
 use frame_metadata::{DefaultByteGetter, StorageEntryModifier};
+use sp_arithmetic::traits::SaturatedConversion;
 use sp_std::prelude::*;
 
 /// A type that allow to store value for given key. Allowing to insert/remove/iterate on values.
@@ -43,20 +44,23 @@ use sp_std::prelude::*;
 ///
 /// If the keys are not trusted (e.g. can be set by a user), a cryptographic `hasher` such as
 /// `blake2_128_concat` must be used.  Otherwise, other values in storage can be compromised.
-pub struct StorageMap<Prefix, Hasher, Key, Value, QueryKind=OptionQuery, OnEmpty=GetDefault>(
-	core::marker::PhantomData<(Prefix, Hasher, Key, Value, QueryKind, OnEmpty)>
+pub struct StorageMap<
+	Prefix, Hasher, Key, Value, QueryKind=OptionQuery, OnEmpty=GetDefault, MaxValues=GetDefault,
+>(
+	core::marker::PhantomData<(Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues)>
 );
 
-impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty>
+impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
 	crate::storage::generator::StorageMap<Key, Value>
-	for StorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty>
+	for StorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
 where
 	Prefix: StorageInstance,
 	Hasher: crate::hash::StorageHasher,
 	Key: FullCodec,
 	Value: FullCodec,
 	QueryKind: QueryKindTrait<Value, OnEmpty>,
-	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
+	OnEmpty: Get<QueryKind::Query> + 'static,
+	MaxValues: Get<Option<u32>>,
 {
 	type Query = QueryKind::Query;
 	type Hasher = Hasher;
@@ -74,15 +78,17 @@ where
 	}
 }
 
-impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty> crate::storage::StoragePrefixedMap<Value> for
-	StorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty>
+impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
+	StoragePrefixedMap<Value> for
+	StorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
 where
 	Prefix: StorageInstance,
 	Hasher: crate::hash::StorageHasher,
 	Key: FullCodec,
 	Value: FullCodec,
 	QueryKind: QueryKindTrait<Value, OnEmpty>,
-	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
+	OnEmpty: Get<QueryKind::Query> + 'static,
+	MaxValues: Get<Option<u32>>,
 {
 	fn module_prefix() -> &'static [u8] {
 		<Self as crate::storage::generator::StorageMap<Key, Value>>::module_prefix()
@@ -92,14 +98,15 @@ where
 	}
 }
 
-impl<Prefix, Hasher, Key, QueryKind, OnEmpty, VecValue, VecBound>
-	StorageMap<Prefix, Hasher, Key, BoundedVec<VecValue, VecBound>, QueryKind, OnEmpty>
+impl<Prefix, Hasher, Key, QueryKind, OnEmpty, MaxValues, VecValue, VecBound>
+	StorageMap<Prefix, Hasher, Key, BoundedVec<VecValue, VecBound>, QueryKind, OnEmpty, MaxValues>
 where
 	Prefix: StorageInstance,
 	Hasher: crate::hash::StorageHasher,
 	Key: FullCodec,
 	QueryKind: QueryKindTrait<BoundedVec<VecValue, VecBound>, OnEmpty>,
-	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
+	OnEmpty: Get<QueryKind::Query> + 'static,
+	MaxValues: Get<Option<u32>>,
 	VecValue: FullCodec,
 	VecBound: Get<u32>,
 {
@@ -120,15 +127,16 @@ where
 	}
 }
 
-impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty>
-	StorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty>
+impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
+	StorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
 where
 	Prefix: StorageInstance,
 	Hasher: crate::hash::StorageHasher,
 	Key: FullCodec,
 	Value: FullCodec,
 	QueryKind: QueryKindTrait<Value, OnEmpty>,
-	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
+	OnEmpty: Get<QueryKind::Query> + 'static,
+	MaxValues: Get<Option<u32>>,
 {
 	/// Get the storage key used to fetch a value corresponding to a specific key.
 	pub fn hashed_key_for<KeyArg: EncodeLike<Key>>(key: KeyArg) -> Vec<u8> {
@@ -283,15 +291,16 @@ where
 	}
 }
 
-impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty>
-	StorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty>
+impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
+	StorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
 where
 	Prefix: StorageInstance,
 	Hasher: crate::hash::StorageHasher + crate::ReversibleStorageHasher,
 	Key: FullCodec,
 	Value: FullCodec,
 	QueryKind: QueryKindTrait<Value, OnEmpty>,
-	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
+	OnEmpty: Get<QueryKind::Query> + 'static,
+	MaxValues: Get<Option<u32>>,
 {
 	/// Enumerate all elements in the map in no particular order.
 	///
@@ -327,14 +336,15 @@ pub trait StorageMapMetadata {
 	const HASHER: frame_metadata::StorageHasher;
 }
 
-impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty> StorageMapMetadata
-	for StorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty> where
+impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues> StorageMapMetadata
+	for StorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues> where
 	Prefix: StorageInstance,
 	Hasher: crate::hash::StorageHasher,
 	Key: FullCodec,
 	Value: FullCodec,
 	QueryKind: QueryKindTrait<Value, OnEmpty>,
-	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
+	OnEmpty: Get<QueryKind::Query> + 'static,
+	MaxValues: Get<Option<u32>>,
 {
 	const MODIFIER: StorageEntryModifier = QueryKind::METADATA;
 	const HASHER: frame_metadata::StorageHasher = Hasher::METADATA;
@@ -343,6 +353,33 @@ impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty> StorageMapMetadata
 		DefaultByteGetter(&OnEmptyGetter::<QueryKind::Query, OnEmpty>(core::marker::PhantomData));
 }
 
+impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
+	crate::traits::StorageInfoTrait for
+	StorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
+where
+	Prefix: StorageInstance,
+	Hasher: crate::hash::StorageHasher,
+	Key: FullCodec + MaxEncodedLen,
+	Value: FullCodec + MaxEncodedLen,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: Get<QueryKind::Query> + 'static,
+	MaxValues: Get<Option<u32>>,
+{
+	fn storage_info() -> Vec<StorageInfo> {
+		vec![
+			StorageInfo {
+				prefix: Self::final_prefix(),
+				max_values: MaxValues::get(),
+				max_size: Some(
+					Hasher::max_len::<Key>()
+						.saturating_add(Value::max_encoded_len())
+						.saturated_into(),
+				),
+			}
+		]
+	}
+}
+
 #[cfg(test)]
 mod test {
 	use super::*;
diff --git a/frame/support/src/storage/types/mod.rs b/frame/support/src/storage/types/mod.rs
index 5b7aa61d3769..f61065671315 100644
--- a/frame/support/src/storage/types/mod.rs
+++ b/frame/support/src/storage/types/mod.rs
@@ -30,7 +30,7 @@ mod value;
 pub use double_map::{StorageDoubleMap, StorageDoubleMapMetadata};
 pub use key::{
 	EncodeLikeTuple, HasKeyPrefix, HasReversibleKeyPrefix, Key, KeyGenerator,
-	ReversibleKeyGenerator, TupleToEncodedIter,
+	ReversibleKeyGenerator, TupleToEncodedIter, KeyGeneratorMaxEncodedLen,
 };
 pub use map::{StorageMap, StorageMapMetadata};
 pub use nmap::{StorageNMap, StorageNMapMetadata};
diff --git a/frame/support/src/storage/types/nmap.rs b/frame/support/src/storage/types/nmap.rs
index 1a2b6d4d55dc..f018ccc38b4f 100755
--- a/frame/support/src/storage/types/nmap.rs
+++ b/frame/support/src/storage/types/nmap.rs
@@ -24,12 +24,13 @@ use crate::{
 			EncodeLikeTuple, HasKeyPrefix, HasReversibleKeyPrefix, OnEmptyGetter,
 			OptionQuery, QueryKindTrait, TupleToEncodedIter,
 		},
-		KeyGenerator, PrefixIterator, StorageAppend, StorageDecodeLength,
+		KeyGenerator, PrefixIterator, StorageAppend, StorageDecodeLength, StoragePrefixedMap,
 	},
-	traits::{GetDefault, StorageInstance},
+	traits::{Get, GetDefault, StorageInstance, StorageInfo, MaxEncodedLen},
 };
 use codec::{Decode, Encode, EncodeLike, FullCodec};
 use frame_metadata::{DefaultByteGetter, StorageEntryModifier};
+use sp_runtime::SaturatedConversion;
 use sp_std::prelude::*;
 
 /// A type that allow to store values for an arbitrary number of keys in the form of
@@ -50,18 +51,22 @@ use sp_std::prelude::*;
 /// If the keys are not trusted (e.g. can be set by a user), a cryptographic `hasher`
 /// such as `blake2_128_concat` must be used for the key hashers. Otherwise, other values
 /// in storage can be compromised.
-pub struct StorageNMap<Prefix, Key, Value, QueryKind = OptionQuery, OnEmpty = GetDefault>(
-	core::marker::PhantomData<(Prefix, Key, Value, QueryKind, OnEmpty)>,
+pub struct StorageNMap<
+	Prefix, Key, Value, QueryKind = OptionQuery, OnEmpty = GetDefault, MaxValues=GetDefault,
+>(
+	core::marker::PhantomData<(Prefix, Key, Value, QueryKind, OnEmpty, MaxValues)>,
 );
 
-impl<Prefix, Key, Value, QueryKind, OnEmpty> crate::storage::generator::StorageNMap<Key, Value>
-	for StorageNMap<Prefix, Key, Value, QueryKind, OnEmpty>
+impl<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues>
+	crate::storage::generator::StorageNMap<Key, Value>
+	for StorageNMap<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues>
 where
 	Prefix: StorageInstance,
 	Key: super::key::KeyGenerator,
 	Value: FullCodec,
 	QueryKind: QueryKindTrait<Value, OnEmpty>,
-	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
+	OnEmpty: Get<QueryKind::Query> + 'static,
+	MaxValues: Get<Option<u32>>,
 {
 	type Query = QueryKind::Query;
 	fn module_prefix() -> &'static [u8] {
@@ -78,14 +83,16 @@ where
 	}
 }
 
-impl<Prefix, Key, Value, QueryKind, OnEmpty> crate::storage::StoragePrefixedMap<Value>
-	for StorageNMap<Prefix, Key, Value, QueryKind, OnEmpty>
+impl<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues>
+	crate::storage::StoragePrefixedMap<Value>
+	for StorageNMap<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues>
 where
 	Prefix: StorageInstance,
 	Key: super::key::KeyGenerator,
 	Value: FullCodec,
 	QueryKind: QueryKindTrait<Value, OnEmpty>,
-	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
+	OnEmpty: Get<QueryKind::Query> + 'static,
+	MaxValues: Get<Option<u32>>,
 {
 	fn module_prefix() -> &'static [u8] {
 		<Self as crate::storage::generator::StorageNMap<Key, Value>>::module_prefix()
@@ -95,13 +102,15 @@ where
 	}
 }
 
-impl<Prefix, Key, Value, QueryKind, OnEmpty> StorageNMap<Prefix, Key, Value, QueryKind, OnEmpty>
+impl<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues>
+	StorageNMap<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues>
 where
 	Prefix: StorageInstance,
 	Key: super::key::KeyGenerator,
 	Value: FullCodec,
 	QueryKind: QueryKindTrait<Value, OnEmpty>,
-	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
+	OnEmpty: Get<QueryKind::Query> + 'static,
+	MaxValues: Get<Option<u32>>,
 {
 	/// Get the storage key used to fetch a value corresponding to a specific key.
 	pub fn hashed_key_for<KArg: EncodeLikeTuple<Key::KArg> + TupleToEncodedIter>(key: KArg) -> Vec<u8> {
@@ -286,13 +295,15 @@ where
 	}
 }
 
-impl<Prefix, Key, Value, QueryKind, OnEmpty> StorageNMap<Prefix, Key, Value, QueryKind, OnEmpty>
+impl<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues>
+	StorageNMap<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues>
 where
 	Prefix: StorageInstance,
 	Key: super::key::ReversibleKeyGenerator,
 	Value: FullCodec,
 	QueryKind: QueryKindTrait<Value, OnEmpty>,
-	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
+	OnEmpty: Get<QueryKind::Query> + 'static,
+	MaxValues: Get<Option<u32>>,
 {
 	/// Enumerate all elements in the map with prefix key `kp` in no particular order.
 	///
@@ -355,14 +366,15 @@ pub trait StorageNMapMetadata {
 	const HASHERS: &'static [frame_metadata::StorageHasher];
 }
 
-impl<Prefix, Key, Value, QueryKind, OnEmpty> StorageNMapMetadata
-	for StorageNMap<Prefix, Key, Value, QueryKind, OnEmpty>
+impl<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues> StorageNMapMetadata
+	for StorageNMap<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues>
 where
 	Prefix: StorageInstance,
 	Key: super::key::KeyGenerator,
 	Value: FullCodec,
 	QueryKind: QueryKindTrait<Value, OnEmpty>,
-	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
+	OnEmpty: Get<QueryKind::Query> + 'static,
+	MaxValues: Get<Option<u32>>,
 {
 	const MODIFIER: StorageEntryModifier = QueryKind::METADATA;
 	const NAME: &'static str = Prefix::STORAGE_PREFIX;
@@ -372,6 +384,32 @@ where
 	const HASHERS: &'static [frame_metadata::StorageHasher] = Key::HASHER_METADATA;
 }
 
+impl<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues>
+	crate::traits::StorageInfoTrait for
+	StorageNMap<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues>
+where
+	Prefix: StorageInstance,
+	Key: super::key::KeyGenerator + super::key::KeyGeneratorMaxEncodedLen,
+	Value: FullCodec + MaxEncodedLen,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: Get<QueryKind::Query> + 'static,
+	MaxValues: Get<Option<u32>>,
+{
+	fn storage_info() -> Vec<StorageInfo> {
+		vec![
+			StorageInfo {
+				prefix: Self::final_prefix(),
+				max_values: MaxValues::get(),
+				max_size: Some(
+					Key::key_max_encoded_len()
+						.saturating_add(Value::max_encoded_len())
+						.saturated_into(),
+				),
+			}
+		]
+	}
+}
+
 #[cfg(test)]
 mod test {
 	use super::*;
diff --git a/frame/support/src/storage/types/value.rs b/frame/support/src/storage/types/value.rs
index 6a92a2a632c7..67d2e3741929 100644
--- a/frame/support/src/storage/types/value.rs
+++ b/frame/support/src/storage/types/value.rs
@@ -24,9 +24,11 @@ use crate::{
 		bounded_vec::BoundedVec,
 		types::{OptionQuery, QueryKindTrait, OnEmptyGetter},
 	},
-	traits::{GetDefault, StorageInstance, Get},
+	traits::{GetDefault, StorageInstance, Get, MaxEncodedLen, StorageInfo},
 };
 use frame_metadata::{DefaultByteGetter, StorageEntryModifier};
+use sp_arithmetic::traits::SaturatedConversion;
+use sp_std::prelude::*;
 
 /// A type that allow to store a value.
 ///
@@ -212,6 +214,29 @@ impl<Prefix, Value, QueryKind, OnEmpty> StorageValueMetadata
 		DefaultByteGetter(&OnEmptyGetter::<QueryKind::Query, OnEmpty>(core::marker::PhantomData));
 }
 
+impl<Prefix, Value, QueryKind, OnEmpty>
+	crate::traits::StorageInfoTrait for
+	StorageValue<Prefix, Value, QueryKind, OnEmpty>
+where
+	Prefix: StorageInstance,
+	Value: FullCodec + MaxEncodedLen,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static
+{
+	fn storage_info() -> Vec<StorageInfo> {
+		vec![
+			StorageInfo {
+				prefix: Self::hashed_key(),
+				max_values: Some(1),
+				max_size: Some(
+					Value::max_encoded_len()
+						.saturated_into(),
+				),
+			}
+		]
+	}
+}
+
 #[cfg(test)]
 mod test {
 	use super::*;
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index 2d7fb3db7366..295995b1bfeb 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -50,7 +50,7 @@ mod misc;
 pub use misc::{
 	Len, Get, GetDefault, HandleLifetime, TryDrop, Time, UnixTime, IsType, IsSubType, ExecuteBlock,
 	SameOrOther, OnNewAccount, OnKilledAccount, OffchainWorker, GetBacking, Backing, ExtrinsicCall,
-	EnsureInherentsAreFirst,
+	EnsureInherentsAreFirst, ConstU32,
 };
 
 mod stored_map;
@@ -73,7 +73,7 @@ pub use hooks::GenesisBuild;
 
 pub mod schedule;
 mod storage;
-pub use storage::{Instance, StorageInstance};
+pub use storage::{Instance, StorageInstance, StorageInfo, StorageInfoTrait};
 
 mod dispatch;
 pub use dispatch::{EnsureOrigin, OriginTrait, UnfilteredDispatchable};
diff --git a/frame/support/src/traits/misc.rs b/frame/support/src/traits/misc.rs
index d3010358dd88..7ec29522cbc7 100644
--- a/frame/support/src/traits/misc.rs
+++ b/frame/support/src/traits/misc.rs
@@ -53,6 +53,21 @@ impl<T: Default> Get<T> for GetDefault {
 	}
 }
 
+/// Implement `Get<u32>` and `Get<Option<u32>>` using the given const.
+pub struct ConstU32<const T: u32>;
+
+impl<const T: u32> Get<u32> for ConstU32<T> {
+	fn get() -> u32 {
+		T
+	}
+}
+
+impl<const T: u32> Get<Option<u32>> for ConstU32<T> {
+	fn get() -> Option<u32> {
+		Some(T)
+	}
+}
+
 /// A type for which some values make sense to be able to drop without further consideration.
 pub trait TryDrop: Sized {
 	/// Drop an instance cleanly. Only works if its value represents "no-operation".
diff --git a/frame/support/src/traits/storage.rs b/frame/support/src/traits/storage.rs
index c42e1abf73ea..37957ceb6776 100644
--- a/frame/support/src/traits/storage.rs
+++ b/frame/support/src/traits/storage.rs
@@ -17,6 +17,8 @@
 
 //! Traits for encoding data related to pallet's storage items.
 
+use sp_std::prelude::*;
+
 /// An instance of a pallet in the storage.
 ///
 /// It is required that these instances are unique, to support multiple instances per pallet in the same runtime!
@@ -45,3 +47,30 @@ pub trait StorageInstance {
 	/// Prefix given to a storage to isolate from other storages in the pallet.
 	const STORAGE_PREFIX: &'static str;
 }
+
+/// Some info about an individual storage in a pallet.
+#[derive(codec::Encode, codec::Decode, crate::RuntimeDebug, Eq, PartialEq, Clone)]
+pub struct StorageInfo {
+	/// The prefix of the storage. All keys after the prefix are considered part of the storage
+	pub prefix: [u8; 32],
+	/// The maximum number of values in the storage, or none if no maximum specified.
+	pub max_values: Option<u32>,
+	/// The maximum size of key/values in the storage, or none if no maximum specified.
+	pub max_size: Option<u32>,
+}
+
+/// A trait to give information about storage.
+///
+/// It can be used to calculate PoV worst case size.
+pub trait StorageInfoTrait {
+	fn storage_info() -> Vec<StorageInfo>;
+}
+
+#[impl_trait_for_tuples::impl_for_tuples(30)]
+impl StorageInfoTrait for Tuple {
+	fn storage_info() -> Vec<StorageInfo> {
+		let mut res = vec![];
+		for_tuples!( #( res.extend_from_slice(&Tuple::storage_info()); )* );
+		res
+	}
+}
diff --git a/frame/support/test/tests/decl_storage.rs b/frame/support/test/tests/decl_storage.rs
index a2690b1379db..ef7b577ab6b8 100644
--- a/frame/support/test/tests/decl_storage.rs
+++ b/frame/support/test/tests/decl_storage.rs
@@ -27,9 +27,13 @@ mod tests {
 		pub struct Module<T: Config> for enum Call where origin: T::Origin, system=frame_support_test {}
 	}
 
-	pub trait Config: frame_support_test::Config {}
+	pub trait Config: frame_support_test::Config {
+		type Origin2: codec::Codec + codec::EncodeLike + Default
+			+ frame_support::traits::MaxEncodedLen;
+	}
 
 	frame_support::decl_storage! {
+		generate_storage_info
 		trait Store for Module<T: Config> as TestStorage {
 			// non-getters: pub / $default
 
@@ -41,7 +45,7 @@ mod tests {
 
 			// getters: pub / $default
 			// we need at least one type which uses T, otherwise GenesisConfig will complain.
-			GETU32 get(fn u32_getter): T::Origin;
+			GETU32 get(fn u32_getter): T::Origin2;
 			pub PUBGETU32 get(fn pub_u32_getter): u32;
 			GETU32WITHCONFIG get(fn u32_getter_with_config) config(): u32;
 			pub PUBGETU32WITHCONFIG get(fn pub_u32_getter_with_config) config(): u32;
@@ -56,23 +60,29 @@ mod tests {
 			GetOptU32WithBuilderNone get(fn opt_u32_with_builder_none) build(|_| None): Option<u32>;
 
 			// map non-getters: pub / $default
-			MAPU32: map hasher(blake2_128_concat) u32 => Option<String>;
-			pub PUBMAPU32: map hasher(blake2_128_concat) u32 => Option<String>;
-			MAPU32MYDEF: map hasher(blake2_128_concat) u32 => Option<String>;
-			pub PUBMAPU32MYDEF: map hasher(blake2_128_concat) u32 => Option<String>;
+			MAPU32 max_values(3): map hasher(blake2_128_concat) u32 => Option<[u8; 4]>;
+			pub PUBMAPU32: map hasher(blake2_128_concat) u32 => Option<[u8; 4]>;
 
 			// map getters: pub / $default
-			GETMAPU32 get(fn map_u32_getter): map hasher(blake2_128_concat) u32 => String;
-			pub PUBGETMAPU32 get(fn pub_map_u32_getter): map hasher(blake2_128_concat) u32 => String;
-
+			GETMAPU32 get(fn map_u32_getter): map hasher(blake2_128_concat) u32 => [u8; 4];
+			pub PUBGETMAPU32 get(fn pub_map_u32_getter): map hasher(blake2_128_concat) u32 => [u8; 4];
 			GETMAPU32MYDEF get(fn map_u32_getter_mydef):
-				map hasher(blake2_128_concat) u32 => String = "map".into();
+				map hasher(blake2_128_concat) u32 => [u8; 4] = *b"mapd";
 			pub PUBGETMAPU32MYDEF get(fn pub_map_u32_getter_mydef):
-				map hasher(blake2_128_concat) u32 => String = "pubmap".into();
+				map hasher(blake2_128_concat) u32 => [u8; 4] = *b"pubm";
 
-			COMPLEXTYPE1: ::std::vec::Vec<T::Origin>;
-			COMPLEXTYPE2: (Vec<Vec<(u16, Box<()>)>>, u32);
+			DOUBLEMAP max_values(3): double_map
+				hasher(blake2_128_concat) u32, hasher(blake2_128_concat) u32 => Option<[u8; 4]>;
+
+			DOUBLEMAP2: double_map
+				hasher(blake2_128_concat) u32, hasher(blake2_128_concat) u32 => Option<[u8; 4]>;
+
+			COMPLEXTYPE1: (::std::option::Option<T::Origin2>,);
+			COMPLEXTYPE2: ([[(u16, Option<()>); 32]; 12], u32);
 			COMPLEXTYPE3: [u32; 25];
+
+			NMAP: nmap hasher(blake2_128_concat) u32, hasher(twox_64_concat) u16 => u8;
+			NMAP2: nmap hasher(blake2_128_concat) u32 => u8;
 		}
 		add_extra_genesis {
 			build(|_| {});
@@ -88,7 +98,9 @@ mod tests {
 		type DbWeight = ();
 	}
 
-	impl Config for TraitImpl {}
+	impl Config for TraitImpl {
+		type Origin2 = u32;
+	}
 
 	const EXPECTED_METADATA: StorageMetadata = StorageMetadata {
 		prefix: DecodeDifferent::Encode("TestStorage"),
@@ -133,7 +145,7 @@ mod tests {
 				StorageEntryMetadata {
 					name: DecodeDifferent::Encode("GETU32"),
 					modifier: StorageEntryModifier::Default,
-					ty: StorageEntryType::Plain(DecodeDifferent::Encode("T::Origin")),
+					ty: StorageEntryType::Plain(DecodeDifferent::Encode("T::Origin2")),
 					default: DecodeDifferent::Encode(
 						DefaultByteGetter(&__GetByteStructGETU32(PhantomData::<TraitImpl>))
 					),
@@ -244,7 +256,7 @@ mod tests {
 					ty: StorageEntryType::Map {
 						hasher: StorageHasher::Blake2_128Concat,
 						key: DecodeDifferent::Encode("u32"),
-						value: DecodeDifferent::Encode("String"),
+						value: DecodeDifferent::Encode("[u8; 4]"),
 						unused: false,
 					},
 					default: DecodeDifferent::Encode(
@@ -258,7 +270,7 @@ mod tests {
 					ty: StorageEntryType::Map {
 						hasher: StorageHasher::Blake2_128Concat,
 						key: DecodeDifferent::Encode("u32"),
-						value: DecodeDifferent::Encode("String"),
+						value: DecodeDifferent::Encode("[u8; 4]"),
 						unused: false,
 					},
 					default: DecodeDifferent::Encode(
@@ -267,93 +279,95 @@ mod tests {
 					documentation: DecodeDifferent::Encode(&[]),
 				},
 				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("MAPU32MYDEF"),
-					modifier: StorageEntryModifier::Optional,
+					name: DecodeDifferent::Encode("GETMAPU32"),
+					modifier: StorageEntryModifier::Default,
 					ty: StorageEntryType::Map {
 						hasher: StorageHasher::Blake2_128Concat,
 						key: DecodeDifferent::Encode("u32"),
-						value: DecodeDifferent::Encode("String"),
+						value: DecodeDifferent::Encode("[u8; 4]"),
 						unused: false,
 					},
 					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructMAPU32MYDEF(PhantomData::<TraitImpl>))
+						DefaultByteGetter(&__GetByteStructGETMAPU32(PhantomData::<TraitImpl>))
 					),
 					documentation: DecodeDifferent::Encode(&[]),
 				},
 				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("PUBMAPU32MYDEF"),
-					modifier: StorageEntryModifier::Optional,
+					name: DecodeDifferent::Encode("PUBGETMAPU32"),
+					modifier: StorageEntryModifier::Default,
 					ty: StorageEntryType::Map {
 						hasher: StorageHasher::Blake2_128Concat,
 						key: DecodeDifferent::Encode("u32"),
-						value: DecodeDifferent::Encode("String"),
+						value: DecodeDifferent::Encode("[u8; 4]"),
 						unused: false,
 					},
 					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructPUBMAPU32MYDEF(PhantomData::<TraitImpl>))
+						DefaultByteGetter(&__GetByteStructPUBGETMAPU32(PhantomData::<TraitImpl>))
 					),
 					documentation: DecodeDifferent::Encode(&[]),
 				},
 				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("GETMAPU32"),
+					name: DecodeDifferent::Encode("GETMAPU32MYDEF"),
 					modifier: StorageEntryModifier::Default,
 					ty: StorageEntryType::Map {
 						hasher: StorageHasher::Blake2_128Concat,
 						key: DecodeDifferent::Encode("u32"),
-						value: DecodeDifferent::Encode("String"),
+						value: DecodeDifferent::Encode("[u8; 4]"),
 						unused: false,
 					},
 					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructGETMAPU32(PhantomData::<TraitImpl>))
+						DefaultByteGetter(&__GetByteStructGETMAPU32MYDEF(PhantomData::<TraitImpl>))
 					),
 					documentation: DecodeDifferent::Encode(&[]),
 				},
 				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("PUBGETMAPU32"),
+					name: DecodeDifferent::Encode("PUBGETMAPU32MYDEF"),
 					modifier: StorageEntryModifier::Default,
 					ty: StorageEntryType::Map {
 						hasher: StorageHasher::Blake2_128Concat,
 						key: DecodeDifferent::Encode("u32"),
-						value: DecodeDifferent::Encode("String"),
+						value: DecodeDifferent::Encode("[u8; 4]"),
 						unused: false,
 					},
 					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructPUBGETMAPU32(PhantomData::<TraitImpl>))
+						DefaultByteGetter(&__GetByteStructPUBGETMAPU32MYDEF(PhantomData::<TraitImpl>))
 					),
 					documentation: DecodeDifferent::Encode(&[]),
 				},
 				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("GETMAPU32MYDEF"),
-					modifier: StorageEntryModifier::Default,
-					ty: StorageEntryType::Map {
+					name: DecodeDifferent::Encode("DOUBLEMAP"),
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::DoubleMap {
 						hasher: StorageHasher::Blake2_128Concat,
-						key: DecodeDifferent::Encode("u32"),
-						value: DecodeDifferent::Encode("String"),
-						unused: false,
+						key1: DecodeDifferent::Encode("u32"),
+						key2: DecodeDifferent::Encode("u32"),
+						value: DecodeDifferent::Encode("[u8; 4]"),
+						key2_hasher: StorageHasher::Blake2_128Concat,
 					},
 					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructGETMAPU32MYDEF(PhantomData::<TraitImpl>))
+						DefaultByteGetter(&__GetByteStructDOUBLEMAP(PhantomData::<TraitImpl>))
 					),
 					documentation: DecodeDifferent::Encode(&[]),
 				},
 				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("PUBGETMAPU32MYDEF"),
-					modifier: StorageEntryModifier::Default,
-					ty: StorageEntryType::Map {
+					name: DecodeDifferent::Encode("DOUBLEMAP2"),
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::DoubleMap {
 						hasher: StorageHasher::Blake2_128Concat,
-						key: DecodeDifferent::Encode("u32"),
-						value: DecodeDifferent::Encode("String"),
-						unused: false,
+						key1: DecodeDifferent::Encode("u32"),
+						key2: DecodeDifferent::Encode("u32"),
+						value: DecodeDifferent::Encode("[u8; 4]"),
+						key2_hasher: StorageHasher::Blake2_128Concat,
 					},
 					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructPUBGETMAPU32MYDEF(PhantomData::<TraitImpl>))
+						DefaultByteGetter(&__GetByteStructDOUBLEMAP2(PhantomData::<TraitImpl>))
 					),
 					documentation: DecodeDifferent::Encode(&[]),
 				},
 				StorageEntryMetadata {
 					name: DecodeDifferent::Encode("COMPLEXTYPE1"),
 					modifier: StorageEntryModifier::Default,
-					ty: StorageEntryType::Plain(DecodeDifferent::Encode("::std::vec::Vec<T::Origin>")),
+					ty: StorageEntryType::Plain(DecodeDifferent::Encode("(::std::option::Option<T::Origin2>,)")),
 					default: DecodeDifferent::Encode(
 						DefaultByteGetter(&__GetByteStructCOMPLEXTYPE1(PhantomData::<TraitImpl>))
 					),
@@ -362,7 +376,7 @@ mod tests {
 				StorageEntryMetadata {
 					name: DecodeDifferent::Encode("COMPLEXTYPE2"),
 					modifier: StorageEntryModifier::Default,
-					ty: StorageEntryType::Plain(DecodeDifferent::Encode("(Vec<Vec<(u16, Box<()>)>>, u32)")),
+					ty: StorageEntryType::Plain(DecodeDifferent::Encode("([[(u16, Option<()>); 32]; 12], u32)")),
 					default: DecodeDifferent::Encode(
 						DefaultByteGetter(&__GetByteStructCOMPLEXTYPE2(PhantomData::<TraitImpl>))
 					),
@@ -377,10 +391,201 @@ mod tests {
 					),
 					documentation: DecodeDifferent::Encode(&[]),
 				},
+				StorageEntryMetadata {
+					name: DecodeDifferent::Encode("NMAP"),
+					modifier: StorageEntryModifier::Default,
+					ty: StorageEntryType::NMap {
+						keys: DecodeDifferent::Encode(&["u32", "u16"]),
+						hashers: DecodeDifferent::Encode(&[StorageHasher::Blake2_128Concat, StorageHasher::Twox64Concat]),
+						value: DecodeDifferent::Encode("u8"),
+					},
+					default: DecodeDifferent::Encode(
+						DefaultByteGetter(&__GetByteStructNMAP(PhantomData::<TraitImpl>))
+					),
+					documentation: DecodeDifferent::Encode(&[]),
+				},
+				StorageEntryMetadata {
+					name: DecodeDifferent::Encode("NMAP2"),
+					modifier: StorageEntryModifier::Default,
+					ty: StorageEntryType::NMap {
+						keys: DecodeDifferent::Encode(&["u32"]),
+						hashers: DecodeDifferent::Encode(&[StorageHasher::Blake2_128Concat]),
+						value: DecodeDifferent::Encode("u8"),
+					},
+					default: DecodeDifferent::Encode(
+						DefaultByteGetter(&__GetByteStructNMAP(PhantomData::<TraitImpl>))
+					),
+					documentation: DecodeDifferent::Encode(&[]),
+				},
 			]
 		),
 	};
 
+	#[test]
+	fn storage_info() {
+		use frame_support::{
+			StorageHasher,
+			traits::{StorageInfoTrait, StorageInfo},
+			pallet_prelude::*,
+		};
+		let prefix = |pallet_name, storage_name| {
+			let mut res = [0u8; 32];
+			res[0..16].copy_from_slice(&Twox128::hash(pallet_name));
+			res[16..32].copy_from_slice(&Twox128::hash(storage_name));
+			res
+		};
+		pretty_assertions::assert_eq!(
+			<Module<TraitImpl>>::storage_info(),
+			vec![
+				StorageInfo {
+					prefix: prefix(b"TestStorage", b"U32"),
+					max_values: Some(1),
+					max_size: Some(4),
+				},
+				StorageInfo {
+					prefix: prefix(b"TestStorage", b"PUBU32"),
+					max_values: Some(1),
+					max_size: Some(4),
+				},
+				StorageInfo {
+					prefix: prefix(b"TestStorage", b"U32MYDEF"),
+					max_values: Some(1),
+					max_size: Some(4),
+				},
+				StorageInfo {
+					prefix: prefix(b"TestStorage", b"PUBU32MYDEF"),
+					max_values: Some(1),
+					max_size: Some(4),
+				},
+				StorageInfo {
+					prefix: prefix(b"TestStorage", b"GETU32"),
+					max_values: Some(1),
+					max_size: Some(4),
+				},
+				StorageInfo {
+					prefix: prefix(b"TestStorage", b"PUBGETU32"),
+					max_values: Some(1),
+					max_size: Some(4),
+				},
+				StorageInfo {
+					prefix: prefix(b"TestStorage", b"GETU32WITHCONFIG"),
+					max_values: Some(1),
+					max_size: Some(4),
+				},
+				StorageInfo {
+					prefix: prefix(b"TestStorage", b"PUBGETU32WITHCONFIG"),
+					max_values: Some(1),
+					max_size: Some(4),
+				},
+				StorageInfo {
+					prefix: prefix(b"TestStorage", b"GETU32MYDEF"),
+					max_values: Some(1),
+					max_size: Some(4),
+				},
+				StorageInfo {
+					prefix: prefix(b"TestStorage", b"PUBGETU32MYDEF"),
+					max_values: Some(1),
+					max_size: Some(4),
+				},
+				StorageInfo {
+					prefix: prefix(b"TestStorage", b"GETU32WITHCONFIGMYDEF"),
+					max_values: Some(1),
+					max_size: Some(4),
+				},
+				StorageInfo {
+					prefix: prefix(b"TestStorage", b"PUBGETU32WITHCONFIGMYDEF"),
+					max_values: Some(1),
+					max_size: Some(4),
+				},
+				StorageInfo {
+					prefix: prefix(b"TestStorage", b"PUBGETU32WITHCONFIGMYDEFOPT"),
+					max_values: Some(1),
+					max_size: Some(4),
+				},
+				StorageInfo {
+					prefix: prefix(b"TestStorage", b"GetU32WithBuilder"),
+					max_values: Some(1),
+					max_size: Some(4),
+				},
+				StorageInfo {
+					prefix: prefix(b"TestStorage", b"GetOptU32WithBuilderSome"),
+					max_values: Some(1),
+					max_size: Some(4),
+				},
+				StorageInfo {
+					prefix: prefix(b"TestStorage", b"GetOptU32WithBuilderNone"),
+					max_values: Some(1),
+					max_size: Some(4),
+				},
+				StorageInfo {
+					prefix: prefix(b"TestStorage", b"MAPU32"),
+					max_values: Some(3),
+					max_size: Some(8 + 16),
+				},
+				StorageInfo {
+					prefix: prefix(b"TestStorage", b"PUBMAPU32"),
+					max_values: None,
+					max_size: Some(8 + 16),
+				},
+				StorageInfo {
+					prefix: prefix(b"TestStorage", b"GETMAPU32"),
+					max_values: None,
+					max_size: Some(8 + 16),
+				},
+				StorageInfo {
+					prefix: prefix(b"TestStorage", b"PUBGETMAPU32"),
+					max_values: None,
+					max_size: Some(8 + 16),
+				},
+				StorageInfo {
+					prefix: prefix(b"TestStorage", b"GETMAPU32MYDEF"),
+					max_values: None,
+					max_size: Some(8 + 16),
+				},
+				StorageInfo {
+					prefix: prefix(b"TestStorage", b"PUBGETMAPU32MYDEF"),
+					max_values: None,
+					max_size: Some(8 + 16),
+				},
+				StorageInfo {
+					prefix: prefix(b"TestStorage", b"DOUBLEMAP"),
+					max_values: Some(3),
+					max_size: Some(12 + 16 + 16),
+				},
+				StorageInfo {
+					prefix: prefix(b"TestStorage", b"DOUBLEMAP2"),
+					max_values: None,
+					max_size: Some(12 + 16 + 16),
+				},
+				StorageInfo {
+					prefix: prefix(b"TestStorage", b"COMPLEXTYPE1"),
+					max_values: Some(1),
+					max_size: Some(5),
+				},
+				StorageInfo {
+					prefix: prefix(b"TestStorage", b"COMPLEXTYPE2"),
+					max_values: Some(1),
+					max_size: Some(1156),
+				},
+				StorageInfo {
+					prefix: prefix(b"TestStorage", b"COMPLEXTYPE3"),
+					max_values: Some(1),
+					max_size: Some(100),
+				},
+				StorageInfo {
+					prefix: prefix(b"TestStorage", b"NMAP"),
+					max_values: None,
+					max_size: Some(16 + 4 + 8 + 2 + 1),
+				},
+				StorageInfo {
+					prefix: prefix(b"TestStorage", b"NMAP2"),
+					max_values: None,
+					max_size: Some(16 + 4 + 1),
+				},
+			],
+		);
+	}
+
 	#[test]
 	fn store_metadata() {
 		let metadata = Module::<TraitImpl>::storage_metadata();
diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index 5db5856fd9d9..0a768c79e779 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -19,6 +19,7 @@ use frame_support::{
 	weights::{DispatchInfo, DispatchClass, Pays, GetDispatchInfo},
 	traits::{
 		GetCallName, OnInitialize, OnFinalize, OnRuntimeUpgrade, GetPalletVersion, OnGenesis,
+		MaxEncodedLen,
 	},
 	dispatch::{UnfilteredDispatchable, Parameter},
 	storage::unhashed,
@@ -47,10 +48,10 @@ impl From<SomeType6> for u64 { fn from(_t: SomeType6) -> Self { 0u64 } }
 pub struct SomeType7;
 impl From<SomeType7> for u64 { fn from(_t: SomeType7) -> Self { 0u64 } }
 
-pub trait SomeAssociation1 { type _1: Parameter; }
+pub trait SomeAssociation1 { type _1: Parameter + MaxEncodedLen; }
 impl SomeAssociation1 for u64 { type _1 = u64; }
 
-pub trait SomeAssociation2 { type _2: Parameter; }
+pub trait SomeAssociation2 { type _2: Parameter + MaxEncodedLen; }
 impl SomeAssociation2 for u64 { type _2 = u64; }
 
 #[frame_support::pallet]
@@ -100,6 +101,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(crate) trait Store)]
+	#[pallet::generate_storage_info]
 	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
@@ -209,13 +211,15 @@ pub mod pallet {
 		StorageMap<_, Blake2_128Concat, u8, u16, ValueQuery, MyDefault<T>>;
 
 	#[pallet::storage]
-	pub type Map2<T> = StorageMap<_, Twox64Concat, u16, u32>;
+	pub type Map2<T> = StorageMap<_, Twox64Concat, u16, u32, OptionQuery, GetDefault, ConstU32<3>>;
 
 	#[pallet::storage]
 	pub type DoubleMap<T> = StorageDoubleMap<_, Blake2_128Concat, u8, Twox64Concat, u16, u32>;
 
 	#[pallet::storage]
-	pub type DoubleMap2<T> = StorageDoubleMap<_, Twox64Concat, u16, Blake2_128Concat, u32, u64>;
+	pub type DoubleMap2<T> = StorageDoubleMap<
+		_, Twox64Concat, u16, Blake2_128Concat, u32, u64, OptionQuery, GetDefault, ConstU32<5>,
+	>;
 
 	#[pallet::storage]
 	#[pallet::getter(fn nmap)]
@@ -230,6 +234,9 @@ pub mod pallet {
 			NMapKey<Blake2_128Concat, u32>,
 		),
 		u64,
+		OptionQuery,
+		GetDefault,
+		ConstU32<11>,
 	>;
 
 	#[pallet::storage]
@@ -240,7 +247,8 @@ pub mod pallet {
 	#[cfg(feature = "conditional-storage")]
 	#[pallet::storage]
 	#[pallet::getter(fn conditional_map)]
-	pub type ConditionalMap<T> = StorageMap<_, Twox64Concat, u16, u32>;
+	pub type ConditionalMap<T> =
+		StorageMap<_, Twox64Concat, u16, u32, OptionQuery, GetDefault, ConstU32<12>>;
 
 	#[cfg(feature = "conditional-storage")]
 	#[pallet::storage]
@@ -560,7 +568,7 @@ fn pallet_expand_deposit_event() {
 #[test]
 fn storage_expand() {
 	use frame_support::pallet_prelude::*;
-	use frame_support::StoragePrefixedMap;
+	use frame_support::storage::StoragePrefixedMap;
 
 	fn twox_64_concat(d: &[u8]) -> Vec<u8> {
 		let mut v = twox_64(d).to_vec();
@@ -966,3 +974,97 @@ fn test_pallet_info_access() {
 	assert_eq!(<Example as frame_support::traits::PalletInfoAccess>::index(), 1);
 	assert_eq!(<Example2 as frame_support::traits::PalletInfoAccess>::index(), 2);
 }
+
+#[test]
+fn test_storage_info() {
+	use frame_support::{
+		StorageHasher,
+		traits::{StorageInfoTrait, StorageInfo},
+		pallet_prelude::*,
+	};
+
+	let prefix = |pallet_name, storage_name| {
+		let mut res = [0u8; 32];
+		res[0..16].copy_from_slice(&Twox128::hash(pallet_name));
+		res[16..32].copy_from_slice(&Twox128::hash(storage_name));
+		res
+	};
+
+	assert_eq!(
+		Example::storage_info(),
+		vec![
+			StorageInfo {
+				prefix: prefix(b"Example", b"ValueWhereClause"),
+				max_values: Some(1),
+				max_size: Some(8),
+			},
+			StorageInfo {
+				prefix: prefix(b"Example", b"Value"),
+				max_values: Some(1),
+				max_size: Some(4),
+			},
+			StorageInfo {
+				prefix: prefix(b"Example", b"Map"),
+				max_values: None,
+				max_size: Some(3 + 16),
+			},
+			StorageInfo {
+				prefix: prefix(b"Example", b"Map2"),
+				max_values: Some(3),
+				max_size: Some(6 + 8),
+			},
+			StorageInfo {
+				prefix: prefix(b"Example", b"DoubleMap"),
+				max_values: None,
+				max_size: Some(7 + 16 + 8),
+			},
+			StorageInfo {
+				prefix: prefix(b"Example", b"DoubleMap2"),
+				max_values: Some(5),
+				max_size: Some(14 + 8 + 16),
+			},
+			StorageInfo {
+				prefix: prefix(b"Example", b"NMap"),
+				max_values: None,
+				max_size: Some(5 + 16),
+			},
+			StorageInfo {
+				prefix: prefix(b"Example", b"NMap2"),
+				max_values: Some(11),
+				max_size: Some(14 + 8 + 16),
+			},
+			#[cfg(feature = "conditional-storage")]
+			{
+				StorageInfo {
+					prefix: prefix(b"Example", b"ConditionalValue"),
+					max_values: Some(1),
+					max_size: Some(4),
+				}
+			},
+			#[cfg(feature = "conditional-storage")]
+			{
+				StorageInfo {
+					prefix: prefix(b"Example", b"ConditionalMap"),
+					max_values: Some(12),
+					max_size: Some(6 + 8),
+				}
+			},
+			#[cfg(feature = "conditional-storage")]
+			{
+				StorageInfo {
+					prefix: prefix(b"Example", b"ConditionalDoubleMap"),
+					max_values: None,
+					max_size: Some(7 + 16 + 8),
+				}
+			},
+			#[cfg(feature = "conditional-storage")]
+			{
+				StorageInfo {
+					prefix: prefix(b"Example", b"ConditionalNMap"),
+					max_values: None,
+					max_size: Some(7 + 16 + 8),
+				}
+			},
+		],
+	);
+}
diff --git a/frame/support/test/tests/pallet_instance.rs b/frame/support/test/tests/pallet_instance.rs
index 46ff301f6712..7d6c6983b01b 100644
--- a/frame/support/test/tests/pallet_instance.rs
+++ b/frame/support/test/tests/pallet_instance.rs
@@ -418,7 +418,7 @@ fn pallet_expand_deposit_event() {
 #[test]
 fn storage_expand() {
 	use frame_support::pallet_prelude::*;
-	use frame_support::StoragePrefixedMap;
+	use frame_support::storage::StoragePrefixedMap;
 
 	fn twox_64_concat(d: &[u8]) -> Vec<u8> {
 		let mut v = twox_64(d).to_vec();
diff --git a/frame/support/test/tests/pallet_ui/duplicate_store_attr.stderr b/frame/support/test/tests/pallet_ui/duplicate_store_attr.stderr
index eed6ad4494ed..232144b8deac 100644
--- a/frame/support/test/tests/pallet_ui/duplicate_store_attr.stderr
+++ b/frame/support/test/tests/pallet_ui/duplicate_store_attr.stderr
@@ -1,5 +1,5 @@
-error: Invalid pallet::pallet, multiple argument pallet::generate_store found
-  --> $DIR/duplicate_store_attr.rs:12:33
+error: Unexpected duplicated attribute
+  --> $DIR/duplicate_store_attr.rs:12:12
    |
 12 |     #[pallet::generate_store(trait Store)]
-   |                                    ^^^^^
+   |               ^^^^^^^^^^^^^^
diff --git a/frame/support/test/tests/pallet_ui/storage_info_unsatisfied.rs b/frame/support/test/tests/pallet_ui/storage_info_unsatisfied.rs
new file mode 100644
index 000000000000..569e59ef6ec2
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/storage_info_unsatisfied.rs
@@ -0,0 +1,27 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::{Hooks, StorageValue};
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	#[pallet::generate_storage_info]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[derive(codec::Encode, codec::Decode)]
+	struct Bar;
+
+	#[pallet::storage]
+	type Foo<T> = StorageValue<_, Bar>;
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/storage_info_unsatisfied.stderr b/frame/support/test/tests/pallet_ui/storage_info_unsatisfied.stderr
new file mode 100644
index 000000000000..ad415911bc93
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/storage_info_unsatisfied.stderr
@@ -0,0 +1,8 @@
+error[E0277]: the trait bound `Bar: MaxEncodedLen` is not satisfied
+  --> $DIR/storage_info_unsatisfied.rs:10:12
+   |
+10 |     #[pallet::generate_storage_info]
+   |               ^^^^^^^^^^^^^^^^^^^^^ the trait `MaxEncodedLen` is not implemented for `Bar`
+   |
+   = note: required because of the requirements on the impl of `StorageInfoTrait` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+   = note: required by `storage_info`
diff --git a/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.rs b/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.rs
new file mode 100644
index 000000000000..3d03099c3c4b
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.rs
@@ -0,0 +1,27 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::{Hooks, StorageNMap, Twox64Concat, NMapKey};
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	#[pallet::generate_storage_info]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[derive(codec::Encode, codec::Decode)]
+	struct Bar;
+
+	#[pallet::storage]
+	type Foo<T> = StorageNMap<_, NMapKey<Twox64Concat, Bar>, u32>;
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.stderr b/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.stderr
new file mode 100644
index 000000000000..545520124bfe
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.stderr
@@ -0,0 +1,9 @@
+error[E0277]: the trait bound `Bar: MaxEncodedLen` is not satisfied
+  --> $DIR/storage_info_unsatisfied_nmap.rs:10:12
+   |
+10 |     #[pallet::generate_storage_info]
+   |               ^^^^^^^^^^^^^^^^^^^^^ the trait `MaxEncodedLen` is not implemented for `Bar`
+   |
+   = note: required because of the requirements on the impl of `KeyGeneratorMaxEncodedLen` for `NMapKey<frame_support::Twox64Concat, Bar>`
+   = note: required because of the requirements on the impl of `StorageInfoTrait` for `frame_support::pallet_prelude::StorageNMap<_GeneratedPrefixForStorageFoo<T>, NMapKey<frame_support::Twox64Concat, Bar>, u32>`
+   = note: required by `storage_info`

From 194efc6cd8292f53f1982f9091d99d44a9ff2d53 Mon Sep 17 00:00:00 2001
From: KingFishDev <74088151+KingFishDev@users.noreply.github.com>
Date: Mon, 17 May 2021 13:55:19 -0400
Subject: [PATCH 0750/1194] fix: add Debug to token traits (#8830)

---
 frame/support/src/traits/tokens/misc.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/frame/support/src/traits/tokens/misc.rs b/frame/support/src/traits/tokens/misc.rs
index 342c69c8bb15..d6329e585324 100644
--- a/frame/support/src/traits/tokens/misc.rs
+++ b/frame/support/src/traits/tokens/misc.rs
@@ -17,6 +17,7 @@
 
 //! Miscellaneous types.
 
+use sp_std::fmt::Debug;
 use codec::{Encode, Decode, FullCodec};
 use sp_core::RuntimeDebug;
 use sp_arithmetic::traits::{Zero, AtLeast32BitUnsigned};
@@ -160,9 +161,9 @@ impl WithdrawReasons {
 }
 
 /// Simple amalgamation trait to collect together properties for an AssetId under one roof.
-pub trait AssetId: FullCodec + Copy + Default + Eq + PartialEq {}
-impl<T: FullCodec + Copy + Default + Eq + PartialEq> AssetId for T {}
+pub trait AssetId: FullCodec + Copy + Default + Eq + PartialEq + Debug {}
+impl<T: FullCodec + Copy + Default + Eq + PartialEq + Debug> AssetId for T {}
 
 /// Simple amalgamation trait to collect together properties for a Balance under one roof.
-pub trait Balance: AtLeast32BitUnsigned + FullCodec + Copy + Default {}
-impl<T: AtLeast32BitUnsigned + FullCodec + Copy + Default> Balance for T {}
+pub trait Balance: AtLeast32BitUnsigned + FullCodec + Copy + Default + Debug {}
+impl<T: AtLeast32BitUnsigned + FullCodec + Copy + Default + Debug> Balance for T {}

From c2cd6a0530cd54c891d16d1e778183b2baca22e0 Mon Sep 17 00:00:00 2001
From: Andreas Doerr <adoerr@users.noreply.github.com>
Date: Tue, 18 May 2021 09:38:56 +0200
Subject: [PATCH 0751/1194] [clippy] Fix clippy issues for crate sp-core
 (#8809)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix clippy issues for crate sp-core

* Update primitives/core/benches/bench.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update primitives/core/src/ed25519.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Remove clippy attributes

* Missed a clippy attribute

* remove clippy attributes for bechmarks as well

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 primitives/core/benches/bench.rs        |  2 +-
 primitives/core/src/changes_trie.rs     |  4 ++--
 primitives/core/src/crypto.rs           | 22 +++++++++++-----------
 primitives/core/src/ecdsa.rs            | 12 ++++++------
 primitives/core/src/ed25519.rs          | 19 ++++++++-----------
 primitives/core/src/lib.rs              | 22 +++++++++++-----------
 primitives/core/src/offchain/mod.rs     | 10 +++++-----
 primitives/core/src/offchain/storage.rs |  2 +-
 primitives/core/src/offchain/testing.rs |  2 +-
 primitives/core/src/sr25519.rs          | 10 +++++-----
 primitives/core/src/testing.rs          |  7 +++++++
 primitives/core/src/traits.rs           |  8 ++++----
 12 files changed, 62 insertions(+), 58 deletions(-)

diff --git a/primitives/core/benches/bench.rs b/primitives/core/benches/bench.rs
index dc57af459daa..d7c127320f56 100644
--- a/primitives/core/benches/bench.rs
+++ b/primitives/core/benches/bench.rs
@@ -32,7 +32,7 @@ fn get_key(key_size: u32) -> Vec<u8> {
 	let mut rnd = rnd.iter().cycle();
 
 	(0..key_size)
-		.map(|_| rnd.next().unwrap().clone())
+		.map(|_| *rnd.next().unwrap())
 		.collect()
 }
 
diff --git a/primitives/core/src/changes_trie.rs b/primitives/core/src/changes_trie.rs
index 3291026f32fb..7b886244a064 100644
--- a/primitives/core/src/changes_trie.rs
+++ b/primitives/core/src/changes_trie.rs
@@ -226,7 +226,7 @@ mod tests {
 	#[test]
 	fn is_digest_build_required_at_block_works() {
 		fn test_with_zero(zero: u64) {
-			assert!(!config(8, 4).is_digest_build_required_at_block(zero, zero + 0u64));
+			assert!(!config(8, 4).is_digest_build_required_at_block(zero, zero));
 			assert!(!config(8, 4).is_digest_build_required_at_block(zero, zero + 1u64));
 			assert!(!config(8, 4).is_digest_build_required_at_block(zero, zero + 2u64));
 			assert!(!config(8, 4).is_digest_build_required_at_block(zero, zero + 4u64));
@@ -249,7 +249,7 @@ mod tests {
 	#[test]
 	fn digest_level_at_block_works() {
 		fn test_with_zero(zero: u64) {
-			assert_eq!(config(8, 4).digest_level_at_block(zero, zero + 0u64), None);
+			assert_eq!(config(8, 4).digest_level_at_block(zero, zero), None);
 			assert_eq!(config(8, 4).digest_level_at_block(zero, zero + 7u64), None);
 			assert_eq!(config(8, 4).digest_level_at_block(zero, zero + 63u64), None);
 			assert_eq!(config(8, 4).digest_level_at_block(zero, zero + 8u64), Some((1, 8, 1)));
diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index 80209a25c411..ba3eb4ff38c6 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -174,8 +174,8 @@ impl DeriveJunction {
 impl<T: AsRef<str>> From<T> for DeriveJunction {
 	fn from(j: T) -> DeriveJunction {
 		let j = j.as_ref();
-		let (code, hard) = if j.starts_with('/') {
-			(&j[1..], true)
+		let (code, hard) = if let Some(stripped) = j.strip_prefix('/') {
+			(stripped, true)
 		} else {
 			(j, false)
 		};
@@ -262,7 +262,7 @@ pub trait Ss58Codec: Sized + AsMut<[u8]> + AsRef<[u8]> + Default {
 				let upper = data[1] & 0b00111111;
 				(2, (lower as u16) | ((upper as u16) << 8))
 			}
-			_ => Err(PublicError::UnknownVersion)?,
+			_ => return Err(PublicError::UnknownVersion),
 		};
 		if data.len() != prefix_len + body_len + CHECKSUM_LEN { return Err(PublicError::BadLength) }
 		let format = ident.try_into().map_err(|_: ()| PublicError::UnknownVersion)?;
@@ -294,15 +294,15 @@ pub trait Ss58Codec: Sized + AsMut<[u8]> + AsRef<[u8]> + Default {
 	#[cfg(feature = "std")]
 	fn to_ss58check_with_version(&self, version: Ss58AddressFormat) -> String {
 		// We mask out the upper two bits of the ident - SS58 Prefix currently only supports 14-bits
-		let ident: u16 = u16::from(version) & 0b00111111_11111111;
+		let ident: u16 = u16::from(version) & 0b0011_1111_1111_1111;
 		let mut v = match ident {
 			0..=63 => vec![ident as u8],
 			64..=16_383 => {
 				// upper six bits of the lower byte(!)
-				let first = ((ident & 0b00000000_11111100) as u8) >> 2;
+				let first = ((ident & 0b0000_0000_1111_1100) as u8) >> 2;
 				// lower two bits of the lower byte in the high pos,
 				// lower bits of the upper byte in the low pos
-				let second = ((ident >> 8) as u8) | ((ident & 0b00000000_00000011) as u8) << 6;
+				let second = ((ident >> 8) as u8) | ((ident & 0b0000_0000_0000_0011) as u8) << 6;
 				vec![first | 0b01000000, second]
 			}
 			_ => unreachable!("masked out the upper two bits; qed"),
@@ -612,14 +612,14 @@ impl<T: Sized + AsMut<[u8]> + AsRef<[u8]> + Default + Derive> Ss58Codec for T {
 		let s = cap.name("ss58")
 			.map(|r| r.as_str())
 			.unwrap_or(DEV_ADDRESS);
-		let addr = if s.starts_with("0x") {
-			let d = hex::decode(&s[2..]).map_err(|_| PublicError::InvalidFormat)?;
+		let addr = if let Some(stripped) = s.strip_prefix("0x") {
+			let d = hex::decode(stripped).map_err(|_| PublicError::InvalidFormat)?;
 			let mut r = Self::default();
 			if d.len() == r.as_ref().len() {
 				r.as_mut().copy_from_slice(&d);
 				r
 			} else {
-				Err(PublicError::BadLength)?
+				return Err(PublicError::BadLength)
 			}
 		} else {
 			Self::from_ss58check(s)?
@@ -1009,8 +1009,8 @@ pub trait Pair: CryptoType + Sized + Clone + Send + Sync + 'static {
 		let phrase = cap.name("phrase").map(|r| r.as_str()).unwrap_or(DEV_PHRASE);
 		let password = password_override.or_else(|| cap.name("password").map(|m| m.as_str()));
 
-		let (root, seed) = if phrase.starts_with("0x") {
-			hex::decode(&phrase[2..]).ok()
+		let (root, seed) = if let Some(stripped) = phrase.strip_prefix("0x") {
+			hex::decode(stripped).ok()
 				.and_then(|seed_vec| {
 					let mut seed = Self::Seed::default();
 					if seed.as_ref().len() == seed_vec.len() {
diff --git a/primitives/core/src/ecdsa.rs b/primitives/core/src/ecdsa.rs
index ee4f8f811bc4..2ec10681e77c 100644
--- a/primitives/core/src/ecdsa.rs
+++ b/primitives/core/src/ecdsa.rs
@@ -256,8 +256,8 @@ impl<'de> Deserialize<'de> for Signature {
 	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
 		let signature_hex = hex::decode(&String::deserialize(deserializer)?)
 			.map_err(|e| de::Error::custom(format!("{:?}", e)))?;
-		Ok(Signature::try_from(signature_hex.as_ref())
-			.map_err(|e| de::Error::custom(format!("{:?}", e)))?)
+		Signature::try_from(signature_hex.as_ref())
+			.map_err(|e| de::Error::custom(format!("{:?}", e)))
 	}
 }
 
@@ -453,7 +453,7 @@ impl TraitPair for Pair {
 		let secret = SecretKey::parse_slice(seed_slice)
 			.map_err(|_| SecretStringError::InvalidSeedLength)?;
 		let public = PublicKey::from_secret_key(&secret);
-		Ok(Pair{ secret, public })
+		Ok(Pair{ public, secret })
 	}
 
 	/// Derive a child key from a series of given junctions.
@@ -592,7 +592,7 @@ mod test {
 		let message = b"";
 		let signature = hex!("3dde91174bd9359027be59a428b8146513df80a2a3c7eda2194f64de04a69ab97b753169e94db6ffd50921a2668a48b94ca11e3d32c1ff19cfe88890aa7e8f3c00");
 		let signature = Signature::from_raw(signature);
-		assert!(&pair.sign(&message[..]) == &signature);
+		assert!(pair.sign(&message[..]) == signature);
 		assert!(Pair::verify(&signature, &message[..], &public));
 	}
 
@@ -612,7 +612,7 @@ mod test {
 		let message = b"";
 		let signature = hex!("3dde91174bd9359027be59a428b8146513df80a2a3c7eda2194f64de04a69ab97b753169e94db6ffd50921a2668a48b94ca11e3d32c1ff19cfe88890aa7e8f3c00");
 		let signature = Signature::from_raw(signature);
-		assert!(&pair.sign(&message[..]) == &signature);
+		assert!(pair.sign(&message[..]) == signature);
 		assert!(Pair::verify(&signature, &message[..], &public));
 	}
 
@@ -754,7 +754,7 @@ mod test {
 	#[test]
 	fn signature_serialization_doesnt_panic() {
 		fn deserialize_signature(text: &str) -> Result<Signature, serde_json::error::Error> {
-			Ok(serde_json::from_str(text)?)
+			serde_json::from_str(text)
 		}
 		assert!(deserialize_signature("Not valid json.").is_err());
 		assert!(deserialize_signature("\"Not an actual signature.\"").is_err());
diff --git a/primitives/core/src/ed25519.rs b/primitives/core/src/ed25519.rs
index 3269f70be1ee..4b160e55b86a 100644
--- a/primitives/core/src/ed25519.rs
+++ b/primitives/core/src/ed25519.rs
@@ -65,7 +65,7 @@ pub struct Pair(ed25519_dalek::Keypair);
 impl Clone for Pair {
 	fn clone(&self) -> Self {
 		Pair(ed25519_dalek::Keypair {
-			public: self.0.public.clone(),
+			public: self.0.public,
 			secret: ed25519_dalek::SecretKey::from_bytes(self.0.secret.as_bytes())
 				.expect("key is always the correct size; qed")
 		})
@@ -217,8 +217,8 @@ impl<'de> Deserialize<'de> for Signature {
 	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
 		let signature_hex = hex::decode(&String::deserialize(deserializer)?)
 			.map_err(|e| de::Error::custom(format!("{:?}", e)))?;
-		Ok(Signature::try_from(signature_hex.as_ref())
-			.map_err(|e| de::Error::custom(format!("{:?}", e)))?)
+		Signature::try_from(signature_hex.as_ref())
+			.map_err(|e| de::Error::custom(format!("{:?}", e)))
 	}
 }
 
@@ -522,10 +522,7 @@ impl TraitPair for Pair {
 			Err(_) => return false
 		};
 
-		match public_key.verify(message.as_ref(), &sig) {
-			Ok(_) => true,
-			_ => false,
-		}
+		public_key.verify(message.as_ref(), &sig).is_ok()
 	}
 
 	/// Return a vec filled with raw data.
@@ -546,7 +543,7 @@ impl Pair {
 	#[cfg(feature = "std")]
 	pub fn from_legacy_string(s: &str, password_override: Option<&str>) -> Pair {
 		Self::from_string(s, password_override).unwrap_or_else(|_| {
-			let mut padded_seed: Seed = [' ' as u8; 32];
+			let mut padded_seed: Seed = [b' '; 32];
 			let len = s.len().min(32);
 			padded_seed[..len].copy_from_slice(&s.as_bytes()[..len]);
 			Self::from_seed(&padded_seed)
@@ -609,7 +606,7 @@ mod test {
 		let message = b"";
 		let signature = hex!("e5564300c360ac729086e2cc806e828a84877f1eb8e5d974d873e065224901555fb8821590a33bacc61e39701cf9b46bd25bf5f0595bbe24655141438e7a100b");
 		let signature = Signature::from_raw(signature);
-		assert!(&pair.sign(&message[..]) == &signature);
+		assert!(pair.sign(&message[..]) == signature);
 		assert!(Pair::verify(&signature, &message[..], &public));
 	}
 
@@ -626,7 +623,7 @@ mod test {
 		let message = b"";
 		let signature = hex!("e5564300c360ac729086e2cc806e828a84877f1eb8e5d974d873e065224901555fb8821590a33bacc61e39701cf9b46bd25bf5f0595bbe24655141438e7a100b");
 		let signature = Signature::from_raw(signature);
-		assert!(&pair.sign(&message[..]) == &signature);
+		assert!(pair.sign(&message[..]) == signature);
 		assert!(Pair::verify(&signature, &message[..], &public));
 	}
 
@@ -703,7 +700,7 @@ mod test {
 	#[test]
 	fn signature_serialization_doesnt_panic() {
 		fn deserialize_signature(text: &str) -> Result<Signature, serde_json::error::Error> {
-			Ok(serde_json::from_str(text)?)
+			serde_json::from_str(text)
 		}
 		assert!(deserialize_signature("Not valid json.").is_err());
 		assert!(deserialize_signature("\"Not an actual signature.\"").is_err());
diff --git a/primitives/core/src/lib.rs b/primitives/core/src/lib.rs
index 8f97d59f2194..495b9e6693d8 100644
--- a/primitives/core/src/lib.rs
+++ b/primitives/core/src/lib.rs
@@ -285,15 +285,15 @@ pub trait TypeId {
 #[derive(Encode, Decode, PassByEnum, Copy, Clone)]
 pub enum LogLevel {
 	/// `Error` log level.
-	Error = 1,
+	Error = 1_isize,
 	/// `Warn` log level.
-	Warn = 2,
+	Warn = 2_isize,
 	/// `Info` log level.
-	Info = 3,
+	Info = 3_isize,
 	/// `Debug` log level.
-	Debug = 4,
+	Debug = 4_isize,
 	/// `Trace` log level.
-	Trace = 5,
+	Trace = 5_isize,
 }
 
 impl From<u32> for LogLevel {
@@ -340,17 +340,17 @@ impl From<LogLevel> for log::Level {
 #[derive(Encode, Decode, PassByEnum, Copy, Clone)]
 pub enum LogLevelFilter {
 	/// `Off` log level filter.
-	Off = 0,
+	Off = 0_isize,
 	/// `Error` log level filter.
-	Error = 1,
+	Error = 1_isize,
 	/// `Warn` log level filter.
-	Warn = 2,
+	Warn = 2_isize,
 	/// `Info` log level filter.
-	Info = 3,
+	Info = 3_isize,
 	/// `Debug` log level filter.
-	Debug = 4,
+	Debug = 4_isize,
 	/// `Trace` log level filter.
-	Trace = 5,
+	Trace = 5_isize,
 }
 
 impl From<LogLevelFilter> for log::LevelFilter {
diff --git a/primitives/core/src/offchain/mod.rs b/primitives/core/src/offchain/mod.rs
index 8b587b887efd..66fc85ec7bf0 100644
--- a/primitives/core/src/offchain/mod.rs
+++ b/primitives/core/src/offchain/mod.rs
@@ -66,12 +66,12 @@ pub enum StorageKind {
 	/// that is re-run at block `N(hash2)`.
 	/// This storage can be used by offchain workers to handle forks
 	/// and coordinate offchain workers running on different forks.
-	PERSISTENT = 1,
+	PERSISTENT = 1_isize,
 	/// Local storage is revertible and fork-aware. It means that any value
 	/// set by the offchain worker triggered at block `N(hash1)` is reverted
 	/// if that block is reverted as non-canonical and is NOT available for the worker
 	/// that is re-run at block `N(hash2)`.
-	LOCAL = 2,
+	LOCAL = 2_isize,
 }
 
 impl TryFrom<u32> for StorageKind {
@@ -108,11 +108,11 @@ impl From<HttpRequestId> for u32 {
 #[repr(C)]
 pub enum HttpError {
 	/// The requested action couldn't been completed within a deadline.
-	DeadlineReached = 1,
+	DeadlineReached = 1_isize,
 	/// There was an IO Error while processing the request.
-	IoError = 2,
+	IoError = 2_isize,
 	/// The ID of the request is invalid in this context.
-	Invalid = 3,
+	Invalid = 3_isize,
 }
 
 impl TryFrom<u32> for HttpError {
diff --git a/primitives/core/src/offchain/storage.rs b/primitives/core/src/offchain/storage.rs
index f114c102fb82..4463c58ede5d 100644
--- a/primitives/core/src/offchain/storage.rs
+++ b/primitives/core/src/offchain/storage.rs
@@ -34,7 +34,7 @@ impl InMemOffchainStorage {
 	}
 
 	/// Iterate over all key value pairs by reference.
-	pub fn iter<'a>(&'a self) -> impl Iterator<Item=(&'a Vec<u8>,&'a Vec<u8>)> {
+	pub fn iter(&self) -> impl Iterator<Item=(&Vec<u8>,&Vec<u8>)> {
 		self.storage.iter()
 	}
 
diff --git a/primitives/core/src/offchain/testing.rs b/primitives/core/src/offchain/testing.rs
index bdec7bf4efa7..76c81d4b9bc6 100644
--- a/primitives/core/src/offchain/testing.rs
+++ b/primitives/core/src/offchain/testing.rs
@@ -247,7 +247,7 @@ impl offchain::Externalities for TestOffchainExt {
 	fn http_request_start(&mut self, method: &str, uri: &str, meta: &[u8]) -> Result<RequestId, ()> {
 		let mut state = self.0.write();
 		let id = RequestId(state.requests.len() as u16);
-		state.requests.insert(id.clone(), PendingRequest {
+		state.requests.insert(id, PendingRequest {
 			method: method.into(),
 			uri: uri.into(),
 			meta: meta.into(),
diff --git a/primitives/core/src/sr25519.rs b/primitives/core/src/sr25519.rs
index 37926d8f801c..f8e17f7b802a 100644
--- a/primitives/core/src/sr25519.rs
+++ b/primitives/core/src/sr25519.rs
@@ -218,8 +218,8 @@ impl<'de> Deserialize<'de> for Signature {
 	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
 		let signature_hex = hex::decode(&String::deserialize(deserializer)?)
 			.map_err(|e| de::Error::custom(format!("{:?}", e)))?;
-		Ok(Signature::try_from(signature_hex.as_ref())
-			.map_err(|e| de::Error::custom(format!("{:?}", e)))?)
+		Signature::try_from(signature_hex.as_ref())
+			.map_err(|e| de::Error::custom(format!("{:?}", e)))
 	}
 }
 
@@ -448,7 +448,7 @@ impl AsRef<schnorrkel::Keypair> for Pair {
 /// Derive a single hard junction.
 #[cfg(feature = "full_crypto")]
 fn derive_hard_junction(secret: &SecretKey, cc: &[u8; CHAIN_CODE_LENGTH]) -> MiniSecretKey {
-	secret.hard_derive_mini_secret_key(Some(ChainCode(cc.clone())), b"").0
+	secret.hard_derive_mini_secret_key(Some(ChainCode(*cc)), b"").0
 }
 
 /// The raw secret seed, which can be used to recreate the `Pair`.
@@ -762,7 +762,7 @@ mod test {
 			"9d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f60"
 		));
 		let path = Some(DeriveJunction::soft(1));
-		let pair_1 = pair.derive(path.clone().into_iter(), None).unwrap().0;
+		let pair_1 = pair.derive(path.into_iter(), None).unwrap().0;
 		let public_1 = pair.public().derive(path.into_iter()).unwrap();
 		assert_eq!(pair_1.public(), public_1);
 	}
@@ -879,7 +879,7 @@ mod test {
 	#[test]
 	fn signature_serialization_doesnt_panic() {
 		fn deserialize_signature(text: &str) -> Result<Signature, serde_json::error::Error> {
-			Ok(serde_json::from_str(text)?)
+			serde_json::from_str(text)
 		}
 		assert!(deserialize_signature("Not valid json.").is_err());
 		assert!(deserialize_signature("\"Not an actual signature.\"").is_err());
diff --git a/primitives/core/src/testing.rs b/primitives/core/src/testing.rs
index b33f518c32ee..be1a83f17009 100644
--- a/primitives/core/src/testing.rs
+++ b/primitives/core/src/testing.rs
@@ -143,6 +143,13 @@ impl TaskExecutor {
 	}
 }
 
+#[cfg(feature = "std")]
+impl Default for TaskExecutor {
+	fn default() -> Self {
+		Self::new()
+	}
+}
+
 #[cfg(feature = "std")]
 impl crate::traits::SpawnNamed for TaskExecutor {
 	fn spawn_blocking(&self, _: &'static str, future: futures::future::BoxFuture<'static, ()>) {
diff --git a/primitives/core/src/traits.rs b/primitives/core/src/traits.rs
index 948830cf5ca6..d6503cb86a05 100644
--- a/primitives/core/src/traits.rs
+++ b/primitives/core/src/traits.rs
@@ -51,14 +51,14 @@ pub trait FetchRuntimeCode {
 	/// Fetch the runtime `:code`.
 	///
 	/// If the `:code` could not be found/not available, `None` should be returned.
-	fn fetch_runtime_code<'a>(&'a self) -> Option<Cow<'a, [u8]>>;
+	fn fetch_runtime_code(&self) -> Option<Cow<[u8]>>;
 }
 
 /// Wrapper to use a `u8` slice or `Vec` as [`FetchRuntimeCode`].
 pub struct WrappedRuntimeCode<'a>(pub std::borrow::Cow<'a, [u8]>);
 
 impl<'a> FetchRuntimeCode for WrappedRuntimeCode<'a> {
-	fn fetch_runtime_code<'b>(&'b self) -> Option<Cow<'b, [u8]>> {
+	fn fetch_runtime_code(&self) -> Option<Cow<[u8]>> {
 		Some(self.0.as_ref().into())
 	}
 }
@@ -67,7 +67,7 @@ impl<'a> FetchRuntimeCode for WrappedRuntimeCode<'a> {
 pub struct NoneFetchRuntimeCode;
 
 impl FetchRuntimeCode for NoneFetchRuntimeCode {
-	fn fetch_runtime_code<'a>(&'a self) -> Option<Cow<'a, [u8]>> {
+	fn fetch_runtime_code(&self) -> Option<Cow<[u8]>> {
 		None
 	}
 }
@@ -108,7 +108,7 @@ impl<'a> RuntimeCode<'a> {
 }
 
 impl<'a> FetchRuntimeCode for RuntimeCode<'a> {
-	fn fetch_runtime_code<'b>(&'b self) -> Option<Cow<'b, [u8]>> {
+	fn fetch_runtime_code(&self) -> Option<Cow<[u8]>> {
 		self.code_fetcher.fetch_runtime_code()
 	}
 }

From dcd846391cb988601acd26f365c5d2a75bc7fa5a Mon Sep 17 00:00:00 2001
From: stanly-johnson <stanlyjohnson@outlook.com>
Date: Tue, 18 May 2021 14:22:17 +0530
Subject: [PATCH 0752/1194] Migrate pallet-scheduler to pallet attribute macro 
 (#8769)

* migrate to pallet!

* fixes

* fix genesis

* code review fixes

* Update frame/scheduler/src/lib.rs

Co-authored-by: Keith Yeung <kungfukeith11@gmail.com>

* Update frame/scheduler/src/lib.rs

Co-authored-by: Keith Yeung <kungfukeith11@gmail.com>

* Update frame/scheduler/src/lib.rs

Co-authored-by: Keith Yeung <kungfukeith11@gmail.com>

* Update frame/scheduler/src/lib.rs

Co-authored-by: Keith Yeung <kungfukeith11@gmail.com>

* Update frame/scheduler/src/lib.rs

Co-authored-by: Keith Yeung <kungfukeith11@gmail.com>

* fix metadata

Co-authored-by: Keith Yeung <kungfukeith11@gmail.com>
---
 frame/scheduler/src/benchmarking.rs |    2 +-
 frame/scheduler/src/lib.rs          | 1214 ++++++++++++++++-----------
 2 files changed, 714 insertions(+), 502 deletions(-)

diff --git a/frame/scheduler/src/benchmarking.rs b/frame/scheduler/src/benchmarking.rs
index 563a1ba89c86..47375658fb9b 100644
--- a/frame/scheduler/src/benchmarking.rs
+++ b/frame/scheduler/src/benchmarking.rs
@@ -25,7 +25,7 @@ use frame_system::RawOrigin;
 use frame_support::{ensure, traits::OnInitialize};
 use frame_benchmarking::{benchmarks, impl_benchmark_test_suite};
 
-use crate::Module as Scheduler;
+use crate::Pallet as Scheduler;
 use frame_system::Pallet as System;
 
 const BLOCK_NUMBER: u32 = 2;
diff --git a/frame/scheduler/src/lib.rs b/frame/scheduler/src/lib.rs
index 5332aedf7f13..006ab5a0f2d7 100644
--- a/frame/scheduler/src/lib.rs
+++ b/frame/scheduler/src/lib.rs
@@ -16,15 +16,15 @@
 // limitations under the License.
 
 //! # Scheduler
-//! A module for scheduling dispatches.
+//! A Pallet for scheduling dispatches.
 //!
 //! - [`Config`]
 //! - [`Call`]
-//! - [`Module`]
+//! - [`Pallet`]
 //!
 //! ## Overview
 //!
-//! This module exposes capabilities for scheduling dispatches to occur at a
+//! This Pallet exposes capabilities for scheduling dispatches to occur at a
 //! specified block number or at a specified period. These scheduled dispatches
 //! may be named or anonymous and may be canceled.
 //!
@@ -58,47 +58,13 @@ use sp_std::{prelude::*, marker::PhantomData, borrow::Borrow};
 use codec::{Encode, Decode, Codec};
 use sp_runtime::{RuntimeDebug, traits::{Zero, One, BadOrigin, Saturating}};
 use frame_support::{
-	decl_module, decl_storage, decl_event, decl_error, IterableStorageMap,
 	dispatch::{Dispatchable, DispatchError, DispatchResult, Parameter},
 	traits::{Get, schedule::{self, DispatchTime}, OriginTrait, EnsureOrigin, IsType},
 	weights::{GetDispatchInfo, Weight},
 };
 use frame_system::{self as system, ensure_signed};
 pub use weights::WeightInfo;
-
-/// Our pallet's configuration trait. All our types and constants go in here. If the
-/// pallet is dependent on specific other pallets, then their configuration traits
-/// should be added to our implied traits list.
-///
-/// `system::Config` should always be included in our implied traits.
-pub trait Config: system::Config {
-	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as system::Config>::Event>;
-
-	/// The aggregated origin which the dispatch will take.
-	type Origin: OriginTrait<PalletsOrigin = Self::PalletsOrigin>
-		+ From<Self::PalletsOrigin> + IsType<<Self as system::Config>::Origin>;
-
-	/// The caller origin, overarching type of all pallets origins.
-	type PalletsOrigin: From<system::RawOrigin<Self::AccountId>> + Codec + Clone + Eq;
-
-	/// The aggregated call type.
-	type Call: Parameter + Dispatchable<Origin=<Self as Config>::Origin> + GetDispatchInfo + From<system::Call<Self>>;
-
-	/// The maximum weight that may be scheduled per block for any dispatchables of less priority
-	/// than `schedule::HARD_DEADLINE`.
-	type MaximumWeight: Get<Weight>;
-
-	/// Required origin to schedule or cancel calls.
-	type ScheduleOrigin: EnsureOrigin<<Self as system::Config>::Origin>;
-
-	/// The maximum number of scheduled calls in the queue for a single block.
-	/// Not strictly enforced, but used for weight estimation.
-	type MaxScheduledPerBlock: Get<u32>;
-
-	/// Weight information for extrinsics in this pallet.
-	type WeightInfo: WeightInfo;
-}
+pub use pallet::*;
 
 /// Just a simple index for naming period tasks.
 pub type PeriodicIndex = u32;
@@ -132,7 +98,8 @@ pub struct ScheduledV2<Call, BlockNumber, PalletsOrigin, AccountId> {
 }
 
 /// The current version of Scheduled struct.
-pub type Scheduled<Call, BlockNumber, PalletsOrigin, AccountId> = ScheduledV2<Call, BlockNumber, PalletsOrigin, AccountId>;
+pub type Scheduled<Call, BlockNumber, PalletsOrigin, AccountId> =
+	ScheduledV2<Call, BlockNumber, PalletsOrigin, AccountId>;
 
 // A value placed in storage that represents the current version of the Scheduler storage.
 // This value is used by the `on_runtime_upgrade` logic to determine whether we run
@@ -149,35 +116,87 @@ impl Default for Releases {
 	}
 }
 
-decl_storage! {
-	trait Store for Module<T: Config> as Scheduler {
-		/// Items to be executed, indexed by the block number that they should be executed on.
-		pub Agenda: map hasher(twox_64_concat) T::BlockNumber
-			=> Vec<Option<Scheduled<<T as Config>::Call, T::BlockNumber, T::PalletsOrigin, T::AccountId>>>;
-
-		/// Lookup from identity to the block number and index of the task.
-		Lookup: map hasher(twox_64_concat) Vec<u8> => Option<TaskAddress<T::BlockNumber>>;
-
-		/// Storage version of the pallet.
-		///
-		/// New networks start with last version.
-		StorageVersion build(|_| Releases::V2): Releases;
+#[frame_support::pallet]
+pub mod pallet {
+	use super::*;
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(_);
+
+	/// `system::Config` should always be included in our implied traits.
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		/// The overarching event type.
+		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
+
+		/// The aggregated origin which the dispatch will take.
+		type Origin: OriginTrait<PalletsOrigin = Self::PalletsOrigin>
+			+ From<Self::PalletsOrigin>
+			+ IsType<<Self as system::Config>::Origin>;
+
+		/// The caller origin, overarching type of all pallets origins.
+		type PalletsOrigin: From<system::RawOrigin<Self::AccountId>> + Codec + Clone + Eq;
+
+		/// The aggregated call type.
+		type Call: Parameter
+			+ Dispatchable<Origin = <Self as Config>::Origin>
+			+ GetDispatchInfo
+			+ From<system::Call<Self>>;
+
+		/// The maximum weight that may be scheduled per block for any dispatchables of less priority
+		/// than `schedule::HARD_DEADLINE`.
+		type MaximumWeight: Get<Weight>;
+
+		/// Required origin to schedule or cancel calls.
+		type ScheduleOrigin: EnsureOrigin<<Self as system::Config>::Origin>;
+
+		/// The maximum number of scheduled calls in the queue for a single block.
+		/// Not strictly enforced, but used for weight estimation.
+		type MaxScheduledPerBlock: Get<u32>;
+
+		/// Weight information for extrinsics in this pallet.
+		type WeightInfo: WeightInfo;
 	}
-}
 
-decl_event!(
-	pub enum Event<T> where <T as system::Config>::BlockNumber {
+	/// Items to be executed, indexed by the block number that they should be executed on.
+	#[pallet::storage]
+	pub type Agenda<T: Config> = StorageMap<
+		_,
+		Twox64Concat,
+		T::BlockNumber,
+		Vec<Option<Scheduled<<T as Config>::Call, T::BlockNumber, T::PalletsOrigin, T::AccountId>>>,
+		ValueQuery,
+	>;
+
+	/// Lookup from identity to the block number and index of the task.
+	#[pallet::storage]
+	pub(crate) type Lookup<T: Config> =
+		StorageMap<_, Twox64Concat, Vec<u8>, TaskAddress<T::BlockNumber>>;
+
+	/// Storage version of the pallet.
+	///
+	/// New networks start with last version.
+	#[pallet::storage]
+	pub(crate) type StorageVersion<T> = StorageValue<_, Releases, ValueQuery>;
+
+	/// Events type.
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	#[pallet::metadata(T::BlockNumber = "BlockNumber", TaskAddress<T::BlockNumber> = "TaskAddress<BlockNumber>")]
+	pub enum Event<T: Config> {
 		/// Scheduled some task. \[when, index\]
-		Scheduled(BlockNumber, u32),
+		Scheduled(T::BlockNumber, u32),
 		/// Canceled some task. \[when, index\]
-		Canceled(BlockNumber, u32),
+		Canceled(T::BlockNumber, u32),
 		/// Dispatched some task. \[task, id, result\]
-		Dispatched(TaskAddress<BlockNumber>, Option<Vec<u8>>, DispatchResult),
+		Dispatched(TaskAddress<T::BlockNumber>, Option<Vec<u8>>, DispatchResult),
 	}
-);
 
-decl_error! {
-	pub enum Error for Module<T: Config> {
+	#[pallet::error]
+	pub enum Error<T> {
 		/// Failed to schedule a call
 		FailedToSchedule,
 		/// Cannot find the scheduled call.
@@ -187,14 +206,135 @@ decl_error! {
 		/// Reschedule failed because it does not change scheduled time.
 		RescheduleNoChange,
 	}
-}
 
-decl_module! {
-	/// Scheduler module declaration.
-	pub struct Module<T: Config> for enum Call where origin: <T as system::Config>::Origin {
-		type Error = Error<T>;
-		fn deposit_event() = default;
+	#[pallet::genesis_config]
+ 	pub struct GenesisConfig;
+
+ 	#[cfg(feature = "std")]
+ 	impl Default for GenesisConfig {
+ 		fn default() -> Self {
+			Self
+		}
+ 	}
 
+ 	#[pallet::genesis_build]
+ 	impl<T: Config> GenesisBuild<T> for GenesisConfig {
+ 		fn build(&self) {
+			StorageVersion::<T>::put(Releases::V2);
+ 		}
+ 	}
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+		/// Execute the scheduled calls
+		///
+		/// # <weight>
+		/// - S = Number of already scheduled calls
+		/// - N = Named scheduled calls
+		/// - P = Periodic Calls
+		/// - Base Weight: 9.243 + 23.45 * S µs
+		/// - DB Weight:
+		///     - Read: Agenda + Lookup * N + Agenda(Future) * P
+		///     - Write: Agenda + Lookup * N  + Agenda(future) * P
+		/// # </weight>
+		fn on_initialize(now: T::BlockNumber) -> Weight {
+			let limit = T::MaximumWeight::get();
+			let mut queued = Agenda::<T>::take(now)
+				.into_iter()
+				.enumerate()
+				.filter_map(|(index, s)| s.map(|inner| (index as u32, inner)))
+				.collect::<Vec<_>>();
+			if queued.len() as u32 > T::MaxScheduledPerBlock::get() {
+				log::warn!(
+					target: "runtime::scheduler",
+					"Warning: This block has more items queued in Scheduler than \
+					expected from the runtime configuration. An update might be needed."
+				);
+			}
+			queued.sort_by_key(|(_, s)| s.priority);
+			let base_weight: Weight = T::DbWeight::get().reads_writes(1, 2); // Agenda + Agenda(next)
+			let mut total_weight: Weight = 0;
+			queued
+				.into_iter()
+				.enumerate()
+				.scan(base_weight, |cumulative_weight, (order, (index, s))| {
+					*cumulative_weight =
+						cumulative_weight.saturating_add(s.call.get_dispatch_info().weight);
+
+					let origin =
+						<<T as Config>::Origin as From<T::PalletsOrigin>>::from(s.origin.clone())
+							.into();
+
+					if ensure_signed(origin).is_ok() {
+						// AccountData for inner call origin accountdata.
+						*cumulative_weight =
+							cumulative_weight.saturating_add(T::DbWeight::get().reads_writes(1, 1));
+					}
+
+					if s.maybe_id.is_some() {
+						// Remove/Modify Lookup
+						*cumulative_weight =
+							cumulative_weight.saturating_add(T::DbWeight::get().writes(1));
+					}
+					if s.maybe_periodic.is_some() {
+						// Read/Write Agenda for future block
+						*cumulative_weight =
+							cumulative_weight.saturating_add(T::DbWeight::get().reads_writes(1, 1));
+					}
+
+					Some((order, index, *cumulative_weight, s))
+				})
+				.filter_map(|(order, index, cumulative_weight, mut s)| {
+					// We allow a scheduled call if any is true:
+					// - It's priority is `HARD_DEADLINE`
+					// - It does not push the weight past the limit.
+					// - It is the first item in the schedule
+					if s.priority <= schedule::HARD_DEADLINE
+						|| cumulative_weight <= limit
+						|| order == 0
+					{
+						let r = s.call.clone().dispatch(s.origin.clone().into());
+						let maybe_id = s.maybe_id.clone();
+						if let &Some((period, count)) = &s.maybe_periodic {
+							if count > 1 {
+								s.maybe_periodic = Some((period, count - 1));
+							} else {
+								s.maybe_periodic = None;
+							}
+							let next = now + period;
+							// If scheduled is named, place it's information in `Lookup`
+							if let Some(ref id) = s.maybe_id {
+								let next_index = Agenda::<T>::decode_len(now + period).unwrap_or(0);
+								Lookup::<T>::insert(id, (next, next_index as u32));
+							}
+							Agenda::<T>::append(next, Some(s));
+						} else {
+							if let Some(ref id) = s.maybe_id {
+								Lookup::<T>::remove(id);
+							}
+						}
+						Self::deposit_event(Event::Dispatched(
+							(now, index),
+							maybe_id,
+							r.map(|_| ()).map_err(|e| e.error),
+						));
+						total_weight = cumulative_weight;
+						None
+					} else {
+						Some(Some(s))
+					}
+				})
+				.for_each(|unused| {
+					let next = now + One::one();
+					Agenda::<T>::append(next, unused);
+				});
+
+			total_weight
+		}
+	}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
 		/// Anonymously schedule a task.
 		///
 		/// # <weight>
@@ -205,16 +345,24 @@ decl_module! {
 		///     - Write: Agenda
 		/// - Will use base weight of 25 which should be good for up to 30 scheduled calls
 		/// # </weight>
-		#[weight = T::WeightInfo::schedule(T::MaxScheduledPerBlock::get())]
-		fn schedule(origin,
+		#[pallet::weight(<T as Config>::WeightInfo::schedule(T::MaxScheduledPerBlock::get()))]
+		pub(crate) fn schedule(
+			origin: OriginFor<T>,
 			when: T::BlockNumber,
 			maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
 			priority: schedule::Priority,
 			call: Box<<T as Config>::Call>,
-		) {
+		) -> DispatchResult {
 			T::ScheduleOrigin::ensure_origin(origin.clone())?;
 			let origin = <T as Config>::Origin::from(origin);
-			Self::do_schedule(DispatchTime::At(when), maybe_periodic, priority, origin.caller().clone(), *call)?;
+			Self::do_schedule(
+				DispatchTime::At(when),
+				maybe_periodic,
+				priority,
+				origin.caller().clone(),
+				*call,
+			)?;
+			Ok(())
 		}
 
 		/// Cancel an anonymously scheduled task.
@@ -227,11 +375,12 @@ decl_module! {
 		///     - Write: Agenda, Lookup
 		/// - Will use base weight of 100 which should be good for up to 30 scheduled calls
 		/// # </weight>
-		#[weight = T::WeightInfo::cancel(T::MaxScheduledPerBlock::get())]
-		fn cancel(origin, when: T::BlockNumber, index: u32) {
+		#[pallet::weight(<T as Config>::WeightInfo::cancel(T::MaxScheduledPerBlock::get()))]
+		pub(crate) fn cancel(origin: OriginFor<T>, when: T::BlockNumber, index: u32) -> DispatchResult {
 			T::ScheduleOrigin::ensure_origin(origin.clone())?;
 			let origin = <T as Config>::Origin::from(origin);
 			Self::do_cancel(Some(origin.caller().clone()), (when, index))?;
+			Ok(())
 		}
 
 		/// Schedule a named task.
@@ -244,19 +393,26 @@ decl_module! {
 		///     - Write: Agenda, Lookup
 		/// - Will use base weight of 35 which should be good for more than 30 scheduled calls
 		/// # </weight>
-		#[weight = T::WeightInfo::schedule_named(T::MaxScheduledPerBlock::get())]
-		fn schedule_named(origin,
+		#[pallet::weight(<T as Config>::WeightInfo::schedule_named(T::MaxScheduledPerBlock::get()))]
+		pub(crate) fn schedule_named(
+			origin: OriginFor<T>,
 			id: Vec<u8>,
 			when: T::BlockNumber,
 			maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
 			priority: schedule::Priority,
 			call: Box<<T as Config>::Call>,
-		) {
+		) -> DispatchResult {
 			T::ScheduleOrigin::ensure_origin(origin.clone())?;
 			let origin = <T as Config>::Origin::from(origin);
 			Self::do_schedule_named(
-				id, DispatchTime::At(when), maybe_periodic, priority, origin.caller().clone(), *call
+				id,
+				DispatchTime::At(when),
+				maybe_periodic,
+				priority,
+				origin.caller().clone(),
+				*call,
 			)?;
+			Ok(())
 		}
 
 		/// Cancel a named scheduled task.
@@ -269,11 +425,12 @@ decl_module! {
 		///     - Write: Agenda, Lookup
 		/// - Will use base weight of 100 which should be good for up to 30 scheduled calls
 		/// # </weight>
-		#[weight = T::WeightInfo::cancel_named(T::MaxScheduledPerBlock::get())]
-		fn cancel_named(origin, id: Vec<u8>) {
+		#[pallet::weight(<T as Config>::WeightInfo::cancel_named(T::MaxScheduledPerBlock::get()))]
+		pub(crate) fn cancel_named(origin: OriginFor<T>, id: Vec<u8>) -> DispatchResult {
 			T::ScheduleOrigin::ensure_origin(origin.clone())?;
 			let origin = <T as Config>::Origin::from(origin);
 			Self::do_cancel_named(Some(origin.caller().clone()), id)?;
+			Ok(())
 		}
 
 		/// Anonymously schedule a task after a delay.
@@ -281,18 +438,24 @@ decl_module! {
 		/// # <weight>
 		/// Same as [`schedule`].
 		/// # </weight>
-		#[weight = T::WeightInfo::schedule(T::MaxScheduledPerBlock::get())]
-		fn schedule_after(origin,
+		#[pallet::weight(<T as Config>::WeightInfo::schedule(T::MaxScheduledPerBlock::get()))]
+		pub(crate) fn schedule_after(
+			origin: OriginFor<T>,
 			after: T::BlockNumber,
 			maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
 			priority: schedule::Priority,
 			call: Box<<T as Config>::Call>,
-		) {
+		) -> DispatchResult {
 			T::ScheduleOrigin::ensure_origin(origin.clone())?;
 			let origin = <T as Config>::Origin::from(origin);
 			Self::do_schedule(
-				DispatchTime::After(after), maybe_periodic, priority, origin.caller().clone(), *call
+				DispatchTime::After(after),
+				maybe_periodic,
+				priority,
+				origin.caller().clone(),
+				*call,
 			)?;
+			Ok(())
 		}
 
 		/// Schedule a named task after a delay.
@@ -300,128 +463,36 @@ decl_module! {
 		/// # <weight>
 		/// Same as [`schedule_named`].
 		/// # </weight>
-		#[weight = T::WeightInfo::schedule_named(T::MaxScheduledPerBlock::get())]
-		fn schedule_named_after(origin,
+		#[pallet::weight(<T as Config>::WeightInfo::schedule_named(T::MaxScheduledPerBlock::get()))]
+		pub(crate) fn schedule_named_after(
+			origin: OriginFor<T>,
 			id: Vec<u8>,
 			after: T::BlockNumber,
 			maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
 			priority: schedule::Priority,
 			call: Box<<T as Config>::Call>,
-		) {
+		) -> DispatchResult {
 			T::ScheduleOrigin::ensure_origin(origin.clone())?;
 			let origin = <T as Config>::Origin::from(origin);
 			Self::do_schedule_named(
-				id, DispatchTime::After(after), maybe_periodic, priority, origin.caller().clone(), *call
+				id,
+				DispatchTime::After(after),
+				maybe_periodic,
+				priority,
+				origin.caller().clone(),
+				*call,
 			)?;
-		}
-
-		/// Execute the scheduled calls
-		///
-		/// # <weight>
-		/// - S = Number of already scheduled calls
-		/// - N = Named scheduled calls
-		/// - P = Periodic Calls
-		/// - Base Weight: 9.243 + 23.45 * S µs
-		/// - DB Weight:
-		///     - Read: Agenda + Lookup * N + Agenda(Future) * P
-		///     - Write: Agenda + Lookup * N  + Agenda(future) * P
-		/// # </weight>
-		fn on_initialize(now: T::BlockNumber) -> Weight {
-			let limit = T::MaximumWeight::get();
-			let mut queued = Agenda::<T>::take(now).into_iter()
-				.enumerate()
-				.filter_map(|(index, s)| s.map(|inner| (index as u32, inner)))
-				.collect::<Vec<_>>();
-			if queued.len() as u32 > T::MaxScheduledPerBlock::get() {
-				log::warn!(
-					target: "runtime::scheduler",
-					"Warning: This block has more items queued in Scheduler than \
-					expected from the runtime configuration. An update might be needed."
-				);
-			}
-			queued.sort_by_key(|(_, s)| s.priority);
-			let base_weight: Weight = T::DbWeight::get().reads_writes(1, 2); // Agenda + Agenda(next)
-			let mut total_weight: Weight = 0;
-			queued.into_iter()
-				.enumerate()
-				.scan(base_weight, |cumulative_weight, (order, (index, s))| {
-					*cumulative_weight = cumulative_weight
-						.saturating_add(s.call.get_dispatch_info().weight);
-
-					let origin = <<T as Config>::Origin as From<T::PalletsOrigin>>::from(
-						s.origin.clone()
-					).into();
-
-					if ensure_signed(origin).is_ok() {
-						 // AccountData for inner call origin accountdata.
-						*cumulative_weight = cumulative_weight
-							.saturating_add(T::DbWeight::get().reads_writes(1, 1));
-					}
-
-					if s.maybe_id.is_some() {
-						// Remove/Modify Lookup
-						*cumulative_weight = cumulative_weight.saturating_add(T::DbWeight::get().writes(1));
-					}
-					if s.maybe_periodic.is_some() {
-						// Read/Write Agenda for future block
-						*cumulative_weight = cumulative_weight.saturating_add(T::DbWeight::get().reads_writes(1, 1));
-					}
-
-					Some((order, index, *cumulative_weight, s))
-				})
-				.filter_map(|(order, index, cumulative_weight, mut s)| {
-					// We allow a scheduled call if any is true:
-					// - It's priority is `HARD_DEADLINE`
-					// - It does not push the weight past the limit.
-					// - It is the first item in the schedule
-					if s.priority <= schedule::HARD_DEADLINE || cumulative_weight <= limit || order == 0 {
-						let r = s.call.clone().dispatch(s.origin.clone().into());
-						let maybe_id = s.maybe_id.clone();
-						if let &Some((period, count)) = &s.maybe_periodic {
-							if count > 1 {
-								s.maybe_periodic = Some((period, count - 1));
-							} else {
-								s.maybe_periodic = None;
-							}
-							let next = now + period;
-							// If scheduled is named, place it's information in `Lookup`
-							if let Some(ref id) = s.maybe_id {
-								let next_index = Agenda::<T>::decode_len(now + period).unwrap_or(0);
-								Lookup::<T>::insert(id, (next, next_index as u32));
-							}
-							Agenda::<T>::append(next, Some(s));
-						} else {
-							if let Some(ref id) = s.maybe_id {
-								Lookup::<T>::remove(id);
-							}
-						}
-						Self::deposit_event(RawEvent::Dispatched(
-							(now, index),
-							maybe_id,
-							r.map(|_| ()).map_err(|e| e.error)
-						));
-						total_weight = cumulative_weight;
-						None
-					} else {
-						Some(Some(s))
-					}
-				})
-				.for_each(|unused| {
-					let next = now + One::one();
-					Agenda::<T>::append(next, unused);
-				});
-
-			total_weight
+			Ok(())
 		}
 	}
 }
 
-impl<T: Config> Module<T> {
+impl<T: Config> Pallet<T> {
 	/// Migrate storage format from V1 to V2.
 	/// Return true if migration is performed.
 	pub fn migrate_v1_to_t2() -> bool {
-		if StorageVersion::get() == Releases::V1 {
-			StorageVersion::put(Releases::V2);
+		if StorageVersion::<T>::get() == Releases::V1 {
+			StorageVersion::<T>::put(Releases::V2);
 
 			Agenda::<T>::translate::<
 				Vec<Option<ScheduledV1<<T as Config>::Call, T::BlockNumber>>>, _
@@ -471,11 +542,11 @@ impl<T: Config> Module<T> {
 			DispatchTime::At(x) => x,
 			// The current block has already completed it's scheduled tasks, so
 			// Schedule the task at lest one block after this current block.
-			DispatchTime::After(x) => now.saturating_add(x).saturating_add(One::one())
+			DispatchTime::After(x) => now.saturating_add(x).saturating_add(One::one()),
 		};
 
 		if when <= now {
-			return Err(Error::<T>::TargetBlockNumberInPast.into())
+			return Err(Error::<T>::TargetBlockNumberInPast.into());
 		}
 
 		Ok(when)
@@ -486,7 +557,7 @@ impl<T: Config> Module<T> {
 		maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
 		priority: schedule::Priority,
 		origin: T::PalletsOrigin,
-		call: <T as Config>::Call
+		call: <T as Config>::Call,
 	) -> Result<TaskAddress<T::BlockNumber>, DispatchError> {
 		let when = Self::resolve_time(when)?;
 
@@ -496,7 +567,12 @@ impl<T: Config> Module<T> {
 			// Remove one from the number of repetitions since we will schedule one now.
 			.map(|(p, c)| (p, c - 1));
 		let s = Some(Scheduled {
-			maybe_id: None, priority, call, maybe_periodic, origin, _phantom: PhantomData::<T::AccountId>::default(),
+			maybe_id: None,
+			priority,
+			call,
+			maybe_periodic,
+			origin,
+			_phantom: PhantomData::<T::AccountId>::default(),
 		});
 		Agenda::<T>::append(when, s);
 		let index = Agenda::<T>::decode_len(when).unwrap_or(1) as u32 - 1;
@@ -507,34 +583,33 @@ impl<T: Config> Module<T> {
 				expected from the runtime configuration. An update might be needed.",
 			);
 		}
-		Self::deposit_event(RawEvent::Scheduled(when, index));
+		Self::deposit_event(Event::Scheduled(when, index));
 
 		Ok((when, index))
 	}
 
 	fn do_cancel(
 		origin: Option<T::PalletsOrigin>,
-		(when, index): TaskAddress<T::BlockNumber>
+		(when, index): TaskAddress<T::BlockNumber>,
 	) -> Result<(), DispatchError> {
-		let scheduled = Agenda::<T>::try_mutate(
-			when,
-			|agenda| {
-				agenda.get_mut(index as usize)
-					.map_or(Ok(None), |s| -> Result<Option<Scheduled<_, _, _, _>>, DispatchError> {
-						if let (Some(ref o), Some(ref s)) = (origin, s.borrow()) {
-							if *o != s.origin {
-								return Err(BadOrigin.into());
-							}
-						};
-						Ok(s.take())
-					})
-			},
-		)?;
+		let scheduled = Agenda::<T>::try_mutate(when, |agenda| {
+			agenda.get_mut(index as usize).map_or(
+				Ok(None),
+				|s| -> Result<Option<Scheduled<_, _, _, _>>, DispatchError> {
+					if let (Some(ref o), Some(ref s)) = (origin, s.borrow()) {
+						if *o != s.origin {
+							return Err(BadOrigin.into());
+						}
+					};
+					Ok(s.take())
+				},
+			)
+		})?;
 		if let Some(s) = scheduled {
 			if let Some(id) = s.maybe_id {
 				Lookup::<T>::remove(id);
 			}
-			Self::deposit_event(RawEvent::Canceled(when, index));
+			Self::deposit_event(Event::Canceled(when, index));
 			Ok(())
 		} else {
 			Err(Error::<T>::NotFound)?
@@ -559,8 +634,8 @@ impl<T: Config> Module<T> {
 		})?;
 
 		let new_index = Agenda::<T>::decode_len(new_time).unwrap_or(1) as u32 - 1;
-		Self::deposit_event(RawEvent::Canceled(when, index));
-		Self::deposit_event(RawEvent::Scheduled(new_time, new_index));
+		Self::deposit_event(Event::Canceled(when, index));
+		Self::deposit_event(Event::Scheduled(new_time, new_index));
 
 		Ok((new_time, new_index))
 	}
@@ -575,7 +650,7 @@ impl<T: Config> Module<T> {
 	) -> Result<TaskAddress<T::BlockNumber>, DispatchError> {
 		// ensure id it is unique
 		if Lookup::<T>::contains_key(&id) {
-			return Err(Error::<T>::FailedToSchedule)?
+			return Err(Error::<T>::FailedToSchedule)?;
 		}
 
 		let when = Self::resolve_time(when)?;
@@ -587,7 +662,12 @@ impl<T: Config> Module<T> {
 			.map(|(p, c)| (p, c - 1));
 
 		let s = Scheduled {
-			maybe_id: Some(id.clone()), priority, call, maybe_periodic, origin, _phantom: Default::default()
+			maybe_id: Some(id.clone()),
+			priority,
+			call,
+			maybe_periodic,
+			origin,
+			_phantom: Default::default(),
 		};
 		Agenda::<T>::append(when, Some(s));
 		let index = Agenda::<T>::decode_len(when).unwrap_or(1) as u32 - 1;
@@ -600,7 +680,7 @@ impl<T: Config> Module<T> {
 		}
 		let address = (when, index);
 		Lookup::<T>::insert(&id, &address);
-		Self::deposit_event(RawEvent::Scheduled(when, index));
+		Self::deposit_event(Event::Scheduled(when, index));
 
 		Ok(address)
 	}
@@ -620,7 +700,7 @@ impl<T: Config> Module<T> {
 					}
 					Ok(())
 				})?;
-				Self::deposit_event(RawEvent::Canceled(when, index));
+				Self::deposit_event(Event::Canceled(when, index));
 				Ok(())
 			} else {
 				Err(Error::<T>::NotFound)?
@@ -634,33 +714,38 @@ impl<T: Config> Module<T> {
 	) -> Result<TaskAddress<T::BlockNumber>, DispatchError> {
 		let new_time = Self::resolve_time(new_time)?;
 
-		Lookup::<T>::try_mutate_exists(id, |lookup| -> Result<TaskAddress<T::BlockNumber>, DispatchError> {
-			let (when, index) = lookup.ok_or(Error::<T>::NotFound)?;
+		Lookup::<T>::try_mutate_exists(
+			id,
+			|lookup| -> Result<TaskAddress<T::BlockNumber>, DispatchError> {
+				let (when, index) = lookup.ok_or(Error::<T>::NotFound)?;
 
-			if new_time == when {
-				return Err(Error::<T>::RescheduleNoChange.into());
-			}
+				if new_time == when {
+					return Err(Error::<T>::RescheduleNoChange.into());
+				}
 
-			Agenda::<T>::try_mutate(when, |agenda| -> DispatchResult {
-				let task = agenda.get_mut(index as usize).ok_or(Error::<T>::NotFound)?;
-				let task = task.take().ok_or(Error::<T>::NotFound)?;
-				Agenda::<T>::append(new_time, Some(task));
+				Agenda::<T>::try_mutate(when, |agenda| -> DispatchResult {
+					let task = agenda.get_mut(index as usize).ok_or(Error::<T>::NotFound)?;
+					let task = task.take().ok_or(Error::<T>::NotFound)?;
+					Agenda::<T>::append(new_time, Some(task));
 
-				Ok(())
-			})?;
+					Ok(())
+				})?;
 
-			let new_index = Agenda::<T>::decode_len(new_time).unwrap_or(1) as u32 - 1;
-			Self::deposit_event(RawEvent::Canceled(when, index));
-			Self::deposit_event(RawEvent::Scheduled(new_time, new_index));
+				let new_index = Agenda::<T>::decode_len(new_time).unwrap_or(1) as u32 - 1;
+				Self::deposit_event(Event::Canceled(when, index));
+				Self::deposit_event(Event::Scheduled(new_time, new_index));
 
-			*lookup = Some((new_time, new_index));
+				*lookup = Some((new_time, new_index));
 
-			Ok((new_time, new_index))
-		})
+				Ok((new_time, new_index))
+			},
+		)
 	}
 }
 
-impl<T: Config> schedule::Anon<T::BlockNumber, <T as Config>::Call, T::PalletsOrigin> for Module<T> {
+impl<T: Config> schedule::Anon<T::BlockNumber, <T as Config>::Call, T::PalletsOrigin>
+	for Pallet<T>
+{
 	type Address = TaskAddress<T::BlockNumber>;
 
 	fn schedule(
@@ -668,7 +753,7 @@ impl<T: Config> schedule::Anon<T::BlockNumber, <T as Config>::Call, T::PalletsOr
 		maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
 		priority: schedule::Priority,
 		origin: T::PalletsOrigin,
-		call: <T as Config>::Call
+		call: <T as Config>::Call,
 	) -> Result<Self::Address, DispatchError> {
 		Self::do_schedule(when, maybe_periodic, priority, origin, call)
 	}
@@ -685,11 +770,16 @@ impl<T: Config> schedule::Anon<T::BlockNumber, <T as Config>::Call, T::PalletsOr
 	}
 
 	fn next_dispatch_time((when, index): Self::Address) -> Result<T::BlockNumber, ()> {
-		Agenda::<T>::get(when).get(index as usize).ok_or(()).map(|_| when)
+		Agenda::<T>::get(when)
+			.get(index as usize)
+			.ok_or(())
+			.map(|_| when)
 	}
 }
 
-impl<T: Config> schedule::Named<T::BlockNumber, <T as Config>::Call, T::PalletsOrigin> for Module<T> {
+impl<T: Config> schedule::Named<T::BlockNumber, <T as Config>::Call, T::PalletsOrigin>
+	for Pallet<T>
+{
 	type Address = TaskAddress<T::BlockNumber>;
 
 	fn schedule_named(
@@ -715,7 +805,9 @@ impl<T: Config> schedule::Named<T::BlockNumber, <T as Config>::Call, T::PalletsO
 	}
 
 	fn next_dispatch_time(id: Vec<u8>) -> Result<T::BlockNumber, ()> {
-		Lookup::<T>::get(id).and_then(|(when, index)| Agenda::<T>::get(when).get(index as usize).map(|_| when)).ok_or(())
+		Lookup::<T>::get(id)
+			.and_then(|(when, index)| Agenda::<T>::get(when).get(index as usize).map(|_| when))
+			.ok_or(())
 	}
 }
 
@@ -723,24 +815,28 @@ impl<T: Config> schedule::Named<T::BlockNumber, <T as Config>::Call, T::PalletsO
 mod tests {
 	use super::*;
 
+	use crate as scheduler;
 	use frame_support::{
-		parameter_types, assert_ok, ord_parameter_types,
-		assert_noop, assert_err, Hashable,
-		traits::{OnInitialize, OnFinalize, Filter},
+		assert_err, assert_noop, assert_ok, ord_parameter_types, parameter_types,
+		traits::{Filter, OnFinalize, OnInitialize},
 		weights::constants::RocksDbWeight,
+		Hashable,
 	};
+	use frame_system::{EnsureOneOf, EnsureRoot, EnsureSignedBy};
 	use sp_core::H256;
 	use sp_runtime::{
-		Perbill,
 		testing::Header,
 		traits::{BlakeTwo256, IdentityLookup},
+		Perbill,
 	};
-	use frame_system::{EnsureOneOf, EnsureRoot, EnsureSignedBy};
 	use substrate_test_utils::assert_eq_uvec;
-	use crate as scheduler;
 
-	mod logger {
+	// Logger module to track execution.
+	#[frame_support::pallet]
+	pub mod logger {
 		use super::*;
+		use frame_support::pallet_prelude::*;
+		use frame_system::pallet_prelude::*;
 		use std::cell::RefCell;
 
 		thread_local! {
@@ -749,37 +845,43 @@ mod tests {
 		pub fn log() -> Vec<(OriginCaller, u32)> {
 			LOG.with(|log| log.borrow().clone())
 		}
-		pub trait Config: system::Config {
-			type Event: From<Event> + Into<<Self as system::Config>::Event>;
+
+		#[pallet::pallet]
+		#[pallet::generate_store(pub(super) trait Store)]
+		pub struct Pallet<T>(PhantomData<T>);
+
+		#[pallet::hooks]
+		impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+		#[pallet::config]
+		pub trait Config: frame_system::Config {
+			type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
 		}
-		decl_event! {
-			pub enum Event {
-				Logged(u32, Weight),
-			}
+
+		#[pallet::event]
+		#[pallet::generate_deposit(pub(super) fn deposit_event)]
+		pub enum Event<T: Config> {
+			Logged(u32, Weight),
 		}
-		decl_module! {
-			pub struct Module<T: Config> for enum Call
-			where
-				origin: <T as system::Config>::Origin,
-				<T as system::Config>::Origin: OriginTrait<PalletsOrigin = OriginCaller>
-			{
-				fn deposit_event() = default;
-
-				#[weight = *weight]
-				fn log(origin, i: u32, weight: Weight) {
-					Self::deposit_event(Event::Logged(i, weight));
-					LOG.with(|log| {
-						log.borrow_mut().push((origin.caller().clone(), i));
-					})
-				}
 
-				#[weight = *weight]
-				fn log_without_filter(origin, i: u32, weight: Weight) {
-					Self::deposit_event(Event::Logged(i, weight));
-					LOG.with(|log| {
-						log.borrow_mut().push((origin.caller().clone(), i));
-					})
-				}
+		#[pallet::call]
+		impl<T: Config> Pallet<T> where <T as system::Config>::Origin: OriginTrait<PalletsOrigin = OriginCaller>  {
+			#[pallet::weight(*weight)]
+			fn log(origin: OriginFor<T>, i: u32, weight: Weight) -> DispatchResult {
+				Self::deposit_event(Event::Logged(i, weight));
+				LOG.with(|log| {
+					log.borrow_mut().push((origin.caller().clone(), i));
+				});
+				Ok(())
+			}
+
+			#[pallet::weight(*weight)]
+			fn log_without_filter(origin: OriginFor<T>, i: u32, weight: Weight) -> DispatchResult {
+				Self::deposit_event(Event::Logged(i, weight));
+				LOG.with(|log| {
+					log.borrow_mut().push((origin.caller().clone(), i));
+				});
+				Ok(())
 			}
 		}
 	}
@@ -794,7 +896,7 @@ mod tests {
 			UncheckedExtrinsic = UncheckedExtrinsic,
 		{
 			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-			Logger: logger::{Pallet, Call, Event},
+			Logger: logger::{Pallet, Call, Event<T>},
 			Scheduler: scheduler::{Pallet, Call, Storage, Event<T>},
 		}
 	);
@@ -803,7 +905,7 @@ mod tests {
 	pub struct BaseFilter;
 	impl Filter<Call> for BaseFilter {
 		fn filter(call: &Call) -> bool {
-			!matches!(call, Call::Logger(logger::Call::log(_, _)))
+			!matches!(call, Call::Logger(LoggerCall::log(_, _)))
 		}
 	}
 
@@ -859,6 +961,8 @@ mod tests {
 		type WeightInfo = ();
 	}
 
+	pub type LoggerCall = logger::Call<Test>;
+
 	pub fn new_test_ext() -> sp_io::TestExternalities {
 		let t = system::GenesisConfig::default().build_storage::<Test>().unwrap();
 		t.into()
@@ -879,8 +983,10 @@ mod tests {
 	#[test]
 	fn basic_scheduling_works() {
 		new_test_ext().execute_with(|| {
-			let call = Call::Logger(logger::Call::log(42, 1000));
-			assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
+			let call = Call::Logger(LoggerCall::log(42, 1000));
+			assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(
+				&call
+			));
 			assert_ok!(Scheduler::do_schedule(DispatchTime::At(4), None, 127, root(), call));
 			run_to_block(3);
 			assert!(logger::log().is_empty());
@@ -895,8 +1001,10 @@ mod tests {
 	fn schedule_after_works() {
 		new_test_ext().execute_with(|| {
 			run_to_block(2);
-			let call = Call::Logger(logger::Call::log(42, 1000));
-			assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
+			let call = Call::Logger(LoggerCall::log(42, 1000));
+			assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(
+				&call
+			));
 			// This will schedule the call 3 blocks after the next block... so block 3 + 3 = 6
 			assert_ok!(Scheduler::do_schedule(DispatchTime::After(3), None, 127, root(), call));
 			run_to_block(5);
@@ -912,7 +1020,7 @@ mod tests {
 	fn schedule_after_zero_works() {
 		new_test_ext().execute_with(|| {
 			run_to_block(2);
-			let call = Call::Logger(logger::Call::log(42, 1000));
+			let call = Call::Logger(LoggerCall::log(42, 1000));
 			assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
 			assert_ok!(Scheduler::do_schedule(DispatchTime::After(0), None, 127, root(), call));
 			// Will trigger on the next block.
@@ -941,16 +1049,22 @@ mod tests {
 			run_to_block(9);
 			assert_eq!(logger::log(), vec![(root(), 42u32), (root(), 42u32)]);
 			run_to_block(10);
-			assert_eq!(logger::log(), vec![(root(), 42u32), (root(), 42u32), (root(), 42u32)]);
+			assert_eq!(
+				logger::log(),
+				vec![(root(), 42u32), (root(), 42u32), (root(), 42u32)]
+			);
 			run_to_block(100);
-			assert_eq!(logger::log(), vec![(root(), 42u32), (root(), 42u32), (root(), 42u32)]);
+			assert_eq!(
+				logger::log(),
+				vec![(root(), 42u32), (root(), 42u32), (root(), 42u32)]
+			);
 		});
 	}
 
 	#[test]
 	fn reschedule_works() {
 		new_test_ext().execute_with(|| {
-			let call = Call::Logger(logger::Call::log(42, 1000));
+			let call = Call::Logger(LoggerCall::log(42, 1000));
 			assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
 			assert_eq!(Scheduler::do_schedule(DispatchTime::At(4), None, 127, root(), call).unwrap(), (4, 0));
 
@@ -975,7 +1089,7 @@ mod tests {
 	#[test]
 	fn reschedule_named_works() {
 		new_test_ext().execute_with(|| {
-			let call = Call::Logger(logger::Call::log(42, 1000));
+			let call = Call::Logger(LoggerCall::log(42, 1000));
 			assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
 			assert_eq!(Scheduler::do_schedule_named(
 				1u32.encode(), DispatchTime::At(4), None, 127, root(), call
@@ -1002,7 +1116,7 @@ mod tests {
 	#[test]
 	fn reschedule_named_perodic_works() {
 		new_test_ext().execute_with(|| {
-			let call = Call::Logger(logger::Call::log(42, 1000));
+			let call = Call::Logger(LoggerCall::log(42, 1000));
 			assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
 			assert_eq!(Scheduler::do_schedule_named(
 				1u32.encode(), DispatchTime::At(4), Some((3, 3)), 127, root(), call
@@ -1041,10 +1155,10 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			// at #4.
 			Scheduler::do_schedule_named(
-				1u32.encode(), DispatchTime::At(4), None, 127, root(), Call::Logger(logger::Call::log(69, 1000))
+				1u32.encode(), DispatchTime::At(4), None, 127, root(), Call::Logger(LoggerCall::log(69, 1000))
 			).unwrap();
 			let i = Scheduler::do_schedule(
-				DispatchTime::At(4), None, 127, root(), Call::Logger(logger::Call::log(42, 1000))
+				DispatchTime::At(4), None, 127, root(), Call::Logger(LoggerCall::log(42, 1000))
 			).unwrap();
 			run_to_block(3);
 			assert!(logger::log().is_empty());
@@ -1065,8 +1179,9 @@ mod tests {
 				Some((3, 3)),
 				127,
 				root(),
-				Call::Logger(logger::Call::log(42, 1000))
-			).unwrap();
+				Call::Logger(LoggerCall::log(42, 1000)),
+			)
+			.unwrap();
 			// same id results in error.
 			assert!(Scheduler::do_schedule_named(
 				1u32.encode(),
@@ -1074,12 +1189,19 @@ mod tests {
 				None,
 				127,
 				root(),
-				Call::Logger(logger::Call::log(69, 1000))
-			).is_err());
+				Call::Logger(LoggerCall::log(69, 1000))
+			)
+			.is_err());
 			// different id is ok.
 			Scheduler::do_schedule_named(
-				2u32.encode(), DispatchTime::At(8), None, 127, root(), Call::Logger(logger::Call::log(69, 1000))
-			).unwrap();
+				2u32.encode(),
+				DispatchTime::At(8),
+				None,
+				127,
+				root(),
+				Call::Logger(LoggerCall::log(69, 1000)),
+			)
+			.unwrap();
 			run_to_block(3);
 			assert!(logger::log().is_empty());
 			run_to_block(4);
@@ -1099,13 +1221,14 @@ mod tests {
 				None,
 				127,
 				root(),
-				Call::Logger(logger::Call::log(42, MaximumSchedulerWeight::get() / 2))
+				Call::Logger(LoggerCall::log(42, MaximumSchedulerWeight::get() / 2))
 			));
 			assert_ok!(Scheduler::do_schedule(
 				DispatchTime::At(4),
 				None,
 				127,
-				root(), Call::Logger(logger::Call::log(69, MaximumSchedulerWeight::get() / 2))
+				root(),
+				Call::Logger(LoggerCall::log(69, MaximumSchedulerWeight::get() / 2))
 			));
 			// 69 and 42 do not fit together
 			run_to_block(4);
@@ -1123,14 +1246,14 @@ mod tests {
 				None,
 				0,
 				root(),
-				Call::Logger(logger::Call::log(42, MaximumSchedulerWeight::get() / 2))
+				Call::Logger(LoggerCall::log(42, MaximumSchedulerWeight::get() / 2))
 			));
 			assert_ok!(Scheduler::do_schedule(
 				DispatchTime::At(4),
 				None,
 				0,
 				root(),
-				Call::Logger(logger::Call::log(69, MaximumSchedulerWeight::get() / 2))
+				Call::Logger(LoggerCall::log(69, MaximumSchedulerWeight::get() / 2))
 			));
 			// With base weights, 69 and 42 should not fit together, but do because of hard deadlines
 			run_to_block(4);
@@ -1146,14 +1269,14 @@ mod tests {
 				None,
 				1,
 				root(),
-				Call::Logger(logger::Call::log(42, MaximumSchedulerWeight::get() / 2))
+				Call::Logger(LoggerCall::log(42, MaximumSchedulerWeight::get() / 2))
 			));
 			assert_ok!(Scheduler::do_schedule(
 				DispatchTime::At(4),
 				None,
 				0,
 				root(),
-				Call::Logger(logger::Call::log(69, MaximumSchedulerWeight::get() / 2))
+				Call::Logger(LoggerCall::log(69, MaximumSchedulerWeight::get() / 2))
 			));
 			run_to_block(4);
 			assert_eq!(logger::log(), vec![(root(), 69u32), (root(), 42u32)]);
@@ -1167,19 +1290,22 @@ mod tests {
 				DispatchTime::At(4),
 				None,
 				255,
-				root(), Call::Logger(logger::Call::log(42, MaximumSchedulerWeight::get() / 3))
+				root(),
+				Call::Logger(LoggerCall::log(42, MaximumSchedulerWeight::get() / 3))
 			));
 			assert_ok!(Scheduler::do_schedule(
 				DispatchTime::At(4),
 				None,
 				127,
-				root(), Call::Logger(logger::Call::log(69, MaximumSchedulerWeight::get() / 2))
+				root(),
+				Call::Logger(LoggerCall::log(69, MaximumSchedulerWeight::get() / 2))
 			));
 			assert_ok!(Scheduler::do_schedule(
 				DispatchTime::At(4),
 				None,
 				126,
-				root(), Call::Logger(logger::Call::log(2600, MaximumSchedulerWeight::get() / 2))
+				root(),
+				Call::Logger(LoggerCall::log(2600, MaximumSchedulerWeight::get() / 2))
 			));
 
 			// 2600 does not fit with 69 or 42, but has higher priority, so will go through
@@ -1187,32 +1313,39 @@ mod tests {
 			assert_eq!(logger::log(), vec![(root(), 2600u32)]);
 			// 69 and 42 fit together
 			run_to_block(5);
-			assert_eq!(logger::log(), vec![(root(), 2600u32), (root(), 69u32), (root(), 42u32)]);
+			assert_eq!(
+				logger::log(),
+				vec![(root(), 2600u32), (root(), 69u32), (root(), 42u32)]
+			);
 		});
 	}
 
 	#[test]
 	fn on_initialize_weight_is_correct() {
 		new_test_ext().execute_with(|| {
-			let base_weight: Weight = <Test as frame_system::Config>::DbWeight::get().reads_writes(1, 2);
+			let base_weight: Weight =
+				<Test as frame_system::Config>::DbWeight::get().reads_writes(1, 2);
 			let base_multiplier = 0;
 			let named_multiplier = <Test as frame_system::Config>::DbWeight::get().writes(1);
-			let periodic_multiplier = <Test as frame_system::Config>::DbWeight::get().reads_writes(1, 1);
+			let periodic_multiplier =
+				<Test as frame_system::Config>::DbWeight::get().reads_writes(1, 1);
 
 			// Named
-			assert_ok!(
-				Scheduler::do_schedule_named(
-					1u32.encode(), DispatchTime::At(1), None, 255, root(),
-					Call::Logger(logger::Call::log(3, MaximumSchedulerWeight::get() / 3))
-				)
-			);
+			assert_ok!(Scheduler::do_schedule_named(
+				1u32.encode(),
+				DispatchTime::At(1),
+				None,
+				255,
+				root(),
+				Call::Logger(LoggerCall::log(3, MaximumSchedulerWeight::get() / 3))
+			));
 			// Anon Periodic
 			assert_ok!(Scheduler::do_schedule(
 				DispatchTime::At(1),
 				Some((1000, 3)),
 				128,
 				root(),
-				Call::Logger(logger::Call::log(42, MaximumSchedulerWeight::get() / 3))
+				Call::Logger(LoggerCall::log(42, MaximumSchedulerWeight::get() / 3))
 			));
 			// Anon
 			assert_ok!(Scheduler::do_schedule(
@@ -1220,33 +1353,57 @@ mod tests {
 				None,
 				127,
 				root(),
-				Call::Logger(logger::Call::log(69, MaximumSchedulerWeight::get() / 2))
+				Call::Logger(LoggerCall::log(69, MaximumSchedulerWeight::get() / 2))
 			));
 			// Named Periodic
 			assert_ok!(Scheduler::do_schedule_named(
-				2u32.encode(), DispatchTime::At(1), Some((1000, 3)), 126, root(),
-				Call::Logger(logger::Call::log(2600, MaximumSchedulerWeight::get() / 2)))
-			);
+				2u32.encode(),
+				DispatchTime::At(1),
+				Some((1000, 3)),
+				126,
+				root(),
+				Call::Logger(LoggerCall::log(2600, MaximumSchedulerWeight::get() / 2))
+			));
 
 			// Will include the named periodic only
 			let actual_weight = Scheduler::on_initialize(1);
 			let call_weight = MaximumSchedulerWeight::get() / 2;
 			assert_eq!(
-				actual_weight, call_weight + base_weight + base_multiplier + named_multiplier + periodic_multiplier
+				actual_weight,
+				call_weight
+					+ base_weight + base_multiplier
+					+ named_multiplier + periodic_multiplier
 			);
 			assert_eq!(logger::log(), vec![(root(), 2600u32)]);
 
 			// Will include anon and anon periodic
 			let actual_weight = Scheduler::on_initialize(2);
 			let call_weight = MaximumSchedulerWeight::get() / 2 + MaximumSchedulerWeight::get() / 3;
-			assert_eq!(actual_weight, call_weight + base_weight + base_multiplier * 2 + periodic_multiplier);
-			assert_eq!(logger::log(), vec![(root(), 2600u32), (root(), 69u32), (root(), 42u32)]);
+			assert_eq!(
+				actual_weight,
+				call_weight + base_weight + base_multiplier * 2 + periodic_multiplier
+			);
+			assert_eq!(
+				logger::log(),
+				vec![(root(), 2600u32), (root(), 69u32), (root(), 42u32)]
+			);
 
 			// Will include named only
 			let actual_weight = Scheduler::on_initialize(3);
 			let call_weight = MaximumSchedulerWeight::get() / 3;
-			assert_eq!(actual_weight, call_weight + base_weight + base_multiplier + named_multiplier);
-			assert_eq!(logger::log(), vec![(root(), 2600u32), (root(), 69u32), (root(), 42u32), (root(), 3u32)]);
+			assert_eq!(
+				actual_weight,
+				call_weight + base_weight + base_multiplier + named_multiplier
+			);
+			assert_eq!(
+				logger::log(),
+				vec![
+					(root(), 2600u32),
+					(root(), 69u32),
+					(root(), 42u32),
+					(root(), 3u32)
+				]
+			);
 
 			// Will contain none
 			let actual_weight = Scheduler::on_initialize(4);
@@ -1257,9 +1414,16 @@ mod tests {
 	#[test]
 	fn root_calls_works() {
 		new_test_ext().execute_with(|| {
-			let call = Box::new(Call::Logger(logger::Call::log(69, 1000)));
-			let call2 = Box::new(Call::Logger(logger::Call::log(42, 1000)));
-			assert_ok!(Scheduler::schedule_named(Origin::root(), 1u32.encode(), 4, None, 127, call));
+			let call = Box::new(Call::Logger(LoggerCall::log(69, 1000)));
+			let call2 = Box::new(Call::Logger(LoggerCall::log(42, 1000)));
+			assert_ok!(Scheduler::schedule_named(
+				Origin::root(),
+				1u32.encode(),
+				4,
+				None,
+				127,
+				call
+			));
 			assert_ok!(Scheduler::schedule(Origin::root(), 4, None, 127, call2));
 			run_to_block(3);
 			// Scheduled calls are in the agenda.
@@ -1278,8 +1442,8 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			run_to_block(3);
 
-			let call = Box::new(Call::Logger(logger::Call::log(69, 1000)));
-			let call2 = Box::new(Call::Logger(logger::Call::log(42, 1000)));
+			let call = Box::new(Call::Logger(LoggerCall::log(69, 1000)));
+			let call2 = Box::new(Call::Logger(LoggerCall::log(42, 1000)));
 
 			assert_err!(
 				Scheduler::schedule_named(Origin::root(), 1u32.encode(), 2, None, 127, call),
@@ -1301,17 +1465,31 @@ mod tests {
 	#[test]
 	fn should_use_orign() {
 		new_test_ext().execute_with(|| {
-			let call = Box::new(Call::Logger(logger::Call::log(69, 1000)));
-			let call2 = Box::new(Call::Logger(logger::Call::log(42, 1000)));
-			assert_ok!(
-				Scheduler::schedule_named(system::RawOrigin::Signed(1).into(), 1u32.encode(), 4, None, 127, call)
-			);
-			assert_ok!(Scheduler::schedule(system::RawOrigin::Signed(1).into(), 4, None, 127, call2));
+			let call = Box::new(Call::Logger(LoggerCall::log(69, 1000)));
+			let call2 = Box::new(Call::Logger(LoggerCall::log(42, 1000)));
+			assert_ok!(Scheduler::schedule_named(
+				system::RawOrigin::Signed(1).into(),
+				1u32.encode(),
+				4,
+				None,
+				127,
+				call
+			));
+			assert_ok!(Scheduler::schedule(
+				system::RawOrigin::Signed(1).into(),
+				4,
+				None,
+				127,
+				call2
+			));
 			run_to_block(3);
 			// Scheduled calls are in the agenda.
 			assert_eq!(Agenda::<Test>::get(4).len(), 2);
 			assert!(logger::log().is_empty());
-			assert_ok!(Scheduler::cancel_named(system::RawOrigin::Signed(1).into(), 1u32.encode()));
+			assert_ok!(Scheduler::cancel_named(
+				system::RawOrigin::Signed(1).into(),
+				1u32.encode()
+			));
 			assert_ok!(Scheduler::cancel(system::RawOrigin::Signed(1).into(), 4, 1));
 			// Scheduled calls are made NONE, so should not effect state
 			run_to_block(100);
@@ -1322,37 +1500,73 @@ mod tests {
 	#[test]
 	fn should_check_orign() {
 		new_test_ext().execute_with(|| {
-			let call = Box::new(Call::Logger(logger::Call::log(69, 1000)));
-			let call2 = Box::new(Call::Logger(logger::Call::log(42, 1000)));
+			let call = Box::new(Call::Logger(LoggerCall::log(69, 1000)));
+			let call2 = Box::new(Call::Logger(LoggerCall::log(42, 1000)));
+			assert_noop!(
+				Scheduler::schedule_named(
+					system::RawOrigin::Signed(2).into(),
+					1u32.encode(),
+					4,
+					None,
+					127,
+					call
+				),
+				BadOrigin
+			);
 			assert_noop!(
-				Scheduler::schedule_named(system::RawOrigin::Signed(2).into(), 1u32.encode(), 4, None, 127, call),
+				Scheduler::schedule(system::RawOrigin::Signed(2).into(), 4, None, 127, call2),
 				BadOrigin
 			);
-			assert_noop!(Scheduler::schedule(system::RawOrigin::Signed(2).into(), 4, None, 127, call2), BadOrigin);
 		});
 	}
 
 	#[test]
 	fn should_check_orign_for_cancel() {
 		new_test_ext().execute_with(|| {
-			let call = Box::new(Call::Logger(logger::Call::log_without_filter(69, 1000)));
-			let call2 = Box::new(Call::Logger(logger::Call::log_without_filter(42, 1000)));
-			assert_ok!(
-				Scheduler::schedule_named(system::RawOrigin::Signed(1).into(), 1u32.encode(), 4, None, 127, call)
-			);
-			assert_ok!(Scheduler::schedule(system::RawOrigin::Signed(1).into(), 4, None, 127, call2));
+			let call = Box::new(Call::Logger(LoggerCall::log_without_filter(69, 1000)));
+			let call2 = Box::new(Call::Logger(LoggerCall::log_without_filter(42, 1000)));
+			assert_ok!(Scheduler::schedule_named(
+				system::RawOrigin::Signed(1).into(),
+				1u32.encode(),
+				4,
+				None,
+				127,
+				call
+			));
+			assert_ok!(Scheduler::schedule(
+				system::RawOrigin::Signed(1).into(),
+				4,
+				None,
+				127,
+				call2
+			));
 			run_to_block(3);
 			// Scheduled calls are in the agenda.
 			assert_eq!(Agenda::<Test>::get(4).len(), 2);
 			assert!(logger::log().is_empty());
-			assert_noop!(Scheduler::cancel_named(system::RawOrigin::Signed(2).into(), 1u32.encode()), BadOrigin);
-			assert_noop!(Scheduler::cancel(system::RawOrigin::Signed(2).into(), 4, 1), BadOrigin);
-			assert_noop!(Scheduler::cancel_named(system::RawOrigin::Root.into(), 1u32.encode()), BadOrigin);
-			assert_noop!(Scheduler::cancel(system::RawOrigin::Root.into(), 4, 1), BadOrigin);
+			assert_noop!(
+				Scheduler::cancel_named(system::RawOrigin::Signed(2).into(), 1u32.encode()),
+				BadOrigin
+			);
+			assert_noop!(
+				Scheduler::cancel(system::RawOrigin::Signed(2).into(), 4, 1),
+				BadOrigin
+			);
+			assert_noop!(
+				Scheduler::cancel_named(system::RawOrigin::Root.into(), 1u32.encode()),
+				BadOrigin
+			);
+			assert_noop!(
+				Scheduler::cancel(system::RawOrigin::Root.into(), 4, 1),
+				BadOrigin
+			);
 			run_to_block(5);
 			assert_eq!(
 				logger::log(),
-				vec![(system::RawOrigin::Signed(1).into(), 69u32), (system::RawOrigin::Signed(1).into(), 42u32)]
+				vec![
+					(system::RawOrigin::Signed(1).into(), 69u32),
+					(system::RawOrigin::Signed(1).into(), 42u32)
+				]
 			);
 		});
 	}
@@ -1366,98 +1580,97 @@ mod tests {
 					Some(ScheduledV1 {
 						maybe_id: None,
 						priority: i as u8 + 10,
-						call: Call::Logger(logger::Call::log(96, 100)),
+						call: Call::Logger(LoggerCall::log(96, 100)),
 						maybe_periodic: None,
 					}),
 					None,
 					Some(ScheduledV1 {
 						maybe_id: Some(b"test".to_vec()),
 						priority: 123,
-						call: Call::Logger(logger::Call::log(69, 1000)),
+						call: Call::Logger(LoggerCall::log(69, 1000)),
 						maybe_periodic: Some((456u64, 10)),
 					}),
 				];
-				frame_support::migration::put_storage_value(
-					b"Scheduler",
-					b"Agenda",
-					&k,
-					old,
-				);
+				frame_support::migration::put_storage_value(b"Scheduler", b"Agenda", &k, old);
 			}
 
-			assert_eq!(StorageVersion::get(), Releases::V1);
+			assert_eq!(StorageVersion::<Test>::get(), Releases::V1);
 
 			assert!(Scheduler::migrate_v1_to_t2());
 
-			assert_eq_uvec!(Agenda::<Test>::iter().collect::<Vec<_>>(), vec![
-				(
-					0,
-					vec![
-					Some(ScheduledV2 {
-						maybe_id: None,
-						priority: 10,
-						call: Call::Logger(logger::Call::log(96, 100)),
-						maybe_periodic: None,
-						origin: root(),
-						_phantom: PhantomData::<u64>::default(),
-					}),
-					None,
-					Some(ScheduledV2 {
-						maybe_id: Some(b"test".to_vec()),
-						priority: 123,
-						call: Call::Logger(logger::Call::log(69, 1000)),
-						maybe_periodic: Some((456u64, 10)),
-						origin: root(),
-						_phantom: PhantomData::<u64>::default(),
-					}),
-				]),
-				(
-					1,
-					vec![
-						Some(ScheduledV2 {
-							maybe_id: None,
-							priority: 11,
-							call: Call::Logger(logger::Call::log(96, 100)),
-							maybe_periodic: None,
-							origin: root(),
-							_phantom: PhantomData::<u64>::default(),
-						}),
-						None,
-						Some(ScheduledV2 {
-							maybe_id: Some(b"test".to_vec()),
-							priority: 123,
-							call: Call::Logger(logger::Call::log(69, 1000)),
-							maybe_periodic: Some((456u64, 10)),
-							origin: root(),
-							_phantom: PhantomData::<u64>::default(),
-						}),
-					]
-				),
-				(
-					2,
-					vec![
-						Some(ScheduledV2 {
-							maybe_id: None,
-							priority: 12,
-							call: Call::Logger(logger::Call::log(96, 100)),
-							maybe_periodic: None,
-							origin: root(),
-							_phantom: PhantomData::<u64>::default(),
-						}),
-						None,
-						Some(ScheduledV2 {
-							maybe_id: Some(b"test".to_vec()),
-							priority: 123,
-							call: Call::Logger(logger::Call::log(69, 1000)),
-							maybe_periodic: Some((456u64, 10)),
-							origin: root(),
-							_phantom: PhantomData::<u64>::default(),
-						}),
-					]
-				)
-			]);
-
-			assert_eq!(StorageVersion::get(), Releases::V2);
+			assert_eq_uvec!(
+				Agenda::<Test>::iter().collect::<Vec<_>>(),
+				vec![
+					(
+						0,
+						vec![
+							Some(ScheduledV2 {
+								maybe_id: None,
+								priority: 10,
+								call: Call::Logger(LoggerCall::log(96, 100)),
+								maybe_periodic: None,
+								origin: root(),
+								_phantom: PhantomData::<u64>::default(),
+							}),
+							None,
+							Some(ScheduledV2 {
+								maybe_id: Some(b"test".to_vec()),
+								priority: 123,
+								call: Call::Logger(LoggerCall::log(69, 1000)),
+								maybe_periodic: Some((456u64, 10)),
+								origin: root(),
+								_phantom: PhantomData::<u64>::default(),
+							}),
+						]
+					),
+					(
+						1,
+						vec![
+							Some(ScheduledV2 {
+								maybe_id: None,
+								priority: 11,
+								call: Call::Logger(LoggerCall::log(96, 100)),
+								maybe_periodic: None,
+								origin: root(),
+								_phantom: PhantomData::<u64>::default(),
+							}),
+							None,
+							Some(ScheduledV2 {
+								maybe_id: Some(b"test".to_vec()),
+								priority: 123,
+								call: Call::Logger(LoggerCall::log(69, 1000)),
+								maybe_periodic: Some((456u64, 10)),
+								origin: root(),
+								_phantom: PhantomData::<u64>::default(),
+							}),
+						]
+					),
+					(
+						2,
+						vec![
+							Some(ScheduledV2 {
+								maybe_id: None,
+								priority: 12,
+								call: Call::Logger(LoggerCall::log(96, 100)),
+								maybe_periodic: None,
+								origin: root(),
+								_phantom: PhantomData::<u64>::default(),
+							}),
+							None,
+							Some(ScheduledV2 {
+								maybe_id: Some(b"test".to_vec()),
+								priority: 123,
+								call: Call::Logger(LoggerCall::log(69, 1000)),
+								maybe_periodic: Some((456u64, 10)),
+								origin: root(),
+								_phantom: PhantomData::<u64>::default(),
+							}),
+						]
+					)
+				]
+			);
+
+			assert_eq!(StorageVersion::<Test>::get(), Releases::V2);
 		});
 	}
 
@@ -1470,7 +1683,7 @@ mod tests {
 					Some(Scheduled {
 						maybe_id: None,
 						priority: i as u8 + 10,
-						call: Call::Logger(logger::Call::log(96, 100)),
+						call: Call::Logger(LoggerCall::log(96, 100)),
 						origin: 3u32,
 						maybe_periodic: None,
 						_phantom: Default::default(),
@@ -1480,17 +1693,12 @@ mod tests {
 						maybe_id: Some(b"test".to_vec()),
 						priority: 123,
 						origin: 2u32,
-						call: Call::Logger(logger::Call::log(69, 1000)),
+						call: Call::Logger(LoggerCall::log(69, 1000)),
 						maybe_periodic: Some((456u64, 10)),
 						_phantom: Default::default(),
 					}),
 				];
-				frame_support::migration::put_storage_value(
-					b"Scheduler",
-					b"Agenda",
-					&k,
-					old,
-				);
+				frame_support::migration::put_storage_value(b"Scheduler", b"Agenda", &k, old);
 			}
 
 			impl Into<OriginCaller> for u32 {
@@ -1505,73 +1713,77 @@ mod tests {
 
 			Scheduler::migrate_origin::<u32>();
 
-			assert_eq_uvec!(Agenda::<Test>::iter().collect::<Vec<_>>(), vec![
-				(
-					0,
-					vec![
-					Some(ScheduledV2::<_, _, OriginCaller, u64> {
-						maybe_id: None,
-						priority: 10,
-						call: Call::Logger(logger::Call::log(96, 100)),
-						maybe_periodic: None,
-						origin: system::RawOrigin::Root.into(),
-						_phantom: PhantomData::<u64>::default(),
-					}),
-					None,
-					Some(ScheduledV2 {
-						maybe_id: Some(b"test".to_vec()),
-						priority: 123,
-						call: Call::Logger(logger::Call::log(69, 1000)),
-						maybe_periodic: Some((456u64, 10)),
-						origin: system::RawOrigin::None.into(),
-						_phantom: PhantomData::<u64>::default(),
-					}),
-				]),
-				(
-					1,
-					vec![
-						Some(ScheduledV2 {
-							maybe_id: None,
-							priority: 11,
-							call: Call::Logger(logger::Call::log(96, 100)),
-							maybe_periodic: None,
-							origin: system::RawOrigin::Root.into(),
-							_phantom: PhantomData::<u64>::default(),
-						}),
-						None,
-						Some(ScheduledV2 {
-							maybe_id: Some(b"test".to_vec()),
-							priority: 123,
-							call: Call::Logger(logger::Call::log(69, 1000)),
-							maybe_periodic: Some((456u64, 10)),
-							origin: system::RawOrigin::None.into(),
-							_phantom: PhantomData::<u64>::default(),
-						}),
-					]
-				),
-				(
-					2,
-					vec![
-						Some(ScheduledV2 {
-							maybe_id: None,
-							priority: 12,
-							call: Call::Logger(logger::Call::log(96, 100)),
-							maybe_periodic: None,
-							origin: system::RawOrigin::Root.into(),
-							_phantom: PhantomData::<u64>::default(),
-						}),
-						None,
-						Some(ScheduledV2 {
-							maybe_id: Some(b"test".to_vec()),
-							priority: 123,
-							call: Call::Logger(logger::Call::log(69, 1000)),
-							maybe_periodic: Some((456u64, 10)),
-							origin: system::RawOrigin::None.into(),
-							_phantom: PhantomData::<u64>::default(),
-						}),
-					]
-				)
-			]);
+			assert_eq_uvec!(
+				Agenda::<Test>::iter().collect::<Vec<_>>(),
+				vec![
+					(
+						0,
+						vec![
+							Some(ScheduledV2::<_, _, OriginCaller, u64> {
+								maybe_id: None,
+								priority: 10,
+								call: Call::Logger(LoggerCall::log(96, 100)),
+								maybe_periodic: None,
+								origin: system::RawOrigin::Root.into(),
+								_phantom: PhantomData::<u64>::default(),
+							}),
+							None,
+							Some(ScheduledV2 {
+								maybe_id: Some(b"test".to_vec()),
+								priority: 123,
+								call: Call::Logger(LoggerCall::log(69, 1000)),
+								maybe_periodic: Some((456u64, 10)),
+								origin: system::RawOrigin::None.into(),
+								_phantom: PhantomData::<u64>::default(),
+							}),
+						]
+					),
+					(
+						1,
+						vec![
+							Some(ScheduledV2 {
+								maybe_id: None,
+								priority: 11,
+								call: Call::Logger(LoggerCall::log(96, 100)),
+								maybe_periodic: None,
+								origin: system::RawOrigin::Root.into(),
+								_phantom: PhantomData::<u64>::default(),
+							}),
+							None,
+							Some(ScheduledV2 {
+								maybe_id: Some(b"test".to_vec()),
+								priority: 123,
+								call: Call::Logger(LoggerCall::log(69, 1000)),
+								maybe_periodic: Some((456u64, 10)),
+								origin: system::RawOrigin::None.into(),
+								_phantom: PhantomData::<u64>::default(),
+							}),
+						]
+					),
+					(
+						2,
+						vec![
+							Some(ScheduledV2 {
+								maybe_id: None,
+								priority: 12,
+								call: Call::Logger(LoggerCall::log(96, 100)),
+								maybe_periodic: None,
+								origin: system::RawOrigin::Root.into(),
+								_phantom: PhantomData::<u64>::default(),
+							}),
+							None,
+							Some(ScheduledV2 {
+								maybe_id: Some(b"test".to_vec()),
+								priority: 123,
+								call: Call::Logger(LoggerCall::log(69, 1000)),
+								maybe_periodic: Some((456u64, 10)),
+								origin: system::RawOrigin::None.into(),
+								_phantom: PhantomData::<u64>::default(),
+							}),
+						]
+					)
+				]
+			);
 		});
 	}
 }

From d908ef803a0368236c8f5891cbe4df11d6e85ec6 Mon Sep 17 00:00:00 2001
From: Sergei Shulepov <sergei@parity.io>
Date: Tue, 18 May 2021 14:06:35 +0200
Subject: [PATCH 0753/1194] Emit wasm sections only when compiling to wasm
 (#8845)

---
 primitives/api/proc-macro/src/impl_runtime_apis.rs |  1 +
 .../version/proc-macro/src/decl_runtime_version.rs |  1 +
 primitives/version/src/lib.rs                      | 14 ++++++++++++++
 3 files changed, 16 insertions(+)

diff --git a/primitives/api/proc-macro/src/impl_runtime_apis.rs b/primitives/api/proc-macro/src/impl_runtime_apis.rs
index e918724c0f5b..cf1265fdb002 100644
--- a/primitives/api/proc-macro/src/impl_runtime_apis.rs
+++ b/primitives/api/proc-macro/src/impl_runtime_apis.rs
@@ -675,6 +675,7 @@ fn generate_runtime_api_versions(impls: &[ItemImpl]) -> Result<TokenStream> {
 			#( #attrs )*
 			const _: () = {
 				// All sections with the same name are going to be merged by concatenation.
+				#[cfg(not(feature = "std"))]
 				#[link_section = "runtime_apis"]
 				static SECTION_CONTENTS: [u8; 12] = #c::serialize_runtime_api_info(#id, #version);
 			};
diff --git a/primitives/version/proc-macro/src/decl_runtime_version.rs b/primitives/version/proc-macro/src/decl_runtime_version.rs
index 6df0b71b202c..22803f07d811 100644
--- a/primitives/version/proc-macro/src/decl_runtime_version.rs
+++ b/primitives/version/proc-macro/src/decl_runtime_version.rs
@@ -238,6 +238,7 @@ fn generate_emit_link_section_decl(contents: &[u8], section_name: &str) -> Token
 	let len = contents.len();
 	quote! {
 		const _: () = {
+			#[cfg(not(feature = "std"))]
 			#[link_section = #section_name]
 			static SECTION_CONTENTS: [u8; #len] = [#(#contents),*];
 		};
diff --git a/primitives/version/src/lib.rs b/primitives/version/src/lib.rs
index 603989f5d2f6..8940e85f68a8 100644
--- a/primitives/version/src/lib.rs
+++ b/primitives/version/src/lib.rs
@@ -45,6 +45,8 @@ use sp_runtime::{traits::Block as BlockT, generic::BlockId};
 /// A shortcoming of this macro is that it is unable to embed information regarding supported APIs.
 /// This is supported by the `construct_runtime!` macro.
 ///
+/// # Usage
+///
 /// This macro accepts a const item like the following:
 ///
 /// ```rust
@@ -78,6 +80,18 @@ use sp_runtime::{traits::Block as BlockT, generic::BlockId};
 /// - `apis` doesn't have any specific constraints. This is because this information doesn't get into
 ///   the custom section and is not parsed.
 ///
+/// # Compilation Target & "std" feature
+///
+/// This macro assumes it will be used within a runtime. By convention, a runtime crate defines a
+/// feature named "std". This feature is enabled when the runtime is compiled to native code and
+/// disabled when it is compiled to the wasm code.
+///
+/// The custom section can only be emitted while compiling to wasm. In order to detect the compilation
+/// target we use the "std" feature. This macro will emit the custom section only if the "std" feature
+/// is **not** enabled.
+///
+/// Including this macro in the context where there is no "std" feature and the code is not compiled
+/// to wasm can lead to cryptic linking errors.
 pub use sp_version_proc_macro::runtime_version;
 
 /// The identity of a particular API interface that the runtime might provide.

From 3d753eca4b94c18d2b456f71f6447b5790df33fe Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Tue, 18 May 2021 14:22:06 +0200
Subject: [PATCH 0754/1194] Ensure election offchain workers don't overlap
 (#8828)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Initial version, well tested, should work fine.

* Add one last log line

* Update frame/election-provider-multi-phase/src/unsigned.rs

Co-authored-by: Gavin Wood <gavin@parity.io>

* Update frame/election-provider-multi-phase/src/unsigned.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Update frame/election-provider-multi-phase/src/unsigned.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Fix a few more things

* fix build

* rewrite the whole thing with a proper lock

* clean

* clean some nits

* Add unit tests.

* Update primitives/runtime/src/offchain/storage_lock.rs

Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Fix test

* Fix tests

Co-authored-by: Gavin Wood <gavin@parity.io>
Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 bin/node/cli/src/chain_spec.rs                |   2 +-
 .../election-provider-multi-phase/Cargo.toml  |   2 +
 .../election-provider-multi-phase/src/lib.rs  |  86 ++++---
 .../src/unsigned.rs                           | 240 ++++++++++++------
 .../runtime/src/offchain/storage_lock.rs      |  12 +
 5 files changed, 231 insertions(+), 111 deletions(-)

diff --git a/bin/node/cli/src/chain_spec.rs b/bin/node/cli/src/chain_spec.rs
index d46a7797a702..eb3ee5124ac0 100644
--- a/bin/node/cli/src/chain_spec.rs
+++ b/bin/node/cli/src/chain_spec.rs
@@ -284,7 +284,7 @@ pub fn testnet_genesis(
 			}).collect::<Vec<_>>(),
 		},
 		pallet_staking: StakingConfig {
-			validator_count: initial_authorities.len() as u32 * 2,
+			validator_count: initial_authorities.len() as u32,
 			minimum_validator_count: initial_authorities.len() as u32,
 			invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(),
 			slash_reward_fraction: Perbill::from_percent(10),
diff --git a/frame/election-provider-multi-phase/Cargo.toml b/frame/election-provider-multi-phase/Cargo.toml
index 643c768ce870..cd84ef3778c5 100644
--- a/frame/election-provider-multi-phase/Cargo.toml
+++ b/frame/election-provider-multi-phase/Cargo.toml
@@ -22,6 +22,7 @@ frame-system = { version = "3.0.0", default-features = false, path = "../system"
 
 sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
 sp-npos-elections = { version = "3.0.0", default-features = false, path = "../../primitives/npos-elections" }
 sp-arithmetic = { version = "3.0.0", default-features = false, path = "../../primitives/arithmetic" }
@@ -56,6 +57,7 @@ std = [
 
 	"sp-io/std",
 	"sp-std/std",
+	"sp-core/std",
 	"sp-runtime/std",
 	"sp-npos-elections/std",
 	"sp-arithmetic/std",
diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index e4fed277cf4f..d1de16f7f744 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -653,38 +653,24 @@ pub mod pallet {
 		}
 
 		fn offchain_worker(now: T::BlockNumber) {
-			match Self::current_phase() {
-				Phase::Unsigned((true, opened)) if opened == now => {
-					// mine a new solution, cache it, and attempt to submit it
-					let initial_output = Self::try_acquire_offchain_lock(now)
-						.and_then(|_| Self::mine_check_save_submit());
-					log!(info, "initial OCW output at {:?}: {:?}", now, initial_output);
-				}
-				Phase::Unsigned((true, opened)) if opened < now => {
-					// keep trying to submit solutions. worst case, we note that the stored solution
-					// is better than our cached/computed one, and decide not to submit after all.
-					//
-					// the offchain_lock prevents us from spamming submissions too often.
-					let resubmit_output = Self::try_acquire_offchain_lock(now)
-						.and_then(|_| Self::restore_or_compute_then_maybe_submit());
-					log!(info, "resubmit OCW output at {:?}: {:?}", now, resubmit_output);
+			use sp_runtime::offchain::storage_lock::{StorageLock, BlockAndTime};
+
+			// create a lock with the maximum deadline of number of blocks in the unsigned phase.
+			// This should only come useful in an **abrupt** termination of execution, otherwise the
+			// guard will be dropped upon successful execution.
+			let mut lock = StorageLock::<BlockAndTime<frame_system::Pallet::<T>>>::with_block_deadline(
+				unsigned::OFFCHAIN_LOCK,
+				T::UnsignedPhase::get().saturated_into(),
+			);
+
+			match lock.try_lock() {
+				Ok(_guard) => {
+					Self::do_synchronized_offchain_worker(now);
+				},
+				Err(deadline) => {
+					log!(debug, "offchain worker lock not released, deadline is {:?}", deadline);
 				}
-				_ => {}
-			}
-			// after election finalization, clear OCW solution storage
-			if <frame_system::Pallet<T>>::events()
-				.into_iter()
-				.filter_map(|event_record| {
-					let local_event = <T as Config>::Event::from(event_record.event);
-					local_event.try_into().ok()
-				})
-				.find(|event| {
-					matches!(event, Event::ElectionFinalized(_))
-				})
-				.is_some()
-			{
-				unsigned::kill_ocw_solution::<T>();
-			}
+			};
 		}
 
 		fn integrity_test() {
@@ -929,6 +915,44 @@ pub mod pallet {
 }
 
 impl<T: Config> Pallet<T> {
+	/// Internal logic of the offchain worker, to be executed only when the offchain lock is
+	/// acquired with success.
+	fn do_synchronized_offchain_worker(now: T::BlockNumber) {
+		log!(trace, "lock for offchain worker acquired.");
+		match Self::current_phase() {
+			Phase::Unsigned((true, opened)) if opened == now => {
+				// mine a new solution, cache it, and attempt to submit it
+				let initial_output = Self::ensure_offchain_repeat_frequency(now).and_then(|_| {
+					Self::mine_check_save_submit()
+				});
+				log!(debug, "initial offchain thread output: {:?}", initial_output);
+			}
+			Phase::Unsigned((true, opened)) if opened < now => {
+				// try and resubmit the cached solution, and recompute ONLY if it is not
+				// feasible.
+				let resubmit_output = Self::ensure_offchain_repeat_frequency(now).and_then(|_| {
+					Self::restore_or_compute_then_maybe_submit()
+				});
+				log!(debug, "resubmit offchain thread output: {:?}", resubmit_output);
+			}
+			_ => {}
+		}
+
+		// after election finalization, clear OCW solution storage.
+		if <frame_system::Pallet<T>>::events()
+			.into_iter()
+			.filter_map(|event_record| {
+				let local_event = <T as Config>::Event::from(event_record.event);
+				local_event.try_into().ok()
+			})
+			.any(|event| {
+				matches!(event, Event::ElectionFinalized(_))
+			})
+		{
+			unsigned::kill_ocw_solution::<T>();
+		}
+	}
+
 	/// Logic for [`<Pallet as Hooks>::on_initialize`] when signed phase is being opened.
 	///
 	/// This is decoupled for easy weight calculation.
diff --git a/frame/election-provider-multi-phase/src/unsigned.rs b/frame/election-provider-multi-phase/src/unsigned.rs
index 66b985c8efb9..ef1cdfd5a71c 100644
--- a/frame/election-provider-multi-phase/src/unsigned.rs
+++ b/frame/election-provider-multi-phase/src/unsigned.rs
@@ -15,26 +15,27 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! The unsigned phase implementation.
+//! The unsigned phase, and its miner.
 
 use crate::{
-	helpers, Call, CompactAccuracyOf, CompactOf, Config,
-	ElectionCompute, Error, FeasibilityError, Pallet, RawSolution, ReadySolution, RoundSnapshot,
-	SolutionOrSnapshotSize, Weight, WeightInfo,
+	helpers, Call, CompactAccuracyOf, CompactOf, Config, ElectionCompute, Error, FeasibilityError,
+	Pallet, RawSolution, ReadySolution, RoundSnapshot, SolutionOrSnapshotSize, Weight, WeightInfo,
 };
 use codec::{Encode, Decode};
 use frame_support::{dispatch::DispatchResult, ensure, traits::Get};
 use frame_system::offchain::SubmitTransaction;
 use sp_arithmetic::Perbill;
 use sp_npos_elections::{
-	CompactSolution, ElectionResult, ElectionScore, assignment_ratio_to_staked_normalized,
+	CompactSolution, ElectionResult, assignment_ratio_to_staked_normalized,
 	assignment_staked_to_ratio_normalized, is_score_better, seq_phragmen,
 };
 use sp_runtime::{offchain::storage::StorageValueRef, traits::TrailingZeroInput, SaturatedConversion};
 use sp_std::{cmp::Ordering, convert::TryFrom, vec::Vec};
 
-/// Storage key used to store the persistent offchain worker status.
-pub(crate) const OFFCHAIN_LOCK: &[u8] = b"parity/multi-phase-unsigned-election";
+/// Storage key used to store the last block number at which offchain worker ran.
+pub(crate) const OFFCHAIN_LAST_BLOCK: &[u8] = b"parity/multi-phase-unsigned-election";
+/// Storage key used to store the offchain worker running status.
+pub(crate) const OFFCHAIN_LOCK: &[u8] = b"parity/multi-phase-unsigned-election/lock";
 
 /// Storage key used to cache the solution `call`.
 pub(crate) const OFFCHAIN_CACHED_CALL: &[u8] = b"parity/multi-phase-unsigned-election/call";
@@ -72,8 +73,6 @@ pub enum MinerError {
 	Lock(&'static str),
 	/// Cannot restore a solution that was not stored.
 	NoStoredSolution,
-	/// Cached solution does not match the current round.
-	SolutionOutOfDate,
 	/// Cached solution is not a `submit_unsigned` call.
 	SolutionCallInvalid,
 	/// Failed to store a solution.
@@ -96,15 +95,16 @@ impl From<FeasibilityError> for MinerError {
 
 /// Save a given call into OCW storage.
 fn save_solution<T: Config>(call: &Call<T>) -> Result<(), MinerError> {
+	log!(debug, "saving a call to the offchain storage.");
 	let storage = StorageValueRef::persistent(&OFFCHAIN_CACHED_CALL);
 	match storage.mutate::<_, (), _>(|_| Ok(call.clone())) {
 		Ok(Ok(_)) => Ok(()),
 		Ok(Err(_)) => Err(MinerError::FailedToStoreSolution),
 		Err(_) => {
-			// this branch should be unreachable according to the definition of `StorageValueRef::mutate`:
-			// that function should only ever `Err` if the closure we pass it return an error.
-			// however, for safety in case the definition changes, we do not optimize the branch away
-			// or panic.
+			// this branch should be unreachable according to the definition of
+			// `StorageValueRef::mutate`: that function should only ever `Err` if the closure we
+			// pass it returns an error. however, for safety in case the definition changes, we do
+			// not optimize the branch away or panic.
 			Err(MinerError::FailedToStoreSolution)
 		},
 	}
@@ -120,10 +120,20 @@ fn restore_solution<T: Config>() -> Result<Call<T>, MinerError> {
 
 /// Clear a saved solution from OCW storage.
 pub(super) fn kill_ocw_solution<T: Config>() {
+	log!(debug, "clearing offchain call cache storage.");
 	let mut storage = StorageValueRef::persistent(&OFFCHAIN_CACHED_CALL);
 	storage.clear();
 }
 
+/// Clear the offchain repeat storage.
+///
+/// After calling this, the next offchain worker is guaranteed to work, with respect to the
+/// frequency repeat.
+fn clear_offchain_repeat_frequency() {
+	let mut last_block = StorageValueRef::persistent(&OFFCHAIN_LAST_BLOCK);
+	last_block.clear();
+}
+
 /// `true` when OCW storage contains a solution
 ///
 /// More precise than `restore_solution::<T>().is_ok()`; that invocation will return `false`
@@ -137,54 +147,59 @@ impl<T: Config> Pallet<T> {
 	/// Attempt to restore a solution from cache. Otherwise, compute it fresh. Either way, submit
 	/// if our call's score is greater than that of the cached solution.
 	pub fn restore_or_compute_then_maybe_submit() -> Result<(), MinerError> {
-		log!(
-			debug,
-			"OCW attempting to restore or compute an unsigned solution for the current election"
-		);
+		log!(debug,"miner attempting to restore or compute an unsigned solution.");
 
 		let call = restore_solution::<T>()
-			.and_then(|call| {
-				// ensure the cached call is still current before submitting
-				if let Call::submit_unsigned(solution, _) = &call {
-					// prevent errors arising from state changes in a forkful chain
-					Self::basic_checks(solution, "restored")?;
+		.and_then(|call| {
+			// ensure the cached call is still current before submitting
+			if let Call::submit_unsigned(solution, _) = &call {
+				// prevent errors arising from state changes in a forkful chain
+				Self::basic_checks(solution, "restored")?;
+				Ok(call)
+			} else {
+				Err(MinerError::SolutionCallInvalid)
+			}
+		}).or_else::<MinerError, _>(|error| {
+			log!(debug, "restoring solution failed due to {:?}", error);
+			match error {
+				MinerError::NoStoredSolution => {
+					log!(trace, "mining a new solution.");
+					// if not present or cache invalidated due to feasibility, regenerate.
+					// note that failing `Feasibility` can only mean that the solution was
+					// computed over a snapshot that has changed due to a fork.
+					let call = Self::mine_checked_call()?;
+					save_solution(&call)?;
 					Ok(call)
-				} else {
-					Err(MinerError::SolutionCallInvalid)
 				}
-			})
-			.or_else::<MinerError, _>(|_| {
-				// if not present or cache invalidated, regenerate
-				let (call, _) = Self::mine_checked_call()?;
-				save_solution(&call)?;
-				Ok(call)
-			})?;
-
-		// the runtime will catch it and reject the transaction if the phase is wrong, but it's
-		// cheap and easy to check it here to ease the workload on the runtime, so:
-		if !Self::current_phase().is_unsigned_open() {
-			// don't bother submitting; it's not an error, we're just too late.
-			return Ok(());
-		}
+				MinerError::Feasibility(_) => {
+					log!(trace, "wiping infeasible solution.");
+					// kill the infeasible solution, hopefully in the next runs (whenever they
+					// may be) we mine a new one.
+					kill_ocw_solution::<T>();
+					clear_offchain_repeat_frequency();
+					Err(error)
+				},
+				_ => {
+					// nothing to do. Return the error as-is.
+					Err(error)
+				}
+			}
+		})?;
 
-		// in case submission fails for any reason, `submit_call` kills the stored solution
 		Self::submit_call(call)
 	}
 
 	/// Mine a new solution, cache it, and submit it back to the chain as an unsigned transaction.
 	pub fn mine_check_save_submit() -> Result<(), MinerError> {
-		log!(
-			debug,
-			"OCW attempting to compute an unsigned solution for the current election"
-		);
+		log!(debug, "miner attempting to compute an unsigned solution.");
 
-		let (call, _) = Self::mine_checked_call()?;
+		let call = Self::mine_checked_call()?;
 		save_solution(&call)?;
 		Self::submit_call(call)
 	}
 
 	/// Mine a new solution as a call. Performs all checks.
-	fn mine_checked_call() -> Result<(Call<T>, ElectionScore), MinerError> {
+	fn mine_checked_call() -> Result<Call<T>, MinerError> {
 		let iters = Self::get_balancing_iters();
 		// get the solution, with a load of checks to ensure if submitted, IT IS ABSOLUTELY VALID.
 		let (raw_solution, witness) = Self::mine_and_check(iters)?;
@@ -194,38 +209,35 @@ impl<T: Config> Pallet<T> {
 
 		log!(
 			debug,
-			"OCW mined a solution with score {:?} and size {}",
+			"mined a solution with score {:?} and size {}",
 			score,
 			call.using_encoded(|b| b.len())
 		);
 
-		Ok((call, score))
+		Ok(call)
 	}
 
 	fn submit_call(call: Call<T>) -> Result<(), MinerError> {
-		log!(
-			debug,
-			"OCW submitting a solution as an unsigned transaction",
-		);
+		log!(debug, "miner submitting a solution as an unsigned transaction");
 
 		SubmitTransaction::<T, Call<T>>::submit_unsigned_transaction(call.into())
-			.map_err(|_| {
-				kill_ocw_solution::<T>();
-				MinerError::PoolSubmissionFailed
-			})
+			.map_err(|_| MinerError::PoolSubmissionFailed)
 	}
 
 	// perform basic checks of a solution's validity
 	//
 	// Performance: note that it internally clones the provided solution.
-	fn basic_checks(raw_solution: &RawSolution<CompactOf<T>>, solution_type: &str) -> Result<(), MinerError> {
+	fn basic_checks(
+		raw_solution: &RawSolution<CompactOf<T>>,
+		solution_type: &str,
+	) -> Result<(), MinerError> {
 		Self::unsigned_pre_dispatch_checks(raw_solution).map_err(|err| {
-			log!(warn, "pre-dispatch checks fialed for {} solution: {:?}", solution_type, err);
+			log!(debug, "pre-dispatch checks failed for {} solution: {:?}", solution_type, err);
 			MinerError::PreDispatchChecksFailed
 		})?;
 
 		Self::feasibility_check(raw_solution.clone(), ElectionCompute::Unsigned).map_err(|err| {
-			log!(warn, "feasibility check failed for {} solution: {:?}", solution_type, err);
+			log!(debug, "feasibility check failed for {} solution: {:?}", solution_type, err);
 			err
 		})?;
 
@@ -561,18 +573,18 @@ impl<T: Config> Pallet<T> {
 	/// Checks if an execution of the offchain worker is permitted at the given block number, or
 	/// not.
 	///
-	/// This essentially makes sure that we don't run on previous blocks in case of a re-org, and we
-	/// don't run twice within a window of length `threshold`.
+	/// This makes sure that
+	/// 1. we don't run on previous blocks in case of a re-org
+	/// 2. we don't run twice within a window of length `T::OffchainRepeat`.
 	///
-	/// Returns `Ok(())` if offchain worker should happen, `Err(reason)` otherwise.
-	pub(crate) fn try_acquire_offchain_lock(
-		now: T::BlockNumber,
-	) -> Result<(), MinerError> {
+	/// Returns `Ok(())` if offchain worker limit is respected, `Err(reason)` otherwise. If `Ok()`
+	/// is returned, `now` is written in storage and will be used in further calls as the baseline.
+	pub(crate) fn ensure_offchain_repeat_frequency(now: T::BlockNumber) -> Result<(), MinerError> {
 		let threshold = T::OffchainRepeat::get();
-		let storage = StorageValueRef::persistent(&OFFCHAIN_LOCK);
+		let last_block = StorageValueRef::persistent(&OFFCHAIN_LAST_BLOCK);
 
-		let mutate_stat =
-			storage.mutate::<_, &'static str, _>(|maybe_head: Option<Option<T::BlockNumber>>| {
+		let mutate_stat = last_block.mutate::<_, &'static str, _>(
+			|maybe_head: Option<Option<T::BlockNumber>>| {
 				match maybe_head {
 					Some(Some(head)) if now < head => Err("fork."),
 					Some(Some(head)) if now >= head && now <= head + threshold => {
@@ -587,7 +599,8 @@ impl<T: Config> Pallet<T> {
 						Ok(now)
 					}
 				}
-			});
+			},
+		);
 
 		match mutate_stat {
 			// all good
@@ -731,11 +744,13 @@ mod tests {
 		mock::{
 			Call as OuterCall, ExtBuilder, Extrinsic, MinerMaxWeight, MultiPhase, Origin, Runtime,
 			TestCompact, TrimHelpers, roll_to, roll_to_with_ocw, trim_helpers, witness,
+			UnsignedPhase, BlockNumber, System,
 		},
 	};
 	use frame_benchmarking::Zero;
 	use frame_support::{assert_noop, assert_ok, dispatch::Dispatchable, traits::OffchainWorker};
 	use sp_npos_elections::IndexAssignment;
+	use sp_runtime::offchain::storage_lock::{StorageLock, BlockAndTime};
 	use sp_runtime::{traits::ValidateUnsigned, PerU16};
 
 	type Assignment = crate::unsigned::Assignment<Runtime>;
@@ -1052,7 +1067,7 @@ mod tests {
 	}
 
 	#[test]
-	fn ocw_check_prevent_duplicate() {
+	fn ocw_lock_prevents_frequent_execution() {
 		let (mut ext, _) = ExtBuilder::default().build_offchainify(0);
 		ext.execute_with(|| {
 			let offchain_repeat = <Runtime as Config>::OffchainRepeat::get();
@@ -1061,21 +1076,88 @@ mod tests {
 			assert!(MultiPhase::current_phase().is_unsigned());
 
 			// first execution -- okay.
-			assert!(MultiPhase::try_acquire_offchain_lock(25).is_ok());
+			assert!(MultiPhase::ensure_offchain_repeat_frequency(25).is_ok());
 
 			// next block: rejected.
-			assert_noop!(MultiPhase::try_acquire_offchain_lock(26), MinerError::Lock("recently executed."));
+			assert_noop!(
+				MultiPhase::ensure_offchain_repeat_frequency(26),
+				MinerError::Lock("recently executed.")
+			);
 
 			// allowed after `OFFCHAIN_REPEAT`
-			assert!(MultiPhase::try_acquire_offchain_lock((26 + offchain_repeat).into()).is_ok());
+			assert!(
+				MultiPhase::ensure_offchain_repeat_frequency((26 + offchain_repeat).into()).is_ok()
+			);
 
 			// a fork like situation: re-execute last 3.
-			assert!(MultiPhase::try_acquire_offchain_lock((26 + offchain_repeat - 3).into()).is_err());
-			assert!(MultiPhase::try_acquire_offchain_lock((26 + offchain_repeat - 2).into()).is_err());
-			assert!(MultiPhase::try_acquire_offchain_lock((26 + offchain_repeat - 1).into()).is_err());
+			assert!(MultiPhase::ensure_offchain_repeat_frequency(
+				(26 + offchain_repeat - 3).into()
+			)
+			.is_err());
+			assert!(MultiPhase::ensure_offchain_repeat_frequency(
+				(26 + offchain_repeat - 2).into()
+			)
+			.is_err());
+			assert!(MultiPhase::ensure_offchain_repeat_frequency(
+				(26 + offchain_repeat - 1).into()
+			)
+			.is_err());
 		})
 	}
 
+	#[test]
+	fn ocw_lock_released_after_successful_execution() {
+		// first, ensure that a successful execution releases the lock
+		let (mut ext, pool) = ExtBuilder::default().build_offchainify(0);
+		ext.execute_with(|| {
+			let guard = StorageValueRef::persistent(&OFFCHAIN_LOCK);
+			let last_block = StorageValueRef::persistent(OFFCHAIN_LAST_BLOCK);
+
+			roll_to(25);
+			assert!(MultiPhase::current_phase().is_unsigned());
+
+			// initially, the lock is not set.
+			assert!(guard.get::<bool>().is_none());
+
+			// a successful a-z execution.
+			MultiPhase::offchain_worker(25);
+			assert_eq!(pool.read().transactions.len(), 1);
+
+			// afterwards, the lock is not set either..
+			assert!(guard.get::<bool>().is_none());
+			assert_eq!(last_block.get::<BlockNumber>().unwrap().unwrap(), 25);
+		});
+	}
+
+	#[test]
+	fn ocw_lock_prevents_overlapping_execution() {
+		// ensure that if the guard is in hold, a new execution is not allowed.
+		let (mut ext, pool) = ExtBuilder::default().build_offchainify(0);
+		ext.execute_with(|| {
+			roll_to(25);
+			assert!(MultiPhase::current_phase().is_unsigned());
+
+			// artificially set the value, as if another thread is mid-way.
+			let mut lock = StorageLock::<BlockAndTime<System>>::with_block_deadline(
+				OFFCHAIN_LOCK,
+				UnsignedPhase::get().saturated_into(),
+			);
+			let guard = lock.lock();
+
+			// nothing submitted.
+			MultiPhase::offchain_worker(25);
+			assert_eq!(pool.read().transactions.len(), 0);
+			MultiPhase::offchain_worker(26);
+			assert_eq!(pool.read().transactions.len(), 0);
+
+			drop(guard);
+
+			// 🎉 !
+			MultiPhase::offchain_worker(25);
+			assert_eq!(pool.read().transactions.len(), 1);
+		});
+	}
+
 	#[test]
 	fn ocw_only_runs_when_unsigned_open_now() {
 		let (mut ext, pool) = ExtBuilder::default().build_offchainify(0);
@@ -1085,7 +1167,7 @@ mod tests {
 
 			// we must clear the offchain storage to ensure the offchain execution check doesn't get
 			// in the way.
-			let mut storage = StorageValueRef::persistent(&OFFCHAIN_LOCK);
+			let mut storage = StorageValueRef::persistent(&OFFCHAIN_LAST_BLOCK);
 
 			MultiPhase::offchain_worker(24);
 			assert!(pool.read().transactions.len().is_zero());
@@ -1112,7 +1194,7 @@ mod tests {
 
 			// we must clear the offchain storage to ensure the offchain execution check doesn't get
 			// in the way.
-			let mut storage = StorageValueRef::persistent(&OFFCHAIN_LOCK);
+			let mut storage = StorageValueRef::persistent(&OFFCHAIN_LAST_BLOCK);
 			storage.clear();
 
 			assert!(!ocw_solution_exists::<Runtime>(), "no solution should be present before we mine one");
@@ -1143,7 +1225,7 @@ mod tests {
 
 			// we must clear the offchain storage to ensure the offchain execution check doesn't get
 			// in the way.
-			let mut storage = StorageValueRef::persistent(&OFFCHAIN_LOCK);
+			let mut storage = StorageValueRef::persistent(&OFFCHAIN_LAST_BLOCK);
 
 			MultiPhase::offchain_worker(block_plus(-1));
 			assert!(pool.read().transactions.len().is_zero());
@@ -1181,7 +1263,7 @@ mod tests {
 
 			// we must clear the offchain storage to ensure the offchain execution check doesn't get
 			// in the way.
-			let mut storage = StorageValueRef::persistent(&OFFCHAIN_LOCK);
+			let mut storage = StorageValueRef::persistent(&OFFCHAIN_LAST_BLOCK);
 
 			MultiPhase::offchain_worker(block_plus(-1));
 			assert!(pool.read().transactions.len().is_zero());
diff --git a/primitives/runtime/src/offchain/storage_lock.rs b/primitives/runtime/src/offchain/storage_lock.rs
index 4bb979967843..c3e63a7924d7 100644
--- a/primitives/runtime/src/offchain/storage_lock.rs
+++ b/primitives/runtime/src/offchain/storage_lock.rs
@@ -66,6 +66,7 @@ use crate::traits::AtLeast32BitUnsigned;
 use codec::{Codec, Decode, Encode};
 use sp_core::offchain::{Duration, Timestamp};
 use sp_io::offchain;
+use sp_std::fmt;
 
 /// Default expiry duration for time based locks in milliseconds.
 const STORAGE_LOCK_DEFAULT_EXPIRY_DURATION: Duration = Duration::from_millis(20_000);
@@ -173,6 +174,17 @@ impl<B: BlockNumberProvider> Default for BlockAndTimeDeadline<B> {
 	}
 }
 
+impl<B: BlockNumberProvider> fmt::Debug for BlockAndTimeDeadline<B>
+	where <B as BlockNumberProvider>::BlockNumber: fmt::Debug
+{
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		f.debug_struct("BlockAndTimeDeadline")
+			.field("block_number", &self.block_number)
+			.field("timestamp", &self.timestamp)
+			.finish()
+	}
+}
+
 /// Lockable based on block number and timestamp.
 ///
 /// Expiration is defined if both, block number _and_ timestamp

From 965be9f4a37acd89433dfbb885ca431803a3148d Mon Sep 17 00:00:00 2001
From: Andreas Doerr <adoerr@users.noreply.github.com>
Date: Tue, 18 May 2021 16:07:45 +0200
Subject: [PATCH 0755/1194] Add CryptoStore::ecdsa_sign_prehashed() (#8838)

* Pair::sign_prehashed()

* add CryptoStore::ecdsa_sign_prehashed()

* add test for testing keystore

* address review comments
---
 client/keystore/src/local.rs       | 21 +++++++++++++++
 primitives/core/src/ecdsa.rs       | 32 +++++++++++++++++++++-
 primitives/keystore/src/lib.rs     | 28 +++++++++++++++++++
 primitives/keystore/src/testing.rs | 43 +++++++++++++++++++++++++++++-
 4 files changed, 122 insertions(+), 2 deletions(-)

diff --git a/client/keystore/src/local.rs b/client/keystore/src/local.rs
index 482ef407601d..2377ea127756 100644
--- a/client/keystore/src/local.rs
+++ b/client/keystore/src/local.rs
@@ -142,6 +142,15 @@ impl CryptoStore for LocalKeystore {
 	) -> std::result::Result<Option<VRFSignature>, TraitError> {
 		SyncCryptoStore::sr25519_vrf_sign(self, key_type, public, transcript_data)
 	}
+
+	async fn ecdsa_sign_prehashed(
+		&self,
+		id: KeyTypeId,
+		public: &ecdsa::Public,
+		msg: &[u8; 32],
+	) -> std::result::Result<Option<ecdsa::Signature>, TraitError> {
+		SyncCryptoStore::ecdsa_sign_prehashed(self, id, public, msg)
+	}
 }
 
 impl SyncCryptoStore for LocalKeystore {
@@ -301,6 +310,18 @@ impl SyncCryptoStore for LocalKeystore {
 			Ok(None)
 		}
 	}
+
+	fn ecdsa_sign_prehashed(
+		&self,
+		id: KeyTypeId,
+		public: &ecdsa::Public,
+		msg: &[u8; 32],
+	) -> std::result::Result<Option<ecdsa::Signature>, TraitError> {
+		let pair = self.0.read()
+			.key_pair_by_type::<ecdsa::Pair>(public, id)?;
+		
+		pair.map(|k| k.sign_prehashed(msg)).map(Ok).transpose()
+	}
 }
 
 impl Into<SyncCryptoStorePtr> for LocalKeystore {
diff --git a/primitives/core/src/ecdsa.rs b/primitives/core/src/ecdsa.rs
index 2ec10681e77c..60fa7c3e8193 100644
--- a/primitives/core/src/ecdsa.rs
+++ b/primitives/core/src/ecdsa.rs
@@ -531,6 +531,12 @@ impl Pair {
 			Self::from_seed(&padded_seed)
 		})
 	}
+
+	/// Sign a pre-hashed message
+	pub fn sign_prehashed(&self, message: &[u8; 32]) -> Signature {
+		let message = secp256k1::Message::parse(message);
+		secp256k1::sign(&message, &self.secret).into()
+	}
 }
 
 impl CryptoType for Public {
@@ -552,7 +558,7 @@ impl CryptoType for Pair {
 mod test {
 	use super::*;
 	use hex_literal::hex;
-	use crate::crypto::{DEV_PHRASE, set_default_ss58_version};
+	use crate::{crypto::{DEV_PHRASE, set_default_ss58_version}, keccak_256};
 	use serde_json;
 	use crate::crypto::PublicError;
 
@@ -761,4 +767,28 @@ mod test {
 		// Poorly-sized
 		assert!(deserialize_signature("\"abc123\"").is_err());
 	}
+
+	#[test]
+	fn sign_prehashed_works() {
+		let (pair, _, _) = Pair::generate_with_phrase(Some("password"));
+
+		// `msg` shouldn't be mangled
+		let msg = [0u8; 32];
+		let sig1 = pair.sign_prehashed(&msg);
+		let sig2: Signature = secp256k1::sign(&secp256k1::Message::parse(&msg), &pair.secret).into();
+
+		assert_eq!(sig1, sig2);
+
+		// signature is actually different
+		let sig2 = pair.sign(&msg);
+
+		assert_ne!(sig1, sig2);
+
+		// using pre-hashed `msg` works
+		let msg = keccak_256(b"this should be hashed");
+		let sig1 = pair.sign_prehashed(&msg);
+		let sig2: Signature = secp256k1::sign(&secp256k1::Message::parse(&msg), &pair.secret).into();
+
+		assert_eq!(sig1, sig2);		
+	}
 }
diff --git a/primitives/keystore/src/lib.rs b/primitives/keystore/src/lib.rs
index 2fda3a48c5da..352154d82458 100644
--- a/primitives/keystore/src/lib.rs
+++ b/primitives/keystore/src/lib.rs
@@ -194,6 +194,20 @@ pub trait CryptoStore: Send + Sync {
 		public: &sr25519::Public,
 		transcript_data: VRFTranscriptData,
 	) -> Result<Option<VRFSignature>, Error>;
+
+	/// Sign pre-hashed
+	///
+	/// Signs a pre-hashed message with the private key that matches
+	/// the ECDSA public key passed.
+	///
+	/// Returns the SCALE encoded signature if key is found and supported,
+	/// `None` if the key doesn't exist or an error when something failed.
+	async fn ecdsa_sign_prehashed(
+		&self,
+		id: KeyTypeId,
+		public: &ecdsa::Public,
+		msg: &[u8; 32],
+	) -> Result<Option<ecdsa::Signature>, Error>;
 }
 
 /// Sync version of the CryptoStore
@@ -353,6 +367,20 @@ pub trait SyncCryptoStore: CryptoStore + Send + Sync {
 		public: &sr25519::Public,
 		transcript_data: VRFTranscriptData,
 	) -> Result<Option<VRFSignature>, Error>;
+
+	/// Sign pre-hashed
+	///
+	/// Signs a pre-hashed message with the private key that matches
+	/// the ECDSA public key passed.
+	///
+	/// Returns the SCALE encoded signature if key is found and supported,
+	/// `None` if the key doesn't exist or an error when something failed.
+	fn ecdsa_sign_prehashed(
+		&self,
+		id: KeyTypeId,
+		public: &ecdsa::Public,
+		msg: &[u8; 32],
+	) -> Result<Option<ecdsa::Signature>, Error>;
 }
 
 /// A pointer to a keystore.
diff --git a/primitives/keystore/src/testing.rs b/primitives/keystore/src/testing.rs
index caee7178e094..9cc8b8fc64b1 100644
--- a/primitives/keystore/src/testing.rs
+++ b/primitives/keystore/src/testing.rs
@@ -22,6 +22,7 @@ use sp_core::{
 	crypto::{Pair, Public, CryptoTypePublicPair},
 	ed25519, sr25519, ecdsa,
 };
+
 use crate::{
 	{CryptoStore, SyncCryptoStorePtr, Error, SyncCryptoStore},
 	vrf::{VRFTranscriptData, VRFSignature, make_transcript},
@@ -144,6 +145,15 @@ impl CryptoStore for KeyStore {
 	) -> Result<Option<VRFSignature>, Error> {
 		SyncCryptoStore::sr25519_vrf_sign(self, key_type, public, transcript_data)
 	}
+
+	async fn ecdsa_sign_prehashed(
+		&self,
+		id: KeyTypeId,
+		public: &ecdsa::Public,
+		msg: &[u8; 32],
+	) -> Result<Option<ecdsa::Signature>, Error> {
+		SyncCryptoStore::ecdsa_sign_prehashed(self, id, public, msg)
+	}
 }
 
 impl SyncCryptoStore for KeyStore {
@@ -325,6 +335,16 @@ impl SyncCryptoStore for KeyStore {
 			proof,
 		}))
 	}
+
+	fn ecdsa_sign_prehashed(
+		&self,
+		id: KeyTypeId,
+		public: &ecdsa::Public,
+		msg: &[u8; 32],
+	) -> Result<Option<ecdsa::Signature>, Error> {
+		let pair = self.ecdsa_key_pair(id, public);
+		pair.map(|k| k.sign_prehashed(msg)).map(Ok).transpose()
+	}
 }
 
 impl Into<SyncCryptoStorePtr> for KeyStore {
@@ -342,7 +362,7 @@ impl Into<Arc<dyn CryptoStore>> for KeyStore {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use sp_core::{sr25519, testing::{ED25519, SR25519}};
+	use sp_core::{sr25519, testing::{ED25519, SR25519, ECDSA}};
 	use crate::{SyncCryptoStore, vrf::VRFTranscriptValue};
 
 	#[test]
@@ -416,4 +436,25 @@ mod tests {
 
 		assert!(result.unwrap().is_some());
 	}
+
+	#[test]
+	fn ecdsa_sign_prehashed_works() {
+		let store = KeyStore::new();
+
+		let suri = "//Alice";
+		let pair = ecdsa::Pair::from_string(suri, None).unwrap();
+
+		let msg = sp_core::keccak_256(b"this should be a hashed message");
+		
+		// no key in key store
+		let res = SyncCryptoStore::ecdsa_sign_prehashed(&store, ECDSA, &pair.public(), &msg).unwrap();
+		assert!(res.is_none());
+
+		// insert key, sign again
+		let res = SyncCryptoStore::insert_unknown(&store, ECDSA, suri, pair.public().as_ref()).unwrap();
+		assert_eq!((), res);
+
+		let res = SyncCryptoStore::ecdsa_sign_prehashed(&store, ECDSA, &pair.public(), &msg).unwrap();
+		assert!(res.is_some());		
+	}
 }

From f61d2fd69f1cfe884be3db79d7741c67f04a1121 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Wed, 19 May 2021 09:11:11 +0200
Subject: [PATCH 0756/1194] Allow to name the generic for storages in
 `#[pallet::storage]` (#8751)

* implement named generic for storages

* fix error message on unexpected name for generic
---
 .../procedural/src/pallet/expand/storage.rs   | 116 ++++-
 .../procedural/src/pallet/parse/storage.rs    | 476 +++++++++++++++---
 frame/support/src/lib.rs                      |  45 +-
 frame/support/test/tests/pallet.rs            |  23 +-
 ...storage_ensure_span_are_ok_on_wrong_gen.rs |  25 +
 ...age_ensure_span_are_ok_on_wrong_gen.stderr |  33 ++
 ...ensure_span_are_ok_on_wrong_gen_unnamed.rs |  25 +
 ...re_span_are_ok_on_wrong_gen_unnamed.stderr |  33 ++
 .../storage_invalid_first_generic.stderr      |   2 +-
 .../pallet_ui/storage_not_storage_type.stderr |   2 +-
 .../storage_value_duplicate_named_generic.rs  |  23 +
 ...orage_value_duplicate_named_generic.stderr |  11 +
 ...storage_value_generic_named_and_unnamed.rs |  23 +
 ...age_value_generic_named_and_unnamed.stderr |   5 +
 .../pallet_ui/storage_value_no_generic.stderr |   2 +-
 .../storage_value_unexpected_named_generic.rs |  23 +
 ...rage_value_unexpected_named_generic.stderr |  11 +
 .../tests/pallet_ui/storage_wrong_item.stderr |   2 +-
 18 files changed, 745 insertions(+), 135 deletions(-)
 create mode 100644 frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs
 create mode 100644 frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs
 create mode 100644 frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/storage_value_duplicate_named_generic.rs
 create mode 100644 frame/support/test/tests/pallet_ui/storage_value_duplicate_named_generic.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/storage_value_generic_named_and_unnamed.rs
 create mode 100644 frame/support/test/tests/pallet_ui/storage_value_generic_named_and_unnamed.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/storage_value_unexpected_named_generic.rs
 create mode 100644 frame/support/test/tests/pallet_ui/storage_value_unexpected_named_generic.stderr

diff --git a/frame/support/procedural/src/pallet/expand/storage.rs b/frame/support/procedural/src/pallet/expand/storage.rs
index c78e93e1d639..c956425379c5 100644
--- a/frame/support/procedural/src/pallet/expand/storage.rs
+++ b/frame/support/procedural/src/pallet/expand/storage.rs
@@ -16,7 +16,7 @@
 // limitations under the License.
 
 use crate::pallet::Def;
-use crate::pallet::parse::storage::{Metadata, QueryKind};
+use crate::pallet::parse::storage::{Metadata, QueryKind, StorageGenerics};
 use frame_support_procedural_tools::clean_type_string;
 
 /// Generate the prefix_ident related the the storage.
@@ -25,50 +25,112 @@ fn prefix_ident(storage_ident: &syn::Ident) -> syn::Ident {
 	syn::Ident::new(&format!("_GeneratedPrefixForStorage{}", storage_ident), storage_ident.span())
 }
 
-/// * generate StoragePrefix structs (e.g. for a storage `MyStorage` a struct with the name
-///   `_GeneratedPrefixForStorage$NameOfStorage` is generated) and implements StorageInstance trait.
-/// * replace the first generic `_` by the generated prefix structure
-/// * generate metadatas
-pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
+/// * if generics are unnamed: replace the first generic `_` by the generated prefix structure
+/// * if generics are named: reorder the generic, remove their name, and add the missing ones.
+/// * Add `#[allow(type_alias_bounds)]`
+pub fn process_generics(def: &mut Def) {
 	let frame_support = &def.frame_support;
-	let frame_system = &def.frame_system;
-	let pallet_ident = &def.pallet_struct.pallet;
-
-	// Replace first arg `_` by the generated prefix structure.
-	// Add `#[allow(type_alias_bounds)]`
 	for storage_def in def.storages.iter_mut() {
 		let item = &mut def.item.content.as_mut().expect("Checked by def").1[storage_def.index];
 
-		let typ_item = if let syn::Item::Type(t) = item {
-			t
-		} else {
-			unreachable!("Checked by def");
+		let typ_item = match item {
+			syn::Item::Type(t) => t,
+			_ => unreachable!("Checked by def"),
 		};
 
 		typ_item.attrs.push(syn::parse_quote!(#[allow(type_alias_bounds)]));
 
-		let typ_path = if let syn::Type::Path(p) = &mut *typ_item.ty {
-			p
-		} else {
-			unreachable!("Checked by def");
+		let typ_path = match &mut *typ_item.ty {
+			syn::Type::Path(p) => p,
+			_ => unreachable!("Checked by def"),
 		};
 
-		let args = if let syn::PathArguments::AngleBracketed(args) =
-			&mut typ_path.path.segments[0].arguments
-		{
-			args
-		} else {
-			unreachable!("Checked by def");
+		let args = match &mut typ_path.path.segments[0].arguments {
+			syn::PathArguments::AngleBracketed(args) => args,
+			_ => unreachable!("Checked by def"),
 		};
 
+		let prefix_ident = prefix_ident(&storage_def.ident);
 		let type_use_gen = if def.config.has_instance {
 			quote::quote_spanned!(storage_def.attr_span => T, I)
 		} else {
 			quote::quote_spanned!(storage_def.attr_span => T)
 		};
-		let prefix_ident = prefix_ident(&storage_def.ident);
-		args.args[0] = syn::parse_quote!( #prefix_ident<#type_use_gen> );
+
+		let default_query_kind: syn::Type =
+			syn::parse_quote!(#frame_support::storage::types::OptionQuery);
+		let default_on_empty: syn::Type =
+			syn::parse_quote!(#frame_support::traits::GetDefault);
+		let default_max_values: syn::Type =
+			syn::parse_quote!(#frame_support::traits::GetDefault);
+
+		if let Some(named_generics) = storage_def.named_generics.clone() {
+			args.args.clear();
+			args.args.push(syn::parse_quote!( #prefix_ident<#type_use_gen> ));
+			match named_generics {
+				StorageGenerics::Value { value, query_kind, on_empty } => {
+					args.args.push(syn::GenericArgument::Type(value));
+					let query_kind = query_kind.unwrap_or_else(|| default_query_kind.clone());
+					args.args.push(syn::GenericArgument::Type(query_kind));
+					let on_empty = on_empty.unwrap_or_else(|| default_on_empty.clone());
+					args.args.push(syn::GenericArgument::Type(on_empty));
+				}
+				StorageGenerics::Map { hasher, key, value, query_kind, on_empty, max_values } => {
+					args.args.push(syn::GenericArgument::Type(hasher));
+					args.args.push(syn::GenericArgument::Type(key));
+					args.args.push(syn::GenericArgument::Type(value));
+					let query_kind = query_kind.unwrap_or_else(|| default_query_kind.clone());
+					args.args.push(syn::GenericArgument::Type(query_kind));
+					let on_empty = on_empty.unwrap_or_else(|| default_on_empty.clone());
+					args.args.push(syn::GenericArgument::Type(on_empty));
+					let max_values = max_values.unwrap_or_else(|| default_max_values.clone());
+					args.args.push(syn::GenericArgument::Type(max_values));
+				}
+				StorageGenerics::DoubleMap {
+					hasher1, key1, hasher2, key2, value, query_kind, on_empty, max_values,
+				} => {
+					args.args.push(syn::GenericArgument::Type(hasher1));
+					args.args.push(syn::GenericArgument::Type(key1));
+					args.args.push(syn::GenericArgument::Type(hasher2));
+					args.args.push(syn::GenericArgument::Type(key2));
+					args.args.push(syn::GenericArgument::Type(value));
+					let query_kind = query_kind.unwrap_or_else(|| default_query_kind.clone());
+					args.args.push(syn::GenericArgument::Type(query_kind));
+					let on_empty = on_empty.unwrap_or_else(|| default_on_empty.clone());
+					args.args.push(syn::GenericArgument::Type(on_empty));
+					let max_values = max_values.unwrap_or_else(|| default_max_values.clone());
+					args.args.push(syn::GenericArgument::Type(max_values));
+				}
+				StorageGenerics::NMap { keygen, value, query_kind, on_empty, max_values, } => {
+					args.args.push(syn::GenericArgument::Type(keygen));
+					args.args.push(syn::GenericArgument::Type(value));
+					let query_kind = query_kind.unwrap_or_else(|| default_query_kind.clone());
+					args.args.push(syn::GenericArgument::Type(query_kind));
+					let on_empty = on_empty.unwrap_or_else(|| default_on_empty.clone());
+					args.args.push(syn::GenericArgument::Type(on_empty));
+					let max_values = max_values.unwrap_or_else(|| default_max_values.clone());
+					args.args.push(syn::GenericArgument::Type(max_values));
+				}
+			}
+		} else {
+			args.args[0] = syn::parse_quote!( #prefix_ident<#type_use_gen> );
+		}
 	}
+}
+
+/// * generate StoragePrefix structs (e.g. for a storage `MyStorage` a struct with the name
+///   `_GeneratedPrefixForStorage$NameOfStorage` is generated) and implements StorageInstance trait.
+/// * if generics are unnamed: replace the first generic `_` by the generated prefix structure
+/// * if generics are named: reorder the generic, remove their name, and add the missing ones.
+/// * Add `#[allow(type_alias_bounds)]` on storages type alias
+/// * generate metadatas
+pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
+	process_generics(def);
+
+	let frame_support = &def.frame_support;
+	let frame_system = &def.frame_system;
+	let pallet_ident = &def.pallet_struct.pallet;
+
 
 	let entries = def.storages.iter()
 		.map(|storage| {
diff --git a/frame/support/procedural/src/pallet/parse/storage.rs b/frame/support/procedural/src/pallet/parse/storage.rs
index 80c2e10a2520..6b842ab7fa40 100644
--- a/frame/support/procedural/src/pallet/parse/storage.rs
+++ b/frame/support/procedural/src/pallet/parse/storage.rs
@@ -18,6 +18,7 @@
 use super::helper;
 use syn::spanned::Spanned;
 use quote::ToTokens;
+use std::collections::HashMap;
 
 /// List of additional token to be used for parsing.
 mod keyword {
@@ -51,17 +52,17 @@ impl syn::parse::Parse for PalletStorageAttr {
 
 /// The value and key types used by storages. Needed to expand metadata.
 pub enum Metadata {
-	Value { value: syn::GenericArgument },
-	Map { value: syn::GenericArgument, key: syn::GenericArgument },
+	Value { value: syn::Type },
+	Map { value: syn::Type, key: syn::Type },
 	DoubleMap {
-		value: syn::GenericArgument,
-		key1: syn::GenericArgument,
-		key2: syn::GenericArgument
+		value: syn::Type,
+		key1: syn::Type,
+		key2: syn::Type
 	},
 	NMap {
 		keys: Vec<syn::Type>,
-		keygen: syn::GenericArgument,
-		value: syn::GenericArgument,
+		keygen: syn::Type,
+		value: syn::Type,
 	},
 }
 
@@ -98,41 +99,402 @@ pub struct StorageDef {
 	pub attr_span: proc_macro2::Span,
 	/// The `cfg` attributes.
 	pub cfg_attrs: Vec<syn::Attribute>,
+	/// If generics are named (e.g. `StorageValue<Value = u32, ..>`) then this contains all the
+	/// generics of the storage.
+	/// If generics are not named, this is none.
+	pub named_generics: Option<StorageGenerics>,
 }
 
-/// In `Foo<A, B, C>` retrieve the argument at given position, i.e. A is argument at position 0.
-fn retrieve_arg(
+
+/// The parsed generic from the
+#[derive(Clone)]
+pub enum StorageGenerics {
+	DoubleMap {
+		hasher1: syn::Type,
+		key1: syn::Type,
+		hasher2: syn::Type,
+		key2: syn::Type,
+		value: syn::Type,
+		query_kind: Option<syn::Type>,
+		on_empty: Option<syn::Type>,
+		max_values: Option<syn::Type>,
+	},
+	Map {
+		hasher: syn::Type,
+		key: syn::Type,
+		value: syn::Type,
+		query_kind: Option<syn::Type>,
+		on_empty: Option<syn::Type>,
+		max_values: Option<syn::Type>,
+	},
+	Value {
+		value: syn::Type,
+		query_kind: Option<syn::Type>,
+		on_empty: Option<syn::Type>,
+	},
+	NMap {
+		keygen: syn::Type,
+		value: syn::Type,
+		query_kind: Option<syn::Type>,
+		on_empty: Option<syn::Type>,
+		max_values: Option<syn::Type>,
+	},
+}
+
+impl StorageGenerics {
+	/// Return the metadata from the defined generics
+	fn metadata(&self) -> syn::Result<Metadata> {
+		let res = match self.clone() {
+			Self::DoubleMap { value, key1, key2, .. } => Metadata::DoubleMap { value, key1, key2 },
+			Self::Map { value, key, .. } => Metadata::Map { value, key },
+			Self::Value { value, .. } => Metadata::Value { value },
+			Self::NMap { keygen, value, .. } => Metadata::NMap {
+				keys: collect_keys(&keygen)?,
+				keygen,
+				value,
+			},
+		};
+
+		Ok(res)
+	}
+
+	/// Return the query kind from the defined generics
+	fn query_kind(&self) -> Option<syn::Type> {
+		match &self {
+			Self::DoubleMap { query_kind, .. }
+			| Self::Map { query_kind, .. }
+			| Self::Value { query_kind, .. }
+			| Self::NMap { query_kind, .. }
+				=> query_kind.clone(),
+		}
+	}
+}
+
+enum StorageKind {
+	Value,
+	Map,
+	DoubleMap,
+	NMap,
+}
+
+/// Check the generics in the `map` contains the generics in `gen` may contains generics in
+/// `optional_gen`, and doesn't contains any other.
+fn check_generics(
+	map: &HashMap<String, syn::Binding>,
+	mandatory_generics: &[&str],
+	optional_generics: &[&str],
+	storage_type_name: &str,
+	args_span: proc_macro2::Span,
+) -> syn::Result<()> {
+	let mut errors = vec![];
+
+	let expectation = {
+		let mut e = format!(
+			"`{}` expect generics {}and optional generics {}",
+			storage_type_name,
+			mandatory_generics.iter().map(|name| format!("`{}`, ", name)).collect::<String>(),
+			&optional_generics.iter().map(|name| format!("`{}`, ", name)).collect::<String>(),
+		);
+		e.pop();
+		e.pop();
+		e.push_str(".");
+		e
+	};
+
+	for (gen_name, gen_binding) in map {
+		if !mandatory_generics.contains(&gen_name.as_str())
+			&& !optional_generics.contains(&gen_name.as_str())
+		{
+			let msg = format!(
+				"Invalid pallet::storage, Unexpected generic `{}` for `{}`. {}",
+				gen_name,
+				storage_type_name,
+				expectation,
+			);
+			errors.push(syn::Error::new(gen_binding.span(), msg));
+		}
+	}
+
+	for mandatory_generic in mandatory_generics {
+		if !map.contains_key(&mandatory_generic.to_string()) {
+			let msg = format!(
+				"Invalid pallet::storage, cannot find `{}` generic, required for `{}`.",
+				mandatory_generic,
+				storage_type_name
+			);
+			errors.push(syn::Error::new(args_span, msg));
+		}
+	}
+
+	let mut errors = errors.drain(..);
+	if let Some(mut error) = errors.next() {
+		for other_error in errors {
+			error.combine(other_error);
+		}
+		Err(error)
+	} else {
+		Ok(())
+	}
+}
+
+/// Returns `(named generics, metadata, query kind)`
+fn process_named_generics(
+	storage: &StorageKind,
+	args_span: proc_macro2::Span,
+	args: &[syn::Binding],
+) -> syn::Result<(Option<StorageGenerics>, Metadata, Option<syn::Type>)> {
+	let mut parsed = HashMap::<String, syn::Binding>::new();
+
+	// Ensure no duplicate.
+	for arg in args {
+		if let Some(other) = parsed.get(&arg.ident.to_string()) {
+			let msg = "Invalid pallet::storage, Duplicated named generic";
+			let mut err = syn::Error::new(arg.ident.span(), msg);
+			err.combine(syn::Error::new(other.ident.span(), msg));
+			return Err(err);
+		}
+		parsed.insert(arg.ident.to_string(), arg.clone());
+	}
+
+	let generics = match storage {
+		StorageKind::Value => {
+			check_generics(
+				&parsed,
+				&["Value"],
+				&["QueryKind", "OnEmpty"],
+				"StorageValue",
+				args_span,
+			)?;
+
+			StorageGenerics::Value {
+				value: parsed.remove("Value")
+					.map(|binding| binding.ty)
+					.expect("checked above as mandatory generic"),
+				query_kind: parsed.remove("QueryKind")
+					.map(|binding| binding.ty),
+				on_empty: parsed.remove("OnEmpty")
+					.map(|binding| binding.ty),
+			}
+		}
+		StorageKind::Map => {
+			check_generics(
+				&parsed,
+				&["Hasher", "Key", "Value"],
+				&["QueryKind", "OnEmpty", "MaxValues"],
+				"StorageMap",
+				args_span,
+			)?;
+
+			StorageGenerics::Map {
+				hasher: parsed.remove("Hasher")
+					.map(|binding| binding.ty)
+					.expect("checked above as mandatory generic"),
+				key: parsed.remove("Key")
+					.map(|binding| binding.ty)
+					.expect("checked above as mandatory generic"),
+				value: parsed.remove("Value")
+					.map(|binding| binding.ty)
+					.expect("checked above as mandatory generic"),
+				query_kind: parsed.remove("QueryKind").map(|binding| binding.ty),
+				on_empty: parsed.remove("OnEmpty").map(|binding| binding.ty),
+				max_values: parsed.remove("MaxValues").map(|binding| binding.ty),
+			}
+		}
+		StorageKind::DoubleMap => {
+			check_generics(
+				&parsed,
+				&["Hasher1", "Key1", "Hasher2", "Key2", "Value"],
+				&["QueryKind", "OnEmpty", "MaxValues"],
+				"StorageDoubleMap",
+				args_span,
+			)?;
+
+			StorageGenerics::DoubleMap {
+				hasher1: parsed.remove("Hasher1")
+					.map(|binding| binding.ty)
+					.expect("checked above as mandatory generic"),
+				key1: parsed.remove("Key1")
+					.map(|binding| binding.ty)
+					.expect("checked above as mandatory generic"),
+				hasher2: parsed.remove("Hasher2")
+					.map(|binding| binding.ty)
+					.expect("checked above as mandatory generic"),
+				key2: parsed.remove("Key2")
+					.map(|binding| binding.ty)
+					.expect("checked above as mandatory generic"),
+				value: parsed.remove("Value")
+					.map(|binding| binding.ty)
+					.expect("checked above as mandatory generic"),
+				query_kind: parsed.remove("QueryKind").map(|binding| binding.ty),
+				on_empty: parsed.remove("OnEmpty").map(|binding| binding.ty),
+				max_values: parsed.remove("MaxValues").map(|binding| binding.ty),
+			}
+		}
+		StorageKind::NMap => {
+			check_generics(
+				&parsed,
+				&["Key", "Value"],
+				&["QueryKind", "OnEmpty", "MaxValues"],
+				"StorageNMap",
+				args_span,
+			)?;
+
+			StorageGenerics::NMap {
+				keygen: parsed.remove("Key")
+					.map(|binding| binding.ty)
+					.expect("checked above as mandatory generic"),
+				value: parsed.remove("Value")
+					.map(|binding| binding.ty)
+					.expect("checked above as mandatory generic"),
+				query_kind: parsed.remove("QueryKind").map(|binding| binding.ty),
+				on_empty: parsed.remove("OnEmpty").map(|binding| binding.ty),
+				max_values: parsed.remove("MaxValues").map(|binding| binding.ty),
+			}
+		}
+	};
+
+	let metadata = generics.metadata()?;
+	let query_kind = generics.query_kind();
+
+	Ok((Some(generics), metadata, query_kind))
+}
+
+/// Returns `(named generics, metadata, query kind)`
+fn process_unnamed_generics(
+	storage: &StorageKind,
+	args_span: proc_macro2::Span,
+	args: &[syn::Type],
+) -> syn::Result<(Option<StorageGenerics>, Metadata, Option<syn::Type>)> {
+	let retrieve_arg = |arg_pos| {
+		args.get(arg_pos)
+			.cloned()
+			.ok_or_else(|| {
+				let msg = format!(
+					"Invalid pallet::storage, unexpected number of generic argument, \
+						expect at least {} args, found {}.",
+					arg_pos + 1,
+					args.len(),
+				);
+				syn::Error::new(args_span, msg)
+			})
+	};
+
+	let prefix_arg = retrieve_arg(0)?;
+	syn::parse2::<syn::Token![_]>(prefix_arg.to_token_stream())
+		.map_err(|e| {
+			let msg = "Invalid pallet::storage, for unnamed generic arguments the type \
+				first generic argument must be `_`, the argument is then replaced by macro.";
+			let mut err = syn::Error::new(prefix_arg.span(), msg);
+			err.combine(e);
+			err
+		})?;
+
+	let res = match storage {
+		StorageKind::Value => (
+			None,
+			Metadata::Value { value: retrieve_arg(1)? },
+			retrieve_arg(2).ok(),
+		),
+		StorageKind::Map => (
+			None,
+			Metadata::Map {
+				key: retrieve_arg(2)?,
+				value: retrieve_arg(3)?,
+			},
+			retrieve_arg(4).ok(),
+		),
+		StorageKind::DoubleMap => (
+			None,
+			Metadata::DoubleMap {
+				key1: retrieve_arg(2)?,
+				key2: retrieve_arg(4)?,
+				value: retrieve_arg(5)?,
+			},
+			retrieve_arg(6).ok(),
+		),
+		StorageKind::NMap => {
+			let keygen = retrieve_arg(1)?;
+			let keys = collect_keys(&keygen)?;
+			(
+				None,
+				Metadata::NMap {
+					keys,
+					keygen,
+					value: retrieve_arg(2)?,
+				},
+				retrieve_arg(3).ok(),
+			)
+		},
+	};
+
+	Ok(res)
+}
+
+/// Returns `(named generics, metadata, query kind)`
+fn process_generics(
 	segment: &syn::PathSegment,
-	arg_pos: usize,
-) -> syn::Result<syn::GenericArgument> {
-	if let syn::PathArguments::AngleBracketed(args) = &segment.arguments {
-		if arg_pos < args.args.len() {
-			Ok(args.args[arg_pos].clone())
-		} else {
-			let msg = format!("pallet::storage unexpected number of generic argument, expected at \
-				least {} args, found {}", arg_pos + 1, args.args.len());
-			Err(syn::Error::new(args.span(), msg))
+) -> syn::Result<(Option<StorageGenerics>, Metadata, Option<syn::Type>)> {
+	let storage_kind = match &*segment.ident.to_string() {
+		"StorageValue" => StorageKind::Value,
+		"StorageMap" => StorageKind::Map,
+		"StorageDoubleMap" => StorageKind::DoubleMap,
+		"StorageNMap" => StorageKind::NMap,
+		found => {
+			let msg = format!(
+				"Invalid pallet::storage, expected ident: `StorageValue` or \
+				`StorageMap` or `StorageDoubleMap` or `StorageNMap` in order to expand metadata, \
+				found `{}`.",
+				found,
+			);
+			return Err(syn::Error::new(segment.ident.span(), msg));
 		}
+	};
+
+	let args_span = segment.arguments.span();
+
+	let args = match &segment.arguments {
+		syn::PathArguments::AngleBracketed(args) if args.args.len() != 0 => args,
+		_ => {
+			let msg = "Invalid pallet::storage, invalid number of generic generic arguments, \
+				expect more that 0 generic arguments.";
+			return Err(syn::Error::new(segment.span(), msg));
+		}
+	};
+
+	if args.args.iter().all(|gen| matches!(gen, syn::GenericArgument::Type(_))) {
+		let args = args.args.iter()
+			.map(|gen| match gen {
+				syn::GenericArgument::Type(gen) => gen.clone(),
+				_ => unreachable!("It is asserted above that all generics are types"),
+			})
+			.collect::<Vec<_>>();
+		process_unnamed_generics(&storage_kind, args_span, &args)
+	} else if args.args.iter().all(|gen| matches!(gen, syn::GenericArgument::Binding(_))) {
+		let args = args.args.iter()
+			.map(|gen| match gen {
+				syn::GenericArgument::Binding(gen) => gen.clone(),
+				_ => unreachable!("It is asserted above that all generics are bindings"),
+			})
+			.collect::<Vec<_>>();
+		process_named_generics(&storage_kind, args_span, &args)
 	} else {
-		let msg = format!("pallet::storage unexpected number of generic argument, expected at \
-			least {} args, found none", arg_pos + 1);
+		let msg = "Invalid pallet::storage, invalid generic declaration for storage. Expect only \
+			type generics or binding generics, e.g. `<Name1 = Gen1, Name2 = Gen2, ..>` or \
+			`<Gen1, Gen2, ..>`.";
 		Err(syn::Error::new(segment.span(), msg))
 	}
 }
 
 /// Parse the 2nd type argument to `StorageNMap` and return its keys.
-fn collect_keys(keygen: &syn::GenericArgument) -> syn::Result<Vec<syn::Type>> {
-	if let syn::GenericArgument::Type(syn::Type::Tuple(tup)) = keygen {
+fn collect_keys(keygen: &syn::Type) -> syn::Result<Vec<syn::Type>> {
+	if let syn::Type::Tuple(tup) = keygen {
 		tup
 			.elems
 			.iter()
 			.map(extract_key)
 			.collect::<syn::Result<Vec<_>>>()
-	} else if let syn::GenericArgument::Type(ty) = keygen {
-		Ok(vec![extract_key(ty)?])
 	} else {
-		let msg = format!("Invalid pallet::storage, expected tuple of Key structs or Key struct");
-		Err(syn::Error::new(keygen.span(), msg))
+		Ok(vec![extract_key(keygen)?])
 	}
 }
 
@@ -187,7 +549,7 @@ impl StorageDef {
 		let item = if let syn::Item::Type(item) = item {
 			item
 		} else {
-			return Err(syn::Error::new(item.span(), "Invalid pallet::storage, expected item type"));
+			return Err(syn::Error::new(item.span(), "Invalid pallet::storage, expect item type."));
 		};
 
 		let mut attrs: Vec<PalletStorageAttr> = helper::take_item_pallet_attrs(&mut item.attrs)?;
@@ -217,55 +579,14 @@ impl StorageDef {
 			return Err(syn::Error::new(item.ty.span(), msg));
 		}
 
-		let query_kind;
-		let metadata = match &*typ.path.segments[0].ident.to_string() {
-			"StorageValue" => {
-				query_kind = retrieve_arg(&typ.path.segments[0], 2);
-				Metadata::Value {
-					value: retrieve_arg(&typ.path.segments[0], 1)?,
-				}
-			}
-			"StorageMap" => {
-				query_kind = retrieve_arg(&typ.path.segments[0], 4);
-				Metadata::Map {
-					key: retrieve_arg(&typ.path.segments[0], 2)?,
-					value: retrieve_arg(&typ.path.segments[0], 3)?,
-				}
-			}
-			"StorageDoubleMap" => {
-				query_kind = retrieve_arg(&typ.path.segments[0], 6);
-				Metadata::DoubleMap {
-					key1: retrieve_arg(&typ.path.segments[0], 2)?,
-					key2: retrieve_arg(&typ.path.segments[0], 4)?,
-					value: retrieve_arg(&typ.path.segments[0], 5)?,
-				}
-			}
-			"StorageNMap" => {
-				query_kind = retrieve_arg(&typ.path.segments[0], 3);
-				let keygen = retrieve_arg(&typ.path.segments[0], 1)?;
-				let keys = collect_keys(&keygen)?;
-				Metadata::NMap {
-					keys,
-					keygen,
-					value: retrieve_arg(&typ.path.segments[0], 2)?,
-				}
-			}
-			found => {
-				let msg = format!(
-					"Invalid pallet::storage, expected ident: `StorageValue` or \
-					`StorageMap` or `StorageDoubleMap` or `StorageNMap` in order \
-					to expand metadata, found `{}`",
-					found,
-				);
-				return Err(syn::Error::new(item.ty.span(), msg));
-			}
-		};
+		let (named_generics, metadata, query_kind) = process_generics(&typ.path.segments[0])?;
+
 		let query_kind = query_kind
 			.map(|query_kind| match query_kind {
-				syn::GenericArgument::Type(syn::Type::Path(path))
+				syn::Type::Path(path)
 					if path.path.segments.last().map_or(false, |s| s.ident == "OptionQuery")
 				=> Some(QueryKind::OptionQuery),
-				syn::GenericArgument::Type(syn::Type::Path(path))
+				syn::Type::Path(path)
 					if path.path.segments.last().map_or(false, |s| s.ident == "ValueQuery")
 				=> Some(QueryKind::ValueQuery),
 				_ => None,
@@ -279,16 +600,6 @@ impl StorageDef {
 			return Err(syn::Error::new(getter.unwrap().span(), msg));
 		}
 
-		let prefix_arg = retrieve_arg(&typ.path.segments[0], 0)?;
-		syn::parse2::<syn::Token![_]>(prefix_arg.to_token_stream())
-			.map_err(|e| {
-				let msg = "Invalid use of `#[pallet::storage]`, the type first generic argument \
-					must be `_`, the final argument is automatically set by macro.";
-				let mut err = syn::Error::new(prefix_arg.span(), msg);
-				err.combine(e);
-				err
-			})?;
-
 		Ok(StorageDef {
 			attr_span,
 			index,
@@ -301,6 +612,7 @@ impl StorageDef {
 			query_kind,
 			where_clause,
 			cfg_attrs,
+			named_generics,
 		})
 	}
 }
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 0f96cdd02319..cc7bd2126c0c 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -1586,11 +1586,28 @@ pub mod pallet_prelude {
 /// #[pallet::storage]
 /// #[pallet::getter(fn $getter_name)] // optional
 /// $vis type $StorageName<$some_generic> $optional_where_clause
+/// 	= $StorageType<$generic_name = $some_generics, $other_name = $some_other, ...>;
+/// ```
+/// or with unnamed generic
+/// ```ignore
+/// #[pallet::storage]
+/// #[pallet::getter(fn $getter_name)] // optional
+/// $vis type $StorageName<$some_generic> $optional_where_clause
 /// 	= $StorageType<_, $some_generics, ...>;
 /// ```
 /// I.e. it must be a type alias, with generics: `T` or `T: Config`, aliased type must be one
 /// of `StorageValue`, `StorageMap` or `StorageDoubleMap` (defined in frame_support).
-/// Their first generic must be `_` as it is written by the macro itself.
+/// The generic arguments of the storage type can be given in two manner: named and unnamed.
+/// For named generic argument: the name for each argument is the one as define on the storage
+/// struct:
+/// * [`pallet_prelude::StorageValue`] expect `Value` and optionally `QueryKind` and `OnEmpty`,
+/// * [`pallet_prelude::StorageMap`] expect `Hasher`, `Key`, `Value` and optionally `QueryKind` and
+///   `OnEmpty`,
+/// * [`pallet_prelude::StorageDoubleMap`] expect `Hasher1`, `Key1`, `Hasher2`, `Key2`, `Value` and
+///   optionally `QueryKind` and `OnEmpty`.
+///
+/// For unnamed generic argument: Their first generic must be `_` as it is replaced by the macro
+/// and other generic must declared as a normal declaration of type generic in rust.
 ///
 /// The Prefix generic written by the macro is generated using `PalletInfo::name::<Pallet<..>>()`
 /// and the name of the storage type.
@@ -1604,6 +1621,12 @@ pub mod pallet_prelude {
 /// ```ignore
 /// #[pallet::storage]
 /// #[pallet::getter(fn my_storage)]
+/// pub(super) type MyStorage<T> = StorageMap<Hasher = Blake2_128Concat, Key = u32, Value = u32>;
+/// ```
+/// or
+/// ```ignore
+/// #[pallet::storage]
+/// #[pallet::getter(fn my_storage)]
 /// pub(super) type MyStorage<T> = StorageMap<_, Blake2_128Concat, u32, u32>;
 /// ```
 ///
@@ -1613,7 +1636,7 @@ pub mod pallet_prelude {
 /// ```ignore
 /// #[cfg(feature = "my-feature")]
 /// #[pallet::storage]
-/// pub(super) type MyStorage<T> = StorageValue<_, u32>;
+/// pub(super) type MyStorage<T> = StorageValue<Value = u32>;
 /// ```
 ///
 /// All the `cfg` attributes are automatically copied to the items generated for the storage, i.e. the
@@ -1630,10 +1653,11 @@ pub mod pallet_prelude {
 /// ### Macro expansion
 ///
 /// For each storage item the macro generates a struct named
-/// `_GeneratedPrefixForStorage$NameOfStorage`, and implements [`StorageInstance`](traits::StorageInstance)
-/// on it using the pallet and storage name. It then uses it as the first generic of the aliased
-/// type.
+/// `_GeneratedPrefixForStorage$NameOfStorage`, and implements
+/// [`StorageInstance`](traits::StorageInstance) on it using the pallet and storage name. It then
+/// uses it as the first generic of the aliased type.
 ///
+/// For named generic, the macro will reorder the generics, and remove the names.
 ///
 /// The macro implements the function `storage_metadata` on `Pallet` implementing the metadata for
 /// all storage items based on their kind:
@@ -1915,12 +1939,13 @@ pub mod pallet_prelude {
 /// 	// storage item. Thus generic hasher is supported.
 /// 	#[pallet::storage]
 /// 	pub(super) type MyStorageValue<T: Config> =
-/// 		StorageValue<_, T::Balance, ValueQuery, MyDefault<T>>;
+/// 		StorageValue<Value = T::Balance, QueryKind = ValueQuery, OnEmpty = MyDefault<T>>;
 ///
 /// 	// Another storage declaration
 /// 	#[pallet::storage]
 /// 	#[pallet::getter(fn my_storage)]
-/// 	pub(super) type MyStorage<T> = StorageMap<_, Blake2_128Concat, u32, u32>;
+/// 	pub(super) type MyStorage<T> =
+/// 		StorageMap<Hasher = Blake2_128Concat, Key = u32, Value = u32>;
 ///
 /// 	// Declare the genesis config (optional).
 /// 	//
@@ -2057,12 +2082,12 @@ pub mod pallet_prelude {
 ///
 /// 	#[pallet::storage]
 /// 	pub(super) type MyStorageValue<T: Config<I>, I: 'static = ()> =
-/// 		StorageValue<_, T::Balance, ValueQuery, MyDefault<T, I>>;
+/// 		StorageValue<Value = T::Balance, QueryKind = ValueQuery, OnEmpty = MyDefault<T, I>>;
 ///
 /// 	#[pallet::storage]
 /// 	#[pallet::getter(fn my_storage)]
 /// 	pub(super) type MyStorage<T, I = ()> =
-/// 		StorageMap<_, Blake2_128Concat, u32, u32>;
+/// 		StorageMap<Hasher = Blake2_128Concat, Key = u32, Value = u32>;
 ///
 /// 	#[pallet::genesis_config]
 /// 	#[derive(Default)]
@@ -2234,7 +2259,7 @@ pub mod pallet_prelude {
 /// 		```ignore
 /// 		#[pallet::type_value] fn MyStorageOnEmpty() -> u32 { 3u32 }
 /// 		#[pallet::storage]
-/// 		pub(super) type MyStorage<T> = StorageValue<u32, ValueQuery, MyStorageOnEmpty>;
+/// 		pub(super) type MyStorage<T> = StorageValue<_, u32, ValueQuery, MyStorageOnEmpty>;
 /// 		```
 ///
 /// 	NOTE: `decl_storage` also generates functions `assimilate_storage` and `build_storage`
diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index 0a768c79e779..cc3d83f47232 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -196,7 +196,7 @@ pub mod pallet {
 		StorageValue<_, <T::AccountId as SomeAssociation2>::_2>;
 
 	#[pallet::storage]
-	pub type Value<T> = StorageValue<_, u32>;
+	pub type Value<T> = StorageValue<Value = u32>;
 
 	#[pallet::type_value]
 	pub fn MyDefault<T: Config>() -> u16
@@ -211,14 +211,19 @@ pub mod pallet {
 		StorageMap<_, Blake2_128Concat, u8, u16, ValueQuery, MyDefault<T>>;
 
 	#[pallet::storage]
-	pub type Map2<T> = StorageMap<_, Twox64Concat, u16, u32, OptionQuery, GetDefault, ConstU32<3>>;
+	pub type Map2<T> = StorageMap<
+		Hasher = Twox64Concat, Key = u16, Value = u32, MaxValues = ConstU32<3>
+	>;
 
 	#[pallet::storage]
 	pub type DoubleMap<T> = StorageDoubleMap<_, Blake2_128Concat, u8, Twox64Concat, u16, u32>;
 
 	#[pallet::storage]
 	pub type DoubleMap2<T> = StorageDoubleMap<
-		_, Twox64Concat, u16, Blake2_128Concat, u32, u64, OptionQuery, GetDefault, ConstU32<5>,
+		Hasher1 = Twox64Concat, Key1 = u16,
+		Hasher2 = Blake2_128Concat, Key2 = u32,
+		Value = u64,
+		MaxValues = ConstU32<5>,
 	>;
 
 	#[pallet::storage]
@@ -228,15 +233,9 @@ pub mod pallet {
 	#[pallet::storage]
 	#[pallet::getter(fn nmap2)]
 	pub type NMap2<T> = StorageNMap<
-		_,
-		(
-			NMapKey<Twox64Concat, u16>,
-			NMapKey<Blake2_128Concat, u32>,
-		),
-		u64,
-		OptionQuery,
-		GetDefault,
-		ConstU32<11>,
+		Key = (NMapKey<Twox64Concat, u16>, NMapKey<Blake2_128Concat, u32>),
+		Value = u64,
+		MaxValues = ConstU32<11>,
 	>;
 
 	#[pallet::storage]
diff --git a/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs b/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs
new file mode 100644
index 000000000000..30b6d651f3b8
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs
@@ -0,0 +1,25 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::{Hooks, StorageValue};
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	struct Bar;
+
+	#[pallet::storage]
+	type Foo<T> = StorageValue<Value = Bar>;
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.stderr b/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.stderr
new file mode 100644
index 000000000000..e2802b5e545f
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.stderr
@@ -0,0 +1,33 @@
+error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
+  --> $DIR/storage_ensure_span_are_ok_on_wrong_gen.rs:20:12
+   |
+20 |     #[pallet::storage]
+   |               ^^^^^^^ the trait `WrapperTypeDecode` is not implemented for `Bar`
+   |
+   = note: required because of the requirements on the impl of `Decode` for `Bar`
+   = note: required because of the requirements on the impl of `FullCodec` for `Bar`
+   = note: required because of the requirements on the impl of `StorageValueMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+   = note: required by `frame_support::storage::types::StorageValueMetadata::NAME`
+
+error[E0277]: the trait bound `Bar: EncodeLike` is not satisfied
+  --> $DIR/storage_ensure_span_are_ok_on_wrong_gen.rs:20:12
+   |
+20 |     #[pallet::storage]
+   |               ^^^^^^^ the trait `EncodeLike` is not implemented for `Bar`
+   |
+   = note: required because of the requirements on the impl of `FullEncode` for `Bar`
+   = note: required because of the requirements on the impl of `FullCodec` for `Bar`
+   = note: required because of the requirements on the impl of `StorageValueMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+   = note: required by `frame_support::storage::types::StorageValueMetadata::NAME`
+
+error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
+  --> $DIR/storage_ensure_span_are_ok_on_wrong_gen.rs:20:12
+   |
+20 |     #[pallet::storage]
+   |               ^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `Bar`
+   |
+   = note: required because of the requirements on the impl of `pallet::_::_parity_scale_codec::Encode` for `Bar`
+   = note: required because of the requirements on the impl of `FullEncode` for `Bar`
+   = note: required because of the requirements on the impl of `FullCodec` for `Bar`
+   = note: required because of the requirements on the impl of `StorageValueMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+   = note: required by `frame_support::storage::types::StorageValueMetadata::NAME`
diff --git a/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs b/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs
new file mode 100644
index 000000000000..ddb19121660d
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs
@@ -0,0 +1,25 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::{Hooks, StorageValue};
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	struct Bar;
+
+	#[pallet::storage]
+	type Foo<T> = StorageValue<_, Bar>;
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.stderr b/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.stderr
new file mode 100644
index 000000000000..e54a8c227eea
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.stderr
@@ -0,0 +1,33 @@
+error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
+  --> $DIR/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:20:12
+   |
+20 |     #[pallet::storage]
+   |               ^^^^^^^ the trait `WrapperTypeDecode` is not implemented for `Bar`
+   |
+   = note: required because of the requirements on the impl of `Decode` for `Bar`
+   = note: required because of the requirements on the impl of `FullCodec` for `Bar`
+   = note: required because of the requirements on the impl of `StorageValueMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+   = note: required by `frame_support::storage::types::StorageValueMetadata::NAME`
+
+error[E0277]: the trait bound `Bar: EncodeLike` is not satisfied
+  --> $DIR/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:20:12
+   |
+20 |     #[pallet::storage]
+   |               ^^^^^^^ the trait `EncodeLike` is not implemented for `Bar`
+   |
+   = note: required because of the requirements on the impl of `FullEncode` for `Bar`
+   = note: required because of the requirements on the impl of `FullCodec` for `Bar`
+   = note: required because of the requirements on the impl of `StorageValueMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+   = note: required by `frame_support::storage::types::StorageValueMetadata::NAME`
+
+error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
+  --> $DIR/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:20:12
+   |
+20 |     #[pallet::storage]
+   |               ^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `Bar`
+   |
+   = note: required because of the requirements on the impl of `pallet::_::_parity_scale_codec::Encode` for `Bar`
+   = note: required because of the requirements on the impl of `FullEncode` for `Bar`
+   = note: required because of the requirements on the impl of `FullCodec` for `Bar`
+   = note: required because of the requirements on the impl of `StorageValueMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+   = note: required by `frame_support::storage::types::StorageValueMetadata::NAME`
diff --git a/frame/support/test/tests/pallet_ui/storage_invalid_first_generic.stderr b/frame/support/test/tests/pallet_ui/storage_invalid_first_generic.stderr
index d332e6c2d3d1..b37f7e57f355 100644
--- a/frame/support/test/tests/pallet_ui/storage_invalid_first_generic.stderr
+++ b/frame/support/test/tests/pallet_ui/storage_invalid_first_generic.stderr
@@ -1,4 +1,4 @@
-error: Invalid use of `#[pallet::storage]`, the type first generic argument must be `_`, the final argument is automatically set by macro.
+error: Invalid pallet::storage, for unnamed generic arguments the type first generic argument must be `_`, the argument is then replaced by macro.
   --> $DIR/storage_invalid_first_generic.rs:19:29
    |
 19 |     type Foo<T> = StorageValue<u8, u8>;
diff --git a/frame/support/test/tests/pallet_ui/storage_not_storage_type.stderr b/frame/support/test/tests/pallet_ui/storage_not_storage_type.stderr
index 73fda6094247..4fd59183282d 100644
--- a/frame/support/test/tests/pallet_ui/storage_not_storage_type.stderr
+++ b/frame/support/test/tests/pallet_ui/storage_not_storage_type.stderr
@@ -1,4 +1,4 @@
-error: Invalid pallet::storage, expected ident: `StorageValue` or `StorageMap` or `StorageDoubleMap` or `StorageNMap` in order to expand metadata, found `u8`
+error: Invalid pallet::storage, expected ident: `StorageValue` or `StorageMap` or `StorageDoubleMap` or `StorageNMap` in order to expand metadata, found `u8`.
   --> $DIR/storage_not_storage_type.rs:19:16
    |
 19 |     type Foo<T> = u8;
diff --git a/frame/support/test/tests/pallet_ui/storage_value_duplicate_named_generic.rs b/frame/support/test/tests/pallet_ui/storage_value_duplicate_named_generic.rs
new file mode 100644
index 000000000000..1f076b1ecbfc
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/storage_value_duplicate_named_generic.rs
@@ -0,0 +1,23 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::{Hooks, StorageValue};
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::storage]
+	type Foo<T> = StorageValue<Value = u32, Value = u32>;
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/storage_value_duplicate_named_generic.stderr b/frame/support/test/tests/pallet_ui/storage_value_duplicate_named_generic.stderr
new file mode 100644
index 000000000000..3def9061fec8
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/storage_value_duplicate_named_generic.stderr
@@ -0,0 +1,11 @@
+error: Invalid pallet::storage, Duplicated named generic
+  --> $DIR/storage_value_duplicate_named_generic.rs:19:42
+   |
+19 |     type Foo<T> = StorageValue<Value = u32, Value = u32>;
+   |                                             ^^^^^
+
+error: Invalid pallet::storage, Duplicated named generic
+  --> $DIR/storage_value_duplicate_named_generic.rs:19:29
+   |
+19 |     type Foo<T> = StorageValue<Value = u32, Value = u32>;
+   |                                ^^^^^
diff --git a/frame/support/test/tests/pallet_ui/storage_value_generic_named_and_unnamed.rs b/frame/support/test/tests/pallet_ui/storage_value_generic_named_and_unnamed.rs
new file mode 100644
index 000000000000..fd0ea4794bc4
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/storage_value_generic_named_and_unnamed.rs
@@ -0,0 +1,23 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::{Hooks, StorageValue, OptionQuery};
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::storage]
+	type Foo<T> = StorageValue<u32, QueryKind = OptionQuery>;
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/storage_value_generic_named_and_unnamed.stderr b/frame/support/test/tests/pallet_ui/storage_value_generic_named_and_unnamed.stderr
new file mode 100644
index 000000000000..61c01943cc3f
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/storage_value_generic_named_and_unnamed.stderr
@@ -0,0 +1,5 @@
+error: Invalid pallet::storage, invalid generic declaration for storage. Expect only type generics or binding generics, e.g. `<Name1 = Gen1, Name2 = Gen2, ..>` or `<Gen1, Gen2, ..>`.
+  --> $DIR/storage_value_generic_named_and_unnamed.rs:19:16
+   |
+19 |     type Foo<T> = StorageValue<u32, QueryKind = OptionQuery>;
+   |                   ^^^^^^^^^^^^
diff --git a/frame/support/test/tests/pallet_ui/storage_value_no_generic.stderr b/frame/support/test/tests/pallet_ui/storage_value_no_generic.stderr
index 894f7095b2b5..f7449c5ffda7 100644
--- a/frame/support/test/tests/pallet_ui/storage_value_no_generic.stderr
+++ b/frame/support/test/tests/pallet_ui/storage_value_no_generic.stderr
@@ -1,4 +1,4 @@
-error: pallet::storage unexpected number of generic argument, expected at least 2 args, found none
+error: Invalid pallet::storage, invalid number of generic generic arguments, expect more that 0 generic arguments.
   --> $DIR/storage_value_no_generic.rs:19:16
    |
 19 |     type Foo<T> = StorageValue;
diff --git a/frame/support/test/tests/pallet_ui/storage_value_unexpected_named_generic.rs b/frame/support/test/tests/pallet_ui/storage_value_unexpected_named_generic.rs
new file mode 100644
index 000000000000..a3e54448e42a
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/storage_value_unexpected_named_generic.rs
@@ -0,0 +1,23 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::{Hooks, StorageValue};
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::storage]
+	type Foo<T> = StorageValue<P = u32>;
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/storage_value_unexpected_named_generic.stderr b/frame/support/test/tests/pallet_ui/storage_value_unexpected_named_generic.stderr
new file mode 100644
index 000000000000..f03b71ff5eb6
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/storage_value_unexpected_named_generic.stderr
@@ -0,0 +1,11 @@
+error: Invalid pallet::storage, Unexpected generic `P` for `StorageValue`. `StorageValue` expect generics `Value`, and optional generics `QueryKind`, `OnEmpty`.
+  --> $DIR/storage_value_unexpected_named_generic.rs:19:29
+   |
+19 |     type Foo<T> = StorageValue<P = u32>;
+   |                                ^
+
+error: Invalid pallet::storage, cannot find `Value` generic, required for `StorageValue`.
+  --> $DIR/storage_value_unexpected_named_generic.rs:19:28
+   |
+19 |     type Foo<T> = StorageValue<P = u32>;
+   |                               ^
diff --git a/frame/support/test/tests/pallet_ui/storage_wrong_item.stderr b/frame/support/test/tests/pallet_ui/storage_wrong_item.stderr
index 8cc180b5bfe4..d875d8acec66 100644
--- a/frame/support/test/tests/pallet_ui/storage_wrong_item.stderr
+++ b/frame/support/test/tests/pallet_ui/storage_wrong_item.stderr
@@ -1,4 +1,4 @@
-error: Invalid pallet::storage, expected item type
+error: Invalid pallet::storage, expect item type.
   --> $DIR/storage_wrong_item.rs:19:2
    |
 19 |     impl Foo {}

From 10cd9ce0af2a34b43fbd24f2c0997c4e3b82eead Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Wed, 19 May 2021 10:29:32 +0200
Subject: [PATCH 0757/1194] Make wasmtime the default when the feature is
 enabled (#8855)

* Make wasmtime the default when the feature is enabled

* Update client/cli/src/arg_enums.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
---
 client/cli/src/arg_enums.rs             | 62 ++++++++++++++++++-------
 client/cli/src/params/import_params.rs  | 11 +++--
 utils/frame/benchmarking-cli/src/lib.rs |  2 +-
 utils/frame/try-runtime/cli/src/lib.rs  |  2 +-
 4 files changed, 55 insertions(+), 22 deletions(-)

diff --git a/client/cli/src/arg_enums.rs b/client/cli/src/arg_enums.rs
index aeb3eeacc6f2..fb2f8fdbc21d 100644
--- a/client/cli/src/arg_enums.rs
+++ b/client/cli/src/arg_enums.rs
@@ -20,26 +20,54 @@
 
 use structopt::clap::arg_enum;
 
-arg_enum! {
-	/// How to execute Wasm runtime code
-	#[allow(missing_docs)]
-	#[derive(Debug, Clone, Copy)]
-	pub enum WasmExecutionMethod {
-		// Uses an interpreter.
-		Interpreted,
-		// Uses a compiled runtime.
-		Compiled,
+/// How to execute Wasm runtime code.
+#[derive(Debug, Clone, Copy)]
+pub enum WasmExecutionMethod {
+	/// Uses an interpreter.
+	Interpreted,
+	/// Uses a compiled runtime.
+	Compiled,
+}
+
+impl std::fmt::Display for WasmExecutionMethod {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		match self {
+			Self::Interpreted => write!(f, "Interpreted"),
+			Self::Compiled => write!(f, "Compiled"),
+		}
+	}
+}
+
+impl std::str::FromStr for WasmExecutionMethod {
+	type Err = String;
+
+	fn from_str(s: &str) -> Result<Self, String> {
+		if s.eq_ignore_ascii_case("interpreted-i-know-what-i-do") {
+			Ok(Self::Interpreted)
+		} else if s.eq_ignore_ascii_case("compiled") {
+			#[cfg(feature = "wasmtime")]
+			{
+				Ok(Self::Compiled)
+			}
+			#[cfg(not(feature = "wasmtime"))]
+			{
+				Err(format!("`Compiled` variant requires the `wasmtime` feature to be enabled"))
+			}
+		} else {
+			Err(format!("Unknown variant `{}`, known variants: {:?}", s, Self::variants()))
+		}
 	}
 }
 
 impl WasmExecutionMethod {
-	/// Returns list of variants that are not disabled by feature flags.
-	pub fn enabled_variants() -> Vec<&'static str> {
-		Self::variants()
-			.iter()
-			.cloned()
-			.filter(|&name| cfg!(feature = "wasmtime") || name != "Compiled")
-			.collect()
+	/// Returns all the variants of this enum to be shown in the cli.
+	pub fn variants() -> &'static [&'static str] {
+		let variants = &["interpreted-i-know-what-i-do", "compiled"];
+		if cfg!(feature = "wasmtime") {
+			variants
+		} else {
+			&variants[..1]
+		}
 	}
 }
 
@@ -181,7 +209,7 @@ impl std::str::FromStr for Database {
 		} else if s.eq_ignore_ascii_case("paritydb-experimental") {
 			Ok(Self::ParityDb)
 		} else {
-			Err(format!("Unknwon variant `{}`, known variants: {:?}", s, Self::variants()))
+			Err(format!("Unknown variant `{}`, known variants: {:?}", s, Self::variants()))
 		}
 	}
 }
diff --git a/client/cli/src/params/import_params.rs b/client/cli/src/params/import_params.rs
index a1d8c1f8834c..a62ec98a9702 100644
--- a/client/cli/src/params/import_params.rs
+++ b/client/cli/src/params/import_params.rs
@@ -27,6 +27,12 @@ use sc_client_api::execution_extensions::ExecutionStrategies;
 use structopt::StructOpt;
 use std::path::PathBuf;
 
+#[cfg(feature = "wasmtime")]
+const WASM_METHOD_DEFAULT: &str = "Compiled";
+
+#[cfg(not(feature = "wasmtime"))]
+const WASM_METHOD_DEFAULT: &str = "interpreted-i-know-what-i-do";
+
 /// Parameters for block import.
 #[derive(Debug, StructOpt, Clone)]
 pub struct ImportParams {
@@ -50,9 +56,9 @@ pub struct ImportParams {
 	#[structopt(
 		long = "wasm-execution",
 		value_name = "METHOD",
-		possible_values = &WasmExecutionMethod::enabled_variants(),
+		possible_values = &WasmExecutionMethod::variants(),
 		case_insensitive = true,
-		default_value = "Interpreted"
+		default_value = WASM_METHOD_DEFAULT
 	)]
 	pub wasm_method: WasmExecutionMethod,
 
@@ -76,7 +82,6 @@ pub struct ImportParams {
 }
 
 impl ImportParams {
-
 	/// Specify the state cache size.
 	pub fn state_cache_size(&self) -> usize {
 		self.state_cache_size
diff --git a/utils/frame/benchmarking-cli/src/lib.rs b/utils/frame/benchmarking-cli/src/lib.rs
index 9862a5a5b82a..38dabd8c9415 100644
--- a/utils/frame/benchmarking-cli/src/lib.rs
+++ b/utils/frame/benchmarking-cli/src/lib.rs
@@ -118,7 +118,7 @@ pub struct BenchmarkCmd {
 	#[structopt(
 		long = "wasm-execution",
 		value_name = "METHOD",
-		possible_values = &WasmExecutionMethod::enabled_variants(),
+		possible_values = &WasmExecutionMethod::variants(),
 		case_insensitive = true,
 		default_value = "Interpreted"
 	)]
diff --git a/utils/frame/try-runtime/cli/src/lib.rs b/utils/frame/try-runtime/cli/src/lib.rs
index 4d265c099597..9e41a3fd87e7 100644
--- a/utils/frame/try-runtime/cli/src/lib.rs
+++ b/utils/frame/try-runtime/cli/src/lib.rs
@@ -51,7 +51,7 @@ pub struct TryRuntimeCmd {
 	#[structopt(
 		long = "wasm-execution",
 		value_name = "METHOD",
-		possible_values = &WasmExecutionMethod::enabled_variants(),
+		possible_values = &WasmExecutionMethod::variants(),
 		case_insensitive = true,
 		default_value = "Interpreted"
 	)]

From 09f14050eed5455d8116866d98605de4c2f95df1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Wed, 19 May 2021 10:37:42 +0200
Subject: [PATCH 0758/1194] Improve `impl_opaque_keys!` (#8856)

The macro should assume less about the scope where it is being used in.
In this case it is about not assuming that the crate where the macro is
called in provides a `std` feature.
---
 primitives/runtime/src/traits.rs | 133 +++++++++++++++++++++----------
 1 file changed, 91 insertions(+), 42 deletions(-)

diff --git a/primitives/runtime/src/traits.rs b/primitives/runtime/src/traits.rs
index 41820d8cb4a1..22f6cb044a00 100644
--- a/primitives/runtime/src/traits.rs
+++ b/primitives/runtime/src/traits.rs
@@ -1183,31 +1183,9 @@ macro_rules! count {
 	};
 }
 
-/// Implement `OpaqueKeys` for a described struct.
-///
-/// Every field type must implement [`BoundToRuntimeAppPublic`](crate::BoundToRuntimeAppPublic).
-/// `KeyTypeIdProviders` is set to the types given as fields.
-///
-/// ```rust
-/// use sp_runtime::{
-/// 	impl_opaque_keys, KeyTypeId, BoundToRuntimeAppPublic, app_crypto::{sr25519, ed25519}
-/// };
-///
-/// pub struct KeyModule;
-/// impl BoundToRuntimeAppPublic for KeyModule { type Public = ed25519::AppPublic; }
-///
-/// pub struct KeyModule2;
-/// impl BoundToRuntimeAppPublic for KeyModule2 { type Public = sr25519::AppPublic; }
-///
-/// impl_opaque_keys! {
-/// 	pub struct Keys {
-/// 		pub key_module: KeyModule,
-/// 		pub key_module2: KeyModule2,
-/// 	}
-/// }
-/// ```
+#[doc(hidden)]
 #[macro_export]
-macro_rules! impl_opaque_keys {
+macro_rules! impl_opaque_keys_inner {
 	(
 		$( #[ $attr:meta ] )*
 		pub struct $name:ident {
@@ -1217,24 +1195,18 @@ macro_rules! impl_opaque_keys {
 			)*
 		}
 	) => {
-		$crate::paste::paste! {
-			#[cfg(feature = "std")]
-			use $crate::serde as [< __opaque_keys_serde_import__ $name >];
-			$( #[ $attr ] )*
-				#[derive(
-					Default, Clone, PartialEq, Eq,
-					$crate::codec::Encode,
-					$crate::codec::Decode,
-					$crate::RuntimeDebug,
-				)]
-			#[cfg_attr(feature = "std", derive($crate::serde::Serialize, $crate::serde::Deserialize))]
-			#[cfg_attr(feature = "std", serde(crate = "__opaque_keys_serde_import__" $name))]
-			pub struct $name {
-				$(
-					$( #[ $inner_attr ] )*
-						pub $field: <$type as $crate::BoundToRuntimeAppPublic>::Public,
-				)*
-			}
+		$( #[ $attr ] )*
+		#[derive(
+			Default, Clone, PartialEq, Eq,
+			$crate::codec::Encode,
+			$crate::codec::Decode,
+			$crate::RuntimeDebug,
+		)]
+		pub struct $name {
+			$(
+				$( #[ $inner_attr ] )*
+				pub $field: <$type as $crate::BoundToRuntimeAppPublic>::Public,
+			)*
 		}
 
 		impl $name {
@@ -1320,6 +1292,83 @@ macro_rules! impl_opaque_keys {
 	};
 }
 
+/// Implement `OpaqueKeys` for a described struct.
+///
+/// Every field type must implement [`BoundToRuntimeAppPublic`](crate::BoundToRuntimeAppPublic).
+/// `KeyTypeIdProviders` is set to the types given as fields.
+///
+/// ```rust
+/// use sp_runtime::{
+/// 	impl_opaque_keys, KeyTypeId, BoundToRuntimeAppPublic, app_crypto::{sr25519, ed25519}
+/// };
+///
+/// pub struct KeyModule;
+/// impl BoundToRuntimeAppPublic for KeyModule { type Public = ed25519::AppPublic; }
+///
+/// pub struct KeyModule2;
+/// impl BoundToRuntimeAppPublic for KeyModule2 { type Public = sr25519::AppPublic; }
+///
+/// impl_opaque_keys! {
+/// 	pub struct Keys {
+/// 		pub key_module: KeyModule,
+/// 		pub key_module2: KeyModule2,
+/// 	}
+/// }
+/// ```
+#[macro_export]
+#[cfg(feature = "std")]
+macro_rules! impl_opaque_keys {
+	{
+		$( #[ $attr:meta ] )*
+		pub struct $name:ident {
+			$(
+				$( #[ $inner_attr:meta ] )*
+				pub $field:ident: $type:ty,
+			)*
+		}
+	} => {
+		$crate::paste::paste! {
+			use $crate::serde as [< __opaque_keys_serde_import__ $name >];
+
+			$crate::impl_opaque_keys_inner! {
+				$( #[ $attr ] )*
+				#[derive($crate::serde::Serialize, $crate::serde::Deserialize)]
+				#[serde(crate = "__opaque_keys_serde_import__" $name)]
+				pub struct $name {
+					$(
+						$( #[ $inner_attr ] )*
+						pub $field: $type,
+					)*
+				}
+			}
+		}
+	}
+}
+
+#[macro_export]
+#[cfg(not(feature = "std"))]
+macro_rules! impl_opaque_keys {
+	{
+		$( #[ $attr:meta ] )*
+		pub struct $name:ident {
+			$(
+				$( #[ $inner_attr:meta ] )*
+				pub $field:ident: $type:ty,
+			)*
+		}
+	} => {
+		$crate::impl_opaque_keys_inner! {
+			$( #[ $attr ] )*
+			pub struct $name {
+				$(
+					$( #[ $inner_attr ] )*
+					pub $field: $type,
+				)*
+			}
+		}
+	}
+}
+
 /// Trait for things which can be printed from the runtime.
 pub trait Printable {
 	/// Print the object.

From 9ed9f3a55a58265f53419e2b62f09c6b03652fa0 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Wed, 19 May 2021 11:23:06 +0200
Subject: [PATCH 0759/1194] Improve pallet macro error message by deriving
 codec with no bound for `Call` enum (#8851)

* improve span for call

* fix stderr file paths
---
 frame/support/Cargo.toml                      |  2 +-
 .../procedural/src/pallet/expand/call.rs      |  2 +
 .../call_argument_invalid_bound_2.stderr      | 44 ++++++++++---------
 3 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/frame/support/Cargo.toml b/frame/support/Cargo.toml
index 7b1179122b97..173e3da27984 100644
--- a/frame/support/Cargo.toml
+++ b/frame/support/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.1.0", default-features = false, features = ["derive"] }
 frame-metadata = { version = "13.0.0", default-features = false, path = "../metadata" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
diff --git a/frame/support/procedural/src/pallet/expand/call.rs b/frame/support/procedural/src/pallet/expand/call.rs
index 301d3fc5d9fa..bd7676c49acd 100644
--- a/frame/support/procedural/src/pallet/expand/call.rs
+++ b/frame/support/procedural/src/pallet/expand/call.rs
@@ -89,6 +89,8 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
 			#frame_support::codec::Encode,
 			#frame_support::codec::Decode,
 		)]
+		#[codec(encode_bound())]
+		#[codec(decode_bound())]
 		#[allow(non_camel_case_types)]
 		pub enum #call_ident<#type_decl_bounded_gen> #where_clause {
 			#[doc(hidden)]
diff --git a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr
index 86968221cf30..e3e94f1fc3eb 100644
--- a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr
+++ b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr
@@ -1,24 +1,28 @@
-error[E0277]: the trait bound `pallet::Call<T>: Decode` is not satisfied
-  --> $DIR/call_argument_invalid_bound_2.rs:17:12
-   |
-17 |     #[pallet::call]
-   |               ^^^^ the trait `Decode` is not implemented for `pallet::Call<T>`
-   |
-  ::: $WORKSPACE/frame/support/src/dispatch.rs
-   |
-   |     type Call: UnfilteredDispatchable + Codec + Clone + PartialEq + Eq;
-   |                                         ----- required by this bound in `frame_support::Callable::Call`
+error[E0277]: the trait bound `<T as pallet::Config>::Bar: WrapperTypeDecode` is not satisfied
+   --> $DIR/call_argument_invalid_bound_2.rs:20:37
+    |
+20  |         fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
+    |                                           ^ the trait `WrapperTypeDecode` is not implemented for `<T as pallet::Config>::Bar`
+    |
+   ::: /usr/local/cargo/registry/src/github.com-1ecc6299db9ec823/parity-scale-codec-2.1.0/src/codec.rs:277:18
+    |
+277 |     fn decode<I: Input>(input: &mut I) -> Result<Self, Error>;
+    |                  ----- required by this bound in `pallet::_::_parity_scale_codec::Decode::decode`
+    |
+    = note: required because of the requirements on the impl of `Decode` for `<T as pallet::Config>::Bar`
 
-error[E0277]: the trait bound `pallet::Call<T>: pallet::_::_parity_scale_codec::Encode` is not satisfied
-  --> $DIR/call_argument_invalid_bound_2.rs:17:12
-   |
-17 |     #[pallet::call]
-   |               ^^^^ the trait `pallet::_::_parity_scale_codec::Encode` is not implemented for `pallet::Call<T>`
-   |
-  ::: $WORKSPACE/frame/support/src/dispatch.rs
-   |
-   |     type Call: UnfilteredDispatchable + Codec + Clone + PartialEq + Eq;
-   |                                         ----- required by this bound in `frame_support::Callable::Call`
+error[E0277]: the trait bound `<T as pallet::Config>::Bar: WrapperTypeEncode` is not satisfied
+   --> $DIR/call_argument_invalid_bound_2.rs:20:37
+    |
+20  |         fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
+    |                                           ^ the trait `WrapperTypeEncode` is not implemented for `<T as pallet::Config>::Bar`
+    |
+   ::: /usr/local/cargo/registry/src/github.com-1ecc6299db9ec823/parity-scale-codec-2.1.0/src/codec.rs:216:21
+    |
+216 |     fn encode_to<T: Output + ?Sized>(&self, dest: &mut T) {
+    |                     ------ required by this bound in `encode_to`
+    |
+    = note: required because of the requirements on the impl of `pallet::_::_parity_scale_codec::Encode` for `<T as pallet::Config>::Bar`
 
 error[E0369]: binary operation `==` cannot be applied to type `&<T as pallet::Config>::Bar`
   --> $DIR/call_argument_invalid_bound_2.rs:20:37

From 0bda86540d44b09da6f1ea6656f3f52d5447db81 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Wed, 19 May 2021 18:44:50 +0200
Subject: [PATCH 0760/1194] Fix transaction payment fee/tip unbalanceds (#8860)

* fix and test

* fmt
---
 frame/transaction-payment/src/lib.rs     | 29 ++++++++++++++++++++++--
 frame/transaction-payment/src/payment.rs | 12 +++++++---
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
index 9e4c97c56d63..3cf79caef770 100644
--- a/frame/transaction-payment/src/lib.rs
+++ b/frame/transaction-payment/src/lib.rs
@@ -609,7 +609,7 @@ mod tests {
 			DispatchClass, DispatchInfo, PostDispatchInfo, GetDispatchInfo, Weight,
 			WeightToFeePolynomial, WeightToFeeCoefficients, WeightToFeeCoefficient,
 		},
-		traits::Currency,
+		traits::{Currency, OnUnbalanced, Imbalance},
 	};
 	use pallet_balances::Call as BalancesCall;
 	use sp_core::H256;
@@ -718,8 +718,27 @@ mod tests {
 		}
 	}
 
+	thread_local! {
+		static TIP_UNBALANCED_AMOUNT: RefCell<u64> = RefCell::new(0);
+		static FEE_UNBALANCED_AMOUNT: RefCell<u64> = RefCell::new(0);
+	}
+
+	pub struct DealWithFees;
+	impl OnUnbalanced<pallet_balances::NegativeImbalance<Runtime>> for DealWithFees {
+		fn on_unbalanceds<B>(
+			mut fees_then_tips: impl Iterator<Item=pallet_balances::NegativeImbalance<Runtime>>
+		) {
+			if let Some(fees) = fees_then_tips.next() {
+				FEE_UNBALANCED_AMOUNT.with(|a| *a.borrow_mut() += fees.peek());
+				if let Some(tips) = fees_then_tips.next() {
+					TIP_UNBALANCED_AMOUNT.with(|a| *a.borrow_mut() += tips.peek());
+				}
+			}
+		}
+	}
+
 	impl Config for Runtime {
-		type OnChargeTransaction = CurrencyAdapter<Balances, ()>;
+		type OnChargeTransaction = CurrencyAdapter<Balances, DealWithFees>;
 		type TransactionByteFee = TransactionByteFee;
 		type WeightToFee = WeightToFee;
 		type FeeMultiplierUpdate = ();
@@ -832,6 +851,10 @@ mod tests {
 					::post_dispatch(pre, &info_from_weight(5), &default_post_info(), len, &Ok(()))
 			);
 			assert_eq!(Balances::free_balance(1), 100 - 5 - 5 - 10);
+			assert_eq!(FEE_UNBALANCED_AMOUNT.with(|a| a.borrow().clone()), 5 + 5 + 10);
+			assert_eq!(TIP_UNBALANCED_AMOUNT.with(|a| a.borrow().clone()), 0);
+
+			FEE_UNBALANCED_AMOUNT.with(|a| *a.borrow_mut() = 0);
 
 			let pre = ChargeTransactionPayment::<Runtime>::from(5 /* tipped */)
 				.pre_dispatch(&2, CALL, &info_from_weight(100), len)
@@ -843,6 +866,8 @@ mod tests {
 					::post_dispatch(pre, &info_from_weight(100), &post_info_from_weight(50), len, &Ok(()))
 			);
 			assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 50 - 5);
+			assert_eq!(FEE_UNBALANCED_AMOUNT.with(|a| a.borrow().clone()), 5 + 10 + 50);
+			assert_eq!(TIP_UNBALANCED_AMOUNT.with(|a| a.borrow().clone()), 5);
 		});
 	}
 
diff --git a/frame/transaction-payment/src/payment.rs b/frame/transaction-payment/src/payment.rs
index 7292ef4dfee7..1d910de8b6ce 100644
--- a/frame/transaction-payment/src/payment.rs
+++ b/frame/transaction-payment/src/payment.rs
@@ -50,9 +50,15 @@ pub trait OnChargeTransaction<T: Config> {
 /// Implements the transaction payment for a module implementing the `Currency`
 /// trait (eg. the pallet_balances) using an unbalance handler (implementing
 /// `OnUnbalanced`).
+///
+/// The unbalance handler is given 2 unbalanceds in [`OnUnbalanced::on_unbalanceds`]: fee and
+/// then tip.
 pub struct CurrencyAdapter<C, OU>(PhantomData<(C, OU)>);
 
 /// Default implementation for a Currency and an OnUnbalanced handler.
+///
+/// The unbalance handler is given 2 unbalanceds in [`OnUnbalanced::on_unbalanceds`]: fee and
+/// then tip.
 impl<T, C, OU> OnChargeTransaction<T> for CurrencyAdapter<C, OU>
 where
 	T: Config,
@@ -97,7 +103,7 @@ where
 	/// Since the predicted fee might have been too high, parts of the fee may
 	/// be refunded.
 	///
-	/// Note: The `fee` already includes the `tip`.
+	/// Note: The `corrected_fee` already includes the `tip`.
 	fn correct_and_deposit_fee(
 		who: &T::AccountId,
 		_dispatch_info: &DispatchInfoOf<T::Call>,
@@ -120,8 +126,8 @@ where
 				.same()
 				.map_err(|_| TransactionValidityError::Invalid(InvalidTransaction::Payment))?;
 			// Call someone else to handle the imbalance (fee and tip separately)
-			let imbalances = adjusted_paid.split(tip);
-			OU::on_unbalanceds(Some(imbalances.0).into_iter().chain(Some(imbalances.1)));
+			let (tip, fee) = adjusted_paid.split(tip);
+			OU::on_unbalanceds(Some(fee).into_iter().chain(Some(tip)));
 		}
 		Ok(())
 	}

From 1d7f6e12c651d776fc0dc1adefd007bb60f60b63 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Thu, 20 May 2021 10:34:52 +0200
Subject: [PATCH 0761/1194] Update the Grafana dashboards (#8832)

* Update the Grafana dashboards

* Remove the panels on top
---
 .../substrate-networking.json                 | 467 ++++++++++--------
 .../substrate-service-tasks.json              | 165 +++++--
 2 files changed, 390 insertions(+), 242 deletions(-)

diff --git a/.maintain/monitoring/grafana-dashboards/substrate-networking.json b/.maintain/monitoring/grafana-dashboards/substrate-networking.json
index 0b157e720583..46942cf582fc 100644
--- a/.maintain/monitoring/grafana-dashboards/substrate-networking.json
+++ b/.maintain/monitoring/grafana-dashboards/substrate-networking.json
@@ -32,12 +32,6 @@
       "id": "prometheus",
       "name": "Prometheus",
       "version": "1.0.0"
-    },
-    {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
     }
   ],
   "annotations": {
@@ -74,36 +68,9 @@
   "gnetId": null,
   "graphTooltip": 0,
   "id": null,
-  "iteration": 1613393276921,
+  "iteration": 1621244671073,
   "links": [],
   "panels": [
-    {
-      "datasource": null,
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 1,
-        "w": 12,
-        "x": 0,
-        "y": 0
-      },
-      "id": 308,
-      "options": {
-        "content": "",
-        "mode": "markdown"
-      },
-      "pluginVersion": "7.3.6",
-      "repeat": "nodename",
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "$nodename",
-      "type": "text"
-    },
     {
       "collapsed": false,
       "datasource": null,
@@ -111,7 +78,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 1
+        "y": 0
       },
       "id": 27,
       "panels": [],
@@ -120,7 +87,7 @@
     },
     {
       "aliasColors": {},
-      "bars": true,
+      "bars": false,
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
@@ -135,13 +102,13 @@
       "fillGradient": 0,
       "gridPos": {
         "h": 6,
-        "w": 12,
+        "w": 24,
         "x": 0,
-        "y": 2
+        "y": 1
       },
       "hiddenSeries": false,
       "id": 19,
-      "interval": "1m",
+      "interval": "",
       "legend": {
         "alignAsTable": false,
         "avg": false,
@@ -154,7 +121,7 @@
         "total": false,
         "values": false
       },
-      "lines": false,
+      "lines": true,
       "linewidth": 1,
       "maxPerRow": 12,
       "nullPointMode": "null as zero",
@@ -170,18 +137,22 @@
       "repeatDirection": "h",
       "seriesOverrides": [
         {
+          "$$hashKey": "object:70",
           "alias": "established (in)",
           "color": "#37872D"
         },
         {
+          "$$hashKey": "object:71",
           "alias": "established (out)",
           "color": "#C4162A"
         },
         {
+          "$$hashKey": "object:72",
           "alias": "pending (out)",
           "color": "#FF7383"
         },
         {
+          "$$hashKey": "object:73",
           "alias": "closed-recently",
           "color": "#FADE2A",
           "steppedLine": true
@@ -242,6 +213,7 @@
       },
       "yaxes": [
         {
+          "$$hashKey": "object:100",
           "format": "short",
           "label": "Connections",
           "logBase": 1,
@@ -250,6 +222,7 @@
           "show": true
         },
         {
+          "$$hashKey": "object:101",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -280,13 +253,13 @@
       "fillGradient": 0,
       "gridPos": {
         "h": 6,
-        "w": 12,
+        "w": 24,
         "x": 0,
-        "y": 8
+        "y": 7
       },
       "hiddenSeries": false,
       "id": 189,
-      "interval": "1m",
+      "interval": "",
       "legend": {
         "alignAsTable": false,
         "avg": false,
@@ -347,6 +320,7 @@
       },
       "yaxes": [
         {
+          "$$hashKey": "object:184",
           "format": "percentunit",
           "label": "",
           "logBase": 1,
@@ -355,6 +329,7 @@
           "show": true
         },
         {
+          "$$hashKey": "object:185",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -385,13 +360,13 @@
       "fillGradient": 0,
       "gridPos": {
         "h": 6,
-        "w": 12,
+        "w": 24,
         "x": 0,
-        "y": 14
+        "y": 13
       },
       "hiddenSeries": false,
       "id": 39,
-      "interval": "1m",
+      "interval": "",
       "legend": {
         "avg": false,
         "current": false,
@@ -415,6 +390,7 @@
       "repeat": "nodename",
       "seriesOverrides": [
         {
+          "$$hashKey": "object:263",
           "alias": "/.*/",
           "color": "#FF780A"
         }
@@ -424,14 +400,14 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "rate(${metric_namespace}_sub_libp2p_incoming_connections_handshake_errors_total{instance=~\"${nodename}\"}[$__interval])",
+          "expr": "increase(${metric_namespace}_sub_libp2p_incoming_connections_handshake_errors_total{instance=~\"${nodename}\"}[$__rate_interval])",
           "hide": false,
           "interval": "",
           "legendFormat": "{{reason}}",
           "refId": "A"
         },
         {
-          "expr": "rate(${metric_namespace}_sub_libp2p_listeners_errors_total{instance=~\"${nodename}\"}[$__interval])",
+          "expr": "increase(${metric_namespace}_sub_libp2p_listeners_errors_total{instance=~\"${nodename}\"}[$__rate_interval])",
           "interval": "",
           "legendFormat": "pre-handshake",
           "refId": "B"
@@ -457,6 +433,7 @@
       },
       "yaxes": [
         {
+          "$$hashKey": "object:270",
           "format": "short",
           "label": "Errors",
           "logBase": 1,
@@ -465,6 +442,7 @@
           "show": true
         },
         {
+          "$$hashKey": "object:271",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -484,7 +462,7 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
-      "description": "Each bucket represent a certain number of nodes using a certain bandwidth range.",
+      "description": "",
       "fieldConfig": {
         "defaults": {
           "custom": {}
@@ -495,9 +473,9 @@
       "fillGradient": 0,
       "gridPos": {
         "h": 6,
-        "w": 12,
+        "w": 24,
         "x": 0,
-        "y": 20
+        "y": 19
       },
       "hiddenSeries": false,
       "id": 4,
@@ -528,7 +506,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "rate(${metric_namespace}_sub_libp2p_network_bytes_total{instance=~\"${nodename}\"}[5m])",
+          "expr": "rate(${metric_namespace}_sub_libp2p_network_bytes_total{instance=~\"${nodename}\"}[$__rate_interval])",
           "interval": "",
           "legendFormat": "{{direction}}",
           "refId": "B"
@@ -538,7 +516,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Network bandwidth - # bytes per second",
+      "title": "Network bandwidth",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -554,7 +532,8 @@
       },
       "yaxes": [
         {
-          "format": "short",
+          "$$hashKey": "object:352",
+          "format": "binBps",
           "label": null,
           "logBase": 1,
           "max": null,
@@ -562,6 +541,7 @@
           "show": true
         },
         {
+          "$$hashKey": "object:353",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -592,13 +572,13 @@
       "fillGradient": 0,
       "gridPos": {
         "h": 7,
-        "w": 12,
+        "w": 24,
         "x": 0,
-        "y": 26
+        "y": 25
       },
       "hiddenSeries": false,
       "id": 81,
-      "interval": "1m",
+      "interval": "",
       "legend": {
         "alignAsTable": false,
         "avg": false,
@@ -631,7 +611,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "rate(${metric_namespace}_sub_libp2p_pending_connections_errors_total{instance=~\"${nodename}\"}[$__interval])",
+          "expr": "increase(${metric_namespace}_sub_libp2p_pending_connections_errors_total{instance=~\"${nodename}\"}[$__rate_interval])",
           "interval": "",
           "legendFormat": "{{reason}}",
           "refId": "A"
@@ -657,6 +637,7 @@
       },
       "yaxes": [
         {
+          "$$hashKey": "object:431",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -665,6 +646,7 @@
           "show": true
         },
         {
+          "$$hashKey": "object:432",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -680,7 +662,7 @@
     },
     {
       "aliasColors": {},
-      "bars": true,
+      "bars": false,
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
@@ -695,13 +677,13 @@
       "fillGradient": 0,
       "gridPos": {
         "h": 7,
-        "w": 12,
+        "w": 24,
         "x": 0,
-        "y": 33
+        "y": 32
       },
       "hiddenSeries": false,
       "id": 46,
-      "interval": "1m",
+      "interval": "",
       "legend": {
         "avg": false,
         "current": false,
@@ -711,10 +693,10 @@
         "total": false,
         "values": false
       },
-      "lines": false,
+      "lines": true,
       "linewidth": 1,
       "maxPerRow": 12,
-      "nullPointMode": "null as zero",
+      "nullPointMode": "connected",
       "options": {
         "alertThreshold": true
       },
@@ -731,7 +713,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "rate(${metric_namespace}_sub_libp2p_connections_closed_total{instance=~\"${nodename}\"}[$__interval])",
+          "expr": "rate(${metric_namespace}_sub_libp2p_connections_closed_total{instance=~\"${nodename}\"}[$__rate_interval])",
           "interval": "",
           "legendFormat": "{{reason}} ({{direction}})",
           "refId": "A"
@@ -741,7 +723,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Disconnects",
+      "title": "Disconnects/sec",
       "tooltip": {
         "shared": true,
         "sort": 2,
@@ -757,8 +739,9 @@
       },
       "yaxes": [
         {
+          "$$hashKey": "object:514",
           "decimals": null,
-          "format": "short",
+          "format": "cps",
           "label": "Disconnects",
           "logBase": 1,
           "max": null,
@@ -766,6 +749,7 @@
           "show": true
         },
         {
+          "$$hashKey": "object:515",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -786,7 +770,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 40
+        "y": 39
       },
       "id": 167,
       "panels": [],
@@ -811,9 +795,9 @@
       "fillGradient": 0,
       "gridPos": {
         "h": 5,
-        "w": 12,
+        "w": 24,
         "x": 0,
-        "y": 41
+        "y": 40
       },
       "hiddenSeries": false,
       "id": 101,
@@ -842,7 +826,7 @@
       "seriesOverrides": [],
       "spaceLength": 10,
       "stack": false,
-      "steppedLine": true,
+      "steppedLine": false,
       "targets": [
         {
           "expr": "${metric_namespace}_sub_libp2p_peerset_num_requested{instance=~\"${nodename}\"}",
@@ -851,7 +835,7 @@
           "refId": "A"
         },
         {
-          "expr": "polkadot_sub_libp2p_peers_count{instance=~\"${nodename}.*\"}",
+          "expr": "${metric_namespace}_sub_libp2p_peers_count{instance=~\"${nodename}.*\"}",
           "interval": "",
           "legendFormat": "peers-count",
           "refId": "B"
@@ -877,6 +861,7 @@
       },
       "yaxes": [
         {
+          "$$hashKey": "object:679",
           "format": "none",
           "label": null,
           "logBase": 1,
@@ -885,6 +870,7 @@
           "show": true
         },
         {
+          "$$hashKey": "object:680",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -905,12 +891,12 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 46
+        "y": 45
       },
       "id": 29,
       "panels": [],
-      "repeat": "request_protocol",
-      "title": "Requests (${request_protocol})",
+      "repeat": "request_protocol_out",
+      "title": "Outbound requests (${request_protocol_out})",
       "type": "row"
     },
     {
@@ -930,9 +916,9 @@
       "fillGradient": 0,
       "gridPos": {
         "h": 4,
-        "w": 12,
+        "w": 24,
         "x": 0,
-        "y": 47
+        "y": 46
       },
       "hiddenSeries": false,
       "id": 148,
@@ -963,7 +949,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "irate(${metric_namespace}_sub_libp2p_requests_out_success_total_sum{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m]) + on(instance) sum(irate(${metric_namespace}_sub_libp2p_requests_out_failure_total{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])) by (instance)",
+          "expr": "rate(${metric_namespace}_sub_libp2p_requests_out_success_total_count{instance=~\"${nodename}\", protocol=\"${request_protocol_out}\"}[$__rate_interval]) + on(instance) sum(rate(${metric_namespace}_sub_libp2p_requests_out_failure_total{instance=~\"${nodename}\", protocol=\"${request_protocol_out}\"}[$__rate_interval])) by (instance)\n\nor\n\nrate(${metric_namespace}_sub_libp2p_requests_out_success_total_count{instance=~\"${nodename}\", protocol=\"${request_protocol_out}\"}[$__rate_interval])",
           "hide": false,
           "interval": "",
           "legendFormat": "{{instance}}",
@@ -1030,9 +1016,9 @@
       "fillGradient": 0,
       "gridPos": {
         "h": 4,
-        "w": 12,
+        "w": 24,
         "x": 0,
-        "y": 51
+        "y": 50
       },
       "hiddenSeries": false,
       "id": 448,
@@ -1063,7 +1049,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(${metric_namespace}_sub_libp2p_requests_out_failure_total{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[$__rate_interval])) by (instance, reason)",
+          "expr": "sum(rate(${metric_namespace}_sub_libp2p_requests_out_failure_total{instance=~\"${nodename}\", protocol=\"${request_protocol_out}\", reason != \"obsolete\"}[$__rate_interval])) by (instance, reason)",
           "hide": false,
           "interval": "",
           "intervalFactor": 1,
@@ -1075,7 +1061,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Outbound requests failures",
+      "title": "Outbound requests failures (other than \"obsolete\")",
       "tooltip": {
         "shared": true,
         "sort": 2,
@@ -1131,9 +1117,9 @@
       "fillGradient": 0,
       "gridPos": {
         "h": 4,
-        "w": 12,
+        "w": 24,
         "x": 0,
-        "y": 55
+        "y": 54
       },
       "hiddenSeries": false,
       "id": 256,
@@ -1164,7 +1150,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "histogram_quantile(0.5, sum(rate(${metric_namespace}_sub_libp2p_requests_out_success_total_bucket{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])) by (instance, le)) > 0",
+          "expr": "histogram_quantile(0.5, sum(rate(${metric_namespace}_sub_libp2p_requests_out_success_total_bucket{instance=~\"${nodename}\", protocol=\"${request_protocol_out}\"}[$__rate_interval])) by (instance, le)) > 0",
           "instant": false,
           "interval": "",
           "legendFormat": "{{instance}}",
@@ -1191,6 +1177,7 @@
       },
       "yaxes": [
         {
+          "$$hashKey": "object:1069",
           "format": "s",
           "label": null,
           "logBase": 1,
@@ -1199,6 +1186,7 @@
           "show": true
         },
         {
+          "$$hashKey": "object:1070",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -1229,9 +1217,9 @@
       "fillGradient": 0,
       "gridPos": {
         "h": 4,
-        "w": 12,
+        "w": 24,
         "x": 0,
-        "y": 59
+        "y": 58
       },
       "hiddenSeries": false,
       "id": 257,
@@ -1262,7 +1250,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "histogram_quantile(0.99, sum(rate(${metric_namespace}_sub_libp2p_requests_out_success_total_bucket{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])) by (instance, le)) > 0",
+          "expr": "histogram_quantile(0.99, sum(rate(${metric_namespace}_sub_libp2p_requests_out_success_total_bucket{instance=~\"${nodename}\", protocol=\"${request_protocol_out}\"}[$__rate_interval])) by (instance, le)) > 0",
           "instant": false,
           "interval": "",
           "legendFormat": "{{instance}}",
@@ -1289,6 +1277,7 @@
       },
       "yaxes": [
         {
+          "$$hashKey": "object:988",
           "format": "s",
           "label": null,
           "logBase": 1,
@@ -1297,6 +1286,7 @@
           "show": true
         },
         {
+          "$$hashKey": "object:989",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -1310,6 +1300,21 @@
         "alignLevel": null
       }
     },
+    {
+      "collapsed": false,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 62
+      },
+      "id": 504,
+      "panels": [],
+      "repeat": "request_protocol_in",
+      "title": "Inbound requests (${request_protocol_in})",
+      "type": "row"
+    },
     {
       "aliasColors": {},
       "bars": false,
@@ -1327,7 +1332,7 @@
       "fillGradient": 0,
       "gridPos": {
         "h": 4,
-        "w": 12,
+        "w": 24,
         "x": 0,
         "y": 63
       },
@@ -1360,7 +1365,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "irate(${metric_namespace}_sub_libp2p_requests_in_success_total_count{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])",
+          "expr": "rate(${metric_namespace}_sub_libp2p_requests_in_success_total_count{instance=~\"${nodename}\", protocol=\"${request_protocol_in}\"}[$__rate_interval])",
           "interval": "",
           "legendFormat": "{{instance}}",
           "refId": "A"
@@ -1386,6 +1391,7 @@
       },
       "yaxes": [
         {
+          "$$hashKey": "object:907",
           "format": "reqps",
           "label": null,
           "logBase": 1,
@@ -1394,6 +1400,7 @@
           "show": true
         },
         {
+          "$$hashKey": "object:908",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -1424,7 +1431,7 @@
       "fillGradient": 0,
       "gridPos": {
         "h": 4,
-        "w": 12,
+        "w": 24,
         "x": 0,
         "y": 67
       },
@@ -1457,7 +1464,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(${metric_namespace}_sub_libp2p_requests_in_failure_total{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[$__rate_interval])) by (instance, reason)",
+          "expr": "sum(rate(${metric_namespace}_sub_libp2p_requests_in_failure_total{instance=~\"${nodename}\", protocol=\"${request_protocol_in}\"}[$__rate_interval])) by (instance, reason)",
           "hide": false,
           "interval": "",
           "intervalFactor": 1,
@@ -1525,7 +1532,7 @@
       "fillGradient": 0,
       "gridPos": {
         "h": 4,
-        "w": 12,
+        "w": 24,
         "x": 0,
         "y": 71
       },
@@ -1558,7 +1565,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "histogram_quantile(0.5, sum(rate(${metric_namespace}_sub_libp2p_requests_in_success_total_bucket{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])) by (instance, le))",
+          "expr": "histogram_quantile(0.5, sum(rate(${metric_namespace}_sub_libp2p_requests_in_success_total_bucket{instance=~\"${nodename}\", protocol=\"${request_protocol_in}\"}[$__rate_interval])) by (instance, le))",
           "interval": "",
           "legendFormat": "{{instance}}",
           "refId": "A"
@@ -1584,6 +1591,7 @@
       },
       "yaxes": [
         {
+          "$$hashKey": "object:666",
           "format": "s",
           "label": null,
           "logBase": 1,
@@ -1592,6 +1600,7 @@
           "show": true
         },
         {
+          "$$hashKey": "object:667",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -1622,7 +1631,7 @@
       "fillGradient": 0,
       "gridPos": {
         "h": 4,
-        "w": 12,
+        "w": 24,
         "x": 0,
         "y": 75
       },
@@ -1655,7 +1664,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "histogram_quantile(0.99, sum(rate(${metric_namespace}_sub_libp2p_requests_in_success_total_bucket{instance=~\"${nodename}\", protocol=\"${request_protocol}\"}[5m])) by (instance, le))",
+          "expr": "histogram_quantile(0.99, sum(rate(${metric_namespace}_sub_libp2p_requests_in_success_total_bucket{instance=~\"${nodename}\", protocol=\"${request_protocol_in}\"}[$__rate_interval])) by (instance, le))",
           "interval": "",
           "legendFormat": "{{instance}}",
           "refId": "A"
@@ -1681,6 +1690,7 @@
       },
       "yaxes": [
         {
+          "$$hashKey": "object:747",
           "format": "s",
           "label": null,
           "logBase": 1,
@@ -1689,6 +1699,7 @@
           "show": true
         },
         {
+          "$$hashKey": "object:748",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -1734,7 +1745,7 @@
       "fillGradient": 0,
       "gridPos": {
         "h": 6,
-        "w": 12,
+        "w": 24,
         "x": 0,
         "y": 80
       },
@@ -1796,6 +1807,7 @@
       },
       "yaxes": [
         {
+          "$$hashKey": "object:896",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -1804,6 +1816,7 @@
           "show": true
         },
         {
+          "$$hashKey": "object:897",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -1830,31 +1843,30 @@
         },
         "overrides": []
       },
-      "fill": 0,
+      "fill": 1,
       "fillGradient": 0,
       "gridPos": {
         "h": 6,
-        "w": 12,
+        "w": 24,
         "x": 0,
         "y": 86
       },
       "hiddenSeries": false,
-      "id": 31,
-      "interval": "1m",
+      "id": 486,
       "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "rightSide": true,
-        "show": true,
+        "alignAsTable": true,
+        "avg": true,
+        "current": true,
+        "max": true,
+        "min": true,
+        "rightSide": false,
+        "show": false,
         "total": false,
-        "values": false
+        "values": true
       },
       "lines": true,
       "linewidth": 1,
-      "maxPerRow": 12,
-      "nullPointMode": "connected",
+      "nullPointMode": "null as zero",
       "options": {
         "alertThreshold": true
       },
@@ -1865,35 +1877,27 @@
       "renderer": "flot",
       "repeat": "nodename",
       "repeatDirection": "h",
-      "seriesOverrides": [
-        {
-          "alias": "/(in)/",
-          "color": "#73BF69"
-        },
-        {
-          "alias": "/(out)/",
-          "color": "#F2495C"
-        }
-      ],
+      "seriesOverrides": [],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
       "targets": [
         {
-          "expr": "avg by (direction) (irate(${metric_namespace}_sub_libp2p_notifications_sizes_count{instance=~\"${nodename}\", protocol=\"${notif_protocol}\"}[$__rate_interval]))",
+          "expr": "rate(${metric_namespace}_sub_libp2p_notifications_streams_closed_total{instance=~\"${nodename}\", protocol=\"${notif_protocol}\"}[$__rate_interval])",
           "interval": "",
-          "legendFormat": "{{direction}}",
-          "refId": "A"
+          "intervalFactor": 4,
+          "legendFormat": "{{instance}}",
+          "refId": "B"
         }
       ],
       "thresholds": [],
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Average network notifications per second",
+      "title": "Substreams closed/sec",
       "tooltip": {
-        "shared": true,
-        "sort": 2,
+        "shared": false,
+        "sort": 1,
         "value_type": "individual"
       },
       "type": "graph",
@@ -1906,14 +1910,16 @@
       },
       "yaxes": [
         {
-          "format": "cps",
-          "label": "Notifs/sec",
+          "$$hashKey": "object:484",
+          "format": "short",
+          "label": null,
           "logBase": 1,
           "max": null,
           "min": null,
           "show": true
         },
         {
+          "$$hashKey": "object:485",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -1944,22 +1950,19 @@
       "fillGradient": 0,
       "gridPos": {
         "h": 6,
-        "w": 12,
+        "w": 24,
         "x": 0,
         "y": 92
       },
       "hiddenSeries": false,
-      "id": 37,
-      "interval": "1m",
+      "id": 31,
+      "interval": "",
       "legend": {
-        "alignAsTable": false,
         "avg": false,
         "current": false,
-        "hideEmpty": false,
-        "hideZero": false,
         "max": false,
         "min": false,
-        "rightSide": true,
+        "rightSide": false,
         "show": true,
         "total": false,
         "values": false
@@ -1980,10 +1983,12 @@
       "repeatDirection": "h",
       "seriesOverrides": [
         {
+          "$$hashKey": "object:399",
           "alias": "/(in)/",
           "color": "#73BF69"
         },
         {
+          "$$hashKey": "object:400",
           "alias": "/(out)/",
           "color": "#F2495C"
         }
@@ -1993,8 +1998,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "avg(irate(${metric_namespace}_sub_libp2p_notifications_sizes_sum{instance=~\"${nodename}\", protocol=\"${notif_protocol}\"}[$__rate_interval])) by (direction)",
-          "instant": false,
+          "expr": "avg by (direction) (rate(${metric_namespace}_sub_libp2p_notifications_sizes_count{instance=~\"${nodename}\", protocol=\"${notif_protocol}\"}[$__rate_interval]))",
           "interval": "",
           "legendFormat": "{{direction}}",
           "refId": "A"
@@ -2004,7 +2008,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Average bandwidth used by notifications",
+      "title": "Number of network notifications",
       "tooltip": {
         "shared": true,
         "sort": 2,
@@ -2020,14 +2024,16 @@
       },
       "yaxes": [
         {
-          "format": "Bps",
-          "label": "Bandwidth",
+          "$$hashKey": "object:413",
+          "format": "short",
+          "label": "Notifs/sec",
           "logBase": 1,
           "max": null,
           "min": null,
           "show": true
         },
         {
+          "$$hashKey": "object:414",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -2054,28 +2060,34 @@
         },
         "overrides": []
       },
-      "fill": 1,
+      "fill": 0,
       "fillGradient": 0,
       "gridPos": {
         "h": 6,
-        "w": 12,
+        "w": 24,
         "x": 0,
         "y": 98
       },
       "hiddenSeries": false,
-      "id": 16,
+      "id": 37,
+      "interval": "",
       "legend": {
+        "alignAsTable": false,
         "avg": false,
         "current": false,
+        "hideEmpty": false,
+        "hideZero": false,
         "max": false,
         "min": false,
-        "show": false,
+        "rightSide": false,
+        "show": true,
         "total": false,
         "values": false
       },
       "lines": true,
       "linewidth": 1,
-      "nullPointMode": "null as zero",
+      "maxPerRow": 12,
+      "nullPointMode": "connected",
       "options": {
         "alertThreshold": true
       },
@@ -2085,15 +2097,28 @@
       "points": false,
       "renderer": "flot",
       "repeat": "nodename",
-      "seriesOverrides": [],
+      "repeatDirection": "h",
+      "seriesOverrides": [
+        {
+          "$$hashKey": "object:492",
+          "alias": "/(in)/",
+          "color": "#73BF69"
+        },
+        {
+          "$$hashKey": "object:493",
+          "alias": "/(out)/",
+          "color": "#F2495C"
+        }
+      ],
       "spaceLength": 10,
       "stack": false,
-      "steppedLine": true,
+      "steppedLine": false,
       "targets": [
         {
-          "expr": "max(${metric_namespace}_sub_libp2p_out_events_notifications_sizes{instance=~\"${nodename}\", protocol=\"${notif_protocol}\", action=\"sent\"} - ignoring(action) ${metric_namespace}_sub_libp2p_out_events_notifications_sizes{instance=~\"${nodename}\", protocol=\"${notif_protocol}\", action=\"received\"}) by (instance) > 0",
+          "expr": "avg(rate(${metric_namespace}_sub_libp2p_notifications_sizes_sum{instance=~\"${nodename}\", protocol=\"${notif_protocol}\"}[$__rate_interval])) by (direction)",
+          "instant": false,
           "interval": "",
-          "legendFormat": "{{instance}}",
+          "legendFormat": "{{direction}}",
           "refId": "A"
         }
       ],
@@ -2101,10 +2126,10 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Total sizes of notifications waiting to be delivered to the rest of Substrate",
+      "title": "Average bandwidth used by notifications",
       "tooltip": {
-        "shared": false,
-        "sort": 1,
+        "shared": true,
+        "sort": 2,
         "value_type": "individual"
       },
       "type": "graph",
@@ -2117,14 +2142,16 @@
       },
       "yaxes": [
         {
-          "format": "bytes",
-          "label": null,
+          "$$hashKey": "object:506",
+          "format": "Bps",
+          "label": "Bandwidth",
           "logBase": 1,
           "max": null,
           "min": null,
           "show": true
         },
         {
+          "$$hashKey": "object:507",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -2152,15 +2179,15 @@
         "overrides": []
       },
       "fill": 1,
-      "fillGradient": 1,
+      "fillGradient": 0,
       "gridPos": {
         "h": 6,
-        "w": 12,
+        "w": 24,
         "x": 0,
         "y": 104
       },
       "hiddenSeries": false,
-      "id": 21,
+      "id": 16,
       "legend": {
         "avg": false,
         "current": false,
@@ -2188,10 +2215,9 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(rate(${metric_namespace}_sub_libp2p_notifications_sizes_sum{instance=~\"${nodename}\", protocol=\"${notif_protocol}\"}[5m])) by (direction, protocol) / sum(rate(${metric_namespace}_sub_libp2p_notifications_sizes_count{instance=~\"${nodename}\", protocol=\"${notif_protocol}\"}[5m])) by (direction, protocol)",
-          "format": "time_series",
+          "expr": "${metric_namespace}_sub_libp2p_out_events_notifications_sizes{instance=~\"${nodename}\", protocol=\"${notif_protocol}\", action=\"sent\"} - ignoring(action) ${metric_namespace}_sub_libp2p_out_events_notifications_sizes{instance=~\"${nodename}\", protocol=\"${notif_protocol}\", action=\"received\"}",
           "interval": "",
-          "legendFormat": "{{direction}}",
+          "legendFormat": "{{name}}",
           "refId": "A"
         }
       ],
@@ -2199,10 +2225,10 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Average size of sent and received notifications in the past 5 minutes",
+      "title": "Total sizes of notifications waiting to be delivered to the rest of Substrate",
       "tooltip": {
-        "shared": true,
-        "sort": 2,
+        "shared": false,
+        "sort": 1,
         "value_type": "individual"
       },
       "type": "graph",
@@ -2215,14 +2241,16 @@
       },
       "yaxes": [
         {
+          "$$hashKey": "object:232",
           "format": "bytes",
-          "label": "Max. notification size",
-          "logBase": 10,
+          "label": null,
+          "logBase": 1,
           "max": null,
           "min": null,
           "show": true
         },
         {
+          "$$hashKey": "object:233",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -2253,12 +2281,12 @@
       "fillGradient": 1,
       "gridPos": {
         "h": 6,
-        "w": 12,
+        "w": 24,
         "x": 0,
         "y": 110
       },
       "hiddenSeries": false,
-      "id": 134,
+      "id": 21,
       "legend": {
         "avg": false,
         "current": false,
@@ -2286,7 +2314,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "histogram_quantile(1.0, sum(rate(${metric_namespace}_sub_libp2p_notifications_sizes_bucket{instance=~\"${nodename}\", protocol=\"${notif_protocol}\"}[5m])) by (direction, le))",
+          "expr": "sum(rate(${metric_namespace}_sub_libp2p_notifications_sizes_sum{instance=~\"${nodename}\", protocol=\"${notif_protocol}\"}[$__rate_interval])) by (direction, protocol) / sum(rate(${metric_namespace}_sub_libp2p_notifications_sizes_count{instance=~\"${nodename}\", protocol=\"${notif_protocol}\"}[$__rate_interval])) by (direction, protocol)",
           "format": "time_series",
           "interval": "",
           "legendFormat": "{{direction}}",
@@ -2297,7 +2325,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Maximum size of sent and received notifications in the past 5 minutes",
+      "title": "Average size of sent and received notifications",
       "tooltip": {
         "shared": true,
         "sort": 2,
@@ -2313,6 +2341,7 @@
       },
       "yaxes": [
         {
+          "$$hashKey": "object:322",
           "format": "bytes",
           "label": "Max. notification size",
           "logBase": 10,
@@ -2321,6 +2350,7 @@
           "show": true
         },
         {
+          "$$hashKey": "object:323",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -2340,7 +2370,6 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
-      "description": "99.9% of the time, the output queue size for this protocol is below the given value",
       "fieldConfig": {
         "defaults": {
           "custom": {},
@@ -2348,32 +2377,28 @@
         },
         "overrides": []
       },
-      "fill": 0,
-      "fillGradient": 0,
+      "fill": 1,
+      "fillGradient": 1,
       "gridPos": {
         "h": 6,
-        "w": 12,
+        "w": 24,
         "x": 0,
         "y": 116
       },
       "hiddenSeries": false,
-      "id": 14,
+      "id": 134,
       "legend": {
-        "alignAsTable": false,
         "avg": false,
-        "current": true,
-        "hideEmpty": false,
-        "hideZero": true,
-        "max": true,
+        "current": false,
+        "max": false,
         "min": false,
-        "rightSide": true,
-        "show": true,
+        "show": false,
         "total": false,
-        "values": true
+        "values": false
       },
       "lines": true,
       "linewidth": 1,
-      "nullPointMode": "null",
+      "nullPointMode": "null as zero",
       "options": {
         "alertThreshold": true
       },
@@ -2383,39 +2408,27 @@
       "points": false,
       "renderer": "flot",
       "repeat": "nodename",
-      "seriesOverrides": [
-        {
-          "alias": "max",
-          "fill": 1,
-          "linewidth": 0
-        }
-      ],
+      "seriesOverrides": [],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
       "targets": [
         {
-          "expr": "histogram_quantile(0.99, sum(rate(${metric_namespace}_sub_libp2p_notifications_queues_size_bucket{instance=~\"${nodename}\", protocol=\"${notif_protocol}\"}[2m])) by (le, instance))",
-          "hide": false,
+          "expr": "histogram_quantile(0.99, sum(irate(${metric_namespace}_sub_libp2p_notifications_sizes_bucket{instance=~\"${nodename}\", protocol=\"${notif_protocol}\"}[$__rate_interval])) by (direction, le))",
+          "format": "time_series",
           "interval": "",
-          "legendFormat": "{{protocol}}",
+          "legendFormat": "{{direction}}",
           "refId": "A"
-        },
-        {
-          "expr": "max(histogram_quantile(0.99, sum(rate(${metric_namespace}_sub_libp2p_notifications_queues_size_bucket{instance=~\"${nodename}\", protocol=\"${notif_protocol}\"}[2m])) by (le, instance)))",
-          "interval": "",
-          "legendFormat": "max",
-          "refId": "B"
         }
       ],
       "thresholds": [],
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "99th percentile of queues sizes",
+      "title": "99th percentile of size of sent and received notifications",
       "tooltip": {
         "shared": true,
-        "sort": 0,
+        "sort": 2,
         "value_type": "individual"
       },
       "type": "graph",
@@ -2428,14 +2441,16 @@
       },
       "yaxes": [
         {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": "300",
-          "min": "0",
+          "$$hashKey": "object:244",
+          "format": "bytes",
+          "label": "Max. notification size",
+          "logBase": 10,
+          "max": null,
+          "min": null,
           "show": true
         },
         {
+          "$$hashKey": "object:245",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -2480,7 +2495,7 @@
       "fillGradient": 0,
       "gridPos": {
         "h": 6,
-        "w": 12,
+        "w": 24,
         "x": 0,
         "y": 123
       },
@@ -2515,16 +2530,19 @@
       "repeatDirection": "h",
       "seriesOverrides": [
         {
+          "$$hashKey": "object:366",
           "alias": "/discard/",
           "color": "#FA6400",
           "zindex": -2
         },
         {
+          "$$hashKey": "object:367",
           "alias": "/keep/",
           "color": "#73BF69",
           "zindex": 2
         },
         {
+          "$$hashKey": "object:368",
           "alias": "/process_and_discard/",
           "color": "#5794F2"
         }
@@ -2560,6 +2578,7 @@
       },
       "yaxes": [
         {
+          "$$hashKey": "object:409",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -2568,6 +2587,7 @@
           "show": true
         },
         {
+          "$$hashKey": "object:410",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -2627,7 +2647,7 @@
       "type": "dashlist"
     }
   ],
-  "refresh": "1m",
+  "refresh": false,
   "schemaVersion": 26,
   "style": "dark",
   "tags": [],
@@ -2660,7 +2680,7 @@
         "allValue": null,
         "current": {},
         "datasource": "$data_source",
-        "definition": "${metric_namespace}_sub_libp2p_notifications_sizes_count{instance=~\"${nodename}\"}",
+        "definition": "${metric_namespace}_sub_libp2p_notifications_streams_opened_total{instance=~\"${nodename}\"}",
         "error": null,
         "hide": 2,
         "includeAll": true,
@@ -2668,7 +2688,7 @@
         "multi": false,
         "name": "notif_protocol",
         "options": [],
-        "query": "${metric_namespace}_sub_libp2p_notifications_sizes_count{instance=~\"${nodename}\"}",
+        "query": "${metric_namespace}_sub_libp2p_notifications_streams_opened_total{instance=~\"${nodename}\"}",
         "refresh": 1,
         "regex": "/protocol=\"(.*?)\"/",
         "skipUrlSync": false,
@@ -2689,7 +2709,7 @@
         "includeAll": true,
         "label": null,
         "multi": false,
-        "name": "request_protocol",
+        "name": "request_protocol_in",
         "options": [],
         "query": "${metric_namespace}_sub_libp2p_requests_in_success_total_count{instance=~\"${nodename}\"}",
         "refresh": 1,
@@ -2742,6 +2762,29 @@
         "query": "${VAR_METRIC_NAMESPACE}",
         "skipUrlSync": false,
         "type": "constant"
+      },
+      {
+        "allValue": null,
+        "current": {},
+        "datasource": "$data_source",
+        "definition": "${metric_namespace}_sub_libp2p_requests_out_success_total_count{instance=~\"${nodename}\"}",
+        "error": null,
+        "hide": 2,
+        "includeAll": true,
+        "label": null,
+        "multi": false,
+        "name": "request_protocol_out",
+        "options": [],
+        "query": "${metric_namespace}_sub_libp2p_requests_out_success_total_count{instance=~\"${nodename}\"}",
+        "refresh": 1,
+        "regex": "/protocol=\"(.*?)\"/",
+        "skipUrlSync": false,
+        "sort": 5,
+        "tagValuesQuery": "",
+        "tags": [],
+        "tagsQuery": "",
+        "type": "query",
+        "useTags": false
       }
     ]
   },
@@ -2766,5 +2809,5 @@
   "timezone": "utc",
   "title": "Substrate Networking",
   "uid": "vKVuiD9Zk",
-  "version": 154
+  "version": 176
 }
\ No newline at end of file
diff --git a/.maintain/monitoring/grafana-dashboards/substrate-service-tasks.json b/.maintain/monitoring/grafana-dashboards/substrate-service-tasks.json
index 944c9fb50c9b..2f08ac7bb34c 100644
--- a/.maintain/monitoring/grafana-dashboards/substrate-service-tasks.json
+++ b/.maintain/monitoring/grafana-dashboards/substrate-service-tasks.json
@@ -84,7 +84,7 @@
   "gnetId": null,
   "graphTooltip": 0,
   "id": null,
-  "iteration": 1613393319015,
+  "iteration": 1621244116095,
   "links": [],
   "panels": [
     {
@@ -130,7 +130,7 @@
     },
     {
       "aliasColors": {},
-      "bars": true,
+      "bars": false,
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
@@ -141,7 +141,7 @@
         },
         "overrides": []
       },
-      "fill": 2,
+      "fill": 3,
       "fillGradient": 0,
       "gridPos": {
         "h": 6,
@@ -151,7 +151,7 @@
       },
       "hiddenSeries": false,
       "id": 11,
-      "interval": "1m",
+      "interval": "",
       "legend": {
         "alignAsTable": true,
         "avg": true,
@@ -165,9 +165,9 @@
         "total": false,
         "values": true
       },
-      "lines": false,
+      "lines": true,
       "linewidth": 1,
-      "nullPointMode": "null",
+      "nullPointMode": "connected",
       "options": {
         "alertThreshold": true
       },
@@ -183,7 +183,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "irate(${metric_namespace}_tasks_polling_duration_sum{instance=~\"${nodename}\"}[$__rate_interval])",
+          "expr": "rate(${metric_namespace}_tasks_polling_duration_sum{instance=~\"${nodename}\"}[$__rate_interval])",
           "interval": "",
           "legendFormat": "{{task_name}}",
           "refId": "A"
@@ -245,7 +245,7 @@
         },
         "overrides": []
       },
-      "fill": 0,
+      "fill": 3,
       "fillGradient": 0,
       "gridPos": {
         "h": 6,
@@ -270,7 +270,7 @@
         "values": true
       },
       "lines": true,
-      "linewidth": 2,
+      "linewidth": 1,
       "nullPointMode": "connected",
       "options": {
         "alertThreshold": true
@@ -283,11 +283,11 @@
       "repeat": "nodename",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "stack": false,
-      "steppedLine": true,
+      "stack": true,
+      "steppedLine": false,
       "targets": [
         {
-          "expr": "irate(${metric_namespace}_tasks_polling_duration_count{instance=~\"${nodename}\"}[$__rate_interval])",
+          "expr": "rate(${metric_namespace}_tasks_polling_duration_count{instance=~\"${nodename}\"}[$__rate_interval])",
           "interval": "",
           "legendFormat": "{{task_name}}",
           "refId": "A"
@@ -358,13 +358,15 @@
         "y": 14
       },
       "hiddenSeries": false,
-      "id": 15,
+      "id": 43,
       "interval": "",
       "legend": {
         "alignAsTable": true,
         "avg": true,
-        "current": false,
-        "max": false,
+        "current": true,
+        "hideEmpty": true,
+        "hideZero": false,
+        "max": true,
         "min": false,
         "rightSide": true,
         "show": true,
@@ -373,7 +375,7 @@
       },
       "lines": true,
       "linewidth": 1,
-      "nullPointMode": "null as zero",
+      "nullPointMode": "connected",
       "options": {
         "alertThreshold": true
       },
@@ -386,11 +388,114 @@
       "seriesOverrides": [],
       "spaceLength": 10,
       "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "increase(${metric_namespace}_tasks_polling_duration_sum{instance=~\"${nodename}\"}[$__rate_interval]) / increase(${metric_namespace}_tasks_polling_duration_count{instance=~\"${nodename}\"}[$__rate_interval])",
+          "interval": "",
+          "legendFormat": "{{task_name}}",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Average time it takes to call Future::poll()",
+      "tooltip": {
+        "shared": true,
+        "sort": 2,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "$$hashKey": "object:2571",
+          "format": "s",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "$$hashKey": "object:2572",
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": false
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": true,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "links": []
+        },
+        "overrides": []
+      },
+      "fill": 0,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 6,
+        "w": 24,
+        "x": 0,
+        "y": 20
+      },
+      "hiddenSeries": false,
+      "id": 15,
+      "interval": "",
+      "legend": {
+        "alignAsTable": true,
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "rightSide": true,
+        "show": true,
+        "total": true,
+        "values": true
+      },
+      "lines": false,
+      "linewidth": 1,
+      "nullPointMode": "null as zero",
+      "options": {
+        "alertThreshold": true
+      },
+      "percentage": false,
+      "pluginVersion": "7.3.6",
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "repeat": "nodename",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": true,
       "steppedLine": true,
       "targets": [
         {
-          "expr": "irate(${metric_namespace}_tasks_spawned_total{instance=~\"${nodename}\"}[$__rate_interval])",
+          "expr": "increase(${metric_namespace}_tasks_spawned_total{instance=~\"${nodename}\"}[$__rate_interval])",
           "interval": "",
+          "intervalFactor": 1,
           "legendFormat": "{{task_name}}",
           "refId": "A"
         }
@@ -399,7 +504,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Number of tasks started per second",
+      "title": "Number of tasks started",
       "tooltip": {
         "shared": true,
         "sort": 2,
@@ -457,17 +562,17 @@
         "h": 6,
         "w": 24,
         "x": 0,
-        "y": 20
+        "y": 26
       },
       "hiddenSeries": false,
       "id": 2,
       "interval": "",
       "legend": {
         "alignAsTable": true,
-        "avg": true,
-        "current": false,
-        "max": false,
-        "min": false,
+        "avg": false,
+        "current": true,
+        "max": true,
+        "min": true,
         "rightSide": true,
         "show": true,
         "total": false,
@@ -488,7 +593,7 @@
       "seriesOverrides": [],
       "spaceLength": 10,
       "stack": false,
-      "steppedLine": true,
+      "steppedLine": false,
       "targets": [
         {
           "expr": "${metric_namespace}_tasks_spawned_total{instance=~\"${nodename}\"} - sum(${metric_namespace}_tasks_ended_total{instance=~\"${nodename}\"}) without(reason)\n\n# Fallback if tasks_ended_total is null for that task\nor on(instance, task_name) ${metric_namespace}_tasks_spawned_total{instance=~\"${nodename}\"}",
@@ -520,7 +625,7 @@
           "$$hashKey": "object:919",
           "format": "short",
           "label": null,
-          "logBase": 10,
+          "logBase": 1,
           "max": null,
           "min": "0",
           "show": true
@@ -560,7 +665,7 @@
         "h": 6,
         "w": 24,
         "x": 0,
-        "y": 26
+        "y": 32
       },
       "hiddenSeries": false,
       "id": 7,
@@ -653,7 +758,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 32
+        "y": 38
       },
       "id": 27,
       "panels": [],
@@ -679,7 +784,7 @@
         "h": 7,
         "w": 24,
         "x": 0,
-        "y": 33
+        "y": 39
       },
       "hiddenSeries": false,
       "id": 32,
@@ -780,7 +885,7 @@
         "h": 7,
         "w": 24,
         "x": 0,
-        "y": 40
+        "y": 46
       },
       "hiddenSeries": false,
       "id": 33,
@@ -955,5 +1060,5 @@
   "timezone": "utc",
   "title": "Substrate Service Tasks",
   "uid": "3LA6XNqZz",
-  "version": 60
+  "version": 69
 }
\ No newline at end of file

From 1bbcc4fab193adaf8dc9e5729000e387b260f69f Mon Sep 17 00:00:00 2001
From: Xiliang Chen <xlchen1291@gmail.com>
Date: Thu, 20 May 2021 22:11:07 +1200
Subject: [PATCH 0762/1194] Update decimals & website for Karura (#8863)

---
 ss58-registry.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ss58-registry.json b/ss58-registry.json
index 43d0117f24f9..25086ae08aed 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -85,11 +85,11 @@
 		{
 			"prefix": 8,
 			"network": "karura",
-			"displayName": "Acala Karura Canary",
+			"displayName": "Karura",
 			"symbols": ["KAR"],
-			"decimals": [18],
+			"decimals": [12],
 			"standardAccount": "*25519",
-			"website": "https://acala.network/"
+			"website": "https://karura.network/"
 		},
 		{
 			"prefix": 9,
@@ -105,7 +105,7 @@
 			"network": "acala",
 			"displayName": "Acala",
 			"symbols": ["ACA"],
-			"decimals": [18],
+			"decimals": [12],
 			"standardAccount": "*25519",
 			"website": "https://acala.network/"
 		},

From 46b3b68d43473b346ed8c2e511bf2509ee11fca7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Thu, 20 May 2021 14:01:43 +0200
Subject: [PATCH 0763/1194] contracts: Add `seal_rent_status` (#8780)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Move public functions up in rent.rs

* Added RentStatus

* Fix test name for consistency

Co-authored-by: Michael Müller <michi@parity.io>

* Mark rent functions as unstable

* Add unstable interfaces to README

* Fix doc typos

Co-authored-by: Andrew Jones <ascjones@gmail.com>

* Use DefaultNoBound

* Simplify calc_share(1)

* Don't output empty debug messages

* Make `seal_debug_message` unstable

Co-authored-by: Michael Müller <michi@parity.io>
Co-authored-by: Andrew Jones <ascjones@gmail.com>
---
 bin/node/runtime/Cargo.toml                   |    5 +
 frame/contracts/Cargo.toml                    |    4 +
 frame/contracts/README.md                     |   26 +-
 .../fixtures/debug_message_invalid_utf8.wat   |    2 +-
 .../debug_message_logging_disabled.wat        |    2 +-
 .../fixtures/debug_message_works.wat          |    2 +-
 frame/contracts/src/benchmarking/code.rs      |    5 +-
 frame/contracts/src/benchmarking/mod.rs       |   35 +-
 frame/contracts/src/exec.rs                   |   92 +-
 frame/contracts/src/gas.rs                    |   14 +-
 frame/contracts/src/rent.rs                   |  573 ++++----
 frame/contracts/src/schedule.rs               |   18 +-
 frame/contracts/src/tests.rs                  |    3 +
 frame/contracts/src/wasm/env_def/macros.rs    |   59 +-
 frame/contracts/src/wasm/mod.rs               |  130 +-
 frame/contracts/src/wasm/runtime.rs           |   96 +-
 frame/contracts/src/weights.rs                | 1281 +++++++++--------
 17 files changed, 1309 insertions(+), 1038 deletions(-)

diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index 512f32d66a66..862bb3baec7d 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -237,3 +237,8 @@ try-runtime = [
 	"pallet-vesting/try-runtime",
 	"pallet-gilt/try-runtime",
 ]
+# Make contract callable functions marked as __unstable__ available. Do not enable
+# on live chains as those are subject to change.
+contracts-unstable-interface = [
+	"pallet-contracts/unstable-interface"
+]
diff --git a/frame/contracts/Cargo.toml b/frame/contracts/Cargo.toml
index 9381f3be5c93..f09e61c3e5ba 100644
--- a/frame/contracts/Cargo.toml
+++ b/frame/contracts/Cargo.toml
@@ -72,5 +72,9 @@ runtime-benchmarks = [
 	"frame-benchmarking",
 	"rand",
 	"rand_pcg",
+	"unstable-interface",
 ]
 try-runtime = ["frame-support/try-runtime"]
+# Make contract callable functions marked as __unstable__ available. Do not enable
+# on live chains as those are subject to change.
+unstable-interface = []
diff --git a/frame/contracts/README.md b/frame/contracts/README.md
index 0b34a55ff42f..f3a8d13f6e77 100644
--- a/frame/contracts/README.md
+++ b/frame/contracts/README.md
@@ -69,7 +69,8 @@ It is up the the individual client if and how those messages are presented to th
 This buffer is also printed as a debug message. In order to see these messages on the node
 console the log level for the `runtime::contracts` target needs to be raised to at least
 the `debug` level. However, those messages are easy to overlook because of the noise generated
-by block production. A good starting point for observing them on the console is:
+by block production. A good starting point for observing them on the console is using this
+command line in the root directory of the substrate repository:
 
 ```bash
 cargo run --release -- --dev --tmp -lerror,runtime::contracts=debug
@@ -81,4 +82,27 @@ to `error` in order to prevent them from spamming the console.
 `--dev`: Use a dev chain spec
 `--tmp`: Use temporary storage for chain data (the chain state is deleted on exit)
 
+## Unstable Interfaces
+
+Driven by the desire to have an iterative approach in developing new contract interfaces
+this pallet contains the concept of an unstable interface. Akin to the rust nightly compiler
+it allows us to add new interfaces but mark them as unstable so that contract languages can
+experiment with them and give feedback before we stabilize those.
+
+In order to access interfaces marked as `__unstable__` in `runtime.rs` one need to compile
+this crate with the `unstable-interface` feature enabled. It should be obvious that any
+live runtime should never be compiled with this feature: In addition to be subject to
+change or removal those interfaces do not have proper weights associated with them and
+are therefore considered unsafe.
+
+The substrate runtime exposes this feature as `contracts-unstable-interface`. Example
+commandline for running the substrate node with unstable contracts interfaces:
+
+```bash
+cargo run --release --features contracts-unstable-interface -- --dev
+```
+
+New interfaces are generally added as unstable and might go through several iterations
+before they are promoted to a stable interface.
+
 License: Apache-2.0
diff --git a/frame/contracts/fixtures/debug_message_invalid_utf8.wat b/frame/contracts/fixtures/debug_message_invalid_utf8.wat
index c60371076440..82cabb6fdca4 100644
--- a/frame/contracts/fixtures/debug_message_invalid_utf8.wat
+++ b/frame/contracts/fixtures/debug_message_invalid_utf8.wat
@@ -1,6 +1,6 @@
 ;; Emit a "Hello World!" debug message
 (module
-	(import "seal0" "seal_debug_message" (func $seal_debug_message (param i32 i32) (result i32)))
+	(import "__unstable__" "seal_debug_message" (func $seal_debug_message (param i32 i32) (result i32)))
 	(import "env" "memory" (memory 1 1))
 
 	(data (i32.const 0) "\fc")
diff --git a/frame/contracts/fixtures/debug_message_logging_disabled.wat b/frame/contracts/fixtures/debug_message_logging_disabled.wat
index cfe238943ad0..0eaa9696afb6 100644
--- a/frame/contracts/fixtures/debug_message_logging_disabled.wat
+++ b/frame/contracts/fixtures/debug_message_logging_disabled.wat
@@ -1,6 +1,6 @@
 ;; Emit a "Hello World!" debug message but assume that logging is disabled.
 (module
-	(import "seal0" "seal_debug_message" (func $seal_debug_message (param i32 i32) (result i32)))
+	(import "__unstable__" "seal_debug_message" (func $seal_debug_message (param i32 i32) (result i32)))
 	(import "env" "memory" (memory 1 1))
 
 	(data (i32.const 0) "Hello World!")
diff --git a/frame/contracts/fixtures/debug_message_works.wat b/frame/contracts/fixtures/debug_message_works.wat
index 61933c232961..1a50a51e3e0d 100644
--- a/frame/contracts/fixtures/debug_message_works.wat
+++ b/frame/contracts/fixtures/debug_message_works.wat
@@ -1,6 +1,6 @@
 ;; Emit a "Hello World!" debug message
 (module
-	(import "seal0" "seal_debug_message" (func $seal_debug_message (param i32 i32) (result i32)))
+	(import "__unstable__" "seal_debug_message" (func $seal_debug_message (param i32 i32) (result i32)))
 	(import "env" "memory" (memory 1 1))
 
 	(data (i32.const 0) "Hello World!")
diff --git a/frame/contracts/src/benchmarking/code.rs b/frame/contracts/src/benchmarking/code.rs
index 811ba71bdea7..930996a437c5 100644
--- a/frame/contracts/src/benchmarking/code.rs
+++ b/frame/contracts/src/benchmarking/code.rs
@@ -103,6 +103,7 @@ impl ImportedMemory {
 }
 
 pub struct ImportedFunction {
+	pub module: &'static str,
 	pub name: &'static str,
 	pub params: Vec<ValueType>,
 	pub return_type: Option<ValueType>,
@@ -171,7 +172,7 @@ where
 				.build_sig();
 			let sig = contract.push_signature(sig);
 			contract = contract.import()
-				.module("seal0")
+				.module(func.module)
 				.field(func.name)
 				.with_external(parity_wasm::elements::External::Function(sig))
 				.build();
@@ -292,6 +293,7 @@ where
 		ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
+				module: "seal0",
 				name: getter_name,
 				params: vec![ValueType::I32, ValueType::I32],
 				return_type: None,
@@ -321,6 +323,7 @@ where
 		ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
+				module: "seal0",
 				name,
 				params: vec![ValueType::I32, ValueType::I32, ValueType::I32],
 				return_type: None,
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index cab80d63bbce..91210f08883e 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -527,20 +527,13 @@ benchmarks! {
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
-	seal_rent_params {
-		let r in 0 .. API_BENCHMARK_BATCHES;
-		let instance = Contract::<T>::new(WasmModule::getter(
-			"seal_rent_params", r * API_BENCHMARK_BATCH_SIZE
-		), vec![], Endow::Max)?;
-		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
-
 	seal_weight_to_fee {
 		let r in 0 .. API_BENCHMARK_BATCHES;
 		let pages = code::max_pages::<T>();
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
+				module: "seal0",
 				name: "seal_weight_to_fee",
 				params: vec![ValueType::I64, ValueType::I32, ValueType::I32],
 				return_type: None,
@@ -565,6 +558,7 @@ benchmarks! {
 		let r in 0 .. API_BENCHMARK_BATCHES;
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			imported_functions: vec![ImportedFunction {
+				module: "seal0",
 				name: "gas",
 				params: vec![ValueType::I32],
 				return_type: None,
@@ -588,6 +582,7 @@ benchmarks! {
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
+				module: "seal0",
 				name: "seal_input",
 				params: vec![ValueType::I32, ValueType::I32],
 				return_type: None,
@@ -616,6 +611,7 @@ benchmarks! {
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
+				module: "seal0",
 				name: "seal_input",
 				params: vec![ValueType::I32, ValueType::I32],
 				return_type: None,
@@ -645,6 +641,7 @@ benchmarks! {
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
+				module: "seal0",
 				name: "seal_return",
 				params: vec![ValueType::I32, ValueType::I32, ValueType::I32],
 				return_type: None,
@@ -666,6 +663,7 @@ benchmarks! {
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
+				module: "seal0",
 				name: "seal_return",
 				params: vec![ValueType::I32, ValueType::I32, ValueType::I32],
 				return_type: None,
@@ -692,6 +690,7 @@ benchmarks! {
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
+				module: "seal0",
 				name: "seal_terminate",
 				params: vec![ValueType::I32, ValueType::I32],
 				return_type: None,
@@ -729,6 +728,7 @@ benchmarks! {
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
+				module: "seal0",
 				name: "seal_terminate",
 				params: vec![ValueType::I32, ValueType::I32],
 				return_type: None,
@@ -780,6 +780,7 @@ benchmarks! {
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
+				module: "seal0",
 				name: "seal_restore_to",
 				params: vec![
 					ValueType::I32,
@@ -864,6 +865,7 @@ benchmarks! {
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
+				module: "seal0",
 				name: "seal_restore_to",
 				params: vec![
 					ValueType::I32,
@@ -935,6 +937,7 @@ benchmarks! {
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
+				module: "seal0",
 				name: "seal_random",
 				params: vec![ValueType::I32, ValueType::I32, ValueType::I32, ValueType::I32],
 				return_type: None,
@@ -965,6 +968,7 @@ benchmarks! {
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
+				module: "seal0",
 				name: "seal_deposit_event",
 				params: vec![ValueType::I32, ValueType::I32, ValueType::I32, ValueType::I32],
 				return_type: None,
@@ -996,6 +1000,7 @@ benchmarks! {
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
+				module: "seal0",
 				name: "seal_deposit_event",
 				params: vec![ValueType::I32, ValueType::I32, ValueType::I32, ValueType::I32],
 				return_type: None,
@@ -1026,6 +1031,7 @@ benchmarks! {
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory { min_pages: 1, max_pages: 1 }),
 			imported_functions: vec![ImportedFunction {
+				module: "seal0",
 				name: "seal_set_rent_allowance",
 				params: vec![ValueType::I32, ValueType::I32],
 				return_type: None,
@@ -1056,6 +1062,7 @@ benchmarks! {
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory { min_pages: 1, max_pages: 1 }),
 			imported_functions: vec![ImportedFunction {
+				module: "__unstable__",
 				name: "seal_debug_message",
 				params: vec![ValueType::I32, ValueType::I32],
 				return_type: Some(ValueType::I32),
@@ -1085,6 +1092,7 @@ benchmarks! {
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
+				module: "seal0",
 				name: "seal_set_storage",
 				params: vec![ValueType::I32, ValueType::I32, ValueType::I32],
 				return_type: None,
@@ -1114,6 +1122,7 @@ benchmarks! {
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
+				module: "seal0",
 				name: "seal_set_storage",
 				params: vec![ValueType::I32, ValueType::I32, ValueType::I32],
 				return_type: None,
@@ -1149,6 +1158,7 @@ benchmarks! {
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
+				module: "seal0",
 				name: "seal_clear_storage",
 				params: vec![ValueType::I32],
 				return_type: None,
@@ -1192,6 +1202,7 @@ benchmarks! {
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
+				module: "seal0",
 				name: "seal_get_storage",
 				params: vec![ValueType::I32, ValueType::I32, ValueType::I32],
 				return_type: Some(ValueType::I32),
@@ -1233,6 +1244,7 @@ benchmarks! {
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
+				module: "seal0",
 				name: "seal_get_storage",
 				params: vec![ValueType::I32, ValueType::I32, ValueType::I32],
 				return_type: Some(ValueType::I32),
@@ -1285,6 +1297,7 @@ benchmarks! {
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
+				module: "seal0",
 				name: "seal_transfer",
 				params: vec![ValueType::I32, ValueType::I32, ValueType::I32, ValueType::I32],
 				return_type: Some(ValueType::I32),
@@ -1336,6 +1349,7 @@ benchmarks! {
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
+				module: "seal0",
 				name: "seal_call",
 				params: vec![
 					ValueType::I32,
@@ -1387,6 +1401,7 @@ benchmarks! {
 		let callee_code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
+				module: "seal0",
 				name: "seal_return",
 				params: vec![
 					ValueType::I32,
@@ -1417,6 +1432,7 @@ benchmarks! {
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
+				module: "seal0",
 				name: "seal_call",
 				params: vec![
 					ValueType::I32,
@@ -1502,6 +1518,7 @@ benchmarks! {
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
+				module: "seal0",
 				name: "seal_instantiate",
 				params: vec![
 					ValueType::I32,
@@ -1584,6 +1601,7 @@ benchmarks! {
 		let callee_code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
+				module: "seal0",
 				name: "seal_return",
 				params: vec![
 					ValueType::I32,
@@ -1627,6 +1645,7 @@ benchmarks! {
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
+				module: "seal0",
 				name: "seal_instantiate",
 				params: vec![
 					ValueType::I32,
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index 793b4c4bf291..d69964ff778b 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -17,7 +17,7 @@
 
 use crate::{
 	CodeHash, Event, Config, Pallet as Contracts,
-	BalanceOf, ContractInfo, gas::GasMeter, rent::Rent, storage::Storage,
+	BalanceOf, ContractInfo, gas::GasMeter, rent::{Rent, RentStatus}, storage::Storage,
 	Error, ContractInfoOf, Schedule, AliveContractInfo, AccountCounter,
 };
 use sp_core::crypto::UncheckedFrom;
@@ -32,7 +32,7 @@ use frame_support::{
 	storage::{with_transaction, TransactionOutcome},
 	traits::{ExistenceRequirement, Currency, Time, Randomness, Get},
 	weights::Weight,
-	ensure,
+	ensure, DefaultNoBound,
 };
 use pallet_contracts_primitives::{ExecReturnValue};
 use smallvec::{SmallVec, Array};
@@ -82,7 +82,7 @@ impl<T: Into<DispatchError>> From<T> for ExecError {
 }
 
 /// Information needed for rent calculations that can be requested by a contract.
-#[derive(codec::Encode)]
+#[derive(codec::Encode, DefaultNoBound)]
 #[cfg_attr(test, derive(Debug, PartialEq))]
 pub struct RentParams<T: Config> {
 	/// The total balance of the contract. Includes the balance transferred from the caller.
@@ -142,27 +142,6 @@ where
 	}
 }
 
-/// We cannot derive `Default` because `T` does not necessarily implement `Default`.
-#[cfg(test)]
-impl<T: Config> Default for RentParams<T> {
-	fn default() -> Self {
-		Self {
-			total_balance: Default::default(),
-			free_balance: Default::default(),
-			subsistence_threshold: Default::default(),
-			deposit_per_contract: Default::default(),
-			deposit_per_storage_byte: Default::default(),
-			deposit_per_storage_item: Default::default(),
-			rent_allowance: Default::default(),
-			rent_fraction: Default::default(),
-			storage_size: Default::default(),
-			code_size: Default::default(),
-			code_refcount: Default::default(),
-			_reserved: Default::default(),
-		}
-	}
-}
-
 /// An interface that provides access to the external environment in which the
 /// smart-contract is executed.
 ///
@@ -313,6 +292,9 @@ pub trait Ext: sealing::Sealed {
 	/// Information needed for rent calculations.
 	fn rent_params(&self) -> &RentParams<Self::T>;
 
+	/// Information about the required deposit and resulting rent.
+	fn rent_status(&mut self, at_refcount: u32) -> RentStatus<Self::T>;
+
 	/// Get a mutable reference to the nested gas meter.
 	fn gas_meter(&mut self) -> &mut GasMeter<Self::T>;
 
@@ -909,11 +891,11 @@ where
 				}
 			}
 		} else {
-			if let Some(message) = &self.debug_message {
+			if let Some((msg, false)) = self.debug_message.as_ref().map(|m| (m, m.is_empty())) {
 				log::debug!(
 					target: "runtime::contracts",
-					"Debug Message: {}",
-					core::str::from_utf8(message).unwrap_or("<Invalid UTF8>"),
+					"Execution finished with debug buffer: {}",
+					core::str::from_utf8(msg).unwrap_or("<Invalid UTF8>"),
 				);
 			}
 			// Write back to the root gas meter.
@@ -1240,6 +1222,20 @@ where
 		&self.top_frame().rent_params
 	}
 
+	fn rent_status(&mut self, at_refcount: u32) -> RentStatus<Self::T> {
+		let frame = self.top_frame_mut();
+		let balance = T::Currency::free_balance(&frame.account_id);
+		let code_size = frame.rent_params.code_size;
+		let refcount = frame.rent_params.code_refcount;
+		<Rent<T, E>>::rent_status(
+			&balance,
+			&frame.contract_info(),
+			code_size,
+			refcount,
+			at_refcount,
+		)
+	}
+
 	fn gas_meter(&mut self) -> &mut GasMeter<Self::T> {
 		&mut self.top_frame_mut().nested_meter
 	}
@@ -2194,6 +2190,48 @@ mod tests {
 		});
 	}
 
+	#[test]
+	fn rent_status_works() {
+		let code_hash = MockLoader::insert(Call, |ctx, _| {
+			assert_eq!(ctx.ext.rent_status(0), RentStatus {
+				max_deposit: 80000,
+				current_deposit: 80000,
+				custom_refcount_deposit: None,
+				max_rent: 32,
+				current_rent: 32,
+				custom_refcount_rent: None,
+				_reserved: None,
+			});
+			assert_eq!(ctx.ext.rent_status(1), RentStatus {
+				max_deposit: 80000,
+				current_deposit: 80000,
+				custom_refcount_deposit: Some(80000),
+				max_rent: 32,
+				current_rent: 32,
+				custom_refcount_rent: Some(32),
+				_reserved: None,
+			});
+			exec_success()
+		});
+
+		ExtBuilder::default().build().execute_with(|| {
+			let subsistence = Contracts::<Test>::subsistence_threshold();
+			let schedule = <Test as Config>::Schedule::get();
+			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
+			set_balance(&ALICE, subsistence * 10);
+			place_contract(&BOB, code_hash);
+			MockStack::run_call(
+				ALICE,
+				BOB,
+				&mut gas_meter,
+				&schedule,
+				0,
+				vec![],
+				None,
+			).unwrap();
+		});
+	}
+
 	#[test]
 	fn in_memory_changes_not_discarded() {
 		// Call stack: BOB -> CHARLIE (trap) -> BOB' (success)
diff --git a/frame/contracts/src/gas.rs b/frame/contracts/src/gas.rs
index 21b9cce38c2b..2c19c999b56a 100644
--- a/frame/contracts/src/gas.rs
+++ b/frame/contracts/src/gas.rs
@@ -23,6 +23,7 @@ use frame_support::{
 		DispatchResultWithPostInfo, PostDispatchInfo, DispatchErrorWithPostInfo, DispatchError,
 	},
 	weights::Weight,
+	DefaultNoBound,
 };
 use sp_core::crypto::UncheckedFrom;
 
@@ -73,6 +74,7 @@ pub struct ErasedToken {
 	pub token: Box<dyn Any>,
 }
 
+#[derive(DefaultNoBound)]
 pub struct GasMeter<T: Config> {
 	gas_limit: Weight,
 	/// Amount of gas left from initial gas limit. Can reach zero.
@@ -82,18 +84,6 @@ pub struct GasMeter<T: Config> {
 	tokens: Vec<ErasedToken>,
 }
 
-impl<T: Config> Default for GasMeter<T> {
-	fn default() -> Self {
-		Self {
-			gas_limit: Default::default(),
-			gas_left: Default::default(),
-			_phantom: Default::default(),
-			#[cfg(test)]
-			tokens: Default::default(),
-		}
-	}
-}
-
 impl<T: Config> GasMeter<T>
 where
 	T::AccountId: UncheckedFrom<<T as frame_system::Config>::Hash> + AsRef<[u8]>
diff --git a/frame/contracts/src/rent.rs b/frame/contracts/src/rent.rs
index d57a3004aa0c..5999a152d04d 100644
--- a/frame/contracts/src/rent.rs
+++ b/frame/contracts/src/rent.rs
@@ -28,6 +28,7 @@ use sp_core::crypto::UncheckedFrom;
 use frame_support::{
 	storage::child,
 	traits::{Currency, ExistenceRequirement, Get, OnUnbalanced, WithdrawReasons},
+	DefaultNoBound,
 };
 use pallet_contracts_primitives::{ContractAccessError, RentProjection, RentProjectionResult};
 use sp_runtime::{
@@ -35,54 +36,32 @@ use sp_runtime::{
 	traits::{Bounded, CheckedDiv, CheckedMul, SaturatedConversion, Saturating, Zero},
 };
 
-/// The amount to charge.
+/// Information about the required deposit and resulting rent.
 ///
-/// This amount respects the contract's rent allowance and the subsistence deposit.
-/// Because of that, charging the amount cannot remove the contract.
-struct OutstandingAmount<T: Config> {
-	amount: BalanceOf<T>,
-}
-
-impl<T: Config> OutstandingAmount<T> {
-	/// Create the new outstanding amount.
-	///
-	/// The amount should be always withdrawable and it should not kill the account.
-	fn new(amount: BalanceOf<T>) -> Self {
-		Self { amount }
-	}
-
-	/// Returns the amount this instance wraps.
-	fn peek(&self) -> BalanceOf<T> {
-		self.amount
-	}
-
-	/// Withdraws the outstanding amount from the given account.
-	fn withdraw(self, account: &T::AccountId) {
-		if let Ok(imbalance) = T::Currency::withdraw(
-			account,
-			self.amount,
-			WithdrawReasons::FEE,
-			ExistenceRequirement::KeepAlive,
-		) {
-			// This should never fail. However, let's err on the safe side.
-			T::RentPayment::on_unbalanced(imbalance);
-		}
-	}
-}
-
-enum Verdict<T: Config> {
-	/// The contract is exempted from paying rent.
-	///
-	/// For example, it already paid its rent in the current block, or it has enough deposit for not
-	/// paying rent at all.
-	Exempt,
-	/// The contract cannot afford payment within its rent budget so it gets evicted. However,
-	/// because its balance is greater than the subsistence threshold it leaves a tombstone.
-	Evict {
-		amount: Option<OutstandingAmount<T>>,
-	},
-	/// Everything is OK, we just only take some charge.
-	Charge { amount: OutstandingAmount<T> },
+/// The easiest way to guarantee that a contract stays alive is to assert that
+/// `max_rent == 0` at the **end** of a contract's execution.
+///
+/// # Note
+///
+/// The `current_*` fields do **not** consider changes to the code's refcount made during
+/// the currently running call.
+#[derive(codec::Encode, DefaultNoBound)]
+#[cfg_attr(test, derive(Debug, PartialEq))]
+pub struct RentStatus<T: Config> {
+	/// Required deposit assuming that this contract is the only user of its code.
+	pub max_deposit: BalanceOf<T>,
+	/// Required deposit assuming the code's current refcount.
+	pub current_deposit: BalanceOf<T>,
+	/// Required deposit assuming the specified refcount (None if 0 is supplied).
+	pub custom_refcount_deposit: Option<BalanceOf<T>>,
+	/// Rent that is paid assuming that the contract is the only user of its code.
+	pub max_rent: BalanceOf<T>,
+	/// Rent that is paid given the code's current refcount.
+	pub current_rent: BalanceOf<T>,
+	/// Rent that is paid assuming the specified refcount (None is 0 is supplied).
+	pub custom_refcount_rent: Option<BalanceOf<T>>,
+	/// Reserved for backwards compatible changes to this data structure.
+	pub _reserved: Option<()>,
 }
 
 pub struct Rent<T, E>(sp_std::marker::PhantomData<(T, E)>);
@@ -93,208 +72,6 @@ where
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 	E: Executable<T>,
 {
-	/// Returns a fee charged per block from the contract.
-	///
-	/// This function accounts for the storage rent deposit. I.e. if the contract possesses enough funds
-	/// then the fee can drop to zero.
-	fn compute_fee_per_block(
-		free_balance: &BalanceOf<T>,
-		contract: &AliveContractInfo<T>,
-		code_size_share: u32,
-	) -> BalanceOf<T> {
-		let uncovered_by_balance = T::DepositPerStorageByte::get()
-			.saturating_mul(contract.storage_size.saturating_add(code_size_share).into())
-			.saturating_add(
-				T::DepositPerStorageItem::get()
-					.saturating_mul(contract.pair_count.into())
-			)
-			.saturating_add(T::DepositPerContract::get())
-			.saturating_sub(*free_balance);
-		T::RentFraction::get().mul_ceil(uncovered_by_balance)
-	}
-
-	/// Returns amount of funds available to consume by rent mechanism.
-	///
-	/// Rent mechanism cannot consume more than `rent_allowance` set by the contract and it cannot make
-	/// the balance lower than [`subsistence_threshold`].
-	///
-	/// In case the toal_balance is below the subsistence threshold, this function returns `None`.
-	fn rent_budget(
-		total_balance: &BalanceOf<T>,
-		free_balance: &BalanceOf<T>,
-		contract: &AliveContractInfo<T>,
-	) -> Option<BalanceOf<T>> {
-		let subsistence_threshold = Pallet::<T>::subsistence_threshold();
-		// Reserved balance contributes towards the subsistence threshold to stay consistent
-		// with the existential deposit where the reserved balance is also counted.
-		if *total_balance < subsistence_threshold {
-			return None;
-		}
-
-		// However, reserved balance cannot be charged so we need to use the free balance
-		// to calculate the actual budget (which can be 0).
-		let rent_allowed_to_charge = free_balance.saturating_sub(subsistence_threshold);
-		Some(<BalanceOf<T>>::min(
-			contract.rent_allowance,
-			rent_allowed_to_charge,
-		))
-	}
-
-	/// Consider the case for rent payment of the given account and returns a `Verdict`.
-	///
-	/// Use `handicap` in case you want to change the reference block number. (To get more details see
-	/// `try_eviction` ).
-	fn consider_case(
-		account: &T::AccountId,
-		current_block_number: T::BlockNumber,
-		handicap: T::BlockNumber,
-		contract: &AliveContractInfo<T>,
-		code_size: u32,
-	) -> Verdict<T> {
-		// How much block has passed since the last deduction for the contract.
-		let blocks_passed = {
-			// Calculate an effective block number, i.e. after adjusting for handicap.
-			let effective_block_number = current_block_number.saturating_sub(handicap);
-			effective_block_number.saturating_sub(contract.deduct_block)
-		};
-		if blocks_passed.is_zero() {
-			// Rent has already been paid
-			return Verdict::Exempt;
-		}
-
-		let total_balance = T::Currency::total_balance(account);
-		let free_balance = T::Currency::free_balance(account);
-
-		// An amount of funds to charge per block for storage taken up by the contract.
-		let fee_per_block = Self::compute_fee_per_block(&free_balance, contract, code_size);
-		if fee_per_block.is_zero() {
-			// The rent deposit offset reduced the fee to 0. This means that the contract
-			// gets the rent for free.
-			return Verdict::Exempt;
-		}
-
-		let rent_budget = match Self::rent_budget(&total_balance, &free_balance, contract) {
-			Some(rent_budget) => rent_budget,
-			None => {
-				// All functions that allow a contract to transfer balance enforce
-				// that the contract always stays above the subsistence threshold.
-				// We want the rent system to always leave a tombstone to prevent the
-				// accidental loss of a contract. Ony `seal_terminate` can remove a
-				// contract without a tombstone. Therefore this case should be never
-				// hit.
-				log::error!(
-					target: "runtime::contracts",
-					"Tombstoned a contract that is below the subsistence threshold: {:?}",
-					account,
-				);
-				0u32.into()
-			}
-		};
-
-		let dues = fee_per_block
-			.checked_mul(&blocks_passed.saturated_into::<u32>().into())
-			.unwrap_or_else(|| <BalanceOf<T>>::max_value());
-		let insufficient_rent = rent_budget < dues;
-
-		// If the rent payment cannot be withdrawn due to locks on the account balance, then evict the
-		// account.
-		//
-		// NOTE: This seems problematic because it provides a way to tombstone an account while
-		// avoiding the last rent payment. In effect, someone could retroactively set rent_allowance
-		// for their contract to 0.
-		let dues_limited = dues.min(rent_budget);
-		let can_withdraw_rent = T::Currency::ensure_can_withdraw(
-			account,
-			dues_limited,
-			WithdrawReasons::FEE,
-			free_balance.saturating_sub(dues_limited),
-		)
-		.is_ok();
-
-		if insufficient_rent || !can_withdraw_rent {
-			// The contract cannot afford the rent payment and has a balance above the subsistence
-			// threshold, so it leaves a tombstone.
-			let amount = if can_withdraw_rent {
-				Some(OutstandingAmount::new(dues_limited))
-			} else {
-				None
-			};
-			return Verdict::Evict { amount };
-		}
-
-		return Verdict::Charge {
-			// We choose to use `dues_limited` here instead of `dues` just to err on the safer side.
-			amount: OutstandingAmount::new(dues_limited),
-		};
-	}
-
-	/// Enacts the given verdict and returns the updated `ContractInfo`.
-	///
-	/// `alive_contract_info` should be from the same address as `account`.
-	///
-	/// # Note
-	///
-	/// if `evictable_code` is `None` an `Evict` verdict will not be enacted. This is for
-	/// when calling this function during a `call` where access to the soon to be evicted
-	/// contract should be denied but storage should be left unmodified.
-	fn enact_verdict(
-		account: &T::AccountId,
-		alive_contract_info: AliveContractInfo<T>,
-		current_block_number: T::BlockNumber,
-		verdict: Verdict<T>,
-		evictable_code: Option<PrefabWasmModule<T>>,
-	) -> Result<Option<AliveContractInfo<T>>, DispatchError> {
-		match (verdict, evictable_code) {
-			(Verdict::Evict { amount }, Some(code)) => {
-				// We need to remove the trie first because it is the only operation
-				// that can fail and this function is called without a storage
-				// transaction when called through `claim_surcharge`.
-				Storage::<T>::queue_trie_for_deletion(&alive_contract_info)?;
-
-				if let Some(amount) = amount {
-					amount.withdraw(account);
-				}
-
-				// Note: this operation is heavy.
-				let child_storage_root = child::root(
-					&alive_contract_info.child_trie_info(),
-				);
-
-				let tombstone = <TombstoneContractInfo<T>>::new(
-					&child_storage_root[..],
-					alive_contract_info.code_hash,
-				);
-				let tombstone_info = ContractInfo::Tombstone(tombstone);
-				<ContractInfoOf<T>>::insert(account, &tombstone_info);
-				code.drop_from_storage();
-				<Pallet<T>>::deposit_event(Event::Evicted(account.clone()));
-				Ok(None)
-			}
-			(Verdict::Evict { amount: _ }, None) => {
-				Ok(None)
-			}
-			(Verdict::Exempt, _) =>  {
-				let contract = ContractInfo::Alive(AliveContractInfo::<T> {
-					deduct_block: current_block_number,
-					..alive_contract_info
-				});
-				<ContractInfoOf<T>>::insert(account, &contract);
-				Ok(Some(contract.get_alive().expect("We just constructed it as alive. qed")))
-			},
-			(Verdict::Charge { amount }, _) => {
-				let contract = ContractInfo::Alive(AliveContractInfo::<T> {
-					rent_allowance: alive_contract_info.rent_allowance - amount.peek(),
-					deduct_block: current_block_number,
-					rent_payed: alive_contract_info.rent_payed.saturating_add(amount.peek()),
-					..alive_contract_info
-				});
-				<ContractInfoOf<T>>::insert(account, &contract);
-				amount.withdraw(account);
-				Ok(Some(contract.get_alive().expect("We just constructed it as alive. qed")))
-			}
-		}
-	}
-
 	/// Make account paying the rent for the current block number
 	///
 	/// This functions does **not** evict the contract. It returns `None` in case the
@@ -412,7 +189,7 @@ where
 		// Compute how much would the fee per block be with the *updated* balance.
 		let total_balance = T::Currency::total_balance(account);
 		let free_balance = T::Currency::free_balance(account);
-		let fee_per_block = Self::compute_fee_per_block(
+		let fee_per_block = Self::fee_per_block(
 			&free_balance, &alive_contract_info, code_size,
 		);
 		if fee_per_block.is_zero() {
@@ -532,4 +309,300 @@ where
 
 		Ok((caller_code_len, tombstone_code_len))
 	}
+
+	/// Create a new `RentStatus` struct for pass through to a requesting contract.
+	pub fn rent_status(
+		free_balance: &BalanceOf<T>,
+		contract: &AliveContractInfo<T>,
+		aggregated_code_size: u32,
+		current_refcount: u32,
+		at_refcount: u32,
+	) -> RentStatus<T> {
+		let calc_share = |refcount: u32| {
+			aggregated_code_size.checked_div(refcount).unwrap_or(0)
+		};
+		let current_share = calc_share(current_refcount);
+		let custom_share = calc_share(at_refcount);
+		RentStatus {
+			max_deposit: Self::required_deposit(contract, aggregated_code_size),
+			current_deposit: Self::required_deposit(contract, current_share),
+			custom_refcount_deposit:
+				if at_refcount > 0 {
+					Some(Self::required_deposit(contract, custom_share))
+				} else {
+					None
+				},
+			max_rent: Self::fee_per_block(free_balance, contract, aggregated_code_size),
+			current_rent: Self::fee_per_block(free_balance, contract, current_share),
+			custom_refcount_rent:
+				if at_refcount > 0 {
+					Some(Self::fee_per_block(free_balance, contract, custom_share))
+				} else {
+					None
+				},
+			_reserved: None,
+		}
+	}
+
+	/// Returns how much deposit is required to not pay rent.
+	fn required_deposit(
+		contract: &AliveContractInfo<T>,
+		code_size_share: u32,
+	) -> BalanceOf<T> {
+		T::DepositPerStorageByte::get()
+			.saturating_mul(contract.storage_size.saturating_add(code_size_share).into())
+			.saturating_add(
+				T::DepositPerStorageItem::get()
+					.saturating_mul(contract.pair_count.into())
+			)
+			.saturating_add(T::DepositPerContract::get())
+	}
+
+	/// Returns a fee charged per block from the contract.
+	///
+	/// This function accounts for the storage rent deposit. I.e. if the contract
+	/// possesses enough funds then the fee can drop to zero.
+	fn fee_per_block(
+		free_balance: &BalanceOf<T>,
+		contract: &AliveContractInfo<T>,
+		code_size_share: u32,
+	) -> BalanceOf<T> {
+		let missing_deposit = Self::required_deposit(contract, code_size_share)
+			.saturating_sub(*free_balance);
+		T::RentFraction::get().mul_ceil(missing_deposit)
+	}
+
+	/// Returns amount of funds available to consume by rent mechanism.
+	///
+	/// Rent mechanism cannot consume more than `rent_allowance` set by the contract and it cannot make
+	/// the balance lower than [`subsistence_threshold`].
+	///
+	/// In case the toal_balance is below the subsistence threshold, this function returns `None`.
+	fn rent_budget(
+		total_balance: &BalanceOf<T>,
+		free_balance: &BalanceOf<T>,
+		contract: &AliveContractInfo<T>,
+	) -> Option<BalanceOf<T>> {
+		let subsistence_threshold = Pallet::<T>::subsistence_threshold();
+		// Reserved balance contributes towards the subsistence threshold to stay consistent
+		// with the existential deposit where the reserved balance is also counted.
+		if *total_balance < subsistence_threshold {
+			return None;
+		}
+
+		// However, reserved balance cannot be charged so we need to use the free balance
+		// to calculate the actual budget (which can be 0).
+		let rent_allowed_to_charge = free_balance.saturating_sub(subsistence_threshold);
+		Some(<BalanceOf<T>>::min(
+			contract.rent_allowance,
+			rent_allowed_to_charge,
+		))
+	}
+
+	/// Consider the case for rent payment of the given account and returns a `Verdict`.
+	///
+	/// Use `handicap` in case you want to change the reference block number. (To get more details see
+	/// `try_eviction` ).
+	fn consider_case(
+		account: &T::AccountId,
+		current_block_number: T::BlockNumber,
+		handicap: T::BlockNumber,
+		contract: &AliveContractInfo<T>,
+		code_size: u32,
+	) -> Verdict<T> {
+		// How much block has passed since the last deduction for the contract.
+		let blocks_passed = {
+			// Calculate an effective block number, i.e. after adjusting for handicap.
+			let effective_block_number = current_block_number.saturating_sub(handicap);
+			effective_block_number.saturating_sub(contract.deduct_block)
+		};
+		if blocks_passed.is_zero() {
+			// Rent has already been paid
+			return Verdict::Exempt;
+		}
+
+		let total_balance = T::Currency::total_balance(account);
+		let free_balance = T::Currency::free_balance(account);
+
+		// An amount of funds to charge per block for storage taken up by the contract.
+		let fee_per_block = Self::fee_per_block(&free_balance, contract, code_size);
+		if fee_per_block.is_zero() {
+			// The rent deposit offset reduced the fee to 0. This means that the contract
+			// gets the rent for free.
+			return Verdict::Exempt;
+		}
+
+		let rent_budget = match Self::rent_budget(&total_balance, &free_balance, contract) {
+			Some(rent_budget) => rent_budget,
+			None => {
+				// All functions that allow a contract to transfer balance enforce
+				// that the contract always stays above the subsistence threshold.
+				// We want the rent system to always leave a tombstone to prevent the
+				// accidental loss of a contract. Ony `seal_terminate` can remove a
+				// contract without a tombstone. Therefore this case should be never
+				// hit.
+				log::error!(
+					target: "runtime::contracts",
+					"Tombstoned a contract that is below the subsistence threshold: {:?}",
+					account,
+				);
+				0u32.into()
+			}
+		};
+
+		let dues = fee_per_block
+			.checked_mul(&blocks_passed.saturated_into::<u32>().into())
+			.unwrap_or_else(|| <BalanceOf<T>>::max_value());
+		let insufficient_rent = rent_budget < dues;
+
+		// If the rent payment cannot be withdrawn due to locks on the account balance, then evict the
+		// account.
+		//
+		// NOTE: This seems problematic because it provides a way to tombstone an account while
+		// avoiding the last rent payment. In effect, someone could retroactively set rent_allowance
+		// for their contract to 0.
+		let dues_limited = dues.min(rent_budget);
+		let can_withdraw_rent = T::Currency::ensure_can_withdraw(
+			account,
+			dues_limited,
+			WithdrawReasons::FEE,
+			free_balance.saturating_sub(dues_limited),
+		)
+		.is_ok();
+
+		if insufficient_rent || !can_withdraw_rent {
+			// The contract cannot afford the rent payment and has a balance above the subsistence
+			// threshold, so it leaves a tombstone.
+			let amount = if can_withdraw_rent {
+				Some(OutstandingAmount::new(dues_limited))
+			} else {
+				None
+			};
+			return Verdict::Evict { amount };
+		}
+
+		return Verdict::Charge {
+			// We choose to use `dues_limited` here instead of `dues` just to err on the safer side.
+			amount: OutstandingAmount::new(dues_limited),
+		};
+	}
+
+	/// Enacts the given verdict and returns the updated `ContractInfo`.
+	///
+	/// `alive_contract_info` should be from the same address as `account`.
+	///
+	/// # Note
+	///
+	/// if `evictable_code` is `None` an `Evict` verdict will not be enacted. This is for
+	/// when calling this function during a `call` where access to the soon to be evicted
+	/// contract should be denied but storage should be left unmodified.
+	fn enact_verdict(
+		account: &T::AccountId,
+		alive_contract_info: AliveContractInfo<T>,
+		current_block_number: T::BlockNumber,
+		verdict: Verdict<T>,
+		evictable_code: Option<PrefabWasmModule<T>>,
+	) -> Result<Option<AliveContractInfo<T>>, DispatchError> {
+		match (verdict, evictable_code) {
+			(Verdict::Evict { amount }, Some(code)) => {
+				// We need to remove the trie first because it is the only operation
+				// that can fail and this function is called without a storage
+				// transaction when called through `claim_surcharge`.
+				Storage::<T>::queue_trie_for_deletion(&alive_contract_info)?;
+
+				if let Some(amount) = amount {
+					amount.withdraw(account);
+				}
+
+				// Note: this operation is heavy.
+				let child_storage_root = child::root(
+					&alive_contract_info.child_trie_info(),
+				);
+
+				let tombstone = <TombstoneContractInfo<T>>::new(
+					&child_storage_root[..],
+					alive_contract_info.code_hash,
+				);
+				let tombstone_info = ContractInfo::Tombstone(tombstone);
+				<ContractInfoOf<T>>::insert(account, &tombstone_info);
+				code.drop_from_storage();
+				<Pallet<T>>::deposit_event(Event::Evicted(account.clone()));
+				Ok(None)
+			}
+			(Verdict::Evict { amount: _ }, None) => {
+				Ok(None)
+			}
+			(Verdict::Exempt, _) =>  {
+				let contract = ContractInfo::Alive(AliveContractInfo::<T> {
+					deduct_block: current_block_number,
+					..alive_contract_info
+				});
+				<ContractInfoOf<T>>::insert(account, &contract);
+				Ok(Some(contract.get_alive().expect("We just constructed it as alive. qed")))
+			},
+			(Verdict::Charge { amount }, _) => {
+				let contract = ContractInfo::Alive(AliveContractInfo::<T> {
+					rent_allowance: alive_contract_info.rent_allowance - amount.peek(),
+					deduct_block: current_block_number,
+					rent_payed: alive_contract_info.rent_payed.saturating_add(amount.peek()),
+					..alive_contract_info
+				});
+				<ContractInfoOf<T>>::insert(account, &contract);
+				amount.withdraw(account);
+				Ok(Some(contract.get_alive().expect("We just constructed it as alive. qed")))
+			}
+		}
+	}
+
+
+}
+
+/// The amount to charge.
+///
+/// This amount respects the contract's rent allowance and the subsistence deposit.
+/// Because of that, charging the amount cannot remove the contract.
+struct OutstandingAmount<T: Config> {
+	amount: BalanceOf<T>,
+}
+
+impl<T: Config> OutstandingAmount<T> {
+	/// Create the new outstanding amount.
+	///
+	/// The amount should be always withdrawable and it should not kill the account.
+	fn new(amount: BalanceOf<T>) -> Self {
+		Self { amount }
+	}
+
+	/// Returns the amount this instance wraps.
+	fn peek(&self) -> BalanceOf<T> {
+		self.amount
+	}
+
+	/// Withdraws the outstanding amount from the given account.
+	fn withdraw(self, account: &T::AccountId) {
+		if let Ok(imbalance) = T::Currency::withdraw(
+			account,
+			self.amount,
+			WithdrawReasons::FEE,
+			ExistenceRequirement::KeepAlive,
+		) {
+			// This should never fail. However, let's err on the safe side.
+			T::RentPayment::on_unbalanced(imbalance);
+		}
+	}
+}
+
+enum Verdict<T: Config> {
+	/// The contract is exempted from paying rent.
+	///
+	/// For example, it already paid its rent in the current block, or it has enough deposit for not
+	/// paying rent at all.
+	Exempt,
+	/// The contract cannot afford payment within its rent budget so it gets evicted. However,
+	/// because its balance is greater than the subsistence threshold it leaves a tombstone.
+	Evict {
+		amount: Option<OutstandingAmount<T>>,
+	},
+	/// Everything is OK, we just only take some charge.
+	Charge { amount: OutstandingAmount<T> },
 }
diff --git a/frame/contracts/src/schedule.rs b/frame/contracts/src/schedule.rs
index a94a08e27d79..67f531f2ba6a 100644
--- a/frame/contracts/src/schedule.rs
+++ b/frame/contracts/src/schedule.rs
@@ -23,7 +23,7 @@ use crate::{Config, weights::WeightInfo};
 #[cfg(feature = "std")]
 use serde::{Serialize, Deserialize};
 use pallet_contracts_proc_macro::{ScheduleDebug, WeightDebug};
-use frame_support::weights::Weight;
+use frame_support::{DefaultNoBound, weights::Weight};
 use sp_std::{marker::PhantomData, vec::Vec};
 use codec::{Encode, Decode};
 use parity_wasm::elements;
@@ -46,7 +46,7 @@ pub const INSTR_BENCHMARK_BATCH_SIZE: u32 = 1_000;
 /// should rely on public functions of this type.
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "std", serde(bound(serialize = "", deserialize = "")))]
-#[derive(Clone, Encode, Decode, PartialEq, Eq, ScheduleDebug)]
+#[derive(Clone, Encode, Decode, PartialEq, Eq, ScheduleDebug, DefaultNoBound)]
 pub struct Schedule<T: Config> {
 	/// Describes the upper limits on various metrics.
 	pub(crate) limits: Limits,
@@ -388,9 +388,6 @@ pub struct HostFnWeights<T: Config> {
 	/// Weight per byte hashed by `seal_hash_blake2_128`.
 	pub hash_blake2_128_per_byte: Weight,
 
-	/// Weight of calling `seal_rent_params`.
-	pub rent_params: Weight,
-
 	/// The type parameter is used in the default implementation.
 	#[codec(skip)]
 	pub _phantom: PhantomData<T>
@@ -473,16 +470,6 @@ macro_rules! cost_byte_batched {
 	}
 }
 
-impl<T: Config> Default for Schedule<T> {
-	fn default() -> Self {
-		Self {
-			limits: Default::default(),
-			instruction_weights: Default::default(),
-			host_fn_weights: Default::default(),
-		}
-	}
-}
-
 impl Default for Limits {
 	fn default() -> Self {
 		Self {
@@ -619,7 +606,6 @@ impl<T: Config> Default for HostFnWeights<T> {
 			hash_blake2_256_per_byte: cost_byte_batched!(seal_hash_blake2_256_per_kb),
 			hash_blake2_128: cost_batched!(seal_hash_blake2_128),
 			hash_blake2_128_per_byte: cost_byte_batched!(seal_hash_blake2_128_per_kb),
-			rent_params: cost_batched!(seal_rent_params),
 			_phantom: PhantomData,
 		}
 	}
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index a1308767fb65..f3d6be6279f9 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -2835,6 +2835,7 @@ fn reinstrument_does_charge() {
 }
 
 #[test]
+#[cfg(feature = "unstable-interface")]
 fn debug_message_works() {
 	let (wasm, code_hash) = compile_module::<Test>("debug_message_works").unwrap();
 
@@ -2866,6 +2867,7 @@ fn debug_message_works() {
 }
 
 #[test]
+#[cfg(feature = "unstable-interface")]
 fn debug_message_logging_disabled() {
 	let (wasm, code_hash) = compile_module::<Test>("debug_message_logging_disabled").unwrap();
 
@@ -2905,6 +2907,7 @@ fn debug_message_logging_disabled() {
 }
 
 #[test]
+#[cfg(feature = "unstable-interface")]
 fn debug_message_invalid_utf8() {
 	let (wasm, code_hash) = compile_module::<Test>("debug_message_invalid_utf8").unwrap();
 
diff --git a/frame/contracts/src/wasm/env_def/macros.rs b/frame/contracts/src/wasm/env_def/macros.rs
index 10d61bab1bb2..a8127939c018 100644
--- a/frame/contracts/src/wasm/env_def/macros.rs
+++ b/frame/contracts/src/wasm/env_def/macros.rs
@@ -50,7 +50,12 @@ macro_rules! gen_signature_dispatch {
 		$name:ident
 		( $ctx:ident $( , $names:ident : $params:ty )* ) $( -> $returns:ty )* , $($rest:tt)*
 	) => {
-		if stringify!($module).as_bytes() == $needle_module && stringify!($name).as_bytes() == $needle_name {
+		let module = stringify!($module).as_bytes();
+		#[cfg(not(feature = "unstable-interface"))]
+		if module == b"__unstable__" {
+			return false;
+		}
+		if module == $needle_module && stringify!($name).as_bytes() == $needle_name {
 			let signature = gen_signature!( ( $( $params ),* ) $( -> $returns )* );
 			if $needle_sig == &signature {
 				return true;
@@ -127,8 +132,8 @@ macro_rules! unmarshall_then_body_then_marshall {
 }
 
 macro_rules! define_func {
-	( < E: $seal_ty:tt > $name:ident ( $ctx: ident $(, $names:ident : $params:ty)*) $(-> $returns:ty)* => $body:tt ) => {
-		fn $name< E: $seal_ty >(
+	( $trait:tt $name:ident ( $ctx: ident $(, $names:ident : $params:ty)*) $(-> $returns:ty)* => $body:tt ) => {
+		fn $name< E: $trait >(
 			$ctx: &mut $crate::wasm::Runtime<E>,
 			args: &[sp_sandbox::Value],
 		) -> Result<sp_sandbox::ReturnValue, sp_sandbox::HostError>
@@ -149,24 +154,52 @@ macro_rules! define_func {
 	};
 }
 
-macro_rules! register_func {
-	( $reg_cb:ident, < E: $seal_ty:tt > ; ) => {};
-
-	( $reg_cb:ident, < E: $seal_ty:tt > ;
+macro_rules! register_body {
+	( $reg_cb:ident, $trait:tt;
 		$module:ident $name:ident ( $ctx:ident $( , $names:ident : $params:ty )* )
-		$( -> $returns:ty )* => $body:tt $($rest:tt)*
+		$( -> $returns:ty )* => $body:tt
 	) => {
 		$reg_cb(
 			stringify!($module).as_bytes(),
 			stringify!($name).as_bytes(),
 			{
 				define_func!(
-					< E: $seal_ty > $name ( $ctx $(, $names : $params )* ) $( -> $returns )* => $body
+					 $trait $name ( $ctx $(, $names : $params )* ) $( -> $returns )* => $body
 				);
 				$name::<E>
 			}
 		);
-		register_func!( $reg_cb, < E: $seal_ty > ; $($rest)* );
+	}
+}
+
+macro_rules! register_func {
+	( $reg_cb:ident, $trait:tt; ) => {};
+
+	( $reg_cb:ident, $trait:tt;
+		__unstable__ $name:ident ( $ctx:ident $( , $names:ident : $params:ty )* )
+		$( -> $returns:ty )* => $body:tt $($rest:tt)*
+	) => {
+		#[cfg(feature = "unstable-interface")]
+		register_body!(
+			$reg_cb, $trait;
+			__unstable__ $name
+			( $ctx $( , $names : $params )* )
+			$( -> $returns )* => $body
+		);
+		register_func!( $reg_cb, $trait; $($rest)* );
+	};
+
+	( $reg_cb:ident, $trait:tt;
+		$module:ident $name:ident ( $ctx:ident $( , $names:ident : $params:ty )* )
+		$( -> $returns:ty )* => $body:tt $($rest:tt)*
+	) => {
+		register_body!(
+			$reg_cb, $trait;
+			$module $name
+			( $ctx $( , $names : $params )* )
+			$( -> $returns )* => $body
+		);
+		register_func!( $reg_cb, $trait; $($rest)* );
 	};
 }
 
@@ -178,7 +211,7 @@ macro_rules! register_func {
 /// It's up to the user of this macro to check signatures of wasm code to be executed
 /// and reject the code if any imported function has a mismatched signature.
 macro_rules! define_env {
-	( $init_name:ident , < E: $seal_ty:tt > ,
+	( $init_name:ident , < E: $trait:tt > ,
 		$( [$module:ident] $name:ident ( $ctx:ident $( , $names:ident : $params:ty )* )
 			$( -> $returns:ty )* => $body:tt , )*
 	) => {
@@ -204,7 +237,7 @@ macro_rules! define_env {
 			fn impls<F: FnMut(&[u8], &[u8], $crate::wasm::env_def::HostFunc<E>)>(f: &mut F) {
 				register_func!(
 					f,
-					< E: $seal_ty > ;
+					$trait;
 					$( $module $name ( $ctx $( , $names : $params )* ) $( -> $returns)* => $body )*
 				);
 			}
@@ -285,7 +318,7 @@ mod tests {
 
 	#[test]
 	fn macro_define_func() {
-		define_func!( <E: Ext> seal_gas (_ctx, amount: u32) => {
+		define_func!( Ext seal_gas (_ctx, amount: u32) => {
 			let amount = Weight::from(amount);
 			if !amount.is_zero() {
 				Ok(())
diff --git a/frame/contracts/src/wasm/mod.rs b/frame/contracts/src/wasm/mod.rs
index 04e9bf2d905b..ed603732f6c0 100644
--- a/frame/contracts/src/wasm/mod.rs
+++ b/frame/contracts/src/wasm/mod.rs
@@ -247,6 +247,7 @@ mod tests {
 			RentParams, ExecError, ErrorOrigin,
 		},
 		gas::GasMeter,
+		rent::RentStatus,
 		tests::{Test, Call, ALICE, BOB},
 	};
 	use std::collections::HashMap;
@@ -452,6 +453,9 @@ mod tests {
 		fn rent_params(&self) -> &RentParams<Self::T> {
 			&self.rent_params
 		}
+		fn rent_status(&mut self, _at_refcount: u32) -> RentStatus<Self::T> {
+			Default::default()
+		}
 		fn gas_meter(&mut self) -> &mut GasMeter<Self::T> {
 			&mut self.gas_meter
 		}
@@ -1817,9 +1821,14 @@ mod tests {
 		);
 	}
 
-	const CODE_RENT_PARAMS: &str = r#"
+
+
+	#[test]
+	#[cfg(feature = "unstable-interface")]
+	fn rent_params_work() {
+		const CODE_RENT_PARAMS: &str = r#"
 (module
-	(import "seal0" "seal_rent_params" (func $seal_rent_params (param i32 i32)))
+	(import "__unstable__" "seal_rent_params" (func $seal_rent_params (param i32 i32)))
 	(import "seal0" "seal_return" (func $seal_return (param i32 i32 i32)))
 	(import "env" "memory" (memory 1 1))
 
@@ -1846,9 +1855,6 @@ mod tests {
 	(func (export "deploy"))
 )
 "#;
-
-	#[test]
-	fn rent_params_work() {
 		let output = execute(
 			CODE_RENT_PARAMS,
 			vec![],
@@ -1858,9 +1864,56 @@ mod tests {
 		assert_eq!(output, ExecReturnValue { flags: ReturnFlags::empty(), data: rent_params });
 	}
 
-	const CODE_DEBUG_MESSAGE: &str = r#"
+
+
+	#[test]
+	#[cfg(feature = "unstable-interface")]
+	fn rent_status_works() {
+		const CODE_RENT_STATUS: &str = r#"
+(module
+	(import "__unstable__" "seal_rent_status" (func $seal_rent_status (param i32 i32 i32)))
+	(import "seal0" "seal_return" (func $seal_return (param i32 i32 i32)))
+	(import "env" "memory" (memory 1 1))
+
+	;; [0, 4) buffer size = 128 bytes
+	(data (i32.const 0) "\80")
+
+	;; [4; inf) buffer where the result is copied
+
+	(func (export "call")
+		;; Load the rent params into memory
+		(call $seal_rent_status
+			(i32.const 1)		;; at_refcount
+			(i32.const 4)		;; Pointer to the output buffer
+			(i32.const 0)		;; Pointer to the size of the buffer
+		)
+
+		;; Return the contents of the buffer
+		(call $seal_return
+			(i32.const 0)				;; return flags
+			(i32.const 4)				;; buffer pointer
+			(i32.load (i32.const 0))	;; buffer size
+		)
+	)
+
+	(func (export "deploy"))
+)
+"#;
+		let output = execute(
+			CODE_RENT_STATUS,
+			vec![],
+			MockExt::default(),
+		).unwrap();
+		let rent_status = Bytes(<RentStatus<Test>>::default().encode());
+		assert_eq!(output, ExecReturnValue { flags: ReturnFlags::empty(), data: rent_status });
+	}
+
+	#[test]
+	#[cfg(feature = "unstable-interface")]
+	fn debug_message_works() {
+		const CODE_DEBUG_MESSAGE: &str = r#"
 (module
-	(import "seal0" "seal_debug_message" (func $seal_debug_message (param i32 i32) (result i32)))
+	(import "__unstable__" "seal_debug_message" (func $seal_debug_message (param i32 i32) (result i32)))
 	(import "env" "memory" (memory 1 1))
 
 	(data (i32.const 0) "Hello World!")
@@ -1876,9 +1929,6 @@ mod tests {
 	(func (export "deploy"))
 )
 "#;
-
-	#[test]
-	fn debug_message_works() {
 		let mut ext = MockExt::default();
 		execute(
 			CODE_DEBUG_MESSAGE,
@@ -1889,39 +1939,39 @@ mod tests {
 		assert_eq!(std::str::from_utf8(&ext.debug_buffer).unwrap(), "Hello World!");
 	}
 
-	const CODE_DEBUG_MESSAGE_FAIL: &str = r#"
-	(module
-		(import "seal0" "seal_debug_message" (func $seal_debug_message (param i32 i32) (result i32)))
-		(import "env" "memory" (memory 1 1))
+	#[test]
+	#[cfg(feature = "unstable-interface")]
+	fn debug_message_invalid_utf8_fails() {
+		const CODE_DEBUG_MESSAGE_FAIL: &str = r#"
+(module
+	(import "__unstable__" "seal_debug_message" (func $seal_debug_message (param i32 i32) (result i32)))
+	(import "env" "memory" (memory 1 1))
 
-		(data (i32.const 0) "\fc")
+	(data (i32.const 0) "\fc")
 
-		(func (export "call")
-			(call $seal_debug_message
-				(i32.const 0)	;; Pointer to the text buffer
-				(i32.const 1)	;; The size of the buffer
-			)
-			drop
+	(func (export "call")
+		(call $seal_debug_message
+			(i32.const 0)	;; Pointer to the text buffer
+			(i32.const 1)	;; The size of the buffer
 		)
-
-		(func (export "deploy"))
+		drop
 	)
-	"#;
 
-		#[test]
-		fn debug_message_invalid_utf8_fails() {
-			let mut ext = MockExt::default();
-			let result = execute(
-				CODE_DEBUG_MESSAGE_FAIL,
-				vec![],
-				&mut ext,
-			);
-			assert_eq!(
-				result,
-				Err(ExecError {
-					error: Error::<Test>::DebugMessageInvalidUTF8.into(),
-					origin: ErrorOrigin::Caller,
-				})
-			);
-		}
+	(func (export "deploy"))
+)
+"#;
+		let mut ext = MockExt::default();
+		let result = execute(
+			CODE_DEBUG_MESSAGE_FAIL,
+			vec![],
+			&mut ext,
+		);
+		assert_eq!(
+			result,
+			Err(ExecError {
+				error: Error::<Test>::DebugMessageInvalidUTF8.into(),
+				origin: ErrorOrigin::Caller,
+			})
+		);
+	}
 }
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index 0935dbe9cbe3..f9e6e9283211 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -73,6 +73,7 @@ pub enum ReturnCode {
 	NotCallable = 8,
 	/// The call to `seal_debug_message` had no effect because debug message
 	/// recording was disabled.
+	#[cfg(feature = "unstable-interface")]
 	LoggingDisabled = 9,
 }
 
@@ -179,6 +180,7 @@ pub enum RuntimeCosts {
 	/// Weight of calling `seal_deposit_event` with the given number of topics and event size.
 	DepositEvent{num_topic: u32, len: u32},
 	/// Weight of calling `seal_debug_message`.
+	#[cfg(feature = "unstable-interface")]
 	DebugMessage,
 	/// Weight of calling `seal_set_rent_allowance`.
 	SetRentAllowance,
@@ -220,8 +222,6 @@ pub enum RuntimeCosts {
 	ChainExtension(u64),
 	/// Weight charged for copying data from the sandbox.
 	CopyIn(u32),
-	/// Weight of calling `seal_rent_params`.
-	RentParams,
 }
 
 impl RuntimeCosts {
@@ -260,6 +260,7 @@ impl RuntimeCosts {
 			DepositEvent{num_topic, len} => s.deposit_event
 				.saturating_add(s.deposit_event_per_topic.saturating_mul(num_topic.into()))
 				.saturating_add(s.deposit_event_per_byte.saturating_mul(len.into())),
+			#[cfg(feature = "unstable-interface")]
 			DebugMessage => s.debug_message,
 			SetRentAllowance => s.set_rent_allowance,
 			SetStorage(len) => s.set_storage
@@ -290,7 +291,6 @@ impl RuntimeCosts {
 				.saturating_add(s.hash_blake2_128_per_byte.saturating_mul(len.into())),
 			ChainExtension(amount) => amount,
 			CopyIn(len) => s.return_per_byte.saturating_mul(len.into()),
-			RentParams => s.rent_params,
 		};
 		RuntimeToken {
 			#[cfg(test)]
@@ -1390,35 +1390,6 @@ define_env!(Env, <E: Ext>,
 		)?)
 	},
 
-	// Emit a custom debug message.
-	//
-	// No newlines are added to the supplied message.
-	// Specifying invalid UTF-8 triggers a trap.
-	//
-	// This is a no-op if debug message recording is disabled which is always the case
-	// when the code is executing on-chain. The message is interpreted as UTF-8 and
-	// appended to the debug buffer which is then supplied to the calling RPC client.
-	//
-	// # Note
-	//
-	// Even though no action is taken when debug message recording is disabled there is still
-	// a non trivial overhead (and weight cost) associated with calling this function. Contract
-	// languages should remove calls to this function (either at runtime or compile time) when
-	// not being executed as an RPC. For example, they could allow users to disable logging
-	// through compile time flags (cargo features) for on-chain deployment. Additionally, the
-	// return value of this function can be cached in order to prevent further calls at runtime.
-	[seal0] seal_debug_message(ctx, str_ptr: u32, str_len: u32) -> ReturnCode => {
-		ctx.charge_gas(RuntimeCosts::DebugMessage)?;
-		if ctx.ext.append_debug_buffer("") {
-			let data = ctx.read_sandbox_memory(str_ptr, str_len)?;
-			let msg = core::str::from_utf8(&data)
-				.map_err(|_| <Error<E::T>>::DebugMessageInvalidUTF8)?;
-			ctx.ext.append_debug_buffer(msg);
-			return Ok(ReturnCode::Success);
-		}
-		Ok(ReturnCode::LoggingDisabled)
-	},
-
 	// Stores the current block number of the current contract into the supplied buffer.
 	//
 	// The value is stored to linear memory at the address pointed to by `out_ptr`.
@@ -1565,6 +1536,35 @@ define_env!(Env, <E: Ext>,
 		}
 	},
 
+	// Emit a custom debug message.
+	//
+	// No newlines are added to the supplied message.
+	// Specifying invalid UTF-8 triggers a trap.
+	//
+	// This is a no-op if debug message recording is disabled which is always the case
+	// when the code is executing on-chain. The message is interpreted as UTF-8 and
+	// appended to the debug buffer which is then supplied to the calling RPC client.
+	//
+	// # Note
+	//
+	// Even though no action is taken when debug message recording is disabled there is still
+	// a non trivial overhead (and weight cost) associated with calling this function. Contract
+	// languages should remove calls to this function (either at runtime or compile time) when
+	// not being executed as an RPC. For example, they could allow users to disable logging
+	// through compile time flags (cargo features) for on-chain deployment. Additionally, the
+	// return value of this function can be cached in order to prevent further calls at runtime.
+	[__unstable__] seal_debug_message(ctx, str_ptr: u32, str_len: u32) -> ReturnCode => {
+		ctx.charge_gas(RuntimeCosts::DebugMessage)?;
+		if ctx.ext.append_debug_buffer("") {
+			let data = ctx.read_sandbox_memory(str_ptr, str_len)?;
+			let msg = core::str::from_utf8(&data)
+				.map_err(|_| <Error<E::T>>::DebugMessageInvalidUTF8)?;
+			ctx.ext.append_debug_buffer(msg);
+			return Ok(ReturnCode::Success);
+		}
+		Ok(ReturnCode::LoggingDisabled)
+	},
+
 	// Stores the rent params into the supplied buffer.
 	//
 	// The value is stored to linear memory at the address pointed to by `out_ptr`.
@@ -1579,10 +1579,38 @@ define_env!(Env, <E: Ext>,
 	// The returned information was collected and cached when the current contract call
 	// started execution. Any change to those values that happens due to actions of the
 	// current call or contracts that are called by this contract are not considered.
-	[seal0] seal_rent_params(ctx, out_ptr: u32, out_len_ptr: u32) => {
-		ctx.charge_gas(RuntimeCosts::RentParams)?;
+	//
+	// # Unstable
+	//
+	// This function is unstable and subject to change (or removal) in the future. Do not
+	// deploy a contract using it to a production chain.
+	[__unstable__] seal_rent_params(ctx, out_ptr: u32, out_len_ptr: u32) => {
 		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &ctx.ext.rent_params().encode(), false, already_charged
 		)?)
 	},
+
+	// Stores the rent status into the supplied buffer.
+	//
+	// The value is stored to linear memory at the address pointed to by `out_ptr`.
+	// `out_len_ptr` must point to a u32 value that describes the available space at
+	// `out_ptr`. This call overwrites it with the size of the value. If the available
+	// space at `out_ptr` is less than the size of the value a trap is triggered.
+	//
+	// The data is encoded as [`crate::rent::RentStatus`].
+	//
+	// # Parameters
+	//
+	// - `at_refcount`: The refcount assumed for the returned `custom_refcount_*` fields
+	//
+	// # Unstable
+	//
+	// This function is unstable and subject to change (or removal) in the future. Do not
+	// deploy a contract using it to a production chain.
+	[__unstable__] seal_rent_status(ctx, at_refcount: u32, out_ptr: u32, out_len_ptr: u32) => {
+		let rent_status = ctx.ext.rent_status(at_refcount).encode();
+		Ok(ctx.write_sandbox_output(
+			out_ptr, out_len_ptr, &rent_status, false, already_charged
+		)?)
+	},
 );
diff --git a/frame/contracts/src/weights.rs b/frame/contracts/src/weights.rs
index ea3f424dd98c..b96a3cad5b73 100644
--- a/frame/contracts/src/weights.rs
+++ b/frame/contracts/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_contracts
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-05-10, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-05-11, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -63,6 +63,7 @@ pub trait WeightInfo {
 	fn seal_block_number(r: u32, ) -> Weight;
 	fn seal_now(r: u32, ) -> Weight;
 	fn seal_rent_params(r: u32, ) -> Weight;
+	fn seal_rent_status(r: u32, ) -> Weight;
 	fn seal_weight_to_fee(r: u32, ) -> Weight;
 	fn seal_gas(r: u32, ) -> Weight;
 	fn seal_input(r: u32, ) -> Weight;
@@ -153,303 +154,310 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn on_initialize() -> Weight {
-		(3_676_000 as Weight)
+		(3_656_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 	}
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((2_259_000 as Weight).saturating_mul(k as Weight))
+			// Standard Error: 3_000
+			.saturating_add((2_241_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 33_000
-			.saturating_add((35_157_000 as Weight).saturating_mul(q as Weight))
+		(36_820_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((34_550_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn instrument(c: u32, ) -> Weight {
-		(42_341_000 as Weight)
-			// Standard Error: 190_000
-			.saturating_add((95_696_000 as Weight).saturating_mul(c as Weight))
+		(42_348_000 as Weight)
+			// Standard Error: 185_000
+			.saturating_add((95_664_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight {
-		(178_191_000 as Weight)
-			// Standard Error: 141_000
-			.saturating_add((135_736_000 as Weight).saturating_mul(c as Weight))
+		(210_852_000 as Weight)
+			// Standard Error: 138_000
+			.saturating_add((135_241_000 as Weight).saturating_mul(c as Weight))
 			// Standard Error: 9_000
-			.saturating_add((1_867_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((1_846_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn instantiate(c: u32, s: u32, ) -> Weight {
-		(183_874_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((8_659_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 1_000
-			.saturating_add((1_781_000 as Weight).saturating_mul(s as Weight))
+		(217_380_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((8_483_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 0
+			.saturating_add((1_752_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn call(c: u32, ) -> Weight {
-		(186_051_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((3_919_000 as Weight).saturating_mul(c as Weight))
+		(181_443_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((3_955_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn claim_surcharge(c: u32, ) -> Weight {
-		(133_967_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((4_733_000 as Weight).saturating_mul(c as Weight))
+		(132_551_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((4_740_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn seal_caller(r: u32, ) -> Weight {
-		(131_758_000 as Weight)
-			// Standard Error: 361_000
-			.saturating_add((249_131_000 as Weight).saturating_mul(r as Weight))
+		(137_742_000 as Weight)
+			// Standard Error: 74_000
+			.saturating_add((242_261_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_address(r: u32, ) -> Weight {
-		(141_100_000 as Weight)
-			// Standard Error: 73_000
-			.saturating_add((245_593_000 as Weight).saturating_mul(r as Weight))
+		(137_739_000 as Weight)
+			// Standard Error: 91_000
+			.saturating_add((241_803_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(141_578_000 as Weight)
-			// Standard Error: 76_000
-			.saturating_add((240_505_000 as Weight).saturating_mul(r as Weight))
+		(139_631_000 as Weight)
+			// Standard Error: 83_000
+			.saturating_add((236_790_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_balance(r: u32, ) -> Weight {
-		(144_329_000 as Weight)
-			// Standard Error: 197_000
-			.saturating_add((529_903_000 as Weight).saturating_mul(r as Weight))
+		(142_506_000 as Weight)
+			// Standard Error: 176_000
+			.saturating_add((525_752_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(137_318_000 as Weight)
-			// Standard Error: 77_000
-			.saturating_add((239_623_000 as Weight).saturating_mul(r as Weight))
+		(138_569_000 as Weight)
+			// Standard Error: 76_000
+			.saturating_add((237_016_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(138_343_000 as Weight)
-			// Standard Error: 260_000
-			.saturating_add((241_997_000 as Weight).saturating_mul(r as Weight))
+		(134_713_000 as Weight)
+			// Standard Error: 81_000
+			.saturating_add((237_962_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(138_989_000 as Weight)
-			// Standard Error: 77_000
-			.saturating_add((239_424_000 as Weight).saturating_mul(r as Weight))
+		(131_523_000 as Weight)
+			// Standard Error: 90_000
+			.saturating_add((237_435_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(140_118_000 as Weight)
-			// Standard Error: 83_000
-			.saturating_add((240_866_000 as Weight).saturating_mul(r as Weight))
+		(141_574_000 as Weight)
+			// Standard Error: 86_000
+			.saturating_add((238_102_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_block_number(r: u32, ) -> Weight {
-		(139_962_000 as Weight)
-			// Standard Error: 69_000
-			.saturating_add((239_267_000 as Weight).saturating_mul(r as Weight))
+		(140_240_000 as Weight)
+			// Standard Error: 101_000
+			.saturating_add((236_568_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_now(r: u32, ) -> Weight {
-		(139_652_000 as Weight)
-			// Standard Error: 69_000
-			.saturating_add((240_282_000 as Weight).saturating_mul(r as Weight))
+		(138_265_000 as Weight)
+			// Standard Error: 91_000
+			.saturating_add((237_187_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_rent_params(r: u32, ) -> Weight {
-		(136_806_000 as Weight)
-			// Standard Error: 104_000
-			.saturating_add((359_911_000 as Weight).saturating_mul(r as Weight))
+		(149_701_000 as Weight)
+			// Standard Error: 297_000
+			.saturating_add((357_149_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn seal_rent_status(r: u32, ) -> Weight {
+		(146_863_000 as Weight)
+			// Standard Error: 191_000
+			.saturating_add((638_683_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(148_086_000 as Weight)
-			// Standard Error: 116_000
-			.saturating_add((470_271_000 as Weight).saturating_mul(r as Weight))
+		(144_278_000 as Weight)
+			// Standard Error: 149_000
+			.saturating_add((470_264_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_gas(r: u32, ) -> Weight {
-		(123_560_000 as Weight)
-			// Standard Error: 295_000
-			.saturating_add((119_119_000 as Weight).saturating_mul(r as Weight))
+		(111_361_000 as Weight)
+			// Standard Error: 157_000
+			.saturating_add((118_441_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_input(r: u32, ) -> Weight {
-		(132_420_000 as Weight)
-			// Standard Error: 83_000
-			.saturating_add((6_835_000 as Weight).saturating_mul(r as Weight))
+		(129_970_000 as Weight)
+			// Standard Error: 316_000
+			.saturating_add((7_160_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(142_119_000 as Weight)
+		(139_275_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((245_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((250_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_return(r: u32, ) -> Weight {
-		(121_030_000 as Weight)
-			// Standard Error: 68_000
-			.saturating_add((4_444_000 as Weight).saturating_mul(r as Weight))
+		(119_240_000 as Weight)
+			// Standard Error: 57_000
+			.saturating_add((4_347_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(131_704_000 as Weight)
+		(128_896_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((756_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((757_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_terminate(r: u32, ) -> Weight {
-		(132_544_000 as Weight)
-			// Standard Error: 113_000
-			.saturating_add((97_343_000 as Weight).saturating_mul(r as Weight))
+		(130_119_000 as Weight)
+			// Standard Error: 108_000
+			.saturating_add((95_078_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_terminate_per_code_kb(c: u32, ) -> Weight {
-		(234_751_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((8_482_000 as Weight).saturating_mul(c as Weight))
+		(230_167_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((8_495_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
 	fn seal_restore_to(r: u32, ) -> Weight {
-		(156_439_000 as Weight)
-			// Standard Error: 1_068_000
-			.saturating_add((96_724_000 as Weight).saturating_mul(r as Weight))
+		(159_200_000 as Weight)
+			// Standard Error: 261_000
+			.saturating_add((103_048_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((5 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_restore_to_per_code_kb_delta(c: u32, t: u32, d: u32, ) -> Weight {
-		(101_920_000 as Weight)
-			// Standard Error: 162_000
-			.saturating_add((7_588_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 162_000
-			.saturating_add((3_475_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 1_431_000
-			.saturating_add((3_733_137_000 as Weight).saturating_mul(d as Weight))
+		(58_389_000 as Weight)
+			// Standard Error: 131_000
+			.saturating_add((7_910_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 131_000
+			.saturating_add((4_036_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 1_156_000
+			.saturating_add((3_714_110_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
 			.saturating_add(T::DbWeight::get().writes(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
 	}
 	fn seal_random(r: u32, ) -> Weight {
-		(151_598_000 as Weight)
-			// Standard Error: 168_000
-			.saturating_add((608_967_000 as Weight).saturating_mul(r as Weight))
+		(138_794_000 as Weight)
+			// Standard Error: 216_000
+			.saturating_add((599_742_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(149_224_000 as Weight)
-			// Standard Error: 205_000
-			.saturating_add((896_074_000 as Weight).saturating_mul(r as Weight))
+		(139_890_000 as Weight)
+			// Standard Error: 263_000
+			.saturating_add((885_805_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_198_650_000 as Weight)
-			// Standard Error: 2_742_000
-			.saturating_add((566_152_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 540_000
-			.saturating_add((248_898_000 as Weight).saturating_mul(n as Weight))
+		(1_117_962_000 as Weight)
+			// Standard Error: 4_029_000
+			.saturating_add((566_825_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 794_000
+			.saturating_add((251_096_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(133_149_000 as Weight)
-			// Standard Error: 72_000
-			.saturating_add((163_281_000 as Weight).saturating_mul(r as Weight))
+		(132_720_000 as Weight)
+			// Standard Error: 87_000
+			.saturating_add((164_134_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_debug_message(r: u32, ) -> Weight {
-		(126_413_000 as Weight)
-			// Standard Error: 127_000
-			.saturating_add((128_176_000 as Weight).saturating_mul(r as Weight))
+		(125_834_000 as Weight)
+			// Standard Error: 142_000
+			.saturating_add((127_200_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 1_710_000
-			.saturating_add((3_933_779_000 as Weight).saturating_mul(r as Weight))
+		(478_734_000 as Weight)
+			// Standard Error: 2_559_000
+			.saturating_add((3_766_445_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(582_721_000 as Weight)
-			// Standard Error: 228_000
-			.saturating_add((71_341_000 as Weight).saturating_mul(n as Weight))
+		(600_306_000 as Weight)
+			// Standard Error: 234_000
+			.saturating_add((70_989_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn seal_clear_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_470_000
-			.saturating_add((1_281_241_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 2_380_000
+			.saturating_add((1_242_131_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_get_storage(r: u32, ) -> Weight {
-		(11_848_000 as Weight)
-			// Standard Error: 1_028_000
-			.saturating_add((934_213_000 as Weight).saturating_mul(r as Weight))
+		(0 as Weight)
+			// Standard Error: 1_060_000
+			.saturating_add((910_861_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(602_494_000 as Weight)
-			// Standard Error: 255_000
-			.saturating_add((152_885_000 as Weight).saturating_mul(n as Weight))
+		(605_545_000 as Weight)
+			// Standard Error: 252_000
+			.saturating_add((153_519_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_transfer(r: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 1_746_000
-			.saturating_add((5_264_601_000 as Weight).saturating_mul(r as Weight))
+		(36_854_000 as Weight)
+			// Standard Error: 2_076_000
+			.saturating_add((5_183_774_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
@@ -457,662 +465,669 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	}
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 13_325_000
-			.saturating_add((11_706_784_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 6_583_000
+			.saturating_add((11_599_057_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((200 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_call_per_code_transfer_input_output_kb(c: u32, t: u32, i: u32, o: u32, ) -> Weight {
-		(9_518_851_000 as Weight)
-			// Standard Error: 349_000
-			.saturating_add((391_414_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 145_480_000
-			.saturating_add((4_113_632_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 46_000
-			.saturating_add((60_888_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 49_000
-			.saturating_add((79_489_000 as Weight).saturating_mul(o as Weight))
+		(10_431_738_000 as Weight)
+			// Standard Error: 301_000
+			.saturating_add((392_174_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 125_400_000
+			.saturating_add((3_698_896_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 39_000
+			.saturating_add((60_692_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 42_000
+			.saturating_add((78_872_000 as Weight).saturating_mul(o as Weight))
 			.saturating_add(T::DbWeight::get().reads(205 as Weight))
 			.saturating_add(T::DbWeight::get().writes(101 as Weight))
 			.saturating_add(T::DbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 39_418_000
-			.saturating_add((21_356_322_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 32_118_000
+			.saturating_add((21_117_947_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes((300 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_instantiate_per_code_input_output_salt_kb(c: u32, i: u32, o: u32, s: u32, ) -> Weight {
-		(12_419_243_000 as Weight)
-			// Standard Error: 1_454_000
-			.saturating_add((848_075_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 206_000
-			.saturating_add((61_500_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 206_000
-			.saturating_add((82_895_000 as Weight).saturating_mul(o as Weight))
-			// Standard Error: 206_000
-			.saturating_add((236_893_000 as Weight).saturating_mul(s as Weight))
+		(8_542_521_000 as Weight)
+			// Standard Error: 644_000
+			.saturating_add((878_020_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 91_000
+			.saturating_add((63_004_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 91_000
+			.saturating_add((83_203_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 91_000
+			.saturating_add((240_170_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(206 as Weight))
 			.saturating_add(T::DbWeight::get().writes(204 as Weight))
 	}
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(129_427_000 as Weight)
-			// Standard Error: 110_000
-			.saturating_add((227_721_000 as Weight).saturating_mul(r as Weight))
+		(130_991_000 as Weight)
+			// Standard Error: 106_000
+			.saturating_add((230_186_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 202_000
-			.saturating_add((494_366_000 as Weight).saturating_mul(n as Weight))
+		(508_089_000 as Weight)
+			// Standard Error: 38_000
+			.saturating_add((491_916_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(133_222_000 as Weight)
-			// Standard Error: 330_000
-			.saturating_add((237_008_000 as Weight).saturating_mul(r as Weight))
+		(135_384_000 as Weight)
+			// Standard Error: 111_000
+			.saturating_add((233_638_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(1_245_757_000 as Weight)
-			// Standard Error: 77_000
-			.saturating_add((339_755_000 as Weight).saturating_mul(n as Weight))
+		(445_961_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((340_992_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(133_091_000 as Weight)
-			// Standard Error: 126_000
-			.saturating_add((208_234_000 as Weight).saturating_mul(r as Weight))
+		(133_593_000 as Weight)
+			// Standard Error: 112_000
+			.saturating_add((208_000_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(799_510_000 as Weight)
-			// Standard Error: 49_000
-			.saturating_add((158_583_000 as Weight).saturating_mul(n as Weight))
+		(444_562_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((159_521_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(130_180_000 as Weight)
-			// Standard Error: 83_000
-			.saturating_add((206_505_000 as Weight).saturating_mul(r as Weight))
+		(131_381_000 as Weight)
+			// Standard Error: 82_000
+			.saturating_add((207_479_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(965_700_000 as Weight)
-			// Standard Error: 64_000
-			.saturating_add((154_387_000 as Weight).saturating_mul(n as Weight))
+		(576_129_000 as Weight)
+			// Standard Error: 49_000
+			.saturating_add((156_900_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(20_233_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((3_445_000 as Weight).saturating_mul(r as Weight))
+		(20_276_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((3_355_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(29_798_000 as Weight)
-			// Standard Error: 1_137_000
-			.saturating_add((137_787_000 as Weight).saturating_mul(r as Weight))
+		(22_345_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((133_628_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(22_914_000 as Weight)
-			// Standard Error: 701_000
-			.saturating_add((205_918_000 as Weight).saturating_mul(r as Weight))
+		(22_294_000 as Weight)
+			// Standard Error: 95_000
+			.saturating_add((204_007_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(20_225_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((12_545_000 as Weight).saturating_mul(r as Weight))
+		(20_266_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((12_605_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(20_196_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((12_677_000 as Weight).saturating_mul(r as Weight))
+		(20_208_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((12_589_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(20_204_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((6_920_000 as Weight).saturating_mul(r as Weight))
+		(20_227_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((6_429_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(20_220_000 as Weight)
-			// Standard Error: 30_000
-			.saturating_add((15_209_000 as Weight).saturating_mul(r as Weight))
+		(20_279_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((14_560_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(20_262_000 as Weight)
-			// Standard Error: 37_000
-			.saturating_add((15_909_000 as Weight).saturating_mul(r as Weight))
+		(20_210_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((15_613_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(35_644_000 as Weight)
+		(34_276_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((82_000 as Weight).saturating_mul(e as Weight))
+			.saturating_add((130_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(20_566_000 as Weight)
-			// Standard Error: 79_000
-			.saturating_add((91_776_000 as Weight).saturating_mul(r as Weight))
+		(20_426_000 as Weight)
+			// Standard Error: 69_000
+			.saturating_add((91_850_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(28_243_000 as Weight)
-			// Standard Error: 207_000
-			.saturating_add((169_342_000 as Weight).saturating_mul(r as Weight))
+		(27_099_000 as Weight)
+			// Standard Error: 111_000
+			.saturating_add((169_212_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(206_233_000 as Weight)
+		(206_492_000 as Weight)
 			// Standard Error: 4_000
 			.saturating_add((4_685_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(37_775_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((3_553_000 as Weight).saturating_mul(r as Weight))
+		(37_892_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((3_510_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(37_836_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((3_745_000 as Weight).saturating_mul(r as Weight))
+		(37_773_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((3_814_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(37_816_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((4_929_000 as Weight).saturating_mul(r as Weight))
+		(37_785_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((4_949_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(23_385_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((7_494_000 as Weight).saturating_mul(r as Weight))
+		(23_467_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((7_493_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(23_334_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((8_306_000 as Weight).saturating_mul(r as Weight))
+		(23_492_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((8_499_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(22_311_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((3_548_000 as Weight).saturating_mul(r as Weight))
+		(22_347_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((3_565_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(20_789_000 as Weight)
-			// Standard Error: 269_000
-			.saturating_add((2_070_923_000 as Weight).saturating_mul(r as Weight))
+		(20_849_000 as Weight)
+			// Standard Error: 2_751_000
+			.saturating_add((2_072_517_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(20_196_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((5_132_000 as Weight).saturating_mul(r as Weight))
+		(20_216_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((5_067_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(20_215_000 as Weight)
-			// Standard Error: 7_000
-			.saturating_add((5_053_000 as Weight).saturating_mul(r as Weight))
+		(20_218_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((5_015_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(20_257_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((5_891_000 as Weight).saturating_mul(r as Weight))
+		(20_215_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((5_888_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(20_263_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((5_438_000 as Weight).saturating_mul(r as Weight))
+		(20_232_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((5_366_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(20_214_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((4_882_000 as Weight).saturating_mul(r as Weight))
+		(20_205_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((4_847_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(20_152_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((4_946_000 as Weight).saturating_mul(r as Weight))
+		(20_181_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((4_849_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(20_216_000 as Weight)
+		(20_175_000 as Weight)
 			// Standard Error: 18_000
-			.saturating_add((4_974_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((4_981_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(20_195_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((7_463_000 as Weight).saturating_mul(r as Weight))
+		(20_273_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((7_402_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(20_170_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((7_425_000 as Weight).saturating_mul(r as Weight))
+		(20_260_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((7_392_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(20_208_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((7_424_000 as Weight).saturating_mul(r as Weight))
+		(20_248_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((7_363_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(20_244_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((7_391_000 as Weight).saturating_mul(r as Weight))
+		(20_229_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((7_412_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(20_218_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((7_384_000 as Weight).saturating_mul(r as Weight))
+		(20_232_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((7_364_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(20_208_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((7_392_000 as Weight).saturating_mul(r as Weight))
+		(20_252_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((7_383_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(20_201_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((7_375_000 as Weight).saturating_mul(r as Weight))
+		(20_258_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((7_359_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(20_213_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((7_460_000 as Weight).saturating_mul(r as Weight))
+		(20_245_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((7_400_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(20_141_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((7_498_000 as Weight).saturating_mul(r as Weight))
+		(20_245_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((7_391_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(20_213_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((7_373_000 as Weight).saturating_mul(r as Weight))
+		(20_230_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((7_439_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(20_137_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((7_325_000 as Weight).saturating_mul(r as Weight))
+		(20_254_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((7_204_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(20_148_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((7_389_000 as Weight).saturating_mul(r as Weight))
+		(20_182_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((7_327_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(20_152_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((7_264_000 as Weight).saturating_mul(r as Weight))
+		(20_203_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((7_221_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(20_153_000 as Weight)
+		(20_187_000 as Weight)
 			// Standard Error: 16_000
-			.saturating_add((13_755_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((13_738_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(20_135_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((12_845_000 as Weight).saturating_mul(r as Weight))
+		(20_153_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((12_766_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(20_203_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((13_792_000 as Weight).saturating_mul(r as Weight))
+		(20_219_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((13_732_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(20_110_000 as Weight)
-			// Standard Error: 30_000
-			.saturating_add((12_880_000 as Weight).saturating_mul(r as Weight))
+		(20_246_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((12_686_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(20_098_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((7_416_000 as Weight).saturating_mul(r as Weight))
+		(20_228_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((7_245_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(20_156_000 as Weight)
+		(20_238_000 as Weight)
 			// Standard Error: 17_000
-			.saturating_add((7_428_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((7_250_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(20_163_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((7_343_000 as Weight).saturating_mul(r as Weight))
+		(20_213_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((7_292_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(20_167_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((7_610_000 as Weight).saturating_mul(r as Weight))
+		(20_224_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_554_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(20_192_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((7_660_000 as Weight).saturating_mul(r as Weight))
+		(20_261_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((7_551_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(20_162_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((7_652_000 as Weight).saturating_mul(r as Weight))
+		(20_212_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((7_616_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(20_151_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((7_890_000 as Weight).saturating_mul(r as Weight))
+		(20_176_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((7_877_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(20_154_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((7_434_000 as Weight).saturating_mul(r as Weight))
+		(20_230_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((7_347_000 as Weight).saturating_mul(r as Weight))
 	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn on_initialize() -> Weight {
-		(3_676_000 as Weight)
+		(3_656_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 	}
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((2_259_000 as Weight).saturating_mul(k as Weight))
+			// Standard Error: 3_000
+			.saturating_add((2_241_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 33_000
-			.saturating_add((35_157_000 as Weight).saturating_mul(q as Weight))
+		(36_820_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((34_550_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn instrument(c: u32, ) -> Weight {
-		(42_341_000 as Weight)
-			// Standard Error: 190_000
-			.saturating_add((95_696_000 as Weight).saturating_mul(c as Weight))
+		(42_348_000 as Weight)
+			// Standard Error: 185_000
+			.saturating_add((95_664_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight {
-		(178_191_000 as Weight)
-			// Standard Error: 141_000
-			.saturating_add((135_736_000 as Weight).saturating_mul(c as Weight))
+		(210_852_000 as Weight)
+			// Standard Error: 138_000
+			.saturating_add((135_241_000 as Weight).saturating_mul(c as Weight))
 			// Standard Error: 9_000
-			.saturating_add((1_867_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((1_846_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn instantiate(c: u32, s: u32, ) -> Weight {
-		(183_874_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((8_659_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 1_000
-			.saturating_add((1_781_000 as Weight).saturating_mul(s as Weight))
+		(217_380_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((8_483_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 0
+			.saturating_add((1_752_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn call(c: u32, ) -> Weight {
-		(186_051_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((3_919_000 as Weight).saturating_mul(c as Weight))
+		(181_443_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((3_955_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn claim_surcharge(c: u32, ) -> Weight {
-		(133_967_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((4_733_000 as Weight).saturating_mul(c as Weight))
+		(132_551_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((4_740_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn seal_caller(r: u32, ) -> Weight {
-		(131_758_000 as Weight)
-			// Standard Error: 361_000
-			.saturating_add((249_131_000 as Weight).saturating_mul(r as Weight))
+		(137_742_000 as Weight)
+			// Standard Error: 74_000
+			.saturating_add((242_261_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_address(r: u32, ) -> Weight {
-		(141_100_000 as Weight)
-			// Standard Error: 73_000
-			.saturating_add((245_593_000 as Weight).saturating_mul(r as Weight))
+		(137_739_000 as Weight)
+			// Standard Error: 91_000
+			.saturating_add((241_803_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(141_578_000 as Weight)
-			// Standard Error: 76_000
-			.saturating_add((240_505_000 as Weight).saturating_mul(r as Weight))
+		(139_631_000 as Weight)
+			// Standard Error: 83_000
+			.saturating_add((236_790_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_balance(r: u32, ) -> Weight {
-		(144_329_000 as Weight)
-			// Standard Error: 197_000
-			.saturating_add((529_903_000 as Weight).saturating_mul(r as Weight))
+		(142_506_000 as Weight)
+			// Standard Error: 176_000
+			.saturating_add((525_752_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(137_318_000 as Weight)
-			// Standard Error: 77_000
-			.saturating_add((239_623_000 as Weight).saturating_mul(r as Weight))
+		(138_569_000 as Weight)
+			// Standard Error: 76_000
+			.saturating_add((237_016_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(138_343_000 as Weight)
-			// Standard Error: 260_000
-			.saturating_add((241_997_000 as Weight).saturating_mul(r as Weight))
+		(134_713_000 as Weight)
+			// Standard Error: 81_000
+			.saturating_add((237_962_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(138_989_000 as Weight)
-			// Standard Error: 77_000
-			.saturating_add((239_424_000 as Weight).saturating_mul(r as Weight))
+		(131_523_000 as Weight)
+			// Standard Error: 90_000
+			.saturating_add((237_435_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(140_118_000 as Weight)
-			// Standard Error: 83_000
-			.saturating_add((240_866_000 as Weight).saturating_mul(r as Weight))
+		(141_574_000 as Weight)
+			// Standard Error: 86_000
+			.saturating_add((238_102_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_block_number(r: u32, ) -> Weight {
-		(139_962_000 as Weight)
-			// Standard Error: 69_000
-			.saturating_add((239_267_000 as Weight).saturating_mul(r as Weight))
+		(140_240_000 as Weight)
+			// Standard Error: 101_000
+			.saturating_add((236_568_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_now(r: u32, ) -> Weight {
-		(139_652_000 as Weight)
-			// Standard Error: 69_000
-			.saturating_add((240_282_000 as Weight).saturating_mul(r as Weight))
+		(138_265_000 as Weight)
+			// Standard Error: 91_000
+			.saturating_add((237_187_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_rent_params(r: u32, ) -> Weight {
-		(136_806_000 as Weight)
-			// Standard Error: 104_000
-			.saturating_add((359_911_000 as Weight).saturating_mul(r as Weight))
+		(149_701_000 as Weight)
+			// Standard Error: 297_000
+			.saturating_add((357_149_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn seal_rent_status(r: u32, ) -> Weight {
+		(146_863_000 as Weight)
+			// Standard Error: 191_000
+			.saturating_add((638_683_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(148_086_000 as Weight)
-			// Standard Error: 116_000
-			.saturating_add((470_271_000 as Weight).saturating_mul(r as Weight))
+		(144_278_000 as Weight)
+			// Standard Error: 149_000
+			.saturating_add((470_264_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_gas(r: u32, ) -> Weight {
-		(123_560_000 as Weight)
-			// Standard Error: 295_000
-			.saturating_add((119_119_000 as Weight).saturating_mul(r as Weight))
+		(111_361_000 as Weight)
+			// Standard Error: 157_000
+			.saturating_add((118_441_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_input(r: u32, ) -> Weight {
-		(132_420_000 as Weight)
-			// Standard Error: 83_000
-			.saturating_add((6_835_000 as Weight).saturating_mul(r as Weight))
+		(129_970_000 as Weight)
+			// Standard Error: 316_000
+			.saturating_add((7_160_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(142_119_000 as Weight)
+		(139_275_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((245_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((250_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_return(r: u32, ) -> Weight {
-		(121_030_000 as Weight)
-			// Standard Error: 68_000
-			.saturating_add((4_444_000 as Weight).saturating_mul(r as Weight))
+		(119_240_000 as Weight)
+			// Standard Error: 57_000
+			.saturating_add((4_347_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(131_704_000 as Weight)
+		(128_896_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((756_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((757_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_terminate(r: u32, ) -> Weight {
-		(132_544_000 as Weight)
-			// Standard Error: 113_000
-			.saturating_add((97_343_000 as Weight).saturating_mul(r as Weight))
+		(130_119_000 as Weight)
+			// Standard Error: 108_000
+			.saturating_add((95_078_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_terminate_per_code_kb(c: u32, ) -> Weight {
-		(234_751_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((8_482_000 as Weight).saturating_mul(c as Weight))
+		(230_167_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((8_495_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}
 	fn seal_restore_to(r: u32, ) -> Weight {
-		(156_439_000 as Weight)
-			// Standard Error: 1_068_000
-			.saturating_add((96_724_000 as Weight).saturating_mul(r as Weight))
+		(159_200_000 as Weight)
+			// Standard Error: 261_000
+			.saturating_add((103_048_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((4 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((5 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_restore_to_per_code_kb_delta(c: u32, t: u32, d: u32, ) -> Weight {
-		(101_920_000 as Weight)
-			// Standard Error: 162_000
-			.saturating_add((7_588_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 162_000
-			.saturating_add((3_475_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 1_431_000
-			.saturating_add((3_733_137_000 as Weight).saturating_mul(d as Weight))
+		(58_389_000 as Weight)
+			// Standard Error: 131_000
+			.saturating_add((7_910_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 131_000
+			.saturating_add((4_036_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 1_156_000
+			.saturating_add((3_714_110_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(7 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
 	}
 	fn seal_random(r: u32, ) -> Weight {
-		(151_598_000 as Weight)
-			// Standard Error: 168_000
-			.saturating_add((608_967_000 as Weight).saturating_mul(r as Weight))
+		(138_794_000 as Weight)
+			// Standard Error: 216_000
+			.saturating_add((599_742_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(149_224_000 as Weight)
-			// Standard Error: 205_000
-			.saturating_add((896_074_000 as Weight).saturating_mul(r as Weight))
+		(139_890_000 as Weight)
+			// Standard Error: 263_000
+			.saturating_add((885_805_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_198_650_000 as Weight)
-			// Standard Error: 2_742_000
-			.saturating_add((566_152_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 540_000
-			.saturating_add((248_898_000 as Weight).saturating_mul(n as Weight))
+		(1_117_962_000 as Weight)
+			// Standard Error: 4_029_000
+			.saturating_add((566_825_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 794_000
+			.saturating_add((251_096_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(133_149_000 as Weight)
-			// Standard Error: 72_000
-			.saturating_add((163_281_000 as Weight).saturating_mul(r as Weight))
+		(132_720_000 as Weight)
+			// Standard Error: 87_000
+			.saturating_add((164_134_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_debug_message(r: u32, ) -> Weight {
-		(126_413_000 as Weight)
-			// Standard Error: 127_000
-			.saturating_add((128_176_000 as Weight).saturating_mul(r as Weight))
+		(125_834_000 as Weight)
+			// Standard Error: 142_000
+			.saturating_add((127_200_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 1_710_000
-			.saturating_add((3_933_779_000 as Weight).saturating_mul(r as Weight))
+		(478_734_000 as Weight)
+			// Standard Error: 2_559_000
+			.saturating_add((3_766_445_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(582_721_000 as Weight)
-			// Standard Error: 228_000
-			.saturating_add((71_341_000 as Weight).saturating_mul(n as Weight))
+		(600_306_000 as Weight)
+			// Standard Error: 234_000
+			.saturating_add((70_989_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn seal_clear_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_470_000
-			.saturating_add((1_281_241_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 2_380_000
+			.saturating_add((1_242_131_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_get_storage(r: u32, ) -> Weight {
-		(11_848_000 as Weight)
-			// Standard Error: 1_028_000
-			.saturating_add((934_213_000 as Weight).saturating_mul(r as Weight))
+		(0 as Weight)
+			// Standard Error: 1_060_000
+			.saturating_add((910_861_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(602_494_000 as Weight)
-			// Standard Error: 255_000
-			.saturating_add((152_885_000 as Weight).saturating_mul(n as Weight))
+		(605_545_000 as Weight)
+			// Standard Error: 252_000
+			.saturating_add((153_519_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_transfer(r: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 1_746_000
-			.saturating_add((5_264_601_000 as Weight).saturating_mul(r as Weight))
+		(36_854_000 as Weight)
+			// Standard Error: 2_076_000
+			.saturating_add((5_183_774_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
@@ -1120,358 +1135,358 @@ impl WeightInfo for () {
 	}
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 13_325_000
-			.saturating_add((11_706_784_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 6_583_000
+			.saturating_add((11_599_057_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((200 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_call_per_code_transfer_input_output_kb(c: u32, t: u32, i: u32, o: u32, ) -> Weight {
-		(9_518_851_000 as Weight)
-			// Standard Error: 349_000
-			.saturating_add((391_414_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 145_480_000
-			.saturating_add((4_113_632_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 46_000
-			.saturating_add((60_888_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 49_000
-			.saturating_add((79_489_000 as Weight).saturating_mul(o as Weight))
+		(10_431_738_000 as Weight)
+			// Standard Error: 301_000
+			.saturating_add((392_174_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 125_400_000
+			.saturating_add((3_698_896_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 39_000
+			.saturating_add((60_692_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 42_000
+			.saturating_add((78_872_000 as Weight).saturating_mul(o as Weight))
 			.saturating_add(RocksDbWeight::get().reads(205 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(101 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 39_418_000
-			.saturating_add((21_356_322_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 32_118_000
+			.saturating_add((21_117_947_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((300 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_instantiate_per_code_input_output_salt_kb(c: u32, i: u32, o: u32, s: u32, ) -> Weight {
-		(12_419_243_000 as Weight)
-			// Standard Error: 1_454_000
-			.saturating_add((848_075_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 206_000
-			.saturating_add((61_500_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 206_000
-			.saturating_add((82_895_000 as Weight).saturating_mul(o as Weight))
-			// Standard Error: 206_000
-			.saturating_add((236_893_000 as Weight).saturating_mul(s as Weight))
+		(8_542_521_000 as Weight)
+			// Standard Error: 644_000
+			.saturating_add((878_020_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 91_000
+			.saturating_add((63_004_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 91_000
+			.saturating_add((83_203_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 91_000
+			.saturating_add((240_170_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(206 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(204 as Weight))
 	}
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(129_427_000 as Weight)
-			// Standard Error: 110_000
-			.saturating_add((227_721_000 as Weight).saturating_mul(r as Weight))
+		(130_991_000 as Weight)
+			// Standard Error: 106_000
+			.saturating_add((230_186_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 202_000
-			.saturating_add((494_366_000 as Weight).saturating_mul(n as Weight))
+		(508_089_000 as Weight)
+			// Standard Error: 38_000
+			.saturating_add((491_916_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(133_222_000 as Weight)
-			// Standard Error: 330_000
-			.saturating_add((237_008_000 as Weight).saturating_mul(r as Weight))
+		(135_384_000 as Weight)
+			// Standard Error: 111_000
+			.saturating_add((233_638_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(1_245_757_000 as Weight)
-			// Standard Error: 77_000
-			.saturating_add((339_755_000 as Weight).saturating_mul(n as Weight))
+		(445_961_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((340_992_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(133_091_000 as Weight)
-			// Standard Error: 126_000
-			.saturating_add((208_234_000 as Weight).saturating_mul(r as Weight))
+		(133_593_000 as Weight)
+			// Standard Error: 112_000
+			.saturating_add((208_000_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(799_510_000 as Weight)
-			// Standard Error: 49_000
-			.saturating_add((158_583_000 as Weight).saturating_mul(n as Weight))
+		(444_562_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((159_521_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(130_180_000 as Weight)
-			// Standard Error: 83_000
-			.saturating_add((206_505_000 as Weight).saturating_mul(r as Weight))
+		(131_381_000 as Weight)
+			// Standard Error: 82_000
+			.saturating_add((207_479_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(965_700_000 as Weight)
-			// Standard Error: 64_000
-			.saturating_add((154_387_000 as Weight).saturating_mul(n as Weight))
+		(576_129_000 as Weight)
+			// Standard Error: 49_000
+			.saturating_add((156_900_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(20_233_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((3_445_000 as Weight).saturating_mul(r as Weight))
+		(20_276_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((3_355_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(29_798_000 as Weight)
-			// Standard Error: 1_137_000
-			.saturating_add((137_787_000 as Weight).saturating_mul(r as Weight))
+		(22_345_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((133_628_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(22_914_000 as Weight)
-			// Standard Error: 701_000
-			.saturating_add((205_918_000 as Weight).saturating_mul(r as Weight))
+		(22_294_000 as Weight)
+			// Standard Error: 95_000
+			.saturating_add((204_007_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(20_225_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((12_545_000 as Weight).saturating_mul(r as Weight))
+		(20_266_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((12_605_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(20_196_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((12_677_000 as Weight).saturating_mul(r as Weight))
+		(20_208_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((12_589_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(20_204_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((6_920_000 as Weight).saturating_mul(r as Weight))
+		(20_227_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((6_429_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(20_220_000 as Weight)
-			// Standard Error: 30_000
-			.saturating_add((15_209_000 as Weight).saturating_mul(r as Weight))
+		(20_279_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((14_560_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(20_262_000 as Weight)
-			// Standard Error: 37_000
-			.saturating_add((15_909_000 as Weight).saturating_mul(r as Weight))
+		(20_210_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((15_613_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(35_644_000 as Weight)
+		(34_276_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((82_000 as Weight).saturating_mul(e as Weight))
+			.saturating_add((130_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(20_566_000 as Weight)
-			// Standard Error: 79_000
-			.saturating_add((91_776_000 as Weight).saturating_mul(r as Weight))
+		(20_426_000 as Weight)
+			// Standard Error: 69_000
+			.saturating_add((91_850_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(28_243_000 as Weight)
-			// Standard Error: 207_000
-			.saturating_add((169_342_000 as Weight).saturating_mul(r as Weight))
+		(27_099_000 as Weight)
+			// Standard Error: 111_000
+			.saturating_add((169_212_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(206_233_000 as Weight)
+		(206_492_000 as Weight)
 			// Standard Error: 4_000
 			.saturating_add((4_685_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(37_775_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((3_553_000 as Weight).saturating_mul(r as Weight))
+		(37_892_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((3_510_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(37_836_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((3_745_000 as Weight).saturating_mul(r as Weight))
+		(37_773_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((3_814_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(37_816_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((4_929_000 as Weight).saturating_mul(r as Weight))
+		(37_785_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((4_949_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(23_385_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((7_494_000 as Weight).saturating_mul(r as Weight))
+		(23_467_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((7_493_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(23_334_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((8_306_000 as Weight).saturating_mul(r as Weight))
+		(23_492_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((8_499_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(22_311_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((3_548_000 as Weight).saturating_mul(r as Weight))
+		(22_347_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((3_565_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(20_789_000 as Weight)
-			// Standard Error: 269_000
-			.saturating_add((2_070_923_000 as Weight).saturating_mul(r as Weight))
+		(20_849_000 as Weight)
+			// Standard Error: 2_751_000
+			.saturating_add((2_072_517_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(20_196_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((5_132_000 as Weight).saturating_mul(r as Weight))
+		(20_216_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((5_067_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(20_215_000 as Weight)
-			// Standard Error: 7_000
-			.saturating_add((5_053_000 as Weight).saturating_mul(r as Weight))
+		(20_218_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((5_015_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(20_257_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((5_891_000 as Weight).saturating_mul(r as Weight))
+		(20_215_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((5_888_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(20_263_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((5_438_000 as Weight).saturating_mul(r as Weight))
+		(20_232_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((5_366_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(20_214_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((4_882_000 as Weight).saturating_mul(r as Weight))
+		(20_205_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((4_847_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(20_152_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((4_946_000 as Weight).saturating_mul(r as Weight))
+		(20_181_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((4_849_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(20_216_000 as Weight)
+		(20_175_000 as Weight)
 			// Standard Error: 18_000
-			.saturating_add((4_974_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((4_981_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(20_195_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((7_463_000 as Weight).saturating_mul(r as Weight))
+		(20_273_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((7_402_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(20_170_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((7_425_000 as Weight).saturating_mul(r as Weight))
+		(20_260_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((7_392_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(20_208_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((7_424_000 as Weight).saturating_mul(r as Weight))
+		(20_248_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((7_363_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(20_244_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((7_391_000 as Weight).saturating_mul(r as Weight))
+		(20_229_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((7_412_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(20_218_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((7_384_000 as Weight).saturating_mul(r as Weight))
+		(20_232_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((7_364_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(20_208_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((7_392_000 as Weight).saturating_mul(r as Weight))
+		(20_252_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((7_383_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(20_201_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((7_375_000 as Weight).saturating_mul(r as Weight))
+		(20_258_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((7_359_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(20_213_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((7_460_000 as Weight).saturating_mul(r as Weight))
+		(20_245_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((7_400_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(20_141_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((7_498_000 as Weight).saturating_mul(r as Weight))
+		(20_245_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((7_391_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(20_213_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((7_373_000 as Weight).saturating_mul(r as Weight))
+		(20_230_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((7_439_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(20_137_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((7_325_000 as Weight).saturating_mul(r as Weight))
+		(20_254_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((7_204_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(20_148_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((7_389_000 as Weight).saturating_mul(r as Weight))
+		(20_182_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((7_327_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(20_152_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((7_264_000 as Weight).saturating_mul(r as Weight))
+		(20_203_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((7_221_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(20_153_000 as Weight)
+		(20_187_000 as Weight)
 			// Standard Error: 16_000
-			.saturating_add((13_755_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((13_738_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(20_135_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((12_845_000 as Weight).saturating_mul(r as Weight))
+		(20_153_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((12_766_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(20_203_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((13_792_000 as Weight).saturating_mul(r as Weight))
+		(20_219_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((13_732_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(20_110_000 as Weight)
-			// Standard Error: 30_000
-			.saturating_add((12_880_000 as Weight).saturating_mul(r as Weight))
+		(20_246_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((12_686_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(20_098_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((7_416_000 as Weight).saturating_mul(r as Weight))
+		(20_228_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((7_245_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(20_156_000 as Weight)
+		(20_238_000 as Weight)
 			// Standard Error: 17_000
-			.saturating_add((7_428_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((7_250_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(20_163_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((7_343_000 as Weight).saturating_mul(r as Weight))
+		(20_213_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((7_292_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(20_167_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((7_610_000 as Weight).saturating_mul(r as Weight))
+		(20_224_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_554_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(20_192_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((7_660_000 as Weight).saturating_mul(r as Weight))
+		(20_261_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((7_551_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(20_162_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((7_652_000 as Weight).saturating_mul(r as Weight))
+		(20_212_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((7_616_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(20_151_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((7_890_000 as Weight).saturating_mul(r as Weight))
+		(20_176_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((7_877_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(20_154_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((7_434_000 as Weight).saturating_mul(r as Weight))
+		(20_230_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((7_347_000 as Weight).saturating_mul(r as Weight))
 	}
 }

From 6bef4f48e7a951b8efa70b7bf491414e896cdc4f Mon Sep 17 00:00:00 2001
From: arshamparity <75425316+arshamparity@users.noreply.github.com>
Date: Thu, 20 May 2021 16:27:16 +0300
Subject: [PATCH 0764/1194] add trigger for monitoring job in cloud-infra
 repository (#8831)

* add trigger for monitoring job in cloud-infra repository

* remove substrate-alerting-rules.env file for artifact:reports:dotenv

* add allow failure to trigger-cloud-infra-monitoring job

* remove strategy=depend from the trigger pipeline

Co-authored-by: Arsham <arsham@parity.io>
---
 .gitlab-ci.yml | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9de2f79b03bc..02a81043a7a5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -671,21 +671,13 @@ deploy-prometheus-alerting-rules:
   needs:
     - job:                         test-prometheus-alerting-rules
       artifacts:                   false
-  interruptible:                   true
-  retry:                           1
-  tags:
-    - kubernetes-parity-build
-  image:                           paritytech/kubetools:latest
-  environment:
-    name: parity-mgmt-polkadot-alerting
+  allow_failure:                   true
+  trigger:
+    project:  parity/infrastructure/cloud-infra
   variables:
-    NAMESPACE:                     monitoring
-    PROMETHEUSRULE:                prometheus-k8s-rules-polkadot-alerting
-    RULES:                         .maintain/monitoring/alerting-rules/alerting-rules.yaml
-  script:
-    - echo "deploying prometheus alerting rules"
-    - kubectl -n ${NAMESPACE} patch prometheusrule ${PROMETHEUSRULE}
-        --type=merge --patch "$(sed 's/^/  /;1s/^/spec:\n/' ${RULES})"
+    SUBSTRATE_CI_COMMIT_NAME:       "${CI_COMMIT_REF_NAME}"
+    SUBSTRATE_CI_COMMIT_REF:        "${CI_COMMIT_SHORT_SHA}"
+    UPSTREAM_TRIGGER_PROJECT:       "${CI_PROJECT_PATH}"
   rules:
     - if: $CI_PIPELINE_SOURCE == "pipeline"
       when: never

From 6aa388e3fe629940662377b1a8cd18c7c18698d0 Mon Sep 17 00:00:00 2001
From: Keith Yeung <kungfukeith11@gmail.com>
Date: Thu, 20 May 2021 12:31:56 -0700
Subject: [PATCH 0765/1194] Make hooks and call attributes optional in pallet
 macro (#8853)

* Make #[pallet::hooks] optional

* Make #[pallet::call] optional

* Remove unused imports

* Update UI test expectations

* Update UI test expectations

* Remove unnecessary HooksDef::empty method

* Remove unnecessary CallDef::empty method

* Clarify what would happen when no call or hooks are specified in a pallet
---
 .../procedural/src/pallet/expand/call.rs      | 40 ++++++++++++-------
 .../procedural/src/pallet/expand/hooks.rs     | 31 +++++++++++---
 .../procedural/src/pallet/parse/call.rs       |  1 +
 .../procedural/src/pallet/parse/mod.rs        | 17 ++++----
 frame/support/src/lib.rs                      | 18 ++++++++-
 frame/support/test/tests/pallet.rs            |  9 -----
 frame/support/test/tests/pallet_instance.rs   |  7 ----
 .../pallet_ui/inconsistent_instance_1.stderr  | 12 +++---
 .../pallet_ui/inconsistent_instance_2.stderr  | 12 +++---
 9 files changed, 90 insertions(+), 57 deletions(-)

diff --git a/frame/support/procedural/src/pallet/expand/call.rs b/frame/support/procedural/src/pallet/expand/call.rs
index bd7676c49acd..a3ac7ecc5f86 100644
--- a/frame/support/procedural/src/pallet/expand/call.rs
+++ b/frame/support/procedural/src/pallet/expand/call.rs
@@ -22,30 +22,40 @@ use syn::spanned::Spanned;
 /// * Generate enum call and implement various trait on it.
 /// * Implement Callable and call_function on `Pallet`
 pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
+	let (span, where_clause, methods, docs) = match def.call.as_ref() {
+		Some(call) => {
+			let span = call.attr_span;
+			let where_clause = call.where_clause.clone();
+			let methods = call.methods.clone();
+			let docs = call.docs.clone();
+
+			(span, where_clause, methods, docs)
+		}
+		None => (def.pallet_struct.attr_span, None, Vec::new(), Vec::new()),
+	};
 	let frame_support = &def.frame_support;
 	let frame_system = &def.frame_system;
-	let type_impl_gen = &def.type_impl_generics(def.call.attr_span);
-	let type_decl_bounded_gen = &def.type_decl_bounded_generics(def.call.attr_span);
-	let type_use_gen = &def.type_use_generics(def.call.attr_span);
-	let call_ident = syn::Ident::new("Call", def.call.attr_span);
+	let type_impl_gen = &def.type_impl_generics(span);
+	let type_decl_bounded_gen = &def.type_decl_bounded_generics(span);
+	let type_use_gen = &def.type_use_generics(span);
+	let call_ident = syn::Ident::new("Call", span);
 	let pallet_ident = &def.pallet_struct.pallet;
-	let where_clause = &def.call.where_clause;
 
-	let fn_name = def.call.methods.iter().map(|method| &method.name).collect::<Vec<_>>();
+	let fn_name = methods.iter().map(|method| &method.name).collect::<Vec<_>>();
 
-	let fn_weight = def.call.methods.iter().map(|method| &method.weight);
+	let fn_weight = methods.iter().map(|method| &method.weight);
 
-	let fn_doc = def.call.methods.iter().map(|method| &method.docs).collect::<Vec<_>>();
+	let fn_doc = methods.iter().map(|method| &method.docs).collect::<Vec<_>>();
 
-	let args_name = def.call.methods.iter()
+	let args_name = methods.iter()
 		.map(|method| method.args.iter().map(|(_, name, _)| name.clone()).collect::<Vec<_>>())
 		.collect::<Vec<_>>();
 
-	let args_type = def.call.methods.iter()
+	let args_type = methods.iter()
 		.map(|method| method.args.iter().map(|(_, _, type_)| type_.clone()).collect::<Vec<_>>())
 		.collect::<Vec<_>>();
 
-	let args_compact_attr = def.call.methods.iter().map(|method| {
+	let args_compact_attr = methods.iter().map(|method| {
 		method.args.iter()
 			.map(|(is_compact, _, type_)| {
 				if *is_compact {
@@ -57,7 +67,7 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
 			.collect::<Vec<_>>()
 	});
 
-	let args_metadata_type = def.call.methods.iter().map(|method| {
+	let args_metadata_type = methods.iter().map(|method| {
 		method.args.iter()
 			.map(|(is_compact, _, type_)| {
 				let final_type = if *is_compact {
@@ -73,13 +83,13 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
 	let default_docs = [syn::parse_quote!(
 		r"Contains one variant per dispatchable that can be called by an extrinsic."
 	)];
-	let docs = if def.call.docs.is_empty() {
+	let docs = if docs.is_empty() {
 		&default_docs[..]
 	} else {
-		&def.call.docs[..]
+		&docs[..]
 	};
 
-	quote::quote_spanned!(def.call.attr_span =>
+	quote::quote_spanned!(span =>
 		#( #[doc = #docs] )*
 		#[derive(
 			#frame_support::RuntimeDebugNoBound,
diff --git a/frame/support/procedural/src/pallet/expand/hooks.rs b/frame/support/procedural/src/pallet/expand/hooks.rs
index 2d12d5ecf9d4..6e21c892d8eb 100644
--- a/frame/support/procedural/src/pallet/expand/hooks.rs
+++ b/frame/support/procedural/src/pallet/expand/hooks.rs
@@ -19,13 +19,21 @@ use crate::pallet::Def;
 
 /// * implement the individual traits using the Hooks trait
 pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
+	let (where_clause, span, has_runtime_upgrade) = match def.hooks.as_ref() {
+		Some(hooks) => {
+			let where_clause = hooks.where_clause.clone();
+			let span = hooks.attr_span;
+			let has_runtime_upgrade = hooks.has_runtime_upgrade;
+			(where_clause, span, has_runtime_upgrade)
+		},
+		None => (None, def.pallet_struct.attr_span, false),
+	};
+
 	let frame_support = &def.frame_support;
-	let type_impl_gen = &def.type_impl_generics(def.hooks.attr_span);
-	let type_use_gen = &def.type_use_generics(def.hooks.attr_span);
+	let type_impl_gen = &def.type_impl_generics(span);
+	let type_use_gen = &def.type_use_generics(span);
 	let pallet_ident = &def.pallet_struct.pallet;
-	let where_clause = &def.hooks.where_clause;
 	let frame_system = &def.frame_system;
-	let has_runtime_upgrade = def.hooks.has_runtime_upgrade;
 
 	let log_runtime_upgrade = if has_runtime_upgrade {
 		// a migration is defined here.
@@ -49,7 +57,20 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 		}
 	};
 
-	quote::quote_spanned!(def.hooks.attr_span =>
+	let hooks_impl = if def.hooks.is_none() {
+		let frame_system = &def.frame_system;
+		quote::quote!{
+			impl<#type_impl_gen>
+				#frame_support::traits::Hooks<<T as #frame_system::Config>::BlockNumber>
+				for Pallet<#type_use_gen> {}
+		}
+	} else {
+		proc_macro2::TokenStream::new()
+	};
+
+	quote::quote_spanned!(span =>
+		#hooks_impl
+
 		impl<#type_impl_gen>
 			#frame_support::traits::OnFinalize<<T as #frame_system::Config>::BlockNumber>
 			for #pallet_ident<#type_use_gen> #where_clause
diff --git a/frame/support/procedural/src/pallet/parse/call.rs b/frame/support/procedural/src/pallet/parse/call.rs
index 23406aeb2343..c2e6dce22539 100644
--- a/frame/support/procedural/src/pallet/parse/call.rs
+++ b/frame/support/procedural/src/pallet/parse/call.rs
@@ -45,6 +45,7 @@ pub struct CallDef {
 	pub docs: Vec<syn::Lit>,
 }
 
+#[derive(Clone)]
 /// Definition of dispatchable typically: `#[weight...] fn foo(origin .., param1: ...) -> ..`
 pub struct CallVariantDef {
 	/// Function name.
diff --git a/frame/support/procedural/src/pallet/parse/mod.rs b/frame/support/procedural/src/pallet/parse/mod.rs
index 39a40fc148bc..2f378c52e8b3 100644
--- a/frame/support/procedural/src/pallet/parse/mod.rs
+++ b/frame/support/procedural/src/pallet/parse/mod.rs
@@ -45,8 +45,8 @@ pub struct Def {
 	pub item: syn::ItemMod,
 	pub config: config::ConfigDef,
 	pub pallet_struct: pallet_struct::PalletStructDef,
-	pub hooks: hooks::HooksDef,
-	pub call: call::CallDef,
+	pub hooks: Option<hooks::HooksDef>,
+	pub call: Option<call::CallDef>,
 	pub storages: Vec<storage::StorageDef>,
 	pub error: Option<error::ErrorDef>,
 	pub event: Option<event::EventDef>,
@@ -156,9 +156,8 @@ impl Def {
 			config: config.ok_or_else(|| syn::Error::new(item_span, "Missing `#[pallet::config]`"))?,
 			pallet_struct: pallet_struct
 				.ok_or_else(|| syn::Error::new(item_span, "Missing `#[pallet::pallet]`"))?,
-			hooks: hooks
-				.ok_or_else(|| syn::Error::new(item_span, "Missing `#[pallet::hooks]`"))?,
-			call: call.ok_or_else(|| syn::Error::new(item_span, "Missing `#[pallet::call]"))?,
+			hooks,
+			call,
 			extra_constants,
 			genesis_config,
 			genesis_build,
@@ -206,10 +205,14 @@ impl Def {
 	/// instance iff it is defined with instance.
 	fn check_instance_usage(&self) -> syn::Result<()> {
 		let mut instances = vec![];
-		instances.extend_from_slice(&self.call.instances[..]);
 		instances.extend_from_slice(&self.pallet_struct.instances[..]);
-		instances.extend_from_slice(&self.hooks.instances[..]);
 		instances.extend(&mut self.storages.iter().flat_map(|s| s.instances.clone()));
+		if let Some(call) = &self.call {
+			instances.extend_from_slice(&call.instances[..]);
+		}
+		if let Some(hooks) = &self.hooks {
+			instances.extend_from_slice(&hooks.instances[..]);
+		}
 		if let Some(event) = &self.event {
 			instances.extend_from_slice(&event.instances[..]);
 		}
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index cc7bd2126c0c..d1874b65b62e 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -1393,7 +1393,7 @@ pub mod pallet_prelude {
 /// [`traits::StorageInfoTrait`] for each storage in the implementation of
 /// [`traits::StorageInfoTrait`] for the pallet.
 ///
-/// # Hooks: `#[pallet::hooks]` mandatory
+/// # Hooks: `#[pallet::hooks]` optional
 ///
 /// Implementation of `Hooks` on `Pallet` allowing to define some specific pallet logic.
 ///
@@ -1407,6 +1407,13 @@ pub mod pallet_prelude {
 /// `Hooks<BlockNumberFor<T>>` (they are defined in preludes), for the type `Pallet<T>`
 /// and with an optional where clause.
 ///
+/// If no `#[pallet::hooks]` exists, then a default implementation corresponding to the following
+/// code is automatically generated:
+/// ```ignore
+/// #[pallet::hooks]
+/// impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+/// ```
+///
 /// ### Macro expansion:
 ///
 /// The macro implements the traits `OnInitialize`, `OnIdle`, `OnFinalize`, `OnRuntimeUpgrade`,
@@ -1418,7 +1425,7 @@ pub mod pallet_prelude {
 /// NOTE: The macro also adds some tracing logic when implementing the above traits. The following
 ///  hooks emit traces: `on_initialize`, `on_finalize` and `on_runtime_upgrade`.
 ///
-/// # Call: `#[pallet::call]` mandatory
+/// # Call: `#[pallet::call]` optional
 ///
 /// Implementation of pallet dispatchables.
 ///
@@ -1450,6 +1457,13 @@ pub mod pallet_prelude {
 /// All arguments must implement `Debug`, `PartialEq`, `Eq`, `Decode`, `Encode`, `Clone`. For ease
 /// of use, bound the trait `Member` available in frame_support::pallet_prelude.
 ///
+/// If no `#[pallet::call]` exists, then a default implementation corresponding to the following
+/// code is automatically generated:
+/// ```ignore
+/// #[pallet::call]
+/// impl<T: Config> Pallet<T> {}
+/// ```
+///
 /// **WARNING**: modifying dispatchables, changing their order, removing some must be done with
 /// care. Indeed this will change the outer runtime call type (which is an enum with one variant
 /// per pallet), this outer runtime call can be stored on-chain (e.g. in pallet-scheduler).
diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index cc3d83f47232..7478da189df0 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -406,20 +406,11 @@ pub mod pallet2 {
 /// Test that the supertrait check works when we pass some parameter to the `frame_system::Config`.
 #[frame_support::pallet]
 pub mod pallet3 {
-	use frame_support::pallet_prelude::*;
-	use frame_system::pallet_prelude::*;
-
 	#[pallet::config]
 	pub trait Config: frame_system::Config<Origin = ()> {}
 
 	#[pallet::pallet]
 	pub struct Pallet<T>(_);
-
-	#[pallet::hooks]
-	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
-
-	#[pallet::call]
-	impl<T: Config> Pallet<T> {}
 }
 
 frame_support::parameter_types!(
diff --git a/frame/support/test/tests/pallet_instance.rs b/frame/support/test/tests/pallet_instance.rs
index 7d6c6983b01b..846a96a237c9 100644
--- a/frame/support/test/tests/pallet_instance.rs
+++ b/frame/support/test/tests/pallet_instance.rs
@@ -209,7 +209,6 @@ pub mod pallet {
 #[frame_support::pallet]
 pub mod pallet2 {
 	use frame_support::pallet_prelude::*;
-	use frame_system::pallet_prelude::*;
 
 	#[pallet::config]
 	pub trait Config<I: 'static = ()>: frame_system::Config {
@@ -220,12 +219,6 @@ pub mod pallet2 {
 	#[pallet::generate_store(pub(crate) trait Store)]
 	pub struct Pallet<T, I = ()>(PhantomData<(T, I)>);
 
-	#[pallet::hooks]
-	impl<T: Config<I>, I: 'static> Hooks<BlockNumberFor<T>> for Pallet<T, I> {}
-
-	#[pallet::call]
-	impl<T: Config<I>, I: 'static> Pallet<T, I> {}
-
 	#[pallet::event]
 	pub enum Event<T: Config<I>, I: 'static = ()> {
 		/// Something
diff --git a/frame/support/test/tests/pallet_ui/inconsistent_instance_1.stderr b/frame/support/test/tests/pallet_ui/inconsistent_instance_1.stderr
index 352c21013cab..06c7941a0bcb 100644
--- a/frame/support/test/tests/pallet_ui/inconsistent_instance_1.stderr
+++ b/frame/support/test/tests/pallet_ui/inconsistent_instance_1.stderr
@@ -1,3 +1,9 @@
+error: Invalid generic declaration, trait is defined with instance but generic use none
+  --> $DIR/inconsistent_instance_1.rs:10:20
+   |
+10 |     pub struct Pallet<T>(core::marker::PhantomData<T>);
+   |                       ^
+
 error: Invalid generic declaration, trait is defined with instance but generic use none
   --> $DIR/inconsistent_instance_1.rs:16:7
    |
@@ -10,12 +16,6 @@ error: Invalid generic declaration, trait is defined with instance but generic u
 16 |     impl<T: Config> Pallet<T> {}
    |                     ^^^^^^
 
-error: Invalid generic declaration, trait is defined with instance but generic use none
-  --> $DIR/inconsistent_instance_1.rs:10:20
-   |
-10 |     pub struct Pallet<T>(core::marker::PhantomData<T>);
-   |                       ^
-
 error: Invalid generic declaration, trait is defined with instance but generic use none
   --> $DIR/inconsistent_instance_1.rs:13:47
    |
diff --git a/frame/support/test/tests/pallet_ui/inconsistent_instance_2.stderr b/frame/support/test/tests/pallet_ui/inconsistent_instance_2.stderr
index 9f5d3c740cbd..9d61f2976b75 100644
--- a/frame/support/test/tests/pallet_ui/inconsistent_instance_2.stderr
+++ b/frame/support/test/tests/pallet_ui/inconsistent_instance_2.stderr
@@ -1,3 +1,9 @@
+error: Invalid generic declaration, trait is defined without instance but generic use some
+  --> $DIR/inconsistent_instance_2.rs:10:20
+   |
+10 |     pub struct Pallet<T, I = ()>(core::marker::PhantomData<(T, I)>);
+   |                       ^
+
 error: Invalid generic declaration, trait is defined without instance but generic use some
   --> $DIR/inconsistent_instance_2.rs:16:7
    |
@@ -10,12 +16,6 @@ error: Invalid generic declaration, trait is defined without instance but generi
 16 |     impl<T: Config<I>, I: 'static> Pallet<T, I> {}
    |                                    ^^^^^^
 
-error: Invalid generic declaration, trait is defined without instance but generic use some
-  --> $DIR/inconsistent_instance_2.rs:10:20
-   |
-10 |     pub struct Pallet<T, I = ()>(core::marker::PhantomData<(T, I)>);
-   |                       ^
-
 error: Invalid generic declaration, trait is defined without instance but generic use some
   --> $DIR/inconsistent_instance_2.rs:13:62
    |

From fc410e8f85e3bac5a081d5f772be5658c95c978a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Thu, 20 May 2021 22:42:44 +0200
Subject: [PATCH 0766/1194] The code generated by the interface macro did
 compare to the wrong module (#8872)

---
 frame/contracts/src/wasm/env_def/macros.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frame/contracts/src/wasm/env_def/macros.rs b/frame/contracts/src/wasm/env_def/macros.rs
index a8127939c018..fbaf7282140b 100644
--- a/frame/contracts/src/wasm/env_def/macros.rs
+++ b/frame/contracts/src/wasm/env_def/macros.rs
@@ -51,10 +51,6 @@ macro_rules! gen_signature_dispatch {
 		( $ctx:ident $( , $names:ident : $params:ty )* ) $( -> $returns:ty )* , $($rest:tt)*
 	) => {
 		let module = stringify!($module).as_bytes();
-		#[cfg(not(feature = "unstable-interface"))]
-		if module == b"__unstable__" {
-			return false;
-		}
 		if module == $needle_module && stringify!($name).as_bytes() == $needle_name {
 			let signature = gen_signature!( ( $( $params ),* ) $( -> $returns )* );
 			if $needle_sig == &signature {
@@ -219,6 +215,10 @@ macro_rules! define_env {
 
 		impl $crate::wasm::env_def::ImportSatisfyCheck for $init_name {
 			fn can_satisfy(module: &[u8], name: &[u8], func_type: &parity_wasm::elements::FunctionType) -> bool {
+				#[cfg(not(feature = "unstable-interface"))]
+				if module == b"__unstable__" {
+					return false;
+				}
 				gen_signature_dispatch!(
 					module, name, func_type ;
 					$( $module, $name ( $ctx $(, $names : $params )* ) $( -> $returns )* , )*

From 89a50c7106a4bb3eca42a584122a9c97e9286144 Mon Sep 17 00:00:00 2001
From: ferrell-code <70108835+ferrell-code@users.noreply.github.com>
Date: Fri, 21 May 2021 02:40:19 -0400
Subject: [PATCH 0767/1194] Pallet-Multisig to framev2 (#8741)

* the great migration

* benchmarks to work

* unnecessary T: Config

* Update frame/multisig/src/lib.rs

Co-authored-by: Keith Yeung <kungfukeith11@gmail.com>

* Update frame/multisig/src/lib.rs

Co-authored-by: Keith Yeung <kungfukeith11@gmail.com>

* Update frame/multisig/src/lib.rs

Co-authored-by: Keith Yeung <kungfukeith11@gmail.com>

* Update frame/multisig/src/lib.rs

Co-authored-by: Keith Yeung <kungfukeith11@gmail.com>

* Update frame/multisig/src/lib.rs

* line width

* get to compile

Co-authored-by: Keith Yeung <kungfukeith11@gmail.com>
Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
---
 frame/multisig/src/benchmarking.rs |   2 +-
 frame/multisig/src/lib.rs          | 214 ++++++++++++++++-------------
 frame/multisig/src/tests.rs        |   2 +-
 3 files changed, 117 insertions(+), 101 deletions(-)

diff --git a/frame/multisig/src/benchmarking.rs b/frame/multisig/src/benchmarking.rs
index b530a9639602..63a178313add 100644
--- a/frame/multisig/src/benchmarking.rs
+++ b/frame/multisig/src/benchmarking.rs
@@ -25,7 +25,7 @@ use frame_benchmarking::{benchmarks, account, impl_benchmark_test_suite};
 use sp_runtime::traits::Bounded;
 use core::convert::TryInto;
 
-use crate::Module as Multisig;
+use crate::Pallet as Multisig;
 
 const SEED: u32 = 0;
 
diff --git a/frame/multisig/src/lib.rs b/frame/multisig/src/lib.rs
index 8c8e1c0dbc43..bbb41e7a9287 100644
--- a/frame/multisig/src/lib.rs
+++ b/frame/multisig/src/lib.rs
@@ -15,15 +15,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! # Multisig Module
-//! A module for doing multisig dispatch.
+//! # Multisig pallet
+//! A pallet for doing multisig dispatch.
 //!
 //! - [`Config`]
 //! - [`Call`]
 //!
 //! ## Overview
 //!
-//! This module contains functionality for multi-signature dispatch, a (potentially) stateful
+//! This pallet contains functionality for multi-signature dispatch, a (potentially) stateful
 //! operation, allowing multiple signed
 //! origins (accounts) to coordinate and dispatch a call from a well-known origin, derivable
 //! deterministically from the set of account IDs and the threshold number of accounts from the
@@ -53,51 +53,21 @@ pub mod weights;
 use sp_std::prelude::*;
 use codec::{Encode, Decode};
 use sp_io::hashing::blake2_256;
-use frame_support::{decl_module, decl_event, decl_error, decl_storage, Parameter, ensure, RuntimeDebug};
+use frame_support::{ensure, RuntimeDebug};
 use frame_support::{traits::{Get, ReservableCurrency, Currency},
 	weights::{Weight, GetDispatchInfo},
-	dispatch::{DispatchResultWithPostInfo, DispatchErrorWithPostInfo, PostDispatchInfo},
+	dispatch::{DispatchResultWithPostInfo, DispatchResult, DispatchErrorWithPostInfo, PostDispatchInfo},
 };
-use frame_system::{self as system, ensure_signed, RawOrigin};
-use sp_runtime::{DispatchError, DispatchResult, traits::{Dispatchable, Zero}};
+use frame_system::{self as system, RawOrigin};
+use sp_runtime::{DispatchError, traits::{Dispatchable, Zero}};
 pub use weights::WeightInfo;
 
+pub use pallet::*;
+
 type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 /// Just a bunch of bytes, but they should decode to a valid `Call`.
 pub type OpaqueCall = Vec<u8>;
 
-/// Configuration trait.
-pub trait Config: frame_system::Config {
-	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
-
-	/// The overarching call type.
-	type Call: Parameter + Dispatchable<Origin=Self::Origin, PostInfo=PostDispatchInfo>
-		+ GetDispatchInfo + From<frame_system::Call<Self>>;
-
-	/// The currency mechanism.
-	type Currency: ReservableCurrency<Self::AccountId>;
-
-	/// The base amount of currency needed to reserve for creating a multisig execution or to store
-	/// a dispatch call for later.
-	///
-	/// This is held for an additional storage item whose value size is
-	/// `4 + sizeof((BlockNumber, Balance, AccountId))` bytes and whose key size is
-	/// `32 + sizeof(AccountId)` bytes.
-	type DepositBase: Get<BalanceOf<Self>>;
-
-	/// The amount of currency needed per unit threshold when creating a multisig execution.
-	///
-	/// This is held for adding 32 bytes more into a pre-existing storage value.
-	type DepositFactor: Get<BalanceOf<Self>>;
-
-	/// The maximum amount of signatories allowed in the multisig.
-	type MaxSignatories: Get<u16>;
-
-	/// Weight information for extrinsics in this pallet.
-	type WeightInfo: WeightInfo;
-}
-
 /// A global extrinsic index, formed as the extrinsic index within a block, together with that
 /// block's height. This allows a transaction in which a multisig operation of a particular
 /// composite was created to be uniquely identified.
@@ -122,19 +92,79 @@ pub struct Multisig<BlockNumber, Balance, AccountId> {
 	approvals: Vec<AccountId>,
 }
 
-decl_storage! {
-	trait Store for Module<T: Config> as Multisig {
-		/// The set of open multisig operations.
-		pub Multisigs: double_map
-			hasher(twox_64_concat) T::AccountId, hasher(blake2_128_concat) [u8; 32]
-			=> Option<Multisig<T::BlockNumber, BalanceOf<T>, T::AccountId>>;
+type CallHash = [u8; 32];
 
-		pub Calls: map hasher(identity) [u8; 32] => Option<(OpaqueCall, T::AccountId, BalanceOf<T>)>;
-	}
+enum CallOrHash {
+	Call(OpaqueCall, bool),
+	Hash([u8; 32]),
 }
 
-decl_error! {
-	pub enum Error for Module<T: Config> {
+#[frame_support::pallet]
+pub mod pallet{
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+	use super::*;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		/// The overarching event type.
+		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
+
+		/// The overarching call type.
+		type Call: Parameter + Dispatchable<Origin=Self::Origin, PostInfo=PostDispatchInfo>
+			+ GetDispatchInfo + From<frame_system::Call<Self>>;
+
+		/// The currency mechanism.
+		type Currency: ReservableCurrency<Self::AccountId>;
+
+		/// The base amount of currency needed to reserve for creating a multisig execution or to store
+		/// a dispatch call for later.
+		///
+		/// This is held for an additional storage item whose value size is
+		/// `4 + sizeof((BlockNumber, Balance, AccountId))` bytes and whose key size is
+		/// `32 + sizeof(AccountId)` bytes.
+		#[pallet::constant]
+		type DepositBase: Get<BalanceOf<Self>>;
+
+		/// The amount of currency needed per unit threshold when creating a multisig execution.
+		///
+		/// This is held for adding 32 bytes more into a pre-existing storage value.
+		#[pallet::constant]
+		type DepositFactor: Get<BalanceOf<Self>>;
+
+		/// The maximum amount of signatories allowed in the multisig.
+		#[pallet::constant]
+		type MaxSignatories: Get<u16>;
+
+		/// Weight information for extrinsics in this pallet.
+		type WeightInfo: WeightInfo;
+	}
+
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(_);
+
+	/// The set of open multisig operations.
+	#[pallet::storage]
+	pub type Multisigs<T: Config> = StorageDoubleMap<
+		_,
+		Twox64Concat,
+		T::AccountId,
+		Blake2_128Concat,
+		[u8; 32],
+		Multisig<T::BlockNumber, BalanceOf<T>, T::AccountId>,
+	>;
+
+	#[pallet::storage]
+	pub type Calls<T: Config> = StorageMap<
+		_,
+		Identity,
+		[u8; 32],
+		(OpaqueCall, T::AccountId, BalanceOf<T>),
+	>;
+
+	#[pallet::error]
+	pub enum Error<T> {
 		/// Threshold must be 2 or greater.
 		MinimumThreshold,
 		/// Call is already approved by this signatory.
@@ -164,49 +194,31 @@ decl_error! {
 		/// The data to be stored is already stored.
 		AlreadyStored,
 	}
-}
 
-decl_event! {
-	/// Events type.
-	pub enum Event<T> where
-		AccountId = <T as system::Config>::AccountId,
-		BlockNumber = <T as system::Config>::BlockNumber,
-		CallHash = [u8; 32]
-	{
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	#[pallet::metadata(
+		T::AccountId = "AccountId",
+		T::BlockNumber = "BlockNumber",
+		Timepoint<T::BlockNumber> = "Timepoint<BlockNumber>"
+	)]
+	pub enum Event<T: Config> {
 		/// A new multisig operation has begun. \[approving, multisig, call_hash\]
-		NewMultisig(AccountId, AccountId, CallHash),
+		NewMultisig(T::AccountId, T::AccountId, CallHash),
 		/// A multisig operation has been approved by someone.
 		/// \[approving, timepoint, multisig, call_hash\]
-		MultisigApproval(AccountId, Timepoint<BlockNumber>, AccountId, CallHash),
+		MultisigApproval(T::AccountId, Timepoint<T::BlockNumber>, T::AccountId, CallHash),
 		/// A multisig operation has been executed. \[approving, timepoint, multisig, call_hash\]
-		MultisigExecuted(AccountId, Timepoint<BlockNumber>, AccountId, CallHash, DispatchResult),
+		MultisigExecuted(T::AccountId, Timepoint<T::BlockNumber>, T::AccountId, CallHash, DispatchResult),
 		/// A multisig operation has been cancelled. \[cancelling, timepoint, multisig, call_hash\]
-		MultisigCancelled(AccountId, Timepoint<BlockNumber>, AccountId, CallHash),
+		MultisigCancelled(T::AccountId, Timepoint<T::BlockNumber>, T::AccountId, CallHash)
 	}
-}
-
-enum CallOrHash {
-	Call(OpaqueCall, bool),
-	Hash([u8; 32]),
-}
-
-decl_module! {
-	pub struct Module<T: Config> for enum Call where origin: T::Origin {
-		type Error = Error<T>;
-
-		/// Deposit one of this module's events by using the default implementation.
-		fn deposit_event() = default;
-
-		/// The base amount of currency needed to reserve for creating a multisig execution or to store
-		/// a dispatch call for later.
-		const DepositBase: BalanceOf<T> = T::DepositBase::get();
-
-		/// The amount of currency needed per unit threshold when creating a multisig execution.
-		const DepositFactor: BalanceOf<T> = T::DepositFactor::get();
 
-		/// The maximum amount of signatories allowed for a given multisig.
-		const MaxSignatories: u16 = T::MaxSignatories::get();
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
 
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
 		/// Immediately dispatch a multi-signature call using a single approval from the caller.
 		///
 		/// The dispatch origin for this call must be _Signed_.
@@ -223,7 +235,7 @@ decl_module! {
 		/// - DB Weight: None
 		/// - Plus Call Weight
 		/// # </weight>
-		#[weight = {
+		#[pallet::weight({
 			let dispatch_info = call.get_dispatch_info();
 			(
 				T::WeightInfo::as_multi_threshold_1(call.using_encoded(|c| c.len() as u32))
@@ -232,8 +244,9 @@ decl_module! {
 					.saturating_add(T::DbWeight::get().reads_writes(1, 1)),
 				dispatch_info.class,
 			)
-		}]
-		fn as_multi_threshold_1(origin,
+		})]
+		pub(super) fn as_multi_threshold_1(
+			origin: OriginFor<T>,
 			other_signatories: Vec<T::AccountId>,
 			call: Box<<T as Config>::Call>,
 		) -> DispatchResultWithPostInfo {
@@ -312,7 +325,7 @@ decl_module! {
 		///     - Writes: Multisig Storage, [Caller Account], Calls (if `store_call`)
 		/// - Plus Call Weight
 		/// # </weight>
-		#[weight = {
+		#[pallet::weight({
 			let s = other_signatories.len() as u32;
 			let z = call.len() as u32;
 
@@ -321,8 +334,9 @@ decl_module! {
 			.max(T::WeightInfo::as_multi_approve(s, z))
 			.max(T::WeightInfo::as_multi_complete(s, z))
 			.saturating_add(*max_weight)
-		}]
-		fn as_multi(origin,
+		})]
+		pub(super) fn as_multi(
+			origin: OriginFor<T>,
 			threshold: u16,
 			other_signatories: Vec<T::AccountId>,
 			maybe_timepoint: Option<Timepoint<T::BlockNumber>>,
@@ -370,15 +384,16 @@ decl_module! {
 		///     - Read: Multisig Storage, [Caller Account]
 		///     - Write: Multisig Storage, [Caller Account]
 		/// # </weight>
-		#[weight = {
+		#[pallet::weight({
 			let s = other_signatories.len() as u32;
 
 			T::WeightInfo::approve_as_multi_create(s)
 			.max(T::WeightInfo::approve_as_multi_approve(s))
 			.max(T::WeightInfo::approve_as_multi_complete(s))
 			.saturating_add(*max_weight)
-		}]
-		fn approve_as_multi(origin,
+		})]
+		pub(super) fn approve_as_multi(
+			origin: OriginFor<T>,
 			threshold: u16,
 			other_signatories: Vec<T::AccountId>,
 			maybe_timepoint: Option<Timepoint<T::BlockNumber>>,
@@ -415,8 +430,9 @@ decl_module! {
 		///     - Read: Multisig Storage, [Caller Account], Refund Account, Calls
 		///     - Write: Multisig Storage, [Caller Account], Refund Account, Calls
 		/// # </weight>
-		#[weight = T::WeightInfo::cancel_as_multi(other_signatories.len() as u32)]
-		fn cancel_as_multi(origin,
+		#[pallet::weight(T::WeightInfo::cancel_as_multi(other_signatories.len() as u32))]
+		pub(super) fn cancel_as_multi(
+			origin: OriginFor<T>,
 			threshold: u16,
 			other_signatories: Vec<T::AccountId>,
 			timepoint: Timepoint<T::BlockNumber>,
@@ -441,13 +457,13 @@ decl_module! {
 			<Multisigs<T>>::remove(&id, &call_hash);
 			Self::clear_call(&call_hash);
 
-			Self::deposit_event(RawEvent::MultisigCancelled(who, timepoint, id, call_hash));
+			Self::deposit_event(Event::MultisigCancelled(who, timepoint, id, call_hash));
 			Ok(())
 		}
 	}
 }
 
-impl<T: Config> Module<T> {
+impl<T: Config> Pallet<T> {
 	/// Derive a multi-account ID from the sorted list of accounts and the threshold that are
 	/// required.
 	///
@@ -513,7 +529,7 @@ impl<T: Config> Module<T> {
 				T::Currency::unreserve(&m.depositor, m.deposit);
 
 				let result = call.dispatch(RawOrigin::Signed(id.clone()).into());
-				Self::deposit_event(RawEvent::MultisigExecuted(
+				Self::deposit_event(Event::MultisigExecuted(
 					who, timepoint, id, call_hash, result.map(|_| ()).map_err(|e| e.error)
 				));
 				Ok(get_result_weight(result).map(|actual_weight|
@@ -538,7 +554,7 @@ impl<T: Config> Module<T> {
 					// Record approval.
 					m.approvals.insert(pos, who.clone());
 					<Multisigs<T>>::insert(&id, call_hash, m);
-					Self::deposit_event(RawEvent::MultisigApproval(who, timepoint, id, call_hash));
+					Self::deposit_event(Event::MultisigApproval(who, timepoint, id, call_hash));
 				} else {
 					// If we already approved and didn't store the Call, then this was useless and
 					// we report an error.
@@ -581,7 +597,7 @@ impl<T: Config> Module<T> {
 				depositor: who.clone(),
 				approvals: vec![who.clone()],
 			});
-			Self::deposit_event(RawEvent::NewMultisig(who, id, call_hash));
+			Self::deposit_event(Event::NewMultisig(who, id, call_hash));
 
 			let final_weight = if stored {
 				T::WeightInfo::as_multi_create_store(
diff --git a/frame/multisig/src/tests.rs b/frame/multisig/src/tests.rs
index d6eb949888d1..cf457f6db602 100644
--- a/frame/multisig/src/tests.rs
+++ b/frame/multisig/src/tests.rs
@@ -425,7 +425,7 @@ fn multisig_2_of_3_cannot_reissue_same_call() {
 		assert_ok!(Multisig::as_multi(Origin::signed(3), 2, vec![1, 2], Some(now()), data.clone(), false, call_weight));
 
 		let err = DispatchError::from(BalancesError::<Test, _>::InsufficientBalance).stripped();
-		System::assert_last_event(RawEvent::MultisigExecuted(3, now(), multi, hash, Err(err)).into());
+		System::assert_last_event(pallet_multisig::Event::MultisigExecuted(3, now(), multi, hash, Err(err)).into());
 	});
 }
 

From 16240c0e3405b23d3a2b493c93fa19bdda6547e2 Mon Sep 17 00:00:00 2001
From: Andreas Doerr <adoerr@users.noreply.github.com>
Date: Fri, 21 May 2021 09:52:20 +0200
Subject: [PATCH 0768/1194] Fix doc for CryptoStore::ecdsa_sign_prehashed()
 (#8876)

* fix ecdsa_sign_prehashed() doc

* document both instances
---
 primitives/core/src/lib.rs     |  2 +-
 primitives/keystore/src/lib.rs | 34 ++++++++++++++++++++++------------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/primitives/core/src/lib.rs b/primitives/core/src/lib.rs
index 495b9e6693d8..1ca97e7c3ffc 100644
--- a/primitives/core/src/lib.rs
+++ b/primitives/core/src/lib.rs
@@ -336,7 +336,7 @@ impl From<LogLevel> for log::Level {
 
 /// Log level filter that expresses which log levels should be filtered.
 ///
-/// This enum matches the [`log::LogLevelFilter`] enum.
+/// This enum matches the [`log::LevelFilter`] enum.
 #[derive(Encode, Decode, PassByEnum, Copy, Clone)]
 pub enum LogLevelFilter {
 	/// `Off` log level filter.
diff --git a/primitives/keystore/src/lib.rs b/primitives/keystore/src/lib.rs
index 352154d82458..cccb390d34ba 100644
--- a/primitives/keystore/src/lib.rs
+++ b/primitives/keystore/src/lib.rs
@@ -195,13 +195,18 @@ pub trait CryptoStore: Send + Sync {
 		transcript_data: VRFTranscriptData,
 	) -> Result<Option<VRFSignature>, Error>;
 
-	/// Sign pre-hashed
-	///
-	/// Signs a pre-hashed message with the private key that matches
-	/// the ECDSA public key passed.
-	///
-	/// Returns the SCALE encoded signature if key is found and supported,
-	/// `None` if the key doesn't exist or an error when something failed.
+	/// Generate an ECDSA signature for a given pre-hashed message.
+	///
+	/// Receives [`KeyTypeId`] and an [`ecdsa::Public`] key to be able to map
+	/// them to a private key that exists in the keystore. This private key is,
+	/// in turn, used for signing the provided pre-hashed message.
+	///
+	/// The `msg` argument provided should be a hashed message for which an
+	/// ECDSA signature should be generated. 
+	/// 
+	/// Returns an [`ecdsa::Signature`] or `None` in case the given `id` and
+	/// `public` combination doesn't exist in the keystore. An `Err` will be
+	/// returned if generating the signature itself failed.
 	async fn ecdsa_sign_prehashed(
 		&self,
 		id: KeyTypeId,
@@ -368,13 +373,18 @@ pub trait SyncCryptoStore: CryptoStore + Send + Sync {
 		transcript_data: VRFTranscriptData,
 	) -> Result<Option<VRFSignature>, Error>;
 
-	/// Sign pre-hashed
+	/// Generate an ECDSA signature for a given pre-hashed message.
 	///
-	/// Signs a pre-hashed message with the private key that matches
-	/// the ECDSA public key passed.
+	/// Receives [`KeyTypeId`] and an [`ecdsa::Public`] key to be able to map
+	/// them to a private key that exists in the keystore. This private key is,
+	/// in turn, used for signing the provided pre-hashed message.
 	///
-	/// Returns the SCALE encoded signature if key is found and supported,
-	/// `None` if the key doesn't exist or an error when something failed.
+	/// The `msg` argument provided should be a hashed message for which an
+	/// ECDSA signature should be generated. 
+	/// 
+	/// Returns an [`ecdsa::Signature`] or `None` in case the given `id` and
+	/// `public` combination doesn't exist in the keystore. An `Err` will be
+	/// returned if generating the signature itself failed.
 	fn ecdsa_sign_prehashed(
 		&self,
 		id: KeyTypeId,

From 99164cbaf011f8b3390d4fcfbeb962c413b78ed1 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Fri, 21 May 2021 11:07:00 +0200
Subject: [PATCH 0769/1194] Introduce WeakBoundedVec, StorageTryAppend, and
 improve BoundedVec API (#8842)

* fix bounded vec doc and unsafe

* fix btree map and set and tests

* introduce weak_bounded_vec and StorageTryAppend

* fix tests and reorganize tests

* improve doc

* add doc

* Update frame/support/src/storage/weak_bounded_vec.rs

Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>

* fix inner doc

Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
---
 frame/support/src/lib.rs                      |   5 +
 .../support/src/storage/bounded_btree_map.rs  |  71 ++-
 .../support/src/storage/bounded_btree_set.rs  |  71 ++-
 frame/support/src/storage/bounded_vec.rs      | 230 ++--------
 frame/support/src/storage/mod.rs              | 200 ++++++++-
 frame/support/src/storage/types/double_map.rs |  69 +--
 frame/support/src/storage/types/map.rs        |  50 +--
 frame/support/src/storage/types/value.rs      |  37 +-
 frame/support/src/storage/weak_bounded_vec.rs | 420 ++++++++++++++++++
 frame/treasury/src/lib.rs                     |   2 +-
 10 files changed, 778 insertions(+), 377 deletions(-)
 create mode 100644 frame/support/src/storage/weak_bounded_vec.rs

diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index d1874b65b62e..911373bfad45 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -321,6 +321,7 @@ macro_rules! parameter_types {
 	(IMPL_CONST $name:ident, $type:ty, $value:expr) => {
 		impl $name {
 			/// Returns the value of this parameter type.
+			#[allow(unused)]
 			pub const fn get() -> $type {
 				$value
 			}
@@ -335,6 +336,7 @@ macro_rules! parameter_types {
 	(IMPL $name:ident, $type:ty, $value:expr) => {
 		impl $name {
 			/// Returns the value of this parameter type.
+			#[allow(unused)]
 			pub fn get() -> $type {
 				$value
 			}
@@ -349,6 +351,7 @@ macro_rules! parameter_types {
 	(IMPL_STORAGE $name:ident, $type:ty, $value:expr) => {
 		impl $name {
 			/// Returns the key for this parameter type.
+			#[allow(unused)]
 			pub fn key() -> [u8; 16] {
 				$crate::sp_io::hashing::twox_128(
 					concat!(":", stringify!($name), ":").as_bytes()
@@ -359,6 +362,7 @@ macro_rules! parameter_types {
 			///
 			/// This needs to be executed in an externalities provided
 			/// environment.
+			#[allow(unused)]
 			pub fn set(value: &$type) {
 				$crate::storage::unhashed::put(&Self::key(), value);
 			}
@@ -367,6 +371,7 @@ macro_rules! parameter_types {
 			///
 			/// This needs to be executed in an externalities provided
 			/// environment.
+			#[allow(unused)]
 			pub fn get() -> $type {
 				$crate::storage::unhashed::get(&Self::key()).unwrap_or_else(|| $value)
 			}
diff --git a/frame/support/src/storage/bounded_btree_map.rs b/frame/support/src/storage/bounded_btree_map.rs
index 7fd0d175fda9..8c50557618ee 100644
--- a/frame/support/src/storage/bounded_btree_map.rs
+++ b/frame/support/src/storage/bounded_btree_map.rs
@@ -32,11 +32,29 @@ use codec::{Encode, Decode};
 /// B-Trees represent a fundamental compromise between cache-efficiency and actually minimizing
 /// the amount of work performed in a search. See [`BTreeMap`] for more details.
 ///
-/// Unlike a standard `BTreeMap`, there is a static, enforced upper limit to the number of items
-/// in the map. All internal operations ensure this bound is respected.
-#[derive(Encode, Decode)]
+/// Unlike a standard `BTreeMap`, there is an enforced upper limit to the number of items in the
+/// map. All internal operations ensure this bound is respected.
+#[derive(Encode)]
 pub struct BoundedBTreeMap<K, V, S>(BTreeMap<K, V>, PhantomData<S>);
 
+impl<K, V, S> Decode for BoundedBTreeMap<K, V, S>
+where
+	BTreeMap<K, V>: Decode,
+	S: Get<u32>,
+{
+	fn decode<I: codec::Input>(input: &mut I) -> Result<Self, codec::Error> {
+		let inner = BTreeMap::<K, V>::decode(input)?;
+		if inner.len() > S::get() as usize {
+			return Err("BoundedBTreeMap exceeds its limit".into());
+		}
+		Ok(Self(inner, PhantomData))
+	}
+
+	fn skip<I: codec::Input>(input: &mut I) -> Result<(), codec::Error> {
+		BTreeMap::<K, V>::skip(input)
+	}
+}
+
 impl<K, V, S> BoundedBTreeMap<K, V, S>
 where
 	S: Get<u32>,
@@ -59,44 +77,6 @@ where
 		BoundedBTreeMap(BTreeMap::new(), PhantomData)
 	}
 
-	/// Create `Self` from a primitive `BTreeMap` without any checks.
-	unsafe fn unchecked_from(map: BTreeMap<K, V>) -> Self {
-		Self(map, Default::default())
-	}
-
-	/// Create `Self` from a primitive `BTreeMap` without any checks.
-	///
-	/// Logs warnings if the bound is not being respected. The scope is mentioned in the log message
-	/// to indicate where overflow is happening.
-	///
-	/// # Example
-	///
-	/// ```
-	/// # use sp_std::collections::btree_map::BTreeMap;
-	/// # use frame_support::{parameter_types, storage::bounded_btree_map::BoundedBTreeMap};
-	/// parameter_types! {
-	/// 	pub const Size: u32 = 5;
-	/// }
-	/// let mut map = BTreeMap::new();
-	/// map.insert("foo", 1);
-	/// map.insert("bar", 2);
-	/// let bounded_map = unsafe {BoundedBTreeMap::<_, _, Size>::force_from(map, "demo")};
-	/// ```
-	pub unsafe fn force_from<Scope>(map: BTreeMap<K, V>, scope: Scope) -> Self
-	where
-		Scope: Into<Option<&'static str>>,
-	{
-		if map.len() > Self::bound() {
-			log::warn!(
-				target: crate::LOG_TARGET,
-				"length of a bounded btreemap in scope {} is not respected.",
-				scope.into().unwrap_or("UNKNOWN"),
-			);
-		}
-
-		Self::unchecked_from(map)
-	}
-
 	/// Consume self, and return the inner `BTreeMap`.
 	///
 	/// This is useful when a mutating API of the inner type is desired, and closure-based mutation
@@ -418,4 +398,13 @@ pub mod test {
 		let bounded = boundedmap_from_keys::<u32, Seven>(&[1, 2, 3, 4, 5, 6]);
 		assert_eq!(bounded, map_from_keys(&[1, 2, 3, 4, 5, 6]));
 	}
+
+	#[test]
+	fn too_big_fail_to_decode() {
+		let v: Vec<(u32, u32)> = vec![(1, 1), (2, 2), (3, 3), (4, 4), (5, 5)];
+		assert_eq!(
+			BoundedBTreeMap::<u32, u32, Four>::decode(&mut &v.encode()[..]),
+			Err("BoundedBTreeMap exceeds its limit".into()),
+		);
+	}
 }
diff --git a/frame/support/src/storage/bounded_btree_set.rs b/frame/support/src/storage/bounded_btree_set.rs
index 586ecca4c85e..f551a3cbfa38 100644
--- a/frame/support/src/storage/bounded_btree_set.rs
+++ b/frame/support/src/storage/bounded_btree_set.rs
@@ -32,11 +32,29 @@ use codec::{Encode, Decode};
 /// B-Trees represent a fundamental compromise between cache-efficiency and actually minimizing
 /// the amount of work performed in a search. See [`BTreeSet`] for more details.
 ///
-/// Unlike a standard `BTreeSet`, there is a static, enforced upper limit to the number of items
-/// in the set. All internal operations ensure this bound is respected.
-#[derive(Encode, Decode)]
+/// Unlike a standard `BTreeSet`, there is an enforced upper limit to the number of items in the
+/// set. All internal operations ensure this bound is respected.
+#[derive(Encode)]
 pub struct BoundedBTreeSet<T, S>(BTreeSet<T>, PhantomData<S>);
 
+impl<T, S> Decode for BoundedBTreeSet<T, S>
+where
+	BTreeSet<T>: Decode,
+	S: Get<u32>,
+{
+	fn decode<I: codec::Input>(input: &mut I) -> Result<Self, codec::Error> {
+		let inner = BTreeSet::<T>::decode(input)?;
+		if inner.len() > S::get() as usize {
+			return Err("BoundedBTreeSet exceeds its limit".into());
+		}
+		Ok(Self(inner, PhantomData))
+	}
+
+	fn skip<I: codec::Input>(input: &mut I) -> Result<(), codec::Error> {
+		BTreeSet::<T>::skip(input)
+	}
+}
+
 impl<T, S> BoundedBTreeSet<T, S>
 where
 	S: Get<u32>,
@@ -59,44 +77,6 @@ where
 		BoundedBTreeSet(BTreeSet::new(), PhantomData)
 	}
 
-	/// Create `Self` from a primitive `BTreeSet` without any checks.
-	unsafe fn unchecked_from(set: BTreeSet<T>) -> Self {
-		Self(set, Default::default())
-	}
-
-	/// Create `Self` from a primitive `BTreeSet` without any checks.
-	///
-	/// Logs warnings if the bound is not being respected. The scope is mentioned in the log message
-	/// to indicate where overflow is happening.
-	///
-	/// # Example
-	///
-	/// ```
-	/// # use sp_std::collections::btree_set::BTreeSet;
-	/// # use frame_support::{parameter_types, storage::bounded_btree_set::BoundedBTreeSet};
-	/// parameter_types! {
-	/// 	pub const Size: u32 = 5;
-	/// }
-	/// let mut set = BTreeSet::new();
-	/// set.insert("foo");
-	/// set.insert("bar");
-	/// let bounded_set = unsafe {BoundedBTreeSet::<_, Size>::force_from(set, "demo")};
-	/// ```
-	pub unsafe fn force_from<Scope>(set: BTreeSet<T>, scope: Scope) -> Self
-	where
-		Scope: Into<Option<&'static str>>,
-	{
-		if set.len() > Self::bound() {
-			log::warn!(
-				target: crate::LOG_TARGET,
-				"length of a bounded btreeset in scope {} is not respected.",
-				scope.into().unwrap_or("UNKNOWN"),
-			);
-		}
-
-		Self::unchecked_from(set)
-	}
-
 	/// Consume self, and return the inner `BTreeSet`.
 	///
 	/// This is useful when a mutating API of the inner type is desired, and closure-based mutation
@@ -404,4 +384,13 @@ pub mod test {
 		let bounded = boundedmap_from_keys::<u32, Seven>(&[1, 2, 3, 4, 5, 6]);
 		assert_eq!(bounded, map_from_keys(&[1, 2, 3, 4, 5, 6]));
 	}
+
+	#[test]
+	fn too_big_fail_to_decode() {
+		let v: Vec<u32> = vec![1, 2, 3, 4, 5];
+		assert_eq!(
+			BoundedBTreeSet::<u32, Four>::decode(&mut &v.encode()[..]),
+			Err("BoundedBTreeSet exceeds its limit".into()),
+		);
+	}
 }
diff --git a/frame/support/src/storage/bounded_vec.rs b/frame/support/src/storage/bounded_vec.rs
index 6bb6ea541c33..a4e8c50918a0 100644
--- a/frame/support/src/storage/bounded_vec.rs
+++ b/frame/support/src/storage/bounded_vec.rs
@@ -20,14 +20,14 @@
 
 use sp_std::prelude::*;
 use sp_std::{convert::TryFrom, fmt, marker::PhantomData};
-use codec::{FullCodec, Encode, EncodeLike, Decode};
+use codec::{Encode, Decode};
 use core::{
 	ops::{Deref, Index, IndexMut},
 	slice::SliceIndex,
 };
 use crate::{
 	traits::{Get, MaxEncodedLen},
-	storage::{generator, StorageDecodeLength, StorageValue, StorageMap, StorageDoubleMap},
+	storage::{StorageDecodeLength, StorageTryAppend},
 };
 
 /// A bounded vector.
@@ -37,12 +37,26 @@ use crate::{
 ///
 /// As the name suggests, the length of the queue is always bounded. All internal operations ensure
 /// this bound is respected.
-#[derive(Encode, Decode)]
+#[derive(Encode)]
 pub struct BoundedVec<T, S>(Vec<T>, PhantomData<S>);
 
+impl<T: Decode, S: Get<u32>> Decode for BoundedVec<T, S> {
+	fn decode<I: codec::Input>(input: &mut I) -> Result<Self, codec::Error> {
+		let inner = Vec::<T>::decode(input)?;
+		if inner.len() > S::get() as usize {
+			return Err("BoundedVec exceeds its limit".into());
+		}
+		Ok(Self(inner, PhantomData))
+	}
+
+	fn skip<I: codec::Input>(input: &mut I) -> Result<(), codec::Error> {
+		Vec::<T>::skip(input)
+	}
+}
+
 impl<T, S> BoundedVec<T, S> {
 	/// Create `Self` from `t` without any checks.
-	unsafe fn unchecked_from(t: Vec<T>) -> Self {
+	fn unchecked_from(t: Vec<T>) -> Self {
 		Self(t, Default::default())
 	}
 
@@ -86,21 +100,6 @@ impl<T, S: Get<u32>> BoundedVec<T, S> {
 		S::get() as usize
 	}
 
-	/// Create `Self` from `t` without any checks. Logs warnings if the bound is not being
-	/// respected. The additional scope can be used to indicate where a potential overflow is
-	/// happening.
-	pub unsafe fn force_from(t: Vec<T>, scope: Option<&'static str>) -> Self {
-		if t.len() > Self::bound() {
-			log::warn!(
-				target: crate::LOG_TARGET,
-				"length of a bounded vector in scope {} is not respected.",
-				scope.unwrap_or("UNKNOWN"),
-			);
-		}
-
-		Self::unchecked_from(t)
-	}
-
 	/// Consumes self and mutates self via the given `mutate` function.
 	///
 	/// If the outcome of mutation is within bounds, `Some(Self)` is returned. Else, `None` is
@@ -147,7 +146,7 @@ impl<T, S: Get<u32>> BoundedVec<T, S> {
 impl<T, S> Default for BoundedVec<T, S> {
 	fn default() -> Self {
 		// the bound cannot be below 0, which is satisfied by an empty vector
-		unsafe { Self::unchecked_from(Vec::default()) }
+		Self::unchecked_from(Vec::default())
 	}
 }
 
@@ -168,7 +167,7 @@ where
 {
 	fn clone(&self) -> Self {
 		// bound is retained
-		unsafe { Self::unchecked_from(self.0.clone()) }
+		Self::unchecked_from(self.0.clone())
 	}
 }
 
@@ -177,7 +176,7 @@ impl<T, S: Get<u32>> TryFrom<Vec<T>> for BoundedVec<T, S> {
 	fn try_from(t: Vec<T>) -> Result<Self, Self::Error> {
 		if t.len() <= Self::bound() {
 			// explicit check just above
-			Ok(unsafe { Self::unchecked_from(t) })
+			Ok(Self::unchecked_from(t))
 		} else {
 			Err(())
 		}
@@ -273,114 +272,9 @@ impl<T, S> Eq for BoundedVec<T, S> where T: Eq {}
 
 impl<T, S> StorageDecodeLength for BoundedVec<T, S> {}
 
-/// Storage value that is *maybe* capable of [`StorageAppend`](crate::storage::StorageAppend).
-pub trait TryAppendValue<T: Encode, S: Get<u32>> {
-	/// Try and append the `item` into the storage item.
-	///
-	/// This might fail if bounds are not respected.
-	fn try_append<LikeT: EncodeLike<T>>(item: LikeT) -> Result<(), ()>;
-}
-
-/// Storage map that is *maybe* capable of [`StorageAppend`](crate::storage::StorageAppend).
-pub trait TryAppendMap<K: FullCodec, T: Encode, S: Get<u32>> {
-	/// Try and append the `item` into the storage map at the given `key`.
-	///
-	/// This might fail if bounds are not respected.
-	fn try_append<LikeK: EncodeLike<K> + Clone, LikeT: EncodeLike<T>>(
-		key: LikeK,
-		item: LikeT,
-	) -> Result<(), ()>;
-}
-
-/// Storage double map that is *maybe* capable of [`StorageAppend`](crate::storage::StorageAppend).
-pub trait TryAppendDoubleMap<K1: FullCodec, K2: FullCodec, T: Encode, S: Get<u32>> {
-	/// Try and append the `item` into the storage double map at the given `key`.
-	///
-	/// This might fail if bounds are not respected.
-	fn try_append<
-		LikeK1: EncodeLike<K1> + Clone,
-		LikeK2: EncodeLike<K2> + Clone,
-		LikeT: EncodeLike<T>,
-	>(
-		key1: LikeK1,
-		key2: LikeK2,
-		item: LikeT,
-	) -> Result<(), ()>;
-}
-
-impl<T, S, StorageValueT> TryAppendValue<T, S> for StorageValueT
-where
-	BoundedVec<T, S>: FullCodec,
-	T: Encode,
-	S: Get<u32>,
-	StorageValueT: generator::StorageValue<BoundedVec<T, S>>,
-{
-	fn try_append<LikeT: EncodeLike<T>>(item: LikeT) -> Result<(), ()> {
-		let bound = BoundedVec::<T, S>::bound();
-		let current = Self::decode_len().unwrap_or_default();
-		if current < bound {
-			// NOTE: we cannot reuse the implementation for `Vec<T>` here because we never want to
-			// mark `BoundedVec<T, S>` as `StorageAppend`.
-			let key = Self::storage_value_final_key();
-			sp_io::storage::append(&key, item.encode());
-			Ok(())
-		} else {
-			Err(())
-		}
-	}
-}
-
-impl<K, T, S, StorageMapT> TryAppendMap<K, T, S> for StorageMapT
-where
-	K: FullCodec,
-	BoundedVec<T, S>: FullCodec,
-	T: Encode,
-	S: Get<u32>,
-	StorageMapT: generator::StorageMap<K, BoundedVec<T, S>>,
-{
-	fn try_append<LikeK: EncodeLike<K> + Clone, LikeT: EncodeLike<T>>(
-		key: LikeK,
-		item: LikeT,
-	) -> Result<(), ()> {
-		let bound = BoundedVec::<T, S>::bound();
-		let current = Self::decode_len(key.clone()).unwrap_or_default();
-		if current < bound {
-			let key = Self::storage_map_final_key(key);
-			sp_io::storage::append(&key, item.encode());
-			Ok(())
-		} else {
-			Err(())
-		}
-	}
-}
-
-impl<K1, K2, T, S, StorageDoubleMapT> TryAppendDoubleMap<K1, K2, T, S> for StorageDoubleMapT
-where
-	K1: FullCodec,
-	K2: FullCodec,
-	BoundedVec<T, S>: FullCodec,
-	T: Encode,
-	S: Get<u32>,
-	StorageDoubleMapT: generator::StorageDoubleMap<K1, K2, BoundedVec<T, S>>,
-{
-	fn try_append<
-		LikeK1: EncodeLike<K1> + Clone,
-		LikeK2: EncodeLike<K2> + Clone,
-		LikeT: EncodeLike<T>,
-	>(
-		key1: LikeK1,
-		key2: LikeK2,
-		item: LikeT,
-	) -> Result<(), ()> {
-		let bound = BoundedVec::<T, S>::bound();
-		let current = Self::decode_len(key1.clone(), key2.clone()).unwrap_or_default();
-		if current < bound {
-			let double_map_key = Self::storage_double_map_final_key(key1, key2);
-			sp_io::storage::append(&double_map_key, item.encode());
-			Ok(())
-		} else {
-			Err(())
-		}
+impl<T, S: Get<u32>> StorageTryAppend<T> for BoundedVec<T, S> {
+	fn bound() -> usize {
+		S::get() as usize
 	}
 }
 
@@ -405,7 +299,7 @@ pub mod test {
 	use super::*;
 	use sp_io::TestExternalities;
 	use sp_std::convert::TryInto;
-	use crate::{assert_ok, Twox128};
+	use crate::Twox128;
 
 	crate::parameter_types! {
 		pub const Seven: u32 = 7;
@@ -419,6 +313,11 @@ pub mod test {
 		FooDoubleMap => DoubleMap<(u32, Twox128), (u32, Twox128), BoundedVec<u32, Seven>>
 	}
 
+	#[test]
+	fn try_append_is_correct() {
+		assert_eq!(BoundedVec::<u32, Seven>::bound(), 7);
+	}
+
 	#[test]
 	fn decode_len_works() {
 		TestExternalities::default().execute_with(|| {
@@ -445,66 +344,6 @@ pub mod test {
 		});
 	}
 
-	#[test]
-	fn try_append_works() {
-		TestExternalities::default().execute_with(|| {
-			let bounded: BoundedVec<u32, Seven> = vec![1, 2, 3].try_into().unwrap();
-			Foo::put(bounded);
-			assert_ok!(Foo::try_append(4));
-			assert_ok!(Foo::try_append(5));
-			assert_ok!(Foo::try_append(6));
-			assert_ok!(Foo::try_append(7));
-			assert_eq!(Foo::decode_len().unwrap(), 7);
-			assert!(Foo::try_append(8).is_err());
-		});
-
-		TestExternalities::default().execute_with(|| {
-			let bounded: BoundedVec<u32, Seven> = vec![1, 2, 3].try_into().unwrap();
-			FooMap::insert(1, bounded);
-
-			assert_ok!(FooMap::try_append(1, 4));
-			assert_ok!(FooMap::try_append(1, 5));
-			assert_ok!(FooMap::try_append(1, 6));
-			assert_ok!(FooMap::try_append(1, 7));
-			assert_eq!(FooMap::decode_len(1).unwrap(), 7);
-			assert!(FooMap::try_append(1, 8).is_err());
-
-			// append to a non-existing
-			assert!(FooMap::get(2).is_none());
-			assert_ok!(FooMap::try_append(2, 4));
-			assert_eq!(FooMap::get(2).unwrap(), unsafe {
-				BoundedVec::<u32, Seven>::unchecked_from(vec![4])
-			});
-			assert_ok!(FooMap::try_append(2, 5));
-			assert_eq!(FooMap::get(2).unwrap(), unsafe {
-				BoundedVec::<u32, Seven>::unchecked_from(vec![4, 5])
-			});
-		});
-
-		TestExternalities::default().execute_with(|| {
-			let bounded: BoundedVec<u32, Seven> = vec![1, 2, 3].try_into().unwrap();
-			FooDoubleMap::insert(1, 1, bounded);
-
-			assert_ok!(FooDoubleMap::try_append(1, 1, 4));
-			assert_ok!(FooDoubleMap::try_append(1, 1, 5));
-			assert_ok!(FooDoubleMap::try_append(1, 1, 6));
-			assert_ok!(FooDoubleMap::try_append(1, 1, 7));
-			assert_eq!(FooDoubleMap::decode_len(1, 1).unwrap(), 7);
-			assert!(FooDoubleMap::try_append(1, 1, 8).is_err());
-
-			// append to a non-existing
-			assert!(FooDoubleMap::get(2, 1).is_none());
-			assert_ok!(FooDoubleMap::try_append(2, 1, 4));
-			assert_eq!(FooDoubleMap::get(2, 1).unwrap(), unsafe {
-				BoundedVec::<u32, Seven>::unchecked_from(vec![4])
-			});
-			assert_ok!(FooDoubleMap::try_append(2, 1, 5));
-			assert_eq!(FooDoubleMap::get(2, 1).unwrap(), unsafe {
-				BoundedVec::<u32, Seven>::unchecked_from(vec![4, 5])
-			});
-		});
-	}
-
 	#[test]
 	fn try_insert_works() {
 		let mut bounded: BoundedVec<u32, Four> = vec![1, 2, 3].try_into().unwrap();
@@ -559,4 +398,13 @@ pub mod test {
 		let bounded: BoundedVec<u32, Seven> = vec![1, 2, 3, 4, 5, 6].try_into().unwrap();
 		assert_eq!(bounded, vec![1, 2, 3, 4, 5, 6]);
 	}
+
+	#[test]
+	fn too_big_vec_fail_to_decode() {
+		let v: Vec<u32> = vec![1, 2, 3, 4, 5];
+		assert_eq!(
+			BoundedVec::<u32, Four>::decode(&mut &v.encode()[..]),
+			Err("BoundedVec exceeds its limit".into()),
+		);
+	}
 }
diff --git a/frame/support/src/storage/mod.rs b/frame/support/src/storage/mod.rs
index b779e064ac20..34d217f5c31b 100644
--- a/frame/support/src/storage/mod.rs
+++ b/frame/support/src/storage/mod.rs
@@ -36,6 +36,7 @@ pub mod hashed;
 pub mod bounded_btree_map;
 pub mod bounded_btree_set;
 pub mod bounded_vec;
+pub mod weak_bounded_vec;
 pub mod child;
 #[doc(hidden)]
 pub mod generator;
@@ -965,12 +966,14 @@ pub trait StorageDecodeLength: private::Sealed + codec::DecodeLength {
 mod private {
 	use super::*;
 	use bounded_vec::BoundedVec;
+	use weak_bounded_vec::WeakBoundedVec;
 
 	pub trait Sealed {}
 
 	impl<T: Encode> Sealed for Vec<T> {}
 	impl<Hash: Encode> Sealed for Digest<Hash> {}
 	impl<T, S> Sealed for BoundedVec<T, S> {}
+	impl<T, S> Sealed for WeakBoundedVec<T, S> {}
 	impl<K, V, S> Sealed for bounded_btree_map::BoundedBTreeMap<K, V, S> {}
 	impl<T, S> Sealed for bounded_btree_set::BoundedBTreeSet<T, S> {}
 
@@ -1010,13 +1013,132 @@ impl<T: Encode> StorageDecodeLength for Vec<T> {}
 /// format ever changes, we need to remove this here.
 impl<Hash: Encode> StorageAppend<DigestItem<Hash>> for Digest<Hash> {}
 
+/// Marker trait that is implemented for types that support the `storage::append` api with a limit
+/// on the number of element.
+///
+/// This trait is sealed.
+pub trait StorageTryAppend<Item>: StorageDecodeLength + private::Sealed {
+	fn bound() -> usize;
+}
+
+/// Storage value that is capable of [`StorageTryAppend`](crate::storage::StorageTryAppend).
+pub trait TryAppendValue<T: StorageTryAppend<I>, I: Encode> {
+	/// Try and append the `item` into the storage item.
+	///
+	/// This might fail if bounds are not respected.
+	fn try_append<LikeI: EncodeLike<I>>(item: LikeI) -> Result<(), ()>;
+}
+
+impl<T, I, StorageValueT> TryAppendValue<T, I> for StorageValueT
+where
+	I: Encode,
+	T: FullCodec + StorageTryAppend<I>,
+	StorageValueT: generator::StorageValue<T>,
+{
+	fn try_append<LikeI: EncodeLike<I>>(item: LikeI) -> Result<(), ()> {
+		let bound = T::bound();
+		let current = Self::decode_len().unwrap_or_default();
+		if current < bound {
+			// NOTE: we cannot reuse the implementation for `Vec<T>` here because we never want to
+			// mark `BoundedVec<T, S>` as `StorageAppend`.
+			let key = Self::storage_value_final_key();
+			sp_io::storage::append(&key, item.encode());
+			Ok(())
+		} else {
+			Err(())
+		}
+	}
+}
+
+/// Storage map that is capable of [`StorageTryAppend`](crate::storage::StorageTryAppend).
+pub trait TryAppendMap<K: Encode, T: StorageTryAppend<I>, I: Encode> {
+	/// Try and append the `item` into the storage map at the given `key`.
+	///
+	/// This might fail if bounds are not respected.
+	fn try_append<LikeK: EncodeLike<K> + Clone, LikeI: EncodeLike<I>>(
+		key: LikeK,
+		item: LikeI,
+	) -> Result<(), ()>;
+}
+
+impl<K, T, I, StorageMapT> TryAppendMap<K, T, I> for StorageMapT
+where
+	K: FullCodec,
+	T: FullCodec + StorageTryAppend<I>,
+	I: Encode,
+	StorageMapT: generator::StorageMap<K, T>,
+{
+	fn try_append<LikeK: EncodeLike<K> + Clone, LikeI: EncodeLike<I>>(
+		key: LikeK,
+		item: LikeI,
+	) -> Result<(), ()> {
+		let bound = T::bound();
+		let current = Self::decode_len(key.clone()).unwrap_or_default();
+		if current < bound {
+			let key = Self::storage_map_final_key(key);
+			sp_io::storage::append(&key, item.encode());
+			Ok(())
+		} else {
+			Err(())
+		}
+	}
+}
+
+/// Storage double map that is capable of [`StorageTryAppend`](crate::storage::StorageTryAppend).
+pub trait TryAppendDoubleMap<K1: Encode, K2: Encode, T: StorageTryAppend<I>, I: Encode> {
+	/// Try and append the `item` into the storage double map at the given `key`.
+	///
+	/// This might fail if bounds are not respected.
+	fn try_append<
+		LikeK1: EncodeLike<K1> + Clone,
+		LikeK2: EncodeLike<K2> + Clone,
+		LikeI: EncodeLike<I>,
+	>(
+		key1: LikeK1,
+		key2: LikeK2,
+		item: LikeI,
+	) -> Result<(), ()>;
+}
+
+impl<K1, K2, T, I, StorageDoubleMapT> TryAppendDoubleMap<K1, K2, T, I> for StorageDoubleMapT
+where
+	K1: FullCodec,
+	K2: FullCodec,
+	T: FullCodec + StorageTryAppend<I>,
+	I: Encode,
+	StorageDoubleMapT: generator::StorageDoubleMap<K1, K2, T>,
+{
+	fn try_append<
+		LikeK1: EncodeLike<K1> + Clone,
+		LikeK2: EncodeLike<K2> + Clone,
+		LikeI: EncodeLike<I>,
+	>(
+		key1: LikeK1,
+		key2: LikeK2,
+		item: LikeI,
+	) -> Result<(), ()> {
+		let bound = T::bound();
+		let current = Self::decode_len(key1.clone(), key2.clone()).unwrap_or_default();
+		if current < bound {
+			let double_map_key = Self::storage_double_map_final_key(key1, key2);
+			sp_io::storage::append(&double_map_key, item.encode());
+			Ok(())
+		} else {
+			Err(())
+		}
+	}
+}
+
 #[cfg(test)]
 mod test {
 	use super::*;
 	use sp_core::hashing::twox_128;
-	use crate::hash::Identity;
+	use crate::{hash::Identity, assert_ok};
 	use sp_io::TestExternalities;
 	use generator::StorageValue as _;
+	use bounded_vec::BoundedVec;
+	use weak_bounded_vec::WeakBoundedVec;
+	use core::convert::{TryFrom, TryInto};
 
 	#[test]
 	fn prefixed_map_works() {
@@ -1225,4 +1347,80 @@ mod test {
 			);
 		});
 	}
+
+	crate::parameter_types! {
+		pub const Seven: u32 = 7;
+		pub const Four: u32 = 4;
+	}
+
+	crate::generate_storage_alias! { Prefix, Foo => Value<WeakBoundedVec<u32, Seven>> }
+	crate::generate_storage_alias! { Prefix, FooMap => Map<(u32, Twox128), BoundedVec<u32, Seven>> }
+	crate::generate_storage_alias! {
+		Prefix,
+		FooDoubleMap => DoubleMap<(u32, Twox128), (u32, Twox128), BoundedVec<u32, Seven>>
+	}
+
+	#[test]
+	fn try_append_works() {
+		TestExternalities::default().execute_with(|| {
+			let bounded: WeakBoundedVec<u32, Seven> = vec![1, 2, 3].try_into().unwrap();
+			Foo::put(bounded);
+			assert_ok!(Foo::try_append(4));
+			assert_ok!(Foo::try_append(5));
+			assert_ok!(Foo::try_append(6));
+			assert_ok!(Foo::try_append(7));
+			assert_eq!(Foo::decode_len().unwrap(), 7);
+			assert!(Foo::try_append(8).is_err());
+		});
+
+		TestExternalities::default().execute_with(|| {
+			let bounded: BoundedVec<u32, Seven> = vec![1, 2, 3].try_into().unwrap();
+			FooMap::insert(1, bounded);
+
+			assert_ok!(FooMap::try_append(1, 4));
+			assert_ok!(FooMap::try_append(1, 5));
+			assert_ok!(FooMap::try_append(1, 6));
+			assert_ok!(FooMap::try_append(1, 7));
+			assert_eq!(FooMap::decode_len(1).unwrap(), 7);
+			assert!(FooMap::try_append(1, 8).is_err());
+
+			// append to a non-existing
+			assert!(FooMap::get(2).is_none());
+			assert_ok!(FooMap::try_append(2, 4));
+			assert_eq!(
+				FooMap::get(2).unwrap(),
+				BoundedVec::<u32, Seven>::try_from(vec![4]).unwrap(),
+			);
+			assert_ok!(FooMap::try_append(2, 5));
+			assert_eq!(
+				FooMap::get(2).unwrap(),
+				BoundedVec::<u32, Seven>::try_from(vec![4, 5]).unwrap(),
+			);
+		});
+
+		TestExternalities::default().execute_with(|| {
+			let bounded: BoundedVec<u32, Seven> = vec![1, 2, 3].try_into().unwrap();
+			FooDoubleMap::insert(1, 1, bounded);
+
+			assert_ok!(FooDoubleMap::try_append(1, 1, 4));
+			assert_ok!(FooDoubleMap::try_append(1, 1, 5));
+			assert_ok!(FooDoubleMap::try_append(1, 1, 6));
+			assert_ok!(FooDoubleMap::try_append(1, 1, 7));
+			assert_eq!(FooDoubleMap::decode_len(1, 1).unwrap(), 7);
+			assert!(FooDoubleMap::try_append(1, 1, 8).is_err());
+
+			// append to a non-existing
+			assert!(FooDoubleMap::get(2, 1).is_none());
+			assert_ok!(FooDoubleMap::try_append(2, 1, 4));
+			assert_eq!(
+				FooDoubleMap::get(2, 1).unwrap(),
+				BoundedVec::<u32, Seven>::try_from(vec![4]).unwrap(),
+			);
+			assert_ok!(FooDoubleMap::try_append(2, 1, 5));
+			assert_eq!(
+				FooDoubleMap::get(2, 1).unwrap(),
+				BoundedVec::<u32, Seven>::try_from(vec![4, 5]).unwrap(),
+			);
+		});
+	}
 }
diff --git a/frame/support/src/storage/types/double_map.rs b/frame/support/src/storage/types/double_map.rs
index 8c23354817f4..f0ed1999d912 100644
--- a/frame/support/src/storage/types/double_map.rs
+++ b/frame/support/src/storage/types/double_map.rs
@@ -21,8 +21,7 @@
 use codec::{Decode, Encode, EncodeLike, FullCodec};
 use crate::{
 	storage::{
-		StorageAppend, StorageDecodeLength, StoragePrefixedMap,
-		bounded_vec::BoundedVec,
+		StorageAppend, StorageTryAppend, StorageDecodeLength, StoragePrefixedMap,
 		types::{OptionQuery, QueryKindTrait, OnEmptyGetter},
 	},
 	traits::{GetDefault, StorageInstance, Get, MaxEncodedLen, StorageInfo},
@@ -116,52 +115,6 @@ where
 	}
 }
 
-impl<Prefix, Hasher1, Key1, Hasher2, Key2, QueryKind, OnEmpty, MaxValues, VecValue, VecBound>
-	StorageDoubleMap<
-		Prefix,
-		Hasher1,
-		Key1,
-		Hasher2,
-		Key2,
-		BoundedVec<VecValue, VecBound>,
-		QueryKind,
-		OnEmpty,
-		MaxValues,
-	> where
-	Prefix: StorageInstance,
-	Hasher1: crate::hash::StorageHasher,
-	Hasher2: crate::hash::StorageHasher,
-	Key1: FullCodec,
-	Key2: FullCodec,
-	QueryKind: QueryKindTrait<BoundedVec<VecValue, VecBound>, OnEmpty>,
-	OnEmpty: Get<QueryKind::Query> + 'static,
-	MaxValues: Get<Option<u32>>,
-	VecValue: FullCodec,
-	VecBound: Get<u32>,
-{
-	/// Try and append the given item to the double map in the storage.
-	///
-	/// Is only available if `Value` of the map is [`BoundedVec`].
-	pub fn try_append<EncodeLikeItem, EncodeLikeKey1, EncodeLikeKey2>(
-		key1: EncodeLikeKey1,
-		key2: EncodeLikeKey2,
-		item: EncodeLikeItem,
-	) -> Result<(), ()>
-	where
-		EncodeLikeKey1: EncodeLike<Key1> + Clone,
-		EncodeLikeKey2: EncodeLike<Key2> + Clone,
-		EncodeLikeItem: EncodeLike<VecValue>,
-	{
-		<
-			Self
-			as
-			crate::storage::bounded_vec::TryAppendDoubleMap<Key1, Key2, VecValue, VecBound>
-		>::try_append(
-			key1, key2, item,
-		)
-	}
-}
-
 impl<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty, MaxValues>
 	StorageDoubleMap<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty, MaxValues>
 where
@@ -390,6 +343,26 @@ where
 	pub fn translate_values<OldValue: Decode, F: FnMut(OldValue) -> Option<Value>>(f: F) {
 		<Self as crate::storage::StoragePrefixedMap<Value>>::translate_values(f)
 	}
+
+	/// Try and append the given item to the value in the storage.
+	///
+	/// Is only available if `Value` of the storage implements [`StorageTryAppend`].
+	pub fn try_append<KArg1, KArg2, Item, EncodeLikeItem>(
+		key1: KArg1,
+		key2: KArg2,
+		item: EncodeLikeItem,
+	) -> Result<(), ()>
+	where
+		KArg1: EncodeLike<Key1> + Clone,
+		KArg2: EncodeLike<Key2> + Clone,
+		Item: Encode,
+		EncodeLikeItem: EncodeLike<Item>,
+		Value: StorageTryAppend<Item>,
+	{
+		<
+			Self as crate::storage::TryAppendDoubleMap<Key1, Key2, Value, Item>
+		>::try_append(key1, key2, item)
+	}
 }
 
 impl<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty, MaxValues>
diff --git a/frame/support/src/storage/types/map.rs b/frame/support/src/storage/types/map.rs
index ac2817c6887f..35062fbc61b2 100644
--- a/frame/support/src/storage/types/map.rs
+++ b/frame/support/src/storage/types/map.rs
@@ -21,8 +21,7 @@
 use codec::{FullCodec, Decode, EncodeLike, Encode};
 use crate::{
 	storage::{
-		StorageAppend, StorageDecodeLength, StoragePrefixedMap,
-		bounded_vec::BoundedVec,
+		StorageAppend, StorageTryAppend, StorageDecodeLength, StoragePrefixedMap,
 		types::{OptionQuery, QueryKindTrait, OnEmptyGetter},
 	},
 	traits::{GetDefault, StorageInstance, Get, MaxEncodedLen, StorageInfo},
@@ -98,35 +97,6 @@ where
 	}
 }
 
-impl<Prefix, Hasher, Key, QueryKind, OnEmpty, MaxValues, VecValue, VecBound>
-	StorageMap<Prefix, Hasher, Key, BoundedVec<VecValue, VecBound>, QueryKind, OnEmpty, MaxValues>
-where
-	Prefix: StorageInstance,
-	Hasher: crate::hash::StorageHasher,
-	Key: FullCodec,
-	QueryKind: QueryKindTrait<BoundedVec<VecValue, VecBound>, OnEmpty>,
-	OnEmpty: Get<QueryKind::Query> + 'static,
-	MaxValues: Get<Option<u32>>,
-	VecValue: FullCodec,
-	VecBound: Get<u32>,
-{
-	/// Try and append the given item to the map in the storage.
-	///
-	/// Is only available if `Value` of the map is [`BoundedVec`].
-	pub fn try_append<EncodeLikeItem, EncodeLikeKey>(
-		key: EncodeLikeKey,
-		item: EncodeLikeItem,
-	) -> Result<(), ()>
-	where
-		EncodeLikeKey: EncodeLike<Key> + Clone,
-		EncodeLikeItem: EncodeLike<VecValue>,
-	{
-		<Self as crate::storage::bounded_vec::TryAppendMap<Key, VecValue, VecBound>>::try_append(
-			key, item,
-		)
-	}
-}
-
 impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
 	StorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
 where
@@ -289,6 +259,24 @@ where
 	pub fn translate_values<OldValue: Decode, F: FnMut(OldValue) -> Option<Value>>(f: F) {
 		<Self as crate::storage::StoragePrefixedMap<Value>>::translate_values(f)
 	}
+
+	/// Try and append the given item to the value in the storage.
+	///
+	/// Is only available if `Value` of the storage implements [`StorageTryAppend`].
+	pub fn try_append<KArg, Item, EncodeLikeItem>(
+		key: KArg,
+		item: EncodeLikeItem,
+	) -> Result<(), ()>
+	where
+		KArg: EncodeLike<Key> + Clone,
+		Item: Encode,
+		EncodeLikeItem: EncodeLike<Item>,
+		Value: StorageTryAppend<Item>,
+	{
+		<
+			Self as crate::storage::TryAppendMap<Key, Value, Item>
+		>::try_append(key, item)
+	}
 }
 
 impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
diff --git a/frame/support/src/storage/types/value.rs b/frame/support/src/storage/types/value.rs
index 67d2e3741929..5b37066fc394 100644
--- a/frame/support/src/storage/types/value.rs
+++ b/frame/support/src/storage/types/value.rs
@@ -20,11 +20,10 @@
 use codec::{FullCodec, Decode, EncodeLike, Encode};
 use crate::{
 	storage::{
-		StorageAppend, StorageDecodeLength,
-		bounded_vec::BoundedVec,
+		StorageAppend, StorageTryAppend, StorageDecodeLength,
 		types::{OptionQuery, QueryKindTrait, OnEmptyGetter},
 	},
-	traits::{GetDefault, StorageInstance, Get, MaxEncodedLen, StorageInfo},
+	traits::{GetDefault, StorageInstance, MaxEncodedLen, StorageInfo},
 };
 use frame_metadata::{DefaultByteGetter, StorageEntryModifier};
 use sp_arithmetic::traits::SaturatedConversion;
@@ -63,26 +62,6 @@ where
 	}
 }
 
-impl<Prefix, QueryKind, OnEmpty, VecValue, VecBound>
-	StorageValue<Prefix, BoundedVec<VecValue, VecBound>, QueryKind, OnEmpty>
-where
-	Prefix: StorageInstance,
-	QueryKind: QueryKindTrait<BoundedVec<VecValue, VecBound>, OnEmpty>,
-	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
-	VecValue: FullCodec,
-	VecBound: Get<u32>,
-{
-	/// Try and append the given item to the value in the storage.
-	///
-	/// Is only available if `Value` of the storage is [`BoundedVec`].
-	pub fn try_append<EncodeLikeItem>(item: EncodeLikeItem) -> Result<(), ()>
-	where
-		EncodeLikeItem: EncodeLike<VecValue>,
-	{
-		<Self as crate::storage::bounded_vec::TryAppendValue<VecValue, VecBound>>::try_append(item)
-	}
-}
-
 impl<Prefix, Value, QueryKind, OnEmpty> StorageValue<Prefix, Value, QueryKind, OnEmpty>
 where
 	Prefix: StorageInstance,
@@ -192,6 +171,18 @@ where
 	pub fn decode_len() -> Option<usize> where Value: StorageDecodeLength {
 		<Self as crate::storage::StorageValue<Value>>::decode_len()
 	}
+
+	/// Try and append the given item to the value in the storage.
+	///
+	/// Is only available if `Value` of the storage implements [`StorageTryAppend`].
+	pub fn try_append<Item, EncodeLikeItem>(item: EncodeLikeItem) -> Result<(), ()>
+	where
+		Item: Encode,
+		EncodeLikeItem: EncodeLike<Item>,
+		Value: StorageTryAppend<Item>,
+	{
+		<Self as crate::storage::TryAppendValue<Value, Item>>::try_append(item)
+	}
 }
 
 /// Part of storage metadata for storage value.
diff --git a/frame/support/src/storage/weak_bounded_vec.rs b/frame/support/src/storage/weak_bounded_vec.rs
new file mode 100644
index 000000000000..606c24de44bb
--- /dev/null
+++ b/frame/support/src/storage/weak_bounded_vec.rs
@@ -0,0 +1,420 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Traits, types and structs to support putting a bounded vector into storage, as a raw value, map
+//! or a double map.
+
+use sp_std::prelude::*;
+use sp_std::{convert::TryFrom, fmt, marker::PhantomData};
+use codec::{Encode, Decode};
+use core::{
+	ops::{Deref, Index, IndexMut},
+	slice::SliceIndex,
+};
+use crate::{
+	traits::{Get, MaxEncodedLen},
+	storage::{StorageDecodeLength, StorageTryAppend},
+};
+
+/// A weakly bounded vector.
+///
+/// It has implementations for efficient append and length decoding, as with a normal `Vec<_>`, once
+/// put into storage as a raw value, map or double-map.
+///
+/// The length of the vec is not strictly bounded. Decoding a vec with more element that the bound
+/// is accepted, and some method allow to bypass the restriction with warnings.
+#[derive(Encode)]
+pub struct WeakBoundedVec<T, S>(Vec<T>, PhantomData<S>);
+
+impl<T: Decode, S: Get<u32>> Decode for WeakBoundedVec<T, S> {
+	fn decode<I: codec::Input>(input: &mut I) -> Result<Self, codec::Error> {
+		let inner = Vec::<T>::decode(input)?;
+		Ok(Self::force_from(inner, Some("decode")))
+	}
+
+	fn skip<I: codec::Input>(input: &mut I) -> Result<(), codec::Error> {
+		Vec::<T>::skip(input)
+	}
+}
+
+impl<T, S> WeakBoundedVec<T, S> {
+	/// Create `Self` from `t` without any checks.
+	fn unchecked_from(t: Vec<T>) -> Self {
+		Self(t, Default::default())
+	}
+
+	/// Consume self, and return the inner `Vec`. Henceforth, the `Vec<_>` can be altered in an
+	/// arbitrary way. At some point, if the reverse conversion is required, `TryFrom<Vec<_>>` can
+	/// be used.
+	///
+	/// This is useful for cases if you need access to an internal API of the inner `Vec<_>` which
+	/// is not provided by the wrapper `WeakBoundedVec`.
+	pub fn into_inner(self) -> Vec<T> {
+		self.0
+	}
+
+	/// Exactly the same semantics as [`Vec::remove`].
+	///
+	/// # Panics
+	///
+	/// Panics if `index` is out of bounds.
+	pub fn remove(&mut self, index: usize) {
+		self.0.remove(index);
+	}
+
+	/// Exactly the same semantics as [`Vec::swap_remove`].
+	///
+	/// # Panics
+	///
+	/// Panics if `index` is out of bounds.
+	pub fn swap_remove(&mut self, index: usize) {
+		self.0.swap_remove(index);
+	}
+
+	/// Exactly the same semantics as [`Vec::retain`].
+	pub fn retain<F: FnMut(&T) -> bool>(&mut self, f: F) {
+		self.0.retain(f)
+	}
+}
+
+impl<T, S: Get<u32>> WeakBoundedVec<T, S> {
+	/// Get the bound of the type in `usize`.
+	pub fn bound() -> usize {
+		S::get() as usize
+	}
+
+	/// Create `Self` from `t` without any checks. Logs warnings if the bound is not being
+	/// respected. The additional scope can be used to indicate where a potential overflow is
+	/// happening.
+	pub fn force_from(t: Vec<T>, scope: Option<&'static str>) -> Self {
+		if t.len() > Self::bound() {
+			log::warn!(
+				target: crate::LOG_TARGET,
+				"length of a bounded vector in scope {} is not respected.",
+				scope.unwrap_or("UNKNOWN"),
+			);
+		}
+
+		Self::unchecked_from(t)
+	}
+
+	/// Consumes self and mutates self via the given `mutate` function.
+	///
+	/// If the outcome of mutation is within bounds, `Some(Self)` is returned. Else, `None` is
+	/// returned.
+	///
+	/// This is essentially a *consuming* shorthand [`Self::into_inner`] -> `...` ->
+	/// [`Self::try_from`].
+	pub fn try_mutate(mut self, mut mutate: impl FnMut(&mut Vec<T>)) -> Option<Self> {
+		mutate(&mut self.0);
+		(self.0.len() <= Self::bound()).then(move || self)
+	}
+
+	/// Exactly the same semantics as [`Vec::insert`], but returns an `Err` (and is a noop) if the
+	/// new length of the vector exceeds `S`.
+	///
+	/// # Panics
+	///
+	/// Panics if `index > len`.
+	pub fn try_insert(&mut self, index: usize, element: T) -> Result<(), ()> {
+		if self.len() < Self::bound() {
+			self.0.insert(index, element);
+			Ok(())
+		} else {
+			Err(())
+		}
+	}
+
+	/// Exactly the same semantics as [`Vec::push`], but returns an `Err` (and is a noop) if the
+	/// new length of the vector exceeds `S`.
+	///
+	/// # Panics
+	///
+	/// Panics if the new capacity exceeds isize::MAX bytes.
+	pub fn try_push(&mut self, element: T) -> Result<(), ()> {
+		if self.len() < Self::bound() {
+			self.0.push(element);
+			Ok(())
+		} else {
+			Err(())
+		}
+	}
+}
+
+impl<T, S> Default for WeakBoundedVec<T, S> {
+	fn default() -> Self {
+		// the bound cannot be below 0, which is satisfied by an empty vector
+		Self::unchecked_from(Vec::default())
+	}
+}
+
+#[cfg(feature = "std")]
+impl<T, S> fmt::Debug for WeakBoundedVec<T, S>
+where
+	T: fmt::Debug,
+	S: Get<u32>,
+{
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		f.debug_tuple("WeakBoundedVec").field(&self.0).field(&Self::bound()).finish()
+	}
+}
+
+impl<T, S> Clone for WeakBoundedVec<T, S>
+where
+	T: Clone,
+{
+	fn clone(&self) -> Self {
+		// bound is retained
+		Self::unchecked_from(self.0.clone())
+	}
+}
+
+impl<T, S: Get<u32>> TryFrom<Vec<T>> for WeakBoundedVec<T, S> {
+	type Error = ();
+	fn try_from(t: Vec<T>) -> Result<Self, Self::Error> {
+		if t.len() <= Self::bound() {
+			// explicit check just above
+			Ok(Self::unchecked_from(t))
+		} else {
+			Err(())
+		}
+	}
+}
+
+// It is okay to give a non-mutable reference of the inner vec to anyone.
+impl<T, S> AsRef<Vec<T>> for WeakBoundedVec<T, S> {
+	fn as_ref(&self) -> &Vec<T> {
+		&self.0
+	}
+}
+
+impl<T, S> AsRef<[T]> for WeakBoundedVec<T, S> {
+	fn as_ref(&self) -> &[T] {
+		&self.0
+	}
+}
+
+impl<T, S> AsMut<[T]> for WeakBoundedVec<T, S> {
+	fn as_mut(&mut self) -> &mut [T] {
+		&mut self.0
+	}
+}
+
+// will allow for immutable all operations of `Vec<T>` on `WeakBoundedVec<T>`.
+impl<T, S> Deref for WeakBoundedVec<T, S> {
+	type Target = Vec<T>;
+
+	fn deref(&self) -> &Self::Target {
+		&self.0
+	}
+}
+
+// Allows for indexing similar to a normal `Vec`. Can panic if out of bound.
+impl<T, S, I> Index<I> for WeakBoundedVec<T, S>
+where
+	I: SliceIndex<[T]>,
+{
+	type Output = I::Output;
+
+	#[inline]
+	fn index(&self, index: I) -> &Self::Output {
+		self.0.index(index)
+	}
+}
+
+impl<T, S, I> IndexMut<I> for WeakBoundedVec<T, S>
+where
+	I: SliceIndex<[T]>,
+{
+	#[inline]
+	fn index_mut(&mut self, index: I) -> &mut Self::Output {
+		self.0.index_mut(index)
+	}
+}
+
+impl<T, S> sp_std::iter::IntoIterator for WeakBoundedVec<T, S> {
+	type Item = T;
+	type IntoIter = sp_std::vec::IntoIter<T>;
+	fn into_iter(self) -> Self::IntoIter {
+		self.0.into_iter()
+	}
+}
+
+impl<T, S> codec::DecodeLength for WeakBoundedVec<T, S> {
+	fn len(self_encoded: &[u8]) -> Result<usize, codec::Error> {
+		// `WeakBoundedVec<T, _>` stored just a `Vec<T>`, thus the length is at the beginning in
+		// `Compact` form, and same implementation as `Vec<T>` can be used.
+		<Vec<T> as codec::DecodeLength>::len(self_encoded)
+	}
+}
+
+// NOTE: we could also implement this as:
+// impl<T: Value, S1: Get<u32>, S2: Get<u32>> PartialEq<WeakBoundedVec<T, S2>> for WeakBoundedVec<T, S1>
+// to allow comparison of bounded vectors with different bounds.
+impl<T, S> PartialEq for WeakBoundedVec<T, S>
+where
+	T: PartialEq,
+{
+	fn eq(&self, rhs: &Self) -> bool {
+		self.0 == rhs.0
+	}
+}
+
+impl<T: PartialEq, S: Get<u32>> PartialEq<Vec<T>> for WeakBoundedVec<T, S> {
+	fn eq(&self, other: &Vec<T>) -> bool {
+		&self.0 == other
+	}
+}
+
+impl<T, S> Eq for WeakBoundedVec<T, S> where T: Eq {}
+
+impl<T, S> StorageDecodeLength for WeakBoundedVec<T, S> {}
+
+impl<T, S: Get<u32>> StorageTryAppend<T> for WeakBoundedVec<T, S> {
+	fn bound() -> usize {
+		S::get() as usize
+	}
+}
+
+impl<T, S> MaxEncodedLen for WeakBoundedVec<T, S>
+where
+	T: MaxEncodedLen,
+	S: Get<u32>,
+	WeakBoundedVec<T, S>: Encode,
+{
+	fn max_encoded_len() -> usize {
+		// WeakBoundedVec<T, S> encodes like Vec<T> which encodes like [T], which is a compact u32
+		// plus each item in the slice:
+		// https://substrate.dev/rustdocs/v3.0.0/src/parity_scale_codec/codec.rs.html#798-808
+		codec::Compact(S::get())
+			.encoded_size()
+			.saturating_add(Self::bound().saturating_mul(T::max_encoded_len()))
+	}
+}
+
+#[cfg(test)]
+pub mod test {
+	use super::*;
+	use sp_io::TestExternalities;
+	use sp_std::convert::TryInto;
+	use crate::Twox128;
+
+	crate::parameter_types! {
+		pub const Seven: u32 = 7;
+		pub const Four: u32 = 4;
+	}
+
+	crate::generate_storage_alias! { Prefix, Foo => Value<WeakBoundedVec<u32, Seven>> }
+	crate::generate_storage_alias! { Prefix, FooMap => Map<(u32, Twox128), WeakBoundedVec<u32, Seven>> }
+	crate::generate_storage_alias! {
+		Prefix,
+		FooDoubleMap => DoubleMap<(u32, Twox128), (u32, Twox128), WeakBoundedVec<u32, Seven>>
+	}
+
+	#[test]
+	fn try_append_is_correct() {
+		assert_eq!(WeakBoundedVec::<u32, Seven>::bound(), 7);
+	}
+
+	#[test]
+	fn decode_len_works() {
+		TestExternalities::default().execute_with(|| {
+			let bounded: WeakBoundedVec<u32, Seven> = vec![1, 2, 3].try_into().unwrap();
+			Foo::put(bounded);
+			assert_eq!(Foo::decode_len().unwrap(), 3);
+		});
+
+		TestExternalities::default().execute_with(|| {
+			let bounded: WeakBoundedVec<u32, Seven> = vec![1, 2, 3].try_into().unwrap();
+			FooMap::insert(1, bounded);
+			assert_eq!(FooMap::decode_len(1).unwrap(), 3);
+			assert!(FooMap::decode_len(0).is_none());
+			assert!(FooMap::decode_len(2).is_none());
+		});
+
+		TestExternalities::default().execute_with(|| {
+			let bounded: WeakBoundedVec<u32, Seven> = vec![1, 2, 3].try_into().unwrap();
+			FooDoubleMap::insert(1, 1, bounded);
+			assert_eq!(FooDoubleMap::decode_len(1, 1).unwrap(), 3);
+			assert!(FooDoubleMap::decode_len(2, 1).is_none());
+			assert!(FooDoubleMap::decode_len(1, 2).is_none());
+			assert!(FooDoubleMap::decode_len(2, 2).is_none());
+		});
+	}
+
+	#[test]
+	fn try_insert_works() {
+		let mut bounded: WeakBoundedVec<u32, Four> = vec![1, 2, 3].try_into().unwrap();
+		bounded.try_insert(1, 0).unwrap();
+		assert_eq!(*bounded, vec![1, 0, 2, 3]);
+
+		assert!(bounded.try_insert(0, 9).is_err());
+		assert_eq!(*bounded, vec![1, 0, 2, 3]);
+	}
+
+	#[test]
+	#[should_panic(expected = "insertion index (is 9) should be <= len (is 3)")]
+	fn try_inert_panics_if_oob() {
+		let mut bounded: WeakBoundedVec<u32, Four> = vec![1, 2, 3].try_into().unwrap();
+		bounded.try_insert(9, 0).unwrap();
+	}
+
+	#[test]
+	fn try_push_works() {
+		let mut bounded: WeakBoundedVec<u32, Four> = vec![1, 2, 3].try_into().unwrap();
+		bounded.try_push(0).unwrap();
+		assert_eq!(*bounded, vec![1, 2, 3, 0]);
+
+		assert!(bounded.try_push(9).is_err());
+	}
+
+	#[test]
+	fn deref_coercion_works() {
+		let bounded: WeakBoundedVec<u32, Seven> = vec![1, 2, 3].try_into().unwrap();
+		// these methods come from deref-ed vec.
+		assert_eq!(bounded.len(), 3);
+		assert!(bounded.iter().next().is_some());
+		assert!(!bounded.is_empty());
+	}
+
+	#[test]
+	fn try_mutate_works() {
+		let bounded: WeakBoundedVec<u32, Seven> = vec![1, 2, 3, 4, 5, 6].try_into().unwrap();
+		let bounded = bounded.try_mutate(|v| v.push(7)).unwrap();
+		assert_eq!(bounded.len(), 7);
+		assert!(bounded.try_mutate(|v| v.push(8)).is_none());
+	}
+
+	#[test]
+	fn slice_indexing_works() {
+		let bounded: WeakBoundedVec<u32, Seven> = vec![1, 2, 3, 4, 5, 6].try_into().unwrap();
+		assert_eq!(&bounded[0..=2], &[1, 2, 3]);
+	}
+
+	#[test]
+	fn vec_eq_works() {
+		let bounded: WeakBoundedVec<u32, Seven> = vec![1, 2, 3, 4, 5, 6].try_into().unwrap();
+		assert_eq!(bounded, vec![1, 2, 3, 4, 5, 6]);
+	}
+
+	#[test]
+	fn too_big_succeed_to_decode() {
+		let v: Vec<u32> = vec![1, 2, 3, 4, 5];
+		let w = WeakBoundedVec::<u32, Four>::decode(&mut &v.encode()[..]).unwrap();
+		assert_eq!(v, *w);
+	}
+}
diff --git a/frame/treasury/src/lib.rs b/frame/treasury/src/lib.rs
index 473a570a8725..6028f1fbe4c7 100644
--- a/frame/treasury/src/lib.rs
+++ b/frame/treasury/src/lib.rs
@@ -66,7 +66,7 @@ pub mod weights;
 use sp_std::prelude::*;
 use frame_support::{
 	decl_module, decl_storage, decl_event, ensure, print, decl_error,
-	PalletId, BoundedVec, bounded_vec::TryAppendValue,
+	PalletId, BoundedVec, storage::TryAppendValue,
 };
 use frame_support::traits::{
 	Currency, Get, Imbalance, OnUnbalanced, ExistenceRequirement::KeepAlive,

From d10ec2718219db87c8436f08f430eed6fffe964b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Fri, 21 May 2021 12:00:25 +0200
Subject: [PATCH 0770/1194] Update README.md (#8871)

---
 frame/contracts/CHANGELOG.md | 60 +++++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 28 deletions(-)

diff --git a/frame/contracts/CHANGELOG.md b/frame/contracts/CHANGELOG.md
index 80615aaec879..2a93c838bc6a 100644
--- a/frame/contracts/CHANGELOG.md
+++ b/frame/contracts/CHANGELOG.md
@@ -20,20 +20,24 @@ In other words: Upgrading this pallet will not break pre-existing contracts.
 
 ### Added
 
-- Replaced `seal_println` with `seal_debug_message` which allows output to an RPC client.
-[1](https://github.com/paritytech/substrate/pull/8773)
+- New **unstable** `seal_rent_params` and `seal_rent_status` contract callable function.
+[#8231](https://github.com/paritytech/substrate/pull/8231)
+[#8780](https://github.com/paritytech/substrate/pull/8780)
 
-- Add new `instantiate` RPC that allows clients to dry-run contract instantiation.
-[1](https://github.com/paritytech/substrate/pull/8451)
+- New `instantiate` RPC that allows clients to dry-run contract instantiation.
+[#8451](https://github.com/paritytech/substrate/pull/8451)
 
-- Make storage and fields of `Schedule` private to the crate.
-[1](https://github.com/paritytech/substrate/pull/8359)
+- New version of `seal_random` which exposes additional information.
+[#8329](https://github.com/paritytech/substrate/pull/8329)
+
+### Changed
 
-- Add new version of `seal_random` which exposes additional information.
-[1](https://github.com/paritytech/substrate/pull/8329)
+- Replaced `seal_println` with the **unstable** `seal_debug_message` API which allows
+output to an RPC client.
+[#8773](https://github.com/paritytech/substrate/pull/8773)
 
-- Add `seal_rent_params` contract callable function.
-[1](https://github.com/paritytech/substrate/pull/8231)
+- Make storage and fields of `Schedule` private to the crate.
+[#8359](https://github.com/paritytech/substrate/pull/8359)
 
 ## [v3.0.0] 2021-02-25
 
@@ -42,56 +46,56 @@ This version constitutes the first release that brings any stability guarantees
 ### Added
 
 - Emit an event when a contract terminates (self-destructs).
-[1](https://github.com/paritytech/substrate/pull/8014)
+[#8014](https://github.com/paritytech/substrate/pull/8014)
 
 - Charge rent for code stored on the chain in addition to the already existing
 rent that is payed for data storage.
-[1](https://github.com/paritytech/substrate/pull/7935)
+[#7935](https://github.com/paritytech/substrate/pull/7935)
 
 - Allow the runtime to configure per storage item costs in addition
 to the already existing per byte costs.
-[1](https://github.com/paritytech/substrate/pull/7819)
+[#7819](https://github.com/paritytech/substrate/pull/7819)
 
 - Contracts are now deleted lazily so that the user who removes a contract
 does not need to pay for the deletion of the contract storage.
-[1](https://github.com/paritytech/substrate/pull/7740)
+[#7740](https://github.com/paritytech/substrate/pull/7740)
 
 - Allow runtime authors to define chain extensions in order to provide custom
 functionality to contracts.
-[1](https://github.com/paritytech/substrate/pull/7548)
-[2](https://github.com/paritytech/substrate/pull/8003)
+[#7548](https://github.com/paritytech/substrate/pull/7548)
+[#8003](https://github.com/paritytech/substrate/pull/8003)
 
 - Proper weights which are fully automated by benchmarking.
-[1](https://github.com/paritytech/substrate/pull/6715)
-[2](https://github.com/paritytech/substrate/pull/7017)
-[3](https://github.com/paritytech/substrate/pull/7361)
+[#6715](https://github.com/paritytech/substrate/pull/6715)
+[#7017](https://github.com/paritytech/substrate/pull/7017)
+[#7361](https://github.com/paritytech/substrate/pull/7361)
 
-### Changes
+### Changed
 
 - Collect the rent for one block during instantiation.
-[1](https://github.com/paritytech/substrate/pull/7847)
+[#7847](https://github.com/paritytech/substrate/pull/7847)
 
 - Instantiation takes a `salt` argument to allow for easier instantion of the
 same code by the same sender.
-[1](https://github.com/paritytech/substrate/pull/7482)
+[#7482](https://github.com/paritytech/substrate/pull/7482)
 
 - Improve the information returned by the `contracts_call` RPC.
-[1](https://github.com/paritytech/substrate/pull/7468)
+[#7468](https://github.com/paritytech/substrate/pull/7468)
 
 - Simplify the node configuration necessary to add this module.
-[1](https://github.com/paritytech/substrate/pull/7409)
+[#7409](https://github.com/paritytech/substrate/pull/7409)
 
 ### Fixed
 
 - Consider the code size of a contract in the weight that is charged for
 loading a contract from storage.
-[1](https://github.com/paritytech/substrate/pull/8086)
+[#8086](https://github.com/paritytech/substrate/pull/8086)
 
 - Fix possible overflow in storage size calculation
-[1](https://github.com/paritytech/substrate/pull/7885)
+[#7885](https://github.com/paritytech/substrate/pull/7885)
 
 - Cap the surcharge reward that can be claimed.
-[1](https://github.com/paritytech/substrate/pull/7870)
+[#7870](https://github.com/paritytech/substrate/pull/7870)
 
 - Fix a possible DoS vector where contracts could allocate too large buffers.
-[1](https://github.com/paritytech/substrate/pull/7818)
+[#7818](https://github.com/paritytech/substrate/pull/7818)

From 309d008cdcce1d8b8fb451e940dd3c9669ec2b56 Mon Sep 17 00:00:00 2001
From: Parth <desaiparth08@gmail.com>
Date: Fri, 21 May 2021 15:51:12 +0530
Subject: [PATCH 0771/1194] add ExternalitiesExt for TestExternalities (#8877)

---
 primitives/state-machine/src/testing.rs | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/primitives/state-machine/src/testing.rs b/primitives/state-machine/src/testing.rs
index f4b0cb6592ce..250c2fd4e9a9 100644
--- a/primitives/state-machine/src/testing.rs
+++ b/primitives/state-machine/src/testing.rs
@@ -41,7 +41,7 @@ use sp_core::{
 	traits::TaskExecutorExt,
 	testing::TaskExecutor,
 };
-use sp_externalities::{Extensions, Extension};
+use sp_externalities::{Extensions, Extension, ExtensionStore};
 
 /// Simple HashMap-based Externalities impl.
 pub struct TestExternalities<H: Hasher, N: ChangesTrieBlockNumber = u64>
@@ -274,6 +274,26 @@ impl<H, N> sp_externalities::ExtensionStore for TestExternalities<H, N> where
 	}
 }
 
+impl<H, N> sp_externalities::ExternalitiesExt for TestExternalities<H, N>
+	where
+		H: Hasher,
+		H::Out: Ord + codec::Codec,
+		N: ChangesTrieBlockNumber,
+{
+	fn extension<T: Any + Extension>(&mut self) -> Option<&mut T> {
+		self.extension_by_type_id(TypeId::of::<T>())
+			.and_then(<dyn Any>::downcast_mut)
+	}
+
+	fn register_extension<T: Extension>(&mut self, ext: T) -> Result<(), sp_externalities::Error> {
+		self.register_extension_with_type_id(TypeId::of::<T>(), Box::new(ext))
+	}
+
+	fn deregister_extension<T: Extension>(&mut self) -> Result<(), sp_externalities::Error> {
+		self.deregister_extension_by_type_id(TypeId::of::<T>())
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;

From 2a7aefb97cf21f3177ddc32857c42ea72063ba98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Sat, 22 May 2021 18:12:42 +0100
Subject: [PATCH 0772/1194] grandpa: fix warp sync proof on missing data
 (#8795)

* grandpa: check for missing data when iterating through authority set changes

* grandpa-warp-sync: handle missing data
---
 client/finality-grandpa-warp-sync/src/lib.rs  |  2 +
 .../finality-grandpa-warp-sync/src/proof.rs   |  5 +-
 client/finality-grandpa/src/authorities.rs    | 51 ++++++++++++-------
 3 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/client/finality-grandpa-warp-sync/src/lib.rs b/client/finality-grandpa-warp-sync/src/lib.rs
index dca6c2ad1ba3..a6b7e46a0f02 100644
--- a/client/finality-grandpa-warp-sync/src/lib.rs
+++ b/client/finality-grandpa-warp-sync/src/lib.rs
@@ -173,4 +173,6 @@ pub enum HandleRequestError {
 	InvalidProof(String),
 	#[display(fmt = "Failed to send response.")]
 	SendResponse,
+	#[display(fmt = "Missing required data to be able to answer request.")]
+	MissingData,
 }
diff --git a/client/finality-grandpa-warp-sync/src/proof.rs b/client/finality-grandpa-warp-sync/src/proof.rs
index 26560c10fe40..87a622026782 100644
--- a/client/finality-grandpa-warp-sync/src/proof.rs
+++ b/client/finality-grandpa-warp-sync/src/proof.rs
@@ -91,7 +91,10 @@ impl<Block: BlockT> WarpSyncProof<Block> {
 		let mut proofs_encoded_len = 0;
 		let mut proof_limit_reached = false;
 
-		for (_, last_block) in set_changes.iter_from(begin_number) {
+		let set_changes = set_changes.iter_from(begin_number)
+			.ok_or(HandleRequestError::MissingData)?;
+
+		for (_, last_block) in set_changes {
 			let header = blockchain.header(BlockId::Number(*last_block))?.expect(
 				"header number comes from previously applied set changes; must exist in db; qed.",
 			);
diff --git a/client/finality-grandpa/src/authorities.rs b/client/finality-grandpa/src/authorities.rs
index 194911e1f104..ececbf1d7c70 100644
--- a/client/finality-grandpa/src/authorities.rs
+++ b/client/finality-grandpa/src/authorities.rs
@@ -730,18 +730,12 @@ impl<N: Ord + Clone> AuthoritySetChanges<N> {
 
 		if idx < self.0.len() {
 			let (set_id, block_number) = self.0[idx].clone();
-			// To make sure we have the right set we need to check that the one before it also exists.
-			if idx > 0 {
-				let (prev_set_id, _) = self.0[idx - 1usize];
-				if set_id != prev_set_id + 1u64 {
-					// Without the preceding set_id we don't have a well-defined start.
-					return AuthoritySetChangeId::Unknown;
-				}
-			} else if set_id != 0 {
-				// If this is the first index, yet not the first set id then it's not well-defined
-				// that we are in the right set id.
+
+			// if this is the first index but not the first set id then we are missing data.
+			if idx == 0 && set_id != 0 {
 				return AuthoritySetChangeId::Unknown;
 			}
+
 			AuthoritySetChangeId::Set(set_id, block_number)
 		} else {
 			AuthoritySetChangeId::Unknown
@@ -751,14 +745,23 @@ impl<N: Ord + Clone> AuthoritySetChanges<N> {
 	/// Returns an iterator over all historical authority set changes starting at the given block
 	/// number (excluded). The iterator yields a tuple representing the set id and the block number
 	/// of the last block in that set.
-	pub fn iter_from(&self, block_number: N) -> impl Iterator<Item = &(u64, N)> {
+	pub fn iter_from(&self, block_number: N) -> Option<impl Iterator<Item = &(u64, N)>> {
 		let idx = self.0.binary_search_by_key(&block_number, |(_, n)| n.clone())
 			// if there was a change at the given block number then we should start on the next
 			// index since we want to exclude the current block number
 			.map(|n| n + 1)
 			.unwrap_or_else(|b| b);
 
-		self.0[idx..].iter()
+		if idx < self.0.len() {
+			let (set_id, _) = self.0[idx].clone();
+
+			// if this is the first index but not the first set id then we are missing data.
+			if idx == 0 && set_id != 0 {
+				return None;
+			}
+		}
+
+		Some(self.0[idx..].iter())
 	}
 }
 
@@ -1710,26 +1713,38 @@ mod tests {
 		let mut authority_set_changes = AuthoritySetChanges::empty();
 		authority_set_changes.append(1, 41);
 		authority_set_changes.append(2, 81);
+
+		// we are missing the data for the first set, therefore we should return `None`
+		assert_eq!(
+			None,
+			authority_set_changes.iter_from(40).map(|it| it.collect::<Vec<_>>()),
+		);
+
+		// after adding the data for the first set the same query should work
+		let mut authority_set_changes = AuthoritySetChanges::empty();
+		authority_set_changes.append(0, 21);
+		authority_set_changes.append(1, 41);
+		authority_set_changes.append(2, 81);
 		authority_set_changes.append(3, 121);
 
 		assert_eq!(
-			vec![(1, 41), (2, 81), (3, 121)],
-			authority_set_changes.iter_from(40).cloned().collect::<Vec<_>>(),
+			Some(vec![(1, 41), (2, 81), (3, 121)]),
+			authority_set_changes.iter_from(40).map(|it| it.cloned().collect::<Vec<_>>()),
 		);
 
 		assert_eq!(
-			vec![(2, 81), (3, 121)],
-			authority_set_changes.iter_from(41).cloned().collect::<Vec<_>>(),
+			Some(vec![(2, 81), (3, 121)]),
+			authority_set_changes.iter_from(41).map(|it| it.cloned().collect::<Vec<_>>()),
 		);
 
 		assert_eq!(
 			0,
-			authority_set_changes.iter_from(121).count(),
+			authority_set_changes.iter_from(121).unwrap().count(),
 		);
 
 		assert_eq!(
 			0,
-			authority_set_changes.iter_from(200).count(),
+			authority_set_changes.iter_from(200).unwrap().count(),
 		);
 	}
 }

From 72e2c34695e839c2550b1b2736b9569ba8085bc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Sat, 22 May 2021 23:01:11 +0200
Subject: [PATCH 0773/1194] Aura improvements (#8881)

* Aura: Expose function to build the verifier

* Use best block to initialize the authorities cache

* Use best block when determining the slot duration

* Remove `AuraBlockImport`

* Some cleanups

* Fix build error
---
 bin/node-template/node/src/service.rs         |  22 +--
 client/consensus/aura/src/import_queue.rs     | 179 +++++++-----------
 client/consensus/aura/src/lib.rs              |  13 +-
 client/consensus/babe/src/lib.rs              |   4 +-
 .../manual-seal/src/consensus/babe.rs         |  16 +-
 client/consensus/slots/src/lib.rs             |  17 +-
 6 files changed, 99 insertions(+), 152 deletions(-)

diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
index c73956d885bf..86b57f689e1e 100644
--- a/bin/node-template/node/src/service.rs
+++ b/bin/node-template/node/src/service.rs
@@ -30,12 +30,7 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 	sp_consensus::DefaultImportQueue<Block, FullClient>,
 	sc_transaction_pool::FullPool<Block, FullClient>,
 	(
-		sc_consensus_aura::AuraBlockImport<
-			Block,
-			FullClient,
-			sc_finality_grandpa::GrandpaBlockImport<FullBackend, Block, FullClient, FullSelectChain>,
-			AuraPair
-		>,
+		sc_finality_grandpa::GrandpaBlockImport<FullBackend, Block, FullClient, FullSelectChain>,
 		sc_finality_grandpa::LinkHalf<Block, FullClient, FullSelectChain>,
 		Option<Telemetry>,
 	)
@@ -84,15 +79,11 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 		telemetry.as_ref().map(|x| x.handle()),
 	)?;
 
-	let aura_block_import = sc_consensus_aura::AuraBlockImport::<_, _, _, AuraPair>::new(
-		grandpa_block_import.clone(), client.clone(),
-	);
-
 	let slot_duration = sc_consensus_aura::slot_duration(&*client)?.slot_duration();
 
 	let import_queue = sc_consensus_aura::import_queue::<AuraPair, _, _, _, _, _, _>(
 		ImportQueueParams {
-			block_import: aura_block_import.clone(),
+			block_import: grandpa_block_import.clone(),
 			justification_import: Some(Box::new(grandpa_block_import.clone())),
 			client: client.clone(),
 			create_inherent_data_providers: move |_, ()| async move {
@@ -122,7 +113,7 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 		keystore_container,
 		select_chain,
 		transaction_pool,
-		other: (aura_block_import, grandpa_link, telemetry),
+		other: (grandpa_block_import, grandpa_link, telemetry),
 	})
 }
 
@@ -353,16 +344,11 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		telemetry.as_ref().map(|x| x.handle()),
 	)?;
 
-	let aura_block_import = sc_consensus_aura::AuraBlockImport::<_, _, _, AuraPair>::new(
-		grandpa_block_import.clone(),
-		client.clone(),
-	);
-
 	let slot_duration = sc_consensus_aura::slot_duration(&*client)?.slot_duration();
 
 	let import_queue = sc_consensus_aura::import_queue::<AuraPair, _, _, _, _, _, _>(
 		ImportQueueParams {
-			block_import: aura_block_import.clone(),
+			block_import: grandpa_block_import.clone(),
 			justification_import: Some(Box::new(grandpa_block_import.clone())),
 			client: client.clone(),
 			create_inherent_data_providers: move |_, ()| async move {
diff --git a/client/consensus/aura/src/import_queue.rs b/client/consensus/aura/src/import_queue.rs
index 6bf9f69722ca..8034fd08a7eb 100644
--- a/client/consensus/aura/src/import_queue.rs
+++ b/client/consensus/aura/src/import_queue.rs
@@ -20,23 +20,23 @@
 
 use crate::{AuthorityId, find_pre_digest, slot_author, aura_err, Error, authorities};
 use std::{
-	sync::Arc, marker::PhantomData, hash::Hash, fmt::Debug, collections::HashMap,
+	sync::Arc, marker::PhantomData, hash::Hash, fmt::Debug,
 };
 use log::{debug, info, trace};
 use prometheus_endpoint::Registry;
 use codec::{Encode, Decode, Codec};
 use sp_consensus::{
 	BlockImport, CanAuthorWith, ForkChoiceStrategy, BlockImportParams,
-	BlockOrigin, Error as ConsensusError, BlockCheckParams, ImportResult,
+	BlockOrigin, Error as ConsensusError,
 	import_queue::{
 		Verifier, BasicQueue, DefaultImportQueue, BoxJustificationImport,
 	},
 };
-use sc_client_api::{backend::AuxStore, BlockOf};
+use sc_client_api::{BlockOf, UsageProvider, backend::AuxStore};
 use sp_blockchain::{well_known_cache_keys::{self, Id as CacheKeyId}, ProvideCache, HeaderBackend};
 use sp_block_builder::BlockBuilder as BlockBuilderApi;
 use sp_runtime::{generic::{BlockId, OpaqueDigestItemId}, Justifications};
-use sp_runtime::traits::{Block as BlockT, Header, DigestItemFor, Zero};
+use sp_runtime::traits::{Block as BlockT, Header, DigestItemFor};
 use sp_api::ProvideRuntimeApi;
 use sp_core::crypto::Pair;
 use sp_inherents::{CreateInherentDataProviders, InherentDataProvider as _};
@@ -113,19 +113,19 @@ fn check_header<C, B: BlockT, P: Pair>(
 }
 
 /// A verifier for Aura blocks.
-pub struct AuraVerifier<C, P, CAW, IDP> {
+pub struct AuraVerifier<C, P, CAW, CIDP> {
 	client: Arc<C>,
 	phantom: PhantomData<P>,
-	create_inherent_data_providers: IDP,
+	create_inherent_data_providers: CIDP,
 	can_author_with: CAW,
 	check_for_equivocation: CheckForEquivocation,
 	telemetry: Option<TelemetryHandle>,
 }
 
-impl<C, P, CAW, IDP> AuraVerifier<C, P, CAW, IDP> {
+impl<C, P, CAW, CIDP> AuraVerifier<C, P, CAW, CIDP> {
 	pub(crate) fn new(
 		client: Arc<C>,
-		create_inherent_data_providers: IDP,
+		create_inherent_data_providers: CIDP,
 		can_author_with: CAW,
 		check_for_equivocation: CheckForEquivocation,
 		telemetry: Option<TelemetryHandle>,
@@ -141,21 +141,21 @@ impl<C, P, CAW, IDP> AuraVerifier<C, P, CAW, IDP> {
 	}
 }
 
-impl<C, P, CAW, IDP> AuraVerifier<C, P, CAW, IDP> where
+impl<C, P, CAW, CIDP> AuraVerifier<C, P, CAW, CIDP> where
 	P: Send + Sync + 'static,
 	CAW: Send + Sync + 'static,
-	IDP: Send,
+	CIDP: Send,
 {
 	async fn check_inherents<B: BlockT>(
 		&self,
 		block: B,
 		block_id: BlockId<B>,
 		inherent_data: sp_inherents::InherentData,
-		create_inherent_data_providers: IDP::InherentDataProviders,
+		create_inherent_data_providers: CIDP::InherentDataProviders,
 	) -> Result<(), Error<B>> where
 		C: ProvideRuntimeApi<B>, C::Api: BlockBuilderApi<B>,
 		CAW: CanAuthorWith<B>,
-		IDP: CreateInherentDataProviders<B, ()>,
+		CIDP: CreateInherentDataProviders<B, ()>,
 	{
 		if let Err(e) = self.can_author_with.can_author_with(&block_id) {
 			debug!(
@@ -187,7 +187,7 @@ impl<C, P, CAW, IDP> AuraVerifier<C, P, CAW, IDP> where
 }
 
 #[async_trait::async_trait]
-impl<B: BlockT, C, P, CAW, IDP> Verifier<B> for AuraVerifier<C, P, CAW, IDP> where
+impl<B: BlockT, C, P, CAW, CIDP> Verifier<B> for AuraVerifier<C, P, CAW, CIDP> where
 	C: ProvideRuntimeApi<B> +
 		Send +
 		Sync +
@@ -200,8 +200,8 @@ impl<B: BlockT, C, P, CAW, IDP> Verifier<B> for AuraVerifier<C, P, CAW, IDP> whe
 	P::Public: Send + Sync + Hash + Eq + Clone + Decode + Encode + Debug + 'static,
 	P::Signature: Encode + Decode,
 	CAW: CanAuthorWith<B> + Send + Sync + 'static,
-	IDP: CreateInherentDataProviders<B, ()> + Send + Sync,
-	IDP::InherentDataProviders: InherentDataProviderExt + Send + Sync,
+	CIDP: CreateInherentDataProviders<B, ()> + Send + Sync,
+	CIDP::InherentDataProviders: InherentDataProviderExt + Send + Sync,
 {
 	async fn verify(
 		&mut self,
@@ -320,7 +320,7 @@ impl<B: BlockT, C, P, CAW, IDP> Verifier<B> for AuraVerifier<C, P, CAW, IDP> whe
 fn initialize_authorities_cache<A, B, C>(client: &C) -> Result<(), ConsensusError> where
 	A: Codec + Debug,
 	B: BlockT,
-	C: ProvideRuntimeApi<B> + BlockOf + ProvideCache<B>,
+	C: ProvideRuntimeApi<B> + BlockOf + ProvideCache<B> + UsageProvider<B>,
 	C::Api: AuraApi<B, A>,
 {
 	// no cache => no initialization
@@ -329,6 +329,8 @@ fn initialize_authorities_cache<A, B, C>(client: &C) -> Result<(), ConsensusErro
 		None => return Ok(()),
 	};
 
+	let best_hash = client.usage_info().chain.best_hash;
+
 	// check if we already have initialized the cache
 	let map_err = |error| sp_consensus::Error::from(sp_consensus::Error::ClientImport(
 		format!(
@@ -336,107 +338,22 @@ fn initialize_authorities_cache<A, B, C>(client: &C) -> Result<(), ConsensusErro
 			error,
 		)));
 
-	let genesis_id = BlockId::Number(Zero::zero());
-	let genesis_authorities: Option<Vec<A>> = cache
-		.get_at(&well_known_cache_keys::AUTHORITIES, &genesis_id)
+	let block_id = BlockId::hash(best_hash);
+	let authorities: Option<Vec<A>> = cache
+		.get_at(&well_known_cache_keys::AUTHORITIES, &block_id)
 		.unwrap_or(None)
 		.and_then(|(_, _, v)| Decode::decode(&mut &v[..]).ok());
-	if genesis_authorities.is_some() {
+	if authorities.is_some() {
 		return Ok(());
 	}
 
-	let genesis_authorities = authorities(client, &genesis_id)?;
-	cache.initialize(&well_known_cache_keys::AUTHORITIES, genesis_authorities.encode())
+	let authorities = crate::authorities(client, &block_id)?;
+	cache.initialize(&well_known_cache_keys::AUTHORITIES, authorities.encode())
 		.map_err(map_err)?;
 
 	Ok(())
 }
 
-/// A block-import handler for Aura.
-pub struct AuraBlockImport<Block: BlockT, C, I: BlockImport<Block>, P> {
-	inner: I,
-	client: Arc<C>,
-	_phantom: PhantomData<(Block, P)>,
-}
-
-impl<Block: BlockT, C, I: Clone + BlockImport<Block>, P> Clone for AuraBlockImport<Block, C, I, P> {
-	fn clone(&self) -> Self {
-		AuraBlockImport {
-			inner: self.inner.clone(),
-			client: self.client.clone(),
-			_phantom: PhantomData,
-		}
-	}
-}
-
-impl<Block: BlockT, C, I: BlockImport<Block>, P> AuraBlockImport<Block, C, I, P> {
-	/// New aura block import.
-	pub fn new(
-		inner: I,
-		client: Arc<C>,
-	) -> Self {
-		Self {
-			inner,
-			client,
-			_phantom: PhantomData,
-		}
-	}
-}
-
-#[async_trait::async_trait]
-impl<Block: BlockT, C, I, P> BlockImport<Block> for AuraBlockImport<Block, C, I, P> where
-	I: BlockImport<Block, Transaction = sp_api::TransactionFor<C, Block>> + Send + Sync,
-	I::Error: Into<ConsensusError>,
-	C: HeaderBackend<Block> + ProvideRuntimeApi<Block>,
-	P: Pair + Send + Sync + 'static,
-	P::Public: Clone + Eq + Send + Sync + Hash + Debug + Encode + Decode,
-	P::Signature: Encode + Decode,
-	sp_api::TransactionFor<C, Block>: Send + 'static,
-{
-	type Error = ConsensusError;
-	type Transaction = sp_api::TransactionFor<C, Block>;
-
-	async fn check_block(
-		&mut self,
-		block: BlockCheckParams<Block>,
-	) -> Result<ImportResult, Self::Error> {
-		self.inner.check_block(block).await.map_err(Into::into)
-	}
-
-	async fn import_block(
-		&mut self,
-		block: BlockImportParams<Block, Self::Transaction>,
-		new_cache: HashMap<CacheKeyId, Vec<u8>>,
-	) -> Result<ImportResult, Self::Error> {
-		let hash = block.post_hash();
-		let slot = find_pre_digest::<Block, P::Signature>(&block.header)
-			.expect("valid Aura headers must contain a predigest; \
-					 header has been already verified; qed");
-
-		let parent_hash = *block.header.parent_hash();
-		let parent_header = self.client.header(BlockId::Hash(parent_hash))
-			.map_err(|e| ConsensusError::ChainLookup(e.to_string()))?
-			.ok_or_else(|| ConsensusError::ChainLookup(aura_err(
-				Error::<Block>::ParentUnavailable(parent_hash, hash)
-			).into()))?;
-
-		let parent_slot = find_pre_digest::<Block, P::Signature>(&parent_header)
-			.expect("valid Aura headers contain a pre-digest; \
-					parent header has already been verified; qed");
-
-		// make sure that slot number is strictly increasing
-		if slot <= parent_slot {
-			return Err(
-				ConsensusError::ClientImport(aura_err(
-					Error::<Block>::SlotMustIncrease(parent_slot, slot)
-				).into())
-			);
-		}
-
-		self.inner.import_block(block, new_cache).await.map_err(Into::into)
-	}
-}
-
 /// Should we check for equivocation of a block author?
 #[derive(Debug, Clone, Copy)]
 pub enum CheckForEquivocation {
@@ -506,6 +423,7 @@ pub fn import_queue<'a, P, Block, I, C, S, CAW, CIDP>(
 		+ Send
 		+ Sync
 		+ AuxStore
+		+ UsageProvider<Block>
 		+ HeaderBackend<Block>,
 	I: BlockImport<Block, Error=ConsensusError, Transaction = sp_api::TransactionFor<C, Block>>
 		+ Send
@@ -522,12 +440,14 @@ pub fn import_queue<'a, P, Block, I, C, S, CAW, CIDP>(
 {
 	initialize_authorities_cache(&*client)?;
 
-	let verifier = AuraVerifier::<_, P, _, _>::new(
-		client,
-		create_inherent_data_providers,
-		can_author_with,
-		check_for_equivocation,
-		telemetry,
+	let verifier = build_verifier::<P, _, _, _>(
+		BuildVerifierParams {
+			client,
+			create_inherent_data_providers,
+			can_author_with,
+			check_for_equivocation,
+			telemetry,
+		},
 	);
 
 	Ok(BasicQueue::new(
@@ -538,3 +458,36 @@ pub fn import_queue<'a, P, Block, I, C, S, CAW, CIDP>(
 		registry,
 	))
 }
+
+/// Parameters of [`build_verifier`].
+pub struct BuildVerifierParams<C, CIDP, CAW> {
+	/// The client to interact with the chain.
+	pub client: Arc<C>,
+	/// Something that can create the inherent data providers.
+	pub create_inherent_data_providers: CIDP,
+	/// Can we author with the current node?
+	pub can_author_with: CAW,
+	/// Should we check for equivocation?
+	pub check_for_equivocation: CheckForEquivocation,
+	/// Telemetry instance used to report telemetry metrics.
+	pub telemetry: Option<TelemetryHandle>,
+}
+
+/// Build the [`AuraVerifier`]
+pub fn build_verifier<P, C, CIDP, CAW>(
+	BuildVerifierParams {
+		client,
+		create_inherent_data_providers,
+		can_author_with,
+		check_for_equivocation,
+		telemetry,
+	}: BuildVerifierParams<C, CIDP, CAW>
+) -> AuraVerifier<C, P, CAW, CIDP> {
+	AuraVerifier::<_, P, _, _>::new(
+		client,
+		create_inherent_data_providers,
+		can_author_with,
+		check_for_equivocation,
+		telemetry,
+	)
+}
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index ce254799d61f..623096cd5c64 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -44,7 +44,7 @@ use sp_consensus::{
 	BlockImport, Environment, Proposer, CanAuthorWith, ForkChoiceStrategy, BlockImportParams,
 	BlockOrigin, Error as ConsensusError, SelectChain,
 };
-use sc_client_api::{backend::AuxStore, BlockOf};
+use sc_client_api::{backend::AuxStore, BlockOf, UsageProvider};
 use sp_blockchain::{Result as CResult, well_known_cache_keys, ProvideCache, HeaderBackend};
 use sp_core::crypto::Public;
 use sp_application_crypto::{AppKey, AppPublic};
@@ -70,7 +70,10 @@ pub use sp_consensus_aura::{
 	},
 };
 pub use sp_consensus::SyncOracle;
-pub use import_queue::{ImportQueueParams, import_queue, AuraBlockImport, CheckForEquivocation};
+pub use import_queue::{
+	ImportQueueParams, import_queue, CheckForEquivocation,
+	build_verifier, BuildVerifierParams, AuraVerifier,
+};
 pub use sc_consensus_slots::SlotProportion;
 
 type AuthorityId<P> = <P as Pair>::Public;
@@ -82,7 +85,7 @@ pub type SlotDuration = sc_consensus_slots::SlotDuration<sp_consensus_aura::Slot
 pub fn slot_duration<A, B, C>(client: &C) -> CResult<SlotDuration> where
 	A: Codec,
 	B: BlockT,
-	C: AuxStore + ProvideRuntimeApi<B>,
+	C: AuxStore + ProvideRuntimeApi<B> + UsageProvider<B>,
 	C::Api: AuraApi<B, A>,
 {
 	SlotDuration::get_or_compute(client, |a, b| a.slot_duration(b).map_err(Into::into))
@@ -491,10 +494,6 @@ enum Error<B: BlockT> {
 	#[display(fmt = "Bad signature on {:?}", _0)]
 	BadSignature(B::Hash),
 	Client(sp_blockchain::Error),
-	#[display(fmt = "Slot number must increase: parent slot: {}, this slot: {}", _0, _1)]
-	SlotMustIncrease(Slot, Slot),
-	#[display(fmt = "Parent ({}) of {} unavailable. Cannot import", _0, _1)]
-	ParentUnavailable(B::Hash, B::Hash),
 	#[display(fmt = "Unknown inherent error for identifier: {}", "String::from_utf8_lossy(_0)")]
 	UnknownInherentError(sp_inherents::InherentIdentifier),
 	#[display(fmt = "Inherent error: {}", _0)]
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index 3bdeaabf614d..0b02bbbe1410 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -98,7 +98,7 @@ use sp_consensus::{
 };
 use sp_consensus_babe::inherents::BabeInherentData;
 use sc_client_api::{
-	backend::AuxStore, BlockchainEvents, ProvideUncles,
+	backend::AuxStore, BlockchainEvents, ProvideUncles, UsageProvider
 };
 use sp_block_builder::BlockBuilder as BlockBuilderApi;
 use futures::channel::mpsc::{channel, Sender, Receiver};
@@ -317,7 +317,7 @@ impl Config {
 	/// Either fetch the slot duration from disk or compute it from the genesis
 	/// state.
 	pub fn get_or_compute<B: BlockT, C>(client: &C) -> ClientResult<Self> where
-		C: AuxStore + ProvideRuntimeApi<B>, C::Api: BabeApi<B>,
+		C: AuxStore + ProvideRuntimeApi<B> + UsageProvider<B>, C::Api: BabeApi<B>,
 	{
 		trace!(target: "babe", "Getting slot duration");
 		match sc_consensus_slots::SlotDuration::get_or_compute(client, |a, b| {
diff --git a/client/consensus/manual-seal/src/consensus/babe.rs b/client/consensus/manual-seal/src/consensus/babe.rs
index 29fea05d8366..69590c6a1e66 100644
--- a/client/consensus/manual-seal/src/consensus/babe.rs
+++ b/client/consensus/manual-seal/src/consensus/babe.rs
@@ -22,7 +22,7 @@ use super::ConsensusDataProvider;
 use crate::Error;
 use codec::Encode;
 use std::{borrow::Cow, sync::{Arc, atomic}, time::SystemTime};
-use sc_client_api::AuxStore;
+use sc_client_api::{AuxStore, UsageProvider};
 use sc_consensus_babe::{
 	Config, Epoch, authorship, CompatibleDigestItem, BabeIntermediate, INTERMEDIATE_KEY,
 	find_pre_digest,
@@ -67,7 +67,11 @@ pub struct BabeConsensusDataProvider<B: BlockT, C> {
 impl<B, C> BabeConsensusDataProvider<B, C>
 	where
 		B: BlockT,
-		C: AuxStore + HeaderBackend<B> + ProvideRuntimeApi<B> + HeaderMetadata<B, Error = sp_blockchain::Error>,
+		C: AuxStore
+			+ HeaderBackend<B>
+			+ ProvideRuntimeApi<B>
+			+ HeaderMetadata<B, Error = sp_blockchain::Error>
+			+ UsageProvider<B>,
 		C::Api: BabeApi<B>,
 {
 	pub fn new(
@@ -120,7 +124,11 @@ impl<B, C> BabeConsensusDataProvider<B, C>
 impl<B, C> ConsensusDataProvider<B> for BabeConsensusDataProvider<B, C>
 	where
 		B: BlockT,
-		C: AuxStore + HeaderBackend<B> + HeaderMetadata<B, Error = sp_blockchain::Error> + ProvideRuntimeApi<B>,
+		C: AuxStore
+			+ HeaderBackend<B>
+			+ HeaderMetadata<B, Error = sp_blockchain::Error>
+			+ UsageProvider<B>
+			+ ProvideRuntimeApi<B>,
 		C::Api: BabeApi<B>,
 {
 	type Transaction = TransactionFor<C, B>;
@@ -252,7 +260,7 @@ impl SlotTimestampProvider {
 	pub fn new<B, C>(client: Arc<C>) -> Result<Self, Error>
 		where
 			B: BlockT,
-			C: AuxStore + HeaderBackend<B> + ProvideRuntimeApi<B>,
+			C: AuxStore + HeaderBackend<B> + ProvideRuntimeApi<B> + UsageProvider<B>,
 			C::Api: BabeApi<B>,
 	{
 		let slot_duration = Config::get_or_compute(&*client)?.slot_duration;
diff --git a/client/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs
index 4ef0093a185e..2ea5e101c3ad 100644
--- a/client/consensus/slots/src/lib.rs
+++ b/client/consensus/slots/src/lib.rs
@@ -584,7 +584,7 @@ impl<T: Clone + Send + Sync + 'static> SlotDuration<T> {
 	/// `slot_key` is marked as `'static`, as it should really be a
 	/// compile-time constant.
 	pub fn get_or_compute<B: BlockT, C, CB>(client: &C, cb: CB) -> sp_blockchain::Result<Self> where
-		C: sc_client_api::backend::AuxStore,
+		C: sc_client_api::backend::AuxStore + sc_client_api::UsageProvider<B>,
 		C: ProvideRuntimeApi<B>,
 		CB: FnOnce(ApiRef<C::Api>, &BlockId<B>) -> sp_blockchain::Result<T>,
 		T: SlotData + Encode + Decode + Debug,
@@ -599,19 +599,20 @@ impl<T: Clone + Send + Sync + 'static> SlotDuration<T> {
 					})
 				}),
 			None => {
-				use sp_runtime::traits::Zero;
-				let genesis_slot_duration =
-					cb(client.runtime_api(), &BlockId::number(Zero::zero()))?;
+				let best_hash = client.usage_info().chain.best_hash;
+				let slot_duration =
+					cb(client.runtime_api(), &BlockId::hash(best_hash))?;
 
 				info!(
-					"⏱  Loaded block-time = {:?} from genesis on first-launch",
-					genesis_slot_duration.slot_duration()
+					"⏱  Loaded block-time = {:?} from block {:?}",
+					slot_duration.slot_duration(),
+					best_hash,
 				);
 
-				genesis_slot_duration
+				slot_duration
 					.using_encoded(|s| client.insert_aux(&[(T::SLOT_KEY, &s[..])], &[]))?;
 
-				Ok(SlotDuration(genesis_slot_duration))
+				Ok(SlotDuration(slot_duration))
 			}
 		}?;
 

From c0be5844f0b44f9f54fb802cef98fa5fdf561c28 Mon Sep 17 00:00:00 2001
From: Tim Gestson <tgestson@gmail.com>
Date: Sun, 23 May 2021 12:30:46 -0400
Subject: [PATCH 0774/1194] Remove now unneeded empty hooks and calls #8873
 (#8874)

* Remove now unneeded empty hooks and calls

* fix pallet_ui tests
---
 bin/node-template/pallets/template/src/lib.rs | 3 ---
 frame/assets/src/lib.rs                       | 3 ---
 frame/atomic-swap/src/lib.rs                  | 3 ---
 frame/aura/src/lib.rs                         | 3 ---
 frame/authority-discovery/src/lib.rs          | 7 -------
 frame/balances/src/lib.rs                     | 4 ----
 frame/example-parallel/src/lib.rs             | 3 ---
 frame/identity/src/lib.rs                     | 3 ---
 frame/indices/src/lib.rs                      | 3 ---
 frame/nicks/src/lib.rs                        | 3 ---
 frame/offences/src/lib.rs                     | 3 ---
 frame/proxy/src/lib.rs                        | 3 ---
 frame/recovery/src/lib.rs                     | 3 ---
 frame/sudo/src/lib.rs                         | 6 ------
 frame/sudo/src/mock.rs                        | 3 ---
 frame/utility/src/lib.rs                      | 3 ---
 frame/vesting/src/lib.rs                      | 3 ---
 17 files changed, 59 deletions(-)

diff --git a/bin/node-template/pallets/template/src/lib.rs b/bin/node-template/pallets/template/src/lib.rs
index 7b986a518669..373a56f44419 100644
--- a/bin/node-template/pallets/template/src/lib.rs
+++ b/bin/node-template/pallets/template/src/lib.rs
@@ -59,9 +59,6 @@ pub mod pallet {
 		StorageOverflow,
 	}
 
-	#[pallet::hooks]
-	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
-
 	// Dispatchable functions allows users to interact with the pallet and invoke state changes.
 	// These functions materialize as "extrinsics", which are often compared to transactions.
 	// Dispatchable functions must be annotated with a weight and must return a DispatchResult.
diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index 9cdd4c0b914e..e856211289b0 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -338,9 +338,6 @@ pub mod pallet {
 		WouldDie,
 	}
 
-	#[pallet::hooks]
-	impl<T: Config<I>, I: 'static> Hooks<BlockNumberFor<T>> for Pallet<T, I> {}
-
 	#[pallet::call]
 	impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		/// Issue a new class of fungible assets from a public origin.
diff --git a/frame/atomic-swap/src/lib.rs b/frame/atomic-swap/src/lib.rs
index 513a9343a72e..afc74dd2a549 100644
--- a/frame/atomic-swap/src/lib.rs
+++ b/frame/atomic-swap/src/lib.rs
@@ -173,9 +173,6 @@ pub mod pallet {
 		PendingSwap<T>,
 	>;
 
-	#[pallet::hooks]
-	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
-
 	#[pallet::error]
 	pub enum Error<T> {
 		/// Swap already exists.
diff --git a/frame/aura/src/lib.rs b/frame/aura/src/lib.rs
index a9b91737235a..7cc9412776df 100644
--- a/frame/aura/src/lib.rs
+++ b/frame/aura/src/lib.rs
@@ -87,9 +87,6 @@ pub mod pallet {
 		}
 	}
 
-	#[pallet::call]
-	impl<T: Config> Pallet<T> {}
-
 	/// The current authority set.
 	#[pallet::storage]
 	#[pallet::getter(fn authorities)]
diff --git a/frame/authority-discovery/src/lib.rs b/frame/authority-discovery/src/lib.rs
index 6b7608b10c3b..868fbfc60536 100644
--- a/frame/authority-discovery/src/lib.rs
+++ b/frame/authority-discovery/src/lib.rs
@@ -34,7 +34,6 @@ pub use pallet::*;
 #[frame_support::pallet]
 pub mod pallet {
 	use frame_support::pallet_prelude::*;
-	use frame_system::pallet_prelude::*;
 	use super::*;
 
 	#[pallet::pallet]
@@ -82,12 +81,6 @@ pub mod pallet {
 			Pallet::<T>::initialize_keys(&self.keys)
 		}
 	}
-
-	#[pallet::hooks]
-	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
-
-	#[pallet::call]
-	impl<T: Config> Pallet<T> {}
 }
 
 impl<T: Config> Pallet<T> {
diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index 0bfe43623c5d..c0566f84a1be 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -220,10 +220,6 @@ pub mod pallet {
 	#[pallet::generate_store(pub(super) trait Store)]
 	pub struct Pallet<T, I=()>(PhantomData<(T, I)>);
 
-	#[pallet::hooks]
-	impl<T: Config<I>, I: 'static> Hooks<BlockNumberFor<T>> for Pallet<T, I> {
-	}
-
 	#[pallet::call]
 	impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		/// Transfer some liquid free balance to another account.
diff --git a/frame/example-parallel/src/lib.rs b/frame/example-parallel/src/lib.rs
index e777100c6f54..24668c5b5ab0 100644
--- a/frame/example-parallel/src/lib.rs
+++ b/frame/example-parallel/src/lib.rs
@@ -48,9 +48,6 @@ pub mod pallet {
 	#[pallet::generate_store(pub(super) trait Store)]
 	pub struct Pallet<T>(_);
 
-	#[pallet::hooks]
-	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
-
 	/// A public part of the pallet.
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
diff --git a/frame/identity/src/lib.rs b/frame/identity/src/lib.rs
index 7c7bacbef56e..91b3f3a50fc4 100644
--- a/frame/identity/src/lib.rs
+++ b/frame/identity/src/lib.rs
@@ -532,9 +532,6 @@ pub mod pallet {
 		SubIdentityRevoked(T::AccountId, T::AccountId, BalanceOf<T>),
 	}
 
-	#[pallet::hooks]
-	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
-
 	#[pallet::call]
 	/// Identity pallet declaration.
 	impl<T: Config> Pallet<T> {
diff --git a/frame/indices/src/lib.rs b/frame/indices/src/lib.rs
index 19697f2d941b..1470e3abe866 100644
--- a/frame/indices/src/lib.rs
+++ b/frame/indices/src/lib.rs
@@ -69,9 +69,6 @@ pub mod pallet {
 	#[pallet::generate_store(pub(super) trait Store)]
 	pub struct Pallet<T>(PhantomData<T>);
 
-	#[pallet::hooks]
-	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
-
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
 		/// Assign an previously unassigned index.
diff --git a/frame/nicks/src/lib.rs b/frame/nicks/src/lib.rs
index 45a0dc477b1d..4372fd326cc9 100644
--- a/frame/nicks/src/lib.rs
+++ b/frame/nicks/src/lib.rs
@@ -119,9 +119,6 @@ pub mod pallet {
 	#[pallet::generate_store(pub(super) trait Store)]
 	pub struct Pallet<T>(_);
 
-	#[pallet::hooks]
-	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
-
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
 		/// Set an account's name. The name should be a UTF-8-encoded string by convention, though
diff --git a/frame/offences/src/lib.rs b/frame/offences/src/lib.rs
index 84a7414927d6..82665099d65d 100644
--- a/frame/offences/src/lib.rs
+++ b/frame/offences/src/lib.rs
@@ -131,9 +131,6 @@ pub mod pallet {
 			migration::remove_deferred_storage::<T>()
 		}
 	}
-
-	#[pallet::call]
-	impl<T: Config> Pallet<T> {}
 }
 
 impl<T: Config, O: Offence<T::IdentificationTuple>>
diff --git a/frame/proxy/src/lib.rs b/frame/proxy/src/lib.rs
index 5e63e0cd8d3d..0f541bd4d45e 100644
--- a/frame/proxy/src/lib.rs
+++ b/frame/proxy/src/lib.rs
@@ -154,9 +154,6 @@ pub mod pallet {
 		type AnnouncementDepositFactor: Get<BalanceOf<Self>>;
 	}
 
-	#[pallet::hooks]
-	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
-
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
 		/// Dispatch the given `call` from an account that the sender is authorised for through
diff --git a/frame/recovery/src/lib.rs b/frame/recovery/src/lib.rs
index 89b6b6692647..7802f26d1d1f 100644
--- a/frame/recovery/src/lib.rs
+++ b/frame/recovery/src/lib.rs
@@ -337,9 +337,6 @@ pub mod pallet {
 	#[pallet::getter(fn proxy)]
 	pub type Proxy<T: Config> = StorageMap<_, Blake2_128Concat, T::AccountId, T::AccountId>;
 
-	#[pallet::hooks]
-	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
-
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
 		/// Send a call through a recovered account.
diff --git a/frame/sudo/src/lib.rs b/frame/sudo/src/lib.rs
index d840d45a7f43..839c819c8d95 100644
--- a/frame/sudo/src/lib.rs
+++ b/frame/sudo/src/lib.rs
@@ -65,9 +65,6 @@
 //! 	#[pallet::pallet]
 //! 	pub struct Pallet<T>(PhantomData<T>);
 //!
-//! 	#[pallet::hooks]
-//! 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
-//!
 //! 	#[pallet::call]
 //! 	impl<T: Config> Pallet<T> {
 //! 		#[pallet::weight(0)]
@@ -130,9 +127,6 @@ pub mod pallet {
 	#[pallet::generate_store(pub(super) trait Store)]
 	pub struct Pallet<T>(PhantomData<T>);
 
-	#[pallet::hooks]
-	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
-
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
 		/// Authenticates the sudo key and dispatches a function call with `Root` origin.
diff --git a/frame/sudo/src/mock.rs b/frame/sudo/src/mock.rs
index 568799e1fe63..6b296c62fe6c 100644
--- a/frame/sudo/src/mock.rs
+++ b/frame/sudo/src/mock.rs
@@ -42,9 +42,6 @@ pub mod logger {
 	#[pallet::generate_store(pub(super) trait Store)]
 	pub struct Pallet<T>(PhantomData<T>);
 
-	#[pallet::hooks]
-	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
-
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
 		#[pallet::weight(*weight)]
diff --git a/frame/utility/src/lib.rs b/frame/utility/src/lib.rs
index 983d24c74dbe..c08df987c8b6 100644
--- a/frame/utility/src/lib.rs
+++ b/frame/utility/src/lib.rs
@@ -107,9 +107,6 @@ pub mod pallet {
 		BatchCompleted,
 	}
 
-	#[pallet::hooks]
-	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
-
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
 		/// Send a batch of dispatch calls.
diff --git a/frame/vesting/src/lib.rs b/frame/vesting/src/lib.rs
index e5e6cb5069b8..c8156e08c69c 100644
--- a/frame/vesting/src/lib.rs
+++ b/frame/vesting/src/lib.rs
@@ -203,9 +203,6 @@ pub mod pallet {
 		AmountLow,
 	}
 
-	#[pallet::hooks]
-	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
-
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
 		/// Unlock any vested funds of the sender account.

From 90cfb952f2e11bc6d327faf04b30dc5f4cf89df8 Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Mon, 24 May 2021 13:32:39 +0100
Subject: [PATCH 0775/1194] Default 2048 heap pages (#8892)

---
 client/executor/src/native_executor.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/executor/src/native_executor.rs b/client/executor/src/native_executor.rs
index 760e0c066bee..c94088a15526 100644
--- a/client/executor/src/native_executor.rs
+++ b/client/executor/src/native_executor.rs
@@ -45,7 +45,7 @@ use sp_externalities::ExternalitiesExt as _;
 use sp_tasks::new_async_externalities;
 
 /// Default num of pages for the heap
-const DEFAULT_HEAP_PAGES: u64 = 1024;
+const DEFAULT_HEAP_PAGES: u64 = 2048;
 
 /// Set up the externalities and safe calling environment to execute runtime calls.
 ///

From 3c2bd9a6ba1052daa8711dfb22b902e7591ab690 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Tue, 25 May 2021 13:03:35 +0200
Subject: [PATCH 0776/1194] Make sure nodes don't hammer each other even when
 reserved (#8901)

* Make sure nodes don't hammer each other even when reserved

* Make the ban random
---
 client/network/src/protocol/notifications/behaviour.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/network/src/protocol/notifications/behaviour.rs b/client/network/src/protocol/notifications/behaviour.rs
index 84f15c8be352..f95f6870e5fa 100644
--- a/client/network/src/protocol/notifications/behaviour.rs
+++ b/client/network/src/protocol/notifications/behaviour.rs
@@ -1851,9 +1851,10 @@ impl NetworkBehaviour for Notifications {
 							trace!(target: "sub-libp2p", "PSM <= Dropped({:?})", source);
 							self.peerset.dropped(set_id, source.clone(), sc_peerset::DropReason::Refused);
 
+							let ban_dur = Uniform::new(5, 10).sample(&mut rand::thread_rng());
 							*entry.into_mut() = PeerState::Disabled {
 								connections,
-								backoff_until: None
+								backoff_until: Some(Instant::now() + Duration::from_secs(ban_dur))
 							};
 						} else {
 							*entry.into_mut() = PeerState::Enabled { connections };

From 85fa0ab80c3ceccf4bb98380d7833578aaf8815e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 25 May 2021 16:07:36 +0200
Subject: [PATCH 0777/1194] Introduce `code_substitute` (#8898)

This introduces a new field `code_substitute` into the chain spec. This
can be used to substitute the on-chain wasm starting from a given block
until there is another wasm on chain (determined through the
`spec_version`). This can be used to fix broken on chain wasm runtimes.
---
 bin/node/testing/src/client.rs                |   4 +-
 client/chain-spec/src/chain_spec.rs           |  13 +-
 client/chain-spec/src/lib.rs                  |   2 +
 client/service/src/builder.rs                 |  25 ++-
 client/service/src/client/call_executor.rs    |  53 ++++--
 client/service/src/client/client.rs           |  30 ++-
 client/service/src/client/light.rs            |   2 +-
 client/service/src/client/mod.rs              |   1 +
 client/service/src/client/wasm_substitutes.rs | 179 ++++++++++++++++++
 client/service/test/src/client/mod.rs         |   2 +-
 test-utils/client/src/lib.rs                  |   4 +-
 test-utils/runtime/client/src/lib.rs          |  14 +-
 12 files changed, 286 insertions(+), 43 deletions(-)
 create mode 100644 client/service/src/client/wasm_substitutes.rs

diff --git a/bin/node/testing/src/client.rs b/bin/node/testing/src/client.rs
index c4ace4ced9b4..d53519950dc1 100644
--- a/bin/node/testing/src/client.rs
+++ b/bin/node/testing/src/client.rs
@@ -32,7 +32,7 @@ pub type Backend = sc_client_db::Backend<node_primitives::Block>;
 /// Test client type.
 pub type Client = client::Client<
 	Backend,
-	client::LocalCallExecutor<Backend, Executor>,
+	client::LocalCallExecutor<node_primitives::Block, Backend, Executor>,
 	node_primitives::Block,
 	node_runtime::RuntimeApi,
 >;
@@ -63,7 +63,7 @@ pub trait TestClientBuilderExt: Sized {
 
 impl TestClientBuilderExt for substrate_test_client::TestClientBuilder<
 	node_primitives::Block,
-	client::LocalCallExecutor<Backend, Executor>,
+	client::LocalCallExecutor<node_primitives::Block, Backend, Executor>,
 	Backend,
 	GenesisParameters,
 > {
diff --git a/client/chain-spec/src/chain_spec.rs b/client/chain-spec/src/chain_spec.rs
index 2faf95568290..59b55707e182 100644
--- a/client/chain-spec/src/chain_spec.rs
+++ b/client/chain-spec/src/chain_spec.rs
@@ -21,7 +21,7 @@
 
 use std::{borrow::Cow, fs::File, path::PathBuf, sync::Arc, collections::HashMap};
 use serde::{Serialize, Deserialize};
-use sp_core::storage::{StorageKey, StorageData, ChildInfo, Storage, StorageChild};
+use sp_core::{storage::{StorageKey, StorageData, ChildInfo, Storage, StorageChild}, Bytes};
 use sp_runtime::BuildStorage;
 use serde_json as json;
 use crate::{RuntimeGenesis, ChainType, extension::GetExtension, Properties};
@@ -160,6 +160,12 @@ struct ClientSpec<E> {
 	#[serde(skip_serializing)]
 	genesis: serde::de::IgnoredAny,
 	light_sync_state: Option<SerializableLightSyncState>,
+	/// Mapping from `block_hash` to `wasm_code`.
+	///
+	/// The given `wasm_code` will be used to substitute the on-chain wasm code from the given
+	/// block hash onwards.
+	#[serde(default)]
+	code_substitutes: HashMap<String, Bytes>,
 }
 
 /// A type denoting empty extensions.
@@ -249,6 +255,7 @@ impl<G, E> ChainSpec<G, E> {
 			consensus_engine: (),
 			genesis: Default::default(),
 			light_sync_state: None,
+			code_substitutes: HashMap::new(),
 		};
 
 		ChainSpec {
@@ -395,6 +402,10 @@ where
 	fn set_light_sync_state(&mut self, light_sync_state: SerializableLightSyncState) {
 		ChainSpec::set_light_sync_state(self, light_sync_state)
 	}
+
+	fn code_substitutes(&self) -> std::collections::HashMap<String, Vec<u8>> {
+		self.client_spec.code_substitutes.iter().map(|(h, c)| (h.clone(), c.0.clone())).collect()
+	}
 }
 
 /// Hardcoded infomation that allows light clients to sync quickly.
diff --git a/client/chain-spec/src/lib.rs b/client/chain-spec/src/lib.rs
index ee4f757f8cf0..e75dafcfe025 100644
--- a/client/chain-spec/src/lib.rs
+++ b/client/chain-spec/src/lib.rs
@@ -161,6 +161,8 @@ pub trait ChainSpec: BuildStorage + Send + Sync {
 	fn set_storage(&mut self, storage: Storage);
 	/// Hardcode infomation to allow light clients to sync quickly into the chain spec.
 	fn set_light_sync_state(&mut self, light_sync_state: SerializableLightSyncState);
+	/// Returns code substitutes that should be used for the on chain wasm.
+	fn code_substitutes(&self) -> std::collections::HashMap<String, Vec<u8>>;
 }
 
 impl std::fmt::Debug for dyn ChainSpec {
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index 2c8557a5456e..45652524d432 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -50,7 +50,7 @@ use sp_runtime::traits::{
 };
 use sp_api::{ProvideRuntimeApi, CallApiAt};
 use sc_executor::{NativeExecutor, NativeExecutionDispatch, RuntimeInfo};
-use std::sync::Arc;
+use std::{sync::Arc, str::FromStr};
 use wasm_timer::SystemTime;
 use sc_telemetry::{
 	telemetry,
@@ -150,6 +150,7 @@ pub type TFullBackend<TBl> = sc_client_db::Backend<TBl>;
 
 /// Full client call executor type.
 pub type TFullCallExecutor<TBl, TExecDisp> = crate::client::LocalCallExecutor<
+	TBl,
 	sc_client_db::Backend<TBl>,
 	NativeExecutor<TExecDisp>,
 >;
@@ -172,6 +173,7 @@ pub type TLightCallExecutor<TBl, TExecDisp> = sc_light::GenesisCallExecutor<
 		HashFor<TBl>
 	>,
 	crate::client::LocalCallExecutor<
+		TBl,
 		sc_light::Backend<
 			sc_client_db::light::LightStorage<TBl>,
 			HashFor<TBl>
@@ -206,7 +208,7 @@ pub type TLightClientWithBackend<TBl, TRtApi, TExecDisp, TBackend> = Client<
 	TBackend,
 	sc_light::GenesisCallExecutor<
 		TBackend,
-		crate::client::LocalCallExecutor<TBackend, NativeExecutor<TExecDisp>>,
+		crate::client::LocalCallExecutor<TBl, TBackend, NativeExecutor<TExecDisp>>,
 	>,
 	TBl,
 	TRtApi,
@@ -295,6 +297,7 @@ pub fn new_full_client<TBl, TRtApi, TExecDisp>(
 ) -> Result<TFullClient<TBl, TRtApi, TExecDisp>, Error> where
 	TBl: BlockT,
 	TExecDisp: NativeExecutionDispatch + 'static,
+	TBl::Hash: FromStr,
 {
 	new_full_parts(config, telemetry).map(|parts| parts.0)
 }
@@ -303,9 +306,10 @@ pub fn new_full_client<TBl, TRtApi, TExecDisp>(
 pub fn new_full_parts<TBl, TRtApi, TExecDisp>(
 	config: &Configuration,
 	telemetry: Option<TelemetryHandle>,
-) -> Result<TFullParts<TBl, TRtApi, TExecDisp>,	Error> where
+) -> Result<TFullParts<TBl, TRtApi, TExecDisp>, Error> where
 	TBl: BlockT,
 	TExecDisp: NativeExecutionDispatch + 'static,
+	TBl::Hash: FromStr,
 {
 	let keystore_container = KeystoreContainer::new(&config.keystore)?;
 
@@ -349,6 +353,16 @@ pub fn new_full_parts<TBl, TRtApi, TExecDisp>(
 			sc_offchain::OffchainDb::factory_from_backend(&*backend),
 		);
 
+		let wasm_runtime_substitutes = config.chain_spec.code_substitutes().into_iter().map(|(h, c)| {
+			let hash = TBl::Hash::from_str(&h)
+				.map_err(|_|
+					 Error::Application(Box::from(
+						format!("Failed to parse `{}` as block hash for code substitutes.", h)
+					))
+				)?;
+			Ok((hash, c))
+		}).collect::<Result<std::collections::HashMap<_, _>, Error>>()?;
+
 		let client = new_client(
 			backend.clone(),
 			executor,
@@ -363,6 +377,7 @@ pub fn new_full_parts<TBl, TRtApi, TExecDisp>(
 				offchain_worker_enabled : config.offchain_worker.enabled,
 				offchain_indexing_api: config.offchain_worker.indexing_enabled,
 				wasm_runtime_overrides: config.wasm_runtime_overrides.clone(),
+				wasm_runtime_substitutes,
 			},
 		)?;
 
@@ -453,11 +468,11 @@ pub fn new_client<E, Block, RA>(
 	spawn_handle: Box<dyn SpawnNamed>,
 	prometheus_registry: Option<Registry>,
 	telemetry: Option<TelemetryHandle>,
-	config: ClientConfig,
+	config: ClientConfig<Block>,
 ) -> Result<
 	crate::client::Client<
 		Backend<Block>,
-		crate::client::LocalCallExecutor<Backend<Block>, E>,
+		crate::client::LocalCallExecutor<Block, Backend<Block>, E>,
 		Block,
 		RA,
 	>,
diff --git a/client/service/src/client/call_executor.rs b/client/service/src/client/call_executor.rs
index b48ff028cda0..e4ef76b1ab08 100644
--- a/client/service/src/client/call_executor.rs
+++ b/client/service/src/client/call_executor.rs
@@ -32,47 +32,56 @@ use sp_core::{
 };
 use sp_api::{ProofRecorder, InitializeBlock, StorageTransactionCache};
 use sc_client_api::{backend, call_executor::CallExecutor};
-use super::{client::ClientConfig, wasm_override::WasmOverride};
+use super::{client::ClientConfig, wasm_override::WasmOverride, wasm_substitutes::WasmSubstitutes};
 
 /// Call executor that executes methods locally, querying all required
 /// data from local backend.
-pub struct LocalCallExecutor<B, E> {
+pub struct LocalCallExecutor<Block: BlockT, B, E> {
 	backend: Arc<B>,
 	executor: E,
 	wasm_override: Option<WasmOverride<E>>,
+	wasm_substitutes: WasmSubstitutes<Block, E, B>,
 	spawn_handle: Box<dyn SpawnNamed>,
-	client_config: ClientConfig,
+	client_config: ClientConfig<Block>,
 }
 
-impl<B, E> LocalCallExecutor<B, E>
+impl<Block: BlockT, B, E> LocalCallExecutor<Block, B, E>
 where
-	E: CodeExecutor + RuntimeInfo + Clone + 'static
+	E: CodeExecutor + RuntimeInfo + Clone + 'static,
+	B: backend::Backend<Block>,
 {
 	/// Creates new instance of local call executor.
 	pub fn new(
 		backend: Arc<B>,
 		executor: E,
 		spawn_handle: Box<dyn SpawnNamed>,
-		client_config: ClientConfig,
+		client_config: ClientConfig<Block>,
 	) -> sp_blockchain::Result<Self> {
 		let wasm_override = client_config.wasm_runtime_overrides
 			.as_ref()
 			.map(|p| WasmOverride::new(p.clone(), executor.clone()))
 			.transpose()?;
 
+		let wasm_substitutes = WasmSubstitutes::new(
+			client_config.wasm_runtime_substitutes.clone(),
+			executor.clone(),
+			backend.clone(),
+		)?;
+
 		Ok(LocalCallExecutor {
 			backend,
 			executor,
 			wasm_override,
 			spawn_handle,
 			client_config,
+			wasm_substitutes,
 		})
 	}
 
 	/// Check if local runtime code overrides are enabled and one is available
 	/// for the given `BlockId`. If yes, return it; otherwise return the same
 	/// `RuntimeCode` instance that was passed.
-	fn check_override<'a, Block>(
+	fn check_override<'a>(
 		&'a self,
 		onchain_code: RuntimeCode<'a>,
 		id: &BlockId<Block>,
@@ -81,16 +90,16 @@ where
 		Block: BlockT,
 		B: backend::Backend<Block>,
 	{
+		let spec = self.runtime_version(id)?.spec_version;
 		let code = if let Some(d) = self.wasm_override
 			.as_ref()
-			.map::<sp_blockchain::Result<Option<RuntimeCode>>, _>(|o| {
-				let spec = self.runtime_version(id)?.spec_version;
-				Ok(o.get(&spec, onchain_code.heap_pages))
-			})
-			.transpose()?
+			.map(|o| o.get(&spec, onchain_code.heap_pages))
 			.flatten() {
 			log::debug!(target: "wasm_overrides", "using WASM override for block {}", id);
 			d
+		} else if let Some(s) = self.wasm_substitutes.get(spec, onchain_code.heap_pages, id) {
+			log::debug!(target: "wasm_substitutes", "Using WASM substitute for block {:?}", id);
+			s
 		} else {
 			log::debug!(
 				target: "wasm_overrides",
@@ -104,7 +113,7 @@ where
 	}
 }
 
-impl<B, E> Clone for LocalCallExecutor<B, E> where E: Clone {
+impl<Block: BlockT, B, E> Clone for LocalCallExecutor<Block, B, E> where E: Clone {
 	fn clone(&self) -> Self {
 		LocalCallExecutor {
 			backend: self.backend.clone(),
@@ -112,11 +121,12 @@ impl<B, E> Clone for LocalCallExecutor<B, E> where E: Clone {
 			wasm_override: self.wasm_override.clone(),
 			spawn_handle: self.spawn_handle.clone(),
 			client_config: self.client_config.clone(),
+			wasm_substitutes: self.wasm_substitutes.clone(),
 		}
 	}
 }
 
-impl<B, E, Block> CallExecutor<Block> for LocalCallExecutor<B, E>
+impl<B, E, Block> CallExecutor<Block> for LocalCallExecutor<Block, B, E>
 where
 	B: backend::Backend<Block>,
 	E: CodeExecutor + RuntimeInfo + Clone + 'static,
@@ -314,7 +324,7 @@ where
 	}
 }
 
-impl<B, E, Block> sp_version::GetRuntimeVersion<Block> for LocalCallExecutor<B, E>
+impl<Block, B, E> sp_version::GetRuntimeVersion<Block> for LocalCallExecutor<Block, B, E>
 	where
 		B: backend::Backend<Block>,
 		E: CodeExecutor + RuntimeInfo + Clone + 'static,
@@ -357,11 +367,7 @@ mod tests {
 
 		// wasm_runtime_overrides is `None` here because we construct the
 		// LocalCallExecutor directly later on
-		let client_config = ClientConfig {
-			offchain_worker_enabled: false,
-			offchain_indexing_api: false,
-			wasm_runtime_overrides: None,
-		};
+		let client_config = ClientConfig::default();
 
 		// client is used for the convenience of creating and inserting the genesis block.
 		let _client = substrate_test_runtime_client::client::new_with_backend::<
@@ -383,10 +389,15 @@ mod tests {
 
 		let call_executor = LocalCallExecutor {
 			backend: backend.clone(),
-			executor,
+			executor: executor.clone(),
 			wasm_override: Some(overrides),
 			spawn_handle: Box::new(TaskExecutor::new()),
 			client_config,
+			wasm_substitutes: WasmSubstitutes::new(
+				Default::default(),
+				executor.clone(),
+				backend.clone(),
+			).unwrap(),
 		};
 
 		let check = call_executor.check_override(onchain_code, &BlockId::Number(Default::default()))
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index a958cb6865c7..b294be226899 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -118,7 +118,7 @@ pub struct Client<B, E, Block, RA> where Block: BlockT {
 	importing_block: RwLock<Option<Block::Hash>>,
 	block_rules: BlockRules<Block>,
 	execution_extensions: ExecutionExtensions<Block>,
-	config: ClientConfig,
+	config: ClientConfig<Block>,
 	telemetry: Option<TelemetryHandle>,
 	_phantom: PhantomData<RA>,
 }
@@ -159,10 +159,10 @@ pub fn new_in_mem<E, Block, S, RA>(
 	prometheus_registry: Option<Registry>,
 	telemetry: Option<TelemetryHandle>,
 	spawn_handle: Box<dyn SpawnNamed>,
-	config: ClientConfig,
+	config: ClientConfig<Block>,
 ) -> sp_blockchain::Result<Client<
 	in_mem::Backend<Block>,
-	LocalCallExecutor<in_mem::Backend<Block>, E>,
+	LocalCallExecutor<Block, in_mem::Backend<Block>, E>,
 	Block,
 	RA
 >> where
@@ -183,14 +183,28 @@ pub fn new_in_mem<E, Block, S, RA>(
 }
 
 /// Relevant client configuration items relevant for the client.
-#[derive(Debug,Clone,Default)]
-pub struct ClientConfig {
+#[derive(Debug, Clone)]
+pub struct ClientConfig<Block: BlockT> {
 	/// Enable the offchain worker db.
 	pub offchain_worker_enabled: bool,
 	/// If true, allows access from the runtime to write into offchain worker db.
 	pub offchain_indexing_api: bool,
 	/// Path where WASM files exist to override the on-chain WASM.
 	pub wasm_runtime_overrides: Option<PathBuf>,
+	/// Map of WASM runtime substitute starting at the child of the given block until the runtime
+	/// version doesn't match anymore.
+	pub wasm_runtime_substitutes: HashMap<Block::Hash, Vec<u8>>,
+}
+
+impl<Block: BlockT> Default for ClientConfig<Block> {
+	fn default() -> Self {
+		Self {
+			offchain_worker_enabled: false,
+			offchain_indexing_api: false,
+			wasm_runtime_overrides: None,
+			wasm_runtime_substitutes: HashMap::new(),
+		}
+	}
 }
 
 /// Create a client with the explicitly provided backend.
@@ -204,8 +218,8 @@ pub fn new_with_backend<B, E, Block, S, RA>(
 	spawn_handle: Box<dyn SpawnNamed>,
 	prometheus_registry: Option<Registry>,
 	telemetry: Option<TelemetryHandle>,
-	config: ClientConfig,
-) -> sp_blockchain::Result<Client<B, LocalCallExecutor<B, E>, Block, RA>>
+	config: ClientConfig<Block>,
+) -> sp_blockchain::Result<Client<B, LocalCallExecutor<Block, B, E>, Block, RA>>
 	where
 		E: CodeExecutor + RuntimeInfo,
 		S: BuildStorage,
@@ -308,7 +322,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		execution_extensions: ExecutionExtensions<Block>,
 		prometheus_registry: Option<Registry>,
 		telemetry: Option<TelemetryHandle>,
-		config: ClientConfig,
+		config: ClientConfig<Block>,
 	) -> sp_blockchain::Result<Self> {
 		if backend.blockchain().header(BlockId::Number(Zero::zero()))?.is_none() {
 			let genesis_storage = build_genesis_storage.build_storage()
diff --git a/client/service/src/client/light.rs b/client/service/src/client/light.rs
index 3b29a0e1a92c..3a09bcbd78de 100644
--- a/client/service/src/client/light.rs
+++ b/client/service/src/client/light.rs
@@ -45,7 +45,7 @@ pub fn new_light<B, S, RA, E>(
 			Backend<S, HashFor<B>>,
 			GenesisCallExecutor<
 				Backend<S, HashFor<B>>,
-				LocalCallExecutor<Backend<S, HashFor<B>>, E>
+				LocalCallExecutor<B, Backend<S, HashFor<B>>, E>
 			>,
 			B,
 			RA
diff --git a/client/service/src/client/mod.rs b/client/service/src/client/mod.rs
index 06f48048f8f2..dd0b70b551bf 100644
--- a/client/service/src/client/mod.rs
+++ b/client/service/src/client/mod.rs
@@ -51,6 +51,7 @@ mod call_executor;
 mod client;
 mod block_rules;
 mod wasm_override;
+mod wasm_substitutes;
 
 pub use self::{
 	call_executor::LocalCallExecutor,
diff --git a/client/service/src/client/wasm_substitutes.rs b/client/service/src/client/wasm_substitutes.rs
new file mode 100644
index 000000000000..e947e4566f33
--- /dev/null
+++ b/client/service/src/client/wasm_substitutes.rs
@@ -0,0 +1,179 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! # WASM substitutes
+
+use std::{collections::{HashMap, hash_map::DefaultHasher}, hash::Hasher as _, sync::Arc};
+use sp_core::traits::{FetchRuntimeCode, RuntimeCode};
+use sp_state_machine::BasicExternalities;
+use sp_blockchain::{Result, HeaderBackend};
+use sc_executor::RuntimeInfo;
+use sp_version::RuntimeVersion;
+use sc_client_api::backend;
+use sp_runtime::{traits::{NumberFor, Block as BlockT}, generic::BlockId};
+use parking_lot::RwLock;
+
+/// A wasm substitute for the on chain wasm.
+#[derive(Debug)]
+struct WasmSubstitute<Block: BlockT> {
+	code: Vec<u8>,
+	hash: Vec<u8>,
+	/// The hash of the block from that on we should use the substitute.
+	block_hash: Block::Hash,
+	/// The block number of `block_hash`. If `None`, the block is still unknown.
+	block_number: RwLock<Option<NumberFor<Block>>>,
+}
+
+impl<Block: BlockT> WasmSubstitute<Block> {
+	fn new(
+		code: Vec<u8>,
+		block_hash: Block::Hash,
+		backend: &impl backend::Backend<Block>,
+	) -> Result<Self> {
+		let block_number = RwLock::new(backend.blockchain().number(block_hash)?);
+		let hash = make_hash(&code);
+		Ok(Self { code, hash, block_hash, block_number })
+	}
+
+	fn runtime_code(&self, heap_pages: Option<u64>) -> RuntimeCode {
+		RuntimeCode {
+			code_fetcher: self,
+			hash: self.hash.clone(),
+			heap_pages,
+		}
+	}
+
+	/// Returns `true` when the substitute matches for the given `block_id`.
+	fn matches(&self, block_id: &BlockId<Block>, backend: &impl backend::Backend<Block>) -> bool {
+		let block_number = *self.block_number.read();
+		let block_number = if let Some(block_number) = block_number {
+			block_number
+		} else {
+			let block_number = match backend.blockchain().number(self.block_hash) {
+				Ok(Some(n)) => n,
+				// still unknown
+				Ok(None) => return false,
+				Err(e) => {
+					log::debug!(
+						target: "wasm_substitutes",
+						"Failed to get block number for block hash {:?}: {:?}",
+						self.block_hash,
+						e,
+					);
+					return false
+				},
+			};
+			*self.block_number.write() = Some(block_number);
+			block_number
+		};
+
+		let requested_block_number = backend.blockchain().block_number_from_id(&block_id).ok().flatten();
+
+		Some(block_number) <= requested_block_number
+	}
+}
+
+/// Make a hash out of a byte string using the default rust hasher
+fn make_hash<K: std::hash::Hash + ?Sized>(val: &K) -> Vec<u8> {
+	let mut state = DefaultHasher::new();
+	val.hash(&mut state);
+	state.finish().to_le_bytes().to_vec()
+}
+
+impl<Block: BlockT> FetchRuntimeCode for WasmSubstitute<Block> {
+	fn fetch_runtime_code<'a>(&'a self) -> Option<std::borrow::Cow<'a, [u8]>> {
+		Some(self.code.as_slice().into())
+	}
+}
+
+#[derive(Debug, thiserror::Error)]
+#[allow(missing_docs)]
+pub enum WasmSubstituteError {
+	#[error("Failed to get runtime version: {0}")]
+	VersionInvalid(String),
+}
+
+impl From<WasmSubstituteError> for sp_blockchain::Error {
+	fn from(err: WasmSubstituteError) -> Self {
+		Self::Application(Box::new(err))
+	}
+}
+
+/// Substitutes the on-chain wasm with some hard coded blobs.
+#[derive(Debug)]
+pub struct WasmSubstitutes<Block: BlockT, Executor, Backend> {
+	/// spec_version -> WasmSubstitute
+	substitutes: Arc<HashMap<u32, WasmSubstitute<Block>>>,
+	executor: Executor,
+	backend: Arc<Backend>,
+}
+
+impl<Block: BlockT, Executor: Clone, Backend> Clone for WasmSubstitutes<Block, Executor, Backend> {
+	fn clone(&self) -> Self {
+		Self {
+			substitutes: self.substitutes.clone(),
+			executor: self.executor.clone(),
+			backend: self.backend.clone(),
+		}
+	}
+}
+
+impl<Executor, Backend, Block> WasmSubstitutes<Block, Executor, Backend>
+where
+	Executor: RuntimeInfo + Clone + 'static,
+	Backend: backend::Backend<Block>,
+	Block: BlockT,
+{
+	/// Create a new instance.
+	pub fn new(
+		substitutes: HashMap<Block::Hash, Vec<u8>>,
+		executor: Executor,
+		backend: Arc<Backend>,
+	) -> Result<Self> {
+		let substitutes = substitutes.into_iter().map(|(parent_block_hash, code)| {
+			let substitute = WasmSubstitute::new(code, parent_block_hash, &*backend)?;
+			let version = Self::runtime_version(&executor, &substitute)?;
+			Ok((version.spec_version, substitute))
+		}).collect::<Result<HashMap<_, _>>>()?;
+
+		Ok(Self { executor, substitutes: Arc::new(substitutes), backend })
+	}
+
+	/// Get a substitute.
+	///
+	/// Returns `None` if there isn't any substitute required.
+	pub fn get(
+		&self,
+		spec: u32,
+		pages: Option<u64>,
+		block_id: &BlockId<Block>,
+	) -> Option<RuntimeCode<'_>> {
+		let s = self.substitutes.get(&spec)?;
+		s.matches(block_id, &*self.backend).then(|| s.runtime_code(pages))
+	}
+
+	fn runtime_version(
+		executor: &Executor,
+		code: &WasmSubstitute<Block>,
+	) -> Result<RuntimeVersion> {
+		let mut ext = BasicExternalities::default();
+		executor.runtime_version(&mut ext, &code.runtime_code(None))
+			.map_err(|e| WasmSubstituteError::VersionInvalid(format!("{:?}", e)).into())
+	}
+}
+
diff --git a/client/service/test/src/client/mod.rs b/client/service/test/src/client/mod.rs
index 0234f43513d5..55ff989bb93c 100644
--- a/client/service/test/src/client/mod.rs
+++ b/client/service/test/src/client/mod.rs
@@ -1822,7 +1822,7 @@ fn cleans_up_closed_notification_sinks_on_block_import() {
 
 	type TestClient = Client<
 		in_mem::Backend<Block>,
-		LocalCallExecutor<in_mem::Backend<Block>, sc_executor::NativeExecutor<LocalExecutor>>,
+		LocalCallExecutor<Block, in_mem::Backend<Block>, sc_executor::NativeExecutor<LocalExecutor>>,
 		substrate_test_runtime_client::runtime::Block,
 		substrate_test_runtime_client::runtime::RuntimeApi,
 	>;
diff --git a/test-utils/client/src/lib.rs b/test-utils/client/src/lib.rs
index d8cc40d5561c..e343181505c9 100644
--- a/test-utils/client/src/lib.rs
+++ b/test-utils/client/src/lib.rs
@@ -244,7 +244,7 @@ impl<Block: BlockT, Executor, Backend, G: GenesisInit> TestClientBuilder<Block,
 
 impl<Block: BlockT, E, Backend, G: GenesisInit> TestClientBuilder<
 	Block,
-	client::LocalCallExecutor<Backend, NativeExecutor<E>>,
+	client::LocalCallExecutor<Block, Backend, NativeExecutor<E>>,
 	Backend,
 	G,
 > {
@@ -255,7 +255,7 @@ impl<Block: BlockT, E, Backend, G: GenesisInit> TestClientBuilder<
 	) -> (
 		client::Client<
 			Backend,
-			client::LocalCallExecutor<Backend, NativeExecutor<E>>,
+			client::LocalCallExecutor<Block, Backend, NativeExecutor<E>>,
 			Block,
 			RuntimeApi
 		>,
diff --git a/test-utils/runtime/client/src/lib.rs b/test-utils/runtime/client/src/lib.rs
index 5a66cde62e56..a9ff26a5adf8 100644
--- a/test-utils/runtime/client/src/lib.rs
+++ b/test-utils/runtime/client/src/lib.rs
@@ -67,6 +67,7 @@ pub type Backend = substrate_test_client::Backend<substrate_test_runtime::Block>
 
 /// Test client executor.
 pub type Executor = client::LocalCallExecutor<
+	substrate_test_runtime::Block,
 	Backend,
 	NativeExecutor<LocalExecutor>,
 >;
@@ -78,6 +79,7 @@ pub type LightBackend = substrate_test_client::LightBackend<substrate_test_runti
 pub type LightExecutor = sc_light::GenesisCallExecutor<
 	LightBackend,
 	client::LocalCallExecutor<
+		substrate_test_runtime::Block,
 		sc_light::Backend<
 			sc_client_db::light::LightStorage<substrate_test_runtime::Block>,
 			HashFor<substrate_test_runtime::Block>
@@ -159,7 +161,11 @@ pub type TestClientBuilder<E, B> = substrate_test_client::TestClientBuilder<
 /// Test client type with `LocalExecutor` and generic Backend.
 pub type Client<B> = client::Client<
 	B,
-	client::LocalCallExecutor<B, sc_executor::NativeExecutor<LocalExecutor>>,
+	client::LocalCallExecutor<
+		substrate_test_runtime::Block,
+		B,
+		sc_executor::NativeExecutor<LocalExecutor>
+	>,
 	substrate_test_runtime::Block,
 	substrate_test_runtime::RuntimeApi,
 >;
@@ -245,7 +251,11 @@ pub trait TestClientBuilderExt<B>: Sized {
 }
 
 impl<B> TestClientBuilderExt<B> for TestClientBuilder<
-	client::LocalCallExecutor<B, sc_executor::NativeExecutor<LocalExecutor>>,
+	client::LocalCallExecutor<
+		substrate_test_runtime::Block,
+		B,
+		sc_executor::NativeExecutor<LocalExecutor>
+	>,
 	B
 > where
 	B: sc_client_api::backend::Backend<substrate_test_runtime::Block> + 'static,

From fb90219bffdead9278b6a7880bebf676e5a071af Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Tue, 25 May 2021 20:00:50 +0200
Subject: [PATCH 0778/1194] make remote-ext work with ws and safe RPCs (#8889)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* make remote-ext work with ws and safe RPCs

* Update docs.

* Update utils/frame/remote-externalities/Cargo.toml

Co-authored-by: Niklas Adolfsson <niklasadolfsson1@gmail.com>

* Fix test

* Update lock file

* Update utils/frame/remote-externalities/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Fix build again.

* revert lifetime stuff

Co-authored-by: Niklas Adolfsson <niklasadolfsson1@gmail.com>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 Cargo.lock                                  | 101 ++++++----
 utils/frame/remote-externalities/Cargo.toml |   4 +-
 utils/frame/remote-externalities/src/lib.rs | 197 +++++++++++++++-----
 utils/frame/try-runtime/cli/src/lib.rs      |  10 +-
 4 files changed, 231 insertions(+), 81 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9019acfcbb23..e4ff69448b23 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -342,6 +342,19 @@ version = "4.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0"
 
+[[package]]
+name = "async-tls"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f23d769dbf1838d5df5156e7b1ad404f4c463d1ac2c6aeb6cd943630f8a8400"
+dependencies = [
+ "futures-core",
+ "futures-io",
+ "rustls 0.19.0",
+ "webpki 0.21.4",
+ "webpki-roots",
+]
+
 [[package]]
 name = "async-trait"
 version = "0.1.48"
@@ -2103,7 +2116,7 @@ checksum = "3a1387e07917c711fb4ee4f48ea0adb04a3c9739e53ef85bf43ae1edc2937a8b"
 dependencies = [
  "futures-io",
  "rustls 0.19.0",
- "webpki",
+ "webpki 0.21.4",
 ]
 
 [[package]]
@@ -2579,7 +2592,7 @@ dependencies = [
  "rustls-native-certs",
  "tokio 0.2.25",
  "tokio-rustls",
- "webpki",
+ "webpki 0.21.4",
 ]
 
 [[package]]
@@ -2910,25 +2923,6 @@ dependencies = [
  "slab",
 ]
 
-[[package]]
-name = "jsonrpsee-http-client"
-version = "0.2.0-alpha.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2737440f37efa10e5ef7beeec43d059d29dc92640978be21fcdcef481a2edb0d"
-dependencies = [
- "async-trait",
- "fnv",
- "hyper 0.13.10",
- "hyper-rustls",
- "jsonrpsee-types",
- "jsonrpsee-utils",
- "log",
- "serde",
- "serde_json",
- "thiserror",
- "url 2.2.1",
-]
-
 [[package]]
 name = "jsonrpsee-proc-macros"
 version = "0.2.0-alpha.6"
@@ -2959,14 +2953,25 @@ dependencies = [
 ]
 
 [[package]]
-name = "jsonrpsee-utils"
+name = "jsonrpsee-ws-client"
 version = "0.2.0-alpha.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d63cf4d423614e71fd144a8691208539d2b23d8373e069e2fbe023c5eba5e922"
+checksum = "d6fdb4390bd25358c62e8b778652a564a1723ba07dca0feb3da439c2253fe59f"
 dependencies = [
- "futures-util",
- "hyper 0.13.10",
+ "async-std",
+ "async-tls",
+ "async-trait",
+ "fnv",
+ "futures 0.3.13",
  "jsonrpsee-types",
+ "log",
+ "pin-project 1.0.5",
+ "serde",
+ "serde_json",
+ "soketto",
+ "thiserror",
+ "url 2.2.1",
+ "webpki 0.22.0",
 ]
 
 [[package]]
@@ -6660,14 +6665,14 @@ version = "0.9.0"
 dependencies = [
  "env_logger 0.8.3",
  "hex-literal",
- "jsonrpsee-http-client",
  "jsonrpsee-proc-macros",
+ "jsonrpsee-ws-client",
  "log",
  "parity-scale-codec",
  "sp-core",
  "sp-io",
  "sp-runtime",
- "tokio 0.2.25",
+ "tokio 1.6.0",
 ]
 
 [[package]]
@@ -6779,7 +6784,7 @@ dependencies = [
  "log",
  "ring",
  "sct",
- "webpki",
+ "webpki 0.21.4",
 ]
 
 [[package]]
@@ -6792,7 +6797,7 @@ dependencies = [
  "log",
  "ring",
  "sct",
- "webpki",
+ "webpki 0.21.4",
 ]
 
 [[package]]
@@ -9989,10 +9994,21 @@ dependencies = [
  "pin-project-lite 0.1.12",
  "signal-hook-registry",
  "slab",
- "tokio-macros",
+ "tokio-macros 0.2.6",
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "tokio"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd3076b5c8cc18138b8f8814895c11eb4de37114a5d127bafdc5e55798ceef37"
+dependencies = [
+ "autocfg",
+ "pin-project-lite 0.2.6",
+ "tokio-macros 1.2.0",
+]
+
 [[package]]
 name = "tokio-buf"
 version = "0.1.1"
@@ -10068,6 +10084,17 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "tokio-macros"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c49e3df43841dafb86046472506755d8501c5615673955f6aa17181125d13c37"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "tokio-named-pipes"
 version = "0.1.0"
@@ -10109,7 +10136,7 @@ dependencies = [
  "futures-core",
  "rustls 0.18.1",
  "tokio 0.2.25",
- "webpki",
+ "webpki 0.21.4",
 ]
 
 [[package]]
@@ -11104,13 +11131,23 @@ dependencies = [
  "untrusted",
 ]
 
+[[package]]
+name = "webpki"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
 [[package]]
 name = "webpki-roots"
 version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "82015b7e0b8bad8185994674a13a93306bea76cf5a16c5a181382fd3a5ec2376"
 dependencies = [
- "webpki",
+ "webpki 0.21.4",
 ]
 
 [[package]]
diff --git a/utils/frame/remote-externalities/Cargo.toml b/utils/frame/remote-externalities/Cargo.toml
index 7d372e8648ee..0d6336f60d88 100644
--- a/utils/frame/remote-externalities/Cargo.toml
+++ b/utils/frame/remote-externalities/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-jsonrpsee-http-client = { version = "=0.2.0-alpha.6", default-features = false, features = ["tokio02"] }
+jsonrpsee-ws-client = { version = "=0.2.0-alpha.6", default-features = false }
 jsonrpsee-proc-macros = "=0.2.0-alpha.6"
 
 hex-literal = "0.3.1"
@@ -26,7 +26,7 @@ sp-core = { version = "3.0.0", path = "../../../primitives/core" }
 sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
 
 [dev-dependencies]
-tokio = { version = "0.2", features = ["macros"] }
+tokio = { version = "1.6.0", features = ["macros", "rt"] }
 
 [features]
 remote-test = []
diff --git a/utils/frame/remote-externalities/src/lib.rs b/utils/frame/remote-externalities/src/lib.rs
index 3ec16ea1982c..077892baabf7 100644
--- a/utils/frame/remote-externalities/src/lib.rs
+++ b/utils/frame/remote-externalities/src/lib.rs
@@ -113,20 +113,26 @@ use sp_core::{
 	storage::{StorageKey, StorageData},
 };
 use codec::{Encode, Decode};
-use jsonrpsee_http_client::{HttpClient, HttpClientBuilder};
-
 use sp_runtime::traits::Block as BlockT;
+use jsonrpsee_ws_client::{WsClientBuilder, WsClient};
 
 type KeyPair = (StorageKey, StorageData);
 
 const LOG_TARGET: &str = "remote-ext";
-const TARGET: &str = "http://localhost:9933";
+const DEFAULT_TARGET: &str = "wss://rpc.polkadot.io";
 
 jsonrpsee_proc_macros::rpc_client_api! {
 	RpcApi<B: BlockT> {
-		#[rpc(method = "state_getPairs", positional_params)]
-		fn storage_pairs(prefix: StorageKey, hash: Option<B::Hash>) -> Vec<(StorageKey, StorageData)>;
-		#[rpc(method = "chain_getFinalizedHead")]
+		#[rpc(method = "state_getStorage", positional_params)]
+		fn get_storage(prefix: StorageKey, hash: Option<B::Hash>) -> StorageData;
+		#[rpc(method = "state_getKeysPaged", positional_params)]
+		fn get_keys_paged(
+			prefix: Option<StorageKey>,
+			count: u32,
+			start_key: Option<StorageKey>,
+			hash: Option<B::Hash>,
+		) -> Vec<StorageKey>;
+		#[rpc(method = "chain_getFinalizedHead", positional_params)]
 		fn finalized_head() -> B::Hash;
 	}
 }
@@ -140,6 +146,12 @@ pub enum Mode<B: BlockT> {
 	Offline(OfflineConfig),
 }
 
+impl<B: BlockT> Default for Mode<B> {
+	fn default() -> Self {
+		Mode::Online(OnlineConfig::default())
+	}
+}
+
 /// configuration of the online execution.
 ///
 /// A state snapshot config must be present.
@@ -149,32 +161,55 @@ pub struct OfflineConfig {
 	pub state_snapshot: SnapshotConfig,
 }
 
+/// Description of the transport protocol.
+#[derive(Debug)]
+pub struct Transport {
+	uri: String,
+	client: Option<WsClient>,
+}
+
+impl Clone for Transport {
+	fn clone(&self) -> Self {
+		Self { uri: self.uri.clone(), client: None }
+	}
+}
+
+impl From<String> for Transport {
+	fn from(t: String) -> Self {
+		Self { uri: t, client: None }
+	}
+}
+
 /// Configuration of the online execution.
 ///
 /// A state snapshot config may be present and will be written to in that case.
 #[derive(Clone)]
 pub struct OnlineConfig<B: BlockT> {
-	/// The HTTP uri to use.
-	pub uri: String,
 	/// The block number at which to connect. Will be latest finalized head if not provided.
 	pub at: Option<B::Hash>,
 	/// An optional state snapshot file to WRITE to, not for reading. Not written if set to `None`.
 	pub state_snapshot: Option<SnapshotConfig>,
 	/// The modules to scrape. If empty, entire chain state will be scraped.
 	pub modules: Vec<String>,
+	/// Transport config.
+	pub transport: Transport,
 }
 
 impl<B: BlockT> Default for OnlineConfig<B> {
 	fn default() -> Self {
-		Self { uri: TARGET.to_owned(), at: None, state_snapshot: None, modules: Default::default() }
+		Self {
+			transport: Transport { uri: DEFAULT_TARGET.to_string(), client: None },
+			at: None,
+			state_snapshot: None,
+			modules: vec![],
+		}
 	}
 }
 
 impl<B: BlockT> OnlineConfig<B> {
-	/// Return a new http rpc client.
-	fn rpc(&self) -> HttpClient {
-		HttpClientBuilder::default().max_request_body_size(u32::MAX).build(&self.uri)
-			.expect("valid HTTP url; qed")
+	/// Return rpc (ws) client.
+	fn rpc_client(&self) -> &WsClient {
+		self.transport.client.as_ref().expect("ws client must have been initialized by now; qed.")
 	}
 }
 
@@ -199,16 +234,17 @@ impl Default for SnapshotConfig {
 
 /// Builder for remote-externalities.
 pub struct Builder<B: BlockT> {
+	/// Pallets to inject their prefix into the externalities.
 	inject: Vec<KeyPair>,
+	/// connectivity mode, online or offline.
 	mode: Mode<B>,
 }
 
+// NOTE: ideally we would use `DefaultNoBound` here, but not worth bringing in frame-support for
+// that.
 impl<B: BlockT> Default for Builder<B> {
 	fn default() -> Self {
-		Self {
-			inject: Default::default(),
-			mode: Mode::Online(OnlineConfig::default()),
-		}
+		Self { inject: Default::default(), mode: Default::default() }
 	}
 }
 
@@ -233,25 +269,92 @@ impl<B: BlockT> Builder<B> {
 impl<B: BlockT> Builder<B> {
 	async fn rpc_get_head(&self) -> Result<B::Hash, &'static str> {
 		trace!(target: LOG_TARGET, "rpc: finalized_head");
-		RpcApi::<B>::finalized_head(&self.as_online().rpc()).await.map_err(|e| {
+		RpcApi::<B>::finalized_head(self.as_online().rpc_client()).await.map_err(|e| {
 			error!("Error = {:?}", e);
 			"rpc finalized_head failed."
 		})
 	}
 
-	/// Relay the request to `state_getPairs` rpc endpoint.
+	/// Get all the keys at `prefix` at `hash` using the paged, safe RPC methods.
+	async fn get_keys_paged(
+		&self,
+		prefix: StorageKey,
+		hash: B::Hash,
+	) -> Result<Vec<StorageKey>, &'static str> {
+		const PAGE: u32 = 512;
+		let mut last_key: Option<StorageKey> = None;
+		let mut all_keys: Vec<StorageKey> = vec![];
+		let keys = loop {
+			let page = RpcApi::<B>::get_keys_paged(
+				self.as_online().rpc_client(),
+				Some(prefix.clone()),
+				PAGE,
+				last_key.clone(),
+				Some(hash),
+			)
+			.await
+			.map_err(|e| {
+				error!(target: LOG_TARGET, "Error = {:?}", e);
+				"rpc get_keys failed"
+			})?;
+			let page_len = page.len();
+			all_keys.extend(page);
+
+			if page_len < PAGE as usize {
+				debug!(target: LOG_TARGET, "last page received: {}", page_len);
+				break all_keys;
+			} else {
+				let new_last_key =
+					all_keys.last().expect("all_keys is populated; has .last(); qed");
+				debug!(
+					target: LOG_TARGET,
+					"new total = {}, full page received: {:?}",
+					all_keys.len(),
+					HexDisplay::from(new_last_key)
+				);
+				last_key = Some(new_last_key.clone());
+			}
+		};
+
+		Ok(keys)
+	}
+
+	/// Synonym of `rpc_get_pairs_unsafe` that uses paged queries to first get the keys, and then
+	/// map them to values one by one.
 	///
-	/// Note that this is an unsafe RPC.
-	async fn rpc_get_pairs(
+	/// This can work with public nodes. But, expect it to be darn slow.
+	pub(crate) async fn rpc_get_pairs_paged(
 		&self,
 		prefix: StorageKey,
 		at: B::Hash,
 	) -> Result<Vec<KeyPair>, &'static str> {
-		trace!(target: LOG_TARGET, "rpc: storage_pairs: {:?} / {:?}", prefix, at);
-		RpcApi::<B>::storage_pairs(&self.as_online().rpc(), prefix, Some(at)).await.map_err(|e| {
-			error!("Error = {:?}", e);
-			"rpc storage_pairs failed"
-		})
+		let keys = self.get_keys_paged(prefix, at).await?;
+		let keys_count = keys.len();
+		info!(target: LOG_TARGET, "Querying a total of {} keys", keys.len());
+
+		let mut key_values: Vec<KeyPair> = vec![];
+		for key in keys {
+			let value =
+				RpcApi::<B>::get_storage(self.as_online().rpc_client(), key.clone(), Some(at))
+					.await
+					.map_err(|e| {
+						error!(target: LOG_TARGET, "Error = {:?}", e);
+						"rpc get_storage failed"
+					})?;
+			key_values.push((key, value));
+			if key_values.len() % 1000 == 0 {
+				let ratio: f64 = key_values.len() as f64 / keys_count as f64;
+				debug!(
+					target: LOG_TARGET,
+					"progress = {:.2} [{} / {}]",
+					ratio,
+					key_values.len(),
+					keys_count,
+				);
+			}
+		}
+
+		Ok(key_values)
 	}
 }
 
@@ -279,13 +382,13 @@ impl<B: BlockT> Builder<B> {
 			.at
 			.expect("online config must be initialized by this point; qed.")
 			.clone();
-		info!(target: LOG_TARGET, "scraping keypairs from remote node {} @ {:?}", config.uri, at);
+		info!(target: LOG_TARGET, "scraping keypairs from remote @ {:?}", at);
 
 		let keys_and_values = if config.modules.len() > 0 {
 			let mut filtered_kv = vec![];
 			for f in config.modules.iter() {
 				let hashed_prefix = StorageKey(twox_128(f.as_bytes()).to_vec());
-				let module_kv = self.rpc_get_pairs(hashed_prefix.clone(), at).await?;
+				let module_kv = self.rpc_get_pairs_paged(hashed_prefix.clone(), at).await?;
 				info!(
 					target: LOG_TARGET,
 					"downloaded data for module {} (count: {} / prefix: {:?}).",
@@ -298,22 +401,34 @@ impl<B: BlockT> Builder<B> {
 			filtered_kv
 		} else {
 			info!(target: LOG_TARGET, "downloading data for all modules.");
-			self.rpc_get_pairs(StorageKey(vec![]), at).await?.into_iter().collect::<Vec<_>>()
+			self.rpc_get_pairs_paged(StorageKey(vec![]), at).await?
 		};
 
 		Ok(keys_and_values)
 	}
 
-	async fn init_remote_client(&mut self) -> Result<(), &'static str> {
-		info!(target: LOG_TARGET, "initializing remote client to {:?}", self.as_online().uri);
+	pub(crate) async fn init_remote_client(&mut self) -> Result<(), &'static str> {
+		let mut online = self.as_online_mut();
+		info!(target: LOG_TARGET, "initializing remote client to {:?}", online.transport.uri);
+
+		// First, initialize the ws client.
+		let ws_client = WsClientBuilder::default()
+			.max_request_body_size(u32::MAX)
+			.build(&online.transport.uri)
+			.await
+			.map_err(|_| "failed to build ws client")?;
+		online.transport.client = Some(ws_client);
+
+		// Then, if `at` is not set, set it.
 		if self.as_online().at.is_none() {
 			let at = self.rpc_get_head().await?;
 			self.as_online_mut().at = Some(at);
 		}
+
 		Ok(())
 	}
 
-	async fn pre_build(mut self) -> Result<Vec<KeyPair>, &'static str> {
+	pub(crate) async fn pre_build(mut self) -> Result<Vec<KeyPair>, &'static str> {
 		let mut base_kv = match self.mode.clone() {
 			Mode::Offline(config) => self.load_state_snapshot(&config.state_snapshot.path)?,
 			Mode::Online(config) => {
@@ -380,8 +495,9 @@ mod test_prelude {
 
 	pub(crate) fn init_logger() {
 		let _ = env_logger::Builder::from_default_env()
-			.format_module_path(false)
+			.format_module_path(true)
 			.format_level(true)
+			.filter_module(LOG_TARGET, log::LevelFilter::Debug)
 			.try_init();
 	}
 }
@@ -395,7 +511,7 @@ mod tests {
 		init_logger();
 		Builder::<Block>::new()
 			.mode(Mode::Offline(OfflineConfig {
-				state_snapshot: SnapshotConfig { path: "test_data/proxy_test".into() },
+				state_snapshot: SnapshotConfig::new("test_data/proxy_test"),
 			}))
 			.build()
 			.await
@@ -413,7 +529,7 @@ mod remote_tests {
 		init_logger();
 		Builder::<Block>::new()
 			.mode(Mode::Online(OnlineConfig {
-				modules: vec!["Proxy".into()],
+				modules: vec!["Proxy".to_owned()],
 				..Default::default()
 			}))
 			.build()
@@ -427,19 +543,16 @@ mod remote_tests {
 		init_logger();
 		Builder::<Block>::new()
 			.mode(Mode::Online(OnlineConfig {
-				state_snapshot: Some(SnapshotConfig {
-					name: "test_snapshot_to_remove.bin".into(),
-					..Default::default()
-				}),
+				state_snapshot: Some(SnapshotConfig::new("test_snapshot_to_remove.bin")),
+				modules: vec!["Balances".to_owned()],
 				..Default::default()
 			}))
 			.build()
 			.await
 			.expect("Can't reach the remote node. Is it running?")
-			.unwrap()
 			.execute_with(|| {});
 
-		let to_delete = std::fs::read_dir(SnapshotConfig::default().directory)
+		let to_delete = std::fs::read_dir(SnapshotConfig::default().path)
 			.unwrap()
 			.into_iter()
 			.map(|d| d.unwrap())
@@ -454,7 +567,7 @@ mod remote_tests {
 	}
 
 	#[tokio::test]
-	async fn can_build_all() {
+	async fn can_fetch_all() {
 		init_logger();
 		Builder::<Block>::new()
 			.build()
diff --git a/utils/frame/try-runtime/cli/src/lib.rs b/utils/frame/try-runtime/cli/src/lib.rs
index 9e41a3fd87e7..c4adab3ce8f8 100644
--- a/utils/frame/try-runtime/cli/src/lib.rs
+++ b/utils/frame/try-runtime/cli/src/lib.rs
@@ -86,7 +86,7 @@ pub enum State {
 		modules: Option<Vec<String>>,
 
 		/// The url to connect to.
-		#[structopt(default_value = "http://localhost:9933", parse(try_from_str = parse_url))]
+		#[structopt(default_value = "ws://localhost:9944", parse(try_from_str = parse_url))]
 		url: String,
 	},
 }
@@ -109,11 +109,11 @@ fn parse_hash(block_number: &str) -> Result<String, String> {
 }
 
 fn parse_url(s: &str) -> Result<String, &'static str> {
-	if s.starts_with("http://") {
+	if s.starts_with("ws://") || s.starts_with("wss://") {
 		// could use Url crate as well, but lets keep it simple for now.
 		Ok(s.to_string())
 	} else {
-		Err("not a valid HTTP url: must start with 'http://'")
+		Err("not a valid WS(S) url: must start with 'ws://' or 'wss://'")
 	}
 }
 
@@ -166,9 +166,9 @@ impl TryRuntimeCmd {
 					block_at,
 					modules
 				} => Builder::<B>::new().mode(Mode::Online(OnlineConfig {
-					uri: url.into(),
+					transport: url.to_owned().into(),
 					state_snapshot: snapshot_path.as_ref().map(SnapshotConfig::new),
-					modules: modules.clone().unwrap_or_default(),
+					modules: modules.to_owned().unwrap_or_default(),
 					at: block_at.as_ref()
 						.map(|b| b.parse().map_err(|e| format!("Could not parse hash: {:?}", e))).transpose()?,
 					..Default::default()

From 9eac3bfaab3e931e52903534ad9a3ba14d689f66 Mon Sep 17 00:00:00 2001
From: Frederik Schulz <mustermeiszer@posteo.de>
Date: Tue, 25 May 2021 21:50:12 +0200
Subject: [PATCH 0779/1194] Removes unnecessary blank impl for Backend (#8897)

* Removes unnecessary blank impl for Backend

This commit removes a from my perspective unneccessary implementation
for &T which implement Backend.

The current implementation exists (again from my perspective) solely
to satisfy a methods &mut self parameters (i.e. allows to satisfy
this for an & reference via using &mut &Backend).

As all implementors use a RefCell with borrow_mut() where actually
calling the mentioned &mut self method and then forwad to the
{} implementation of either TrieBackend or ProvingBackend, the
current &mut self seems to be not needed.

* Fixed tests client
---
 client/db/src/bench.rs                        |  2 +-
 client/db/src/lib.rs                          |  2 +-
 client/db/src/storage_cache.rs                |  4 +-
 client/light/src/backend.rs                   |  2 +-
 client/service/src/client/call_executor.rs    |  2 +-
 client/service/test/src/client/mod.rs         |  2 +-
 primitives/state-machine/src/backend.rs       | 82 +------------------
 primitives/state-machine/src/ext.rs           |  4 +-
 .../state-machine/src/proving_backend.rs      |  2 +-
 primitives/state-machine/src/trie_backend.rs  |  2 +-
 10 files changed, 12 insertions(+), 92 deletions(-)

diff --git a/client/db/src/bench.rs b/client/db/src/bench.rs
index a2501891b31e..ed53f52da3ce 100644
--- a/client/db/src/bench.rs
+++ b/client/db/src/bench.rs
@@ -507,7 +507,7 @@ impl<B: BlockT> StateBackend<HashFor<B>> for BenchmarkingState<B> {
 		*self.whitelist.borrow_mut() = new;
 	}
 
-	fn register_overlay_stats(&mut self, stats: &sp_state_machine::StateMachineStats) {
+	fn register_overlay_stats(&self, stats: &sp_state_machine::StateMachineStats) {
 		self.state.borrow_mut().as_mut().map(|s| s.register_overlay_stats(stats));
 	}
 
diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index c684245be356..9a334f95d49a 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -259,7 +259,7 @@ impl<B: BlockT> StateBackend<HashFor<B>> for RefTrackingState<B> {
 		self.state.as_trie_backend()
 	}
 
-	fn register_overlay_stats(&mut self, stats: &StateMachineStats) {
+	fn register_overlay_stats(&self, stats: &StateMachineStats) {
 		self.state.register_overlay_stats(stats);
 	}
 
diff --git a/client/db/src/storage_cache.rs b/client/db/src/storage_cache.rs
index 8929972e26e6..cb2ab1de1b6c 100644
--- a/client/db/src/storage_cache.rs
+++ b/client/db/src/storage_cache.rs
@@ -677,7 +677,7 @@ impl<S: StateBackend<HashFor<B>>, B: BlockT> StateBackend<HashFor<B>> for Cachin
 		self.state.as_trie_backend()
 	}
 
-	fn register_overlay_stats(&mut self, stats: &sp_state_machine::StateMachineStats) {
+	fn register_overlay_stats(&self, stats: &sp_state_machine::StateMachineStats) {
 		self.overlay_stats.add(stats);
 	}
 
@@ -862,7 +862,7 @@ impl<S: StateBackend<HashFor<B>>, B: BlockT> StateBackend<HashFor<B>> for Syncin
 			.as_trie_backend()
 	}
 
-	fn register_overlay_stats(&mut self, stats: &sp_state_machine::StateMachineStats) {
+	fn register_overlay_stats(&self, stats: &sp_state_machine::StateMachineStats) {
 		self.caching_state().register_overlay_stats(stats);
 	}
 
diff --git a/client/light/src/backend.rs b/client/light/src/backend.rs
index d6f86209afe9..4c8ac3fe40f4 100644
--- a/client/light/src/backend.rs
+++ b/client/light/src/backend.rs
@@ -526,7 +526,7 @@ impl<H: Hasher> StateBackend<H> for GenesisOrUnavailableState<H>
 		}
 	}
 
-	fn register_overlay_stats(&mut self, _stats: &sp_state_machine::StateMachineStats) { }
+	fn register_overlay_stats(&self, _stats: &sp_state_machine::StateMachineStats) { }
 
 	fn usage_info(&self) -> sp_state_machine::UsageInfo {
 		sp_state_machine::UsageInfo::empty()
diff --git a/client/service/src/client/call_executor.rs b/client/service/src/client/call_executor.rs
index e4ef76b1ab08..c8c1fee545be 100644
--- a/client/service/src/client/call_executor.rs
+++ b/client/service/src/client/call_executor.rs
@@ -220,7 +220,7 @@ where
 						Box::new(sp_state_machine::ExecutionError::UnableToGenerateProof) as Box<dyn sp_state_machine::Error>
 					)?;
 
-				let state_runtime_code = sp_state_machine::backend::BackendRuntimeCode::new(&trie_state);
+				let state_runtime_code = sp_state_machine::backend::BackendRuntimeCode::new(trie_state);
 				// It is important to extract the runtime code here before we create the proof
 				// recorder.
 				let runtime_code = state_runtime_code.runtime_code()
diff --git a/client/service/test/src/client/mod.rs b/client/service/test/src/client/mod.rs
index 55ff989bb93c..3852ab2d61b5 100644
--- a/client/service/test/src/client/mod.rs
+++ b/client/service/test/src/client/mod.rs
@@ -167,7 +167,7 @@ fn construct_block(
 	};
 	let hash = header.hash();
 	let mut overlay = OverlayedChanges::default();
-	let backend_runtime_code = sp_state_machine::backend::BackendRuntimeCode::new(&backend);
+	let backend_runtime_code = sp_state_machine::backend::BackendRuntimeCode::new(backend);
 	let runtime_code = backend_runtime_code.runtime_code().expect("Code is part of the backend");
 	let task_executor = Box::new(TaskExecutor::new());
 
diff --git a/primitives/state-machine/src/backend.rs b/primitives/state-machine/src/backend.rs
index 1a8892f8dd14..92b4c83314e7 100644
--- a/primitives/state-machine/src/backend.rs
+++ b/primitives/state-machine/src/backend.rs
@@ -204,7 +204,7 @@ pub trait Backend<H: Hasher>: sp_std::fmt::Debug {
 	/// Register stats from overlay of state machine.
 	///
 	/// By default nothing is registered.
-	fn register_overlay_stats(&mut self, _stats: &crate::stats::StateMachineStats);
+	fn register_overlay_stats(&self, _stats: &crate::stats::StateMachineStats);
 
 	/// Query backend usage statistics (i/o, memory)
 	///
@@ -252,86 +252,6 @@ pub trait Backend<H: Hasher>: sp_std::fmt::Debug {
 	}
 }
 
-impl<'a, T: Backend<H>, H: Hasher> Backend<H> for &'a T {
-	type Error = T::Error;
-	type Transaction = T::Transaction;
-	type TrieBackendStorage = T::TrieBackendStorage;
-
-	fn storage(&self, key: &[u8]) -> Result<Option<StorageKey>, Self::Error> {
-		(*self).storage(key)
-	}
-
-	fn child_storage(
-		&self,
-		child_info: &ChildInfo,
-		key: &[u8],
-	) -> Result<Option<StorageKey>, Self::Error> {
-		(*self).child_storage(child_info, key)
-	}
-
-	fn apply_to_child_keys_while<F: FnMut(&[u8]) -> bool>(
-		&self,
-		child_info: &ChildInfo,
-		f: F,
-	) {
-		(*self).apply_to_child_keys_while(child_info, f)
-	}
-
-	fn next_storage_key(&self, key: &[u8]) -> Result<Option<StorageKey>, Self::Error> {
-		(*self).next_storage_key(key)
-	}
-
-	fn next_child_storage_key(
-		&self,
-		child_info: &ChildInfo,
-		key: &[u8],
-	) -> Result<Option<StorageKey>, Self::Error> {
-		(*self).next_child_storage_key(child_info, key)
-	}
-
-	fn for_keys_with_prefix<F: FnMut(&[u8])>(&self, prefix: &[u8], f: F) {
-		(*self).for_keys_with_prefix(prefix, f)
-	}
-
-	fn for_child_keys_with_prefix<F: FnMut(&[u8])>(
-		&self,
-		child_info: &ChildInfo,
-		prefix: &[u8],
-		f: F,
-	) {
-		(*self).for_child_keys_with_prefix(child_info, prefix, f)
-	}
-
-	fn storage_root<'b>(
-		&self,
-		delta: impl Iterator<Item=(&'b [u8], Option<&'b [u8]>)>,
-	) -> (H::Out, Self::Transaction) where H::Out: Ord {
-		(*self).storage_root(delta)
-	}
-
-	fn child_storage_root<'b>(
-		&self,
-		child_info: &ChildInfo,
-		delta: impl Iterator<Item=(&'b [u8], Option<&'b [u8]>)>,
-	) -> (H::Out, bool, Self::Transaction) where H::Out: Ord {
-		(*self).child_storage_root(child_info, delta)
-	}
-
-	fn pairs(&self) -> Vec<(StorageKey, StorageValue)> {
-		(*self).pairs()
-	}
-
-	fn for_key_values_with_prefix<F: FnMut(&[u8], &[u8])>(&self, prefix: &[u8], f: F) {
-		(*self).for_key_values_with_prefix(prefix, f);
-	}
-
-	fn register_overlay_stats(&mut self, _stats: &crate::stats::StateMachineStats) {	}
-
-	fn usage_info(&self) -> UsageInfo {
-		(*self).usage_info()
-	}
-}
-
 /// Trait that allows consolidate two transactions together.
 pub trait Consolidate {
 	/// Consolidate two transactions into one.
diff --git a/primitives/state-machine/src/ext.rs b/primitives/state-machine/src/ext.rs
index 43793d3c815d..471674580d2b 100644
--- a/primitives/state-machine/src/ext.rs
+++ b/primitives/state-machine/src/ext.rs
@@ -682,7 +682,7 @@ where
 			self.overlay.rollback_transaction().expect(BENCHMARKING_FN);
 		}
 		self.overlay.drain_storage_changes(
-			&self.backend,
+			self.backend,
 			#[cfg(feature = "std")]
 			None,
 			Default::default(),
@@ -700,7 +700,7 @@ where
 			self.overlay.commit_transaction().expect(BENCHMARKING_FN);
 		}
 		let changes = self.overlay.drain_storage_changes(
-			&self.backend,
+			self.backend,
 			#[cfg(feature = "std")]
 			None,
 			Default::default(),
diff --git a/primitives/state-machine/src/proving_backend.rs b/primitives/state-machine/src/proving_backend.rs
index 28672659fa10..963582a3cc35 100644
--- a/primitives/state-machine/src/proving_backend.rs
+++ b/primitives/state-machine/src/proving_backend.rs
@@ -328,7 +328,7 @@ impl<'a, S, H> Backend<H> for ProvingBackend<'a, S, H>
 		self.0.child_storage_root(child_info, delta)
 	}
 
-	fn register_overlay_stats(&mut self, _stats: &crate::stats::StateMachineStats) { }
+	fn register_overlay_stats(&self, _stats: &crate::stats::StateMachineStats) { }
 
 	fn usage_info(&self) -> crate::stats::UsageInfo {
 		self.0.usage_info()
diff --git a/primitives/state-machine/src/trie_backend.rs b/primitives/state-machine/src/trie_backend.rs
index 3e74f2d3df4b..5dd8fb7562f7 100644
--- a/primitives/state-machine/src/trie_backend.rs
+++ b/primitives/state-machine/src/trie_backend.rs
@@ -236,7 +236,7 @@ impl<S: TrieBackendStorage<H>, H: Hasher> Backend<H> for TrieBackend<S, H> where
 		Some(self)
 	}
 
-	fn register_overlay_stats(&mut self, _stats: &crate::stats::StateMachineStats) { }
+	fn register_overlay_stats(&self, _stats: &crate::stats::StateMachineStats) { }
 
 	fn usage_info(&self) -> crate::UsageInfo {
 		crate::UsageInfo::empty()

From c46ffcc6882c58c8e9d76584712841cf94899e36 Mon Sep 17 00:00:00 2001
From: Denis Pisarev <denis.pisarev@parity.io>
Date: Tue, 25 May 2021 22:58:42 +0200
Subject: [PATCH 0780/1194] Fix stderr in new Rust nightly (#8904)

* CI: revert me

* fix stderr

* CI: revert me

* typo

* more stderr fixes

* Revert "CI: revert me"

This reverts commit 5f47effc4965fa5c0c2a6ed92e434a6adb6b1dce.

* Revert "CI: revert me"

This reverts commit 7f785660c797b703dd36272cbe313056dd7a1858.
---
 frame/support/test/tests/derive_no_bound_ui/eq.stderr     | 2 +-
 .../test/tests/ui/impl_incorrect_method_signature.stderr  | 4 ++--
 .../api/test/tests/ui/mock_only_self_reference.stderr     | 8 ++++----
 .../ui/type_reference_in_impl_runtime_apis_call.stderr    | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/frame/support/test/tests/derive_no_bound_ui/eq.stderr b/frame/support/test/tests/derive_no_bound_ui/eq.stderr
index 36384178d469..fce13d6f17f0 100644
--- a/frame/support/test/tests/derive_no_bound_ui/eq.stderr
+++ b/frame/support/test/tests/derive_no_bound_ui/eq.stderr
@@ -7,6 +7,6 @@ error[E0277]: can't compare `Foo<T>` with `Foo<T>`
    ::: $RUST/core/src/cmp.rs
     |
     | pub trait Eq: PartialEq<Self> {
-    |               --------------- required by this bound in `Eq`
+    |               --------------- required by this bound in `std::cmp::Eq`
     |
     = help: the trait `PartialEq` is not implemented for `Foo<T>`
diff --git a/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr b/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr
index fcda69533e3a..6b00b7268672 100644
--- a/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr
+++ b/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr
@@ -23,8 +23,8 @@ error[E0053]: method `Api_test_runtime_api_impl` has an incompatible type for tr
 17 |   sp_api::impl_runtime_apis! {
    |   ^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `u64`, found struct `std::string::String`
    |
-   = note: expected fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option<u64>, Vec<_>) -> std::result::Result<_, _>`
-              found fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option<std::string::String>, Vec<_>) -> std::result::Result<_, _>`
+   = note: expected fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option<u64>, Vec<_>) -> Result<_, _>`
+              found fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option<std::string::String>, Vec<_>) -> Result<_, _>`
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0308]: mismatched types
diff --git a/primitives/api/test/tests/ui/mock_only_self_reference.stderr b/primitives/api/test/tests/ui/mock_only_self_reference.stderr
index 73cf93610379..83cfcf6ca1f9 100644
--- a/primitives/api/test/tests/ui/mock_only_self_reference.stderr
+++ b/primitives/api/test/tests/ui/mock_only_self_reference.stderr
@@ -24,8 +24,8 @@ error[E0053]: method `Api_test_runtime_api_impl` has an incompatible type for tr
 12 |   sp_api::mock_impl_runtime_apis! {
    |   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `u64`, found `()`
    |
-   = note: expected fn pointer `fn(&MockApi, &BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, Extrinsic>>, ExecutionContext, Option<u64>, Vec<_>) -> std::result::Result<_, _>`
-              found fn pointer `fn(&MockApi, &BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, Extrinsic>>, ExecutionContext, Option<()>, Vec<_>) -> std::result::Result<_, _>`
+   = note: expected fn pointer `fn(&MockApi, &BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, Extrinsic>>, ExecutionContext, Option<u64>, Vec<_>) -> Result<_, _>`
+              found fn pointer `fn(&MockApi, &BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, Extrinsic>>, ExecutionContext, Option<()>, Vec<_>) -> Result<_, _>`
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0053]: method `Api_test2_runtime_api_impl` has an incompatible type for trait
@@ -42,6 +42,6 @@ error[E0053]: method `Api_test2_runtime_api_impl` has an incompatible type for t
 12 |   sp_api::mock_impl_runtime_apis! {
    |   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `u64`, found `()`
    |
-   = note: expected fn pointer `fn(&MockApi, &BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, Extrinsic>>, ExecutionContext, Option<u64>, Vec<_>) -> std::result::Result<_, _>`
-              found fn pointer `fn(&MockApi, &BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, Extrinsic>>, ExecutionContext, Option<()>, Vec<_>) -> std::result::Result<_, _>`
+   = note: expected fn pointer `fn(&MockApi, &BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, Extrinsic>>, ExecutionContext, Option<u64>, Vec<_>) -> Result<_, _>`
+              found fn pointer `fn(&MockApi, &BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, Extrinsic>>, ExecutionContext, Option<()>, Vec<_>) -> Result<_, _>`
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr b/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr
index 71f12b415a2b..689723f8d750 100644
--- a/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr
+++ b/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr
@@ -23,8 +23,8 @@ error[E0053]: method `Api_test_runtime_api_impl` has an incompatible type for tr
 17 |   sp_api::impl_runtime_apis! {
    |   ^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `u64`, found `&u64`
    |
-   = note: expected fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option<u64>, Vec<_>) -> std::result::Result<_, _>`
-              found fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option<&u64>, Vec<_>) -> std::result::Result<_, _>`
+   = note: expected fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option<u64>, Vec<_>) -> Result<_, _>`
+              found fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option<&u64>, Vec<_>) -> Result<_, _>`
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0308]: mismatched types

From 1305ec84b7789f5eee120913ed94dd17a1e5a76f Mon Sep 17 00:00:00 2001
From: Denis Pisarev <denis.pisarev@parity.io>
Date: Tue, 25 May 2021 23:01:00 +0200
Subject: [PATCH 0781/1194] Fix build job (#8905)

* CI: fix node-template packaging

* add explicit deps versions
---
 .maintain/node-template-release.sh     | 2 +-
 utils/frame/try-runtime/cli/Cargo.toml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.maintain/node-template-release.sh b/.maintain/node-template-release.sh
index fd470a3dce17..cb5e72e7fa98 100755
--- a/.maintain/node-template-release.sh
+++ b/.maintain/node-template-release.sh
@@ -13,4 +13,4 @@ fi
 PATH_TO_ARCHIVE=$1
 cd $PROJECT_ROOT/.maintain/node-template-release
 
-cargo run $PROJECT_ROOT/bin/node-template $PATH_TO_ARCHIVE
+cargo run $PROJECT_ROOT/bin/node-template $PROJECT_ROOT/$PATH_TO_ARCHIVE
diff --git a/utils/frame/try-runtime/cli/Cargo.toml b/utils/frame/try-runtime/cli/Cargo.toml
index 592d0a5b99d2..4767d0db6783 100644
--- a/utils/frame/try-runtime/cli/Cargo.toml
+++ b/utils/frame/try-runtime/cli/Cargo.toml
@@ -18,7 +18,7 @@ parity-scale-codec = { version = "2.0.0" }
 
 sc-service = { version = "0.9.0", default-features = false, path = "../../../../client/service" }
 sc-cli = { version = "0.9.0", path = "../../../../client/cli" }
-sc-executor = { path = "../../../../client/executor" }
+sc-executor = { version = "0.9.0", path = "../../../../client/executor" }
 sc-client-api = { version = "3.0.0", path = "../../../../client/api" }
 structopt = "0.3.8"
 sp-state-machine = { version = "0.9.0", path = "../../../../primitives/state-machine" }
@@ -29,4 +29,4 @@ sp-externalities = { version = "0.9.0", path = "../../../../primitives/externali
 sp-core = { version = "3.0.0", path = "../../../../primitives/core" }
 frame-try-runtime = { version = "0.9.0", path = "../../../../frame/try-runtime" }
 
-remote-externalities = { path = "../../remote-externalities" }
+remote-externalities = { version = "0.9.0", path = "../../remote-externalities" }

From 7fe74c4563a02a37b8546a378625e8fee1e8056b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Wed, 26 May 2021 00:29:55 +0200
Subject: [PATCH 0782/1194] contracts: Fix some minor bugs around instantiation
 (#8879)

* Fix output of wrongly outputted error

The "Tombstoned a contract that is below the subsistence threshold: {:?}" was
triggered when too few balance was provided. It was a false alarm.

* Fix return of wrong code_len

* Split up `NotCallable` into more fine grained errors

* Fix typos in docs

Co-authored-by: Keith Yeung <kungfukeith11@gmail.com>

* RentNotPayed -> RentNotPaid

* Fix typo: payed -> paid

It is OK to change the in-storage field name because:

1. The SCALE encoding is not based on names only on position.
2. The struct is not public (only to the crate).

Co-authored-by: Keith Yeung <kungfukeith11@gmail.com>
---
 frame/contracts/CHANGELOG.md            |  2 +-
 frame/contracts/src/benchmarking/mod.rs |  4 ++--
 frame/contracts/src/exec.rs             | 30 ++++++++++++++++++-------
 frame/contracts/src/lib.rs              | 23 ++++++++++++++-----
 frame/contracts/src/rent.rs             | 12 +++++-----
 frame/contracts/src/storage.rs          |  8 +++----
 frame/contracts/src/tests.rs            | 22 +++++++++---------
 frame/contracts/src/wasm/runtime.rs     |  6 +++--
 8 files changed, 67 insertions(+), 40 deletions(-)

diff --git a/frame/contracts/CHANGELOG.md b/frame/contracts/CHANGELOG.md
index 2a93c838bc6a..76fc09ad1735 100644
--- a/frame/contracts/CHANGELOG.md
+++ b/frame/contracts/CHANGELOG.md
@@ -49,7 +49,7 @@ This version constitutes the first release that brings any stability guarantees
 [#8014](https://github.com/paritytech/substrate/pull/8014)
 
 - Charge rent for code stored on the chain in addition to the already existing
-rent that is payed for data storage.
+rent that is paid for data storage.
 [#7935](https://github.com/paritytech/substrate/pull/7935)
 
 - Allow the runtime to configure per storage item costs in addition
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index 91210f08883e..2ba32069cbe3 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -409,7 +409,7 @@ benchmarks! {
 
 	// We benchmark the costs for sucessfully evicting an empty contract.
 	// The actual costs are depending on how many storage items the evicted contract
-	// does have. However, those costs are not to be payed by the sender but
+	// does have. However, those costs are not to be paid by the sender but
 	// will be distributed over multiple blocks using a scheduler. Otherwise there is
 	// no incentive to remove large contracts when the removal is more expensive than
 	// the reward for removing them.
@@ -435,7 +435,7 @@ benchmarks! {
 		instance.ensure_tombstone()?;
 
 		// the caller should get the reward for being a good snitch
-		// this is capped by the maximum amount of rent payed. So we only now that it should
+		// this is capped by the maximum amount of rent paid. So we only now that it should
 		// have increased by at most the surcharge reward.
 		assert!(
 			T::Currency::free_balance(&instance.caller) >
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index d69964ff778b..d5b489d8912e 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -686,8 +686,11 @@ where
 					contract
 				} else {
 					<ContractInfoOf<T>>::get(&dest)
-						.and_then(|contract| contract.get_alive())
-						.ok_or((Error::<T>::NotCallable.into(), 0))?
+						.ok_or((<Error<T>>::ContractNotFound.into(), 0))
+						.and_then(|contract|
+							contract.get_alive()
+								.ok_or((<Error<T>>::ContractIsTombstone.into(), 0))
+						)?
 				};
 
 				let executable = E::from_storage(contract.code_hash, schedule, gas_meter)
@@ -701,7 +704,7 @@ where
 				let contract = Rent::<T, E>
 					::charge(&dest, contract, executable.occupied_storage())
 					.map_err(|e| (e.into(), executable.code_len()))?
-					.ok_or((Error::<T>::NotCallable.into(), executable.code_len()))?;
+					.ok_or((Error::<T>::RentNotPaid.into(), executable.code_len()))?;
 				(dest, contract, executable, ExportedFunction::Call)
 			}
 			FrameArgs::Instantiate{sender, trie_seed, executable, salt} => {
@@ -791,7 +794,7 @@ where
 			let code_len = executable.code_len();
 
 			// Every call or instantiate also optionally transferres balance.
-			self.initial_transfer().map_err(|e| (ExecError::from(e), 0))?;
+			self.initial_transfer().map_err(|e| (ExecError::from(e), code_len))?;
 
 			// Call into the wasm blob.
 			let output = executable.execute(
@@ -954,12 +957,23 @@ where
 
 	// The transfer as performed by a call or instantiate.
 	fn initial_transfer(&self) -> DispatchResult {
+		let frame = self.top_frame();
+		let value = frame.value_transferred;
+		let subsistence_threshold = <Contracts<T>>::subsistence_threshold();
+
+		// If the value transferred to a new contract is less than the subsistence threshold
+		// we can error out early. This avoids executing the constructor in cases where
+		// we already know that the contract has too little balance.
+		if frame.entry_point == ExportedFunction::Constructor && value < subsistence_threshold {
+			return Err(<Error<T>>::NewContractNotFunded.into());
+		}
+
 		Self::transfer(
 			self.caller_is_origin(),
 			false,
 			self.caller(),
-			&self.top_frame().account_id,
-			self.top_frame().value_transferred,
+			&frame.account_id,
+			value,
 		)
 	}
 
@@ -2005,7 +2019,7 @@ mod tests {
 					ctx.ext.instantiate(
 						0,
 						dummy_ch,
-						15u64,
+						Contracts::<Test>::subsistence_threshold(),
 						vec![],
 						&[],
 					),
@@ -2286,7 +2300,7 @@ mod tests {
 		let code = MockLoader::insert(Constructor, |ctx, _| {
 			assert_matches!(
 				ctx.ext.call(0, ctx.ext.address().clone(), 0, vec![]),
-				Err((ExecError{error, ..}, _)) if error == <Error<Test>>::NotCallable.into()
+				Err((ExecError{error, ..}, _)) if error == <Error<Test>>::ContractNotFound.into()
 			);
 			exec_success()
 		});
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index 67c5acee8f4a..c655a926d803 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -388,7 +388,7 @@ pub mod pallet {
 		/// producer fails to do so, a regular users will be allowed to claim the reward.
 		///
 		/// In case of a successful eviction no fees are charged from the sender. However, the
-		/// reward is capped by the total amount of rent that was payed by the contract while
+		/// reward is capped by the total amount of rent that was paid by the contract while
 		/// it was alive.
 		///
 		/// If contract is not evicted as a result of this call, [`Error::ContractNotEvictable`]
@@ -421,10 +421,10 @@ pub mod pallet {
 
 			// If poking the contract has lead to eviction of the contract, give out the rewards.
 			match Rent::<T, PrefabWasmModule<T>>::try_eviction(&dest, handicap)? {
-				(Some(rent_payed), code_len) => {
+				(Some(rent_paid), code_len) => {
 					T::Currency::deposit_into_existing(
 						&rewarded,
-						T::SurchargeReward::get().min(rent_payed),
+						T::SurchargeReward::get().min(rent_paid),
 					)
 					.map(|_| PostDispatchInfo {
 						actual_weight: Some(T::WeightInfo::claim_surcharge(code_len / 1024)),
@@ -535,9 +535,20 @@ pub mod pallet {
 		/// Performing a call was denied because the calling depth reached the limit
 		/// of what is specified in the schedule.
 		MaxCallDepthReached,
-		/// The contract that was called is either no contract at all (a plain account)
-		/// or is a tombstone.
-		NotCallable,
+		/// No contract was found at the specified address.
+		ContractNotFound,
+		/// A tombstone exist at the specified address.
+		///
+		/// Tombstone cannot be called. Anyone can use `seal_restore_to` in order to revive
+		/// the contract, though.
+		ContractIsTombstone,
+		/// The called contract does not have enough balance to pay for its storage.
+		///
+		/// The contract ran out of balance and is therefore eligible for eviction into a
+		/// tombstone. Anyone can evict the contract by submitting a `claim_surcharge`
+		/// extrinsic. Alternatively, a plain balance transfer can be used in order to
+		/// increase the contracts funds so that it can be called again.
+		RentNotPaid,
 		/// The code supplied to `instantiate_with_code` exceeds the limit specified in the
 		/// current schedule.
 		CodeTooLarge,
diff --git a/frame/contracts/src/rent.rs b/frame/contracts/src/rent.rs
index 5999a152d04d..68e8c57e9ade 100644
--- a/frame/contracts/src/rent.rs
+++ b/frame/contracts/src/rent.rs
@@ -96,7 +96,7 @@ where
 	/// Process a report that a contract under the given address should be evicted.
 	///
 	/// Enact the eviction right away if the contract should be evicted and return the amount
-	/// of rent that the contract payed over its lifetime.
+	/// of rent that the contract paid over its lifetime.
 	/// Otherwise, **do nothing** and return None.
 	///
 	/// The `handicap` parameter gives a way to check the rent to a moment in the past instead
@@ -130,15 +130,15 @@ where
 		match verdict {
 			Verdict::Evict { ref amount } => {
 				// The outstanding `amount` is withdrawn inside `enact_verdict`.
-				let rent_payed = amount
+				let rent_paid = amount
 					.as_ref()
 					.map(|a| a.peek())
 					.unwrap_or_else(|| <BalanceOf<T>>::zero())
-					.saturating_add(contract.rent_payed);
+					.saturating_add(contract.rent_paid);
 				Self::enact_verdict(
 					account, contract, current_block_number, verdict, Some(module),
 				)?;
-				Ok((Some(rent_payed), code_len))
+				Ok((Some(rent_paid), code_len))
 			}
 			_ => Ok((None, code_len)),
 		}
@@ -297,7 +297,7 @@ where
 		<ContractInfoOf<T>>::insert(&dest, ContractInfo::Alive(AliveContractInfo::<T> {
 			code_hash,
 			rent_allowance,
-			rent_payed: <BalanceOf<T>>::zero(),
+			rent_paid: <BalanceOf<T>>::zero(),
 			deduct_block: current_block,
 			last_write,
 			.. origin_contract
@@ -544,7 +544,7 @@ where
 				let contract = ContractInfo::Alive(AliveContractInfo::<T> {
 					rent_allowance: alive_contract_info.rent_allowance - amount.peek(),
 					deduct_block: current_block_number,
-					rent_payed: alive_contract_info.rent_payed.saturating_add(amount.peek()),
+					rent_paid: alive_contract_info.rent_paid.saturating_add(amount.peek()),
 					..alive_contract_info
 				});
 				<ContractInfoOf<T>>::insert(account, &contract);
diff --git a/frame/contracts/src/storage.rs b/frame/contracts/src/storage.rs
index bb3553529bef..17486b274f2c 100644
--- a/frame/contracts/src/storage.rs
+++ b/frame/contracts/src/storage.rs
@@ -97,11 +97,11 @@ pub struct RawAliveContractInfo<CodeHash, Balance, BlockNumber> {
 	pub code_hash: CodeHash,
 	/// Pay rent at most up to this value.
 	pub rent_allowance: Balance,
-	/// The amount of rent that was payed by the contract over its whole lifetime.
+	/// The amount of rent that was paid by the contract over its whole lifetime.
 	///
 	/// A restored contract starts with a value of zero just like a new contract.
-	pub rent_payed: Balance,
-	/// Last block rent has been payed.
+	pub rent_paid: Balance,
+	/// Last block rent has been paid.
 	pub deduct_block: BlockNumber,
 	/// Last block child storage has been written.
 	pub last_write: Option<BlockNumber>,
@@ -243,7 +243,7 @@ where
 				// charge rent for it during instantiation.
 				<frame_system::Pallet<T>>::block_number().saturating_sub(1u32.into()),
 			rent_allowance: <BalanceOf<T>>::max_value(),
-			rent_payed: <BalanceOf<T>>::zero(),
+			rent_paid: <BalanceOf<T>>::zero(),
 			pair_count: 0,
 			last_write: None,
 			_reserved: None,
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index f3d6be6279f9..6fdaecebd85f 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -366,7 +366,7 @@ fn calling_plain_account_fails() {
 			Contracts::call(Origin::signed(ALICE), BOB, 0, GAS_LIMIT, Vec::new()),
 			Err(
 				DispatchErrorWithPostInfo {
-					error: Error::<Test>::NotCallable.into(),
+					error: Error::<Test>::ContractNotFound.into(),
 					post_info: PostDispatchInfo {
 						actual_weight: Some(base_cost),
 						pays_fee: Default::default(),
@@ -396,7 +396,7 @@ fn account_removal_does_not_remove_storage() {
 				deduct_block: System::block_number(),
 				code_hash: H256::repeat_byte(1),
 				rent_allowance: 40,
-				rent_payed: 0,
+				rent_paid: 0,
 				last_write: None,
 				_reserved: None,
 			});
@@ -412,7 +412,7 @@ fn account_removal_does_not_remove_storage() {
 				deduct_block: System::block_number(),
 				code_hash: H256::repeat_byte(2),
 				rent_allowance: 40,
-				rent_payed: 0,
+				rent_paid: 0,
 				last_write: None,
 				_reserved: None,
 			});
@@ -1088,7 +1088,7 @@ fn call_removed_contract() {
 			// Calling contract should deny access because rent cannot be paid.
 			assert_err_ignore_postinfo!(
 				Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, call::null()),
-				Error::<Test>::NotCallable
+				Error::<Test>::RentNotPaid,
 			);
 			// No event is generated because the contract is not actually removed.
 			assert_eq!(System::events(), vec![]);
@@ -1096,7 +1096,7 @@ fn call_removed_contract() {
 			// Subsequent contract calls should also fail.
 			assert_err_ignore_postinfo!(
 				Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, call::null()),
-				Error::<Test>::NotCallable
+				Error::<Test>::RentNotPaid,
 			);
 
 			// A snitch can now remove the contract
@@ -1321,7 +1321,7 @@ fn restoration(
 				Contracts::call(
 					Origin::signed(ALICE), addr_bob.clone(), 0, GAS_LIMIT, call::null()
 				),
-				Error::<Test>::NotCallable
+				Error::<Test>::RentNotPaid,
 			);
 			assert!(System::events().is_empty());
 			assert!(ContractInfoOf::<Test>::get(&addr_bob).unwrap().get_alive().is_some());
@@ -2669,11 +2669,11 @@ fn surcharge_reward_is_capped() {
 		let balance = Balances::free_balance(&ALICE);
 		let reward = <Test as Config>::SurchargeReward::get();
 
-		// some rent should have payed due to instantiation
-		assert_ne!(contract.rent_payed, 0);
+		// some rent should have paid due to instantiation
+		assert_ne!(contract.rent_paid, 0);
 
 		// the reward should be parameterized sufficiently high to make this test useful
-		assert!(reward > contract.rent_payed);
+		assert!(reward > contract.rent_paid);
 
 		// make contract eligible for eviction
 		initialize_block(40);
@@ -2682,13 +2682,13 @@ fn surcharge_reward_is_capped() {
 		assert_ok!(Contracts::claim_surcharge(Origin::none(), addr.clone(), Some(ALICE)));
 
 		// this reward does not take into account the last rent payment collected during eviction
-		let capped_reward = reward.min(contract.rent_payed);
+		let capped_reward = reward.min(contract.rent_paid);
 
 		// this is smaller than the actual reward because it does not take into account the
 		// rent collected during eviction
 		assert!(Balances::free_balance(&ALICE) > balance + capped_reward);
 
-		// the full reward is not payed out because of the cap introduced by rent_payed
+		// the full reward is not paid out because of the cap introduced by rent_paid
 		assert!(Balances::free_balance(&ALICE) < balance + reward);
 	});
 }
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index f9e6e9283211..3701c0d60734 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -601,14 +601,16 @@ where
 		let transfer_failed = Error::<E::T>::TransferFailed.into();
 		let not_funded = Error::<E::T>::NewContractNotFunded.into();
 		let no_code = Error::<E::T>::CodeNotFound.into();
-		let invalid_contract = Error::<E::T>::NotCallable.into();
+		let not_found = Error::<E::T>::ContractNotFound.into();
+		let is_tombstone = Error::<E::T>::ContractIsTombstone.into();
+		let rent_not_paid = Error::<E::T>::RentNotPaid.into();
 
 		match from {
 			x if x == below_sub => Ok(BelowSubsistenceThreshold),
 			x if x == transfer_failed => Ok(TransferFailed),
 			x if x == not_funded => Ok(NewContractNotFunded),
 			x if x == no_code => Ok(CodeNotFound),
-			x if x == invalid_contract => Ok(NotCallable),
+			x if (x == not_found || x == is_tombstone || x == rent_not_paid) => Ok(NotCallable),
 			err => Err(err)
 		}
 	}

From 2c713b5f6a42bda48f6b482c375c8e9df4595d03 Mon Sep 17 00:00:00 2001
From: MOZGIII <mike-n@narod.ru>
Date: Wed, 26 May 2021 10:16:53 +0300
Subject: [PATCH 0783/1194] Convert Into to From to make clippy happy (#8900)

---
 frame/support/src/origin.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frame/support/src/origin.rs b/frame/support/src/origin.rs
index 6dd38eb1b2ab..869296b52f88 100644
--- a/frame/support/src/origin.rs
+++ b/frame/support/src/origin.rs
@@ -349,13 +349,13 @@ macro_rules! impl_outer_origin {
 			}
 		}
 
-		impl Into<$crate::sp_std::result::Result<$system::Origin<$runtime>, $name>> for $name {
+		impl From<$name> for $crate::sp_std::result::Result<$system::Origin<$runtime>, $name>{
 			/// NOTE: converting to pallet origin loses the origin filter information.
-			fn into(self) -> $crate::sp_std::result::Result<$system::Origin<$runtime>, Self> {
-				if let $caller_name::system(l) = self.caller {
+			fn from(val: $name) -> Self {
+				if let $caller_name::system(l) = val.caller {
 					Ok(l)
 				} else {
-					Err(self)
+					Err(val)
 				}
 			}
 		}

From cb308ac8d289b3089560a61a2bb6b6093af26f53 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Wed, 26 May 2021 10:49:45 +0200
Subject: [PATCH 0784/1194] add an absolute measure of election score on-chain
 as a parameter (#8903)

* add an absolute measure of election score on-chain as a parameter

* make it storage item

* line width

* some nits

* Apply suggestions from code review

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* make a few more things pub

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 bin/node/runtime/src/lib.rs                   |  1 +
 .../election-provider-multi-phase/src/lib.rs  | 68 ++++++++++++++++++-
 .../election-provider-multi-phase/src/mock.rs |  1 +
 .../src/unsigned.rs                           | 12 ++--
 frame/merkle-mountain-range/src/lib.rs        |  2 +-
 5 files changed, 74 insertions(+), 10 deletions(-)

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index a570329dcfce..92f3d43901a9 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -554,6 +554,7 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
 	type CompactSolution = NposCompactSolution16;
 	type Fallback = Fallback;
 	type WeightInfo = pallet_election_provider_multi_phase::weights::SubstrateWeight<Runtime>;
+	type ForceOrigin = EnsureRootOrHalfCouncil;
 	type BenchmarkingConfig = ();
 }
 
diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index d1de16f7f744..9bec5cc4bd31 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -502,6 +502,8 @@ pub enum FeasibilityError {
 	InvalidScore,
 	/// The provided round is incorrect.
 	InvalidRound,
+	/// Comparison against `MinimumUntrustedScore` failed.
+	UntrustedScoreTooLow,
 }
 
 impl From<sp_npos_elections::Error> for FeasibilityError {
@@ -579,6 +581,9 @@ pub mod pallet {
 		/// Configuration for the fallback
 		type Fallback: Get<FallbackStrategy>;
 
+		/// Origin that can set the minimum score.
+		type ForceOrigin: EnsureOrigin<Self::Origin>;
+
 		/// The configuration of benchmarking.
 		type BenchmarkingConfig: BenchmarkingConfig;
 
@@ -773,6 +778,21 @@ pub mod pallet {
 
 			Ok(None.into())
 		}
+
+		/// Set a new value for `MinimumUntrustedScore`.
+		///
+		/// Dispatch origin must be aligned with `T::ForceOrigin`.
+		///
+		/// This check can be turned off by setting the value to `None`.
+		#[pallet::weight(T::DbWeight::get().writes(1))]
+		fn set_minimum_untrusted_score(
+			origin: OriginFor<T>,
+			maybe_next_score: Option<ElectionScore>,
+		) -> DispatchResult {
+			T::ForceOrigin::ensure_origin(origin)?;
+			<MinimumUntrustedScore<T>>::set(maybe_next_score);
+			Ok(())
+		}
 	}
 
 	#[pallet::event]
@@ -909,6 +929,14 @@ pub mod pallet {
 	#[pallet::getter(fn snapshot_metadata)]
 	pub type SnapshotMetadata<T: Config> = StorageValue<_, SolutionOrSnapshotSize>;
 
+	/// The minimum score that each 'untrusted' solution must attain in order to be considered
+	/// feasible.
+	///
+	/// Can be set via `set_minimum_untrusted_score`.
+	#[pallet::storage]
+	#[pallet::getter(fn minimum_untrusted_score)]
+	pub type MinimumUntrustedScore<T: Config> = StorageValue<_, ElectionScore>;
+
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
 	pub struct Pallet<T>(PhantomData<T>);
@@ -959,7 +987,7 @@ impl<T: Config> Pallet<T> {
 	///
 	/// Returns `Ok(snapshot_weight)` if success, where `snapshot_weight` is the weight that
 	/// needs to recorded for the creation of snapshot.
-	pub(crate) fn on_initialize_open_signed() -> Result<Weight, ElectionError> {
+	pub fn on_initialize_open_signed() -> Result<Weight, ElectionError> {
 		let weight = Self::create_snapshot()?;
 		<CurrentPhase<T>>::put(Phase::Signed);
 		Self::deposit_event(Event::SignedPhaseStarted(Self::round()));
@@ -972,7 +1000,7 @@ impl<T: Config> Pallet<T> {
 	///
 	/// Returns `Ok(snapshot_weight)` if success, where `snapshot_weight` is the weight that
 	/// needs to recorded for the creation of snapshot.
-	pub(crate) fn on_initialize_open_unsigned(
+	pub fn on_initialize_open_unsigned(
 		need_snapshot: bool,
 		enabled: bool,
 		now: T::BlockNumber,
@@ -997,7 +1025,7 @@ impl<T: Config> Pallet<T> {
 	/// 3. [`DesiredTargets`]
 	///
 	/// Returns `Ok(consumed_weight)` if operation is okay.
-	pub(crate) fn create_snapshot() -> Result<Weight, ElectionError> {
+	pub fn create_snapshot() -> Result<Weight, ElectionError> {
 		let target_limit = <CompactTargetIndexOf<T>>::max_value().saturated_into::<usize>();
 		let voter_limit = <CompactVoterIndexOf<T>>::max_value().saturated_into::<usize>();
 
@@ -1052,6 +1080,15 @@ impl<T: Config> Pallet<T> {
 		// upon arrival, thus we would then remove it here. Given overlay it is cheap anyhow
 		ensure!(winners.len() as u32 == desired_targets, FeasibilityError::WrongWinnerCount);
 
+		// ensure that the solution's score can pass absolute min-score.
+		let submitted_score = solution.score.clone();
+		ensure!(
+			Self::minimum_untrusted_score().map_or(true, |min_score|
+				sp_npos_elections::is_score_better(submitted_score, min_score, Perbill::zero())
+			),
+			FeasibilityError::UntrustedScoreTooLow
+		);
+
 		// read the entire snapshot.
 		let RoundSnapshot { voters: snapshot_voters, targets: snapshot_targets } =
 			Self::snapshot().ok_or(FeasibilityError::SnapshotUnavailable)?;
@@ -1596,6 +1633,31 @@ mod tests {
 		})
 	}
 
+	#[test]
+	fn untrusted_score_verification_is_respected() {
+		ExtBuilder::default().build_and_execute(|| {
+			roll_to(15);
+			assert_eq!(MultiPhase::current_phase(), Phase::Signed);
+
+
+			let (solution, _) = MultiPhase::mine_solution(2).unwrap();
+			// default solution has a score of [50, 100, 5000].
+			assert_eq!(solution.score, [50, 100, 5000]);
+
+			<MinimumUntrustedScore<Runtime>>::put([49, 0, 0]);
+			assert_ok!(MultiPhase::feasibility_check(solution.clone(), ElectionCompute::Signed));
+
+			<MinimumUntrustedScore<Runtime>>::put([51, 0, 0]);
+			assert_noop!(
+				MultiPhase::feasibility_check(
+					solution,
+					ElectionCompute::Signed
+				),
+				FeasibilityError::UntrustedScoreTooLow,
+			);
+		})
+	}
+
 	#[test]
 	fn number_of_voters_allowed_2sec_block() {
 		// Just a rough estimate with the substrate weights.
diff --git a/frame/election-provider-multi-phase/src/mock.rs b/frame/election-provider-multi-phase/src/mock.rs
index f57836178d49..2fb7927d98f9 100644
--- a/frame/election-provider-multi-phase/src/mock.rs
+++ b/frame/election-provider-multi-phase/src/mock.rs
@@ -345,6 +345,7 @@ impl crate::Config for Runtime {
 	type BenchmarkingConfig = ();
 	type OnChainAccuracy = Perbill;
 	type Fallback = Fallback;
+	type ForceOrigin = frame_system::EnsureRoot<AccountId>;
 	type CompactSolution = TestCompact;
 }
 
diff --git a/frame/election-provider-multi-phase/src/unsigned.rs b/frame/election-provider-multi-phase/src/unsigned.rs
index ef1cdfd5a71c..78726c542078 100644
--- a/frame/election-provider-multi-phase/src/unsigned.rs
+++ b/frame/election-provider-multi-phase/src/unsigned.rs
@@ -199,7 +199,7 @@ impl<T: Config> Pallet<T> {
 	}
 
 	/// Mine a new solution as a call. Performs all checks.
-	fn mine_checked_call() -> Result<Call<T>, MinerError> {
+	pub fn mine_checked_call() -> Result<Call<T>, MinerError> {
 		let iters = Self::get_balancing_iters();
 		// get the solution, with a load of checks to ensure if submitted, IT IS ABSOLUTELY VALID.
 		let (raw_solution, witness) = Self::mine_and_check(iters)?;
@@ -227,7 +227,7 @@ impl<T: Config> Pallet<T> {
 	// perform basic checks of a solution's validity
 	//
 	// Performance: note that it internally clones the provided solution.
-	fn basic_checks(
+	pub fn basic_checks(
 		raw_solution: &RawSolution<CompactOf<T>>,
 		solution_type: &str,
 	) -> Result<(), MinerError> {
@@ -404,7 +404,7 @@ impl<T: Config> Pallet<T> {
 	///
 	/// Indeed, the score must be computed **after** this step. If this step reduces the score too
 	/// much or remove a winner, then the solution must be discarded **after** this step.
-	fn trim_assignments_weight(
+	pub fn trim_assignments_weight(
 		desired_targets: u32,
 		size: SolutionOrSnapshotSize,
 		max_weight: Weight,
@@ -438,7 +438,7 @@ impl<T: Config> Pallet<T> {
 	///
 	/// The score must be computed **after** this step. If this step reduces the score too much,
 	/// then the solution must be discarded.
-	pub(crate) fn trim_assignments_length(
+	pub fn trim_assignments_length(
 		max_allowed_length: u32,
 		assignments: &mut Vec<IndexAssignmentOf<T>>,
 		encoded_size_of: impl Fn(&[IndexAssignmentOf<T>]) -> Result<usize, sp_npos_elections::Error>,
@@ -579,7 +579,7 @@ impl<T: Config> Pallet<T> {
 	///
 	/// Returns `Ok(())` if offchain worker limit is respected, `Err(reason)` otherwise. If `Ok()`
 	/// is returned, `now` is written in storage and will be used in further calls as the baseline.
-	pub(crate) fn ensure_offchain_repeat_frequency(now: T::BlockNumber) -> Result<(), MinerError> {
+	pub fn ensure_offchain_repeat_frequency(now: T::BlockNumber) -> Result<(), MinerError> {
 		let threshold = T::OffchainRepeat::get();
 		let last_block = StorageValueRef::persistent(&OFFCHAIN_LAST_BLOCK);
 
@@ -619,7 +619,7 @@ impl<T: Config> Pallet<T> {
 	///
 	/// NOTE: Ideally, these tests should move more and more outside of this and more to the miner's
 	/// code, so that we do less and less storage reads here.
-	pub(crate) fn unsigned_pre_dispatch_checks(
+	pub fn unsigned_pre_dispatch_checks(
 		solution: &RawSolution<CompactOf<T>>,
 	) -> DispatchResult {
 		// ensure solution is timely. Don't panic yet. This is a cheap check.
diff --git a/frame/merkle-mountain-range/src/lib.rs b/frame/merkle-mountain-range/src/lib.rs
index 6992341f6bbd..a8e707c7ac4e 100644
--- a/frame/merkle-mountain-range/src/lib.rs
+++ b/frame/merkle-mountain-range/src/lib.rs
@@ -154,7 +154,7 @@ decl_storage! {
 decl_module! {
 	/// A public part of the pallet.
 	pub struct Module<T: Config<I>, I: Instance = DefaultInstance> for enum Call where origin: T::Origin {
-		fn on_initialize(n: T::BlockNumber) -> Weight {
+		fn on_initialize(_n: T::BlockNumber) -> Weight {
 			use primitives::LeafDataProvider;
 			let leaves = Self::mmr_leaves();
 			let peaks_before = mmr::utils::NodesUtils::new(leaves).number_of_peaks();

From de95ba50d10683d8aaaad351b6ce0cd3339c9f6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Wed, 26 May 2021 12:33:11 +0100
Subject: [PATCH 0785/1194] grandpa: enable light clients to participate in
 gossip (#8796)

* network: allow gossiping to light clients

* grandpa: gossip global messages to light clients

* grandpa: don't send neighbor packets to light clients

* grandpa: fix tests

* grandpa: export run_grandpa_observer

* node: run grandpa observer on light client

* node: start network at end

* Use wasm_timer in finality-grandpa

Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
---
 Cargo.lock                                    |   1 +
 bin/node-template/node/src/service.rs         |  25 +++-
 bin/node/cli/src/service.rs                   |  31 ++++-
 client/finality-grandpa/Cargo.toml            |   1 +
 .../src/communication/gossip.rs               | 119 ++++++++++++------
 .../src/communication/tests.rs                |   4 +-
 client/finality-grandpa/src/lib.rs            |  13 +-
 client/finality-grandpa/src/observer.rs       |   1 -
 client/finality-grandpa/src/tests.rs          |  20 +--
 client/finality-grandpa/src/until_imported.rs |   3 +-
 client/network-gossip/src/state_machine.rs    |   5 -
 client/network/src/config.rs                  |   5 +
 12 files changed, 157 insertions(+), 71 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e4ff69448b23..c3e69b4db11b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7470,6 +7470,7 @@ dependencies = [
  "substrate-test-runtime-client",
  "tempfile",
  "tokio 0.2.25",
+ "wasm-timer",
 ]
 
 [[package]]
diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
index 86b57f689e1e..ed0a0463353c 100644
--- a/bin/node-template/node/src/service.rs
+++ b/bin/node-template/node/src/service.rs
@@ -269,7 +269,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		name: Some(name),
 		observer_enabled: false,
 		keystore,
-		is_authority: role.is_authority(),
+		local_role: role,
 		telemetry: telemetry.as_ref().map(|x| x.handle()),
 	};
 
@@ -337,7 +337,7 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		on_demand.clone(),
 	));
 
-	let (grandpa_block_import, _) = sc_finality_grandpa::block_import(
+	let (grandpa_block_import, grandpa_link) = sc_finality_grandpa::block_import(
 		client.clone(),
 		&(client.clone() as Arc<_>),
 		select_chain.clone(),
@@ -387,6 +387,26 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		);
 	}
 
+	let enable_grandpa = !config.disable_grandpa;
+	if enable_grandpa {
+		let name = config.network.node_name.clone();
+
+		let config = sc_finality_grandpa::Config {
+			gossip_duration: std::time::Duration::from_millis(333),
+			justification_period: 512,
+			name: Some(name),
+			observer_enabled: false,
+			keystore: None,
+			local_role: config.role.clone(),
+			telemetry: telemetry.as_ref().map(|x| x.handle()),
+		};
+
+		task_manager.spawn_handle().spawn_blocking(
+			"grandpa-observer",
+			sc_finality_grandpa::run_grandpa_observer(config, grandpa_link, network.clone())?,
+		);
+	}
+
 	sc_service::spawn_tasks(sc_service::SpawnTasksParams {
 		remote_blockchain: Some(backend.remote_blockchain()),
 		transaction_pool,
@@ -404,6 +424,5 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
 	})?;
 
 	network_starter.start_network();
-
 	Ok(task_manager)
 }
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index a13f8be9af13..6781402c948e 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -381,7 +381,7 @@ pub fn new_full_base(
 		name: Some(name),
 		observer_enabled: false,
 		keystore,
-		is_authority: role.is_authority(),
+		local_role: role,
 		telemetry: telemetry.as_ref().map(|x| x.handle()),
 	};
 
@@ -478,7 +478,7 @@ pub fn new_light_base(
 		on_demand.clone(),
 	));
 
-	let (grandpa_block_import, _) = grandpa::block_import(
+	let (grandpa_block_import, grandpa_link) = grandpa::block_import(
 		client.clone(),
 		&(client.clone() as Arc<_>),
 		select_chain.clone(),
@@ -529,11 +529,33 @@ pub fn new_light_base(
 			on_demand: Some(on_demand.clone()),
 			block_announce_validator_builder: None,
 		})?;
-	network_starter.start_network();
+
+	let enable_grandpa = !config.disable_grandpa;
+	if enable_grandpa {
+		let name = config.network.node_name.clone();
+
+		let config = grandpa::Config {
+			gossip_duration: std::time::Duration::from_millis(333),
+			justification_period: 512,
+			name: Some(name),
+			observer_enabled: false,
+			keystore: None,
+			local_role: config.role.clone(),
+			telemetry: telemetry.as_ref().map(|x| x.handle()),
+		};
+
+		task_manager.spawn_handle().spawn_blocking(
+			"grandpa-observer",
+			grandpa::run_grandpa_observer(config, grandpa_link, network.clone())?,
+		);
+	}
 
 	if config.offchain_worker.enabled {
 		sc_service::build_offchain_workers(
-			&config, task_manager.spawn_handle(), client.clone(), network.clone(),
+			&config,
+			task_manager.spawn_handle(),
+			client.clone(),
+			network.clone(),
 		);
 	}
 
@@ -560,6 +582,7 @@ pub fn new_light_base(
 			telemetry: telemetry.as_mut(),
 		})?;
 
+	network_starter.start_network();
 	Ok((
 		task_manager,
 		rpc_handlers,
diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml
index 1f21f454491b..ea91460972c9 100644
--- a/client/finality-grandpa/Cargo.toml
+++ b/client/finality-grandpa/Cargo.toml
@@ -48,6 +48,7 @@ finality-grandpa = { version = "0.14.0", features = ["derive-codec"] }
 pin-project = "1.0.4"
 linked-hash-map = "0.5.2"
 async-trait = "0.1.42"
+wasm-timer = "0.2"
 
 [dev-dependencies]
 assert_matches = "1.3.0"
diff --git a/client/finality-grandpa/src/communication/gossip.rs b/client/finality-grandpa/src/communication/gossip.rs
index a6c51f7eeee7..878a630d0e51 100644
--- a/client/finality-grandpa/src/communication/gossip.rs
+++ b/client/finality-grandpa/src/communication/gossip.rs
@@ -100,7 +100,8 @@ use crate::{environment, CatchUp, CompactCommit, SignedMessage};
 use super::{cost, benefit, Round, SetId};
 
 use std::collections::{HashMap, VecDeque, HashSet};
-use std::time::{Duration, Instant};
+use std::time::Duration;
+use wasm_timer::Instant;
 
 const REBROADCAST_AFTER: Duration = Duration::from_secs(60 * 5);
 const CATCH_UP_REQUEST_TIMEOUT: Duration = Duration::from_secs(45);
@@ -494,10 +495,10 @@ impl<N: Ord> Peers<N> {
 		match role {
 			ObservedRole::Authority if self.lucky_authorities.len() < MIN_LUCKY => {
 				self.lucky_authorities.insert(who.clone());
-			},
-			ObservedRole::Full | ObservedRole::Light if self.lucky_peers.len() < MIN_LUCKY => {
+			}
+			ObservedRole::Full if self.lucky_peers.len() < MIN_LUCKY => {
 				self.lucky_peers.insert(who.clone());
-			},
+			}
 			_ => {}
 		}
 		self.inner.insert(who, PeerInfo::new(role));
@@ -562,27 +563,43 @@ impl<N: Ord> Peers<N> {
 		self.inner.get(who)
 	}
 
-	fn authorities(&self) -> usize {
-		self.inner.iter().filter(|(_, info)| matches!(info.roles, ObservedRole::Authority)).count()
+	fn connected_authorities(&self) -> usize {
+		self.inner
+			.iter()
+			.filter(|(_, info)| matches!(info.roles, ObservedRole::Authority))
+			.count()
 	}
 
-	fn non_authorities(&self) -> usize {
+	fn connected_full(&self) -> usize {
 		self.inner
 			.iter()
-			.filter(|(_, info)| matches!(info.roles, ObservedRole::Full | ObservedRole::Light))
+			.filter(|(_, info)| matches!(info.roles, ObservedRole::Full))
 			.count()
 	}
 
 	fn reshuffle(&mut self) {
-		let mut lucky_peers: Vec<_> = self.inner
+		let mut lucky_peers: Vec<_> = self
+			.inner
 			.iter()
-			.filter_map(|(id, info)|
-				if matches!(info.roles, ObservedRole::Full | ObservedRole::Light) { Some(id.clone()) } else { None })
+			.filter_map(|(id, info)| {
+				if matches!(info.roles, ObservedRole::Full) {
+					Some(id.clone())
+				} else {
+					None
+				}
+			})
 			.collect();
-		let mut lucky_authorities: Vec<_> = self.inner
+
+		let mut lucky_authorities: Vec<_> = self
+			.inner
 			.iter()
-			.filter_map(|(id, info)|
-				if matches!(info.roles, ObservedRole::Authority) { Some(id.clone()) } else { None })
+			.filter_map(|(id, info)| {
+				if matches!(info.roles, ObservedRole::Authority) {
+					Some(id.clone())
+				} else {
+					None
+				}
+			})
 			.collect();
 
 		let num_non_authorities = ((lucky_peers.len() as f32).sqrt() as usize)
@@ -662,10 +679,14 @@ impl CatchUpConfig {
 	fn request_allowed<N>(&self, peer: &PeerInfo<N>) -> bool {
 		match self {
 			CatchUpConfig::Disabled => false,
-			CatchUpConfig::Enabled { only_from_authorities, .. } => match peer.roles {
+			CatchUpConfig::Enabled {
+				only_from_authorities,
+				..
+			} => match peer.roles {
 				ObservedRole::Authority => true,
-				_ => !only_from_authorities
-			}
+				ObservedRole::Light => false,
+				ObservedRole::Full => !only_from_authorities,
+			},
 		}
 	}
 }
@@ -685,8 +706,12 @@ type MaybeMessage<Block> = Option<(Vec<PeerId>, NeighborPacket<NumberFor<Block>>
 
 impl<Block: BlockT> Inner<Block> {
 	fn new(config: crate::Config) -> Self {
-		let catch_up_config = if config.observer_enabled {
-			if config.is_authority {
+		let catch_up_config = if config.local_role.is_light() {
+			// if we are a light client we shouldn't be issuing any catch-up requests
+			// as we don't participate in the full GRANDPA protocol
+			CatchUpConfig::disabled()
+		} else if config.observer_enabled {
+			if config.local_role.is_authority() {
 				// since the observer protocol is enabled, we will only issue
 				// catch-up requests if we are an authority (and only to other
 				// authorities).
@@ -697,8 +722,8 @@ impl<Block: BlockT> Inner<Block> {
 				CatchUpConfig::disabled()
 			}
 		} else {
-			// if the observer protocol isn't enabled, then any full node should
-			// be able to answer catch-up requests.
+			// if the observer protocol isn't enabled and we're not a light client, then any full
+			// node should be able to answer catch-up requests.
 			CatchUpConfig::enabled(false)
 		};
 
@@ -1103,7 +1128,22 @@ impl<Block: BlockT> Inner<Block> {
 				commit_finalized_height: *local_view.last_commit_height().unwrap_or(&Zero::zero()),
 			};
 
-			let peers = self.peers.inner.keys().cloned().collect();
+			let peers = self
+				.peers
+				.inner
+				.iter()
+				.filter_map(|(id, info)| {
+					// light clients don't participate in the full GRANDPA voter protocol
+					// and therefore don't need to be informed about view updates
+					if info.roles.is_light() {
+						None
+					} else {
+						Some(id)
+					}
+				})
+				.cloned()
+				.collect();
+
 			(peers, packet)
 		})
 	}
@@ -1157,7 +1197,7 @@ impl<Block: BlockT> Inner<Block> {
 			None => return false,
 		};
 
-		if !self.config.is_authority
+		if !self.config.local_role.is_authority()
 			&& round_elapsed < round_duration * PROPAGATION_ALL
 		{
 			// non-authority nodes don't gossip any messages right away. we
@@ -1169,7 +1209,7 @@ impl<Block: BlockT> Inner<Block> {
 
 		match peer.roles {
 			ObservedRole::Authority => {
-				let authorities = self.peers.authorities();
+				let authorities = self.peers.connected_authorities();
 
 				// the target node is an authority, on the first round duration we start by
 				// sending the message to only `sqrt(authorities)` (if we're
@@ -1184,8 +1224,8 @@ impl<Block: BlockT> Inner<Block> {
 					// authorities for whom it is polite to do so
 					true
 				}
-			},
-			ObservedRole::Full | ObservedRole::Light => {
+			}
+			ObservedRole::Full => {
 				// the node is not an authority so we apply stricter filters
 				if round_elapsed >= round_duration * PROPAGATION_ALL {
 					// if we waited for 3 (or more) rounds
@@ -1197,7 +1237,12 @@ impl<Block: BlockT> Inner<Block> {
 				} else {
 					false
 				}
-			},
+			}
+			ObservedRole::Light => {
+				// we never gossip round messages to light clients as they don't
+				// participate in the full grandpa protocol
+				false
+			}
 		}
 	}
 
@@ -1224,7 +1269,7 @@ impl<Block: BlockT> Inner<Block> {
 
 		match peer.roles {
 			ObservedRole::Authority => {
-				let authorities = self.peers.authorities();
+				let authorities = self.peers.connected_authorities();
 
 				// the target node is an authority, on the first round duration we start by
 				// sending the message to only `sqrt(authorities)` (if we're
@@ -1239,9 +1284,9 @@ impl<Block: BlockT> Inner<Block> {
 					// authorities for whom it is polite to do so
 					true
 				}
-			},
+			}
 			ObservedRole::Full | ObservedRole::Light => {
-				let non_authorities = self.peers.non_authorities();
+				let non_authorities = self.peers.connected_full();
 
 				// the target node is not an authority, on the first and second
 				// round duration we start by sending the message to only
@@ -1638,6 +1683,7 @@ pub(super) struct PeerReport {
 mod tests {
 	use super::*;
 	use super::environment::SharedVoterSetState;
+	use sc_network::config::Role;
 	use sc_network_gossip::Validator as GossipValidatorT;
 	use sc_network_test::Block;
 	use sp_core::{crypto::Public, H256};
@@ -1649,7 +1695,7 @@ mod tests {
 			justification_period: 256,
 			keystore: None,
 			name: None,
-			is_authority: true,
+			local_role: Role::Authority,
 			observer_enabled: true,
 			telemetry: None,
 		}
@@ -2174,7 +2220,7 @@ mod tests {
 
 			// if the observer protocol is enabled and we are not an authority,
 			// then we don't issue any catch-up requests.
-			c.is_authority = false;
+			c.local_role = Role::Full;
 			c.observer_enabled = true;
 
 			c
@@ -2468,15 +2514,10 @@ mod tests {
 	fn non_authorities_never_gossip_messages_on_first_round_duration() {
 		let mut config = config();
 		config.gossip_duration = Duration::from_secs(300); // Set to high value to prevent test race
-		config.is_authority = false;
+		config.local_role = Role::Full;
 		let round_duration = config.gossip_duration * ROUND_DURATION;
 
-		let (val, _) = GossipValidator::<Block>::new(
-			config,
-			voter_set_state(),
-			None,
-			None,
-		);
+		let (val, _) = GossipValidator::<Block>::new(config, voter_set_state(), None, None);
 
 		// the validator start at set id 0
 		val.note_set(SetId(0), Vec::new(), |_, _| {});
diff --git a/client/finality-grandpa/src/communication/tests.rs b/client/finality-grandpa/src/communication/tests.rs
index bfc5b1d10a41..ec8c97dfe3e8 100644
--- a/client/finality-grandpa/src/communication/tests.rs
+++ b/client/finality-grandpa/src/communication/tests.rs
@@ -20,7 +20,7 @@
 
 use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use futures::prelude::*;
-use sc_network::{Event as NetworkEvent, ObservedRole, PeerId};
+use sc_network::{config::Role, Event as NetworkEvent, ObservedRole, PeerId};
 use sc_network_test::{Block, Hash};
 use sc_network_gossip::Validator;
 use std::sync::Arc;
@@ -137,7 +137,7 @@ fn config() -> crate::Config {
 		justification_period: 256,
 		keystore: None,
 		name: None,
-		is_authority: true,
+		local_role: Role::Authority,
 		observer_enabled: true,
 		telemetry: None,
 	}
diff --git a/client/finality-grandpa/src/lib.rs b/client/finality-grandpa/src/lib.rs
index 672b08d0b714..f249d3982cf2 100644
--- a/client/finality-grandpa/src/lib.rs
+++ b/client/finality-grandpa/src/lib.rs
@@ -123,10 +123,11 @@ mod voting_rule;
 
 pub use authorities::{AuthoritySet, AuthoritySetChanges, SharedAuthoritySet};
 pub use aux_schema::best_justification;
-pub use finality_proof::{FinalityProof, FinalityProofProvider, FinalityProofError};
-pub use notification::{GrandpaJustificationSender, GrandpaJustificationStream};
-pub use import::{find_scheduled_change, find_forced_change, GrandpaBlockImport};
+pub use finality_proof::{FinalityProof, FinalityProofError, FinalityProofProvider};
+pub use import::{find_forced_change, find_scheduled_change, GrandpaBlockImport};
 pub use justification::GrandpaJustification;
+pub use notification::{GrandpaJustificationSender, GrandpaJustificationStream};
+pub use observer::run_grandpa_observer;
 pub use voting_rule::{
 	BeforeBestBlockBy, ThreeQuartersOfTheUnfinalizedChain, VotingRule, VotingRuleResult,
 	VotingRulesBuilder,
@@ -134,9 +135,9 @@ pub use voting_rule::{
 pub use finality_grandpa::voter::report;
 
 use aux_schema::PersistentData;
+use communication::{Network as NetworkT, NetworkBridge};
 use environment::{Environment, VoterSetState};
 use until_imported::UntilGlobalMessageBlocksImported;
-use communication::{NetworkBridge, Network as NetworkT};
 use sp_finality_grandpa::{AuthorityList, AuthoritySignature, SetId};
 
 // Re-export these two because it's just so damn convenient.
@@ -265,8 +266,8 @@ pub struct Config {
 	/// protocol (we will only issue catch-up requests to authorities when the
 	/// observer protocol is enabled).
 	pub observer_enabled: bool,
-	/// Whether the node is running as an authority (i.e. running the full GRANDPA protocol).
-	pub is_authority: bool,
+	/// The role of the local node (i.e. authority, full-node or light).
+	pub local_role: sc_network::config::Role,
 	/// Some local identifier of the voter.
 	pub name: Option<String>,
 	/// The keystore that manages the keys of this node.
diff --git a/client/finality-grandpa/src/observer.rs b/client/finality-grandpa/src/observer.rs
index 827a7388d603..5434cd08a91d 100644
--- a/client/finality-grandpa/src/observer.rs
+++ b/client/finality-grandpa/src/observer.rs
@@ -156,7 +156,6 @@ where
 /// already been instantiated with `block_import`.
 /// NOTE: this is currently not part of the crate's public API since we don't consider
 /// it stable enough to use on a live network.
-#[allow(unused)]
 pub fn run_grandpa_observer<BE, Block: BlockT, Client, N, SC>(
 	config: Config,
 	link: LinkHalf<Block, Client, SC>,
diff --git a/client/finality-grandpa/src/tests.rs b/client/finality-grandpa/src/tests.rs
index fa4bd028bfe2..475c11191b10 100644
--- a/client/finality-grandpa/src/tests.rs
+++ b/client/finality-grandpa/src/tests.rs
@@ -25,7 +25,7 @@ use sc_network_test::{
 	Block, BlockImportAdapter, Hash, PassThroughVerifier, Peer, PeersClient, PeersFullClient,
 	TestClient, TestNetFactory, FullPeerConfig,
 };
-use sc_network::config::ProtocolConfig;
+use sc_network::config::{ProtocolConfig, Role};
 use parking_lot::{RwLock, Mutex};
 use futures_timer::Delay;
 use futures::executor::block_on;
@@ -277,7 +277,7 @@ fn initialize_grandpa(
 				justification_period: 32,
 				keystore: Some(keystore),
 				name: Some(format!("peer#{}", peer_id)),
-				is_authority: true,
+				local_role: Role::Authority,
 				observer_enabled: true,
 				telemetry: None,
 			},
@@ -421,7 +421,7 @@ fn finalize_3_voters_1_full_observer() {
 				justification_period: 32,
 				keystore: None,
 				name: Some(format!("peer#{}", peer_id)),
-				is_authority: true,
+				local_role: Role::Authority,
 				observer_enabled: true,
 				telemetry: None,
 			},
@@ -524,7 +524,7 @@ fn transition_3_voters_twice_1_full_observer() {
 				justification_period: 32,
 				keystore: Some(keystore),
 				name: Some(format!("peer#{}", peer_id)),
-				is_authority: true,
+				local_role: Role::Authority,
 				observer_enabled: true,
 				telemetry: None,
 			},
@@ -952,7 +952,7 @@ fn voter_persists_its_votes() {
 			justification_period: 32,
 			keystore: Some(bob_keystore.clone()),
 			name: Some(format!("peer#{}", 1)),
-			is_authority: true,
+			local_role: Role::Authority,
 			observer_enabled: true,
 			telemetry: None,
 		};
@@ -995,7 +995,7 @@ fn voter_persists_its_votes() {
 				justification_period: 32,
 				keystore: Some(keystore),
 				name: Some(format!("peer#{}", 0)),
-				is_authority: true,
+				local_role: Role::Authority,
 				observer_enabled: true,
 				telemetry: None,
 			},
@@ -1036,7 +1036,7 @@ fn voter_persists_its_votes() {
 				justification_period: 32,
 				keystore: Some(keystore),
 				name: Some(format!("peer#{}", 0)),
-				is_authority: true,
+				local_role: Role::Authority,
 				observer_enabled: true,
 				telemetry: None,
 			},
@@ -1196,7 +1196,7 @@ fn finalize_3_voters_1_light_observer() {
 			justification_period: 32,
 			keystore: None,
 			name: Some("observer".to_string()),
-			is_authority: false,
+			local_role: Role::Full,
 			observer_enabled: true,
 			telemetry: None,
 		},
@@ -1238,7 +1238,7 @@ fn voter_catches_up_to_latest_round_when_behind() {
 				justification_period: 32,
 				keystore,
 				name: Some(format!("peer#{}", peer_id)),
-				is_authority: true,
+				local_role: Role::Authority,
 				observer_enabled: true,
 				telemetry: None,
 			},
@@ -1361,7 +1361,7 @@ where
 		justification_period: 32,
 		keystore,
 		name: None,
-		is_authority: true,
+		local_role: Role::Authority,
 		observer_enabled: true,
 		telemetry: None,
 	};
diff --git a/client/finality-grandpa/src/until_imported.rs b/client/finality-grandpa/src/until_imported.rs
index bcde68d2fb33..d2e896685658 100644
--- a/client/finality-grandpa/src/until_imported.rs
+++ b/client/finality-grandpa/src/until_imported.rs
@@ -48,7 +48,8 @@ use std::collections::{HashMap, VecDeque};
 use std::pin::Pin;
 use std::sync::Arc;
 use std::task::{Context, Poll};
-use std::time::{Duration, Instant};
+use std::time::Duration;
+use wasm_timer::Instant;
 
 const LOG_PENDING_INTERVAL: Duration = Duration::from_secs(15);
 
diff --git a/client/network-gossip/src/state_machine.rs b/client/network-gossip/src/state_machine.rs
index 4c006f288f01..74f716133b47 100644
--- a/client/network-gossip/src/state_machine.rs
+++ b/client/network-gossip/src/state_machine.rs
@@ -197,11 +197,6 @@ impl<B: BlockT> ConsensusGossip<B> {
 
 	/// Handle new connected peer.
 	pub fn new_peer(&mut self, network: &mut dyn Network<B>, who: PeerId, role: ObservedRole) {
-		// light nodes are not valid targets for consensus gossip messages
-		if role.is_light() {
-			return;
-		}
-
 		tracing::trace!(
 			target:"gossip",
 			%who,
diff --git a/client/network/src/config.rs b/client/network/src/config.rs
index 77618f277114..a742d8c95274 100644
--- a/client/network/src/config.rs
+++ b/client/network/src/config.rs
@@ -141,6 +141,11 @@ impl Role {
 	pub fn is_authority(&self) -> bool {
 		matches!(self, Role::Authority { .. })
 	}
+
+	/// True for `Role::Light`
+	pub fn is_light(&self) -> bool {
+		matches!(self, Role::Light { .. })
+	}
 }
 
 impl fmt::Display for Role {

From 1f3a89090aecff1aa532c54e78d3fa4eec564b01 Mon Sep 17 00:00:00 2001
From: Denis Pisarev <denis.pisarev@parity.io>
Date: Wed, 26 May 2021 13:51:28 +0200
Subject: [PATCH 0786/1194] Revert "Fix stderr in new Rust nightly (#8904)"
 (#8910)

This reverts commit c46ffcc6882c58c8e9d76584712841cf94899e36.
---
 frame/support/test/tests/derive_no_bound_ui/eq.stderr     | 2 +-
 .../test/tests/ui/impl_incorrect_method_signature.stderr  | 4 ++--
 .../api/test/tests/ui/mock_only_self_reference.stderr     | 8 ++++----
 .../ui/type_reference_in_impl_runtime_apis_call.stderr    | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/frame/support/test/tests/derive_no_bound_ui/eq.stderr b/frame/support/test/tests/derive_no_bound_ui/eq.stderr
index fce13d6f17f0..36384178d469 100644
--- a/frame/support/test/tests/derive_no_bound_ui/eq.stderr
+++ b/frame/support/test/tests/derive_no_bound_ui/eq.stderr
@@ -7,6 +7,6 @@ error[E0277]: can't compare `Foo<T>` with `Foo<T>`
    ::: $RUST/core/src/cmp.rs
     |
     | pub trait Eq: PartialEq<Self> {
-    |               --------------- required by this bound in `std::cmp::Eq`
+    |               --------------- required by this bound in `Eq`
     |
     = help: the trait `PartialEq` is not implemented for `Foo<T>`
diff --git a/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr b/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr
index 6b00b7268672..fcda69533e3a 100644
--- a/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr
+++ b/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr
@@ -23,8 +23,8 @@ error[E0053]: method `Api_test_runtime_api_impl` has an incompatible type for tr
 17 |   sp_api::impl_runtime_apis! {
    |   ^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `u64`, found struct `std::string::String`
    |
-   = note: expected fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option<u64>, Vec<_>) -> Result<_, _>`
-              found fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option<std::string::String>, Vec<_>) -> Result<_, _>`
+   = note: expected fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option<u64>, Vec<_>) -> std::result::Result<_, _>`
+              found fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option<std::string::String>, Vec<_>) -> std::result::Result<_, _>`
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0308]: mismatched types
diff --git a/primitives/api/test/tests/ui/mock_only_self_reference.stderr b/primitives/api/test/tests/ui/mock_only_self_reference.stderr
index 83cfcf6ca1f9..73cf93610379 100644
--- a/primitives/api/test/tests/ui/mock_only_self_reference.stderr
+++ b/primitives/api/test/tests/ui/mock_only_self_reference.stderr
@@ -24,8 +24,8 @@ error[E0053]: method `Api_test_runtime_api_impl` has an incompatible type for tr
 12 |   sp_api::mock_impl_runtime_apis! {
    |   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `u64`, found `()`
    |
-   = note: expected fn pointer `fn(&MockApi, &BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, Extrinsic>>, ExecutionContext, Option<u64>, Vec<_>) -> Result<_, _>`
-              found fn pointer `fn(&MockApi, &BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, Extrinsic>>, ExecutionContext, Option<()>, Vec<_>) -> Result<_, _>`
+   = note: expected fn pointer `fn(&MockApi, &BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, Extrinsic>>, ExecutionContext, Option<u64>, Vec<_>) -> std::result::Result<_, _>`
+              found fn pointer `fn(&MockApi, &BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, Extrinsic>>, ExecutionContext, Option<()>, Vec<_>) -> std::result::Result<_, _>`
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0053]: method `Api_test2_runtime_api_impl` has an incompatible type for trait
@@ -42,6 +42,6 @@ error[E0053]: method `Api_test2_runtime_api_impl` has an incompatible type for t
 12 |   sp_api::mock_impl_runtime_apis! {
    |   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `u64`, found `()`
    |
-   = note: expected fn pointer `fn(&MockApi, &BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, Extrinsic>>, ExecutionContext, Option<u64>, Vec<_>) -> Result<_, _>`
-              found fn pointer `fn(&MockApi, &BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, Extrinsic>>, ExecutionContext, Option<()>, Vec<_>) -> Result<_, _>`
+   = note: expected fn pointer `fn(&MockApi, &BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, Extrinsic>>, ExecutionContext, Option<u64>, Vec<_>) -> std::result::Result<_, _>`
+              found fn pointer `fn(&MockApi, &BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, Extrinsic>>, ExecutionContext, Option<()>, Vec<_>) -> std::result::Result<_, _>`
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr b/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr
index 689723f8d750..71f12b415a2b 100644
--- a/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr
+++ b/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr
@@ -23,8 +23,8 @@ error[E0053]: method `Api_test_runtime_api_impl` has an incompatible type for tr
 17 |   sp_api::impl_runtime_apis! {
    |   ^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `u64`, found `&u64`
    |
-   = note: expected fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option<u64>, Vec<_>) -> Result<_, _>`
-              found fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option<&u64>, Vec<_>) -> Result<_, _>`
+   = note: expected fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option<u64>, Vec<_>) -> std::result::Result<_, _>`
+              found fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option<&u64>, Vec<_>) -> std::result::Result<_, _>`
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0308]: mismatched types

From 15731fec6d9e835e4f67b0399894672f4c81798e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= <jon.haggblad@gmail.com>
Date: Wed, 26 May 2021 18:26:15 +0200
Subject: [PATCH 0787/1194] Migrate pallet-grandpa to attribute macros (#8724)

* frame/grandpa: migrate Config

* frame/grandpa: migrate decl_module

* frame/grandpa: migrate decl_event

* frame/grandpa: migrate decl_error

* frame/grandpa: migrate decl_storage

* frame/grandpa: make report_equivocation_unsigned pub(super)

* frame/grandpa: remove unused imports

* frame/grandpa: replace deprecated Module with Pallet

* frame/grandpa: add RawEvent for compatibility

* frame/grandpa: create migration to new storage prefix

* frame/grandpa: bump version to 4.0.0

* frame/grandpa: address review comments

* Try using version 3.1 instead

* frame/grandpa: tweak log text to say cancelled
---
 Cargo.lock                             |   2 +-
 bin/node-template/runtime/Cargo.toml   |   2 +-
 bin/node/cli/Cargo.toml                |   2 +-
 bin/node/executor/Cargo.toml           |   2 +-
 bin/node/runtime/Cargo.toml            |   2 +-
 bin/node/testing/Cargo.toml            |   2 +-
 frame/grandpa/Cargo.toml               |   4 +-
 frame/grandpa/src/benchmarking.rs      |   2 +-
 frame/grandpa/src/equivocation.rs      |   4 +-
 frame/grandpa/src/lib.rs               | 483 ++++++++++++++-----------
 frame/grandpa/src/migrations.rs        |  19 +
 frame/grandpa/src/migrations/v3_1.rs   | 128 +++++++
 frame/grandpa/src/mock.rs              |   2 +-
 frame/offences/benchmarking/Cargo.toml |   2 +-
 14 files changed, 424 insertions(+), 232 deletions(-)
 create mode 100644 frame/grandpa/src/migrations.rs
 create mode 100644 frame/grandpa/src/migrations/v3_1.rs

diff --git a/Cargo.lock b/Cargo.lock
index c3e69b4db11b..5115bf4d42b8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5010,7 +5010,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-grandpa"
-version = "3.0.0"
+version = "3.1.0"
 dependencies = [
  "finality-grandpa",
  "frame-benchmarking",
diff --git a/bin/node-template/runtime/Cargo.toml b/bin/node-template/runtime/Cargo.toml
index 8f7d39f18bc4..6234f8958aad 100644
--- a/bin/node-template/runtime/Cargo.toml
+++ b/bin/node-template/runtime/Cargo.toml
@@ -16,7 +16,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
 pallet-aura = { version = "3.0.0", default-features = false, path = "../../../frame/aura" }
 pallet-balances = { version = "3.0.0", default-features = false, path = "../../../frame/balances" }
 frame-support = { version = "3.0.0", default-features = false, path = "../../../frame/support" }
-pallet-grandpa = { version = "3.0.0", default-features = false, path = "../../../frame/grandpa" }
+pallet-grandpa = { version = "3.1.0", default-features = false, path = "../../../frame/grandpa" }
 pallet-randomness-collective-flip = { version = "3.0.0", default-features = false, path = "../../../frame/randomness-collective-flip" }
 pallet-sudo = { version = "3.0.0", default-features = false, path = "../../../frame/sudo" }
 frame-system = { version = "3.0.0", default-features = false, path = "../../../frame/system" }
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index ccba896a2068..9fcd0875e8dc 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -89,7 +89,7 @@ frame-support = { version = "3.0.0", default-features = false, path = "../../../
 pallet-im-online = { version = "3.0.0", default-features = false, path = "../../../frame/im-online" }
 pallet-authority-discovery = { version = "3.0.0", path = "../../../frame/authority-discovery" }
 pallet-staking = { version = "3.0.0", path = "../../../frame/staking" }
-pallet-grandpa = { version = "3.0.0", path = "../../../frame/grandpa" }
+pallet-grandpa = { version = "3.1.0", path = "../../../frame/grandpa" }
 
 # node-specific dependencies
 node-runtime = { version = "2.0.0", path = "../runtime" }
diff --git a/bin/node/executor/Cargo.toml b/bin/node/executor/Cargo.toml
index 54a44d59c259..b08d1d78b4aa 100644
--- a/bin/node/executor/Cargo.toml
+++ b/bin/node/executor/Cargo.toml
@@ -31,7 +31,7 @@ frame-system = { version = "3.0.0", path = "../../../frame/system" }
 node-testing = { version = "2.0.0", path = "../testing" }
 pallet-balances = { version = "3.0.0", path = "../../../frame/balances" }
 pallet-contracts = { version = "3.0.0", path = "../../../frame/contracts" }
-pallet-grandpa = { version = "3.0.0", path = "../../../frame/grandpa" }
+pallet-grandpa = { version = "3.1.0", path = "../../../frame/grandpa" }
 pallet-im-online = { version = "3.0.0", path = "../../../frame/im-online" }
 pallet-indices = { version = "3.0.0", path = "../../../frame/indices" }
 pallet-session = { version = "3.0.0", path = "../../../frame/session" }
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index 862bb3baec7d..16189a23289f 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -59,7 +59,7 @@ pallet-democracy = { version = "3.0.0", default-features = false, path = "../../
 pallet-election-provider-multi-phase = { version = "3.0.0", default-features = false, path = "../../../frame/election-provider-multi-phase" }
 pallet-elections-phragmen = { version = "4.0.0", default-features = false, path = "../../../frame/elections-phragmen" }
 pallet-gilt = { version = "3.0.0", default-features = false, path = "../../../frame/gilt" }
-pallet-grandpa = { version = "3.0.0", default-features = false, path = "../../../frame/grandpa" }
+pallet-grandpa = { version = "3.1.0", default-features = false, path = "../../../frame/grandpa" }
 pallet-im-online = { version = "3.0.0", default-features = false, path = "../../../frame/im-online" }
 pallet-indices = { version = "3.0.0", default-features = false, path = "../../../frame/indices" }
 pallet-identity = { version = "3.0.0", default-features = false, path = "../../../frame/identity" }
diff --git a/bin/node/testing/Cargo.toml b/bin/node/testing/Cargo.toml
index 5ae277b35be2..706816ddae67 100644
--- a/bin/node/testing/Cargo.toml
+++ b/bin/node/testing/Cargo.toml
@@ -19,7 +19,7 @@ sc-client-db = { version = "0.9.0", path = "../../../client/db/", features = ["k
 sc-client-api = { version = "3.0.0", path = "../../../client/api/" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 pallet-contracts = { version = "3.0.0", path = "../../../frame/contracts" }
-pallet-grandpa = { version = "3.0.0", path = "../../../frame/grandpa" }
+pallet-grandpa = { version = "3.1.0", path = "../../../frame/grandpa" }
 pallet-indices = { version = "3.0.0", path = "../../../frame/indices" }
 sp-keyring = { version = "3.0.0", path = "../../../primitives/keyring" }
 node-executor = { version = "2.0.0", path = "../executor" }
diff --git a/frame/grandpa/Cargo.toml b/frame/grandpa/Cargo.toml
index a602e8b6dadd..c6cfa96f7da1 100644
--- a/frame/grandpa/Cargo.toml
+++ b/frame/grandpa/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-grandpa"
-version = "3.0.0"
+version = "3.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -17,6 +17,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
 sp-application-crypto = { version = "3.0.0", default-features = false, path = "../../primitives/application-crypto" }
 sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
 sp-finality-grandpa = { version = "3.0.0", default-features = false, path = "../../primitives/finality-grandpa" }
+sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
 sp-session = { version = "3.0.0", default-features = false, path = "../../primitives/session" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
@@ -31,7 +32,6 @@ log = { version = "0.4.14", default-features = false }
 [dev-dependencies]
 frame-benchmarking = { version = "3.1.0", path = "../benchmarking" }
 grandpa = { package = "finality-grandpa", version = "0.14.0", features = ["derive-codec"] }
-sp-io = { version = "3.0.0", path = "../../primitives/io" }
 sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
 pallet-balances = { version = "3.0.0", path = "../balances" }
 pallet-offences = { version = "3.0.0", path = "../offences" }
diff --git a/frame/grandpa/src/benchmarking.rs b/frame/grandpa/src/benchmarking.rs
index 5f08a5ea4bac..1bd65944f0a3 100644
--- a/frame/grandpa/src/benchmarking.rs
+++ b/frame/grandpa/src/benchmarking.rs
@@ -19,7 +19,7 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use super::{*, Module as Grandpa};
+use super::{*, Pallet as Grandpa};
 use frame_benchmarking::benchmarks;
 use frame_system::RawOrigin;
 use sp_core::H256;
diff --git a/frame/grandpa/src/equivocation.rs b/frame/grandpa/src/equivocation.rs
index 441311ebc542..24f56247d30e 100644
--- a/frame/grandpa/src/equivocation.rs
+++ b/frame/grandpa/src/equivocation.rs
@@ -54,7 +54,7 @@ use sp_staking::{
 	SessionIndex,
 };
 
-use super::{Call, Module, Config};
+use super::{Call, Pallet, Config};
 
 /// A trait with utility methods for handling equivocation reports in GRANDPA.
 /// The offence type is generic, and the trait provides , reporting an offence
@@ -203,7 +203,7 @@ pub struct GrandpaTimeSlot {
 /// A `ValidateUnsigned` implementation that restricts calls to `report_equivocation_unsigned`
 /// to local calls (i.e. extrinsics generated on this node) or that already in a block. This
 /// guarantees that only block authors can include unsigned equivocation reports.
-impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
+impl<T: Config> frame_support::unsigned::ValidateUnsigned for Pallet<T> {
 	type Call = Call<T>;
 	fn validate_unsigned(source: TransactionSource, call: &Self::Call) -> TransactionValidity {
 		if let Call::report_equivocation_unsigned(equivocation_proof, key_owner_proof) = call {
diff --git a/frame/grandpa/src/lib.rs b/frame/grandpa/src/lib.rs
index 6c78b2c8d01f..f6edb07ccc6b 100644
--- a/frame/grandpa/src/lib.rs
+++ b/frame/grandpa/src/lib.rs
@@ -40,10 +40,9 @@ use fg_primitives::{
 	GRANDPA_ENGINE_ID,
 };
 use frame_support::{
-	decl_error, decl_event, decl_module, decl_storage, dispatch::DispatchResultWithPostInfo,
-	storage, traits::{OneSessionHandler, KeyOwnerProofSystem}, weights::{Pays, Weight}, Parameter,
+	dispatch::DispatchResultWithPostInfo,
+	storage, traits::{OneSessionHandler, KeyOwnerProofSystem}, weights::{Pays, Weight},
 };
-use frame_system::{ensure_none, ensure_root, ensure_signed};
 use sp_runtime::{
 	generic::DigestItem,
 	traits::Zero,
@@ -54,6 +53,7 @@ use sp_staking::SessionIndex;
 
 mod equivocation;
 mod default_weights;
+pub mod migrations;
 
 #[cfg(any(feature = "runtime-benchmarks", test))]
 mod benchmarking;
@@ -67,165 +67,131 @@ pub use equivocation::{
 	HandleEquivocation,
 };
 
-pub trait Config: frame_system::Config {
-	/// The event type of this module.
-	type Event: From<Event> + Into<<Self as frame_system::Config>::Event>;
-
-	/// The function call.
-	type Call: From<Call<Self>>;
-
-	/// The proof of key ownership, used for validating equivocation reports.
-	/// The proof must include the session index and validator count of the
-	/// session at which the equivocation occurred.
-	type KeyOwnerProof: Parameter + GetSessionNumber + GetValidatorCount;
-
-	/// The identification of a key owner, used when reporting equivocations.
-	type KeyOwnerIdentification: Parameter;
-
-	/// A system for proving ownership of keys, i.e. that a given key was part
-	/// of a validator set, needed for validating equivocation reports.
-	type KeyOwnerProofSystem: KeyOwnerProofSystem<
-		(KeyTypeId, AuthorityId),
-		Proof = Self::KeyOwnerProof,
-		IdentificationTuple = Self::KeyOwnerIdentification,
-	>;
-
-	/// The equivocation handling subsystem, defines methods to report an
-	/// offence (after the equivocation has been validated) and for submitting a
-	/// transaction to report an equivocation (from an offchain context).
-	/// NOTE: when enabling equivocation handling (i.e. this type isn't set to
-	/// `()`) you must use this pallet's `ValidateUnsigned` in the runtime
-	/// definition.
-	type HandleEquivocation: HandleEquivocation<Self>;
-
-	/// Weights for this pallet.
-	type WeightInfo: WeightInfo;
-}
-
-pub trait WeightInfo {
-	fn report_equivocation(validator_count: u32) -> Weight;
-	fn note_stalled() -> Weight;
-}
-
-/// A stored pending change.
-#[derive(Encode, Decode)]
-pub struct StoredPendingChange<N> {
-	/// The block number this was scheduled at.
-	pub scheduled_at: N,
-	/// The delay in blocks until it will be applied.
-	pub delay: N,
-	/// The next authority set.
-	pub next_authorities: AuthorityList,
-	/// If defined it means the change was forced and the given block number
-	/// indicates the median last finalized block when the change was signaled.
-	pub forced: Option<N>,
-}
-
-/// Current state of the GRANDPA authority set. State transitions must happen in
-/// the same order of states defined below, e.g. `Paused` implies a prior
-/// `PendingPause`.
-#[derive(Decode, Encode)]
-#[cfg_attr(test, derive(Debug, PartialEq))]
-pub enum StoredState<N> {
-	/// The current authority set is live, and GRANDPA is enabled.
-	Live,
-	/// There is a pending pause event which will be enacted at the given block
-	/// height.
-	PendingPause {
-		/// Block at which the intention to pause was scheduled.
-		scheduled_at: N,
-		/// Number of blocks after which the change will be enacted.
-		delay: N
-	},
-	/// The current GRANDPA authority set is paused.
-	Paused,
-	/// There is a pending resume event which will be enacted at the given block
-	/// height.
-	PendingResume {
-		/// Block at which the intention to resume was scheduled.
-		scheduled_at: N,
-		/// Number of blocks after which the change will be enacted.
-		delay: N,
-	},
-}
-
-decl_event! {
-	pub enum Event {
-		/// New authority set has been applied. \[authority_set\]
-		NewAuthorities(AuthorityList),
-		/// Current authority set has been paused.
-		Paused,
-		/// Current authority set has been resumed.
-		Resumed,
+pub use pallet::*;
+
+#[frame_support::pallet]
+pub mod pallet {
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+	use super::*;
+
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(_);
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		/// The event type of this module.
+		type Event: From<Event>
+			+ Into<<Self as frame_system::Config>::Event>
+			+ IsType<<Self as frame_system::Config>::Event>;
+
+		/// The function call.
+		type Call: From<Call<Self>>;
+
+		/// The proof of key ownership, used for validating equivocation reports
+		/// The proof must include the session index and validator count of the
+		/// session at which the equivocation occurred.
+		type KeyOwnerProof: Parameter + GetSessionNumber + GetValidatorCount;
+
+		/// The identification of a key owner, used when reporting equivocations.
+		type KeyOwnerIdentification: Parameter;
+
+		/// A system for proving ownership of keys, i.e. that a given key was part
+		/// of a validator set, needed for validating equivocation reports.
+		type KeyOwnerProofSystem: KeyOwnerProofSystem<
+			(KeyTypeId, AuthorityId),
+			Proof = Self::KeyOwnerProof,
+			IdentificationTuple = Self::KeyOwnerIdentification,
+		>;
+
+		/// The equivocation handling subsystem, defines methods to report an
+		/// offence (after the equivocation has been validated) and for submitting a
+		/// transaction to report an equivocation (from an offchain context).
+		/// NOTE: when enabling equivocation handling (i.e. this type isn't set to
+		/// `()`) you must use this pallet's `ValidateUnsigned` in the runtime
+		/// definition.
+		type HandleEquivocation: HandleEquivocation<Self>;
+
+		/// Weights for this pallet.
+		type WeightInfo: WeightInfo;
 	}
-}
 
-decl_error! {
-	pub enum Error for Module<T: Config> {
-		/// Attempt to signal GRANDPA pause when the authority set isn't live
-		/// (either paused or already pending pause).
-		PauseFailed,
-		/// Attempt to signal GRANDPA resume when the authority set isn't paused
-		/// (either live or already pending resume).
-		ResumeFailed,
-		/// Attempt to signal GRANDPA change with one already pending.
-		ChangePending,
-		/// Cannot signal forced change so soon after last.
-		TooSoon,
-		/// A key ownership proof provided as part of an equivocation report is invalid.
-		InvalidKeyOwnershipProof,
-		/// An equivocation proof provided as part of an equivocation report is invalid.
-		InvalidEquivocationProof,
-		/// A given equivocation report is valid but already previously reported.
-		DuplicateOffenceReport,
-	}
-}
-
-decl_storage! {
-	trait Store for Module<T: Config> as GrandpaFinality {
-		/// State of the current authority set.
-		State get(fn state): StoredState<T::BlockNumber> = StoredState::Live;
-
-		/// Pending change: (signaled at, scheduled change).
-		PendingChange get(fn pending_change): Option<StoredPendingChange<T::BlockNumber>>;
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+		fn on_finalize(block_number: T::BlockNumber) {
+			// check for scheduled pending authority set changes
+			if let Some(pending_change) = <PendingChange<T>>::get() {
+				// emit signal if we're at the block that scheduled the change
+				if block_number == pending_change.scheduled_at {
+					if let Some(median) = pending_change.forced {
+						Self::deposit_log(ConsensusLog::ForcedChange(
+							median,
+							ScheduledChange {
+								delay: pending_change.delay,
+								next_authorities: pending_change.next_authorities.clone(),
+							}
+						))
+					} else {
+						Self::deposit_log(ConsensusLog::ScheduledChange(
+							ScheduledChange {
+								delay: pending_change.delay,
+								next_authorities: pending_change.next_authorities.clone(),
+							}
+						));
+					}
+				}
 
-		/// next block number where we can force a change.
-		NextForced get(fn next_forced): Option<T::BlockNumber>;
+				// enact the change if we've reached the enacting block
+				if block_number == pending_change.scheduled_at + pending_change.delay {
+					Self::set_grandpa_authorities(&pending_change.next_authorities);
+					Self::deposit_event(
+						Event::NewAuthorities(pending_change.next_authorities)
+					);
+					<PendingChange<T>>::kill();
+				}
+			}
 
-		/// `true` if we are currently stalled.
-		Stalled get(fn stalled): Option<(T::BlockNumber, T::BlockNumber)>;
+			// check for scheduled pending state changes
+			match <State<T>>::get() {
+				StoredState::PendingPause { scheduled_at, delay } => {
+					// signal change to pause
+					if block_number == scheduled_at {
+						Self::deposit_log(ConsensusLog::Pause(delay));
+					}
 
-		/// The number of changes (both in terms of keys and underlying economic responsibilities)
-		/// in the "set" of Grandpa validators from genesis.
-		CurrentSetId get(fn current_set_id) build(|_| fg_primitives::SetId::default()): SetId;
+					// enact change to paused state
+					if block_number == scheduled_at + delay {
+						<State<T>>::put(StoredState::Paused);
+						Self::deposit_event(Event::Paused);
+					}
+				},
+				StoredState::PendingResume { scheduled_at, delay } => {
+					// signal change to resume
+					if block_number == scheduled_at {
+						Self::deposit_log(ConsensusLog::Resume(delay));
+					}
 
-		/// A mapping from grandpa set ID to the index of the *most recent* session for which its
-		/// members were responsible.
-		///
-		/// TWOX-NOTE: `SetId` is not under user control.
-		SetIdSession get(fn session_for_set): map hasher(twox_64_concat) SetId => Option<SessionIndex>;
-	}
-	add_extra_genesis {
-		config(authorities): AuthorityList;
-		build(|config| {
-			Module::<T>::initialize(&config.authorities)
-		})
+					// enact change to live state
+					if block_number == scheduled_at + delay {
+						<State<T>>::put(StoredState::Live);
+						Self::deposit_event(Event::Resumed);
+					}
+				},
+				_ => {},
+			}
+		}
 	}
-}
-
-decl_module! {
-	pub struct Module<T: Config> for enum Call where origin: T::Origin {
-		type Error = Error<T>;
-
-		fn deposit_event() = default;
 
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
 		/// Report voter equivocation/misbehavior. This method will verify the
 		/// equivocation proof and validate the given key ownership proof
 		/// against the extracted offender. If both are valid, the offence
 		/// will be reported.
-		#[weight = T::WeightInfo::report_equivocation(key_owner_proof.validator_count())]
+		#[pallet::weight(T::WeightInfo::report_equivocation(key_owner_proof.validator_count()))]
 		fn report_equivocation(
-			origin,
+			origin: OriginFor<T>,
 			equivocation_proof: EquivocationProof<T::Hash, T::BlockNumber>,
 			key_owner_proof: T::KeyOwnerProof,
 		) -> DispatchResultWithPostInfo {
@@ -247,9 +213,9 @@ decl_module! {
 		/// block authors will call it (validated in `ValidateUnsigned`), as such
 		/// if the block author is defined it will be defined as the equivocation
 		/// reporter.
-		#[weight = T::WeightInfo::report_equivocation(key_owner_proof.validator_count())]
-		fn report_equivocation_unsigned(
-			origin,
+		#[pallet::weight(T::WeightInfo::report_equivocation(key_owner_proof.validator_count()))]
+		pub(super) fn report_equivocation_unsigned(
+			origin: OriginFor<T>,
 			equivocation_proof: EquivocationProof<T::Hash, T::BlockNumber>,
 			key_owner_proof: T::KeyOwnerProof,
 		) -> DispatchResultWithPostInfo {
@@ -269,83 +235,162 @@ decl_module! {
 		/// forced change will not be re-orged (e.g. 1000 blocks). The GRANDPA voters
 		/// will start the new authority set using the given finalized block as base.
 		/// Only callable by root.
-		#[weight = T::WeightInfo::note_stalled()]
+		#[pallet::weight(T::WeightInfo::note_stalled())]
 		fn note_stalled(
-			origin,
+			origin: OriginFor<T>,
 			delay: T::BlockNumber,
 			best_finalized_block_number: T::BlockNumber,
-		) {
+		) -> DispatchResultWithPostInfo {
 			ensure_root(origin)?;
 
-			Self::on_stalled(delay, best_finalized_block_number)
+			Ok(Self::on_stalled(delay, best_finalized_block_number).into())
 		}
+	}
 
-		fn on_finalize(block_number: T::BlockNumber) {
-			// check for scheduled pending authority set changes
-			if let Some(pending_change) = <PendingChange<T>>::get() {
-				// emit signal if we're at the block that scheduled the change
-				if block_number == pending_change.scheduled_at {
-					if let Some(median) = pending_change.forced {
-						Self::deposit_log(ConsensusLog::ForcedChange(
-							median,
-							ScheduledChange {
-								delay: pending_change.delay,
-								next_authorities: pending_change.next_authorities.clone(),
-							}
-						))
-					} else {
-						Self::deposit_log(ConsensusLog::ScheduledChange(
-							ScheduledChange {
-								delay: pending_change.delay,
-								next_authorities: pending_change.next_authorities.clone(),
-							}
-						));
-					}
-				}
+	#[pallet::event]
+	#[pallet::generate_deposit(fn deposit_event)]
+	pub enum Event {
+		/// New authority set has been applied. \[authority_set\]
+		NewAuthorities(AuthorityList),
+		/// Current authority set has been paused.
+		Paused,
+		/// Current authority set has been resumed.
+		Resumed,
+	}
 
-				// enact the change if we've reached the enacting block
-				if block_number == pending_change.scheduled_at + pending_change.delay {
-					Self::set_grandpa_authorities(&pending_change.next_authorities);
-					Self::deposit_event(
-						Event::NewAuthorities(pending_change.next_authorities)
-					);
-					<PendingChange<T>>::kill();
-				}
-			}
+	#[deprecated(note = "use `Event` instead")]
+	pub type RawEvent = Event;
 
-			// check for scheduled pending state changes
-			match <State<T>>::get() {
-				StoredState::PendingPause { scheduled_at, delay } => {
-					// signal change to pause
-					if block_number == scheduled_at {
-						Self::deposit_log(ConsensusLog::Pause(delay));
-					}
+	#[pallet::error]
+	pub enum Error<T> {
+		/// Attempt to signal GRANDPA pause when the authority set isn't live
+		/// (either paused or already pending pause).
+		PauseFailed,
+		/// Attempt to signal GRANDPA resume when the authority set isn't paused
+		/// (either live or already pending resume).
+		ResumeFailed,
+		/// Attempt to signal GRANDPA change with one already pending.
+		ChangePending,
+		/// Cannot signal forced change so soon after last.
+		TooSoon,
+		/// A key ownership proof provided as part of an equivocation report is invalid.
+		InvalidKeyOwnershipProof,
+		/// An equivocation proof provided as part of an equivocation report is invalid.
+		InvalidEquivocationProof,
+		/// A given equivocation report is valid but already previously reported.
+		DuplicateOffenceReport,
+	}
 
-					// enact change to paused state
-					if block_number == scheduled_at + delay {
-						<State<T>>::put(StoredState::Paused);
-						Self::deposit_event(Event::Paused);
-					}
-				},
-				StoredState::PendingResume { scheduled_at, delay } => {
-					// signal change to resume
-					if block_number == scheduled_at {
-						Self::deposit_log(ConsensusLog::Resume(delay));
-					}
+	#[pallet::type_value]
+	pub(super) fn DefaultForState<T: Config>() -> StoredState<T::BlockNumber> {
+		StoredState::Live
+	}
 
-					// enact change to live state
-					if block_number == scheduled_at + delay {
-						<State<T>>::put(StoredState::Live);
-						Self::deposit_event(Event::Resumed);
-					}
-				},
-				_ => {},
+	/// State of the current authority set.
+	#[pallet::storage]
+	#[pallet::getter(fn state)]
+	pub(super) type State<T: Config> = StorageValue<_, StoredState<T::BlockNumber>, ValueQuery, DefaultForState<T>>;
+
+	/// Pending change: (signaled at, scheduled change).
+	#[pallet::storage]
+	#[pallet::getter(fn pending_change)]
+	pub(super) type PendingChange<T: Config> = StorageValue<_, StoredPendingChange<T::BlockNumber>>;
+
+	/// next block number where we can force a change.
+	#[pallet::storage]
+	#[pallet::getter(fn next_forced)]
+	pub(super) type NextForced<T: Config> = StorageValue<_, T::BlockNumber>;
+
+	/// `true` if we are currently stalled.
+	#[pallet::storage]
+	#[pallet::getter(fn stalled)]
+	pub(super) type Stalled<T: Config> = StorageValue<_, (T::BlockNumber, T::BlockNumber)>;
+
+	/// The number of changes (both in terms of keys and underlying economic responsibilities)
+	/// in the "set" of Grandpa validators from genesis.
+	#[pallet::storage]
+	#[pallet::getter(fn current_set_id)]
+	pub(super) type CurrentSetId<T: Config> = StorageValue<_, SetId, ValueQuery>;
+
+	/// A mapping from grandpa set ID to the index of the *most recent* session for which its
+	/// members were responsible.
+	///
+	/// TWOX-NOTE: `SetId` is not under user control.
+	#[pallet::storage]
+	#[pallet::getter(fn session_for_set)]
+	pub(super) type SetIdSession<T: Config> = StorageMap<_, Twox64Concat, SetId, SessionIndex>;
+
+	#[pallet::genesis_config]
+	pub struct GenesisConfig {
+		pub authorities: AuthorityList,
+	}
+
+	#[cfg(feature = "std")]
+	impl Default for GenesisConfig {
+		fn default() -> Self {
+			Self {
+				authorities: Default::default(),
 			}
 		}
 	}
+
+	#[pallet::genesis_build]
+	impl<T: Config> GenesisBuild<T> for GenesisConfig {
+		fn build(&self) {
+			CurrentSetId::<T>::put(fg_primitives::SetId::default());
+			Pallet::<T>::initialize(&self.authorities)
+		}
+	}
+}
+
+pub trait WeightInfo {
+	fn report_equivocation(validator_count: u32) -> Weight;
+	fn note_stalled() -> Weight;
+}
+
+/// A stored pending change.
+#[derive(Encode, Decode)]
+pub struct StoredPendingChange<N> {
+	/// The block number this was scheduled at.
+	pub scheduled_at: N,
+	/// The delay in blocks until it will be applied.
+	pub delay: N,
+	/// The next authority set.
+	pub next_authorities: AuthorityList,
+	/// If defined it means the change was forced and the given block number
+	/// indicates the median last finalized block when the change was signaled.
+	pub forced: Option<N>,
+}
+
+/// Current state of the GRANDPA authority set. State transitions must happen in
+/// the same order of states defined below, e.g. `Paused` implies a prior
+/// `PendingPause`.
+#[derive(Decode, Encode)]
+#[cfg_attr(test, derive(Debug, PartialEq))]
+pub enum StoredState<N> {
+	/// The current authority set is live, and GRANDPA is enabled.
+	Live,
+	/// There is a pending pause event which will be enacted at the given block
+	/// height.
+	PendingPause {
+		/// Block at which the intention to pause was scheduled.
+		scheduled_at: N,
+		/// Number of blocks after which the change will be enacted.
+		delay: N
+	},
+	/// The current GRANDPA authority set is paused.
+	Paused,
+	/// There is a pending resume event which will be enacted at the given block
+	/// height.
+	PendingResume {
+		/// Block at which the intention to resume was scheduled.
+		scheduled_at: N,
+		/// Number of blocks after which the change will be enacted.
+		delay: N,
+	},
 }
 
-impl<T: Config> Module<T> {
+impl<T: Config> Pallet<T> {
 	/// Get the current set of authorities, along with their respective weights.
 	pub fn grandpa_authorities() -> AuthorityList {
 		storage::unhashed::get_or_default::<VersionedAuthorityList>(GRANDPA_AUTHORITIES_KEY).into()
@@ -455,7 +500,7 @@ impl<T: Config> Module<T> {
 		// NOTE: initialize first session of first set. this is necessary for
 		// the genesis set and session since we only update the set -> session
 		// mapping whenever a new session starts, i.e. through `on_new_session`.
-		SetIdSession::insert(0, 0);
+		SetIdSession::<T>::insert(0, 0);
 	}
 
 	fn do_report_equivocation(
@@ -548,11 +593,11 @@ impl<T: Config> Module<T> {
 	}
 }
 
-impl<T: Config> sp_runtime::BoundToRuntimeAppPublic for Module<T> {
+impl<T: Config> sp_runtime::BoundToRuntimeAppPublic for Pallet<T> {
 	type Public = AuthorityId;
 }
 
-impl<T: Config> OneSessionHandler<T::AccountId> for Module<T>
+impl<T: Config> OneSessionHandler<T::AccountId> for Pallet<T>
 	where T: pallet_session::Config
 {
 	type Key = AuthorityId;
@@ -580,7 +625,7 @@ impl<T: Config> OneSessionHandler<T::AccountId> for Module<T>
 			};
 
 			if res.is_ok() {
-				CurrentSetId::mutate(|s| {
+				CurrentSetId::<T>::mutate(|s| {
 					*s += 1;
 					*s
 				})
@@ -598,8 +643,8 @@ impl<T: Config> OneSessionHandler<T::AccountId> for Module<T>
 
 		// if we didn't issue a change, we update the mapping to note that the current
 		// set corresponds to the latest equivalent session (i.e. now).
-		let session_index = <pallet_session::Module<T>>::current_index();
-		SetIdSession::insert(current_set_id, &session_index);
+		let session_index = <pallet_session::Pallet<T>>::current_index();
+		SetIdSession::<T>::insert(current_set_id, &session_index);
 	}
 
 	fn on_disabled(i: usize) {
diff --git a/frame/grandpa/src/migrations.rs b/frame/grandpa/src/migrations.rs
new file mode 100644
index 000000000000..b0c8578c33e0
--- /dev/null
+++ b/frame/grandpa/src/migrations.rs
@@ -0,0 +1,19 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/// Version 3.1.
+pub mod v3_1;
diff --git a/frame/grandpa/src/migrations/v3_1.rs b/frame/grandpa/src/migrations/v3_1.rs
new file mode 100644
index 000000000000..fc626578098d
--- /dev/null
+++ b/frame/grandpa/src/migrations/v3_1.rs
@@ -0,0 +1,128 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use frame_support::{
+	weights::Weight,
+	traits::{GetPalletVersion, PalletVersion, Get},
+};
+use sp_io::hashing::twox_128;
+
+/// The old prefix.
+pub const OLD_PREFIX: &[u8] = b"GrandpaFinality";
+
+/// Migrate the entire storage of this pallet to a new prefix.
+///
+/// This new prefix must be the same as the one set in construct_runtime. For safety, use
+/// `PalletInfo` to get it, as:
+/// `<Runtime as frame_system::Config>::PalletInfo::name::<GrandpaPallet>`.
+///
+/// The old storage prefix, `GrandpaFinality` is hardcoded in the migration code.
+pub fn migrate<
+	T: frame_system::Config,
+	P: GetPalletVersion,
+	N: AsRef<str>,
+>(new_pallet_name: N) -> Weight {
+
+	if new_pallet_name.as_ref().as_bytes() == OLD_PREFIX {
+		log::info!(
+			target: "runtime::afg",
+			"New pallet name is equal to the old prefix. No migration needs to be done.",
+		);
+		return 0;
+	}
+	let maybe_storage_version = <P as GetPalletVersion>::storage_version();
+	log::info!(
+		target: "runtime::afg",
+		"Running migration to v3.1 for grandpa with storage version {:?}",
+		maybe_storage_version,
+	);
+
+	match maybe_storage_version {
+		Some(storage_version) if storage_version <= PalletVersion::new(3, 0, 0) => {
+			log::info!("new prefix: {}", new_pallet_name.as_ref());
+			frame_support::storage::migration::move_pallet(
+				OLD_PREFIX,
+				new_pallet_name.as_ref().as_bytes(),
+			);
+			<T as frame_system::Config>::BlockWeights::get().max_block
+		}
+		_ => {
+			log::warn!(
+				target: "runtime::afg",
+				"Attempted to apply migration to v3.1 but cancelled because storage version is {:?}",
+				maybe_storage_version,
+			);
+			0
+		},
+	}
+}
+
+/// Some checks prior to migration. This can be linked to
+/// [`frame_support::traits::OnRuntimeUpgrade::pre_upgrade`] for further testing.
+///
+/// Panics if anything goes wrong.
+pub fn pre_migration<
+	T: frame_system::Config,
+	P: GetPalletVersion + 'static,
+	N: AsRef<str>,
+>(new: N) {
+	let new = new.as_ref();
+	log::info!("pre-migration grandpa test with new = {}", new);
+
+	// the next key must exist, and start with the hash of `OLD_PREFIX`.
+	let next_key = sp_io::storage::next_key(&twox_128(OLD_PREFIX)).unwrap();
+	assert!(next_key.starts_with(&twox_128(OLD_PREFIX)));
+
+	// The pallet version is already stored using the pallet name
+	let storage_key = PalletVersion::storage_key::<T::PalletInfo, P>().unwrap();
+
+	// ensure nothing is stored in the new prefix.
+	assert!(
+		sp_io::storage::next_key(&twox_128(new.as_bytes())).map_or(
+			// either nothing is there
+			true,
+			// or we ensure that it has no common prefix with twox_128(new),
+			// or isn't the pallet version that is already stored using the pallet name
+			|next_key| {
+				!next_key.starts_with(&twox_128(new.as_bytes())) || next_key == storage_key
+			},
+		),
+		"unexpected next_key({}) = {:?}",
+		new,
+		sp_core::hexdisplay::HexDisplay::from(
+			&sp_io::storage::next_key(&twox_128(new.as_bytes())).unwrap()
+		),
+	);
+	// ensure storage version is 3.
+	assert!(<P as GetPalletVersion>::storage_version().unwrap().major == 3);
+}
+
+/// Some checks for after migration. This can be linked to
+/// [`frame_support::traits::OnRuntimeUpgrade::post_upgrade`] for further testing.
+///
+/// Panics if anything goes wrong.
+pub fn post_migration<P: GetPalletVersion>() {
+	log::info!("post-migration grandpa");
+
+	// Assert that nothing remains at the old prefix
+	assert!(
+		sp_io::storage::next_key(&twox_128(OLD_PREFIX)).map_or(
+			true,
+			|next_key| !next_key.starts_with(&twox_128(OLD_PREFIX))
+		)
+	);
+}
diff --git a/frame/grandpa/src/mock.rs b/frame/grandpa/src/mock.rs
index e26020b60034..1ab28f7752ef 100644
--- a/frame/grandpa/src/mock.rs
+++ b/frame/grandpa/src/mock.rs
@@ -64,7 +64,7 @@ frame_support::construct_runtime!(
 
 impl_opaque_keys! {
 	pub struct TestSessionKeys {
-		pub grandpa_authority: super::Module<Test>,
+		pub grandpa_authority: super::Pallet<Test>,
 	}
 }
 
diff --git a/frame/offences/benchmarking/Cargo.toml b/frame/offences/benchmarking/Cargo.toml
index 6c249ebcc61d..acfb5b1b0dc8 100644
--- a/frame/offences/benchmarking/Cargo.toml
+++ b/frame/offences/benchmarking/Cargo.toml
@@ -19,7 +19,7 @@ frame-support = { version = "3.0.0", default-features = false, path = "../../sup
 frame-system = { version = "3.0.0", default-features = false, path = "../../system" }
 pallet-babe = { version = "3.0.0", default-features = false, path = "../../babe" }
 pallet-balances = { version = "3.0.0", default-features = false, path = "../../balances" }
-pallet-grandpa = { version = "3.0.0", default-features = false, path = "../../grandpa" }
+pallet-grandpa = { version = "3.1.0", default-features = false, path = "../../grandpa" }
 pallet-im-online = { version = "3.0.0", default-features = false, path = "../../im-online" }
 pallet-offences = { version = "3.0.0", default-features = false, features = ["runtime-benchmarks"], path = "../../offences" }
 pallet-session = { version = "3.0.0", default-features = false, path = "../../session" }

From af69a8f8890dc4e411baa00fdbc9f9d35736cdf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20P=C3=A1nik?= <jakub.panik@gmail.com>
Date: Wed, 26 May 2021 19:47:56 +0100
Subject: [PATCH 0788/1194] Add Basilisk ss58 (#8882)

---
 primitives/core/src/crypto.rs |  2 ++
 ss58-registry.json            | 13 +++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index ba3eb4ff38c6..a53e633dc3c0 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -581,6 +581,8 @@ ss58_address_format!(
 		(69, "sora", "SORA Network, standard account (*25519).")
 	SocialAccount =>
 		(252, "social-network", "Social Network, standard account (*25519).")
+	BasiliskAccount =>
+		(10041, "basilisk", "Basilisk standard account (*25519).")
 
 	// Note: 16384 and above are reserved.
 );
diff --git a/ss58-registry.json b/ss58-registry.json
index 25086ae08aed..464b6a273e50 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -477,8 +477,8 @@
 			"decimals": [0,9,9,9,9,9,9,9],
 			"standardAccount": "*25519",
 			"website": "https://equilibrium.io"
-    },
-    {
+		},
+		{
 			"prefix": 69,
 			"network": "sora",
 			"displayName": "SORA Network",
@@ -495,6 +495,15 @@
 			"decimals": [18],
 			"standardAccount": "*25519",
 			"website": "https://social.network"
+		},
+		{
+			"prefix": 10041,
+			"network": "basilisk",
+			"displayName": "Basilisk",
+			"symbols": ["BSX"],
+			"decimals": [12],
+			"standardAccount": "*25519",
+			"website": "https://bsx.fi"
 		}
 	]
 }

From 69e2e0b536cea67f1c7a12c2b3709102ffa63d80 Mon Sep 17 00:00:00 2001
From: Shumo Chu <stechu@users.noreply.github.com>
Date: Wed, 26 May 2021 13:58:41 -0700
Subject: [PATCH 0789/1194] Manta Network ss58 address registration (#8706)

* manta network ss58 address registration

* minor
---
 primitives/core/src/crypto.rs |  4 ++++
 ss58-registry.json            | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index a53e633dc3c0..4d075dc6ff4f 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -579,6 +579,10 @@ ss58_address_format!(
 		(67, "equilibrium", "Equilibrium Network, standard account (*25519).")
 	SoraAccount =>
 		(69, "sora", "SORA Network, standard account (*25519).")
+	MantaAccount =>
+		(77, "manta", "Manta Network, standard account (*25519).")
+	CalamariAccount =>
+		(78, "calamari", "Manta Canary Network, standard account (*25519).")
 	SocialAccount =>
 		(252, "social-network", "Social Network, standard account (*25519).")
 	BasiliskAccount =>
diff --git a/ss58-registry.json b/ss58-registry.json
index 464b6a273e50..1fa01597f20f 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -487,6 +487,24 @@
 			"standardAccount": "*25519",
 			"website": "https://sora.org"
 		},
+		{
+			"prefix": 77,
+			"network": "manta",
+			"displayName": "Manta network",
+			"symbols": ["MA"],
+			"decimals": [12],
+			"standardAccount": "*25519",
+			"website": "https://manta.network"
+		},
+		{
+			"prefix": 78,
+			"network": "calamari",
+			"displayName": "Calamari: Manta Canary Network",
+			"symbols": ["KMA"],
+			"decimals": [12],
+			"standardAccount": "*25519",
+			"website": "https://manta.network"
+		},
 		{
 			"prefix": 252,
 			"network": "social-network",

From 25db73e7e44b1507c3dc8834e6219da20ba2fc50 Mon Sep 17 00:00:00 2001
From: Keith Yeung <kungfukeith11@gmail.com>
Date: Wed, 26 May 2021 16:22:35 -0700
Subject: [PATCH 0790/1194] Convert impl_key_prefix_for to proc macro (#8844)

* Convert impl_key_prefix_for to proc macro

* Reduce the number of let bindings

* Remove parsing of inputs for impl_key_prefix_for_tuples

* Replace unwrap with expect

* Remove unnecessary array of idents

* Use numeric identifiers

* Simplify ident generation

* Fix whitespacing

* Add documentation for impl_key_prefix_for_tuple proc macro

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
---
 frame/support/procedural/src/key_prefix.rs |  95 +++
 frame/support/procedural/src/lib.rs        |   8 +
 frame/support/src/storage/types/key.rs     | 735 +--------------------
 3 files changed, 105 insertions(+), 733 deletions(-)
 create mode 100644 frame/support/procedural/src/key_prefix.rs

diff --git a/frame/support/procedural/src/key_prefix.rs b/frame/support/procedural/src/key_prefix.rs
new file mode 100644
index 000000000000..17c310c2bcad
--- /dev/null
+++ b/frame/support/procedural/src/key_prefix.rs
@@ -0,0 +1,95 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use proc_macro2::{Span, TokenStream};
+use quote::{ToTokens, format_ident, quote};
+use syn::{Ident, Result};
+
+const MAX_IDENTS: usize = 18;
+
+pub fn impl_key_prefix_for_tuples(input: proc_macro::TokenStream) -> Result<TokenStream> {
+	if !input.is_empty() {
+		return Err(syn::Error::new(Span::call_site(), "No arguments expected"));
+	}
+
+	let mut all_trait_impls = TokenStream::new();
+
+	for i in 2..=MAX_IDENTS {
+		let current_tuple = (0..i)
+			.map(|n| Ident::new(&format!("Tuple{}", n), Span::call_site()))
+			.collect::<Vec<_>>();
+
+		for prefix_count in 1..i {
+			let (prefixes, suffixes) = current_tuple.split_at(prefix_count);
+
+			let hashers = current_tuple.iter().map(|ident| format_ident!("Hasher{}", ident)).collect::<Vec<_>>();
+			let kargs = prefixes.iter().map(|ident| format_ident!("KArg{}", ident)).collect::<Vec<_>>();
+			let partial_keygen = generate_keygen(prefixes);
+			let suffix_keygen = generate_keygen(suffixes);
+			let suffix_tuple = generate_tuple(suffixes);
+
+			let trait_impls = quote!{
+				impl<
+					#(#current_tuple: FullCodec,)*
+					#(#hashers: StorageHasher,)*
+					#(#kargs: EncodeLike<#prefixes>),*
+				> HasKeyPrefix<( #( #kargs, )* )> for ( #( Key<#hashers, #current_tuple>, )* ) {
+					type Suffix = #suffix_tuple;
+
+					fn partial_key(prefix: ( #( #kargs, )* )) -> Vec<u8> {
+						<#partial_keygen>::final_key(prefix)
+					}
+				}
+
+				impl<
+					#(#current_tuple: FullCodec,)*
+					#(#hashers: ReversibleStorageHasher,)*
+					#(#kargs: EncodeLike<#prefixes>),*
+				> HasReversibleKeyPrefix<( #( #kargs, )* )> for ( #( Key<#hashers, #current_tuple>, )* ) {
+					fn decode_partial_key(key_material: &[u8]) -> Result<Self::Suffix, codec::Error> {
+						<#suffix_keygen>::decode_final_key(key_material).map(|k| k.0)
+					}
+				}
+			};
+
+			all_trait_impls.extend(trait_impls);
+		}
+	}
+
+	Ok(all_trait_impls)
+}
+
+fn generate_tuple(idents: &[Ident]) -> TokenStream {
+	if idents.len() == 1 {
+		idents[0].to_token_stream()
+	} else {
+		quote!((#(#idents),*))
+	}
+}
+
+fn generate_keygen(idents: &[Ident]) -> TokenStream {
+	if idents.len() == 1 {
+		let key = &idents[0];
+		let hasher = format_ident!("Hasher{}", key);
+
+		quote!(Key<#hasher, #key>)
+	} else {
+		let hashers = idents.iter().map(|ident| format_ident!("Hasher{}", ident));
+
+		quote!((#(Key<#hashers, #idents>),*))
+	}
+}
diff --git a/frame/support/procedural/src/lib.rs b/frame/support/procedural/src/lib.rs
index 6b163ed5d79e..13b3f317e144 100644
--- a/frame/support/procedural/src/lib.rs
+++ b/frame/support/procedural/src/lib.rs
@@ -29,6 +29,7 @@ mod clone_no_bound;
 mod partial_eq_no_bound;
 mod default_no_bound;
 mod max_encoded_len;
+mod key_prefix;
 
 pub(crate) use storage::INHERENT_INSTANCE_NAME;
 use proc_macro::TokenStream;
@@ -451,3 +452,10 @@ pub(crate) const NUMBER_OF_INSTANCE: u8 = 16;
 pub fn derive_max_encoded_len(input: TokenStream) -> TokenStream {
 	max_encoded_len::derive_max_encoded_len(input)
 }
+
+/// This macro is meant to be used by frame-support only.
+/// It implements the trait `HasKeyPrefix` and `HasReversibleKeyPrefix` for tuple of `Key`.
+#[proc_macro]
+pub fn impl_key_prefix_for_tuples(input: TokenStream) -> TokenStream {
+	key_prefix::impl_key_prefix_for_tuples(input).unwrap_or_else(syn::Error::into_compile_error).into()
+}
diff --git a/frame/support/src/storage/types/key.rs b/frame/support/src/storage/types/key.rs
index 79fc33a24e83..a770d1b0fcea 100755
--- a/frame/support/src/storage/types/key.rs
+++ b/frame/support/src/storage/types/key.rs
@@ -246,7 +246,7 @@ impl ReversibleKeyGenerator for Tuple {
 	fn decode_final_key(key_material: &[u8]) -> Result<(Self::Key, &[u8]), codec::Error> {
 		let mut current_key_material = key_material;
 		Ok((
-			(for_tuples! {
+			(for_tuples!{
 				#({
 					let (key, material) = Tuple::decode_final_key(current_key_material)?;
 					current_key_material = material;
@@ -270,735 +270,4 @@ pub trait HasReversibleKeyPrefix<P>: ReversibleKeyGenerator + HasKeyPrefix<P> {
 	fn decode_partial_key(key_material: &[u8]) -> Result<Self::Suffix, codec::Error>;
 }
 
-macro_rules! impl_key_prefix_for {
-	(($($keygen:ident),+), ($($prefix:ident),+), ($($suffix:ident),+)) => {
-		paste! {
-			impl<
-				$($keygen: FullCodec,)+
-				$( [<$keygen $keygen>]: StorageHasher,)+
-				$( [<KArg $prefix>]: EncodeLike<$prefix> ),+
-			> HasKeyPrefix<($( [<KArg $prefix>] ),+)> for ($(Key<[<$keygen $keygen>], $keygen>),+) {
-				type Suffix = ($($suffix),+);
-
-				fn partial_key(prefix: ($( [<KArg $prefix>] ),+)) -> Vec<u8> {
-					<($(Key<[<$prefix $prefix>], $prefix>),+)>::final_key(prefix)
-				}
-			}
-
-			impl<
-				$($keygen: FullCodec,)+
-				$( [<$keygen $keygen>]: ReversibleStorageHasher,)+
-				$( [<KArg $prefix>]: EncodeLike<$prefix> ),+
-			> HasReversibleKeyPrefix<($( [<KArg $prefix>] ),+)> for
-				($(Key<[<$keygen $keygen>], $keygen>),+)
-			{
-				fn decode_partial_key(key_material: &[u8]) -> Result<Self::Suffix, codec::Error> {
-					<($(Key<[<$suffix $suffix>], $suffix>),+)>::decode_final_key(key_material).map(|k| k.0)
-				}
-			}
-		}
-	};
-	(($($keygen:ident),+), $prefix:ident, ($($suffix:ident),+)) => {
-		paste! {
-			impl<
-				$($keygen: FullCodec,)+
-				$( [<$keygen $keygen>]: StorageHasher,)+
-				[<KArg $prefix>]: EncodeLike<$prefix>
-			> HasKeyPrefix<( [<KArg $prefix>] ,)> for ($(Key<[<$keygen $keygen>], $keygen>),+) {
-				type Suffix = ($($suffix),+);
-
-				fn partial_key(prefix: ( [<KArg $prefix>] ,)) -> Vec<u8> {
-					<Key<[<$prefix $prefix>], $prefix>>::final_key(prefix)
-				}
-			}
-
-			impl<
-				$($keygen: FullCodec,)+
-				$( [<$keygen $keygen>]: ReversibleStorageHasher,)+
-				[<KArg $prefix>]: EncodeLike<$prefix>
-			> HasReversibleKeyPrefix<( [<KArg $prefix>] ,)> for
-				($(Key<[<$keygen $keygen>], $keygen>),+)
-			{
-				fn decode_partial_key(key_material: &[u8]) -> Result<Self::Suffix, codec::Error> {
-					<($(Key<[<$suffix $suffix>], $suffix>),+)>::decode_final_key(key_material).map(|k| k.0)
-				}
-			}
-		}
-	};
-	(($($keygen:ident),+), ($($prefix:ident),+), $suffix:ident) => {
-		paste! {
-			impl<
-				$($keygen: FullCodec,)+
-				$( [<$keygen $keygen>]: StorageHasher,)+
-				$( [<KArg $prefix>]: EncodeLike<$prefix>),+
-			> HasKeyPrefix<($( [<KArg $prefix>] ),+)> for ($(Key<[<$keygen $keygen>], $keygen>),+) {
-				type Suffix = $suffix;
-
-				fn partial_key(prefix: ($( [<KArg $prefix>] ),+)) -> Vec<u8> {
-					<($(Key<[<$prefix $prefix>], $prefix>),+)>::final_key(prefix)
-				}
-			}
-
-			impl<
-				$($keygen: FullCodec,)+
-				$( [<$keygen $keygen>]: ReversibleStorageHasher,)+
-				$( [<KArg $prefix>]: EncodeLike<$prefix> ),+
-			> HasReversibleKeyPrefix<($( [<KArg $prefix>] ),+)> for
-				($(Key<[<$keygen $keygen>], $keygen>),+)
-			{
-				fn decode_partial_key(key_material: &[u8]) -> Result<Self::Suffix, codec::Error> {
-					<Key<[<$suffix $suffix>], $suffix>>::decode_final_key(key_material).map(|k| k.0)
-				}
-			}
-		}
-	};
-}
-
-impl<A, B, X, Y, KArg> HasKeyPrefix<(KArg,)> for (Key<X, A>, Key<Y, B>)
-where
-	A: FullCodec,
-	B: FullCodec,
-	X: StorageHasher,
-	Y: StorageHasher,
-	KArg: EncodeLike<A>,
-{
-	type Suffix = B;
-
-	fn partial_key(prefix: (KArg,)) -> Vec<u8> {
-		<Key<X, A>>::final_key(prefix)
-	}
-}
-
-impl<A, B, X, Y, KArg> HasReversibleKeyPrefix<(KArg,)> for (Key<X, A>, Key<Y, B>)
-where
-	A: FullCodec,
-	B: FullCodec,
-	X: ReversibleStorageHasher,
-	Y: ReversibleStorageHasher,
-	KArg: EncodeLike<A>,
-{
-	fn decode_partial_key(key_material: &[u8]) -> Result<B, codec::Error> {
-		<Key<Y, B>>::decode_final_key(key_material).map(|k| k.0)
-	}
-}
-
-impl_key_prefix_for!((A, B, C), (A, B), C);
-impl_key_prefix_for!((A, B, C), A, (B, C));
-impl_key_prefix_for!((A, B, C, D), (A, B, C), D);
-impl_key_prefix_for!((A, B, C, D), (A, B), (C, D));
-impl_key_prefix_for!((A, B, C, D), A, (B, C, D));
-impl_key_prefix_for!((A, B, C, D, E), (A, B, C, D), E);
-impl_key_prefix_for!((A, B, C, D, E), (A, B, C), (D, E));
-impl_key_prefix_for!((A, B, C, D, E), (A, B), (C, D, E));
-impl_key_prefix_for!((A, B, C, D, E), A, (B, C, D, E));
-impl_key_prefix_for!((A, B, C, D, E, F), (A, B, C, D, E), F);
-impl_key_prefix_for!((A, B, C, D, E, F), (A, B, C, D), (E, F));
-impl_key_prefix_for!((A, B, C, D, E, F), (A, B, C), (D, E, F));
-impl_key_prefix_for!((A, B, C, D, E, F), (A, B), (C, D, E, F));
-impl_key_prefix_for!((A, B, C, D, E, F), A, (B, C, D, E, F));
-impl_key_prefix_for!((A, B, C, D, E, F, G), (A, B, C, D, E, F), G);
-impl_key_prefix_for!((A, B, C, D, E, F, G), (A, B, C, D, E), (F, G));
-impl_key_prefix_for!((A, B, C, D, E, F, G), (A, B, C, D), (E, F, G));
-impl_key_prefix_for!((A, B, C, D, E, F, G), (A, B, C), (D, E, F, G));
-impl_key_prefix_for!((A, B, C, D, E, F, G), (A, B), (C, D, E, F, G));
-impl_key_prefix_for!((A, B, C, D, E, F, G), A, (B, C, D, E, F, G));
-impl_key_prefix_for!((A, B, C, D, E, F, G, H), (A, B, C, D, E, F, G), H);
-impl_key_prefix_for!((A, B, C, D, E, F, G, H), (A, B, C, D, E, F), (G, H));
-impl_key_prefix_for!((A, B, C, D, E, F, G, H), (A, B, C, D, E), (F, G, H));
-impl_key_prefix_for!((A, B, C, D, E, F, G, H), (A, B, C, D), (E, F, G, H));
-impl_key_prefix_for!((A, B, C, D, E, F, G, H), (A, B, C), (D, E, F, G, H));
-impl_key_prefix_for!((A, B, C, D, E, F, G, H), (A, B), (C, D, E, F, G, H));
-impl_key_prefix_for!((A, B, C, D, E, F, G, H), A, (B, C, D, E, F, G, H));
-impl_key_prefix_for!((A, B, C, D, E, F, G, H, I), (A, B, C, D, E, F, G, H), I);
-impl_key_prefix_for!((A, B, C, D, E, F, G, H, I), (A, B, C, D, E, F, G), (H, I));
-impl_key_prefix_for!((A, B, C, D, E, F, G, H, I), (A, B, C, D, E, F), (G, H, I));
-impl_key_prefix_for!((A, B, C, D, E, F, G, H, I), (A, B, C, D, E), (F, G, H, I));
-impl_key_prefix_for!((A, B, C, D, E, F, G, H, I), (A, B, C, D), (E, F, G, H, I));
-impl_key_prefix_for!((A, B, C, D, E, F, G, H, I), (A, B, C), (D, E, F, G, H, I));
-impl_key_prefix_for!((A, B, C, D, E, F, G, H, I), (A, B), (C, D, E, F, G, H, I));
-impl_key_prefix_for!((A, B, C, D, E, F, G, H, I), A, (B, C, D, E, F, G, H, I));
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J),
-	(A, B, C, D, E, F, G, H, I),
-	J
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J),
-	(A, B, C, D, E, F, G, H),
-	(I, J)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J),
-	(A, B, C, D, E, F, G),
-	(H, I, J)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J),
-	(A, B, C, D, E, F),
-	(G, H, I, J)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J),
-	(A, B, C, D, E),
-	(F, G, H, I, J)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J),
-	(A, B, C, D),
-	(E, F, G, H, I, J)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J),
-	(A, B, C),
-	(D, E, F, G, H, I, J)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J),
-	(A, B),
-	(C, D, E, F, G, H, I, J)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J),
-	A,
-	(B, C, D, E, F, G, H, I, J)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K),
-	(A, B, C, D, E, F, G, H, I, J),
-	K
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K),
-	(A, B, C, D, E, F, G, H, I),
-	(J, K)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K),
-	(A, B, C, D, E, F, G, H),
-	(I, J, K)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K),
-	(A, B, C, D, E, F, G),
-	(H, I, J, K)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K),
-	(A, B, C, D, E, F),
-	(G, H, I, J, K)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K),
-	(A, B, C, D, E),
-	(F, G, H, I, J, K)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K),
-	(A, B, C, D),
-	(E, F, G, H, I, J, K)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K),
-	(A, B, C),
-	(D, E, F, G, H, I, J, K)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K),
-	(A, B),
-	(C, D, E, F, G, H, I, J, K)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K),
-	A,
-	(B, C, D, E, F, G, H, I, J, K)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L),
-	(A, B, C, D, E, F, G, H, I, J, K),
-	L
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L),
-	(A, B, C, D, E, F, G, H, I, J),
-	(K, L)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L),
-	(A, B, C, D, E, F, G, H, I),
-	(J, K, L)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L),
-	(A, B, C, D, E, F, G, H),
-	(I, J, K, L)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L),
-	(A, B, C, D, E, F, G),
-	(H, I, J, K, L)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L),
-	(A, B, C, D, E, F),
-	(G, H, I, J, K, L)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L),
-	(A, B, C, D, E),
-	(F, G, H, I, J, K, L)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L),
-	(A, B, C, D),
-	(E, F, G, H, I, J, K, L)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L),
-	(A, B, C),
-	(D, E, F, G, H, I, J, K, L)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L),
-	(A, B),
-	(C, D, E, F, G, H, I, J, K, L)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L),
-	A,
-	(B, C, D, E, F, G, H, I, J, K, L)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M),
-	(A, B, C, D, E, F, G, H, I, J, K, L),
-	M
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M),
-	(A, B, C, D, E, F, G, H, I, J, K),
-	(L, M)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M),
-	(A, B, C, D, E, F, G, H, I, J),
-	(K, L, M)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M),
-	(A, B, C, D, E, F, G, H, I),
-	(J, K, L, M)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M),
-	(A, B, C, D, E, F, G, H),
-	(I, J, K, L, M)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M),
-	(A, B, C, D, E, F, G),
-	(H, I, J, K, L, M)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M),
-	(A, B, C, D, E, F),
-	(G, H, I, J, K, L, M)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M),
-	(A, B, C, D, E),
-	(F, G, H, I, J, K, L, M)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M),
-	(A, B, C, D),
-	(E, F, G, H, I, J, K, L, M)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M),
-	(A, B, C),
-	(D, E, F, G, H, I, J, K, L, M)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M),
-	(A, B),
-	(C, D, E, F, G, H, I, J, K, L, M)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M),
-	A,
-	(B, C, D, E, F, G, H, I, J, K, L, M)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
-	(A, B, C, D, E, F, G, H, I, J, K, L, M),
-	N
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
-	(A, B, C, D, E, F, G, H, I, J, K, L),
-	(M, N)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
-	(A, B, C, D, E, F, G, H, I, J, K),
-	(L, M, N)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
-	(A, B, C, D, E, F, G, H, I, J),
-	(K, L, M, N)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
-	(A, B, C, D, E, F, G, H, I),
-	(J, K, L, M, N)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
-	(A, B, C, D, E, F, G, H),
-	(I, J, K, L, M, N)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
-	(A, B, C, D, E, F, G),
-	(H, I, J, K, L, M, N)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
-	(A, B, C, D, E, F),
-	(G, H, I, J, K, L, M, N)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
-	(A, B, C, D, E),
-	(F, G, H, I, J, K, L, M, N)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
-	(A, B, C, D),
-	(E, F, G, H, I, J, K, L, M, N)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
-	(A, B, C),
-	(D, E, F, G, H, I, J, K, L, M, N)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
-	(A, B),
-	(C, D, E, F, G, H, I, J, K, L, M, N)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
-	A,
-	(B, C, D, E, F, G, H, I, J, K, L, M, N)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
-	O
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
-	(A, B, C, D, E, F, G, H, I, J, K, L, M),
-	(N, O)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
-	(A, B, C, D, E, F, G, H, I, J, K, L),
-	(M, N, O)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
-	(A, B, C, D, E, F, G, H, I, J, K),
-	(L, M, N, O)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
-	(A, B, C, D, E, F, G, H, I, J),
-	(K, L, M, N, O)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
-	(A, B, C, D, E, F, G, H, I),
-	(J, K, L, M, N, O)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
-	(A, B, C, D, E, F, G, H),
-	(I, J, K, L, M, N, O)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
-	(A, B, C, D, E, F, G),
-	(H, I, J, K, L, M, N, O)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
-	(A, B, C, D, E, F),
-	(G, H, I, J, K, L, M, N, O)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
-	(A, B, C, D, E),
-	(F, G, H, I, J, K, L, M, N, O)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
-	(A, B, C, D),
-	(E, F, G, H, I, J, K, L, M, N, O)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
-	(A, B, C),
-	(D, E, F, G, H, I, J, K, L, M, N, O)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
-	(A, B),
-	(C, D, E, F, G, H, I, J, K, L, M, N, O)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
-	A,
-	(B, C, D, E, F, G, H, I, J, K, L, M, N, O)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
-	P
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
-	(O, P)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
-	(A, B, C, D, E, F, G, H, I, J, K, L, M),
-	(N, O, P)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
-	(A, B, C, D, E, F, G, H, I, J, K, L),
-	(M, N, O, P)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
-	(A, B, C, D, E, F, G, H, I, J, K),
-	(L, M, N, O, P)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
-	(A, B, C, D, E, F, G, H, I, J),
-	(K, L, M, N, O, P)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
-	(A, B, C, D, E, F, G, H, I),
-	(J, K, L, M, N, O, P)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
-	(A, B, C, D, E, F, G, H),
-	(I, J, K, L, M, N, O, P)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
-	(A, B, C, D, E, F, G),
-	(H, I, J, K, L, M, N, O, P)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
-	(A, B, C, D, E, F),
-	(G, H, I, J, K, L, M, N, O, P)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
-	(A, B, C, D, E),
-	(F, G, H, I, J, K, L, M, N, O, P)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
-	(A, B, C, D),
-	(E, F, G, H, I, J, K, L, M, N, O, P)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
-	(A, B, C),
-	(D, E, F, G, H, I, J, K, L, M, N, O, P)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
-	(A, B),
-	(C, D, E, F, G, H, I, J, K, L, M, N, O, P)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
-	A,
-	(B, C, D, E, F, G, H, I, J, K, L, M, N, O, P)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
-	Q
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
-	(P, Q)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
-	(O, P, Q)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
-	(A, B, C, D, E, F, G, H, I, J, K, L, M),
-	(N, O, P, Q)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
-	(A, B, C, D, E, F, G, H, I, J, K, L),
-	(M, N, O, P, Q)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
-	(A, B, C, D, E, F, G, H, I, J, K),
-	(L, M, N, O, P, Q)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
-	(A, B, C, D, E, F, G, H, I, J),
-	(K, L, M, N, O, P, Q)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
-	(A, B, C, D, E, F, G, H, I),
-	(J, K, L, M, N, O, P, Q)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
-	(A, B, C, D, E, F, G, H),
-	(I, J, K, L, M, N, O, P, Q)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
-	(A, B, C, D, E, F, G),
-	(H, I, J, K, L, M, N, O, P, Q)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
-	(A, B, C, D, E, F),
-	(G, H, I, J, K, L, M, N, O, P, Q)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
-	(A, B, C, D, E),
-	(F, G, H, I, J, K, L, M, N, O, P, Q)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
-	(A, B, C, D),
-	(E, F, G, H, I, J, K, L, M, N, O, P, Q)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
-	(A, B, C),
-	(D, E, F, G, H, I, J, K, L, M, N, O, P, Q)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
-	(A, B),
-	(C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
-	A,
-	(B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q),
-	R
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P),
-	(Q, R)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O),
-	(P, Q, R)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N),
-	(O, P, Q, R)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
-	(A, B, C, D, E, F, G, H, I, J, K, L, M),
-	(N, O, P, Q, R)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
-	(A, B, C, D, E, F, G, H, I, J, K, L),
-	(M, N, O, P, Q, R)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
-	(A, B, C, D, E, F, G, H, I, J, K),
-	(L, M, N, O, P, Q, R)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
-	(A, B, C, D, E, F, G, H, I, J),
-	(K, L, M, N, O, P, Q, R)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
-	(A, B, C, D, E, F, G, H, I),
-	(J, K, L, M, N, O, P, Q, R)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
-	(A, B, C, D, E, F, G, H),
-	(I, J, K, L, M, N, O, P, Q, R)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
-	(A, B, C, D, E, F, G),
-	(H, I, J, K, L, M, N, O, P, Q, R)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
-	(A, B, C, D, E, F),
-	(G, H, I, J, K, L, M, N, O, P, Q, R)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
-	(A, B, C, D, E),
-	(F, G, H, I, J, K, L, M, N, O, P, Q, R)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
-	(A, B, C, D),
-	(E, F, G, H, I, J, K, L, M, N, O, P, Q, R)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
-	(A, B, C),
-	(D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
-	(A, B),
-	(C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R)
-);
-impl_key_prefix_for!(
-	(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R),
-	A,
-	(B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R)
-);
+frame_support_procedural::impl_key_prefix_for_tuples!();

From 1cbf0e16832eca5e0733d65279872ce79ddfe9f2 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Thu, 27 May 2021 01:52:05 -0400
Subject: [PATCH 0791/1194] Fix Compiler Warnings (new rustc) (#8907)

* unused mmr

* more unused

* dyn in executor

* remove `doc(inline)`

* fix dyn for sp-api-test

* update benchmarks

* Update primitives/core/benches/bench.rs

* Update primitives/core/benches/bench.rs

* update another bench

* fix benchmark?

Co-authored-by: adoerr <0xad@gmx.net>
---
 bin/node/executor/benches/bench.rs         | 103 ++++++++++---------
 client/executor/src/wasm_runtime.rs        |   6 +-
 frame/support/src/lib.rs                   |   2 -
 frame/utility/src/tests.rs                 |   8 +-
 primitives/api/test/tests/decl_and_impl.rs |  12 +--
 primitives/core/benches/bench.rs           | 113 ++++++++++++++-------
 6 files changed, 144 insertions(+), 100 deletions(-)

diff --git a/bin/node/executor/benches/bench.rs b/bin/node/executor/benches/bench.rs
index 554e6c4af428..d21aedd1d184 100644
--- a/bin/node/executor/benches/bench.rs
+++ b/bin/node/executor/benches/bench.rs
@@ -139,7 +139,6 @@ fn construct_block<E: Externalities>(
 	(Block { header, extrinsics }.encode(), hash.into())
 }
 
-
 fn test_blocks(genesis_config: &GenesisConfig, executor: &NativeExecutor<Executor>)
 	-> Vec<(Vec<u8>, Hash)>
 {
@@ -147,7 +146,7 @@ fn test_blocks(genesis_config: &GenesisConfig, executor: &NativeExecutor<Executo
 	let mut block1_extrinsics = vec![
 		CheckedExtrinsic {
 			signed: None,
-			function: Call::Timestamp(pallet_timestamp::Call::set(42 * 1000)),
+			function: Call::Timestamp(pallet_timestamp::Call::set(0)),
 		},
 	];
 	block1_extrinsics.extend((0..20).map(|i| {
@@ -168,52 +167,56 @@ fn test_blocks(genesis_config: &GenesisConfig, executor: &NativeExecutor<Executo
 }
 
 fn bench_execute_block(c: &mut Criterion) {
-	c.bench_function_over_inputs(
-		"execute blocks",
-		|b, strategy| {
-			let genesis_config = node_testing::genesis::config(false, Some(compact_code_unwrap()));
-			let (use_native, wasm_method) = match strategy {
-				ExecutionMethod::Native => (true, WasmExecutionMethod::Interpreted),
-				ExecutionMethod::Wasm(wasm_method) => (false, *wasm_method),
-			};
-
-			let executor = NativeExecutor::new(wasm_method, None, 8);
-			let runtime_code = RuntimeCode {
-				code_fetcher: &sp_core::traits::WrappedRuntimeCode(compact_code_unwrap().into()),
-				hash: vec![1, 2, 3],
-				heap_pages: None,
-			};
-
-			// Get the runtime version to initialize the runtimes cache.
-			{
-				let mut test_ext = new_test_ext(&genesis_config);
-				executor.runtime_version(&mut test_ext.ext(), &runtime_code).unwrap();
-			}
-
-			let blocks = test_blocks(&genesis_config, &executor);
-
-			b.iter_batched_ref(
-				|| new_test_ext(&genesis_config),
-				|test_ext| {
-					for block in blocks.iter() {
-						executor.call::<NeverNativeValue, fn() -> _>(
-							&mut test_ext.ext(),
-							&runtime_code,
-							"Core_execute_block",
-							&block.0,
-							use_native,
-							None,
-						).0.unwrap();
-					}
-				},
-				BatchSize::LargeInput,
-			);
-		},
-		vec![
-			ExecutionMethod::Native,
-			ExecutionMethod::Wasm(WasmExecutionMethod::Interpreted),
-			#[cfg(feature = "wasmtime")]
-			ExecutionMethod::Wasm(WasmExecutionMethod::Compiled),
-		],
-	);
+	let mut group = c.benchmark_group("execute blocks");
+	let execution_methods = vec![
+		ExecutionMethod::Native,
+		ExecutionMethod::Wasm(WasmExecutionMethod::Interpreted),
+		#[cfg(feature = "wasmtime")]
+		ExecutionMethod::Wasm(WasmExecutionMethod::Compiled),
+	];
+
+	for strategy in execution_methods {
+		group.bench_function(
+			format!("{:?}", strategy),
+			|b| {
+				let genesis_config = node_testing::genesis::config(false, Some(compact_code_unwrap()));
+				let (use_native, wasm_method) = match strategy {
+					ExecutionMethod::Native => (true, WasmExecutionMethod::Interpreted),
+					ExecutionMethod::Wasm(wasm_method) => (false, wasm_method),
+				};
+
+				let executor = NativeExecutor::new(wasm_method, None, 8);
+				let runtime_code = RuntimeCode {
+					code_fetcher: &sp_core::traits::WrappedRuntimeCode(compact_code_unwrap().into()),
+					hash: vec![1, 2, 3],
+					heap_pages: None,
+				};
+
+				// Get the runtime version to initialize the runtimes cache.
+				{
+					let mut test_ext = new_test_ext(&genesis_config);
+					executor.runtime_version(&mut test_ext.ext(), &runtime_code).unwrap();
+				}
+
+				let blocks = test_blocks(&genesis_config, &executor);
+
+				b.iter_batched_ref(
+					|| new_test_ext(&genesis_config),
+					|test_ext| {
+						for block in blocks.iter() {
+							executor.call::<NeverNativeValue, fn() -> _>(
+								&mut test_ext.ext(),
+								&runtime_code,
+								"Core_execute_block",
+								&block.0,
+								use_native,
+								None,
+							).0.unwrap();
+						}
+					},
+					BatchSize::LargeInput,
+				);
+			},
+		);
+	}
 }
diff --git a/client/executor/src/wasm_runtime.rs b/client/executor/src/wasm_runtime.rs
index 23e88f944090..6c13150613d6 100644
--- a/client/executor/src/wasm_runtime.rs
+++ b/client/executor/src/wasm_runtime.rs
@@ -492,7 +492,7 @@ mod tests {
 			authoring_version: 1,
 			spec_version: 1,
 			impl_version: 1,
-			apis: sp_api::create_apis_vec!([(Core::<Block>::ID, 1)]),
+			apis: sp_api::create_apis_vec!([(<dyn Core::<Block>>::ID, 1)]),
 		};
 
 		let version = decode_version(&old_runtime_version.encode()).unwrap();
@@ -507,7 +507,7 @@ mod tests {
 			authoring_version: 1,
 			spec_version: 1,
 			impl_version: 1,
-			apis: sp_api::create_apis_vec!([(Core::<Block>::ID, 3)]),
+			apis: sp_api::create_apis_vec!([(<dyn Core::<Block>>::ID, 3)]),
 		};
 
 		decode_version(&old_runtime_version.encode()).unwrap_err();
@@ -521,7 +521,7 @@ mod tests {
 			authoring_version: 1,
 			spec_version: 1,
 			impl_version: 1,
-			apis: sp_api::create_apis_vec!([(Core::<Block>::ID, 3)]),
+			apis: sp_api::create_apis_vec!([(<dyn Core::<Block>>::ID, 3)]),
 			transaction_version: 3,
 		};
 
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 911373bfad45..edbc69df26b7 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -397,7 +397,6 @@ macro_rules! parameter_types {
 }
 
 #[cfg(not(feature = "std"))]
-#[doc(inline)]
 #[macro_export]
 macro_rules! parameter_types_impl_thread_local {
 	( $( $any:tt )* ) => {
@@ -406,7 +405,6 @@ macro_rules! parameter_types_impl_thread_local {
 }
 
 #[cfg(feature = "std")]
-#[doc(inline)]
 #[macro_export]
 macro_rules! parameter_types_impl_thread_local {
 	(
diff --git a/frame/utility/src/tests.rs b/frame/utility/src/tests.rs
index 1828418bd7fb..6d9db2f0c612 100644
--- a/frame/utility/src/tests.rs
+++ b/frame/utility/src/tests.rs
@@ -41,14 +41,14 @@ pub mod example {
 
 	decl_module! {
 		pub struct Module<T: Config> for enum Call where origin: <T as frame_system::Config>::Origin {
-			#[weight = *weight]
-			fn noop(_origin, weight: Weight) { }
+			#[weight = *_weight]
+			fn noop(_origin, _weight: Weight) { }
 
-			#[weight = *start_weight]
+			#[weight = *_start_weight]
 			fn foobar(
 				origin,
 				err: bool,
-				start_weight: Weight,
+				_start_weight: Weight,
 				end_weight: Option<Weight>,
 			) -> DispatchResultWithPostInfo {
 				let _ = ensure_signed(origin)?;
diff --git a/primitives/api/test/tests/decl_and_impl.rs b/primitives/api/test/tests/decl_and_impl.rs
index 1f7ccf2712d6..54fb37133f46 100644
--- a/primitives/api/test/tests/decl_and_impl.rs
+++ b/primitives/api/test/tests/decl_and_impl.rs
@@ -156,19 +156,19 @@ fn test_client_side_function_signature() {
 
 #[test]
 fn check_runtime_api_info() {
-	assert_eq!(&Api::<Block>::ID, &runtime_decl_for_Api::ID);
-	assert_eq!(Api::<Block>::VERSION, runtime_decl_for_Api::VERSION);
-	assert_eq!(Api::<Block>::VERSION, 1);
+	assert_eq!(&<dyn Api::<Block>>::ID, &runtime_decl_for_Api::ID);
+	assert_eq!(<dyn Api::<Block>>::VERSION, runtime_decl_for_Api::VERSION);
+	assert_eq!(<dyn Api::<Block>>::VERSION, 1);
 
 	assert_eq!(
-		ApiWithCustomVersion::<Block>::VERSION,
+		<dyn ApiWithCustomVersion::<Block>>::VERSION,
 		runtime_decl_for_ApiWithCustomVersion::VERSION,
 	);
 	assert_eq!(
-		&ApiWithCustomVersion::<Block>::ID,
+		&<dyn ApiWithCustomVersion::<Block>>::ID,
 		&runtime_decl_for_ApiWithCustomVersion::ID,
 	);
-	assert_eq!(ApiWithCustomVersion::<Block>::VERSION, 2);
+	assert_eq!(<dyn ApiWithCustomVersion::<Block>>::VERSION, 2);
 }
 
 fn check_runtime_api_versions_contains<T: RuntimeApiInfo + ?Sized>() {
diff --git a/primitives/core/benches/bench.rs b/primitives/core/benches/bench.rs
index d7c127320f56..77680d53be6c 100644
--- a/primitives/core/benches/bench.rs
+++ b/primitives/core/benches/bench.rs
@@ -12,13 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-
-
 #[macro_use]
 extern crate criterion;
 
-use criterion::{Criterion, black_box, Bencher, Fun};
-use std::time::Duration;
+use criterion::{Criterion, black_box, Bencher, BenchmarkId};
 use sp_core::crypto::Pair as _;
 use sp_core::hashing::{twox_128, blake2_128};
 
@@ -49,87 +46,133 @@ fn bench_twox_128(b: &mut Bencher, key: &Vec<u8>) {
 }
 
 fn bench_hash_128_fix_size(c: &mut Criterion) {
+	let mut group = c.benchmark_group("fix size hashing");
+
 	let key = get_key(MAX_KEY_SIZE);
-	let blake_fn = Fun::new("blake2_128", bench_blake2_128);
-	let twox_fn = Fun::new("twox_128", bench_twox_128);
-	let fns = vec![blake_fn, twox_fn];
 
-	c.bench_functions("fixed size hashing", fns, key);
+	group.bench_with_input("blake2_128", &key, bench_blake2_128);
+	group.bench_with_input("twox_128", &key, bench_twox_128);
+
+	group.finish();
 }
 
 fn bench_hash_128_dyn_size(c: &mut Criterion) {
-	let mut keys = Vec::new();
+	let mut group = c.benchmark_group("dyn size hashing");
+
 	for i in (2..MAX_KEY_SIZE).step_by(4) {
-		keys.push(get_key(i).clone())
+		let key = get_key(i);
+
+		group.bench_with_input(
+			BenchmarkId::new("blake2_128", format!("{}", i)),
+			&key,
+			bench_blake2_128,
+		);
+		group.bench_with_input(
+			BenchmarkId::new("twox_128", format!("{}", i)),
+			&key,
+			bench_twox_128,
+		);
 	}
 
-	c.bench_function_over_inputs("dyn size hashing - blake2", |b, key| bench_blake2_128(b, &key), keys.clone());
-	c.bench_function_over_inputs("dyn size hashing - twox", |b, key| bench_twox_128(b, &key), keys);
+	group.finish();
 }
 
 fn bench_ed25519(c: &mut Criterion) {
-	c.bench_function_over_inputs("signing - ed25519", |b, &msg_size| {
+	let mut group = c.benchmark_group("ed25519");
+
+	for msg_size in vec![32, 1024, 1024 * 1024] {
 		let msg = (0..msg_size)
 			.map(|_| rand::random::<u8>())
 			.collect::<Vec<_>>();
 		let key = sp_core::ed25519::Pair::generate().0;
-		b.iter(|| key.sign(&msg))
-	}, vec![32, 1024, 1024 * 1024]);
+		group.bench_function(
+			BenchmarkId::new("signing", format!("{}", msg_size)),
+			|b| b.iter(|| key.sign(&msg)),
+		);
+	}
 
-	c.bench_function_over_inputs("verifying - ed25519", |b, &msg_size| {
+	for msg_size in vec![32, 1024, 1024 * 1024] {
 		let msg = (0..msg_size)
 			.map(|_| rand::random::<u8>())
 			.collect::<Vec<_>>();
 		let key = sp_core::ed25519::Pair::generate().0;
 		let sig = key.sign(&msg);
 		let public = key.public();
-		b.iter(|| sp_core::ed25519::Pair::verify(&sig, &msg, &public))
-	}, vec![32, 1024, 1024 * 1024]);
+		group.bench_function(
+			BenchmarkId::new("verifying", format!("{}", msg_size)),
+			|b| b.iter(|| sp_core::ed25519::Pair::verify(&sig, &msg, &public)),
+		);
+	}
+
+	group.finish();
 }
 
 fn bench_sr25519(c: &mut Criterion) {
-	c.bench_function_over_inputs("signing - sr25519", |b, &msg_size| {
+	let mut group = c.benchmark_group("sr25519");
+
+	for msg_size in vec![32, 1024, 1024 * 1024] {
 		let msg = (0..msg_size)
 			.map(|_| rand::random::<u8>())
 			.collect::<Vec<_>>();
 		let key = sp_core::sr25519::Pair::generate().0;
-		b.iter(|| key.sign(&msg))
-	}, vec![32, 1024, 1024 * 1024]);
+		group.bench_function(
+			BenchmarkId::new("signing", format!("{}", msg_size)),
+			|b| b.iter(|| key.sign(&msg)),
+		);
+	}
 
-	c.bench_function_over_inputs("verifying - sr25519", |b, &msg_size| {
+	for msg_size in vec![32, 1024, 1024 * 1024] {
 		let msg = (0..msg_size)
 			.map(|_| rand::random::<u8>())
 			.collect::<Vec<_>>();
 		let key = sp_core::sr25519::Pair::generate().0;
 		let sig = key.sign(&msg);
 		let public = key.public();
-		b.iter(|| sp_core::sr25519::Pair::verify(&sig, &msg, &public))
-	}, vec![32, 1024, 1024 * 1024]);
+		group.bench_function(
+			BenchmarkId::new("verifying", format!("{}", msg_size)),
+			|b| b.iter(|| sp_core::sr25519::Pair::verify(&sig, &msg, &public)),
+		);
+	}
+
+	group.finish();
 }
 
 fn bench_ecdsa(c: &mut Criterion) {
-	c.bench_function_over_inputs("signing - ecdsa", |b, &msg_size| {
+	let mut group = c.benchmark_group("ecdsa");
+
+	for msg_size in vec![32, 1024, 1024 * 1024] {
 		let msg = (0..msg_size)
 			.map(|_| rand::random::<u8>())
 			.collect::<Vec<_>>();
 		let key = sp_core::ecdsa::Pair::generate().0;
-		b.iter(|| key.sign(&msg))
-	}, vec![32, 1024, 1024 * 1024]);
+		group.bench_function(
+			BenchmarkId::new("signing", format!("{}", msg_size)),
+			|b| b.iter(|| key.sign(&msg)),
+		);
+	}
 
-	c.bench_function_over_inputs("verifying - ecdsa", |b, &msg_size| {
+	for msg_size in vec![32, 1024, 1024 * 1024] {
 		let msg = (0..msg_size)
 			.map(|_| rand::random::<u8>())
 			.collect::<Vec<_>>();
 		let key = sp_core::ecdsa::Pair::generate().0;
 		let sig = key.sign(&msg);
 		let public = key.public();
-		b.iter(|| sp_core::ecdsa::Pair::verify(&sig, &msg, &public))
-	}, vec![32, 1024, 1024 * 1024]);
-}
+		group.bench_function(
+			BenchmarkId::new("verifying", format!("{}", msg_size)),
+			|b| b.iter(|| sp_core::ecdsa::Pair::verify(&sig, &msg, &public)),
+		);
+	}
 
-criterion_group!{
-	name = benches;
-	config = Criterion::default().warm_up_time(Duration::from_millis(500)).without_plots();
-	targets = bench_hash_128_fix_size, bench_hash_128_dyn_size, bench_ed25519, bench_sr25519, bench_ecdsa
+	group.finish();
 }
+
+criterion_group!(
+	benches,
+	bench_hash_128_fix_size,
+	bench_hash_128_dyn_size,
+	bench_ed25519,
+	bench_sr25519,
+	bench_ecdsa,
+);
 criterion_main!(benches);

From 14fcad989c168e34c494ac752a7f40ff8f627dcc Mon Sep 17 00:00:00 2001
From: Roman Proskuryakov <humbug@deeptown.org>
Date: Thu, 27 May 2021 12:54:37 +0000
Subject: [PATCH 0792/1194] Remove: (#8748)

* `NetworkStatusSinks`
* `sc_service::SpawnTasksParams::network_status_sinks`

Also:
* `sc_service::build_network()` does not return `network_status_sinks`
---
 Cargo.lock                            |  2 +-
 bin/node-template/node/src/service.rs |  6 +--
 bin/node/cli/src/service.rs           |  9 ++---
 client/informant/Cargo.toml           |  2 +-
 client/informant/src/lib.rs           | 31 ++++++++------
 client/network/src/service.rs         | 49 ++++++++++++++++++++++
 client/service/src/builder.rs         | 14 ++-----
 client/service/src/lib.rs             | 54 +------------------------
 client/service/src/metrics.rs         | 58 +++++++--------------------
 test-utils/test-runner/src/node.rs    |  3 +-
 10 files changed, 96 insertions(+), 132 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5115bf4d42b8..39ec3e8c26b1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7535,6 +7535,7 @@ version = "0.9.0"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.13",
+ "futures-timer 3.0.2",
  "log",
  "parity-util-mem",
  "sc-client-api",
@@ -7542,7 +7543,6 @@ dependencies = [
  "sp-blockchain",
  "sp-runtime",
  "sp-transaction-pool",
- "sp-utils",
  "wasm-timer",
 ]
 
diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
index ed0a0463353c..f50490410076 100644
--- a/bin/node-template/node/src/service.rs
+++ b/bin/node-template/node/src/service.rs
@@ -149,7 +149,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 
 	config.network.extra_sets.push(sc_finality_grandpa::grandpa_peers_set_config());
 
-	let (network, network_status_sinks, system_rpc_tx, network_starter) =
+	let (network, system_rpc_tx, network_starter) =
 		sc_service::build_network(sc_service::BuildNetworkParams {
 			config: &config,
 			client: client.clone(),
@@ -199,7 +199,6 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 			on_demand: None,
 			remote_blockchain: None,
 			backend,
-			network_status_sinks,
 			system_rpc_tx,
 			config,
 			telemetry: telemetry.as_mut(),
@@ -370,7 +369,7 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		},
 	)?;
 
-	let (network, network_status_sinks, system_rpc_tx, network_starter) =
+	let (network, system_rpc_tx, network_starter) =
 		sc_service::build_network(sc_service::BuildNetworkParams {
 			config: &config,
 			client: client.clone(),
@@ -418,7 +417,6 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		keystore: keystore_container.sync_keystore(),
 		backend,
 		network,
-		network_status_sinks,
 		system_rpc_tx,
 		telemetry: telemetry.as_mut(),
 	})?;
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index 6781402c948e..42020e6668e4 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -204,7 +204,6 @@ pub struct NewFullBase {
 	pub task_manager: TaskManager,
 	pub client: Arc<FullClient>,
 	pub network: Arc<NetworkService<Block, <Block as BlockT>::Hash>>,
-	pub network_status_sinks: sc_service::NetworkStatusSinks<Block>,
 	pub transaction_pool: Arc<sc_transaction_pool::FullPool<Block, FullClient>>,
 }
 
@@ -242,7 +241,7 @@ pub fn new_full_base(
 		)
 	);
 
-	let (network, network_status_sinks, system_rpc_tx, network_starter) =
+	let (network, system_rpc_tx, network_starter) =
 		sc_service::build_network(sc_service::BuildNetworkParams {
 			config: &config,
 			client: client.clone(),
@@ -279,7 +278,6 @@ pub fn new_full_base(
 			task_manager: &mut task_manager,
 			on_demand: None,
 			remote_blockchain: None,
-			network_status_sinks: network_status_sinks.clone(),
 			system_rpc_tx,
 			telemetry: telemetry.as_mut(),
 		},
@@ -415,7 +413,6 @@ pub fn new_full_base(
 		task_manager,
 		client,
 		network,
-		network_status_sinks,
 		transaction_pool,
 	})
 }
@@ -519,7 +516,7 @@ pub fn new_light_base(
 		telemetry.as_ref().map(|x| x.handle()),
 	)?;
 
-	let (network, network_status_sinks, system_rpc_tx, network_starter) =
+	let (network, system_rpc_tx, network_starter) =
 		sc_service::build_network(sc_service::BuildNetworkParams {
 			config: &config,
 			client: client.clone(),
@@ -576,7 +573,7 @@ pub fn new_light_base(
 			client: client.clone(),
 			transaction_pool: transaction_pool.clone(),
 			keystore: keystore_container.sync_keystore(),
-			config, backend, network_status_sinks, system_rpc_tx,
+			config, backend, system_rpc_tx,
 			network: network.clone(),
 			task_manager: &mut task_manager,
 			telemetry: telemetry.as_mut(),
diff --git a/client/informant/Cargo.toml b/client/informant/Cargo.toml
index d552a123c378..139a5ce19a00 100644
--- a/client/informant/Cargo.toml
+++ b/client/informant/Cargo.toml
@@ -15,12 +15,12 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 ansi_term = "0.12.1"
 futures = "0.3.9"
+futures-timer = "3.0.1"
 log = "0.4.8"
 parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
 sc-client-api = { version = "3.0.0", path = "../api" }
 sc-network = { version = "0.9.0", path = "../network" }
 sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
 sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
-sp-utils = { version = "3.0.0", path = "../../primitives/utils" }
 sp-transaction-pool = { version = "3.0.0", path = "../../primitives/transaction-pool" }
 wasm-timer = "0.2"
diff --git a/client/informant/src/lib.rs b/client/informant/src/lib.rs
index c955834c0f11..ef1533fb49f7 100644
--- a/client/informant/src/lib.rs
+++ b/client/informant/src/lib.rs
@@ -20,18 +20,23 @@
 
 use ansi_term::Colour;
 use futures::prelude::*;
+use futures_timer::Delay;
 use log::{info, trace, warn};
 use parity_util_mem::MallocSizeOf;
 use sc_client_api::{BlockchainEvents, UsageProvider};
-use sc_network::NetworkStatus;
+use sc_network::NetworkService;
 use sp_blockchain::HeaderMetadata;
 use sp_runtime::traits::{Block as BlockT, Header};
 use sp_transaction_pool::TransactionPool;
-use sp_utils::{status_sinks, mpsc::tracing_unbounded};
 use std::{fmt::Display, sync::Arc, time::Duration, collections::VecDeque};
 
 mod display;
 
+/// Creates a stream that returns a new value every `duration`.
+fn interval(duration: Duration) -> impl Stream<Item = ()> + Unpin {
+	futures::stream::unfold((), move |_| Delay::new(duration).map(|_| Some(((), ())))).map(drop)
+}
+
 /// The format to print telemetry output in.
 #[derive(Clone, Debug)]
 pub struct OutputFormat {
@@ -64,12 +69,12 @@ impl<T: TransactionPool> TransactionPoolAndMaybeMallogSizeOf for T {}
 impl<T: TransactionPool + MallocSizeOf> TransactionPoolAndMaybeMallogSizeOf for T {}
 
 /// Builds the informant and returns a `Future` that drives the informant.
-pub fn build<B: BlockT, C>(
+pub async fn build<B: BlockT, C>(
 	client: Arc<C>,
-	network_status_sinks: Arc<status_sinks::StatusSinks<NetworkStatus<B>>>,
+	network: Arc<NetworkService<B, <B as BlockT>::Hash>>,
 	pool: Arc<impl TransactionPoolAndMaybeMallogSizeOf>,
 	format: OutputFormat,
-) -> impl futures::Future<Output = ()>
+)
 where
 	C: UsageProvider<B> + HeaderMetadata<B> + BlockchainEvents<B>,
 	<C as HeaderMetadata<B>>::Error: Display,
@@ -77,10 +82,12 @@ where
 	let mut display = display::InformantDisplay::new(format.clone());
 
 	let client_1 = client.clone();
-	let (network_status_sink, network_status_stream) = tracing_unbounded("mpsc_network_status");
-	network_status_sinks.push(Duration::from_millis(5000), network_status_sink);
 
-	let display_notifications = network_status_stream
+	let display_notifications = interval(Duration::from_millis(5000))
+		.filter_map(|_| async {
+			let status = network.status().await;
+			status.ok()
+		})
 		.for_each(move |net_status| {
 			let info = client_1.usage_info();
 			if let Some(ref usage) = info.usage {
@@ -101,10 +108,10 @@ where
 			future::ready(())
 		});
 
-	future::join(
-		display_notifications,
-		display_block_import(client),
-	).map(|_| ())
+	futures::select! {
+		() = display_notifications.fuse() => (),
+		() = display_block_import(client).fuse() => (),
+	};
 }
 
 fn display_block_import<B: BlockT, C>(client: Arc<C>) -> impl Future<Output = ()>
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 9bcde11e4b0d..5dc550254fcd 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -888,6 +888,43 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 		});
 	}
 
+	/// High-level network status information.
+	///
+	/// Returns an error if the `NetworkWorker` is no longer running.
+	pub async fn status(&self) -> Result<NetworkStatus<B>, ()> {
+		let (tx, rx) = oneshot::channel();
+
+		let _ = self.to_worker.unbounded_send(ServiceToWorkerMsg::NetworkStatus {
+			pending_response: tx,
+		});
+
+		match rx.await {
+			Ok(v) => v.map_err(|_| ()),
+			// The channel can only be closed if the network worker no longer exists.
+			Err(_) => Err(()),
+		}
+	}
+
+	/// Get network state.
+	///
+	/// **Note**: Use this only for debugging. This API is unstable. There are warnings literally
+	/// everywhere about this. Please don't use this function to retrieve actual information.
+	///
+	/// Returns an error if the `NetworkWorker` is no longer running.
+	pub async fn network_state(&self) -> Result<NetworkState, ()> {
+		let (tx, rx) = oneshot::channel();
+
+		let _ = self.to_worker.unbounded_send(ServiceToWorkerMsg::NetworkState {
+			pending_response: tx,
+		});
+
+		match rx.await {
+			Ok(v) => v.map_err(|_| ()),
+			// The channel can only be closed if the network worker no longer exists.
+			Err(_) => Err(()),
+		}
+	}
+
 	/// You may call this when new transactons are imported by the transaction pool.
 	///
 	/// All transactions will be fetched from the `TransactionPool` that was passed at
@@ -1307,6 +1344,12 @@ enum ServiceToWorkerMsg<B: BlockT, H: ExHashT> {
 		pending_response: oneshot::Sender<Result<Vec<u8>, RequestFailure>>,
 		connect: IfDisconnected,
 	},
+	NetworkStatus {
+		pending_response: oneshot::Sender<Result<NetworkStatus<B>, RequestFailure>>,
+	},
+	NetworkState {
+		pending_response: oneshot::Sender<Result<NetworkState, RequestFailure>>,
+	},
 	DisconnectPeer(PeerId, Cow<'static, str>),
 	NewBestBlockImported(B::Hash, NumberFor<B>),
 }
@@ -1434,6 +1477,12 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 				ServiceToWorkerMsg::Request { target, protocol, request, pending_response, connect } => {
 					this.network_service.behaviour_mut().send_request(&target, &protocol, request, pending_response, connect);
 				},
+				ServiceToWorkerMsg::NetworkStatus { pending_response } => {
+					let _ = pending_response.send(Ok(this.status()));
+				},
+				ServiceToWorkerMsg::NetworkState { pending_response } => {
+					let _ = pending_response.send(Ok(this.network_state()));
+				},
 				ServiceToWorkerMsg::DisconnectPeer(who, protocol_name) =>
 					this.network_service.behaviour_mut().user_protocol_mut().disconnect_peer(&who, &protocol_name),
 				ServiceToWorkerMsg::NewBestBlockImported(hash, number) =>
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index 45652524d432..ba566252742e 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -17,7 +17,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{
-	error::Error, MallocSizeOfWasm, RpcHandlers, NetworkStatusSinks,
+	error::Error, MallocSizeOfWasm, RpcHandlers,
 	start_rpc_servers, build_network_future, TransactionPoolAdapter, TaskManager, SpawnTaskHandle,
 	metrics::MetricsService,
 	client::{light, Client, ClientConfig},
@@ -519,8 +519,6 @@ pub struct SpawnTasksParams<'a, TBl: BlockT, TCl, TExPool, TRpc, Backend> {
 	pub remote_blockchain: Option<Arc<dyn RemoteBlockchain<TBl>>>,
 	/// A shared network instance.
 	pub network: Arc<NetworkService<TBl, <TBl as BlockT>::Hash>>,
-	/// Sinks to propagate network status updates.
-	pub network_status_sinks: NetworkStatusSinks<TBl>,
 	/// A Sender for RPC requests.
 	pub system_rpc_tx: TracingUnboundedSender<sc_rpc::system::Request<TBl>>,
 	/// Telemetry instance for this node.
@@ -590,7 +588,6 @@ pub fn spawn_tasks<TBl, TBackend, TExPool, TRpc, TCl>(
 		rpc_extensions_builder,
 		remote_blockchain,
 		network,
-		network_status_sinks,
 		system_rpc_tx,
 		telemetry,
 	} = params;
@@ -654,7 +651,7 @@ pub fn spawn_tasks<TBl, TBackend, TExPool, TRpc, TCl>(
 		metrics_service.run(
 			client.clone(),
 			transaction_pool.clone(),
-			network_status_sinks.clone()
+			network.clone(),
 		)
 	);
 
@@ -679,7 +676,7 @@ pub fn spawn_tasks<TBl, TBackend, TExPool, TRpc, TCl>(
 	// Spawn informant task
 	spawn_handle.spawn("informant", sc_informant::build(
 		client.clone(),
-		network_status_sinks.status.clone(),
+		network.clone(),
 		transaction_pool.clone(),
 		config.informant_output_format,
 	));
@@ -865,7 +862,6 @@ pub fn build_network<TBl, TExPool, TImpQu, TCl>(
 ) -> Result<
 	(
 		Arc<NetworkService<TBl, <TBl as BlockT>::Hash>>,
-		NetworkStatusSinks<TBl>,
 		TracingUnboundedSender<sc_rpc::system::Request<TBl>>,
 		NetworkStarter,
 	),
@@ -959,7 +955,6 @@ pub fn build_network<TBl, TExPool, TImpQu, TCl>(
 	let has_bootnodes = !network_params.network_config.boot_nodes.is_empty();
 	let network_mut = sc_network::NetworkWorker::new(network_params)?;
 	let network = network_mut.service().clone();
-	let network_status_sinks = NetworkStatusSinks::new();
 
 	let (system_rpc_tx, system_rpc_rx) = tracing_unbounded("mpsc_system_rpc");
 
@@ -967,7 +962,6 @@ pub fn build_network<TBl, TExPool, TImpQu, TCl>(
 		config.role.clone(),
 		network_mut,
 		client,
-		network_status_sinks.clone(),
 		system_rpc_rx,
 		has_bootnodes,
 		config.announce_block,
@@ -1010,7 +1004,7 @@ pub fn build_network<TBl, TExPool, TImpQu, TCl>(
 		future.await
 	});
 
-	Ok((network, network_status_sinks, system_rpc_tx, NetworkStarter(network_start_tx)))
+	Ok((network, system_rpc_tx, NetworkStarter(network_start_tx)))
 }
 
 /// Object used to start the network.
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index 0e47b775e4a4..ae2cfbc8b894 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -37,17 +37,16 @@ mod task_manager;
 use std::{io, pin::Pin};
 use std::net::SocketAddr;
 use std::collections::HashMap;
-use std::time::Duration;
 use std::task::Poll;
 
 use futures::{Future, FutureExt, Stream, StreamExt, stream, compat::*};
-use sc_network::{NetworkStatus, network_state::NetworkState, PeerId};
+use sc_network::PeerId;
 use log::{warn, debug, error};
 use codec::{Encode, Decode};
 use sp_runtime::generic::BlockId;
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT};
 use parity_util_mem::MallocSizeOf;
-use sp_utils::{status_sinks, mpsc::{tracing_unbounded, TracingUnboundedReceiver}};
+use sp_utils::mpsc::TracingUnboundedReceiver;
 
 pub use self::error::Error;
 pub use self::builder::{
@@ -124,42 +123,6 @@ impl RpcHandlers {
 	}
 }
 
-/// Sinks to propagate network status updates.
-/// For each element, every time the `Interval` fires we push an element on the sender.
-#[derive(Clone)]
-pub struct NetworkStatusSinks<Block: BlockT> {
-	status: Arc<status_sinks::StatusSinks<NetworkStatus<Block>>>,
-	state: Arc<status_sinks::StatusSinks<NetworkState>>,
-}
-
-impl<Block: BlockT> NetworkStatusSinks<Block> {
-	fn new() -> Self {
-		Self {
-			status: Arc::new(status_sinks::StatusSinks::new()),
-			state: Arc::new(status_sinks::StatusSinks::new()),
-		}
-	}
-
-	/// Returns a receiver that periodically yields a [`NetworkStatus`].
-	pub fn status_stream(&self, interval: Duration)
-		-> TracingUnboundedReceiver<NetworkStatus<Block>>
-	{
-		let (sink, stream) = tracing_unbounded("mpsc_network_status");
-		self.status.push(interval, sink);
-		stream
-	}
-
-	/// Returns a receiver that periodically yields a [`NetworkState`].
-	pub fn state_stream(&self, interval: Duration)
-		-> TracingUnboundedReceiver<NetworkState>
-	{
-		let (sink, stream) = tracing_unbounded("mpsc_network_state");
-		self.state.push(interval, sink);
-		stream
-	}
-
-}
-
 /// An incomplete set of chain components, but enough to run the chain ops subcommands.
 pub struct PartialComponents<Client, Backend, SelectChain, ImportQueue, TransactionPool, Other> {
 	/// A shared client instance.
@@ -191,7 +154,6 @@ async fn build_network_future<
 	role: Role,
 	mut network: sc_network::NetworkWorker<B, H>,
 	client: Arc<C>,
-	status_sinks: NetworkStatusSinks<B>,
 	mut rpc_rx: TracingUnboundedReceiver<sc_rpc::system::Request<B>>,
 	should_have_peers: bool,
 	announce_imported_blocks: bool,
@@ -335,18 +297,6 @@ async fn build_network_future<
 			// used in the future to perform actions in response of things that happened on
 			// the network.
 			_ = (&mut network).fuse() => {}
-
-			// At a regular interval, we send high-level status as well as
-			// detailed state information of the network on what are called
-			// "status sinks".
-
-			status_sink = status_sinks.status.next().fuse() => {
-				status_sink.send(network.status());
-			}
-
-			state_sink = status_sinks.state.next().fuse() => {
-				state_sink.send(network.network_state());
-			}
 		}
 	}
 }
diff --git a/client/service/src/metrics.rs b/client/service/src/metrics.rs
index 43e5b8eaaded..516fb243557c 100644
--- a/client/service/src/metrics.rs
+++ b/client/service/src/metrics.rs
@@ -18,7 +18,7 @@
 
 use std::{convert::TryFrom, time::SystemTime};
 
-use crate::{NetworkStatus, NetworkState, NetworkStatusSinks, config::Configuration};
+use crate::config::Configuration;
 use futures_timer::Delay;
 use prometheus_endpoint::{register, Gauge, U64, Registry, PrometheusError, Opts, GaugeVec};
 use sc_telemetry::{telemetry, TelemetryHandle, SUBSTRATE_INFO};
@@ -26,9 +26,8 @@ use sp_api::ProvideRuntimeApi;
 use sp_runtime::traits::{NumberFor, Block, SaturatedConversion, UniqueSaturatedInto};
 use sp_transaction_pool::{PoolStatus, MaintainedTransactionPool};
 use sp_utils::metrics::register_globals;
-use sp_utils::mpsc::TracingUnboundedReceiver;
 use sc_client_api::{ClientInfo, UsageProvider};
-use sc_network::config::Role;
+use sc_network::{config::Role, NetworkStatus, NetworkService, network_state::NetworkState};
 use std::sync::Arc;
 use std::time::Duration;
 use wasm_timer::Instant;
@@ -163,7 +162,7 @@ impl MetricsService {
 		mut self,
 		client: Arc<TCl>,
 		transactions: Arc<TExPool>,
-		network: NetworkStatusSinks<TBl>,
+		network: Arc<NetworkService<TBl, <TBl as Block>::Hash>>,
 	) where
 		TBl: Block,
 		TCl: ProvideRuntimeApi<TBl> + UsageProvider<TBl>,
@@ -172,33 +171,23 @@ impl MetricsService {
 		let mut timer = Delay::new(Duration::from_secs(0));
 		let timer_interval = Duration::from_secs(5);
 
-		// Metric and telemetry update interval.
-		let net_status_interval = timer_interval;
-		let net_state_interval = Duration::from_secs(30);
-
-		// Source of network information.
-		let mut net_status_rx = Some(network.status_stream(net_status_interval));
-		let mut net_state_rx = Some(network.state_stream(net_state_interval));
+		let net_state_duration = Duration::from_secs(30);
+		let mut last_net_state = Instant::now();
 
 		loop {
 			// Wait for the next tick of the timer.
 			(&mut timer).await;
+			let now = Instant::now();
+			let from_net_state = now.duration_since(last_net_state);
 
 			// Try to get the latest network information.
-			let mut net_status = None;
-			let mut net_state = None;
-			if let Some(rx) = net_status_rx.as_mut() {
-				match Self::latest(rx) {
-					Ok(status) => { net_status = status; }
-					Err(()) => { net_status_rx = None; }
-				}
-			}
-			if let Some(rx) = net_state_rx.as_mut() {
-				match Self::latest(rx) {
-					Ok(state) => { net_state = state; }
-					Err(()) => { net_state_rx = None; }
-				}
-			}
+			let net_status = network.status().await.ok();
+			let net_state = if from_net_state >= net_state_duration {
+				last_net_state = now;
+				network.network_state().await.ok()
+			} else {
+				None
+			};
 
 			// Update / Send the metrics.
 			self.update(
@@ -213,25 +202,6 @@ impl MetricsService {
 		}
 	}
 
-	// Try to get the latest value from a receiver, dropping intermediate values.
-	fn latest<T>(rx: &mut TracingUnboundedReceiver<T>) -> Result<Option<T>, ()> {
-		let mut value = None;
-
-		while let Ok(next) = rx.try_next() {
-			match next {
-				Some(v) => {
-					value = Some(v)
-				}
-				None => {
-					log::error!("Receiver closed unexpectedly.");
-					return Err(())
-				}
-			}
-		}
-
-		Ok(value)
-	}
-
 	fn update<T: Block>(
 		&mut self,
 		info: &ClientInfo<T>,
diff --git a/test-utils/test-runner/src/node.rs b/test-utils/test-runner/src/node.rs
index 50c9c54ea18f..ce41e5b5b520 100644
--- a/test-utils/test-runner/src/node.rs
+++ b/test-utils/test-runner/src/node.rs
@@ -138,7 +138,7 @@ impl<T: ChainInfo> Node<T> {
 			client.clone(),
 		);
 
-		let (network, network_status_sinks, system_rpc_tx, network_starter) = {
+		let (network, system_rpc_tx, network_starter) = {
 			let params = BuildNetworkParams {
 				config: &config,
 				client: client.clone(),
@@ -182,7 +182,6 @@ impl<T: ChainInfo> Node<T> {
 				rpc_extensions_builder: Box::new(move |_, _| jsonrpc_core::IoHandler::default()),
 				remote_blockchain: None,
 				network,
-				network_status_sinks,
 				system_rpc_tx,
 				telemetry: None
 			};

From 27cc30e88788f6b423d790e34ca39ad0d7fa4219 Mon Sep 17 00:00:00 2001
From: Denis Pisarev <denis.pisarev@parity.io>
Date: Thu, 27 May 2021 20:31:29 +0200
Subject: [PATCH 0793/1194] CI: fix simnet trigger (#8927)

* CI: chore

* CI: pin simnet version
---
 .gitlab-ci.yml                       | 27 +++++++++++++++------------
 .maintain/gitlab/trigger_pipeline.sh |  7 ++++---
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 02a81043a7a5..03fe9f8a2dca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,7 +54,7 @@ default:
     paths:
       - artifacts/
 
-.kubernetes-build:                 &kubernetes-build
+.kubernetes-env:                   &kubernetes-env
   tags:
     - kubernetes-parity-build
   interruptible:                   true
@@ -62,6 +62,8 @@ default:
 .rust-info-script:                 &rust-info-script
   - rustup show
   - cargo --version
+  - rustup +nightly show
+  - cargo +nightly --version
   - sccache -s
 
 .docker-env:                       &docker-env
@@ -140,7 +142,7 @@ default:
 
 skip-if-draft:
   image:                           paritytech/tools:latest
-  <<:                              *kubernetes-build
+  <<:                              *kubernetes-env
   stage:                           .pre
   rules:
     - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
@@ -155,7 +157,7 @@ skip-if-draft:
 check-runtime:
   stage:                           check
   image:                           paritytech/tools:latest
-  <<:                              *kubernetes-build
+  <<:                              *kubernetes-env
   rules:
     - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
   variables:
@@ -169,7 +171,7 @@ check-runtime:
 check-signed-tag:
   stage:                           check
   image:                           paritytech/tools:latest
-  <<:                              *kubernetes-build
+  <<:                              *kubernetes-env
   rules:
     - if: $CI_COMMIT_REF_NAME =~ /^ci-release-.*$/
     - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
@@ -179,7 +181,7 @@ check-signed-tag:
 check-line-width:
   stage:                           check
   image:                           paritytech/tools:latest
-  <<:                              *kubernetes-build
+  <<:                              *kubernetes-env
   rules:
     - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
   script:
@@ -189,7 +191,7 @@ check-line-width:
 test-dependency-rules:
   stage:                           check
   image:                           paritytech/tools:latest
-  <<:                              *kubernetes-build
+  <<:                              *kubernetes-env
   rules:
     - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
   script:
@@ -198,7 +200,7 @@ test-dependency-rules:
 test-prometheus-alerting-rules:
   stage:                           check
   image:                           paritytech/tools:latest
-  <<:                              *kubernetes-build
+  <<:                              *kubernetes-env
   rules:
     - if: $CI_PIPELINE_SOURCE == "pipeline"
       when: never
@@ -419,7 +421,7 @@ cargo-check-macos:
 check-polkadot-companion-status:
   stage:                           build
   image:                           paritytech/tools:latest
-  <<:                              *kubernetes-build
+  <<:                              *kubernetes-env
   rules:
     - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
   script:
@@ -536,7 +538,7 @@ build-rust-doc:
 
 .build-push-docker-image:          &build-push-docker-image
   <<:                              *build-refs
-  <<:                              *kubernetes-build
+  <<:                              *kubernetes-env
   image:                           quay.io/buildah/stable
   variables:                       &docker-build-vars
     <<:                            *default-vars
@@ -598,7 +600,7 @@ publish-docker-subkey:
 publish-s3-release:
   stage:                           publish
   <<:                              *build-refs
-  <<:                              *kubernetes-build
+  <<:                              *kubernetes-env
   needs:
     - job:                         build-linux-substrate
       artifacts:                   true
@@ -627,7 +629,7 @@ publish-s3-doc:
     - job:                         build-linux-substrate
       artifacts:                   false
   <<:                              *build-refs
-  <<:                              *kubernetes-build
+  <<:                              *kubernetes-env
   variables:
     GIT_STRATEGY:                  none
     BUCKET:                        "releases.parity.io"
@@ -689,6 +691,7 @@ deploy-prometheus-alerting-rules:
 trigger-simnet:
   stage:                           deploy
   image:                           paritytech/tools:latest
+  <<:                              *kubernetes-env
   rules:
     - if: $CI_PIPELINE_SOURCE == "pipeline"
       when: never
@@ -705,4 +708,4 @@ trigger-simnet:
     DWNSTRM_ID:                    332
   script:
     # API trigger for a simnet job
-    - ./scripts/gitlab/trigger_pipeline.sh
+    - .maintain/gitlab/trigger_pipeline.sh
diff --git a/.maintain/gitlab/trigger_pipeline.sh b/.maintain/gitlab/trigger_pipeline.sh
index dd9da8102d53..0e95a6458e4d 100755
--- a/.maintain/gitlab/trigger_pipeline.sh
+++ b/.maintain/gitlab/trigger_pipeline.sh
@@ -1,13 +1,14 @@
 #!/bin/bash
 
 set -eu
+
 # API trigger another project's pipeline
 echo "Triggering Simnet pipeline."
 
 curl --silent \
     -X POST \
     -F "token=${CI_JOB_TOKEN}" \
-    -F "ref=master" \
+    -F "ref=v3" `# trigger the pinned version of simnet CI config` \
     -F "variables[TRGR_PROJECT]=${TRGR_PROJECT}" \
     -F "variables[TRGR_REF]=${TRGR_REF}" \
     -F "variables[IMAGE_NAME]=${IMAGE_NAME}" \
@@ -38,9 +39,9 @@ for i in $(seq 1 360); do
     STATUS=$(get_status);
     echo "Triggered pipeline status is ${STATUS}";
     if [[ ${STATUS} =~ ^(pending|running|created)$ ]]; then
-        echo "${STATUS}"...";
+        echo;
     elif [[ ${STATUS} =~ ^(failed|canceled|skipped|manual)$ ]]; then
-        echo "Oh noes! Something's broken in: ${PIPELINE_URL}"; exit 1;
+        echo "Something's broken in: ${PIPELINE_URL}"; exit 1;
     elif [[ ${STATUS} =~ ^(success)$ ]]; then
         echo "Look how green it is: ${PIPELINE_URL}"; exit 0;
     else

From 925f170d1a1f588cf61d7a366c2d744dd16392a6 Mon Sep 17 00:00:00 2001
From: MOZGIII <mike-n@narod.ru>
Date: Thu, 27 May 2021 23:32:22 +0300
Subject: [PATCH 0794/1194] More sc-service config reexports (#8887)

* Reexport ExecutionStrategies and ExecutionStrategy

* Reexport more of the network

* Reexport the ExecutionStrategy as it's used within ExecutionStrategies
---
 client/api/src/execution_extensions.rs | 3 ++-
 client/service/src/config.rs           | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/client/api/src/execution_extensions.rs b/client/api/src/execution_extensions.rs
index 2f17408b7d7c..e6a7fb306e77 100644
--- a/client/api/src/execution_extensions.rs
+++ b/client/api/src/execution_extensions.rs
@@ -33,7 +33,8 @@ use sp_runtime::{
 	generic::BlockId,
 	traits,
 };
-use sp_state_machine::{ExecutionStrategy, ExecutionManager, DefaultHandler};
+use sp_state_machine::{ExecutionManager, DefaultHandler};
+pub use sp_state_machine::ExecutionStrategy;
 use sp_externalities::Extensions;
 use parking_lot::RwLock;
 
diff --git a/client/service/src/config.rs b/client/service/src/config.rs
index f82a877545e8..5d8ee89225cb 100644
--- a/client/service/src/config.rs
+++ b/client/service/src/config.rs
@@ -23,9 +23,13 @@ pub use sc_client_db::{
 	KeepBlocks, TransactionStorageMode
 };
 pub use sc_network::Multiaddr;
-pub use sc_network::config::{ExtTransport, MultiaddrWithPeerId, NetworkConfiguration, Role, NodeKeyConfig};
+pub use sc_network::config::{
+	ExtTransport, MultiaddrWithPeerId, NetworkConfiguration, Role, NodeKeyConfig,
+	SetConfig, NonDefaultSetConfig, TransportConfig,
+	RequestResponseConfig, IncomingRequest, OutgoingResponse,
+};
 pub use sc_executor::WasmExecutionMethod;
-use sc_client_api::execution_extensions::ExecutionStrategies;
+pub use sc_client_api::execution_extensions::{ExecutionStrategies, ExecutionStrategy};
 
 use std::{io, future::Future, path::{PathBuf, Path}, pin::Pin, net::SocketAddr, sync::Arc};
 pub use sc_transaction_pool::txpool::Options as TransactionPoolOptions;

From 426d57b0a0c2f407fade5ea204bd133e76956404 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Fri, 28 May 2021 11:33:22 +0200
Subject: [PATCH 0795/1194] Fix check runtime CI (#8930)

* Fix check_runtime.sh script

* contracts: Remove confusing "Related Modules" doc
---
 .maintain/gitlab/check_runtime.sh | 8 ++++----
 frame/contracts/src/lib.rs        | 4 ----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.maintain/gitlab/check_runtime.sh b/.maintain/gitlab/check_runtime.sh
index af392e1b7d11..71d6965ecf4f 100755
--- a/.maintain/gitlab/check_runtime.sh
+++ b/.maintain/gitlab/check_runtime.sh
@@ -56,9 +56,9 @@ fi
 # consensus-critical logic that has changed. the runtime wasm blobs must be
 # rebuilt.
 
-add_spec_version="$(git diff "tags/release...${CI_COMMIT_SHA}" "${VERSIONS_FILE}" \
+add_spec_version="$(git diff tags/release ${CI_COMMIT_SHA} -- "${VERSIONS_FILE}" \
 	| sed -n -r "s/^\+[[:space:]]+spec_version: +([0-9]+),$/\1/p")"
-sub_spec_version="$(git diff "tags/release...${CI_COMMIT_SHA}" "${VERSIONS_FILE}" \
+sub_spec_version="$(git diff tags/release ${CI_COMMIT_SHA} -- "${VERSIONS_FILE}" \
 	| sed -n -r "s/^\-[[:space:]]+spec_version: +([0-9]+),$/\1/p")"
 
 
@@ -79,9 +79,9 @@ else
 	# check for impl_version updates: if only the impl versions changed, we assume
 	# there is no consensus-critical logic that has changed.
 
-	add_impl_version="$(git diff "tags/release...${CI_COMMIT_SHA}" "${VERSIONS_FILE}" \
+	add_impl_version="$(git diff tags/release ${CI_COMMIT_SHA} -- "${VERSIONS_FILE}" \
 		| sed -n -r 's/^\+[[:space:]]+impl_version: +([0-9]+),$/\1/p')"
-	sub_impl_version="$(git diff "tags/release...${CI_COMMIT_SHA}" "${VERSIONS_FILE}" \
+	sub_impl_version="$(git diff tags/release ${CI_COMMIT_SHA} -- "${VERSIONS_FILE}" \
 		| sed -n -r 's/^\-[[:space:]]+impl_version: +([0-9]+),$/\1/p')"
 
 
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index c655a926d803..0c36a8465a1e 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -76,10 +76,6 @@
 //! * [`ink`](https://github.com/paritytech/ink) is
 //! an [`eDSL`](https://wiki.haskell.org/Embedded_domain_specific_language) that enables writing
 //! WebAssembly based smart contracts in the Rust programming language. This is a work in progress.
-//!
-//! ## Related Modules
-//!
-//! * [Balances](../pallet_balances/index.html)
 
 #![cfg_attr(not(feature = "std"), no_std)]
 #![cfg_attr(feature = "runtime-benchmarks", recursion_limit="512")]

From c2ec5bc8f12bb5a084b976f2dc1280796e9c1b23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Fri, 28 May 2021 13:06:16 +0200
Subject: [PATCH 0796/1194] Bump parity-wasm and pwasm-utils to the newest
 versions everywhere (#8928)

---
 Cargo.lock                                    | 58 ++++++-------------
 client/executor/Cargo.toml                    |  4 +-
 client/executor/common/Cargo.toml             |  5 +-
 .../runtime_blob/data_segments_snapshot.rs    |  2 +-
 .../common/src/runtime_blob/runtime_blob.rs   | 18 +++---
 client/executor/wasmi/Cargo.toml              |  2 +-
 client/executor/wasmtime/Cargo.toml           |  3 +-
 frame/contracts/Cargo.toml                    |  4 +-
 frame/contracts/src/benchmarking/code.rs      | 22 ++++---
 frame/contracts/src/benchmarking/mod.rs       |  6 +-
 frame/contracts/src/schedule.rs               |  5 +-
 frame/contracts/src/wasm/env_def/macros.rs    | 21 ++++---
 frame/contracts/src/wasm/env_def/mod.rs       |  2 +-
 frame/contracts/src/wasm/prepare.rs           |  6 +-
 frame/contracts/src/wasm/runtime.rs           |  2 +-
 primitives/core/Cargo.toml                    |  2 +-
 primitives/sandbox/Cargo.toml                 |  2 +-
 primitives/wasm-interface/Cargo.toml          |  2 +-
 18 files changed, 78 insertions(+), 88 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 39ec3e8c26b1..f7934072cc70 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1431,6 +1431,12 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
 
+[[package]]
+name = "downcast-rs"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
+
 [[package]]
 name = "dyn-clonable"
 version = "0.9.0"
@@ -4797,10 +4803,9 @@ dependencies = [
  "pallet-randomness-collective-flip",
  "pallet-timestamp",
  "parity-scale-codec",
- "parity-wasm 0.42.2",
  "paste 1.0.4",
  "pretty_assertions 0.7.2",
- "pwasm-utils 0.17.0",
+ "pwasm-utils",
  "rand 0.8.3",
  "rand_pcg 0.3.0",
  "serde",
@@ -4810,7 +4815,7 @@ dependencies = [
  "sp-runtime",
  "sp-sandbox",
  "sp-std",
- "wasmi-validation 0.4.0",
+ "wasmi-validation",
  "wat",
 ]
 
@@ -5723,12 +5728,6 @@ dependencies = [
  "byteorder",
 ]
 
-[[package]]
-name = "parity-wasm"
-version = "0.41.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddfc878dac00da22f8f61e7af3157988424567ab01d9920b962ef7dcbd7cd865"
-
 [[package]]
 name = "parity-wasm"
 version = "0.42.2"
@@ -6295,20 +6294,9 @@ dependencies = [
 
 [[package]]
 name = "pwasm-utils"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f53bc2558e8376358ebdc28301546471d67336584f6438ed4b7c7457a055fd7"
-dependencies = [
- "byteorder",
- "log",
- "parity-wasm 0.41.0",
-]
-
-[[package]]
-name = "pwasm-utils"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51992bc74c0f34f759ff97fb303602e60343afc83693769c91aa17724442809e"
+checksum = "a0e517f47d9964362883182404b68d0b6949382c0baa40aa5ffca94f5f1e3481"
 dependencies = [
  "byteorder",
  "log",
@@ -7346,7 +7334,7 @@ dependencies = [
  "libsecp256k1",
  "log",
  "parity-scale-codec",
- "parity-wasm 0.41.0",
+ "parity-wasm 0.42.2",
  "parking_lot 0.11.1",
  "paste 1.0.4",
  "sc-executor-common",
@@ -7381,8 +7369,7 @@ version = "0.9.0"
 dependencies = [
  "derive_more",
  "parity-scale-codec",
- "parity-wasm 0.41.0",
- "pwasm-utils 0.14.0",
+ "pwasm-utils",
  "sp-allocator",
  "sp-core",
  "sp-maybe-compressed-blob",
@@ -7413,8 +7400,7 @@ dependencies = [
  "assert_matches",
  "log",
  "parity-scale-codec",
- "parity-wasm 0.41.0",
- "pwasm-utils 0.14.0",
+ "parity-wasm 0.42.2",
  "sc-executor-common",
  "scoped-tls",
  "sp-allocator",
@@ -10856,26 +10842,18 @@ dependencies = [
 
 [[package]]
 name = "wasmi"
-version = "0.6.2"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf617d864d25af3587aa745529f7aaa541066c876d57e050c0d0c85c61c92aff"
+checksum = "d2ee05bba3d1d994652079893941a2ef9324d2b58a63c31b40678fb7eddd7a5a"
 dependencies = [
+ "downcast-rs",
  "errno",
  "libc",
  "memory_units",
  "num-rational",
  "num-traits",
- "parity-wasm 0.41.0",
- "wasmi-validation 0.3.0",
-]
-
-[[package]]
-name = "wasmi-validation"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea78c597064ba73596099281e2f4cfc019075122a65cdda3205af94f0b264d93"
-dependencies = [
- "parity-wasm 0.41.0",
+ "parity-wasm 0.42.2",
+ "wasmi-validation",
 ]
 
 [[package]]
diff --git a/client/executor/Cargo.toml b/client/executor/Cargo.toml
index f678029d0674..f9ebfd9bd5de 100644
--- a/client/executor/Cargo.toml
+++ b/client/executor/Cargo.toml
@@ -23,8 +23,8 @@ sp-trie = { version = "3.0.0", path = "../../primitives/trie" }
 sp-serializer = { version = "3.0.0", path = "../../primitives/serializer" }
 sp-version = { version = "3.0.0", path = "../../primitives/version" }
 sp-panic-handler = { version = "3.0.0", path = "../../primitives/panic-handler" }
-wasmi = "0.6.2"
-parity-wasm = "0.41.0"
+wasmi = "0.9.0"
+parity-wasm = "0.42.0"
 lazy_static = "1.4.0"
 sp-api = { version = "3.0.0", path = "../../primitives/api" }
 sp-wasm-interface = { version = "3.0.0", path = "../../primitives/wasm-interface" }
diff --git a/client/executor/common/Cargo.toml b/client/executor/common/Cargo.toml
index 9f9ec989431f..cb238f3a96fb 100644
--- a/client/executor/common/Cargo.toml
+++ b/client/executor/common/Cargo.toml
@@ -15,10 +15,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 derive_more = "0.99.2"
-parity-wasm = "0.41.0"
-pwasm-utils = "0.14.0"
+pwasm-utils = "0.18.0"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-wasmi = "0.6.2"
+wasmi = "0.9.0"
 sp-core = { version = "3.0.0", path = "../../../primitives/core" }
 sp-allocator = { version = "3.0.0", path = "../../../primitives/allocator" }
 sp-wasm-interface = { version = "3.0.0", path = "../../../primitives/wasm-interface" }
diff --git a/client/executor/common/src/runtime_blob/data_segments_snapshot.rs b/client/executor/common/src/runtime_blob/data_segments_snapshot.rs
index 3850ec6753be..269ad0858325 100644
--- a/client/executor/common/src/runtime_blob/data_segments_snapshot.rs
+++ b/client/executor/common/src/runtime_blob/data_segments_snapshot.rs
@@ -19,7 +19,7 @@
 use crate::error::{self, Error};
 use super::RuntimeBlob;
 use std::mem;
-use parity_wasm::elements::Instruction;
+use pwasm_utils::parity_wasm::elements::Instruction;
 
 /// This is a snapshot of data segments specialzied for a particular instantiation.
 ///
diff --git a/client/executor/common/src/runtime_blob/runtime_blob.rs b/client/executor/common/src/runtime_blob/runtime_blob.rs
index 6541f9f5d966..aac023e960c7 100644
--- a/client/executor/common/src/runtime_blob/runtime_blob.rs
+++ b/client/executor/common/src/runtime_blob/runtime_blob.rs
@@ -16,14 +16,18 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use parity_wasm::elements::{DataSegment, Module as RawModule, deserialize_buffer, serialize};
-
+use pwasm_utils::{
+	parity_wasm::elements::{
+		DataSegment, Module, deserialize_buffer, serialize, Internal,
+	},
+	export_mutable_globals,
+};
 use crate::error::WasmError;
 
 /// A bunch of information collected from a WebAssembly module.
 #[derive(Clone)]
 pub struct RuntimeBlob {
-	raw_module: RawModule,
+	raw_module: Module,
 }
 
 impl RuntimeBlob {
@@ -42,7 +46,7 @@ impl RuntimeBlob {
 	///
 	/// Returns `Err` if the wasm code cannot be deserialized.
 	pub fn new(wasm_code: &[u8]) -> Result<Self, WasmError> {
-		let raw_module: RawModule = deserialize_buffer(wasm_code)
+		let raw_module: Module = deserialize_buffer(wasm_code)
 			.map_err(|e| WasmError::Other(format!("cannot deserialize module: {:?}", e)))?;
 		Ok(Self { raw_module })
 	}
@@ -74,7 +78,7 @@ impl RuntimeBlob {
 
 	/// Perform an instrumentation that makes sure that the mutable globals are exported.
 	pub fn expose_mutable_globals(&mut self) {
-		pwasm_utils::export_mutable_globals(&mut self.raw_module, "exported_internal_global");
+		export_mutable_globals(&mut self.raw_module, "exported_internal_global");
 	}
 
 	/// Returns an iterator of all globals which were exported by [`expose_mutable_globals`].
@@ -87,7 +91,7 @@ impl RuntimeBlob {
 			.map(|es| es.entries())
 			.unwrap_or(&[]);
 		exports.iter().filter_map(|export| match export.internal() {
-			parity_wasm::elements::Internal::Global(_)
+			Internal::Global(_)
 				if export.field().starts_with("exported_internal_global") =>
 			{
 				Some(export.field())
@@ -112,7 +116,7 @@ impl RuntimeBlob {
 	}
 
 	/// Destructure this structure into the underlying parity-wasm Module.
-	pub fn into_inner(self) -> RawModule {
+	pub fn into_inner(self) -> Module {
 		self.raw_module
 	}
 }
diff --git a/client/executor/wasmi/Cargo.toml b/client/executor/wasmi/Cargo.toml
index cfe9dd7108cf..4c3054d5d10c 100644
--- a/client/executor/wasmi/Cargo.toml
+++ b/client/executor/wasmi/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 log = "0.4.8"
-wasmi = "0.6.2"
+wasmi = "0.9.0"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 sc-executor-common = { version = "0.9.0", path = "../common" }
 sp-wasm-interface = { version = "3.0.0", path = "../../../primitives/wasm-interface" }
diff --git a/client/executor/wasmtime/Cargo.toml b/client/executor/wasmtime/Cargo.toml
index b9f2dd1a9d92..4583c1ab8202 100644
--- a/client/executor/wasmtime/Cargo.toml
+++ b/client/executor/wasmtime/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 log = "0.4.8"
 scoped-tls = "1.0"
-parity-wasm = "0.41.0"
+parity-wasm = "0.42.0"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 sc-executor-common = { version = "0.9.0", path = "../common" }
 sp-wasm-interface = { version = "3.0.0", path = "../../../primitives/wasm-interface" }
@@ -23,7 +23,6 @@ sp-runtime-interface = { version = "3.0.0", path = "../../../primitives/runtime-
 sp-core = { version = "3.0.0", path = "../../../primitives/core" }
 sp-allocator = { version = "3.0.0", path = "../../../primitives/allocator" }
 wasmtime = "0.24.0"
-pwasm-utils = "0.14.0"
 
 [dev-dependencies]
 assert_matches = "1.3.0"
diff --git a/frame/contracts/Cargo.toml b/frame/contracts/Cargo.toml
index f09e61c3e5ba..71a45a9dfa6b 100644
--- a/frame/contracts/Cargo.toml
+++ b/frame/contracts/Cargo.toml
@@ -15,8 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 log = { version = "0.4", default-features = false }
-parity-wasm = { version = "0.42", default-features = false }
-pwasm-utils = { version = "0.17", default-features = false }
+pwasm-utils = { version = "0.18", default-features = false }
 serde = { version = "1", optional = true, features = ["derive"] }
 smallvec = { version = "1", default-features = false, features = ["const_generics"] }
 wasmi-validation = { version = "0.4", default-features = false }
@@ -61,7 +60,6 @@ std = [
 	"sp-sandbox/std",
 	"frame-support/std",
 	"frame-system/std",
-	"parity-wasm/std",
 	"pwasm-utils/std",
 	"wasmi-validation/std",
 	"pallet-contracts-primitives/std",
diff --git a/frame/contracts/src/benchmarking/code.rs b/frame/contracts/src/benchmarking/code.rs
index 930996a437c5..b9bd693f1c2c 100644
--- a/frame/contracts/src/benchmarking/code.rs
+++ b/frame/contracts/src/benchmarking/code.rs
@@ -25,10 +25,16 @@
 //! compiles it down into a `WasmModule` that can be used as a contract's code.
 
 use crate::Config;
-use parity_wasm::elements::{
-	Instruction, Instructions, FuncBody, ValueType, BlockType, Section, CustomSection,
+use pwasm_utils::{
+	stack_height::inject_limiter,
+	parity_wasm::{
+		elements::{
+			self, Instruction, Instructions, FuncBody, ValueType, BlockType, Section,
+			CustomSection,
+		},
+		builder,
+	},
 };
-use pwasm_utils::stack_height::inject_limiter;
 use sp_core::crypto::UncheckedFrom;
 use sp_runtime::traits::Hash;
 use sp_sandbox::{EnvironmentDefinitionBuilder, Memory};
@@ -127,7 +133,7 @@ where
 		let func_offset = u32::try_from(def.imported_functions.len()).unwrap();
 
 		// Every contract must export "deploy" and "call" functions
-		let mut contract = parity_wasm::builder::module()
+		let mut contract = builder::module()
 			// deploy function (first internal function)
 			.function()
 				.signature().build()
@@ -166,7 +172,7 @@ where
 
 		// Import supervisor functions. They start with idx 0.
 		for func in def.imported_functions {
-			let sig = parity_wasm::builder::signature()
+			let sig = builder::signature()
 				.with_params(func.params)
 				.with_results(func.return_type.into_iter().collect())
 				.build_sig();
@@ -174,7 +180,7 @@ where
 			contract = contract.import()
 				.module(func.module)
 				.field(func.name)
-				.with_external(parity_wasm::elements::External::Function(sig))
+				.with_external(elements::External::Function(sig))
 				.build();
 		}
 
@@ -264,7 +270,7 @@ where
 	/// `instantiate_with_code` for different sizes of wasm modules. The generated module maximizes
 	/// instrumentation runtime by nesting blocks as deeply as possible given the byte budget.
 	pub fn sized(target_bytes: u32) -> Self {
-		use parity_wasm::elements::Instruction::{If, I32Const, Return, End};
+		use self::elements::Instruction::{If, I32Const, Return, End};
 		// Base size of a contract is 63 bytes and each expansion adds 6 bytes.
 		// We do one expansion less to account for the code section and function body
 		// size fields inside the binary wasm module representation which are leb128 encoded
@@ -496,7 +502,7 @@ pub mod body {
 
 	/// Replace the locals of the supplied `body` with `num` i64 locals.
 	pub fn inject_locals(body: &mut FuncBody, num: u32) {
-		use parity_wasm::elements::Local;
+		use self::elements::Local;
 		*body.locals_mut() = (0..num).map(|i| Local::new(i, ValueType::I64)).collect()
 	}
 }
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index 2ba32069cbe3..bb04e9b2cf32 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -39,7 +39,7 @@ use self::{
 use codec::Encode;
 use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
 use frame_system::{Pallet as System, RawOrigin};
-use parity_wasm::elements::{Instruction, ValueType, BlockType};
+use pwasm_utils::parity_wasm::elements::{Instruction, ValueType, BlockType, BrTableData};
 use sp_runtime::traits::{Hash, Bounded, Zero};
 use sp_std::{default::Default, convert::{TryInto}, vec::Vec, vec};
 use pallet_contracts_primitives::RentProjection;
@@ -1934,7 +1934,7 @@ benchmarks! {
 	// 1 * w_param + 0.5 * 2 * w_param + 0.25 * 4 * w_param
 	instr_br_table {
 		let r in 0 .. INSTR_BENCHMARK_BATCHES;
-		let table = Box::new(parity_wasm::elements::BrTableData {
+		let table = Box::new(BrTableData {
 			table: Box::new([0, 1, 2]),
 			default: 1,
 		});
@@ -1968,7 +1968,7 @@ benchmarks! {
 			.cloned()
 			.cycle()
 			.take((e / 2) as usize).collect();
-		let table = Box::new(parity_wasm::elements::BrTableData {
+		let table = Box::new(BrTableData {
 			table: entry.into_boxed_slice(),
 			default: 0,
 		});
diff --git a/frame/contracts/src/schedule.rs b/frame/contracts/src/schedule.rs
index 67f531f2ba6a..686861d28bbc 100644
--- a/frame/contracts/src/schedule.rs
+++ b/frame/contracts/src/schedule.rs
@@ -26,8 +26,7 @@ use pallet_contracts_proc_macro::{ScheduleDebug, WeightDebug};
 use frame_support::{DefaultNoBound, weights::Weight};
 use sp_std::{marker::PhantomData, vec::Vec};
 use codec::{Encode, Decode};
-use parity_wasm::elements;
-use pwasm_utils::rules;
+use pwasm_utils::{parity_wasm::elements, rules};
 use sp_runtime::RuntimeDebug;
 
 /// How many API calls are executed in a single batch. The reason for increasing the amount
@@ -635,7 +634,7 @@ impl<T: Config> Schedule<T> {
 
 impl<'a, T: Config> rules::Rules for ScheduleRules<'a, T> {
 	fn instruction_cost(&self, instruction: &elements::Instruction) -> Option<u32> {
-		use parity_wasm::elements::Instruction::*;
+		use self::elements::Instruction::*;
 		let w = &self.schedule.instruction_weights;
 		let max_params = self.schedule.limits.parameters;
 
diff --git a/frame/contracts/src/wasm/env_def/macros.rs b/frame/contracts/src/wasm/env_def/macros.rs
index fbaf7282140b..b7358f6aa234 100644
--- a/frame/contracts/src/wasm/env_def/macros.rs
+++ b/frame/contracts/src/wasm/env_def/macros.rs
@@ -28,15 +28,18 @@ macro_rules! convert_args {
 macro_rules! gen_signature {
 	( ( $( $params: ty ),* ) ) => (
 		{
-			parity_wasm::elements::FunctionType::new(convert_args!($($params),*), vec![])
+			pwasm_utils::parity_wasm::elements::FunctionType::new(
+				convert_args!($($params),*), vec![],
+			)
 		}
 	);
 
 	( ( $( $params: ty ),* ) -> $returns: ty ) => (
 		{
-			parity_wasm::elements::FunctionType::new(convert_args!($($params),*), vec![{
-				use $crate::wasm::env_def::ConvertibleToWasm; <$returns>::VALUE_TYPE
-			}])
+			pwasm_utils::parity_wasm::elements::FunctionType::new(
+				convert_args!($($params),*),
+				vec![{use $crate::wasm::env_def::ConvertibleToWasm; <$returns>::VALUE_TYPE}],
+			)
 		}
 	);
 }
@@ -214,7 +217,12 @@ macro_rules! define_env {
 		pub struct $init_name;
 
 		impl $crate::wasm::env_def::ImportSatisfyCheck for $init_name {
-			fn can_satisfy(module: &[u8], name: &[u8], func_type: &parity_wasm::elements::FunctionType) -> bool {
+			fn can_satisfy(
+				module: &[u8],
+				name: &[u8],
+				func_type: &pwasm_utils::parity_wasm::elements::FunctionType,
+			) -> bool
+			{
 				#[cfg(not(feature = "unstable-interface"))]
 				if module == b"__unstable__" {
 					return false;
@@ -247,8 +255,7 @@ macro_rules! define_env {
 
 #[cfg(test)]
 mod tests {
-	use parity_wasm::elements::FunctionType;
-	use parity_wasm::elements::ValueType;
+	use pwasm_utils::parity_wasm::elements::{FunctionType, ValueType};
 	use sp_runtime::traits::Zero;
 	use sp_sandbox::{ReturnValue, Value};
 	use crate::{
diff --git a/frame/contracts/src/wasm/env_def/mod.rs b/frame/contracts/src/wasm/env_def/mod.rs
index 6d33444b04df..5855befd34cb 100644
--- a/frame/contracts/src/wasm/env_def/mod.rs
+++ b/frame/contracts/src/wasm/env_def/mod.rs
@@ -19,7 +19,7 @@ use super::Runtime;
 use crate::exec::Ext;
 
 use sp_sandbox::Value;
-use parity_wasm::elements::{FunctionType, ValueType};
+use pwasm_utils::parity_wasm::elements::{FunctionType, ValueType};
 
 #[macro_use]
 pub mod macros;
diff --git a/frame/contracts/src/wasm/prepare.rs b/frame/contracts/src/wasm/prepare.rs
index e595c3255593..2b52d9438904 100644
--- a/frame/contracts/src/wasm/prepare.rs
+++ b/frame/contracts/src/wasm/prepare.rs
@@ -24,7 +24,7 @@ use crate::{
 	chain_extension::ChainExtension,
 	wasm::{PrefabWasmModule, env_def::ImportSatisfyCheck},
 };
-use parity_wasm::elements::{self, Internal, External, MemoryType, Type, ValueType};
+use pwasm_utils::parity_wasm::elements::{self, Internal, External, MemoryType, Type, ValueType};
 use sp_runtime::traits::Hash;
 use sp_std::prelude::*;
 
@@ -105,7 +105,7 @@ impl<'a, T: Config> ContractModule<'a, T> {
 			return Ok(());
 		};
 		for instr in code_section.bodies().iter().flat_map(|body| body.code().elements()) {
-			use parity_wasm::elements::Instruction::BrTable;
+			use self::elements::Instruction::BrTable;
 			if let BrTable(table) = instr {
 				if table.table.len() > limit as usize {
 					return Err("BrTable's immediate value is too big.")
@@ -484,7 +484,7 @@ pub fn reinstrument_contract<T: Config>(
 #[cfg(feature = "runtime-benchmarks")]
 pub mod benchmarking {
 	use super::*;
-	use parity_wasm::elements::FunctionType;
+	use super::elements::FunctionType;
 
 	impl ImportSatisfyCheck for () {
 		fn can_satisfy(_module: &[u8], _name: &[u8], _func_type: &FunctionType) -> bool {
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index 3701c0d60734..99dcab17cf12 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -24,7 +24,7 @@ use crate::{
 	wasm::env_def::ConvertibleToWasm,
 	schedule::HostFnWeights,
 };
-use parity_wasm::elements::ValueType;
+use pwasm_utils::parity_wasm::elements::ValueType;
 use frame_support::{dispatch::DispatchError, ensure, traits::Get, weights::Weight};
 use sp_std::prelude::*;
 use codec::{Decode, DecodeAll, Encode};
diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml
index 3d9cf1287e05..146dee2cfa1d 100644
--- a/primitives/core/Cargo.toml
+++ b/primitives/core/Cargo.toml
@@ -20,7 +20,7 @@ serde = { version = "1.0.101", optional = true, features = ["derive"] }
 byteorder = { version = "1.3.2", default-features = false }
 primitive-types = { version = "0.9.0", default-features = false, features = ["codec"] }
 impl-serde = { version = "0.3.0", optional = true }
-wasmi = { version = "0.6.2", optional = true }
+wasmi = { version = "0.9.0", optional = true }
 hash-db = { version = "0.15.2", default-features = false }
 hash256-std-hasher = { version = "0.15.2", default-features = false }
 base58 = { version = "0.1.0", optional = true }
diff --git a/primitives/sandbox/Cargo.toml b/primitives/sandbox/Cargo.toml
index 9efe5cde7a42..dc6103bfa6ad 100755
--- a/primitives/sandbox/Cargo.toml
+++ b/primitives/sandbox/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-wasmi = { version = "0.6.2", optional = true }
+wasmi = { version = "0.9.0", optional = true }
 sp-core = { version = "3.0.0", default-features = false, path = "../core" }
 sp-std = { version = "3.0.0", default-features = false, path = "../std" }
 sp-io = { version = "3.0.0", default-features = false, path = "../io" }
diff --git a/primitives/wasm-interface/Cargo.toml b/primitives/wasm-interface/Cargo.toml
index 1721df4a8668..97171310b415 100644
--- a/primitives/wasm-interface/Cargo.toml
+++ b/primitives/wasm-interface/Cargo.toml
@@ -14,7 +14,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-wasmi = { version = "0.6.2", optional = true }
+wasmi = { version = "0.9.0", optional = true }
 impl-trait-for-tuples = "0.2.1"
 sp-std = { version = "3.0.0", path = "../std", default-features = false }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }

From 050e4ace716b24df43b5742e44773f5c11b16538 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Fri, 28 May 2021 14:35:15 -0400
Subject: [PATCH 0797/1194] Simple `MaxBoundedLen` Implementations (#8793)

* implement max_values + storages info

* some formatting + doc

* sudo sanity check

* timestamp

* assets (not working)

* fix assets

* impl for proxy

* update balances

* rename StoragesInfo -> PalletStorageInfo

* merge both StorageInfoTrait and PalletStorageInfo

I think it is more future proof. In the future some storage could make
use of multiple prefix. Like one to store how much value has been
inserted, etc...

* Update frame/support/procedural/src/storage/parse.rs

Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>

* Update frame/support/procedural/src/storage/storage_struct.rs

Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>

* Fix max_size using hasher information

hasher now expose `max_len` which allows to computes their maximum len.
For hasher without concatenation, it is the size of the hash part,
for hasher with concatenation, it is the size of the hash part + max
encoded len of the key.

* fix tests

* fix ui tests

* Move `MaxBoundedLen` into its own crate (#8814)

* move MaxEncodedLen into its own crate

* remove MaxEncodedLen impl from frame-support

* add to assets and balances

* try more fixes

* fix compile

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* nits

* fix compile

* line width

* fix max-values-macro merge

* Add some derive, needed for test and other purpose

* use weak bounded vec in some cases

* Update lib.rs

* move max-encoded-len crate

* fix

* remove app crypto for now

* width

* Revert "remove app crypto for now"

This reverts commit 73623e9933d50648e0e7fe90b6171a8e45d7f5a2.

* unused variable

* more unused variables

* more fixes

* Add #[max_encoded_len_crate(...)] helper attribute

The purpose of this attribute is to reduce the surface area of
max_encoded_len changes. Crates deriving `MaxEncodedLen` do not
need to add it to `Cargo.toml`; they can instead just do

```rust
\#[derive(Encode, MaxEncodedLen)]
\#[max_encoded_len_crate(frame_support::max_encoded_len)]
struct Example;
```

* fix a ui test

* use #[max_encoded_len_crate(...)] helper in app_crypto

* remove max_encoded_len import where not necessary

* update lockfile

* fix ui test

* ui

* newline

* fix merge

* try fix ui again

* Update max-encoded-len/derive/src/lib.rs

Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>

* extract generate_crate_access_2018

* Update lib.rs

* compiler isnt smart enough

Co-authored-by: thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
Co-authored-by: Peter Goodspeed-Niklaus <peter.r.goodspeedniklaus@gmail.com>
---
 Cargo.lock                                    | 41 +++++++--
 Cargo.toml                                    |  3 +
 bin/node/runtime/Cargo.toml                   |  3 +
 bin/node/runtime/src/lib.rs                   |  8 +-
 frame/assets/Cargo.toml                       |  2 +
 frame/assets/src/lib.rs                       | 51 ++++++++---
 frame/assets/src/types.rs                     | 17 ++--
 frame/balances/Cargo.toml                     |  2 +
 frame/balances/src/lib.rs                     | 32 ++++---
 frame/proxy/Cargo.toml                        |  4 +-
 frame/proxy/src/lib.rs                        | 81 ++++++++---------
 frame/proxy/src/tests.rs                      | 40 ++++----
 frame/sudo/src/lib.rs                         |  1 +
 frame/support/Cargo.toml                      |  2 +
 frame/support/procedural/src/lib.rs           |  7 --
 frame/support/procedural/src/storage/mod.rs   |  2 +-
 frame/support/src/lib.rs                      |  8 +-
 frame/support/src/traits.rs                   | 30 +-----
 frame/support/src/traits/tokens/currency.rs   |  4 +-
 .../call_argument_invalid_bound_2.stderr      |  4 +-
 frame/system/src/lib.rs                       |  9 +-
 frame/timestamp/src/lib.rs                    |  3 +-
 max-encoded-len/Cargo.toml                    | 36 ++++++++
 max-encoded-len/derive/Cargo.toml             | 25 +++++
 .../derive/src/lib.rs                         | 91 +++++++++++++++++--
 .../src/lib.rs                                | 45 +++++++--
 .../tests/max_encoded_len.rs                  |  4 +-
 .../tests/max_encoded_len_ui.rs               |  1 +
 .../max_encoded_len_ui/list_list_item.rs      | 10 ++
 .../max_encoded_len_ui/list_list_item.stderr  | 18 ++++
 .../max_encoded_len_ui/literal_list_item.rs   | 10 ++
 .../literal_list_item.stderr                  | 18 ++++
 .../max_encoded_len_ui/name_value_attr.rs     | 10 ++
 .../max_encoded_len_ui/name_value_attr.stderr | 18 ++++
 .../name_value_list_item.rs                   | 10 ++
 .../name_value_list_item.stderr               | 18 ++++
 .../max_encoded_len_ui/no_path_list_items.rs  | 10 ++
 .../no_path_list_items.stderr                 | 18 ++++
 .../tests/max_encoded_len_ui/not_encode.rs    |  2 +-
 .../max_encoded_len_ui/not_encode.stderr      |  8 +-
 .../tests/max_encoded_len_ui/not_mel.rs       |  2 +-
 .../tests/max_encoded_len_ui/not_mel.stderr   |  0
 .../tests/max_encoded_len_ui/path_attr.rs     | 10 ++
 .../tests/max_encoded_len_ui/path_attr.stderr | 18 ++++
 .../max_encoded_len_ui/two_path_list_items.rs | 10 ++
 .../two_path_list_items.stderr                | 18 ++++
 .../tests/max_encoded_len_ui/union.rs         |  2 +-
 .../tests/max_encoded_len_ui/union.stderr     |  0
 .../max_encoded_len_ui/unsupported_variant.rs |  2 +-
 .../unsupported_variant.stderr                |  0
 primitives/application-crypto/Cargo.toml      | 11 ++-
 primitives/application-crypto/src/lib.rs      |  7 +-
 primitives/core/Cargo.toml                    |  2 +
 primitives/core/src/crypto.rs                 |  3 +-
 primitives/core/src/ecdsa.rs                  |  2 +-
 primitives/core/src/ed25519.rs                |  5 +-
 primitives/core/src/sr25519.rs                |  5 +-
 primitives/runtime/Cargo.toml                 |  2 +
 primitives/runtime/src/traits.rs              |  3 +-
 59 files changed, 619 insertions(+), 189 deletions(-)
 create mode 100644 max-encoded-len/Cargo.toml
 create mode 100644 max-encoded-len/derive/Cargo.toml
 rename frame/support/procedural/src/max_encoded_len.rs => max-encoded-len/derive/src/lib.rs (56%)
 rename frame/support/src/traits/max_encoded_len.rs => max-encoded-len/src/lib.rs (65%)
 rename {frame/support/test => max-encoded-len}/tests/max_encoded_len.rs (98%)
 rename {frame/support/test => max-encoded-len}/tests/max_encoded_len_ui.rs (97%)
 create mode 100644 max-encoded-len/tests/max_encoded_len_ui/list_list_item.rs
 create mode 100644 max-encoded-len/tests/max_encoded_len_ui/list_list_item.stderr
 create mode 100644 max-encoded-len/tests/max_encoded_len_ui/literal_list_item.rs
 create mode 100644 max-encoded-len/tests/max_encoded_len_ui/literal_list_item.stderr
 create mode 100644 max-encoded-len/tests/max_encoded_len_ui/name_value_attr.rs
 create mode 100644 max-encoded-len/tests/max_encoded_len_ui/name_value_attr.stderr
 create mode 100644 max-encoded-len/tests/max_encoded_len_ui/name_value_list_item.rs
 create mode 100644 max-encoded-len/tests/max_encoded_len_ui/name_value_list_item.stderr
 create mode 100644 max-encoded-len/tests/max_encoded_len_ui/no_path_list_items.rs
 create mode 100644 max-encoded-len/tests/max_encoded_len_ui/no_path_list_items.stderr
 rename {frame/support/test => max-encoded-len}/tests/max_encoded_len_ui/not_encode.rs (58%)
 rename {frame/support/test => max-encoded-len}/tests/max_encoded_len_ui/not_encode.stderr (54%)
 rename {frame/support/test => max-encoded-len}/tests/max_encoded_len_ui/not_mel.rs (80%)
 rename {frame/support/test => max-encoded-len}/tests/max_encoded_len_ui/not_mel.stderr (100%)
 create mode 100644 max-encoded-len/tests/max_encoded_len_ui/path_attr.rs
 create mode 100644 max-encoded-len/tests/max_encoded_len_ui/path_attr.stderr
 create mode 100644 max-encoded-len/tests/max_encoded_len_ui/two_path_list_items.rs
 create mode 100644 max-encoded-len/tests/max_encoded_len_ui/two_path_list_items.stderr
 rename {frame/support/test => max-encoded-len}/tests/max_encoded_len_ui/union.rs (70%)
 rename {frame/support/test => max-encoded-len}/tests/max_encoded_len_ui/union.stderr (100%)
 rename {frame/support/test => max-encoded-len}/tests/max_encoded_len_ui/unsupported_variant.rs (77%)
 rename {frame/support/test => max-encoded-len}/tests/max_encoded_len_ui/unsupported_variant.stderr (100%)

diff --git a/Cargo.lock b/Cargo.lock
index f7934072cc70..b866304222c6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,7 +1,5 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
-
 [[package]]
 name = "Inflector"
 version = "0.11.4"
@@ -1829,6 +1827,7 @@ dependencies = [
  "frame-system",
  "impl-trait-for-tuples",
  "log",
+ "max-encoded-len",
  "once_cell",
  "parity-scale-codec",
  "parity-util-mem",
@@ -3730,6 +3729,29 @@ dependencies = [
  "rawpointer",
 ]
 
+[[package]]
+name = "max-encoded-len"
+version = "3.0.0"
+dependencies = [
+ "frame-support",
+ "impl-trait-for-tuples",
+ "max-encoded-len-derive",
+ "parity-scale-codec",
+ "primitive-types",
+ "rustversion",
+ "trybuild",
+]
+
+[[package]]
+name = "max-encoded-len-derive"
+version = "3.0.0"
+dependencies = [
+ "proc-macro-crate 1.0.0",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "maybe-uninit"
 version = "2.0.0"
@@ -4302,6 +4324,7 @@ dependencies = [
  "frame-try-runtime",
  "hex-literal",
  "log",
+ "max-encoded-len",
  "node-primitives",
  "pallet-assets",
  "pallet-authority-discovery",
@@ -4635,6 +4658,7 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "max-encoded-len",
  "pallet-balances",
  "parity-scale-codec",
  "sp-core",
@@ -4745,6 +4769,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "log",
+ "max-encoded-len",
  "pallet-transaction-payment",
  "parity-scale-codec",
  "sp-core",
@@ -5270,6 +5295,7 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "max-encoded-len",
  "pallet-balances",
  "pallet-utility",
  "parity-scale-codec",
@@ -5644,9 +5670,9 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "731f4d179ed52b1c7eeb29baf29c604ea9301b889b23ce93660220a5465d5c6f"
+checksum = "e0f518afaa5a47d0d6386229b0a6e01e86427291d643aa4cabb4992219f504f8"
 dependencies = [
  "arrayvec 0.7.0",
  "bitvec",
@@ -8556,6 +8582,7 @@ dependencies = [
 name = "sp-application-crypto"
 version = "3.0.0"
 dependencies = [
+ "max-encoded-len",
  "parity-scale-codec",
  "serde",
  "sp-core",
@@ -8775,6 +8802,7 @@ dependencies = [
  "lazy_static",
  "libsecp256k1",
  "log",
+ "max-encoded-len",
  "merlin",
  "num-traits",
  "parity-scale-codec",
@@ -9001,6 +9029,7 @@ dependencies = [
  "hash256-std-hasher",
  "impl-trait-for-tuples",
  "log",
+ "max-encoded-len",
  "parity-scale-codec",
  "parity-util-mem",
  "paste 1.0.4",
@@ -10462,9 +10491,9 @@ dependencies = [
 
 [[package]]
 name = "trybuild"
-version = "1.0.41"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99471a206425fba51842a9186315f32d91c56eadc21ea4c21f847b59cf778f8b"
+checksum = "1768998d9a3b179411618e377dbb134c58a88cda284b0aa71c42c40660127d46"
 dependencies = [
  "dissimilar",
  "glob",
diff --git a/Cargo.toml b/Cargo.toml
index 9d7017be1d0d..5bd83b70f4c2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -202,6 +202,9 @@ members = [
 	"utils/frame/rpc/system",
 	"utils/prometheus",
 	"utils/wasm-builder",
+	# temp deps
+	"max-encoded-len",
+	"max-encoded-len/derive",
 ]
 
 # The list of dependencies below (which can be both direct and indirect dependencies) are crates
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index 16189a23289f..335d9a1aa2a9 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -87,6 +87,8 @@ pallet-transaction-payment = { version = "3.0.0", default-features = false, path
 pallet-transaction-payment-rpc-runtime-api = { version = "3.0.0", default-features = false, path = "../../../frame/transaction-payment/rpc/runtime-api/" }
 pallet-vesting = { version = "3.0.0", default-features = false, path = "../../../frame/vesting" }
 
+max-encoded-len = { version = "3.0.0", default-features = false, path = "../../../max-encoded-len", features = [ "derive" ] }
+
 [build-dependencies]
 substrate-wasm-builder = { version = "4.0.0", path = "../../../utils/wasm-builder" }
 
@@ -159,6 +161,7 @@ std = [
 	"log/std",
 	"frame-try-runtime/std",
 	"sp-npos-elections/std",
+	"max-encoded-len/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 92f3d43901a9..c51799d11a94 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -33,7 +33,7 @@ use frame_support::{
 	},
 	traits::{
 		Currency, Imbalance, KeyOwnerProofSystem, OnUnbalanced, LockIdentifier,
-		U128CurrencyToVote,
+		U128CurrencyToVote, MaxEncodedLen,
 	},
 };
 use frame_system::{
@@ -114,8 +114,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	// and set impl_version to 0. If only runtime
 	// implementation changes and behavior does not, then leave spec_version as
 	// is and increment impl_version.
-	spec_version: 265,
-	impl_version: 1,
+	spec_version: 266,
+	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 2,
 };
@@ -253,7 +253,7 @@ parameter_types! {
 }
 
 /// The type used to represent the kinds of proxying allowed.
-#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, RuntimeDebug)]
+#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, RuntimeDebug, MaxEncodedLen)]
 pub enum ProxyType {
 	Any,
 	NonTransfer,
diff --git a/frame/assets/Cargo.toml b/frame/assets/Cargo.toml
index 7137cf1d789a..7afd08d8c11f 100644
--- a/frame/assets/Cargo.toml
+++ b/frame/assets/Cargo.toml
@@ -22,6 +22,7 @@ frame-support = { version = "3.0.0", default-features = false, path = "../suppor
 # `system` module provides us with all sorts of useful stuff and macros depend on it being around.
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
+max-encoded-len = { version = "3.0.0", default-features = false, path = "../../max-encoded-len", features = [ "derive" ] }
 
 [dev-dependencies]
 sp-core = { version = "3.0.0", path = "../../primitives/core" }
@@ -38,6 +39,7 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 	"frame-benchmarking/std",
+	"max-encoded-len/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index e856211289b0..ccbe1920e997 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -138,14 +138,15 @@ mod functions;
 mod types;
 pub use types::*;
 
-use sp_std::{prelude::*, borrow::Borrow};
+use sp_std::{prelude::*, borrow::Borrow, convert::TryInto};
 use sp_runtime::{
-	RuntimeDebug, TokenError, ArithmeticError, traits::{
+	TokenError, ArithmeticError,
+	traits::{
 		AtLeast32BitUnsigned, Zero, StaticLookup, Saturating, CheckedSub, CheckedAdd, Bounded,
 		StoredMapError,
 	}
 };
-use codec::{Encode, Decode, HasCompact};
+use codec::HasCompact;
 use frame_support::{ensure, dispatch::{DispatchError, DispatchResult}};
 use frame_support::traits::{Currency, ReservableCurrency, BalanceStatus::Reserved, StoredMap};
 use frame_support::traits::tokens::{WithdrawConsequence, DepositConsequence, fungibles};
@@ -165,6 +166,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::generate_storage_info]
 	pub struct Pallet<T, I = ()>(_);
 
 	#[pallet::config]
@@ -174,10 +176,10 @@ pub mod pallet {
 		type Event: From<Event<Self, I>> + IsType<<Self as frame_system::Config>::Event>;
 
 		/// The units in which we record balances.
-		type Balance: Member + Parameter + AtLeast32BitUnsigned + Default + Copy;
+		type Balance: Member + Parameter + AtLeast32BitUnsigned + Default + Copy + MaxEncodedLen;
 
 		/// Identifier for the class of asset.
-		type AssetId: Member + Parameter + Default + Copy + HasCompact;
+		type AssetId: Member + Parameter + Default + Copy + HasCompact + MaxEncodedLen;
 
 		/// The currency mechanism.
 		type Currency: ReservableCurrency<Self::AccountId>;
@@ -207,7 +209,7 @@ pub mod pallet {
 		type Freezer: FrozenBalance<Self::AssetId, Self::AccountId, Self::Balance>;
 
 		/// Additional data to be stored with an account's asset balance.
-		type Extra: Member + Parameter + Default;
+		type Extra: Member + Parameter + Default + MaxEncodedLen;
 
 		/// Weight information for extrinsics in this pallet.
 		type WeightInfo: WeightInfo;
@@ -232,6 +234,8 @@ pub mod pallet {
 		T::AccountId,
 		AssetBalance<T::Balance, T::Extra>,
 		ValueQuery,
+		GetDefault,
+		ConstU32<300_000>,
 	>;
 
 	#[pallet::storage]
@@ -247,6 +251,8 @@ pub mod pallet {
 		),
 		Approval<T::Balance, DepositBalanceOf<T, I>>,
 		OptionQuery,
+		GetDefault,
+		ConstU32<300_000>,
 	>;
 
 	#[pallet::storage]
@@ -255,8 +261,10 @@ pub mod pallet {
 		_,
 		Blake2_128Concat,
 		T::AssetId,
-		AssetMetadata<DepositBalanceOf<T, I>>,
+		AssetMetadata<DepositBalanceOf<T, I>, BoundedVec<u8, T::StringLimit>>,
 		ValueQuery,
+		GetDefault,
+		ConstU32<300_000>,
 	>;
 
 	#[pallet::event]
@@ -899,8 +907,14 @@ pub mod pallet {
 		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
 
-			ensure!(name.len() <= T::StringLimit::get() as usize, Error::<T, I>::BadMetadata);
-			ensure!(symbol.len() <= T::StringLimit::get() as usize, Error::<T, I>::BadMetadata);
+			let bounded_name: BoundedVec<u8, T::StringLimit> = name
+				.clone()
+				.try_into()
+				.map_err(|_| Error::<T, I>::BadMetadata)?;
+			let bounded_symbol: BoundedVec<u8, T::StringLimit> = symbol
+				.clone()
+				.try_into()
+				.map_err(|_| Error::<T, I>::BadMetadata)?;
 
 			let d = Asset::<T, I>::get(id).ok_or(Error::<T, I>::Unknown)?;
 			ensure!(&origin == &d.owner, Error::<T, I>::NoPermission);
@@ -924,8 +938,8 @@ pub mod pallet {
 
 				*metadata = Some(AssetMetadata {
 					deposit: new_deposit,
-					name: name.clone(),
-					symbol: symbol.clone(),
+					name: bounded_name,
+					symbol: bounded_symbol,
 					decimals,
 					is_frozen: false,
 				});
@@ -989,16 +1003,23 @@ pub mod pallet {
 		) -> DispatchResult {
 			T::ForceOrigin::ensure_origin(origin)?;
 
-			ensure!(name.len() <= T::StringLimit::get() as usize, Error::<T, I>::BadMetadata);
-			ensure!(symbol.len() <= T::StringLimit::get() as usize, Error::<T, I>::BadMetadata);
+			let bounded_name: BoundedVec<u8, T::StringLimit> = name
+				.clone()
+				.try_into()
+				.map_err(|_| Error::<T, I>::BadMetadata)?;
+
+			let bounded_symbol: BoundedVec<u8, T::StringLimit> = symbol
+				.clone()
+				.try_into()
+				.map_err(|_| Error::<T, I>::BadMetadata)?;
 
 			ensure!(Asset::<T, I>::contains_key(id), Error::<T, I>::Unknown);
 			Metadata::<T, I>::try_mutate_exists(id, |metadata| {
 				let deposit = metadata.take().map_or(Zero::zero(), |m| m.deposit);
 				*metadata = Some(AssetMetadata {
 					deposit,
-					name: name.clone(),
-					symbol: symbol.clone(),
+					name: bounded_name,
+					symbol: bounded_symbol,
 					decimals,
 					is_frozen,
 				});
diff --git a/frame/assets/src/types.rs b/frame/assets/src/types.rs
index 0cfcb64e137f..afd6b536cf18 100644
--- a/frame/assets/src/types.rs
+++ b/frame/assets/src/types.rs
@@ -18,11 +18,12 @@
 //! Various basic types for use in the assets pallet.
 
 use super::*;
+use frame_support::pallet_prelude::*;
 
 pub(super) type DepositBalanceOf<T, I = ()> =
 	<<T as Config<I>>::Currency as Currency<<T as SystemConfig>::AccountId>>::Balance;
 
-#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug)]
+#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, MaxEncodedLen)]
 pub struct AssetDetails<
 	Balance,
 	AccountId,
@@ -66,7 +67,7 @@ impl<Balance, AccountId, DepositBalance> AssetDetails<Balance, AccountId, Deposi
 }
 
 /// Data concerning an approval.
-#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default)]
+#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default, MaxEncodedLen)]
 pub struct Approval<Balance, DepositBalance> {
 	/// The amount of funds approved for the balance transfer from the owner to some delegated
 	/// target.
@@ -75,7 +76,7 @@ pub struct Approval<Balance, DepositBalance> {
 	pub(super) deposit: DepositBalance,
 }
 
-#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default)]
+#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default, MaxEncodedLen)]
 pub struct AssetBalance<Balance, Extra> {
 	/// The balance.
 	pub(super) balance: Balance,
@@ -87,16 +88,16 @@ pub struct AssetBalance<Balance, Extra> {
 	pub(super) extra: Extra,
 }
 
-#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default)]
-pub struct AssetMetadata<DepositBalance> {
+#[derive(Clone, Encode, Decode, Eq, PartialEq, Default, RuntimeDebug, MaxEncodedLen)]
+pub struct AssetMetadata<DepositBalance, BoundedString> {
 	/// The balance deposited for this metadata.
 	///
 	/// This pays for the data stored in this struct.
 	pub(super) deposit: DepositBalance,
 	/// The user friendly name of this asset. Limited in length by `StringLimit`.
-	pub(super) name: Vec<u8>,
+	pub(super) name: BoundedString,
 	/// The ticker symbol for this asset. Limited in length by `StringLimit`.
-	pub(super) symbol: Vec<u8>,
+	pub(super) symbol: BoundedString,
 	/// The number of decimals this asset uses to represent one unit.
 	pub(super) decimals: u8,
 	/// Whether the asset metadata may be changed by a non Force origin.
@@ -104,7 +105,7 @@ pub struct AssetMetadata<DepositBalance> {
 }
 
 /// Witness data for the destroy transactions.
-#[derive(Copy, Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug)]
+#[derive(Copy, Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, MaxEncodedLen)]
 pub struct DestroyWitness {
 	/// The number of accounts holding the asset.
 	#[codec(compact)]
diff --git a/frame/balances/Cargo.toml b/frame/balances/Cargo.toml
index 116a52151583..c4ab509aa0d4 100644
--- a/frame/balances/Cargo.toml
+++ b/frame/balances/Cargo.toml
@@ -20,6 +20,7 @@ frame-benchmarking = { version = "3.1.0", default-features = false, path = "../b
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 log = { version = "0.4.14", default-features = false }
+max-encoded-len = { version = "3.0.0", default-features = false, path = "../../max-encoded-len", features = [ "derive" ] }
 
 [dev-dependencies]
 sp-io = { version = "3.0.0", path = "../../primitives/io" }
@@ -36,6 +37,7 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 	"log/std",
+	"max-encoded-len/std",
 ]
 runtime-benchmarks = ["frame-benchmarking"]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index c0566f84a1be..04dacc785864 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -159,9 +159,9 @@ use sp_std::prelude::*;
 use sp_std::{cmp, result, mem, fmt::Debug, ops::BitOr};
 use codec::{Codec, Encode, Decode};
 use frame_support::{
-	ensure,
+	ensure, WeakBoundedVec,
 	traits::{
-		Currency, OnUnbalanced, TryDrop, StoredMap,
+		Currency, OnUnbalanced, TryDrop, StoredMap, MaxEncodedLen,
 		WithdrawReasons, LockIdentifier, LockableCurrency, ExistenceRequirement,
 		Imbalance, SignedImbalance, ReservableCurrency, Get, ExistenceRequirement::KeepAlive,
 		ExistenceRequirement::AllowDeath,
@@ -193,7 +193,7 @@ pub mod pallet {
 	pub trait Config<I: 'static = ()>: frame_system::Config {
 		/// The balance of an account.
 		type Balance: Parameter + Member + AtLeast32BitUnsigned + Codec + Default + Copy +
-			MaybeSerializeDeserialize + Debug;
+			MaybeSerializeDeserialize + Debug + MaxEncodedLen;
 
 		/// Handler for the unbalanced reduction when removing a dust account.
 		type DustRemoval: OnUnbalanced<NegativeImbalance<Self, I>>;
@@ -218,6 +218,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::generate_storage_info]
 	pub struct Pallet<T, I=()>(PhantomData<(T, I)>);
 
 	#[pallet::call]
@@ -424,7 +425,9 @@ pub mod pallet {
 		Blake2_128Concat,
 		T::AccountId,
 		AccountData<T::Balance>,
-		ValueQuery
+		ValueQuery,
+		GetDefault,
+		ConstU32<300_000>,
 	>;
 
 	/// Any liquidity locks on some account balances.
@@ -435,8 +438,10 @@ pub mod pallet {
 		_,
 		Blake2_128Concat,
 		T::AccountId,
-		Vec<BalanceLock<T::Balance>>,
-		ValueQuery
+		WeakBoundedVec<BalanceLock<T::Balance>, T::MaxLocks>,
+		ValueQuery,
+		GetDefault,
+		ConstU32<300_000>,
 	>;
 
 	/// Storage version of the pallet.
@@ -513,7 +518,7 @@ impl<T: Config<I>, I: 'static> GenesisConfig<T, I> {
 }
 
 /// Simplified reasons for withdrawing balance.
-#[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, RuntimeDebug)]
+#[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, RuntimeDebug, MaxEncodedLen)]
 pub enum Reasons {
 	/// Paying system transaction fees.
 	Fee = 0,
@@ -545,7 +550,7 @@ impl BitOr for Reasons {
 
 /// A single lock on a balance. There can be many of these on an account and they "overlap", so the
 /// same balance is frozen by multiple locks.
-#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug)]
+#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, MaxEncodedLen)]
 pub struct BalanceLock<Balance> {
 	/// An identifier for this lock. Only one lock may be in existence for each identifier.
 	pub id: LockIdentifier,
@@ -556,7 +561,7 @@ pub struct BalanceLock<Balance> {
 }
 
 /// All balance information for an account.
-#[derive(Encode, Decode, Clone, PartialEq, Eq, Default, RuntimeDebug)]
+#[derive(Encode, Decode, Clone, PartialEq, Eq, Default, RuntimeDebug, MaxEncodedLen)]
 pub struct AccountData<Balance> {
 	/// Non-reserved part of the balance. There may still be restrictions on this, but it is the
 	/// total pool what may in principle be transferred, reserved and used for tipping.
@@ -602,7 +607,7 @@ impl<Balance: Saturating + Copy + Ord> AccountData<Balance> {
 // A value placed in storage that represents the current version of the Balances storage.
 // This value is used by the `on_runtime_upgrade` logic to determine whether we run
 // storage migration logic. This should match directly with the semantic versions of the Rust crate.
-#[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, RuntimeDebug)]
+#[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, RuntimeDebug, MaxEncodedLen)]
 enum Releases {
 	V1_0_0,
 	V2_0_0,
@@ -822,6 +827,11 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 
 	/// Update the account entry for `who`, given the locks.
 	fn update_locks(who: &T::AccountId, locks: &[BalanceLock<T::Balance>]) {
+		let bounded_locks = WeakBoundedVec::<_, T::MaxLocks>::force_from(
+			locks.to_vec(),
+			Some("Balances Update Locks"),
+		);
+
 		if locks.len() as u32 > T::MaxLocks::get() {
 			log::warn!(
 				target: "runtime::balances",
@@ -853,7 +863,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 				system::Pallet::<T>::dec_consumers(who);
 			}
 		} else {
-			Locks::<T, I>::insert(who, locks);
+			Locks::<T, I>::insert(who, bounded_locks);
 			if !existed {
 				if system::Pallet::<T>::inc_consumers(who).is_err() {
 					// No providers for the locks. This is impossible under normal circumstances
diff --git a/frame/proxy/Cargo.toml b/frame/proxy/Cargo.toml
index d8f7afe433cb..deec8aab7268 100644
--- a/frame/proxy/Cargo.toml
+++ b/frame/proxy/Cargo.toml
@@ -20,6 +20,7 @@ sp-core = { version = "3.0.0", default-features = false, path = "../../primitive
 sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+max-encoded-len = { version = "3.0.0", default-features = false, path = "../../max-encoded-len", features = [ "derive" ] }
 
 frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 
@@ -36,7 +37,8 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 	"sp-std/std",
-	"sp-io/std"
+	"sp-io/std",
+	"max-encoded-len/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
diff --git a/frame/proxy/src/lib.rs b/frame/proxy/src/lib.rs
index 0f541bd4d45e..f308dbd28955 100644
--- a/frame/proxy/src/lib.rs
+++ b/frame/proxy/src/lib.rs
@@ -33,7 +33,7 @@ mod tests;
 mod benchmarking;
 pub mod weights;
 
-use sp_std::prelude::*;
+use sp_std::{prelude::*, convert::TryInto};
 use codec::{Encode, Decode};
 use sp_io::hashing::blake2_256;
 use sp_runtime::{
@@ -43,8 +43,11 @@ use sp_runtime::{
 use frame_support::{
 		RuntimeDebug, ensure,
 		dispatch::{DispatchResultWithPostInfo, PostDispatchInfo},
-		traits::{Get, ReservableCurrency, Currency, InstanceFilter, OriginTrait, IsType, IsSubType},
-		weights::{Weight, GetDispatchInfo}
+		traits::{
+			Get, ReservableCurrency, Currency, InstanceFilter, OriginTrait,
+			IsType, IsSubType, MaxEncodedLen,
+		},
+		weights::GetDispatchInfo,
 };
 use frame_system::{self as system};
 use frame_support::dispatch::DispatchError;
@@ -58,7 +61,7 @@ type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Con
 
 /// The parameters under which a particular account has a proxy relationship with some other
 /// account.
-#[derive(Encode, Decode, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, RuntimeDebug)]
+#[derive(Encode, Decode, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, RuntimeDebug, MaxEncodedLen)]
 pub struct ProxyDefinition<AccountId, ProxyType, BlockNumber> {
 	/// The account which may act on behalf of another.
 	delegate: AccountId,
@@ -70,7 +73,7 @@ pub struct ProxyDefinition<AccountId, ProxyType, BlockNumber> {
 }
 
 /// Details surrounding a specific instance of an announcement to make a call.
-#[derive(Encode, Decode, Clone, Copy, Eq, PartialEq, RuntimeDebug)]
+#[derive(Encode, Decode, Clone, Copy, Eq, PartialEq, RuntimeDebug, MaxEncodedLen)]
 pub struct Announcement<AccountId, Hash, BlockNumber> {
 	/// The account which made the announcement.
 	real: AccountId,
@@ -88,6 +91,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::generate_storage_info]
 	pub struct Pallet<T>(_);
 
 	/// Configuration trait.
@@ -109,7 +113,7 @@ pub mod pallet {
 		///
 		/// IMPORTANT: `Default` must be provided and MUST BE the the *most permissive* value.
 		type ProxyType: Parameter + Member + Ord + PartialOrd + InstanceFilter<<Self as Config>::Call>
-			+ Default;
+			+ Default + MaxEncodedLen;
 
 		/// The base amount of currency needed to reserve for creating a proxy.
 		///
@@ -128,7 +132,7 @@ pub mod pallet {
 
 		/// The maximum amount of proxies allowed for a single account.
 		#[pallet::constant]
-		type MaxProxies: Get<u16>;
+		type MaxProxies: Get<u32>;
 
 		/// Weight information for extrinsics in this pallet.
 		type WeightInfo: WeightInfo;
@@ -293,14 +297,20 @@ pub mod pallet {
 
 			let anonymous = Self::anonymous_account(&who, &proxy_type, index, None);
 			ensure!(!Proxies::<T>::contains_key(&anonymous), Error::<T>::Duplicate);
-			let deposit = T::ProxyDepositBase::get() + T::ProxyDepositFactor::get();
-			T::Currency::reserve(&who, deposit)?;
+
 			let proxy_def = ProxyDefinition {
 				delegate: who.clone(),
 				proxy_type: proxy_type.clone(),
 				delay,
 			};
-			Proxies::<T>::insert(&anonymous, (vec![proxy_def], deposit));
+			let bounded_proxies: BoundedVec<_, T::MaxProxies> = vec![proxy_def]
+				.try_into()
+				.map_err(|_| Error::<T>::TooMany)?;
+
+			let deposit = T::ProxyDepositBase::get() + T::ProxyDepositFactor::get();
+			T::Currency::reserve(&who, deposit)?;
+
+			Proxies::<T>::insert(&anonymous, (bounded_proxies, deposit));
 			Self::deposit_event(Event::AnonymousCreated(anonymous, who, proxy_type, index));
 
 			Ok(().into())
@@ -386,8 +396,7 @@ pub mod pallet {
 			};
 
 			Announcements::<T>::try_mutate(&who, |(ref mut pending, ref mut deposit)| {
-				ensure!(pending.len() < T::MaxPending::get() as usize, Error::<T>::TooMany);
-				pending.push(announcement);
+				pending.try_push(announcement).map_err(|_| Error::<T>::TooMany)?;
 				Self::rejig_deposit(
 					&who,
 					*deposit,
@@ -555,7 +564,13 @@ pub mod pallet {
 		_,
 		Twox64Concat,
 		T::AccountId,
-		(Vec<ProxyDefinition<T::AccountId, T::ProxyType, T::BlockNumber>>, BalanceOf<T>),
+		(
+			BoundedVec<
+				ProxyDefinition<T::AccountId, T::ProxyType, T::BlockNumber>,
+				T::MaxProxies,
+			>,
+			BalanceOf<T>
+		),
 		ValueQuery
 	>;
 
@@ -566,7 +581,13 @@ pub mod pallet {
 		_,
 		Twox64Concat,
 		T::AccountId,
-		(Vec<Announcement<T::AccountId, CallHashOf<T>, T::BlockNumber>>, BalanceOf<T>),
+		(
+			BoundedVec<
+				Announcement<T::AccountId, CallHashOf<T>, T::BlockNumber>,
+				T::MaxPending,
+			>,
+			BalanceOf<T>,
+		),
 		ValueQuery
 	>;
 
@@ -616,10 +637,9 @@ impl<T: Config> Pallet<T> {
 	) -> DispatchResultWithPostInfo {
 		ensure!(delegator != &delegatee, Error::<T>::NoSelfProxy);
 		Proxies::<T>::try_mutate(delegator, |(ref mut proxies, ref mut deposit)| {
-			ensure!(proxies.len() < T::MaxProxies::get() as usize, Error::<T>::TooMany);
 			let proxy_def = ProxyDefinition { delegate: delegatee, proxy_type, delay };
 			let i = proxies.binary_search(&proxy_def).err().ok_or(Error::<T>::Duplicate)?;
-			proxies.insert(i, proxy_def);
+			proxies.try_insert(i, proxy_def).map_err(|_| Error::<T>::TooMany)?;
 			let new_deposit = Self::deposit(proxies.len() as u32);
 			if new_deposit > *deposit {
 				T::Currency::reserve(delegator, new_deposit - *deposit)?;
@@ -749,32 +769,3 @@ impl<T: Config> Pallet<T> {
 		Self::deposit_event(Event::ProxyExecuted(e.map(|_| ()).map_err(|e| e.error)));
 	}
 }
-
-/// Migration utilities for upgrading the Proxy pallet between its different versions.
-pub mod migration {
-	use super::*;
-
-	/// Migration code for <https://github.com/paritytech/substrate/pull/6770>
-	///
-	/// Details: This migration was introduced between Substrate 2.0-RC6 and Substrate 2.0 releases.
-	/// Before this migration, the `Proxies` storage item used a tuple of `AccountId` and
-	/// `ProxyType` to represent the proxy definition. After #6770, we switched to use a struct
-	/// `ProxyDefinition` which additionally included a `BlockNumber` delay value. This function,
-	/// simply takes any existing proxies using the old tuple format, and migrates it to the new
-	/// struct by setting the delay to zero.
-	pub fn migrate_to_time_delayed_proxies<T: Config>() -> Weight {
-		Proxies::<T>::translate::<(Vec<(T::AccountId, T::ProxyType)>, BalanceOf<T>), _>(
-			|_, (targets, deposit)| Some((
-				targets.into_iter()
-					.map(|(a, t)| ProxyDefinition {
-						delegate: a,
-						proxy_type: t,
-						delay: Zero::zero(),
-					})
-					.collect::<Vec<_>>(),
-				deposit,
-			))
-		);
-		T::BlockWeights::get().max_block
-	}
-}
diff --git a/frame/proxy/src/tests.rs b/frame/proxy/src/tests.rs
index 0b34edb43e73..fd632b91bb35 100644
--- a/frame/proxy/src/tests.rs
+++ b/frame/proxy/src/tests.rs
@@ -100,7 +100,10 @@ parameter_types! {
 	pub const AnnouncementDepositBase: u64 = 1;
 	pub const AnnouncementDepositFactor: u64 = 1;
 }
-#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, RuntimeDebug)]
+#[derive(
+	Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, RuntimeDebug,
+	max_encoded_len::MaxEncodedLen,
+)]
 pub enum ProxyType {
 	Any,
 	JustTransfer,
@@ -180,15 +183,17 @@ fn announcement_works() {
 		assert_eq!(Balances::reserved_balance(3), 0);
 
 		assert_ok!(Proxy::announce(Origin::signed(3), 1, [1; 32].into()));
-		assert_eq!(Announcements::<Test>::get(3), (vec![Announcement {
+		let announcements = Announcements::<Test>::get(3);
+		assert_eq!(announcements.0, vec![Announcement {
 			real: 1,
 			call_hash: [1; 32].into(),
 			height: 1,
-		}], 2));
-		assert_eq!(Balances::reserved_balance(3), 2);
+		}]);
+		assert_eq!(Balances::reserved_balance(3), announcements.1);
 
 		assert_ok!(Proxy::announce(Origin::signed(3), 2, [2; 32].into()));
-		assert_eq!(Announcements::<Test>::get(3), (vec![
+		let announcements = Announcements::<Test>::get(3);
+		assert_eq!(announcements.0, vec![
 			Announcement {
 				real: 1,
 				call_hash: [1; 32].into(),
@@ -199,8 +204,8 @@ fn announcement_works() {
 				call_hash: [2; 32].into(),
 				height: 1,
 			},
-		], 3));
-		assert_eq!(Balances::reserved_balance(3), 3);
+		]);
+		assert_eq!(Balances::reserved_balance(3), announcements.1);
 
 		assert_noop!(Proxy::announce(Origin::signed(3), 2, [3; 32].into()), Error::<Test>::TooMany);
 	});
@@ -216,12 +221,13 @@ fn remove_announcement_works() {
 		let e = Error::<Test>::NotFound;
 		assert_noop!(Proxy::remove_announcement(Origin::signed(3), 1, [0; 32].into()), e);
 		assert_ok!(Proxy::remove_announcement(Origin::signed(3), 1, [1; 32].into()));
-		assert_eq!(Announcements::<Test>::get(3), (vec![Announcement {
+		let announcements = Announcements::<Test>::get(3);
+		assert_eq!(announcements.0, vec![Announcement {
 			real: 2,
 			call_hash: [2; 32].into(),
 			height: 1,
-		}], 2));
-		assert_eq!(Balances::reserved_balance(3), 2);
+		}]);
+		assert_eq!(Balances::reserved_balance(3), announcements.1);
 	});
 }
 
@@ -237,12 +243,13 @@ fn reject_announcement_works() {
 		let e = Error::<Test>::NotFound;
 		assert_noop!(Proxy::reject_announcement(Origin::signed(4), 3, [1; 32].into()), e);
 		assert_ok!(Proxy::reject_announcement(Origin::signed(1), 3, [1; 32].into()));
-		assert_eq!(Announcements::<Test>::get(3), (vec![Announcement {
+		let announcements = Announcements::<Test>::get(3);
+		assert_eq!(announcements.0, vec![Announcement {
 			real: 2,
 			call_hash: [2; 32].into(),
 			height: 1,
-		}], 2));
-		assert_eq!(Balances::reserved_balance(3), 2);
+		}]);
+		assert_eq!(Balances::reserved_balance(3), announcements.1);
 	});
 }
 
@@ -284,12 +291,13 @@ fn proxy_announced_removes_announcement_and_returns_deposit() {
 
 		system::Pallet::<Test>::set_block_number(2);
 		assert_ok!(Proxy::proxy_announced(Origin::signed(0), 3, 1, None, call.clone()));
-		assert_eq!(Announcements::<Test>::get(3), (vec![Announcement {
+		let announcements = Announcements::<Test>::get(3);
+		assert_eq!(announcements.0, vec![Announcement {
 			real: 2,
 			call_hash,
 			height: 1,
-		}], 2));
-		assert_eq!(Balances::reserved_balance(3), 2);
+		}]);
+		assert_eq!(Balances::reserved_balance(3), announcements.1);
 	});
 }
 
diff --git a/frame/sudo/src/lib.rs b/frame/sudo/src/lib.rs
index 839c819c8d95..51cc1df05070 100644
--- a/frame/sudo/src/lib.rs
+++ b/frame/sudo/src/lib.rs
@@ -125,6 +125,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::generate_storage_info]
 	pub struct Pallet<T>(PhantomData<T>);
 
 	#[pallet::call]
diff --git a/frame/support/Cargo.toml b/frame/support/Cargo.toml
index 173e3da27984..0c9aacaf307b 100644
--- a/frame/support/Cargo.toml
+++ b/frame/support/Cargo.toml
@@ -16,6 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.1.0", default-features = false, features = ["derive"] }
 frame-metadata = { version = "13.0.0", default-features = false, path = "../metadata" }
+max-encoded-len = { version = "3.0.0", default-features = false, path = "../../max-encoded-len", features = [ "derive" ] }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
@@ -55,6 +56,7 @@ std = [
 	"sp-state-machine",
 	"frame-support-procedural/std",
 	"log/std",
+	"max-encoded-len/std",
 ]
 runtime-benchmarks = []
 try-runtime = []
diff --git a/frame/support/procedural/src/lib.rs b/frame/support/procedural/src/lib.rs
index 13b3f317e144..23cb557e6dd7 100644
--- a/frame/support/procedural/src/lib.rs
+++ b/frame/support/procedural/src/lib.rs
@@ -28,7 +28,6 @@ mod debug_no_bound;
 mod clone_no_bound;
 mod partial_eq_no_bound;
 mod default_no_bound;
-mod max_encoded_len;
 mod key_prefix;
 
 pub(crate) use storage::INHERENT_INSTANCE_NAME;
@@ -447,12 +446,6 @@ pub fn crate_to_pallet_version(input: TokenStream) -> TokenStream {
 /// and up to `NUMBER_OF_INSTANCE`.
 pub(crate) const NUMBER_OF_INSTANCE: u8 = 16;
 
-/// Derive `MaxEncodedLen`.
-#[proc_macro_derive(MaxEncodedLen)]
-pub fn derive_max_encoded_len(input: TokenStream) -> TokenStream {
-	max_encoded_len::derive_max_encoded_len(input)
-}
-
 /// This macro is meant to be used by frame-support only.
 /// It implements the trait `HasKeyPrefix` and `HasReversibleKeyPrefix` for tuple of `Key`.
 #[proc_macro]
diff --git a/frame/support/procedural/src/storage/mod.rs b/frame/support/procedural/src/storage/mod.rs
index 3a1915e43144..570ef447a43c 100644
--- a/frame/support/procedural/src/storage/mod.rs
+++ b/frame/support/procedural/src/storage/mod.rs
@@ -117,7 +117,7 @@ impl From<DeclStorageDef> for DeclStorageDefExt {
 	fn from(mut def: DeclStorageDef) -> Self {
 		let hidden_crate_name = def.hidden_crate.as_ref().map(|i| i.to_string())
 			.unwrap_or_else(|| "decl_storage".to_string());
-	
+
 		let hidden_crate = generate_crate_access(&hidden_crate_name, "frame-support");
 		let hidden_imports = generate_hidden_includes(&hidden_crate_name, "frame-support");
 
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index edbc69df26b7..c1aadc6fa57d 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -76,7 +76,7 @@ pub use self::hash::{
 pub use self::storage::{
 	StorageValue, StorageMap, StorageDoubleMap, StorageNMap, StoragePrefixedMap,
 	IterableStorageMap, IterableStorageDoubleMap, IterableStorageNMap, migration,
-	bounded_vec::{self, BoundedVec},
+	bounded_vec::BoundedVec, weak_bounded_vec::WeakBoundedVec,
 };
 pub use self::dispatch::{Parameter, Callable};
 pub use sp_runtime::{self, ConsensusEngineId, print, traits::Printable};
@@ -1239,7 +1239,7 @@ pub mod pallet_prelude {
 		RuntimeDebug, storage,
 		traits::{
 			Get, Hooks, IsType, GetPalletVersion, EnsureOrigin, PalletInfoAccess, StorageInfoTrait,
-			ConstU32, GetDefault,
+			ConstU32, GetDefault, MaxEncodedLen,
 		},
 		dispatch::{DispatchResultWithPostInfo, Parameter, DispatchError, DispatchResult},
 		weights::{DispatchClass, Pays, Weight},
@@ -2339,3 +2339,7 @@ pub mod pallet_prelude {
 /// * use the newest nightly possible.
 ///
 pub use frame_support_procedural::pallet;
+
+/// The `max_encoded_len` module contains the `MaxEncodedLen` trait and derive macro, which is
+/// useful for computing upper bounds on storage size.
+pub use max_encoded_len;
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index 295995b1bfeb..52def92ef9b4 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -81,33 +81,5 @@ pub use dispatch::{EnsureOrigin, OriginTrait, UnfilteredDispatchable};
 mod voting;
 pub use voting::{CurrencyToVote, SaturatingCurrencyToVote, U128CurrencyToVote};
 
-mod max_encoded_len;
-// This looks like an overlapping import/export, but it isn't:
-// macros and traits live in distinct namespaces.
+// for backwards-compatibility with existing imports
 pub use max_encoded_len::MaxEncodedLen;
-/// Derive [`MaxEncodedLen`][max_encoded_len::MaxEncodedLen].
-///
-/// # Examples
-///
-/// ```
-/// # use codec::Encode;
-/// # use frame_support::traits::MaxEncodedLen;
-/// #[derive(Encode, MaxEncodedLen)]
-/// struct TupleStruct(u8, u32);
-///
-/// assert_eq!(TupleStruct::max_encoded_len(), u8::max_encoded_len() + u32::max_encoded_len());
-/// ```
-///
-/// ```
-/// # use codec::Encode;
-/// # use frame_support::traits::MaxEncodedLen;
-/// #[derive(Encode, MaxEncodedLen)]
-/// enum GenericEnum<T> {
-/// 	A,
-/// 	B(T),
-/// }
-///
-/// assert_eq!(GenericEnum::<u8>::max_encoded_len(), u8::max_encoded_len() + u8::max_encoded_len());
-/// assert_eq!(GenericEnum::<u128>::max_encoded_len(), u8::max_encoded_len() + u128::max_encoded_len());
-/// ```
-pub use frame_support_procedural::MaxEncodedLen;
diff --git a/frame/support/src/traits/tokens/currency.rs b/frame/support/src/traits/tokens/currency.rs
index 567ca44aa78c..a18e0b6593bc 100644
--- a/frame/support/src/traits/tokens/currency.rs
+++ b/frame/support/src/traits/tokens/currency.rs
@@ -22,7 +22,7 @@ use sp_runtime::traits::MaybeSerializeDeserialize;
 use crate::dispatch::{DispatchResult, DispatchError};
 use super::misc::{Balance, WithdrawReasons, ExistenceRequirement};
 use super::imbalance::{Imbalance, SignedImbalance};
-
+use frame_support::traits::MaxEncodedLen;
 
 mod reservable;
 pub use reservable::ReservableCurrency;
@@ -32,7 +32,7 @@ pub use lockable::{LockableCurrency, VestingSchedule, LockIdentifier};
 /// Abstraction over a fungible assets system.
 pub trait Currency<AccountId> {
 	/// The balance of an account.
-	type Balance: Balance + MaybeSerializeDeserialize + Debug;
+	type Balance: Balance + MaybeSerializeDeserialize + Debug + MaxEncodedLen;
 
 	/// The opaque token type for an imbalance. This is returned by unbalanced operations
 	/// and must be dealt with. It may be dropped but cannot be cloned.
diff --git a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr
index e3e94f1fc3eb..1d0e96be9edb 100644
--- a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr
+++ b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr
@@ -4,7 +4,7 @@ error[E0277]: the trait bound `<T as pallet::Config>::Bar: WrapperTypeDecode` is
 20  |         fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
     |                                           ^ the trait `WrapperTypeDecode` is not implemented for `<T as pallet::Config>::Bar`
     |
-   ::: /usr/local/cargo/registry/src/github.com-1ecc6299db9ec823/parity-scale-codec-2.1.0/src/codec.rs:277:18
+   ::: /usr/local/cargo/registry/src/github.com-1ecc6299db9ec823/parity-scale-codec-2.1.1/src/codec.rs:277:18
     |
 277 |     fn decode<I: Input>(input: &mut I) -> Result<Self, Error>;
     |                  ----- required by this bound in `pallet::_::_parity_scale_codec::Decode::decode`
@@ -17,7 +17,7 @@ error[E0277]: the trait bound `<T as pallet::Config>::Bar: WrapperTypeEncode` is
 20  |         fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
     |                                           ^ the trait `WrapperTypeEncode` is not implemented for `<T as pallet::Config>::Bar`
     |
-   ::: /usr/local/cargo/registry/src/github.com-1ecc6299db9ec823/parity-scale-codec-2.1.0/src/codec.rs:216:21
+   ::: /usr/local/cargo/registry/src/github.com-1ecc6299db9ec823/parity-scale-codec-2.1.1/src/codec.rs:216:21
     |
 216 |     fn encode_to<T: Output + ?Sized>(&self, dest: &mut T) {
     |                     ------ required by this bound in `encode_to`
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index 8595b94c08de..6938df7e86c2 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -88,7 +88,7 @@ use frame_support::{
 	Parameter, storage,
 	traits::{
 		SortedMembers, Get, PalletInfo, OnNewAccount, OnKilledAccount, HandleLifetime,
-		StoredMap, EnsureOrigin, OriginTrait, Filter,
+		StoredMap, EnsureOrigin, OriginTrait, Filter, MaxEncodedLen,
 	},
 	weights::{
 		Weight, RuntimeDbWeight, DispatchInfo, DispatchClass,
@@ -194,19 +194,20 @@ pub mod pallet {
 		type BlockNumber:
 			Parameter + Member + MaybeSerializeDeserialize + Debug + MaybeDisplay +
 			AtLeast32BitUnsigned + Default + Bounded + Copy + sp_std::hash::Hash +
-			sp_std::str::FromStr + MaybeMallocSizeOf;
+			sp_std::str::FromStr + MaybeMallocSizeOf + MaxEncodedLen;
 
 		/// The output of the `Hashing` function.
 		type Hash:
 			Parameter + Member + MaybeSerializeDeserialize + Debug + MaybeDisplay + SimpleBitOps + Ord
-			+ Default + Copy + CheckEqual + sp_std::hash::Hash + AsRef<[u8]> + AsMut<[u8]> + MaybeMallocSizeOf;
+			+ Default + Copy + CheckEqual + sp_std::hash::Hash + AsRef<[u8]> + AsMut<[u8]>
+			+ MaybeMallocSizeOf + MaxEncodedLen;
 
 		/// The hashing system (algorithm) being used in the runtime (e.g. Blake2).
 		type Hashing: Hash<Output=Self::Hash>;
 
 		/// The user account identifier type for the runtime.
 		type AccountId: Parameter + Member + MaybeSerializeDeserialize + Debug + MaybeDisplay + Ord
-			+ Default;
+			+ Default + MaxEncodedLen;
 
 		/// Converting trait to take a source type and convert to `AccountId`.
 		///
diff --git a/frame/timestamp/src/lib.rs b/frame/timestamp/src/lib.rs
index dde635c6a8a3..3315fadb1c1c 100644
--- a/frame/timestamp/src/lib.rs
+++ b/frame/timestamp/src/lib.rs
@@ -116,7 +116,7 @@ pub mod pallet {
 	pub trait Config: frame_system::Config {
 		/// Type used for expressing timestamp.
 		type Moment: Parameter + Default + AtLeast32Bit
-			+ Scale<Self::BlockNumber, Output = Self::Moment> + Copy;
+			+ Scale<Self::BlockNumber, Output = Self::Moment> + Copy + MaxEncodedLen;
 
 		/// Something which can be notified when the timestamp is set. Set this to `()` if not needed.
 		type OnTimestampSet: OnTimestampSet<Self::Moment>;
@@ -134,6 +134,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::generate_storage_info]
 	pub struct Pallet<T>(PhantomData<T>);
 
 	/// Current time for the current block.
diff --git a/max-encoded-len/Cargo.toml b/max-encoded-len/Cargo.toml
new file mode 100644
index 000000000000..994a3c6a5e13
--- /dev/null
+++ b/max-encoded-len/Cargo.toml
@@ -0,0 +1,36 @@
+[package]
+name = "max-encoded-len"
+version = "3.0.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
+license = "Apache-2.0"
+homepage = "https://substrate.dev"
+repository = "https://github.com/paritytech/substrate/"
+description = "Trait MaxEncodedLen bounds the max encoded length of an item."
+
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
+impl-trait-for-tuples = "0.2.1"
+max-encoded-len-derive = { package = "max-encoded-len-derive", version = "3.0.0", path = "derive", default-features = false, optional = true }
+primitive-types = { version = "0.9.0", default-features = false, features = ["codec"] }
+
+[dev-dependencies]
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [ "derive" ] }
+frame-support = { path = "../frame/support" }
+rustversion = "1.0.4"
+trybuild = "1.0.42"
+
+[features]
+default = [
+	"derive",
+	"std",
+]
+derive = [
+	"max-encoded-len-derive",
+]
+std = [
+	"codec/std",
+	"max-encoded-len-derive/std",
+	"primitive-types/std",
+]
diff --git a/max-encoded-len/derive/Cargo.toml b/max-encoded-len/derive/Cargo.toml
new file mode 100644
index 000000000000..42c13dc50edd
--- /dev/null
+++ b/max-encoded-len/derive/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+name = "max-encoded-len-derive"
+version = "3.0.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
+license = "Apache-2.0"
+homepage = "https://substrate.dev"
+repository = "https://github.com/paritytech/substrate/"
+description = "Derive support for MaxEncodedLen"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+proc-macro = true
+
+[dependencies]
+proc-macro2 = "1.0.6"
+proc-macro-crate = "1.0.0"
+quote = "1.0.3"
+syn = { version = "1.0.58", features = ["full"] }
+
+[features]
+default = ["std"]
+std = []
diff --git a/frame/support/procedural/src/max_encoded_len.rs b/max-encoded-len/derive/src/lib.rs
similarity index 56%
rename from frame/support/procedural/src/max_encoded_len.rs
rename to max-encoded-len/derive/src/lib.rs
index 72efa446b3f4..34bf42f30cb3 100644
--- a/frame/support/procedural/src/max_encoded_len.rs
+++ b/max-encoded-len/derive/src/lib.rs
@@ -15,21 +15,39 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use frame_support_procedural_tools::generate_crate_access_2018;
 use quote::{quote, quote_spanned};
 use syn::{
-	Data, DeriveInput, Fields, GenericParam, Generics, TraitBound, Type, TypeParamBound,
-	parse_quote, spanned::Spanned,
+	Data, DeriveInput, Error, Fields, GenericParam, Generics, Meta, TraitBound, Type,
+	TypeParamBound, parse_quote, spanned::Spanned,
 };
+use proc_macro_crate::{crate_name, FoundCrate};
+use proc_macro2::{Ident, Span};
 
-/// impl for `#[derive(MaxEncodedLen)]`
+/// Generate the crate access for the crate using 2018 syntax.
+fn generate_crate_access_2018(def_crate: &str) -> Result<syn::Ident, Error> {
+	match crate_name(def_crate) {
+		Ok(FoundCrate::Itself) => {
+			let name = def_crate.to_string().replace("-", "_");
+			Ok(syn::Ident::new(&name, Span::call_site()))
+		},
+		Ok(FoundCrate::Name(name)) => {
+			Ok(Ident::new(&name, Span::call_site()))
+		},
+		Err(e) => {
+			Err(Error::new(Span::call_site(), e))
+		}
+	}
+}
+
+/// Derive `MaxEncodedLen`.
+#[proc_macro_derive(MaxEncodedLen, attributes(max_encoded_len_crate))]
 pub fn derive_max_encoded_len(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
 	let input: DeriveInput = match syn::parse(input) {
 		Ok(input) => input,
 		Err(e) => return e.to_compile_error().into(),
 	};
 
-	let mel_trait = match max_encoded_len_trait() {
+	let mel_trait = match max_encoded_len_trait(&input) {
 		Ok(mel_trait) => mel_trait,
 		Err(e) => return e.to_compile_error().into(),
 	};
@@ -52,9 +70,63 @@ pub fn derive_max_encoded_len(input: proc_macro::TokenStream) -> proc_macro::Tok
 	.into()
 }
 
-fn max_encoded_len_trait() -> syn::Result<TraitBound> {
-	let frame_support = generate_crate_access_2018("frame-support")?;
-	Ok(parse_quote!(#frame_support::traits::MaxEncodedLen))
+fn max_encoded_len_trait(input: &DeriveInput) -> syn::Result<TraitBound> {
+	let mel = {
+		const EXPECT_LIST: &str = "expect: #[max_encoded_len_crate(path::to::crate)]";
+		const EXPECT_PATH: &str = "expect: path::to::crate";
+
+		macro_rules! return_err {
+			($wrong_style:expr, $err:expr) => {
+				return Err(Error::new($wrong_style.span(), $err))
+			};
+		}
+
+		let mut mel_crates = Vec::with_capacity(2);
+		mel_crates.extend(input
+			.attrs
+			.iter()
+			.filter(|attr| attr.path == parse_quote!(max_encoded_len_crate))
+			.take(2)
+			.map(|attr| {
+				let meta_list = match attr.parse_meta()? {
+					Meta::List(meta_list) => meta_list,
+					Meta::Path(wrong_style) => return_err!(wrong_style, EXPECT_LIST),
+					Meta::NameValue(wrong_style) => return_err!(wrong_style, EXPECT_LIST),
+				};
+				if meta_list.nested.len() != 1 {
+					return_err!(meta_list, "expected exactly 1 item");
+				}
+				let first_nested =
+					meta_list.nested.into_iter().next().expect("length checked above");
+				let meta = match first_nested {
+					syn::NestedMeta::Lit(l) => {
+						return_err!(l, "expected a path item, not a literal")
+					}
+					syn::NestedMeta::Meta(meta) => meta,
+				};
+				let path = match meta {
+					Meta::Path(path) => path,
+					Meta::List(ref wrong_style) => return_err!(wrong_style, EXPECT_PATH),
+					Meta::NameValue(ref wrong_style) => return_err!(wrong_style, EXPECT_PATH),
+				};
+				Ok(path)
+			})
+			.collect::<Result<Vec<_>, _>>()?);
+
+		// we have to return `Result<Ident, Error>` here in order to satisfy the trait
+		// bounds for `.or_else` for `generate_crate_access_2018`, even though `Option<Ident>`
+		// would be more natural in this circumstance.
+		match mel_crates.len() {
+			0 => Err(Error::new(
+				input.span(),
+				"this error is spurious and swallowed by the or_else below",
+			)),
+			1 => Ok(mel_crates.into_iter().next().expect("length is checked")),
+			_ => return_err!(mel_crates[1], "duplicate max_encoded_len_crate definition"),
+		}
+	}
+	.or_else(|_| generate_crate_access_2018("max-encoded-len").map(|ident| ident.into()))?;
+	Ok(parse_quote!(#mel::MaxEncodedLen))
 }
 
 // Add a bound `T: MaxEncodedLen` to every type parameter T.
@@ -126,8 +198,7 @@ fn data_length_expr(data: &Data) -> proc_macro2::TokenStream {
 		Data::Union(ref data) => {
 			// https://github.com/paritytech/parity-scale-codec/
 			//   blob/f0341dabb01aa9ff0548558abb6dcc5c31c669a1/derive/src/encode.rs#L290-L293
-			syn::Error::new(data.union_token.span(), "Union types are not supported")
-				.to_compile_error()
+			Error::new(data.union_token.span(), "Union types are not supported").to_compile_error()
 		}
 	}
 }
diff --git a/frame/support/src/traits/max_encoded_len.rs b/max-encoded-len/src/lib.rs
similarity index 65%
rename from frame/support/src/traits/max_encoded_len.rs
rename to max-encoded-len/src/lib.rs
index 2cf9007d4d62..e216d3b17415 100644
--- a/frame/support/src/traits/max_encoded_len.rs
+++ b/max-encoded-len/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,38 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//! `trait MaxEncodedLen` bounds the max encoded length of items.
+
+#![cfg_attr(not(feature = "std"), no_std)]
+
 use codec::{Compact, Encode};
 use impl_trait_for_tuples::impl_for_tuples;
-use sp_std::{mem, marker::PhantomData};
+use core::{mem, marker::PhantomData};
+use primitive_types::{H160, H256, H512};
+
+/// Derive macro for `MaxEncodedLen`.
+///
+/// ```
+/// # use max_encoded_len::MaxEncodedLen;
+/// # use codec::Encode;
+/// #[derive(Encode, MaxEncodedLen)]
+/// struct Example;
+/// ```
+///
+/// Sometimes the `MaxEncodedLen` trait and macro are accessed without explicitly importing its
+/// crate, notably via the `frame_support::max_encoded_len` re-binding. In these circumstances,
+/// the derive macro needs some help to understand where its crate should be:
+///
+/// ```
+/// # use codec::Encode;
+/// use frame_support::max_encoded_len::MaxEncodedLen;
+///
+/// #[derive(Encode, MaxEncodedLen)]
+/// #[max_encoded_len_crate(frame_support::max_encoded_len)]
+/// struct Example;
+/// ```
+#[cfg(feature = "derive")]
+pub use max_encoded_len_derive::MaxEncodedLen;
 
 /// Items implementing `MaxEncodedLen` have a statically known maximum encoded size.
 ///
@@ -42,7 +71,7 @@ macro_rules! impl_primitives {
 	};
 }
 
-impl_primitives!(u8, u16, u32, u64, u128, i8, i16, i32, i64, i128, bool);
+impl_primitives!(u8, u16, u32, u64, u128, i8, i16, i32, i64, i128, bool, H160, H256, H512);
 
 macro_rules! impl_compact {
 	($( $t:ty => $e:expr; )*) => {
@@ -57,15 +86,15 @@ macro_rules! impl_compact {
 }
 
 impl_compact!(
-	// https://github.com/paritytech/parity-scale-codec/blob/f0341dabb01aa9ff0548558abb6dcc5c31c669a1/src/compact.rs#L261
+	// github.com/paritytech/parity-scale-codec/blob/f0341dabb01aa9ff0548558abb6dcc5c31c669a1/src/compact.rs#L261
 	u8 => 2;
-	// https://github.com/paritytech/parity-scale-codec/blob/f0341dabb01aa9ff0548558abb6dcc5c31c669a1/src/compact.rs#L291
+	// github.com/paritytech/parity-scale-codec/blob/f0341dabb01aa9ff0548558abb6dcc5c31c669a1/src/compact.rs#L291
 	u16 => 4;
-	// https://github.com/paritytech/parity-scale-codec/blob/f0341dabb01aa9ff0548558abb6dcc5c31c669a1/src/compact.rs#L326
+	// github.com/paritytech/parity-scale-codec/blob/f0341dabb01aa9ff0548558abb6dcc5c31c669a1/src/compact.rs#L326
 	u32 => 5;
-	// https://github.com/paritytech/parity-scale-codec/blob/f0341dabb01aa9ff0548558abb6dcc5c31c669a1/src/compact.rs#L369
+	// github.com/paritytech/parity-scale-codec/blob/f0341dabb01aa9ff0548558abb6dcc5c31c669a1/src/compact.rs#L369
 	u64 => 9;
-	// https://github.com/paritytech/parity-scale-codec/blob/f0341dabb01aa9ff0548558abb6dcc5c31c669a1/src/compact.rs#L413
+	// github.com/paritytech/parity-scale-codec/blob/f0341dabb01aa9ff0548558abb6dcc5c31c669a1/src/compact.rs#L413
 	u128 => 17;
 );
 
diff --git a/frame/support/test/tests/max_encoded_len.rs b/max-encoded-len/tests/max_encoded_len.rs
similarity index 98%
rename from frame/support/test/tests/max_encoded_len.rs
rename to max-encoded-len/tests/max_encoded_len.rs
index e9e74929108d..665ac8fa98a4 100644
--- a/frame/support/test/tests/max_encoded_len.rs
+++ b/max-encoded-len/tests/max_encoded_len.rs
@@ -17,7 +17,9 @@
 
 //! Tests for MaxEncodedLen derive macro
 
-use frame_support::traits::MaxEncodedLen;
+#![cfg(feature = "derive")]
+
+use max_encoded_len::MaxEncodedLen;
 use codec::{Compact, Encode};
 
 // These structs won't even compile if the macro isn't working right.
diff --git a/frame/support/test/tests/max_encoded_len_ui.rs b/max-encoded-len/tests/max_encoded_len_ui.rs
similarity index 97%
rename from frame/support/test/tests/max_encoded_len_ui.rs
rename to max-encoded-len/tests/max_encoded_len_ui.rs
index c5c0489da924..79d6d49234ff 100644
--- a/frame/support/test/tests/max_encoded_len_ui.rs
+++ b/max-encoded-len/tests/max_encoded_len_ui.rs
@@ -15,6 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#[cfg(feature = "derive")]
 #[rustversion::attr(not(stable), ignore)]
 #[test]
 fn derive_no_bound_ui() {
diff --git a/max-encoded-len/tests/max_encoded_len_ui/list_list_item.rs b/max-encoded-len/tests/max_encoded_len_ui/list_list_item.rs
new file mode 100644
index 000000000000..0cb12991fab4
--- /dev/null
+++ b/max-encoded-len/tests/max_encoded_len_ui/list_list_item.rs
@@ -0,0 +1,10 @@
+use codec::Encode;
+use frame_support::max_encoded_len::MaxEncodedLen;
+
+#[derive(Encode, MaxEncodedLen)]
+#[max_encoded_len_crate(foo())]
+struct Example;
+
+fn main() {
+	let _ = Example::max_encoded_len();
+}
diff --git a/max-encoded-len/tests/max_encoded_len_ui/list_list_item.stderr b/max-encoded-len/tests/max_encoded_len_ui/list_list_item.stderr
new file mode 100644
index 000000000000..4ecd40440a46
--- /dev/null
+++ b/max-encoded-len/tests/max_encoded_len_ui/list_list_item.stderr
@@ -0,0 +1,18 @@
+error: expect: path::to::crate
+ --> $DIR/list_list_item.rs:5:25
+  |
+5 | #[max_encoded_len_crate(foo())]
+  |                         ^^^
+
+error[E0599]: no function or associated item named `max_encoded_len` found for struct `Example` in the current scope
+ --> $DIR/list_list_item.rs:9:19
+  |
+6 | struct Example;
+  | --------------- function or associated item `max_encoded_len` not found for this
+...
+9 |     let _ = Example::max_encoded_len();
+  |                      ^^^^^^^^^^^^^^^ function or associated item not found in `Example`
+  |
+  = help: items from traits can only be used if the trait is implemented and in scope
+  = note: the following trait defines an item `max_encoded_len`, perhaps you need to implement it:
+          candidate #1: `MaxEncodedLen`
diff --git a/max-encoded-len/tests/max_encoded_len_ui/literal_list_item.rs b/max-encoded-len/tests/max_encoded_len_ui/literal_list_item.rs
new file mode 100644
index 000000000000..f3f7a72d813b
--- /dev/null
+++ b/max-encoded-len/tests/max_encoded_len_ui/literal_list_item.rs
@@ -0,0 +1,10 @@
+use codec::Encode;
+use frame_support::max_encoded_len::MaxEncodedLen;
+
+#[derive(Encode, MaxEncodedLen)]
+#[max_encoded_len_crate("frame_support::max_encoded_len")]
+struct Example;
+
+fn main() {
+	let _ = Example::max_encoded_len();
+}
diff --git a/max-encoded-len/tests/max_encoded_len_ui/literal_list_item.stderr b/max-encoded-len/tests/max_encoded_len_ui/literal_list_item.stderr
new file mode 100644
index 000000000000..118259991299
--- /dev/null
+++ b/max-encoded-len/tests/max_encoded_len_ui/literal_list_item.stderr
@@ -0,0 +1,18 @@
+error: expected a path item, not a literal
+ --> $DIR/literal_list_item.rs:5:25
+  |
+5 | #[max_encoded_len_crate("frame_support::max_encoded_len")]
+  |                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0599]: no function or associated item named `max_encoded_len` found for struct `Example` in the current scope
+ --> $DIR/literal_list_item.rs:9:19
+  |
+6 | struct Example;
+  | --------------- function or associated item `max_encoded_len` not found for this
+...
+9 |     let _ = Example::max_encoded_len();
+  |                      ^^^^^^^^^^^^^^^ function or associated item not found in `Example`
+  |
+  = help: items from traits can only be used if the trait is implemented and in scope
+  = note: the following trait defines an item `max_encoded_len`, perhaps you need to implement it:
+          candidate #1: `MaxEncodedLen`
diff --git a/max-encoded-len/tests/max_encoded_len_ui/name_value_attr.rs b/max-encoded-len/tests/max_encoded_len_ui/name_value_attr.rs
new file mode 100644
index 000000000000..382310d3a7dd
--- /dev/null
+++ b/max-encoded-len/tests/max_encoded_len_ui/name_value_attr.rs
@@ -0,0 +1,10 @@
+use codec::Encode;
+use frame_support::max_encoded_len::MaxEncodedLen;
+
+#[derive(Encode, MaxEncodedLen)]
+#[max_encoded_len_crate = "frame_support::max_encoded_len"]
+struct Example;
+
+fn main() {
+	let _ = Example::max_encoded_len();
+}
diff --git a/max-encoded-len/tests/max_encoded_len_ui/name_value_attr.stderr b/max-encoded-len/tests/max_encoded_len_ui/name_value_attr.stderr
new file mode 100644
index 000000000000..4949631049ba
--- /dev/null
+++ b/max-encoded-len/tests/max_encoded_len_ui/name_value_attr.stderr
@@ -0,0 +1,18 @@
+error: expect: #[max_encoded_len_crate(path::to::crate)]
+ --> $DIR/name_value_attr.rs:5:3
+  |
+5 | #[max_encoded_len_crate = "frame_support::max_encoded_len"]
+  |   ^^^^^^^^^^^^^^^^^^^^^
+
+error[E0599]: no function or associated item named `max_encoded_len` found for struct `Example` in the current scope
+ --> $DIR/name_value_attr.rs:9:19
+  |
+6 | struct Example;
+  | --------------- function or associated item `max_encoded_len` not found for this
+...
+9 |     let _ = Example::max_encoded_len();
+  |                      ^^^^^^^^^^^^^^^ function or associated item not found in `Example`
+  |
+  = help: items from traits can only be used if the trait is implemented and in scope
+  = note: the following trait defines an item `max_encoded_len`, perhaps you need to implement it:
+          candidate #1: `MaxEncodedLen`
diff --git a/max-encoded-len/tests/max_encoded_len_ui/name_value_list_item.rs b/max-encoded-len/tests/max_encoded_len_ui/name_value_list_item.rs
new file mode 100644
index 000000000000..44f92e8d5d99
--- /dev/null
+++ b/max-encoded-len/tests/max_encoded_len_ui/name_value_list_item.rs
@@ -0,0 +1,10 @@
+use codec::Encode;
+use frame_support::max_encoded_len::MaxEncodedLen;
+
+#[derive(Encode, MaxEncodedLen)]
+#[max_encoded_len_crate(path = "frame_support::max_encoded_len")]
+struct Example;
+
+fn main() {
+	let _ = Example::max_encoded_len();
+}
diff --git a/max-encoded-len/tests/max_encoded_len_ui/name_value_list_item.stderr b/max-encoded-len/tests/max_encoded_len_ui/name_value_list_item.stderr
new file mode 100644
index 000000000000..2faa1108c49d
--- /dev/null
+++ b/max-encoded-len/tests/max_encoded_len_ui/name_value_list_item.stderr
@@ -0,0 +1,18 @@
+error: expect: path::to::crate
+ --> $DIR/name_value_list_item.rs:5:25
+  |
+5 | #[max_encoded_len_crate(path = "frame_support::max_encoded_len")]
+  |                         ^^^^
+
+error[E0599]: no function or associated item named `max_encoded_len` found for struct `Example` in the current scope
+ --> $DIR/name_value_list_item.rs:9:19
+  |
+6 | struct Example;
+  | --------------- function or associated item `max_encoded_len` not found for this
+...
+9 |     let _ = Example::max_encoded_len();
+  |                      ^^^^^^^^^^^^^^^ function or associated item not found in `Example`
+  |
+  = help: items from traits can only be used if the trait is implemented and in scope
+  = note: the following trait defines an item `max_encoded_len`, perhaps you need to implement it:
+          candidate #1: `MaxEncodedLen`
diff --git a/max-encoded-len/tests/max_encoded_len_ui/no_path_list_items.rs b/max-encoded-len/tests/max_encoded_len_ui/no_path_list_items.rs
new file mode 100644
index 000000000000..069c8af5a77e
--- /dev/null
+++ b/max-encoded-len/tests/max_encoded_len_ui/no_path_list_items.rs
@@ -0,0 +1,10 @@
+use codec::Encode;
+use frame_support::max_encoded_len::MaxEncodedLen;
+
+#[derive(Encode, MaxEncodedLen)]
+#[max_encoded_len_crate]
+struct Example;
+
+fn main() {
+	let _ = Example::max_encoded_len();
+}
diff --git a/max-encoded-len/tests/max_encoded_len_ui/no_path_list_items.stderr b/max-encoded-len/tests/max_encoded_len_ui/no_path_list_items.stderr
new file mode 100644
index 000000000000..4d36039d33b3
--- /dev/null
+++ b/max-encoded-len/tests/max_encoded_len_ui/no_path_list_items.stderr
@@ -0,0 +1,18 @@
+error: expect: #[max_encoded_len_crate(path::to::crate)]
+ --> $DIR/no_path_list_items.rs:5:3
+  |
+5 | #[max_encoded_len_crate]
+  |   ^^^^^^^^^^^^^^^^^^^^^
+
+error[E0599]: no function or associated item named `max_encoded_len` found for struct `Example` in the current scope
+ --> $DIR/no_path_list_items.rs:9:19
+  |
+6 | struct Example;
+  | --------------- function or associated item `max_encoded_len` not found for this
+...
+9 |     let _ = Example::max_encoded_len();
+  |                      ^^^^^^^^^^^^^^^ function or associated item not found in `Example`
+  |
+  = help: items from traits can only be used if the trait is implemented and in scope
+  = note: the following trait defines an item `max_encoded_len`, perhaps you need to implement it:
+          candidate #1: `MaxEncodedLen`
diff --git a/frame/support/test/tests/max_encoded_len_ui/not_encode.rs b/max-encoded-len/tests/max_encoded_len_ui/not_encode.rs
similarity index 58%
rename from frame/support/test/tests/max_encoded_len_ui/not_encode.rs
rename to max-encoded-len/tests/max_encoded_len_ui/not_encode.rs
index ed6fe94471e5..5e8eb6035547 100644
--- a/frame/support/test/tests/max_encoded_len_ui/not_encode.rs
+++ b/max-encoded-len/tests/max_encoded_len_ui/not_encode.rs
@@ -1,4 +1,4 @@
-use frame_support::traits::MaxEncodedLen;
+use max_encoded_len::MaxEncodedLen;
 
 #[derive(MaxEncodedLen)]
 struct NotEncode;
diff --git a/frame/support/test/tests/max_encoded_len_ui/not_encode.stderr b/max-encoded-len/tests/max_encoded_len_ui/not_encode.stderr
similarity index 54%
rename from frame/support/test/tests/max_encoded_len_ui/not_encode.stderr
rename to max-encoded-len/tests/max_encoded_len_ui/not_encode.stderr
index f4dbeac04084..1e0ead0854a0 100644
--- a/frame/support/test/tests/max_encoded_len_ui/not_encode.stderr
+++ b/max-encoded-len/tests/max_encoded_len_ui/not_encode.stderr
@@ -1,13 +1,13 @@
-error[E0277]: the trait bound `NotEncode: WrapperTypeEncode` is not satisfied
+error[E0277]: the trait bound `NotEncode: parity_scale_codec::codec::WrapperTypeEncode` is not satisfied
   --> $DIR/not_encode.rs:3:10
    |
 3  | #[derive(MaxEncodedLen)]
-   |          ^^^^^^^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `NotEncode`
+   |          ^^^^^^^^^^^^^ the trait `parity_scale_codec::codec::WrapperTypeEncode` is not implemented for `NotEncode`
    |
-  ::: $WORKSPACE/frame/support/src/traits/max_encoded_len.rs
+  ::: $WORKSPACE/max-encoded-len/src/lib.rs
    |
    | pub trait MaxEncodedLen: Encode {
    |                          ------ required by this bound in `MaxEncodedLen`
    |
-   = note: required because of the requirements on the impl of `frame_support::dispatch::Encode` for `NotEncode`
+   = note: required because of the requirements on the impl of `parity_scale_codec::codec::Encode` for `NotEncode`
    = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/frame/support/test/tests/max_encoded_len_ui/not_mel.rs b/max-encoded-len/tests/max_encoded_len_ui/not_mel.rs
similarity index 80%
rename from frame/support/test/tests/max_encoded_len_ui/not_mel.rs
rename to max-encoded-len/tests/max_encoded_len_ui/not_mel.rs
index 6116f30e5272..cbaf820ff58e 100644
--- a/frame/support/test/tests/max_encoded_len_ui/not_mel.rs
+++ b/max-encoded-len/tests/max_encoded_len_ui/not_mel.rs
@@ -1,5 +1,5 @@
 use codec::Encode;
-use frame_support::traits::MaxEncodedLen;
+use max_encoded_len::MaxEncodedLen;
 
 #[derive(Encode)]
 struct NotMel;
diff --git a/frame/support/test/tests/max_encoded_len_ui/not_mel.stderr b/max-encoded-len/tests/max_encoded_len_ui/not_mel.stderr
similarity index 100%
rename from frame/support/test/tests/max_encoded_len_ui/not_mel.stderr
rename to max-encoded-len/tests/max_encoded_len_ui/not_mel.stderr
diff --git a/max-encoded-len/tests/max_encoded_len_ui/path_attr.rs b/max-encoded-len/tests/max_encoded_len_ui/path_attr.rs
new file mode 100644
index 000000000000..069c8af5a77e
--- /dev/null
+++ b/max-encoded-len/tests/max_encoded_len_ui/path_attr.rs
@@ -0,0 +1,10 @@
+use codec::Encode;
+use frame_support::max_encoded_len::MaxEncodedLen;
+
+#[derive(Encode, MaxEncodedLen)]
+#[max_encoded_len_crate]
+struct Example;
+
+fn main() {
+	let _ = Example::max_encoded_len();
+}
diff --git a/max-encoded-len/tests/max_encoded_len_ui/path_attr.stderr b/max-encoded-len/tests/max_encoded_len_ui/path_attr.stderr
new file mode 100644
index 000000000000..84745efc5e6f
--- /dev/null
+++ b/max-encoded-len/tests/max_encoded_len_ui/path_attr.stderr
@@ -0,0 +1,18 @@
+error: expect: #[max_encoded_len_crate(path::to::crate)]
+ --> $DIR/path_attr.rs:5:3
+  |
+5 | #[max_encoded_len_crate]
+  |   ^^^^^^^^^^^^^^^^^^^^^
+
+error[E0599]: no function or associated item named `max_encoded_len` found for struct `Example` in the current scope
+ --> $DIR/path_attr.rs:9:19
+  |
+6 | struct Example;
+  | --------------- function or associated item `max_encoded_len` not found for this
+...
+9 |     let _ = Example::max_encoded_len();
+  |                      ^^^^^^^^^^^^^^^ function or associated item not found in `Example`
+  |
+  = help: items from traits can only be used if the trait is implemented and in scope
+  = note: the following trait defines an item `max_encoded_len`, perhaps you need to implement it:
+          candidate #1: `MaxEncodedLen`
diff --git a/max-encoded-len/tests/max_encoded_len_ui/two_path_list_items.rs b/max-encoded-len/tests/max_encoded_len_ui/two_path_list_items.rs
new file mode 100644
index 000000000000..2b29648cbaa2
--- /dev/null
+++ b/max-encoded-len/tests/max_encoded_len_ui/two_path_list_items.rs
@@ -0,0 +1,10 @@
+use codec::Encode;
+use frame_support::max_encoded_len::MaxEncodedLen;
+
+#[derive(Encode, MaxEncodedLen)]
+#[max_encoded_len_crate(max_encoded_len, frame_support::max_encoded_len)]
+struct Example;
+
+fn main() {
+	let _ = Example::max_encoded_len();
+}
diff --git a/max-encoded-len/tests/max_encoded_len_ui/two_path_list_items.stderr b/max-encoded-len/tests/max_encoded_len_ui/two_path_list_items.stderr
new file mode 100644
index 000000000000..9252a4065f25
--- /dev/null
+++ b/max-encoded-len/tests/max_encoded_len_ui/two_path_list_items.stderr
@@ -0,0 +1,18 @@
+error: expected exactly 1 item
+ --> $DIR/two_path_list_items.rs:5:3
+  |
+5 | #[max_encoded_len_crate(max_encoded_len, frame_support::max_encoded_len)]
+  |   ^^^^^^^^^^^^^^^^^^^^^
+
+error[E0599]: no function or associated item named `max_encoded_len` found for struct `Example` in the current scope
+ --> $DIR/two_path_list_items.rs:9:19
+  |
+6 | struct Example;
+  | --------------- function or associated item `max_encoded_len` not found for this
+...
+9 |     let _ = Example::max_encoded_len();
+  |                      ^^^^^^^^^^^^^^^ function or associated item not found in `Example`
+  |
+  = help: items from traits can only be used if the trait is implemented and in scope
+  = note: the following trait defines an item `max_encoded_len`, perhaps you need to implement it:
+          candidate #1: `MaxEncodedLen`
diff --git a/frame/support/test/tests/max_encoded_len_ui/union.rs b/max-encoded-len/tests/max_encoded_len_ui/union.rs
similarity index 70%
rename from frame/support/test/tests/max_encoded_len_ui/union.rs
rename to max-encoded-len/tests/max_encoded_len_ui/union.rs
index c685b6939e9b..932c484b9e67 100644
--- a/frame/support/test/tests/max_encoded_len_ui/union.rs
+++ b/max-encoded-len/tests/max_encoded_len_ui/union.rs
@@ -1,5 +1,5 @@
 use codec::Encode;
-use frame_support::traits::MaxEncodedLen;
+use max_encoded_len::MaxEncodedLen;
 
 #[derive(Encode, MaxEncodedLen)]
 union Union {
diff --git a/frame/support/test/tests/max_encoded_len_ui/union.stderr b/max-encoded-len/tests/max_encoded_len_ui/union.stderr
similarity index 100%
rename from frame/support/test/tests/max_encoded_len_ui/union.stderr
rename to max-encoded-len/tests/max_encoded_len_ui/union.stderr
diff --git a/frame/support/test/tests/max_encoded_len_ui/unsupported_variant.rs b/max-encoded-len/tests/max_encoded_len_ui/unsupported_variant.rs
similarity index 77%
rename from frame/support/test/tests/max_encoded_len_ui/unsupported_variant.rs
rename to max-encoded-len/tests/max_encoded_len_ui/unsupported_variant.rs
index 675f62c168a6..2fa94867471b 100644
--- a/frame/support/test/tests/max_encoded_len_ui/unsupported_variant.rs
+++ b/max-encoded-len/tests/max_encoded_len_ui/unsupported_variant.rs
@@ -1,5 +1,5 @@
 use codec::Encode;
-use frame_support::traits::MaxEncodedLen;
+use max_encoded_len::MaxEncodedLen;
 
 #[derive(Encode)]
 struct NotMel;
diff --git a/frame/support/test/tests/max_encoded_len_ui/unsupported_variant.stderr b/max-encoded-len/tests/max_encoded_len_ui/unsupported_variant.stderr
similarity index 100%
rename from frame/support/test/tests/max_encoded_len_ui/unsupported_variant.stderr
rename to max-encoded-len/tests/max_encoded_len_ui/unsupported_variant.stderr
diff --git a/primitives/application-crypto/Cargo.toml b/primitives/application-crypto/Cargo.toml
index fff289e9a1d8..7f3e48ae4825 100644
--- a/primitives/application-crypto/Cargo.toml
+++ b/primitives/application-crypto/Cargo.toml
@@ -20,10 +20,19 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 sp-std = { version = "3.0.0", default-features = false, path = "../std" }
 sp-io = { version = "3.0.0", default-features = false, path = "../io" }
+max-encoded-len = { version = "3.0.0", default-features = false, path = "../../max-encoded-len", features = [ "derive" ] }
 
 [features]
 default = [ "std" ]
-std = [ "full_crypto", "sp-core/std", "codec/std", "serde", "sp-std/std", "sp-io/std" ]
+std = [
+	"full_crypto",
+	"sp-core/std",
+	"codec/std",
+	"serde",
+	"sp-std/std",
+	"sp-io/std",
+	"max-encoded-len/std",
+]
 
 # This feature enables all crypto primitives for `no_std` builds like microcontrollers
 # or Intel SGX.
diff --git a/primitives/application-crypto/src/lib.rs b/primitives/application-crypto/src/lib.rs
index d085d961a102..58e5c5b7a311 100644
--- a/primitives/application-crypto/src/lib.rs
+++ b/primitives/application-crypto/src/lib.rs
@@ -39,6 +39,8 @@ pub use sp_std::{
 	ops::Deref,
 	vec::Vec,
 };
+#[doc(hidden)]
+pub use max_encoded_len;
 
 pub mod ed25519;
 pub mod sr25519;
@@ -194,12 +196,13 @@ macro_rules! app_crypto_public_full_crypto {
 		$crate::wrap!{
 			/// A generic `AppPublic` wrapper type over $public crypto; this has no specific App.
 			#[derive(
-				Clone, Default, Eq, PartialEq, Ord, PartialOrd,
+				Clone, Default, Eq, Hash, PartialEq, PartialOrd, Ord,
 				$crate::codec::Encode,
 				$crate::codec::Decode,
 				$crate::RuntimeDebug,
+				$crate::max_encoded_len::MaxEncodedLen,
 			)]
-			#[derive(Hash)]
+			#[max_encoded_len_crate($crate::max_encoded_len)]
 			pub struct Public($public);
 		}
 
diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml
index 146dee2cfa1d..831e62d6f952 100644
--- a/primitives/core/Cargo.toml
+++ b/primitives/core/Cargo.toml
@@ -40,6 +40,7 @@ parity-util-mem = { version = "0.9.0", default-features = false, features = ["pr
 futures = { version = "0.3.1", optional = true }
 dyn-clonable = { version = "0.9.0", optional = true }
 thiserror = { version = "1.0.21", optional = true }
+max-encoded-len = { version = "3.0.0", default-features = false, path = "../../max-encoded-len", features = [ "derive" ] }
 
 # full crypto
 ed25519-dalek = { version = "1.0.1", default-features = false, features = ["u64_backend", "alloc"], optional = true }
@@ -114,6 +115,7 @@ std = [
 	"futures/thread-pool",
 	"libsecp256k1/std",
 	"dyn-clonable",
+	"max-encoded-len/std",
 ]
 
 # This feature enables all crypto primitives for `no_std` builds like microcontrollers
diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index 4d075dc6ff4f..08e6211e3233 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -20,6 +20,7 @@
 // end::description[]
 
 use crate::{sr25519, ed25519};
+use max_encoded_len::MaxEncodedLen;
 use sp_std::hash::Hash;
 use sp_std::vec::Vec;
 use sp_std::str;
@@ -689,7 +690,7 @@ pub trait Public:
 }
 
 /// An opaque 32-byte cryptographic identifier.
-#[derive(Clone, Eq, PartialEq, Ord, PartialOrd, Default, Encode, Decode)]
+#[derive(Clone, Eq, PartialEq, Ord, PartialOrd, Default, Encode, Decode, MaxEncodedLen)]
 #[cfg_attr(feature = "std", derive(Hash))]
 pub struct AccountId32([u8; 32]);
 
diff --git a/primitives/core/src/ecdsa.rs b/primitives/core/src/ecdsa.rs
index 60fa7c3e8193..1fb80f24eaf3 100644
--- a/primitives/core/src/ecdsa.rs
+++ b/primitives/core/src/ecdsa.rs
@@ -52,7 +52,7 @@ pub const CRYPTO_ID: CryptoTypeId = CryptoTypeId(*b"ecds");
 type Seed = [u8; 32];
 
 /// The ECDSA compressed public key.
-#[derive(Clone, Encode, Decode, PassByInner)]
+#[derive(Clone, Encode, Decode, PassByInner, max_encoded_len::MaxEncodedLen)]
 pub struct Public(pub [u8; 33]);
 
 impl PartialOrd for Public {
diff --git a/primitives/core/src/ed25519.rs b/primitives/core/src/ed25519.rs
index 4b160e55b86a..392dc2eec6c6 100644
--- a/primitives/core/src/ed25519.rs
+++ b/primitives/core/src/ed25519.rs
@@ -54,7 +54,10 @@ type Seed = [u8; 32];
 
 /// A public key.
 #[cfg_attr(feature = "full_crypto", derive(Hash))]
-#[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Encode, Decode, Default, PassByInner)]
+#[derive(
+	PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Encode, Decode, Default, PassByInner,
+	max_encoded_len::MaxEncodedLen,
+)]
 pub struct Public(pub [u8; 32]);
 
 /// A key pair.
diff --git a/primitives/core/src/sr25519.rs b/primitives/core/src/sr25519.rs
index f8e17f7b802a..269f19cba007 100644
--- a/primitives/core/src/sr25519.rs
+++ b/primitives/core/src/sr25519.rs
@@ -60,7 +60,10 @@ pub const CRYPTO_ID: CryptoTypeId = CryptoTypeId(*b"sr25");
 
 /// An Schnorrkel/Ristretto x25519 ("sr25519") public key.
 #[cfg_attr(feature = "full_crypto", derive(Hash))]
-#[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Encode, Decode, Default, PassByInner)]
+#[derive(
+	PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Encode, Decode, Default, PassByInner,
+	max_encoded_len::MaxEncodedLen,
+)]
 pub struct Public(pub [u8; 32]);
 
 /// An Schnorrkel/Ristretto x25519 ("sr25519") key pair.
diff --git a/primitives/runtime/Cargo.toml b/primitives/runtime/Cargo.toml
index 7d33e7fa62d2..aec2bc416ee3 100644
--- a/primitives/runtime/Cargo.toml
+++ b/primitives/runtime/Cargo.toml
@@ -29,6 +29,7 @@ impl-trait-for-tuples = "0.2.1"
 parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
 hash256-std-hasher = { version = "0.15.2", default-features = false }
 either = { version = "1.5", default-features = false }
+max-encoded-len = { version = "3.0.0", default-features = false, path = "../../max-encoded-len", features = [ "derive" ] }
 
 [dev-dependencies]
 serde_json = "1.0.41"
@@ -55,4 +56,5 @@ std = [
 	"parity-util-mem/std",
 	"hash256-std-hasher/std",
 	"either/use_std",
+	"max-encoded-len/std",
 ]
diff --git a/primitives/runtime/src/traits.rs b/primitives/runtime/src/traits.rs
index 22f6cb044a00..2379fce9949e 100644
--- a/primitives/runtime/src/traits.rs
+++ b/primitives/runtime/src/traits.rs
@@ -40,6 +40,7 @@ pub use sp_arithmetic::traits::{
 use sp_application_crypto::AppKey;
 use impl_trait_for_tuples::impl_for_tuples;
 use crate::DispatchResult;
+use max_encoded_len::MaxEncodedLen;
 
 /// A lazy value.
 pub trait Lazy<T: ?Sized> {
@@ -386,7 +387,7 @@ impl<T:
 pub trait Hash: 'static + MaybeSerializeDeserialize + Debug + Clone + Eq + PartialEq + Hasher<Out = <Self as Hash>::Output> {
 	/// The hash type produced.
 	type Output: Member + MaybeSerializeDeserialize + Debug + sp_std::hash::Hash
-		+ AsRef<[u8]> + AsMut<[u8]> + Copy + Default + Encode + Decode;
+		+ AsRef<[u8]> + AsMut<[u8]> + Copy + Default + Encode + Decode + MaxEncodedLen;
 
 	/// Produce the hash of some byte-slice.
 	fn hash(s: &[u8]) -> Self::Output {

From 6a63f282a5c0fb608569137ed464a23583d2d7de Mon Sep 17 00:00:00 2001
From: joe petrowski <25483142+joepetrowski@users.noreply.github.com>
Date: Fri, 28 May 2021 21:22:49 +0200
Subject: [PATCH 0798/1194] remove duplicate Issued/Burned events (#8935)

---
 frame/assets/src/lib.rs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index ccbe1920e997..e81fca20db81 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -525,7 +525,7 @@ pub mod pallet {
 		/// - `beneficiary`: The account to be credited with the minted assets.
 		/// - `amount`: The amount of the asset to be minted.
 		///
-		/// Emits `Destroyed` event when successful.
+		/// Emits `Issued` event when successful.
 		///
 		/// Weight: `O(1)`
 		/// Modes: Pre-existing balance of `beneficiary`; Account pre-existence of `beneficiary`.
@@ -539,7 +539,6 @@ pub mod pallet {
 			let origin = ensure_signed(origin)?;
 			let beneficiary = T::Lookup::lookup(beneficiary)?;
 			Self::do_mint(id, &beneficiary, amount, Some(origin))?;
-			Self::deposit_event(Event::Issued(id, beneficiary, amount));
 			Ok(())
 		}
 
@@ -569,8 +568,7 @@ pub mod pallet {
 			let who = T::Lookup::lookup(who)?;
 
 			let f = DebitFlags { keep_alive: false, best_effort: true };
-			let burned = Self::do_burn(id, &who, amount, Some(origin), f)?;
-			Self::deposit_event(Event::Burned(id, who, burned));
+			let _ = Self::do_burn(id, &who, amount, Some(origin), f)?;
 			Ok(())
 		}
 

From 4b99c7fef5b6baa9fc10cf3304d36fd453554154 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20M=C3=BCller?= <sebastian@web3.foundation>
Date: Fri, 28 May 2021 23:32:00 +0200
Subject: [PATCH 0799/1194] weather -> whether (#8938)

---
 frame/support/src/weights.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frame/support/src/weights.rs b/frame/support/src/weights.rs
index 840b1c3c01ac..9337ec330d1c 100644
--- a/frame/support/src/weights.rs
+++ b/frame/support/src/weights.rs
@@ -22,7 +22,7 @@
 //!
 //! - [`WeighData`]: the weight amount.
 //! - [`ClassifyDispatch`]: class of the dispatch.
-//! - [`PaysFee`]: weather this weight should be translated to fee and deducted upon dispatch.
+//! - [`PaysFee`]: whether this weight should be translated to fee and deducted upon dispatch.
 //!
 //! Substrate then bundles the output information of the three traits into [`DispatchInfo`] struct
 //! and provides it by implementing the [`GetDispatchInfo`] for all `Call` both inner and outer call

From ac277db0f5467187a5f54a27c01851a59e791961 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Sat, 29 May 2021 06:20:25 +0200
Subject: [PATCH 0800/1194] make remote ext use batch ws-client (#8916)

* make remote ext use batch ws-client

* Add debug log for key length

* better assertions

* new sanity_checl

* try and make it work with batch

* update test

* remove exctra uri

* add missing at

* remove unused rpc stuff

* improve

Co-authored-by: emostov <32168567+emostov@users.noreply.github.com>
---
 Cargo.lock                                  |   5 +-
 primitives/storage/src/lib.rs               |   8 +-
 utils/frame/remote-externalities/Cargo.toml |   6 +-
 utils/frame/remote-externalities/src/lib.rs | 122 ++++++++++++++++----
 4 files changed, 112 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b866304222c6..377059ba220c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6678,11 +6678,14 @@ name = "remote-externalities"
 version = "0.9.0"
 dependencies = [
  "env_logger 0.8.3",
- "hex-literal",
+ "frame-support",
+ "hex",
  "jsonrpsee-proc-macros",
  "jsonrpsee-ws-client",
  "log",
+ "pallet-elections-phragmen",
  "parity-scale-codec",
+ "serde_json",
  "sp-core",
  "sp-io",
  "sp-runtime",
diff --git a/primitives/storage/src/lib.rs b/primitives/storage/src/lib.rs
index ced8d8c02a80..76557d64753b 100644
--- a/primitives/storage/src/lib.rs
+++ b/primitives/storage/src/lib.rs
@@ -107,10 +107,12 @@ impl PrefixedStorageKey {
 
 /// Storage data associated to a [`StorageKey`].
 #[derive(PartialEq, Eq, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Hash, PartialOrd, Ord, Clone, Encode, Decode))]
+#[cfg_attr(
+	feature = "std",
+	derive(Serialize, Deserialize, Hash, PartialOrd, Ord, Clone, Encode, Decode, Default)
+)]
 pub struct StorageData(
-	#[cfg_attr(feature = "std", serde(with="impl_serde::serialize"))]
-	pub Vec<u8>,
+	#[cfg_attr(feature = "std", serde(with = "impl_serde::serialize"))] pub Vec<u8>,
 );
 
 /// Map of data to use in a storage, it is a collection of
diff --git a/utils/frame/remote-externalities/Cargo.toml b/utils/frame/remote-externalities/Cargo.toml
index 0d6336f60d88..4fe0cf979c1b 100644
--- a/utils/frame/remote-externalities/Cargo.toml
+++ b/utils/frame/remote-externalities/Cargo.toml
@@ -16,17 +16,21 @@ targets = ["x86_64-unknown-linux-gnu"]
 jsonrpsee-ws-client = { version = "=0.2.0-alpha.6", default-features = false }
 jsonrpsee-proc-macros = "=0.2.0-alpha.6"
 
-hex-literal = "0.3.1"
+hex = "0.4.0"
 env_logger = "0.8.2"
 log = "0.4.11"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 
+serde_json = "1.0"
+
 sp-io = { version = "3.0.0", path = "../../../primitives/io" }
 sp-core = { version = "3.0.0", path = "../../../primitives/core" }
 sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
 
 [dev-dependencies]
 tokio = { version = "1.6.0", features = ["macros", "rt"] }
+pallet-elections-phragmen = { path = "../../../frame/elections-phragmen", version = "4.0.0" }
+frame-support = { path = "../../../frame/support", version = "3.0.0" }
 
 [features]
 remote-test = []
diff --git a/utils/frame/remote-externalities/src/lib.rs b/utils/frame/remote-externalities/src/lib.rs
index 077892baabf7..46aa583b9b2a 100644
--- a/utils/frame/remote-externalities/src/lib.rs
+++ b/utils/frame/remote-externalities/src/lib.rs
@@ -114,17 +114,18 @@ use sp_core::{
 };
 use codec::{Encode, Decode};
 use sp_runtime::traits::Block as BlockT;
-use jsonrpsee_ws_client::{WsClientBuilder, WsClient};
+use jsonrpsee_ws_client::{
+	WsClientBuilder, WsClient, v2::params::JsonRpcParams, traits::Client,
+};
 
 type KeyPair = (StorageKey, StorageData);
 
 const LOG_TARGET: &str = "remote-ext";
 const DEFAULT_TARGET: &str = "wss://rpc.polkadot.io";
+const BATCH_SIZE: usize = 512;
 
 jsonrpsee_proc_macros::rpc_client_api! {
 	RpcApi<B: BlockT> {
-		#[rpc(method = "state_getStorage", positional_params)]
-		fn get_storage(prefix: StorageKey, hash: Option<B::Hash>) -> StorageData;
 		#[rpc(method = "state_getKeysPaged", positional_params)]
 		fn get_keys_paged(
 			prefix: Option<StorageKey>,
@@ -279,7 +280,7 @@ impl<B: BlockT> Builder<B> {
 	async fn get_keys_paged(
 		&self,
 		prefix: StorageKey,
-		hash: B::Hash,
+		at: B::Hash,
 	) -> Result<Vec<StorageKey>, &'static str> {
 		const PAGE: u32 = 512;
 		let mut last_key: Option<StorageKey> = None;
@@ -290,7 +291,7 @@ impl<B: BlockT> Builder<B> {
 				Some(prefix.clone()),
 				PAGE,
 				last_key.clone(),
-				Some(hash),
+				Some(at),
 			)
 			.await
 			.map_err(|e| {
@@ -328,29 +329,53 @@ impl<B: BlockT> Builder<B> {
 		prefix: StorageKey,
 		at: B::Hash,
 	) -> Result<Vec<KeyPair>, &'static str> {
+		use serde_json::to_value;
 		let keys = self.get_keys_paged(prefix, at).await?;
 		let keys_count = keys.len();
 		info!(target: LOG_TARGET, "Querying a total of {} keys", keys.len());
 
 		let mut key_values: Vec<KeyPair> = vec![];
-		for key in keys {
-			let value =
-				RpcApi::<B>::get_storage(self.as_online().rpc_client(), key.clone(), Some(at))
-					.await
-					.map_err(|e| {
-						error!(target: LOG_TARGET, "Error = {:?}", e);
-						"rpc get_storage failed"
-					})?;
-			key_values.push((key, value));
-			if key_values.len() % 1000 == 0 {
-				let ratio: f64 = key_values.len() as f64 / keys_count as f64;
-				debug!(
-					target: LOG_TARGET,
-					"progress = {:.2} [{} / {}]",
-					ratio,
-					key_values.len(),
-					keys_count,
-				);
+		let client = self.as_online().rpc_client();
+		for chunk_keys in keys.chunks(BATCH_SIZE) {
+			let batch = chunk_keys
+				.iter()
+				.cloned()
+				.map(|key| {
+					(
+						"state_getStorage",
+						JsonRpcParams::Array(
+							vec![
+								to_value(key).expect("json serialization will work; qed."),
+								to_value(at).expect("json serialization will work; qed."),
+							]
+						),
+					)
+				})
+				.collect::<Vec<_>>();
+			let values = client.batch_request::<Option<StorageData>>(batch)
+				.await
+				.map_err(|e| {
+					log::error!(target: LOG_TARGET, "failed to execute batch {:?} due to {:?}", chunk_keys, e);
+					"batch failed."
+				})?;
+			assert_eq!(chunk_keys.len(), values.len());
+			for (idx, key) in chunk_keys.into_iter().enumerate() {
+				let maybe_value = values[idx].clone();
+				let value = maybe_value.unwrap_or_else(|| {
+					log::warn!(target: LOG_TARGET, "key {:?} had none corresponding value.", &key);
+					StorageData(vec![])
+				});
+				key_values.push((key.clone(), value));
+				if key_values.len() % (10 * BATCH_SIZE) == 0 {
+					let ratio: f64 = key_values.len() as f64 / keys_count as f64;
+					debug!(
+						target: LOG_TARGET,
+						"progress = {:.2} [{} / {}]",
+						ratio,
+						key_values.len(),
+						keys_count,
+					);
+				}
 			}
 		}
 
@@ -529,7 +554,7 @@ mod remote_tests {
 		init_logger();
 		Builder::<Block>::new()
 			.mode(Mode::Online(OnlineConfig {
-				modules: vec!["Proxy".to_owned()],
+				modules: vec!["System".to_owned()],
 				..Default::default()
 			}))
 			.build()
@@ -538,6 +563,55 @@ mod remote_tests {
 			.execute_with(|| {});
 	}
 
+	#[tokio::test]
+	async fn can_build_few_pallet() {
+		init_logger();
+		Builder::<Block>::new()
+			.mode(Mode::Online(OnlineConfig {
+				modules: vec!["Proxy".to_owned(), "Multisig".to_owned(), "PhragmenElection".to_owned()],
+				..Default::default()
+			}))
+			.build()
+			.await
+			.expect("Can't reach the remote node. Is it running?")
+			.execute_with(|| {});
+	}
+
+	#[tokio::test]
+	async fn sanity_check_decoding() {
+		use pallet_elections_phragmen::SeatHolder;
+		use sp_core::crypto::Ss58Codec;
+		type AccountId = sp_runtime::AccountId32;
+		type Balance = u128;
+		frame_support::generate_storage_alias!(
+			PhragmenElection,
+			Members =>
+			Value<Vec<SeatHolder<AccountId, Balance>>>
+		);
+
+		init_logger();
+		Builder::<Block>::new()
+			.mode(Mode::Online(OnlineConfig {
+				modules: vec!["PhragmenElection".to_owned()],
+				..Default::default()
+			}))
+			.build()
+			.await
+			.expect("Can't reach the remote node. Is it running?")
+			.execute_with(|| {
+				// Gav's polkadot account. 99% this will be in the council.
+				let gav_polkadot =
+					AccountId::from_ss58check("13RDY9nrJpyTDBSUdBw12dGwhk19sGwsrVZ2bxkzYHBSagP2")
+						.unwrap();
+				let members = Members::get().unwrap();
+				assert!(members
+					.iter()
+					.map(|s| s.who.clone())
+					.find(|a| a == &gav_polkadot)
+					.is_some());
+			});
+	}
+
 	#[tokio::test]
 	async fn can_create_state_snapshot() {
 		init_logger();

From 6aaa03130da8abbe7c0aa5cf4c3f10557713f9d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Sat, 29 May 2021 11:58:26 +0200
Subject: [PATCH 0801/1194] Make `Schedule` fields public to allow for
 customization (#8924)

* Make `Schedule` fields public for customization

* Fix doc typo

Co-authored-by: Andrew Jones <ascjones@gmail.com>

Co-authored-by: Andrew Jones <ascjones@gmail.com>
---
 frame/contracts/src/lib.rs      |  6 ++-
 frame/contracts/src/schedule.rs | 70 +++++++++++++++++++++------------
 2 files changed, 49 insertions(+), 27 deletions(-)

diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index 0c36a8465a1e..fb4239adb24c 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -96,7 +96,11 @@ pub mod weights;
 #[cfg(test)]
 mod tests;
 
-pub use crate::{pallet::*, schedule::Schedule, exec::Frame};
+pub use crate::{
+	pallet::*,
+	schedule::{Schedule, Limits, InstructionWeights, HostFnWeights},
+	exec::Frame,
+};
 use crate::{
 	gas::GasMeter,
 	exec::{Stack as ExecStack, Executable},
diff --git a/frame/contracts/src/schedule.rs b/frame/contracts/src/schedule.rs
index 686861d28bbc..0bf7c050e5df 100644
--- a/frame/contracts/src/schedule.rs
+++ b/frame/contracts/src/schedule.rs
@@ -40,39 +40,48 @@ pub const INSTR_BENCHMARK_BATCH_SIZE: u32 = 1_000;
 
 /// Definition of the cost schedule and other parameterizations for the wasm vm.
 ///
-/// Its fields are private to the crate in order to allow addition of new contract
-/// callable functions without bumping to a new major version. The supplied [`Config::Schedule`]
-/// should rely on public functions of this type.
+/// Its [`Default`] implementation is the designated way to initialize this type. It uses
+/// the benchmarked information supplied by [`Config::WeightInfo`]. All of its fields are
+/// public and can therefore be modified. For example in order to change some of the limits
+/// and set a custom instruction weight version the following code could be used:
+/// ```rust
+/// use pallet_contracts::{Schedule, Limits, InstructionWeights, Config};
+///
+/// fn create_schedule<T: Config>() -> Schedule<T> {
+///     Schedule {
+///         limits: Limits {
+///		        globals: 3,
+///		        parameters: 3,
+///		        memory_pages: 16,
+///		        table_size: 3,
+///		        br_table_size: 3,
+///		        .. Default::default()
+///	        },
+///         instruction_weights: InstructionWeights {
+///	            version: 5,
+///             .. Default::default()
+///         },
+///	        .. Default::default()
+///     }
+/// }
+/// ```
+///
+/// # Note
+///
+/// Please make sure to bump the [`InstructionWeights::version`] whenever substantial
+/// changes are made to its values.
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "std", serde(bound(serialize = "", deserialize = "")))]
 #[derive(Clone, Encode, Decode, PartialEq, Eq, ScheduleDebug, DefaultNoBound)]
 pub struct Schedule<T: Config> {
 	/// Describes the upper limits on various metrics.
-	pub(crate) limits: Limits,
+	pub limits: Limits,
 
 	/// The weights for individual wasm instructions.
-	pub(crate) instruction_weights: InstructionWeights<T>,
+	pub instruction_weights: InstructionWeights<T>,
 
 	/// The weights for each imported function a contract is allowed to call.
-	pub(crate) host_fn_weights: HostFnWeights<T>,
-}
-
-impl<T: Config> Schedule<T> {
-	/// Set the version of the instruction weights.
-	///
-	/// # Note
-	///
-	/// Should be incremented whenever any instruction weight is changed. The
-	/// reason is that changes to instruction weights require a re-instrumentation
-	/// in order to apply the changes to an already deployed code. The re-instrumentation
-	/// is triggered by comparing the version of the current schedule with the the code was
-	/// instrumented with. Changes usually happen when pallet_contracts is re-benchmarked.
-	///
-	/// Changes to other parts of the schedule should not increment the version in
-	/// order to avoid unnecessary re-instrumentations.
-	pub fn set_instruction_weights_version(&mut self, version: u32) {
-		self.instruction_weights.version = version;
-	}
+	pub host_fn_weights: HostFnWeights<T>,
 }
 
 /// Describes the upper limits on various metrics.
@@ -169,8 +178,17 @@ impl Limits {
 pub struct InstructionWeights<T: Config> {
 	/// Version of the instruction weights.
 	///
-	/// See [`Schedule::set_instruction_weights_version`].
-	pub(crate) version: u32,
+	/// # Note
+	///
+	/// Should be incremented whenever any instruction weight is changed. The
+	/// reason is that changes to instruction weights require a re-instrumentation
+	/// in order to apply the changes to an already deployed code. The re-instrumentation
+	/// is triggered by comparing the version of the current schedule with the version the code was
+	/// instrumented with. Changes usually happen when pallet_contracts is re-benchmarked.
+	///
+	/// Changes to other parts of the schedule should not increment the version in
+	/// order to avoid unnecessary re-instrumentations.
+	pub version: u32,
 	pub i64const: u32,
 	pub i64load: u32,
 	pub i64store: u32,

From be1b8ef0eefd6e8fbc7abb3d33262d139277da13 Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Sat, 29 May 2021 11:17:26 +0100
Subject: [PATCH 0802/1194] Session key should be settable at genesis even for
 non-endowed accounts (#8942)

* Session key should be settable at genesis even for non-endowed accounts

* Docs
---
 frame/session/src/lib.rs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs
index cbe70598a91b..8574979ef2fe 100644
--- a/frame/session/src/lib.rs
+++ b/frame/session/src/lib.rs
@@ -442,11 +442,13 @@ decl_storage! {
 			for (account, val, keys) in config.keys.iter().cloned() {
 				<Module<T>>::inner_set_keys(&val, keys)
 					.expect("genesis config must not contain duplicates; qed");
-				assert!(
-					frame_system::Pallet::<T>::inc_consumers(&account).is_ok(),
-					"Account ({:?}) does not exist at genesis to set key. Account not endowed?",
-					account,
-				);
+				if frame_system::Pallet::<T>::inc_consumers(&account).is_err() {
+					// This will leak a provider reference, however it only happens once (at
+					// genesis) so it's really not a big deal and we assume that the user wants to
+					// do this since it's the only way a non-endowed account can contain a session
+					// key.
+					frame_system::Pallet::<T>::inc_providers(&account);
+				}
 			}
 
 			let initial_validators_0 = T::SessionManager::new_session(0)

From 88021e9db4d2e4f2bf88121f1eaace5b7cf640cf Mon Sep 17 00:00:00 2001
From: Shaun Wang <spxwang@gmail.com>
Date: Mon, 31 May 2021 17:57:20 +1200
Subject: [PATCH 0803/1194] Migrate pallet-scored-pool to pallet attribute
 macro (#8825)

* Migrate pallet-scored-pool to pallet attribute macro.

* Remove dummy event.

* Apply review suggestions.
---
 frame/scored-pool/src/lib.rs   | 303 ++++++++++++++++++---------------
 frame/scored-pool/src/mock.rs  |   6 +-
 frame/scored-pool/src/tests.rs |   4 +-
 3 files changed, 173 insertions(+), 140 deletions(-)

diff --git a/frame/scored-pool/src/lib.rs b/frame/scored-pool/src/lib.rs
index da26872a0071..2279bdfbfc5f 100644
--- a/frame/scored-pool/src/lib.rs
+++ b/frame/scored-pool/src/lib.rs
@@ -15,9 +15,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! # Scored Pool Module
+//! # Scored Pool Pallet
 //!
-//! The module maintains a scored membership pool. Each entity in the
+//! The pallet maintains a scored membership pool. Each entity in the
 //! pool can be attributed a `Score`. From this pool a set `Members`
 //! is constructed. This set contains the `MemberCount` highest
 //! scoring entities. Unscored entities are never part of `Members`.
@@ -39,7 +39,7 @@
 //!
 //! - [`Config`]
 //! - [`Call`]
-//! - [`Module`]
+//! - [`Pallet`]
 //!
 //! ## Interface
 //!
@@ -66,7 +66,7 @@
 //! 		pub fn candidate(origin) -> dispatch::DispatchResult {
 //! 			let who = ensure_signed(origin)?;
 //!
-//! 			let _ = <scored_pool::Module<T>>::submit_candidacy(
+//! 			let _ = <scored_pool::Pallet<T>>::submit_candidacy(
 //! 				T::Origin::from(Some(who.clone()).into())
 //! 			);
 //! 			Ok(())
@@ -79,7 +79,7 @@
 //!
 //! ## Dependencies
 //!
-//! This module depends on the [System module](../frame_system/index.html).
+//! This pallet depends on the [System pallet](../frame_system/index.html).
 
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
@@ -96,12 +96,11 @@ use sp_std::{
 	prelude::*,
 };
 use frame_support::{
-	decl_module, decl_storage, decl_event, ensure, decl_error,
-	traits::{EnsureOrigin, ChangeMembers, InitializeMembers, Currency, Get, ReservableCurrency},
-	weights::Weight,
+	ensure,
+	traits::{ChangeMembers, InitializeMembers, Currency, Get, ReservableCurrency},
 };
-use frame_system::{ensure_root, ensure_signed};
-use sp_runtime::traits::{AtLeast32Bit, MaybeSerializeDeserialize, Zero, StaticLookup};
+use sp_runtime::traits::{AtLeast32Bit, Zero, StaticLookup};
+pub use pallet::*;
 
 type BalanceOf<T, I> = <<T as Config<I>>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 type PoolT<T, I> = Vec<(<T as frame_system::Config>::AccountId, Option<<T as Config<I>>::Score>)>;
@@ -116,96 +115,60 @@ enum ChangeReceiver {
 	MembershipChanged,
 }
 
-pub trait Config<I=DefaultInstance>: frame_system::Config {
-	/// The currency used for deposits.
-	type Currency: Currency<Self::AccountId> + ReservableCurrency<Self::AccountId>;
-
-	/// The score attributed to a member or candidate.
-	type Score:
-		AtLeast32Bit + Clone + Copy + Default + FullCodec + MaybeSerializeDeserialize + Debug;
-
-	/// The overarching event type.
-	type Event: From<Event<Self, I>> + Into<<Self as frame_system::Config>::Event>;
-
-	// The deposit which is reserved from candidates if they want to
-	// start a candidacy. The deposit gets returned when the candidacy is
-	// withdrawn or when the candidate is kicked.
-	type CandidateDeposit: Get<BalanceOf<Self, I>>;
-
-	/// Every `Period` blocks the `Members` are filled with the highest scoring
-	/// members in the `Pool`.
-	type Period: Get<Self::BlockNumber>;
-
-	/// The receiver of the signal for when the membership has been initialized.
-	/// This happens pre-genesis and will usually be the same as `MembershipChanged`.
-	/// If you need to do something different on initialization, then you can change
-	/// this accordingly.
-	type MembershipInitialized: InitializeMembers<Self::AccountId>;
-
-	/// The receiver of the signal for when the members have changed.
-	type MembershipChanged: ChangeMembers<Self::AccountId>;
-
-	/// Allows a configurable origin type to set a score to a candidate in the pool.
-	type ScoreOrigin: EnsureOrigin<Self::Origin>;
-
-	/// Required origin for removing a member (though can always be Root).
-	/// Configurable origin which enables removing an entity. If the entity
-	/// is part of the `Members` it is immediately replaced by the next
-	/// highest scoring candidate, if available.
-	type KickOrigin: EnsureOrigin<Self::Origin>;
-}
-
-decl_storage! {
-	trait Store for Module<T: Config<I>, I: Instance=DefaultInstance> as ScoredPool {
-		/// The current pool of candidates, stored as an ordered Vec
-		/// (ordered descending by score, `None` last, highest first).
-		Pool get(fn pool) config(): PoolT<T, I>;
-
-		/// A Map of the candidates. The information in this Map is redundant
-		/// to the information in the `Pool`. But the Map enables us to easily
-		/// check if a candidate is already in the pool, without having to
-		/// iterate over the entire pool (the `Pool` is not sorted by
-		/// `T::AccountId`, but by `T::Score` instead).
-		CandidateExists get(fn candidate_exists): map hasher(twox_64_concat) T::AccountId => bool;
-
-		/// The current membership, stored as an ordered Vec.
-		Members get(fn members): Vec<T::AccountId>;
-
-		/// Size of the `Members` set.
-		MemberCount get(fn member_count) config(): u32;
-	}
-	add_extra_genesis {
-		config(members): Vec<T::AccountId>;
-		config(phantom): sp_std::marker::PhantomData<I>;
-		build(|config| {
-			let mut pool = config.pool.clone();
-
-			// reserve balance for each candidate in the pool.
-			// panicking here is ok, since this just happens one time, pre-genesis.
-			pool
-				.iter()
-				.for_each(|(who, _)| {
-					T::Currency::reserve(&who, T::CandidateDeposit::get())
-						.expect("balance too low to create candidacy");
-					<CandidateExists<T, I>>::insert(who, true);
-				});
-
-			// Sorts the `Pool` by score in a descending order. Entities which
-			// have a score of `None` are sorted to the beginning of the vec.
-			pool.sort_by_key(|(_, maybe_score)|
-				Reverse(maybe_score.unwrap_or_default())
-			);
-
-			<Pool<T, I>>::put(&pool);
-			<Module<T, I>>::refresh_members(pool, ChangeReceiver::MembershipInitialized);
-		})
+#[frame_support::pallet]
+pub mod pallet {
+	use frame_support::{pallet_prelude::*, traits::EnsureOrigin, weights::Weight};
+	use frame_system::{ensure_root, ensure_signed, pallet_prelude::*};
+	use sp_runtime::traits::MaybeSerializeDeserialize;
+	use super::*;
+
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T, I = ()>(_);
+
+	#[pallet::config]
+	pub trait Config<I: 'static = ()>: frame_system::Config {
+		/// The currency used for deposits.
+		type Currency: Currency<Self::AccountId> + ReservableCurrency<Self::AccountId>;
+
+		/// The score attributed to a member or candidate.
+		type Score:
+			AtLeast32Bit + Clone + Copy + Default + FullCodec + MaybeSerializeDeserialize + Debug;
+
+		/// The overarching event type.
+		type Event: From<Event<Self, I>> + IsType<<Self as frame_system::Config>::Event>;
+
+		// The deposit which is reserved from candidates if they want to
+		// start a candidacy. The deposit gets returned when the candidacy is
+		// withdrawn or when the candidate is kicked.
+		type CandidateDeposit: Get<BalanceOf<Self, I>>;
+
+		/// Every `Period` blocks the `Members` are filled with the highest scoring
+		/// members in the `Pool`.
+		type Period: Get<Self::BlockNumber>;
+
+		/// The receiver of the signal for when the membership has been initialized.
+		/// This happens pre-genesis and will usually be the same as `MembershipChanged`.
+		/// If you need to do something different on initialization, then you can change
+		/// this accordingly.
+		type MembershipInitialized: InitializeMembers<Self::AccountId>;
+
+		/// The receiver of the signal for when the members have changed.
+		type MembershipChanged: ChangeMembers<Self::AccountId>;
+
+		/// Allows a configurable origin type to set a score to a candidate in the pool.
+		type ScoreOrigin: EnsureOrigin<Self::Origin>;
+
+		/// Required origin for removing a member (though can always be Root).
+		/// Configurable origin which enables removing an entity. If the entity
+		/// is part of the `Members` it is immediately replaced by the next
+		/// highest scoring candidate, if available.
+		type KickOrigin: EnsureOrigin<Self::Origin>;
 	}
-}
 
-decl_event!(
-	pub enum Event<T, I=DefaultInstance> where
-		<T as frame_system::Config>::AccountId,
-	{
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	pub enum Event<T: Config<I>, I: 'static = ()> {
 		/// The given member was removed. See the transaction for who.
 		MemberRemoved,
 		/// An entity has issued a candidacy. See the transaction for who.
@@ -218,14 +181,11 @@ decl_event!(
 		/// A score was attributed to the candidate.
 		/// See the transaction for who.
 		CandidateScored,
-		/// Phantom member, never used.
-		Dummy(sp_std::marker::PhantomData<(AccountId, I)>),
 	}
-);
 
-decl_error! {
-	/// Error for the scored-pool module.
-	pub enum Error for Module<T: Config<I>, I: Instance> {
+	/// Error for the scored-pool pallet.
+	#[pallet::error]
+	pub enum Error<T, I = ()> {
 		/// Already a member.
 		AlreadyInPool,
 		/// Index out of bounds.
@@ -233,27 +193,95 @@ decl_error! {
 		/// Index does not match requested account.
 		WrongAccountIndex,
 	}
-}
 
-decl_module! {
-	pub struct Module<T: Config<I>, I: Instance=DefaultInstance>
-		for enum Call
-		where origin: T::Origin
-	{
-		type Error = Error<T, I>;
+	/// The current pool of candidates, stored as an ordered Vec
+	/// (ordered descending by score, `None` last, highest first).
+	#[pallet::storage]
+	#[pallet::getter(fn pool)]
+	pub(crate) type Pool<T: Config<I>, I: 'static = ()> = StorageValue<_, PoolT<T, I>, ValueQuery>;
+
+	/// A Map of the candidates. The information in this Map is redundant
+	/// to the information in the `Pool`. But the Map enables us to easily
+	/// check if a candidate is already in the pool, without having to
+	/// iterate over the entire pool (the `Pool` is not sorted by
+	/// `T::AccountId`, but by `T::Score` instead).
+	#[pallet::storage]
+	#[pallet::getter(fn candidate_exists)]
+	pub(crate) type CandidateExists<T: Config<I>, I: 'static = ()> = StorageMap<
+		_,
+		Twox64Concat, T::AccountId,
+		bool,
+		ValueQuery,
+	>;
+
+	/// The current membership, stored as an ordered Vec.
+	#[pallet::storage]
+	#[pallet::getter(fn members)]
+	pub(crate) type Members<T: Config<I>, I: 'static = ()> = StorageValue<_, Vec<T::AccountId>, ValueQuery>;
+
+	/// Size of the `Members` set.
+	#[pallet::storage]
+	#[pallet::getter(fn member_count)]
+	pub(crate) type MemberCount<T, I=()> = StorageValue<_, u32, ValueQuery>;
+
+	#[pallet::genesis_config]
+	pub struct GenesisConfig<T: Config<I>, I: 'static = ()> {
+		pub pool: PoolT<T, I>,
+		pub member_count: u32,
+	}
+
+	#[cfg(feature = "std")]
+	impl<T: Config<I>, I: 'static> Default for GenesisConfig<T, I> {
+		fn default() -> Self {
+			Self {
+				pool: Default::default(),
+				member_count: Default::default(),
+			}
+		}
+	}
+
+	#[pallet::genesis_build]
+	impl<T: Config<I>, I: 'static> GenesisBuild<T, I> for GenesisConfig<T, I> {
+		fn build(&self) {
+			let mut pool = self.pool.clone();
+
+			// reserve balance for each candidate in the pool.
+			// panicking here is ok, since this just happens one time, pre-genesis.
+			pool
+				.iter()
+				.for_each(|(who, _)| {
+					T::Currency::reserve(&who, T::CandidateDeposit::get())
+						.expect("balance too low to create candidacy");
+					<CandidateExists<T, I>>::insert(who, true);
+				});
+
+			// Sorts the `Pool` by score in a descending order. Entities which
+			// have a score of `None` are sorted to the beginning of the vec.
+			pool.sort_by_key(|(_, maybe_score)|
+				Reverse(maybe_score.unwrap_or_default())
+			);
 
-		fn deposit_event() = default;
+			<MemberCount<T, I>>::put(self.member_count);
+			<Pool<T, I>>::put(&pool);
+			<Pallet<T, I>>::refresh_members(pool, ChangeReceiver::MembershipInitialized);
+		}
+	}
 
+	#[pallet::hooks]
+	impl<T: Config<I>, I: 'static> Hooks<BlockNumberFor<T>> for Pallet<T, I> {
 		/// Every `Period` blocks the `Members` set is refreshed from the
 		/// highest scoring members in the pool.
 		fn on_initialize(n: T::BlockNumber) -> Weight {
 			if n % T::Period::get() == Zero::zero() {
 				let pool = <Pool<T, I>>::get();
-				<Module<T, I>>::refresh_members(pool, ChangeReceiver::MembershipChanged);
+				<Pallet<T, I>>::refresh_members(pool, ChangeReceiver::MembershipChanged);
 			}
 			0
 		}
+	}
 
+	#[pallet::call]
+	impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		/// Add `origin` to the pool of candidates.
 		///
 		/// This results in `CandidateDeposit` being reserved from
@@ -265,8 +293,8 @@ decl_module! {
 		///
 		/// The `index` parameter of this function must be set to
 		/// the index of the transactor in the `Pool`.
-		#[weight = 0]
-		pub fn submit_candidacy(origin) {
+		#[pallet::weight(0)]
+		pub fn submit_candidacy(origin: OriginFor<T>) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			ensure!(!<CandidateExists<T, I>>::contains_key(&who), Error::<T, I>::AlreadyInPool);
 
@@ -279,7 +307,8 @@ decl_module! {
 
 			<CandidateExists<T, I>>::insert(&who, true);
 
-			Self::deposit_event(RawEvent::CandidateAdded);
+			Self::deposit_event(Event::<T, I>::CandidateAdded);
+			Ok(())
 		}
 
 		/// An entity withdraws candidacy and gets its deposit back.
@@ -292,18 +321,19 @@ decl_module! {
 		///
 		/// The `index` parameter of this function must be set to
 		/// the index of the transactor in the `Pool`.
-		#[weight = 0]
+		#[pallet::weight(0)]
 		pub fn withdraw_candidacy(
-			origin,
+			origin: OriginFor<T>,
 			index: u32
-		) {
+		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 
 			let pool = <Pool<T, I>>::get();
 			Self::ensure_index(&pool, &who, index)?;
 
 			Self::remove_member(pool, who, index)?;
-			Self::deposit_event(RawEvent::CandidateWithdrew);
+			Self::deposit_event(Event::<T, I>::CandidateWithdrew);
+			Ok(())
 		}
 
 		/// Kick a member `who` from the set.
@@ -312,12 +342,12 @@ decl_module! {
 		///
 		/// The `index` parameter of this function must be set to
 		/// the index of `dest` in the `Pool`.
-		#[weight = 0]
+		#[pallet::weight(0)]
 		pub fn kick(
-			origin,
+			origin: OriginFor<T>,
 			dest: <T::Lookup as StaticLookup>::Source,
 			index: u32
-		) {
+		) -> DispatchResult {
 			T::KickOrigin::ensure_origin(origin)?;
 
 			let who = T::Lookup::lookup(dest)?;
@@ -326,7 +356,8 @@ decl_module! {
 			Self::ensure_index(&pool, &who, index)?;
 
 			Self::remove_member(pool, who, index)?;
-			Self::deposit_event(RawEvent::CandidateKicked);
+			Self::deposit_event(Event::<T, I>::CandidateKicked);
+			Ok(())
 		}
 
 		/// Score a member `who` with `score`.
@@ -335,13 +366,13 @@ decl_module! {
 		///
 		/// The `index` parameter of this function must be set to
 		/// the index of the `dest` in the `Pool`.
-		#[weight = 0]
+		#[pallet::weight(0)]
 		pub fn score(
-			origin,
+			origin: OriginFor<T>,
 			dest: <T::Lookup as StaticLookup>::Source,
 			index: u32,
 			score: T::Score
-		) {
+		) -> DispatchResult {
 			T::ScoreOrigin::ensure_origin(origin)?;
 
 			let who = T::Lookup::lookup(dest)?;
@@ -365,7 +396,8 @@ decl_module! {
 			pool.insert(location, item);
 
 			<Pool<T, I>>::put(&pool);
-			Self::deposit_event(RawEvent::CandidateScored);
+			Self::deposit_event(Event::<T, I>::CandidateScored);
+			Ok(())
 		}
 
 		/// Dispatchable call to change `MemberCount`.
@@ -374,15 +406,16 @@ decl_module! {
 		/// (this happens each `Period`).
 		///
 		/// May only be called from root.
-		#[weight = 0]
-		pub fn change_member_count(origin, count: u32) {
+		#[pallet::weight(0)]
+		pub fn change_member_count(origin: OriginFor<T>, count: u32) -> DispatchResult {
 			ensure_root(origin)?;
-			<MemberCount<I>>::put(&count);
+			MemberCount::<T, I>::put(&count);
+			Ok(())
 		}
 	}
 }
 
-impl<T: Config<I>, I: Instance> Module<T, I> {
+impl<T: Config<I>, I: 'static> Pallet<T, I> {
 
 	/// Fetches the `MemberCount` highest scoring members from
 	/// `Pool` and puts them into `Members`.
@@ -393,7 +426,7 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 		pool: PoolT<T, I>,
 		notify: ChangeReceiver
 	) {
-		let count = <MemberCount<I>>::get();
+		let count = MemberCount::<T, I>::get();
 
 		let mut new_members: Vec<T::AccountId> = pool
 			.into_iter()
@@ -426,7 +459,7 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 		remove: T::AccountId,
 		index: u32
 	) -> Result<(), Error<T, I>> {
-		// all callers of this function in this module also check
+		// all callers of this function in this pallet also check
 		// the index for validity before calling this function.
 		// nevertheless we check again here, to assert that there was
 		// no mistake when invoking this sensible function.
@@ -445,7 +478,7 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 
 		T::Currency::unreserve(&remove, T::CandidateDeposit::get());
 
-		Self::deposit_event(RawEvent::MemberRemoved);
+		Self::deposit_event(Event::<T, I>::MemberRemoved);
 		Ok(())
 	}
 
diff --git a/frame/scored-pool/src/mock.rs b/frame/scored-pool/src/mock.rs
index 1da665f43eae..8f7acd32007e 100644
--- a/frame/scored-pool/src/mock.rs
+++ b/frame/scored-pool/src/mock.rs
@@ -21,7 +21,7 @@ use super::*;
 use crate as pallet_scored_pool;
 
 use std::cell::RefCell;
-use frame_support::{parameter_types, ord_parameter_types};
+use frame_support::{parameter_types, ord_parameter_types, traits::GenesisBuild};
 use sp_core::H256;
 use sp_runtime::{
 	traits::{BlakeTwo256, IdentityLookup}, testing::Header,
@@ -160,7 +160,7 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 
 /// Fetch an entity from the pool, if existent.
 pub fn fetch_from_pool(who: u64) -> Option<(u64, Option<u64>)> {
-	<Module<Test>>::pool()
+	<Pallet<Test>>::pool()
 		.into_iter()
 		.find(|item| item.0 == who)
 }
@@ -168,7 +168,7 @@ pub fn fetch_from_pool(who: u64) -> Option<(u64, Option<u64>)> {
 /// Find an entity in the pool.
 /// Returns its position in the `Pool` vec, if existent.
 pub fn find_in_pool(who: u64) -> Option<usize> {
-	<Module<Test>>::pool()
+	<Pallet<Test>>::pool()
 		.into_iter()
 		.position(|item| item.0 == who)
 }
diff --git a/frame/scored-pool/src/tests.rs b/frame/scored-pool/src/tests.rs
index e24ee9116497..4a3b8384b744 100644
--- a/frame/scored-pool/src/tests.rs
+++ b/frame/scored-pool/src/tests.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Tests for the module.
+//! Tests for the pallet.
 
 use super::*;
 use mock::*;
@@ -23,7 +23,7 @@ use mock::*;
 use frame_support::{assert_ok, assert_noop, traits::OnInitialize};
 use sp_runtime::traits::BadOrigin;
 
-type ScoredPool = Module<Test>;
+type ScoredPool = Pallet<Test>;
 type System = frame_system::Pallet<Test>;
 type Balances = pallet_balances::Pallet<Test>;
 

From 87e63fa7c70be29383cb95ff52d71874f1db908a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 31 May 2021 07:39:35 +0000
Subject: [PATCH 0804/1194] Bump retain_mut from 0.1.2 to 0.1.3 (#8951)

Bumps [retain_mut](https://github.com/upsuper/retain_mut) from 0.1.2 to 0.1.3.
- [Release notes](https://github.com/upsuper/retain_mut/releases)
- [Commits](https://github.com/upsuper/retain_mut/compare/v0.1.2...v0.1.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                               | 4 ++--
 client/consensus/babe/Cargo.toml         | 2 +-
 client/transaction-pool/graph/Cargo.toml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 377059ba220c..e954a76d0ba2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6713,9 +6713,9 @@ dependencies = [
 
 [[package]]
 name = "retain_mut"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53552c6c49e1e13f1a203ef0080ab3bbef0beb570a528993e83df057a9d9bba1"
+checksum = "e9c17925a9027d298a4603d286befe3f9dc0e8ed02523141914eb628798d6e5b"
 
 [[package]]
 name = "ring"
diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml
index c69544bc06c9..9ada9fda6216 100644
--- a/client/consensus/babe/Cargo.toml
+++ b/client/consensus/babe/Cargo.toml
@@ -51,7 +51,7 @@ rand = "0.7.2"
 merlin = "2.0"
 pdqselect = "0.1.0"
 derive_more = "0.99.2"
-retain_mut = "0.1.2"
+retain_mut = "0.1.3"
 async-trait = "0.1.42"
 
 [dev-dependencies]
diff --git a/client/transaction-pool/graph/Cargo.toml b/client/transaction-pool/graph/Cargo.toml
index 7ed455f9370c..4b134c708096 100644
--- a/client/transaction-pool/graph/Cargo.toml
+++ b/client/transaction-pool/graph/Cargo.toml
@@ -27,7 +27,7 @@ sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
 sp-transaction-pool = { version = "3.0.0", path = "../../../primitives/transaction-pool" }
 parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
 linked-hash-map = "0.5.2"
-retain_mut = "0.1.2"
+retain_mut = "0.1.3"
 
 [dev-dependencies]
 assert_matches = "1.3.0"

From 61aa8dc17d2bdde36f0c0e1078cde5b79408cb62 Mon Sep 17 00:00:00 2001
From: Seun Lanlege <seun@parity.io>
Date: Mon, 31 May 2021 16:31:47 +0100
Subject: [PATCH 0805/1194] Use correct CreateInherentDataProviders impl for
 manual seal (#8852)

* use correct CreateInherentDataProviders impl for manual seal

* add babe inherent provider

* move client into factory fn
---
 bin/node/test-runner-example/src/lib.rs       | 23 ++++++++-----------
 .../manual-seal/src/consensus/babe.rs         |  9 ++++++--
 .../consensus/manual-seal/src/seal_block.rs   |  5 +---
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/bin/node/test-runner-example/src/lib.rs b/bin/node/test-runner-example/src/lib.rs
index 8a5fbdad885c..8a3f5560ec86 100644
--- a/bin/node/test-runner-example/src/lib.rs
+++ b/bin/node/test-runner-example/src/lib.rs
@@ -27,7 +27,9 @@ use sc_consensus_babe::BabeBlockImport;
 use sp_keystore::SyncCryptoStorePtr;
 use sp_keyring::sr25519::Keyring::Alice;
 use sp_consensus_babe::AuthorityId;
-use sc_consensus_manual_seal::{ConsensusDataProvider, consensus::babe::BabeConsensusDataProvider};
+use sc_consensus_manual_seal::{
+	ConsensusDataProvider, consensus::babe::{BabeConsensusDataProvider, SlotTimestampProvider},
+};
 use sp_runtime::{traits::IdentifyAccount, MultiSigner, generic::Era};
 use node_cli::chain_spec::development_config;
 
@@ -59,10 +61,7 @@ impl ChainInfo for NodeTemplateChainInfo {
 		Self::SelectChain,
 	>;
 	type SignedExtras = node_runtime::SignedExtra;
-	type InherentDataProviders = (
-		sp_timestamp::InherentDataProvider,
-		sp_consensus_babe::inherents::InherentDataProvider,
-	);
+	type InherentDataProviders = (SlotTimestampProvider, sp_consensus_babe::inherents::InherentDataProvider);
 
 	fn signed_extras(from: <Self::Runtime as frame_system::Config>::AccountId) -> Self::SignedExtras {
 		(
@@ -139,20 +138,16 @@ impl ChainInfo for NodeTemplateChainInfo {
 			.expect("failed to create ConsensusDataProvider");
 
 		Ok((
-			client,
+			client.clone(),
 			backend,
 			keystore.sync_keystore(),
 			task_manager,
 			Box::new(move |_, _| {
-				let slot_duration = slot_duration.clone();
+				let client = client.clone();
 				async move {
-					let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
-					let slot = sp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_duration(
-						*timestamp,
-						slot_duration.slot_duration(),
-					);
-
-					Ok((timestamp, slot))
+					let timestamp = SlotTimestampProvider::new(client.clone()).map_err(|err| format!("{:?}", err))?;
+					let babe = sp_consensus_babe::inherents::InherentDataProvider::new(timestamp.slot().into());
+					Ok((timestamp, babe))
 				}
 			}),
 			Some(Box::new(consensus_data_provider)),
diff --git a/client/consensus/manual-seal/src/consensus/babe.rs b/client/consensus/manual-seal/src/consensus/babe.rs
index 69590c6a1e66..100fec912faa 100644
--- a/client/consensus/manual-seal/src/consensus/babe.rs
+++ b/client/consensus/manual-seal/src/consensus/babe.rs
@@ -268,7 +268,7 @@ impl SlotTimestampProvider {
 
 		// looks like this isn't the first block, rehydrate the fake time.
 		// otherwise we'd be producing blocks for older slots.
-		let duration = if info.best_number != Zero::zero() {
+		let time = if info.best_number != Zero::zero() {
 			let header = client.header(BlockId::Hash(info.best_hash))?.unwrap();
 			let slot = find_pre_digest::<B>(&header).unwrap().slot();
 			// add the slot duration so there's no collision of slots
@@ -282,10 +282,15 @@ impl SlotTimestampProvider {
 		};
 
 		Ok(Self {
-			time: atomic::AtomicU64::new(duration),
+			time: atomic::AtomicU64::new(time),
 			slot_duration,
 		})
 	}
+
+	/// Get the current slot number
+	pub fn slot(&self) -> u64 {
+		self.time.load(atomic::Ordering::SeqCst) / self.slot_duration
+	}
 }
 
 #[async_trait::async_trait]
diff --git a/client/consensus/manual-seal/src/seal_block.rs b/client/consensus/manual-seal/src/seal_block.rs
index 6f2b613cd939..4aecfc213ab4 100644
--- a/client/consensus/manual-seal/src/seal_block.rs
+++ b/client/consensus/manual-seal/src/seal_block.rs
@@ -111,10 +111,7 @@ pub async fn seal_block<B, BI, SC, C, E, P, CIDP>(
 
 		let inherent_data_providers =
 			create_inherent_data_providers
-				.create_inherent_data_providers(
-					parent.hash(),
-					(),
-				)
+				.create_inherent_data_providers(parent.hash(), ())
 				.await
 				.map_err(|e| Error::Other(e))?;
 

From fc29e14efd84d34ef4362b9671300611fb41b52b Mon Sep 17 00:00:00 2001
From: Roman Proskuryakov <humbug@deeptown.org>
Date: Mon, 31 May 2021 16:05:50 +0000
Subject: [PATCH 0806/1194] Refactor code a little bit (#8932)

---
 client/network/src/block_request_handler.rs | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/client/network/src/block_request_handler.rs b/client/network/src/block_request_handler.rs
index 633b6b5935ed..19367b110469 100644
--- a/client/network/src/block_request_handler.rs
+++ b/client/network/src/block_request_handler.rs
@@ -46,7 +46,7 @@ mod rep {
 	use super::ReputationChange as Rep;
 
 	/// Reputation change when a peer sent us the same request multiple times.
-	pub const SAME_REQUEST: Rep = Rep::new(i32::min_value(), "Same block request multiple times");
+	pub const SAME_REQUEST: Rep = Rep::new_fatal("Same block request multiple times");
 }
 
 /// Generates a [`ProtocolConfig`] for the block request protocol, refusing incoming requests.
@@ -65,11 +65,7 @@ pub fn generate_protocol_config(protocol_id: &ProtocolId) -> ProtocolConfig {
 // Visibility `pub(crate)` to allow `crate::light_client_requests::sender` to generate block request
 // protocol name and send block requests.
 pub(crate) fn generate_protocol_name(protocol_id: &ProtocolId) -> String {
-	let mut s = String::new();
-	s.push_str("/");
-	s.push_str(protocol_id.as_ref());
-	s.push_str("/sync/2");
-	s
+	format!("/{}/sync/2", protocol_id.as_ref())
 }
 
 /// The key of [`BlockRequestHandler::seen_requests`].
@@ -192,7 +188,7 @@ impl<B: BlockT> BlockRequestHandler<B> {
 			support_multiple_justifications,
 		};
 
-		let mut reputation_changes = Vec::new();
+		let mut reputation_change = None;
 
 		match self.seen_requests.get_mut(&key) {
 			Some(SeenRequestsValue::First) => {},
@@ -200,7 +196,7 @@ impl<B: BlockT> BlockRequestHandler<B> {
 				*requests = requests.saturating_add(1);
 
 				if *requests > MAX_NUMBER_OF_SAME_REQUESTS_PER_PEER {
-					reputation_changes.push(rep::SAME_REQUEST);
+					reputation_change = Some(rep::SAME_REQUEST);
 				}
 			},
 			None => {
@@ -219,7 +215,7 @@ impl<B: BlockT> BlockRequestHandler<B> {
 			attributes,
 		);
 
-		let result = if reputation_changes.is_empty() {
+		let result = if reputation_change.is_none() {
 			let block_response = self.get_block_response(
 				attributes,
 				from_block_id,
@@ -228,7 +224,7 @@ impl<B: BlockT> BlockRequestHandler<B> {
 				support_multiple_justifications,
 			)?;
 
-			// If any of the blocks contains nay data, we can consider it as successful request.
+			// If any of the blocks contains any data, we can consider it as successful request.
 			if block_response
 				.blocks
 				.iter()
@@ -253,7 +249,7 @@ impl<B: BlockT> BlockRequestHandler<B> {
 
 		pending_response.send(OutgoingResponse {
 			result,
-			reputation_changes,
+			reputation_changes: reputation_change.into_iter().collect(),
 			sent_feedback: None,
 		}).map_err(|_| HandleRequestError::SendResponse)
 	}

From 6d43761487c36b0b1d3fff0d538d134d0620ce04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Mon, 31 May 2021 20:17:15 +0200
Subject: [PATCH 0807/1194] Optimize `next_storage_key` (#8956)

* Optimize `next_storage_key`

- Do not rely on recursion
- Use an iterator over the overlay to not always call the same method

* Fix bug
---
 primitives/state-machine/src/ext.rs           | 116 ++++++++++++++----
 .../src/overlayed_changes/changeset.rs        |  46 +++----
 .../src/overlayed_changes/mod.rs              |  42 +++----
 3 files changed, 136 insertions(+), 68 deletions(-)

diff --git a/primitives/state-machine/src/ext.rs b/primitives/state-machine/src/ext.rs
index 471674580d2b..2649c320e14d 100644
--- a/primitives/state-machine/src/ext.rs
+++ b/primitives/state-machine/src/ext.rs
@@ -32,7 +32,7 @@ use sp_externalities::{
 };
 use codec::{Decode, Encode, EncodeAppend};
 
-use sp_std::{fmt, any::{Any, TypeId}, vec::Vec, vec, boxed::Box};
+use sp_std::{fmt, any::{Any, TypeId}, vec::Vec, vec, boxed::Box, cmp::Ordering};
 use crate::{warn, trace, log_error};
 #[cfg(feature = "std")]
 use crate::changes_trie::State as ChangesTrieState;
@@ -323,16 +323,37 @@ where
 	}
 
 	fn next_storage_key(&self, key: &[u8]) -> Option<StorageKey> {
-		let next_backend_key = self.backend.next_storage_key(key).expect(EXT_NOT_ALLOWED_TO_FAIL);
-		let next_overlay_key_change = self.overlay.next_storage_key_change(key);
-
-		match (next_backend_key, next_overlay_key_change) {
-			(Some(backend_key), Some(overlay_key)) if &backend_key[..] < overlay_key.0 => Some(backend_key),
-			(backend_key, None) => backend_key,
-			(_, Some(overlay_key)) => if overlay_key.1.value().is_some() {
-				Some(overlay_key.0.to_vec())
-			} else {
-				self.next_storage_key(&overlay_key.0[..])
+		let mut next_backend_key = self.backend.next_storage_key(key).expect(EXT_NOT_ALLOWED_TO_FAIL);
+		let mut overlay_changes = self.overlay.iter_after(key).peekable();
+
+		match (&next_backend_key, overlay_changes.peek()) {
+			(_, None) => next_backend_key,
+			(Some(_), Some(_)) => {
+				while let Some(overlay_key) = overlay_changes.next() {
+					let cmp = next_backend_key.as_deref().map(|v| v.cmp(&overlay_key.0));
+
+					// If `backend_key` is less than the `overlay_key`, we found out next key.
+					if cmp == Some(Ordering::Less) {
+						return next_backend_key
+					} else if overlay_key.1.value().is_some() {
+						// If there exists a value for the `overlay_key` in the overlay
+						// (aka the key is still valid), it means we have found our next key.
+						return Some(overlay_key.0.to_vec())
+					} else if cmp == Some(Ordering::Equal) {
+						// If the `backend_key` and `overlay_key` are equal, it means that we need
+						// to search for the next backend key, because the overlay has overwritten
+						// this key.
+						next_backend_key = self.backend.next_storage_key(
+							&overlay_key.0,
+						).expect(EXT_NOT_ALLOWED_TO_FAIL);
+					}
+				}
+
+				next_backend_key
+			},
+			(None, Some(_)) => {
+				// Find the next overlay key that has a value attached.
+				overlay_changes.find_map(|k| k.1.value().as_ref().map(|_| k.0.to_vec()))
 			},
 		}
 	}
@@ -342,24 +363,43 @@ where
 		child_info: &ChildInfo,
 		key: &[u8],
 	) -> Option<StorageKey> {
-		let next_backend_key = self.backend
+		let mut next_backend_key = self.backend
 			.next_child_storage_key(child_info, key)
 			.expect(EXT_NOT_ALLOWED_TO_FAIL);
-		let next_overlay_key_change = self.overlay.next_child_storage_key_change(
+		let mut overlay_changes = self.overlay.child_iter_after(
 			child_info.storage_key(),
 			key
-		);
+		).peekable();
+
+		match (&next_backend_key, overlay_changes.peek()) {
+			(_, None) => next_backend_key,
+			(Some(_), Some(_)) => {
+				while let Some(overlay_key) = overlay_changes.next() {
+					let cmp = next_backend_key.as_deref().map(|v| v.cmp(&overlay_key.0));
+
+					// If `backend_key` is less than the `overlay_key`, we found out next key.
+					if cmp == Some(Ordering::Less) {
+						return next_backend_key
+					} else if overlay_key.1.value().is_some() {
+						// If there exists a value for the `overlay_key` in the overlay
+						// (aka the key is still valid), it means we have found our next key.
+						return Some(overlay_key.0.to_vec())
+					} else if cmp == Some(Ordering::Equal) {
+						// If the `backend_key` and `overlay_key` are equal, it means that we need
+						// to search for the next backend key, because the overlay has overwritten
+						// this key.
+						next_backend_key = self.backend.next_child_storage_key(
+							child_info,
+							&overlay_key.0,
+						).expect(EXT_NOT_ALLOWED_TO_FAIL);
+					}
+				}
 
-		match (next_backend_key, next_overlay_key_change) {
-			(Some(backend_key), Some(overlay_key)) if &backend_key[..] < overlay_key.0 => Some(backend_key),
-			(backend_key, None) => backend_key,
-			(_, Some(overlay_key)) => if overlay_key.1.value().is_some() {
-				Some(overlay_key.0.to_vec())
-			} else {
-				self.next_child_storage_key(
-					child_info,
-					&overlay_key.0[..],
-				)
+				next_backend_key
+			},
+			(None, Some(_)) => {
+				// Find the next overlay key that has a value attached.
+				overlay_changes.find_map(|k| k.1.value().as_ref().map(|_| k.0.to_vec()))
 			},
 		}
 	}
@@ -971,6 +1011,34 @@ mod tests {
 		assert_eq!(ext.next_storage_key(&[40]), Some(vec![50]));
 	}
 
+	#[test]
+	fn next_storage_key_works_with_a_lot_empty_values_in_overlay() {
+		let mut cache = StorageTransactionCache::default();
+		let mut overlay = OverlayedChanges::default();
+		overlay.set_storage(vec![20], None);
+		overlay.set_storage(vec![21], None);
+		overlay.set_storage(vec![22], None);
+		overlay.set_storage(vec![23], None);
+		overlay.set_storage(vec![24], None);
+		overlay.set_storage(vec![25], None);
+		overlay.set_storage(vec![26], None);
+		overlay.set_storage(vec![27], None);
+		overlay.set_storage(vec![28], None);
+		overlay.set_storage(vec![29], None);
+		let backend = Storage {
+			top: map![
+				vec![30] => vec![30]
+			],
+			children_default: map![]
+		}.into();
+
+		let ext = TestExt::new(&mut overlay, &mut cache, &backend, None, None);
+
+		assert_eq!(ext.next_storage_key(&[5]), Some(vec![30]));
+
+		drop(ext);
+	}
+
 	#[test]
 	fn next_child_storage_key_works() {
 		let child_info = ChildInfo::new_default(b"Child1");
diff --git a/primitives/state-machine/src/overlayed_changes/changeset.rs b/primitives/state-machine/src/overlayed_changes/changeset.rs
index d25f4807aa97..ae9584990e5f 100644
--- a/primitives/state-machine/src/overlayed_changes/changeset.rs
+++ b/primitives/state-machine/src/overlayed_changes/changeset.rs
@@ -426,11 +426,11 @@ impl OverlayedChangeSet {
 		}
 	}
 
-	/// Get the change that is next to the supplied key.
-	pub fn next_change(&self, key: &[u8]) -> Option<(&[u8], &OverlayedValue)> {
+	/// Get the iterator over all changes that follow the supplied `key`.
+	pub fn changes_after(&self, key: &[u8]) -> impl Iterator<Item = (&[u8], &OverlayedValue)> {
 		use sp_std::ops::Bound;
 		let range = (Bound::Excluded(key), Bound::Unbounded);
-		self.changes.range::<[u8], _>(range).next().map(|(k, v)| (&k[..], v))
+		self.changes.range::<[u8], _>(range).map(|(k, v)| (k.as_slice(), v))
 	}
 }
 
@@ -707,29 +707,29 @@ mod test {
 		changeset.set(b"key4".to_vec(), Some(b"val4".to_vec()), Some(4));
 		changeset.set(b"key11".to_vec(), Some(b"val11".to_vec()), Some(11));
 
-		assert_eq!(changeset.next_change(b"key0").unwrap().0, b"key1");
-		assert_eq!(changeset.next_change(b"key0").unwrap().1.value(), Some(&b"val1".to_vec()));
-		assert_eq!(changeset.next_change(b"key1").unwrap().0, b"key11");
-		assert_eq!(changeset.next_change(b"key1").unwrap().1.value(), Some(&b"val11".to_vec()));
-		assert_eq!(changeset.next_change(b"key11").unwrap().0, b"key2");
-		assert_eq!(changeset.next_change(b"key11").unwrap().1.value(), Some(&b"val2".to_vec()));
-		assert_eq!(changeset.next_change(b"key2").unwrap().0, b"key3");
-		assert_eq!(changeset.next_change(b"key2").unwrap().1.value(), Some(&b"val3".to_vec()));
-		assert_eq!(changeset.next_change(b"key3").unwrap().0, b"key4");
-		assert_eq!(changeset.next_change(b"key3").unwrap().1.value(), Some(&b"val4".to_vec()));
-		assert_eq!(changeset.next_change(b"key4"), None);
+		assert_eq!(changeset.changes_after(b"key0").next().unwrap().0, b"key1");
+		assert_eq!(changeset.changes_after(b"key0").next().unwrap().1.value(), Some(&b"val1".to_vec()));
+		assert_eq!(changeset.changes_after(b"key1").next().unwrap().0, b"key11");
+		assert_eq!(changeset.changes_after(b"key1").next().unwrap().1.value(), Some(&b"val11".to_vec()));
+		assert_eq!(changeset.changes_after(b"key11").next().unwrap().0, b"key2");
+		assert_eq!(changeset.changes_after(b"key11").next().unwrap().1.value(), Some(&b"val2".to_vec()));
+		assert_eq!(changeset.changes_after(b"key2").next().unwrap().0, b"key3");
+		assert_eq!(changeset.changes_after(b"key2").next().unwrap().1.value(), Some(&b"val3".to_vec()));
+		assert_eq!(changeset.changes_after(b"key3").next().unwrap().0, b"key4");
+		assert_eq!(changeset.changes_after(b"key3").next().unwrap().1.value(), Some(&b"val4".to_vec()));
+		assert_eq!(changeset.changes_after(b"key4").next(), None);
 
 		changeset.rollback_transaction().unwrap();
 
-		assert_eq!(changeset.next_change(b"key0").unwrap().0, b"key1");
-		assert_eq!(changeset.next_change(b"key0").unwrap().1.value(), Some(&b"val1".to_vec()));
-		assert_eq!(changeset.next_change(b"key1").unwrap().0, b"key2");
-		assert_eq!(changeset.next_change(b"key1").unwrap().1.value(), Some(&b"val2".to_vec()));
-		assert_eq!(changeset.next_change(b"key11").unwrap().0, b"key2");
-		assert_eq!(changeset.next_change(b"key11").unwrap().1.value(), Some(&b"val2".to_vec()));
-		assert_eq!(changeset.next_change(b"key2"), None);
-		assert_eq!(changeset.next_change(b"key3"), None);
-		assert_eq!(changeset.next_change(b"key4"), None);
+		assert_eq!(changeset.changes_after(b"key0").next().unwrap().0, b"key1");
+		assert_eq!(changeset.changes_after(b"key0").next().unwrap().1.value(), Some(&b"val1".to_vec()));
+		assert_eq!(changeset.changes_after(b"key1").next().unwrap().0, b"key2");
+		assert_eq!(changeset.changes_after(b"key1").next().unwrap().1.value(), Some(&b"val2".to_vec()));
+		assert_eq!(changeset.changes_after(b"key11").next().unwrap().0, b"key2");
+		assert_eq!(changeset.changes_after(b"key11").next().unwrap().1.value(), Some(&b"val2".to_vec()));
+		assert_eq!(changeset.changes_after(b"key2").next(), None);
+		assert_eq!(changeset.changes_after(b"key3").next(), None);
+		assert_eq!(changeset.changes_after(b"key4").next(), None);
 
 	}
 
diff --git a/primitives/state-machine/src/overlayed_changes/mod.rs b/primitives/state-machine/src/overlayed_changes/mod.rs
index 1d3cbb59ba0c..2a3495a4e1c7 100644
--- a/primitives/state-machine/src/overlayed_changes/mod.rs
+++ b/primitives/state-machine/src/overlayed_changes/mod.rs
@@ -669,24 +669,24 @@ impl OverlayedChanges {
 		})
 	}
 
-	/// Returns the next (in lexicographic order) storage key in the overlayed alongside its value.
-	/// If no value is next then `None` is returned.
-	pub fn next_storage_key_change(&self, key: &[u8]) -> Option<(&[u8], &OverlayedValue)> {
-		self.top.next_change(key)
+	/// Returns an iterator over the keys (in lexicographic order) following `key` (excluding `key`)
+	/// alongside its value.
+	pub fn iter_after(&self, key: &[u8]) -> impl Iterator<Item = (&[u8], &OverlayedValue)> {
+		self.top.changes_after(key)
 	}
 
-	/// Returns the next (in lexicographic order) child storage key in the overlayed alongside its
-	/// value.  If no value is next then `None` is returned.
-	pub fn next_child_storage_key_change(
+	/// Returns an iterator over the keys (in lexicographic order) following `key` (excluding `key`)
+	/// alongside its value for the given `storage_key` child.
+	pub fn child_iter_after(
 		&self,
 		storage_key: &[u8],
 		key: &[u8]
-	) -> Option<(&[u8], &OverlayedValue)> {
+	) -> impl Iterator<Item = (&[u8], &OverlayedValue)> {
 		self.children
 			.get(storage_key)
-			.and_then(|(overlay, _)|
-				overlay.next_change(key)
-			)
+			.map(|(overlay, _)| overlay.changes_after(key))
+			.into_iter()
+			.flatten()
 	}
 
 	/// Read only access ot offchain overlay.
@@ -988,28 +988,28 @@ mod tests {
 		overlay.set_storage(vec![30], None);
 
 		// next_prospective < next_committed
-		let next_to_5 = overlay.next_storage_key_change(&[5]).unwrap();
+		let next_to_5 = overlay.iter_after(&[5]).next().unwrap();
 		assert_eq!(next_to_5.0.to_vec(), vec![10]);
 		assert_eq!(next_to_5.1.value(), Some(&vec![10]));
 
 		// next_committed < next_prospective
-		let next_to_10 = overlay.next_storage_key_change(&[10]).unwrap();
+		let next_to_10 = overlay.iter_after(&[10]).next().unwrap();
 		assert_eq!(next_to_10.0.to_vec(), vec![20]);
 		assert_eq!(next_to_10.1.value(), Some(&vec![20]));
 
 		// next_committed == next_prospective
-		let next_to_20 = overlay.next_storage_key_change(&[20]).unwrap();
+		let next_to_20 = overlay.iter_after(&[20]).next().unwrap();
 		assert_eq!(next_to_20.0.to_vec(), vec![30]);
 		assert_eq!(next_to_20.1.value(), None);
 
 		// next_committed, no next_prospective
-		let next_to_30 = overlay.next_storage_key_change(&[30]).unwrap();
+		let next_to_30 = overlay.iter_after(&[30]).next().unwrap();
 		assert_eq!(next_to_30.0.to_vec(), vec![40]);
 		assert_eq!(next_to_30.1.value(), Some(&vec![40]));
 
 		overlay.set_storage(vec![50], Some(vec![50]));
 		// next_prospective, no next_committed
-		let next_to_40 = overlay.next_storage_key_change(&[40]).unwrap();
+		let next_to_40 = overlay.iter_after(&[40]).next().unwrap();
 		assert_eq!(next_to_40.0.to_vec(), vec![50]);
 		assert_eq!(next_to_40.1.value(), Some(&vec![50]));
 	}
@@ -1029,28 +1029,28 @@ mod tests {
 		overlay.set_child_storage(child_info, vec![30], None);
 
 		// next_prospective < next_committed
-		let next_to_5 = overlay.next_child_storage_key_change(child, &[5]).unwrap();
+		let next_to_5 = overlay.child_iter_after(child, &[5]).next().unwrap();
 		assert_eq!(next_to_5.0.to_vec(), vec![10]);
 		assert_eq!(next_to_5.1.value(), Some(&vec![10]));
 
 		// next_committed < next_prospective
-		let next_to_10 = overlay.next_child_storage_key_change(child, &[10]).unwrap();
+		let next_to_10 = overlay.child_iter_after(child, &[10]).next().unwrap();
 		assert_eq!(next_to_10.0.to_vec(), vec![20]);
 		assert_eq!(next_to_10.1.value(), Some(&vec![20]));
 
 		// next_committed == next_prospective
-		let next_to_20 = overlay.next_child_storage_key_change(child, &[20]).unwrap();
+		let next_to_20 = overlay.child_iter_after(child, &[20]).next().unwrap();
 		assert_eq!(next_to_20.0.to_vec(), vec![30]);
 		assert_eq!(next_to_20.1.value(), None);
 
 		// next_committed, no next_prospective
-		let next_to_30 = overlay.next_child_storage_key_change(child, &[30]).unwrap();
+		let next_to_30 = overlay.child_iter_after(child, &[30]).next().unwrap();
 		assert_eq!(next_to_30.0.to_vec(), vec![40]);
 		assert_eq!(next_to_30.1.value(), Some(&vec![40]));
 
 		overlay.set_child_storage(child_info, vec![50], Some(vec![50]));
 		// next_prospective, no next_committed
-		let next_to_40 = overlay.next_child_storage_key_change(child, &[40]).unwrap();
+		let next_to_40 = overlay.child_iter_after(child, &[40]).next().unwrap();
 		assert_eq!(next_to_40.0.to_vec(), vec![50]);
 		assert_eq!(next_to_40.1.value(), Some(&vec![50]));
 	}

From 25388397aab20a24e2be55103dda95011aa04d7c Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Mon, 31 May 2021 20:17:56 +0200
Subject: [PATCH 0808/1194] Add deserialize for TransactionValidityError in
 std. (#8961)

* Add deserialize for TransactionValidityError in std.

* Fix derives
---
 primitives/runtime/src/transaction_validity.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/primitives/runtime/src/transaction_validity.rs b/primitives/runtime/src/transaction_validity.rs
index 0ee4b4861204..1768c27d6f5a 100644
--- a/primitives/runtime/src/transaction_validity.rs
+++ b/primitives/runtime/src/transaction_validity.rs
@@ -33,7 +33,7 @@ pub type TransactionTag = Vec<u8>;
 
 /// An invalid transaction validity.
 #[derive(Clone, PartialEq, Eq, Encode, Decode, Copy, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(serde::Serialize))]
+#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
 pub enum InvalidTransaction {
 	/// The call of the transaction is not expected.
 	Call,
@@ -113,7 +113,7 @@ impl From<InvalidTransaction> for &'static str {
 
 /// An unknown transaction validity.
 #[derive(Clone, PartialEq, Eq, Encode, Decode, Copy, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(serde::Serialize))]
+#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
 pub enum UnknownTransaction {
 	/// Could not lookup some information that is required to validate the transaction.
 	CannotLookup,
@@ -137,7 +137,7 @@ impl From<UnknownTransaction> for &'static str {
 
 /// Errors that can occur while checking the validity of a transaction.
 #[derive(Clone, PartialEq, Eq, Encode, Decode, Copy, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(serde::Serialize))]
+#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
 pub enum TransactionValidityError {
 	/// The transaction is invalid.
 	Invalid(InvalidTransaction),

From 7ba4e4ced0c0ed4ce8ccba6b36f6d53d7de3db89 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 31 May 2021 18:40:36 +0000
Subject: [PATCH 0809/1194] Bump getrandom from 0.2.2 to 0.2.3 (#8952)

Bumps [getrandom](https://github.com/rust-random/getrandom) from 0.2.2 to 0.2.3.
- [Release notes](https://github.com/rust-random/getrandom/releases)
- [Changelog](https://github.com/rust-random/getrandom/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-random/getrandom/compare/v0.2.2...v0.2.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e954a76d0ba2..5f1c123357ee 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2222,9 +2222,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
+checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
@@ -6477,7 +6477,7 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
 dependencies = [
- "getrandom 0.2.2",
+ "getrandom 0.2.3",
 ]
 
 [[package]]
@@ -6597,7 +6597,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
 dependencies = [
- "getrandom 0.2.2",
+ "getrandom 0.2.3",
  "redox_syscall 0.2.5",
 ]
 
@@ -7121,7 +7121,7 @@ dependencies = [
  "derive_more",
  "futures 0.3.13",
  "futures-timer 3.0.2",
- "getrandom 0.2.2",
+ "getrandom 0.2.3",
  "log",
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -9469,7 +9469,7 @@ dependencies = [
  "futures 0.1.31",
  "futures 0.3.13",
  "futures-timer 3.0.2",
- "getrandom 0.2.2",
+ "getrandom 0.2.3",
  "js-sys",
  "kvdb-web",
  "libp2p-wasm-ext",

From da051b11ce46a00c1b5d53401ee69ad7ddae355f Mon Sep 17 00:00:00 2001
From: Keith Yeung <kungfukeith11@gmail.com>
Date: Tue, 1 Jun 2021 02:23:41 -0700
Subject: [PATCH 0810/1194] Allow usage of path in construct_runtime! (#8801)

* Allow usage of path in construct_runtime!

* Fix whitespace

* Fix whitespace

* Make expand_runtime_metadata accept slice instead of Iterator

* Include Call and Event in construct_runtime for testing

* Migrate impl_outer_event to proc macro

* Fix integrity_test_works

* Update UI test expectations

* Factor in module path while generating enum variant or fn names

* Use ParseStream::lookahead for more helpful error messages

* Remove generating outer_event_metadata

* Ensure pallets with different paths but same last path segment can coexist

* Remove unnecessary generated function

* Migrate decl_outer_config to proc macro

* Add default_filter test for expand_outer_origin

* Allow crate, self and super keywords to appear in pallet path

* Add UI test for specifying empty pallet paths in construct_runtime
---
 .../src/construct_runtime/expand/config.rs    | 123 +++++++
 .../src/construct_runtime/expand/event.rs     | 146 ++++++++
 .../src/construct_runtime/expand/metadata.rs  | 190 ++++++++++
 .../src/construct_runtime/expand/mod.rs       |  26 ++
 .../src/construct_runtime/expand/origin.rs    | 341 ++++++++++++++++++
 .../procedural/src/construct_runtime/mod.rs   | 193 +---------
 .../procedural/src/construct_runtime/parse.rs | 101 +++++-
 frame/support/test/tests/construct_runtime.rs | 240 +++++++++++-
 .../construct_runtime_ui/empty_pallet_path.rs |  13 +
 .../empty_pallet_path.stderr                  |   5 +
 .../invalid_module_details.stderr             |   2 +-
 11 files changed, 1179 insertions(+), 201 deletions(-)
 create mode 100644 frame/support/procedural/src/construct_runtime/expand/config.rs
 create mode 100644 frame/support/procedural/src/construct_runtime/expand/event.rs
 create mode 100644 frame/support/procedural/src/construct_runtime/expand/metadata.rs
 create mode 100644 frame/support/procedural/src/construct_runtime/expand/mod.rs
 create mode 100644 frame/support/procedural/src/construct_runtime/expand/origin.rs
 create mode 100644 frame/support/test/tests/construct_runtime_ui/empty_pallet_path.rs
 create mode 100644 frame/support/test/tests/construct_runtime_ui/empty_pallet_path.stderr

diff --git a/frame/support/procedural/src/construct_runtime/expand/config.rs b/frame/support/procedural/src/construct_runtime/expand/config.rs
new file mode 100644
index 000000000000..93d4a868b784
--- /dev/null
+++ b/frame/support/procedural/src/construct_runtime/expand/config.rs
@@ -0,0 +1,123 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License
+
+use crate::construct_runtime::Pallet;
+use proc_macro2::TokenStream;
+use quote::{format_ident, quote};
+use syn::Ident;
+
+pub fn expand_outer_config(
+	runtime: &Ident,
+	pallet_decls: &[Pallet],
+	scrate: &TokenStream,
+) -> TokenStream {
+	let mut types = TokenStream::new();
+	let mut fields = TokenStream::new();
+	let mut build_storage_calls = TokenStream::new();
+
+	for decl in pallet_decls {
+		if let Some(pallet_entry) = decl.find_part("Config") {
+			let config = format_ident!("{}Config", decl.name);
+			let mod_name = decl.pallet.mod_name();
+			let field_name = if let Some(inst) = decl.instance.as_ref() {
+				format_ident!("{}_{}", mod_name, inst)
+			} else {
+				mod_name
+			};
+			let part_is_generic = !pallet_entry.generics.params.is_empty();
+
+			types.extend(expand_config_types(runtime, decl, &config, part_is_generic));
+			fields.extend(quote!(pub #field_name: #config,));
+			build_storage_calls.extend(expand_config_build_storage_call(scrate, runtime, decl, &field_name));
+		}
+	}
+
+	quote!{
+		#types
+
+		#[cfg(any(feature = "std", test))]
+		use #scrate::serde as __genesis_config_serde_import__;
+		#[cfg(any(feature = "std", test))]
+		#[derive(#scrate::serde::Serialize, #scrate::serde::Deserialize, Default)]
+		#[serde(rename_all = "camelCase")]
+		#[serde(deny_unknown_fields)]
+		#[serde(crate = "__genesis_config_serde_import__")]
+		#[allow(non_snake_case)]
+		pub struct GenesisConfig {
+			#fields
+		}
+
+		#[cfg(any(feature = "std", test))]
+		impl #scrate::sp_runtime::BuildStorage for GenesisConfig {
+			fn assimilate_storage(
+				&self,
+				storage: &mut #scrate::sp_runtime::Storage,
+			) -> std::result::Result<(), String> {
+				#build_storage_calls
+
+				#scrate::BasicExternalities::execute_with_storage(storage, || {
+					<AllPalletsWithSystem as #scrate::traits::OnGenesis>::on_genesis();
+				});
+
+				Ok(())
+			}
+		}
+	}
+}
+
+fn expand_config_types(
+	runtime: &Ident,
+	decl: &Pallet,
+	config: &Ident,
+	part_is_generic: bool,
+) -> TokenStream {
+	let path = &decl.pallet;
+
+	match (decl.instance.as_ref(), part_is_generic) {
+		(Some(inst), true) => quote!{
+			#[cfg(any(feature = "std", test))]
+			pub type #config = #path::GenesisConfig<#runtime, #path::#inst>;
+		},
+		(None, true) => quote!{
+			#[cfg(any(feature = "std", test))]
+			pub type #config = #path::GenesisConfig<#runtime>;
+		},
+		(_, false) => quote!{
+			#[cfg(any(feature = "std", test))]
+			pub type #config = #path::GenesisConfig;
+		},
+	}
+}
+
+fn expand_config_build_storage_call(
+	scrate: &TokenStream,
+	runtime: &Ident,
+	decl: &Pallet,
+	field_name: &Ident,
+) -> TokenStream {
+	let path = &decl.pallet;
+	let instance = if let Some(inst) = decl.instance.as_ref() {
+		quote!(#path::#inst)
+	} else {
+		quote!(#path::__InherentHiddenInstance)
+	};
+
+	quote!{
+		#scrate::sp_runtime::BuildModuleGenesisStorage::
+			<#runtime, #instance>::build_module_genesis_storage(&self.#field_name, storage)?;
+	}
+}
diff --git a/frame/support/procedural/src/construct_runtime/expand/event.rs b/frame/support/procedural/src/construct_runtime/expand/event.rs
new file mode 100644
index 000000000000..c2c905e50ff8
--- /dev/null
+++ b/frame/support/procedural/src/construct_runtime/expand/event.rs
@@ -0,0 +1,146 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License
+
+use crate::construct_runtime::{Pallet, parse::PalletPath};
+use proc_macro2::TokenStream;
+use quote::{format_ident, quote};
+use syn::{Generics, Ident};
+
+pub fn expand_outer_event(
+	runtime: &Ident,
+	pallet_decls: &[Pallet],
+	scrate: &TokenStream,
+) -> syn::Result<TokenStream> {
+	let mut event_variants = TokenStream::new();
+	let mut event_conversions = TokenStream::new();
+	let mut events_metadata = TokenStream::new();
+
+	for pallet_decl in pallet_decls {
+		if let Some(pallet_entry) = pallet_decl.find_part("Event") {
+			let path = &pallet_decl.pallet;
+			let index = pallet_decl.index;
+			let instance = pallet_decl.instance.as_ref();
+			let generics = &pallet_entry.generics;
+
+			if instance.is_some() && generics.params.is_empty() {
+				let msg = format!(
+					"Instantiable pallet with no generic `Event` cannot \
+					 be constructed: pallet `{}` must have generic `Event`",
+					pallet_decl.name,
+				);
+				return Err(syn::Error::new(pallet_decl.name.span(), msg));
+			}
+
+			let part_is_generic = !generics.params.is_empty();
+			let pallet_event = match (instance, part_is_generic) {
+				(Some(inst), true) => quote!(#path::Event::<#runtime, #path::#inst>),
+				(Some(inst), false) => quote!(#path::Event::<#path::#inst>),
+				(None, true) => quote!(#path::Event::<#runtime>),
+				(None, false) => quote!(#path::Event),
+			};
+
+			event_variants.extend(expand_event_variant(runtime, path, index, instance, generics));
+			event_conversions.extend(expand_event_conversion(scrate, path, instance, &pallet_event));
+			events_metadata.extend(expand_event_metadata(scrate, path, &pallet_event));
+		}
+	}
+
+	Ok(quote!{
+		#[derive(
+			Clone, PartialEq, Eq,
+			#scrate::codec::Encode,
+			#scrate::codec::Decode,
+			#scrate::RuntimeDebug,
+		)]
+		#[allow(non_camel_case_types)]
+		pub enum Event {
+			#event_variants
+		}
+
+		#event_conversions
+	})
+}
+
+fn expand_event_variant(
+	runtime: &Ident,
+	path: &PalletPath,
+	index: u8,
+	instance: Option<&Ident>,
+	generics: &Generics,
+) -> TokenStream {
+	let part_is_generic = !generics.params.is_empty();
+	let mod_name = &path.mod_name();
+
+	match (instance, part_is_generic) {
+		(Some(inst), true) => {
+			let variant = format_ident!("{}_{}", mod_name, inst);
+			quote!(#[codec(index = #index)] #variant(#path::Event<#runtime, #path::#inst>),)
+		}
+		(Some(inst), false) => {
+			let variant = format_ident!("{}_{}", mod_name, inst);
+			quote!(#[codec(index = #index)] #variant(#path::Event<#path::#inst>),)
+		}
+		(None, true) => {
+			quote!(#[codec(index = #index)] #mod_name(#path::Event<#runtime>),)
+		}
+		(None, false) => {
+			quote!(#[codec(index = #index)] #mod_name(#path::Event),)
+		}
+	}
+}
+
+fn expand_event_conversion(
+	scrate: &TokenStream,
+	path: &PalletPath,
+	instance: Option<&Ident>,
+	pallet_event: &TokenStream,
+) -> TokenStream {
+	let mod_name = path.mod_name();
+	let variant = if let Some(inst) = instance {
+		format_ident!("{}_{}", mod_name, inst)
+	} else {
+		mod_name
+	};
+
+	quote!{
+		impl From<#pallet_event> for Event {
+			fn from(x: #pallet_event) -> Self {
+				Event::#variant(x)
+			}
+		}
+		impl #scrate::sp_std::convert::TryInto<#pallet_event> for Event {
+			type Error = ();
+
+			fn try_into(self) -> #scrate::sp_std::result::Result<#pallet_event, Self::Error> {
+				match self {
+					Self::#variant(evt) => Ok(evt),
+					_ => Err(()),
+				}
+			}
+		}
+	}
+}
+
+fn expand_event_metadata(
+	scrate: &TokenStream,
+	path: &PalletPath,
+	pallet_event: &TokenStream,
+) -> TokenStream {
+	let mod_name = path.mod_name();
+
+	quote!{(stringify!(#mod_name), #scrate::event::FnEncode(#pallet_event::metadata)),}
+}
diff --git a/frame/support/procedural/src/construct_runtime/expand/metadata.rs b/frame/support/procedural/src/construct_runtime/expand/metadata.rs
new file mode 100644
index 000000000000..cbabec73d3a6
--- /dev/null
+++ b/frame/support/procedural/src/construct_runtime/expand/metadata.rs
@@ -0,0 +1,190 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License
+
+use proc_macro2::TokenStream;
+use crate::construct_runtime::Pallet;
+use syn::{Ident, TypePath};
+use quote::quote;
+
+pub fn expand_runtime_metadata(
+	runtime: &Ident,
+	pallet_declarations: &[Pallet],
+	scrate: &TokenStream,
+	extrinsic: &TypePath,
+) -> TokenStream {
+	let modules = pallet_declarations
+		.iter()
+		.filter_map(|pallet_declaration| {
+			pallet_declaration.find_part("Pallet").map(|_| {
+				let filtered_names: Vec<_> = pallet_declaration
+					.pallet_parts()
+					.iter()
+					.filter(|part| part.name() != "Pallet")
+					.map(|part| part.name())
+					.collect();
+				(pallet_declaration, filtered_names)
+			})
+		})
+		.map(|(decl, filtered_names)| {
+			let name = &decl.name;
+			let index = &decl.index;
+			let storage = expand_pallet_metadata_storage(&filtered_names, runtime, scrate, decl);
+			let calls = expand_pallet_metadata_calls(&filtered_names, runtime, scrate, decl);
+			let event = expand_pallet_metadata_events(&filtered_names, runtime, scrate, decl);
+			let constants = expand_pallet_metadata_constants(runtime, scrate, decl);
+			let errors = expand_pallet_metadata_errors(runtime, scrate, decl);
+
+			quote!{
+				#scrate::metadata::ModuleMetadata {
+					name: #scrate::metadata::DecodeDifferent::Encode(stringify!(#name)),
+					index: #index,
+					storage: #storage,
+					calls: #calls,
+					event: #event,
+					constants: #constants,
+					errors: #errors,
+				}
+			}
+		})
+		.collect::<Vec<_>>();
+
+	quote!{
+		impl #runtime {
+			pub fn metadata() -> #scrate::metadata::RuntimeMetadataPrefixed {
+				#scrate::metadata::RuntimeMetadataLastVersion {
+					modules: #scrate::metadata::DecodeDifferent::Encode(&[ #(#modules),* ]),
+					extrinsic: #scrate::metadata::ExtrinsicMetadata {
+						version: <#extrinsic as #scrate::sp_runtime::traits::ExtrinsicMetadata>::VERSION,
+						signed_extensions: <
+								<
+									#extrinsic as #scrate::sp_runtime::traits::ExtrinsicMetadata
+								>::SignedExtensions as #scrate::sp_runtime::traits::SignedExtension
+							>::identifier()
+								.into_iter()
+								.map(#scrate::metadata::DecodeDifferent::Encode)
+								.collect(),
+					},
+				}.into()
+			}
+		}
+	}
+}
+
+fn expand_pallet_metadata_storage(
+	filtered_names: &[&'static str],
+	runtime: &Ident,
+	scrate: &TokenStream,
+	decl: &Pallet,
+) -> TokenStream {
+	if filtered_names.contains(&"Storage") {
+		let instance = decl.instance.as_ref().into_iter();
+		let path = &decl.pallet;
+
+		quote!{
+			Some(#scrate::metadata::DecodeDifferent::Encode(
+				#scrate::metadata::FnEncode(
+					#path::Pallet::<#runtime #(, #path::#instance)*>::storage_metadata
+				)
+			))
+		}
+	} else {
+		quote!(None)
+	}
+}
+
+fn expand_pallet_metadata_calls(
+	filtered_names: &[&'static str],
+	runtime: &Ident,
+	scrate: &TokenStream,
+	decl: &Pallet,
+) -> TokenStream {
+	if filtered_names.contains(&"Call") {
+		let instance = decl.instance.as_ref().into_iter();
+		let path = &decl.pallet;
+
+		quote!{
+			Some(#scrate::metadata::DecodeDifferent::Encode(
+				#scrate::metadata::FnEncode(
+					#path::Pallet::<#runtime #(, #path::#instance)*>::call_functions
+				)
+			))
+		}
+	} else {
+		quote!(None)
+	}
+}
+
+fn expand_pallet_metadata_events(
+	filtered_names: &[&'static str],
+	runtime: &Ident,
+	scrate: &TokenStream,
+	decl: &Pallet,
+) -> TokenStream {
+	if filtered_names.contains(&"Event") {
+		let path = &decl.pallet;
+		let part_is_generic =
+			!decl.find_part("Event").expect("Event part exists; qed").generics.params.is_empty();
+		let pallet_event = match (decl.instance.as_ref(), part_is_generic) {
+			(Some(inst), true) => quote!(#path::Event::<#runtime, #path::#inst>),
+			(Some(inst), false) => quote!(#path::Event::<#path::#inst>),
+			(None, true) => quote!(#path::Event::<#runtime>),
+			(None, false) => quote!(#path::Event),
+		};
+
+		quote!{
+			Some(#scrate::metadata::DecodeDifferent::Encode(
+				#scrate::metadata::FnEncode(#pallet_event::metadata)
+			))
+		}
+	} else {
+		quote!(None)
+	}
+}
+
+fn expand_pallet_metadata_constants(
+	runtime: &Ident,
+	scrate: &TokenStream,
+	decl: &Pallet,
+) -> TokenStream {
+	let path = &decl.pallet;
+	let instance = decl.instance.as_ref().into_iter();
+
+	quote!{
+		#scrate::metadata::DecodeDifferent::Encode(
+			#scrate::metadata::FnEncode(
+				#path::Pallet::<#runtime #(, #path::#instance)*>::module_constants_metadata
+			)
+		)
+	}
+}
+
+fn expand_pallet_metadata_errors(
+	runtime: &Ident,
+	scrate: &TokenStream,
+	decl: &Pallet,
+) -> TokenStream {
+	let path = &decl.pallet;
+	let instance = decl.instance.as_ref().into_iter();
+
+	quote!{
+		#scrate::metadata::DecodeDifferent::Encode(
+			#scrate::metadata::FnEncode(
+				<#path::Pallet::<#runtime #(, #path::#instance)*> as #scrate::metadata::ModuleErrorMetadata>::metadata
+			)
+		)
+	}
+}
diff --git a/frame/support/procedural/src/construct_runtime/expand/mod.rs b/frame/support/procedural/src/construct_runtime/expand/mod.rs
new file mode 100644
index 000000000000..ab2242ba0546
--- /dev/null
+++ b/frame/support/procedural/src/construct_runtime/expand/mod.rs
@@ -0,0 +1,26 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License
+
+mod config;
+mod event;
+mod metadata;
+mod origin;
+
+pub use config::expand_outer_config;
+pub use event::expand_outer_event;
+pub use metadata::expand_runtime_metadata;
+pub use origin::expand_outer_origin;
diff --git a/frame/support/procedural/src/construct_runtime/expand/origin.rs b/frame/support/procedural/src/construct_runtime/expand/origin.rs
new file mode 100644
index 000000000000..8ebce237480c
--- /dev/null
+++ b/frame/support/procedural/src/construct_runtime/expand/origin.rs
@@ -0,0 +1,341 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License
+
+use crate::construct_runtime::{parse::PalletPath, Pallet, SYSTEM_PALLET_NAME};
+use proc_macro2::TokenStream;
+use quote::{format_ident, quote};
+use syn::{token, Ident, Generics};
+
+pub fn expand_outer_origin(
+	runtime: &Ident,
+	pallets: &[Pallet],
+	pallets_token: token::Brace,
+	scrate: &TokenStream,
+) -> syn::Result<TokenStream> {
+	let system_pallet = pallets.iter()
+		.find(|decl| decl.name == SYSTEM_PALLET_NAME)
+		.ok_or_else(|| syn::Error::new(
+			pallets_token.span,
+			"`System` pallet declaration is missing. \
+			 Please add this line: `System: frame_system::{Pallet, Call, Storage, Config, Event<T>},`",
+		))?;
+
+	let mut caller_variants = TokenStream::new();
+	let mut pallet_conversions = TokenStream::new();
+
+	for pallet_decl in pallets.iter().filter(|pallet| pallet.name != SYSTEM_PALLET_NAME) {
+		if let Some(pallet_entry) = pallet_decl.find_part("Origin") {
+			let path = &pallet_decl.pallet;
+			let instance = pallet_decl.instance.as_ref();
+			let index = pallet_decl.index;
+			let generics = &pallet_entry.generics;
+
+			if instance.is_some() && generics.params.is_empty() {
+				let msg = format!(
+					"Instantiable pallet with no generic `Origin` cannot \
+					 be constructed: pallet `{}` must have generic `Origin`",
+					pallet_decl.name
+				);
+				return Err(syn::Error::new(pallet_decl.name.span(), msg));
+			}
+
+			caller_variants.extend(
+				expand_origin_caller_variant(runtime, path, index, instance, generics),
+			);
+			pallet_conversions.extend(
+				expand_origin_pallet_conversions(scrate, runtime, path, instance, generics),
+			);
+		}
+	}
+
+	let system_path = &system_pallet.pallet;
+	let system_index = system_pallet.index;
+
+	Ok(quote!{
+		// WARNING: All instance must hold the filter `frame_system::Config::BaseCallFilter`, except
+		// when caller is system Root. One can use `OriginTrait::reset_filter` to do so.
+		#[derive(Clone)]
+		pub struct Origin {
+			caller: OriginCaller,
+			filter: #scrate::sp_std::rc::Rc<Box<dyn Fn(&<#runtime as #system_path::Config>::Call) -> bool>>,
+		}
+
+		#[cfg(not(feature = "std"))]
+		impl #scrate::sp_std::fmt::Debug for Origin {
+			fn fmt(
+				&self,
+				fmt: &mut #scrate::sp_std::fmt::Formatter,
+			) -> #scrate::sp_std::result::Result<(), #scrate::sp_std::fmt::Error> {
+				fmt.write_str("<wasm:stripped>")
+			}
+		}
+
+		#[cfg(feature = "std")]
+		impl #scrate::sp_std::fmt::Debug for Origin {
+			fn fmt(
+				&self,
+				fmt: &mut #scrate::sp_std::fmt::Formatter,
+			) -> #scrate::sp_std::result::Result<(), #scrate::sp_std::fmt::Error> {
+				fmt.debug_struct("Origin")
+					.field("caller", &self.caller)
+					.field("filter", &"[function ptr]")
+					.finish()
+			}
+		}
+
+		impl #scrate::traits::OriginTrait for Origin {
+			type Call = <#runtime as #system_path::Config>::Call;
+			type PalletsOrigin = OriginCaller;
+			type AccountId = <#runtime as #system_path::Config>::AccountId;
+
+			fn add_filter(&mut self, filter: impl Fn(&Self::Call) -> bool + 'static) {
+				let f = self.filter.clone();
+
+				self.filter = #scrate::sp_std::rc::Rc::new(Box::new(move |call| {
+					f(call) && filter(call)
+				}));
+			}
+
+			fn reset_filter(&mut self) {
+				let filter = <
+					<#runtime as #system_path::Config>::BaseCallFilter
+					as #scrate::traits::Filter<<#runtime as #system_path::Config>::Call>
+				>::filter;
+
+				self.filter = #scrate::sp_std::rc::Rc::new(Box::new(filter));
+			}
+
+			fn set_caller_from(&mut self, other: impl Into<Self>) {
+				self.caller = other.into().caller;
+			}
+
+			fn filter_call(&self, call: &Self::Call) -> bool {
+				(self.filter)(call)
+			}
+
+			fn caller(&self) -> &Self::PalletsOrigin {
+				&self.caller
+			}
+
+			fn try_with_caller<R>(
+				mut self,
+				f: impl FnOnce(Self::PalletsOrigin) -> Result<R, Self::PalletsOrigin>,
+			) -> Result<R, Self> {
+				match f(self.caller) {
+					Ok(r) => Ok(r),
+					Err(caller) => { self.caller = caller; Err(self) }
+				}
+			}
+
+			/// Create with system none origin and `frame-system::Config::BaseCallFilter`.
+			fn none() -> Self {
+				#system_path::RawOrigin::None.into()
+			}
+			/// Create with system root origin and no filter.
+			fn root() -> Self {
+				#system_path::RawOrigin::Root.into()
+			}
+			/// Create with system signed origin and `frame-system::Config::BaseCallFilter`.
+			fn signed(by: <#runtime as #system_path::Config>::AccountId) -> Self {
+				#system_path::RawOrigin::Signed(by).into()
+			}
+		}
+
+		#[derive(Clone, PartialEq, Eq, #scrate::RuntimeDebug, #scrate::codec::Encode, #scrate::codec::Decode)]
+		#[allow(non_camel_case_types)]
+		pub enum OriginCaller {
+			#[codec(index = #system_index)]
+			system(#system_path::Origin<#runtime>),
+			#caller_variants
+			#[allow(dead_code)]
+			Void(#scrate::Void)
+		}
+
+		// For backwards compatibility and ease of accessing these functions.
+		#[allow(dead_code)]
+		impl Origin {
+			/// Create with system none origin and `frame-system::Config::BaseCallFilter`.
+			pub fn none() -> Self {
+				<Origin as #scrate::traits::OriginTrait>::none()
+			}
+			/// Create with system root origin and no filter.
+			pub fn root() -> Self {
+				<Origin as #scrate::traits::OriginTrait>::root()
+			}
+			/// Create with system signed origin and `frame-system::Config::BaseCallFilter`.
+			pub fn signed(by: <#runtime as #system_path::Config>::AccountId) -> Self {
+				<Origin as #scrate::traits::OriginTrait>::signed(by)
+			}
+		}
+
+		impl From<#system_path::Origin<#runtime>> for OriginCaller {
+			fn from(x: #system_path::Origin<#runtime>) -> Self {
+				OriginCaller::system(x)
+			}
+		}
+
+		impl #scrate::sp_std::convert::TryFrom<OriginCaller> for #system_path::Origin<#runtime> {
+			type Error = OriginCaller;
+			fn try_from(x: OriginCaller)
+				-> #scrate::sp_std::result::Result<#system_path::Origin<#runtime>, OriginCaller>
+			{
+				if let OriginCaller::system(l) = x {
+					Ok(l)
+				} else {
+					Err(x)
+				}
+			}
+		}
+
+		impl From<#system_path::Origin<#runtime>> for Origin {
+			/// Convert to runtime origin:
+			/// * root origin is built with no filter
+			/// * others use `frame-system::Config::BaseCallFilter`
+			fn from(x: #system_path::Origin<#runtime>) -> Self {
+				let o: OriginCaller = x.into();
+				o.into()
+			}
+		}
+
+		impl From<OriginCaller> for Origin {
+			fn from(x: OriginCaller) -> Self {
+				let mut o = Origin {
+					caller: x,
+					filter: #scrate::sp_std::rc::Rc::new(Box::new(|_| true)),
+				};
+
+				// Root has no filter
+				if !matches!(o.caller, OriginCaller::system(#system_path::Origin::<#runtime>::Root)) {
+					#scrate::traits::OriginTrait::reset_filter(&mut o);
+				}
+
+				o
+			}
+		}
+
+		impl Into<#scrate::sp_std::result::Result<#system_path::Origin<#runtime>, Origin>> for Origin {
+			/// NOTE: converting to pallet origin loses the origin filter information.
+			fn into(self) -> #scrate::sp_std::result::Result<#system_path::Origin<#runtime>, Self> {
+				if let OriginCaller::system(l) = self.caller {
+					Ok(l)
+				} else {
+					Err(self)
+				}
+			}
+		}
+		impl From<Option<<#runtime as #system_path::Config>::AccountId>> for Origin {
+			/// Convert to runtime origin with caller being system signed or none and use filter
+			/// `frame-system::Config::BaseCallFilter`.
+			fn from(x: Option<<#runtime as #system_path::Config>::AccountId>) -> Self {
+				<#system_path::Origin<#runtime>>::from(x).into()
+			}
+		}
+
+		#pallet_conversions
+	})
+}
+
+fn expand_origin_caller_variant(
+	runtime: &Ident,
+	path: &PalletPath,
+	index: u8,
+	instance: Option<&Ident>,
+	generics: &Generics,
+) -> TokenStream {
+	let part_is_generic = !generics.params.is_empty();
+	let mod_name = &path.mod_name();
+
+	match (instance, part_is_generic) {
+		(Some(inst), true) => {
+			let variant = format_ident!("{}_{}", mod_name, inst);
+			quote!(#[codec(index = #index)] #variant(#path::Origin<#runtime, #path::#inst>),)
+		}
+		(Some(inst), false) => {
+			let variant = format_ident!("{}_{}", mod_name, inst);
+			quote!(#[codec(index = #index)] #variant(#path::Origin<#path::#inst>),)
+		}
+		(None, true) => {
+			quote!(#[codec(index = #index)] #mod_name(#path::Origin<#runtime>),)
+		}
+		(None, false) => {
+			quote!(#[codec(index = #index)] #mod_name(#path::Origin),)
+		}
+	}
+}
+
+fn expand_origin_pallet_conversions(
+	scrate: &TokenStream,
+	runtime: &Ident,
+	path: &PalletPath,
+	instance: Option<&Ident>,
+	generics: &Generics,
+) -> TokenStream {
+	let mod_name = path.mod_name();
+	let variant = if let Some(inst) = instance {
+		format_ident!("{}_{}", mod_name, inst)
+	} else {
+		mod_name
+	};
+
+	let part_is_generic = !generics.params.is_empty();
+	let pallet_origin = match (instance, part_is_generic) {
+		(Some(inst), true) => quote!(#path::Origin<#runtime, #path::#inst>),
+		(Some(inst), false) => quote!(#path::Origin<#path::#inst>),
+		(None, true) => quote!(#path::Origin<#runtime>),
+		(None, false) => quote!(#path::Origin),
+	};
+
+	quote!{
+		impl From<#pallet_origin> for OriginCaller {
+			fn from(x: #pallet_origin) -> Self {
+				OriginCaller::#variant(x)
+			}
+		}
+
+		impl From<#pallet_origin> for Origin {
+			/// Convert to runtime origin using `frame-system::Config::BaseCallFilter`.
+			fn from(x: #pallet_origin) -> Self {
+				let x: OriginCaller = x.into();
+				x.into()
+			}
+		}
+
+		impl Into<#scrate::sp_std::result::Result<#pallet_origin, Origin>> for Origin {
+			/// NOTE: converting to pallet origin loses the origin filter information.
+			fn into(self) -> #scrate::sp_std::result::Result<#pallet_origin, Self> {
+				if let OriginCaller::#variant(l) = self.caller {
+					Ok(l)
+				} else {
+					Err(self)
+				}
+			}
+		}
+
+		impl #scrate::sp_std::convert::TryFrom<OriginCaller> for #pallet_origin {
+			type Error = OriginCaller;
+			fn try_from(
+				x: OriginCaller,
+			) -> #scrate::sp_std::result::Result<#pallet_origin, OriginCaller> {
+				if let OriginCaller::#variant(l) = x {
+					Ok(l)
+				} else {
+					Err(x)
+				}
+			}
+		}
+	}
+}
diff --git a/frame/support/procedural/src/construct_runtime/mod.rs b/frame/support/procedural/src/construct_runtime/mod.rs
index e14f90197f06..a24168c463aa 100644
--- a/frame/support/procedural/src/construct_runtime/mod.rs
+++ b/frame/support/procedural/src/construct_runtime/mod.rs
@@ -15,15 +15,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+mod expand;
 mod parse;
 
 use frame_support_procedural_tools::syn_ext as ext;
 use frame_support_procedural_tools::{generate_crate_access, generate_hidden_includes};
-use parse::{PalletDeclaration, RuntimeDefinition, WhereSection, PalletPart};
+use parse::{PalletDeclaration, PalletPart, PalletPath, RuntimeDefinition, WhereSection};
 use proc_macro::TokenStream;
-use proc_macro2::{TokenStream as TokenStream2};
+use proc_macro2::TokenStream as TokenStream2;
 use quote::quote;
-use syn::{Ident, Result, TypePath};
+use syn::{Ident, Result};
 use std::collections::HashMap;
 
 /// The fixed name of the system pallet.
@@ -34,7 +35,7 @@ const SYSTEM_PALLET_NAME: &str = "System";
 pub struct Pallet {
 	pub name: Ident,
 	pub index: u8,
-	pub pallet: Ident,
+	pub pallet: PalletPath,
 	pub instance: Option<Ident>,
 	pub pallet_parts: Vec<PalletPart>,
 }
@@ -134,38 +135,19 @@ fn construct_runtime_parsed(definition: RuntimeDefinition) -> Result<TokenStream
 
 	let pallets = complete_pallets(pallets.into_iter())?;
 
-	let system_pallet = pallets.iter()
-		.find(|decl| decl.name == SYSTEM_PALLET_NAME)
-		.ok_or_else(|| syn::Error::new(
-			pallets_token.span,
-			"`System` pallet declaration is missing. \
-			 Please add this line: `System: frame_system::{Pallet, Call, Storage, Config, Event<T>},`",
-		))?;
-
 	let hidden_crate_name = "construct_runtime";
 	let scrate = generate_crate_access(&hidden_crate_name, "frame-support");
 	let scrate_decl = generate_hidden_includes(&hidden_crate_name, "frame-support");
 
-	let all_but_system_pallets = pallets.iter().filter(|pallet| pallet.name != SYSTEM_PALLET_NAME);
-
-	let outer_event = decl_outer_event(
-		&name,
-		pallets.iter(),
-		&scrate,
-	)?;
+	let outer_event = expand::expand_outer_event(&name, &pallets, &scrate)?;
 
-	let outer_origin = decl_outer_origin(
-		&name,
-		all_but_system_pallets,
-		&system_pallet,
-		&scrate,
-	)?;
+	let outer_origin = expand::expand_outer_origin(&name, &pallets, pallets_token, &scrate)?;
 	let all_pallets = decl_all_pallets(&name, pallets.iter());
 	let pallet_to_index = decl_pallet_runtime_setup(&pallets, &scrate);
 
 	let dispatch = decl_outer_dispatch(&name, pallets.iter(), &scrate);
-	let metadata = decl_runtime_metadata(&name, pallets.iter(), &scrate, &unchecked_extrinsic);
-	let outer_config = decl_outer_config(&name, pallets.iter(), &scrate);
+	let metadata = expand::expand_runtime_metadata(&name, &pallets, &scrate, &unchecked_extrinsic);
+	let outer_config = expand::expand_outer_config(&name, &pallets, &scrate);
 	let inherent = decl_outer_inherent(
 		&name,
 		&block,
@@ -262,85 +244,6 @@ fn decl_outer_inherent<'a>(
 	)
 }
 
-fn decl_outer_config<'a>(
-	runtime: &'a Ident,
-	pallet_declarations: impl Iterator<Item = &'a Pallet>,
-	scrate: &'a TokenStream2,
-) -> TokenStream2 {
-	let pallets_tokens = pallet_declarations
-		.filter_map(|pallet_declaration| {
-			pallet_declaration.find_part("Config").map(|part| {
-				let transformed_generics: Vec<_> = part
-					.generics
-					.params
-					.iter()
-					.map(|param| quote!(<#param>))
-					.collect();
-				(pallet_declaration, transformed_generics)
-			})
-		})
-		.map(|(pallet_declaration, generics)| {
-			let pallet = &pallet_declaration.pallet;
-			let name = Ident::new(
-				&format!("{}Config", pallet_declaration.name),
-				pallet_declaration.name.span(),
-			);
-			let instance = pallet_declaration.instance.as_ref().into_iter();
-			quote!(
-				#name =>
-					#pallet #(#instance)* #(#generics)*,
-			)
-		});
-	quote!(
-		#scrate::impl_outer_config! {
-			pub struct GenesisConfig for #runtime where AllPalletsWithSystem = AllPalletsWithSystem {
-				#(#pallets_tokens)*
-			}
-		}
-	)
-}
-
-fn decl_runtime_metadata<'a>(
-	runtime: &'a Ident,
-	pallet_declarations: impl Iterator<Item = &'a Pallet>,
-	scrate: &'a TokenStream2,
-	extrinsic: &TypePath,
-) -> TokenStream2 {
-	let pallets_tokens = pallet_declarations
-		.filter_map(|pallet_declaration| {
-			pallet_declaration.find_part("Pallet").map(|_| {
-				let filtered_names: Vec<_> = pallet_declaration
-					.pallet_parts()
-					.iter()
-					.filter(|part| part.name() != "Pallet")
-					.map(|part| part.ident())
-					.collect();
-				(pallet_declaration, filtered_names)
-			})
-		})
-		.map(|(pallet_declaration, filtered_names)| {
-			let pallet = &pallet_declaration.pallet;
-			let name = &pallet_declaration.name;
-			let instance = pallet_declaration
-				.instance
-				.as_ref()
-				.map(|name| quote!(<#name>))
-				.into_iter();
-
-			let index = pallet_declaration.index;
-
-			quote!(
-				#pallet::Pallet #(#instance)* as #name { index #index } with #(#filtered_names)*,
-			)
-		});
-	quote!(
-		#scrate::impl_runtime_metadata!{
-			for #runtime with pallets where Extrinsic = #extrinsic
-				#(#pallets_tokens)*
-		}
-	)
-}
-
 fn decl_outer_dispatch<'a>(
 	runtime: &'a Ident,
 	pallet_declarations: impl Iterator<Item = &'a Pallet>,
@@ -349,7 +252,7 @@ fn decl_outer_dispatch<'a>(
 	let pallets_tokens = pallet_declarations
 		.filter(|pallet_declaration| pallet_declaration.exists_part("Call"))
 		.map(|pallet_declaration| {
-			let pallet = &pallet_declaration.pallet;
+			let pallet = &pallet_declaration.pallet.inner.segments.last().unwrap();
 			let name = &pallet_declaration.name;
 			let index = pallet_declaration.index;
 			quote!(#[codec(index = #index)] #pallet::#name)
@@ -364,82 +267,6 @@ fn decl_outer_dispatch<'a>(
 	)
 }
 
-fn decl_outer_origin<'a>(
-	runtime_name: &'a Ident,
-	pallets_except_system: impl Iterator<Item = &'a Pallet>,
-	system_pallet: &'a Pallet,
-	scrate: &'a TokenStream2,
-) -> syn::Result<TokenStream2> {
-	let mut pallets_tokens = TokenStream2::new();
-	for pallet_declaration in pallets_except_system {
-		if let Some(pallet_entry) = pallet_declaration.find_part("Origin") {
-			let pallet = &pallet_declaration.pallet;
-			let instance = pallet_declaration.instance.as_ref();
-			let generics = &pallet_entry.generics;
-			if instance.is_some() && generics.params.is_empty() {
-				let msg = format!(
-					"Instantiable pallet with no generic `Origin` cannot \
-					 be constructed: pallet `{}` must have generic `Origin`",
-					pallet_declaration.name
-				);
-				return Err(syn::Error::new(pallet_declaration.name.span(), msg));
-			}
-			let index = pallet_declaration.index;
-			let tokens = quote!(#[codec(index = #index)] #pallet #instance #generics,);
-			pallets_tokens.extend(tokens);
-		}
-	}
-
-	let system_name = &system_pallet.pallet;
-	let system_index = system_pallet.index;
-
-	Ok(quote!(
-		#scrate::impl_outer_origin! {
-			pub enum Origin for #runtime_name where
-				system = #system_name,
-				system_index = #system_index
-			{
-				#pallets_tokens
-			}
-		}
-	))
-}
-
-fn decl_outer_event<'a>(
-	runtime_name: &'a Ident,
-	pallet_declarations: impl Iterator<Item = &'a Pallet>,
-	scrate: &'a TokenStream2,
-) -> syn::Result<TokenStream2> {
-	let mut pallets_tokens = TokenStream2::new();
-	for pallet_declaration in pallet_declarations {
-		if let Some(pallet_entry) = pallet_declaration.find_part("Event") {
-			let pallet = &pallet_declaration.pallet;
-			let instance = pallet_declaration.instance.as_ref();
-			let generics = &pallet_entry.generics;
-			if instance.is_some() && generics.params.is_empty() {
-				let msg = format!(
-					"Instantiable pallet with no generic `Event` cannot \
-					 be constructed: pallet `{}` must have generic `Event`",
-					pallet_declaration.name,
-				);
-				return Err(syn::Error::new(pallet_declaration.name.span(), msg));
-			}
-
-			let index = pallet_declaration.index;
-			let tokens = quote!(#[codec(index = #index)] #pallet #instance #generics,);
-			pallets_tokens.extend(tokens);
-		}
-	}
-
-	Ok(quote!(
-		#scrate::impl_outer_event! {
-			pub enum Event for #runtime_name {
-				#pallets_tokens
-			}
-		}
-	))
-}
-
 fn decl_all_pallets<'a>(
 	runtime: &'a Ident,
 	pallet_declarations: impl Iterator<Item = &'a Pallet>,
diff --git a/frame/support/procedural/src/construct_runtime/parse.rs b/frame/support/procedural/src/construct_runtime/parse.rs
index def207439b53..390729865e98 100644
--- a/frame/support/procedural/src/construct_runtime/parse.rs
+++ b/frame/support/procedural/src/construct_runtime/parse.rs
@@ -16,12 +16,14 @@
 // limitations under the License.
 
 use frame_support_procedural_tools::syn_ext as ext;
-use proc_macro2::Span;
+use proc_macro2::{Span, TokenStream};
 use std::collections::HashSet;
 use syn::{
+	ext::IdentExt,
 	parse::{Parse, ParseStream},
+	punctuated::Punctuated,
 	spanned::Spanned,
-	token, Error, Ident, Result, Token,
+	token, Error, Ident, Path, PathArguments, PathSegment, Result, Token,
 };
 
 mod keyword {
@@ -154,7 +156,7 @@ pub struct PalletDeclaration {
 	pub name: Ident,
 	/// Optional fixed index (e.g. `MyPallet ...  = 3,`)
 	pub index: Option<u8>,
-	pub pallet: Ident,
+	pub pallet: PalletPath,
 	pub instance: Option<Ident>,
 	pub pallet_parts: Vec<PalletPart>,
 }
@@ -164,17 +166,16 @@ impl Parse for PalletDeclaration {
 		let name = input.parse()?;
 		let _: Token![:] = input.parse()?;
 		let pallet = input.parse()?;
-		let instance = if input.peek(Token![::]) && input.peek3(Token![<]) {
-			let _: Token![::] = input.parse()?;
+		let instance = if input.peek(Token![<]) {
 			let _: Token![<] = input.parse()?;
 			let res = Some(input.parse()?);
 			let _: Token![>] = input.parse()?;
+			let _: Token![::] = input.parse()?;
 			res
 		} else {
 			None
 		};
 
-		let _: Token![::] = input.parse()?;
 		let pallet_parts = parse_pallet_parts(input)?;
 
 		let index = if input.peek(Token![=]) {
@@ -198,6 +199,84 @@ impl Parse for PalletDeclaration {
 	}
 }
 
+/// A struct representing a path to a pallet. `PalletPath` is almost identical to the standard
+/// Rust path with a few restrictions:
+/// - No leading colons allowed
+/// - Path segments can only consist of identifers; angle-bracketed or parenthesized segments will
+///   result in a parsing error (except when specifying instances)
+#[derive(Debug, Clone)]
+pub struct PalletPath {
+	pub inner: Path,
+}
+
+impl Parse for PalletPath {
+	fn parse(input: ParseStream) -> Result<Self> {
+		let mut lookahead = input.lookahead1();
+		let mut segments = Punctuated::new();
+
+		if lookahead.peek(Token![crate])
+			|| lookahead.peek(Token![self])
+			|| lookahead.peek(Token![super])
+			|| lookahead.peek(Ident)
+		{
+			let ident = input.call(Ident::parse_any)?;
+			segments.push(PathSegment { ident, arguments: PathArguments::None });
+			let _: Token![::] = input.parse()?;
+			lookahead = input.lookahead1();
+		} else {
+			return Err(lookahead.error());
+		}
+
+		while lookahead.peek(Ident) {
+			let ident = input.parse()?;
+			segments.push(PathSegment { ident, arguments: PathArguments::None });
+			let _: Token![::] = input.parse()?;
+			lookahead = input.lookahead1();
+		}
+
+		if !lookahead.peek(token::Brace) && !lookahead.peek(Token![<]) {
+			return Err(lookahead.error());
+		}
+
+		Ok(Self {
+			inner: Path {
+				leading_colon: None,
+				segments,
+			}
+		})
+	}
+}
+
+impl PalletPath {
+	/// Return the snake-cased module name for this path.
+	pub fn mod_name(&self) -> Ident {
+		let mut iter = self.inner.segments.iter();
+		let mut mod_name = match &iter.next().expect("Path should always have 1 segment; qed").ident {
+			ident if ident == "self" || ident == "super" || ident == "crate" => {
+				// Skip `crate`, `self` and `super` quasi-keywords when creating the module name
+				iter.next()
+					.expect("There must be a path segment pointing to a pallet following \
+						`crate`, `self` or `super`; qed")
+					.ident
+					.clone()
+			}
+			ident => ident.clone(),
+		};
+
+		for segment in iter {
+			mod_name = quote::format_ident!("{}_{}", mod_name, segment.ident);
+		}
+
+		mod_name
+	}
+}
+
+impl quote::ToTokens for PalletPath {
+	fn to_tokens(&self, tokens: &mut TokenStream) {
+		self.inner.to_tokens(tokens);
+	}
+}
+
 /// Parse [`PalletPart`]'s from a braces enclosed list that is split by commas, e.g.
 ///
 /// `{ Call, Event }`
@@ -271,11 +350,6 @@ impl PalletPartKeyword {
 		}
 	}
 
-	/// Returns the name as `Ident`.
-	fn ident(&self) -> Ident {
-		Ident::new(self.name(), self.span())
-	}
-
 	/// Returns `true` if this pallet part is allowed to have generic arguments.
 	fn allows_generic(&self) -> bool {
 		Self::all_generic_arg().iter().any(|n| *n == self.name())
@@ -341,11 +415,6 @@ impl PalletPart {
 	pub fn name(&self) -> &'static str {
 		self.keyword.name()
 	}
-
-	/// The name of this pallet part as `Ident`.
-	pub fn ident(&self) -> Ident {
-		self.keyword.ident()
-	}
 }
 
 fn remove_kind(
diff --git a/frame/support/test/tests/construct_runtime.rs b/frame/support/test/tests/construct_runtime.rs
index 76e28a3b152f..6b0a7091edff 100644
--- a/frame/support/test/tests/construct_runtime.rs
+++ b/frame/support/test/tests/construct_runtime.rs
@@ -112,8 +112,96 @@ mod module2 {
 	}
 }
 
+mod nested {
+	use super::*;
+
+	pub mod module3 {
+		use super::*;
+
+		pub trait Config: system::Config {}
+
+		frame_support::decl_module! {
+			pub struct Module<T: Config> for enum Call
+				where origin: <T as system::Config>::Origin, system=system
+			{
+				#[weight = 0]
+				pub fn fail(_origin) -> frame_support::dispatch::DispatchResult {
+					Err(Error::<T>::Something.into())
+				}
+
+				fn integrity_test() {
+					INTEGRITY_TEST_EXEC.with(|i| *i.borrow_mut() += 1);
+				}
+			}
+		}
+
+		#[derive(Clone, PartialEq, Eq, Debug, codec::Encode, codec::Decode)]
+		pub struct Origin;
+
+		frame_support::decl_event! {
+			pub enum Event {
+				A,
+			}
+		}
+
+		frame_support::decl_error! {
+			pub enum Error for Module<T: Config> {
+				Something
+			}
+		}
+
+		frame_support::decl_storage! {
+			trait Store for Module<T: Config> as Module {}
+			add_extra_genesis {
+				build(|_config| {})
+			}
+		}
+	}
+}
+
+pub mod module3 {
+	use super::*;
+
+	pub trait Config: system::Config {}
+
+	frame_support::decl_module! {
+		pub struct Module<T: Config> for enum Call
+			where origin: <T as system::Config>::Origin, system=system
+		{
+			#[weight = 0]
+			pub fn fail(_origin) -> frame_support::dispatch::DispatchResult {
+				Err(Error::<T>::Something.into())
+			}
+		}
+	}
+
+	#[derive(Clone, PartialEq, Eq, Debug, codec::Encode, codec::Decode)]
+	pub struct Origin<T>(pub core::marker::PhantomData<T>);
+
+	frame_support::decl_event! {
+		pub enum Event {
+			A,
+		}
+	}
+
+	frame_support::decl_error! {
+		pub enum Error for Module<T: Config> {
+			Something
+		}
+	}
+
+	frame_support::decl_storage! {
+		trait Store for Module<T: Config> as Module {}
+		add_extra_genesis {
+			build(|_config| {})
+		}
+	}
+}
+
 impl<I> module1::Config<I> for Runtime {}
 impl module2::Config for Runtime {}
+impl nested::module3::Config for Runtime {}
+impl module3::Config for Runtime {}
 
 pub type Signature = sr25519::Signature;
 pub type AccountId = <Signature as Verify>::Signer;
@@ -142,6 +230,8 @@ frame_support::construct_runtime!(
 		Module1_1: module1::<Instance1>::{Pallet, Call, Storage, Event<T>, Origin<T>},
 		Module2: module2::{Pallet, Call, Storage, Event, Origin},
 		Module1_2: module1::<Instance2>::{Pallet, Call, Storage, Event<T>, Origin<T>},
+		NestedModule3: nested::module3::{Pallet, Call, Config, Storage, Event, Origin},
+		Module3: self::module3::{Pallet, Call, Config, Storage, Event, Origin<T>},
 		Module1_3: module1::<Instance3>::{Pallet, Storage} = 6,
 		Module1_4: module1::<Instance4>::{Pallet, Call} = 3,
 		Module1_5: module1::<Instance5>::{Pallet, Event<T>},
@@ -156,6 +246,82 @@ pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
 pub type Block = generic::Block<Header, UncheckedExtrinsic>;
 pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, Call, Signature, ()>;
 
+mod origin_test {
+	use frame_support::traits::{Filter, OriginTrait};
+	use super::{module3, nested, system, Block, UncheckedExtrinsic};
+
+	impl nested::module3::Config for RuntimeOriginTest {}
+	impl module3::Config for RuntimeOriginTest {}
+
+	pub struct BaseCallFilter;
+	impl Filter<Call> for BaseCallFilter {
+		fn filter(c: &Call) -> bool {
+			match c {
+				Call::NestedModule3(_) => true,
+				_ => false,
+			}
+		}
+	}
+
+	impl system::Config for RuntimeOriginTest {
+		type BaseCallFilter = BaseCallFilter;
+		type Hash = super::H256;
+		type Origin = Origin;
+		type BlockNumber = super::BlockNumber;
+		type AccountId = u32;
+		type Event = Event;
+		type PalletInfo = PalletInfo;
+		type Call = Call;
+		type DbWeight = ();
+	}
+
+	frame_support::construct_runtime!(
+		pub enum RuntimeOriginTest where
+			Block = Block,
+			NodeBlock = Block,
+			UncheckedExtrinsic = UncheckedExtrinsic
+		{
+			System: system::{Pallet, Event<T>, Origin<T>},
+			NestedModule3: nested::module3::{Pallet, Origin, Call},
+			Module3: module3::{Pallet, Origin<T>, Call},
+		}
+	);
+
+	#[test]
+	fn origin_default_filter() {
+		let accepted_call = nested::module3::Call::fail().into();
+		let rejected_call = module3::Call::fail().into();
+
+		assert_eq!(Origin::root().filter_call(&accepted_call), true);
+		assert_eq!(Origin::root().filter_call(&rejected_call), true);
+		assert_eq!(Origin::none().filter_call(&accepted_call), true);
+		assert_eq!(Origin::none().filter_call(&rejected_call), false);
+		assert_eq!(Origin::signed(0).filter_call(&accepted_call), true);
+		assert_eq!(Origin::signed(0).filter_call(&rejected_call), false);
+		assert_eq!(Origin::from(Some(0)).filter_call(&accepted_call), true);
+		assert_eq!(Origin::from(Some(0)).filter_call(&rejected_call), false);
+		assert_eq!(Origin::from(None).filter_call(&accepted_call), true);
+		assert_eq!(Origin::from(None).filter_call(&rejected_call), false);
+		assert_eq!(Origin::from(super::nested::module3::Origin).filter_call(&accepted_call), true);
+		assert_eq!(Origin::from(super::nested::module3::Origin).filter_call(&rejected_call), false);
+
+		let mut origin = Origin::from(Some(0));
+
+		origin.add_filter(|c| matches!(c, Call::Module3(_)));
+		assert_eq!(origin.filter_call(&accepted_call), false);
+		assert_eq!(origin.filter_call(&rejected_call), false);
+
+		origin.set_caller_from(Origin::root());
+		assert!(matches!(origin.caller, OriginCaller::system(super::system::RawOrigin::Root)));
+		assert_eq!(origin.filter_call(&accepted_call), false);
+		assert_eq!(origin.filter_call(&rejected_call), false);
+
+		origin.reset_filter();
+		assert_eq!(origin.filter_call(&accepted_call), true);
+		assert_eq!(origin.filter_call(&rejected_call), false);
+	}
+}
+
 #[test]
 fn check_modules_error_type() {
 	assert_eq!(
@@ -170,6 +336,10 @@ fn check_modules_error_type() {
 		Module1_2::fail(system::Origin::<Runtime>::Root.into()),
 		Err(DispatchError::Module { index: 33, error: 0, message: Some("Something") }),
 	);
+	assert_eq!(
+		NestedModule3::fail(system::Origin::<Runtime>::Root.into()),
+		Err(DispatchError::Module { index: 34, error: 0, message: Some("Something") }),
+	);
 	assert_eq!(
 		Module1_3::fail(system::Origin::<Runtime>::Root.into()),
 		Err(DispatchError::Module { index: 6, error: 0, message: Some("Something") }),
@@ -203,7 +373,7 @@ fn check_modules_error_type() {
 #[test]
 fn integrity_test_works() {
 	__construct_runtime_integrity_test::runtime_integrity_tests();
-	assert_eq!(INTEGRITY_TEST_EXEC.with(|i| *i.borrow()), 1);
+	assert_eq!(INTEGRITY_TEST_EXEC.with(|i| *i.borrow()), 2);
 }
 
 #[test]
@@ -222,6 +392,12 @@ fn origin_codec() {
 	let origin = OriginCaller::module1_Instance2(module1::Origin(Default::default()));
 	assert_eq!(origin.encode()[0], 33);
 
+	let origin = OriginCaller::nested_module3(nested::module3::Origin);
+	assert_eq!(origin.encode()[0], 34);
+
+	let origin = OriginCaller::module3(module3::Origin(Default::default()));
+	assert_eq!(origin.encode()[0], 35);
+
 	let origin = OriginCaller::module1_Instance6(module1::Origin(Default::default()));
 	assert_eq!(origin.encode()[0], 1);
 
@@ -251,6 +427,12 @@ fn event_codec() {
 	let event = module1::Event::<Runtime, module1::Instance2>::A(Default::default());
 	assert_eq!(Event::from(event).encode()[0], 33);
 
+	let event = nested::module3::Event::A;
+	assert_eq!(Event::from(event).encode()[0], 34);
+
+	let event = module3::Event::A;
+	assert_eq!(Event::from(event).encode()[0], 35);
+
 	let event = module1::Event::<Runtime, module1::Instance5>::A(Default::default());
 	assert_eq!(Event::from(event).encode()[0], 4);
 
@@ -274,6 +456,8 @@ fn call_codec() {
 	assert_eq!(Call::Module1_1(module1::Call::fail()).encode()[0], 31);
 	assert_eq!(Call::Module2(module2::Call::fail()).encode()[0], 32);
 	assert_eq!(Call::Module1_2(module1::Call::fail()).encode()[0], 33);
+	assert_eq!(Call::NestedModule3(nested::module3::Call::fail()).encode()[0], 34);
+	assert_eq!(Call::Module3(module3::Call::fail()).encode()[0], 35);
 	assert_eq!(Call::Module1_4(module1::Call::fail()).encode()[0], 3);
 	assert_eq!(Call::Module1_6(module1::Call::fail()).encode()[0], 1);
 	assert_eq!(Call::Module1_7(module1::Call::fail()).encode()[0], 2);
@@ -381,6 +565,54 @@ fn test_metadata() {
 				errors: DecodeDifferent::Encode(FnEncode(|| &[])),
 				index: 33,
 			},
+			ModuleMetadata {
+				name: DecodeDifferent::Encode("NestedModule3"),
+				storage: Some(DecodeDifferent::Encode(FnEncode(|| StorageMetadata {
+					prefix: DecodeDifferent::Encode("Module"),
+					entries: DecodeDifferent::Encode(&[]),
+				}))),
+				calls: Some(DecodeDifferent::Encode(FnEncode(|| &[
+					FunctionMetadata {
+						name: DecodeDifferent::Encode("fail"),
+						arguments: DecodeDifferent::Encode(&[]),
+						documentation: DecodeDifferent::Encode(&[]),
+					},
+				]))),
+				event: Some(DecodeDifferent::Encode(FnEncode(|| &[
+					EventMetadata {
+						name: DecodeDifferent::Encode("A"),
+						arguments: DecodeDifferent::Encode(&[]),
+						documentation: DecodeDifferent::Encode(&[]),
+					},
+				]))),
+				constants: DecodeDifferent::Encode(FnEncode(|| &[])),
+				errors: DecodeDifferent::Encode(FnEncode(|| &[])),
+				index: 34,
+			},
+			ModuleMetadata {
+				name: DecodeDifferent::Encode("Module3"),
+				storage: Some(DecodeDifferent::Encode(FnEncode(|| StorageMetadata {
+					prefix: DecodeDifferent::Encode("Module"),
+					entries: DecodeDifferent::Encode(&[]),
+				}))),
+				calls: Some(DecodeDifferent::Encode(FnEncode(|| &[
+					FunctionMetadata {
+						name: DecodeDifferent::Encode("fail"),
+						arguments: DecodeDifferent::Encode(&[]),
+						documentation: DecodeDifferent::Encode(&[]),
+					},
+				]))),
+				event: Some(DecodeDifferent::Encode(FnEncode(|| &[
+					EventMetadata {
+						name: DecodeDifferent::Encode("A"),
+						arguments: DecodeDifferent::Encode(&[]),
+						documentation: DecodeDifferent::Encode(&[]),
+					},
+				]))),
+				constants: DecodeDifferent::Encode(FnEncode(|| &[])),
+				errors: DecodeDifferent::Encode(FnEncode(|| &[])),
+				index: 35,
+			},
 			ModuleMetadata {
 				name: DecodeDifferent::Encode("Module1_3"),
 				storage: Some(DecodeDifferent::Encode(FnEncode(|| StorageMetadata {
@@ -522,6 +754,12 @@ fn pallet_in_runtime_is_correct() {
 	assert_eq!(PalletInfo::index::<Module1_2>().unwrap(), 33);
 	assert_eq!(PalletInfo::name::<Module1_2>().unwrap(), "Module1_2");
 
+	assert_eq!(PalletInfo::index::<NestedModule3>().unwrap(), 34);
+	assert_eq!(PalletInfo::name::<NestedModule3>().unwrap(), "NestedModule3");
+
+	assert_eq!(PalletInfo::index::<Module3>().unwrap(), 35);
+	assert_eq!(PalletInfo::name::<Module3>().unwrap(), "Module3");
+
 	assert_eq!(PalletInfo::index::<Module1_3>().unwrap(), 6);
 	assert_eq!(PalletInfo::name::<Module1_3>().unwrap(), "Module1_3");
 
diff --git a/frame/support/test/tests/construct_runtime_ui/empty_pallet_path.rs b/frame/support/test/tests/construct_runtime_ui/empty_pallet_path.rs
new file mode 100644
index 000000000000..bc6abfa82b9c
--- /dev/null
+++ b/frame/support/test/tests/construct_runtime_ui/empty_pallet_path.rs
@@ -0,0 +1,13 @@
+use frame_support::construct_runtime;
+
+construct_runtime! {
+	pub enum Runtime where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic
+	{
+		system: ,
+	}
+}
+
+fn main() {}
diff --git a/frame/support/test/tests/construct_runtime_ui/empty_pallet_path.stderr b/frame/support/test/tests/construct_runtime_ui/empty_pallet_path.stderr
new file mode 100644
index 000000000000..7102076e5acb
--- /dev/null
+++ b/frame/support/test/tests/construct_runtime_ui/empty_pallet_path.stderr
@@ -0,0 +1,5 @@
+error: expected one of: `crate`, `self`, `super`, identifier
+ --> $DIR/empty_pallet_path.rs:9:11
+  |
+9 |         system: ,
+  |                 ^
diff --git a/frame/support/test/tests/construct_runtime_ui/invalid_module_details.stderr b/frame/support/test/tests/construct_runtime_ui/invalid_module_details.stderr
index 559a4637d67f..50505b9130cb 100644
--- a/frame/support/test/tests/construct_runtime_ui/invalid_module_details.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/invalid_module_details.stderr
@@ -1,4 +1,4 @@
-error: expected curly braces
+error: expected one of: identifier, curly braces, `<`
  --> $DIR/invalid_module_details.rs:9:19
   |
 9 |         system: System::(),

From f87609ad8d9d974962c49c0c9c0eeca8017b7133 Mon Sep 17 00:00:00 2001
From: Squirrel <gilescope@gmail.com>
Date: Tue, 1 Jun 2021 10:26:10 +0100
Subject: [PATCH 0811/1194] Reduce cargo doc warnings (#8947)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 client/authority-discovery/src/worker.rs           | 2 +-
 client/basic-authorship/src/basic_authorship.rs    | 8 ++++----
 client/consensus/common/src/shared_data.rs         | 4 ++--
 client/consensus/slots/src/lib.rs                  | 4 ++--
 client/network/src/config.rs                       | 7 +++----
 client/network/src/light_client_requests/sender.rs | 4 ++--
 client/network/src/service.rs                      | 2 +-
 frame/contracts/rpc/src/lib.rs                     | 2 +-
 primitives/npos-elections/compact/src/lib.rs       | 2 +-
 9 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/client/authority-discovery/src/worker.rs b/client/authority-discovery/src/worker.rs
index 3b76215dc24c..bb9207e4e7ea 100644
--- a/client/authority-discovery/src/worker.rs
+++ b/client/authority-discovery/src/worker.rs
@@ -86,7 +86,7 @@ pub enum Role {
 ///
 ///    4. Put addresses and signature as a record with the authority id as a key on a Kademlia DHT.
 ///
-/// When constructed with either [`Role::PublishAndDiscover`] or [`Role::Publish`] a [`Worker`] will
+/// When constructed with either [`Role::PublishAndDiscover`] or [`Role::Discover`] a [`Worker`] will
 ///
 ///    1. Retrieve the current and next set of authorities.
 ///
diff --git a/client/basic-authorship/src/basic_authorship.rs b/client/basic-authorship/src/basic_authorship.rs
index c8277d3b5d32..36e649fb8ed5 100644
--- a/client/basic-authorship/src/basic_authorship.rs
+++ b/client/basic-authorship/src/basic_authorship.rs
@@ -44,14 +44,14 @@ use sc_proposer_metrics::MetricsLink as PrometheusMetrics;
 
 /// Default block size limit in bytes used by [`Proposer`].
 ///
-/// Can be overwritten by [`ProposerFactory::set_block_size_limit`].
+/// Can be overwritten by [`ProposerFactory::set_default_block_size_limit`].
 ///
 /// Be aware that there is also an upper packet size on what the networking code
 /// will accept. If the block doesn't fit in such a package, it can not be
 /// transferred to other nodes.
 pub const DEFAULT_BLOCK_SIZE_LIMIT: usize = 4 * 1024 * 1024 + 512;
 
-/// Proposer factory.
+/// [`Proposer`] factory.
 pub struct ProposerFactory<A, B, C, PR> {
 	spawn_handle: Box<dyn SpawnNamed>,
 	/// The client instance.
@@ -62,7 +62,7 @@ pub struct ProposerFactory<A, B, C, PR> {
 	metrics: PrometheusMetrics,
 	/// The default block size limit.
 	///
-	/// If no `block_size_limit` is passed to [`Proposer::propose`], this block size limit will be
+	/// If no `block_size_limit` is passed to [`sp_consensus::Proposer::propose`], this block size limit will be
 	/// used.
 	default_block_size_limit: usize,
 	telemetry: Option<TelemetryHandle>,
@@ -134,7 +134,7 @@ impl<A, B, C, PR> ProposerFactory<A, B, C, PR> {
 	/// The default value for the block size limit is:
 	/// [`DEFAULT_BLOCK_SIZE_LIMIT`].
 	///
-	/// If there is no block size limit passed to [`Proposer::propose`], this value will be used.
+	/// If there is no block size limit passed to [`sp_consensus::Proposer::propose`], this value will be used.
 	pub fn set_default_block_size_limit(&mut self, limit: usize) {
 		self.default_block_size_limit = limit;
 	}
diff --git a/client/consensus/common/src/shared_data.rs b/client/consensus/common/src/shared_data.rs
index d90fc6273e05..8132a42a4b92 100644
--- a/client/consensus/common/src/shared_data.rs
+++ b/client/consensus/common/src/shared_data.rs
@@ -54,8 +54,8 @@ impl<T> Drop for SharedDataLockedUpgradable<T> {
 /// Created by [`SharedData::shared_data_locked`].
 ///
 /// As long as this object isn't dropped, the shared data is held in a mutex guard and the shared
-/// data is tagged as locked. Access to the shared data is provided through [`Deref`] and
-/// [`DerefMut`]. The trick is to use [`Self::release_mutex`] to release the mutex, but still keep
+/// data is tagged as locked. Access to the shared data is provided through [`Deref`](std::ops::Deref) and
+/// [`DerefMut`](std::ops::DerefMut). The trick is to use [`Self::release_mutex`] to release the mutex, but still keep
 /// the shared data locked. This means every other thread trying to access the shared data in this
 /// time will need to wait until this lock is freed.
 ///
diff --git a/client/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs
index 2ea5e101c3ad..cc879f769e47 100644
--- a/client/consensus/slots/src/lib.rs
+++ b/client/consensus/slots/src/lib.rs
@@ -428,10 +428,10 @@ impl<B: BlockT, T: SimpleSlotWorker<B> + Send> SlotWorker<B, <T::Proposer as Pro
 
 /// Slot specific extension that the inherent data provider needs to implement.
 pub trait InherentDataProviderExt {
-	/// The current timestamp that will be found in the [`InherentData`].
+	/// The current timestamp that will be found in the [`InherentData`](`sp_inherents::InherentData`).
 	fn timestamp(&self) -> Timestamp;
 
-	/// The current slot that will be found in the [`InherentData`].
+	/// The current slot that will be found in the [`InherentData`](`sp_inherents::InherentData`).
 	fn slot(&self) -> Slot;
 }
 
diff --git a/client/network/src/config.rs b/client/network/src/config.rs
index a742d8c95274..4942d1b0fb87 100644
--- a/client/network/src/config.rs
+++ b/client/network/src/config.rs
@@ -105,7 +105,7 @@ pub struct Params<B: BlockT, H: ExHashT> {
 
 	/// Request response configuration for the block request protocol.
 	///
-	/// [`RequestResponseConfig`] [`name`] is used to tag outgoing block requests with the correct
+	/// [`RequestResponseConfig::name`] is used to tag outgoing block requests with the correct
 	/// protocol name. In addition all of [`RequestResponseConfig`] is used to handle incoming block
 	/// requests, if enabled.
 	///
@@ -171,7 +171,7 @@ pub enum TransactionImport {
 	None,
 }
 
-/// Fuure resolving to transaction import result.
+/// Future resolving to transaction import result.
 pub type TransactionImportFuture = Pin<Box<dyn Future<Output=TransactionImport> + Send>>;
 
 /// Transaction pool interface
@@ -599,8 +599,7 @@ pub enum TransportConfig {
 
 		/// If true, allow connecting to private IPv4 addresses (as defined in
 		/// [RFC1918](https://tools.ietf.org/html/rfc1918)). Irrelevant for addresses that have
-		/// been passed in [`NetworkConfiguration::reserved_nodes`] or
-		/// [`NetworkConfiguration::boot_nodes`].
+		/// been passed in [`NetworkConfiguration::boot_nodes`].
 		allow_private_ipv4: bool,
 
 		/// Optional external implementation of a libp2p transport. Used in WASM contexts where we
diff --git a/client/network/src/light_client_requests/sender.rs b/client/network/src/light_client_requests/sender.rs
index bf832ea13aed..7cb224344a9a 100644
--- a/client/network/src/light_client_requests/sender.rs
+++ b/client/network/src/light_client_requests/sender.rs
@@ -25,7 +25,7 @@
 //! 2. Forward the request to [`crate::request_responses::RequestResponsesBehaviour`] via
 //! [`OutEvent::SendRequest`].
 //!
-//! 3. Wait for the response and forward the response via the [`oneshot::Sender`] provided earlier
+//! 3. Wait for the response and forward the response via the [`futures::channel::oneshot::Sender`] provided earlier
 //! with [`LightClientRequestSender::send_request`].
 
 use codec::{self, Encode, Decode};
@@ -552,7 +552,7 @@ pub enum OutEvent {
 		target: PeerId,
 		/// The encoded request.
 		request: Vec<u8>,
-		/// The [`onehsot::Sender`] channel to pass the response to.
+		/// The [`oneshot::Sender`] channel to pass the response to.
 		pending_response: oneshot::Sender<Result<Vec<u8>, RequestFailure>>,
 		/// The name of the protocol to use to send the request.
 		protocol_name: String,
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 5dc550254fcd..6351f03a393e 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -925,7 +925,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 		}
 	}
 
-	/// You may call this when new transactons are imported by the transaction pool.
+	/// You may call this when new transactions are imported by the transaction pool.
 	///
 	/// All transactions will be fetched from the `TransactionPool` that was passed at
 	/// initialization as part of the configuration and propagated to peers.
diff --git a/frame/contracts/rpc/src/lib.rs b/frame/contracts/rpc/src/lib.rs
index dd9ec164a984..1250d3cb285e 100644
--- a/frame/contracts/rpc/src/lib.rs
+++ b/frame/contracts/rpc/src/lib.rs
@@ -50,7 +50,7 @@ pub type Weight = u64;
 ///
 /// As 1 gas is equal to 1 weight we base this on the conducted benchmarks which
 /// determined runtime weights:
-/// https://github.com/paritytech/substrate/pull/5446
+/// <https://github.com/paritytech/substrate/pull/5446>
 const GAS_PER_SECOND: Weight = 1_000_000_000_000;
 
 /// The maximum amount of weight that the call and instantiate rpcs are allowed to consume.
diff --git a/primitives/npos-elections/compact/src/lib.rs b/primitives/npos-elections/compact/src/lib.rs
index e49518cc25cc..e8cde8774453 100644
--- a/primitives/npos-elections/compact/src/lib.rs
+++ b/primitives/npos-elections/compact/src/lib.rs
@@ -419,7 +419,7 @@ fn check_compact_attr(input: ParseStream) -> Result<bool> {
 	}
 }
 
-/// #[compact] pub struct CompactName::<VoterIndex = u32, TargetIndex = u32, Accuracy = u32>()
+/// `#[compact] pub struct CompactName::<VoterIndex = u32, TargetIndex = u32, Accuracy = u32>()`
 impl Parse for SolutionDef {
 	fn parse(input: ParseStream) -> syn::Result<Self> {
 		// optional #[compact]

From 5ceb0b0b6fbd57b181f53c5791a372ccccc72cba Mon Sep 17 00:00:00 2001
From: Sergei Shulepov <sergei@parity.io>
Date: Tue, 1 Jun 2021 12:02:10 +0200
Subject: [PATCH 0812/1194] Update wasmtime to 0.27 (#8913)

* Update wasmtime to 0.27

A couple of notes:

- Now we are fair about unsafeness of runtime creation via an compiled artifact.
  This change was prompted by the change in wasmtime which made
  `deserialize` rightfully unsafe. Now `CodeSupplyMode` was hidden and
  the `create_runtime` now takes the blob again and there is now a new
  fn for creating a runtime with a compiled artifact.
- This is a big change for wasmtime. They switched to the modern backend
  for code generation. While this can bring performance improvements, it
  can also introduce some problems. In fact, 0.27 fixed a serious issue
  that could lead to sandbox escape. Hence we need a proper burn in.

This would require a change to PVF validation host as well.

* Filter regalloc logging
---
 Cargo.lock                              | 142 ++++++++++++++----------
 client/executor/src/wasm_runtime.rs     |   2 +-
 client/executor/wasmtime/Cargo.toml     |   2 +-
 client/executor/wasmtime/src/imports.rs |   7 +-
 client/executor/wasmtime/src/lib.rs     |   4 +-
 client/executor/wasmtime/src/runtime.rs |  56 ++++++++--
 client/tracing/src/logging/mod.rs       |   3 +
 7 files changed, 143 insertions(+), 73 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5f1c123357ee..fca6465198aa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -16,7 +16,16 @@ version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7"
 dependencies = [
- "gimli",
+ "gimli 0.23.0",
+]
+
+[[package]]
+name = "addr2line"
+version = "0.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03345e98af8f3d786b6d9f656ccfa6ac316d954e92bc4841f0bba20789d5fb5a"
+dependencies = [
+ "gimli 0.24.0",
 ]
 
 [[package]]
@@ -428,11 +437,11 @@ version = "0.3.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d117600f438b1707d4e4ae15d3595657288f8235a0eb593e80ecc98ab34e1bc"
 dependencies = [
- "addr2line",
+ "addr2line 0.14.1",
  "cfg-if 1.0.0",
  "libc",
  "miniz_oxide",
- "object",
+ "object 0.23.0",
  "rustc-demangle",
 ]
 
@@ -963,38 +972,36 @@ checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba"
 
 [[package]]
 name = "cranelift-bforest"
-version = "0.71.0"
+version = "0.74.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcee7a5107071484772b89fdf37f0f460b7db75f476e43ea7a684fd942470bcf"
+checksum = "c8ca3560686e7c9c7ed7e0fe77469f2410ba5d7781b1acaa9adc8d8deea28e3e"
 dependencies = [
  "cranelift-entity",
 ]
 
 [[package]]
 name = "cranelift-codegen"
-version = "0.71.0"
+version = "0.74.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "654ab96f0f1cab71c0d323618a58360a492da2c341eb2c1f977fc195c664001b"
+checksum = "baf9bf1ffffb6ce3d2e5ebc83549bd2436426c99b31cc550d521364cbe35d276"
 dependencies = [
- "byteorder",
  "cranelift-bforest",
  "cranelift-codegen-meta",
  "cranelift-codegen-shared",
  "cranelift-entity",
- "gimli",
+ "gimli 0.24.0",
  "log",
  "regalloc",
  "serde",
  "smallvec 1.6.1",
  "target-lexicon",
- "thiserror",
 ]
 
 [[package]]
 name = "cranelift-codegen-meta"
-version = "0.71.0"
+version = "0.74.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65994cfc5be9d5fd10c5fc30bcdddfa50c04bb79c91329287bff846434ff8f14"
+checksum = "4cc21936a5a6d07e23849ffe83e5c1f6f50305c074f4b2970ca50c13bf55b821"
 dependencies = [
  "cranelift-codegen-shared",
  "cranelift-entity",
@@ -1002,27 +1009,27 @@ dependencies = [
 
 [[package]]
 name = "cranelift-codegen-shared"
-version = "0.71.0"
+version = "0.74.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "889d720b688b8b7df5e4903f9b788c3c59396050f5548e516e58ccb7312463ab"
+checksum = "ca5b6ffaa87560bebe69a5446449da18090b126037920b0c1c6d5945f72faf6b"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "cranelift-entity"
-version = "0.71.0"
+version = "0.74.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a2e6884a363e42a9ba980193ea8603a4272f8a92bd8bbaf9f57a94dbea0ff96"
+checksum = "7d6b4a8bef04f82e4296782646f733c641d09497df2fabf791323fefaa44c64c"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "cranelift-frontend"
-version = "0.71.0"
+version = "0.74.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6f41e2f9b57d2c030e249d0958f1cdc2c3cd46accf8c0438b3d1944e9153444"
+checksum = "c31b783b351f966fce33e3c03498cb116d16d97a8f9978164a60920bd0d3a99c"
 dependencies = [
  "cranelift-codegen",
  "log",
@@ -1032,9 +1039,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-native"
-version = "0.71.0"
+version = "0.74.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aab70ba7575665375d31cbdea2462916ce58be887834e1b83c860b43b51af637"
+checksum = "a77c88d3dd48021ff1e37e978a00098524abd3513444ae252c08d37b310b3d2a"
 dependencies = [
  "cranelift-codegen",
  "target-lexicon",
@@ -1042,9 +1049,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-wasm"
-version = "0.71.0"
+version = "0.74.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2fc3d2e70da6439adf97648dcdf81834363154f2907405345b6fbe7ca38918c"
+checksum = "edb6d408e2da77cdbbd65466298d44c86ae71c1785d2ab0d8657753cdb4d9d89"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -2248,6 +2255,12 @@ name = "gimli"
 version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
+
+[[package]]
+name = "gimli"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e4075386626662786ddb0ec9081e7c7eeb1ba31951f447ca780ef9f5d568189"
 dependencies = [
  "fallible-iterator",
  "indexmap",
@@ -4595,6 +4608,12 @@ name = "object"
 version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4"
+
+[[package]]
+name = "object"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a5b3dd1c072ee7963717671d1ca129f1048fda25edea6b752bfc71ac8854170"
 dependencies = [
  "crc32fast",
  "indexmap",
@@ -9758,9 +9777,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "target-lexicon"
-version = "0.11.2"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "422045212ea98508ae3d28025bc5aaa2bd4a9cdaecd442a08da2ee620ee9ea95"
+checksum = "64ae3b39281e4b14b8123bdbaddd472b7dfe215e444181f2f9d2443c2444f834"
 
 [[package]]
 name = "tempfile"
@@ -10899,15 +10918,15 @@ dependencies = [
 
 [[package]]
 name = "wasmparser"
-version = "0.76.0"
+version = "0.78.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "755a9a4afe3f6cccbbe6d7e965eef44cf260b001f93e547eba84255c1d0187d8"
+checksum = "52144d4c78e5cf8b055ceab8e5fa22814ce4315d6002ad32cfd914f37c12fd65"
 
 [[package]]
 name = "wasmtime"
-version = "0.24.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "718cb52a9fdb7ab12471e9b9d051c9adfa6b5c504e0a1fea045e5eabc81eedd9"
+checksum = "b310b9d20fcf59385761d1ade7a3ef06aecc380e3d3172035b919eaf7465d9f7"
 dependencies = [
  "anyhow",
  "backtrace",
@@ -10915,9 +10934,11 @@ dependencies = [
  "cfg-if 1.0.0",
  "cpp_demangle",
  "indexmap",
+ "lazy_static",
  "libc",
  "log",
  "paste 1.0.4",
+ "psm",
  "region",
  "rustc-demangle",
  "serde",
@@ -10936,9 +10957,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-cache"
-version = "0.24.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f984df56c4adeba91540f9052db9f7a8b3b00cfaac1a023bee50a972f588b0c"
+checksum = "d14d500d5c3dc5f5c097158feee123d64b3097f0d836a2a27dff9c761c73c843"
 dependencies = [
  "anyhow",
  "base64 0.13.0",
@@ -10957,28 +10978,29 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-cranelift"
-version = "0.24.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a05abbf94e03c2c8ee02254b1949320c4d45093de5d9d6ed4d9351d536075c9"
+checksum = "c525b39f062eada7db3c1298287b96dcb6e472b9f6b22501300b28d9fa7582f6"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
  "cranelift-frontend",
  "cranelift-wasm",
+ "target-lexicon",
  "wasmparser",
  "wasmtime-environ",
 ]
 
 [[package]]
 name = "wasmtime-debug"
-version = "0.24.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "382eecd6281c6c1d1f3c904c3c143e671fc1a9573820cbfa777fba45ce2eda9c"
+checksum = "c5d2a763e7a6fc734218e0e463196762a4f409c483063d81e0e85f96343b2e0a"
 dependencies = [
  "anyhow",
- "gimli",
+ "gimli 0.24.0",
  "more-asserts",
- "object",
+ "object 0.24.0",
  "target-lexicon",
  "thiserror",
  "wasmparser",
@@ -10987,16 +11009,15 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-environ"
-version = "0.24.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81011b2b833663d7e0ce34639459a0e301e000fc7331e0298b3a27c78d0cec60"
+checksum = "f64d0c2d881c31b0d65c1f2695e022d71eb60b9fbdd336aacca28208b58eac90"
 dependencies = [
- "anyhow",
  "cfg-if 1.0.0",
  "cranelift-codegen",
  "cranelift-entity",
  "cranelift-wasm",
- "gimli",
+ "gimli 0.24.0",
  "indexmap",
  "log",
  "more-asserts",
@@ -11007,9 +11028,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-fiber"
-version = "0.24.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d92da32e31af2e3d828f485f5f24651ed4d3b7f03a46ea6555eae6940d1402cd"
+checksum = "a089d44cd7e2465d41a53b840a5b4fca1bf6d1ecfebc970eac9592b34ea5f0b3"
 dependencies = [
  "cc",
  "libc",
@@ -11018,11 +11039,11 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-jit"
-version = "0.24.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b5f649623859a12d361fe4cc4793de44f7c3ff34c322c5714289787e89650bb"
+checksum = "4d4539ea734422b7c868107e2187d7746d8affbcaa71916d72639f53757ad707"
 dependencies = [
- "addr2line",
+ "addr2line 0.15.1",
  "anyhow",
  "cfg-if 1.0.0",
  "cranelift-codegen",
@@ -11030,10 +11051,10 @@ dependencies = [
  "cranelift-frontend",
  "cranelift-native",
  "cranelift-wasm",
- "gimli",
+ "gimli 0.24.0",
  "log",
  "more-asserts",
- "object",
+ "object 0.24.0",
  "rayon",
  "region",
  "serde",
@@ -11051,13 +11072,13 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-obj"
-version = "0.24.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef2e99cd9858f57fd062e9351e07881cedfc8597928385e02a48d9333b9e15a1"
+checksum = "8e1a8ff85246d091828e2225af521a6208ed28c997bb5c39eb697366dc2e2f2b"
 dependencies = [
  "anyhow",
  "more-asserts",
- "object",
+ "object 0.24.0",
  "target-lexicon",
  "wasmtime-debug",
  "wasmtime-environ",
@@ -11065,16 +11086,16 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-profiling"
-version = "0.24.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e46c0a590e49278ba7f79ef217af9db4ecc671b50042c185093e22d73524abb2"
+checksum = "e24364d522dcd67c897c8fffc42e5bdfc57207bbb6d7eeade0da9d4a7d70105b"
 dependencies = [
  "anyhow",
  "cfg-if 1.0.0",
- "gimli",
+ "gimli 0.24.0",
  "lazy_static",
  "libc",
- "object",
+ "object 0.24.0",
  "scroll",
  "serde",
  "target-lexicon",
@@ -11084,10 +11105,11 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-runtime"
-version = "0.24.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1438a09185fc7ca067caf1a80d7e5b398eefd4fb7630d94841448ade60feb3d0"
+checksum = "c51e57976e8a19a18a18e002c6eb12e5769554204238e47ff155fda1809ef0f7"
 dependencies = [
+ "anyhow",
  "backtrace",
  "cc",
  "cfg-if 1.0.0",
@@ -11095,12 +11117,14 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
+ "mach",
  "memoffset 0.6.1",
  "more-asserts",
- "psm",
+ "rand 0.8.3",
  "region",
  "thiserror",
  "wasmtime-environ",
+ "wasmtime-fiber",
  "winapi 0.3.9",
 ]
 
@@ -11115,9 +11139,9 @@ dependencies = [
 
 [[package]]
 name = "wat"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b0fa059022c5dabe129f02b429d67086400deb8277f89c975555dacc1dadbcc"
+checksum = "8ec280a739b69173e0ffd12c1658507996836ba4e992ed9bc1e5385a0bd72a02"
 dependencies = [
  "wast",
 ]
diff --git a/client/executor/src/wasm_runtime.rs b/client/executor/src/wasm_runtime.rs
index 6c13150613d6..d721f36e8a99 100644
--- a/client/executor/src/wasm_runtime.rs
+++ b/client/executor/src/wasm_runtime.rs
@@ -321,7 +321,7 @@ pub fn create_wasm_runtime_with_code(
 		#[cfg(feature = "wasmtime")]
 		WasmExecutionMethod::Compiled => {
 			sc_executor_wasmtime::create_runtime(
-				sc_executor_wasmtime::CodeSupplyMode::Verbatim { blob },
+				blob,
 				sc_executor_wasmtime::Config {
 					heap_pages: heap_pages as u32,
 					allow_missing_func_imports,
diff --git a/client/executor/wasmtime/Cargo.toml b/client/executor/wasmtime/Cargo.toml
index 4583c1ab8202..591565276a9d 100644
--- a/client/executor/wasmtime/Cargo.toml
+++ b/client/executor/wasmtime/Cargo.toml
@@ -22,7 +22,7 @@ sp-wasm-interface = { version = "3.0.0", path = "../../../primitives/wasm-interf
 sp-runtime-interface = { version = "3.0.0", path = "../../../primitives/runtime-interface" }
 sp-core = { version = "3.0.0", path = "../../../primitives/core" }
 sp-allocator = { version = "3.0.0", path = "../../../primitives/allocator" }
-wasmtime = "0.24.0"
+wasmtime = "0.27.0"
 
 [dev-dependencies]
 assert_matches = "1.3.0"
diff --git a/client/executor/wasmtime/src/imports.rs b/client/executor/wasmtime/src/imports.rs
index 21b7728c323c..f66e3042fba5 100644
--- a/client/executor/wasmtime/src/imports.rs
+++ b/client/executor/wasmtime/src/imports.rs
@@ -118,7 +118,12 @@ fn resolve_memory_import(
 	}
 
 	let memory_ty = MemoryType::new(Limits::new(initial, requested_memory_ty.limits().max()));
-	let memory = Memory::new(store, memory_ty);
+	let memory = Memory::new(store, memory_ty).map_err(|e| {
+		WasmError::Other(format!(
+			"failed to create a memory during resolving of memory import: {}",
+			e,
+		))
+	})?;
 	Ok(Extern::Memory(memory))
 }
 
diff --git a/client/executor/wasmtime/src/lib.rs b/client/executor/wasmtime/src/lib.rs
index 3679c1524965..3a0c7d59f19c 100644
--- a/client/executor/wasmtime/src/lib.rs
+++ b/client/executor/wasmtime/src/lib.rs
@@ -24,4 +24,6 @@ mod runtime;
 mod state_holder;
 mod util;
 
-pub use runtime::{create_runtime, prepare_runtime_artifact, CodeSupplyMode, Config, Semantics};
+pub use runtime::{
+	create_runtime, create_runtime_from_artifact, prepare_runtime_artifact, Config, Semantics,
+};
diff --git a/client/executor/wasmtime/src/runtime.rs b/client/executor/wasmtime/src/runtime.rs
index 103b37a681e8..fc45345256d1 100644
--- a/client/executor/wasmtime/src/runtime.rs
+++ b/client/executor/wasmtime/src/runtime.rs
@@ -272,7 +272,7 @@ pub struct Config {
 	pub semantics: Semantics,
 }
 
-pub enum CodeSupplyMode<'a> {
+enum CodeSupplyMode<'a> {
 	/// The runtime is instantiated using the given runtime blob.
 	Verbatim {
 		// Rationale to take the `RuntimeBlob` here is so that the client will be able to reuse
@@ -295,9 +295,42 @@ pub enum CodeSupplyMode<'a> {
 
 /// Create a new `WasmtimeRuntime` given the code. This function performs translation from Wasm to
 /// machine code, which can be computationally heavy.
-///
-/// The `cache_path` designates where this executor implementation can put compiled artifacts.
 pub fn create_runtime(
+	blob: RuntimeBlob,
+	config: Config,
+	host_functions: Vec<&'static dyn Function>,
+) -> std::result::Result<WasmtimeRuntime, WasmError> {
+	// SAFETY: this is safe because it doesn't use `CodeSupplyMode::Artifact`.
+	unsafe { do_create_runtime(CodeSupplyMode::Verbatim { blob }, config, host_functions) }
+}
+
+/// The same as [`create_runtime`] but takes a precompiled artifact, which makes this function
+/// considerably faster than [`create_runtime`].
+///
+/// # Safety
+///
+/// The caller must ensure that the compiled artifact passed here was produced by [`prepare_runtime_artifact`].
+/// Otherwise, there is a risk of arbitrary code execution with all implications.
+///
+/// It is ok though if the `compiled_artifact` was created by code of another version or with different
+/// configuration flags. In such case the caller will receive an `Err` deterministically.
+pub unsafe fn create_runtime_from_artifact(
+	compiled_artifact: &[u8],
+	config: Config,
+	host_functions: Vec<&'static dyn Function>,
+) -> std::result::Result<WasmtimeRuntime, WasmError> {
+	do_create_runtime(
+		CodeSupplyMode::Artifact { compiled_artifact },
+		config,
+		host_functions,
+	)
+}
+
+/// # Safety
+///
+/// This is only unsafe if called with [`CodeSupplyMode::Artifact`]. See [`create_runtime_from_artifact`]
+/// to get more details.
+unsafe fn do_create_runtime(
 	code_supply_mode: CodeSupplyMode<'_>,
 	config: Config,
 	host_functions: Vec<&'static dyn Function>,
@@ -313,7 +346,8 @@ pub fn create_runtime(
 		}
 	}
 
-	let engine = Engine::new(&wasmtime_config);
+	let engine = Engine::new(&wasmtime_config)
+		.map_err(|e| WasmError::Other(format!("cannot create the engine for runtime: {}", e)))?;
 
 	let (module, snapshot_data) = match code_supply_mode {
 		CodeSupplyMode::Verbatim { mut blob } => {
@@ -341,6 +375,8 @@ pub fn create_runtime(
 			}
 		}
 		CodeSupplyMode::Artifact { compiled_artifact } => {
+			// SAFETY: The unsafity of `deserialize` is covered by this function. The
+			//         responsibilities to maintain the invariants are passed to the caller.
 			let module = wasmtime::Module::deserialize(&engine, compiled_artifact)
 				.map_err(|e| WasmError::Other(format!("cannot deserialize module: {}", e)))?;
 
@@ -375,12 +411,12 @@ pub fn prepare_runtime_artifact(
 ) -> std::result::Result<Vec<u8>, WasmError> {
 	instrument(&mut blob, semantics);
 
-	let engine = Engine::new(&common_config());
-	let module = wasmtime::Module::new(&engine, &blob.serialize())
-		.map_err(|e| WasmError::Other(format!("cannot compile module: {}", e)))?;
-	module
-		.serialize()
-		.map_err(|e| WasmError::Other(format!("cannot serialize module: {}", e)))
+	let engine = Engine::new(&common_config())
+		.map_err(|e| WasmError::Other(format!("cannot create the engine: {}", e)))?;
+
+	engine
+		.precompile_module(&blob.serialize())
+		.map_err(|e| WasmError::Other(format!("cannot precompile module: {}", e)))
 }
 
 fn perform_call(
diff --git a/client/tracing/src/logging/mod.rs b/client/tracing/src/logging/mod.rs
index 49bcfc4abfb4..63daa0b29ce1 100644
--- a/client/tracing/src/logging/mod.rs
+++ b/client/tracing/src/logging/mod.rs
@@ -121,6 +121,9 @@ where
 		// Disable info logging by default for some modules.
 		.add_directive(parse_default_directive("ws=off").expect("provided directive is valid"))
 		.add_directive(parse_default_directive("yamux=off").expect("provided directive is valid"))
+		.add_directive(
+			parse_default_directive("regalloc=off").expect("provided directive is valid"),
+		)
 		.add_directive(
 			parse_default_directive("cranelift_codegen=off").expect("provided directive is valid"),
 		)

From e1d93fb3f08d71ce01d32ab49fed56d6e87f40b7 Mon Sep 17 00:00:00 2001
From: Squirrel <gilescope@gmail.com>
Date: Tue, 1 Jun 2021 11:51:38 +0100
Subject: [PATCH 0813/1194] Spellling corrections (no code changes) (#8971)

* Spelling corrections

* As this might break let's do as a separate PR
---
 client/rpc-api/src/child_state/mod.rs              |  4 ++--
 client/service/src/builder.rs                      |  6 +++---
 client/telemetry/src/lib.rs                        |  2 +-
 client/transaction-pool/graph/src/ready.rs         |  2 +-
 .../transaction-pool/graph/src/validated_pool.rs   |  2 +-
 client/transaction-pool/src/lib.rs                 |  2 +-
 client/transaction-pool/src/testing/pool.rs        |  2 +-
 docs/CHANGELOG.md                                  | 14 +++++++-------
 docs/Upgrading-2.0-to-3.0.md                       |  4 ++--
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/client/rpc-api/src/child_state/mod.rs b/client/rpc-api/src/child_state/mod.rs
index cffb1590c7f4..7ab897d6174a 100644
--- a/client/rpc-api/src/child_state/mod.rs
+++ b/client/rpc-api/src/child_state/mod.rs
@@ -27,8 +27,8 @@ use crate::state::ReadProof;
 
 /// Substrate child state API
 ///
-/// Note that all `PrefixedStorageKey` are desierialized
-/// from json and not guaranted valid.
+/// Note that all `PrefixedStorageKey` are deserialized
+/// from json and not guaranteed valid.
 #[rpc]
 pub trait ChildStateApi<Hash> {
 	/// RPC Metadata
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index ba566252742e..ebf600b12f02 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -252,7 +252,7 @@ impl KeystoreContainer {
 	/// Should be called right away at startup and not at runtime:
 	/// even though this overrides any previously set remote store, it
 	/// does not reset any references previously handed out - they will
-	/// stick araound.
+	/// stick around.
 	pub fn set_remote_keystore<T>(&mut self, remote: Arc<T>)
 		where T: CryptoStore + SyncCryptoStore + 'static
 	{
@@ -268,7 +268,7 @@ impl KeystoreContainer {
 		}
 	}
 
-	/// Returns the synchrnous keystore wrapper
+	/// Returns the synchronous keystore wrapper
 	pub fn sync_keystore(&self) -> SyncCryptoStorePtr {
 		if let Some(c) = self.remote.as_ref() {
 			c.sync_keystore_ref()
@@ -850,7 +850,7 @@ pub struct BuildNetworkParams<'a, TBl: BlockT, TExPool, TImpQu, TCl> {
 	pub import_queue: TImpQu,
 	/// An optional, shared data fetcher for light clients.
 	pub on_demand: Option<Arc<OnDemand<TBl>>>,
-	/// A block annouce validator builder.
+	/// A block announce validator builder.
 	pub block_announce_validator_builder: Option<Box<
 		dyn FnOnce(Arc<TCl>) -> Box<dyn BlockAnnounceValidator<TBl> + Send> + Send
 	>>,
diff --git a/client/telemetry/src/lib.rs b/client/telemetry/src/lib.rs
index 5c233d54903d..06c82d44ab38 100644
--- a/client/telemetry/src/lib.rs
+++ b/client/telemetry/src/lib.rs
@@ -400,7 +400,7 @@ impl Telemetry {
 			.map_err(|_| Error::TelemetryWorkerDropped)
 	}
 
-	/// Make a new clonable handle to this [`Telemetry`]. This is used for reporting telemetries.
+	/// Make a new cloneable handle to this [`Telemetry`]. This is used for reporting telemetries.
 	pub fn handle(&self) -> TelemetryHandle {
 		TelemetryHandle {
 			message_sender: Arc::new(Mutex::new(self.message_sender.clone())),
diff --git a/client/transaction-pool/graph/src/ready.rs b/client/transaction-pool/graph/src/ready.rs
index 7946f49e6a17..2c0575bf1efb 100644
--- a/client/transaction-pool/graph/src/ready.rs
+++ b/client/transaction-pool/graph/src/ready.rs
@@ -240,7 +240,7 @@ impl<Hash: hash::Hash + Member + Serialize, Ex> ReadyTransactions<Hash, Ex> {
 		self.ready.read().contains_key(hash)
 	}
 
-	/// Retrive transaction by hash
+	/// Retrieve transaction by hash
 	pub fn by_hash(&self, hash: &Hash) -> Option<Arc<Transaction<Hash, Ex>>> {
 		self.by_hashes(&[hash.clone()]).into_iter().next().unwrap_or(None)
 	}
diff --git a/client/transaction-pool/graph/src/validated_pool.rs b/client/transaction-pool/graph/src/validated_pool.rs
index 2e4db1248619..b9c2593f019c 100644
--- a/client/transaction-pool/graph/src/validated_pool.rs
+++ b/client/transaction-pool/graph/src/validated_pool.rs
@@ -155,7 +155,7 @@ impl<B: ChainApi> ValidatedPool<B> {
 
 	/// A fast check before doing any further processing of a transaction, like validation.
 	///
-	/// If `ingore_banned` is `true`, it will not check if the transaction is banned.
+	/// If `ignore_banned` is `true`, it will not check if the transaction is banned.
 	///
 	/// It checks if the transaction is already imported or banned. If so, it returns an error.
 	pub fn check_is_known(
diff --git a/client/transaction-pool/src/lib.rs b/client/transaction-pool/src/lib.rs
index efd5a7a14342..bc5f6e367ff8 100644
--- a/client/transaction-pool/src/lib.rs
+++ b/client/transaction-pool/src/lib.rs
@@ -578,7 +578,7 @@ impl<PoolApi, Block> MaintainedTransactionPool for BasicPool<PoolApi, Block>
 
 				async move {
 					// We keep track of everything we prune so that later we won't add
-					// tranactions with those hashes from the retracted blocks.
+					// transactions with those hashes from the retracted blocks.
 					let mut pruned_log = HashSet::<ExtrinsicHash<PoolApi>>::new();
 
 					// If there is a tree route, we use this to prune known tx based on the enacted
diff --git a/client/transaction-pool/src/testing/pool.rs b/client/transaction-pool/src/testing/pool.rs
index 063947b383d0..904870ae0ece 100644
--- a/client/transaction-pool/src/testing/pool.rs
+++ b/client/transaction-pool/src/testing/pool.rs
@@ -361,7 +361,7 @@ fn should_revalidate_across_many_blocks() {
 
 
 #[test]
-fn should_push_watchers_during_maintaince() {
+fn should_push_watchers_during_maintenance() {
 	fn alice_uxt(nonce: u64) -> Extrinsic {
 		uxt(Alice, 209 + nonce)
 	}
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index a918ef5d554c..c867a245739f 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -8,14 +8,14 @@ The format is based on [Keep a Changelog].
 
 ## 2.0.1-> 3.0.0 - Apollo 14
 
-Most notably, this is the first release of the new FRAME (2.0) with its new macro-syntax and some changes in types, and pallet versioning. This release also incorporates the faster and improve version 2.0 of the parity-scale-codec and upgraded dependencies all-around. While the `FinalityTracker` pallet has been dropped, this release marks the first public appereance of a few new pallets, too;Bounties, Lottery, Tips (extracted from the `Treasury`-pallet, see #7536) and Merkle-Mountain-Ranges (MMR).
+Most notably, this is the first release of the new FRAME (2.0) with its new macro-syntax and some changes in types, and pallet versioning. This release also incorporates the faster and improve version 2.0 of the parity-scale-codec and upgraded dependencies all-around. While the `FinalityTracker` pallet has been dropped, this release marks the first public appearance of a few new pallets, too;Bounties, Lottery, Tips (extracted from the `Treasury`-pallet, see #7536) and Merkle-Mountain-Ranges (MMR).
 
 On the client side, the most notable changes are around the keystore, making it async and switching to a different signing model allowing for remote-signing to be implemented; and various changes to improve networking and light-client support, like adding the Grandpa warp sync request-response protocol (#7711).
 
 _Contracts_: Please note that the contracts pallet _is not part_ of this release. The pallet is not yet ready and will be released separately in the coming weeks. The currently released contracts pallet _is not compatible_ with the new FRAME, thus if you need the contracts pallet, we recommend you wait with the upgrade until it has been released, too.
 ### Upgrade instructions
 
-Not too much has changed on the top and API level for developing Substrate betweeen 2.0 and 3.0. The easiest and quickest path for upgading is just to take the latest node-template and try applying your changes to it:
+Not too much has changed on the top and API level for developing Substrate between 2.0 and 3.0. The easiest and quickest path for upgrading is just to take the latest node-template and try applying your changes to it:
 1. take a diff between 2.0 and your changes
 2. store that diff
 3. remove everything, copy over the 3.0 node-template
@@ -31,7 +31,7 @@ Runtime
 * contracts: Emit event on contract termination (#8014)
 * Fix elections-phragmen and proxy issue (#7040)
 * Allow validators to block and kick their nominator set. (#7930)
-* Decouple Stkaing and Election - Part1: Support traits (#7908)
+* Decouple Staking and Election - Part1: Support traits (#7908)
 * Introduces account existence providers reference counting (#7363)
 * contracts: Cap the surcharge reward by the amount of rent that way payed by a contract (#7870)
 * Use checked math when calculating storage size (#7885)
@@ -215,7 +215,7 @@ Runtime Migrations
 Runtime
 -------
 
-* Custom Codec Implenetation for NPoS Election (#6720)
+* Custom Codec Implementation for NPoS Election (#6720)
 * Successful `note_imminent_preimage` is free (#6793)
 * pallet-democracy use of weightinfo (#6783)
 * Update Balances Pallet to use `WeightInfo` (#6610)
@@ -276,7 +276,7 @@ Runtime
 Client
 ------
 
-* Update wasmtime to (almost) lastest master (#6662)
+* Update wasmtime to (almost) latest master (#6662)
 * Update to latest sysinfo prevents leaking fd-handlers (#6708)
 * Tracing values (#6679)
 * Graceful shutdown for the task manager (#6654)
@@ -309,7 +309,7 @@ Runtime
 * `pallet-scheduler`: Check that `when` is not in the past (#6480)
 * Fix `sp-api` handling of multiple arguments (#6484)
 * Fix issues with `Operational` transactions validity and prioritization. (#6435)
-* pallet-atomic-swap: generialized swap action (#6421)
+* pallet-atomic-swap: generalized swap action (#6421)
 * Avoid multisig reentrancy (#6445)
 * Root origin use no filter by default. Scheduler and Democracy dispatch without asserting BaseCallFilter (#6408)
 * Scale and increase validator count (#6417)
@@ -334,7 +334,7 @@ Client
 * Remove penalty on duplicate Status message (#6377)
 * Fix the broken weight multiplier update function (#6334)
 * client/authority-discovery: Don't add own address to priority group (#6370)
-* Split the service initialisation up into seperate functions (#6332)
+* Split the service initialisation up into separate functions (#6332)
 * Fix transaction pool event sending (#6341)
 * Add a [prefix]_process_start_time_seconds metric (#6315)
 * new crate sc-light (#6235)
diff --git a/docs/Upgrading-2.0-to-3.0.md b/docs/Upgrading-2.0-to-3.0.md
index f1f6f31e9203..46f01ab7824c 100644
--- a/docs/Upgrading-2.0-to-3.0.md
+++ b/docs/Upgrading-2.0-to-3.0.md
@@ -4,7 +4,7 @@ An incomplete guide.
 
 ## Refreshing the node-template
 
-Not much has changed on the top and API level for developing Substrate betweeen 2.0 and 3.0. If you've made only small changes to the node-template, we recommend to do the following - it is easiest and quickest path forward:
+Not much has changed on the top and API level for developing Substrate between 2.0 and 3.0. If you've made only small changes to the node-template, we recommend to do the following - it is easiest and quickest path forward:
 1. take a diff between 2.0 and your changes
 2. store that diff
 3. remove everything, copy over the 3.0 node-template
@@ -558,7 +558,7 @@ First and foremost, grandpa internalised a few aspects, and thus `new_partial` d
 +	));
 ```
 
-As these changes pull through the enitrety of `cli/src/service.rs`, we recommend looking at the final diff below for guidance.
+As these changes pull through the entirety of `cli/src/service.rs`, we recommend looking at the final diff below for guidance.
 
 ##### In a nutshell
 

From 04aa0e96b951de3bf0d4282446f19a03e2c70dec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 1 Jun 2021 13:57:35 +0200
Subject: [PATCH 0814/1194] Dependabot use correct label (#8973)

---
 .github/dependabot.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index d782bb80f753..a321729dcbc8 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -2,6 +2,6 @@ version: 2
 updates:
   - package-ecosystem: "cargo"
     directory: "/"
-    labels: ["A2-insubstantial", "B0-silent", "C1-low"]
+    labels: ["A2-insubstantial", "B0-silent", "C1-low 📌"]
     schedule:
       interval: "daily"

From 408e803f91790b1a128a964985de26f2bdf11eea Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Tue, 1 Jun 2021 14:49:06 +0200
Subject: [PATCH 0815/1194] Inject hashed prefix for remote-ext (#8960)

* Inject for remote-ext

* Update utils/frame/remote-externalities/src/lib.rs

Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com>

* Update utils/frame/remote-externalities/src/lib.rs

Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com>

* Apply suggestions from code review

* Apply suggestions from code review

Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com>
---
 frame/system/src/offchain.rs                |   2 +-
 utils/frame/remote-externalities/src/lib.rs | 105 ++++----------------
 2 files changed, 20 insertions(+), 87 deletions(-)

diff --git a/frame/system/src/offchain.rs b/frame/system/src/offchain.rs
index fe601f995ce5..6769923bc04b 100644
--- a/frame/system/src/offchain.rs
+++ b/frame/system/src/offchain.rs
@@ -447,7 +447,7 @@ pub trait AppCrypto<Public, Signature> {
 // TODO [#5663] Could this be just `T::Signature as traits::Verify>::Signer`?
 // Seems that this may cause issues with bounds resolution.
 pub trait SigningTypes: crate::Config {
-	/// A public key that is capable of identifing `AccountId`s.
+	/// A public key that is capable of identifying `AccountId`s.
 	///
 	/// Usually that's either a raw crypto public key (e.g. `sr25519::Public`) or
 	/// an aggregate type for multiple crypto public keys, like `MulitSigner`.
diff --git a/utils/frame/remote-externalities/src/lib.rs b/utils/frame/remote-externalities/src/lib.rs
index 46aa583b9b2a..3ea97fc9d365 100644
--- a/utils/frame/remote-externalities/src/lib.rs
+++ b/utils/frame/remote-externalities/src/lib.rs
@@ -19,87 +19,6 @@
 //!
 //! An equivalent of `sp_io::TestExternalities` that can load its state from a remote substrate
 //! based chain, or a local state snapshot file.
-//!
-//! #### Runtime to Test Against
-//!
-//! While not absolutely necessary, you most likely need a `Runtime` equivalent in your test setup
-//! through which you can infer storage types. There are two options here:
-//!
-//! 1. Build a mock runtime, similar how to you would build one in a pallet test (see example
-//!    below). The very important point here is that this mock needs to hold real values for types
-//!    that matter for you, based on the chain of interest. Some typical ones are:
-//!
-//! - `sp_runtime::AccountId32` as `AccountId`.
-//! - `u32` as `BlockNumber`.
-//! - `u128` as Balance.
-//!
-//! Once you have your `Runtime`, you can use it for storage type resolution and do things like
-//! `<my_pallet::Pallet<Runtime>>::storage_getter()` or `<my_pallet::StorageItem<Runtime>>::get()`.
-//!
-//! 2. Or, you can use a real runtime.
-//!
-//! ### Example
-//!
-//! With a test runtime
-//!
-//! ```ignore
-//! use remote_externalities::Builder;
-//!
-//! #[derive(Clone, Eq, PartialEq, Debug, Default)]
-//! pub struct TestRuntime;
-//!
-//! use frame_system as system;
-//! impl_outer_origin! {
-//!     pub enum Origin for TestRuntime {}
-//! }
-//!
-//! impl frame_system::Config for TestRuntime {
-//!     ..
-//!     // we only care about these two for now. The rest can be mock. The block number type of
-//!     // kusama is u32.
-//!     type BlockNumber = u32;
-//!     type Header = Header;
-//!     ..
-//! }
-//!
-//! #[test]
-//! fn test_runtime_works() {
-//!     let hash: Hash =
-//!         hex!["f9a4ce984129569f63edc01b1c13374779f9384f1befd39931ffdcc83acf63a7"].into();
-//!     let parent: Hash =
-//!         hex!["540922e96a8fcaf945ed23c6f09c3e189bd88504ec945cc2171deaebeaf2f37e"].into();
-//!     Builder::new()
-//!         .at(hash)
-//!         .module("System")
-//!         .build()
-//!         .execute_with(|| {
-//!             assert_eq!(
-//!                 // note: the hash corresponds to 3098546. We can check only the parent.
-//!                 // https://polkascan.io/kusama/block/3098546
-//!                 <frame_system::Pallet<Runtime>>::block_hash(3098545u32),
-//!                 parent,
-//!             )
-//!         });
-//! }
-//! ```
-//!
-//! Or with the real kusama runtime.
-//!
-//! ```ignore
-//! use remote_externalities::Builder;
-//! use kusama_runtime::Runtime;
-//!
-//! #[test]
-//! fn test_runtime_works() {
-//!     let hash: Hash =
-//!         hex!["f9a4ce984129569f63edc01b1c13374779f9384f1befd39931ffdcc83acf63a7"].into();
-//!     Builder::new()
-//!         .at(hash)
-//!         .module("Staking")
-//!         .build()
-//!         .execute_with(|| assert_eq!(<pallet_staking::Module<Runtime>>::validator_count(), 400));
-//! }
-//! ```
 
 use std::{
 	fs,
@@ -235,8 +154,10 @@ impl Default for SnapshotConfig {
 
 /// Builder for remote-externalities.
 pub struct Builder<B: BlockT> {
-	/// Pallets to inject their prefix into the externalities.
+	/// Custom key-pairs to be injected into the externalities.
 	inject: Vec<KeyPair>,
+	/// Storage entry key prefixes to be injected into the externalities. The *hashed* prefix must be given.
+	hashed_prefixes: Vec<Vec<u8>>,
 	/// connectivity mode, online or offline.
 	mode: Mode<B>,
 }
@@ -245,7 +166,7 @@ pub struct Builder<B: BlockT> {
 // that.
 impl<B: BlockT> Default for Builder<B> {
 	fn default() -> Self {
-		Self { inject: Default::default(), mode: Default::default() }
+		Self { inject: Default::default(), mode: Default::default(), hashed_prefixes: Default::default() }
 	}
 }
 
@@ -394,7 +315,7 @@ impl<B: BlockT> Builder<B> {
 
 	/// initialize `Self` from state snapshot. Panics if the file does not exist.
 	fn load_state_snapshot(&self, path: &Path) -> Result<Vec<KeyPair>, &'static str> {
-		info!(target: LOG_TARGET, "scraping keypairs from state snapshot {:?}", path,);
+		info!(target: LOG_TARGET, "scraping key-pairs from state snapshot {:?}", path,);
 		let bytes = fs::read(path).map_err(|_| "fs::read failed.")?;
 		Decode::decode(&mut &*bytes).map_err(|_| "decode failed")
 	}
@@ -407,9 +328,9 @@ impl<B: BlockT> Builder<B> {
 			.at
 			.expect("online config must be initialized by this point; qed.")
 			.clone();
-		info!(target: LOG_TARGET, "scraping keypairs from remote @ {:?}", at);
+		info!(target: LOG_TARGET, "scraping key-pairs from remote @ {:?}", at);
 
-		let keys_and_values = if config.modules.len() > 0 {
+		let mut keys_and_values = if config.modules.len() > 0 {
 			let mut filtered_kv = vec![];
 			for f in config.modules.iter() {
 				let hashed_prefix = StorageKey(twox_128(f.as_bytes()).to_vec());
@@ -429,6 +350,12 @@ impl<B: BlockT> Builder<B> {
 			self.rpc_get_pairs_paged(StorageKey(vec![]), at).await?
 		};
 
+		for prefix in &self.hashed_prefixes {
+			info!(target: LOG_TARGET, "adding data for hashed prefix: {:?}", HexDisplay::from(prefix));
+			let additional_key_values = self.rpc_get_pairs_paged(StorageKey(prefix.to_vec()), at).await?;
+			keys_and_values.extend(additional_key_values);
+		}
+
 		Ok(keys_and_values)
 	}
 
@@ -491,6 +418,12 @@ impl<B: BlockT> Builder<B> {
 		self
 	}
 
+	/// Inject a hashed prefix. This is treated as-is, and should be pre-hashed. 
+	pub fn inject_hashed_prefix(mut self, hashed: &[u8]) -> Self {
+		self.hashed_prefixes.push(hashed.to_vec());
+		self
+	}
+
 	/// Configure a state snapshot to be used.
 	pub fn mode(mut self, mode: Mode<B>) -> Self {
 		self.mode = mode;

From bfef07c0d22ead3ab3c4e0e90ddf9b0e3537566e Mon Sep 17 00:00:00 2001
From: Ashley <ashley.ruglys@gmail.com>
Date: Tue, 1 Jun 2021 16:28:03 +0200
Subject: [PATCH 0816/1194] Use `SpawnTaskHandle`s for spawning tasks in the tx
 pool  (#8958)

* Remove futures-diagnose

* Use `SpawnTaskHandle`s for spawning tasks in the tx pool

* Box the spawner

* Fix tests

* Use the testing task executor
---
 Cargo.lock                                  | 17 -----------------
 client/transaction-pool/Cargo.toml          |  1 -
 client/transaction-pool/src/api.rs          | 16 +++++++---------
 client/transaction-pool/src/lib.rs          |  4 ++--
 client/transaction-pool/src/testing/pool.rs |  5 +++--
 5 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fca6465198aa..fc107b0a53bc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2059,22 +2059,6 @@ dependencies = [
  "num_cpus",
 ]
 
-[[package]]
-name = "futures-diagnose"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdcef58a173af8148b182684c9f2d5250875adbcaff7b5794073894f9d8634a9"
-dependencies = [
- "futures 0.1.31",
- "futures 0.3.13",
- "lazy_static",
- "log",
- "parking_lot 0.9.0",
- "pin-project 0.4.27",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "futures-executor"
 version = "0.3.13"
@@ -8116,7 +8100,6 @@ version = "3.0.0"
 dependencies = [
  "assert_matches",
  "futures 0.3.13",
- "futures-diagnose",
  "hex",
  "intervalier",
  "log",
diff --git a/client/transaction-pool/Cargo.toml b/client/transaction-pool/Cargo.toml
index d457d709d122..6b105520baec 100644
--- a/client/transaction-pool/Cargo.toml
+++ b/client/transaction-pool/Cargo.toml
@@ -16,7 +16,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 thiserror = "1.0.21"
 futures = { version = "0.3.1", features = ["compat"] }
-futures-diagnose = "1.0"
 intervalier = "0.4.0"
 log = "0.4.8"
 parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
diff --git a/client/transaction-pool/src/api.rs b/client/transaction-pool/src/api.rs
index 2ebf038844fa..fe1f99e0a3c2 100644
--- a/client/transaction-pool/src/api.rs
+++ b/client/transaction-pool/src/api.rs
@@ -21,7 +21,7 @@
 use std::{marker::PhantomData, pin::Pin, sync::Arc};
 use codec::{Decode, Encode};
 use futures::{
-	channel::oneshot, executor::{ThreadPool, ThreadPoolBuilder}, future::{Future, FutureExt, ready, Ready},
+	channel::oneshot, future::{Future, FutureExt, ready, Ready},
 };
 
 use sc_client_api::{
@@ -31,6 +31,7 @@ use sp_runtime::{
 	generic::BlockId, traits::{self, Block as BlockT, BlockIdTo, Header as HeaderT, Hash as HashT},
 	transaction_validity::{TransactionValidity, TransactionSource},
 };
+use sp_core::traits::SpawnNamed;
 use sp_transaction_pool::runtime_api::TaggedTransactionQueue;
 use sp_api::{ProvideRuntimeApi, ApiExt};
 use prometheus_endpoint::Registry as PrometheusRegistry;
@@ -40,7 +41,7 @@ use crate::{metrics::{ApiMetrics, ApiMetricsExt}, error::{self, Error}};
 /// The transaction pool logic for full client.
 pub struct FullChainApi<Client, Block> {
 	client: Arc<Client>,
-	pool: ThreadPool,
+	spawner: Box<dyn SpawnNamed>,
 	_marker: PhantomData<Block>,
 	metrics: Option<Arc<ApiMetrics>>,
 }
@@ -50,6 +51,7 @@ impl<Client, Block> FullChainApi<Client, Block> {
 	pub fn new(
 		client: Arc<Client>,
 		prometheus: Option<&PrometheusRegistry>,
+		spawner: impl SpawnNamed + 'static,
 	) -> Self {
 		let metrics = prometheus.map(ApiMetrics::register).and_then(|r| {
 			match r {
@@ -67,13 +69,9 @@ impl<Client, Block> FullChainApi<Client, Block> {
 
 		FullChainApi {
 			client,
-			pool: ThreadPoolBuilder::new()
-				.pool_size(2)
-				.name_prefix("txpool-verifier")
-				.create()
-				.expect("Failed to spawn verifier threads, that are critical for node operation."),
 			_marker: Default::default(),
 			metrics,
+			spawner: Box::new(spawner) ,
 		}
 	}
 }
@@ -109,9 +107,9 @@ where
 		let metrics = self.metrics.clone();
 		metrics.report(|m| m.validations_scheduled.inc());
 
-		self.pool.spawn_ok(futures_diagnose::diagnose(
+		self.spawner.spawn_blocking(
 			"validate-transaction",
-			async move {
+			Box::pin(async move {
 				let res = validate_transaction_blocking(&*client, &at, source, uxt);
 				if let Err(e) = tx.send(res) {
 					log::warn!("Unable to send a validate transaction result: {:?}", e);
diff --git a/client/transaction-pool/src/lib.rs b/client/transaction-pool/src/lib.rs
index bc5f6e367ff8..bcabc5b87399 100644
--- a/client/transaction-pool/src/lib.rs
+++ b/client/transaction-pool/src/lib.rs
@@ -366,10 +366,10 @@ where
 		options: sc_transaction_graph::Options,
 		is_validator: txpool::IsValidator,
 		prometheus: Option<&PrometheusRegistry>,
-		spawner: impl SpawnNamed,
+		spawner: impl SpawnNamed + Clone + 'static,
 		client: Arc<Client>,
 	) -> Arc<Self> {
-		let pool_api = Arc::new(FullChainApi::new(client.clone(), prometheus));
+		let pool_api = Arc::new(FullChainApi::new(client.clone(), prometheus, spawner.clone()));
 		let pool = Arc::new(Self::with_revalidation_type(
 			options, is_validator, pool_api, prometheus, RevalidationType::Full, spawner
 		));
diff --git a/client/transaction-pool/src/testing/pool.rs b/client/transaction-pool/src/testing/pool.rs
index 904870ae0ece..1a76c28a0e0d 100644
--- a/client/transaction-pool/src/testing/pool.rs
+++ b/client/transaction-pool/src/testing/pool.rs
@@ -35,6 +35,7 @@ use std::collections::BTreeSet;
 use sc_client_api::client::BlockchainEvents;
 use sc_block_builder::BlockBuilderProvider;
 use sp_consensus::BlockOrigin;
+use sp_core::testing::TaskExecutor;
 
 fn pool() -> Pool<TestApi> {
 	Pool::new(Default::default(), true.into(), TestApi::with_alice_nonce(209).into())
@@ -935,7 +936,7 @@ fn should_not_accept_old_signatures() {
 	let client = Arc::new(substrate_test_runtime_client::new());
 
 	let pool = Arc::new(
-		BasicPool::new_test(Arc::new(FullChainApi::new(client, None))).0
+		BasicPool::new_test(Arc::new(FullChainApi::new(client, None, TaskExecutor::new()))).0
 	);
 
 	let transfer = Transfer {
@@ -971,7 +972,7 @@ fn import_notification_to_pool_maintain_works() {
 	let mut client = Arc::new(substrate_test_runtime_client::new());
 
 	let pool = Arc::new(
-		BasicPool::new_test(Arc::new(FullChainApi::new(client.clone(), None))).0
+		BasicPool::new_test(Arc::new(FullChainApi::new(client.clone(), None, TaskExecutor::new()))).0
 	);
 
 	// Prepare the extrisic, push it to the pool and check that it was added.

From 24750eafb691517e3aec70fcd9554cd91d7e4974 Mon Sep 17 00:00:00 2001
From: Sergei Shulepov <sergei@parity.io>
Date: Tue, 1 Jun 2021 16:43:29 +0200
Subject: [PATCH 0817/1194] Do not spend time on verifying the signatures
 before calling Runtime (#8980)

---
 .../executor/wasmtime/src/instance_wrapper.rs | 98 +++++++++----------
 1 file changed, 47 insertions(+), 51 deletions(-)

diff --git a/client/executor/wasmtime/src/instance_wrapper.rs b/client/executor/wasmtime/src/instance_wrapper.rs
index fec88a472fb9..381ae993442a 100644
--- a/client/executor/wasmtime/src/instance_wrapper.rs
+++ b/client/executor/wasmtime/src/instance_wrapper.rs
@@ -36,75 +36,71 @@ pub enum EntryPointType {
 	/// Direct call.
 	///
 	/// Call is made by providing only payload reference and length.
-	Direct,
+	Direct {
+		entrypoint: wasmtime::TypedFunc<(u32, u32), u64>,
+	},
 	/// Indirect call.
 	///
 	/// Call is made by providing payload reference and length, and extra argument
-	/// for advanced routing (typically extra WASM function pointer).
-	Wrapped(u32),
+	/// for advanced routing.
+	Wrapped {
+		/// The extra argument passed to the runtime. It is typically a wasm function pointer.
+		func: u32,
+		dispatcher: wasmtime::TypedFunc<(u32, u32, u32), u64>,
+	},
 }
 
 /// Wasm blob entry point.
 pub struct EntryPoint {
 	call_type: EntryPointType,
-	func: wasmtime::Func,
 }
 
 impl EntryPoint {
 	/// Call this entry point.
 	pub fn call(&self, data_ptr: Pointer<u8>, data_len: WordSize) -> Result<u64> {
-		let data_ptr = u32::from(data_ptr) as i32;
-		let data_len = u32::from(data_len) as i32;
-
-		(match self.call_type {
-			EntryPointType::Direct => {
-				self.func.call(&[
-					wasmtime::Val::I32(data_ptr),
-					wasmtime::Val::I32(data_len),
-				])
-			},
-			EntryPointType::Wrapped(func) => {
-				self.func.call(&[
-					wasmtime::Val::I32(func as _),
-					wasmtime::Val::I32(data_ptr),
-					wasmtime::Val::I32(data_len),
-				])
-			},
-		})
-			.map(|results|
-				// the signature is checked to have i64 return type
-				results[0].unwrap_i64() as u64
-			)
-			.map_err(|err| Error::from(format!(
-				"Wasm execution trapped: {}",
-				err
-			)))
+		let data_ptr = u32::from(data_ptr);
+		let data_len = u32::from(data_len);
+
+		fn handle_trap(err: wasmtime::Trap) -> Error {
+			Error::from(format!("Wasm execution trapped: {}", err))
+		}
+
+		match self.call_type {
+			EntryPointType::Direct { ref entrypoint } => {
+				entrypoint.call((data_ptr, data_len)).map_err(handle_trap)
+			}
+			EntryPointType::Wrapped {
+				func,
+				ref dispatcher,
+			} => {
+				dispatcher
+					.call((func, data_ptr, data_len))
+					.map_err(handle_trap)
+			}
+		}
 	}
 
 	pub fn direct(func: wasmtime::Func) -> std::result::Result<Self, &'static str> {
-		use wasmtime::ValType;
-		let entry_point = wasmtime::FuncType::new(
-			[ValType::I32, ValType::I32].iter().cloned(),
-			[ValType::I64].iter().cloned(),
-		);
-		if func.ty() == entry_point {
-			Ok(Self { func, call_type: EntryPointType::Direct })
-		} else {
-			Err("Invalid signature for direct entry point")
-		}
+		let entrypoint = func
+			.typed::<(u32, u32), u64>()
+			.map_err(|_| "Invalid signature for direct entry point")?
+			.clone();
+		Ok(Self {
+			call_type: EntryPointType::Direct { entrypoint },
+		})
 	}
 
-	pub fn wrapped(dispatcher: wasmtime::Func, func: u32) -> std::result::Result<Self, &'static str> {
-		use wasmtime::ValType;
-		let entry_point = wasmtime::FuncType::new(
-			[ValType::I32, ValType::I32, ValType::I32].iter().cloned(),
-			[ValType::I64].iter().cloned(),
-		);
-		if dispatcher.ty() == entry_point {
-			Ok(Self { func: dispatcher, call_type: EntryPointType::Wrapped(func) })
-		} else {
-			Err("Invalid signature for wrapped entry point")
-		}
+	pub fn wrapped(
+		dispatcher: wasmtime::Func,
+		func: u32,
+	) -> std::result::Result<Self, &'static str> {
+		let dispatcher = dispatcher
+			.typed::<(u32, u32, u32), u64>()
+			.map_err(|_| "Invalid signature for wrapped entry point")?
+			.clone();
+		Ok(Self {
+			call_type: EntryPointType::Wrapped { func, dispatcher },
+		})
 	}
 }
 

From fa23b18e28d9d22824e2edfb76042297aae83efe Mon Sep 17 00:00:00 2001
From: Ashley <ashley.ruglys@gmail.com>
Date: Tue, 1 Jun 2021 17:14:33 +0200
Subject: [PATCH 0818/1194] Revert "Use `SpawnTaskHandle`s for spawning tasks
 in the tx pool  (#8958)" (#8983)

This reverts commit bfef07c0d22ead3ab3c4e0e90ddf9b0e3537566e.
---
 Cargo.lock                                  | 17 +++++++++++++++++
 client/transaction-pool/Cargo.toml          |  1 +
 client/transaction-pool/src/api.rs          | 16 +++++++++-------
 client/transaction-pool/src/lib.rs          |  4 ++--
 client/transaction-pool/src/testing/pool.rs |  5 ++---
 5 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fc107b0a53bc..fca6465198aa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2059,6 +2059,22 @@ dependencies = [
  "num_cpus",
 ]
 
+[[package]]
+name = "futures-diagnose"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdcef58a173af8148b182684c9f2d5250875adbcaff7b5794073894f9d8634a9"
+dependencies = [
+ "futures 0.1.31",
+ "futures 0.3.13",
+ "lazy_static",
+ "log",
+ "parking_lot 0.9.0",
+ "pin-project 0.4.27",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "futures-executor"
 version = "0.3.13"
@@ -8100,6 +8116,7 @@ version = "3.0.0"
 dependencies = [
  "assert_matches",
  "futures 0.3.13",
+ "futures-diagnose",
  "hex",
  "intervalier",
  "log",
diff --git a/client/transaction-pool/Cargo.toml b/client/transaction-pool/Cargo.toml
index 6b105520baec..d457d709d122 100644
--- a/client/transaction-pool/Cargo.toml
+++ b/client/transaction-pool/Cargo.toml
@@ -16,6 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 thiserror = "1.0.21"
 futures = { version = "0.3.1", features = ["compat"] }
+futures-diagnose = "1.0"
 intervalier = "0.4.0"
 log = "0.4.8"
 parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
diff --git a/client/transaction-pool/src/api.rs b/client/transaction-pool/src/api.rs
index fe1f99e0a3c2..2ebf038844fa 100644
--- a/client/transaction-pool/src/api.rs
+++ b/client/transaction-pool/src/api.rs
@@ -21,7 +21,7 @@
 use std::{marker::PhantomData, pin::Pin, sync::Arc};
 use codec::{Decode, Encode};
 use futures::{
-	channel::oneshot, future::{Future, FutureExt, ready, Ready},
+	channel::oneshot, executor::{ThreadPool, ThreadPoolBuilder}, future::{Future, FutureExt, ready, Ready},
 };
 
 use sc_client_api::{
@@ -31,7 +31,6 @@ use sp_runtime::{
 	generic::BlockId, traits::{self, Block as BlockT, BlockIdTo, Header as HeaderT, Hash as HashT},
 	transaction_validity::{TransactionValidity, TransactionSource},
 };
-use sp_core::traits::SpawnNamed;
 use sp_transaction_pool::runtime_api::TaggedTransactionQueue;
 use sp_api::{ProvideRuntimeApi, ApiExt};
 use prometheus_endpoint::Registry as PrometheusRegistry;
@@ -41,7 +40,7 @@ use crate::{metrics::{ApiMetrics, ApiMetricsExt}, error::{self, Error}};
 /// The transaction pool logic for full client.
 pub struct FullChainApi<Client, Block> {
 	client: Arc<Client>,
-	spawner: Box<dyn SpawnNamed>,
+	pool: ThreadPool,
 	_marker: PhantomData<Block>,
 	metrics: Option<Arc<ApiMetrics>>,
 }
@@ -51,7 +50,6 @@ impl<Client, Block> FullChainApi<Client, Block> {
 	pub fn new(
 		client: Arc<Client>,
 		prometheus: Option<&PrometheusRegistry>,
-		spawner: impl SpawnNamed + 'static,
 	) -> Self {
 		let metrics = prometheus.map(ApiMetrics::register).and_then(|r| {
 			match r {
@@ -69,9 +67,13 @@ impl<Client, Block> FullChainApi<Client, Block> {
 
 		FullChainApi {
 			client,
+			pool: ThreadPoolBuilder::new()
+				.pool_size(2)
+				.name_prefix("txpool-verifier")
+				.create()
+				.expect("Failed to spawn verifier threads, that are critical for node operation."),
 			_marker: Default::default(),
 			metrics,
-			spawner: Box::new(spawner) ,
 		}
 	}
 }
@@ -107,9 +109,9 @@ where
 		let metrics = self.metrics.clone();
 		metrics.report(|m| m.validations_scheduled.inc());
 
-		self.spawner.spawn_blocking(
+		self.pool.spawn_ok(futures_diagnose::diagnose(
 			"validate-transaction",
-			Box::pin(async move {
+			async move {
 				let res = validate_transaction_blocking(&*client, &at, source, uxt);
 				if let Err(e) = tx.send(res) {
 					log::warn!("Unable to send a validate transaction result: {:?}", e);
diff --git a/client/transaction-pool/src/lib.rs b/client/transaction-pool/src/lib.rs
index bcabc5b87399..bc5f6e367ff8 100644
--- a/client/transaction-pool/src/lib.rs
+++ b/client/transaction-pool/src/lib.rs
@@ -366,10 +366,10 @@ where
 		options: sc_transaction_graph::Options,
 		is_validator: txpool::IsValidator,
 		prometheus: Option<&PrometheusRegistry>,
-		spawner: impl SpawnNamed + Clone + 'static,
+		spawner: impl SpawnNamed,
 		client: Arc<Client>,
 	) -> Arc<Self> {
-		let pool_api = Arc::new(FullChainApi::new(client.clone(), prometheus, spawner.clone()));
+		let pool_api = Arc::new(FullChainApi::new(client.clone(), prometheus));
 		let pool = Arc::new(Self::with_revalidation_type(
 			options, is_validator, pool_api, prometheus, RevalidationType::Full, spawner
 		));
diff --git a/client/transaction-pool/src/testing/pool.rs b/client/transaction-pool/src/testing/pool.rs
index 1a76c28a0e0d..904870ae0ece 100644
--- a/client/transaction-pool/src/testing/pool.rs
+++ b/client/transaction-pool/src/testing/pool.rs
@@ -35,7 +35,6 @@ use std::collections::BTreeSet;
 use sc_client_api::client::BlockchainEvents;
 use sc_block_builder::BlockBuilderProvider;
 use sp_consensus::BlockOrigin;
-use sp_core::testing::TaskExecutor;
 
 fn pool() -> Pool<TestApi> {
 	Pool::new(Default::default(), true.into(), TestApi::with_alice_nonce(209).into())
@@ -936,7 +935,7 @@ fn should_not_accept_old_signatures() {
 	let client = Arc::new(substrate_test_runtime_client::new());
 
 	let pool = Arc::new(
-		BasicPool::new_test(Arc::new(FullChainApi::new(client, None, TaskExecutor::new()))).0
+		BasicPool::new_test(Arc::new(FullChainApi::new(client, None))).0
 	);
 
 	let transfer = Transfer {
@@ -972,7 +971,7 @@ fn import_notification_to_pool_maintain_works() {
 	let mut client = Arc::new(substrate_test_runtime_client::new());
 
 	let pool = Arc::new(
-		BasicPool::new_test(Arc::new(FullChainApi::new(client.clone(), None, TaskExecutor::new()))).0
+		BasicPool::new_test(Arc::new(FullChainApi::new(client.clone(), None))).0
 	);
 
 	// Prepare the extrisic, push it to the pool and check that it was added.

From d8b3fce28513169d8ee1315dd9a4cd92d95753cc Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Tue, 1 Jun 2021 17:03:13 +0100
Subject: [PATCH 0819/1194] Uniques: An economically-secure basic-featured NFT
 pallet (#8813)

* Uniques: An economically-secure basic-featured NFT pallet

* force_transfer

* freeze/thaw

* team management

* approvals

* Fixes

* force_asset_status

* class_metadata

* instance metadata

* Fixes

* use nmap

* Fixes

* class metadata has information field

* Intiial mock/tests and a fix

* Remove impl_non_fungibles

* Docs

* Update frame/uniques/src/lib.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Update frame/uniques/src/lib.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Update frame/uniques/src/lib.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Update frame/uniques/src/lib.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Reserve, don't transfer.

* Fixes

* Tests

* Tests

* refresh_deposit

* Tests and proper handling of metdata destruction

* test burn

* Tests

* Update impl_fungibles.rs

* Initial benchmarking

* benchmark

* Fixes

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_uniques --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/uniques/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Attributes

* Attribute metadata

* Fixes

* Update frame/uniques/README.md

* Docs

* Docs

* Docs

* Simple metadata

* Use BoundedVec

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_uniques --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/uniques/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Update frame/uniques/src/lib.rs

Co-authored-by: Lohann Paterno Coutinho Ferreira <developer@lohann.dev>

* Update frame/uniques/src/lib.rs

Co-authored-by: Lohann Paterno Coutinho Ferreira <developer@lohann.dev>

* Update frame/uniques/src/lib.rs

Co-authored-by: Lohann Paterno Coutinho Ferreira <developer@lohann.dev>

* Update frame/uniques/src/lib.rs

Co-authored-by: Lohann Paterno Coutinho Ferreira <developer@lohann.dev>

* Update frame/uniques/src/lib.rs

Co-authored-by: Lohann Paterno Coutinho Ferreira <developer@lohann.dev>

* Fixes

* Update frame/uniques/README.md

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

* Update frame/uniques/README.md

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

* Update frame/uniques/README.md

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

* Docs

* Bump

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Parity Bot <admin@parity.io>
Co-authored-by: Lohann Paterno Coutinho Ferreira <developer@lohann.dev>
Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>
---
 Cargo.lock                               |   16 +
 Cargo.toml                               |    1 +
 bin/node/runtime/Cargo.toml              |    4 +
 bin/node/runtime/src/lib.rs              |   28 +-
 frame/assets/src/impl_fungibles.rs       |    8 +-
 frame/assets/src/lib.rs                  |   16 +-
 frame/support/src/storage/bounded_vec.rs |    6 +
 frame/support/src/storage/types/nmap.rs  |    2 +-
 frame/uniques/Cargo.toml                 |   46 +
 frame/uniques/README.md                  |   78 ++
 frame/uniques/src/benchmarking.rs        |  376 +++++++
 frame/uniques/src/lib.rs                 | 1289 ++++++++++++++++++++++
 frame/uniques/src/mock.rs                |  119 ++
 frame/uniques/src/tests.rs               |  527 +++++++++
 frame/uniques/src/types.rs               |  118 ++
 frame/uniques/src/weights.rs             |  326 ++++++
 primitives/arithmetic/src/traits.rs      |   28 +
 17 files changed, 2973 insertions(+), 15 deletions(-)
 create mode 100644 frame/uniques/Cargo.toml
 create mode 100644 frame/uniques/README.md
 create mode 100644 frame/uniques/src/benchmarking.rs
 create mode 100644 frame/uniques/src/lib.rs
 create mode 100644 frame/uniques/src/mock.rs
 create mode 100644 frame/uniques/src/tests.rs
 create mode 100644 frame/uniques/src/types.rs
 create mode 100644 frame/uniques/src/weights.rs

diff --git a/Cargo.lock b/Cargo.lock
index fca6465198aa..c8a7299835a0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4378,6 +4378,7 @@ dependencies = [
  "pallet-transaction-payment",
  "pallet-transaction-payment-rpc-runtime-api",
  "pallet-treasury",
+ "pallet-uniques",
  "pallet-utility",
  "pallet-vesting",
  "parity-scale-codec",
@@ -5619,6 +5620,21 @@ dependencies = [
  "sp-storage",
 ]
 
+[[package]]
+name = "pallet-uniques"
+version = "3.0.0"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "pallet-balances",
+ "parity-scale-codec",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
 [[package]]
 name = "pallet-utility"
 version = "3.0.0"
diff --git a/Cargo.toml b/Cargo.toml
index 5bd83b70f4c2..8b613c021a9f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -125,6 +125,7 @@ members = [
 	"frame/transaction-payment/rpc/runtime-api",
 	"frame/treasury",
 	"frame/tips",
+	"frame/uniques",
 	"frame/utility",
 	"frame/vesting",
 	"primitives/allocator",
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index 335d9a1aa2a9..ca1ed7f3dcc0 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -85,6 +85,7 @@ pallet-treasury = { version = "3.0.0", default-features = false, path = "../../.
 pallet-utility = { version = "3.0.0", default-features = false, path = "../../../frame/utility" }
 pallet-transaction-payment = { version = "3.0.0", default-features = false, path = "../../../frame/transaction-payment" }
 pallet-transaction-payment-rpc-runtime-api = { version = "3.0.0", default-features = false, path = "../../../frame/transaction-payment/rpc/runtime-api/" }
+pallet-uniques = { version = "3.0.0", default-features = false, path = "../../../frame/uniques" }
 pallet-vesting = { version = "3.0.0", default-features = false, path = "../../../frame/vesting" }
 
 max-encoded-len = { version = "3.0.0", default-features = false, path = "../../../max-encoded-len", features = [ "derive" ] }
@@ -157,6 +158,7 @@ std = [
 	"sp-version/std",
 	"pallet-society/std",
 	"pallet-recovery/std",
+	"pallet-uniques/std",
 	"pallet-vesting/std",
 	"log/std",
 	"frame-try-runtime/std",
@@ -194,6 +196,7 @@ runtime-benchmarks = [
 	"pallet-tips/runtime-benchmarks",
 	"pallet-treasury/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
+	"pallet-uniques/runtime-benchmarks",
 	"pallet-vesting/runtime-benchmarks",
 	"pallet-offences-benchmarking",
 	"pallet-session-benchmarking",
@@ -237,6 +240,7 @@ try-runtime = [
 	"pallet-utility/try-runtime",
 	"pallet-society/try-runtime",
 	"pallet-recovery/try-runtime",
+	"pallet-uniques/try-runtime",
 	"pallet-vesting/try-runtime",
 	"pallet-gilt/try-runtime",
 ]
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index c51799d11a94..f92ca963bb62 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -114,7 +114,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	// and set impl_version to 0. If only runtime
 	// implementation changes and behavior does not, then leave spec_version as
 	// is and increment impl_version.
-	spec_version: 266,
+	spec_version: 267,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 2,
@@ -1090,6 +1090,30 @@ impl pallet_gilt::Config for Runtime {
 	type WeightInfo = pallet_gilt::weights::SubstrateWeight<Runtime>;
 }
 
+parameter_types! {
+	pub const ClassDeposit: Balance = 100 * DOLLARS;
+	pub const InstanceDeposit: Balance = 1 * DOLLARS;
+	pub const KeyLimit: u32 = 32;
+	pub const ValueLimit: u32 = 256;
+}
+
+impl pallet_uniques::Config for Runtime {
+	type Event = Event;
+	type ClassId = u32;
+	type InstanceId = u32;
+	type Currency = Balances;
+	type ForceOrigin = frame_system::EnsureRoot<AccountId>;
+	type ClassDeposit = ClassDeposit;
+	type InstanceDeposit = InstanceDeposit;
+	type MetadataDepositBase = MetadataDepositBase;
+	type AttributeDepositBase = MetadataDepositBase;
+	type DepositPerByte = MetadataDepositPerByte;
+	type StringLimit = StringLimit;
+	type KeyLimit = KeyLimit;
+	type ValueLimit = ValueLimit;
+	type WeightInfo = pallet_uniques::weights::SubstrateWeight<Runtime>;
+}
+
 construct_runtime!(
 	pub enum Runtime where
 		Block = Block,
@@ -1134,6 +1158,7 @@ construct_runtime!(
 		Mmr: pallet_mmr::{Pallet, Storage},
 		Lottery: pallet_lottery::{Pallet, Call, Storage, Event<T>},
 		Gilt: pallet_gilt::{Pallet, Call, Storage, Event<T>, Config},
+		Uniques: pallet_uniques::{Pallet, Call, Storage, Event<T>},
 	}
 );
 
@@ -1508,6 +1533,7 @@ impl_runtime_apis! {
 			add_benchmark!(params, batches, pallet_timestamp, Timestamp);
 			add_benchmark!(params, batches, pallet_tips, Tips);
 			add_benchmark!(params, batches, pallet_treasury, Treasury);
+			add_benchmark!(params, batches, pallet_uniques, Uniques);
 			add_benchmark!(params, batches, pallet_utility, Utility);
 			add_benchmark!(params, batches, pallet_vesting, Vesting);
 
diff --git a/frame/assets/src/impl_fungibles.rs b/frame/assets/src/impl_fungibles.rs
index d0ab13072a88..71951bae1116 100644
--- a/frame/assets/src/impl_fungibles.rs
+++ b/frame/assets/src/impl_fungibles.rs
@@ -127,26 +127,26 @@ impl<T: Config<I>, I: 'static> fungibles::Unbalanced<T::AccountId> for Pallet<T,
 		});
 	}
 	fn decrease_balance(asset: T::AssetId, who: &T::AccountId, amount: Self::Balance)
-						-> Result<Self::Balance, DispatchError>
+		-> Result<Self::Balance, DispatchError>
 	{
 		let f = DebitFlags { keep_alive: false, best_effort: false };
 		Self::decrease_balance(asset, who, amount, f, |_, _| Ok(()))
 	}
 	fn decrease_balance_at_most(asset: T::AssetId, who: &T::AccountId, amount: Self::Balance)
-								-> Self::Balance
+		-> Self::Balance
 	{
 		let f = DebitFlags { keep_alive: false, best_effort: true };
 		Self::decrease_balance(asset, who, amount, f, |_, _| Ok(()))
 			.unwrap_or(Zero::zero())
 	}
 	fn increase_balance(asset: T::AssetId, who: &T::AccountId, amount: Self::Balance)
-						-> Result<Self::Balance, DispatchError>
+		-> Result<Self::Balance, DispatchError>
 	{
 		Self::increase_balance(asset, who, amount, |_| Ok(()))?;
 		Ok(amount)
 	}
 	fn increase_balance_at_most(asset: T::AssetId, who: &T::AccountId, amount: Self::Balance)
-								-> Self::Balance
+		-> Self::Balance
 	{
 		match Self::increase_balance(asset, who, amount, |_| Ok(())) {
 			Ok(()) => amount,
diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index e81fca20db81..333dbad83646 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -417,8 +417,6 @@ pub mod pallet {
 		/// - `owner`: The owner of this class of assets. The owner has full superuser permissions
 		/// over this asset, but may later change and configure the permissions using `transfer_ownership`
 		/// and `set_team`.
-		/// - `max_zombies`: The total number of accounts which may hold assets in this class yet
-		/// have no existential deposit.
 		/// - `min_balance`: The minimum balance of this new asset that any single account must
 		/// have. If an account's balance is reduced below this, then it collapses to zero.
 		///
@@ -588,8 +586,8 @@ pub mod pallet {
 		/// to zero.
 		///
 		/// Weight: `O(1)`
-		/// Modes: Pre-existence of `target`; Post-existence of sender; Prior & post zombie-status
-		/// of sender; Account pre-existence of `target`.
+		/// Modes: Pre-existence of `target`; Post-existence of sender; Account pre-existence of
+		/// `target`.
 		#[pallet::weight(T::WeightInfo::transfer())]
 		pub(super) fn transfer(
 			origin: OriginFor<T>,
@@ -624,8 +622,8 @@ pub mod pallet {
 		/// to zero.
 		///
 		/// Weight: `O(1)`
-		/// Modes: Pre-existence of `target`; Post-existence of sender; Prior & post zombie-status
-		/// of sender; Account pre-existence of `target`.
+		/// Modes: Pre-existence of `target`; Post-existence of sender; Account pre-existence of
+		/// `target`.
 		#[pallet::weight(T::WeightInfo::transfer_keep_alive())]
 		pub(super) fn transfer_keep_alive(
 			origin: OriginFor<T>,
@@ -661,8 +659,8 @@ pub mod pallet {
 		/// to zero.
 		///
 		/// Weight: `O(1)`
-		/// Modes: Pre-existence of `dest`; Post-existence of `source`; Prior & post zombie-status
-		/// of `source`; Account pre-existence of `dest`.
+		/// Modes: Pre-existence of `dest`; Post-existence of `source`; Account pre-existence of
+		/// `dest`.
 		#[pallet::weight(T::WeightInfo::force_transfer())]
 		pub(super) fn force_transfer(
 			origin: OriginFor<T>,
@@ -779,7 +777,7 @@ pub mod pallet {
 		///
 		/// Origin must be Signed and the sender should be the Admin of the asset `id`.
 		///
-		/// - `id`: The identifier of the asset to be frozen.
+		/// - `id`: The identifier of the asset to be thawed.
 		///
 		/// Emits `Thawed`.
 		///
diff --git a/frame/support/src/storage/bounded_vec.rs b/frame/support/src/storage/bounded_vec.rs
index a4e8c50918a0..fe58b5cd476a 100644
--- a/frame/support/src/storage/bounded_vec.rs
+++ b/frame/support/src/storage/bounded_vec.rs
@@ -94,6 +94,12 @@ impl<T, S> BoundedVec<T, S> {
 	}
 }
 
+impl<T, S: Get<u32>> From<BoundedVec<T, S>> for Vec<T> {
+	fn from(x: BoundedVec<T, S>) -> Vec<T> {
+		x.0
+	}
+}
+
 impl<T, S: Get<u32>> BoundedVec<T, S> {
 	/// Get the bound of the type in `usize`.
 	pub fn bound() -> usize {
diff --git a/frame/support/src/storage/types/nmap.rs b/frame/support/src/storage/types/nmap.rs
index f018ccc38b4f..e1f5feb956ef 100755
--- a/frame/support/src/storage/types/nmap.rs
+++ b/frame/support/src/storage/types/nmap.rs
@@ -272,7 +272,7 @@ where
 
 	/// Iter over all value of the storage.
 	///
-	/// NOTE: If a value failed to decode becaues storage is corrupted then it is skipped.
+	/// NOTE: If a value failed to decode because storage is corrupted then it is skipped.
 	pub fn iter_values() -> crate::storage::PrefixIterator<Value> {
 		<Self as crate::storage::StoragePrefixedMap<Value>>::iter_values()
 	}
diff --git a/frame/uniques/Cargo.toml b/frame/uniques/Cargo.toml
new file mode 100644
index 000000000000..f007744dc64a
--- /dev/null
+++ b/frame/uniques/Cargo.toml
@@ -0,0 +1,46 @@
+[package]
+name = "pallet-uniques"
+version = "3.0.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
+license = "Apache-2.0"
+homepage = "https://substrate.dev"
+repository = "https://github.com/paritytech/substrate/"
+description = "FRAME NFT asset management pallet"
+readme = "README.md"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
+
+[dev-dependencies]
+sp-std = { version = "3.0.0", path = "../../primitives/std" }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-io = { version = "3.0.0", path = "../../primitives/io" }
+pallet-balances = { version = "3.0.0", path = "../balances" }
+
+[features]
+default = ["std"]
+std = [
+	"codec/std",
+	"sp-std/std",
+	"sp-core/std",
+	"sp-runtime/std",
+	"frame-support/std",
+	"frame-system/std",
+	"frame-benchmarking/std",
+]
+runtime-benchmarks = [
+	"frame-benchmarking",
+	"sp-runtime/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+]
+try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/uniques/README.md b/frame/uniques/README.md
new file mode 100644
index 000000000000..b924e338452f
--- /dev/null
+++ b/frame/uniques/README.md
@@ -0,0 +1,78 @@
+# Uniques Module
+
+A simple, secure module for dealing with non-fungible assets.
+
+## Overview
+
+The Uniques module provides functionality for asset management of non-fungible asset classes, including:
+
+* Asset Issuance
+* Asset Transfer
+* Asset Destruction
+
+To use it in your runtime, you need to implement the assets [`uniques::Config`](https://docs.rs/pallet-uniques/latest/pallet_uniques/pallet/trait.Config.html).
+
+The supported dispatchable functions are documented in the [`uniques::Call`](https://docs.rs/pallet-uniques/latest/pallet_uniques/pallet/enum.Call.html) enum.
+
+### Terminology
+
+* **Asset issuance:** The creation of a new asset instance.
+* **Asset transfer:** The action of transferring an asset instance from one account to another.
+* **Asset burning:** The destruction of an asset instance.
+* **Non-fungible asset:** An asset for which each unit has unique characteristics. There is exactly
+  one instance of such an asset in existance and there is exactly one owning account.
+
+### Goals
+
+The Uniques pallet in Substrate is designed to make the following possible:
+
+* Allow accounts to permissionlessly create asset classes (collections of asset instances).
+* Allow a named (permissioned) account to mint and burn unique assets within a class.
+* Move asset instances between accounts permissionlessly.
+* Allow a named (permissioned) account to freeze and unfreeze unique assets within a
+  class or the entire class.
+* Allow the owner of an asset instance to delegate the ability to transfer the asset to some
+  named third-party.
+
+## Interface
+
+### Permissionless dispatchables
+* `create`: Create a new asset class by placing a deposit.
+* `transfer`: Transfer an asset instance to a new owner.
+* `redeposit`: Update the deposit amount of an asset instance, potentially freeing funds.
+* `approve_transfer`: Name a delegate who may authorise a transfer.
+* `cancel_approval`: Revert the effects of a previous `approve_transfer`.
+
+### Permissioned dispatchables
+* `destroy`: Destroy an asset class.
+* `mint`: Mint a new asset instance within an asset class.
+* `burn`: Burn an asset instance within an asset class.
+* `freeze`: Prevent an individual asset from being transferred.
+* `thaw`: Revert the effects of a previous `freeze`.
+* `freeze_class`: Prevent all asset within a class from being transferred.
+* `thaw_class`: Revert the effects of a previous `freeze_class`.
+* `transfer_ownership`: Alter the owner of an asset class, moving all associated deposits.
+* `set_team`: Alter the permissioned accounts of an asset class.
+
+### Metadata (permissioned) dispatchables
+* `set_attribute`: Set a metadata attribute of an asset instance or class.
+* `clear_attribute`: Remove a metadata attribute of an asset instance or class.
+* `set_metadata`: Set general metadata of an asset instance.
+* `clear_metadata`: Remove general metadata of an asset instance.
+* `set_class_metadata`: Set general metadata of an asset class.
+* `clear_class_metadata`: Remove general metadata of an asset class.
+
+### Force (i.e. governance) dispatchables
+* `force_create`: Create a new asset class.
+* `force_asset_status`: Alter the underlying characteristics of an asset class.
+
+Please refer to the [`Call`](https://docs.rs/pallet-assets/latest/pallet_assets/enum.Call.html) enum
+and its associated variants for documentation on each function.
+
+## Related Modules
+
+* [`System`](https://docs.rs/frame-system/latest/frame_system/)
+* [`Support`](https://docs.rs/frame-support/latest/frame_support/)
+* [`Assets`](https://docs.rs/pallet-assets/latest/pallet_assetss/)
+
+License: Apache-2.0
diff --git a/frame/uniques/src/benchmarking.rs b/frame/uniques/src/benchmarking.rs
new file mode 100644
index 000000000000..ca6d656bd500
--- /dev/null
+++ b/frame/uniques/src/benchmarking.rs
@@ -0,0 +1,376 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Assets pallet benchmarking.
+
+#![cfg(feature = "runtime-benchmarks")]
+
+use sp_std::{prelude::*, convert::TryInto};
+use super::*;
+use sp_runtime::traits::Bounded;
+use frame_system::RawOrigin as SystemOrigin;
+use frame_benchmarking::{
+	benchmarks_instance_pallet, account, whitelisted_caller, whitelist_account, impl_benchmark_test_suite
+};
+use frame_support::{traits::{Get, EnsureOrigin}, dispatch::UnfilteredDispatchable, BoundedVec};
+
+use crate::Pallet as Uniques;
+
+const SEED: u32 = 0;
+
+fn create_class<T: Config<I>, I: 'static>()
+	-> (T::ClassId, T::AccountId, <T::Lookup as StaticLookup>::Source)
+{
+	let caller: T::AccountId = whitelisted_caller();
+	let caller_lookup = T::Lookup::unlookup(caller.clone());
+	let class = Default::default();
+	T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T, I>::max_value());
+	assert!(Uniques::<T, I>::create(
+		SystemOrigin::Signed(caller.clone()).into(),
+		class,
+		caller_lookup.clone(),
+	).is_ok());
+	(class, caller, caller_lookup)
+}
+
+fn add_class_metadata<T: Config<I>, I: 'static>()
+	-> (T::AccountId, <T::Lookup as StaticLookup>::Source)
+{
+	let caller = Class::<T, I>::get(T::ClassId::default()).unwrap().owner;
+	if caller != whitelisted_caller() {
+		whitelist_account!(caller);
+	}
+	let caller_lookup = T::Lookup::unlookup(caller.clone());
+	assert!(Uniques::<T, I>::set_class_metadata(
+		SystemOrigin::Signed(caller.clone()).into(),
+		Default::default(),
+		vec![0; T::StringLimit::get() as usize].try_into().unwrap(),
+		false,
+	).is_ok());
+	(caller, caller_lookup)
+}
+
+fn mint_instance<T: Config<I>, I: 'static>(index: u16)
+	-> (T::InstanceId, T::AccountId, <T::Lookup as StaticLookup>::Source)
+{
+	let caller = Class::<T, I>::get(T::ClassId::default()).unwrap().admin;
+	if caller != whitelisted_caller() {
+		whitelist_account!(caller);
+	}
+	let caller_lookup = T::Lookup::unlookup(caller.clone());
+	let instance = index.into();
+	assert!(Uniques::<T, I>::mint(
+		SystemOrigin::Signed(caller.clone()).into(),
+		Default::default(),
+		instance,
+		caller_lookup.clone(),
+	).is_ok());
+	(instance, caller, caller_lookup)
+}
+
+fn add_instance_metadata<T: Config<I>, I: 'static>(instance: T::InstanceId)
+	-> (T::AccountId, <T::Lookup as StaticLookup>::Source)
+{
+	let caller = Class::<T, I>::get(T::ClassId::default()).unwrap().owner;
+	if caller != whitelisted_caller() {
+		whitelist_account!(caller);
+	}
+	let caller_lookup = T::Lookup::unlookup(caller.clone());
+	assert!(Uniques::<T, I>::set_metadata(
+		SystemOrigin::Signed(caller.clone()).into(),
+		Default::default(),
+		instance,
+		vec![0; T::StringLimit::get() as usize].try_into().unwrap(),
+		false,
+	).is_ok());
+	(caller, caller_lookup)
+}
+
+fn add_instance_attribute<T: Config<I>, I: 'static>(instance: T::InstanceId)
+	-> (BoundedVec<u8, T::KeyLimit>, T::AccountId, <T::Lookup as StaticLookup>::Source)
+{
+	let caller = Class::<T, I>::get(T::ClassId::default()).unwrap().owner;
+	if caller != whitelisted_caller() {
+		whitelist_account!(caller);
+	}
+	let caller_lookup = T::Lookup::unlookup(caller.clone());
+	let key: BoundedVec<_, _> = vec![0; T::KeyLimit::get() as usize].try_into().unwrap();
+	assert!(Uniques::<T, I>::set_attribute(
+		SystemOrigin::Signed(caller.clone()).into(),
+		Default::default(),
+		Some(instance),
+		key.clone(),
+		vec![0; T::ValueLimit::get() as usize].try_into().unwrap(),
+	).is_ok());
+	(key, caller, caller_lookup)
+}
+
+fn assert_last_event<T: Config<I>, I: 'static>(generic_event: <T as Config<I>>::Event) {
+	let events = frame_system::Pallet::<T>::events();
+	let system_event: <T as frame_system::Config>::Event = generic_event.into();
+	// compare to the last event record
+	let frame_system::EventRecord { event, .. } = &events[events.len() - 1];
+	assert_eq!(event, &system_event);
+}
+
+benchmarks_instance_pallet! {
+	create {
+		let caller: T::AccountId = whitelisted_caller();
+		let caller_lookup = T::Lookup::unlookup(caller.clone());
+		T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T, I>::max_value());
+	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup)
+	verify {
+		assert_last_event::<T, I>(Event::Created(Default::default(), caller.clone(), caller).into());
+	}
+
+	force_create {
+		let caller: T::AccountId = whitelisted_caller();
+		let caller_lookup = T::Lookup::unlookup(caller.clone());
+	}: _(SystemOrigin::Root, Default::default(), caller_lookup, true)
+	verify {
+		assert_last_event::<T, I>(Event::ForceCreated(Default::default(), caller).into());
+	}
+
+	destroy {
+		let n in 0 .. 1_000;
+		let m in 0 .. 1_000;
+		let a in 0 .. 1_000;
+
+		let (class, caller, caller_lookup) = create_class::<T, I>();
+		add_class_metadata::<T, I>();
+		for i in 0..n {
+			mint_instance::<T, I>(i as u16);
+		}
+		for i in 0..m {
+			add_instance_metadata::<T, I>((i as u16).into());
+		}
+		for i in 0..a {
+			add_instance_attribute::<T, I>((i as u16).into());
+		}
+		let witness = Class::<T, I>::get(class).unwrap().destroy_witness();
+	}: _(SystemOrigin::Signed(caller), class, witness)
+	verify {
+		assert_last_event::<T, I>(Event::Destroyed(class).into());
+	}
+
+	mint {
+		let (class, caller, caller_lookup) = create_class::<T, I>();
+		let instance = Default::default();
+	}: _(SystemOrigin::Signed(caller.clone()), class, instance, caller_lookup)
+	verify {
+		assert_last_event::<T, I>(Event::Issued(class, instance, caller).into());
+	}
+
+	burn {
+		let (class, caller, caller_lookup) = create_class::<T, I>();
+		let (instance, ..) = mint_instance::<T, I>(0);
+	}: _(SystemOrigin::Signed(caller.clone()), class, instance, Some(caller_lookup))
+	verify {
+		assert_last_event::<T, I>(Event::Burned(class, instance, caller).into());
+	}
+
+	transfer {
+		let (class, caller, caller_lookup) = create_class::<T, I>();
+		let (instance, ..) = mint_instance::<T, I>(Default::default());
+
+		let target: T::AccountId = account("target", 0, SEED);
+		let target_lookup = T::Lookup::unlookup(target.clone());
+	}: _(SystemOrigin::Signed(caller.clone()), class, instance, target_lookup)
+	verify {
+		assert_last_event::<T, I>(Event::Transferred(class, instance, caller, target).into());
+	}
+
+	redeposit {
+		let i in 0 .. 5_000;
+		let (class, caller, caller_lookup) = create_class::<T, I>();
+		let instances = (0..i).map(|x| mint_instance::<T, I>(x as u16).0).collect::<Vec<_>>();
+		Uniques::<T, I>::force_asset_status(
+			SystemOrigin::Root.into(),
+			class,
+			caller_lookup.clone(),
+			caller_lookup.clone(),
+			caller_lookup.clone(),
+			caller_lookup.clone(),
+			true,
+			false,
+		)?;
+	}: _(SystemOrigin::Signed(caller.clone()), class, instances.clone())
+	verify {
+		assert_last_event::<T, I>(Event::Redeposited(class, instances).into());
+	}
+
+	freeze {
+		let (class, caller, caller_lookup) = create_class::<T, I>();
+		let (instance, ..) = mint_instance::<T, I>(Default::default());
+	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), Default::default())
+	verify {
+		assert_last_event::<T, I>(Event::Frozen(Default::default(), Default::default()).into());
+	}
+
+	thaw {
+		let (class, caller, caller_lookup) = create_class::<T, I>();
+		let (instance, ..) = mint_instance::<T, I>(Default::default());
+		Uniques::<T, I>::freeze(
+			SystemOrigin::Signed(caller.clone()).into(),
+			class,
+			instance,
+		)?;
+	}: _(SystemOrigin::Signed(caller.clone()), class, instance)
+	verify {
+		assert_last_event::<T, I>(Event::Thawed(class, instance).into());
+	}
+
+	freeze_class {
+		let (class, caller, caller_lookup) = create_class::<T, I>();
+	}: _(SystemOrigin::Signed(caller.clone()), class)
+	verify {
+		assert_last_event::<T, I>(Event::ClassFrozen(class).into());
+	}
+
+	thaw_class {
+		let (class, caller, caller_lookup) = create_class::<T, I>();
+		let origin = SystemOrigin::Signed(caller.clone()).into();
+		Uniques::<T, I>::freeze_class(origin, class)?;
+	}: _(SystemOrigin::Signed(caller.clone()), class)
+	verify {
+		assert_last_event::<T, I>(Event::ClassThawed(class).into());
+	}
+
+	transfer_ownership {
+		let (class, caller, _) = create_class::<T, I>();
+		let target: T::AccountId = account("target", 0, SEED);
+		let target_lookup = T::Lookup::unlookup(target.clone());
+		T::Currency::make_free_balance_be(&target, T::Currency::minimum_balance());
+	}: _(SystemOrigin::Signed(caller), class, target_lookup)
+	verify {
+		assert_last_event::<T, I>(Event::OwnerChanged(class, target).into());
+	}
+
+	set_team {
+		let (class, caller, _) = create_class::<T, I>();
+		let target0 = T::Lookup::unlookup(account("target", 0, SEED));
+		let target1 = T::Lookup::unlookup(account("target", 1, SEED));
+		let target2 = T::Lookup::unlookup(account("target", 2, SEED));
+	}: _(SystemOrigin::Signed(caller), Default::default(), target0.clone(), target1.clone(), target2.clone())
+	verify {
+		assert_last_event::<T, I>(Event::TeamChanged(
+			class,
+			account("target", 0, SEED),
+			account("target", 1, SEED),
+			account("target", 2, SEED),
+		).into());
+	}
+
+	force_asset_status {
+		let (class, caller, caller_lookup) = create_class::<T, I>();
+		let origin = T::ForceOrigin::successful_origin();
+		let call = Call::<T, I>::force_asset_status(
+			class,
+			caller_lookup.clone(),
+			caller_lookup.clone(),
+			caller_lookup.clone(),
+			caller_lookup.clone(),
+			true,
+			false,
+		);
+	}: { call.dispatch_bypass_filter(origin)? }
+	verify {
+		assert_last_event::<T, I>(Event::AssetStatusChanged(class).into());
+	}
+
+	set_attribute {
+		let key: BoundedVec<_, _> = vec![0u8; T::KeyLimit::get() as usize].try_into().unwrap();
+		let value: BoundedVec<_, _> = vec![0u8; T::ValueLimit::get() as usize].try_into().unwrap();
+
+		let (class, caller, _) = create_class::<T, I>();
+		let (instance, ..) = mint_instance::<T, I>(0);
+		add_instance_metadata::<T, I>(instance);
+	}: _(SystemOrigin::Signed(caller), class, Some(instance), key.clone(), value.clone())
+	verify {
+		assert_last_event::<T, I>(Event::AttributeSet(class, Some(instance), key, value).into());
+	}
+
+	clear_attribute {
+		let (class, caller, _) = create_class::<T, I>();
+		let (instance, ..) = mint_instance::<T, I>(0);
+		add_instance_metadata::<T, I>(instance);
+		let (key, ..) = add_instance_attribute::<T, I>(instance);
+	}: _(SystemOrigin::Signed(caller), class, Some(instance), key.clone())
+	verify {
+		assert_last_event::<T, I>(Event::AttributeCleared(class, Some(instance), key).into());
+	}
+
+	set_metadata {
+		let data: BoundedVec<_, _> = vec![0u8; T::StringLimit::get() as usize].try_into().unwrap();
+
+		let (class, caller, _) = create_class::<T, I>();
+		let (instance, ..) = mint_instance::<T, I>(0);
+	}: _(SystemOrigin::Signed(caller), class, instance, data.clone(), false)
+	verify {
+		assert_last_event::<T, I>(Event::MetadataSet(class, instance, data, false).into());
+	}
+
+	clear_metadata {
+		let (class, caller, _) = create_class::<T, I>();
+		let (instance, ..) = mint_instance::<T, I>(0);
+		add_instance_metadata::<T, I>(instance);
+	}: _(SystemOrigin::Signed(caller), class, instance)
+	verify {
+		assert_last_event::<T, I>(Event::MetadataCleared(class, instance).into());
+	}
+
+	set_class_metadata {
+		let data: BoundedVec<_, _> = vec![0u8; T::StringLimit::get() as usize].try_into().unwrap();
+
+		let (class, caller, _) = create_class::<T, I>();
+	}: _(SystemOrigin::Signed(caller), class, data.clone(), false)
+	verify {
+		assert_last_event::<T, I>(Event::ClassMetadataSet(class, data, false).into());
+	}
+
+	clear_class_metadata {
+		let (class, caller, _) = create_class::<T, I>();
+		add_class_metadata::<T, I>();
+	}: _(SystemOrigin::Signed(caller), class)
+	verify {
+		assert_last_event::<T, I>(Event::ClassMetadataCleared(class).into());
+	}
+
+	approve_transfer {
+		let (class, caller, _) = create_class::<T, I>();
+		let (instance, ..) = mint_instance::<T, I>(0);
+		let delegate: T::AccountId = account("delegate", 0, SEED);
+		let delegate_lookup = T::Lookup::unlookup(delegate.clone());
+	}: _(SystemOrigin::Signed(caller.clone()), class, instance, delegate_lookup)
+	verify {
+		assert_last_event::<T, I>(Event::ApprovedTransfer(class, instance, caller, delegate).into());
+	}
+
+	cancel_approval {
+		let (class, caller, _) = create_class::<T, I>();
+		let (instance, ..) = mint_instance::<T, I>(0);
+		let delegate: T::AccountId = account("delegate", 0, SEED);
+		let delegate_lookup = T::Lookup::unlookup(delegate.clone());
+		let origin = SystemOrigin::Signed(caller.clone()).into();
+		Uniques::<T, I>::approve_transfer(origin, class, instance, delegate_lookup.clone())?;
+	}: _(SystemOrigin::Signed(caller.clone()), class, instance, Some(delegate_lookup))
+	verify {
+		assert_last_event::<T, I>(Event::ApprovalCancelled(class, instance, caller, delegate).into());
+	}
+}
+
+impl_benchmark_test_suite!(Uniques, crate::mock::new_test_ext(), crate::mock::Test);
diff --git a/frame/uniques/src/lib.rs b/frame/uniques/src/lib.rs
new file mode 100644
index 000000000000..21142a3a92ce
--- /dev/null
+++ b/frame/uniques/src/lib.rs
@@ -0,0 +1,1289 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! # Unique (Assets) Module
+//!
+//! A simple, secure module for dealing with non-fungible assets.
+//!
+//! ## Related Modules
+//!
+//! * [`System`](../frame_system/index.html)
+//! * [`Support`](../frame_support/index.html)
+
+// Ensure we're `no_std` when compiling for Wasm.
+#![cfg_attr(not(feature = "std"), no_std)]
+
+pub mod weights;
+#[cfg(feature = "runtime-benchmarks")]
+mod benchmarking;
+#[cfg(test)]
+pub mod mock;
+#[cfg(test)]
+mod tests;
+
+mod types;
+pub use types::*;
+
+use sp_std::prelude::*;
+use sp_runtime::{RuntimeDebug, ArithmeticError, traits::{Zero, StaticLookup, Saturating}};
+use codec::{Encode, Decode, HasCompact};
+use frame_support::traits::{Currency, ReservableCurrency, BalanceStatus::Reserved};
+use frame_system::Config as SystemConfig;
+
+pub use weights::WeightInfo;
+pub use pallet::*;
+
+#[frame_support::pallet]
+pub mod pallet {
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+	use super::*;
+
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T, I = ()>(_);
+
+	#[pallet::config]
+	/// The module configuration trait.
+	pub trait Config<I: 'static = ()>: frame_system::Config {
+		/// The overarching event type.
+		type Event: From<Event<Self, I>> + IsType<<Self as frame_system::Config>::Event>;
+
+		/// Identifier for the class of asset.
+		type ClassId: Member + Parameter + Default + Copy + HasCompact;
+
+		/// The type used to identify a unique asset within an asset class.
+		type InstanceId: Member + Parameter + Default + Copy + HasCompact + From<u16>;
+
+		/// The currency mechanism, used for paying for reserves.
+		type Currency: ReservableCurrency<Self::AccountId>;
+
+		/// The origin which may forcibly create or destroy an asset or otherwise alter privileged
+		/// attributes.
+		type ForceOrigin: EnsureOrigin<Self::Origin>;
+
+		/// The basic amount of funds that must be reserved for an asset class.
+		type ClassDeposit: Get<DepositBalanceOf<Self, I>>;
+
+		/// The basic amount of funds that must be reserved for an asset instance.
+		type InstanceDeposit: Get<DepositBalanceOf<Self, I>>;
+
+		/// The basic amount of funds that must be reserved when adding metadata to your asset.
+		type MetadataDepositBase: Get<DepositBalanceOf<Self, I>>;
+
+		/// The basic amount of funds that must be reserved when adding an attribute to an asset.
+		type AttributeDepositBase: Get<DepositBalanceOf<Self, I>>;
+
+		/// The additional funds that must be reserved for the number of bytes store in metadata,
+		/// either "normal" metadata or attribute metadata.
+		type DepositPerByte: Get<DepositBalanceOf<Self, I>>;
+
+		/// The maximum length of data stored on-chain.
+		type StringLimit: Get<u32>;
+
+		/// The maximum length of an attribute key.
+		type KeyLimit: Get<u32>;
+
+		/// The maximum length of an attribute value.
+		type ValueLimit: Get<u32>;
+
+		/// Weight information for extrinsics in this pallet.
+		type WeightInfo: WeightInfo;
+	}
+
+	#[pallet::storage]
+	/// Details of an asset class.
+	pub(super) type Class<T: Config<I>, I: 'static = ()> = StorageMap<
+		_,
+		Blake2_128Concat,
+		T::ClassId,
+		ClassDetails<T::AccountId, DepositBalanceOf<T, I>>,
+	>;
+
+	#[pallet::storage]
+	/// The assets held by any given account; set out this way so that assets owned by a single
+	/// account can be enumerated.
+	pub(super) type Account<T: Config<I>, I: 'static = ()> = StorageNMap<
+		_,
+		(
+			NMapKey<Blake2_128Concat, T::AccountId>, // owner
+			NMapKey<Blake2_128Concat, T::ClassId>,
+			NMapKey<Blake2_128Concat, T::InstanceId>,
+		),
+		(),
+		OptionQuery,
+	>;
+
+	#[pallet::storage]
+	/// The assets in existence and their ownership details.
+	pub(super) type Asset<T: Config<I>, I: 'static = ()> = StorageDoubleMap<
+		_,
+		Blake2_128Concat,
+		T::ClassId,
+		Blake2_128Concat,
+		T::InstanceId,
+		InstanceDetails<T::AccountId, DepositBalanceOf<T, I>>,
+		OptionQuery,
+	>;
+
+	#[pallet::storage]
+	/// Metadata of an asset class.
+	pub(super) type ClassMetadataOf<T: Config<I>, I: 'static = ()> = StorageMap<
+		_,
+		Blake2_128Concat,
+		T::ClassId,
+		ClassMetadata<DepositBalanceOf<T, I>, T::StringLimit>,
+		OptionQuery,
+	>;
+
+	#[pallet::storage]
+	/// Metadata of an asset instance.
+	pub(super) type InstanceMetadataOf<T: Config<I>, I: 'static = ()> = StorageDoubleMap<
+		_,
+		Blake2_128Concat,
+		T::ClassId,
+		Blake2_128Concat,
+		T::InstanceId,
+		InstanceMetadata<DepositBalanceOf<T, I>, T::StringLimit>,
+		OptionQuery,
+	>;
+
+	#[pallet::storage]
+	/// Metadata of an asset class.
+	pub(super) type Attribute<T: Config<I>, I: 'static = ()> = StorageNMap<
+		_,
+		(
+			NMapKey<Blake2_128Concat, T::ClassId>,
+			NMapKey<Blake2_128Concat, Option<T::InstanceId>>,
+			NMapKey<Blake2_128Concat, BoundedVec<u8, T::KeyLimit>>,
+		),
+		(BoundedVec<u8, T::ValueLimit>, DepositBalanceOf<T, I>),
+		OptionQuery
+	>;
+
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	#[pallet::metadata(
+		T::AccountId = "AccountId",
+		T::ClassId = "ClassId",
+		T::InstanceId = "InstanceId",
+	)]
+	pub enum Event<T: Config<I>, I: 'static = ()> {
+		/// An asset class was created. \[ class, creator, owner \]
+		Created(T::ClassId, T::AccountId, T::AccountId),
+		/// An asset class was force-created. \[ class, owner \]
+		ForceCreated(T::ClassId, T::AccountId),
+		/// An asset `class` was destroyed. \[ class \]
+		Destroyed(T::ClassId),
+		/// An asset `instace` was issued. \[ class, instance, owner \]
+		Issued(T::ClassId, T::InstanceId, T::AccountId),
+		/// An asset `instace` was transferred. \[ class, instance, from, to \]
+		Transferred(T::ClassId, T::InstanceId, T::AccountId, T::AccountId),
+		/// An asset `instance` was destroyed. \[ class, instance, owner \]
+		Burned(T::ClassId, T::InstanceId, T::AccountId),
+		/// Some asset `instance` was frozen. \[ class, instance \]
+		Frozen(T::ClassId, T::InstanceId),
+		/// Some asset `instance` was thawed. \[ class, instance \]
+		Thawed(T::ClassId, T::InstanceId),
+		/// Some asset `class` was frozen. \[ class \]
+		ClassFrozen(T::ClassId),
+		/// Some asset `class` was thawed. \[ class \]
+		ClassThawed(T::ClassId),
+		/// The owner changed \[ class, new_owner \]
+		OwnerChanged(T::ClassId, T::AccountId),
+		/// The management team changed \[ class, issuer, admin, freezer \]
+		TeamChanged(T::ClassId, T::AccountId, T::AccountId, T::AccountId),
+		/// An `instance` of an asset `class` has been approved by the `owner` for transfer by a
+		/// `delegate`.
+		/// \[ class, instance, owner, delegate \]
+		ApprovedTransfer(T::ClassId, T::InstanceId, T::AccountId, T::AccountId),
+		/// An approval for a `delegate` account to transfer the `instance` of an asset `class` was
+		/// cancelled by its `owner`.
+		/// \[ class, instance, owner, delegate \]
+		ApprovalCancelled(T::ClassId, T::InstanceId, T::AccountId, T::AccountId),
+		/// An asset `class` has had its attributes changed by the `Force` origin.
+		/// \[ class \]
+		AssetStatusChanged(T::ClassId),
+		/// New metadata has been set for an asset class. \[ class, data, is_frozen \]
+		ClassMetadataSet(T::ClassId, BoundedVec<u8, T::StringLimit>, bool),
+		/// Metadata has been cleared for an asset class. \[ class \]
+		ClassMetadataCleared(T::ClassId),
+		/// New metadata has been set for an asset instance.
+		/// \[ class, instance, data, is_frozen \]
+		MetadataSet(T::ClassId, T::InstanceId, BoundedVec<u8, T::StringLimit>, bool),
+		/// Metadata has been cleared for an asset instance. \[ class, instance \]
+		MetadataCleared(T::ClassId, T::InstanceId),
+		/// Metadata has been cleared for an asset instance. \[ class, successful_instances \]
+		Redeposited(T::ClassId, Vec<T::InstanceId>),
+		/// New attribute metadata has been set for an asset class or instance.
+		/// \[ class, maybe_instance, key, value \]
+		AttributeSet(
+			T::ClassId,
+			Option<T::InstanceId>,
+			BoundedVec<u8, T::KeyLimit>,
+			BoundedVec<u8, T::ValueLimit>,
+		),
+		/// Attribute metadata has been cleared for an asset class or instance.
+		/// \[ class, maybe_instance, key, maybe_value \]
+		AttributeCleared(T::ClassId, Option<T::InstanceId>, BoundedVec<u8, T::KeyLimit>),
+	}
+
+	#[pallet::error]
+	pub enum Error<T, I = ()> {
+		/// The signing account has no permission to do the operation.
+		NoPermission,
+		/// The given asset ID is unknown.
+		Unknown,
+		/// The asset instance ID has already been used for an asset.
+		AlreadyExists,
+		/// The owner turned out to be different to what was expected.
+		WrongOwner,
+		/// Invalid witness data given.
+		BadWitness,
+		/// The asset ID is already taken.
+		InUse,
+		/// The asset instance or class is frozen.
+		Frozen,
+		/// The delegate turned out to be different to what was expected.
+		WrongDelegate,
+		/// There is no delegate approved.
+		NoDelegate,
+		/// No approval exists that would allow the transfer.
+		Unapproved,
+	}
+
+	#[pallet::hooks]
+	impl<T: Config<I>, I: 'static> Hooks<BlockNumberFor<T>> for Pallet<T, I> {}
+
+	impl<T: Config<I>, I: 'static> Pallet<T, I> {
+		/// Get the owner of the asset instance, if the asset exists.
+		pub fn owner(class: T::ClassId, instance: T::InstanceId) -> Option<T::AccountId> {
+			Asset::<T, I>::get(class, instance).map(|i| i.owner)
+		}
+	}
+
+	#[pallet::call]
+	impl<T: Config<I>, I: 'static> Pallet<T, I> {
+		/// Issue a new class of non-fungible assets from a public origin.
+		///
+		/// This new asset class has no assets initially and its owner is the origin.
+		///
+		/// The origin must be Signed and the sender must have sufficient funds free.
+		///
+		/// `AssetDeposit` funds of sender are reserved.
+		///
+		/// Parameters:
+		/// - `class`: The identifier of the new asset class. This must not be currently in use.
+		/// - `admin`: The admin of this class of assets. The admin is the initial address of each
+		/// member of the asset class's admin team.
+		///
+		/// Emits `Created` event when successful.
+		///
+		/// Weight: `O(1)`
+		#[pallet::weight(T::WeightInfo::create())]
+		pub(super) fn create(
+			origin: OriginFor<T>,
+			#[pallet::compact] class: T::ClassId,
+			admin: <T::Lookup as StaticLookup>::Source,
+		) -> DispatchResult {
+			let owner = ensure_signed(origin)?;
+			let admin = T::Lookup::lookup(admin)?;
+
+			ensure!(!Class::<T, I>::contains_key(class), Error::<T, I>::InUse);
+
+			let deposit = T::ClassDeposit::get();
+			T::Currency::reserve(&owner, deposit)?;
+
+			Class::<T, I>::insert(
+				class,
+				ClassDetails {
+					owner: owner.clone(),
+					issuer: admin.clone(),
+					admin: admin.clone(),
+					freezer: admin.clone(),
+					total_deposit: deposit,
+					free_holding: false,
+					instances: 0,
+					instance_metadatas: 0,
+					attributes: 0,
+					is_frozen: false,
+				},
+			);
+			Self::deposit_event(Event::Created(class, owner, admin));
+			Ok(())
+		}
+
+		/// Issue a new class of non-fungible assets from a privileged origin.
+		///
+		/// This new asset class has no assets initially.
+		///
+		/// The origin must conform to `ForceOrigin`.
+		///
+		/// Unlike `create`, no funds are reserved.
+		///
+		/// - `class`: The identifier of the new asset. This must not be currently in use.
+		/// - `owner`: The owner of this class of assets. The owner has full superuser permissions
+		/// over this asset, but may later change and configure the permissions using
+		/// `transfer_ownership` and `set_team`.
+		///
+		/// Emits `ForceCreated` event when successful.
+		///
+		/// Weight: `O(1)`
+		#[pallet::weight(T::WeightInfo::force_create())]
+		pub(super) fn force_create(
+			origin: OriginFor<T>,
+			#[pallet::compact] class: T::ClassId,
+			owner: <T::Lookup as StaticLookup>::Source,
+			free_holding: bool,
+		) -> DispatchResult {
+			T::ForceOrigin::ensure_origin(origin)?;
+			let owner = T::Lookup::lookup(owner)?;
+
+			ensure!(!Class::<T, I>::contains_key(class), Error::<T, I>::InUse);
+
+			Class::<T, I>::insert(
+				class,
+				ClassDetails {
+					owner: owner.clone(),
+					issuer: owner.clone(),
+					admin: owner.clone(),
+					freezer: owner.clone(),
+					total_deposit: Zero::zero(),
+					free_holding,
+					instances: 0,
+					instance_metadatas: 0,
+					attributes: 0,
+					is_frozen: false,
+				},
+			);
+			Self::deposit_event(Event::ForceCreated(class, owner));
+			Ok(())
+		}
+
+		/// Destroy a class of fungible assets.
+		///
+		/// The origin must conform to `ForceOrigin` or must be `Signed` and the sender must be the
+		/// owner of the asset `class`.
+		///
+		/// - `class`: The identifier of the asset class to be destroyed.
+		/// - `witness`: Information on the instances minted in the asset class. This must be
+		/// correct.
+		///
+		/// Emits `Destroyed` event when successful.
+		///
+		/// Weight: `O(n + m)` where:
+		/// - `n = witness.instances`
+		/// - `m = witness.instance_metdadatas`
+		/// - `a = witness.attributes`
+		#[pallet::weight(T::WeightInfo::destroy(
+			witness.instances,
+ 			witness.instance_metadatas,
+			witness.attributes,
+ 		))]
+		pub(super) fn destroy(
+			origin: OriginFor<T>,
+			#[pallet::compact] class: T::ClassId,
+			witness: DestroyWitness,
+		) -> DispatchResult {
+			let maybe_check_owner = match T::ForceOrigin::try_origin(origin) {
+				Ok(_) => None,
+				Err(origin) => Some(ensure_signed(origin)?),
+			};
+			Class::<T, I>::try_mutate_exists(class, |maybe_details| {
+				let class_details = maybe_details.take().ok_or(Error::<T, I>::Unknown)?;
+				if let Some(check_owner) = maybe_check_owner {
+					ensure!(class_details.owner == check_owner, Error::<T, I>::NoPermission);
+				}
+				ensure!(class_details.instances == witness.instances, Error::<T, I>::BadWitness);
+				ensure!(class_details.instance_metadatas == witness.instance_metadatas, Error::<T, I>::BadWitness);
+				ensure!(class_details.attributes == witness.attributes, Error::<T, I>::BadWitness);
+
+				for (instance, details) in Asset::<T, I>::drain_prefix(&class) {
+					Account::<T, I>::remove((&details.owner, &class, &instance));
+				}
+				InstanceMetadataOf::<T, I>::remove_prefix(&class);
+				ClassMetadataOf::<T, I>::remove(&class);
+				Attribute::<T, I>::remove_prefix((&class,));
+				T::Currency::unreserve(&class_details.owner, class_details.total_deposit);
+
+				Self::deposit_event(Event::Destroyed(class));
+
+				// NOTE: could use postinfo to reflect the actual number of accounts/sufficient/approvals
+				Ok(())
+			})
+		}
+
+		/// Mint an asset instance of a particular class.
+		///
+		/// The origin must be Signed and the sender must be the Issuer of the asset `class`.
+		///
+		/// - `class`: The class of the asset to be minted.
+		/// - `instance`: The instance value of the asset to be minted.
+		/// - `beneficiary`: The initial owner of the minted asset.
+		///
+		/// Emits `Issued` event when successful.
+		///
+		/// Weight: `O(1)`
+		#[pallet::weight(T::WeightInfo::mint())]
+		pub(super) fn mint(
+			origin: OriginFor<T>,
+			#[pallet::compact] class: T::ClassId,
+			#[pallet::compact] instance: T::InstanceId,
+			owner: <T::Lookup as StaticLookup>::Source,
+		) -> DispatchResult {
+			let origin = ensure_signed(origin)?;
+			let owner = T::Lookup::lookup(owner)?;
+
+			ensure!(!Asset::<T, I>::contains_key(class, instance), Error::<T, I>::AlreadyExists);
+
+			Class::<T, I>::try_mutate(&class, |maybe_class_details| -> DispatchResult {
+				let class_details = maybe_class_details.as_mut().ok_or(Error::<T, I>::Unknown)?;
+				ensure!(class_details.issuer == origin, Error::<T, I>::NoPermission);
+
+				let instances = class_details.instances.checked_add(1)
+					.ok_or(ArithmeticError::Overflow)?;
+				class_details.instances = instances;
+
+				let deposit = match class_details.free_holding {
+					true => Zero::zero(),
+					false => T::InstanceDeposit::get(),
+				};
+				T::Currency::reserve(&class_details.owner, deposit)?;
+				class_details.total_deposit += deposit;
+
+				let owner = owner.clone();
+				Account::<T, I>::insert((&owner, &class, &instance), ());
+				let details = InstanceDetails { owner, approved: None, is_frozen: false, deposit};
+				Asset::<T, I>::insert(&class, &instance, details);
+				Ok(())
+			})?;
+
+			Self::deposit_event(Event::Issued(class, instance, owner));
+			Ok(())
+		}
+
+		/// Destroy a single asset instance.
+		///
+		/// Origin must be Signed and the sender should be the Admin of the asset `class`.
+		///
+		/// - `class`: The class of the asset to be burned.
+		/// - `instance`: The instance of the asset to be burned.
+		/// - `check_owner`: If `Some` then the operation will fail with `WrongOwner` unless the
+		///   asset is owned by this value.
+		///
+		/// Emits `Burned` with the actual amount burned.
+		///
+		/// Weight: `O(1)`
+		/// Modes: `check_owner.is_some()`.
+		#[pallet::weight(T::WeightInfo::burn())]
+		pub(super) fn burn(
+			origin: OriginFor<T>,
+			#[pallet::compact] class: T::ClassId,
+			#[pallet::compact] instance: T::InstanceId,
+			check_owner: Option<<T::Lookup as StaticLookup>::Source>,
+		) -> DispatchResult {
+			let origin = ensure_signed(origin)?;
+			let check_owner = check_owner.map(T::Lookup::lookup).transpose()?;
+
+			let owner = Class::<T, I>::try_mutate(&class, |maybe_class_details| -> Result<T::AccountId, DispatchError> {
+				let class_details = maybe_class_details.as_mut().ok_or(Error::<T, I>::Unknown)?;
+				let details = Asset::<T, I>::get(&class, &instance)
+					.ok_or(Error::<T, I>::Unknown)?;
+				let is_permitted = class_details.admin == origin || details.owner == origin;
+				ensure!(is_permitted, Error::<T, I>::NoPermission);
+				ensure!(check_owner.map_or(true, |o| o == details.owner), Error::<T, I>::WrongOwner);
+
+				// Return the deposit.
+				T::Currency::unreserve(&class_details.owner, details.deposit);
+				class_details.total_deposit.saturating_reduce(details.deposit);
+				class_details.instances.saturating_dec();
+				Ok(details.owner)
+			})?;
+
+
+			Asset::<T, I>::remove(&class, &instance);
+			Account::<T, I>::remove((&owner, &class, &instance));
+
+			Self::deposit_event(Event::Burned(class, instance, owner));
+			Ok(())
+		}
+
+		/// Move an asset from the sender account to another.
+		///
+		/// Origin must be Signed and the signing account must be either:
+		/// - the Admin of the asset `class`;
+		/// - the Owner of the asset `instance`;
+		/// - the approved delegate for the asset `instance` (in this case, the approval is reset).
+		///
+		/// Arguments:
+		/// - `class`: The class of the asset to be transferred.
+		/// - `instance`: The instance of the asset to be transferred.
+		/// - `dest`: The account to receive ownership of the asset.
+		///
+		/// Emits `Transferred`.
+		///
+		/// Weight: `O(1)`
+		#[pallet::weight(T::WeightInfo::transfer())]
+		pub(super) fn transfer(
+			origin: OriginFor<T>,
+			#[pallet::compact] class: T::ClassId,
+			#[pallet::compact] instance: T::InstanceId,
+			dest: <T::Lookup as StaticLookup>::Source,
+		) -> DispatchResult {
+			let origin = ensure_signed(origin)?;
+			let dest = T::Lookup::lookup(dest)?;
+
+			let class_details = Class::<T, I>::get(&class).ok_or(Error::<T, I>::Unknown)?;
+			ensure!(!class_details.is_frozen, Error::<T, I>::Frozen);
+
+			let mut details = Asset::<T, I>::get(&class, &instance).ok_or(Error::<T, I>::Unknown)?;
+			ensure!(!details.is_frozen, Error::<T, I>::Frozen);
+			if details.owner != origin && class_details.admin != origin {
+				let approved = details.approved.take().map_or(false, |i| i == origin);
+				ensure!(approved, Error::<T, I>::NoPermission);
+			}
+
+			Account::<T, I>::remove((&details.owner, &class, &instance));
+			Account::<T, I>::insert((&dest, &class, &instance), ());
+			details.owner = dest;
+			Asset::<T, I>::insert(&class, &instance, &details);
+
+			Self::deposit_event(Event::Transferred(class, instance, origin, details.owner));
+
+			Ok(())
+		}
+
+		/// Reevaluate the deposits on some assets.
+		///
+		/// Origin must be Signed and the sender should be the Owner of the asset `class`.
+		///
+		/// - `class`: The class of the asset to be frozen.
+		/// - `instances`: The instances of the asset class whose deposits will be reevaluated.
+		///
+		/// NOTE: This exists as a best-effort function. Any asset instances which are unknown or
+		/// in the case that the owner account does not have reservable funds to pay for a
+		/// deposit increase are ignored. Generally the owner isn't going to call this on instances
+		/// whose existing deposit is less than the refreshed deposit as it would only cost them,
+		/// so it's of little consequence.
+		///
+		/// It will still return an error in the case that the class is unknown of the signer is
+		/// not permitted to call it.
+		///
+		/// Weight: `O(instances.len())`
+		#[pallet::weight(T::WeightInfo::redeposit(instances.len() as u32))]
+		pub(super) fn redeposit(
+			origin: OriginFor<T>,
+			#[pallet::compact] class: T::ClassId,
+			instances: Vec<T::InstanceId>,
+		) -> DispatchResult {
+			let origin = ensure_signed(origin)?;
+
+			let mut class_details = Class::<T, I>::get(&class).ok_or(Error::<T, I>::Unknown)?;
+			ensure!(class_details.owner == origin, Error::<T, I>::NoPermission);
+			let deposit = match class_details.free_holding {
+				true => Zero::zero(),
+				false => T::InstanceDeposit::get(),
+			};
+
+			let mut successful = Vec::with_capacity(instances.len());
+			for instance in instances.into_iter() {
+				let mut details = match Asset::<T, I>::get(&class, &instance) {
+					Some(x) => x,
+					None => continue,
+				};
+				let old = details.deposit;
+				if old > deposit {
+					T::Currency::unreserve(&class_details.owner, old - deposit);
+				} else if deposit > old {
+					if T::Currency::reserve(&class_details.owner, deposit - old).is_err() {
+						// NOTE: No alterations made to class_details in this iteration so far, so
+						// this is OK to do.
+						continue
+					}
+				} else {
+					continue
+				}
+				class_details.total_deposit.saturating_accrue(deposit);
+				class_details.total_deposit.saturating_reduce(old);
+				details.deposit = deposit;
+				Asset::<T, I>::insert(&class, &instance, &details);
+				successful.push(instance);
+			}
+			Class::<T, I>::insert(&class, &class_details);
+
+			Self::deposit_event(Event::<T, I>::Redeposited(class, successful));
+
+			Ok(())
+		}
+
+		/// Disallow further unprivileged transfer of an asset instance.
+		///
+		/// Origin must be Signed and the sender should be the Freezer of the asset `class`.
+		///
+		/// - `class`: The class of the asset to be frozen.
+		/// - `instance`: The instance of the asset to be frozen.
+		///
+		/// Emits `Frozen`.
+		///
+		/// Weight: `O(1)`
+		#[pallet::weight(T::WeightInfo::freeze())]
+		pub(super) fn freeze(
+			origin: OriginFor<T>,
+			#[pallet::compact] class: T::ClassId,
+			#[pallet::compact] instance: T::InstanceId,
+		) -> DispatchResult {
+			let origin = ensure_signed(origin)?;
+
+			let mut details = Asset::<T, I>::get(&class, &instance)
+				.ok_or(Error::<T, I>::Unknown)?;
+			let class_details = Class::<T, I>::get(&class).ok_or(Error::<T, I>::Unknown)?;
+			ensure!(class_details.freezer == origin, Error::<T, I>::NoPermission);
+
+			details.is_frozen = true;
+			Asset::<T, I>::insert(&class, &instance, &details);
+
+			Self::deposit_event(Event::<T, I>::Frozen(class, instance));
+			Ok(())
+		}
+
+		/// Re-allow unprivileged transfer of an asset instance.
+		///
+		/// Origin must be Signed and the sender should be the Freezer of the asset `class`.
+		///
+		/// - `class`: The class of the asset to be thawed.
+		/// - `instance`: The instance of the asset to be thawed.
+		///
+		/// Emits `Thawed`.
+		///
+		/// Weight: `O(1)`
+		#[pallet::weight(T::WeightInfo::thaw())]
+		pub(super) fn thaw(
+			origin: OriginFor<T>,
+			#[pallet::compact] class: T::ClassId,
+			#[pallet::compact] instance: T::InstanceId,
+		) -> DispatchResult {
+			let origin = ensure_signed(origin)?;
+
+			let mut details = Asset::<T, I>::get(&class, &instance)
+				.ok_or(Error::<T, I>::Unknown)?;
+			let class_details = Class::<T, I>::get(&class).ok_or(Error::<T, I>::Unknown)?;
+			ensure!(class_details.admin == origin, Error::<T, I>::NoPermission);
+
+			details.is_frozen = false;
+			Asset::<T, I>::insert(&class, &instance, &details);
+
+			Self::deposit_event(Event::<T, I>::Thawed(class, instance));
+			Ok(())
+		}
+
+		/// Disallow further unprivileged transfers for a whole asset class.
+		///
+		/// Origin must be Signed and the sender should be the Freezer of the asset `class`.
+		///
+		/// - `class`: The asset class to be frozen.
+		///
+		/// Emits `ClassFrozen`.
+		///
+		/// Weight: `O(1)`
+		#[pallet::weight(T::WeightInfo::freeze_class())]
+		pub(super) fn freeze_class(
+			origin: OriginFor<T>,
+			#[pallet::compact] class: T::ClassId
+		) -> DispatchResult {
+			let origin = ensure_signed(origin)?;
+
+			Class::<T, I>::try_mutate(class, |maybe_details| {
+				let details = maybe_details.as_mut().ok_or(Error::<T, I>::Unknown)?;
+				ensure!(&origin == &details.freezer, Error::<T, I>::NoPermission);
+
+				details.is_frozen = true;
+
+				Self::deposit_event(Event::<T, I>::ClassFrozen(class));
+				Ok(())
+			})
+		}
+
+		/// Re-allow unprivileged transfers for a whole asset class.
+		///
+		/// Origin must be Signed and the sender should be the Admin of the asset `class`.
+		///
+		/// - `class`: The class to be thawed.
+		///
+		/// Emits `ClassThawed`.
+		///
+		/// Weight: `O(1)`
+		#[pallet::weight(T::WeightInfo::thaw_class())]
+		pub(super) fn thaw_class(
+			origin: OriginFor<T>,
+			#[pallet::compact] class: T::ClassId
+		) -> DispatchResult {
+			let origin = ensure_signed(origin)?;
+
+			Class::<T, I>::try_mutate(class, |maybe_details| {
+				let details = maybe_details.as_mut().ok_or(Error::<T, I>::Unknown)?;
+				ensure!(&origin == &details.admin, Error::<T, I>::NoPermission);
+
+				details.is_frozen = false;
+
+				Self::deposit_event(Event::<T, I>::ClassThawed(class));
+				Ok(())
+			})
+		}
+
+		/// Change the Owner of an asset class.
+		///
+		/// Origin must be Signed and the sender should be the Owner of the asset `class`.
+		///
+		/// - `class`: The asset class whose owner should be changed.
+		/// - `owner`: The new Owner of this asset class.
+		///
+		/// Emits `OwnerChanged`.
+		///
+		/// Weight: `O(1)`
+		#[pallet::weight(T::WeightInfo::transfer_ownership())]
+		pub(super) fn transfer_ownership(
+			origin: OriginFor<T>,
+			#[pallet::compact] class: T::ClassId,
+			owner: <T::Lookup as StaticLookup>::Source,
+		) -> DispatchResult {
+			let origin = ensure_signed(origin)?;
+			let owner = T::Lookup::lookup(owner)?;
+
+			Class::<T, I>::try_mutate(class, |maybe_details| {
+				let details = maybe_details.as_mut().ok_or(Error::<T, I>::Unknown)?;
+				ensure!(&origin == &details.owner, Error::<T, I>::NoPermission);
+				if details.owner == owner {
+					return Ok(());
+				}
+
+				// Move the deposit to the new owner.
+				T::Currency::repatriate_reserved(
+					&details.owner,
+					&owner,
+					details.total_deposit,
+					Reserved,
+				)?;
+				details.owner = owner.clone();
+
+				Self::deposit_event(Event::OwnerChanged(class, owner));
+				Ok(())
+			})
+		}
+
+		/// Change the Issuer, Admin and Freezer of an asset class.
+		///
+		/// Origin must be Signed and the sender should be the Owner of the asset `class`.
+		///
+		/// - `class`: The asset class whose team should be changed.
+		/// - `issuer`: The new Issuer of this asset class.
+		/// - `admin`: The new Admin of this asset class.
+		/// - `freezer`: The new Freezer of this asset class.
+		///
+		/// Emits `TeamChanged`.
+		///
+		/// Weight: `O(1)`
+		#[pallet::weight(T::WeightInfo::set_team())]
+		pub(super) fn set_team(
+			origin: OriginFor<T>,
+			#[pallet::compact] class: T::ClassId,
+			issuer: <T::Lookup as StaticLookup>::Source,
+			admin: <T::Lookup as StaticLookup>::Source,
+			freezer: <T::Lookup as StaticLookup>::Source,
+		) -> DispatchResult {
+			let origin = ensure_signed(origin)?;
+			let issuer = T::Lookup::lookup(issuer)?;
+			let admin = T::Lookup::lookup(admin)?;
+			let freezer = T::Lookup::lookup(freezer)?;
+
+			Class::<T, I>::try_mutate(class, |maybe_details| {
+				let details = maybe_details.as_mut().ok_or(Error::<T, I>::Unknown)?;
+				ensure!(&origin == &details.owner, Error::<T, I>::NoPermission);
+
+				details.issuer = issuer.clone();
+				details.admin = admin.clone();
+				details.freezer = freezer.clone();
+
+				Self::deposit_event(Event::TeamChanged(class, issuer, admin, freezer));
+				Ok(())
+			})
+		}
+
+		/// Approve an instance to be transferred by a delegated third-party account.
+		///
+		/// Origin must be Signed and must be the owner of the asset `instance`.
+		///
+		/// - `class`: The class of the asset to be approved for delegated transfer.
+		/// - `instance`: The instance of the asset to be approved for delegated transfer.
+		/// - `delegate`: The account to delegate permission to transfer the asset.
+		///
+		/// Emits `ApprovedTransfer` on success.
+		///
+		/// Weight: `O(1)`
+		#[pallet::weight(T::WeightInfo::approve_transfer())]
+		pub(super) fn approve_transfer(
+			origin: OriginFor<T>,
+			#[pallet::compact] class: T::ClassId,
+			#[pallet::compact] instance: T::InstanceId,
+			delegate: <T::Lookup as StaticLookup>::Source,
+		) -> DispatchResult {
+			let maybe_check: Option<T::AccountId> = T::ForceOrigin::try_origin(origin)
+				.map(|_| None)
+				.or_else(|origin| ensure_signed(origin).map(Some).map_err(DispatchError::from))?;
+
+			let delegate = T::Lookup::lookup(delegate)?;
+
+			let class_details = Class::<T, I>::get(&class).ok_or(Error::<T, I>::Unknown)?;
+			let mut details = Asset::<T, I>::get(&class, &instance)
+				.ok_or(Error::<T, I>::Unknown)?;
+
+			if let Some(check) = maybe_check {
+				let permitted = &check == &class_details.admin || &check == &details.owner;
+				ensure!(permitted, Error::<T, I>::NoPermission);
+			}
+
+			details.approved = Some(delegate);
+			Asset::<T, I>::insert(&class, &instance, &details);
+
+			let delegate = details.approved.expect("set as Some above; qed");
+			Self::deposit_event(Event::ApprovedTransfer(class, instance, details.owner, delegate));
+
+			Ok(())
+		}
+
+		/// Cancel the prior approval for the transfer of an asset by a delegate.
+		///
+		/// Origin must be either:
+		/// - the `Force` origin;
+		/// - `Signed` with the signer being the Admin of the asset `class`;
+		/// - `Signed` with the signer being the Owner of the asset `instance`;
+		///
+		/// Arguments:
+		/// - `class`: The class of the asset of whose approval will be cancelled.
+		/// - `instance`: The instance of the asset of whose approval will be cancelled.
+		/// - `maybe_check_delegate`: If `Some` will ensure that the given account is the one to
+		///   which permission of transfer is delegated.
+		///
+		/// Emits `ApprovalCancelled` on success.
+		///
+		/// Weight: `O(1)`
+		#[pallet::weight(T::WeightInfo::cancel_approval())]
+		pub(super) fn cancel_approval(
+			origin: OriginFor<T>,
+			#[pallet::compact] class: T::ClassId,
+			#[pallet::compact] instance: T::InstanceId,
+			maybe_check_delegate: Option<<T::Lookup as StaticLookup>::Source>,
+		) -> DispatchResult {
+			let maybe_check: Option<T::AccountId> = T::ForceOrigin::try_origin(origin)
+				.map(|_| None)
+				.or_else(|origin| ensure_signed(origin).map(Some).map_err(DispatchError::from))?;
+
+			let class_details = Class::<T, I>::get(&class).ok_or(Error::<T, I>::Unknown)?;
+			let mut details = Asset::<T, I>::get(&class, &instance)
+				.ok_or(Error::<T, I>::Unknown)?;
+			if let Some(check) = maybe_check {
+				let permitted = &check == &class_details.admin || &check == &details.owner;
+				ensure!(permitted, Error::<T, I>::NoPermission);
+			}
+			let maybe_check_delegate = maybe_check_delegate.map(T::Lookup::lookup).transpose()?;
+			let old = details.approved.take().ok_or(Error::<T, I>::NoDelegate)?;
+			if let Some(check_delegate) = maybe_check_delegate {
+				ensure!(check_delegate == old, Error::<T, I>::WrongDelegate);
+			}
+
+			Asset::<T, I>::insert(&class, &instance, &details);
+			Self::deposit_event(Event::ApprovalCancelled(class, instance, details.owner, old));
+
+			Ok(())
+		}
+
+		/// Alter the attributes of a given asset.
+		///
+		/// Origin must be `ForceOrigin`.
+		///
+		/// - `class`: The identifier of the asset.
+		/// - `owner`: The new Owner of this asset.
+		/// - `issuer`: The new Issuer of this asset.
+		/// - `admin`: The new Admin of this asset.
+		/// - `freezer`: The new Freezer of this asset.
+		/// - `free_holding`: Whether a deposit is taken for holding an instance of this asset
+		///   class.
+		/// - `is_frozen`: Whether this asset class is frozen except for permissioned/admin
+		/// instructions.
+		///
+		/// Emits `AssetStatusChanged` with the identity of the asset.
+		///
+		/// Weight: `O(1)`
+		#[pallet::weight(T::WeightInfo::force_asset_status())]
+		pub(super) fn force_asset_status(
+			origin: OriginFor<T>,
+			#[pallet::compact] class: T::ClassId,
+			owner: <T::Lookup as StaticLookup>::Source,
+			issuer: <T::Lookup as StaticLookup>::Source,
+			admin: <T::Lookup as StaticLookup>::Source,
+			freezer: <T::Lookup as StaticLookup>::Source,
+			free_holding: bool,
+			is_frozen: bool,
+		) -> DispatchResult {
+			T::ForceOrigin::ensure_origin(origin)?;
+
+			Class::<T, I>::try_mutate(class, |maybe_asset| {
+				let mut asset = maybe_asset.take().ok_or(Error::<T, I>::Unknown)?;
+				asset.owner = T::Lookup::lookup(owner)?;
+				asset.issuer = T::Lookup::lookup(issuer)?;
+				asset.admin = T::Lookup::lookup(admin)?;
+				asset.freezer = T::Lookup::lookup(freezer)?;
+				asset.free_holding = free_holding;
+				asset.is_frozen = is_frozen;
+				*maybe_asset = Some(asset);
+
+				Self::deposit_event(Event::AssetStatusChanged(class));
+				Ok(())
+			})
+		}
+
+		/// Set an attribute for an asset class or instance.
+		///
+		/// Origin must be either `ForceOrigin` or Signed and the sender should be the Owner of the
+		/// asset `class`.
+		///
+		/// If the origin is Signed, then funds of signer are reserved according to the formula:
+		/// `MetadataDepositBase + DepositPerByte * (key.len + value.len)` taking into
+		/// account any already reserved funds.
+		///
+		/// - `class`: The identifier of the asset class whose instance's metadata to set.
+		/// - `maybe_instance`: The identifier of the asset instance whose metadata to set.
+		/// - `key`: The key of the attribute.
+		/// - `value`: The value to which to set the attribute.
+		///
+		/// Emits `AttributeSet`.
+		///
+		/// Weight: `O(1)`
+		#[pallet::weight(T::WeightInfo::set_attribute())]
+		pub(super) fn set_attribute(
+			origin: OriginFor<T>,
+			#[pallet::compact] class: T::ClassId,
+			maybe_instance: Option<T::InstanceId>,
+			key: BoundedVec<u8, T::KeyLimit>,
+			value: BoundedVec<u8, T::ValueLimit>,
+		) -> DispatchResult {
+			let maybe_check_owner = T::ForceOrigin::try_origin(origin)
+				.map(|_| None)
+				.or_else(|origin| ensure_signed(origin).map(Some))?;
+
+			let mut class_details = Class::<T, I>::get(&class).ok_or(Error::<T, I>::Unknown)?;
+			if let Some(check_owner) = &maybe_check_owner {
+				ensure!(check_owner == &class_details.owner, Error::<T, I>::NoPermission);
+			}
+			let maybe_is_frozen = match maybe_instance {
+				None => ClassMetadataOf::<T, I>::get(class).map(|v| v.is_frozen),
+				Some(instance) =>
+					InstanceMetadataOf::<T, I>::get(class, instance).map(|v| v.is_frozen),
+			};
+			ensure!(!maybe_is_frozen.unwrap_or(false), Error::<T, I>::Frozen);
+
+			let attribute = Attribute::<T, I>::get((class, maybe_instance, &key));
+			if attribute.is_none() {
+				class_details.attributes.saturating_inc();
+			}
+			let old_deposit = attribute.map_or(Zero::zero(), |m| m.1);
+			class_details.total_deposit.saturating_reduce(old_deposit);
+			let mut deposit = Zero::zero();
+			if !class_details.free_holding && maybe_check_owner.is_some() {
+				deposit = T::DepositPerByte::get()
+					.saturating_mul(((key.len() + value.len()) as u32).into())
+					.saturating_add(T::AttributeDepositBase::get());
+			}
+			class_details.total_deposit.saturating_accrue(deposit);
+			if deposit > old_deposit {
+				T::Currency::reserve(&class_details.owner, deposit - old_deposit)?;
+			} else if deposit < old_deposit {
+				T::Currency::unreserve(&class_details.owner, old_deposit - deposit);
+			}
+
+			Attribute::<T, I>::insert((&class, maybe_instance, &key), (&value, deposit));
+			Class::<T, I>::insert(class, &class_details);
+			Self::deposit_event(Event::AttributeSet(class, maybe_instance, key, value));
+			Ok(())
+		}
+
+		/// Set an attribute for an asset class or instance.
+		///
+		/// Origin must be either `ForceOrigin` or Signed and the sender should be the Owner of the
+		/// asset `class`.
+		///
+		/// If the origin is Signed, then funds of signer are reserved according to the formula:
+		/// `MetadataDepositBase + DepositPerByte * (key.len + value.len)` taking into
+		/// account any already reserved funds.
+		///
+		/// - `class`: The identifier of the asset class whose instance's metadata to set.
+		/// - `instance`: The identifier of the asset instance whose metadata to set.
+		/// - `key`: The key of the attribute.
+		/// - `value`: The value to which to set the attribute.
+		///
+		/// Emits `AttributeSet`.
+		///
+		/// Weight: `O(1)`
+		#[pallet::weight(T::WeightInfo::clear_attribute())]
+		pub(super) fn clear_attribute(
+			origin: OriginFor<T>,
+			#[pallet::compact] class: T::ClassId,
+			maybe_instance: Option<T::InstanceId>,
+			key: BoundedVec<u8, T::KeyLimit>,
+		) -> DispatchResult {
+			let maybe_check_owner = T::ForceOrigin::try_origin(origin)
+				.map(|_| None)
+				.or_else(|origin| ensure_signed(origin).map(Some))?;
+
+			let mut class_details = Class::<T, I>::get(&class).ok_or(Error::<T, I>::Unknown)?;
+			if let Some(check_owner) = &maybe_check_owner {
+				ensure!(check_owner == &class_details.owner, Error::<T, I>::NoPermission);
+			}
+			let maybe_is_frozen = match maybe_instance {
+				None => ClassMetadataOf::<T, I>::get(class).map(|v| v.is_frozen),
+				Some(instance) =>
+					InstanceMetadataOf::<T, I>::get(class, instance).map(|v| v.is_frozen),
+			};
+			ensure!(!maybe_is_frozen.unwrap_or(false), Error::<T, I>::Frozen);
+
+			if let Some((_, deposit)) = Attribute::<T, I>::take((class, maybe_instance, &key)) {
+				class_details.attributes.saturating_dec();
+				class_details.total_deposit.saturating_reduce(deposit);
+				T::Currency::unreserve(&class_details.owner, deposit);
+				Class::<T, I>::insert(class, &class_details);
+				Self::deposit_event(Event::AttributeCleared(class, maybe_instance, key));
+			}
+			Ok(())
+		}
+
+		/// Set the metadata for an asset instance.
+		///
+		/// Origin must be either `ForceOrigin` or Signed and the sender should be the Owner of the
+		/// asset `class`.
+		///
+		/// If the origin is Signed, then funds of signer are reserved according to the formula:
+		/// `MetadataDepositBase + DepositPerByte * data.len` taking into
+		/// account any already reserved funds.
+		///
+		/// - `class`: The identifier of the asset class whose instance's metadata to set.
+		/// - `instance`: The identifier of the asset instance whose metadata to set.
+		/// - `data`: The general information of this asset. Limited in length by `StringLimit`.
+		/// - `is_frozen`: Whether the metadata should be frozen against further changes.
+		///
+		/// Emits `MetadataSet`.
+		///
+		/// Weight: `O(1)`
+		#[pallet::weight(T::WeightInfo::set_metadata())]
+		pub(super) fn set_metadata(
+			origin: OriginFor<T>,
+			#[pallet::compact] class: T::ClassId,
+			#[pallet::compact] instance: T::InstanceId,
+			data: BoundedVec<u8, T::StringLimit>,
+			is_frozen: bool,
+		) -> DispatchResult {
+			let maybe_check_owner = T::ForceOrigin::try_origin(origin)
+				.map(|_| None)
+				.or_else(|origin| ensure_signed(origin).map(Some))?;
+
+			let mut class_details = Class::<T, I>::get(&class)
+				.ok_or(Error::<T, I>::Unknown)?;
+
+			if let Some(check_owner) = &maybe_check_owner {
+				ensure!(check_owner == &class_details.owner, Error::<T, I>::NoPermission);
+			}
+
+			InstanceMetadataOf::<T, I>::try_mutate_exists(class, instance, |metadata| {
+				let was_frozen = metadata.as_ref().map_or(false, |m| m.is_frozen);
+				ensure!(maybe_check_owner.is_none() || !was_frozen, Error::<T, I>::Frozen);
+
+				if metadata.is_none() {
+					class_details.instance_metadatas.saturating_inc();
+				}
+				let old_deposit = metadata.take().map_or(Zero::zero(), |m| m.deposit);
+				class_details.total_deposit.saturating_reduce(old_deposit);
+				let mut deposit = Zero::zero();
+				if !class_details.free_holding && maybe_check_owner.is_some() {
+					deposit = T::DepositPerByte::get()
+						.saturating_mul(((data.len()) as u32).into())
+						.saturating_add(T::MetadataDepositBase::get());
+				}
+				if deposit > old_deposit {
+					T::Currency::reserve(&class_details.owner, deposit - old_deposit)?;
+				} else if deposit < old_deposit {
+					T::Currency::unreserve(&class_details.owner, old_deposit - deposit);
+				}
+				class_details.total_deposit.saturating_accrue(deposit);
+
+				*metadata = Some(InstanceMetadata {
+					deposit,
+					data: data.clone(),
+					is_frozen,
+				});
+
+				Class::<T, I>::insert(&class, &class_details);
+				Self::deposit_event(Event::MetadataSet(class, instance, data, is_frozen));
+				Ok(())
+			})
+		}
+
+		/// Clear the metadata for an asset instance.
+		///
+		/// Origin must be either `ForceOrigin` or Signed and the sender should be the Owner of the
+		/// asset `instance`.
+		///
+		/// Any deposit is freed for the asset class owner.
+		///
+		/// - `class`: The identifier of the asset class whose instance's metadata to clear.
+		/// - `instance`: The identifier of the asset instance whose metadata to clear.
+		///
+		/// Emits `MetadataCleared`.
+		///
+		/// Weight: `O(1)`
+		#[pallet::weight(T::WeightInfo::clear_metadata())]
+		pub(super) fn clear_metadata(
+			origin: OriginFor<T>,
+			#[pallet::compact] class: T::ClassId,
+			#[pallet::compact] instance: T::InstanceId,
+		) -> DispatchResult {
+			let maybe_check_owner = T::ForceOrigin::try_origin(origin)
+				.map(|_| None)
+				.or_else(|origin| ensure_signed(origin).map(Some))?;
+
+			let mut class_details = Class::<T, I>::get(&class)
+				.ok_or(Error::<T, I>::Unknown)?;
+			if let Some(check_owner) = &maybe_check_owner {
+				ensure!(check_owner == &class_details.owner, Error::<T, I>::NoPermission);
+			}
+
+			InstanceMetadataOf::<T, I>::try_mutate_exists(class, instance, |metadata| {
+				let was_frozen = metadata.as_ref().map_or(false, |m| m.is_frozen);
+				ensure!(maybe_check_owner.is_none() || !was_frozen, Error::<T, I>::Frozen);
+
+				if metadata.is_some() {
+					class_details.instance_metadatas.saturating_dec();
+				}
+				let deposit = metadata.take().ok_or(Error::<T, I>::Unknown)?.deposit;
+				T::Currency::unreserve(&class_details.owner, deposit);
+				class_details.total_deposit.saturating_reduce(deposit);
+
+				Class::<T, I>::insert(&class, &class_details);
+				Self::deposit_event(Event::MetadataCleared(class, instance));
+				Ok(())
+			})
+		}
+
+		/// Set the metadata for an asset class.
+		///
+		/// Origin must be either `ForceOrigin` or `Signed` and the sender should be the Owner of
+		/// the asset `class`.
+		///
+		/// If the origin is `Signed`, then funds of signer are reserved according to the formula:
+		/// `MetadataDepositBase + DepositPerByte * data.len` taking into
+		/// account any already reserved funds.
+		///
+		/// - `class`: The identifier of the asset whose metadata to update.
+		/// - `data`: The general information of this asset. Limited in length by `StringLimit`.
+		/// - `is_frozen`: Whether the metadata should be frozen against further changes.
+		///
+		/// Emits `ClassMetadataSet`.
+		///
+		/// Weight: `O(1)`
+		#[pallet::weight(T::WeightInfo::set_class_metadata())]
+		pub(super) fn set_class_metadata(
+			origin: OriginFor<T>,
+			#[pallet::compact] class: T::ClassId,
+			data: BoundedVec<u8, T::StringLimit>,
+			is_frozen: bool,
+		) -> DispatchResult {
+			let maybe_check_owner = T::ForceOrigin::try_origin(origin)
+				.map(|_| None)
+				.or_else(|origin| ensure_signed(origin).map(Some))?;
+
+			let mut details = Class::<T, I>::get(&class).ok_or(Error::<T, I>::Unknown)?;
+			if let Some(check_owner) = &maybe_check_owner {
+				ensure!(check_owner == &details.owner, Error::<T, I>::NoPermission);
+			}
+
+			ClassMetadataOf::<T, I>::try_mutate_exists(class, |metadata| {
+				let was_frozen = metadata.as_ref().map_or(false, |m| m.is_frozen);
+				ensure!(maybe_check_owner.is_none() || !was_frozen, Error::<T, I>::Frozen);
+
+				let old_deposit = metadata.take().map_or(Zero::zero(), |m| m.deposit);
+				details.total_deposit.saturating_reduce(old_deposit);
+				let mut deposit = Zero::zero();
+				if maybe_check_owner.is_some() && !details.free_holding {
+					deposit = T::DepositPerByte::get()
+						.saturating_mul(((data.len()) as u32).into())
+						.saturating_add(T::MetadataDepositBase::get());
+				}
+				if deposit > old_deposit {
+					T::Currency::reserve(&details.owner, deposit - old_deposit)?;
+				} else if deposit < old_deposit {
+					T::Currency::unreserve(&details.owner, old_deposit - deposit);
+				}
+				details.total_deposit.saturating_accrue(deposit);
+
+				Class::<T, I>::insert(&class, details);
+
+				*metadata = Some(ClassMetadata {
+					deposit,
+					data: data.clone(),
+					is_frozen,
+				});
+
+				Self::deposit_event(Event::ClassMetadataSet(class, data, is_frozen));
+				Ok(())
+			})
+		}
+
+		/// Clear the metadata for an asset class.
+		///
+		/// Origin must be either `ForceOrigin` or `Signed` and the sender should be the Owner of
+		/// the asset `class`.
+		///
+		/// Any deposit is freed for the asset class owner.
+		///
+		/// - `class`: The identifier of the asset class whose metadata to clear.
+		///
+		/// Emits `ClassMetadataCleared`.
+		///
+		/// Weight: `O(1)`
+		#[pallet::weight(T::WeightInfo::clear_class_metadata())]
+		pub(super) fn clear_class_metadata(
+			origin: OriginFor<T>,
+			#[pallet::compact] class: T::ClassId,
+		) -> DispatchResult {
+			let maybe_check_owner = T::ForceOrigin::try_origin(origin)
+				.map(|_| None)
+				.or_else(|origin| ensure_signed(origin).map(Some))?;
+
+			let details = Class::<T, I>::get(&class).ok_or(Error::<T, I>::Unknown)?;
+			if let Some(check_owner) = &maybe_check_owner {
+				ensure!(check_owner == &details.owner, Error::<T, I>::NoPermission);
+			}
+
+			ClassMetadataOf::<T, I>::try_mutate_exists(class, |metadata| {
+				let was_frozen = metadata.as_ref().map_or(false, |m| m.is_frozen);
+				ensure!(maybe_check_owner.is_none() || !was_frozen, Error::<T, I>::Frozen);
+
+				let deposit = metadata.take().ok_or(Error::<T, I>::Unknown)?.deposit;
+				T::Currency::unreserve(&details.owner, deposit);
+				Self::deposit_event(Event::ClassMetadataCleared(class));
+				Ok(())
+			})
+		}
+	}
+}
diff --git a/frame/uniques/src/mock.rs b/frame/uniques/src/mock.rs
new file mode 100644
index 000000000000..1040821d0d88
--- /dev/null
+++ b/frame/uniques/src/mock.rs
@@ -0,0 +1,119 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Test environment for Assets pallet.
+
+use super::*;
+use crate as pallet_uniques;
+
+use sp_core::H256;
+use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
+use frame_support::{parameter_types, construct_runtime};
+
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Uniques: pallet_uniques::{Pallet, Call, Storage, Event<T>},
+	}
+);
+
+parameter_types! {
+	pub const BlockHashCount: u64 = 250;
+}
+impl frame_system::Config for Test {
+	type BaseCallFilter = ();
+	type BlockWeights = ();
+	type BlockLength = ();
+	type Origin = Origin;
+	type Call = Call;
+	type Index = u64;
+	type BlockNumber = u64;
+	type Hash = H256;
+	type Hashing = BlakeTwo256;
+	type AccountId = u64;
+	type Lookup = IdentityLookup<Self::AccountId>;
+	type Header = Header;
+	type Event = Event;
+	type BlockHashCount = BlockHashCount;
+	type DbWeight = ();
+	type Version = ();
+	type PalletInfo = PalletInfo;
+	type AccountData = pallet_balances::AccountData<u64>;
+	type OnNewAccount = ();
+	type OnKilledAccount = ();
+	type SystemWeightInfo = ();
+	type SS58Prefix = ();
+	type OnSetCode = ();
+}
+
+parameter_types! {
+	pub const ExistentialDeposit: u64 = 1;
+}
+
+impl pallet_balances::Config for Test {
+	type Balance = u64;
+	type DustRemoval = ();
+	type Event = Event;
+	type ExistentialDeposit = ExistentialDeposit;
+	type AccountStore = System;
+	type WeightInfo = ();
+	type MaxLocks = ();
+}
+
+parameter_types! {
+	pub const ClassDeposit: u64 = 2;
+	pub const InstanceDeposit: u64 = 1;
+	pub const KeyLimit: u32 = 50;
+	pub const ValueLimit: u32 = 50;
+	pub const StringLimit: u32 = 50;
+	pub const MetadataDepositBase: u64 = 1;
+	pub const AttributeDepositBase: u64 = 1;
+	pub const MetadataDepositPerByte: u64 = 1;
+}
+
+impl Config for Test {
+	type Event = Event;
+	type ClassId = u32;
+	type InstanceId = u32;
+	type Currency = Balances;
+	type ForceOrigin = frame_system::EnsureRoot<u64>;
+	type ClassDeposit = ClassDeposit;
+	type InstanceDeposit = InstanceDeposit;
+	type MetadataDepositBase = MetadataDepositBase;
+	type AttributeDepositBase = AttributeDepositBase;
+	type DepositPerByte = MetadataDepositPerByte;
+	type StringLimit = StringLimit;
+	type KeyLimit = KeyLimit;
+	type ValueLimit = ValueLimit;
+	type WeightInfo = ();
+}
+
+pub(crate) fn new_test_ext() -> sp_io::TestExternalities {
+	let t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+
+	let mut ext = sp_io::TestExternalities::new(t);
+	ext.execute_with(|| System::set_block_number(1));
+	ext
+}
diff --git a/frame/uniques/src/tests.rs b/frame/uniques/src/tests.rs
new file mode 100644
index 000000000000..4673ff71f8ed
--- /dev/null
+++ b/frame/uniques/src/tests.rs
@@ -0,0 +1,527 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Tests for Uniques pallet.
+
+use super::*;
+use crate::mock::*;
+use sp_std::convert::TryInto;
+use frame_support::{assert_ok, assert_noop, traits::Currency};
+use pallet_balances::Error as BalancesError;
+
+fn assets() -> Vec<(u64, u32, u32)> {
+	let mut r: Vec<_> = Account::<Test>::iter().map(|x| x.0).collect();
+	r.sort();
+	let mut s: Vec<_> = Asset::<Test>::iter().map(|x| (x.2.owner, x.0, x.1)).collect();
+	s.sort();
+	assert_eq!(r, s);
+	for class in Asset::<Test>::iter()
+		.map(|x| x.0)
+		.scan(None, |s, item| if s.map_or(false, |last| last == item) {
+				*s = Some(item);
+				Some(None)
+			} else {
+				Some(Some(item))
+			}
+		).filter_map(|item| item)
+	{
+		let details = Class::<Test>::get(class).unwrap();
+		let instances = Asset::<Test>::iter_prefix(class).count() as u32;
+		assert_eq!(details.instances, instances);
+	}
+	r
+}
+
+macro_rules! bvec {
+	($( $x:tt )*) => {
+		vec![$( $x )*].try_into().unwrap()
+	}
+}
+
+fn attributes(class: u32) -> Vec<(Option<u32>, Vec<u8>, Vec<u8>)> {
+	let mut s: Vec<_> = Attribute::<Test>::iter_prefix((class,))
+		.map(|(k, v)| (k.0, k.1.into(), v.0.into()))
+		.collect();
+	s.sort();
+	s
+}
+
+#[test]
+fn basic_setup_works() {
+	new_test_ext().execute_with(|| {
+		assert_eq!(assets(), vec![]);
+	});
+}
+
+#[test]
+fn basic_minting_should_work() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Uniques::force_create(Origin::root(), 0, 1, true));
+		assert_ok!(Uniques::mint(Origin::signed(1), 0, 42, 1));
+		assert_eq!(assets(), vec![(1, 0, 42)]);
+
+		assert_ok!(Uniques::force_create(Origin::root(), 1, 2, true));
+		assert_ok!(Uniques::mint(Origin::signed(2), 1, 69, 1));
+		assert_eq!(assets(), vec![(1, 0, 42), (1, 1, 69)]);
+	});
+}
+
+#[test]
+fn lifecycle_should_work() {
+	new_test_ext().execute_with(|| {
+		Balances::make_free_balance_be(&1, 100);
+		assert_ok!(Uniques::create(Origin::signed(1), 0, 1));
+		assert_eq!(Balances::reserved_balance(&1), 2);
+
+		assert_ok!(Uniques::set_class_metadata(Origin::signed(1), 0, bvec![0, 0], false));
+		assert_eq!(Balances::reserved_balance(&1), 5);
+		assert!(ClassMetadataOf::<Test>::contains_key(0));
+
+		assert_ok!(Uniques::mint(Origin::signed(1), 0, 42, 10));
+		assert_eq!(Balances::reserved_balance(&1), 6);
+		assert_ok!(Uniques::mint(Origin::signed(1), 0, 69, 20));
+		assert_eq!(Balances::reserved_balance(&1), 7);
+		assert_eq!(assets(), vec![(10, 0, 42), (20, 0, 69)]);
+		assert_eq!(Class::<Test>::get(0).unwrap().instances, 2);
+		assert_eq!(Class::<Test>::get(0).unwrap().instance_metadatas, 0);
+
+		assert_ok!(Uniques::set_metadata(Origin::signed(1), 0, 42, bvec![42, 42], false));
+		assert_eq!(Balances::reserved_balance(&1), 10);
+		assert!(InstanceMetadataOf::<Test>::contains_key(0, 42));
+		assert_ok!(Uniques::set_metadata(Origin::signed(1), 0, 69, bvec![69, 69], false));
+		assert_eq!(Balances::reserved_balance(&1), 13);
+		assert!(InstanceMetadataOf::<Test>::contains_key(0, 69));
+
+		let w = Class::<Test>::get(0).unwrap().destroy_witness();
+		assert_eq!(w.instances, 2);
+		assert_eq!(w.instance_metadatas, 2);
+		assert_ok!(Uniques::destroy(Origin::signed(1), 0, w));
+		assert_eq!(Balances::reserved_balance(&1), 0);
+
+		assert!(!Class::<Test>::contains_key(0));
+		assert!(!Asset::<Test>::contains_key(0, 42));
+		assert!(!Asset::<Test>::contains_key(0, 69));
+		assert!(!ClassMetadataOf::<Test>::contains_key(0));
+		assert!(!InstanceMetadataOf::<Test>::contains_key(0, 42));
+		assert!(!InstanceMetadataOf::<Test>::contains_key(0, 69));
+		assert_eq!(assets(), vec![]);
+	});
+}
+
+#[test]
+fn destroy_with_bad_witness_should_not_work() {
+	new_test_ext().execute_with(|| {
+		Balances::make_free_balance_be(&1, 100);
+		assert_ok!(Uniques::create(Origin::signed(1), 0, 1));
+
+		let w = Class::<Test>::get(0).unwrap().destroy_witness();
+		assert_ok!(Uniques::mint(Origin::signed(1), 0, 42, 1));
+		assert_noop!(Uniques::destroy(Origin::signed(1), 0, w), Error::<Test>::BadWitness);
+	});
+}
+
+#[test]
+fn mint_should_work() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Uniques::force_create(Origin::root(), 0, 1, true));
+		assert_ok!(Uniques::mint(Origin::signed(1), 0, 42, 1));
+		assert_eq!(Uniques::owner(0, 42).unwrap(), 1);
+		assert_eq!(assets(), vec![(1, 0, 42)]);
+	});
+}
+
+#[test]
+fn transfer_should_work() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Uniques::force_create(Origin::root(), 0, 1, true));
+		assert_ok!(Uniques::mint(Origin::signed(1), 0, 42, 2));
+
+		assert_ok!(Uniques::transfer(Origin::signed(2), 0, 42, 3));
+		assert_eq!(assets(), vec![(3, 0, 42)]);
+		assert_noop!(Uniques::transfer(Origin::signed(2), 0, 42, 4), Error::<Test>::NoPermission);
+
+		assert_ok!(Uniques::approve_transfer(Origin::signed(3), 0, 42, 2));
+		assert_ok!(Uniques::transfer(Origin::signed(2), 0, 42, 4));
+	});
+}
+
+#[test]
+fn freezing_should_work() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Uniques::force_create(Origin::root(), 0, 1, true));
+		assert_ok!(Uniques::mint(Origin::signed(1), 0, 42, 1));
+		assert_ok!(Uniques::freeze(Origin::signed(1), 0, 42));
+		assert_noop!(Uniques::transfer(Origin::signed(1), 0, 42, 2), Error::<Test>::Frozen);
+
+		assert_ok!(Uniques::thaw(Origin::signed(1), 0, 42));
+		assert_ok!(Uniques::freeze_class(Origin::signed(1), 0));
+		assert_noop!(Uniques::transfer(Origin::signed(1), 0, 42, 2), Error::<Test>::Frozen);
+
+		assert_ok!(Uniques::thaw_class(Origin::signed(1), 0));
+		assert_ok!(Uniques::transfer(Origin::signed(1), 0, 42, 2));
+	});
+}
+
+#[test]
+fn origin_guards_should_work() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Uniques::force_create(Origin::root(), 0, 1, true));
+		assert_ok!(Uniques::mint(Origin::signed(1), 0, 42, 1));
+		assert_noop!(Uniques::transfer_ownership(Origin::signed(2), 0, 2), Error::<Test>::NoPermission);
+		assert_noop!(Uniques::set_team(Origin::signed(2), 0, 2, 2, 2), Error::<Test>::NoPermission);
+		assert_noop!(Uniques::freeze(Origin::signed(2), 0, 42), Error::<Test>::NoPermission);
+		assert_noop!(Uniques::thaw(Origin::signed(2), 0, 42), Error::<Test>::NoPermission);
+		assert_noop!(Uniques::mint(Origin::signed(2), 0, 69, 2), Error::<Test>::NoPermission);
+		assert_noop!(Uniques::burn(Origin::signed(2), 0, 42, None), Error::<Test>::NoPermission);
+		let w = Class::<Test>::get(0).unwrap().destroy_witness();
+		assert_noop!(Uniques::destroy(Origin::signed(2), 0, w), Error::<Test>::NoPermission);
+	});
+}
+
+#[test]
+fn transfer_owner_should_work() {
+	new_test_ext().execute_with(|| {
+		Balances::make_free_balance_be(&1, 100);
+		Balances::make_free_balance_be(&2, 100);
+		Balances::make_free_balance_be(&3, 100);
+		assert_ok!(Uniques::create(Origin::signed(1), 0, 1));
+		assert_ok!(Uniques::transfer_ownership(Origin::signed(1), 0, 2));
+		assert_eq!(Balances::total_balance(&1), 98);
+		assert_eq!(Balances::total_balance(&2), 102);
+		assert_eq!(Balances::reserved_balance(&1), 0);
+		assert_eq!(Balances::reserved_balance(&2), 2);
+
+		assert_noop!(Uniques::transfer_ownership(Origin::signed(1), 0, 1), Error::<Test>::NoPermission);
+
+		// Mint and set metadata now and make sure that deposit gets transferred back.
+		assert_ok!(Uniques::set_class_metadata(Origin::signed(2), 0, bvec![0u8; 20], false));
+		assert_ok!(Uniques::mint(Origin::signed(1), 0, 42, 1));
+		assert_ok!(Uniques::set_metadata(Origin::signed(2), 0, 42, bvec![0u8; 20], false));
+		assert_ok!(Uniques::transfer_ownership(Origin::signed(2), 0, 3));
+		assert_eq!(Balances::total_balance(&2), 57);
+		assert_eq!(Balances::total_balance(&3), 145);
+		assert_eq!(Balances::reserved_balance(&2), 0);
+		assert_eq!(Balances::reserved_balance(&3), 45);
+	});
+}
+
+#[test]
+fn set_team_should_work() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Uniques::force_create(Origin::root(), 0, 1, true));
+		assert_ok!(Uniques::set_team(Origin::signed(1), 0, 2, 3, 4));
+
+		assert_ok!(Uniques::mint(Origin::signed(2), 0, 42, 2));
+		assert_ok!(Uniques::freeze(Origin::signed(4), 0, 42));
+		assert_ok!(Uniques::thaw(Origin::signed(3), 0, 42));
+		assert_ok!(Uniques::transfer(Origin::signed(3), 0, 42, 3));
+		assert_ok!(Uniques::burn(Origin::signed(3), 0, 42, None));
+	});
+}
+
+#[test]
+fn set_class_metadata_should_work() {
+	new_test_ext().execute_with(|| {
+		// Cannot add metadata to unknown asset
+		assert_noop!(
+			Uniques::set_class_metadata(Origin::signed(1), 0, bvec![0u8; 20], false),
+			Error::<Test>::Unknown,
+		);
+		assert_ok!(Uniques::force_create(Origin::root(), 0, 1, false));
+		// Cannot add metadata to unowned asset
+		assert_noop!(
+			Uniques::set_class_metadata(Origin::signed(2), 0, bvec![0u8; 20], false),
+			Error::<Test>::NoPermission,
+		);
+
+		// Successfully add metadata and take deposit
+		Balances::make_free_balance_be(&1, 30);
+		assert_ok!(Uniques::set_class_metadata(Origin::signed(1), 0, bvec![0u8; 20], false));
+		assert_eq!(Balances::free_balance(&1), 9);
+		assert!(ClassMetadataOf::<Test>::contains_key(0));
+
+		// Force origin works, too.
+		assert_ok!(Uniques::set_class_metadata(Origin::root(), 0, bvec![0u8; 18], false));
+
+		// Update deposit
+		assert_ok!(Uniques::set_class_metadata(Origin::signed(1), 0, bvec![0u8; 15], false));
+		assert_eq!(Balances::free_balance(&1), 14);
+		assert_ok!(Uniques::set_class_metadata(Origin::signed(1), 0, bvec![0u8; 25], false));
+		assert_eq!(Balances::free_balance(&1), 4);
+
+		// Cannot over-reserve
+		assert_noop!(
+			Uniques::set_class_metadata(Origin::signed(1), 0, bvec![0u8; 40], false),
+			BalancesError::<Test, _>::InsufficientBalance,
+		);
+
+		// Can't set or clear metadata once frozen
+		assert_ok!(Uniques::set_class_metadata(Origin::signed(1), 0, bvec![0u8; 15], true));
+		assert_noop!(
+			Uniques::set_class_metadata(Origin::signed(1), 0, bvec![0u8; 15], false),
+			Error::<Test, _>::Frozen,
+		);
+		assert_noop!(Uniques::clear_class_metadata(Origin::signed(1), 0), Error::<Test>::Frozen);
+
+		// Clear Metadata
+		assert_ok!(Uniques::set_class_metadata(Origin::root(), 0, bvec![0u8; 15], false));
+		assert_noop!(Uniques::clear_class_metadata(Origin::signed(2), 0), Error::<Test>::NoPermission);
+		assert_noop!(Uniques::clear_class_metadata(Origin::signed(1), 1), Error::<Test>::Unknown);
+		assert_ok!(Uniques::clear_class_metadata(Origin::signed(1), 0));
+		assert!(!ClassMetadataOf::<Test>::contains_key(0));
+	});
+}
+
+#[test]
+fn set_instance_metadata_should_work() {
+	new_test_ext().execute_with(|| {
+		Balances::make_free_balance_be(&1, 30);
+
+		// Cannot add metadata to unknown asset
+		assert_ok!(Uniques::force_create(Origin::root(), 0, 1, false));
+		assert_ok!(Uniques::mint(Origin::signed(1), 0, 42, 1));
+		// Cannot add metadata to unowned asset
+		assert_noop!(
+			Uniques::set_metadata(Origin::signed(2), 0, 42, bvec![0u8; 20], false),
+			Error::<Test>::NoPermission,
+		);
+
+		// Successfully add metadata and take deposit
+		assert_ok!(Uniques::set_metadata(Origin::signed(1), 0, 42, bvec![0u8; 20], false));
+		assert_eq!(Balances::free_balance(&1), 8);
+		assert!(InstanceMetadataOf::<Test>::contains_key(0, 42));
+
+		// Force origin works, too.
+		assert_ok!(Uniques::set_metadata(Origin::root(), 0, 42, bvec![0u8; 18], false));
+
+		// Update deposit
+		assert_ok!(Uniques::set_metadata(Origin::signed(1), 0, 42, bvec![0u8; 15], false));
+		assert_eq!(Balances::free_balance(&1), 13);
+		assert_ok!(Uniques::set_metadata(Origin::signed(1), 0, 42, bvec![0u8; 25], false));
+		assert_eq!(Balances::free_balance(&1), 3);
+
+		// Cannot over-reserve
+		assert_noop!(
+			Uniques::set_metadata(Origin::signed(1), 0, 42, bvec![0u8; 40], false),
+			BalancesError::<Test, _>::InsufficientBalance,
+		);
+
+		// Can't set or clear metadata once frozen
+		assert_ok!(Uniques::set_metadata(Origin::signed(1), 0, 42, bvec![0u8; 15], true));
+		assert_noop!(
+			Uniques::set_metadata(Origin::signed(1), 0, 42, bvec![0u8; 15], false),
+			Error::<Test, _>::Frozen,
+		);
+		assert_noop!(Uniques::clear_metadata(Origin::signed(1), 0, 42), Error::<Test>::Frozen);
+
+		// Clear Metadata
+		assert_ok!(Uniques::set_metadata(Origin::root(), 0, 42, bvec![0u8; 15], false));
+		assert_noop!(Uniques::clear_metadata(Origin::signed(2), 0, 42), Error::<Test>::NoPermission);
+		assert_noop!(Uniques::clear_metadata(Origin::signed(1), 1, 42), Error::<Test>::Unknown);
+		assert_ok!(Uniques::clear_metadata(Origin::signed(1), 0, 42));
+		assert!(!InstanceMetadataOf::<Test>::contains_key(0, 42));
+	});
+}
+
+#[test]
+fn set_attribute_should_work() {
+	new_test_ext().execute_with(|| {
+		Balances::make_free_balance_be(&1, 100);
+
+		assert_ok!(Uniques::force_create(Origin::root(), 0, 1, false));
+
+		assert_ok!(Uniques::set_attribute(Origin::signed(1), 0, None, bvec![0], bvec![0]));
+		assert_ok!(Uniques::set_attribute(Origin::signed(1), 0, Some(0), bvec![0], bvec![0]));
+		assert_ok!(Uniques::set_attribute(Origin::signed(1), 0, Some(0), bvec![1], bvec![0]));
+		assert_eq!(attributes(0), vec![
+			(None, bvec![0], bvec![0]),
+			(Some(0), bvec![0], bvec![0]),
+			(Some(0), bvec![1], bvec![0]),
+		]);
+		assert_eq!(Balances::reserved_balance(1), 9);
+
+		assert_ok!(Uniques::set_attribute(Origin::signed(1), 0, None, bvec![0], bvec![0; 10]));
+		assert_eq!(attributes(0), vec![
+			(None, bvec![0], bvec![0; 10]),
+			(Some(0), bvec![0], bvec![0]),
+			(Some(0), bvec![1], bvec![0]),
+		]);
+		assert_eq!(Balances::reserved_balance(1), 18);
+
+		assert_ok!(Uniques::clear_attribute(Origin::signed(1), 0, Some(0), bvec![1]));
+		assert_eq!(attributes(0), vec![
+			(None, bvec![0], bvec![0; 10]),
+			(Some(0), bvec![0], bvec![0]),
+		]);
+		assert_eq!(Balances::reserved_balance(1), 15);
+
+		let w = Class::<Test>::get(0).unwrap().destroy_witness();
+		assert_ok!(Uniques::destroy(Origin::signed(1), 0, w));
+		assert_eq!(attributes(0), vec![]);
+		assert_eq!(Balances::reserved_balance(1), 0);
+	});
+}
+
+#[test]
+fn set_attribute_should_respect_freeze() {
+	new_test_ext().execute_with(|| {
+		Balances::make_free_balance_be(&1, 100);
+
+		assert_ok!(Uniques::force_create(Origin::root(), 0, 1, false));
+
+		assert_ok!(Uniques::set_attribute(Origin::signed(1), 0, None, bvec![0], bvec![0]));
+		assert_ok!(Uniques::set_attribute(Origin::signed(1), 0, Some(0), bvec![0], bvec![0]));
+		assert_ok!(Uniques::set_attribute(Origin::signed(1), 0, Some(1), bvec![0], bvec![0]));
+		assert_eq!(attributes(0), vec![
+			(None, bvec![0], bvec![0]),
+			(Some(0), bvec![0], bvec![0]),
+			(Some(1), bvec![0], bvec![0]),
+		]);
+		assert_eq!(Balances::reserved_balance(1), 9);
+
+		assert_ok!(Uniques::set_class_metadata(Origin::signed(1), 0, bvec![], true));
+		let e = Error::<Test>::Frozen;
+		assert_noop!(Uniques::set_attribute(Origin::signed(1), 0, None, bvec![0], bvec![0]), e);
+		assert_ok!(Uniques::set_attribute(Origin::signed(1), 0, Some(0), bvec![0], bvec![1]));
+
+		assert_ok!(Uniques::set_metadata(Origin::signed(1), 0, 0, bvec![], true));
+		let e = Error::<Test>::Frozen;
+		assert_noop!(Uniques::set_attribute(Origin::signed(1), 0, Some(0), bvec![0], bvec![1]), e);
+		assert_ok!(Uniques::set_attribute(Origin::signed(1), 0, Some(1), bvec![0], bvec![1]));
+	});
+}
+
+#[test]
+fn force_asset_status_should_work(){
+	new_test_ext().execute_with(|| {
+		Balances::make_free_balance_be(&1, 100);
+
+		assert_ok!(Uniques::force_create(Origin::root(), 0, 1, false));
+		assert_ok!(Uniques::mint(Origin::signed(1), 0, 42, 1));
+		assert_ok!(Uniques::mint(Origin::signed(1), 0, 69, 2));
+		assert_ok!(Uniques::set_class_metadata(Origin::signed(1), 0, bvec![0; 20], false));
+		assert_ok!(Uniques::set_metadata(Origin::signed(1), 0, 42, bvec![0; 20], false));
+		assert_ok!(Uniques::set_metadata(Origin::signed(1), 0, 69, bvec![0; 20], false));
+		assert_eq!(Balances::reserved_balance(1), 65);
+
+		//force asset status to be free holding
+		assert_ok!(Uniques::force_asset_status(Origin::root(), 0, 1, 1, 1, 1, true, false));
+		assert_ok!(Uniques::mint(Origin::signed(1), 0, 142, 1));
+		assert_ok!(Uniques::mint(Origin::signed(1), 0, 169, 2));
+		assert_ok!(Uniques::set_metadata(Origin::signed(1), 0, 142, bvec![0; 20], false));
+		assert_ok!(Uniques::set_metadata(Origin::signed(1), 0, 169, bvec![0; 20], false));
+		assert_eq!(Balances::reserved_balance(1), 65);
+
+		assert_ok!(Uniques::redeposit(Origin::signed(1), 0, bvec![0, 42, 50, 69, 100]));
+		assert_eq!(Balances::reserved_balance(1), 63);
+
+		assert_ok!(Uniques::set_metadata(Origin::signed(1), 0, 42, bvec![0; 20], false));
+		assert_eq!(Balances::reserved_balance(1), 42);
+
+		assert_ok!(Uniques::set_metadata(Origin::signed(1), 0, 69, bvec![0; 20], false));
+		assert_eq!(Balances::reserved_balance(1), 21);
+
+		assert_ok!(Uniques::set_class_metadata(Origin::signed(1), 0, bvec![0; 20], false));
+		assert_eq!(Balances::reserved_balance(1), 0);
+	});
+}
+
+#[test]
+fn burn_works() {
+	new_test_ext().execute_with(|| {
+		Balances::make_free_balance_be(&1, 100);
+		assert_ok!(Uniques::force_create(Origin::root(), 0, 1, false));
+		assert_ok!(Uniques::set_team(Origin::signed(1), 0, 2, 3, 4));
+
+		assert_noop!(Uniques::burn(Origin::signed(5), 0, 42, Some(5)), Error::<Test>::Unknown);
+
+		assert_ok!(Uniques::mint(Origin::signed(2), 0, 42, 5));
+		assert_ok!(Uniques::mint(Origin::signed(2), 0, 69, 5));
+		assert_eq!(Balances::reserved_balance(1), 2);
+
+		assert_noop!(Uniques::burn(Origin::signed(0), 0, 42, None), Error::<Test>::NoPermission);
+		assert_noop!(Uniques::burn(Origin::signed(5), 0, 42, Some(6)), Error::<Test>::WrongOwner);
+
+		assert_ok!(Uniques::burn(Origin::signed(5), 0, 42, Some(5)));
+		assert_ok!(Uniques::burn(Origin::signed(3), 0, 69, Some(5)));
+		assert_eq!(Balances::reserved_balance(1), 0);
+	});
+}
+
+#[test]
+fn approval_lifecycle_works() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Uniques::force_create(Origin::root(), 0, 1, true));
+		assert_ok!(Uniques::mint(Origin::signed(1), 0, 42, 2));
+		assert_ok!(Uniques::approve_transfer(Origin::signed(2), 0, 42, 3));
+		assert_ok!(Uniques::transfer(Origin::signed(3), 0, 42, 4));
+		assert_noop!(Uniques::transfer(Origin::signed(3), 0, 42, 3), Error::<Test>::NoPermission);
+		assert!(Asset::<Test>::get(0, 42).unwrap().approved.is_none());
+
+		assert_ok!(Uniques::approve_transfer(Origin::signed(4), 0, 42, 2));
+		assert_ok!(Uniques::transfer(Origin::signed(2), 0, 42, 2));
+	});
+}
+
+#[test]
+fn cancel_approval_works() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Uniques::force_create(Origin::root(), 0, 1, true));
+		assert_ok!(Uniques::mint(Origin::signed(1), 0, 42, 2));
+
+		assert_ok!(Uniques::approve_transfer(Origin::signed(2), 0, 42, 3));
+		assert_noop!(Uniques::cancel_approval(Origin::signed(2), 1, 42, None), Error::<Test>::Unknown);
+		assert_noop!(Uniques::cancel_approval(Origin::signed(2), 0, 43, None), Error::<Test>::Unknown);
+		assert_noop!(Uniques::cancel_approval(Origin::signed(3), 0, 42, None), Error::<Test>::NoPermission);
+		assert_noop!(Uniques::cancel_approval(Origin::signed(2), 0, 42, Some(4)), Error::<Test>::WrongDelegate);
+
+		assert_ok!(Uniques::cancel_approval(Origin::signed(2), 0, 42, Some(3)));
+		assert_noop!(Uniques::cancel_approval(Origin::signed(2), 0, 42, None), Error::<Test>::NoDelegate);
+	});
+}
+
+#[test]
+fn cancel_approval_works_with_admin() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Uniques::force_create(Origin::root(), 0, 1, true));
+		assert_ok!(Uniques::mint(Origin::signed(1), 0, 42, 2));
+
+		assert_ok!(Uniques::approve_transfer(Origin::signed(2), 0, 42, 3));
+		assert_noop!(Uniques::cancel_approval(Origin::signed(1), 1, 42, None), Error::<Test>::Unknown);
+		assert_noop!(Uniques::cancel_approval(Origin::signed(1), 0, 43, None), Error::<Test>::Unknown);
+		assert_noop!(Uniques::cancel_approval(Origin::signed(1), 0, 42, Some(4)), Error::<Test>::WrongDelegate);
+
+		assert_ok!(Uniques::cancel_approval(Origin::signed(1), 0, 42, Some(3)));
+		assert_noop!(Uniques::cancel_approval(Origin::signed(1), 0, 42, None), Error::<Test>::NoDelegate);
+	});
+}
+
+#[test]
+fn cancel_approval_works_with_force() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Uniques::force_create(Origin::root(), 0, 1, true));
+		assert_ok!(Uniques::mint(Origin::signed(1), 0, 42, 2));
+
+		assert_ok!(Uniques::approve_transfer(Origin::signed(2), 0, 42, 3));
+		assert_noop!(Uniques::cancel_approval(Origin::root(), 1, 42, None), Error::<Test>::Unknown);
+		assert_noop!(Uniques::cancel_approval(Origin::root(), 0, 43, None), Error::<Test>::Unknown);
+		assert_noop!(Uniques::cancel_approval(Origin::root(), 0, 42, Some(4)), Error::<Test>::WrongDelegate);
+
+		assert_ok!(Uniques::cancel_approval(Origin::root(), 0, 42, Some(3)));
+		assert_noop!(Uniques::cancel_approval(Origin::root(), 0, 42, None), Error::<Test>::NoDelegate);
+	});
+}
diff --git a/frame/uniques/src/types.rs b/frame/uniques/src/types.rs
new file mode 100644
index 000000000000..45b571aa7de2
--- /dev/null
+++ b/frame/uniques/src/types.rs
@@ -0,0 +1,118 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Various basic types for use in the assets pallet.
+
+use super::*;
+use frame_support::{traits::Get, BoundedVec};
+
+pub(super) type DepositBalanceOf<T, I = ()> =
+	<<T as Config<I>>::Currency as Currency<<T as SystemConfig>::AccountId>>::Balance;
+
+#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug)]
+pub struct ClassDetails<
+	AccountId,
+	DepositBalance,
+> {
+	/// Can change `owner`, `issuer`, `freezer` and `admin` accounts.
+	pub(super) owner: AccountId,
+	/// Can mint tokens.
+	pub(super) issuer: AccountId,
+	/// Can thaw tokens, force transfers and burn tokens from any account.
+	pub(super) admin: AccountId,
+	/// Can freeze tokens.
+	pub(super) freezer: AccountId,
+	/// The total balance deposited for the all storage associated with this asset class. Used by
+	/// `destroy`.
+	pub(super) total_deposit: DepositBalance,
+	/// If `true`, then no deposit is needed to hold instances of this class.
+	pub(super) free_holding: bool,
+	/// The total number of outstanding instances of this asset class.
+	pub(super) instances: u32,
+	/// The total number of outstanding instance metadata of this asset class.
+	pub(super) instance_metadatas: u32,
+	/// The total number of attributes for this asset class.
+	pub(super) attributes: u32,
+	/// Whether the asset is frozen for non-admin transfers.
+	pub(super) is_frozen: bool,
+}
+
+/// Witness data for the destroy transactions.
+#[derive(Copy, Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug)]
+pub struct DestroyWitness {
+	/// The total number of outstanding instances of this asset class.
+	#[codec(compact)]
+	pub(super) instances: u32,
+	/// The total number of outstanding instance metadata of this asset class.
+	#[codec(compact)]
+	pub(super) instance_metadatas: u32,
+	#[codec(compact)]
+	/// The total number of attributes for this asset class.
+	pub(super) attributes: u32,
+}
+
+impl<AccountId, DepositBalance> ClassDetails<AccountId, DepositBalance> {
+	pub fn destroy_witness(&self) -> DestroyWitness {
+		DestroyWitness {
+			instances: self.instances,
+			instance_metadatas: self.instance_metadatas,
+			attributes: self.attributes,
+		}
+	}
+}
+
+/// Information concerning the ownership of a single unique asset.
+#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default)]
+pub struct InstanceDetails<AccountId, DepositBalance> {
+	/// The owner of this asset.
+	pub(super) owner: AccountId,
+	/// The approved transferrer of this asset, if one is set.
+	pub(super) approved: Option<AccountId>,
+	/// Whether the asset can be transferred or not.
+	pub(super) is_frozen: bool,
+	/// The amount held in the pallet's default account for this asset. Free-hold assets will have
+	/// this as zero.
+	pub(super) deposit: DepositBalance,
+}
+
+#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default)]
+pub struct ClassMetadata<DepositBalance, StringLimit: Get<u32>> {
+	/// The balance deposited for this metadata.
+	///
+	/// This pays for the data stored in this struct.
+	pub(super) deposit: DepositBalance,
+	/// General information concerning this asset. Limited in length by `StringLimit`. This will
+	/// generally be either a JSON dump or the hash of some JSON which can be found on a
+	/// hash-addressable global publication system such as IPFS.
+	pub(super) data: BoundedVec<u8, StringLimit>,
+	/// Whether the asset metadata may be changed by a non Force origin.
+	pub(super) is_frozen: bool,
+}
+
+#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default)]
+pub struct InstanceMetadata<DepositBalance, StringLimit: Get<u32>> {
+	/// The balance deposited for this metadata.
+	///
+	/// This pays for the data stored in this struct.
+	pub(super) deposit: DepositBalance,
+	/// General information concerning this asset. Limited in length by `StringLimit`. This will
+	/// generally be either a JSON dump or the hash of some JSON which can be found on a
+	/// hash-addressable global publication system such as IPFS.
+	pub(super) data: BoundedVec<u8, StringLimit>,
+	/// Whether the asset metadata may be changed by a non Force origin.
+	pub(super) is_frozen: bool,
+}
diff --git a/frame/uniques/src/weights.rs b/frame/uniques/src/weights.rs
new file mode 100644
index 000000000000..9272ae6026a9
--- /dev/null
+++ b/frame/uniques/src/weights.rs
@@ -0,0 +1,326 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Autogenerated weights for pallet_uniques
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-05-24, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
+
+// Executed Command:
+// target/release/substrate
+// benchmark
+// --chain=dev
+// --steps=50
+// --repeat=20
+// --pallet=pallet_uniques
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./frame/uniques/src/weights.rs
+// --template=./.maintain/frame-weight-template.hbs
+
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for pallet_uniques.
+pub trait WeightInfo {
+	fn create() -> Weight;
+	fn force_create() -> Weight;
+	fn destroy(n: u32, m: u32, a: u32, ) -> Weight;
+	fn mint() -> Weight;
+	fn burn() -> Weight;
+	fn transfer() -> Weight;
+	fn redeposit(i: u32, ) -> Weight;
+	fn freeze() -> Weight;
+	fn thaw() -> Weight;
+	fn freeze_class() -> Weight;
+	fn thaw_class() -> Weight;
+	fn transfer_ownership() -> Weight;
+	fn set_team() -> Weight;
+	fn force_asset_status() -> Weight;
+	fn set_attribute() -> Weight;
+	fn clear_attribute() -> Weight;
+	fn set_metadata() -> Weight;
+	fn clear_metadata() -> Weight;
+	fn set_class_metadata() -> Weight;
+	fn clear_class_metadata() -> Weight;
+	fn approve_transfer() -> Weight;
+	fn cancel_approval() -> Weight;
+}
+
+/// Weights for pallet_uniques using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	fn create() -> Weight {
+		(55_264_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn force_create() -> Weight {
+		(28_173_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn destroy(n: u32, m: u32, a: u32, ) -> Weight {
+		(0 as Weight)
+			// Standard Error: 32_000
+			.saturating_add((23_077_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 32_000
+			.saturating_add((1_723_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 32_000
+			.saturating_add((1_534_000 as Weight).saturating_mul(a as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(n as Weight)))
+			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(m as Weight)))
+			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(a as Weight)))
+	}
+	fn mint() -> Weight {
+		(73_250_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+	}
+	fn burn() -> Weight {
+		(74_443_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+	}
+	fn transfer() -> Weight {
+		(54_690_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+	}
+	fn redeposit(i: u32, ) -> Weight {
+		(0 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((34_624_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(i as Weight)))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
+	}
+	fn freeze() -> Weight {
+		(39_505_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn thaw() -> Weight {
+		(38_844_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn freeze_class() -> Weight {
+		(28_739_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn thaw_class() -> Weight {
+		(28_963_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn transfer_ownership() -> Weight {
+		(65_160_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+	}
+	fn set_team() -> Weight {
+		(30_000_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn force_asset_status() -> Weight {
+		(29_145_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn set_attribute() -> Weight {
+		(88_923_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+	}
+	fn clear_attribute() -> Weight {
+		(79_878_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+	}
+	fn set_metadata() -> Weight {
+		(67_110_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+	}
+	fn clear_metadata() -> Weight {
+		(66_191_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+	}
+	fn set_class_metadata() -> Weight {
+		(65_558_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+	}
+	fn clear_class_metadata() -> Weight {
+		(60_135_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn approve_transfer() -> Weight {
+		(40_337_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn cancel_approval() -> Weight {
+		(40_770_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+	fn create() -> Weight {
+		(55_264_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn force_create() -> Weight {
+		(28_173_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn destroy(n: u32, m: u32, a: u32, ) -> Weight {
+		(0 as Weight)
+			// Standard Error: 32_000
+			.saturating_add((23_077_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 32_000
+			.saturating_add((1_723_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 32_000
+			.saturating_add((1_534_000 as Weight).saturating_mul(a as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((2 as Weight).saturating_mul(n as Weight)))
+			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(m as Weight)))
+			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(a as Weight)))
+	}
+	fn mint() -> Weight {
+		(73_250_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+	}
+	fn burn() -> Weight {
+		(74_443_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+	}
+	fn transfer() -> Weight {
+		(54_690_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+	}
+	fn redeposit(i: u32, ) -> Weight {
+		(0 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((34_624_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(i as Weight)))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
+	}
+	fn freeze() -> Weight {
+		(39_505_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn thaw() -> Weight {
+		(38_844_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn freeze_class() -> Weight {
+		(28_739_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn thaw_class() -> Weight {
+		(28_963_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn transfer_ownership() -> Weight {
+		(65_160_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+	}
+	fn set_team() -> Weight {
+		(30_000_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn force_asset_status() -> Weight {
+		(29_145_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn set_attribute() -> Weight {
+		(88_923_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+	}
+	fn clear_attribute() -> Weight {
+		(79_878_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+	}
+	fn set_metadata() -> Weight {
+		(67_110_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+	}
+	fn clear_metadata() -> Weight {
+		(66_191_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+	}
+	fn set_class_metadata() -> Weight {
+		(65_558_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+	}
+	fn clear_class_metadata() -> Weight {
+		(60_135_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn approve_transfer() -> Weight {
+		(40_337_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn cancel_approval() -> Weight {
+		(40_770_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+}
diff --git a/primitives/arithmetic/src/traits.rs b/primitives/arithmetic/src/traits.rs
index ea297077e351..d0ce921d9d34 100644
--- a/primitives/arithmetic/src/traits.rs
+++ b/primitives/arithmetic/src/traits.rs
@@ -127,6 +127,34 @@ pub trait Saturating {
 	/// Saturating exponentiation. Compute `self.pow(exp)`, saturating at the numeric bounds
 	/// instead of overflowing.
 	fn saturating_pow(self, exp: usize) -> Self;
+
+	/// Increment self by one, saturating.
+	fn saturating_inc(&mut self) where Self: One {
+		let mut o = Self::one();
+		sp_std::mem::swap(&mut o, self);
+		*self = o.saturating_add(One::one());
+	}
+
+	/// Decrement self by one, saturating at zero.
+	fn saturating_dec(&mut self) where Self: One {
+		let mut o = Self::one();
+		sp_std::mem::swap(&mut o, self);
+		*self = o.saturating_sub(One::one());
+	}
+
+	/// Increment self by some `amount`, saturating.
+	fn saturating_accrue(&mut self, amount: Self) where Self: One {
+		let mut o = Self::one();
+		sp_std::mem::swap(&mut o, self);
+		*self = o.saturating_add(amount);
+	}
+
+	/// Decrement self by some `amount`, saturating at zero.
+	fn saturating_reduce(&mut self, amount: Self) where Self: One {
+		let mut o = Self::one();
+		sp_std::mem::swap(&mut o, self);
+		*self = o.saturating_sub(amount);
+	}
 }
 
 impl<T: Clone + Zero + One + PartialOrd + CheckedMul + Bounded + num_traits::Saturating> Saturating for T {

From 45f16302d233a70b2e2a8f9b9316b9a2c0e60d04 Mon Sep 17 00:00:00 2001
From: Boiethios <Boiethios@users.noreply.github.com>
Date: Tue, 1 Jun 2021 22:27:30 +0200
Subject: [PATCH 0820/1194] Update WeakBoundedVec's remove and swap_remove
 (#8985)

Co-authored-by: Boiethios <felix-dev@daudre-vignier.fr>
---
 frame/support/src/storage/weak_bounded_vec.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frame/support/src/storage/weak_bounded_vec.rs b/frame/support/src/storage/weak_bounded_vec.rs
index 606c24de44bb..ca2271df4341 100644
--- a/frame/support/src/storage/weak_bounded_vec.rs
+++ b/frame/support/src/storage/weak_bounded_vec.rs
@@ -72,8 +72,8 @@ impl<T, S> WeakBoundedVec<T, S> {
 	/// # Panics
 	///
 	/// Panics if `index` is out of bounds.
-	pub fn remove(&mut self, index: usize) {
-		self.0.remove(index);
+	pub fn remove(&mut self, index: usize) -> T {
+		self.0.remove(index)
 	}
 
 	/// Exactly the same semantics as [`Vec::swap_remove`].
@@ -81,8 +81,8 @@ impl<T, S> WeakBoundedVec<T, S> {
 	/// # Panics
 	///
 	/// Panics if `index` is out of bounds.
-	pub fn swap_remove(&mut self, index: usize) {
-		self.0.swap_remove(index);
+	pub fn swap_remove(&mut self, index: usize) -> T {
+		self.0.swap_remove(index)
 	}
 
 	/// Exactly the same semantics as [`Vec::retain`].

From 9f621a936eb5c692ad8efea22a9bb9ecf3bd93d3 Mon Sep 17 00:00:00 2001
From: MOZGIII <mike-n@narod.ru>
Date: Tue, 1 Jun 2021 23:48:31 +0300
Subject: [PATCH 0821/1194] Convert another instance of Into impl to From in
 the macros (#8986)

* Convert another instance of Into impl to From in the macros

* Convert another location
---
 .../src/construct_runtime/expand/origin.rs       | 16 ++++++++--------
 frame/support/src/origin.rs                      | 16 ++++++----------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/frame/support/procedural/src/construct_runtime/expand/origin.rs b/frame/support/procedural/src/construct_runtime/expand/origin.rs
index 8ebce237480c..021396e64caa 100644
--- a/frame/support/procedural/src/construct_runtime/expand/origin.rs
+++ b/frame/support/procedural/src/construct_runtime/expand/origin.rs
@@ -227,13 +227,13 @@ pub fn expand_outer_origin(
 			}
 		}
 
-		impl Into<#scrate::sp_std::result::Result<#system_path::Origin<#runtime>, Origin>> for Origin {
+		impl From<Origin> for #scrate::sp_std::result::Result<#system_path::Origin<#runtime>, Origin> {
 			/// NOTE: converting to pallet origin loses the origin filter information.
-			fn into(self) -> #scrate::sp_std::result::Result<#system_path::Origin<#runtime>, Self> {
-				if let OriginCaller::system(l) = self.caller {
+			fn from(val: Origin) -> Self {
+				if let OriginCaller::system(l) = val.caller {
 					Ok(l)
 				} else {
-					Err(self)
+					Err(val)
 				}
 			}
 		}
@@ -314,13 +314,13 @@ fn expand_origin_pallet_conversions(
 			}
 		}
 
-		impl Into<#scrate::sp_std::result::Result<#pallet_origin, Origin>> for Origin {
+		impl From<Origin> for #scrate::sp_std::result::Result<#pallet_origin, Origin> {
 			/// NOTE: converting to pallet origin loses the origin filter information.
-			fn into(self) -> #scrate::sp_std::result::Result<#pallet_origin, Self> {
-				if let OriginCaller::#variant(l) = self.caller {
+			fn from(val: Origin) -> Self {
+				if let OriginCaller::#variant(l) = val.caller {
 					Ok(l)
 				} else {
-					Err(self)
+					Err(val)
 				}
 			}
 		}
diff --git a/frame/support/src/origin.rs b/frame/support/src/origin.rs
index 869296b52f88..4341c7c653e8 100644
--- a/frame/support/src/origin.rs
+++ b/frame/support/src/origin.rs
@@ -382,21 +382,17 @@ macro_rules! impl_outer_origin {
 						x.into()
 					}
 				}
-				impl Into<
-					$crate::sp_std::result::Result<
+				impl From<$name> for $crate::sp_std::result::Result<
 						$module::Origin < $( $generic )? $(, $module::$generic_instance )? >,
 						$name,
-					>>
-				for $name {
+					>
+				{
 					/// NOTE: converting to pallet origin loses the origin filter information.
-					fn into(self) -> $crate::sp_std::result::Result<
-						$module::Origin < $( $generic )? $(, $module::$generic_instance )? >,
-						Self,
-					> {
-						if let $caller_name::[< $module $( _ $generic_instance )? >](l) = self.caller {
+					fn from(val: $name) -> Self {
+						if let $caller_name::[< $module $( _ $generic_instance )? >](l) = val.caller {
 							Ok(l)
 						} else {
-							Err(self)
+							Err(val)
 						}
 					}
 				}

From 4652f9e00f0e3079b9ed40ff806829f17fd1ddcf Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Wed, 2 Jun 2021 00:30:53 -0400
Subject: [PATCH 0822/1194] also fix bounded vec (#8987)

---
 frame/support/src/storage/bounded_vec.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frame/support/src/storage/bounded_vec.rs b/frame/support/src/storage/bounded_vec.rs
index fe58b5cd476a..9575cb4bf4ef 100644
--- a/frame/support/src/storage/bounded_vec.rs
+++ b/frame/support/src/storage/bounded_vec.rs
@@ -75,8 +75,8 @@ impl<T, S> BoundedVec<T, S> {
 	/// # Panics
 	///
 	/// Panics if `index` is out of bounds.
-	pub fn remove(&mut self, index: usize) {
-		self.0.remove(index);
+	pub fn remove(&mut self, index: usize) -> T {
+		self.0.remove(index)
 	}
 
 	/// Exactly the same semantics as [`Vec::swap_remove`].
@@ -84,8 +84,8 @@ impl<T, S> BoundedVec<T, S> {
 	/// # Panics
 	///
 	/// Panics if `index` is out of bounds.
-	pub fn swap_remove(&mut self, index: usize) {
-		self.0.swap_remove(index);
+	pub fn swap_remove(&mut self, index: usize) -> T {
+		self.0.swap_remove(index)
 	}
 
 	/// Exactly the same semantics as [`Vec::retain`].

From 538b15fa8dd61f77254abebd5a3336835f4aebe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Wed, 2 Jun 2021 20:13:47 +0200
Subject: [PATCH 0823/1194] Transactionpool: Make `ready_at` return earlier
 (#8995)

`ready_at` returns when we have processed the requested block. However,
on startup we already have processed the best block and there
are no transactions in the pool on startup anyway. So, we can set `updated_at`
to the best block on startup.

Besides that `ready_at` now returns early when there are no ready nor
any future transactions in the pool.
---
 client/consensus/manual-seal/src/lib.rs | 10 +++-
 client/transaction-pool/src/lib.rs      | 66 ++++++++++++++++++-------
 2 files changed, 58 insertions(+), 18 deletions(-)

diff --git a/client/consensus/manual-seal/src/lib.rs b/client/consensus/manual-seal/src/lib.rs
index 45628e90a6f9..2473ac848ca3 100644
--- a/client/consensus/manual-seal/src/lib.rs
+++ b/client/consensus/manual-seal/src/lib.rs
@@ -296,7 +296,13 @@ mod tests {
 		let client = Arc::new(client);
 		let spawner = sp_core::testing::TaskExecutor::new();
 		let pool = Arc::new(BasicPool::with_revalidation_type(
-			Options::default(), true.into(), api(), None, RevalidationType::Full, spawner.clone(),
+			Options::default(),
+			true.into(),
+			api(),
+			None,
+			RevalidationType::Full,
+			spawner.clone(),
+			0,
 		));
 		let env = ProposerFactory::new(
 			spawner.clone(),
@@ -373,6 +379,7 @@ mod tests {
 			None,
 			RevalidationType::Full,
 			spawner.clone(),
+			0,
 		));
 		let env = ProposerFactory::new(
 			spawner.clone(),
@@ -453,6 +460,7 @@ mod tests {
 			None,
 			RevalidationType::Full,
 			spawner.clone(),
+			0,
 		));
 		let env = ProposerFactory::new(
 			spawner.clone(),
diff --git a/client/transaction-pool/src/lib.rs b/client/transaction-pool/src/lib.rs
index bc5f6e367ff8..32bea107d8ac 100644
--- a/client/transaction-pool/src/lib.rs
+++ b/client/transaction-pool/src/lib.rs
@@ -98,6 +98,13 @@ impl<T, Block: BlockT> Default for ReadyPoll<T, Block> {
 }
 
 impl<T, Block: BlockT> ReadyPoll<T, Block> {
+	fn new(best_block_number: NumberFor<Block>) -> Self {
+		Self {
+			updated_at: best_block_number,
+			pollers: Default::default(),
+		}
+	}
+
 	fn trigger(&mut self, number: NumberFor<Block>, iterator_factory: impl Fn() -> T) {
 		self.updated_at = number;
 
@@ -189,6 +196,7 @@ impl<PoolApi, Block> BasicPool<PoolApi, Block>
 		prometheus: Option<&PrometheusRegistry>,
 		revalidation_type: RevalidationType,
 		spawner: impl SpawnNamed,
+		best_block_number: NumberFor<Block>,
 	) -> Self {
 		let pool = Arc::new(sc_transaction_graph::Pool::new(options, is_validator, pool_api.clone()));
 		let (revalidation_queue, background_task) = match revalidation_type {
@@ -213,7 +221,7 @@ impl<PoolApi, Block> BasicPool<PoolApi, Block>
 					RevalidationType::Full => RevalidationStrategy::Always,
 				}
 			)),
-			ready_poll: Default::default(),
+			ready_poll: Arc::new(Mutex::new(ReadyPoll::new(best_block_number))),
 			metrics: PrometheusMetrics::new(prometheus),
 		}
 	}
@@ -309,21 +317,29 @@ impl<PoolApi, Block> TransactionPool for BasicPool<PoolApi, Block>
 	}
 
 	fn ready_at(&self, at: NumberFor<Self::Block>) -> PolledIterator<PoolApi> {
+		let status = self.status();
+		// If there are no transactions in the pool, it is fine to return early.
+		//
+		// There could be transaction being added because of some re-org happening at the relevant
+		// block, but this is relative unlikely.
+		if status.ready == 0 && status.future == 0 {
+			return async { Box::new(std::iter::empty()) as Box<_> }.boxed()
+		}
+
 		if self.ready_poll.lock().updated_at() >= at {
 			log::trace!(target: "txpool", "Transaction pool already processed block  #{}", at);
 			let iterator: ReadyIteratorFor<PoolApi> = Box::new(self.pool.validated_pool().ready());
-			return Box::pin(futures::future::ready(iterator));
+			return async move { iterator }.boxed();
 		}
 
-		Box::pin(
-			self.ready_poll
-				.lock()
-				.add(at)
-				.map(|received| received.unwrap_or_else(|e| {
-					log::warn!("Error receiving pending set: {:?}", e);
-					Box::new(vec![].into_iter())
-				}))
-		)
+		self.ready_poll
+			.lock()
+			.add(at)
+			.map(|received| received.unwrap_or_else(|e| {
+				log::warn!("Error receiving pending set: {:?}", e);
+				Box::new(std::iter::empty())
+			}))
+			.boxed()
 	}
 
 	fn ready(&self) -> ReadyIteratorFor<PoolApi> {
@@ -334,7 +350,7 @@ impl<PoolApi, Block> TransactionPool for BasicPool<PoolApi, Block>
 impl<Block, Client, Fetcher> LightPool<Block, Client, Fetcher>
 where
 	Block: BlockT,
-	Client: sp_blockchain::HeaderBackend<Block> + 'static,
+	Client: sp_blockchain::HeaderBackend<Block> + sc_client_api::UsageProvider<Block> + 'static,
 	Fetcher: sc_client_api::Fetcher<Block> + 'static,
 {
 	/// Create new basic transaction pool for a light node with the provided api.
@@ -345,9 +361,15 @@ where
 		client: Arc<Client>,
 		fetcher: Arc<Fetcher>,
 	) -> Self {
-		let pool_api = Arc::new(LightChainApi::new(client, fetcher));
+		let pool_api = Arc::new(LightChainApi::new(client.clone(), fetcher));
 		Self::with_revalidation_type(
-			options, false.into(), pool_api, prometheus, RevalidationType::Light, spawner,
+			options,
+			false.into(),
+			pool_api,
+			prometheus,
+			RevalidationType::Light,
+			spawner,
+			client.usage_info().chain.best_number,
 		)
 	}
 }
@@ -357,8 +379,12 @@ where
 	Block: BlockT,
 	Client: sp_api::ProvideRuntimeApi<Block>
 		+ sc_client_api::BlockBackend<Block>
-		+ sp_runtime::traits::BlockIdTo<Block>,
-	Client: sc_client_api::ExecutorProvider<Block> + Send + Sync + 'static,
+		+ sp_runtime::traits::BlockIdTo<Block>
+		+ sc_client_api::ExecutorProvider<Block>
+		+ sc_client_api::UsageProvider<Block>
+		+ Send
+		+ Sync
+		+ 'static,
 	Client::Api: sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block>,
 {
 	/// Create new basic transaction pool for a full node with the provided api.
@@ -371,7 +397,13 @@ where
 	) -> Arc<Self> {
 		let pool_api = Arc::new(FullChainApi::new(client.clone(), prometheus));
 		let pool = Arc::new(Self::with_revalidation_type(
-			options, is_validator, pool_api, prometheus, RevalidationType::Full, spawner
+			options,
+			is_validator,
+			pool_api,
+			prometheus,
+			RevalidationType::Full,
+			spawner,
+			client.usage_info().chain.best_number,
 		));
 
 		// make transaction pool available for off-chain runtime calls.

From 437c83817805c39f0f5f5101dfa26f13cc4a4758 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Wed, 2 Jun 2021 20:41:21 +0200
Subject: [PATCH 0824/1194] Discard notifications if we have failed to parse
 handshake (#8806)

---
 client/network/src/protocol.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index 6dafd8b85f35..6431250c96f3 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -1517,6 +1517,9 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 						);
 						CustomMessageOutcome::None
 					}
+					_ if self.bad_handshake_substreams.contains(&(peer_id.clone(), set_id)) => {
+						CustomMessageOutcome::None
+					}
 					_ => {
 						let protocol_name = self.notification_protocols[usize::from(set_id) - NUM_HARDCODED_PEERSETS].clone();
 						CustomMessageOutcome::NotificationsReceived {

From 94679ebd37f4989f8f7803d4f9aa403b7ba9aead Mon Sep 17 00:00:00 2001
From: Shaun Wang <spxwang@gmail.com>
Date: Thu, 3 Jun 2021 20:30:21 +1200
Subject: [PATCH 0825/1194] Migrate pallet-democracy to pallet attribute macro
 (#8824)

* Migrate pallet-democracy to pallet attribute macro.

* Metadata fix.

* Trigger CI.
---
 bin/node/runtime/src/lib.rs           |   2 +-
 frame/democracy/src/benchmarking.rs   |  15 +-
 frame/democracy/src/lib.rs            | 764 +++++++++++++++-----------
 frame/democracy/src/tests.rs          |   8 +-
 frame/democracy/src/tests/decoders.rs |   2 +-
 5 files changed, 450 insertions(+), 341 deletions(-)

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index f92ca963bb62..3732adfb9a78 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -1131,7 +1131,7 @@ construct_runtime!(
 		ElectionProviderMultiPhase: pallet_election_provider_multi_phase::{Pallet, Call, Storage, Event<T>, ValidateUnsigned},
 		Staking: pallet_staking::{Pallet, Call, Config<T>, Storage, Event<T>},
 		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
-		Democracy: pallet_democracy::{Pallet, Call, Storage, Config, Event<T>},
+		Democracy: pallet_democracy::{Pallet, Call, Storage, Config<T>, Event<T>},
 		Council: pallet_collective::<Instance1>::{Pallet, Call, Storage, Origin<T>, Event<T>, Config<T>},
 		TechnicalCommittee: pallet_collective::<Instance2>::{Pallet, Call, Storage, Origin<T>, Event<T>, Config<T>},
 		Elections: pallet_elections_phragmen::{Pallet, Call, Storage, Event<T>, Config<T>},
diff --git a/frame/democracy/src/benchmarking.rs b/frame/democracy/src/benchmarking.rs
index 2e7af74b22d5..6cf35553f536 100644
--- a/frame/democracy/src/benchmarking.rs
+++ b/frame/democracy/src/benchmarking.rs
@@ -21,9 +21,8 @@ use super::*;
 
 use frame_benchmarking::{benchmarks, account, whitelist_account, impl_benchmark_test_suite};
 use frame_support::{
-	assert_noop, assert_ok, IterableStorageMap,
-	traits::{Currency, Get, EnsureOrigin, OnInitialize, UnfilteredDispatchable,
-        schedule::DispatchTime},
+	assert_noop, assert_ok,
+	traits::{Currency, Get, EnsureOrigin, OnInitialize, UnfilteredDispatchable, schedule::DispatchTime},
 };
 use frame_system::{RawOrigin, Pallet as System, self};
 use sp_runtime::traits::{Bounded, One};
@@ -69,13 +68,13 @@ fn add_referendum<T: Config>(n: u32) -> Result<ReferendumIndex, &'static str> {
 		vote_threshold,
 		0u32.into(),
 	);
-	let referendum_index: ReferendumIndex = ReferendumCount::get() - 1;
+	let referendum_index: ReferendumIndex = ReferendumCount::<T>::get() - 1;
 	T::Scheduler::schedule_named(
 		(DEMOCRACY_ID, referendum_index).encode(),
 		DispatchTime::At(1u32.into()),
 		None,
 		63,
-		system::RawOrigin::Root.into(),
+		frame_system::RawOrigin::Root.into(),
 		Call::enact_proposal(proposal_hash, referendum_index).into(),
 	).map_err(|_| "failed to schedule named")?;
 	Ok(referendum_index)
@@ -360,7 +359,7 @@ benchmarks! {
 		assert_eq!(Democracy::<T>::referendum_count(), r, "referenda not created");
 
 		// Launch external
-		LastTabledWasExternal::put(false);
+		LastTabledWasExternal::<T>::put(false);
 
 		let origin = T::ExternalMajorityOrigin::successful_origin();
 		let proposal_hash = T::Hashing::hash_of(&r);
@@ -402,7 +401,7 @@ benchmarks! {
 
 		// Launch public
 		assert!(add_proposal::<T>(r).is_ok(), "proposal not created");
-		LastTabledWasExternal::put(true);
+		LastTabledWasExternal::<T>::put(true);
 
 		let block_number = T::LaunchPeriod::get();
 
@@ -760,7 +759,7 @@ benchmarks! {
 	}: enact_proposal(RawOrigin::Root, proposal_hash, 0)
 	verify {
 		// Fails due to mismatched origin
-		assert_last_event::<T>(RawEvent::Executed(0, false).into());
+		assert_last_event::<T>(Event::<T>::Executed(0, false).into());
 	}
 
 	#[extra]
diff --git a/frame/democracy/src/lib.rs b/frame/democracy/src/lib.rs
index 6fdff1aa5a6a..70b943bf00d5 100644
--- a/frame/democracy/src/lib.rs
+++ b/frame/democracy/src/lib.rs
@@ -159,15 +159,12 @@ use sp_runtime::{
 };
 use codec::{Encode, Decode, Input};
 use frame_support::{
-	decl_module, decl_storage, decl_event, decl_error, ensure, Parameter,
-	weights::{Weight, DispatchClass, Pays},
+	ensure, weights::Weight,
 	traits::{
 		Currency, ReservableCurrency, LockableCurrency, WithdrawReasons, LockIdentifier, Get,
-		OnUnbalanced, BalanceStatus, schedule::{Named as ScheduleNamed, DispatchTime}, EnsureOrigin
+		OnUnbalanced, BalanceStatus, schedule::{Named as ScheduleNamed, DispatchTime},
 	},
-	dispatch::DispatchResultWithPostInfo,
 };
-use frame_system::{self as system, ensure_signed, ensure_root};
 
 mod vote_threshold;
 mod vote;
@@ -179,6 +176,7 @@ pub use vote_threshold::{Approved, VoteThreshold};
 pub use vote::{Vote, AccountVote, Voting};
 pub use conviction::Conviction;
 pub use types::{ReferendumInfo, ReferendumStatus, Tally, UnvoteScope, Delegations};
+pub use pallet::*;
 
 #[cfg(test)]
 mod tests;
@@ -203,108 +201,6 @@ type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Con
 type NegativeImbalanceOf<T> =
 	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
 
-pub trait Config: frame_system::Config + Sized {
-	type Proposal: Parameter + Dispatchable<Origin=Self::Origin> + From<Call<Self>>;
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
-
-	/// Currency type for this module.
-	type Currency: ReservableCurrency<Self::AccountId>
-		+ LockableCurrency<Self::AccountId, Moment=Self::BlockNumber>;
-
-	/// The minimum period of locking and the period between a proposal being approved and enacted.
-	///
-	/// It should generally be a little more than the unstake period to ensure that
-	/// voting stakers have an opportunity to remove themselves from the system in the case where
-	/// they are on the losing side of a vote.
-	type EnactmentPeriod: Get<Self::BlockNumber>;
-
-	/// How often (in blocks) new public referenda are launched.
-	type LaunchPeriod: Get<Self::BlockNumber>;
-
-	/// How often (in blocks) to check for new votes.
-	type VotingPeriod: Get<Self::BlockNumber>;
-
-	/// The minimum amount to be used as a deposit for a public referendum proposal.
-	type MinimumDeposit: Get<BalanceOf<Self>>;
-
-	/// Origin from which the next tabled referendum may be forced. This is a normal
-	/// "super-majority-required" referendum.
-	type ExternalOrigin: EnsureOrigin<Self::Origin>;
-
-	/// Origin from which the next tabled referendum may be forced; this allows for the tabling of
-	/// a majority-carries referendum.
-	type ExternalMajorityOrigin: EnsureOrigin<Self::Origin>;
-
-	/// Origin from which the next tabled referendum may be forced; this allows for the tabling of
-	/// a negative-turnout-bias (default-carries) referendum.
-	type ExternalDefaultOrigin: EnsureOrigin<Self::Origin>;
-
-	/// Origin from which the next majority-carries (or more permissive) referendum may be tabled to
-	/// vote according to the `FastTrackVotingPeriod` asynchronously in a similar manner to the
-	/// emergency origin. It retains its threshold method.
-	type FastTrackOrigin: EnsureOrigin<Self::Origin>;
-
-	/// Origin from which the next majority-carries (or more permissive) referendum may be tabled to
-	/// vote immediately and asynchronously in a similar manner to the emergency origin. It retains
-	/// its threshold method.
-	type InstantOrigin: EnsureOrigin<Self::Origin>;
-
-	/// Indicator for whether an emergency origin is even allowed to happen. Some chains may want
-	/// to set this permanently to `false`, others may want to condition it on things such as
-	/// an upgrade having happened recently.
-	type InstantAllowed: Get<bool>;
-
-	/// Minimum voting period allowed for a fast-track referendum.
-	type FastTrackVotingPeriod: Get<Self::BlockNumber>;
-
-	/// Origin from which any referendum may be cancelled in an emergency.
-	type CancellationOrigin: EnsureOrigin<Self::Origin>;
-
-	/// Origin from which proposals may be blacklisted.
-	type BlacklistOrigin: EnsureOrigin<Self::Origin>;
-
-	/// Origin from which a proposal may be cancelled and its backers slashed.
-	type CancelProposalOrigin: EnsureOrigin<Self::Origin>;
-
-	/// Origin for anyone able to veto proposals.
-	///
-	/// # Warning
-	///
-	/// The number of Vetoers for a proposal must be small, extrinsics are weighted according to
-	/// [MAX_VETOERS](./const.MAX_VETOERS.html)
-	type VetoOrigin: EnsureOrigin<Self::Origin, Success=Self::AccountId>;
-
-	/// Period in blocks where an external proposal may not be re-submitted after being vetoed.
-	type CooloffPeriod: Get<Self::BlockNumber>;
-
-	/// The amount of balance that must be deposited per byte of preimage stored.
-	type PreimageByteDeposit: Get<BalanceOf<Self>>;
-
-	/// An origin that can provide a preimage using operational extrinsics.
-	type OperationalPreimageOrigin: EnsureOrigin<Self::Origin, Success=Self::AccountId>;
-
-	/// Handler for the unbalanced reduction when slashing a preimage deposit.
-	type Slash: OnUnbalanced<NegativeImbalanceOf<Self>>;
-
-	/// The Scheduler.
-	type Scheduler: ScheduleNamed<Self::BlockNumber, Self::Proposal, Self::PalletsOrigin>;
-
-	/// Overarching type of all pallets origins.
-	type PalletsOrigin: From<system::RawOrigin<Self::AccountId>>;
-
-	/// The maximum number of votes for an account.
-	///
-	/// Also used to compute weight, an overly big value can
-	/// lead to extrinsic with very big weight: see `delegate` for instance.
-	type MaxVotes: Get<u32>;
-
-	/// Weight information for extrinsics in this pallet.
-	type WeightInfo: WeightInfo;
-
-	/// The maximum number of public proposals that can exist at any time.
-	type MaxProposals: Get<u32>;
-}
-
 #[derive(Clone, Encode, Decode, RuntimeDebug)]
 pub enum PreimageStatus<AccountId, Balance, BlockNumber> {
 	/// The preimage is imminently needed at the argument.
@@ -337,90 +233,273 @@ enum Releases {
 	V1,
 }
 
-decl_storage! {
-	trait Store for Module<T: Config> as Democracy {
-		// TODO: Refactor public proposal queue into its own pallet.
-		// https://github.com/paritytech/substrate/issues/5322
-		/// The number of (public) proposals that have been made so far.
-		pub PublicPropCount get(fn public_prop_count) build(|_| 0 as PropIndex) : PropIndex;
-		/// The public proposals. Unsorted. The second item is the proposal's hash.
-		pub PublicProps get(fn public_props): Vec<(PropIndex, T::Hash, T::AccountId)>;
-		/// Those who have locked a deposit.
-		///
-		/// TWOX-NOTE: Safe, as increasing integer keys are safe.
-		pub DepositOf get(fn deposit_of):
-			map hasher(twox_64_concat) PropIndex => Option<(Vec<T::AccountId>, BalanceOf<T>)>;
-
-		/// Map of hashes to the proposal preimage, along with who registered it and their deposit.
-		/// The block number is the block at which it was deposited.
-		// TODO: Refactor Preimages into its own pallet.
-		// https://github.com/paritytech/substrate/issues/5322
-		pub Preimages:
-			map hasher(identity) T::Hash
-			=> Option<PreimageStatus<T::AccountId, BalanceOf<T>, T::BlockNumber>>;
-
-		/// The next free referendum index, aka the number of referenda started so far.
-		pub ReferendumCount get(fn referendum_count) build(|_| 0 as ReferendumIndex): ReferendumIndex;
-		/// The lowest referendum index representing an unbaked referendum. Equal to
-		/// `ReferendumCount` if there isn't a unbaked referendum.
-		pub LowestUnbaked get(fn lowest_unbaked) build(|_| 0 as ReferendumIndex): ReferendumIndex;
-
-		/// Information concerning any given referendum.
-		///
-		/// TWOX-NOTE: SAFE as indexes are not under an attacker’s control.
-		pub ReferendumInfoOf get(fn referendum_info):
-			map hasher(twox_64_concat) ReferendumIndex
-			=> Option<ReferendumInfo<T::BlockNumber, T::Hash, BalanceOf<T>>>;
-
-		/// All votes for a particular voter. We store the balance for the number of votes that we
-		/// have recorded. The second item is the total amount of delegations, that will be added.
-		///
-		/// TWOX-NOTE: SAFE as `AccountId`s are crypto hashes anyway.
-		pub VotingOf: map hasher(twox_64_concat) T::AccountId => Voting<BalanceOf<T>, T::AccountId, T::BlockNumber>;
-
-		/// Accounts for which there are locks in action which may be removed at some point in the
-		/// future. The value is the block number at which the lock expires and may be removed.
-		///
-		/// TWOX-NOTE: OK ― `AccountId` is a secure hash.
-		pub Locks get(fn locks): map hasher(twox_64_concat) T::AccountId => Option<T::BlockNumber>;
-
-		/// True if the last referendum tabled was submitted externally. False if it was a public
-		/// proposal.
-		// TODO: There should be any number of tabling origins, not just public and "external" (council).
-		// https://github.com/paritytech/substrate/issues/5322
-		pub LastTabledWasExternal: bool;
-
-		/// The referendum to be tabled whenever it would be valid to table an external proposal.
-		/// This happens when a referendum needs to be tabled and one of two conditions are met:
-		/// - `LastTabledWasExternal` is `false`; or
-		/// - `PublicProps` is empty.
-		pub NextExternal: Option<(T::Hash, VoteThreshold)>;
-
-		/// A record of who vetoed what. Maps proposal hash to a possible existent block number
-		/// (until when it may not be resubmitted) and who vetoed it.
-		pub Blacklist: map hasher(identity) T::Hash => Option<(T::BlockNumber, Vec<T::AccountId>)>;
-
-		/// Record of all proposals that have been subject to emergency cancellation.
-		pub Cancellations: map hasher(identity) T::Hash => bool;
-
-		/// Storage version of the pallet.
-		///
-		/// New networks start with last version.
-		StorageVersion build(|_| Some(Releases::V1)): Option<Releases>;
+#[frame_support::pallet]
+pub mod pallet {
+	use sp_runtime::DispatchResult;
+	use frame_support::{
+		pallet_prelude::*, Parameter,
+		weights::{DispatchClass, Pays}, traits::EnsureOrigin, dispatch::DispatchResultWithPostInfo,
+	};
+	use frame_system::{pallet_prelude::*, ensure_signed, ensure_root};
+	use super::*;
+
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(_);
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config + Sized {
+		type Proposal: Parameter + Dispatchable<Origin=Self::Origin> + From<Call<Self>>;
+		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
+
+		/// Currency type for this pallet.
+		type Currency: ReservableCurrency<Self::AccountId>
+			+ LockableCurrency<Self::AccountId, Moment=Self::BlockNumber>;
+
+		/// The minimum period of locking and the period between a proposal being approved and enacted.
+		///
+		/// It should generally be a little more than the unstake period to ensure that
+		/// voting stakers have an opportunity to remove themselves from the system in the case where
+		/// they are on the losing side of a vote.
+		#[pallet::constant]
+		type EnactmentPeriod: Get<Self::BlockNumber>;
+
+		/// How often (in blocks) new public referenda are launched.
+		#[pallet::constant]
+		type LaunchPeriod: Get<Self::BlockNumber>;
+
+		/// How often (in blocks) to check for new votes.
+		#[pallet::constant]
+		type VotingPeriod: Get<Self::BlockNumber>;
+
+		/// The minimum amount to be used as a deposit for a public referendum proposal.
+		#[pallet::constant]
+		type MinimumDeposit: Get<BalanceOf<Self>>;
+
+		/// Origin from which the next tabled referendum may be forced. This is a normal
+		/// "super-majority-required" referendum.
+		type ExternalOrigin: EnsureOrigin<Self::Origin>;
+
+		/// Origin from which the next tabled referendum may be forced; this allows for the tabling of
+		/// a majority-carries referendum.
+		type ExternalMajorityOrigin: EnsureOrigin<Self::Origin>;
+
+		/// Origin from which the next tabled referendum may be forced; this allows for the tabling of
+		/// a negative-turnout-bias (default-carries) referendum.
+		type ExternalDefaultOrigin: EnsureOrigin<Self::Origin>;
+
+		/// Origin from which the next majority-carries (or more permissive) referendum may be tabled to
+		/// vote according to the `FastTrackVotingPeriod` asynchronously in a similar manner to the
+		/// emergency origin. It retains its threshold method.
+		type FastTrackOrigin: EnsureOrigin<Self::Origin>;
+
+		/// Origin from which the next majority-carries (or more permissive) referendum may be tabled to
+		/// vote immediately and asynchronously in a similar manner to the emergency origin. It retains
+		/// its threshold method.
+		type InstantOrigin: EnsureOrigin<Self::Origin>;
+
+		/// Indicator for whether an emergency origin is even allowed to happen. Some chains may want
+		/// to set this permanently to `false`, others may want to condition it on things such as
+		/// an upgrade having happened recently.
+		type InstantAllowed: Get<bool>;
+
+		/// Minimum voting period allowed for a fast-track referendum.
+		#[pallet::constant]
+		type FastTrackVotingPeriod: Get<Self::BlockNumber>;
+
+		/// Origin from which any referendum may be cancelled in an emergency.
+		type CancellationOrigin: EnsureOrigin<Self::Origin>;
+
+		/// Origin from which proposals may be blacklisted.
+		type BlacklistOrigin: EnsureOrigin<Self::Origin>;
+
+		/// Origin from which a proposal may be cancelled and its backers slashed.
+		type CancelProposalOrigin: EnsureOrigin<Self::Origin>;
+
+		/// Origin for anyone able to veto proposals.
+		///
+		/// # Warning
+		///
+		/// The number of Vetoers for a proposal must be small, extrinsics are weighted according to
+		/// [MAX_VETOERS](./const.MAX_VETOERS.html)
+		type VetoOrigin: EnsureOrigin<Self::Origin, Success=Self::AccountId>;
+
+		/// Period in blocks where an external proposal may not be re-submitted after being vetoed.
+		#[pallet::constant]
+		type CooloffPeriod: Get<Self::BlockNumber>;
+
+		/// The amount of balance that must be deposited per byte of preimage stored.
+		#[pallet::constant]
+		type PreimageByteDeposit: Get<BalanceOf<Self>>;
+
+		/// An origin that can provide a preimage using operational extrinsics.
+		type OperationalPreimageOrigin: EnsureOrigin<Self::Origin, Success=Self::AccountId>;
+
+		/// Handler for the unbalanced reduction when slashing a preimage deposit.
+		type Slash: OnUnbalanced<NegativeImbalanceOf<Self>>;
+
+		/// The Scheduler.
+		type Scheduler: ScheduleNamed<Self::BlockNumber, Self::Proposal, Self::PalletsOrigin>;
+
+		/// Overarching type of all pallets origins.
+		type PalletsOrigin: From<frame_system::RawOrigin<Self::AccountId>>;
+
+		/// The maximum number of votes for an account.
+		///
+		/// Also used to compute weight, an overly big value can
+		/// lead to extrinsic with very big weight: see `delegate` for instance.
+		#[pallet::constant]
+		type MaxVotes: Get<u32>;
+
+		/// Weight information for extrinsics in this pallet.
+		type WeightInfo: WeightInfo;
+
+		/// The maximum number of public proposals that can exist at any time.
+		type MaxProposals: Get<u32>;
 	}
-}
 
-decl_event! {
-	pub enum Event<T> where
-		Balance = BalanceOf<T>,
-		<T as frame_system::Config>::AccountId,
-		<T as frame_system::Config>::Hash,
-		<T as frame_system::Config>::BlockNumber,
-	{
+	// TODO: Refactor public proposal queue into its own pallet.
+	// https://github.com/paritytech/substrate/issues/5322
+	/// The number of (public) proposals that have been made so far.
+	#[pallet::storage]
+	#[pallet::getter(fn public_prop_count)]
+	pub type PublicPropCount<T> = StorageValue<_, PropIndex, ValueQuery>;
+
+	/// The public proposals. Unsorted. The second item is the proposal's hash.
+	#[pallet::storage]
+	#[pallet::getter(fn public_props)]
+	pub type PublicProps<T: Config> = StorageValue<_, Vec<(PropIndex, T::Hash, T::AccountId)>, ValueQuery>;
+
+	/// Those who have locked a deposit.
+	///
+	/// TWOX-NOTE: Safe, as increasing integer keys are safe.
+	#[pallet::storage]
+	#[pallet::getter(fn deposit_of)]
+	pub type DepositOf<T: Config> = StorageMap<
+		_,
+		Twox64Concat, PropIndex,
+		(Vec<T::AccountId>, BalanceOf<T>),
+	>;
+
+	/// Map of hashes to the proposal preimage, along with who registered it and their deposit.
+	/// The block number is the block at which it was deposited.
+	// TODO: Refactor Preimages into its own pallet.
+	// https://github.com/paritytech/substrate/issues/5322
+	#[pallet::storage]
+	pub type Preimages<T: Config> = StorageMap<
+		_,
+		Identity, T::Hash,
+		PreimageStatus<T::AccountId, BalanceOf<T>, T::BlockNumber>,
+	>;
+
+	/// The next free referendum index, aka the number of referenda started so far.
+	#[pallet::storage]
+	#[pallet::getter(fn referendum_count)]
+	pub type ReferendumCount<T> = StorageValue<_, ReferendumIndex, ValueQuery>;
+
+	/// The lowest referendum index representing an unbaked referendum. Equal to
+	/// `ReferendumCount` if there isn't a unbaked referendum.
+	#[pallet::storage]
+	#[pallet::getter(fn lowest_unbaked)]
+	pub type LowestUnbaked<T> = StorageValue<_, ReferendumIndex, ValueQuery>;
+
+	/// Information concerning any given referendum.
+	///
+	/// TWOX-NOTE: SAFE as indexes are not under an attacker’s control.
+	#[pallet::storage]
+	#[pallet::getter(fn referendum_info)]
+	pub type ReferendumInfoOf<T: Config> = StorageMap<
+		_,
+		Twox64Concat, ReferendumIndex,
+		ReferendumInfo<T::BlockNumber, T::Hash, BalanceOf<T>>,
+	>;
+
+	/// All votes for a particular voter. We store the balance for the number of votes that we
+	/// have recorded. The second item is the total amount of delegations, that will be added.
+	///
+	/// TWOX-NOTE: SAFE as `AccountId`s are crypto hashes anyway.
+	#[pallet::storage]
+	pub type VotingOf<T: Config> = StorageMap<
+		_, Twox64Concat, T::AccountId,
+		Voting<BalanceOf<T>, T::AccountId, T::BlockNumber>,
+		ValueQuery,
+	>;
+
+	/// Accounts for which there are locks in action which may be removed at some point in the
+	/// future. The value is the block number at which the lock expires and may be removed.
+	///
+	/// TWOX-NOTE: OK ― `AccountId` is a secure hash.
+	#[pallet::storage]
+	#[pallet::getter(fn locks)]
+	pub type Locks<T: Config> = StorageMap<_, Twox64Concat, T::AccountId, T::BlockNumber>;
+
+	/// True if the last referendum tabled was submitted externally. False if it was a public
+	/// proposal.
+	// TODO: There should be any number of tabling origins, not just public and "external" (council).
+	// https://github.com/paritytech/substrate/issues/5322
+	#[pallet::storage]
+	pub type LastTabledWasExternal<T> = StorageValue<_, bool, ValueQuery>;
+
+	/// The referendum to be tabled whenever it would be valid to table an external proposal.
+	/// This happens when a referendum needs to be tabled and one of two conditions are met:
+	/// - `LastTabledWasExternal` is `false`; or
+	/// - `PublicProps` is empty.
+	#[pallet::storage]
+	pub type NextExternal<T: Config> = StorageValue<_, (T::Hash, VoteThreshold)>;
+
+	/// A record of who vetoed what. Maps proposal hash to a possible existent block number
+	/// (until when it may not be resubmitted) and who vetoed it.
+	#[pallet::storage]
+	pub type Blacklist<T: Config> = StorageMap<_, Identity, T::Hash, (T::BlockNumber, Vec<T::AccountId>)>;
+
+	/// Record of all proposals that have been subject to emergency cancellation.
+	#[pallet::storage]
+	pub type Cancellations<T: Config> = StorageMap<_, Identity, T::Hash, bool, ValueQuery>;
+
+	/// Storage version of the pallet.
+	///
+	/// New networks start with last version.
+	#[pallet::storage]
+	pub(crate) type StorageVersion<T> = StorageValue<_, Releases>;
+
+	#[pallet::genesis_config]
+	pub struct GenesisConfig<T: Config> {
+		_phantom: sp_std::marker::PhantomData<T>,
+	}
+
+	#[cfg(feature = "std")]
+	impl<T: Config> Default for GenesisConfig<T> {
+		fn default() -> Self {
+			GenesisConfig {
+				_phantom: Default::default(),
+			}
+		}
+	}
+
+	#[pallet::genesis_build]
+	impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+		fn build(&self) {
+			PublicPropCount::<T>::put(0 as PropIndex);
+			ReferendumCount::<T>::put(0 as ReferendumIndex);
+			LowestUnbaked::<T>::put(0 as ReferendumIndex);
+			StorageVersion::<T>::put(Releases::V1);
+		}
+	}
+
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	#[pallet::metadata(
+		T::AccountId = "AccountId",
+		Vec<T::AccountId> = "Vec<AccountId>",
+		BalanceOf<T> = "Balance",
+		T::BlockNumber = "BlockNumber",
+		T::Hash = "Hash",
+	)]
+	pub enum Event<T: Config> {
 		/// A motion has been proposed by a public account. \[proposal_index, deposit\]
-		Proposed(PropIndex, Balance),
+		Proposed(PropIndex, BalanceOf<T>),
 		/// A public proposal has been tabled for referendum vote. \[proposal_index, deposit, depositors\]
-		Tabled(PropIndex, Balance, Vec<AccountId>),
+		Tabled(PropIndex, BalanceOf<T>, Vec<T::AccountId>),
 		/// An external proposal has been tabled.
 		ExternalTabled,
 		/// A referendum has begun. \[ref_index, threshold\]
@@ -434,34 +513,33 @@ decl_event! {
 		/// A proposal has been enacted. \[ref_index, is_ok\]
 		Executed(ReferendumIndex, bool),
 		/// An account has delegated their vote to another account. \[who, target\]
-		Delegated(AccountId, AccountId),
+		Delegated(T::AccountId, T::AccountId),
 		/// An \[account\] has cancelled a previous delegation operation.
-		Undelegated(AccountId),
+		Undelegated(T::AccountId),
 		/// An external proposal has been vetoed. \[who, proposal_hash, until\]
-		Vetoed(AccountId, Hash, BlockNumber),
+		Vetoed(T::AccountId, T::Hash, T::BlockNumber),
 		/// A proposal's preimage was noted, and the deposit taken. \[proposal_hash, who, deposit\]
-		PreimageNoted(Hash, AccountId, Balance),
+		PreimageNoted(T::Hash, T::AccountId, BalanceOf<T>),
 		/// A proposal preimage was removed and used (the deposit was returned).
 		/// \[proposal_hash, provider, deposit\]
-		PreimageUsed(Hash, AccountId, Balance),
+		PreimageUsed(T::Hash, T::AccountId, BalanceOf<T>),
 		/// A proposal could not be executed because its preimage was invalid.
 		/// \[proposal_hash, ref_index\]
-		PreimageInvalid(Hash, ReferendumIndex),
+		PreimageInvalid(T::Hash, ReferendumIndex),
 		/// A proposal could not be executed because its preimage was missing.
 		/// \[proposal_hash, ref_index\]
-		PreimageMissing(Hash, ReferendumIndex),
+		PreimageMissing(T::Hash, ReferendumIndex),
 		/// A registered preimage was removed and the deposit collected by the reaper.
 		/// \[proposal_hash, provider, deposit, reaper\]
-		PreimageReaped(Hash, AccountId, Balance, AccountId),
+		PreimageReaped(T::Hash, T::AccountId, BalanceOf<T>, T::AccountId),
 		/// An \[account\] has been unlocked successfully.
-		Unlocked(AccountId),
+		Unlocked(T::AccountId),
 		/// A proposal \[hash\] has been blacklisted permanently.
-		Blacklisted(Hash),
+		Blacklisted(T::Hash),
 	}
-}
 
-decl_error! {
-	pub enum Error for Module<T: Config> {
+	#[pallet::error]
+	pub enum Error<T> {
 		/// Value too low
 		ValueLow,
 		/// Proposal does not exist
@@ -530,42 +608,20 @@ decl_error! {
 		/// Maximum number of proposals reached.
 		TooManyProposals,
 	}
-}
-
-decl_module! {
-	pub struct Module<T: Config> for enum Call where origin: T::Origin {
-		type Error = Error<T>;
-
-		/// The minimum period of locking and the period between a proposal being approved and enacted.
-		///
-		/// It should generally be a little more than the unstake period to ensure that
-		/// voting stakers have an opportunity to remove themselves from the system in the case where
-		/// they are on the losing side of a vote.
-		const EnactmentPeriod: T::BlockNumber = T::EnactmentPeriod::get();
-
-		/// How often (in blocks) new public referenda are launched.
-		const LaunchPeriod: T::BlockNumber = T::LaunchPeriod::get();
-
-		/// How often (in blocks) to check for new votes.
-		const VotingPeriod: T::BlockNumber = T::VotingPeriod::get();
-
-		/// The minimum amount to be used as a deposit for a public referendum proposal.
-		const MinimumDeposit: BalanceOf<T> = T::MinimumDeposit::get();
-
-		/// Minimum voting period allowed for an emergency referendum.
-		const FastTrackVotingPeriod: T::BlockNumber = T::FastTrackVotingPeriod::get();
 
-		/// Period in blocks where an external proposal may not be re-submitted after being vetoed.
-		const CooloffPeriod: T::BlockNumber = T::CooloffPeriod::get();
-
-		/// The amount of balance that must be deposited per byte of preimage stored.
-		const PreimageByteDeposit: BalanceOf<T> = T::PreimageByteDeposit::get();
-
-		/// The maximum number of votes for an account.
-		const MaxVotes: u32 = T::MaxVotes::get();
-
-		fn deposit_event() = default;
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+		/// Weight: see `begin_block`
+		fn on_initialize(n: T::BlockNumber) -> Weight {
+			Self::begin_block(n).unwrap_or_else(|e| {
+				sp_runtime::print(e);
+				0
+			})
+		}
+	}
 
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
 		/// Propose a sensitive action to be taken.
 		///
 		/// The dispatch origin of this call must be _Signed_ and the sender must
@@ -577,11 +633,12 @@ decl_module! {
 		/// Emits `Proposed`.
 		///
 		/// Weight: `O(p)`
-		#[weight = T::WeightInfo::propose()]
-		fn propose(origin,
+		#[pallet::weight(T::WeightInfo::propose())]
+		pub(crate) fn propose(
+			origin: OriginFor<T>,
 			proposal_hash: T::Hash,
-			#[compact] value: BalanceOf<T>,
-		) {
+			#[pallet::compact] value: BalanceOf<T>,
+		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			ensure!(value >= T::MinimumDeposit::get(), Error::<T>::ValueLow);
 
@@ -598,12 +655,13 @@ decl_module! {
 			}
 
 			T::Currency::reserve(&who, value)?;
-			PublicPropCount::put(index + 1);
+			PublicPropCount::<T>::put(index + 1);
 			<DepositOf<T>>::insert(index, (&[&who][..], value));
 
 			<PublicProps<T>>::append((index, proposal_hash, who));
 
-			Self::deposit_event(RawEvent::Proposed(index, value));
+			Self::deposit_event(Event::<T>::Proposed(index, value));
+			Ok(())
 		}
 
 		/// Signals agreement with a particular proposal.
@@ -616,8 +674,12 @@ decl_module! {
 		///   proposal. Extrinsic is weighted according to this value with no refund.
 		///
 		/// Weight: `O(S)` where S is the number of seconds a proposal already has.
-		#[weight = T::WeightInfo::second(*seconds_upper_bound)]
-		fn second(origin, #[compact] proposal: PropIndex, #[compact] seconds_upper_bound: u32) {
+		#[pallet::weight(T::WeightInfo::second(*seconds_upper_bound))]
+		pub(crate) fn second(
+			origin: OriginFor<T>,
+			#[pallet::compact] proposal: PropIndex,
+			#[pallet::compact] seconds_upper_bound: u32,
+		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 
 			let seconds = Self::len_of_deposit_of(proposal)
@@ -628,6 +690,7 @@ decl_module! {
 			T::Currency::reserve(&who, deposit.1)?;
 			deposit.0.push(who);
 			<DepositOf<T>>::insert(proposal, deposit);
+			Ok(())
 		}
 
 		/// Vote in a referendum. If `vote.is_aye()`, the vote is to enact the proposal;
@@ -639,10 +702,13 @@ decl_module! {
 		/// - `vote`: The vote configuration.
 		///
 		/// Weight: `O(R)` where R is the number of referendums the voter has voted on.
-		#[weight = T::WeightInfo::vote_new(T::MaxVotes::get())
-			.max(T::WeightInfo::vote_existing(T::MaxVotes::get()))]
-		fn vote(origin,
-			#[compact] ref_index: ReferendumIndex,
+		#[pallet::weight(
+			T::WeightInfo::vote_new(T::MaxVotes::get())
+				.max(T::WeightInfo::vote_existing(T::MaxVotes::get()))
+		)]
+		pub(crate) fn vote(
+			origin: OriginFor<T>,
+			#[pallet::compact] ref_index: ReferendumIndex,
 			vote: AccountVote<BalanceOf<T>>,
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
@@ -657,8 +723,8 @@ decl_module! {
 		/// -`ref_index`: The index of the referendum to cancel.
 		///
 		/// Weight: `O(1)`.
-		#[weight = (T::WeightInfo::emergency_cancel(), DispatchClass::Operational)]
-		fn emergency_cancel(origin, ref_index: ReferendumIndex) {
+		#[pallet::weight((T::WeightInfo::emergency_cancel(), DispatchClass::Operational))]
+		pub(crate) fn emergency_cancel(origin: OriginFor<T>, ref_index: ReferendumIndex) -> DispatchResult {
 			T::CancellationOrigin::ensure_origin(origin)?;
 
 			let status = Self::referendum_status(ref_index)?;
@@ -667,6 +733,7 @@ decl_module! {
 
 			<Cancellations<T>>::insert(h, true);
 			Self::internal_cancel_referendum(ref_index);
+			Ok(())
 		}
 
 		/// Schedule a referendum to be tabled once it is legal to schedule an external
@@ -678,8 +745,8 @@ decl_module! {
 		///
 		/// Weight: `O(V)` with V number of vetoers in the blacklist of proposal.
 		///   Decoding vec of length V. Charged as maximum
-		#[weight = T::WeightInfo::external_propose(MAX_VETOERS)]
-		fn external_propose(origin, proposal_hash: T::Hash) {
+		#[pallet::weight(T::WeightInfo::external_propose(MAX_VETOERS))]
+		pub(crate) fn external_propose(origin: OriginFor<T>, proposal_hash: T::Hash) -> DispatchResult {
 			T::ExternalOrigin::ensure_origin(origin)?;
 			ensure!(!<NextExternal<T>>::exists(), Error::<T>::DuplicateProposal);
 			if let Some((until, _)) = <Blacklist<T>>::get(proposal_hash) {
@@ -689,6 +756,7 @@ decl_module! {
 				);
 			}
 			<NextExternal<T>>::put((proposal_hash, VoteThreshold::SuperMajorityApprove));
+			Ok(())
 		}
 
 		/// Schedule a majority-carries referendum to be tabled next once it is legal to schedule
@@ -702,10 +770,14 @@ decl_module! {
 		/// pre-scheduled `external_propose` call.
 		///
 		/// Weight: `O(1)`
-		#[weight = T::WeightInfo::external_propose_majority()]
-		fn external_propose_majority(origin, proposal_hash: T::Hash) {
+		#[pallet::weight(T::WeightInfo::external_propose_majority())]
+		pub(crate) fn external_propose_majority(
+			origin: OriginFor<T>,
+			proposal_hash: T::Hash,
+		) -> DispatchResult {
 			T::ExternalMajorityOrigin::ensure_origin(origin)?;
 			<NextExternal<T>>::put((proposal_hash, VoteThreshold::SimpleMajority));
+			Ok(())
 		}
 
 		/// Schedule a negative-turnout-bias referendum to be tabled next once it is legal to
@@ -719,10 +791,14 @@ decl_module! {
 		/// pre-scheduled `external_propose` call.
 		///
 		/// Weight: `O(1)`
-		#[weight = T::WeightInfo::external_propose_default()]
-		fn external_propose_default(origin, proposal_hash: T::Hash) {
+		#[pallet::weight(T::WeightInfo::external_propose_default())]
+		pub(crate) fn external_propose_default(
+			origin: OriginFor<T>,
+			proposal_hash: T::Hash,
+		) -> DispatchResult {
 			T::ExternalDefaultOrigin::ensure_origin(origin)?;
 			<NextExternal<T>>::put((proposal_hash, VoteThreshold::SuperMajorityAgainst));
+			Ok(())
 		}
 
 		/// Schedule the currently externally-proposed majority-carries referendum to be tabled
@@ -740,12 +816,13 @@ decl_module! {
 		/// Emits `Started`.
 		///
 		/// Weight: `O(1)`
-		#[weight = T::WeightInfo::fast_track()]
-		fn fast_track(origin,
+		#[pallet::weight(T::WeightInfo::fast_track())]
+		pub(crate) fn fast_track(
+			origin: OriginFor<T>,
 			proposal_hash: T::Hash,
 			voting_period: T::BlockNumber,
 			delay: T::BlockNumber,
-		) {
+		) -> DispatchResult {
 			// Rather complicated bit of code to ensure that either:
 			// - `voting_period` is at least `FastTrackVotingPeriod` and `origin` is `FastTrackOrigin`; or
 			// - `InstantAllowed` is `true` and `origin` is `InstantOrigin`.
@@ -774,6 +851,7 @@ decl_module! {
 			<NextExternal<T>>::kill();
 			let now = <frame_system::Pallet<T>>::block_number();
 			Self::inject_referendum(now + voting_period, proposal_hash, threshold, delay);
+			Ok(())
 		}
 
 		/// Veto and blacklist the external proposal hash.
@@ -785,8 +863,8 @@ decl_module! {
 		/// Emits `Vetoed`.
 		///
 		/// Weight: `O(V + log(V))` where V is number of `existing vetoers`
-		#[weight = T::WeightInfo::veto_external(MAX_VETOERS)]
-		fn veto_external(origin, proposal_hash: T::Hash) {
+		#[pallet::weight(T::WeightInfo::veto_external(MAX_VETOERS))]
+		pub(crate) fn veto_external(origin: OriginFor<T>, proposal_hash: T::Hash) -> DispatchResult {
 			let who = T::VetoOrigin::ensure_origin(origin)?;
 
 			if let Some((e_proposal_hash, _)) = <NextExternal<T>>::get() {
@@ -805,8 +883,9 @@ decl_module! {
 			let until = <frame_system::Pallet<T>>::block_number() + T::CooloffPeriod::get();
 			<Blacklist<T>>::insert(&proposal_hash, (until, existing_vetoers));
 
-			Self::deposit_event(RawEvent::Vetoed(who, proposal_hash, until));
+			Self::deposit_event(Event::<T>::Vetoed(who, proposal_hash, until));
 			<NextExternal<T>>::kill();
+			Ok(())
 		}
 
 		/// Remove a referendum.
@@ -816,10 +895,14 @@ decl_module! {
 		/// - `ref_index`: The index of the referendum to cancel.
 		///
 		/// # Weight: `O(1)`.
-		#[weight = T::WeightInfo::cancel_referendum()]
-		fn cancel_referendum(origin, #[compact] ref_index: ReferendumIndex) {
+		#[pallet::weight(T::WeightInfo::cancel_referendum())]
+		pub(crate) fn cancel_referendum(
+			origin: OriginFor<T>,
+			#[pallet::compact] ref_index: ReferendumIndex,
+		) -> DispatchResult {
 			ensure_root(origin)?;
 			Self::internal_cancel_referendum(ref_index);
+			Ok(())
 		}
 
 		/// Cancel a proposal queued for enactment.
@@ -829,19 +912,12 @@ decl_module! {
 		/// - `which`: The index of the referendum to cancel.
 		///
 		/// Weight: `O(D)` where `D` is the items in the dispatch queue. Weighted as `D = 10`.
-		#[weight = (T::WeightInfo::cancel_queued(10), DispatchClass::Operational)]
-		fn cancel_queued(origin, which: ReferendumIndex) {
+		#[pallet::weight((T::WeightInfo::cancel_queued(10), DispatchClass::Operational))]
+		pub(crate) fn cancel_queued(origin: OriginFor<T>, which: ReferendumIndex) -> DispatchResult {
 			ensure_root(origin)?;
 			T::Scheduler::cancel_named((DEMOCRACY_ID, which).encode())
 				.map_err(|_| Error::<T>::ProposalMissing)?;
-		}
-
-		/// Weight: see `begin_block`
-		fn on_initialize(n: T::BlockNumber) -> Weight {
-			Self::begin_block(n).unwrap_or_else(|e| {
-				sp_runtime::print(e);
-				0
-			})
+			Ok(())
 		}
 
 		/// Delegate the voting power (with some given conviction) of the sending account.
@@ -866,9 +942,9 @@ decl_module! {
 		///   voted on. Weight is charged as if maximum votes.
 		// NOTE: weight must cover an incorrect voting of origin with max votes, this is ensure
 		// because a valid delegation cover decoding a direct voting with max votes.
-		#[weight = T::WeightInfo::delegate(T::MaxVotes::get())]
+		#[pallet::weight(T::WeightInfo::delegate(T::MaxVotes::get()))]
 		pub fn delegate(
-			origin,
+			origin: OriginFor<T>,
 			to: T::AccountId,
 			conviction: Conviction,
 			balance: BalanceOf<T>
@@ -893,8 +969,8 @@ decl_module! {
 		///   voted on. Weight is charged as if maximum votes.
 		// NOTE: weight must cover an incorrect voting of origin with max votes, this is ensure
 		// because a valid delegation cover decoding a direct voting with max votes.
-		#[weight = T::WeightInfo::undelegate(T::MaxVotes::get().into())]
-		fn undelegate(origin) -> DispatchResultWithPostInfo {
+		#[pallet::weight(T::WeightInfo::undelegate(T::MaxVotes::get().into()))]
+		pub(crate) fn undelegate(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
 			let votes = Self::try_undelegate(who)?;
 			Ok(Some(T::WeightInfo::undelegate(votes)).into())
@@ -905,10 +981,11 @@ decl_module! {
 		/// The dispatch origin of this call must be _Root_.
 		///
 		/// Weight: `O(1)`.
-		#[weight = T::WeightInfo::clear_public_proposals()]
-		fn clear_public_proposals(origin) {
+		#[pallet::weight(T::WeightInfo::clear_public_proposals())]
+		pub(crate) fn clear_public_proposals(origin: OriginFor<T>) -> DispatchResult {
 			ensure_root(origin)?;
 			<PublicProps<T>>::kill();
+			Ok(())
 		}
 
 		/// Register the preimage for an upcoming proposal. This doesn't require the proposal to be
@@ -921,19 +998,24 @@ decl_module! {
 		/// Emits `PreimageNoted`.
 		///
 		/// Weight: `O(E)` with E size of `encoded_proposal` (protected by a required deposit).
-		#[weight = T::WeightInfo::note_preimage(encoded_proposal.len() as u32)]
-		fn note_preimage(origin, encoded_proposal: Vec<u8>) {
+		#[pallet::weight(T::WeightInfo::note_preimage(encoded_proposal.len() as u32))]
+		pub(crate) fn note_preimage(origin: OriginFor<T>, encoded_proposal: Vec<u8>) -> DispatchResult {
 			Self::note_preimage_inner(ensure_signed(origin)?, encoded_proposal)?;
+			Ok(())
 		}
 
 		/// Same as `note_preimage` but origin is `OperationalPreimageOrigin`.
-		#[weight = (
+		#[pallet::weight((
 			T::WeightInfo::note_preimage(encoded_proposal.len() as u32),
 			DispatchClass::Operational,
-		)]
-		fn note_preimage_operational(origin, encoded_proposal: Vec<u8>) {
+		))]
+		pub(crate) fn note_preimage_operational(
+			origin: OriginFor<T>,
+			encoded_proposal: Vec<u8>,
+		) -> DispatchResult {
 			let who = T::OperationalPreimageOrigin::ensure_origin(origin)?;
 			Self::note_preimage_inner(who, encoded_proposal)?;
+			Ok(())
 		}
 
 		/// Register the preimage for an upcoming proposal. This requires the proposal to be
@@ -948,8 +1030,11 @@ decl_module! {
 		/// Emits `PreimageNoted`.
 		///
 		/// Weight: `O(E)` with E size of `encoded_proposal` (protected by a required deposit).
-		#[weight = T::WeightInfo::note_imminent_preimage(encoded_proposal.len() as u32)]
-		fn note_imminent_preimage(origin, encoded_proposal: Vec<u8>) -> DispatchResultWithPostInfo {
+		#[pallet::weight(T::WeightInfo::note_imminent_preimage(encoded_proposal.len() as u32))]
+		pub(crate) fn note_imminent_preimage(
+			origin: OriginFor<T>,
+			encoded_proposal: Vec<u8>,
+		) -> DispatchResultWithPostInfo {
 			Self::note_imminent_preimage_inner(ensure_signed(origin)?, encoded_proposal)?;
 			// We check that this preimage was not uploaded before in `note_imminent_preimage_inner`,
 			// thus this call can only be successful once. If successful, user does not pay a fee.
@@ -957,11 +1042,14 @@ decl_module! {
 		}
 
 		/// Same as `note_imminent_preimage` but origin is `OperationalPreimageOrigin`.
-		#[weight = (
+		#[pallet::weight((
 			T::WeightInfo::note_imminent_preimage(encoded_proposal.len() as u32),
 			DispatchClass::Operational,
-		)]
-		fn note_imminent_preimage_operational(origin, encoded_proposal: Vec<u8>) -> DispatchResultWithPostInfo {
+		))]
+		pub(crate) fn note_imminent_preimage_operational(
+			origin: OriginFor<T>,
+			encoded_proposal: Vec<u8>,
+		) -> DispatchResultWithPostInfo {
 			let who = T::OperationalPreimageOrigin::ensure_origin(origin)?;
 			Self::note_imminent_preimage_inner(who, encoded_proposal)?;
 			// We check that this preimage was not uploaded before in `note_imminent_preimage_inner`,
@@ -984,8 +1072,12 @@ decl_module! {
 		/// Emits `PreimageReaped`.
 		///
 		/// Weight: `O(D)` where D is length of proposal.
-		#[weight = T::WeightInfo::reap_preimage(*proposal_len_upper_bound)]
-		fn reap_preimage(origin, proposal_hash: T::Hash, #[compact] proposal_len_upper_bound: u32) {
+		#[pallet::weight(T::WeightInfo::reap_preimage(*proposal_len_upper_bound))]
+		pub(crate) fn reap_preimage(
+			origin: OriginFor<T>,
+			proposal_hash: T::Hash,
+			#[pallet::compact] proposal_len_upper_bound: u32,
+		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 
 			ensure!(
@@ -1009,7 +1101,8 @@ decl_module! {
 			let res = T::Currency::repatriate_reserved(&provider, &who, deposit, BalanceStatus::Free);
 			debug_assert!(res.is_ok());
 			<Preimages<T>>::remove(&proposal_hash);
-			Self::deposit_event(RawEvent::PreimageReaped(proposal_hash, provider, deposit, who));
+			Self::deposit_event(Event::<T>::PreimageReaped(proposal_hash, provider, deposit, who));
+			Ok(())
 		}
 
 		/// Unlock tokens that have an expired lock.
@@ -1019,11 +1112,14 @@ decl_module! {
 		/// - `target`: The account to remove the lock on.
 		///
 		/// Weight: `O(R)` with R number of vote of target.
-		#[weight = T::WeightInfo::unlock_set(T::MaxVotes::get())
-			.max(T::WeightInfo::unlock_remove(T::MaxVotes::get()))]
-		fn unlock(origin, target: T::AccountId) {
+		#[pallet::weight(
+			T::WeightInfo::unlock_set(T::MaxVotes::get())
+				.max(T::WeightInfo::unlock_remove(T::MaxVotes::get()))
+		)]
+		pub(crate) fn unlock(origin: OriginFor<T>, target: T::AccountId) -> DispatchResult {
 			ensure_signed(origin)?;
 			Self::update_lock(&target);
+			Ok(())
 		}
 
 		/// Remove a vote for a referendum.
@@ -1053,8 +1149,8 @@ decl_module! {
 		///
 		/// Weight: `O(R + log R)` where R is the number of referenda that `target` has voted on.
 		///   Weight is calculated for the maximum number of vote.
-		#[weight = T::WeightInfo::remove_vote(T::MaxVotes::get())]
-		fn remove_vote(origin, index: ReferendumIndex) -> DispatchResult {
+		#[pallet::weight(T::WeightInfo::remove_vote(T::MaxVotes::get()))]
+		pub(crate) fn remove_vote(origin: OriginFor<T>, index: ReferendumIndex) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			Self::try_remove_vote(&who, index, UnvoteScope::Any)
 		}
@@ -1074,8 +1170,12 @@ decl_module! {
 		///
 		/// Weight: `O(R + log R)` where R is the number of referenda that `target` has voted on.
 		///   Weight is calculated for the maximum number of vote.
-		#[weight = T::WeightInfo::remove_other_vote(T::MaxVotes::get())]
-		fn remove_other_vote(origin, target: T::AccountId, index: ReferendumIndex) -> DispatchResult {
+		#[pallet::weight(T::WeightInfo::remove_other_vote(T::MaxVotes::get()))]
+		pub(crate) fn remove_other_vote(
+			origin: OriginFor<T>,
+			target: T::AccountId,
+			index: ReferendumIndex,
+		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			let scope = if target == who { UnvoteScope::Any } else { UnvoteScope::OnlyExpired };
 			Self::try_remove_vote(&target, index, scope)?;
@@ -1083,8 +1183,12 @@ decl_module! {
 		}
 
 		/// Enact a proposal from a referendum. For now we just make the weight be the maximum.
-		#[weight = T::BlockWeights::get().max_block]
-		fn enact_proposal(origin, proposal_hash: T::Hash, index: ReferendumIndex) -> DispatchResult {
+		#[pallet::weight(T::BlockWeights::get().max_block)]
+		pub(crate) fn enact_proposal(
+			origin: OriginFor<T>,
+			proposal_hash: T::Hash,
+			index: ReferendumIndex,
+		) -> DispatchResult {
 			ensure_root(origin)?;
 			Self::do_enact_proposal(proposal_hash, index)
 		}
@@ -1104,11 +1208,11 @@ decl_module! {
 		///
 		/// Weight: `O(p)` (though as this is an high-privilege dispatch, we assume it has a
 		///   reasonable value).
-		#[weight = (T::WeightInfo::blacklist(T::MaxProposals::get()), DispatchClass::Operational)]
-		fn blacklist(origin,
+		#[pallet::weight((T::WeightInfo::blacklist(T::MaxProposals::get()), DispatchClass::Operational))]
+		pub(crate) fn blacklist(origin: OriginFor<T>,
 			proposal_hash: T::Hash,
 			maybe_ref_index: Option<ReferendumIndex>,
-		) {
+		) -> DispatchResult {
 			T::BlacklistOrigin::ensure_origin(origin)?;
 
 			// Insert the proposal into the blacklist.
@@ -1141,7 +1245,8 @@ decl_module! {
 				}
 			}
 
-			Self::deposit_event(RawEvent::Blacklisted(proposal_hash));
+			Self::deposit_event(Event::<T>::Blacklisted(proposal_hash));
+			Ok(())
 		}
 
 		/// Remove a proposal.
@@ -1151,8 +1256,11 @@ decl_module! {
 		/// - `prop_index`: The index of the proposal to cancel.
 		///
 		/// Weight: `O(p)` where `p = PublicProps::<T>::decode_len()`
-		#[weight = T::WeightInfo::cancel_proposal(T::MaxProposals::get())]
-		fn cancel_proposal(origin, #[compact] prop_index: PropIndex) {
+		#[pallet::weight(T::WeightInfo::cancel_proposal(T::MaxProposals::get()))]
+		pub(crate) fn cancel_proposal(
+			origin: OriginFor<T>,
+			#[pallet::compact] prop_index: PropIndex,
+		) -> DispatchResult {
 			T::CancelProposalOrigin::ensure_origin(origin)?;
 
 			PublicProps::<T>::mutate(|props| props.retain(|p| p.0 != prop_index));
@@ -1161,11 +1269,13 @@ decl_module! {
 					T::Slash::on_unbalanced(T::Currency::slash_reserved(&who, amount).0);
 				}
 			}
+
+			Ok(())
 		}
 	}
 }
 
-impl<T: Config> Module<T> {
+impl<T: Config> Pallet<T> {
 	// exposed immutables.
 
 	/// Get the amount locked in support of `proposal`; `None` if proposal isn't a valid proposal
@@ -1205,7 +1315,7 @@ impl<T: Config> Module<T> {
 		threshold: VoteThreshold,
 		delay: T::BlockNumber
 	) -> ReferendumIndex {
-		<Module<T>>::inject_referendum(
+		<Pallet<T>>::inject_referendum(
 			<frame_system::Pallet<T>>::block_number() + T::VotingPeriod::get(),
 			proposal_hash,
 			threshold,
@@ -1215,7 +1325,7 @@ impl<T: Config> Module<T> {
 
 	/// Remove a referendum.
 	pub fn internal_cancel_referendum(ref_index: ReferendumIndex) {
-		Self::deposit_event(RawEvent::Cancelled(ref_index));
+		Self::deposit_event(Event::<T>::Cancelled(ref_index));
 		ReferendumInfoOf::<T>::remove(ref_index);
 	}
 
@@ -1305,7 +1415,7 @@ impl<T: Config> Module<T> {
 					Some(ReferendumInfo::Finished{end, approved}) =>
 						if let Some((lock_periods, balance)) = votes[i].1.locked_if(approved) {
 							let unlock_at = end + T::EnactmentPeriod::get() * lock_periods.into();
-							let now = system::Pallet::<T>::block_number();
+							let now = frame_system::Pallet::<T>::block_number();
 							if now < unlock_at {
 								ensure!(matches!(scope, UnvoteScope::Any), Error::<T>::NoPermission);
 								prior.accumulate(unlock_at, balance)
@@ -1432,7 +1542,7 @@ impl<T: Config> Module<T> {
 				} => {
 					// remove any delegation votes to our current target.
 					let votes = Self::reduce_upstream_delegation(&target, conviction.votes(balance));
-					let now = system::Pallet::<T>::block_number();
+					let now = frame_system::Pallet::<T>::block_number();
 					let lock_periods = conviction.lock_periods().into();
 					prior.accumulate(now + T::EnactmentPeriod::get() * lock_periods, balance);
 					voting.set_common(delegations, prior);
@@ -1452,7 +1562,7 @@ impl<T: Config> Module<T> {
 	/// a security hole) but may be reduced from what they are currently.
 	fn update_lock(who: &T::AccountId) {
 		let lock_needed = VotingOf::<T>::mutate(who, |voting| {
-			voting.rejig(system::Pallet::<T>::block_number());
+			voting.rejig(frame_system::Pallet::<T>::block_number());
 			voting.locked_balance()
 		});
 		if lock_needed.is_zero() {
@@ -1470,17 +1580,17 @@ impl<T: Config> Module<T> {
 		delay: T::BlockNumber,
 	) -> ReferendumIndex {
 		let ref_index = Self::referendum_count();
-		ReferendumCount::put(ref_index + 1);
+		ReferendumCount::<T>::put(ref_index + 1);
 		let status = ReferendumStatus { end, proposal_hash, threshold, delay, tally: Default::default() };
 		let item = ReferendumInfo::Ongoing(status);
 		<ReferendumInfoOf<T>>::insert(ref_index, item);
-		Self::deposit_event(RawEvent::Started(ref_index, threshold));
+		Self::deposit_event(Event::<T>::Started(ref_index, threshold));
 		ref_index
 	}
 
 	/// Table the next waiting proposal for a vote.
 	fn launch_next(now: T::BlockNumber) -> DispatchResult {
-		if LastTabledWasExternal::take() {
+		if LastTabledWasExternal::<T>::take() {
 			Self::launch_public(now).or_else(|_| Self::launch_external(now))
 		} else {
 			Self::launch_external(now).or_else(|_| Self::launch_public(now))
@@ -1490,8 +1600,8 @@ impl<T: Config> Module<T> {
 	/// Table the waiting external proposal for a vote, if there is one.
 	fn launch_external(now: T::BlockNumber) -> DispatchResult {
 		if let Some((proposal, threshold)) = <NextExternal<T>>::take() {
-			LastTabledWasExternal::put(true);
-			Self::deposit_event(RawEvent::ExternalTabled);
+			LastTabledWasExternal::<T>::put(true);
+			Self::deposit_event(Event::<T>::ExternalTabled);
 			Self::inject_referendum(
 				now + T::VotingPeriod::get(),
 				proposal,
@@ -1520,7 +1630,7 @@ impl<T: Config> Module<T> {
 				for d in &depositors {
 					T::Currency::unreserve(d, deposit);
 				}
-				Self::deposit_event(RawEvent::Tabled(prop_index, deposit, depositors));
+				Self::deposit_event(Event::<T>::Tabled(prop_index, deposit, depositors));
 				Self::inject_referendum(
 					now + T::VotingPeriod::get(),
 					proposal,
@@ -1540,19 +1650,19 @@ impl<T: Config> Module<T> {
 			if let Ok(proposal) = T::Proposal::decode(&mut &data[..]) {
 				let err_amount = T::Currency::unreserve(&provider, deposit);
 				debug_assert!(err_amount.is_zero());
-				Self::deposit_event(RawEvent::PreimageUsed(proposal_hash, provider, deposit));
+				Self::deposit_event(Event::<T>::PreimageUsed(proposal_hash, provider, deposit));
 
 				let ok = proposal.dispatch(frame_system::RawOrigin::Root.into()).is_ok();
-				Self::deposit_event(RawEvent::Executed(index, ok));
+				Self::deposit_event(Event::<T>::Executed(index, ok));
 
 				Ok(())
 			} else {
 				T::Slash::on_unbalanced(T::Currency::slash_reserved(&provider, deposit).0);
-				Self::deposit_event(RawEvent::PreimageInvalid(proposal_hash, index));
+				Self::deposit_event(Event::<T>::PreimageInvalid(proposal_hash, index));
 				Err(Error::<T>::PreimageInvalid.into())
 			}
 		} else {
-			Self::deposit_event(RawEvent::PreimageMissing(proposal_hash, index));
+			Self::deposit_event(Event::<T>::PreimageMissing(proposal_hash, index));
 			Err(Error::<T>::PreimageMissing.into())
 		}
 	}
@@ -1566,7 +1676,7 @@ impl<T: Config> Module<T> {
 		let approved = status.threshold.approved(status.tally, total_issuance);
 
 		if approved {
-			Self::deposit_event(RawEvent::Passed(index));
+			Self::deposit_event(Event::<T>::Passed(index));
 			if status.delay.is_zero() {
 				let _ = Self::do_enact_proposal(status.proposal_hash, index);
 			} else {
@@ -1582,14 +1692,14 @@ impl<T: Config> Module<T> {
 					DispatchTime::At(when),
 					None,
 					63,
-					system::RawOrigin::Root.into(),
+					frame_system::RawOrigin::Root.into(),
 					Call::enact_proposal(status.proposal_hash, index).into(),
 				).is_err() {
 					frame_support::print("LOGIC ERROR: bake_referendum/schedule_named failed");
 				}
 			}
 		} else {
-			Self::deposit_event(RawEvent::NotPassed(index));
+			Self::deposit_event(Event::<T>::NotPassed(index));
 		}
 
 		Ok(approved)
@@ -1718,7 +1828,7 @@ impl<T: Config> Module<T> {
 		};
 		<Preimages<T>>::insert(proposal_hash, a);
 
-		Self::deposit_event(RawEvent::PreimageNoted(proposal_hash, who, deposit));
+		Self::deposit_event(Event::<T>::PreimageNoted(proposal_hash, who, deposit));
 
 		Ok(())
 	}
@@ -1741,7 +1851,7 @@ impl<T: Config> Module<T> {
 		};
 		<Preimages<T>>::insert(proposal_hash, a);
 
-		Self::deposit_event(RawEvent::PreimageNoted(proposal_hash, who, free));
+		Self::deposit_event(Event::<T>::PreimageNoted(proposal_hash, who, free));
 
 		Ok(())
 	}
diff --git a/frame/democracy/src/tests.rs b/frame/democracy/src/tests.rs
index 73bbb5481dad..9c7b21ad9157 100644
--- a/frame/democracy/src/tests.rs
+++ b/frame/democracy/src/tests.rs
@@ -22,8 +22,8 @@ use super::*;
 use codec::Encode;
 use frame_support::{
 	assert_noop, assert_ok, parameter_types, ord_parameter_types,
-	traits::{SortedMembers, OnInitialize, Filter},
-	weights::Weight,
+	traits::{SortedMembers, OnInitialize, Filter, GenesisBuild},
+	weights::Weight, storage::StorageMap,
 };
 use sp_core::H256;
 use sp_runtime::{
@@ -63,7 +63,7 @@ frame_support::construct_runtime!(
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
 		Scheduler: pallet_scheduler::{Pallet, Call, Storage, Config, Event<T>},
-		Democracy: pallet_democracy::{Pallet, Call, Storage, Config, Event<T>},
+		Democracy: pallet_democracy::{Pallet, Call, Storage, Config<T>, Event<T>},
 	}
 );
 
@@ -195,7 +195,7 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 	pallet_balances::GenesisConfig::<Test>{
 		balances: vec![(1, 10), (2, 20), (3, 30), (4, 40), (5, 50), (6, 60)],
 	}.assimilate_storage(&mut t).unwrap();
-	pallet_democracy::GenesisConfig::default().assimilate_storage(&mut t).unwrap();
+	pallet_democracy::GenesisConfig::<Test>::default().assimilate_storage(&mut t).unwrap();
 	let mut ext = sp_io::TestExternalities::new(t);
 	ext.execute_with(|| System::set_block_number(1));
 	ext
diff --git a/frame/democracy/src/tests/decoders.rs b/frame/democracy/src/tests/decoders.rs
index 0331ea393447..32e5e3ecf7ae 100644
--- a/frame/democracy/src/tests/decoders.rs
+++ b/frame/democracy/src/tests/decoders.rs
@@ -18,7 +18,7 @@
 //! The for various partial storage decoders
 
 use super::*;
-use frame_support::storage::{migration, StorageMap, unhashed};
+use frame_support::storage::{migration, unhashed};
 
 #[test]
 fn test_decode_compact_u32_at() {

From 48aea1b2f4774c975e2e3f8bf044c9b3f4a1b0ce Mon Sep 17 00:00:00 2001
From: Andreas Doerr <adoerr@users.noreply.github.com>
Date: Thu, 3 Jun 2021 11:46:43 +0200
Subject: [PATCH 0826/1194] Add ecdsa::Pair::verify_prehashed() (#8996)

* Add ecdsa::Pair::verify_prehashed()

* turn verify_prehashed() into an associated function

* add Signature::recover_prehashed()
---
 primitives/core/src/ecdsa.rs | 61 ++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/primitives/core/src/ecdsa.rs b/primitives/core/src/ecdsa.rs
index 1fb80f24eaf3..c567b3c44f6c 100644
--- a/primitives/core/src/ecdsa.rs
+++ b/primitives/core/src/ecdsa.rs
@@ -354,6 +354,18 @@ impl Signature {
 			.ok()
 			.map(|recovered| Public(recovered.serialize_compressed()))
 	}
+
+	/// Recover the public key from this signature and a pre-hashed message.
+	#[cfg(feature = "full_crypto")]
+	pub fn recover_prehashed(&self, message: &[u8; 32]) -> Option<Public> {
+		let message = secp256k1::Message::parse(message);
+		
+		let sig: (_, _) = self.try_into().ok()?;
+
+		secp256k1::recover(&message, &sig.0, &sig.1)
+			.ok()
+			.map(|key| Public(key.serialize_compressed()))
+	}
 }
 
 #[cfg(feature = "full_crypto")]
@@ -537,6 +549,22 @@ impl Pair {
 		let message = secp256k1::Message::parse(message);
 		secp256k1::sign(&message, &self.secret).into()
 	}
+
+	/// Verify a signature on a pre-hashed message. Return `true` if the signature is valid
+	/// and thus matches the given `public` key.
+	pub fn verify_prehashed(sig: &Signature, message: &[u8; 32], public: &Public) -> bool {
+		let message = secp256k1::Message::parse(message);
+	
+		let sig: (_, _) = match sig.try_into() {
+			Ok(x) => x,
+			_ => return false,
+		};
+	
+		match secp256k1::recover(&message, &sig.0, &sig.1) {
+			Ok(actual) => public.0[..] == actual.serialize_compressed()[..],
+			_ => false,
+		}
+	}	
 }
 
 impl CryptoType for Public {
@@ -791,4 +819,37 @@ mod test {
 
 		assert_eq!(sig1, sig2);		
 	}
+
+	#[test]
+	fn verify_prehashed_works() {
+		let (pair, _, _) = Pair::generate_with_phrase(Some("password"));
+		
+		// `msg` and `sig` match
+		let msg = keccak_256(b"this should be hashed");
+		let sig = pair.sign_prehashed(&msg);
+		assert!(Pair::verify_prehashed(&sig, &msg, &pair.public()));
+
+		// `msg` and `sig` don't match
+		let msg = keccak_256(b"this is a different message");
+		assert!(!Pair::verify_prehashed(&sig, &msg, &pair.public()));
+	}
+
+	#[test]
+	fn recover_prehashed_works() {
+		let (pair, _, _) = Pair::generate_with_phrase(Some("password"));
+
+		// recovered key matches signing key
+		let msg = keccak_256(b"this should be hashed");
+		let sig = pair.sign_prehashed(&msg);
+		let key = sig.recover_prehashed(&msg).unwrap();
+		assert_eq!(pair.public(), key);
+
+		// recovered key is useable
+		assert!(Pair::verify_prehashed(&sig, &msg, &key));
+
+		// recovered key and signing key don't match
+		let msg = keccak_256(b"this is a different message");
+		let key = sig.recover_prehashed(&msg).unwrap();
+		assert_ne!(pair.public(), key);
+	}
 }

From b14fdf5c8b205a5dd00e4c54a32d62f18555c0d8 Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Thu, 3 Jun 2021 13:20:34 +0200
Subject: [PATCH 0827/1194] Non-fungible token traits (#8993)

* Non-fungible token traits

* Docs

* Fixes

* Implement non-fungible trait for Uniques

* Update frame/uniques/src/impl_nonfungibles.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Update frame/uniques/src/impl_nonfungibles.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 frame/support/src/lib.rs                      |   2 +-
 frame/support/src/storage/bounded_vec.rs      |  32 ++-
 frame/support/src/traits/tokens.rs            |   2 +
 .../support/src/traits/tokens/nonfungible.rs  | 190 +++++++++++++++++
 .../support/src/traits/tokens/nonfungibles.rs | 194 ++++++++++++++++++
 frame/uniques/src/functions.rs                | 115 +++++++++++
 frame/uniques/src/impl_nonfungibles.rs        | 108 ++++++++++
 frame/uniques/src/lib.rs                      |  74 ++-----
 frame/uniques/src/types.rs                    |   5 +
 primitives/runtime/src/lib.rs                 |   3 +
 10 files changed, 663 insertions(+), 62 deletions(-)
 create mode 100644 frame/support/src/traits/tokens/nonfungible.rs
 create mode 100644 frame/support/src/traits/tokens/nonfungibles.rs
 create mode 100644 frame/uniques/src/functions.rs
 create mode 100644 frame/uniques/src/impl_nonfungibles.rs

diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index c1aadc6fa57d..57ab1d6febde 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -76,7 +76,7 @@ pub use self::hash::{
 pub use self::storage::{
 	StorageValue, StorageMap, StorageDoubleMap, StorageNMap, StoragePrefixedMap,
 	IterableStorageMap, IterableStorageDoubleMap, IterableStorageNMap, migration,
-	bounded_vec::BoundedVec, weak_bounded_vec::WeakBoundedVec,
+	bounded_vec::{BoundedVec, BoundedSlice}, weak_bounded_vec::WeakBoundedVec,
 };
 pub use self::dispatch::{Parameter, Callable};
 pub use sp_runtime::{self, ConsensusEngineId, print, traits::Printable};
diff --git a/frame/support/src/storage/bounded_vec.rs b/frame/support/src/storage/bounded_vec.rs
index 9575cb4bf4ef..d1c042b5db17 100644
--- a/frame/support/src/storage/bounded_vec.rs
+++ b/frame/support/src/storage/bounded_vec.rs
@@ -20,7 +20,7 @@
 
 use sp_std::prelude::*;
 use sp_std::{convert::TryFrom, fmt, marker::PhantomData};
-use codec::{Encode, Decode};
+use codec::{Encode, Decode, EncodeLike};
 use core::{
 	ops::{Deref, Index, IndexMut},
 	slice::SliceIndex,
@@ -40,6 +40,33 @@ use crate::{
 #[derive(Encode)]
 pub struct BoundedVec<T, S>(Vec<T>, PhantomData<S>);
 
+/// A bounded slice.
+///
+/// Similar to a `BoundedVec`, but not owned and cannot be decoded.
+#[derive(Encode)]
+pub struct BoundedSlice<'a, T, S>(&'a [T], PhantomData<S>);
+
+// `BoundedSlice`s encode to something which will always decode into a `BoundedVec` or a `Vec`.
+impl<'a, T: Encode + Decode, S: Get<u32>> EncodeLike<BoundedVec<T, S>> for BoundedSlice<'a, T, S> {}
+impl<'a, T: Encode + Decode, S: Get<u32>> EncodeLike<Vec<T>> for BoundedSlice<'a, T, S> {}
+
+impl<'a, T, S: Get<u32>> TryFrom<&'a [T]> for BoundedSlice<'a, T, S> {
+	type Error = ();
+	fn try_from(t: &'a [T]) -> Result<Self, Self::Error> {
+		if t.len() < S::get() as usize {
+			Ok(BoundedSlice(t, PhantomData))
+		} else {
+			Err(())
+		}
+	}
+}
+
+impl<'a, T, S> From<BoundedSlice<'a, T, S>> for &'a [T] {
+	fn from(t: BoundedSlice<'a, T, S>) -> Self {
+		t.0
+	}
+}
+
 impl<T: Decode, S: Get<u32>> Decode for BoundedVec<T, S> {
 	fn decode<I: codec::Input>(input: &mut I) -> Result<Self, codec::Error> {
 		let inner = Vec::<T>::decode(input)?;
@@ -54,6 +81,9 @@ impl<T: Decode, S: Get<u32>> Decode for BoundedVec<T, S> {
 	}
 }
 
+// `BoundedVec`s encode to something which will always decode as a `Vec`.
+impl<T: Encode + Decode, S: Get<u32>> EncodeLike<Vec<T>> for BoundedVec<T, S> {}
+
 impl<T, S> BoundedVec<T, S> {
 	/// Create `Self` from `t` without any checks.
 	fn unchecked_from(t: Vec<T>) -> Self {
diff --git a/frame/support/src/traits/tokens.rs b/frame/support/src/traits/tokens.rs
index 82af5dbade8f..ac316b82b03e 100644
--- a/frame/support/src/traits/tokens.rs
+++ b/frame/support/src/traits/tokens.rs
@@ -21,6 +21,8 @@ pub mod fungible;
 pub mod fungibles;
 pub mod currency;
 pub mod imbalance;
+pub mod nonfungible;
+pub mod nonfungibles;
 mod misc;
 pub use misc::{
 	WithdrawConsequence, DepositConsequence, ExistenceRequirement, BalanceStatus, WithdrawReasons,
diff --git a/frame/support/src/traits/tokens/nonfungible.rs b/frame/support/src/traits/tokens/nonfungible.rs
new file mode 100644
index 000000000000..348d830c5002
--- /dev/null
+++ b/frame/support/src/traits/tokens/nonfungible.rs
@@ -0,0 +1,190 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Traits for dealing with a single non-fungible asset class.
+//!
+//! This assumes a single level namespace identified by `Inspect::InstanceId`, and could
+//! reasonably be implemented by pallets which wants to expose a single collection of NFT-like
+//! objects.
+//!
+//! For an NFT API which has dual-level namespacing, the traits in `nonfungibles` are better to
+//! use.
+
+use codec::{Encode, Decode};
+use sp_std::prelude::*;
+use sp_runtime::TokenError;
+use crate::dispatch::DispatchResult;
+use crate::traits::Get;
+use super::nonfungibles;
+
+/// Trait for providing an interface to a read-only NFT-like set of asset instances.
+pub trait Inspect<AccountId> {
+	/// Type for identifying an asset instance.
+	type InstanceId;
+
+	/// Returns the owner of asset `instance`, or `None` if the asset doesn't exist or has no
+	/// owner.
+	fn owner(instance: &Self::InstanceId) -> Option<AccountId>;
+
+	/// Returns the attribute value of `instance` corresponding to `key`.
+	///
+	/// By default this is `None`; no attributes are defined.
+	fn attribute(_instance: &Self::InstanceId, _key: &[u8]) -> Option<Vec<u8>> { None }
+
+	/// Returns the strongly-typed attribute value of `instance` corresponding to `key`.
+	///
+	/// By default this just attempts to use `attribute`.
+	fn typed_attribute<K: Encode, V: Decode>(instance: &Self::InstanceId, key: &K) -> Option<V> {
+		key.using_encoded(|d| Self::attribute(instance, d))
+			.and_then(|v| V::decode(&mut &v[..]).ok())
+	}
+
+	/// Returns `true` if the asset `instance` may be transferred.
+	///
+	/// Default implementation is that all assets are transferable.
+	fn can_transfer(_instance: &Self::InstanceId) -> bool { true }
+}
+
+/// Interface for enumerating assets in existence or owned by a given account over a collection
+/// of NFTs.
+///
+/// WARNING: These may be a heavy operations. Do not use when execution time is limited.
+pub trait InspectEnumerable<AccountId>: Inspect<AccountId> {
+	/// Returns the instances of an asset `class` in existence.
+	fn instances() -> Vec<Self::InstanceId>;
+
+	/// Returns the asset instances of all classes owned by `who`.
+	fn owned(who: &AccountId) -> Vec<Self::InstanceId>;
+}
+
+/// Trait for providing an interface for NFT-like assets which may be minted, burned and/or have
+/// attributes set on them.
+pub trait Mutate<AccountId>: Inspect<AccountId> {
+	/// Mint some asset `instance` to be owned by `who`.
+	///
+	/// By default, this is not a supported operation.
+	fn mint_into(_instance: &Self::InstanceId, _who: &AccountId) -> DispatchResult {
+		Err(TokenError::Unsupported.into())
+	}
+
+	/// Burn some asset `instance`.
+	///
+	/// By default, this is not a supported operation.
+	fn burn_from(_instance: &Self::InstanceId) -> DispatchResult {
+		Err(TokenError::Unsupported.into())
+	}
+
+	/// Set attribute `value` of asset `instance`'s `key`.
+	///
+	/// By default, this is not a supported operation.
+	fn set_attribute(_instance: &Self::InstanceId, _key: &[u8], _value: &[u8]) -> DispatchResult {
+		Err(TokenError::Unsupported.into())
+	}
+
+	/// Attempt to set the strongly-typed attribute `value` of `instance`'s `key`.
+	///
+	/// By default this just attempts to use `set_attribute`.
+	fn set_typed_attribute<K: Encode, V: Encode>(
+		instance: &Self::InstanceId,
+		key: &K,
+		value: &V,
+	) -> DispatchResult {
+		key.using_encoded(|k| value.using_encoded(|v| Self::set_attribute(instance, k, v)))
+	}
+}
+
+/// Trait for providing a non-fungible set of assets which can only be transferred.
+pub trait Transfer<AccountId>: Inspect<AccountId> {
+	/// Transfer asset `instance` into `destination` account.
+	fn transfer(instance: &Self::InstanceId, destination: &AccountId) -> DispatchResult;
+}
+
+/// Convert a `fungibles` trait implementation into a `fungible` trait implementation by identifying
+/// a single item.
+pub struct ItemOf<
+	F: nonfungibles::Inspect<AccountId>,
+	A: Get<<F as nonfungibles::Inspect<AccountId>>::ClassId>,
+	AccountId,
+>(
+	sp_std::marker::PhantomData<(F, A, AccountId)>
+);
+
+impl<
+	F: nonfungibles::Inspect<AccountId>,
+	A: Get<<F as nonfungibles::Inspect<AccountId>>::ClassId>,
+	AccountId,
+> Inspect<AccountId> for ItemOf<F, A, AccountId> {
+	type InstanceId = <F as nonfungibles::Inspect<AccountId>>::InstanceId;
+	fn owner(instance: &Self::InstanceId) -> Option<AccountId> {
+		<F as nonfungibles::Inspect<AccountId>>::owner(&A::get(), instance)
+	}
+	fn attribute(instance: &Self::InstanceId, key: &[u8]) -> Option<Vec<u8>> {
+		<F as nonfungibles::Inspect<AccountId>>::attribute(&A::get(), instance, key)
+	}
+	fn typed_attribute<K: Encode, V: Decode>(instance: &Self::InstanceId, key: &K) -> Option<V> {
+		<F as nonfungibles::Inspect<AccountId>>::typed_attribute(&A::get(), instance, key)
+	}
+	fn can_transfer(instance: &Self::InstanceId) -> bool {
+		<F as nonfungibles::Inspect<AccountId>>::can_transfer(&A::get(), instance)
+	}
+}
+
+impl<
+	F: nonfungibles::InspectEnumerable<AccountId>,
+	A: Get<<F as nonfungibles::Inspect<AccountId>>::ClassId>,
+	AccountId,
+> InspectEnumerable<AccountId> for ItemOf<F, A, AccountId> {
+	fn instances() -> Vec<Self::InstanceId> {
+		<F as nonfungibles::InspectEnumerable<AccountId>>::instances(&A::get())
+	}
+	fn owned(who: &AccountId) -> Vec<Self::InstanceId> {
+		<F as nonfungibles::InspectEnumerable<AccountId>>::owned_in_class(&A::get(), who)
+	}
+}
+
+impl<
+	F: nonfungibles::Mutate<AccountId>,
+	A: Get<<F as nonfungibles::Inspect<AccountId>>::ClassId>,
+	AccountId,
+> Mutate<AccountId> for ItemOf<F, A, AccountId> {
+	fn mint_into(instance: &Self::InstanceId, who: &AccountId) -> DispatchResult {
+		<F as nonfungibles::Mutate<AccountId>>::mint_into(&A::get(), instance, who)
+	}
+	fn burn_from(instance: &Self::InstanceId) -> DispatchResult {
+		<F as nonfungibles::Mutate<AccountId>>::burn_from(&A::get(), instance)
+	}
+	fn set_attribute(instance: &Self::InstanceId, key: &[u8], value: &[u8]) -> DispatchResult {
+		<F as nonfungibles::Mutate<AccountId>>::set_attribute(&A::get(), instance, key, value)
+	}
+	fn set_typed_attribute<K: Encode, V: Encode>(
+		instance: &Self::InstanceId,
+		key: &K,
+		value: &V,
+	) -> DispatchResult {
+		<F as nonfungibles::Mutate<AccountId>>::set_typed_attribute(&A::get(), instance, key, value)
+	}
+}
+
+impl<
+	F: nonfungibles::Transfer<AccountId>,
+	A: Get<<F as nonfungibles::Inspect<AccountId>>::ClassId>,
+	AccountId,
+> Transfer<AccountId> for ItemOf<F, A, AccountId> {
+	fn transfer(instance: &Self::InstanceId, destination: &AccountId) -> DispatchResult {
+		<F as nonfungibles::Transfer<AccountId>>::transfer(&A::get(), instance, destination)
+	}
+}
diff --git a/frame/support/src/traits/tokens/nonfungibles.rs b/frame/support/src/traits/tokens/nonfungibles.rs
new file mode 100644
index 000000000000..56db553d83ac
--- /dev/null
+++ b/frame/support/src/traits/tokens/nonfungibles.rs
@@ -0,0 +1,194 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Traits for dealing with multiple collections of non-fungible assets.
+//!
+//! This assumes a dual-level namespace identified by `Inspect::InstanceId`, and could
+//! reasonably be implemented by pallets which want to expose multiple independent collections of
+//! NFT-like objects.
+//!
+//! For an NFT API which has single-level namespacing, the traits in `nonfungible` are better to
+//! use.
+//!
+//! Implementations of these traits may be converted to implementations of corresponding
+//! `nonfungible` traits by using the `nonfungible::ItemOf` type adapter.
+
+use sp_std::prelude::*;
+use codec::{Encode, Decode};
+use sp_runtime::TokenError;
+use crate::dispatch::DispatchResult;
+
+/// Trait for providing an interface to many read-only NFT-like sets of asset instances.
+pub trait Inspect<AccountId> {
+	/// Type for identifying an asset instance.
+	type InstanceId;
+
+	/// Type for identifying an asset class (an identifier for an independent collection of asset
+	/// instances).
+	type ClassId;
+
+	/// Returns the owner of asset `instance` of `class`, or `None` if the asset doesn't exist (or
+	/// somehow has no owner).
+	fn owner(class: &Self::ClassId, instance: &Self::InstanceId) -> Option<AccountId>;
+
+	/// Returns the owner of the asset `class`, if there is one. For many NFTs this may not make
+	/// any sense, so users of this API should not be surprised to find an asset class results in
+	/// `None` here.
+	fn class_owner(_class: &Self::ClassId) -> Option<AccountId> { None }
+
+	/// Returns the attribute value of `instance` of `class` corresponding to `key`.
+	///
+	/// By default this is `None`; no attributes are defined.
+	fn attribute(_class: &Self::ClassId, _instance: &Self::InstanceId, _key: &[u8])
+		-> Option<Vec<u8>>
+	{
+		None
+	}
+
+	/// Returns the strongly-typed attribute value of `instance` of `class` corresponding to `key`.
+	///
+	/// By default this just attempts to use `attribute`.
+	fn typed_attribute<K: Encode, V: Decode>(
+		class: &Self::ClassId,
+		instance: &Self::InstanceId,
+		key: &K,
+	) -> Option<V> {
+		key.using_encoded(|d| Self::attribute(class, instance, d))
+			.and_then(|v| V::decode(&mut &v[..]).ok())
+	}
+
+	/// Returns the attribute value of `class` corresponding to `key`.
+	///
+	/// By default this is `None`; no attributes are defined.
+	fn class_attribute(_class: &Self::ClassId, _key: &[u8]) -> Option<Vec<u8>> { None }
+
+	/// Returns the strongly-typed attribute value of `class` corresponding to `key`.
+	///
+	/// By default this just attempts to use `class_attribute`.
+	fn typed_class_attribute<K: Encode, V: Decode>(
+		class: &Self::ClassId,
+		key: &K,
+	) -> Option<V> {
+		key.using_encoded(|d| Self::class_attribute(class, d))
+			.and_then(|v| V::decode(&mut &v[..]).ok())
+	}
+
+	/// Returns `true` if the asset `instance` of `class` may be transferred.
+	///
+	/// Default implementation is that all assets are transferable.
+	fn can_transfer(_class: &Self::ClassId, _instance: &Self::InstanceId) -> bool { true }
+}
+
+/// Interface for enumerating assets in existence or owned by a given account over many collections
+/// of NFTs.
+///
+/// WARNING: These may be a heavy operations. Do not use when execution time is limited.
+pub trait InspectEnumerable<AccountId>: Inspect<AccountId> {
+	/// Returns the asset classes in existence.
+	fn classes() -> Vec<Self::ClassId>;
+
+	/// Returns the instances of an asset `class` in existence.
+	fn instances(class: &Self::ClassId) -> Vec<Self::InstanceId>;
+
+	/// Returns the asset instances of all classes owned by `who`.
+	fn owned(who: &AccountId) -> Vec<(Self::ClassId, Self::InstanceId)>;
+
+	/// Returns the asset instances of `class` owned by `who`.
+	fn owned_in_class(class: &Self::ClassId, who: &AccountId) -> Vec<Self::InstanceId>;
+}
+
+/// Trait for providing an interface for multiple classes of NFT-like assets which may be minted,
+/// burned and/or have attributes set on them.
+pub trait Mutate<AccountId>: Inspect<AccountId> {
+	/// Mint some asset `instance` of `class` to be owned by `who`.
+	///
+	/// By default, this is not a supported operation.
+	fn mint_into(
+		_class: &Self::ClassId,
+		_instance: &Self::InstanceId,
+		_who: &AccountId,
+	) -> DispatchResult {
+		Err(TokenError::Unsupported.into())
+	}
+
+	/// Burn some asset `instance` of `class`.
+	///
+	/// By default, this is not a supported operation.
+	fn burn_from(_class: &Self::ClassId, _instance: &Self::InstanceId) -> DispatchResult {
+		Err(TokenError::Unsupported.into())
+	}
+
+	/// Set attribute `value` of asset `instance` of `class`'s `key`.
+	///
+	/// By default, this is not a supported operation.
+	fn set_attribute(
+		_class: &Self::ClassId,
+		_instance: &Self::InstanceId,
+		_key: &[u8],
+		_value: &[u8],
+	) -> DispatchResult {
+		Err(TokenError::Unsupported.into())
+	}
+
+	/// Attempt to set the strongly-typed attribute `value` of `instance` of `class`'s `key`.
+	///
+	/// By default this just attempts to use `set_attribute`.
+	fn set_typed_attribute<K: Encode, V: Encode>(
+		class: &Self::ClassId,
+		instance: &Self::InstanceId,
+		key: &K,
+		value: &V,
+	) -> DispatchResult {
+		key.using_encoded(|k| value.using_encoded(|v|
+			Self::set_attribute(class, instance, k, v)
+		))
+	}
+
+	/// Set attribute `value` of asset `class`'s `key`.
+	///
+	/// By default, this is not a supported operation.
+	fn set_class_attribute(
+		_class: &Self::ClassId,
+		_key: &[u8],
+		_value: &[u8],
+	) -> DispatchResult {
+		Err(TokenError::Unsupported.into())
+	}
+
+	/// Attempt to set the strongly-typed attribute `value` of `class`'s `key`.
+	///
+	/// By default this just attempts to use `set_attribute`.
+	fn set_typed_class_attribute<K: Encode, V: Encode>(
+		class: &Self::ClassId,
+		key: &K,
+		value: &V,
+	) -> DispatchResult {
+		key.using_encoded(|k| value.using_encoded(|v|
+			Self::set_class_attribute(class, k, v)
+		))
+	}
+}
+
+/// Trait for providing a non-fungible sets of assets which can only be transferred.
+pub trait Transfer<AccountId>: Inspect<AccountId> {
+	/// Transfer asset `instance` of `class` into `destination` account.
+	fn transfer(
+		class: &Self::ClassId,
+		instance: &Self::InstanceId,
+		destination: &AccountId,
+	) -> DispatchResult;
+}
diff --git a/frame/uniques/src/functions.rs b/frame/uniques/src/functions.rs
new file mode 100644
index 000000000000..28ff5ac6a703
--- /dev/null
+++ b/frame/uniques/src/functions.rs
@@ -0,0 +1,115 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Various pieces of common functionality.
+
+use super::*;
+use frame_support::{ensure, traits::Get};
+use sp_runtime::{DispatchResult, DispatchError};
+
+impl<T: Config<I>, I: 'static> Pallet<T, I> {
+	pub(crate) fn do_transfer(
+		class: T::ClassId,
+		instance: T::InstanceId,
+		dest: T::AccountId,
+		with_details: impl FnOnce(
+			&ClassDetailsFor<T, I>,
+			&mut InstanceDetailsFor<T, I>,
+		) -> DispatchResult,
+	) -> DispatchResult {
+		let class_details = Class::<T, I>::get(&class).ok_or(Error::<T, I>::Unknown)?;
+		ensure!(!class_details.is_frozen, Error::<T, I>::Frozen);
+
+		let mut details = Asset::<T, I>::get(&class, &instance).ok_or(Error::<T, I>::Unknown)?;
+		ensure!(!details.is_frozen, Error::<T, I>::Frozen);
+		with_details(&class_details, &mut details)?;
+
+		Account::<T, I>::remove((&details.owner, &class, &instance));
+		Account::<T, I>::insert((&dest, &class, &instance), ());
+		let origin = details.owner;
+		details.owner = dest;
+		Asset::<T, I>::insert(&class, &instance, &details);
+
+		Self::deposit_event(Event::Transferred(class, instance, origin, details.owner));
+		Ok(())
+	}
+
+	pub(super) fn do_mint(
+		class: T::ClassId,
+		instance: T::InstanceId,
+		owner: T::AccountId,
+		with_details: impl FnOnce(
+			&ClassDetailsFor<T, I>,
+		) -> DispatchResult,
+	) -> DispatchResult {
+		ensure!(!Asset::<T, I>::contains_key(class, instance), Error::<T, I>::AlreadyExists);
+
+		Class::<T, I>::try_mutate(&class, |maybe_class_details| -> DispatchResult {
+			let class_details = maybe_class_details.as_mut().ok_or(Error::<T, I>::Unknown)?;
+
+			with_details(&class_details)?;
+
+			let instances = class_details.instances.checked_add(1)
+				.ok_or(ArithmeticError::Overflow)?;
+			class_details.instances = instances;
+
+			let deposit = match class_details.free_holding {
+				true => Zero::zero(),
+				false => T::InstanceDeposit::get(),
+			};
+			T::Currency::reserve(&class_details.owner, deposit)?;
+			class_details.total_deposit += deposit;
+
+			let owner = owner.clone();
+			Account::<T, I>::insert((&owner, &class, &instance), ());
+			let details = InstanceDetails { owner, approved: None, is_frozen: false, deposit};
+			Asset::<T, I>::insert(&class, &instance, details);
+			Ok(())
+		})?;
+
+		Self::deposit_event(Event::Issued(class, instance, owner));
+		Ok(())
+	}
+
+	pub(super) fn do_burn(
+		class: T::ClassId,
+		instance: T::InstanceId,
+		with_details: impl FnOnce(
+			&ClassDetailsFor<T, I>,
+			&InstanceDetailsFor<T, I>,
+		) -> DispatchResult,
+	) -> DispatchResult {
+		let owner = Class::<T, I>::try_mutate(&class, |maybe_class_details| -> Result<T::AccountId, DispatchError> {
+			let class_details = maybe_class_details.as_mut().ok_or(Error::<T, I>::Unknown)?;
+			let details = Asset::<T, I>::get(&class, &instance)
+				.ok_or(Error::<T, I>::Unknown)?;
+			with_details(&class_details, &details)?;
+
+			// Return the deposit.
+			T::Currency::unreserve(&class_details.owner, details.deposit);
+			class_details.total_deposit.saturating_reduce(details.deposit);
+			class_details.instances.saturating_dec();
+			Ok(details.owner)
+		})?;
+
+		Asset::<T, I>::remove(&class, &instance);
+		Account::<T, I>::remove((&owner, &class, &instance));
+
+		Self::deposit_event(Event::Burned(class, instance, owner));
+		Ok(())
+	}
+}
diff --git a/frame/uniques/src/impl_nonfungibles.rs b/frame/uniques/src/impl_nonfungibles.rs
new file mode 100644
index 000000000000..c856e2cc5588
--- /dev/null
+++ b/frame/uniques/src/impl_nonfungibles.rs
@@ -0,0 +1,108 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Implementations for `nonfungibles` traits.
+
+use super::*;
+use sp_std::convert::TryFrom;
+use frame_support::traits::tokens::nonfungibles::{Inspect, Mutate, Transfer};
+use frame_support::BoundedSlice;
+use sp_runtime::DispatchResult;
+
+impl<T: Config<I>, I: 'static> Inspect<<T as SystemConfig>::AccountId> for Pallet<T, I> {
+	type InstanceId = T::InstanceId;
+	type ClassId = T::ClassId;
+
+	fn owner(
+		class: &Self::ClassId,
+		instance: &Self::InstanceId,
+	) -> Option<<T as SystemConfig>::AccountId> {
+		Asset::<T, I>::get(class, instance).map(|a| a.owner)
+	}
+
+	fn class_owner(class: &Self::ClassId) -> Option<<T as SystemConfig>::AccountId> {
+		Class::<T, I>::get(class).map(|a| a.owner)
+	}
+
+	/// Returns the attribute value of `instance` of `class` corresponding to `key`.
+	///
+	/// When `key` is empty, we return the instance metadata value.
+	///
+	/// By default this is `None`; no attributes are defined.
+	fn attribute(class: &Self::ClassId, instance: &Self::InstanceId, key: &[u8])
+		-> Option<Vec<u8>>
+	{
+		if key.is_empty() {
+			// We make the empty key map to the instance metadata value.
+			InstanceMetadataOf::<T, I>::get(class, instance).map(|m| m.data.into())
+		} else {
+			let key = BoundedSlice::<_, _>::try_from(key).ok()?;
+			Attribute::<T, I>::get((class, Some(instance), key)).map(|a| a.0.into())
+		}
+	}
+
+	/// Returns the attribute value of `instance` of `class` corresponding to `key`.
+	///
+	/// When `key` is empty, we return the instance metadata value.
+	///
+	/// By default this is `None`; no attributes are defined.
+	fn class_attribute(class: &Self::ClassId, key: &[u8])
+		-> Option<Vec<u8>>
+	{
+		if key.is_empty() {
+			// We make the empty key map to the instance metadata value.
+			ClassMetadataOf::<T, I>::get(class).map(|m| m.data.into())
+		} else {
+			let key = BoundedSlice::<_, _>::try_from(key).ok()?;
+			Attribute::<T, I>::get((class, Option::<T::InstanceId>::None, key)).map(|a| a.0.into())
+		}
+	}
+
+	/// Returns `true` if the asset `instance` of `class` may be transferred.
+	///
+	/// Default implementation is that all assets are transferable.
+	fn can_transfer(class: &Self::ClassId, instance: &Self::InstanceId) -> bool {
+		match (Class::<T, I>::get(class), Asset::<T, I>::get(class, instance)) {
+			(Some(cd), Some(id)) if !cd.is_frozen && !id.is_frozen => true,
+			_ => false,
+		}
+	}
+}
+
+impl<T: Config<I>, I: 'static> Mutate<<T as SystemConfig>::AccountId> for Pallet<T, I> {
+	fn mint_into(
+		class: &Self::ClassId,
+		instance: &Self::InstanceId,
+		who: &T::AccountId,
+	) -> DispatchResult {
+		Self::do_mint(class.clone(), instance.clone(), who.clone(), |_| Ok(()))
+	}
+
+	fn burn_from(class: &Self::ClassId, instance: &Self::InstanceId) -> DispatchResult {
+		Self::do_burn(class.clone(), instance.clone(), |_, _| Ok(()))
+	}
+}
+
+impl<T: Config<I>, I: 'static> Transfer<T::AccountId> for Pallet<T, I> {
+	fn transfer(
+		class: &Self::ClassId,
+		instance: &Self::InstanceId,
+		destination: &T::AccountId,
+	) -> DispatchResult {
+		Self::do_transfer(class.clone(), instance.clone(), destination.clone(), |_, _| Ok(()))
+	}
+}
diff --git a/frame/uniques/src/lib.rs b/frame/uniques/src/lib.rs
index 21142a3a92ce..f4a0228de4a8 100644
--- a/frame/uniques/src/lib.rs
+++ b/frame/uniques/src/lib.rs
@@ -36,6 +36,8 @@ pub mod mock;
 mod tests;
 
 mod types;
+mod functions;
+mod impl_nonfungibles;
 pub use types::*;
 
 use sp_std::prelude::*;
@@ -448,32 +450,10 @@ pub mod pallet {
 			let origin = ensure_signed(origin)?;
 			let owner = T::Lookup::lookup(owner)?;
 
-			ensure!(!Asset::<T, I>::contains_key(class, instance), Error::<T, I>::AlreadyExists);
-
-			Class::<T, I>::try_mutate(&class, |maybe_class_details| -> DispatchResult {
-				let class_details = maybe_class_details.as_mut().ok_or(Error::<T, I>::Unknown)?;
+			Self::do_mint(class, instance, owner, |class_details| {
 				ensure!(class_details.issuer == origin, Error::<T, I>::NoPermission);
-
-				let instances = class_details.instances.checked_add(1)
-					.ok_or(ArithmeticError::Overflow)?;
-				class_details.instances = instances;
-
-				let deposit = match class_details.free_holding {
-					true => Zero::zero(),
-					false => T::InstanceDeposit::get(),
-				};
-				T::Currency::reserve(&class_details.owner, deposit)?;
-				class_details.total_deposit += deposit;
-
-				let owner = owner.clone();
-				Account::<T, I>::insert((&owner, &class, &instance), ());
-				let details = InstanceDetails { owner, approved: None, is_frozen: false, deposit};
-				Asset::<T, I>::insert(&class, &instance, details);
 				Ok(())
-			})?;
-
-			Self::deposit_event(Event::Issued(class, instance, owner));
-			Ok(())
+			})
 		}
 
 		/// Destroy a single asset instance.
@@ -499,27 +479,12 @@ pub mod pallet {
 			let origin = ensure_signed(origin)?;
 			let check_owner = check_owner.map(T::Lookup::lookup).transpose()?;
 
-			let owner = Class::<T, I>::try_mutate(&class, |maybe_class_details| -> Result<T::AccountId, DispatchError> {
-				let class_details = maybe_class_details.as_mut().ok_or(Error::<T, I>::Unknown)?;
-				let details = Asset::<T, I>::get(&class, &instance)
-					.ok_or(Error::<T, I>::Unknown)?;
+			Self::do_burn(class, instance, |class_details, details| {
 				let is_permitted = class_details.admin == origin || details.owner == origin;
 				ensure!(is_permitted, Error::<T, I>::NoPermission);
 				ensure!(check_owner.map_or(true, |o| o == details.owner), Error::<T, I>::WrongOwner);
-
-				// Return the deposit.
-				T::Currency::unreserve(&class_details.owner, details.deposit);
-				class_details.total_deposit.saturating_reduce(details.deposit);
-				class_details.instances.saturating_dec();
-				Ok(details.owner)
-			})?;
-
-
-			Asset::<T, I>::remove(&class, &instance);
-			Account::<T, I>::remove((&owner, &class, &instance));
-
-			Self::deposit_event(Event::Burned(class, instance, owner));
-			Ok(())
+				Ok(())
+			})
 		}
 
 		/// Move an asset from the sender account to another.
@@ -547,24 +512,13 @@ pub mod pallet {
 			let origin = ensure_signed(origin)?;
 			let dest = T::Lookup::lookup(dest)?;
 
-			let class_details = Class::<T, I>::get(&class).ok_or(Error::<T, I>::Unknown)?;
-			ensure!(!class_details.is_frozen, Error::<T, I>::Frozen);
-
-			let mut details = Asset::<T, I>::get(&class, &instance).ok_or(Error::<T, I>::Unknown)?;
-			ensure!(!details.is_frozen, Error::<T, I>::Frozen);
-			if details.owner != origin && class_details.admin != origin {
-				let approved = details.approved.take().map_or(false, |i| i == origin);
-				ensure!(approved, Error::<T, I>::NoPermission);
-			}
-
-			Account::<T, I>::remove((&details.owner, &class, &instance));
-			Account::<T, I>::insert((&dest, &class, &instance), ());
-			details.owner = dest;
-			Asset::<T, I>::insert(&class, &instance, &details);
-
-			Self::deposit_event(Event::Transferred(class, instance, origin, details.owner));
-
-			Ok(())
+			Self::do_transfer(class, instance, dest, |class_details, details| {
+				if details.owner != origin && class_details.admin != origin {
+					let approved = details.approved.take().map_or(false, |i| i == origin);
+					ensure!(approved, Error::<T, I>::NoPermission);
+				}
+				Ok(())
+			})
 		}
 
 		/// Reevaluate the deposits on some assets.
diff --git a/frame/uniques/src/types.rs b/frame/uniques/src/types.rs
index 45b571aa7de2..f73a18c7f3f3 100644
--- a/frame/uniques/src/types.rs
+++ b/frame/uniques/src/types.rs
@@ -22,6 +22,11 @@ use frame_support::{traits::Get, BoundedVec};
 
 pub(super) type DepositBalanceOf<T, I = ()> =
 	<<T as Config<I>>::Currency as Currency<<T as SystemConfig>::AccountId>>::Balance;
+pub(super) type ClassDetailsFor<T, I> =
+	ClassDetails<<T as SystemConfig>::AccountId, DepositBalanceOf<T, I>>;
+pub(super) type InstanceDetailsFor<T, I> =
+	InstanceDetails<<T as SystemConfig>::AccountId, DepositBalanceOf<T, I>>;
+
 
 #[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug)]
 pub struct ClassDetails<
diff --git a/primitives/runtime/src/lib.rs b/primitives/runtime/src/lib.rs
index 0ae69e93980a..8f7bbf1680c0 100644
--- a/primitives/runtime/src/lib.rs
+++ b/primitives/runtime/src/lib.rs
@@ -544,6 +544,8 @@ pub enum TokenError {
 	UnknownAsset,
 	/// Funds exist but are frozen.
 	Frozen,
+	/// Operation is not supported by the asset.
+	Unsupported,
 }
 
 impl From<TokenError> for &'static str {
@@ -555,6 +557,7 @@ impl From<TokenError> for &'static str {
 			TokenError::CannotCreate => "Account cannot be created",
 			TokenError::UnknownAsset => "The asset in question is unknown",
 			TokenError::Frozen => "Funds exist but are frozen",
+			TokenError::Unsupported => "Operation is not supported by the asset",
 		}
 	}
 }

From 2562dda0e0476e7522e89a7f4524a0dfced7e105 Mon Sep 17 00:00:00 2001
From: Dmitry Kashitsyn <korvin@deeptown.org>
Date: Thu, 3 Jun 2021 18:25:02 +0700
Subject: [PATCH 0828/1194] Removes unused import (#9007)

---
 frame/democracy/src/tests.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frame/democracy/src/tests.rs b/frame/democracy/src/tests.rs
index 9c7b21ad9157..e8877e2774c7 100644
--- a/frame/democracy/src/tests.rs
+++ b/frame/democracy/src/tests.rs
@@ -23,7 +23,7 @@ use codec::Encode;
 use frame_support::{
 	assert_noop, assert_ok, parameter_types, ord_parameter_types,
 	traits::{SortedMembers, OnInitialize, Filter, GenesisBuild},
-	weights::Weight, storage::StorageMap,
+	weights::Weight,
 };
 use sp_core::H256;
 use sp_runtime::{

From d6e4db6c30667bf3524abced8428401ab141b07a Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Thu, 3 Jun 2021 09:05:02 -0400
Subject: [PATCH 0829/1194] Add Call Filter That Prevents Nested `batch_all`
 (#9009)

* add filter preventing nested `batch_all`

* more tests

* fix test

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_utility --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/utility/src/weights.rs --template=./.maintain/frame-weight-template.hbs

Co-authored-by: Parity Bot <admin@parity.io>
---
 frame/utility/src/lib.rs     | 14 +++++++++---
 frame/utility/src/tests.rs   | 41 +++++++++++++++++++++++++++++++++++
 frame/utility/src/weights.rs | 42 ++++++++++++++++--------------------
 3 files changed, 71 insertions(+), 26 deletions(-)

diff --git a/frame/utility/src/lib.rs b/frame/utility/src/lib.rs
index c08df987c8b6..b8170ac8ba00 100644
--- a/frame/utility/src/lib.rs
+++ b/frame/utility/src/lib.rs
@@ -62,7 +62,7 @@ use sp_core::TypeId;
 use sp_io::hashing::blake2_256;
 use frame_support::{
 	transactional,
-	traits::{OriginTrait, UnfilteredDispatchable},
+	traits::{OriginTrait, UnfilteredDispatchable, IsSubType},
 	weights::{GetDispatchInfo, extract_actual_weight},
 	dispatch::PostDispatchInfo,
 };
@@ -91,7 +91,9 @@ pub mod pallet {
 		/// The overarching call type.
 		type Call: Parameter + Dispatchable<Origin=Self::Origin, PostInfo=PostDispatchInfo>
 			+ GetDispatchInfo + From<frame_system::Call<Self>>
-			+ UnfilteredDispatchable<Origin=Self::Origin>;
+			+ UnfilteredDispatchable<Origin=Self::Origin>
+			+ IsSubType<Call<Self>>
+			+ IsType<<Self as frame_system::Config>::Call>;
 
 		/// Weight information for extrinsics in this pallet.
 		type WeightInfo: WeightInfo;
@@ -266,7 +268,13 @@ pub mod pallet {
 				let result = if is_root {
 					call.dispatch_bypass_filter(origin.clone())
 				} else {
-					call.dispatch(origin.clone())
+					let mut filtered_origin = origin.clone();
+					// Don't allow users to nest `batch_all` calls.
+					filtered_origin.add_filter(move |c: &<T as frame_system::Config>::Call| {
+						let c = <T as Config>::Call::from_ref(c);
+						!matches!(c.is_sub_type(), Some(Call::batch_all(_)))
+					});
+					call.dispatch(filtered_origin)
 				};
 				// Add the weight of this call.
 				weight = weight.saturating_add(extract_actual_weight(&result, &info));
diff --git a/frame/utility/src/tests.rs b/frame/utility/src/tests.rs
index 6d9db2f0c612..02b878e799ee 100644
--- a/frame/utility/src/tests.rs
+++ b/frame/utility/src/tests.rs
@@ -519,3 +519,44 @@ fn batch_all_handles_weight_refund() {
 		);
 	});
 }
+
+#[test]
+fn batch_all_does_not_nest() {
+	new_test_ext().execute_with(|| {
+		let batch_all = Call::Utility(
+			UtilityCall::batch_all(
+				vec![
+					Call::Balances(BalancesCall::transfer(2, 1)),
+					Call::Balances(BalancesCall::transfer(2, 1)),
+					Call::Balances(BalancesCall::transfer(2, 1)),
+				]
+			)
+		);
+
+		let info = batch_all.get_dispatch_info();
+
+		assert_eq!(Balances::free_balance(1), 10);
+		assert_eq!(Balances::free_balance(2), 10);
+		// A nested batch_all call will not pass the filter, and fail with `BadOrigin`.
+		assert_noop!(
+			Utility::batch_all(Origin::signed(1), vec![batch_all.clone()]),
+			DispatchErrorWithPostInfo {
+				post_info: PostDispatchInfo {
+					actual_weight: Some(<Test as Config>::WeightInfo::batch_all(1) + info.weight),
+					pays_fee: Pays::Yes
+				},
+				error: DispatchError::BadOrigin,
+			}
+		);
+
+		// And for those who want to get a little fancy, we check that the filter persists across
+		// other kinds of dispatch wrapping functions... in this case `batch_all(batch(batch_all(..)))`
+		let batch_nested = Call::Utility(UtilityCall::batch(vec![batch_all]));
+		// Batch will end with `Ok`, but does not actually execute as we can see from the event
+		// and balances.
+		assert_ok!(Utility::batch_all(Origin::signed(1), vec![batch_nested]));
+		System::assert_has_event(utility::Event::BatchInterrupted(0, DispatchError::BadOrigin).into());
+		assert_eq!(Balances::free_balance(1), 10);
+		assert_eq!(Balances::free_balance(2), 10);
+	});
+}
diff --git a/frame/utility/src/weights.rs b/frame/utility/src/weights.rs
index f8cc31d1bba8..dd4981cf32da 100644
--- a/frame/utility/src/weights.rs
+++ b/frame/utility/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Weights for pallet_utility
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! Autogenerated weights for pallet_utility
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-03, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -46,44 +47,39 @@ pub trait WeightInfo {
 	fn batch(c: u32, ) -> Weight;
 	fn as_derivative() -> Weight;
 	fn batch_all(c: u32, ) -> Weight;
-	
 }
 
 /// Weights for pallet_utility using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn batch(c: u32, ) -> Weight {
-		(20_071_000 as Weight)
-			.saturating_add((2_739_000 as Weight).saturating_mul(c as Weight))
-			
+		(19_099_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((640_000 as Weight).saturating_mul(c as Weight))
 	}
 	fn as_derivative() -> Weight {
-		(5_721_000 as Weight)
-			
+		(3_701_000 as Weight)
 	}
 	fn batch_all(c: u32, ) -> Weight {
-		(21_440_000 as Weight)
-			.saturating_add((2_738_000 as Weight).saturating_mul(c as Weight))
-			
+		(19_199_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((1_061_000 as Weight).saturating_mul(c as Weight))
 	}
-	
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn batch(c: u32, ) -> Weight {
-		(20_071_000 as Weight)
-			.saturating_add((2_739_000 as Weight).saturating_mul(c as Weight))
-			
+		(19_099_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((640_000 as Weight).saturating_mul(c as Weight))
 	}
 	fn as_derivative() -> Weight {
-		(5_721_000 as Weight)
-			
+		(3_701_000 as Weight)
 	}
 	fn batch_all(c: u32, ) -> Weight {
-		(21_440_000 as Weight)
-			.saturating_add((2_738_000 as Weight).saturating_mul(c as Weight))
-			
+		(19_199_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((1_061_000 as Weight).saturating_mul(c as Weight))
 	}
-	
 }

From ea5d3570673d125dfe0b7da33b345c3c13195380 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Thu, 3 Jun 2021 16:04:29 +0200
Subject: [PATCH 0830/1194] Transaction pool: Ensure that we prune transactions
 properly (#8963)

* Transaction pool: Ensure that we prune transactions properly

There was a bug in the transaction pool that we didn't pruned
transactions properly because we called `prune_known`, instead of `prune`.

This bug was introduced by:
https://github.com/paritytech/substrate/pull/4629

This is required to have stale extrinsics being removed properly, so
that they don't fill up the tx pool.

* Fix compilation

* Fix benches

* ...
---
 .../transaction-pool/graph/benches/basics.rs  |   9 +-
 client/transaction-pool/graph/src/listener.rs |  10 +-
 client/transaction-pool/graph/src/pool.rs     |  15 ++-
 .../graph/src/validated_pool.rs               |  26 ++--
 client/transaction-pool/src/api.rs            |  20 +++-
 client/transaction-pool/src/lib.rs            |  25 +++-
 client/transaction-pool/src/testing/pool.rs   | 113 ++++++++++++------
 .../runtime/transaction-pool/src/lib.rs       |  20 +++-
 8 files changed, 170 insertions(+), 68 deletions(-)

diff --git a/client/transaction-pool/graph/benches/basics.rs b/client/transaction-pool/graph/benches/basics.rs
index 21e3d1006d5d..0c55c931eb21 100644
--- a/client/transaction-pool/graph/benches/basics.rs
+++ b/client/transaction-pool/graph/benches/basics.rs
@@ -23,7 +23,7 @@ use sc_transaction_graph::*;
 use codec::Encode;
 use substrate_test_runtime::{Block, Extrinsic, Transfer, H256, AccountId};
 use sp_runtime::{
-	generic::BlockId,
+	generic::BlockId, traits::Block as BlockT,
 	transaction_validity::{
 		ValidTransaction, InvalidTransaction, TransactionValidity, TransactionTag as Tag,
 		TransactionSource,
@@ -114,6 +114,13 @@ impl ChainApi for TestApi {
 	fn block_body(&self, _id: &BlockId<Self::Block>) -> Self::BodyFuture {
 		ready(Ok(None))
 	}
+
+	fn block_header(
+		&self,
+		_: &BlockId<Self::Block>,
+	) -> Result<Option<<Self::Block as BlockT>::Header>, Self::Error> {
+		Ok(None)
+	}
 }
 
 fn uxt(transfer: Transfer) -> Extrinsic {
diff --git a/client/transaction-pool/graph/src/listener.rs b/client/transaction-pool/graph/src/listener.rs
index 563243bf4594..e81c28660027 100644
--- a/client/transaction-pool/graph/src/listener.rs
+++ b/client/transaction-pool/graph/src/listener.rs
@@ -23,7 +23,7 @@ use std::{
 
 use linked_hash_map::LinkedHashMap;
 use serde::Serialize;
-use log::{debug, trace, warn};
+use log::{debug, trace};
 use sp_runtime::traits;
 
 use crate::{watcher, ChainApi, ExtrinsicHash, BlockHash};
@@ -99,12 +99,8 @@ impl<H: hash::Hash + traits::Member + Serialize, C: ChainApi> Listener<H, C> {
 	}
 
 	/// Transaction was removed as invalid.
-	pub fn invalid(&mut self, tx: &H, warn: bool) {
-		if warn {
-			warn!(target: "txpool", "[{:?}] Extrinsic invalid", tx);
-		} else {
-			debug!(target: "txpool", "[{:?}] Extrinsic invalid", tx);
-		}
+	pub fn invalid(&mut self, tx: &H) {
+		debug!(target: "txpool", "[{:?}] Extrinsic invalid", tx);
 		self.fire(tx, |watcher| watcher.invalid());
 	}
 
diff --git a/client/transaction-pool/graph/src/pool.rs b/client/transaction-pool/graph/src/pool.rs
index 7f9bc3c757f1..4f132550d703 100644
--- a/client/transaction-pool/graph/src/pool.rs
+++ b/client/transaction-pool/graph/src/pool.rs
@@ -95,6 +95,12 @@ pub trait ChainApi: Send + Sync {
 
 	/// Returns a block body given the block id.
 	fn block_body(&self, at: &BlockId<Self::Block>) -> Self::BodyFuture;
+
+	/// Returns a block header given the block id.
+	fn block_header(
+		&self,
+		at: &BlockId<Self::Block>,
+	) -> Result<Option<<Self::Block as BlockT>::Header>, Self::Error>;
 }
 
 /// Pool configuration options.
@@ -237,7 +243,7 @@ impl<B: ChainApi> Pool<B> {
 	) -> Result<(), B::Error> {
 		// Get details of all extrinsics that are already in the pool
 		let in_pool_tags = self.validated_pool.extrinsics_tags(hashes)
-			.into_iter().filter_map(|x| x).flat_map(|x| x);
+			.into_iter().filter_map(|x| x).flatten();
 
 		// Prune all transactions that provide given tags
 		let prune_status = self.validated_pool.prune_tags(in_pool_tags)?;
@@ -579,6 +585,13 @@ mod tests {
 		fn block_body(&self, _id: &BlockId<Self::Block>) -> Self::BodyFuture {
 			futures::future::ready(Ok(None))
 		}
+
+		fn block_header(
+			&self,
+			_: &BlockId<Self::Block>,
+		) -> Result<Option<<Self::Block as BlockT>::Header>, Self::Error> {
+			Ok(None)
+		}
 	}
 
 	fn uxt(transfer: Transfer) -> Extrinsic {
diff --git a/client/transaction-pool/graph/src/validated_pool.rs b/client/transaction-pool/graph/src/validated_pool.rs
index b9c2593f019c..ec05106896f2 100644
--- a/client/transaction-pool/graph/src/validated_pool.rs
+++ b/client/transaction-pool/graph/src/validated_pool.rs
@@ -230,7 +230,7 @@ impl<B: ChainApi> ValidatedPool<B> {
 				Err(err)
 			},
 			ValidatedTransaction::Unknown(hash, err) => {
-				self.listener.write().invalid(&hash, false);
+				self.listener.write().invalid(&hash);
 				Err(err)
 			},
 		}
@@ -415,7 +415,7 @@ impl<B: ChainApi> ValidatedPool<B> {
 					Status::Future => listener.future(&hash),
 					Status::Ready => listener.ready(&hash, None),
 					Status::Dropped => listener.dropped(&hash, None),
-					Status::Failed => listener.invalid(&hash, initial_status.is_some()),
+					Status::Failed => listener.invalid(&hash),
 				}
 			}
 		}
@@ -423,10 +423,12 @@ impl<B: ChainApi> ValidatedPool<B> {
 
 	/// For each extrinsic, returns tags that it provides (if known), or None (if it is unknown).
 	pub fn extrinsics_tags(&self, hashes: &[ExtrinsicHash<B>]) -> Vec<Option<Vec<Tag>>> {
-		self.pool.read().by_hashes(&hashes)
+		self.pool.read()
+			.by_hashes(&hashes)
 			.into_iter()
-			.map(|existing_in_pool| existing_in_pool
-				.map(|transaction| transaction.provides.to_vec()))
+			.map(|existing_in_pool|
+				existing_in_pool.map(|transaction| transaction.provides.to_vec())
+			)
 			.collect()
 	}
 
@@ -599,7 +601,7 @@ impl<B: ChainApi> ValidatedPool<B> {
 
 		let mut listener = self.listener.write();
 		for tx in &invalid {
-			listener.invalid(&tx.hash, true);
+			listener.invalid(&tx.hash);
 		}
 
 		invalid
@@ -645,15 +647,9 @@ fn fire_events<H, B, Ex>(
 	match *imported {
 		base::Imported::Ready { ref promoted, ref failed, ref removed, ref hash } => {
 			listener.ready(hash, None);
-			for f in failed {
-				listener.invalid(f, true);
-			}
-			for r in removed {
-				listener.dropped(&r.hash, Some(hash));
-			}
-			for p in promoted {
-				listener.ready(p, None);
-			}
+			failed.into_iter().for_each(|f| listener.invalid(f));
+			removed.into_iter().for_each(|r| listener.dropped(&r.hash, Some(hash)));
+			promoted.into_iter().for_each(|p| listener.ready(p, None));
 		},
 		base::Imported::Future { ref hash } => {
 			listener.future(hash)
diff --git a/client/transaction-pool/src/api.rs b/client/transaction-pool/src/api.rs
index 2ebf038844fa..09864f78248a 100644
--- a/client/transaction-pool/src/api.rs
+++ b/client/transaction-pool/src/api.rs
@@ -81,7 +81,7 @@ impl<Client, Block> FullChainApi<Client, Block> {
 impl<Client, Block> sc_transaction_graph::ChainApi for FullChainApi<Client, Block>
 where
 	Block: BlockT,
-	Client: ProvideRuntimeApi<Block> + BlockBackend<Block> + BlockIdTo<Block>,
+	Client: ProvideRuntimeApi<Block> + BlockBackend<Block> + BlockIdTo<Block> + HeaderBackend<Block>,
 	Client: Send + Sync + 'static,
 	Client::Api: TaggedTransactionQueue<Block>,
 {
@@ -150,6 +150,13 @@ where
 			(<traits::HashFor::<Block> as traits::Hash>::hash(x), x.len())
 		})
 	}
+
+	fn block_header(
+		&self,
+		at: &BlockId<Self::Block>,
+	) -> Result<Option<<Self::Block as BlockT>::Header>, Self::Error> {
+		self.client.header(*at).map_err(Into::into)
+	}
 }
 
 /// Helper function to validate a transaction using a full chain API.
@@ -162,7 +169,7 @@ fn validate_transaction_blocking<Client, Block>(
 ) -> error::Result<TransactionValidity>
 where
 	Block: BlockT,
-	Client: ProvideRuntimeApi<Block> + BlockBackend<Block> + BlockIdTo<Block>,
+	Client: ProvideRuntimeApi<Block> + BlockBackend<Block> + BlockIdTo<Block> + HeaderBackend<Block>,
 	Client: Send + Sync + 'static,
 	Client::Api: TaggedTransactionQueue<Block>,
 {
@@ -193,7 +200,7 @@ where
 impl<Client, Block> FullChainApi<Client, Block>
 where
 	Block: BlockT,
-	Client: ProvideRuntimeApi<Block> + BlockBackend<Block> + BlockIdTo<Block>,
+	Client: ProvideRuntimeApi<Block> + BlockBackend<Block> + BlockIdTo<Block> + HeaderBackend<Block>,
 	Client: Send + Sync + 'static,
 	Client::Api: TaggedTransactionQueue<Block>,
 {
@@ -333,4 +340,11 @@ impl<Client, F, Block> sc_transaction_graph::ChainApi for
 			Ok(Some(transactions))
 		}.boxed()
 	}
+
+	fn block_header(
+		&self,
+		at: &BlockId<Self::Block>,
+	) -> Result<Option<<Self::Block as BlockT>::Header>, Self::Error> {
+		self.client.header(*at).map_err(Into::into)
+	}
 }
diff --git a/client/transaction-pool/src/lib.rs b/client/transaction-pool/src/lib.rs
index 32bea107d8ac..0cd47f870d1a 100644
--- a/client/transaction-pool/src/lib.rs
+++ b/client/transaction-pool/src/lib.rs
@@ -40,7 +40,7 @@ use parking_lot::Mutex;
 
 use sp_runtime::{
 	generic::BlockId,
-	traits::{Block as BlockT, NumberFor, AtLeast32Bit, Extrinsic, Zero},
+	traits::{Block as BlockT, NumberFor, AtLeast32Bit, Extrinsic, Zero, Header as HeaderT},
 };
 use sp_core::traits::SpawnNamed;
 use sp_transaction_pool::{
@@ -379,6 +379,7 @@ where
 	Block: BlockT,
 	Client: sp_api::ProvideRuntimeApi<Block>
 		+ sc_client_api::BlockBackend<Block>
+		+ sc_client_api::blockchain::HeaderBackend<Block>
 		+ sp_runtime::traits::BlockIdTo<Block>
 		+ sc_client_api::ExecutorProvider<Block>
 		+ sc_client_api::UsageProvider<Block>
@@ -419,6 +420,7 @@ where
 	Block: BlockT,
 	Client: sp_api::ProvideRuntimeApi<Block>
 		+ sc_client_api::BlockBackend<Block>
+		+ sc_client_api::blockchain::HeaderBackend<Block>
 		+ sp_runtime::traits::BlockIdTo<Block>,
 	Client: Send + Sync + 'static,
 	Client::Api: sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block>,
@@ -555,19 +557,32 @@ async fn prune_known_txs_for_block<Block: BlockT, Api: ChainApi<Block = Block>>(
 	api: &Api,
 	pool: &sc_transaction_graph::Pool<Api>,
 ) -> Vec<ExtrinsicHash<Api>> {
-	let hashes = api.block_body(&block_id).await
+	let extrinsics = api.block_body(&block_id).await
 		.unwrap_or_else(|e| {
 			log::warn!("Prune known transactions: error request {:?}!", e);
 			None
 		})
-		.unwrap_or_default()
-		.into_iter()
+		.unwrap_or_default();
+
+	let hashes = extrinsics.iter()
 		.map(|tx| pool.hash_of(&tx))
 		.collect::<Vec<_>>();
 
 	log::trace!(target: "txpool", "Pruning transactions: {:?}", hashes);
 
-	if let Err(e) = pool.prune_known(&block_id, &hashes) {
+	let header = match api.block_header(&block_id) {
+		Ok(Some(h)) => h,
+		Ok(None) => {
+			log::debug!(target: "txpool", "Could not find header for {:?}.", block_id);
+			return hashes
+		},
+		Err(e) => {
+			log::debug!(target: "txpool", "Error retrieving header for {:?}: {:?}", block_id, e);
+			return hashes
+		}
+	};
+
+	if let Err(e) = pool.prune(&block_id, &BlockId::hash(*header.parent_hash()), &extrinsics).await {
 		log::error!("Cannot prune known in the pool {:?}!", e);
 	}
 
diff --git a/client/transaction-pool/src/testing/pool.rs b/client/transaction-pool/src/testing/pool.rs
index 904870ae0ece..999d1ab65eb6 100644
--- a/client/transaction-pool/src/testing/pool.rs
+++ b/client/transaction-pool/src/testing/pool.rs
@@ -306,31 +306,6 @@ fn should_not_retain_invalid_hashes_from_retracted() {
 	assert_eq!(pool.status().ready, 0);
 }
 
-#[test]
-fn should_revalidate_transaction_multiple_times() {
-	let xt = uxt(Alice, 209);
-
-	let (pool, _guard, mut notifier) = maintained_pool();
-
-	block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt.clone())).expect("1. Imported");
-	assert_eq!(pool.status().ready, 1);
-
-	let header = pool.api.push_block(1, vec![xt.clone()], true);
-
-	block_on(pool.maintain(block_event(header)));
-
-	block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt.clone())).expect("1. Imported");
-	assert_eq!(pool.status().ready, 1);
-
-	let header = pool.api.push_block(2, vec![], true);
-	pool.api.add_invalid(&xt);
-
-	block_on(pool.maintain(block_event(header)));
-	block_on(notifier.next());
-
-	assert_eq!(pool.status().ready, 0);
-}
-
 #[test]
 fn should_revalidate_across_many_blocks() {
 	let xt1 = uxt(Alice, 209);
@@ -1002,21 +977,13 @@ fn pruning_a_transaction_should_remove_it_from_best_transaction() {
 	let xt1 = Extrinsic::IncludeData(Vec::new());
 
 	block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt1.clone())).expect("1. Imported");
+	assert_eq!(pool.status().ready, 1);
 	let header = pool.api.push_block(1, vec![xt1.clone()], true);
 
 	// This will prune `xt1`.
 	block_on(pool.maintain(block_event(header)));
 
-	// Submit the tx again.
-	block_on(pool.submit_one(&BlockId::number(1), SOURCE, xt1.clone())).expect("2. Imported");
-
-	let mut iterator = block_on(pool.ready_at(1));
-
-	assert_eq!(iterator.next().unwrap().data, xt1.clone());
-
-	// If the tx was not removed from the best txs, the tx would be
-	// returned a second time by the iterator.
-	assert!(iterator.next().is_none());
+	assert_eq!(pool.status().ready, 0);
 }
 
 #[test]
@@ -1038,3 +1005,79 @@ fn only_revalidate_on_best_block() {
 
 	assert_eq!(pool.status().ready, 1);
 }
+
+#[test]
+fn stale_transactions_are_pruned() {
+	sp_tracing::try_init_simple();
+
+	// Our initial transactions
+	let xts = vec![
+		Transfer {
+			from: Alice.into(),
+			to: Bob.into(),
+			nonce: 1,
+			amount: 1,
+		},
+		Transfer {
+			from: Alice.into(),
+			to: Bob.into(),
+			nonce: 2,
+			amount: 1,
+		},
+		Transfer {
+			from: Alice.into(),
+			to: Bob.into(),
+			nonce: 3,
+			amount: 1,
+		},
+	];
+
+	let (pool, _guard, _notifier) = maintained_pool();
+
+	xts.into_iter().for_each(|xt| {
+		block_on(
+			pool.submit_one(&BlockId::number(0), SOURCE, xt.into_signed_tx()),
+		).expect("1. Imported");
+	});
+	assert_eq!(pool.status().ready, 0);
+	assert_eq!(pool.status().future, 3);
+
+	// Almost the same as our initial transactions, but with some different `amount`s to make them
+	// generate a different hash
+	let xts = vec![
+		Transfer {
+			from: Alice.into(),
+			to: Bob.into(),
+			nonce: 1,
+			amount: 2,
+		}.into_signed_tx(),
+		Transfer {
+			from: Alice.into(),
+			to: Bob.into(),
+			nonce: 2,
+			amount: 2,
+		}.into_signed_tx(),
+		Transfer {
+			from: Alice.into(),
+			to: Bob.into(),
+			nonce: 3,
+			amount: 2,
+		}.into_signed_tx(),
+	];
+
+	// Import block
+	let header = pool.api.push_block(1, xts, true);
+	block_on(pool.maintain(block_event(header)));
+	// The imported transactions have a different hash and should not evict our initial
+	// transactions.
+	assert_eq!(pool.status().future, 3);
+
+	// Import enough blocks to make our transactions stale
+	for n in 1..66 {
+		let header = pool.api.push_block(n, vec![], true);
+		block_on(pool.maintain(block_event(header)));
+	}
+
+	assert_eq!(pool.status().future, 0);
+	assert_eq!(pool.status().ready, 0);
+}
diff --git a/test-utils/runtime/transaction-pool/src/lib.rs b/test-utils/runtime/transaction-pool/src/lib.rs
index bcba2fb6e678..91f26b1921ce 100644
--- a/test-utils/runtime/transaction-pool/src/lib.rs
+++ b/test-utils/runtime/transaction-pool/src/lib.rs
@@ -23,7 +23,7 @@ use codec::Encode;
 use parking_lot::RwLock;
 use sp_runtime::{
 	generic::{self, BlockId},
-	traits::{BlakeTwo256, Hash as HashT, Block as _, Header as _},
+	traits::{BlakeTwo256, Hash as HashT, Block as BlockT, Header as _},
 	transaction_validity::{
 		TransactionValidity, ValidTransaction, TransactionValidityError, InvalidTransaction,
 		TransactionSource,
@@ -346,6 +346,24 @@ impl sc_transaction_graph::ChainApi for TestApi {
 				.map(|b| b.extrinsics().to_vec()),
 		}))
 	}
+
+	fn block_header(
+		&self,
+		at: &BlockId<Self::Block>,
+	) -> Result<Option<<Self::Block as BlockT>::Header>, Self::Error> {
+		Ok(match at {
+			BlockId::Number(num) => self.chain
+				.read()
+				.block_by_number
+				.get(num)
+				.map(|b| b[0].0.header().clone()),
+			BlockId::Hash(hash) => self.chain
+				.read()
+				.block_by_hash
+				.get(hash)
+				.map(|b| b.header().clone()),
+		})
+	}
 }
 
 impl sp_blockchain::HeaderMetadata<Block> for TestApi {

From a57bc4445a4e0bfd5c79c111add9d0db1a265507 Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Fri, 4 Jun 2021 08:50:59 +0200
Subject: [PATCH 0831/1194] Storage chain: Runtime module (#8624)

* Transaction storage runtime module

* WIP: Tests

* Tests, benchmarks  and docs

* Made check_proof mandatory

* Typo

* Renamed a crate

* Apply suggestions from code review

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Added weight for on_finalize

* Fixed counter mutations

* Reorganized tests

* Fixed build

* Update for the new inherent API

* Reworked for the new inherents API

* Apply suggestions from code review

Co-authored-by: cheme <emericchevalier.pro@gmail.com>
Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Store transactions in a Vec

* Added FeeDestination

* Get rid of constants

* Fixed node runtime build

* Fixed benches

* Update frame/transaction-storage/src/lib.rs

Co-authored-by: cheme <emericchevalier.pro@gmail.com>

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Co-authored-by: cheme <emericchevalier.pro@gmail.com>
Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 Cargo.lock                                    |  36 ++
 Cargo.toml                                    |   2 +
 bin/node/cli/src/chain_spec.rs                |   1 +
 bin/node/runtime/Cargo.toml                   |   3 +
 bin/node/runtime/src/lib.rs                   |  10 +
 bin/node/testing/src/genesis.rs               |   1 +
 client/api/src/client.rs                      |  10 +
 client/api/src/in_mem.rs                      |   7 +
 client/api/src/lib.rs                         |   1 +
 client/db/src/lib.rs                          |  51 +-
 client/light/src/blockchain.rs                |   7 +
 client/service/Cargo.toml                     |   1 +
 client/service/src/client/client.rs           |  30 ++
 frame/benchmarking/src/lib.rs                 |  29 +-
 frame/transaction-storage/Cargo.toml          |  50 ++
 frame/transaction-storage/README.md           |   8 +
 frame/transaction-storage/src/benchmarking.rs | 147 ++++++
 frame/transaction-storage/src/lib.rs          | 436 ++++++++++++++++++
 frame/transaction-storage/src/mock.rs         | 129 ++++++
 frame/transaction-storage/src/tests.rs        | 157 +++++++
 frame/transaction-storage/src/weights.rs      |  95 ++++
 primitives/blockchain/src/backend.rs          |   2 +
 primitives/externalities/src/lib.rs           |   4 +-
 primitives/io/src/lib.rs                      |  33 ++
 primitives/state-machine/src/ext.rs           |  17 +-
 .../src/overlayed_changes/mod.rs              |  13 +-
 .../transaction-storage-proof/Cargo.toml      |  36 ++
 .../transaction-storage-proof/README.md       |   3 +
 .../transaction-storage-proof/src/lib.rs      | 240 ++++++++++
 primitives/trie/src/storage_proof.rs          |   4 +
 30 files changed, 1534 insertions(+), 29 deletions(-)
 create mode 100644 frame/transaction-storage/Cargo.toml
 create mode 100644 frame/transaction-storage/README.md
 create mode 100644 frame/transaction-storage/src/benchmarking.rs
 create mode 100644 frame/transaction-storage/src/lib.rs
 create mode 100644 frame/transaction-storage/src/mock.rs
 create mode 100644 frame/transaction-storage/src/tests.rs
 create mode 100644 frame/transaction-storage/src/weights.rs
 create mode 100644 primitives/transaction-storage-proof/Cargo.toml
 create mode 100644 primitives/transaction-storage-proof/README.md
 create mode 100644 primitives/transaction-storage-proof/src/lib.rs

diff --git a/Cargo.lock b/Cargo.lock
index c8a7299835a0..97b64e07e413 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4377,6 +4377,7 @@ dependencies = [
  "pallet-tips",
  "pallet-transaction-payment",
  "pallet-transaction-payment-rpc-runtime-api",
+ "pallet-transaction-storage",
  "pallet-treasury",
  "pallet-uniques",
  "pallet-utility",
@@ -5602,6 +5603,26 @@ dependencies = [
  "sp-runtime",
 ]
 
+[[package]]
+name = "pallet-transaction-storage"
+version = "3.0.0"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-support-test",
+ "frame-system",
+ "hex-literal",
+ "pallet-balances",
+ "parity-scale-codec",
+ "serde",
+ "sp-core",
+ "sp-inherents",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+ "sp-transaction-storage-proof",
+]
+
 [[package]]
 name = "pallet-treasury"
 version = "3.0.0"
@@ -7953,6 +7974,7 @@ dependencies = [
  "sp-state-machine",
  "sp-tracing",
  "sp-transaction-pool",
+ "sp-transaction-storage-proof",
  "sp-trie",
  "sp-utils",
  "sp-version",
@@ -9314,6 +9336,20 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "sp-transaction-storage-proof"
+version = "3.0.0"
+dependencies = [
+ "async-trait",
+ "log",
+ "parity-scale-codec",
+ "sp-core",
+ "sp-inherents",
+ "sp-runtime",
+ "sp-std",
+ "sp-trie",
+]
+
 [[package]]
 name = "sp-trie"
 version = "3.0.0"
diff --git a/Cargo.toml b/Cargo.toml
index 8b613c021a9f..f7552f0bbbc4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -123,6 +123,7 @@ members = [
 	"frame/transaction-payment",
 	"frame/transaction-payment/rpc",
 	"frame/transaction-payment/rpc/runtime-api",
+	"frame/transaction-storage",
 	"frame/treasury",
 	"frame/tips",
 	"frame/uniques",
@@ -180,6 +181,7 @@ members = [
 	"primitives/timestamp",
 	"primitives/tracing",
 	"primitives/transaction-pool",
+	"primitives/transaction-storage-proof",
 	"primitives/trie",
 	"primitives/utils",
 	"primitives/version",
diff --git a/bin/node/cli/src/chain_spec.rs b/bin/node/cli/src/chain_spec.rs
index eb3ee5124ac0..3454aa83c24d 100644
--- a/bin/node/cli/src/chain_spec.rs
+++ b/bin/node/cli/src/chain_spec.rs
@@ -335,6 +335,7 @@ pub fn testnet_genesis(
 		},
 		pallet_vesting: Default::default(),
 		pallet_gilt: Default::default(),
+		pallet_transaction_storage: Default::default(),
 	}
 }
 
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index ca1ed7f3dcc0..e57944674fcc 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -85,6 +85,7 @@ pallet-treasury = { version = "3.0.0", default-features = false, path = "../../.
 pallet-utility = { version = "3.0.0", default-features = false, path = "../../../frame/utility" }
 pallet-transaction-payment = { version = "3.0.0", default-features = false, path = "../../../frame/transaction-payment" }
 pallet-transaction-payment-rpc-runtime-api = { version = "3.0.0", default-features = false, path = "../../../frame/transaction-payment/rpc/runtime-api/" }
+pallet-transaction-storage = { version = "3.0.0", default-features = false, path = "../../../frame/transaction-storage" }
 pallet-uniques = { version = "3.0.0", default-features = false, path = "../../../frame/uniques" }
 pallet-vesting = { version = "3.0.0", default-features = false, path = "../../../frame/vesting" }
 
@@ -152,6 +153,7 @@ std = [
 	"pallet-tips/std",
 	"pallet-transaction-payment-rpc-runtime-api/std",
 	"pallet-transaction-payment/std",
+	"pallet-transaction-storage/std",
 	"pallet-treasury/std",
 	"sp-transaction-pool/std",
 	"pallet-utility/std",
@@ -194,6 +196,7 @@ runtime-benchmarks = [
 	"pallet-staking/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
 	"pallet-tips/runtime-benchmarks",
+	"pallet-transaction-storage/runtime-benchmarks",
 	"pallet-treasury/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
 	"pallet-uniques/runtime-benchmarks",
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 3732adfb9a78..97975c55e960 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -1114,6 +1114,14 @@ impl pallet_uniques::Config for Runtime {
 	type WeightInfo = pallet_uniques::weights::SubstrateWeight<Runtime>;
 }
 
+impl pallet_transaction_storage::Config for Runtime {
+	type Event = Event;
+	type Currency = Balances;
+	type Call = Call;
+	type FeeDestination = ();
+	type WeightInfo = pallet_transaction_storage::weights::SubstrateWeight<Runtime>;
+}
+
 construct_runtime!(
 	pub enum Runtime where
 		Block = Block,
@@ -1159,6 +1167,7 @@ construct_runtime!(
 		Lottery: pallet_lottery::{Pallet, Call, Storage, Event<T>},
 		Gilt: pallet_gilt::{Pallet, Call, Storage, Event<T>, Config},
 		Uniques: pallet_uniques::{Pallet, Call, Storage, Event<T>},
+		TransactionStorage: pallet_transaction_storage::{Pallet, Call, Storage, Inherent, Config<T>, Event<T>},
 	}
 );
 
@@ -1532,6 +1541,7 @@ impl_runtime_apis! {
 			add_benchmark!(params, batches, frame_system, SystemBench::<Runtime>);
 			add_benchmark!(params, batches, pallet_timestamp, Timestamp);
 			add_benchmark!(params, batches, pallet_tips, Tips);
+			add_benchmark!(params, batches, pallet_transaction_storage, TransactionStorage);
 			add_benchmark!(params, batches, pallet_treasury, Treasury);
 			add_benchmark!(params, batches, pallet_uniques, Uniques);
 			add_benchmark!(params, batches, pallet_utility, Utility);
diff --git a/bin/node/testing/src/genesis.rs b/bin/node/testing/src/genesis.rs
index 905c2f4d70bb..6f884d1f73b6 100644
--- a/bin/node/testing/src/genesis.rs
+++ b/bin/node/testing/src/genesis.rs
@@ -120,5 +120,6 @@ pub fn config_endowed(
 		},
 		pallet_vesting: Default::default(),
 		pallet_gilt: Default::default(),
+		pallet_transaction_storage: Default::default(),
 	}
 }
diff --git a/client/api/src/client.rs b/client/api/src/client.rs
index 4a0940b1f4bd..79fb4f884431 100644
--- a/client/api/src/client.rs
+++ b/client/api/src/client.rs
@@ -84,6 +84,16 @@ pub trait BlockBackend<Block: BlockT> {
 		id: &BlockId<Block>
 	) -> sp_blockchain::Result<Option<Vec<<Block as BlockT>::Extrinsic>>>;
 
+	/// Get all indexed transactions for a block,
+	/// including renewed transactions.
+	///
+	/// Note that this will only fetch transactions
+	/// that are indexed by the runtime with `storage_index_transaction`.
+	fn block_indexed_body(
+		&self,
+		id: &BlockId<Block>,
+	) -> sp_blockchain::Result<Option<Vec<Vec<u8>>>>;
+
 	/// Get full block by id.
 	fn block(&self, id: &BlockId<Block>) -> sp_blockchain::Result<Option<SignedBlock<Block>>>;
 
diff --git a/client/api/src/in_mem.rs b/client/api/src/in_mem.rs
index d756e1cc0bbc..0d40bb3354cc 100644
--- a/client/api/src/in_mem.rs
+++ b/client/api/src/in_mem.rs
@@ -419,6 +419,13 @@ impl<Block: BlockT> blockchain::Backend<Block> for Blockchain<Block> {
 	) -> sp_blockchain::Result<Option<Vec<u8>>> {
 		unimplemented!("Not supported by the in-mem backend.")
 	}
+
+	fn block_indexed_body(
+		&self,
+		_id: BlockId<Block>
+	) -> sp_blockchain::Result<Option<Vec<Vec<u8>>>> {
+		unimplemented!("Not supported by the in-mem backend.")
+	}
 }
 
 impl<Block: BlockT> blockchain::ProvideCache<Block> for Blockchain<Block> {
diff --git a/client/api/src/lib.rs b/client/api/src/lib.rs
index 0f860b95e780..f3cef0e36ff4 100644
--- a/client/api/src/lib.rs
+++ b/client/api/src/lib.rs
@@ -38,6 +38,7 @@ pub use client::*;
 pub use light::*;
 pub use notifications::*;
 pub use proof_provider::*;
+pub use sp_blockchain::HeaderBackend;
 
 pub use sp_state_machine::{StorageProof, ExecutionStrategy};
 
diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index 9a334f95d49a..cda197ab0687 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -67,7 +67,7 @@ use codec::{Decode, Encode};
 use hash_db::Prefix;
 use sp_trie::{MemoryDB, PrefixedMemoryDB, prefixed_key};
 use sp_database::Transaction;
-use sp_core::{Hasher, ChangesTrieConfiguration};
+use sp_core::ChangesTrieConfiguration;
 use sp_core::offchain::OffchainOverlayedChange;
 use sp_core::storage::{well_known_keys, ChildInfo};
 use sp_arithmetic::traits::Saturating;
@@ -591,6 +591,37 @@ impl<Block: BlockT> sc_client_api::blockchain::Backend<Block> for BlockchainDb<B
 	fn has_indexed_transaction(&self, hash: &Block::Hash) -> ClientResult<bool> {
 		Ok(self.db.contains(columns::TRANSACTION, hash.as_ref()))
 	}
+
+	fn block_indexed_body(&self, id: BlockId<Block>) -> ClientResult<Option<Vec<Vec<u8>>>> {
+		match self.transaction_storage {
+			TransactionStorageMode::BlockBody => Ok(None),
+			TransactionStorageMode::StorageChain => {
+				let body = match read_db(&*self.db, columns::KEY_LOOKUP, columns::BODY, id)? {
+					Some(body) => body,
+					None => return Ok(None),
+				};
+				match Vec::<ExtrinsicHeader>::decode(&mut &body[..]) {
+					Ok(index) => {
+						let mut transactions = Vec::new();
+						for ExtrinsicHeader { indexed_hash, .. } in index.into_iter() {
+							if indexed_hash != Default::default() {
+								match self.db.get(columns::TRANSACTION, indexed_hash.as_ref()) {
+									Some(t) => transactions.push(t),
+									None => return Err(sp_blockchain::Error::Backend(
+										format!("Missing indexed transaction {:?}", indexed_hash))
+									)
+								}
+							}
+						}
+						Ok(Some(transactions))
+					}
+					Err(err) => return Err(sp_blockchain::Error::Backend(
+							format!("Error decoding body list: {}", err)
+					)),
+				}
+			}
+		}
+	}
 }
 
 impl<Block: BlockT> sc_client_api::blockchain::ProvideCache<Block> for BlockchainDb<Block> {
@@ -1624,10 +1655,10 @@ fn apply_index_ops<Block: BlockT>(
 	let mut renewed_map = HashMap::new();
 	for op in ops {
 		match op {
-			IndexOperation::Insert { extrinsic, offset } => {
-				index_map.insert(extrinsic, offset);
+			IndexOperation::Insert { extrinsic, hash, size } => {
+				index_map.insert(extrinsic, (hash, size));
 			}
-			IndexOperation::Renew { extrinsic, hash, .. } => {
+			IndexOperation::Renew { extrinsic, hash } => {
 				renewed_map.insert(extrinsic, DbHash::from_slice(hash.as_ref()));
 			}
 		}
@@ -1643,9 +1674,8 @@ fn apply_index_ops<Block: BlockT>(
 			}
 		} else {
 			match index_map.get(&(index as u32)) {
-				Some(offset) if *offset as usize <= extrinsic.len() => {
-					let offset = *offset as usize;
-					let hash = HashFor::<Block>::hash(&extrinsic[offset..]);
+				Some((hash, size)) if *size as usize <= extrinsic.len() => {
+					let offset = extrinsic.len() - *size as usize;
 					transaction.store(
 						columns::TRANSACTION,
 						DbHash::from_slice(hash.as_ref()),
@@ -3024,13 +3054,16 @@ pub(crate) mod tests {
 		for i in 0 .. 10 {
 			let mut index = Vec::new();
 			if i == 0 {
-				index.push(IndexOperation::Insert { extrinsic: 0, offset: 1 });
+				index.push(IndexOperation::Insert {
+					extrinsic: 0,
+					hash: x1_hash.as_ref().to_vec(),
+					size: (x1.len() - 1) as u32,
+				});
 			} else if i < 5 {
 				// keep renewing 1st
 				index.push(IndexOperation::Renew {
 					extrinsic: 0,
 					hash: x1_hash.as_ref().to_vec(),
-					size: (x1.len() - 1) as u32,
 				});
 			} // else stop renewing
 			let hash = insert_block(
diff --git a/client/light/src/blockchain.rs b/client/light/src/blockchain.rs
index 3349adf7ac69..242839833a54 100644
--- a/client/light/src/blockchain.rs
+++ b/client/light/src/blockchain.rs
@@ -135,6 +135,13 @@ impl<S, Block> BlockchainBackend<Block> for Blockchain<S> where Block: BlockT, S
 	) -> ClientResult<Option<Vec<u8>>> {
 		Err(ClientError::NotAvailableOnLightClient)
 	}
+
+	fn block_indexed_body(
+		&self,
+		_id: BlockId<Block>
+	) -> sp_blockchain::Result<Option<Vec<Vec<u8>>>> {
+		Err(ClientError::NotAvailableOnLightClient)
+	}
 }
 
 impl<S: Storage<Block>, Block: BlockT> ProvideCache<Block> for Blockchain<S> {
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index cff05390d787..6a98cf82f3e5 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -65,6 +65,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0" }
 sc-executor = { version = "0.9.0", path = "../executor" }
 sc-transaction-pool = { version = "3.0.0", path = "../transaction-pool" }
 sp-transaction-pool = { version = "3.0.0", path = "../../primitives/transaction-pool" }
+sp-transaction-storage-proof = { version = "3.0.0", path = "../../primitives/transaction-storage-proof" }
 sc-rpc-server = { version = "3.0.0", path = "../rpc-servers" }
 sc-rpc = { version = "3.0.0", path = "../rpc" }
 sc-block-builder = { version = "0.9.0", path = "../block-builder" }
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index b294be226899..06d9aec4e4fd 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -1982,6 +1982,13 @@ impl<B, E, Block, RA> BlockBackend<Block> for Client<B, E, Block, RA>
 	fn has_indexed_transaction(&self, hash: &Block::Hash) -> sp_blockchain::Result<bool> {
 		self.backend.blockchain().has_indexed_transaction(hash)
 	}
+
+	fn block_indexed_body(
+		&self,
+		id: &BlockId<Block>
+	) -> sp_blockchain::Result<Option<Vec<Vec<u8>>>> {
+		self.backend.blockchain().block_indexed_body(*id)
+	}
 }
 
 impl<B, E, Block, RA> backend::AuxStore for Client<B, E, Block, RA>
@@ -2050,3 +2057,26 @@ impl<BE, E, B, RA> sp_consensus::block_validation::Chain<B> for Client<BE, E, B,
 		Client::block_status(self, id).map_err(|e| Box::new(e) as Box<_>)
 	}
 }
+
+impl<BE, E, B, RA> sp_transaction_storage_proof::IndexedBody<B> for Client<BE, E, B, RA>
+where
+	BE: backend::Backend<B>,
+	E: CallExecutor<B>,
+	B: BlockT,
+{
+	fn block_indexed_body(
+		&self,
+		number: NumberFor<B>,
+	) ->Result<Option<Vec<Vec<u8>>>, sp_transaction_storage_proof::Error> {
+		self.backend.blockchain().block_indexed_body(BlockId::number(number))
+			.map_err(|e| sp_transaction_storage_proof::Error::Application(Box::new(e)))
+	}
+
+	fn number(
+		&self,
+		hash: B::Hash,
+	) -> Result<Option<NumberFor<B>>, sp_transaction_storage_proof::Error> {
+		self.backend.blockchain().number(hash)
+			.map_err(|e| sp_transaction_storage_proof::Error::Application(Box::new(e)))
+	}
+}
diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
index 63f65db36665..8160bd5d1dd2 100644
--- a/frame/benchmarking/src/lib.rs
+++ b/frame/benchmarking/src/lib.rs
@@ -736,17 +736,20 @@ macro_rules! impl_benchmark {
 					SelectedBenchmark as $crate::BenchmarkingSetup<T $(, $instance)?>
 				>::components(&selected_benchmark);
 
+				let mut progress = $crate::benchmarking::current_time();
 				// Default number of steps for a component.
 				let mut prev_steps = 10;
 
-				let repeat_benchmark = |
+				let mut repeat_benchmark = |
 					repeat: u32,
 					c: &[($crate::BenchmarkParameter, u32)],
 					results: &mut $crate::Vec<$crate::BenchmarkResults>,
 					verify: bool,
+					step: u32,
+					num_steps: u32,
 				| -> Result<(), &'static str> {
 					// Run the benchmark `repeat` times.
-					for _ in 0..repeat {
+					for r in 0..repeat {
 						// Set up the externalities environment for the setup we want to
 						// benchmark.
 						let closure_to_benchmark = <
@@ -801,6 +804,20 @@ macro_rules! impl_benchmark {
 								"Read/Write Count {:?}", read_write_count
 							);
 
+							let time = $crate::benchmarking::current_time();
+							if time.saturating_sub(progress) > 5000000000 {
+								progress = $crate::benchmarking::current_time();
+								$crate::log::info!(
+									target: "benchmark",
+									"Benchmarking {} {}/{}, run {}/{}",
+									extrinsic,
+									step,
+									num_steps,
+									r,
+									repeat,
+								);
+							}
+
 							// Time the storage root recalculation.
 							let start_storage_root = $crate::benchmarking::current_time();
 							$crate::storage_root();
@@ -829,9 +846,9 @@ macro_rules! impl_benchmark {
 				if components.is_empty() {
 					if verify {
 						// If `--verify` is used, run the benchmark once to verify it would complete.
-						repeat_benchmark(1, Default::default(), &mut $crate::Vec::new(), true)?;
+						repeat_benchmark(1, Default::default(), &mut $crate::Vec::new(), true, 1, 1)?;
 					}
-					repeat_benchmark(repeat, Default::default(), &mut results, false)?;
+					repeat_benchmark(repeat, Default::default(), &mut results, false, 1, 1)?;
 				} else {
 					// Select the component we will be benchmarking. Each component will be benchmarked.
 					for (idx, (name, low, high)) in components.iter().enumerate() {
@@ -869,9 +886,9 @@ macro_rules! impl_benchmark {
 
 							if verify {
 								// If `--verify` is used, run the benchmark once to verify it would complete.
-								repeat_benchmark(1, &c, &mut $crate::Vec::new(), true)?;
+								repeat_benchmark(1, &c, &mut $crate::Vec::new(), true, s, num_of_steps)?;
 							}
-							repeat_benchmark(repeat, &c, &mut results, false)?;
+							repeat_benchmark(repeat, &c, &mut results, false, s, num_of_steps)?;
 						}
 					}
 				}
diff --git a/frame/transaction-storage/Cargo.toml b/frame/transaction-storage/Cargo.toml
new file mode 100644
index 000000000000..8892e234d436
--- /dev/null
+++ b/frame/transaction-storage/Cargo.toml
@@ -0,0 +1,50 @@
+[package]
+name = "pallet-transaction-storage"
+version = "3.0.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
+license = "Unlicense"
+homepage = "https://substrate.dev"
+repository = "https://github.com/paritytech/substrate/"
+description = "Storage chain pallet"
+readme = "README.md"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+serde = { version = "1.0.101", optional = true }
+hex-literal = { version = "0.3.1", optional = true }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
+frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+pallet-balances = { version = "3.0.0", default-features = false, path = "../balances" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
+sp-inherents = { version = "3.0.0", default-features = false, path = "../../primitives/inherents" }
+sp-transaction-storage-proof = { version = "3.0.0", default-features = false, path = "../../primitives/transaction-storage-proof" }
+frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
+
+[dev-dependencies]
+frame-support-test = { version = "3.0.0", path = "../support/test" }
+sp-transaction-storage-proof = { version = "3.0.0", default-features = true, path = "../../primitives/transaction-storage-proof" }
+sp-core = { version = "3.0.0", path = "../../primitives/core", default-features = false }
+
+[features]
+default = ["std"]
+runtime-benchmarks = [
+	"frame-benchmarking",
+	"hex-literal",
+]
+std = [
+	"serde",
+	"codec/std",
+	"sp-runtime/std",
+	"frame-support/std",
+	"frame-system/std",
+	"pallet-balances/std",
+	"sp-io/std",
+	"sp-std/std",
+	"sp-inherents/std",
+]
diff --git a/frame/transaction-storage/README.md b/frame/transaction-storage/README.md
new file mode 100644
index 000000000000..a4f77797f5ef
--- /dev/null
+++ b/frame/transaction-storage/README.md
@@ -0,0 +1,8 @@
+# Transaction Storage Pallet
+
+Indexes transactions and manages storage proofs.
+# Transaction Storage Pallet
+
+Indexes transactions and manages storage proofs.
+
+License: Apache-2.0
diff --git a/frame/transaction-storage/src/benchmarking.rs b/frame/transaction-storage/src/benchmarking.rs
new file mode 100644
index 000000000000..ffb4d23de119
--- /dev/null
+++ b/frame/transaction-storage/src/benchmarking.rs
@@ -0,0 +1,147 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Benchmarks for transaction-storage Pallet
+
+#![cfg(feature = "runtime-benchmarks")]
+
+use sp_std::*;
+use super::*;
+use sp_runtime::traits::{Zero, One, Bounded};
+use sp_transaction_storage_proof::TransactionStorageProof;
+use frame_system::{RawOrigin, Pallet as System, EventRecord};
+use frame_benchmarking::{benchmarks, whitelisted_caller, impl_benchmark_test_suite};
+use frame_support::{traits::{Currency, OnFinalize, OnInitialize}};
+
+use crate::Pallet as TransactionStorage;
+
+const PROOF: &[u8] = &hex_literal::hex!("
+	0104000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+	0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+	0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+	0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+	0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+	000000000000000000000000000000014cd0780ffff80e316a478e2f1fcb13cf22fd0b2dbb54a6f53cff93f3ca2f3dfe8
+	7d12a3662c4c0080e316a478e2f1fcb13cf22fd0b2dbb54a6f53cff93f3ca2f3dfe87d12a3662c4c80e316a478e2f1fcb
+	13cf22fd0b2dbb54a6f53cff93f3ca2f3dfe87d12a3662c4c80e316a478e2f1fcb13cf22fd0b2dbb54a6f53cff93f3ca2
+	f3dfe87d12a3662c4c80e316a478e2f1fcb13cf22fd0b2dbb54a6f53cff93f3ca2f3dfe87d12a3662c4c80e316a478e2f
+	1fcb13cf22fd0b2dbb54a6f53cff93f3ca2f3dfe87d12a3662c4c80e316a478e2f1fcb13cf22fd0b2dbb54a6f53cff93f
+	3ca2f3dfe87d12a3662c4c80e316a478e2f1fcb13cf22fd0b2dbb54a6f53cff93f3ca2f3dfe87d12a3662c4c80e316a47
+	8e2f1fcb13cf22fd0b2dbb54a6f53cff93f3ca2f3dfe87d12a3662c4c80e316a478e2f1fcb13cf22fd0b2dbb54a6f53cf
+	f93f3ca2f3dfe87d12a3662c4c80e316a478e2f1fcb13cf22fd0b2dbb54a6f53cff93f3ca2f3dfe87d12a3662c4c80e31
+	6a478e2f1fcb13cf22fd0b2dbb54a6f53cff93f3ca2f3dfe87d12a3662c4c80e316a478e2f1fcb13cf22fd0b2dbb54a6f
+	53cff93f3ca2f3dfe87d12a3662c4c80e316a478e2f1fcb13cf22fd0b2dbb54a6f53cff93f3ca2f3dfe87d12a3662c4c8
+	0e316a478e2f1fcb13cf22fd0b2dbb54a6f53cff93f3ca2f3dfe87d12a3662c4cbd05807777809a5d7a720ce5f9d9a012
+	fbf25e92c30e732dadba8f312b05e02976313ea64d9f807d43bcbf8a3dc2f6b9e957d129e610c06d411e11743062dc1cf
+	3ac289390ae4c8008592aa2d915f52941036afbe72bac4ebe7ce186c4ddc53f118e0ddd4decd8cc809a5d7a720ce5f9d9
+	a012fbf25e92c30e732dadba8f312b05e02976313ea64d9f807d43bcbf8a3dc2f6b9e957d129e610c06d411e11743062d
+	c1cf3ac289390ae4c00809a5d7a720ce5f9d9a012fbf25e92c30e732dadba8f312b05e02976313ea64d9f807d43bcbf8a
+	3dc2f6b9e957d129e610c06d411e11743062dc1cf3ac289390ae4c8008592aa2d915f52941036afbe72bac4ebe7ce186c
+	4ddc53f118e0ddd4decd8cc809a5d7a720ce5f9d9a012fbf25e92c30e732dadba8f312b05e02976313ea64d9f807d43bc
+	bf8a3dc2f6b9e957d129e610c06d411e11743062dc1cf3ac289390ae4c8008592aa2d915f52941036afbe72bac4ebe7ce
+	186c4ddc53f118e0ddd4decd8cccd0780ffff8081b825bfa9b2ba8f5f253515e7db09eb1ad3d4f02f322d3aa1398e0cb0
+	3bdb31008081b825bfa9b2ba8f5f253515e7db09eb1ad3d4f02f322d3aa1398e0cb03bdb318081b825bfa9b2ba8f5f253
+	515e7db09eb1ad3d4f02f322d3aa1398e0cb03bdb318081b825bfa9b2ba8f5f253515e7db09eb1ad3d4f02f322d3aa139
+	8e0cb03bdb318081b825bfa9b2ba8f5f253515e7db09eb1ad3d4f02f322d3aa1398e0cb03bdb318081b825bfa9b2ba8f5
+	f253515e7db09eb1ad3d4f02f322d3aa1398e0cb03bdb318081b825bfa9b2ba8f5f253515e7db09eb1ad3d4f02f322d3a
+	a1398e0cb03bdb318081b825bfa9b2ba8f5f253515e7db09eb1ad3d4f02f322d3aa1398e0cb03bdb318081b825bfa9b2b
+	a8f5f253515e7db09eb1ad3d4f02f322d3aa1398e0cb03bdb318081b825bfa9b2ba8f5f253515e7db09eb1ad3d4f02f32
+	2d3aa1398e0cb03bdb318081b825bfa9b2ba8f5f253515e7db09eb1ad3d4f02f322d3aa1398e0cb03bdb318081b825bfa
+	9b2ba8f5f253515e7db09eb1ad3d4f02f322d3aa1398e0cb03bdb318081b825bfa9b2ba8f5f253515e7db09eb1ad3d4f0
+	2f322d3aa1398e0cb03bdb318081b825bfa9b2ba8f5f253515e7db09eb1ad3d4f02f322d3aa1398e0cb03bdb318081b82
+	5bfa9b2ba8f5f253515e7db09eb1ad3d4f02f322d3aa1398e0cb03bdb31cd0780ffff80b4f23ac50c8e67d9b280f2b31a
+	5707d52b892977acaac84d530bd188544c5f9b80b4f23ac50c8e67d9b280f2b31a5707d52b892977acaac84d530bd1885
+	44c5f9b80b4f23ac50c8e67d9b280f2b31a5707d52b892977acaac84d530bd188544c5f9b80b4f23ac50c8e67d9b280f2
+	b31a5707d52b892977acaac84d530bd188544c5f9b80b4f23ac50c8e67d9b280f2b31a5707d52b892977acaac84d530bd
+	188544c5f9b0080b4f23ac50c8e67d9b280f2b31a5707d52b892977acaac84d530bd188544c5f9b80b4f23ac50c8e67d9
+	b280f2b31a5707d52b892977acaac84d530bd188544c5f9b80b4f23ac50c8e67d9b280f2b31a5707d52b892977acaac84
+	d530bd188544c5f9b80b4f23ac50c8e67d9b280f2b31a5707d52b892977acaac84d530bd188544c5f9b80b4f23ac50c8e
+	67d9b280f2b31a5707d52b892977acaac84d530bd188544c5f9b80b4f23ac50c8e67d9b280f2b31a5707d52b892977aca
+	ac84d530bd188544c5f9b80b4f23ac50c8e67d9b280f2b31a5707d52b892977acaac84d530bd188544c5f9b80b4f23ac5
+	0c8e67d9b280f2b31a5707d52b892977acaac84d530bd188544c5f9b80b4f23ac50c8e67d9b280f2b31a5707d52b89297
+	7acaac84d530bd188544c5f9b80b4f23ac50c8e67d9b280f2b31a5707d52b892977acaac84d530bd188544c5f9b104401
+	0000
+");
+
+type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+
+fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
+	let events = System::<T>::events();
+	let system_event: <T as frame_system::Config>::Event = generic_event.into();
+	let EventRecord { event, .. } = &events[events.len() - 1];
+	assert_eq!(event, &system_event);
+}
+
+pub fn run_to_block<T: Config>(n: T::BlockNumber) {
+	while frame_system::Pallet::<T>::block_number() < n {
+		crate::Pallet::<T>::on_finalize(frame_system::Pallet::<T>::block_number());
+		frame_system::Pallet::<T>::on_finalize(frame_system::Pallet::<T>::block_number());
+		frame_system::Pallet::<T>::set_block_number(frame_system::Pallet::<T>::block_number() + One::one());
+		frame_system::Pallet::<T>::on_initialize(frame_system::Pallet::<T>::block_number());
+		crate::Pallet::<T>::on_initialize(frame_system::Pallet::<T>::block_number());
+	}
+}
+
+benchmarks! {
+	store {
+		let l in 1 .. MaxTransactionSize::<T>::get();
+		let caller: T::AccountId = whitelisted_caller();
+		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
+	}: _(RawOrigin::Signed(caller.clone()), vec![0u8; l as usize])
+	verify {
+		assert!(!BlockTransactions::<T>::get().is_empty());
+		assert_last_event::<T>(Event::Stored(0).into());
+	}
+
+	renew {
+		let caller: T::AccountId = whitelisted_caller();
+		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
+		TransactionStorage::<T>::store(
+			RawOrigin::Signed(caller.clone()).into(),
+			vec![0u8; MaxTransactionSize::<T>::get() as usize],
+		)?;
+		run_to_block::<T>(1u32.into());
+	}: _(RawOrigin::Signed(caller.clone()), T::BlockNumber::zero(), 0)
+	verify {
+		assert_last_event::<T>(Event::Renewed(0).into());
+	}
+
+	check_proof_max {
+		run_to_block::<T>(1u32.into());
+		let caller: T::AccountId = whitelisted_caller();
+		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
+		for _ in 0 .. MaxBlockTransactions::<T>::get() {
+			TransactionStorage::<T>::store(
+				RawOrigin::Signed(caller.clone()).into(),
+				vec![0u8; MaxTransactionSize::<T>::get() as usize],
+			)?;
+		}
+		run_to_block::<T>(StoragePeriod::<T>::get() + T::BlockNumber::one());
+		let random_hash = [0u8];
+		let mut encoded_proof = PROOF;
+		let proof = TransactionStorageProof::decode(&mut encoded_proof).unwrap();
+	}: check_proof(RawOrigin::None, proof)
+	verify {
+		assert_last_event::<T>(Event::ProofChecked.into());
+	}
+}
+
+impl_benchmark_test_suite!(
+	TransactionStorage,
+	crate::mock::new_test_ext(),
+	crate::mock::Test,
+);
diff --git a/frame/transaction-storage/src/lib.rs b/frame/transaction-storage/src/lib.rs
new file mode 100644
index 000000000000..ef824a8399f5
--- /dev/null
+++ b/frame/transaction-storage/src/lib.rs
@@ -0,0 +1,436 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Transaction storage pallet. Indexes transactions and manages storage proofs.
+
+// Ensure we're `no_std` when compiling for Wasm.
+#![cfg_attr(not(feature = "std"), no_std)]
+
+mod benchmarking;
+pub mod weights;
+
+#[cfg(test)]
+mod mock;
+#[cfg(test)]
+mod tests;
+
+use frame_support::{
+	traits::{ReservableCurrency, Currency, OnUnbalanced},
+	dispatch::{Dispatchable, GetDispatchInfo},
+};
+use sp_std::prelude::*;
+use sp_std::{result};
+use codec::{Encode, Decode};
+use sp_runtime::traits::{Saturating, BlakeTwo256, Hash, Zero, One};
+use sp_transaction_storage_proof::{
+	TransactionStorageProof, InherentError,
+	random_chunk, encode_index,
+	CHUNK_SIZE, INHERENT_IDENTIFIER, DEFAULT_STORAGE_PERIOD,
+};
+
+/// A type alias for the balance type from this pallet's point of view.
+type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>
+	::NegativeImbalance;
+
+// Re-export pallet items so that they can be accessed from the crate namespace.
+pub use pallet::*;
+pub use weights::WeightInfo;
+
+/// Maximum bytes that can be stored in one transaction.
+// Setting higher limit also requires raising the allocator limit.
+pub const DEFAULT_MAX_TRANSACTION_SIZE: u32 = 8 * 1024 * 1024;
+pub const DEFAULT_MAX_BLOCK_TRANSACTIONS: u32 = 512;
+
+/// State data for a stored transaction.
+#[derive(Encode, Decode, Clone, sp_runtime::RuntimeDebug, PartialEq, Eq)]
+pub struct TransactionInfo {
+	/// Chunk trie root.
+	chunk_root: <BlakeTwo256 as Hash>::Output,
+	/// Plain hash of indexed data.
+	content_hash: <BlakeTwo256 as Hash>::Output,
+	/// Size of indexed data in bytes.
+	size: u32,
+	/// Total number of chunks added in the block with this transaction. This
+	/// is used find transaction info by block chunk index using binary search.
+	block_chunks: u32,
+}
+
+fn num_chunks(bytes: u32) -> u32 {
+	((bytes as u64 + CHUNK_SIZE as u64 - 1) / CHUNK_SIZE as u64) as u32
+}
+
+#[frame_support::pallet]
+pub mod pallet {
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+	use super::*;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		/// The overarching event type.
+		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
+		/// A dispatchable call.
+		type Call: Parameter + Dispatchable<Origin=Self::Origin> + GetDispatchInfo + From<frame_system::Call<Self>>;
+		/// The currency trait.
+		type Currency: ReservableCurrency<Self::AccountId>;
+		/// Handler for the unbalanced decrease when fees are burned.
+		type FeeDestination: OnUnbalanced<NegativeImbalanceOf<Self>>;
+		/// Weight information for extrinsics in this pallet.
+		type WeightInfo: WeightInfo;
+	}
+
+	#[pallet::error]
+	pub enum Error<T> {
+		/// Insufficient account balance.
+		InsufficientFunds,
+		/// Invalid configuration.
+		NotConfigured,
+		/// Renewed extrinsic is not found.
+		RenewedNotFound,
+		/// Attempting to store empty transaction
+		EmptyTransaction,
+		/// Proof was not expected in this block.
+		UnexpectedProof,
+		/// Proof failed verification.
+		InvalidProof,
+		/// Missing storage proof.
+		MissingProof,
+		/// Unable to verify proof becasue state data is missing.
+		MissingStateData,
+		/// Double proof check in the block.
+		DoubleCheck,
+		/// Storage proof was not checked in the block.
+		ProofNotChecked,
+		/// Transaction is too large.
+		TransactionTooLarge,
+		/// Too many transactions in the block.
+		TooManyTransactions,
+		/// Attempted to call `store` outside of block execution.
+		BadContext,
+	}
+
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(_);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+		fn on_initialize(n: T::BlockNumber) -> Weight {
+			// Drop obsolete roots. The proof for `obsolete` will be checked later
+			// in this block, so we drop `obsolete` - 1.
+			let period = <StoragePeriod<T>>::get();
+			let obsolete = n.saturating_sub(period.saturating_add(One::one()));
+			if obsolete > Zero::zero() {
+				<Transactions<T>>::remove(obsolete);
+				<ChunkCount<T>>::remove(obsolete);
+			}
+			// 2 writes in `on_initialize` and 2 writes + 2 reads in `on_finalize`
+			T::DbWeight::get().reads_writes(2, 4)
+		}
+
+		fn on_finalize(n: T::BlockNumber) {
+			assert!(
+				<ProofChecked<T>>::take()
+				|| {
+					// Proof is not required for early or empty blocks.
+					let number = <frame_system::Pallet<T>>::block_number();
+					let period = <StoragePeriod<T>>::get();
+					let target_number = number.saturating_sub(period);
+					target_number.is_zero() || <ChunkCount<T>>::get(target_number) == 0
+				},
+				"Storage proof must be checked once in the block"
+			);
+			// Insert new transactions
+			let transactions = <BlockTransactions<T>>::take();
+			let total_chunks = transactions.last().map_or(0, |t| t.block_chunks);
+			if total_chunks != 0 {
+				<ChunkCount<T>>::insert(n, total_chunks);
+				<Transactions<T>>::insert(n, transactions);
+			}
+		}
+	}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		/// Index and store data on chain. Minimum data size is 1 bytes, maximum is `MaxTransactionSize`.
+		/// Data will be removed after `STORAGE_PERIOD` blocks, unless `renew` is called.
+		/// # <weight>
+		/// - n*log(n) of data size, as all data is pushed to an in-memory trie.
+		/// Additionally contains a DB write.
+		/// # </weight>
+		#[pallet::weight(T::WeightInfo::store(data.len() as u32))]
+		pub(super) fn store(
+			origin: OriginFor<T>,
+			data: Vec<u8>,
+		) -> DispatchResult {
+			ensure!(data.len() > 0, Error::<T>::EmptyTransaction);
+			ensure!(data.len() <= MaxTransactionSize::<T>::get() as usize, Error::<T>::TransactionTooLarge);
+			let sender = ensure_signed(origin)?;
+			Self::apply_fee(sender, data.len() as u32)?;
+
+			// Chunk data and compute storage root
+			let chunk_count = num_chunks(data.len() as u32);
+			let chunks = data.chunks(CHUNK_SIZE).map(|c| c.to_vec()).collect();
+			let root = sp_io::trie::blake2_256_ordered_root(chunks);
+
+			let content_hash = sp_io::hashing::blake2_256(&data);
+			let extrinsic_index = <frame_system::Pallet<T>>::extrinsic_index().ok_or_else(
+				|| Error::<T>::BadContext)?;
+			sp_io::transaction_index::index(extrinsic_index, data.len() as u32, content_hash);
+
+			let mut index = 0;
+			<BlockTransactions<T>>::mutate(|transactions| {
+				if transactions.len() + 1 > MaxBlockTransactions::<T>::get() as usize {
+					return Err(Error::<T>::TooManyTransactions)
+				}
+				let total_chunks = transactions.last().map_or(0, |t| t.block_chunks) + chunk_count;
+				index = transactions.len() as u32;
+				transactions.push(TransactionInfo {
+					chunk_root: root,
+					size: data.len() as u32,
+					content_hash: content_hash.into(),
+					block_chunks: total_chunks,
+				});
+				Ok(())
+			})?;
+			Self::deposit_event(Event::Stored(index));
+			Ok(())
+		}
+
+		/// Renew previously stored data. Parameters are the block number that contains
+		/// previous `store` or `renew` call and transaction index within that block.
+		/// Transaction index is emitted in the `Stored` or `Renewed` event.
+		/// Applies same fees as `store`.
+		/// # <weight>
+		/// - Constant.
+		/// # </weight>
+		#[pallet::weight(T::WeightInfo::renew())]
+		pub(super) fn renew(
+			origin: OriginFor<T>,
+			block: T::BlockNumber,
+			index: u32,
+		) -> DispatchResultWithPostInfo {
+			let sender = ensure_signed(origin)?;
+			let transactions = <Transactions<T>>::get(block).ok_or(Error::<T>::RenewedNotFound)?;
+			let info = transactions.get(index as usize).ok_or(Error::<T>::RenewedNotFound)?;
+			Self::apply_fee(sender, info.size)?;
+
+			let extrinsic_index = <frame_system::Pallet<T>>::extrinsic_index().unwrap();
+			sp_io::transaction_index::renew(extrinsic_index, info.content_hash.into());
+
+			let mut index = 0;
+			<BlockTransactions<T>>::mutate(|transactions| {
+				if transactions.len() + 1 > MaxBlockTransactions::<T>::get() as usize {
+					return Err(Error::<T>::TooManyTransactions)
+				}
+				let chunks = num_chunks(info.size);
+				let total_chunks = transactions.last().map_or(0, |t| t.block_chunks) + chunks;
+				index = transactions.len() as u32;
+				transactions.push(TransactionInfo {
+					chunk_root: info.chunk_root,
+					size: info.size,
+					content_hash: info.content_hash,
+					block_chunks: total_chunks,
+				});
+				Ok(())
+			})?;
+			Self::deposit_event(Event::Renewed(index));
+			Ok(().into())
+		}
+
+		/// Check storage proof for block number `block_number() - StoragePeriod`.
+		/// If such block does not exist the proof is expected to be `None`.
+		/// # <weight>
+		/// - Linear w.r.t the number of indexed transactions in the proved block for random probing.
+		/// There's a DB read for each transaction.
+		/// Here we assume a maximum of 100 probed transactions.
+		/// # </weight>
+		#[pallet::weight((T::WeightInfo::check_proof_max(), DispatchClass::Mandatory))]
+		pub(super) fn check_proof(
+			origin: OriginFor<T>,
+			proof: TransactionStorageProof,
+		) -> DispatchResultWithPostInfo {
+			ensure_none(origin)?;
+			ensure!(!ProofChecked::<T>::get(), Error::<T>::DoubleCheck);
+			let number = <frame_system::Pallet<T>>::block_number();
+			let period = <StoragePeriod<T>>::get();
+			let target_number = number.saturating_sub(period);
+			ensure!(!target_number.is_zero(), Error::<T>::UnexpectedProof);
+			let total_chunks = <ChunkCount<T>>::get(target_number);
+			ensure!(total_chunks != 0, Error::<T>::UnexpectedProof);
+			let parent_hash = <frame_system::Pallet<T>>::parent_hash();
+			let selected_chunk_index = random_chunk(parent_hash.as_ref(), total_chunks);
+			let (info, chunk_index) = match <Transactions<T>>::get(target_number) {
+				Some(infos) => {
+					let index = match infos.binary_search_by_key(&selected_chunk_index, |info| info.block_chunks) {
+						Ok(index) => index,
+						Err(index) => index,
+					};
+					let info = infos.get(index).ok_or_else(|| Error::<T>::MissingStateData)?.clone();
+					let chunks = num_chunks(info.size);
+					let prev_chunks = info.block_chunks - chunks;
+					(info, selected_chunk_index - prev_chunks)
+				},
+				None => Err(Error::<T>::MissingStateData)?,
+			};
+			ensure!(
+				sp_io::trie::blake2_256_verify_proof(
+					info.chunk_root,
+					&proof.proof,
+					&encode_index(chunk_index),
+					&proof.chunk,
+				),
+				Error::<T>::InvalidProof
+			);
+			ProofChecked::<T>::put(true);
+			Self::deposit_event(Event::ProofChecked);
+			Ok(().into())
+		}
+	}
+
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	pub enum Event<T: Config> {
+		/// Stored data under specified index.
+		Stored(u32),
+		/// Renewed data under specified index.
+		Renewed(u32),
+		/// Storage proof was successfully checked.
+		ProofChecked,
+	}
+
+	/// Collection of transaction metadata by block number.
+	#[pallet::storage]
+	#[pallet::getter(fn transaction_roots)]
+	pub(super) type Transactions<T: Config> = StorageMap<
+		_,
+		Blake2_128Concat,
+		T::BlockNumber,
+		Vec<TransactionInfo>,
+		OptionQuery,
+	>;
+
+	/// Count indexed chunks for each block.
+	#[pallet::storage]
+	pub(super) type ChunkCount<T: Config> = StorageMap<
+		_,
+		Blake2_128Concat,
+		T::BlockNumber,
+		u32,
+		ValueQuery,
+	>;
+
+	#[pallet::storage]
+	#[pallet::getter(fn byte_fee)]
+	/// Storage fee per byte.
+	pub(super) type ByteFee<T: Config> = StorageValue<_, BalanceOf<T>>;
+
+	#[pallet::storage]
+	#[pallet::getter(fn entry_fee)]
+	/// Storage fee per transaction.
+	pub(super) type EntryFee<T: Config> = StorageValue<_, BalanceOf<T>>;
+
+	#[pallet::storage]
+	#[pallet::getter(fn max_transaction_size)]
+	/// Maximum data set in a single transaction in bytes.
+	pub(super) type MaxTransactionSize<T: Config> = StorageValue<_, u32, ValueQuery>;
+
+	#[pallet::storage]
+	#[pallet::getter(fn max_block_transactions)]
+	/// Maximum number of indexed transactions in the block.
+	pub(super) type MaxBlockTransactions<T: Config> = StorageValue<_, u32, ValueQuery>;
+
+	/// Storage period for data in blocks. Should match `sp_storage_proof::DEFAULT_STORAGE_PERIOD`
+	/// for block authoring.
+	#[pallet::storage]
+	pub(super) type StoragePeriod<T: Config> = StorageValue<_, T::BlockNumber, ValueQuery>;
+
+	// Intermediates
+	#[pallet::storage]
+	pub(super) type BlockTransactions<T: Config> = StorageValue<_, Vec<TransactionInfo>, ValueQuery>;
+
+	/// Was the proof checked in this block?
+	#[pallet::storage]
+	pub(super) type ProofChecked<T: Config> = StorageValue<_, bool, ValueQuery>;
+
+
+	#[pallet::genesis_config]
+	pub struct GenesisConfig<T: Config> {
+		pub byte_fee: BalanceOf<T>,
+		pub entry_fee: BalanceOf<T>,
+		pub storage_period: T::BlockNumber,
+		pub max_block_transactions: u32,
+		pub max_transaction_size: u32,
+	}
+
+	#[cfg(feature = "std")]
+	impl<T: Config> Default for GenesisConfig<T> {
+		fn default() -> Self {
+			Self {
+				byte_fee: 10u32.into(),
+				entry_fee: 1000u32.into(),
+				storage_period: DEFAULT_STORAGE_PERIOD.into(),
+				max_block_transactions: DEFAULT_MAX_BLOCK_TRANSACTIONS,
+				max_transaction_size: DEFAULT_MAX_TRANSACTION_SIZE,
+			}
+		}
+	}
+
+	#[pallet::genesis_build]
+	impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+		fn build(&self) {
+			<ByteFee<T>>::put(&self.byte_fee);
+			<EntryFee<T>>::put(&self.entry_fee);
+			<MaxTransactionSize<T>>::put(&self.max_transaction_size);
+			<MaxBlockTransactions<T>>::put(&self.max_block_transactions);
+			<StoragePeriod<T>>::put(&self.storage_period);
+		}
+	}
+
+	#[pallet::inherent]
+	impl<T: Config> ProvideInherent for Pallet<T> {
+		type Call = Call<T>;
+		type Error = InherentError;
+		const INHERENT_IDENTIFIER: InherentIdentifier = INHERENT_IDENTIFIER;
+
+		fn create_inherent(data: &InherentData) -> Option<Self::Call> {
+			let proof = data.get_data::<TransactionStorageProof>(&Self::INHERENT_IDENTIFIER).unwrap_or(None);
+			proof.map(Call::check_proof)
+		}
+
+		fn check_inherent(_call: &Self::Call, _data: &InherentData) -> result::Result<(), Self::Error> {
+			Ok(())
+		}
+
+		fn is_inherent(call: &Self::Call) -> bool {
+			matches!(call, Call::check_proof(_))
+		}
+	}
+
+	impl<T: Config> Pallet<T> {
+		fn apply_fee(sender: T::AccountId, size: u32) -> DispatchResult {
+			let byte_fee = ByteFee::<T>::get().ok_or(Error::<T>::NotConfigured)?;
+			let entry_fee = EntryFee::<T>::get().ok_or(Error::<T>::NotConfigured)?;
+			let fee = byte_fee.saturating_mul(size.into()).saturating_add(entry_fee);
+			ensure!(T::Currency::can_slash(&sender, fee), Error::<T>::InsufficientFunds);
+			let (credit, _) = T::Currency::slash(&sender, fee);
+			T::FeeDestination::on_unbalanced(credit);
+			Ok(())
+		}
+	}
+}
diff --git a/frame/transaction-storage/src/mock.rs b/frame/transaction-storage/src/mock.rs
new file mode 100644
index 000000000000..51eb61dd26b7
--- /dev/null
+++ b/frame/transaction-storage/src/mock.rs
@@ -0,0 +1,129 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Test environment for transaction-storage pallet.
+
+use crate as pallet_transaction_storage;
+use crate::TransactionStorageProof;
+use sp_core::H256;
+use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header, BuildStorage};
+use frame_support::{
+	parameter_types,
+	traits::{OnInitialize, OnFinalize},
+};
+
+
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+pub type Block = frame_system::mocking::MockBlock<Test>;
+
+// Configure a mock runtime to test the pallet.
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Pallet, Call, Config<T>, Storage, Event<T>},
+		TransactionStorage: pallet_transaction_storage::{
+			Pallet, Call, Storage, Config<T>, Inherent, Event<T>
+		},
+	}
+);
+
+parameter_types! {
+	pub const BlockHashCount: u64 = 250;
+	pub const SS58Prefix: u8 = 42;
+}
+
+impl frame_system::Config for Test {
+	type BaseCallFilter = ();
+	type BlockWeights = ();
+	type BlockLength = ();
+	type Origin = Origin;
+	type Call = Call;
+	type Index = u64;
+	type BlockNumber = u64;
+	type Hash = H256;
+	type Hashing = BlakeTwo256;
+	type AccountId = u64;
+	type Lookup = IdentityLookup<Self::AccountId>;
+	type Header = Header;
+	type Event = Event;
+	type BlockHashCount = BlockHashCount;
+	type DbWeight = ();
+	type Version = ();
+	type PalletInfo = PalletInfo;
+	type AccountData = pallet_balances::AccountData<u64>;
+	type OnNewAccount = ();
+	type OnKilledAccount = ();
+	type SystemWeightInfo = ();
+	type SS58Prefix = SS58Prefix;
+	type OnSetCode = ();
+}
+
+parameter_types! {
+	pub const ExistentialDeposit: u64 = 1;
+}
+
+impl pallet_balances::Config for Test {
+	type Balance = u64;
+	type DustRemoval = ();
+	type Event = Event;
+	type ExistentialDeposit = ExistentialDeposit;
+	type AccountStore = System;
+	type WeightInfo = ();
+	type MaxLocks = ();
+}
+
+impl pallet_transaction_storage::Config for Test {
+	type Event = Event;
+	type Call = Call;
+	type Currency = Balances;
+	type FeeDestination = ();
+	type WeightInfo = ();
+}
+
+pub fn new_test_ext() -> sp_io::TestExternalities {
+	let t = GenesisConfig {
+		frame_system: Default::default(),
+		pallet_balances: pallet_balances::GenesisConfig::<Test> {
+			balances: vec![(1, 1000000000), (2, 100), (3, 100), (4, 100)]
+		},
+		pallet_transaction_storage: pallet_transaction_storage::GenesisConfig::<Test> {
+			storage_period: 10,
+			byte_fee: 2,
+			entry_fee: 200,
+			max_block_transactions: crate::DEFAULT_MAX_BLOCK_TRANSACTIONS,
+			max_transaction_size: crate::DEFAULT_MAX_TRANSACTION_SIZE,
+		},
+	}.build_storage().unwrap();
+	t.into()
+}
+
+pub fn run_to_block(n: u64, f: impl Fn() -> Option<TransactionStorageProof>) {
+	while System::block_number() < n {
+		if let Some(proof) = f() {
+			TransactionStorage::check_proof(Origin::none(), proof).unwrap();
+		}
+		TransactionStorage::on_finalize(System::block_number());
+		System::on_finalize(System::block_number());
+		System::set_block_number(System::block_number() + 1);
+		System::on_initialize(System::block_number());
+		TransactionStorage::on_initialize(System::block_number());
+	}
+}
diff --git a/frame/transaction-storage/src/tests.rs b/frame/transaction-storage/src/tests.rs
new file mode 100644
index 000000000000..50594f1bce9d
--- /dev/null
+++ b/frame/transaction-storage/src/tests.rs
@@ -0,0 +1,157 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Tests for transction-storage pallet.
+
+use super::*;
+use crate::mock::*;
+use super::Pallet as TransactionStorage;
+use frame_support::{assert_ok, assert_noop};
+use frame_system::RawOrigin;
+use sp_transaction_storage_proof::registration::build_proof;
+
+const MAX_DATA_SIZE: u32 = DEFAULT_MAX_TRANSACTION_SIZE;
+
+#[test]
+fn discards_data() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1, || None);
+		let caller = 1;
+		assert_ok!(TransactionStorage::<Test>::store(
+			RawOrigin::Signed(caller.clone()).into(),
+			vec![0u8; 2000 as usize]
+		));
+		assert_ok!(TransactionStorage::<Test>::store(
+			RawOrigin::Signed(caller.clone()).into(),
+			vec![0u8; 2000 as usize]
+		));
+		let proof_provider = || {
+			let block_num = <frame_system::Pallet<Test>>::block_number();
+			if block_num == 11  {
+				let parent_hash = <frame_system::Pallet<Test>>::parent_hash();
+				Some(build_proof(parent_hash.as_ref(), vec![vec![0u8; 2000], vec![0u8; 2000]]).unwrap())
+			} else {
+				None
+			}
+		};
+		run_to_block(11, proof_provider);
+		assert!(Transactions::<Test>::get(1).is_some());
+		let transctions = Transactions::<Test>::get(1).unwrap();
+		assert_eq!(transctions.len(), 2);
+		assert_eq!(ChunkCount::<Test>::get(1), 16);
+		run_to_block(12, proof_provider);
+		assert!(Transactions::<Test>::get(1).is_none());
+		assert_eq!(ChunkCount::<Test>::get(1), 0);
+	});
+}
+
+#[test]
+fn burns_fee() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1, || None);
+		let caller = 1;
+		assert_noop!(TransactionStorage::<Test>::store(
+				RawOrigin::Signed(5).into(),
+				vec![0u8; 2000 as usize]
+			),
+			Error::<Test>::InsufficientFunds,
+		);
+		assert_ok!(TransactionStorage::<Test>::store(
+				RawOrigin::Signed(caller.clone()).into(),
+				vec![0u8; 2000 as usize]
+		));
+		assert_eq!(Balances::free_balance(1), 1_000_000_000 - 2000 * 2 - 200);
+	});
+}
+
+#[test]
+fn checks_proof() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1, || None);
+		let caller = 1;
+		assert_ok!(TransactionStorage::<Test>::store(
+			RawOrigin::Signed(caller.clone()).into(),
+			vec![0u8; MAX_DATA_SIZE as usize]
+		));
+		run_to_block(10, || None);
+		let parent_hash = <frame_system::Pallet<Test>>::parent_hash();
+		let proof = build_proof(
+			parent_hash.as_ref(),
+			vec![vec![0u8; MAX_DATA_SIZE as usize]]
+		).unwrap();
+		assert_noop!(TransactionStorage::<Test>::check_proof(
+				Origin::none(),
+				proof,
+			),
+			Error::<Test>::UnexpectedProof,
+		);
+		run_to_block(11, || None);
+		let parent_hash = <frame_system::Pallet<Test>>::parent_hash();
+
+		let invalid_proof = build_proof(
+			parent_hash.as_ref(),
+			vec![vec![0u8; 1000]]
+		).unwrap();
+		assert_noop!(TransactionStorage::<Test>::check_proof(
+				Origin::none(),
+				invalid_proof,
+		),
+		Error::<Test>::InvalidProof,
+		);
+
+		let proof = build_proof(
+			parent_hash.as_ref(),
+			vec![vec![0u8; MAX_DATA_SIZE as usize]]
+		).unwrap();
+		assert_ok!(TransactionStorage::<Test>::check_proof(Origin::none(), proof));
+	});
+}
+
+#[test]
+fn renews_data() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1, || None);
+		let caller = 1;
+		assert_ok!(TransactionStorage::<Test>::store(
+				RawOrigin::Signed(caller.clone()).into(),
+				vec![0u8; 2000]
+		));
+		let info = BlockTransactions::<Test>::get().last().unwrap().clone();
+		run_to_block(6, || None);
+		assert_ok!(TransactionStorage::<Test>::renew(
+				RawOrigin::Signed(caller.clone()).into(),
+				1, // block
+				0, // transaction
+		));
+		assert_eq!(Balances::free_balance(1), 1_000_000_000 - 4000 * 2 - 200 * 2);
+		let proof_provider = || {
+			let block_num = <frame_system::Pallet<Test>>::block_number();
+			if block_num == 11 || block_num == 16  {
+				let parent_hash = <frame_system::Pallet<Test>>::parent_hash();
+				Some(build_proof(parent_hash.as_ref(), vec![vec![0u8; 2000]]).unwrap())
+			} else {
+				None
+			}
+		};
+		run_to_block(16, proof_provider);
+		assert!(Transactions::<Test>::get(1).is_none());
+		assert_eq!(Transactions::<Test>::get(6).unwrap().get(0), Some(info).as_ref());
+		run_to_block(17, proof_provider);
+		assert!(Transactions::<Test>::get(6).is_none());
+	});
+}
+
diff --git a/frame/transaction-storage/src/weights.rs b/frame/transaction-storage/src/weights.rs
new file mode 100644
index 000000000000..7951db8828d0
--- /dev/null
+++ b/frame/transaction-storage/src/weights.rs
@@ -0,0 +1,95 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Autogenerated weights for pallet_transaction_storage
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-03, STEPS: `[20, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
+
+// Executed Command:
+// ./target/release/substrate
+// benchmark
+// --chain
+// dev
+// --steps
+// 20
+// --repeat=20
+// --pallet=pallet_transaction_storage
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./frame/transaction-storage/src/weights.rs
+// --template=./.maintain/frame-weight-template.hbs
+
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for pallet_transaction_storage.
+pub trait WeightInfo {
+	fn store(l: u32, ) -> Weight;
+	fn renew() -> Weight;
+	fn check_proof_max() -> Weight;
+}
+
+/// Weights for pallet_transaction_storage using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	fn store(l: u32, ) -> Weight {
+		(0 as Weight)
+			// Standard Error: 0
+			.saturating_add((10_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add(T::DbWeight::get().reads(6 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn renew() -> Weight {
+		(97_000_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(6 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn check_proof_max() -> Weight {
+		(99_000_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+	fn store(l: u32, ) -> Weight {
+		(0 as Weight)
+			// Standard Error: 0
+			.saturating_add((10_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn renew() -> Weight {
+		(97_000_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn check_proof_max() -> Weight {
+		(99_000_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+}
diff --git a/primitives/blockchain/src/backend.rs b/primitives/blockchain/src/backend.rs
index b00cbada9f47..3441a4f6cf54 100644
--- a/primitives/blockchain/src/backend.rs
+++ b/primitives/blockchain/src/backend.rs
@@ -227,6 +227,8 @@ pub trait Backend<Block: BlockT>: HeaderBackend<Block> + HeaderMetadata<Block, E
 	fn has_indexed_transaction(&self, hash: &Block::Hash) -> Result<bool> {
 		Ok(self.indexed_transaction(hash)?.is_some())
 	}
+
+	fn block_indexed_body(&self, id: BlockId<Block>) -> Result<Option<Vec<Vec<u8>>>>;
 }
 
 /// Provides access to the optional cache.
diff --git a/primitives/externalities/src/lib.rs b/primitives/externalities/src/lib.rs
index ce5a0990d738..14145e879849 100644
--- a/primitives/externalities/src/lib.rs
+++ b/primitives/externalities/src/lib.rs
@@ -229,12 +229,12 @@ pub trait Externalities: ExtensionStore {
 	fn storage_commit_transaction(&mut self) -> Result<(), ()>;
 
 	/// Index specified transaction slice and store it.
-	fn storage_index_transaction(&mut self, _index: u32, _offset: u32) {
+	fn storage_index_transaction(&mut self, _index: u32, _hash: &[u8], _size: u32) {
 		unimplemented!("storage_index_transaction");
 	}
 
 	/// Renew existing piece of transaction storage.
-	fn storage_renew_transaction_index(&mut self, _index: u32, _hash: &[u8], _size: u32) {
+	fn storage_renew_transaction_index(&mut self, _index: u32, _hash: &[u8]) {
 		unimplemented!("storage_renew_transaction_index");
 	}
 
diff --git a/primitives/io/src/lib.rs b/primitives/io/src/lib.rs
index 72695f2156b6..f0fcc4f1b067 100644
--- a/primitives/io/src/lib.rs
+++ b/primitives/io/src/lib.rs
@@ -429,6 +429,24 @@ pub trait Trie {
 	fn keccak_256_ordered_root(input: Vec<Vec<u8>>) -> H256 {
 		Layout::<sp_core::KeccakHasher>::ordered_trie_root(input)
 	}
+
+	/// Verify trie proof
+	fn blake2_256_verify_proof(root: H256, proof: &[Vec<u8>], key: &[u8], value: &[u8]) -> bool {
+		sp_trie::verify_trie_proof::<Layout<sp_core::Blake2Hasher>, _, _, _>(
+			&root,
+			proof,
+			&[(key, Some(value))],
+		).is_ok()
+	}
+
+	/// Verify trie proof
+	fn keccak_256_verify_proof(root: H256, proof: &[Vec<u8>], key: &[u8], value: &[u8]) -> bool {
+		sp_trie::verify_trie_proof::<Layout<sp_core::KeccakHasher>, _, _, _>(
+			&root,
+			proof,
+			&[(key, Some(value))],
+		).is_ok()
+	}
 }
 
 /// Interface that provides miscellaneous functions for communicating between the runtime and the node.
@@ -824,6 +842,20 @@ pub trait Hashing {
 	}
 }
 
+/// Interface that provides transaction indexing API.
+#[runtime_interface]
+pub trait TransactionIndex {
+	/// Add transaction index. Returns indexed content hash.
+	fn index(&mut self, extrinsic: u32, size: u32, context_hash: [u8; 32]) {
+		self.storage_index_transaction(extrinsic, &context_hash, size);
+	}
+
+	/// Conduct a 512-bit Keccak hash.
+	fn renew(&mut self, extrinsic: u32, context_hash: [u8; 32]) {
+		self.storage_renew_transaction_index(extrinsic, &context_hash);
+	}
+}
+
 /// Interface that provides functions to access the Offchain DB.
 #[runtime_interface]
 pub trait OffchainIndex {
@@ -1434,6 +1466,7 @@ pub type SubstrateHostFunctions = (
 	crate::trie::HostFunctions,
 	offchain_index::HostFunctions,
 	runtime_tasks::HostFunctions,
+	transaction_index::HostFunctions,
 );
 
 #[cfg(test)]
diff --git a/primitives/state-machine/src/ext.rs b/primitives/state-machine/src/ext.rs
index 2649c320e14d..8bcf1f28a077 100644
--- a/primitives/state-machine/src/ext.rs
+++ b/primitives/state-machine/src/ext.rs
@@ -629,33 +629,34 @@ where
 		}
 	}
 
-	fn storage_index_transaction(&mut self, index: u32, offset: u32) {
+	fn storage_index_transaction(&mut self, index: u32, hash: &[u8], size: u32) {
 		trace!(
 			target: "state",
-			"{:04x}: IndexTransaction ({}): [{}..]",
+			"{:04x}: IndexTransaction ({}): {}, {} bytes",
 			self.id,
 			index,
-			offset,
+			HexDisplay::from(&hash),
+			size,
 		);
 		self.overlay.add_transaction_index(IndexOperation::Insert {
 			extrinsic: index,
-			offset,
+			hash: hash.to_vec(),
+			size,
 		});
 	}
 
 	/// Renew existing piece of data storage.
-	fn storage_renew_transaction_index(&mut self, index: u32, hash: &[u8], size: u32) {
+	fn storage_renew_transaction_index(&mut self, index: u32, hash: &[u8]) {
 		trace!(
 			target: "state",
-			"{:04x}: RenewTransactionIndex ({}) {} bytes",
+			"{:04x}: RenewTransactionIndex ({}): {}",
 			self.id,
+			index,
 			HexDisplay::from(&hash),
-			size,
 		);
 		self.overlay.add_transaction_index(IndexOperation::Renew {
 			extrinsic: index,
 			hash: hash.to_vec(),
-			size
 		});
 	}
 
diff --git a/primitives/state-machine/src/overlayed_changes/mod.rs b/primitives/state-machine/src/overlayed_changes/mod.rs
index 2a3495a4e1c7..c01d56ab919a 100644
--- a/primitives/state-machine/src/overlayed_changes/mod.rs
+++ b/primitives/state-machine/src/overlayed_changes/mod.rs
@@ -118,8 +118,10 @@ pub enum IndexOperation {
 	Insert {
 		/// Extrinsic index in the current block.
 		extrinsic: u32,
-		/// Data offset in the extrinsic.
-		offset: u32,
+		/// Data content hash.
+		hash: Vec<u8>,
+		/// Indexed data size.
+		size: u32,
 	},
 	/// Renew existing transaction storage.
 	Renew {
@@ -127,8 +129,6 @@ pub enum IndexOperation {
 		extrinsic: u32,
 		/// Referenced index hash.
 		hash: Vec<u8>,
-		/// Expected data size.
-		size: u32,
 	}
 }
 
@@ -520,6 +520,11 @@ impl OverlayedChanges {
 		self.children.get(key).map(|(overlay, info)| (overlay.changes(), info))
 	}
 
+	/// Get an list of all index operations.
+	pub fn transaction_index_ops(&self) -> &[IndexOperation] {
+		&self.transaction_index_ops
+	}
+
 	/// Convert this instance with all changes into a [`StorageChanges`] instance.
 	#[cfg(feature = "std")]
 	pub fn into_storage_changes<
diff --git a/primitives/transaction-storage-proof/Cargo.toml b/primitives/transaction-storage-proof/Cargo.toml
new file mode 100644
index 000000000000..bbdcb9f989f0
--- /dev/null
+++ b/primitives/transaction-storage-proof/Cargo.toml
@@ -0,0 +1,36 @@
+[package]
+name = "sp-transaction-storage-proof"
+version = "3.0.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+description = "Transaction storage proof primitives"
+edition = "2018"
+license = "Apache-2.0"
+homepage = "https://substrate.dev"
+repository = "https://github.com/paritytech/substrate/"
+readme = "README.md"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+sp-inherents = { version = "3.0.0", default-features = false, path = "../inherents" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../runtime" }
+sp-std = { version = "3.0.0", default-features = false, path = "../std" }
+sp-trie = { version = "3.0.0", optional = true, path = "../trie" }
+sp-core = { version = "3.0.0", path = "../core", optional = true }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+log = { version = "0.4.8", optional = true }
+async-trait = { version = "0.1.48", optional = true }
+
+[features]
+default = [ "std" ]
+std = [
+	"codec/std",
+	"sp-std/std",
+	"sp-inherents/std",
+	"sp-runtime/std",
+	"sp-trie/std",
+	"sp-core",
+	"log",
+	"async-trait",
+]
diff --git a/primitives/transaction-storage-proof/README.md b/primitives/transaction-storage-proof/README.md
new file mode 100644
index 000000000000..1aa1805cfc5e
--- /dev/null
+++ b/primitives/transaction-storage-proof/README.md
@@ -0,0 +1,3 @@
+Authorship Primitives
+
+License: Apache-2.0
\ No newline at end of file
diff --git a/primitives/transaction-storage-proof/src/lib.rs b/primitives/transaction-storage-proof/src/lib.rs
new file mode 100644
index 000000000000..825de27b2a5a
--- /dev/null
+++ b/primitives/transaction-storage-proof/src/lib.rs
@@ -0,0 +1,240 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Storge proof primitives. Constains types and basic code to extract storage
+//! proofs for indexed transactions.
+
+#![cfg_attr(not(feature = "std"), no_std)]
+
+use sp_std::{result::Result, prelude::*};
+
+use codec::{Encode, Decode};
+use sp_inherents::{InherentIdentifier, InherentData, IsFatalError};
+use sp_runtime::{traits::{Block as BlockT, NumberFor}};
+
+pub use sp_inherents::Error;
+
+/// The identifier for the proof inherent.
+pub const INHERENT_IDENTIFIER: InherentIdentifier = *b"tx_proof";
+/// Storage period for data.
+pub const DEFAULT_STORAGE_PERIOD: u32 = 100800;
+/// Proof trie value size.
+pub const CHUNK_SIZE: usize = 256;
+
+/// Errors that can occur while checking the storage proof.
+#[derive(Encode, sp_runtime::RuntimeDebug)]
+#[cfg_attr(feature = "std", derive(Decode))]
+pub enum InherentError {
+	InvalidProof,
+	TrieError
+}
+
+impl IsFatalError for InherentError {
+	fn is_fatal_error(&self) -> bool {
+		true
+	}
+}
+
+#[derive(Encode, Decode, Clone, PartialEq, Debug)]
+pub struct TransactionStorageProof {
+	/// Data chunk that is proved to exist.
+	pub chunk: Vec<u8>,
+	/// Trie nodes that compose the proof.
+	pub proof: Vec<Vec<u8>>,
+}
+
+/// Auxiliary trait to extract storage proof.
+pub trait TransactionStorageProofInherentData {
+	/// Get the proof.
+	fn storage_proof(&self) -> Result<Option<TransactionStorageProof>, Error>;
+}
+
+impl TransactionStorageProofInherentData for InherentData {
+	fn storage_proof(&self) -> Result<Option<TransactionStorageProof>, Error> {
+		Ok(self.get_data(&INHERENT_IDENTIFIER)?)
+	}
+}
+
+/// Provider for inherent data.
+#[cfg(feature = "std")]
+pub struct InherentDataProvider {
+	proof: Option<TransactionStorageProof>,
+}
+
+#[cfg(feature = "std")]
+impl InherentDataProvider {
+	pub fn new(proof: Option<TransactionStorageProof>) -> Self {
+		InherentDataProvider { proof }
+	}
+}
+
+#[cfg(feature = "std")]
+#[async_trait::async_trait]
+impl sp_inherents::InherentDataProvider for InherentDataProvider {
+	fn provide_inherent_data(&self, inherent_data: &mut InherentData) -> Result<(), Error> {
+		if let Some(proof) = &self.proof {
+			inherent_data.put_data(INHERENT_IDENTIFIER, proof)
+		} else {
+			Ok(())
+		}
+	}
+
+	async fn try_handle_error(
+		&self,
+		identifier: &InherentIdentifier,
+		error: &[u8],
+	) -> Option<Result<(), Error>> {
+		if *identifier != INHERENT_IDENTIFIER {
+			return None
+		}
+
+		let error = InherentError::decode(&mut &error[..]).ok()?;
+
+		Some(Err(Error::Application(Box::from(format!("{:?}", error)))))
+	}
+}
+
+/// An utility function to extract chunk index from the source of randomness.
+pub fn random_chunk(random_hash: &[u8], total_chunks: u32) -> u32 {
+	let mut buf = [0u8; 8];
+	buf.copy_from_slice(&random_hash[0..8]);
+	let random_u64 = u64::from_be_bytes(buf);
+	(random_u64 % total_chunks as u64) as u32
+}
+
+/// An utility function to enocde transaction index as trie key.
+pub fn encode_index(input: u32) -> Vec<u8> {
+	codec::Encode::encode(&codec::Compact(input))
+}
+
+/// An interface to request indexed data from the client.
+pub trait IndexedBody<B: BlockT> {
+	fn block_indexed_body(
+		&self,
+		number: NumberFor<B>,
+	) -> Result<Option<Vec<Vec<u8>>>, Error>;
+
+	fn number(
+		&self,
+		hash: B::Hash,
+	) -> Result<Option<NumberFor<B>>, Error>;
+}
+
+#[cfg(feature = "std")]
+pub mod registration {
+	use sp_runtime::{traits::{Block as BlockT, Saturating, Zero, One}};
+	use sp_trie::TrieMut;
+	use super::*;
+
+	type Hasher = sp_core::Blake2Hasher;
+	type TrieLayout = sp_trie::Layout::<Hasher>;
+
+	/// Create a new inherent data provider instance for a given parent block hash.
+	pub fn new_data_provider<B, C>(
+		client: &C,
+		parent: &B::Hash,
+	) -> Result<InherentDataProvider, Error>
+	where
+		B: BlockT,
+		C: IndexedBody<B>,
+	{
+		let parent_number = client.number(parent.clone())?.unwrap_or(Zero::zero());
+		let number = parent_number
+			.saturating_add(One::one())
+			.saturating_sub(DEFAULT_STORAGE_PERIOD.into());
+		if number.is_zero() {
+			// Too early to collect proofs.
+			return Ok(InherentDataProvider::new(None));
+		}
+
+		let proof = match client.block_indexed_body(number)? {
+			Some(transactions) => {
+				Some(build_proof(parent.as_ref(), transactions)?)
+			},
+			None => {
+				// Nothing was indexed in that block.
+				None
+			}
+		};
+		Ok(InherentDataProvider::new(proof))
+	}
+
+	/// Build a proof for a given source of randomness and indexed transactions.
+	pub fn build_proof(random_hash: &[u8], transactions: Vec<Vec<u8>>)
+		-> Result<TransactionStorageProof, Error>
+	{
+		let mut db = sp_trie::MemoryDB::<Hasher>::default();
+
+		let mut target_chunk = None;
+		let mut target_root = Default::default();
+		let mut target_chunk_key = Default::default();
+		let mut chunk_proof = Default::default();
+
+		let total_chunks: u64 = transactions.iter().map(|t| ((t.len() + CHUNK_SIZE - 1) / CHUNK_SIZE) as u64).sum();
+		let mut buf = [0u8; 8];
+		buf.copy_from_slice(&random_hash[0..8]);
+		let random_u64 = u64::from_be_bytes(buf);
+		let target_chunk_index = random_u64 % total_chunks;
+		//Generate tries for each transaction.
+		let mut chunk_index = 0;
+		for transaction in transactions {
+			let mut transaction_root = sp_trie::empty_trie_root::<TrieLayout>();
+			{
+				let mut trie = sp_trie::TrieDBMut::<TrieLayout>::new(&mut db, &mut transaction_root);
+				let chunks = transaction.chunks(CHUNK_SIZE).map(|c| c.to_vec());
+				for (index, chunk) in chunks.enumerate() {
+					let index = encode_index(index as u32);
+					trie.insert(&index, &chunk)
+						.map_err(|e| Error::Application(Box::new(e)))?;
+					if chunk_index == target_chunk_index {
+						target_chunk = Some(chunk);
+						target_chunk_key = index;
+					}
+					chunk_index += 1;
+				}
+				trie.commit();
+			}
+			if target_chunk.is_some() && target_root == Default::default() {
+				target_root = transaction_root.clone();
+				chunk_proof = sp_trie::generate_trie_proof::<TrieLayout, _, _, _>(
+					&db,
+					transaction_root.clone(),
+					&[target_chunk_key.clone()]
+				).map_err(|e| Error::Application(Box::new(e)))?;
+			}
+		};
+
+		Ok(TransactionStorageProof {
+			proof: chunk_proof,
+			chunk: target_chunk.unwrap(),
+		})
+	}
+
+	#[test]
+	fn build_proof_check() {
+		use std::str::FromStr;
+		let random = [0u8; 32];
+		let proof = build_proof(&random, vec![vec![42]]).unwrap();
+		let root = sp_core::H256::from_str("0xff8611a4d212fc161dae19dd57f0f1ba9309f45d6207da13f2d3eab4c6839e91").unwrap();
+		sp_trie::verify_trie_proof::<TrieLayout, _, _, _>(
+			&root,
+			&proof.proof,
+			&[(encode_index(0), Some(proof.chunk))],
+		).unwrap();
+	}
+}
+
diff --git a/primitives/trie/src/storage_proof.rs b/primitives/trie/src/storage_proof.rs
index f0b2bfd4bc3d..d8394a89de52 100644
--- a/primitives/trie/src/storage_proof.rs
+++ b/primitives/trie/src/storage_proof.rs
@@ -58,6 +58,10 @@ impl StorageProof {
 		StorageProofNodeIterator::new(self)
 	}
 
+	/// Convert into plain node vector.
+	pub fn into_nodes(self) -> Vec<Vec<u8>> {
+		self.trie_nodes
+	}
 	/// Creates a `MemoryDB` from `Self`.
 	pub fn into_memory_db<H: Hasher>(self) -> crate::MemoryDB<H> {
 		self.into()

From 7d8a9b6d9862f208e34a7f715448b21250b653e2 Mon Sep 17 00:00:00 2001
From: Andronik Ordian <write@reusable.software>
Date: Fri, 4 Jun 2021 09:05:21 +0200
Subject: [PATCH 0832/1194] more useful error message (#9014)

---
 client/finality-grandpa/src/import.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/finality-grandpa/src/import.rs b/client/finality-grandpa/src/import.rs
index 482859b1f79e..474f6ee5bf7e 100644
--- a/client/finality-grandpa/src/import.rs
+++ b/client/finality-grandpa/src/import.rs
@@ -646,9 +646,10 @@ where
 		initial_sync: bool,
 	) -> Result<(), ConsensusError> {
 		if justification.0 != GRANDPA_ENGINE_ID {
-			return Err(ConsensusError::ClientImport(
-				"GRANDPA can only import GRANDPA Justifications.".into(),
-			));
+			return Err(ConsensusError::ClientImport(format!(
+				"Expected GRANDPA Justification, got {}.",
+				String::from_utf8_lossy(&justification.0)
+			)));
 		}
 
 		let justification = GrandpaJustification::decode_and_verify_finalizes(

From 0495ead464cc632237d0f9d1687b1ebbb579c7a7 Mon Sep 17 00:00:00 2001
From: Xiliang Chen <xlchen1291@gmail.com>
Date: Fri, 4 Jun 2021 19:32:46 +1200
Subject: [PATCH 0833/1194] Named reserve (#7778)

* add NamedReservableCurrency

* move currency related trait and types into a new file

* implement NamedReservableCurrency

* remove empty reserves

* Update frame/support/src/traits.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* fix build

* bump year

* add MaxReserves

* repatriate_reserved_named should put reserved fund into named reserved

* add tests

* add some docs

* fix warning

* Update lib.rs

* fix test

* fix test

* fix

* fix

* triggier CI

* Move NamedReservableCurrency.

* Use strongly bounded vec for reserves.

* Fix test.

* remove duplicated file

* trigger CI

* Make `ReserveIdentifier` assosicated type

* add helpers

* make ReserveIdentifier assosicated type

* fix

* update

* trigger CI

* Apply suggestions from code review

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* trigger CI

* Apply suggestions from code review

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Gavin Wood <i@gavwood.com>
Co-authored-by: Shaun Wang <spxwang@gmail.com>
---
 bin/node-template/runtime/src/lib.rs          |   2 +
 bin/node/runtime/src/lib.rs                   |   3 +
 frame/assets/src/mock.rs                      |   2 +
 frame/atomic-swap/src/tests.rs                |   2 +
 frame/babe/src/mock.rs                        |   2 +
 frame/balances/src/lib.rs                     | 225 +++++++++++++++++-
 frame/balances/src/tests.rs                   | 118 +++++++++
 frame/balances/src/tests_composite.rs         |   6 +
 frame/balances/src/tests_local.rs             |   3 +
 frame/balances/src/tests_reentrancy.rs        |   3 +
 frame/bounties/src/tests.rs                   |   2 +
 frame/contracts/src/tests.rs                  |   2 +
 frame/democracy/src/tests.rs                  |   2 +
 .../election-provider-multi-phase/src/mock.rs |   2 +
 frame/elections-phragmen/src/lib.rs           |   2 +
 frame/elections/src/mock.rs                   |   2 +
 frame/example/src/tests.rs                    |   2 +
 frame/executive/src/lib.rs                    |   2 +
 frame/gilt/src/mock.rs                        |   2 +
 frame/grandpa/src/mock.rs                     |   2 +
 frame/identity/src/tests.rs                   |   2 +
 frame/indices/src/mock.rs                     |   2 +
 frame/lottery/src/mock.rs                     |   2 +
 frame/multisig/src/tests.rs                   |   2 +
 frame/nicks/src/lib.rs                        |   2 +
 frame/offences/benchmarking/src/mock.rs       |   2 +
 frame/proxy/src/tests.rs                      |   2 +
 frame/recovery/src/mock.rs                    |   2 +
 frame/scored-pool/src/mock.rs                 |   2 +
 frame/session/benchmarking/src/mock.rs        |   2 +
 frame/society/src/mock.rs                     |   2 +
 frame/staking/fuzzer/src/mock.rs              |   2 +
 frame/staking/src/mock.rs                     |   2 +
 frame/support/src/traits.rs                   |   3 +-
 frame/support/src/traits/tokens/currency.rs   |   2 +-
 .../src/traits/tokens/currency/reservable.rs  | 113 +++++++++
 frame/tips/src/tests.rs                       |   2 +
 frame/transaction-payment/src/lib.rs          |   2 +
 frame/treasury/src/tests.rs                   |   2 +
 frame/uniques/src/mock.rs                     |   3 +
 frame/utility/src/tests.rs                    |   2 +
 frame/vesting/src/lib.rs                      |   2 +
 42 files changed, 538 insertions(+), 5 deletions(-)

diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index b928f8d3410e..e51a190ae9a0 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -244,6 +244,8 @@ parameter_types! {
 
 impl pallet_balances::Config for Runtime {
 	type MaxLocks = MaxLocks;
+	type MaxReserves = ();
+	type ReserveIdentifier = [u8; 8];
 	/// The type for recording an account's balance.
 	type Balance = Balance;
 	/// The ubiquitous event type.
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 97975c55e960..6c38bf41ec59 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -375,10 +375,13 @@ parameter_types! {
 	// For weight estimation, we assume that the most locks on an individual account will be 50.
 	// This number may need to be adjusted in the future if this assumption no longer holds true.
 	pub const MaxLocks: u32 = 50;
+	pub const MaxReserves: u32 = 50;
 }
 
 impl pallet_balances::Config for Runtime {
 	type MaxLocks = MaxLocks;
+	type MaxReserves = MaxReserves;
+	type ReserveIdentifier = [u8; 8];
 	type Balance = Balance;
 	type DustRemoval = ();
 	type Event = Event;
diff --git a/frame/assets/src/mock.rs b/frame/assets/src/mock.rs
index 0b7aa339835e..cf99eed703cd 100644
--- a/frame/assets/src/mock.rs
+++ b/frame/assets/src/mock.rs
@@ -80,6 +80,8 @@ impl pallet_balances::Config for Test {
 	type AccountStore = System;
 	type WeightInfo = ();
 	type MaxLocks = ();
+	type MaxReserves = ();
+	type ReserveIdentifier = [u8; 8];
 }
 
 parameter_types! {
diff --git a/frame/atomic-swap/src/tests.rs b/frame/atomic-swap/src/tests.rs
index cc2849f5bd2c..f41874a1eec4 100644
--- a/frame/atomic-swap/src/tests.rs
+++ b/frame/atomic-swap/src/tests.rs
@@ -60,6 +60,8 @@ parameter_types! {
 }
 impl pallet_balances::Config for Test {
 	type MaxLocks = ();
+	type MaxReserves = ();
+	type ReserveIdentifier = [u8; 8];
 	type Balance = u64;
 	type DustRemoval = ();
 	type Event = Event;
diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index 40ee782e721d..bd9953154247 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -155,6 +155,8 @@ parameter_types! {
 
 impl pallet_balances::Config for Test {
 	type MaxLocks = ();
+	type MaxReserves = ();
+	type ReserveIdentifier = [u8; 8];
 	type Balance = u128;
 	type DustRemoval = ();
 	type Event = Event;
diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index 04dacc785864..23c5cc97d093 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -73,6 +73,7 @@
 //! - [`Currency`](frame_support::traits::Currency): Functions for dealing with a
 //! fungible assets system.
 //! - [`ReservableCurrency`](frame_support::traits::ReservableCurrency):
+//! - [`NamedReservableCurrency`](frame_support::traits::NamedReservableCurrency):
 //! Functions for dealing with assets that can be reserved from an account.
 //! - [`LockableCurrency`](frame_support::traits::LockableCurrency): Functions for
 //! dealing with accounts that allow liquidity restrictions.
@@ -163,9 +164,9 @@ use frame_support::{
 	traits::{
 		Currency, OnUnbalanced, TryDrop, StoredMap, MaxEncodedLen,
 		WithdrawReasons, LockIdentifier, LockableCurrency, ExistenceRequirement,
-		Imbalance, SignedImbalance, ReservableCurrency, Get, ExistenceRequirement::KeepAlive,
-		ExistenceRequirement::AllowDeath,
-		tokens::{fungible, DepositConsequence, WithdrawConsequence, BalanceStatus as Status}
+		Imbalance, SignedImbalance, ReservableCurrency, Get, ExistenceRequirement::{AllowDeath, KeepAlive},
+		NamedReservableCurrency,
+		tokens::{fungible, DepositConsequence, WithdrawConsequence, BalanceStatus as Status},
 	}
 };
 #[cfg(feature = "std")]
@@ -214,6 +215,12 @@ pub mod pallet {
 		/// The maximum number of locks that should exist on an account.
 		/// Not strictly enforced, but used for weight estimation.
 		type MaxLocks: Get<u32>;
+
+		/// The maximum number of named reserves that can exist on an account.
+		type MaxReserves: Get<u32>;
+
+		/// The id type for named reserves.
+		type ReserveIdentifier: Parameter + Member + MaxEncodedLen + Ord + Copy;
 	}
 
 	#[pallet::pallet]
@@ -409,6 +416,8 @@ pub mod pallet {
 		ExistingVestingSchedule,
 		/// Beneficiary account must pre-exist
 		DeadAccount,
+		/// Number of named reserves exceed MaxReserves
+		TooManyReserves,
 	}
 
 	/// The total units issued in the system.
@@ -444,6 +453,17 @@ pub mod pallet {
 		ConstU32<300_000>,
 	>;
 
+	/// Named reserves on some account balances.
+	#[pallet::storage]
+	#[pallet::getter(fn reserves)]
+	pub type Reserves<T: Config<I>, I: 'static = ()> = StorageMap<
+		_,
+		Blake2_128Concat,
+		T::AccountId,
+		BoundedVec<ReserveData<T::ReserveIdentifier, T::Balance>, T::MaxReserves>,
+		ValueQuery
+	>;
+
 	/// Storage version of the pallet.
 	///
 	/// This is set to v2.0.0 for new networks.
@@ -560,6 +580,15 @@ pub struct BalanceLock<Balance> {
 	pub reasons: Reasons,
 }
 
+/// Store named reserved balance.
+#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, MaxEncodedLen)]
+pub struct ReserveData<ReserveIdentifier, Balance> {
+	/// The identifier for the named reserve.
+	pub id: ReserveIdentifier,
+	/// The amount of the named reserve.
+	pub amount: Balance,
+}
+
 /// All balance information for an account.
 #[derive(Encode, Decode, Clone, PartialEq, Eq, Default, RuntimeDebug, MaxEncodedLen)]
 pub struct AccountData<Balance> {
@@ -575,6 +604,7 @@ pub struct AccountData<Balance> {
 	///
 	/// This balance is a 'reserve' balance that other subsystems use in order to set aside tokens
 	/// that are still 'owned' by the account holder, but which are suspendable.
+	/// This includes named reserve and unnamed reserve.
 	pub reserved: Balance,
 	/// The amount that `free` may not drop below when withdrawing for *anything except transaction
 	/// fee payment*.
@@ -1648,6 +1678,195 @@ impl<T: Config<I>, I: 'static> ReservableCurrency<T::AccountId> for Pallet<T, I>
 	}
 }
 
+impl<T: Config<I>, I: 'static> NamedReservableCurrency<T::AccountId> for Pallet<T, I>  where
+	T::Balance: MaybeSerializeDeserialize + Debug
+{
+	type ReserveIdentifier = T::ReserveIdentifier;
+
+	fn reserved_balance_named(id: &Self::ReserveIdentifier, who: &T::AccountId) -> Self::Balance {
+		let reserves = Self::reserves(who);
+		reserves
+			.binary_search_by_key(id, |data| data.id)
+			.map(|index| reserves[index].amount)
+			.unwrap_or_default()
+	}
+
+	/// Move `value` from the free balance from `who` to a named reserve balance.
+	///
+	/// Is a no-op if value to be reserved is zero.
+	fn reserve_named(id: &Self::ReserveIdentifier, who: &T::AccountId, value: Self::Balance) -> DispatchResult {
+		if value.is_zero() { return Ok(()) }
+		
+		Reserves::<T, I>::try_mutate(who, |reserves| -> DispatchResult {
+			match reserves.binary_search_by_key(id, |data| data.id) {
+				Ok(index) => {
+					// this add can't overflow but just to be defensive.
+					reserves[index].amount = reserves[index].amount.saturating_add(value);
+				},
+				Err(index) => {
+					reserves.try_insert(index, ReserveData {
+						id: id.clone(),
+						amount: value
+					}).map_err(|_| Error::<T, I>::TooManyReserves)?;
+				},
+			};
+			<Self as ReservableCurrency<_>>::reserve(who, value)?;
+			Ok(())
+		})
+	}
+
+	/// Unreserve some funds, returning any amount that was unable to be unreserved.
+	///
+	/// Is a no-op if the value to be unreserved is zero.
+	fn unreserve_named(id: &Self::ReserveIdentifier, who: &T::AccountId, value: Self::Balance) -> Self::Balance {
+		if value.is_zero() { return Zero::zero() }
+
+		Reserves::<T, I>::mutate_exists(who, |maybe_reserves| -> Self::Balance {
+			if let Some(reserves) = maybe_reserves.as_mut() {
+				match reserves.binary_search_by_key(id, |data| data.id) {
+					Ok(index) => {
+						let to_change = cmp::min(reserves[index].amount, value);
+
+						let remain = <Self as ReservableCurrency<_>>::unreserve(who, to_change);
+
+						// remain should always be zero but just to be defensive here
+						let actual = to_change.saturating_sub(remain);
+
+						// `actual <= to_change` and `to_change <= amount`; qed;
+						reserves[index].amount -= actual;
+
+						if reserves[index].amount.is_zero() {
+							if reserves.len() == 1 {
+								// no more named reserves
+								*maybe_reserves = None;
+							} else {
+								// remove this named reserve
+								reserves.remove(index);
+							}
+						}
+
+						value - actual
+					},
+					Err(_) => {
+						value
+					},
+				}
+			} else {
+				value
+			}
+		})
+	}
+
+	/// Slash from reserved balance, returning the negative imbalance created,
+	/// and any amount that was unable to be slashed.
+	///
+	/// Is a no-op if the value to be slashed is zero.
+	fn slash_reserved_named(
+		id: &Self::ReserveIdentifier,
+		who: &T::AccountId,
+		value: Self::Balance
+	) -> (Self::NegativeImbalance, Self::Balance) {
+		if value.is_zero() { return (NegativeImbalance::zero(), Zero::zero()) }
+
+		Reserves::<T, I>::mutate(who, |reserves| -> (Self::NegativeImbalance, Self::Balance) {
+			match reserves.binary_search_by_key(id, |data| data.id) {
+				Ok(index) => {
+					let to_change = cmp::min(reserves[index].amount, value);
+
+					let (imb, remain) = <Self as ReservableCurrency<_>>::slash_reserved(who, to_change);
+
+					// remain should always be zero but just to be defensive here
+					let actual = to_change.saturating_sub(remain);
+
+					// `actual <= to_change` and `to_change <= amount`; qed;
+					reserves[index].amount -= actual;
+
+					(imb, value - actual)
+				},
+				Err(_) => {
+					(NegativeImbalance::zero(), value)
+				},
+			}
+		})
+	}
+
+	/// Move the reserved balance of one account into the balance of another, according to `status`.
+	/// If `status` is `Reserved`, the balance will be reserved with given `id`.
+	///
+	/// Is a no-op if:
+	/// - the value to be moved is zero; or
+	/// - the `slashed` id equal to `beneficiary` and the `status` is `Reserved`.
+	fn repatriate_reserved_named(
+		id: &Self::ReserveIdentifier,
+		slashed: &T::AccountId,
+		beneficiary: &T::AccountId,
+		value: Self::Balance,
+		status: Status,
+	) -> Result<Self::Balance, DispatchError> {
+		if value.is_zero() { return Ok(Zero::zero()) }
+
+		if slashed == beneficiary {
+			return match status {
+				Status::Free => Ok(Self::unreserve_named(id, slashed, value)),
+				Status::Reserved => Ok(value.saturating_sub(Self::reserved_balance_named(id, slashed))),
+			};
+		}
+
+		Reserves::<T, I>::try_mutate(slashed, |reserves| -> Result<Self::Balance, DispatchError> {
+			match reserves.binary_search_by_key(id, |data| data.id) {
+				Ok(index) => {
+					let to_change = cmp::min(reserves[index].amount, value);
+
+					let actual = if status == Status::Reserved {
+						// make it the reserved under same identifier
+						Reserves::<T, I>::try_mutate(beneficiary, |reserves| -> Result<T::Balance, DispatchError> {
+							match reserves.binary_search_by_key(id, |data| data.id) {
+								Ok(index) => {
+									let remain = <Self as ReservableCurrency<_>>::repatriate_reserved(slashed, beneficiary, to_change, status)?;
+
+									// remain should always be zero but just to be defensive here
+									let actual = to_change.saturating_sub(remain);
+
+									// this add can't overflow but just to be defensive.
+									reserves[index].amount = reserves[index].amount.saturating_add(actual);
+
+									Ok(actual)
+								},
+								Err(index) => {
+									let remain = <Self as ReservableCurrency<_>>::repatriate_reserved(slashed, beneficiary, to_change, status)?;
+
+									// remain should always be zero but just to be defensive here
+									let actual = to_change.saturating_sub(remain);
+
+									reserves.try_insert(index, ReserveData {
+										id: id.clone(),
+										amount: actual
+									}).map_err(|_| Error::<T, I>::TooManyReserves)?;
+
+									Ok(actual)
+								},
+							}
+						})?
+					} else {
+						let remain = <Self as ReservableCurrency<_>>::repatriate_reserved(slashed, beneficiary, to_change, status)?;
+
+						// remain should always be zero but just to be defensive here
+						to_change.saturating_sub(remain)
+					};
+
+					// `actual <= to_change` and `to_change <= amount`; qed;
+					reserves[index].amount -= actual;
+
+					Ok(value - actual)
+				},
+				Err(_) => {
+					Ok(value)
+				},
+			}
+		})
+	}
+}
+
 impl<T: Config<I>, I: 'static> LockableCurrency<T::AccountId> for Pallet<T, I>
 where
 	T::Balance: MaybeSerializeDeserialize + Debug
diff --git a/frame/balances/src/tests.rs b/frame/balances/src/tests.rs
index 38a49df37bdf..9589fb25805b 100644
--- a/frame/balances/src/tests.rs
+++ b/frame/balances/src/tests.rs
@@ -964,5 +964,123 @@ macro_rules! decl_tests {
 					assert_eq!(Balances::total_balance(&2), 100);
 				});
 		}
+
+		#[test]
+		fn named_reserve_should_work() {
+			<$ext_builder>::default().build().execute_with(|| {
+				let _ = Balances::deposit_creating(&1, 111);
+
+				let id_1 = [1u8; 8];
+				let id_2 = [2u8; 8];
+				let id_3 = [3u8; 8];
+
+				// reserve
+
+				assert_noop!(Balances::reserve_named(&id_1, &1, 112), Error::<Test, _>::InsufficientBalance);
+
+				assert_ok!(Balances::reserve_named(&id_1, &1, 12));
+
+				assert_eq!(Balances::reserved_balance(1), 12);
+				assert_eq!(Balances::reserved_balance_named(&id_1, &1), 12);
+				assert_eq!(Balances::reserved_balance_named(&id_2, &1), 0);
+
+				assert_ok!(Balances::reserve_named(&id_1, &1, 2));
+
+				assert_eq!(Balances::reserved_balance(1), 14);
+				assert_eq!(Balances::reserved_balance_named(&id_1, &1), 14);
+				assert_eq!(Balances::reserved_balance_named(&id_2, &1), 0);
+
+				assert_ok!(Balances::reserve_named(&id_2, &1, 23));
+
+				assert_eq!(Balances::reserved_balance(1), 37);
+				assert_eq!(Balances::reserved_balance_named(&id_1, &1), 14);
+				assert_eq!(Balances::reserved_balance_named(&id_2, &1), 23);
+
+				assert_ok!(Balances::reserve(&1, 34));
+
+				assert_eq!(Balances::reserved_balance(1), 71);
+				assert_eq!(Balances::reserved_balance_named(&id_1, &1), 14);
+				assert_eq!(Balances::reserved_balance_named(&id_2, &1), 23);
+
+				assert_eq!(Balances::total_balance(&1), 111);
+				assert_eq!(Balances::free_balance(1), 40);
+
+				assert_noop!(Balances::reserve_named(&id_3, &1, 2), Error::<Test, _>::TooManyReserves);
+
+				// unreserve
+
+				assert_eq!(Balances::unreserve_named(&id_1, &1, 10), 0);
+
+				assert_eq!(Balances::reserved_balance(1), 61);
+				assert_eq!(Balances::reserved_balance_named(&id_1, &1), 4);
+				assert_eq!(Balances::reserved_balance_named(&id_2, &1), 23);
+
+				assert_eq!(Balances::unreserve_named(&id_1, &1, 5), 1);
+
+				assert_eq!(Balances::reserved_balance(1), 57);
+				assert_eq!(Balances::reserved_balance_named(&id_1, &1), 0);
+				assert_eq!(Balances::reserved_balance_named(&id_2, &1), 23);
+
+				assert_eq!(Balances::unreserve_named(&id_2, &1, 3), 0);
+
+				assert_eq!(Balances::reserved_balance(1), 54);
+				assert_eq!(Balances::reserved_balance_named(&id_1, &1), 0);
+				assert_eq!(Balances::reserved_balance_named(&id_2, &1), 20);
+
+				assert_eq!(Balances::total_balance(&1), 111);
+				assert_eq!(Balances::free_balance(1), 57);
+
+				// slash_reserved_named
+
+				assert_ok!(Balances::reserve_named(&id_1, &1, 10));
+
+				assert_eq!(Balances::slash_reserved_named(&id_1, &1, 25).1, 15);
+
+				assert_eq!(Balances::reserved_balance(1), 54);
+				assert_eq!(Balances::reserved_balance_named(&id_1, &1), 0);
+				assert_eq!(Balances::reserved_balance_named(&id_2, &1), 20);
+				assert_eq!(Balances::total_balance(&1), 101);
+
+				assert_eq!(Balances::slash_reserved_named(&id_2, &1, 5).1, 0);
+
+				assert_eq!(Balances::reserved_balance(1), 49);
+				assert_eq!(Balances::reserved_balance_named(&id_1, &1), 0);
+				assert_eq!(Balances::reserved_balance_named(&id_2, &1), 15);
+				assert_eq!(Balances::total_balance(&1), 96);
+
+				// repatriate_reserved_named
+
+				let _ = Balances::deposit_creating(&2, 100);
+
+				assert_eq!(Balances::repatriate_reserved_named(&id_2, &1, &2, 10, Status::Reserved).unwrap(), 0);
+
+				assert_eq!(Balances::reserved_balance_named(&id_2, &1), 5);
+				assert_eq!(Balances::reserved_balance_named(&id_2, &2), 10);
+				assert_eq!(Balances::reserved_balance(&2), 10);
+
+				assert_eq!(Balances::repatriate_reserved_named(&id_2, &2, &1, 11, Status::Reserved).unwrap(), 1);
+
+				assert_eq!(Balances::reserved_balance_named(&id_2, &1), 15);
+				assert_eq!(Balances::reserved_balance_named(&id_2, &2), 0);
+				assert_eq!(Balances::reserved_balance(&2), 0);
+
+				assert_eq!(Balances::repatriate_reserved_named(&id_2, &1, &2, 10, Status::Free).unwrap(), 0);
+				assert_eq!(Balances::reserved_balance_named(&id_2, &1), 5);
+				assert_eq!(Balances::reserved_balance_named(&id_2, &2), 0);
+				assert_eq!(Balances::free_balance(&2), 110);
+
+				// repatriate_reserved_named to self
+
+				assert_eq!(Balances::repatriate_reserved_named(&id_2, &1, &1, 10, Status::Reserved).unwrap(), 5);
+				assert_eq!(Balances::reserved_balance_named(&id_2, &1), 5);
+
+				assert_eq!(Balances::free_balance(&1), 47);
+
+				assert_eq!(Balances::repatriate_reserved_named(&id_2, &1, &1, 15, Status::Free).unwrap(), 10);
+				assert_eq!(Balances::reserved_balance_named(&id_2, &1), 0);
+
+				assert_eq!(Balances::free_balance(&1), 52);
+			});
+		}
 	}
 }
diff --git a/frame/balances/src/tests_composite.rs b/frame/balances/src/tests_composite.rs
index b4bdb13fbb83..ff10607bcee0 100644
--- a/frame/balances/src/tests_composite.rs
+++ b/frame/balances/src/tests_composite.rs
@@ -87,6 +87,10 @@ impl pallet_transaction_payment::Config for Test {
 	type FeeMultiplierUpdate = ();
 }
 
+parameter_types! {
+	pub const MaxReserves: u32 = 2;
+}
+
 impl Config for Test {
 	type Balance = u64;
 	type DustRemoval = ();
@@ -94,6 +98,8 @@ impl Config for Test {
 	type ExistentialDeposit = ExistentialDeposit;
 	type AccountStore = frame_system::Pallet<Test>;
 	type MaxLocks = ();
+	type MaxReserves = MaxReserves;
+	type ReserveIdentifier = [u8; 8];
 	type WeightInfo = ();
 }
 
diff --git a/frame/balances/src/tests_local.rs b/frame/balances/src/tests_local.rs
index ac5adfd8d1f3..afa68764573e 100644
--- a/frame/balances/src/tests_local.rs
+++ b/frame/balances/src/tests_local.rs
@@ -90,6 +90,7 @@ impl pallet_transaction_payment::Config for Test {
 }
 parameter_types! {
 	pub const MaxLocks: u32 = 50;
+	pub const MaxReserves: u32 = 2;
 }
 impl Config for Test {
 	type Balance = u64;
@@ -103,6 +104,8 @@ impl Config for Test {
 		super::AccountData<u64>,
 	>;
 	type MaxLocks = MaxLocks;
+	type MaxReserves = MaxReserves;
+	type ReserveIdentifier = [u8; 8];
 	type WeightInfo = ();
 }
 
diff --git a/frame/balances/src/tests_reentrancy.rs b/frame/balances/src/tests_reentrancy.rs
index 91ad51446c19..a12da8f001d8 100644
--- a/frame/balances/src/tests_reentrancy.rs
+++ b/frame/balances/src/tests_reentrancy.rs
@@ -106,6 +106,7 @@ impl OnUnbalanced<NegativeImbalance<Test>> for OnDustRemoval {
 }
 parameter_types! {
 	pub const MaxLocks: u32 = 50;
+	pub const MaxReserves: u32 = 2;
 }
 impl Config for Test {
 	type Balance = u64;
@@ -119,6 +120,8 @@ impl Config for Test {
 		super::AccountData<u64>,
 	>;
 	type MaxLocks = MaxLocks;
+	type MaxReserves = MaxReserves;
+	type ReserveIdentifier = [u8; 8];
 	type WeightInfo = ();
 }
 
diff --git a/frame/bounties/src/tests.rs b/frame/bounties/src/tests.rs
index e90b1f565a4c..04cc06ef64b8 100644
--- a/frame/bounties/src/tests.rs
+++ b/frame/bounties/src/tests.rs
@@ -88,6 +88,8 @@ parameter_types! {
 }
 impl pallet_balances::Config for Test {
 	type MaxLocks = ();
+	type MaxReserves = ();
+	type ReserveIdentifier = [u8; 8];
 	type Balance = u64;
 	type Event = Event;
 	type DustRemoval = ();
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index 6fdaecebd85f..75ea8d9bd89b 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -237,6 +237,8 @@ impl frame_system::Config for Test {
 }
 impl pallet_balances::Config for Test {
 	type MaxLocks = ();
+	type MaxReserves = ();
+	type ReserveIdentifier = [u8; 8];
 	type Balance = u64;
 	type Event = Event;
 	type DustRemoval = ();
diff --git a/frame/democracy/src/tests.rs b/frame/democracy/src/tests.rs
index e8877e2774c7..1c68715d49e3 100644
--- a/frame/democracy/src/tests.rs
+++ b/frame/democracy/src/tests.rs
@@ -123,6 +123,8 @@ parameter_types! {
 	pub const MaxLocks: u32 = 10;
 }
 impl pallet_balances::Config for Test {
+	type MaxReserves = ();
+	type ReserveIdentifier = [u8; 8];
 	type MaxLocks = MaxLocks;
 	type Balance = u64;
 	type Event = Event;
diff --git a/frame/election-provider-multi-phase/src/mock.rs b/frame/election-provider-multi-phase/src/mock.rs
index 2fb7927d98f9..830df099b5d0 100644
--- a/frame/election-provider-multi-phase/src/mock.rs
+++ b/frame/election-provider-multi-phase/src/mock.rs
@@ -237,6 +237,8 @@ impl pallet_balances::Config for Runtime {
 	type ExistentialDeposit = ExistentialDeposit;
 	type AccountStore = System;
 	type MaxLocks = ();
+	type MaxReserves = ();
+	type ReserveIdentifier = [u8; 8];
 	type WeightInfo = ();
 }
 
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index 9efe8c826091..ab2edfaac6c2 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -1159,6 +1159,8 @@ mod tests {
 		type ExistentialDeposit = ExistentialDeposit;
 		type AccountStore = frame_system::Pallet<Test>;
 		type MaxLocks = ();
+		type MaxReserves = ();
+		type ReserveIdentifier = [u8; 8];
 		type WeightInfo = ();
 	}
 
diff --git a/frame/elections/src/mock.rs b/frame/elections/src/mock.rs
index 896fd40020e4..b5dd15ce8119 100644
--- a/frame/elections/src/mock.rs
+++ b/frame/elections/src/mock.rs
@@ -66,6 +66,8 @@ parameter_types! {
 }
 impl pallet_balances::Config for Test {
 	type MaxLocks = ();
+	type MaxReserves = ();
+	type ReserveIdentifier = [u8; 8];
 	type Balance = u64;
 	type DustRemoval = ();
 	type Event = Event;
diff --git a/frame/example/src/tests.rs b/frame/example/src/tests.rs
index 496cd5701fe5..f4658c280764 100644
--- a/frame/example/src/tests.rs
+++ b/frame/example/src/tests.rs
@@ -83,6 +83,8 @@ parameter_types! {
 }
 impl pallet_balances::Config for Test {
 	type MaxLocks = ();
+	type MaxReserves = ();
+	type ReserveIdentifier = [u8; 8];
 	type Balance = u64;
 	type DustRemoval = ();
 	type Event = Event;
diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index c630fb639960..593b8db92c60 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -721,6 +721,8 @@ mod tests {
 		type ExistentialDeposit = ExistentialDeposit;
 		type AccountStore = System;
 		type MaxLocks = ();
+		type MaxReserves = ();
+		type ReserveIdentifier = [u8; 8];
 		type WeightInfo = ();
 	}
 
diff --git a/frame/gilt/src/mock.rs b/frame/gilt/src/mock.rs
index f5c0d3a5aabe..fb888515496b 100644
--- a/frame/gilt/src/mock.rs
+++ b/frame/gilt/src/mock.rs
@@ -85,6 +85,8 @@ impl pallet_balances::Config for Test {
 	type AccountStore = System;
 	type WeightInfo = ();
 	type MaxLocks = ();
+	type MaxReserves = ();
+	type ReserveIdentifier = [u8; 8];
 }
 
 parameter_types! {
diff --git a/frame/grandpa/src/mock.rs b/frame/grandpa/src/mock.rs
index 1ab28f7752ef..df55f6037e30 100644
--- a/frame/grandpa/src/mock.rs
+++ b/frame/grandpa/src/mock.rs
@@ -150,6 +150,8 @@ parameter_types! {
 
 impl pallet_balances::Config for Test {
 	type MaxLocks = ();
+	type MaxReserves = ();
+	type ReserveIdentifier = [u8; 8];
 	type Balance = u128;
 	type DustRemoval = ();
 	type Event = Event;
diff --git a/frame/identity/src/tests.rs b/frame/identity/src/tests.rs
index 2bfad79640c2..262b3211b6d1 100644
--- a/frame/identity/src/tests.rs
+++ b/frame/identity/src/tests.rs
@@ -83,6 +83,8 @@ impl pallet_balances::Config for Test {
 	type ExistentialDeposit = ExistentialDeposit;
 	type AccountStore = System;
 	type MaxLocks = ();
+	type MaxReserves = ();
+	type ReserveIdentifier = [u8; 8];
 	type WeightInfo = ();
 }
 parameter_types! {
diff --git a/frame/indices/src/mock.rs b/frame/indices/src/mock.rs
index efaaa0212467..bd9e9c33af25 100644
--- a/frame/indices/src/mock.rs
+++ b/frame/indices/src/mock.rs
@@ -77,6 +77,8 @@ parameter_types! {
 
 impl pallet_balances::Config for Test {
 	type MaxLocks = ();
+	type MaxReserves = ();
+	type ReserveIdentifier = [u8; 8];
 	type Balance = u64;
 	type DustRemoval = ();
 	type Event = Event;
diff --git a/frame/lottery/src/mock.rs b/frame/lottery/src/mock.rs
index b668fba85951..07593c17e508 100644
--- a/frame/lottery/src/mock.rs
+++ b/frame/lottery/src/mock.rs
@@ -87,6 +87,8 @@ parameter_types! {
 
 impl pallet_balances::Config for Test {
 	type MaxLocks = ();
+	type MaxReserves = ();
+	type ReserveIdentifier = [u8; 8];
 	type Balance = u64;
 	type Event = Event;
 	type DustRemoval = ();
diff --git a/frame/multisig/src/tests.rs b/frame/multisig/src/tests.rs
index cf457f6db602..69f7cb17b0f5 100644
--- a/frame/multisig/src/tests.rs
+++ b/frame/multisig/src/tests.rs
@@ -78,6 +78,8 @@ parameter_types! {
 }
 impl pallet_balances::Config for Test {
 	type MaxLocks = ();
+	type MaxReserves = ();
+	type ReserveIdentifier = [u8; 8];
 	type Balance = u64;
 	type Event = Event;
 	type DustRemoval = ();
diff --git a/frame/nicks/src/lib.rs b/frame/nicks/src/lib.rs
index 4372fd326cc9..a76d4506f93b 100644
--- a/frame/nicks/src/lib.rs
+++ b/frame/nicks/src/lib.rs
@@ -304,6 +304,8 @@ mod tests {
 	}
 	impl pallet_balances::Config for Test {
 		type MaxLocks = ();
+		type MaxReserves = ();
+		type ReserveIdentifier = [u8; 8];
 		type Balance = u64;
 		type Event = Event;
 		type DustRemoval = ();
diff --git a/frame/offences/benchmarking/src/mock.rs b/frame/offences/benchmarking/src/mock.rs
index 9047120923ad..7230c1215afc 100644
--- a/frame/offences/benchmarking/src/mock.rs
+++ b/frame/offences/benchmarking/src/mock.rs
@@ -72,6 +72,8 @@ parameter_types! {
 }
 impl pallet_balances::Config for Test {
 	type MaxLocks = ();
+	type MaxReserves = ();
+	type ReserveIdentifier = [u8; 8];
 	type Balance = Balance;
 	type Event = Event;
 	type DustRemoval = ();
diff --git a/frame/proxy/src/tests.rs b/frame/proxy/src/tests.rs
index fd632b91bb35..a2cb00d0ccc3 100644
--- a/frame/proxy/src/tests.rs
+++ b/frame/proxy/src/tests.rs
@@ -80,6 +80,8 @@ parameter_types! {
 }
 impl pallet_balances::Config for Test {
 	type MaxLocks = ();
+	type MaxReserves = ();
+	type ReserveIdentifier = [u8; 8];
 	type Balance = u64;
 	type Event = Event;
 	type DustRemoval = ();
diff --git a/frame/recovery/src/mock.rs b/frame/recovery/src/mock.rs
index 72dbc29fd716..6a0abab2bd12 100644
--- a/frame/recovery/src/mock.rs
+++ b/frame/recovery/src/mock.rs
@@ -79,6 +79,8 @@ parameter_types! {
 
 impl pallet_balances::Config for Test {
 	type MaxLocks = ();
+	type MaxReserves = ();
+	type ReserveIdentifier = [u8; 8];
 	type Balance = u128;
 	type DustRemoval = ();
 	type Event = Event;
diff --git a/frame/scored-pool/src/mock.rs b/frame/scored-pool/src/mock.rs
index 8f7acd32007e..44a28234a2a8 100644
--- a/frame/scored-pool/src/mock.rs
+++ b/frame/scored-pool/src/mock.rs
@@ -84,6 +84,8 @@ impl frame_system::Config for Test {
 
 impl pallet_balances::Config for Test {
 	type MaxLocks = ();
+	type MaxReserves = ();
+	type ReserveIdentifier = [u8; 8];
 	type Balance = u64;
 	type Event = Event;
 	type DustRemoval = ();
diff --git a/frame/session/benchmarking/src/mock.rs b/frame/session/benchmarking/src/mock.rs
index cf2fa8a07cfe..87d1242812db 100644
--- a/frame/session/benchmarking/src/mock.rs
+++ b/frame/session/benchmarking/src/mock.rs
@@ -74,6 +74,8 @@ parameter_types! {
 }
 impl pallet_balances::Config for Test {
 	type MaxLocks = ();
+	type MaxReserves = ();
+	type ReserveIdentifier = [u8; 8];
 	type Balance = Balance;
 	type Event = Event;
 	type DustRemoval = ();
diff --git a/frame/society/src/mock.rs b/frame/society/src/mock.rs
index aa46d40a14ae..5e156caa282e 100644
--- a/frame/society/src/mock.rs
+++ b/frame/society/src/mock.rs
@@ -96,6 +96,8 @@ impl frame_system::Config for Test {
 
 impl pallet_balances::Config for Test {
 	type MaxLocks = ();
+	type MaxReserves = ();
+	type ReserveIdentifier = [u8; 8];
 	type Balance = u64;
 	type Event = Event;
 	type DustRemoval = ();
diff --git a/frame/staking/fuzzer/src/mock.rs b/frame/staking/fuzzer/src/mock.rs
index 11d810a26e17..4ac1a10364e6 100644
--- a/frame/staking/fuzzer/src/mock.rs
+++ b/frame/staking/fuzzer/src/mock.rs
@@ -71,6 +71,8 @@ parameter_types! {
 }
 impl pallet_balances::Config for Test {
 	type MaxLocks = ();
+	type MaxReserves = ();
+	type ReserveIdentifier = [u8; 8];
 	type Balance = Balance;
 	type Event = Event;
 	type DustRemoval = ();
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index 4027ac1f670b..8930a6bfd61c 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -155,6 +155,8 @@ impl frame_system::Config for Test {
 }
 impl pallet_balances::Config for Test {
 	type MaxLocks = MaxLocks;
+	type MaxReserves = ();
+	type ReserveIdentifier = [u8; 8];
 	type Balance = Balance;
 	type Event = Event;
 	type DustRemoval = ();
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index 52def92ef9b4..96e1cece5506 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -23,7 +23,8 @@ pub mod tokens;
 pub use tokens::fungible;
 pub use tokens::fungibles;
 pub use tokens::currency::{
-	Currency, LockIdentifier, LockableCurrency, ReservableCurrency, VestingSchedule,
+	Currency, LockIdentifier, LockableCurrency, ReservableCurrency, NamedReservableCurrency,
+	VestingSchedule,
 };
 pub use tokens::imbalance::{Imbalance, OnUnbalanced, SignedImbalance};
 pub use tokens::{ExistenceRequirement, WithdrawReasons, BalanceStatus};
diff --git a/frame/support/src/traits/tokens/currency.rs b/frame/support/src/traits/tokens/currency.rs
index a18e0b6593bc..a00e99b0c4ac 100644
--- a/frame/support/src/traits/tokens/currency.rs
+++ b/frame/support/src/traits/tokens/currency.rs
@@ -25,7 +25,7 @@ use super::imbalance::{Imbalance, SignedImbalance};
 use frame_support::traits::MaxEncodedLen;
 
 mod reservable;
-pub use reservable::ReservableCurrency;
+pub use reservable::{ReservableCurrency, NamedReservableCurrency};
 mod lockable;
 pub use lockable::{LockableCurrency, VestingSchedule, LockIdentifier};
 
diff --git a/frame/support/src/traits/tokens/currency/reservable.rs b/frame/support/src/traits/tokens/currency/reservable.rs
index 14ea1d3a16fb..17dee7a8ae65 100644
--- a/frame/support/src/traits/tokens/currency/reservable.rs
+++ b/frame/support/src/traits/tokens/currency/reservable.rs
@@ -81,3 +81,116 @@ pub trait ReservableCurrency<AccountId>: Currency<AccountId> {
 		status: BalanceStatus,
 	) -> Result<Self::Balance, DispatchError>;
 }
+
+pub trait NamedReservableCurrency<AccountId>: ReservableCurrency<AccountId> {
+	/// An identifier for a reserve. Used for disambiguating different reserves so that
+	/// they can be individually replaced or removed.
+	type ReserveIdentifier;
+
+	/// Deducts up to `value` from reserved balance of `who`. This function cannot fail.
+	///
+	/// As much funds up to `value` will be deducted as possible. If the reserve balance of `who`
+	/// is less than `value`, then a non-zero second item will be returned.
+	fn slash_reserved_named(
+		id: &Self::ReserveIdentifier,
+		who: &AccountId,
+		value: Self::Balance
+	) -> (Self::NegativeImbalance, Self::Balance);
+
+	/// The amount of the balance of a given account that is externally reserved; this can still get
+	/// slashed, but gets slashed last of all.
+	///
+	/// This balance is a 'reserve' balance that other subsystems use in order to set aside tokens
+	/// that are still 'owned' by the account holder, but which are suspendable.
+	///
+	/// When this balance falls below the value of `ExistentialDeposit`, then this 'reserve account'
+	/// is deleted: specifically, `ReservedBalance`.
+	///
+	/// `system::AccountNonce` is also deleted if `FreeBalance` is also zero (it also gets
+	/// collapsed to zero if it ever becomes less than `ExistentialDeposit`.
+	fn reserved_balance_named(id: &Self::ReserveIdentifier, who: &AccountId) -> Self::Balance;
+
+	/// Moves `value` from balance to reserved balance.
+	///
+	/// If the free balance is lower than `value`, then no funds will be moved and an `Err` will
+	/// be returned to notify of this. This is different behavior than `unreserve`.
+	fn reserve_named(id: &Self::ReserveIdentifier, who: &AccountId, value: Self::Balance) -> DispatchResult;
+
+	/// Moves up to `value` from reserved balance to free balance. This function cannot fail.
+	///
+	/// As much funds up to `value` will be moved as possible. If the reserve balance of `who`
+	/// is less than `value`, then the remaining amount will be returned.
+	///
+	/// # NOTES
+	///
+	/// - This is different from `reserve`.
+	/// - If the remaining reserved balance is less than `ExistentialDeposit`, it will
+	/// invoke `on_reserved_too_low` and could reap the account.
+	fn unreserve_named(id: &Self::ReserveIdentifier, who: &AccountId, value: Self::Balance) -> Self::Balance;
+
+	/// Moves up to `value` from reserved balance of account `slashed` to balance of account
+	/// `beneficiary`. `beneficiary` must exist for this to succeed. If it does not, `Err` will be
+	/// returned. Funds will be placed in either the `free` balance or the `reserved` balance,
+	/// depending on the `status`.
+	///
+	/// As much funds up to `value` will be deducted as possible. If this is less than `value`,
+	/// then `Ok(non_zero)` will be returned.
+	fn repatriate_reserved_named(
+		id: &Self::ReserveIdentifier,
+		slashed: &AccountId,
+		beneficiary: &AccountId,
+		value: Self::Balance,
+		status: BalanceStatus,
+	) -> Result<Self::Balance, DispatchError>;
+
+	/// Ensure the reserved balance is equal to `value`.
+	///
+	/// This will reserve extra amount of current reserved balance is less than `value`.
+	/// And unreserve if current reserved balance is greater than `value`.
+	fn ensure_reserved_named(id: &Self::ReserveIdentifier, who: &AccountId, value: Self::Balance) -> DispatchResult {
+		let current = Self::reserved_balance_named(id, who);
+ 		if current > value {
+			// we always have enough balance to unreserve here
+			Self::unreserve_named(id, who, current - value);
+			Ok(())
+		} else if value > current {
+			// we checked value > current
+			Self::reserve_named(id, who, value - current)
+		} else { // current == value
+			Ok(())
+		}
+	}
+
+	/// Unreserve all the named reserved balances, returning unreserved amount.
+	///
+	/// Is a no-op if the value to be unreserved is zero.
+	fn unreserve_all_named(id: &Self::ReserveIdentifier, who: &AccountId) -> Self::Balance {
+		let value = Self::reserved_balance_named(id, who);
+		Self::slash_reserved_named(id, who, value);
+		value
+	}
+
+	/// Slash all the reserved balance, returning the negative imbalance created.
+	///
+	/// Is a no-op if the value to be slashed is zero.
+	fn slash_all_reserved_named(id: &Self::ReserveIdentifier, who: &AccountId) -> Self::NegativeImbalance {
+		let value = Self::reserved_balance_named(id, who);
+		Self::slash_reserved_named(id, who, value).0
+	}
+
+	/// Move all the named reserved balance of one account into the balance of another, according to `status`.
+	/// If `status` is `Reserved`, the balance will be reserved with given `id`.
+	///
+	/// Is a no-op if:
+	/// - the value to be moved is zero; or
+	/// - the `slashed` id equal to `beneficiary` and the `status` is `Reserved`.
+	fn repatriate_all_reserved_named(
+		id: &Self::ReserveIdentifier,
+		slashed: &AccountId,
+		beneficiary: &AccountId,
+		status: BalanceStatus,
+	) -> DispatchResult {
+		let value = Self::reserved_balance_named(id, slashed);
+		Self::repatriate_reserved_named(id, slashed, beneficiary, value, status).map(|_| ())
+	}
+}
diff --git a/frame/tips/src/tests.rs b/frame/tips/src/tests.rs
index 3b11e105c6d0..6b144273ca82 100644
--- a/frame/tips/src/tests.rs
+++ b/frame/tips/src/tests.rs
@@ -87,6 +87,8 @@ parameter_types! {
 }
 impl pallet_balances::Config for Test {
 	type MaxLocks = ();
+	type MaxReserves = ();
+	type ReserveIdentifier = [u8; 8];
 	type Balance = u64;
 	type Event = Event;
 	type DustRemoval = ();
diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
index 3cf79caef770..2b1ad2db9ae0 100644
--- a/frame/transaction-payment/src/lib.rs
+++ b/frame/transaction-payment/src/lib.rs
@@ -702,6 +702,8 @@ mod tests {
 		type ExistentialDeposit = ExistentialDeposit;
 		type AccountStore = System;
 		type MaxLocks = ();
+		type MaxReserves = ();
+		type ReserveIdentifier = [u8; 8];
 		type WeightInfo = ();
 	}
 
diff --git a/frame/treasury/src/tests.rs b/frame/treasury/src/tests.rs
index cb6d4903a573..408f99f29e1b 100644
--- a/frame/treasury/src/tests.rs
+++ b/frame/treasury/src/tests.rs
@@ -83,6 +83,8 @@ parameter_types! {
 }
 impl pallet_balances::Config for Test {
 	type MaxLocks = ();
+	type MaxReserves = ();
+	type ReserveIdentifier = [u8; 8];
 	type Balance = u64;
 	type Event = Event;
 	type DustRemoval = ();
diff --git a/frame/uniques/src/mock.rs b/frame/uniques/src/mock.rs
index 1040821d0d88..336a262358b2 100644
--- a/frame/uniques/src/mock.rs
+++ b/frame/uniques/src/mock.rs
@@ -70,6 +70,7 @@ impl frame_system::Config for Test {
 
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
+	pub const MaxReserves: u32 = 50;
 }
 
 impl pallet_balances::Config for Test {
@@ -80,6 +81,8 @@ impl pallet_balances::Config for Test {
 	type AccountStore = System;
 	type WeightInfo = ();
 	type MaxLocks = ();
+	type MaxReserves = MaxReserves;
+	type ReserveIdentifier = [u8; 8];
 }
 
 parameter_types! {
diff --git a/frame/utility/src/tests.rs b/frame/utility/src/tests.rs
index 02b878e799ee..aa6bea8a27d3 100644
--- a/frame/utility/src/tests.rs
+++ b/frame/utility/src/tests.rs
@@ -118,6 +118,8 @@ parameter_types! {
 }
 impl pallet_balances::Config for Test {
 	type MaxLocks = ();
+	type MaxReserves = ();
+	type ReserveIdentifier = [u8; 8];
 	type Balance = u64;
 	type DustRemoval = ();
 	type Event = Event;
diff --git a/frame/vesting/src/lib.rs b/frame/vesting/src/lib.rs
index c8156e08c69c..8c520b715801 100644
--- a/frame/vesting/src/lib.rs
+++ b/frame/vesting/src/lib.rs
@@ -473,6 +473,8 @@ mod tests {
 		type ExistentialDeposit = ExistentialDeposit;
 		type AccountStore = System;
 		type MaxLocks = MaxLocks;
+		type MaxReserves = ();
+		type ReserveIdentifier = [u8; 8];
 		type WeightInfo = ();
 	}
 	parameter_types! {

From e98aca335f066d84d7a5cbabf280392f39e1cc99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20P=C3=A1nik?= <jakub.panik@gmail.com>
Date: Fri, 4 Jun 2021 11:01:05 +0200
Subject: [PATCH 0834/1194] update ss58 type to u16 (#8955)

---
 bin/node/runtime/src/lib.rs | 2 +-
 frame/system/src/lib.rs     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 6c38bf41ec59..14bf16d19778 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -186,7 +186,7 @@ parameter_types! {
 		})
 		.avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)
 		.build_or_panic();
-	pub const SS58Prefix: u8 = 42;
+	pub const SS58Prefix: u16 = 42;
 }
 
 const_assert!(NORMAL_DISPATCH_RATIO.deconstruct() >= AVERAGE_ON_INITIALIZE_RATIO.deconstruct());
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index 6938df7e86c2..f0597ea2fe0f 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -266,7 +266,7 @@ pub mod pallet {
 		/// that the runtime should know about the prefix in order to make use of it as
 		/// an identifier of the chain.
 		#[pallet::constant]
-		type SS58Prefix: Get<u8>;
+		type SS58Prefix: Get<u16>;
 
 		/// What to do if the user wants the code set to something. Just use `()` unless you are in
 		/// cumulus.

From d27dea95712696fcc5dd1fcc93f22926e0b9e57f Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Fri, 4 Jun 2021 13:27:05 +0200
Subject: [PATCH 0835/1194] Fixed build (#9021)

---
 frame/transaction-storage/src/mock.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frame/transaction-storage/src/mock.rs b/frame/transaction-storage/src/mock.rs
index 51eb61dd26b7..351893c08a33 100644
--- a/frame/transaction-storage/src/mock.rs
+++ b/frame/transaction-storage/src/mock.rs
@@ -88,6 +88,8 @@ impl pallet_balances::Config for Test {
 	type AccountStore = System;
 	type WeightInfo = ();
 	type MaxLocks = ();
+	type MaxReserves = ();
+	type ReserveIdentifier = ();
 }
 
 impl pallet_transaction_storage::Config for Test {

From 2cff60c3be7b84d940b219399b1d2c8aa2e4b31d Mon Sep 17 00:00:00 2001
From: Andreas Doerr <adoerr@users.noreply.github.com>
Date: Fri, 4 Jun 2021 16:46:16 +0200
Subject: [PATCH 0836/1194] Bump parity-db (#9024)

---
 Cargo.lock                | 4 ++--
 bin/node/bench/Cargo.toml | 2 +-
 client/db/Cargo.toml      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 97b64e07e413..62056dd99b2e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5691,9 +5691,9 @@ dependencies = [
 
 [[package]]
 name = "parity-db"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "495197c078e54b8735181aa35c00a327f7f3a3cc00a1ee8c95926dd010f0ec6b"
+checksum = "2e337f62db341435f0da05b8f6b97e984ef4ea5800510cd07c2d624688c40b47"
 dependencies = [
  "blake2-rfc",
  "crc32fast",
diff --git a/bin/node/bench/Cargo.toml b/bin/node/bench/Cargo.toml
index 728eb8d6093c..93ee35d98f98 100644
--- a/bin/node/bench/Cargo.toml
+++ b/bin/node/bench/Cargo.toml
@@ -38,6 +38,6 @@ hex = "0.4.0"
 rand = { version = "0.7.2", features = ["small_rng"] }
 lazy_static = "1.4.0"
 parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
-parity-db = { version = "0.2.2" }
+parity-db = { version = "0.2.4" }
 sc-transaction-pool = { version = "3.0.0", path = "../../../client/transaction-pool" }
 futures = { version = "0.3.4", features = ["thread-pool"] }
diff --git a/client/db/Cargo.toml b/client/db/Cargo.toml
index e5e52494c2db..43bae63f09c2 100644
--- a/client/db/Cargo.toml
+++ b/client/db/Cargo.toml
@@ -35,7 +35,7 @@ sp-trie = { version = "3.0.0", path = "../../primitives/trie" }
 sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
 sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
 sp-database = { version = "3.0.0", path = "../../primitives/database" }
-parity-db = { version = "0.2.3", optional = true }
+parity-db = { version = "0.2.4", optional = true }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.9.0", path = "../../utils/prometheus" }
 
 [dev-dependencies]

From 37bb3ae7eb559afaf9c7dbf7fd99e08b282c8127 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Fri, 4 Jun 2021 22:31:06 +0100
Subject: [PATCH 0837/1194] consensus: handle justification sync for blocks
 authored locally (#8698)

* consensus: add trait to control justification sync process

* network: implement JustificationSyncLink for NetworkService

* slots: handle justification sync in slot worker

* babe: fix slot worker instantiation

* aura: fix slot worker instantiation

* pow: handle justification sync in miner

* babe: fix tests

* aura: fix tests

* node: fix compilation

* node-template: fix compilation

* consensus: rename justification sync link parameter

* aura: fix test compilation

* consensus: slots: move JustificationSyncLink out of on_slot
---
 bin/node-template/node/src/service.rs         |  3 +-
 bin/node/cli/src/service.rs                   |  1 +
 client/consensus/aura/src/lib.rs              | 62 ++++++++++++-------
 client/consensus/babe/src/lib.rs              | 53 +++++++++++-----
 client/consensus/babe/src/tests.rs            |  5 +-
 client/consensus/pow/src/lib.rs               | 11 ++--
 client/consensus/pow/src/worker.rs            | 19 ++++--
 client/consensus/slots/src/lib.rs             | 55 ++++++++++------
 client/network/src/protocol.rs                |  5 ++
 client/network/src/protocol/sync.rs           |  7 ++-
 client/network/src/service.rs                 | 20 ++++++
 .../consensus/common/src/block_import.rs      | 53 ++++++++++++++++
 primitives/consensus/common/src/lib.rs        |  4 +-
 13 files changed, 228 insertions(+), 70 deletions(-)

diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
index f50490410076..8ed9c1ee5037 100644
--- a/bin/node-template/node/src/service.rs
+++ b/bin/node-template/node/src/service.rs
@@ -220,7 +220,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		let slot_duration = sc_consensus_aura::slot_duration(&*client)?;
 		let raw_slot_duration = slot_duration.slot_duration();
 
-		let aura = sc_consensus_aura::start_aura::<AuraPair, _, _, _, _, _, _, _, _, _, _>(
+		let aura = sc_consensus_aura::start_aura::<AuraPair, _, _, _, _, _, _, _, _, _, _, _>(
 			StartAuraParams {
 				slot_duration,
 				client: client.clone(),
@@ -243,6 +243,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 				keystore: keystore_container.sync_keystore(),
 				can_author_with,
 				sync_oracle: network.clone(),
+				justification_sync_link: network.clone(),
 				block_proposal_slot_portion: SlotProportion::new(2f32 / 3f32),
 				telemetry: telemetry.as_ref().map(|x| x.handle()),
 			},
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index 42020e6668e4..a9ac2ac8065f 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -308,6 +308,7 @@ pub fn new_full_base(
 			env: proposer,
 			block_import,
 			sync_oracle: network.clone(),
+			justification_sync_link: network.clone(),
 			create_inherent_data_providers: move |parent, ()| {
 				let client_clone = client_clone.clone();
 				async move {
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index 623096cd5c64..702e4dc0bf1b 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -109,7 +109,7 @@ fn slot_author<P: Pair>(slot: Slot, authorities: &[AuthorityId<P>]) -> Option<&A
 }
 
 /// Parameters of [`start_aura`].
-pub struct StartAuraParams<C, SC, I, PF, SO, BS, CAW, IDP> {
+pub struct StartAuraParams<C, SC, I, PF, SO, L, CIDP, BS, CAW> {
 	/// The duration of a slot.
 	pub slot_duration: SlotDuration,
 	/// The client to interact with the chain.
@@ -122,8 +122,10 @@ pub struct StartAuraParams<C, SC, I, PF, SO, BS, CAW, IDP> {
 	pub proposer_factory: PF,
 	/// The sync oracle that can give us the current sync status.
 	pub sync_oracle: SO,
+	/// Hook into the sync module to control the justification sync process.
+	pub justification_sync_link: L,
 	/// Something that can create the inherent data providers.
-	pub create_inherent_data_providers: IDP,
+	pub create_inherent_data_providers: CIDP,
 	/// Should we force the authoring of blocks?
 	pub force_authoring: bool,
 	/// The backoff strategy when we miss slots.
@@ -143,7 +145,7 @@ pub struct StartAuraParams<C, SC, I, PF, SO, BS, CAW, IDP> {
 }
 
 /// Start the aura worker. The returned future should be run in a futures executor.
-pub fn start_aura<P, B, C, SC, PF, I, SO, CAW, BS, Error, IDP>(
+pub fn start_aura<P, B, C, SC, I, PF, SO, L, CIDP, BS, CAW, Error>(
 	StartAuraParams {
 		slot_duration,
 		client,
@@ -151,6 +153,7 @@ pub fn start_aura<P, B, C, SC, PF, I, SO, CAW, BS, Error, IDP>(
 		block_import,
 		proposer_factory,
 		sync_oracle,
+		justification_sync_link,
 		create_inherent_data_providers,
 		force_authoring,
 		backoff_authoring_blocks,
@@ -158,31 +161,33 @@ pub fn start_aura<P, B, C, SC, PF, I, SO, CAW, BS, Error, IDP>(
 		can_author_with,
 		block_proposal_slot_portion,
 		telemetry,
-	}: StartAuraParams<C, SC, I, PF, SO, BS, CAW, IDP>,
+	}: StartAuraParams<C, SC, I, PF, SO, L, CIDP, BS, CAW>,
 ) -> Result<impl Future<Output = ()>, sp_consensus::Error> where
+	P: Pair + Send + Sync,
+	P::Public: AppPublic + Hash + Member + Encode + Decode,
+	P::Signature: TryFrom<Vec<u8>> + Hash + Member + Encode + Decode,
 	B: BlockT,
 	C: ProvideRuntimeApi<B> + BlockOf + ProvideCache<B> + AuxStore + HeaderBackend<B> + Send + Sync,
 	C::Api: AuraApi<B, AuthorityId<P>>,
 	SC: SelectChain<B>,
+	I: BlockImport<B, Transaction = sp_api::TransactionFor<C, B>> + Send + Sync + 'static,
 	PF: Environment<B, Error = Error> + Send + Sync + 'static,
 	PF::Proposer: Proposer<B, Error = Error, Transaction = sp_api::TransactionFor<C, B>>,
-	P: Pair + Send + Sync,
-	P::Public: AppPublic + Hash + Member + Encode + Decode,
-	P::Signature: TryFrom<Vec<u8>> + Hash + Member + Encode + Decode,
-	I: BlockImport<B, Transaction = sp_api::TransactionFor<C, B>> + Send + Sync + 'static,
-	Error: std::error::Error + Send + From<sp_consensus::Error> + 'static,
 	SO: SyncOracle + Send + Sync + Clone,
-	CAW: CanAuthorWith<B> + Send,
+	L: sp_consensus::JustificationSyncLink<B>,
+	CIDP: CreateInherentDataProviders<B, ()> + Send,
+	CIDP::InherentDataProviders: InherentDataProviderExt + Send,
 	BS: BackoffAuthoringBlocksStrategy<NumberFor<B>> + Send + 'static,
-	IDP: CreateInherentDataProviders<B, ()> + Send,
-	IDP::InherentDataProviders: InherentDataProviderExt + Send,
+	CAW: CanAuthorWith<B> + Send,
+	Error: std::error::Error + Send + From<sp_consensus::Error> + 'static,
 {
-	let worker = build_aura_worker::<P, _, _, _, _, _, _, _>(BuildAuraWorkerParams {
+	let worker = build_aura_worker::<P, _, _, _, _, _, _, _, _>(BuildAuraWorkerParams {
 		client: client.clone(),
 		block_import,
 		proposer_factory,
 		keystore,
 		sync_oracle: sync_oracle.clone(),
+		justification_sync_link,
 		force_authoring,
 		backoff_authoring_blocks,
 		telemetry,
@@ -200,7 +205,7 @@ pub fn start_aura<P, B, C, SC, PF, I, SO, CAW, BS, Error, IDP>(
 }
 
 /// Parameters of [`build_aura_worker`].
-pub struct BuildAuraWorkerParams<C, I, PF, SO, BS> {
+pub struct BuildAuraWorkerParams<C, I, PF, SO, L, BS> {
 	/// The client to interact with the chain.
 	pub client: Arc<C>,
 	/// The block import.
@@ -209,6 +214,8 @@ pub struct BuildAuraWorkerParams<C, I, PF, SO, BS> {
 	pub proposer_factory: PF,
 	/// The sync oracle that can give us the current sync status.
 	pub sync_oracle: SO,
+	/// Hook into the sync module to control the justification sync process.
+	pub justification_sync_link: L,
 	/// Should we force the authoring of blocks?
 	pub force_authoring: bool,
 	/// The backoff strategy when we miss slots.
@@ -228,18 +235,19 @@ pub struct BuildAuraWorkerParams<C, I, PF, SO, BS> {
 /// Build the aura worker.
 ///
 /// The caller is responsible for running this worker, otherwise it will do nothing.
-pub fn build_aura_worker<P, B, C, PF, I, SO, BS, Error>(
+pub fn build_aura_worker<P, B, C, PF, I, SO, L, BS, Error>(
 	BuildAuraWorkerParams {
 		client,
 		block_import,
 		proposer_factory,
 		sync_oracle,
+		justification_sync_link,
 		backoff_authoring_blocks,
 		keystore,
 		block_proposal_slot_portion,
 		telemetry,
 		force_authoring,
-	}: BuildAuraWorkerParams<C, I, PF, SO, BS>,
+	}: BuildAuraWorkerParams<C, I, PF, SO, L, BS>,
 ) -> impl sc_consensus_slots::SlotWorker<B, <PF::Proposer as Proposer<B>>::Proof> where
 	B: BlockT,
 	C: ProvideRuntimeApi<B> + BlockOf + ProvideCache<B> + AuxStore + HeaderBackend<B> + Send + Sync,
@@ -252,6 +260,7 @@ pub fn build_aura_worker<P, B, C, PF, I, SO, BS, Error>(
 	I: BlockImport<B, Transaction = sp_api::TransactionFor<C, B>> + Send + Sync + 'static,
 	Error: std::error::Error + Send + From<sp_consensus::Error> + 'static,
 	SO: SyncOracle + Send + Sync + Clone,
+	L: sp_consensus::JustificationSyncLink<B>,
 	BS: BackoffAuthoringBlocksStrategy<NumberFor<B>> + Send + 'static,
 {
 	AuraWorker {
@@ -260,6 +269,7 @@ pub fn build_aura_worker<P, B, C, PF, I, SO, BS, Error>(
 		env: proposer_factory,
 		keystore,
 		sync_oracle,
+		justification_sync_link,
 		force_authoring,
 		backoff_authoring_blocks,
 		telemetry,
@@ -268,12 +278,13 @@ pub fn build_aura_worker<P, B, C, PF, I, SO, BS, Error>(
 	}
 }
 
-struct AuraWorker<C, E, I, P, SO, BS> {
+struct AuraWorker<C, E, I, P, SO, L, BS> {
 	client: Arc<C>,
 	block_import: I,
 	env: E,
 	keystore: SyncCryptoStorePtr,
 	sync_oracle: SO,
+	justification_sync_link: L,
 	force_authoring: bool,
 	backoff_authoring_blocks: Option<BS>,
 	block_proposal_slot_portion: SlotProportion,
@@ -281,8 +292,8 @@ struct AuraWorker<C, E, I, P, SO, BS> {
 	_key_type: PhantomData<P>,
 }
 
-impl<B, C, E, I, P, Error, SO, BS> sc_consensus_slots::SimpleSlotWorker<B>
-	for AuraWorker<C, E, I, P, SO, BS>
+impl<B, C, E, I, P, Error, SO, L, BS> sc_consensus_slots::SimpleSlotWorker<B>
+	for AuraWorker<C, E, I, P, SO, L, BS>
 where
 	B: BlockT,
 	C: ProvideRuntimeApi<B> + BlockOf + ProvideCache<B> + HeaderBackend<B> + Sync,
@@ -294,11 +305,13 @@ where
 	P::Public: AppPublic + Public + Member + Encode + Decode + Hash,
 	P::Signature: TryFrom<Vec<u8>> + Member + Encode + Decode + Hash + Debug,
 	SO: SyncOracle + Send + Clone,
+	L: sp_consensus::JustificationSyncLink<B>,
 	BS: BackoffAuthoringBlocksStrategy<NumberFor<B>> + Send + 'static,
 	Error: std::error::Error + Send + From<sp_consensus::Error> + 'static,
 {
 	type BlockImport = I;
 	type SyncOracle = SO;
+	type JustificationSyncLink = L;
 	type CreateProposer = Pin<Box<
 		dyn Future<Output = Result<E::Proposer, sp_consensus::Error>> + Send + 'static
 	>>;
@@ -425,6 +438,10 @@ where
 		&mut self.sync_oracle
 	}
 
+	fn justification_sync_link(&mut self) -> &mut Self::JustificationSyncLink {
+		&mut self.justification_sync_link
+	}
+
 	fn proposer(&mut self, block: &B::Header) -> Self::CreateProposer {
 		Box::pin(self.env.init(block).map_err(|e| {
 			sp_consensus::Error::ClientImport(format!("{:?}", e)).into()
@@ -725,13 +742,14 @@ mod tests {
 
 			let slot_duration = slot_duration(&*client).expect("slot duration available");
 
-			aura_futures.push(start_aura::<AuthorityPair, _, _, _, _, _, _, _, _, _, _>(StartAuraParams {
+			aura_futures.push(start_aura::<AuthorityPair, _, _, _, _, _, _, _, _, _, _, _>(StartAuraParams {
 				slot_duration,
 				block_import: client.clone(),
 				select_chain,
 				client,
 				proposer_factory: environ,
 				sync_oracle: DummyOracle,
+				justification_sync_link: (),
 				create_inherent_data_providers: |_, _| async {
 					let timestamp = TimestampInherentDataProvider::from_system_time();
 					let slot = InherentDataProvider::from_timestamp_and_duration(
@@ -804,6 +822,7 @@ mod tests {
 			env: environ,
 			keystore: keystore.into(),
 			sync_oracle: DummyOracle.clone(),
+			justification_sync_link: (),
 			force_authoring: false,
 			backoff_authoring_blocks: Some(BackoffAuthoringOnFinalizedHeadLagging::default()),
 			telemetry: None,
@@ -853,6 +872,7 @@ mod tests {
 			env: environ,
 			keystore: keystore.into(),
 			sync_oracle: DummyOracle.clone(),
+			justification_sync_link: (),
 			force_authoring: false,
 			backoff_authoring_blocks: Option::<()>::None,
 			telemetry: None,
@@ -871,7 +891,7 @@ mod tests {
 				duration: Duration::from_millis(1000),
 				chain_head: head,
 				block_size_limit: None,
-			},
+			}
 		)).unwrap();
 
 		// The returned block should be imported and we should be able to get its header by now.
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index 0b02bbbe1410..409999ef1fdc 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -363,7 +363,7 @@ impl std::ops::Deref for Config {
 }
 
 /// Parameters for BABE.
-pub struct BabeParams<B: BlockT, C, E, I, SO, SC, CAW, BS, IDP> {
+pub struct BabeParams<B: BlockT, C, SC, E, I, SO, L, CIDP, BS, CAW> {
 	/// The keystore that manages the keys of the node.
 	pub keystore: SyncCryptoStorePtr,
 
@@ -384,8 +384,11 @@ pub struct BabeParams<B: BlockT, C, E, I, SO, SC, CAW, BS, IDP> {
 	/// A sync oracle
 	pub sync_oracle: SO,
 
+	/// Hook into the sync module to control the justification sync process.
+	pub justification_sync_link: L,
+
 	/// Something that can create the inherent data providers.
-	pub create_inherent_data_providers: IDP,
+	pub create_inherent_data_providers: CIDP,
 
 	/// Force authoring of blocks even if we are offline
 	pub force_authoring: bool,
@@ -411,13 +414,14 @@ pub struct BabeParams<B: BlockT, C, E, I, SO, SC, CAW, BS, IDP> {
 }
 
 /// Start the babe worker.
-pub fn start_babe<B, C, SC, E, I, SO, CAW, BS, Error, IDP>(BabeParams {
+pub fn start_babe<B, C, SC, E, I, SO, CIDP, BS, CAW, L, Error>(BabeParams {
 	keystore,
 	client,
 	select_chain,
 	env,
 	block_import,
 	sync_oracle,
+	justification_sync_link,
 	create_inherent_data_providers,
 	force_authoring,
 	backoff_authoring_blocks,
@@ -425,26 +429,35 @@ pub fn start_babe<B, C, SC, E, I, SO, CAW, BS, Error, IDP>(BabeParams {
 	can_author_with,
 	block_proposal_slot_portion,
 	telemetry,
-}: BabeParams<B, C, E, I, SO, SC, CAW, BS, IDP>) -> Result<
+}: BabeParams<B, C, SC, E, I, SO, L, CIDP, BS, CAW>) -> Result<
 	BabeWorker<B>,
 	sp_consensus::Error,
 > where
 	B: BlockT,
-	C: ProvideRuntimeApi<B> + ProvideCache<B> + ProvideUncles<B> + BlockchainEvents<B>
-		+ HeaderBackend<B> + HeaderMetadata<B, Error = ClientError>
-		+ Send + Sync + 'static,
+	C: ProvideRuntimeApi<B>
+		+ ProvideCache<B>
+		+ ProvideUncles<B>
+		+ BlockchainEvents<B>
+		+ HeaderBackend<B>
+		+ HeaderMetadata<B, Error = ClientError>
+		+ Send
+		+ Sync
+		+ 'static,
 	C::Api: BabeApi<B>,
 	SC: SelectChain<B> + 'static,
 	E: Environment<B, Error = Error> + Send + Sync + 'static,
 	E::Proposer: Proposer<B, Error = Error, Transaction = sp_api::TransactionFor<C, B>>,
-	I: BlockImport<B, Error = ConsensusError, Transaction = sp_api::TransactionFor<C, B>> + Send
-		+ Sync + 'static,
-	Error: std::error::Error + Send + From<ConsensusError> + From<I::Error> + 'static,
+	I: BlockImport<B, Error = ConsensusError, Transaction = sp_api::TransactionFor<C, B>>
+		+ Send
+		+ Sync
+		+ 'static,
 	SO: SyncOracle + Send + Sync + Clone + 'static,
-	CAW: CanAuthorWith<B> + Send + Sync + 'static,
+	L: sp_consensus::JustificationSyncLink<B> + 'static,
+	CIDP: CreateInherentDataProviders<B, ()> + Send + Sync + 'static,
+	CIDP::InherentDataProviders: InherentDataProviderExt + Send,
 	BS: BackoffAuthoringBlocksStrategy<NumberFor<B>> + Send + 'static,
-	IDP: CreateInherentDataProviders<B, ()> + Send + Sync + 'static,
-	IDP::InherentDataProviders: InherentDataProviderExt + Send,
+	CAW: CanAuthorWith<B> + Send + Sync + 'static,
+	Error: std::error::Error + Send + From<ConsensusError> + From<I::Error> + 'static,
 {
 	const HANDLE_BUFFER_SIZE: usize = 1024;
 
@@ -456,6 +469,7 @@ pub fn start_babe<B, C, SC, E, I, SO, CAW, BS, Error, IDP>(BabeParams {
 		block_import,
 		env,
 		sync_oracle: sync_oracle.clone(),
+		justification_sync_link,
 		force_authoring,
 		backoff_authoring_blocks,
 		keystore,
@@ -600,11 +614,12 @@ type SlotNotificationSinks<B> = Arc<
 	Mutex<Vec<Sender<(Slot, ViableEpochDescriptor<<B as BlockT>::Hash, NumberFor<B>, Epoch>)>>>
 >;
 
-struct BabeSlotWorker<B: BlockT, C, E, I, SO, BS> {
+struct BabeSlotWorker<B: BlockT, C, E, I, SO, L, BS> {
 	client: Arc<C>,
 	block_import: I,
 	env: E,
 	sync_oracle: SO,
+	justification_sync_link: L,
 	force_authoring: bool,
 	backoff_authoring_blocks: Option<BS>,
 	keystore: SyncCryptoStorePtr,
@@ -615,8 +630,8 @@ struct BabeSlotWorker<B: BlockT, C, E, I, SO, BS> {
 	telemetry: Option<TelemetryHandle>,
 }
 
-impl<B, C, E, I, Error, SO, BS> sc_consensus_slots::SimpleSlotWorker<B>
-	for BabeSlotWorker<B, C, E, I, SO, BS>
+impl<B, C, E, I, Error, SO, L, BS> sc_consensus_slots::SimpleSlotWorker<B>
+	for BabeSlotWorker<B, C, E, I, SO, L, BS>
 where
 	B: BlockT,
 	C: ProvideRuntimeApi<B> +
@@ -628,12 +643,14 @@ where
 	E::Proposer: Proposer<B, Error = Error, Transaction = sp_api::TransactionFor<C, B>>,
 	I: BlockImport<B, Transaction = sp_api::TransactionFor<C, B>> + Send + Sync + 'static,
 	SO: SyncOracle + Send + Clone,
+	L: sp_consensus::JustificationSyncLink<B>,
 	BS: BackoffAuthoringBlocksStrategy<NumberFor<B>>,
 	Error: std::error::Error + Send + From<ConsensusError> + From<I::Error> + 'static,
 {
 	type EpochData = ViableEpochDescriptor<B::Hash, NumberFor<B>, Epoch>;
 	type Claim = (PreDigest, AuthorityId);
 	type SyncOracle = SO;
+	type JustificationSyncLink = L;
 	type CreateProposer = Pin<Box<
 		dyn Future<Output = Result<E::Proposer, sp_consensus::Error>> + Send + 'static
 	>>;
@@ -798,6 +815,10 @@ where
 		&mut self.sync_oracle
 	}
 
+	fn justification_sync_link(&mut self) -> &mut Self::JustificationSyncLink {
+		&mut self.justification_sync_link
+	}
+
 	fn proposer(&mut self, block: &B::Header) -> Self::CreateProposer {
 		Box::pin(self.env.init(block).map_err(|e| {
 			sp_consensus::Error::ClientImport(format!("{:?}", e))
diff --git a/client/consensus/babe/src/tests.rs b/client/consensus/babe/src/tests.rs
index d042f25399ee..467de9683c68 100644
--- a/client/consensus/babe/src/tests.rs
+++ b/client/consensus/babe/src/tests.rs
@@ -390,9 +390,7 @@ fn rejects_empty_block() {
 	})
 }
 
-fn run_one_test(
-	mutator: impl Fn(&mut TestHeader, Stage) + Send + Sync + 'static,
-) {
+fn run_one_test(mutator: impl Fn(&mut TestHeader, Stage) + Send + Sync + 'static) {
 	sp_tracing::try_init_simple();
 	let mutator = Arc::new(mutator) as Mutator;
 
@@ -473,6 +471,7 @@ fn run_one_test(
 			babe_link: data.link.clone(),
 			keystore,
 			can_author_with: sp_consensus::AlwaysCanAuthor,
+			justification_sync_link: (),
 			block_proposal_slot_portion: SlotProportion::new(0.5),
 			telemetry: None,
 		}).expect("Starts babe"));
diff --git a/client/consensus/pow/src/lib.rs b/client/consensus/pow/src/lib.rs
index 17cdae48cdb6..6688c14b6375 100644
--- a/client/consensus/pow/src/lib.rs
+++ b/client/consensus/pow/src/lib.rs
@@ -527,20 +527,21 @@ pub fn import_queue<B, Transaction, Algorithm>(
 ///
 /// `pre_runtime` is a parameter that allows a custom additional pre-runtime digest to be inserted
 /// for blocks being built. This can encode authorship information, or just be a graffiti.
-pub fn start_mining_worker<Block, C, S, Algorithm, E, SO, CAW, CIDP>(
+pub fn start_mining_worker<Block, C, S, Algorithm, E, SO, L, CIDP, CAW>(
 	block_import: BoxBlockImport<Block, sp_api::TransactionFor<C, Block>>,
 	client: Arc<C>,
 	select_chain: S,
 	algorithm: Algorithm,
 	mut env: E,
 	mut sync_oracle: SO,
+	justification_sync_link: L,
 	pre_runtime: Option<Vec<u8>>,
 	create_inherent_data_providers: CIDP,
 	timeout: Duration,
 	build_time: Duration,
 	can_author_with: CAW,
 ) -> (
-	Arc<Mutex<MiningWorker<Block, Algorithm, C, <E::Proposer as Proposer<Block>>::Proof>>>,
+	Arc<Mutex<MiningWorker<Block, Algorithm, C, L, <E::Proposer as Proposer<Block>>::Proof>>>,
 	impl Future<Output = ()>,
 ) where
 	Block: BlockT,
@@ -552,14 +553,16 @@ pub fn start_mining_worker<Block, C, S, Algorithm, E, SO, CAW, CIDP>(
 	E::Error: std::fmt::Debug,
 	E::Proposer: Proposer<Block, Transaction = sp_api::TransactionFor<C, Block>>,
 	SO: SyncOracle + Clone + Send + Sync + 'static,
-	CAW: CanAuthorWith<Block> + Clone + Send + 'static,
+	L: sp_consensus::JustificationSyncLink<Block>,
 	CIDP: CreateInherentDataProviders<Block, ()>,
+	CAW: CanAuthorWith<Block> + Clone + Send + 'static,
 {
 	let mut timer = UntilImportedOrTimeout::new(client.import_notification_stream(), timeout);
-	let worker = Arc::new(Mutex::new(MiningWorker::<Block, Algorithm, C, _> {
+	let worker = Arc::new(Mutex::new(MiningWorker {
 		build: None,
 		algorithm: algorithm.clone(),
 		block_import,
+		justification_sync_link,
 	}));
 	let worker_ret = worker.clone();
 
diff --git a/client/consensus/pow/src/worker.rs b/client/consensus/pow/src/worker.rs
index 18844e51ce41..e5d76592b7fd 100644
--- a/client/consensus/pow/src/worker.rs
+++ b/client/consensus/pow/src/worker.rs
@@ -18,8 +18,12 @@
 
 use std::{pin::Pin, time::Duration, collections::HashMap, borrow::Cow};
 use sc_client_api::ImportNotifications;
-use sp_runtime::{DigestItem, traits::Block as BlockT, generic::BlockId};
 use sp_consensus::{Proposal, BlockOrigin, BlockImportParams, import_queue::BoxBlockImport};
+use sp_runtime::{
+	generic::BlockId,
+	traits::{Block as BlockT, Header as HeaderT},
+	DigestItem,
+};
 use futures::{prelude::*, task::{Context, Poll}};
 use futures_timer::Delay;
 use log::*;
@@ -57,18 +61,22 @@ pub struct MiningWorker<
 	Block: BlockT,
 	Algorithm: PowAlgorithm<Block>,
 	C: sp_api::ProvideRuntimeApi<Block>,
-	Proof
+	L: sp_consensus::JustificationSyncLink<Block>,
+	Proof,
 > {
 	pub(crate) build: Option<MiningBuild<Block, Algorithm, C, Proof>>,
 	pub(crate) algorithm: Algorithm,
 	pub(crate) block_import: BoxBlockImport<Block, sp_api::TransactionFor<C, Block>>,
+	pub(crate) justification_sync_link: L,
 }
 
-impl<Block, Algorithm, C, Proof> MiningWorker<Block, Algorithm, C, Proof> where
+impl<Block, Algorithm, C, L, Proof> MiningWorker<Block, Algorithm, C, L, Proof>
+where
 	Block: BlockT,
 	C: sp_api::ProvideRuntimeApi<Block>,
 	Algorithm: PowAlgorithm<Block>,
 	Algorithm::Difficulty: 'static + Send,
+	L: sp_consensus::JustificationSyncLink<Block>,
 	sp_api::TransactionFor<C, Block>: Send + 'static,
 {
 	/// Get the current best hash. `None` if the worker has just started or the client is doing
@@ -139,8 +147,11 @@ impl<Block, Algorithm, C, Proof> MiningWorker<Block, Algorithm, C, Proof> where
 				Box::new(intermediate) as Box<_>,
 			);
 
+			let header = import_block.post_header();
 			match self.block_import.import_block(import_block, HashMap::default()).await {
-				Ok(_) => {
+				Ok(res) => {
+					res.handle_justification(&header.hash(), *header.number(), &mut self.justification_sync_link);
+
 					info!(
 						target: "pow",
 						"✅ Successfully mined block on top of: {}",
diff --git a/client/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs
index cc879f769e47..188aa52881a7 100644
--- a/client/consensus/slots/src/lib.rs
+++ b/client/consensus/slots/src/lib.rs
@@ -39,7 +39,9 @@ use futures_timer::Delay;
 use log::{debug, error, info, warn};
 use sp_api::{ProvideRuntimeApi, ApiRef};
 use sp_arithmetic::traits::BaseArithmetic;
-use sp_consensus::{BlockImport, Proposer, SyncOracle, SelectChain, CanAuthorWith, SlotData};
+use sp_consensus::{
+	BlockImport, CanAuthorWith, JustificationSyncLink, Proposer, SelectChain, SlotData, SyncOracle,
+};
 use sp_consensus_slots::Slot;
 use sp_inherents::CreateInherentDataProviders;
 use sp_runtime::{
@@ -92,6 +94,10 @@ pub trait SimpleSlotWorker<B: BlockT> {
 	/// A handle to a `SyncOracle`.
 	type SyncOracle: SyncOracle;
 
+	/// A handle to a `JustificationSyncLink`, allows hooking into the sync module to control the
+	/// justification sync process.
+	type JustificationSyncLink: JustificationSyncLink<B>;
+
 	/// The type of future resolving to the proposer.
 	type CreateProposer: Future<Output = Result<Self::Proposer, sp_consensus::Error>>
 		+ Send + Unpin + 'static;
@@ -178,6 +184,9 @@ pub trait SimpleSlotWorker<B: BlockT> {
 	/// Returns a handle to a `SyncOracle`.
 	fn sync_oracle(&mut self) -> &mut Self::SyncOracle;
 
+	/// Returns a handle to a `JustificationSyncLink`.
+	fn justification_sync_link(&mut self) -> &mut Self::JustificationSyncLink;
+
 	/// Returns a `Proposer` to author on top of the given block.
 	fn proposer(&mut self, block: &B::Header) -> Self::CreateProposer;
 
@@ -392,27 +401,37 @@ pub trait SimpleSlotWorker<B: BlockT> {
 		);
 
 		let header = block_import_params.post_header();
-		if let Err(err) = block_import
+		match block_import
 			.import_block(block_import_params, Default::default())
 			.await
 		{
-			warn!(
-				target: logging_target,
-				"Error with block built on {:?}: {:?}",
-				parent_hash,
-				err,
-			);
+			Ok(res) => {
+				res.handle_justification(
+					&header.hash(),
+					*header.number(),
+					self.justification_sync_link(),
+				);
+			}
+			Err(err) => {
+				warn!(
+					target: logging_target,
+					"Error with block built on {:?}: {:?}", parent_hash, err,
+				);
 
-			telemetry!(
-				telemetry;
-				CONSENSUS_WARN;
-				"slots.err_with_block_built_on";
-				"hash" => ?parent_hash,
-				"err" => ?err,
-			);
+				telemetry!(
+					telemetry;
+					CONSENSUS_WARN;
+					"slots.err_with_block_built_on";
+					"hash" => ?parent_hash,
+					"err" => ?err,
+				);
+			}
 		}
 
-		Some(SlotResult { block: B::new(header, body), storage_proof })
+		Some(SlotResult {
+			block: B::new(header, body),
+			storage_proof,
+		})
 	}
 }
 
@@ -481,7 +500,7 @@ where
 ///
 /// Every time a new slot is triggered, `worker.on_slot` is called and the future it returns is
 /// polled until completion, unless we are major syncing.
-pub async fn start_slot_worker<B, C, W, T, SO, CAW, CIDP, Proof>(
+pub async fn start_slot_worker<B, C, W, T, SO, CIDP, CAW, Proof>(
 	slot_duration: SlotDuration<T>,
 	client: C,
 	mut worker: W,
@@ -495,9 +514,9 @@ where
 	W: SlotWorker<B, Proof>,
 	SO: SyncOracle + Send,
 	T: SlotData + Clone,
-	CAW: CanAuthorWith<B> + Send,
 	CIDP: CreateInherentDataProviders<B, ()> + Send,
 	CIDP::InherentDataProviders: InherentDataProviderExt + Send,
+	CAW: CanAuthorWith<B> + Send,
 {
 	let SlotDuration(slot_duration) = slot_duration;
 
diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index 6431250c96f3..a3a490e09778 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -966,6 +966,11 @@ impl<B: BlockT> Protocol<B> {
 		self.sync.request_justification(&hash, number)
 	}
 
+	/// Clear all pending justification requests.
+	pub fn clear_justification_requests(&mut self) {
+		self.sync.clear_justification_requests();
+	}
+
 	/// Request syncing for the given block from given set of peers.
 	/// Uses `protocol` to queue a new block download request and tries to dispatch all pending
 	/// requests.
diff --git a/client/network/src/protocol/sync.rs b/client/network/src/protocol/sync.rs
index f1b744c89a99..7b7ac721b5b4 100644
--- a/client/network/src/protocol/sync.rs
+++ b/client/network/src/protocol/sync.rs
@@ -632,6 +632,11 @@ impl<B: BlockT> ChainSync<B> {
 		})
 	}
 
+	/// Clear all pending justification requests.
+	pub fn clear_justification_requests(&mut self) {
+		self.extra_justifications.reset();
+	}
+
 	/// Request syncing for the given block from given set of peers.
 	// The implementation is similar to on_block_announce with unknown parent hash.
 	pub fn set_sync_fork_request(
@@ -1117,7 +1122,7 @@ impl<B: BlockT> ChainSync<B> {
 							number,
 							hash
 						);
-						self.extra_justifications.reset()
+						self.clear_justification_requests();
 					}
 
 					if aux.needs_justification {
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 6351f03a393e..666108363f64 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -976,6 +976,13 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 			.unbounded_send(ServiceToWorkerMsg::RequestJustification(*hash, number));
 	}
 
+	/// Clear all pending justification requests.
+	pub fn clear_justification_requests(&self) {
+		let _ = self
+			.to_worker
+			.unbounded_send(ServiceToWorkerMsg::ClearJustificationRequests);
+	}
+
 	/// Are we in the process of downloading the chain?
 	pub fn is_major_syncing(&self) -> bool {
 		self.is_major_syncing.load(Ordering::Relaxed)
@@ -1219,6 +1226,16 @@ impl<'a, B: BlockT + 'static, H: ExHashT> sp_consensus::SyncOracle
 	}
 }
 
+impl<B: BlockT, H: ExHashT> sp_consensus::JustificationSyncLink<B> for NetworkService<B, H> {
+	fn request_justification(&self, hash: &B::Hash, number: NumberFor<B>) {
+		NetworkService::request_justification(self, hash, number);
+	}
+
+	fn clear_justification_requests(&self) {
+		NetworkService::clear_justification_requests(self);
+	}
+}
+
 impl<B, H> NetworkStateInfo for NetworkService<B, H>
 	where
 		B: sp_runtime::traits::Block,
@@ -1323,6 +1340,7 @@ enum ServiceToWorkerMsg<B: BlockT, H: ExHashT> {
 	PropagateTransaction(H),
 	PropagateTransactions,
 	RequestJustification(B::Hash, NumberFor<B>),
+	ClearJustificationRequests,
 	AnnounceBlock(B::Hash, Option<Vec<u8>>),
 	GetValue(record::Key),
 	PutValue(record::Key, Vec<u8>),
@@ -1444,6 +1462,8 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 					this.network_service.behaviour_mut().user_protocol_mut().announce_block(hash, data),
 				ServiceToWorkerMsg::RequestJustification(hash, number) =>
 					this.network_service.behaviour_mut().user_protocol_mut().request_justification(&hash, number),
+				ServiceToWorkerMsg::ClearJustificationRequests =>
+					this.network_service.behaviour_mut().user_protocol_mut().clear_justification_requests(),
 				ServiceToWorkerMsg::PropagateTransaction(hash) =>
 					this.tx_handler_controller.propagate_transaction(hash),
 				ServiceToWorkerMsg::PropagateTransactions =>
diff --git a/primitives/consensus/common/src/block_import.rs b/primitives/consensus/common/src/block_import.rs
index 6e4fb9886501..31c3eb74457c 100644
--- a/primitives/consensus/common/src/block_import.rs
+++ b/primitives/consensus/common/src/block_import.rs
@@ -68,6 +68,30 @@ impl ImportResult {
 
 		ImportResult::Imported(aux)
 	}
+
+	/// Handles any necessary request for justifications (or clearing of pending requests) based on
+	/// the outcome of this block import.
+	pub fn handle_justification<B>(
+		&self,
+		hash: &B::Hash,
+		number: NumberFor<B>,
+		justification_sync_link: &mut dyn JustificationSyncLink<B>,
+	) where
+		B: BlockT,
+	{
+		match self {
+			ImportResult::Imported(aux) => {
+				if aux.clear_justification_requests {
+					justification_sync_link.clear_justification_requests();
+				}
+
+				if aux.needs_justification {
+					justification_sync_link.request_justification(hash, number);
+				}
+			}
+			_ => {}
+		}
+	}
 }
 
 /// Block data origin.
@@ -354,3 +378,32 @@ pub trait JustificationImport<B: BlockT> {
 		justification: Justification,
 	) -> Result<(), Self::Error>;
 }
+
+/// Control the synchronization process of block justifications.
+///
+/// When importing blocks different consensus engines might require that
+/// additional finality data is provided (i.e. a justification for the block).
+/// This trait abstracts the required methods to issue those requests
+pub trait JustificationSyncLink<B: BlockT>: Send + Sync {
+	/// Request a justification for the given block.
+	fn request_justification(&self, hash: &B::Hash, number: NumberFor<B>);
+
+	/// Clear all pending justification requests.
+	fn clear_justification_requests(&self);
+}
+
+impl<B: BlockT> JustificationSyncLink<B> for () {
+	fn request_justification(&self, _hash: &B::Hash, _number: NumberFor<B>) {}
+
+	fn clear_justification_requests(&self) {}
+}
+
+impl<B: BlockT, L: JustificationSyncLink<B>> JustificationSyncLink<B> for Arc<L> {
+	fn request_justification(&self, hash: &B::Hash, number: NumberFor<B>) {
+		L::request_justification(&*self, hash, number);
+	}
+
+	fn clear_justification_requests(&self) {
+		L::clear_justification_requests(&*self);
+	}
+}
diff --git a/primitives/consensus/common/src/lib.rs b/primitives/consensus/common/src/lib.rs
index 642b6b12e7d6..37df7230fd62 100644
--- a/primitives/consensus/common/src/lib.rs
+++ b/primitives/consensus/common/src/lib.rs
@@ -49,8 +49,8 @@ mod metrics;
 
 pub use self::error::Error;
 pub use block_import::{
-	BlockImport, BlockOrigin, ForkChoiceStrategy, ImportedAux, BlockImportParams, BlockCheckParams,
-	ImportResult, JustificationImport,
+	BlockCheckParams, BlockImport, BlockImportParams, BlockOrigin, ForkChoiceStrategy,
+	ImportResult, ImportedAux, JustificationImport, JustificationSyncLink,
 };
 pub use select_chain::SelectChain;
 pub use sp_state_machine::Backend as StateBackend;

From 24a92c32680258275926021ae4da7db126ddf1d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Sun, 6 Jun 2021 09:07:29 +0100
Subject: [PATCH 0838/1194] arithmetic: fix PerThing pow (#9030)

* arithmetic: add failing test for pow

* arithmetic: fix PerThing::pow

* Revert back to previous optimisations

Co-authored-by: Gav Wood <gavin@parity.io>
---
 primitives/arithmetic/src/per_things.rs | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/primitives/arithmetic/src/per_things.rs b/primitives/arithmetic/src/per_things.rs
index 29d5d2be73a1..80d556486d56 100644
--- a/primitives/arithmetic/src/per_things.rs
+++ b/primitives/arithmetic/src/per_things.rs
@@ -639,20 +639,20 @@ macro_rules! implement_per_thing {
 		impl Pow<usize> for $name {
 			type Output = Self;
 
-			fn pow(self, exp: usize) -> Self::Output {
+			fn pow(mut self, exp: usize) -> Self::Output {
 				if exp == 0 || self.is_one() {
 					return Self::one()
 				}
+
 				let mut result = self;
 				let mut exp = exp - 1;
 				while exp > 0 && !result.is_zero() {
-					if exp % 2 == 0 {
-						result = result.square();
-						exp /= 2;
-					} else {
+					if exp % 2 != 0 {
 						result = result * self;
 						exp -= 1;
 					}
+					self = self.square();
+					exp /= 2;
 				}
 				result
 			}
@@ -1107,11 +1107,13 @@ macro_rules! implement_per_thing {
 					$name::from_parts($max / 2).square(),
 				);
 
-				// x^3
-				assert_eq!(
-					$name::from_parts($max / 2).saturating_pow(3),
-					$name::from_parts($max / 8),
-				);
+				// x^2 .. x^16
+				for n in 1..=16 {
+					assert_eq!(
+						$name::from_parts($max / 2).saturating_pow(n),
+						$name::from_parts(($max as u128 / 2u128.pow(n as u32)) as $type),
+					);
+				}
 
 				// 0^n == 0
 				assert_eq!(

From 1085a9021134f39d527c1bc828e7904959b3cc1a Mon Sep 17 00:00:00 2001
From: cheme <emericchevalier.pro@gmail.com>
Date: Mon, 7 Jun 2021 11:06:38 +0200
Subject: [PATCH 0839/1194] Compact proof utilities in sp_trie. (#8574)

* validation extension in sp_io

* need paths

* arc impl

* missing host function in executor

* io to pkdot

* decode function.

* encode primitive.

* trailing tab

* multiple patch

* fix child trie logic

* restore master versionning

* bench compact proof size

* trie-db 22.3 is needed

* line width

* split line

* fixes for bench (additional root may not be needed as original issue was
with empty proof).

* revert compact from block size calculation.

* New error type for compression.

* Adding test (incomplete (failing)).
Also lacking real proof checking (no good primitives in sp-trie crate).

* There is currently no proof recording utility in sp_trie, removing
test.

* small test of child root in proof without a child proof.

* remove empty test.

* remove non compact proof size

* Missing revert.

* proof method to encode decode.
---
 client/db/src/bench.rs                 |  31 ++-
 primitives/state-machine/src/lib.rs    |  57 +++++-
 primitives/trie/Cargo.toml             |   2 +-
 primitives/trie/src/error.rs           |   2 +-
 primitives/trie/src/lib.rs             |   6 +-
 primitives/trie/src/storage_proof.rs   |  56 ++++++
 primitives/trie/src/trie_codec.rs      | 259 +++++++++++++++++++++++++
 utils/wasm-builder/src/wasm_project.rs |   3 +-
 8 files changed, 407 insertions(+), 9 deletions(-)
 create mode 100644 primitives/trie/src/trie_codec.rs

diff --git a/client/db/src/bench.rs b/client/db/src/bench.rs
index ed53f52da3ce..c198fb400408 100644
--- a/client/db/src/bench.rs
+++ b/client/db/src/bench.rs
@@ -117,6 +117,7 @@ pub struct BenchmarkingState<B: BlockT> {
 	read_write_tracker: RefCell<ReadWriteTracker>,
 	whitelist: RefCell<Vec<TrackedStorageKey>>,
 	proof_recorder: Option<ProofRecorder<B::Hash>>,
+	proof_recorder_root: Cell<B::Hash>,
 }
 
 impl<B: BlockT> BenchmarkingState<B> {
@@ -129,7 +130,7 @@ impl<B: BlockT> BenchmarkingState<B> {
 		let mut state = BenchmarkingState {
 			state: RefCell::new(None),
 			db: Cell::new(None),
-			root: Cell::new(root),
+			root: Cell::new(root.clone()),
 			genesis: Default::default(),
 			genesis_root: Default::default(),
 			record: Default::default(),
@@ -139,6 +140,7 @@ impl<B: BlockT> BenchmarkingState<B> {
 			read_write_tracker: Default::default(),
 			whitelist: Default::default(),
 			proof_recorder: record_proof.then(Default::default),
+			proof_recorder_root: Cell::new(root.clone()),
 		};
 
 		state.add_whitelist_to_tracker();
@@ -166,7 +168,10 @@ impl<B: BlockT> BenchmarkingState<B> {
 			None => Arc::new(kvdb_memorydb::create(1)),
 		};
 		self.db.set(Some(db.clone()));
-		self.proof_recorder.as_ref().map(|r| r.reset());
+		if let Some(recorder) = &self.proof_recorder {
+			recorder.reset();
+			self.proof_recorder_root.set(self.root.get());
+		}
 		let storage_db = Arc::new(StorageDb::<B> {
 			db,
 			proof_recorder: self.proof_recorder.clone(),
@@ -516,7 +521,27 @@ impl<B: BlockT> StateBackend<HashFor<B>> for BenchmarkingState<B> {
 	}
 
 	fn proof_size(&self) -> Option<u32> {
-		self.proof_recorder.as_ref().map(|recorder| recorder.estimate_encoded_size() as u32)
+		self.proof_recorder.as_ref().map(|recorder| {
+			let proof_size = recorder.estimate_encoded_size() as u32;
+			let proof = recorder.to_storage_proof();
+			let proof_recorder_root = self.proof_recorder_root.get();
+			if proof_recorder_root == Default::default() || proof_size == 1 {
+				// empty trie
+				proof_size
+			} else {
+				if let Some(size) = proof.encoded_compact_size::<HashFor<B>>(proof_recorder_root) {
+					size as u32
+				} else {
+					panic!(
+						"proof rec root {:?}, root {:?}, genesis {:?}, rec_len {:?}",
+						self.proof_recorder_root.get(),
+						self.root.get(),
+						self.genesis_root,
+						proof_size,
+					);
+				}
+			}
+		})
 	}
 }
 
diff --git a/primitives/state-machine/src/lib.rs b/primitives/state-machine/src/lib.rs
index 479184b4b990..0508bfb78092 100644
--- a/primitives/state-machine/src/lib.rs
+++ b/primitives/state-machine/src/lib.rs
@@ -1402,14 +1402,22 @@ mod tests {
 		}
 	}
 
+	fn test_compact(remote_proof: StorageProof, remote_root: &sp_core::H256) -> StorageProof {
+		let compact_remote_proof = remote_proof.into_compact_proof::<BlakeTwo256>(
+			remote_root.clone(),
+		).unwrap();
+		compact_remote_proof.to_storage_proof::<BlakeTwo256>(Some(remote_root)).unwrap().0
+	}
+
 	#[test]
 	fn prove_read_and_proof_check_works() {
 		let child_info = ChildInfo::new_default(b"sub1");
 		let child_info = &child_info;
 		// fetch read proof from 'remote' full node
 		let remote_backend = trie_backend::tests::test_trie();
-		let remote_root = remote_backend.storage_root(::std::iter::empty()).0;
+		let remote_root = remote_backend.storage_root(std::iter::empty()).0;
 		let remote_proof = prove_read(remote_backend, &[b"value2"]).unwrap();
+		let remote_proof = test_compact(remote_proof, &remote_root);
  		// check proof locally
 		let local_result1 = read_proof_check::<BlakeTwo256, _>(
 			remote_root,
@@ -1429,12 +1437,13 @@ mod tests {
 		assert_eq!(local_result2, false);
 		// on child trie
 		let remote_backend = trie_backend::tests::test_trie();
-		let remote_root = remote_backend.storage_root(::std::iter::empty()).0;
+		let remote_root = remote_backend.storage_root(std::iter::empty()).0;
 		let remote_proof = prove_child_read(
 			remote_backend,
 			child_info,
 			&[b"value3"],
 		).unwrap();
+		let remote_proof = test_compact(remote_proof, &remote_root);
 		let local_result1 = read_child_proof_check::<BlakeTwo256, _>(
 			remote_root,
 			remote_proof.clone(),
@@ -1457,6 +1466,50 @@ mod tests {
 		);
 	}
 
+	#[test]
+	fn compact_multiple_child_trie() {
+		// this root will be queried
+		let child_info1 = ChildInfo::new_default(b"sub1");
+		// this root will not be include in proof
+		let child_info2 = ChildInfo::new_default(b"sub2");
+		// this root will be include in proof
+		let child_info3 = ChildInfo::new_default(b"sub");
+		let mut remote_backend = trie_backend::tests::test_trie();
+		let (remote_root, transaction) = remote_backend.full_storage_root(
+			std::iter::empty(),
+			vec![
+				(&child_info1, vec![
+					(&b"key1"[..], Some(&b"val2"[..])),
+					(&b"key2"[..], Some(&b"val3"[..])),
+				].into_iter()),
+				(&child_info2, vec![
+					(&b"key3"[..], Some(&b"val4"[..])),
+					(&b"key4"[..], Some(&b"val5"[..])),
+				].into_iter()),
+				(&child_info3, vec![
+					(&b"key5"[..], Some(&b"val6"[..])),
+					(&b"key6"[..], Some(&b"val7"[..])),
+				].into_iter()),
+			].into_iter(),
+		);
+		remote_backend.backend_storage_mut().consolidate(transaction);
+		remote_backend.essence.set_root(remote_root.clone());
+		let remote_proof = prove_child_read(
+			remote_backend,
+			&child_info1,
+			&[b"key1"],
+		).unwrap();
+		let remote_proof = test_compact(remote_proof, &remote_root);
+		let local_result1 = read_child_proof_check::<BlakeTwo256, _>(
+			remote_root,
+			remote_proof.clone(),
+			&child_info1,
+			&[b"key1"],
+		).unwrap();
+		assert_eq!(local_result1.len(), 1);
+		assert_eq!(local_result1.get(&b"key1"[..]), Some(&Some(b"val2".to_vec())));
+	}
+
 	#[test]
 	fn child_storage_uuid() {
 
diff --git a/primitives/trie/Cargo.toml b/primitives/trie/Cargo.toml
index 4396550a48a8..9584ae678d40 100644
--- a/primitives/trie/Cargo.toml
+++ b/primitives/trie/Cargo.toml
@@ -21,7 +21,7 @@ harness = false
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 sp-std = { version = "3.0.0", default-features = false, path = "../std" }
 hash-db = { version = "0.15.2", default-features = false }
-trie-db = { version = "0.22.2", default-features = false }
+trie-db = { version = "0.22.3", default-features = false }
 trie-root = { version = "0.16.0", default-features = false }
 memory-db = { version = "0.26.0", default-features = false }
 sp-core = { version = "3.0.0", default-features = false, path = "../core" }
diff --git a/primitives/trie/src/error.rs b/primitives/trie/src/error.rs
index 8e1d9b974ffd..bdaa49b1156f 100644
--- a/primitives/trie/src/error.rs
+++ b/primitives/trie/src/error.rs
@@ -26,7 +26,7 @@ pub enum Error {
 	/// Bad format.
 	BadFormat,
 	/// Decoding error.
-	Decode(codec::Error)
+	Decode(codec::Error),
 }
 
 impl From<codec::Error> for Error {
diff --git a/primitives/trie/src/lib.rs b/primitives/trie/src/lib.rs
index 572283f1c027..89bef715ba99 100644
--- a/primitives/trie/src/lib.rs
+++ b/primitives/trie/src/lib.rs
@@ -23,6 +23,7 @@ mod error;
 mod node_header;
 mod node_codec;
 mod storage_proof;
+mod trie_codec;
 mod trie_stream;
 
 use sp_std::{boxed::Box, marker::PhantomData, vec::Vec, borrow::Borrow};
@@ -35,7 +36,7 @@ pub use error::Error;
 pub use trie_stream::TrieStream;
 /// The Substrate format implementation of `NodeCodec`.
 pub use node_codec::NodeCodec;
-pub use storage_proof::StorageProof;
+pub use storage_proof::{StorageProof, CompactProof};
 /// Various re-exports from the `trie-db` crate.
 pub use trie_db::{
 	Trie, TrieMut, DBValue, Recorder, CError, Query, TrieLayout, TrieConfiguration, nibble_ops, TrieDBIterator,
@@ -45,6 +46,9 @@ pub use memory_db::KeyFunction;
 pub use memory_db::prefixed_key;
 /// Various re-exports from the `hash-db` crate.
 pub use hash_db::{HashDB as HashDBT, EMPTY_PREFIX};
+/// Trie codec reexport, mainly child trie support
+/// for trie compact proof.
+pub use trie_codec::{decode_compact, encode_compact, Error as CompactProofError};
 
 #[derive(Default)]
 /// substrate trie layout
diff --git a/primitives/trie/src/storage_proof.rs b/primitives/trie/src/storage_proof.rs
index d8394a89de52..03668920509b 100644
--- a/primitives/trie/src/storage_proof.rs
+++ b/primitives/trie/src/storage_proof.rs
@@ -31,6 +31,12 @@ pub struct StorageProof {
 	trie_nodes: Vec<Vec<u8>>,
 }
 
+/// Storage proof in compact form.
+#[derive(Debug, PartialEq, Eq, Clone, Encode, Decode)]
+pub struct CompactProof {
+	pub encoded_nodes: Vec<Vec<u8>>,
+}
+
 impl StorageProof {
 	/// Constructs a storage proof from a subset of encoded trie nodes in a storage backend.
 	pub fn new(trie_nodes: Vec<Vec<u8>>) -> Self {
@@ -79,6 +85,56 @@ impl StorageProof {
 
 		Self { trie_nodes }
 	}
+
+	/// Encode as a compact proof with default
+	/// trie layout.
+	pub fn into_compact_proof<H: Hasher>(
+		self,
+		root: H::Out,
+	) -> Result<CompactProof, crate::CompactProofError<crate::Layout<H>>> {
+		crate::encode_compact::<crate::Layout<H>>(self, root)
+	}
+	
+	/// Returns the estimated encoded size of the compact proof.
+	///
+	/// Runing this operation is a slow operation (build the whole compact proof) and should only be
+	/// in non sensitive path.
+	/// Return `None` on error.
+	pub fn encoded_compact_size<H: Hasher>(self, root: H::Out) -> Option<usize> {
+		let compact_proof = self.into_compact_proof::<H>(root);
+		compact_proof.ok().map(|p| p.encoded_size())
+	}
+
+}
+
+impl CompactProof {
+	/// Return an iterator on the compact encoded nodes.
+	pub fn iter_compact_encoded_nodes(&self) -> impl Iterator<Item = &[u8]> {
+		self.encoded_nodes.iter().map(Vec::as_slice)
+	}
+
+	/// Decode to a full storage_proof.
+	///
+	/// Method use a temporary `HashDB`, and `sp_trie::decode_compact`
+	/// is often better.
+	pub fn to_storage_proof<H: Hasher>(
+		&self,
+		expected_root: Option<&H::Out>,
+	) -> Result<(StorageProof, H::Out), crate::CompactProofError<crate::Layout<H>>> {
+		let mut db = crate::MemoryDB::<H>::new(&[]);
+		let root = crate::decode_compact::<crate::Layout<H>, _, _>(
+			&mut db,
+			self.iter_compact_encoded_nodes(),
+			expected_root,
+		)?;
+		Ok((StorageProof::new(db.drain().into_iter().filter_map(|kv|
+			if (kv.1).1 > 0 {
+				Some((kv.1).0)
+			} else {
+				None
+			}
+		).collect()), root))
+	}
 }
 
 /// An iterator over trie nodes constructed from a storage proof. The nodes are not guaranteed to
diff --git a/primitives/trie/src/trie_codec.rs b/primitives/trie/src/trie_codec.rs
new file mode 100644
index 000000000000..efe3223580f3
--- /dev/null
+++ b/primitives/trie/src/trie_codec.rs
@@ -0,0 +1,259 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Compact proof support.
+//!
+//! This uses compact proof from trie crate and extends
+//! it to substrate specific layout and child trie system.
+
+use crate::{
+	EMPTY_PREFIX, HashDBT, TrieHash, TrieError, TrieConfiguration,
+	CompactProof, StorageProof,
+};
+use sp_std::boxed::Box;
+use sp_std::vec::Vec;
+use trie_db::Trie;
+#[cfg(feature="std")]
+use std::fmt;
+#[cfg(feature="std")]
+use std::error::Error as StdError;
+
+
+/// Error for trie node decoding.
+pub enum Error<L: TrieConfiguration> {
+	/// Verification failed due to root mismatch.
+	RootMismatch(TrieHash<L>, TrieHash<L>),
+	/// Missing nodes in proof.
+	IncompleteProof,
+	/// Compact node is not needed.
+	ExtraneousChildNode,
+	/// Child content with root not in proof.
+	ExtraneousChildProof(TrieHash<L>),
+	/// Bad child trie root.
+	InvalidChildRoot(Vec<u8>, Vec<u8>),
+	/// Errors from trie crate.
+	TrieError(Box<TrieError<L>>),
+}
+
+impl<L: TrieConfiguration> From<Box<TrieError<L>>> for Error<L> {
+	fn from(error: Box<TrieError<L>>) -> Self {
+		Error::TrieError(error)
+	}
+}
+
+#[cfg(feature="std")]
+impl<L: TrieConfiguration> StdError for Error<L> {
+	fn description(&self) -> &str {
+		match self {
+			Error::InvalidChildRoot(..) => "Invalid child root error",
+			Error::TrieError(..) => "Trie db error",
+			Error::RootMismatch(..) => "Trie db error",
+			Error::IncompleteProof => "Incomplete proof",
+			Error::ExtraneousChildNode => "Extraneous child node",
+			Error::ExtraneousChildProof(..) => "Extraneous child proof",
+		}
+	}
+}
+
+#[cfg(feature="std")]
+impl<L: TrieConfiguration> fmt::Debug for Error<L> {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+		<Self as fmt::Display>::fmt(&self, f)
+	}
+}
+
+#[cfg(feature="std")]
+impl<L: TrieConfiguration> fmt::Display for Error<L> {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+		match self {
+			Error::InvalidChildRoot(k, v) => write!(f, "InvalidChildRoot at {:x?}: {:x?}", k, v),
+			Error::TrieError(e) => write!(f, "Trie error: {}", e),
+			Error::IncompleteProof => write!(f, "Incomplete proof"),
+			Error::ExtraneousChildNode => write!(f, "Child node content with no root in proof"),
+			Error::ExtraneousChildProof(root) => write!(f, "Proof of child trie {:x?} not in parent proof", root.as_ref()),
+			Error::RootMismatch(root, expected) => write!(
+				f,
+				"Verification error, root is {:x?}, expected: {:x?}",
+				root.as_ref(),
+				expected.as_ref(),
+			),
+		}
+	}
+}
+
+/// Decode a compact proof.
+///
+/// Takes as input a destination `db` for decoded node and `encoded`
+/// an iterator of compact encoded nodes.
+///
+/// Child trie are decoded in order of child trie root present
+/// in the top trie.
+pub fn decode_compact<'a, L, DB, I>(
+	db: &mut DB,
+	encoded: I,
+	expected_root: Option<&TrieHash<L>>,
+) -> Result<TrieHash<L>, Error<L>>
+	where
+		L: TrieConfiguration,
+		DB: HashDBT<L::Hash, trie_db::DBValue> + hash_db::HashDBRef<L::Hash, trie_db::DBValue>,
+		I: IntoIterator<Item = &'a [u8]>,
+{
+	let mut nodes_iter = encoded.into_iter();
+	let (top_root, _nb_used) = trie_db::decode_compact_from_iter::<L, _, _, _>(
+		db,
+		&mut nodes_iter,
+	)?;
+
+	// Only check root if expected root is passed as argument.
+	if let Some(expected_root) = expected_root {
+		if expected_root != &top_root {
+			return Err(Error::RootMismatch(top_root.clone(), expected_root.clone()));
+		}
+	}
+
+	let mut child_tries = Vec::new();
+	{
+		// fetch child trie roots
+		let trie = crate::TrieDB::<L>::new(db, &top_root)?;
+
+		let mut iter = trie.iter()?;
+
+		let childtrie_roots = sp_core::storage::well_known_keys::DEFAULT_CHILD_STORAGE_KEY_PREFIX;
+		if iter.seek(childtrie_roots).is_ok() {
+			loop {
+				match iter.next() {
+					Some(Ok((key, value))) if key.starts_with(childtrie_roots) => {
+						// we expect all default child trie root to be correctly encoded.
+						// see other child trie functions.
+						let mut root = TrieHash::<L>::default();
+						// still in a proof so prevent panic
+						if root.as_mut().len() != value.as_slice().len() {
+							return Err(Error::InvalidChildRoot(key, value));
+						}
+						root.as_mut().copy_from_slice(value.as_ref());
+						child_tries.push(root);
+					},
+					// allow incomplete database error: we only
+					// require access to data in the proof.
+					Some(Err(error)) => match *error {
+						trie_db::TrieError::IncompleteDatabase(..) => (),
+						e => return Err(Box::new(e).into()),
+					},
+					_ => break,
+				}
+			}
+		}
+	}
+
+	if !HashDBT::<L::Hash, _>::contains(db, &top_root, EMPTY_PREFIX) {
+		return Err(Error::IncompleteProof);
+	}
+
+	let mut previous_extracted_child_trie = None;
+	for child_root in child_tries.into_iter() {
+		if previous_extracted_child_trie.is_none() {
+			let (top_root, _) = trie_db::decode_compact_from_iter::<L, _, _, _>(
+				db,
+				&mut nodes_iter,
+			)?;
+			previous_extracted_child_trie = Some(top_root);
+		}
+
+		// we do not early exit on root mismatch but try the
+		// other read from proof (some child root may be
+		// in proof without actual child content).
+		if Some(child_root) == previous_extracted_child_trie {
+			previous_extracted_child_trie = None;
+		}
+	}
+
+	if let Some(child_root) = previous_extracted_child_trie {
+		// A child root was read from proof but is not present
+		// in top trie.
+		return Err(Error::ExtraneousChildProof(child_root));
+	}
+
+	if nodes_iter.next().is_some() {
+		return Err(Error::ExtraneousChildNode);
+	}
+
+	Ok(top_root)
+}
+
+/// Encode a compact proof.
+///
+/// Takes as input all full encoded node from the proof, and
+/// the root.
+/// Then parse all child trie root and compress main trie content first
+/// then all child trie contents.
+/// Child trie are ordered by the order of their roots in the top trie.
+pub fn encode_compact<L>(
+	proof: StorageProof,
+	root: TrieHash<L>,
+) -> Result<CompactProof, Error<L>>
+	where
+		L: TrieConfiguration,
+{
+	let mut child_tries = Vec::new();
+	let partial_db = proof.into_memory_db();
+	let mut compact_proof = {
+		let trie = crate::TrieDB::<L>::new(&partial_db, &root)?;
+
+		let mut iter = trie.iter()?;
+
+		let childtrie_roots = sp_core::storage::well_known_keys::DEFAULT_CHILD_STORAGE_KEY_PREFIX;
+		if iter.seek(childtrie_roots).is_ok() {
+			loop {
+				match iter.next() {
+					Some(Ok((key, value))) if key.starts_with(childtrie_roots) => {
+						let mut root = TrieHash::<L>::default();
+						if root.as_mut().len() != value.as_slice().len() {
+							// some child trie root in top trie are not an encoded hash.
+							return Err(Error::InvalidChildRoot(key.to_vec(), value.to_vec()));
+						}
+						root.as_mut().copy_from_slice(value.as_ref());
+						child_tries.push(root);
+					},
+					// allow incomplete database error: we only
+					// require access to data in the proof.
+					Some(Err(error)) => match *error {
+						trie_db::TrieError::IncompleteDatabase(..) => (),
+						e => return Err(Box::new(e).into()),
+					},
+					_ => break,
+				}
+			}
+		}
+
+		trie_db::encode_compact::<L>(&trie)?
+	};
+
+	for child_root in child_tries {
+		if !HashDBT::<L::Hash, _>::contains(&partial_db, &child_root, EMPTY_PREFIX) {
+			// child proof are allowed to be missing (unused root can be included
+			// due to trie structure modification).
+			continue;
+		}
+
+		let trie = crate::TrieDB::<L>::new(&partial_db, &child_root)?;
+		let child_proof = trie_db::encode_compact::<L>(&trie)?;
+
+		compact_proof.extend(child_proof);
+	}
+
+	Ok(CompactProof { encoded_nodes: compact_proof })
+}
diff --git a/utils/wasm-builder/src/wasm_project.rs b/utils/wasm-builder/src/wasm_project.rs
index 58161f53113f..466c2145e6ce 100644
--- a/utils/wasm-builder/src/wasm_project.rs
+++ b/utils/wasm-builder/src/wasm_project.rs
@@ -232,7 +232,8 @@ fn create_project_cargo_toml(
 	wasm_workspace_toml.insert("profile".into(), profile.into());
 
 	// Add patch section from the project root `Cargo.toml`
-	if let Some(mut patch) = workspace_toml.remove("patch").and_then(|p| p.try_into::<Table>().ok()) {
+	while let Some(mut patch) = workspace_toml.remove("patch")
+		.and_then(|p| p.try_into::<Table>().ok()) {
 		// Iterate over all patches and make the patch path absolute from the workspace root path.
 		patch.iter_mut()
 			.filter_map(|p|

From 1fa8cf7cf9dbfe1b093b3e7e116dc3435c7f3f7b Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Mon, 7 Jun 2021 11:26:31 +0200
Subject: [PATCH 0840/1194] Don't inlucde nominaotrs that back no one in the
 snapshot. (#9017)

---
 frame/staking/src/lib.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 67726f69228f..c8011faef151 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -2518,8 +2518,10 @@ impl<T: Config> Module<T> {
 					.map_or(true, |spans| submitted_in >= spans.last_nonzero_slash())
 			});
 
-			let vote_weight = weight_of(&nominator);
-			all_voters.push((nominator, vote_weight, targets))
+			if !targets.is_empty() {
+				let vote_weight = weight_of(&nominator);
+				all_voters.push((nominator, vote_weight, targets))
+			}
 		}
 
 		all_voters

From 5d89967d7cc12d620bda9c9c042dbf7fcc4beb89 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Mon, 7 Jun 2021 15:00:03 +0200
Subject: [PATCH 0841/1194] Periodically call `Peerset::alloc_slots` on all
 sets (#9025)

* Periodically call alloc_slots on all slots

* Add test
---
 client/peerset/src/lib.rs | 55 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

diff --git a/client/peerset/src/lib.rs b/client/peerset/src/lib.rs
index eefab81b851d..19260afccb80 100644
--- a/client/peerset/src/lib.rs
+++ b/client/peerset/src/lib.rs
@@ -39,7 +39,7 @@ use futures::prelude::*;
 use log::{debug, error, trace};
 use serde_json::json;
 use std::{collections::HashMap, pin::Pin, task::{Context, Poll}, time::Duration};
-use wasm_timer::Instant;
+use wasm_timer::{Delay, Instant};
 use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedSender, TracingUnboundedReceiver};
 
 pub use libp2p::PeerId;
@@ -252,6 +252,9 @@ pub struct Peerset {
 	created: Instant,
 	/// Last time when we updated the reputations of connected nodes.
 	latest_time_update: Instant,
+	/// Next time to do a periodic call to `alloc_slots` with all sets. This is done once per
+	/// second, to match the period of the reputation updates.
+	next_periodic_alloc_slots: Delay,
 }
 
 impl Peerset {
@@ -279,6 +282,7 @@ impl Peerset {
 				message_queue: VecDeque::new(),
 				created: now,
 				latest_time_update: now,
+				next_periodic_alloc_slots: Delay::new(Duration::new(0, 0)),
 			}
 		};
 
@@ -699,6 +703,14 @@ impl Stream for Peerset {
 				return Poll::Ready(Some(message));
 			}
 
+			if let Poll::Ready(_) = Future::poll(Pin::new(&mut self.next_periodic_alloc_slots), cx) {
+				self.next_periodic_alloc_slots = Delay::new(Duration::new(1, 0));
+
+				for set_index in 0..self.data.num_sets() {
+					self.alloc_slots(SetId(set_index));
+				}
+			}
+
 			let action = match Stream::poll_next(Pin::new(&mut self.rx), cx) {
 				Poll::Pending => return Poll::Pending,
 				Poll::Ready(Some(event)) => event,
@@ -907,4 +919,45 @@ mod tests {
 
 		futures::executor::block_on(fut);
 	}
+
+	#[test]
+	fn test_relloc_after_banned() {
+		let (mut peerset, handle) = Peerset::from_config(PeersetConfig {
+			sets: vec![SetConfig {
+				in_peers: 25,
+				out_peers: 25,
+				bootnodes: vec![],
+				reserved_nodes: Default::default(),
+				reserved_only: false,
+			}],
+		});
+
+		// We ban a node by setting its reputation under the threshold.
+		let peer_id = PeerId::random();
+		handle.report_peer(peer_id.clone(), ReputationChange::new(BANNED_THRESHOLD - 1, ""));
+
+		let fut = futures::future::poll_fn(move |cx| {
+			// We need one polling for the message to be processed.
+			assert_eq!(Stream::poll_next(Pin::new(&mut peerset), cx), Poll::Pending);
+
+			// Check that an incoming connection from that node gets refused.
+			// This is already tested in other tests, but it is done again here because it doesn't
+			// hurt.
+			peerset.incoming(SetId::from(0), peer_id.clone(), IncomingIndex(1));
+			if let Poll::Ready(msg) = Stream::poll_next(Pin::new(&mut peerset), cx) {
+				assert_eq!(msg.unwrap(), Message::Reject(IncomingIndex(1)));
+			} else {
+				panic!()
+			}
+
+			// Wait for the peerset to change its mind and actually connect to it.
+			while let Poll::Ready(msg) = Stream::poll_next(Pin::new(&mut peerset), cx) {
+				assert_eq!(msg.unwrap(), Message::Connect { set_id: SetId::from(0), peer_id });
+			}
+
+			Poll::Ready(())
+		});
+
+		futures::executor::block_on(fut);
+	}
 }

From fa26ce6b4b59710cb402d76b9c4577c93d2f65d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Mon, 7 Jun 2021 19:40:23 +0200
Subject: [PATCH 0842/1194] contracts: Add new `seal_call` that offers new
 features (#8909)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add new `seal_call` that offers new features

* Fix doc typo

Co-authored-by: Michael Müller <michi@parity.io>

* Fix doc typos

Co-authored-by: Michael Müller <michi@parity.io>

* Fix comment on assert

* Update CHANGELOG.md

Co-authored-by: Michael Müller <michi@parity.io>
---
 Cargo.lock                          |   1 +
 frame/contracts/CHANGELOG.md        |   3 +
 frame/contracts/Cargo.toml          |   1 +
 frame/contracts/src/exec.rs         | 162 +++++++++++++++++----
 frame/contracts/src/lib.rs          |  13 +-
 frame/contracts/src/wasm/mod.rs     | 214 ++++++++++++++++++++++++++--
 frame/contracts/src/wasm/runtime.rs | 180 +++++++++++++++++++----
 7 files changed, 503 insertions(+), 71 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 62056dd99b2e..8a25ba6c7a48 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4838,6 +4838,7 @@ name = "pallet-contracts"
 version = "3.0.0"
 dependencies = [
  "assert_matches",
+ "bitflags",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
diff --git a/frame/contracts/CHANGELOG.md b/frame/contracts/CHANGELOG.md
index 76fc09ad1735..dd679f432d31 100644
--- a/frame/contracts/CHANGELOG.md
+++ b/frame/contracts/CHANGELOG.md
@@ -20,6 +20,9 @@ In other words: Upgrading this pallet will not break pre-existing contracts.
 
 ### Added
 
+- New **unstable** version of `seal_call` that offers more features.
+[#8909](https://github.com/paritytech/substrate/pull/8909)
+
 - New **unstable** `seal_rent_params` and `seal_rent_status` contract callable function.
 [#8231](https://github.com/paritytech/substrate/pull/8231)
 [#8780](https://github.com/paritytech/substrate/pull/8780)
diff --git a/frame/contracts/Cargo.toml b/frame/contracts/Cargo.toml
index 71a45a9dfa6b..9d344fb6866d 100644
--- a/frame/contracts/Cargo.toml
+++ b/frame/contracts/Cargo.toml
@@ -13,6 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+bitflags = "1.0"
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 log = { version = "0.4", default-features = false }
 pwasm-utils = { version = "0.18", default-features = false }
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index d5b489d8912e..f3a981347c98 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -167,6 +167,7 @@ pub trait Ext: sealing::Sealed {
 		to: AccountIdOf<Self::T>,
 		value: BalanceOf<Self::T>,
 		input_data: Vec<u8>,
+		allows_reentry: bool,
 	) -> Result<(ExecReturnValue, u32), (ExecError, u32)>;
 
 	/// Instantiate a contract from the given code.
@@ -457,6 +458,8 @@ pub struct Frame<T: Config> {
 	entry_point: ExportedFunction,
 	/// The gas meter capped to the supplied gas limit.
 	nested_meter: GasMeter<T>,
+	/// If `false` the contract enabled its defense against reentrance attacks.
+	allows_reentry: bool,
 }
 
 /// Parameter passed in when creating a new `Frame`.
@@ -731,6 +734,7 @@ where
 			entry_point,
 			nested_meter: gas_meter.nested(gas_limit)
 				.map_err(|e| (e.into(), executable.code_len()))?,
+			allows_reentry: true,
 		};
 
 		Ok((frame, executable))
@@ -1014,6 +1018,11 @@ where
 		self.frames().skip(1).any(|f| &f.account_id == account_id)
 	}
 
+	/// Returns whether the specified contract allows to be reentered right now.
+	fn allows_reentry(&self, id: &AccountIdOf<T>) -> bool {
+		!self.frames().any(|f| &f.account_id == id && !f.allows_reentry)
+	}
+
 	/// Increments the cached account id and returns the value to be used for the trie_id.
 	fn next_trie_seed(&mut self) -> u64 {
 		let next = if let Some(current) = self.account_counter {
@@ -1045,25 +1054,44 @@ where
 		to: T::AccountId,
 		value: BalanceOf<T>,
 		input_data: Vec<u8>,
+		allows_reentry: bool,
 	) -> Result<(ExecReturnValue, u32), (ExecError, u32)> {
-		// We ignore instantiate frames in our search for a cached contract.
-		// Otherwise it would be possible to recursively call a contract from its own
-		// constructor: We disallow calling not fully constructed contracts.
-		let cached_info = self
-			.frames()
-			.find(|f| f.entry_point == ExportedFunction::Call && f.account_id == to)
-			.and_then(|f| {
-				match &f.contract_info {
-					CachedContract::Cached(contract) => Some(contract.clone()),
-					_ => None,
-				}
-			});
-		let executable = self.push_frame(
-			FrameArgs::Call{dest: to, cached_info},
-			value,
-			gas_limit
-		)?;
-		self.run(executable, input_data)
+		// Before pushing the new frame: Protect the caller contract against reentrancy attacks.
+		// It is important to do this before calling `allows_reentry` so that a direct recursion
+		// is caught by it.
+		self.top_frame_mut().allows_reentry = allows_reentry;
+
+		let try_call = || {
+			if !self.allows_reentry(&to) {
+				return Err((<Error<T>>::ReentranceDenied.into(), 0));
+			}
+			// We ignore instantiate frames in our search for a cached contract.
+			// Otherwise it would be possible to recursively call a contract from its own
+			// constructor: We disallow calling not fully constructed contracts.
+			let cached_info = self
+				.frames()
+				.find(|f| f.entry_point == ExportedFunction::Call && f.account_id == to)
+				.and_then(|f| {
+					match &f.contract_info {
+						CachedContract::Cached(contract) => Some(contract.clone()),
+						_ => None,
+					}
+				});
+			let executable = self.push_frame(
+				FrameArgs::Call{dest: to, cached_info},
+				value,
+				gas_limit
+			)?;
+			self.run(executable, input_data)
+		};
+
+		// We need to make sure to reset `allows_reentry` even on failure.
+		let result = try_call();
+
+		// Protection is on a per call basis.
+		self.top_frame_mut().allows_reentry = true;
+
+		result
 	}
 
 	fn instantiate(
@@ -1097,7 +1125,7 @@ where
 		beneficiary: &AccountIdOf<Self::T>,
 	) -> Result<u32, (DispatchError, u32)> {
 		if self.is_recursive() {
-			return Err((Error::<T>::ReentranceDenied.into(), 0));
+			return Err((Error::<T>::TerminatedWhileReentrant.into(), 0));
 		}
 		let frame = self.top_frame_mut();
 		let info = frame.terminate();
@@ -1125,7 +1153,7 @@ where
 		delta: Vec<StorageKey>,
 	) -> Result<(u32, u32), (DispatchError, u32, u32)> {
 		if self.is_recursive() {
-			return Err((Error::<T>::ReentranceDenied.into(), 0, 0));
+			return Err((Error::<T>::TerminatedWhileReentrant.into(), 0, 0));
 		}
 		let origin_contract = self.top_frame_mut().contract_info().clone();
 		let result = Rent::<T, E>::restore_to(
@@ -1308,12 +1336,14 @@ mod tests {
 		exec::ExportedFunction::*,
 		Error, Weight,
 	};
+	use codec::{Encode, Decode};
 	use sp_core::Bytes;
 	use sp_runtime::DispatchError;
 	use assert_matches::assert_matches;
 	use std::{cell::RefCell, collections::HashMap, rc::Rc};
 	use pretty_assertions::{assert_eq, assert_ne};
 	use pallet_contracts_primitives::ReturnFlags;
+	use frame_support::{assert_ok, assert_err};
 
 	type MockStack<'a> = Stack<'a, Test, MockExecutable>;
 
@@ -1731,7 +1761,7 @@ mod tests {
 		let value = Default::default();
 		let recurse_ch = MockLoader::insert(Call, |ctx, _| {
 			// Try to call into yourself.
-			let r = ctx.ext.call(0, BOB, 0, vec![]);
+			let r = ctx.ext.call(0, BOB, 0, vec![], true);
 
 			REACHED_BOTTOM.with(|reached_bottom| {
 				let mut reached_bottom = reached_bottom.borrow_mut();
@@ -1789,7 +1819,7 @@ mod tests {
 
 			// Call into CHARLIE contract.
 			assert_matches!(
-				ctx.ext.call(0, CHARLIE, 0, vec![]),
+				ctx.ext.call(0, CHARLIE, 0, vec![], true),
 				Ok(_)
 			);
 			exec_success()
@@ -1832,7 +1862,7 @@ mod tests {
 
 			// Call into charlie contract.
 			assert_matches!(
-				ctx.ext.call(0, CHARLIE, 0, vec![]),
+				ctx.ext.call(0, CHARLIE, 0, vec![], true),
 				Ok(_)
 			);
 			exec_success()
@@ -2263,7 +2293,7 @@ mod tests {
 				assert_ne!(original_allowance, changed_allowance);
 				ctx.ext.set_rent_allowance(changed_allowance);
 				assert_eq!(
-					ctx.ext.call(0, CHARLIE, 0, vec![]).map(|v| v.0).map_err(|e| e.0),
+					ctx.ext.call(0, CHARLIE, 0, vec![], true).map(|v| v.0).map_err(|e| e.0),
 					exec_trapped()
 				);
 				assert_eq!(ctx.ext.rent_allowance(), changed_allowance);
@@ -2272,7 +2302,7 @@ mod tests {
 			exec_success()
 		});
 		let code_charlie = MockLoader::insert(Call, |ctx, _| {
-			assert!(ctx.ext.call(0, BOB, 0, vec![99]).is_ok());
+			assert!(ctx.ext.call(0, BOB, 0, vec![99], true).is_ok());
 			exec_trapped()
 		});
 
@@ -2299,7 +2329,7 @@ mod tests {
 	fn recursive_call_during_constructor_fails() {
 		let code = MockLoader::insert(Constructor, |ctx, _| {
 			assert_matches!(
-				ctx.ext.call(0, ctx.ext.address().clone(), 0, vec![]),
+				ctx.ext.call(0, ctx.ext.address().clone(), 0, vec![], true),
 				Err((ExecError{error, ..}, _)) if error == <Error<Test>>::ContractNotFound.into()
 			);
 			exec_success()
@@ -2390,4 +2420,84 @@ mod tests {
 
 		assert_eq!(&String::from_utf8(debug_buffer).unwrap(), "This is a testMore text");
 	}
+
+	#[test]
+	fn call_reentry_direct_recursion() {
+		// call the contract passed as input with disabled reentry
+		let code_bob = MockLoader::insert(Call, |ctx, _| {
+			let dest = Decode::decode(&mut ctx.input_data.as_ref()).unwrap();
+			ctx.ext.call(0, dest, 0, vec![], false).map(|v| v.0).map_err(|e| e.0)
+		});
+
+		let code_charlie = MockLoader::insert(Call, |_, _| {
+			exec_success()
+		});
+
+		ExtBuilder::default().build().execute_with(|| {
+			let schedule = <Test as Config>::Schedule::get();
+			place_contract(&BOB, code_bob);
+			place_contract(&CHARLIE, code_charlie);
+
+			// Calling another contract should succeed
+			assert_ok!(MockStack::run_call(
+				ALICE,
+				BOB,
+				&mut GasMeter::<Test>::new(GAS_LIMIT),
+				&schedule,
+				0,
+				CHARLIE.encode(),
+				None,
+			));
+
+			// Calling into oneself fails
+			assert_err!(
+				MockStack::run_call(
+					ALICE,
+					BOB,
+					&mut GasMeter::<Test>::new(GAS_LIMIT),
+					&schedule,
+					0,
+					BOB.encode(),
+					None,
+				).map_err(|e| e.0.error),
+				<Error<Test>>::ReentranceDenied,
+			);
+		});
+	}
+
+	#[test]
+	fn call_deny_reentry() {
+		let code_bob = MockLoader::insert(Call, |ctx, _| {
+			if ctx.input_data[0] == 0 {
+				ctx.ext.call(0, CHARLIE, 0, vec![], false).map(|v| v.0).map_err(|e| e.0)
+			} else {
+				exec_success()
+			}
+		});
+
+		// call BOB with input set to '1'
+		let code_charlie = MockLoader::insert(Call, |ctx, _| {
+			ctx.ext.call(0, BOB, 0, vec![1], true).map(|v| v.0).map_err(|e| e.0)
+		});
+
+		ExtBuilder::default().build().execute_with(|| {
+			let schedule = <Test as Config>::Schedule::get();
+			place_contract(&BOB, code_bob);
+			place_contract(&CHARLIE, code_charlie);
+
+			// BOB -> CHARLIE -> BOB fails as BOB denies reentry.
+			assert_err!(
+				MockStack::run_call(
+					ALICE,
+					BOB,
+					&mut GasMeter::<Test>::new(GAS_LIMIT),
+					&schedule,
+					0,
+					vec![0],
+					None,
+				).map_err(|e| e.0.error),
+				<Error<Test>>::ReentranceDenied,
+			);
+		});
+	}
 }
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index fb4239adb24c..f7dec843a7f7 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -562,12 +562,11 @@ pub mod pallet {
 		ContractTrapped,
 		/// The size defined in `T::MaxValueSize` was exceeded.
 		ValueTooLarge,
-		/// The action performed is not allowed while the contract performing it is already
-		/// on the call stack. Those actions are contract self destruction and restoration
-		/// of a tombstone.
-		ReentranceDenied,
-		/// `seal_input` was called twice from the same contract execution context.
-		InputAlreadyRead,
+		/// Termination of a contract is not allowed while the contract is already
+		/// on the call stack. Can be triggered by `seal_terminate` or `seal_restore_to.
+		TerminatedWhileReentrant,
+		/// `seal_call` forwarded this contracts input. It therefore is no longer available.
+		InputForwarded,
 		/// The subject passed to `seal_random` exceeds the limit.
 		RandomSubjectTooLong,
 		/// The amount of topics passed to `seal_deposit_events` exceeds the limit.
@@ -602,6 +601,8 @@ pub mod pallet {
 		TerminatedInConstructor,
 		/// The debug message specified to `seal_debug_message` does contain invalid UTF-8.
 		DebugMessageInvalidUTF8,
+		/// A call tried to invoke a contract that is flagged as non-reentrant.
+		ReentranceDenied,
 	}
 
 	/// A mapping from an original code hash to the original code, untouched by instrumentation.
diff --git a/frame/contracts/src/wasm/mod.rs b/frame/contracts/src/wasm/mod.rs
index ed603732f6c0..5f9936c68dfb 100644
--- a/frame/contracts/src/wasm/mod.rs
+++ b/frame/contracts/src/wasm/mod.rs
@@ -289,7 +289,14 @@ mod tests {
 	struct TransferEntry {
 		to: AccountIdOf<Test>,
 		value: u64,
+	}
+
+	#[derive(Debug, PartialEq, Eq)]
+	struct CallEntry {
+		to: AccountIdOf<Test>,
+		value: u64,
 		data: Vec<u8>,
+		allows_reentry: bool,
 	}
 
 	pub struct MockExt {
@@ -297,6 +304,7 @@ mod tests {
 		rent_allowance: u64,
 		instantiates: Vec<InstantiateEntry>,
 		terminations: Vec<TerminationEntry>,
+		calls: Vec<CallEntry>,
 		transfers: Vec<TransferEntry>,
 		restores: Vec<RestoreEntry>,
 		// (topics, data)
@@ -307,6 +315,11 @@ mod tests {
 		debug_buffer: Vec<u8>,
 	}
 
+	/// The call is mocked and just returns this hardcoded value.
+	fn call_return_data() -> Bytes {
+		Bytes(vec![0xDE, 0xAD, 0xBE, 0xEF])
+	}
+
 	impl Default for MockExt {
 		fn default() -> Self {
 			Self {
@@ -314,6 +327,7 @@ mod tests {
 				rent_allowance: Default::default(),
 				instantiates: Default::default(),
 				terminations: Default::default(),
+				calls: Default::default(),
 				transfers: Default::default(),
 				restores: Default::default(),
 				events: Default::default(),
@@ -334,13 +348,15 @@ mod tests {
 			to: AccountIdOf<Self::T>,
 			value: u64,
 			data: Vec<u8>,
+			allows_reentry: bool,
 		) -> Result<(ExecReturnValue, u32), (ExecError, u32)> {
-			self.transfers.push(TransferEntry {
+			self.calls.push(CallEntry {
 				to,
 				value,
-				data: data,
+				data,
+				allows_reentry,
 			});
-			Ok((ExecReturnValue { flags: ReturnFlags::empty(), data: Bytes(Vec::new()) }, 0))
+			Ok((ExecReturnValue { flags: ReturnFlags::empty(), data: call_return_data() }, 0))
 		}
 		fn instantiate(
 			&mut self,
@@ -374,7 +390,6 @@ mod tests {
 			self.transfers.push(TransferEntry {
 				to: to.clone(),
 				value,
-				data: Vec::new(),
 			});
 			Ok(())
 		}
@@ -526,7 +541,6 @@ mod tests {
 			&[TransferEntry {
 				to: ALICE,
 				value: 153,
-				data: Vec::new(),
 			}]
 		);
 	}
@@ -587,11 +601,192 @@ mod tests {
 		));
 
 		assert_eq!(
-			&mock_ext.transfers,
-			&[TransferEntry {
+			&mock_ext.calls,
+			&[CallEntry {
 				to: ALICE,
 				value: 6,
 				data: vec![1, 2, 3, 4],
+				allows_reentry: true,
+			}]
+		);
+	}
+
+	#[test]
+	#[cfg(feature = "unstable-interface")]
+	fn contract_call_forward_input() {
+		const CODE: &str = r#"
+(module
+	(import "__unstable__" "seal_call" (func $seal_call (param i32 i32 i32 i64 i32 i32 i32 i32 i32 i32) (result i32)))
+	(import "seal0" "seal_input" (func $seal_input (param i32 i32)))
+	(import "env" "memory" (memory 1 1))
+	(func (export "call")
+		(drop
+			(call $seal_call
+				(i32.const 1) ;; Set FORWARD_INPUT bit
+				(i32.const 4)  ;; Pointer to "callee" address.
+				(i32.const 32)  ;; Length of "callee" address.
+				(i64.const 0)  ;; How much gas to devote for the execution. 0 = all.
+				(i32.const 36) ;; Pointer to the buffer with value to transfer
+				(i32.const 8)  ;; Length of the buffer with value to transfer.
+				(i32.const 44) ;; Pointer to input data buffer address
+				(i32.const 4)  ;; Length of input data buffer
+				(i32.const 4294967295) ;; u32 max value is the sentinel value: do not copy output
+				(i32.const 0) ;; Length is ignored in this case
+			)
+		)
+
+		;; triggers a trap because we already forwarded the input
+		(call $seal_input (i32.const 1) (i32.const 44))
+	)
+
+	(func (export "deploy"))
+
+	;; Destination AccountId (ALICE)
+	(data (i32.const 4)
+		"\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01"
+		"\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01"
+	)
+
+	;; Amount of value to transfer.
+	;; Represented by u64 (8 bytes long) in little endian.
+	(data (i32.const 36) "\2A\00\00\00\00\00\00\00")
+
+	;; The input is ignored because we forward our own input
+	(data (i32.const 44) "\01\02\03\04")
+)
+"#;
+		let mut mock_ext = MockExt::default();
+		let input = vec![0xff, 0x2a, 0x99, 0x88];
+		frame_support::assert_err!(
+			execute(CODE, input.clone(), &mut mock_ext),
+			<Error<Test>>::InputForwarded,
+		);
+
+		assert_eq!(
+			&mock_ext.calls,
+			&[CallEntry {
+				to: ALICE,
+				value: 0x2a,
+				data: input,
+				allows_reentry: false,
+			}]
+		);
+	}
+
+	#[test]
+	#[cfg(feature = "unstable-interface")]
+	fn contract_call_clone_input() {
+		const CODE: &str = r#"
+(module
+	(import "__unstable__" "seal_call" (func $seal_call (param i32 i32 i32 i64 i32 i32 i32 i32 i32 i32) (result i32)))
+	(import "seal0" "seal_input" (func $seal_input (param i32 i32)))
+	(import "seal0" "seal_return" (func $seal_return (param i32 i32 i32)))
+	(import "env" "memory" (memory 1 1))
+	(func (export "call")
+		(drop
+			(call $seal_call
+				(i32.const 11) ;; Set FORWARD_INPUT | CLONE_INPUT | ALLOW_REENTRY bits
+				(i32.const 4)  ;; Pointer to "callee" address.
+				(i32.const 32)  ;; Length of "callee" address.
+				(i64.const 0)  ;; How much gas to devote for the execution. 0 = all.
+				(i32.const 36) ;; Pointer to the buffer with value to transfer
+				(i32.const 8)  ;; Length of the buffer with value to transfer.
+				(i32.const 44) ;; Pointer to input data buffer address
+				(i32.const 4)  ;; Length of input data buffer
+				(i32.const 4294967295) ;; u32 max value is the sentinel value: do not copy output
+				(i32.const 0) ;; Length is ignored in this case
+			)
+		)
+
+		;; works because the input was cloned
+		(call $seal_input (i32.const 0) (i32.const 44))
+
+		;; return the input to caller for inspection
+		(call $seal_return (i32.const 0) (i32.const 0) (i32.load (i32.const 44)))
+	)
+
+	(func (export "deploy"))
+
+	;; Destination AccountId (ALICE)
+	(data (i32.const 4)
+		"\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01"
+		"\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01"
+	)
+
+	;; Amount of value to transfer.
+	;; Represented by u64 (8 bytes long) in little endian.
+	(data (i32.const 36) "\2A\00\00\00\00\00\00\00")
+
+	;; The input is ignored because we forward our own input
+	(data (i32.const 44) "\01\02\03\04")
+)
+"#;
+		let mut mock_ext = MockExt::default();
+		let input = vec![0xff, 0x2a, 0x99, 0x88];
+		let result = execute(CODE, input.clone(), &mut mock_ext).unwrap();
+		assert_eq!(result.data.0, input);
+		assert_eq!(
+			&mock_ext.calls,
+			&[CallEntry {
+				to: ALICE,
+				value: 0x2a,
+				data: input,
+				allows_reentry: true,
+			}]
+		);
+	}
+
+	#[test]
+	#[cfg(feature = "unstable-interface")]
+	fn contract_call_tail_call() {
+		const CODE: &str = r#"
+(module
+	(import "__unstable__" "seal_call" (func $seal_call (param i32 i32 i32 i64 i32 i32 i32 i32 i32 i32) (result i32)))
+	(import "env" "memory" (memory 1 1))
+	(func (export "call")
+		(drop
+			(call $seal_call
+				(i32.const 5) ;; Set FORWARD_INPUT | TAIL_CALL bit
+				(i32.const 4)  ;; Pointer to "callee" address.
+				(i32.const 32)  ;; Length of "callee" address.
+				(i64.const 0)  ;; How much gas to devote for the execution. 0 = all.
+				(i32.const 36) ;; Pointer to the buffer with value to transfer
+				(i32.const 8)  ;; Length of the buffer with value to transfer.
+				(i32.const 0) ;; Pointer to input data buffer address
+				(i32.const 0)  ;; Length of input data buffer
+				(i32.const 4294967295) ;; u32 max value is the sentinel value: do not copy output
+				(i32.const 0) ;; Length is ignored in this case
+			)
+		)
+
+		;; a tail call never returns
+		(unreachable)
+	)
+
+	(func (export "deploy"))
+
+	;; Destination AccountId (ALICE)
+	(data (i32.const 4)
+		"\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01"
+		"\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01"
+	)
+
+	;; Amount of value to transfer.
+	;; Represented by u64 (8 bytes long) in little endian.
+	(data (i32.const 36) "\2A\00\00\00\00\00\00\00")
+)
+"#;
+		let mut mock_ext = MockExt::default();
+		let input = vec![0xff, 0x2a, 0x99, 0x88];
+		let result = execute(CODE, input.clone(), &mut mock_ext).unwrap();
+		assert_eq!(result.data, call_return_data());
+		assert_eq!(
+			&mock_ext.calls,
+			&[CallEntry {
+				to: ALICE,
+				value: 0x2a,
+				data: input,
+				allows_reentry: false,
 			}]
 		);
 	}
@@ -772,11 +967,12 @@ mod tests {
 		));
 
 		assert_eq!(
-			&mock_ext.transfers,
-			&[TransferEntry {
+			&mock_ext.calls,
+			&[CallEntry {
 				to: ALICE,
 				value: 6,
 				data: vec![1, 2, 3, 4],
+				allows_reentry: true,
 			}]
 		);
 	}
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index 99dcab17cf12..7ca6dfed1581 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -24,6 +24,7 @@ use crate::{
 	wasm::env_def::ConvertibleToWasm,
 	schedule::HostFnWeights,
 };
+use bitflags::bitflags;
 use pwasm_utils::parity_wasm::elements::ValueType;
 use frame_support::{dispatch::DispatchError, ensure, traits::Get, weights::Weight};
 use sp_std::prelude::*;
@@ -318,6 +319,47 @@ where
 	}
 }
 
+bitflags! {
+	/// Flags used to change the behaviour of `seal_call`.
+	struct CallFlags: u32 {
+		/// Forward the input of current function to the callee.
+		///
+		/// Supplied input pointers are ignored when set.
+		///
+		/// # Note
+		///
+		/// A forwarding call will consume the current contracts input. Any attempt to
+		/// access the input after this call returns will lead to [`Error::InputForwarded`].
+		/// It does not matter if this is due to calling `seal_input` or trying another
+		/// forwarding call. Consider using [`Self::CLONE_INPUT`] in order to preserve
+		/// the input.
+		const FORWARD_INPUT = 0b0000_0001;
+		/// Identical to [`Self::FORWARD_INPUT`] but without consuming the input.
+		///
+		/// This adds some additional weight costs to the call.
+		///
+		/// # Note
+		///
+		/// This implies [`Self::FORWARD_INPUT`] and takes precedence when both are set.
+		const CLONE_INPUT = 0b0000_0010;
+		/// Do not return from the call but rather return the result of the callee to the
+		/// callers caller.
+		///
+		/// # Note
+		///
+		/// This makes the current contract completely transparent to its caller by replacing
+		/// this contracts potential output by the callee ones. Any code after `seal_call`
+		/// can be safely considered unreachable.
+		const TAIL_CALL = 0b0000_0100;
+		/// Allow the callee to reenter into the current contract.
+		///
+		/// Without this flag any reentrancy into the current contract that originates from
+		/// the callee (or any of its callees) is denied. This includes the first callee:
+		/// You cannot call into yourself with this flag set.
+		const ALLOW_REENTRY = 0b0000_1000;
+	}
+}
+
 /// This is only appropriate when writing out data of constant size that does not depend on user
 /// input. In this case the costs for this copy was already charged as part of the token at
 /// the beginning of the API entry point.
@@ -402,8 +444,7 @@ where
 			//
 			// Because panics are really undesirable in the runtime code, we treat this as
 			// a trap for now. Eventually, we might want to revisit this.
-			Err(sp_sandbox::Error::Module) =>
-				Err("validation error")?,
+			Err(sp_sandbox::Error::Module) => Err("validation error")?,
 			// Any other kind of a trap should result in a failure.
 			Err(sp_sandbox::Error::Execution) | Err(sp_sandbox::Error::OutOfBounds) =>
 				Err(Error::<E::T>::ContractTrapped)?
@@ -629,6 +670,65 @@ where
 			(err, _) => Self::err_into_return_code(err)
 		}
 	}
+
+	fn call(
+		&mut self,
+		flags: CallFlags,
+		callee_ptr: u32,
+		callee_len: u32,
+		gas: u64,
+		value_ptr: u32,
+		value_len: u32,
+		input_data_ptr: u32,
+		input_data_len: u32,
+		output_ptr: u32,
+		output_len_ptr: u32
+	) -> Result<ReturnCode, TrapReason> {
+		self.charge_gas(RuntimeCosts::CallBase(input_data_len))?;
+		let callee: <<E as Ext>::T as frame_system::Config>::AccountId =
+			self.read_sandbox_memory_as(callee_ptr, callee_len)?;
+		let value: BalanceOf<<E as Ext>::T> = self.read_sandbox_memory_as(value_ptr, value_len)?;
+		let input_data = if flags.contains(CallFlags::CLONE_INPUT) {
+			self.input_data.as_ref().ok_or_else(|| Error::<E::T>::InputForwarded)?.clone()
+		} else if flags.contains(CallFlags::FORWARD_INPUT) {
+			self.input_data.take().ok_or_else(|| Error::<E::T>::InputForwarded)?
+		} else {
+			self.read_sandbox_memory(input_data_ptr, input_data_len)?
+		};
+		if value > 0u32.into() {
+			self.charge_gas(RuntimeCosts::CallSurchargeTransfer)?;
+		}
+		let charged = self.charge_gas(
+			RuntimeCosts::CallSurchargeCodeSize(<E::T as Config>::Schedule::get().limits.code_len)
+		)?;
+		let ext = &mut self.ext;
+		let call_outcome = ext.call(
+			gas, callee, value, input_data, flags.contains(CallFlags::ALLOW_REENTRY),
+		);
+		let code_len = match &call_outcome {
+			Ok((_, len)) => len,
+			Err((_, len)) => len,
+		};
+		self.adjust_gas(charged, RuntimeCosts::CallSurchargeCodeSize(*code_len));
+
+		// `TAIL_CALL` only matters on an `OK` result. Otherwise the call stack comes to
+		// a halt anyways without anymore code being executed.
+		if flags.contains(CallFlags::TAIL_CALL) {
+			if let Ok((return_value, _)) = call_outcome {
+				return Err(TrapReason::Return(ReturnData {
+					flags: return_value.flags.bits(),
+					data: return_value.data.0,
+				}));
+			}
+		}
+
+		if let Ok((output, _)) = &call_outcome {
+			self.write_sandbox_output(output_ptr, output_len_ptr, &output.data, true, |len| {
+				Some(RuntimeCosts::CallCopyOut(len))
+			})?;
+		}
+		Ok(Runtime::<E>::exec_into_return_code(call_outcome.map(|r| r.0).map_err(|r| r.0))?)
+	}
 }
 
 // ***********************************************************
@@ -758,6 +858,36 @@ define_env!(Env, <E: Ext>,
 		}
 	},
 
+	// Make a call to another contract.
+	//
+	// This is equivalent to calling the newer version of this function with
+	// `flags` set to `ALLOW_REENTRY`. See the newer version for documentation.
+	[seal0] seal_call(
+		ctx,
+		callee_ptr: u32,
+		callee_len: u32,
+		gas: u64,
+		value_ptr: u32,
+		value_len: u32,
+		input_data_ptr: u32,
+		input_data_len: u32,
+		output_ptr: u32,
+		output_len_ptr: u32
+	) -> ReturnCode => {
+		ctx.call(
+			CallFlags::ALLOW_REENTRY,
+			callee_ptr,
+			callee_len,
+			gas,
+			value_ptr,
+			value_len,
+			input_data_ptr,
+			input_data_len,
+			output_ptr,
+			output_len_ptr,
+		)
+	},
+
 	// Make a call to another contract.
 	//
 	// The callees output buffer is copied to `output_ptr` and its length to `output_len_ptr`.
@@ -766,6 +896,7 @@ define_env!(Env, <E: Ext>,
 	//
 	// # Parameters
 	//
+	// - flags: See [`CallFlags`] for a documenation of the supported flags.
 	// - callee_ptr: a pointer to the address of the callee contract.
 	//   Should be decodable as an `T::AccountId`. Traps otherwise.
 	// - callee_len: length of the address buffer.
@@ -789,8 +920,9 @@ define_env!(Env, <E: Ext>,
 	// `ReturnCode::BelowSubsistenceThreshold`
 	// `ReturnCode::TransferFailed`
 	// `ReturnCode::NotCallable`
-	[seal0] seal_call(
+	[__unstable__] seal_call(
 		ctx,
+		flags: u32,
 		callee_ptr: u32,
 		callee_len: u32,
 		gas: u64,
@@ -801,30 +933,18 @@ define_env!(Env, <E: Ext>,
 		output_ptr: u32,
 		output_len_ptr: u32
 	) -> ReturnCode => {
-		ctx.charge_gas(RuntimeCosts::CallBase(input_data_len))?;
-		let callee: <<E as Ext>::T as frame_system::Config>::AccountId =
-			ctx.read_sandbox_memory_as(callee_ptr, callee_len)?;
-		let value: BalanceOf<<E as Ext>::T> = ctx.read_sandbox_memory_as(value_ptr, value_len)?;
-		let input_data = ctx.read_sandbox_memory(input_data_ptr, input_data_len)?;
-		if value > 0u32.into() {
-			ctx.charge_gas(RuntimeCosts::CallSurchargeTransfer)?;
-		}
-		let charged = ctx.charge_gas(
-			RuntimeCosts::CallSurchargeCodeSize(<E::T as Config>::Schedule::get().limits.code_len)
-		)?;
-		let ext = &mut ctx.ext;
-		let call_outcome = ext.call(gas, callee, value, input_data);
-		let code_len = match &call_outcome {
-			Ok((_, len)) => len,
-			Err((_, len)) => len,
-		};
-		ctx.adjust_gas(charged, RuntimeCosts::CallSurchargeCodeSize(*code_len));
-		if let Ok((output, _)) = &call_outcome {
-			ctx.write_sandbox_output(output_ptr, output_len_ptr, &output.data, true, |len| {
-				Some(RuntimeCosts::CallCopyOut(len))
-			})?;
-		}
-		Ok(Runtime::<E>::exec_into_return_code(call_outcome.map(|r| r.0).map_err(|r| r.0))?)
+		ctx.call(
+			CallFlags::from_bits(flags).ok_or_else(|| "used rerved bit in CallFlags")?,
+			callee_ptr,
+			callee_len,
+			gas,
+			value_ptr,
+			value_len,
+			input_data_ptr,
+			input_data_len,
+			output_ptr,
+			output_len_ptr,
+		)
 	},
 
 	// Instantiate a contract with the specified code hash.
@@ -945,7 +1065,6 @@ define_env!(Env, <E: Ext>,
 		ctx.charge_gas(RuntimeCosts::Terminate)?;
 		let beneficiary: <<E as Ext>::T as frame_system::Config>::AccountId =
 			ctx.read_sandbox_memory_as(beneficiary_ptr, beneficiary_len)?;
-
 		let charged = ctx.charge_gas(
 			RuntimeCosts::TerminateSurchargeCodeSize(
 				<E::T as Config>::Schedule::get().limits.code_len
@@ -969,16 +1088,17 @@ define_env!(Env, <E: Ext>,
 	//
 	// # Note
 	//
-	// This function can only be called once. Calling it multiple times will trigger a trap.
+	// This function traps if the input was previously forwarded by a `seal_call`.
 	[seal0] seal_input(ctx, out_ptr: u32, out_len_ptr: u32) => {
 		ctx.charge_gas(RuntimeCosts::InputBase)?;
 		if let Some(input) = ctx.input_data.take() {
 			ctx.write_sandbox_output(out_ptr, out_len_ptr, &input, false, |len| {
 				Some(RuntimeCosts::InputCopyOut(len))
 			})?;
+			ctx.input_data = Some(input);
 			Ok(())
 		} else {
-			Err(Error::<E::T>::InputAlreadyRead.into())
+			Err(Error::<E::T>::InputForwarded.into())
 		}
 	},
 

From d0891796ed48acfad7445b884c8d035dc4a2487a Mon Sep 17 00:00:00 2001
From: Xiliang Chen <xlchen1291@gmail.com>
Date: Tue, 8 Jun 2021 20:59:19 +1200
Subject: [PATCH 0843/1194] fix unreserve_all_named (#9042)

---
 frame/balances/src/tests.rs                   | 73 +++++++++++++++++++
 .../src/traits/tokens/currency/reservable.rs  |  2 +-
 2 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/frame/balances/src/tests.rs b/frame/balances/src/tests.rs
index 9589fb25805b..43d3c2fc6009 100644
--- a/frame/balances/src/tests.rs
+++ b/frame/balances/src/tests.rs
@@ -1082,5 +1082,78 @@ macro_rules! decl_tests {
 				assert_eq!(Balances::free_balance(&1), 52);
 			});
 		}
+
+		#[test]
+		fn ensure_reserved_named_should_work() {
+			<$ext_builder>::default().build().execute_with(|| {
+				let _ = Balances::deposit_creating(&1, 111);
+
+				let id = [1u8; 8];
+
+				assert_ok!(Balances::ensure_reserved_named(&id, &1, 15));
+				assert_eq!(Balances::reserved_balance_named(&id, &1), 15);
+
+				assert_ok!(Balances::ensure_reserved_named(&id, &1, 10));
+				assert_eq!(Balances::reserved_balance_named(&id, &1), 10);
+
+				assert_ok!(Balances::ensure_reserved_named(&id, &1, 20));
+				assert_eq!(Balances::reserved_balance_named(&id, &1), 20);
+			});
+		}
+
+		#[test]
+		fn unreserve_all_named_should_work() {
+			<$ext_builder>::default().build().execute_with(|| {
+				let _ = Balances::deposit_creating(&1, 111);
+
+				let id = [1u8; 8];
+
+				assert_ok!(Balances::reserve_named(&id, &1, 15));
+
+				assert_eq!(Balances::unreserve_all_named(&id, &1), 15);
+				assert_eq!(Balances::reserved_balance_named(&id, &1), 0);
+				assert_eq!(Balances::free_balance(&1), 111);
+
+				assert_eq!(Balances::unreserve_all_named(&id, &1), 0);
+			});
+		}
+
+		#[test]
+		fn slash_all_reserved_named_should_work() {
+			<$ext_builder>::default().build().execute_with(|| {
+				let _ = Balances::deposit_creating(&1, 111);
+
+				let id = [1u8; 8];
+
+				assert_ok!(Balances::reserve_named(&id, &1, 15));
+
+				assert_eq!(Balances::slash_all_reserved_named(&id, &1).peek(), 15);
+				assert_eq!(Balances::reserved_balance_named(&id, &1), 0);
+				assert_eq!(Balances::free_balance(&1), 96);
+
+				assert_eq!(Balances::slash_all_reserved_named(&id, &1).peek(), 0);
+			});
+		}
+
+		#[test]
+		fn repatriate_all_reserved_named_should_work() {
+			<$ext_builder>::default().build().execute_with(|| {
+				let _ = Balances::deposit_creating(&1, 111);
+				let _ = Balances::deposit_creating(&2, 10);
+				let _ = Balances::deposit_creating(&3, 10);
+
+				let id = [1u8; 8];
+
+				assert_ok!(Balances::reserve_named(&id, &1, 15));
+
+				assert_ok!(Balances::repatriate_all_reserved_named(&id, &1, &2, Status::Reserved));
+				assert_eq!(Balances::reserved_balance_named(&id, &1), 0);
+				assert_eq!(Balances::reserved_balance_named(&id, &2), 15);
+
+				assert_ok!(Balances::repatriate_all_reserved_named(&id, &2, &3, Status::Free));
+				assert_eq!(Balances::reserved_balance_named(&id, &2), 0);
+				assert_eq!(Balances::free_balance(&3), 25);
+			});
+		}
 	}
 }
diff --git a/frame/support/src/traits/tokens/currency/reservable.rs b/frame/support/src/traits/tokens/currency/reservable.rs
index 17dee7a8ae65..69017357cfa8 100644
--- a/frame/support/src/traits/tokens/currency/reservable.rs
+++ b/frame/support/src/traits/tokens/currency/reservable.rs
@@ -166,7 +166,7 @@ pub trait NamedReservableCurrency<AccountId>: ReservableCurrency<AccountId> {
 	/// Is a no-op if the value to be unreserved is zero.
 	fn unreserve_all_named(id: &Self::ReserveIdentifier, who: &AccountId) -> Self::Balance {
 		let value = Self::reserved_balance_named(id, who);
-		Self::slash_reserved_named(id, who, value);
+		Self::unreserve_named(id, who, value);
 		value
 	}
 

From 0af6df59aab21d5a23907faf236be1ff235b7581 Mon Sep 17 00:00:00 2001
From: Andrew Jones <ascjones@gmail.com>
Date: Tue, 8 Jun 2021 12:16:56 +0100
Subject: [PATCH 0844/1194] Delete legacy runtime metadata macros (#9043)

---
 frame/support/src/lib.rs      |   4 +-
 frame/support/src/metadata.rs | 660 ----------------------------------
 2 files changed, 2 insertions(+), 662 deletions(-)
 delete mode 100644 frame/support/src/metadata.rs

diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 57ab1d6febde..4e830c26691e 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -46,6 +46,8 @@ pub use sp_io::{storage::root as storage_root, self};
 pub use sp_runtime::RuntimeDebug;
 #[doc(hidden)]
 pub use log;
+#[doc(hidden)]
+pub use frame_metadata as metadata;
 
 #[macro_use]
 mod origin;
@@ -56,8 +58,6 @@ mod hash;
 #[macro_use]
 pub mod event;
 #[macro_use]
-pub mod metadata;
-#[macro_use]
 pub mod genesis_config;
 #[macro_use]
 pub mod inherent;
diff --git a/frame/support/src/metadata.rs b/frame/support/src/metadata.rs
deleted file mode 100644
index d0c59a0dfdc1..000000000000
--- a/frame/support/src/metadata.rs
+++ /dev/null
@@ -1,660 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-pub use frame_metadata::{
-	DecodeDifferent, FnEncode, RuntimeMetadata, ModuleMetadata, RuntimeMetadataLastVersion,
-	DefaultByteGetter, RuntimeMetadataPrefixed, StorageEntryMetadata, StorageMetadata,
-	StorageEntryType, StorageEntryModifier, DefaultByte, StorageHasher, ModuleErrorMetadata,
-	ExtrinsicMetadata,
-};
-
-/// Implements the metadata support for the given runtime and all its modules.
-///
-/// Example:
-/// ```
-///# mod module0 {
-///#    pub trait Config: 'static {
-///#        type Origin;
-///#        type BlockNumber;
-///#        type PalletInfo: frame_support::traits::PalletInfo;
-///#        type DbWeight: frame_support::traits::Get<frame_support::weights::RuntimeDbWeight>;
-///#    }
-///#    frame_support::decl_module! {
-///#        pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {}
-///#    }
-///#
-///#    frame_support::decl_storage! {
-///#        trait Store for Module<T: Config> as TestStorage {}
-///#    }
-///# }
-///# use module0 as module1;
-///# use module0 as module2;
-///# impl frame_support::traits::PalletInfo for Runtime {
-///#     fn index<P: 'static>() -> Option<usize> { unimplemented!() }
-///#     fn name<P: 'static>() -> Option<&'static str> { unimplemented!() }
-///# }
-///# impl module0::Config for Runtime {
-///#     type Origin = u32;
-///#     type BlockNumber = u32;
-///#     type PalletInfo = Self;
-///#     type DbWeight = ();
-///# }
-///#
-///# type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<(), (), (), ()>;
-///
-/// struct Runtime;
-/// frame_support::impl_runtime_metadata! {
-///     for Runtime with pallets where Extrinsic = UncheckedExtrinsic
-///         module0::Module as Module0 { index 0 } with,
-///         module1::Module as Module1 { index 1 } with,
-///         module2::Module as Module2 { index 2 } with Storage,
-/// };
-/// ```
-///
-/// In this example, just `MODULE3` implements the `Storage` trait.
-#[macro_export]
-macro_rules! impl_runtime_metadata {
-	(
-		for $runtime:ident with pallets where Extrinsic = $ext:ident
-			$( $rest:tt )*
-	) => {
-		impl $runtime {
-			pub fn metadata() -> $crate::metadata::RuntimeMetadataPrefixed {
-				$crate::metadata::RuntimeMetadataLastVersion {
-						modules: $crate::__runtime_modules_to_metadata!($runtime;; $( $rest )*),
-						extrinsic: $crate::metadata::ExtrinsicMetadata {
-							version: <$ext as $crate::sp_runtime::traits::ExtrinsicMetadata>::VERSION,
-							signed_extensions: <
-									<
-										$ext as $crate::sp_runtime::traits::ExtrinsicMetadata
-									>::SignedExtensions as $crate::sp_runtime::traits::SignedExtension
-								>::identifier()
-									.into_iter()
-									.map($crate::metadata::DecodeDifferent::Encode)
-									.collect(),
-						},
-				}.into()
-			}
-		}
-	}
-}
-
-#[macro_export]
-#[doc(hidden)]
-macro_rules! __runtime_modules_to_metadata {
-	(
-		$runtime: ident;
-		$( $metadata:expr ),*;
-		$mod:ident::$module:ident $( < $instance:ident > )? as $name:ident
-			{ index $index:tt }
-			$(with)+ $($kw:ident)*
-		,
-		$( $rest:tt )*
-	) => {
-		$crate::__runtime_modules_to_metadata!(
-			$runtime;
-			$( $metadata, )* $crate::metadata::ModuleMetadata {
-				name: $crate::metadata::DecodeDifferent::Encode(stringify!($name)),
-				index: $index,
-				storage: $crate::__runtime_modules_to_metadata_calls_storage!(
-					$mod, $module $( <$instance> )?, $runtime, $(with $kw)*
-				),
-				calls: $crate::__runtime_modules_to_metadata_calls_call!(
-					$mod, $module $( <$instance> )?, $runtime, $(with $kw)*
-				),
-				event: $crate::__runtime_modules_to_metadata_calls_event!(
-					$mod, $module $( <$instance> )?, $runtime, $(with $kw)*
-				),
-				constants: $crate::metadata::DecodeDifferent::Encode(
-					$crate::metadata::FnEncode(
-						$mod::$module::<$runtime $(, $mod::$instance )?>::module_constants_metadata
-					)
-				),
-				errors: $crate::metadata::DecodeDifferent::Encode(
-					$crate::metadata::FnEncode(
-						<$mod::$module::<$runtime $(, $mod::$instance )?> as $crate::metadata::ModuleErrorMetadata>::metadata
-					)
-				)
-			};
-			$( $rest )*
-		)
-	};
-	(
-		$runtime:ident;
-		$( $metadata:expr ),*;
-	) => {
-		$crate::metadata::DecodeDifferent::Encode(&[ $( $metadata ),* ])
-	};
-}
-
-#[macro_export]
-#[doc(hidden)]
-macro_rules! __runtime_modules_to_metadata_calls_call {
-	(
-		$mod: ident,
-		$module: ident $( <$instance:ident> )?,
-		$runtime: ident,
-		with Call
-		$(with $kws:ident)*
-	) => {
-		Some($crate::metadata::DecodeDifferent::Encode(
-			$crate::metadata::FnEncode(
-				$mod::$module::<$runtime $(, $mod::$instance )?>::call_functions
-			)
-		))
-	};
-	(
-		$mod: ident,
-		$module: ident $( <$instance:ident> )?,
-		$runtime: ident,
-		with $_:ident
-		$(with $kws:ident)*
-	) => {
-		$crate::__runtime_modules_to_metadata_calls_call! {
-			$mod, $module $( <$instance> )?, $runtime, $(with $kws)*
-		};
-	};
-	(
-		$mod: ident,
-		$module: ident $( <$instance:ident> )?,
-		$runtime: ident,
-	) => {
-		None
-	};
-}
-
-
-#[macro_export]
-#[doc(hidden)]
-macro_rules! __runtime_modules_to_metadata_calls_event {
-	(
-		$mod: ident,
-		$module: ident $( <$instance:ident> )?,
-		$runtime: ident,
-		with Event
-		$(with $kws:ident)*
-	) => {
-		Some($crate::metadata::DecodeDifferent::Encode(
-			$crate::metadata::FnEncode(
-				$crate::paste::expr!{
-					$runtime:: [< __module_events_ $mod $(_ $instance)?>]
-				}
-			)
-		))
-	};
-	(
-		$mod: ident,
-		$module: ident $( <$instance:ident> )?,
-		$runtime: ident,
-		with $_:ident
-		$(with $kws:ident)*
-	) => {
-		$crate::__runtime_modules_to_metadata_calls_event!( $mod, $module $( <$instance> )?, $runtime, $(with $kws)* );
-	};
-	(
-		$mod: ident,
-		$module: ident $( <$instance:ident> )?,
-		$runtime: ident,
-	) => {
-		None
-	};
-}
-
-#[macro_export]
-#[doc(hidden)]
-macro_rules! __runtime_modules_to_metadata_calls_storage {
-	(
-		$mod: ident,
-		$module: ident $( <$instance:ident> )?,
-		$runtime: ident,
-		with Storage
-		$(with $kws:ident)*
-	) => {
-		Some($crate::metadata::DecodeDifferent::Encode(
-			$crate::metadata::FnEncode(
-				$mod::$module::<$runtime $(, $mod::$instance )?>::storage_metadata
-			)
-		))
-	};
-	(
-		$mod: ident,
-		$module: ident $( <$instance:ident> )?,
-		$runtime: ident,
-		with $_:ident
-		$(with $kws:ident)*
-	) => {
-		$crate::__runtime_modules_to_metadata_calls_storage! {
-			$mod, $module $( <$instance> )?, $runtime, $(with $kws)*
-		};
-	};
-	(
-		$mod: ident,
-		$module: ident $( <$instance:ident> )?,
-		$runtime: ident,
-	) => {
-		None
-	};
-}
-
-
-#[cfg(test)]
-// Do not complain about unused `dispatch` and `dispatch_aux`.
-#[allow(dead_code)]
-mod tests {
-	use super::*;
-	use frame_metadata::{
-		EventMetadata, StorageEntryModifier, StorageEntryType, FunctionMetadata, StorageEntryMetadata,
-		ModuleMetadata, RuntimeMetadataPrefixed, DefaultByte, ModuleConstantMetadata, DefaultByteGetter,
-		ErrorMetadata, ExtrinsicMetadata,
-	};
-	use codec::{Encode, Decode};
-	use crate::traits::Get;
-	use sp_runtime::transaction_validity::TransactionValidityError;
-
-	#[derive(Clone, Eq, Debug, PartialEq, Encode, Decode)]
-	struct TestExtension;
-	impl sp_runtime::traits::SignedExtension for TestExtension {
-		type AccountId = u32;
-		type Call = ();
-		type AdditionalSigned = u32;
-		type Pre = ();
-		const IDENTIFIER: &'static str = "testextension";
-		fn additional_signed(&self) -> Result<Self::AdditionalSigned, TransactionValidityError> {
-			Ok(1)
-		}
-	}
-
-	#[derive(Clone, Eq, Debug, PartialEq, Encode, Decode)]
-	struct TestExtension2;
-	impl sp_runtime::traits::SignedExtension for TestExtension2 {
-		type AccountId = u32;
-		type Call = ();
-		type AdditionalSigned = u32;
-		type Pre = ();
-		const IDENTIFIER: &'static str = "testextension2";
-		fn additional_signed(&self) -> Result<Self::AdditionalSigned, TransactionValidityError> {
-			Ok(1)
-		}
-	}
-
-	struct TestExtrinsic;
-
-	impl sp_runtime::traits::ExtrinsicMetadata for TestExtrinsic {
-		const VERSION: u8 = 1;
-		type SignedExtensions = (TestExtension, TestExtension2);
-	}
-
-	mod system {
-		use super::*;
-
-		pub trait Config: 'static {
-			type BaseCallFilter;
-			const ASSOCIATED_CONST: u64 = 500;
-			type Origin: Into<Result<RawOrigin<Self::AccountId>, Self::Origin>>
-				+ From<RawOrigin<Self::AccountId>>;
-			type AccountId: From<u32> + Encode;
-			type BlockNumber: From<u32> + Encode;
-			type SomeValue: Get<u32>;
-			type PalletInfo: crate::traits::PalletInfo;
-			type DbWeight: crate::traits::Get<crate::weights::RuntimeDbWeight>;
-			type Call;
-		}
-
-		decl_module! {
-			pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {
-				/// Hi, I am a comment.
-				const BlockNumber: T::BlockNumber = 100.into();
-				const GetType: T::AccountId = T::SomeValue::get().into();
-				const ASSOCIATED_CONST: u64 = T::ASSOCIATED_CONST.into();
-			}
-		}
-
-		decl_event!(
-			pub enum Event {
-				SystemEvent,
-			}
-		);
-
-		#[derive(Clone, PartialEq, Eq, Debug, Encode, Decode)]
-		pub enum RawOrigin<AccountId> {
-			Root,
-			Signed(AccountId),
-			None,
-		}
-
-		impl<AccountId> From<Option<AccountId>> for RawOrigin<AccountId> {
-			fn from(s: Option<AccountId>) -> RawOrigin<AccountId> {
-				match s {
-					Some(who) => RawOrigin::Signed(who),
-					None => RawOrigin::None,
-				}
-			}
-		}
-
-		pub type Origin<T> = RawOrigin<<T as Config>::AccountId>;
-	}
-
-	mod event_module {
-		use crate::dispatch::DispatchResult;
-		use super::system;
-
-		pub trait Config: system::Config {
-			type Balance;
-		}
-
-		decl_event!(
-			pub enum Event<T> where <T as Config>::Balance
-			{
-				/// Hi, I am a comment.
-				TestEvent(Balance),
-			}
-		);
-
-		decl_module! {
-			pub struct Module<T: Config> for enum Call where origin: T::Origin, system=system {
-				type Error = Error<T>;
-
-				#[weight = 0]
-				fn aux_0(_origin) -> DispatchResult { unreachable!() }
-			}
-		}
-
-		crate::decl_error! {
-			pub enum Error for Module<T: Config> {
-				/// Some user input error
-				UserInputError,
-				/// Something bad happened
-				/// this could be due to many reasons
-				BadThingHappened,
-			}
-		}
-	}
-
-	mod event_module2 {
-		use super::system;
-
-		pub trait Config: system::Config {
-			type Balance;
-		}
-
-		decl_event!(
-			pub enum Event<T> where <T as Config>::Balance
-			{
-				TestEvent(Balance),
-			}
-		);
-
-		decl_module! {
-			pub struct Module<T: Config> for enum Call where origin: T::Origin, system=system {}
-		}
-
-		crate::decl_storage! {
-			trait Store for Module<T: Config> as TestStorage {
-				StorageMethod : Option<u32>;
-			}
-			add_extra_genesis {
-				build(|_| {});
-			}
-		}
-	}
-
-	type EventModule = event_module::Module<TestRuntime>;
-	type EventModule2 = event_module2::Module<TestRuntime>;
-
-	#[derive(Debug, Clone, PartialEq, Eq, Encode, Decode)]
-	pub struct TestRuntime;
-
-	impl crate::traits::PalletInfo for TestRuntime {
-		fn index<P: 'static>() -> Option<usize> {
-			let type_id = sp_std::any::TypeId::of::<P>();
-			if type_id == sp_std::any::TypeId::of::<system::Pallet<TestRuntime>>() {
-				return Some(0)
-			}
-			if type_id == sp_std::any::TypeId::of::<EventModule>() {
-				return Some(1)
-			}
-			if type_id == sp_std::any::TypeId::of::<EventModule2>() {
-				return Some(2)
-			}
-
-			None
-		}
-		fn name<P: 'static>() -> Option<&'static str> {
-			let type_id = sp_std::any::TypeId::of::<P>();
-			if type_id == sp_std::any::TypeId::of::<system::Pallet<TestRuntime>>() {
-				return Some("System")
-			}
-			if type_id == sp_std::any::TypeId::of::<EventModule>() {
-				return Some("EventModule")
-			}
-			if type_id == sp_std::any::TypeId::of::<EventModule2>() {
-				return Some("EventModule2")
-			}
-
-			None
-		}
-	}
-
-	impl_outer_event! {
-		pub enum TestEvent for TestRuntime {
-			system,
-			event_module<T>,
-			event_module2<T>,
-		}
-	}
-
-	impl_outer_origin! {
-		pub enum Origin for TestRuntime where system = system {}
-	}
-
-	impl_outer_dispatch! {
-		pub enum Call for TestRuntime where origin: Origin {
-			event_module::EventModule,
-			event_module2::EventModule2,
-		}
-	}
-
-	impl event_module::Config for TestRuntime {
-		type Balance = u32;
-	}
-
-	impl event_module2::Config for TestRuntime {
-		type Balance = u32;
-	}
-
-	crate::parameter_types! {
-		pub const SystemValue: u32 = 600;
-	}
-
-	impl system::Config for TestRuntime {
-		type BaseCallFilter = ();
-		type Origin = Origin;
-		type AccountId = u32;
-		type BlockNumber = u32;
-		type SomeValue = SystemValue;
-		type PalletInfo = Self;
-		type DbWeight = ();
-		type Call = Call;
-	}
-
-	impl_runtime_metadata!(
-		for TestRuntime with pallets where Extrinsic = TestExtrinsic
-			system::Pallet as System { index 0 } with Event,
-			event_module::Module as Module { index 1 } with Event Call,
-			event_module2::Module as Module2 { index 2 } with Event Storage Call,
-	);
-
-	struct ConstantBlockNumberByteGetter;
-	impl DefaultByte for ConstantBlockNumberByteGetter {
-		fn default_byte(&self) -> Vec<u8> {
-			100u32.encode()
-		}
-	}
-
-	struct ConstantGetTypeByteGetter;
-	impl DefaultByte for ConstantGetTypeByteGetter {
-		fn default_byte(&self) -> Vec<u8> {
-			SystemValue::get().encode()
-		}
-	}
-
-	struct ConstantAssociatedConstByteGetter;
-	impl DefaultByte for ConstantAssociatedConstByteGetter {
-		fn default_byte(&self) -> Vec<u8> {
-			<TestRuntime as system::Config>::ASSOCIATED_CONST.encode()
-		}
-	}
-
-	#[test]
-	fn runtime_metadata() {
-		let expected_metadata: RuntimeMetadataLastVersion = RuntimeMetadataLastVersion {
-			modules: DecodeDifferent::Encode(&[
-				ModuleMetadata {
-					name: DecodeDifferent::Encode("System"),
-					index: 0,
-					storage: None,
-					calls: None,
-					event: Some(DecodeDifferent::Encode(
-						FnEncode(||&[
-							EventMetadata {
-								name: DecodeDifferent::Encode("SystemEvent"),
-								arguments: DecodeDifferent::Encode(&[]),
-								documentation: DecodeDifferent::Encode(&[])
-							}
-						])
-					)),
-					constants: DecodeDifferent::Encode(
-						FnEncode(|| &[
-							ModuleConstantMetadata {
-								name: DecodeDifferent::Encode("BlockNumber"),
-								ty: DecodeDifferent::Encode("T::BlockNumber"),
-								value: DecodeDifferent::Encode(
-									DefaultByteGetter(&ConstantBlockNumberByteGetter)
-								),
-								documentation: DecodeDifferent::Encode(&[" Hi, I am a comment."]),
-							},
-							ModuleConstantMetadata {
-								name: DecodeDifferent::Encode("GetType"),
-								ty: DecodeDifferent::Encode("T::AccountId"),
-								value: DecodeDifferent::Encode(
-									DefaultByteGetter(&ConstantGetTypeByteGetter)
-								),
-								documentation: DecodeDifferent::Encode(&[]),
-							},
-							ModuleConstantMetadata {
-								name: DecodeDifferent::Encode("ASSOCIATED_CONST"),
-								ty: DecodeDifferent::Encode("u64"),
-								value: DecodeDifferent::Encode(
-									DefaultByteGetter(&ConstantAssociatedConstByteGetter)
-								),
-								documentation: DecodeDifferent::Encode(&[]),
-							}
-						])
-					),
-					errors: DecodeDifferent::Encode(FnEncode(|| &[])),
-				},
-				ModuleMetadata {
-					name: DecodeDifferent::Encode("Module"),
-					index: 1,
-					storage: None,
-					calls: Some(
-						DecodeDifferent::Encode(FnEncode(|| &[
-							FunctionMetadata {
-								name: DecodeDifferent::Encode("aux_0"),
-								arguments: DecodeDifferent::Encode(&[]),
-								documentation: DecodeDifferent::Encode(&[]),
-							}
-						]))),
-					event: Some(DecodeDifferent::Encode(
-						FnEncode(||&[
-							EventMetadata {
-								name: DecodeDifferent::Encode("TestEvent"),
-								arguments: DecodeDifferent::Encode(&["Balance"]),
-								documentation: DecodeDifferent::Encode(&[" Hi, I am a comment."])
-							}
-						])
-					)),
-					constants: DecodeDifferent::Encode(FnEncode(|| &[])),
-					errors: DecodeDifferent::Encode(FnEncode(|| &[
-						ErrorMetadata {
-							name: DecodeDifferent::Encode("UserInputError"),
-							documentation: DecodeDifferent::Encode(&[" Some user input error"]),
-						},
-						ErrorMetadata {
-							name: DecodeDifferent::Encode("BadThingHappened"),
-							documentation: DecodeDifferent::Encode(&[
-								" Something bad happened",
-								" this could be due to many reasons",
-							]),
-						},
-					])),
-				},
-				ModuleMetadata {
-					name: DecodeDifferent::Encode("Module2"),
-					index: 2,
-					storage: Some(DecodeDifferent::Encode(
-						FnEncode(|| StorageMetadata {
-							prefix: DecodeDifferent::Encode("TestStorage"),
-							entries: DecodeDifferent::Encode(
-								&[
-									StorageEntryMetadata {
-										name: DecodeDifferent::Encode("StorageMethod"),
-										modifier: StorageEntryModifier::Optional,
-										ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
-										default: DecodeDifferent::Encode(
-											DefaultByteGetter(
-												&event_module2::__GetByteStructStorageMethod(
-													std::marker::PhantomData::<TestRuntime>
-												)
-											)
-										),
-										documentation: DecodeDifferent::Encode(&[]),
-									}
-								]
-							)
-						}),
-					)),
-					calls: Some(DecodeDifferent::Encode(FnEncode(|| &[]))),
-					event: Some(DecodeDifferent::Encode(
-						FnEncode(||&[
-							EventMetadata {
-								name: DecodeDifferent::Encode("TestEvent"),
-								arguments: DecodeDifferent::Encode(&["Balance"]),
-								documentation: DecodeDifferent::Encode(&[])
-							}
-						])
-					)),
-					constants: DecodeDifferent::Encode(FnEncode(|| &[])),
-					errors: DecodeDifferent::Encode(FnEncode(|| &[])),
-				},
-			]),
-			extrinsic: ExtrinsicMetadata {
-				version: 1,
-				signed_extensions: vec![
-					DecodeDifferent::Encode("testextension"),
-					DecodeDifferent::Encode("testextension2"),
-				],
-			}
-		};
-
-		let metadata_encoded = TestRuntime::metadata().encode();
-		let metadata_decoded = RuntimeMetadataPrefixed::decode(&mut &metadata_encoded[..]);
-		let expected_metadata: RuntimeMetadataPrefixed = expected_metadata.into();
-
-		pretty_assertions::assert_eq!(expected_metadata, metadata_decoded.unwrap());
-	}
-}

From 0a2472d8364bc103a0a13c8e2dcb7f6ed3e44342 Mon Sep 17 00:00:00 2001
From: tgmichel <telmo@purestake.com>
Date: Tue, 8 Jun 2021 13:18:57 +0200
Subject: [PATCH 0845/1194] `rpc-http-threads` cli arg (#8890)

* Add optional `rpc-http-threads` cli arg

* Update `http::ServerBuilder`threads
---
 client/cli/src/commands/run_cmd.rs  | 8 ++++++++
 client/cli/src/config.rs            | 8 ++++++++
 client/rpc-servers/src/lib.rs       | 6 +++++-
 client/service/src/config.rs        | 2 ++
 client/service/src/lib.rs           | 1 +
 client/service/test/src/lib.rs      | 1 +
 test-utils/test-runner/src/utils.rs | 1 +
 utils/browser/src/lib.rs            | 1 +
 8 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/client/cli/src/commands/run_cmd.rs b/client/cli/src/commands/run_cmd.rs
index 9ef14cfa02b8..3e5823ef733a 100644
--- a/client/cli/src/commands/run_cmd.rs
+++ b/client/cli/src/commands/run_cmd.rs
@@ -122,6 +122,10 @@ pub struct RunCmd {
 	#[structopt(long = "ws-max-connections", value_name = "COUNT")]
 	pub ws_max_connections: Option<usize>,
 
+	/// Size of the RPC HTTP server thread pool.
+	#[structopt(long = "rpc-http-threads", value_name = "COUNT")]
+	pub rpc_http_threads: Option<usize>,
+
 	/// Specify browser Origins allowed to access the HTTP & WS RPC servers.
 	///
 	/// A comma-separated list of origins (protocol://domain or special `null`
@@ -376,6 +380,10 @@ impl CliConfiguration for RunCmd {
 		Ok(self.ws_max_connections)
 	}
 
+	fn rpc_http_threads(&self) -> Result<Option<usize>> {
+		Ok(self.rpc_http_threads)
+	}
+
 	fn rpc_cors(&self, is_dev: bool) -> Result<Option<Vec<String>>> {
 		Ok(self
 			.rpc_cors
diff --git a/client/cli/src/config.rs b/client/cli/src/config.rs
index a21a79afe9fd..62afc849c09f 100644
--- a/client/cli/src/config.rs
+++ b/client/cli/src/config.rs
@@ -358,6 +358,13 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 		Ok(None)
 	}
 
+	/// Get the RPC HTTP thread pool size (`None` for a default 4-thread pool config).
+	///
+	/// By default this is `None`.
+	fn rpc_http_threads(&self) -> Result<Option<usize>> {
+		Ok(None)
+	}
+
 	/// Get the RPC cors (`None` if disabled)
 	///
 	/// By default this is `Some(Vec::new())`.
@@ -526,6 +533,7 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 			rpc_ipc: self.rpc_ipc()?,
 			rpc_methods: self.rpc_methods()?,
 			rpc_ws_max_connections: self.rpc_ws_max_connections()?,
+			rpc_http_threads: self.rpc_http_threads()?,
 			rpc_cors: self.rpc_cors(is_dev)?,
 			prometheus_config: self.prometheus_config(DCV::prometheus_listen_port())?,
 			telemetry_endpoints,
diff --git a/client/rpc-servers/src/lib.rs b/client/rpc-servers/src/lib.rs
index be6abea67b05..cb2704efc82a 100644
--- a/client/rpc-servers/src/lib.rs
+++ b/client/rpc-servers/src/lib.rs
@@ -33,6 +33,9 @@ pub const MAX_PAYLOAD: usize = 15 * 1024 * 1024;
 /// Default maximum number of connections for WS RPC servers.
 const WS_MAX_CONNECTIONS: usize = 100;
 
+/// Default thread pool size for RPC HTTP servers.
+const HTTP_THREADS: usize = 4;
+
 /// The RPC IoHandler containing all requested APIs.
 pub type RpcHandler<T> = pubsub::PubSubHandler<T, RpcMiddleware>;
 
@@ -79,11 +82,12 @@ mod inner {
 	/// **Note**: Only available if `not(target_os = "unknown")`.
 	pub fn start_http<M: pubsub::PubSubMetadata + Default>(
 		addr: &std::net::SocketAddr,
+		thread_pool_size: Option<usize>,
 		cors: Option<&Vec<String>>,
 		io: RpcHandler<M>,
 	) -> io::Result<http::Server> {
 		http::ServerBuilder::new(io)
-			.threads(4)
+			.threads(thread_pool_size.unwrap_or(HTTP_THREADS))
 			.health_api(("/health", "system_health"))
 			.allowed_hosts(hosts_filtering(cors.is_some()))
 			.rest_api(if cors.is_some() {
diff --git a/client/service/src/config.rs b/client/service/src/config.rs
index 5d8ee89225cb..f2c5f2c6ed40 100644
--- a/client/service/src/config.rs
+++ b/client/service/src/config.rs
@@ -89,6 +89,8 @@ pub struct Configuration {
 	pub rpc_ipc: Option<String>,
 	/// Maximum number of connections for WebSockets RPC server. `None` if default.
 	pub rpc_ws_max_connections: Option<usize>,
+	/// Size of the RPC HTTP server thread pool. `None` if default.
+	pub rpc_http_threads: Option<usize>,
 	/// CORS settings for HTTP & WS servers. `None` if all origins are allowed.
 	pub rpc_cors: Option<Vec<String>>,
 	/// RPC methods to expose (by default only a safe subset or all of them).
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index ae2cfbc8b894..51ee0965ebcf 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -381,6 +381,7 @@ fn start_rpc_servers<
 			config.rpc_http,
 			|address| sc_rpc_server::start_http(
 				address,
+				config.rpc_http_threads,
 				config.rpc_cors.as_ref(),
 				gen_handler(
 					deny_unsafe(&address, &config.rpc_methods),
diff --git a/client/service/test/src/lib.rs b/client/service/test/src/lib.rs
index a80c53a8c21c..3999b852ac74 100644
--- a/client/service/test/src/lib.rs
+++ b/client/service/test/src/lib.rs
@@ -262,6 +262,7 @@ fn node_config<G: RuntimeGenesis + 'static, E: ChainSpecExtension + Clone + 'sta
 		rpc_ipc: None,
 		rpc_ws: None,
 		rpc_ws_max_connections: None,
+		rpc_http_threads: None,
 		rpc_cors: None,
 		rpc_methods: Default::default(),
 		prometheus_config: None,
diff --git a/test-utils/test-runner/src/utils.rs b/test-utils/test-runner/src/utils.rs
index d8ab3860f28a..4f5390a7eb86 100644
--- a/test-utils/test-runner/src/utils.rs
+++ b/test-utils/test-runner/src/utils.rs
@@ -124,6 +124,7 @@ pub fn default_config(task_executor: TaskExecutor, mut chain_spec: Box<dyn Chain
 		rpc_ws: None,
 		rpc_ipc: None,
 		rpc_ws_max_connections: None,
+		rpc_http_threads: None,
 		rpc_cors: None,
 		rpc_methods: Default::default(),
 		prometheus_config: None,
diff --git a/utils/browser/src/lib.rs b/utils/browser/src/lib.rs
index f7e5537c43b5..9bfe9e3d0d22 100644
--- a/utils/browser/src/lib.rs
+++ b/utils/browser/src/lib.rs
@@ -101,6 +101,7 @@ where
 		rpc_ipc: Default::default(),
 		rpc_ws: Default::default(),
 		rpc_ws_max_connections: Default::default(),
+		rpc_http_threads: Default::default(),
 		rpc_methods: Default::default(),
 		state_cache_child_ratio: Default::default(),
 		state_cache_size: Default::default(),

From 07a1af348f76e08be36341f8a1b6039765b665bc Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Tue, 8 Jun 2021 10:02:57 -0400
Subject: [PATCH 0846/1194] Emit `Bonded` event when rebonding (#9040)

* Emit `Bonded` event when rebonding

* fix borrow checker

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs

Co-authored-by: Parity Bot <admin@parity.io>
---
 frame/staking/src/lib.rs     |   1 +
 frame/staking/src/weights.rs | 218 +++++++++++++++++------------------
 2 files changed, 110 insertions(+), 109 deletions(-)

diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index c8011faef151..888601e307f3 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -1820,6 +1820,7 @@ decl_module! {
 			// last check: the new active amount of ledger must be more than ED.
 			ensure!(ledger.active >= T::Currency::minimum_balance(), Error::<T>::InsufficientValue);
 
+			Self::deposit_event(RawEvent::Bonded(ledger.stash.clone(), value));
 			Self::update_ledger(&controller, &ledger);
 			Ok(Some(
 				35 * WEIGHT_PER_MICROS
diff --git a/frame/staking/src/weights.rs b/frame/staking/src/weights.rs
index d3274cad8050..5960d6612566 100644
--- a/frame/staking/src/weights.rs
+++ b/frame/staking/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_staking
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-03-25, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-06-07, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -76,155 +76,155 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn bond() -> Weight {
-		(79_895_000 as Weight)
+		(91_959_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn bond_extra() -> Weight {
-		(60_561_000 as Weight)
+		(69_291_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn unbond() -> Weight {
-		(54_996_000 as Weight)
+		(63_513_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn withdraw_unbonded_update(s: u32, ) -> Weight {
-		(56_056_000 as Weight)
+		(64_747_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((67_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((77_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
-		(90_267_000 as Weight)
+		(100_375_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((2_787_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((3_067_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(8 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn validate() -> Weight {
-		(16_345_000 as Weight)
+		(17_849_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn kick(k: u32, ) -> Weight {
-		(27_080_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((18_739_000 as Weight).saturating_mul(k as Weight))
+		(27_939_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((21_431_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(k as Weight)))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn nominate(n: u32, ) -> Weight {
-		(29_101_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((5_670_000 as Weight).saturating_mul(n as Weight))
+		(32_791_000 as Weight)
+			// Standard Error: 33_000
+			.saturating_add((7_006_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn chill() -> Weight {
-		(15_771_000 as Weight)
+		(17_014_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn set_payee() -> Weight {
-		(13_329_000 as Weight)
+		(14_816_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_controller() -> Weight {
-		(29_807_000 as Weight)
+		(33_600_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn set_validator_count() -> Weight {
-		(2_323_000 as Weight)
+		(2_706_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_no_eras() -> Weight {
-		(2_528_000 as Weight)
+		(2_973_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_new_era() -> Weight {
-		(2_529_000 as Weight)
+		(2_949_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_new_era_always() -> Weight {
-		(2_527_000 as Weight)
+		(3_011_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_invulnerables(v: u32, ) -> Weight {
-		(2_661_000 as Weight)
+		(3_078_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((35_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((5_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_unstake(s: u32, ) -> Weight {
-		(64_650_000 as Weight)
+		(69_220_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((2_755_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((3_070_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(8 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn cancel_deferred_slash(s: u32, ) -> Weight {
-		(5_904_642_000 as Weight)
-			// Standard Error: 393_000
-			.saturating_add((34_810_000 as Weight).saturating_mul(s as Weight))
+		(3_460_399_000 as Weight)
+			// Standard Error: 222_000
+			.saturating_add((19_782_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn payout_stakers_dead_controller(n: u32, ) -> Weight {
-		(131_368_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((52_611_000 as Weight).saturating_mul(n as Weight))
+		(120_436_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((63_092_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(10 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(n as Weight)))
 	}
 	fn payout_stakers_alive_staked(n: u32, ) -> Weight {
-		(165_079_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((66_740_000 as Weight).saturating_mul(n as Weight))
+		(181_424_000 as Weight)
+			// Standard Error: 51_000
+			.saturating_add((78_631_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(11 as Weight))
 			.saturating_add(T::DbWeight::get().reads((5 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(n as Weight)))
 	}
 	fn rebond(l: u32, ) -> Weight {
-		(37_039_000 as Weight)
+		(59_349_000 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((93_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add((64_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn set_history_depth(e: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 71_000
-			.saturating_add((34_403_000 as Weight).saturating_mul(e as Weight))
+			// Standard Error: 97_000
+			.saturating_add((44_609_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes((7 as Weight).saturating_mul(e as Weight)))
 	}
 	fn reap_stash(s: u32, ) -> Weight {
-		(67_561_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((2_766_000 as Weight).saturating_mul(s as Weight))
+		(72_356_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((3_066_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(8 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn new_era(v: u32, n: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 1_016_000
-			.saturating_add((389_979_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 51_000
-			.saturating_add((63_208_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 1_462_000
+			.saturating_add((393_007_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 73_000
+			.saturating_add((72_014_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(10 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
@@ -233,21 +233,21 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	}
 	fn get_npos_voters(v: u32, n: u32, s: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 95_000
-			.saturating_add((26_419_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 95_000
-			.saturating_add((29_033_000 as Weight).saturating_mul(n as Weight))
-			// Standard Error: 1_305_000
-			.saturating_add((23_680_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 235_000
+			.saturating_add((35_212_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 235_000
+			.saturating_add((38_391_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 3_200_000
+			.saturating_add((31_130_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn get_npos_targets(v: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 32_000
-			.saturating_add((11_317_000 as Weight).saturating_mul(v as Weight))
+		(52_314_000 as Weight)
+			// Standard Error: 71_000
+			.saturating_add((15_195_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(v as Weight)))
 	}
@@ -256,155 +256,155 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn bond() -> Weight {
-		(79_895_000 as Weight)
+		(91_959_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn bond_extra() -> Weight {
-		(60_561_000 as Weight)
+		(69_291_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn unbond() -> Weight {
-		(54_996_000 as Weight)
+		(63_513_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn withdraw_unbonded_update(s: u32, ) -> Weight {
-		(56_056_000 as Weight)
+		(64_747_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((67_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((77_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
-		(90_267_000 as Weight)
+		(100_375_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((2_787_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((3_067_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn validate() -> Weight {
-		(16_345_000 as Weight)
+		(17_849_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn kick(k: u32, ) -> Weight {
-		(27_080_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((18_739_000 as Weight).saturating_mul(k as Weight))
+		(27_939_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((21_431_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(k as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn nominate(n: u32, ) -> Weight {
-		(29_101_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((5_670_000 as Weight).saturating_mul(n as Weight))
+		(32_791_000 as Weight)
+			// Standard Error: 33_000
+			.saturating_add((7_006_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn chill() -> Weight {
-		(15_771_000 as Weight)
+		(17_014_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn set_payee() -> Weight {
-		(13_329_000 as Weight)
+		(14_816_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_controller() -> Weight {
-		(29_807_000 as Weight)
+		(33_600_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn set_validator_count() -> Weight {
-		(2_323_000 as Weight)
+		(2_706_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_no_eras() -> Weight {
-		(2_528_000 as Weight)
+		(2_973_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_new_era() -> Weight {
-		(2_529_000 as Weight)
+		(2_949_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_new_era_always() -> Weight {
-		(2_527_000 as Weight)
+		(3_011_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_invulnerables(v: u32, ) -> Weight {
-		(2_661_000 as Weight)
+		(3_078_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((35_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((5_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_unstake(s: u32, ) -> Weight {
-		(64_650_000 as Weight)
+		(69_220_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((2_755_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((3_070_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn cancel_deferred_slash(s: u32, ) -> Weight {
-		(5_904_642_000 as Weight)
-			// Standard Error: 393_000
-			.saturating_add((34_810_000 as Weight).saturating_mul(s as Weight))
+		(3_460_399_000 as Weight)
+			// Standard Error: 222_000
+			.saturating_add((19_782_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn payout_stakers_dead_controller(n: u32, ) -> Weight {
-		(131_368_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((52_611_000 as Weight).saturating_mul(n as Weight))
+		(120_436_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((63_092_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(n as Weight)))
 	}
 	fn payout_stakers_alive_staked(n: u32, ) -> Weight {
-		(165_079_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((66_740_000 as Weight).saturating_mul(n as Weight))
+		(181_424_000 as Weight)
+			// Standard Error: 51_000
+			.saturating_add((78_631_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(11 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((5 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(n as Weight)))
 	}
 	fn rebond(l: u32, ) -> Weight {
-		(37_039_000 as Weight)
+		(59_349_000 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((93_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add((64_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn set_history_depth(e: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 71_000
-			.saturating_add((34_403_000 as Weight).saturating_mul(e as Weight))
+			// Standard Error: 97_000
+			.saturating_add((44_609_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((7 as Weight).saturating_mul(e as Weight)))
 	}
 	fn reap_stash(s: u32, ) -> Weight {
-		(67_561_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((2_766_000 as Weight).saturating_mul(s as Weight))
+		(72_356_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((3_066_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn new_era(v: u32, n: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 1_016_000
-			.saturating_add((389_979_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 51_000
-			.saturating_add((63_208_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 1_462_000
+			.saturating_add((393_007_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 73_000
+			.saturating_add((72_014_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
@@ -413,21 +413,21 @@ impl WeightInfo for () {
 	}
 	fn get_npos_voters(v: u32, n: u32, s: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 95_000
-			.saturating_add((26_419_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 95_000
-			.saturating_add((29_033_000 as Weight).saturating_mul(n as Weight))
-			// Standard Error: 1_305_000
-			.saturating_add((23_680_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 235_000
+			.saturating_add((35_212_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 235_000
+			.saturating_add((38_391_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 3_200_000
+			.saturating_add((31_130_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn get_npos_targets(v: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 32_000
-			.saturating_add((11_317_000 as Weight).saturating_mul(v as Weight))
+		(52_314_000 as Weight)
+			// Standard Error: 71_000
+			.saturating_add((15_195_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(v as Weight)))
 	}

From 5f5fbea7a787d8b5db6133530e1dbb0606c08cf1 Mon Sep 17 00:00:00 2001
From: Niklas Adolfsson <niklasadolfsson1@gmail.com>
Date: Tue, 8 Jun 2021 18:17:25 +0200
Subject: [PATCH 0847/1194] deps(jsonrpsee): update to 0.2.0 to avoid alpha
 (#9036)

The motivation is a couple of bug fixes and not to pin to certain alpha versions.
---
 Cargo.lock                                  | 424 ++++++++++++--------
 utils/frame/remote-externalities/Cargo.toml |   6 +-
 2 files changed, 258 insertions(+), 172 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8a25ba6c7a48..cc8557daad2f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -349,19 +349,6 @@ version = "4.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0"
 
-[[package]]
-name = "async-tls"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f23d769dbf1838d5df5156e7b1ad404f4c463d1ac2c6aeb6cd943630f8a8400"
-dependencies = [
- "futures-core",
- "futures-io",
- "rustls 0.19.0",
- "webpki 0.21.4",
- "webpki-roots",
-]
-
 [[package]]
 name = "async-trait"
 version = "0.1.48"
@@ -474,6 +461,9 @@ name = "beef"
 version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6736e2428df2ca2848d846c43e88745121a6654696e349ce0054a420815a7409"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "bincode"
@@ -938,7 +928,17 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
 dependencies = [
- "core-foundation-sys",
+ "core-foundation-sys 0.7.0",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62"
+dependencies = [
+ "core-foundation-sys 0.8.2",
  "libc",
 ]
 
@@ -948,6 +948,12 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
 
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b"
+
 [[package]]
 name = "cpp_demangle"
 version = "0.3.2"
@@ -1604,7 +1610,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
 ]
 
 [[package]]
@@ -1676,7 +1682,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c6447e2f8178843749e8c8003206def83ec124a7859475395777a28b5338647c"
 dependencies = [
  "either",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "log",
  "num-traits",
@@ -2020,9 +2026,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678"
 
 [[package]]
 name = "futures"
-version = "0.3.13"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f55667319111d593ba876406af7c409c0ebb44dc4be6132a783ccf163ea14c1"
+checksum = "0e7e43a803dae2fa37c1f6a8fe121e1f7bf9548b4dfc0522a42f34145dadfc27"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2035,9 +2041,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.13"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c2dd2df839b57db9ab69c2c9d8f3e8c81984781937fe2807dc6dcf3b2ad2939"
+checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -2045,9 +2051,9 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.13"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15496a72fabf0e62bdc3df11a59a3787429221dd0710ba8ef163d6f7a9112c94"
+checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1"
 
 [[package]]
 name = "futures-cpupool"
@@ -2066,7 +2072,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdcef58a173af8148b182684c9f2d5250875adbcaff7b5794073894f9d8634a9"
 dependencies = [
  "futures 0.1.31",
- "futures 0.3.13",
+ "futures 0.3.15",
  "lazy_static",
  "log",
  "parking_lot 0.9.0",
@@ -2077,9 +2083,9 @@ dependencies = [
 
 [[package]]
 name = "futures-executor"
-version = "0.3.13"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "891a4b7b96d84d5940084b2a37632dd65deeae662c114ceaa2c879629c9c0ad1"
+checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -2089,9 +2095,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.13"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71c2c65c57704c32f5241c1223167c2c3294fd34ac020c807ddbe6db287ba59"
+checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1"
 
 [[package]]
 name = "futures-lite"
@@ -2110,10 +2116,11 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.13"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea405816a5139fb39af82c2beb921d52143f556038378d6db21183a5c37fbfb7"
+checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121"
 dependencies = [
+ "autocfg",
  "proc-macro-hack",
  "proc-macro2",
  "quote",
@@ -2127,21 +2134,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3a1387e07917c711fb4ee4f48ea0adb04a3c9739e53ef85bf43ae1edc2937a8b"
 dependencies = [
  "futures-io",
- "rustls 0.19.0",
- "webpki 0.21.4",
+ "rustls 0.19.1",
+ "webpki",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.13"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85754d98985841b7d4f5e8e6fbfa4a4ac847916893ec511a2917ccd8525b8bb3"
+checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282"
 
 [[package]]
 name = "futures-task"
-version = "0.3.13"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa189ef211c15ee602667a6fcfe1c1fd9e07d42250d2156382820fba33c9df80"
+checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae"
 
 [[package]]
 name = "futures-timer"
@@ -2161,10 +2168,11 @@ dependencies = [
 
 [[package]]
 name = "futures-util"
-version = "0.3.13"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1812c7ab8aedf8d6f2701a43e1243acdbcc2b36ab26e2ad421eb99ac963d96d1"
+checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967"
 dependencies = [
+ "autocfg",
  "futures 0.1.31",
  "futures-channel",
  "futures-core",
@@ -2514,6 +2522,17 @@ dependencies = [
  "http 0.2.3",
 ]
 
+[[package]]
+name = "http-body"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60daa14be0e0786db0f03a9e57cb404c9d756eed2b6c62b9ea98ec5743ec75a9"
+dependencies = [
+ "bytes 1.0.1",
+ "http 0.2.3",
+ "pin-project-lite 0.2.6",
+]
+
 [[package]]
 name = "httparse"
 version = "1.3.5"
@@ -2595,6 +2614,28 @@ dependencies = [
  "want 0.3.0",
 ]
 
+[[package]]
+name = "hyper"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bf09f61b52cfcf4c00de50df88ae423d6c02354e385a86341133b5338630ad1"
+dependencies = [
+ "bytes 1.0.1",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "http 0.2.3",
+ "http-body 0.4.2",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project 1.0.5",
+ "tokio 1.6.0",
+ "tower-service",
+ "tracing",
+ "want 0.3.0",
+]
+
 [[package]]
 name = "hyper-rustls"
 version = "0.21.0"
@@ -2607,10 +2648,10 @@ dependencies = [
  "hyper 0.13.10",
  "log",
  "rustls 0.18.1",
- "rustls-native-certs",
+ "rustls-native-certs 0.4.0",
  "tokio 0.2.25",
- "tokio-rustls",
- "webpki 0.21.4",
+ "tokio-rustls 0.14.1",
+ "webpki",
 ]
 
 [[package]]
@@ -2663,7 +2704,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a6d52908d4ea4ab2bc22474ba149bf1011c8e2c3ebc1ff593ae28ac44f494b6"
 dependencies = [
  "async-io",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-lite",
  "if-addrs",
  "ipnet",
@@ -2739,7 +2780,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64fa110ec7b8f493f416eed552740d10e7030ad5f63b2308f82c9608ec2df275"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 2.0.2",
 ]
 
@@ -2943,9 +2984,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-proc-macros"
-version = "0.2.0-alpha.6"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5784ee8bb31988fa2c7a755fe31b0e21aa51894a67e5c99b6d4470f0253bf31a"
+checksum = "3b4c85cfa6767333f3e5f3b2f2f765dad2727b0033ee270ae07c599bf43ed5ae"
 dependencies = [
  "Inflector",
  "proc-macro-crate 1.0.0",
@@ -2956,40 +2997,44 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-types"
-version = "0.2.0-alpha.6"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab3dabceeeeb865897661d532d47202eaae71cd2c606f53cb69f1fbc0555a51"
+checksum = "c0cf7bd4e93b3b56e59131de7f24afbea871faf914e97bcdd942c86927ab0172"
 dependencies = [
  "async-trait",
  "beef",
  "futures-channel",
  "futures-util",
+ "hyper 0.14.5",
  "log",
  "serde",
  "serde_json",
+ "soketto 0.5.0",
  "thiserror",
 ]
 
 [[package]]
 name = "jsonrpsee-ws-client"
-version = "0.2.0-alpha.6"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6fdb4390bd25358c62e8b778652a564a1723ba07dca0feb3da439c2253fe59f"
+checksum = "6ec51150965544e1a4468f372bdab8545243a1b045d4ab272023aac74c60de32"
 dependencies = [
- "async-std",
- "async-tls",
  "async-trait",
  "fnv",
- "futures 0.3.13",
+ "futures 0.3.15",
  "jsonrpsee-types",
  "log",
  "pin-project 1.0.5",
+ "rustls 0.19.1",
+ "rustls-native-certs 0.5.0",
  "serde",
  "serde_json",
- "soketto",
+ "soketto 0.5.0",
  "thiserror",
+ "tokio 0.2.25",
+ "tokio-rustls 0.15.0",
+ "tokio-util",
  "url 2.2.1",
- "webpki 0.22.0",
 ]
 
 [[package]]
@@ -3073,7 +3118,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eb1e98ba343d0b35f9009a8844cd2b87fa3192f7e79033ac05b00aeae0f3b0b5"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "js-sys",
  "kvdb",
  "kvdb-memorydb",
@@ -3105,9 +3150,9 @@ checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a"
 
 [[package]]
 name = "libc"
-version = "0.2.90"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba4aede83fc3617411dc6993bc8c70919750c1c257c6ca6a502aed6e0e2394ae"
+checksum = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36"
 
 [[package]]
 name = "libloading"
@@ -3143,7 +3188,7 @@ checksum = "08053fbef67cd777049ef7a95ebaca2ece370b4ed7712c3fa404d69a88cb741b"
 dependencies = [
  "atomic",
  "bytes 1.0.1",
- "futures 0.3.13",
+ "futures 0.3.15",
  "lazy_static",
  "libp2p-core",
  "libp2p-deflate",
@@ -3185,7 +3230,7 @@ dependencies = [
  "ed25519-dalek",
  "either",
  "fnv",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "lazy_static",
  "libsecp256k1",
@@ -3215,7 +3260,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2181a641cd15f9b6ba71b1335800f309012a0a97a29ffaabbbf40e9d3d58f08"
 dependencies = [
  "flate2",
- "futures 0.3.13",
+ "futures 0.3.15",
  "libp2p-core",
 ]
 
@@ -3226,7 +3271,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62e63dab8b5ff35e0c101a3e51e843ba782c07bbb1682f5fd827622e0d02b98b"
 dependencies = [
  "async-std-resolver",
- "futures 0.3.13",
+ "futures 0.3.15",
  "libp2p-core",
  "log",
  "smallvec 1.6.1",
@@ -3241,7 +3286,7 @@ checksum = "48a9b570f6766301d9c4aa00fce3554cad1598e2f466debbc4dde909028417cf"
 dependencies = [
  "cuckoofilter",
  "fnv",
- "futures 0.3.13",
+ "futures 0.3.15",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3262,7 +3307,7 @@ dependencies = [
  "byteorder",
  "bytes 1.0.1",
  "fnv",
- "futures 0.3.13",
+ "futures 0.3.15",
  "hex_fmt",
  "libp2p-core",
  "libp2p-swarm",
@@ -3283,7 +3328,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f668f00efd9883e8b7bcc582eaf0164615792608f886f6577da18bcbeea0a46"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3304,7 +3349,7 @@ dependencies = [
  "bytes 1.0.1",
  "either",
  "fnv",
- "futures 0.3.13",
+ "futures 0.3.15",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3328,7 +3373,7 @@ dependencies = [
  "async-io",
  "data-encoding",
  "dns-parser",
- "futures 0.3.13",
+ "futures 0.3.15",
  "if-watch",
  "lazy_static",
  "libp2p-core",
@@ -3348,7 +3393,7 @@ checksum = "85e9b544335d1ed30af71daa96edbefadef6f19c7a55f078b9fc92c87163105d"
 dependencies = [
  "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
- "futures 0.3.13",
+ "futures 0.3.15",
  "libp2p-core",
  "log",
  "nohash-hasher",
@@ -3366,7 +3411,7 @@ checksum = "36db0f0db3b0433f5b9463f1c0cd9eadc0a3734a9170439ce501ff99733a88bd"
 dependencies = [
  "bytes 1.0.1",
  "curve25519-dalek 3.0.2",
- "futures 0.3.13",
+ "futures 0.3.15",
  "lazy_static",
  "libp2p-core",
  "log",
@@ -3386,7 +3431,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf4bfaffac63bf3c7ec11ed9d8879d455966ddea7e78ee14737f0b6dce0d1cd1"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3403,7 +3448,7 @@ checksum = "0c8c37b4d2a075b4be8442760a5f8c037180f0c8dd5b5734b9978ab868b3aa11"
 dependencies = [
  "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
- "futures 0.3.13",
+ "futures 0.3.15",
  "libp2p-core",
  "log",
  "prost",
@@ -3418,7 +3463,7 @@ version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ce3374f3b28162db9d3442c9347c4f14cb01e8290052615c7d341d40eae0599"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "log",
  "pin-project 1.0.5",
  "rand 0.7.3",
@@ -3434,7 +3479,7 @@ checksum = "0b8786aca3f18671d8776289706a5521f6c9124a820f69e358de214b9939440d"
 dependencies = [
  "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "libp2p-core",
  "libp2p-swarm",
@@ -3457,7 +3502,7 @@ checksum = "1cdbe172f08e6d0f95fa8634e273d4c4268c4063de2e33e7435194b0130c62e3"
 dependencies = [
  "async-trait",
  "bytes 1.0.1",
- "futures 0.3.13",
+ "futures 0.3.15",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3476,7 +3521,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e04d8e1eef675029ec728ba14e8d0da7975d84b6679b699b4ae91a1de9c3a92"
 dependencies = [
  "either",
- "futures 0.3.13",
+ "futures 0.3.15",
  "libp2p-core",
  "log",
  "rand 0.7.3",
@@ -3502,7 +3547,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b1a27d21c477951799e99d5c105d78868258502ce092988040a808d5a19bbd9"
 dependencies = [
  "async-io",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "if-watch",
  "ipnet",
@@ -3519,7 +3564,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ffd6564bb3b7ff203661ccbb69003c2b551e34cef974f2d6c6a28306a12170b5"
 dependencies = [
  "async-std",
- "futures 0.3.13",
+ "futures 0.3.15",
  "libp2p-core",
  "log",
 ]
@@ -3530,7 +3575,7 @@ version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cef45d61e43c313531b5e903e4e8415212ff6338e0c54c47da5b9b412b5760de"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "js-sys",
  "libp2p-core",
  "parity-send-wrapper",
@@ -3545,13 +3590,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cace60995ef6f637e4752cccbb2590f6bc358e8741a0d066307636c69a4b3a74"
 dependencies = [
  "either",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-rustls",
  "libp2p-core",
  "log",
  "quicksink",
  "rw-stream-sink",
- "soketto",
+ "soketto 0.4.2",
  "url 2.2.1",
  "webpki-roots",
 ]
@@ -3562,7 +3607,7 @@ version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f35da42cfc6d5cb0dcf3ad6881bc68d146cdf38f98655e09e33fbba4d13eabc4"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "libp2p-core",
  "parking_lot 0.11.1",
  "thiserror",
@@ -4010,7 +4055,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d91ec0a2440aaff5f78ec35631a7027d50386c6163aa975f7caa0d5da4b6ff8"
 dependencies = [
  "bytes 1.0.1",
- "futures 0.3.13",
+ "futures 0.3.15",
  "log",
  "pin-project 1.0.5",
  "smallvec 1.6.1",
@@ -4083,7 +4128,7 @@ version = "0.8.0"
 dependencies = [
  "derive_more",
  "fs_extra",
- "futures 0.3.13",
+ "futures 0.3.15",
  "hash-db",
  "hex",
  "kvdb",
@@ -4119,7 +4164,7 @@ dependencies = [
 name = "node-browser-testing"
 version = "2.0.0"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "jsonrpc-core",
  "libp2p",
@@ -4141,7 +4186,7 @@ dependencies = [
  "frame-benchmarking-cli",
  "frame-support",
  "frame-system",
- "futures 0.3.13",
+ "futures 0.3.15",
  "hex-literal",
  "libp2p-wasm-ext",
  "log",
@@ -4189,7 +4234,7 @@ dependencies = [
  "sc-transaction-pool",
  "serde",
  "serde_json",
- "soketto",
+ "soketto 0.4.2",
  "sp-authority-discovery",
  "sp-authorship",
  "sp-consensus",
@@ -4222,7 +4267,7 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "futures 0.3.13",
+ "futures 0.3.15",
  "node-primitives",
  "node-runtime",
  "node-testing",
@@ -4484,7 +4529,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "fs_extra",
- "futures 0.3.13",
+ "futures 0.3.15",
  "log",
  "node-executor",
  "node-primitives",
@@ -6746,7 +6791,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "tokio 1.6.0",
+ "tokio 0.2.25",
 ]
 
 [[package]]
@@ -6858,20 +6903,20 @@ dependencies = [
  "log",
  "ring",
  "sct",
- "webpki 0.21.4",
+ "webpki",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.19.0"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "064fd21ff87c6e87ed4506e68beb42459caa4a0e2eb144932e6776768556980b"
+checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
 dependencies = [
  "base64 0.13.0",
  "log",
  "ring",
  "sct",
- "webpki 0.21.4",
+ "webpki",
 ]
 
 [[package]]
@@ -6883,7 +6928,19 @@ dependencies = [
  "openssl-probe",
  "rustls 0.18.1",
  "schannel",
- "security-framework",
+ "security-framework 1.0.0",
+]
+
+[[package]]
+name = "rustls-native-certs"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092"
+dependencies = [
+ "openssl-probe",
+ "rustls 0.19.1",
+ "schannel",
+ "security-framework 2.3.0",
 ]
 
 [[package]]
@@ -6908,7 +6965,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "pin-project 0.4.27",
  "static_assertions",
 ]
@@ -6953,7 +7010,7 @@ dependencies = [
  "async-trait",
  "derive_more",
  "either",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "ip_network",
  "libp2p",
@@ -6982,7 +7039,7 @@ dependencies = [
 name = "sc-basic-authorship"
 version = "0.9.0"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "log",
  "parity-scale-codec",
@@ -7056,7 +7113,7 @@ version = "0.9.0"
 dependencies = [
  "chrono",
  "fdlimit",
- "futures 0.3.13",
+ "futures 0.3.15",
  "hex",
  "libp2p",
  "log",
@@ -7094,7 +7151,7 @@ version = "3.0.0"
 dependencies = [
  "derive_more",
  "fnv",
- "futures 0.3.13",
+ "futures 0.3.15",
  "hash-db",
  "kvdb",
  "kvdb-memorydb",
@@ -7176,7 +7233,7 @@ version = "0.9.0"
 dependencies = [
  "async-trait",
  "derive_more",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "getrandom 0.2.3",
  "log",
@@ -7219,7 +7276,7 @@ dependencies = [
  "async-trait",
  "derive_more",
  "fork-tree",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "log",
  "merlin",
@@ -7273,7 +7330,7 @@ name = "sc-consensus-babe-rpc"
 version = "0.9.0"
 dependencies = [
  "derive_more",
- "futures 0.3.13",
+ "futures 0.3.15",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -7316,7 +7373,7 @@ dependencies = [
  "assert_matches",
  "async-trait",
  "derive_more",
- "futures 0.3.13",
+ "futures 0.3.15",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -7354,7 +7411,7 @@ version = "0.9.0"
 dependencies = [
  "async-trait",
  "derive_more",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "log",
  "parity-scale-codec",
@@ -7376,7 +7433,7 @@ name = "sc-consensus-slots"
 version = "0.9.0"
 dependencies = [
  "async-trait",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "impl-trait-for-tuples",
  "log",
@@ -7506,7 +7563,7 @@ dependencies = [
  "dyn-clone",
  "finality-grandpa",
  "fork-tree",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "linked-hash-map",
  "log",
@@ -7551,7 +7608,7 @@ version = "0.9.0"
 dependencies = [
  "derive_more",
  "finality-grandpa",
- "futures 0.3.13",
+ "futures 0.3.15",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -7581,7 +7638,7 @@ version = "0.9.0"
 dependencies = [
  "derive_more",
  "finality-grandpa",
- "futures 0.3.13",
+ "futures 0.3.15",
  "log",
  "num-traits",
  "parity-scale-codec",
@@ -7606,7 +7663,7 @@ name = "sc-informant"
 version = "0.9.0"
 dependencies = [
  "ansi_term 0.12.1",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "log",
  "parity-util-mem",
@@ -7624,7 +7681,7 @@ version = "3.0.0"
 dependencies = [
  "async-trait",
  "derive_more",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-util",
  "hex",
  "merlin",
@@ -7673,7 +7730,7 @@ dependencies = [
  "erased-serde",
  "fnv",
  "fork-tree",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "hex",
  "ip_network",
@@ -7721,7 +7778,7 @@ name = "sc-network-gossip"
 version = "0.9.0"
 dependencies = [
  "async-std",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "libp2p",
  "log",
@@ -7742,7 +7799,7 @@ version = "0.8.0"
 dependencies = [
  "async-std",
  "async-trait",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "libp2p",
  "log",
@@ -7770,7 +7827,7 @@ version = "3.0.0"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "hex",
  "hyper 0.13.10",
@@ -7804,7 +7861,7 @@ dependencies = [
 name = "sc-peerset"
 version = "3.0.0"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "libp2p",
  "log",
  "rand 0.7.3",
@@ -7827,7 +7884,7 @@ version = "3.0.0"
 dependencies = [
  "assert_matches",
  "futures 0.1.31",
- "futures 0.3.13",
+ "futures 0.3.15",
  "hash-db",
  "jsonrpc-core",
  "jsonrpc-pubsub",
@@ -7869,7 +7926,7 @@ name = "sc-rpc-api"
 version = "0.9.0"
 dependencies = [
  "derive_more",
- "futures 0.3.13",
+ "futures 0.3.15",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -7928,7 +7985,7 @@ dependencies = [
  "directories",
  "exit-future",
  "futures 0.1.31",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "hash-db",
  "jsonrpc-core",
@@ -7996,7 +8053,7 @@ version = "2.0.0"
 dependencies = [
  "fdlimit",
  "futures 0.1.31",
- "futures 0.3.13",
+ "futures 0.3.15",
  "hex-literal",
  "log",
  "parity-scale-codec",
@@ -8064,7 +8121,7 @@ name = "sc-telemetry"
 version = "3.0.0"
 dependencies = [
  "chrono",
- "futures 0.3.13",
+ "futures 0.3.15",
  "libp2p",
  "log",
  "parking_lot 0.11.1",
@@ -8131,7 +8188,7 @@ dependencies = [
  "assert_matches",
  "criterion",
  "derive_more",
- "futures 0.3.13",
+ "futures 0.3.15",
  "linked-hash-map",
  "log",
  "parity-scale-codec",
@@ -8154,7 +8211,7 @@ name = "sc-transaction-pool"
 version = "3.0.0"
 dependencies = [
  "assert_matches",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-diagnose",
  "hex",
  "intervalier",
@@ -8268,10 +8325,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ad502866817f0575705bd7be36e2b2535cc33262d493aa733a2ec862baa2bc2b"
 dependencies = [
  "bitflags",
- "core-foundation",
- "core-foundation-sys",
+ "core-foundation 0.7.0",
+ "core-foundation-sys 0.7.0",
  "libc",
- "security-framework-sys",
+ "security-framework-sys 1.0.0",
+]
+
+[[package]]
+name = "security-framework"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b239a3d5db51252f6f48f42172c65317f37202f4a21021bf5f9d40a408f4592c"
+dependencies = [
+ "bitflags",
+ "core-foundation 0.9.1",
+ "core-foundation-sys 0.8.2",
+ "libc",
+ "security-framework-sys 2.3.0",
 ]
 
 [[package]]
@@ -8280,7 +8350,17 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "51ceb04988b17b6d1dcd555390fa822ca5637b4a14e1f5099f13d351bed4d6c7"
 dependencies = [
- "core-foundation-sys",
+ "core-foundation-sys 0.7.0",
+ "libc",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e4effb91b4b8b6fb7732e670b6cee160278ff8e6bf485c7805d9e319d76e284"
+dependencies = [
+ "core-foundation-sys 0.8.2",
  "libc",
 ]
 
@@ -8572,13 +8652,28 @@ dependencies = [
  "base64 0.12.3",
  "bytes 0.5.6",
  "flate2",
- "futures 0.3.13",
+ "futures 0.3.15",
  "httparse",
  "log",
  "rand 0.7.3",
  "sha-1 0.9.4",
 ]
 
+[[package]]
+name = "soketto"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4919971d141dbadaa0e82b5d369e2d7666c98e4625046140615ca363e50d4daa"
+dependencies = [
+ "base64 0.13.0",
+ "bytes 1.0.1",
+ "futures 0.3.15",
+ "httparse",
+ "log",
+ "rand 0.8.3",
+ "sha-1 0.9.4",
+]
+
 [[package]]
 name = "sp-allocator"
 version = "3.0.0"
@@ -8728,7 +8823,7 @@ dependencies = [
 name = "sp-blockchain"
 version = "3.0.0"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "log",
  "lru",
  "parity-scale-codec",
@@ -8754,7 +8849,7 @@ name = "sp-consensus"
 version = "0.9.0"
 dependencies = [
  "async-trait",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "libp2p",
  "log",
@@ -8854,7 +8949,7 @@ dependencies = [
  "criterion",
  "dyn-clonable",
  "ed25519-dalek",
- "futures 0.3.13",
+ "futures 0.3.15",
  "hash-db",
  "hash256-std-hasher",
  "hex",
@@ -8942,7 +9037,7 @@ name = "sp-inherents"
 version = "3.0.0"
 dependencies = [
  "async-trait",
- "futures 0.3.13",
+ "futures 0.3.15",
  "impl-trait-for-tuples",
  "parity-scale-codec",
  "sp-core",
@@ -8955,7 +9050,7 @@ dependencies = [
 name = "sp-io"
 version = "3.0.0"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "hash-db",
  "libsecp256k1",
  "log",
@@ -8991,7 +9086,7 @@ version = "0.9.0"
 dependencies = [
  "async-trait",
  "derive_more",
- "futures 0.3.13",
+ "futures 0.3.15",
  "merlin",
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -9327,7 +9422,7 @@ name = "sp-transaction-pool"
 version = "3.0.0"
 dependencies = [
  "derive_more",
- "futures 0.3.13",
+ "futures 0.3.15",
  "log",
  "parity-scale-codec",
  "serde",
@@ -9373,7 +9468,7 @@ dependencies = [
 name = "sp-utils"
 version = "3.0.0"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-core",
  "futures-timer 3.0.2",
  "lazy_static",
@@ -9539,7 +9634,7 @@ dependencies = [
  "chrono",
  "console_error_panic_hook",
  "futures 0.1.31",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "getrandom 0.2.3",
  "js-sys",
@@ -9582,7 +9677,7 @@ version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
- "futures 0.3.13",
+ "futures 0.3.15",
  "jsonrpc-client-transports",
  "jsonrpc-core",
  "parity-scale-codec",
@@ -9597,7 +9692,7 @@ name = "substrate-frame-rpc-system"
 version = "3.0.0"
 dependencies = [
  "frame-system-rpc-runtime-api",
- "futures 0.3.13",
+ "futures 0.3.15",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -9636,7 +9731,7 @@ version = "2.0.1"
 dependencies = [
  "async-trait",
  "futures 0.1.31",
- "futures 0.3.13",
+ "futures 0.3.15",
  "hash-db",
  "hex",
  "parity-scale-codec",
@@ -9666,7 +9761,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "frame-system-rpc-runtime-api",
- "futures 0.3.13",
+ "futures 0.3.15",
  "log",
  "memory-db",
  "pallet-babe",
@@ -9706,7 +9801,7 @@ dependencies = [
 name = "substrate-test-runtime-client"
 version = "2.0.0"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "parity-scale-codec",
  "sc-block-builder",
  "sc-client-api",
@@ -9727,7 +9822,7 @@ name = "substrate-test-runtime-transaction-pool"
 version = "2.0.0"
 dependencies = [
  "derive_more",
- "futures 0.3.13",
+ "futures 0.3.15",
  "parity-scale-codec",
  "parking_lot 0.11.1",
  "sc-transaction-graph",
@@ -9741,7 +9836,7 @@ dependencies = [
 name = "substrate-test-utils"
 version = "3.0.0"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "sc-service",
  "substrate-test-utils-derive",
  "tokio 0.2.25",
@@ -9863,7 +9958,7 @@ version = "0.9.0"
 dependencies = [
  "env_logger 0.7.1",
  "frame-system",
- "futures 0.3.13",
+ "futures 0.3.15",
  "jsonrpc-core",
  "log",
  "sc-basic-authorship",
@@ -10085,7 +10180,7 @@ dependencies = [
  "pin-project-lite 0.1.12",
  "signal-hook-registry",
  "slab",
- "tokio-macros 0.2.6",
+ "tokio-macros",
  "winapi 0.3.9",
 ]
 
@@ -10097,7 +10192,6 @@ checksum = "bd3076b5c8cc18138b8f8814895c11eb4de37114a5d127bafdc5e55798ceef37"
 dependencies = [
  "autocfg",
  "pin-project-lite 0.2.6",
- "tokio-macros 1.2.0",
 ]
 
 [[package]]
@@ -10175,17 +10269,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "tokio-macros"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c49e3df43841dafb86046472506755d8501c5615673955f6aa17181125d13c37"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "tokio-named-pipes"
 version = "0.1.0"
@@ -10227,7 +10310,19 @@ dependencies = [
  "futures-core",
  "rustls 0.18.1",
  "tokio 0.2.25",
- "webpki 0.21.4",
+ "webpki",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03d15e5669243a45f630a5167d101b942174ca94b615445b2057eace1c818736"
+dependencies = [
+ "futures-core",
+ "rustls 0.19.1",
+ "tokio 0.2.25",
+ "webpki",
 ]
 
 [[package]]
@@ -10333,6 +10428,7 @@ checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499"
 dependencies = [
  "bytes 0.5.6",
  "futures-core",
+ "futures-io",
  "futures-sink",
  "log",
  "pin-project-lite 0.1.12",
@@ -10935,7 +11031,7 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "js-sys",
  "parking_lot 0.11.1",
  "pin-utils",
@@ -11219,23 +11315,13 @@ dependencies = [
  "untrusted",
 ]
 
-[[package]]
-name = "webpki"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
-dependencies = [
- "ring",
- "untrusted",
-]
-
 [[package]]
 name = "webpki-roots"
 version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "82015b7e0b8bad8185994674a13a93306bea76cf5a16c5a181382fd3a5ec2376"
 dependencies = [
- "webpki 0.21.4",
+ "webpki",
 ]
 
 [[package]]
@@ -11348,7 +11434,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e7d9028f208dd5e63c614be69f115c1b53cacc1111437d4c765185856666c107"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "log",
  "nohash-hasher",
  "parking_lot 0.11.1",
diff --git a/utils/frame/remote-externalities/Cargo.toml b/utils/frame/remote-externalities/Cargo.toml
index 4fe0cf979c1b..8f62d977baed 100644
--- a/utils/frame/remote-externalities/Cargo.toml
+++ b/utils/frame/remote-externalities/Cargo.toml
@@ -13,8 +13,8 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-jsonrpsee-ws-client = { version = "=0.2.0-alpha.6", default-features = false }
-jsonrpsee-proc-macros = "=0.2.0-alpha.6"
+jsonrpsee-ws-client = { version = "0.2.0", default-features = false, features = ["tokio02"] }
+jsonrpsee-proc-macros = "0.2.0"
 
 hex = "0.4.0"
 env_logger = "0.8.2"
@@ -28,7 +28,7 @@ sp-core = { version = "3.0.0", path = "../../../primitives/core" }
 sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
 
 [dev-dependencies]
-tokio = { version = "1.6.0", features = ["macros", "rt"] }
+tokio = { version = "0.2", features = ["macros", "rt-threaded"] }
 pallet-elections-phragmen = { path = "../../../frame/elections-phragmen", version = "4.0.0" }
 frame-support = { path = "../../../frame/support", version = "3.0.0" }
 

From b493dd3fa5d7f07c369562004870046a53a3f3c8 Mon Sep 17 00:00:00 2001
From: Zeke Mostov <32168567+emostov@users.noreply.github.com>
Date: Tue, 8 Jun 2021 10:26:08 -0700
Subject: [PATCH 0848/1194] Small doc updates to
 `election-provider-multi-phase` (#9041)

* Small doc updates to election-provider-multi-phase

* small change

* Improve challenge phase docs

* An honest
---
 .../election-provider-multi-phase/src/lib.rs  | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index 9bec5cc4bd31..a4ca89a417e0 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -45,6 +45,7 @@
 //! Each of the phases can be disabled by essentially setting their length to zero. If both phases
 //! have length zero, then the pallet essentially runs only the fallback strategy, denoted by
 //! [`Config::Fallback`].
+//!
 //! ### Signed Phase
 //!
 //!	In the signed phase, solutions (of type [`RawSolution`]) are submitted and queued on chain. A
@@ -158,15 +159,15 @@
 //!
 //! ## Future Plans
 //!
-//! **Challenge Phase**. We plan adding a third phase to the pallet, called the challenge phase.
-//! This is phase in which no further solutions are processed, and the current best solution might
+//! **Challenge Phase**. We plan on adding a third phase to the pallet, called the challenge phase.
+//! This is a phase in which no further solutions are processed, and the current best solution might
 //! be challenged by anyone (signed or unsigned). The main plan here is to enforce the solution to
 //! be PJR. Checking PJR on-chain is quite expensive, yet proving that a solution is **not** PJR is
-//! rather cheap. If a queued solution is challenged:
+//! rather cheap. If a queued solution is successfully proven bad:
 //!
 //! 1. We must surely slash whoever submitted that solution (might be a challenge for unsigned
 //!    solutions).
-//! 2. It is probably fine to fallback to the on-chain election, as we expect this to happen rarely.
+//! 2. We will fallback to the emergency strategy (likely extending the current era).
 //!
 //! **Bailing out**. The functionality of bailing out of a queued solution is nice. A miner can
 //! submit a solution as soon as they _think_ it is high probability feasible, and do the checks
@@ -174,11 +175,11 @@
 //! portion of the bond).
 //!
 //! **Conditionally open unsigned phase**: Currently, the unsigned phase is always opened. This is
-//! useful because an honest validation will run our OCW code, which should be good enough to trump
-//! a mediocre or malicious signed submission (assuming in the absence of honest signed bots). If an
-//! when the signed submissions are checked against an absolute measure (e.g. PJR), then we can only
-//! open the unsigned phase in extreme conditions (i.e. "not good signed solution received") to
-//! spare some work in the validators
+//! useful because an honest validator will run substrate OCW code, which should be good enough to trump
+//! a mediocre or malicious signed submission (assuming in the absence of honest signed bots).
+//! If there are signed submissions, they can be checked against an absolute measure (e.g. PJR),
+//! then we can only open the unsigned phase in extreme conditions (i.e. "no good signed solution
+//! received") to spare some work for the active validators.
 //!
 //! **Allow smaller solutions and build up**: For now we only allow solutions that are exactly
 //! [`DesiredTargets`], no more, no less. Over time, we can change this to a [min, max] where any

From f775d0de6bddeba53ab35bc662fb076291e5260e Mon Sep 17 00:00:00 2001
From: David <dvdplm@gmail.com>
Date: Tue, 8 Jun 2021 20:10:16 +0200
Subject: [PATCH 0849/1194] Misc telemetry polish (#8484)

* Remove TelemetryWorker::with_transport
Make logging more useful

* Re-instate TelemetryWorker::with_transport

* Fix typo, don't spam
---
 client/telemetry/src/lib.rs  | 22 +++-----------------
 client/telemetry/src/node.rs | 40 ++++++++++++++++++++----------------
 2 files changed, 25 insertions(+), 37 deletions(-)

diff --git a/client/telemetry/src/lib.rs b/client/telemetry/src/lib.rs
index 06c82d44ab38..842d89d7edf0 100644
--- a/client/telemetry/src/lib.rs
+++ b/client/telemetry/src/lib.rs
@@ -122,21 +122,11 @@ impl TelemetryWorker {
 	///
 	/// Only one is needed per process.
 	pub fn new(buffer_size: usize) -> Result<Self> {
-		let transport = initialize_transport(None)?;
-		let (message_sender, message_receiver) = mpsc::channel(buffer_size);
-		let (register_sender, register_receiver) = mpsc::unbounded();
-
-		Ok(Self {
-			message_receiver,
-			message_sender,
-			register_receiver,
-			register_sender,
-			id_counter: Arc::new(atomic::AtomicU64::new(1)),
-			transport,
-		})
+		Self::with_transport(buffer_size, None)
 	}
 
-	/// Instantiate a new [`TelemetryWorker`] which can run in background.
+	/// Instantiate a new [`TelemetryWorker`] with the given [`ExtTransport`]
+	/// which can run in background.
 	///
 	/// Only one is needed per process.
 	pub fn with_transport(buffer_size: usize, transport: Option<ExtTransport>) -> Result<Self> {
@@ -312,12 +302,6 @@ impl TelemetryWorker {
 
 		for (node_max_verbosity, addr) in nodes {
 			if verbosity > *node_max_verbosity {
-				log::trace!(
-					target: "telemetry",
-					"Skipping {} for log entry with verbosity {:?}",
-					addr,
-					verbosity,
-				);
 				continue;
 			}
 
diff --git a/client/telemetry/src/node.rs b/client/telemetry/src/node.rs
index 2d1a04b00a4c..9ac7ada4e5d6 100644
--- a/client/telemetry/src/node.rs
+++ b/client/telemetry/src/node.rs
@@ -73,8 +73,9 @@ enum NodeSocket<TTrans: Transport> {
 
 impl<TTrans: Transport> NodeSocket<TTrans> {
 	fn wait_reconnect() -> NodeSocket<TTrans> {
-		let random_delay = rand::thread_rng().gen_range(5, 10);
+		let random_delay = rand::thread_rng().gen_range(10, 20);
 		let delay = Delay::new(Duration::from_secs(random_delay));
+		log::trace!(target: "telemetry", "Pausing for {} secs before reconnecting", random_delay);
 		NodeSocket::WaitingReconnect(delay)
 	}
 }
@@ -214,11 +215,11 @@ where
 				},
 				NodeSocket::ReconnectNow => match self.transport.clone().dial(self.addr.clone()) {
 					Ok(d) => {
-						log::debug!(target: "telemetry", "Started dialing {}", self.addr);
+						log::trace!(target: "telemetry", "Re-dialing {}", self.addr);
 						socket = NodeSocket::Dialing(d);
 					}
 					Err(err) => {
-						log::warn!(target: "telemetry", "❌ Error while dialing {}: {:?}", self.addr, err);
+						log::warn!(target: "telemetry", "❌ Error while re-dialing {}: {:?}", self.addr, err);
 						socket = NodeSocket::wait_reconnect();
 					}
 				},
@@ -236,16 +237,18 @@ where
 			}
 		};
 
-		// The Dispatcher blocks when the Node sinks blocks. This is why it is important that the
-		// Node sinks doesn't go into "Pending" state while waiting for reconnection but rather
+		// The Dispatcher blocks when the Node syncs blocks. This is why it is important that the
+		// Node sinks don't go into "Pending" state while waiting for reconnection but rather
 		// discard the excess of telemetry messages.
 		Poll::Ready(Ok(()))
 	}
 
 	fn start_send(mut self: Pin<&mut Self>, item: TelemetryPayload) -> Result<(), Self::Error> {
+		// Any buffered outgoing telemetry messages are discarded while (re-)connecting.
 		match &mut self.socket {
 			NodeSocket::Connected(conn) => match serde_json::to_vec(&item) {
 				Ok(data) => {
+					log::trace!(target: "telemetry", "Sending {} bytes", data.len());
 					let _ = conn.sink.start_send_unpin(data);
 				}
 				Err(err) => log::debug!(
@@ -254,18 +257,14 @@ where
 					err,
 				),
 			},
-			_socket => {
-				log::trace!(
-					target: "telemetry",
-					"Message has been discarded: {}",
-					serde_json::to_string(&item)
-						.unwrap_or_else(|err| format!(
-							"could not be serialized ({}): {:?}",
-							err,
-							item,
-						)),
-				);
-			}
+			// We are currently dialing the node.
+			NodeSocket::Dialing(_) => log::trace!(target: "telemetry", "Dialing"),
+			// A new connection should be started as soon as possible.
+			NodeSocket::ReconnectNow => log::trace!(target: "telemetry", "Reconnecting"),
+			// Waiting before attempting to dial again.
+			NodeSocket::WaitingReconnect(_) => {}
+			// Temporary transition state.
+			NodeSocket::Poisoned => log::trace!(target: "telemetry", "Poisoned"),
 		}
 		Ok(())
 	}
@@ -273,7 +272,12 @@ where
 	fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
 		match &mut self.socket {
 			NodeSocket::Connected(conn) => match conn.sink.poll_flush_unpin(cx) {
-				Poll::Ready(Err(_)) => {
+				Poll::Ready(Err(e)) => {
+					// When `telemetry` closes the websocket connection we end
+					// up here, which is sub-optimal. See
+					// https://github.com/libp2p/rust-libp2p/issues/2021 for
+					// what we could do to improve this.
+					log::trace!(target: "telemetry", "[poll_flush] Error: {:?}", e);
 					self.socket = NodeSocket::wait_reconnect();
 					Poll::Ready(Ok(()))
 				}

From 6749c701900747accaa35eaf2101586f09baef9e Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Tue, 8 Jun 2021 22:54:06 +0200
Subject: [PATCH 0850/1194] put the validate_unsigned implementation inside the
 pallet definition (#9044)

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 frame/babe/src/equivocation.rs    | 14 +++++++-------
 frame/babe/src/lib.rs             | 12 ++++++++++++
 frame/grandpa/src/equivocation.rs | 14 +++++++-------
 frame/grandpa/src/lib.rs          | 12 ++++++++++++
 4 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/frame/babe/src/equivocation.rs b/frame/babe/src/equivocation.rs
index 0fd74882c1b7..e9017205c6b5 100644
--- a/frame/babe/src/equivocation.rs
+++ b/frame/babe/src/equivocation.rs
@@ -179,12 +179,12 @@ where
 	}
 }
 
-/// A `ValidateUnsigned` implementation that restricts calls to `report_equivocation_unsigned`
-/// to local calls (i.e. extrinsics generated on this node) or that already in a block. This
-/// guarantees that only block authors can include unsigned equivocation reports.
-impl<T: Config> frame_support::unsigned::ValidateUnsigned for Pallet<T> {
-	type Call = Call<T>;
-	fn validate_unsigned(source: TransactionSource, call: &Self::Call) -> TransactionValidity {
+/// Methods for the `ValidateUnsigned` implementation:
+/// It restricts calls to `report_equivocation_unsigned` to local calls (i.e. extrinsics generated
+/// on this node) or that already in a block. This guarantees that only block authors can include
+/// unsigned equivocation reports.
+impl<T: Config> Pallet<T> {
+	pub fn validate_unsigned(source: TransactionSource, call: &Call<T>) -> TransactionValidity {
 		if let Call::report_equivocation_unsigned(equivocation_proof, key_owner_proof) = call {
 			// discard equivocation report not coming from the local node
 			match source {
@@ -221,7 +221,7 @@ impl<T: Config> frame_support::unsigned::ValidateUnsigned for Pallet<T> {
 		}
 	}
 
-	fn pre_dispatch(call: &Self::Call) -> Result<(), TransactionValidityError> {
+	pub fn pre_dispatch(call: &Call<T>) -> Result<(), TransactionValidityError> {
 		if let Call::report_equivocation_unsigned(equivocation_proof, key_owner_proof) = call {
 			is_known_offence::<T>(equivocation_proof, key_owner_proof)
 		} else {
diff --git a/frame/babe/src/lib.rs b/frame/babe/src/lib.rs
index 6eecf2675291..a0a9e01eaa26 100644
--- a/frame/babe/src/lib.rs
+++ b/frame/babe/src/lib.rs
@@ -407,6 +407,18 @@ pub mod pallet {
 			Ok(())
 		}
 	}
+
+	#[pallet::validate_unsigned]
+	impl<T: Config> ValidateUnsigned for Pallet<T> {
+		type Call = Call<T>;
+		fn validate_unsigned(source: TransactionSource, call: &Self::Call) -> TransactionValidity {
+			Self::validate_unsigned(source, call)
+		}
+
+		fn pre_dispatch(call: &Self::Call) -> Result<(), TransactionValidityError> {
+			Self::pre_dispatch(call)
+		}
+	}
 }
 
 /// A BABE public key
diff --git a/frame/grandpa/src/equivocation.rs b/frame/grandpa/src/equivocation.rs
index 24f56247d30e..0383d2d9a9be 100644
--- a/frame/grandpa/src/equivocation.rs
+++ b/frame/grandpa/src/equivocation.rs
@@ -200,12 +200,12 @@ pub struct GrandpaTimeSlot {
 	pub round: RoundNumber,
 }
 
-/// A `ValidateUnsigned` implementation that restricts calls to `report_equivocation_unsigned`
-/// to local calls (i.e. extrinsics generated on this node) or that already in a block. This
-/// guarantees that only block authors can include unsigned equivocation reports.
-impl<T: Config> frame_support::unsigned::ValidateUnsigned for Pallet<T> {
-	type Call = Call<T>;
-	fn validate_unsigned(source: TransactionSource, call: &Self::Call) -> TransactionValidity {
+/// Methods for the `ValidateUnsigned` implementation:
+/// It restricts calls to `report_equivocation_unsigned` to local calls (i.e. extrinsics generated
+/// on this node) or that already in a block. This guarantees that only block authors can include
+/// unsigned equivocation reports.
+impl<T: Config> Pallet<T> {
+	pub fn validate_unsigned(source: TransactionSource, call: &Call<T>) -> TransactionValidity {
 		if let Call::report_equivocation_unsigned(equivocation_proof, key_owner_proof) = call {
 			// discard equivocation report not coming from the local node
 			match source {
@@ -243,7 +243,7 @@ impl<T: Config> frame_support::unsigned::ValidateUnsigned for Pallet<T> {
 		}
 	}
 
-	fn pre_dispatch(call: &Self::Call) -> Result<(), TransactionValidityError> {
+	pub fn pre_dispatch(call: &Call<T>) -> Result<(), TransactionValidityError> {
 		if let Call::report_equivocation_unsigned(equivocation_proof, key_owner_proof) = call {
 			is_known_offence::<T>(equivocation_proof, key_owner_proof)
 		} else {
diff --git a/frame/grandpa/src/lib.rs b/frame/grandpa/src/lib.rs
index f6edb07ccc6b..952e0d646135 100644
--- a/frame/grandpa/src/lib.rs
+++ b/frame/grandpa/src/lib.rs
@@ -341,6 +341,18 @@ pub mod pallet {
 			Pallet::<T>::initialize(&self.authorities)
 		}
 	}
+
+	#[pallet::validate_unsigned]
+	impl<T: Config> ValidateUnsigned for Pallet<T> {
+		type Call = Call<T>;
+		fn validate_unsigned(source: TransactionSource, call: &Self::Call) -> TransactionValidity {
+			Self::validate_unsigned(source, call)
+		}
+
+		fn pre_dispatch(call: &Self::Call) -> Result<(), TransactionValidityError> {
+			Self::pre_dispatch(call)
+		}
+	}
 }
 
 pub trait WeightInfo {

From d6ac9f551b71d9c7b69afcebfc68ace310ef74ee Mon Sep 17 00:00:00 2001
From: Keith Yeung <kungfukeith11@gmail.com>
Date: Wed, 9 Jun 2021 02:31:29 -0700
Subject: [PATCH 0851/1194] Use pallet names to name enum variants (#8990)

* Remove unused event_metadata variable

* Eliminate mod_name and use pallet names to name enum variants

* Rename field name `pallet` to `path`

* Use only the pallet name to generate variant names

* Use new naming scheme for Event enum in sudo pallet tests

* Use new naming scheme for Event enum in offences pallet tests

* Use new naming scheme for Event enum in contracts pallet tests

* Use new naming scheme for Event enum in collective pallet tests

* Use new naming scheme for Event enum in bounties pallet tests

* Use new naming scheme for Event enum in balances pallet tests

* Use new naming scheme for Event enum in assets pallet tests

* Use new naming scheme for Event enum in frame support tests

* Use new naming scheme for Event enum in tips pallet tests

* Use new naming scheme for Event enum in transaction payment pallet tests

* Use new naming scheme for GenesisConfig fields in example pallet tests

* Use new naming scheme for GenesisConfig fields in elections pallet tests

* Use new naming scheme for Event enum in election provider multi-phase pallet tests

* Use new naming scheme for Event enum in elections phragmen pallet tests

* Use new naming scheme for GenesisConfig fields in chain spec

* Use new naming scheme for Event enum in staking pallet mock

* Use new naming scheme for GenesisConfig fields in node-template chain spec

* Use new naming scheme for GenesisConfig fields in node-testing chain spec

* Use new naming scheme for Event enum in node executor tests

* Use new naming scheme for GenesisConfig fields in transaction storage pallet mock

* Refactor match conditions
---
 bin/node-template/node/src/chain_spec.rs      | 10 +--
 bin/node/cli/src/chain_spec.rs                | 40 +++++-----
 bin/node/executor/tests/basic.rs              | 22 +++---
 bin/node/testing/src/genesis.rs               | 40 +++++-----
 frame/assets/src/tests.rs                     |  2 +-
 frame/balances/src/tests.rs                   | 26 +++----
 frame/balances/src/tests_local.rs             | 10 +--
 frame/balances/src/tests_reentrancy.rs        | 12 +--
 frame/bounties/src/tests.rs                   |  2 +-
 frame/collective/src/lib.rs                   | 74 +++++++++----------
 frame/contracts/src/exec.rs                   |  2 +-
 frame/contracts/src/tests.rs                  | 68 ++++++++---------
 .../election-provider-multi-phase/src/mock.rs |  2 +-
 frame/elections-phragmen/src/lib.rs           | 14 ++--
 frame/elections/src/mock.rs                   |  2 +-
 frame/example/src/tests.rs                    |  6 +-
 frame/offences/src/tests.rs                   |  4 +-
 frame/staking/src/mock.rs                     |  2 +-
 frame/sudo/src/tests.rs                       | 10 +--
 .../src/construct_runtime/expand/config.rs    | 14 ++--
 .../src/construct_runtime/expand/event.rs     | 61 ++++++---------
 .../src/construct_runtime/expand/metadata.rs  | 10 +--
 .../src/construct_runtime/expand/origin.rs    | 62 +++++++---------
 .../procedural/src/construct_runtime/mod.rs   |  8 +-
 .../procedural/src/construct_runtime/parse.rs | 30 +-------
 frame/support/test/tests/construct_runtime.rs | 18 ++---
 frame/support/test/tests/instance.rs          | 12 +--
 frame/support/test/tests/pallet.rs            | 10 +--
 frame/support/test/tests/pallet_instance.rs   | 16 ++--
 frame/tips/src/tests.rs                       |  2 +-
 frame/transaction-payment/src/lib.rs          |  4 +-
 frame/transaction-storage/src/mock.rs         |  6 +-
 32 files changed, 274 insertions(+), 327 deletions(-)

diff --git a/bin/node-template/node/src/chain_spec.rs b/bin/node-template/node/src/chain_spec.rs
index f7ed87251391..5093a77b571e 100644
--- a/bin/node-template/node/src/chain_spec.rs
+++ b/bin/node-template/node/src/chain_spec.rs
@@ -134,22 +134,22 @@ fn testnet_genesis(
 	_enable_println: bool,
 ) -> GenesisConfig {
 	GenesisConfig {
-		frame_system: SystemConfig {
+		system: SystemConfig {
 			// Add Wasm runtime to storage.
 			code: wasm_binary.to_vec(),
 			changes_trie_config: Default::default(),
 		},
-		pallet_balances: BalancesConfig {
+		balances: BalancesConfig {
 			// Configure endowed accounts with initial balance of 1 << 60.
 			balances: endowed_accounts.iter().cloned().map(|k|(k, 1 << 60)).collect(),
 		},
-		pallet_aura: AuraConfig {
+		aura: AuraConfig {
 			authorities: initial_authorities.iter().map(|x| (x.0.clone())).collect(),
 		},
-		pallet_grandpa: GrandpaConfig {
+		grandpa: GrandpaConfig {
 			authorities: initial_authorities.iter().map(|x| (x.1.clone(), 1)).collect(),
 		},
-		pallet_sudo: SudoConfig {
+		sudo: SudoConfig {
 			// Assign network admin rights.
 			key: root_key,
 		},
diff --git a/bin/node/cli/src/chain_spec.rs b/bin/node/cli/src/chain_spec.rs
index 3454aa83c24d..e3ba16b9de6f 100644
--- a/bin/node/cli/src/chain_spec.rs
+++ b/bin/node/cli/src/chain_spec.rs
@@ -261,19 +261,19 @@ pub fn testnet_genesis(
 	const STASH: Balance = ENDOWMENT / 1000;
 
 	GenesisConfig {
-		frame_system: SystemConfig {
+		system: SystemConfig {
 			code: wasm_binary_unwrap().to_vec(),
 			changes_trie_config: Default::default(),
 		},
-		pallet_balances: BalancesConfig {
+		balances: BalancesConfig {
 			balances: endowed_accounts.iter().cloned()
 				.map(|x| (x, ENDOWMENT))
 				.collect()
 		},
-		pallet_indices: IndicesConfig {
+		indices: IndicesConfig {
 			indices: vec![],
 		},
-		pallet_session: SessionConfig {
+		session: SessionConfig {
 			keys: initial_authorities.iter().map(|x| {
 				(x.0.clone(), x.0.clone(), session_keys(
 					x.2.clone(),
@@ -283,7 +283,7 @@ pub fn testnet_genesis(
 				))
 			}).collect::<Vec<_>>(),
 		},
-		pallet_staking: StakingConfig {
+		staking: StakingConfig {
 			validator_count: initial_authorities.len() as u32,
 			minimum_validator_count: initial_authorities.len() as u32,
 			invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(),
@@ -291,41 +291,41 @@ pub fn testnet_genesis(
 			stakers,
 			.. Default::default()
 		},
-		pallet_democracy: DemocracyConfig::default(),
-		pallet_elections_phragmen: ElectionsConfig {
+		democracy: DemocracyConfig::default(),
+		elections: ElectionsConfig {
 			members: endowed_accounts.iter()
 						.take((num_endowed_accounts + 1) / 2)
 						.cloned()
 						.map(|member| (member, STASH))
 						.collect(),
 		},
-		pallet_collective_Instance1: CouncilConfig::default(),
-		pallet_collective_Instance2: TechnicalCommitteeConfig {
+		council: CouncilConfig::default(),
+		technical_committee: TechnicalCommitteeConfig {
 			members: endowed_accounts.iter()
 						.take((num_endowed_accounts + 1) / 2)
 						.cloned()
 						.collect(),
 			phantom: Default::default(),
 		},
-		pallet_sudo: SudoConfig {
+		sudo: SudoConfig {
 			key: root_key,
 		},
-		pallet_babe: BabeConfig {
+		babe: BabeConfig {
 			authorities: vec![],
 			epoch_config: Some(node_runtime::BABE_GENESIS_EPOCH_CONFIG),
 		},
-		pallet_im_online: ImOnlineConfig {
+		im_online: ImOnlineConfig {
 			keys: vec![],
 		},
-		pallet_authority_discovery: AuthorityDiscoveryConfig {
+		authority_discovery: AuthorityDiscoveryConfig {
 			keys: vec![],
 		},
-		pallet_grandpa: GrandpaConfig {
+		grandpa: GrandpaConfig {
 			authorities: vec![],
 		},
-		pallet_membership_Instance1: Default::default(),
-		pallet_treasury: Default::default(),
-		pallet_society: SocietyConfig {
+		technical_membership: Default::default(),
+		treasury: Default::default(),
+		society: SocietyConfig {
 			members: endowed_accounts.iter()
 						.take((num_endowed_accounts + 1) / 2)
 						.cloned()
@@ -333,9 +333,9 @@ pub fn testnet_genesis(
 			pot: 0,
 			max_members: 999,
 		},
-		pallet_vesting: Default::default(),
-		pallet_gilt: Default::default(),
-		pallet_transaction_storage: Default::default(),
+		vesting: Default::default(),
+		gilt: Default::default(),
+		transaction_storage: Default::default(),
 	}
 }
 
diff --git a/bin/node/executor/tests/basic.rs b/bin/node/executor/tests/basic.rs
index fe3ae5f14cc3..8c7b1eae5dec 100644
--- a/bin/node/executor/tests/basic.rs
+++ b/bin/node/executor/tests/basic.rs
@@ -347,14 +347,14 @@ fn full_native_block_import_works() {
 		let events = vec![
 			EventRecord {
 				phase: Phase::ApplyExtrinsic(0),
-				event: Event::frame_system(frame_system::Event::ExtrinsicSuccess(
+				event: Event::System(frame_system::Event::ExtrinsicSuccess(
 					DispatchInfo { weight: timestamp_weight, class: DispatchClass::Mandatory, ..Default::default() }
 				)),
 				topics: vec![],
 			},
 			EventRecord {
 				phase: Phase::ApplyExtrinsic(1),
-				event: Event::pallet_balances(pallet_balances::Event::Transfer(
+				event: Event::Balances(pallet_balances::Event::Transfer(
 					alice().into(),
 					bob().into(),
 					69 * DOLLARS,
@@ -363,12 +363,12 @@ fn full_native_block_import_works() {
 			},
 			EventRecord {
 				phase: Phase::ApplyExtrinsic(1),
-				event: Event::pallet_treasury(pallet_treasury::RawEvent::Deposit(fees * 8 / 10)),
+				event: Event::Treasury(pallet_treasury::RawEvent::Deposit(fees * 8 / 10)),
 				topics: vec![],
 			},
 			EventRecord {
 				phase: Phase::ApplyExtrinsic(1),
-				event: Event::frame_system(frame_system::Event::ExtrinsicSuccess(
+				event: Event::System(frame_system::Event::ExtrinsicSuccess(
 					DispatchInfo { weight: transfer_weight, ..Default::default() }
 				)),
 				topics: vec![],
@@ -399,14 +399,14 @@ fn full_native_block_import_works() {
 		let events = vec![
 			EventRecord {
 				phase: Phase::ApplyExtrinsic(0),
-				event: Event::frame_system(frame_system::Event::ExtrinsicSuccess(
+				event: Event::System(frame_system::Event::ExtrinsicSuccess(
 					DispatchInfo { weight: timestamp_weight, class: DispatchClass::Mandatory, ..Default::default() }
 				)),
 				topics: vec![],
 			},
 			EventRecord {
 				phase: Phase::ApplyExtrinsic(1),
-				event: Event::pallet_balances(
+				event: Event::Balances(
 					pallet_balances::Event::Transfer(
 						bob().into(),
 						alice().into(),
@@ -417,19 +417,19 @@ fn full_native_block_import_works() {
 			},
 			EventRecord {
 				phase: Phase::ApplyExtrinsic(1),
-				event: Event::pallet_treasury(pallet_treasury::RawEvent::Deposit(fees * 8 / 10)),
+				event: Event::Treasury(pallet_treasury::RawEvent::Deposit(fees * 8 / 10)),
 				topics: vec![],
 			},
 			EventRecord {
 				phase: Phase::ApplyExtrinsic(1),
-				event: Event::frame_system(frame_system::Event::ExtrinsicSuccess(
+				event: Event::System(frame_system::Event::ExtrinsicSuccess(
 					DispatchInfo { weight: transfer_weight, ..Default::default() }
 				)),
 				topics: vec![],
 			},
 			EventRecord {
 				phase: Phase::ApplyExtrinsic(2),
-				event: Event::pallet_balances(
+				event: Event::Balances(
 					pallet_balances::Event::Transfer(
 						alice().into(),
 						bob().into(),
@@ -440,12 +440,12 @@ fn full_native_block_import_works() {
 			},
 			EventRecord {
 				phase: Phase::ApplyExtrinsic(2),
-				event: Event::pallet_treasury(pallet_treasury::RawEvent::Deposit(fees * 8 / 10)),
+				event: Event::Treasury(pallet_treasury::RawEvent::Deposit(fees * 8 / 10)),
 				topics: vec![],
 			},
 			EventRecord {
 				phase: Phase::ApplyExtrinsic(2),
-				event: Event::frame_system(frame_system::Event::ExtrinsicSuccess(
+				event: Event::System(frame_system::Event::ExtrinsicSuccess(
 					DispatchInfo { weight: transfer_weight, ..Default::default() }
 				)),
 				topics: vec![],
diff --git a/bin/node/testing/src/genesis.rs b/bin/node/testing/src/genesis.rs
index 6f884d1f73b6..3a6d51f1971e 100644
--- a/bin/node/testing/src/genesis.rs
+++ b/bin/node/testing/src/genesis.rs
@@ -56,20 +56,20 @@ pub fn config_endowed(
 	);
 
 	GenesisConfig {
-		frame_system: SystemConfig {
+		system: SystemConfig {
 			changes_trie_config: if support_changes_trie { Some(ChangesTrieConfiguration {
 				digest_interval: 2,
 				digest_levels: 2,
 			}) } else { None },
 			code: code.map(|x| x.to_vec()).unwrap_or_else(|| wasm_binary_unwrap().to_vec()),
 		},
-		pallet_indices: IndicesConfig {
+		indices: IndicesConfig {
 			indices: vec![],
 		},
-		pallet_balances: BalancesConfig {
+		balances: BalancesConfig {
 			balances: endowed,
 		},
-		pallet_session: SessionConfig {
+		session: SessionConfig {
 			keys: vec![
 				(dave(), alice(), to_session_keys(
 					&Ed25519Keyring::Alice,
@@ -85,7 +85,7 @@ pub fn config_endowed(
 				)),
 			]
 		},
-		pallet_staking: StakingConfig {
+		staking: StakingConfig {
 			stakers: vec![
 				(dave(), alice(), 111 * DOLLARS, StakerStatus::Validator),
 				(eve(), bob(), 100 * DOLLARS, StakerStatus::Validator),
@@ -97,29 +97,29 @@ pub fn config_endowed(
 			invulnerables: vec![alice(), bob(), charlie()],
 			.. Default::default()
 		},
-		pallet_babe: BabeConfig {
+		babe: BabeConfig {
 			authorities: vec![],
 			epoch_config: Some(BABE_GENESIS_EPOCH_CONFIG),
 		},
-		pallet_grandpa: GrandpaConfig {
+		grandpa: GrandpaConfig {
 			authorities: vec![],
 		},
-		pallet_im_online: Default::default(),
-		pallet_authority_discovery: Default::default(),
-		pallet_democracy: Default::default(),
-		pallet_collective_Instance1: Default::default(),
-		pallet_collective_Instance2: Default::default(),
-		pallet_membership_Instance1: Default::default(),
-		pallet_elections_phragmen: Default::default(),
-		pallet_sudo: Default::default(),
-		pallet_treasury: Default::default(),
-		pallet_society: SocietyConfig {
+		im_online: Default::default(),
+		authority_discovery: Default::default(),
+		democracy: Default::default(),
+		council: Default::default(),
+		technical_committee: Default::default(),
+		technical_membership: Default::default(),
+		elections: Default::default(),
+		sudo: Default::default(),
+		treasury: Default::default(),
+		society: SocietyConfig {
 			members: vec![alice(), bob()],
 			pot: 0,
 			max_members: 999,
 		},
-		pallet_vesting: Default::default(),
-		pallet_gilt: Default::default(),
-		pallet_transaction_storage: Default::default(),
+		vesting: Default::default(),
+		gilt: Default::default(),
+		transaction_storage: Default::default(),
 	}
 }
diff --git a/frame/assets/src/tests.rs b/frame/assets/src/tests.rs
index 3ee8f9a9cfa4..6bef5b962de7 100644
--- a/frame/assets/src/tests.rs
+++ b/frame/assets/src/tests.rs
@@ -397,7 +397,7 @@ fn transferring_less_than_one_unit_is_fine() {
 		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
 		assert_eq!(Assets::balance(0, 1), 100);
 		assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 0));
-		System::assert_last_event(mock::Event::pallet_assets(crate::Event::Transferred(0, 1, 2, 0)));
+		System::assert_last_event(mock::Event::Assets(crate::Event::Transferred(0, 1, 2, 0)));
 	});
 }
 
diff --git a/frame/balances/src/tests.rs b/frame/balances/src/tests.rs
index 43d3c2fc6009..86004efcf68f 100644
--- a/frame/balances/src/tests.rs
+++ b/frame/balances/src/tests.rs
@@ -464,7 +464,7 @@ macro_rules! decl_tests {
 				assert_ok!(Balances::reserve(&1, 110));
 				assert_ok!(Balances::repatriate_reserved(&1, &2, 41, Status::Free), 0);
 				System::assert_last_event(
-					Event::pallet_balances(crate::Event::ReserveRepatriated(1, 2, 41, Status::Free))
+					Event::Balances(crate::Event::ReserveRepatriated(1, 2, 41, Status::Free))
 				);
 				assert_eq!(Balances::reserved_balance(1), 69);
 				assert_eq!(Balances::free_balance(1), 0);
@@ -683,18 +683,18 @@ macro_rules! decl_tests {
 					System::set_block_number(2);
 					assert_ok!(Balances::reserve(&1, 10));
 
-					System::assert_last_event(Event::pallet_balances(crate::Event::Reserved(1, 10)));
+					System::assert_last_event(Event::Balances(crate::Event::Reserved(1, 10)));
 
 					System::set_block_number(3);
 					assert!(Balances::unreserve(&1, 5).is_zero());
 
-					System::assert_last_event(Event::pallet_balances(crate::Event::Unreserved(1, 5)));
+					System::assert_last_event(Event::Balances(crate::Event::Unreserved(1, 5)));
 
 					System::set_block_number(4);
 					assert_eq!(Balances::unreserve(&1, 6), 1);
 
 					// should only unreserve 5
-					System::assert_last_event(Event::pallet_balances(crate::Event::Unreserved(1, 5)));
+					System::assert_last_event(Event::Balances(crate::Event::Unreserved(1, 5)));
 				});
 		}
 
@@ -709,9 +709,9 @@ macro_rules! decl_tests {
 					assert_eq!(
 						events(),
 						[
-							Event::frame_system(system::Event::NewAccount(1)),
-							Event::pallet_balances(crate::Event::Endowed(1, 100)),
-							Event::pallet_balances(crate::Event::BalanceSet(1, 100, 0)),
+							Event::System(system::Event::NewAccount(1)),
+							Event::Balances(crate::Event::Endowed(1, 100)),
+							Event::Balances(crate::Event::BalanceSet(1, 100, 0)),
 						]
 					);
 
@@ -721,8 +721,8 @@ macro_rules! decl_tests {
 					assert_eq!(
 						events(),
 						[
-							Event::frame_system(system::Event::KilledAccount(1)),
-							Event::pallet_balances(crate::Event::DustLost(1, 99)),
+							Event::System(system::Event::KilledAccount(1)),
+							Event::Balances(crate::Event::DustLost(1, 99)),
 						]
 					);
 				});
@@ -739,9 +739,9 @@ macro_rules! decl_tests {
 					assert_eq!(
 						events(),
 						[
-							Event::frame_system(system::Event::NewAccount(1)),
-							Event::pallet_balances(crate::Event::Endowed(1, 100)),
-							Event::pallet_balances(crate::Event::BalanceSet(1, 100, 0)),
+							Event::System(system::Event::NewAccount(1)),
+							Event::Balances(crate::Event::Endowed(1, 100)),
+							Event::Balances(crate::Event::BalanceSet(1, 100, 0)),
 						]
 					);
 
@@ -751,7 +751,7 @@ macro_rules! decl_tests {
 					assert_eq!(
 						events(),
 						[
-							Event::frame_system(system::Event::KilledAccount(1))
+							Event::System(system::Event::KilledAccount(1))
 						]
 					);
 				});
diff --git a/frame/balances/src/tests_local.rs b/frame/balances/src/tests_local.rs
index afa68764573e..e6de7e64b16a 100644
--- a/frame/balances/src/tests_local.rs
+++ b/frame/balances/src/tests_local.rs
@@ -172,9 +172,9 @@ fn emit_events_with_no_existential_deposit_suicide_with_dust() {
 			assert_eq!(
 				events(),
 				[
-					Event::frame_system(system::Event::NewAccount(1)),
-					Event::pallet_balances(crate::Event::Endowed(1, 100)),
-					Event::pallet_balances(crate::Event::BalanceSet(1, 100, 0)),
+					Event::System(system::Event::NewAccount(1)),
+					Event::Balances(crate::Event::Endowed(1, 100)),
+					Event::Balances(crate::Event::BalanceSet(1, 100, 0)),
 				]
 			);
 
@@ -190,8 +190,8 @@ fn emit_events_with_no_existential_deposit_suicide_with_dust() {
 			assert_eq!(
 				events(),
 				[
-					Event::frame_system(system::Event::KilledAccount(1)),
-					Event::pallet_balances(crate::Event::DustLost(1, 1)),
+					Event::System(system::Event::KilledAccount(1)),
+					Event::Balances(crate::Event::DustLost(1, 1)),
 				]
 			);
 		});
diff --git a/frame/balances/src/tests_reentrancy.rs b/frame/balances/src/tests_reentrancy.rs
index a12da8f001d8..caca7d78d0ff 100644
--- a/frame/balances/src/tests_reentrancy.rs
+++ b/frame/balances/src/tests_reentrancy.rs
@@ -188,8 +188,8 @@ fn transfer_dust_removal_tst1_should_work() {
 			// Number of events expected is 8
 			assert_eq!(System::events().len(), 11);
 
-			System::assert_has_event(Event::pallet_balances(crate::Event::Transfer(2, 3, 450)));
-			System::assert_has_event(Event::pallet_balances(crate::Event::DustLost(2, 50)));
+			System::assert_has_event(Event::Balances(crate::Event::Transfer(2, 3, 450)));
+			System::assert_has_event(Event::Balances(crate::Event::DustLost(2, 50)));
 		}
 	);
 }
@@ -220,8 +220,8 @@ fn transfer_dust_removal_tst2_should_work() {
 			// Number of events expected is 8
 			assert_eq!(System::events().len(), 9);
 
-			System::assert_has_event(Event::pallet_balances(crate::Event::Transfer(2, 1, 450)));
-			System::assert_has_event(Event::pallet_balances(crate::Event::DustLost(2, 50)));
+			System::assert_has_event(Event::Balances(crate::Event::Transfer(2, 1, 450)));
+			System::assert_has_event(Event::Balances(crate::Event::DustLost(2, 50)));
 		}
 	);
 }
@@ -261,11 +261,11 @@ fn repatriating_reserved_balance_dust_removal_should_work() {
 			// Number of events expected is 10
 			assert_eq!(System::events().len(), 10);
 
-			System::assert_has_event(Event::pallet_balances(
+			System::assert_has_event(Event::Balances(
 				crate::Event::ReserveRepatriated(2, 1, 450, Status::Free),
 			));
 
-			System::assert_last_event(Event::pallet_balances(crate::Event::DustLost(2, 50)));
+			System::assert_last_event(Event::Balances(crate::Event::DustLost(2, 50)));
 		}
 	);
 }
diff --git a/frame/bounties/src/tests.rs b/frame/bounties/src/tests.rs
index 04cc06ef64b8..3a53ffd56ac1 100644
--- a/frame/bounties/src/tests.rs
+++ b/frame/bounties/src/tests.rs
@@ -161,7 +161,7 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 fn last_event() -> RawEvent<u64, u128> {
 	System::events().into_iter().map(|r| r.event)
 		.filter_map(|e| {
-			if let Event::pallet_bounties(inner) = e { Some(inner) } else { None }
+			if let Event::Bounties(inner) = e { Some(inner) } else { None }
 		})
 		.last()
 		.unwrap()
diff --git a/frame/collective/src/lib.rs b/frame/collective/src/lib.rs
index 76e410697823..a7039887db60 100644
--- a/frame/collective/src/lib.rs
+++ b/frame/collective/src/lib.rs
@@ -1059,15 +1059,15 @@ mod tests {
 
 	pub fn new_test_ext() -> sp_io::TestExternalities {
 		let mut ext: sp_io::TestExternalities = GenesisConfig {
-			collective_Instance1: collective::GenesisConfig {
+			collective: collective::GenesisConfig {
 				members: vec![1, 2, 3],
 				phantom: Default::default(),
 			},
-			collective_Instance2: collective::GenesisConfig {
+			collective_majority: collective::GenesisConfig {
 				members: vec![1, 2, 3, 4, 5],
 				phantom: Default::default(),
 			},
-			collective: Default::default(),
+			default_collective: Default::default(),
 		}.build_storage().unwrap().into();
 		ext.execute_with(|| System::set_block_number(1));
 		ext
@@ -1107,10 +1107,10 @@ mod tests {
 
 			let record = |event| EventRecord { phase: Phase::Initialization, event, topics: vec![] };
 			assert_eq!(System::events(), vec![
-				record(Event::collective_Instance1(RawEvent::Proposed(1, 0, hash.clone(), 3))),
-				record(Event::collective_Instance1(RawEvent::Voted(2, hash.clone(), true, 2, 0))),
-				record(Event::collective_Instance1(RawEvent::Closed(hash.clone(), 2, 1))),
-				record(Event::collective_Instance1(RawEvent::Disapproved(hash.clone())))
+				record(Event::Collective(RawEvent::Proposed(1, 0, hash.clone(), 3))),
+				record(Event::Collective(RawEvent::Voted(2, hash.clone(), true, 2, 0))),
+				record(Event::Collective(RawEvent::Closed(hash.clone(), 2, 1))),
+				record(Event::Collective(RawEvent::Disapproved(hash.clone())))
 			]);
 		});
 	}
@@ -1169,10 +1169,10 @@ mod tests {
 
 			let record = |event| EventRecord { phase: Phase::Initialization, event, topics: vec![] };
 			assert_eq!(System::events(), vec![
-				record(Event::collective_Instance1(RawEvent::Proposed(1, 0, hash.clone(), 3))),
-				record(Event::collective_Instance1(RawEvent::Voted(2, hash.clone(), true, 2, 0))),
-				record(Event::collective_Instance1(RawEvent::Closed(hash.clone(), 2, 1))),
-				record(Event::collective_Instance1(RawEvent::Disapproved(hash.clone())))
+				record(Event::Collective(RawEvent::Proposed(1, 0, hash.clone(), 3))),
+				record(Event::Collective(RawEvent::Voted(2, hash.clone(), true, 2, 0))),
+				record(Event::Collective(RawEvent::Closed(hash.clone(), 2, 1))),
+				record(Event::Collective(RawEvent::Disapproved(hash.clone())))
 			]);
 		});
 	}
@@ -1194,11 +1194,11 @@ mod tests {
 
 			let record = |event| EventRecord { phase: Phase::Initialization, event, topics: vec![] };
 			assert_eq!(System::events(), vec![
-				record(Event::collective_Instance1(RawEvent::Proposed(1, 0, hash.clone(), 3))),
-				record(Event::collective_Instance1(RawEvent::Voted(2, hash.clone(), true, 2, 0))),
-				record(Event::collective_Instance1(RawEvent::Closed(hash.clone(), 3, 0))),
-				record(Event::collective_Instance1(RawEvent::Approved(hash.clone()))),
-				record(Event::collective_Instance1(RawEvent::Executed(hash.clone(), Err(DispatchError::BadOrigin))))
+				record(Event::Collective(RawEvent::Proposed(1, 0, hash.clone(), 3))),
+				record(Event::Collective(RawEvent::Voted(2, hash.clone(), true, 2, 0))),
+				record(Event::Collective(RawEvent::Closed(hash.clone(), 3, 0))),
+				record(Event::Collective(RawEvent::Approved(hash.clone()))),
+				record(Event::Collective(RawEvent::Executed(hash.clone(), Err(DispatchError::BadOrigin))))
 			]);
 		});
 	}
@@ -1221,12 +1221,12 @@ mod tests {
 
 			let record = |event| EventRecord { phase: Phase::Initialization, event, topics: vec![] };
 			assert_eq!(System::events(), vec![
-				record(Event::collective_Instance2(RawEvent::Proposed(1, 0, hash.clone(), 5))),
-				record(Event::collective_Instance2(RawEvent::Voted(2, hash.clone(), true, 2, 0))),
-				record(Event::collective_Instance2(RawEvent::Voted(3, hash.clone(), true, 3, 0))),
-				record(Event::collective_Instance2(RawEvent::Closed(hash.clone(), 5, 0))),
-				record(Event::collective_Instance2(RawEvent::Approved(hash.clone()))),
-				record(Event::collective_Instance2(RawEvent::Executed(hash.clone(), Err(DispatchError::BadOrigin))))
+				record(Event::CollectiveMajority(RawEvent::Proposed(1, 0, hash.clone(), 5))),
+				record(Event::CollectiveMajority(RawEvent::Voted(2, hash.clone(), true, 2, 0))),
+				record(Event::CollectiveMajority(RawEvent::Voted(3, hash.clone(), true, 3, 0))),
+				record(Event::CollectiveMajority(RawEvent::Closed(hash.clone(), 5, 0))),
+				record(Event::CollectiveMajority(RawEvent::Approved(hash.clone()))),
+				record(Event::CollectiveMajority(RawEvent::Executed(hash.clone(), Err(DispatchError::BadOrigin))))
 			]);
 		});
 	}
@@ -1321,7 +1321,7 @@ mod tests {
 			assert_eq!(System::events(), vec![
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::collective_Instance1(RawEvent::Proposed(
+					event: Event::Collective(RawEvent::Proposed(
 						1,
 						0,
 						hex!["68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"].into(),
@@ -1449,7 +1449,7 @@ mod tests {
 			assert_eq!(System::events(), vec![
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::collective_Instance1(RawEvent::Proposed(
+					event: Event::Collective(RawEvent::Proposed(
 						1,
 						0,
 						hex!["68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"].into(),
@@ -1459,7 +1459,7 @@ mod tests {
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::collective_Instance1(RawEvent::Voted(
+					event: Event::Collective(RawEvent::Voted(
 						1,
 						hex!["68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"].into(),
 						false,
@@ -1592,7 +1592,7 @@ mod tests {
 			assert_eq!(System::events(), vec![
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::collective_Instance1(
+					event: Event::Collective(
 						RawEvent::Proposed(
 							1,
 							0,
@@ -1603,7 +1603,7 @@ mod tests {
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::collective_Instance1(RawEvent::Voted(
+					event: Event::Collective(RawEvent::Voted(
 						2,
 						hex!["68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"].into(),
 						false,
@@ -1614,14 +1614,14 @@ mod tests {
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::collective_Instance1(RawEvent::Closed(
+					event: Event::Collective(RawEvent::Closed(
 						hex!["68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"].into(), 1, 1,
 					)),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::collective_Instance1(RawEvent::Disapproved(
+					event: Event::Collective(RawEvent::Disapproved(
 						hex!["68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"].into(),
 					)),
 					topics: vec![],
@@ -1644,7 +1644,7 @@ mod tests {
 			assert_eq!(System::events(), vec![
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::collective_Instance1(RawEvent::Proposed(
+					event: Event::Collective(RawEvent::Proposed(
 						1,
 						0,
 						hex!["68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"].into(),
@@ -1654,7 +1654,7 @@ mod tests {
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::collective_Instance1(RawEvent::Voted(
+					event: Event::Collective(RawEvent::Voted(
 						2,
 						hex!["68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"].into(),
 						true,
@@ -1665,21 +1665,21 @@ mod tests {
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::collective_Instance1(RawEvent::Closed(
+					event: Event::Collective(RawEvent::Closed(
 						hex!["68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"].into(), 2, 0,
 					)),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::collective_Instance1(RawEvent::Approved(
+					event: Event::Collective(RawEvent::Approved(
 						hex!["68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"].into(),
 					)),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::collective_Instance1(RawEvent::Executed(
+					event: Event::Collective(RawEvent::Executed(
 						hex!["68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"].into(),
 						Err(DispatchError::BadOrigin),
 					)),
@@ -1731,9 +1731,9 @@ mod tests {
 			assert_ok!(Collective::disapprove_proposal(Origin::root(), hash.clone()));
 			let record = |event| EventRecord { phase: Phase::Initialization, event, topics: vec![] };
 			assert_eq!(System::events(), vec![
-				record(Event::collective_Instance1(RawEvent::Proposed(1, 0, hash.clone(), 2))),
-				record(Event::collective_Instance1(RawEvent::Voted(2, hash.clone(), true, 2, 0))),
-				record(Event::collective_Instance1(RawEvent::Disapproved(hash.clone()))),
+				record(Event::Collective(RawEvent::Proposed(1, 0, hash.clone(), 2))),
+				record(Event::Collective(RawEvent::Voted(2, hash.clone(), true, 2, 0))),
+				record(Event::Collective(RawEvent::Disapproved(hash.clone()))),
 			]);
 		})
 	}
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index f3a981347c98..3739ab77e2b6 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -1357,7 +1357,7 @@ mod tests {
 		<frame_system::Pallet<Test>>::events()
 			.into_iter()
 			.filter_map(|meta| match meta.event {
-				MetaEvent::pallet_contracts(contract_event) => Some(contract_event),
+				MetaEvent::Contracts(contract_event) => Some(contract_event),
 				_ => None,
 			})
 			.collect()
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index 75ea8d9bd89b..e066a369af0b 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -481,50 +481,50 @@ fn instantiate_and_call_and_deposit_event() {
 			assert_eq!(System::events(), vec![
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::frame_system(frame_system::Event::NewAccount(ALICE.clone())),
+					event: Event::System(frame_system::Event::NewAccount(ALICE.clone())),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::pallet_balances(
+					event: Event::Balances(
 						pallet_balances::Event::Endowed(ALICE, 1_000_000)
 					),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::frame_system(frame_system::Event::NewAccount(addr.clone())),
+					event: Event::System(frame_system::Event::NewAccount(addr.clone())),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::pallet_balances(
+					event: Event::Balances(
 						pallet_balances::Event::Endowed(addr.clone(), subsistence * 100)
 					),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::pallet_balances(
+					event: Event::Balances(
 						pallet_balances::Event::Transfer(ALICE, addr.clone(), subsistence * 100)
 					),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::pallet_contracts(crate::Event::CodeStored(code_hash.into())),
+					event: Event::Contracts(crate::Event::CodeStored(code_hash.into())),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::pallet_contracts(
+					event: Event::Contracts(
 						crate::Event::ContractEmitted(addr.clone(), vec![1, 2, 3, 4])
 					),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::pallet_contracts(crate::Event::Instantiated(ALICE, addr.clone())),
+					event: Event::Contracts(crate::Event::Instantiated(ALICE, addr.clone())),
 					topics: vec![],
 				},
 			]);
@@ -1210,45 +1210,45 @@ fn restoration(
 			let mut events = vec![
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::frame_system(frame_system::Event::NewAccount(ALICE)),
+					event: Event::System(frame_system::Event::NewAccount(ALICE)),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::pallet_balances(
+					event: Event::Balances(
 						pallet_balances::Event::Endowed(ALICE, 1_000_000)
 					),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::frame_system(frame_system::Event::NewAccount(addr_bob.clone())),
+					event: Event::System(frame_system::Event::NewAccount(addr_bob.clone())),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::pallet_balances(
+					event: Event::Balances(
 						pallet_balances::Event::Endowed(addr_bob.clone(), 30_000)
 					),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::pallet_balances(
+					event: Event::Balances(
 						pallet_balances::Event::Transfer(ALICE, addr_bob.clone(), 30_000)
 					),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::pallet_contracts(
+					event: Event::Contracts(
 						crate::Event::CodeStored(set_rent_code_hash.into())
 					),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::pallet_contracts(
+					event: Event::Contracts(
 						crate::Event::Instantiated(ALICE, addr_bob.clone())
 					),
 					topics: vec![],
@@ -1271,26 +1271,26 @@ fn restoration(
 				events.extend([
 					EventRecord {
 						phase: Phase::Initialization,
-						event: Event::frame_system(frame_system::Event::NewAccount(addr_dummy.clone())),
+						event: Event::System(frame_system::Event::NewAccount(addr_dummy.clone())),
 						topics: vec![],
 					},
 					EventRecord {
 						phase: Phase::Initialization,
-						event: Event::pallet_balances(
+						event: Event::Balances(
 							pallet_balances::Event::Endowed(addr_dummy.clone(), 20_000)
 						),
 						topics: vec![],
 					},
 					EventRecord {
 						phase: Phase::Initialization,
-						event: Event::pallet_balances(
+						event: Event::Balances(
 							pallet_balances::Event::Transfer(ALICE, addr_dummy.clone(), 20_000)
 						),
 						topics: vec![],
 					},
 					EventRecord {
 						phase: Phase::Initialization,
-						event: Event::pallet_contracts(
+						event: Event::Contracts(
 							crate::Event::Instantiated(ALICE, addr_dummy.clone())
 						),
 						topics: vec![],
@@ -1418,46 +1418,46 @@ fn restoration(
 						assert_eq!(System::events(), vec![
 							EventRecord {
 								phase: Phase::Initialization,
-								event: Event::pallet_contracts(crate::Event::Evicted(addr_bob)),
+								event: Event::Contracts(crate::Event::Evicted(addr_bob)),
 								topics: vec![],
 							},
 							EventRecord {
 								phase: Phase::Initialization,
-								event: Event::frame_system(frame_system::Event::NewAccount(CHARLIE)),
+								event: Event::System(frame_system::Event::NewAccount(CHARLIE)),
 								topics: vec![],
 							},
 							EventRecord {
 								phase: Phase::Initialization,
-								event: Event::pallet_balances(pallet_balances::Event::Endowed(CHARLIE, 1_000_000)),
+								event: Event::Balances(pallet_balances::Event::Endowed(CHARLIE, 1_000_000)),
 								topics: vec![],
 							},
 							EventRecord {
 								phase: Phase::Initialization,
-								event: Event::frame_system(frame_system::Event::NewAccount(addr_django.clone())),
+								event: Event::System(frame_system::Event::NewAccount(addr_django.clone())),
 								topics: vec![],
 							},
 							EventRecord {
 								phase: Phase::Initialization,
-								event: Event::pallet_balances(pallet_balances::Event::Endowed(addr_django.clone(), 30_000)),
+								event: Event::Balances(pallet_balances::Event::Endowed(addr_django.clone(), 30_000)),
 								topics: vec![],
 							},
 							EventRecord {
 								phase: Phase::Initialization,
-								event: Event::pallet_balances(
+								event: Event::Balances(
 									pallet_balances::Event::Transfer(CHARLIE, addr_django.clone(), 30_000)
 								),
 								topics: vec![],
 							},
 							EventRecord {
 								phase: Phase::Initialization,
-								event: Event::pallet_contracts(
+								event: Event::Contracts(
 									crate::Event::CodeStored(restoration_code_hash)
 								),
 								topics: vec![],
 							},
 							EventRecord {
 								phase: Phase::Initialization,
-								event: Event::pallet_contracts(
+								event: Event::Contracts(
 									crate::Event::Instantiated(CHARLIE, addr_django.clone())
 								),
 								topics: vec![],
@@ -1491,17 +1491,17 @@ fn restoration(
 				assert_eq!(System::events(), vec![
 					EventRecord {
 						phase: Phase::Initialization,
-						event: Event::pallet_contracts(crate::Event::CodeRemoved(restoration_code_hash)),
+						event: Event::Contracts(crate::Event::CodeRemoved(restoration_code_hash)),
 						topics: vec![],
 					},
 					EventRecord {
 						phase: Phase::Initialization,
-						event: Event::frame_system(system::Event::KilledAccount(addr_django.clone())),
+						event: Event::System(system::Event::KilledAccount(addr_django.clone())),
 						topics: vec![],
 					},
 					EventRecord {
 						phase: Phase::Initialization,
-						event: Event::pallet_contracts(
+						event: Event::Contracts(
 							crate::Event::Restored(
 								addr_django, addr_bob, bob_contract.code_hash, 50
 							)
@@ -1729,26 +1729,26 @@ fn self_destruct_works() {
 			pretty_assertions::assert_eq!(System::events(), vec![
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::frame_system(
+					event: Event::System(
 						frame_system::Event::KilledAccount(addr.clone())
 					),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::pallet_balances(
+					event: Event::Balances(
 						pallet_balances::Event::Transfer(addr.clone(), DJANGO, 93_086)
 					),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::pallet_contracts(crate::Event::CodeRemoved(code_hash)),
+					event: Event::Contracts(crate::Event::CodeRemoved(code_hash)),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::pallet_contracts(
+					event: Event::Contracts(
 						crate::Event::Terminated(addr.clone(), DJANGO)
 					),
 					topics: vec![],
diff --git a/frame/election-provider-multi-phase/src/mock.rs b/frame/election-provider-multi-phase/src/mock.rs
index 830df099b5d0..bd035aaf8296 100644
--- a/frame/election-provider-multi-phase/src/mock.rs
+++ b/frame/election-provider-multi-phase/src/mock.rs
@@ -75,7 +75,7 @@ pub(crate) fn multi_phase_events() -> Vec<super::Event<Runtime>> {
 	System::events()
 		.into_iter()
 		.map(|r| r.event)
-		.filter_map(|e| if let Event::multi_phase(inner) = e { Some(inner) } else { None })
+		.filter_map(|e| if let Event::MultiPhase(inner) = e { Some(inner) } else { None })
 		.collect::<Vec<_>>()
 }
 
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index ab2edfaac6c2..556c57eea5a1 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -1308,7 +1308,7 @@ mod tests {
 		pub fn build_and_execute(self, test: impl FnOnce() -> ()) {
 			MEMBERS.with(|m| *m.borrow_mut() = self.genesis_members.iter().map(|(m, _)| m.clone()).collect::<Vec<_>>());
 			let mut ext: sp_io::TestExternalities = GenesisConfig {
-				pallet_balances: pallet_balances::GenesisConfig::<Test>{
+				balances: pallet_balances::GenesisConfig::<Test>{
 					balances: vec![
 						(1, 10 * self.balance_factor),
 						(2, 20 * self.balance_factor),
@@ -1318,7 +1318,7 @@ mod tests {
 						(6, 60 * self.balance_factor)
 					],
 				},
-				elections_phragmen: elections_phragmen::GenesisConfig::<Test> {
+				elections: elections_phragmen::GenesisConfig::<Test> {
 					members: self.genesis_members
 				},
 			}.build_storage().unwrap().into();
@@ -2134,7 +2134,7 @@ mod tests {
 			System::set_block_number(5);
 			Elections::on_initialize(System::block_number());
 
-			System::assert_last_event(Event::elections_phragmen(super::Event::EmptyTerm));
+			System::assert_last_event(Event::Elections(super::Event::EmptyTerm));
 		})
 	}
 
@@ -2150,7 +2150,7 @@ mod tests {
 			System::set_block_number(5);
 			Elections::on_initialize(System::block_number());
 
-			System::assert_last_event(Event::elections_phragmen(super::Event::NewTerm(vec![(4, 40), (5, 50)])));
+			System::assert_last_event(Event::Elections(super::Event::NewTerm(vec![(4, 40), (5, 50)])));
 
 			assert_eq!(members_and_stake(), vec![(4, 40), (5, 50)]);
 			assert_eq!(runners_up_and_stake(), vec![]);
@@ -2161,7 +2161,7 @@ mod tests {
 			System::set_block_number(10);
 			Elections::on_initialize(System::block_number());
 
-			System::assert_last_event(Event::elections_phragmen(super::Event::NewTerm(vec![])));
+			System::assert_last_event(Event::Elections(super::Event::NewTerm(vec![])));
 
 			// outgoing have lost their bond.
 			assert_eq!(balances(&4), (37, 0));
@@ -2231,7 +2231,7 @@ mod tests {
 			assert_eq!(Elections::election_rounds(), 1);
 			assert!(members_ids().is_empty());
 
-			System::assert_last_event(Event::elections_phragmen(super::Event::NewTerm(vec![])));
+			System::assert_last_event(Event::Elections(super::Event::NewTerm(vec![])));
 		});
 	}
 
@@ -2589,7 +2589,7 @@ mod tests {
 			// 5 is an outgoing loser. will also get slashed.
 			assert_eq!(balances(&5), (45, 2));
 
-			System::assert_has_event(Event::elections_phragmen(super::Event::NewTerm(vec![(4, 40), (5, 50)])));
+			System::assert_has_event(Event::Elections(super::Event::NewTerm(vec![(4, 40), (5, 50)])));
 		})
 	}
 
diff --git a/frame/elections/src/mock.rs b/frame/elections/src/mock.rs
index b5dd15ce8119..bb67622eb7ea 100644
--- a/frame/elections/src/mock.rs
+++ b/frame/elections/src/mock.rs
@@ -197,7 +197,7 @@ impl ExtBuilder {
 		PRESENT_SLASH_PER_VOTER.with(|v| *v.borrow_mut() = self.bad_presentation_punishment);
 		DECAY_RATIO.with(|v| *v.borrow_mut() = self.decay_ratio);
 		let mut ext: sp_io::TestExternalities = GenesisConfig {
-			pallet_balances: pallet_balances::GenesisConfig::<Test>{
+			balances: pallet_balances::GenesisConfig::<Test>{
 				balances: vec![
 					(1, 10 * self.balance_factor),
 					(2, 20 * self.balance_factor),
diff --git a/frame/example/src/tests.rs b/frame/example/src/tests.rs
index f4658c280764..a290ea0f6576 100644
--- a/frame/example/src/tests.rs
+++ b/frame/example/src/tests.rs
@@ -107,9 +107,9 @@ impl Config for Test {
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let t = GenesisConfig {
 		// We use default for brevity, but you can configure as desired if needed.
-		frame_system: Default::default(),
-		pallet_balances: Default::default(),
-		pallet_example: pallet_example::GenesisConfig {
+		system: Default::default(),
+		balances: Default::default(),
+		example: pallet_example::GenesisConfig {
 			dummy: 42,
 			// we configure the map with (key, value) pairs.
 			bar: vec![(1, 2), (2, 3)],
diff --git a/frame/offences/src/tests.rs b/frame/offences/src/tests.rs
index f7bd90fe93e6..edc22cb239c4 100644
--- a/frame/offences/src/tests.rs
+++ b/frame/offences/src/tests.rs
@@ -131,7 +131,7 @@ fn should_deposit_event() {
 			System::events(),
 			vec![EventRecord {
 				phase: Phase::Initialization,
-				event: Event::offences(crate::Event::Offence(KIND, time_slot.encode())),
+				event: Event::Offences(crate::Event::Offence(KIND, time_slot.encode())),
 				topics: vec![],
 			}]
 		);
@@ -166,7 +166,7 @@ fn doesnt_deposit_event_for_dups() {
 			System::events(),
 			vec![EventRecord {
 				phase: Phase::Initialization,
-				event: Event::offences(crate::Event::Offence(KIND, time_slot.encode())),
+				event: Event::Offences(crate::Event::Offence(KIND, time_slot.encode())),
 				topics: vec![],
 			}]
 		);
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index 8930a6bfd61c..b4ff35d0d6f9 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -794,7 +794,7 @@ macro_rules! assert_session_era {
 
 pub(crate) fn staking_events() -> Vec<staking::Event<Test>> {
 	System::events().into_iter().map(|r| r.event).filter_map(|e| {
-		if let Event::staking(inner) = e {
+		if let Event::Staking(inner) = e {
 			Some(inner)
 		} else {
 			None
diff --git a/frame/sudo/src/tests.rs b/frame/sudo/src/tests.rs
index 2f824ae6a394..aa859c547c03 100644
--- a/frame/sudo/src/tests.rs
+++ b/frame/sudo/src/tests.rs
@@ -58,7 +58,7 @@ fn sudo_emits_events_correctly() {
 		// Should emit event to indicate success when called with the root `key` and `call` is `Ok`.
 		let call = Box::new(Call::Logger(LoggerCall::privileged_i32_log(42, 1)));
 		assert_ok!(Sudo::sudo(Origin::signed(1), call));
-		System::assert_has_event(TestEvent::sudo(Event::Sudid(Ok(()))));
+		System::assert_has_event(TestEvent::Sudo(Event::Sudid(Ok(()))));
 	})
 }
 
@@ -96,7 +96,7 @@ fn sudo_unchecked_weight_emits_events_correctly() {
 		// Should emit event to indicate success when called with the root `key` and `call` is `Ok`.
 		let call = Box::new(Call::Logger(LoggerCall::privileged_i32_log(42, 1)));
 		assert_ok!(Sudo::sudo_unchecked_weight(Origin::signed(1), call, 1_000));
-		System::assert_has_event(TestEvent::sudo(Event::Sudid(Ok(()))));
+		System::assert_has_event(TestEvent::Sudo(Event::Sudid(Ok(()))));
 	})
 }
 
@@ -122,10 +122,10 @@ fn set_key_emits_events_correctly() {
 
 		// A root `key` can change the root `key`.
 		assert_ok!(Sudo::set_key(Origin::signed(1), 2));
-		System::assert_has_event(TestEvent::sudo(Event::KeyChanged(1)));
+		System::assert_has_event(TestEvent::Sudo(Event::KeyChanged(1)));
 		// Double check.
 		assert_ok!(Sudo::set_key(Origin::signed(2), 4));
-		System::assert_has_event(TestEvent::sudo(Event::KeyChanged(2)));
+		System::assert_has_event(TestEvent::Sudo(Event::KeyChanged(2)));
 	});
 }
 
@@ -160,6 +160,6 @@ fn sudo_as_emits_events_correctly() {
 		// A non-privileged function will work when passed to `sudo_as` with the root `key`.
 		let call = Box::new(Call::Logger(LoggerCall::non_privileged_log(42, 1)));
 		assert_ok!(Sudo::sudo_as(Origin::signed(1), 2, call));
-		System::assert_has_event(TestEvent::sudo(Event::SudoAsDone(Ok(()))));
+		System::assert_has_event(TestEvent::Sudo(Event::SudoAsDone(Ok(()))));
 	});
 }
diff --git a/frame/support/procedural/src/construct_runtime/expand/config.rs b/frame/support/procedural/src/construct_runtime/expand/config.rs
index 93d4a868b784..0400bd52f433 100644
--- a/frame/support/procedural/src/construct_runtime/expand/config.rs
+++ b/frame/support/procedural/src/construct_runtime/expand/config.rs
@@ -16,6 +16,7 @@
 // limitations under the License
 
 use crate::construct_runtime::Pallet;
+use inflector::Inflector;
 use proc_macro2::TokenStream;
 use quote::{format_ident, quote};
 use syn::Ident;
@@ -32,12 +33,8 @@ pub fn expand_outer_config(
 	for decl in pallet_decls {
 		if let Some(pallet_entry) = decl.find_part("Config") {
 			let config = format_ident!("{}Config", decl.name);
-			let mod_name = decl.pallet.mod_name();
-			let field_name = if let Some(inst) = decl.instance.as_ref() {
-				format_ident!("{}_{}", mod_name, inst)
-			} else {
-				mod_name
-			};
+			let pallet_name = &decl.name.to_string().to_snake_case();
+			let field_name = &Ident::new(pallet_name, decl.name.span());
 			let part_is_generic = !pallet_entry.generics.params.is_empty();
 
 			types.extend(expand_config_types(runtime, decl, &config, part_is_generic));
@@ -56,7 +53,6 @@ pub fn expand_outer_config(
 		#[serde(rename_all = "camelCase")]
 		#[serde(deny_unknown_fields)]
 		#[serde(crate = "__genesis_config_serde_import__")]
-		#[allow(non_snake_case)]
 		pub struct GenesisConfig {
 			#fields
 		}
@@ -85,7 +81,7 @@ fn expand_config_types(
 	config: &Ident,
 	part_is_generic: bool,
 ) -> TokenStream {
-	let path = &decl.pallet;
+	let path = &decl.path;
 
 	match (decl.instance.as_ref(), part_is_generic) {
 		(Some(inst), true) => quote!{
@@ -109,7 +105,7 @@ fn expand_config_build_storage_call(
 	decl: &Pallet,
 	field_name: &Ident,
 ) -> TokenStream {
-	let path = &decl.pallet;
+	let path = &decl.path;
 	let instance = if let Some(inst) = decl.instance.as_ref() {
 		quote!(#path::#inst)
 	} else {
diff --git a/frame/support/procedural/src/construct_runtime/expand/event.rs b/frame/support/procedural/src/construct_runtime/expand/event.rs
index c2c905e50ff8..afedb3ed9250 100644
--- a/frame/support/procedural/src/construct_runtime/expand/event.rs
+++ b/frame/support/procedural/src/construct_runtime/expand/event.rs
@@ -15,9 +15,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License
 
-use crate::construct_runtime::{Pallet, parse::PalletPath};
+use crate::construct_runtime::Pallet;
 use proc_macro2::TokenStream;
-use quote::{format_ident, quote};
+use quote::quote;
 use syn::{Generics, Ident};
 
 pub fn expand_outer_event(
@@ -27,11 +27,10 @@ pub fn expand_outer_event(
 ) -> syn::Result<TokenStream> {
 	let mut event_variants = TokenStream::new();
 	let mut event_conversions = TokenStream::new();
-	let mut events_metadata = TokenStream::new();
 
 	for pallet_decl in pallet_decls {
 		if let Some(pallet_entry) = pallet_decl.find_part("Event") {
-			let path = &pallet_decl.pallet;
+			let path = &pallet_decl.path;
 			let index = pallet_decl.index;
 			let instance = pallet_decl.instance.as_ref();
 			let generics = &pallet_entry.generics;
@@ -53,9 +52,8 @@ pub fn expand_outer_event(
 				(None, false) => quote!(#path::Event),
 			};
 
-			event_variants.extend(expand_event_variant(runtime, path, index, instance, generics));
-			event_conversions.extend(expand_event_conversion(scrate, path, instance, &pallet_event));
-			events_metadata.extend(expand_event_metadata(scrate, path, &pallet_event));
+			event_variants.extend(expand_event_variant(runtime, pallet_decl, index, instance, generics));
+			event_conversions.extend(expand_event_conversion(scrate, pallet_decl, &pallet_event));
 		}
 	}
 
@@ -77,49 +75,42 @@ pub fn expand_outer_event(
 
 fn expand_event_variant(
 	runtime: &Ident,
-	path: &PalletPath,
+	pallet: &Pallet,
 	index: u8,
 	instance: Option<&Ident>,
 	generics: &Generics,
 ) -> TokenStream {
+	let path = &pallet.path;
+	let variant_name = &pallet.name;
 	let part_is_generic = !generics.params.is_empty();
-	let mod_name = &path.mod_name();
 
-	match (instance, part_is_generic) {
-		(Some(inst), true) => {
-			let variant = format_ident!("{}_{}", mod_name, inst);
-			quote!(#[codec(index = #index)] #variant(#path::Event<#runtime, #path::#inst>),)
+	match instance {
+		Some(inst) if part_is_generic => {
+			quote!(#[codec(index = #index)] #variant_name(#path::Event<#runtime, #path::#inst>),)
 		}
-		(Some(inst), false) => {
-			let variant = format_ident!("{}_{}", mod_name, inst);
-			quote!(#[codec(index = #index)] #variant(#path::Event<#path::#inst>),)
+		Some(inst) => {
+			quote!(#[codec(index = #index)] #variant_name(#path::Event<#path::#inst>),)
 		}
-		(None, true) => {
-			quote!(#[codec(index = #index)] #mod_name(#path::Event<#runtime>),)
+		None if part_is_generic => {
+			quote!(#[codec(index = #index)] #variant_name(#path::Event<#runtime>),)
 		}
-		(None, false) => {
-			quote!(#[codec(index = #index)] #mod_name(#path::Event),)
+		None => {
+			quote!(#[codec(index = #index)] #variant_name(#path::Event),)
 		}
 	}
 }
 
 fn expand_event_conversion(
 	scrate: &TokenStream,
-	path: &PalletPath,
-	instance: Option<&Ident>,
+	pallet: &Pallet,
 	pallet_event: &TokenStream,
 ) -> TokenStream {
-	let mod_name = path.mod_name();
-	let variant = if let Some(inst) = instance {
-		format_ident!("{}_{}", mod_name, inst)
-	} else {
-		mod_name
-	};
+	let variant_name = &pallet.name;
 
 	quote!{
 		impl From<#pallet_event> for Event {
 			fn from(x: #pallet_event) -> Self {
-				Event::#variant(x)
+				Event::#variant_name(x)
 			}
 		}
 		impl #scrate::sp_std::convert::TryInto<#pallet_event> for Event {
@@ -127,20 +118,10 @@ fn expand_event_conversion(
 
 			fn try_into(self) -> #scrate::sp_std::result::Result<#pallet_event, Self::Error> {
 				match self {
-					Self::#variant(evt) => Ok(evt),
+					Self::#variant_name(evt) => Ok(evt),
 					_ => Err(()),
 				}
 			}
 		}
 	}
 }
-
-fn expand_event_metadata(
-	scrate: &TokenStream,
-	path: &PalletPath,
-	pallet_event: &TokenStream,
-) -> TokenStream {
-	let mod_name = path.mod_name();
-
-	quote!{(stringify!(#mod_name), #scrate::event::FnEncode(#pallet_event::metadata)),}
-}
diff --git a/frame/support/procedural/src/construct_runtime/expand/metadata.rs b/frame/support/procedural/src/construct_runtime/expand/metadata.rs
index cbabec73d3a6..5854d0edccab 100644
--- a/frame/support/procedural/src/construct_runtime/expand/metadata.rs
+++ b/frame/support/procedural/src/construct_runtime/expand/metadata.rs
@@ -92,7 +92,7 @@ fn expand_pallet_metadata_storage(
 ) -> TokenStream {
 	if filtered_names.contains(&"Storage") {
 		let instance = decl.instance.as_ref().into_iter();
-		let path = &decl.pallet;
+		let path = &decl.path;
 
 		quote!{
 			Some(#scrate::metadata::DecodeDifferent::Encode(
@@ -114,7 +114,7 @@ fn expand_pallet_metadata_calls(
 ) -> TokenStream {
 	if filtered_names.contains(&"Call") {
 		let instance = decl.instance.as_ref().into_iter();
-		let path = &decl.pallet;
+		let path = &decl.path;
 
 		quote!{
 			Some(#scrate::metadata::DecodeDifferent::Encode(
@@ -135,7 +135,7 @@ fn expand_pallet_metadata_events(
 	decl: &Pallet,
 ) -> TokenStream {
 	if filtered_names.contains(&"Event") {
-		let path = &decl.pallet;
+		let path = &decl.path;
 		let part_is_generic =
 			!decl.find_part("Event").expect("Event part exists; qed").generics.params.is_empty();
 		let pallet_event = match (decl.instance.as_ref(), part_is_generic) {
@@ -160,7 +160,7 @@ fn expand_pallet_metadata_constants(
 	scrate: &TokenStream,
 	decl: &Pallet,
 ) -> TokenStream {
-	let path = &decl.pallet;
+	let path = &decl.path;
 	let instance = decl.instance.as_ref().into_iter();
 
 	quote!{
@@ -177,7 +177,7 @@ fn expand_pallet_metadata_errors(
 	scrate: &TokenStream,
 	decl: &Pallet,
 ) -> TokenStream {
-	let path = &decl.pallet;
+	let path = &decl.path;
 	let instance = decl.instance.as_ref().into_iter();
 
 	quote!{
diff --git a/frame/support/procedural/src/construct_runtime/expand/origin.rs b/frame/support/procedural/src/construct_runtime/expand/origin.rs
index 021396e64caa..2d0cc8300cb7 100644
--- a/frame/support/procedural/src/construct_runtime/expand/origin.rs
+++ b/frame/support/procedural/src/construct_runtime/expand/origin.rs
@@ -15,9 +15,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License
 
-use crate::construct_runtime::{parse::PalletPath, Pallet, SYSTEM_PALLET_NAME};
+use crate::construct_runtime::{Pallet, SYSTEM_PALLET_NAME};
 use proc_macro2::TokenStream;
-use quote::{format_ident, quote};
+use quote::quote;
 use syn::{token, Ident, Generics};
 
 pub fn expand_outer_origin(
@@ -39,7 +39,6 @@ pub fn expand_outer_origin(
 
 	for pallet_decl in pallets.iter().filter(|pallet| pallet.name != SYSTEM_PALLET_NAME) {
 		if let Some(pallet_entry) = pallet_decl.find_part("Origin") {
-			let path = &pallet_decl.pallet;
 			let instance = pallet_decl.instance.as_ref();
 			let index = pallet_decl.index;
 			let generics = &pallet_entry.generics;
@@ -54,15 +53,15 @@ pub fn expand_outer_origin(
 			}
 
 			caller_variants.extend(
-				expand_origin_caller_variant(runtime, path, index, instance, generics),
+				expand_origin_caller_variant(runtime, pallet_decl, index, instance, generics),
 			);
 			pallet_conversions.extend(
-				expand_origin_pallet_conversions(scrate, runtime, path, instance, generics),
+				expand_origin_pallet_conversions(scrate, runtime, pallet_decl, instance, generics),
 			);
 		}
 	}
 
-	let system_path = &system_pallet.pallet;
+	let system_path = &system_pallet.path;
 	let system_index = system_pallet.index;
 
 	Ok(quote!{
@@ -251,28 +250,27 @@ pub fn expand_outer_origin(
 
 fn expand_origin_caller_variant(
 	runtime: &Ident,
-	path: &PalletPath,
+	pallet: &Pallet,
 	index: u8,
 	instance: Option<&Ident>,
 	generics: &Generics,
 ) -> TokenStream {
 	let part_is_generic = !generics.params.is_empty();
-	let mod_name = &path.mod_name();
+	let variant_name = &pallet.name;
+	let path = &pallet.path;
 
-	match (instance, part_is_generic) {
-		(Some(inst), true) => {
-			let variant = format_ident!("{}_{}", mod_name, inst);
-			quote!(#[codec(index = #index)] #variant(#path::Origin<#runtime, #path::#inst>),)
+	match instance {
+		Some(inst) if part_is_generic => {
+			quote!(#[codec(index = #index)] #variant_name(#path::Origin<#runtime, #path::#inst>),)
 		}
-		(Some(inst), false) => {
-			let variant = format_ident!("{}_{}", mod_name, inst);
-			quote!(#[codec(index = #index)] #variant(#path::Origin<#path::#inst>),)
+		Some(inst) => {
+			quote!(#[codec(index = #index)] #variant_name(#path::Origin<#path::#inst>),)
 		}
-		(None, true) => {
-			quote!(#[codec(index = #index)] #mod_name(#path::Origin<#runtime>),)
+		None if part_is_generic => {
+			quote!(#[codec(index = #index)] #variant_name(#path::Origin<#runtime>),)
 		}
-		(None, false) => {
-			quote!(#[codec(index = #index)] #mod_name(#path::Origin),)
+		None => {
+			quote!(#[codec(index = #index)] #variant_name(#path::Origin),)
 		}
 	}
 }
@@ -280,29 +278,25 @@ fn expand_origin_caller_variant(
 fn expand_origin_pallet_conversions(
 	scrate: &TokenStream,
 	runtime: &Ident,
-	path: &PalletPath,
+	pallet: &Pallet,
 	instance: Option<&Ident>,
 	generics: &Generics,
 ) -> TokenStream {
-	let mod_name = path.mod_name();
-	let variant = if let Some(inst) = instance {
-		format_ident!("{}_{}", mod_name, inst)
-	} else {
-		mod_name
-	};
+	let path = &pallet.path;
+	let variant_name = &pallet.name;
 
 	let part_is_generic = !generics.params.is_empty();
-	let pallet_origin = match (instance, part_is_generic) {
-		(Some(inst), true) => quote!(#path::Origin<#runtime, #path::#inst>),
-		(Some(inst), false) => quote!(#path::Origin<#path::#inst>),
-		(None, true) => quote!(#path::Origin<#runtime>),
-		(None, false) => quote!(#path::Origin),
+	let pallet_origin = match instance {
+		Some(inst) if part_is_generic => quote!(#path::Origin<#runtime, #path::#inst>),
+		Some(inst) => quote!(#path::Origin<#path::#inst>),
+		None if part_is_generic => quote!(#path::Origin<#runtime>),
+		None => quote!(#path::Origin),
 	};
 
 	quote!{
 		impl From<#pallet_origin> for OriginCaller {
 			fn from(x: #pallet_origin) -> Self {
-				OriginCaller::#variant(x)
+				OriginCaller::#variant_name(x)
 			}
 		}
 
@@ -317,7 +311,7 @@ fn expand_origin_pallet_conversions(
 		impl From<Origin> for #scrate::sp_std::result::Result<#pallet_origin, Origin> {
 			/// NOTE: converting to pallet origin loses the origin filter information.
 			fn from(val: Origin) -> Self {
-				if let OriginCaller::#variant(l) = val.caller {
+				if let OriginCaller::#variant_name(l) = val.caller {
 					Ok(l)
 				} else {
 					Err(val)
@@ -330,7 +324,7 @@ fn expand_origin_pallet_conversions(
 			fn try_from(
 				x: OriginCaller,
 			) -> #scrate::sp_std::result::Result<#pallet_origin, OriginCaller> {
-				if let OriginCaller::#variant(l) = x {
+				if let OriginCaller::#variant_name(l) = x {
 					Ok(l)
 				} else {
 					Err(x)
diff --git a/frame/support/procedural/src/construct_runtime/mod.rs b/frame/support/procedural/src/construct_runtime/mod.rs
index a24168c463aa..eb3550355aa4 100644
--- a/frame/support/procedural/src/construct_runtime/mod.rs
+++ b/frame/support/procedural/src/construct_runtime/mod.rs
@@ -35,7 +35,7 @@ const SYSTEM_PALLET_NAME: &str = "System";
 pub struct Pallet {
 	pub name: Ident,
 	pub index: u8,
-	pub pallet: PalletPath,
+	pub path: PalletPath,
 	pub instance: Option<Ident>,
 	pub pallet_parts: Vec<PalletPart>,
 }
@@ -101,7 +101,7 @@ fn complete_pallets(decl: impl Iterator<Item = PalletDeclaration>) -> syn::Resul
 			Ok(Pallet {
 				name: pallet.name,
 				index: final_index,
-				pallet: pallet.pallet,
+				path: pallet.path,
 				instance: pallet.instance,
 				pallet_parts: pallet.pallet_parts,
 			})
@@ -252,7 +252,7 @@ fn decl_outer_dispatch<'a>(
 	let pallets_tokens = pallet_declarations
 		.filter(|pallet_declaration| pallet_declaration.exists_part("Call"))
 		.map(|pallet_declaration| {
-			let pallet = &pallet_declaration.pallet.inner.segments.last().unwrap();
+			let pallet = &pallet_declaration.path.inner.segments.last().unwrap();
 			let name = &pallet_declaration.name;
 			let index = pallet_declaration.index;
 			quote!(#[codec(index = #index)] #pallet::#name)
@@ -275,7 +275,7 @@ fn decl_all_pallets<'a>(
 	let mut names = Vec::new();
 	for pallet_declaration in pallet_declarations {
 		let type_name = &pallet_declaration.name;
-		let pallet = &pallet_declaration.pallet;
+		let pallet = &pallet_declaration.path;
 		let mut generics = vec![quote!(#runtime)];
 		generics.extend(
 			pallet_declaration
diff --git a/frame/support/procedural/src/construct_runtime/parse.rs b/frame/support/procedural/src/construct_runtime/parse.rs
index 390729865e98..2d242749cfe0 100644
--- a/frame/support/procedural/src/construct_runtime/parse.rs
+++ b/frame/support/procedural/src/construct_runtime/parse.rs
@@ -156,7 +156,7 @@ pub struct PalletDeclaration {
 	pub name: Ident,
 	/// Optional fixed index (e.g. `MyPallet ...  = 3,`)
 	pub index: Option<u8>,
-	pub pallet: PalletPath,
+	pub path: PalletPath,
 	pub instance: Option<Ident>,
 	pub pallet_parts: Vec<PalletPart>,
 }
@@ -165,7 +165,7 @@ impl Parse for PalletDeclaration {
 	fn parse(input: ParseStream) -> Result<Self> {
 		let name = input.parse()?;
 		let _: Token![:] = input.parse()?;
-		let pallet = input.parse()?;
+		let path = input.parse()?;
 		let instance = if input.peek(Token![<]) {
 			let _: Token![<] = input.parse()?;
 			let res = Some(input.parse()?);
@@ -189,7 +189,7 @@ impl Parse for PalletDeclaration {
 
 		let parsed = Self {
 			name,
-			pallet,
+			path,
 			instance,
 			pallet_parts,
 			index,
@@ -247,30 +247,6 @@ impl Parse for PalletPath {
 	}
 }
 
-impl PalletPath {
-	/// Return the snake-cased module name for this path.
-	pub fn mod_name(&self) -> Ident {
-		let mut iter = self.inner.segments.iter();
-		let mut mod_name = match &iter.next().expect("Path should always have 1 segment; qed").ident {
-			ident if ident == "self" || ident == "super" || ident == "crate" => {
-				// Skip `crate`, `self` and `super` quasi-keywords when creating the module name
-				iter.next()
-					.expect("There must be a path segment pointing to a pallet following \
-						`crate`, `self` or `super`; qed")
-					.ident
-					.clone()
-			}
-			ident => ident.clone(),
-		};
-
-		for segment in iter {
-			mod_name = quote::format_ident!("{}_{}", mod_name, segment.ident);
-		}
-
-		mod_name
-	}
-}
-
 impl quote::ToTokens for PalletPath {
 	fn to_tokens(&self, tokens: &mut TokenStream) {
 		self.inner.to_tokens(tokens);
diff --git a/frame/support/test/tests/construct_runtime.rs b/frame/support/test/tests/construct_runtime.rs
index 6b0a7091edff..7858595108b0 100644
--- a/frame/support/test/tests/construct_runtime.rs
+++ b/frame/support/test/tests/construct_runtime.rs
@@ -383,31 +383,31 @@ fn origin_codec() {
 	let origin = OriginCaller::system(system::RawOrigin::None);
 	assert_eq!(origin.encode()[0], 30);
 
-	let origin = OriginCaller::module1_Instance1(module1::Origin(Default::default()));
+	let origin = OriginCaller::Module1_1(module1::Origin(Default::default()));
 	assert_eq!(origin.encode()[0], 31);
 
-	let origin = OriginCaller::module2(module2::Origin);
+	let origin = OriginCaller::Module2(module2::Origin);
 	assert_eq!(origin.encode()[0], 32);
 
-	let origin = OriginCaller::module1_Instance2(module1::Origin(Default::default()));
+	let origin = OriginCaller::Module1_2(module1::Origin(Default::default()));
 	assert_eq!(origin.encode()[0], 33);
 
-	let origin = OriginCaller::nested_module3(nested::module3::Origin);
+	let origin = OriginCaller::NestedModule3(nested::module3::Origin);
 	assert_eq!(origin.encode()[0], 34);
 
-	let origin = OriginCaller::module3(module3::Origin(Default::default()));
+	let origin = OriginCaller::Module3(module3::Origin(Default::default()));
 	assert_eq!(origin.encode()[0], 35);
 
-	let origin = OriginCaller::module1_Instance6(module1::Origin(Default::default()));
+	let origin = OriginCaller::Module1_6(module1::Origin(Default::default()));
 	assert_eq!(origin.encode()[0], 1);
 
-	let origin = OriginCaller::module1_Instance7(module1::Origin(Default::default()));
+	let origin = OriginCaller::Module1_7(module1::Origin(Default::default()));
 	assert_eq!(origin.encode()[0], 2);
 
-	let origin = OriginCaller::module1_Instance8(module1::Origin(Default::default()));
+	let origin = OriginCaller::Module1_8(module1::Origin(Default::default()));
 	assert_eq!(origin.encode()[0], 12);
 
-	let origin = OriginCaller::module1_Instance9(module1::Origin(Default::default()));
+	let origin = OriginCaller::Module1_9(module1::Origin(Default::default()));
 	assert_eq!(origin.encode()[0], 13);
 }
 
diff --git a/frame/support/test/tests/instance.rs b/frame/support/test/tests/instance.rs
index 077763ac9128..d952fd82eb0d 100644
--- a/frame/support/test/tests/instance.rs
+++ b/frame/support/test/tests/instance.rs
@@ -299,26 +299,26 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, Call, Signature,
 
 fn new_test_ext() -> sp_io::TestExternalities {
 	GenesisConfig{
-		module1_Instance1: module1::GenesisConfig {
+		module_1_1: module1::GenesisConfig {
 			value: 3,
 			test: 2,
 		},
-		module1_Instance2: module1::GenesisConfig {
+		module_1_2: module1::GenesisConfig {
 			value: 4,
 			test: 5,
 		},
-		module2: module2::GenesisConfig {
+		module_2: module2::GenesisConfig {
 			value: 4,
 			map: vec![(0, 0)],
 			double_map: vec![(0, 0, 0)],
 		},
-		module2_Instance1: module2::GenesisConfig {
+		module_2_1: module2::GenesisConfig {
 			value: 4,
 			map: vec![(0, 0)],
 			double_map: vec![(0, 0, 0)],
 		},
-		module2_Instance2: Default::default(),
-		module2_Instance3: Default::default(),
+		module_2_2: Default::default(),
+		module_2_3: Default::default(),
 	}.build_storage().unwrap().into()
 }
 
diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index 7478da189df0..f7e04e922687 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -485,7 +485,7 @@ fn transactional_works() {
 		pallet::Call::<Runtime>::foo_transactional(1).dispatch_bypass_filter(None.into()).unwrap();
 		assert_eq!(
 			frame_system::Pallet::<Runtime>::events().iter().map(|e| &e.event).collect::<Vec<_>>(),
-			vec![&Event::pallet(pallet::Event::Something(0))],
+			vec![&Event::Example(pallet::Event::Something(0))],
 		);
 	})
 }
@@ -550,7 +550,7 @@ fn pallet_expand_deposit_event() {
 		pallet::Call::<Runtime>::foo(3, 0).dispatch_bypass_filter(None.into()).unwrap();
 		assert_eq!(
 			frame_system::Pallet::<Runtime>::events()[0].event,
-			Event::pallet(pallet::Event::Something(3)),
+			Event::Example(pallet::Event::Something(3)),
 		);
 	})
 }
@@ -643,15 +643,15 @@ fn pallet_hooks_expand() {
 
 		assert_eq!(
 			frame_system::Pallet::<Runtime>::events()[0].event,
-			Event::pallet(pallet::Event::Something(10)),
+			Event::Example(pallet::Event::Something(10)),
 		);
 		assert_eq!(
 			frame_system::Pallet::<Runtime>::events()[1].event,
-			Event::pallet(pallet::Event::Something(20)),
+			Event::Example(pallet::Event::Something(20)),
 		);
 		assert_eq!(
 			frame_system::Pallet::<Runtime>::events()[2].event,
-			Event::pallet(pallet::Event::Something(30)),
+			Event::Example(pallet::Event::Something(30)),
 		);
 	})
 }
diff --git a/frame/support/test/tests/pallet_instance.rs b/frame/support/test/tests/pallet_instance.rs
index 846a96a237c9..48ff166c5b22 100644
--- a/frame/support/test/tests/pallet_instance.rs
+++ b/frame/support/test/tests/pallet_instance.rs
@@ -394,7 +394,7 @@ fn pallet_expand_deposit_event() {
 		pallet::Call::<Runtime>::foo(3).dispatch_bypass_filter(None.into()).unwrap();
 		assert_eq!(
 			frame_system::Pallet::<Runtime>::events()[0].event,
-			Event::pallet(pallet::Event::Something(3)),
+			Event::Example(pallet::Event::Something(3)),
 		);
 	});
 
@@ -403,7 +403,7 @@ fn pallet_expand_deposit_event() {
 		pallet::Call::<Runtime, pallet::Instance1>::foo(3).dispatch_bypass_filter(None.into()).unwrap();
 		assert_eq!(
 			frame_system::Pallet::<Runtime>::events()[0].event,
-			Event::pallet_Instance1(pallet::Event::Something(3)),
+			Event::Instance1Example(pallet::Event::Something(3)),
 		);
 	});
 }
@@ -539,27 +539,27 @@ fn pallet_hooks_expand() {
 		// The order is indeed reversed due to https://github.com/paritytech/substrate/issues/6280
 		assert_eq!(
 			frame_system::Pallet::<Runtime>::events()[0].event,
-			Event::pallet_Instance1(pallet::Event::Something(11)),
+			Event::Instance1Example(pallet::Event::Something(11)),
 		);
 		assert_eq!(
 			frame_system::Pallet::<Runtime>::events()[1].event,
-			Event::pallet(pallet::Event::Something(10)),
+			Event::Example(pallet::Event::Something(10)),
 		);
 		assert_eq!(
 			frame_system::Pallet::<Runtime>::events()[2].event,
-			Event::pallet_Instance1(pallet::Event::Something(21)),
+			Event::Instance1Example(pallet::Event::Something(21)),
 		);
 		assert_eq!(
 			frame_system::Pallet::<Runtime>::events()[3].event,
-			Event::pallet(pallet::Event::Something(20)),
+			Event::Example(pallet::Event::Something(20)),
 		);
 		assert_eq!(
 			frame_system::Pallet::<Runtime>::events()[4].event,
-			Event::pallet_Instance1(pallet::Event::Something(31)),
+			Event::Instance1Example(pallet::Event::Something(31)),
 		);
 		assert_eq!(
 			frame_system::Pallet::<Runtime>::events()[5].event,
-			Event::pallet(pallet::Event::Something(30)),
+			Event::Example(pallet::Event::Something(30)),
 		);
 	})
 }
diff --git a/frame/tips/src/tests.rs b/frame/tips/src/tests.rs
index 6b144273ca82..6063f0954bd8 100644
--- a/frame/tips/src/tests.rs
+++ b/frame/tips/src/tests.rs
@@ -176,7 +176,7 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 fn last_event() -> RawEvent<u64, u128, H256> {
 	System::events().into_iter().map(|r| r.event)
 		.filter_map(|e| {
-			if let Event::tips(inner) = e { Some(inner) } else { None }
+			if let Event::TipsModTestInst(inner) = e { Some(inner) } else { None }
 		})
 		.last()
 		.unwrap()
diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
index 2b1ad2db9ae0..1ce3f75d5a01 100644
--- a/frame/transaction-payment/src/lib.rs
+++ b/frame/transaction-payment/src/lib.rs
@@ -1177,9 +1177,9 @@ mod tests {
 			);
 			assert_eq!(Balances::free_balance(2), 0);
 			// Transfer Event
-			System::assert_has_event(Event::pallet_balances(pallet_balances::Event::Transfer(2, 3, 80)));
+			System::assert_has_event(Event::Balances(pallet_balances::Event::Transfer(2, 3, 80)));
 			// Killed Event
-			System::assert_has_event(Event::system(system::Event::KilledAccount(2)));
+			System::assert_has_event(Event::System(system::Event::KilledAccount(2)));
 		});
 	}
 
diff --git a/frame/transaction-storage/src/mock.rs b/frame/transaction-storage/src/mock.rs
index 351893c08a33..03dacf8a98e8 100644
--- a/frame/transaction-storage/src/mock.rs
+++ b/frame/transaction-storage/src/mock.rs
@@ -102,11 +102,11 @@ impl pallet_transaction_storage::Config for Test {
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let t = GenesisConfig {
-		frame_system: Default::default(),
-		pallet_balances: pallet_balances::GenesisConfig::<Test> {
+		system: Default::default(),
+		balances: pallet_balances::GenesisConfig::<Test> {
 			balances: vec![(1, 1000000000), (2, 100), (3, 100), (4, 100)]
 		},
-		pallet_transaction_storage: pallet_transaction_storage::GenesisConfig::<Test> {
+		transaction_storage: pallet_transaction_storage::GenesisConfig::<Test> {
 			storage_period: 10,
 			byte_fee: 2,
 			entry_fee: 200,

From a2f48bf96eecbb5cd1f45bd5319ba814595eaaef Mon Sep 17 00:00:00 2001
From: Squirrel <gilescope@gmail.com>
Date: Wed, 9 Jun 2021 10:56:31 +0100
Subject: [PATCH 0852/1194] Stop sending network_state to telemetry (#9026)

(We send network information to prometheus)
---
 client/service/src/metrics.rs | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/client/service/src/metrics.rs b/client/service/src/metrics.rs
index 516fb243557c..8fc48ccf8c86 100644
--- a/client/service/src/metrics.rs
+++ b/client/service/src/metrics.rs
@@ -27,7 +27,7 @@ use sp_runtime::traits::{NumberFor, Block, SaturatedConversion, UniqueSaturatedI
 use sp_transaction_pool::{PoolStatus, MaintainedTransactionPool};
 use sp_utils::metrics::register_globals;
 use sc_client_api::{ClientInfo, UsageProvider};
-use sc_network::{config::Role, NetworkStatus, NetworkService, network_state::NetworkState};
+use sc_network::{config::Role, NetworkStatus, NetworkService};
 use std::sync::Arc;
 use std::time::Duration;
 use wasm_timer::Instant;
@@ -171,30 +171,18 @@ impl MetricsService {
 		let mut timer = Delay::new(Duration::from_secs(0));
 		let timer_interval = Duration::from_secs(5);
 
-		let net_state_duration = Duration::from_secs(30);
-		let mut last_net_state = Instant::now();
-
 		loop {
 			// Wait for the next tick of the timer.
 			(&mut timer).await;
-			let now = Instant::now();
-			let from_net_state = now.duration_since(last_net_state);
 
 			// Try to get the latest network information.
 			let net_status = network.status().await.ok();
-			let net_state = if from_net_state >= net_state_duration {
-				last_net_state = now;
-				network.network_state().await.ok()
-			} else {
-				None
-			};
 
 			// Update / Send the metrics.
 			self.update(
 				&client.usage_info(),
 				&transactions.status(),
 				net_status,
-				net_state,
 			);
 
 			// Schedule next tick.
@@ -207,7 +195,6 @@ impl MetricsService {
 		info: &ClientInfo<T>,
 		txpool_status: &PoolStatus,
 		net_status: Option<NetworkStatus<T>>,
-		net_state: Option<NetworkState>,
 	) {
 		let now = Instant::now();
 		let elapsed = (now - self.last_update).as_secs();
@@ -300,15 +287,5 @@ impl MetricsService {
 				}
 			}
 		}
-
-		// Send network state information, if any.
-		if let Some(net_state) = net_state {
-			telemetry!(
-				self.telemetry;
-				SUBSTRATE_INFO;
-				"system.network_state";
-				"state" => net_state,
-			);
-		}
 	}
 }

From 4d64381801d6df6567d261f319b2c5981a692f72 Mon Sep 17 00:00:00 2001
From: radupopa2010 <radupopa2010@yahoo.com>
Date: Wed, 9 Jun 2021 15:51:27 +0200
Subject: [PATCH 0853/1194] READY Update simnet tests to v5 (#8946)

* Update simnet tests to v4

* enable simnet tests for PRs

* add stage to job "test-linux-stable-int"

* v2.0.0simnet

* alow build-for-simnet option

* Fix passing of IMAGE_TAG to downstream

* forgot to build-for-simnet

* build-for-simnet

* build-for-simnet

* build-for-simnet

* build-for-simnet

* build-for-simnet

* take a shortcut build-for-simnet

* build-for-simnet

* update triggering script to polkadot version

* "revert me"

* "revert me"  build-for-simnet

* add simnet version as arg to script

* revert me build-for-simnet

* build-for-simnet

* remove triggering simnet for PRs for now

* Add suggestions from Vladimir

* Add suggestions from Vladimir
---
 .gitlab-ci.yml                       |  11 +-
 .maintain/gitlab/trigger_pipeline.sh | 230 ++++++++++++++++++++++-----
 2 files changed, 197 insertions(+), 44 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 03fe9f8a2dca..9b28bb2e25a8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -355,6 +355,7 @@ test-frame-examples-compile-to-wasm:
 
 test-linux-stable-int:
   <<:                              *test-linux
+  stage:                           test
   script:
     - echo "___Logs will be partly shown at the end in case of failure.___"
     - echo "___Full log will be saved to the job artifacts only in case of failure.___"
@@ -567,9 +568,11 @@ build-rust-doc:
     - buildah push --format=v2s2 "$IMAGE_NAME:latest"
   after_script:
     - buildah logout "$IMAGE_NAME"
-    # pass artifacts to the trigger-simnet job
-    - echo "IMAGE_NAME=${IMAGE_NAME}" > ./artifacts/$PRODUCT/build.env
-    - echo "IMAGE_TAG=${VERSION}" >> ./artifacts/$PRODUCT/build.env
+    # pass artifacts to the trigger-simnet job 
+    - echo "IMAGE_NAME=${IMAGE_NAME}" | tee -a ./artifacts/$PRODUCT/build.env
+    - IMAGE_TAG="$(cat ./artifacts/$PRODUCT/VERSION)"
+    - echo "IMAGE_TAG=${IMAGE_TAG}"   | tee -a ./artifacts/$PRODUCT/build.env
+    - cat ./artifacts/$PRODUCT/build.env
 
 publish-docker-substrate:
   stage:                           publish
@@ -708,4 +711,4 @@ trigger-simnet:
     DWNSTRM_ID:                    332
   script:
     # API trigger for a simnet job
-    - .maintain/gitlab/trigger_pipeline.sh
+    - .maintain/gitlab/trigger_pipeline.sh --simnet-version=${SIMNET_REF}
diff --git a/.maintain/gitlab/trigger_pipeline.sh b/.maintain/gitlab/trigger_pipeline.sh
index 0e95a6458e4d..3ed9215405af 100755
--- a/.maintain/gitlab/trigger_pipeline.sh
+++ b/.maintain/gitlab/trigger_pipeline.sh
@@ -1,30 +1,181 @@
 #!/bin/bash
 
-set -eu
-
-# API trigger another project's pipeline
-echo "Triggering Simnet pipeline."
-
-curl --silent \
-    -X POST \
-    -F "token=${CI_JOB_TOKEN}" \
-    -F "ref=v3" `# trigger the pinned version of simnet CI config` \
-    -F "variables[TRGR_PROJECT]=${TRGR_PROJECT}" \
-    -F "variables[TRGR_REF]=${TRGR_REF}" \
-    -F "variables[IMAGE_NAME]=${IMAGE_NAME}" \
-    -F "variables[IMAGE_TAG]=${IMAGE_TAG}" \
-    "https://${CI_SERVER_HOST}/api/v4/projects/${DWNSTRM_ID}/trigger/pipeline" | \
-        tee pipeline
-
-PIPELINE_ID=$(cat pipeline | jq ".id")
-PIPELINE_URL=$(cat pipeline | jq ".web_url")
-echo
-echo "Simnet pipeline ${PIPELINE_URL} was successfully triggered."
-echo "Now we're polling it to obtain the distinguished status."
-
-# This is a workaround for a Gitlab bug, waits here until
-# https://gitlab.com/gitlab-org/gitlab/-/issues/326137 gets fixed.
-# The timeout is 360 curls with 8 sec interval, roughly an hour.
+set -eou pipefail
+
+# This script is to trigger Simnet pipeline.
+# See help article for more details.
+
+SCRIPT_NAME="$0"
+SCRIPT_PATH=$(dirname "$0")               # relative
+SCRIPT_PATH=$(cd "${SCRIPT_PATH}" && pwd) # absolutized and normalized
+SIMNET_VERSION=""
+
+function usage {
+  cat << EOF
+This script is to trigger Simnet pipeline.
+It's designed to be launched locally and from CI.
+The required argumants for both cases are listed below.
+
+Usage: ${SCRIPT_NAME} OPTION
+
+OPTIONS
+
+    -h, --help                  Print this help message.
+
+  Mandatory in both cases:
+
+    -s, --simnet-version        Simnet version to trigger.
+                                E.g.: v4
+
+    -u, --upstream-project      Triggering project.
+                                E.g.: substrate
+
+    -r, --upstream-ref          The branch or tag name for which project is built.
+                                E.g.: master
+
+    -d, --downstream-id         Downstream project's ID to trigger.
+                                E.g.: 332 (simnet project id)
+
+    -n, --image-name            Name of image to test.
+                                E.g.: docker.io/paritypr/synth-wave
+
+    -i, --image-tag             Tag of the image to test.
+                                E.g.: master
+
+    -c, --collator-image-tag    Tag of collator image. Image name is hardcoded.
+                                E.g.: master
+
+  Required for local launch:
+
+    -g, --ci-server-fqdn        FQDN of your gitlab server.
+                                E.g.: gitlab.parity.io
+
+    -t, --trigger-token         Gitlab trigger token. This must be defined in
+                                project -> settings -> CI/CD -> Pipeline triggers
+                                Defaults to CI_JOB_TOKEN
+                                https://stackoverflow.com/questions/42746634/gitlab-trigger-api-returns-404
+
+    -a, --access-token          Gitlab  peronal access token or it defaults to
+                                PIPELINE_TOKEN (gitlab variable)
+                                https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html
+
+EXAMPLES
+  ${SCRIPT_NAME} -s v4
+  ${SCRIPT_NAME} --simnet-version=v4
+
+  Local test example. You need to set the 2 vars before running: TR_TOKEN and PERS_TOKEN
+  ${SCRIPT_NAME} --simnet-version=v4 \\
+                 --upstream-project=substrate \\
+                 --upstream-ref=master \\
+                 --image-name=docker.io/paritypr/synth-wave \\
+                 --image-tag=master \\
+                 --collator-image-tag=master \\
+                 --ci-server-fqdn=gitlab.parity.io \\
+                 --downstream-id=332 \\
+                 --trigger-token="\${TR_TOKEN}" \\
+                 --access-token="\${PERS_TOKEN}"
+EOF
+}
+
+function main {
+  # Main entry point for the script.
+  parse_args "$@"
+  check_args
+  trigger_pipeline
+  check_pipeline
+  poll_pipeline
+}
+
+function parse_args {
+  # shellcheck disable=SC2214
+  while getopts c:u:r:i:n:g:t:r:a:s:h-: OPT; do
+    # support long options: https://stackoverflow.com/a/28466267/519360
+    if [ "${OPT}" = "-" ]; then   # long option: reformulate OPT and OPTARG
+      OPT="${OPTARG%%=*}"         # extract long option name
+      OPTARG="${OPTARG#$OPT}"     # extract long option argument (may be empty)
+      OPTARG="${OPTARG#=}"        # if long option argument, remove assigning `=`
+    fi
+    case "${OPT}" in
+      h | help )                usage     ; exit 0 ;;
+      s | simnet-version )      needs_arg ; SIMNET_VERSION="${OPTARG}" ;;
+      u | upstream-project )    needs_arg ; TRGR_PROJECT="${OPTARG}" ;;
+      r | upstream-ref )        needs_arg ; TRGR_REF="${OPTARG}" ;;
+      n | image-name )          needs_arg ; IMAGE_NAME="${OPTARG}" ;;
+      i | image-tag )           needs_arg ; IMAGE_TAG="${OPTARG}" ;;
+      c | collator-image-tag )  needs_arg ; COLLATOR_IMAGE_TAG="${OPTARG}" ;;
+      g | ci-server-fqdn )      needs_arg ; CI_SERVER_HOST="${OPTARG}" ;;
+      d | downstream-id )       needs_arg ; DWNSTRM_ID="${OPTARG}" ;;
+      t | trigger-token )       needs_arg ; CI_JOB_TOKEN="${OPTARG}" ;;
+      a | access-token )        needs_arg ; PIPELINE_TOKEN="${OPTARG}" ;;
+      ??* )                     log DIE "Illegal option --${OPT}" ;;  # bad long option
+      ? )                       exit 2 ;;  # bad short option (error reported via getopts)
+    esac
+  done
+  shift $((OPTIND-1)) # remove parsed options and args from $@ list
+
+}
+
+function check_args {
+  if [[ -z "${SIMNET_VERSION}" ]] ; then
+    log DIE "Must specify value for mandatory argument -s,--simnet-version
+
+$(usage)"
+  fi
+}
+
+function needs_arg {
+  if [ -z "${OPTARG}" ]; then
+    log DIE "No arg for --${OPT} option"
+  fi
+}
+
+function trigger_pipeline {
+  # API trigger another project's pipeline.
+  log INFO "Triggering Simnet pipeline."
+
+  curl --silent \
+      -X POST \
+      -F "token=${CI_JOB_TOKEN}" \
+      -F "ref=${SIMNET_VERSION}" \
+      -F "variables[TRGR_PROJECT]=${TRGR_PROJECT}" \
+      -F "variables[TRGR_REF]=${TRGR_REF}" \
+      -F "variables[IMAGE_NAME]=${IMAGE_NAME}" \
+      -F "variables[IMAGE_TAG]=${IMAGE_TAG}" \
+      "https://${CI_SERVER_HOST}/api/v4/projects/${DWNSTRM_ID}/trigger/pipeline" | \
+          tee pipeline;
+}
+
+function check_pipeline {
+  PIPELINE_ID=$(jq ".id" pipeline)
+  PIPELINE_URL=$(jq ".web_url" pipeline)
+  echo
+  log INFO "Simnet pipeline ${PIPELINE_URL} was successfully triggered."
+  log INFO "Now we're polling it to obtain the distinguished status."
+}
+
+function poll_pipeline {
+  # This is a workaround for a Gitlab bug, waits here until
+  # https://gitlab.com/gitlab-org/gitlab/-/issues/326137 gets fixed.
+  # The timeout is 360 curls with 8 sec interval, roughly an hour.
+  log INFO "Waiting on ${PIPELINE_ID} status..."
+
+# shellcheck disable=SC2034
+  for i in {1..360}; do
+      STATUS=$(get_status);
+      log INFO "Triggered pipeline status is ${STATUS}";
+      if [[ ${STATUS} =~ ^(pending|running|created)$ ]]; then
+          echo;
+      elif [[ ${STATUS} =~ ^(failed|canceled|skipped|manual)$ ]]; then
+          log DIE "Something's broken in: ${PIPELINE_URL}";
+      elif [[ ${STATUS} =~ ^(success)$ ]]; then
+          log INFO "Look how green it is: ${PIPELINE_URL}"
+          exit 0
+      else
+          log DIE "Something else has happened in ${PIPELINE_URL}"
+      fi
+  sleep 8;
+  done
+}
 
 function get_status() {
     curl --silent \
@@ -33,19 +184,18 @@ function get_status() {
             jq --raw-output ".status";
 }
 
-echo "Waiting on ${PIPELINE_ID} status..."
+function log {
+  local lvl msg fmt
+  lvl=$1 msg=$2
+  fmt='+%Y-%m-%d %H:%M:%S'
+  lg_date=$(date "${fmt}")
+  if [[ "${lvl}" = "DIE" ]] ; then
+    lvl="ERROR"
+    echo  "${lg_date} - ${lvl} - ${msg}"
+    exit 1
+  else
+    echo "${lg_date} - ${lvl} - ${msg}"
+  fi
+}
 
-for i in $(seq 1 360); do
-    STATUS=$(get_status);
-    echo "Triggered pipeline status is ${STATUS}";
-    if [[ ${STATUS} =~ ^(pending|running|created)$ ]]; then
-        echo;
-    elif [[ ${STATUS} =~ ^(failed|canceled|skipped|manual)$ ]]; then
-        echo "Something's broken in: ${PIPELINE_URL}"; exit 1;
-    elif [[ ${STATUS} =~ ^(success)$ ]]; then
-        echo "Look how green it is: ${PIPELINE_URL}"; exit 0;
-    else
-        echo "Something else has happened in ${PIPELINE_URL}"; exit 1;
-    fi
-sleep 8;
-done
+main "$@"

From 3e5b4a2444c22561f5d4a995dec28d7ddc01865f Mon Sep 17 00:00:00 2001
From: Joshy Orndorff <JoshOrndorff@users.noreply.github.com>
Date: Wed, 9 Jun 2021 10:36:41 -0400
Subject: [PATCH 0854/1194] remove explicit unit return type (#9053)

---
 frame/support/procedural/src/pallet/expand/event.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frame/support/procedural/src/pallet/expand/event.rs b/frame/support/procedural/src/pallet/expand/event.rs
index c4f7aeffa736..204b5a23611c 100644
--- a/frame/support/procedural/src/pallet/expand/event.rs
+++ b/frame/support/procedural/src/pallet/expand/event.rs
@@ -133,7 +133,7 @@ pub fn expand_event(def: &mut Def) -> proc_macro2::TokenStream {
 		#deposit_event
 
 		impl<#event_impl_gen> From<#event_ident<#event_use_gen>> for () #event_where_clause {
-			fn from(_: #event_ident<#event_use_gen>) -> () { () }
+			fn from(_: #event_ident<#event_use_gen>) {}
 		}
 
 		impl<#event_impl_gen> #event_ident<#event_use_gen> #event_where_clause {

From eb9033b826b9e8115c20707fe66af0ceb177e99c Mon Sep 17 00:00:00 2001
From: Zeke Mostov <32168567+emostov@users.noreply.github.com>
Date: Wed, 9 Jun 2021 15:05:28 -0700
Subject: [PATCH 0855/1194] [try-runtime-cli] Offchain worker support (#8966)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* make remote-ext work with ws and safe RPCs

* Update docs.

* Update utils/frame/remote-externalities/Cargo.toml

Co-authored-by: Niklas Adolfsson <niklasadolfsson1@gmail.com>

* Fix test

* Update lock file

* Update utils/frame/remote-externalities/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Fix build again.

* checkpoint, merging the paged rpc now

* revert lifetime stuff

* WIP: remote client init not working

* Small cleanups

* use jsonrpsee alpha.7

* WIP

* Executiing without errors

* Reorg & cleanup

* Trivial cleaning

* Add txpool & keystore extension

* Small cleaning

* More :cleaning

* Flags: page-size, override-code

* WIP

* Apply suggestions from code review

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Remove heap_pages

* Dry code extraction from state

* Formatting

* More formatting

* Add issue todo

* Use jsonrpsee 0.2.0

* Try trigger gitlab

* Fix "block_import_works" test

* fix native_big_block_import_fails_on_fallback test

* fix commit should work

* Rewrite UI tests

* Revert "Rewrite UI tests"

This reverts commit ada7f670f701c21fb399946a3f6918453f537bcb.

* try again with UI

* Use const for legacy heap pages val

* Move parse module to its own file

* Move rpc_api module to its own file

* Apply suggestions from code review

Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>

* trait names: Block, not B

* Corect HEAP_PAGES_TEST_LEGACY export

* Update utils/frame/remote-externalities/src/rpc_api.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Revert test_ext heap_page insert; adjust storage root instead

* Doc comments for try_runtime::cli::Command

* TryRuntime stub

* trailing comma

* Remove unused dev dep in frame-executive

* Improve parse::hash variable name & error index

* Use Result for rpc_api fns

* Richer err messagges

* Remove HEAP_PAGE_TEST_LEGACY

* Update bin/node/executor/tests/basic.rs

Co-authored-by: kianenigma <kian@parity.io>
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Co-authored-by: Niklas Adolfsson <niklasadolfsson1@gmail.com>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
---
 Cargo.lock                                    |   6 +
 bin/node/cli/src/cli.rs                       |   7 +-
 bin/node/cli/src/command.rs                   |   7 +-
 bin/node/executor/tests/basic.rs              |   3 +
 frame/executive/src/lib.rs                    |   2 +-
 primitives/state-machine/src/testing.rs       |   7 +-
 utils/frame/remote-externalities/Cargo.toml   |   2 +-
 utils/frame/remote-externalities/src/lib.rs   |  27 +-
 .../frame/remote-externalities/src/rpc_api.rs |  53 +++
 utils/frame/try-runtime/cli/Cargo.toml        |   5 +-
 utils/frame/try-runtime/cli/src/lib.rs        | 397 ++++++++++++------
 utils/frame/try-runtime/cli/src/parse.rs      |  44 ++
 12 files changed, 421 insertions(+), 139 deletions(-)
 create mode 100644 utils/frame/remote-externalities/src/rpc_api.rs
 create mode 100644 utils/frame/try-runtime/cli/src/parse.rs

diff --git a/Cargo.lock b/Cargo.lock
index cc8557daad2f..a6c7873f6f06 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,5 +1,7 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "Inflector"
 version = "0.11.4"
@@ -6787,6 +6789,7 @@ dependencies = [
  "log",
  "pallet-elections-phragmen",
  "parity-scale-codec",
+ "serde",
  "serde_json",
  "sp-core",
  "sp-io",
@@ -10647,14 +10650,17 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "remote-externalities",
+ "sc-chain-spec",
  "sc-cli",
  "sc-client-api",
  "sc-executor",
  "sc-service",
+ "serde",
  "sp-api",
  "sp-blockchain",
  "sp-core",
  "sp-externalities",
+ "sp-keystore",
  "sp-runtime",
  "sp-state-machine",
  "structopt",
diff --git a/bin/node/cli/src/cli.rs b/bin/node/cli/src/cli.rs
index 9b80a3e34529..11ea58f4068d 100644
--- a/bin/node/cli/src/cli.rs
+++ b/bin/node/cli/src/cli.rs
@@ -47,11 +47,14 @@ pub enum Subcommand {
 	#[structopt(name = "benchmark", about = "Benchmark runtime pallets.")]
 	Benchmark(frame_benchmarking_cli::BenchmarkCmd),
 
-	/// Try some experimental command on the runtime. This includes migration and runtime-upgrade
-	/// testing.
+	/// Try some command against runtime state.
 	#[cfg(feature = "try-runtime")]
 	TryRuntime(try_runtime_cli::TryRuntimeCmd),
 
+	/// Try some command against runtime state. Note: `try-runtime` feature must be enabled.
+	#[cfg(not(feature = "try-runtime"))]
+	TryRuntime,
+
 	/// Verify a signature for a message, provided on STDIN, with a given (public or secret) key.
 	Verify(VerifyCmd),
 
diff --git a/bin/node/cli/src/command.rs b/bin/node/cli/src/command.rs
index ece97436bfdf..1ef1da6ba681 100644
--- a/bin/node/cli/src/command.rs
+++ b/bin/node/cli/src/command.rs
@@ -163,6 +163,11 @@ pub fn run() -> Result<()> {
 
 				Ok((cmd.run::<Block, Executor>(config), task_manager))
 			})
-		}
+		},
+		#[cfg(not(feature = "try-runtime"))]
+		Some(Subcommand::TryRuntime) => {
+			Err("TryRuntime wasn't enabled when building the node. \
+				You can enable it with `--features try-runtime`.".into())
+		},
 	}
 }
diff --git a/bin/node/executor/tests/basic.rs b/bin/node/executor/tests/basic.rs
index 8c7b1eae5dec..af9843715f13 100644
--- a/bin/node/executor/tests/basic.rs
+++ b/bin/node/executor/tests/basic.rs
@@ -697,6 +697,9 @@ fn native_big_block_import_succeeds() {
 fn native_big_block_import_fails_on_fallback() {
 	let mut t = new_test_ext(compact_code_unwrap(), false);
 
+	// We set the heap pages to 8 because we know that should give an OOM in WASM with the given block.
+	set_heap_pages(&mut t.ext(), 8);
+
 	assert!(
 		executor_call::<NeverNativeValue, fn() -> _>(
 			&mut t,
diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index 593b8db92c60..d8004e14acda 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -835,7 +835,7 @@ mod tests {
 				header: Header {
 					parent_hash: [69u8; 32].into(),
 					number: 1,
-					state_root: hex!("6e70de4fa07bac443dc7f8a812c8a0c941aacfa892bb373c5899f7d511d4c25b").into(),
+					state_root: hex!("ec6bb58b0e4bc7fdf0151a0f601eb825f529fbf90b5be5b2024deba30c5cbbcb").into(),
 					extrinsics_root: hex!("03170a2e7597b7b7e3d84c05391d139a62b157e78786d8c082f29dcf4c111314").into(),
 					digest: Digest { logs: vec![], },
 				},
diff --git a/primitives/state-machine/src/testing.rs b/primitives/state-machine/src/testing.rs
index 250c2fd4e9a9..363d543da086 100644
--- a/primitives/state-machine/src/testing.rs
+++ b/primitives/state-machine/src/testing.rs
@@ -30,12 +30,12 @@ use crate::{
 	},
 };
 
-use codec::{Decode, Encode};
+use codec::Decode;
 use hash_db::Hasher;
 use sp_core::{
 	offchain::testing::TestPersistentOffchainDB,
 	storage::{
-		well_known_keys::{CHANGES_TRIE_CONFIG, CODE, HEAP_PAGES, is_child_storage_key},
+		well_known_keys::{CHANGES_TRIE_CONFIG, CODE, is_child_storage_key},
 		Storage,
 	},
 	traits::TaskExecutorExt,
@@ -103,7 +103,6 @@ where
 		assert!(storage.top.keys().all(|key| !is_child_storage_key(key)));
 		assert!(storage.children_default.keys().all(|key| is_child_storage_key(key)));
 
-		storage.top.insert(HEAP_PAGES.to_vec(), 8u64.encode());
 		storage.top.insert(CODE.to_vec(), code.to_vec());
 
 		let mut extensions = Extensions::default();
@@ -308,7 +307,7 @@ mod tests {
 		ext.set_storage(b"doe".to_vec(), b"reindeer".to_vec());
 		ext.set_storage(b"dog".to_vec(), b"puppy".to_vec());
 		ext.set_storage(b"dogglesworth".to_vec(), b"cat".to_vec());
-		let root = H256::from(hex!("2a340d3dfd52f5992c6b117e9e45f479e6da5afffafeb26ab619cf137a95aeb8"));
+		let root = H256::from(hex!("ed4d8c799d996add422395a6abd7545491d40bd838d738afafa1b8a4de625489"));
 		assert_eq!(H256::from_slice(ext.storage_root().as_slice()), root);
 	}
 
diff --git a/utils/frame/remote-externalities/Cargo.toml b/utils/frame/remote-externalities/Cargo.toml
index 8f62d977baed..a7519b7e47f3 100644
--- a/utils/frame/remote-externalities/Cargo.toml
+++ b/utils/frame/remote-externalities/Cargo.toml
@@ -20,8 +20,8 @@ hex = "0.4.0"
 env_logger = "0.8.2"
 log = "0.4.11"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-
 serde_json = "1.0"
+serde = "1.0.0"
 
 sp-io = { version = "3.0.0", path = "../../../primitives/io" }
 sp-core = { version = "3.0.0", path = "../../../primitives/core" }
diff --git a/utils/frame/remote-externalities/src/lib.rs b/utils/frame/remote-externalities/src/lib.rs
index 3ea97fc9d365..a77650d04212 100644
--- a/utils/frame/remote-externalities/src/lib.rs
+++ b/utils/frame/remote-externalities/src/lib.rs
@@ -34,9 +34,11 @@ use sp_core::{
 use codec::{Encode, Decode};
 use sp_runtime::traits::Block as BlockT;
 use jsonrpsee_ws_client::{
-	WsClientBuilder, WsClient, v2::params::JsonRpcParams, traits::Client,
+	WsClientBuilder, WsClient, v2::params::JsonRpcParams,
 };
 
+pub mod rpc_api;
+
 type KeyPair = (StorageKey, StorageData);
 
 const LOG_TARGET: &str = "remote-ext";
@@ -72,7 +74,7 @@ impl<B: BlockT> Default for Mode<B> {
 	}
 }
 
-/// configuration of the online execution.
+/// Configuration of the offline execution.
 ///
 /// A state snapshot config must be present.
 #[derive(Clone)]
@@ -81,7 +83,7 @@ pub struct OfflineConfig {
 	pub state_snapshot: SnapshotConfig,
 }
 
-/// Description of the transport protocol.
+/// Description of the transport protocol (for online execution).
 #[derive(Debug)]
 pub struct Transport {
 	uri: String,
@@ -115,10 +117,17 @@ pub struct OnlineConfig<B: BlockT> {
 	pub transport: Transport,
 }
 
+impl<B: BlockT> OnlineConfig<B> {
+	/// Return rpc (ws) client.
+	fn rpc_client(&self) -> &WsClient {
+		self.transport.client.as_ref().expect("ws client must have been initialized by now; qed.")
+	}
+}
+
 impl<B: BlockT> Default for OnlineConfig<B> {
 	fn default() -> Self {
 		Self {
-			transport: Transport { uri: DEFAULT_TARGET.to_string(), client: None },
+			transport: Transport { uri: DEFAULT_TARGET.to_owned(), client: None },
 			at: None,
 			state_snapshot: None,
 			modules: vec![],
@@ -126,12 +135,6 @@ impl<B: BlockT> Default for OnlineConfig<B> {
 	}
 }
 
-impl<B: BlockT> OnlineConfig<B> {
-	/// Return rpc (ws) client.
-	fn rpc_client(&self) -> &WsClient {
-		self.transport.client.as_ref().expect("ws client must have been initialized by now; qed.")
-	}
-}
 
 /// Configuration of the state snapshot.
 #[derive(Clone)]
@@ -189,6 +192,7 @@ impl<B: BlockT> Builder<B> {
 
 // RPC methods
 impl<B: BlockT> Builder<B> {
+	/// Get the latest finalized head.
 	async fn rpc_get_head(&self) -> Result<B::Hash, &'static str> {
 		trace!(target: LOG_TARGET, "rpc: finalized_head");
 		RpcApi::<B>::finalized_head(self.as_online().rpc_client()).await.map_err(|e| {
@@ -250,6 +254,7 @@ impl<B: BlockT> Builder<B> {
 		prefix: StorageKey,
 		at: B::Hash,
 	) -> Result<Vec<KeyPair>, &'static str> {
+		use jsonrpsee_ws_client::traits::Client;
 		use serde_json::to_value;
 		let keys = self.get_keys_paged(prefix, at).await?;
 		let keys_count = keys.len();
@@ -438,8 +443,10 @@ impl<B: BlockT> Builder<B> {
 		info!(target: LOG_TARGET, "injecting a total of {} keys", kv.len());
 		for (k, v) in kv {
 			let (k, v) = (k.0, v.0);
+			// Insert the key,value pair into the test trie backend
 			ext.insert(k, v);
 		}
+
 		Ok(ext)
 	}
 }
diff --git a/utils/frame/remote-externalities/src/rpc_api.rs b/utils/frame/remote-externalities/src/rpc_api.rs
new file mode 100644
index 000000000000..e7fd021bac4a
--- /dev/null
+++ b/utils/frame/remote-externalities/src/rpc_api.rs
@@ -0,0 +1,53 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! WS RPC API for one off RPC calls to a substrate node.
+// TODO: Consolidate one off RPC calls https://github.com/paritytech/substrate/issues/8988
+
+use super::*;
+
+/// Get the header of the block identified by `at`
+pub async fn get_header<B: BlockT, S: AsRef<str>>(from: S, at: B::Hash) -> Result<B::Header, String>
+where
+	B::Header: serde::de::DeserializeOwned,
+{
+	use jsonrpsee_ws_client::traits::Client;
+	let at = serde_json::to_value(at)
+		.map_err(|e| format!("Block hash could not be converted to JSON due to {:?}", e))?;
+	let params = vec![at];
+	let client = WsClientBuilder::default()
+		.max_request_body_size(u32::MAX)
+		.build(from.as_ref())
+		.await
+		.map_err(|e| format!("`WsClientBuilder` failed to build do to {:?}", e))?;
+	client.request::<B::Header>("chain_getHeader", JsonRpcParams::Array(params))
+		.await
+		.map_err(|e| format!("chain_getHeader request failed due to {:?}", e))
+}
+
+/// Get the finalized head
+pub async fn get_finalized_head<B: BlockT, S: AsRef<str>>(from: S) -> Result<B::Hash, String> {
+	use jsonrpsee_ws_client::traits::Client;
+	let client = WsClientBuilder::default()
+		.max_request_body_size(u32::MAX)
+		.build(from.as_ref())
+		.await
+		.map_err(|e| format!("`WsClientBuilder` failed to build do to {:?}", e))?;
+	client.request::<B::Hash>("chain_getFinalizedHead", JsonRpcParams::NoParams)
+		.await
+		.map_err(|e| format!("chain_getFinalizedHead request failed due to {:?}", e))
+}
diff --git a/utils/frame/try-runtime/cli/Cargo.toml b/utils/frame/try-runtime/cli/Cargo.toml
index 4767d0db6783..f262ba4812a0 100644
--- a/utils/frame/try-runtime/cli/Cargo.toml
+++ b/utils/frame/try-runtime/cli/Cargo.toml
@@ -15,18 +15,21 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 log = "0.4.8"
 parity-scale-codec = { version = "2.0.0" }
+serde = "1.0.0"
+structopt = "0.3.8"
 
 sc-service = { version = "0.9.0", default-features = false, path = "../../../../client/service" }
 sc-cli = { version = "0.9.0", path = "../../../../client/cli" }
 sc-executor = { version = "0.9.0", path = "../../../../client/executor" }
 sc-client-api = { version = "3.0.0", path = "../../../../client/api" }
-structopt = "0.3.8"
+sc-chain-spec = { version = "3.0.0", path = "../../../../client/chain-spec" }
 sp-state-machine = { version = "0.9.0", path = "../../../../primitives/state-machine" }
 sp-api = { version = "3.0.0", path = "../../../../primitives/api" }
 sp-blockchain = { version = "3.0.0", path = "../../../../primitives/blockchain" }
 sp-runtime = { version = "3.0.0", path = "../../../../primitives/runtime" }
 sp-externalities = { version = "0.9.0", path = "../../../../primitives/externalities" }
 sp-core = { version = "3.0.0", path = "../../../../primitives/core" }
+sp-keystore = { version = "0.9.0", path = "../../../../primitives/keystore" }
 frame-try-runtime = { version = "0.9.0", path = "../../../../frame/try-runtime" }
 
 remote-externalities = { version = "0.9.0", path = "../../remote-externalities" }
diff --git a/utils/frame/try-runtime/cli/src/lib.rs b/utils/frame/try-runtime/cli/src/lib.rs
index c4adab3ce8f8..dc4cb7cd33db 100644
--- a/utils/frame/try-runtime/cli/src/lib.rs
+++ b/utils/frame/try-runtime/cli/src/lib.rs
@@ -15,23 +15,61 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! `Structopt`-ready struct for `try-runtime`.
+//! `Structopt`-ready structs for `try-runtime`.
 
-use parity_scale_codec::Decode;
-use std::{fmt::Debug, path::PathBuf, str::FromStr};
+use parity_scale_codec::{Decode, Encode};
+use std::{fmt::Debug, path::PathBuf, str::FromStr, sync::Arc};
 use sc_service::Configuration;
 use sc_cli::{CliConfiguration, ExecutionStrategy, WasmExecutionMethod};
 use sc_executor::NativeExecutor;
 use sc_service::NativeExecutionDispatch;
+use sc_chain_spec::ChainSpec;
 use sp_state_machine::StateMachine;
 use sp_runtime::traits::{Block as BlockT, NumberFor};
-use sp_core::storage::{StorageData, StorageKey, well_known_keys};
+use sp_core::{
+	offchain::{
+		OffchainWorkerExt, OffchainDbExt, TransactionPoolExt,
+		testing::{TestOffchainExt, TestTransactionPoolExt}
+	},
+	storage::{StorageData, StorageKey, well_known_keys},
+};
+use sp_keystore::{KeystoreExt, testing::KeyStore};
+use remote_externalities::{Builder, Mode, SnapshotConfig, OfflineConfig, OnlineConfig, rpc_api};
 
-/// Various commands to try out the new runtime, over configurable states.
-///
-/// For now this only assumes running the `on_runtime_upgrade` hooks.
-#[derive(Debug, structopt::StructOpt)]
-pub struct TryRuntimeCmd {
+mod parse;
+
+/// Possible subcommands of `try-runtime`.
+#[derive(Debug, Clone, structopt::StructOpt)]
+pub enum Command {
+	/// Execute "TryRuntime_on_runtime_upgrade" against the given runtime state.
+	OnRuntimeUpgrade(OnRuntimeUpgradeCmd),
+	/// Execute "OffchainWorkerApi_offchain_worker" against the given runtime state.
+	OffchainWorker(OffchainWorkerCmd),
+}
+
+#[derive(Debug, Clone, structopt::StructOpt)]
+pub struct OnRuntimeUpgradeCmd {
+	#[structopt(subcommand)]
+	pub state: State,
+}
+
+#[derive(Debug, Clone, structopt::StructOpt)]
+pub struct OffchainWorkerCmd {
+	/// Hash of the block whose header to use to execute the offchain worker.
+	#[structopt(short, long, multiple = false, parse(try_from_str = parse::hash))]
+	pub header_at: String,
+
+	#[structopt(subcommand)]
+	pub state: State,
+
+	/// Whether or not to overwrite the code from state with the code from
+	/// the specified chain spec.
+	#[structopt(long)]
+	pub overwrite_code: bool,
+}
+
+#[derive(Debug, Clone, structopt::StructOpt)]
+pub struct SharedParams {
 	/// The shared parameters
 	#[allow(missing_docs)]
 	#[structopt(flatten)]
@@ -43,7 +81,7 @@ pub struct TryRuntimeCmd {
 		value_name = "STRATEGY",
 		possible_values = &ExecutionStrategy::variants(),
 		case_insensitive = true,
-		default_value = "Native",
+		default_value = "Wasm",
 	)]
 	pub execution: ExecutionStrategy,
 
@@ -53,24 +91,38 @@ pub struct TryRuntimeCmd {
 		value_name = "METHOD",
 		possible_values = &WasmExecutionMethod::variants(),
 		case_insensitive = true,
-		default_value = "Interpreted"
+		default_value = "Compiled"
 	)]
 	pub wasm_method: WasmExecutionMethod,
 
-	/// The state to use to run the migration.
+	/// The number of 64KB pages to allocate for Wasm execution. Defaults to
+	/// sc_service::Configuration.default_heap_pages.
+	#[structopt(long)]
+	pub heap_pages: Option<u64>,
+}
+
+/// Various commands to try out against runtime state at a specific block.
+#[derive(Debug, Clone, structopt::StructOpt)]
+pub struct TryRuntimeCmd {
+	#[structopt(flatten)]
+	pub shared: SharedParams,
+
 	#[structopt(subcommand)]
-	pub state: State,
+	pub command: Command,
 }
 
-/// The state to use for a migration dry-run.
-#[derive(Debug, structopt::StructOpt)]
+/// The source of runtime state to try operations against.
+#[derive(Debug, Clone, structopt::StructOpt)]
 pub enum State {
-	/// Use a state snapshot as state to run the migration.
+	/// Use a state snapshot as the source of runtime state. NOTE: for the offchain-worker command this
+	/// is only partially supported at the moment and you must have a relevant archive node exposed on
+	/// localhost:9944 in order to query the block header.
+	// TODO https://github.com/paritytech/substrate/issues/9027
 	Snap {
 		snapshot_path: PathBuf,
 	},
 
-	/// Use a live chain to run the migration.
+	/// Use a live chain as the source of runtime state.
 	Live {
 		/// An optional state snapshot file to WRITE to. Not written if set to `None`.
 		#[structopt(short, long)]
@@ -78,7 +130,7 @@ pub enum State {
 
 		/// The block hash at which to connect.
 		/// Will be latest finalized head if not provided.
-		#[structopt(short, long, multiple = false, parse(try_from_str = parse_hash))]
+		#[structopt(short, long, multiple = false, parse(try_from_str = parse::hash))]
 		block_at: Option<String>,
 
 		/// The modules to scrape. If empty, entire chain state will be scraped.
@@ -86,136 +138,243 @@ pub enum State {
 		modules: Option<Vec<String>>,
 
 		/// The url to connect to.
-		#[structopt(default_value = "ws://localhost:9944", parse(try_from_str = parse_url))]
+		#[structopt(default_value = "ws://localhost:9944", parse(try_from_str = parse::url))]
 		url: String,
 	},
 }
 
-fn parse_hash(block_number: &str) -> Result<String, String> {
-	let block_number = if block_number.starts_with("0x") {
-		&block_number[2..]
+async fn on_runtime_upgrade<Block, ExecDispatch>(
+	shared: SharedParams,
+	command: OnRuntimeUpgradeCmd,
+	config: Configuration
+) -> sc_cli::Result<()>
+where
+	Block: BlockT,
+	Block::Hash: FromStr,
+	<Block::Hash as FromStr>::Err: Debug,
+	NumberFor<Block>: FromStr,
+	<NumberFor<Block> as FromStr>::Err: Debug,
+	ExecDispatch: NativeExecutionDispatch + 'static,
+{
+	let wasm_method = shared.wasm_method;
+	let execution = shared.execution;
+	let heap_pages = if shared.heap_pages.is_some() {
+		shared.heap_pages
 	} else {
-		block_number
+		config.default_heap_pages
 	};
 
-	if let Some(pos) = block_number.chars().position(|c| !c.is_ascii_hexdigit()) {
-		Err(format!(
-			"Expected block hash, found illegal hex character at position: {}",
-			2 + pos,
-		))
-	} else {
-		Ok(block_number.into())
-	}
+	let mut changes = Default::default();
+	let max_runtime_instances = config.max_runtime_instances;
+	let executor = NativeExecutor::<ExecDispatch>::new(
+		wasm_method.into(),
+		heap_pages,
+		max_runtime_instances,
+	);
+
+	let ext = {
+		let builder = match command.state {
+			State::Snap { snapshot_path } => {
+				Builder::<Block>::new().mode(Mode::Offline(OfflineConfig {
+					state_snapshot: SnapshotConfig::new(snapshot_path),
+				}))
+			},
+			State::Live {
+				url,
+				snapshot_path,
+				block_at,
+				modules
+			} => Builder::<Block>::new().mode(Mode::Online(OnlineConfig {
+				transport: url.to_owned().into(),
+				state_snapshot: snapshot_path.as_ref().map(SnapshotConfig::new),
+				modules: modules.to_owned().unwrap_or_default(),
+				at: block_at.as_ref()
+					.map(|b| b.parse().map_err(|e| format!("Could not parse hash: {:?}", e))).transpose()?,
+				..Default::default()
+			})),
+		};
+
+		let (code_key, code) = extract_code(config.chain_spec)?;
+		builder.inject(&[(code_key, code)]).build().await?
+	};
+
+	let encoded_result = StateMachine::<_, _, NumberFor<Block>, _>::new(
+		&ext.backend,
+		None,
+		&mut changes,
+		&executor,
+		"TryRuntime_on_runtime_upgrade",
+		&[],
+		ext.extensions,
+		&sp_state_machine::backend::BackendRuntimeCode::new(&ext.backend)
+			.runtime_code()?,
+		sp_core::testing::TaskExecutor::new(),
+	)
+	.execute(execution.into())
+	.map_err(|e| format!("failed to execute 'TryRuntime_on_runtime_upgrade' due to {:?}", e))?;
+
+	let (weight, total_weight) = <(u64, u64) as Decode>::decode(&mut &*encoded_result)
+		.map_err(|e| format!("failed to decode output due to {:?}", e))?;
+	log::info!(
+		"TryRuntime_on_runtime_upgrade executed without errors. Consumed weight = {}, total weight = {} ({})",
+		weight,
+		total_weight,
+		weight as f64 / total_weight as f64
+	);
+
+	Ok(())
 }
 
-fn parse_url(s: &str) -> Result<String, &'static str> {
-	if s.starts_with("ws://") || s.starts_with("wss://") {
-		// could use Url crate as well, but lets keep it simple for now.
-		Ok(s.to_string())
+async fn offchain_worker<Block, ExecDispatch>(
+	shared: SharedParams,
+	command: OffchainWorkerCmd,
+	config: Configuration,
+)-> sc_cli::Result<()>
+where
+	Block: BlockT,
+	Block::Hash: FromStr,
+	Block::Header: serde::de::DeserializeOwned,
+	<Block::Hash as FromStr>::Err: Debug,
+	NumberFor<Block>: FromStr,
+	<NumberFor<Block> as FromStr>::Err: Debug,
+	ExecDispatch: NativeExecutionDispatch + 'static,
+{
+	let wasm_method = shared.wasm_method;
+	let execution = shared.execution;
+	let heap_pages = if shared.heap_pages.is_some() {
+		shared.heap_pages
 	} else {
-		Err("not a valid WS(S) url: must start with 'ws://' or 'wss://'")
-	}
-}
+		config.default_heap_pages
+	};
 
-impl TryRuntimeCmd {
-	pub async fn run<B, ExecDispatch>(&self, config: Configuration) -> sc_cli::Result<()>
-	where
-		B: BlockT,
-		B::Hash: FromStr,
-		<B::Hash as FromStr>::Err: Debug,
-		NumberFor<B>: FromStr,
-		<NumberFor<B> as FromStr>::Err: Debug,
-		ExecDispatch: NativeExecutionDispatch + 'static,
-	{
-		let spec = config.chain_spec;
-		let genesis_storage = spec.build_storage()?;
-
-		let code = StorageData(
-			genesis_storage
-				.top
-				.get(well_known_keys::CODE)
-				.expect("code key must exist in genesis storage; qed")
-				.to_vec(),
-		);
-		let code_key = StorageKey(well_known_keys::CODE.to_vec());
-
-		let wasm_method = self.wasm_method;
-		let execution = self.execution;
-
-		let mut changes = Default::default();
-		// don't really care about these -- use the default values.
-		let max_runtime_instances = config.max_runtime_instances;
-		let heap_pages = config.default_heap_pages;
-		let executor = NativeExecutor::<ExecDispatch>::new(
-			wasm_method.into(),
-			heap_pages,
-			max_runtime_instances,
-		);
-
-		let ext = {
-			use remote_externalities::{Builder, Mode, SnapshotConfig, OfflineConfig, OnlineConfig};
-			let builder = match &self.state {
-				State::Snap { snapshot_path } => {
-					Builder::<B>::new().mode(Mode::Offline(OfflineConfig {
-						state_snapshot: SnapshotConfig::new(snapshot_path),
-					}))
-				},
-				State::Live {
-					url,
-					snapshot_path,
-					block_at,
-					modules
-				} => Builder::<B>::new().mode(Mode::Online(OnlineConfig {
+	let mut changes = Default::default();
+	let max_runtime_instances = config.max_runtime_instances;
+	let executor = NativeExecutor::<ExecDispatch>::new(
+		wasm_method.into(),
+		heap_pages,
+		max_runtime_instances,
+	);
+
+	let (mode, url) = match command.state {
+			State::Live {
+				url,
+				snapshot_path,
+				block_at,
+				modules
+			} => {
+				let online_config = OnlineConfig {
 					transport: url.to_owned().into(),
 					state_snapshot: snapshot_path.as_ref().map(SnapshotConfig::new),
 					modules: modules.to_owned().unwrap_or_default(),
 					at: block_at.as_ref()
 						.map(|b| b.parse().map_err(|e| format!("Could not parse hash: {:?}", e))).transpose()?,
 					..Default::default()
-				})),
-			};
+				};
 
-			// inject the code into this ext.
-			builder.inject(&[(code_key, code)]).build().await?
-		};
+				(Mode::Online(online_config), url)
+			},
+			State::Snap { snapshot_path } => {
+				// TODO This is a temporary hack; the url is used just to get the header. We should try
+				// and get the header out of state, OR use an arbitrary header if thats ok, OR allow
+				// the user to feed in a header via file.
+				// https://github.com/paritytech/substrate/issues/9027
+				// This assumes you have a node running on local host default
+				let url = "ws://127.0.0.1:9944".to_string();
+				let mode = Mode::Offline(OfflineConfig {
+					state_snapshot: SnapshotConfig::new(snapshot_path),
+				});
+
+				(mode, url)
+			}
+	};
+	let builder = Builder::<Block>::new().mode(mode);
+	let mut ext = if command.overwrite_code {
+		let (code_key, code) = extract_code(config.chain_spec)?;
+		builder.inject(&[(code_key, code)]).build().await?
+	} else {
+		builder.build().await?
+	};
+
+	// register externality extensions in order to provide host interface for OCW to the runtime.
+	let (offchain, _offchain_state) = TestOffchainExt::new();
+	let (pool, _pool_state) = TestTransactionPoolExt::new();
+	ext.register_extension(OffchainDbExt::new(offchain.clone()));
+	ext.register_extension(OffchainWorkerExt::new(offchain));
+	ext.register_extension(KeystoreExt(Arc::new(KeyStore::new())));
+	ext.register_extension(TransactionPoolExt::new(pool));
+
+	let header_hash: Block::Hash = command.header_at
+		.parse()
+		.map_err(|e| format!("Could not parse header hash: {:?}", e))?;
+	let header = rpc_api::get_header::<Block, _>(url, header_hash).await?;
+
+	let _ = StateMachine::<_, _, NumberFor<Block>, _>::new(
+		&ext.backend,
+		None,
+		&mut changes,
+		&executor,
+		"OffchainWorkerApi_offchain_worker",
+		header.encode().as_ref(),
+		ext.extensions,
+		&sp_state_machine::backend::BackendRuntimeCode::new(&ext.backend)
+			.runtime_code()?,
+		sp_core::testing::TaskExecutor::new(),
+	)
+	.execute(execution.into())
+	.map_err(|e| format!("failed to execute 'OffchainWorkerApi_offchain_worker' due to {:?}", e))?;
+
+	log::info!("OffchainWorkerApi_offchain_worker executed without errors.");
+
+	Ok(())
+}
 
-		let encoded_result = StateMachine::<_, _, NumberFor<B>, _>::new(
-			&ext.backend,
-			None,
-			&mut changes,
-			&executor,
-			"TryRuntime_on_runtime_upgrade",
-			&[],
-			ext.extensions,
-			&sp_state_machine::backend::BackendRuntimeCode::new(&ext.backend)
-				.runtime_code()?,
-			sp_core::testing::TaskExecutor::new(),
-		)
-		.execute(execution.into())
-		.map_err(|e| format!("failed to execute 'TryRuntime_on_runtime_upgrade' due to {:?}", e))?;
-
-		let (weight, total_weight) = <(u64, u64) as Decode>::decode(&mut &*encoded_result)
-			.map_err(|e| format!("failed to decode output due to {:?}", e))?;
-		log::info!(
-			"try-runtime executed without errors. Consumed weight = {}, total weight = {} ({})",
-			weight,
-			total_weight,
-			weight as f64 / total_weight as f64
-		);
-
-		Ok(())
+impl TryRuntimeCmd {
+	pub async fn run<Block, ExecDispatch>(&self, config: Configuration) -> sc_cli::Result<()>
+	where
+		Block: BlockT,
+		Block::Header: serde::de::DeserializeOwned,
+		Block::Hash: FromStr,
+		<Block::Hash as FromStr>::Err: Debug,
+		NumberFor<Block>: FromStr,
+		<NumberFor<Block> as FromStr>::Err: Debug,
+		ExecDispatch: NativeExecutionDispatch + 'static,
+	{
+		match &self.command {
+			Command::OnRuntimeUpgrade(ref cmd) => {
+				on_runtime_upgrade::<Block, ExecDispatch>(self.shared.clone(), cmd.clone(), config).await
+			}
+			Command::OffchainWorker(cmd) => {
+				offchain_worker::<Block, ExecDispatch>(self.shared.clone(), cmd.clone(), config).await
+			}
+		}
 	}
 }
 
 impl CliConfiguration for TryRuntimeCmd {
 	fn shared_params(&self) -> &sc_cli::SharedParams {
-		&self.shared_params
+		&self.shared.shared_params
 	}
 
 	fn chain_id(&self, _is_dev: bool) -> sc_cli::Result<String> {
-		Ok(match self.shared_params.chain {
+		Ok(match self.shared.shared_params.chain {
 			Some(ref chain) => chain.clone(),
 			None => "dev".into(),
 		})
 	}
 }
+
+/// Extract `:code` from the given chain spec and return as `StorageData` along with the 
+/// corresponding `StorageKey`.
+fn extract_code(spec: Box<dyn ChainSpec>) -> sc_cli::Result<(StorageKey, StorageData)> {
+	let genesis_storage = spec.build_storage()?;
+	let code = StorageData(
+		genesis_storage
+			.top
+			.get(well_known_keys::CODE)
+			.expect("code key must exist in genesis storage; qed")
+			.to_vec(),
+	);
+	let code_key = StorageKey(well_known_keys::CODE.to_vec());
+
+	Ok((code_key, code))
+}
diff --git a/utils/frame/try-runtime/cli/src/parse.rs b/utils/frame/try-runtime/cli/src/parse.rs
new file mode 100644
index 000000000000..beb9a6508fed
--- /dev/null
+++ b/utils/frame/try-runtime/cli/src/parse.rs
@@ -0,0 +1,44 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Utils for parsing user input
+
+pub(crate) fn hash(block_hash: &str) -> Result<String, String> {
+	let (block_hash, offset) = if block_hash.starts_with("0x") {
+		(&block_hash[2..], 2)
+	} else {
+		(block_hash, 0)
+	};
+
+	if let Some(pos) = block_hash.chars().position(|c| !c.is_ascii_hexdigit()) {
+		Err(format!(
+			"Expected block hash, found illegal hex character at position: {}",
+			offset + pos,
+		))
+	} else {
+		Ok(block_hash.into())
+	}
+}
+
+pub(crate) fn url(s: &str) -> Result<String, &'static str> {
+	if s.starts_with("ws://") || s.starts_with("wss://") {
+		// could use Url crate as well, but lets keep it simple for now.
+		Ok(s.to_string())
+	} else {
+		Err("not a valid WS(S) url: must start with 'ws://' or 'wss://'")
+	}
+}

From 2c84b31c86a62353ad3dbf04fae971b18470c9f5 Mon Sep 17 00:00:00 2001
From: Folyd <lyshuhow@gmail.com>
Date: Fri, 11 Jun 2021 01:31:49 +0800
Subject: [PATCH 0856/1194] Migrate ProfilingLayer to tracing registry API
 (#8943)

* Migrate ProfilingLayer to tracing registry API

* Remove the `current_span` field from `BlockSubscriber`.

* Bump the `tracing-subscriber` version

* Fix Gitlab CI
---
 Cargo.lock                        |   4 +-
 client/executor/Cargo.toml        |   2 +-
 client/tracing/Cargo.toml         |   4 +-
 client/tracing/src/block/mod.rs   |  17 +---
 client/tracing/src/lib.rs         | 156 +++++++++++++++++-------------
 client/tracing/src/logging/mod.rs |   4 +-
 primitives/tracing/Cargo.toml     |   2 +-
 7 files changed, 99 insertions(+), 90 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a6c7873f6f06..dc2c67ad1883 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10519,9 +10519,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.2.16"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ab8966ac3ca27126141f7999361cc97dd6fb4b71da04c02044fa9045d98bb96"
+checksum = "aa5553bf0883ba7c9cbe493b085c29926bd41b66afc31ff72cf17ff4fb60dcd5"
 dependencies = [
  "ansi_term 0.12.1",
  "chrono",
diff --git a/client/executor/Cargo.toml b/client/executor/Cargo.toml
index f9ebfd9bd5de..7cb2e12fd391 100644
--- a/client/executor/Cargo.toml
+++ b/client/executor/Cargo.toml
@@ -48,7 +48,7 @@ sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
 sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
 sc-tracing = { version = "3.0.0", path = "../tracing" }
 tracing = "0.1.25"
-tracing-subscriber = "0.2.15"
+tracing-subscriber = "0.2.18"
 paste = "1.0"
 
 [features]
diff --git a/client/tracing/Cargo.toml b/client/tracing/Cargo.toml
index a455cd8ab95c..1121b922494c 100644
--- a/client/tracing/Cargo.toml
+++ b/client/tracing/Cargo.toml
@@ -26,8 +26,8 @@ serde = "1.0.101"
 serde_json = "1.0.41"
 thiserror = "1.0.21"
 tracing = "0.1.25"
-tracing-log = "0.1.1"
-tracing-subscriber = "0.2.15"
+tracing-log = "0.1.2"
+tracing-subscriber = "0.2.18"
 sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
 sp-rpc = { version = "3.0.0", path = "../../primitives/rpc" }
 sp-block-builder = { version = "3.0.0", path = "../../primitives/block-builder" }
diff --git a/client/tracing/src/block/mod.rs b/client/tracing/src/block/mod.rs
index 70e74b1d8278..bc5342c85998 100644
--- a/client/tracing/src/block/mod.rs
+++ b/client/tracing/src/block/mod.rs
@@ -20,7 +20,6 @@ use std::{collections::HashMap, sync::{Arc, atomic::{AtomicU64, Ordering}}, time
 
 use parking_lot::Mutex;
 use tracing::{Dispatch, dispatcher, Subscriber, Level, span::{Attributes, Record, Id}};
-use tracing_subscriber::CurrentSpan;
 
 use sc_client_api::BlockBackend;
 use sc_rpc_server::MAX_PAYLOAD;
@@ -75,7 +74,6 @@ pub enum Error {
 struct BlockSubscriber {
 	targets: Vec<(String, Level)>,
 	next_id: AtomicU64,
-	current_span: CurrentSpan,
 	spans: Mutex<HashMap<Id, SpanDatum>>,
 	events: Mutex<Vec<TraceEvent>>,
 }
@@ -93,7 +91,6 @@ impl BlockSubscriber {
 		BlockSubscriber {
 			targets,
 			next_id,
-			current_span: CurrentSpan::default(),
 			spans: Mutex::new(HashMap::new()),
 			events: Mutex::new(Vec::new()),
 		}
@@ -117,8 +114,7 @@ impl Subscriber for BlockSubscriber {
 		let id = Id::from_u64(self.next_id.fetch_add(1, Ordering::Relaxed));
 		let mut values = Values::default();
 		attrs.record(&mut values);
-		let parent_id = attrs.parent().cloned()
-			.or_else(|| self.current_span.id());
+		let parent_id = attrs.parent().cloned();
 		let span = SpanDatum {
 			id: id.clone(),
 			parent_id,
@@ -150,8 +146,7 @@ impl Subscriber for BlockSubscriber {
 	fn event(&self, event: &tracing::Event<'_>) {
 		let mut values = crate::Values::default();
 		event.record(&mut values);
-		let parent_id = event.parent().cloned()
-			.or_else(|| self.current_span.id());
+		let parent_id = event.parent().cloned();
 		let trace_event = TraceEvent {
 			name: event.metadata().name().to_owned(),
 			target: event.metadata().target().to_owned(),
@@ -162,14 +157,10 @@ impl Subscriber for BlockSubscriber {
 		self.events.lock().push(trace_event);
 	}
 
-	fn enter(&self, id: &Id) {
-		self.current_span.enter(id.clone());
+	fn enter(&self, _id: &Id) {
 	}
 
-	fn exit(&self, span: &Id) {
-		if self.spans.lock().contains_key(span) {
-			self.current_span.exit();
-		}
+	fn exit(&self, _span: &Id) {
 	}
 }
 
diff --git a/client/tracing/src/lib.rs b/client/tracing/src/lib.rs
index 72992a9ab05f..9f02bb96e4f7 100644
--- a/client/tracing/src/lib.rs
+++ b/client/tracing/src/lib.rs
@@ -28,26 +28,23 @@
 
 #![warn(missing_docs)]
 
-pub mod logging;
 pub mod block;
+pub mod logging;
 
 use rustc_hash::FxHashMap;
+use serde::ser::{Serialize, SerializeMap, Serializer};
+use sp_tracing::{WASM_NAME_KEY, WASM_TARGET_KEY, WASM_TRACE_IDENTIFIER};
 use std::fmt;
 use std::time::{Duration, Instant};
-use parking_lot::Mutex;
-use serde::ser::{Serialize, Serializer, SerializeMap};
 use tracing::{
 	event::Event,
-	field::{Visit, Field},
-	Level,
+	field::{Field, Visit},
 	span::{Attributes, Id, Record},
 	subscriber::Subscriber,
+	Level,
 };
-use tracing_subscriber::{
-	CurrentSpan,
-	layer::{Layer, Context},
-};
-use sp_tracing::{WASM_NAME_KEY, WASM_TARGET_KEY, WASM_TRACE_IDENTIFIER};
+use tracing_subscriber::layer::{Context, Layer};
+use tracing_subscriber::registry::LookupSpan;
 
 #[doc(hidden)]
 pub use tracing;
@@ -58,8 +55,6 @@ const ZERO_DURATION: Duration = Duration::from_nanos(0);
 pub struct ProfilingLayer {
 	targets: Vec<(String, Level)>,
 	trace_handler: Box<dyn TraceHandler>,
-	span_data: Mutex<FxHashMap<Id, SpanDatum>>,
-	current_span: CurrentSpan,
 }
 
 /// Used to configure how to receive the metrics
@@ -142,10 +137,10 @@ impl Values {
 
 	/// Checks if all individual collections are empty
 	pub fn is_empty(&self) -> bool {
-		self.bool_values.is_empty() &&
-			self.i64_values.is_empty() &&
-			self.u64_values.is_empty() &&
-			self.string_values.is_empty()
+		self.bool_values.is_empty()
+			&& self.i64_values.is_empty()
+			&& self.u64_values.is_empty()
+			&& self.string_values.is_empty()
 	}
 }
 
@@ -225,8 +220,6 @@ impl ProfilingLayer {
 		Self {
 			targets,
 			trace_handler,
-			span_data: Mutex::new(FxHashMap::default()),
-			current_span: Default::default(),
 		}
 	}
 
@@ -257,32 +250,56 @@ fn parse_target(s: &str) -> (String, Level) {
 	}
 }
 
-impl<S: Subscriber> Layer<S> for ProfilingLayer {
-	fn new_span(&self, attrs: &Attributes<'_>, id: &Id, _ctx: Context<S>) {
-		let mut values = Values::default();
-		attrs.record(&mut values);
-		let span_datum = SpanDatum {
-			id: id.clone(),
-			parent_id: attrs.parent().cloned().or_else(|| self.current_span.id()),
-			name: attrs.metadata().name().to_owned(),
-			target: attrs.metadata().target().to_owned(),
-			level: *attrs.metadata().level(),
-			line: attrs.metadata().line().unwrap_or(0),
-			start_time: Instant::now(),
-			overall_time: ZERO_DURATION,
-			values,
-		};
-		self.span_data.lock().insert(id.clone(), span_datum);
+impl<S> Layer<S> for ProfilingLayer
+where
+	S: Subscriber + for<'span> LookupSpan<'span>,
+{
+	fn new_span(&self, attrs: &Attributes<'_>, id: &Id, ctx: Context<S>) {
+		if let Some(span) = ctx.span(id) {
+			let mut extension = span.extensions_mut();
+			let parent_id = attrs.parent().cloned().or_else(|| {
+				if attrs.is_contextual() {
+					ctx.lookup_current().map(|span| span.id())
+				} else {
+					None
+				}
+			});
+
+			let mut values = Values::default();
+			attrs.record(&mut values);
+			let span_datum = SpanDatum {
+				id: id.clone(),
+				parent_id,
+				name: attrs.metadata().name().to_owned(),
+				target: attrs.metadata().target().to_owned(),
+				level: *attrs.metadata().level(),
+				line: attrs.metadata().line().unwrap_or(0),
+				start_time: Instant::now(),
+				overall_time: ZERO_DURATION,
+				values,
+			};
+			extension.insert(span_datum);
+		}
 	}
 
-	fn on_record(&self, span: &Id, values: &Record<'_>, _ctx: Context<S>) {
-		let mut span_data = self.span_data.lock();
-		if let Some(s) = span_data.get_mut(span) {
-			values.record(&mut s.values);
+	fn on_record(&self, id: &Id, values: &Record<'_>, ctx: Context<S>) {
+		if let Some(span) = ctx.span(id) {
+			let mut extensions = span.extensions_mut();
+			if let Some(s) = extensions.get_mut::<SpanDatum>() {
+				values.record(&mut s.values);
+			}
 		}
 	}
 
-	fn on_event(&self, event: &Event<'_>, _ctx: Context<S>) {
+	fn on_event(&self, event: &Event<'_>, ctx: Context<S>) {
+		let parent_id = event.parent().cloned().or_else(|| {
+			if event.is_contextual() {
+				ctx.lookup_current().map(|span| span.id())
+			} else {
+				None
+			}
+		});
+
 		let mut values = Values::default();
 		event.record(&mut values);
 		let trace_event = TraceEvent {
@@ -290,46 +307,46 @@ impl<S: Subscriber> Layer<S> for ProfilingLayer {
 			target: event.metadata().target().to_owned(),
 			level: *event.metadata().level(),
 			values,
-			parent_id: event.parent().cloned().or_else(|| self.current_span.id()),
+			parent_id,
 		};
 		self.trace_handler.handle_event(trace_event);
 	}
 
-	fn on_enter(&self, span: &Id, _ctx: Context<S>) {
-		self.current_span.enter(span.clone());
-		let mut span_data = self.span_data.lock();
-		let start_time = Instant::now();
-		if let Some(mut s) = span_data.get_mut(&span) {
-			s.start_time = start_time;
+	fn on_enter(&self, span: &Id, ctx: Context<S>) {
+		if let Some(span) = ctx.span(span) {
+			let mut extensions = span.extensions_mut();
+			if let Some(s) = extensions.get_mut::<SpanDatum>() {
+				let start_time = Instant::now();
+				s.start_time = start_time;
+			}
 		}
 	}
 
-	fn on_exit(&self, span: &Id, _ctx: Context<S>) {
-		let end_time = Instant::now();
-		let span_datum = {
-			let mut span_data = self.span_data.lock();
-			span_data.remove(&span)
-		};
-
-		if let Some(mut span_datum) = span_datum {
-			// If `span_datum` is `None` we don't exit (we'd be exiting the parent span)
-			self.current_span.exit();
-			span_datum.overall_time += end_time - span_datum.start_time;
-			if span_datum.name == WASM_TRACE_IDENTIFIER {
-				span_datum.values.bool_values.insert("wasm".to_owned(), true);
-				if let Some(n) = span_datum.values.string_values.remove(WASM_NAME_KEY) {
-					span_datum.name = n;
-				}
-				if let Some(t) = span_datum.values.string_values.remove(WASM_TARGET_KEY) {
-					span_datum.target = t;
-				}
-				if self.check_target(&span_datum.target, &span_datum.level) {
+	fn on_exit(&self, span: &Id, ctx: Context<S>) {
+		if let Some(span) = ctx.span(span) {
+			let end_time = Instant::now();
+			let mut extensions = span.extensions_mut();
+			if let Some(mut span_datum) = extensions.remove::<SpanDatum>() {
+				span_datum.overall_time += end_time - span_datum.start_time;
+				if span_datum.name == WASM_TRACE_IDENTIFIER {
+					span_datum
+						.values
+						.bool_values
+						.insert("wasm".to_owned(), true);
+					if let Some(n) = span_datum.values.string_values.remove(WASM_NAME_KEY) {
+						span_datum.name = n;
+					}
+					if let Some(t) = span_datum.values.string_values.remove(WASM_TARGET_KEY) {
+						span_datum.target = t;
+					}
+					if self.check_target(&span_datum.target, &span_datum.level) {
+						self.trace_handler.handle_span(span_datum);
+					}
+				} else {
 					self.trace_handler.handle_span(span_datum);
 				}
-			} else {
-				self.trace_handler.handle_span(span_datum);
 			}
-		};
+		}
 	}
 
 	fn on_close(&self, _span: Id, _ctx: Context<S>) {}
@@ -414,6 +431,7 @@ impl From<SpanDatum> for sp_rpc::tracing::Span {
 #[cfg(test)]
 mod tests {
 	use super::*;
+	use parking_lot::Mutex;
 	use std::sync::Arc;
 	use tracing_subscriber::layer::SubscriberExt;
 
diff --git a/client/tracing/src/logging/mod.rs b/client/tracing/src/logging/mod.rs
index 63daa0b29ce1..a3fa3a531b3e 100644
--- a/client/tracing/src/logging/mod.rs
+++ b/client/tracing/src/logging/mod.rs
@@ -398,7 +398,7 @@ mod tests {
 	#[test]
 	fn prefix_in_log_lines() {
 		let re = regex::Regex::new(&format!(
-			r"^\d{{4}}-\d{{2}}-\d{{2}} \d{{2}}:\d{{2}}:\d{{2}}  \[{}\] {}$",
+			r"^\d{{4}}-\d{{2}}-\d{{2}} \d{{2}}:\d{{2}}:\d{{2}} \[{}\] {}$",
 			EXPECTED_NODE_NAME, EXPECTED_LOG_MESSAGE,
 		))
 		.unwrap();
@@ -448,7 +448,7 @@ mod tests {
 	#[test]
 	fn do_not_write_with_colors_on_tty() {
 		let re = regex::Regex::new(&format!(
-			r"^\d{{4}}-\d{{2}}-\d{{2}} \d{{2}}:\d{{2}}:\d{{2}}  {}$",
+			r"^\d{{4}}-\d{{2}}-\d{{2}} \d{{2}}:\d{{2}}:\d{{2}} {}$",
 			EXPECTED_LOG_MESSAGE,
 		))
 		.unwrap();
diff --git a/primitives/tracing/Cargo.toml b/primitives/tracing/Cargo.toml
index 6c4d70b109cd..2c4b7dc12c74 100644
--- a/primitives/tracing/Cargo.toml
+++ b/primitives/tracing/Cargo.toml
@@ -23,7 +23,7 @@ codec = { version = "2.0.0", package = "parity-scale-codec", default-features =
 tracing = { version = "0.1.25", default-features = false }
 tracing-core = { version = "0.1.17", default-features = false }
 log = { version = "0.4.8", optional = true }
-tracing-subscriber = { version = "0.2.15", optional = true, features = ["tracing-log"] }
+tracing-subscriber = { version = "0.2.18", optional = true, features = ["tracing-log"] }
 parking_lot = { version = "0.10.0", optional = true }
 erased-serde = { version = "0.3.9", optional = true }
 serde = { version = "1.0.101", optional = true }

From 8f99b4bb177b8cf57b624a10481b6a1e2ea72809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Fri, 11 Jun 2021 12:18:41 +0100
Subject: [PATCH 0857/1194] grandpa: ignore justifications from other consensus
 engines (#9075)

---
 client/finality-grandpa/src/import.rs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/client/finality-grandpa/src/import.rs b/client/finality-grandpa/src/import.rs
index 474f6ee5bf7e..3d22cc886610 100644
--- a/client/finality-grandpa/src/import.rs
+++ b/client/finality-grandpa/src/import.rs
@@ -646,10 +646,12 @@ where
 		initial_sync: bool,
 	) -> Result<(), ConsensusError> {
 		if justification.0 != GRANDPA_ENGINE_ID {
-			return Err(ConsensusError::ClientImport(format!(
-				"Expected GRANDPA Justification, got {}.",
-				String::from_utf8_lossy(&justification.0)
-			)));
+			// TODO: the import queue needs to be refactored to be able dispatch to the correct
+			// `JustificationImport` instance based on `ConsensusEngineId`, or we need to build a
+			// justification import pipeline similar to what we do for `BlockImport`. In the
+			// meantime we'll just drop the justification, since this is only used for BEEFY which
+			// is still WIP.
+			return Ok(());
 		}
 
 		let justification = GrandpaJustification::decode_and_verify_finalizes(

From 218bd4ffb20565e29a8fcca2f8f3ed005fc7d6cc Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Fri, 11 Jun 2021 14:36:37 +0200
Subject: [PATCH 0858/1194] Don't connect to reserved nodes if they're banned
 (#9020)

---
 client/peerset/src/lib.rs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/client/peerset/src/lib.rs b/client/peerset/src/lib.rs
index 19260afccb80..36d1e1831cec 100644
--- a/client/peerset/src/lib.rs
+++ b/client/peerset/src/lib.rs
@@ -444,6 +444,8 @@ impl Peerset {
 					set_id: SetId(set_index),
 					peer_id: peer.into_peer_id(),
 				});
+
+				self.alloc_slots(SetId(set_index));
 			}
 		}
 	}
@@ -524,6 +526,14 @@ impl Peerset {
 				peersstate::Peer::Connected(_) => continue,
 			};
 
+			// Don't connect to nodes with an abysmal reputation, even if they're reserved.
+			// This is a rather opinionated behaviour, and it wouldn't be fundamentally wrong to
+			// remove that check. If necessary, the peerset should be refactored to give more
+			// control over what happens in that situation.
+			if entry.reputation() < BANNED_THRESHOLD {
+				break;
+			}
+
 			match entry.try_outgoing() {
 				Ok(conn) => self.message_queue.push_back(Message::Connect {
 					set_id,

From 155ac5bcadc3143c60ffded6a3af47bce3fb12e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Fri, 11 Jun 2021 16:12:57 +0100
Subject: [PATCH 0859/1194] Try fix ui tests (#9082)

* Try fix ui tests

* More
---
 frame/support/test/Cargo.toml                             | 2 +-
 frame/support/test/tests/derive_no_bound_ui/eq.stderr     | 2 +-
 primitives/api/proc-macro/Cargo.toml                      | 1 -
 primitives/api/test/Cargo.toml                            | 2 +-
 .../test/tests/ui/impl_incorrect_method_signature.stderr  | 4 ++--
 .../api/test/tests/ui/mock_only_self_reference.stderr     | 8 ++++----
 .../ui/type_reference_in_impl_runtime_apis_call.stderr    | 4 ++--
 primitives/npos-elections/compact/Cargo.toml              | 2 +-
 primitives/runtime-interface/Cargo.toml                   | 2 +-
 test-utils/Cargo.toml                                     | 2 +-
 10 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/frame/support/test/Cargo.toml b/frame/support/test/Cargo.toml
index 85236a20f60e..1a979cdee6f8 100644
--- a/frame/support/test/Cargo.toml
+++ b/frame/support/test/Cargo.toml
@@ -20,7 +20,7 @@ frame-support = { version = "3.0.0", default-features = false, path = "../" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
 sp-core = { version = "3.0.0", default-features = false, path = "../../../primitives/core" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../../primitives/std" }
-trybuild = "1.0.38"
+trybuild = "1.0.42"
 pretty_assertions = "0.6.1"
 rustversion = "1.0.0"
 frame-metadata = { version = "13.0.0", default-features = false, path = "../../metadata" }
diff --git a/frame/support/test/tests/derive_no_bound_ui/eq.stderr b/frame/support/test/tests/derive_no_bound_ui/eq.stderr
index 36384178d469..fce13d6f17f0 100644
--- a/frame/support/test/tests/derive_no_bound_ui/eq.stderr
+++ b/frame/support/test/tests/derive_no_bound_ui/eq.stderr
@@ -7,6 +7,6 @@ error[E0277]: can't compare `Foo<T>` with `Foo<T>`
    ::: $RUST/core/src/cmp.rs
     |
     | pub trait Eq: PartialEq<Self> {
-    |               --------------- required by this bound in `Eq`
+    |               --------------- required by this bound in `std::cmp::Eq`
     |
     = help: the trait `PartialEq` is not implemented for `Foo<T>`
diff --git a/primitives/api/proc-macro/Cargo.toml b/primitives/api/proc-macro/Cargo.toml
index 1df8c489e914..d07285fe215a 100644
--- a/primitives/api/proc-macro/Cargo.toml
+++ b/primitives/api/proc-macro/Cargo.toml
@@ -12,7 +12,6 @@ documentation = "https://docs.rs/sp-api-proc-macro"
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
 
-
 [lib]
 proc-macro = true
 
diff --git a/primitives/api/test/Cargo.toml b/primitives/api/test/Cargo.toml
index 2a6325fd09e9..5866d44bd479 100644
--- a/primitives/api/test/Cargo.toml
+++ b/primitives/api/test/Cargo.toml
@@ -22,7 +22,7 @@ sp-consensus = { version = "0.9.0", path = "../../consensus/common" }
 sc-block-builder = { version = "0.9.0", path = "../../../client/block-builder" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 sp-state-machine = { version = "0.9.0", path = "../../state-machine" }
-trybuild = "1.0.38"
+trybuild = "1.0.42"
 rustversion = "1.0.0"
 
 [dev-dependencies]
diff --git a/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr b/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr
index fcda69533e3a..6b00b7268672 100644
--- a/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr
+++ b/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr
@@ -23,8 +23,8 @@ error[E0053]: method `Api_test_runtime_api_impl` has an incompatible type for tr
 17 |   sp_api::impl_runtime_apis! {
    |   ^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `u64`, found struct `std::string::String`
    |
-   = note: expected fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option<u64>, Vec<_>) -> std::result::Result<_, _>`
-              found fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option<std::string::String>, Vec<_>) -> std::result::Result<_, _>`
+   = note: expected fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option<u64>, Vec<_>) -> Result<_, _>`
+              found fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option<std::string::String>, Vec<_>) -> Result<_, _>`
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0308]: mismatched types
diff --git a/primitives/api/test/tests/ui/mock_only_self_reference.stderr b/primitives/api/test/tests/ui/mock_only_self_reference.stderr
index 73cf93610379..83cfcf6ca1f9 100644
--- a/primitives/api/test/tests/ui/mock_only_self_reference.stderr
+++ b/primitives/api/test/tests/ui/mock_only_self_reference.stderr
@@ -24,8 +24,8 @@ error[E0053]: method `Api_test_runtime_api_impl` has an incompatible type for tr
 12 |   sp_api::mock_impl_runtime_apis! {
    |   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `u64`, found `()`
    |
-   = note: expected fn pointer `fn(&MockApi, &BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, Extrinsic>>, ExecutionContext, Option<u64>, Vec<_>) -> std::result::Result<_, _>`
-              found fn pointer `fn(&MockApi, &BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, Extrinsic>>, ExecutionContext, Option<()>, Vec<_>) -> std::result::Result<_, _>`
+   = note: expected fn pointer `fn(&MockApi, &BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, Extrinsic>>, ExecutionContext, Option<u64>, Vec<_>) -> Result<_, _>`
+              found fn pointer `fn(&MockApi, &BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, Extrinsic>>, ExecutionContext, Option<()>, Vec<_>) -> Result<_, _>`
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0053]: method `Api_test2_runtime_api_impl` has an incompatible type for trait
@@ -42,6 +42,6 @@ error[E0053]: method `Api_test2_runtime_api_impl` has an incompatible type for t
 12 |   sp_api::mock_impl_runtime_apis! {
    |   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `u64`, found `()`
    |
-   = note: expected fn pointer `fn(&MockApi, &BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, Extrinsic>>, ExecutionContext, Option<u64>, Vec<_>) -> std::result::Result<_, _>`
-              found fn pointer `fn(&MockApi, &BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, Extrinsic>>, ExecutionContext, Option<()>, Vec<_>) -> std::result::Result<_, _>`
+   = note: expected fn pointer `fn(&MockApi, &BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, Extrinsic>>, ExecutionContext, Option<u64>, Vec<_>) -> Result<_, _>`
+              found fn pointer `fn(&MockApi, &BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, Extrinsic>>, ExecutionContext, Option<()>, Vec<_>) -> Result<_, _>`
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr b/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr
index 71f12b415a2b..689723f8d750 100644
--- a/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr
+++ b/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr
@@ -23,8 +23,8 @@ error[E0053]: method `Api_test_runtime_api_impl` has an incompatible type for tr
 17 |   sp_api::impl_runtime_apis! {
    |   ^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `u64`, found `&u64`
    |
-   = note: expected fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option<u64>, Vec<_>) -> std::result::Result<_, _>`
-              found fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option<&u64>, Vec<_>) -> std::result::Result<_, _>`
+   = note: expected fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option<u64>, Vec<_>) -> Result<_, _>`
+              found fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option<&u64>, Vec<_>) -> Result<_, _>`
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0308]: mismatched types
diff --git a/primitives/npos-elections/compact/Cargo.toml b/primitives/npos-elections/compact/Cargo.toml
index 63432a36efc8..78432d777a01 100644
--- a/primitives/npos-elections/compact/Cargo.toml
+++ b/primitives/npos-elections/compact/Cargo.toml
@@ -24,4 +24,4 @@ proc-macro-crate = "1.0.0"
 parity-scale-codec = "2.0.1"
 sp-arithmetic = { path = "../../arithmetic" }
 sp-npos-elections = { path = ".." }
-trybuild = "1.0.41"
+trybuild = "1.0.42"
diff --git a/primitives/runtime-interface/Cargo.toml b/primitives/runtime-interface/Cargo.toml
index c4eb084f685c..4099e8993388 100644
--- a/primitives/runtime-interface/Cargo.toml
+++ b/primitives/runtime-interface/Cargo.toml
@@ -31,7 +31,7 @@ sp-state-machine = { version = "0.9.0", path = "../state-machine" }
 sp-core = { version = "3.0.0", path = "../core" }
 sp-io = { version = "3.0.0", path = "../io" }
 rustversion = "1.0.0"
-trybuild = "1.0.38"
+trybuild = "1.0.42"
 
 [features]
 default = [ "std" ]
diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml
index 0a8849fe98a7..24a794ff4802 100644
--- a/test-utils/Cargo.toml
+++ b/test-utils/Cargo.toml
@@ -18,4 +18,4 @@ tokio = { version = "0.2.13", features = ["macros"] }
 
 [dev-dependencies]
 sc-service = { version = "0.9.0", path = "../client/service" }
-trybuild = { version = "1.0.38", features = [ "diff" ] }
+trybuild = { version = "1.0.42", features = [ "diff" ] }

From 41ab01a8cb2a43f7d743778c066ad91453e0c883 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Fri, 11 Jun 2021 16:45:13 +0100
Subject: [PATCH 0860/1194] Implement `transfer_all` in Balances Pallet (#9018)

* transfer_all

* benchmark

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* update

* add note

* typo

Co-authored-by: Parity Bot <admin@parity.io>
Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>
---
 frame/balances/src/benchmarking.rs | 24 +++++++++++++++---
 frame/balances/src/lib.rs          | 35 +++++++++++++++++++++++++-
 frame/balances/src/tests.rs        | 40 ++++++++++++++++++++++++++++++
 frame/balances/src/weights.rs      | 33 ++++++++++++++++--------
 4 files changed, 117 insertions(+), 15 deletions(-)

diff --git a/frame/balances/src/benchmarking.rs b/frame/balances/src/benchmarking.rs
index f89775146b13..688bcbc262bd 100644
--- a/frame/balances/src/benchmarking.rs
+++ b/frame/balances/src/benchmarking.rs
@@ -40,7 +40,7 @@ benchmarks_instance_pallet! {
 		let existential_deposit = T::ExistentialDeposit::get();
 		let caller = whitelisted_caller();
 
-		// Give some multiple of the existential deposit + creation fee + transfer fee
+		// Give some multiple of the existential deposit
 		let balance = existential_deposit.saturating_mul(ED_MULTIPLIER.into());
 		let _ = <Balances<T, I> as Currency<_>>::make_free_balance_be(&caller, balance);
 
@@ -130,7 +130,7 @@ benchmarks_instance_pallet! {
 		let source: T::AccountId = account("source", 0, SEED);
 		let source_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(source.clone());
 
-		// Give some multiple of the existential deposit + creation fee + transfer fee
+		// Give some multiple of the existential deposit
 		let balance = existential_deposit.saturating_mul(ED_MULTIPLIER.into());
 		let _ = <Balances<T, I> as Currency<_>>::make_free_balance_be(&source, balance);
 
@@ -154,7 +154,7 @@ benchmarks_instance_pallet! {
 		let existential_deposit = T::ExistentialDeposit::get();
 		let caller = whitelisted_caller();
 
-		// Give some multiple of the existential deposit + creation fee + transfer fee
+		// Give some multiple of the existential deposit
 		let balance = existential_deposit.saturating_mul(ED_MULTIPLIER.into());
 		let _ = <Balances<T, I> as Currency<_>>::make_free_balance_be(&caller, balance);
 
@@ -176,6 +176,24 @@ benchmarks_instance_pallet! {
 		assert_eq!(Balances::<T, I>::free_balance(&caller), Zero::zero());
 		assert_eq!(Balances::<T, I>::free_balance(&recipient), transfer_amount);
 	}
+
+	// Benchmark `transfer_all` with the worst possible condition:
+	// * The recipient account is created
+	// * The sender is killed
+	transfer_all {
+		let caller = whitelisted_caller();
+		let recipient: T::AccountId = account("recipient", 0, SEED);
+		let recipient_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(recipient.clone());
+
+		// Give some multiple of the existential deposit
+		let existential_deposit = T::ExistentialDeposit::get();
+		let balance = existential_deposit.saturating_mul(ED_MULTIPLIER.into());
+		let _ = <Balances<T, I> as Currency<_>>::make_free_balance_be(&caller, balance);
+	}: _(RawOrigin::Signed(caller.clone()), recipient_lookup, false)
+	verify {
+		assert!(Balances::<T, I>::free_balance(&caller).is_zero());
+		assert_eq!(Balances::<T, I>::free_balance(&recipient), balance);
+	}
 }
 
 impl_benchmark_test_suite!(
diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index 23c5cc97d093..105c5d08a659 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -369,6 +369,39 @@ pub mod pallet {
 			<Self as Currency<_>>::transfer(&transactor, &dest, value, KeepAlive)?;
 			Ok(().into())
 		}
+
+		/// Transfer the entire transferable balance from the caller account.
+		///
+		/// NOTE: This function only attempts to transfer _transferable_ balances. This means that
+		/// any locked, reserved, or existential deposits (when `keep_alive` is `true`), will not be
+		/// transferred by this function. To ensure that this function results in a killed account,
+		/// you might need to prepare the account by removing any reference counters, storage
+		/// deposits, etc...
+		///
+		/// The dispatch origin of this call must be Signed.
+		///
+		/// - `dest`: The recipient of the transfer.
+		/// - `keep_alive`: A boolean to determine if the `transfer_all` operation should send all
+		///   of the funds the account has, causing the sender account to be killed (false), or
+		///   transfer everything except at least the existential deposit, which will guarantee to
+		///   keep the sender account alive (true).
+		///   # <weight>
+		/// - O(1). Just like transfer, but reading the user's transferable balance first.
+		///   #</weight>
+		#[pallet::weight(T::WeightInfo::transfer_all())]
+		pub fn transfer_all(
+			origin: OriginFor<T>,
+			dest: <T::Lookup as StaticLookup>::Source,
+			keep_alive: bool,
+		) -> DispatchResultWithPostInfo {
+			use fungible::Inspect;
+			let transactor = ensure_signed(origin)?;
+			let reducible_balance = Self::reducible_balance(&transactor, keep_alive);
+			let dest = T::Lookup::lookup(dest)?;
+			let keep_alive = if keep_alive { KeepAlive } else { AllowDeath };
+			<Self as Currency<_>>::transfer(&transactor, &dest, reducible_balance, keep_alive.into())?;
+			Ok(().into())
+		}
 	}
 
 	#[pallet::event]
@@ -1696,7 +1729,7 @@ impl<T: Config<I>, I: 'static> NamedReservableCurrency<T::AccountId> for Pallet<
 	/// Is a no-op if value to be reserved is zero.
 	fn reserve_named(id: &Self::ReserveIdentifier, who: &T::AccountId, value: Self::Balance) -> DispatchResult {
 		if value.is_zero() { return Ok(()) }
-		
+
 		Reserves::<T, I>::try_mutate(who, |reserves| -> DispatchResult {
 			match reserves.binary_search_by_key(id, |data| data.id) {
 				Ok(index) => {
diff --git a/frame/balances/src/tests.rs b/frame/balances/src/tests.rs
index 86004efcf68f..3598595c7649 100644
--- a/frame/balances/src/tests.rs
+++ b/frame/balances/src/tests.rs
@@ -965,6 +965,46 @@ macro_rules! decl_tests {
 				});
 		}
 
+		#[test]
+		fn transfer_all_works() {
+			<$ext_builder>::default()
+				.existential_deposit(100)
+				.build()
+				.execute_with(|| {
+					// setup
+					assert_ok!(Balances::set_balance(Origin::root(), 1, 200, 0));
+					assert_ok!(Balances::set_balance(Origin::root(), 2, 0, 0));
+					// transfer all and allow death
+					assert_ok!(Balances::transfer_all(Some(1).into(), 2, false));
+					assert_eq!(Balances::total_balance(&1), 0);
+					assert_eq!(Balances::total_balance(&2), 200);
+
+					// setup
+					assert_ok!(Balances::set_balance(Origin::root(), 1, 200, 0));
+					assert_ok!(Balances::set_balance(Origin::root(), 2, 0, 0));
+					// transfer all and keep alive
+					assert_ok!(Balances::transfer_all(Some(1).into(), 2, true));
+					assert_eq!(Balances::total_balance(&1), 100);
+					assert_eq!(Balances::total_balance(&2), 100);
+
+					// setup
+					assert_ok!(Balances::set_balance(Origin::root(), 1, 200, 10));
+					assert_ok!(Balances::set_balance(Origin::root(), 2, 0, 0));
+					// transfer all and allow death w/ reserved
+					assert_ok!(Balances::transfer_all(Some(1).into(), 2, false));
+					assert_eq!(Balances::total_balance(&1), 0);
+					assert_eq!(Balances::total_balance(&2), 200);
+
+					// setup
+					assert_ok!(Balances::set_balance(Origin::root(), 1, 200, 10));
+					assert_ok!(Balances::set_balance(Origin::root(), 2, 0, 0));
+					// transfer all and keep alive w/ reserved
+					assert_ok!(Balances::transfer_all(Some(1).into(), 2, true));
+					assert_eq!(Balances::total_balance(&1), 100);
+					assert_eq!(Balances::total_balance(&2), 110);
+				});
+		}
+
 		#[test]
 		fn named_reserve_should_work() {
 			<$ext_builder>::default().build().execute_with(|| {
diff --git a/frame/balances/src/weights.rs b/frame/balances/src/weights.rs
index 5f3cf2b6bd9a..cf1d7dff8284 100644
--- a/frame/balances/src/weights.rs
+++ b/frame/balances/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_balances
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-04-08, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-06-04, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -49,63 +49,74 @@ pub trait WeightInfo {
 	fn set_balance_creating() -> Weight;
 	fn set_balance_killing() -> Weight;
 	fn force_transfer() -> Weight;
+	fn transfer_all() -> Weight;
 }
 
 /// Weights for pallet_balances using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn transfer() -> Weight {
-		(81_909_000 as Weight)
+		(91_896_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn transfer_keep_alive() -> Weight {
-		(61_075_000 as Weight)
+		(67_779_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_balance_creating() -> Weight {
-		(32_255_000 as Weight)
+		(36_912_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_balance_killing() -> Weight {
-		(38_513_000 as Weight)
+		(44_416_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_transfer() -> Weight {
-		(80_448_000 as Weight)
+		(90_811_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	fn transfer_all() -> Weight {
+		(84_170_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn transfer() -> Weight {
-		(81_909_000 as Weight)
+		(91_896_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn transfer_keep_alive() -> Weight {
-		(61_075_000 as Weight)
+		(67_779_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_balance_creating() -> Weight {
-		(32_255_000 as Weight)
+		(36_912_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_balance_killing() -> Weight {
-		(38_513_000 as Weight)
+		(44_416_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_transfer() -> Weight {
-		(80_448_000 as Weight)
+		(90_811_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	fn transfer_all() -> Weight {
+		(84_170_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
 }

From b9f7b588c8ba35ede3bfcce955ddc4712377245e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Fri, 11 Jun 2021 18:24:30 +0100
Subject: [PATCH 0861/1194] Transaction pool: Remove futures-diagnose and
 thread pool (#9074)

* Transaction pool: Remove futures-diagnose and thread pool

This pr removes `futures-diagnose` as this isn't used anymore. Besides
that the pr also removes the thread pool that was used to validate the
transactions in the background. Instead of this thread pool we now spawn
two separate long running tasks that we use to validate the
transactions. All tasks of the transaction pool are now also spawned as
essential tasks. This means, if any of these tasks is stopping, the node
will stop as well.

* Update client/transaction-pool/src/api.rs
---
 Cargo.lock                                  | 17 -----
 bin/node-template/node/src/service.rs       |  4 +-
 bin/node/cli/src/service.rs                 |  4 +-
 client/transaction-pool/Cargo.toml          |  1 -
 client/transaction-pool/src/api.rs          | 71 ++++++++++++++-------
 client/transaction-pool/src/lib.rs          | 22 ++++---
 client/transaction-pool/src/testing/pool.rs | 12 +++-
 test-utils/test-runner/src/node.rs          |  2 +-
 8 files changed, 78 insertions(+), 55 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index dc2c67ad1883..4572ed354ab1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2067,22 +2067,6 @@ dependencies = [
  "num_cpus",
 ]
 
-[[package]]
-name = "futures-diagnose"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdcef58a173af8148b182684c9f2d5250875adbcaff7b5794073894f9d8634a9"
-dependencies = [
- "futures 0.1.31",
- "futures 0.3.15",
- "lazy_static",
- "log",
- "parking_lot 0.9.0",
- "pin-project 0.4.27",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "futures-executor"
 version = "0.3.15"
@@ -8215,7 +8199,6 @@ version = "3.0.0"
 dependencies = [
  "assert_matches",
  "futures 0.3.15",
- "futures-diagnose",
  "hex",
  "intervalier",
  "log",
diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
index 8ed9c1ee5037..51b63e614fb8 100644
--- a/bin/node-template/node/src/service.rs
+++ b/bin/node-template/node/src/service.rs
@@ -68,7 +68,7 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 		config.transaction_pool.clone(),
 		config.role.is_authority().into(),
 		config.prometheus_registry(),
-		task_manager.spawn_handle(),
+		task_manager.spawn_essential_handle(),
 		client.clone(),
 	);
 
@@ -332,7 +332,7 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
 	let transaction_pool = Arc::new(sc_transaction_pool::BasicPool::new_light(
 		config.transaction_pool.clone(),
 		config.prometheus_registry(),
-		task_manager.spawn_handle(),
+		task_manager.spawn_essential_handle(),
 		client.clone(),
 		on_demand.clone(),
 	));
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index a9ac2ac8065f..06e1fcc80477 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -90,7 +90,7 @@ pub fn new_partial(
 		config.transaction_pool.clone(),
 		config.role.is_authority().into(),
 		config.prometheus_registry(),
-		task_manager.spawn_handle(),
+		task_manager.spawn_essential_handle(),
 		client.clone(),
 	);
 
@@ -471,7 +471,7 @@ pub fn new_light_base(
 	let transaction_pool = Arc::new(sc_transaction_pool::BasicPool::new_light(
 		config.transaction_pool.clone(),
 		config.prometheus_registry(),
-		task_manager.spawn_handle(),
+		task_manager.spawn_essential_handle(),
 		client.clone(),
 		on_demand.clone(),
 	));
diff --git a/client/transaction-pool/Cargo.toml b/client/transaction-pool/Cargo.toml
index d457d709d122..6b105520baec 100644
--- a/client/transaction-pool/Cargo.toml
+++ b/client/transaction-pool/Cargo.toml
@@ -16,7 +16,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 thiserror = "1.0.21"
 futures = { version = "0.3.1", features = ["compat"] }
-futures-diagnose = "1.0"
 intervalier = "0.4.0"
 log = "0.4.8"
 parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
diff --git a/client/transaction-pool/src/api.rs b/client/transaction-pool/src/api.rs
index 09864f78248a..74e08c3aa058 100644
--- a/client/transaction-pool/src/api.rs
+++ b/client/transaction-pool/src/api.rs
@@ -21,7 +21,8 @@
 use std::{marker::PhantomData, pin::Pin, sync::Arc};
 use codec::{Decode, Encode};
 use futures::{
-	channel::oneshot, executor::{ThreadPool, ThreadPoolBuilder}, future::{Future, FutureExt, ready, Ready},
+	channel::{oneshot, mpsc}, future::{Future, FutureExt, ready, Ready}, lock::Mutex, SinkExt,
+	StreamExt,
 };
 
 use sc_client_api::{
@@ -34,15 +35,36 @@ use sp_runtime::{
 use sp_transaction_pool::runtime_api::TaggedTransactionQueue;
 use sp_api::{ProvideRuntimeApi, ApiExt};
 use prometheus_endpoint::Registry as PrometheusRegistry;
+use sp_core::traits::SpawnEssentialNamed;
 
 use crate::{metrics::{ApiMetrics, ApiMetricsExt}, error::{self, Error}};
 
 /// The transaction pool logic for full client.
 pub struct FullChainApi<Client, Block> {
 	client: Arc<Client>,
-	pool: ThreadPool,
 	_marker: PhantomData<Block>,
 	metrics: Option<Arc<ApiMetrics>>,
+	validation_pool: Arc<Mutex<mpsc::Sender<Pin<Box<dyn Future<Output = ()> + Send>>>>>,
+}
+
+/// Spawn a validation task that will be used by the transaction pool to validate transactions.
+fn spawn_validation_pool_task(
+	name: &'static str,
+	receiver: Arc<Mutex<mpsc::Receiver<Pin<Box<dyn Future<Output = ()> + Send>>>>>,
+	spawner: &impl SpawnEssentialNamed,
+) {
+	spawner.spawn_essential_blocking(
+		name,
+		async move {
+			loop {
+				let task = receiver.lock().await.next().await;
+				match task {
+					None => return,
+					Some(task) => task.await,
+				}
+			}
+		}.boxed(),
+	);
 }
 
 impl<Client, Block> FullChainApi<Client, Block> {
@@ -50,6 +72,7 @@ impl<Client, Block> FullChainApi<Client, Block> {
 	pub fn new(
 		client: Arc<Client>,
 		prometheus: Option<&PrometheusRegistry>,
+		spawner: &impl SpawnEssentialNamed,
 	) -> Self {
 		let metrics = prometheus.map(ApiMetrics::register).and_then(|r| {
 			match r {
@@ -65,13 +88,15 @@ impl<Client, Block> FullChainApi<Client, Block> {
 			}
 		});
 
+		let (sender, receiver) = mpsc::channel(0);
+
+		let receiver = Arc::new(Mutex::new(receiver));
+		spawn_validation_pool_task("transaction-pool-task-0", receiver.clone(), spawner);
+		spawn_validation_pool_task("transaction-pool-task-1", receiver, spawner);
+
 		FullChainApi {
 			client,
-			pool: ThreadPoolBuilder::new()
-				.pool_size(2)
-				.name_prefix("txpool-verifier")
-				.create()
-				.expect("Failed to spawn verifier threads, that are critical for node operation."),
+			validation_pool: Arc::new(Mutex::new(sender)),
 			_marker: Default::default(),
 			metrics,
 		}
@@ -105,27 +130,29 @@ where
 		let (tx, rx) = oneshot::channel();
 		let client = self.client.clone();
 		let at = at.clone();
-
+		let validation_pool = self.validation_pool.clone();
 		let metrics = self.metrics.clone();
-		metrics.report(|m| m.validations_scheduled.inc());
-
-		self.pool.spawn_ok(futures_diagnose::diagnose(
-			"validate-transaction",
-			async move {
-				let res = validate_transaction_blocking(&*client, &at, source, uxt);
-				if let Err(e) = tx.send(res) {
-					log::warn!("Unable to send a validate transaction result: {:?}", e);
-				}
-				metrics.report(|m| m.validations_finished.inc());
-			},
-		));
 
-		Box::pin(async move {
+		async move {
+			metrics.report(|m| m.validations_scheduled.inc());
+
+			validation_pool.lock()
+				.await
+				.send(
+					async move {
+						let res = validate_transaction_blocking(&*client, &at, source, uxt);
+						let _ = tx.send(res);
+						metrics.report(|m| m.validations_finished.inc());
+					}.boxed()
+				)
+				.await
+				.map_err(|e| Error::RuntimeApi(format!("Validation pool down: {:?}", e)))?;
+
 			match rx.await {
 				Ok(r) => r,
 				Err(_) => Err(Error::RuntimeApi("Validation was canceled".into())),
 			}
-		})
+		}.boxed()
 	}
 
 	fn block_id_to_number(
diff --git a/client/transaction-pool/src/lib.rs b/client/transaction-pool/src/lib.rs
index 0cd47f870d1a..15c75a554daa 100644
--- a/client/transaction-pool/src/lib.rs
+++ b/client/transaction-pool/src/lib.rs
@@ -42,7 +42,7 @@ use sp_runtime::{
 	generic::BlockId,
 	traits::{Block as BlockT, NumberFor, AtLeast32Bit, Extrinsic, Zero, Header as HeaderT},
 };
-use sp_core::traits::SpawnNamed;
+use sp_core::traits::SpawnEssentialNamed;
 use sp_transaction_pool::{
 	TransactionPool, PoolStatus, ImportNotificationStream, TxHash, TransactionFor,
 	TransactionStatusStreamFor, MaintainedTransactionPool, PoolFuture, ChainEvent,
@@ -195,20 +195,26 @@ impl<PoolApi, Block> BasicPool<PoolApi, Block>
 		pool_api: Arc<PoolApi>,
 		prometheus: Option<&PrometheusRegistry>,
 		revalidation_type: RevalidationType,
-		spawner: impl SpawnNamed,
+		spawner: impl SpawnEssentialNamed,
 		best_block_number: NumberFor<Block>,
 	) -> Self {
 		let pool = Arc::new(sc_transaction_graph::Pool::new(options, is_validator, pool_api.clone()));
 		let (revalidation_queue, background_task) = match revalidation_type {
-			RevalidationType::Light => (revalidation::RevalidationQueue::new(pool_api.clone(), pool.clone()), None),
+			RevalidationType::Light => (
+				revalidation::RevalidationQueue::new(pool_api.clone(), pool.clone()),
+				None,
+			),
 			RevalidationType::Full => {
-				let (queue, background) = revalidation::RevalidationQueue::new_background(pool_api.clone(), pool.clone());
+				let (queue, background) = revalidation::RevalidationQueue::new_background(
+					pool_api.clone(),
+					pool.clone(),
+				);
 				(queue, Some(background))
 			},
 		};
 
 		if let Some(background_task) = background_task {
-			spawner.spawn("txpool-background", background_task);
+			spawner.spawn_essential("txpool-background", background_task);
 		}
 
 		Self {
@@ -357,7 +363,7 @@ where
 	pub fn new_light(
 		options: sc_transaction_graph::Options,
 		prometheus: Option<&PrometheusRegistry>,
-		spawner: impl SpawnNamed,
+		spawner: impl SpawnEssentialNamed,
 		client: Arc<Client>,
 		fetcher: Arc<Fetcher>,
 	) -> Self {
@@ -393,10 +399,10 @@ where
 		options: sc_transaction_graph::Options,
 		is_validator: txpool::IsValidator,
 		prometheus: Option<&PrometheusRegistry>,
-		spawner: impl SpawnNamed,
+		spawner: impl SpawnEssentialNamed,
 		client: Arc<Client>,
 	) -> Arc<Self> {
-		let pool_api = Arc::new(FullChainApi::new(client.clone(), prometheus));
+		let pool_api = Arc::new(FullChainApi::new(client.clone(), prometheus, &spawner));
 		let pool = Arc::new(Self::with_revalidation_type(
 			options,
 			is_validator,
diff --git a/client/transaction-pool/src/testing/pool.rs b/client/transaction-pool/src/testing/pool.rs
index 999d1ab65eb6..675a58cd4427 100644
--- a/client/transaction-pool/src/testing/pool.rs
+++ b/client/transaction-pool/src/testing/pool.rs
@@ -910,7 +910,11 @@ fn should_not_accept_old_signatures() {
 	let client = Arc::new(substrate_test_runtime_client::new());
 
 	let pool = Arc::new(
-		BasicPool::new_test(Arc::new(FullChainApi::new(client, None))).0
+		BasicPool::new_test(Arc::new(FullChainApi::new(
+			client,
+			None,
+			&sp_core::testing::TaskExecutor::new(),
+		))).0
 	);
 
 	let transfer = Transfer {
@@ -946,7 +950,11 @@ fn import_notification_to_pool_maintain_works() {
 	let mut client = Arc::new(substrate_test_runtime_client::new());
 
 	let pool = Arc::new(
-		BasicPool::new_test(Arc::new(FullChainApi::new(client.clone(), None))).0
+		BasicPool::new_test(Arc::new(FullChainApi::new(
+			client.clone(),
+			None,
+			&sp_core::testing::TaskExecutor::new(),
+		))).0
 	);
 
 	// Prepare the extrisic, push it to the pool and check that it was added.
diff --git a/test-utils/test-runner/src/node.rs b/test-utils/test-runner/src/node.rs
index ce41e5b5b520..00be12b651bc 100644
--- a/test-utils/test-runner/src/node.rs
+++ b/test-utils/test-runner/src/node.rs
@@ -134,7 +134,7 @@ impl<T: ChainInfo> Node<T> {
 			config.transaction_pool.clone(),
 			true.into(),
 			config.prometheus_registry(),
-			task_manager.spawn_handle(),
+			task_manager.spawn_essential_handle(),
 			client.clone(),
 		);
 

From 561dbcff78fcbeb3848cbeb35c8f0397335d7df4 Mon Sep 17 00:00:00 2001
From: Shaun Wang <spxwang@gmail.com>
Date: Sat, 12 Jun 2021 12:22:40 +1200
Subject: [PATCH 0862/1194] Migrate pallet-staking to pallet attribute macro
 (#9083)

* Migrate staking pallet to pallet attribute macro.

* HistoryDepth default value.

* Make all calls public.

* Update frame/staking/src/lib.rs

* remove externalities again

* Update lib.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 frame/babe/src/mock.rs                 |    2 +-
 frame/grandpa/src/mock.rs              |    2 +-
 frame/offences/benchmarking/src/lib.rs |    2 +-
 frame/session/benchmarking/src/lib.rs  |    9 +-
 frame/staking/src/benchmarking.rs      |   34 +-
 frame/staking/src/lib.rs               | 1065 ++++++++++++++----------
 frame/staking/src/mock.rs              |   13 +-
 frame/staking/src/slashing.rs          |   52 +-
 frame/staking/src/testing_utils.rs     |    6 +-
 frame/staking/src/tests.rs             |   72 +-
 10 files changed, 718 insertions(+), 539 deletions(-)

diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index bd9953154247..236b975817ff 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -28,7 +28,7 @@ use sp_runtime::{
 use frame_system::InitKind;
 use frame_support::{
 	parameter_types,
-	traits::{KeyOwnerProofSystem, OnInitialize},
+	traits::{KeyOwnerProofSystem, OnInitialize, GenesisBuild},
 };
 use sp_io;
 use sp_core::{H256, U256, crypto::{IsWrappedBy, KeyTypeId, Pair}};
diff --git a/frame/grandpa/src/mock.rs b/frame/grandpa/src/mock.rs
index df55f6037e30..752d94ce1908 100644
--- a/frame/grandpa/src/mock.rs
+++ b/frame/grandpa/src/mock.rs
@@ -24,7 +24,7 @@ use ::grandpa as finality_grandpa;
 use codec::Encode;
 use frame_support::{
 	parameter_types,
-	traits::{KeyOwnerProofSystem, OnFinalize, OnInitialize},
+	traits::{KeyOwnerProofSystem, OnFinalize, OnInitialize, GenesisBuild},
 };
 use pallet_staking::EraIndex;
 use sp_core::{crypto::KeyTypeId, H256};
diff --git a/frame/offences/benchmarking/src/lib.rs b/frame/offences/benchmarking/src/lib.rs
index e27c66c75a66..e7c61bfd989b 100644
--- a/frame/offences/benchmarking/src/lib.rs
+++ b/frame/offences/benchmarking/src/lib.rs
@@ -42,7 +42,7 @@ use pallet_offences::{Config as OffencesConfig, Pallet as Offences};
 use pallet_session::historical::{Config as HistoricalConfig, IdentificationTuple};
 use pallet_session::{Config as SessionConfig, SessionManager};
 use pallet_staking::{
-	Module as Staking, Config as StakingConfig, RewardDestination, ValidatorPrefs, Exposure,
+	Pallet as Staking, Config as StakingConfig, RewardDestination, ValidatorPrefs, Exposure,
 	IndividualExposure, Event as StakingEvent,
 };
 
diff --git a/frame/session/benchmarking/src/lib.rs b/frame/session/benchmarking/src/lib.rs
index fff3717607f8..d9a50b431f2e 100644
--- a/frame/session/benchmarking/src/lib.rs
+++ b/frame/session/benchmarking/src/lib.rs
@@ -28,7 +28,6 @@ use sp_std::vec;
 use frame_benchmarking::{benchmarks, impl_benchmark_test_suite};
 use frame_support::{
 	codec::Decode,
-	storage::StorageValue,
 	traits::{KeyOwnerProofSystem, OnInitialize},
 };
 use frame_system::RawOrigin;
@@ -59,7 +58,7 @@ benchmarks! {
 			false,
 			RewardDestination::Staked,
 		)?;
-		let v_controller = pallet_staking::Module::<T>::bonded(&v_stash).ok_or("not stash")?;
+		let v_controller = pallet_staking::Pallet::<T>::bonded(&v_stash).ok_or("not stash")?;
 		let keys = T::Keys::default();
 		let proof: Vec<u8> = vec![0,1,2,3];
 		// Whitelist controller account from further DB operations.
@@ -75,7 +74,7 @@ benchmarks! {
 			false,
 			RewardDestination::Staked
 		)?;
-		let v_controller = pallet_staking::Module::<T>::bonded(&v_stash).ok_or("not stash")?;
+		let v_controller = pallet_staking::Pallet::<T>::bonded(&v_stash).ok_or("not stash")?;
 		let keys = T::Keys::default();
 		let proof: Vec<u8> = vec![0,1,2,3];
 		Session::<T>::set_keys(RawOrigin::Signed(v_controller.clone()).into(), keys, proof)?;
@@ -125,7 +124,7 @@ fn check_membership_proof_setup<T: Config>(
 	(sp_runtime::KeyTypeId, &'static [u8; 32]),
 	sp_session::MembershipProof,
 ) {
-	pallet_staking::ValidatorCount::put(n);
+	pallet_staking::ValidatorCount::<T>::put(n);
 
 	// create validators and set random session keys
 	for (n, who) in create_validators::<T>(n, 1000)
@@ -137,7 +136,7 @@ fn check_membership_proof_setup<T: Config>(
 		use rand::SeedableRng;
 
 		let validator = T::Lookup::lookup(who).unwrap();
-		let controller = pallet_staking::Module::<T>::bonded(validator).unwrap();
+		let controller = pallet_staking::Pallet::<T>::bonded(validator).unwrap();
 
 		let keys = {
 			let mut keys = [0u8; 128];
diff --git a/frame/staking/src/benchmarking.rs b/frame/staking/src/benchmarking.rs
index 1d8a5c1fd645..800d3379d7e3 100644
--- a/frame/staking/src/benchmarking.rs
+++ b/frame/staking/src/benchmarking.rs
@@ -18,7 +18,7 @@
 //! Staking pallet benchmarking.
 
 use super::*;
-use crate::Module as Staking;
+use crate::Pallet as Staking;
 use testing_utils::*;
 
 use sp_runtime::traits::One;
@@ -88,7 +88,7 @@ pub fn create_validator_with_nominators<T: Config>(
 		}
 	}
 
-	ValidatorCount::put(1);
+	ValidatorCount::<T>::put(1);
 
 	// Start a new Era
 	let new_validators = Staking::<T>::new_era(SessionIndex::one()).unwrap();
@@ -102,7 +102,7 @@ pub fn create_validator_with_nominators<T: Config>(
 		individual: points_individual.into_iter().collect(),
 	};
 
-	let current_era = CurrentEra::get().unwrap();
+	let current_era = CurrentEra::<T>::get().unwrap();
 	ErasRewardPoints::<T>::insert(current_era, reward);
 
 	// Create reward pool
@@ -164,7 +164,7 @@ benchmarks! {
 		add_slashing_spans::<T>(&stash, s);
 		let amount = T::Currency::minimum_balance() * 5u32.into(); // Half of total
 		Staking::<T>::unbond(RawOrigin::Signed(controller.clone()).into(), amount)?;
-		CurrentEra::put(EraIndex::max_value());
+		CurrentEra::<T>::put(EraIndex::max_value());
 		let ledger = Ledger::<T>::get(&controller).ok_or("ledger not created before")?;
 		let original_total: BalanceOf<T> = ledger.total;
 		whitelist_account!(controller);
@@ -183,7 +183,7 @@ benchmarks! {
 		add_slashing_spans::<T>(&stash, s);
 		let amount = T::Currency::minimum_balance() * 10u32.into();
 		Staking::<T>::unbond(RawOrigin::Signed(controller.clone()).into(), amount)?;
-		CurrentEra::put(EraIndex::max_value());
+		CurrentEra::<T>::put(EraIndex::max_value());
 		let ledger = Ledger::<T>::get(&controller).ok_or("ledger not created before")?;
 		let original_total: BalanceOf<T> = ledger.total;
 		whitelist_account!(controller);
@@ -303,17 +303,17 @@ benchmarks! {
 		let validator_count = MAX_VALIDATORS;
 	}: _(RawOrigin::Root, validator_count)
 	verify {
-		assert_eq!(ValidatorCount::get(), validator_count);
+		assert_eq!(ValidatorCount::<T>::get(), validator_count);
 	}
 
 	force_no_eras {}: _(RawOrigin::Root)
-	verify { assert_eq!(ForceEra::get(), Forcing::ForceNone); }
+	verify { assert_eq!(ForceEra::<T>::get(), Forcing::ForceNone); }
 
 	force_new_era {}: _(RawOrigin::Root)
-	verify { assert_eq!(ForceEra::get(), Forcing::ForceNew); }
+	verify { assert_eq!(ForceEra::<T>::get(), Forcing::ForceNew); }
 
 	force_new_era_always {}: _(RawOrigin::Root)
-	verify { assert_eq!(ForceEra::get(), Forcing::ForceAlways); }
+	verify { assert_eq!(ForceEra::<T>::get(), Forcing::ForceAlways); }
 
 	// Worst case scenario, the list of invulnerables is very long.
 	set_invulnerables {
@@ -361,7 +361,7 @@ benchmarks! {
 			RewardDestination::Controller,
 		)?;
 
-		let current_era = CurrentEra::get().unwrap();
+		let current_era = CurrentEra::<T>::get().unwrap();
 		// set the commission for this particular era as well.
 		<ErasValidatorPrefs<T>>::insert(current_era, validator.clone(), <Staking<T>>::validators(&validator));
 
@@ -394,7 +394,7 @@ benchmarks! {
 			RewardDestination::Staked,
 		)?;
 
-		let current_era = CurrentEra::get().unwrap();
+		let current_era = CurrentEra::<T>::get().unwrap();
 		// set the commission for this particular era as well.
 		<ErasValidatorPrefs<T>>::insert(current_era, validator.clone(), <Staking<T>>::validators(&validator));
 
@@ -444,8 +444,8 @@ benchmarks! {
 
 	set_history_depth {
 		let e in 1 .. 100;
-		HistoryDepth::put(e);
-		CurrentEra::put(e);
+		HistoryDepth::<T>::put(e);
+		CurrentEra::<T>::put(e);
 		for i in 0 .. e {
 			<ErasStakers<T>>::insert(i, T::AccountId::default(), Exposure::<T::AccountId, BalanceOf<T>>::default());
 			<ErasStakersClipped<T>>::insert(i, T::AccountId::default(), Exposure::<T::AccountId, BalanceOf<T>>::default());
@@ -453,11 +453,11 @@ benchmarks! {
 			<ErasValidatorReward<T>>::insert(i, BalanceOf::<T>::one());
 			<ErasRewardPoints<T>>::insert(i, EraRewardPoints::<T::AccountId>::default());
 			<ErasTotalStake<T>>::insert(i, BalanceOf::<T>::one());
-			ErasStartSessionIndex::insert(i, i);
+			ErasStartSessionIndex::<T>::insert(i, i);
 		}
 	}: _(RawOrigin::Root, EraIndex::zero(), u32::max_value())
 	verify {
-		assert_eq!(HistoryDepth::get(), 0);
+		assert_eq!(HistoryDepth::<T>::get(), 0);
 	}
 
 	reap_stash {
@@ -503,7 +503,7 @@ benchmarks! {
 		let new_validators = Staking::<T>::new_era(SessionIndex::one()).unwrap();
 		assert!(new_validators.len() == v as usize);
 
-		let current_era = CurrentEra::get().unwrap();
+		let current_era = CurrentEra::<T>::get().unwrap();
 		let mut points_total = 0;
 		let mut points_individual = Vec::new();
 		let mut payout_calls_arg = Vec::new();
@@ -636,7 +636,7 @@ mod tests {
 
 			assert_eq!(nominators.len() as u32, n);
 
-			let current_era = CurrentEra::get().unwrap();
+			let current_era = CurrentEra::<Test>::get().unwrap();
 
 			let original_free_balance = Balances::free_balance(&validator_stash);
 			assert_ok!(Staking::payout_stakers(Origin::signed(1337), validator_stash, current_era));
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 888601e307f3..49660350ba91 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -15,17 +15,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! # Staking Module
+//! # Staking Pallet
 //!
-//! The Staking module is used to manage funds at stake by network maintainers.
+//! The Staking pallet is used to manage funds at stake by network maintainers.
 //!
 //! - [`Config`]
 //! - [`Call`]
-//! - [`Module`]
+//! - [`Pallet`]
 //!
 //! ## Overview
 //!
-//! The Staking module is the means by which a set of network maintainers (known as _authorities_ in
+//! The Staking pallet is the means by which a set of network maintainers (known as _authorities_ in
 //! some contexts and _validators_ in others) are chosen based upon those who voluntarily place
 //! funds under deposit. Under deposit, those funds are rewarded under normal operation but are held
 //! at pain of _slash_ (expropriation) should the staked maintainer be found not to be discharging
@@ -59,7 +59,7 @@
 //!
 //! #### Staking
 //!
-//! Almost any interaction with the Staking module requires a process of _**bonding**_ (also known
+//! Almost any interaction with the Staking pallet requires a process of _**bonding**_ (also known
 //! as being a _staker_). To become *bonded*, a fund-holding account known as the _stash account_,
 //! which holds some or all of the funds that become frozen in place as part of the staking process,
 //! is paired with an active **controller** account, which issues instructions on how they shall be
@@ -102,7 +102,7 @@
 //!
 //! #### Rewards and Slash
 //!
-//! The **reward and slashing** procedure is the core of the Staking module, attempting to _embrace
+//! The **reward and slashing** procedure is the core of the Staking pallet, attempting to _embrace
 //! valid behavior_ while _punishing any misbehavior or lack of availability_.
 //!
 //! Rewards must be claimed for each era before it gets too old by `$HISTORY_DEPTH` using the
@@ -115,7 +115,7 @@
 //! determined, a value is deducted from the balance of the validator and all the nominators who
 //! voted for this validator (values are deducted from the _stash_ account of the slashed entity).
 //!
-//! Slashing logic is further described in the documentation of the `slashing` module.
+//! Slashing logic is further described in the documentation of the `slashing` pallet.
 //!
 //! Similar to slashing, rewards are also shared among a validator and its associated nominators.
 //! Yet, the reward funds are not always transferred to the stash account and can be configured. See
@@ -131,19 +131,19 @@
 //!
 //! ### Session managing
 //!
-//! The module implement the trait `SessionManager`. Which is the only API to query new validator
+//! The pallet implement the trait `SessionManager`. Which is the only API to query new validator
 //! set and allowing these validator set to be rewarded once their era is ended.
 //!
 //! ## Interface
 //!
 //! ### Dispatchable Functions
 //!
-//! The dispatchable functions of the Staking module enable the steps needed for entities to accept
-//! and change their role, alongside some helper functions to get/set the metadata of the module.
+//! The dispatchable functions of the Staking pallet enable the steps needed for entities to accept
+//! and change their role, alongside some helper functions to get/set the metadata of the pallet.
 //!
 //! ### Public Functions
 //!
-//! The Staking module contains many public storage items and (im)mutable functions.
+//! The Staking pallet contains many public storage items and (im)mutable functions.
 //!
 //! ## Usage
 //!
@@ -162,7 +162,7 @@
 //!         #[weight = 0]
 //!         pub fn reward_myself(origin) -> dispatch::DispatchResult {
 //!             let reported = ensure_signed(origin)?;
-//!             <staking::Module<T>>::reward_by_ids(vec![(reported, 10)]);
+//!             <staking::Pallet<T>>::reward_by_ids(vec![(reported, 10)]);
 //!             Ok(())
 //!         }
 //!     }
@@ -198,9 +198,9 @@
 //!
 //! Total reward is split among validators and their nominators depending on the number of points
 //! they received during the era. Points are added to a validator using
-//! [`reward_by_ids`](Module::reward_by_ids).
+//! [`reward_by_ids`](Pallet::reward_by_ids).
 //!
-//! [`Module`] implements
+//! [`Pallet`] implements
 //! [`pallet_authorship::EventHandler`] to add reward
 //! points to block producer and block producer of referenced uncles.
 //!
@@ -255,14 +255,14 @@
 //!
 //! ## GenesisConfig
 //!
-//! The Staking module depends on the [`GenesisConfig`]. The
+//! The Staking pallet depends on the [`GenesisConfig`]. The
 //! `GenesisConfig` is optional and allow to set some initial stakers.
 //!
 //! ## Related Modules
 //!
 //! - [Balances](../pallet_balances/index.html): Used to manage values at stake.
 //! - [Session](../pallet_session/index.html): Used to manage sessions. Also, a list of new
-//!   validators is stored in the Session module's `Validators` at the end of each era.
+//!   validators is stored in the Session pallet's `Validators` at the end of each era.
 
 #![recursion_limit = "128"]
 #![cfg_attr(not(feature = "std"), no_std)]
@@ -288,13 +288,11 @@ use sp_std::{
 };
 use codec::{HasCompact, Encode, Decode};
 use frame_support::{
-	decl_module, decl_event, decl_storage, ensure, decl_error,
+	pallet_prelude::*,
 	weights::{
 		Weight, WithPostDispatchInfo,
 		constants::{WEIGHT_PER_MICROS, WEIGHT_PER_NANOS},
 	},
-	storage::IterableStorageMap,
-	dispatch::{DispatchResult, DispatchResultWithPostInfo},
 	traits::{
 		Currency, LockIdentifier, LockableCurrency, WithdrawReasons, OnUnbalanced, Imbalance, Get,
 		UnixTime, EstimateNextNewSession, EnsureOrigin, CurrencyToVote,
@@ -314,11 +312,12 @@ use sp_staking::{
 	offence::{OnOffenceHandler, OffenceDetails, Offence, ReportOffence, OffenceError},
 };
 use frame_system::{
-	self as system, ensure_signed, ensure_root,
+	ensure_signed, ensure_root, pallet_prelude::*,
 	offchain::SendTransactionTypes,
 };
 use frame_election_provider_support::{ElectionProvider, VoteWeight, Supports, data_provider};
 pub use weights::WeightInfo;
+pub use pallet::*;
 
 const STAKING_ID: LockIdentifier = *b"staking ";
 pub(crate) const LOG_TARGET: &'static str = "runtime::staking";
@@ -342,7 +341,7 @@ pub type EraIndex = u32;
 /// Counter for the number of "reward" points earned by a given validator.
 pub type RewardPoint = u32;
 
-/// The balance type of this module.
+/// The balance type of this pallet.
 pub type BalanceOf<T> =
 	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 
@@ -654,15 +653,15 @@ impl<T: Config> SessionInterface<<T as frame_system::Config>::AccountId> for T w
 		Convert<<T as frame_system::Config>::AccountId, Option<<T as frame_system::Config>::AccountId>>,
 {
 	fn disable_validator(validator: &<T as frame_system::Config>::AccountId) -> Result<bool, ()> {
-		<pallet_session::Module<T>>::disable(validator)
+		<pallet_session::Pallet<T>>::disable(validator)
 	}
 
 	fn validators() -> Vec<<T as frame_system::Config>::AccountId> {
-		<pallet_session::Module<T>>::validators()
+		<pallet_session::Pallet<T>>::validators()
 	}
 
 	fn prune_historical_up_to(up_to: SessionIndex) {
-		<pallet_session::historical::Module<T>>::prune_up_to(up_to);
+		<pallet_session::historical::Pallet<T>>::prune_up_to(up_to);
 	}
 }
 
@@ -713,82 +712,6 @@ impl<
 	}
 }
 
-pub trait Config: frame_system::Config + SendTransactionTypes<Call<Self>> {
-	/// The staking balance.
-	type Currency: LockableCurrency<Self::AccountId, Moment = Self::BlockNumber>;
-
-	/// Time used for computing era duration.
-	///
-	/// It is guaranteed to start being called from the first `on_finalize`. Thus value at genesis
-	/// is not used.
-	type UnixTime: UnixTime;
-
-	/// Convert a balance into a number used for election calculation. This must fit into a `u64`
-	/// but is allowed to be sensibly lossy. The `u64` is used to communicate with the
-	/// [`sp_npos_elections`] crate which accepts u64 numbers and does operations in 128.
-	/// Consequently, the backward convert is used convert the u128s from sp-elections back to a
-	/// [`BalanceOf`].
-	type CurrencyToVote: CurrencyToVote<BalanceOf<Self>>;
-
-	/// Something that provides the election functionality.
-	type ElectionProvider: frame_election_provider_support::ElectionProvider<
-		Self::AccountId,
-		Self::BlockNumber,
-		// we only accept an election provider that has staking as data provider.
-		DataProvider = Module<Self>,
-	>;
-
-	/// Maximum number of nominations per nominator.
-	const MAX_NOMINATIONS: u32;
-
-	/// Tokens have been minted and are unused for validator-reward.
-	/// See [Era payout](./index.html#era-payout).
-	type RewardRemainder: OnUnbalanced<NegativeImbalanceOf<Self>>;
-
-	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
-
-	/// Handler for the unbalanced reduction when slashing a staker.
-	type Slash: OnUnbalanced<NegativeImbalanceOf<Self>>;
-
-	/// Handler for the unbalanced increment when rewarding a staker.
-	type Reward: OnUnbalanced<PositiveImbalanceOf<Self>>;
-
-	/// Number of sessions per era.
-	type SessionsPerEra: Get<SessionIndex>;
-
-	/// Number of eras that staked funds must remain bonded for.
-	type BondingDuration: Get<EraIndex>;
-
-	/// Number of eras that slashes are deferred by, after computation.
-	///
-	/// This should be less than the bonding duration. Set to 0 if slashes
-	/// should be applied immediately, without opportunity for intervention.
-	type SlashDeferDuration: Get<EraIndex>;
-
-	/// The origin which can cancel a deferred slash. Root can always do this.
-	type SlashCancelOrigin: EnsureOrigin<Self::Origin>;
-
-	/// Interface for interacting with a session module.
-	type SessionInterface: self::SessionInterface<Self::AccountId>;
-
-	/// The payout for validators and the system for the current era.
-	/// See [Era payout](./index.html#era-payout).
-	type EraPayout: EraPayout<BalanceOf<Self>>;
-
-	/// Something that can estimate the next session change, accurately or as a best effort guess.
-	type NextNewSession: EstimateNextNewSession<Self::BlockNumber>;
-
-	/// The maximum number of nominators rewarded for each validator.
-	///
-	/// For each validator only the `$MaxNominatorRewardedPerValidator` biggest stakers can claim
-	/// their reward. This used to limit the i/o cost for the nominator payout.
-	type MaxNominatorRewardedPerValidator: Get<u32>;
-
-	/// Weight information for extrinsics in this pallet.
-	type WeightInfo: WeightInfo;
-}
-
 /// Mode of era-forcing.
 #[derive(Copy, Clone, PartialEq, Eq, Encode, Decode, RuntimeDebug)]
 #[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
@@ -828,183 +751,447 @@ impl Default for Releases {
 	}
 }
 
-decl_storage! {
-	trait Store for Module<T: Config> as Staking {
-		/// Number of eras to keep in history.
-		///
-		/// Information is kept for eras in `[current_era - history_depth; current_era]`.
-		///
-		/// Must be more than the number of eras delayed by session otherwise. I.e. active era must
-		/// always be in history. I.e. `active_era > current_era - history_depth` must be
-		/// guaranteed.
-		HistoryDepth get(fn history_depth) config(): u32 = 84;
+pub mod migrations {
+	use super::*;
 
-		/// The ideal number of staking participants.
-		pub ValidatorCount get(fn validator_count) config(): u32;
+	pub mod v6 {
+		use super::*;
+		use frame_support::{traits::Get, weights::Weight, generate_storage_alias};
 
-		/// Minimum number of staking participants before emergency conditions are imposed.
-		pub MinimumValidatorCount get(fn minimum_validator_count) config(): u32;
+		// NOTE: value type doesn't matter, we just set it to () here.
+		generate_storage_alias!(Staking, SnapshotValidators => Value<()>);
+		generate_storage_alias!(Staking, SnapshotNominators => Value<()>);
+		generate_storage_alias!(Staking, QueuedElected => Value<()>);
+		generate_storage_alias!(Staking, QueuedScore => Value<()>);
+		generate_storage_alias!(Staking, EraElectionStatus => Value<()>);
+		generate_storage_alias!(Staking, IsCurrentSessionFinal => Value<()>);
 
-		/// Any validators that may never be slashed or forcibly kicked. It's a Vec since they're
-		/// easy to initialize and the performance hit is minimal (we expect no more than four
-		/// invulnerables) and restricted to testnets.
-		pub Invulnerables get(fn invulnerables) config(): Vec<T::AccountId>;
+		/// check to execute prior to migration.
+		pub fn pre_migrate<T: Config>() -> Result<(), &'static str> {
+			// these may or may not exist.
+			log!(info, "SnapshotValidators.exits()? {:?}", SnapshotValidators::exists());
+			log!(info, "SnapshotNominators.exits()? {:?}", SnapshotNominators::exists());
+			log!(info, "QueuedElected.exits()? {:?}", QueuedElected::exists());
+			log!(info, "QueuedScore.exits()? {:?}", QueuedScore::exists());
+			// these must exist.
+			assert!(IsCurrentSessionFinal::exists(), "IsCurrentSessionFinal storage item not found!");
+			assert!(EraElectionStatus::exists(), "EraElectionStatus storage item not found!");
+			Ok(())
+		}
 
-		/// Map from all locked "stash" accounts to the controller account.
-		pub Bonded get(fn bonded): map hasher(twox_64_concat) T::AccountId => Option<T::AccountId>;
+		/// Migrate storage to v6.
+		pub fn migrate<T: Config>() -> Weight {
+			log!(info, "Migrating staking to Releases::V6_0_0");
 
-		/// Map from all (unlocked) "controller" accounts to the info regarding the staking.
-		pub Ledger get(fn ledger):
-			map hasher(blake2_128_concat) T::AccountId
-			=> Option<StakingLedger<T::AccountId, BalanceOf<T>>>;
+			SnapshotValidators::kill();
+			SnapshotNominators::kill();
+			QueuedElected::kill();
+			QueuedScore::kill();
+			EraElectionStatus::kill();
+			IsCurrentSessionFinal::kill();
 
-		/// Where the reward payment should be made. Keyed by stash.
-		pub Payee get(fn payee): map hasher(twox_64_concat) T::AccountId => RewardDestination<T::AccountId>;
+			StorageVersion::<T>::put(Releases::V6_0_0);
+			log!(info, "Done.");
+			T::DbWeight::get().writes(6 + 1)
+		}
+	}
+}
 
-		/// The map from (wannabe) validator stash key to the preferences of that validator.
-		pub Validators get(fn validators):
-			map hasher(twox_64_concat) T::AccountId => ValidatorPrefs;
+#[frame_support::pallet]
+pub mod pallet {
+	use super::*;
 
-		/// The map from nominator stash key to the set of stash keys of all validators to nominate.
-		pub Nominators get(fn nominators):
-			map hasher(twox_64_concat) T::AccountId => Option<Nominations<T::AccountId>>;
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(_);
 
-		/// The current era index.
-		///
-		/// This is the latest planned era, depending on how the Session pallet queues the validator
-		/// set, it might be active or not.
-		pub CurrentEra get(fn current_era): Option<EraIndex>;
+	#[pallet::config]
+	pub trait Config: frame_system::Config + SendTransactionTypes<Call<Self>> {
+		/// The staking balance.
+		type Currency: LockableCurrency<Self::AccountId, Moment = Self::BlockNumber>;
 
-		/// The active era information, it holds index and start.
+		/// Time used for computing era duration.
 		///
-		/// The active era is the era being currently rewarded. Validator set of this era must be
-		/// equal to [`SessionInterface::validators`].
-		pub ActiveEra get(fn active_era): Option<ActiveEraInfo>;
+		/// It is guaranteed to start being called from the first `on_finalize`. Thus value at genesis
+		/// is not used.
+		type UnixTime: UnixTime;
 
-		/// The session index at which the era start for the last `HISTORY_DEPTH` eras.
-		///
-		/// Note: This tracks the starting session (i.e. session index when era start being active)
-		/// for the eras in `[CurrentEra - HISTORY_DEPTH, CurrentEra]`.
-		pub ErasStartSessionIndex get(fn eras_start_session_index):
-			map hasher(twox_64_concat) EraIndex => Option<SessionIndex>;
+		/// Convert a balance into a number used for election calculation. This must fit into a `u64`
+		/// but is allowed to be sensibly lossy. The `u64` is used to communicate with the
+		/// [`sp_npos_elections`] crate which accepts u64 numbers and does operations in 128.
+		/// Consequently, the backward convert is used convert the u128s from sp-elections back to a
+		/// [`BalanceOf`].
+		type CurrencyToVote: CurrencyToVote<BalanceOf<Self>>;
 
-		/// Exposure of validator at era.
-		///
-		/// This is keyed first by the era index to allow bulk deletion and then the stash account.
-		///
-		/// Is it removed after `HISTORY_DEPTH` eras.
-		/// If stakers hasn't been set or has been removed then empty exposure is returned.
-		pub ErasStakers get(fn eras_stakers):
-			double_map hasher(twox_64_concat) EraIndex, hasher(twox_64_concat) T::AccountId
-			=> Exposure<T::AccountId, BalanceOf<T>>;
+		/// Something that provides the election functionality.
+		type ElectionProvider: frame_election_provider_support::ElectionProvider<
+			Self::AccountId,
+			Self::BlockNumber,
+			// we only accept an election provider that has staking as data provider.
+			DataProvider = Pallet<Self>,
+		>;
 
-		/// Clipped Exposure of validator at era.
-		///
-		/// This is similar to [`ErasStakers`] but number of nominators exposed is reduced to the
-		/// `T::MaxNominatorRewardedPerValidator` biggest stakers.
-		/// (Note: the field `total` and `own` of the exposure remains unchanged).
-		/// This is used to limit the i/o cost for the nominator payout.
-		///
-		/// This is keyed fist by the era index to allow bulk deletion and then the stash account.
-		///
-		/// Is it removed after `HISTORY_DEPTH` eras.
-		/// If stakers hasn't been set or has been removed then empty exposure is returned.
-		pub ErasStakersClipped get(fn eras_stakers_clipped):
-			double_map hasher(twox_64_concat) EraIndex, hasher(twox_64_concat) T::AccountId
-			=> Exposure<T::AccountId, BalanceOf<T>>;
+		/// Maximum number of nominations per nominator.
+		const MAX_NOMINATIONS: u32;
 
-		/// Similar to `ErasStakers`, this holds the preferences of validators.
-		///
-		/// This is keyed first by the era index to allow bulk deletion and then the stash account.
-		///
-		/// Is it removed after `HISTORY_DEPTH` eras.
-		// If prefs hasn't been set or has been removed then 0 commission is returned.
-		pub ErasValidatorPrefs get(fn eras_validator_prefs):
-			double_map hasher(twox_64_concat) EraIndex, hasher(twox_64_concat) T::AccountId
-			=> ValidatorPrefs;
+		/// Tokens have been minted and are unused for validator-reward.
+		/// See [Era payout](./index.html#era-payout).
+		type RewardRemainder: OnUnbalanced<NegativeImbalanceOf<Self>>;
 
-		/// The total validator era payout for the last `HISTORY_DEPTH` eras.
-		///
-		/// Eras that haven't finished yet or has been removed doesn't have reward.
-		pub ErasValidatorReward get(fn eras_validator_reward):
-			map hasher(twox_64_concat) EraIndex => Option<BalanceOf<T>>;
+		/// The overarching event type.
+		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
 
-		/// Rewards for the last `HISTORY_DEPTH` eras.
-		/// If reward hasn't been set or has been removed then 0 reward is returned.
-		pub ErasRewardPoints get(fn eras_reward_points):
-			map hasher(twox_64_concat) EraIndex => EraRewardPoints<T::AccountId>;
+		/// Handler for the unbalanced reduction when slashing a staker.
+		type Slash: OnUnbalanced<NegativeImbalanceOf<Self>>;
 
-		/// The total amount staked for the last `HISTORY_DEPTH` eras.
-		/// If total hasn't been set or has been removed then 0 stake is returned.
-		pub ErasTotalStake get(fn eras_total_stake):
-			map hasher(twox_64_concat) EraIndex => BalanceOf<T>;
+		/// Handler for the unbalanced increment when rewarding a staker.
+		type Reward: OnUnbalanced<PositiveImbalanceOf<Self>>;
 
-		/// Mode of era forcing.
-		pub ForceEra get(fn force_era) config(): Forcing;
+		/// Number of sessions per era.
+		#[pallet::constant]
+		type SessionsPerEra: Get<SessionIndex>;
 
-		/// The percentage of the slash that is distributed to reporters.
+		/// Number of eras that staked funds must remain bonded for.
+		#[pallet::constant]
+		type BondingDuration: Get<EraIndex>;
+
+		/// Number of eras that slashes are deferred by, after computation.
 		///
-		/// The rest of the slashed value is handled by the `Slash`.
-		pub SlashRewardFraction get(fn slash_reward_fraction) config(): Perbill;
+		/// This should be less than the bonding duration. Set to 0 if slashes
+		/// should be applied immediately, without opportunity for intervention.
+		#[pallet::constant]
+		type SlashDeferDuration: Get<EraIndex>;
+
+		/// The origin which can cancel a deferred slash. Root can always do this.
+		type SlashCancelOrigin: EnsureOrigin<Self::Origin>;
 
-		/// The amount of currency given to reporters of a slash event which was
-		/// canceled by extraordinary circumstances (e.g. governance).
-		pub CanceledSlashPayout get(fn canceled_payout) config(): BalanceOf<T>;
+		/// Interface for interacting with a session pallet.
+		type SessionInterface: self::SessionInterface<Self::AccountId>;
 
-		/// All unapplied slashes that are queued for later.
-		pub UnappliedSlashes:
-			map hasher(twox_64_concat) EraIndex => Vec<UnappliedSlash<T::AccountId, BalanceOf<T>>>;
+		/// The payout for validators and the system for the current era.
+		/// See [Era payout](./index.html#era-payout).
+		type EraPayout: EraPayout<BalanceOf<Self>>;
 
-		/// A mapping from still-bonded eras to the first session index of that era.
+		/// Something that can estimate the next session change, accurately or as a best effort guess.
+		type NextNewSession: EstimateNextNewSession<Self::BlockNumber>;
+
+		/// The maximum number of nominators rewarded for each validator.
 		///
-		/// Must contains information for eras for the range:
-		/// `[active_era - bounding_duration; active_era]`
-		BondedEras: Vec<(EraIndex, SessionIndex)>;
+		/// For each validator only the `$MaxNominatorRewardedPerValidator` biggest stakers can claim
+		/// their reward. This used to limit the i/o cost for the nominator payout.
+		#[pallet::constant]
+		type MaxNominatorRewardedPerValidator: Get<u32>;
+
+		/// Weight information for extrinsics in this pallet.
+		type WeightInfo: WeightInfo;
+	}
+
+	#[pallet::extra_constants]
+	impl<T: Config> Pallet<T> {
+		//TODO: rename to snake case after https://github.com/paritytech/substrate/issues/8826 fixed.
+		#[allow(non_snake_case)]
+		fn MaxNominations() -> u32 {
+			T::MAX_NOMINATIONS
+		}
+	}
 
-		/// All slashing events on validators, mapped by era to the highest slash proportion
-		/// and slash value of the era.
-		ValidatorSlashInEra:
-			double_map hasher(twox_64_concat) EraIndex, hasher(twox_64_concat) T::AccountId
-			=> Option<(Perbill, BalanceOf<T>)>;
+	#[pallet::type_value]
+	pub(crate) fn HistoryDepthOnEmpty() -> u32 { 84u32 }
 
-		/// All slashing events on nominators, mapped by era to the highest slash value of the era.
-		NominatorSlashInEra:
-			double_map hasher(twox_64_concat) EraIndex, hasher(twox_64_concat) T::AccountId
-			=> Option<BalanceOf<T>>;
+	/// Number of eras to keep in history.
+	///
+	/// Information is kept for eras in `[current_era - history_depth; current_era]`.
+	///
+	/// Must be more than the number of eras delayed by session otherwise. I.e. active era must
+	/// always be in history. I.e. `active_era > current_era - history_depth` must be
+	/// guaranteed.
+	#[pallet::storage]
+	#[pallet::getter(fn history_depth)]
+	pub(crate) type HistoryDepth<T> = StorageValue<_, u32, ValueQuery, HistoryDepthOnEmpty>;
+
+	/// The ideal number of staking participants.
+	#[pallet::storage]
+	#[pallet::getter(fn validator_count)]
+	pub type ValidatorCount<T> = StorageValue<_, u32, ValueQuery>;
+
+	/// Minimum number of staking participants before emergency conditions are imposed.
+	#[pallet::storage]
+	#[pallet::getter(fn minimum_validator_count)]
+	pub type MinimumValidatorCount<T> = StorageValue<_, u32, ValueQuery>;
+
+	/// Any validators that may never be slashed or forcibly kicked. It's a Vec since they're
+	/// easy to initialize and the performance hit is minimal (we expect no more than four
+	/// invulnerables) and restricted to testnets.
+	#[pallet::storage]
+	#[pallet::getter(fn invulnerables)]
+	pub type Invulnerables<T: Config> = StorageValue<_, Vec<T::AccountId>, ValueQuery>;
+
+	/// Map from all locked "stash" accounts to the controller account.
+	#[pallet::storage]
+	#[pallet::getter(fn bonded)]
+	pub type Bonded<T: Config> = StorageMap<_, Twox64Concat, T::AccountId, T::AccountId>;
+
+	/// Map from all (unlocked) "controller" accounts to the info regarding the staking.
+	#[pallet::storage]
+	#[pallet::getter(fn ledger)]
+	pub type Ledger<T: Config> = StorageMap<
+		_,
+		Blake2_128Concat, T::AccountId,
+		StakingLedger<T::AccountId, BalanceOf<T>>,
+	>;
 
-		/// Slashing spans for stash accounts.
-		SlashingSpans get(fn slashing_spans): map hasher(twox_64_concat) T::AccountId => Option<slashing::SlashingSpans>;
+	/// Where the reward payment should be made. Keyed by stash.
+	#[pallet::storage]
+	#[pallet::getter(fn payee)]
+	pub type Payee<T: Config> = StorageMap<
+		_,
+		Twox64Concat, T::AccountId,
+		RewardDestination<T::AccountId>,
+		ValueQuery,
+	>;
 
-		/// Records information about the maximum slash of a stash within a slashing span,
-		/// as well as how much reward has been paid out.
-		SpanSlash:
-			map hasher(twox_64_concat) (T::AccountId, slashing::SpanIndex)
-			=> slashing::SpanRecord<BalanceOf<T>>;
+	/// The map from (wannabe) validator stash key to the preferences of that validator.
+	#[pallet::storage]
+	#[pallet::getter(fn validators)]
+	pub type Validators<T: Config> = StorageMap<_, Twox64Concat, T::AccountId, ValidatorPrefs, ValueQuery>;
 
-		/// The earliest era for which we have a pending, unapplied slash.
-		EarliestUnappliedSlash: Option<EraIndex>;
+	/// The map from nominator stash key to the set of stash keys of all validators to nominate.
+	#[pallet::storage]
+	#[pallet::getter(fn nominators)]
+	pub type Nominators<T: Config> = StorageMap<_, Twox64Concat, T::AccountId, Nominations<T::AccountId>>;
 
-		/// The last planned session scheduled by the session pallet.
-		///
-		/// This is basically in sync with the call to [`SessionManager::new_session`].
-		pub CurrentPlannedSession get(fn current_planned_session): SessionIndex;
+	/// The current era index.
+	///
+	/// This is the latest planned era, depending on how the Session pallet queues the validator
+	/// set, it might be active or not.
+	#[pallet::storage]
+	#[pallet::getter(fn current_era)]
+	pub type CurrentEra<T> = StorageValue<_, EraIndex>;
 
-		/// True if network has been upgraded to this version.
-		/// Storage version of the pallet.
-		///
-		/// This is set to v6.0.0 for new networks.
-		StorageVersion build(|_: &GenesisConfig<T>| Releases::V6_0_0): Releases;
+	/// The active era information, it holds index and start.
+	///
+	/// The active era is the era being currently rewarded. Validator set of this era must be
+	/// equal to [`SessionInterface::validators`].
+	#[pallet::storage]
+	#[pallet::getter(fn active_era)]
+	pub type ActiveEra<T> = StorageValue<_, ActiveEraInfo>;
+
+	/// The session index at which the era start for the last `HISTORY_DEPTH` eras.
+	///
+	/// Note: This tracks the starting session (i.e. session index when era start being active)
+	/// for the eras in `[CurrentEra - HISTORY_DEPTH, CurrentEra]`.
+	#[pallet::storage]
+	#[pallet::getter(fn eras_start_session_index)]
+	pub type ErasStartSessionIndex<T> = StorageMap<_, Twox64Concat, EraIndex, SessionIndex>;
+
+	/// Exposure of validator at era.
+	///
+	/// This is keyed first by the era index to allow bulk deletion and then the stash account.
+	///
+	/// Is it removed after `HISTORY_DEPTH` eras.
+	/// If stakers hasn't been set or has been removed then empty exposure is returned.
+	#[pallet::storage]
+	#[pallet::getter(fn eras_stakers)]
+	pub type ErasStakers<T: Config> = StorageDoubleMap<
+		_,
+		Twox64Concat, EraIndex,
+		Twox64Concat, T::AccountId,
+		Exposure<T::AccountId, BalanceOf<T>>,
+		ValueQuery,
+	>;
+
+	/// Clipped Exposure of validator at era.
+	///
+	/// This is similar to [`ErasStakers`] but number of nominators exposed is reduced to the
+	/// `T::MaxNominatorRewardedPerValidator` biggest stakers.
+	/// (Note: the field `total` and `own` of the exposure remains unchanged).
+	/// This is used to limit the i/o cost for the nominator payout.
+	///
+	/// This is keyed fist by the era index to allow bulk deletion and then the stash account.
+	///
+	/// Is it removed after `HISTORY_DEPTH` eras.
+	/// If stakers hasn't been set or has been removed then empty exposure is returned.
+	#[pallet::storage]
+	#[pallet::getter(fn eras_stakers_clipped)]
+	pub type ErasStakersClipped<T: Config> = StorageDoubleMap<
+		_,
+		Twox64Concat, EraIndex,
+		Twox64Concat, T::AccountId,
+		Exposure<T::AccountId, BalanceOf<T>>,
+		ValueQuery,
+	>;
+
+	/// Similar to `ErasStakers`, this holds the preferences of validators.
+	///
+	/// This is keyed first by the era index to allow bulk deletion and then the stash account.
+	///
+	/// Is it removed after `HISTORY_DEPTH` eras.
+	// If prefs hasn't been set or has been removed then 0 commission is returned.
+	#[pallet::storage]
+	#[pallet::getter(fn eras_validator_prefs)]
+	pub type ErasValidatorPrefs<T: Config> = StorageDoubleMap<
+		_,
+		Twox64Concat, EraIndex,
+		Twox64Concat, T::AccountId,
+		ValidatorPrefs,
+		ValueQuery,
+	>;
+
+	/// The total validator era payout for the last `HISTORY_DEPTH` eras.
+	///
+	/// Eras that haven't finished yet or has been removed doesn't have reward.
+	#[pallet::storage]
+	#[pallet::getter(fn eras_validator_reward)]
+	pub type ErasValidatorReward<T: Config> = StorageMap<_, Twox64Concat, EraIndex, BalanceOf<T>>;
+
+	/// Rewards for the last `HISTORY_DEPTH` eras.
+	/// If reward hasn't been set or has been removed then 0 reward is returned.
+	#[pallet::storage]
+	#[pallet::getter(fn eras_reward_points)]
+	pub type ErasRewardPoints<T: Config> = StorageMap<
+		_,
+		Twox64Concat, EraIndex,
+		EraRewardPoints<T::AccountId>,
+		ValueQuery,
+	>;
+
+	/// The total amount staked for the last `HISTORY_DEPTH` eras.
+	/// If total hasn't been set or has been removed then 0 stake is returned.
+	#[pallet::storage]
+	#[pallet::getter(fn eras_total_stake)]
+	pub type ErasTotalStake<T: Config> = StorageMap<_, Twox64Concat, EraIndex, BalanceOf<T>, ValueQuery>;
+
+	/// Mode of era forcing.
+	#[pallet::storage]
+	#[pallet::getter(fn force_era)]
+	pub type ForceEra<T> = StorageValue<_, Forcing, ValueQuery>;
+
+	/// The percentage of the slash that is distributed to reporters.
+	///
+	/// The rest of the slashed value is handled by the `Slash`.
+	#[pallet::storage]
+	#[pallet::getter(fn slash_reward_fraction)]
+	pub type SlashRewardFraction<T> = StorageValue<_, Perbill, ValueQuery>;
+
+	/// The amount of currency given to reporters of a slash event which was
+	/// canceled by extraordinary circumstances (e.g. governance).
+	#[pallet::storage]
+	#[pallet::getter(fn canceled_payout)]
+	pub type CanceledSlashPayout<T: Config> = StorageValue<_, BalanceOf<T>, ValueQuery>;
+
+	/// All unapplied slashes that are queued for later.
+	#[pallet::storage]
+	pub type UnappliedSlashes<T: Config> = StorageMap<
+		_,
+		Twox64Concat, EraIndex,
+		Vec<UnappliedSlash<T::AccountId, BalanceOf<T>>>,
+		ValueQuery,
+	>;
+
+	/// A mapping from still-bonded eras to the first session index of that era.
+	///
+	/// Must contains information for eras for the range:
+	/// `[active_era - bounding_duration; active_era]`
+	#[pallet::storage]
+	pub(crate) type BondedEras<T: Config> = StorageValue<_, Vec<(EraIndex, SessionIndex)>, ValueQuery>;
+
+	/// All slashing events on validators, mapped by era to the highest slash proportion
+	/// and slash value of the era.
+	#[pallet::storage]
+	pub(crate) type ValidatorSlashInEra<T: Config> = StorageDoubleMap<
+		_,
+		Twox64Concat, EraIndex,
+		Twox64Concat, T::AccountId,
+		(Perbill, BalanceOf<T>),
+	>;
+
+	/// All slashing events on nominators, mapped by era to the highest slash value of the era.
+	#[pallet::storage]
+	pub(crate) type NominatorSlashInEra<T: Config> = StorageDoubleMap<
+		_,
+		Twox64Concat, EraIndex,
+		Twox64Concat, T::AccountId,
+		BalanceOf<T>,
+	>;
+
+	/// Slashing spans for stash accounts.
+	#[pallet::storage]
+	pub(crate) type SlashingSpans<T: Config> = StorageMap<_, Twox64Concat, T::AccountId, slashing::SlashingSpans>;
+
+	/// Records information about the maximum slash of a stash within a slashing span,
+	/// as well as how much reward has been paid out.
+	#[pallet::storage]
+	pub(crate) type SpanSlash<T: Config> = StorageMap<
+		_,
+		Twox64Concat, (T::AccountId, slashing::SpanIndex),
+		slashing::SpanRecord<BalanceOf<T>>,
+		ValueQuery,
+	>;
+
+	/// The earliest era for which we have a pending, unapplied slash.
+	#[pallet::storage]
+	pub(crate) type EarliestUnappliedSlash<T> = StorageValue<_, EraIndex>;
+
+	/// The last planned session scheduled by the session pallet.
+	///
+	/// This is basically in sync with the call to [`SessionManager::new_session`].
+	#[pallet::storage]
+	#[pallet::getter(fn current_planned_session)]
+	pub type CurrentPlannedSession<T> = StorageValue<_, SessionIndex, ValueQuery>;
+
+	/// True if network has been upgraded to this version.
+	/// Storage version of the pallet.
+	///
+	/// This is set to v6.0.0 for new networks.
+	#[pallet::storage]
+	pub(crate) type StorageVersion<T: Config> = StorageValue<_, Releases, ValueQuery>;
+
+	#[pallet::genesis_config]
+	pub struct GenesisConfig<T: Config> {
+		pub history_depth: u32,
+		pub validator_count: u32,
+		pub minimum_validator_count: u32,
+		pub invulnerables: Vec<T::AccountId>,
+		pub force_era: Forcing,
+		pub slash_reward_fraction: Perbill,
+		pub canceled_payout: BalanceOf<T>,
+		pub stakers: Vec<(T::AccountId, T::AccountId, BalanceOf<T>, StakerStatus<T::AccountId>)>,
 	}
-	add_extra_genesis {
-		config(stakers):
-			Vec<(T::AccountId, T::AccountId, BalanceOf<T>, StakerStatus<T::AccountId>)>;
-		build(|config: &GenesisConfig<T>| {
-			for &(ref stash, ref controller, balance, ref status) in &config.stakers {
+
+	#[cfg(feature = "std")]
+	impl<T: Config> Default for GenesisConfig<T> {
+		fn default() -> Self {
+			GenesisConfig {
+				history_depth: 84u32,
+				validator_count: Default::default(),
+				minimum_validator_count: Default::default(),
+				invulnerables: Default::default(),
+				force_era: Default::default(),
+				slash_reward_fraction: Default::default(),
+				canceled_payout: Default::default(),
+				stakers: Default::default(),
+			}
+		}
+	}
+
+	#[pallet::genesis_build]
+	impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+		fn build(&self) {
+			HistoryDepth::<T>::put(self.history_depth);
+			ValidatorCount::<T>::put(self.validator_count);
+			MinimumValidatorCount::<T>::put(self.minimum_validator_count);
+			Invulnerables::<T>::put(&self.invulnerables);
+			ForceEra::<T>::put(self.force_era);
+			CanceledSlashPayout::<T>::put(self.canceled_payout);
+			SlashRewardFraction::<T>::put(self.slash_reward_fraction);
+			StorageVersion::<T>::put(Releases::V6_0_0);
+
+			for &(ref stash, ref controller, balance, ref status) in &self.stakers {
 				assert!(
 					T::Currency::free_balance(&stash) >= balance,
 					"Stash does not have enough balance to bond."
 				);
-				let _ = <Module<T>>::bond(
+				let _ = <Pallet<T>>::bond(
 					T::Origin::from(Some(stash.clone()).into()),
 					T::Lookup::unlookup(controller.clone()),
 					balance,
@@ -1012,80 +1199,35 @@ decl_storage! {
 				);
 				let _ = match status {
 					StakerStatus::Validator => {
-						<Module<T>>::validate(
+						<Pallet<T>>::validate(
 							T::Origin::from(Some(controller.clone()).into()),
 							Default::default(),
 						)
 					},
 					StakerStatus::Nominator(votes) => {
-						<Module<T>>::nominate(
+						<Pallet<T>>::nominate(
 							T::Origin::from(Some(controller.clone()).into()),
 							votes.iter().map(|l| T::Lookup::unlookup(l.clone())).collect(),
 						)
 					}, _ => Ok(())
 				};
 			}
-		});
-	}
-}
-
-pub mod migrations {
-	use super::*;
-
-	pub mod v6 {
-		use super::*;
-		use frame_support::{traits::Get, weights::Weight, generate_storage_alias};
-
-		// NOTE: value type doesn't matter, we just set it to () here.
-		generate_storage_alias!(Staking, SnapshotValidators => Value<()>);
-		generate_storage_alias!(Staking, SnapshotNominators => Value<()>);
-		generate_storage_alias!(Staking, QueuedElected => Value<()>);
-		generate_storage_alias!(Staking, QueuedScore => Value<()>);
-		generate_storage_alias!(Staking, EraElectionStatus => Value<()>);
-		generate_storage_alias!(Staking, IsCurrentSessionFinal => Value<()>);
-
-		/// check to execute prior to migration.
-		pub fn pre_migrate<T: Config>() -> Result<(), &'static str> {
-			// these may or may not exist.
-			log!(info, "SnapshotValidators.exits()? {:?}", SnapshotValidators::exists());
-			log!(info, "SnapshotNominators.exits()? {:?}", SnapshotNominators::exists());
-			log!(info, "QueuedElected.exits()? {:?}", QueuedElected::exists());
-			log!(info, "QueuedScore.exits()? {:?}", QueuedScore::exists());
-			// these must exist.
-			assert!(IsCurrentSessionFinal::exists(), "IsCurrentSessionFinal storage item not found!");
-			assert!(EraElectionStatus::exists(), "EraElectionStatus storage item not found!");
-			Ok(())
-		}
-
-		/// Migrate storage to v6.
-		pub fn migrate<T: Config>() -> Weight {
-			log!(info, "Migrating staking to Releases::V6_0_0");
-
-			SnapshotValidators::kill();
-			SnapshotNominators::kill();
-			QueuedElected::kill();
-			QueuedScore::kill();
-			EraElectionStatus::kill();
-			IsCurrentSessionFinal::kill();
-
-			StorageVersion::put(Releases::V6_0_0);
-			log!(info, "Done.");
-			T::DbWeight::get().writes(6 + 1)
 		}
 	}
-}
 
-decl_event!(
-	pub enum Event<T> where Balance = BalanceOf<T>, <T as frame_system::Config>::AccountId {
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	#[pallet::metadata(T::AccountId = "AccountId", BalanceOf<T> = "Balance")]
+	pub enum Event<T: Config> {
 		/// The era payout has been set; the first balance is the validator-payout; the second is
 		/// the remainder from the maximum amount of reward.
 		/// \[era_index, validator_payout, remainder\]
-		EraPayout(EraIndex, Balance, Balance),
+		EraPayout(EraIndex, BalanceOf<T>, BalanceOf<T>),
 		/// The staker has been rewarded by this amount. \[stash, amount\]
-		Reward(AccountId, Balance),
+		Reward(T::AccountId, BalanceOf<T>),
 		/// One validator (and its nominators) has been slashed by the given amount.
 		/// \[validator, amount\]
-		Slash(AccountId, Balance),
+		Slash(T::AccountId, BalanceOf<T>),
 		/// An old slashing report from a prior era was discarded because it could
 		/// not be processed. \[session_index\]
 		OldSlashingReportDiscarded(SessionIndex),
@@ -1095,20 +1237,18 @@ decl_event!(
 		///
 		/// NOTE: This event is only emitted when funds are bonded via a dispatchable. Notably,
 		/// it will not be emitted for staking rewards when they are added to stake.
-		Bonded(AccountId, Balance),
+		Bonded(T::AccountId, BalanceOf<T>),
 		/// An account has unbonded this amount. \[stash, amount\]
-		Unbonded(AccountId, Balance),
+		Unbonded(T::AccountId, BalanceOf<T>),
 		/// An account has called `withdraw_unbonded` and removed unbonding chunks worth `Balance`
 		/// from the unlocking queue. \[stash, amount\]
-		Withdrawn(AccountId, Balance),
+		Withdrawn(T::AccountId, BalanceOf<T>),
 		/// A nominator has been kicked from a validator. \[nominator, stash\]
-		Kicked(AccountId, AccountId),
+		Kicked(T::AccountId, T::AccountId),
 	}
-);
 
-decl_error! {
-	/// Error for the staking module.
-	pub enum Error for Module<T: Config> {
+	#[pallet::error]
+	pub enum Error<T> {
 		/// Not a controller account.
 		NotController,
 		/// Not a stash account.
@@ -1150,73 +1290,51 @@ decl_error! {
 		/// A nomination target was supplied that was blocked or otherwise not a validator.
 		BadTarget,
 	}
-}
-
-decl_module! {
-	pub struct Module<T: Config> for enum Call where origin: T::Origin {
-		/// Number of sessions per era.
-		const SessionsPerEra: SessionIndex = T::SessionsPerEra::get();
-
-		/// Number of eras that staked funds must remain bonded for.
-		const BondingDuration: EraIndex = T::BondingDuration::get();
-
-		/// Number of eras that slashes are deferred by, after computation.
-		///
-		/// This should be less than the bonding duration.
-		/// Set to 0 if slashes should be applied immediately, without opportunity for
-		/// intervention.
-		const SlashDeferDuration: EraIndex = T::SlashDeferDuration::get();
-
-		/// The maximum number of nominators rewarded for each validator.
-		///
-		/// For each validator only the `$MaxNominatorRewardedPerValidator` biggest stakers can claim
-		/// their reward. This used to limit the i/o cost for the nominator payout.
-		const MaxNominatorRewardedPerValidator: u32 = T::MaxNominatorRewardedPerValidator::get();
-
-		/// Maximum number of nominations per nominator.
-		const MaxNominations: u32 = T::MAX_NOMINATIONS;
-
-		type Error = Error<T>;
-
-		fn deposit_event() = default;
 
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
 		fn on_runtime_upgrade() -> Weight {
-			if StorageVersion::get() == Releases::V5_0_0 {
+			if StorageVersion::<T>::get() == Releases::V5_0_0 {
 				migrations::v6::migrate::<T>()
 			} else {
 				T::DbWeight::get().reads(1)
 			}
 		}
 
-		fn on_initialize(_now: T::BlockNumber) -> Weight {
+		fn on_initialize(_now: BlockNumberFor<T>) -> Weight {
 			// just return the weight of the on_finalize.
 			T::DbWeight::get().reads(1)
 		}
 
-		fn on_finalize() {
+		fn on_finalize(_n: BlockNumberFor<T>) {
 			// Set the start of the first era.
 			if let Some(mut active_era) = Self::active_era() {
 				if active_era.start.is_none() {
 					let now_as_millis_u64 = T::UnixTime::now().as_millis().saturated_into::<u64>();
 					active_era.start = Some(now_as_millis_u64);
 					// This write only ever happens once, we don't include it in the weight in general
-					ActiveEra::put(active_era);
+					ActiveEra::<T>::put(active_era);
 				}
 			}
 			// `on_finalize` weight is tracked in `on_initialize`
 		}
 
 		fn integrity_test() {
-			sp_io::TestExternalities::new_empty().execute_with(||
-				assert!(
-					T::SlashDeferDuration::get() < T::BondingDuration::get() || T::BondingDuration::get() == 0,
-					"As per documentation, slash defer duration ({}) should be less than bonding duration ({}).",
-					T::SlashDeferDuration::get(),
-					T::BondingDuration::get(),
-				)
-			);
+			sp_std::if_std! {
+				sp_io::TestExternalities::new_empty().execute_with(||
+					assert!(
+						T::SlashDeferDuration::get() < T::BondingDuration::get() || T::BondingDuration::get() == 0,
+						"As per documentation, slash defer duration ({}) should be less than bonding duration ({}).",
+						T::SlashDeferDuration::get(),
+						T::BondingDuration::get(),
+					)
+				);
+			}
 		}
+	}
 
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
 		/// Take the origin account as a stash and lock up `value` of its balance. `controller` will
 		/// be the account that controls it.
 		///
@@ -1239,12 +1357,13 @@ decl_module! {
 		/// - Read: Bonded, Ledger, [Origin Account], Current Era, History Depth, Locks
 		/// - Write: Bonded, Payee, [Origin Account], Locks, Ledger
 		/// # </weight>
-		#[weight = T::WeightInfo::bond()]
-		pub fn bond(origin,
+		#[pallet::weight(T::WeightInfo::bond())]
+		pub fn bond(
+			origin: OriginFor<T>,
 			controller: <T::Lookup as StaticLookup>::Source,
-			#[compact] value: BalanceOf<T>,
+			#[pallet::compact] value: BalanceOf<T>,
 			payee: RewardDestination<T::AccountId>,
-		) {
+		) -> DispatchResult {
 			let stash = ensure_signed(origin)?;
 
 			if <Bonded<T>>::contains_key(&stash) {
@@ -1262,20 +1381,20 @@ decl_module! {
 				Err(Error::<T>::InsufficientValue)?
 			}
 
-			system::Pallet::<T>::inc_consumers(&stash).map_err(|_| Error::<T>::BadState)?;
+			frame_system::Pallet::<T>::inc_consumers(&stash).map_err(|_| Error::<T>::BadState)?;
 
 			// You're auto-bonded forever, here. We might improve this by only bonding when
 			// you actually validate/nominate and remove once you unbond __everything__.
 			<Bonded<T>>::insert(&stash, &controller);
 			<Payee<T>>::insert(&stash, payee);
 
-			let current_era = CurrentEra::get().unwrap_or(0);
+			let current_era = CurrentEra::<T>::get().unwrap_or(0);
 			let history_depth = Self::history_depth();
 			let last_reward_era = current_era.saturating_sub(history_depth);
 
 			let stash_balance = T::Currency::free_balance(&stash);
 			let value = value.min(stash_balance);
-			Self::deposit_event(RawEvent::Bonded(stash.clone(), value));
+			Self::deposit_event(Event::<T>::Bonded(stash.clone(), value));
 			let item = StakingLedger {
 				stash,
 				total: value,
@@ -1284,6 +1403,7 @@ decl_module! {
 				claimed_rewards: (last_reward_era..current_era).collect(),
 			};
 			Self::update_ledger(&controller, &item);
+			Ok(())
 		}
 
 		/// Add some extra amount that have appeared in the stash `free_balance` into the balance up
@@ -1307,8 +1427,11 @@ decl_module! {
 		/// - Read: Era Election Status, Bonded, Ledger, [Origin Account], Locks
 		/// - Write: [Origin Account], Locks, Ledger
 		/// # </weight>
-		#[weight = T::WeightInfo::bond_extra()]
-		fn bond_extra(origin, #[compact] max_additional: BalanceOf<T>) {
+		#[pallet::weight(T::WeightInfo::bond_extra())]
+		pub fn bond_extra(
+			origin: OriginFor<T>,
+			#[pallet::compact] max_additional: BalanceOf<T>,
+		) -> DispatchResult {
 			let stash = ensure_signed(origin)?;
 
 			let controller = Self::bonded(&stash).ok_or(Error::<T>::NotStash)?;
@@ -1322,9 +1445,10 @@ decl_module! {
 				// last check: the new active amount of ledger must be more than ED.
 				ensure!(ledger.active >= T::Currency::minimum_balance(), Error::<T>::InsufficientValue);
 
-				Self::deposit_event(RawEvent::Bonded(stash, extra));
+				Self::deposit_event(Event::<T>::Bonded(stash, extra));
 				Self::update_ledger(&controller, &ledger);
 			}
+			Ok(())
 		}
 
 		/// Schedule a portion of the stash to be unlocked ready for transfer out after the bond
@@ -1359,8 +1483,8 @@ decl_module! {
 		/// - Read: EraElectionStatus, Ledger, CurrentEra, Locks, BalanceOf Stash,
 		/// - Write: Locks, Ledger, BalanceOf Stash,
 		/// </weight>
-		#[weight = T::WeightInfo::unbond()]
-		fn unbond(origin, #[compact] value: BalanceOf<T>) {
+		#[pallet::weight(T::WeightInfo::unbond())]
+		pub fn unbond(origin: OriginFor<T>, #[pallet::compact] value: BalanceOf<T>) -> DispatchResult {
 			let controller = ensure_signed(origin)?;
 			let mut ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
 			ensure!(
@@ -1383,8 +1507,9 @@ decl_module! {
 				let era = Self::current_era().unwrap_or(0) + T::BondingDuration::get();
 				ledger.unlocking.push(UnlockChunk { value, era });
 				Self::update_ledger(&controller, &ledger);
-				Self::deposit_event(RawEvent::Unbonded(ledger.stash, value));
+				Self::deposit_event(Event::<T>::Unbonded(ledger.stash, value));
 			}
+			Ok(())
 		}
 
 		/// Remove any unlocked chunks from the `unlocking` queue from our management.
@@ -1418,8 +1543,11 @@ decl_module! {
 		/// - Writes Each: SpanSlash * S
 		/// NOTE: Weight annotation is the kill scenario, we refund otherwise.
 		/// # </weight>
-		#[weight = T::WeightInfo::withdraw_unbonded_kill(*num_slashing_spans)]
-		fn withdraw_unbonded(origin, num_slashing_spans: u32) -> DispatchResultWithPostInfo {
+		#[pallet::weight(T::WeightInfo::withdraw_unbonded_kill(*num_slashing_spans))]
+		pub fn withdraw_unbonded(
+			origin: OriginFor<T>,
+			num_slashing_spans: u32,
+		) -> DispatchResultWithPostInfo {
 			let controller = ensure_signed(origin)?;
 			let mut ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
 			let (stash, old_total) = (ledger.stash.clone(), ledger.total);
@@ -1449,7 +1577,7 @@ decl_module! {
 			if ledger.total < old_total {
 				// Already checked that this won't overflow by entry condition.
 				let value = old_total - ledger.total;
-				Self::deposit_event(RawEvent::Withdrawn(stash, value));
+				Self::deposit_event(Event::<T>::Withdrawn(stash, value));
 			}
 
 			Ok(post_info_weight.into())
@@ -1472,13 +1600,14 @@ decl_module! {
 		/// - Read: Era Election Status, Ledger
 		/// - Write: Nominators, Validators
 		/// # </weight>
-		#[weight = T::WeightInfo::validate()]
-		pub fn validate(origin, prefs: ValidatorPrefs) {
+		#[pallet::weight(T::WeightInfo::validate())]
+		pub fn validate(origin: OriginFor<T>, prefs: ValidatorPrefs) -> DispatchResult {
 			let controller = ensure_signed(origin)?;
 			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
 			let stash = &ledger.stash;
 			<Nominators<T>>::remove(stash);
 			<Validators<T>>::insert(stash, prefs);
+			Ok(())
 		}
 
 		/// Declare the desire to nominate `targets` for the origin controller.
@@ -1500,8 +1629,11 @@ decl_module! {
 		/// - Reads: Era Election Status, Ledger, Current Era
 		/// - Writes: Validators, Nominators
 		/// # </weight>
-		#[weight = T::WeightInfo::nominate(targets.len() as u32)]
-		pub fn nominate(origin, targets: Vec<<T::Lookup as StaticLookup>::Source>) {
+		#[pallet::weight(T::WeightInfo::nominate(targets.len() as u32))]
+		pub fn nominate(
+			origin: OriginFor<T>,
+			targets: Vec<<T::Lookup as StaticLookup>::Source>,
+		) -> DispatchResult {
 			let controller = ensure_signed(origin)?;
 			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
 			let stash = &ledger.stash;
@@ -1528,6 +1660,7 @@ decl_module! {
 
 			<Validators<T>>::remove(stash);
 			<Nominators<T>>::insert(stash, &nominations);
+			Ok(())
 		}
 
 		/// Declare no desire to either validate or nominate.
@@ -1547,11 +1680,12 @@ decl_module! {
 		/// - Read: EraElectionStatus, Ledger
 		/// - Write: Validators, Nominators
 		/// # </weight>
-		#[weight = T::WeightInfo::chill()]
-		fn chill(origin) {
+		#[pallet::weight(T::WeightInfo::chill())]
+		pub fn chill(origin: OriginFor<T>) -> DispatchResult {
 			let controller = ensure_signed(origin)?;
 			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
 			Self::chill_stash(&ledger.stash);
+			Ok(())
 		}
 
 		/// (Re-)set the payment target for a controller.
@@ -1570,12 +1704,16 @@ decl_module! {
 		///     - Read: Ledger
 		///     - Write: Payee
 		/// # </weight>
-		#[weight = T::WeightInfo::set_payee()]
-		fn set_payee(origin, payee: RewardDestination<T::AccountId>) {
+		#[pallet::weight(T::WeightInfo::set_payee())]
+		pub fn set_payee(
+			origin: OriginFor<T>,
+			payee: RewardDestination<T::AccountId>,
+		) -> DispatchResult {
 			let controller = ensure_signed(origin)?;
 			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
 			let stash = &ledger.stash;
 			<Payee<T>>::insert(stash, payee);
+			Ok(())
 		}
 
 		/// (Re-)set the controller of a stash.
@@ -1594,8 +1732,11 @@ decl_module! {
 		/// - Read: Bonded, Ledger New Controller, Ledger Old Controller
 		/// - Write: Bonded, Ledger New Controller, Ledger Old Controller
 		/// # </weight>
-		#[weight = T::WeightInfo::set_controller()]
-		fn set_controller(origin, controller: <T::Lookup as StaticLookup>::Source) {
+		#[pallet::weight(T::WeightInfo::set_controller())]
+		pub fn set_controller(
+			origin: OriginFor<T>,
+			controller: <T::Lookup as StaticLookup>::Source,
+		) -> DispatchResult {
 			let stash = ensure_signed(origin)?;
 			let old_controller = Self::bonded(&stash).ok_or(Error::<T>::NotStash)?;
 			let controller = T::Lookup::lookup(controller)?;
@@ -1608,6 +1749,7 @@ decl_module! {
 					<Ledger<T>>::insert(&controller, l);
 				}
 			}
+			Ok(())
 		}
 
 		/// Sets the ideal number of validators.
@@ -1618,10 +1760,14 @@ decl_module! {
 		/// Weight: O(1)
 		/// Write: Validator Count
 		/// # </weight>
-		#[weight = T::WeightInfo::set_validator_count()]
-		fn set_validator_count(origin, #[compact] new: u32) {
+		#[pallet::weight(T::WeightInfo::set_validator_count())]
+		pub fn set_validator_count(
+			origin: OriginFor<T>,
+			#[pallet::compact] new: u32,
+		) -> DispatchResult {
 			ensure_root(origin)?;
-			ValidatorCount::put(new);
+			ValidatorCount::<T>::put(new);
+			Ok(())
 		}
 
 		/// Increments the ideal number of validators.
@@ -1631,10 +1777,14 @@ decl_module! {
 		/// # <weight>
 		/// Same as [`set_validator_count`].
 		/// # </weight>
-		#[weight = T::WeightInfo::set_validator_count()]
-		fn increase_validator_count(origin, #[compact] additional: u32) {
+		#[pallet::weight(T::WeightInfo::set_validator_count())]
+		pub fn increase_validator_count(
+			origin: OriginFor<T>,
+			#[pallet::compact] additional: u32,
+		) -> DispatchResult {
 			ensure_root(origin)?;
-			ValidatorCount::mutate(|n| *n += additional);
+			ValidatorCount::<T>::mutate(|n| *n += additional);
+			Ok(())
 		}
 
 		/// Scale up the ideal number of validators by a factor.
@@ -1644,10 +1794,11 @@ decl_module! {
 		/// # <weight>
 		/// Same as [`set_validator_count`].
 		/// # </weight>
-		#[weight = T::WeightInfo::set_validator_count()]
-		fn scale_validator_count(origin, factor: Percent) {
+		#[pallet::weight(T::WeightInfo::set_validator_count())]
+		pub fn scale_validator_count(origin: OriginFor<T>, factor: Percent) -> DispatchResult {
 			ensure_root(origin)?;
-			ValidatorCount::mutate(|n| *n += factor * *n);
+			ValidatorCount::<T>::mutate(|n| *n += factor * *n);
+			Ok(())
 		}
 
 		/// Force there to be no new eras indefinitely.
@@ -1659,10 +1810,11 @@ decl_module! {
 		/// - Weight: O(1)
 		/// - Write: ForceEra
 		/// # </weight>
-		#[weight = T::WeightInfo::force_no_eras()]
-		fn force_no_eras(origin) {
+		#[pallet::weight(T::WeightInfo::force_no_eras())]
+		pub fn force_no_eras(origin: OriginFor<T>) -> DispatchResult {
 			ensure_root(origin)?;
-			ForceEra::put(Forcing::ForceNone);
+			ForceEra::<T>::put(Forcing::ForceNone);
+			Ok(())
 		}
 
 		/// Force there to be a new era at the end of the next session. After this, it will be
@@ -1675,10 +1827,11 @@ decl_module! {
 		/// - Weight: O(1)
 		/// - Write ForceEra
 		/// # </weight>
-		#[weight = T::WeightInfo::force_new_era()]
-		fn force_new_era(origin) {
+		#[pallet::weight(T::WeightInfo::force_new_era())]
+		pub fn force_new_era(origin: OriginFor<T>) -> DispatchResult {
 			ensure_root(origin)?;
-			ForceEra::put(Forcing::ForceNew);
+			ForceEra::<T>::put(Forcing::ForceNew);
+			Ok(())
 		}
 
 		/// Set the validators who cannot be slashed (if any).
@@ -1689,10 +1842,14 @@ decl_module! {
 		/// - O(V)
 		/// - Write: Invulnerables
 		/// # </weight>
-		#[weight = T::WeightInfo::set_invulnerables(invulnerables.len() as u32)]
-		fn set_invulnerables(origin, invulnerables: Vec<T::AccountId>) {
+		#[pallet::weight(T::WeightInfo::set_invulnerables(invulnerables.len() as u32))]
+		pub fn set_invulnerables(
+			origin: OriginFor<T>,
+			invulnerables: Vec<T::AccountId>,
+		) -> DispatchResult {
 			ensure_root(origin)?;
 			<Invulnerables<T>>::put(invulnerables);
+			Ok(())
 		}
 
 		/// Force a current staker to become completely unstaked, immediately.
@@ -1705,8 +1862,12 @@ decl_module! {
 		/// Writes: Bonded, Slashing Spans (if S > 0), Ledger, Payee, Validators, Nominators, Account, Locks
 		/// Writes Each: SpanSlash * S
 		/// # </weight>
-		#[weight = T::WeightInfo::force_unstake(*num_slashing_spans)]
-		fn force_unstake(origin, stash: T::AccountId, num_slashing_spans: u32) {
+		#[pallet::weight(T::WeightInfo::force_unstake(*num_slashing_spans))]
+		pub fn force_unstake(
+			origin: OriginFor<T>,
+			stash: T::AccountId,
+			num_slashing_spans: u32,
+		) -> DispatchResult {
 			ensure_root(origin)?;
 
 			// remove all staking-related information.
@@ -1714,6 +1875,7 @@ decl_module! {
 
 			// remove the lock.
 			T::Currency::remove_lock(STAKING_ID, &stash);
+			Ok(())
 		}
 
 		/// Force there to be a new era at the end of sessions indefinitely.
@@ -1724,10 +1886,11 @@ decl_module! {
 		/// - Weight: O(1)
 		/// - Write: ForceEra
 		/// # </weight>
-		#[weight = T::WeightInfo::force_new_era_always()]
-		fn force_new_era_always(origin) {
+		#[pallet::weight(T::WeightInfo::force_new_era_always())]
+		pub fn force_new_era_always(origin: OriginFor<T>) -> DispatchResult {
 			ensure_root(origin)?;
-			ForceEra::put(Forcing::ForceAlways);
+			ForceEra::<T>::put(Forcing::ForceAlways);
+			Ok(())
 		}
 
 		/// Cancel enactment of a deferred slash.
@@ -1743,8 +1906,12 @@ decl_module! {
 		/// - Read: Unapplied Slashes
 		/// - Write: Unapplied Slashes
 		/// # </weight>
-		#[weight = T::WeightInfo::cancel_deferred_slash(slash_indices.len() as u32)]
-		fn cancel_deferred_slash(origin, era: EraIndex, slash_indices: Vec<u32>) {
+		#[pallet::weight(T::WeightInfo::cancel_deferred_slash(slash_indices.len() as u32))]
+		pub fn cancel_deferred_slash(
+			origin: OriginFor<T>,
+			era: EraIndex,
+			slash_indices: Vec<u32>,
+		) -> DispatchResult {
 			T::SlashCancelOrigin::ensure_origin(origin)?;
 
 			ensure!(!slash_indices.is_empty(), Error::<T>::EmptyTargets);
@@ -1760,6 +1927,7 @@ decl_module! {
 			}
 
 			<Self as Store>::UnappliedSlashes::insert(&era, &unapplied);
+			Ok(())
 		}
 
 		/// Pay out all the stakers behind a single validator for a single era.
@@ -1790,8 +1958,12 @@ decl_module! {
 		///   NOTE: weights are assuming that payouts are made to alive stash account (Staked).
 		///   Paying even a dead controller is cheaper weight-wise. We don't do any refunds here.
 		/// # </weight>
-		#[weight = T::WeightInfo::payout_stakers_alive_staked(T::MaxNominatorRewardedPerValidator::get())]
-		fn payout_stakers(origin, validator_stash: T::AccountId, era: EraIndex) -> DispatchResultWithPostInfo {
+		#[pallet::weight(T::WeightInfo::payout_stakers_alive_staked(T::MaxNominatorRewardedPerValidator::get()))]
+		pub(super) fn payout_stakers(
+			origin: OriginFor<T>,
+			validator_stash: T::AccountId,
+			era: EraIndex,
+		) -> DispatchResultWithPostInfo {
 			ensure_signed(origin)?;
 			Self::do_payout_stakers(validator_stash, era)
 		}
@@ -1810,8 +1982,11 @@ decl_module! {
 		///     - Reads: EraElectionStatus, Ledger, Locks, [Origin Account]
 		///     - Writes: [Origin Account], Locks, Ledger
 		/// # </weight>
-		#[weight = T::WeightInfo::rebond(MAX_UNLOCKING_CHUNKS as u32)]
-		fn rebond(origin, #[compact] value: BalanceOf<T>) -> DispatchResultWithPostInfo {
+		#[pallet::weight(T::WeightInfo::rebond(MAX_UNLOCKING_CHUNKS as u32))]
+		pub fn rebond(
+			origin: OriginFor<T>,
+			#[pallet::compact] value: BalanceOf<T>,
+		) -> DispatchResultWithPostInfo {
 			let controller = ensure_signed(origin)?;
 			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
 			ensure!(!ledger.unlocking.is_empty(), Error::<T>::NoUnlockChunk);
@@ -1820,7 +1995,7 @@ decl_module! {
 			// last check: the new active amount of ledger must be more than ED.
 			ensure!(ledger.active >= T::Currency::minimum_balance(), Error::<T>::InsufficientValue);
 
-			Self::deposit_event(RawEvent::Bonded(ledger.stash.clone(), value));
+			Self::deposit_event(Event::<T>::Bonded(ledger.stash.clone(), value));
 			Self::update_ledger(&controller, &ledger);
 			Ok(Some(
 				35 * WEIGHT_PER_MICROS
@@ -1850,14 +2025,14 @@ decl_module! {
 		///     - Clear Prefix Each: Era Stakers, EraStakersClipped, ErasValidatorPrefs
 		///     - Writes Each: ErasValidatorReward, ErasRewardPoints, ErasTotalStake, ErasStartSessionIndex
 		/// # </weight>
-		#[weight = T::WeightInfo::set_history_depth(*_era_items_deleted)]
-		fn set_history_depth(origin,
-			#[compact] new_history_depth: EraIndex,
-			#[compact] _era_items_deleted: u32,
-		) {
+		#[pallet::weight(T::WeightInfo::set_history_depth(*_era_items_deleted))]
+		pub fn set_history_depth(origin: OriginFor<T>,
+			#[pallet::compact] new_history_depth: EraIndex,
+			#[pallet::compact] _era_items_deleted: u32,
+		) -> DispatchResult {
 			ensure_root(origin)?;
 			if let Some(current_era) = Self::current_era() {
-				HistoryDepth::mutate(|history_depth| {
+				HistoryDepth::<T>::mutate(|history_depth| {
 					let last_kept = current_era.checked_sub(*history_depth).unwrap_or(0);
 					let new_last_kept = current_era.checked_sub(new_history_depth).unwrap_or(0);
 					for era_index in last_kept..new_last_kept {
@@ -1866,6 +2041,7 @@ decl_module! {
 					*history_depth = new_history_depth
 				})
 			}
+			Ok(())
 		}
 
 		/// Remove all data structure concerning a staker/stash once its balance is at the minimum.
@@ -1883,12 +2059,17 @@ decl_module! {
 		/// - Writes: Bonded, Slashing Spans (if S > 0), Ledger, Payee, Validators, Nominators, Stash Account, Locks
 		/// - Writes Each: SpanSlash * S
 		/// # </weight>
-		#[weight = T::WeightInfo::reap_stash(*num_slashing_spans)]
-		fn reap_stash(_origin, stash: T::AccountId, num_slashing_spans: u32) {
+		#[pallet::weight(T::WeightInfo::reap_stash(*num_slashing_spans))]
+		pub fn reap_stash(
+			_origin: OriginFor<T>,
+			stash: T::AccountId,
+			num_slashing_spans: u32,
+		) -> DispatchResult {
 			let at_minimum = T::Currency::total_balance(&stash) == T::Currency::minimum_balance();
 			ensure!(at_minimum, Error::<T>::FundedTarget);
 			Self::kill_stash(&stash, num_slashing_spans)?;
 			T::Currency::remove_lock(STAKING_ID, &stash);
+			Ok(())
 		}
 
 		/// Remove the given nominations from the calling validator.
@@ -1904,8 +2085,8 @@ decl_module! {
 		///
 		/// Note: Making this call only makes sense if you first set the validator preferences to
 		/// block any further nominations.
-		#[weight = T::WeightInfo::kick(who.len() as u32)]
-		pub fn kick(origin, who: Vec<<T::Lookup as StaticLookup>::Source>) -> DispatchResult {
+		#[pallet::weight(T::WeightInfo::kick(who.len() as u32))]
+		pub fn kick(origin: OriginFor<T>, who: Vec<<T::Lookup as StaticLookup>::Source>) -> DispatchResult {
 			let controller = ensure_signed(origin)?;
 			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
 			let stash = &ledger.stash;
@@ -1918,7 +2099,7 @@ decl_module! {
 				Nominators::<T>::mutate(&nom_stash, |maybe_nom| if let Some(ref mut nom) = maybe_nom {
 					if let Some(pos) = nom.targets.iter().position(|v| v == stash) {
 						nom.targets.swap_remove(pos);
-						Self::deposit_event(RawEvent::Kicked(nom_stash.clone(), stash.clone()));
+						Self::deposit_event(Event::<T>::Kicked(nom_stash.clone(), stash.clone()));
 					}
 				});
 			}
@@ -1928,7 +2109,7 @@ decl_module! {
 	}
 }
 
-impl<T: Config> Module<T> {
+impl<T: Config> Pallet<T> {
 	/// The total balance that can be slashed from a stash account as of right now.
 	pub fn slashable_balance_of(stash: &T::AccountId) -> BalanceOf<T> {
 		// Weight note: consider making the stake accessible through stash.
@@ -1948,7 +2129,7 @@ impl<T: Config> Module<T> {
 	/// This prevents call sites from repeatedly requesting `total_issuance` from backend. But it is
 	/// important to be only used while the total issuance is not changing.
 	pub fn slashable_balance_of_fn() -> Box<dyn Fn(&T::AccountId) -> VoteWeight> {
-		// NOTE: changing this to unboxed `impl Fn(..)` return type and the module will still
+		// NOTE: changing this to unboxed `impl Fn(..)` return type and the pallet will still
 		// compile, while some types in mock fail to resolve.
 		let issuance = T::Currency::total_issuance();
 		Box::new(move |who: &T::AccountId| -> VoteWeight {
@@ -1958,7 +2139,7 @@ impl<T: Config> Module<T> {
 
 	fn do_payout_stakers(validator_stash: T::AccountId, era: EraIndex) -> DispatchResultWithPostInfo {
 		// Validate input data
-		let current_era = CurrentEra::get().ok_or(
+		let current_era = CurrentEra::<T>::get().ok_or(
 			Error::<T>::InvalidEraToReward.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
 		)?;
 		let history_depth = Self::history_depth();
@@ -2040,7 +2221,7 @@ impl<T: Config> Module<T> {
 			&ledger.stash,
 			validator_staking_payout + validator_commission_payout
 		) {
-			Self::deposit_event(RawEvent::Reward(ledger.stash, imbalance.peek()));
+			Self::deposit_event(Event::<T>::Reward(ledger.stash, imbalance.peek()));
 		}
 
 		// Track the number of payout ops to nominators. Note: `WeightInfo::payout_stakers_alive_staked`
@@ -2060,7 +2241,7 @@ impl<T: Config> Module<T> {
 			if let Some(imbalance) = Self::make_payout(&nominator.who, nominator_reward) {
 				// Note: this logic does not count payouts for `RewardDestination::None`.
 				nominator_payout_count += 1;
-				Self::deposit_event(RawEvent::Reward(nominator.who.clone(), imbalance.peek()));
+				Self::deposit_event(Event::<T>::Reward(nominator.who.clone(), imbalance.peek()));
 			}
 		}
 
@@ -2131,9 +2312,9 @@ impl<T: Config> Module<T> {
 			let era_length = session_index.checked_sub(current_era_start_session_index)
 				.unwrap_or(0); // Must never happen.
 
-			match ForceEra::get() {
+			match ForceEra::<T>::get() {
 				// Will set to default again, which is `NotForcing`.
-				Forcing::ForceNew => ForceEra::kill(),
+				Forcing::ForceNew => ForceEra::<T>::kill(),
 				// Short circuit to `new_era`.
 				Forcing::ForceAlways => (),
 				// Only go to `new_era` if deadline reached.
@@ -2191,7 +2372,7 @@ impl<T: Config> Module<T> {
 	/// * reset `active_era.start`,
 	/// * update `BondedEras` and apply slashes.
 	fn start_era(start_session: SessionIndex) {
-		let active_era = ActiveEra::mutate(|active_era| {
+		let active_era = ActiveEra::<T>::mutate(|active_era| {
 			let new_index = active_era.as_ref().map(|info| info.index + 1).unwrap_or(0);
 			*active_era = Some(ActiveEraInfo {
 				index: new_index,
@@ -2203,7 +2384,7 @@ impl<T: Config> Module<T> {
 
 		let bonding_duration = T::BondingDuration::get();
 
-		BondedEras::mutate(|bonded| {
+		BondedEras::<T>::mutate(|bonded| {
 			bonded.push((active_era, start_session));
 
 			if active_era > bonding_duration {
@@ -2239,7 +2420,7 @@ impl<T: Config> Module<T> {
 			let issuance = T::Currency::total_issuance();
 			let (validator_payout, rest) = T::EraPayout::era_payout(staked, issuance, era_duration);
 
-			Self::deposit_event(RawEvent::EraPayout(active_era.index, validator_payout, rest));
+			Self::deposit_event(Event::<T>::EraPayout(active_era.index, validator_payout, rest));
 
 			// Set ending era reward.
 			<ErasValidatorReward<T>>::insert(&active_era.index, validator_payout);
@@ -2250,11 +2431,11 @@ impl<T: Config> Module<T> {
 	/// Plan a new era. Return the potential new staking set.
 	fn new_era(start_session_index: SessionIndex) -> Option<Vec<T::AccountId>> {
 		// Increment or set current era.
-		let current_era = CurrentEra::mutate(|s| {
+		let current_era = CurrentEra::<T>::mutate(|s| {
 			*s = Some(s.map(|s| s + 1).unwrap_or(0));
 			s.unwrap()
 		});
-		ErasStartSessionIndex::insert(&current_era, &start_session_index);
+		ErasStartSessionIndex::<T>::insert(&current_era, &start_session_index);
 
 		// Clean old era information.
 		if let Some(old_era) = current_era.checked_sub(Self::history_depth() + 1) {
@@ -2338,7 +2519,7 @@ impl<T: Config> Module<T> {
 		}
 
 		// emit event
-		Self::deposit_event(RawEvent::StakingElection);
+		Self::deposit_event(Event::<T>::StakingElection);
 
 		if current_era > 0 {
 			log!(
@@ -2407,7 +2588,7 @@ impl<T: Config> Module<T> {
 		<Validators<T>>::remove(stash);
 		<Nominators<T>>::remove(stash);
 
-		system::Pallet::<T>::dec_consumers(stash);
+		frame_system::Pallet::<T>::dec_consumers(stash);
 
 		Ok(())
 	}
@@ -2420,7 +2601,7 @@ impl<T: Config> Module<T> {
 		<ErasValidatorReward<T>>::remove(era_index);
 		<ErasRewardPoints<T>>::remove(era_index);
 		<ErasTotalStake<T>>::remove(era_index);
-		ErasStartSessionIndex::remove(era_index);
+		ErasStartSessionIndex::<T>::remove(era_index);
 	}
 
 	/// Apply previously-unapplied slashes on the beginning of a new era, after a delay.
@@ -2465,9 +2646,9 @@ impl<T: Config> Module<T> {
 
 	/// Ensures that at the end of the current session there will be a new era.
 	fn ensure_new_era() {
-		match ForceEra::get() {
+		match ForceEra::<T>::get() {
 			Forcing::ForceAlways | Forcing::ForceNew => (),
-			_ => ForceEra::put(Forcing::ForceNew),
+			_ => ForceEra::<T>::put(Forcing::ForceNew),
 		}
 	}
 
@@ -2482,7 +2663,7 @@ impl<T: Config> Module<T> {
 
 	#[cfg(feature = "runtime-benchmarks")]
 	pub fn set_slash_reward_fraction(fraction: Perbill) {
-		SlashRewardFraction::put(fraction);
+		SlashRewardFraction::<T>::put(fraction);
 	}
 
 	/// Get all of the voters that are eligible for the npos election.
@@ -2534,7 +2715,7 @@ impl<T: Config> Module<T> {
 }
 
 impl<T: Config> frame_election_provider_support::ElectionDataProvider<T::AccountId, T::BlockNumber>
-	for Module<T>
+	for Pallet<T>
 {
 	const MAXIMUM_VOTES_PER_VOTER: u32 = T::MAX_NOMINATIONS;
 	fn desired_targets() -> data_provider::Result<(u32, Weight)> {
@@ -2658,10 +2839,10 @@ impl<T: Config> frame_election_provider_support::ElectionDataProvider<T::Account
 ///
 /// Once the first new_session is planned, all session must start and then end in order, though
 /// some session can lag in between the newest session planned and the latest session started.
-impl<T: Config> pallet_session::SessionManager<T::AccountId> for Module<T> {
+impl<T: Config> pallet_session::SessionManager<T::AccountId> for Pallet<T> {
 	fn new_session(new_index: SessionIndex) -> Option<Vec<T::AccountId>> {
 		log!(trace, "planning new_session({})", new_index);
-		CurrentPlannedSession::put(new_index);
+		CurrentPlannedSession::<T>::put(new_index);
 		Self::new_session(new_index)
 	}
 	fn start_session(start_index: SessionIndex) {
@@ -2675,7 +2856,7 @@ impl<T: Config> pallet_session::SessionManager<T::AccountId> for Module<T> {
 }
 
 impl<T: Config> historical::SessionManager<T::AccountId, Exposure<T::AccountId, BalanceOf<T>>>
-	for Module<T>
+	for Pallet<T>
 {
 	fn new_session(
 		new_index: SessionIndex,
@@ -2703,7 +2884,7 @@ impl<T: Config> historical::SessionManager<T::AccountId, Exposure<T::AccountId,
 /// * 20 points to the block producer for producing a (non-uncle) block in the relay chain,
 /// * 2 points to the block producer for each reference to a previously unreferenced uncle, and
 /// * 1 point to the producer of each referenced uncle block.
-impl<T> pallet_authorship::EventHandler<T::AccountId, T::BlockNumber> for Module<T>
+impl<T> pallet_authorship::EventHandler<T::AccountId, T::BlockNumber> for Pallet<T>
 where
 	T: Config + pallet_authorship::Config + pallet_session::Config,
 {
@@ -2724,7 +2905,7 @@ pub struct StashOf<T>(sp_std::marker::PhantomData<T>);
 
 impl<T: Config> Convert<T::AccountId, Option<T::AccountId>> for StashOf<T> {
 	fn convert(controller: T::AccountId) -> Option<T::AccountId> {
-		<Module<T>>::ledger(&controller).map(|l| l.stash)
+		<Pallet<T>>::ledger(&controller).map(|l| l.stash)
 	}
 }
 
@@ -2739,15 +2920,15 @@ impl<T: Config> Convert<T::AccountId, Option<Exposure<T::AccountId, BalanceOf<T>
 	for ExposureOf<T>
 {
 	fn convert(validator: T::AccountId) -> Option<Exposure<T::AccountId, BalanceOf<T>>> {
-		<Module<T>>::active_era()
-			.map(|active_era| <Module<T>>::eras_stakers(active_era.index, &validator))
+		<Pallet<T>>::active_era()
+			.map(|active_era| <Pallet<T>>::eras_stakers(active_era.index, &validator))
 	}
 }
 
 /// This is intended to be used with `FilterHistoricalOffences`.
 impl<T: Config>
 	OnOffenceHandler<T::AccountId, pallet_session::historical::IdentificationTuple<T>, Weight>
-	for Module<T>
+	for Pallet<T>
 where
 	T: pallet_session::Config<ValidatorId = <T as frame_system::Config>::AccountId>,
 	T: pallet_session::historical::Config<
@@ -2769,7 +2950,7 @@ where
 		slash_fraction: &[Perbill],
 		slash_session: SessionIndex,
 	) -> Weight {
-		let reward_proportion = SlashRewardFraction::get();
+		let reward_proportion = SlashRewardFraction::<T>::get();
 		let mut consumed_weight: Weight = 0;
 		let mut add_db_reads_writes = |reads, writes| {
 			consumed_weight += T::DbWeight::get().reads_writes(reads, writes);
@@ -2798,7 +2979,7 @@ where
 		let slash_era = if slash_session >= active_era_start_session_index {
 			active_era
 		} else {
-			let eras = BondedEras::get();
+			let eras = BondedEras::<T>::get();
 			add_db_reads_writes(1, 0);
 
 			// reverse because it's more likely to find reports from recent eras.
@@ -2883,7 +3064,7 @@ pub struct FilterHistoricalOffences<T, R> {
 }
 
 impl<T, Reporter, Offender, R, O> ReportOffence<Reporter, Offender, O>
-	for FilterHistoricalOffences<Module<T>, R>
+	for FilterHistoricalOffences<Pallet<T>, R>
 where
 	T: Config,
 	R: ReportOffence<Reporter, Offender, O>,
@@ -2892,13 +3073,13 @@ where
 	fn report_offence(reporters: Vec<Reporter>, offence: O) -> Result<(), OffenceError> {
 		// disallow any slashing from before the current bonding period.
 		let offence_session = offence.session_index();
-		let bonded_eras = BondedEras::get();
+		let bonded_eras = BondedEras::<T>::get();
 
 		if bonded_eras.first().filter(|(_, start)| offence_session >= *start).is_some() {
 			R::report_offence(reporters, offence)
 		} else {
-			<Module<T>>::deposit_event(
-				RawEvent::OldSlashingReportDiscarded(offence_session)
+			<Pallet<T>>::deposit_event(
+				Event::<T>::OldSlashingReportDiscarded(offence_session)
 			);
 			Ok(())
 		}
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index b4ff35d0d6f9..211cc025300e 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -21,9 +21,8 @@ use crate::*;
 use crate as staking;
 use frame_support::{
 	assert_ok, parameter_types,
-	traits::{Currency, FindAuthor, Get, OnFinalize, OnInitialize, OneSessionHandler},
+	traits::{Currency, FindAuthor, Get, OnInitialize, OneSessionHandler},
 	weights::constants::RocksDbWeight,
-	IterableStorageMap, StorageDoubleMap, StorageMap, StorageValue,
 };
 use sp_core::H256;
 use sp_io;
@@ -194,7 +193,7 @@ impl pallet_authorship::Config for Test {
 	type FindAuthor = Author11;
 	type UncleGenerations = UncleGenerations;
 	type FilterUncle = ();
-	type EventHandler = Module<Test>;
+	type EventHandler = Pallet<Test>;
 }
 parameter_types! {
 	pub const MinimumPeriod: u64 = 5;
@@ -459,7 +458,7 @@ impl ExtBuilder {
 			ext.execute_with(|| {
 				System::set_block_number(1);
 				Session::on_initialize(1);
-				Staking::on_initialize(1);
+				<Staking as Hooks<u64>>::on_initialize(1);
 				Timestamp::set_timestamp(INIT_TIMESTAMP);
 			});
 		}
@@ -610,7 +609,7 @@ pub(crate) fn run_to_block(n: BlockNumber) {
 	for b in (System::block_number() + 1)..=n {
 		System::set_block_number(b);
 		Session::on_initialize(b);
-		Staking::on_initialize(b);
+		<Staking as Hooks<u64>>::on_initialize(b);
 		Timestamp::set_timestamp(System::block_number() * BLOCK_TIME + INIT_TIMESTAMP);
 		if b != n {
 			Staking::on_finalize(System::block_number());
@@ -696,7 +695,7 @@ pub(crate) fn reward_all_elected() {
 		.into_iter()
 		.map(|v| (v, 1));
 
-	<Module<Test>>::reward_by_ids(rewards)
+	<Pallet<Test>>::reward_by_ids(rewards)
 }
 
 pub(crate) fn validator_controllers() -> Vec<AccountId> {
@@ -714,7 +713,7 @@ pub(crate) fn on_offence_in_era(
 	slash_fraction: &[Perbill],
 	era: EraIndex,
 ) {
-	let bonded_eras = crate::BondedEras::get();
+	let bonded_eras = crate::BondedEras::<Test>::get();
 	for &(bonded_era, start_session) in bonded_eras.iter() {
 		if bonded_era == era {
 			let _ = Staking::on_offence(offenders, slash_fraction, start_session);
diff --git a/frame/staking/src/slashing.rs b/frame/staking/src/slashing.rs
index fd0a63b288ab..50cab1103b95 100644
--- a/frame/staking/src/slashing.rs
+++ b/frame/staking/src/slashing.rs
@@ -50,12 +50,12 @@
 //! Based on research at <https://w3f-research.readthedocs.io/en/latest/polkadot/slashing/npos.html>
 
 use super::{
-	EraIndex, Config, Module, Store, BalanceOf, Exposure, Perbill, SessionInterface,
+	EraIndex, Config, Pallet, Store, BalanceOf, Exposure, Perbill, SessionInterface,
 	NegativeImbalanceOf, UnappliedSlash, Error,
 };
 use sp_runtime::{traits::{Zero, Saturating}, RuntimeDebug, DispatchResult};
 use frame_support::{
-	StorageMap, StorageDoubleMap, ensure,
+	ensure,
 	traits::{Currency, OnUnbalanced, Imbalance},
 };
 use sp_std::vec::Vec;
@@ -239,7 +239,7 @@ pub(crate) fn compute_slash<T: Config>(params: SlashParams<T>)
 		return None;
 	}
 
-	let (prior_slash_p, _era_slash) = <Module<T> as Store>::ValidatorSlashInEra::get(
+	let (prior_slash_p, _era_slash) = <Pallet<T> as Store>::ValidatorSlashInEra::get(
 		&slash_era,
 		stash,
 	).unwrap_or((Perbill::zero(), Zero::zero()));
@@ -247,7 +247,7 @@ pub(crate) fn compute_slash<T: Config>(params: SlashParams<T>)
 	// compare slash proportions rather than slash values to avoid issues due to rounding
 	// error.
 	if slash.deconstruct() > prior_slash_p.deconstruct() {
-		<Module<T> as Store>::ValidatorSlashInEra::insert(
+		<Pallet<T> as Store>::ValidatorSlashInEra::insert(
 			&slash_era,
 			stash,
 			&(slash, own_slash),
@@ -285,12 +285,12 @@ pub(crate) fn compute_slash<T: Config>(params: SlashParams<T>)
 			// chill the validator - it misbehaved in the current span and should
 			// not continue in the next election. also end the slashing span.
 			spans.end_span(now);
-			<Module<T>>::chill_stash(stash);
+			<Pallet<T>>::chill_stash(stash);
 
 			// make sure to disable validator till the end of this session
 			if T::SessionInterface::disable_validator(stash).unwrap_or(false) {
 				// force a new era, to select a new validator set
-				<Module<T>>::ensure_new_era()
+				<Pallet<T>>::ensure_new_era()
 			}
 		}
 	}
@@ -325,12 +325,12 @@ fn kick_out_if_recent<T: Config>(
 
 	if spans.era_span(params.slash_era).map(|s| s.index) == Some(spans.span_index()) {
 		spans.end_span(params.now);
-		<Module<T>>::chill_stash(params.stash);
+		<Pallet<T>>::chill_stash(params.stash);
 
 		// make sure to disable validator till the end of this session
 		if T::SessionInterface::disable_validator(params.stash).unwrap_or(false) {
 			// force a new era, to select a new validator set
-			<Module<T>>::ensure_new_era()
+			<Pallet<T>>::ensure_new_era()
 		}
 	}
 }
@@ -367,14 +367,14 @@ fn slash_nominators<T: Config>(
 			let own_slash_by_validator = slash * nominator.value;
 			let own_slash_difference = own_slash_by_validator.saturating_sub(own_slash_prior);
 
-			let mut era_slash = <Module<T> as Store>::NominatorSlashInEra::get(
+			let mut era_slash = <Pallet<T> as Store>::NominatorSlashInEra::get(
 				&slash_era,
 				stash,
 			).unwrap_or_else(|| Zero::zero());
 
 			era_slash += own_slash_difference;
 
-			<Module<T> as Store>::NominatorSlashInEra::insert(
+			<Pallet<T> as Store>::NominatorSlashInEra::insert(
 				&slash_era,
 				stash,
 				&era_slash,
@@ -437,9 +437,9 @@ fn fetch_spans<'a, T: Config + 'a>(
 	slash_of: &'a mut BalanceOf<T>,
 	reward_proportion: Perbill,
 ) -> InspectingSpans<'a, T> {
-	let spans = <Module<T> as Store>::SlashingSpans::get(stash).unwrap_or_else(|| {
+	let spans = <Pallet<T> as Store>::SlashingSpans::get(stash).unwrap_or_else(|| {
 		let spans = SlashingSpans::new(window_start);
-		<Module<T> as Store>::SlashingSpans::insert(stash, &spans);
+		<Pallet<T> as Store>::SlashingSpans::insert(stash, &spans);
 		spans
 	});
 
@@ -488,7 +488,7 @@ impl<'a, T: 'a + Config> InspectingSpans<'a, T> {
 	) -> Option<SpanIndex> {
 		let target_span = self.era_span(slash_era)?;
 		let span_slash_key = (self.stash.clone(), target_span.index);
-		let mut span_record = <Module<T> as Store>::SpanSlash::get(&span_slash_key);
+		let mut span_record = <Pallet<T> as Store>::SpanSlash::get(&span_slash_key);
 		let mut changed = false;
 
 		let reward = if span_record.slashed < slash {
@@ -519,7 +519,7 @@ impl<'a, T: 'a + Config> InspectingSpans<'a, T> {
 
 		if changed {
 			self.dirty = true;
-			<Module<T> as Store>::SpanSlash::insert(&span_slash_key, &span_record);
+			<Pallet<T> as Store>::SpanSlash::insert(&span_slash_key, &span_record);
 		}
 
 		Some(target_span.index)
@@ -533,18 +533,18 @@ impl<'a, T: 'a + Config> Drop for InspectingSpans<'a, T> {
 
 		if let Some((start, end)) = self.spans.prune(self.window_start) {
 			for span_index in start..end {
-				<Module<T> as Store>::SpanSlash::remove(&(self.stash.clone(), span_index));
+				<Pallet<T> as Store>::SpanSlash::remove(&(self.stash.clone(), span_index));
 			}
 		}
 
-		<Module<T> as Store>::SlashingSpans::insert(self.stash, &self.spans);
+		<Pallet<T> as Store>::SlashingSpans::insert(self.stash, &self.spans);
 	}
 }
 
 /// Clear slashing metadata for an obsolete era.
 pub(crate) fn clear_era_metadata<T: Config>(obsolete_era: EraIndex) {
-	<Module<T> as Store>::ValidatorSlashInEra::remove_prefix(&obsolete_era);
-	<Module<T> as Store>::NominatorSlashInEra::remove_prefix(&obsolete_era);
+	<Pallet<T> as Store>::ValidatorSlashInEra::remove_prefix(&obsolete_era);
+	<Pallet<T> as Store>::NominatorSlashInEra::remove_prefix(&obsolete_era);
 }
 
 /// Clear slashing metadata for a dead account.
@@ -552,14 +552,14 @@ pub(crate) fn clear_stash_metadata<T: Config>(
 	stash: &T::AccountId,
 	num_slashing_spans: u32,
 ) -> DispatchResult {
-	let spans = match <Module<T> as Store>::SlashingSpans::get(stash) {
+	let spans = match <Pallet<T> as Store>::SlashingSpans::get(stash) {
 		None => return Ok(()),
 		Some(s) => s,
 	};
 
 	ensure!(num_slashing_spans as usize >= spans.iter().count(), Error::<T>::IncorrectSlashingSpans);
 
-	<Module<T> as Store>::SlashingSpans::remove(stash);
+	<Pallet<T> as Store>::SlashingSpans::remove(stash);
 
 	// kill slashing-span metadata for account.
 	//
@@ -567,7 +567,7 @@ pub(crate) fn clear_stash_metadata<T: Config>(
 	// in that case, they may re-bond, but it would count again as span 0. Further ancient
 	// slashes would slash into this new bond, since metadata has now been cleared.
 	for span in spans.iter() {
-		<Module<T> as Store>::SpanSlash::remove(&(stash.clone(), span.index));
+		<Pallet<T> as Store>::SpanSlash::remove(&(stash.clone(), span.index));
 	}
 
 	Ok(())
@@ -582,12 +582,12 @@ pub fn do_slash<T: Config>(
 	reward_payout: &mut BalanceOf<T>,
 	slashed_imbalance: &mut NegativeImbalanceOf<T>,
 ) {
-	let controller = match <Module<T>>::bonded(stash) {
+	let controller = match <Pallet<T>>::bonded(stash) {
 		None => return, // defensive: should always exist.
 		Some(c) => c,
 	};
 
-	let mut ledger = match <Module<T>>::ledger(&controller) {
+	let mut ledger = match <Pallet<T>>::ledger(&controller) {
 		Some(ledger) => ledger,
 		None => return, // nothing to do.
 	};
@@ -603,11 +603,11 @@ pub fn do_slash<T: Config>(
 			*reward_payout = reward_payout.saturating_sub(missing);
 		}
 
-		<Module<T>>::update_ledger(&controller, &ledger);
+		<Pallet<T>>::update_ledger(&controller, &ledger);
 
 		// trigger the event
-		<Module<T>>::deposit_event(
-			super::RawEvent::Slash(stash.clone(), value)
+		<Pallet<T>>::deposit_event(
+			super::Event::<T>::Slash(stash.clone(), value)
 		);
 	}
 }
diff --git a/frame/staking/src/testing_utils.rs b/frame/staking/src/testing_utils.rs
index c4daf88098e7..185b96983ab9 100644
--- a/frame/staking/src/testing_utils.rs
+++ b/frame/staking/src/testing_utils.rs
@@ -19,7 +19,7 @@
 //! bonding validators, nominators, and generating different types of solutions.
 
 use crate::*;
-use crate::Module as Staking;
+use crate::Pallet as Staking;
 use frame_benchmarking::account;
 use frame_system::RawOrigin;
 use sp_io::hashing::blake2_256;
@@ -166,12 +166,12 @@ pub fn create_validators_with_nominators_for_era<T: Config>(
 		Staking::<T>::nominate(RawOrigin::Signed(n_controller.clone()).into(), selected_validators)?;
 	}
 
-	ValidatorCount::put(validators);
+	ValidatorCount::<T>::put(validators);
 
 	Ok(validator_chosen)
 }
 
 /// get the current era.
 pub fn current_era<T: Config>() -> EraIndex {
-	<Module<T>>::current_era().unwrap_or(0)
+	<Pallet<T>>::current_era().unwrap_or(0)
 }
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index ec5a61d46885..4473e8958500 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -17,7 +17,7 @@
 
 //! Tests for the module.
 
-use super::*;
+use super::{*, Event};
 use mock::*;
 use sp_runtime::{
 	assert_eq_error_rate,
@@ -25,7 +25,7 @@ use sp_runtime::{
 };
 use sp_staking::offence::OffenceDetails;
 use frame_support::{
-	assert_ok, assert_noop, StorageMap,
+	assert_ok, assert_noop,
 	traits::{Currency, ReservableCurrency, OnInitialize},
 	weights::{extract_actual_weight, GetDispatchInfo},
 };
@@ -187,10 +187,10 @@ fn rewards_should_work() {
 		Payee::<Test>::insert(21, RewardDestination::Controller);
 		Payee::<Test>::insert(101, RewardDestination::Controller);
 
-		<Module<Test>>::reward_by_ids(vec![(11, 50)]);
-		<Module<Test>>::reward_by_ids(vec![(11, 50)]);
+		<Pallet<Test>>::reward_by_ids(vec![(11, 50)]);
+		<Pallet<Test>>::reward_by_ids(vec![(11, 50)]);
 		// This is the second validator of the current elected set.
-		<Module<Test>>::reward_by_ids(vec![(21, 50)]);
+		<Pallet<Test>>::reward_by_ids(vec![(21, 50)]);
 
 		// Compute total payout now for whole duration of the session.
 		let total_payout_0 = current_total_payout_for_duration(reward_time_per_era());
@@ -227,7 +227,7 @@ fn rewards_should_work() {
 		);
 		assert_eq!(
 			*mock::staking_events().last().unwrap(),
-			RawEvent::EraPayout(0, total_payout_0, maximum_payout - total_payout_0)
+			Event::EraPayout(0, total_payout_0, maximum_payout - total_payout_0)
 		);
 		mock::make_all_reward_payment(0);
 
@@ -253,7 +253,7 @@ fn rewards_should_work() {
 		assert_eq_error_rate!(Balances::total_balance(&101), init_balance_101, 2);
 
 		assert_eq_uvec!(Session::validators(), vec![11, 21]);
-		<Module<Test>>::reward_by_ids(vec![(11, 1)]);
+		<Pallet<Test>>::reward_by_ids(vec![(11, 1)]);
 
 		// Compute total payout now for whole duration as other parameter won't change
 		let total_payout_1 = current_total_payout_for_duration(reward_time_per_era());
@@ -265,7 +265,7 @@ fn rewards_should_work() {
 		);
 		assert_eq!(
 			*mock::staking_events().last().unwrap(),
-			RawEvent::EraPayout(1, total_payout_1, maximum_payout - total_payout_1)
+			Event::EraPayout(1, total_payout_1, maximum_payout - total_payout_1)
 		);
 		mock::make_all_reward_payment(1);
 
@@ -482,8 +482,8 @@ fn nominating_and_rewards_should_work() {
 
 			// the total reward for era 0
 			let total_payout_0 = current_total_payout_for_duration(reward_time_per_era());
-			<Module<Test>>::reward_by_ids(vec![(41, 1)]);
-			<Module<Test>>::reward_by_ids(vec![(31, 1)]);
+			<Pallet<Test>>::reward_by_ids(vec![(41, 1)]);
+			<Pallet<Test>>::reward_by_ids(vec![(31, 1)]);
 
 			mock::start_active_era(1);
 
@@ -524,8 +524,8 @@ fn nominating_and_rewards_should_work() {
 
 			// the total reward for era 1
 			let total_payout_1 = current_total_payout_for_duration(reward_time_per_era());
-			<Module<Test>>::reward_by_ids(vec![(21, 2)]);
-			<Module<Test>>::reward_by_ids(vec![(11, 1)]);
+			<Pallet<Test>>::reward_by_ids(vec![(21, 2)]);
+			<Pallet<Test>>::reward_by_ids(vec![(11, 1)]);
 
 			mock::start_active_era(2);
 
@@ -779,7 +779,7 @@ fn forcing_new_era_works() {
 		assert_eq!(active_era(), 1);
 
 		// no era change.
-		ForceEra::put(Forcing::ForceNone);
+		ForceEra::<Test>::put(Forcing::ForceNone);
 
 		start_session(4);
 		assert_eq!(active_era(), 1);
@@ -795,7 +795,7 @@ fn forcing_new_era_works() {
 
 		// back to normal.
 		// this immediately starts a new session.
-		ForceEra::put(Forcing::NotForcing);
+		ForceEra::<Test>::put(Forcing::NotForcing);
 
 		start_session(8);
 		assert_eq!(active_era(), 1);
@@ -803,7 +803,7 @@ fn forcing_new_era_works() {
 		start_session(9);
 		assert_eq!(active_era(), 2);
 		// forceful change
-		ForceEra::put(Forcing::ForceAlways);
+		ForceEra::<Test>::put(Forcing::ForceAlways);
 
 		start_session(10);
 		assert_eq!(active_era(), 2);
@@ -815,10 +815,10 @@ fn forcing_new_era_works() {
 		assert_eq!(active_era(), 4);
 
 		// just one forceful change
-		ForceEra::put(Forcing::ForceNew);
+		ForceEra::<Test>::put(Forcing::ForceNew);
 		start_session(13);
 		assert_eq!(active_era(), 5);
-		assert_eq!(ForceEra::get(), Forcing::NotForcing);
+		assert_eq!(ForceEra::<Test>::get(), Forcing::NotForcing);
 
 		start_session(14);
 		assert_eq!(active_era(), 6);
@@ -917,7 +917,7 @@ fn reward_destination_works() {
 
 		// Compute total payout now for whole duration as other parameter won't change
 		let total_payout_0 = current_total_payout_for_duration(reward_time_per_era());
-		<Module<Test>>::reward_by_ids(vec![(11, 1)]);
+		<Pallet<Test>>::reward_by_ids(vec![(11, 1)]);
 
 		mock::start_active_era(1);
 		mock::make_all_reward_payment(0);
@@ -940,7 +940,7 @@ fn reward_destination_works() {
 
 		// Compute total payout now for whole duration as other parameter won't change
 		let total_payout_1 = current_total_payout_for_duration(reward_time_per_era());
-		<Module<Test>>::reward_by_ids(vec![(11, 1)]);
+		<Pallet<Test>>::reward_by_ids(vec![(11, 1)]);
 
 		mock::start_active_era(2);
 		mock::make_all_reward_payment(1);
@@ -968,7 +968,7 @@ fn reward_destination_works() {
 
 		// Compute total payout now for whole duration as other parameter won't change
 		let total_payout_2 = current_total_payout_for_duration(reward_time_per_era());
-		<Module<Test>>::reward_by_ids(vec![(11, 1)]);
+		<Pallet<Test>>::reward_by_ids(vec![(11, 1)]);
 
 		mock::start_active_era(3);
 		mock::make_all_reward_payment(2);
@@ -1015,7 +1015,7 @@ fn validator_payment_prefs_work() {
 		// Compute total payout now for whole duration as other parameter won't change
 		let total_payout_1 = current_total_payout_for_duration(reward_time_per_era());
 		let exposure_1 = Staking::eras_stakers(Staking::active_era().unwrap().index, 11);
-		<Module<Test>>::reward_by_ids(vec![(11, 1)]);
+		<Pallet<Test>>::reward_by_ids(vec![(11, 1)]);
 
 		mock::start_active_era(2);
 		mock::make_all_reward_payment(1);
@@ -1508,8 +1508,8 @@ fn reward_to_stake_works() {
 
 		// Compute total payout now for whole duration as other parameter won't change
 		let total_payout_0 = current_total_payout_for_duration(reward_time_per_era());
-		<Module<Test>>::reward_by_ids(vec![(11, 1)]);
-		<Module<Test>>::reward_by_ids(vec![(21, 1)]);
+		<Pallet<Test>>::reward_by_ids(vec![(11, 1)]);
+		<Pallet<Test>>::reward_by_ids(vec![(21, 1)]);
 
 		// New era --> rewards are paid --> stakes are changed
 		mock::start_active_era(1);
@@ -2009,10 +2009,10 @@ fn reward_from_authorship_event_handler_works() {
 
 		assert_eq!(<pallet_authorship::Pallet<Test>>::author(), 11);
 
-		<Module<Test>>::note_author(11);
-		<Module<Test>>::note_uncle(21, 1);
+		<Pallet<Test>>::note_author(11);
+		<Pallet<Test>>::note_uncle(21, 1);
 		// Rewarding the same two times works.
-		<Module<Test>>::note_uncle(11, 1);
+		<Pallet<Test>>::note_uncle(11, 1);
 
 		// Not mandatory but must be coherent with rewards
 		assert_eq_uvec!(Session::validators(), vec![11, 21]);
@@ -2035,13 +2035,13 @@ fn add_reward_points_fns_works() {
 		// Not mandatory but must be coherent with rewards
 		assert_eq_uvec!(Session::validators(), vec![21, 11]);
 
-		<Module<Test>>::reward_by_ids(vec![
+		<Pallet<Test>>::reward_by_ids(vec![
 			(21, 1),
 			(11, 1),
 			(11, 1),
 		]);
 
-		<Module<Test>>::reward_by_ids(vec![
+		<Pallet<Test>>::reward_by_ids(vec![
 			(21, 1),
 			(11, 1),
 			(11, 1),
@@ -2084,7 +2084,7 @@ fn era_is_always_same_length() {
 		assert_eq!(Staking::eras_start_session_index(current_era()).unwrap(), session_per_era * 2u32);
 
 		let session = Session::current_index();
-		ForceEra::put(Forcing::ForceNew);
+		ForceEra::<Test>::put(Forcing::ForceNew);
 		advance_session();
 		advance_session();
 		assert_eq!(current_era(), 3);
@@ -2992,13 +2992,13 @@ fn claim_reward_at_the_last_era_and_no_double_claim_and_invalid_claim() {
 		Payee::<Test>::insert(11, RewardDestination::Controller);
 		Payee::<Test>::insert(101, RewardDestination::Controller);
 
-		<Module<Test>>::reward_by_ids(vec![(11, 1)]);
+		<Pallet<Test>>::reward_by_ids(vec![(11, 1)]);
 		// Compute total payout now for whole duration as other parameter won't change
 		let total_payout_0 = current_total_payout_for_duration(reward_time_per_era());
 
 		mock::start_active_era(1);
 
-		<Module<Test>>::reward_by_ids(vec![(11, 1)]);
+		<Pallet<Test>>::reward_by_ids(vec![(11, 1)]);
 		// Change total issuance in order to modify total payout
 		let _ = Balances::deposit_creating(&999, 1_000_000_000);
 		// Compute total payout now for whole duration as other parameter won't change
@@ -3007,7 +3007,7 @@ fn claim_reward_at_the_last_era_and_no_double_claim_and_invalid_claim() {
 
 		mock::start_active_era(2);
 
-		<Module<Test>>::reward_by_ids(vec![(11, 1)]);
+		<Pallet<Test>>::reward_by_ids(vec![(11, 1)]);
 		// Change total issuance in order to modify total payout
 		let _ = Balances::deposit_creating(&999, 1_000_000_000);
 		// Compute total payout now for whole duration as other parameter won't change
@@ -3168,7 +3168,7 @@ fn test_max_nominator_rewarded_per_validator_and_cant_steal_someone_else_reward(
 		}
 		mock::start_active_era(1);
 
-		<Module<Test>>::reward_by_ids(vec![(11, 1)]);
+		<Pallet<Test>>::reward_by_ids(vec![(11, 1)]);
 		// compute and ensure the reward amount is greater than zero.
 		let _ = current_total_payout_for_duration(reward_time_per_era());
 
@@ -3832,7 +3832,7 @@ fn do_not_die_when_active_is_ed() {
 fn on_finalize_weight_is_nonzero() {
 	ExtBuilder::default().build_and_execute(|| {
 		let on_finalize_weight = <Test as frame_system::Config>::DbWeight::get().reads(1);
-		assert!(Staking::on_initialize(1) >= on_finalize_weight);
+		assert!(<Staking as Hooks<u64>>::on_initialize(1) >= on_finalize_weight);
 	})
 }
 
@@ -3954,7 +3954,7 @@ mod election_data_provider {
 			assert_eq!(staking_events().len(), 1);
 			assert_eq!(
 				*staking_events().last().unwrap(),
-				RawEvent::StakingElection
+				Event::StakingElection
 			);
 
 			for b in 21..45 {
@@ -3968,7 +3968,7 @@ mod election_data_provider {
 			assert_eq!(staking_events().len(), 3);
 			assert_eq!(
 				*staking_events().last().unwrap(),
-				RawEvent::StakingElection
+				Event::StakingElection
 			);
 		})
 	}

From 3325b100195539427e6b828f7ea4a36341df2c8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Sat, 12 Jun 2021 01:38:17 +0100
Subject: [PATCH 0863/1194] pallet-offences: Switch to partition_point (#9049)

This changes the code to use `partition_point` instead of
`binary_search_by_key`, because this was very likely the problematic
pallet 2 weeks ago on polkadot.
---
 frame/offences/src/lib.rs   | 11 ++-----
 frame/offences/src/mock.rs  |  5 +++
 frame/offences/src/tests.rs | 61 ++++++++++++++++++++++++++++++++++++-
 3 files changed, 68 insertions(+), 9 deletions(-)

diff --git a/frame/offences/src/lib.rs b/frame/offences/src/lib.rs
index 82665099d65d..1076dd615496 100644
--- a/frame/offences/src/lib.rs
+++ b/frame/offences/src/lib.rs
@@ -281,15 +281,10 @@ impl<T: Config, O: Offence<T::IdentificationTuple>> ReportIndexStorage<T, O> {
 	fn insert(&mut self, time_slot: &O::TimeSlot, report_id: ReportIdOf<T>) {
 		// Insert the report id into the list while maintaining the ordering by the time
 		// slot.
-		let pos = match self
+		let pos = self
 			.same_kind_reports
-			.binary_search_by_key(&time_slot, |&(ref when, _)| when)
-		{
-			Ok(pos) => pos,
-			Err(pos) => pos,
-		};
-		self.same_kind_reports
-			.insert(pos, (time_slot.clone(), report_id));
+			.partition_point(|&(ref when, _)| when <= time_slot);
+		self.same_kind_reports.insert(pos, (time_slot.clone(), report_id));
 
 		// Update the list of concurrent reports.
 		self.concurrent_reports.push(report_id);
diff --git a/frame/offences/src/mock.rs b/frame/offences/src/mock.rs
index e7655d7ee29a..a494ab02ebbd 100644
--- a/frame/offences/src/mock.rs
+++ b/frame/offences/src/mock.rs
@@ -170,3 +170,8 @@ impl<T: Clone> offence::Offence<T> for Offence<T> {
 		Perbill::from_percent(5 + offenders_count * 100 / validator_set_count)
 	}
 }
+
+/// Create the report id for the given `offender` and `time_slot` combination.
+pub fn report_id(time_slot: u128, offender: u64) -> H256 {
+	Offences::report_id::<Offence<u64>>(&time_slot, &offender)
+}
diff --git a/frame/offences/src/tests.rs b/frame/offences/src/tests.rs
index edc22cb239c4..d2e0f2d63d55 100644
--- a/frame/offences/src/tests.rs
+++ b/frame/offences/src/tests.rs
@@ -22,7 +22,7 @@
 use super::*;
 use crate::mock::{
 	Offences, System, Offence, Event, KIND, new_test_ext, with_on_offence_fractions,
-	offence_reports,
+	offence_reports, report_id,
 };
 use sp_runtime::Perbill;
 use frame_system::{EventRecord, Phase};
@@ -284,3 +284,62 @@ fn should_properly_count_offences() {
 		);
 	});
 }
+
+/// We insert offences in sorted order using the time slot in the `same_kind_reports`.
+/// This test ensures that it works as expected.
+#[test]
+fn should_properly_sort_offences() {
+	new_test_ext().execute_with(|| {
+		// given
+		let time_slot = 42;
+		assert_eq!(offence_reports(KIND, time_slot), vec![]);
+
+		let offence1 = Offence {
+			validator_set_count: 5,
+			time_slot,
+			offenders: vec![5],
+		};
+		let offence2 = Offence {
+			validator_set_count: 5,
+			time_slot,
+			offenders: vec![4],
+		};
+		let offence3 = Offence {
+			validator_set_count: 5,
+			time_slot: time_slot + 1,
+			offenders: vec![6, 7],
+		};
+		let offence4 = Offence {
+			validator_set_count: 5,
+			time_slot: time_slot - 1,
+			offenders: vec![3],
+		};
+		Offences::report_offence(vec![], offence1).unwrap();
+		with_on_offence_fractions(|f| {
+			assert_eq!(f.clone(), vec![Perbill::from_percent(25)]);
+			f.clear();
+		});
+
+		// when
+		// report for the second time
+		Offences::report_offence(vec![], offence2).unwrap();
+		Offences::report_offence(vec![], offence3).unwrap();
+		Offences::report_offence(vec![], offence4).unwrap();
+
+		// then
+		let same_kind_reports =
+			Vec::<(u128, sp_core::H256)>::decode(
+				&mut &crate::ReportsByKindIndex::<crate::mock::Runtime>::get(KIND)[..],
+			).unwrap();
+		assert_eq!(
+			same_kind_reports,
+			vec![
+				(time_slot - 1, report_id(time_slot - 1, 3)),
+				(time_slot, report_id(time_slot, 5)),
+				(time_slot, report_id(time_slot, 4)),
+				(time_slot + 1, report_id(time_slot + 1, 6)),
+				(time_slot + 1, report_id(time_slot + 1, 7)),
+			]
+		);
+	});
+}

From 6d82c02611c51a5c54d60e02c3c104b10aa3ae71 Mon Sep 17 00:00:00 2001
From: Andronik Ordian <write@reusable.software>
Date: Sat, 12 Jun 2021 02:47:22 +0200
Subject: [PATCH 0864/1194] disable unused schnorrkel feature (#9084)

---
 Cargo.lock                     | 1 -
 primitives/core/Cargo.toml     | 1 -
 primitives/keystore/Cargo.toml | 1 -
 primitives/keystore/src/vrf.rs | 1 -
 4 files changed, 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4572ed354ab1..a52f4250b5a6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8247,7 +8247,6 @@ dependencies = [
  "merlin",
  "rand 0.7.3",
  "rand_core 0.5.1",
- "serde",
  "sha2 0.8.2",
  "subtle 2.4.0",
  "zeroize",
diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml
index 831e62d6f952..0c724d61ae0c 100644
--- a/primitives/core/Cargo.toml
+++ b/primitives/core/Cargo.toml
@@ -101,7 +101,6 @@ std = [
 	"rand",
 	"sha2/std",
 	"schnorrkel/std",
-	"schnorrkel/serde",
 	"regex",
 	"num-traits/std",
 	"tiny-keccak",
diff --git a/primitives/keystore/Cargo.toml b/primitives/keystore/Cargo.toml
index 81404ce344a2..d4ebfc1c74c6 100644
--- a/primitives/keystore/Cargo.toml
+++ b/primitives/keystore/Cargo.toml
@@ -34,5 +34,4 @@ default = ["std"]
 std = [
 	"serde",
 	"schnorrkel/std",
-	"schnorrkel/serde",
 ]
diff --git a/primitives/keystore/src/vrf.rs b/primitives/keystore/src/vrf.rs
index 463a565f9d86..04286eea8276 100644
--- a/primitives/keystore/src/vrf.rs
+++ b/primitives/keystore/src/vrf.rs
@@ -40,7 +40,6 @@ pub struct VRFTranscriptData {
 	pub items: Vec<(&'static str, VRFTranscriptValue)>,
 }
 /// VRF signature data
-#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
 pub struct VRFSignature {
 	/// The VRFOutput serialized
 	pub output: VRFOutput,

From 2c210396dbf67968a5f631912fa4addefdc8d11a Mon Sep 17 00:00:00 2001
From: Alexander Popiak <alexander.popiak@parity.io>
Date: Sat, 12 Jun 2021 12:43:08 +0200
Subject: [PATCH 0865/1194] make all extrinsics public so they are available
 from outside (#9078)

Co-authored-by: thiolliere <gui.thiolliere@gmail.com>
---
 frame/assets/src/lib.rs              | 46 +++++++++++++-------------
 frame/atomic-swap/src/lib.rs         |  6 ++--
 frame/balances/src/lib.rs            |  2 +-
 frame/democracy/src/lib.rs           | 48 ++++++++++++++--------------
 frame/elections-phragmen/src/lib.rs  | 12 +++----
 frame/example/src/lib.rs             |  4 +--
 frame/grandpa/src/lib.rs             |  2 +-
 frame/identity/src/lib.rs            | 30 ++++++++---------
 frame/indices/src/lib.rs             | 10 +++---
 frame/lottery/src/lib.rs             |  8 ++---
 frame/multisig/src/lib.rs            |  8 ++---
 frame/nicks/src/lib.rs               |  8 ++---
 frame/proxy/src/lib.rs               | 20 ++++++------
 frame/recovery/src/lib.rs            | 18 +++++------
 frame/scheduler/src/lib.rs           | 12 +++----
 frame/sudo/src/lib.rs                |  8 ++---
 frame/support/src/lib.rs             |  2 +-
 frame/system/src/lib.rs              | 14 ++++----
 frame/timestamp/src/lib.rs           |  2 +-
 frame/transaction-storage/src/lib.rs |  6 ++--
 frame/uniques/src/lib.rs             | 44 ++++++++++++-------------
 21 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index 333dbad83646..afcdb5b054d0 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -368,7 +368,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::create())]
-		pub(super) fn create(
+		pub fn create(
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId,
 			admin: <T::Lookup as StaticLookup>::Source,
@@ -424,7 +424,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::force_create())]
-		pub(super) fn force_create(
+		pub fn force_create(
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId,
 			owner: <T::Lookup as StaticLookup>::Source,
@@ -477,7 +477,7 @@ pub mod pallet {
  			witness.sufficients,
  			witness.approvals,
  		))]
-		pub(super) fn destroy(
+		pub fn destroy(
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId,
 			witness: DestroyWitness,
@@ -528,7 +528,7 @@ pub mod pallet {
 		/// Weight: `O(1)`
 		/// Modes: Pre-existing balance of `beneficiary`; Account pre-existence of `beneficiary`.
 		#[pallet::weight(T::WeightInfo::mint())]
-		pub(super) fn mint(
+		pub fn mint(
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId,
 			beneficiary: <T::Lookup as StaticLookup>::Source,
@@ -556,7 +556,7 @@ pub mod pallet {
 		/// Weight: `O(1)`
 		/// Modes: Post-existence of `who`; Pre & post Zombie-status of `who`.
 		#[pallet::weight(T::WeightInfo::burn())]
-		pub(super) fn burn(
+		pub fn burn(
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId,
 			who: <T::Lookup as StaticLookup>::Source,
@@ -589,7 +589,7 @@ pub mod pallet {
 		/// Modes: Pre-existence of `target`; Post-existence of sender; Account pre-existence of
 		/// `target`.
 		#[pallet::weight(T::WeightInfo::transfer())]
-		pub(super) fn transfer(
+		pub fn transfer(
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId,
 			target: <T::Lookup as StaticLookup>::Source,
@@ -625,7 +625,7 @@ pub mod pallet {
 		/// Modes: Pre-existence of `target`; Post-existence of sender; Account pre-existence of
 		/// `target`.
 		#[pallet::weight(T::WeightInfo::transfer_keep_alive())]
-		pub(super) fn transfer_keep_alive(
+		pub fn transfer_keep_alive(
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId,
 			target: <T::Lookup as StaticLookup>::Source,
@@ -662,7 +662,7 @@ pub mod pallet {
 		/// Modes: Pre-existence of `dest`; Post-existence of `source`; Account pre-existence of
 		/// `dest`.
 		#[pallet::weight(T::WeightInfo::force_transfer())]
-		pub(super) fn force_transfer(
+		pub fn force_transfer(
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId,
 			source: <T::Lookup as StaticLookup>::Source,
@@ -692,7 +692,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::freeze())]
-		pub(super) fn freeze(
+		pub fn freeze(
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId,
 			who: <T::Lookup as StaticLookup>::Source
@@ -724,7 +724,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::thaw())]
-		pub(super) fn thaw(
+		pub fn thaw(
 			origin: OriginFor<T>,
 			#[pallet::compact]
 			id: T::AssetId,
@@ -756,7 +756,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::freeze_asset())]
-		pub(super) fn freeze_asset(
+		pub fn freeze_asset(
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId
 		) -> DispatchResult {
@@ -783,7 +783,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::thaw_asset())]
-		pub(super) fn thaw_asset(
+		pub fn thaw_asset(
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId
 		) -> DispatchResult {
@@ -811,7 +811,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::transfer_ownership())]
-		pub(super) fn transfer_ownership(
+		pub fn transfer_ownership(
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId,
 			owner: <T::Lookup as StaticLookup>::Source,
@@ -852,7 +852,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::set_team())]
-		pub(super) fn set_team(
+		pub fn set_team(
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId,
 			issuer: <T::Lookup as StaticLookup>::Source,
@@ -894,7 +894,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::set_metadata(name.len() as u32, symbol.len() as u32))]
-		pub(super) fn set_metadata(
+		pub fn set_metadata(
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId,
 			name: Vec<u8>,
@@ -957,7 +957,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::clear_metadata())]
-		pub(super) fn clear_metadata(
+		pub fn clear_metadata(
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId,
 		) -> DispatchResult {
@@ -989,7 +989,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(N + S)` where N and S are the length of the name and symbol respectively.
 		#[pallet::weight(T::WeightInfo::force_set_metadata(name.len() as u32, symbol.len() as u32))]
-		pub(super) fn force_set_metadata(
+		pub fn force_set_metadata(
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId,
 			name: Vec<u8>,
@@ -1037,7 +1037,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::force_clear_metadata())]
-		pub(super) fn force_clear_metadata(
+		pub fn force_clear_metadata(
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId,
 		) -> DispatchResult {
@@ -1075,7 +1075,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::force_asset_status())]
-		pub(super) fn force_asset_status(
+		pub fn force_asset_status(
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId,
 			owner: <T::Lookup as StaticLookup>::Source,
@@ -1125,7 +1125,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::approve_transfer())]
-		pub(super) fn approve_transfer(
+		pub fn approve_transfer(
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId,
 			delegate: <T::Lookup as StaticLookup>::Source,
@@ -1164,7 +1164,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::cancel_approval())]
-		pub(super) fn cancel_approval(
+		pub fn cancel_approval(
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId,
 			delegate: <T::Lookup as StaticLookup>::Source,
@@ -1192,7 +1192,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::force_cancel_approval())]
-		pub(super) fn force_cancel_approval(
+		pub fn force_cancel_approval(
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId,
 			owner: <T::Lookup as StaticLookup>::Source,
@@ -1236,7 +1236,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::transfer_approved())]
-		pub(super) fn transfer_approved(
+		pub fn transfer_approved(
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId,
 			owner: <T::Lookup as StaticLookup>::Source,
diff --git a/frame/atomic-swap/src/lib.rs b/frame/atomic-swap/src/lib.rs
index afc74dd2a549..4c19a61bb72f 100644
--- a/frame/atomic-swap/src/lib.rs
+++ b/frame/atomic-swap/src/lib.rs
@@ -226,7 +226,7 @@ pub mod pallet {
 		///   that the revealer uses a shorter duration than the counterparty, to prevent the
 		///   situation where the revealer reveals the proof too late around the end block.
 		#[pallet::weight(T::DbWeight::get().reads_writes(1, 1).saturating_add(40_000_000))]
-		pub(crate) fn create_swap(
+		pub fn create_swap(
 			origin: OriginFor<T>,
 			target: T::AccountId,
 			hashed_proof: HashedProof,
@@ -268,7 +268,7 @@ pub mod pallet {
 				.saturating_add((proof.len() as Weight).saturating_mul(100))
 				.saturating_add(action.weight())
 		)]
-		pub(crate) fn claim_swap(
+		pub fn claim_swap(
 			origin: OriginFor<T>,
 			proof: Vec<u8>,
 			action: T::SwapAction,
@@ -303,7 +303,7 @@ pub mod pallet {
 		/// - `target`: Target of the original atomic swap.
 		/// - `hashed_proof`: Hashed proof of the original atomic swap.
 		#[pallet::weight(T::DbWeight::get().reads_writes(1, 1).saturating_add(40_000_000))]
-		pub(crate) fn cancel_swap(
+		pub fn cancel_swap(
 			origin: OriginFor<T>,
 			target: T::AccountId,
 			hashed_proof: HashedProof,
diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index 105c5d08a659..5dccd7da267f 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -291,7 +291,7 @@ pub mod pallet {
 			T::WeightInfo::set_balance_creating() // Creates a new account.
 				.max(T::WeightInfo::set_balance_killing()) // Kills an existing account.
 		)]
-		pub(super) fn set_balance(
+		pub fn set_balance(
 			origin: OriginFor<T>,
 			who: <T::Lookup as StaticLookup>::Source,
 			#[pallet::compact] new_free: T::Balance,
diff --git a/frame/democracy/src/lib.rs b/frame/democracy/src/lib.rs
index 70b943bf00d5..6ebe917f56ae 100644
--- a/frame/democracy/src/lib.rs
+++ b/frame/democracy/src/lib.rs
@@ -634,7 +634,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(p)`
 		#[pallet::weight(T::WeightInfo::propose())]
-		pub(crate) fn propose(
+		pub fn propose(
 			origin: OriginFor<T>,
 			proposal_hash: T::Hash,
 			#[pallet::compact] value: BalanceOf<T>,
@@ -675,7 +675,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(S)` where S is the number of seconds a proposal already has.
 		#[pallet::weight(T::WeightInfo::second(*seconds_upper_bound))]
-		pub(crate) fn second(
+		pub fn second(
 			origin: OriginFor<T>,
 			#[pallet::compact] proposal: PropIndex,
 			#[pallet::compact] seconds_upper_bound: u32,
@@ -706,7 +706,7 @@ pub mod pallet {
 			T::WeightInfo::vote_new(T::MaxVotes::get())
 				.max(T::WeightInfo::vote_existing(T::MaxVotes::get()))
 		)]
-		pub(crate) fn vote(
+		pub fn vote(
 			origin: OriginFor<T>,
 			#[pallet::compact] ref_index: ReferendumIndex,
 			vote: AccountVote<BalanceOf<T>>,
@@ -724,7 +724,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`.
 		#[pallet::weight((T::WeightInfo::emergency_cancel(), DispatchClass::Operational))]
-		pub(crate) fn emergency_cancel(origin: OriginFor<T>, ref_index: ReferendumIndex) -> DispatchResult {
+		pub fn emergency_cancel(origin: OriginFor<T>, ref_index: ReferendumIndex) -> DispatchResult {
 			T::CancellationOrigin::ensure_origin(origin)?;
 
 			let status = Self::referendum_status(ref_index)?;
@@ -746,7 +746,7 @@ pub mod pallet {
 		/// Weight: `O(V)` with V number of vetoers in the blacklist of proposal.
 		///   Decoding vec of length V. Charged as maximum
 		#[pallet::weight(T::WeightInfo::external_propose(MAX_VETOERS))]
-		pub(crate) fn external_propose(origin: OriginFor<T>, proposal_hash: T::Hash) -> DispatchResult {
+		pub fn external_propose(origin: OriginFor<T>, proposal_hash: T::Hash) -> DispatchResult {
 			T::ExternalOrigin::ensure_origin(origin)?;
 			ensure!(!<NextExternal<T>>::exists(), Error::<T>::DuplicateProposal);
 			if let Some((until, _)) = <Blacklist<T>>::get(proposal_hash) {
@@ -771,7 +771,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::external_propose_majority())]
-		pub(crate) fn external_propose_majority(
+		pub fn external_propose_majority(
 			origin: OriginFor<T>,
 			proposal_hash: T::Hash,
 		) -> DispatchResult {
@@ -792,7 +792,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::external_propose_default())]
-		pub(crate) fn external_propose_default(
+		pub fn external_propose_default(
 			origin: OriginFor<T>,
 			proposal_hash: T::Hash,
 		) -> DispatchResult {
@@ -817,7 +817,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::fast_track())]
-		pub(crate) fn fast_track(
+		pub fn fast_track(
 			origin: OriginFor<T>,
 			proposal_hash: T::Hash,
 			voting_period: T::BlockNumber,
@@ -864,7 +864,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(V + log(V))` where V is number of `existing vetoers`
 		#[pallet::weight(T::WeightInfo::veto_external(MAX_VETOERS))]
-		pub(crate) fn veto_external(origin: OriginFor<T>, proposal_hash: T::Hash) -> DispatchResult {
+		pub fn veto_external(origin: OriginFor<T>, proposal_hash: T::Hash) -> DispatchResult {
 			let who = T::VetoOrigin::ensure_origin(origin)?;
 
 			if let Some((e_proposal_hash, _)) = <NextExternal<T>>::get() {
@@ -896,7 +896,7 @@ pub mod pallet {
 		///
 		/// # Weight: `O(1)`.
 		#[pallet::weight(T::WeightInfo::cancel_referendum())]
-		pub(crate) fn cancel_referendum(
+		pub fn cancel_referendum(
 			origin: OriginFor<T>,
 			#[pallet::compact] ref_index: ReferendumIndex,
 		) -> DispatchResult {
@@ -913,7 +913,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(D)` where `D` is the items in the dispatch queue. Weighted as `D = 10`.
 		#[pallet::weight((T::WeightInfo::cancel_queued(10), DispatchClass::Operational))]
-		pub(crate) fn cancel_queued(origin: OriginFor<T>, which: ReferendumIndex) -> DispatchResult {
+		pub fn cancel_queued(origin: OriginFor<T>, which: ReferendumIndex) -> DispatchResult {
 			ensure_root(origin)?;
 			T::Scheduler::cancel_named((DEMOCRACY_ID, which).encode())
 				.map_err(|_| Error::<T>::ProposalMissing)?;
@@ -970,7 +970,7 @@ pub mod pallet {
 		// NOTE: weight must cover an incorrect voting of origin with max votes, this is ensure
 		// because a valid delegation cover decoding a direct voting with max votes.
 		#[pallet::weight(T::WeightInfo::undelegate(T::MaxVotes::get().into()))]
-		pub(crate) fn undelegate(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
+		pub fn undelegate(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
 			let votes = Self::try_undelegate(who)?;
 			Ok(Some(T::WeightInfo::undelegate(votes)).into())
@@ -982,7 +982,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`.
 		#[pallet::weight(T::WeightInfo::clear_public_proposals())]
-		pub(crate) fn clear_public_proposals(origin: OriginFor<T>) -> DispatchResult {
+		pub fn clear_public_proposals(origin: OriginFor<T>) -> DispatchResult {
 			ensure_root(origin)?;
 			<PublicProps<T>>::kill();
 			Ok(())
@@ -999,7 +999,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(E)` with E size of `encoded_proposal` (protected by a required deposit).
 		#[pallet::weight(T::WeightInfo::note_preimage(encoded_proposal.len() as u32))]
-		pub(crate) fn note_preimage(origin: OriginFor<T>, encoded_proposal: Vec<u8>) -> DispatchResult {
+		pub fn note_preimage(origin: OriginFor<T>, encoded_proposal: Vec<u8>) -> DispatchResult {
 			Self::note_preimage_inner(ensure_signed(origin)?, encoded_proposal)?;
 			Ok(())
 		}
@@ -1009,7 +1009,7 @@ pub mod pallet {
 			T::WeightInfo::note_preimage(encoded_proposal.len() as u32),
 			DispatchClass::Operational,
 		))]
-		pub(crate) fn note_preimage_operational(
+		pub fn note_preimage_operational(
 			origin: OriginFor<T>,
 			encoded_proposal: Vec<u8>,
 		) -> DispatchResult {
@@ -1031,7 +1031,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(E)` with E size of `encoded_proposal` (protected by a required deposit).
 		#[pallet::weight(T::WeightInfo::note_imminent_preimage(encoded_proposal.len() as u32))]
-		pub(crate) fn note_imminent_preimage(
+		pub fn note_imminent_preimage(
 			origin: OriginFor<T>,
 			encoded_proposal: Vec<u8>,
 		) -> DispatchResultWithPostInfo {
@@ -1046,7 +1046,7 @@ pub mod pallet {
 			T::WeightInfo::note_imminent_preimage(encoded_proposal.len() as u32),
 			DispatchClass::Operational,
 		))]
-		pub(crate) fn note_imminent_preimage_operational(
+		pub fn note_imminent_preimage_operational(
 			origin: OriginFor<T>,
 			encoded_proposal: Vec<u8>,
 		) -> DispatchResultWithPostInfo {
@@ -1073,7 +1073,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(D)` where D is length of proposal.
 		#[pallet::weight(T::WeightInfo::reap_preimage(*proposal_len_upper_bound))]
-		pub(crate) fn reap_preimage(
+		pub fn reap_preimage(
 			origin: OriginFor<T>,
 			proposal_hash: T::Hash,
 			#[pallet::compact] proposal_len_upper_bound: u32,
@@ -1116,7 +1116,7 @@ pub mod pallet {
 			T::WeightInfo::unlock_set(T::MaxVotes::get())
 				.max(T::WeightInfo::unlock_remove(T::MaxVotes::get()))
 		)]
-		pub(crate) fn unlock(origin: OriginFor<T>, target: T::AccountId) -> DispatchResult {
+		pub fn unlock(origin: OriginFor<T>, target: T::AccountId) -> DispatchResult {
 			ensure_signed(origin)?;
 			Self::update_lock(&target);
 			Ok(())
@@ -1150,7 +1150,7 @@ pub mod pallet {
 		/// Weight: `O(R + log R)` where R is the number of referenda that `target` has voted on.
 		///   Weight is calculated for the maximum number of vote.
 		#[pallet::weight(T::WeightInfo::remove_vote(T::MaxVotes::get()))]
-		pub(crate) fn remove_vote(origin: OriginFor<T>, index: ReferendumIndex) -> DispatchResult {
+		pub fn remove_vote(origin: OriginFor<T>, index: ReferendumIndex) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			Self::try_remove_vote(&who, index, UnvoteScope::Any)
 		}
@@ -1171,7 +1171,7 @@ pub mod pallet {
 		/// Weight: `O(R + log R)` where R is the number of referenda that `target` has voted on.
 		///   Weight is calculated for the maximum number of vote.
 		#[pallet::weight(T::WeightInfo::remove_other_vote(T::MaxVotes::get()))]
-		pub(crate) fn remove_other_vote(
+		pub fn remove_other_vote(
 			origin: OriginFor<T>,
 			target: T::AccountId,
 			index: ReferendumIndex,
@@ -1184,7 +1184,7 @@ pub mod pallet {
 
 		/// Enact a proposal from a referendum. For now we just make the weight be the maximum.
 		#[pallet::weight(T::BlockWeights::get().max_block)]
-		pub(crate) fn enact_proposal(
+		pub fn enact_proposal(
 			origin: OriginFor<T>,
 			proposal_hash: T::Hash,
 			index: ReferendumIndex,
@@ -1209,7 +1209,7 @@ pub mod pallet {
 		/// Weight: `O(p)` (though as this is an high-privilege dispatch, we assume it has a
 		///   reasonable value).
 		#[pallet::weight((T::WeightInfo::blacklist(T::MaxProposals::get()), DispatchClass::Operational))]
-		pub(crate) fn blacklist(origin: OriginFor<T>,
+		pub fn blacklist(origin: OriginFor<T>,
 			proposal_hash: T::Hash,
 			maybe_ref_index: Option<ReferendumIndex>,
 		) -> DispatchResult {
@@ -1257,7 +1257,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(p)` where `p = PublicProps::<T>::decode_len()`
 		#[pallet::weight(T::WeightInfo::cancel_proposal(T::MaxProposals::get()))]
-		pub(crate) fn cancel_proposal(
+		pub fn cancel_proposal(
 			origin: OriginFor<T>,
 			#[pallet::compact] prop_index: PropIndex,
 		) -> DispatchResult {
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index 556c57eea5a1..8a1680633ef7 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -286,7 +286,7 @@ pub mod pallet {
 			.max(T::WeightInfo::vote_less(votes.len() as u32))
 			.max(T::WeightInfo::vote_equal(votes.len() as u32))
 		)]
-		pub(crate) fn vote(
+		pub fn vote(
 			origin: OriginFor<T>,
 			votes: Vec<T::AccountId>,
 			#[pallet::compact] value: BalanceOf<T>,
@@ -349,7 +349,7 @@ pub mod pallet {
 		///
 		/// The dispatch origin of this call must be signed and be a voter.
 		#[pallet::weight(T::WeightInfo::remove_voter())]
-		pub(crate) fn remove_voter(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
+		pub fn remove_voter(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
 			ensure!(Self::is_voter(&who), Error::<T>::MustBeVoter);
 			Self::do_remove_voter(&who);
@@ -372,7 +372,7 @@ pub mod pallet {
 		/// The number of current candidates must be provided as witness data.
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::submit_candidacy(*candidate_count))]
-		pub(crate) fn submit_candidacy(
+		pub fn submit_candidacy(
 			origin: OriginFor<T>,
 			#[pallet::compact] candidate_count: u32,
 		) -> DispatchResultWithPostInfo {
@@ -415,7 +415,7 @@ pub mod pallet {
 			Renouncing::Member => T::WeightInfo::renounce_candidacy_members(),
 			Renouncing::RunnerUp => T::WeightInfo::renounce_candidacy_runners_up(),
 		})]
-		pub(crate) fn renounce_candidacy(
+		pub fn renounce_candidacy(
 			origin: OriginFor<T>,
 			renouncing: Renouncing,
 		) -> DispatchResultWithPostInfo {
@@ -476,7 +476,7 @@ pub mod pallet {
 		} else {
 			T::BlockWeights::get().max_block
 		})]
-		pub(crate) fn remove_member(
+		pub fn remove_member(
 			origin: OriginFor<T>,
 			who: <T::Lookup as StaticLookup>::Source,
 			has_replacement: bool,
@@ -516,7 +516,7 @@ pub mod pallet {
 		/// The total number of voters and those that are defunct must be provided as witness data.
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::clean_defunct_voters(*_num_voters, *_num_defunct))]
-		pub(crate) fn clean_defunct_voters(
+		pub fn clean_defunct_voters(
 			origin: OriginFor<T>,
 			_num_voters: u32,
 			_num_defunct: u32,
diff --git a/frame/example/src/lib.rs b/frame/example/src/lib.rs
index fd1bc292ac8a..f5014b75640b 100644
--- a/frame/example/src/lib.rs
+++ b/frame/example/src/lib.rs
@@ -488,7 +488,7 @@ pub mod pallet {
 		#[pallet::weight(
 			<T as pallet::Config>::WeightInfo::accumulate_dummy((*increase_by).saturated_into())
 		)]
-		pub(super) fn accumulate_dummy(
+		pub fn accumulate_dummy(
 			origin: OriginFor<T>,
 			increase_by: T::Balance
 		) -> DispatchResult {
@@ -533,7 +533,7 @@ pub mod pallet {
 		// The weight for this extrinsic we use our own weight object `WeightForSetDummy` to determine
 		// its weight
 		#[pallet::weight(WeightForSetDummy::<T>(<BalanceOf<T>>::from(100u32)))]
-		pub(super) fn set_dummy(
+		pub fn set_dummy(
 			origin: OriginFor<T>,
 			#[pallet::compact] new_value: T::Balance,
 		) -> DispatchResult {
diff --git a/frame/grandpa/src/lib.rs b/frame/grandpa/src/lib.rs
index 952e0d646135..28546018a978 100644
--- a/frame/grandpa/src/lib.rs
+++ b/frame/grandpa/src/lib.rs
@@ -214,7 +214,7 @@ pub mod pallet {
 		/// if the block author is defined it will be defined as the equivocation
 		/// reporter.
 		#[pallet::weight(T::WeightInfo::report_equivocation(key_owner_proof.validator_count()))]
-		pub(super) fn report_equivocation_unsigned(
+		pub fn report_equivocation_unsigned(
 			origin: OriginFor<T>,
 			equivocation_proof: EquivocationProof<T::Hash, T::BlockNumber>,
 			key_owner_proof: T::KeyOwnerProof,
diff --git a/frame/identity/src/lib.rs b/frame/identity/src/lib.rs
index 91b3f3a50fc4..b71b069ccb74 100644
--- a/frame/identity/src/lib.rs
+++ b/frame/identity/src/lib.rs
@@ -549,7 +549,7 @@ pub mod pallet {
 		/// - One event.
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::add_registrar(T::MaxRegistrars::get()))]
-		pub(super) fn add_registrar(origin: OriginFor<T>, account: T::AccountId) -> DispatchResultWithPostInfo {
+		pub fn add_registrar(origin: OriginFor<T>, account: T::AccountId) -> DispatchResultWithPostInfo {
 			T::RegistrarOrigin::ensure_origin(origin)?;
 
 			let (i, registrar_count) = <Registrars<T>>::try_mutate(
@@ -590,7 +590,7 @@ pub mod pallet {
 			T::MaxRegistrars::get().into(), // R
 			T::MaxAdditionalFields::get().into(), // X
 		))]
-		pub(super) fn set_identity(origin: OriginFor<T>, info: IdentityInfo) -> DispatchResultWithPostInfo {
+		pub fn set_identity(origin: OriginFor<T>, info: IdentityInfo) -> DispatchResultWithPostInfo {
 			let sender = ensure_signed(origin)?;
 			let extra_fields = info.additional.len() as u32;
 			ensure!(extra_fields <= T::MaxAdditionalFields::get(), Error::<T>::TooManyFields);
@@ -656,7 +656,7 @@ pub mod pallet {
 		#[pallet::weight(T::WeightInfo::set_subs_old(T::MaxSubAccounts::get()) // P: Assume max sub accounts removed.
 			.saturating_add(T::WeightInfo::set_subs_new(subs.len() as u32)) // S: Assume all subs are new.
 		)]
-		pub(super) fn set_subs(origin: OriginFor<T>, subs: Vec<(T::AccountId, Data)>) -> DispatchResultWithPostInfo {
+		pub fn set_subs(origin: OriginFor<T>, subs: Vec<(T::AccountId, Data)>) -> DispatchResultWithPostInfo {
 			let sender = ensure_signed(origin)?;
 			ensure!(<IdentityOf<T>>::contains_key(&sender), Error::<T>::NotFound);
 			ensure!(subs.len() <= T::MaxSubAccounts::get() as usize, Error::<T>::TooManySubAccounts);
@@ -719,7 +719,7 @@ pub mod pallet {
 			T::MaxSubAccounts::get().into(), // S
 			T::MaxAdditionalFields::get().into(), // X
 		))]
-		pub(super) fn clear_identity(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
+		pub fn clear_identity(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
 			let sender = ensure_signed(origin)?;
 
 			let (subs_deposit, sub_ids) = <SubsOf<T>>::take(&sender);
@@ -768,7 +768,7 @@ pub mod pallet {
 			T::MaxRegistrars::get().into(), // R
 			T::MaxAdditionalFields::get().into(), // X
 		))]
-		pub(super) fn request_judgement(origin: OriginFor<T>,
+		pub fn request_judgement(origin: OriginFor<T>,
 			#[pallet::compact] reg_index: RegistrarIndex,
 			#[pallet::compact] max_fee: BalanceOf<T>,
 		) -> DispatchResultWithPostInfo {
@@ -824,7 +824,7 @@ pub mod pallet {
 			T::MaxRegistrars::get().into(), // R
 			T::MaxAdditionalFields::get().into(), // X
 		))]
-		pub(super) fn cancel_request(origin: OriginFor<T>, reg_index: RegistrarIndex) -> DispatchResultWithPostInfo {
+		pub fn cancel_request(origin: OriginFor<T>, reg_index: RegistrarIndex) -> DispatchResultWithPostInfo {
 			let sender = ensure_signed(origin)?;
 			let mut id = <IdentityOf<T>>::get(&sender).ok_or(Error::<T>::NoIdentity)?;
 
@@ -864,7 +864,7 @@ pub mod pallet {
 		/// - Benchmark: 7.315 + R * 0.329 µs (min squares analysis)
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::set_fee(T::MaxRegistrars::get()))] // R
-		pub(super) fn set_fee(origin: OriginFor<T>,
+		pub fn set_fee(origin: OriginFor<T>,
 			#[pallet::compact] index: RegistrarIndex,
 			#[pallet::compact] fee: BalanceOf<T>,
 		) -> DispatchResultWithPostInfo {
@@ -894,7 +894,7 @@ pub mod pallet {
 		/// - Benchmark: 8.823 + R * 0.32 µs (min squares analysis)
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::set_account_id(T::MaxRegistrars::get()))] // R
-		pub(super) fn set_account_id(origin: OriginFor<T>,
+		pub fn set_account_id(origin: OriginFor<T>,
 			#[pallet::compact] index: RegistrarIndex,
 			new: T::AccountId,
 		) -> DispatchResultWithPostInfo {
@@ -924,7 +924,7 @@ pub mod pallet {
 		/// - Benchmark: 7.464 + R * 0.325 µs (min squares analysis)
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::set_fields(T::MaxRegistrars::get()))] // R
-		pub(super) fn set_fields(origin: OriginFor<T>,
+		pub fn set_fields(origin: OriginFor<T>,
 			#[pallet::compact] index: RegistrarIndex,
 			fields: IdentityFields,
 		) -> DispatchResultWithPostInfo {
@@ -965,7 +965,7 @@ pub mod pallet {
 			T::MaxRegistrars::get().into(), // R
 			T::MaxAdditionalFields::get().into(), // X
 		))]
-		pub(super) fn provide_judgement(origin: OriginFor<T>,
+		pub fn provide_judgement(origin: OriginFor<T>,
 			#[pallet::compact] reg_index: RegistrarIndex,
 			target: <T::Lookup as StaticLookup>::Source,
 			judgement: Judgement<BalanceOf<T>>,
@@ -1026,7 +1026,7 @@ pub mod pallet {
 			T::MaxSubAccounts::get().into(), // S
 			T::MaxAdditionalFields::get().into(), // X
 		))]
-		pub(super) fn kill_identity(
+		pub fn kill_identity(
 			origin: OriginFor<T>, target: <T::Lookup as StaticLookup>::Source
 		) -> DispatchResultWithPostInfo {
 			T::ForceOrigin::ensure_origin(origin)?;
@@ -1060,7 +1060,7 @@ pub mod pallet {
 		/// The dispatch origin for this call must be _Signed_ and the sender must have a registered
 		/// sub identity of `sub`.
 		#[pallet::weight(T::WeightInfo::add_sub(T::MaxSubAccounts::get()))]
-		pub(super) fn add_sub(origin: OriginFor<T>, sub: <T::Lookup as StaticLookup>::Source, data: Data) -> DispatchResult {
+		pub fn add_sub(origin: OriginFor<T>, sub: <T::Lookup as StaticLookup>::Source, data: Data) -> DispatchResult {
 			let sender = ensure_signed(origin)?;
 			let sub = T::Lookup::lookup(sub)?;
 			ensure!(IdentityOf::<T>::contains_key(&sender), Error::<T>::NoIdentity);
@@ -1088,7 +1088,7 @@ pub mod pallet {
 		/// The dispatch origin for this call must be _Signed_ and the sender must have a registered
 		/// sub identity of `sub`.
 		#[pallet::weight(T::WeightInfo::rename_sub(T::MaxSubAccounts::get()))]
-		pub(super) fn rename_sub(
+		pub fn rename_sub(
 			origin: OriginFor<T>, sub: <T::Lookup as StaticLookup>::Source, data: Data
 		) -> DispatchResult {
 			let sender = ensure_signed(origin)?;
@@ -1107,7 +1107,7 @@ pub mod pallet {
 		/// The dispatch origin for this call must be _Signed_ and the sender must have a registered
 		/// sub identity of `sub`.
 		#[pallet::weight(T::WeightInfo::remove_sub(T::MaxSubAccounts::get()))]
-		pub(super) fn remove_sub(origin: OriginFor<T>, sub: <T::Lookup as StaticLookup>::Source) -> DispatchResult {
+		pub fn remove_sub(origin: OriginFor<T>, sub: <T::Lookup as StaticLookup>::Source) -> DispatchResult {
 			let sender = ensure_signed(origin)?;
 			ensure!(IdentityOf::<T>::contains_key(&sender), Error::<T>::NoIdentity);
 			let sub = T::Lookup::lookup(sub)?;
@@ -1136,7 +1136,7 @@ pub mod pallet {
 		/// NOTE: This should not normally be used, but is provided in the case that the non-
 		/// controller of an account is maliciously registered as a sub-account.
 		#[pallet::weight(T::WeightInfo::quit_sub(T::MaxSubAccounts::get()))]
-		pub(super) fn quit_sub(origin: OriginFor<T>) -> DispatchResult {
+		pub fn quit_sub(origin: OriginFor<T>) -> DispatchResult {
 			let sender = ensure_signed(origin)?;
 			let (sup, _) = SuperOf::<T>::take(&sender).ok_or(Error::<T>::NotSub)?;
 			SubsOf::<T>::mutate(&sup, |(ref mut subs_deposit, ref mut sub_ids)| {
diff --git a/frame/indices/src/lib.rs b/frame/indices/src/lib.rs
index 1470e3abe866..778173dbc971 100644
--- a/frame/indices/src/lib.rs
+++ b/frame/indices/src/lib.rs
@@ -90,7 +90,7 @@ pub mod pallet {
 		/// - DB Weight: 1 Read/Write (Accounts)
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::claim())]
-		pub(crate) fn claim(origin: OriginFor<T>, index: T::AccountIndex) -> DispatchResult {
+		pub fn claim(origin: OriginFor<T>, index: T::AccountIndex) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 
 			Accounts::<T>::try_mutate(index, |maybe_value| {
@@ -123,7 +123,7 @@ pub mod pallet {
 		///    - Writes: Indices Accounts, System Account (recipient)
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::transfer())]
-		pub(crate) fn transfer(
+		pub fn transfer(
 			origin: OriginFor<T>,
 			new: T::AccountId,
 			index: T::AccountIndex,
@@ -162,7 +162,7 @@ pub mod pallet {
 		/// - DB Weight: 1 Read/Write (Accounts)
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::free())]
-		pub(crate) fn free(origin: OriginFor<T>, index: T::AccountIndex) -> DispatchResult {
+		pub fn free(origin: OriginFor<T>, index: T::AccountIndex) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 
 			Accounts::<T>::try_mutate(index, |maybe_value| -> DispatchResult {
@@ -198,7 +198,7 @@ pub mod pallet {
 		///    - Writes: Indices Accounts, System Account (original owner)
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::force_transfer())]
-		pub(crate) fn force_transfer(
+		pub fn force_transfer(
 			origin: OriginFor<T>,
 			new: T::AccountId,
 			index: T::AccountIndex,
@@ -234,7 +234,7 @@ pub mod pallet {
 		/// - DB Weight: 1 Read/Write (Accounts)
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::freeze())]
-		pub(crate) fn freeze(origin: OriginFor<T>, index: T::AccountIndex) -> DispatchResult {
+		pub fn freeze(origin: OriginFor<T>, index: T::AccountIndex) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 
 			Accounts::<T>::try_mutate(index, |maybe_value| -> DispatchResult {
diff --git a/frame/lottery/src/lib.rs b/frame/lottery/src/lib.rs
index 5d6940c93b3e..53cadbf02b94 100644
--- a/frame/lottery/src/lib.rs
+++ b/frame/lottery/src/lib.rs
@@ -286,7 +286,7 @@ pub mod pallet {
 			T::WeightInfo::buy_ticket()
 				.saturating_add(call.get_dispatch_info().weight)
 		)]
-		pub(crate) fn buy_ticket(origin: OriginFor<T>, call: Box<<T as Config>::Call>) -> DispatchResult {
+		pub fn buy_ticket(origin: OriginFor<T>, call: Box<<T as Config>::Call>) -> DispatchResult {
 			let caller = ensure_signed(origin.clone())?;
 			call.clone().dispatch(origin).map_err(|e| e.error)?;
 
@@ -301,7 +301,7 @@ pub mod pallet {
 		///
 		/// This extrinsic must be called by the Manager origin.
 		#[pallet::weight(T::WeightInfo::set_calls(calls.len() as u32))]
-		pub(crate) fn set_calls(origin: OriginFor<T>, calls: Vec<<T as Config>::Call>) -> DispatchResult {
+		pub fn set_calls(origin: OriginFor<T>, calls: Vec<<T as Config>::Call>) -> DispatchResult {
 			T::ManagerOrigin::ensure_origin(origin)?;
 			ensure!(calls.len() <= T::MaxCalls::get() as usize, Error::<T>::TooManyCalls);
 			if calls.is_empty() {
@@ -325,7 +325,7 @@ pub mod pallet {
 		/// * `delay`: How long after the lottery end we should wait before picking a winner.
 		/// * `repeat`: If the lottery should repeat when completed.
 		#[pallet::weight(T::WeightInfo::start_lottery())]
-		pub(crate) fn start_lottery(
+		pub fn start_lottery(
 			origin: OriginFor<T>,
 			price: BalanceOf<T>,
 			length: T::BlockNumber,
@@ -363,7 +363,7 @@ pub mod pallet {
 		///
 		/// This extrinsic must be called by the `ManagerOrigin`.
 		#[pallet::weight(T::WeightInfo::stop_repeat())]
-		pub(crate) fn stop_repeat(origin: OriginFor<T>) -> DispatchResult {
+		pub fn stop_repeat(origin: OriginFor<T>) -> DispatchResult {
 			T::ManagerOrigin::ensure_origin(origin)?;
 			Lottery::<T>::mutate(|mut lottery| {
 				if let Some(config) = &mut lottery {
diff --git a/frame/multisig/src/lib.rs b/frame/multisig/src/lib.rs
index bbb41e7a9287..bc7ce7029a95 100644
--- a/frame/multisig/src/lib.rs
+++ b/frame/multisig/src/lib.rs
@@ -245,7 +245,7 @@ pub mod pallet{
 				dispatch_info.class,
 			)
 		})]
-		pub(super) fn as_multi_threshold_1(
+		pub fn as_multi_threshold_1(
 			origin: OriginFor<T>,
 			other_signatories: Vec<T::AccountId>,
 			call: Box<<T as Config>::Call>,
@@ -335,7 +335,7 @@ pub mod pallet{
 			.max(T::WeightInfo::as_multi_complete(s, z))
 			.saturating_add(*max_weight)
 		})]
-		pub(super) fn as_multi(
+		pub fn as_multi(
 			origin: OriginFor<T>,
 			threshold: u16,
 			other_signatories: Vec<T::AccountId>,
@@ -392,7 +392,7 @@ pub mod pallet{
 			.max(T::WeightInfo::approve_as_multi_complete(s))
 			.saturating_add(*max_weight)
 		})]
-		pub(super) fn approve_as_multi(
+		pub fn approve_as_multi(
 			origin: OriginFor<T>,
 			threshold: u16,
 			other_signatories: Vec<T::AccountId>,
@@ -431,7 +431,7 @@ pub mod pallet{
 		///     - Write: Multisig Storage, [Caller Account], Refund Account, Calls
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::cancel_as_multi(other_signatories.len() as u32))]
-		pub(super) fn cancel_as_multi(
+		pub fn cancel_as_multi(
 			origin: OriginFor<T>,
 			threshold: u16,
 			other_signatories: Vec<T::AccountId>,
diff --git a/frame/nicks/src/lib.rs b/frame/nicks/src/lib.rs
index a76d4506f93b..1e0ef90e0a3a 100644
--- a/frame/nicks/src/lib.rs
+++ b/frame/nicks/src/lib.rs
@@ -138,7 +138,7 @@ pub mod pallet {
 		/// - One event.
 		/// # </weight>
 		#[pallet::weight(50_000_000)]
-		pub(super) fn set_name(origin: OriginFor<T>, name: Vec<u8>) -> DispatchResult {
+		pub fn set_name(origin: OriginFor<T>, name: Vec<u8>) -> DispatchResult {
 			let sender = ensure_signed(origin)?;
 
 			ensure!(name.len() >= T::MinLength::get() as usize, Error::<T>::TooShort);
@@ -169,7 +169,7 @@ pub mod pallet {
 		/// - One event.
 		/// # </weight>
 		#[pallet::weight(70_000_000)]
-		pub(super) fn clear_name(origin: OriginFor<T>) -> DispatchResult {
+		pub fn clear_name(origin: OriginFor<T>) -> DispatchResult {
 			let sender = ensure_signed(origin)?;
 
 			let deposit = <NameOf<T>>::take(&sender).ok_or(Error::<T>::Unnamed)?.1;
@@ -195,7 +195,7 @@ pub mod pallet {
 		/// - One event.
 		/// # </weight>
 		#[pallet::weight(70_000_000)]
-		pub(super) fn kill_name(
+		pub fn kill_name(
 			origin: OriginFor<T>,
 			target: <T::Lookup as StaticLookup>::Source
 		) -> DispatchResult {
@@ -225,7 +225,7 @@ pub mod pallet {
 		/// - One event.
 		/// # </weight>
 		#[pallet::weight(70_000_000)]
-		pub(super) fn force_name(
+		pub fn force_name(
 			origin: OriginFor<T>,
 			target: <T::Lookup as StaticLookup>::Source,
 			name: Vec<u8>
diff --git a/frame/proxy/src/lib.rs b/frame/proxy/src/lib.rs
index f308dbd28955..6e78df2c7326 100644
--- a/frame/proxy/src/lib.rs
+++ b/frame/proxy/src/lib.rs
@@ -183,7 +183,7 @@ pub mod pallet {
 				.saturating_add(T::DbWeight::get().reads_writes(1, 1)),
 			di.class)
 		})]
-		pub(super) fn proxy(
+		pub fn proxy(
 			origin: OriginFor<T>,
 			real: T::AccountId,
 			force_proxy_type: Option<T::ProxyType>,
@@ -212,7 +212,7 @@ pub mod pallet {
 		/// Weight is a function of the number of proxies the user has (P).
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::add_proxy(T::MaxProxies::get().into()))]
-		pub(super) fn add_proxy(
+		pub fn add_proxy(
 			origin: OriginFor<T>,
 			delegate: T::AccountId,
 			proxy_type: T::ProxyType,
@@ -234,7 +234,7 @@ pub mod pallet {
 		/// Weight is a function of the number of proxies the user has (P).
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::remove_proxy(T::MaxProxies::get().into()))]
-		pub(super) fn remove_proxy(
+		pub fn remove_proxy(
 			origin: OriginFor<T>,
 			delegate: T::AccountId,
 			proxy_type: T::ProxyType,
@@ -255,7 +255,7 @@ pub mod pallet {
 		/// Weight is a function of the number of proxies the user has (P).
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::remove_proxies(T::MaxProxies::get().into()))]
-		pub(super) fn remove_proxies(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
+		pub fn remove_proxies(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
 			let (_, old_deposit) = Proxies::<T>::take(&who);
 			T::Currency::unreserve(&who, old_deposit);
@@ -287,7 +287,7 @@ pub mod pallet {
 		/// # </weight>
 		/// TODO: Might be over counting 1 read
 		#[pallet::weight(T::WeightInfo::anonymous(T::MaxProxies::get().into()))]
-		pub(super) fn anonymous(
+		pub fn anonymous(
 			origin: OriginFor<T>,
 			proxy_type: T::ProxyType,
 			delay: T::BlockNumber,
@@ -337,7 +337,7 @@ pub mod pallet {
 		/// Weight is a function of the number of proxies the user has (P).
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::kill_anonymous(T::MaxProxies::get().into()))]
-		pub(super) fn kill_anonymous(
+		pub fn kill_anonymous(
 			origin: OriginFor<T>,
 			spawner: T::AccountId,
 			proxy_type: T::ProxyType,
@@ -379,7 +379,7 @@ pub mod pallet {
 		/// - P: the number of proxies the user has.
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::announce(T::MaxPending::get(), T::MaxProxies::get().into()))]
-		pub(super) fn announce(
+		pub fn announce(
 			origin: OriginFor<T>,
 			real: T::AccountId,
 			call_hash: CallHashOf<T>
@@ -430,7 +430,7 @@ pub mod pallet {
 		#[pallet::weight(
 			T::WeightInfo::remove_announcement(T::MaxPending::get(), T::MaxProxies::get().into())
 		)]
-		pub(super) fn remove_announcement(
+		pub fn remove_announcement(
 			origin: OriginFor<T>,
 			real: T::AccountId,
 			call_hash: CallHashOf<T>
@@ -460,7 +460,7 @@ pub mod pallet {
 		#[pallet::weight(
 			T::WeightInfo::reject_announcement(T::MaxPending::get(), T::MaxProxies::get().into())
 		)]
-		pub(super) fn reject_announcement(
+		pub fn reject_announcement(
 			origin: OriginFor<T>,
 			delegate: T::AccountId,
 			call_hash: CallHashOf<T>
@@ -496,7 +496,7 @@ pub mod pallet {
 				.saturating_add(T::DbWeight::get().reads_writes(1, 1)),
 			di.class)
 		})]
-		pub(super) fn proxy_announced(
+		pub fn proxy_announced(
 			origin: OriginFor<T>,
 			delegate: T::AccountId,
 			real: T::AccountId,
diff --git a/frame/recovery/src/lib.rs b/frame/recovery/src/lib.rs
index 7802f26d1d1f..6f5c7ebcb6e4 100644
--- a/frame/recovery/src/lib.rs
+++ b/frame/recovery/src/lib.rs
@@ -362,7 +362,7 @@ pub mod pallet {
 				dispatch_info.class,
 			)
 		})]
-		pub(crate) fn as_recovered(
+		pub fn as_recovered(
 			origin: OriginFor<T>,
 			account: T::AccountId,
 			call: Box<<T as Config>::Call>
@@ -389,7 +389,7 @@ pub mod pallet {
 		/// - One event
 		/// # </weight>
 		#[pallet::weight(30_000_000)]
-		pub(crate) fn set_recovered(
+		pub fn set_recovered(
 			origin: OriginFor<T>,
 			lost: T::AccountId,
 			rescuer: T::AccountId,
@@ -429,7 +429,7 @@ pub mod pallet {
 		/// Total Complexity: O(F + X)
 		/// # </weight>
 		#[pallet::weight(100_000_000)]
-		pub(crate) fn create_recovery(
+		pub fn create_recovery(
 			origin: OriginFor<T>,
 			friends: Vec<T::AccountId>,
 			threshold: u16,
@@ -491,7 +491,7 @@ pub mod pallet {
 		/// Total Complexity: O(F + X)
 		/// # </weight>
 		#[pallet::weight(100_000_000)]
-		pub(crate) fn initiate_recovery(origin: OriginFor<T>, account: T::AccountId) -> DispatchResult {
+		pub fn initiate_recovery(origin: OriginFor<T>, account: T::AccountId) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			// Check that the account is recoverable
 			ensure!(<Recoverable<T>>::contains_key(&account), Error::<T>::NotRecoverable);
@@ -538,7 +538,7 @@ pub mod pallet {
 		/// Total Complexity: O(F + logF + V + logV)
 		/// # </weight>
 		#[pallet::weight(100_000_000)]
-		pub(crate) fn vouch_recovery(
+		pub fn vouch_recovery(
 			origin: OriginFor<T>,
 			lost: T::AccountId,
 			rescuer: T::AccountId
@@ -582,7 +582,7 @@ pub mod pallet {
 		/// Total Complexity: O(F + V)
 		/// # </weight>
 		#[pallet::weight(100_000_000)]
-		pub(crate) fn claim_recovery(origin: OriginFor<T>, account: T::AccountId) -> DispatchResult {
+		pub fn claim_recovery(origin: OriginFor<T>, account: T::AccountId) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			// Get the recovery configuration for the lost account
 			let recovery_config = Self::recovery_config(&account).ok_or(Error::<T>::NotRecoverable)?;
@@ -628,7 +628,7 @@ pub mod pallet {
 		/// Total Complexity: O(V + X)
 		/// # </weight>
 		#[pallet::weight(30_000_000)]
-		pub(crate) fn close_recovery(origin: OriginFor<T>, rescuer: T::AccountId) -> DispatchResult {
+		pub fn close_recovery(origin: OriginFor<T>, rescuer: T::AccountId) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			// Take the active recovery process started by the rescuer for this account.
 			let active_recovery = <ActiveRecoveries<T>>::take(&who, &rescuer).ok_or(Error::<T>::NotStarted)?;
@@ -662,7 +662,7 @@ pub mod pallet {
 		/// Total Complexity: O(F + X)
 		/// # </weight>
 		#[pallet::weight(30_000_000)]
-		pub(crate) fn remove_recovery(origin: OriginFor<T>) -> DispatchResult {
+		pub fn remove_recovery(origin: OriginFor<T>) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			// Check there are no active recoveries
 			let mut active_recoveries = <ActiveRecoveries<T>>::iter_prefix_values(&who);
@@ -688,7 +688,7 @@ pub mod pallet {
 		/// - One storage mutation to check account is recovered by `who`. O(1)
 		/// # </weight>
 		#[pallet::weight(30_000_000)]
-		pub(crate) fn cancel_recovered(origin: OriginFor<T>, account: T::AccountId) -> DispatchResult {
+		pub fn cancel_recovered(origin: OriginFor<T>, account: T::AccountId) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			// Check `who` is allowed to make a call on behalf of `account`
 			ensure!(Self::proxy(&who) == Some(account), Error::<T>::NotAllowed);
diff --git a/frame/scheduler/src/lib.rs b/frame/scheduler/src/lib.rs
index 006ab5a0f2d7..950bbde8bc49 100644
--- a/frame/scheduler/src/lib.rs
+++ b/frame/scheduler/src/lib.rs
@@ -346,7 +346,7 @@ pub mod pallet {
 		/// - Will use base weight of 25 which should be good for up to 30 scheduled calls
 		/// # </weight>
 		#[pallet::weight(<T as Config>::WeightInfo::schedule(T::MaxScheduledPerBlock::get()))]
-		pub(crate) fn schedule(
+		pub fn schedule(
 			origin: OriginFor<T>,
 			when: T::BlockNumber,
 			maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
@@ -376,7 +376,7 @@ pub mod pallet {
 		/// - Will use base weight of 100 which should be good for up to 30 scheduled calls
 		/// # </weight>
 		#[pallet::weight(<T as Config>::WeightInfo::cancel(T::MaxScheduledPerBlock::get()))]
-		pub(crate) fn cancel(origin: OriginFor<T>, when: T::BlockNumber, index: u32) -> DispatchResult {
+		pub fn cancel(origin: OriginFor<T>, when: T::BlockNumber, index: u32) -> DispatchResult {
 			T::ScheduleOrigin::ensure_origin(origin.clone())?;
 			let origin = <T as Config>::Origin::from(origin);
 			Self::do_cancel(Some(origin.caller().clone()), (when, index))?;
@@ -394,7 +394,7 @@ pub mod pallet {
 		/// - Will use base weight of 35 which should be good for more than 30 scheduled calls
 		/// # </weight>
 		#[pallet::weight(<T as Config>::WeightInfo::schedule_named(T::MaxScheduledPerBlock::get()))]
-		pub(crate) fn schedule_named(
+		pub fn schedule_named(
 			origin: OriginFor<T>,
 			id: Vec<u8>,
 			when: T::BlockNumber,
@@ -426,7 +426,7 @@ pub mod pallet {
 		/// - Will use base weight of 100 which should be good for up to 30 scheduled calls
 		/// # </weight>
 		#[pallet::weight(<T as Config>::WeightInfo::cancel_named(T::MaxScheduledPerBlock::get()))]
-		pub(crate) fn cancel_named(origin: OriginFor<T>, id: Vec<u8>) -> DispatchResult {
+		pub fn cancel_named(origin: OriginFor<T>, id: Vec<u8>) -> DispatchResult {
 			T::ScheduleOrigin::ensure_origin(origin.clone())?;
 			let origin = <T as Config>::Origin::from(origin);
 			Self::do_cancel_named(Some(origin.caller().clone()), id)?;
@@ -439,7 +439,7 @@ pub mod pallet {
 		/// Same as [`schedule`].
 		/// # </weight>
 		#[pallet::weight(<T as Config>::WeightInfo::schedule(T::MaxScheduledPerBlock::get()))]
-		pub(crate) fn schedule_after(
+		pub fn schedule_after(
 			origin: OriginFor<T>,
 			after: T::BlockNumber,
 			maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
@@ -464,7 +464,7 @@ pub mod pallet {
 		/// Same as [`schedule_named`].
 		/// # </weight>
 		#[pallet::weight(<T as Config>::WeightInfo::schedule_named(T::MaxScheduledPerBlock::get()))]
-		pub(crate) fn schedule_named_after(
+		pub fn schedule_named_after(
 			origin: OriginFor<T>,
 			id: Vec<u8>,
 			after: T::BlockNumber,
diff --git a/frame/sudo/src/lib.rs b/frame/sudo/src/lib.rs
index 51cc1df05070..6f70ddda99f6 100644
--- a/frame/sudo/src/lib.rs
+++ b/frame/sudo/src/lib.rs
@@ -144,7 +144,7 @@ pub mod pallet {
 			let dispatch_info = call.get_dispatch_info();
 			(dispatch_info.weight.saturating_add(10_000), dispatch_info.class)
 		})]
-		pub(crate) fn sudo(
+		pub fn sudo(
 			origin: OriginFor<T>,
 			call: Box<<T as Config>::Call>,
 		) -> DispatchResultWithPostInfo {
@@ -169,7 +169,7 @@ pub mod pallet {
 		/// - The weight of this call is defined by the caller.
 		/// # </weight>
 		#[pallet::weight((*_weight, call.get_dispatch_info().class))]
-		pub(crate) fn sudo_unchecked_weight(
+		pub fn sudo_unchecked_weight(
 			origin: OriginFor<T>,
 			call: Box<<T as Config>::Call>,
 			_weight: Weight,
@@ -194,7 +194,7 @@ pub mod pallet {
 		/// - One DB change.
 		/// # </weight>
 		#[pallet::weight(0)]
-		pub(crate) fn set_key(
+		pub fn set_key(
 			origin: OriginFor<T>,
 			new: <T::Lookup as StaticLookup>::Source,
 		) -> DispatchResultWithPostInfo {
@@ -230,7 +230,7 @@ pub mod pallet {
 				dispatch_info.class,
 			)
 		})]
-		pub(crate) fn sudo_as(
+		pub fn sudo_as(
 			origin: OriginFor<T>,
 			who: <T::Lookup as StaticLookup>::Source,
 			call: Box<<T as Config>::Call>
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 4e830c26691e..1d4d7e461834 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -2071,7 +2071,7 @@ pub mod pallet_prelude {
 /// 	impl<T: Config<I>, I: 'static> Pallet<T, I> {
 /// 		/// Doc comment put in metadata
 /// 		#[pallet::weight(0)]
-/// 		fn toto(origin: OriginFor<T>, #[pallet::compact] _foo: u32) -> DispatchResultWithPostInfo {
+/// 		pub fn toto(origin: OriginFor<T>, #[pallet::compact] _foo: u32) -> DispatchResultWithPostInfo {
 /// 			let _ = origin;
 /// 			unimplemented!();
 /// 		}
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index f0597ea2fe0f..e3a110f2e7e2 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -301,7 +301,7 @@ pub mod pallet {
 		// TODO: This should only be available for testing, rather than in general usage, but
 		// that's not possible at present (since it's within the pallet macro).
 		#[pallet::weight(*_ratio * T::BlockWeights::get().max_block)]
-		pub(crate) fn fill_block(origin: OriginFor<T>, _ratio: Perbill) -> DispatchResultWithPostInfo {
+		pub fn fill_block(origin: OriginFor<T>, _ratio: Perbill) -> DispatchResultWithPostInfo {
 			ensure_root(origin)?;
 			Ok(().into())
 		}
@@ -312,7 +312,7 @@ pub mod pallet {
 		/// - `O(1)`
 		/// # </weight>
 		#[pallet::weight(T::SystemWeightInfo::remark(_remark.len() as u32))]
-		pub(crate) fn remark(origin: OriginFor<T>, _remark: Vec<u8>) -> DispatchResultWithPostInfo {
+		pub fn remark(origin: OriginFor<T>, _remark: Vec<u8>) -> DispatchResultWithPostInfo {
 			ensure_signed(origin)?;
 			Ok(().into())
 		}
@@ -326,7 +326,7 @@ pub mod pallet {
 		/// - 1 write to HEAP_PAGES
 		/// # </weight>
 		#[pallet::weight((T::SystemWeightInfo::set_heap_pages(), DispatchClass::Operational))]
-		pub(crate) fn set_heap_pages(origin: OriginFor<T>, pages: u64) -> DispatchResultWithPostInfo {
+		pub fn set_heap_pages(origin: OriginFor<T>, pages: u64) -> DispatchResultWithPostInfo {
 			ensure_root(origin)?;
 			storage::unhashed::put_raw(well_known_keys::HEAP_PAGES, &pages.encode());
 			Ok(().into())
@@ -414,7 +414,7 @@ pub mod pallet {
 			T::SystemWeightInfo::set_storage(items.len() as u32),
 			DispatchClass::Operational,
 		))]
-		pub(crate) fn set_storage(origin: OriginFor<T>, items: Vec<KeyValue>) -> DispatchResultWithPostInfo {
+		pub fn set_storage(origin: OriginFor<T>, items: Vec<KeyValue>) -> DispatchResultWithPostInfo {
 			ensure_root(origin)?;
 			for i in &items {
 				storage::unhashed::put_raw(&i.0, &i.1);
@@ -434,7 +434,7 @@ pub mod pallet {
 			T::SystemWeightInfo::kill_storage(keys.len() as u32),
 			DispatchClass::Operational,
 		))]
-		pub(crate) fn kill_storage(origin: OriginFor<T>, keys: Vec<Key>) -> DispatchResultWithPostInfo {
+		pub fn kill_storage(origin: OriginFor<T>, keys: Vec<Key>) -> DispatchResultWithPostInfo {
 			ensure_root(origin)?;
 			for key in &keys {
 				storage::unhashed::kill(&key);
@@ -457,7 +457,7 @@ pub mod pallet {
 			T::SystemWeightInfo::kill_prefix(_subkeys.saturating_add(1)),
 			DispatchClass::Operational,
 		))]
-		pub(crate) fn kill_prefix(
+		pub fn kill_prefix(
 			origin: OriginFor<T>,
 			prefix: Key,
 			_subkeys: u32,
@@ -474,7 +474,7 @@ pub mod pallet {
 		/// - 1 event.
 		/// # </weight>
 		#[pallet::weight(T::SystemWeightInfo::remark_with_event(remark.len() as u32))]
-		pub(crate) fn remark_with_event(origin: OriginFor<T>, remark: Vec<u8>) -> DispatchResultWithPostInfo {
+		pub fn remark_with_event(origin: OriginFor<T>, remark: Vec<u8>) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
 			let hash = T::Hashing::hash(&remark[..]);
 			Self::deposit_event(Event::Remarked(who, hash));
diff --git a/frame/timestamp/src/lib.rs b/frame/timestamp/src/lib.rs
index 3315fadb1c1c..f7dd7378d8ab 100644
--- a/frame/timestamp/src/lib.rs
+++ b/frame/timestamp/src/lib.rs
@@ -184,7 +184,7 @@ pub mod pallet {
 			T::WeightInfo::set(),
 			DispatchClass::Mandatory
 		))]
-		pub(super) fn set(origin: OriginFor<T>, #[pallet::compact] now: T::Moment) -> DispatchResult {
+		pub fn set(origin: OriginFor<T>, #[pallet::compact] now: T::Moment) -> DispatchResult {
 			ensure_none(origin)?;
 			assert!(!DidUpdate::<T>::exists(), "Timestamp must be updated only once in the block");
 			let prev = Self::now();
diff --git a/frame/transaction-storage/src/lib.rs b/frame/transaction-storage/src/lib.rs
index ef824a8399f5..97dfd76fe677 100644
--- a/frame/transaction-storage/src/lib.rs
+++ b/frame/transaction-storage/src/lib.rs
@@ -174,7 +174,7 @@ pub mod pallet {
 		/// Additionally contains a DB write.
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::store(data.len() as u32))]
-		pub(super) fn store(
+		pub fn store(
 			origin: OriginFor<T>,
 			data: Vec<u8>,
 		) -> DispatchResult {
@@ -220,7 +220,7 @@ pub mod pallet {
 		/// - Constant.
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::renew())]
-		pub(super) fn renew(
+		pub fn renew(
 			origin: OriginFor<T>,
 			block: T::BlockNumber,
 			index: u32,
@@ -261,7 +261,7 @@ pub mod pallet {
 		/// Here we assume a maximum of 100 probed transactions.
 		/// # </weight>
 		#[pallet::weight((T::WeightInfo::check_proof_max(), DispatchClass::Mandatory))]
-		pub(super) fn check_proof(
+		pub fn check_proof(
 			origin: OriginFor<T>,
 			proof: TransactionStorageProof,
 		) -> DispatchResultWithPostInfo {
diff --git a/frame/uniques/src/lib.rs b/frame/uniques/src/lib.rs
index f4a0228de4a8..28518843c96f 100644
--- a/frame/uniques/src/lib.rs
+++ b/frame/uniques/src/lib.rs
@@ -297,7 +297,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::create())]
-		pub(super) fn create(
+		pub fn create(
 			origin: OriginFor<T>,
 			#[pallet::compact] class: T::ClassId,
 			admin: <T::Lookup as StaticLookup>::Source,
@@ -346,7 +346,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::force_create())]
-		pub(super) fn force_create(
+		pub fn force_create(
 			origin: OriginFor<T>,
 			#[pallet::compact] class: T::ClassId,
 			owner: <T::Lookup as StaticLookup>::Source,
@@ -396,7 +396,7 @@ pub mod pallet {
  			witness.instance_metadatas,
 			witness.attributes,
  		))]
-		pub(super) fn destroy(
+		pub fn destroy(
 			origin: OriginFor<T>,
 			#[pallet::compact] class: T::ClassId,
 			witness: DestroyWitness,
@@ -441,7 +441,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::mint())]
-		pub(super) fn mint(
+		pub fn mint(
 			origin: OriginFor<T>,
 			#[pallet::compact] class: T::ClassId,
 			#[pallet::compact] instance: T::InstanceId,
@@ -470,7 +470,7 @@ pub mod pallet {
 		/// Weight: `O(1)`
 		/// Modes: `check_owner.is_some()`.
 		#[pallet::weight(T::WeightInfo::burn())]
-		pub(super) fn burn(
+		pub fn burn(
 			origin: OriginFor<T>,
 			#[pallet::compact] class: T::ClassId,
 			#[pallet::compact] instance: T::InstanceId,
@@ -503,7 +503,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::transfer())]
-		pub(super) fn transfer(
+		pub fn transfer(
 			origin: OriginFor<T>,
 			#[pallet::compact] class: T::ClassId,
 			#[pallet::compact] instance: T::InstanceId,
@@ -539,7 +539,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(instances.len())`
 		#[pallet::weight(T::WeightInfo::redeposit(instances.len() as u32))]
-		pub(super) fn redeposit(
+		pub fn redeposit(
 			origin: OriginFor<T>,
 			#[pallet::compact] class: T::ClassId,
 			instances: Vec<T::InstanceId>,
@@ -595,7 +595,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::freeze())]
-		pub(super) fn freeze(
+		pub fn freeze(
 			origin: OriginFor<T>,
 			#[pallet::compact] class: T::ClassId,
 			#[pallet::compact] instance: T::InstanceId,
@@ -625,7 +625,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::thaw())]
-		pub(super) fn thaw(
+		pub fn thaw(
 			origin: OriginFor<T>,
 			#[pallet::compact] class: T::ClassId,
 			#[pallet::compact] instance: T::InstanceId,
@@ -654,7 +654,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::freeze_class())]
-		pub(super) fn freeze_class(
+		pub fn freeze_class(
 			origin: OriginFor<T>,
 			#[pallet::compact] class: T::ClassId
 		) -> DispatchResult {
@@ -681,7 +681,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::thaw_class())]
-		pub(super) fn thaw_class(
+		pub fn thaw_class(
 			origin: OriginFor<T>,
 			#[pallet::compact] class: T::ClassId
 		) -> DispatchResult {
@@ -709,7 +709,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::transfer_ownership())]
-		pub(super) fn transfer_ownership(
+		pub fn transfer_ownership(
 			origin: OriginFor<T>,
 			#[pallet::compact] class: T::ClassId,
 			owner: <T::Lookup as StaticLookup>::Source,
@@ -751,7 +751,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::set_team())]
-		pub(super) fn set_team(
+		pub fn set_team(
 			origin: OriginFor<T>,
 			#[pallet::compact] class: T::ClassId,
 			issuer: <T::Lookup as StaticLookup>::Source,
@@ -788,7 +788,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::approve_transfer())]
-		pub(super) fn approve_transfer(
+		pub fn approve_transfer(
 			origin: OriginFor<T>,
 			#[pallet::compact] class: T::ClassId,
 			#[pallet::compact] instance: T::InstanceId,
@@ -835,7 +835,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::cancel_approval())]
-		pub(super) fn cancel_approval(
+		pub fn cancel_approval(
 			origin: OriginFor<T>,
 			#[pallet::compact] class: T::ClassId,
 			#[pallet::compact] instance: T::InstanceId,
@@ -882,7 +882,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::force_asset_status())]
-		pub(super) fn force_asset_status(
+		pub fn force_asset_status(
 			origin: OriginFor<T>,
 			#[pallet::compact] class: T::ClassId,
 			owner: <T::Lookup as StaticLookup>::Source,
@@ -927,7 +927,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::set_attribute())]
-		pub(super) fn set_attribute(
+		pub fn set_attribute(
 			origin: OriginFor<T>,
 			#[pallet::compact] class: T::ClassId,
 			maybe_instance: Option<T::InstanceId>,
@@ -992,7 +992,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::clear_attribute())]
-		pub(super) fn clear_attribute(
+		pub fn clear_attribute(
 			origin: OriginFor<T>,
 			#[pallet::compact] class: T::ClassId,
 			maybe_instance: Option<T::InstanceId>,
@@ -1041,7 +1041,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::set_metadata())]
-		pub(super) fn set_metadata(
+		pub fn set_metadata(
 			origin: OriginFor<T>,
 			#[pallet::compact] class: T::ClassId,
 			#[pallet::compact] instance: T::InstanceId,
@@ -1107,7 +1107,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::clear_metadata())]
-		pub(super) fn clear_metadata(
+		pub fn clear_metadata(
 			origin: OriginFor<T>,
 			#[pallet::compact] class: T::ClassId,
 			#[pallet::compact] instance: T::InstanceId,
@@ -1156,7 +1156,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::set_class_metadata())]
-		pub(super) fn set_class_metadata(
+		pub fn set_class_metadata(
 			origin: OriginFor<T>,
 			#[pallet::compact] class: T::ClassId,
 			data: BoundedVec<u8, T::StringLimit>,
@@ -1216,7 +1216,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`
 		#[pallet::weight(T::WeightInfo::clear_class_metadata())]
-		pub(super) fn clear_class_metadata(
+		pub fn clear_class_metadata(
 			origin: OriginFor<T>,
 			#[pallet::compact] class: T::ClassId,
 		) -> DispatchResult {

From 350ba1293319713f0587d7260863108c7e6e200e Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Sat, 12 Jun 2021 15:59:56 +0100
Subject: [PATCH 0866/1194] Fixes in Assets Pallet (#9059)

* upper bound witness with refund

* simple test

* track approvals

* dont allow approvals when asset is frozen

* destroy returns approval deposit

* update `NonTransfer` proxies

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_assets --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/assets/src/weights.rs --template=./.maintain/frame-weight-template.hbs

Co-authored-by: Parity Bot <admin@parity.io>
---
 bin/node/runtime/src/lib.rs |   2 +
 frame/assets/src/lib.rs     |  51 ++++++++++---
 frame/assets/src/tests.rs   |  76 +++++++++++++++++-
 frame/assets/src/weights.rs | 148 ++++++++++++++++++------------------
 4 files changed, 194 insertions(+), 83 deletions(-)

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 14bf16d19778..13189b1ff898 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -268,6 +268,8 @@ impl InstanceFilter<Call> for ProxyType {
 			ProxyType::NonTransfer => !matches!(
 				c,
 				Call::Balances(..) |
+				Call::Assets(..) |
+				Call::Uniques(..) |
 				Call::Vesting(pallet_vesting::Call::vested_transfer(..)) |
 				Call::Indices(pallet_indices::Call::transfer(..))
 			),
diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index afcdb5b054d0..44ecbe98a017 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -468,6 +468,10 @@ pub mod pallet {
 		///
 		/// Emits `Destroyed` event when successful.
 		///
+		/// NOTE: It can be helpful to first freeze an asset before destroying it so that you
+		/// can provide accurate witness information and prevent users from manipulating state
+		/// in a way that can make it harder to destroy.
+		///
 		/// Weight: `O(c + p + a)` where:
 		/// - `c = (witness.accounts - witness.sufficients)`
 		/// - `s = witness.sufficients`
@@ -481,7 +485,7 @@ pub mod pallet {
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId,
 			witness: DestroyWitness,
-		) -> DispatchResult {
+		) -> DispatchResultWithPostInfo {
 			let maybe_check_owner = match T::ForceOrigin::try_origin(origin) {
 				Ok(_) => None,
 				Err(origin) => Some(ensure_signed(origin)?),
@@ -491,9 +495,9 @@ pub mod pallet {
 				if let Some(check_owner) = maybe_check_owner {
 					ensure!(details.owner == check_owner, Error::<T, I>::NoPermission);
 				}
-				ensure!(details.accounts == witness.accounts, Error::<T, I>::BadWitness);
-				ensure!(details.sufficients == witness.sufficients, Error::<T, I>::BadWitness);
-				ensure!(details.approvals == witness.approvals, Error::<T, I>::BadWitness);
+				ensure!(details.accounts <= witness.accounts, Error::<T, I>::BadWitness);
+				ensure!(details.sufficients <= witness.sufficients, Error::<T, I>::BadWitness);
+				ensure!(details.approvals <= witness.approvals, Error::<T, I>::BadWitness);
 
 				for (who, v) in Account::<T, I>::drain_prefix(id) {
 					Self::dead_account(id, &who, &mut details, v.sufficient);
@@ -507,11 +511,18 @@ pub mod pallet {
 					details.deposit.saturating_add(metadata.deposit),
 				);
 
-				Approvals::<T, I>::remove_prefix((&id,));
+				for ((owner, _), approval) in Approvals::<T, I>::drain_prefix((&id,)) {
+					T::Currency::unreserve(&owner, approval.deposit);
+				}
 				Self::deposit_event(Event::Destroyed(id));
 
-				// NOTE: could use postinfo to reflect the actual number of accounts/sufficient/approvals
-				Ok(())
+				Ok(
+					Some(T::WeightInfo::destroy(
+						details.accounts.saturating_sub(details.sufficients),
+						details.sufficients,
+						details.approvals,
+					)).into()
+				)
 			})
 		}
 
@@ -1134,8 +1145,18 @@ pub mod pallet {
 			let owner = ensure_signed(origin)?;
 			let delegate = T::Lookup::lookup(delegate)?;
 
+			let mut d = Asset::<T, I>::get(id).ok_or(Error::<T, I>::Unknown)?;
+			ensure!(!d.is_frozen, Error::<T, I>::Frozen);
 			Approvals::<T, I>::try_mutate((id, &owner, &delegate), |maybe_approved| -> DispatchResult {
-				let mut approved = maybe_approved.take().unwrap_or_default();
+				let mut approved = match maybe_approved.take() {
+					// an approval already exists and is being updated
+					Some(a) => a,
+					// a new approval is created
+					None => {
+						d.approvals.saturating_inc();
+						Default::default()
+					}
+				};
 				let deposit_required = T::ApprovalDeposit::get();
 				if approved.deposit < deposit_required {
 					T::Currency::reserve(&owner, deposit_required - approved.deposit)?;
@@ -1145,6 +1166,7 @@ pub mod pallet {
 				*maybe_approved = Some(approved);
 				Ok(())
 			})?;
+			Asset::<T, I>::insert(id, d);
 			Self::deposit_event(Event::ApprovedTransfer(id, owner, delegate, amount));
 
 			Ok(())
@@ -1171,9 +1193,13 @@ pub mod pallet {
 		) -> DispatchResult {
 			let owner = ensure_signed(origin)?;
 			let delegate = T::Lookup::lookup(delegate)?;
+			let mut d = Asset::<T, I>::get(id).ok_or(Error::<T, I>::Unknown)?;
 			let approval = Approvals::<T, I>::take((id, &owner, &delegate)).ok_or(Error::<T, I>::Unknown)?;
 			T::Currency::unreserve(&owner, approval.deposit);
 
+			d.approvals.saturating_dec();
+			Asset::<T, I>::insert(id, d);
+
 			Self::deposit_event(Event::ApprovalCancelled(id, owner, delegate));
 			Ok(())
 		}
@@ -1198,11 +1224,11 @@ pub mod pallet {
 			owner: <T::Lookup as StaticLookup>::Source,
 			delegate: <T::Lookup as StaticLookup>::Source,
 		) -> DispatchResult {
+			let mut d = Asset::<T, I>::get(id).ok_or(Error::<T, I>::Unknown)?;
 			T::ForceOrigin::try_origin(origin)
 				.map(|_| ())
 				.or_else(|origin| -> DispatchResult {
 					let origin = ensure_signed(origin)?;
-					let d = Asset::<T, I>::get(id).ok_or(Error::<T, I>::Unknown)?;
 					ensure!(&origin == &d.admin, Error::<T, I>::NoPermission);
 					Ok(())
 				})?;
@@ -1212,6 +1238,8 @@ pub mod pallet {
 
 			let approval = Approvals::<T, I>::take((id, &owner, &delegate)).ok_or(Error::<T, I>::Unknown)?;
 			T::Currency::unreserve(&owner, approval.deposit);
+			d.approvals.saturating_dec();
+			Asset::<T, I>::insert(id, d);
 
 			Self::deposit_event(Event::ApprovalCancelled(id, owner, delegate));
 			Ok(())
@@ -1263,6 +1291,11 @@ pub mod pallet {
 
 				if remaining.is_zero() {
 					T::Currency::unreserve(&owner, approved.deposit);
+					Asset::<T, I>::mutate(id, |maybe_details| {
+						if let Some(details) = maybe_details {
+							details.approvals.saturating_dec();
+						}
+					});
 				} else {
 					approved.amount = remaining;
 					*maybe_approved = Some(approved);
diff --git a/frame/assets/src/tests.rs b/frame/assets/src/tests.rs
index 6bef5b962de7..b561864c8e48 100644
--- a/frame/assets/src/tests.rs
+++ b/frame/assets/src/tests.rs
@@ -37,19 +37,47 @@ fn basic_minting_should_work() {
 #[test]
 fn approval_lifecycle_works() {
 	new_test_ext().execute_with(|| {
+		// can't approve non-existent token
+		assert_noop!(Assets::approve_transfer(Origin::signed(1), 0, 2, 50), Error::<Test>::Unknown);
+		// so we create it :)
 		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
 		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
 		Balances::make_free_balance_be(&1, 1);
 		assert_ok!(Assets::approve_transfer(Origin::signed(1), 0, 2, 50));
+		assert_eq!(Asset::<Test>::get(0).unwrap().approvals, 1);
 		assert_eq!(Balances::reserved_balance(&1), 1);
 		assert_ok!(Assets::transfer_approved(Origin::signed(2), 0, 1, 3, 40));
+		assert_eq!(Asset::<Test>::get(0).unwrap().approvals, 1);
 		assert_ok!(Assets::cancel_approval(Origin::signed(1), 0, 2));
+		assert_eq!(Asset::<Test>::get(0).unwrap().approvals, 0);
 		assert_eq!(Assets::balance(0, 1), 60);
 		assert_eq!(Assets::balance(0, 3), 40);
 		assert_eq!(Balances::reserved_balance(&1), 0);
 	});
 }
 
+#[test]
+fn transfer_approved_all_funds() {
+	new_test_ext().execute_with(|| {
+		// can't approve non-existent token
+		assert_noop!(Assets::approve_transfer(Origin::signed(1), 0, 2, 50), Error::<Test>::Unknown);
+		// so we create it :)
+		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
+		Balances::make_free_balance_be(&1, 1);
+		assert_ok!(Assets::approve_transfer(Origin::signed(1), 0, 2, 50));
+		assert_eq!(Asset::<Test>::get(0).unwrap().approvals, 1);
+		assert_eq!(Balances::reserved_balance(&1), 1);
+
+		// transfer the full amount, which should trigger auto-cleanup
+		assert_ok!(Assets::transfer_approved(Origin::signed(2), 0, 1, 3, 50));
+		assert_eq!(Asset::<Test>::get(0).unwrap().approvals, 0);
+		assert_eq!(Assets::balance(0, 1), 50);
+		assert_eq!(Assets::balance(0, 3), 50);
+		assert_eq!(Balances::reserved_balance(&1), 0);
+	});
+}
+
 #[test]
 fn approval_deposits_work() {
 	new_test_ext().execute_with(|| {
@@ -102,10 +130,13 @@ fn cancel_approval_works() {
 		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
 		Balances::make_free_balance_be(&1, 1);
 		assert_ok!(Assets::approve_transfer(Origin::signed(1), 0, 2, 50));
+		assert_eq!(Asset::<Test>::get(0).unwrap().approvals, 1);
 		assert_noop!(Assets::cancel_approval(Origin::signed(1), 1, 2), Error::<Test>::Unknown);
 		assert_noop!(Assets::cancel_approval(Origin::signed(2), 0, 2), Error::<Test>::Unknown);
 		assert_noop!(Assets::cancel_approval(Origin::signed(1), 0, 3), Error::<Test>::Unknown);
+		assert_eq!(Asset::<Test>::get(0).unwrap().approvals, 1);
 		assert_ok!(Assets::cancel_approval(Origin::signed(1), 0, 2));
+		assert_eq!(Asset::<Test>::get(0).unwrap().approvals, 0);
 		assert_noop!(Assets::cancel_approval(Origin::signed(1), 0, 2), Error::<Test>::Unknown);
 	});
 }
@@ -117,12 +148,15 @@ fn force_cancel_approval_works() {
 		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
 		Balances::make_free_balance_be(&1, 1);
 		assert_ok!(Assets::approve_transfer(Origin::signed(1), 0, 2, 50));
+		assert_eq!(Asset::<Test>::get(0).unwrap().approvals, 1);
 		let e = Error::<Test>::NoPermission;
 		assert_noop!(Assets::force_cancel_approval(Origin::signed(2), 0, 1, 2), e);
 		assert_noop!(Assets::force_cancel_approval(Origin::signed(1), 1, 1, 2), Error::<Test>::Unknown);
 		assert_noop!(Assets::force_cancel_approval(Origin::signed(1), 0, 2, 2), Error::<Test>::Unknown);
 		assert_noop!(Assets::force_cancel_approval(Origin::signed(1), 0, 1, 3), Error::<Test>::Unknown);
+		assert_eq!(Asset::<Test>::get(0).unwrap().approvals, 1);
 		assert_ok!(Assets::force_cancel_approval(Origin::signed(1), 0, 1, 2));
+		assert_eq!(Asset::<Test>::get(0).unwrap().approvals, 0);
 		assert_noop!(Assets::force_cancel_approval(Origin::signed(1), 0, 1, 2), Error::<Test>::Unknown);
 	});
 }
@@ -180,9 +214,35 @@ fn destroy_with_bad_witness_should_not_work() {
 	new_test_ext().execute_with(|| {
 		Balances::make_free_balance_be(&1, 100);
 		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
-		let w = Asset::<Test>::get(0).unwrap().destroy_witness();
+		let mut w = Asset::<Test>::get(0).unwrap().destroy_witness();
 		assert_ok!(Assets::mint(Origin::signed(1), 0, 10, 100));
+		// witness too low
 		assert_noop!(Assets::destroy(Origin::signed(1), 0, w), Error::<Test>::BadWitness);
+		// witness too high is okay though
+		w.accounts += 2;
+		w.sufficients += 2;
+		assert_ok!(Assets::destroy(Origin::signed(1), 0, w));
+
+	});
+}
+
+#[test]
+fn destroy_should_refund_approvals() {
+	new_test_ext().execute_with(|| {
+		Balances::make_free_balance_be(&1, 100);
+		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 10, 100));
+		assert_ok!(Assets::approve_transfer(Origin::signed(1), 0, 2, 50));
+		assert_ok!(Assets::approve_transfer(Origin::signed(1), 0, 3, 50));
+		assert_ok!(Assets::approve_transfer(Origin::signed(1), 0, 4, 50));
+		assert_eq!(Balances::reserved_balance(&1), 3);
+
+		let w = Asset::<Test>::get(0).unwrap().destroy_witness();
+		assert_ok!(Assets::destroy(Origin::signed(1), 0, w));
+		assert_eq!(Balances::reserved_balance(&1), 0);
+
+		// all approvals are removed
+		assert!(Approvals::<Test>::iter().count().is_zero())
 	});
 }
 
@@ -306,6 +366,20 @@ fn transferring_frozen_asset_should_not_work() {
 	});
 }
 
+#[test]
+fn approve_transfer_frozen_asset_should_not_work() {
+	new_test_ext().execute_with(|| {
+		Balances::make_free_balance_be(&1, 100);
+		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
+		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
+		assert_eq!(Assets::balance(0, 1), 100);
+		assert_ok!(Assets::freeze_asset(Origin::signed(1), 0));
+		assert_noop!(Assets::approve_transfer(Origin::signed(1), 0, 2, 50), Error::<Test>::Frozen);
+		assert_ok!(Assets::thaw_asset(Origin::signed(1), 0));
+		assert_ok!(Assets::approve_transfer(Origin::signed(1), 0, 2, 50));
+	});
+}
+
 #[test]
 fn origin_guards_should_work() {
 	new_test_ext().execute_with(|| {
diff --git a/frame/assets/src/weights.rs b/frame/assets/src/weights.rs
index c3c804a392db..77db7fa4f05b 100644
--- a/frame/assets/src/weights.rs
+++ b/frame/assets/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_assets
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-03-08, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-06-10, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -73,267 +73,269 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn create() -> Weight {
-		(48_305_000 as Weight)
+		(52_735_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_create() -> Weight {
-		(23_827_000 as Weight)
+		(26_570_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn destroy(c: u32, s: u32, a: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 38_000
-			.saturating_add((24_232_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 38_000
-			.saturating_add((30_467_000 as Weight).saturating_mul(s as Weight))
-			// Standard Error: 383_000
-			.saturating_add((2_343_000 as Weight).saturating_mul(a as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			// Standard Error: 93_000
+			.saturating_add((31_110_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 93_000
+			.saturating_add((38_908_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 935_000
+			.saturating_add((42_765_000 as Weight).saturating_mul(a as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(c as Weight)))
 			.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(s as Weight)))
+			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(a as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(c as Weight)))
 			.saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(s as Weight)))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(a as Weight)))
 	}
 	fn mint() -> Weight {
-		(46_433_000 as Weight)
+		(58_399_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn burn() -> Weight {
-		(46_000_000 as Weight)
+		(65_917_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn transfer() -> Weight {
-		(70_793_000 as Weight)
+		(100_407_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn transfer_keep_alive() -> Weight {
-		(57_453_000 as Weight)
+		(84_243_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn force_transfer() -> Weight {
-		(70_968_000 as Weight)
+		(100_407_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn freeze() -> Weight {
-		(34_290_000 as Weight)
+		(37_831_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn thaw() -> Weight {
-		(34_419_000 as Weight)
+		(37_660_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn freeze_asset() -> Weight {
-		(24_373_000 as Weight)
+		(27_175_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn thaw_asset() -> Weight {
-		(24_096_000 as Weight)
+		(26_884_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn transfer_ownership() -> Weight {
-		(28_566_000 as Weight)
+		(31_877_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_team() -> Weight {
-		(25_297_000 as Weight)
+		(27_947_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_metadata(_n: u32, s: u32, ) -> Weight {
-		(53_367_000 as Weight)
+		(57_993_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((8_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((12_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn clear_metadata() -> Weight {
-		(51_721_000 as Weight)
+		(57_820_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_set_metadata(_n: u32, s: u32, ) -> Weight {
-		(27_117_000 as Weight)
+		(30_830_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((5_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((7_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_clear_metadata() -> Weight {
-		(51_598_000 as Weight)
+		(57_292_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_asset_status() -> Weight {
-		(23_366_000 as Weight)
+		(26_750_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn approve_transfer() -> Weight {
-		(47_906_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+		(65_598_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn transfer_approved() -> Weight {
-		(90_338_000 as Weight)
+		(131_312_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
 	fn cancel_approval() -> Weight {
-		(48_591_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+		(66_904_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn force_cancel_approval() -> Weight {
-		(54_879_000 as Weight)
+		(67_525_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn create() -> Weight {
-		(48_305_000 as Weight)
+		(52_735_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_create() -> Weight {
-		(23_827_000 as Weight)
+		(26_570_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn destroy(c: u32, s: u32, a: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 38_000
-			.saturating_add((24_232_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 38_000
-			.saturating_add((30_467_000 as Weight).saturating_mul(s as Weight))
-			// Standard Error: 383_000
-			.saturating_add((2_343_000 as Weight).saturating_mul(a as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			// Standard Error: 93_000
+			.saturating_add((31_110_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 93_000
+			.saturating_add((38_908_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 935_000
+			.saturating_add((42_765_000 as Weight).saturating_mul(a as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(c as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(s as Weight)))
+			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(a as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((2 as Weight).saturating_mul(c as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((2 as Weight).saturating_mul(s as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(a as Weight)))
 	}
 	fn mint() -> Weight {
-		(46_433_000 as Weight)
+		(58_399_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn burn() -> Weight {
-		(46_000_000 as Weight)
+		(65_917_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn transfer() -> Weight {
-		(70_793_000 as Weight)
+		(100_407_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn transfer_keep_alive() -> Weight {
-		(57_453_000 as Weight)
+		(84_243_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn force_transfer() -> Weight {
-		(70_968_000 as Weight)
+		(100_407_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn freeze() -> Weight {
-		(34_290_000 as Weight)
+		(37_831_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn thaw() -> Weight {
-		(34_419_000 as Weight)
+		(37_660_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn freeze_asset() -> Weight {
-		(24_373_000 as Weight)
+		(27_175_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn thaw_asset() -> Weight {
-		(24_096_000 as Weight)
+		(26_884_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn transfer_ownership() -> Weight {
-		(28_566_000 as Weight)
+		(31_877_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_team() -> Weight {
-		(25_297_000 as Weight)
+		(27_947_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_metadata(_n: u32, s: u32, ) -> Weight {
-		(53_367_000 as Weight)
+		(57_993_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((8_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((12_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn clear_metadata() -> Weight {
-		(51_721_000 as Weight)
+		(57_820_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_set_metadata(_n: u32, s: u32, ) -> Weight {
-		(27_117_000 as Weight)
+		(30_830_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((5_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((7_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_clear_metadata() -> Weight {
-		(51_598_000 as Weight)
+		(57_292_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_asset_status() -> Weight {
-		(23_366_000 as Weight)
+		(26_750_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn approve_transfer() -> Weight {
-		(47_906_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+		(65_598_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn transfer_approved() -> Weight {
-		(90_338_000 as Weight)
+		(131_312_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}
 	fn cancel_approval() -> Weight {
-		(48_591_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+		(66_904_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn force_cancel_approval() -> Weight {
-		(54_879_000 as Weight)
+		(67_525_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 }

From 1f16a6a41b973bbdd800ce07ac68c6055400a321 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Sat, 12 Jun 2021 16:58:36 +0100
Subject: [PATCH 0867/1194] im-online: send heartbeats at a random period
 (#8819)

* im-online: send heartbeats at a random period

* support: use permill to represent session progress

* im-online: increase probability of heartbeating with session progress

* babe, session: fix tests

* babe: fix test
---
 frame/babe/src/lib.rs                  |  6 +-
 frame/babe/src/tests.rs                |  6 +-
 frame/im-online/src/lib.rs             | 44 +++++++++----
 frame/im-online/src/mock.rs            |  6 +-
 frame/im-online/src/tests.rs           | 86 +++++++++++++++++++++++++-
 frame/session/src/lib.rs               |  8 +--
 frame/session/src/tests.rs             | 14 ++---
 frame/support/src/traits/validation.rs |  6 +-
 8 files changed, 140 insertions(+), 36 deletions(-)

diff --git a/frame/babe/src/lib.rs b/frame/babe/src/lib.rs
index a0a9e01eaa26..6ec199925be1 100644
--- a/frame/babe/src/lib.rs
+++ b/frame/babe/src/lib.rs
@@ -31,7 +31,7 @@ use sp_application_crypto::Public;
 use sp_runtime::{
 	generic::DigestItem,
 	traits::{IsMember, One, SaturatedConversion, Saturating, Zero},
-	ConsensusEngineId, KeyTypeId, Percent,
+	ConsensusEngineId, KeyTypeId, Permill,
 };
 use sp_session::{GetSessionNumber, GetValidatorCount};
 use sp_std::prelude::*;
@@ -848,11 +848,11 @@ impl<T: Config> frame_support::traits::EstimateNextSessionRotation<T::BlockNumbe
 		T::EpochDuration::get().saturated_into()
 	}
 
-	fn estimate_current_session_progress(_now: T::BlockNumber) -> (Option<Percent>, Weight) {
+	fn estimate_current_session_progress(_now: T::BlockNumber) -> (Option<Permill>, Weight) {
 		let elapsed = CurrentSlot::<T>::get().saturating_sub(Self::current_epoch_start()) + 1;
 
 		(
-			Some(Percent::from_rational(
+			Some(Permill::from_rational(
 				*elapsed,
 				T::EpochDuration::get(),
 			)),
diff --git a/frame/babe/src/tests.rs b/frame/babe/src/tests.rs
index 6aa80e969733..dfb398a4f477 100644
--- a/frame/babe/src/tests.rs
+++ b/frame/babe/src/tests.rs
@@ -236,10 +236,10 @@ fn can_estimate_current_epoch_progress() {
 			if Babe::estimate_next_session_rotation(i).0.unwrap() - 1 == i {
 				assert_eq!(
 					Babe::estimate_current_session_progress(i).0.unwrap(),
-					Percent::from_percent(100)
+					Permill::from_percent(100)
 				);
 			} else {
-				assert!(Babe::estimate_current_session_progress(i).0.unwrap() < Percent::from_percent(100));
+				assert!(Babe::estimate_current_session_progress(i).0.unwrap() < Permill::from_percent(100));
 			}
 		}
 
@@ -247,7 +247,7 @@ fn can_estimate_current_epoch_progress() {
 		progress_to_block(4);
 		assert_eq!(
 			Babe::estimate_current_session_progress(4).0.unwrap(),
-			Percent::from_percent(33),
+			Permill::from_float(1.0 / 3.0),
 		);
 	})
 }
diff --git a/frame/im-online/src/lib.rs b/frame/im-online/src/lib.rs
index bddb286fad73..e132f7f929a0 100644
--- a/frame/im-online/src/lib.rs
+++ b/frame/im-online/src/lib.rs
@@ -81,8 +81,8 @@ use sp_std::prelude::*;
 use sp_std::convert::TryInto;
 use sp_runtime::{
 	offchain::storage::StorageValueRef,
-	traits::{AtLeast32BitUnsigned, Convert, Saturating},
-	Perbill, Percent, RuntimeDebug,
+	traits::{AtLeast32BitUnsigned, Convert, Saturating, TrailingZeroInput},
+	Perbill, Permill, PerThing, RuntimeDebug, SaturatedConversion,
 };
 use sp_staking::{
 	SessionIndex,
@@ -571,23 +571,46 @@ impl<T: Config> Pallet<T> {
 	pub(crate) fn send_heartbeats(
 		block_number: T::BlockNumber,
 	) -> OffchainResult<T, impl Iterator<Item = OffchainResult<T, ()>>> {
-		const HALF_SESSION: Percent = Percent::from_percent(50);
+		const START_HEARTBEAT_RANDOM_PERIOD: Permill = Permill::from_percent(10);
+		const START_HEARTBEAT_FINAL_PERIOD: Permill = Permill::from_percent(80);
+
+		// this should give us a residual probability of 1/SESSION_LENGTH of sending an heartbeat,
+		// i.e. all heartbeats spread uniformly, over most of the session. as the session progresses
+		// the probability of sending an heartbeat starts to increase exponentially.
+		let random_choice = |progress: Permill| {
+			// given session progress `p` and session length `l`
+			// the threshold formula is: p^6 + 1/l
+			let session_length = T::NextSessionRotation::average_session_length();
+			let residual = Permill::from_rational(1u32, session_length.saturated_into());
+			let threshold: Permill = progress.saturating_pow(6).saturating_add(residual);
+
+			let seed = sp_io::offchain::random_seed();
+			let random = <u32>::decode(&mut TrailingZeroInput::new(seed.as_ref()))
+				.expect("input is padded with zeroes; qed");
+			let random = Permill::from_parts(random % Permill::ACCURACY);
+
+			random <= threshold
+		};
 
-		let too_early = if let (Some(progress), _) =
+		let should_heartbeat = if let (Some(progress), _) =
 			T::NextSessionRotation::estimate_current_session_progress(block_number)
 		{
-			// we try to get an estimate of the current session progress first since it
-			// should provide more accurate results and send the heartbeat if we're halfway
-			// through the session.
-			progress < HALF_SESSION
+			// we try to get an estimate of the current session progress first since it should
+			// provide more accurate results. we will start an early heartbeat period where we'll
+			// randomly pick whether to heartbeat. after 80% of the session has elapsed, if we
+			// haven't sent an heartbeat yet we'll send one unconditionally. the idea is to prevent
+			// all nodes from sending the heartbeats at the same block and causing a temporary (but
+			// deterministic) spike in transactions.
+			progress >= START_HEARTBEAT_FINAL_PERIOD
+				|| progress >= START_HEARTBEAT_RANDOM_PERIOD && random_choice(progress)
 		} else {
 			// otherwise we fallback to using the block number calculated at the beginning
 			// of the session that should roughly correspond to the middle of the session
 			let heartbeat_after = <HeartbeatAfter<T>>::get();
-			block_number < heartbeat_after
+			block_number >= heartbeat_after
 		};
 
-		if too_early {
+		if !should_heartbeat {
 			return Err(OffchainErr::TooEarly);
 		}
 
@@ -607,7 +630,6 @@ impl<T: Config> Pallet<T> {
 		)
 	}
 
-
 	fn send_single_heartbeat(
 		authority_index: u32,
 		key: T::AuthorityId,
diff --git a/frame/im-online/src/mock.rs b/frame/im-online/src/mock.rs
index 4f21012abc51..4bc976476a67 100644
--- a/frame/im-online/src/mock.rs
+++ b/frame/im-online/src/mock.rs
@@ -26,7 +26,7 @@ use pallet_session::historical as pallet_session_historical;
 use sp_core::H256;
 use sp_runtime::testing::{Header, TestXt, UintAuthorityId};
 use sp_runtime::traits::{BlakeTwo256, ConvertInto, IdentityLookup};
-use sp_runtime::{Perbill, Percent};
+use sp_runtime::{Perbill, Permill};
 use sp_staking::{
 	offence::{OffenceError, ReportOffence},
 	SessionIndex,
@@ -182,7 +182,7 @@ impl pallet_authorship::Config for Runtime {
 }
 
 thread_local! {
-	pub static MOCK_CURRENT_SESSION_PROGRESS: RefCell<Option<Option<Percent>>> = RefCell::new(None);
+	pub static MOCK_CURRENT_SESSION_PROGRESS: RefCell<Option<Option<Permill>>> = RefCell::new(None);
 }
 
 thread_local! {
@@ -199,7 +199,7 @@ impl frame_support::traits::EstimateNextSessionRotation<u64> for TestNextSession
 		mock.unwrap_or(pallet_session::PeriodicSessions::<Period, Offset>::average_session_length())
 	}
 
-	fn estimate_current_session_progress(now: u64) -> (Option<Percent>, Weight) {
+	fn estimate_current_session_progress(now: u64) -> (Option<Permill>, Weight) {
 		let (estimate, weight) =
 			pallet_session::PeriodicSessions::<Period, Offset>::estimate_current_session_progress(
 				now,
diff --git a/frame/im-online/src/tests.rs b/frame/im-online/src/tests.rs
index f100bd71c34f..5fb8fd3a791e 100644
--- a/frame/im-online/src/tests.rs
+++ b/frame/im-online/src/tests.rs
@@ -433,10 +433,92 @@ fn should_handle_non_linear_session_progress() {
 		assert!(ImOnline::send_heartbeats(5).ok().is_some());
 
 		// if we have a valid current session progress then we'll heartbeat as soon
-		// as we're past 50% of the session regardless of the block number
+		// as we're past 80% of the session regardless of the block number
 		MOCK_CURRENT_SESSION_PROGRESS
-			.with(|p| *p.borrow_mut() = Some(Some(Percent::from_percent(51))));
+			.with(|p| *p.borrow_mut() = Some(Some(Permill::from_percent(81))));
 
 		assert!(ImOnline::send_heartbeats(2).ok().is_some());
 	});
 }
+
+#[test]
+fn test_does_not_heartbeat_early_in_the_session() {
+	let mut ext = new_test_ext();
+	let (offchain, _state) = TestOffchainExt::new();
+	let (pool, _) = TestTransactionPoolExt::new();
+	ext.register_extension(OffchainDbExt::new(offchain.clone()));
+	ext.register_extension(OffchainWorkerExt::new(offchain));
+	ext.register_extension(TransactionPoolExt::new(pool));
+
+	ext.execute_with(|| {
+		// mock current session progress as being 5%. we only randomly start
+		// heartbeating after 10% of the session has elapsed.
+		MOCK_CURRENT_SESSION_PROGRESS.with(|p| *p.borrow_mut() = Some(Some(Permill::from_float(0.05))));
+		assert_eq!(
+			ImOnline::send_heartbeats(2).err(),
+			Some(OffchainErr::TooEarly),
+		);
+	});
+}
+
+#[test]
+fn test_probability_of_heartbeating_increases_with_session_progress() {
+	let mut ext = new_test_ext();
+	let (offchain, state) = TestOffchainExt::new();
+	let (pool, _) = TestTransactionPoolExt::new();
+	ext.register_extension(OffchainDbExt::new(offchain.clone()));
+	ext.register_extension(OffchainWorkerExt::new(offchain));
+	ext.register_extension(TransactionPoolExt::new(pool));
+
+	ext.execute_with(|| {
+		let set_test = |progress, random: f64| {
+			// the average session length is 100 blocks, therefore the residual
+			// probability of sending a heartbeat is 1%
+			MOCK_AVERAGE_SESSION_LENGTH.with(|p| *p.borrow_mut() = Some(100));
+			MOCK_CURRENT_SESSION_PROGRESS.with(|p| *p.borrow_mut() =
+				Some(Some(Permill::from_float(progress))));
+
+			let mut seed = [0u8; 32];
+			let encoded = ((random * Permill::ACCURACY as f64) as u32).encode();
+			seed[0..4].copy_from_slice(&encoded);
+			state.write().seed = seed;
+		};
+
+		let assert_too_early = |progress, random| {
+			set_test(progress, random);
+			assert_eq!(
+				ImOnline::send_heartbeats(2).err(),
+				Some(OffchainErr::TooEarly),
+			);
+		};
+
+		let assert_heartbeat_ok = |progress, random| {
+			set_test(progress, random);
+			assert!(ImOnline::send_heartbeats(2).ok().is_some());
+		};
+
+		assert_too_early(0.05, 1.0);
+
+		assert_too_early(0.1, 0.1);
+		assert_too_early(0.1, 0.011);
+		assert_heartbeat_ok(0.1, 0.010);
+
+		assert_too_early(0.4, 0.015);
+		assert_heartbeat_ok(0.4, 0.014);
+
+		assert_too_early(0.5, 0.026);
+		assert_heartbeat_ok(0.5, 0.025);
+
+		assert_too_early(0.6, 0.057);
+		assert_heartbeat_ok(0.6, 0.056);
+
+		assert_too_early(0.65, 0.086);
+		assert_heartbeat_ok(0.65, 0.085);
+
+		assert_too_early(0.7, 0.13);
+		assert_heartbeat_ok(0.7, 0.12);
+
+		assert_too_early(0.75, 0.19);
+		assert_heartbeat_ok(0.75, 0.18);
+	});
+}
diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs
index 8574979ef2fe..547d29715d9c 100644
--- a/frame/session/src/lib.rs
+++ b/frame/session/src/lib.rs
@@ -118,7 +118,7 @@ use sp_std::{prelude::*, marker::PhantomData, ops::{Sub, Rem}};
 use codec::Decode;
 use sp_runtime::{
 	traits::{AtLeast32BitUnsigned, Convert, Member, One, OpaqueKeys, Zero},
-	KeyTypeId, Perbill, Percent, RuntimeAppPublic,
+	KeyTypeId, Perbill, Permill, RuntimeAppPublic,
 };
 use sp_staking::SessionIndex;
 use frame_support::{
@@ -168,7 +168,7 @@ impl<
 		Period::get()
 	}
 
-	fn estimate_current_session_progress(now: BlockNumber) -> (Option<Percent>, Weight) {
+	fn estimate_current_session_progress(now: BlockNumber) -> (Option<Permill>, Weight) {
 		let offset = Offset::get();
 		let period = Period::get();
 
@@ -177,12 +177,12 @@ impl<
 		// (0% is never returned).
 		let progress = if now >= offset {
 			let current = (now - offset) % period.clone() + One::one();
-			Some(Percent::from_rational(
+			Some(Permill::from_rational(
 				current.clone(),
 				period.clone(),
 			))
 		} else {
-			Some(Percent::from_rational(
+			Some(Permill::from_rational(
 				now + One::one(),
 				offset,
 			))
diff --git a/frame/session/src/tests.rs b/frame/session/src/tests.rs
index f48388b5a002..a551e1a4a261 100644
--- a/frame/session/src/tests.rs
+++ b/frame/session/src/tests.rs
@@ -274,11 +274,11 @@ fn periodic_session_works() {
 		if P::estimate_next_session_rotation(i).0.unwrap() - 1 == i {
 			assert_eq!(
 				P::estimate_current_session_progress(i).0.unwrap(),
-				Percent::from_percent(100)
+				Permill::from_percent(100)
 			);
 		} else {
 			assert!(
-				P::estimate_current_session_progress(i).0.unwrap() < Percent::from_percent(100)
+				P::estimate_current_session_progress(i).0.unwrap() < Permill::from_percent(100)
 			);
 		}
 	}
@@ -290,7 +290,7 @@ fn periodic_session_works() {
 	assert_eq!(P::estimate_next_session_rotation(3u64).0.unwrap(), 3);
 	assert_eq!(
 		P::estimate_current_session_progress(3u64).0.unwrap(),
-		Percent::from_percent(10),
+		Permill::from_percent(10),
 	);
 
 	for i in (1u64..10).map(|i| 3 + i) {
@@ -302,11 +302,11 @@ fn periodic_session_works() {
 		if P::estimate_next_session_rotation(i).0.unwrap() - 1 == i {
 			assert_eq!(
 				P::estimate_current_session_progress(i).0.unwrap(),
-				Percent::from_percent(100)
+				Permill::from_percent(100)
 			);
 		} else {
 			assert!(
-				P::estimate_current_session_progress(i).0.unwrap() < Percent::from_percent(100)
+				P::estimate_current_session_progress(i).0.unwrap() < Permill::from_percent(100)
 			);
 		}
 	}
@@ -316,14 +316,14 @@ fn periodic_session_works() {
 	assert_eq!(P::estimate_next_session_rotation(13u64).0.unwrap(), 23);
 	assert_eq!(
 		P::estimate_current_session_progress(13u64).0.unwrap(),
-		Percent::from_percent(10)
+		Permill::from_percent(10)
 	);
 
 	assert!(!P::should_end_session(14u64));
 	assert_eq!(P::estimate_next_session_rotation(14u64).0.unwrap(), 23);
 	assert_eq!(
 		P::estimate_current_session_progress(14u64).0.unwrap(),
-		Percent::from_percent(20)
+		Permill::from_percent(20)
 	);
 }
 
diff --git a/frame/support/src/traits/validation.rs b/frame/support/src/traits/validation.rs
index 900be7bb8e7e..d0583d6991fe 100644
--- a/frame/support/src/traits/validation.rs
+++ b/frame/support/src/traits/validation.rs
@@ -20,7 +20,7 @@
 use sp_std::prelude::*;
 use codec::{Codec, Decode};
 use sp_runtime::traits::{Convert, Zero};
-use sp_runtime::{BoundToRuntimeAppPublic, ConsensusEngineId, Percent, RuntimeAppPublic};
+use sp_runtime::{BoundToRuntimeAppPublic, ConsensusEngineId, Permill, RuntimeAppPublic};
 use sp_staking::SessionIndex;
 use crate::dispatch::Parameter;
 use crate::weights::Weight;
@@ -126,7 +126,7 @@ pub trait EstimateNextSessionRotation<BlockNumber> {
 	/// Return an estimate of the current session progress.
 	///
 	/// None should be returned if the estimation fails to come to an answer.
-	fn estimate_current_session_progress(now: BlockNumber) -> (Option<Percent>, Weight);
+	fn estimate_current_session_progress(now: BlockNumber) -> (Option<Permill>, Weight);
 
 	/// Return the block number at which the next session rotation is estimated to happen.
 	///
@@ -139,7 +139,7 @@ impl<BlockNumber: Zero> EstimateNextSessionRotation<BlockNumber> for () {
 		Zero::zero()
 	}
 
-	fn estimate_current_session_progress(_: BlockNumber) -> (Option<Percent>, Weight) {
+	fn estimate_current_session_progress(_: BlockNumber) -> (Option<Permill>, Weight) {
 		(None, Zero::zero())
 	}
 

From 9e42949aeb8779a36a4c1f8cff037570815f9aff Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Sat, 12 Jun 2021 18:15:21 +0200
Subject: [PATCH 0868/1194] Enforce pub calls in pallets (#9085)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* make all extrinsics public so they are available from outside

* Impl

* fix

* more fix

* more pub

* few more

* merge fix

* fix ui test

* fix ui test

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Bastian Köcher <info@kchr.de>
---
 frame/authorship/src/lib.rs                   |  2 +-
 .../election-provider-multi-phase/src/lib.rs  |  2 +-
 frame/grandpa/src/lib.rs                      |  4 +--
 frame/scheduler/src/lib.rs                    |  4 +--
 frame/staking/src/lib.rs                      |  2 +-
 frame/sudo/src/mock.rs                        |  4 +--
 .../procedural/src/pallet/parse/call.rs       | 12 ++++++++
 frame/support/src/lib.rs                      |  4 +--
 frame/support/test/tests/pallet.rs            |  8 ++---
 .../test/tests/pallet_compatibility.rs        |  2 +-
 .../tests/pallet_compatibility_instance.rs    |  2 +-
 frame/support/test/tests/pallet_instance.rs   |  4 +--
 .../pallet_ui/call_argument_invalid_bound.rs  |  2 +-
 .../call_argument_invalid_bound.stderr        | 18 +++++------
 .../call_argument_invalid_bound_2.rs          |  2 +-
 .../call_argument_invalid_bound_2.stderr      | 30 +++++++++----------
 .../call_argument_invalid_bound_3.rs          |  2 +-
 .../call_argument_invalid_bound_3.stderr      | 18 +++++------
 .../pallet_ui/call_invalid_origin_type.rs     |  2 +-
 .../pallet_ui/call_invalid_origin_type.stderr | 12 ++++----
 .../tests/pallet_ui/call_invalid_return.rs    |  2 +-
 .../pallet_ui/call_invalid_return.stderr      |  6 ++--
 .../test/tests/pallet_ui/call_invalid_vis.rs  | 27 +++++++++++++++++
 .../tests/pallet_ui/call_invalid_vis.stderr   |  5 ++++
 .../tests/pallet_ui/call_invalid_vis_2.rs     | 27 +++++++++++++++++
 .../tests/pallet_ui/call_invalid_vis_2.stderr |  5 ++++
 .../tests/pallet_ui/call_missing_weight.rs    |  2 +-
 .../pallet_ui/call_missing_weight.stderr      |  6 ++--
 .../test/tests/pallet_ui/call_no_origin.rs    |  2 +-
 .../tests/pallet_ui/call_no_origin.stderr     |  6 ++--
 .../test/tests/pallet_ui/call_no_return.rs    |  2 +-
 .../tests/pallet_ui/call_no_return.stderr     |  6 ++--
 32 files changed, 154 insertions(+), 78 deletions(-)
 create mode 100644 frame/support/test/tests/pallet_ui/call_invalid_vis.rs
 create mode 100644 frame/support/test/tests/pallet_ui/call_invalid_vis.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/call_invalid_vis_2.rs
 create mode 100644 frame/support/test/tests/pallet_ui/call_invalid_vis_2.stderr

diff --git a/frame/authorship/src/lib.rs b/frame/authorship/src/lib.rs
index b00f412808a1..9b46a3fe1199 100644
--- a/frame/authorship/src/lib.rs
+++ b/frame/authorship/src/lib.rs
@@ -226,7 +226,7 @@ pub mod pallet {
 	impl<T: Config> Pallet<T> {
 		/// Provide a set of uncles.
 		#[pallet::weight((0, DispatchClass::Mandatory))]
-		fn set_uncles(origin: OriginFor<T>, new_uncles: Vec<T::Header>) -> DispatchResult {
+		pub fn set_uncles(origin: OriginFor<T>, new_uncles: Vec<T::Header>) -> DispatchResult {
 			ensure_none(origin)?;
 			ensure!(new_uncles.len() <= MAX_UNCLES, Error::<T>::TooManyUncles);
 
diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index a4ca89a417e0..0254525ce819 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -786,7 +786,7 @@ pub mod pallet {
 		///
 		/// This check can be turned off by setting the value to `None`.
 		#[pallet::weight(T::DbWeight::get().writes(1))]
-		fn set_minimum_untrusted_score(
+		pub fn set_minimum_untrusted_score(
 			origin: OriginFor<T>,
 			maybe_next_score: Option<ElectionScore>,
 		) -> DispatchResult {
diff --git a/frame/grandpa/src/lib.rs b/frame/grandpa/src/lib.rs
index 28546018a978..2d10e3c96b14 100644
--- a/frame/grandpa/src/lib.rs
+++ b/frame/grandpa/src/lib.rs
@@ -190,7 +190,7 @@ pub mod pallet {
 		/// against the extracted offender. If both are valid, the offence
 		/// will be reported.
 		#[pallet::weight(T::WeightInfo::report_equivocation(key_owner_proof.validator_count()))]
-		fn report_equivocation(
+		pub fn report_equivocation(
 			origin: OriginFor<T>,
 			equivocation_proof: EquivocationProof<T::Hash, T::BlockNumber>,
 			key_owner_proof: T::KeyOwnerProof,
@@ -236,7 +236,7 @@ pub mod pallet {
 		/// will start the new authority set using the given finalized block as base.
 		/// Only callable by root.
 		#[pallet::weight(T::WeightInfo::note_stalled())]
-		fn note_stalled(
+		pub fn note_stalled(
 			origin: OriginFor<T>,
 			delay: T::BlockNumber,
 			best_finalized_block_number: T::BlockNumber,
diff --git a/frame/scheduler/src/lib.rs b/frame/scheduler/src/lib.rs
index 950bbde8bc49..a3520f3b21f7 100644
--- a/frame/scheduler/src/lib.rs
+++ b/frame/scheduler/src/lib.rs
@@ -867,7 +867,7 @@ mod tests {
 		#[pallet::call]
 		impl<T: Config> Pallet<T> where <T as system::Config>::Origin: OriginTrait<PalletsOrigin = OriginCaller>  {
 			#[pallet::weight(*weight)]
-			fn log(origin: OriginFor<T>, i: u32, weight: Weight) -> DispatchResult {
+			pub fn log(origin: OriginFor<T>, i: u32, weight: Weight) -> DispatchResult {
 				Self::deposit_event(Event::Logged(i, weight));
 				LOG.with(|log| {
 					log.borrow_mut().push((origin.caller().clone(), i));
@@ -876,7 +876,7 @@ mod tests {
 			}
 
 			#[pallet::weight(*weight)]
-			fn log_without_filter(origin: OriginFor<T>, i: u32, weight: Weight) -> DispatchResult {
+			pub fn log_without_filter(origin: OriginFor<T>, i: u32, weight: Weight) -> DispatchResult {
 				Self::deposit_event(Event::Logged(i, weight));
 				LOG.with(|log| {
 					log.borrow_mut().push((origin.caller().clone(), i));
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 49660350ba91..0a22f31e6c3f 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -1959,7 +1959,7 @@ pub mod pallet {
 		///   Paying even a dead controller is cheaper weight-wise. We don't do any refunds here.
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::payout_stakers_alive_staked(T::MaxNominatorRewardedPerValidator::get()))]
-		pub(super) fn payout_stakers(
+		pub fn payout_stakers(
 			origin: OriginFor<T>,
 			validator_stash: T::AccountId,
 			era: EraIndex,
diff --git a/frame/sudo/src/mock.rs b/frame/sudo/src/mock.rs
index 6b296c62fe6c..92683f98fb64 100644
--- a/frame/sudo/src/mock.rs
+++ b/frame/sudo/src/mock.rs
@@ -45,7 +45,7 @@ pub mod logger {
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
 		#[pallet::weight(*weight)]
-		pub(crate) fn privileged_i32_log(
+		pub fn privileged_i32_log(
 			origin: OriginFor<T>,
 			i: i32,
 			weight: Weight
@@ -58,7 +58,7 @@ pub mod logger {
 		}
 
 		#[pallet::weight(*weight)]
-		pub(crate) fn non_privileged_log(
+		pub fn non_privileged_log(
 			origin: OriginFor<T>,
 			i: i32,
 			weight: Weight
diff --git a/frame/support/procedural/src/pallet/parse/call.rs b/frame/support/procedural/src/pallet/parse/call.rs
index c2e6dce22539..299b86cf6f84 100644
--- a/frame/support/procedural/src/pallet/parse/call.rs
+++ b/frame/support/procedural/src/pallet/parse/call.rs
@@ -149,6 +149,18 @@ impl CallDef {
 		let mut methods = vec![];
 		for impl_item in &mut item.items {
 			if let syn::ImplItem::Method(method) = impl_item {
+				if !matches!(method.vis, syn::Visibility::Public(_)) {
+					let msg = "Invalid pallet::call, dispatchable function must be public: \
+						`pub fn`";
+
+					let span = match method.vis {
+						syn::Visibility::Inherited => method.sig.span(),
+						_ => method.vis.span(),
+					};
+
+					return Err(syn::Error::new(span, msg));
+				}
+
 				match method.sig.inputs.first() {
 					None => {
 						let msg = "Invalid pallet::call, must have at least origin arg";
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 1d4d7e461834..43891c158200 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -1438,7 +1438,7 @@ pub mod pallet_prelude {
 /// impl<T: Config> Pallet<T> {
 /// 	/// $some_doc
 /// 	#[pallet::weight($ExpressionResultingInWeight)]
-/// 	$vis fn $fn_name(
+/// 	pub fn $fn_name(
 /// 		origin: OriginFor<T>,
 /// 		$some_arg: $some_type,
 /// 		// or with compact attribute: #[pallet::compact] $some_arg: $some_type,
@@ -1897,7 +1897,7 @@ pub mod pallet_prelude {
 /// 	impl<T: Config> Pallet<T> {
 /// 		/// Doc comment put in metadata
 /// 		#[pallet::weight(0)] // Defines weight for call (function parameters are in scope)
-/// 		fn toto(
+/// 		pub fn toto(
 /// 			origin: OriginFor<T>,
 /// 			#[pallet::compact] _foo: u32,
 /// 		) -> DispatchResultWithPostInfo {
diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index f7e04e922687..a79c25ae8f3e 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -133,11 +133,11 @@ pub mod pallet {
 
 	#[pallet::call]
 	impl<T: Config> Pallet<T>
-	where T::AccountId: From<SomeType1> + From<SomeType3> + SomeAssociation1
+		where T::AccountId: From<SomeType1> + From<SomeType3> + SomeAssociation1
 	{
 		/// Doc comment put in metadata
 		#[pallet::weight(Weight::from(*_foo))]
-		fn foo(
+		pub fn foo(
 			origin: OriginFor<T>,
 			#[pallet::compact] _foo: u32,
 			_bar: u32,
@@ -152,7 +152,7 @@ pub mod pallet {
 		/// Doc comment put in metadata
 		#[pallet::weight(1)]
 		#[frame_support::transactional]
-		fn foo_transactional(
+		pub fn foo_transactional(
 			_origin: OriginFor<T>,
 			#[pallet::compact] foo: u32,
 		) -> DispatchResultWithPostInfo {
@@ -166,7 +166,7 @@ pub mod pallet {
 
 		// Test for DispatchResult return type
 		#[pallet::weight(1)]
-		fn foo_no_post_info(
+		pub fn foo_no_post_info(
 			_origin: OriginFor<T>,
 		) -> DispatchResult {
 			Ok(())
diff --git a/frame/support/test/tests/pallet_compatibility.rs b/frame/support/test/tests/pallet_compatibility.rs
index 130014f1e9eb..db01d15e5daa 100644
--- a/frame/support/test/tests/pallet_compatibility.rs
+++ b/frame/support/test/tests/pallet_compatibility.rs
@@ -123,7 +123,7 @@ pub mod pallet {
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
 		#[pallet::weight(<T::Balance as Into<Weight>>::into(new_value.clone()))]
-		fn set_dummy(
+		pub fn set_dummy(
 			origin: OriginFor<T>,
 			#[pallet::compact] new_value: T::Balance
 		) -> DispatchResultWithPostInfo {
diff --git a/frame/support/test/tests/pallet_compatibility_instance.rs b/frame/support/test/tests/pallet_compatibility_instance.rs
index d80d9ba3dff7..63e71c8bf255 100644
--- a/frame/support/test/tests/pallet_compatibility_instance.rs
+++ b/frame/support/test/tests/pallet_compatibility_instance.rs
@@ -113,7 +113,7 @@ pub mod pallet {
 	#[pallet::call]
 	impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		#[pallet::weight(<T::Balance as Into<Weight>>::into(new_value.clone()))]
-		fn set_dummy(
+		pub fn set_dummy(
 			origin: OriginFor<T>,
 			#[pallet::compact] new_value: T::Balance
 		) -> DispatchResultWithPostInfo {
diff --git a/frame/support/test/tests/pallet_instance.rs b/frame/support/test/tests/pallet_instance.rs
index 48ff166c5b22..f0b72da2c7fb 100644
--- a/frame/support/test/tests/pallet_instance.rs
+++ b/frame/support/test/tests/pallet_instance.rs
@@ -81,7 +81,7 @@ pub mod pallet {
 	impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		/// Doc comment put in metadata
 		#[pallet::weight(Weight::from(*_foo))]
-		fn foo(origin: OriginFor<T>, #[pallet::compact] _foo: u32) -> DispatchResultWithPostInfo {
+		pub fn foo(origin: OriginFor<T>, #[pallet::compact] _foo: u32) -> DispatchResultWithPostInfo {
 			let _ = origin;
 			Self::deposit_event(Event::Something(3));
 			Ok(().into())
@@ -90,7 +90,7 @@ pub mod pallet {
 		/// Doc comment put in metadata
 		#[pallet::weight(1)]
 		#[frame_support::transactional]
-		fn foo_transactional(
+		pub fn foo_transactional(
 			origin: OriginFor<T>,
 			#[pallet::compact] _foo: u32
 		) -> DispatchResultWithPostInfo {
diff --git a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.rs b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.rs
index 69d35344d576..0f58187f73eb 100644
--- a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.rs
+++ b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.rs
@@ -17,7 +17,7 @@ mod pallet {
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
 		#[pallet::weight(0)]
-		fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
+		pub fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
 			Ok(().into())
 		}
 	}
diff --git a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.stderr b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.stderr
index 1eaf71be1710..ead05261b193 100644
--- a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.stderr
+++ b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.stderr
@@ -1,8 +1,8 @@
 error[E0369]: binary operation `==` cannot be applied to type `&<T as pallet::Config>::Bar`
-  --> $DIR/call_argument_invalid_bound.rs:20:37
+  --> $DIR/call_argument_invalid_bound.rs:20:41
    |
-20 |         fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
-   |                                           ^
+20 |         pub fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
+   |                                               ^
    |
 help: consider further restricting this bound
    |
@@ -10,18 +10,18 @@ help: consider further restricting this bound
    |                    ^^^^^^^^^^^^^^^^^^^^^
 
 error[E0277]: the trait bound `<T as pallet::Config>::Bar: Clone` is not satisfied
-  --> $DIR/call_argument_invalid_bound.rs:20:37
+  --> $DIR/call_argument_invalid_bound.rs:20:41
    |
-20 |         fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
-   |                                           ^ the trait `Clone` is not implemented for `<T as pallet::Config>::Bar`
+20 |         pub fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
+   |                                               ^ the trait `Clone` is not implemented for `<T as pallet::Config>::Bar`
    |
    = note: required by `clone`
 
 error[E0277]: `<T as pallet::Config>::Bar` doesn't implement `std::fmt::Debug`
-  --> $DIR/call_argument_invalid_bound.rs:20:37
+  --> $DIR/call_argument_invalid_bound.rs:20:41
    |
-20 |         fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
-   |                                           ^ `<T as pallet::Config>::Bar` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
+20 |         pub fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
+   |                                               ^ `<T as pallet::Config>::Bar` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
    |
    = help: the trait `std::fmt::Debug` is not implemented for `<T as pallet::Config>::Bar`
    = note: required because of the requirements on the impl of `std::fmt::Debug` for `&<T as pallet::Config>::Bar`
diff --git a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.rs b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.rs
index 581c72a4240a..da87046822eb 100644
--- a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.rs
+++ b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.rs
@@ -17,7 +17,7 @@ mod pallet {
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
 		#[pallet::weight(0)]
-		fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
+		pub fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
 			Ok(().into())
 		}
 	}
diff --git a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr
index 1d0e96be9edb..2a3bbe1abf4c 100644
--- a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr
+++ b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr
@@ -1,8 +1,8 @@
 error[E0277]: the trait bound `<T as pallet::Config>::Bar: WrapperTypeDecode` is not satisfied
-   --> $DIR/call_argument_invalid_bound_2.rs:20:37
+   --> $DIR/call_argument_invalid_bound_2.rs:20:41
     |
-20  |         fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
-    |                                           ^ the trait `WrapperTypeDecode` is not implemented for `<T as pallet::Config>::Bar`
+20  |         pub fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
+    |                                               ^ the trait `WrapperTypeDecode` is not implemented for `<T as pallet::Config>::Bar`
     |
    ::: /usr/local/cargo/registry/src/github.com-1ecc6299db9ec823/parity-scale-codec-2.1.1/src/codec.rs:277:18
     |
@@ -12,10 +12,10 @@ error[E0277]: the trait bound `<T as pallet::Config>::Bar: WrapperTypeDecode` is
     = note: required because of the requirements on the impl of `Decode` for `<T as pallet::Config>::Bar`
 
 error[E0277]: the trait bound `<T as pallet::Config>::Bar: WrapperTypeEncode` is not satisfied
-   --> $DIR/call_argument_invalid_bound_2.rs:20:37
+   --> $DIR/call_argument_invalid_bound_2.rs:20:41
     |
-20  |         fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
-    |                                           ^ the trait `WrapperTypeEncode` is not implemented for `<T as pallet::Config>::Bar`
+20  |         pub fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
+    |                                               ^ the trait `WrapperTypeEncode` is not implemented for `<T as pallet::Config>::Bar`
     |
    ::: /usr/local/cargo/registry/src/github.com-1ecc6299db9ec823/parity-scale-codec-2.1.1/src/codec.rs:216:21
     |
@@ -25,10 +25,10 @@ error[E0277]: the trait bound `<T as pallet::Config>::Bar: WrapperTypeEncode` is
     = note: required because of the requirements on the impl of `pallet::_::_parity_scale_codec::Encode` for `<T as pallet::Config>::Bar`
 
 error[E0369]: binary operation `==` cannot be applied to type `&<T as pallet::Config>::Bar`
-  --> $DIR/call_argument_invalid_bound_2.rs:20:37
+  --> $DIR/call_argument_invalid_bound_2.rs:20:41
    |
-20 |         fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
-   |                                           ^
+20 |         pub fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
+   |                                               ^
    |
 help: consider further restricting this bound
    |
@@ -36,18 +36,18 @@ help: consider further restricting this bound
    |                    ^^^^^^^^^^^^^^^^^^^^^
 
 error[E0277]: the trait bound `<T as pallet::Config>::Bar: Clone` is not satisfied
-  --> $DIR/call_argument_invalid_bound_2.rs:20:37
+  --> $DIR/call_argument_invalid_bound_2.rs:20:41
    |
-20 |         fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
-   |                                           ^ the trait `Clone` is not implemented for `<T as pallet::Config>::Bar`
+20 |         pub fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
+   |                                               ^ the trait `Clone` is not implemented for `<T as pallet::Config>::Bar`
    |
    = note: required by `clone`
 
 error[E0277]: `<T as pallet::Config>::Bar` doesn't implement `std::fmt::Debug`
-  --> $DIR/call_argument_invalid_bound_2.rs:20:37
+  --> $DIR/call_argument_invalid_bound_2.rs:20:41
    |
-20 |         fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
-   |                                           ^ `<T as pallet::Config>::Bar` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
+20 |         pub fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
+   |                                               ^ `<T as pallet::Config>::Bar` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
    |
    = help: the trait `std::fmt::Debug` is not implemented for `<T as pallet::Config>::Bar`
    = note: required because of the requirements on the impl of `std::fmt::Debug` for `&<T as pallet::Config>::Bar`
diff --git a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.rs b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.rs
index 97f362551037..4a6a781ff44a 100644
--- a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.rs
+++ b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.rs
@@ -19,7 +19,7 @@ mod pallet {
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
 		#[pallet::weight(0)]
-		fn foo(origin: OriginFor<T>, bar: Bar) -> DispatchResultWithPostInfo {
+		pub fn foo(origin: OriginFor<T>, bar: Bar) -> DispatchResultWithPostInfo {
 			Ok(().into())
 		}
 	}
diff --git a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.stderr b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.stderr
index 89cee573a275..73c3069719ea 100644
--- a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.stderr
+++ b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.stderr
@@ -1,24 +1,24 @@
 error[E0369]: binary operation `==` cannot be applied to type `&Bar`
-  --> $DIR/call_argument_invalid_bound_3.rs:22:37
+  --> $DIR/call_argument_invalid_bound_3.rs:22:41
    |
-22 |         fn foo(origin: OriginFor<T>, bar: Bar) -> DispatchResultWithPostInfo {
-   |                                           ^^^
+22 |         pub fn foo(origin: OriginFor<T>, bar: Bar) -> DispatchResultWithPostInfo {
+   |                                               ^^^
    |
    = note: an implementation of `std::cmp::PartialEq` might be missing for `&Bar`
 
 error[E0277]: the trait bound `Bar: Clone` is not satisfied
-  --> $DIR/call_argument_invalid_bound_3.rs:22:37
+  --> $DIR/call_argument_invalid_bound_3.rs:22:41
    |
-22 |         fn foo(origin: OriginFor<T>, bar: Bar) -> DispatchResultWithPostInfo {
-   |                                           ^^^ the trait `Clone` is not implemented for `Bar`
+22 |         pub fn foo(origin: OriginFor<T>, bar: Bar) -> DispatchResultWithPostInfo {
+   |                                               ^^^ the trait `Clone` is not implemented for `Bar`
    |
    = note: required by `clone`
 
 error[E0277]: `Bar` doesn't implement `std::fmt::Debug`
-  --> $DIR/call_argument_invalid_bound_3.rs:22:37
+  --> $DIR/call_argument_invalid_bound_3.rs:22:41
    |
-22 |         fn foo(origin: OriginFor<T>, bar: Bar) -> DispatchResultWithPostInfo {
-   |                                           ^^^ `Bar` cannot be formatted using `{:?}`
+22 |         pub fn foo(origin: OriginFor<T>, bar: Bar) -> DispatchResultWithPostInfo {
+   |                                               ^^^ `Bar` cannot be formatted using `{:?}`
    |
    = help: the trait `std::fmt::Debug` is not implemented for `Bar`
    = note: add `#[derive(Debug)]` or manually implement `std::fmt::Debug`
diff --git a/frame/support/test/tests/pallet_ui/call_invalid_origin_type.rs b/frame/support/test/tests/pallet_ui/call_invalid_origin_type.rs
index edf953b5976c..2502506fa6aa 100644
--- a/frame/support/test/tests/pallet_ui/call_invalid_origin_type.rs
+++ b/frame/support/test/tests/pallet_ui/call_invalid_origin_type.rs
@@ -14,7 +14,7 @@ mod pallet {
 
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
-		fn foo(origin: u8) {}
+		pub fn foo(origin: u8) {}
 	}
 }
 
diff --git a/frame/support/test/tests/pallet_ui/call_invalid_origin_type.stderr b/frame/support/test/tests/pallet_ui/call_invalid_origin_type.stderr
index 855c59fd8d57..f17cd9016a6e 100644
--- a/frame/support/test/tests/pallet_ui/call_invalid_origin_type.stderr
+++ b/frame/support/test/tests/pallet_ui/call_invalid_origin_type.stderr
@@ -1,11 +1,11 @@
 error: Invalid type: expected `OriginFor<T>`
-  --> $DIR/call_invalid_origin_type.rs:17:18
+  --> $DIR/call_invalid_origin_type.rs:17:22
    |
-17 |         fn foo(origin: u8) {}
-   |                        ^^
+17 |         pub fn foo(origin: u8) {}
+   |                            ^^
 
 error: expected `OriginFor`
-  --> $DIR/call_invalid_origin_type.rs:17:18
+  --> $DIR/call_invalid_origin_type.rs:17:22
    |
-17 |         fn foo(origin: u8) {}
-   |                        ^^
+17 |         pub fn foo(origin: u8) {}
+   |                            ^^
diff --git a/frame/support/test/tests/pallet_ui/call_invalid_return.rs b/frame/support/test/tests/pallet_ui/call_invalid_return.rs
index 477e7f3219de..1ccdff5d0737 100644
--- a/frame/support/test/tests/pallet_ui/call_invalid_return.rs
+++ b/frame/support/test/tests/pallet_ui/call_invalid_return.rs
@@ -14,7 +14,7 @@ mod pallet {
 
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
-		fn foo(origin: OriginFor<T>) -> ::DispatchResult { todo!() }
+		pub fn foo(origin: OriginFor<T>) -> ::DispatchResult { todo!() }
 	}
 }
 
diff --git a/frame/support/test/tests/pallet_ui/call_invalid_return.stderr b/frame/support/test/tests/pallet_ui/call_invalid_return.stderr
index c79da3bbf78c..6a851ed3fc28 100644
--- a/frame/support/test/tests/pallet_ui/call_invalid_return.stderr
+++ b/frame/support/test/tests/pallet_ui/call_invalid_return.stderr
@@ -1,5 +1,5 @@
 error: expected `DispatchResultWithPostInfo` or `DispatchResult`
-  --> $DIR/call_invalid_return.rs:17:35
+  --> $DIR/call_invalid_return.rs:17:39
    |
-17 |         fn foo(origin: OriginFor<T>) -> ::DispatchResult { todo!() }
-   |                                         ^^
+17 |         pub fn foo(origin: OriginFor<T>) -> ::DispatchResult { todo!() }
+   |                                             ^^
diff --git a/frame/support/test/tests/pallet_ui/call_invalid_vis.rs b/frame/support/test/tests/pallet_ui/call_invalid_vis.rs
new file mode 100644
index 000000000000..fe1c5aee453d
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/call_invalid_vis.rs
@@ -0,0 +1,27 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::{Hooks, DispatchResultWithPostInfo};
+	use frame_system::pallet_prelude::{BlockNumberFor, OriginFor};
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		type Bar: codec::Codec;
+	}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		#[pallet::weight(0)]
+		fn foo(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
+			Ok(().into())
+		}
+	}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/call_invalid_vis.stderr b/frame/support/test/tests/pallet_ui/call_invalid_vis.stderr
new file mode 100644
index 000000000000..321828a1ae28
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/call_invalid_vis.stderr
@@ -0,0 +1,5 @@
+error: Invalid pallet::call, dispatchable function must be public: `pub fn`
+  --> $DIR/call_invalid_vis.rs:20:3
+   |
+20 |         fn foo(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
+   |         ^^
diff --git a/frame/support/test/tests/pallet_ui/call_invalid_vis_2.rs b/frame/support/test/tests/pallet_ui/call_invalid_vis_2.rs
new file mode 100644
index 000000000000..fb25e9876dc8
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/call_invalid_vis_2.rs
@@ -0,0 +1,27 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::{Hooks, DispatchResultWithPostInfo};
+	use frame_system::pallet_prelude::{BlockNumberFor, OriginFor};
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		type Bar: codec::Codec;
+	}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		#[pallet::weight(0)]
+		pub(crate) fn foo(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
+			Ok(().into())
+		}
+	}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/call_invalid_vis_2.stderr b/frame/support/test/tests/pallet_ui/call_invalid_vis_2.stderr
new file mode 100644
index 000000000000..7d3113474af7
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/call_invalid_vis_2.stderr
@@ -0,0 +1,5 @@
+error: Invalid pallet::call, dispatchable function must be public: `pub fn`
+  --> $DIR/call_invalid_vis_2.rs:20:3
+   |
+20 |         pub(crate) fn foo(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
+   |         ^^^
diff --git a/frame/support/test/tests/pallet_ui/call_missing_weight.rs b/frame/support/test/tests/pallet_ui/call_missing_weight.rs
index 2ce607c53ac3..4cdb85502b57 100644
--- a/frame/support/test/tests/pallet_ui/call_missing_weight.rs
+++ b/frame/support/test/tests/pallet_ui/call_missing_weight.rs
@@ -14,7 +14,7 @@ mod pallet {
 
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
-		fn foo(origin: OriginFor<T>) -> DispatchResultWithPostInfo {}
+		pub fn foo(origin: OriginFor<T>) -> DispatchResultWithPostInfo {}
 	}
 }
 
diff --git a/frame/support/test/tests/pallet_ui/call_missing_weight.stderr b/frame/support/test/tests/pallet_ui/call_missing_weight.stderr
index 37386d7771a7..ec45d478870c 100644
--- a/frame/support/test/tests/pallet_ui/call_missing_weight.stderr
+++ b/frame/support/test/tests/pallet_ui/call_missing_weight.stderr
@@ -1,5 +1,5 @@
 error: Invalid pallet::call, requires weight attribute i.e. `#[pallet::weight($expr)]`
-  --> $DIR/call_missing_weight.rs:17:3
+  --> $DIR/call_missing_weight.rs:17:7
    |
-17 |         fn foo(origin: OriginFor<T>) -> DispatchResultWithPostInfo {}
-   |         ^^
+17 |         pub fn foo(origin: OriginFor<T>) -> DispatchResultWithPostInfo {}
+   |             ^^
diff --git a/frame/support/test/tests/pallet_ui/call_no_origin.rs b/frame/support/test/tests/pallet_ui/call_no_origin.rs
index 83d10b6b08b4..231c75f43f4a 100644
--- a/frame/support/test/tests/pallet_ui/call_no_origin.rs
+++ b/frame/support/test/tests/pallet_ui/call_no_origin.rs
@@ -14,7 +14,7 @@ mod pallet {
 
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
-		fn foo() {}
+		pub fn foo() {}
 	}
 }
 
diff --git a/frame/support/test/tests/pallet_ui/call_no_origin.stderr b/frame/support/test/tests/pallet_ui/call_no_origin.stderr
index 42afd02c4263..97574ea1b644 100644
--- a/frame/support/test/tests/pallet_ui/call_no_origin.stderr
+++ b/frame/support/test/tests/pallet_ui/call_no_origin.stderr
@@ -1,5 +1,5 @@
 error: Invalid pallet::call, must have at least origin arg
-  --> $DIR/call_no_origin.rs:17:3
+  --> $DIR/call_no_origin.rs:17:7
    |
-17 |         fn foo() {}
-   |         ^^
+17 |         pub fn foo() {}
+   |             ^^
diff --git a/frame/support/test/tests/pallet_ui/call_no_return.rs b/frame/support/test/tests/pallet_ui/call_no_return.rs
index a18c30f6d6d9..68a883c52c07 100644
--- a/frame/support/test/tests/pallet_ui/call_no_return.rs
+++ b/frame/support/test/tests/pallet_ui/call_no_return.rs
@@ -14,7 +14,7 @@ mod pallet {
 
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
-		fn foo(origin: OriginFor<T>) {}
+		pub fn foo(origin: OriginFor<T>) {}
 	}
 }
 
diff --git a/frame/support/test/tests/pallet_ui/call_no_return.stderr b/frame/support/test/tests/pallet_ui/call_no_return.stderr
index b16d401355c1..18ebbaff76d9 100644
--- a/frame/support/test/tests/pallet_ui/call_no_return.stderr
+++ b/frame/support/test/tests/pallet_ui/call_no_return.stderr
@@ -1,5 +1,5 @@
 error: Invalid pallet::call, require return type DispatchResultWithPostInfo
-  --> $DIR/call_no_return.rs:17:3
+  --> $DIR/call_no_return.rs:17:7
    |
-17 |         fn foo(origin: OriginFor<T>) {}
-   |         ^^
+17 |         pub fn foo(origin: OriginFor<T>) {}
+   |             ^^

From ab84c8cfe8511ef9f8e5ffb8a497383f4b008daa Mon Sep 17 00:00:00 2001
From: Alan Sapede <alan@purestake.com>
Date: Sat, 12 Jun 2021 20:31:53 -0400
Subject: [PATCH 0869/1194] Adds moonbeam, moonriver to ss58 registry (#9028)

* Adds moonream, moonriver to ss58 registry

* Fixes names
---
 primitives/core/src/crypto.rs |  4 ++++
 ss58-registry.json            | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index 08e6211e3233..5be18422d0e1 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -586,6 +586,10 @@ ss58_address_format!(
 		(78, "calamari", "Manta Canary Network, standard account (*25519).")
 	SocialAccount =>
 		(252, "social-network", "Social Network, standard account (*25519).")
+	Moonbeam =>
+		(1284, "moonbeam", "Moonbeam, session key (*25519).")
+	Moonriver =>
+		(1285, "moonriver", "Moonriver, session key (*25519).")
 	BasiliskAccount =>
 		(10041, "basilisk", "Basilisk standard account (*25519).")
 
diff --git a/ss58-registry.json b/ss58-registry.json
index 1fa01597f20f..9fec4b7be9f5 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -514,6 +514,24 @@
 			"standardAccount": "*25519",
 			"website": "https://social.network"
 		},
+		{
+			"prefix": 1284,
+			"network": "moonbeam",
+			"displayName": "Moonbeam",
+			"symbols": ["GLMR"],
+			"decimals": [18],
+			"standardAccount": "*25519",
+			"website": "https://moonbeam.network"
+		},
+		{
+			"prefix": 1285,
+			"network": "moonriver",
+			"displayName": "Moonriver",
+			"symbols": ["MOVR"],
+			"decimals": [18],
+			"standardAccount": "*25519",
+			"website": "https://moonbeam.network"
+		},
 		{
 			"prefix": 10041,
 			"network": "basilisk",

From 3a41701a675b81a264cccf6b2771bfff74f6674a Mon Sep 17 00:00:00 2001
From: Andrew Jones <ascjones@gmail.com>
Date: Sun, 13 Jun 2021 01:36:36 +0100
Subject: [PATCH 0870/1194]  Allow additional trait bounds for
 `#[pallet::constant]`  (#9050)

* Allow additional trait bounds for constants

* Add ui test for constants with additional trait bounds

* Update trait constant ui test

* Import syn::Error

* Use reference instead of cloning

* Add extra invalid bound ui test

* Out or order valid bounds

* Fix ui test

* Fix ui test

* Apply review suggestion about error message
---
 .../procedural/src/pallet/parse/config.rs     | 60 ++++++++++++-------
 frame/support/test/tests/pallet_ui.rs         |  1 +
 .../pass/trait_constant_valid_bounds.rs       | 29 +++++++++
 .../trait_constant_invalid_bound.stderr       |  8 +--
 .../trait_constant_invalid_bound_lifetime.rs  | 23 +++++++
 ...ait_constant_invalid_bound_lifetime.stderr |  5 ++
 6 files changed, 96 insertions(+), 30 deletions(-)
 create mode 100644 frame/support/test/tests/pallet_ui/pass/trait_constant_valid_bounds.rs
 create mode 100644 frame/support/test/tests/pallet_ui/trait_constant_invalid_bound_lifetime.rs
 create mode 100644 frame/support/test/tests/pallet_ui/trait_constant_invalid_bound_lifetime.stderr

diff --git a/frame/support/procedural/src/pallet/parse/config.rs b/frame/support/procedural/src/pallet/parse/config.rs
index 79d4680752b9..69dfaeb7f9e9 100644
--- a/frame/support/procedural/src/pallet/parse/config.rs
+++ b/frame/support/procedural/src/pallet/parse/config.rs
@@ -16,6 +16,7 @@
 // limitations under the License.
 
 use super::helper;
+use core::convert::TryFrom;
 use syn::spanned::Spanned;
 use quote::ToTokens;
 
@@ -25,7 +26,6 @@ mod keyword {
 	syn::custom_keyword!(From);
 	syn::custom_keyword!(T);
 	syn::custom_keyword!(I);
-	syn::custom_keyword!(Get);
 	syn::custom_keyword!(config);
 	syn::custom_keyword!(IsType);
 	syn::custom_keyword!(Event);
@@ -62,19 +62,41 @@ pub struct ConstMetadataDef {
 	pub doc: Vec<syn::Lit>,
 }
 
-impl syn::parse::Parse for ConstMetadataDef  {
-	fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
-		let doc = helper::get_doc_literals(&syn::Attribute::parse_outer(input)?);
-		input.parse::<syn::Token![type]>()?;
-		let ident = input.parse::<syn::Ident>()?;
-		input.parse::<syn::Token![:]>()?;
-		input.parse::<keyword::Get>()?;
-		input.parse::<syn::Token![<]>()?;
-		let mut type_ = input.parse::<syn::Type>()?;
-		type_ = syn::parse2::<syn::Type>(replace_self_by_t(type_.to_token_stream()))
+impl TryFrom<&syn::TraitItemType> for ConstMetadataDef {
+	type Error = syn::Error;
+
+	fn try_from(trait_ty: &syn::TraitItemType) -> Result<Self, Self::Error> {
+		let err = |span, msg|
+			syn::Error::new(span, format!("Invalid usage of `#[pallet::constant]`: {}", msg));
+		let doc = helper::get_doc_literals(&trait_ty.attrs);
+		let ident = trait_ty.ident.clone();
+		let bound = trait_ty.bounds
+			.iter()
+			.find_map(|b|
+				if let syn::TypeParamBound::Trait(tb) = b {
+					tb.path.segments
+						.last()
+						.and_then(|s| if s.ident == "Get" { Some(s) } else { None } )
+				} else {
+					None
+				}
+			)
+			.ok_or_else(|| err(trait_ty.span(), "`Get<T>` trait bound not found"))?;
+		let type_arg = if let syn::PathArguments::AngleBracketed (ref ab) = bound.arguments {
+			if ab.args.len() == 1 {
+				if let syn::GenericArgument::Type(ref ty) = ab.args[0] {
+					Ok(ty)
+				} else {
+					Err(err(ab.args[0].span(), "Expected a type argument"))
+				}
+			} else {
+				Err(err(bound.span(), "Expected a single type argument"))
+			}
+		} else {
+			Err(err(bound.span(), "Expected trait generic args"))
+		}?;
+		let type_ = syn::parse2::<syn::Type>(replace_self_by_t(type_arg.to_token_stream()))
 			.expect("Internal error: replacing `Self` by `T` should result in valid type");
-		input.parse::<syn::Token![>]>()?;
-		input.parse::<syn::Token![;]>()?;
 
 		Ok(Self { ident, type_, doc })
 	}
@@ -322,16 +344,8 @@ impl ConfigDef {
 
 			if type_attrs_const.len() == 1 {
 				match trait_item {
-					syn::TraitItem::Type(type_) => {
-						let constant = syn::parse2::<ConstMetadataDef>(type_.to_token_stream())
-							.map_err(|e| {
-								let error_msg = "Invalid usage of `#[pallet::constant]`, syntax \
-									must be `type $SomeIdent: Get<$SomeType>;`";
-								let mut err = syn::Error::new(type_.span(), error_msg);
-								err.combine(e);
-								err
-							})?;
-
+					syn::TraitItem::Type(ref type_) => {
+						let constant = ConstMetadataDef::try_from(type_)?;
 						consts_metadata.push(constant);
 					},
 					_ => {
diff --git a/frame/support/test/tests/pallet_ui.rs b/frame/support/test/tests/pallet_ui.rs
index 1836b06cabfd..e5f4a54dfb00 100644
--- a/frame/support/test/tests/pallet_ui.rs
+++ b/frame/support/test/tests/pallet_ui.rs
@@ -23,4 +23,5 @@ fn pallet_ui() {
 
 	let t = trybuild::TestCases::new();
 	t.compile_fail("tests/pallet_ui/*.rs");
+	t.pass("tests/pallet_ui/pass/*.rs");
 }
diff --git a/frame/support/test/tests/pallet_ui/pass/trait_constant_valid_bounds.rs b/frame/support/test/tests/pallet_ui/pass/trait_constant_valid_bounds.rs
new file mode 100644
index 000000000000..71eb4f2992b3
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/pass/trait_constant_valid_bounds.rs
@@ -0,0 +1,29 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		#[pallet::constant]
+		type U: Get<u32>;
+
+		#[pallet::constant]
+		type V: Get<u32> + From<u16>;
+
+		#[pallet::constant]
+		type W: From<u16> + Get<u32>;
+	}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/trait_constant_invalid_bound.stderr b/frame/support/test/tests/pallet_ui/trait_constant_invalid_bound.stderr
index 16c3531140ea..057ec6ffb2c7 100644
--- a/frame/support/test/tests/pallet_ui/trait_constant_invalid_bound.stderr
+++ b/frame/support/test/tests/pallet_ui/trait_constant_invalid_bound.stderr
@@ -1,11 +1,5 @@
-error: Invalid usage of `#[pallet::constant]`, syntax must be `type $SomeIdent: Get<$SomeType>;`
+error: Invalid usage of `#[pallet::constant]`: `Get<T>` trait bound not found
  --> $DIR/trait_constant_invalid_bound.rs:9:3
   |
 9 |         type U;
   |         ^^^^
-
-error: expected `:`
- --> $DIR/trait_constant_invalid_bound.rs:9:9
-  |
-9 |         type U;
-  |               ^
diff --git a/frame/support/test/tests/pallet_ui/trait_constant_invalid_bound_lifetime.rs b/frame/support/test/tests/pallet_ui/trait_constant_invalid_bound_lifetime.rs
new file mode 100644
index 000000000000..47303f2b20a0
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/trait_constant_invalid_bound_lifetime.rs
@@ -0,0 +1,23 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		#[pallet::constant]
+		type U: Get<'static>;
+	}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/trait_constant_invalid_bound_lifetime.stderr b/frame/support/test/tests/pallet_ui/trait_constant_invalid_bound_lifetime.stderr
new file mode 100644
index 000000000000..8d830fed8f39
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/trait_constant_invalid_bound_lifetime.stderr
@@ -0,0 +1,5 @@
+error: Invalid usage of `#[pallet::constant]`: Expected a type argument
+ --> $DIR/trait_constant_invalid_bound_lifetime.rs:9:15
+  |
+9 |         type U: Get<'static>;
+  |                     ^^^^^^^

From c8d5796ae2b0ee5c71e2ee585fc05b3fa94ac84f Mon Sep 17 00:00:00 2001
From: Xiliang Chen <xlchen1291@gmail.com>
Date: Sun, 13 Jun 2021 18:26:42 +1200
Subject: [PATCH 0871/1194] remove Default from AssetId trait bound (#9062)

* update AssetId trait

* try again
---
 frame/support/src/traits/tokens/misc.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frame/support/src/traits/tokens/misc.rs b/frame/support/src/traits/tokens/misc.rs
index d6329e585324..0c55ac79182c 100644
--- a/frame/support/src/traits/tokens/misc.rs
+++ b/frame/support/src/traits/tokens/misc.rs
@@ -161,8 +161,8 @@ impl WithdrawReasons {
 }
 
 /// Simple amalgamation trait to collect together properties for an AssetId under one roof.
-pub trait AssetId: FullCodec + Copy + Default + Eq + PartialEq + Debug {}
-impl<T: FullCodec + Copy + Default + Eq + PartialEq + Debug> AssetId for T {}
+pub trait AssetId: FullCodec + Copy  + Eq + PartialEq + Debug {}
+impl<T: FullCodec + Copy + Eq + PartialEq + Debug> AssetId for T {}
 
 /// Simple amalgamation trait to collect together properties for a Balance under one roof.
 pub trait Balance: AtLeast32BitUnsigned + FullCodec + Copy + Default + Debug {}

From 11d5eff647a54a70e87f805b3dabca458faca283 Mon Sep 17 00:00:00 2001
From: Lldenaurois <ljdenaurois@gmail.com>
Date: Sun, 13 Jun 2021 06:24:05 -0400
Subject: [PATCH 0872/1194] Add function to test whether function is exported
 in wasm blob (#9093)

* Add function to test whether function is exported in wasm blob

* Address Feedback

* Update based on feedback
---
 client/executor/common/src/runtime_blob/runtime_blob.rs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/client/executor/common/src/runtime_blob/runtime_blob.rs b/client/executor/common/src/runtime_blob/runtime_blob.rs
index aac023e960c7..82b9312dec50 100644
--- a/client/executor/common/src/runtime_blob/runtime_blob.rs
+++ b/client/executor/common/src/runtime_blob/runtime_blob.rs
@@ -81,6 +81,15 @@ impl RuntimeBlob {
 		export_mutable_globals(&mut self.raw_module, "exported_internal_global");
 	}
 
+	/// Perform an instrumentation that makes sure that a specific function `entry_point` is exported
+	pub fn entry_point_exists(&self, entry_point: &str) -> bool {
+		self.raw_module.export_section().map(|e| {
+			e.entries()
+			.iter()
+			.any(|e| matches!(e.internal(), Internal::Function(_)) && e.field() == entry_point)
+		}).unwrap_or_default()
+	}
+
 	/// Returns an iterator of all globals which were exported by [`expose_mutable_globals`].
 	pub(super) fn exported_internal_global_names<'module>(
 		&'module self,

From 125c4b365f21e60e3d284e3c73cbf0585bfc7342 Mon Sep 17 00:00:00 2001
From: chenwei <chenwei_767@qq.com>
Date: Sun, 13 Jun 2021 18:27:54 +0800
Subject: [PATCH 0873/1194] Make find_proxy public. (#9094)

export `pallet_proxy::find_prox` and `ProxyDefinition`.
---
 frame/proxy/src/lib.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frame/proxy/src/lib.rs b/frame/proxy/src/lib.rs
index 6e78df2c7326..bc892b65b377 100644
--- a/frame/proxy/src/lib.rs
+++ b/frame/proxy/src/lib.rs
@@ -64,12 +64,12 @@ type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Con
 #[derive(Encode, Decode, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, RuntimeDebug, MaxEncodedLen)]
 pub struct ProxyDefinition<AccountId, ProxyType, BlockNumber> {
 	/// The account which may act on behalf of another.
-	delegate: AccountId,
+	pub delegate: AccountId,
 	/// A value defining the subset of calls that it is allowed to make.
-	proxy_type: ProxyType,
+	pub proxy_type: ProxyType,
 	/// The number of blocks that an announcement must be in place for before the corresponding call
 	/// may be dispatched. If zero, then no announcement is needed.
-	delay: BlockNumber,
+	pub delay: BlockNumber,
 }
 
 /// Details surrounding a specific instance of an announcement to make a call.
@@ -734,7 +734,7 @@ impl<T: Config> Pallet<T> {
 		})
 	}
 
-	fn find_proxy(
+	pub fn find_proxy(
 		real: &T::AccountId,
 		delegate: &T::AccountId,
 		force_proxy_type: Option<T::ProxyType>,

From 6b3c76a23ed18c5d4f2149edebd85063a85a8218 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Sun, 13 Jun 2021 12:41:13 +0100
Subject: [PATCH 0874/1194] pallet-authorship: Fixing some nitpicks (#9095)

As reviewing the pallet yesterday, I have found some nitpicks that I
fixed.
---
 frame/authorship/src/lib.rs | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/frame/authorship/src/lib.rs b/frame/authorship/src/lib.rs
index 9b46a3fe1199..98d20ec62140 100644
--- a/frame/authorship/src/lib.rs
+++ b/frame/authorship/src/lib.rs
@@ -27,7 +27,7 @@ use frame_support::{
 	inherent::{InherentData, ProvideInherent, InherentIdentifier},
 };
 use codec::{Encode, Decode};
-use sp_runtime::traits::{Header as HeaderT, One, Zero};
+use sp_runtime::traits::{Header as HeaderT, One, Saturating};
 use sp_authorship::{INHERENT_IDENTIFIER, UnclesInherentData, InherentError};
 
 const MAX_UNCLES: usize = 10;
@@ -298,11 +298,7 @@ impl<T: Config> Pallet<T> {
 
 		let (minimum_height, maximum_height) = {
 			let uncle_generations = T::UncleGenerations::get();
-			let min = if now >= uncle_generations {
-				now - uncle_generations
-			} else {
-				Zero::zero()
-			};
+			let min = now.saturating_sub(uncle_generations);
 
 			(min, now)
 		};
@@ -329,7 +325,7 @@ impl<T: Config> Pallet<T> {
 			return Err(Error::<T>::OldUncle.into());
 		}
 
-		let duplicate = existing_uncles.into_iter().find(|h| **h == hash).is_some();
+		let duplicate = existing_uncles.into_iter().any(|h| *h == hash);
 		let in_chain = <frame_system::Pallet<T>>::block_hash(uncle.number()) == hash;
 
 		if duplicate || in_chain {
@@ -341,15 +337,14 @@ impl<T: Config> Pallet<T> {
 	}
 
 	fn prune_old_uncles(minimum_height: T::BlockNumber) {
-		let mut uncles = <Uncles<T>>::get();
+		let uncles = <Uncles<T>>::get();
 		let prune_entries = uncles.iter().take_while(|item| match item {
 			UncleEntryItem::Uncle(_, _) => true,
 			UncleEntryItem::InclusionHeight(height) => height < &minimum_height,
 		});
 		let prune_index = prune_entries.count();
 
-		let _ = uncles.drain(..prune_index);
-		<Uncles<T>>::put(uncles);
+		<Uncles<T>>::put(&uncles[prune_index..]);
 	}
 }
 

From f4cccc08110bd1c516f2dcc6fe86682cb6118184 Mon Sep 17 00:00:00 2001
From: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
Date: Mon, 14 Jun 2021 09:16:14 +0200
Subject: [PATCH 0875/1194] fix ordering of staking weight arguments (#9063)

Closes #9054.
---
 frame/staking/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 0a22f31e6c3f..30c2a160e9e7 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -2738,8 +2738,8 @@ impl<T: Config> frame_election_provider_support::ElectionDataProvider<T::Account
 
 		let slashing_span_count = <SlashingSpans<T>>::iter().count();
 		let weight = T::WeightInfo::get_npos_voters(
-			nominator_count as u32,
 			validator_count as u32,
+			nominator_count as u32,
 			slashing_span_count as u32,
 		);
 		Ok((Self::get_npos_voters(), weight))

From a7b641fc25d8d157b2dddccb7f459c4f166596e2 Mon Sep 17 00:00:00 2001
From: Keith Yeung <kungfukeith11@gmail.com>
Date: Mon, 14 Jun 2021 03:07:09 -0700
Subject: [PATCH 0876/1194] Allow renaming storage item prefixes (#9016)

* Implement parsing for #[pallet::storage_name] on storage items

* Rename storage prefix when a #[pallet::storage_name] is supplied

* Fix test_storage_info

* Rename storage_name to storage_prefix

* Check for duplicates when renaming storage prefixes

* Allow only string literals for storage_prefix renames

* Use proper spans for attribute errors

* Check for valid identifiers when parsing storage prefix renames
---
 .../procedural/src/pallet/expand/storage.rs   | 44 +++++++--
 .../procedural/src/pallet/parse/storage.rs    | 97 ++++++++++++++++---
 frame/support/test/tests/pallet.rs            | 20 ++++
 .../pallet_ui/duplicate_storage_prefix.rs     | 21 ++++
 .../pallet_ui/duplicate_storage_prefix.stderr | 17 ++++
 .../pallet_ui/storage_invalid_attribute.rs    | 21 ++++
 .../storage_invalid_attribute.stderr          |  5 +
 .../pallet_ui/storage_invalid_rename_value.rs | 18 ++++
 .../storage_invalid_rename_value.stderr       |  5 +
 .../pallet_ui/storage_multiple_getters.rs     | 25 +++++
 .../pallet_ui/storage_multiple_getters.stderr |  5 +
 .../pallet_ui/storage_multiple_renames.rs     | 25 +++++
 .../pallet_ui/storage_multiple_renames.stderr |  5 +
 13 files changed, 288 insertions(+), 20 deletions(-)
 create mode 100644 frame/support/test/tests/pallet_ui/duplicate_storage_prefix.rs
 create mode 100644 frame/support/test/tests/pallet_ui/duplicate_storage_prefix.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/storage_invalid_attribute.rs
 create mode 100644 frame/support/test/tests/pallet_ui/storage_invalid_attribute.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/storage_invalid_rename_value.rs
 create mode 100644 frame/support/test/tests/pallet_ui/storage_invalid_rename_value.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/storage_multiple_getters.rs
 create mode 100644 frame/support/test/tests/pallet_ui/storage_multiple_getters.stderr
 create mode 100644 frame/support/test/tests/pallet_ui/storage_multiple_renames.rs
 create mode 100644 frame/support/test/tests/pallet_ui/storage_multiple_renames.stderr

diff --git a/frame/support/procedural/src/pallet/expand/storage.rs b/frame/support/procedural/src/pallet/expand/storage.rs
index c956425379c5..0000051dd9b9 100644
--- a/frame/support/procedural/src/pallet/expand/storage.rs
+++ b/frame/support/procedural/src/pallet/expand/storage.rs
@@ -15,22 +15,48 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::pallet::Def;
+use crate::pallet::{Def, parse::storage::StorageDef};
 use crate::pallet::parse::storage::{Metadata, QueryKind, StorageGenerics};
 use frame_support_procedural_tools::clean_type_string;
+use std::collections::HashSet;
 
 /// Generate the prefix_ident related the the storage.
 /// prefix_ident is used for the prefix struct to be given to storage as first generic param.
-fn prefix_ident(storage_ident: &syn::Ident) -> syn::Ident {
+fn prefix_ident(storage: &StorageDef) -> syn::Ident {
+	let storage_ident = &storage.ident;
 	syn::Ident::new(&format!("_GeneratedPrefixForStorage{}", storage_ident), storage_ident.span())
 }
 
+/// Check for duplicated storage prefixes. This step is necessary since users can specify an
+/// alternative storage prefix using the #[pallet::storage_prefix] syntax, and we need to ensure
+/// that the prefix specified by the user is not a duplicate of an existing one.
+fn check_prefix_duplicates(
+	storage_def: &StorageDef,
+	set: &mut HashSet<String>,
+) -> syn::Result<()> {
+	let prefix = storage_def.prefix();
+
+	if !set.insert(prefix.clone()) {
+		let err = syn::Error::new(
+			storage_def.prefix_span(),
+			format!("Duplicate storage prefixes found for `{}`", prefix),
+		);
+		return Err(err);
+	}
+
+	Ok(())
+}
+
 /// * if generics are unnamed: replace the first generic `_` by the generated prefix structure
 /// * if generics are named: reorder the generic, remove their name, and add the missing ones.
 /// * Add `#[allow(type_alias_bounds)]`
-pub fn process_generics(def: &mut Def) {
+pub fn process_generics(def: &mut Def) -> syn::Result<()> {
 	let frame_support = &def.frame_support;
+	let mut prefix_set = HashSet::new();
+
 	for storage_def in def.storages.iter_mut() {
+		check_prefix_duplicates(storage_def, &mut prefix_set)?;
+
 		let item = &mut def.item.content.as_mut().expect("Checked by def").1[storage_def.index];
 
 		let typ_item = match item {
@@ -50,7 +76,7 @@ pub fn process_generics(def: &mut Def) {
 			_ => unreachable!("Checked by def"),
 		};
 
-		let prefix_ident = prefix_ident(&storage_def.ident);
+		let prefix_ident = prefix_ident(&storage_def);
 		let type_use_gen = if def.config.has_instance {
 			quote::quote_spanned!(storage_def.attr_span => T, I)
 		} else {
@@ -116,6 +142,8 @@ pub fn process_generics(def: &mut Def) {
 			args.args[0] = syn::parse_quote!( #prefix_ident<#type_use_gen> );
 		}
 	}
+
+	Ok(())
 }
 
 /// * generate StoragePrefix structs (e.g. for a storage `MyStorage` a struct with the name
@@ -125,7 +153,9 @@ pub fn process_generics(def: &mut Def) {
 /// * Add `#[allow(type_alias_bounds)]` on storages type alias
 /// * generate metadatas
 pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
-	process_generics(def);
+	if let Err(e) = process_generics(def) {
+		return e.into_compile_error().into();
+	}
 
 	let frame_support = &def.frame_support;
 	let frame_system = &def.frame_system;
@@ -344,9 +374,9 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 	let prefix_structs = def.storages.iter().map(|storage_def| {
 		let type_impl_gen = &def.type_impl_generics(storage_def.attr_span);
 		let type_use_gen = &def.type_use_generics(storage_def.attr_span);
-		let prefix_struct_ident = prefix_ident(&storage_def.ident);
+		let prefix_struct_ident = prefix_ident(&storage_def);
 		let prefix_struct_vis = &storage_def.vis;
-		let prefix_struct_const = storage_def.ident.to_string();
+		let prefix_struct_const = storage_def.prefix();
 		let config_where_clause = &def.config.where_clause;
 
 		let cfg_attrs = &storage_def.cfg_attrs;
diff --git a/frame/support/procedural/src/pallet/parse/storage.rs b/frame/support/procedural/src/pallet/parse/storage.rs
index 6b842ab7fa40..9ec890e66e57 100644
--- a/frame/support/procedural/src/pallet/parse/storage.rs
+++ b/frame/support/procedural/src/pallet/parse/storage.rs
@@ -25,28 +25,60 @@ mod keyword {
 	syn::custom_keyword!(Error);
 	syn::custom_keyword!(pallet);
 	syn::custom_keyword!(getter);
+	syn::custom_keyword!(storage_prefix);
 	syn::custom_keyword!(OptionQuery);
 	syn::custom_keyword!(ValueQuery);
 }
 
-/// Parse for `#[pallet::getter(fn dummy)]`
-pub struct PalletStorageAttr {
-	getter: syn::Ident,
+/// Parse for one of the following:
+/// * `#[pallet::getter(fn dummy)]`
+/// * `#[pallet::storage_prefix = "CustomName"]`
+pub enum PalletStorageAttr {
+	Getter(syn::Ident, proc_macro2::Span),
+	StorageName(syn::LitStr, proc_macro2::Span),
+}
+
+impl PalletStorageAttr {
+	fn attr_span(&self) -> proc_macro2::Span {
+		match self {
+			Self::Getter(_, span) | Self::StorageName(_, span) => *span,
+		}
+	}
 }
 
 impl syn::parse::Parse for PalletStorageAttr {
 	fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
 		input.parse::<syn::Token![#]>()?;
+		let attr_span = input.span();
 		let content;
 		syn::bracketed!(content in input);
 		content.parse::<keyword::pallet>()?;
 		content.parse::<syn::Token![::]>()?;
-		content.parse::<keyword::getter>()?;
 
-		let generate_content;
-		syn::parenthesized!(generate_content in content);
-		generate_content.parse::<syn::Token![fn]>()?;
-		Ok(Self { getter: generate_content.parse::<syn::Ident>()? })
+		let lookahead = content.lookahead1();
+		if lookahead.peek(keyword::getter) {
+			content.parse::<keyword::getter>()?;
+
+			let generate_content;
+			syn::parenthesized!(generate_content in content);
+			generate_content.parse::<syn::Token![fn]>()?;
+			Ok(Self::Getter(generate_content.parse::<syn::Ident>()?, attr_span))
+		} else if lookahead.peek(keyword::storage_prefix) {
+			content.parse::<keyword::storage_prefix>()?;
+			content.parse::<syn::Token![=]>()?;
+
+			let renamed_prefix = content.parse::<syn::LitStr>()?;
+			// Ensure the renamed prefix is a proper Rust identifier
+			syn::parse_str::<syn::Ident>(&renamed_prefix.value())
+				.map_err(|_| {
+					let msg = format!("`{}` is not a valid identifier", renamed_prefix.value());
+					syn::Error::new(renamed_prefix.span(), msg)
+				})?;
+
+			Ok(Self::StorageName(renamed_prefix, attr_span))
+		} else {
+			Err(lookahead.error())
+		}
 	}
 }
 
@@ -89,6 +121,8 @@ pub struct StorageDef {
 	pub instances: Vec<helper::InstanceUsage>,
 	/// Optional getter to generate. If some then query_kind is ensured to be some as well.
 	pub getter: Option<syn::Ident>,
+	/// Optional expression that evaluates to a type that can be used as StoragePrefix instead of ident.
+	pub rename_as: Option<syn::LitStr>,
 	/// Whereas the querytype of the storage is OptionQuery or ValueQuery.
 	/// Note that this is best effort as it can't be determined when QueryKind is generic, and
 	/// result can be false if user do some unexpected type alias.
@@ -105,7 +139,6 @@ pub struct StorageDef {
 	pub named_generics: Option<StorageGenerics>,
 }
 
-
 /// The parsed generic from the
 #[derive(Clone)]
 pub enum StorageGenerics {
@@ -541,6 +574,25 @@ fn extract_key(ty: &syn::Type) -> syn::Result<syn::Type> {
 }
 
 impl StorageDef {
+	/// Return the storage prefix for this storage item
+	pub fn prefix(&self) -> String {
+		self
+			.rename_as
+			.as_ref()
+			.map(syn::LitStr::value)
+			.unwrap_or(self.ident.to_string())
+	}
+
+	/// Return either the span of the ident or the span of the literal in the
+	/// #[storage_prefix] attribute
+	pub fn prefix_span(&self) -> proc_macro2::Span {
+		self
+			.rename_as
+			.as_ref()
+			.map(syn::LitStr::span)
+			.unwrap_or(self.ident.span())
+	}
+
 	pub fn try_from(
 		attr_span: proc_macro2::Span,
 		index: usize,
@@ -552,12 +604,30 @@ impl StorageDef {
 			return Err(syn::Error::new(item.span(), "Invalid pallet::storage, expect item type."));
 		};
 
-		let mut attrs: Vec<PalletStorageAttr> = helper::take_item_pallet_attrs(&mut item.attrs)?;
-		if attrs.len() > 1 {
+		let attrs: Vec<PalletStorageAttr> = helper::take_item_pallet_attrs(&mut item.attrs)?;
+		let (mut getters, mut names) = attrs
+			.into_iter()
+			.partition::<Vec<_>, _>(|attr| matches!(attr, PalletStorageAttr::Getter(..)));
+		if getters.len() > 1 {
 			let msg = "Invalid pallet::storage, multiple argument pallet::getter found";
-			return Err(syn::Error::new(attrs[1].getter.span(), msg));
+			return Err(syn::Error::new(getters[1].attr_span(), msg));
 		}
-		let getter = attrs.pop().map(|attr| attr.getter);
+		if names.len() > 1 {
+			let msg = "Invalid pallet::storage, multiple argument pallet::storage_prefix found";
+			return Err(syn::Error::new(names[1].attr_span(), msg));
+		}
+		let getter = getters.pop().map(|attr| {
+			match attr {
+				PalletStorageAttr::Getter(ident, _) => ident,
+				_ => unreachable!(),
+			}
+		});
+		let rename_as = names.pop().map(|attr| {
+			match attr {
+				PalletStorageAttr::StorageName(lit, _) => lit,
+				_ => unreachable!(),
+			}
+		});
 
 		let cfg_attrs = helper::get_item_cfg_attrs(&item.attrs);
 
@@ -609,6 +679,7 @@ impl StorageDef {
 			metadata,
 			docs,
 			getter,
+			rename_as,
 			query_kind,
 			where_clause,
 			cfg_attrs,
diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index a79c25ae8f3e..412622b3b194 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -198,6 +198,10 @@ pub mod pallet {
 	#[pallet::storage]
 	pub type Value<T> = StorageValue<Value = u32>;
 
+	#[pallet::storage]
+	#[pallet::storage_prefix = "Value2"]
+	pub type RenamedValue<T> = StorageValue<Value = u64>;
+
 	#[pallet::type_value]
 	pub fn MyDefault<T: Config>() -> u16
 	where T::AccountId: From<SomeType7> + From<SomeType1> + SomeAssociation1
@@ -577,6 +581,10 @@ fn storage_expand() {
 		let k = [twox_128(b"Example"), twox_128(b"Value")].concat();
 		assert_eq!(unhashed::get::<u32>(&k), Some(1u32));
 
+		pallet::RenamedValue::<Runtime>::put(2);
+		let k = [twox_128(b"Example"), twox_128(b"Value2")].concat();
+		assert_eq!(unhashed::get::<u64>(&k), Some(2));
+
 		pallet::Map::<Runtime>::insert(1, 2);
 		let mut k = [twox_128(b"Example"), twox_128(b"Map")].concat();
 		k.extend(1u8.using_encoded(blake2_128_concat));
@@ -697,6 +705,13 @@ fn metadata() {
 					default: DecodeDifferent::Decoded(vec![0]),
 					documentation: DecodeDifferent::Decoded(vec![]),
 				},
+				StorageEntryMetadata {
+					name: DecodeDifferent::Decoded("Value2".to_string()),
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::Plain(DecodeDifferent::Decoded("u64".to_string())),
+					default: DecodeDifferent::Decoded(vec![0]),
+					documentation: DecodeDifferent::Decoded(vec![]),
+				},
 				StorageEntryMetadata {
 					name: DecodeDifferent::Decoded("Map".to_string()),
 					modifier: StorageEntryModifier::Default,
@@ -993,6 +1008,11 @@ fn test_storage_info() {
 				max_values: Some(1),
 				max_size: Some(4),
 			},
+			StorageInfo {
+				prefix: prefix(b"Example", b"Value2"),
+				max_values: Some(1),
+				max_size: Some(8),
+			},
 			StorageInfo {
 				prefix: prefix(b"Example", b"Map"),
 				max_values: None,
diff --git a/frame/support/test/tests/pallet_ui/duplicate_storage_prefix.rs b/frame/support/test/tests/pallet_ui/duplicate_storage_prefix.rs
new file mode 100644
index 000000000000..d103fa09d991
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/duplicate_storage_prefix.rs
@@ -0,0 +1,21 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::StorageValue;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	#[pallet::generate_store(trait Store)]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::storage]
+	type Foo<T> = StorageValue<_, u8>;
+
+    #[pallet::storage]
+    #[pallet::storage_prefix = "Foo"]
+    type NotFoo<T> = StorageValue<_, u16>;
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/duplicate_storage_prefix.stderr b/frame/support/test/tests/pallet_ui/duplicate_storage_prefix.stderr
new file mode 100644
index 000000000000..63a6e71e4404
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/duplicate_storage_prefix.stderr
@@ -0,0 +1,17 @@
+error: Duplicate storage prefixes found for `Foo`
+  --> $DIR/duplicate_storage_prefix.rs:16:32
+   |
+16 |     #[pallet::storage_prefix = "Foo"]
+   |                                ^^^^^
+
+error[E0412]: cannot find type `_GeneratedPrefixForStorageFoo` in this scope
+  --> $DIR/duplicate_storage_prefix.rs:13:7
+   |
+13 |     type Foo<T> = StorageValue<_, u8>;
+   |          ^^^ not found in this scope
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/duplicate_storage_prefix.rs:17:35
+   |
+17 |     type NotFoo<T> = StorageValue<_, u16>;
+   |                                   ^ not allowed in type signatures
diff --git a/frame/support/test/tests/pallet_ui/storage_invalid_attribute.rs b/frame/support/test/tests/pallet_ui/storage_invalid_attribute.rs
new file mode 100644
index 000000000000..c6a88c083135
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/storage_invalid_attribute.rs
@@ -0,0 +1,21 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(_);
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::storage]
+	#[pallet::generate_store(pub trait Store)]
+	type Foo<T> = StorageValue<u8, u8>;
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/storage_invalid_attribute.stderr b/frame/support/test/tests/pallet_ui/storage_invalid_attribute.stderr
new file mode 100644
index 000000000000..bf93d99cf56b
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/storage_invalid_attribute.stderr
@@ -0,0 +1,5 @@
+error: expected `getter` or `storage_prefix`
+  --> $DIR/storage_invalid_attribute.rs:16:12
+   |
+16 |     #[pallet::generate_store(pub trait Store)]
+   |               ^^^^^^^^^^^^^^
diff --git a/frame/support/test/tests/pallet_ui/storage_invalid_rename_value.rs b/frame/support/test/tests/pallet_ui/storage_invalid_rename_value.rs
new file mode 100644
index 000000000000..c3a08e05e2ac
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/storage_invalid_rename_value.rs
@@ -0,0 +1,18 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::storage]
+	#[pallet::storage_prefix = "pub"]
+	type Foo<T> = StorageValue<_, u8>;
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/storage_invalid_rename_value.stderr b/frame/support/test/tests/pallet_ui/storage_invalid_rename_value.stderr
new file mode 100644
index 000000000000..513970f98a4f
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/storage_invalid_rename_value.stderr
@@ -0,0 +1,5 @@
+error: `pub` is not a valid identifier
+  --> $DIR/storage_invalid_rename_value.rs:13:29
+   |
+13 |     #[pallet::storage_prefix = "pub"]
+   |                                ^^^^^
diff --git a/frame/support/test/tests/pallet_ui/storage_multiple_getters.rs b/frame/support/test/tests/pallet_ui/storage_multiple_getters.rs
new file mode 100644
index 000000000000..309b9b24136f
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/storage_multiple_getters.rs
@@ -0,0 +1,25 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::storage]
+	#[pallet::getter(fn get_foo)]
+	#[pallet::getter(fn foo_error)]
+	type Foo<T> = StorageValue<_, u8>;
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/storage_multiple_getters.stderr b/frame/support/test/tests/pallet_ui/storage_multiple_getters.stderr
new file mode 100644
index 000000000000..188eed3cb0d1
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/storage_multiple_getters.stderr
@@ -0,0 +1,5 @@
+error: Invalid pallet::storage, multiple argument pallet::getter found
+  --> $DIR/storage_multiple_getters.rs:20:3
+   |
+20 |     #[pallet::getter(fn foo_error)]
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/frame/support/test/tests/pallet_ui/storage_multiple_renames.rs b/frame/support/test/tests/pallet_ui/storage_multiple_renames.rs
new file mode 100644
index 000000000000..f3caef80a7ee
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/storage_multiple_renames.rs
@@ -0,0 +1,25 @@
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::Hooks;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::storage]
+	#[pallet::storage_prefix = "Bar"]
+	#[pallet::storage_prefix = "Baz"]
+	type Foo<T> = StorageValue<_, u8>;
+}
+
+fn main() {
+}
diff --git a/frame/support/test/tests/pallet_ui/storage_multiple_renames.stderr b/frame/support/test/tests/pallet_ui/storage_multiple_renames.stderr
new file mode 100644
index 000000000000..9288d131d95a
--- /dev/null
+++ b/frame/support/test/tests/pallet_ui/storage_multiple_renames.stderr
@@ -0,0 +1,5 @@
+error: Invalid pallet::storage, multiple argument pallet::storage_prefix found
+  --> $DIR/storage_multiple_renames.rs:20:3
+   |
+20 |     #[pallet::storage_prefix = "Baz"]
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

From a4b0fd8fa5939879e5a3f9a1a009323ccb4d4a30 Mon Sep 17 00:00:00 2001
From: Qinxuan Chen <koushiro.cqx@gmail.com>
Date: Mon, 14 Jun 2021 19:00:32 +0800
Subject: [PATCH 0877/1194] Migrate pallet-randomness-collective-flip to pallet
 attribute macro (#9061)

* migrate pallet-randomness-collective-flip to pallet attribute macro

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* fix some nits

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* remove some spacing things

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* remove space

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* use tabs

Signed-off-by: koushiro <koushiro.cqx@gmail.com>
---
 Cargo.lock                                  |  1 -
 bin/node-template/runtime/src/lib.rs        |  2 +
 bin/node/runtime/src/lib.rs                 |  2 +
 frame/contracts/src/tests.rs                |  1 +
 frame/randomness-collective-flip/Cargo.toml |  8 +-
 frame/randomness-collective-flip/src/lib.rs | 86 ++++++++++++++-------
 6 files changed, 65 insertions(+), 35 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a52f4250b5a6..17651bf4b3a5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5366,7 +5366,6 @@ dependencies = [
  "frame-system",
  "parity-scale-codec",
  "safe-mix",
- "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index e51a190ae9a0..f98517b91d24 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -202,6 +202,8 @@ impl frame_system::Config for Runtime {
 	type OnSetCode = ();
 }
 
+impl pallet_randomness_collective_flip::Config for Runtime {}
+
 impl pallet_aura::Config for Runtime {
 	type AuthorityId = AuraId;
 }
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 13189b1ff898..2665607cc42f 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -217,6 +217,8 @@ impl frame_system::Config for Runtime {
 	type OnSetCode = ();
 }
 
+impl pallet_randomness_collective_flip::Config for Runtime {}
+
 impl pallet_utility::Config for Runtime {
 	type Event = Event;
 	type Call = Call;
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index e066a369af0b..3e687643cdc8 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -235,6 +235,7 @@ impl frame_system::Config for Test {
 	type SS58Prefix = ();
 	type OnSetCode = ();
 }
+impl pallet_randomness_collective_flip::Config for Test {}
 impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type MaxReserves = ();
diff --git a/frame/randomness-collective-flip/Cargo.toml b/frame/randomness-collective-flip/Cargo.toml
index ad9bcb97837d..5ae350ffcac1 100644
--- a/frame/randomness-collective-flip/Cargo.toml
+++ b/frame/randomness-collective-flip/Cargo.toml
@@ -16,23 +16,23 @@ targets = ["x86_64-unknown-linux-gnu"]
 safe-mix = { version = "1.0", default-features = false }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 
 [dev-dependencies]
 sp-core = { version = "3.0.0", path = "../../primitives/core" }
 sp-io = { version = "3.0.0", path = "../../primitives/io" }
-serde = { version = "1.0.101" }
 
 [features]
 default = ["std"]
 std = [
 	"safe-mix/std",
-	"frame-system/std",
 	"codec/std",
-	"frame-support/std",
 	"sp-runtime/std",
 	"sp-std/std",
+	"frame-system/std",
+	"frame-support/std",
 ]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/randomness-collective-flip/src/lib.rs b/frame/randomness-collective-flip/src/lib.rs
index 724605c6238b..3285addc5bf4 100644
--- a/frame/randomness-collective-flip/src/lib.rs
+++ b/frame/randomness-collective-flip/src/lib.rs
@@ -37,33 +37,41 @@
 //! ### Example - Get random seed for the current block
 //!
 //! ```
-//! use frame_support::{decl_module, dispatch, traits::Randomness};
+//! use frame_support::traits::Randomness;
 //!
-//! pub trait Config: frame_system::Config {}
+//! #[frame_support::pallet]
+//! pub mod pallet {
+//!     use frame_support::pallet_prelude::*;
+//!     use frame_system::pallet_prelude::*;
+//!     use super::*;
 //!
-//! decl_module! {
-//! 	pub struct Module<T: Config> for enum Call where origin: T::Origin {
-//! 		#[weight = 0]
-//! 		pub fn random_module_example(origin) -> dispatch::DispatchResult {
-//! 			let _random_value = <pallet_randomness_collective_flip::Module<T>>::random(&b"my context"[..]);
-//! 			Ok(())
-//! 		}
-//! 	}
+//!     #[pallet::pallet]
+//!     #[pallet::generate_store(pub(super) trait Store)]
+//!     pub struct Pallet<T>(_);
+//!
+//!     #[pallet::config]
+//!     pub trait Config: frame_system::Config + pallet_randomness_collective_flip::Config {}
+//!
+//!     #[pallet::call]
+//!     impl<T: Config> Pallet<T> {
+//!         #[pallet::weight(0)]
+//!         pub fn random_module_example(origin: OriginFor<T>) -> DispatchResult {
+//!             let _random_value = <pallet_randomness_collective_flip::Pallet<T>>::random(&b"my context"[..]);
+//!             Ok(())
+//!         }
+//!     }
 //! }
 //! # fn main() { }
 //! ```
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use sp_std::{prelude::*, convert::TryInto};
-use sp_runtime::traits::{Hash, Saturating};
-use frame_support::{
-	decl_module, decl_storage, traits::Randomness,
-	weights::Weight
-};
 use safe_mix::TripletMix;
+
 use codec::Encode;
-use frame_system::Config;
+use sp_std::{prelude::*, convert::TryInto};
+use sp_runtime::traits::{Hash, Saturating};
+use frame_support::traits::Randomness;
 
 const RANDOM_MATERIAL_LEN: u32 = 81;
 
@@ -73,8 +81,23 @@ fn block_number_to_index<T: Config>(block_number: T::BlockNumber) -> usize {
 	index.try_into().ok().expect("Something % 81 is always smaller than usize; qed")
 }
 
-decl_module! {
-	pub struct Module<T: Config> for enum Call where origin: T::Origin {
+pub use pallet::*;
+
+#[frame_support::pallet]
+pub mod pallet {
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+	use super::*;
+
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(_);
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
 		fn on_initialize(block_number: T::BlockNumber) -> Weight {
 			let parent_hash = <frame_system::Pallet<T>>::parent_hash();
 
@@ -85,21 +108,20 @@ decl_module! {
 				values[index] = parent_hash;
 			});
 
-			0
+			T::DbWeight::get().reads_writes(1, 1)
 		}
 	}
-}
 
-decl_storage! {
-	trait Store for Module<T: Config> as RandomnessCollectiveFlip {
-		/// Series of block headers from the last 81 blocks that acts as random seed material. This
-		/// is arranged as a ring buffer with `block_number % 81` being the index into the `Vec` of
-		/// the oldest hash.
-		RandomMaterial get(fn random_material): Vec<T::Hash>;
-	}
+	/// Series of block headers from the last 81 blocks that acts as random seed material. This
+	/// is arranged as a ring buffer with `block_number % 81` being the index into the `Vec` of
+	/// the oldest hash.
+	#[pallet::storage]
+	#[pallet::getter(fn random_material)]
+	pub(super) type RandomMaterial<T: Config> =
+		StorageValue<_, Vec<T::Hash>, ValueQuery>;
 }
 
-impl<T: Config> Randomness<T::Hash, T::BlockNumber> for Module<T> {
+impl<T: Config> Randomness<T::Hash, T::BlockNumber> for Pallet<T> {
 	/// This randomness uses a low-influence function, drawing upon the block hashes from the
 	/// previous 81 blocks. Its result for any given subject will be known far in advance by anyone
 	/// observing the chain. Any block producer has significant influence over their block hashes
@@ -140,13 +162,15 @@ impl<T: Config> Randomness<T::Hash, T::BlockNumber> for Module<T> {
 mod tests {
 	use crate as pallet_randomness_collective_flip;
 	use super::*;
+
 	use sp_core::H256;
 	use sp_runtime::{
 		testing::Header,
 		traits::{BlakeTwo256, Header as _, IdentityLookup},
 	};
-	use frame_system::limits;
+
 	use frame_support::{parameter_types, traits::{Randomness, OnInitialize}};
+	use frame_system::limits;
 
 	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 	type Block = frame_system::mocking::MockBlock<Test>;
@@ -196,6 +220,8 @@ mod tests {
 		type OnSetCode = ();
 	}
 
+	impl pallet_randomness_collective_flip::Config for Test {}
+
 	fn new_test_ext() -> sp_io::TestExternalities {
 		let t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
 		t.into()

From ea960d6c5350f381f4748b628079691794055610 Mon Sep 17 00:00:00 2001
From: h4x3rotab <h4x3rotab@gmail.com>
Date: Mon, 14 Jun 2021 19:22:39 +0800
Subject: [PATCH 0878/1194] Improve construct_runtime doc (#9096)

- Mention when the pallet definition parts are needed
- Rename "module" to "pallet"
---
 frame/support/procedural/src/lib.rs | 45 +++++++++++++++--------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/frame/support/procedural/src/lib.rs b/frame/support/procedural/src/lib.rs
index 23cb557e6dd7..d3ddd2360b31 100644
--- a/frame/support/procedural/src/lib.rs
+++ b/frame/support/procedural/src/lib.rs
@@ -256,10 +256,10 @@ pub fn decl_storage(input: TokenStream) -> TokenStream {
 	storage::decl_storage_impl(input)
 }
 
-/// Construct a runtime, with the given name and the given modules.
+/// Construct a runtime, with the given name and the given pallets.
 ///
 /// The parameters here are specific types for `Block`, `NodeBlock`, and `UncheckedExtrinsic`
-/// and the modules that are used by the runtime.
+/// and the pallets that are used by the runtime.
 /// `Block` is the block type that is used in the runtime and `NodeBlock` is the block type
 /// that is used in the node. For instance they can differ in the extrinsics type.
 ///
@@ -276,7 +276,7 @@ pub fn decl_storage(input: TokenStream) -> TokenStream {
 ///         Test: test::{Pallet, Call} = 1,
 ///         Test2: test_with_long_module::{Pallet, Event<T>},
 ///
-///         // Module with instances
+///         // Pallets with instances
 ///         Test3_Instance1: test3::<Instance1>::{Pallet, Call, Storage, Event<T, I>, Config<T, I>, Origin<T, I>},
 ///         Test3_DefaultInstance: test3::{Pallet, Call, Storage, Event<T>, Config<T>, Origin<T>} = 4,
 ///     }
@@ -284,38 +284,39 @@ pub fn decl_storage(input: TokenStream) -> TokenStream {
 /// ```
 ///
 /// The identifier `System` is the name of the pallet and the lower case identifier `system` is the
-/// name of the Rust module/crate for this Substrate module. The identifiers between the braces are
-/// the module parts provided by the pallet. It is important to list these parts here to export
+/// name of the Rust module/crate for this Substrate pallet. The identifiers between the braces are
+/// the pallet parts provided by the pallet. It is important to list these parts here to export
 /// them correctly in the metadata or to make the pallet usable in the runtime.
 ///
 /// We provide support for the following module parts in a pallet:
 ///
-/// - `Module`
-/// - `Call`
-/// - `Storage`
-/// - `Event` or `Event<T>` (if the event is generic)
-/// - `Origin` or `Origin<T>` (if the origin is generic)
-/// - `Config` or `Config<T>` (if the config is generic)
-/// - `Inherent` - If the module provides/can check inherents.
-/// - `ValidateUnsigned` - If the module validates unsigned extrinsics.
-///
-/// `= $n` is an optional part allowing to define at which index the module variants in
+/// - `Pallet` - Required for all pallets
+/// - `Call` - If the pallet has callable functions
+/// - `Storage` - If the pallet uses storage
+/// - `Event` or `Event<T>` (if the event is generic) - If the pallet emits events
+/// - `Origin` or `Origin<T>` (if the origin is generic) - If the pallet has instanciable origins
+/// - `Config` or `Config<T>` (if the config is generic) - If the pallet builds the genesis storage
+///   with `GenesisConfig`
+/// - `Inherent` - If the pallet provides/can check inherents.
+/// - `ValidateUnsigned` - If the pallet validates unsigned extrinsics.
+///
+/// `= $n` is an optional part allowing to define at which index the pallet variants in
 /// `OriginCaller`, `Call` and `Event` are encoded, and to define the ModuleToIndex value.
 ///
 /// if `= $n` is not given, then index is resolved same as fieldless enum in Rust
 /// (i.e. incrementedly from previous index):
 /// ```nocompile
-/// module1 .. = 2,
-/// module2 .., // Here module2 is given index 3
-/// module3 .. = 0,
-/// module4 .., // Here module4 is given index 1
+/// pallet1 .. = 2,
+/// pallet2 .., // Here pallet2 is given index 3
+/// pallet3 .. = 0,
+/// pallet4 .., // Here pallet4 is given index 1
 /// ```
 ///
 /// # Note
 ///
-/// The population of the genesis storage depends on the order of modules. So, if one of your
-/// modules depends on another module, the module that is depended upon needs to come before
-/// the module depending on it.
+/// The population of the genesis storage depends on the order of pallets. So, if one of your
+/// pallets depends on another pallet, the pallet that is depended upon needs to come before
+/// the pallet depending on it.
 ///
 /// # Type definitions
 ///

From c666a251691300c1651075a3b59ba1cf59c5a664 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Mon, 14 Jun 2021 16:02:45 +0200
Subject: [PATCH 0879/1194] staking/election: prolonged era and emergency mode
 for governance submission. (#8912)

* Implementation but weird initial era in tests

* Emergency mode for elections. (#8918)

* do some testing, some logging.

* some testing apparatus

* genesis election provider (#8970)

* genesis election provider

* fix historical stuff

* Fix test

* remove dbg

* Apply suggestions from code review

Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com>
Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>

* capitalize comment and name without conflict

* fix log

* Update frame/election-provider-multi-phase/src/lib.rs

* Update frame/election-provider-multi-phase/src/lib.rs

Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>

* apply suggestion on tests

* remove testing modifications

* Apply suggestions from code review

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Co-authored-by: Dmitry Kashitsyn <korvin@deeptown.org>

* apply suggestion

* fix master merge

Co-authored-by: kianenigma <kian@parity.io>
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com>
Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
Co-authored-by: Dmitry Kashitsyn <korvin@deeptown.org>
---
 Cargo.lock                                    |   2 +
 bin/node/runtime/Cargo.toml                   |   1 +
 bin/node/runtime/src/lib.rs                   |   5 +-
 frame/babe/src/mock.rs                        |   1 +
 .../election-provider-multi-phase/src/lib.rs  | 184 ++++++++----
 frame/grandpa/src/mock.rs                     |   1 +
 frame/offences/benchmarking/src/mock.rs       |   1 +
 frame/session/Cargo.toml                      |   2 +
 frame/session/benchmarking/src/mock.rs        |   1 +
 frame/session/src/historical/mod.rs           |  43 ++-
 frame/session/src/lib.rs                      |  27 +-
 frame/staking/src/benchmarking.rs             |   7 +-
 frame/staking/src/lib.rs                      | 284 ++++++++++++------
 frame/staking/src/mock.rs                     |   1 +
 frame/staking/src/tests.rs                    |  51 +++-
 15 files changed, 420 insertions(+), 191 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 17651bf4b3a5..1abbfd394707 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4360,6 +4360,7 @@ name = "node-runtime"
 version = "2.0.1"
 dependencies = [
  "frame-benchmarking",
+ "frame-election-provider-support",
  "frame-executive",
  "frame-support",
  "frame-system",
@@ -5425,6 +5426,7 @@ dependencies = [
  "frame-system",
  "impl-trait-for-tuples",
  "lazy_static",
+ "log",
  "pallet-timestamp",
  "parity-scale-codec",
  "sp-application-crypto",
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index e57944674fcc..9b182c408579 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -43,6 +43,7 @@ frame-benchmarking = { version = "3.1.0", default-features = false, path = "../.
 frame-support = { version = "3.0.0", default-features = false, path = "../../../frame/support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../../../frame/system" }
 frame-system-benchmarking = { version = "3.0.0", default-features = false, path = "../../../frame/system/benchmarking", optional = true }
+frame-election-provider-support = { version = "3.0.0", default-features = false, path = "../../../frame/election-provider-support" }
 frame-system-rpc-runtime-api = { version = "3.0.0", default-features = false, path = "../../../frame/system/rpc/runtime-api/" }
 frame-try-runtime = { version = "0.9.0", default-features = false, path = "../../../frame/try-runtime", optional = true }
 pallet-assets = { version = "3.0.0", default-features = false, path = "../../../frame/assets" }
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 2665607cc42f..3e8053ac4f1b 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -482,6 +482,7 @@ parameter_types! {
 	pub OffchainRepeat: BlockNumber = 5;
 }
 
+use frame_election_provider_support::onchain;
 impl pallet_staking::Config for Runtime {
 	const MAX_NOMINATIONS: u32 = MAX_NOMINATIONS;
 	type Currency = Balances;
@@ -505,6 +506,8 @@ impl pallet_staking::Config for Runtime {
 	type NextNewSession = Session;
 	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
 	type ElectionProvider = ElectionProviderMultiPhase;
+	type GenesisElectionProvider =
+		onchain::OnChainSequentialPhragmen<pallet_election_provider_multi_phase::OnChainConfig<Self>>;
 	type WeightInfo = pallet_staking::weights::SubstrateWeight<Runtime>;
 }
 
@@ -515,7 +518,7 @@ parameter_types! {
 
 	// fallback: no need to do on-chain phragmen initially.
 	pub const Fallback: pallet_election_provider_multi_phase::FallbackStrategy =
-		pallet_election_provider_multi_phase::FallbackStrategy::OnChain;
+		pallet_election_provider_multi_phase::FallbackStrategy::Nothing;
 
 	pub SolutionImprovementThreshold: Perbill = Perbill::from_rational(1u32, 10_000);
 
diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index 236b975817ff..770e20cb786e 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -213,6 +213,7 @@ impl pallet_staking::Config for Test {
 	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
 	type NextNewSession = Session;
 	type ElectionProvider = onchain::OnChainSequentialPhragmen<Self>;
+	type GenesisElectionProvider = Self::ElectionProvider;
 	type WeightInfo = ();
 }
 
diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index 0254525ce819..2bb47a877807 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -115,7 +115,23 @@
 //! good solution is queued, then the fallback strategy [`pallet::Config::Fallback`] is used to
 //! determine what needs to be done. The on-chain election is slow, and contains no balancing or
 //! reduction post-processing. See [`onchain::OnChainSequentialPhragmen`]. The
-//! [`FallbackStrategy::Nothing`] should probably only be used for testing, and returns an error.
+//! [`FallbackStrategy::Nothing`] just returns an error, and enables the [`Phase::Emergency`].
+//!
+//! ### Emergency Phase
+//!
+//! If, for any of the below reasons:
+//!
+//! 1. No signed or unsigned solution submitted & Fallback is `None` or failed
+//! 2. Internal error
+//!
+//! A call to `T::ElectionProvider::elect` is made, and `Ok(_)` cannot be returned, then the pallet
+//! proceeds to the [`Phase::Emergency`]. During this phase, any solution can be submitted from
+//! [`T::ForceOrigin`], without any checking. Once submitted, the forced solution is kept in
+//! [`QueuedSolution`] until the next call to `T::ElectionProvider::elect`, where it is returned and
+//! [`Phase`] goes back to `Off`.
+//!
+//! This implies that the user of this pallet (i.e. a staking pallet) should re-try calling
+//! `T::ElectionProvider::elect` in case of error until `OK(_)` is returned.
 //!
 //! ## Feasible Solution (correct solution)
 //!
@@ -269,7 +285,7 @@ pub type CompactAccuracyOf<T> = <CompactOf<T> as CompactSolution>::Accuracy;
 pub type OnChainAccuracyOf<T> = <T as Config>::OnChainAccuracy;
 
 /// Wrapper type that implements the configurations needed for the on-chain backup.
-struct OnChainConfig<T: Config>(sp_std::marker::PhantomData<T>);
+pub struct OnChainConfig<T: Config>(sp_std::marker::PhantomData<T>);
 impl<T: Config> onchain::Config for OnChainConfig<T> {
 	type AccountId = T::AccountId;
 	type BlockNumber = T::BlockNumber;
@@ -312,9 +328,13 @@ pub enum Phase<Bn> {
 	/// advising validators not to bother running the unsigned offchain worker.
 	///
 	/// As validator nodes are free to edit their OCW code, they could simply ignore this advisory
-	/// and always compute their own solution. However, by default, when the unsigned phase is passive,
-	/// the offchain workers will not bother running.
+	/// and always compute their own solution. However, by default, when the unsigned phase is
+	/// passive, the offchain workers will not bother running.
 	Unsigned((bool, Bn)),
+	/// The emergency phase. This is enabled upon a failing call to `T::ElectionProvider::elect`.
+	/// After that, the only way to leave this phase is through a successful
+	/// `T::ElectionProvider::elect`.
+	Emergency,
 }
 
 impl<Bn> Default for Phase<Bn> {
@@ -324,6 +344,11 @@ impl<Bn> Default for Phase<Bn> {
 }
 
 impl<Bn: PartialEq + Eq> Phase<Bn> {
+	/// Whether the phase is emergency or not.
+	pub fn is_emergency(&self) -> bool {
+		matches!(self, Phase::Emergency)
+	}
+
 	/// Whether the phase is signed or not.
 	pub fn is_signed(&self) -> bool {
 		matches!(self, Phase::Signed)
@@ -582,7 +607,8 @@ pub mod pallet {
 		/// Configuration for the fallback
 		type Fallback: Get<FallbackStrategy>;
 
-		/// Origin that can set the minimum score.
+		/// Origin that can control this pallet. Note that any action taken by this origin (such)
+		/// as providing an emergency solution is not checked. Thus, it must be a trusted origin. 
 		type ForceOrigin: EnsureOrigin<Self::Origin>;
 
 		/// The configuration of benchmarking.
@@ -603,6 +629,13 @@ pub mod pallet {
 			let remaining = next_election - now;
 			let current_phase = Self::current_phase();
 
+			log!(
+				trace,
+				"current phase {:?}, next election {:?}, metadata: {:?}",
+				current_phase,
+				next_election,
+				Self::snapshot_metadata()
+			);
 			match current_phase {
 				Phase::Off if remaining <= signed_deadline && remaining > unsigned_deadline => {
 					// NOTE: if signed-phase length is zero, second part of the if-condition fails.
@@ -612,7 +645,7 @@ pub mod pallet {
 							T::WeightInfo::on_initialize_open_signed().saturating_add(snap_weight)
 						}
 						Err(why) => {
-							// not much we can do about this at this point.
+							// Not much we can do about this at this point.
 							log!(warn, "failed to open signed phase due to {:?}", why);
 							T::WeightInfo::on_initialize_nothing()
 							// NOTE: ^^ The trait specifies that this is a noop in terms of weight
@@ -623,13 +656,13 @@ pub mod pallet {
 				Phase::Signed | Phase::Off
 					if remaining <= unsigned_deadline && remaining > Zero::zero() =>
 				{
-					// determine if followed by signed or not.
+					// Determine if followed by signed or not.
 					let (need_snapshot, enabled, signed_weight) = if current_phase == Phase::Signed {
-						// followed by a signed phase: close the signed phase, no need for snapshot.
+						// Followed by a signed phase: close the signed phase, no need for snapshot.
 						// TODO: proper weight https://github.com/paritytech/substrate/pull/7910.
 						(false, true, Weight::zero())
 					} else {
-						// no signed phase: create a new snapshot, definitely `enable` the unsigned
+						// No signed phase: create a new snapshot, definitely `enable` the unsigned
 						// phase.
 						(true, true, Weight::zero())
 					};
@@ -646,7 +679,7 @@ pub mod pallet {
 							base_weight.saturating_add(snap_weight).saturating_add(signed_weight)
 						}
 						Err(why) => {
-							// not much we can do about this at this point.
+							// Not much we can do about this at this point.
 							log!(warn, "failed to open unsigned phase due to {:?}", why);
 							T::WeightInfo::on_initialize_nothing()
 							// NOTE: ^^ The trait specifies that this is a noop in terms of weight
@@ -661,7 +694,7 @@ pub mod pallet {
 		fn offchain_worker(now: T::BlockNumber) {
 			use sp_runtime::offchain::storage_lock::{StorageLock, BlockAndTime};
 
-			// create a lock with the maximum deadline of number of blocks in the unsigned phase.
+			// Create a lock with the maximum deadline of number of blocks in the unsigned phase.
 			// This should only come useful in an **abrupt** termination of execution, otherwise the
 			// guard will be dropped upon successful execution.
 			let mut lock = StorageLock::<BlockAndTime<frame_system::Pallet::<T>>>::with_block_deadline(
@@ -687,7 +720,7 @@ pub mod pallet {
 			assert!(size_of::<CompactTargetIndexOf<T>>() <= size_of::<usize>());
 
 			// ----------------------------
-			// based on the requirements of [`sp_npos_elections::Assignment::try_normalize`].
+			// Based on the requirements of [`sp_npos_elections::Assignment::try_normalize`].
 			let max_vote: usize = <CompactOf<T> as CompactSolution>::LIMIT;
 
 			// 1. Maximum sum of [ChainAccuracy; 16] must fit into `UpperOf<ChainAccuracy>`..
@@ -761,7 +794,7 @@ pub mod pallet {
 			// Check score being an improvement, phase, and desired targets.
 			Self::unsigned_pre_dispatch_checks(&solution).expect(error_message);
 
-			// ensure witness was correct.
+			// Ensure witness was correct.
 			let SolutionOrSnapshotSize { voters, targets } =
 				Self::snapshot_metadata().expect(error_message);
 
@@ -772,7 +805,7 @@ pub mod pallet {
 			let ready =
 				Self::feasibility_check(solution, ElectionCompute::Unsigned).expect(error_message);
 
-			// store the newly received solution.
+			// Store the newly received solution.
 			log!(info, "queued unsigned solution with score {:?}", ready.score);
 			<QueuedSolution<T>>::put(ready);
 			Self::deposit_event(Event::SolutionStored(ElectionCompute::Unsigned));
@@ -794,6 +827,29 @@ pub mod pallet {
 			<MinimumUntrustedScore<T>>::set(maybe_next_score);
 			Ok(())
 		}
+
+		/// Set a solution in the queue, to be handed out to the client of this pallet in the next
+		/// call to `ElectionProvider::elect`.
+		///
+		/// This can only be set by `T::ForceOrigin`, and only when the phase is `Emergency`.
+		///
+		/// The solution is not checked for any feasibility and is assumed to be trustworthy, as any
+		/// feasibility check itself can in principle cause the election process to fail (due to
+		/// memory/weight constrains).
+		#[pallet::weight(T::DbWeight::get().reads_writes(1, 1))]
+		pub fn set_emergency_election_result(
+			origin: OriginFor<T>,
+			solution: ReadySolution<T::AccountId>,
+		) -> DispatchResult {
+			T::ForceOrigin::ensure_origin(origin)?;
+			ensure!(Self::current_phase().is_emergency(), <Error<T>>::CallNotAllowed);
+
+			// Note: we don't `rotate_round` at this point; the next call to
+			// `ElectionProvider::elect` will succeed and take care of that.
+
+			<QueuedSolution<T>>::put(solution);
+			Ok(())
+		}
 	}
 
 	#[pallet::event]
@@ -829,6 +885,8 @@ pub mod pallet {
 		PreDispatchWeakSubmission,
 		/// OCW submitted solution for wrong round
 		OcwCallWrongEra,
+		/// The call is not allowed at this point.
+		CallNotAllowed,
 	}
 
 	#[pallet::origin]
@@ -838,7 +896,7 @@ pub mod pallet {
 		type Call = Call<T>;
 		fn validate_unsigned(source: TransactionSource, call: &Self::Call) -> TransactionValidity {
 			if let Call::submit_unsigned(solution, _) = call {
-				// discard solution not coming from the local OCW.
+				// Discard solution not coming from the local OCW.
 				match source {
 					TransactionSource::Local | TransactionSource::InBlock => { /* allowed */ }
 					_ => {
@@ -860,10 +918,10 @@ pub mod pallet {
 							solution.score[0].saturated_into()
 						),
 					)
-					// used to deduplicate unsigned solutions: each validator should produce one
+					// Used to deduplicate unsigned solutions: each validator should produce one
 					// solution per round at most, and solutions are not propagate.
 					.and_provides(solution.round)
-					// transaction should stay in the pool for the duration of the unsigned phase.
+					// Transaction should stay in the pool for the duration of the unsigned phase.
 					.longevity(T::UnsignedPhase::get().saturated_into::<u64>())
 					// We don't propagate this. This can never be validated at a remote node.
 					.propagate(false)
@@ -950,14 +1008,14 @@ impl<T: Config> Pallet<T> {
 		log!(trace, "lock for offchain worker acquired.");
 		match Self::current_phase() {
 			Phase::Unsigned((true, opened)) if opened == now => {
-				// mine a new solution, cache it, and attempt to submit it
+				// Mine a new solution, cache it, and attempt to submit it
 				let initial_output = Self::ensure_offchain_repeat_frequency(now).and_then(|_| {
 					Self::mine_check_save_submit()
 				});
 				log!(debug, "initial offchain thread output: {:?}", initial_output);
 			}
 			Phase::Unsigned((true, opened)) if opened < now => {
-				// try and resubmit the cached solution, and recompute ONLY if it is not
+				// Try and resubmit the cached solution, and recompute ONLY if it is not
 				// feasible.
 				let resubmit_output = Self::ensure_offchain_repeat_frequency(now).and_then(|_| {
 					Self::restore_or_compute_then_maybe_submit()
@@ -967,7 +1025,7 @@ impl<T: Config> Pallet<T> {
 			_ => {}
 		}
 
-		// after election finalization, clear OCW solution storage.
+		// After election finalization, clear OCW solution storage.
 		if <frame_system::Pallet<T>>::events()
 			.into_iter()
 			.filter_map(|event_record| {
@@ -1007,7 +1065,7 @@ impl<T: Config> Pallet<T> {
 		now: T::BlockNumber,
 	) -> Result<Weight, ElectionError> {
 		let weight = if need_snapshot {
-			// if not being followed by a signed phase, then create the snapshots.
+			// If not being followed by a signed phase, then create the snapshots.
 			debug_assert!(Self::snapshot().is_none());
 			Self::create_snapshot()?
 		} else {
@@ -1037,13 +1095,13 @@ impl<T: Config> Pallet<T> {
 		let (desired_targets, w3) =
 			T::DataProvider::desired_targets().map_err(ElectionError::DataProvider)?;
 
-		// defensive-only
+		// Defensive-only.
 		if targets.len() > target_limit || voters.len() > voter_limit {
 			debug_assert!(false, "Snapshot limit has not been respected.");
 			return Err(ElectionError::DataProvider("Snapshot too big for submission."));
 		}
 
-		// only write snapshot if all existed.
+		// Only write snapshot if all existed.
 		<SnapshotMetadata<T>>::put(SolutionOrSnapshotSize {
 			voters: voters.len() as u32,
 			targets: targets.len() as u32,
@@ -1067,10 +1125,10 @@ impl<T: Config> Pallet<T> {
 	) -> Result<ReadySolution<T::AccountId>, FeasibilityError> {
 		let RawSolution { compact, score, round } = solution;
 
-		// first, check round.
+		// First, check round.
 		ensure!(Self::round() == round, FeasibilityError::InvalidRound);
 
-		// winners are not directly encoded in the solution.
+		// Winners are not directly encoded in the solution.
 		let winners = compact.unique_targets();
 
 		let desired_targets =
@@ -1081,7 +1139,7 @@ impl<T: Config> Pallet<T> {
 		// upon arrival, thus we would then remove it here. Given overlay it is cheap anyhow
 		ensure!(winners.len() as u32 == desired_targets, FeasibilityError::WrongWinnerCount);
 
-		// ensure that the solution's score can pass absolute min-score.
+		// Ensure that the solution's score can pass absolute min-score.
 		let submitted_score = solution.score.clone();
 		ensure!(
 			Self::minimum_untrusted_score().map_or(true, |min_score|
@@ -1090,7 +1148,7 @@ impl<T: Config> Pallet<T> {
 			FeasibilityError::UntrustedScoreTooLow
 		);
 
-		// read the entire snapshot.
+		// Read the entire snapshot.
 		let RoundSnapshot { voters: snapshot_voters, targets: snapshot_targets } =
 			Self::snapshot().ok_or(FeasibilityError::SnapshotUnavailable)?;
 
@@ -1100,7 +1158,7 @@ impl<T: Config> Pallet<T> {
 		let target_at = helpers::target_at_fn::<T>(&snapshot_targets);
 		let voter_index = helpers::voter_index_fn_usize::<T>(&cache);
 
-		// first, make sure that all the winners are sane.
+		// First, make sure that all the winners are sane.
 		// OPTIMIZATION: we could first build the assignments, and then extract the winners directly
 		// from that, as that would eliminate a little bit of duplicate work. For now, we keep them
 		// separate: First extract winners separately from compact, and then assignments. This is
@@ -1119,19 +1177,19 @@ impl<T: Config> Pallet<T> {
 		let _ = assignments
 			.iter()
 			.map(|ref assignment| {
-				// check that assignment.who is actually a voter (defensive-only).
+				// Check that assignment.who is actually a voter (defensive-only).
 				// NOTE: while using the index map from `voter_index` is better than a blind linear
 				// search, this *still* has room for optimization. Note that we had the index when
 				// we did `compact -> assignment` and we lost it. Ideal is to keep the index around.
 
-				// defensive-only: must exist in the snapshot.
+				// Defensive-only: must exist in the snapshot.
 				let snapshot_index =
 					voter_index(&assignment.who).ok_or(FeasibilityError::InvalidVoter)?;
-				// defensive-only: index comes from the snapshot, must exist.
+				// Defensive-only: index comes from the snapshot, must exist.
 				let (_voter, _stake, targets) =
 					snapshot_voters.get(snapshot_index).ok_or(FeasibilityError::InvalidVoter)?;
 
-				// check that all of the targets are valid based on the snapshot.
+				// Check that all of the targets are valid based on the snapshot.
 				if assignment.distribution.iter().any(|(d, _)| !targets.contains(d)) {
 					return Err(FeasibilityError::InvalidVote);
 				}
@@ -1163,14 +1221,14 @@ impl<T: Config> Pallet<T> {
 	/// 1. Increment round.
 	/// 2. Change phase to [`Phase::Off`]
 	/// 3. Clear all snapshot data.
-	fn post_elect() {
-		// inc round
+	fn rotate_round() {
+		// Inc round.
 		<Round<T>>::mutate(|r| *r = *r + 1);
 
-		// change phase
+		// Phase is off now.
 		<CurrentPhase<T>>::put(Phase::Off);
 
-		// kill snapshots
+		// Kill snapshots.
 		Self::kill_snapshot();
 	}
 
@@ -1220,10 +1278,18 @@ impl<T: Config> ElectionProvider<T::AccountId, T::BlockNumber> for Pallet<T> {
 	type DataProvider = T::DataProvider;
 
 	fn elect() -> Result<(Supports<T::AccountId>, Weight), Self::Error> {
-		let outcome_and_weight = Self::do_elect();
-		// IMPORTANT: regardless of if election was `Ok` or `Err`, we shall do some cleanup.
-		Self::post_elect();
-		outcome_and_weight
+		match Self::do_elect() {
+			Ok((supports, weight)) => {
+				// All went okay, put sign to be Off, clean snapshot, etc.
+				Self::rotate_round();
+				Ok((supports, weight))
+			}
+			Err(why) => {
+				log!(error, "Entering emergency mode: {:?}", why);
+				<CurrentPhase<T>>::put(Phase::Emergency);
+				Err(why)
+			}
+		}
 	}
 }
 
@@ -1254,7 +1320,7 @@ mod feasibility_check {
 			assert!(MultiPhase::current_phase().is_signed());
 			let solution = raw_solution();
 
-			// for whatever reason it might be:
+			// For whatever reason it might be:
 			<Snapshot<Runtime>>::kill();
 
 			assert_noop!(
@@ -1307,7 +1373,7 @@ mod feasibility_check {
 			assert_eq!(MultiPhase::snapshot().unwrap().targets.len(), 4);
 			// ----------------------------------------------------^^ valid range is [0..3].
 
-			// swap all votes from 3 to 4. This will ensure that the number of unique winners
+			// Swap all votes from 3 to 4. This will ensure that the number of unique winners
 			// will still be 4, but one of the indices will be gibberish. Requirement is to make
 			// sure 3 a winner, which we don't do here.
 			solution
@@ -1333,7 +1399,7 @@ mod feasibility_check {
 
 	#[test]
 	fn voter_indices() {
-		// should be caught in `compact.into_assignment`.
+		// Should be caught in `compact.into_assignment`.
 		ExtBuilder::default().desired_targets(2).build_and_execute(|| {
 			roll_to(<EpochLength>::get() - <SignedPhase>::get() - <UnsignedPhase>::get());
 			assert!(MultiPhase::current_phase().is_signed());
@@ -1342,7 +1408,7 @@ mod feasibility_check {
 			assert_eq!(MultiPhase::snapshot().unwrap().voters.len(), 8);
 			// ----------------------------------------------------^^ valid range is [0..7].
 
-			// check that there is a index 7 in votes1, and flip to 8.
+			// Check that there is an index 7 in votes1, and flip to 8.
 			assert!(
 				solution
 					.compact
@@ -1369,7 +1435,7 @@ mod feasibility_check {
 			assert_eq!(MultiPhase::snapshot().unwrap().voters.len(), 8);
 			// ----------------------------------------------------^^ valid range is [0..7].
 
-			// first, check that voter at index 7 (40) actually voted for 3 (40) -- this is self
+			// First, check that voter at index 7 (40) actually voted for 3 (40) -- this is self
 			// vote. Then, change the vote to 2 (30).
 			assert_eq!(
 				solution
@@ -1397,7 +1463,7 @@ mod feasibility_check {
 			let mut solution = raw_solution();
 			assert_eq!(MultiPhase::snapshot().unwrap().voters.len(), 8);
 
-			// simply faff with the score.
+			// Simply faff with the score.
 			solution.score[0] += 1;
 
 			assert_noop!(
@@ -1457,7 +1523,7 @@ mod tests {
 			assert_eq!(MultiPhase::current_phase(), Phase::Unsigned((true, 25)));
 			assert!(MultiPhase::snapshot().is_some());
 
-			// we close when upstream tells us to elect.
+			// We close when upstream tells us to elect.
 			roll_to(32);
 			assert_eq!(MultiPhase::current_phase(), Phase::Unsigned((true, 25)));
 			assert!(MultiPhase::snapshot().is_some());
@@ -1540,7 +1606,7 @@ mod tests {
 			roll_to(30);
 			assert!(MultiPhase::current_phase().is_off());
 
-			// this module is now only capable of doing on-chain backup.
+			// This module is now only capable of doing on-chain backup.
 			assert_ok!(MultiPhase::elect());
 
 			assert!(MultiPhase::current_phase().is_off());
@@ -1549,9 +1615,9 @@ mod tests {
 
 	#[test]
 	fn early_termination() {
-		// an early termination in the signed phase, with no queued solution.
+		// An early termination in the signed phase, with no queued solution.
 		ExtBuilder::default().build_and_execute(|| {
-			// signed phase started at block 15 and will end at 25.
+			// Signed phase started at block 15 and will end at 25.
 			roll_to(14);
 			assert_eq!(MultiPhase::current_phase(), Phase::Off);
 
@@ -1560,11 +1626,11 @@ mod tests {
 			assert_eq!(MultiPhase::current_phase(), Phase::Signed);
 			assert_eq!(MultiPhase::round(), 1);
 
-			// an unexpected call to elect.
+			// An unexpected call to elect.
 			roll_to(20);
 			MultiPhase::elect().unwrap();
 
-			// we surely can't have any feasible solutions. This will cause an on-chain election.
+			// We surely can't have any feasible solutions. This will cause an on-chain election.
 			assert_eq!(
 				multi_phase_events(),
 				vec![
@@ -1572,7 +1638,7 @@ mod tests {
 					Event::ElectionFinalized(Some(ElectionCompute::OnChain))
 				],
 			);
-			// all storage items must be cleared.
+			// All storage items must be cleared.
 			assert_eq!(MultiPhase::round(), 2);
 			assert!(MultiPhase::snapshot().is_none());
 			assert!(MultiPhase::snapshot_metadata().is_none());
@@ -1590,7 +1656,7 @@ mod tests {
 			roll_to(25);
 			assert_eq!(MultiPhase::current_phase(), Phase::Unsigned((true, 25)));
 
-			// zilch solutions thus far.
+			// Zilch solutions thus far.
 			let (supports, _) = MultiPhase::elect().unwrap();
 
 			assert_eq!(
@@ -1609,7 +1675,7 @@ mod tests {
 			roll_to(25);
 			assert_eq!(MultiPhase::current_phase(), Phase::Unsigned((true, 25)));
 
-			// zilch solutions thus far.
+			// Zilch solutions thus far.
 			assert_eq!(MultiPhase::elect().unwrap_err(), ElectionError::NoFallbackConfigured);
 		})
 	}
@@ -1619,15 +1685,15 @@ mod tests {
 		ExtBuilder::default().build_and_execute(|| {
 			Targets::set((0..(TargetIndex::max_value() as AccountId) + 1).collect::<Vec<_>>());
 
-			// signed phase failed to open.
+			// Signed phase failed to open.
 			roll_to(15);
 			assert_eq!(MultiPhase::current_phase(), Phase::Off);
 
-			// unsigned phase failed to open.
+			// Unsigned phase failed to open.
 			roll_to(25);
 			assert_eq!(MultiPhase::current_phase(), Phase::Off);
 
-			// on-chain backup works though.
+			// On-chain backup works though.
 			roll_to(29);
 			let (supports, _) = MultiPhase::elect().unwrap();
 			assert!(supports.len() > 0);
@@ -1642,7 +1708,7 @@ mod tests {
 
 
 			let (solution, _) = MultiPhase::mine_solution(2).unwrap();
-			// default solution has a score of [50, 100, 5000].
+			// Default solution has a score of [50, 100, 5000].
 			assert_eq!(solution.score, [50, 100, 5000]);
 
 			<MinimumUntrustedScore<Runtime>>::put([49, 0, 0]);
diff --git a/frame/grandpa/src/mock.rs b/frame/grandpa/src/mock.rs
index 752d94ce1908..fe8a1bd4a395 100644
--- a/frame/grandpa/src/mock.rs
+++ b/frame/grandpa/src/mock.rs
@@ -219,6 +219,7 @@ impl pallet_staking::Config for Test {
 	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
 	type NextNewSession = Session;
 	type ElectionProvider = onchain::OnChainSequentialPhragmen<Self>;
+	type GenesisElectionProvider = Self::ElectionProvider;
 	type WeightInfo = ();
 }
 
diff --git a/frame/offences/benchmarking/src/mock.rs b/frame/offences/benchmarking/src/mock.rs
index 7230c1215afc..b780662b92cd 100644
--- a/frame/offences/benchmarking/src/mock.rs
+++ b/frame/offences/benchmarking/src/mock.rs
@@ -178,6 +178,7 @@ impl pallet_staking::Config for Test {
 	type NextNewSession = Session;
 	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
 	type ElectionProvider = onchain::OnChainSequentialPhragmen<Self>;
+	type GenesisElectionProvider = Self::ElectionProvider;
 	type WeightInfo = ();
 }
 
diff --git a/frame/session/Cargo.toml b/frame/session/Cargo.toml
index 44e1f2f67858..efe7bc133fb4 100644
--- a/frame/session/Cargo.toml
+++ b/frame/session/Cargo.toml
@@ -24,6 +24,7 @@ frame-support = { version = "3.0.0", default-features = false, path = "../suppor
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 pallet-timestamp = { version = "3.0.0", default-features = false, path = "../timestamp" }
 sp-trie = { version = "3.0.0", optional = true, default-features = false, path = "../../primitives/trie" }
+log = { version = "0.4.0", default-features = false }
 impl-trait-for-tuples = "0.2.1"
 
 [dev-dependencies]
@@ -44,5 +45,6 @@ std = [
 	"sp-staking/std",
 	"pallet-timestamp/std",
 	"sp-trie/std",
+	"log/std",
 ]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/session/benchmarking/src/mock.rs b/frame/session/benchmarking/src/mock.rs
index 87d1242812db..591e54f067bb 100644
--- a/frame/session/benchmarking/src/mock.rs
+++ b/frame/session/benchmarking/src/mock.rs
@@ -183,6 +183,7 @@ impl pallet_staking::Config for Test {
 	type NextNewSession = Session;
 	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
 	type ElectionProvider = onchain::OnChainSequentialPhragmen<Self>;
+	type GenesisElectionProvider = Self::ElectionProvider;
 	type WeightInfo = ();
 }
 
diff --git a/frame/session/src/historical/mod.rs b/frame/session/src/historical/mod.rs
index 8902ebe551f6..3cfcbf98bf38 100644
--- a/frame/session/src/historical/mod.rs
+++ b/frame/session/src/historical/mod.rs
@@ -124,10 +124,17 @@ impl<T: Config> ValidatorSetWithIdentification<T::AccountId> for Module<T> {
 
 /// Specialization of the crate-level `SessionManager` which returns the set of full identification
 /// when creating a new session.
-pub trait SessionManager<ValidatorId, FullIdentification>: crate::SessionManager<ValidatorId> {
+pub trait SessionManager<ValidatorId, FullIdentification>:
+	crate::SessionManager<ValidatorId>
+{
 	/// If there was a validator set change, its returns the set of new validators along with their
 	/// full identifications.
 	fn new_session(new_index: SessionIndex) -> Option<Vec<(ValidatorId, FullIdentification)>>;
+	fn new_session_genesis(
+		new_index: SessionIndex,
+	) -> Option<Vec<(ValidatorId, FullIdentification)>> {
+		<Self as SessionManager<_, _>>::new_session(new_index)
+	}
 	fn start_session(start_index: SessionIndex);
 	fn end_session(end_index: SessionIndex);
 }
@@ -136,19 +143,20 @@ pub trait SessionManager<ValidatorId, FullIdentification>: crate::SessionManager
 /// sets the historical trie root of the ending session.
 pub struct NoteHistoricalRoot<T, I>(sp_std::marker::PhantomData<(T, I)>);
 
-impl<T: Config, I> crate::SessionManager<T::ValidatorId> for NoteHistoricalRoot<T, I>
-	where I: SessionManager<T::ValidatorId, T::FullIdentification>
-{
-	fn new_session(new_index: SessionIndex) -> Option<Vec<T::ValidatorId>> {
-
+impl<T: Config, I: SessionManager<T::ValidatorId, T::FullIdentification>> NoteHistoricalRoot<T, I> {
+	fn do_new_session(new_index: SessionIndex, is_genesis: bool) -> Option<Vec<T::ValidatorId>> {
 		StoredRange::mutate(|range| {
 			range.get_or_insert_with(|| (new_index, new_index)).1 = new_index + 1;
 		});
 
-		let new_validators_and_id = <I as SessionManager<_, _>>::new_session(new_index);
-		let new_validators = new_validators_and_id.as_ref().map(|new_validators| {
-			new_validators.iter().map(|(v, _id)| v.clone()).collect()
-		});
+		let new_validators_and_id = if is_genesis {
+			<I as SessionManager<_, _>>::new_session_genesis(new_index)
+		} else {
+			<I as SessionManager<_, _>>::new_session(new_index)
+		};
+		let new_validators_opt = new_validators_and_id
+			.as_ref()
+			.map(|new_validators| new_validators.iter().map(|(v, _id)| v.clone()).collect());
 
 		if let Some(new_validators) = new_validators_and_id {
 			let count = new_validators.len() as ValidatorCount;
@@ -166,7 +174,20 @@ impl<T: Config, I> crate::SessionManager<T::ValidatorId> for NoteHistoricalRoot<
 			}
 		}
 
-		new_validators
+		new_validators_opt
+	}
+}
+
+impl<T: Config, I> crate::SessionManager<T::ValidatorId> for NoteHistoricalRoot<T, I>
+where
+	I: SessionManager<T::ValidatorId, T::FullIdentification>,
+{
+	fn new_session(new_index: SessionIndex) -> Option<Vec<T::ValidatorId>> {
+		Self::do_new_session(new_index, false)
+	}
+
+	fn new_session_genesis(new_index: SessionIndex) -> Option<Vec<T::ValidatorId>> {
+		Self::do_new_session(new_index, true)
 	}
 
 	fn start_session(start_index: SessionIndex) {
diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs
index 547d29715d9c..933aff02972f 100644
--- a/frame/session/src/lib.rs
+++ b/frame/session/src/lib.rs
@@ -238,12 +238,19 @@ pub trait SessionManager<ValidatorId> {
 	/// `new_session(session)` is guaranteed to be called before `end_session(session-1)`. In other
 	/// words, a new session must always be planned before an ongoing one can be finished.
 	fn new_session(new_index: SessionIndex) -> Option<Vec<ValidatorId>>;
+	/// Same as `new_session`, but it this should only be called at genesis.
+	///
+	/// The session manager might decide to treat this in a different way. Default impl is simply
+	/// using [`new_session`].
+	fn new_session_genesis(new_index: SessionIndex) -> Option<Vec<ValidatorId>> {
+		Self::new_session(new_index)
+	}
 	/// End the session.
 	///
 	/// Because the session pallet can queue validator set the ending session can be lower than the
 	/// last new session index.
 	fn end_session(end_index: SessionIndex);
-	/// Start the session.
+	/// Start an already planned session.
 	///
 	/// The session start to be used for validation.
 	fn start_session(start_index: SessionIndex);
@@ -340,13 +347,9 @@ impl<AId> SessionHandler<AId> for Tuple {
 pub struct TestSessionHandler;
 impl<AId> SessionHandler<AId> for TestSessionHandler {
 	const KEY_TYPE_IDS: &'static [KeyTypeId] = &[sp_runtime::key_types::DUMMY];
-
 	fn on_genesis_session<Ks: OpaqueKeys>(_: &[(AId, Ks)]) {}
-
 	fn on_new_session<Ks: OpaqueKeys>(_: bool, _: &[(AId, Ks)], _: &[(AId, Ks)]) {}
-
 	fn on_before_session_ending() {}
-
 	fn on_disabled(_: usize) {}
 }
 
@@ -451,7 +454,7 @@ decl_storage! {
 				}
 			}
 
-			let initial_validators_0 = T::SessionManager::new_session(0)
+			let initial_validators_0 = T::SessionManager::new_session_genesis(0)
 				.unwrap_or_else(|| {
 					frame_support::print("No initial validator provided by `SessionManager`, use \
 						session config keys to generate initial validator set.");
@@ -459,7 +462,7 @@ decl_storage! {
 				});
 			assert!(!initial_validators_0.is_empty(), "Empty validator set for session 0 in genesis block!");
 
-			let initial_validators_1 = T::SessionManager::new_session(1)
+			let initial_validators_1 = T::SessionManager::new_session_genesis(1)
 				.unwrap_or_else(|| initial_validators_0.clone());
 			assert!(!initial_validators_1.is_empty(), "Empty validator set for session 1 in genesis block!");
 
@@ -548,7 +551,7 @@ decl_module! {
 		///   Actual cost depends on the number of length of `T::Keys::key_ids()` which is fixed.
 		/// - DbReads: `T::ValidatorIdOf`, `NextKeys`, `origin account`
 		/// - DbWrites: `NextKeys`, `origin account`
-		/// - DbWrites per key id: `KeyOwnder`
+		/// - DbWrites per key id: `KeyOwner`
 		/// # </weight>
 		#[weight = T::WeightInfo::purge_keys()]
 		pub fn purge_keys(origin) {
@@ -573,17 +576,17 @@ decl_module! {
 }
 
 impl<T: Config> Module<T> {
-	/// Move on to next session. Register new validator set and session keys. Changes
-	/// to the validator set have a session of delay to take effect. This allows for
-	/// equivocation punishment after a fork.
+	/// Move on to next session. Register new validator set and session keys. Changes to the
+	/// validator set have a session of delay to take effect. This allows for equivocation
+	/// punishment after a fork.
 	pub fn rotate_session() {
 		let session_index = CurrentIndex::get();
+		log::trace!(target: "runtime::session", "rotating session {:?}", session_index);
 
 		let changed = QueuedChanged::get();
 
 		// Inform the session handlers that a session is going to end.
 		T::SessionHandler::on_before_session_ending();
-
 		T::SessionManager::end_session(session_index);
 
 		// Get queued session keys and validators.
diff --git a/frame/staking/src/benchmarking.rs b/frame/staking/src/benchmarking.rs
index 800d3379d7e3..2ad939e5b166 100644
--- a/frame/staking/src/benchmarking.rs
+++ b/frame/staking/src/benchmarking.rs
@@ -91,7 +91,7 @@ pub fn create_validator_with_nominators<T: Config>(
 	ValidatorCount::<T>::put(1);
 
 	// Start a new Era
-	let new_validators = Staking::<T>::new_era(SessionIndex::one()).unwrap();
+	let new_validators = Staking::<T>::try_trigger_new_era(SessionIndex::one(), true).unwrap();
 
 	assert_eq!(new_validators.len(), 1);
 	assert_eq!(new_validators[0], v_stash, "Our validator was not selected!");
@@ -484,7 +484,8 @@ benchmarks! {
 		)?;
 		let session_index = SessionIndex::one();
 	}: {
-		let validators = Staking::<T>::new_era(session_index).ok_or("`new_era` failed")?;
+		let validators = Staking::<T>::try_trigger_new_era(session_index, true)
+			.ok_or("`new_era` failed")?;
 		assert!(validators.len() == v as usize);
 	}
 
@@ -500,7 +501,7 @@ benchmarks! {
 			None,
 		)?;
 		// Start a new Era
-		let new_validators = Staking::<T>::new_era(SessionIndex::one()).unwrap();
+		let new_validators = Staking::<T>::try_trigger_new_era(SessionIndex::one(), true).unwrap();
 		assert!(new_validators.len() == v as usize);
 
 		let current_era = CurrentEra::<T>::get().unwrap();
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 30c2a160e9e7..58ab459d1bf2 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -304,7 +304,7 @@ use sp_runtime::{
 	curve::PiecewiseLinear,
 	traits::{
 		Convert, Zero, StaticLookup, CheckedSub, Saturating, SaturatedConversion,
-		AtLeast32BitUnsigned,
+		AtLeast32BitUnsigned, Bounded,
 	},
 };
 use sp_staking::{
@@ -542,7 +542,7 @@ impl<AccountId, Balance> StakingLedger<AccountId, Balance> where
 			if !slash_from_target.is_zero() {
 				*target -= slash_from_target;
 
-				// don't leave a dust balance in the staking system.
+				// Don't leave a dust balance in the staking system.
 				if *target <= minimum_balance {
 					slash_from_target += *target;
 					*value += sp_std::mem::replace(target, Zero::zero());
@@ -560,10 +560,10 @@ impl<AccountId, Balance> StakingLedger<AccountId, Balance> where
 				slash_out_of(total, &mut chunk.value, &mut value);
 				chunk.value
 			})
-			.take_while(|value| value.is_zero()) // take all fully-consumed chunks out.
+			.take_while(|value| value.is_zero()) // Take all fully-consumed chunks out.
 			.count();
 
-		// kill all drained chunks.
+		// Kill all drained chunks.
 		let _ = self.unlocking.drain(..i);
 
 		pre_total.saturating_sub(*total)
@@ -719,6 +719,8 @@ pub enum Forcing {
 	/// Not forcing anything - just let whatever happen.
 	NotForcing,
 	/// Force a new era, then reset to `NotForcing` as soon as it is done.
+	/// Note that this will force to trigger an election until a new era is triggered, if the
+	/// election failed, the next session end will trigger a new election again, until success.
 	ForceNew,
 	/// Avoid a new era indefinitely.
 	ForceNone,
@@ -831,6 +833,13 @@ pub mod pallet {
 			DataProvider = Pallet<Self>,
 		>;
 
+		/// Something that provides the election functionality at genesis.
+		type GenesisElectionProvider: frame_election_provider_support::ElectionProvider<
+			Self::AccountId,
+			Self::BlockNumber,
+			DataProvider = Pallet<Self>,
+		>;
+
 		/// Maximum number of nominations per nominator.
 		const MAX_NOMINATIONS: u32;
 
@@ -1245,6 +1254,8 @@ pub mod pallet {
 		Withdrawn(T::AccountId, BalanceOf<T>),
 		/// A nominator has been kicked from a validator. \[nominator, stash\]
 		Kicked(T::AccountId, T::AccountId),
+		/// The election failed. No new era is planned.
+		StakingElectionFailed,
 	}
 
 	#[pallet::error]
@@ -1376,7 +1387,7 @@ pub mod pallet {
 				Err(Error::<T>::AlreadyPaired)?
 			}
 
-			// reject a bond which is considered to be _dust_.
+			// Reject a bond which is considered to be _dust_.
 			if value < T::Currency::minimum_balance() {
 				Err(Error::<T>::InsufficientValue)?
 			}
@@ -1442,7 +1453,7 @@ pub mod pallet {
 				let extra = extra.min(max_additional);
 				ledger.total += extra;
 				ledger.active += extra;
-				// last check: the new active amount of ledger must be more than ED.
+				// Last check: the new active amount of ledger must be more than ED.
 				ensure!(ledger.active >= T::Currency::minimum_balance(), Error::<T>::InsufficientValue);
 
 				Self::deposit_event(Event::<T>::Bonded(stash, extra));
@@ -1560,7 +1571,7 @@ pub mod pallet {
 				// portion to fall below existential deposit + will have no more unlocking chunks
 				// left. We can now safely remove all staking-related information.
 				Self::kill_stash(&stash, num_slashing_spans)?;
-				// remove the lock.
+				// Remove the lock.
 				T::Currency::remove_lock(STAKING_ID, &stash);
 				// This is worst case scenario, so we use the full weight and return None
 				None
@@ -1653,7 +1664,7 @@ pub mod pallet {
 
 			let nominations = Nominations {
 				targets,
-				// initial nominations are considered submitted at era 0. See `Nominations` doc
+				// Initial nominations are considered submitted at era 0. See `Nominations` doc
 				submitted_in: Self::current_era().unwrap_or(0),
 				suppressed: false,
 			};
@@ -1805,6 +1816,12 @@ pub mod pallet {
 		///
 		/// The dispatch origin must be Root.
 		///
+		/// # Warning
+		///
+		/// The election process starts multiple blocks before the end of the era.
+		/// Thus the election process may be ongoing when this is called. In this case the
+		/// election will continue until the next era is triggered.
+		///
 		/// # <weight>
 		/// - No arguments.
 		/// - Weight: O(1)
@@ -1822,6 +1839,12 @@ pub mod pallet {
 		///
 		/// The dispatch origin must be Root.
 		///
+		/// # Warning
+		///
+		/// The election process starts multiple blocks before the end of the era.
+		/// If this is called just before a new era is triggered, the election process may not
+		/// have enough blocks to get a result.
+		///
 		/// # <weight>
 		/// - No arguments.
 		/// - Weight: O(1)
@@ -1870,10 +1893,10 @@ pub mod pallet {
 		) -> DispatchResult {
 			ensure_root(origin)?;
 
-			// remove all staking-related information.
+			// Remove all staking-related information.
 			Self::kill_stash(&stash, num_slashing_spans)?;
 
-			// remove the lock.
+			// Remove the lock.
 			T::Currency::remove_lock(STAKING_ID, &stash);
 			Ok(())
 		}
@@ -1882,6 +1905,12 @@ pub mod pallet {
 		///
 		/// The dispatch origin must be Root.
 		///
+		/// # Warning
+		///
+		/// The election process starts multiple blocks before the end of the era.
+		/// If this is called just before a new era is triggered, the election process may not
+		/// have enough blocks to get a result.
+		///
 		/// # <weight>
 		/// - Weight: O(1)
 		/// - Write: ForceEra
@@ -1992,7 +2021,7 @@ pub mod pallet {
 			ensure!(!ledger.unlocking.is_empty(), Error::<T>::NoUnlockChunk);
 
 			let ledger = ledger.rebond(value);
-			// last check: the new active amount of ledger must be more than ED.
+			// Last check: the new active amount of ledger must be more than ED.
 			ensure!(ledger.active >= T::Currency::minimum_balance(), Error::<T>::InsufficientValue);
 
 			Self::deposit_event(Event::<T>::Bonded(ledger.stash.clone(), value));
@@ -2299,10 +2328,9 @@ impl<T: Config> Pallet<T> {
 	}
 
 	/// Plan a new session potentially trigger a new era.
-	fn new_session(session_index: SessionIndex) -> Option<Vec<T::AccountId>> {
+	fn new_session(session_index: SessionIndex, is_genesis: bool) -> Option<Vec<T::AccountId>> {
 		if let Some(current_era) = Self::current_era() {
 			// Initial era has been set.
-
 			let current_era_start_session_index = Self::eras_start_session_index(current_era)
 				.unwrap_or_else(|| {
 					frame_support::print("Error: start_session_index must be set for current_era");
@@ -2313,25 +2341,32 @@ impl<T: Config> Pallet<T> {
 				.unwrap_or(0); // Must never happen.
 
 			match ForceEra::<T>::get() {
-				// Will set to default again, which is `NotForcing`.
-				Forcing::ForceNew => ForceEra::<T>::kill(),
-				// Short circuit to `new_era`.
+				// Will be set to `NotForcing` again if a new era has been triggered.
+				Forcing::ForceNew => (),
+				// Short circuit to `try_trigger_new_era`.
 				Forcing::ForceAlways => (),
-				// Only go to `new_era` if deadline reached.
+				// Only go to `try_trigger_new_era` if deadline reached.
 				Forcing::NotForcing if era_length >= T::SessionsPerEra::get() => (),
 				_ => {
-					// either `Forcing::ForceNone`,
+					// Either `Forcing::ForceNone`,
 					// or `Forcing::NotForcing if era_length >= T::SessionsPerEra::get()`.
 					return None
 				},
 			}
 
-			// new era.
-			Self::new_era(session_index)
+			// New era.
+			let maybe_new_era_validators = Self::try_trigger_new_era(session_index, is_genesis);
+			if maybe_new_era_validators.is_some()
+				&& matches!(ForceEra::<T>::get(), Forcing::ForceNew)
+			{
+				ForceEra::<T>::put(Forcing::NotForcing);
+			}
+
+			maybe_new_era_validators
 		} else {
-			// Set initial era
+			// Set initial era.
 			log!(debug, "Starting the first era.");
-			Self::new_era(session_index)
+			Self::try_trigger_new_era(session_index, is_genesis)
 		}
 	}
 
@@ -2390,12 +2425,12 @@ impl<T: Config> Pallet<T> {
 			if active_era > bonding_duration {
 				let first_kept = active_era - bonding_duration;
 
-				// prune out everything that's from before the first-kept index.
+				// Prune out everything that's from before the first-kept index.
 				let n_to_prune = bonded.iter()
 					.take_while(|&&(era_idx, _)| era_idx < first_kept)
 					.count();
 
-				// kill slashing metadata.
+				// Kill slashing metadata.
 				for (pruned_era, _) in bonded.drain(..n_to_prune) {
 					slashing::clear_era_metadata::<T>(pruned_era);
 				}
@@ -2428,77 +2463,105 @@ impl<T: Config> Pallet<T> {
 		}
 	}
 
-	/// Plan a new era. Return the potential new staking set.
-	fn new_era(start_session_index: SessionIndex) -> Option<Vec<T::AccountId>> {
+	/// Plan a new era.
+	///
+	/// * Bump the current era storage (which holds the latest planned era).
+	/// * Store start session index for the new planned era.
+	/// * Clean old era information.
+	/// * Store staking information for the new planned era
+	///
+	/// Returns the new validator set.
+	pub fn trigger_new_era(
+		start_session_index: SessionIndex,
+		exposures: Vec<(T::AccountId, Exposure<T::AccountId, BalanceOf<T>>)>,
+	) -> Vec<T::AccountId> {
 		// Increment or set current era.
-		let current_era = CurrentEra::<T>::mutate(|s| {
+		let new_planned_era = CurrentEra::<T>::mutate(|s| {
 			*s = Some(s.map(|s| s + 1).unwrap_or(0));
 			s.unwrap()
 		});
-		ErasStartSessionIndex::<T>::insert(&current_era, &start_session_index);
+		ErasStartSessionIndex::<T>::insert(&new_planned_era, &start_session_index);
 
 		// Clean old era information.
-		if let Some(old_era) = current_era.checked_sub(Self::history_depth() + 1) {
+		if let Some(old_era) = new_planned_era.checked_sub(Self::history_depth() + 1) {
 			Self::clear_era_information(old_era);
 		}
 
-		// Set staking information for new era.
-		let maybe_new_validators = Self::enact_election(current_era);
-
-		maybe_new_validators
+		// Set staking information for the new era.
+		Self::store_stakers_info(exposures, new_planned_era)
 	}
 
-	/// Enact and process the election using the `ElectionProvider` type.
+	/// Potentially plan a new era.
+	///
+	/// Get election result from `T::ElectionProvider`.
+	/// In case election result has more than [`MinimumValidatorCount`] validator trigger a new era.
 	///
-	/// This will also process the election, as noted in [`process_election`].
-	fn enact_election(current_era: EraIndex) -> Option<Vec<T::AccountId>> {
-		T::ElectionProvider::elect()
-			.map_err(|e| {
-				log!(warn, "election provider failed due to {:?}", e)
+	/// In case a new era is planned, the new validator set is returned.
+	fn try_trigger_new_era(start_session_index: SessionIndex, is_genesis: bool) -> Option<Vec<T::AccountId>> {
+		let (election_result, weight) = if is_genesis {
+			T::GenesisElectionProvider::elect().map_err(|e| {
+				log!(warn, "genesis election provider failed due to {:?}", e);
+				Self::deposit_event(Event::StakingElectionFailed);
 			})
-			.and_then(|(res, weight)| {
-				<frame_system::Pallet<T>>::register_extra_weight_unchecked(
-					weight,
-					frame_support::weights::DispatchClass::Mandatory,
-				);
-				Self::process_election(res, current_era)
+		} else {
+			T::ElectionProvider::elect().map_err(|e| {
+				log!(warn, "election provider failed due to {:?}", e);
+				Self::deposit_event(Event::StakingElectionFailed);
 			})
-			.ok()
-	}
+		}
+		.ok()?;
 
-	/// Process the output of the election.
-	///
-	/// This ensures enough validators have been elected, converts all supports to exposures and
-	/// writes them to the associated storage.
-	///
-	/// Returns `Err(())` if less than [`MinimumValidatorCount`] validators have been elected, `Ok`
-	/// otherwise.
-	pub fn process_election(
-		flat_supports: frame_election_provider_support::Supports<T::AccountId>,
-		current_era: EraIndex,
-	) -> Result<Vec<T::AccountId>, ()> {
-		let exposures = Self::collect_exposures(flat_supports);
-		let elected_stashes = exposures.iter().cloned().map(|(x, _)| x).collect::<Vec<_>>();
+		<frame_system::Pallet<T>>::register_extra_weight_unchecked(
+			weight,
+			frame_support::weights::DispatchClass::Mandatory,
+		);
+
+		let exposures = Self::collect_exposures(election_result);
 
-		if (elected_stashes.len() as u32) < Self::minimum_validator_count().max(1) {
+		if (exposures.len() as u32) < Self::minimum_validator_count().max(1) {
 			// Session will panic if we ever return an empty validator set, thus max(1) ^^.
-			if current_era > 0 {
-				log!(
+			match CurrentEra::<T>::get() {
+				Some(current_era) if current_era > 0 => log!(
 					warn,
-					"chain does not have enough staking candidates to operate for era {:?} ({} elected, minimum is {})",
-					current_era,
-					elected_stashes.len(),
+					"chain does not have enough staking candidates to operate for era {:?} ({} \
+					elected, minimum is {})",
+					CurrentEra::<T>::get().unwrap_or(0),
+					exposures.len(),
 					Self::minimum_validator_count(),
-				);
+				),
+				None => {
+					// The initial era is allowed to have no exposures.
+					// In this case the SessionManager is expected to choose a sensible validator
+					// set.
+					// TODO: this should be simplified #8911
+					CurrentEra::<T>::put(0);
+					ErasStartSessionIndex::<T>::insert(&0, &start_session_index);
+				},
+				_ => ()
 			}
-			return Err(());
+
+			Self::deposit_event(Event::StakingElectionFailed);
+			return None
 		}
 
+		Self::deposit_event(Event::StakingElection);
+		Some(Self::trigger_new_era(start_session_index, exposures))
+	}
+
+	/// Process the output of the election.
+	///
+	/// Store staking information for the new planned era
+	pub fn store_stakers_info(
+		exposures: Vec<(T::AccountId, Exposure<T::AccountId, BalanceOf<T>>)>,
+		new_planned_era: EraIndex,
+	) -> Vec<T::AccountId> {
+		let elected_stashes = exposures.iter().cloned().map(|(x, _)| x).collect::<Vec<_>>();
+
 		// Populate stakers, exposures, and the snapshot of validator prefs.
 		let mut total_stake: BalanceOf<T> = Zero::zero();
 		exposures.into_iter().for_each(|(stash, exposure)| {
 			total_stake = total_stake.saturating_add(exposure.total);
-			<ErasStakers<T>>::insert(current_era, &stash, &exposure);
+			<ErasStakers<T>>::insert(new_planned_era, &stash, &exposure);
 
 			let mut exposure_clipped = exposure;
 			let clipped_max_len = T::MaxNominatorRewardedPerValidator::get() as usize;
@@ -2506,31 +2569,28 @@ impl<T: Config> Pallet<T> {
 				exposure_clipped.others.sort_by(|a, b| a.value.cmp(&b.value).reverse());
 				exposure_clipped.others.truncate(clipped_max_len);
 			}
-			<ErasStakersClipped<T>>::insert(&current_era, &stash, exposure_clipped);
+			<ErasStakersClipped<T>>::insert(&new_planned_era, &stash, exposure_clipped);
 		});
 
 		// Insert current era staking information
-		<ErasTotalStake<T>>::insert(&current_era, total_stake);
+		<ErasTotalStake<T>>::insert(&new_planned_era, total_stake);
 
-		// collect the pref of all winners
+		// Collect the pref of all winners.
 		for stash in &elected_stashes {
 			let pref = Self::validators(stash);
-			<ErasValidatorPrefs<T>>::insert(&current_era, stash, pref);
+			<ErasValidatorPrefs<T>>::insert(&new_planned_era, stash, pref);
 		}
 
-		// emit event
-		Self::deposit_event(Event::<T>::StakingElection);
-
-		if current_era > 0 {
+		if new_planned_era > 0 {
 			log!(
 				info,
 				"new validator set of size {:?} has been processed for era {:?}",
 				elected_stashes.len(),
-				current_era,
+				new_planned_era,
 			);
 		}
 
-		Ok(elected_stashes)
+		elected_stashes
 	}
 
 	/// Consume a set of [`Supports`] from [`sp_npos_elections`] and collect them into a
@@ -2546,7 +2606,7 @@ impl<T: Config> Pallet<T> {
 		supports
 			.into_iter()
 			.map(|(validator, support)| {
-				// build `struct exposure` from `support`
+				// Build `struct exposure` from `support`.
 				let mut others = Vec::with_capacity(support.voters.len());
 				let mut own: BalanceOf<T> = Zero::zero();
 				let mut total: BalanceOf<T> = Zero::zero();
@@ -2681,12 +2741,12 @@ impl<T: Config> Pallet<T> {
 		let mut all_voters = Vec::new();
 
 		for (validator, _) in <Validators<T>>::iter() {
-			// append self vote
+			// Append self vote.
 			let self_vote = (validator.clone(), weight_of(&validator), vec![validator.clone()]);
 			all_voters.push(self_vote);
 		}
 
-		// collect all slashing spans into a BTreeMap for further queries.
+		// Collect all slashing spans into a BTreeMap for further queries.
 		let slashing_spans = <SlashingSpans<T>>::iter().collect::<BTreeMap<_, _>>();
 
 		for (nominator, nominations) in <Nominators<T>>::iter() {
@@ -2765,18 +2825,23 @@ impl<T: Config> frame_election_provider_support::ElectionDataProvider<T::Account
 			.saturating_sub(current_era_start_session_index)
 			.min(T::SessionsPerEra::get());
 
-		let session_length = T::NextNewSession::average_session_length();
-
 		let until_this_session_end = T::NextNewSession::estimate_next_new_session(now)
 			.0
 			.unwrap_or_default()
 			.saturating_sub(now);
 
-		let sessions_left: T::BlockNumber = T::SessionsPerEra::get()
-			.saturating_sub(era_length)
-			// one session is computed in this_session_end.
-			.saturating_sub(1)
-			.into();
+		let session_length = T::NextNewSession::average_session_length();
+
+		let sessions_left: T::BlockNumber = match ForceEra::<T>::get() {
+			Forcing::ForceNone => Bounded::max_value(),
+			Forcing::ForceNew | Forcing::ForceAlways => Zero::zero(),
+			Forcing::NotForcing if era_length >= T::SessionsPerEra::get() => Zero::zero(),
+			Forcing::NotForcing => T::SessionsPerEra::get()
+				.saturating_sub(era_length)
+				// One session is computed in this_session_end.
+				.saturating_sub(1)
+				.into(),
+		};
 
 		now.saturating_add(
 			until_this_session_end.saturating_add(sessions_left.saturating_mul(session_length)),
@@ -2841,16 +2906,21 @@ impl<T: Config> frame_election_provider_support::ElectionDataProvider<T::Account
 /// some session can lag in between the newest session planned and the latest session started.
 impl<T: Config> pallet_session::SessionManager<T::AccountId> for Pallet<T> {
 	fn new_session(new_index: SessionIndex) -> Option<Vec<T::AccountId>> {
-		log!(trace, "planning new_session({})", new_index);
+		log!(trace, "planning new session {}", new_index);
+		CurrentPlannedSession::<T>::put(new_index);
+		Self::new_session(new_index, false)
+	}
+	fn new_session_genesis(new_index: SessionIndex) -> Option<Vec<T::AccountId>> {
+		log!(trace, "planning new session {} at genesis", new_index);
 		CurrentPlannedSession::<T>::put(new_index);
-		Self::new_session(new_index)
+		Self::new_session(new_index, true)
 	}
 	fn start_session(start_index: SessionIndex) {
-		log!(trace, "starting start_session({})", start_index);
+		log!(trace, "starting session {}", start_index);
 		Self::start_session(start_index)
 	}
 	fn end_session(end_index: SessionIndex) {
-		log!(trace, "ending end_session({})", end_index);
+		log!(trace, "ending session {}", end_index);
 		Self::end_session(end_index)
 	}
 }
@@ -2872,6 +2942,20 @@ impl<T: Config> historical::SessionManager<T::AccountId, Exposure<T::AccountId,
 			}).collect()
 		})
 	}
+	fn new_session_genesis(
+		new_index: SessionIndex,
+	) -> Option<Vec<(T::AccountId, Exposure<T::AccountId, BalanceOf<T>>)>> {
+		<Self as pallet_session::SessionManager<_>>::new_session_genesis(new_index).map(|validators| {
+			let current_era = Self::current_era()
+				// Must be some as a new era has been created.
+				.unwrap_or(0);
+
+			validators.into_iter().map(|v| {
+				let exposure = Self::eras_stakers(current_era, &v);
+				(v, exposure)
+			}).collect()
+		})
+	}
 	fn start_session(start_index: SessionIndex) {
 		<Self as pallet_session::SessionManager<_>>::start_session(start_index)
 	}
@@ -2960,7 +3044,7 @@ where
 			let active_era = Self::active_era();
 			add_db_reads_writes(1, 0);
 			if active_era.is_none() {
-				// this offence need not be re-submitted.
+				// This offence need not be re-submitted.
 				return consumed_weight
 			}
 			active_era.expect("value checked not to be `None`; qed").index
@@ -2974,7 +3058,7 @@ where
 
 		let window_start = active_era.saturating_sub(T::BondingDuration::get());
 
-		// fast path for active-era report - most likely.
+		// Fast path for active-era report - most likely.
 		// `slash_session` cannot be in a future active era. It must be in `active_era` or before.
 		let slash_era = if slash_session >= active_era_start_session_index {
 			active_era
@@ -2982,10 +3066,10 @@ where
 			let eras = BondedEras::<T>::get();
 			add_db_reads_writes(1, 0);
 
-			// reverse because it's more likely to find reports from recent eras.
+			// Reverse because it's more likely to find reports from recent eras.
 			match eras.iter().rev().filter(|&&(_, ref sesh)| sesh <= &slash_session).next() {
 				Some(&(ref slash_era, _)) => *slash_era,
-				// before bonding period. defensive - should be filtered out.
+				// Before bonding period. defensive - should be filtered out.
 				None => return consumed_weight,
 			}
 		};
@@ -3031,7 +3115,7 @@ where
 				}
 				unapplied.reporters = details.reporters.clone();
 				if slash_defer_duration == 0 {
-					// apply right away.
+					// Apply right away.
 					slashing::apply_slash::<T>(unapplied);
 					{
 						let slash_cost = (6, 5);
@@ -3042,7 +3126,7 @@ where
 						);
 					}
 				} else {
-					// defer to end of some `slash_defer_duration` from now.
+					// Defer to end of some `slash_defer_duration` from now.
 					<Self as Store>::UnappliedSlashes::mutate(
 						active_era,
 						move |for_later| for_later.push(unapplied),
@@ -3071,7 +3155,7 @@ where
 	O: Offence<Offender>,
 {
 	fn report_offence(reporters: Vec<Reporter>, offence: O) -> Result<(), OffenceError> {
-		// disallow any slashing from before the current bonding period.
+		// Disallow any slashing from before the current bonding period.
 		let offence_session = offence.session_index();
 		let bonded_eras = BondedEras::<T>::get();
 
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index 211cc025300e..f58cdf0d2350 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -260,6 +260,7 @@ impl Config for Test {
 	type NextNewSession = Session;
 	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
 	type ElectionProvider = onchain::OnChainSequentialPhragmen<Self>;
+	type GenesisElectionProvider = Self::ElectionProvider;
 	type WeightInfo = ();
 }
 
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index 4473e8958500..ee8f78769e70 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -440,13 +440,26 @@ fn no_candidate_emergency_condition() {
 			let res = Staking::chill(Origin::signed(10));
 			assert_ok!(res);
 
-			// trigger era
-			mock::start_active_era(1);
+			let current_era = CurrentEra::<Test>::get();
+
+			// try trigger new era
+			mock::run_to_block(20);
+			assert_eq!(
+				*staking_events().last().unwrap(),
+				Event::StakingElectionFailed,
+			);
+			// No new era is created
+			assert_eq!(current_era, CurrentEra::<Test>::get());
+
+			// Go to far further session to see if validator have changed
+			mock::run_to_block(100);
 
-			// Previous ones are elected. chill is invalidates. TODO: #2494
+			// Previous ones are elected. chill is not effective in active era (as era hasn't changed)
 			assert_eq_uvec!(validator_controllers(), vec![10, 20, 30, 40]);
-			// Though the validator preferences has been removed.
-			assert!(Staking::validators(11) != prefs);
+			// The chill is still pending.
+			assert!(!<Staking as crate::Store>::Validators::contains_key(11));
+			// No new era is created.
+			assert_eq!(current_era, CurrentEra::<Test>::get());
 		});
 }
 
@@ -3970,6 +3983,34 @@ mod election_data_provider {
 				*staking_events().last().unwrap(),
 				Event::StakingElection
 			);
+
+			Staking::force_no_eras(Origin::root()).unwrap();
+			assert_eq!(Staking::next_election_prediction(System::block_number()), u64::max_value());
+
+			Staking::force_new_era_always(Origin::root()).unwrap();
+			assert_eq!(Staking::next_election_prediction(System::block_number()), 45 + 5);
+
+			Staking::force_new_era(Origin::root()).unwrap();
+			assert_eq!(Staking::next_election_prediction(System::block_number()), 45 + 5);
+
+			// Do a fail election
+			MinimumValidatorCount::<Test>::put(1000);
+			run_to_block(50);
+			// Election: failed, next session is a new election
+			assert_eq!(Staking::next_election_prediction(System::block_number()), 50 + 5);
+			// The new era is still forced until a new era is planned.
+			assert_eq!(ForceEra::<Test>::get(), Forcing::ForceNew);
+
+			MinimumValidatorCount::<Test>::put(2);
+			run_to_block(55);
+			assert_eq!(Staking::next_election_prediction(System::block_number()), 55 + 25);
+			assert_eq!(staking_events().len(), 6);
+			assert_eq!(
+				*staking_events().last().unwrap(),
+				Event::StakingElection
+			);
+			// The new era has been planned, forcing is changed from `ForceNew` to `NotForcing`.
+			assert_eq!(ForceEra::<Test>::get(), Forcing::NotForcing);
 		})
 	}
 }

From 029e2a994abc5c1664b47b811d568365053fd78c Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Mon, 14 Jun 2021 21:16:58 +0200
Subject: [PATCH 0880/1194] improve variable name (#9108)

---
 frame/staking/src/lib.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 58ab459d1bf2..734afb082461 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -2821,7 +2821,8 @@ impl<T: Config> frame_election_provider_support::ElectionDataProvider<T::Account
 		let current_session = Self::current_planned_session();
 		let current_era_start_session_index =
 			Self::eras_start_session_index(current_era).unwrap_or(0);
-		let era_length = current_session
+		// Number of session in the current era or the maximum session per era if reached.
+		let era_progress = current_session
 			.saturating_sub(current_era_start_session_index)
 			.min(T::SessionsPerEra::get());
 
@@ -2835,9 +2836,9 @@ impl<T: Config> frame_election_provider_support::ElectionDataProvider<T::Account
 		let sessions_left: T::BlockNumber = match ForceEra::<T>::get() {
 			Forcing::ForceNone => Bounded::max_value(),
 			Forcing::ForceNew | Forcing::ForceAlways => Zero::zero(),
-			Forcing::NotForcing if era_length >= T::SessionsPerEra::get() => Zero::zero(),
+			Forcing::NotForcing if era_progress >= T::SessionsPerEra::get() => Zero::zero(),
 			Forcing::NotForcing => T::SessionsPerEra::get()
-				.saturating_sub(era_length)
+				.saturating_sub(era_progress)
 				// One session is computed in this_session_end.
 				.saturating_sub(1)
 				.into(),

From b81332bc354c55a82882e8fa479479ed73849850 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Mon, 14 Jun 2021 22:31:04 +0200
Subject: [PATCH 0881/1194] execute system integrity_test also (#9104)

---
 frame/support/procedural/src/construct_runtime/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frame/support/procedural/src/construct_runtime/mod.rs b/frame/support/procedural/src/construct_runtime/mod.rs
index eb3550355aa4..87fce6e37cf0 100644
--- a/frame/support/procedural/src/construct_runtime/mod.rs
+++ b/frame/support/procedural/src/construct_runtime/mod.rs
@@ -367,7 +367,7 @@ fn decl_integrity_test(scrate: &TokenStream2) -> TokenStream2 {
 
 			#[test]
 			pub fn runtime_integrity_tests() {
-				<AllPallets as #scrate::traits::IntegrityTest>::integrity_test();
+				<AllPalletsWithSystem as #scrate::traits::IntegrityTest>::integrity_test();
 			}
 		}
 	)

From 05cac0ddb96e1ca03775e491540e450537548844 Mon Sep 17 00:00:00 2001
From: Sergei Shulepov <sergei@parity.io>
Date: Mon, 14 Jun 2021 22:07:06 +0100
Subject: [PATCH 0882/1194] Decommit instance memory after a runtime call on
 Linux (#8998)

* Decommit instance memory after a runtime call on Linux

* Update documentation for the test

* Remove unfinished comment

* Use saturating_sub.

Also update the doc comment.

* Precise RSS tracking in the test

Instead of tracking RSS for the whole process we just look at the particular mapping that is associated with the linear memory of the runtime instance

* Remove unused import

* Fix unused imports

* Fix the unused imports error for good

* Rollback an accidental change to benches

* Fix the test

* Remove now unneeded code
---
 Cargo.lock                                    |  3 +
 client/executor/Cargo.toml                    |  1 +
 client/executor/common/src/wasm_runtime.rs    |  9 ++
 client/executor/runtime-test/src/lib.rs       | 30 +++++++
 .../executor/src/integration_tests/linux.rs   | 73 +++++++++++++++++
 .../src/integration_tests/linux/smaps.rs      | 82 +++++++++++++++++++
 client/executor/src/integration_tests/mod.rs  |  3 +
 client/executor/wasmtime/Cargo.toml           |  2 +
 .../executor/wasmtime/src/instance_wrapper.rs | 37 +++++++++
 client/executor/wasmtime/src/runtime.rs       | 21 ++++-
 10 files changed, 260 insertions(+), 1 deletion(-)
 create mode 100644 client/executor/src/integration_tests/linux.rs
 create mode 100644 client/executor/src/integration_tests/linux/smaps.rs

diff --git a/Cargo.lock b/Cargo.lock
index 1abbfd394707..84f487ceedc9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7468,6 +7468,7 @@ dependencies = [
  "parity-wasm 0.42.2",
  "parking_lot 0.11.1",
  "paste 1.0.4",
+ "regex",
  "sc-executor-common",
  "sc-executor-wasmi",
  "sc-executor-wasmtime",
@@ -7529,6 +7530,8 @@ name = "sc-executor-wasmtime"
 version = "0.9.0"
 dependencies = [
  "assert_matches",
+ "cfg-if 1.0.0",
+ "libc",
  "log",
  "parity-scale-codec",
  "parity-wasm 0.42.2",
diff --git a/client/executor/Cargo.toml b/client/executor/Cargo.toml
index 7cb2e12fd391..27e90ddcc85e 100644
--- a/client/executor/Cargo.toml
+++ b/client/executor/Cargo.toml
@@ -50,6 +50,7 @@ sc-tracing = { version = "3.0.0", path = "../tracing" }
 tracing = "0.1.25"
 tracing-subscriber = "0.2.18"
 paste = "1.0"
+regex = "1"
 
 [features]
 default = [ "std" ]
diff --git a/client/executor/common/src/wasm_runtime.rs b/client/executor/common/src/wasm_runtime.rs
index cca0d99c4b91..12ff92a2c607 100644
--- a/client/executor/common/src/wasm_runtime.rs
+++ b/client/executor/common/src/wasm_runtime.rs
@@ -93,4 +93,13 @@ pub trait WasmInstance: Send {
 	///
 	/// This method is only suitable for getting immutable globals.
 	fn get_global_const(&self, name: &str) -> Result<Option<Value>, Error>;
+
+	/// **Testing Only**. This function returns the base address of the linear memory.
+	///
+	/// This is meant to be the starting address of the memory mapped area for the linear memory.
+	///
+	/// This function is intended only for a specific test that measures physical memory consumption.
+	fn linear_memory_base_ptr(&self) -> Option<*const u8> {
+		None
+	}
 }
diff --git a/client/executor/runtime-test/src/lib.rs b/client/executor/runtime-test/src/lib.rs
index bfba4ef03939..115683bffa62 100644
--- a/client/executor/runtime-test/src/lib.rs
+++ b/client/executor/runtime-test/src/lib.rs
@@ -69,6 +69,36 @@ sp_core::wasm_export_functions! {
 
 	fn test_empty_return() {}
 
+	fn test_dirty_plenty_memory(heap_base: u32, heap_pages: u32) {
+		// This piece of code will dirty multiple pages of memory. The number of pages is given by
+		// the `heap_pages`. It's unit is a wasm page (64KiB). The first page to be cleared
+		// is a wasm page that that follows the one that holds the `heap_base` address.
+		//
+		// This function dirties the **host** pages. I.e. we dirty 4KiB at a time and it will take
+		// 16 writes to process a single wasm page.
+
+		let mut heap_ptr = heap_base as usize;
+
+		// Find the next wasm page boundary.
+		let heap_ptr = round_up_to(heap_ptr, 65536);
+
+		// Make it an actual pointer
+		let heap_ptr = heap_ptr as *mut u8;
+
+		// Traverse the host pages and make each one dirty
+		let host_pages = heap_pages as usize * 16;
+		for i in 0..host_pages {
+			unsafe {
+				// technically this is an UB, but there is no way Rust can find this out.
+				heap_ptr.add(i * 4096).write(0);
+			}
+		}
+
+		fn round_up_to(n: usize, divisor: usize) -> usize {
+			(n + divisor - 1) / divisor
+		}
+	}
+
 	fn test_exhaust_heap() -> Vec<u8> { Vec::with_capacity(16777216) }
 
 	fn test_panic() { panic!("test panic") }
diff --git a/client/executor/src/integration_tests/linux.rs b/client/executor/src/integration_tests/linux.rs
new file mode 100644
index 000000000000..057cc1332717
--- /dev/null
+++ b/client/executor/src/integration_tests/linux.rs
@@ -0,0 +1,73 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! Tests that are only relevant for Linux.
+
+// Constrain this only to wasmtime for the time being. Without this rustc will complain on unused
+// imports and items. The alternative is to plop `cfg(feature = wasmtime)` everywhere which seems
+// borthersome.
+#![cfg(feature = "wasmtime")]
+
+use crate::WasmExecutionMethod;
+use super::mk_test_runtime;
+use codec::Encode as _;
+
+mod smaps;
+
+use self::smaps::Smaps;
+
+#[test]
+fn memory_consumption_compiled() {
+	// This aims to see if linear memory stays backed by the physical memory after a runtime call.
+	//
+	// For that we make a series of runtime calls, probing the RSS for the VMA matching the linear
+	// memory. After the call we expect RSS to be equal to 0.
+
+	let runtime = mk_test_runtime(WasmExecutionMethod::Compiled, 1024);
+
+	let instance = runtime.new_instance().unwrap();
+	let heap_base = instance
+		.get_global_const("__heap_base")
+		.expect("`__heap_base` is valid")
+		.expect("`__heap_base` exists")
+		.as_i32()
+		.expect("`__heap_base` is an `i32`");
+
+	fn probe_rss(instance: &dyn sc_executor_common::wasm_runtime::WasmInstance) -> usize {
+		let base_addr = instance.linear_memory_base_ptr().unwrap() as usize;
+		Smaps::new().get_rss(base_addr).expect("failed to get rss")
+	}
+
+	instance
+		.call_export(
+			"test_dirty_plenty_memory",
+			&(heap_base as u32, 1u32).encode(),
+		)
+		.unwrap();
+	let probe_1 = probe_rss(&*instance);
+	instance
+		.call_export(
+			"test_dirty_plenty_memory",
+			&(heap_base as u32, 1024u32).encode(),
+		)
+		.unwrap();
+	let probe_2 = probe_rss(&*instance);
+
+	assert_eq!(probe_1, 0);
+	assert_eq!(probe_2, 0);
+}
diff --git a/client/executor/src/integration_tests/linux/smaps.rs b/client/executor/src/integration_tests/linux/smaps.rs
new file mode 100644
index 000000000000..8088a5a3ea95
--- /dev/null
+++ b/client/executor/src/integration_tests/linux/smaps.rs
@@ -0,0 +1,82 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! A tool for extracting information about the memory consumption of the current process from
+//! the procfs.
+
+use std::ops::Range;
+use std::collections::BTreeMap;
+
+/// An interface to the /proc/self/smaps
+///
+/// See docs about [procfs on kernel.org][procfs]
+///
+/// [procfs]: https://www.kernel.org/doc/html/latest/filesystems/proc.html
+pub struct Smaps(Vec<(Range<usize>, BTreeMap<String, usize>)>);
+
+impl Smaps {
+	pub fn new() -> Self {
+		let regex_start = regex::RegexBuilder::new("^([0-9a-f]+)-([0-9a-f]+)")
+			.multi_line(true)
+			.build()
+			.unwrap();
+		let regex_kv = regex::RegexBuilder::new(r#"^([^:]+):\s*(\d+) kB"#)
+			.multi_line(true)
+			.build()
+			.unwrap();
+		let smaps = std::fs::read_to_string("/proc/self/smaps").unwrap();
+		let boundaries: Vec<_> = regex_start
+			.find_iter(&smaps)
+			.map(|matched| matched.start())
+			.chain(std::iter::once(smaps.len()))
+			.collect();
+
+		let mut output = Vec::new();
+		for window in boundaries.windows(2) {
+			let chunk = &smaps[window[0]..window[1]];
+			let caps = regex_start.captures(chunk).unwrap();
+			let start = usize::from_str_radix(caps.get(1).unwrap().as_str(), 16).unwrap();
+			let end = usize::from_str_radix(caps.get(2).unwrap().as_str(), 16).unwrap();
+
+			let values = regex_kv
+				.captures_iter(chunk)
+				.map(|cap| {
+					let key = cap.get(1).unwrap().as_str().to_owned();
+					let value = cap.get(2).unwrap().as_str().parse().unwrap();
+					(key, value)
+				})
+				.collect();
+
+			output.push((start..end, values));
+		}
+
+		Self(output)
+	}
+
+	fn get_map(&self, addr: usize) -> &BTreeMap<String, usize> {
+		&self.0
+			.iter()
+			.find(|(range, _)| addr >= range.start && addr < range.end)
+			.unwrap()
+			.1
+	}
+
+	pub fn get_rss(&self, addr: usize) -> Option<usize> {
+		self.get_map(addr).get("Rss").cloned()
+	}
+}
diff --git a/client/executor/src/integration_tests/mod.rs b/client/executor/src/integration_tests/mod.rs
index fb39429dfdb2..8c8674fc3ca9 100644
--- a/client/executor/src/integration_tests/mod.rs
+++ b/client/executor/src/integration_tests/mod.rs
@@ -15,6 +15,9 @@
 
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+#[cfg(target_os = "linux")]
+mod linux;
 mod sandbox;
 
 use std::sync::Arc;
diff --git a/client/executor/wasmtime/Cargo.toml b/client/executor/wasmtime/Cargo.toml
index 591565276a9d..1e886d15beb1 100644
--- a/client/executor/wasmtime/Cargo.toml
+++ b/client/executor/wasmtime/Cargo.toml
@@ -13,6 +13,8 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+libc = "0.2.90"
+cfg-if = "1.0"
 log = "0.4.8"
 scoped-tls = "1.0"
 parity-wasm = "0.42.0"
diff --git a/client/executor/wasmtime/src/instance_wrapper.rs b/client/executor/wasmtime/src/instance_wrapper.rs
index 381ae993442a..866dbfb2e2bf 100644
--- a/client/executor/wasmtime/src/instance_wrapper.rs
+++ b/client/executor/wasmtime/src/instance_wrapper.rs
@@ -415,6 +415,43 @@ impl InstanceWrapper {
 			slice::from_raw_parts_mut(ptr, len)
 		}
 	}
+
+	/// Returns the pointer to the first byte of the linear memory for this instance.
+	pub fn base_ptr(&self) -> *const u8 {
+		self.memory.data_ptr()
+	}
+
+	/// Removes physical backing from the allocated linear memory. This leads to returning the memory
+	/// back to the system. While the memory is zeroed this is considered as a side-effect and is not
+	/// relied upon. Thus this function acts as a hint.
+	pub fn decommit(&self) {
+		if self.memory.data_size() == 0 {
+			return;
+		}
+
+		cfg_if::cfg_if! {
+			if #[cfg(target_os = "linux")] {
+				use std::sync::Once;
+
+				unsafe {
+					let ptr = self.memory.data_ptr();
+					let len = self.memory.data_size();
+
+					// Linux handles MADV_DONTNEED reliably. The result is that the given area
+					// is unmapped and will be zeroed on the next pagefault.
+					if libc::madvise(ptr as _, len, libc::MADV_DONTNEED) != 0 {
+						static LOGGED: Once = Once::new();
+						LOGGED.call_once(|| {
+							log::warn!(
+								"madvise(MADV_DONTNEED) failed: {}",
+								std::io::Error::last_os_error(),
+							);
+						});
+					}
+				}
+			}
+		}
+	}
 }
 
 impl runtime_blob::InstanceGlobals for InstanceWrapper {
diff --git a/client/executor/wasmtime/src/runtime.rs b/client/executor/wasmtime/src/runtime.rs
index fc45345256d1..5018b11264d7 100644
--- a/client/executor/wasmtime/src/runtime.rs
+++ b/client/executor/wasmtime/src/runtime.rs
@@ -150,7 +150,13 @@ impl WasmInstance for WasmtimeInstance {
 				globals_snapshot.apply(&**instance_wrapper);
 				let allocator = FreeingBumpHeapAllocator::new(*heap_base);
 
-				perform_call(data, Rc::clone(&instance_wrapper), entrypoint, allocator)
+				let result = perform_call(data, Rc::clone(&instance_wrapper), entrypoint, allocator);
+
+				// Signal to the OS that we are done with the linear memory and that it can be
+				// reclaimed.
+				instance_wrapper.decommit();
+
+				result
 			}
 			Strategy::RecreateInstance(instance_creator) => {
 				let instance_wrapper = instance_creator.instantiate()?;
@@ -173,6 +179,19 @@ impl WasmInstance for WasmtimeInstance {
 			}
 		}
 	}
+
+	fn linear_memory_base_ptr(&self) -> Option<*const u8> {
+		match &self.strategy {
+			Strategy::RecreateInstance(_) => {
+				// We do not keep the wasm instance around, therefore there is no linear memory
+				// associated with it.
+				None
+			}
+			Strategy::FastInstanceReuse {
+				instance_wrapper, ..
+			} => Some(instance_wrapper.base_ptr()),
+		}
+	}
 }
 
 /// Prepare a directory structure and a config file to enable wasmtime caching.

From f32aa2243f57f63a7f7c8c10783f1455bd0005a3 Mon Sep 17 00:00:00 2001
From: Sergei Shulepov <sergei@parity.io>
Date: Tue, 15 Jun 2021 11:58:09 +0100
Subject: [PATCH 0883/1194] Test restoring zeroed data (#9011)

* Test restoring zeroed data

* Change to u64
---
 client/executor/runtime-test/src/lib.rs      | 15 +++++++++++++++
 client/executor/src/integration_tests/mod.rs | 19 +++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/client/executor/runtime-test/src/lib.rs b/client/executor/runtime-test/src/lib.rs
index 115683bffa62..0cfa06a94c61 100644
--- a/client/executor/runtime-test/src/lib.rs
+++ b/client/executor/runtime-test/src/lib.rs
@@ -39,6 +39,14 @@ extern "C" {
 /// the initialized value at the start of a runtime call.
 static mut MUTABLE_STATIC: u64 = 32;
 
+#[cfg(not(feature = "std"))]
+/// This is similar to `MUTABLE_STATIC`. The tests need `MUTABLE_STATIC` for testing that
+/// non-null initialization data is properly restored during instance reusing.
+///
+/// `MUTABLE_STATIC_BSS` on the other hand focuses on the zeroed data. This is important since there
+/// may be differences in handling zeroed and non-zeroed data.
+static mut MUTABLE_STATIC_BSS: u64 = 0;
+
 sp_core::wasm_export_functions! {
 	fn test_calling_missing_external() {
 		unsafe { missing_external() }
@@ -309,6 +317,13 @@ sp_core::wasm_export_functions! {
 		}
 	}
 
+	fn returns_mutable_static_bss() -> u64 {
+		unsafe {
+			MUTABLE_STATIC_BSS += 1;
+			MUTABLE_STATIC_BSS
+		}
+	}
+
 	fn allocates_huge_stack_array(trap: bool) -> Vec<u8> {
 		// Allocate a stack frame that is approx. 75% of the stack (assuming it is 1MB).
 		// This will just decrease (stacks in wasm32-u-u grow downwards) the stack
diff --git a/client/executor/src/integration_tests/mod.rs b/client/executor/src/integration_tests/mod.rs
index 8c8674fc3ca9..0762306309df 100644
--- a/client/executor/src/integration_tests/mod.rs
+++ b/client/executor/src/integration_tests/mod.rs
@@ -588,6 +588,25 @@ fn returns_mutable_static(wasm_method: WasmExecutionMethod) {
 	assert_eq!(33, u64::decode(&mut &res[..]).unwrap());
 }
 
+test_wasm_execution!(returns_mutable_static_bss);
+fn returns_mutable_static_bss(wasm_method: WasmExecutionMethod) {
+	let runtime = mk_test_runtime(wasm_method, 1024);
+
+	let instance = runtime.new_instance().unwrap();
+	let res = instance
+		.call_export("returns_mutable_static_bss", &[0])
+		.unwrap();
+	assert_eq!(1, u64::decode(&mut &res[..]).unwrap());
+
+	// We expect that every invocation will need to return the initial
+	// value plus one. If the value increases more than that then it is
+	// a sign that the wasm runtime preserves the memory content.
+	let res = instance
+		.call_export("returns_mutable_static_bss", &[0])
+		.unwrap();
+	assert_eq!(1, u64::decode(&mut &res[..]).unwrap());
+}
+
 // If we didn't restore the wasm instance properly, on a trap the stack pointer would not be
 // returned to its initial value and thus the stack space is going to be leaked.
 //

From cdc55fe6b838410750c897f189ef73064c44396d Mon Sep 17 00:00:00 2001
From: cheme <emericchevalier.pro@gmail.com>
Date: Tue, 15 Jun 2021 15:23:58 +0200
Subject: [PATCH 0884/1194] Frame `remove_all` with size limit. (#9106)

* remove prefixed content with limit.

* test match

* factor comment and factor ext limit removal.

* fix benchmark

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 client/db/src/bench.rs                        |   7 +-
 client/db/src/lib.rs                          |   7 +-
 client/db/src/storage_cache.rs                |  14 ++-
 client/executor/runtime-test/src/lib.rs       |   2 +-
 client/light/src/backend.rs                   |   7 +-
 frame/contracts/src/storage.rs                |   6 +-
 frame/elections-phragmen/src/benchmarking.rs  |   2 +-
 frame/im-online/src/lib.rs                    |   4 +-
 frame/society/src/lib.rs                      |   6 +-
 frame/staking/src/lib.rs                      |   6 +-
 frame/staking/src/slashing.rs                 |   4 +-
 frame/staking/src/testing_utils.rs            |   4 +-
 frame/support/src/lib.rs                      |   5 +-
 frame/support/src/storage/child.rs            |   4 +-
 .../src/storage/generator/double_map.rs       |   5 +-
 frame/support/src/storage/generator/nmap.rs   |   4 +-
 frame/support/src/storage/migration.rs        |   2 +-
 frame/support/src/storage/mod.rs              |  16 +--
 frame/support/src/storage/types/double_map.rs |  15 +--
 frame/support/src/storage/types/map.rs        |   8 +-
 frame/support/src/storage/types/nmap.rs       |  20 ++--
 frame/support/src/storage/unhashed.rs         |   4 +-
 frame/system/src/lib.rs                       |   6 +-
 frame/uniques/src/lib.rs                      |   4 +-
 primitives/externalities/src/lib.rs           |   9 +-
 primitives/io/src/lib.rs                      | 110 ++++++++++--------
 primitives/state-machine/src/backend.rs       |   7 +-
 primitives/state-machine/src/basic.rs         |  13 ++-
 primitives/state-machine/src/ext.rs           | 102 +++++++++-------
 primitives/state-machine/src/lib.rs           |  30 ++++-
 .../state-machine/src/proving_backend.rs      |   7 +-
 primitives/state-machine/src/read_only.rs     |   5 +-
 primitives/state-machine/src/trie_backend.rs  |   7 +-
 .../state-machine/src/trie_backend_essence.rs |  65 ++++++-----
 primitives/tasks/src/async_externalities.rs   |   5 +-
 primitives/trie/src/lib.rs                    |  29 -----
 36 files changed, 312 insertions(+), 239 deletions(-)

diff --git a/client/db/src/bench.rs b/client/db/src/bench.rs
index c198fb400408..1f2f46af0079 100644
--- a/client/db/src/bench.rs
+++ b/client/db/src/bench.rs
@@ -373,13 +373,14 @@ impl<B: BlockT> StateBackend<HashFor<B>> for BenchmarkingState<B> {
 		}
 	}
 
-	fn apply_to_child_keys_while<F: FnMut(&[u8]) -> bool>(
+	fn apply_to_keys_while<F: FnMut(&[u8]) -> bool>(
 		&self,
-		child_info: &ChildInfo,
+		child_info: Option<&ChildInfo>,
+		prefix: Option<&[u8]>,
 		f: F,
 	) {
 		if let Some(ref state) = *self.state.borrow() {
-			state.apply_to_child_keys_while(child_info, f)
+			state.apply_to_keys_while(child_info, prefix, f)
 		}
 	}
 
diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index cda197ab0687..38b9d7a7adff 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -205,12 +205,13 @@ impl<B: BlockT> StateBackend<HashFor<B>> for RefTrackingState<B> {
 		self.state.for_key_values_with_prefix(prefix, f)
 	}
 
-	fn apply_to_child_keys_while<F: FnMut(&[u8]) -> bool>(
+	fn apply_to_keys_while<F: FnMut(&[u8]) -> bool>(
 		&self,
-		child_info: &ChildInfo,
+		child_info: Option<&ChildInfo>,
+		prefix: Option<&[u8]>,
 		f: F,
 	) {
-		self.state.apply_to_child_keys_while(child_info, f)
+		self.state.apply_to_keys_while(child_info, prefix, f)
 	}
 
 	fn for_child_keys_with_prefix<F: FnMut(&[u8])>(
diff --git a/client/db/src/storage_cache.rs b/client/db/src/storage_cache.rs
index cb2ab1de1b6c..788e011fb2f0 100644
--- a/client/db/src/storage_cache.rs
+++ b/client/db/src/storage_cache.rs
@@ -605,12 +605,13 @@ impl<S: StateBackend<HashFor<B>>, B: BlockT> StateBackend<HashFor<B>> for Cachin
 		self.state.exists_child_storage(child_info, key)
 	}
 
-	fn apply_to_child_keys_while<F: FnMut(&[u8]) -> bool>(
+	fn apply_to_keys_while<F: FnMut(&[u8]) -> bool>(
 		&self,
-		child_info: &ChildInfo,
+		child_info: Option<&ChildInfo>,
+		prefix: Option<&[u8]>,
 		f: F,
 	) {
-		self.state.apply_to_child_keys_while(child_info, f)
+		self.state.apply_to_keys_while(child_info, prefix, f)
 	}
 
 	fn next_storage_key(&self, key: &[u8]) -> Result<Option<Vec<u8>>, Self::Error> {
@@ -787,12 +788,13 @@ impl<S: StateBackend<HashFor<B>>, B: BlockT> StateBackend<HashFor<B>> for Syncin
 		self.caching_state().exists_child_storage(child_info, key)
 	}
 
-	fn apply_to_child_keys_while<F: FnMut(&[u8]) -> bool>(
+	fn apply_to_keys_while<F: FnMut(&[u8]) -> bool>(
 		&self,
-		child_info: &ChildInfo,
+		child_info: Option<&ChildInfo>,
+		prefix: Option<&[u8]>,
 		f: F,
 	) {
-		self.caching_state().apply_to_child_keys_while(child_info, f)
+		self.caching_state().apply_to_keys_while(child_info, prefix, f)
 	}
 
 	fn next_storage_key(&self, key: &[u8]) -> Result<Option<Vec<u8>>, Self::Error> {
diff --git a/client/executor/runtime-test/src/lib.rs b/client/executor/runtime-test/src/lib.rs
index 0cfa06a94c61..439d4f66b187 100644
--- a/client/executor/runtime-test/src/lib.rs
+++ b/client/executor/runtime-test/src/lib.rs
@@ -71,7 +71,7 @@ sp_core::wasm_export_functions! {
 	}
 
 	fn test_clear_prefix(input: Vec<u8>) -> Vec<u8> {
-		storage::clear_prefix(&input);
+		storage::clear_prefix(&input, None);
 		b"all ok!".to_vec()
 	}
 
diff --git a/client/light/src/backend.rs b/client/light/src/backend.rs
index 4c8ac3fe40f4..a7f1b8e0c169 100644
--- a/client/light/src/backend.rs
+++ b/client/light/src/backend.rs
@@ -461,14 +461,15 @@ impl<H: Hasher> StateBackend<H> for GenesisOrUnavailableState<H>
 		}
 	}
 
-	fn apply_to_child_keys_while<A: FnMut(&[u8]) -> bool>(
+	fn apply_to_keys_while<A: FnMut(&[u8]) -> bool>(
 		&self,
-		child_info: &ChildInfo,
+		child_info: Option<&ChildInfo>,
+		prefix: Option<&[u8]>,
 		action: A,
 	) {
 		match *self {
 			GenesisOrUnavailableState::Genesis(ref state) =>
-				state.apply_to_child_keys_while(child_info, action),
+				state.apply_to_keys_while(child_info, prefix, action),
 			GenesisOrUnavailableState::Unavailable => (),
 		}
 	}
diff --git a/frame/contracts/src/storage.rs b/frame/contracts/src/storage.rs
index 17486b274f2c..15782d7d1e45 100644
--- a/frame/contracts/src/storage.rs
+++ b/frame/contracts/src/storage.rs
@@ -33,7 +33,7 @@ use sp_runtime::{
 use sp_core::crypto::UncheckedFrom;
 use frame_support::{
 	dispatch::{DispatchError, DispatchResult},
-	storage::child::{self, KillChildStorageResult, ChildInfo},
+	storage::child::{self, KillStorageResult, ChildInfo},
 	traits::Get,
 	weights::Weight,
 };
@@ -331,14 +331,14 @@ where
 				let removed = queue.swap_remove(0);
 				match outcome {
 					// This should not happen as our budget was large enough to remove all keys.
-					KillChildStorageResult::SomeRemaining(_) => {
+					KillStorageResult::SomeRemaining(_) => {
 						log::error!(
 							target: "runtime::contracts",
 							"After deletion keys are remaining in this child trie: {:?}",
 							removed.trie_id,
 						);
 					},
-					KillChildStorageResult::AllRemoved(_) => (),
+					KillStorageResult::AllRemoved(_) => (),
 				}
 			}
 			remaining_key_budget = remaining_key_budget
diff --git a/frame/elections-phragmen/src/benchmarking.rs b/frame/elections-phragmen/src/benchmarking.rs
index 3534a62ac3ce..86a011697806 100644
--- a/frame/elections-phragmen/src/benchmarking.rs
+++ b/frame/elections-phragmen/src/benchmarking.rs
@@ -142,7 +142,7 @@ fn clean<T: Config>() {
 	<Members<T>>::kill();
 	<Candidates<T>>::kill();
 	<RunnersUp<T>>::kill();
-	<Voting<T>>::remove_all();
+	<Voting<T>>::remove_all(None);
 }
 
 benchmarks! {
diff --git a/frame/im-online/src/lib.rs b/frame/im-online/src/lib.rs
index e132f7f929a0..318e3d2de3ad 100644
--- a/frame/im-online/src/lib.rs
+++ b/frame/im-online/src/lib.rs
@@ -809,8 +809,8 @@ impl<T: Config> OneSessionHandler<T::AccountId> for Pallet<T> {
 		// Remove all received heartbeats and number of authored blocks from the
 		// current session, they have already been processed and won't be needed
 		// anymore.
-		ReceivedHeartbeats::<T>::remove_prefix(&T::ValidatorSet::session_index());
-		AuthoredBlocks::<T>::remove_prefix(&T::ValidatorSet::session_index());
+		ReceivedHeartbeats::<T>::remove_prefix(&T::ValidatorSet::session_index(), None);
+		AuthoredBlocks::<T>::remove_prefix(&T::ValidatorSet::session_index(), None);
 
 		if offenders.is_empty() {
 			Self::deposit_event(Event::<T>::AllGood);
diff --git a/frame/society/src/lib.rs b/frame/society/src/lib.rs
index 3b661386da23..ff6cc0786dcb 100644
--- a/frame/society/src/lib.rs
+++ b/frame/society/src/lib.rs
@@ -871,7 +871,7 @@ decl_module! {
 			Founder::<T, I>::kill();
 			Rules::<T, I>::kill();
 			Candidates::<T, I>::kill();
-			SuspendedCandidates::<T, I>::remove_all();
+			SuspendedCandidates::<T, I>::remove_all(None);
 			Self::deposit_event(RawEvent::Unfounded(founder));
 		}
 
@@ -1402,7 +1402,7 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 			}).collect::<Vec<_>>();
 
 			// Clean up all votes.
-			<Votes<T, I>>::remove_all();
+			<Votes<T, I>>::remove_all(None);
 
 			// Reward one of the voters who voted the right way.
 			if !total_slash.is_zero() {
@@ -1570,7 +1570,7 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 				}
 
 				// Clean up all votes.
-				<DefenderVotes<T, I>>::remove_all();
+				<DefenderVotes<T, I>>::remove_all(None);
 			}
 
 			// Avoid challenging if there's only two members since we never challenge the Head or
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 734afb082461..ff7a1ae8a882 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -2655,9 +2655,9 @@ impl<T: Config> Pallet<T> {
 
 	/// Clear all era information for given era.
 	fn clear_era_information(era_index: EraIndex) {
-		<ErasStakers<T>>::remove_prefix(era_index);
-		<ErasStakersClipped<T>>::remove_prefix(era_index);
-		<ErasValidatorPrefs<T>>::remove_prefix(era_index);
+		<ErasStakers<T>>::remove_prefix(era_index, None);
+		<ErasStakersClipped<T>>::remove_prefix(era_index, None);
+		<ErasValidatorPrefs<T>>::remove_prefix(era_index, None);
 		<ErasValidatorReward<T>>::remove(era_index);
 		<ErasRewardPoints<T>>::remove(era_index);
 		<ErasTotalStake<T>>::remove(era_index);
diff --git a/frame/staking/src/slashing.rs b/frame/staking/src/slashing.rs
index 50cab1103b95..1e959e9341ad 100644
--- a/frame/staking/src/slashing.rs
+++ b/frame/staking/src/slashing.rs
@@ -543,8 +543,8 @@ impl<'a, T: 'a + Config> Drop for InspectingSpans<'a, T> {
 
 /// Clear slashing metadata for an obsolete era.
 pub(crate) fn clear_era_metadata<T: Config>(obsolete_era: EraIndex) {
-	<Pallet<T> as Store>::ValidatorSlashInEra::remove_prefix(&obsolete_era);
-	<Pallet<T> as Store>::NominatorSlashInEra::remove_prefix(&obsolete_era);
+	<Pallet<T> as Store>::ValidatorSlashInEra::remove_prefix(&obsolete_era, None);
+	<Pallet<T> as Store>::NominatorSlashInEra::remove_prefix(&obsolete_era, None);
 }
 
 /// Clear slashing metadata for a dead account.
diff --git a/frame/staking/src/testing_utils.rs b/frame/staking/src/testing_utils.rs
index 185b96983ab9..f3af4ac0920d 100644
--- a/frame/staking/src/testing_utils.rs
+++ b/frame/staking/src/testing_utils.rs
@@ -29,8 +29,8 @@ const SEED: u32 = 0;
 
 /// This function removes all validators and nominators from storage.
 pub fn clear_validators_and_nominators<T: Config>() {
-	Validators::<T>::remove_all();
-	Nominators::<T>::remove_all();
+	Validators::<T>::remove_all(None);
+	Nominators::<T>::remove_all(None);
 }
 
 /// Grab a funded user.
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 43891c158200..49e61eea569b 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -1005,7 +1005,10 @@ pub mod tests {
 			DoubleMap::insert(&key1, &(key2 + 1), &4u64);
 			DoubleMap::insert(&(key1 + 1), &key2, &4u64);
 			DoubleMap::insert(&(key1 + 1), &(key2 + 1), &4u64);
-			DoubleMap::remove_prefix(&key1);
+			assert!(matches!(
+				DoubleMap::remove_prefix(&key1, None),
+				sp_io::KillStorageResult::AllRemoved(0), // all in overlay
+			));
 			assert_eq!(DoubleMap::get(&key1, &key2), 0u64);
 			assert_eq!(DoubleMap::get(&key1, &(key2 + 1)), 0u64);
 			assert_eq!(DoubleMap::get(&(key1 + 1), &key2), 4u64);
diff --git a/frame/support/src/storage/child.rs b/frame/support/src/storage/child.rs
index 6f9987474394..52830c8ac5dc 100644
--- a/frame/support/src/storage/child.rs
+++ b/frame/support/src/storage/child.rs
@@ -24,7 +24,7 @@
 use crate::sp_std::prelude::*;
 use codec::{Codec, Encode, Decode};
 pub use sp_core::storage::{ChildInfo, ChildType};
-pub use crate::sp_io::KillChildStorageResult;
+pub use crate::sp_io::KillStorageResult;
 
 /// Return the value of the item in storage under `key`, or `None` if there is no explicit entry.
 pub fn get<T: Decode + Sized>(
@@ -174,7 +174,7 @@ pub fn exists(
 pub fn kill_storage(
 	child_info: &ChildInfo,
 	limit: Option<u32>,
-) -> KillChildStorageResult {
+) -> KillStorageResult {
 	match child_info.child_type() {
 		ChildType::ParentKeyId => sp_io::default_child_storage::storage_kill(
 			child_info.storage_key(),
diff --git a/frame/support/src/storage/generator/double_map.rs b/frame/support/src/storage/generator/double_map.rs
index c02ebe48290e..836ae25bdbbc 100644
--- a/frame/support/src/storage/generator/double_map.rs
+++ b/frame/support/src/storage/generator/double_map.rs
@@ -212,8 +212,9 @@ impl<K1, K2, V, G> storage::StorageDoubleMap<K1, K2, V> for G where
 		unhashed::kill(&Self::storage_double_map_final_key(k1, k2))
 	}
 
-	fn remove_prefix<KArg1>(k1: KArg1) where KArg1: EncodeLike<K1> {
-		unhashed::kill_prefix(Self::storage_double_map_final_key1(k1).as_ref())
+	fn remove_prefix<KArg1>(k1: KArg1, limit: Option<u32>) -> sp_io::KillStorageResult
+		where KArg1: EncodeLike<K1> {
+		unhashed::kill_prefix(Self::storage_double_map_final_key1(k1).as_ref(), limit)
 	}
 
 	fn iter_prefix_values<KArg1>(k1: KArg1) -> storage::PrefixIterator<V> where
diff --git a/frame/support/src/storage/generator/nmap.rs b/frame/support/src/storage/generator/nmap.rs
index d1f00adda5e5..62f188a26db8 100755
--- a/frame/support/src/storage/generator/nmap.rs
+++ b/frame/support/src/storage/generator/nmap.rs
@@ -196,11 +196,11 @@ where
 		unhashed::kill(&Self::storage_n_map_final_key::<K, _>(key));
 	}
 
-	fn remove_prefix<KP>(partial_key: KP)
+	fn remove_prefix<KP>(partial_key: KP, limit: Option<u32>) -> sp_io::KillStorageResult
 	where
 		K: HasKeyPrefix<KP>,
 	{
-		unhashed::kill_prefix(&Self::storage_n_map_partial_key(partial_key));
+		unhashed::kill_prefix(&Self::storage_n_map_partial_key(partial_key), limit)
 	}
 
 	fn iter_prefix_values<KP>(partial_key: KP) -> PrefixIterator<V>
diff --git a/frame/support/src/storage/migration.rs b/frame/support/src/storage/migration.rs
index b4a1a9225dd1..62db2eff839f 100644
--- a/frame/support/src/storage/migration.rs
+++ b/frame/support/src/storage/migration.rs
@@ -244,7 +244,7 @@ pub fn remove_storage_prefix(module: &[u8], item: &[u8], hash: &[u8]) {
 	key[0..16].copy_from_slice(&Twox128::hash(module));
 	key[16..32].copy_from_slice(&Twox128::hash(item));
 	key[32..].copy_from_slice(hash);
-	frame_support::storage::unhashed::kill_prefix(&key)
+	frame_support::storage::unhashed::kill_prefix(&key, None);
 }
 
 /// Get a particular value in storage by the `module`, the map's `item` name and the key `hash`.
diff --git a/frame/support/src/storage/mod.rs b/frame/support/src/storage/mod.rs
index 34d217f5c31b..6a02c6572c7f 100644
--- a/frame/support/src/storage/mod.rs
+++ b/frame/support/src/storage/mod.rs
@@ -464,7 +464,8 @@ pub trait StorageDoubleMap<K1: FullEncode, K2: FullEncode, V: FullCodec> {
 		KArg2: EncodeLike<K2>;
 
 	/// Remove all values under the first key.
-	fn remove_prefix<KArg1>(k1: KArg1) where KArg1: ?Sized + EncodeLike<K1>;
+	fn remove_prefix<KArg1>(k1: KArg1, limit: Option<u32>) -> sp_io::KillStorageResult
+		where KArg1: ?Sized + EncodeLike<K1>;
 
 	/// Iterate over values that share the first key.
 	fn iter_prefix_values<KArg1>(k1: KArg1) -> PrefixIterator<V>
@@ -589,7 +590,8 @@ pub trait StorageNMap<K: KeyGenerator, V: FullCodec> {
 	fn remove<KArg: EncodeLikeTuple<K::KArg> + TupleToEncodedIter>(key: KArg);
 
 	/// Remove all values under the partial prefix key.
-	fn remove_prefix<KP>(partial_key: KP) where K: HasKeyPrefix<KP>;
+	fn remove_prefix<KP>(partial_key: KP, limit: Option<u32>) -> sp_io::KillStorageResult
+		where K: HasKeyPrefix<KP>;
 
 	/// Iterate over values that share the partial prefix key.
 	fn iter_prefix_values<KP>(partial_key: KP) -> PrefixIterator<V> where K: HasKeyPrefix<KP>;
@@ -880,8 +882,8 @@ pub trait StoragePrefixedMap<Value: FullCodec> {
 	}
 
 	/// Remove all value of the storage.
-	fn remove_all() {
-		sp_io::storage::clear_prefix(&Self::final_prefix())
+	fn remove_all(limit: Option<u32>) -> sp_io::KillStorageResult {
+		sp_io::storage::clear_prefix(&Self::final_prefix(), limit)
 	}
 
 	/// Iter over all value of the storage.
@@ -1184,7 +1186,7 @@ mod test {
 			assert_eq!(MyStorage::iter_values().collect::<Vec<_>>(), vec![1, 2, 3, 4]);
 
 			// test removal
-			MyStorage::remove_all();
+			MyStorage::remove_all(None);
 			assert!(MyStorage::iter_values().collect::<Vec<_>>().is_empty());
 
 			// test migration
@@ -1194,7 +1196,7 @@ mod test {
 			assert!(MyStorage::iter_values().collect::<Vec<_>>().is_empty());
 			MyStorage::translate_values(|v: u32| Some(v as u64));
 			assert_eq!(MyStorage::iter_values().collect::<Vec<_>>(), vec![1, 2]);
-			MyStorage::remove_all();
+			MyStorage::remove_all(None);
 
 			// test migration 2
 			unhashed::put(&[&k[..], &vec![1][..]].concat(), &1u128);
@@ -1206,7 +1208,7 @@ mod test {
 			assert_eq!(MyStorage::iter_values().collect::<Vec<_>>(), vec![1, 2, 3]);
 			MyStorage::translate_values(|v: u128| Some(v as u64));
 			assert_eq!(MyStorage::iter_values().collect::<Vec<_>>(), vec![1, 2, 3]);
-			MyStorage::remove_all();
+			MyStorage::remove_all(None);
 
 			// test that other values are not modified.
 			assert_eq!(unhashed::get(&key_before[..]), Some(32u64));
diff --git a/frame/support/src/storage/types/double_map.rs b/frame/support/src/storage/types/double_map.rs
index f0ed1999d912..6f03e9b8b2dd 100644
--- a/frame/support/src/storage/types/double_map.rs
+++ b/frame/support/src/storage/types/double_map.rs
@@ -205,8 +205,9 @@ where
 	}
 
 	/// Remove all values under the first key.
-	pub fn remove_prefix<KArg1>(k1: KArg1) where KArg1: ?Sized + EncodeLike<Key1> {
-		<Self as crate::storage::StorageDoubleMap<Key1, Key2, Value>>::remove_prefix(k1)
+	pub fn remove_prefix<KArg1>(k1: KArg1, limit: Option<u32>) -> sp_io::KillStorageResult
+		where KArg1: ?Sized + EncodeLike<Key1> {
+		<Self as crate::storage::StorageDoubleMap<Key1, Key2, Value>>::remove_prefix(k1, limit)
 	}
 
 	/// Iterate over values that share the first key.
@@ -316,8 +317,8 @@ where
 	}
 
 	/// Remove all value of the storage.
-	pub fn remove_all() {
-		<Self as crate::storage::StoragePrefixedMap<Value>>::remove_all()
+	pub fn remove_all(limit: Option<u32>) -> sp_io::KillStorageResult {
+		<Self as crate::storage::StoragePrefixedMap<Value>>::remove_all(limit)
 	}
 
 	/// Iter over all value of the storage.
@@ -615,7 +616,7 @@ mod test {
 
 			A::insert(3, 30, 10);
 			A::insert(4, 40, 10);
-			A::remove_all();
+			A::remove_all(None);
 			assert_eq!(A::contains_key(3, 30), false);
 			assert_eq!(A::contains_key(4, 40), false);
 
@@ -655,7 +656,7 @@ mod test {
 			assert_eq!(AValueQueryWithAnOnEmpty::DEFAULT.0.default_byte(), 97u32.encode());
 			assert_eq!(A::DEFAULT.0.default_byte(), Option::<u32>::None.encode());
 
-			WithLen::remove_all();
+			WithLen::remove_all(None);
 			assert_eq!(WithLen::decode_len(3, 30), None);
 			WithLen::append(0, 100, 10);
 			assert_eq!(WithLen::decode_len(0, 100), Some(1));
@@ -669,7 +670,7 @@ mod test {
 			assert_eq!(A::iter_prefix_values(4).collect::<Vec<_>>(), vec![13, 14]);
 			assert_eq!(A::iter_prefix(4).collect::<Vec<_>>(), vec![(40, 13), (41, 14)]);
 
-			A::remove_prefix(3);
+			A::remove_prefix(3, None);
 			assert_eq!(A::iter_prefix(3).collect::<Vec<_>>(), vec![]);
 			assert_eq!(A::iter_prefix(4).collect::<Vec<_>>(), vec![(40, 13), (41, 14)]);
 
diff --git a/frame/support/src/storage/types/map.rs b/frame/support/src/storage/types/map.rs
index 35062fbc61b2..db3a5e73c9cb 100644
--- a/frame/support/src/storage/types/map.rs
+++ b/frame/support/src/storage/types/map.rs
@@ -231,8 +231,8 @@ where
 	}
 
 	/// Remove all value of the storage.
-	pub fn remove_all() {
-		<Self as crate::storage::StoragePrefixedMap<Value>>::remove_all()
+	pub fn remove_all(limit: Option<u32>) -> sp_io::KillStorageResult {
+		<Self as crate::storage::StoragePrefixedMap<Value>>::remove_all(limit)
 	}
 
 	/// Iter over all value of the storage.
@@ -498,7 +498,7 @@ mod test {
 
 			A::insert(3, 10);
 			A::insert(4, 10);
-			A::remove_all();
+			A::remove_all(None);
 			assert_eq!(A::contains_key(3), false);
 			assert_eq!(A::contains_key(4), false);
 
@@ -533,7 +533,7 @@ mod test {
 			assert_eq!(AValueQueryWithAnOnEmpty::DEFAULT.0.default_byte(), 97u32.encode());
 			assert_eq!(A::DEFAULT.0.default_byte(), Option::<u32>::None.encode());
 
-			WithLen::remove_all();
+			WithLen::remove_all(None);
 			assert_eq!(WithLen::decode_len(3), None);
 			WithLen::append(0, 10);
 			assert_eq!(WithLen::decode_len(0), Some(1));
diff --git a/frame/support/src/storage/types/nmap.rs b/frame/support/src/storage/types/nmap.rs
index e1f5feb956ef..a9fc121d42d2 100755
--- a/frame/support/src/storage/types/nmap.rs
+++ b/frame/support/src/storage/types/nmap.rs
@@ -166,11 +166,11 @@ where
 	}
 
 	/// Remove all values under the first key.
-	pub fn remove_prefix<KP>(partial_key: KP)
+	pub fn remove_prefix<KP>(partial_key: KP, limit: Option<u32>) -> sp_io::KillStorageResult
 	where
 		Key: HasKeyPrefix<KP>,
 	{
-		<Self as crate::storage::StorageNMap<Key, Value>>::remove_prefix(partial_key)
+		<Self as crate::storage::StorageNMap<Key, Value>>::remove_prefix(partial_key, limit)
 	}
 
 	/// Iterate over values that share the first key.
@@ -266,8 +266,8 @@ where
 	}
 
 	/// Remove all value of the storage.
-	pub fn remove_all() {
-		<Self as crate::storage::StoragePrefixedMap<Value>>::remove_all()
+	pub fn remove_all(limit: Option<u32>) -> sp_io::KillStorageResult {
+		<Self as crate::storage::StoragePrefixedMap<Value>>::remove_all(limit)
 	}
 
 	/// Iter over all value of the storage.
@@ -546,7 +546,7 @@ mod test {
 
 			A::insert((3,), 10);
 			A::insert((4,), 10);
-			A::remove_all();
+			A::remove_all(None);
 			assert_eq!(A::contains_key((3,)), false);
 			assert_eq!(A::contains_key((4,)), false);
 
@@ -582,7 +582,7 @@ mod test {
 			);
 			assert_eq!(A::DEFAULT.0.default_byte(), Option::<u32>::None.encode());
 
-			WithLen::remove_all();
+			WithLen::remove_all(None);
 			assert_eq!(WithLen::decode_len((3,)), None);
 			WithLen::append((0,), 10);
 			assert_eq!(WithLen::decode_len((0,)), Some(1));
@@ -720,7 +720,7 @@ mod test {
 
 			A::insert((3, 30), 10);
 			A::insert((4, 40), 10);
-			A::remove_all();
+			A::remove_all(None);
 			assert_eq!(A::contains_key((3, 30)), false);
 			assert_eq!(A::contains_key((4, 40)), false);
 
@@ -768,7 +768,7 @@ mod test {
 			);
 			assert_eq!(A::DEFAULT.0.default_byte(), Option::<u32>::None.encode());
 
-			WithLen::remove_all();
+			WithLen::remove_all(None);
 			assert_eq!(WithLen::decode_len((3, 30)), None);
 			WithLen::append((0, 100), 10);
 			assert_eq!(WithLen::decode_len((0, 100)), Some(1));
@@ -953,7 +953,7 @@ mod test {
 
 			A::insert((3, 30, 300), 10);
 			A::insert((4, 40, 400), 10);
-			A::remove_all();
+			A::remove_all(None);
 			assert_eq!(A::contains_key((3, 30, 300)), false);
 			assert_eq!(A::contains_key((4, 40, 400)), false);
 
@@ -1003,7 +1003,7 @@ mod test {
 			);
 			assert_eq!(A::DEFAULT.0.default_byte(), Option::<u32>::None.encode());
 
-			WithLen::remove_all();
+			WithLen::remove_all(None);
 			assert_eq!(WithLen::decode_len((3, 30, 300)), None);
 			WithLen::append((0, 100, 1000), 10);
 			assert_eq!(WithLen::decode_len((0, 100, 1000)), Some(1));
diff --git a/frame/support/src/storage/unhashed.rs b/frame/support/src/storage/unhashed.rs
index d3d54f3de579..134b3debcd31 100644
--- a/frame/support/src/storage/unhashed.rs
+++ b/frame/support/src/storage/unhashed.rs
@@ -92,8 +92,8 @@ pub fn kill(key: &[u8]) {
 }
 
 /// Ensure keys with the given `prefix` have no entries in storage.
-pub fn kill_prefix(prefix: &[u8]) {
-	sp_io::storage::clear_prefix(prefix);
+pub fn kill_prefix(prefix: &[u8], limit: Option<u32>) -> sp_io::KillStorageResult {
+	sp_io::storage::clear_prefix(prefix, limit)
 }
 
 /// Get a Vec of bytes from storage.
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index e3a110f2e7e2..17ea3a71bec8 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -463,7 +463,7 @@ pub mod pallet {
 			_subkeys: u32,
 		) -> DispatchResultWithPostInfo {
 			ensure_root(origin)?;
-			storage::unhashed::kill_prefix(&prefix);
+			storage::unhashed::kill_prefix(&prefix, None);
 			Ok(().into())
 		}
 
@@ -1334,7 +1334,7 @@ impl<T: Config> Pallet<T> {
 		if let InitKind::Full = kind {
 			<Events<T>>::kill();
 			EventCount::<T>::kill();
-			<EventTopics<T>>::remove_all();
+			<EventTopics<T>>::remove_all(None);
 		}
 	}
 
@@ -1447,7 +1447,7 @@ impl<T: Config> Pallet<T> {
 	pub fn reset_events() {
 		<Events<T>>::kill();
 		EventCount::<T>::kill();
-		<EventTopics<T>>::remove_all();
+		<EventTopics<T>>::remove_all(None);
 	}
 
 	/// Assert the given `event` exists.
diff --git a/frame/uniques/src/lib.rs b/frame/uniques/src/lib.rs
index 28518843c96f..b98a038ecff3 100644
--- a/frame/uniques/src/lib.rs
+++ b/frame/uniques/src/lib.rs
@@ -417,9 +417,9 @@ pub mod pallet {
 				for (instance, details) in Asset::<T, I>::drain_prefix(&class) {
 					Account::<T, I>::remove((&details.owner, &class, &instance));
 				}
-				InstanceMetadataOf::<T, I>::remove_prefix(&class);
+				InstanceMetadataOf::<T, I>::remove_prefix(&class, None);
 				ClassMetadataOf::<T, I>::remove(&class);
-				Attribute::<T, I>::remove_prefix((&class,));
+				Attribute::<T, I>::remove_prefix((&class,), None);
 				T::Currency::unreserve(&class_details.owner, class_details.total_deposit);
 
 				Self::deposit_event(Event::Destroyed(class));
diff --git a/primitives/externalities/src/lib.rs b/primitives/externalities/src/lib.rs
index 14145e879849..7a8771bd623e 100644
--- a/primitives/externalities/src/lib.rs
+++ b/primitives/externalities/src/lib.rs
@@ -151,14 +151,19 @@ pub trait Externalities: ExtensionStore {
 	fn kill_child_storage(&mut self, child_info: &ChildInfo, limit: Option<u32>) -> (bool, u32);
 
 	/// Clear storage entries which keys are start with the given prefix.
-	fn clear_prefix(&mut self, prefix: &[u8]);
+	///
+	/// `limit` and result works as for `kill_child_storage`.
+	fn clear_prefix(&mut self, prefix: &[u8], limit: Option<u32>) -> (bool, u32);
 
 	/// Clear child storage entries which keys are start with the given prefix.
+	///
+	/// `limit` and result works as for `kill_child_storage`.
 	fn clear_child_prefix(
 		&mut self,
 		child_info: &ChildInfo,
 		prefix: &[u8],
-	);
+		limit: Option<u32>,
+	) -> (bool, u32);
 
 	/// Set or clear a storage entry (`key`) of current contract being called (effective immediately).
 	fn place_storage(&mut self, key: Vec<u8>, value: Option<Vec<u8>>);
diff --git a/primitives/io/src/lib.rs b/primitives/io/src/lib.rs
index f0fcc4f1b067..12cbf09e8650 100644
--- a/primitives/io/src/lib.rs
+++ b/primitives/io/src/lib.rs
@@ -86,7 +86,7 @@ pub enum EcdsaVerifyError {
 /// The outcome of calling `storage_kill`. Returned value is the number of storage items
 /// removed from the trie from making the `storage_kill` call.
 #[derive(PassByCodec, Encode, Decode)]
-pub enum KillChildStorageResult {
+pub enum KillStorageResult {
 	/// No key remains in the child trie.
 	AllRemoved(u32),
 	/// At least one key still resides in the child trie due to the supplied limit.
@@ -133,9 +133,44 @@ pub trait Storage {
 
 	/// Clear the storage of each key-value pair where the key starts with the given `prefix`.
 	fn clear_prefix(&mut self, prefix: &[u8]) {
-		Externalities::clear_prefix(*self, prefix)
+		let _ = Externalities::clear_prefix(*self, prefix, None);
 	}
 
+	/// Clear the storage of each key-value pair where the key starts with the given `prefix`.
+	///
+	/// # Limit
+	///
+	/// Deletes all keys from the overlay and up to `limit` keys from the backend if
+	/// it is set to `Some`. No limit is applied when `limit` is set to `None`.
+	///
+	/// The limit can be used to partially delete a prefix storage in case it is too large
+	/// to delete in one go (block).
+	///
+	/// It returns a boolean false iff some keys are remaining in
+	/// the prefix after the functions returns. Also returns a `u32` with
+	/// the number of keys removed from the process.
+	///
+	/// # Note
+	///
+	/// Please note that keys that are residing in the overlay for that prefix when
+	/// issuing this call are all deleted without counting towards the `limit`. Only keys
+	/// written during the current block are part of the overlay. Deleting with a `limit`
+	/// mostly makes sense with an empty overlay for that prefix.
+	///
+	/// Calling this function multiple times per block for the same `prefix` does
+	/// not make much sense because it is not cumulative when called inside the same block.
+	/// Use this function to distribute the deletion of a single child trie across multiple
+	/// blocks.
+	#[version(2)]
+	fn clear_prefix(&mut self, prefix: &[u8], limit: Option<u32>) -> KillStorageResult {
+		let (all_removed, num_removed) = Externalities::clear_prefix(*self, prefix, limit);
+		match all_removed {
+			true => KillStorageResult::AllRemoved(num_removed),
+			false => KillStorageResult::SomeRemaining(num_removed),
+		}
+	}
+
+
 	/// Append the encoded `value` to the storage item at `key`.
 	///
 	/// The storage item needs to implement [`EncodeAppend`](codec::EncodeAppend).
@@ -296,26 +331,7 @@ pub trait DefaultChildStorage {
 
 	/// Clear a child storage key.
 	///
-	/// Deletes all keys from the overlay and up to `limit` keys from the backend if
-	/// it is set to `Some`. No limit is applied when `limit` is set to `None`.
-	///
-	/// The limit can be used to partially delete a child trie in case it is too large
-	/// to delete in one go (block).
-	///
-	/// It returns a boolean false iff some keys are remaining in
-	/// the child trie after the functions returns.
-	///
-	/// # Note
-	///
-	/// Please note that keys that are residing in the overlay for that child trie when
-	/// issuing this call are all deleted without counting towards the `limit`. Only keys
-	/// written during the current block are part of the overlay. Deleting with a `limit`
-	/// mostly makes sense with an empty overlay for that child trie.
-	///
-	/// Calling this function multiple times per block for the same `storage_key` does
-	/// not make much sense because it is not cumulative when called inside the same block.
-	/// Use this function to distribute the deletion of a single child trie across multiple
-	/// blocks.
+	/// See `Storage` module `clear_prefix` documentation for `limit` usage.
 	#[version(2)]
 	fn storage_kill(&mut self, storage_key: &[u8], limit: Option<u32>) -> bool {
 		let child_info = ChildInfo::new_default(storage_key);
@@ -325,34 +341,14 @@ pub trait DefaultChildStorage {
 
 	/// Clear a child storage key.
 	///
-	/// Deletes all keys from the overlay and up to `limit` keys from the backend if
-	/// it is set to `Some`. No limit is applied when `limit` is set to `None`.
-	///
-	/// The limit can be used to partially delete a child trie in case it is too large
-	/// to delete in one go (block).
-	///
-	/// It returns a boolean false iff some keys are remaining in
-	/// the child trie after the functions returns. Also returns a `u32` with
-	/// the number of keys removed from the process.
-	///
-	/// # Note
-	///
-	/// Please note that keys that are residing in the overlay for that child trie when
-	/// issuing this call are all deleted without counting towards the `limit`. Only keys
-	/// written during the current block are part of the overlay. Deleting with a `limit`
-	/// mostly makes sense with an empty overlay for that child trie.
-	///
-	/// Calling this function multiple times per block for the same `storage_key` does
-	/// not make much sense because it is not cumulative when called inside the same block.
-	/// Use this function to distribute the deletion of a single child trie across multiple
-	/// blocks.
+	/// See `Storage` module `clear_prefix` documentation for `limit` usage.
 	#[version(3)]
-	fn storage_kill(&mut self, storage_key: &[u8], limit: Option<u32>) -> KillChildStorageResult {
+	fn storage_kill(&mut self, storage_key: &[u8], limit: Option<u32>) -> KillStorageResult {
 		let child_info = ChildInfo::new_default(storage_key);
 		let (all_removed, num_removed) = self.kill_child_storage(&child_info, limit);
 		match all_removed {
-			true => KillChildStorageResult::AllRemoved(num_removed),
-			false => KillChildStorageResult::SomeRemaining(num_removed),
+			true => KillStorageResult::AllRemoved(num_removed),
+			false => KillStorageResult::SomeRemaining(num_removed),
 		}
 	}
 
@@ -377,7 +373,25 @@ pub trait DefaultChildStorage {
 		prefix: &[u8],
 	) {
 		let child_info = ChildInfo::new_default(storage_key);
-		self.clear_child_prefix(&child_info, prefix);
+		let _ = self.clear_child_prefix(&child_info, prefix, None);
+	}
+
+	/// Clear the child storage of each key-value pair where the key starts with the given `prefix`.
+	///
+	/// See `Storage` module `clear_prefix` documentation for `limit` usage.
+	#[version(2)]
+	fn clear_prefix(
+		&mut self,
+		storage_key: &[u8],
+		prefix: &[u8],
+		limit: Option<u32>,
+	) -> KillStorageResult {
+		let child_info = ChildInfo::new_default(storage_key);
+		let (all_removed, num_removed) = self.clear_child_prefix(&child_info, prefix, limit);
+		match all_removed {
+			true => KillStorageResult::AllRemoved(num_removed),
+			false => KillStorageResult::SomeRemaining(num_removed),
+		}
 	}
 
 	/// Default child root calculation.
@@ -1531,7 +1545,7 @@ mod tests {
 		});
 
 		t.execute_with(|| {
-			storage::clear_prefix(b":abc");
+			assert!(matches!(storage::clear_prefix(b":abc", None), KillStorageResult::AllRemoved(2)));
 
 			assert!(storage::get(b":a").is_some());
 			assert!(storage::get(b":abdd").is_some());
diff --git a/primitives/state-machine/src/backend.rs b/primitives/state-machine/src/backend.rs
index 92b4c83314e7..18b89acbc6f1 100644
--- a/primitives/state-machine/src/backend.rs
+++ b/primitives/state-machine/src/backend.rs
@@ -93,11 +93,12 @@ pub trait Backend<H: Hasher>: sp_std::fmt::Debug {
 		key: &[u8]
 	) -> Result<Option<StorageKey>, Self::Error>;
 
-	/// Retrieve all entries keys of child storage and call `f` for each of those keys.
+	/// Retrieve all entries keys of storage and call `f` for each of those keys.
 	/// Aborts as soon as `f` returns false.
-	fn apply_to_child_keys_while<F: FnMut(&[u8]) -> bool>(
+	fn apply_to_keys_while<F: FnMut(&[u8]) -> bool>(
 		&self,
-		child_info: &ChildInfo,
+		child_info: Option<&ChildInfo>,
+		prefix: Option<&[u8]>,
 		f: F,
 	);
 
diff --git a/primitives/state-machine/src/basic.rs b/primitives/state-machine/src/basic.rs
index dda8f523b77f..08849ebcc69a 100644
--- a/primitives/state-machine/src/basic.rs
+++ b/primitives/state-machine/src/basic.rs
@@ -216,13 +216,13 @@ impl Externalities for BasicExternalities {
 		(true, num_removed as u32)
 	}
 
-	fn clear_prefix(&mut self, prefix: &[u8]) {
+	fn clear_prefix(&mut self, prefix: &[u8], _limit: Option<u32>) -> (bool, u32) {
 		if is_child_storage_key(prefix) {
 			warn!(
 				target: "trie",
 				"Refuse to clear prefix that is part of child storage key via main storage"
 			);
-			return;
+			return (false, 0);
 		}
 
 		let to_remove = self.inner.top.range::<[u8], _>((Bound::Included(prefix), Bound::Unbounded))
@@ -231,16 +231,19 @@ impl Externalities for BasicExternalities {
 			.cloned()
 			.collect::<Vec<_>>();
 
+		let num_removed = to_remove.len();
 		for key in to_remove {
 			self.inner.top.remove(&key);
 		}
+		(true, num_removed as u32)
 	}
 
 	fn clear_child_prefix(
 		&mut self,
 		child_info: &ChildInfo,
 		prefix: &[u8],
-	) {
+		_limit: Option<u32>,
+	) -> (bool, u32) {
 		if let Some(child) = self.inner.children_default.get_mut(child_info.storage_key()) {
 			let to_remove = child.data.range::<[u8], _>((Bound::Included(prefix), Bound::Unbounded))
 				.map(|(k, _)| k)
@@ -248,9 +251,13 @@ impl Externalities for BasicExternalities {
 				.cloned()
 				.collect::<Vec<_>>();
 
+			let num_removed = to_remove.len();
 			for key in to_remove {
 				child.data.remove(&key);
 			}
+			(true, num_removed as u32)
+		} else {
+			(true, 0)
 		}
 	}
 
diff --git a/primitives/state-machine/src/ext.rs b/primitives/state-machine/src/ext.rs
index 8bcf1f28a077..e66664647d9d 100644
--- a/primitives/state-machine/src/ext.rs
+++ b/primitives/state-machine/src/ext.rs
@@ -460,36 +460,10 @@ where
 		let _guard = guard();
 		self.mark_dirty();
 		self.overlay.clear_child_storage(child_info);
-		let mut num_deleted: u32 = 0;
-
-		if let Some(limit) = limit {
-			let mut all_deleted = true;
-			self.backend.apply_to_child_keys_while(child_info, |key| {
-				if num_deleted == limit {
-					all_deleted = false;
-					return false;
-				}
-				if let Some(num) = num_deleted.checked_add(1) {
-					num_deleted = num;
-				} else {
-					all_deleted = false;
-					return false;
-				}
-				self.overlay.set_child_storage(child_info, key.to_vec(), None);
-				true
-			});
-			(all_deleted, num_deleted)
-		} else {
-			self.backend.apply_to_child_keys_while(child_info, |key| {
-				num_deleted = num_deleted.saturating_add(1);
-				self.overlay.set_child_storage(child_info, key.to_vec(), None);
-				true
-			});
-			(true, num_deleted)
-		}
+		self.limit_remove_from_backend(Some(child_info), None, limit)
 	}
 
-	fn clear_prefix(&mut self, prefix: &[u8]) {
+	fn clear_prefix(&mut self, prefix: &[u8], limit: Option<u32>) -> (bool, u32) {
 		trace!(target: "state", "{:04x}: ClearPrefix {}",
 			self.id,
 			HexDisplay::from(&prefix),
@@ -498,21 +472,20 @@ where
 
 		if sp_core::storage::well_known_keys::starts_with_child_storage_key(prefix) {
 			warn!(target: "trie", "Refuse to directly clear prefix that is part or contains of child storage key");
-			return;
+			return (false, 0);
 		}
 
 		self.mark_dirty();
 		self.overlay.clear_prefix(prefix);
-		self.backend.for_keys_with_prefix(prefix, |key| {
-			self.overlay.set_storage(key.to_vec(), None);
-		});
+		self.limit_remove_from_backend(None, Some(prefix), limit)
 	}
 
 	fn clear_child_prefix(
 		&mut self,
 		child_info: &ChildInfo,
 		prefix: &[u8],
-	) {
+		limit: Option<u32>,
+	) -> (bool, u32) {
 		trace!(target: "state", "{:04x}: ClearChildPrefix({}) {}",
 			self.id,
 			HexDisplay::from(&child_info.storage_key()),
@@ -522,9 +495,7 @@ where
 
 		self.mark_dirty();
 		self.overlay.clear_child_prefix(child_info, prefix);
-		self.backend.for_child_keys_with_prefix(child_info, prefix, |key| {
-			self.overlay.set_child_storage(child_info, key.to_vec(), None);
-		});
+		self.limit_remove_from_backend(Some(child_info), Some(prefix), limit)
 	}
 
 	fn storage_append(
@@ -780,6 +751,57 @@ where
 	}
 }
 
+impl<'a, H, N, B> Ext<'a, H, N, B>
+where
+	H: Hasher,
+	H::Out: Ord + 'static + codec::Codec,
+	B: Backend<H>,
+	N: crate::changes_trie::BlockNumber,
+{
+	fn limit_remove_from_backend(
+		&mut self,
+		child_info: Option<&ChildInfo>,
+		prefix: Option<&[u8]>,
+		limit: Option<u32>,
+	) -> (bool, u32) {
+		let mut num_deleted: u32 = 0;
+
+		if let Some(limit) = limit {
+			let mut all_deleted = true;
+			self.backend.apply_to_keys_while(child_info, prefix, |key| {
+				if num_deleted == limit {
+					all_deleted = false;
+					return false;
+				}
+				if let Some(num) = num_deleted.checked_add(1) {
+					num_deleted = num;
+				} else {
+					all_deleted = false;
+					return false;
+				}
+				if let Some(child_info) = child_info {
+					self.overlay.set_child_storage(child_info, key.to_vec(), None);
+				} else {
+					self.overlay.set_storage(key.to_vec(), None);
+				}
+				true
+			});
+			(all_deleted, num_deleted)
+		} else {
+			self.backend.apply_to_keys_while(child_info, prefix, |key| {
+				num_deleted = num_deleted.saturating_add(1);
+				if let Some(child_info) = child_info {
+					self.overlay.set_child_storage(child_info, key.to_vec(), None);
+				} else {
+					self.overlay.set_storage(key.to_vec(), None);
+				}
+				true
+			});
+			(true, num_deleted)
+		}
+	}
+}
+
 /// Implement `Encode` by forwarding the stored raw vec.
 struct EncodeOpaqueValue(Vec<u8>);
 
@@ -1155,14 +1177,14 @@ mod tests {
 		not_under_prefix.extend(b"path");
 		ext.set_storage(not_under_prefix.clone(), vec![10]);
 
-		ext.clear_prefix(&[]);
-		ext.clear_prefix(&well_known_keys::CHILD_STORAGE_KEY_PREFIX[..4]);
+		ext.clear_prefix(&[], None);
+		ext.clear_prefix(&well_known_keys::CHILD_STORAGE_KEY_PREFIX[..4], None);
 		let mut under_prefix = well_known_keys::CHILD_STORAGE_KEY_PREFIX.to_vec();
 		under_prefix.extend(b"path");
-		ext.clear_prefix(&well_known_keys::CHILD_STORAGE_KEY_PREFIX[..4]);
+		ext.clear_prefix(&well_known_keys::CHILD_STORAGE_KEY_PREFIX[..4], None);
 		assert_eq!(ext.child_storage(child_info, &[30]), Some(vec![40]));
 		assert_eq!(ext.storage(not_under_prefix.as_slice()), Some(vec![10]));
-		ext.clear_prefix(&not_under_prefix[..5]);
+		ext.clear_prefix(&not_under_prefix[..5], None);
 		assert_eq!(ext.storage(not_under_prefix.as_slice()), None);
 	}
 
diff --git a/primitives/state-machine/src/lib.rs b/primitives/state-machine/src/lib.rs
index 0508bfb78092..c4ba39e16016 100644
--- a/primitives/state-machine/src/lib.rs
+++ b/primitives/state-machine/src/lib.rs
@@ -1102,6 +1102,7 @@ mod tests {
 		overlay.set_storage(b"abd".to_vec(), Some(b"69".to_vec()));
 		overlay.set_storage(b"bbd".to_vec(), Some(b"42".to_vec()));
 
+		let overlay_limit = overlay.clone();
 		{
 			let mut cache = StorageTransactionCache::default();
 			let mut ext = Ext::new(
@@ -1111,7 +1112,7 @@ mod tests {
 				changes_trie::disabled_state::<_, u64>(),
 				None,
 			);
-			ext.clear_prefix(b"ab");
+			ext.clear_prefix(b"ab", None);
 		}
 		overlay.commit_transaction().unwrap();
 
@@ -1128,6 +1129,33 @@ mod tests {
 				b"bbd".to_vec() => Some(b"42".to_vec()).into()
 			],
 		);
+
+		let mut overlay = overlay_limit;
+		{
+			let mut cache = StorageTransactionCache::default();
+			let mut ext = Ext::new(
+				&mut overlay,
+				&mut cache,
+				backend,
+				changes_trie::disabled_state::<_, u64>(),
+				None,
+			);
+			assert_eq!((false, 1), ext.clear_prefix(b"ab", Some(1)));
+		}
+		overlay.commit_transaction().unwrap();
+
+		assert_eq!(
+			overlay.changes().map(|(k, v)| (k.clone(), v.value().cloned()))
+				.collect::<HashMap<_, _>>(),
+			map![
+				b"abb".to_vec() => None.into(),
+				b"aba".to_vec() => None.into(),
+				b"abd".to_vec() => None.into(),
+
+				b"bab".to_vec() => Some(b"228".to_vec()).into(),
+				b"bbd".to_vec() => Some(b"42".to_vec()).into()
+			],
+		);
 	}
 
 	#[test]
diff --git a/primitives/state-machine/src/proving_backend.rs b/primitives/state-machine/src/proving_backend.rs
index 963582a3cc35..d68a87f9f56a 100644
--- a/primitives/state-machine/src/proving_backend.rs
+++ b/primitives/state-machine/src/proving_backend.rs
@@ -260,12 +260,13 @@ impl<'a, S, H> Backend<H> for ProvingBackend<'a, S, H>
 		self.0.child_storage(child_info, key)
 	}
 
-	fn apply_to_child_keys_while<F: FnMut(&[u8]) -> bool>(
+	fn apply_to_keys_while<F: FnMut(&[u8]) -> bool>(
 		&self,
-		child_info: &ChildInfo,
+		child_info: Option<&ChildInfo>,
+		prefix: Option<&[u8]>,
 		f: F,
 	) {
-		self.0.apply_to_child_keys_while(child_info, f)
+		self.0.apply_to_keys_while(child_info, prefix, f)
 	}
 
 	fn next_storage_key(&self, key: &[u8]) -> Result<Option<Vec<u8>>, Self::Error> {
diff --git a/primitives/state-machine/src/read_only.rs b/primitives/state-machine/src/read_only.rs
index 296520900c95..7b67b61eea82 100644
--- a/primitives/state-machine/src/read_only.rs
+++ b/primitives/state-machine/src/read_only.rs
@@ -136,7 +136,7 @@ impl<'a, H: Hasher, B: 'a + Backend<H>> Externalities for ReadOnlyExternalities<
 		unimplemented!("kill_child_storage is not supported in ReadOnlyExternalities")
 	}
 
-	fn clear_prefix(&mut self, _prefix: &[u8]) {
+	fn clear_prefix(&mut self, _prefix: &[u8], _limit: Option<u32>) -> (bool, u32) {
 		unimplemented!("clear_prefix is not supported in ReadOnlyExternalities")
 	}
 
@@ -144,7 +144,8 @@ impl<'a, H: Hasher, B: 'a + Backend<H>> Externalities for ReadOnlyExternalities<
 		&mut self,
 		_child_info: &ChildInfo,
 		_prefix: &[u8],
-	) {
+		_limit: Option<u32>,
+	) -> (bool, u32) {
 		unimplemented!("clear_child_prefix is not supported in ReadOnlyExternalities")
 	}
 
diff --git a/primitives/state-machine/src/trie_backend.rs b/primitives/state-machine/src/trie_backend.rs
index 5dd8fb7562f7..98deca23a957 100644
--- a/primitives/state-machine/src/trie_backend.rs
+++ b/primitives/state-machine/src/trie_backend.rs
@@ -113,12 +113,13 @@ impl<S: TrieBackendStorage<H>, H: Hasher> Backend<H> for TrieBackend<S, H> where
 		self.essence.for_key_values_with_prefix(prefix, f)
 	}
 
-	fn apply_to_child_keys_while<F: FnMut(&[u8]) -> bool>(
+	fn apply_to_keys_while<F: FnMut(&[u8]) -> bool>(
 		&self,
-		child_info: &ChildInfo,
+		child_info: Option<&ChildInfo>,
+		prefix: Option<&[u8]>,
 		f: F,
 	) {
-		self.essence.apply_to_child_keys_while(child_info, f)
+		self.essence.apply_to_keys_while(child_info, prefix, f)
 	}
 
 	fn for_child_keys_with_prefix<F: FnMut(&[u8])>(
diff --git a/primitives/state-machine/src/trie_backend_essence.rs b/primitives/state-machine/src/trie_backend_essence.rs
index c085099da77d..e0a24c08393c 100644
--- a/primitives/state-machine/src/trie_backend_essence.rs
+++ b/primitives/state-machine/src/trie_backend_essence.rs
@@ -25,7 +25,7 @@ use crate::{warn, debug};
 use hash_db::{self, Hasher, Prefix};
 use sp_trie::{Trie, MemoryDB, PrefixedMemoryDB, DBValue,
 	empty_child_trie_root, read_trie_value, read_child_trie_value,
-	for_keys_in_child_trie, KeySpacedDB, TrieDBIterator};
+	KeySpacedDB, TrieDBIterator};
 use sp_trie::trie_types::{TrieDB, TrieError, Layout};
 use crate::{backend::Consolidate, StorageKey, StorageValue};
 use sp_core::storage::ChildInfo;
@@ -189,29 +189,30 @@ impl<S: TrieBackendStorage<H>, H: Hasher> TrieBackendEssence<S, H> where H::Out:
 			.map_err(map_e)
 	}
 
-	/// Retrieve all entries keys of child storage and call `f` for each of those keys.
+	/// Retrieve all entries keys of a storage and call `f` for each of those keys.
 	/// Aborts as soon as `f` returns false.
-	pub fn apply_to_child_keys_while<F: FnMut(&[u8]) -> bool>(
+	pub fn apply_to_keys_while<F: FnMut(&[u8]) -> bool>(
 		&self,
-		child_info: &ChildInfo,
-		f: F,
+		child_info: Option<&ChildInfo>,
+		prefix: Option<&[u8]>,
+		mut f: F,
 	) {
-		let root = match self.child_root(child_info) {
-			Ok(v) => v.unwrap_or_else(|| empty_child_trie_root::<Layout<H>>().encode()),
-			Err(e) => {
-				debug!(target: "trie", "Error while iterating child storage: {}", e);
-				return;
-			}
+		let mut child_root = H::Out::default();
+		let root = if let Some(child_info) = child_info.as_ref() {
+			let root_vec = match self.child_root(child_info) {
+				Ok(v) => v.unwrap_or_else(|| empty_child_trie_root::<Layout<H>>().encode()),
+				Err(e) => {
+					debug!(target: "trie", "Error while iterating child storage: {}", e);
+					return;
+				}
+			};
+			child_root.as_mut().copy_from_slice(&root_vec);
+			&child_root
+		} else {
+			&self.root
 		};
 
-		if let Err(e) = for_keys_in_child_trie::<Layout<H>, _, _>(
-			child_info.keyspace(),
-			self,
-			&root,
-			f,
-		) {
-			debug!(target: "trie", "Error while iterating child storage: {}", e);
-		}
+		self.trie_iter_inner(root, prefix, |k, _v| f(k), child_info)
 	}
 
 	/// Execute given closure for all keys starting with prefix.
@@ -230,30 +231,38 @@ impl<S: TrieBackendStorage<H>, H: Hasher> TrieBackendEssence<S, H> where H::Out:
 		};
 		let mut root = H::Out::default();
 		root.as_mut().copy_from_slice(&root_vec);
-		self.keys_values_with_prefix_inner(&root, prefix, |k, _v| f(k), Some(child_info))
+		self.trie_iter_inner(&root, Some(prefix), |k, _v| { f(k); true }, Some(child_info))
 	}
 
 	/// Execute given closure for all keys starting with prefix.
 	pub fn for_keys_with_prefix<F: FnMut(&[u8])>(&self, prefix: &[u8], mut f: F) {
-		self.keys_values_with_prefix_inner(&self.root, prefix, |k, _v| f(k), None)
+		self.trie_iter_inner(&self.root, Some(prefix), |k, _v| { f(k); true }, None)
 	}
 
-	fn keys_values_with_prefix_inner<F: FnMut(&[u8], &[u8])>(
+	fn trie_iter_inner<F: FnMut(&[u8], &[u8]) -> bool>(
 		&self,
 		root: &H::Out,
-		prefix: &[u8],
+		prefix: Option<&[u8]>,
 		mut f: F,
 		child_info: Option<&ChildInfo>,
 	) {
 		let mut iter = move |db| -> sp_std::result::Result<(), Box<TrieError<H::Out>>> {
 			let trie = TrieDB::<H>::new(db, root)?;
 
-			for x in TrieDBIterator::new_prefixed(&trie, prefix)? {
+			let iter = if let Some(prefix) = prefix.as_ref() {
+				TrieDBIterator::new_prefixed(&trie, prefix)?
+			} else {
+				TrieDBIterator::new(&trie)?
+			};
+
+			for x in iter {
 				let (key, value) = x?;
 
-				debug_assert!(key.starts_with(prefix));
+				debug_assert!(prefix.as_ref().map(|prefix| key.starts_with(prefix)).unwrap_or(true));
 
-				f(&key, &value);
+				if !f(&key, &value) {
+					break;
+				}
 			}
 
 			Ok(())
@@ -271,8 +280,8 @@ impl<S: TrieBackendStorage<H>, H: Hasher> TrieBackendEssence<S, H> where H::Out:
 	}
 
 	/// Execute given closure for all key and values starting with prefix.
-	pub fn for_key_values_with_prefix<F: FnMut(&[u8], &[u8])>(&self, prefix: &[u8], f: F) {
-		self.keys_values_with_prefix_inner(&self.root, prefix, f, None)
+	pub fn for_key_values_with_prefix<F: FnMut(&[u8], &[u8])>(&self, prefix: &[u8], mut f: F) {
+		self.trie_iter_inner(&self.root, Some(prefix), |k, v| { f(k, v); true }, None)
 	}
 }
 
diff --git a/primitives/tasks/src/async_externalities.rs b/primitives/tasks/src/async_externalities.rs
index 5d99ca4368d0..b64614991264 100644
--- a/primitives/tasks/src/async_externalities.rs
+++ b/primitives/tasks/src/async_externalities.rs
@@ -123,7 +123,7 @@ impl Externalities for AsyncExternalities {
 		panic!("`kill_child_storage`: should not be used in async externalities!")
 	}
 
-	fn clear_prefix(&mut self, _prefix: &[u8]) {
+	fn clear_prefix(&mut self, _prefix: &[u8], _limit: Option<u32>) -> (bool, u32) {
 		panic!("`clear_prefix`: should not be used in async externalities!")
 	}
 
@@ -131,7 +131,8 @@ impl Externalities for AsyncExternalities {
 		&mut self,
 		_child_info: &ChildInfo,
 		_prefix: &[u8],
-	) {
+		_limit: Option<u32>,
+	) -> (bool, u32) {
 		panic!("`clear_child_prefix`: should not be used in async externalities!")
 	}
 
diff --git a/primitives/trie/src/lib.rs b/primitives/trie/src/lib.rs
index 89bef715ba99..f815d2af44ad 100644
--- a/primitives/trie/src/lib.rs
+++ b/primitives/trie/src/lib.rs
@@ -279,35 +279,6 @@ pub fn child_delta_trie_root<L: TrieConfiguration, I, A, B, DB, RD, V>(
 	)
 }
 
-/// Call `f` for all keys in a child trie.
-/// Aborts as soon as `f` returns false.
-pub fn for_keys_in_child_trie<L: TrieConfiguration, F: FnMut(&[u8]) -> bool, DB>(
-	keyspace: &[u8],
-	db: &DB,
-	root_slice: &[u8],
-	mut f: F
-) -> Result<(), Box<TrieError<L>>>
-	where
-		DB: hash_db::HashDBRef<L::Hash, trie_db::DBValue>
-{
-	let mut root = TrieHash::<L>::default();
-	// root is fetched from DB, not writable by runtime, so it's always valid.
-	root.as_mut().copy_from_slice(root_slice);
-
-	let db = KeySpacedDB::new(&*db, keyspace);
-	let trie = TrieDB::<L>::new(&db, &root)?;
-	let iter = trie.iter()?;
-
-	for x in iter {
-		let (key, _) = x?;
-		if !f(&key) {
-			break;
-		}
-	}
-
-	Ok(())
-}
-
 /// Record all keys for a given root.
 pub fn record_all_keys<L: TrieConfiguration, DB>(
 	db: &DB,

From 7f09a7619c863c964a93ceb915d6e0b9ddc39e2e Mon Sep 17 00:00:00 2001
From: Ethan Brierley <ethanboxx@gmail.com>
Date: Tue, 15 Jun 2021 17:23:57 +0100
Subject: [PATCH 0885/1194] fix: CARGO_TARGET_DIR_freeze (#9114)

---
 utils/wasm-builder/src/prerequisites.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/utils/wasm-builder/src/prerequisites.rs b/utils/wasm-builder/src/prerequisites.rs
index 5dedcc4641a7..dbbd9c0a5622 100644
--- a/utils/wasm-builder/src/prerequisites.rs
+++ b/utils/wasm-builder/src/prerequisites.rs
@@ -129,6 +129,10 @@ fn check_wasm_toolchain_installed(
 	let mut run_cmd = cargo_command.command();
 	run_cmd.args(&["run", "--manifest-path", &manifest_path]);
 
+	// Unset the `CARGO_TARGET_DIR` to prevent a cargo deadlock
+	build_cmd.env_remove("CARGO_TARGET_DIR");
+	run_cmd.env_remove("CARGO_TARGET_DIR");
+
 	build_cmd
 		.output()
 		.map_err(|_| err_msg.clone())

From d30b6e373dd9f470e0f0738e34519ec65a98f9f9 Mon Sep 17 00:00:00 2001
From: Keith Yeung <kungfukeith11@gmail.com>
Date: Tue, 15 Jun 2021 20:44:22 -0700
Subject: [PATCH 0886/1194] Emit error when construct_runtime imports a
 non-existent pallet part (#8949)

* Emit error when construct_runtime imports a non-existent Call part

* Reword and display pallet name when emitting part not found error

* Migrate decl_outer_dispatch to a proc macro

* Rename calls.rs to call.rs

* Create new construct_runtime_v2 macro

* Add UI test for importing non-existent call part in construct_runtime

* Emit error when construct_runtime imports a non-existent Config part

* Emit error when construct_runtime imports a non-existent Event part

* Migrate decl_outer_inherent to a proc macro

* Emit error when construct_runtime imports a non-existent Inherent part

* Migrate decl_outer_validate_unsigned to a proc macro

* Emit error when construct_runtime imports a non-existent ValidateUnsigned part

* impl for old macro

* fix line width

* add doc

* hide macroes and use unique counter everywhere

* Remove construct_runtime_v2

* Encapsulate pallet part check macros in a module

* Fix macro definitions in dummy part checker

* Tag ProvideInherent impl with #[pallet::inherent] properly for authorship pallet

* Remove Call part from pallets that do not define it

* Add Call part unit tests

* Remove undefined Call part import from offences pallet

* Add tests for expand_outer_inherent

* Remove Call part from pallets that do not define them

* Remove Call part imports from pallets that do not have it defined

* Remove Call part import of the offences pallet from grandpa pallet mocks

* Update frame/support/test/tests/pallet.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Remove Call part imports for pallets that do not define them

* Move inherent tests to inherent_expand

* Add unit tests for expand_outer_validate_unsigned

* Add newline at the end of file

* fix ui test

* Small prayer to RNGsus for fixing CI

* Remove Call part from construct_runtime for randomness collective flip pallet

* Remove Call part import for randomness collective flip pallet

* Summon Laplace's demon instead of praying to RNGsus

* Update test expectations

* fix ui test and make sure it's flaky

* Revert "fix ui test and make sure it's flaky"

This reverts commit 362b6881389c911ef8d9ef85d71c9463f5694b20.

* Comment out test instead of putting it in conditional compilation

* Update UI test expectations

* Update UI test expectations

* Emit error when construct_runtime imports a non-existent Origin part

Co-authored-by: thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Denis P <denis.pisarev@parity.io>
---
 bin/node-template/runtime/src/lib.rs          |   2 +-
 bin/node/runtime/src/lib.rs                   |   6 +-
 frame/aura/src/mock.rs                        |   2 +-
 frame/authority-discovery/src/lib.rs          |   2 +-
 frame/authorship/src/lib.rs                   | 124 +++++------
 frame/babe/src/mock.rs                        |   2 +-
 frame/contracts/src/tests.rs                  |   2 +-
 frame/grandpa/src/mock.rs                     |   2 +-
 frame/offences/benchmarking/src/mock.rs       |   2 +-
 frame/offences/src/mock.rs                    |   2 +-
 frame/randomness-collective-flip/src/lib.rs   |   2 +-
 .../src/construct_runtime/expand/call.rs      | 145 +++++++++++++
 .../src/construct_runtime/expand/config.rs    |  18 +-
 .../src/construct_runtime/expand/event.rs     |  13 +-
 .../src/construct_runtime/expand/inherent.rs  | 204 ++++++++++++++++++
 .../src/construct_runtime/expand/mod.rs       |   6 +
 .../src/construct_runtime/expand/origin.rs    |  14 +-
 .../src/construct_runtime/expand/unsigned.rs  |  72 +++++++
 .../procedural/src/construct_runtime/mod.rs   |  75 +------
 .../procedural/src/dummy_part_checker.rs      | 104 +++++++++
 frame/support/procedural/src/lib.rs           |  26 +++
 .../procedural/src/pallet/expand/call.rs      |  33 ++-
 .../procedural/src/pallet/expand/event.rs     |  47 +++-
 .../src/pallet/expand/genesis_config.rs       |  52 ++++-
 .../procedural/src/pallet/expand/inherent.rs  |  56 +++++
 .../procedural/src/pallet/expand/mod.rs       |   9 +
 .../procedural/src/pallet/expand/origin.rs    |  55 +++++
 .../src/pallet/expand/validate_unsigned.rs    |  56 +++++
 frame/support/src/dispatch.rs                 |   2 +
 frame/support/src/lib.rs                      |   5 +-
 frame/support/test/tests/construct_runtime.rs | 158 ++++++++++++++
 .../undefined_call_part.rs                    |  33 +++
 .../undefined_call_part.stderr                |  49 +++++
 .../undefined_event_part.rs                   |  33 +++
 .../undefined_event_part.stderr               | 101 +++++++++
 .../undefined_genesis_config_part.rs          |  33 +++
 .../undefined_genesis_config_part.stderr      |  67 ++++++
 .../undefined_inherent_part.rs                |  33 +++
 .../undefined_inherent_part.stderr            |  49 +++++
 .../undefined_origin_part.rs                  |  33 +++
 .../undefined_origin_part.stderr              |  87 ++++++++
 .../undefined_validate_unsigned_part.rs       |  33 +++
 .../undefined_validate_unsigned_part.stderr   |  49 +++++
 frame/support/test/tests/pallet.rs            | 180 +++++++++++++++-
 frame/support/test/tests/pallet_instance.rs   |   4 +-
 .../storage_info_unsatisfied_nmap.rs          |  37 ++--
 .../storage_info_unsatisfied_nmap.stderr      |  12 +-
 47 files changed, 1934 insertions(+), 197 deletions(-)
 create mode 100644 frame/support/procedural/src/construct_runtime/expand/call.rs
 create mode 100644 frame/support/procedural/src/construct_runtime/expand/inherent.rs
 create mode 100644 frame/support/procedural/src/construct_runtime/expand/unsigned.rs
 create mode 100644 frame/support/procedural/src/dummy_part_checker.rs
 create mode 100644 frame/support/procedural/src/pallet/expand/inherent.rs
 create mode 100644 frame/support/procedural/src/pallet/expand/origin.rs
 create mode 100644 frame/support/procedural/src/pallet/expand/validate_unsigned.rs
 create mode 100644 frame/support/test/tests/construct_runtime_ui/undefined_call_part.rs
 create mode 100644 frame/support/test/tests/construct_runtime_ui/undefined_call_part.stderr
 create mode 100644 frame/support/test/tests/construct_runtime_ui/undefined_event_part.rs
 create mode 100644 frame/support/test/tests/construct_runtime_ui/undefined_event_part.stderr
 create mode 100644 frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.rs
 create mode 100644 frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.stderr
 create mode 100644 frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.rs
 create mode 100644 frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.stderr
 create mode 100644 frame/support/test/tests/construct_runtime_ui/undefined_origin_part.rs
 create mode 100644 frame/support/test/tests/construct_runtime_ui/undefined_origin_part.stderr
 create mode 100644 frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.rs
 create mode 100644 frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.stderr

diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index f98517b91d24..2ff4272747ee 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -287,7 +287,7 @@ construct_runtime!(
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-		RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Call, Storage},
+		RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage},
 		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
 		Aura: pallet_aura::{Pallet, Config<T>},
 		Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event},
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 3e8053ac4f1b..2e11ab54e431 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -1159,10 +1159,10 @@ construct_runtime!(
 		Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>},
 		Sudo: pallet_sudo::{Pallet, Call, Config<T>, Storage, Event<T>},
 		ImOnline: pallet_im_online::{Pallet, Call, Storage, Event<T>, ValidateUnsigned, Config<T>},
-		AuthorityDiscovery: pallet_authority_discovery::{Pallet, Call, Config},
-		Offences: pallet_offences::{Pallet, Call, Storage, Event},
+		AuthorityDiscovery: pallet_authority_discovery::{Pallet, Config},
+		Offences: pallet_offences::{Pallet, Storage, Event},
 		Historical: pallet_session_historical::{Pallet},
-		RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Call, Storage},
+		RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage},
 		Identity: pallet_identity::{Pallet, Call, Storage, Event<T>},
 		Society: pallet_society::{Pallet, Call, Storage, Event<T>, Config<T>},
 		Recovery: pallet_recovery::{Pallet, Call, Storage, Event<T>},
diff --git a/frame/aura/src/mock.rs b/frame/aura/src/mock.rs
index 26d5a2754974..443ac9890ac7 100644
--- a/frame/aura/src/mock.rs
+++ b/frame/aura/src/mock.rs
@@ -36,7 +36,7 @@ frame_support::construct_runtime!(
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
-		Aura: pallet_aura::{Pallet, Call, Storage, Config<T>},
+		Aura: pallet_aura::{Pallet, Storage, Config<T>},
 	}
 );
 
diff --git a/frame/authority-discovery/src/lib.rs b/frame/authority-discovery/src/lib.rs
index 868fbfc60536..791fbda10382 100644
--- a/frame/authority-discovery/src/lib.rs
+++ b/frame/authority-discovery/src/lib.rs
@@ -184,7 +184,7 @@ mod tests {
 		{
 			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 			Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
-			AuthorityDiscovery: pallet_authority_discovery::{Pallet, Call, Config},
+			AuthorityDiscovery: pallet_authority_discovery::{Pallet, Config},
 		}
 	);
 
diff --git a/frame/authorship/src/lib.rs b/frame/authorship/src/lib.rs
index 98d20ec62140..d40fb93b901a 100644
--- a/frame/authorship/src/lib.rs
+++ b/frame/authorship/src/lib.rs
@@ -24,7 +24,6 @@
 use sp_std::{result, prelude::*, collections::btree_set::BTreeSet};
 use frame_support::{
 	dispatch, traits::{FindAuthor, VerifySeal, Get},
-	inherent::{InherentData, ProvideInherent, InherentIdentifier},
 };
 use codec::{Encode, Decode};
 use sp_runtime::traits::{Header as HeaderT, One, Saturating};
@@ -238,6 +237,68 @@ pub mod pallet {
 			Self::verify_and_import_uncles(new_uncles)
 		}
 	}
+
+	#[pallet::inherent]
+	impl<T: Config> ProvideInherent for Pallet<T> {
+		type Call = Call<T>;
+		type Error = InherentError;
+		const INHERENT_IDENTIFIER: InherentIdentifier = INHERENT_IDENTIFIER;
+
+		fn create_inherent(data: &InherentData) -> Option<Self::Call> {
+			let uncles = data.uncles().unwrap_or_default();
+			let mut set_uncles = Vec::new();
+
+			if !uncles.is_empty() {
+				let prev_uncles = <Uncles<T>>::get();
+				let mut existing_hashes: Vec<_> = prev_uncles.into_iter().filter_map(|entry|
+					match entry {
+						UncleEntryItem::InclusionHeight(_) => None,
+						UncleEntryItem::Uncle(h, _) => Some(h),
+					}
+				).collect();
+
+				let mut acc: <T::FilterUncle as FilterUncle<_, _>>::Accumulator = Default::default();
+
+				for uncle in uncles {
+					match Self::verify_uncle(&uncle, &existing_hashes, &mut acc) {
+						Ok(_) => {
+							let hash = uncle.hash();
+							set_uncles.push(uncle);
+							existing_hashes.push(hash);
+
+							if set_uncles.len() == MAX_UNCLES {
+								break
+							}
+						}
+						Err(_) => {
+							// skip this uncle
+						}
+					}
+				}
+			}
+
+			if set_uncles.is_empty() {
+				None
+			} else {
+				Some(Call::set_uncles(set_uncles))
+			}
+		}
+
+		fn check_inherent(call: &Self::Call, _data: &InherentData) -> result::Result<(), Self::Error> {
+			match call {
+				Call::set_uncles(ref uncles) if uncles.len() > MAX_UNCLES => {
+					Err(InherentError::Uncles(Error::<T>::TooManyUncles.as_str().into()))
+				},
+				_ => {
+					Ok(())
+				},
+			}
+		}
+
+		fn is_inherent(call: &Self::Call) -> bool {
+			matches!(call, Call::set_uncles(_))
+		}
+	}
 }
 
 impl<T: Config> Pallet<T> {
@@ -348,67 +409,6 @@ impl<T: Config> Pallet<T> {
 	}
 }
 
-impl<T: Config> ProvideInherent for Pallet<T> {
-	type Call = Call<T>;
-	type Error = InherentError;
-	const INHERENT_IDENTIFIER: InherentIdentifier = INHERENT_IDENTIFIER;
-
-	fn create_inherent(data: &InherentData) -> Option<Self::Call> {
-		let uncles = data.uncles().unwrap_or_default();
-		let mut set_uncles = Vec::new();
-
-		if !uncles.is_empty() {
-			let prev_uncles = <Uncles<T>>::get();
-			let mut existing_hashes: Vec<_> = prev_uncles.into_iter().filter_map(|entry|
-				match entry {
-					UncleEntryItem::InclusionHeight(_) => None,
-					UncleEntryItem::Uncle(h, _) => Some(h),
-				}
-			).collect();
-
-			let mut acc: <T::FilterUncle as FilterUncle<_, _>>::Accumulator = Default::default();
-
-			for uncle in uncles {
-				match Self::verify_uncle(&uncle, &existing_hashes, &mut acc) {
-					Ok(_) => {
-						let hash = uncle.hash();
-						set_uncles.push(uncle);
-						existing_hashes.push(hash);
-
-						if set_uncles.len() == MAX_UNCLES {
-							break
-						}
-					}
-					Err(_) => {
-						// skip this uncle
-					}
-				}
-			}
-		}
-
-		if set_uncles.is_empty() {
-			None
-		} else {
-			Some(Call::set_uncles(set_uncles))
-		}
-	}
-
-	fn check_inherent(call: &Self::Call, _data: &InherentData) -> result::Result<(), Self::Error> {
-		match call {
-			Call::set_uncles(ref uncles) if uncles.len() > MAX_UNCLES => {
-				Err(InherentError::Uncles(Error::<T>::TooManyUncles.as_str().into()))
-			},
-			_ => {
-				Ok(())
-			},
-		}
-	}
-
-	fn is_inherent(call: &Self::Call) -> bool {
-		matches!(call, Call::set_uncles(_))
-	}
-}
-
 #[cfg(test)]
 mod tests {
 	use crate as pallet_authorship;
diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index 770e20cb786e..a8d0bba9632d 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -54,7 +54,7 @@ frame_support::construct_runtime!(
 		Authorship: pallet_authorship::{Pallet, Call, Storage, Inherent},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
 		Historical: pallet_session_historical::{Pallet},
-		Offences: pallet_offences::{Pallet, Call, Storage, Event},
+		Offences: pallet_offences::{Pallet, Storage, Event},
 		Babe: pallet_babe::{Pallet, Call, Storage, Config, ValidateUnsigned},
 		Staking: pallet_staking::{Pallet, Call, Storage, Config<T>, Event<T>},
 		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index 3e687643cdc8..619bd8eac9d3 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -62,7 +62,7 @@ frame_support::construct_runtime!(
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
 		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
-		Randomness: pallet_randomness_collective_flip::{Pallet, Call, Storage},
+		Randomness: pallet_randomness_collective_flip::{Pallet, Storage},
 		Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>},
 	}
 );
diff --git a/frame/grandpa/src/mock.rs b/frame/grandpa/src/mock.rs
index fe8a1bd4a395..9206b3ff2dfa 100644
--- a/frame/grandpa/src/mock.rs
+++ b/frame/grandpa/src/mock.rs
@@ -57,7 +57,7 @@ frame_support::construct_runtime!(
 		Staking: pallet_staking::{Pallet, Call, Config<T>, Storage, Event<T>},
 		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
 		Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event, ValidateUnsigned},
-		Offences: pallet_offences::{Pallet, Call, Storage, Event},
+		Offences: pallet_offences::{Pallet, Storage, Event},
 		Historical: pallet_session_historical::{Pallet},
 	}
 );
diff --git a/frame/offences/benchmarking/src/mock.rs b/frame/offences/benchmarking/src/mock.rs
index b780662b92cd..cd72780ec5ad 100644
--- a/frame/offences/benchmarking/src/mock.rs
+++ b/frame/offences/benchmarking/src/mock.rs
@@ -219,7 +219,7 @@ frame_support::construct_runtime!(
 		Staking: pallet_staking::{Pallet, Call, Config<T>, Storage, Event<T>},
 		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
 		ImOnline: pallet_im_online::{Pallet, Call, Storage, Event<T>, ValidateUnsigned, Config<T>},
-		Offences: pallet_offences::{Pallet, Call, Storage, Event},
+		Offences: pallet_offences::{Pallet, Storage, Event},
 		Historical: pallet_session_historical::{Pallet},
 	}
 );
diff --git a/frame/offences/src/mock.rs b/frame/offences/src/mock.rs
index a494ab02ebbd..fff1973e334e 100644
--- a/frame/offences/src/mock.rs
+++ b/frame/offences/src/mock.rs
@@ -75,7 +75,7 @@ frame_support::construct_runtime!(
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-		Offences: offences::{Pallet, Call, Storage, Event},
+		Offences: offences::{Pallet, Storage, Event},
 	}
 );
 
diff --git a/frame/randomness-collective-flip/src/lib.rs b/frame/randomness-collective-flip/src/lib.rs
index 3285addc5bf4..eaefa9ac86c3 100644
--- a/frame/randomness-collective-flip/src/lib.rs
+++ b/frame/randomness-collective-flip/src/lib.rs
@@ -182,7 +182,7 @@ mod tests {
 			UncheckedExtrinsic = UncheckedExtrinsic,
 		{
 			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-			CollectiveFlip: pallet_randomness_collective_flip::{Pallet, Call, Storage},
+			CollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage},
 		}
 	);
 
diff --git a/frame/support/procedural/src/construct_runtime/expand/call.rs b/frame/support/procedural/src/construct_runtime/expand/call.rs
new file mode 100644
index 000000000000..6a44468f25b2
--- /dev/null
+++ b/frame/support/procedural/src/construct_runtime/expand/call.rs
@@ -0,0 +1,145 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License
+
+use crate::construct_runtime::Pallet;
+use proc_macro2::TokenStream;
+use quote::quote;
+use syn::Ident;
+
+pub fn expand_outer_dispatch(
+	runtime: &Ident,
+	pallet_decls: &[Pallet],
+	scrate: &TokenStream,
+) -> TokenStream {
+	let mut variant_defs = TokenStream::new();
+	let mut variant_patterns = Vec::new();
+	let mut query_call_part_macros = Vec::new();
+	let mut pallet_names = Vec::new();
+
+	let pallets_with_call = pallet_decls
+		.iter()
+		.filter(|decl| decl.exists_part("Call"));
+
+	for pallet_declaration in pallets_with_call {
+		let name = &pallet_declaration.name;
+		let path = &pallet_declaration.path;
+		let index = pallet_declaration.index;
+
+		variant_defs.extend(quote!(#[codec(index = #index)] #name( #scrate::dispatch::CallableCallFor<#name, #runtime> ),));
+		variant_patterns.push(quote!(Call::#name(call)));
+		pallet_names.push(name);
+		query_call_part_macros.push(quote! {
+			#path::__substrate_call_check::is_call_part_defined!(#name);
+		});
+	}
+
+	quote! {
+		#( #query_call_part_macros )*
+
+		#[derive(
+			Clone, PartialEq, Eq,
+			#scrate::codec::Encode,
+			#scrate::codec::Decode,
+			#scrate::RuntimeDebug,
+		)]
+		pub enum Call {
+			#variant_defs
+		}
+		impl #scrate::dispatch::GetDispatchInfo for Call {
+			fn get_dispatch_info(&self) -> #scrate::dispatch::DispatchInfo {
+				match self {
+					#( #variant_patterns => call.get_dispatch_info(), )*
+				}
+			}
+		}
+		impl #scrate::dispatch::GetCallMetadata for Call {
+			fn get_call_metadata(&self) -> #scrate::dispatch::CallMetadata {
+				use #scrate::dispatch::GetCallName;
+				match self {
+					#(
+						#variant_patterns => {
+							let function_name = call.get_call_name();
+							let pallet_name = stringify!(#pallet_names);
+							#scrate::dispatch::CallMetadata { function_name, pallet_name }
+						}
+					)*
+				}
+			}
+
+			fn get_module_names() -> &'static [&'static str] {
+				&[#(
+					stringify!(#pallet_names),
+				)*]
+			}
+
+			fn get_call_names(module: &str) -> &'static [&'static str] {
+				use #scrate::dispatch::{Callable, GetCallName};
+				match module {
+					#(
+						stringify!(#pallet_names) =>
+							<<#pallet_names as Callable<#runtime>>::Call
+								as GetCallName>::get_call_names(),
+					)*
+					_ => unreachable!(),
+				}
+			}
+		}
+		impl #scrate::dispatch::Dispatchable for Call {
+			type Origin = Origin;
+			type Config = Call;
+			type Info = #scrate::weights::DispatchInfo;
+			type PostInfo = #scrate::weights::PostDispatchInfo;
+			fn dispatch(self, origin: Origin) -> #scrate::dispatch::DispatchResultWithPostInfo {
+				if !<Self::Origin as #scrate::traits::OriginTrait>::filter_call(&origin, &self) {
+					return #scrate::sp_std::result::Result::Err(#scrate::dispatch::DispatchError::BadOrigin.into());
+				}
+
+				#scrate::traits::UnfilteredDispatchable::dispatch_bypass_filter(self, origin)
+			}
+		}
+		impl #scrate::traits::UnfilteredDispatchable for Call {
+			type Origin = Origin;
+			fn dispatch_bypass_filter(self, origin: Origin) -> #scrate::dispatch::DispatchResultWithPostInfo {
+				match self {
+					#(
+						#variant_patterns =>
+							#scrate::traits::UnfilteredDispatchable::dispatch_bypass_filter(call, origin),
+					)*
+				}
+			}
+		}
+
+		#(
+			impl #scrate::traits::IsSubType<#scrate::dispatch::CallableCallFor<#pallet_names, #runtime>> for Call {
+				#[allow(unreachable_patterns)]
+				fn is_sub_type(&self) -> Option<&#scrate::dispatch::CallableCallFor<#pallet_names, #runtime>> {
+					match self {
+						#variant_patterns => Some(call),
+						// May be unreachable
+						_ => None,
+					}
+				}
+			}
+
+			impl From<#scrate::dispatch::CallableCallFor<#pallet_names, #runtime>> for Call {
+				fn from(call: #scrate::dispatch::CallableCallFor<#pallet_names, #runtime>) -> Self {
+					#variant_patterns
+				}
+			}
+		)*
+	}
+}
diff --git a/frame/support/procedural/src/construct_runtime/expand/config.rs b/frame/support/procedural/src/construct_runtime/expand/config.rs
index 0400bd52f433..b87d3685beea 100644
--- a/frame/support/procedural/src/construct_runtime/expand/config.rs
+++ b/frame/support/procedural/src/construct_runtime/expand/config.rs
@@ -29,21 +29,31 @@ pub fn expand_outer_config(
 	let mut types = TokenStream::new();
 	let mut fields = TokenStream::new();
 	let mut build_storage_calls = TokenStream::new();
+	let mut query_genesis_config_part_macros = Vec::new();
 
 	for decl in pallet_decls {
 		if let Some(pallet_entry) = decl.find_part("Config") {
-			let config = format_ident!("{}Config", decl.name);
-			let pallet_name = &decl.name.to_string().to_snake_case();
-			let field_name = &Ident::new(pallet_name, decl.name.span());
+			let path = &decl.path;
+			let pallet_name = &decl.name;
+			let config = format_ident!("{}Config", pallet_name);
+			let field_name = &Ident::new(
+				&pallet_name.to_string().to_snake_case(),
+				decl.name.span(),
+			);
 			let part_is_generic = !pallet_entry.generics.params.is_empty();
 
 			types.extend(expand_config_types(runtime, decl, &config, part_is_generic));
 			fields.extend(quote!(pub #field_name: #config,));
 			build_storage_calls.extend(expand_config_build_storage_call(scrate, runtime, decl, &field_name));
+			query_genesis_config_part_macros.push(quote! {
+				#path::__substrate_genesis_config_check::is_genesis_config_defined!(#pallet_name);
+			});
 		}
 	}
 
-	quote!{
+	quote! {
+		#( #query_genesis_config_part_macros )*
+
 		#types
 
 		#[cfg(any(feature = "std", test))]
diff --git a/frame/support/procedural/src/construct_runtime/expand/event.rs b/frame/support/procedural/src/construct_runtime/expand/event.rs
index afedb3ed9250..d304a30b7df0 100644
--- a/frame/support/procedural/src/construct_runtime/expand/event.rs
+++ b/frame/support/procedural/src/construct_runtime/expand/event.rs
@@ -27,10 +27,12 @@ pub fn expand_outer_event(
 ) -> syn::Result<TokenStream> {
 	let mut event_variants = TokenStream::new();
 	let mut event_conversions = TokenStream::new();
+	let mut query_event_part_macros = Vec::new();
 
 	for pallet_decl in pallet_decls {
 		if let Some(pallet_entry) = pallet_decl.find_part("Event") {
 			let path = &pallet_decl.path;
+			let pallet_name = &pallet_decl.name;
 			let index = pallet_decl.index;
 			let instance = pallet_decl.instance.as_ref();
 			let generics = &pallet_entry.generics;
@@ -39,9 +41,9 @@ pub fn expand_outer_event(
 				let msg = format!(
 					"Instantiable pallet with no generic `Event` cannot \
 					 be constructed: pallet `{}` must have generic `Event`",
-					pallet_decl.name,
+					pallet_name,
 				);
-				return Err(syn::Error::new(pallet_decl.name.span(), msg));
+				return Err(syn::Error::new(pallet_name.span(), msg));
 			}
 
 			let part_is_generic = !generics.params.is_empty();
@@ -54,10 +56,15 @@ pub fn expand_outer_event(
 
 			event_variants.extend(expand_event_variant(runtime, pallet_decl, index, instance, generics));
 			event_conversions.extend(expand_event_conversion(scrate, pallet_decl, &pallet_event));
+			query_event_part_macros.push(quote! {
+				#path::__substrate_event_check::is_event_part_defined!(#pallet_name);
+			});
 		}
 	}
 
-	Ok(quote!{
+	Ok(quote! {
+		#( #query_event_part_macros )*
+
 		#[derive(
 			Clone, PartialEq, Eq,
 			#scrate::codec::Encode,
diff --git a/frame/support/procedural/src/construct_runtime/expand/inherent.rs b/frame/support/procedural/src/construct_runtime/expand/inherent.rs
new file mode 100644
index 000000000000..fd3041678268
--- /dev/null
+++ b/frame/support/procedural/src/construct_runtime/expand/inherent.rs
@@ -0,0 +1,204 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License
+
+use crate::construct_runtime::Pallet;
+use proc_macro2::TokenStream;
+use quote::quote;
+use syn::{Ident, TypePath};
+
+pub fn expand_outer_inherent(
+	runtime: &Ident,
+	block: &TypePath,
+	unchecked_extrinsic: &TypePath,
+	pallet_decls: &[Pallet],
+	scrate: &TokenStream,
+) -> TokenStream {
+	let mut pallet_names = Vec::new();
+	let mut query_inherent_part_macros = Vec::new();
+
+	for pallet_decl in pallet_decls {
+		if pallet_decl.exists_part("Inherent") {
+			let name = &pallet_decl.name;
+			let path = &pallet_decl.path;
+
+			pallet_names.push(name);
+			query_inherent_part_macros.push(quote! {
+				#path::__substrate_inherent_check::is_inherent_part_defined!(#name);
+			});
+		}
+	}
+
+	quote! {
+		#( #query_inherent_part_macros )*
+
+		trait InherentDataExt {
+			fn create_extrinsics(&self) ->
+				#scrate::inherent::Vec<<#block as #scrate::inherent::BlockT>::Extrinsic>;
+			fn check_extrinsics(&self, block: &#block) -> #scrate::inherent::CheckInherentsResult;
+		}
+
+		impl InherentDataExt for #scrate::inherent::InherentData {
+			fn create_extrinsics(&self) ->
+				#scrate::inherent::Vec<<#block as #scrate::inherent::BlockT>::Extrinsic>
+			{
+				use #scrate::inherent::ProvideInherent;
+
+				let mut inherents = Vec::new();
+
+				#(
+					if let Some(inherent) = #pallet_names::create_inherent(self) {
+						let inherent = <#unchecked_extrinsic as #scrate::inherent::Extrinsic>::new(
+							inherent.into(),
+							None,
+						).expect("Runtime UncheckedExtrinsic is not Opaque, so it has to return \
+							`Some`; qed");
+
+						inherents.push(inherent);
+					}
+				)*
+
+				inherents
+			}
+
+			fn check_extrinsics(&self, block: &#block) -> #scrate::inherent::CheckInherentsResult {
+				use #scrate::inherent::{ProvideInherent, IsFatalError};
+				use #scrate::traits::{IsSubType, ExtrinsicCall};
+				use #scrate::sp_runtime::traits::Block as _;
+
+				let mut result = #scrate::inherent::CheckInherentsResult::new();
+
+				for xt in block.extrinsics() {
+					// Inherents are before any other extrinsics.
+					// And signed extrinsics are not inherents.
+					if #scrate::inherent::Extrinsic::is_signed(xt).unwrap_or(false) {
+						break
+					}
+
+					let mut is_inherent = false;
+
+					#({
+						let call = <#unchecked_extrinsic as ExtrinsicCall>::call(xt);
+						if let Some(call) = IsSubType::<_>::is_sub_type(call) {
+							if #pallet_names::is_inherent(call) {
+								is_inherent = true;
+								if let Err(e) = #pallet_names::check_inherent(call, self) {
+									result.put_error(
+										#pallet_names::INHERENT_IDENTIFIER, &e
+									).expect("There is only one fatal error; qed");
+									if e.is_fatal_error() {
+										return result;
+									}
+								}
+							}
+						}
+					})*
+
+					// Inherents are before any other extrinsics.
+					// No module marked it as inherent thus it is not.
+					if !is_inherent {
+						break
+					}
+				}
+
+				#(
+					match #pallet_names::is_inherent_required(self) {
+						Ok(Some(e)) => {
+							let found = block.extrinsics().iter().any(|xt| {
+								let is_signed = #scrate::inherent::Extrinsic::is_signed(xt)
+									.unwrap_or(false);
+
+								if !is_signed {
+									let call = <
+										#unchecked_extrinsic as ExtrinsicCall
+									>::call(xt);
+									if let Some(call) = IsSubType::<_>::is_sub_type(call) {
+										#pallet_names::is_inherent(&call)
+									} else {
+										false
+									}
+								} else {
+									// Signed extrinsics are not inherents.
+									false
+								}
+							});
+
+							if !found {
+								result.put_error(
+									#pallet_names::INHERENT_IDENTIFIER, &e
+								).expect("There is only one fatal error; qed");
+								if e.is_fatal_error() {
+									return result;
+								}
+							}
+						},
+						Ok(None) => (),
+						Err(e) => {
+							result.put_error(
+								#pallet_names::INHERENT_IDENTIFIER, &e
+							).expect("There is only one fatal error; qed");
+							if e.is_fatal_error() {
+								return result;
+							}
+						},
+					}
+				)*
+
+				result
+			}
+		}
+
+		impl #scrate::traits::EnsureInherentsAreFirst<#block> for #runtime {
+			fn ensure_inherents_are_first(block: &#block) -> Result<(), u32> {
+				use #scrate::inherent::ProvideInherent;
+				use #scrate::traits::{IsSubType, ExtrinsicCall};
+				use #scrate::sp_runtime::traits::Block as _;
+
+				let mut first_signed_observed = false;
+
+				for (i, xt) in block.extrinsics().iter().enumerate() {
+					let is_signed = #scrate::inherent::Extrinsic::is_signed(xt).unwrap_or(false);
+
+					let is_inherent = if is_signed {
+						// Signed extrinsics are not inherents.
+						false
+					} else {
+						let mut is_inherent = false;
+						#({
+							let call = <#unchecked_extrinsic as ExtrinsicCall>::call(xt);
+							if let Some(call) = IsSubType::<_>::is_sub_type(call) {
+								if #pallet_names::is_inherent(&call) {
+									is_inherent = true;
+								}
+							}
+						})*
+						is_inherent
+					};
+
+					if !is_inherent {
+						first_signed_observed = true;
+					}
+
+					if first_signed_observed && is_inherent {
+						return Err(i as u32)
+					}
+				}
+
+				Ok(())
+			}
+		}
+	}
+}
diff --git a/frame/support/procedural/src/construct_runtime/expand/mod.rs b/frame/support/procedural/src/construct_runtime/expand/mod.rs
index ab2242ba0546..cf8b5eef8d10 100644
--- a/frame/support/procedural/src/construct_runtime/expand/mod.rs
+++ b/frame/support/procedural/src/construct_runtime/expand/mod.rs
@@ -15,12 +15,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License
 
+mod call;
 mod config;
 mod event;
+mod inherent;
 mod metadata;
 mod origin;
+mod unsigned;
 
+pub use call::expand_outer_dispatch;
 pub use config::expand_outer_config;
 pub use event::expand_outer_event;
+pub use inherent::expand_outer_inherent;
 pub use metadata::expand_runtime_metadata;
 pub use origin::expand_outer_origin;
+pub use unsigned::expand_outer_validate_unsigned;
diff --git a/frame/support/procedural/src/construct_runtime/expand/origin.rs b/frame/support/procedural/src/construct_runtime/expand/origin.rs
index 2d0cc8300cb7..962d25835940 100644
--- a/frame/support/procedural/src/construct_runtime/expand/origin.rs
+++ b/frame/support/procedural/src/construct_runtime/expand/origin.rs
@@ -36,20 +36,23 @@ pub fn expand_outer_origin(
 
 	let mut caller_variants = TokenStream::new();
 	let mut pallet_conversions = TokenStream::new();
+	let mut query_origin_part_macros = Vec::new();
 
 	for pallet_decl in pallets.iter().filter(|pallet| pallet.name != SYSTEM_PALLET_NAME) {
 		if let Some(pallet_entry) = pallet_decl.find_part("Origin") {
 			let instance = pallet_decl.instance.as_ref();
 			let index = pallet_decl.index;
 			let generics = &pallet_entry.generics;
+			let name = &pallet_decl.name;
+			let path = &pallet_decl.path;
 
 			if instance.is_some() && generics.params.is_empty() {
 				let msg = format!(
 					"Instantiable pallet with no generic `Origin` cannot \
 					 be constructed: pallet `{}` must have generic `Origin`",
-					pallet_decl.name
+					name
 				);
-				return Err(syn::Error::new(pallet_decl.name.span(), msg));
+				return Err(syn::Error::new(name.span(), msg));
 			}
 
 			caller_variants.extend(
@@ -58,13 +61,18 @@ pub fn expand_outer_origin(
 			pallet_conversions.extend(
 				expand_origin_pallet_conversions(scrate, runtime, pallet_decl, instance, generics),
 			);
+			query_origin_part_macros.push(quote! {
+				#path::__substrate_origin_check::is_origin_part_defined!(#name);
+			});
 		}
 	}
 
 	let system_path = &system_pallet.path;
 	let system_index = system_pallet.index;
 
-	Ok(quote!{
+	Ok(quote! {
+		#( #query_origin_part_macros )*
+
 		// WARNING: All instance must hold the filter `frame_system::Config::BaseCallFilter`, except
 		// when caller is system Root. One can use `OriginTrait::reset_filter` to do so.
 		#[derive(Clone)]
diff --git a/frame/support/procedural/src/construct_runtime/expand/unsigned.rs b/frame/support/procedural/src/construct_runtime/expand/unsigned.rs
new file mode 100644
index 000000000000..d51792dd4a8d
--- /dev/null
+++ b/frame/support/procedural/src/construct_runtime/expand/unsigned.rs
@@ -0,0 +1,72 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License
+
+use crate::construct_runtime::Pallet;
+use proc_macro2::TokenStream;
+use quote::quote;
+use syn::Ident;
+
+pub fn expand_outer_validate_unsigned(
+	runtime: &Ident,
+	pallet_decls: &[Pallet],
+	scrate: &TokenStream,
+) -> TokenStream {
+	let mut pallet_names = Vec::new();
+	let mut query_validate_unsigned_part_macros = Vec::new();
+
+	for pallet_decl in pallet_decls {
+		if pallet_decl.exists_part("ValidateUnsigned") {
+			let name = &pallet_decl.name;
+			let path = &pallet_decl.path;
+
+			pallet_names.push(name);
+			query_validate_unsigned_part_macros.push(quote! {
+				#path::__substrate_validate_unsigned_check::is_validate_unsigned_part_defined!(#name);
+			});
+		}
+	}
+
+	quote! {
+		#( #query_validate_unsigned_part_macros )*
+
+		impl #scrate::unsigned::ValidateUnsigned for #runtime {
+			type Call = Call;
+
+			fn pre_dispatch(call: &Self::Call) -> Result<(), #scrate::unsigned::TransactionValidityError> {
+				#[allow(unreachable_patterns)]
+				match call {
+					#( Call::#pallet_names(inner_call) => #pallet_names::pre_dispatch(inner_call), )*
+					// pre-dispatch should not stop inherent extrinsics, validation should prevent
+					// including arbitrary (non-inherent) extrinsics to blocks.
+					_ => Ok(()),
+				}
+			}
+
+			fn validate_unsigned(
+				#[allow(unused_variables)]
+				source: #scrate::unsigned::TransactionSource,
+				call: &Self::Call,
+			) -> #scrate::unsigned::TransactionValidity {
+				#[allow(unreachable_patterns)]
+				match call {
+					#( Call::#pallet_names(inner_call) => #pallet_names::validate_unsigned(source, inner_call), )*
+					_ => #scrate::unsigned::UnknownTransaction::NoUnsignedValidator.into(),
+				}
+			}
+		}
+	}
+}
diff --git a/frame/support/procedural/src/construct_runtime/mod.rs b/frame/support/procedural/src/construct_runtime/mod.rs
index 87fce6e37cf0..6f8924a14bcc 100644
--- a/frame/support/procedural/src/construct_runtime/mod.rs
+++ b/frame/support/procedural/src/construct_runtime/mod.rs
@@ -145,17 +145,17 @@ fn construct_runtime_parsed(definition: RuntimeDefinition) -> Result<TokenStream
 	let all_pallets = decl_all_pallets(&name, pallets.iter());
 	let pallet_to_index = decl_pallet_runtime_setup(&pallets, &scrate);
 
-	let dispatch = decl_outer_dispatch(&name, pallets.iter(), &scrate);
+	let dispatch = expand::expand_outer_dispatch(&name, &pallets, &scrate);
 	let metadata = expand::expand_runtime_metadata(&name, &pallets, &scrate, &unchecked_extrinsic);
 	let outer_config = expand::expand_outer_config(&name, &pallets, &scrate);
-	let inherent = decl_outer_inherent(
+	let inherent = expand::expand_outer_inherent(
 		&name,
 		&block,
 		&unchecked_extrinsic,
-		pallets.iter(),
+		&pallets,
 		&scrate,
 	);
-	let validate_unsigned = decl_validate_unsigned(&name, pallets.iter(), &scrate);
+	let validate_unsigned = expand::expand_outer_validate_unsigned(&name, &pallets, &scrate);
 	let integrity_test = decl_integrity_test(&scrate);
 
 	let res = quote!(
@@ -200,73 +200,6 @@ fn construct_runtime_parsed(definition: RuntimeDefinition) -> Result<TokenStream
 	Ok(res)
 }
 
-fn decl_validate_unsigned<'a>(
-	runtime: &'a Ident,
-	pallet_declarations: impl Iterator<Item = &'a Pallet>,
-	scrate: &'a TokenStream2,
-) -> TokenStream2 {
-	let pallets_tokens = pallet_declarations
-		.filter(|pallet_declaration| pallet_declaration.exists_part("ValidateUnsigned"))
-		.map(|pallet_declaration| &pallet_declaration.name);
-	quote!(
-		#scrate::impl_outer_validate_unsigned!(
-			impl ValidateUnsigned for #runtime {
-				#( #pallets_tokens )*
-			}
-		);
-	)
-}
-
-fn decl_outer_inherent<'a>(
-	runtime: &'a Ident,
-	block: &'a syn::TypePath,
-	unchecked_extrinsic: &'a syn::TypePath,
-	pallet_declarations: impl Iterator<Item = &'a Pallet>,
-	scrate: &'a TokenStream2,
-) -> TokenStream2 {
-	let pallets_tokens = pallet_declarations.filter_map(|pallet_declaration| {
-		let maybe_config_part = pallet_declaration.find_part("Inherent");
-		maybe_config_part.map(|_| {
-			let name = &pallet_declaration.name;
-			quote!(#name,)
-		})
-	});
-	quote!(
-		#scrate::impl_outer_inherent!(
-			impl Inherents where
-				Block = #block,
-				UncheckedExtrinsic = #unchecked_extrinsic,
-				Runtime = #runtime,
-			{
-				#(#pallets_tokens)*
-			}
-		);
-	)
-}
-
-fn decl_outer_dispatch<'a>(
-	runtime: &'a Ident,
-	pallet_declarations: impl Iterator<Item = &'a Pallet>,
-	scrate: &'a TokenStream2,
-) -> TokenStream2 {
-	let pallets_tokens = pallet_declarations
-		.filter(|pallet_declaration| pallet_declaration.exists_part("Call"))
-		.map(|pallet_declaration| {
-			let pallet = &pallet_declaration.path.inner.segments.last().unwrap();
-			let name = &pallet_declaration.name;
-			let index = pallet_declaration.index;
-			quote!(#[codec(index = #index)] #pallet::#name)
-		});
-
-	quote!(
-		#scrate::impl_outer_dispatch! {
-			pub enum Call for #runtime where origin: Origin {
-				#(#pallets_tokens,)*
-			}
-		}
-	)
-}
-
 fn decl_all_pallets<'a>(
 	runtime: &'a Ident,
 	pallet_declarations: impl Iterator<Item = &'a Pallet>,
diff --git a/frame/support/procedural/src/dummy_part_checker.rs b/frame/support/procedural/src/dummy_part_checker.rs
new file mode 100644
index 000000000000..8bc893b3123f
--- /dev/null
+++ b/frame/support/procedural/src/dummy_part_checker.rs
@@ -0,0 +1,104 @@
+use proc_macro::TokenStream;
+use crate::COUNTER;
+
+pub fn generate_dummy_part_checker(input: TokenStream) -> TokenStream {
+	if !input.is_empty() {
+		return syn::Error::new(proc_macro2::Span::call_site(), "No arguments expected")
+			.to_compile_error().into()
+	}
+
+	let count = COUNTER.with(|counter| counter.borrow_mut().inc());
+
+	let genesis_config_macro_ident = syn::Ident::new(
+		&format!("__is_genesis_config_defined_{}", count),
+		proc_macro2::Span::call_site(),
+	);
+	let event_macro_ident = syn::Ident::new(
+		&format!("__is_event_part_defined_{}", count),
+		proc_macro2::Span::call_site(),
+	);
+	let inherent_macro_ident = syn::Ident::new(
+		&format!("__is_inherent_part_defined_{}", count),
+		proc_macro2::Span::call_site(),
+	);
+	let validate_unsigned_macro_ident = syn::Ident::new(
+		&format!("__is_validate_unsigned_part_defined_{}", count),
+		proc_macro2::Span::call_site(),
+	);
+	let call_macro_ident = syn::Ident::new(
+		&format!("__is_call_part_defined_{}", count),
+		proc_macro2::Span::call_site(),
+	);
+	let origin_macro_ident = syn::Ident::new(
+		&format!("__is_origin_part_defined_{}", count),
+		proc_macro2::Span::call_site(),
+	);
+
+	quote::quote!(
+		#[doc(hidden)]
+		pub mod __substrate_genesis_config_check {
+			#[macro_export]
+			#[doc(hidden)]
+			macro_rules! #genesis_config_macro_ident {
+				($pallet_name:ident) => {};
+			}
+			#[doc(hidden)]
+			pub use #genesis_config_macro_ident as is_genesis_config_defined;
+		}
+
+		#[doc(hidden)]
+		pub mod __substrate_event_check {
+			#[macro_export]
+			#[doc(hidden)]
+			macro_rules! #event_macro_ident {
+				($pallet_name:ident) => {};
+			}
+			#[doc(hidden)]
+			pub use #event_macro_ident as is_event_part_defined;
+		}
+
+		#[doc(hidden)]
+		pub mod __substrate_inherent_check {
+			#[macro_export]
+			#[doc(hidden)]
+			macro_rules! #inherent_macro_ident {
+				($pallet_name:ident) => {};
+			}
+			#[doc(hidden)]
+			pub use #inherent_macro_ident as is_inherent_part_defined;
+		}
+
+		#[doc(hidden)]
+		pub mod __substrate_validate_unsigned_check {
+			#[macro_export]
+			#[doc(hidden)]
+			macro_rules! #validate_unsigned_macro_ident {
+				($pallet_name:ident) => {};
+			}
+			#[doc(hidden)]
+			pub use #validate_unsigned_macro_ident as is_validate_unsigned_part_defined;
+		}
+
+		#[doc(hidden)]
+		pub mod __substrate_call_check {
+			#[macro_export]
+			#[doc(hidden)]
+			macro_rules! #call_macro_ident {
+				($pallet_name:ident) => {};
+			}
+			#[doc(hidden)]
+			pub use #call_macro_ident as is_call_part_defined;
+		}
+
+		#[doc(hidden)]
+		pub mod __substrate_origin_check {
+			#[macro_export]
+			#[doc(hidden)]
+			macro_rules! #origin_macro_ident {
+				($pallet_name:ident) => {};
+			}
+			#[doc(hidden)]
+			pub use #origin_macro_ident as is_origin_part_defined;
+		}
+	).into()
+}
diff --git a/frame/support/procedural/src/lib.rs b/frame/support/procedural/src/lib.rs
index d3ddd2360b31..2768608cb6f5 100644
--- a/frame/support/procedural/src/lib.rs
+++ b/frame/support/procedural/src/lib.rs
@@ -29,9 +29,29 @@ mod clone_no_bound;
 mod partial_eq_no_bound;
 mod default_no_bound;
 mod key_prefix;
+mod dummy_part_checker;
 
 pub(crate) use storage::INHERENT_INSTANCE_NAME;
 use proc_macro::TokenStream;
+use std::cell::RefCell;
+
+thread_local! {
+	/// A global counter, can be used to generate a relatively unique identifier.
+	static COUNTER: RefCell<Counter> = RefCell::new(Counter(0));
+}
+
+/// Counter to generate a relatively unique identifier for macros querying for the existence of
+/// pallet parts. This is necessary because declarative macros gets hoisted to the crate root,
+/// which shares the namespace with other pallets containing the very same query macros.
+struct Counter(u64);
+
+impl Counter {
+	fn inc(&mut self) -> u64 {
+		let ret = self.0;
+		self.0 += 1;
+		ret
+	}
+}
 
 /// Declares strongly-typed wrappers around codec-compatible types in storage.
 ///
@@ -453,3 +473,9 @@ pub(crate) const NUMBER_OF_INSTANCE: u8 = 16;
 pub fn impl_key_prefix_for_tuples(input: TokenStream) -> TokenStream {
 	key_prefix::impl_key_prefix_for_tuples(input).unwrap_or_else(syn::Error::into_compile_error).into()
 }
+
+/// Internal macro use by frame_support to generate dummy part checker for old pallet declaration
+#[proc_macro]
+pub fn __generate_dummy_part_checker(input: TokenStream) -> TokenStream {
+	dummy_part_checker::generate_dummy_part_checker(input)
+}
diff --git a/frame/support/procedural/src/pallet/expand/call.rs b/frame/support/procedural/src/pallet/expand/call.rs
index a3ac7ecc5f86..28280a5e8922 100644
--- a/frame/support/procedural/src/pallet/expand/call.rs
+++ b/frame/support/procedural/src/pallet/expand/call.rs
@@ -17,6 +17,7 @@
 
 use crate::pallet::Def;
 use frame_support_procedural_tools::clean_type_string;
+use crate::COUNTER;
 use syn::spanned::Spanned;
 
 /// * Generate enum call and implement various trait on it.
@@ -31,7 +32,7 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
 
 			(span, where_clause, methods, docs)
 		}
-		None => (def.pallet_struct.attr_span, None, Vec::new(), Vec::new()),
+		None => (def.item.span(), None, Vec::new(), Vec::new()),
 	};
 	let frame_support = &def.frame_support;
 	let frame_system = &def.frame_system;
@@ -89,7 +90,37 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
 		&docs[..]
 	};
 
+	let maybe_compile_error = if def.call.is_none() {
+		quote::quote!{
+			compile_error!(concat!(
+				"`",
+				stringify!($pallet_name),
+				"` does not have #[pallet::call] defined, perhaps you should remove `Call` from \
+				construct_runtime?",
+			));
+		}
+	} else {
+		proc_macro2::TokenStream::new()
+	};
+
+	let count = COUNTER.with(|counter| counter.borrow_mut().inc());
+	let macro_ident = syn::Ident::new(&format!("__is_call_part_defined_{}", count), span);
+
 	quote::quote_spanned!(span =>
+		#[doc(hidden)]
+		pub mod __substrate_call_check {
+			#[macro_export]
+			#[doc(hidden)]
+			macro_rules! #macro_ident {
+				($pallet_name:ident) => {
+					#maybe_compile_error
+				};
+			}
+
+			#[doc(hidden)]
+			pub use #macro_ident as is_call_part_defined;
+		}
+
 		#( #[doc = #docs] )*
 		#[derive(
 			#frame_support::RuntimeDebugNoBound,
diff --git a/frame/support/procedural/src/pallet/expand/event.rs b/frame/support/procedural/src/pallet/expand/event.rs
index 204b5a23611c..d932206be09f 100644
--- a/frame/support/procedural/src/pallet/expand/event.rs
+++ b/frame/support/procedural/src/pallet/expand/event.rs
@@ -16,15 +16,44 @@
 // limitations under the License.
 
 use crate::pallet::{Def, parse::helper::get_doc_literals};
+use crate::COUNTER;
+use syn::{spanned::Spanned, Ident};
 
 /// * Add __Ignore variant on Event
 /// * Impl various trait on Event including metadata
 /// * if deposit_event is defined, implement deposit_event on module.
 pub fn expand_event(def: &mut Def) -> proc_macro2::TokenStream {
-	let event = if let Some(event) = &def.event {
-		event
+	let count = COUNTER.with(|counter| counter.borrow_mut().inc());
+
+	let (event, macro_ident) = if let Some(event) = &def.event {
+		let ident = Ident::new(&format!("__is_event_part_defined_{}", count), event.attr_span);
+		(event, ident)
 	} else {
-		return Default::default()
+		let macro_ident = Ident::new(
+			&format!("__is_event_part_defined_{}", count),
+			def.item.span(),
+		);
+
+		return quote::quote! {
+			#[doc(hidden)]
+			pub mod __substrate_event_check {
+				#[macro_export]
+				#[doc(hidden)]
+				macro_rules! #macro_ident {
+					($pallet_name:ident) => {
+						compile_error!(concat!(
+							"`",
+							stringify!($pallet_name),
+							"` does not have #[pallet::event] defined, perhaps you should \
+							remove `Event` from construct_runtime?",
+						));
+					}
+				}
+	
+				#[doc(hidden)]
+				pub use #macro_ident as is_event_part_defined;
+			}
+		};
 	};
 
 	let event_where_clause = &event.where_clause;
@@ -130,6 +159,18 @@ pub fn expand_event(def: &mut Def) -> proc_macro2::TokenStream {
 	};
 
 	quote::quote_spanned!(event.attr_span =>
+		#[doc(hidden)]
+		pub mod __substrate_event_check {
+			#[macro_export]
+			#[doc(hidden)]
+			macro_rules! #macro_ident {
+				($pallet_name:ident) => {};
+			}
+	
+			#[doc(hidden)]
+			pub use #macro_ident as is_event_part_defined;
+		}
+
 		#deposit_event
 
 		impl<#event_impl_gen> From<#event_ident<#event_use_gen>> for () #event_where_clause {
diff --git a/frame/support/procedural/src/pallet/expand/genesis_config.rs b/frame/support/procedural/src/pallet/expand/genesis_config.rs
index 23ccdfa5ddc9..ac0bdacefc77 100644
--- a/frame/support/procedural/src/pallet/expand/genesis_config.rs
+++ b/frame/support/procedural/src/pallet/expand/genesis_config.rs
@@ -16,13 +16,45 @@
 // limitations under the License.
 
 use crate::pallet::{Def, parse::helper::get_doc_literals};
+use crate::COUNTER;
+use syn::{Ident, spanned::Spanned};
 
 /// * add various derive trait on GenesisConfig struct.
 pub fn expand_genesis_config(def: &mut Def) -> proc_macro2::TokenStream {
-	let genesis_config = if let Some(genesis_config) = &def.genesis_config {
-		genesis_config
+	let count = COUNTER.with(|counter| counter.borrow_mut().inc());
+
+	let (genesis_config, macro_ident) = if let Some(genesis_config) = &def.genesis_config {
+		let ident = Ident::new(
+			&format!("__is_genesis_config_defined_{}", count),
+			genesis_config.genesis_config.span(),
+		);
+		(genesis_config, ident)
 	} else {
-		return Default::default()
+		let macro_ident = Ident::new(
+			&format!("__is_genesis_config_defined_{}", count),
+			def.item.span(),
+		);
+
+		return quote::quote! {
+			#[doc(hidden)]
+			pub mod __substrate_genesis_config_check {
+				#[macro_export]
+				#[doc(hidden)]
+				macro_rules! #macro_ident {
+					($pallet_name:ident) => {
+						compile_error!(concat!(
+							"`",
+							stringify!($pallet_name),
+							"` does not have #[pallet::genesis_config] defined, perhaps you should \
+							remove `Config` from construct_runtime?",
+						));
+					}
+				}
+	
+				#[doc(hidden)]
+				pub use #macro_ident as is_genesis_config_defined;
+			}
+		};
 	};
 	let frame_support = &def.frame_support;
 
@@ -57,5 +89,17 @@ pub fn expand_genesis_config(def: &mut Def) -> proc_macro2::TokenStream {
 		_ => unreachable!("Checked by genesis_config parser"),
 	}
 
-	Default::default()
+	quote::quote! {
+		#[doc(hidden)]
+		pub mod __substrate_genesis_config_check {
+			#[macro_export]
+			#[doc(hidden)]
+			macro_rules! #macro_ident {
+				($pallet_name:ident) => {};
+			}
+	
+			#[doc(hidden)]
+			pub use #macro_ident as is_genesis_config_defined;
+		}
+	}
 }
diff --git a/frame/support/procedural/src/pallet/expand/inherent.rs b/frame/support/procedural/src/pallet/expand/inherent.rs
new file mode 100644
index 000000000000..f1d58b28a514
--- /dev/null
+++ b/frame/support/procedural/src/pallet/expand/inherent.rs
@@ -0,0 +1,56 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::pallet::Def;
+use proc_macro2::TokenStream;
+use quote::quote;
+use crate::COUNTER;
+use syn::{Ident, spanned::Spanned};
+
+pub fn expand_inherents(def: &mut Def) -> TokenStream {
+	let count = COUNTER.with(|counter| counter.borrow_mut().inc());
+	let macro_ident = Ident::new(&format!("__is_inherent_part_defined_{}", count), def.item.span());
+
+	let maybe_compile_error = if def.inherent.is_none() {
+		quote! {
+			compile_error!(concat!(
+				"`",
+				stringify!($pallet_name),
+				"` does not have #[pallet::inherent] defined, perhaps you should \
+				remove `Inherent` from construct_runtime?",
+			));
+		}
+	} else {
+		TokenStream::new()
+	};
+
+	quote! {
+		#[doc(hidden)]
+		pub mod __substrate_inherent_check {
+			#[macro_export]
+			#[doc(hidden)]
+			macro_rules! #macro_ident {
+				($pallet_name:ident) => {
+					#maybe_compile_error
+				}
+			}
+	
+			#[doc(hidden)]
+			pub use #macro_ident as is_inherent_part_defined;
+		}
+	}
+}
diff --git a/frame/support/procedural/src/pallet/expand/mod.rs b/frame/support/procedural/src/pallet/expand/mod.rs
index 22ef26817778..f3a42dfa868b 100644
--- a/frame/support/procedural/src/pallet/expand/mod.rs
+++ b/frame/support/procedural/src/pallet/expand/mod.rs
@@ -24,10 +24,13 @@ mod event;
 mod storage;
 mod hooks;
 mod store_trait;
+mod inherent;
 mod instances;
 mod genesis_build;
 mod genesis_config;
 mod type_value;
+mod origin;
+mod validate_unsigned;
 
 use crate::pallet::{Def, parse::helper::get_doc_literals};
 use quote::ToTokens;
@@ -54,12 +57,15 @@ pub fn expand(mut def: Def) -> proc_macro2::TokenStream {
 	let error = error::expand_error(&mut def);
 	let event = event::expand_event(&mut def);
 	let storages = storage::expand_storages(&mut def);
+	let inherents = inherent::expand_inherents(&mut def);
 	let instances = instances::expand_instances(&mut def);
 	let store_trait = store_trait::expand_store_trait(&mut def);
 	let hooks = hooks::expand_hooks(&mut def);
 	let genesis_build = genesis_build::expand_genesis_build(&mut def);
 	let genesis_config = genesis_config::expand_genesis_config(&mut def);
 	let type_values = type_value::expand_type_values(&mut def);
+	let origins = origin::expand_origins(&mut def);
+	let validate_unsigned = validate_unsigned::expand_validate_unsigned(&mut def);
 
 	if get_doc_literals(&def.item.attrs).is_empty() {
 		def.item.attrs.push(syn::parse_quote!(
@@ -80,12 +86,15 @@ pub fn expand(mut def: Def) -> proc_macro2::TokenStream {
 		#error
 		#event
 		#storages
+		#inherents
 		#instances
 		#store_trait
 		#hooks
 		#genesis_build
 		#genesis_config
 		#type_values
+		#origins
+		#validate_unsigned
 	);
 
 	def.item.content.as_mut().expect("This is checked by parsing").1
diff --git a/frame/support/procedural/src/pallet/expand/origin.rs b/frame/support/procedural/src/pallet/expand/origin.rs
new file mode 100644
index 000000000000..578c641b43e4
--- /dev/null
+++ b/frame/support/procedural/src/pallet/expand/origin.rs
@@ -0,0 +1,55 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::{pallet::Def, COUNTER};
+use proc_macro2::TokenStream;
+use quote::quote;
+use syn::{Ident, spanned::Spanned};
+
+pub fn expand_origins(def: &mut Def) -> TokenStream {
+	let count = COUNTER.with(|counter| counter.borrow_mut().inc());
+	let macro_ident = Ident::new(&format!("__is_origin_part_defined_{}", count), def.item.span());
+
+	let maybe_compile_error = if def.origin.is_none() {
+		quote! {
+			compile_error!(concat!(
+				"`",
+				stringify!($pallet_name),
+				"` does not have #[pallet::origin] defined, perhaps you should \
+				remove `Origin` from construct_runtime?",
+			));
+		}
+	} else {
+		TokenStream::new()
+	};
+
+	quote! {
+		#[doc(hidden)]
+		pub mod __substrate_origin_check {
+			#[macro_export]
+			#[doc(hidden)]
+			macro_rules! #macro_ident {
+				($pallet_name:ident) => {
+					#maybe_compile_error
+				}
+			}
+	
+			#[doc(hidden)]
+			pub use #macro_ident as is_origin_part_defined;
+		}
+	}
+}
diff --git a/frame/support/procedural/src/pallet/expand/validate_unsigned.rs b/frame/support/procedural/src/pallet/expand/validate_unsigned.rs
new file mode 100644
index 000000000000..1abf7d893b93
--- /dev/null
+++ b/frame/support/procedural/src/pallet/expand/validate_unsigned.rs
@@ -0,0 +1,56 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::pallet::Def;
+use proc_macro2::TokenStream;
+use quote::quote;
+use crate::COUNTER;
+use syn::{Ident, spanned::Spanned};
+
+pub fn expand_validate_unsigned(def: &mut Def) -> TokenStream {
+	let count = COUNTER.with(|counter| counter.borrow_mut().inc());
+	let macro_ident = Ident::new(&format!("__is_validate_unsigned_part_defined_{}", count), def.item.span());
+
+	let maybe_compile_error = if def.validate_unsigned.is_none() {
+		quote! {
+			compile_error!(concat!(
+				"`",
+				stringify!($pallet_name),
+				"` does not have #[pallet::validate_unsigned] defined, perhaps you should \
+				remove `ValidateUnsigned` from construct_runtime?",
+			));
+		}
+	} else {
+		TokenStream::new()
+	};
+
+	quote! {
+		#[doc(hidden)]
+		pub mod __substrate_validate_unsigned_check {
+			#[macro_export]
+			#[doc(hidden)]
+			macro_rules! #macro_ident {
+				($pallet_name:ident) => {
+					#maybe_compile_error
+				}
+			}
+	
+			#[doc(hidden)]
+			pub use #macro_ident as is_validate_unsigned_part_defined;
+		}
+	}
+}
diff --git a/frame/support/src/dispatch.rs b/frame/support/src/dispatch.rs
index d6f133a8d20a..ee290a31d5a4 100644
--- a/frame/support/src/dispatch.rs
+++ b/frame/support/src/dispatch.rs
@@ -2159,6 +2159,8 @@ macro_rules! decl_module {
 				<$error_type as $crate::dispatch::ModuleErrorMetadata>::metadata()
 			}
 		}
+
+		$crate::__generate_dummy_part_checker!();
 	}
 }
 
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 49e61eea569b..45988c1c7372 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -501,9 +501,12 @@ pub fn debug(data: &impl sp_std::fmt::Debug) {
 
 #[doc(inline)]
 pub use frame_support_procedural::{
-	decl_storage, construct_runtime, transactional, RuntimeDebugNoBound
+	decl_storage, construct_runtime, transactional, RuntimeDebugNoBound,
 };
 
+#[doc(hidden)]
+pub use frame_support_procedural::__generate_dummy_part_checker;
+
 /// Derive [`Clone`] but do not bound any generic.
 ///
 /// This is useful for type generic over runtime:
diff --git a/frame/support/test/tests/construct_runtime.rs b/frame/support/test/tests/construct_runtime.rs
index 7858595108b0..98d0c45d2425 100644
--- a/frame/support/test/tests/construct_runtime.rs
+++ b/frame/support/test/tests/construct_runtime.rs
@@ -172,6 +172,22 @@ pub mod module3 {
 			pub fn fail(_origin) -> frame_support::dispatch::DispatchResult {
 				Err(Error::<T>::Something.into())
 			}
+			#[weight = 0]
+			pub fn aux_1(_origin, #[compact] _data: u32) -> frame_support::dispatch::DispatchResult {
+				unreachable!()
+			}
+			#[weight = 0]
+			pub fn aux_2(_origin, _data: i32, #[compact] _data2: u32) -> frame_support::dispatch::DispatchResult {
+				unreachable!()
+			}
+			#[weight = 0]
+			fn aux_3(_origin, _data: i32, _data2: String) -> frame_support::dispatch::DispatchResult {
+				unreachable!()
+			}
+			#[weight = 3]
+			fn aux_4(_origin) -> frame_support::dispatch::DispatchResult { unreachable!() }
+			#[weight = (5, frame_support::weights::DispatchClass::Operational)]
+			fn operational(_origin) { unreachable!() }
 		}
 	}
 
@@ -465,6 +481,100 @@ fn call_codec() {
 	assert_eq!(Call::Module1_9(module1::Call::fail()).encode()[0], 13);
 }
 
+#[test]
+fn call_compact_attr() {
+	use codec::Encode;
+	let call: module3::Call<Runtime> = module3::Call::aux_1(1);
+	let encoded = call.encode();
+	assert_eq!(2, encoded.len());
+	assert_eq!(vec![1, 4], encoded);
+
+	let call: module3::Call<Runtime> = module3::Call::aux_2(1, 2);
+	let encoded = call.encode();
+	assert_eq!(6, encoded.len());
+	assert_eq!(vec![2, 1, 0, 0, 0, 8], encoded);
+}
+
+#[test]
+fn call_encode_is_correct_and_decode_works() {
+	use codec::{Decode, Encode};
+	let call: module3::Call<Runtime> = module3::Call::fail();
+	let encoded = call.encode();
+	assert_eq!(vec![0], encoded);
+	let decoded = module3::Call::<Runtime>::decode(&mut &encoded[..]).unwrap();
+	assert_eq!(decoded, call);
+
+	let call: module3::Call<Runtime> = module3::Call::aux_3(32, "hello".into());
+	let encoded = call.encode();
+	assert_eq!(vec![3, 32, 0, 0, 0, 20, 104, 101, 108, 108, 111], encoded);
+	let decoded = module3::Call::<Runtime>::decode(&mut &encoded[..]).unwrap();
+	assert_eq!(decoded, call);
+}
+
+#[test]
+fn call_weight_should_attach_to_call_enum() {
+	use frame_support::{
+		dispatch::{DispatchInfo, GetDispatchInfo},
+		weights::{DispatchClass, Pays},
+	};
+	// operational.
+	assert_eq!(
+		module3::Call::<Runtime>::operational().get_dispatch_info(),
+		DispatchInfo { weight: 5, class: DispatchClass::Operational, pays_fee: Pays::Yes },
+	);
+	// custom basic
+	assert_eq!(
+		module3::Call::<Runtime>::aux_4().get_dispatch_info(),
+		DispatchInfo { weight: 3, class: DispatchClass::Normal, pays_fee: Pays::Yes },
+	);
+}
+
+#[test]
+fn call_name() {
+	use frame_support::dispatch::GetCallName;
+	let name = module3::Call::<Runtime>::aux_4().get_call_name();
+	assert_eq!("aux_4", name);
+}
+
+#[test]
+fn call_metadata() {
+	use frame_support::dispatch::{CallMetadata, GetCallMetadata};
+	let call = Call::Module3(module3::Call::<Runtime>::aux_4());
+	let metadata = call.get_call_metadata();
+	let expected = CallMetadata { function_name: "aux_4".into(), pallet_name: "Module3".into() };
+	assert_eq!(metadata, expected);
+}
+
+#[test]
+fn get_call_names() {
+	use frame_support::dispatch::GetCallName;
+	let call_names = module3::Call::<Runtime>::get_call_names();
+	assert_eq!(["fail", "aux_1", "aux_2", "aux_3", "aux_4", "operational"], call_names);
+}
+
+#[test]
+fn get_module_names() {
+	use frame_support::dispatch::GetCallMetadata;
+	let module_names = Call::get_module_names();
+	assert_eq!([
+		"System", "Module1_1", "Module2", "Module1_2", "NestedModule3", "Module3",
+		"Module1_4", "Module1_6", "Module1_7", "Module1_8", "Module1_9",
+	], module_names);
+}
+
+#[test]
+fn call_subtype_conversion() {
+	use frame_support::{dispatch::CallableCallFor, traits::IsSubType};
+	let call = Call::Module3(module3::Call::<Runtime>::fail());
+	let subcall: Option<&CallableCallFor<Module3, Runtime>> = call.is_sub_type();
+	let subcall_none: Option<&CallableCallFor<Module2, Runtime>> = call.is_sub_type();
+	assert_eq!(Some(&module3::Call::<Runtime>::fail()), subcall);
+	assert_eq!(None, subcall_none);
+
+	let from = Call::from(subcall.unwrap().clone());
+	assert_eq!(from, call);
+}
+
 #[test]
 fn test_metadata() {
 	use frame_metadata::*;
@@ -601,6 +711,54 @@ fn test_metadata() {
 						arguments: DecodeDifferent::Encode(&[]),
 						documentation: DecodeDifferent::Encode(&[]),
 					},
+					FunctionMetadata {
+						name: DecodeDifferent::Encode("aux_1"),
+						arguments: DecodeDifferent::Encode(&[
+							FunctionArgumentMetadata {
+								name: DecodeDifferent::Encode("_data"),
+								ty: DecodeDifferent::Encode("Compact<u32>"),
+							},
+						]),
+						documentation: DecodeDifferent::Encode(&[]),
+					},
+					FunctionMetadata {
+						name: DecodeDifferent::Encode("aux_2"),
+						arguments: DecodeDifferent::Encode(&[
+							FunctionArgumentMetadata {
+								name: DecodeDifferent::Encode("_data"),
+								ty: DecodeDifferent::Encode("i32"),
+							},
+							FunctionArgumentMetadata {
+								name: DecodeDifferent::Encode("_data2"),
+								ty: DecodeDifferent::Encode("Compact<u32>"),
+							},
+						]),
+						documentation: DecodeDifferent::Encode(&[]),
+					},
+					FunctionMetadata {
+						name: DecodeDifferent::Encode("aux_3"),
+						arguments: DecodeDifferent::Encode(&[
+							FunctionArgumentMetadata {
+								name: DecodeDifferent::Encode("_data"),
+								ty: DecodeDifferent::Encode("i32"),
+							},
+							FunctionArgumentMetadata {
+								name: DecodeDifferent::Encode("_data2"),
+								ty: DecodeDifferent::Encode("String"),
+							},
+						]),
+						documentation: DecodeDifferent::Encode(&[]),
+					},
+					FunctionMetadata {
+						name: DecodeDifferent::Encode("aux_4"),
+						arguments: DecodeDifferent::Encode(&[]),
+						documentation: DecodeDifferent::Encode(&[]),
+					},
+					FunctionMetadata {
+						name: DecodeDifferent::Encode("operational"),
+						arguments: DecodeDifferent::Encode(&[]),
+						documentation: DecodeDifferent::Encode(&[]),
+					},
 				]))),
 				event: Some(DecodeDifferent::Encode(FnEncode(|| &[
 					EventMetadata {
diff --git a/frame/support/test/tests/construct_runtime_ui/undefined_call_part.rs b/frame/support/test/tests/construct_runtime_ui/undefined_call_part.rs
new file mode 100644
index 000000000000..c5b9fcca1f31
--- /dev/null
+++ b/frame/support/test/tests/construct_runtime_ui/undefined_call_part.rs
@@ -0,0 +1,33 @@
+use frame_support::construct_runtime;
+use sp_runtime::{generic, traits::BlakeTwo256};
+use sp_core::sr25519;
+
+#[frame_support::pallet]
+mod pallet {
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(_);
+}
+
+pub type Signature = sr25519::Signature;
+pub type BlockNumber = u64;
+pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
+pub type Block = generic::Block<Header, UncheckedExtrinsic>;
+pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, Call, Signature, ()>;
+
+impl pallet::Config for Runtime {}
+
+construct_runtime! {
+	pub enum Runtime where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic
+	{
+		System: system::{Pallet, Call, Storage, Config, Event<T>},
+		Pallet: pallet::{Pallet, Call},
+	}
+}
+
+fn main() {}
diff --git a/frame/support/test/tests/construct_runtime_ui/undefined_call_part.stderr b/frame/support/test/tests/construct_runtime_ui/undefined_call_part.stderr
new file mode 100644
index 000000000000..201609b2abaf
--- /dev/null
+++ b/frame/support/test/tests/construct_runtime_ui/undefined_call_part.stderr
@@ -0,0 +1,49 @@
+error: `Pallet` does not have #[pallet::call] defined, perhaps you should remove `Call` from construct_runtime?
+  --> $DIR/undefined_call_part.rs:5:1
+   |
+5  |   #[frame_support::pallet]
+   |   ^^^^^^^^^^^^^^^^^^^^^^^^
+...
+22 | / construct_runtime! {
+23 | |     pub enum Runtime where
+24 | |         Block = Block,
+25 | |         NodeBlock = Block,
+...  |
+30 | |     }
+31 | | }
+   | |_- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0433]: failed to resolve: use of undeclared crate or module `system`
+  --> $DIR/undefined_call_part.rs:28:11
+   |
+28 |         System: system::{Pallet, Call, Storage, Config, Event<T>},
+   |                 ^^^^^^ use of undeclared crate or module `system`
+
+error[E0433]: failed to resolve: use of undeclared crate or module `system`
+  --> $DIR/undefined_call_part.rs:22:1
+   |
+22 | / construct_runtime! {
+23 | |     pub enum Runtime where
+24 | |         Block = Block,
+25 | |         NodeBlock = Block,
+...  |
+30 | |     }
+31 | | }
+   | |_^ not found in `system`
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+help: consider importing this enum
+   |
+1  | use frame_system::RawOrigin;
+   |
+
+error[E0277]: the trait bound `Runtime: frame_system::Config` is not satisfied
+  --> $DIR/undefined_call_part.rs:20:6
+   |
+8  |     pub trait Config: frame_system::Config {}
+   |                       -------------------- required by this bound in `pallet::Config`
+...
+20 | impl pallet::Config for Runtime {}
+   |      ^^^^^^^^^^^^^^ the trait `frame_system::Config` is not implemented for `Runtime`
diff --git a/frame/support/test/tests/construct_runtime_ui/undefined_event_part.rs b/frame/support/test/tests/construct_runtime_ui/undefined_event_part.rs
new file mode 100644
index 000000000000..6aec45f240c9
--- /dev/null
+++ b/frame/support/test/tests/construct_runtime_ui/undefined_event_part.rs
@@ -0,0 +1,33 @@
+use frame_support::construct_runtime;
+use sp_runtime::{generic, traits::BlakeTwo256};
+use sp_core::sr25519;
+
+#[frame_support::pallet]
+mod pallet {
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(_);
+}
+
+pub type Signature = sr25519::Signature;
+pub type BlockNumber = u64;
+pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
+pub type Block = generic::Block<Header, UncheckedExtrinsic>;
+pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, Call, Signature, ()>;
+
+impl pallet::Config for Runtime {}
+
+construct_runtime! {
+	pub enum Runtime where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic
+	{
+		System: system::{Pallet, Call, Storage, Config, Event<T>},
+		Pallet: pallet::{Pallet, Event},
+	}
+}
+
+fn main() {}
diff --git a/frame/support/test/tests/construct_runtime_ui/undefined_event_part.stderr b/frame/support/test/tests/construct_runtime_ui/undefined_event_part.stderr
new file mode 100644
index 000000000000..b68beb2b3fc6
--- /dev/null
+++ b/frame/support/test/tests/construct_runtime_ui/undefined_event_part.stderr
@@ -0,0 +1,101 @@
+error: `Pallet` does not have #[pallet::event] defined, perhaps you should remove `Event` from construct_runtime?
+  --> $DIR/undefined_event_part.rs:5:1
+   |
+5  |   #[frame_support::pallet]
+   |   ^^^^^^^^^^^^^^^^^^^^^^^^
+...
+22 | / construct_runtime! {
+23 | |     pub enum Runtime where
+24 | |         Block = Block,
+25 | |         NodeBlock = Block,
+...  |
+30 | |     }
+31 | | }
+   | |_- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0433]: failed to resolve: use of undeclared crate or module `system`
+  --> $DIR/undefined_event_part.rs:28:11
+   |
+28 |         System: system::{Pallet, Call, Storage, Config, Event<T>},
+   |                 ^^^^^^ use of undeclared crate or module `system`
+
+error[E0433]: failed to resolve: could not find `Event` in `pallet`
+  --> $DIR/undefined_event_part.rs:22:1
+   |
+22 | / construct_runtime! {
+23 | |     pub enum Runtime where
+24 | |         Block = Block,
+25 | |         NodeBlock = Block,
+...  |
+30 | |     }
+31 | | }
+   | |_^ could not find `Event` in `pallet`
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0412]: cannot find type `Event` in module `pallet`
+  --> $DIR/undefined_event_part.rs:22:1
+   |
+22 | / construct_runtime! {
+23 | |     pub enum Runtime where
+24 | |         Block = Block,
+25 | |         NodeBlock = Block,
+...  |
+30 | |     }
+31 | | }
+   | |_^ not found in `pallet`
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+help: consider importing this enum
+   |
+1  | use frame_system::Event;
+   |
+
+error[E0412]: cannot find type `Event` in module `pallet`
+  --> $DIR/undefined_event_part.rs:22:1
+   |
+22 | / construct_runtime! {
+23 | |     pub enum Runtime where
+24 | |         Block = Block,
+25 | |         NodeBlock = Block,
+...  |
+30 | |     }
+31 | | }
+   | |_^ not found in `pallet`
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+help: consider importing one of these items
+   |
+1  | use crate::Event;
+   |
+1  | use frame_system::Event;
+   |
+
+error[E0433]: failed to resolve: use of undeclared crate or module `system`
+  --> $DIR/undefined_event_part.rs:22:1
+   |
+22 | / construct_runtime! {
+23 | |     pub enum Runtime where
+24 | |         Block = Block,
+25 | |         NodeBlock = Block,
+...  |
+30 | |     }
+31 | | }
+   | |_^ not found in `system`
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+help: consider importing this enum
+   |
+1  | use frame_system::RawOrigin;
+   |
+
+error[E0277]: the trait bound `Runtime: frame_system::Config` is not satisfied
+  --> $DIR/undefined_event_part.rs:20:6
+   |
+8  |     pub trait Config: frame_system::Config {}
+   |                       -------------------- required by this bound in `pallet::Config`
+...
+20 | impl pallet::Config for Runtime {}
+   |      ^^^^^^^^^^^^^^ the trait `frame_system::Config` is not implemented for `Runtime`
diff --git a/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.rs b/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.rs
new file mode 100644
index 000000000000..5e08fd96fa1a
--- /dev/null
+++ b/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.rs
@@ -0,0 +1,33 @@
+use frame_support::construct_runtime;
+use sp_runtime::{generic, traits::BlakeTwo256};
+use sp_core::sr25519;
+
+#[frame_support::pallet]
+mod pallet {
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(_);
+}
+
+pub type Signature = sr25519::Signature;
+pub type BlockNumber = u64;
+pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
+pub type Block = generic::Block<Header, UncheckedExtrinsic>;
+pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, Call, Signature, ()>;
+
+impl pallet::Config for Runtime {}
+
+construct_runtime! {
+	pub enum Runtime where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic
+	{
+        System: system::{Pallet, Call, Storage, Config, Event<T>},
+		Pallet: pallet::{Pallet, Config},
+	}
+}
+
+fn main() {}
diff --git a/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.stderr b/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.stderr
new file mode 100644
index 000000000000..686875d83a4f
--- /dev/null
+++ b/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.stderr
@@ -0,0 +1,67 @@
+error: `Pallet` does not have #[pallet::genesis_config] defined, perhaps you should remove `Config` from construct_runtime?
+  --> $DIR/undefined_genesis_config_part.rs:5:1
+   |
+5  |   #[frame_support::pallet]
+   |   ^^^^^^^^^^^^^^^^^^^^^^^^
+...
+22 | / construct_runtime! {
+23 | |     pub enum Runtime where
+24 | |         Block = Block,
+25 | |         NodeBlock = Block,
+...  |
+30 | |     }
+31 | | }
+   | |_- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0433]: failed to resolve: use of undeclared crate or module `system`
+  --> $DIR/undefined_genesis_config_part.rs:28:17
+   |
+28 |         System: system::{Pallet, Call, Storage, Config, Event<T>},
+   |                 ^^^^^^ use of undeclared crate or module `system`
+
+error[E0433]: failed to resolve: use of undeclared crate or module `system`
+  --> $DIR/undefined_genesis_config_part.rs:22:1
+   |
+22 | / construct_runtime! {
+23 | |     pub enum Runtime where
+24 | |         Block = Block,
+25 | |         NodeBlock = Block,
+...  |
+30 | |     }
+31 | | }
+   | |_^ not found in `system`
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+help: consider importing this enum
+   |
+1  | use frame_system::RawOrigin;
+   |
+
+error[E0412]: cannot find type `GenesisConfig` in module `pallet`
+  --> $DIR/undefined_genesis_config_part.rs:22:1
+   |
+22 | / construct_runtime! {
+23 | |     pub enum Runtime where
+24 | |         Block = Block,
+25 | |         NodeBlock = Block,
+...  |
+30 | |     }
+31 | | }
+   | |_^ not found in `pallet`
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+help: consider importing this struct
+   |
+1  | use frame_system::GenesisConfig;
+   |
+
+error[E0277]: the trait bound `Runtime: frame_system::Config` is not satisfied
+  --> $DIR/undefined_genesis_config_part.rs:20:6
+   |
+8  |     pub trait Config: frame_system::Config {}
+   |                       -------------------- required by this bound in `pallet::Config`
+...
+20 | impl pallet::Config for Runtime {}
+   |      ^^^^^^^^^^^^^^ the trait `frame_system::Config` is not implemented for `Runtime`
diff --git a/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.rs b/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.rs
new file mode 100644
index 000000000000..06c36a30f550
--- /dev/null
+++ b/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.rs
@@ -0,0 +1,33 @@
+use frame_support::construct_runtime;
+use sp_runtime::{generic, traits::BlakeTwo256};
+use sp_core::sr25519;
+
+#[frame_support::pallet]
+mod pallet {
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(_);
+}
+
+pub type Signature = sr25519::Signature;
+pub type BlockNumber = u64;
+pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
+pub type Block = generic::Block<Header, UncheckedExtrinsic>;
+pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, Call, Signature, ()>;
+
+impl pallet::Config for Runtime {}
+
+construct_runtime! {
+	pub enum Runtime where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic
+	{
+		System: system::{Pallet, Call, Storage, Config, Event<T>},
+		Pallet: pallet::{Pallet, Inherent},
+	}
+}
+
+fn main() {}
diff --git a/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.stderr b/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.stderr
new file mode 100644
index 000000000000..303819b45dd7
--- /dev/null
+++ b/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.stderr
@@ -0,0 +1,49 @@
+error: `Pallet` does not have #[pallet::inherent] defined, perhaps you should remove `Inherent` from construct_runtime?
+  --> $DIR/undefined_inherent_part.rs:5:1
+   |
+5  |   #[frame_support::pallet]
+   |   ^^^^^^^^^^^^^^^^^^^^^^^^
+...
+22 | / construct_runtime! {
+23 | |     pub enum Runtime where
+24 | |         Block = Block,
+25 | |         NodeBlock = Block,
+...  |
+30 | |     }
+31 | | }
+   | |_- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0433]: failed to resolve: use of undeclared crate or module `system`
+  --> $DIR/undefined_inherent_part.rs:28:11
+   |
+28 |         System: system::{Pallet, Call, Storage, Config, Event<T>},
+   |                 ^^^^^^ use of undeclared crate or module `system`
+
+error[E0433]: failed to resolve: use of undeclared crate or module `system`
+  --> $DIR/undefined_inherent_part.rs:22:1
+   |
+22 | / construct_runtime! {
+23 | |     pub enum Runtime where
+24 | |         Block = Block,
+25 | |         NodeBlock = Block,
+...  |
+30 | |     }
+31 | | }
+   | |_^ not found in `system`
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+help: consider importing this enum
+   |
+1  | use frame_system::RawOrigin;
+   |
+
+error[E0277]: the trait bound `Runtime: frame_system::Config` is not satisfied
+  --> $DIR/undefined_inherent_part.rs:20:6
+   |
+8  |     pub trait Config: frame_system::Config {}
+   |                       -------------------- required by this bound in `pallet::Config`
+...
+20 | impl pallet::Config for Runtime {}
+   |      ^^^^^^^^^^^^^^ the trait `frame_system::Config` is not implemented for `Runtime`
diff --git a/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.rs b/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.rs
new file mode 100644
index 000000000000..bec5c27ec034
--- /dev/null
+++ b/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.rs
@@ -0,0 +1,33 @@
+use frame_support::construct_runtime;
+use sp_runtime::{generic, traits::BlakeTwo256};
+use sp_core::sr25519;
+
+#[frame_support::pallet]
+mod pallet {
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(_);
+}
+
+pub type Signature = sr25519::Signature;
+pub type BlockNumber = u64;
+pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
+pub type Block = generic::Block<Header, UncheckedExtrinsic>;
+pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, Call, Signature, ()>;
+
+impl pallet::Config for Runtime {}
+
+construct_runtime! {
+	pub enum Runtime where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic
+	{
+		System: system::{Pallet, Call, Storage, Config, Event<T>},
+		Pallet: pallet::{Pallet, Origin},
+	}
+}
+
+fn main() {}
diff --git a/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.stderr b/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.stderr
new file mode 100644
index 000000000000..f49dcf5783e7
--- /dev/null
+++ b/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.stderr
@@ -0,0 +1,87 @@
+error: `Pallet` does not have #[pallet::origin] defined, perhaps you should remove `Origin` from construct_runtime?
+  --> $DIR/undefined_origin_part.rs:5:1
+   |
+5  |   #[frame_support::pallet]
+   |   ^^^^^^^^^^^^^^^^^^^^^^^^
+...
+22 | / construct_runtime! {
+23 | |     pub enum Runtime where
+24 | |         Block = Block,
+25 | |         NodeBlock = Block,
+...  |
+30 | |     }
+31 | | }
+   | |_- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0433]: failed to resolve: use of undeclared crate or module `system`
+  --> $DIR/undefined_origin_part.rs:28:11
+   |
+28 |         System: system::{Pallet, Call, Storage, Config, Event<T>},
+   |                 ^^^^^^ use of undeclared crate or module `system`
+
+error[E0433]: failed to resolve: use of undeclared crate or module `system`
+  --> $DIR/undefined_origin_part.rs:22:1
+   |
+22 | / construct_runtime! {
+23 | |     pub enum Runtime where
+24 | |         Block = Block,
+25 | |         NodeBlock = Block,
+...  |
+30 | |     }
+31 | | }
+   | |_^ not found in `system`
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+help: consider importing this enum
+   |
+1  | use frame_system::RawOrigin;
+   |
+
+error[E0412]: cannot find type `Origin` in module `pallet`
+  --> $DIR/undefined_origin_part.rs:22:1
+   |
+22 | / construct_runtime! {
+23 | |     pub enum Runtime where
+24 | |         Block = Block,
+25 | |         NodeBlock = Block,
+...  |
+30 | |     }
+31 | | }
+   | |_^ not found in `pallet`
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+help: consider importing this type alias
+   |
+1  | use frame_system::Origin;
+   |
+
+error[E0412]: cannot find type `Origin` in module `pallet`
+  --> $DIR/undefined_origin_part.rs:22:1
+   |
+22 | / construct_runtime! {
+23 | |     pub enum Runtime where
+24 | |         Block = Block,
+25 | |         NodeBlock = Block,
+...  |
+30 | |     }
+31 | | }
+   | |_^ not found in `pallet`
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+help: consider importing one of these items
+   |
+1  | use crate::Origin;
+   |
+1  | use frame_system::Origin;
+   |
+
+error[E0277]: the trait bound `Runtime: frame_system::Config` is not satisfied
+  --> $DIR/undefined_origin_part.rs:20:6
+   |
+8  |     pub trait Config: frame_system::Config {}
+   |                       -------------------- required by this bound in `pallet::Config`
+...
+20 | impl pallet::Config for Runtime {}
+   |      ^^^^^^^^^^^^^^ the trait `frame_system::Config` is not implemented for `Runtime`
diff --git a/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.rs b/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.rs
new file mode 100644
index 000000000000..816f52b91ccc
--- /dev/null
+++ b/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.rs
@@ -0,0 +1,33 @@
+use frame_support::construct_runtime;
+use sp_runtime::{generic, traits::BlakeTwo256};
+use sp_core::sr25519;
+
+#[frame_support::pallet]
+mod pallet {
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(_);
+}
+
+pub type Signature = sr25519::Signature;
+pub type BlockNumber = u64;
+pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
+pub type Block = generic::Block<Header, UncheckedExtrinsic>;
+pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, Call, Signature, ()>;
+
+impl pallet::Config for Runtime {}
+
+construct_runtime! {
+	pub enum Runtime where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic
+	{
+		System: system::{Pallet, Call, Storage, Config, Event<T>},
+		Pallet: pallet::{Pallet, ValidateUnsigned},
+	}
+}
+
+fn main() {}
diff --git a/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.stderr b/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.stderr
new file mode 100644
index 000000000000..41202c3b005b
--- /dev/null
+++ b/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.stderr
@@ -0,0 +1,49 @@
+error: `Pallet` does not have #[pallet::validate_unsigned] defined, perhaps you should remove `ValidateUnsigned` from construct_runtime?
+  --> $DIR/undefined_validate_unsigned_part.rs:5:1
+   |
+5  |   #[frame_support::pallet]
+   |   ^^^^^^^^^^^^^^^^^^^^^^^^
+...
+22 | / construct_runtime! {
+23 | |     pub enum Runtime where
+24 | |         Block = Block,
+25 | |         NodeBlock = Block,
+...  |
+30 | |     }
+31 | | }
+   | |_- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0433]: failed to resolve: use of undeclared crate or module `system`
+  --> $DIR/undefined_validate_unsigned_part.rs:28:11
+   |
+28 |         System: system::{Pallet, Call, Storage, Config, Event<T>},
+   |                 ^^^^^^ use of undeclared crate or module `system`
+
+error[E0433]: failed to resolve: use of undeclared crate or module `system`
+  --> $DIR/undefined_validate_unsigned_part.rs:22:1
+   |
+22 | / construct_runtime! {
+23 | |     pub enum Runtime where
+24 | |         Block = Block,
+25 | |         NodeBlock = Block,
+...  |
+30 | |     }
+31 | | }
+   | |_^ not found in `system`
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+help: consider importing this enum
+   |
+1  | use frame_system::RawOrigin;
+   |
+
+error[E0277]: the trait bound `Runtime: frame_system::Config` is not satisfied
+  --> $DIR/undefined_validate_unsigned_part.rs:20:6
+   |
+8  |     pub trait Config: frame_system::Config {}
+   |                       -------------------- required by this bound in `pallet::Config`
+...
+20 | impl pallet::Config for Runtime {}
+   |      ^^^^^^^^^^^^^^ the trait `frame_system::Config` is not implemented for `Runtime`
diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index 412622b3b194..4f1e66a86894 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -304,10 +304,13 @@ pub mod pallet {
 		type Call = Call<T>;
 		fn validate_unsigned(
 			_source: TransactionSource,
-			_call: &Self::Call
+			call: &Self::Call
 		) -> TransactionValidity {
 			T::AccountId::from(SomeType1); // Test for where clause
 			T::AccountId::from(SomeType5); // Test for where clause
+			if matches!(call, Call::foo_transactional(_)) {
+				return Ok(ValidTransaction::default());
+			}
 			Err(TransactionValidityError::Invalid(InvalidTransaction::Call))
 		}
 	}
@@ -324,22 +327,40 @@ pub mod pallet {
 		fn create_inherent(_data: &InherentData) -> Option<Self::Call> {
 			T::AccountId::from(SomeType1); // Test for where clause
 			T::AccountId::from(SomeType6); // Test for where clause
-			unimplemented!();
+			Some(Call::foo_no_post_info())
+		}
+
+		fn is_inherent(call: &Self::Call) -> bool {
+			matches!(call, Call::foo_no_post_info() | Call::foo(..))
+		}
+
+		fn check_inherent(call: &Self::Call, _: &InherentData) -> Result<(), Self::Error> {
+			match call {
+				Call::foo_no_post_info() => Ok(()),
+				Call::foo(0, 0) => Err(InherentError::Fatal),
+				Call::foo(..) => Ok(()),
+				_ => unreachable!("other calls are not inherents"),
+			}
 		}
 
-		fn is_inherent(_call: &Self::Call) -> bool {
-			unimplemented!();
+		fn is_inherent_required(d: &InherentData) -> Result<Option<Self::Error>, Self::Error> {
+			match d.get_data::<bool>(b"required") {
+				Ok(Some(true)) => Ok(Some(InherentError::Fatal)),
+				Ok(Some(false)) | Ok(None) => Ok(None),
+				Err(_) => unreachable!("should not happen in tests"),
+			}
 		}
 	}
 
 	#[derive(codec::Encode, sp_runtime::RuntimeDebug)]
 	#[cfg_attr(feature = "std", derive(codec::Decode))]
 	pub enum InherentError {
+		Fatal,
 	}
 
 	impl frame_support::inherent::IsFatalError for InherentError {
 		fn is_fatal_error(&self) -> bool {
-			unimplemented!();
+			matches!(self, InherentError::Fatal)
 		}
 	}
 
@@ -538,6 +559,155 @@ fn instance_expand() {
 	let _: pallet::__InherentHiddenInstance = ();
 }
 
+#[test]
+fn inherent_expand() {
+	use frame_support::{
+		inherent::{BlockT, InherentData},
+		traits::EnsureInherentsAreFirst,
+	};
+	use sp_core::Hasher;
+	use sp_runtime::{traits::{BlakeTwo256, Header}, Digest};
+
+	let inherents = InherentData::new().create_extrinsics();
+
+	let expected = vec![
+		UncheckedExtrinsic { function: Call::Example(pallet::Call::foo_no_post_info()), signature: None },
+	];
+	assert_eq!(expected, inherents);
+
+	let block = Block::new(
+		Header::new(
+			1,
+			BlakeTwo256::hash(b"test"),
+			BlakeTwo256::hash(b"test"),
+			BlakeTwo256::hash(b"test"),
+			Digest::default(),
+		),
+		vec![
+			UncheckedExtrinsic { function: Call::Example(pallet::Call::foo_no_post_info()), signature: None },
+			UncheckedExtrinsic { function: Call::Example(pallet::Call::foo(1, 0)), signature: None },
+		],
+	);
+
+	assert!(InherentData::new().check_extrinsics(&block).ok());
+
+	let block = Block::new(
+		Header::new(
+			1,
+			BlakeTwo256::hash(b"test"),
+			BlakeTwo256::hash(b"test"),
+			BlakeTwo256::hash(b"test"),
+			Digest::default(),
+		),
+		vec![
+			UncheckedExtrinsic { function: Call::Example(pallet::Call::foo_no_post_info()), signature: None },
+			UncheckedExtrinsic { function: Call::Example(pallet::Call::foo(0, 0)), signature: None },
+		],
+	);
+
+	assert!(InherentData::new().check_extrinsics(&block).fatal_error());
+
+	let block = Block::new(
+		Header::new(
+			1,
+			BlakeTwo256::hash(b"test"),
+			BlakeTwo256::hash(b"test"),
+			BlakeTwo256::hash(b"test"),
+			Digest::default(),
+		),
+		vec![
+			UncheckedExtrinsic { function: Call::Example(pallet::Call::foo_transactional(0)), signature: None },
+		],
+	);
+
+	let mut inherent = InherentData::new();
+	inherent.put_data(*b"required", &true).unwrap();
+	assert!(inherent.check_extrinsics(&block).fatal_error());
+
+	let block = Block::new(
+		Header::new(
+			1,
+			BlakeTwo256::hash(b"test"),
+			BlakeTwo256::hash(b"test"),
+			BlakeTwo256::hash(b"test"),
+			Digest::default(),
+		),
+		vec![
+			UncheckedExtrinsic { function: Call::Example(pallet::Call::foo_no_post_info()), signature: Some((1, (), ())) },
+		],
+	);
+
+	let mut inherent = InherentData::new();
+	inherent.put_data(*b"required", &true).unwrap();
+	assert!(inherent.check_extrinsics(&block).fatal_error());
+
+	let block = Block::new(
+		Header::new(
+			1,
+			BlakeTwo256::hash(b"test"),
+			BlakeTwo256::hash(b"test"),
+			BlakeTwo256::hash(b"test"),
+			Digest::default(),
+		),
+		vec![
+			UncheckedExtrinsic { function: Call::Example(pallet::Call::foo(1, 1)), signature: None },
+			UncheckedExtrinsic { function: Call::Example(pallet::Call::foo_transactional(0)), signature: None },
+		],
+	);
+
+	assert!(Runtime::ensure_inherents_are_first(&block).is_ok());
+
+	let block = Block::new(
+		Header::new(
+			1,
+			BlakeTwo256::hash(b"test"),
+			BlakeTwo256::hash(b"test"),
+			BlakeTwo256::hash(b"test"),
+			Digest::default(),
+		),
+		vec![
+			UncheckedExtrinsic { function: Call::Example(pallet::Call::foo(1, 1)), signature: None },
+			UncheckedExtrinsic { function: Call::Example(pallet::Call::foo_transactional(0)), signature: None },
+			UncheckedExtrinsic { function: Call::Example(pallet::Call::foo_no_post_info()), signature: None },
+		],
+	);
+
+	assert_eq!(Runtime::ensure_inherents_are_first(&block).err().unwrap(), 2);
+
+	let block = Block::new(
+		Header::new(
+			1,
+			BlakeTwo256::hash(b"test"),
+			BlakeTwo256::hash(b"test"),
+			BlakeTwo256::hash(b"test"),
+			Digest::default(),
+		),
+		vec![
+			UncheckedExtrinsic { function: Call::Example(pallet::Call::foo(1, 1)), signature: None },
+			UncheckedExtrinsic { function: Call::Example(pallet::Call::foo(1, 0)), signature: Some((1, (), ())) },
+			UncheckedExtrinsic { function: Call::Example(pallet::Call::foo_no_post_info()), signature: None },
+		],
+	);
+
+	assert_eq!(Runtime::ensure_inherents_are_first(&block).err().unwrap(), 2);
+}
+
+#[test]
+fn validate_unsigned_expand() {
+	use frame_support::pallet_prelude::{
+		InvalidTransaction, TransactionSource, TransactionValidityError, ValidTransaction, ValidateUnsigned,
+	};
+	let call = pallet::Call::<Runtime>::foo_no_post_info();
+
+	let validity = pallet::Pallet::validate_unsigned(TransactionSource::Local, &call).unwrap_err();
+	assert_eq!(validity, TransactionValidityError::Invalid(InvalidTransaction::Call));
+
+	let call = pallet::Call::<Runtime>::foo_transactional(0);
+
+	let validity = pallet::Pallet::validate_unsigned(TransactionSource::External, &call).unwrap();
+	assert_eq!(validity, ValidTransaction::default());
+}
+
 #[test]
 fn trait_store_expand() {
 	TestExternalities::default().execute_with(|| {
diff --git a/frame/support/test/tests/pallet_instance.rs b/frame/support/test/tests/pallet_instance.rs
index f0b72da2c7fb..ccac97100a4b 100644
--- a/frame/support/test/tests/pallet_instance.rs
+++ b/frame/support/test/tests/pallet_instance.rs
@@ -306,8 +306,8 @@ frame_support::construct_runtime!(
 		Instance1Example: pallet::<Instance1>::{
 			Pallet, Call, Event<T>, Config, Storage, Inherent, Origin<T>, ValidateUnsigned
 		},
-		Example2: pallet2::{Pallet, Call, Event<T>, Config<T>, Storage},
-		Instance1Example2: pallet2::<Instance1>::{Pallet, Call, Event<T>, Config<T>, Storage},
+		Example2: pallet2::{Pallet, Event<T>, Config<T>, Storage},
+		Instance1Example2: pallet2::<Instance1>::{Pallet, Event<T>, Config<T>, Storage},
 	}
 );
 
diff --git a/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.rs b/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.rs
index 3d03099c3c4b..ef31af92e5a3 100644
--- a/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.rs
+++ b/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.rs
@@ -1,27 +1,28 @@
-#[frame_support::pallet]
-mod pallet {
-	use frame_support::pallet_prelude::{Hooks, StorageNMap, Twox64Concat, NMapKey};
-	use frame_system::pallet_prelude::BlockNumberFor;
+// #[frame_support::pallet]
+// mod pallet {
+// 	use frame_support::pallet_prelude::{Hooks, StorageNMap, Twox64Concat, NMapKey};
+// 	use frame_system::pallet_prelude::BlockNumberFor;
 
-	#[pallet::config]
-	pub trait Config: frame_system::Config {}
+// 	#[pallet::config]
+// 	pub trait Config: frame_system::Config {}
 
-	#[pallet::pallet]
-	#[pallet::generate_storage_info]
-	pub struct Pallet<T>(core::marker::PhantomData<T>);
+// 	#[pallet::pallet]
+// 	#[pallet::generate_storage_info]
+// 	pub struct Pallet<T>(core::marker::PhantomData<T>);
 
-	#[pallet::hooks]
-	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+// 	#[pallet::hooks]
+// 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
 
-	#[pallet::call]
-	impl<T: Config> Pallet<T> {}
+// 	#[pallet::call]
+// 	impl<T: Config> Pallet<T> {}
 
-	#[derive(codec::Encode, codec::Decode)]
-	struct Bar;
+// 	#[derive(codec::Encode, codec::Decode)]
+// 	struct Bar;
 
-	#[pallet::storage]
-	type Foo<T> = StorageNMap<_, NMapKey<Twox64Concat, Bar>, u32>;
-}
+// 	#[pallet::storage]
+// 	type Foo<T> = StorageNMap<_, NMapKey<Twox64Concat, Bar>, u32>;
+// }
 
 fn main() {
+	compile_error!("Temporarily disabled due to test flakiness");
 }
diff --git a/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.stderr b/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.stderr
index 545520124bfe..9c69a3f076e3 100644
--- a/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.stderr
+++ b/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.stderr
@@ -1,9 +1,5 @@
-error[E0277]: the trait bound `Bar: MaxEncodedLen` is not satisfied
-  --> $DIR/storage_info_unsatisfied_nmap.rs:10:12
+error: Temporarily disabled due to test flakiness
+  --> $DIR/storage_info_unsatisfied_nmap.rs:27:2
    |
-10 |     #[pallet::generate_storage_info]
-   |               ^^^^^^^^^^^^^^^^^^^^^ the trait `MaxEncodedLen` is not implemented for `Bar`
-   |
-   = note: required because of the requirements on the impl of `KeyGeneratorMaxEncodedLen` for `NMapKey<frame_support::Twox64Concat, Bar>`
-   = note: required because of the requirements on the impl of `StorageInfoTrait` for `frame_support::pallet_prelude::StorageNMap<_GeneratedPrefixForStorageFoo<T>, NMapKey<frame_support::Twox64Concat, Bar>, u32>`
-   = note: required by `storage_info`
+27 |     compile_error!("Temporarily disabled due to test flakiness");
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

From f88f4edbc42b76053404f9ba45d641dafb147ab7 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Wed, 16 Jun 2021 05:57:14 +0100
Subject: [PATCH 0887/1194] Add Control to Growth of the Staking Pallet (#8920)

* start count

* track count

* add max limit

* min bonds for participating

* respect min bond when unbonding

* revert a bit of u32

* fix merge

* more merge fixes

* update to `Current*`

* add helper functions

* Update frame/staking/src/lib.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* fix

* minbond as storage

* checkpoint

* chill_other

* better bond tracking

* MinBond to MinNominatorBond

* better doc

* use helper function

* oops

* simple hard limits to validators / nominators.

* better doc

* update storage version

* fix tests

* enable migrations

* min bond tests

* chill other tests

* tests for max cap

* check `None` on cap too

* benchmarks

* Update frame/staking/src/lib.rs

* Update frame/staking/src/lib.rs

Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com>

* Update frame/staking/src/lib.rs

Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com>

* Update frame/staking/src/tests.rs

Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com>

* fix benchmark

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* nits

* fix reap_stash benchmark

* remove lower bound to min bond

Co-authored-by: kianenigma <kian@parity.io>
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Co-authored-by: Parity Bot <admin@parity.io>
Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com>
---
 frame/staking/src/benchmarking.rs  |  53 +++-
 frame/staking/src/lib.rs           | 295 ++++++++++++++++++---
 frame/staking/src/mock.rs          |  25 +-
 frame/staking/src/testing_utils.rs |   2 +
 frame/staking/src/tests.rs         | 397 +++++++++++++++++++----------
 frame/staking/src/weights.rs       | 284 +++++++++++----------
 6 files changed, 750 insertions(+), 306 deletions(-)

diff --git a/frame/staking/src/benchmarking.rs b/frame/staking/src/benchmarking.rs
index 2ad939e5b166..8adf797abe9e 100644
--- a/frame/staking/src/benchmarking.rs
+++ b/frame/staking/src/benchmarking.rs
@@ -30,6 +30,7 @@ pub use frame_benchmarking::{
 const SEED: u32 = 0;
 const MAX_SPANS: u32 = 100;
 const MAX_VALIDATORS: u32 = 1000;
+const MAX_NOMINATORS: u32 = 1000;
 const MAX_SLASHES: u32 = 1000;
 
 // Add slashing spans to a user account. Not relevant for actual use, only to benchmark
@@ -463,12 +464,18 @@ benchmarks! {
 	reap_stash {
 		let s in 1 .. MAX_SPANS;
 		let (stash, controller) = create_stash_controller::<T>(0, 100, Default::default())?;
+		Staking::<T>::validate(RawOrigin::Signed(controller.clone()).into(), ValidatorPrefs::default())?;
 		add_slashing_spans::<T>(&stash, s);
 		T::Currency::make_free_balance_be(&stash, T::Currency::minimum_balance());
 		whitelist_account!(controller);
+
+		assert!(Bonded::<T>::contains_key(&stash));
+		assert!(Validators::<T>::contains_key(&stash));
+
 	}: _(RawOrigin::Signed(controller), stash.clone(), s)
 	verify {
 		assert!(!Bonded::<T>::contains_key(&stash));
+		assert!(!Validators::<T>::contains_key(&stash));
 	}
 
 	new_era {
@@ -563,9 +570,9 @@ benchmarks! {
 
 	get_npos_voters {
 		// number of validator intention.
-		let v in 200 .. 400;
+		let v in (MAX_VALIDATORS / 2) .. MAX_VALIDATORS;
 		// number of nominator intention.
-		let n in 200 .. 400;
+		let n in (MAX_NOMINATORS / 2) .. MAX_NOMINATORS;
 		// total number of slashing spans. Assigned to validators randomly.
 		let s in 1 .. 20;
 
@@ -584,15 +591,42 @@ benchmarks! {
 
 	get_npos_targets {
 		// number of validator intention.
-		let v in 200 .. 400;
+		let v in (MAX_VALIDATORS / 2) .. MAX_VALIDATORS;
 		// number of nominator intention.
-		let n = 500;
+		let n = MAX_NOMINATORS;
 
 		let _ = create_validators_with_nominators_for_era::<T>(v, n, T::MAX_NOMINATIONS as usize, false, None)?;
 	}: {
 		let targets = <Staking<T>>::get_npos_targets();
 		assert_eq!(targets.len() as u32, v);
 	}
+
+	update_staking_limits {
+		// This function always does the same thing... just write to 4 storage items.
+	}: _(
+		RawOrigin::Root,
+		BalanceOf::<T>::max_value(),
+		BalanceOf::<T>::max_value(),
+		Some(u32::max_value()),
+		Some(u32::max_value())
+	) verify {
+		assert_eq!(MinNominatorBond::<T>::get(), BalanceOf::<T>::max_value());
+		assert_eq!(MinValidatorBond::<T>::get(), BalanceOf::<T>::max_value());
+		assert_eq!(MaxNominatorsCount::<T>::get(), Some(u32::max_value()));
+		assert_eq!(MaxValidatorsCount::<T>::get(), Some(u32::max_value()));
+	}
+
+	chill_other {
+		let (_, controller) = create_stash_controller::<T>(USER_SEED, 100, Default::default())?;
+		Staking::<T>::validate(RawOrigin::Signed(controller.clone()).into(), ValidatorPrefs::default())?;
+		Staking::<T>::update_staking_limits(
+			RawOrigin::Root.into(), BalanceOf::<T>::max_value(), BalanceOf::<T>::max_value(), None, None,
+		)?;
+		let caller = whitelisted_caller();
+	}: _(RawOrigin::Signed(caller), controller.clone())
+	verify {
+		assert!(!Validators::<T>::contains_key(controller));
+	}
 }
 
 #[cfg(test)]
@@ -603,7 +637,7 @@ mod tests {
 
 	#[test]
 	fn create_validators_with_nominators_for_era_works() {
-		ExtBuilder::default().has_stakers(true).build().execute_with(|| {
+		ExtBuilder::default().has_stakers(true).build_and_execute(|| {
 			let v = 10;
 			let n = 100;
 
@@ -625,7 +659,7 @@ mod tests {
 
 	#[test]
 	fn create_validator_with_nominators_works() {
-		ExtBuilder::default().has_stakers(true).build().execute_with(|| {
+		ExtBuilder::default().has_stakers(true).build_and_execute(|| {
 			let n = 10;
 
 			let (validator_stash, nominators) = create_validator_with_nominators::<Test>(
@@ -649,7 +683,7 @@ mod tests {
 
 	#[test]
 	fn add_slashing_spans_works() {
-		ExtBuilder::default().has_stakers(true).build().execute_with(|| {
+		ExtBuilder::default().has_stakers(true).build_and_execute(|| {
 			let n = 10;
 
 			let (validator_stash, _nominators) = create_validator_with_nominators::<Test>(
@@ -680,7 +714,7 @@ mod tests {
 
 	#[test]
 	fn test_payout_all() {
-		ExtBuilder::default().has_stakers(true).build().execute_with(|| {
+		ExtBuilder::default().has_stakers(true).build_and_execute(|| {
 			let v = 10;
 			let n = 100;
 
@@ -700,6 +734,7 @@ mod tests {
 
 impl_benchmark_test_suite!(
 	Staking,
-	crate::mock::ExtBuilder::default().has_stakers(true).build(),
+	crate::mock::ExtBuilder::default().has_stakers(true),
 	crate::mock::Test,
+	exec_name = build_and_execute
 );
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index ff7a1ae8a882..b6d02fa2fd30 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -745,17 +745,46 @@ enum Releases {
 	V4_0_0,
 	V5_0_0, // blockable validators.
 	V6_0_0, // removal of all storage associated with offchain phragmen.
+	V7_0_0, // keep track of number of nominators / validators in map
 }
 
 impl Default for Releases {
 	fn default() -> Self {
-		Releases::V6_0_0
+		Releases::V7_0_0
 	}
 }
 
 pub mod migrations {
 	use super::*;
 
+	pub mod v7 {
+		use super::*;
+
+		pub fn pre_migrate<T: Config>() -> Result<(), &'static str> {
+			assert!(CurrentValidatorsCount::<T>::get().is_zero(), "CurrentValidatorsCount already set.");
+			assert!(CurrentNominatorsCount::<T>::get().is_zero(), "CurrentNominatorsCount already set.");
+			assert!(StorageVersion::<T>::get() == Releases::V6_0_0);
+			Ok(())
+		}
+
+		pub fn migrate<T: Config>() -> Weight {
+			log!(info, "Migrating staking to Releases::V7_0_0");
+			let validator_count = Validators::<T>::iter().count() as u32;
+			let nominator_count = Nominators::<T>::iter().count() as u32;
+
+			CurrentValidatorsCount::<T>::put(validator_count);
+			CurrentNominatorsCount::<T>::put(nominator_count);
+
+			StorageVersion::<T>::put(Releases::V7_0_0);
+			log!(info, "Completed staking migration to Releases::V7_0_0");
+
+			T::DbWeight::get().reads_writes(
+				validator_count.saturating_add(nominator_count).into(),
+				2,
+			)
+		}
+	}
+
 	pub mod v6 {
 		use super::*;
 		use frame_support::{traits::Get, weights::Weight, generate_storage_alias};
@@ -940,6 +969,14 @@ pub mod pallet {
 	#[pallet::getter(fn bonded)]
 	pub type Bonded<T: Config> = StorageMap<_, Twox64Concat, T::AccountId, T::AccountId>;
 
+	/// The minimum active bond to become and maintain the role of a nominator.
+	#[pallet::storage]
+	pub type MinNominatorBond<T: Config> = StorageValue<_, BalanceOf<T>, ValueQuery>;
+
+	/// The minimum active bond to become and maintain the role of a validator.
+	#[pallet::storage]
+	pub type MinValidatorBond<T: Config> = StorageValue<_, BalanceOf<T>, ValueQuery>;
+
 	/// Map from all (unlocked) "controller" accounts to the info regarding the staking.
 	#[pallet::storage]
 	#[pallet::getter(fn ledger)]
@@ -960,15 +997,39 @@ pub mod pallet {
 	>;
 
 	/// The map from (wannabe) validator stash key to the preferences of that validator.
+	///
+	/// When updating this storage item, you must also update the `CurrentValidatorsCount`.
 	#[pallet::storage]
 	#[pallet::getter(fn validators)]
 	pub type Validators<T: Config> = StorageMap<_, Twox64Concat, T::AccountId, ValidatorPrefs, ValueQuery>;
 
+	/// A tracker to keep count of the number of items in the `Validators` map.
+	#[pallet::storage]
+	pub type CurrentValidatorsCount<T> = StorageValue<_, u32, ValueQuery>;
+
+	/// The maximum validator count before we stop allowing new validators to join.
+	///
+	/// When this value is not set, no limits are enforced.
+	#[pallet::storage]
+	pub type MaxValidatorsCount<T> = StorageValue<_, u32, OptionQuery>;
+
 	/// The map from nominator stash key to the set of stash keys of all validators to nominate.
+	///
+	/// When updating this storage item, you must also update the `CurrentNominatorsCount`.
 	#[pallet::storage]
 	#[pallet::getter(fn nominators)]
 	pub type Nominators<T: Config> = StorageMap<_, Twox64Concat, T::AccountId, Nominations<T::AccountId>>;
 
+	/// A tracker to keep count of the number of items in the `Nominators` map.
+	#[pallet::storage]
+	pub type CurrentNominatorsCount<T> = StorageValue<_, u32, ValueQuery>;
+
+	/// The maximum nominator count before we stop allowing new validators to join.
+	///
+	/// When this value is not set, no limits are enforced.
+	#[pallet::storage]
+	pub type MaxNominatorsCount<T> = StorageValue<_, u32, OptionQuery>;
+
 	/// The current era index.
 	///
 	/// This is the latest planned era, depending on how the Session pallet queues the validator
@@ -1165,6 +1226,8 @@ pub mod pallet {
 		pub slash_reward_fraction: Perbill,
 		pub canceled_payout: BalanceOf<T>,
 		pub stakers: Vec<(T::AccountId, T::AccountId, BalanceOf<T>, StakerStatus<T::AccountId>)>,
+		pub min_nominator_bond: BalanceOf<T>,
+		pub min_validator_bond: BalanceOf<T>,
 	}
 
 	#[cfg(feature = "std")]
@@ -1179,6 +1242,8 @@ pub mod pallet {
 				slash_reward_fraction: Default::default(),
 				canceled_payout: Default::default(),
 				stakers: Default::default(),
+				min_nominator_bond: Default::default(),
+				min_validator_bond: Default::default(),
 			}
 		}
 	}
@@ -1194,6 +1259,8 @@ pub mod pallet {
 			CanceledSlashPayout::<T>::put(self.canceled_payout);
 			SlashRewardFraction::<T>::put(self.slash_reward_fraction);
 			StorageVersion::<T>::put(Releases::V6_0_0);
+			MinNominatorBond::<T>::put(self.min_nominator_bond);
+			MinValidatorBond::<T>::put(self.min_validator_bond);
 
 			for &(ref stash, ref controller, balance, ref status) in &self.stakers {
 				assert!(
@@ -1274,8 +1341,8 @@ pub mod pallet {
 		DuplicateIndex,
 		/// Slash record index out of bounds.
 		InvalidSlashIndex,
-		/// Can not bond with value less than minimum balance.
-		InsufficientValue,
+		/// Can not bond with value less than minimum required.
+		InsufficientBond,
 		/// Can not schedule more unlock chunks.
 		NoMoreChunks,
 		/// Can not rebond without unlocking chunks.
@@ -1300,18 +1367,35 @@ pub mod pallet {
 		TooManyTargets,
 		/// A nomination target was supplied that was blocked or otherwise not a validator.
 		BadTarget,
+		/// The user has enough bond and thus cannot be chilled forcefully by an external person.
+		CannotChillOther,
+		/// There are too many nominators in the system. Governance needs to adjust the staking settings
+		/// to keep things safe for the runtime.
+		TooManyNominators,
+		/// There are too many validators in the system. Governance needs to adjust the staking settings
+		/// to keep things safe for the runtime.
+		TooManyValidators,
 	}
 
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
 		fn on_runtime_upgrade() -> Weight {
-			if StorageVersion::<T>::get() == Releases::V5_0_0 {
-				migrations::v6::migrate::<T>()
+			if StorageVersion::<T>::get() == Releases::V6_0_0 {
+				migrations::v7::migrate::<T>()
 			} else {
 				T::DbWeight::get().reads(1)
 			}
 		}
 
+		#[cfg(feature = "try-runtime")]
+		fn pre_upgrade() -> Result<(), &'static str> {
+			if StorageVersion::<T>::get() == Releases::V6_0_0 {
+				migrations::v7::pre_migrate::<T>()
+			} else {
+				Ok(())
+			}
+		}
+
 		fn on_initialize(_now: BlockNumberFor<T>) -> Weight {
 			// just return the weight of the on_finalize.
 			T::DbWeight::get().reads(1)
@@ -1389,7 +1473,7 @@ pub mod pallet {
 
 			// Reject a bond which is considered to be _dust_.
 			if value < T::Currency::minimum_balance() {
-				Err(Error::<T>::InsufficientValue)?
+				Err(Error::<T>::InsufficientBond)?
 			}
 
 			frame_system::Pallet::<T>::inc_consumers(&stash).map_err(|_| Error::<T>::BadState)?;
@@ -1454,7 +1538,7 @@ pub mod pallet {
 				ledger.total += extra;
 				ledger.active += extra;
 				// Last check: the new active amount of ledger must be more than ED.
-				ensure!(ledger.active >= T::Currency::minimum_balance(), Error::<T>::InsufficientValue);
+				ensure!(ledger.active >= T::Currency::minimum_balance(), Error::<T>::InsufficientBond);
 
 				Self::deposit_event(Event::<T>::Bonded(stash, extra));
 				Self::update_ledger(&controller, &ledger);
@@ -1473,6 +1557,9 @@ pub mod pallet {
 		/// can co-exists at the same time. In that case, [`Call::withdraw_unbonded`] need
 		/// to be called first to remove some of the chunks (if possible).
 		///
+		/// If a user encounters the `InsufficientBond` error when calling this extrinsic,
+		/// they should call `chill` first in order to free up their bonded funds.
+		///
 		/// The dispatch origin for this call must be _Signed_ by the controller, not the stash.
 		/// And, it can be only called when [`EraElectionStatus`] is `Closed`.
 		///
@@ -1514,6 +1601,18 @@ pub mod pallet {
 					ledger.active = Zero::zero();
 				}
 
+				let min_active_bond = if Nominators::<T>::contains_key(&ledger.stash) {
+					MinNominatorBond::<T>::get()
+				} else if Validators::<T>::contains_key(&ledger.stash) {
+					MinValidatorBond::<T>::get()
+				} else {
+					Zero::zero()
+				};
+
+				// Make sure that the user maintains enough active bond for their role.
+				// If a user runs into this error, they should chill first.
+				ensure!(ledger.active >= min_active_bond, Error::<T>::InsufficientBond);
+
 				// Note: in case there is no current era it is fine to bond one era more.
 				let era = Self::current_era().unwrap_or(0) + T::BondingDuration::get();
 				ledger.unlocking.push(UnlockChunk { value, era });
@@ -1614,10 +1713,19 @@ pub mod pallet {
 		#[pallet::weight(T::WeightInfo::validate())]
 		pub fn validate(origin: OriginFor<T>, prefs: ValidatorPrefs) -> DispatchResult {
 			let controller = ensure_signed(origin)?;
+
+			// If this error is reached, we need to adjust the `MinValidatorBond` and start calling `chill_other`.
+			// Until then, we explicitly block new validators to protect the runtime.
+			if let Some(max_validators) = MaxValidatorsCount::<T>::get() {
+				ensure!(CurrentValidatorsCount::<T>::get() < max_validators, Error::<T>::TooManyValidators);
+			}
+
 			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
+			ensure!(ledger.active >= MinValidatorBond::<T>::get(), Error::<T>::InsufficientBond);
+
 			let stash = &ledger.stash;
-			<Nominators<T>>::remove(stash);
-			<Validators<T>>::insert(stash, prefs);
+			Self::do_remove_nominator(stash);
+			Self::do_add_validator(stash, prefs);
 			Ok(())
 		}
 
@@ -1646,7 +1754,16 @@ pub mod pallet {
 			targets: Vec<<T::Lookup as StaticLookup>::Source>,
 		) -> DispatchResult {
 			let controller = ensure_signed(origin)?;
+
+			// If this error is reached, we need to adjust the `MinNominatorBond` and start calling `chill_other`.
+			// Until then, we explicitly block new nominators to protect the runtime.
+			if let Some(max_nominators) = MaxNominatorsCount::<T>::get() {
+				ensure!(CurrentNominatorsCount::<T>::get() < max_nominators, Error::<T>::TooManyNominators);
+			}
+
 			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
+			ensure!(ledger.active >= MinNominatorBond::<T>::get(), Error::<T>::InsufficientBond);
+
 			let stash = &ledger.stash;
 			ensure!(!targets.is_empty(), Error::<T>::EmptyTargets);
 			ensure!(targets.len() <= T::MAX_NOMINATIONS as usize, Error::<T>::TooManyTargets);
@@ -1669,8 +1786,8 @@ pub mod pallet {
 				suppressed: false,
 			};
 
-			<Validators<T>>::remove(stash);
-			<Nominators<T>>::insert(stash, &nominations);
+			Self::do_remove_validator(stash);
+			Self::do_add_nominator(stash, nominations);
 			Ok(())
 		}
 
@@ -2022,7 +2139,7 @@ pub mod pallet {
 
 			let ledger = ledger.rebond(value);
 			// Last check: the new active amount of ledger must be more than ED.
-			ensure!(ledger.active >= T::Currency::minimum_balance(), Error::<T>::InsufficientValue);
+			ensure!(ledger.active >= T::Currency::minimum_balance(), Error::<T>::InsufficientBond);
 
 			Self::deposit_event(Event::<T>::Bonded(ledger.stash.clone(), value));
 			Self::update_ledger(&controller, &ledger);
@@ -2135,6 +2252,80 @@ pub mod pallet {
 
 			Ok(())
 		}
+
+		/// Update the various staking limits this pallet.
+		///
+		/// * `min_nominator_bond`: The minimum active bond needed to be a nominator.
+		/// * `min_validator_bond`: The minimum active bond needed to be a validator.
+		/// * `max_nominator_count`: The max number of users who can be a nominator at once.
+		///   When set to `None`, no limit is enforced.
+		/// * `max_validator_count`: The max number of users who can be a validator at once.
+		///   When set to `None`, no limit is enforced.
+		///
+		/// Origin must be Root to call this function.
+		///
+		/// NOTE: Existing nominators and validators will not be affected by this update.
+		/// to kick people under the new limits, `chill_other` should be called.
+		#[pallet::weight(T::WeightInfo::update_staking_limits())]
+		pub fn update_staking_limits(
+			origin: OriginFor<T>,
+			min_nominator_bond: BalanceOf<T>,
+			min_validator_bond: BalanceOf<T>,
+			max_nominator_count: Option<u32>,
+			max_validator_count: Option<u32>,
+		) -> DispatchResult {
+			ensure_root(origin)?;
+			MinNominatorBond::<T>::set(min_nominator_bond);
+			MinValidatorBond::<T>::set(min_validator_bond);
+			MaxNominatorsCount::<T>::set(max_nominator_count);
+			MaxValidatorsCount::<T>::set(max_validator_count);
+			Ok(())
+		}
+
+		/// Declare a `controller` as having no desire to either validator or nominate.
+		///
+		/// Effects will be felt at the beginning of the next era.
+		///
+		/// The dispatch origin for this call must be _Signed_, but can be called by anyone.
+		///
+		/// If the caller is the same as the controller being targeted, then no further checks
+		/// are enforced. However, this call can also be made by an third party user who witnesses
+		/// that this controller does not satisfy the minimum bond requirements to be in their role.
+		///
+		/// This can be helpful if bond requirements are updated, and we need to remove old users
+		/// who do not satisfy these requirements.
+		///
+		// TODO: Maybe we can deprecate `chill` in the future.
+		// https://github.com/paritytech/substrate/issues/9111
+		#[pallet::weight(T::WeightInfo::chill_other())]
+		pub fn chill_other(
+			origin: OriginFor<T>,
+			controller: T::AccountId,
+		) -> DispatchResult {
+			// Anyone can call this function.
+			let caller = ensure_signed(origin)?;
+			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
+			let stash = ledger.stash;
+
+			// If the caller is not the controller, we want to check that the minimum bond
+			// requirements are not satisfied, and thus we have reason to chill this user.
+			//
+			// Otherwise, if caller is the same as the controller, this is just like `chill`.
+			if caller != controller {
+				let min_active_bond = if Nominators::<T>::contains_key(&stash) {
+					MinNominatorBond::<T>::get()
+				} else if Validators::<T>::contains_key(&stash) {
+					MinValidatorBond::<T>::get()
+				} else {
+					Zero::zero()
+				};
+
+				ensure!(ledger.active < min_active_bond, Error::<T>::CannotChillOther);
+			}
+
+			Self::chill_stash(&stash);
+			Ok(())
+		}
 	}
 }
 
@@ -2296,8 +2487,8 @@ impl<T: Config> Pallet<T> {
 
 	/// Chill a stash account.
 	fn chill_stash(stash: &T::AccountId) {
-		<Validators<T>>::remove(stash);
-		<Nominators<T>>::remove(stash);
+		Self::do_remove_validator(stash);
+		Self::do_remove_nominator(stash);
 	}
 
 	/// Actually make a payment to a staker. This uses the currency's reward function
@@ -2645,8 +2836,8 @@ impl<T: Config> Pallet<T> {
 		<Ledger<T>>::remove(&controller);
 
 		<Payee<T>>::remove(stash);
-		<Validators<T>>::remove(stash);
-		<Nominators<T>>::remove(stash);
+		Self::do_remove_validator(stash);
+		Self::do_remove_nominator(stash);
 
 		frame_system::Pallet::<T>::dec_consumers(stash);
 
@@ -2749,7 +2940,7 @@ impl<T: Config> Pallet<T> {
 		// Collect all slashing spans into a BTreeMap for further queries.
 		let slashing_spans = <SlashingSpans<T>>::iter().collect::<BTreeMap<_, _>>();
 
-		for (nominator, nominations) in <Nominators<T>>::iter() {
+		for (nominator, nominations) in Nominators::<T>::iter() {
 			let Nominations { submitted_in, mut targets, suppressed: _ } = nominations;
 
 			// Filter out nomination targets which were nominated before the most recent
@@ -2769,8 +2960,49 @@ impl<T: Config> Pallet<T> {
 		all_voters
 	}
 
+	/// This is a very expensive function and result should be cached versus being called multiple times.
 	pub fn get_npos_targets() -> Vec<T::AccountId> {
-		<Validators<T>>::iter().map(|(v, _)| v).collect::<Vec<_>>()
+		Validators::<T>::iter().map(|(v, _)| v).collect::<Vec<_>>()
+	}
+
+	/// This function will add a nominator to the `Nominators` storage map,
+	/// and keep track of the `CurrentNominatorsCount`.
+	///
+	/// If the nominator already exists, their nominations will be updated.
+	pub fn do_add_nominator(who: &T::AccountId, nominations: Nominations<T::AccountId>) {
+		if !Nominators::<T>::contains_key(who) {
+			CurrentNominatorsCount::<T>::mutate(|x| x.saturating_inc())
+		}
+		Nominators::<T>::insert(who, nominations);
+	}
+
+	/// This function will remove a nominator from the `Nominators` storage map,
+	/// and keep track of the `CurrentNominatorsCount`.
+	pub fn do_remove_nominator(who: &T::AccountId) {
+		if Nominators::<T>::contains_key(who) {
+			Nominators::<T>::remove(who);
+			CurrentNominatorsCount::<T>::mutate(|x| x.saturating_dec());
+		}
+	}
+
+	/// This function will add a validator to the `Validators` storage map,
+	/// and keep track of the `CurrentValidatorsCount`.
+	///
+	/// If the validator already exists, their preferences will be updated.
+	pub fn do_add_validator(who: &T::AccountId, prefs: ValidatorPrefs) {
+		if !Validators::<T>::contains_key(who) {
+			CurrentValidatorsCount::<T>::mutate(|x| x.saturating_inc())
+		}
+		Validators::<T>::insert(who, prefs);
+	}
+
+	/// This function will remove a validator from the `Validators` storage map,
+	/// and keep track of the `CurrentValidatorsCount`.
+	pub fn do_remove_validator(who: &T::AccountId) {
+		if Validators::<T>::contains_key(who) {
+			Validators::<T>::remove(who);
+			CurrentValidatorsCount::<T>::mutate(|x| x.saturating_dec());
+		}
 	}
 }
 
@@ -2785,12 +3017,11 @@ impl<T: Config> frame_election_provider_support::ElectionDataProvider<T::Account
 	fn voters(
 		maybe_max_len: Option<usize>,
 	) -> data_provider::Result<(Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)>, Weight)> {
-		// NOTE: reading these counts already needs to iterate a lot of storage keys, but they get
-		// cached. This is okay for the case of `Ok(_)`, but bad for `Err(_)`, as the trait does not
-		// report weight in failures.
-		let nominator_count = <Nominators<T>>::iter().count();
-		let validator_count = <Validators<T>>::iter().count();
-		let voter_count = nominator_count.saturating_add(validator_count);
+		let nominator_count = CurrentNominatorsCount::<T>::get();
+		let validator_count = CurrentValidatorsCount::<T>::get();
+		let voter_count = nominator_count.saturating_add(validator_count) as usize;
+		debug_assert!(<Nominators<T>>::iter().count() as u32 == CurrentNominatorsCount::<T>::get());
+		debug_assert!(<Validators<T>>::iter().count() as u32 == CurrentValidatorsCount::<T>::get());
 
 		if maybe_max_len.map_or(false, |max_len| voter_count > max_len) {
 			return Err("Voter snapshot too big");
@@ -2798,15 +3029,15 @@ impl<T: Config> frame_election_provider_support::ElectionDataProvider<T::Account
 
 		let slashing_span_count = <SlashingSpans<T>>::iter().count();
 		let weight = T::WeightInfo::get_npos_voters(
-			validator_count as u32,
-			nominator_count as u32,
+			nominator_count,
+			validator_count,
 			slashing_span_count as u32,
 		);
 		Ok((Self::get_npos_voters(), weight))
 	}
 
 	fn targets(maybe_max_len: Option<usize>) -> data_provider::Result<(Vec<T::AccountId>, Weight)> {
-		let target_count = <Validators<T>>::iter().count();
+		let target_count = CurrentValidatorsCount::<T>::get() as usize;
 
 		if maybe_max_len.map_or(false, |max_len| target_count > max_len) {
 			return Err("Target snapshot too big");
@@ -2859,7 +3090,7 @@ impl<T: Config> frame_election_provider_support::ElectionDataProvider<T::Account
 		targets.into_iter().for_each(|v| {
 			let stake: BalanceOf<T> = target_stake
 				.and_then(|w| <BalanceOf<T>>::try_from(w).ok())
-				.unwrap_or(T::Currency::minimum_balance() * 100u32.into());
+				.unwrap_or(MinNominatorBond::<T>::get() * 100u32.into());
 			<Bonded<T>>::insert(v.clone(), v.clone());
 			<Ledger<T>>::insert(
 				v.clone(),
@@ -2871,8 +3102,8 @@ impl<T: Config> frame_election_provider_support::ElectionDataProvider<T::Account
 					claimed_rewards: vec![],
 				},
 			);
-			<Validators<T>>::insert(
-				v,
+			Self::do_add_validator(
+				&v,
 				ValidatorPrefs { commission: Perbill::zero(), blocked: false },
 			);
 		});
@@ -2892,8 +3123,8 @@ impl<T: Config> frame_election_provider_support::ElectionDataProvider<T::Account
 					claimed_rewards: vec![],
 				},
 			);
-			<Nominators<T>>::insert(
-				v,
+			Self::do_add_nominator(
+				&v,
 				Nominations { targets: t, submitted_in: 0, suppressed: false },
 			);
 		});
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index f58cdf0d2350..35a1fa45284d 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -242,6 +242,7 @@ impl onchain::Config for Test {
 	type Accuracy = Perbill;
 	type DataProvider = Staking;
 }
+
 impl Config for Test {
 	const MAX_NOMINATIONS: u32 = 16;
 	type Currency = Balances;
@@ -286,6 +287,8 @@ pub struct ExtBuilder {
 	invulnerables: Vec<AccountId>,
 	has_stakers: bool,
 	initialize_first_session: bool,
+	min_nominator_bond: Balance,
+	min_validator_bond: Balance,
 }
 
 impl Default for ExtBuilder {
@@ -300,6 +303,8 @@ impl Default for ExtBuilder {
 			invulnerables: vec![],
 			has_stakers: true,
 			initialize_first_session: true,
+			min_nominator_bond: ExistentialDeposit::get(),
+			min_validator_bond: ExistentialDeposit::get(),
 		}
 	}
 }
@@ -361,7 +366,15 @@ impl ExtBuilder {
 		OFFSET.with(|v| *v.borrow_mut() = offset);
 		self
 	}
-	pub fn build(self) -> sp_io::TestExternalities {
+	pub fn min_nominator_bond(mut self, amount: Balance) -> Self {
+		self.min_nominator_bond = amount;
+		self
+	}
+	pub fn min_validator_bond(mut self, amount: Balance) -> Self {
+		self.min_validator_bond = amount;
+		self
+	}
+	fn build(self) -> sp_io::TestExternalities {
 		sp_tracing::try_init_simple();
 		let mut storage = frame_system::GenesisConfig::default()
 			.build_storage::<Test>()
@@ -434,6 +447,8 @@ impl ExtBuilder {
 			minimum_validator_count: self.minimum_validator_count,
 			invulnerables: self.invulnerables,
 			slash_reward_fraction: Perbill::from_percent(10),
+			min_nominator_bond: self.min_nominator_bond,
+			min_validator_bond: self.min_validator_bond,
 			..Default::default()
 		}
 		.assimilate_storage(&mut storage);
@@ -477,6 +492,14 @@ fn post_conditions() {
 	check_nominators();
 	check_exposures();
 	check_ledgers();
+	check_count();
+}
+
+fn check_count() {
+	let nominator_count = Nominators::<Test>::iter().count() as u32;
+	let validator_count = Validators::<Test>::iter().count() as u32;
+	assert_eq!(nominator_count, CurrentNominatorsCount::<Test>::get());
+	assert_eq!(validator_count, CurrentValidatorsCount::<Test>::get());
 }
 
 fn check_ledgers() {
diff --git a/frame/staking/src/testing_utils.rs b/frame/staking/src/testing_utils.rs
index f3af4ac0920d..8a4392edfed2 100644
--- a/frame/staking/src/testing_utils.rs
+++ b/frame/staking/src/testing_utils.rs
@@ -30,7 +30,9 @@ const SEED: u32 = 0;
 /// This function removes all validators and nominators from storage.
 pub fn clear_validators_and_nominators<T: Config>() {
 	Validators::<T>::remove_all(None);
+	CurrentValidatorsCount::<T>::kill();
 	Nominators::<T>::remove_all(None);
+	CurrentNominatorsCount::<T>::kill();
 }
 
 /// Grab a funded user.
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index ee8f78769e70..976ee34d9b8e 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -297,8 +297,7 @@ fn staking_should_work() {
 	ExtBuilder::default()
 		.nominate(false)
 		.fair(false) // to give 20 more staked value
-		.build()
-		.execute_with(|| {
+		.build_and_execute(|| {
 			// remember + compare this along with the test.
 			assert_eq_uvec!(validator_controllers(), vec![20, 10]);
 
@@ -374,8 +373,7 @@ fn blocking_and_kicking_works() {
 		.validator_count(4)
 		.nominate(true)
 		.num_validators(3)
-		.build()
-		.execute_with(|| {
+		.build_and_execute(|| {
 			// block validator 10/11
 			assert_ok!(Staking::validate(Origin::signed(10), ValidatorPrefs { blocked: true, .. Default::default() }));
 			// attempt to nominate from 100/101...
@@ -398,8 +396,7 @@ fn less_than_needed_candidates_works() {
 		.validator_count(4)
 		.nominate(false)
 		.num_validators(3)
-		.build()
-		.execute_with(|| {
+		.build_and_execute(|| {
 			assert_eq!(Staking::validator_count(), 4);
 			assert_eq!(Staking::minimum_validator_count(), 1);
 			assert_eq_uvec!(validator_controllers(), vec![30, 20, 10]);
@@ -426,8 +423,7 @@ fn no_candidate_emergency_condition() {
 		.num_validators(4)
 		.validator_pool(true)
 		.nominate(false)
-		.build()
-		.execute_with(|| {
+		.build_and_execute(|| {
 			// initial validators
 			assert_eq_uvec!(validator_controllers(), vec![10, 20, 30, 40]);
 			let prefs = ValidatorPrefs { commission: Perbill::one(), .. Default::default() };
@@ -468,8 +464,7 @@ fn nominating_and_rewards_should_work() {
 	ExtBuilder::default()
 		.nominate(false)
 		.validator_pool(true)
-		.build()
-		.execute_with(|| {
+		.build_and_execute(|| {
 			// initial validators -- everyone is actually even.
 			assert_eq_uvec!(validator_controllers(), vec![40, 30]);
 
@@ -1254,8 +1249,7 @@ fn rebond_works() {
 	// * it can re-bond a portion of the funds scheduled to unlock.
 	ExtBuilder::default()
 		.nominate(false)
-		.build()
-		.execute_with(|| {
+		.build_and_execute(|| {
 			// Set payee to controller. avoids confusion
 			assert_ok!(Staking::set_payee(
 				Origin::signed(10),
@@ -1399,8 +1393,7 @@ fn rebond_is_fifo() {
 	// Rebond should proceed by reversing the most recent bond operations.
 	ExtBuilder::default()
 		.nominate(false)
-		.build()
-		.execute_with(|| {
+		.build_and_execute(|| {
 			// Set payee to controller. avoids confusion
 			assert_ok!(Staking::set_payee(
 				Origin::signed(10),
@@ -1547,109 +1540,117 @@ fn reward_to_stake_works() {
 fn on_free_balance_zero_stash_removes_validator() {
 	// Tests that validator storage items are cleaned up when stash is empty
 	// Tests that storage items are untouched when controller is empty
-	ExtBuilder::default().existential_deposit(10).build_and_execute(|| {
-		// Check the balance of the validator account
-		assert_eq!(Balances::free_balance(10), 256);
-		// Check the balance of the stash account
-		assert_eq!(Balances::free_balance(11), 256000);
-		// Check these two accounts are bonded
-		assert_eq!(Staking::bonded(&11), Some(10));
-
-		// Set some storage items which we expect to be cleaned up
-		// Set payee information
-		assert_ok!(Staking::set_payee(Origin::signed(10), RewardDestination::Stash));
-
-		// Check storage items that should be cleaned up
-		assert!(<Ledger<Test>>::contains_key(&10));
-		assert!(<Bonded<Test>>::contains_key(&11));
-		assert!(<Validators<Test>>::contains_key(&11));
-		assert!(<Payee<Test>>::contains_key(&11));
-
-		// Reduce free_balance of controller to 0
-		let _ = Balances::slash(&10, Balance::max_value());
-
-		// Check the balance of the stash account has not been touched
-		assert_eq!(Balances::free_balance(11), 256000);
-		// Check these two accounts are still bonded
-		assert_eq!(Staking::bonded(&11), Some(10));
-
-		// Check storage items have not changed
-		assert!(<Ledger<Test>>::contains_key(&10));
-		assert!(<Bonded<Test>>::contains_key(&11));
-		assert!(<Validators<Test>>::contains_key(&11));
-		assert!(<Payee<Test>>::contains_key(&11));
-
-		// Reduce free_balance of stash to 0
-		let _ = Balances::slash(&11, Balance::max_value());
-		// Check total balance of stash
-		assert_eq!(Balances::total_balance(&11), 10);
-
-		// Reap the stash
-		assert_ok!(Staking::reap_stash(Origin::none(), 11, 0));
-
-		// Check storage items do not exist
-		assert!(!<Ledger<Test>>::contains_key(&10));
-		assert!(!<Bonded<Test>>::contains_key(&11));
-		assert!(!<Validators<Test>>::contains_key(&11));
-		assert!(!<Nominators<Test>>::contains_key(&11));
-		assert!(!<Payee<Test>>::contains_key(&11));
-	});
+	ExtBuilder::default()
+		.existential_deposit(10)
+		.min_nominator_bond(10)
+		.min_validator_bond(10)
+		.build_and_execute(|| {
+			// Check the balance of the validator account
+			assert_eq!(Balances::free_balance(10), 256);
+			// Check the balance of the stash account
+			assert_eq!(Balances::free_balance(11), 256000);
+			// Check these two accounts are bonded
+			assert_eq!(Staking::bonded(&11), Some(10));
+
+			// Set some storage items which we expect to be cleaned up
+			// Set payee information
+			assert_ok!(Staking::set_payee(Origin::signed(10), RewardDestination::Stash));
+
+			// Check storage items that should be cleaned up
+			assert!(<Ledger<Test>>::contains_key(&10));
+			assert!(<Bonded<Test>>::contains_key(&11));
+			assert!(<Validators<Test>>::contains_key(&11));
+			assert!(<Payee<Test>>::contains_key(&11));
+
+			// Reduce free_balance of controller to 0
+			let _ = Balances::slash(&10, Balance::max_value());
+
+			// Check the balance of the stash account has not been touched
+			assert_eq!(Balances::free_balance(11), 256000);
+			// Check these two accounts are still bonded
+			assert_eq!(Staking::bonded(&11), Some(10));
+
+			// Check storage items have not changed
+			assert!(<Ledger<Test>>::contains_key(&10));
+			assert!(<Bonded<Test>>::contains_key(&11));
+			assert!(<Validators<Test>>::contains_key(&11));
+			assert!(<Payee<Test>>::contains_key(&11));
+
+			// Reduce free_balance of stash to 0
+			let _ = Balances::slash(&11, Balance::max_value());
+			// Check total balance of stash
+			assert_eq!(Balances::total_balance(&11), 10);
+
+			// Reap the stash
+			assert_ok!(Staking::reap_stash(Origin::none(), 11, 0));
+
+			// Check storage items do not exist
+			assert!(!<Ledger<Test>>::contains_key(&10));
+			assert!(!<Bonded<Test>>::contains_key(&11));
+			assert!(!<Validators<Test>>::contains_key(&11));
+			assert!(!<Nominators<Test>>::contains_key(&11));
+			assert!(!<Payee<Test>>::contains_key(&11));
+		});
 }
 
 #[test]
 fn on_free_balance_zero_stash_removes_nominator() {
 	// Tests that nominator storage items are cleaned up when stash is empty
 	// Tests that storage items are untouched when controller is empty
-	ExtBuilder::default().existential_deposit(10).build_and_execute(|| {
-		// Make 10 a nominator
-		assert_ok!(Staking::nominate(Origin::signed(10), vec![20]));
-		// Check that account 10 is a nominator
-		assert!(<Nominators<Test>>::contains_key(11));
-		// Check the balance of the nominator account
-		assert_eq!(Balances::free_balance(10), 256);
-		// Check the balance of the stash account
-		assert_eq!(Balances::free_balance(11), 256000);
-
-		// Set payee information
-		assert_ok!(Staking::set_payee(Origin::signed(10), RewardDestination::Stash));
-
-		// Check storage items that should be cleaned up
-		assert!(<Ledger<Test>>::contains_key(&10));
-		assert!(<Bonded<Test>>::contains_key(&11));
-		assert!(<Nominators<Test>>::contains_key(&11));
-		assert!(<Payee<Test>>::contains_key(&11));
-
-		// Reduce free_balance of controller to 0
-		let _ = Balances::slash(&10, Balance::max_value());
-		// Check total balance of account 10
-		assert_eq!(Balances::total_balance(&10), 0);
-
-		// Check the balance of the stash account has not been touched
-		assert_eq!(Balances::free_balance(11), 256000);
-		// Check these two accounts are still bonded
-		assert_eq!(Staking::bonded(&11), Some(10));
-
-		// Check storage items have not changed
-		assert!(<Ledger<Test>>::contains_key(&10));
-		assert!(<Bonded<Test>>::contains_key(&11));
-		assert!(<Nominators<Test>>::contains_key(&11));
-		assert!(<Payee<Test>>::contains_key(&11));
-
-		// Reduce free_balance of stash to 0
-		let _ = Balances::slash(&11, Balance::max_value());
-		// Check total balance of stash
-		assert_eq!(Balances::total_balance(&11), 10);
-
-		// Reap the stash
-		assert_ok!(Staking::reap_stash(Origin::none(), 11, 0));
-
-		// Check storage items do not exist
-		assert!(!<Ledger<Test>>::contains_key(&10));
-		assert!(!<Bonded<Test>>::contains_key(&11));
-		assert!(!<Validators<Test>>::contains_key(&11));
-		assert!(!<Nominators<Test>>::contains_key(&11));
-		assert!(!<Payee<Test>>::contains_key(&11));
-	});
+	ExtBuilder::default()
+		.existential_deposit(10)
+		.min_nominator_bond(10)
+		.min_validator_bond(10)
+		.build_and_execute(|| {
+			// Make 10 a nominator
+			assert_ok!(Staking::nominate(Origin::signed(10), vec![20]));
+			// Check that account 10 is a nominator
+			assert!(<Nominators<Test>>::contains_key(11));
+			// Check the balance of the nominator account
+			assert_eq!(Balances::free_balance(10), 256);
+			// Check the balance of the stash account
+			assert_eq!(Balances::free_balance(11), 256000);
+
+			// Set payee information
+			assert_ok!(Staking::set_payee(Origin::signed(10), RewardDestination::Stash));
+
+			// Check storage items that should be cleaned up
+			assert!(<Ledger<Test>>::contains_key(&10));
+			assert!(<Bonded<Test>>::contains_key(&11));
+			assert!(<Nominators<Test>>::contains_key(&11));
+			assert!(<Payee<Test>>::contains_key(&11));
+
+			// Reduce free_balance of controller to 0
+			let _ = Balances::slash(&10, Balance::max_value());
+			// Check total balance of account 10
+			assert_eq!(Balances::total_balance(&10), 0);
+
+			// Check the balance of the stash account has not been touched
+			assert_eq!(Balances::free_balance(11), 256000);
+			// Check these two accounts are still bonded
+			assert_eq!(Staking::bonded(&11), Some(10));
+
+			// Check storage items have not changed
+			assert!(<Ledger<Test>>::contains_key(&10));
+			assert!(<Bonded<Test>>::contains_key(&11));
+			assert!(<Nominators<Test>>::contains_key(&11));
+			assert!(<Payee<Test>>::contains_key(&11));
+
+			// Reduce free_balance of stash to 0
+			let _ = Balances::slash(&11, Balance::max_value());
+			// Check total balance of stash
+			assert_eq!(Balances::total_balance(&11), 10);
+
+			// Reap the stash
+			assert_ok!(Staking::reap_stash(Origin::none(), 11, 0));
+
+			// Check storage items do not exist
+			assert!(!<Ledger<Test>>::contains_key(&10));
+			assert!(!<Bonded<Test>>::contains_key(&11));
+			assert!(!<Validators<Test>>::contains_key(&11));
+			assert!(!<Nominators<Test>>::contains_key(&11));
+			assert!(!<Payee<Test>>::contains_key(&11));
+		});
 }
 
 
@@ -1725,14 +1726,15 @@ fn bond_with_no_staked_value() {
 	ExtBuilder::default()
 		.validator_count(3)
 		.existential_deposit(5)
+		.min_nominator_bond(5)
+		.min_validator_bond(5)
 		.nominate(false)
 		.minimum_validator_count(1)
-		.build()
-		.execute_with(|| {
+		.build_and_execute(|| {
 			// Can't bond with 1
 			assert_noop!(
 				Staking::bond(Origin::signed(1), 2, 1, RewardDestination::Controller),
-				Error::<Test>::InsufficientValue,
+				Error::<Test>::InsufficientBond,
 			);
 			// bonded with absolute minimum value possible.
 			assert_ok!(Staking::bond(Origin::signed(1), 2, 5, RewardDestination::Controller));
@@ -1774,8 +1776,7 @@ fn bond_with_little_staked_value_bounded() {
 		.validator_count(3)
 		.nominate(false)
 		.minimum_validator_count(1)
-		.build()
-		.execute_with(|| {
+		.build_and_execute(|| {
 			// setup
 			assert_ok!(Staking::chill(Origin::signed(30)));
 			assert_ok!(Staking::set_payee(Origin::signed(10), RewardDestination::Controller));
@@ -1828,8 +1829,7 @@ fn bond_with_duplicate_vote_should_be_ignored_by_election_provider() {
 		.validator_count(2)
 		.nominate(false)
 		.minimum_validator_count(1)
-		.build()
-		.execute_with(|| {
+		.build_and_execute(|| {
 			// disable the nominator
 			assert_ok!(Staking::chill(Origin::signed(100)));
 			// make stakes equal.
@@ -1876,8 +1876,7 @@ fn bond_with_duplicate_vote_should_be_ignored_by_election_provider_elected() {
 		.validator_count(2)
 		.nominate(false)
 		.minimum_validator_count(1)
-		.build()
-		.execute_with(|| {
+		.build_and_execute(|| {
 			// disable the nominator
 			assert_ok!(Staking::chill(Origin::signed(100)));
 			// 31/30 will have less stake
@@ -1923,8 +1922,7 @@ fn new_era_elects_correct_number_of_validators() {
 		.validator_pool(true)
 		.fair(true)
 		.validator_count(1)
-		.build()
-		.execute_with(|| {
+		.build_and_execute(|| {
 			assert_eq!(Staking::validator_count(), 1);
 			assert_eq!(validator_controllers().len(), 1);
 
@@ -2466,7 +2464,11 @@ fn only_slash_for_max_in_era() {
 #[test]
 fn garbage_collection_after_slashing() {
 	// ensures that `SlashingSpans` and `SpanSlash` of an account is removed after reaping.
-	ExtBuilder::default().existential_deposit(2).build_and_execute(|| {
+	ExtBuilder::default()
+	.existential_deposit(2)
+	.min_nominator_bond(2)
+	.min_validator_bond(2)
+	.build_and_execute(|| {
 		assert_eq!(Balances::free_balance(11), 256_000);
 
 		on_offence_now(
@@ -3723,6 +3725,8 @@ fn session_buffering_no_offset() {
 fn cannot_rebond_to_lower_than_ed() {
 	ExtBuilder::default()
 		.existential_deposit(10)
+		.min_nominator_bond(10)
+		.min_validator_bond(10)
 		.build_and_execute(|| {
 			// stash must have more balance than bonded for this to work.
 			assert_eq!(Balances::free_balance(&21), 512_000);
@@ -3739,7 +3743,8 @@ fn cannot_rebond_to_lower_than_ed() {
 				}
 			);
 
-			// unbond all of it.
+			// unbond all of it. must be chilled first.
+			assert_ok!(Staking::chill(Origin::signed(20)));
 			assert_ok!(Staking::unbond(Origin::signed(20), 1000));
 			assert_eq!(
 				Staking::ledger(&20).unwrap(),
@@ -3755,7 +3760,7 @@ fn cannot_rebond_to_lower_than_ed() {
 			// now bond a wee bit more
 			assert_noop!(
 				Staking::rebond(Origin::signed(20), 5),
-				Error::<Test>::InsufficientValue,
+				Error::<Test>::InsufficientBond,
 			);
 		})
 }
@@ -3764,6 +3769,8 @@ fn cannot_rebond_to_lower_than_ed() {
 fn cannot_bond_extra_to_lower_than_ed() {
 	ExtBuilder::default()
 		.existential_deposit(10)
+		.min_nominator_bond(10)
+		.min_validator_bond(10)
 		.build_and_execute(|| {
 			// stash must have more balance than bonded for this to work.
 			assert_eq!(Balances::free_balance(&21), 512_000);
@@ -3780,7 +3787,8 @@ fn cannot_bond_extra_to_lower_than_ed() {
 				}
 			);
 
-			// unbond all of it.
+			// unbond all of it. must be chilled first.
+			assert_ok!(Staking::chill(Origin::signed(20)));
 			assert_ok!(Staking::unbond(Origin::signed(20), 1000));
 			assert_eq!(
 				Staking::ledger(&20).unwrap(),
@@ -3799,7 +3807,7 @@ fn cannot_bond_extra_to_lower_than_ed() {
 			// now bond a wee bit more
 			assert_noop!(
 				Staking::bond_extra(Origin::signed(21), 5),
-				Error::<Test>::InsufficientValue,
+				Error::<Test>::InsufficientBond,
 			);
 		})
 }
@@ -3809,6 +3817,8 @@ fn do_not_die_when_active_is_ed() {
 	let ed = 10;
 	ExtBuilder::default()
 		.existential_deposit(ed)
+		.min_nominator_bond(ed)
+		.min_validator_bond(ed)
 		.build_and_execute(|| {
 			// initial stuff.
 			assert_eq!(
@@ -3888,7 +3898,7 @@ mod election_data_provider {
 
 	#[test]
 	fn voters_include_self_vote() {
-		ExtBuilder::default().nominate(false).build().execute_with(|| {
+		ExtBuilder::default().nominate(false).build_and_execute(|| {
 			assert!(<Validators<Test>>::iter().map(|(x, _)| x).all(|v| Staking::voters(None)
 				.unwrap()
 				.0
@@ -3900,7 +3910,7 @@ mod election_data_provider {
 
 	#[test]
 	fn voters_exclude_slashed() {
-		ExtBuilder::default().build().execute_with(|| {
+		ExtBuilder::default().build_and_execute(|| {
 			assert_eq!(Staking::nominators(101).unwrap().targets, vec![11, 21]);
 			assert_eq!(
 				<Staking as ElectionDataProvider<AccountId, BlockNumber>>::voters(None)
@@ -3946,7 +3956,7 @@ mod election_data_provider {
 
 	#[test]
 	fn respects_len_limits() {
-		ExtBuilder::default().build().execute_with(|| {
+		ExtBuilder::default().build_and_execute(|| {
 			assert_eq!(Staking::voters(Some(1)).unwrap_err(), "Voter snapshot too big");
 			assert_eq!(Staking::targets(Some(1)).unwrap_err(), "Target snapshot too big");
 		});
@@ -3954,7 +3964,7 @@ mod election_data_provider {
 
 	#[test]
 	fn estimate_next_election_works() {
-		ExtBuilder::default().session_per_era(5).period(5).build().execute_with(|| {
+		ExtBuilder::default().session_per_era(5).period(5).build_and_execute(|| {
 			// first session is always length 0.
 			for b in 1..20 {
 				run_to_block(b);
@@ -4013,4 +4023,129 @@ mod election_data_provider {
 			assert_eq!(ForceEra::<Test>::get(), Forcing::NotForcing);
 		})
 	}
+
+	#[test]
+	#[should_panic]
+	fn count_check_works() {
+		ExtBuilder::default().build_and_execute(|| {
+			// We should never insert into the validators or nominators map directly as this will
+			// not keep track of the count. This test should panic as we verify the count is accurate
+			// after every test using the `post_checks` in `mock`.
+			Validators::<Test>::insert(987654321, ValidatorPrefs::default());
+			Nominators::<Test>::insert(987654321, Nominations {
+				targets: vec![],
+				submitted_in: Default::default(),
+				suppressed: false,
+			});
+		})
+	}
+
+	#[test]
+	fn min_bond_checks_work() {
+		ExtBuilder::default()
+			.existential_deposit(100)
+			.min_nominator_bond(1_000)
+			.min_validator_bond(1_500)
+			.build_and_execute(|| {
+				// 500 is not enough for any role
+				assert_ok!(Staking::bond(Origin::signed(3), 4, 500, RewardDestination::Controller));
+				assert_noop!(Staking::nominate(Origin::signed(4), vec![1]), Error::<Test>::InsufficientBond);
+				assert_noop!(Staking::validate(Origin::signed(4), ValidatorPrefs::default()), Error::<Test>::InsufficientBond);
+
+				// 1000 is enough for nominator
+				assert_ok!(Staking::bond_extra(Origin::signed(3), 500));
+				assert_ok!(Staking::nominate(Origin::signed(4), vec![1]));
+				assert_noop!(Staking::validate(Origin::signed(4), ValidatorPrefs::default()), Error::<Test>::InsufficientBond);
+
+				// 1500 is enough for validator
+				assert_ok!(Staking::bond_extra(Origin::signed(3), 500));
+				assert_ok!(Staking::nominate(Origin::signed(4), vec![1]));
+				assert_ok!(Staking::validate(Origin::signed(4), ValidatorPrefs::default()));
+
+				// Can't unbond anything as validator
+				assert_noop!(Staking::unbond(Origin::signed(4), 500), Error::<Test>::InsufficientBond);
+
+				// Once they are a nominator, they can unbond 500
+				assert_ok!(Staking::nominate(Origin::signed(4), vec![1]));
+				assert_ok!(Staking::unbond(Origin::signed(4), 500));
+				assert_noop!(Staking::unbond(Origin::signed(4), 500), Error::<Test>::InsufficientBond);
+
+				// Once they are chilled they can unbond everything
+				assert_ok!(Staking::chill(Origin::signed(4)));
+				assert_ok!(Staking::unbond(Origin::signed(4), 1000));
+			})
+	}
+
+	#[test]
+	fn chill_other_works() {
+		ExtBuilder::default()
+			.existential_deposit(100)
+			.min_nominator_bond(1_000)
+			.min_validator_bond(1_500)
+			.build_and_execute(|| {
+				// Nominator
+				assert_ok!(Staking::bond(Origin::signed(1), 2, 1000, RewardDestination::Controller));
+				assert_ok!(Staking::nominate(Origin::signed(2), vec![1]));
+
+				// Validator
+				assert_ok!(Staking::bond(Origin::signed(3), 4, 1500, RewardDestination::Controller));
+				assert_ok!(Staking::validate(Origin::signed(4), ValidatorPrefs::default()));
+
+				// Can't chill these users
+				assert_noop!(Staking::chill_other(Origin::signed(1), 2), Error::<Test>::CannotChillOther);
+				assert_noop!(Staking::chill_other(Origin::signed(1), 4), Error::<Test>::CannotChillOther);
+
+				// Change the minimum bond
+				assert_ok!(Staking::update_staking_limits(Origin::root(), 1_500, 2_000, None, None));
+
+				// Users can now be chilled
+				assert_ok!(Staking::chill_other(Origin::signed(1), 2));
+				assert_ok!(Staking::chill_other(Origin::signed(1), 4));
+			})
+	}
+
+	#[test]
+	fn capped_stakers_works() {
+		ExtBuilder::default().build_and_execute(|| {
+			let validator_count = CurrentValidatorsCount::<Test>::get();
+			assert_eq!(validator_count, 3);
+			let nominator_count = CurrentNominatorsCount::<Test>::get();
+			assert_eq!(nominator_count, 1);
+
+			// Change the maximums
+			let max = 10;
+			assert_ok!(Staking::update_staking_limits(Origin::root(), 10, 10, Some(max), Some(max)));
+
+			// can create `max - validator_count` validators
+			assert_ok!(testing_utils::create_validators::<Test>(max - validator_count, 100));
+
+			// but no more
+			let (_, last_validator) = testing_utils::create_stash_controller::<Test>(
+				1337, 100, RewardDestination::Controller,
+			).unwrap();
+			assert_noop!(
+				Staking::validate(Origin::signed(last_validator), ValidatorPrefs::default()),
+				Error::<Test>::TooManyValidators,
+			);
+
+			// same with nominators
+			for i in 0 .. max - nominator_count {
+				let (_, controller) = testing_utils::create_stash_controller::<Test>(
+					i + 10_000_000, 100, RewardDestination::Controller,
+				).unwrap();
+				assert_ok!(Staking::nominate(Origin::signed(controller), vec![1]));
+			}
+
+			// one more is too many
+			let (_, last_nominator) = testing_utils::create_stash_controller::<Test>(
+				20_000_000, 100, RewardDestination::Controller,
+			).unwrap();
+			assert_noop!(Staking::nominate(Origin::signed(last_nominator), vec![1]), Error::<Test>::TooManyNominators);
+
+			// No problem when we set to `None` again
+			assert_ok!(Staking::update_staking_limits(Origin::root(), 10, 10, None, None));
+			assert_ok!(Staking::nominate(Origin::signed(last_nominator), vec![1]));
+			assert_ok!(Staking::validate(Origin::signed(last_validator), ValidatorPrefs::default()));
+		})
+	}
 }
diff --git a/frame/staking/src/weights.rs b/frame/staking/src/weights.rs
index 5960d6612566..980b0855fbd8 100644
--- a/frame/staking/src/weights.rs
+++ b/frame/staking/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_staking
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-07, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-06-15, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -70,365 +70,383 @@ pub trait WeightInfo {
 	fn new_era(v: u32, n: u32, ) -> Weight;
 	fn get_npos_voters(v: u32, n: u32, s: u32, ) -> Weight;
 	fn get_npos_targets(v: u32, ) -> Weight;
+	fn update_staking_limits() -> Weight;
+	fn chill_other() -> Weight;
 }
 
 /// Weights for pallet_staking using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn bond() -> Weight {
-		(91_959_000 as Weight)
+		(91_278_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn bond_extra() -> Weight {
-		(69_291_000 as Weight)
+		(69_833_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn unbond() -> Weight {
-		(63_513_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(75_020_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn withdraw_unbonded_update(s: u32, ) -> Weight {
-		(64_747_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((77_000 as Weight).saturating_mul(s as Weight))
+		(63_898_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((50_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
-		(100_375_000 as Weight)
+		(103_717_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((3_067_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(T::DbWeight::get().reads(6 as Weight))
-			.saturating_add(T::DbWeight::get().writes(8 as Weight))
+			.saturating_add((2_942_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(8 as Weight))
+			.saturating_add(T::DbWeight::get().writes(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn validate() -> Weight {
-		(17_849_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+		(40_702_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn kick(k: u32, ) -> Weight {
-		(27_939_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((21_431_000 as Weight).saturating_mul(k as Weight))
+		(33_572_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((20_771_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(k as Weight)))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn nominate(n: u32, ) -> Weight {
-		(32_791_000 as Weight)
-			// Standard Error: 33_000
-			.saturating_add((7_006_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+		(53_561_000 as Weight)
+			// Standard Error: 34_000
+			.saturating_add((6_652_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn chill() -> Weight {
-		(17_014_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+		(21_489_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 	}
 	fn set_payee() -> Weight {
-		(14_816_000 as Weight)
+		(14_514_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_controller() -> Weight {
-		(33_600_000 as Weight)
+		(32_598_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn set_validator_count() -> Weight {
-		(2_706_000 as Weight)
+		(2_477_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_no_eras() -> Weight {
-		(2_973_000 as Weight)
+		(2_743_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_new_era() -> Weight {
-		(2_949_000 as Weight)
+		(2_784_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_new_era_always() -> Weight {
-		(3_011_000 as Weight)
+		(2_749_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_invulnerables(v: u32, ) -> Weight {
-		(3_078_000 as Weight)
+		(2_798_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((5_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_unstake(s: u32, ) -> Weight {
-		(69_220_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((3_070_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().writes(8 as Weight))
+		(70_372_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((3_029_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(6 as Weight))
+			.saturating_add(T::DbWeight::get().writes(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn cancel_deferred_slash(s: u32, ) -> Weight {
-		(3_460_399_000 as Weight)
-			// Standard Error: 222_000
-			.saturating_add((19_782_000 as Weight).saturating_mul(s as Weight))
+		(3_436_822_000 as Weight)
+			// Standard Error: 221_000
+			.saturating_add((19_799_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn payout_stakers_dead_controller(n: u32, ) -> Weight {
-		(120_436_000 as Weight)
+		(132_018_000 as Weight)
 			// Standard Error: 27_000
-			.saturating_add((63_092_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((61_340_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(10 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(n as Weight)))
 	}
 	fn payout_stakers_alive_staked(n: u32, ) -> Weight {
-		(181_424_000 as Weight)
-			// Standard Error: 51_000
-			.saturating_add((78_631_000 as Weight).saturating_mul(n as Weight))
+		(158_346_000 as Weight)
+			// Standard Error: 61_000
+			.saturating_add((77_147_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(11 as Weight))
 			.saturating_add(T::DbWeight::get().reads((5 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(n as Weight)))
 	}
 	fn rebond(l: u32, ) -> Weight {
-		(59_349_000 as Weight)
+		(57_756_000 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((64_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add((79_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn set_history_depth(e: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 97_000
-			.saturating_add((44_609_000 as Weight).saturating_mul(e as Weight))
+			// Standard Error: 100_000
+			.saturating_add((44_873_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes((7 as Weight).saturating_mul(e as Weight)))
 	}
 	fn reap_stash(s: u32, ) -> Weight {
-		(72_356_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((3_066_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().writes(8 as Weight))
+		(75_073_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((2_988_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(6 as Weight))
+			.saturating_add(T::DbWeight::get().writes(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn new_era(v: u32, n: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 1_462_000
-			.saturating_add((393_007_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 73_000
-			.saturating_add((72_014_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 1_146_000
+			.saturating_add((362_986_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 57_000
+			.saturating_add((60_216_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(10 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
-			.saturating_add(T::DbWeight::get().writes(9 as Weight))
+			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(v as Weight)))
 	}
 	fn get_npos_voters(v: u32, n: u32, s: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 235_000
-			.saturating_add((35_212_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 235_000
-			.saturating_add((38_391_000 as Weight).saturating_mul(n as Weight))
-			// Standard Error: 3_200_000
-			.saturating_add((31_130_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 230_000
+			.saturating_add((35_891_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 230_000
+			.saturating_add((37_854_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 7_842_000
+			.saturating_add((32_492_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn get_npos_targets(v: u32, ) -> Weight {
-		(52_314_000 as Weight)
-			// Standard Error: 71_000
-			.saturating_add((15_195_000 as Weight).saturating_mul(v as Weight))
+		(0 as Weight)
+			// Standard Error: 74_000
+			.saturating_add((16_370_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(v as Weight)))
 	}
+	fn update_staking_limits() -> Weight {
+		(6_398_000 as Weight)
+			.saturating_add(T::DbWeight::get().writes(4 as Weight))
+	}
+	fn chill_other() -> Weight {
+		(44_694_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn bond() -> Weight {
-		(91_959_000 as Weight)
+		(91_278_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn bond_extra() -> Weight {
-		(69_291_000 as Weight)
+		(69_833_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn unbond() -> Weight {
-		(63_513_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(75_020_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn withdraw_unbonded_update(s: u32, ) -> Weight {
-		(64_747_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((77_000 as Weight).saturating_mul(s as Weight))
+		(63_898_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((50_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
-		(100_375_000 as Weight)
+		(103_717_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((3_067_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
+			.saturating_add((2_942_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(8 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn validate() -> Weight {
-		(17_849_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+		(40_702_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn kick(k: u32, ) -> Weight {
-		(27_939_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((21_431_000 as Weight).saturating_mul(k as Weight))
+		(33_572_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((20_771_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(k as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn nominate(n: u32, ) -> Weight {
-		(32_791_000 as Weight)
-			// Standard Error: 33_000
-			.saturating_add((7_006_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+		(53_561_000 as Weight)
+			// Standard Error: 34_000
+			.saturating_add((6_652_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn chill() -> Weight {
-		(17_014_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+		(21_489_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 	}
 	fn set_payee() -> Weight {
-		(14_816_000 as Weight)
+		(14_514_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_controller() -> Weight {
-		(33_600_000 as Weight)
+		(32_598_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn set_validator_count() -> Weight {
-		(2_706_000 as Weight)
+		(2_477_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_no_eras() -> Weight {
-		(2_973_000 as Weight)
+		(2_743_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_new_era() -> Weight {
-		(2_949_000 as Weight)
+		(2_784_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_new_era_always() -> Weight {
-		(3_011_000 as Weight)
+		(2_749_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_invulnerables(v: u32, ) -> Weight {
-		(3_078_000 as Weight)
+		(2_798_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((5_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_unstake(s: u32, ) -> Weight {
-		(69_220_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((3_070_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
+		(70_372_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((3_029_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn cancel_deferred_slash(s: u32, ) -> Weight {
-		(3_460_399_000 as Weight)
-			// Standard Error: 222_000
-			.saturating_add((19_782_000 as Weight).saturating_mul(s as Weight))
+		(3_436_822_000 as Weight)
+			// Standard Error: 221_000
+			.saturating_add((19_799_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn payout_stakers_dead_controller(n: u32, ) -> Weight {
-		(120_436_000 as Weight)
+		(132_018_000 as Weight)
 			// Standard Error: 27_000
-			.saturating_add((63_092_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((61_340_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(n as Weight)))
 	}
 	fn payout_stakers_alive_staked(n: u32, ) -> Weight {
-		(181_424_000 as Weight)
-			// Standard Error: 51_000
-			.saturating_add((78_631_000 as Weight).saturating_mul(n as Weight))
+		(158_346_000 as Weight)
+			// Standard Error: 61_000
+			.saturating_add((77_147_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(11 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((5 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(n as Weight)))
 	}
 	fn rebond(l: u32, ) -> Weight {
-		(59_349_000 as Weight)
+		(57_756_000 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((64_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add((79_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn set_history_depth(e: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 97_000
-			.saturating_add((44_609_000 as Weight).saturating_mul(e as Weight))
+			// Standard Error: 100_000
+			.saturating_add((44_873_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((7 as Weight).saturating_mul(e as Weight)))
 	}
 	fn reap_stash(s: u32, ) -> Weight {
-		(72_356_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((3_066_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
+		(75_073_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((2_988_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn new_era(v: u32, n: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 1_462_000
-			.saturating_add((393_007_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 73_000
-			.saturating_add((72_014_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 1_146_000
+			.saturating_add((362_986_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 57_000
+			.saturating_add((60_216_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
-			.saturating_add(RocksDbWeight::get().writes(9 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(v as Weight)))
 	}
 	fn get_npos_voters(v: u32, n: u32, s: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 235_000
-			.saturating_add((35_212_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 235_000
-			.saturating_add((38_391_000 as Weight).saturating_mul(n as Weight))
-			// Standard Error: 3_200_000
-			.saturating_add((31_130_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 230_000
+			.saturating_add((35_891_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 230_000
+			.saturating_add((37_854_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 7_842_000
+			.saturating_add((32_492_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn get_npos_targets(v: u32, ) -> Weight {
-		(52_314_000 as Weight)
-			// Standard Error: 71_000
-			.saturating_add((15_195_000 as Weight).saturating_mul(v as Weight))
+		(0 as Weight)
+			// Standard Error: 74_000
+			.saturating_add((16_370_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(v as Weight)))
 	}
+	fn update_staking_limits() -> Weight {
+		(6_398_000 as Weight)
+			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
+	}
+	fn chill_other() -> Weight {
+		(44_694_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+	}
 }

From c3e9fcf11c043c245d938d65b34f02152f7a3caf Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Wed, 16 Jun 2021 11:09:24 +0200
Subject: [PATCH 0888/1194] Do not run pallet_ui test with conditional-storage
 feature (#9122)

* do not run pallet_ui test with conditional-compilation feature

* fix
---
 frame/support/test/tests/pallet_ui.rs         |  1 +
 .../storage_info_unsatisfied_nmap.rs          | 37 +++++++++----------
 .../storage_info_unsatisfied_nmap.stderr      | 12 ++++--
 3 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/frame/support/test/tests/pallet_ui.rs b/frame/support/test/tests/pallet_ui.rs
index e5f4a54dfb00..fea7a2c7e7ad 100644
--- a/frame/support/test/tests/pallet_ui.rs
+++ b/frame/support/test/tests/pallet_ui.rs
@@ -16,6 +16,7 @@
 // limitations under the License.
 
 #[rustversion::attr(not(stable), ignore)]
+#[cfg(not(feature = "conditional-storage"))]
 #[test]
 fn pallet_ui() {
 	// As trybuild is using `cargo check`, we don't need the real WASM binaries.
diff --git a/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.rs b/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.rs
index ef31af92e5a3..3d03099c3c4b 100644
--- a/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.rs
+++ b/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.rs
@@ -1,28 +1,27 @@
-// #[frame_support::pallet]
-// mod pallet {
-// 	use frame_support::pallet_prelude::{Hooks, StorageNMap, Twox64Concat, NMapKey};
-// 	use frame_system::pallet_prelude::BlockNumberFor;
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::{Hooks, StorageNMap, Twox64Concat, NMapKey};
+	use frame_system::pallet_prelude::BlockNumberFor;
 
-// 	#[pallet::config]
-// 	pub trait Config: frame_system::Config {}
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
 
-// 	#[pallet::pallet]
-// 	#[pallet::generate_storage_info]
-// 	pub struct Pallet<T>(core::marker::PhantomData<T>);
+	#[pallet::pallet]
+	#[pallet::generate_storage_info]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
 
-// 	#[pallet::hooks]
-// 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
 
-// 	#[pallet::call]
-// 	impl<T: Config> Pallet<T> {}
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
 
-// 	#[derive(codec::Encode, codec::Decode)]
-// 	struct Bar;
+	#[derive(codec::Encode, codec::Decode)]
+	struct Bar;
 
-// 	#[pallet::storage]
-// 	type Foo<T> = StorageNMap<_, NMapKey<Twox64Concat, Bar>, u32>;
-// }
+	#[pallet::storage]
+	type Foo<T> = StorageNMap<_, NMapKey<Twox64Concat, Bar>, u32>;
+}
 
 fn main() {
-	compile_error!("Temporarily disabled due to test flakiness");
 }
diff --git a/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.stderr b/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.stderr
index 9c69a3f076e3..545520124bfe 100644
--- a/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.stderr
+++ b/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.stderr
@@ -1,5 +1,9 @@
-error: Temporarily disabled due to test flakiness
-  --> $DIR/storage_info_unsatisfied_nmap.rs:27:2
+error[E0277]: the trait bound `Bar: MaxEncodedLen` is not satisfied
+  --> $DIR/storage_info_unsatisfied_nmap.rs:10:12
    |
-27 |     compile_error!("Temporarily disabled due to test flakiness");
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10 |     #[pallet::generate_storage_info]
+   |               ^^^^^^^^^^^^^^^^^^^^^ the trait `MaxEncodedLen` is not implemented for `Bar`
+   |
+   = note: required because of the requirements on the impl of `KeyGeneratorMaxEncodedLen` for `NMapKey<frame_support::Twox64Concat, Bar>`
+   = note: required because of the requirements on the impl of `StorageInfoTrait` for `frame_support::pallet_prelude::StorageNMap<_GeneratedPrefixForStorageFoo<T>, NMapKey<frame_support::Twox64Concat, Bar>, u32>`
+   = note: required by `storage_info`

From 286d7ce1c983e06cedeefa3b44f410da0181f9aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Wed, 16 Jun 2021 13:51:09 +0100
Subject: [PATCH 0889/1194] grandpa: cleanup sync bounds (#9127)

* grandpa: cleanup sync bounds

* grandpa: cleanup imports

* remove cargo patch
---
 Cargo.lock                                    |   4 +-
 client/finality-grandpa-warp-sync/Cargo.toml  |   2 +-
 client/finality-grandpa-warp-sync/src/lib.rs  |   5 +-
 client/finality-grandpa/Cargo.toml            |   4 +-
 client/finality-grandpa/rpc/Cargo.toml        |   2 +-
 .../finality-grandpa/src/communication/mod.rs |   2 +-
 client/finality-grandpa/src/environment.rs    | 123 ++++++++++--------
 client/finality-grandpa/src/finality_proof.rs |   7 +-
 client/finality-grandpa/src/import.rs         |  83 ++++++------
 client/finality-grandpa/src/lib.rs            |  14 +-
 client/finality-grandpa/src/observer.rs       |  60 +++++----
 client/finality-grandpa/src/tests.rs          |   2 +-
 client/finality-grandpa/src/until_imported.rs |  19 ++-
 client/finality-grandpa/src/voting_rule.rs    |   5 +-
 frame/grandpa/Cargo.toml                      |   2 +-
 primitives/finality-grandpa/Cargo.toml        |   2 +-
 16 files changed, 188 insertions(+), 148 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 84f487ceedc9..fb944b782abd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1679,9 +1679,9 @@ dependencies = [
 
 [[package]]
 name = "finality-grandpa"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6447e2f8178843749e8c8003206def83ec124a7859475395777a28b5338647c"
+checksum = "74a1bfdcc776e63e49f741c7ce6116fa1b887e8ac2e3ccb14dd4aa113e54feb9"
 dependencies = [
  "either",
  "futures 0.3.15",
diff --git a/client/finality-grandpa-warp-sync/Cargo.toml b/client/finality-grandpa-warp-sync/Cargo.toml
index 3557d543c987..27728e159c76 100644
--- a/client/finality-grandpa-warp-sync/Cargo.toml
+++ b/client/finality-grandpa-warp-sync/Cargo.toml
@@ -28,7 +28,7 @@ sp-finality-grandpa = { version = "3.0.0", path = "../../primitives/finality-gra
 sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
 
 [dev-dependencies]
-finality-grandpa = { version = "0.14.0" }
+finality-grandpa = { version = "0.14.1" }
 rand = "0.8"
 sc-block-builder = { version = "0.9.0", path = "../block-builder" }
 sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
diff --git a/client/finality-grandpa-warp-sync/src/lib.rs b/client/finality-grandpa-warp-sync/src/lib.rs
index a6b7e46a0f02..c0ef93e625fd 100644
--- a/client/finality-grandpa-warp-sync/src/lib.rs
+++ b/client/finality-grandpa-warp-sync/src/lib.rs
@@ -40,7 +40,8 @@ pub fn request_response_config_for_chain<TBlock: BlockT, TBackend: Backend<TBloc
 	backend: Arc<TBackend>,
 	authority_set: SharedAuthoritySet<TBlock::Hash, NumberFor<TBlock>>,
 ) -> RequestResponseConfig
-	where NumberFor<TBlock>: sc_finality_grandpa::BlockNumberOps,
+where
+	NumberFor<TBlock>: sc_finality_grandpa::BlockNumberOps,
 {
 	let protocol_id = config.protocol_id();
 
@@ -54,7 +55,7 @@ pub fn request_response_config_for_chain<TBlock: BlockT, TBackend: Backend<TBloc
 			backend.clone(),
 			authority_set,
 		);
-		spawn_handle.spawn("grandpa_warp_sync_request_handler", handler.run());
+		spawn_handle.spawn("grandpa-warp-sync", handler.run());
 		request_response_config
 	}
 }
diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml
index ea91460972c9..3cb577aee5db 100644
--- a/client/finality-grandpa/Cargo.toml
+++ b/client/finality-grandpa/Cargo.toml
@@ -44,7 +44,7 @@ sc-network-gossip = { version = "0.9.0", path = "../network-gossip" }
 sp-finality-grandpa = { version = "3.0.0", path = "../../primitives/finality-grandpa" }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
 sc-block-builder = { version = "0.9.0", path = "../block-builder" }
-finality-grandpa = { version = "0.14.0", features = ["derive-codec"] }
+finality-grandpa = { version = "0.14.1", features = ["derive-codec"] }
 pin-project = "1.0.4"
 linked-hash-map = "0.5.2"
 async-trait = "0.1.42"
@@ -52,7 +52,7 @@ wasm-timer = "0.2"
 
 [dev-dependencies]
 assert_matches = "1.3.0"
-finality-grandpa = { version = "0.14.0", features = ["derive-codec", "test-helpers"] }
+finality-grandpa = { version = "0.14.1", features = ["derive-codec", "test-helpers"] }
 sc-network = { version = "0.9.0", path = "../network" }
 sc-network-test = { version = "0.8.0", path = "../network/test" }
 sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
diff --git a/client/finality-grandpa/rpc/Cargo.toml b/client/finality-grandpa/rpc/Cargo.toml
index ff5b4cafdae7..97359120fcaa 100644
--- a/client/finality-grandpa/rpc/Cargo.toml
+++ b/client/finality-grandpa/rpc/Cargo.toml
@@ -14,7 +14,7 @@ sc-rpc = { version = "3.0.0", path = "../../rpc" }
 sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
 sp-core = { version = "3.0.0", path = "../../../primitives/core" }
 sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
-finality-grandpa = { version = "0.14.0", features = ["derive-codec"] }
+finality-grandpa = { version = "0.14.1", features = ["derive-codec"] }
 jsonrpc-core = "15.1.0"
 jsonrpc-core-client = "15.1.0"
 jsonrpc-derive = "15.1.0"
diff --git a/client/finality-grandpa/src/communication/mod.rs b/client/finality-grandpa/src/communication/mod.rs
index 0d287cc96e53..45bc72223e4b 100644
--- a/client/finality-grandpa/src/communication/mod.rs
+++ b/client/finality-grandpa/src/communication/mod.rs
@@ -117,7 +117,7 @@ impl LocalIdKeystore {
 	}
 
 	/// Returns a reference to the keystore.
-	fn keystore(&self) -> SyncCryptoStorePtr{
+	fn keystore(&self) -> SyncCryptoStorePtr {
 		(self.0).1.clone()
 	}
 }
diff --git a/client/finality-grandpa/src/environment.rs b/client/finality-grandpa/src/environment.rs
index d3a5b49b5072..3d593a17ffdb 100644
--- a/client/finality-grandpa/src/environment.rs
+++ b/client/finality-grandpa/src/environment.rs
@@ -23,43 +23,42 @@ use std::pin::Pin;
 use std::sync::Arc;
 use std::time::Duration;
 
+use finality_grandpa::{
+	round::State as RoundState, voter, voter_set::VoterSet, BlockNumberOps, Error as GrandpaError,
+};
 use futures::prelude::*;
 use futures_timer::Delay;
 use log::{debug, warn};
 use parity_scale_codec::{Decode, Encode};
 use parking_lot::RwLock;
+use prometheus_endpoint::{register, Counter, Gauge, PrometheusError, U64};
 
-use sc_client_api::{backend::{Backend, apply_aux}, utils::is_descendent_of};
-use finality_grandpa::{
-	BlockNumberOps, Error as GrandpaError, round::State as RoundState,
-	voter, voter_set::VoterSet,
+use sc_client_api::{
+	backend::{apply_aux, Backend},
+	utils::is_descendent_of,
 };
+use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_DEBUG, CONSENSUS_INFO};
 use sp_blockchain::HeaderMetadata;
-use sp_runtime::generic::BlockId;
-use sp_runtime::traits::{
-	Block as BlockT, Header as HeaderT, NumberFor, Zero,
+use sp_consensus::SelectChain;
+use sp_finality_grandpa::{
+	AuthorityId, AuthoritySignature, Equivocation, EquivocationProof, GrandpaApi, RoundNumber,
+	SetId, GRANDPA_ENGINE_ID,
 };
-use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_DEBUG, CONSENSUS_INFO};
+use sp_runtime::generic::BlockId;
+use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor, Zero};
 
 use crate::{
-	local_authority_id, CommandOrError, Commit, Config, Error, NewAuthoritySet, Precommit, Prevote,
+	authorities::{AuthoritySet, SharedAuthoritySet},
+	communication::Network as NetworkT,
+	justification::GrandpaJustification,
+	local_authority_id,
+	notification::GrandpaJustificationSender,
+	until_imported::UntilVoteTargetImported,
+	voting_rule::VotingRule,
+	ClientForGrandpa, CommandOrError, Commit, Config, Error, NewAuthoritySet, Precommit, Prevote,
 	PrimaryPropose, SignedMessage, VoterCommand,
 };
 
-use sp_consensus::SelectChain;
-
-use crate::authorities::{AuthoritySet, SharedAuthoritySet};
-use crate::communication::Network as NetworkT;
-use crate::notification::GrandpaJustificationSender;
-use crate::justification::GrandpaJustification;
-use crate::until_imported::UntilVoteTargetImported;
-use crate::voting_rule::VotingRule;
-use sp_finality_grandpa::{
-	AuthorityId, AuthoritySignature, Equivocation, EquivocationProof, GRANDPA_ENGINE_ID,
-	GrandpaApi, RoundNumber, SetId,
-};
-use prometheus_endpoint::{register, Counter, Gauge, PrometheusError, U64};
-
 type HistoricalVotes<Block> = finality_grandpa::HistoricalVotes<
 	<Block as BlockT>::Hash,
 	NumberFor<Block>,
@@ -480,10 +479,10 @@ impl<BE, Block, C, N, SC, VR> Environment<BE, Block, C, N, SC, VR>
 where
 	Block: BlockT,
 	BE: Backend<Block>,
-	C: crate::ClientForGrandpa<Block, BE>,
+	C: ClientForGrandpa<Block, BE>,
 	C::Api: GrandpaApi<Block>,
 	N: NetworkT<Block>,
-	SC: SelectChain<Block> + 'static,
+	SC: SelectChain<Block>,
 {
 	/// Report the given equivocation to the GRANDPA runtime module. This method
 	/// generates a session membership proof of the offender and then submits an
@@ -578,24 +577,26 @@ where
 	}
 }
 
-impl<BE, Block: BlockT, C, N, SC, VR>
-	finality_grandpa::Chain<Block::Hash, NumberFor<Block>>
-for Environment<BE, Block, C, N, SC, VR>
+impl<BE, Block, C, N, SC, VR> finality_grandpa::Chain<Block::Hash, NumberFor<Block>>
+	for Environment<BE, Block, C, N, SC, VR>
 where
-	Block: 'static,
+	Block: BlockT,
 	BE: Backend<Block>,
-	C: crate::ClientForGrandpa<Block, BE>,
-	N: NetworkT<Block> + 'static + Send,
-	SC: SelectChain<Block> + 'static,
+	C: ClientForGrandpa<Block, BE>,
+	N: NetworkT<Block>,
+	SC: SelectChain<Block>,
 	VR: VotingRule<Block, C>,
 	NumberFor<Block>: BlockNumberOps,
 {
-	fn ancestry(&self, base: Block::Hash, block: Block::Hash) -> Result<Vec<Block::Hash>, GrandpaError> {
+	fn ancestry(
+		&self,
+		base: Block::Hash,
+		block: Block::Hash,
+	) -> Result<Vec<Block::Hash>, GrandpaError> {
 		ancestry(&self.client, base, block)
 	}
 }
 
-
 pub(crate) fn ancestry<Block: BlockT, Client>(
 	client: &Arc<Client>,
 	base: Block::Hash,
@@ -624,27 +625,31 @@ where
 
 	// skip one because our ancestry is meant to start from the parent of `block`,
 	// and `tree_route` includes it.
-	Ok(tree_route.retracted().iter().skip(1).map(|e| e.hash).collect())
+	Ok(tree_route
+		.retracted()
+		.iter()
+		.skip(1)
+		.map(|e| e.hash)
+		.collect())
 }
 
-impl<B, Block: BlockT, C, N, SC, VR> voter::Environment<Block::Hash, NumberFor<Block>>
+impl<B, Block, C, N, SC, VR> voter::Environment<Block::Hash, NumberFor<Block>>
 	for Environment<B, Block, C, N, SC, VR>
 where
-	Block: 'static,
+	Block: BlockT,
 	B: Backend<Block>,
-	C: crate::ClientForGrandpa<Block, B> + 'static,
+	C: ClientForGrandpa<Block, B> + 'static,
 	C::Api: GrandpaApi<Block>,
-	N: NetworkT<Block> + 'static + Send + Sync,
-	SC: SelectChain<Block> + 'static,
+	N: NetworkT<Block>,
+	SC: SelectChain<Block>,
 	VR: VotingRule<Block, C>,
 	NumberFor<Block>: BlockNumberOps,
 {
-	type Timer = Pin<Box<dyn Future<Output = Result<(), Self::Error>> + Send + Sync>>;
+	type Timer = Pin<Box<dyn Future<Output = Result<(), Self::Error>> + Send>>;
 	type BestChain = Pin<
 		Box<
 			dyn Future<Output = Result<Option<(Block::Hash, NumberFor<Block>)>, Self::Error>>
-				+ Send
-				+ Sync
+				+ Send,
 		>,
 	>;
 
@@ -652,13 +657,29 @@ where
 	type Signature = AuthoritySignature;
 
 	// regular round message streams
-	type In = Pin<Box<dyn Stream<
-		Item = Result<::finality_grandpa::SignedMessage<Block::Hash, NumberFor<Block>, Self::Signature, Self::Id>, Self::Error>
-	> + Send + Sync>>;
-	type Out = Pin<Box<dyn Sink<
-		::finality_grandpa::Message<Block::Hash, NumberFor<Block>>,
-		Error = Self::Error,
-	> + Send + Sync>>;
+	type In = Pin<
+		Box<
+			dyn Stream<
+					Item = Result<
+						::finality_grandpa::SignedMessage<
+							Block::Hash,
+							NumberFor<Block>,
+							Self::Signature,
+							Self::Id,
+						>,
+						Self::Error,
+					>,
+				> + Send,
+		>,
+	>;
+	type Out = Pin<
+		Box<
+			dyn Sink<
+					::finality_grandpa::Message<Block::Hash, NumberFor<Block>>,
+					Error = Self::Error,
+				> + Send,
+		>,
+	>;
 
 	type Error = CommandOrError<Block::Hash, NumberFor<Block>>;
 
@@ -1223,7 +1244,7 @@ pub(crate) fn finalize_block<BE, Block, Client>(
 where
 	Block: BlockT,
 	BE: Backend<Block>,
-	Client: crate::ClientForGrandpa<Block, BE>,
+	Client: ClientForGrandpa<Block, BE>,
 {
 	// NOTE: lock must be held through writing to DB to avoid race. this lock
 	//       also implicitly synchronizes the check for last finalized number
diff --git a/client/finality-grandpa/src/finality_proof.rs b/client/finality-grandpa/src/finality_proof.rs
index 6735d91ba8b7..ec33d48774ae 100644
--- a/client/finality-grandpa/src/finality_proof.rs
+++ b/client/finality-grandpa/src/finality_proof.rs
@@ -62,9 +62,10 @@ pub struct FinalityProofProvider<BE, Block: BlockT> {
 	shared_authority_set: Option<SharedAuthoritySet<Block::Hash, NumberFor<Block>>>,
 }
 
-impl<B, Block: BlockT> FinalityProofProvider<B, Block>
+impl<B, Block> FinalityProofProvider<B, Block>
 where
-	B: Backend<Block> + Send + Sync + 'static,
+	Block: BlockT,
+	B: Backend<Block>,
 {
 	/// Create new finality proof provider using:
 	///
@@ -97,7 +98,7 @@ where
 impl<B, Block> FinalityProofProvider<B, Block>
 where
 	Block: BlockT,
-	B: Backend<Block> + Send + Sync + 'static,
+	B: Backend<Block>,
 {
 	/// Prove finality for the given block number by returning a Justification for the last block of
 	/// the authority set.
diff --git a/client/finality-grandpa/src/import.rs b/client/finality-grandpa/src/import.rs
index 3d22cc886610..de02ea357cac 100644
--- a/client/finality-grandpa/src/import.rs
+++ b/client/finality-grandpa/src/import.rs
@@ -16,36 +16,33 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use std::{sync::Arc, collections::HashMap};
+use std::{collections::HashMap, marker::PhantomData, sync::Arc};
 
 use log::debug;
 use parity_scale_codec::Encode;
 
-use sp_blockchain::{BlockStatus, well_known_cache_keys};
 use sc_client_api::{backend::Backend, utils::is_descendent_of};
+use sc_consensus::shared_data::{SharedDataLocked, SharedDataLockedUpgradable};
 use sc_telemetry::TelemetryHandle;
-use sp_utils::mpsc::TracingUnboundedSender;
 use sp_api::TransactionFor;
-use sc_consensus::shared_data::{SharedDataLockedUpgradable, SharedDataLocked};
-
+use sp_blockchain::{well_known_cache_keys, BlockStatus};
 use sp_consensus::{
-	BlockImport, Error as ConsensusError,
-	BlockCheckParams, BlockImportParams, BlockOrigin, ImportResult, JustificationImport,
-	SelectChain,
+	BlockCheckParams, BlockImport, BlockImportParams, BlockOrigin, Error as ConsensusError,
+	ImportResult, JustificationImport, SelectChain,
 };
 use sp_finality_grandpa::{ConsensusLog, ScheduledChange, SetId, GRANDPA_ENGINE_ID};
-use sp_runtime::Justification;
 use sp_runtime::generic::{BlockId, OpaqueDigestItemId};
-use sp_runtime::traits::{
-	Block as BlockT, DigestFor, Header as HeaderT, NumberFor, Zero,
-};
+use sp_runtime::traits::{Block as BlockT, DigestFor, Header as HeaderT, NumberFor, Zero};
+use sp_runtime::Justification;
+use sp_utils::mpsc::TracingUnboundedSender;
 
-use crate::{Error, CommandOrError, NewAuthoritySet, VoterCommand};
-use crate::authorities::{AuthoritySet, SharedAuthoritySet, DelayKind, PendingChange};
-use crate::environment::finalize_block;
-use crate::justification::GrandpaJustification;
-use crate::notification::GrandpaJustificationSender;
-use std::marker::PhantomData;
+use crate::{
+	authorities::{AuthoritySet, DelayKind, PendingChange, SharedAuthoritySet},
+	environment::finalize_block,
+	justification::GrandpaJustification,
+	notification::GrandpaJustificationSender,
+	ClientForGrandpa, CommandOrError, Error, NewAuthoritySet, VoterCommand,
+};
 
 /// A block-import handler for GRANDPA.
 ///
@@ -67,8 +64,8 @@ pub struct GrandpaBlockImport<Backend, Block: BlockT, Client, SC> {
 	_phantom: PhantomData<Backend>,
 }
 
-impl<Backend, Block: BlockT, Client, SC: Clone> Clone for
-	GrandpaBlockImport<Backend, Block, Client, SC>
+impl<Backend, Block: BlockT, Client, SC: Clone> Clone
+	for GrandpaBlockImport<Backend, Block, Client, SC>
 {
 	fn clone(&self) -> Self {
 		GrandpaBlockImport {
@@ -85,12 +82,13 @@ impl<Backend, Block: BlockT, Client, SC: Clone> Clone for
 }
 
 impl<BE, Block: BlockT, Client, SC> JustificationImport<Block>
-	for GrandpaBlockImport<BE, Block, Client, SC> where
-		NumberFor<Block>: finality_grandpa::BlockNumberOps,
-		DigestFor<Block>: Encode,
-		BE: Backend<Block>,
-		Client: crate::ClientForGrandpa<Block, BE>,
-		SC: SelectChain<Block>,
+	for GrandpaBlockImport<BE, Block, Client, SC>
+where
+	NumberFor<Block>: finality_grandpa::BlockNumberOps,
+	DigestFor<Block>: Encode,
+	BE: Backend<Block>,
+	Client: ClientForGrandpa<Block, BE>,
+	SC: SelectChain<Block>,
 {
 	type Error = ConsensusError;
 
@@ -219,13 +217,12 @@ pub fn find_forced_change<B: BlockT>(
 	header.digest().convert_first(|l| l.try_to(id).and_then(filter_log))
 }
 
-impl<BE, Block: BlockT, Client, SC>
-	GrandpaBlockImport<BE, Block, Client, SC>
+impl<BE, Block: BlockT, Client, SC> GrandpaBlockImport<BE, Block, Client, SC>
 where
 	NumberFor<Block>: finality_grandpa::BlockNumberOps,
 	DigestFor<Block>: Encode,
 	BE: Backend<Block>,
-	Client: crate::ClientForGrandpa<Block, BE>,
+	Client: ClientForGrandpa<Block, BE>,
 {
 	// check for a new authority set change.
 	fn check_new_change(
@@ -416,21 +413,25 @@ where
 
 		let just_in_case = just_in_case.map(|(o, i)| (o, i.release_mutex()));
 
-		Ok(PendingSetChanges { just_in_case, applied_changes, do_pause })
+		Ok(PendingSetChanges {
+			just_in_case,
+			applied_changes,
+			do_pause,
+		})
 	}
 }
 
 #[async_trait::async_trait]
-impl<BE, Block: BlockT, Client, SC> BlockImport<Block>
-	for GrandpaBlockImport<BE, Block, Client, SC> where
-		NumberFor<Block>: finality_grandpa::BlockNumberOps,
-		DigestFor<Block>: Encode,
-		BE: Backend<Block>,
-		Client: crate::ClientForGrandpa<Block, BE>,
-		for<'a> &'a Client:
-			BlockImport<Block, Error = ConsensusError, Transaction = TransactionFor<Client, Block>>,
-		TransactionFor<Client, Block>: Send + 'static,
-		SC: Send,
+impl<BE, Block: BlockT, Client, SC> BlockImport<Block> for GrandpaBlockImport<BE, Block, Client, SC>
+where
+	NumberFor<Block>: finality_grandpa::BlockNumberOps,
+	DigestFor<Block>: Encode,
+	BE: Backend<Block>,
+	Client: ClientForGrandpa<Block, BE>,
+	for<'a> &'a Client:
+		BlockImport<Block, Error = ConsensusError, Transaction = TransactionFor<Client, Block>>,
+	TransactionFor<Client, Block>: 'static,
+	SC: Send,
 {
 	type Error = ConsensusError;
 	type Transaction = TransactionFor<Client, Block>;
@@ -630,7 +631,7 @@ impl<Backend, Block: BlockT, Client, SC> GrandpaBlockImport<Backend, Block, Clie
 impl<BE, Block: BlockT, Client, SC> GrandpaBlockImport<BE, Block, Client, SC>
 where
 	BE: Backend<Block>,
-	Client: crate::ClientForGrandpa<Block, BE>,
+	Client: ClientForGrandpa<Block, BE>,
 	NumberFor<Block>: finality_grandpa::BlockNumberOps,
 {
 	/// Import a block justification and finalize the block.
diff --git a/client/finality-grandpa/src/lib.rs b/client/finality-grandpa/src/lib.rs
index f249d3982cf2..a133319fdbef 100644
--- a/client/finality-grandpa/src/lib.rs
+++ b/client/finality-grandpa/src/lib.rs
@@ -627,13 +627,17 @@ fn global_communication<BE, Block: BlockT, C, N>(
 	metrics: Option<until_imported::Metrics>,
 ) -> (
 	impl Stream<
-		Item = Result<CommunicationInH<Block, Block::Hash>, CommandOrError<Block::Hash, NumberFor<Block>>>,
+		Item = Result<
+			CommunicationInH<Block, Block::Hash>,
+			CommandOrError<Block::Hash, NumberFor<Block>>,
+		>,
 	>,
 	impl Sink<
 		CommunicationOutH<Block, Block::Hash>,
 		Error = CommandOrError<Block::Hash, NumberFor<Block>>,
-	> + Unpin,
-) where
+	>,
+)
+where
 	BE: Backend<Block> + 'static,
 	C: ClientForGrandpa<Block, BE> + 'static,
 	N: NetworkT<Block>,
@@ -707,11 +711,11 @@ pub fn grandpa_peers_set_config() -> sc_network::config::NonDefaultSetConfig {
 /// block import worker that has already been instantiated with `block_import`.
 pub fn run_grandpa_voter<Block: BlockT, BE: 'static, C, N, SC, VR>(
 	grandpa_params: GrandpaParams<Block, C, N, SC, VR>,
-) -> sp_blockchain::Result<impl Future<Output = ()> + Unpin + Send + 'static>
+) -> sp_blockchain::Result<impl Future<Output = ()> + Send>
 where
 	Block::Hash: Ord,
 	BE: Backend<Block> + 'static,
-	N: NetworkT<Block> + Send + Sync + Clone + 'static,
+	N: NetworkT<Block> + Sync + 'static,
 	SC: SelectChain<Block> + 'static,
 	VR: VotingRule<Block, C> + Clone + 'static,
 	NumberFor<Block>: BlockNumberOps,
diff --git a/client/finality-grandpa/src/observer.rs b/client/finality-grandpa/src/observer.rs
index 5434cd08a91d..23c4f873a10b 100644
--- a/client/finality-grandpa/src/observer.rs
+++ b/client/finality-grandpa/src/observer.rs
@@ -16,33 +16,33 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+use std::marker::{PhantomData, Unpin};
 use std::pin::Pin;
 use std::sync::Arc;
 use std::task::{Context, Poll};
 
+use finality_grandpa::{voter, voter_set::VoterSet, BlockNumberOps, Error as GrandpaError};
 use futures::prelude::*;
-
-use finality_grandpa::{
-	BlockNumberOps, Error as GrandpaError, voter, voter_set::VoterSet
-};
 use log::{debug, info, warn};
-use sp_keystore::SyncCryptoStorePtr;
-use sp_consensus::SelectChain;
+
 use sc_client_api::backend::Backend;
 use sc_telemetry::TelemetryHandle;
-use sp_utils::mpsc::TracingUnboundedReceiver;
-use sp_runtime::traits::{NumberFor, Block as BlockT};
 use sp_blockchain::HeaderMetadata;
+use sp_consensus::SelectChain;
+use sp_finality_grandpa::AuthorityId;
+use sp_keystore::SyncCryptoStorePtr;
+use sp_runtime::traits::{Block as BlockT, NumberFor};
+use sp_utils::mpsc::TracingUnboundedReceiver;
 
 use crate::{
-	global_communication, CommandOrError, CommunicationIn, Config, environment,
-	LinkHalf, Error, aux_schema::PersistentData, VoterCommand, VoterSetState,
+	authorities::SharedAuthoritySet,
+	aux_schema::PersistentData,
+	communication::{Network as NetworkT, NetworkBridge},
+	environment, global_communication,
+	notification::GrandpaJustificationSender,
+	ClientForGrandpa, CommandOrError, CommunicationIn, Config, Error, LinkHalf, VoterCommand,
+	VoterSetState,
 };
-use crate::authorities::SharedAuthoritySet;
-use crate::communication::{Network as NetworkT, NetworkBridge};
-use crate::notification::GrandpaJustificationSender;
-use sp_finality_grandpa::AuthorityId;
-use std::marker::{PhantomData, Unpin};
 
 struct ObserverChain<'a, Block: BlockT, Client> {
 	client: &'a Arc<Client>,
@@ -50,12 +50,17 @@ struct ObserverChain<'a, Block: BlockT, Client> {
 }
 
 impl<'a, Block, Client> finality_grandpa::Chain<Block::Hash, NumberFor<Block>>
-	for ObserverChain<'a, Block, Client> where
-		Block: BlockT,
-		Client: HeaderMetadata<Block, Error = sp_blockchain::Error>,
-		NumberFor<Block>: BlockNumberOps,
+	for ObserverChain<'a, Block, Client>
+where
+	Block: BlockT,
+	Client: HeaderMetadata<Block, Error = sp_blockchain::Error>,
+	NumberFor<Block>: BlockNumberOps,
 {
-	fn ancestry(&self, base: Block::Hash, block: Block::Hash) -> Result<Vec<Block::Hash>, GrandpaError> {
+	fn ancestry(
+		&self,
+		base: Block::Hash,
+		block: Block::Hash,
+	) -> Result<Vec<Block::Hash>, GrandpaError> {
 		environment::ancestry(&self.client, base, block)
 	}
 }
@@ -75,7 +80,7 @@ where
 	S: Stream<Item = Result<CommunicationIn<Block>, CommandOrError<Block::Hash, NumberFor<Block>>>>,
 	F: Fn(u64),
 	BE: Backend<Block>,
-	Client: crate::ClientForGrandpa<Block, BE>,
+	Client: ClientForGrandpa<Block, BE>,
 {
 	let authority_set = authority_set.clone();
 	let client = client.clone();
@@ -160,13 +165,13 @@ pub fn run_grandpa_observer<BE, Block: BlockT, Client, N, SC>(
 	config: Config,
 	link: LinkHalf<Block, Client, SC>,
 	network: N,
-) -> sp_blockchain::Result<impl Future<Output = ()> + Unpin + Send + 'static>
+) -> sp_blockchain::Result<impl Future<Output = ()> + Send>
 where
 	BE: Backend<Block> + Unpin + 'static,
-	N: NetworkT<Block> + Send + Clone + 'static,
-	SC: SelectChain<Block> + 'static,
+	N: NetworkT<Block>,
+	SC: SelectChain<Block>,
 	NumberFor<Block>: BlockNumberOps,
-	Client: crate::ClientForGrandpa<Block, BE> + 'static,
+	Client: ClientForGrandpa<Block, BE> + 'static,
 {
 	let LinkHalf {
 		client,
@@ -223,7 +228,7 @@ impl<B, BE, Client, Network> ObserverWork<B, BE, Client, Network>
 where
 	B: BlockT,
 	BE: Backend<B> + 'static,
-	Client: crate::ClientForGrandpa<B, BE> + 'static,
+	Client: ClientForGrandpa<B, BE> + 'static,
 	Network: NetworkT<B>,
 	NumberFor<B>: BlockNumberOps,
 {
@@ -236,7 +241,6 @@ where
 		justification_sender: Option<GrandpaJustificationSender<B>>,
 		telemetry: Option<TelemetryHandle>,
 	) -> Self {
-
 		let mut work = ObserverWork {
 			// `observer` is set to a temporary value and replaced below when
 			// calling `rebuild_observer`.
@@ -344,7 +348,7 @@ impl<B, BE, C, N> Future for ObserverWork<B, BE, C, N>
 where
 	B: BlockT,
 	BE: Backend<B> + Unpin + 'static,
-	C: crate::ClientForGrandpa<B, BE> + 'static,
+	C: ClientForGrandpa<B, BE> + 'static,
 	N: NetworkT<B>,
 	NumberFor<B>: BlockNumberOps,
 {
diff --git a/client/finality-grandpa/src/tests.rs b/client/finality-grandpa/src/tests.rs
index 475c11191b10..725beec6a94b 100644
--- a/client/finality-grandpa/src/tests.rs
+++ b/client/finality-grandpa/src/tests.rs
@@ -1013,7 +1013,7 @@ fn voter_persists_its_votes() {
 	fn alice_voter2(
 		peers: &[Ed25519Keyring],
 		net: Arc<Mutex<GrandpaTestNet>>,
-	) -> impl Future<Output = ()> + Unpin + Send + 'static {
+	) -> impl Future<Output = ()> + Send {
 		let (keystore, _) = create_keystore(peers[0]);
 		let mut net = net.lock();
 
diff --git a/client/finality-grandpa/src/until_imported.rs b/client/finality-grandpa/src/until_imported.rs
index d2e896685658..7cfd9e6074c4 100644
--- a/client/finality-grandpa/src/until_imported.rs
+++ b/client/finality-grandpa/src/until_imported.rs
@@ -136,12 +136,14 @@ impl Drop for Metrics {
 	fn drop(&mut self) {
 		// Reduce the global counter by the amount of messages that were still left in the dropped
 		// queue.
-		self.global_waiting_messages.sub(self.local_waiting_messages)
+		self.global_waiting_messages
+			.sub(self.local_waiting_messages)
 	}
 }
 
 /// Buffering incoming messages until blocks with given hashes are imported.
-pub(crate) struct UntilImported<Block, BlockStatus, BlockSyncRequester, I, M> where
+pub(crate) struct UntilImported<Block, BlockStatus, BlockSyncRequester, I, M>
+where
 	Block: BlockT,
 	I: Stream<Item = M::Blocked> + Unpin,
 	M: BlockUntilImported<Block>,
@@ -152,7 +154,7 @@ pub(crate) struct UntilImported<Block, BlockStatus, BlockSyncRequester, I, M> wh
 	incoming_messages: Fuse<I>,
 	ready: VecDeque<M::Blocked>,
 	/// Interval at which to check status of each awaited block.
-	check_pending: Pin<Box<dyn Stream<Item = Result<(), std::io::Error>> + Send + Sync>>,
+	check_pending: Pin<Box<dyn Stream<Item = Result<(), std::io::Error>> + Send>>,
 	/// Mapping block hashes to their block number, the point in time it was
 	/// first encountered (Instant) and a list of GRANDPA messages referencing
 	/// the block hash.
@@ -164,13 +166,18 @@ pub(crate) struct UntilImported<Block, BlockStatus, BlockSyncRequester, I, M> wh
 	metrics: Option<Metrics>,
 }
 
-impl<Block, BlockStatus, BlockSyncRequester, I, M> Unpin for UntilImported<Block, BlockStatus, BlockSyncRequester, I, M > where
+impl<Block, BlockStatus, BlockSyncRequester, I, M> Unpin
+	for UntilImported<Block, BlockStatus, BlockSyncRequester, I, M>
+where
 	Block: BlockT,
 	I: Stream<Item = M::Blocked> + Unpin,
 	M: BlockUntilImported<Block>,
-{}
+{
+}
 
-impl<Block, BlockStatus, BlockSyncRequester, I, M> UntilImported<Block, BlockStatus, BlockSyncRequester, I, M> where
+impl<Block, BlockStatus, BlockSyncRequester, I, M>
+	UntilImported<Block, BlockStatus, BlockSyncRequester, I, M>
+where
 	Block: BlockT,
 	BlockStatus: BlockStatusT<Block>,
 	BlockSyncRequester: BlockSyncRequesterT<Block>,
diff --git a/client/finality-grandpa/src/voting_rule.rs b/client/finality-grandpa/src/voting_rule.rs
index 3ede7649a138..a5515c1be23e 100644
--- a/client/finality-grandpa/src/voting_rule.rs
+++ b/client/finality-grandpa/src/voting_rule.rs
@@ -34,10 +34,11 @@ use sp_runtime::traits::{Block as BlockT, Header, NumberFor, One, Zero};
 
 /// A future returned by a `VotingRule` to restrict a given vote, if any restriction is necessary.
 pub type VotingRuleResult<Block> =
-	Pin<Box<dyn Future<Output = Option<(<Block as BlockT>::Hash, NumberFor<Block>)>> + Send + Sync>>;
+	Pin<Box<dyn Future<Output = Option<(<Block as BlockT>::Hash, NumberFor<Block>)>> + Send>>;
 
 /// A trait for custom voting rules in GRANDPA.
-pub trait VotingRule<Block, B>: DynClone + Send + Sync where
+pub trait VotingRule<Block, B>: DynClone + Send + Sync
+where
 	Block: BlockT,
 	B: HeaderBackend<Block>,
 {
diff --git a/frame/grandpa/Cargo.toml b/frame/grandpa/Cargo.toml
index c6cfa96f7da1..5c3cac8f8218 100644
--- a/frame/grandpa/Cargo.toml
+++ b/frame/grandpa/Cargo.toml
@@ -31,7 +31,7 @@ log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
 frame-benchmarking = { version = "3.1.0", path = "../benchmarking" }
-grandpa = { package = "finality-grandpa", version = "0.14.0", features = ["derive-codec"] }
+grandpa = { package = "finality-grandpa", version = "0.14.1", features = ["derive-codec"] }
 sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
 pallet-balances = { version = "3.0.0", path = "../balances" }
 pallet-offences = { version = "3.0.0", path = "../offences" }
diff --git a/primitives/finality-grandpa/Cargo.toml b/primitives/finality-grandpa/Cargo.toml
index 95aa65c930f7..ec9e89105d58 100644
--- a/primitives/finality-grandpa/Cargo.toml
+++ b/primitives/finality-grandpa/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-grandpa = { package = "finality-grandpa", version = "0.14.0", default-features = false, features = ["derive-codec"] }
+grandpa = { package = "finality-grandpa", version = "0.14.1", default-features = false, features = ["derive-codec"] }
 log = { version = "0.4.8", optional = true }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 sp-api = { version = "3.0.0", default-features = false, path = "../api" }

From 63a0d0bcf4cb0327dd78ed39d71b770bfc1dfc8a Mon Sep 17 00:00:00 2001
From: Shaun Wang <spxwang@gmail.com>
Date: Thu, 17 Jun 2021 02:17:57 +1200
Subject: [PATCH 0890/1194] Migrate pallet-elections to pallet attribute macro
 (#9088)

* Migrate elections pallet to pallet attribute macro.

* Metadata fix.

* Update frame/elections/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
---
 frame/elections/src/lib.rs  | 545 ++++++++++++++++++++----------------
 frame/elections/src/mock.rs |   4 +-
 2 files changed, 313 insertions(+), 236 deletions(-)

diff --git a/frame/elections/src/lib.rs b/frame/elections/src/lib.rs
index 46ec62bf7517..b53671393562 100644
--- a/frame/elections/src/lib.rs
+++ b/frame/elections/src/lib.rs
@@ -22,7 +22,7 @@
 //!
 //! ---
 //!
-//! Election module for stake-weighted membership selection of a collective.
+//! Election pallet for stake-weighted membership selection of a collective.
 //!
 //! The composition of a set of account IDs works according to one or more approval votes
 //! weighted by stake. There is a partial carry-over facility to give greater weight to those
@@ -33,19 +33,20 @@
 
 use sp_std::prelude::*;
 use sp_runtime::{
-	RuntimeDebug, DispatchResult, print,
+	RuntimeDebug, print,
 	traits::{Zero, One, StaticLookup, Saturating},
 };
 use frame_support::{
-	decl_storage, decl_event, ensure, decl_module, decl_error,
+	pallet_prelude::*, ensure,
 	weights::{Weight, DispatchClass},
 	traits::{
-		Currency, ExistenceRequirement, Get, LockableCurrency, LockIdentifier, BalanceStatus,
+		Currency, ExistenceRequirement, LockableCurrency, LockIdentifier, BalanceStatus,
 		OnUnbalanced, ReservableCurrency, WithdrawReasons, ChangeMembers,
 	}
 };
 use codec::{Encode, Decode};
-use frame_system::{ensure_signed, ensure_root};
+use frame_system::pallet_prelude::*;
+pub use pallet::*;
 
 mod mock;
 mod tests;
@@ -152,141 +153,250 @@ type ApprovalFlag = u32;
 /// Number of approval flags that can fit into [`ApprovalFlag`] type.
 const APPROVAL_FLAG_LEN: usize = 32;
 
-pub trait Config: frame_system::Config {
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
+#[frame_support::pallet]
+pub mod pallet {
+	use super::*;
 
-	/// Identifier for the elections pallet's lock
-	type PalletId: Get<LockIdentifier>;
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(_);
 
-	/// The currency that people are electing with.
-	type Currency:
-		LockableCurrency<Self::AccountId, Moment=Self::BlockNumber>
-		+ ReservableCurrency<Self::AccountId>;
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
 
-	/// Handler for the unbalanced reduction when slashing a validator.
-	type BadPresentation: OnUnbalanced<NegativeImbalanceOf<Self>>;
+		/// Identifier for the elections pallet's lock
+		#[pallet::constant]
+		type PalletId: Get<LockIdentifier>;
 
-	/// Handler for the unbalanced reduction when slashing an invalid reaping attempt.
-	type BadReaper: OnUnbalanced<NegativeImbalanceOf<Self>>;
+		/// The currency that people are electing with.
+		type Currency:
+			LockableCurrency<Self::AccountId, Moment=Self::BlockNumber>
+			+ ReservableCurrency<Self::AccountId>;
 
-	/// Handler for the unbalanced reduction when submitting a bad `voter_index`.
-	type BadVoterIndex: OnUnbalanced<NegativeImbalanceOf<Self>>;
+		/// Handler for the unbalanced reduction when slashing a validator.
+		type BadPresentation: OnUnbalanced<NegativeImbalanceOf<Self>>;
 
-	/// Handler for the unbalanced reduction when a candidate has lost (and is not a runner up)
-	type LoserCandidate: OnUnbalanced<NegativeImbalanceOf<Self>>;
+		/// Handler for the unbalanced reduction when slashing an invalid reaping attempt.
+		type BadReaper: OnUnbalanced<NegativeImbalanceOf<Self>>;
 
-	/// What to do when the members change.
-	type ChangeMembers: ChangeMembers<Self::AccountId>;
+		/// Handler for the unbalanced reduction when submitting a bad `voter_index`.
+		type BadVoterIndex: OnUnbalanced<NegativeImbalanceOf<Self>>;
 
-	/// How much should be locked up in order to submit one's candidacy. A reasonable
-	/// default value is 9.
-	type CandidacyBond: Get<BalanceOf<Self>>;
+		/// Handler for the unbalanced reduction when a candidate has lost (and is not a runner up)
+		type LoserCandidate: OnUnbalanced<NegativeImbalanceOf<Self>>;
 
-	/// How much should be locked up in order to be able to submit votes.
-	type VotingBond: Get<BalanceOf<Self>>;
+		/// What to do when the members change.
+		type ChangeMembers: ChangeMembers<Self::AccountId>;
 
-	/// The amount of fee paid upon each vote submission, unless if they submit a
-	/// _hole_ index and replace it.
-	type VotingFee: Get<BalanceOf<Self>>;
+		/// How much should be locked up in order to submit one's candidacy. A reasonable
+		/// default value is 9.
+		#[pallet::constant]
+		type CandidacyBond: Get<BalanceOf<Self>>;
 
-	/// Minimum about that can be used as the locked value for voting.
-	type MinimumVotingLock: Get<BalanceOf<Self>>;
+		/// How much should be locked up in order to be able to submit votes.
+		#[pallet::constant]
+		type VotingBond: Get<BalanceOf<Self>>;
 
-	/// The punishment, per voter, if you provide an invalid presentation. A
-	/// reasonable default value is 1.
-	type PresentSlashPerVoter: Get<BalanceOf<Self>>;
+		/// The amount of fee paid upon each vote submission, unless if they submit a
+		/// _hole_ index and replace it.
+		#[pallet::constant]
+		type VotingFee: Get<BalanceOf<Self>>;
 
-	/// How many runners-up should have their approvals persist until the next
-	/// vote. A reasonable default value is 2.
-	type CarryCount: Get<u32>;
+		/// Minimum about that can be used as the locked value for voting.
+		#[pallet::constant]
+		type MinimumVotingLock: Get<BalanceOf<Self>>;
 
-	/// How many vote indices need to go by after a target voter's last vote before
-	/// they can be reaped if their approvals are moot. A reasonable default value
-	/// is 1.
-	type InactiveGracePeriod: Get<VoteIndex>;
+		/// The punishment, per voter, if you provide an invalid presentation. A
+		/// reasonable default value is 1.
+		#[pallet::constant]
+		type PresentSlashPerVoter: Get<BalanceOf<Self>>;
 
-	/// How often (in blocks) to check for new votes. A reasonable default value
-	/// is 1000.
-	type VotingPeriod: Get<Self::BlockNumber>;
+		/// How many runners-up should have their approvals persist until the next
+		/// vote. A reasonable default value is 2.
+		#[pallet::constant]
+		type CarryCount: Get<u32>;
 
-	/// Decay factor of weight when being accumulated. It should typically be set to
-	/// __at least__ `membership_size -1` to keep the collective secure.
-	/// When set to `N`, it indicates `(1/N)^t` of staked is decayed at weight
-	/// increment step `t`. 0 will result in no weight being added at all (normal
-	/// approval voting). A reasonable default value is 24.
-	type DecayRatio: Get<u32>;
-}
+		/// How many vote indices need to go by after a target voter's last vote before
+		/// they can be reaped if their approvals are moot. A reasonable default value
+		/// is 1.
+		#[pallet::constant]
+		type InactiveGracePeriod: Get<VoteIndex>;
 
-decl_storage! {
-	trait Store for Module<T: Config> as Elections {
-		// ---- parameters
-
-		/// How long to give each top candidate to present themselves after the vote ends.
-		pub PresentationDuration get(fn presentation_duration) config(): T::BlockNumber;
-		/// How long each position is active for.
-		pub TermDuration get(fn term_duration) config(): T::BlockNumber;
-		/// Number of accounts that should constitute the collective.
-		pub DesiredSeats get(fn desired_seats) config(): u32;
-
-		// ---- permanent state (always relevant, changes only at the finalization of voting)
-
-		///  The current membership. When there's a vote going on, this should still be used for
-		///  executive matters. The block number (second element in the tuple) is the block that
-		///  their position is active until (calculated by the sum of the block number when the
-		///  member was elected and their term duration).
-		pub Members get(fn members) config(): Vec<(T::AccountId, T::BlockNumber)>;
-		/// The total number of vote rounds that have happened or are in progress.
-		pub VoteCount get(fn vote_index): VoteIndex;
-
-		// ---- persistent state (always relevant, changes constantly)
-
-		// A list of votes for each voter. The votes are stored as numeric values and parsed in a
-		// bit-wise manner. In order to get a human-readable representation (`Vec<bool>`), use
-		// [`all_approvals_of`]. Furthermore, each vector of scalars is chunked with the cap of
-		// `APPROVAL_SET_SIZE`.
-		///
-		/// TWOX-NOTE: SAFE as `AccountId` is a crypto hash and `SetIndex` is not
-		/// attacker-controlled.
-		pub ApprovalsOf get(fn approvals_of):
-			map hasher(twox_64_concat) (T::AccountId, SetIndex) => Vec<ApprovalFlag>;
-		/// The vote index and list slot that the candidate `who` was registered or `None` if they
-		/// are not currently registered.
-		///
-		/// TWOX-NOTE: SAFE as `AccountId` is a crypto hash.
-		pub RegisterInfoOf get(fn candidate_reg_info):
-			map hasher(twox_64_concat) T::AccountId => Option<(VoteIndex, u32)>;
-		/// Basic information about a voter.
-		///
-		/// TWOX-NOTE: SAFE as `AccountId` is a crypto hash.
-		pub VoterInfoOf get(fn voter_info):
-			map hasher(twox_64_concat) T::AccountId => Option<VoterInfo<BalanceOf<T>>>;
-		/// The present voter list (chunked and capped at [`VOTER_SET_SIZE`]).
-		///
-		/// TWOX-NOTE: OKAY ― `SetIndex` is not user-controlled data.
-		pub Voters get(fn voters): map hasher(twox_64_concat) SetIndex => Vec<Option<T::AccountId>>;
-		/// the next free set to store a voter in. This will keep growing.
-		pub NextVoterSet get(fn next_nonfull_voter_set): SetIndex = 0;
-		/// Current number of Voters.
-		pub VoterCount get(fn voter_count): SetIndex = 0;
-		/// The present candidate list.
-		pub Candidates get(fn candidates): Vec<T::AccountId>; // has holes
-		/// Current number of active candidates
-		pub CandidateCount get(fn candidate_count): u32;
-
-		// ---- temporary state (only relevant during finalization/presentation)
-
-		/// The accounts holding the seats that will become free on the next tally.
-		pub NextFinalize get(fn next_finalize): Option<(T::BlockNumber, u32, Vec<T::AccountId>)>;
-		/// Get the leaderboard if we're in the presentation phase. The first element is the weight
-		/// of each entry; It may be the direct summed approval stakes, or a weighted version of it.
-		/// Sorted from low to high.
-		pub Leaderboard get(fn leaderboard): Option<Vec<(BalanceOf<T>, T::AccountId)> >;
+		/// How often (in blocks) to check for new votes. A reasonable default value
+		/// is 1000.
+		#[pallet::constant]
+		type VotingPeriod: Get<Self::BlockNumber>;
+
+		/// Decay factor of weight when being accumulated. It should typically be set to
+		/// __at least__ `membership_size -1` to keep the collective secure.
+		/// When set to `N`, it indicates `(1/N)^t` of staked is decayed at weight
+		/// increment step `t`. 0 will result in no weight being added at all (normal
+		/// approval voting). A reasonable default value is 24.
+		#[pallet::constant]
+		type DecayRatio: Get<u32>;
 	}
-}
 
-decl_error! {
-	/// Error for the elections module.
-	pub enum Error for Module<T: Config> {
+	#[pallet::extra_constants]
+	impl<T: Config> Pallet<T> {
+		//TODO: rename to snake case after https://github.com/paritytech/substrate/issues/8826 fixed.
+		/// The chunk size of the voter vector.
+		#[allow(non_snake_case)]
+		fn VOTER_SET_SIZE() -> u32 {
+			VOTER_SET_SIZE as u32
+		}
+
+		//TODO: rename to snake case after https://github.com/paritytech/substrate/issues/8826 fixed.
+		/// The chunk size of the approval vector.
+		#[allow(non_snake_case)]
+		fn APPROVAL_SET_SIZE() -> u32 {
+			APPROVAL_SET_SIZE as u32
+		}
+	}
+
+	// ---- permanent state (always relevant, changes only at the finalization of voting)
+
+	/// How long to give each top candidate to present themselves after the vote ends.
+	#[pallet::storage]
+	#[pallet::getter(fn presentation_duration)]
+	pub type PresentationDuration<T: Config> = StorageValue<_, T::BlockNumber, ValueQuery>;
+
+	/// How long each position is active for.
+	#[pallet::storage]
+	#[pallet::getter(fn term_duration)]
+	pub type TermDuration<T: Config> = StorageValue<_, T::BlockNumber, ValueQuery>;
+
+	/// Number of accounts that should constitute the collective.
+	#[pallet::storage]
+	#[pallet::getter(fn desired_seats)]
+	pub type DesiredSeats<T> = StorageValue<_, u32, ValueQuery>;
+
+	// ---- permanent state (always relevant, changes only at the finalization of voting)
+
+	///  The current membership. When there's a vote going on, this should still be used for
+	///  executive matters. The block number (second element in the tuple) is the block that
+	///  their position is active until (calculated by the sum of the block number when the
+	///  member was elected and their term duration).
+	#[pallet::storage]
+	#[pallet::getter(fn members)]
+	pub type Members<T: Config> = StorageValue<_, Vec<(T::AccountId, T::BlockNumber)>, ValueQuery>;
+
+	/// The total number of vote rounds that have happened or are in progress.
+	#[pallet::storage]
+	#[pallet::getter(fn vote_index)]
+	pub type VoteCount<T> = StorageValue<_, VoteIndex, ValueQuery>;
+
+	// ---- persistent state (always relevant, changes constantly)
+
+	// A list of votes for each voter. The votes are stored as numeric values and parsed in a
+	// bit-wise manner. In order to get a human-readable representation (`Vec<bool>`), use
+	// [`all_approvals_of`]. Furthermore, each vector of scalars is chunked with the cap of
+	// `APPROVAL_SET_SIZE`.
+	///
+	/// TWOX-NOTE: SAFE as `AccountId` is a crypto hash and `SetIndex` is not
+	/// attacker-controlled.
+	#[pallet::storage]
+	#[pallet::getter(fn approvals_of)]
+	pub type ApprovalsOf<T: Config> = StorageMap<
+		_,
+		Twox64Concat, (T::AccountId, SetIndex),
+		Vec<ApprovalFlag>,
+		ValueQuery,
+	>;
+
+	/// The vote index and list slot that the candidate `who` was registered or `None` if they
+	/// are not currently registered.
+	///
+	/// TWOX-NOTE: SAFE as `AccountId` is a crypto hash.
+	#[pallet::storage]
+	#[pallet::getter(fn candidate_reg_info)]
+	pub type RegisterInfoOf<T: Config> = StorageMap<_, Twox64Concat, T::AccountId, (VoteIndex, u32)>;
+
+	/// Basic information about a voter.
+	///
+	/// TWOX-NOTE: SAFE as `AccountId` is a crypto hash.
+	#[pallet::storage]
+	#[pallet::getter(fn voter_info)]
+	pub type VoterInfoOf<T: Config> = StorageMap<_, Twox64Concat, T::AccountId, VoterInfo<BalanceOf<T>>>;
+
+	/// The present voter list (chunked and capped at [`VOTER_SET_SIZE`]).
+	///
+	/// TWOX-NOTE: OKAY ― `SetIndex` is not user-controlled data.
+	#[pallet::storage]
+	#[pallet::getter(fn voters)]
+	pub type Voters<T: Config> = StorageMap<
+		_,
+		Twox64Concat, SetIndex,
+		Vec<Option<T::AccountId>>,
+		ValueQuery,
+	>;
+
+	/// the next free set to store a voter in. This will keep growing.
+	#[pallet::storage]
+	#[pallet::getter(fn next_nonfull_voter_set)]
+	pub type NextVoterSet<T> = StorageValue<_, SetIndex, ValueQuery>;
+
+	/// Current number of Voters.
+	#[pallet::storage]
+	#[pallet::getter(fn voter_count)]
+	pub type VoterCount<T> = StorageValue<_, SetIndex, ValueQuery>;
+
+	/// The present candidate list.
+	#[pallet::storage]
+	#[pallet::getter(fn candidates)]
+	pub type Candidates<T: Config> = StorageValue<_, Vec<T::AccountId>, ValueQuery>; // has holes
+
+	/// Current number of active candidates
+	#[pallet::storage]
+	#[pallet::getter(fn candidate_count)]
+	pub type CandidateCount<T> = StorageValue<_, u32, ValueQuery>;
+
+	// ---- temporary state (only relevant during finalization/presentation)
+
+	/// The accounts holding the seats that will become free on the next tally.
+	#[pallet::storage]
+	#[pallet::getter(fn next_finalize)]
+	pub type NextFinalize<T: Config> = StorageValue<_, (T::BlockNumber, u32, Vec<T::AccountId>)>;
+
+	/// Get the leaderboard if we're in the presentation phase. The first element is the weight
+	/// of each entry; It may be the direct summed approval stakes, or a weighted version of it.
+	/// Sorted from low to high.
+	#[pallet::storage]
+	#[pallet::getter(fn leaderboard)]
+	pub type Leaderboard<T: Config> = StorageValue<_, Vec<(BalanceOf<T>, T::AccountId)>>;
+
+	#[pallet::genesis_config]
+	pub struct GenesisConfig<T: Config> {
+		pub presentation_duration: T::BlockNumber,
+		pub term_duration: T::BlockNumber,
+		pub desired_seats: u32,
+		pub members: Vec<(T::AccountId, T::BlockNumber)>,
+	}
+
+	#[cfg(feature = "std")]
+	impl<T: Config> Default for GenesisConfig<T> {
+		fn default() -> Self {
+			GenesisConfig {
+				presentation_duration: Default::default(),
+				term_duration: Default::default(),
+				desired_seats: Default::default(),
+				members: Default::default(),
+			}
+		}
+	}
+
+	#[pallet::genesis_build]
+	impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+		fn build(&self) {
+			PresentationDuration::<T>::put(self.presentation_duration);
+			TermDuration::<T>::put(self.term_duration);
+			DesiredSeats::<T>::put(self.desired_seats);
+			Members::<T>::put(&self.members);
+		}
+	}
+
+	#[pallet::error]
+	pub enum Error<T> {
 		/// Reporter must be a voter.
 		NotVoter,
 		/// Target for inactivity cleanup must be active.
@@ -342,59 +452,35 @@ decl_error! {
 		/// No approval changes during presentation period.
 		ApprovalPresentation,
 	}
-}
 
-decl_module! {
-	pub struct Module<T: Config> for enum Call where origin: T::Origin {
-		type Error = Error<T>;
-
-		/// How much should be locked up in order to submit one's candidacy. A reasonable
-		/// default value is 9.
-		const CandidacyBond: BalanceOf<T> = T::CandidacyBond::get();
-
-		/// How much should be locked up in order to be able to submit votes.
-		const VotingBond: BalanceOf<T> = T::VotingBond::get();
-
-		/// The amount of fee paid upon each vote submission, unless if they submit a
-		/// _hole_ index and replace it.
-		const VotingFee: BalanceOf<T> = T::VotingFee::get();
-
-		/// The punishment, per voter, if you provide an invalid presentation. A
-		/// reasonable default value is 1.
-		const PresentSlashPerVoter: BalanceOf<T> = T::PresentSlashPerVoter::get();
-
-		/// How many runners-up should have their approvals persist until the next
-		/// vote. A reasonable default value is 2.
-		const CarryCount: u32 = T::CarryCount::get();
-
-		/// How many vote indices need to go by after a target voter's last vote before
-		/// they can be reaped if their approvals are moot. A reasonable default value
-		/// is 1.
-		const InactiveGracePeriod: VoteIndex = T::InactiveGracePeriod::get();
-
-		/// How often (in blocks) to check for new votes. A reasonable default value
-		/// is 1000.
-		const VotingPeriod: T::BlockNumber = T::VotingPeriod::get();
-
-		/// Minimum about that can be used as the locked value for voting.
-		const MinimumVotingLock: BalanceOf<T> = T::MinimumVotingLock::get();
-
-		/// Decay factor of weight when being accumulated. It should typically be set to
-		/// __at least__ `membership_size -1` to keep the collective secure.
-		/// When set to `N`, it indicates `(1/N)^t` of staked is decayed at weight
-		/// increment step `t`. 0 will result in no weight being added at all (normal
-		/// approval voting). A reasonable default value is 24.
-		const DecayRatio: u32 = T::DecayRatio::get();
-
-		/// The chunk size of the voter vector.
-		const VOTER_SET_SIZE: u32 = VOTER_SET_SIZE as u32;
-		/// The chunk size of the approval vector.
-		const APPROVAL_SET_SIZE: u32 = APPROVAL_SET_SIZE as u32;
-
-		const PalletId: LockIdentifier = T::PalletId::get();
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+		fn on_initialize(n: T::BlockNumber) -> Weight {
+			if let Err(e) = Self::end_block(n) {
+				print("Guru meditation");
+				print(e);
+			}
+			0
+		}
+	}
 
-		fn deposit_event() = default;
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	#[pallet::metadata(T::AccountId = "AccountId", Vec<T::AccountId> = "Vec<AccountId>")]
+	pub enum Event<T: Config> {
+		/// Reaped \[voter, reaper\].
+		VoterReaped(T::AccountId, T::AccountId),
+		/// Slashed \[reaper\].
+		BadReaperSlashed(T::AccountId),
+		/// A tally (for approval votes of \[seats\]) has started.
+		TallyStarted(u32),
+		/// A tally (for approval votes of seat(s)) has ended (with one or more new members).
+		/// \[incoming, outgoing\]
+		TallyFinalized(Vec<T::AccountId>, Vec<T::AccountId>),
+	}
 
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
 		/// Set candidate approvals. Approval slots stay valid as long as candidates in those slots
 		/// are registered.
 		///
@@ -419,13 +505,13 @@ decl_module! {
 		/// - Two extra DB entries, one DB change.
 		/// - Argument `votes` is limited in length to number of candidates.
 		/// # </weight>
-		#[weight = 2_500_000_000]
-		fn set_approvals(
-			origin,
+		#[pallet::weight(2_500_000_000)]
+		pub fn set_approvals(
+			origin: OriginFor<T>,
 			votes: Vec<bool>,
-			#[compact] index: VoteIndex,
+			#[pallet::compact] index: VoteIndex,
 			hint: SetIndex,
-			#[compact] value: BalanceOf<T>,
+			#[pallet::compact] value: BalanceOf<T>,
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			Self::do_set_approvals(who, votes, index, hint, value)
@@ -443,14 +529,14 @@ decl_module! {
 		/// - O(1).
 		/// - Two fewer DB entries, one DB change.
 		/// # </weight>
-		#[weight = 2_500_000_000]
-		fn reap_inactive_voter(
-			origin,
-			#[compact] reporter_index: u32,
+		#[pallet::weight(2_500_000_000)]
+		pub fn reap_inactive_voter(
+			origin: OriginFor<T>,
+			#[pallet::compact] reporter_index: u32,
 			who: <T::Lookup as StaticLookup>::Source,
-			#[compact] who_index: u32,
-			#[compact] assumed_vote_index: VoteIndex,
-		) {
+			#[pallet::compact] who_index: u32,
+			#[pallet::compact] assumed_vote_index: VoteIndex,
+		) -> DispatchResult {
 			let reporter = ensure_signed(origin)?;
 			let who = T::Lookup::lookup(who)?;
 
@@ -499,12 +585,13 @@ decl_module! {
 				// This only fails if `reporter` doesn't exist, which it clearly must do since its
 				// the origin. Still, it's no more harmful to propagate any error at this point.
 				T::Currency::repatriate_reserved(&who, &reporter, T::VotingBond::get(), BalanceStatus::Free)?;
-				Self::deposit_event(RawEvent::VoterReaped(who, reporter));
+				Self::deposit_event(Event::<T>::VoterReaped(who, reporter));
 			} else {
 				let imbalance = T::Currency::slash_reserved(&reporter, T::VotingBond::get()).0;
 				T::BadReaper::on_unbalanced(imbalance);
-				Self::deposit_event(RawEvent::BadReaperSlashed(reporter));
+				Self::deposit_event(Event::<T>::BadReaperSlashed(reporter));
 			}
+			Ok(())
 		}
 
 		/// Remove a voter. All votes are cancelled and the voter deposit is returned.
@@ -517,8 +604,8 @@ decl_module! {
 		/// - O(1).
 		/// - Two fewer DB entries, one DB change.
 		/// # </weight>
-		#[weight = 1_250_000_000]
-		fn retract_voter(origin, #[compact] index: u32) {
+		#[pallet::weight(1_250_000_000)]
+		pub fn retract_voter(origin: OriginFor<T>, #[pallet::compact] index: u32) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 
 			ensure!(!Self::presentation_active(), Error::<T>::CannotRetractPresenting);
@@ -530,6 +617,7 @@ decl_module! {
 			Self::remove_voter(&who, index);
 			T::Currency::unreserve(&who, T::VotingBond::get());
 			T::Currency::remove_lock(T::PalletId::get(), &who);
+			Ok(())
 		}
 
 		/// Submit oneself for candidacy.
@@ -545,8 +633,8 @@ decl_module! {
 		/// - Independent of input.
 		/// - Three DB changes.
 		/// # </weight>
-		#[weight = 2_500_000_000]
-		fn submit_candidacy(origin, #[compact] slot: u32) {
+		#[pallet::weight(2_500_000_000)]
+		pub fn submit_candidacy(origin: OriginFor<T>, #[pallet::compact] slot: u32) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 
 			ensure!(!Self::is_a_candidate(&who), Error::<T>::DuplicatedCandidate);
@@ -570,7 +658,8 @@ decl_module! {
 				candidates[slot] = who;
 			}
 			<Candidates<T>>::put(candidates);
-			CandidateCount::put(count as u32 + 1);
+			CandidateCount::<T>::put(count as u32 + 1);
+			Ok(())
 		}
 
 		/// Claim that `candidate` is one of the top `carry_count + desired_seats` candidates. Only
@@ -582,12 +671,12 @@ decl_module! {
 		/// - O(voters) compute.
 		/// - One DB change.
 		/// # </weight>
-		#[weight = 10_000_000_000]
-		fn present_winner(
-			origin,
+		#[pallet::weight(10_000_000_000)]
+		pub fn present_winner(
+			origin: OriginFor<T>,
 			candidate: <T::Lookup as StaticLookup>::Source,
-			#[compact] total: BalanceOf<T>,
-			#[compact] index: VoteIndex,
+			#[pallet::compact] total: BalanceOf<T>,
+			#[pallet::compact] index: VoteIndex,
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			ensure!(
@@ -656,18 +745,19 @@ decl_module! {
 		/// Set the desired member count; if lower than the current count, then seats will not be up
 		/// election when they expire. If more, then a new vote will be started if one is not
 		/// already in progress.
-		#[weight = (0, DispatchClass::Operational)]
-		fn set_desired_seats(origin, #[compact] count: u32) {
+		#[pallet::weight((0, DispatchClass::Operational))]
+		pub fn set_desired_seats(origin: OriginFor<T>, #[pallet::compact] count: u32) -> DispatchResult {
 			ensure_root(origin)?;
-			DesiredSeats::put(count);
+			DesiredSeats::<T>::put(count);
+			Ok(())
 		}
 
 		/// Remove a particular member from the set. This is effective immediately.
 		///
 		/// Note: A tally should happen instantly (if not already in a presentation
 		/// period) to fill the seat if removal means that the desired members are not met.
-		#[weight = (0, DispatchClass::Operational)]
-		fn remove_member(origin, who: <T::Lookup as StaticLookup>::Source) {
+		#[pallet::weight((0, DispatchClass::Operational))]
+		pub fn remove_member(origin: OriginFor<T>, who: <T::Lookup as StaticLookup>::Source) -> DispatchResult {
 			ensure_root(origin)?;
 			let who = T::Lookup::lookup(who)?;
 			let new_set: Vec<(T::AccountId, T::BlockNumber)> = Self::members()
@@ -677,49 +767,36 @@ decl_module! {
 			<Members<T>>::put(&new_set);
 			let new_set = new_set.into_iter().map(|x| x.0).collect::<Vec<_>>();
 			T::ChangeMembers::change_members(&[], &[who], new_set);
+			Ok(())
 		}
 
 		/// Set the presentation duration. If there is currently a vote being presented for, will
 		/// invoke `finalize_vote`.
-		#[weight = (0, DispatchClass::Operational)]
-		fn set_presentation_duration(origin, #[compact] count: T::BlockNumber) {
+		#[pallet::weight((0, DispatchClass::Operational))]
+		pub fn set_presentation_duration(
+			origin: OriginFor<T>,
+			#[pallet::compact] count: T::BlockNumber,
+		) -> DispatchResult {
 			ensure_root(origin)?;
 			<PresentationDuration<T>>::put(count);
+			Ok(())
 		}
 
 		/// Set the presentation duration. If there is current a vote being presented for, will
 		/// invoke `finalize_vote`.
-		#[weight = (0, DispatchClass::Operational)]
-		fn set_term_duration(origin, #[compact] count: T::BlockNumber) {
+		#[pallet::weight((0, DispatchClass::Operational))]
+		pub fn set_term_duration(
+			origin: OriginFor<T>,
+			#[pallet::compact] count: T::BlockNumber,
+		) -> DispatchResult {
 			ensure_root(origin)?;
 			<TermDuration<T>>::put(count);
-		}
-
-		fn on_initialize(n: T::BlockNumber) -> Weight {
-			if let Err(e) = Self::end_block(n) {
-				print("Guru meditation");
-				print(e);
-			}
-			0
+			Ok(())
 		}
 	}
 }
 
-decl_event!(
-	pub enum Event<T> where <T as frame_system::Config>::AccountId {
-		/// Reaped \[voter, reaper\].
-		VoterReaped(AccountId, AccountId),
-		/// Slashed \[reaper\].
-		BadReaperSlashed(AccountId),
-		/// A tally (for approval votes of \[seats\]) has started.
-		TallyStarted(u32),
-		/// A tally (for approval votes of seat(s)) has ended (with one or more new members).
-		/// \[incoming, outgoing\]
-		TallyFinalized(Vec<AccountId>, Vec<AccountId>),
-	}
-);
-
-impl<T: Config> Module<T> {
+impl<T: Config> Pallet<T> {
 	// exposed immutables.
 
 	/// True if we're currently in a presentation period.
@@ -800,7 +877,7 @@ impl<T: Config> Module<T> {
 		let mut set = Self::voters(set_index);
 		set[vec_index] = None;
 		<Voters<T>>::insert(set_index, set);
-		VoterCount::mutate(|c| *c = *c - 1);
+		VoterCount::<T>::mutate(|c| *c = *c - 1);
 		Self::remove_all_approvals_of(voter);
 		<VoterInfoOf<T>>::remove(voter);
 	}
@@ -879,14 +956,14 @@ impl<T: Config> Module<T> {
 						locked_balance -= T::VotingFee::get();
 					}
 					if set_len + 1 == VOTER_SET_SIZE {
-						NextVoterSet::put(next + 1);
+						NextVoterSet::<T>::put(next + 1);
 					}
 					<Voters<T>>::append(next, Some(who.clone()));
 				}
 			}
 
 			T::Currency::reserve(&who, T::VotingBond::get())?;
-			VoterCount::mutate(|c| *c = *c + 1);
+			VoterCount::<T>::mutate(|c| *c = *c + 1);
 		}
 
 		T::Currency::set_lock(
@@ -928,7 +1005,7 @@ impl<T: Config> Module<T> {
 			let leaderboard_size = empty_seats + T::CarryCount::get() as usize;
 			<Leaderboard<T>>::put(vec![(BalanceOf::<T>::zero(), T::AccountId::default()); leaderboard_size]);
 
-			Self::deposit_event(RawEvent::TallyStarted(empty_seats as u32));
+			Self::deposit_event(Event::<T>::TallyStarted(empty_seats as u32));
 		}
 	}
 
@@ -1017,11 +1094,11 @@ impl<T: Config> Module<T> {
 				new_candidates.truncate(last_index + 1);
 			}
 
-		Self::deposit_event(RawEvent::TallyFinalized(incoming, outgoing));
+		Self::deposit_event(Event::<T>::TallyFinalized(incoming, outgoing));
 
 		<Candidates<T>>::put(new_candidates);
-		CandidateCount::put(count);
-		VoteCount::put(Self::vote_index() + 1);
+		CandidateCount::<T>::put(count);
+		VoteCount::<T>::put(Self::vote_index() + 1);
 		Ok(())
 	}
 
diff --git a/frame/elections/src/mock.rs b/frame/elections/src/mock.rs
index bb67622eb7ea..7eef7f490998 100644
--- a/frame/elections/src/mock.rs
+++ b/frame/elections/src/mock.rs
@@ -20,7 +20,7 @@
 #![cfg(test)]
 
 use frame_support::{
-	StorageValue, StorageMap, parameter_types, assert_ok,
+	parameter_types, assert_ok,
 	traits::{ChangeMembers, Currency, LockIdentifier},
 };
 use sp_core::H256;
@@ -266,7 +266,7 @@ pub(crate) fn new_test_ext_with_candidate_holes() -> sp_io::TestExternalities {
 	let mut t = ExtBuilder::default().build();
 	t.execute_with(|| {
 		<elections::Candidates<Test>>::put(vec![0, 0, 1]);
-		elections::CandidateCount::put(1);
+		elections::CandidateCount::<Test>::put(1);
 		<elections::RegisterInfoOf<Test>>::insert(1, (0, 2));
 	});
 	t

From 955633c50fcef1e52cb187828d7786798e5f25b0 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Wed, 16 Jun 2021 15:19:10 +0100
Subject: [PATCH 0891/1194] Make backwards compatible with CountedMap (#9126)

---
 frame/staking/src/lib.rs           | 46 +++++++++++++++---------------
 frame/staking/src/mock.rs          |  4 +--
 frame/staking/src/testing_utils.rs |  4 +--
 frame/staking/src/tests.rs         |  4 +--
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index b6d02fa2fd30..ce1f5afc64c1 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -761,8 +761,8 @@ pub mod migrations {
 		use super::*;
 
 		pub fn pre_migrate<T: Config>() -> Result<(), &'static str> {
-			assert!(CurrentValidatorsCount::<T>::get().is_zero(), "CurrentValidatorsCount already set.");
-			assert!(CurrentNominatorsCount::<T>::get().is_zero(), "CurrentNominatorsCount already set.");
+			assert!(CounterForValidators::<T>::get().is_zero(), "CounterForValidators already set.");
+			assert!(CounterForNominators::<T>::get().is_zero(), "CounterForNominators already set.");
 			assert!(StorageVersion::<T>::get() == Releases::V6_0_0);
 			Ok(())
 		}
@@ -772,8 +772,8 @@ pub mod migrations {
 			let validator_count = Validators::<T>::iter().count() as u32;
 			let nominator_count = Nominators::<T>::iter().count() as u32;
 
-			CurrentValidatorsCount::<T>::put(validator_count);
-			CurrentNominatorsCount::<T>::put(nominator_count);
+			CounterForValidators::<T>::put(validator_count);
+			CounterForNominators::<T>::put(nominator_count);
 
 			StorageVersion::<T>::put(Releases::V7_0_0);
 			log!(info, "Completed staking migration to Releases::V7_0_0");
@@ -998,14 +998,14 @@ pub mod pallet {
 
 	/// The map from (wannabe) validator stash key to the preferences of that validator.
 	///
-	/// When updating this storage item, you must also update the `CurrentValidatorsCount`.
+	/// When updating this storage item, you must also update the `CounterForValidators`.
 	#[pallet::storage]
 	#[pallet::getter(fn validators)]
 	pub type Validators<T: Config> = StorageMap<_, Twox64Concat, T::AccountId, ValidatorPrefs, ValueQuery>;
 
 	/// A tracker to keep count of the number of items in the `Validators` map.
 	#[pallet::storage]
-	pub type CurrentValidatorsCount<T> = StorageValue<_, u32, ValueQuery>;
+	pub type CounterForValidators<T> = StorageValue<_, u32, ValueQuery>;
 
 	/// The maximum validator count before we stop allowing new validators to join.
 	///
@@ -1015,14 +1015,14 @@ pub mod pallet {
 
 	/// The map from nominator stash key to the set of stash keys of all validators to nominate.
 	///
-	/// When updating this storage item, you must also update the `CurrentNominatorsCount`.
+	/// When updating this storage item, you must also update the `CounterForNominators`.
 	#[pallet::storage]
 	#[pallet::getter(fn nominators)]
 	pub type Nominators<T: Config> = StorageMap<_, Twox64Concat, T::AccountId, Nominations<T::AccountId>>;
 
 	/// A tracker to keep count of the number of items in the `Nominators` map.
 	#[pallet::storage]
-	pub type CurrentNominatorsCount<T> = StorageValue<_, u32, ValueQuery>;
+	pub type CounterForNominators<T> = StorageValue<_, u32, ValueQuery>;
 
 	/// The maximum nominator count before we stop allowing new validators to join.
 	///
@@ -1717,7 +1717,7 @@ pub mod pallet {
 			// If this error is reached, we need to adjust the `MinValidatorBond` and start calling `chill_other`.
 			// Until then, we explicitly block new validators to protect the runtime.
 			if let Some(max_validators) = MaxValidatorsCount::<T>::get() {
-				ensure!(CurrentValidatorsCount::<T>::get() < max_validators, Error::<T>::TooManyValidators);
+				ensure!(CounterForValidators::<T>::get() < max_validators, Error::<T>::TooManyValidators);
 			}
 
 			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
@@ -1758,7 +1758,7 @@ pub mod pallet {
 			// If this error is reached, we need to adjust the `MinNominatorBond` and start calling `chill_other`.
 			// Until then, we explicitly block new nominators to protect the runtime.
 			if let Some(max_nominators) = MaxNominatorsCount::<T>::get() {
-				ensure!(CurrentNominatorsCount::<T>::get() < max_nominators, Error::<T>::TooManyNominators);
+				ensure!(CounterForNominators::<T>::get() < max_nominators, Error::<T>::TooManyNominators);
 			}
 
 			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
@@ -2966,42 +2966,42 @@ impl<T: Config> Pallet<T> {
 	}
 
 	/// This function will add a nominator to the `Nominators` storage map,
-	/// and keep track of the `CurrentNominatorsCount`.
+	/// and keep track of the `CounterForNominators`.
 	///
 	/// If the nominator already exists, their nominations will be updated.
 	pub fn do_add_nominator(who: &T::AccountId, nominations: Nominations<T::AccountId>) {
 		if !Nominators::<T>::contains_key(who) {
-			CurrentNominatorsCount::<T>::mutate(|x| x.saturating_inc())
+			CounterForNominators::<T>::mutate(|x| x.saturating_inc())
 		}
 		Nominators::<T>::insert(who, nominations);
 	}
 
 	/// This function will remove a nominator from the `Nominators` storage map,
-	/// and keep track of the `CurrentNominatorsCount`.
+	/// and keep track of the `CounterForNominators`.
 	pub fn do_remove_nominator(who: &T::AccountId) {
 		if Nominators::<T>::contains_key(who) {
 			Nominators::<T>::remove(who);
-			CurrentNominatorsCount::<T>::mutate(|x| x.saturating_dec());
+			CounterForNominators::<T>::mutate(|x| x.saturating_dec());
 		}
 	}
 
 	/// This function will add a validator to the `Validators` storage map,
-	/// and keep track of the `CurrentValidatorsCount`.
+	/// and keep track of the `CounterForValidators`.
 	///
 	/// If the validator already exists, their preferences will be updated.
 	pub fn do_add_validator(who: &T::AccountId, prefs: ValidatorPrefs) {
 		if !Validators::<T>::contains_key(who) {
-			CurrentValidatorsCount::<T>::mutate(|x| x.saturating_inc())
+			CounterForValidators::<T>::mutate(|x| x.saturating_inc())
 		}
 		Validators::<T>::insert(who, prefs);
 	}
 
 	/// This function will remove a validator from the `Validators` storage map,
-	/// and keep track of the `CurrentValidatorsCount`.
+	/// and keep track of the `CounterForValidators`.
 	pub fn do_remove_validator(who: &T::AccountId) {
 		if Validators::<T>::contains_key(who) {
 			Validators::<T>::remove(who);
-			CurrentValidatorsCount::<T>::mutate(|x| x.saturating_dec());
+			CounterForValidators::<T>::mutate(|x| x.saturating_dec());
 		}
 	}
 }
@@ -3017,11 +3017,11 @@ impl<T: Config> frame_election_provider_support::ElectionDataProvider<T::Account
 	fn voters(
 		maybe_max_len: Option<usize>,
 	) -> data_provider::Result<(Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)>, Weight)> {
-		let nominator_count = CurrentNominatorsCount::<T>::get();
-		let validator_count = CurrentValidatorsCount::<T>::get();
+		let nominator_count = CounterForNominators::<T>::get();
+		let validator_count = CounterForValidators::<T>::get();
 		let voter_count = nominator_count.saturating_add(validator_count) as usize;
-		debug_assert!(<Nominators<T>>::iter().count() as u32 == CurrentNominatorsCount::<T>::get());
-		debug_assert!(<Validators<T>>::iter().count() as u32 == CurrentValidatorsCount::<T>::get());
+		debug_assert!(<Nominators<T>>::iter().count() as u32 == CounterForNominators::<T>::get());
+		debug_assert!(<Validators<T>>::iter().count() as u32 == CounterForValidators::<T>::get());
 
 		if maybe_max_len.map_or(false, |max_len| voter_count > max_len) {
 			return Err("Voter snapshot too big");
@@ -3037,7 +3037,7 @@ impl<T: Config> frame_election_provider_support::ElectionDataProvider<T::Account
 	}
 
 	fn targets(maybe_max_len: Option<usize>) -> data_provider::Result<(Vec<T::AccountId>, Weight)> {
-		let target_count = CurrentValidatorsCount::<T>::get() as usize;
+		let target_count = CounterForValidators::<T>::get() as usize;
 
 		if maybe_max_len.map_or(false, |max_len| target_count > max_len) {
 			return Err("Target snapshot too big");
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index 35a1fa45284d..e0079cc3f375 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -498,8 +498,8 @@ fn post_conditions() {
 fn check_count() {
 	let nominator_count = Nominators::<Test>::iter().count() as u32;
 	let validator_count = Validators::<Test>::iter().count() as u32;
-	assert_eq!(nominator_count, CurrentNominatorsCount::<Test>::get());
-	assert_eq!(validator_count, CurrentValidatorsCount::<Test>::get());
+	assert_eq!(nominator_count, CounterForNominators::<Test>::get());
+	assert_eq!(validator_count, CounterForValidators::<Test>::get());
 }
 
 fn check_ledgers() {
diff --git a/frame/staking/src/testing_utils.rs b/frame/staking/src/testing_utils.rs
index 8a4392edfed2..c643cb283373 100644
--- a/frame/staking/src/testing_utils.rs
+++ b/frame/staking/src/testing_utils.rs
@@ -30,9 +30,9 @@ const SEED: u32 = 0;
 /// This function removes all validators and nominators from storage.
 pub fn clear_validators_and_nominators<T: Config>() {
 	Validators::<T>::remove_all(None);
-	CurrentValidatorsCount::<T>::kill();
+	CounterForValidators::<T>::kill();
 	Nominators::<T>::remove_all(None);
-	CurrentNominatorsCount::<T>::kill();
+	CounterForNominators::<T>::kill();
 }
 
 /// Grab a funded user.
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index 976ee34d9b8e..5d42d866b133 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -4107,9 +4107,9 @@ mod election_data_provider {
 	#[test]
 	fn capped_stakers_works() {
 		ExtBuilder::default().build_and_execute(|| {
-			let validator_count = CurrentValidatorsCount::<Test>::get();
+			let validator_count = CounterForValidators::<Test>::get();
 			assert_eq!(validator_count, 3);
-			let nominator_count = CurrentNominatorsCount::<Test>::get();
+			let nominator_count = CounterForNominators::<Test>::get();
 			assert_eq!(nominator_count, 1);
 
 			// Change the maximums

From ede9bc19e883005d6bb71f325f13c90e03cea9c2 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Wed, 16 Jun 2021 18:19:09 +0200
Subject: [PATCH 0892/1194] Avoid running some test 2 times when unneeded
 (#9124)

* avoid running some test 2 times when unneeded

* Update frame/support/test/Cargo.toml
---
 .gitlab-ci.yml                        | 2 +-
 frame/support/test/Cargo.toml         | 2 ++
 frame/support/test/tests/pallet_ui.rs | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9b28bb2e25a8..2ffa8a4b977b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -319,7 +319,7 @@ test-linux-stable:                 &test-linux
   script:
     # this job runs all tests in former runtime-benchmarks, frame-staking and wasmtime tests
     - time cargo test --workspace --locked --release --verbose --features runtime-benchmarks --manifest-path bin/node/cli/Cargo.toml
-    - time cargo test -p frame-support-test --features=conditional-storage --manifest-path frame/support/test/Cargo.toml # does not reuse cache 1 min 44 sec
+    - time cargo test -p frame-support-test --features=conditional-storage --manifest-path frame/support/test/Cargo.toml --test pallet # does not reuse cache 1 min 44 sec
     - SUBSTRATE_TEST_TIMEOUT=1 time cargo test -p substrate-test-utils --release --verbose --locked -- --ignored timeout
     - sccache -s
 
diff --git a/frame/support/test/Cargo.toml b/frame/support/test/Cargo.toml
index 1a979cdee6f8..ce5c8ea7de1f 100644
--- a/frame/support/test/Cargo.toml
+++ b/frame/support/test/Cargo.toml
@@ -40,4 +40,6 @@ std = [
 	"sp-state-machine",
 ]
 try-runtime = ["frame-support/try-runtime"]
+# WARNING: CI only execute pallet test with this feature,
+# if the feature intended to be used outside, CI and this message need to be updated.
 conditional-storage = []
diff --git a/frame/support/test/tests/pallet_ui.rs b/frame/support/test/tests/pallet_ui.rs
index fea7a2c7e7ad..e5f4a54dfb00 100644
--- a/frame/support/test/tests/pallet_ui.rs
+++ b/frame/support/test/tests/pallet_ui.rs
@@ -16,7 +16,6 @@
 // limitations under the License.
 
 #[rustversion::attr(not(stable), ignore)]
-#[cfg(not(feature = "conditional-storage"))]
 #[test]
 fn pallet_ui() {
 	// As trybuild is using `cargo check`, we don't need the real WASM binaries.

From e447c49537e66d0b6e3a408c6ae5c424c7344a7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Thu, 17 Jun 2021 09:27:53 +0200
Subject: [PATCH 0893/1194] Aura: Skip initialize block & remove cache (#9132)

This instructs the Aura runtime api to skip initialize block, when
requesting the authorities. This is important, as we don't want to use
the new authorities that should be used from the next block on.
Besides that, it removes the caching stuff. The cache is not available
on full nodes anyway. In the future we should store the authorities
probably in the aux store.
---
 client/consensus/aura/src/import_queue.rs | 39 -----------------------
 client/consensus/aura/src/lib.rs          | 13 +++-----
 primitives/consensus/aura/src/lib.rs      |  1 +
 3 files changed, 5 insertions(+), 48 deletions(-)

diff --git a/client/consensus/aura/src/import_queue.rs b/client/consensus/aura/src/import_queue.rs
index 8034fd08a7eb..c3faa5382686 100644
--- a/client/consensus/aura/src/import_queue.rs
+++ b/client/consensus/aura/src/import_queue.rs
@@ -317,43 +317,6 @@ impl<B: BlockT, C, P, CAW, CIDP> Verifier<B> for AuraVerifier<C, P, CAW, CIDP> w
 	}
 }
 
-fn initialize_authorities_cache<A, B, C>(client: &C) -> Result<(), ConsensusError> where
-	A: Codec + Debug,
-	B: BlockT,
-	C: ProvideRuntimeApi<B> + BlockOf + ProvideCache<B> + UsageProvider<B>,
-	C::Api: AuraApi<B, A>,
-{
-	// no cache => no initialization
-	let cache = match client.cache() {
-		Some(cache) => cache,
-		None => return Ok(()),
-	};
-
-	let best_hash = client.usage_info().chain.best_hash;
-
-	// check if we already have initialized the cache
-	let map_err = |error| sp_consensus::Error::from(sp_consensus::Error::ClientImport(
-		format!(
-			"Error initializing authorities cache: {}",
-			error,
-		)));
-
-	let block_id = BlockId::hash(best_hash);
-	let authorities: Option<Vec<A>> = cache
-		.get_at(&well_known_cache_keys::AUTHORITIES, &block_id)
-		.unwrap_or(None)
-		.and_then(|(_, _, v)| Decode::decode(&mut &v[..]).ok());
-	if authorities.is_some() {
-		return Ok(());
-	}
-
-	let authorities = crate::authorities(client, &block_id)?;
-	cache.initialize(&well_known_cache_keys::AUTHORITIES, authorities.encode())
-		.map_err(map_err)?;
-
-	Ok(())
-}
-
 /// Should we check for equivocation of a block author?
 #[derive(Debug, Clone, Copy)]
 pub enum CheckForEquivocation {
@@ -438,8 +401,6 @@ pub fn import_queue<'a, P, Block, I, C, S, CAW, CIDP>(
 	CIDP: CreateInherentDataProviders<Block, ()> + Sync + Send + 'static,
 	CIDP::InherentDataProviders: InherentDataProviderExt + Send + Sync,
 {
-	initialize_authorities_cache(&*client)?;
-
 	let verifier = build_verifier::<P, _, _, _>(
 		BuildVerifierParams {
 			client,
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index 702e4dc0bf1b..d0b0cefe8ddc 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -45,7 +45,7 @@ use sp_consensus::{
 	BlockOrigin, Error as ConsensusError, SelectChain,
 };
 use sc_client_api::{backend::AuxStore, BlockOf, UsageProvider};
-use sp_blockchain::{Result as CResult, well_known_cache_keys, ProvideCache, HeaderBackend};
+use sp_blockchain::{Result as CResult, ProvideCache, HeaderBackend};
 use sp_core::crypto::Public;
 use sp_application_crypto::{AppKey, AppPublic};
 use sp_runtime::{generic::BlockId, traits::NumberFor};
@@ -546,14 +546,9 @@ fn authorities<A, B, C>(client: &C, at: &BlockId<B>) -> Result<Vec<A>, Consensus
 	C: ProvideRuntimeApi<B> + BlockOf + ProvideCache<B>,
 	C::Api: AuraApi<B, A>,
 {
-	client
-		.cache()
-		.and_then(|cache| cache
-			.get_at(&well_known_cache_keys::AUTHORITIES, at)
-			.unwrap_or(None)
-			.and_then(|(_, _, v)| Decode::decode(&mut &v[..]).ok())
-		)
-		.or_else(|| AuraApi::authorities(&*client.runtime_api(), at).ok())
+	client.runtime_api()
+		.authorities(at)
+		.ok()
 		.ok_or_else(|| sp_consensus::Error::InvalidAuthoritiesSet.into())
 }
 
diff --git a/primitives/consensus/aura/src/lib.rs b/primitives/consensus/aura/src/lib.rs
index a28e681fda27..ef888a2ab855 100644
--- a/primitives/consensus/aura/src/lib.rs
+++ b/primitives/consensus/aura/src/lib.rs
@@ -90,6 +90,7 @@ sp_api::decl_runtime_apis! {
 		fn slot_duration() -> SlotDuration;
 
 		// Return the current set of authorities.
+		#[skip_initialize_block]
 		fn authorities() -> Vec<AuthorityId>;
 	}
 }

From 34d4bb0ed47f7ec5ae26add9f9f8f244428a3e02 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Thu, 17 Jun 2021 16:37:43 +0200
Subject: [PATCH 0894/1194] Make it possible to override maximum payload of RPC
 (#9019)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Make it possible to override maximum payload of RPC

* Finish it.

* remove todo.

* Update client/cli/src/commands/run_cmd.rs

* Apply suggestions from code review

Co-authored-by: David <dvdplm@gmail.com>

* Apply suggestions from code review

Co-authored-by: David <dvdplm@gmail.com>

* Incorporate suggestions

* Thread rpc_max_payload from configuration to trace_block

* Try obey line gitlab/check_line_width.sh

* update state rpc tests

* Improve readbility

* Apply suggestions from code review

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com>
Co-authored-by: David <dvdplm@gmail.com>
---
 client/cli/src/commands/run_cmd.rs     | 32 +++++++++++++++++---------
 client/cli/src/config.rs               |  6 +++++
 client/executor/src/native_executor.rs |  2 +-
 client/rpc-servers/src/lib.rs          | 18 +++++++++++----
 client/rpc/src/state/mod.rs            |  7 ++++--
 client/rpc/src/state/state_full.rs     | 21 +++++++++++++----
 client/rpc/src/state/tests.rs          |  8 +++++++
 client/service/src/builder.rs          |  1 +
 client/service/src/config.rs           |  2 ++
 client/service/src/lib.rs              |  2 ++
 client/service/test/src/lib.rs         |  1 +
 client/tracing/src/block/mod.rs        | 11 ++++++---
 test-utils/test-runner/src/utils.rs    |  1 +
 utils/browser/src/lib.rs               |  1 +
 14 files changed, 87 insertions(+), 26 deletions(-)

diff --git a/client/cli/src/commands/run_cmd.rs b/client/cli/src/commands/run_cmd.rs
index 3e5823ef733a..285ffc9fdca1 100644
--- a/client/cli/src/commands/run_cmd.rs
+++ b/client/cli/src/commands/run_cmd.rs
@@ -42,12 +42,11 @@ pub struct RunCmd {
 	/// The node will be started with the authority role and actively
 	/// participate in any consensus task that it can (e.g. depending on
 	/// availability of local keys).
-	#[structopt(
-		long = "validator"
-	)]
+	#[structopt(long)]
 	pub validator: bool,
 
-	/// Disable GRANDPA voter when running in validator mode, otherwise disable the GRANDPA observer.
+	/// Disable GRANDPA voter when running in validator mode, otherwise disable the GRANDPA
+	/// observer.
 	#[structopt(long)]
 	pub no_grandpa: bool,
 
@@ -57,8 +56,8 @@ pub struct RunCmd {
 
 	/// Listen to all RPC interfaces.
 	///
-	/// Default is local. Note: not all RPC methods are safe to be exposed publicly. Use an RPC proxy
-	/// server to filter out dangerous methods. More details:
+	/// Default is local. Note: not all RPC methods are safe to be exposed publicly. Use an RPC
+	/// proxy server to filter out dangerous methods. More details:
 	/// <https://github.com/paritytech/substrate/wiki/Public-RPC>.
 	/// Use `--unsafe-rpc-external` to suppress the warning if you understand the risks.
 	#[structopt(long = "rpc-external")]
@@ -74,8 +73,8 @@ pub struct RunCmd {
 	///
 	/// - `Unsafe`: Exposes every RPC method.
 	/// - `Safe`: Exposes only a safe subset of RPC methods, denying unsafe RPC methods.
-	/// - `Auto`: Acts as `Safe` if RPC is served externally, e.g. when `--{rpc,ws}-external` is passed,
-	///   otherwise acts as `Unsafe`.
+	/// - `Auto`: Acts as `Safe` if RPC is served externally, e.g. when `--{rpc,ws}-external` is
+	///   passed, otherwise acts as `Unsafe`.
 	#[structopt(
 		long,
 		value_name = "METHOD SET",
@@ -88,8 +87,9 @@ pub struct RunCmd {
 
 	/// Listen to all Websocket interfaces.
 	///
-	/// Default is local. Note: not all RPC methods are safe to be exposed publicly. Use an RPC proxy
-	/// server to filter out dangerous methods. More details: <https://github.com/paritytech/substrate/wiki/Public-RPC>.
+	/// Default is local. Note: not all RPC methods are safe to be exposed publicly. Use an RPC
+	/// proxy server to filter out dangerous methods. More details:
+	/// <https://github.com/paritytech/substrate/wiki/Public-RPC>.
 	/// Use `--unsafe-ws-external` to suppress the warning if you understand the risks.
 	#[structopt(long = "ws-external")]
 	pub ws_external: bool,
@@ -100,6 +100,11 @@ pub struct RunCmd {
 	#[structopt(long = "unsafe-ws-external")]
 	pub unsafe_ws_external: bool,
 
+	/// Set the the maximum RPC payload size for both requests and responses (both http and ws), in
+	/// megabytes. Default is 15MiB.
+	#[structopt(long = "rpc-max-payload")]
+	pub rpc_max_payload: Option<usize>,
+
 	/// Listen to all Prometheus data source interfaces.
 	///
 	/// Default is local.
@@ -194,7 +199,8 @@ pub struct RunCmd {
 	#[structopt(long, conflicts_with_all = &["alice", "charlie", "dave", "eve", "ferdie", "one", "two"])]
 	pub bob: bool,
 
-	/// Shortcut for `--name Charlie --validator` with session keys for `Charlie` added to keystore.
+	/// Shortcut for `--name Charlie --validator` with session keys for `Charlie` added to
+	/// keystore.
 	#[structopt(long, conflicts_with_all = &["alice", "bob", "dave", "eve", "ferdie", "one", "two"])]
 	pub charlie: bool,
 
@@ -435,6 +441,10 @@ impl CliConfiguration for RunCmd {
 		Ok(self.rpc_methods.into())
 	}
 
+	fn rpc_max_payload(&self) -> Result<Option<usize>> {
+		Ok(self.rpc_max_payload)
+	}
+
 	fn transaction_pool(&self) -> Result<TransactionPoolOptions> {
 		Ok(self.pool_config.transaction_pool())
 	}
diff --git a/client/cli/src/config.rs b/client/cli/src/config.rs
index 62afc849c09f..8e435da253c0 100644
--- a/client/cli/src/config.rs
+++ b/client/cli/src/config.rs
@@ -372,6 +372,11 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 		Ok(Some(Vec::new()))
 	}
 
+	/// Get maximum RPC payload.
+	fn rpc_max_payload(&self) -> Result<Option<usize>> {
+		Ok(None)
+	}
+
 	/// Get the prometheus configuration (`None` if disabled)
 	///
 	/// By default this is `None`.
@@ -535,6 +540,7 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 			rpc_ws_max_connections: self.rpc_ws_max_connections()?,
 			rpc_http_threads: self.rpc_http_threads()?,
 			rpc_cors: self.rpc_cors(is_dev)?,
+			rpc_max_payload: self.rpc_max_payload()?,
 			prometheus_config: self.prometheus_config(DCV::prometheus_listen_port())?,
 			telemetry_endpoints,
 			telemetry_external_transport: self.telemetry_external_transport()?,
diff --git a/client/executor/src/native_executor.rs b/client/executor/src/native_executor.rs
index c94088a15526..6fc34b6f1a32 100644
--- a/client/executor/src/native_executor.rs
+++ b/client/executor/src/native_executor.rs
@@ -291,7 +291,7 @@ impl<D: NativeExecutionDispatch> NativeExecutor<D> {
 		default_heap_pages: Option<u64>,
 		max_runtime_instances: usize,
 	) -> Self {
-		let extended =  D::ExtendHostFunctions::host_functions();
+		let extended = D::ExtendHostFunctions::host_functions();
 		let mut host_functions = sp_io::SubstrateHostFunctions::host_functions()
 			.into_iter()
 			// filter out any host function overrides provided.
diff --git a/client/rpc-servers/src/lib.rs b/client/rpc-servers/src/lib.rs
index cb2704efc82a..c93451e5cc67 100644
--- a/client/rpc-servers/src/lib.rs
+++ b/client/rpc-servers/src/lib.rs
@@ -27,8 +27,10 @@ use jsonrpc_core::{IoHandlerExtension, MetaIoHandler};
 use log::error;
 use pubsub::PubSubMetadata;
 
+const MEGABYTE: usize = 1024 * 1024;
+
 /// Maximal payload accepted by RPC servers.
-pub const MAX_PAYLOAD: usize = 15 * 1024 * 1024;
+pub const RPC_MAX_PAYLOAD_DEFAULT: usize = 15 * MEGABYTE;
 
 /// Default maximum number of connections for WS RPC servers.
 const WS_MAX_CONNECTIONS: usize = 100;
@@ -85,7 +87,10 @@ mod inner {
 		thread_pool_size: Option<usize>,
 		cors: Option<&Vec<String>>,
 		io: RpcHandler<M>,
+		maybe_max_payload_mb: Option<usize>,
 	) -> io::Result<http::Server> {
+		let max_request_body_size = maybe_max_payload_mb.map(|mb| mb.saturating_mul(MEGABYTE))
+			.unwrap_or(RPC_MAX_PAYLOAD_DEFAULT);
 		http::ServerBuilder::new(io)
 			.threads(thread_pool_size.unwrap_or(HTTP_THREADS))
 			.health_api(("/health", "system_health"))
@@ -96,7 +101,7 @@ mod inner {
 				http::RestApi::Unsecure
 			})
 			.cors(map_cors::<http::AccessControlAllowOrigin>(cors))
-			.max_request_body_size(MAX_PAYLOAD)
+			.max_request_body_size(max_request_body_size)
 			.start_http(addr)
 	}
 
@@ -120,14 +125,19 @@ mod inner {
 	/// Start WS server listening on given address.
 	///
 	/// **Note**: Only available if `not(target_os = "unknown")`.
-	pub fn start_ws<M: pubsub::PubSubMetadata + From<jsonrpc_core::futures::sync::mpsc::Sender<String>>> (
+	pub fn start_ws<
+		M: pubsub::PubSubMetadata + From<jsonrpc_core::futures::sync::mpsc::Sender<String>>,
+	>(
 		addr: &std::net::SocketAddr,
 		max_connections: Option<usize>,
 		cors: Option<&Vec<String>>,
 		io: RpcHandler<M>,
+		maybe_max_payload_mb: Option<usize>,
 	) -> io::Result<ws::Server> {
+		let rpc_max_payload = maybe_max_payload_mb.map(|mb| mb.saturating_mul(MEGABYTE))
+			.unwrap_or(RPC_MAX_PAYLOAD_DEFAULT);
 		ws::ServerBuilder::with_meta_extractor(io, |context: &ws::RequestContext| context.sender().into())
-			.max_payload(MAX_PAYLOAD)
+			.max_payload(rpc_max_payload)
 			.max_connections(max_connections.unwrap_or(WS_MAX_CONNECTIONS))
 			.allowed_origins(map_cors(cors))
 			.allowed_hosts(hosts_filtering(cors.is_some()))
diff --git a/client/rpc/src/state/mod.rs b/client/rpc/src/state/mod.rs
index 803fc6797ee9..ad9712a41db6 100644
--- a/client/rpc/src/state/mod.rs
+++ b/client/rpc/src/state/mod.rs
@@ -182,6 +182,7 @@ pub fn new_full<BE, Block: BlockT, Client>(
 	client: Arc<Client>,
 	subscriptions: SubscriptionManager,
 	deny_unsafe: DenyUnsafe,
+	rpc_max_payload: Option<usize>,
 ) -> (State<Block, Client>, ChildState<Block, Client>)
 	where
 		Block: BlockT + 'static,
@@ -193,9 +194,11 @@ pub fn new_full<BE, Block: BlockT, Client>(
 		Client::Api: Metadata<Block>,
 {
 	let child_backend = Box::new(
-		self::state_full::FullState::new(client.clone(), subscriptions.clone())
+		self::state_full::FullState::new(
+			client.clone(), subscriptions.clone(), rpc_max_payload
+		)
 	);
-	let backend = Box::new(self::state_full::FullState::new(client, subscriptions));
+	let backend = Box::new(self::state_full::FullState::new(client, subscriptions, rpc_max_payload));
 	(State { backend, deny_unsafe }, ChildState { backend: child_backend })
 }
 
diff --git a/client/rpc/src/state/state_full.rs b/client/rpc/src/state/state_full.rs
index bea7ddfbb3b7..218cb35f0086 100644
--- a/client/rpc/src/state/state_full.rs
+++ b/client/rpc/src/state/state_full.rs
@@ -67,7 +67,8 @@ struct QueryStorageRange<Block: BlockT> {
 pub struct FullState<BE, Block: BlockT, Client> {
 	client: Arc<Client>,
 	subscriptions: SubscriptionManager,
-	_phantom: PhantomData<(BE, Block)>
+	_phantom: PhantomData<(BE, Block)>,
+	rpc_max_payload: Option<usize>,
 }
 
 impl<BE, Block: BlockT, Client> FullState<BE, Block, Client>
@@ -78,8 +79,12 @@ impl<BE, Block: BlockT, Client> FullState<BE, Block, Client>
 		Block: BlockT + 'static,
 {
 	/// Create new state API backend for full nodes.
-	pub fn new(client: Arc<Client>, subscriptions: SubscriptionManager) -> Self {
-		Self { client, subscriptions, _phantom: PhantomData }
+	pub fn new(
+		client: Arc<Client>,
+		subscriptions: SubscriptionManager,
+		rpc_max_payload: Option<usize>,
+	) -> Self {
+		Self { client, subscriptions, _phantom: PhantomData, rpc_max_payload }
 	}
 
 	/// Returns given block hash or best block hash if None is passed.
@@ -540,9 +545,15 @@ impl<BE, Block, Client> StateBackend<Block, Client> for FullState<BE, Block, Cli
 		targets: Option<String>,
 		storage_keys: Option<String>,
 	) -> FutureResult<sp_rpc::tracing::TraceBlockResponse> {
+		let block_executor = sc_tracing::block::BlockExecutor::new(
+			self.client.clone(),
+			block,
+			targets,
+			storage_keys,
+			self.rpc_max_payload,
+		);
 		Box::new(result(
-			sc_tracing::block::BlockExecutor::new(self.client.clone(), block, targets, storage_keys)
-				.trace_block()
+			block_executor.trace_block()
 				.map_err(|e| invalid_block::<Block>(block, None, e.to_string()))
 		))
 	}
diff --git a/client/rpc/src/state/tests.rs b/client/rpc/src/state/tests.rs
index cfc27c7bf525..e413827552c9 100644
--- a/client/rpc/src/state/tests.rs
+++ b/client/rpc/src/state/tests.rs
@@ -63,6 +63,7 @@ fn should_return_storage() {
 		Arc::new(client),
 		SubscriptionManager::new(Arc::new(TaskExecutor)),
 		DenyUnsafe::No,
+		None,
 	);
 	let key = StorageKey(KEY.to_vec());
 
@@ -105,6 +106,7 @@ fn should_return_child_storage() {
 		client,
 		SubscriptionManager::new(Arc::new(TaskExecutor)),
 		DenyUnsafe::No,
+		None,
 	);
 	let child_key = prefixed_storage_key();
 	let key = StorageKey(b"key".to_vec());
@@ -144,6 +146,7 @@ fn should_call_contract() {
 		client,
 		SubscriptionManager::new(Arc::new(TaskExecutor)),
 		DenyUnsafe::No,
+		None,
 	);
 
 	assert_matches!(
@@ -162,6 +165,7 @@ fn should_notify_about_storage_changes() {
 			client.clone(),
 			SubscriptionManager::new(Arc::new(TaskExecutor)),
 			DenyUnsafe::No,
+			None,
 		);
 
 		api.subscribe_storage(Default::default(), subscriber, None.into());
@@ -200,6 +204,7 @@ fn should_send_initial_storage_changes_and_notifications() {
 			client.clone(),
 			SubscriptionManager::new(Arc::new(TaskExecutor)),
 			DenyUnsafe::No,
+			None,
 		);
 
 		let alice_balance_key = blake2_256(&runtime::system::balance_of_key(AccountKeyring::Alice.into()));
@@ -242,6 +247,7 @@ fn should_query_storage() {
 			client.clone(),
 			SubscriptionManager::new(Arc::new(TaskExecutor)),
 			DenyUnsafe::No,
+			None,
 		);
 
 		let mut add_block = |nonce| {
@@ -463,6 +469,7 @@ fn should_return_runtime_version() {
 		client.clone(),
 		SubscriptionManager::new(Arc::new(TaskExecutor)),
 		DenyUnsafe::No,
+		None,
 	);
 
 	let result = "{\"specName\":\"test\",\"implName\":\"parity-test\",\"authoringVersion\":1,\
@@ -490,6 +497,7 @@ fn should_notify_on_runtime_version_initially() {
 			client.clone(),
 			SubscriptionManager::new(Arc::new(TaskExecutor)),
 			DenyUnsafe::No,
+			None,
 		);
 
 		api.subscribe_runtime_version(Default::default(), subscriber);
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index ebf600b12f02..ca2232279846 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -804,6 +804,7 @@ fn gen_handler<TBl, TBackend, TExPool, TRpc, TCl>(
 			client.clone(),
 			subscriptions.clone(),
 			deny_unsafe,
+			config.rpc_max_payload,
 		);
 		(chain, state, child_state)
 	};
diff --git a/client/service/src/config.rs b/client/service/src/config.rs
index f2c5f2c6ed40..c91cf0a4ef5c 100644
--- a/client/service/src/config.rs
+++ b/client/service/src/config.rs
@@ -95,6 +95,8 @@ pub struct Configuration {
 	pub rpc_cors: Option<Vec<String>>,
 	/// RPC methods to expose (by default only a safe subset or all of them).
 	pub rpc_methods: RpcMethods,
+	/// Maximum payload of rpc request/responses.
+	pub rpc_max_payload: Option<usize>,
 	/// Prometheus endpoint configuration. `None` if disabled.
 	pub prometheus_config: Option<PrometheusConfig>,
 	/// Telemetry service URL. `None` if disabled.
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index 51ee0965ebcf..afc120928032 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -387,6 +387,7 @@ fn start_rpc_servers<
 					deny_unsafe(&address, &config.rpc_methods),
 					sc_rpc_server::RpcMiddleware::new(rpc_metrics.clone(), "http")
 				),
+				config.rpc_max_payload
 			),
 		)?.map(|s| waiting::HttpServer(Some(s))),
 		maybe_start_server(
@@ -399,6 +400,7 @@ fn start_rpc_servers<
 					deny_unsafe(&address, &config.rpc_methods),
 					sc_rpc_server::RpcMiddleware::new(rpc_metrics.clone(), "ws")
 				),
+				config.rpc_max_payload
 			),
 		)?.map(|s| waiting::WsServer(Some(s))),
 	)))
diff --git a/client/service/test/src/lib.rs b/client/service/test/src/lib.rs
index 3999b852ac74..eb437b1aba0a 100644
--- a/client/service/test/src/lib.rs
+++ b/client/service/test/src/lib.rs
@@ -265,6 +265,7 @@ fn node_config<G: RuntimeGenesis + 'static, E: ChainSpecExtension + Clone + 'sta
 		rpc_http_threads: None,
 		rpc_cors: None,
 		rpc_methods: Default::default(),
+		rpc_max_payload: None,
 		prometheus_config: None,
 		telemetry_endpoints: None,
 		telemetry_external_transport: None,
diff --git a/client/tracing/src/block/mod.rs b/client/tracing/src/block/mod.rs
index bc5342c85998..cd5cf1052004 100644
--- a/client/tracing/src/block/mod.rs
+++ b/client/tracing/src/block/mod.rs
@@ -22,7 +22,7 @@ use parking_lot::Mutex;
 use tracing::{Dispatch, dispatcher, Subscriber, Level, span::{Attributes, Record, Id}};
 
 use sc_client_api::BlockBackend;
-use sc_rpc_server::MAX_PAYLOAD;
+use sc_rpc_server::RPC_MAX_PAYLOAD_DEFAULT;
 use sp_api::{Core, Metadata, ProvideRuntimeApi, Encode};
 use sp_blockchain::HeaderBackend;
 use sp_runtime::{
@@ -54,6 +54,7 @@ const DEFAULT_TARGETS: &str = "pallet,frame,state";
 const TRACE_TARGET: &str = "block_trace";
 // The name of a field required for all events.
 const REQUIRED_EVENT_FIELD: &str  = "method";
+const MEGABYTE: usize = 1024 * 1024;
 
 /// Tracing Block Result type alias
 pub type TraceBlockResult<T> = Result<T, Error>;
@@ -174,6 +175,7 @@ pub struct BlockExecutor<Block: BlockT, Client> {
 	block: Block::Hash,
 	targets: Option<String>,
 	storage_keys: Option<String>,
+	rpc_max_payload: usize,
 }
 
 impl<Block, Client> BlockExecutor<Block, Client>
@@ -189,8 +191,11 @@ impl<Block, Client> BlockExecutor<Block, Client>
 		block: Block::Hash,
 		targets: Option<String>,
 		storage_keys: Option<String>,
+		rpc_max_payload: Option<usize>,
 	) -> Self {
-		Self { client, block, targets, storage_keys }
+		let rpc_max_payload = rpc_max_payload.map(|mb| mb.saturating_mul(MEGABYTE))
+			.unwrap_or(RPC_MAX_PAYLOAD_DEFAULT);
+		Self { client, block, targets, storage_keys, rpc_max_payload }
 	}
 
 	/// Execute block, record all spans and events belonging to `Self::targets`
@@ -260,7 +265,7 @@ impl<Block, Client> BlockExecutor<Block, Client>
 		tracing::debug!(target: "state_tracing", "Captured {} spans and {} events", spans.len(), events.len());
 
 		let approx_payload_size = BASE_PAYLOAD + events.len() * AVG_EVENT + spans.len() * AVG_SPAN;
-		let response = if approx_payload_size > MAX_PAYLOAD {
+		let response = if approx_payload_size > self.rpc_max_payload {
 				TraceBlockResponse::TraceError(TraceError {
 					error:
 						"Payload likely exceeds max payload size of RPC server.".to_string()
diff --git a/test-utils/test-runner/src/utils.rs b/test-utils/test-runner/src/utils.rs
index 4f5390a7eb86..fae527ededf9 100644
--- a/test-utils/test-runner/src/utils.rs
+++ b/test-utils/test-runner/src/utils.rs
@@ -127,6 +127,7 @@ pub fn default_config(task_executor: TaskExecutor, mut chain_spec: Box<dyn Chain
 		rpc_http_threads: None,
 		rpc_cors: None,
 		rpc_methods: Default::default(),
+		rpc_max_payload: None,
 		prometheus_config: None,
 		telemetry_endpoints: None,
 		telemetry_external_transport: None,
diff --git a/utils/browser/src/lib.rs b/utils/browser/src/lib.rs
index 9bfe9e3d0d22..d9d77210b930 100644
--- a/utils/browser/src/lib.rs
+++ b/utils/browser/src/lib.rs
@@ -103,6 +103,7 @@ where
 		rpc_ws_max_connections: Default::default(),
 		rpc_http_threads: Default::default(),
 		rpc_methods: Default::default(),
+		rpc_max_payload: Default::default(),
 		state_cache_child_ratio: Default::default(),
 		state_cache_size: Default::default(),
 		tracing_receiver: Default::default(),

From f6b1197b2a773ed003fc46823cd47d82190c22b6 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Thu, 17 Jun 2021 18:01:27 +0200
Subject: [PATCH 0895/1194] double the allocator limit (#9102)

* double the allocator limit

* 32 MiB should be enough for everybody.

* Update doc

Co-authored-by: Sergei Shulepov <sergei@parity.io>
---
 primitives/allocator/src/freeing_bump.rs | 33 +++++++++++++++++++-----
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/primitives/allocator/src/freeing_bump.rs b/primitives/allocator/src/freeing_bump.rs
index 14746c8784f8..64ba136f9a35 100644
--- a/primitives/allocator/src/freeing_bump.rs
+++ b/primitives/allocator/src/freeing_bump.rs
@@ -36,7 +36,7 @@
 //!
 //! For implementing freeing we maintain a linked lists for each order. The maximum supported
 //! allocation size is capped, therefore the number of orders and thus the linked lists is as well
-//! limited. Currently, the maximum size of an allocation is 16 MiB.
+//! limited. Currently, the maximum size of an allocation is 32 MiB.
 //!
 //! When the allocator serves an allocation request it first checks the linked list for the respective
 //! order. If it doesn't have any free chunks, the allocator requests memory from the bump allocator.
@@ -44,6 +44,24 @@
 //!
 //! Upon deallocation we get the order of the allocation from its header and then add that
 //! allocation to the linked list for the respective order.
+//!
+//! # Caveats
+//!
+//! This is a fast allocator but it is also dumb. There are specifically two main shortcomings
+//! that the user should keep in mind:
+//!
+//! - Once the bump allocator space is exhausted, there is no way to reclaim the memory. This means
+//!   that it's possible to end up in a situation where there are no live allocations yet a new
+//!   allocation will fail.
+//!
+//!   Let's look into an example. Given a heap of 32 MiB. The user makes a 32 MiB allocation that we
+//!   call `X` . Now the heap is full. Then user deallocates `X`. Since all the space in the bump
+//!   allocator was consumed by the 32 MiB allocation, allocations of all sizes except 32 MiB will
+//!   fail.
+//!
+//! - Sizes of allocations are rounded up to the nearest order. That is, an allocation of 2,00001 MiB
+//!   will be put into the bucket of 4 MiB. Therefore, typically more than half of the space in allocation
+//!   will be wasted. This is more pronounced with larger allocation sizes.
 
 use crate::Error;
 use sp_std::{mem, convert::{TryFrom, TryInto}, ops::{Range, Index, IndexMut}};
@@ -78,15 +96,15 @@ macro_rules! trace {
 // The minimum possible allocation size is chosen to be 8 bytes because in that case we would have
 // easier time to provide the guaranteed alignment of 8.
 //
-// The maximum possible allocation size was chosen rather arbitrary. 16 MiB should be enough for
+// The maximum possible allocation size was chosen rather arbitrary. 32 MiB should be enough for
 // everybody.
 //
 // N_ORDERS - represents the number of orders supported.
 //
 // This number corresponds to the number of powers between the minimum possible allocation and
-// maximum possible allocation, or: 2^3...2^24 (both ends inclusive, hence 22).
-const N_ORDERS: usize = 22;
-const MAX_POSSIBLE_ALLOCATION: u32 = 16777216; // 2^24 bytes, 16 MiB
+// maximum possible allocation, or: 2^3...2^25 (both ends inclusive, hence 23).
+const N_ORDERS: usize = 23;
+const MAX_POSSIBLE_ALLOCATION: u32 = 33554432; // 2^25 bytes, 32 MiB
 const MIN_POSSIBLE_ALLOCATION: u32 = 8; // 2^3 bytes, 8 bytes
 
 /// The exponent for the power of two sized block adjusted to the minimum size.
@@ -100,6 +118,7 @@ const MIN_POSSIBLE_ALLOCATION: u32 = 8; // 2^3 bytes, 8 bytes
 /// 64                | 3
 /// ...
 /// 16777216          | 21
+/// 33554432          | 22
 ///
 /// and so on.
 #[derive(Copy, Clone, PartialEq, Eq, Debug)]
@@ -329,7 +348,7 @@ impl FreeingBumpHeapAllocator {
 	}
 
 	/// Gets requested number of bytes to allocate and returns a pointer.
-	/// The maximum size which can be allocated at once is 16 MiB.
+	/// The maximum size which can be allocated at once is 32 MiB.
 	/// There is no minimum size, but whatever size is passed into
 	/// this function is rounded to the next power of two. If the requested
 	/// size is below 8 bytes it will be rounded up to 8 bytes.
@@ -813,7 +832,7 @@ mod tests {
 	#[test]
 	fn should_get_max_item_size_from_index() {
 		// given
-		let raw_order = 21;
+		let raw_order = 22;
 
 		// when
 		let item_size = Order::from_raw(raw_order).unwrap().size();

From df1165d7b47d43f7b5032512ad41ac8ab2ead117 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Fri, 18 Jun 2021 20:31:00 +0100
Subject: [PATCH 0896/1194] grandpa: restrict grandpa gossip (#9131)

* grandpa: make gossip more conservative (and fair)

* grandpa: make round commit timer dependent on gossip_duration

* grandpa: add gossip tests

* grandpa: reduce variance in tests
---
 .../src/communication/gossip.rs               | 534 +++++++++---------
 client/finality-grandpa/src/environment.rs    |   5 +-
 client/network-gossip/src/state_machine.rs    |   2 +-
 3 files changed, 272 insertions(+), 269 deletions(-)

diff --git a/client/finality-grandpa/src/communication/gossip.rs b/client/finality-grandpa/src/communication/gossip.rs
index 878a630d0e51..8f46e45d635a 100644
--- a/client/finality-grandpa/src/communication/gossip.rs
+++ b/client/finality-grandpa/src/communication/gossip.rs
@@ -110,12 +110,23 @@ const CATCH_UP_PROCESS_TIMEOUT: Duration = Duration::from_secs(30);
 /// catch up request.
 const CATCH_UP_THRESHOLD: u64 = 2;
 
-const PROPAGATION_ALL: u32 = 4; //in rounds;
-const PROPAGATION_ALL_AUTHORITIES: u32 = 2; //in rounds;
-const PROPAGATION_SOME_NON_AUTHORITIES: u32 = 3; //in rounds;
-const ROUND_DURATION: u32 = 2; // measured in gossip durations
+/// The total round duration measured in periods of gossip duration:
+/// 2 gossip durations for prevote timer
+/// 2 gossip durations for precommit timer
+/// 1 gossip duration for precommits to spread
+const ROUND_DURATION: u32 = 5;
 
-const MIN_LUCKY: usize = 5;
+/// The period, measured in rounds, since the latest round start, after which we will start
+/// propagating gossip messages to more nodes than just the lucky ones.
+const PROPAGATION_SOME: f32 = 1.5;
+
+/// The period, measured in rounds, since the latest round start, after which we will start
+/// propagating gossip messages to all the nodes we are connected to.
+const PROPAGATION_ALL: f32 = 3.0;
+
+/// Assuming a network of 3000 nodes, using a fanout of 4, after about 6 iterations
+/// of gossip a message has very likely reached all nodes on the network (`log4(3000)`).
+const LUCKY_PEERS: usize = 4;
 
 type Report = (PeerId, ReputationChange);
 
@@ -459,6 +470,7 @@ impl Misbehavior {
 	}
 }
 
+#[derive(Debug)]
 struct PeerInfo<N> {
 	view: View<N>,
 	roles: ObservedRole,
@@ -473,19 +485,27 @@ impl<N> PeerInfo<N> {
 	}
 }
 
-/// The peers we're connected do in gossip.
+/// The peers we're connected to in gossip.
 struct Peers<N> {
 	inner: HashMap<PeerId, PeerInfo<N>>,
-	lucky_peers: HashSet<PeerId>,
-	lucky_authorities: HashSet<PeerId>,
+	/// The randomly picked set of `LUCKY_PEERS` we'll gossip to in the first stage of round
+	/// gossiping.
+	first_stage_peers: HashSet<PeerId>,
+	/// The randomly picked set of peers we'll gossip to in the second stage of gossiping if the
+	/// first stage didn't allow us to spread the voting data enough to conclude the round. This set
+	/// should have size `sqrt(connected_peers)`.
+	second_stage_peers: HashSet<PeerId>,
+	/// The randomly picked set of `LUCKY_PEERS` light clients we'll gossip commit messages to.
+	lucky_light_peers: HashSet<PeerId>,
 }
 
 impl<N> Default for Peers<N> {
 	fn default() -> Self {
 		Peers {
 			inner: HashMap::new(),
-			lucky_peers: HashSet::new(),
-			lucky_authorities: HashSet::new(),
+			first_stage_peers: HashSet::new(),
+			second_stage_peers: HashSet::new(),
+			lucky_light_peers: HashSet::new(),
 		}
 	}
 }
@@ -493,14 +513,18 @@ impl<N> Default for Peers<N> {
 impl<N: Ord> Peers<N> {
 	fn new_peer(&mut self, who: PeerId, role: ObservedRole) {
 		match role {
-			ObservedRole::Authority if self.lucky_authorities.len() < MIN_LUCKY => {
-				self.lucky_authorities.insert(who.clone());
+			ObservedRole::Authority if self.first_stage_peers.len() < LUCKY_PEERS => {
+				self.first_stage_peers.insert(who.clone());
 			}
-			ObservedRole::Full if self.lucky_peers.len() < MIN_LUCKY => {
-				self.lucky_peers.insert(who.clone());
+			ObservedRole::Authority if self.second_stage_peers.len() < LUCKY_PEERS => {
+				self.second_stage_peers.insert(who.clone());
+			}
+			ObservedRole::Light if self.lucky_light_peers.len() < LUCKY_PEERS => {
+				self.lucky_light_peers.insert(who.clone());
 			}
 			_ => {}
 		}
+
 		self.inner.insert(who, PeerInfo::new(role));
 	}
 
@@ -508,14 +532,17 @@ impl<N: Ord> Peers<N> {
 		self.inner.remove(who);
 		// This does not happen often enough compared to round duration,
 		// so we don't reshuffle.
-		self.lucky_peers.remove(who);
-		self.lucky_authorities.remove(who);
+		self.first_stage_peers.remove(who);
+		self.second_stage_peers.remove(who);
+		self.lucky_light_peers.remove(who);
 	}
 
 	// returns a reference to the new view, if the peer is known.
-	fn update_peer_state(&mut self, who: &PeerId, update: NeighborPacket<N>)
-		-> Result<Option<&View<N>>, Misbehavior>
-	{
+	fn update_peer_state(
+		&mut self,
+		who: &PeerId,
+		update: NeighborPacket<N>,
+	) -> Result<Option<&View<N>>, Misbehavior> {
 		let peer = match self.inner.get_mut(who) {
 			None => return Ok(None),
 			Some(p) => p,
@@ -563,69 +590,93 @@ impl<N: Ord> Peers<N> {
 		self.inner.get(who)
 	}
 
-	fn connected_authorities(&self) -> usize {
-		self.inner
-			.iter()
-			.filter(|(_, info)| matches!(info.roles, ObservedRole::Authority))
-			.count()
-	}
+	fn reshuffle(&mut self) {
+		// we want to randomly select peers into three sets according to the following logic:
+		// - first set: LUCKY_PEERS random peers where at least LUCKY_PEERS/2 are authorities (unless
+		// we're not connected to that many authorities)
+		// - second set: max(LUCKY_PEERS, sqrt(peers)) peers where at least LUCKY_PEERS are authorities.
+		// - third set: LUCKY_PEERS random light client peers
+
+		let shuffled_peers = {
+			let mut peers = self
+				.inner
+				.iter()
+				.map(|(peer_id, info)| (peer_id.clone(), info.clone()))
+				.collect::<Vec<_>>();
 
-	fn connected_full(&self) -> usize {
-		self.inner
-			.iter()
-			.filter(|(_, info)| matches!(info.roles, ObservedRole::Full))
-			.count()
-	}
+			peers.shuffle(&mut rand::thread_rng());
+			peers
+		};
 
-	fn reshuffle(&mut self) {
-		let mut lucky_peers: Vec<_> = self
-			.inner
-			.iter()
-			.filter_map(|(id, info)| {
-				if matches!(info.roles, ObservedRole::Full) {
-					Some(id.clone())
-				} else {
-					None
+		let shuffled_authorities = shuffled_peers.iter().filter_map(|(peer_id, info)| {
+			if matches!(info.roles, ObservedRole::Authority) {
+				Some(peer_id)
+			} else {
+				None
+			}
+		});
+
+		let mut first_stage_peers = HashSet::new();
+		let mut second_stage_peers = HashSet::new();
+
+		// we start by allocating authorities to the first stage set and when the minimum of
+		// `LUCKY_PEERS / 2` is filled we start allocating to the second stage set.
+		let half_lucky = LUCKY_PEERS / 2;
+		let one_and_a_half_lucky = LUCKY_PEERS + half_lucky;
+		let mut n_authorities_added = 0;
+		for peer_id in shuffled_authorities {
+			if n_authorities_added < half_lucky {
+				first_stage_peers.insert(peer_id.clone());
+			} else if n_authorities_added < one_and_a_half_lucky {
+				second_stage_peers.insert(peer_id.clone());
+			} else {
+				break;
+			}
+
+			n_authorities_added += 1;
+		}
+
+		// fill up first and second sets with remaining peers (either full or authorities)
+		// prioritizing filling the first set over the second.
+		let n_second_stage_peers = LUCKY_PEERS.max((shuffled_peers.len() as f32).sqrt() as usize);
+		for (peer_id, info) in &shuffled_peers {
+			if info.roles.is_light() {
+				continue;
+			}
+
+			if first_stage_peers.len() < LUCKY_PEERS {
+				first_stage_peers.insert(peer_id.clone());
+				second_stage_peers.remove(peer_id);
+			} else if second_stage_peers.len() < n_second_stage_peers {
+				if !first_stage_peers.contains(peer_id) {
+					second_stage_peers.insert(peer_id.clone());
 				}
-			})
-			.collect();
+			} else {
+				break;
+			}
+		}
 
-		let mut lucky_authorities: Vec<_> = self
-			.inner
-			.iter()
-			.filter_map(|(id, info)| {
-				if matches!(info.roles, ObservedRole::Authority) {
-					Some(id.clone())
+		// pick `LUCKY_PEERS` random light peers
+		let lucky_light_peers = shuffled_peers
+			.into_iter()
+			.filter_map(|(peer_id, info)| {
+				if info.roles.is_light() {
+					Some(peer_id)
 				} else {
 					None
 				}
 			})
+			.take(LUCKY_PEERS)
 			.collect();
 
-		let num_non_authorities = ((lucky_peers.len() as f32).sqrt() as usize)
-			.max(MIN_LUCKY)
-			.min(lucky_peers.len());
-
-		let num_authorities = ((lucky_authorities.len() as f32).sqrt() as usize)
-			.max(MIN_LUCKY)
-			.min(lucky_authorities.len());
-
-		lucky_peers.partial_shuffle(&mut rand::thread_rng(), num_non_authorities);
-		lucky_peers.truncate(num_non_authorities);
-
-		lucky_authorities.partial_shuffle(&mut rand::thread_rng(), num_authorities);
-		lucky_authorities.truncate(num_authorities);
-
-		self.lucky_peers.clear();
-		self.lucky_peers.extend(lucky_peers.into_iter());
-
-		self.lucky_authorities.clear();
-		self.lucky_authorities.extend(lucky_authorities.into_iter());
+		self.first_stage_peers = first_stage_peers;
+		self.second_stage_peers = second_stage_peers;
+		self.lucky_light_peers = lucky_light_peers;
 	}
 }
 
 #[derive(Debug, PartialEq)]
-pub(super) enum Action<H>  {
+pub(super) enum Action<H> {
 	// repropagate under given topic, to the given peers, applying cost/benefit to originator.
 	Keep(H, ReputationChange),
 	// discard and process.
@@ -1182,76 +1233,40 @@ impl<Block: BlockT> Inner<Block> {
 	/// The initial logic for filtering round messages follows the given state
 	/// transitions:
 	///
-	/// - State 0: not allowed to anyone (only if our local node is not an authority)
-	/// - State 1: allowed to random `sqrt(authorities)`
-	/// - State 2: allowed to all authorities
-	/// - State 3: allowed to random `sqrt(non-authorities)`
-	/// - State 4: allowed to all non-authorities
+	/// - State 1: allowed to LUCKY_PEERS random peers (where at least LUCKY_PEERS/2 are authorities)
+	/// - State 2: allowed to max(LUCKY_PEERS, sqrt(random peers)) (where at least LUCKY_PEERS are authorities)
+	/// - State 3: allowed to all peers
 	///
-	/// Transitions will be triggered on repropagation attempts by the
-	/// underlying gossip layer, which should happen every 30 seconds.
-	fn round_message_allowed<N>(&self, who: &PeerId, peer: &PeerInfo<N>) -> bool {
+	/// Transitions will be triggered on repropagation attempts by the underlying gossip layer.
+	fn round_message_allowed(&self, who: &PeerId) -> bool {
 		let round_duration = self.config.gossip_duration * ROUND_DURATION;
 		let round_elapsed = match self.local_view {
 			Some(ref local_view) => local_view.round_start.elapsed(),
 			None => return false,
 		};
 
-		if !self.config.local_role.is_authority()
-			&& round_elapsed < round_duration * PROPAGATION_ALL
-		{
-			// non-authority nodes don't gossip any messages right away. we
-			// assume that authorities (and sentries) are strongly connected, so
-			// it should be unnecessary for non-authorities to gossip all
-			// messages right away.
+		if self.config.local_role.is_light() {
 			return false;
 		}
 
-		match peer.roles {
-			ObservedRole::Authority => {
-				let authorities = self.peers.connected_authorities();
-
-				// the target node is an authority, on the first round duration we start by
-				// sending the message to only `sqrt(authorities)` (if we're
-				// connected to at least `MIN_LUCKY`).
-				if round_elapsed < round_duration * PROPAGATION_ALL_AUTHORITIES
-					&& authorities > MIN_LUCKY
-				{
-					self.peers.lucky_authorities.contains(who)
-				} else {
-					// otherwise we already went through the step above, so
-					// we won't filter the message and send it to all
-					// authorities for whom it is polite to do so
-					true
-				}
-			}
-			ObservedRole::Full => {
-				// the node is not an authority so we apply stricter filters
-				if round_elapsed >= round_duration * PROPAGATION_ALL {
-					// if we waited for 3 (or more) rounds
-					// then it is allowed to be sent to all peers.
-					true
-				} else if round_elapsed >= round_duration * PROPAGATION_SOME_NON_AUTHORITIES {
-					// otherwise we only send it to `sqrt(non-authorities)`.
-					self.peers.lucky_peers.contains(who)
-				} else {
-					false
-				}
-			}
-			ObservedRole::Light => {
-				// we never gossip round messages to light clients as they don't
-				// participate in the full grandpa protocol
-				false
-			}
+		if round_elapsed < round_duration.mul_f32(PROPAGATION_SOME) {
+			self.peers.first_stage_peers.contains(who)
+		} else if round_elapsed < round_duration.mul_f32(PROPAGATION_ALL) {
+			self.peers.first_stage_peers.contains(who)
+				|| self.peers.second_stage_peers.contains(who)
+		} else {
+			self.peers
+				.peer(who)
+				.map(|info| !info.roles.is_light())
+				.unwrap_or(false)
 		}
 	}
 
 	/// The initial logic for filtering global messages follows the given state
 	/// transitions:
 	///
-	/// - State 0: send to `sqrt(authorities)` ++ `sqrt(non-authorities)`.
-	/// - State 1: send to all authorities
-	/// - State 2: send to all non-authorities
+	/// - State 1: allowed to max(LUCKY_PEERS, sqrt(peers)) (where at least LUCKY_PEERS are authorities)
+	/// - State 2: allowed to all peers
 	///
 	/// We are more lenient with global messages since there should be a lot
 	/// less global messages than round messages (just commits), and we want
@@ -1260,49 +1275,23 @@ impl<Block: BlockT> Inner<Block> {
 	///
 	/// Transitions will be triggered on repropagation attempts by the
 	/// underlying gossip layer, which should happen every 30 seconds.
-	fn global_message_allowed<N>(&self, who: &PeerId, peer: &PeerInfo<N>) -> bool {
+	fn global_message_allowed(&self, who: &PeerId) -> bool {
 		let round_duration = self.config.gossip_duration * ROUND_DURATION;
 		let round_elapsed = match self.local_view {
 			Some(ref local_view) => local_view.round_start.elapsed(),
 			None => return false,
 		};
 
-		match peer.roles {
-			ObservedRole::Authority => {
-				let authorities = self.peers.connected_authorities();
-
-				// the target node is an authority, on the first round duration we start by
-				// sending the message to only `sqrt(authorities)` (if we're
-				// connected to at least `MIN_LUCKY`).
-				if round_elapsed < round_duration * PROPAGATION_ALL_AUTHORITIES
-					&& authorities > MIN_LUCKY
-				{
-					self.peers.lucky_authorities.contains(who)
-				} else {
-					// otherwise we already went through the step above, so
-					// we won't filter the message and send it to all
-					// authorities for whom it is polite to do so
-					true
-				}
-			}
-			ObservedRole::Full | ObservedRole::Light => {
-				let non_authorities = self.peers.connected_full();
-
-				// the target node is not an authority, on the first and second
-				// round duration we start by sending the message to only
-				// `sqrt(non_authorities)` (if we're connected to at least
-				// `MIN_LUCKY`).
-				if round_elapsed < round_duration * PROPAGATION_SOME_NON_AUTHORITIES
-					&& non_authorities > MIN_LUCKY
-				{
-					self.peers.lucky_peers.contains(who)
-				} else {
-					// otherwise we already went through the step above, so
-					// we won't filter the message and send it to all
-					// non-authorities for whom it is polite to do so
-					true
-				}
-			}
+		if self.config.local_role.is_light() {
+			return false;
+		}
+
+		if round_elapsed < round_duration.mul_f32(PROPAGATION_ALL) {
+			self.peers.first_stage_peers.contains(who)
+				|| self.peers.second_stage_peers.contains(who)
+				|| self.peers.lucky_light_peers.contains(who)
+		} else {
+			true
 		}
 	}
 }
@@ -1529,9 +1518,12 @@ impl<Block: BlockT> sc_network_gossip::Validator<Block> for GossipValidator<Bloc
 		self.inner.write().peers.peer_disconnected(who);
 	}
 
-	fn validate(&self, context: &mut dyn ValidatorContext<Block>, who: &PeerId, data: &[u8])
-		-> sc_network_gossip::ValidationResult<Block::Hash>
-	{
+	fn validate(
+		&self,
+		context: &mut dyn ValidatorContext<Block>,
+		who: &PeerId,
+		data: &[u8],
+	) -> sc_network_gossip::ValidationResult<Block::Hash> {
 		let (action, broadcast_topics, peer_reply) = self.do_validate(who, data);
 
 		// not with lock held!
@@ -1560,9 +1552,9 @@ impl<Block: BlockT> sc_network_gossip::Validator<Block> for GossipValidator<Bloc
 		}
 	}
 
-	fn message_allowed<'a>(&'a self)
-		-> Box<dyn FnMut(&PeerId, MessageIntent, &Block::Hash, &[u8]) -> bool + 'a>
-	{
+	fn message_allowed<'a>(
+		&'a self,
+	) -> Box<dyn FnMut(&PeerId, MessageIntent, &Block::Hash, &[u8]) -> bool + 'a> {
 		let (inner, do_rebroadcast) = {
 			use parking_lot::RwLockWriteGuard;
 
@@ -1598,12 +1590,12 @@ impl<Block: BlockT> sc_network_gossip::Validator<Block> for GossipValidator<Bloc
 
 			if let MessageIntent::Broadcast = intent {
 				if maybe_round.is_some() {
-					if !inner.round_message_allowed(who, peer) {
+					if !inner.round_message_allowed(who) {
 						// early return if the vote message isn't allowed at this stage.
 						return false;
 					}
 				} else {
-					if !inner.global_message_allowed(who, peer) {
+					if !inner.global_message_allowed(who) {
 						// early return if the global message isn't allowed at this stage.
 						return false;
 					}
@@ -2391,7 +2383,7 @@ mod tests {
 	}
 
 	#[test]
-	fn progressively_gossips_to_more_peers() {
+	fn progressively_gossips_to_more_peers_as_round_duration_increases() {
 		let mut config = config();
 		config.gossip_duration = Duration::from_secs(300); // Set to high value to prevent test race
 		let round_duration = config.gossip_duration * ROUND_DURATION;
@@ -2414,14 +2406,26 @@ mod tests {
 		full_nodes.resize_with(30, || PeerId::random());
 
 		for i in 0..30 {
-			val.inner.write().peers.new_peer(authorities[i].clone(), ObservedRole::Authority);
-			val.inner.write().peers.new_peer(full_nodes[i].clone(), ObservedRole::Full);
+			val.inner
+				.write()
+				.peers
+				.new_peer(authorities[i].clone(), ObservedRole::Authority);
+
+			val.inner
+				.write()
+				.peers
+				.new_peer(full_nodes[i].clone(), ObservedRole::Full);
 		}
 
-		let test = |num_round, peers| {
+		let test = |rounds_elapsed, peers| {
 			// rewind n round durations
-			val.inner.write().local_view.as_mut().unwrap().round_start =
-				Instant::now() - round_duration * num_round;
+			val.inner.write().local_view.as_mut().unwrap().round_start = Instant::now() -
+				Duration::from_millis(
+					(round_duration.as_millis() as f32 * rounds_elapsed) as u64,
+				);
+
+			val.inner.write().peers.reshuffle();
+
 			let mut message_allowed = val.message_allowed();
 
 			move || {
@@ -2454,121 +2458,119 @@ mod tests {
 			sum / n
 		}
 
-		// on the first attempt we will only gossip to `sqrt(authorities)`,
-		// which should average out to 5 peers after a couple of trials
-		assert_eq!(trial(test(1, &authorities)), 5);
-
-		// on the second (and subsequent attempts) we should gossip to all
-		// authorities we're connected to.
-		assert_eq!(trial(test(2, &authorities)), 30);
-		assert_eq!(trial(test(3, &authorities)), 30);
-
-		// we should only gossip to non-authorities after the third attempt
-		assert_eq!(trial(test(1, &full_nodes)), 0);
-		assert_eq!(trial(test(2, &full_nodes)), 0);
+		let all_peers = authorities
+			.iter()
+			.chain(full_nodes.iter())
+			.cloned()
+			.collect();
 
-		// and only to `sqrt(non-authorities)`
-		assert_eq!(trial(test(3, &full_nodes)), 5);
+		// on the first attempt we will only gossip to 4 peers, either
+		// authorities or full nodes, but we'll guarantee that half of those
+		// are authorities
+		assert!(trial(test(1.0, &authorities)) >= LUCKY_PEERS / 2);
+		assert_eq!(trial(test(1.0, &all_peers)), LUCKY_PEERS);
+
+		// after more than 1.5 round durations have elapsed we should gossip to
+		// `sqrt(peers)` we're connected to, but we guarantee that at least 4 of
+		// those peers are authorities (plus the `LUCKY_PEERS` from the previous
+		// stage)
+		assert!(trial(test(PROPAGATION_SOME * 1.1, &authorities)) >= LUCKY_PEERS);
+		assert_eq!(
+			trial(test(2.0, &all_peers)),
+			LUCKY_PEERS + (all_peers.len() as f64).sqrt() as usize,
+		);
 
-		// only on the fourth attempt should we gossip to all non-authorities
-		assert_eq!(trial(test(4, &full_nodes)), 30);
+		// after 3 rounds durations we should gossip to all peers we are
+		// connected to
+		assert_eq!(trial(test(PROPAGATION_ALL * 1.1, &all_peers)), all_peers.len());
 	}
 
 	#[test]
-	fn only_restricts_gossip_to_authorities_after_a_minimum_threshold() {
-		let (val, _) = GossipValidator::<Block>::new(
-			config(),
-			voter_set_state(),
-			None,
-			None,
-		);
+	fn never_gossips_round_messages_to_light_clients() {
+		let config = config();
+		let round_duration = config.gossip_duration * ROUND_DURATION;
+		let (val, _) = GossipValidator::<Block>::new(config, voter_set_state(), None, None);
 
-		// the validator start at set id 0
+		// the validator starts at set id 0
 		val.note_set(SetId(0), Vec::new(), |_, _| {});
 
-		let mut authorities = Vec::new();
-		for _ in 0..5 {
-			let peer_id = PeerId::random();
-			val.inner.write().peers.new_peer(peer_id.clone(), ObservedRole::Authority);
-			authorities.push(peer_id);
-		}
+		// add a new light client as peer
+		let light_peer = PeerId::random();
 
-		let mut message_allowed = val.message_allowed();
+		val.inner
+			.write()
+			.peers
+			.new_peer(light_peer.clone(), ObservedRole::Light);
 
-		// since we're only connected to 5 authorities, we should never restrict
-		// sending of gossip messages, and instead just allow them to all
-		// non-authorities on the first attempt.
-		for authority in &authorities {
-			assert!(
-				message_allowed(
-					authority,
-					MessageIntent::Broadcast,
-					&crate::communication::round_topic::<Block>(1, 0),
-					&[],
-				)
-			);
-		}
-	}
+		assert!(!val.message_allowed()(
+			&light_peer,
+			MessageIntent::Broadcast,
+			&crate::communication::round_topic::<Block>(1, 0),
+			&[],
+		));
 
-	#[test]
-	fn non_authorities_never_gossip_messages_on_first_round_duration() {
-		let mut config = config();
-		config.gossip_duration = Duration::from_secs(300); // Set to high value to prevent test race
-		config.local_role = Role::Full;
-		let round_duration = config.gossip_duration * ROUND_DURATION;
+		// we reverse the round start time so that the elapsed time is higher
+		// (which should lead to more peers getting the message)
+		val.inner.write().local_view.as_mut().unwrap().round_start =
+			Instant::now() - round_duration * 10;
 
-		let (val, _) = GossipValidator::<Block>::new(config, voter_set_state(), None, None);
+		// even after the round has been going for 10 round durations we will never
+		// gossip to light clients
+		assert!(!val.message_allowed()(
+			&light_peer,
+			MessageIntent::Broadcast,
+			&crate::communication::round_topic::<Block>(1, 0),
+			&[],
+		));
 
-		// the validator start at set id 0
-		val.note_set(SetId(0), Vec::new(), |_, _| {});
+		// update the peer state and local state wrt commits
+		val.inner
+			.write()
+			.peers
+			.update_peer_state(
+				&light_peer,
+				NeighborPacket {
+					round: Round(1),
+					set_id: SetId(0),
+					commit_finalized_height: 1,
+				},
+			)
+			.unwrap();
 
-		let mut authorities = Vec::new();
-		for _ in 0..100 {
-			let peer_id = PeerId::random();
-			val.inner.write().peers.new_peer(peer_id.clone(), ObservedRole::Authority);
-			authorities.push(peer_id);
-		}
+		val.note_commit_finalized(Round(1), SetId(0), 2, |_, _| {});
 
-		{
-			let mut message_allowed = val.message_allowed();
-			// since our node is not an authority we should **never** gossip any
-			// messages on the first attempt.
-			for authority in &authorities {
-				assert!(
-					!message_allowed(
-						authority,
-						MessageIntent::Broadcast,
-						&crate::communication::round_topic::<Block>(1, 0),
-						&[],
-					)
-				);
-			}
-		}
+		let commit = {
+			let commit = finality_grandpa::CompactCommit {
+				target_hash: H256::random(),
+				target_number: 2,
+				precommits: Vec::new(),
+				auth_data: Vec::new(),
+			};
 
-		{
-			val.inner.write().local_view.as_mut().unwrap().round_start =
-				Instant::now() - round_duration * 4;
-			let mut message_allowed = val.message_allowed();
-			// on the fourth round duration we should allow messages to authorities
-			// (on the second we would do `sqrt(authorities)`)
-			for authority in &authorities {
-				assert!(
-					message_allowed(
-						authority,
-						MessageIntent::Broadcast,
-						&crate::communication::round_topic::<Block>(1, 0),
-						&[],
-					)
-				);
-			}
-		}
+			crate::communication::gossip::GossipMessage::<Block>::Commit(
+				crate::communication::gossip::FullCommitMessage {
+					round: Round(2),
+					set_id: SetId(0),
+					message: commit,
+				},
+			)
+			.encode()
+		};
+
+		// global messages are gossiped to light clients though
+		assert!(val.message_allowed()(
+			&light_peer,
+			MessageIntent::Broadcast,
+			&crate::communication::global_topic::<Block>(0),
+			&commit,
+		));
 	}
 
 	#[test]
 	fn only_gossip_commits_to_peers_on_same_set() {
 		let (val, _) = GossipValidator::<Block>::new(config(), voter_set_state(), None, None);
 
-		// the validator start at set id 1
+		// the validator starts at set id 1
 		val.note_set(SetId(1), Vec::new(), |_, _| {});
 
 		// add a new peer at set id 1
diff --git a/client/finality-grandpa/src/environment.rs b/client/finality-grandpa/src/environment.rs
index 3d593a17ffdb..62d9a4a8bb9e 100644
--- a/client/finality-grandpa/src/environment.rs
+++ b/client/finality-grandpa/src/environment.rs
@@ -1181,8 +1181,9 @@ where
 	fn round_commit_timer(&self) -> Self::Timer {
 		use rand::{thread_rng, Rng};
 
-		//random between 0-1 seconds.
-		let delay: u64 = thread_rng().gen_range(0, 1000);
+		// random between `[0, 2 * gossip_duration]` seconds.
+		let delay: u64 =
+			thread_rng().gen_range(0, 2 * self.config.gossip_duration.as_millis() as u64);
 		Box::pin(Delay::new(Duration::from_millis(delay)).map(Ok))
 	}
 
diff --git a/client/network-gossip/src/state_machine.rs b/client/network-gossip/src/state_machine.rs
index 74f716133b47..ea1a33658598 100644
--- a/client/network-gossip/src/state_machine.rs
+++ b/client/network-gossip/src/state_machine.rs
@@ -41,7 +41,7 @@ use wasm_timer::Instant;
 // this cache should take about 256 KB of memory.
 const KNOWN_MESSAGES_CACHE_SIZE: usize = 8192;
 
-const REBROADCAST_INTERVAL: time::Duration = time::Duration::from_secs(30);
+const REBROADCAST_INTERVAL: time::Duration = time::Duration::from_millis(750);
 
 pub(crate) const PERIODIC_MAINTENANCE_INTERVAL: time::Duration = time::Duration::from_millis(1100);
 

From 8b4df6ad44c169e727278a9ad012d065ecca0661 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Sat, 19 Jun 2021 13:40:53 +0100
Subject: [PATCH 0897/1194] babe: add comments to block weight and expose
 block_weight function (#9145)

* babe: add comments to block weight and expose block_weight function

* babe: expose function for block weight key
---
 client/consensus/babe/src/aux_schema.rs |   3 +-
 client/consensus/babe/src/lib.rs        | 101 ++++++++++++------------
 primitives/consensus/babe/src/lib.rs    |   6 +-
 3 files changed, 59 insertions(+), 51 deletions(-)

diff --git a/client/consensus/babe/src/aux_schema.rs b/client/consensus/babe/src/aux_schema.rs
index 8b8804e3bfb0..69c1a1930bbb 100644
--- a/client/consensus/babe/src/aux_schema.rs
+++ b/client/consensus/babe/src/aux_schema.rs
@@ -32,7 +32,8 @@ const BABE_EPOCH_CHANGES_VERSION: &[u8] = b"babe_epoch_changes_version";
 const BABE_EPOCH_CHANGES_KEY: &[u8] = b"babe_epoch_changes";
 const BABE_EPOCH_CHANGES_CURRENT_VERSION: u32 = 2;
 
-fn block_weight_key<H: Encode>(block_hash: H) -> Vec<u8> {
+/// The aux storage key used to store the block weight of the given block hash.
+pub fn block_weight_key<H: Encode>(block_hash: H) -> Vec<u8> {
 	(b"block_weight", block_hash).encode()
 }
 
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index 409999ef1fdc..8aa92f37815e 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -65,70 +65,73 @@
 
 #![forbid(unsafe_code)]
 #![warn(missing_docs)]
-pub use sp_consensus_babe::{
-	BabeApi, ConsensusLog, BABE_ENGINE_ID, BabeEpochConfiguration, BabeGenesisConfiguration,
-	AuthorityId, AuthorityPair, AuthoritySignature, BabeAuthorityWeight, VRF_OUTPUT_LENGTH,
-	digests::{
-		CompatibleDigestItem, NextEpochDescriptor, NextConfigDescriptor, PreDigest,
-		PrimaryPreDigest, SecondaryPlainPreDigest,
-	},
-};
-pub use sp_consensus::SyncOracle;
-pub use sc_consensus_slots::SlotProportion;
+
 use std::{
-	collections::HashMap, sync::Arc, u64, pin::Pin, borrow::Cow, convert::TryInto,
-	time::Duration,
+	borrow::Cow, collections::HashMap, convert::TryInto, pin::Pin, sync::Arc, time::Duration, u64,
 };
-use sp_consensus::{ImportResult, CanAuthorWith, import_queue::BoxJustificationImport};
-use sp_core::crypto::Public;
-use sp_application_crypto::AppKey;
-use sp_keystore::{SyncCryptoStorePtr, SyncCryptoStore};
-use sp_runtime::{
-	generic::{BlockId, OpaqueDigestItemId}, Justifications,
-	traits::{Block as BlockT, Header, DigestItemFor, Zero},
-};
-use sp_api::{ProvideRuntimeApi, NumberFor};
-use parking_lot::Mutex;
-use sp_inherents::{CreateInherentDataProviders, InherentDataProvider, InherentData};
-use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_TRACE, CONSENSUS_DEBUG};
-use sp_consensus::{
-	BlockImport, Environment, Proposer, BlockCheckParams,
-	ForkChoiceStrategy, BlockImportParams, BlockOrigin, Error as ConsensusError,
-	SelectChain, SlotData, import_queue::{Verifier, BasicQueue, DefaultImportQueue, CacheKeyId},
-};
-use sp_consensus_babe::inherents::BabeInherentData;
-use sc_client_api::{
-	backend::AuxStore, BlockchainEvents, ProvideUncles, UsageProvider
-};
-use sp_block_builder::BlockBuilder as BlockBuilderApi;
-use futures::channel::mpsc::{channel, Sender, Receiver};
-use futures::channel::oneshot;
-use retain_mut::RetainMut;
 
+use codec::{Decode, Encode};
+use futures::channel::mpsc::{channel, Receiver, Sender};
+use futures::channel::oneshot;
 use futures::prelude::*;
 use log::{debug, info, log, trace, warn};
+use parking_lot::Mutex;
 use prometheus_endpoint::Registry;
-use sc_consensus_slots::{
-	SlotInfo, StorageChanges, CheckedHeader, check_equivocation,
-	BackoffAuthoringBlocksStrategy, InherentDataProviderExt,
-};
+use retain_mut::RetainMut;
+use schnorrkel::SignatureError;
+
+use sc_client_api::{backend::AuxStore, BlockchainEvents, ProvideUncles, UsageProvider};
 use sc_consensus_epochs::{
-	descendent_query, SharedEpochChanges, EpochChangesFor, Epoch as EpochT, ViableEpochDescriptor,
+	descendent_query, Epoch as EpochT, EpochChangesFor, SharedEpochChanges, ViableEpochDescriptor,
 };
-use sp_blockchain::{
-	Result as ClientResult, Error as ClientError,
-	HeaderBackend, ProvideCache, HeaderMetadata
+use sc_consensus_slots::{
+	check_equivocation, BackoffAuthoringBlocksStrategy, CheckedHeader, InherentDataProviderExt,
+	SlotInfo, StorageChanges,
 };
-use schnorrkel::SignatureError;
-use codec::{Encode, Decode};
+use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_DEBUG, CONSENSUS_TRACE};
 use sp_api::ApiExt;
+use sp_api::{NumberFor, ProvideRuntimeApi};
+use sp_application_crypto::AppKey;
+use sp_block_builder::BlockBuilder as BlockBuilderApi;
+use sp_blockchain::{
+	Error as ClientError, HeaderBackend, HeaderMetadata, ProvideCache, Result as ClientResult,
+};
+use sp_consensus::{import_queue::BoxJustificationImport, CanAuthorWith, ImportResult};
+use sp_consensus::{
+	import_queue::{BasicQueue, CacheKeyId, DefaultImportQueue, Verifier},
+	BlockCheckParams, BlockImport, BlockImportParams, BlockOrigin, Environment,
+	Error as ConsensusError, ForkChoiceStrategy, Proposer, SelectChain, SlotData,
+};
+use sp_consensus_babe::inherents::BabeInherentData;
 use sp_consensus_slots::Slot;
+use sp_core::crypto::Public;
+use sp_inherents::{CreateInherentDataProviders, InherentData, InherentDataProvider};
+use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr};
+use sp_runtime::{
+	generic::{BlockId, OpaqueDigestItemId},
+	traits::{Block as BlockT, DigestItemFor, Header, Zero},
+	Justifications,
+};
+
+pub use sc_consensus_slots::SlotProportion;
+pub use sp_consensus::SyncOracle;
+pub use sp_consensus_babe::{
+	digests::{
+		CompatibleDigestItem, NextConfigDescriptor, NextEpochDescriptor, PreDigest,
+		PrimaryPreDigest, SecondaryPlainPreDigest,
+	},
+	AuthorityId, AuthorityPair, AuthoritySignature, BabeApi, BabeAuthorityWeight,
+	BabeEpochConfiguration, BabeGenesisConfiguration, ConsensusLog, BABE_ENGINE_ID,
+	VRF_OUTPUT_LENGTH,
+};
+
+pub use aux_schema::load_block_weight as block_weight;
 
-mod verification;
 mod migration;
+mod verification;
 
-pub mod aux_schema;
 pub mod authorship;
+pub mod aux_schema;
 #[cfg(test)]
 mod tests;
 
diff --git a/primitives/consensus/babe/src/lib.rs b/primitives/consensus/babe/src/lib.rs
index da9f089e4561..3609a0b8ce32 100644
--- a/primitives/consensus/babe/src/lib.rs
+++ b/primitives/consensus/babe/src/lib.rs
@@ -88,7 +88,11 @@ pub type EquivocationProof<H> = sp_consensus_slots::EquivocationProof<H, Authori
 //       `Weight` types, since the metadata isn't able to disambiguate.
 pub type BabeAuthorityWeight = u64;
 
-/// The weight of a BABE block.
+/// The cumulative weight of a BABE block, i.e. sum of block weights starting
+/// at this block until the genesis block.
+///
+/// Primary blocks have a weight of 1 whereas secondary blocks have a weight
+/// of 0 (regardless of whether they are plain or vrf secondary blocks).
 pub type BabeBlockWeight = u32;
 
 /// Make a VRF transcript from given randomness, slot number and epoch.

From 4d9f03d3d6d0ceec0708b1a23978feee12f5b0bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Sat, 19 Jun 2021 21:37:33 +0100
Subject: [PATCH 0898/1194] slots: slot lenience must take into account block
 proposal portion (#9138)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* aura, babe: proposal slot lenience must take into account proposal portion

* slots: add support for max_block_proposal_slot_portion

* fix compilation

* slots: add tests

* aura: fix comment

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* slots: log the actual proposing duration after lenience is applied

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 bin/node-template/node/src/service.rs |   1 +
 bin/node/cli/src/service.rs           |   1 +
 client/consensus/aura/src/lib.rs      |  67 ++++++--------
 client/consensus/babe/src/lib.rs      |  98 +++++++++-----------
 client/consensus/babe/src/tests.rs    |   1 +
 client/consensus/slots/src/lib.rs     | 124 +++++++++++++++++++++++++-
 6 files changed, 194 insertions(+), 98 deletions(-)

diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
index 51b63e614fb8..c19824e9eaa3 100644
--- a/bin/node-template/node/src/service.rs
+++ b/bin/node-template/node/src/service.rs
@@ -245,6 +245,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 				sync_oracle: network.clone(),
 				justification_sync_link: network.clone(),
 				block_proposal_slot_portion: SlotProportion::new(2f32 / 3f32),
+				max_block_proposal_slot_portion: None,
 				telemetry: telemetry.as_ref().map(|x| x.handle()),
 			},
 		)?;
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index 06e1fcc80477..8fa3d2ed77ce 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -333,6 +333,7 @@ pub fn new_full_base(
 			babe_link,
 			can_author_with,
 			block_proposal_slot_portion: SlotProportion::new(0.5),
+			max_block_proposal_slot_portion: None,
 			telemetry: telemetry.as_ref().map(|x| x.handle()),
 		};
 
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index d0b0cefe8ddc..845e920cfc11 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -140,6 +140,9 @@ pub struct StartAuraParams<C, SC, I, PF, SO, L, CIDP, BS, CAW> {
 	/// slot. However, the proposing can still take longer when there is some lenience factor applied,
 	/// because there were no blocks produced for some slots.
 	pub block_proposal_slot_portion: SlotProportion,
+	/// The maximum proportion of the slot dedicated to proposing with any lenience factor applied
+	/// due to no blocks being produced.
+	pub max_block_proposal_slot_portion: Option<SlotProportion>,
 	/// Telemetry instance used to report telemetry metrics.
 	pub telemetry: Option<TelemetryHandle>,
 }
@@ -160,9 +163,11 @@ pub fn start_aura<P, B, C, SC, I, PF, SO, L, CIDP, BS, CAW, Error>(
 		keystore,
 		can_author_with,
 		block_proposal_slot_portion,
+		max_block_proposal_slot_portion,
 		telemetry,
 	}: StartAuraParams<C, SC, I, PF, SO, L, CIDP, BS, CAW>,
-) -> Result<impl Future<Output = ()>, sp_consensus::Error> where
+) -> Result<impl Future<Output = ()>, sp_consensus::Error>
+where
 	P: Pair + Send + Sync,
 	P::Public: AppPublic + Hash + Member + Encode + Decode,
 	P::Signature: TryFrom<Vec<u8>> + Hash + Member + Encode + Decode,
@@ -192,6 +197,7 @@ pub fn start_aura<P, B, C, SC, I, PF, SO, L, CIDP, BS, CAW, Error>(
 		backoff_authoring_blocks,
 		telemetry,
 		block_proposal_slot_portion,
+		max_block_proposal_slot_portion,
 	});
 
 	Ok(sc_consensus_slots::start_slot_worker(
@@ -228,6 +234,9 @@ pub struct BuildAuraWorkerParams<C, I, PF, SO, L, BS> {
 	/// slot. However, the proposing can still take longer when there is some lenience factor applied,
 	/// because there were no blocks produced for some slots.
 	pub block_proposal_slot_portion: SlotProportion,
+	/// The maximum proportion of the slot dedicated to proposing with any lenience factor applied
+	/// due to no blocks being produced.
+	pub max_block_proposal_slot_portion: Option<SlotProportion>,
 	/// Telemetry instance used to report telemetry metrics.
 	pub telemetry: Option<TelemetryHandle>,
 }
@@ -245,10 +254,12 @@ pub fn build_aura_worker<P, B, C, PF, I, SO, L, BS, Error>(
 		backoff_authoring_blocks,
 		keystore,
 		block_proposal_slot_portion,
+		max_block_proposal_slot_portion,
 		telemetry,
 		force_authoring,
 	}: BuildAuraWorkerParams<C, I, PF, SO, L, BS>,
-) -> impl sc_consensus_slots::SlotWorker<B, <PF::Proposer as Proposer<B>>::Proof> where
+) -> impl sc_consensus_slots::SlotWorker<B, <PF::Proposer as Proposer<B>>::Proof>
+where
 	B: BlockT,
 	C: ProvideRuntimeApi<B> + BlockOf + ProvideCache<B> + AuxStore + HeaderBackend<B> + Send + Sync,
 	C::Api: AuraApi<B, AuthorityId<P>>,
@@ -274,6 +285,7 @@ pub fn build_aura_worker<P, B, C, PF, I, SO, L, BS, Error>(
 		backoff_authoring_blocks,
 		telemetry,
 		block_proposal_slot_portion,
+		max_block_proposal_slot_portion,
 		_key_type: PhantomData::<P>,
 	}
 }
@@ -288,6 +300,7 @@ struct AuraWorker<C, E, I, P, SO, L, BS> {
 	force_authoring: bool,
 	backoff_authoring_blocks: Option<BS>,
 	block_proposal_slot_portion: SlotProportion,
+	max_block_proposal_slot_portion: Option<SlotProportion>,
 	telemetry: Option<TelemetryHandle>,
 	_key_type: PhantomData<P>,
 }
@@ -452,42 +465,17 @@ where
 		self.telemetry.clone()
 	}
 
-	fn proposing_remaining_duration(
-		&self,
-		slot_info: &SlotInfo<B>,
-	) -> std::time::Duration {
-		let max_proposing = slot_info.duration.mul_f32(self.block_proposal_slot_portion.get());
-
-		let slot_remaining = slot_info.ends_at
-			.checked_duration_since(std::time::Instant::now())
-			.unwrap_or_default();
-
-		let slot_remaining = std::cmp::min(slot_remaining, max_proposing);
-
-		// If parent is genesis block, we don't require any lenience factor.
-		if slot_info.chain_head.number().is_zero() {
-			return slot_remaining
-		}
-
-		let parent_slot = match find_pre_digest::<B, P::Signature>(&slot_info.chain_head) {
-			Err(_) => return slot_remaining,
-			Ok(d) => d,
-		};
-
-		if let Some(slot_lenience) =
-			sc_consensus_slots::slot_lenience_exponential(parent_slot, slot_info)
-		{
-			debug!(
-				target: "aura",
-				"No block for {} slots. Applying linear lenience of {}s",
-				slot_info.slot.saturating_sub(parent_slot + 1),
-				slot_lenience.as_secs(),
-			);
-
-			slot_remaining + slot_lenience
-		} else {
-			slot_remaining
-		}
+	fn proposing_remaining_duration(&self, slot_info: &SlotInfo<B>) -> std::time::Duration {
+		let parent_slot = find_pre_digest::<B, P::Signature>(&slot_info.chain_head).ok();
+
+		sc_consensus_slots::proposing_remaining_duration(
+			parent_slot,
+			slot_info,
+			&self.block_proposal_slot_portion,
+			self.max_block_proposal_slot_portion.as_ref(),
+			sc_consensus_slots::SlotLenienceType::Exponential,
+			self.logging_target(),
+		)
 	}
 }
 
@@ -759,6 +747,7 @@ mod tests {
 				keystore,
 				can_author_with: sp_consensus::AlwaysCanAuthor,
 				block_proposal_slot_portion: SlotProportion::new(0.5),
+				max_block_proposal_slot_portion: None,
 				telemetry: None,
 			}).expect("Starts aura"));
 		}
@@ -823,6 +812,7 @@ mod tests {
 			telemetry: None,
 			_key_type: PhantomData::<AuthorityPair>,
 			block_proposal_slot_portion: SlotProportion::new(0.5),
+			max_block_proposal_slot_portion: None,
 		};
 
 		let head = Header::new(
@@ -873,6 +863,7 @@ mod tests {
 			telemetry: None,
 			_key_type: PhantomData::<AuthorityPair>,
 			block_proposal_slot_portion: SlotProportion::new(0.5),
+			max_block_proposal_slot_portion: None,
 		};
 
 		let head = client.header(&BlockId::Number(0)).unwrap().unwrap();
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index 8aa92f37815e..8112a00416e3 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -412,30 +412,35 @@ pub struct BabeParams<B: BlockT, C, SC, E, I, SO, L, CIDP, BS, CAW> {
 	/// because there were no blocks produced for some slots.
 	pub block_proposal_slot_portion: SlotProportion,
 
+	/// The maximum proportion of the slot dedicated to proposing with any lenience factor applied
+	/// due to no blocks being produced.
+	pub max_block_proposal_slot_portion: Option<SlotProportion>,
+
 	/// Handle use to report telemetries.
 	pub telemetry: Option<TelemetryHandle>,
 }
 
 /// Start the babe worker.
-pub fn start_babe<B, C, SC, E, I, SO, CIDP, BS, CAW, L, Error>(BabeParams {
-	keystore,
-	client,
-	select_chain,
-	env,
-	block_import,
-	sync_oracle,
-	justification_sync_link,
-	create_inherent_data_providers,
-	force_authoring,
-	backoff_authoring_blocks,
-	babe_link,
-	can_author_with,
-	block_proposal_slot_portion,
-	telemetry,
-}: BabeParams<B, C, SC, E, I, SO, L, CIDP, BS, CAW>) -> Result<
-	BabeWorker<B>,
-	sp_consensus::Error,
-> where
+pub fn start_babe<B, C, SC, E, I, SO, CIDP, BS, CAW, L, Error>(
+	BabeParams {
+		keystore,
+		client,
+		select_chain,
+		env,
+		block_import,
+		sync_oracle,
+		justification_sync_link,
+		create_inherent_data_providers,
+		force_authoring,
+		backoff_authoring_blocks,
+		babe_link,
+		can_author_with,
+		block_proposal_slot_portion,
+		max_block_proposal_slot_portion,
+		telemetry,
+	}: BabeParams<B, C, SC, E, I, SO, L, CIDP, BS, CAW>,
+) -> Result<BabeWorker<B>, sp_consensus::Error>
+where
 	B: BlockT,
 	C: ProvideRuntimeApi<B>
 		+ ProvideCache<B>
@@ -480,6 +485,7 @@ pub fn start_babe<B, C, SC, E, I, SO, CIDP, BS, CAW, L, Error>(BabeParams {
 		slot_notification_sinks: slot_notification_sinks.clone(),
 		config: config.clone(),
 		block_proposal_slot_portion,
+		max_block_proposal_slot_portion,
 		telemetry,
 	};
 
@@ -630,6 +636,7 @@ struct BabeSlotWorker<B: BlockT, C, E, I, SO, L, BS> {
 	slot_notification_sinks: SlotNotificationSinks<B>,
 	config: Config,
 	block_proposal_slot_portion: SlotProportion,
+	max_block_proposal_slot_portion: Option<SlotProportion>,
 	telemetry: Option<TelemetryHandle>,
 }
 
@@ -637,10 +644,10 @@ impl<B, C, E, I, Error, SO, L, BS> sc_consensus_slots::SimpleSlotWorker<B>
 	for BabeSlotWorker<B, C, E, I, SO, L, BS>
 where
 	B: BlockT,
-	C: ProvideRuntimeApi<B> +
-		ProvideCache<B> +
-		HeaderBackend<B> +
-		HeaderMetadata<B, Error = ClientError>,
+	C: ProvideRuntimeApi<B>
+		+ ProvideCache<B>
+		+ HeaderBackend<B>
+		+ HeaderMetadata<B, Error = ClientError>,
 	C::Api: BabeApi<B>,
 	E: Environment<B, Error = Error>,
 	E::Proposer: Proposer<B, Error = Error, Transaction = sp_api::TransactionFor<C, B>>,
@@ -832,42 +839,17 @@ where
 		self.telemetry.clone()
 	}
 
-	fn proposing_remaining_duration(
-		&self,
-		slot_info: &SlotInfo<B>,
-	) -> std::time::Duration {
-		let max_proposing = slot_info.duration.mul_f32(self.block_proposal_slot_portion.get());
-
-		let slot_remaining = slot_info.ends_at
-			.checked_duration_since(std::time::Instant::now())
-			.unwrap_or_default();
+	fn proposing_remaining_duration(&self, slot_info: &SlotInfo<B>) -> std::time::Duration {
+		let parent_slot = find_pre_digest::<B>(&slot_info.chain_head).ok().map(|d| d.slot());
 
-		let slot_remaining = std::cmp::min(slot_remaining, max_proposing);
-
-		// If parent is genesis block, we don't require any lenience factor.
-		if slot_info.chain_head.number().is_zero() {
-			return slot_remaining
-		}
-
-		let parent_slot = match find_pre_digest::<B>(&slot_info.chain_head) {
-			Err(_) => return slot_remaining,
-			Ok(d) => d.slot(),
-		};
-
-		if let Some(slot_lenience) =
-			sc_consensus_slots::slot_lenience_exponential(parent_slot, slot_info)
-		{
-			debug!(
-				target: "babe",
-				"No block for {} slots. Applying exponential lenience of {}s",
-				slot_info.slot.saturating_sub(parent_slot + 1),
-				slot_lenience.as_secs(),
-			);
-
-			slot_remaining + slot_lenience
-		} else {
-			slot_remaining
-		}
+		sc_consensus_slots::proposing_remaining_duration(
+			parent_slot,
+			slot_info,
+			&self.block_proposal_slot_portion,
+			self.max_block_proposal_slot_portion.as_ref(),
+			sc_consensus_slots::SlotLenienceType::Exponential,
+			self.logging_target(),
+		)
 	}
 }
 
diff --git a/client/consensus/babe/src/tests.rs b/client/consensus/babe/src/tests.rs
index 467de9683c68..3392ffade98e 100644
--- a/client/consensus/babe/src/tests.rs
+++ b/client/consensus/babe/src/tests.rs
@@ -473,6 +473,7 @@ fn run_one_test(mutator: impl Fn(&mut TestHeader, Stage) + Send + Sync + 'static
 			can_author_with: sp_consensus::AlwaysCanAuthor,
 			justification_sync_link: (),
 			block_proposal_slot_portion: SlotProportion::new(0.5),
+			max_block_proposal_slot_portion: None,
 			telemetry: None,
 		}).expect("Starts babe"));
 	}
diff --git a/client/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs
index 188aa52881a7..1ec89a6f519a 100644
--- a/client/consensus/slots/src/lib.rs
+++ b/client/consensus/slots/src/lib.rs
@@ -666,6 +666,96 @@ impl SlotProportion {
 	}
 }
 
+/// The strategy used to calculate the slot lenience used to increase the block proposal time when
+/// slots have been skipped with no blocks authored.
+pub enum SlotLenienceType {
+	/// Increase the lenience linearly with the number of skipped slots.
+	Linear,
+	/// Increase the lenience exponentially with the number of skipped slots.
+	Exponential,
+}
+
+impl SlotLenienceType {
+	fn as_str(&self) -> &'static str {
+		match self {
+			SlotLenienceType::Linear => "linear",
+			SlotLenienceType::Exponential => "exponential",
+		}
+	}
+}
+
+/// Calculate the remaining duration for block proposal taking into account whether any slots have
+/// been skipped and applying the given lenience strategy. If `max_block_proposal_slot_portion` is
+/// not none this method guarantees that the returned duration must be lower or equal to
+/// `slot_info.duration * max_block_proposal_slot_portion`.
+pub fn proposing_remaining_duration<Block: BlockT>(
+	parent_slot: Option<Slot>,
+	slot_info: &SlotInfo<Block>,
+	block_proposal_slot_portion: &SlotProportion,
+	max_block_proposal_slot_portion: Option<&SlotProportion>,
+	slot_lenience_type: SlotLenienceType,
+	log_target: &str,
+) -> Duration {
+	use sp_runtime::traits::Zero;
+
+	let proposing_duration = slot_info
+		.duration
+		.mul_f32(block_proposal_slot_portion.get());
+
+	let slot_remaining = slot_info
+		.ends_at
+		.checked_duration_since(std::time::Instant::now())
+		.unwrap_or_default();
+
+	let proposing_duration = std::cmp::min(slot_remaining, proposing_duration);
+
+	// If parent is genesis block, we don't require any lenience factor.
+	if slot_info.chain_head.number().is_zero() {
+		return proposing_duration;
+	}
+
+	let parent_slot = match parent_slot {
+		Some(parent_slot) => parent_slot,
+		None => return proposing_duration,
+	};
+
+	let slot_lenience = match slot_lenience_type {
+		SlotLenienceType::Exponential => slot_lenience_exponential(parent_slot, slot_info),
+		SlotLenienceType::Linear => slot_lenience_linear(parent_slot, slot_info),
+	};
+
+	if let Some(slot_lenience) = slot_lenience {
+		let lenient_proposing_duration =
+			proposing_duration + slot_lenience.mul_f32(block_proposal_slot_portion.get());
+
+		// if we defined a maximum portion of the slot for proposal then we must make sure the
+		// lenience doesn't go over it
+		let lenient_proposing_duration =
+			if let Some(ref max_block_proposal_slot_portion) = max_block_proposal_slot_portion {
+				std::cmp::min(
+					lenient_proposing_duration,
+					slot_info
+						.duration
+						.mul_f32(max_block_proposal_slot_portion.get()),
+				)
+			} else {
+				lenient_proposing_duration
+			};
+
+		debug!(
+			target: log_target,
+			"No block for {} slots. Applying {} lenience, total proposing duration: {}",
+			slot_info.slot.saturating_sub(parent_slot + 1),
+			slot_lenience_type.as_str(),
+			lenient_proposing_duration.as_secs(),
+		);
+
+		lenient_proposing_duration
+	} else {
+		proposing_duration
+	}
+}
+
 /// Calculate a slot duration lenience based on the number of missed slots from current
 /// to parent. If the number of skipped slots is greated than 0 this method will apply
 /// an exponential backoff of at most `2^7 * slot_duration`, if no slots were skipped
@@ -703,7 +793,7 @@ pub fn slot_lenience_exponential<Block: BlockT>(
 /// a linear backoff of at most `20 * slot_duration`, if no slots were skipped
 /// this method will return `None.`
 pub fn slot_lenience_linear<Block: BlockT>(
-	parent_slot: u64,
+	parent_slot: Slot,
 	slot_info: &SlotInfo<Block>,
 ) -> Option<Duration> {
 	// never give more than 20 times more lenience.
@@ -839,7 +929,7 @@ mod test {
 			duration: SLOT_DURATION,
 			timestamp: Default::default(),
 			inherent_data: Default::default(),
-			ends_at: Instant::now(),
+			ends_at: Instant::now() + SLOT_DURATION,
 			chain_head: Header::new(
 				1,
 				Default::default(),
@@ -897,6 +987,36 @@ mod test {
 		);
 	}
 
+	#[test]
+	fn proposing_remaining_duration_should_apply_lenience_based_on_proposal_slot_proportion() {
+		assert_eq!(
+			proposing_remaining_duration(
+				Some(0.into()),
+				&slot(2),
+				&SlotProportion(0.25),
+				None,
+				SlotLenienceType::Linear,
+				"test",
+			),
+			SLOT_DURATION.mul_f32(0.25 * 2.0),
+		);
+	}
+
+	#[test]
+	fn proposing_remaining_duration_should_never_exceed_max_proposal_slot_proportion() {
+		assert_eq!(
+			proposing_remaining_duration(
+				Some(0.into()),
+				&slot(100),
+				&SlotProportion(0.25),
+				Some(SlotProportion(0.9)).as_ref(),
+				SlotLenienceType::Exponential,
+				"test",
+			),
+			SLOT_DURATION.mul_f32(0.9),
+		);
+	}
+
 	#[derive(PartialEq, Debug)]
 	struct HeadState {
 		head_number: NumberFor<Block>,

From d03a91a181d0b22d00a6b9ba2a8007dc254779e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Sun, 20 Jun 2021 12:01:09 +0100
Subject: [PATCH 0899/1194] make SelectChain async (#9128)

* make SelectChain async

* make JustificationImport async
---
 Cargo.lock                                    |   2 +
 client/consensus/babe/rpc/src/lib.rs          |  51 +-
 client/consensus/babe/src/lib.rs              |  24 +-
 client/consensus/common/Cargo.toml            |   1 +
 client/consensus/common/src/longest_chain.rs  |  32 +-
 .../consensus/manual-seal/src/seal_block.rs   |  52 +-
 client/consensus/pow/src/lib.rs               |  12 +-
 client/consensus/slots/src/slots.rs           |   2 +-
 client/finality-grandpa/src/environment.rs    | 259 +++----
 client/finality-grandpa/src/import.rs         |  25 +-
 client/network/test/src/lib.rs                |   7 +-
 client/service/src/lib.rs                     |   5 +-
 client/service/test/src/client/mod.rs         | 678 ++++++++++++------
 primitives/api/test/Cargo.toml                |   5 +-
 primitives/api/test/tests/runtime_calls.rs    |   9 +-
 .../consensus/common/src/block_import.rs      |   5 +-
 .../common/src/import_queue/basic_queue.rs    |  54 +-
 .../consensus/common/src/select_chain.rs      |  15 +-
 18 files changed, 792 insertions(+), 446 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fb944b782abd..a33cb02f7f0d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7208,6 +7208,7 @@ dependencies = [
 name = "sc-consensus"
 version = "0.9.0"
 dependencies = [
+ "async-trait",
  "parking_lot 0.11.1",
  "sc-client-api",
  "sp-blockchain",
@@ -8707,6 +8708,7 @@ name = "sp-api-test"
 version = "2.0.1"
 dependencies = [
  "criterion",
+ "futures 0.3.15",
  "log",
  "parity-scale-codec",
  "rustversion",
diff --git a/client/consensus/babe/rpc/src/lib.rs b/client/consensus/babe/rpc/src/lib.rs
index 6696a65040a5..e16c24acaca3 100644
--- a/client/consensus/babe/rpc/src/lib.rs
+++ b/client/consensus/babe/rpc/src/lib.rs
@@ -93,11 +93,14 @@ impl<B: BlockT, C, SC> BabeRpcHandler<B, C, SC> {
 }
 
 impl<B, C, SC> BabeApi for BabeRpcHandler<B, C, SC>
-	where
-		B: BlockT,
-		C: ProvideRuntimeApi<B> + HeaderBackend<B> + HeaderMetadata<B, Error=BlockChainError> + 'static,
-		C::Api: BabeRuntimeApi<B>,
-		SC: SelectChain<B> + Clone + 'static,
+where
+	B: BlockT,
+	C: ProvideRuntimeApi<B>
+		+ HeaderBackend<B>
+		+ HeaderMetadata<B, Error = BlockChainError>
+		+ 'static,
+	C::Api: BabeRuntimeApi<B>,
+	SC: SelectChain<B> + Clone + 'static,
 {
 	fn epoch_authorship(&self) -> FutureResult<HashMap<AuthorityId, EpochAuthorship>> {
 		if let Err(err) = self.deny_unsafe.check_if_safe() {
@@ -118,28 +121,33 @@ impl<B, C, SC> BabeApi for BabeRpcHandler<B, C, SC>
 			self.select_chain.clone(),
 		);
 		let future = async move {
-			let header = select_chain.best_chain().map_err(Error::Consensus)?;
-			let epoch_start = client.runtime_api()
+			let header = select_chain.best_chain().map_err(Error::Consensus).await?;
+			let epoch_start = client
+				.runtime_api()
 				.current_epoch_start(&BlockId::Hash(header.hash()))
-				.map_err(|err| {
-					Error::StringError(format!("{:?}", err))
-				})?;
+				.map_err(|err| Error::StringError(format!("{:?}", err)))?;
 			let epoch = epoch_data(
 				&shared_epoch,
 				&client,
 				&babe_config,
 				*epoch_start,
 				&select_chain,
-			)?;
+			)
+			.await?;
 			let (epoch_start, epoch_end) = (epoch.start_slot(), epoch.end_slot());
 
 			let mut claims: HashMap<AuthorityId, EpochAuthorship> = HashMap::new();
 
 			let keys = {
-				epoch.authorities.iter()
+				epoch
+					.authorities
+					.iter()
 					.enumerate()
 					.filter_map(|(i, a)| {
-						if SyncCryptoStore::has_keys(&*keystore, &[(a.0.to_raw_vec(), AuthorityId::ID)]) {
+						if SyncCryptoStore::has_keys(
+							&*keystore,
+							&[(a.0.to_raw_vec(), AuthorityId::ID)],
+						) {
 							Some((a.0.clone(), i))
 						} else {
 							None
@@ -167,7 +175,8 @@ impl<B, C, SC> BabeApi for BabeRpcHandler<B, C, SC>
 			}
 
 			Ok(claims)
-		}.boxed();
+		}
+		.boxed();
 
 		Box::new(future.compat())
 	}
@@ -203,20 +212,20 @@ impl From<Error> for jsonrpc_core::Error {
 	}
 }
 
-/// fetches the epoch data for a given slot.
-fn epoch_data<B, C, SC>(
+/// Fetches the epoch data for a given slot.
+async fn epoch_data<B, C, SC>(
 	epoch_changes: &SharedEpochChanges<B, Epoch>,
 	client: &Arc<C>,
 	babe_config: &Config,
 	slot: u64,
 	select_chain: &SC,
 ) -> Result<Epoch, Error>
-	where
-		B: BlockT,
-		C: HeaderBackend<B> + HeaderMetadata<B, Error=BlockChainError> + 'static,
-		SC: SelectChain<B>,
+where
+	B: BlockT,
+	C: HeaderBackend<B> + HeaderMetadata<B, Error = BlockChainError> + 'static,
+	SC: SelectChain<B>,
 {
-	let parent = select_chain.best_chain()?;
+	let parent = select_chain.best_chain().await?;
 	epoch_changes.shared_data().epoch_data_for_child_of(
 		descendent_query(&**client),
 		&parent.hash(),
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index 8112a00416e3..15d16c91f430 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -989,7 +989,7 @@ where
 		Ok(())
 	}
 
-	fn check_and_report_equivocation(
+	async fn check_and_report_equivocation(
 		&self,
 		slot_now: Slot,
 		slot: Slot,
@@ -1024,6 +1024,7 @@ where
 		let best_id = self
 			.select_chain
 			.best_chain()
+			.await
 			.map(|h| BlockId::Hash(h.hash()))
 			.map_err(|e| Error::Client(e.into()))?;
 
@@ -1070,13 +1071,26 @@ where
 	}
 }
 
+type BlockVerificationResult<Block> = Result<
+	(
+		BlockImportParams<Block, ()>,
+		Option<Vec<(CacheKeyId, Vec<u8>)>>,
+	),
+	String,
+>;
+
 #[async_trait::async_trait]
 impl<Block, Client, SelectChain, CAW, CIDP> Verifier<Block>
 	for BabeVerifier<Block, Client, SelectChain, CAW, CIDP>
 where
 	Block: BlockT,
-	Client: HeaderMetadata<Block, Error = sp_blockchain::Error> + HeaderBackend<Block> + ProvideRuntimeApi<Block>
-		+ Send + Sync + AuxStore + ProvideCache<Block>,
+	Client: HeaderMetadata<Block, Error = sp_blockchain::Error>
+		+ HeaderBackend<Block>
+		+ ProvideRuntimeApi<Block>
+		+ Send
+		+ Sync
+		+ AuxStore
+		+ ProvideCache<Block>,
 	Client::Api: BlockBuilderApi<Block> + BabeApi<Block>,
 	SelectChain: sp_consensus::SelectChain<Block>,
 	CAW: CanAuthorWith<Block> + Send + Sync,
@@ -1089,7 +1103,7 @@ where
 		header: Block::Header,
 		justifications: Option<Justifications>,
 		mut body: Option<Vec<Block::Extrinsic>>,
-	) -> Result<(BlockImportParams<Block, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String> {
+	) -> BlockVerificationResult<Block> {
 		trace!(
 			target: "babe",
 			"Verifying origin: {:?} header: {:?} justification(s): {:?} body: {:?}",
@@ -1158,7 +1172,7 @@ where
 					&header,
 					&verified_info.author,
 					&origin,
-				) {
+				).await {
 					warn!(target: "babe", "Error checking/reporting BABE equivocation: {:?}", err);
 				}
 
diff --git a/client/consensus/common/Cargo.toml b/client/consensus/common/Cargo.toml
index 5762b9c998b6..32babb02c2bf 100644
--- a/client/consensus/common/Cargo.toml
+++ b/client/consensus/common/Cargo.toml
@@ -13,6 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+async-trait = "0.1"
 sc-client-api = { version = "3.0.0", path = "../../api" }
 sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
 sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
diff --git a/client/consensus/common/src/longest_chain.rs b/client/consensus/common/src/longest_chain.rs
index 8cf32a1dbd3c..e1fbb600fa44 100644
--- a/client/consensus/common/src/longest_chain.rs
+++ b/client/consensus/common/src/longest_chain.rs
@@ -46,15 +46,15 @@ impl<B, Block> Clone for LongestChain<B, Block> {
 }
 
 impl<B, Block> LongestChain<B, Block>
-	where
-		B: backend::Backend<Block>,
-		Block: BlockT,
+where
+	B: backend::Backend<Block>,
+	Block: BlockT,
 {
 	/// Instantiate a new LongestChain for Backend B
 	pub fn new(backend: Arc<B>) -> Self {
 		LongestChain {
 			backend,
-			_phantom: Default::default()
+			_phantom: Default::default(),
 		}
 	}
 
@@ -75,30 +75,30 @@ impl<B, Block> LongestChain<B, Block>
 	}
 }
 
+#[async_trait::async_trait]
 impl<B, Block> SelectChain<Block> for LongestChain<B, Block>
-	where
-		B: backend::Backend<Block>,
-		Block: BlockT,
+where
+	B: backend::Backend<Block>,
+	Block: BlockT,
 {
-
-	fn leaves(&self) -> Result<Vec<<Block as BlockT>::Hash>, ConsensusError> {
-		LongestChain::leaves(self)
-			.map_err(|e| ConsensusError::ChainLookup(e.to_string()).into())
+	async fn leaves(&self) -> Result<Vec<<Block as BlockT>::Hash>, ConsensusError> {
+		LongestChain::leaves(self).map_err(|e| ConsensusError::ChainLookup(e.to_string()).into())
 	}
 
-	fn best_chain(&self) -> Result<<Block as BlockT>::Header, ConsensusError>
-	{
+	async fn best_chain(&self) -> Result<<Block as BlockT>::Header, ConsensusError> {
 		LongestChain::best_block_header(&self)
 			.map_err(|e| ConsensusError::ChainLookup(e.to_string()).into())
 	}
 
-	fn finality_target(
+	async fn finality_target(
 		&self,
 		target_hash: Block::Hash,
-		maybe_max_number: Option<NumberFor<Block>>
+		maybe_max_number: Option<NumberFor<Block>>,
 	) -> Result<Option<Block::Hash>, ConsensusError> {
 		let import_lock = self.backend.get_import_lock();
-		self.backend.blockchain().best_containing(target_hash, maybe_max_number, import_lock)
+		self.backend
+			.blockchain()
+			.best_containing(target_hash, maybe_max_number, import_lock)
 			.map_err(|e| ConsensusError::ChainLookup(e.to_string()).into())
 	}
 }
diff --git a/client/consensus/manual-seal/src/seal_block.rs b/client/consensus/manual-seal/src/seal_block.rs
index 4aecfc213ab4..6ddd2cb05d49 100644
--- a/client/consensus/manual-seal/src/seal_block.rs
+++ b/client/consensus/manual-seal/src/seal_block.rs
@@ -80,45 +80,47 @@ pub async fn seal_block<B, BI, SC, C, E, P, CIDP>(
 		create_inherent_data_providers,
 		consensus_data_provider: digest_provider,
 		mut sender,
-	}: SealBlockParams<'_, B, BI, SC, C, E, P, CIDP>
-)
-	where
-		B: BlockT,
-		BI: BlockImport<B, Error = sp_consensus::Error, Transaction = sp_api::TransactionFor<C, B>>
-			+ Send + Sync + 'static,
-		C: HeaderBackend<B> + ProvideRuntimeApi<B>,
-		E: Environment<B>,
-		E::Proposer: Proposer<B, Transaction = TransactionFor<C, B>>,
-		P: txpool::ChainApi<Block=B>,
-		SC: SelectChain<B>,
-		TransactionFor<C, B>: 'static,
-		CIDP: CreateInherentDataProviders<B, ()>,
+	}: SealBlockParams<'_, B, BI, SC, C, E, P, CIDP>,
+) where
+	B: BlockT,
+	BI: BlockImport<B, Error = sp_consensus::Error, Transaction = sp_api::TransactionFor<C, B>>
+		+ Send
+		+ Sync
+		+ 'static,
+	C: HeaderBackend<B> + ProvideRuntimeApi<B>,
+	E: Environment<B>,
+	E::Proposer: Proposer<B, Transaction = TransactionFor<C, B>>,
+	P: txpool::ChainApi<Block = B>,
+	SC: SelectChain<B>,
+	TransactionFor<C, B>: 'static,
+	CIDP: CreateInherentDataProviders<B, ()>,
 {
 	let future = async {
 		if pool.validated_pool().status().ready == 0 && !create_empty {
-			return Err(Error::EmptyTransactionPool)
+			return Err(Error::EmptyTransactionPool);
 		}
 
 		// get the header to build this new block on.
 		// use the parent_hash supplied via `EngineCommand`
 		// or fetch the best_block.
 		let parent = match parent_hash {
-			Some(hash) => {
-				client.header(BlockId::Hash(hash))?.ok_or_else(|| Error::BlockNotFound(format!("{}", hash)))?
-			}
-			None => select_chain.best_chain()?
+			Some(hash) => client
+				.header(BlockId::Hash(hash))?
+				.ok_or_else(|| Error::BlockNotFound(format!("{}", hash)))?,
+			None => select_chain.best_chain().await?,
 		};
 
-		let inherent_data_providers =
-			create_inherent_data_providers
-				.create_inherent_data_providers(parent.hash(), ())
-				.await
-				.map_err(|e| Error::Other(e))?;
+		let inherent_data_providers = create_inherent_data_providers
+			.create_inherent_data_providers(parent.hash(), ())
+			.await
+			.map_err(|e| Error::Other(e))?;
 
 		let inherent_data = inherent_data_providers.create_inherent_data()?;
 
-		let proposer = env.init(&parent)
-			.map_err(|err| Error::StringError(format!("{:?}", err))).await?;
+		let proposer = env
+			.init(&parent)
+			.map_err(|err| Error::StringError(format!("{:?}", err)))
+			.await?;
 		let inherents_len = inherent_data.len();
 
 		let digest = if let Some(digest_provider) = digest_provider {
diff --git a/client/consensus/pow/src/lib.rs b/client/consensus/pow/src/lib.rs
index 6688c14b6375..e71726564ebe 100644
--- a/client/consensus/pow/src/lib.rs
+++ b/client/consensus/pow/src/lib.rs
@@ -341,7 +341,10 @@ where
 		mut block: BlockImportParams<B, Self::Transaction>,
 		new_cache: HashMap<CacheKeyId, Vec<u8>>,
 	) -> Result<ImportResult, Self::Error> {
-		let best_header = self.select_chain.best_chain()
+		let best_header = self
+			.select_chain
+			.best_chain()
+			.await
 			.map_err(|e| format!("Fetch best chain failed via select chain: {:?}", e))?;
 		let best_hash = best_header.hash();
 
@@ -543,7 +546,8 @@ pub fn start_mining_worker<Block, C, S, Algorithm, E, SO, L, CIDP, CAW>(
 ) -> (
 	Arc<Mutex<MiningWorker<Block, Algorithm, C, L, <E::Proposer as Proposer<Block>>::Proof>>>,
 	impl Future<Output = ()>,
-) where
+)
+where
 	Block: BlockT,
 	C: ProvideRuntimeApi<Block> + BlockchainEvents<Block> + 'static,
 	S: SelectChain<Block> + 'static,
@@ -578,7 +582,7 @@ pub fn start_mining_worker<Block, C, S, Algorithm, E, SO, L, CIDP, CAW>(
 				return;
 			}
 
-			let best_header = match select_chain.best_chain() {
+			let best_header = match select_chain.best_chain().await {
 				Ok(x) => x,
 				Err(err) => {
 					warn!(
@@ -588,7 +592,7 @@ pub fn start_mining_worker<Block, C, S, Algorithm, E, SO, L, CIDP, CAW>(
 						err
 					);
 					return;
-				},
+				}
 			};
 			let best_hash = best_header.hash();
 
diff --git a/client/consensus/slots/src/slots.rs b/client/consensus/slots/src/slots.rs
index 665f7c58ba94..1e6dadcdf5cf 100644
--- a/client/consensus/slots/src/slots.rs
+++ b/client/consensus/slots/src/slots.rs
@@ -151,7 +151,7 @@ where
 
 			let ends_at = Instant::now() + ends_in;
 
-			let chain_head = match self.client.best_chain() {
+			let chain_head = match self.client.best_chain().await {
 				Ok(x) => x,
 				Err(e) => {
 					log::warn!(
diff --git a/client/finality-grandpa/src/environment.rs b/client/finality-grandpa/src/environment.rs
index 62d9a4a8bb9e..77c7ccda7daf 100644
--- a/client/finality-grandpa/src/environment.rs
+++ b/client/finality-grandpa/src/environment.rs
@@ -34,12 +34,12 @@ use parking_lot::RwLock;
 use prometheus_endpoint::{register, Counter, Gauge, PrometheusError, U64};
 
 use sc_client_api::{
-	backend::{apply_aux, Backend},
+	backend::{apply_aux, Backend as BackendT},
 	utils::is_descendent_of,
 };
 use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_DEBUG, CONSENSUS_INFO};
 use sp_blockchain::HeaderMetadata;
-use sp_consensus::SelectChain;
+use sp_consensus::SelectChain as SelectChainT;
 use sp_finality_grandpa::{
 	AuthorityId, AuthoritySignature, Equivocation, EquivocationProof, GrandpaApi, RoundNumber,
 	SetId, GRANDPA_ENGINE_ID,
@@ -54,7 +54,7 @@ use crate::{
 	local_authority_id,
 	notification::GrandpaJustificationSender,
 	until_imported::UntilVoteTargetImported,
-	voting_rule::VotingRule,
+	voting_rule::VotingRule as VotingRuleT,
 	ClientForGrandpa, CommandOrError, Commit, Config, Error, NewAuthoritySet, Precommit, Prevote,
 	PrimaryPropose, SignedMessage, VoterCommand,
 };
@@ -478,11 +478,11 @@ impl<BE, Block: BlockT, C, N: NetworkT<Block>, SC, VR> Environment<BE, Block, C,
 impl<BE, Block, C, N, SC, VR> Environment<BE, Block, C, N, SC, VR>
 where
 	Block: BlockT,
-	BE: Backend<Block>,
+	BE: BackendT<Block>,
 	C: ClientForGrandpa<Block, BE>,
 	C::Api: GrandpaApi<Block>,
 	N: NetworkT<Block>,
-	SC: SelectChain<Block>,
+	SC: SelectChainT<Block>,
 {
 	/// Report the given equivocation to the GRANDPA runtime module. This method
 	/// generates a session membership proof of the offender and then submits an
@@ -503,9 +503,12 @@ where
 
 		let is_descendent_of = is_descendent_of(&*self.client, None);
 
-		let best_header = self.select_chain
-			.best_chain()
-			.map_err(|e| Error::Blockchain(e.to_string()))?;
+		// TODO: add proper async support here
+		let best_header = futures::executor::block_on(
+			self.select_chain
+				.best_chain()
+				.map_err(|e| Error::Blockchain(e.to_string())),
+		)?;
 
 		let authority_set = self.authority_set.inner();
 
@@ -581,11 +584,11 @@ impl<BE, Block, C, N, SC, VR> finality_grandpa::Chain<Block::Hash, NumberFor<Blo
 	for Environment<BE, Block, C, N, SC, VR>
 where
 	Block: BlockT,
-	BE: Backend<Block>,
+	BE: BackendT<Block>,
 	C: ClientForGrandpa<Block, BE>,
 	N: NetworkT<Block>,
-	SC: SelectChain<Block>,
-	VR: VotingRule<Block, C>,
+	SC: SelectChainT<Block>,
+	VR: VotingRuleT<Block, C>,
 	NumberFor<Block>: BlockNumberOps,
 {
 	fn ancestry(
@@ -637,12 +640,12 @@ impl<B, Block, C, N, SC, VR> voter::Environment<Block::Hash, NumberFor<Block>>
 	for Environment<B, Block, C, N, SC, VR>
 where
 	Block: BlockT,
-	B: Backend<Block>,
+	B: BackendT<Block>,
 	C: ClientForGrandpa<Block, B> + 'static,
 	C::Api: GrandpaApi<Block>,
 	N: NetworkT<Block>,
-	SC: SelectChain<Block>,
-	VR: VotingRule<Block, C>,
+	SC: SelectChainT<Block> + 'static,
+	VR: VotingRuleT<Block, C> + Clone + 'static,
 	NumberFor<Block>: BlockNumberOps,
 {
 	type Timer = Pin<Box<dyn Future<Output = Result<(), Self::Error>> + Send>>;
@@ -684,116 +687,25 @@ where
 	type Error = CommandOrError<Block::Hash, NumberFor<Block>>;
 
 	fn best_chain_containing(&self, block: Block::Hash) -> Self::BestChain {
-		let find_best_chain = || {
+		let client = self.client.clone();
+		let authority_set = self.authority_set.clone();
+		let select_chain = self.select_chain.clone();
+		let voting_rule = self.voting_rule.clone();
+		let set_id = self.set_id;
+
+		Box::pin(async move {
 			// NOTE: when we finalize an authority set change through the sync protocol the voter is
 			//       signaled asynchronously. therefore the voter could still vote in the next round
-			//       before activating the new set. the `authority_set` is updated immediately thus we
-			//       restrict the voter based on that.
-			if self.set_id != self.authority_set.set_id() {
-				return None;
-			}
-
-			let base_header = match self.client.header(BlockId::Hash(block)).ok()? {
-				Some(h) => h,
-				None => {
-					debug!(target: "afg", "Encountered error finding best chain containing {:?}: couldn't find base block", block);
-					return None;
-				}
-			};
-
-			// we refuse to vote beyond the current limit number where transitions are scheduled to
-			// occur.
-			// once blocks are finalized that make that transition irrelevant or activate it,
-			// we will proceed onwards. most of the time there will be no pending transition.
-			// the limit, if any, is guaranteed to be higher than or equal to the given base number.
-			let limit = self.authority_set.current_limit(*base_header.number());
-			debug!(target: "afg", "Finding best chain containing block {:?} with number limit {:?}", block, limit);
-
-			match self.select_chain.finality_target(block, None) {
-				Ok(Some(best_hash)) => {
-					let best_header = self
-						.client
-						.header(BlockId::Hash(best_hash))
-						.ok()?
-						.expect("Header known to exist after `finality_target` call; qed");
-
-					// check if our vote is currently being limited due to a pending change
-					let limit = limit.filter(|limit| limit < best_header.number());
-
-					if let Some(target_number) = limit {
-						let mut target_header = best_header.clone();
-
-						// walk backwards until we find the target block
-						loop {
-							if *target_header.number() < target_number {
-								unreachable!(
-									"we are traversing backwards from a known block; \
-									 blocks are stored contiguously; \
-									 qed"
-								);
-							}
-
-							if *target_header.number() == target_number {
-								break;
-							}
-
-							target_header = self
-								.client
-								.header(BlockId::Hash(*target_header.parent_hash()))
-								.ok()?
-								.expect("Header known to exist after `finality_target` call; qed");
-						}
-
-						Some((base_header, best_header, target_header))
-					} else {
-						// otherwise just use the given best as the target
-						Some((base_header, best_header.clone(), best_header))
-					}
-				}
-				Ok(None) => {
-					debug!(target: "afg", "Encountered error finding best chain containing {:?}: couldn't find target block", block);
-					None
-				}
-				Err(e) => {
-					debug!(target: "afg", "Encountered error finding best chain containing {:?}: {:?}", block, e);
-					None
-				}
+			//       before activating the new set. the `authority_set` is updated immediately thus
+			//       we restrict the voter based on that.
+			if set_id != authority_set.set_id() {
+				return Ok(None);
 			}
-		};
-
-		if let Some((base_header, best_header, target_header)) = find_best_chain() {
-			// restrict vote according to the given voting rule, if the
-			// voting rule doesn't restrict the vote then we keep the
-			// previous target.
-			//
-			// note that we pass the original `best_header`, i.e. before the
-			// authority set limit filter, which can be considered a
-			// mandatory/implicit voting rule.
-			//
-			// we also make sure that the restricted vote is higher than the
-			// round base (i.e. last finalized), otherwise the value
-			// returned by the given voting rule is ignored and the original
-			// target is used instead.
-			let rule_fut = self.voting_rule.restrict_vote(
-				self.client.clone(),
-				&base_header,
-				&best_header,
-				&target_header,
-			);
 
-			Box::pin(async move {
-				Ok(rule_fut
-					.await
-					.filter(|(_, restricted_number)| {
-						// we can only restrict votes within the interval [base, target]
-						restricted_number >= base_header.number()
-							&& restricted_number < target_header.number()
-					})
-					.or_else(|| Some((target_header.hash(), *target_header.number()))))
-			})
-		} else {
-			Box::pin(future::ok(None))
-		}
+			best_chain_containing(block, client, authority_set, select_chain, voting_rule)
+				.await
+				.map_err(|e| e.into())
+		})
 	}
 
 	fn round_data(
@@ -1227,6 +1139,111 @@ impl<Block: BlockT> From<GrandpaJustification<Block>> for JustificationOrCommit<
 	}
 }
 
+async fn best_chain_containing<Block, Backend, Client, SelectChain, VotingRule>(
+	block: Block::Hash,
+	client: Arc<Client>,
+	authority_set: SharedAuthoritySet<Block::Hash, NumberFor<Block>>,
+	select_chain: SelectChain,
+	voting_rule: VotingRule,
+) -> Result<Option<(Block::Hash, NumberFor<Block>)>, Error>
+where
+	Backend: BackendT<Block>,
+	Block: BlockT,
+	Client: ClientForGrandpa<Block, Backend>,
+	SelectChain: SelectChainT<Block> + 'static,
+	VotingRule: VotingRuleT<Block, Client>,
+{
+	let base_header = match client.header(BlockId::Hash(block))? {
+		Some(h) => h,
+		None => {
+			debug!(target: "afg",
+				"Encountered error finding best chain containing {:?}: couldn't find base block",
+				block,
+			);
+
+			return Ok(None);
+		}
+	};
+
+	// we refuse to vote beyond the current limit number where transitions are scheduled to occur.
+	// once blocks are finalized that make that transition irrelevant or activate it, we will
+	// proceed onwards. most of the time there will be no pending transition.  the limit, if any, is
+	// guaranteed to be higher than or equal to the given base number.
+	let limit = authority_set.current_limit(*base_header.number());
+	debug!(target: "afg", "Finding best chain containing block {:?} with number limit {:?}", block, limit);
+
+	let result = match select_chain.finality_target(block, None).await {
+		Ok(Some(best_hash)) => {
+			let best_header = client
+				.header(BlockId::Hash(best_hash))?
+				.expect("Header known to exist after `finality_target` call; qed");
+
+			// check if our vote is currently being limited due to a pending change
+			let limit = limit.filter(|limit| limit < best_header.number());
+
+			let (base_header, best_header, target_header) = if let Some(target_number) = limit {
+				let mut target_header = best_header.clone();
+
+				// walk backwards until we find the target block
+				loop {
+					if *target_header.number() < target_number {
+						unreachable!(
+							"we are traversing backwards from a known block; \
+							 blocks are stored contiguously; \
+							 qed"
+						);
+					}
+
+					if *target_header.number() == target_number {
+						break;
+					}
+
+					target_header = client
+						.header(BlockId::Hash(*target_header.parent_hash()))?
+						.expect("Header known to exist after `finality_target` call; qed");
+				}
+
+				(base_header, best_header, target_header)
+			} else {
+				// otherwise just use the given best as the target
+				(base_header, best_header.clone(), best_header)
+			};
+
+			// restrict vote according to the given voting rule, if the
+			// voting rule doesn't restrict the vote then we keep the
+			// previous target.
+			//
+			// note that we pass the original `best_header`, i.e. before the
+			// authority set limit filter, which can be considered a
+			// mandatory/implicit voting rule.
+			//
+			// we also make sure that the restricted vote is higher than the
+			// round base (i.e. last finalized), otherwise the value
+			// returned by the given voting rule is ignored and the original
+			// target is used instead.
+			voting_rule
+				.restrict_vote(client.clone(), &base_header, &best_header, &target_header)
+				.await
+				.filter(|(_, restricted_number)| {
+					// we can only restrict votes within the interval [base, target]
+					restricted_number >= base_header.number() &&
+						restricted_number < target_header.number()
+				})
+				.or_else(|| Some((target_header.hash(), *target_header.number())))
+		}
+		Ok(None) => {
+			debug!(target: "afg", "Encountered error finding best chain containing {:?}: couldn't find target block", block);
+			None
+		}
+		Err(e) => {
+			debug!(target: "afg", "Encountered error finding best chain containing {:?}: {:?}", block, e);
+			None
+		}
+	};
+
+	Ok(result)
+}
+
 /// Finalize the given block and apply any authority set changes. If an
 /// authority set change is enacted then a justification is created (if not
 /// given) and stored with the block when finalizing it.
@@ -1244,7 +1261,7 @@ pub(crate) fn finalize_block<BE, Block, Client>(
 ) -> Result<(), CommandOrError<Block::Hash, NumberFor<Block>>>
 where
 	Block: BlockT,
-	BE: Backend<Block>,
+	BE: BackendT<Block>,
 	Client: ClientForGrandpa<Block, BE>,
 {
 	// NOTE: lock must be held through writing to DB to avoid race. this lock
diff --git a/client/finality-grandpa/src/import.rs b/client/finality-grandpa/src/import.rs
index de02ea357cac..481f38b617ea 100644
--- a/client/finality-grandpa/src/import.rs
+++ b/client/finality-grandpa/src/import.rs
@@ -81,6 +81,7 @@ impl<Backend, Block: BlockT, Client, SC: Clone> Clone
 	}
 }
 
+#[async_trait::async_trait]
 impl<BE, Block: BlockT, Client, SC> JustificationImport<Block>
 	for GrandpaBlockImport<BE, Block, Client, SC>
 where
@@ -92,22 +93,30 @@ where
 {
 	type Error = ConsensusError;
 
-	fn on_start(&mut self) -> Vec<(Block::Hash, NumberFor<Block>)> {
+	async fn on_start(&mut self) -> Vec<(Block::Hash, NumberFor<Block>)> {
 		let mut out = Vec::new();
 		let chain_info = self.inner.info();
 
 		// request justifications for all pending changes for which change blocks have already been imported
-		let authorities = self.authority_set.inner();
-		for pending_change in authorities.pending_changes() {
+		let pending_changes: Vec<_> = self
+			.authority_set
+			.inner()
+			.pending_changes()
+			.cloned()
+			.collect();
+
+		for pending_change in pending_changes {
 			if pending_change.delay_kind == DelayKind::Finalized &&
 				pending_change.effective_number() > chain_info.finalized_number &&
 				pending_change.effective_number() <= chain_info.best_number
 			{
 				let effective_block_hash = if !pending_change.delay.is_zero() {
-					self.select_chain.finality_target(
-						pending_change.canon_hash,
-						Some(pending_change.effective_number()),
-					)
+					self.select_chain
+						.finality_target(
+							pending_change.canon_hash,
+							Some(pending_change.effective_number()),
+						)
+						.await
 				} else {
 					Ok(Some(pending_change.canon_hash))
 				};
@@ -125,7 +134,7 @@ where
 		out
 	}
 
-	fn import_justification(
+	async fn import_justification(
 		&mut self,
 		hash: Block::Hash,
 		number: NumberFor<Block>,
diff --git a/client/network/test/src/lib.rs b/client/network/test/src/lib.rs
index 8e56005dad25..f55444f8cf12 100644
--- a/client/network/test/src/lib.rs
+++ b/client/network/test/src/lib.rs
@@ -1075,10 +1075,15 @@ impl TestNetFactory for TestNet {
 
 pub struct ForceFinalized(PeersClient);
 
+#[async_trait::async_trait]
 impl JustificationImport<Block> for ForceFinalized {
 	type Error = ConsensusError;
 
-	fn import_justification(
+	async fn on_start(&mut self) -> Vec<(H256, NumberFor<Block>)> {
+		Vec::new()
+	}
+
+	async fn import_justification(
 		&mut self,
 		hash: H256,
 		_number: NumberFor<Block>,
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index afc120928032..c8ac03ee0e36 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -561,13 +561,14 @@ mod tests {
 			client.clone(),
 		);
 		let source = sp_runtime::transaction_validity::TransactionSource::External;
-		let best = longest_chain.best_chain().unwrap();
+		let best = block_on(longest_chain.best_chain()).unwrap();
 		let transaction = Transfer {
 			amount: 5,
 			nonce: 0,
 			from: AccountKeyring::Alice.into(),
 			to: Default::default(),
-		}.into_signed_tx();
+		}
+		.into_signed_tx();
 		block_on(pool.submit_one(
 			&BlockId::hash(best.hash()), source, transaction.clone()),
 		).unwrap();
diff --git a/client/service/test/src/client/mod.rs b/client/service/test/src/client/mod.rs
index 3852ab2d61b5..bf4105377f9c 100644
--- a/client/service/test/src/client/mod.rs
+++ b/client/service/test/src/client/mod.rs
@@ -337,7 +337,6 @@ fn construct_genesis_with_bad_transaction_should_panic() {
 	assert!(r.is_err());
 }
 
-
 #[test]
 fn client_initializes_from_genesis_ok() {
 	let client = substrate_test_runtime_client::new();
@@ -450,7 +449,9 @@ fn best_containing_with_genesis_block() {
 
 	assert_eq!(
 		genesis_hash.clone(),
-		longest_chain_select.finality_target(genesis_hash.clone(), None).unwrap().unwrap()
+		block_on(longest_chain_select.finality_target(genesis_hash.clone(), None))
+			.unwrap()
+			.unwrap(),
 	);
 }
 
@@ -461,11 +462,17 @@ fn best_containing_with_hash_not_found() {
 
 	let (client, longest_chain_select) = TestClientBuilder::new().build_with_longest_chain();
 
-	let uninserted_block = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let uninserted_block = client
+		.new_block(Default::default())
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 
 	assert_eq!(
 		None,
-		longest_chain_select.finality_target(uninserted_block.hash().clone(), None).unwrap()
+		block_on(longest_chain_select.finality_target(uninserted_block.hash().clone(), None))
+			.unwrap(),
 	);
 }
 
@@ -624,18 +631,43 @@ fn best_containing_on_longest_chain_with_single_chain_3_blocks() {
 	let (mut client, longest_chain_select) = TestClientBuilder::new().build_with_longest_chain();
 
 	// G -> A1
-	let a1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let a1 = client
+		.new_block(Default::default())
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
 	// A1 -> A2
-	let a2 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let a2 = client
+		.new_block(Default::default())
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
 	let genesis_hash = client.chain_info().genesis_hash;
 
-	assert_eq!(a2.hash(), longest_chain_select.finality_target(genesis_hash, None).unwrap().unwrap());
-	assert_eq!(a2.hash(), longest_chain_select.finality_target(a1.hash(), None).unwrap().unwrap());
-	assert_eq!(a2.hash(), longest_chain_select.finality_target(a2.hash(), None).unwrap().unwrap());
+	assert_eq!(
+		a2.hash(),
+		block_on(longest_chain_select.finality_target(genesis_hash, None))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		a2.hash(),
+		block_on(longest_chain_select.finality_target(a1.hash(), None))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		a2.hash(),
+		block_on(longest_chain_select.finality_target(a2.hash(), None))
+			.unwrap()
+			.unwrap()
+	);
 }
 
 #[test]
@@ -715,19 +747,19 @@ fn best_containing_on_longest_chain_with_multiple_forks() {
 	).unwrap().build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, b4.clone())).unwrap();
 
-	// // B2 -> C3
-	let mut builder = client.new_block_at(
-		&BlockId::Hash(b2.hash()),
-		Default::default(),
-		false,
-	).unwrap();
+	// B2 -> C3
+	let mut builder = client
+		.new_block_at(&BlockId::Hash(b2.hash()), Default::default(), false)
+		.unwrap();
 	// this push is required as otherwise C3 has the same hash as B3 and won't get imported
-	builder.push_transfer(Transfer {
-		from: AccountKeyring::Alice.into(),
-		to: AccountKeyring::Ferdie.into(),
-		amount: 1,
-		nonce: 1,
-	}).unwrap();
+	builder
+		.push_transfer(Transfer {
+			from: AccountKeyring::Alice.into(),
+			to: AccountKeyring::Ferdie.into(),
+			amount: 1,
+			nonce: 1,
+		})
+		.unwrap();
 	let c3 = builder.build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, c3.clone())).unwrap();
 
@@ -750,7 +782,7 @@ fn best_containing_on_longest_chain_with_multiple_forks() {
 	assert_eq!(client.chain_info().best_hash, a5.hash());
 
 	let genesis_hash = client.chain_info().genesis_hash;
-	let leaves = longest_chain_select.leaves().unwrap();
+	let leaves = block_on(longest_chain_select.leaves()).unwrap();
 
 	assert!(leaves.contains(&a5.hash()));
 	assert!(leaves.contains(&b4.hash()));
@@ -759,208 +791,422 @@ fn best_containing_on_longest_chain_with_multiple_forks() {
 	assert_eq!(leaves.len(), 4);
 
 	// search without restriction
-
-	assert_eq!(a5.hash(), longest_chain_select.finality_target(
-		genesis_hash, None).unwrap().unwrap());
-	assert_eq!(a5.hash(), longest_chain_select.finality_target(
-		a1.hash(), None).unwrap().unwrap());
-	assert_eq!(a5.hash(), longest_chain_select.finality_target(
-		a2.hash(), None).unwrap().unwrap());
-	assert_eq!(a5.hash(), longest_chain_select.finality_target(
-		a3.hash(), None).unwrap().unwrap());
-	assert_eq!(a5.hash(), longest_chain_select.finality_target(
-		a4.hash(), None).unwrap().unwrap());
-	assert_eq!(a5.hash(), longest_chain_select.finality_target(
-		a5.hash(), None).unwrap().unwrap());
-
-	assert_eq!(b4.hash(), longest_chain_select.finality_target(
-		b2.hash(), None).unwrap().unwrap());
-	assert_eq!(b4.hash(), longest_chain_select.finality_target(
-		b3.hash(), None).unwrap().unwrap());
-	assert_eq!(b4.hash(), longest_chain_select.finality_target(
-		b4.hash(), None).unwrap().unwrap());
-
-	assert_eq!(c3.hash(), longest_chain_select.finality_target(
-		c3.hash(), None).unwrap().unwrap());
-
-	assert_eq!(d2.hash(), longest_chain_select.finality_target(
-		d2.hash(), None).unwrap().unwrap());
-
+	assert_eq!(
+		a5.hash(),
+		block_on(longest_chain_select.finality_target(genesis_hash, None))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		a5.hash(),
+		block_on(longest_chain_select.finality_target(a1.hash(), None))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		a5.hash(),
+		block_on(longest_chain_select.finality_target(a2.hash(), None))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		a5.hash(),
+		block_on(longest_chain_select.finality_target(a3.hash(), None))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		a5.hash(),
+		block_on(longest_chain_select.finality_target(a4.hash(), None))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		a5.hash(),
+		block_on(longest_chain_select.finality_target(a5.hash(), None))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		b4.hash(),
+		block_on(longest_chain_select.finality_target(b2.hash(), None))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		b4.hash(),
+		block_on(longest_chain_select.finality_target(b3.hash(), None))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		b4.hash(),
+		block_on(longest_chain_select.finality_target(b4.hash(), None))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		c3.hash(),
+		block_on(longest_chain_select.finality_target(c3.hash(), None))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		d2.hash(),
+		block_on(longest_chain_select.finality_target(d2.hash(), None))
+			.unwrap()
+			.unwrap()
+	);
 
 	// search only blocks with number <= 5. equivalent to without restriction for this scenario
-
-	assert_eq!(a5.hash(), longest_chain_select.finality_target(
-		genesis_hash, Some(5)).unwrap().unwrap());
-	assert_eq!(a5.hash(), longest_chain_select.finality_target(
-		a1.hash(), Some(5)).unwrap().unwrap());
-	assert_eq!(a5.hash(), longest_chain_select.finality_target(
-		a2.hash(), Some(5)).unwrap().unwrap());
-	assert_eq!(a5.hash(), longest_chain_select.finality_target(
-		a3.hash(), Some(5)).unwrap().unwrap());
-	assert_eq!(a5.hash(), longest_chain_select.finality_target(
-		a4.hash(), Some(5)).unwrap().unwrap());
-	assert_eq!(a5.hash(), longest_chain_select.finality_target(
-		a5.hash(), Some(5)).unwrap().unwrap());
-
-	assert_eq!(b4.hash(), longest_chain_select.finality_target(
-		b2.hash(), Some(5)).unwrap().unwrap());
-	assert_eq!(b4.hash(), longest_chain_select.finality_target(
-		b3.hash(), Some(5)).unwrap().unwrap());
-	assert_eq!(b4.hash(), longest_chain_select.finality_target(
-		b4.hash(), Some(5)).unwrap().unwrap());
-
-	assert_eq!(c3.hash(), longest_chain_select.finality_target(
-		c3.hash(), Some(5)).unwrap().unwrap());
-
-	assert_eq!(d2.hash(), longest_chain_select.finality_target(
-		d2.hash(), Some(5)).unwrap().unwrap());
-
+	assert_eq!(
+		a5.hash(),
+		block_on(longest_chain_select.finality_target(genesis_hash, Some(5)))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		a5.hash(),
+		block_on(longest_chain_select.finality_target(a1.hash(), Some(5)))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		a5.hash(),
+		block_on(longest_chain_select.finality_target(a2.hash(), Some(5)))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		a5.hash(),
+		block_on(longest_chain_select.finality_target(a3.hash(), Some(5)))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		a5.hash(),
+		block_on(longest_chain_select.finality_target(a4.hash(), Some(5)))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		a5.hash(),
+		block_on(longest_chain_select.finality_target(a5.hash(), Some(5)))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		b4.hash(),
+		block_on(longest_chain_select.finality_target(b2.hash(), Some(5)))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		b4.hash(),
+		block_on(longest_chain_select.finality_target(b3.hash(), Some(5)))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		b4.hash(),
+		block_on(longest_chain_select.finality_target(b4.hash(), Some(5)))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		c3.hash(),
+		block_on(longest_chain_select.finality_target(c3.hash(), Some(5)))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		d2.hash(),
+		block_on(longest_chain_select.finality_target(d2.hash(), Some(5)))
+			.unwrap()
+			.unwrap()
+	);
 
 	// search only blocks with number <= 4
-
-	assert_eq!(a4.hash(), longest_chain_select.finality_target(
-		genesis_hash, Some(4)).unwrap().unwrap());
-	assert_eq!(a4.hash(), longest_chain_select.finality_target(
-		a1.hash(), Some(4)).unwrap().unwrap());
-	assert_eq!(a4.hash(), longest_chain_select.finality_target(
-		a2.hash(), Some(4)).unwrap().unwrap());
-	assert_eq!(a4.hash(), longest_chain_select.finality_target(
-		a3.hash(), Some(4)).unwrap().unwrap());
-	assert_eq!(a4.hash(), longest_chain_select.finality_target(
-		a4.hash(), Some(4)).unwrap().unwrap());
-	assert_eq!(None, longest_chain_select.finality_target(
-		a5.hash(), Some(4)).unwrap());
-
-	assert_eq!(b4.hash(), longest_chain_select.finality_target(
-		b2.hash(), Some(4)).unwrap().unwrap());
-	assert_eq!(b4.hash(), longest_chain_select.finality_target(
-		b3.hash(), Some(4)).unwrap().unwrap());
-	assert_eq!(b4.hash(), longest_chain_select.finality_target(
-		b4.hash(), Some(4)).unwrap().unwrap());
-
-	assert_eq!(c3.hash(), longest_chain_select.finality_target(
-		c3.hash(), Some(4)).unwrap().unwrap());
-
-	assert_eq!(d2.hash(), longest_chain_select.finality_target(
-		d2.hash(), Some(4)).unwrap().unwrap());
-
+	assert_eq!(
+		a4.hash(),
+		block_on(longest_chain_select.finality_target(genesis_hash, Some(4)))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		a4.hash(),
+		block_on(longest_chain_select.finality_target(a1.hash(), Some(4)))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		a4.hash(),
+		block_on(longest_chain_select.finality_target(a2.hash(), Some(4)))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		a4.hash(),
+		block_on(longest_chain_select.finality_target(a3.hash(), Some(4)))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		a4.hash(),
+		block_on(longest_chain_select.finality_target(a4.hash(), Some(4)))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		None,
+		block_on(longest_chain_select.finality_target(a5.hash(), Some(4))).unwrap()
+	);
+	assert_eq!(
+		b4.hash(),
+		block_on(longest_chain_select.finality_target(b2.hash(), Some(4)))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		b4.hash(),
+		block_on(longest_chain_select.finality_target(b3.hash(), Some(4)))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		b4.hash(),
+		block_on(longest_chain_select.finality_target(b4.hash(), Some(4)))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		c3.hash(),
+		block_on(longest_chain_select.finality_target(c3.hash(), Some(4)))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		d2.hash(),
+		block_on(longest_chain_select.finality_target(d2.hash(), Some(4)))
+			.unwrap()
+			.unwrap()
+	);
 
 	// search only blocks with number <= 3
-
-	assert_eq!(a3.hash(), longest_chain_select.finality_target(
-		genesis_hash, Some(3)).unwrap().unwrap());
-	assert_eq!(a3.hash(), longest_chain_select.finality_target(
-		a1.hash(), Some(3)).unwrap().unwrap());
-	assert_eq!(a3.hash(), longest_chain_select.finality_target(
-		a2.hash(), Some(3)).unwrap().unwrap());
-	assert_eq!(a3.hash(), longest_chain_select.finality_target(
-		a3.hash(), Some(3)).unwrap().unwrap());
-	assert_eq!(None, longest_chain_select.finality_target(
-		a4.hash(), Some(3)).unwrap());
-	assert_eq!(None, longest_chain_select.finality_target(
-		a5.hash(), Some(3)).unwrap());
-
-	assert_eq!(b3.hash(), longest_chain_select.finality_target(
-		b2.hash(), Some(3)).unwrap().unwrap());
-	assert_eq!(b3.hash(), longest_chain_select.finality_target(
-		b3.hash(), Some(3)).unwrap().unwrap());
-	assert_eq!(None, longest_chain_select.finality_target(
-		b4.hash(), Some(3)).unwrap());
-
-	assert_eq!(c3.hash(), longest_chain_select.finality_target(
-		c3.hash(), Some(3)).unwrap().unwrap());
-
-	assert_eq!(d2.hash(), longest_chain_select.finality_target(
-		d2.hash(), Some(3)).unwrap().unwrap());
-
+	assert_eq!(
+		a3.hash(),
+		block_on(longest_chain_select.finality_target(genesis_hash, Some(3)))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		a3.hash(),
+		block_on(longest_chain_select.finality_target(a1.hash(), Some(3)))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		a3.hash(),
+		block_on(longest_chain_select.finality_target(a2.hash(), Some(3)))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		a3.hash(),
+		block_on(longest_chain_select.finality_target(a3.hash(), Some(3)))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		None,
+		block_on(longest_chain_select.finality_target(a4.hash(), Some(3))).unwrap()
+	);
+	assert_eq!(
+		None,
+		block_on(longest_chain_select.finality_target(a5.hash(), Some(3))).unwrap()
+	);
+	assert_eq!(
+		b3.hash(),
+		block_on(longest_chain_select.finality_target(b2.hash(), Some(3)))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		b3.hash(),
+		block_on(longest_chain_select.finality_target(b3.hash(), Some(3)))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		None,
+		block_on(longest_chain_select.finality_target(b4.hash(), Some(3))).unwrap()
+	);
+	assert_eq!(
+		c3.hash(),
+		block_on(longest_chain_select.finality_target(c3.hash(), Some(3)))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		d2.hash(),
+		block_on(longest_chain_select.finality_target(d2.hash(), Some(3)))
+			.unwrap()
+			.unwrap()
+	);
 
 	// search only blocks with number <= 2
-
-	assert_eq!(a2.hash(), longest_chain_select.finality_target(
-		genesis_hash, Some(2)).unwrap().unwrap());
-	assert_eq!(a2.hash(), longest_chain_select.finality_target(
-		a1.hash(), Some(2)).unwrap().unwrap());
-	assert_eq!(a2.hash(), longest_chain_select.finality_target(
-		a2.hash(), Some(2)).unwrap().unwrap());
-	assert_eq!(None, longest_chain_select.finality_target(
-		a3.hash(), Some(2)).unwrap());
-	assert_eq!(None, longest_chain_select.finality_target(
-		a4.hash(), Some(2)).unwrap());
-	assert_eq!(None, longest_chain_select.finality_target(
-		a5.hash(), Some(2)).unwrap());
-
-	assert_eq!(b2.hash(), longest_chain_select.finality_target(
-		b2.hash(), Some(2)).unwrap().unwrap());
-	assert_eq!(None, longest_chain_select.finality_target(
-		b3.hash(), Some(2)).unwrap());
-	assert_eq!(None, longest_chain_select.finality_target(
-		b4.hash(), Some(2)).unwrap());
-
-	assert_eq!(None, longest_chain_select.finality_target(
-		c3.hash(), Some(2)).unwrap());
-
-	assert_eq!(d2.hash(), longest_chain_select.finality_target(
-		d2.hash(), Some(2)).unwrap().unwrap());
-
+	assert_eq!(
+		a2.hash(),
+		block_on(longest_chain_select.finality_target(genesis_hash, Some(2)))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		a2.hash(),
+		block_on(longest_chain_select.finality_target(a1.hash(), Some(2)))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		a2.hash(),
+		block_on(longest_chain_select.finality_target(a2.hash(), Some(2)))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		None,
+		block_on(longest_chain_select.finality_target(a3.hash(), Some(2))).unwrap()
+	);
+	assert_eq!(
+		None,
+		block_on(longest_chain_select.finality_target(a4.hash(), Some(2))).unwrap()
+	);
+	assert_eq!(
+		None,
+		block_on(longest_chain_select.finality_target(a5.hash(), Some(2))).unwrap()
+	);
+	assert_eq!(
+		b2.hash(),
+		block_on(longest_chain_select.finality_target(b2.hash(), Some(2)))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		None,
+		block_on(longest_chain_select.finality_target(b3.hash(), Some(2))).unwrap()
+	);
+	assert_eq!(
+		None,
+		block_on(longest_chain_select.finality_target(b4.hash(), Some(2))).unwrap()
+	);
+	assert_eq!(
+		None,
+		block_on(longest_chain_select.finality_target(c3.hash(), Some(2))).unwrap()
+	);
+	assert_eq!(
+		d2.hash(),
+		block_on(longest_chain_select.finality_target(d2.hash(), Some(2)))
+			.unwrap()
+			.unwrap()
+	);
 
 	// search only blocks with number <= 1
+	assert_eq!(
+		a1.hash(),
+		block_on(longest_chain_select.finality_target(genesis_hash, Some(1)))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		a1.hash(),
+		block_on(longest_chain_select.finality_target(a1.hash(), Some(1)))
+			.unwrap()
+			.unwrap()
+	);
+	assert_eq!(
+		None,
+		block_on(longest_chain_select.finality_target(a2.hash(), Some(1))).unwrap()
+	);
+	assert_eq!(
+		None,
+		block_on(longest_chain_select.finality_target(a3.hash(), Some(1))).unwrap()
+	);
+	assert_eq!(
+		None,
+		block_on(longest_chain_select.finality_target(a4.hash(), Some(1))).unwrap()
+	);
+	assert_eq!(
+		None,
+		block_on(longest_chain_select.finality_target(a5.hash(), Some(1))).unwrap()
+	);
 
-	assert_eq!(a1.hash(), longest_chain_select.finality_target(
-		genesis_hash, Some(1)).unwrap().unwrap());
-	assert_eq!(a1.hash(), longest_chain_select.finality_target(
-		a1.hash(), Some(1)).unwrap().unwrap());
-	assert_eq!(None, longest_chain_select.finality_target(
-		a2.hash(), Some(1)).unwrap());
-	assert_eq!(None, longest_chain_select.finality_target(
-		a3.hash(), Some(1)).unwrap());
-	assert_eq!(None, longest_chain_select.finality_target(
-		a4.hash(), Some(1)).unwrap());
-	assert_eq!(None, longest_chain_select.finality_target(
-		a5.hash(), Some(1)).unwrap());
-
-	assert_eq!(None, longest_chain_select.finality_target(
-		b2.hash(), Some(1)).unwrap());
-	assert_eq!(None, longest_chain_select.finality_target(
-		b3.hash(), Some(1)).unwrap());
-	assert_eq!(None, longest_chain_select.finality_target(
-		b4.hash(), Some(1)).unwrap());
-
-	assert_eq!(None, longest_chain_select.finality_target(
-		c3.hash(), Some(1)).unwrap());
-
-	assert_eq!(None, longest_chain_select.finality_target(
-		d2.hash(), Some(1)).unwrap());
+	assert_eq!(
+		None,
+		block_on(longest_chain_select.finality_target(b2.hash(), Some(1))).unwrap()
+	);
+	assert_eq!(
+		None,
+		block_on(longest_chain_select.finality_target(b3.hash(), Some(1))).unwrap()
+	);
+	assert_eq!(
+		None,
+		block_on(longest_chain_select.finality_target(b4.hash(), Some(1))).unwrap()
+	);
+	assert_eq!(
+		None,
+		block_on(longest_chain_select.finality_target(c3.hash(), Some(1))).unwrap()
+	);
+	assert_eq!(
+		None,
+		block_on(longest_chain_select.finality_target(d2.hash(), Some(1))).unwrap()
+	);
 
 	// search only blocks with number <= 0
-
-	assert_eq!(genesis_hash, longest_chain_select.finality_target(
-		genesis_hash, Some(0)).unwrap().unwrap());
-	assert_eq!(None, longest_chain_select.finality_target(
-		a1.hash(), Some(0)).unwrap());
-	assert_eq!(None, longest_chain_select.finality_target(
-		a2.hash(), Some(0)).unwrap());
-	assert_eq!(None, longest_chain_select.finality_target(
-		a3.hash(), Some(0)).unwrap());
-	assert_eq!(None, longest_chain_select.finality_target(
-		a4.hash(), Some(0)).unwrap());
-	assert_eq!(None, longest_chain_select.finality_target(
-		a5.hash(), Some(0)).unwrap());
-
-	assert_eq!(None, longest_chain_select.finality_target(
-		b2.hash(), Some(0)).unwrap());
-	assert_eq!(None, longest_chain_select.finality_target(
-		b3.hash(), Some(0)).unwrap());
-	assert_eq!(None, longest_chain_select.finality_target(
-		b4.hash(), Some(0)).unwrap());
-
+	assert_eq!(
+		genesis_hash,
+		block_on(longest_chain_select.finality_target(genesis_hash, Some(0)))
+			.unwrap()
+			.unwrap()
+	);
 	assert_eq!(
 		None,
-		longest_chain_select.finality_target(c3.hash().clone(), Some(0)).unwrap(),
+		block_on(longest_chain_select.finality_target(a1.hash(), Some(0))).unwrap()
+	);
+	assert_eq!(
+		None,
+		block_on(longest_chain_select.finality_target(a2.hash(), Some(0))).unwrap()
+	);
+	assert_eq!(
+		None,
+		block_on(longest_chain_select.finality_target(a3.hash(), Some(0))).unwrap()
+	);
+	assert_eq!(
+		None,
+		block_on(longest_chain_select.finality_target(a4.hash(), Some(0))).unwrap()
+	);
+	assert_eq!(
+		None,
+		block_on(longest_chain_select.finality_target(a5.hash(), Some(0))).unwrap()
+	);
+	assert_eq!(
+		None,
+		block_on(longest_chain_select.finality_target(b2.hash(), Some(0))).unwrap()
+	);
+	assert_eq!(
+		None,
+		block_on(longest_chain_select.finality_target(b3.hash(), Some(0))).unwrap()
+	);
+	assert_eq!(
+		None,
+		block_on(longest_chain_select.finality_target(b4.hash(), Some(0))).unwrap()
 	);
-
 	assert_eq!(
 		None,
-		longest_chain_select.finality_target(d2.hash().clone(), Some(0)).unwrap(),
+		block_on(longest_chain_select.finality_target(c3.hash().clone(), Some(0))).unwrap(),
+	);
+	assert_eq!(
+		None,
+		block_on(longest_chain_select.finality_target(d2.hash().clone(), Some(0))).unwrap(),
 	);
 }
 
@@ -972,18 +1218,30 @@ fn best_containing_on_longest_chain_with_max_depth_higher_than_best() {
 	let (mut client, longest_chain_select) = TestClientBuilder::new().build_with_longest_chain();
 
 	// G -> A1
-	let a1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let a1 = client
+		.new_block(Default::default())
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
 	// A1 -> A2
-	let a2 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let a2 = client
+		.new_block(Default::default())
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
 	let genesis_hash = client.chain_info().genesis_hash;
 
 	assert_eq!(
 		a2.hash(),
-		longest_chain_select.finality_target(genesis_hash, Some(10)).unwrap().unwrap(),
+		block_on(longest_chain_select.finality_target(genesis_hash, Some(10)))
+			.unwrap()
+			.unwrap(),
 	);
 }
 
@@ -1181,7 +1439,7 @@ fn finalizing_diverged_block_should_trigger_reorg() {
 
 	// `SelectChain` should report B2 as best block though
 	assert_eq!(
-		select_chain.best_chain().unwrap().hash(),
+		block_on(select_chain.best_chain()).unwrap().hash(),
 		b2.hash(),
 	);
 
diff --git a/primitives/api/test/Cargo.toml b/primitives/api/test/Cargo.toml
index 5866d44bd479..d0c45fb7545b 100644
--- a/primitives/api/test/Cargo.toml
+++ b/primitives/api/test/Cargo.toml
@@ -27,9 +27,10 @@ rustversion = "1.0.0"
 
 [dev-dependencies]
 criterion = "0.3.0"
-substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
-sp-core = { version = "3.0.0", path = "../../core" }
+futures = "0.3.9"
 log = "0.4.14"
+sp-core = { version = "3.0.0", path = "../../core" }
+substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
 
 [[bench]]
 name = "bench"
diff --git a/primitives/api/test/tests/runtime_calls.rs b/primitives/api/test/tests/runtime_calls.rs
index e10e1b34012a..562735834ddc 100644
--- a/primitives/api/test/tests/runtime_calls.rs
+++ b/primitives/api/test/tests/runtime_calls.rs
@@ -160,10 +160,15 @@ fn record_proof_works() {
 		.build_with_longest_chain();
 
 	let block_id = BlockId::Number(client.chain_info().best_number);
-	let storage_root = longest_chain.best_chain().unwrap().state_root().clone();
+	let storage_root = futures::executor::block_on(longest_chain.best_chain())
+		.unwrap()
+		.state_root()
+		.clone();
 
 	let runtime_code = sp_core::traits::RuntimeCode {
-		code_fetcher: &sp_core::traits::WrappedRuntimeCode(client.code_at(&block_id).unwrap().into()),
+		code_fetcher: &sp_core::traits::WrappedRuntimeCode(
+			client.code_at(&block_id).unwrap().into(),
+		),
 		hash: vec![1],
 		heap_pages: None,
 	};
diff --git a/primitives/consensus/common/src/block_import.rs b/primitives/consensus/common/src/block_import.rs
index 31c3eb74457c..67978232009e 100644
--- a/primitives/consensus/common/src/block_import.rs
+++ b/primitives/consensus/common/src/block_import.rs
@@ -363,15 +363,16 @@ impl<B: BlockT, T, E: std::error::Error + Send + 'static, Transaction> BlockImpo
 }
 
 /// Justification import trait
+#[async_trait::async_trait]
 pub trait JustificationImport<B: BlockT> {
 	type Error: std::error::Error + Send + 'static;
 
 	/// Called by the import queue when it is started. Returns a list of justifications to request
 	/// from the network.
-	fn on_start(&mut self) -> Vec<(B::Hash, NumberFor<B>)> { Vec::new() }
+	async fn on_start(&mut self) -> Vec<(B::Hash, NumberFor<B>)>;
 
 	/// Import a Block justification and finalize the given block.
-	fn import_justification(
+	async fn import_justification(
 		&mut self,
 		hash: B::Hash,
 		number: NumberFor<B>,
diff --git a/primitives/consensus/common/src/import_queue/basic_queue.rs b/primitives/consensus/common/src/import_queue/basic_queue.rs
index 55fc2eac40ca..3af983952af7 100644
--- a/primitives/consensus/common/src/import_queue/basic_queue.rs
+++ b/primitives/consensus/common/src/import_queue/basic_queue.rs
@@ -220,16 +220,16 @@ impl<B: BlockT> BlockImportWorker<B> {
 			metrics,
 		};
 
-		// Let's initialize `justification_import`
-		if let Some(justification_import) = worker.justification_import.as_mut() {
-			for (hash, number) in justification_import.on_start() {
-				worker.result_sender.request_justification(&hash, number);
-			}
-		}
-
 		let delay_between_blocks = Duration::default();
 
 		let future = async move {
+			// Let's initialize `justification_import`
+			if let Some(justification_import) = worker.justification_import.as_mut() {
+				for (hash, number) in justification_import.on_start().await {
+					worker.result_sender.request_justification(&hash, number);
+				}
+			}
+
 			let block_import_process = block_import_process(
 				block_import,
 				verifier,
@@ -254,15 +254,18 @@ impl<B: BlockT> BlockImportWorker<B> {
 				// Make sure to first process all justifications
 				while let Poll::Ready(justification) = futures::poll!(justification_port.next()) {
 					match justification {
-						Some(ImportJustification(who, hash, number, justification)) =>
-							worker.import_justification(who, hash, number, justification),
+						Some(ImportJustification(who, hash, number, justification)) => {
+							worker
+								.import_justification(who, hash, number, justification)
+								.await
+						}
 						None => {
 							log::debug!(
 								target: "block-import",
 								"Stopping block import because justification channel was closed!",
 							);
-							return
-						},
+							return;
+						}
 					}
 				}
 
@@ -278,7 +281,7 @@ impl<B: BlockT> BlockImportWorker<B> {
 		(future, justification_sender, block_import_sender)
 	}
 
-	fn import_justification(
+	async fn import_justification(
 		&mut self,
 		who: Origin,
 		hash: B::Hash,
@@ -286,8 +289,11 @@ impl<B: BlockT> BlockImportWorker<B> {
 		justification: Justification,
 	) {
 		let started = wasm_timer::Instant::now();
-		let success = self.justification_import.as_mut().map(|justification_import| {
-			justification_import.import_justification(hash, number, justification)
+
+		let success = match self.justification_import.as_mut() {
+			Some(justification_import) => justification_import
+				.import_justification(hash, number, justification)
+				.await
 				.map_err(|e| {
 					debug!(
 						target: "sync",
@@ -298,14 +304,19 @@ impl<B: BlockT> BlockImportWorker<B> {
 						who,
 					);
 					e
-				}).is_ok()
-		}).unwrap_or(false);
+				})
+				.is_ok(),
+			None => false,
+		};
 
 		if let Some(metrics) = self.metrics.as_ref() {
-			metrics.justification_import_time.observe(started.elapsed().as_secs_f64());
+			metrics
+				.justification_import_time
+				.observe(started.elapsed().as_secs_f64());
 		}
 
-		self.result_sender.justification_imported(who, &hash, number, success);
+		self.result_sender
+			.justification_imported(who, &hash, number, success);
 	}
 }
 
@@ -472,10 +483,15 @@ mod tests {
 		}
 	}
 
+	#[async_trait::async_trait]
 	impl JustificationImport<Block> for () {
 		type Error = crate::Error;
 
-		fn import_justification(
+		async fn on_start(&mut self) -> Vec<(Hash, BlockNumber)> {
+			Vec::new()
+		}
+
+		async fn import_justification(
 			&mut self,
 			_hash: Hash,
 			_number: BlockNumber,
diff --git a/primitives/consensus/common/src/select_chain.rs b/primitives/consensus/common/src/select_chain.rs
index 11f6fbeb54d3..e99a6756175d 100644
--- a/primitives/consensus/common/src/select_chain.rs
+++ b/primitives/consensus/common/src/select_chain.rs
@@ -33,23 +33,24 @@ use sp_runtime::traits::{Block as BlockT, NumberFor};
 /// some implementations.
 ///
 /// Non-deterministically finalizing chains may only use the `_authoring` functions.
+#[async_trait::async_trait]
 pub trait SelectChain<Block: BlockT>: Sync + Send + Clone {
-
-	/// Get all leaves of the chain: block hashes that have no children currently.
+	/// Get all leaves of the chain, i.e. block hashes that have no children currently.
 	/// Leaves that can never be finalized will not be returned.
-	fn leaves(&self) -> Result<Vec<<Block as BlockT>::Hash>, Error>;
+	async fn leaves(&self) -> Result<Vec<<Block as BlockT>::Hash>, Error>;
 
 	/// Among those `leaves` deterministically pick one chain as the generally
-	/// best chain to author new blocks upon and probably finalize.
-	fn best_chain(&self) -> Result<<Block as BlockT>::Header, Error>;
+	/// best chain to author new blocks upon and probably (but not necessarily)
+	/// finalize.
+	async fn best_chain(&self) -> Result<<Block as BlockT>::Header, Error>;
 
 	/// Get the best descendent of `target_hash` that we should attempt to
 	/// finalize next, if any. It is valid to return the given `target_hash`
 	/// itself if no better descendent exists.
-	fn finality_target(
+	async fn finality_target(
 		&self,
 		target_hash: <Block as BlockT>::Hash,
-		_maybe_max_number: Option<NumberFor<Block>>
+		_maybe_max_number: Option<NumberFor<Block>>,
 	) -> Result<Option<<Block as BlockT>::Hash>, Error> {
 		Ok(Some(target_hash))
 	}

From d6c33e7ec313f9bd5e319dc0a5a3ace5543f9617 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Mon, 21 Jun 2021 10:57:43 +0100
Subject: [PATCH 0900/1194] New Weights for All Pallets (#9148)

* Create run_benchmarks.sh

* Update run_benchmarks.sh

* new weights

* Delete run_benchmarks.sh

* wrong folder

* remove grandpa weight

* Update weights.rs
---
 frame/assets/src/weights.rs                   |  118 +-
 frame/balances/src/weights.rs                 |   26 +-
 frame/bounties/src/weights.rs                 |   60 +-
 frame/collective/src/weights.rs               |  218 +--
 frame/contracts/src/weights.rs                | 1272 ++++++++---------
 frame/democracy/src/weights.rs                |  217 +--
 .../src/weights.rs                            |  102 +-
 frame/elections-phragmen/src/weights.rs       |  124 +-
 frame/gilt/src/weights.rs                     |   54 +-
 frame/identity/src/weights.rs                 |  272 ++--
 frame/im-online/src/weights.rs                |   25 +-
 frame/indices/src/weights.rs                  |   42 +-
 frame/lottery/src/weights.rs                  |   36 +-
 frame/membership/src/weights.rs               |   58 +-
 frame/multisig/src/weights.rs                 |  154 +-
 frame/proxy/src/weights.rs                    |  156 +-
 frame/scheduler/src/weights.rs                |   60 +-
 frame/session/src/weights.rs                  |   24 +-
 frame/staking/src/weights.rs                  |  238 +--
 frame/system/src/weights.rs                   |   43 +-
 frame/timestamp/src/weights.rs                |   28 +-
 frame/tips/src/weights.rs                     |   54 +-
 frame/transaction-storage/src/weights.rs      |   22 +-
 frame/treasury/src/weights.rs                 |   34 +-
 frame/uniques/src/weights.rs                  |  114 +-
 frame/utility/src/weights.rs                  |   26 +-
 frame/vesting/src/weights.rs                  |   84 +-
 27 files changed, 1851 insertions(+), 1810 deletions(-)

diff --git a/frame/assets/src/weights.rs b/frame/assets/src/weights.rs
index 77db7fa4f05b..ae5462288a30 100644
--- a/frame/assets/src/weights.rs
+++ b/frame/assets/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_assets
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-10, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -73,23 +73,23 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn create() -> Weight {
-		(52_735_000 as Weight)
+		(43_277_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_create() -> Weight {
-		(26_570_000 as Weight)
+		(21_829_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn destroy(c: u32, s: u32, a: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 93_000
-			.saturating_add((31_110_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 93_000
-			.saturating_add((38_908_000 as Weight).saturating_mul(s as Weight))
-			// Standard Error: 935_000
-			.saturating_add((42_765_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 34_000
+			.saturating_add((22_206_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 34_000
+			.saturating_add((28_086_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 346_000
+			.saturating_add((32_168_000 as Weight).saturating_mul(a as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(c as Weight)))
 			.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(s as Weight)))
@@ -100,106 +100,106 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(a as Weight)))
 	}
 	fn mint() -> Weight {
-		(58_399_000 as Weight)
+		(45_983_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn burn() -> Weight {
-		(65_917_000 as Weight)
+		(52_925_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn transfer() -> Weight {
-		(100_407_000 as Weight)
+		(80_375_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn transfer_keep_alive() -> Weight {
-		(84_243_000 as Weight)
+		(67_688_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn force_transfer() -> Weight {
-		(100_407_000 as Weight)
+		(80_267_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn freeze() -> Weight {
-		(37_831_000 as Weight)
+		(30_541_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn thaw() -> Weight {
-		(37_660_000 as Weight)
+		(30_494_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn freeze_asset() -> Weight {
-		(27_175_000 as Weight)
+		(22_025_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn thaw_asset() -> Weight {
-		(26_884_000 as Weight)
+		(21_889_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn transfer_ownership() -> Weight {
-		(31_877_000 as Weight)
+		(24_939_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_team() -> Weight {
-		(27_947_000 as Weight)
+		(21_959_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_metadata(_n: u32, s: u32, ) -> Weight {
-		(57_993_000 as Weight)
+		(47_510_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((12_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((6_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn clear_metadata() -> Weight {
-		(57_820_000 as Weight)
+		(46_085_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_set_metadata(_n: u32, s: u32, ) -> Weight {
-		(30_830_000 as Weight)
+		(24_297_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((7_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_clear_metadata() -> Weight {
-		(57_292_000 as Weight)
+		(45_787_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_asset_status() -> Weight {
-		(26_750_000 as Weight)
+		(20_574_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn approve_transfer() -> Weight {
-		(65_598_000 as Weight)
+		(53_893_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn transfer_approved() -> Weight {
-		(131_312_000 as Weight)
+		(106_171_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
 	fn cancel_approval() -> Weight {
-		(66_904_000 as Weight)
+		(55_213_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn force_cancel_approval() -> Weight {
-		(67_525_000 as Weight)
+		(55_946_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
@@ -208,23 +208,23 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn create() -> Weight {
-		(52_735_000 as Weight)
+		(43_277_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_create() -> Weight {
-		(26_570_000 as Weight)
+		(21_829_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn destroy(c: u32, s: u32, a: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 93_000
-			.saturating_add((31_110_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 93_000
-			.saturating_add((38_908_000 as Weight).saturating_mul(s as Weight))
-			// Standard Error: 935_000
-			.saturating_add((42_765_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 34_000
+			.saturating_add((22_206_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 34_000
+			.saturating_add((28_086_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 346_000
+			.saturating_add((32_168_000 as Weight).saturating_mul(a as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(c as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(s as Weight)))
@@ -235,106 +235,106 @@ impl WeightInfo for () {
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(a as Weight)))
 	}
 	fn mint() -> Weight {
-		(58_399_000 as Weight)
+		(45_983_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn burn() -> Weight {
-		(65_917_000 as Weight)
+		(52_925_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn transfer() -> Weight {
-		(100_407_000 as Weight)
+		(80_375_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn transfer_keep_alive() -> Weight {
-		(84_243_000 as Weight)
+		(67_688_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn force_transfer() -> Weight {
-		(100_407_000 as Weight)
+		(80_267_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn freeze() -> Weight {
-		(37_831_000 as Weight)
+		(30_541_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn thaw() -> Weight {
-		(37_660_000 as Weight)
+		(30_494_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn freeze_asset() -> Weight {
-		(27_175_000 as Weight)
+		(22_025_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn thaw_asset() -> Weight {
-		(26_884_000 as Weight)
+		(21_889_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn transfer_ownership() -> Weight {
-		(31_877_000 as Weight)
+		(24_939_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_team() -> Weight {
-		(27_947_000 as Weight)
+		(21_959_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_metadata(_n: u32, s: u32, ) -> Weight {
-		(57_993_000 as Weight)
+		(47_510_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((12_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((6_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn clear_metadata() -> Weight {
-		(57_820_000 as Weight)
+		(46_085_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_set_metadata(_n: u32, s: u32, ) -> Weight {
-		(30_830_000 as Weight)
+		(24_297_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((7_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_clear_metadata() -> Weight {
-		(57_292_000 as Weight)
+		(45_787_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_asset_status() -> Weight {
-		(26_750_000 as Weight)
+		(20_574_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn approve_transfer() -> Weight {
-		(65_598_000 as Weight)
+		(53_893_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn transfer_approved() -> Weight {
-		(131_312_000 as Weight)
+		(106_171_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}
 	fn cancel_approval() -> Weight {
-		(66_904_000 as Weight)
+		(55_213_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn force_cancel_approval() -> Weight {
-		(67_525_000 as Weight)
+		(55_946_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
diff --git a/frame/balances/src/weights.rs b/frame/balances/src/weights.rs
index cf1d7dff8284..79e6445dd6bb 100644
--- a/frame/balances/src/weights.rs
+++ b/frame/balances/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_balances
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-04, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -56,32 +56,32 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn transfer() -> Weight {
-		(91_896_000 as Weight)
+		(73_268_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn transfer_keep_alive() -> Weight {
-		(67_779_000 as Weight)
+		(54_881_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_balance_creating() -> Weight {
-		(36_912_000 as Weight)
+		(29_853_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_balance_killing() -> Weight {
-		(44_416_000 as Weight)
+		(36_007_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_transfer() -> Weight {
-		(90_811_000 as Weight)
+		(72_541_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn transfer_all() -> Weight {
-		(84_170_000 as Weight)
+		(67_360_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -90,32 +90,32 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn transfer() -> Weight {
-		(91_896_000 as Weight)
+		(73_268_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn transfer_keep_alive() -> Weight {
-		(67_779_000 as Weight)
+		(54_881_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_balance_creating() -> Weight {
-		(36_912_000 as Weight)
+		(29_853_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_balance_killing() -> Weight {
-		(44_416_000 as Weight)
+		(36_007_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_transfer() -> Weight {
-		(90_811_000 as Weight)
+		(72_541_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn transfer_all() -> Weight {
-		(84_170_000 as Weight)
+		(67_360_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
diff --git a/frame/bounties/src/weights.rs b/frame/bounties/src/weights.rs
index 50d76739a938..9b50d438923c 100644
--- a/frame/bounties/src/weights.rs
+++ b/frame/bounties/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,12 +17,12 @@
 
 //! Autogenerated weights for pallet_bounties
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-12-16, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
-// ./target/release/substrate
+// target/release/substrate
 // benchmark
 // --chain=dev
 // --steps=50
@@ -61,61 +61,61 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn propose_bounty(d: u32, ) -> Weight {
-		(64_778_000 as Weight)
+		(44_351_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((1_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn approve_bounty() -> Weight {
-		(18_293_000 as Weight)
+		(12_417_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn propose_curator() -> Weight {
-		(14_248_000 as Weight)
+		(9_692_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn unassign_curator() -> Weight {
-		(52_100_000 as Weight)
+		(41_211_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn accept_curator() -> Weight {
-		(52_564_000 as Weight)
+		(37_376_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn award_bounty() -> Weight {
-		(37_426_000 as Weight)
+		(25_525_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn claim_bounty() -> Weight {
-		(176_077_000 as Weight)
+		(125_495_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
 	fn close_bounty_proposed() -> Weight {
-		(51_162_000 as Weight)
+		(40_464_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn close_bounty_active() -> Weight {
-		(116_907_000 as Weight)
+		(84_042_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn extend_bounty_expiry() -> Weight {
-		(36_419_000 as Weight)
+		(25_114_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn spend_funds(b: u32, ) -> Weight {
-		(7_562_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((77_328_000 as Weight).saturating_mul(b as Weight))
+		(351_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((58_724_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(b as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -126,61 +126,61 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn propose_bounty(d: u32, ) -> Weight {
-		(64_778_000 as Weight)
+		(44_351_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((1_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn approve_bounty() -> Weight {
-		(18_293_000 as Weight)
+		(12_417_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn propose_curator() -> Weight {
-		(14_248_000 as Weight)
+		(9_692_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn unassign_curator() -> Weight {
-		(52_100_000 as Weight)
+		(41_211_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn accept_curator() -> Weight {
-		(52_564_000 as Weight)
+		(37_376_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn award_bounty() -> Weight {
-		(37_426_000 as Weight)
+		(25_525_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn claim_bounty() -> Weight {
-		(176_077_000 as Weight)
+		(125_495_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}
 	fn close_bounty_proposed() -> Weight {
-		(51_162_000 as Weight)
+		(40_464_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn close_bounty_active() -> Weight {
-		(116_907_000 as Weight)
+		(84_042_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn extend_bounty_expiry() -> Weight {
-		(36_419_000 as Weight)
+		(25_114_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn spend_funds(b: u32, ) -> Weight {
-		(7_562_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((77_328_000 as Weight).saturating_mul(b as Weight))
+		(351_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((58_724_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(b as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
diff --git a/frame/collective/src/weights.rs b/frame/collective/src/weights.rs
index 7bdce04d2648..46bd999344ad 100644
--- a/frame/collective/src/weights.rs
+++ b/frame/collective/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Weights for pallet_collective
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! Autogenerated weights for pallet_collective
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -43,17 +44,16 @@ use sp_std::marker::PhantomData;
 
 /// Weight functions needed for pallet_collective.
 pub trait WeightInfo {
-	fn set_members(_m: u32, _n: u32, _p: u32, ) -> Weight;
-	fn execute(_b: u32, _m: u32, ) -> Weight;
-	fn propose_execute(_b: u32, _m: u32, ) -> Weight;
-	fn propose_proposed(_b: u32, _m: u32, _p: u32, ) -> Weight;
-	fn vote(_m: u32, ) -> Weight;
-	fn close_early_disapproved(_m: u32, _p: u32, ) -> Weight;
-	fn close_early_approved(_b: u32, _m: u32, _p: u32, ) -> Weight;
-	fn close_disapproved(_m: u32, _p: u32, ) -> Weight;
-	fn close_approved(_b: u32, _m: u32, _p: u32, ) -> Weight;
-	fn disapprove_proposal(_p: u32, ) -> Weight;
-
+	fn set_members(m: u32, n: u32, p: u32, ) -> Weight;
+	fn execute(b: u32, m: u32, ) -> Weight;
+	fn propose_execute(b: u32, m: u32, ) -> Weight;
+	fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight;
+	fn vote(m: u32, ) -> Weight;
+	fn close_early_disapproved(m: u32, p: u32, ) -> Weight;
+	fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight;
+	fn close_disapproved(m: u32, p: u32, ) -> Weight;
+	fn close_approved(b: u32, m: u32, p: u32, ) -> Weight;
+	fn disapprove_proposal(p: u32, ) -> Weight;
 }
 
 /// Weights for pallet_collective using the Substrate node and recommended hardware.
@@ -61,170 +61,194 @@ pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn set_members(m: u32, n: u32, p: u32, ) -> Weight {
 		(0 as Weight)
-			.saturating_add((20_933_000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((254_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add((28_233_000 as Weight).saturating_mul(p as Weight))
+			// Standard Error: 5_000
+			.saturating_add((15_266_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 5_000
+			.saturating_add((39_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 5_000
+			.saturating_add((20_899_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(p as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
 	}
 	fn execute(b: u32, m: u32, ) -> Weight {
-		(31_147_000 as Weight)
-			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
-			.saturating_add((115_000 as Weight).saturating_mul(m as Weight))
+		(21_945_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
+			// Standard Error: 0
+			.saturating_add((93_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-
 	}
 	fn propose_execute(b: u32, m: u32, ) -> Weight {
-		(38_774_000 as Weight)
-			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
-			.saturating_add((226_000 as Weight).saturating_mul(m as Weight))
+		(26_316_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
+			// Standard Error: 0
+			.saturating_add((184_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-
 	}
 	fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight {
-		(64_230_000 as Weight)
-			.saturating_add((5_000 as Weight).saturating_mul(b as Weight))
-			.saturating_add((138_000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((637_000 as Weight).saturating_mul(p as Weight))
+		(42_664_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
+			// Standard Error: 2_000
+			.saturating_add((166_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 2_000
+			.saturating_add((435_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
-
 	}
 	fn vote(m: u32, ) -> Weight {
-		(57_051_000 as Weight)
-			.saturating_add((220_000 as Weight).saturating_mul(m as Weight))
+		(43_750_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((198_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-
 	}
 	fn close_early_disapproved(m: u32, p: u32, ) -> Weight {
-		(61_406_000 as Weight)
-			.saturating_add((225_000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((630_000 as Weight).saturating_mul(p as Weight))
+		(44_153_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((185_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 0
+			.saturating_add((454_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-
 	}
 	fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		(92_864_000 as Weight)
-			.saturating_add((1_000 as Weight).saturating_mul(b as Weight))
-			.saturating_add((233_000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((597_000 as Weight).saturating_mul(p as Weight))
+		(65_478_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
+			// Standard Error: 2_000
+			.saturating_add((167_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 2_000
+			.saturating_add((434_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-
 	}
 	fn close_disapproved(m: u32, p: u32, ) -> Weight {
-		(67_942_000 as Weight)
-			.saturating_add((232_000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((636_000 as Weight).saturating_mul(p as Weight))
+		(49_001_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((189_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 0
+			.saturating_add((464_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-
 	}
 	fn close_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		(99_742_000 as Weight)
-			.saturating_add((1_000 as Weight).saturating_mul(b as Weight))
-			.saturating_add((233_000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((598_000 as Weight).saturating_mul(p as Weight))
+		(65_049_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
+			// Standard Error: 1_000
+			.saturating_add((192_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 1_000
+			.saturating_add((469_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-
 	}
 	fn disapprove_proposal(p: u32, ) -> Weight {
-		(36_628_000 as Weight)
-			.saturating_add((640_000 as Weight).saturating_mul(p as Weight))
+		(27_288_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((477_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-
 	}
-
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn set_members(m: u32, n: u32, p: u32, ) -> Weight {
 		(0 as Weight)
-			.saturating_add((20_933_000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((254_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add((28_233_000 as Weight).saturating_mul(p as Weight))
+			// Standard Error: 5_000
+			.saturating_add((15_266_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 5_000
+			.saturating_add((39_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 5_000
+			.saturating_add((20_899_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(p as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
 	}
 	fn execute(b: u32, m: u32, ) -> Weight {
-		(31_147_000 as Weight)
-			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
-			.saturating_add((115_000 as Weight).saturating_mul(m as Weight))
+		(21_945_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
+			// Standard Error: 0
+			.saturating_add((93_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
-
 	}
 	fn propose_execute(b: u32, m: u32, ) -> Weight {
-		(38_774_000 as Weight)
-			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
-			.saturating_add((226_000 as Weight).saturating_mul(m as Weight))
+		(26_316_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
+			// Standard Error: 0
+			.saturating_add((184_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
-
 	}
 	fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight {
-		(64_230_000 as Weight)
-			.saturating_add((5_000 as Weight).saturating_mul(b as Weight))
-			.saturating_add((138_000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((637_000 as Weight).saturating_mul(p as Weight))
+		(42_664_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
+			// Standard Error: 2_000
+			.saturating_add((166_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 2_000
+			.saturating_add((435_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
-
 	}
 	fn vote(m: u32, ) -> Weight {
-		(57_051_000 as Weight)
-			.saturating_add((220_000 as Weight).saturating_mul(m as Weight))
+		(43_750_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((198_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-
 	}
 	fn close_early_disapproved(m: u32, p: u32, ) -> Weight {
-		(61_406_000 as Weight)
-			.saturating_add((225_000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((630_000 as Weight).saturating_mul(p as Weight))
+		(44_153_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((185_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 0
+			.saturating_add((454_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
-
 	}
 	fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		(92_864_000 as Weight)
-			.saturating_add((1_000 as Weight).saturating_mul(b as Weight))
-			.saturating_add((233_000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((597_000 as Weight).saturating_mul(p as Weight))
+		(65_478_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
+			// Standard Error: 2_000
+			.saturating_add((167_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 2_000
+			.saturating_add((434_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
-
 	}
 	fn close_disapproved(m: u32, p: u32, ) -> Weight {
-		(67_942_000 as Weight)
-			.saturating_add((232_000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((636_000 as Weight).saturating_mul(p as Weight))
+		(49_001_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((189_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 0
+			.saturating_add((464_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
-
 	}
 	fn close_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		(99_742_000 as Weight)
-			.saturating_add((1_000 as Weight).saturating_mul(b as Weight))
-			.saturating_add((233_000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((598_000 as Weight).saturating_mul(p as Weight))
+		(65_049_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
+			// Standard Error: 1_000
+			.saturating_add((192_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 1_000
+			.saturating_add((469_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
-
 	}
 	fn disapprove_proposal(p: u32, ) -> Weight {
-		(36_628_000 as Weight)
-			.saturating_add((640_000 as Weight).saturating_mul(p as Weight))
+		(27_288_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((477_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
-
 	}
-
 }
diff --git a/frame/contracts/src/weights.rs b/frame/contracts/src/weights.rs
index b96a3cad5b73..5edb4170e4ea 100644
--- a/frame/contracts/src/weights.rs
+++ b/frame/contracts/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_contracts
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-05-11, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -62,8 +62,6 @@ pub trait WeightInfo {
 	fn seal_rent_allowance(r: u32, ) -> Weight;
 	fn seal_block_number(r: u32, ) -> Weight;
 	fn seal_now(r: u32, ) -> Weight;
-	fn seal_rent_params(r: u32, ) -> Weight;
-	fn seal_rent_status(r: u32, ) -> Weight;
 	fn seal_weight_to_fee(r: u32, ) -> Weight;
 	fn seal_gas(r: u32, ) -> Weight;
 	fn seal_input(r: u32, ) -> Weight;
@@ -154,286 +152,272 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn on_initialize() -> Weight {
-		(3_656_000 as Weight)
+		(3_603_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 	}
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((2_241_000 as Weight).saturating_mul(k as Weight))
+			// Standard Error: 2_000
+			.saturating_add((2_217_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
-		(36_820_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((34_550_000 as Weight).saturating_mul(q as Weight))
+		(0 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((36_769_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn instrument(c: u32, ) -> Weight {
-		(42_348_000 as Weight)
-			// Standard Error: 185_000
-			.saturating_add((95_664_000 as Weight).saturating_mul(c as Weight))
+		(54_463_000 as Weight)
+			// Standard Error: 105_000
+			.saturating_add((77_542_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight {
-		(210_852_000 as Weight)
-			// Standard Error: 138_000
-			.saturating_add((135_241_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 9_000
-			.saturating_add((1_846_000 as Weight).saturating_mul(s as Weight))
+		(184_114_000 as Weight)
+			// Standard Error: 82_000
+			.saturating_add((117_247_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 5_000
+			.saturating_add((1_542_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn instantiate(c: u32, s: u32, ) -> Weight {
-		(217_380_000 as Weight)
-			// Standard Error: 6_000
-			.saturating_add((8_483_000 as Weight).saturating_mul(c as Weight))
+		(183_501_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((5_645_000 as Weight).saturating_mul(c as Weight))
 			// Standard Error: 0
-			.saturating_add((1_752_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((1_473_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn call(c: u32, ) -> Weight {
-		(181_443_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((3_955_000 as Weight).saturating_mul(c as Weight))
+		(173_411_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((2_639_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn claim_surcharge(c: u32, ) -> Weight {
-		(132_551_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((4_740_000 as Weight).saturating_mul(c as Weight))
+		(125_839_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((3_123_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn seal_caller(r: u32, ) -> Weight {
-		(137_742_000 as Weight)
-			// Standard Error: 74_000
-			.saturating_add((242_261_000 as Weight).saturating_mul(r as Weight))
+		(131_793_000 as Weight)
+			// Standard Error: 84_000
+			.saturating_add((231_138_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_address(r: u32, ) -> Weight {
-		(137_739_000 as Weight)
-			// Standard Error: 91_000
-			.saturating_add((241_803_000 as Weight).saturating_mul(r as Weight))
+		(129_995_000 as Weight)
+			// Standard Error: 78_000
+			.saturating_add((231_839_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(139_631_000 as Weight)
-			// Standard Error: 83_000
-			.saturating_add((236_790_000 as Weight).saturating_mul(r as Weight))
+		(129_710_000 as Weight)
+			// Standard Error: 85_000
+			.saturating_add((227_268_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_balance(r: u32, ) -> Weight {
-		(142_506_000 as Weight)
-			// Standard Error: 176_000
-			.saturating_add((525_752_000 as Weight).saturating_mul(r as Weight))
+		(133_445_000 as Weight)
+			// Standard Error: 144_000
+			.saturating_add((487_125_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(138_569_000 as Weight)
-			// Standard Error: 76_000
-			.saturating_add((237_016_000 as Weight).saturating_mul(r as Weight))
+		(129_299_000 as Weight)
+			// Standard Error: 82_000
+			.saturating_add((227_118_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(134_713_000 as Weight)
-			// Standard Error: 81_000
-			.saturating_add((237_962_000 as Weight).saturating_mul(r as Weight))
+		(126_120_000 as Weight)
+			// Standard Error: 114_000
+			.saturating_add((227_326_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(131_523_000 as Weight)
-			// Standard Error: 90_000
-			.saturating_add((237_435_000 as Weight).saturating_mul(r as Weight))
+		(130_934_000 as Weight)
+			// Standard Error: 89_000
+			.saturating_add((226_638_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(141_574_000 as Weight)
-			// Standard Error: 86_000
-			.saturating_add((238_102_000 as Weight).saturating_mul(r as Weight))
+		(128_738_000 as Weight)
+			// Standard Error: 77_000
+			.saturating_add((227_062_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_block_number(r: u32, ) -> Weight {
-		(140_240_000 as Weight)
-			// Standard Error: 101_000
-			.saturating_add((236_568_000 as Weight).saturating_mul(r as Weight))
+		(132_375_000 as Weight)
+			// Standard Error: 88_000
+			.saturating_add((226_861_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_now(r: u32, ) -> Weight {
-		(138_265_000 as Weight)
-			// Standard Error: 91_000
-			.saturating_add((237_187_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn seal_rent_params(r: u32, ) -> Weight {
-		(149_701_000 as Weight)
-			// Standard Error: 297_000
-			.saturating_add((357_149_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn seal_rent_status(r: u32, ) -> Weight {
-		(146_863_000 as Weight)
-			// Standard Error: 191_000
-			.saturating_add((638_683_000 as Weight).saturating_mul(r as Weight))
+		(127_888_000 as Weight)
+			// Standard Error: 86_000
+			.saturating_add((227_851_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(144_278_000 as Weight)
+		(131_825_000 as Weight)
 			// Standard Error: 149_000
-			.saturating_add((470_264_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((420_149_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_gas(r: u32, ) -> Weight {
-		(111_361_000 as Weight)
-			// Standard Error: 157_000
-			.saturating_add((118_441_000 as Weight).saturating_mul(r as Weight))
+		(113_641_000 as Weight)
+			// Standard Error: 114_000
+			.saturating_add((113_068_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_input(r: u32, ) -> Weight {
-		(129_970_000 as Weight)
-			// Standard Error: 316_000
-			.saturating_add((7_160_000 as Weight).saturating_mul(r as Weight))
+		(122_982_000 as Weight)
+			// Standard Error: 74_000
+			.saturating_add((6_828_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(139_275_000 as Weight)
+		(131_913_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((250_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((275_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_return(r: u32, ) -> Weight {
-		(119_240_000 as Weight)
-			// Standard Error: 57_000
-			.saturating_add((4_347_000 as Weight).saturating_mul(r as Weight))
+		(114_164_000 as Weight)
+			// Standard Error: 72_000
+			.saturating_add((4_318_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(128_896_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((757_000 as Weight).saturating_mul(n as Weight))
+		(123_940_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((664_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_terminate(r: u32, ) -> Weight {
-		(130_119_000 as Weight)
-			// Standard Error: 108_000
-			.saturating_add((95_078_000 as Weight).saturating_mul(r as Weight))
+		(123_340_000 as Weight)
+			// Standard Error: 99_000
+			.saturating_add((89_126_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_terminate_per_code_kb(c: u32, ) -> Weight {
-		(230_167_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((8_495_000 as Weight).saturating_mul(c as Weight))
+		(217_499_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((5_608_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
 	fn seal_restore_to(r: u32, ) -> Weight {
-		(159_200_000 as Weight)
-			// Standard Error: 261_000
-			.saturating_add((103_048_000 as Weight).saturating_mul(r as Weight))
+		(149_019_000 as Weight)
+			// Standard Error: 903_000
+			.saturating_add((87_433_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((5 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_restore_to_per_code_kb_delta(c: u32, t: u32, d: u32, ) -> Weight {
-		(58_389_000 as Weight)
-			// Standard Error: 131_000
-			.saturating_add((7_910_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 131_000
-			.saturating_add((4_036_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 1_156_000
-			.saturating_add((3_714_110_000 as Weight).saturating_mul(d as Weight))
+		(18_255_000 as Weight)
+			// Standard Error: 141_000
+			.saturating_add((5_142_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 141_000
+			.saturating_add((2_478_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 1_242_000
+			.saturating_add((2_935_421_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
 			.saturating_add(T::DbWeight::get().writes(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
 	}
 	fn seal_random(r: u32, ) -> Weight {
-		(138_794_000 as Weight)
-			// Standard Error: 216_000
-			.saturating_add((599_742_000 as Weight).saturating_mul(r as Weight))
+		(140_411_000 as Weight)
+			// Standard Error: 146_000
+			.saturating_add((566_687_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(139_890_000 as Weight)
-			// Standard Error: 263_000
-			.saturating_add((885_805_000 as Weight).saturating_mul(r as Weight))
+		(132_048_000 as Weight)
+			// Standard Error: 308_000
+			.saturating_add((818_622_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_117_962_000 as Weight)
-			// Standard Error: 4_029_000
-			.saturating_add((566_825_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 794_000
-			.saturating_add((251_096_000 as Weight).saturating_mul(n as Weight))
+		(1_080_578_000 as Weight)
+			// Standard Error: 2_337_000
+			.saturating_add((534_525_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 460_000
+			.saturating_add((167_990_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(132_720_000 as Weight)
-			// Standard Error: 87_000
-			.saturating_add((164_134_000 as Weight).saturating_mul(r as Weight))
+		(123_998_000 as Weight)
+			// Standard Error: 53_000
+			.saturating_add((155_113_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_debug_message(r: u32, ) -> Weight {
-		(125_834_000 as Weight)
-			// Standard Error: 142_000
-			.saturating_add((127_200_000 as Weight).saturating_mul(r as Weight))
+		(120_514_000 as Weight)
+			// Standard Error: 93_000
+			.saturating_add((124_243_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(478_734_000 as Weight)
-			// Standard Error: 2_559_000
-			.saturating_add((3_766_445_000 as Weight).saturating_mul(r as Weight))
+		(47_131_000 as Weight)
+			// Standard Error: 931_000
+			.saturating_add((4_033_062_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(600_306_000 as Weight)
-			// Standard Error: 234_000
-			.saturating_add((70_989_000 as Weight).saturating_mul(n as Weight))
+		(549_577_000 as Weight)
+			// Standard Error: 192_000
+			.saturating_add((57_815_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn seal_clear_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_380_000
-			.saturating_add((1_242_131_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 2_635_000
+			.saturating_add((1_214_454_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -441,23 +425,23 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	}
 	fn seal_get_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 1_060_000
-			.saturating_add((910_861_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 1_044_000
+			.saturating_add((883_653_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(605_545_000 as Weight)
-			// Standard Error: 252_000
-			.saturating_add((153_519_000 as Weight).saturating_mul(n as Weight))
+		(568_190_000 as Weight)
+			// Standard Error: 181_000
+			.saturating_add((106_420_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_transfer(r: u32, ) -> Weight {
-		(36_854_000 as Weight)
-			// Standard Error: 2_076_000
-			.saturating_add((5_183_774_000 as Weight).saturating_mul(r as Weight))
+		(0 as Weight)
+			// Standard Error: 1_553_000
+			.saturating_add((4_810_405_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
@@ -465,645 +449,631 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	}
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 6_583_000
-			.saturating_add((11_599_057_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 8_671_000
+			.saturating_add((10_965_308_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((200 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_call_per_code_transfer_input_output_kb(c: u32, t: u32, i: u32, o: u32, ) -> Weight {
-		(10_431_738_000 as Weight)
-			// Standard Error: 301_000
-			.saturating_add((392_174_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 125_400_000
-			.saturating_add((3_698_896_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 39_000
-			.saturating_add((60_692_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 42_000
-			.saturating_add((78_872_000 as Weight).saturating_mul(o as Weight))
+		(10_138_403_000 as Weight)
+			// Standard Error: 162_000
+			.saturating_add((264_871_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 67_846_000
+			.saturating_add((3_793_372_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 21_000
+			.saturating_add((49_168_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 22_000
+			.saturating_add((71_664_000 as Weight).saturating_mul(o as Weight))
 			.saturating_add(T::DbWeight::get().reads(205 as Weight))
 			.saturating_add(T::DbWeight::get().writes(101 as Weight))
 			.saturating_add(T::DbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 32_118_000
-			.saturating_add((21_117_947_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 34_546_000
+			.saturating_add((19_938_393_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes((300 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_instantiate_per_code_input_output_salt_kb(c: u32, i: u32, o: u32, s: u32, ) -> Weight {
-		(8_542_521_000 as Weight)
-			// Standard Error: 644_000
-			.saturating_add((878_020_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 91_000
-			.saturating_add((63_004_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 91_000
-			.saturating_add((83_203_000 as Weight).saturating_mul(o as Weight))
-			// Standard Error: 91_000
-			.saturating_add((240_170_000 as Weight).saturating_mul(s as Weight))
+		(8_861_543_000 as Weight)
+			// Standard Error: 566_000
+			.saturating_add((585_057_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 80_000
+			.saturating_add((52_025_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 80_000
+			.saturating_add((75_956_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 80_000
+			.saturating_add((198_033_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(206 as Weight))
 			.saturating_add(T::DbWeight::get().writes(204 as Weight))
 	}
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(130_991_000 as Weight)
-			// Standard Error: 106_000
-			.saturating_add((230_186_000 as Weight).saturating_mul(r as Weight))
+		(129_022_000 as Weight)
+			// Standard Error: 76_000
+			.saturating_add((216_764_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(508_089_000 as Weight)
-			// Standard Error: 38_000
-			.saturating_add((491_916_000 as Weight).saturating_mul(n as Weight))
+		(414_489_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((481_873_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(135_384_000 as Weight)
-			// Standard Error: 111_000
-			.saturating_add((233_638_000 as Weight).saturating_mul(r as Weight))
+		(127_636_000 as Weight)
+			// Standard Error: 104_000
+			.saturating_add((225_094_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(445_961_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((340_992_000 as Weight).saturating_mul(n as Weight))
+		(216_668_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((331_423_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(133_593_000 as Weight)
-			// Standard Error: 112_000
-			.saturating_add((208_000_000 as Weight).saturating_mul(r as Weight))
+		(129_582_000 as Weight)
+			// Standard Error: 97_000
+			.saturating_add((198_429_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(444_562_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((159_521_000 as Weight).saturating_mul(n as Weight))
+		(288_991_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((148_497_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(131_381_000 as Weight)
-			// Standard Error: 82_000
-			.saturating_add((207_479_000 as Weight).saturating_mul(r as Weight))
+		(128_711_000 as Weight)
+			// Standard Error: 94_000
+			.saturating_add((197_050_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(576_129_000 as Weight)
-			// Standard Error: 49_000
-			.saturating_add((156_900_000 as Weight).saturating_mul(n as Weight))
+		(275_444_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((148_469_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(20_276_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((3_355_000 as Weight).saturating_mul(r as Weight))
+		(20_089_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((3_376_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(22_345_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((133_628_000 as Weight).saturating_mul(r as Weight))
+		(22_187_000 as Weight)
+			// Standard Error: 31_000
+			.saturating_add((162_969_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(22_294_000 as Weight)
-			// Standard Error: 95_000
-			.saturating_add((204_007_000 as Weight).saturating_mul(r as Weight))
+		(22_292_000 as Weight)
+			// Standard Error: 39_000
+			.saturating_add((233_277_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(20_266_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((12_605_000 as Weight).saturating_mul(r as Weight))
+		(20_083_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((12_378_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(20_208_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((12_589_000 as Weight).saturating_mul(r as Weight))
+		(20_091_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((12_195_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(20_227_000 as Weight)
+		(20_082_000 as Weight)
 			// Standard Error: 18_000
-			.saturating_add((6_429_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((6_151_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(20_279_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((14_560_000 as Weight).saturating_mul(r as Weight))
+		(20_031_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((13_978_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(20_210_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((15_613_000 as Weight).saturating_mul(r as Weight))
+		(20_063_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((15_524_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(34_276_000 as Weight)
+		(34_332_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((130_000 as Weight).saturating_mul(e as Weight))
+			.saturating_add((117_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(20_426_000 as Weight)
-			// Standard Error: 69_000
-			.saturating_add((91_850_000 as Weight).saturating_mul(r as Weight))
+		(20_446_000 as Weight)
+			// Standard Error: 121_000
+			.saturating_add((90_977_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(27_099_000 as Weight)
-			// Standard Error: 111_000
-			.saturating_add((169_212_000 as Weight).saturating_mul(r as Weight))
+		(28_119_000 as Weight)
+			// Standard Error: 390_000
+			.saturating_add((192_865_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(206_492_000 as Weight)
+		(228_352_000 as Weight)
 			// Standard Error: 4_000
-			.saturating_add((4_685_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((3_891_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(37_892_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((3_510_000 as Weight).saturating_mul(r as Weight))
+		(37_745_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((3_135_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(37_773_000 as Weight)
+		(37_639_000 as Weight)
 			// Standard Error: 15_000
-			.saturating_add((3_814_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((3_541_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(37_785_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((4_949_000 as Weight).saturating_mul(r as Weight))
+		(37_639_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((4_813_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(23_467_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((7_493_000 as Weight).saturating_mul(r as Weight))
+		(23_379_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((7_757_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(23_492_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((8_499_000 as Weight).saturating_mul(r as Weight))
+		(23_378_000 as Weight)
+			// Standard Error: 68_000
+			.saturating_add((8_437_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(22_347_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((3_565_000 as Weight).saturating_mul(r as Weight))
+		(22_245_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((3_446_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(20_849_000 as Weight)
-			// Standard Error: 2_751_000
-			.saturating_add((2_072_517_000 as Weight).saturating_mul(r as Weight))
+		(20_714_000 as Weight)
+			// Standard Error: 478_000
+			.saturating_add((2_314_540_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(20_216_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((5_067_000 as Weight).saturating_mul(r as Weight))
+		(20_126_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((5_316_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(20_218_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((5_015_000 as Weight).saturating_mul(r as Weight))
+		(20_107_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((5_344_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(20_215_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((5_888_000 as Weight).saturating_mul(r as Weight))
+		(20_135_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((5_909_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(20_232_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((5_366_000 as Weight).saturating_mul(r as Weight))
+		(20_107_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((5_515_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(20_205_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((4_847_000 as Weight).saturating_mul(r as Weight))
+		(20_229_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((5_113_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(20_181_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((4_849_000 as Weight).saturating_mul(r as Weight))
+		(20_070_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((5_226_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(20_175_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((4_981_000 as Weight).saturating_mul(r as Weight))
+		(20_090_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((5_296_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(20_273_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((7_402_000 as Weight).saturating_mul(r as Weight))
+		(20_095_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((7_323_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(20_260_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((7_392_000 as Weight).saturating_mul(r as Weight))
+		(20_043_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((7_280_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(20_248_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((7_363_000 as Weight).saturating_mul(r as Weight))
+		(20_061_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((7_226_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(20_229_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((7_412_000 as Weight).saturating_mul(r as Weight))
+		(20_072_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((7_315_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(20_232_000 as Weight)
-			// Standard Error: 9_000
-			.saturating_add((7_364_000 as Weight).saturating_mul(r as Weight))
+		(20_054_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((7_228_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(20_252_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((7_383_000 as Weight).saturating_mul(r as Weight))
+		(20_169_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_262_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(20_258_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((7_359_000 as Weight).saturating_mul(r as Weight))
+		(20_115_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((7_212_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(20_245_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((7_400_000 as Weight).saturating_mul(r as Weight))
+		(20_122_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((7_166_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(20_245_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((7_391_000 as Weight).saturating_mul(r as Weight))
+		(20_140_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((7_242_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(20_230_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((7_439_000 as Weight).saturating_mul(r as Weight))
+		(20_107_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_365_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(20_254_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((7_204_000 as Weight).saturating_mul(r as Weight))
+		(20_179_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((7_144_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(20_182_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((7_327_000 as Weight).saturating_mul(r as Weight))
+		(20_143_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((7_222_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(20_203_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((7_221_000 as Weight).saturating_mul(r as Weight))
+		(20_129_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((7_247_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(20_187_000 as Weight)
+		(20_107_000 as Weight)
 			// Standard Error: 16_000
-			.saturating_add((13_738_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((12_953_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(20_153_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((12_766_000 as Weight).saturating_mul(r as Weight))
+		(20_093_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((12_040_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(20_219_000 as Weight)
+		(20_102_000 as Weight)
 			// Standard Error: 13_000
-			.saturating_add((13_732_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((12_945_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(20_246_000 as Weight)
+		(20_132_000 as Weight)
 			// Standard Error: 16_000
-			.saturating_add((12_686_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((12_199_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(20_228_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((7_245_000 as Weight).saturating_mul(r as Weight))
+		(20_155_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((7_103_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(20_238_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((7_250_000 as Weight).saturating_mul(r as Weight))
+		(20_088_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((7_213_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(20_213_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((7_292_000 as Weight).saturating_mul(r as Weight))
+		(20_060_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_275_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(20_224_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((7_554_000 as Weight).saturating_mul(r as Weight))
+		(20_104_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((7_282_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(20_261_000 as Weight)
+		(20_111_000 as Weight)
 			// Standard Error: 20_000
-			.saturating_add((7_551_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((7_264_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(20_212_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((7_616_000 as Weight).saturating_mul(r as Weight))
+		(20_096_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((7_347_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(20_176_000 as Weight)
-			// Standard Error: 9_000
-			.saturating_add((7_877_000 as Weight).saturating_mul(r as Weight))
+		(20_091_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((7_370_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(20_230_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((7_347_000 as Weight).saturating_mul(r as Weight))
+		(20_102_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((7_266_000 as Weight).saturating_mul(r as Weight))
 	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn on_initialize() -> Weight {
-		(3_656_000 as Weight)
+		(3_603_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 	}
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((2_241_000 as Weight).saturating_mul(k as Weight))
+			// Standard Error: 2_000
+			.saturating_add((2_217_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
-		(36_820_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((34_550_000 as Weight).saturating_mul(q as Weight))
+		(0 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((36_769_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn instrument(c: u32, ) -> Weight {
-		(42_348_000 as Weight)
-			// Standard Error: 185_000
-			.saturating_add((95_664_000 as Weight).saturating_mul(c as Weight))
+		(54_463_000 as Weight)
+			// Standard Error: 105_000
+			.saturating_add((77_542_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight {
-		(210_852_000 as Weight)
-			// Standard Error: 138_000
-			.saturating_add((135_241_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 9_000
-			.saturating_add((1_846_000 as Weight).saturating_mul(s as Weight))
+		(184_114_000 as Weight)
+			// Standard Error: 82_000
+			.saturating_add((117_247_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 5_000
+			.saturating_add((1_542_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn instantiate(c: u32, s: u32, ) -> Weight {
-		(217_380_000 as Weight)
-			// Standard Error: 6_000
-			.saturating_add((8_483_000 as Weight).saturating_mul(c as Weight))
+		(183_501_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((5_645_000 as Weight).saturating_mul(c as Weight))
 			// Standard Error: 0
-			.saturating_add((1_752_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((1_473_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn call(c: u32, ) -> Weight {
-		(181_443_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((3_955_000 as Weight).saturating_mul(c as Weight))
+		(173_411_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((2_639_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn claim_surcharge(c: u32, ) -> Weight {
-		(132_551_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((4_740_000 as Weight).saturating_mul(c as Weight))
+		(125_839_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((3_123_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn seal_caller(r: u32, ) -> Weight {
-		(137_742_000 as Weight)
-			// Standard Error: 74_000
-			.saturating_add((242_261_000 as Weight).saturating_mul(r as Weight))
+		(131_793_000 as Weight)
+			// Standard Error: 84_000
+			.saturating_add((231_138_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_address(r: u32, ) -> Weight {
-		(137_739_000 as Weight)
-			// Standard Error: 91_000
-			.saturating_add((241_803_000 as Weight).saturating_mul(r as Weight))
+		(129_995_000 as Weight)
+			// Standard Error: 78_000
+			.saturating_add((231_839_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(139_631_000 as Weight)
-			// Standard Error: 83_000
-			.saturating_add((236_790_000 as Weight).saturating_mul(r as Weight))
+		(129_710_000 as Weight)
+			// Standard Error: 85_000
+			.saturating_add((227_268_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_balance(r: u32, ) -> Weight {
-		(142_506_000 as Weight)
-			// Standard Error: 176_000
-			.saturating_add((525_752_000 as Weight).saturating_mul(r as Weight))
+		(133_445_000 as Weight)
+			// Standard Error: 144_000
+			.saturating_add((487_125_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(138_569_000 as Weight)
-			// Standard Error: 76_000
-			.saturating_add((237_016_000 as Weight).saturating_mul(r as Weight))
+		(129_299_000 as Weight)
+			// Standard Error: 82_000
+			.saturating_add((227_118_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(134_713_000 as Weight)
-			// Standard Error: 81_000
-			.saturating_add((237_962_000 as Weight).saturating_mul(r as Weight))
+		(126_120_000 as Weight)
+			// Standard Error: 114_000
+			.saturating_add((227_326_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(131_523_000 as Weight)
-			// Standard Error: 90_000
-			.saturating_add((237_435_000 as Weight).saturating_mul(r as Weight))
+		(130_934_000 as Weight)
+			// Standard Error: 89_000
+			.saturating_add((226_638_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(141_574_000 as Weight)
-			// Standard Error: 86_000
-			.saturating_add((238_102_000 as Weight).saturating_mul(r as Weight))
+		(128_738_000 as Weight)
+			// Standard Error: 77_000
+			.saturating_add((227_062_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_block_number(r: u32, ) -> Weight {
-		(140_240_000 as Weight)
-			// Standard Error: 101_000
-			.saturating_add((236_568_000 as Weight).saturating_mul(r as Weight))
+		(132_375_000 as Weight)
+			// Standard Error: 88_000
+			.saturating_add((226_861_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_now(r: u32, ) -> Weight {
-		(138_265_000 as Weight)
-			// Standard Error: 91_000
-			.saturating_add((237_187_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-	}
-	fn seal_rent_params(r: u32, ) -> Weight {
-		(149_701_000 as Weight)
-			// Standard Error: 297_000
-			.saturating_add((357_149_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-	}
-	fn seal_rent_status(r: u32, ) -> Weight {
-		(146_863_000 as Weight)
-			// Standard Error: 191_000
-			.saturating_add((638_683_000 as Weight).saturating_mul(r as Weight))
+		(127_888_000 as Weight)
+			// Standard Error: 86_000
+			.saturating_add((227_851_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(144_278_000 as Weight)
+		(131_825_000 as Weight)
 			// Standard Error: 149_000
-			.saturating_add((470_264_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((420_149_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_gas(r: u32, ) -> Weight {
-		(111_361_000 as Weight)
-			// Standard Error: 157_000
-			.saturating_add((118_441_000 as Weight).saturating_mul(r as Weight))
+		(113_641_000 as Weight)
+			// Standard Error: 114_000
+			.saturating_add((113_068_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_input(r: u32, ) -> Weight {
-		(129_970_000 as Weight)
-			// Standard Error: 316_000
-			.saturating_add((7_160_000 as Weight).saturating_mul(r as Weight))
+		(122_982_000 as Weight)
+			// Standard Error: 74_000
+			.saturating_add((6_828_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(139_275_000 as Weight)
+		(131_913_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((250_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((275_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_return(r: u32, ) -> Weight {
-		(119_240_000 as Weight)
-			// Standard Error: 57_000
-			.saturating_add((4_347_000 as Weight).saturating_mul(r as Weight))
+		(114_164_000 as Weight)
+			// Standard Error: 72_000
+			.saturating_add((4_318_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(128_896_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((757_000 as Weight).saturating_mul(n as Weight))
+		(123_940_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((664_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_terminate(r: u32, ) -> Weight {
-		(130_119_000 as Weight)
-			// Standard Error: 108_000
-			.saturating_add((95_078_000 as Weight).saturating_mul(r as Weight))
+		(123_340_000 as Weight)
+			// Standard Error: 99_000
+			.saturating_add((89_126_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_terminate_per_code_kb(c: u32, ) -> Weight {
-		(230_167_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((8_495_000 as Weight).saturating_mul(c as Weight))
+		(217_499_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((5_608_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}
 	fn seal_restore_to(r: u32, ) -> Weight {
-		(159_200_000 as Weight)
-			// Standard Error: 261_000
-			.saturating_add((103_048_000 as Weight).saturating_mul(r as Weight))
+		(149_019_000 as Weight)
+			// Standard Error: 903_000
+			.saturating_add((87_433_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((4 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((5 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_restore_to_per_code_kb_delta(c: u32, t: u32, d: u32, ) -> Weight {
-		(58_389_000 as Weight)
-			// Standard Error: 131_000
-			.saturating_add((7_910_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 131_000
-			.saturating_add((4_036_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 1_156_000
-			.saturating_add((3_714_110_000 as Weight).saturating_mul(d as Weight))
+		(18_255_000 as Weight)
+			// Standard Error: 141_000
+			.saturating_add((5_142_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 141_000
+			.saturating_add((2_478_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 1_242_000
+			.saturating_add((2_935_421_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(7 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
 	}
 	fn seal_random(r: u32, ) -> Weight {
-		(138_794_000 as Weight)
-			// Standard Error: 216_000
-			.saturating_add((599_742_000 as Weight).saturating_mul(r as Weight))
+		(140_411_000 as Weight)
+			// Standard Error: 146_000
+			.saturating_add((566_687_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(139_890_000 as Weight)
-			// Standard Error: 263_000
-			.saturating_add((885_805_000 as Weight).saturating_mul(r as Weight))
+		(132_048_000 as Weight)
+			// Standard Error: 308_000
+			.saturating_add((818_622_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_117_962_000 as Weight)
-			// Standard Error: 4_029_000
-			.saturating_add((566_825_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 794_000
-			.saturating_add((251_096_000 as Weight).saturating_mul(n as Weight))
+		(1_080_578_000 as Weight)
+			// Standard Error: 2_337_000
+			.saturating_add((534_525_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 460_000
+			.saturating_add((167_990_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(132_720_000 as Weight)
-			// Standard Error: 87_000
-			.saturating_add((164_134_000 as Weight).saturating_mul(r as Weight))
+		(123_998_000 as Weight)
+			// Standard Error: 53_000
+			.saturating_add((155_113_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_debug_message(r: u32, ) -> Weight {
-		(125_834_000 as Weight)
-			// Standard Error: 142_000
-			.saturating_add((127_200_000 as Weight).saturating_mul(r as Weight))
+		(120_514_000 as Weight)
+			// Standard Error: 93_000
+			.saturating_add((124_243_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(478_734_000 as Weight)
-			// Standard Error: 2_559_000
-			.saturating_add((3_766_445_000 as Weight).saturating_mul(r as Weight))
+		(47_131_000 as Weight)
+			// Standard Error: 931_000
+			.saturating_add((4_033_062_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(600_306_000 as Weight)
-			// Standard Error: 234_000
-			.saturating_add((70_989_000 as Weight).saturating_mul(n as Weight))
+		(549_577_000 as Weight)
+			// Standard Error: 192_000
+			.saturating_add((57_815_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn seal_clear_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_380_000
-			.saturating_add((1_242_131_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 2_635_000
+			.saturating_add((1_214_454_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
@@ -1111,23 +1081,23 @@ impl WeightInfo for () {
 	}
 	fn seal_get_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 1_060_000
-			.saturating_add((910_861_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 1_044_000
+			.saturating_add((883_653_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(605_545_000 as Weight)
-			// Standard Error: 252_000
-			.saturating_add((153_519_000 as Weight).saturating_mul(n as Weight))
+		(568_190_000 as Weight)
+			// Standard Error: 181_000
+			.saturating_add((106_420_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_transfer(r: u32, ) -> Weight {
-		(36_854_000 as Weight)
-			// Standard Error: 2_076_000
-			.saturating_add((5_183_774_000 as Weight).saturating_mul(r as Weight))
+		(0 as Weight)
+			// Standard Error: 1_553_000
+			.saturating_add((4_810_405_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
@@ -1135,358 +1105,358 @@ impl WeightInfo for () {
 	}
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 6_583_000
-			.saturating_add((11_599_057_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 8_671_000
+			.saturating_add((10_965_308_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((200 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_call_per_code_transfer_input_output_kb(c: u32, t: u32, i: u32, o: u32, ) -> Weight {
-		(10_431_738_000 as Weight)
-			// Standard Error: 301_000
-			.saturating_add((392_174_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 125_400_000
-			.saturating_add((3_698_896_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 39_000
-			.saturating_add((60_692_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 42_000
-			.saturating_add((78_872_000 as Weight).saturating_mul(o as Weight))
+		(10_138_403_000 as Weight)
+			// Standard Error: 162_000
+			.saturating_add((264_871_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 67_846_000
+			.saturating_add((3_793_372_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 21_000
+			.saturating_add((49_168_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 22_000
+			.saturating_add((71_664_000 as Weight).saturating_mul(o as Weight))
 			.saturating_add(RocksDbWeight::get().reads(205 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(101 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 32_118_000
-			.saturating_add((21_117_947_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 34_546_000
+			.saturating_add((19_938_393_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((300 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_instantiate_per_code_input_output_salt_kb(c: u32, i: u32, o: u32, s: u32, ) -> Weight {
-		(8_542_521_000 as Weight)
-			// Standard Error: 644_000
-			.saturating_add((878_020_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 91_000
-			.saturating_add((63_004_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 91_000
-			.saturating_add((83_203_000 as Weight).saturating_mul(o as Weight))
-			// Standard Error: 91_000
-			.saturating_add((240_170_000 as Weight).saturating_mul(s as Weight))
+		(8_861_543_000 as Weight)
+			// Standard Error: 566_000
+			.saturating_add((585_057_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 80_000
+			.saturating_add((52_025_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 80_000
+			.saturating_add((75_956_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 80_000
+			.saturating_add((198_033_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(206 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(204 as Weight))
 	}
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(130_991_000 as Weight)
-			// Standard Error: 106_000
-			.saturating_add((230_186_000 as Weight).saturating_mul(r as Weight))
+		(129_022_000 as Weight)
+			// Standard Error: 76_000
+			.saturating_add((216_764_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(508_089_000 as Weight)
-			// Standard Error: 38_000
-			.saturating_add((491_916_000 as Weight).saturating_mul(n as Weight))
+		(414_489_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((481_873_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(135_384_000 as Weight)
-			// Standard Error: 111_000
-			.saturating_add((233_638_000 as Weight).saturating_mul(r as Weight))
+		(127_636_000 as Weight)
+			// Standard Error: 104_000
+			.saturating_add((225_094_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(445_961_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((340_992_000 as Weight).saturating_mul(n as Weight))
+		(216_668_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((331_423_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(133_593_000 as Weight)
-			// Standard Error: 112_000
-			.saturating_add((208_000_000 as Weight).saturating_mul(r as Weight))
+		(129_582_000 as Weight)
+			// Standard Error: 97_000
+			.saturating_add((198_429_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(444_562_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((159_521_000 as Weight).saturating_mul(n as Weight))
+		(288_991_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((148_497_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(131_381_000 as Weight)
-			// Standard Error: 82_000
-			.saturating_add((207_479_000 as Weight).saturating_mul(r as Weight))
+		(128_711_000 as Weight)
+			// Standard Error: 94_000
+			.saturating_add((197_050_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(576_129_000 as Weight)
-			// Standard Error: 49_000
-			.saturating_add((156_900_000 as Weight).saturating_mul(n as Weight))
+		(275_444_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((148_469_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(20_276_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((3_355_000 as Weight).saturating_mul(r as Weight))
+		(20_089_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((3_376_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(22_345_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((133_628_000 as Weight).saturating_mul(r as Weight))
+		(22_187_000 as Weight)
+			// Standard Error: 31_000
+			.saturating_add((162_969_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(22_294_000 as Weight)
-			// Standard Error: 95_000
-			.saturating_add((204_007_000 as Weight).saturating_mul(r as Weight))
+		(22_292_000 as Weight)
+			// Standard Error: 39_000
+			.saturating_add((233_277_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(20_266_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((12_605_000 as Weight).saturating_mul(r as Weight))
+		(20_083_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((12_378_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(20_208_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((12_589_000 as Weight).saturating_mul(r as Weight))
+		(20_091_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((12_195_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(20_227_000 as Weight)
+		(20_082_000 as Weight)
 			// Standard Error: 18_000
-			.saturating_add((6_429_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((6_151_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(20_279_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((14_560_000 as Weight).saturating_mul(r as Weight))
+		(20_031_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((13_978_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(20_210_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((15_613_000 as Weight).saturating_mul(r as Weight))
+		(20_063_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((15_524_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(34_276_000 as Weight)
+		(34_332_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((130_000 as Weight).saturating_mul(e as Weight))
+			.saturating_add((117_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(20_426_000 as Weight)
-			// Standard Error: 69_000
-			.saturating_add((91_850_000 as Weight).saturating_mul(r as Weight))
+		(20_446_000 as Weight)
+			// Standard Error: 121_000
+			.saturating_add((90_977_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(27_099_000 as Weight)
-			// Standard Error: 111_000
-			.saturating_add((169_212_000 as Weight).saturating_mul(r as Weight))
+		(28_119_000 as Weight)
+			// Standard Error: 390_000
+			.saturating_add((192_865_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(206_492_000 as Weight)
+		(228_352_000 as Weight)
 			// Standard Error: 4_000
-			.saturating_add((4_685_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((3_891_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(37_892_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((3_510_000 as Weight).saturating_mul(r as Weight))
+		(37_745_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((3_135_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(37_773_000 as Weight)
+		(37_639_000 as Weight)
 			// Standard Error: 15_000
-			.saturating_add((3_814_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((3_541_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(37_785_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((4_949_000 as Weight).saturating_mul(r as Weight))
+		(37_639_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((4_813_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(23_467_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((7_493_000 as Weight).saturating_mul(r as Weight))
+		(23_379_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((7_757_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(23_492_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((8_499_000 as Weight).saturating_mul(r as Weight))
+		(23_378_000 as Weight)
+			// Standard Error: 68_000
+			.saturating_add((8_437_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(22_347_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((3_565_000 as Weight).saturating_mul(r as Weight))
+		(22_245_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((3_446_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(20_849_000 as Weight)
-			// Standard Error: 2_751_000
-			.saturating_add((2_072_517_000 as Weight).saturating_mul(r as Weight))
+		(20_714_000 as Weight)
+			// Standard Error: 478_000
+			.saturating_add((2_314_540_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(20_216_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((5_067_000 as Weight).saturating_mul(r as Weight))
+		(20_126_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((5_316_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(20_218_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((5_015_000 as Weight).saturating_mul(r as Weight))
+		(20_107_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((5_344_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(20_215_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((5_888_000 as Weight).saturating_mul(r as Weight))
+		(20_135_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((5_909_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(20_232_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((5_366_000 as Weight).saturating_mul(r as Weight))
+		(20_107_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((5_515_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(20_205_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((4_847_000 as Weight).saturating_mul(r as Weight))
+		(20_229_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((5_113_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(20_181_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((4_849_000 as Weight).saturating_mul(r as Weight))
+		(20_070_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((5_226_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(20_175_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((4_981_000 as Weight).saturating_mul(r as Weight))
+		(20_090_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((5_296_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(20_273_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((7_402_000 as Weight).saturating_mul(r as Weight))
+		(20_095_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((7_323_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(20_260_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((7_392_000 as Weight).saturating_mul(r as Weight))
+		(20_043_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((7_280_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(20_248_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((7_363_000 as Weight).saturating_mul(r as Weight))
+		(20_061_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((7_226_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(20_229_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((7_412_000 as Weight).saturating_mul(r as Weight))
+		(20_072_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((7_315_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(20_232_000 as Weight)
-			// Standard Error: 9_000
-			.saturating_add((7_364_000 as Weight).saturating_mul(r as Weight))
+		(20_054_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((7_228_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(20_252_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((7_383_000 as Weight).saturating_mul(r as Weight))
+		(20_169_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_262_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(20_258_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((7_359_000 as Weight).saturating_mul(r as Weight))
+		(20_115_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((7_212_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(20_245_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((7_400_000 as Weight).saturating_mul(r as Weight))
+		(20_122_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((7_166_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(20_245_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((7_391_000 as Weight).saturating_mul(r as Weight))
+		(20_140_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((7_242_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(20_230_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((7_439_000 as Weight).saturating_mul(r as Weight))
+		(20_107_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_365_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(20_254_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((7_204_000 as Weight).saturating_mul(r as Weight))
+		(20_179_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((7_144_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(20_182_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((7_327_000 as Weight).saturating_mul(r as Weight))
+		(20_143_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((7_222_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(20_203_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((7_221_000 as Weight).saturating_mul(r as Weight))
+		(20_129_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((7_247_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(20_187_000 as Weight)
+		(20_107_000 as Weight)
 			// Standard Error: 16_000
-			.saturating_add((13_738_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((12_953_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(20_153_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((12_766_000 as Weight).saturating_mul(r as Weight))
+		(20_093_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((12_040_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(20_219_000 as Weight)
+		(20_102_000 as Weight)
 			// Standard Error: 13_000
-			.saturating_add((13_732_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((12_945_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(20_246_000 as Weight)
+		(20_132_000 as Weight)
 			// Standard Error: 16_000
-			.saturating_add((12_686_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((12_199_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(20_228_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((7_245_000 as Weight).saturating_mul(r as Weight))
+		(20_155_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((7_103_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(20_238_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((7_250_000 as Weight).saturating_mul(r as Weight))
+		(20_088_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((7_213_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(20_213_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((7_292_000 as Weight).saturating_mul(r as Weight))
+		(20_060_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_275_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(20_224_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((7_554_000 as Weight).saturating_mul(r as Weight))
+		(20_104_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((7_282_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(20_261_000 as Weight)
+		(20_111_000 as Weight)
 			// Standard Error: 20_000
-			.saturating_add((7_551_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((7_264_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(20_212_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((7_616_000 as Weight).saturating_mul(r as Weight))
+		(20_096_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((7_347_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(20_176_000 as Weight)
-			// Standard Error: 9_000
-			.saturating_add((7_877_000 as Weight).saturating_mul(r as Weight))
+		(20_091_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((7_370_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(20_230_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((7_347_000 as Weight).saturating_mul(r as Weight))
+		(20_102_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((7_266_000 as Weight).saturating_mul(r as Weight))
 	}
 }
diff --git a/frame/democracy/src/weights.rs b/frame/democracy/src/weights.rs
index e2e1bd0c8be2..1462e65c409b 100644
--- a/frame/democracy/src/weights.rs
+++ b/frame/democracy/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Weights for pallet_democracy
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-28, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! Autogenerated weights for pallet_democracy
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -74,145 +75,163 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn propose() -> Weight {
-		(87_883_000 as Weight)
+		(71_782_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn second(s: u32, ) -> Weight {
-		(52_998_000 as Weight)
-			.saturating_add((251_000 as Weight).saturating_mul(s as Weight))
+		(41_071_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((211_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn vote_new(r: u32, ) -> Weight {
-		(63_300_000 as Weight)
-			.saturating_add((284_000 as Weight).saturating_mul(r as Weight))
+		(46_179_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((283_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn vote_existing(r: u32, ) -> Weight {
-		(63_127_000 as Weight)
-			.saturating_add((289_000 as Weight).saturating_mul(r as Weight))
+		(46_169_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((284_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn emergency_cancel() -> Weight {
-		(38_877_000 as Weight)
+		(28_615_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn blacklist(p: u32, ) -> Weight {
-		(108_060_000 as Weight)
-			.saturating_add((795_000 as Weight).saturating_mul(p as Weight))
+		(80_711_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((590_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(6 as Weight))
 	}
 	fn external_propose(v: u32, ) -> Weight {
-		(19_052_000 as Weight)
-			.saturating_add((111_000 as Weight).saturating_mul(v as Weight))
+		(13_197_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((90_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn external_propose_majority() -> Weight {
-		(4_544_000 as Weight)
+		(2_712_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn external_propose_default() -> Weight {
-		(4_608_000 as Weight)
+		(2_680_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn fast_track() -> Weight {
-		(38_876_000 as Weight)
+		(28_340_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn veto_external(v: u32, ) -> Weight {
-		(40_283_000 as Weight)
-			.saturating_add((187_000 as Weight).saturating_mul(v as Weight))
+		(28_894_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((133_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn cancel_proposal(p: u32, ) -> Weight {
-		(68_449_000 as Weight)
-			.saturating_add((876_000 as Weight).saturating_mul(p as Weight))
+		(54_339_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((561_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn cancel_referendum() -> Weight {
-		(23_670_000 as Weight)
+		(17_183_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn cancel_queued(r: u32, ) -> Weight {
-		(43_247_000 as Weight)
-			.saturating_add((4_578_000 as Weight).saturating_mul(r as Weight))
+		(30_500_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_730_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn on_initialize_base(r: u32, ) -> Weight {
-		(15_278_000 as Weight)
-			.saturating_add((6_696_000 as Weight).saturating_mul(r as Weight))
+		(7_788_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((5_422_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
 	}
 	fn delegate(r: u32, ) -> Weight {
-		(83_002_000 as Weight)
-			.saturating_add((9_889_000 as Weight).saturating_mul(r as Weight))
+		(55_676_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((7_553_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight)))
 	}
 	fn undelegate(r: u32, ) -> Weight {
-		(43_552_000 as Weight)
-			.saturating_add((9_887_000 as Weight).saturating_mul(r as Weight))
+		(23_908_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((7_551_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight)))
 	}
 	fn clear_public_proposals() -> Weight {
-		(4_404_000 as Weight)
+		(3_023_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn note_preimage(b: u32, ) -> Weight {
-		(60_073_000 as Weight)
-			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
+		(44_069_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn note_imminent_preimage(b: u32, ) -> Weight {
-		(38_896_000 as Weight)
-			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
+		(28_457_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn reap_preimage(b: u32, ) -> Weight {
-		(54_861_000 as Weight)
-			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
+		(39_646_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn unlock_remove(r: u32, ) -> Weight {
-		(52_956_000 as Weight)
-			.saturating_add((126_000 as Weight).saturating_mul(r as Weight))
+		(39_499_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((148_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn unlock_set(r: u32, ) -> Weight {
-		(49_789_000 as Weight)
-			.saturating_add((274_000 as Weight).saturating_mul(r as Weight))
+		(37_340_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((266_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn remove_vote(r: u32, ) -> Weight {
-		(29_790_000 as Weight)
-			.saturating_add((283_000 as Weight).saturating_mul(r as Weight))
+		(20_397_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((259_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn remove_other_vote(r: u32, ) -> Weight {
-		(28_497_000 as Weight)
-			.saturating_add((217_000 as Weight).saturating_mul(r as Weight))
+		(20_425_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((156_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
@@ -221,145 +240,163 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn propose() -> Weight {
-		(87_883_000 as Weight)
+		(71_782_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn second(s: u32, ) -> Weight {
-		(52_998_000 as Weight)
-			.saturating_add((251_000 as Weight).saturating_mul(s as Weight))
+		(41_071_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((211_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn vote_new(r: u32, ) -> Weight {
-		(63_300_000 as Weight)
-			.saturating_add((284_000 as Weight).saturating_mul(r as Weight))
+		(46_179_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((283_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn vote_existing(r: u32, ) -> Weight {
-		(63_127_000 as Weight)
-			.saturating_add((289_000 as Weight).saturating_mul(r as Weight))
+		(46_169_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((284_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn emergency_cancel() -> Weight {
-		(38_877_000 as Weight)
+		(28_615_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn blacklist(p: u32, ) -> Weight {
-		(108_060_000 as Weight)
-			.saturating_add((795_000 as Weight).saturating_mul(p as Weight))
+		(80_711_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((590_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(6 as Weight))
 	}
 	fn external_propose(v: u32, ) -> Weight {
-		(19_052_000 as Weight)
-			.saturating_add((111_000 as Weight).saturating_mul(v as Weight))
+		(13_197_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((90_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn external_propose_majority() -> Weight {
-		(4_544_000 as Weight)
+		(2_712_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn external_propose_default() -> Weight {
-		(4_608_000 as Weight)
+		(2_680_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn fast_track() -> Weight {
-		(38_876_000 as Weight)
+		(28_340_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn veto_external(v: u32, ) -> Weight {
-		(40_283_000 as Weight)
-			.saturating_add((187_000 as Weight).saturating_mul(v as Weight))
+		(28_894_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((133_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn cancel_proposal(p: u32, ) -> Weight {
-		(68_449_000 as Weight)
-			.saturating_add((876_000 as Weight).saturating_mul(p as Weight))
+		(54_339_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((561_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn cancel_referendum() -> Weight {
-		(23_670_000 as Weight)
+		(17_183_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn cancel_queued(r: u32, ) -> Weight {
-		(43_247_000 as Weight)
-			.saturating_add((4_578_000 as Weight).saturating_mul(r as Weight))
+		(30_500_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_730_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn on_initialize_base(r: u32, ) -> Weight {
-		(15_278_000 as Weight)
-			.saturating_add((6_696_000 as Weight).saturating_mul(r as Weight))
+		(7_788_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((5_422_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
 	}
 	fn delegate(r: u32, ) -> Weight {
-		(83_002_000 as Weight)
-			.saturating_add((9_889_000 as Weight).saturating_mul(r as Weight))
+		(55_676_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((7_553_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(r as Weight)))
 	}
 	fn undelegate(r: u32, ) -> Weight {
-		(43_552_000 as Weight)
-			.saturating_add((9_887_000 as Weight).saturating_mul(r as Weight))
+		(23_908_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((7_551_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(r as Weight)))
 	}
 	fn clear_public_proposals() -> Weight {
-		(4_404_000 as Weight)
+		(3_023_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn note_preimage(b: u32, ) -> Weight {
-		(60_073_000 as Weight)
-			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
+		(44_069_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn note_imminent_preimage(b: u32, ) -> Weight {
-		(38_896_000 as Weight)
-			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
+		(28_457_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn reap_preimage(b: u32, ) -> Weight {
-		(54_861_000 as Weight)
-			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
+		(39_646_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn unlock_remove(r: u32, ) -> Weight {
-		(52_956_000 as Weight)
-			.saturating_add((126_000 as Weight).saturating_mul(r as Weight))
+		(39_499_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((148_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn unlock_set(r: u32, ) -> Weight {
-		(49_789_000 as Weight)
-			.saturating_add((274_000 as Weight).saturating_mul(r as Weight))
+		(37_340_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((266_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn remove_vote(r: u32, ) -> Weight {
-		(29_790_000 as Weight)
-			.saturating_add((283_000 as Weight).saturating_mul(r as Weight))
+		(20_397_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((259_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn remove_other_vote(r: u32, ) -> Weight {
-		(28_497_000 as Weight)
-			.saturating_add((217_000 as Weight).saturating_mul(r as Weight))
+		(20_425_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((156_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
diff --git a/frame/election-provider-multi-phase/src/weights.rs b/frame/election-provider-multi-phase/src/weights.rs
index 3d3a5cede329..51b99bc962d4 100644
--- a/frame/election-provider-multi-phase/src/weights.rs
+++ b/frame/election-provider-multi-phase/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_election_provider_multi_phase
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-03-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -57,101 +57,105 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn on_initialize_nothing() -> Weight {
-		(22_730_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(7 as Weight))
+		(24_579_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(8 as Weight))
 	}
 	fn on_initialize_open_signed() -> Weight {
-		(112_051_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(8 as Weight))
+		(87_463_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(10 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn on_initialize_open_unsigned_with_snapshot() -> Weight {
-		(112_165_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(8 as Weight))
+		(87_381_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(10 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn on_initialize_open_unsigned_without_snapshot() -> Weight {
-		(21_039_000 as Weight)
+		(18_489_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn elect_queued() -> Weight {
-		(7_362_949_000 as Weight)
+		(6_038_989_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(6 as Weight))
 	}
-	fn submit_unsigned(v: u32, _t: u32, a: u32, d: u32, ) -> Weight {
+	fn submit_unsigned(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((3_933_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 21_000
-			.saturating_add((13_520_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 107_000
-			.saturating_add((2_880_000 as Weight).saturating_mul(d as Weight))
-			.saturating_add(T::DbWeight::get().reads(6 as Weight))
+			// Standard Error: 12_000
+			.saturating_add((3_480_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 42_000
+			.saturating_add((194_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 12_000
+			.saturating_add((10_498_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 63_000
+			.saturating_add((3_074_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn feasibility_check(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((4_069_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 7_000
+			.saturating_add((3_481_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 24_000
+			.saturating_add((385_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 7_000
+			.saturating_add((8_538_000 as Weight).saturating_mul(a as Weight))
 			// Standard Error: 36_000
-			.saturating_add((503_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 10_000
-			.saturating_add((10_000_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 54_000
-			.saturating_add((3_734_000 as Weight).saturating_mul(d as Weight))
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add((3_322_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn on_initialize_nothing() -> Weight {
-		(22_730_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
+		(24_579_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(8 as Weight))
 	}
 	fn on_initialize_open_signed() -> Weight {
-		(112_051_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(8 as Weight))
+		(87_463_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn on_initialize_open_unsigned_with_snapshot() -> Weight {
-		(112_165_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(8 as Weight))
+		(87_381_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn on_initialize_open_unsigned_without_snapshot() -> Weight {
-		(21_039_000 as Weight)
+		(18_489_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn elect_queued() -> Weight {
-		(7_362_949_000 as Weight)
+		(6_038_989_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(6 as Weight))
 	}
-	fn submit_unsigned(v: u32, _t: u32, a: u32, d: u32, ) -> Weight {
+	fn submit_unsigned(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((3_933_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 21_000
-			.saturating_add((13_520_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 107_000
-			.saturating_add((2_880_000 as Weight).saturating_mul(d as Weight))
-			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
+			// Standard Error: 12_000
+			.saturating_add((3_480_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 42_000
+			.saturating_add((194_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 12_000
+			.saturating_add((10_498_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 63_000
+			.saturating_add((3_074_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn feasibility_check(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((4_069_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 7_000
+			.saturating_add((3_481_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 24_000
+			.saturating_add((385_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 7_000
+			.saturating_add((8_538_000 as Weight).saturating_mul(a as Weight))
 			// Standard Error: 36_000
-			.saturating_add((503_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 10_000
-			.saturating_add((10_000_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 54_000
-			.saturating_add((3_734_000 as Weight).saturating_mul(d as Weight))
-			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add((3_322_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 	}
 }
diff --git a/frame/elections-phragmen/src/weights.rs b/frame/elections-phragmen/src/weights.rs
index c3d9365c8855..12a3a433401b 100644
--- a/frame/elections-phragmen/src/weights.rs
+++ b/frame/elections-phragmen/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_elections_phragmen
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.1
-//! DATE: 2021-01-20, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -62,82 +62,80 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn vote_equal(v: u32, ) -> Weight {
-		(45_157_000 as Weight)
-			// Standard Error: 6_000
-			.saturating_add((399_000 as Weight).saturating_mul(v as Weight))
+		(43_911_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((324_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn vote_more(v: u32, ) -> Weight {
-		(69_738_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((450_000 as Weight).saturating_mul(v as Weight))
+		(68_236_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((359_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn vote_less(v: u32, ) -> Weight {
-		(73_955_000 as Weight)
-			// Standard Error: 38_000
-			.saturating_add((227_000 as Weight).saturating_mul(v as Weight))
+		(68_162_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((350_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn remove_voter() -> Weight {
-		(68_398_000 as Weight)
+		(63_005_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn submit_candidacy(c: u32, ) -> Weight {
-		(59_291_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((412_000 as Weight).saturating_mul(c as Weight))
+		(58_498_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((305_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn renounce_candidacy_candidate(c: u32, ) -> Weight {
-		(55_026_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((207_000 as Weight).saturating_mul(c as Weight))
+		(52_062_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((173_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn renounce_candidacy_members() -> Weight {
-		(77_840_000 as Weight)
+		(73_234_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn renounce_candidacy_runners_up() -> Weight {
-		(54_559_000 as Weight)
+		(51_689_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn remove_member_with_replacement() -> Weight {
-		(84_311_000 as Weight)
+		(79_906_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
 	fn remove_member_wrong_refund() -> Weight {
-		(7_677_000 as Weight)
+		(6_877_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 	}
-	fn clean_defunct_voters(v: u32, d: u32, ) -> Weight {
+	fn clean_defunct_voters(v: u32, _d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 55_000
-			.saturating_add((114_815_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 53_000
-			.saturating_add((49_000 as Weight).saturating_mul(d as Weight))
+			// Standard Error: 39_000
+			.saturating_add((112_381_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(v as Weight)))
 	}
 	fn election_phragmen(c: u32, v: u32, e: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 1_940_000
-			.saturating_add((43_557_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 807_000
-			.saturating_add((65_849_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 55_000
-			.saturating_add((4_206_000 as Weight).saturating_mul(e as Weight))
+			// Standard Error: 1_789_000
+			.saturating_add((42_600_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 744_000
+			.saturating_add((60_743_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 50_000
+			.saturating_add((3_837_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(c as Weight)))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(c as Weight)))
@@ -147,82 +145,80 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn vote_equal(v: u32, ) -> Weight {
-		(45_157_000 as Weight)
-			// Standard Error: 6_000
-			.saturating_add((399_000 as Weight).saturating_mul(v as Weight))
+		(43_911_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((324_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn vote_more(v: u32, ) -> Weight {
-		(69_738_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((450_000 as Weight).saturating_mul(v as Weight))
+		(68_236_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((359_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn vote_less(v: u32, ) -> Weight {
-		(73_955_000 as Weight)
-			// Standard Error: 38_000
-			.saturating_add((227_000 as Weight).saturating_mul(v as Weight))
+		(68_162_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((350_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn remove_voter() -> Weight {
-		(68_398_000 as Weight)
+		(63_005_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn submit_candidacy(c: u32, ) -> Weight {
-		(59_291_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((412_000 as Weight).saturating_mul(c as Weight))
+		(58_498_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((305_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn renounce_candidacy_candidate(c: u32, ) -> Weight {
-		(55_026_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((207_000 as Weight).saturating_mul(c as Weight))
+		(52_062_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((173_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn renounce_candidacy_members() -> Weight {
-		(77_840_000 as Weight)
+		(73_234_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn renounce_candidacy_runners_up() -> Weight {
-		(54_559_000 as Weight)
+		(51_689_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn remove_member_with_replacement() -> Weight {
-		(84_311_000 as Weight)
+		(79_906_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}
 	fn remove_member_wrong_refund() -> Weight {
-		(7_677_000 as Weight)
+		(6_877_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 	}
-	fn clean_defunct_voters(v: u32, d: u32, ) -> Weight {
+	fn clean_defunct_voters(v: u32, _d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 55_000
-			.saturating_add((114_815_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 53_000
-			.saturating_add((49_000 as Weight).saturating_mul(d as Weight))
+			// Standard Error: 39_000
+			.saturating_add((112_381_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(v as Weight)))
 	}
 	fn election_phragmen(c: u32, v: u32, e: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 1_940_000
-			.saturating_add((43_557_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 807_000
-			.saturating_add((65_849_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 55_000
-			.saturating_add((4_206_000 as Weight).saturating_mul(e as Weight))
+			// Standard Error: 1_789_000
+			.saturating_add((42_600_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 744_000
+			.saturating_add((60_743_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 50_000
+			.saturating_add((3_837_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(c as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(c as Weight)))
diff --git a/frame/gilt/src/weights.rs b/frame/gilt/src/weights.rs
index 1e0e5fa9b4d3..c9e16c041874 100644
--- a/frame/gilt/src/weights.rs
+++ b/frame/gilt/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_gilt
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-02-23, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -58,50 +58,50 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn place_bid(l: u32, ) -> Weight {
-		(79_274_000 as Weight)
+		(60_401_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((289_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add((146_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn place_bid_max() -> Weight {
-		(297_825_000 as Weight)
+		(178_653_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn retract_bid(l: u32, ) -> Weight {
-		(79_731_000 as Weight)
+		(61_026_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((231_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add((119_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn set_target() -> Weight {
-		(6_113_000 as Weight)
+		(5_756_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn thaw() -> Weight {
-		(74_792_000 as Weight)
+		(72_668_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn pursue_target_noop() -> Weight {
-		(3_468_000 as Weight)
+		(3_449_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 	}
 	fn pursue_target_per_item(b: u32, ) -> Weight {
-		(65_792_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((11_402_000 as Weight).saturating_mul(b as Weight))
+		(58_182_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((10_005_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(b as Weight)))
 	}
 	fn pursue_target_per_queue(q: u32, ) -> Weight {
-		(32_391_000 as Weight)
+		(21_740_000 as Weight)
 			// Standard Error: 7_000
-			.saturating_add((18_500_000 as Weight).saturating_mul(q as Weight))
+			.saturating_add((16_849_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(q as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
@@ -112,50 +112,50 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn place_bid(l: u32, ) -> Weight {
-		(79_274_000 as Weight)
+		(60_401_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((289_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add((146_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn place_bid_max() -> Weight {
-		(297_825_000 as Weight)
+		(178_653_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn retract_bid(l: u32, ) -> Weight {
-		(79_731_000 as Weight)
+		(61_026_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((231_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add((119_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn set_target() -> Weight {
-		(6_113_000 as Weight)
+		(5_756_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn thaw() -> Weight {
-		(74_792_000 as Weight)
+		(72_668_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn pursue_target_noop() -> Weight {
-		(3_468_000 as Weight)
+		(3_449_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 	}
 	fn pursue_target_per_item(b: u32, ) -> Weight {
-		(65_792_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((11_402_000 as Weight).saturating_mul(b as Weight))
+		(58_182_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((10_005_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(b as Weight)))
 	}
 	fn pursue_target_per_queue(q: u32, ) -> Weight {
-		(32_391_000 as Weight)
+		(21_740_000 as Weight)
 			// Standard Error: 7_000
-			.saturating_add((18_500_000 as Weight).saturating_mul(q as Weight))
+			.saturating_add((16_849_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(q as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
diff --git a/frame/identity/src/weights.rs b/frame/identity/src/weights.rs
index 1635a8d70547..f283b2869bdf 100644
--- a/frame/identity/src/weights.rs
+++ b/frame/identity/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Weights for pallet_identity
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! Autogenerated weights for pallet_identity
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -43,270 +44,295 @@ use sp_std::marker::PhantomData;
 
 /// Weight functions needed for pallet_identity.
 pub trait WeightInfo {
-	fn add_registrar(_r: u32, ) -> Weight;
-	fn set_identity(_r: u32, _x: u32, ) -> Weight;
-	fn set_subs_new(_s: u32, ) -> Weight;
-	fn set_subs_old(_p: u32, ) -> Weight;
-	fn clear_identity(_r: u32, _s: u32, _x: u32, ) -> Weight;
-	fn request_judgement(_r: u32, _x: u32, ) -> Weight;
-	fn cancel_request(_r: u32, _x: u32, ) -> Weight;
-	fn set_fee(_r: u32, ) -> Weight;
-	fn set_account_id(_r: u32, ) -> Weight;
-	fn set_fields(_r: u32, ) -> Weight;
-	fn provide_judgement(_r: u32, _x: u32, ) -> Weight;
-	fn kill_identity(_r: u32, _s: u32, _x: u32, ) -> Weight;
-	fn add_sub(_s: u32, ) -> Weight;
-	fn rename_sub(_s: u32, ) -> Weight;
-	fn remove_sub(_s: u32, ) -> Weight;
-	fn quit_sub(_s: u32, ) -> Weight;
-	
+	fn add_registrar(r: u32, ) -> Weight;
+	fn set_identity(r: u32, x: u32, ) -> Weight;
+	fn set_subs_new(s: u32, ) -> Weight;
+	fn set_subs_old(p: u32, ) -> Weight;
+	fn clear_identity(r: u32, s: u32, x: u32, ) -> Weight;
+	fn request_judgement(r: u32, x: u32, ) -> Weight;
+	fn cancel_request(r: u32, x: u32, ) -> Weight;
+	fn set_fee(r: u32, ) -> Weight;
+	fn set_account_id(r: u32, ) -> Weight;
+	fn set_fields(r: u32, ) -> Weight;
+	fn provide_judgement(r: u32, x: u32, ) -> Weight;
+	fn kill_identity(r: u32, s: u32, x: u32, ) -> Weight;
+	fn add_sub(s: u32, ) -> Weight;
+	fn rename_sub(s: u32, ) -> Weight;
+	fn remove_sub(s: u32, ) -> Weight;
+	fn quit_sub(s: u32, ) -> Weight;
 }
 
 /// Weights for pallet_identity using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn add_registrar(r: u32, ) -> Weight {
-		(28_965_000 as Weight)
-			.saturating_add((421_000 as Weight).saturating_mul(r as Weight))
+		(21_825_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((288_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn set_identity(r: u32, x: u32, ) -> Weight {
-		(71_923_000 as Weight)
-			.saturating_add((529_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((1_763_000 as Weight).saturating_mul(x as Weight))
+		(53_354_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((274_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 2_000
+			.saturating_add((939_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn set_subs_new(s: u32, ) -> Weight {
-		(55_550_000 as Weight)
-			.saturating_add((9_760_000 as Weight).saturating_mul(s as Weight))
+		(42_017_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((6_457_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn set_subs_old(p: u32, ) -> Weight {
-		(51_789_000 as Weight)
-			.saturating_add((3_484_000 as Weight).saturating_mul(p as Weight))
+		(41_605_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_157_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
 	}
 	fn clear_identity(r: u32, s: u32, x: u32, ) -> Weight {
-		(65_458_000 as Weight)
-			.saturating_add((230_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((3_437_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add((1_023_000 as Weight).saturating_mul(x as Weight))
+		(51_811_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((202_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 0
+			.saturating_add((2_157_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 0
+			.saturating_add((618_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn request_judgement(r: u32, x: u32, ) -> Weight {
-		(75_299_000 as Weight)
-			.saturating_add((493_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((2_014_000 as Weight).saturating_mul(x as Weight))
+		(54_657_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((381_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 0
+			.saturating_add((1_153_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn cancel_request(r: u32, x: u32, ) -> Weight {
-		(67_492_000 as Weight)
-			.saturating_add((225_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((2_003_000 as Weight).saturating_mul(x as Weight))
+		(50_895_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((267_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 0
+			.saturating_add((1_141_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn set_fee(r: u32, ) -> Weight {
-		(11_375_000 as Weight)
-			.saturating_add((382_000 as Weight).saturating_mul(r as Weight))
+		(8_036_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((281_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn set_account_id(r: u32, ) -> Weight {
-		(12_898_000 as Weight)
-			.saturating_add((384_000 as Weight).saturating_mul(r as Weight))
+		(9_001_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((288_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn set_fields(r: u32, ) -> Weight {
-		(11_419_000 as Weight)
-			.saturating_add((381_000 as Weight).saturating_mul(r as Weight))
+		(8_039_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((286_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn provide_judgement(r: u32, x: u32, ) -> Weight {
-		(51_115_000 as Weight)
-			.saturating_add((427_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((2_001_000 as Weight).saturating_mul(x as Weight))
+		(35_746_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((346_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 0
+			.saturating_add((1_164_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
-	fn kill_identity(_r: u32, s: u32, _x: u32, ) -> Weight {
-		(90_911_000 as Weight)
-			.saturating_add((3_450_000 as Weight).saturating_mul(s as Weight))
+	fn kill_identity(r: u32, s: u32, x: u32, ) -> Weight {
+		(65_304_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((149_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 0
+			.saturating_add((2_118_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 0
+			.saturating_add((6_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn add_sub(s: u32, ) -> Weight {
-		(76_957_000 as Weight)
-			.saturating_add((261_000 as Weight).saturating_mul(s as Weight))
+		(55_491_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((220_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
 	fn rename_sub(s: u32, ) -> Weight {
-		(26_219_000 as Weight)
+		(17_564_000 as Weight)
+			// Standard Error: 0
 			.saturating_add((84_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn remove_sub(s: u32, ) -> Weight {
-		(73_130_000 as Weight)
-			.saturating_add((239_000 as Weight).saturating_mul(s as Weight))
+		(56_535_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((209_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
 	fn quit_sub(s: u32, ) -> Weight {
-		(48_088_000 as Weight)
-			.saturating_add((237_000 as Weight).saturating_mul(s as Weight))
+		(35_369_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((200_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
-	
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn add_registrar(r: u32, ) -> Weight {
-		(28_965_000 as Weight)
-			.saturating_add((421_000 as Weight).saturating_mul(r as Weight))
+		(21_825_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((288_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn set_identity(r: u32, x: u32, ) -> Weight {
-		(71_923_000 as Weight)
-			.saturating_add((529_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((1_763_000 as Weight).saturating_mul(x as Weight))
+		(53_354_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((274_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 2_000
+			.saturating_add((939_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn set_subs_new(s: u32, ) -> Weight {
-		(55_550_000 as Weight)
-			.saturating_add((9_760_000 as Weight).saturating_mul(s as Weight))
+		(42_017_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((6_457_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn set_subs_old(p: u32, ) -> Weight {
-		(51_789_000 as Weight)
-			.saturating_add((3_484_000 as Weight).saturating_mul(p as Weight))
+		(41_605_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_157_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
 	}
 	fn clear_identity(r: u32, s: u32, x: u32, ) -> Weight {
-		(65_458_000 as Weight)
-			.saturating_add((230_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((3_437_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add((1_023_000 as Weight).saturating_mul(x as Weight))
+		(51_811_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((202_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 0
+			.saturating_add((2_157_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 0
+			.saturating_add((618_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn request_judgement(r: u32, x: u32, ) -> Weight {
-		(75_299_000 as Weight)
-			.saturating_add((493_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((2_014_000 as Weight).saturating_mul(x as Weight))
+		(54_657_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((381_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 0
+			.saturating_add((1_153_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn cancel_request(r: u32, x: u32, ) -> Weight {
-		(67_492_000 as Weight)
-			.saturating_add((225_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((2_003_000 as Weight).saturating_mul(x as Weight))
+		(50_895_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((267_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 0
+			.saturating_add((1_141_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn set_fee(r: u32, ) -> Weight {
-		(11_375_000 as Weight)
-			.saturating_add((382_000 as Weight).saturating_mul(r as Weight))
+		(8_036_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((281_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn set_account_id(r: u32, ) -> Weight {
-		(12_898_000 as Weight)
-			.saturating_add((384_000 as Weight).saturating_mul(r as Weight))
+		(9_001_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((288_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn set_fields(r: u32, ) -> Weight {
-		(11_419_000 as Weight)
-			.saturating_add((381_000 as Weight).saturating_mul(r as Weight))
+		(8_039_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((286_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn provide_judgement(r: u32, x: u32, ) -> Weight {
-		(51_115_000 as Weight)
-			.saturating_add((427_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((2_001_000 as Weight).saturating_mul(x as Weight))
+		(35_746_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((346_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 0
+			.saturating_add((1_164_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
-	fn kill_identity(_r: u32, s: u32, _x: u32, ) -> Weight {
-		(90_911_000 as Weight)
-			.saturating_add((3_450_000 as Weight).saturating_mul(s as Weight))
+	fn kill_identity(r: u32, s: u32, x: u32, ) -> Weight {
+		(65_304_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((149_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 0
+			.saturating_add((2_118_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 0
+			.saturating_add((6_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn add_sub(s: u32, ) -> Weight {
-		(76_957_000 as Weight)
-			.saturating_add((261_000 as Weight).saturating_mul(s as Weight))
+		(55_491_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((220_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
 	fn rename_sub(s: u32, ) -> Weight {
-		(26_219_000 as Weight)
+		(17_564_000 as Weight)
+			// Standard Error: 0
 			.saturating_add((84_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn remove_sub(s: u32, ) -> Weight {
-		(73_130_000 as Weight)
-			.saturating_add((239_000 as Weight).saturating_mul(s as Weight))
+		(56_535_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((209_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
 	fn quit_sub(s: u32, ) -> Weight {
-		(48_088_000 as Weight)
-			.saturating_add((237_000 as Weight).saturating_mul(s as Weight))
+		(35_369_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((200_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
-	
 }
diff --git a/frame/im-online/src/weights.rs b/frame/im-online/src/weights.rs
index 83ec294e8edb..6a1f575b856c 100644
--- a/frame/im-online/src/weights.rs
+++ b/frame/im-online/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Weights for pallet_im_online
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! Autogenerated weights for pallet_im_online
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -50,9 +51,11 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn validate_unsigned_and_then_heartbeat(k: u32, e: u32, ) -> Weight {
-		(114_379_000 as Weight)
-			.saturating_add((219_000 as Weight).saturating_mul(k as Weight))
-			.saturating_add((481_000 as Weight).saturating_mul(e as Weight))
+		(97_166_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((153_000 as Weight).saturating_mul(k as Weight))
+			// Standard Error: 1_000
+			.saturating_add((328_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -61,9 +64,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn validate_unsigned_and_then_heartbeat(k: u32, e: u32, ) -> Weight {
-		(114_379_000 as Weight)
-			.saturating_add((219_000 as Weight).saturating_mul(k as Weight))
-			.saturating_add((481_000 as Weight).saturating_mul(e as Weight))
+		(97_166_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((153_000 as Weight).saturating_mul(k as Weight))
+			// Standard Error: 1_000
+			.saturating_add((328_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
diff --git a/frame/indices/src/weights.rs b/frame/indices/src/weights.rs
index e303b943b7e2..559392d3d2ba 100644
--- a/frame/indices/src/weights.rs
+++ b/frame/indices/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Weights for pallet_indices
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! Autogenerated weights for pallet_indices
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -48,76 +49,63 @@ pub trait WeightInfo {
 	fn free() -> Weight;
 	fn force_transfer() -> Weight;
 	fn freeze() -> Weight;
-	
 }
 
 /// Weights for pallet_indices using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn claim() -> Weight {
-		(53_799_000 as Weight)
+		(40_622_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn transfer() -> Weight {
-		(60_294_000 as Weight)
+		(49_166_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
 	fn free() -> Weight {
-		(48_625_000 as Weight)
+		(40_802_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn force_transfer() -> Weight {
-		(49_762_000 as Weight)
+		(41_423_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
 	fn freeze() -> Weight {
-		(44_869_000 as Weight)
+		(38_476_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
-	
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn claim() -> Weight {
-		(53_799_000 as Weight)
+		(40_622_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn transfer() -> Weight {
-		(60_294_000 as Weight)
+		(49_166_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
 	fn free() -> Weight {
-		(48_625_000 as Weight)
+		(40_802_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn force_transfer() -> Weight {
-		(49_762_000 as Weight)
+		(41_423_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
 	fn freeze() -> Weight {
-		(44_869_000 as Weight)
+		(38_476_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
-	
 }
diff --git a/frame/lottery/src/weights.rs b/frame/lottery/src/weights.rs
index 464bb94bbbb7..a73d0b667e35 100644
--- a/frame/lottery/src/weights.rs
+++ b/frame/lottery/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_lottery
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2021-01-05, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -56,33 +56,33 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn buy_ticket() -> Weight {
-		(97_799_000 as Weight)
+		(71_604_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn set_calls(n: u32, ) -> Weight {
-		(20_932_000 as Weight)
-			// Standard Error: 9_000
-			.saturating_add((513_000 as Weight).saturating_mul(n as Weight))
+		(15_015_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((301_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn start_lottery() -> Weight {
-		(77_600_000 as Weight)
+		(58_855_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn stop_repeat() -> Weight {
-		(10_707_000 as Weight)
+		(7_524_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn on_initialize_end() -> Weight {
-		(162_126_000 as Weight)
+		(114_766_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn on_initialize_repeat() -> Weight {
-		(169_310_000 as Weight)
+		(119_402_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
@@ -91,33 +91,33 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn buy_ticket() -> Weight {
-		(97_799_000 as Weight)
+		(71_604_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn set_calls(n: u32, ) -> Weight {
-		(20_932_000 as Weight)
-			// Standard Error: 9_000
-			.saturating_add((513_000 as Weight).saturating_mul(n as Weight))
+		(15_015_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((301_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn start_lottery() -> Weight {
-		(77_600_000 as Weight)
+		(58_855_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn stop_repeat() -> Weight {
-		(10_707_000 as Weight)
+		(7_524_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn on_initialize_end() -> Weight {
-		(162_126_000 as Weight)
+		(114_766_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn on_initialize_repeat() -> Weight {
-		(169_310_000 as Weight)
+		(119_402_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}
diff --git a/frame/membership/src/weights.rs b/frame/membership/src/weights.rs
index fbdb44caec84..8e2d8bb26616 100644
--- a/frame/membership/src/weights.rs
+++ b/frame/membership/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_membership
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-04-17, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -57,49 +57,49 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn add_member(m: u32, ) -> Weight {
-		(25_448_000 as Weight)
+		(24_309_000 as Weight)
 			// Standard Error: 3_000
-			.saturating_add((257_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((147_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn remove_member(m: u32, ) -> Weight {
-		(31_317_000 as Weight)
+		(29_722_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((215_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((119_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn swap_member(m: u32, ) -> Weight {
-		(31_208_000 as Weight)
+		(30_239_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((229_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((132_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn reset_member(m: u32, ) -> Weight {
-		(31_673_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((455_000 as Weight).saturating_mul(m as Weight))
+		(31_302_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((289_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn change_key(m: u32, ) -> Weight {
-		(33_499_000 as Weight)
+		(31_967_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((226_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((130_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn set_prime(m: u32, ) -> Weight {
-		(8_865_000 as Weight)
+		(8_083_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((124_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((91_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn clear_prime(m: u32, ) -> Weight {
-		(3_397_000 as Weight)
+		(3_360_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((1_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
@@ -109,49 +109,49 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn add_member(m: u32, ) -> Weight {
-		(25_448_000 as Weight)
+		(24_309_000 as Weight)
 			// Standard Error: 3_000
-			.saturating_add((257_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((147_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn remove_member(m: u32, ) -> Weight {
-		(31_317_000 as Weight)
+		(29_722_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((215_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((119_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn swap_member(m: u32, ) -> Weight {
-		(31_208_000 as Weight)
+		(30_239_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((229_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((132_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn reset_member(m: u32, ) -> Weight {
-		(31_673_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((455_000 as Weight).saturating_mul(m as Weight))
+		(31_302_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((289_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn change_key(m: u32, ) -> Weight {
-		(33_499_000 as Weight)
+		(31_967_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((226_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((130_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn set_prime(m: u32, ) -> Weight {
-		(8_865_000 as Weight)
+		(8_083_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((124_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((91_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn clear_prime(m: u32, ) -> Weight {
-		(3_397_000 as Weight)
+		(3_360_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((1_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
diff --git a/frame/multisig/src/weights.rs b/frame/multisig/src/weights.rs
index 1c8736616c18..50f774030015 100644
--- a/frame/multisig/src/weights.rs
+++ b/frame/multisig/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Weights for pallet_multisig
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! Autogenerated weights for pallet_multisig
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -53,162 +54,165 @@ pub trait WeightInfo {
 	fn approve_as_multi_approve(s: u32, ) -> Weight;
 	fn approve_as_multi_complete(s: u32, ) -> Weight;
 	fn cancel_as_multi(s: u32, ) -> Weight;
-	
 }
 
 /// Weights for pallet_multisig using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
-	fn as_multi_threshold_1(z: u32, ) -> Weight {
-		(14_183_000 as Weight)
-			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
-			
+	fn as_multi_threshold_1(_z: u32, ) -> Weight {
+		(14_411_000 as Weight)
 	}
 	fn as_multi_create(s: u32, z: u32, ) -> Weight {
-		(72_350_000 as Weight)
-			.saturating_add((64_000 as Weight).saturating_mul(s as Weight))
+		(54_200_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((127_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 0
 			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn as_multi_create_store(s: u32, z: u32, ) -> Weight {
-		(83_175_000 as Weight)
-			.saturating_add((72_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add((3_000 as Weight).saturating_mul(z as Weight))
+		(60_502_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((128_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 0
+			.saturating_add((2_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
 	fn as_multi_approve(s: u32, z: u32, ) -> Weight {
-		(43_035_000 as Weight)
-			.saturating_add((140_000 as Weight).saturating_mul(s as Weight))
+		(32_075_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((132_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 0
 			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn as_multi_approve_store(s: u32, z: u32, ) -> Weight {
-		(75_190_000 as Weight)
-			.saturating_add((127_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add((3_000 as Weight).saturating_mul(z as Weight))
+		(57_742_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((141_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 0
+			.saturating_add((2_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
 	fn as_multi_complete(s: u32, z: u32, ) -> Weight {
-		(92_751_000 as Weight)
-			.saturating_add((282_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add((5_000 as Weight).saturating_mul(z as Weight))
+		(73_503_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((246_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 0
+			.saturating_add((4_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-			
 	}
 	fn approve_as_multi_create(s: u32, ) -> Weight {
-		(71_937_000 as Weight)
-			.saturating_add((87_000 as Weight).saturating_mul(s as Weight))
+		(53_659_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((133_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn approve_as_multi_approve(s: u32, ) -> Weight {
-		(44_294_000 as Weight)
-			.saturating_add((89_000 as Weight).saturating_mul(s as Weight))
+		(31_353_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((136_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn approve_as_multi_complete(s: u32, ) -> Weight {
-		(163_098_000 as Weight)
-			.saturating_add((276_000 as Weight).saturating_mul(s as Weight))
+		(125_011_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((247_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-			
 	}
 	fn cancel_as_multi(s: u32, ) -> Weight {
-		(115_731_000 as Weight)
-			.saturating_add((104_000 as Weight).saturating_mul(s as Weight))
+		(92_318_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((128_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
-	
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
-	fn as_multi_threshold_1(z: u32, ) -> Weight {
-		(14_183_000 as Weight)
-			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
-			
+	fn as_multi_threshold_1(_z: u32, ) -> Weight {
+		(14_411_000 as Weight)
 	}
 	fn as_multi_create(s: u32, z: u32, ) -> Weight {
-		(72_350_000 as Weight)
-			.saturating_add((64_000 as Weight).saturating_mul(s as Weight))
+		(54_200_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((127_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 0
 			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn as_multi_create_store(s: u32, z: u32, ) -> Weight {
-		(83_175_000 as Weight)
-			.saturating_add((72_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add((3_000 as Weight).saturating_mul(z as Weight))
+		(60_502_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((128_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 0
+			.saturating_add((2_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
 	fn as_multi_approve(s: u32, z: u32, ) -> Weight {
-		(43_035_000 as Weight)
-			.saturating_add((140_000 as Weight).saturating_mul(s as Weight))
+		(32_075_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((132_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 0
 			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn as_multi_approve_store(s: u32, z: u32, ) -> Weight {
-		(75_190_000 as Weight)
-			.saturating_add((127_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add((3_000 as Weight).saturating_mul(z as Weight))
+		(57_742_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((141_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 0
+			.saturating_add((2_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
 	fn as_multi_complete(s: u32, z: u32, ) -> Weight {
-		(92_751_000 as Weight)
-			.saturating_add((282_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add((5_000 as Weight).saturating_mul(z as Weight))
+		(73_503_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((246_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 0
+			.saturating_add((4_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
-			
 	}
 	fn approve_as_multi_create(s: u32, ) -> Weight {
-		(71_937_000 as Weight)
-			.saturating_add((87_000 as Weight).saturating_mul(s as Weight))
+		(53_659_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((133_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn approve_as_multi_approve(s: u32, ) -> Weight {
-		(44_294_000 as Weight)
-			.saturating_add((89_000 as Weight).saturating_mul(s as Weight))
+		(31_353_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((136_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn approve_as_multi_complete(s: u32, ) -> Weight {
-		(163_098_000 as Weight)
-			.saturating_add((276_000 as Weight).saturating_mul(s as Weight))
+		(125_011_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((247_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
-			
 	}
 	fn cancel_as_multi(s: u32, ) -> Weight {
-		(115_731_000 as Weight)
-			.saturating_add((104_000 as Weight).saturating_mul(s as Weight))
+		(92_318_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((128_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
-	
 }
diff --git a/frame/proxy/src/weights.rs b/frame/proxy/src/weights.rs
index b720a22be120..f250186ad81d 100644
--- a/frame/proxy/src/weights.rs
+++ b/frame/proxy/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Weights for pallet_proxy
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! Autogenerated weights for pallet_proxy
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -53,162 +54,167 @@ pub trait WeightInfo {
 	fn remove_proxies(p: u32, ) -> Weight;
 	fn anonymous(p: u32, ) -> Weight;
 	fn kill_anonymous(p: u32, ) -> Weight;
-	
 }
 
 /// Weights for pallet_proxy using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn proxy(p: u32, ) -> Weight {
-		(32_194_000 as Weight)
-			.saturating_add((215_000 as Weight).saturating_mul(p as Weight))
+		(22_645_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((162_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			
 	}
 	fn proxy_announced(a: u32, p: u32, ) -> Weight {
-		(67_490_000 as Weight)
-			.saturating_add((859_000 as Weight).saturating_mul(a as Weight))
-			.saturating_add((215_000 as Weight).saturating_mul(p as Weight))
+		(53_259_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((543_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 2_000
+			.saturating_add((153_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
 	fn remove_announcement(a: u32, p: u32, ) -> Weight {
-		(40_768_000 as Weight)
-			.saturating_add((882_000 as Weight).saturating_mul(a as Weight))
-			.saturating_add((122_000 as Weight).saturating_mul(p as Weight))
+		(37_983_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((545_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 2_000
+			.saturating_add((4_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
 	fn reject_announcement(a: u32, p: u32, ) -> Weight {
-		(42_742_000 as Weight)
-			.saturating_add((852_000 as Weight).saturating_mul(a as Weight))
-			.saturating_add((22_000 as Weight).saturating_mul(p as Weight))
+		(37_922_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((541_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 2_000
+			.saturating_add((6_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
 	fn announce(a: u32, p: u32, ) -> Weight {
-		(67_967_000 as Weight)
-			.saturating_add((737_000 as Weight).saturating_mul(a as Weight))
-			.saturating_add((213_000 as Weight).saturating_mul(p as Weight))
+		(51_355_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((534_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 2_000
+			.saturating_add((148_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
 	fn add_proxy(p: u32, ) -> Weight {
-		(45_245_000 as Weight)
-			.saturating_add((240_000 as Weight).saturating_mul(p as Weight))
+		(35_798_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((228_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn remove_proxy(p: u32, ) -> Weight {
-		(40_742_000 as Weight)
-			.saturating_add((272_000 as Weight).saturating_mul(p as Weight))
+		(35_554_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((250_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn remove_proxies(p: u32, ) -> Weight {
-		(39_070_000 as Weight)
-			.saturating_add((214_000 as Weight).saturating_mul(p as Weight))
+		(33_911_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((165_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn anonymous(p: u32, ) -> Weight {
-		(64_851_000 as Weight)
-			.saturating_add((37_000 as Weight).saturating_mul(p as Weight))
+		(48_695_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((53_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn kill_anonymous(p: u32, ) -> Weight {
-		(41_831_000 as Weight)
-			.saturating_add((207_000 as Weight).saturating_mul(p as Weight))
+		(35_904_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((159_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
-	
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn proxy(p: u32, ) -> Weight {
-		(32_194_000 as Weight)
-			.saturating_add((215_000 as Weight).saturating_mul(p as Weight))
+		(22_645_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((162_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
-			
 	}
 	fn proxy_announced(a: u32, p: u32, ) -> Weight {
-		(67_490_000 as Weight)
-			.saturating_add((859_000 as Weight).saturating_mul(a as Weight))
-			.saturating_add((215_000 as Weight).saturating_mul(p as Weight))
+		(53_259_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((543_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 2_000
+			.saturating_add((153_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
 	fn remove_announcement(a: u32, p: u32, ) -> Weight {
-		(40_768_000 as Weight)
-			.saturating_add((882_000 as Weight).saturating_mul(a as Weight))
-			.saturating_add((122_000 as Weight).saturating_mul(p as Weight))
+		(37_983_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((545_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 2_000
+			.saturating_add((4_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
 	fn reject_announcement(a: u32, p: u32, ) -> Weight {
-		(42_742_000 as Weight)
-			.saturating_add((852_000 as Weight).saturating_mul(a as Weight))
-			.saturating_add((22_000 as Weight).saturating_mul(p as Weight))
+		(37_922_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((541_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 2_000
+			.saturating_add((6_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
 	fn announce(a: u32, p: u32, ) -> Weight {
-		(67_967_000 as Weight)
-			.saturating_add((737_000 as Weight).saturating_mul(a as Weight))
-			.saturating_add((213_000 as Weight).saturating_mul(p as Weight))
+		(51_355_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((534_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 2_000
+			.saturating_add((148_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
 	fn add_proxy(p: u32, ) -> Weight {
-		(45_245_000 as Weight)
-			.saturating_add((240_000 as Weight).saturating_mul(p as Weight))
+		(35_798_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((228_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn remove_proxy(p: u32, ) -> Weight {
-		(40_742_000 as Weight)
-			.saturating_add((272_000 as Weight).saturating_mul(p as Weight))
+		(35_554_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((250_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn remove_proxies(p: u32, ) -> Weight {
-		(39_070_000 as Weight)
-			.saturating_add((214_000 as Weight).saturating_mul(p as Weight))
+		(33_911_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((165_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn anonymous(p: u32, ) -> Weight {
-		(64_851_000 as Weight)
-			.saturating_add((37_000 as Weight).saturating_mul(p as Weight))
+		(48_695_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((53_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn kill_anonymous(p: u32, ) -> Weight {
-		(41_831_000 as Weight)
-			.saturating_add((207_000 as Weight).saturating_mul(p as Weight))
+		(35_904_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((159_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
-	
 }
diff --git a/frame/scheduler/src/weights.rs b/frame/scheduler/src/weights.rs
index 1d7273353f34..648652428cbb 100644
--- a/frame/scheduler/src/weights.rs
+++ b/frame/scheduler/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Weights for pallet_scheduler
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! Autogenerated weights for pallet_scheduler
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -47,72 +48,69 @@ pub trait WeightInfo {
 	fn cancel(s: u32, ) -> Weight;
 	fn schedule_named(s: u32, ) -> Weight;
 	fn cancel_named(s: u32, ) -> Weight;
-	
 }
 
 /// Weights for pallet_scheduler using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn schedule(s: u32, ) -> Weight {
-		(35_029_000 as Weight)
-			.saturating_add((77_000 as Weight).saturating_mul(s as Weight))
+		(24_811_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((116_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn cancel(s: u32, ) -> Weight {
-		(31_419_000 as Weight)
-			.saturating_add((4_015_000 as Weight).saturating_mul(s as Weight))
+		(23_851_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((1_439_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
 	fn schedule_named(s: u32, ) -> Weight {
-		(44_752_000 as Weight)
-			.saturating_add((123_000 as Weight).saturating_mul(s as Weight))
+		(31_096_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((141_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
 	fn cancel_named(s: u32, ) -> Weight {
-		(35_712_000 as Weight)
-			.saturating_add((4_008_000 as Weight).saturating_mul(s as Weight))
+		(26_715_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((1_455_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
-	
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn schedule(s: u32, ) -> Weight {
-		(35_029_000 as Weight)
-			.saturating_add((77_000 as Weight).saturating_mul(s as Weight))
+		(24_811_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((116_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn cancel(s: u32, ) -> Weight {
-		(31_419_000 as Weight)
-			.saturating_add((4_015_000 as Weight).saturating_mul(s as Weight))
+		(23_851_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((1_439_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
 	fn schedule_named(s: u32, ) -> Weight {
-		(44_752_000 as Weight)
-			.saturating_add((123_000 as Weight).saturating_mul(s as Weight))
+		(31_096_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((141_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
 	fn cancel_named(s: u32, ) -> Weight {
-		(35_712_000 as Weight)
-			.saturating_add((4_008_000 as Weight).saturating_mul(s as Weight))
+		(26_715_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((1_455_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
-	
 }
diff --git a/frame/session/src/weights.rs b/frame/session/src/weights.rs
index 88ed9e6d8ece..ec911d8c01cc 100644
--- a/frame/session/src/weights.rs
+++ b/frame/session/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Weights for pallet_session
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! Autogenerated weights for pallet_session
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -45,40 +46,33 @@ use sp_std::marker::PhantomData;
 pub trait WeightInfo {
 	fn set_keys() -> Weight;
 	fn purge_keys() -> Weight;
-	
 }
 
 /// Weights for pallet_session using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn set_keys() -> Weight {
-		(86_033_000 as Weight)
+		(70_351_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
-			
 	}
 	fn purge_keys() -> Weight {
-		(54_334_000 as Weight)
+		(45_866_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
-			
 	}
-	
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn set_keys() -> Weight {
-		(86_033_000 as Weight)
+		(70_351_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
-			
 	}
 	fn purge_keys() -> Weight {
-		(54_334_000 as Weight)
+		(45_866_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
-			
 	}
-	
 }
diff --git a/frame/staking/src/weights.rs b/frame/staking/src/weights.rs
index 980b0855fbd8..dbf5f3fc82bf 100644
--- a/frame/staking/src/weights.rs
+++ b/frame/staking/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_staking
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-15, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -78,154 +78,154 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn bond() -> Weight {
-		(91_278_000 as Weight)
+		(72_617_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn bond_extra() -> Weight {
-		(69_833_000 as Weight)
+		(55_590_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn unbond() -> Weight {
-		(75_020_000 as Weight)
+		(59_730_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn withdraw_unbonded_update(s: u32, ) -> Weight {
-		(63_898_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((50_000 as Weight).saturating_mul(s as Weight))
+		(52_279_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((68_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
-		(103_717_000 as Weight)
+		(86_629_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((2_942_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((2_379_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(8 as Weight))
 			.saturating_add(T::DbWeight::get().writes(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn validate() -> Weight {
-		(40_702_000 as Weight)
+		(32_393_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn kick(k: u32, ) -> Weight {
-		(33_572_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((20_771_000 as Weight).saturating_mul(k as Weight))
+		(36_986_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((16_574_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(k as Weight)))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn nominate(n: u32, ) -> Weight {
-		(53_561_000 as Weight)
-			// Standard Error: 34_000
-			.saturating_add((6_652_000 as Weight).saturating_mul(n as Weight))
+		(43_228_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((5_119_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn chill() -> Weight {
-		(21_489_000 as Weight)
+		(17_800_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 	}
 	fn set_payee() -> Weight {
-		(14_514_000 as Weight)
+		(12_612_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_controller() -> Weight {
-		(32_598_000 as Weight)
+		(27_503_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn set_validator_count() -> Weight {
-		(2_477_000 as Weight)
+		(2_119_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_no_eras() -> Weight {
-		(2_743_000 as Weight)
+		(2_320_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_new_era() -> Weight {
-		(2_784_000 as Weight)
+		(2_269_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_new_era_always() -> Weight {
-		(2_749_000 as Weight)
+		(2_334_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_invulnerables(v: u32, ) -> Weight {
-		(2_798_000 as Weight)
+		(2_354_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((5_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_unstake(s: u32, ) -> Weight {
-		(70_372_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((3_029_000 as Weight).saturating_mul(s as Weight))
+		(61_556_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((2_377_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn cancel_deferred_slash(s: u32, ) -> Weight {
-		(3_436_822_000 as Weight)
-			// Standard Error: 221_000
-			.saturating_add((19_799_000 as Weight).saturating_mul(s as Weight))
+		(3_367_105_000 as Weight)
+			// Standard Error: 222_000
+			.saturating_add((19_817_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn payout_stakers_dead_controller(n: u32, ) -> Weight {
-		(132_018_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((61_340_000 as Weight).saturating_mul(n as Weight))
+		(47_229_000 as Weight)
+			// Standard Error: 53_000
+			.saturating_add((48_365_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(10 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(n as Weight)))
 	}
 	fn payout_stakers_alive_staked(n: u32, ) -> Weight {
-		(158_346_000 as Weight)
-			// Standard Error: 61_000
-			.saturating_add((77_147_000 as Weight).saturating_mul(n as Weight))
+		(156_788_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((61_280_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(11 as Weight))
 			.saturating_add(T::DbWeight::get().reads((5 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(n as Weight)))
 	}
 	fn rebond(l: u32, ) -> Weight {
-		(57_756_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((79_000 as Weight).saturating_mul(l as Weight))
+		(47_815_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((65_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn set_history_depth(e: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 100_000
-			.saturating_add((44_873_000 as Weight).saturating_mul(e as Weight))
+			// Standard Error: 74_000
+			.saturating_add((34_945_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes((7 as Weight).saturating_mul(e as Weight)))
 	}
 	fn reap_stash(s: u32, ) -> Weight {
-		(75_073_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((2_988_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(T::DbWeight::get().reads(6 as Weight))
-			.saturating_add(T::DbWeight::get().writes(6 as Weight))
+		(73_483_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_384_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(7 as Weight))
+			.saturating_add(T::DbWeight::get().writes(8 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn new_era(v: u32, n: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 1_146_000
-			.saturating_add((362_986_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 57_000
-			.saturating_add((60_216_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 846_000
+			.saturating_add((305_234_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 42_000
+			.saturating_add((48_280_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(10 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
@@ -234,12 +234,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	}
 	fn get_npos_voters(v: u32, n: u32, s: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 230_000
-			.saturating_add((35_891_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 230_000
-			.saturating_add((37_854_000 as Weight).saturating_mul(n as Weight))
-			// Standard Error: 7_842_000
-			.saturating_add((32_492_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 99_000
+			.saturating_add((25_735_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 99_000
+			.saturating_add((28_122_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 3_388_000
+			.saturating_add((21_500_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
@@ -247,17 +247,17 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	}
 	fn get_npos_targets(v: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 74_000
-			.saturating_add((16_370_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 30_000
+			.saturating_add((11_065_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(v as Weight)))
 	}
 	fn update_staking_limits() -> Weight {
-		(6_398_000 as Weight)
+		(5_028_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn chill_other() -> Weight {
-		(44_694_000 as Weight)
+		(35_758_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
@@ -266,154 +266,154 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn bond() -> Weight {
-		(91_278_000 as Weight)
+		(72_617_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn bond_extra() -> Weight {
-		(69_833_000 as Weight)
+		(55_590_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn unbond() -> Weight {
-		(75_020_000 as Weight)
+		(59_730_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn withdraw_unbonded_update(s: u32, ) -> Weight {
-		(63_898_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((50_000 as Weight).saturating_mul(s as Weight))
+		(52_279_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((68_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
-		(103_717_000 as Weight)
+		(86_629_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((2_942_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((2_379_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(8 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn validate() -> Weight {
-		(40_702_000 as Weight)
+		(32_393_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn kick(k: u32, ) -> Weight {
-		(33_572_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((20_771_000 as Weight).saturating_mul(k as Weight))
+		(36_986_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((16_574_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(k as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn nominate(n: u32, ) -> Weight {
-		(53_561_000 as Weight)
-			// Standard Error: 34_000
-			.saturating_add((6_652_000 as Weight).saturating_mul(n as Weight))
+		(43_228_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((5_119_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn chill() -> Weight {
-		(21_489_000 as Weight)
+		(17_800_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 	}
 	fn set_payee() -> Weight {
-		(14_514_000 as Weight)
+		(12_612_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_controller() -> Weight {
-		(32_598_000 as Weight)
+		(27_503_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn set_validator_count() -> Weight {
-		(2_477_000 as Weight)
+		(2_119_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_no_eras() -> Weight {
-		(2_743_000 as Weight)
+		(2_320_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_new_era() -> Weight {
-		(2_784_000 as Weight)
+		(2_269_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_new_era_always() -> Weight {
-		(2_749_000 as Weight)
+		(2_334_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_invulnerables(v: u32, ) -> Weight {
-		(2_798_000 as Weight)
+		(2_354_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((5_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_unstake(s: u32, ) -> Weight {
-		(70_372_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((3_029_000 as Weight).saturating_mul(s as Weight))
+		(61_556_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((2_377_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn cancel_deferred_slash(s: u32, ) -> Weight {
-		(3_436_822_000 as Weight)
-			// Standard Error: 221_000
-			.saturating_add((19_799_000 as Weight).saturating_mul(s as Weight))
+		(3_367_105_000 as Weight)
+			// Standard Error: 222_000
+			.saturating_add((19_817_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn payout_stakers_dead_controller(n: u32, ) -> Weight {
-		(132_018_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((61_340_000 as Weight).saturating_mul(n as Weight))
+		(47_229_000 as Weight)
+			// Standard Error: 53_000
+			.saturating_add((48_365_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(n as Weight)))
 	}
 	fn payout_stakers_alive_staked(n: u32, ) -> Weight {
-		(158_346_000 as Weight)
-			// Standard Error: 61_000
-			.saturating_add((77_147_000 as Weight).saturating_mul(n as Weight))
+		(156_788_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((61_280_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(11 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((5 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(n as Weight)))
 	}
 	fn rebond(l: u32, ) -> Weight {
-		(57_756_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((79_000 as Weight).saturating_mul(l as Weight))
+		(47_815_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((65_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn set_history_depth(e: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 100_000
-			.saturating_add((44_873_000 as Weight).saturating_mul(e as Weight))
+			// Standard Error: 74_000
+			.saturating_add((34_945_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((7 as Weight).saturating_mul(e as Weight)))
 	}
 	fn reap_stash(s: u32, ) -> Weight {
-		(75_073_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((2_988_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(6 as Weight))
+		(73_483_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_384_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn new_era(v: u32, n: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 1_146_000
-			.saturating_add((362_986_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 57_000
-			.saturating_add((60_216_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 846_000
+			.saturating_add((305_234_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 42_000
+			.saturating_add((48_280_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
@@ -422,12 +422,12 @@ impl WeightInfo for () {
 	}
 	fn get_npos_voters(v: u32, n: u32, s: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 230_000
-			.saturating_add((35_891_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 230_000
-			.saturating_add((37_854_000 as Weight).saturating_mul(n as Weight))
-			// Standard Error: 7_842_000
-			.saturating_add((32_492_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 99_000
+			.saturating_add((25_735_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 99_000
+			.saturating_add((28_122_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 3_388_000
+			.saturating_add((21_500_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
@@ -435,17 +435,17 @@ impl WeightInfo for () {
 	}
 	fn get_npos_targets(v: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 74_000
-			.saturating_add((16_370_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 30_000
+			.saturating_add((11_065_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(v as Weight)))
 	}
 	fn update_staking_limits() -> Weight {
-		(6_398_000 as Weight)
+		(5_028_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn chill_other() -> Weight {
-		(44_694_000 as Weight)
+		(35_758_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
diff --git a/frame/system/src/weights.rs b/frame/system/src/weights.rs
index 04e95de4ba37..c6284ba17d63 100644
--- a/frame/system/src/weights.rs
+++ b/frame/system/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for frame_system
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-02-28, STEPS: \[50, \], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -34,7 +34,6 @@
 // --heap-pages=4096
 // --output=./frame/system/src/weights.rs
 // --template=./.maintain/frame-weight-template.hbs
-// --output-analysis=max
 
 
 #![allow(unused_parens)]
@@ -58,38 +57,38 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: crate::Config> WeightInfo for SubstrateWeight<T> {
 	fn remark(_b: u32, ) -> Weight {
-		(1_345_000 as Weight)
+		(1_038_000 as Weight)
 	}
 	fn remark_with_event(b: u32, ) -> Weight {
-		(9_697_000 as Weight)
+		(5_246_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((1_000 as Weight).saturating_mul(b as Weight))
 	}
 	fn set_heap_pages() -> Weight {
-		(2_070_000 as Weight)
+		(1_586_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_changes_trie_config() -> Weight {
-		(10_111_000 as Weight)
+		(7_181_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn set_storage(i: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 0
-			.saturating_add((619_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((568_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	fn kill_storage(i: u32, ) -> Weight {
-		(1_647_000 as Weight)
+		(2_278_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((460_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((423_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	fn kill_prefix(p: u32, ) -> Weight {
-		(10_678_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((862_000 as Weight).saturating_mul(p as Weight))
+		(8_243_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((795_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
 	}
 }
@@ -97,38 +96,38 @@ impl<T: crate::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn remark(_b: u32, ) -> Weight {
-		(1_345_000 as Weight)
+		(1_038_000 as Weight)
 	}
 	fn remark_with_event(b: u32, ) -> Weight {
-		(9_697_000 as Weight)
+		(5_246_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((1_000 as Weight).saturating_mul(b as Weight))
 	}
 	fn set_heap_pages() -> Weight {
-		(2_070_000 as Weight)
+		(1_586_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_changes_trie_config() -> Weight {
-		(10_111_000 as Weight)
+		(7_181_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn set_storage(i: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 0
-			.saturating_add((619_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((568_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	fn kill_storage(i: u32, ) -> Weight {
-		(1_647_000 as Weight)
+		(2_278_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((460_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((423_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	fn kill_prefix(p: u32, ) -> Weight {
-		(10_678_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((862_000 as Weight).saturating_mul(p as Weight))
+		(8_243_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((795_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
 	}
 }
diff --git a/frame/timestamp/src/weights.rs b/frame/timestamp/src/weights.rs
index 875d78c31d22..cf4fa6ea3d63 100644
--- a/frame/timestamp/src/weights.rs
+++ b/frame/timestamp/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Weights for pallet_timestamp
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! Autogenerated weights for pallet_timestamp
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -45,36 +46,29 @@ use sp_std::marker::PhantomData;
 pub trait WeightInfo {
 	fn set() -> Weight;
 	fn on_finalize() -> Weight;
-	
 }
 
 /// Weights for pallet_timestamp using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn set() -> Weight {
-		(11_650_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+		(10_277_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn on_finalize() -> Weight {
-		(6_681_000 as Weight)
-			
+		(4_859_000 as Weight)
 	}
-	
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn set() -> Weight {
-		(11_650_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+		(10_277_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn on_finalize() -> Weight {
-		(6_681_000 as Weight)
-			
+		(4_859_000 as Weight)
 	}
-	
 }
diff --git a/frame/tips/src/weights.rs b/frame/tips/src/weights.rs
index f5cd4bc23c86..ceee79bd6f07 100644
--- a/frame/tips/src/weights.rs
+++ b/frame/tips/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_tips
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-12-20, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -56,44 +56,44 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn report_awesome(r: u32, ) -> Weight {
-		(73_795_000 as Weight)
+		(49_844_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((2_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn retract_tip() -> Weight {
-		(61_753_000 as Weight)
+		(45_934_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn tip_new(r: u32, t: u32, ) -> Weight {
-		(47_731_000 as Weight)
+		(31_777_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((2_000 as Weight).saturating_mul(r as Weight))
 			// Standard Error: 0
-			.saturating_add((154_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((127_000 as Weight).saturating_mul(t as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn tip(t: u32, ) -> Weight {
-		(35_215_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((712_000 as Weight).saturating_mul(t as Weight))
+		(22_361_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((584_000 as Weight).saturating_mul(t as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn close_tip(t: u32, ) -> Weight {
-		(117_027_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((375_000 as Weight).saturating_mul(t as Weight))
+		(84_470_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((326_000 as Weight).saturating_mul(t as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn slash_tip(t: u32, ) -> Weight {
-		(37_184_000 as Weight)
+		(25_214_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((11_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((8_000 as Weight).saturating_mul(t as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
@@ -102,44 +102,44 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn report_awesome(r: u32, ) -> Weight {
-		(73_795_000 as Weight)
+		(49_844_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((2_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn retract_tip() -> Weight {
-		(61_753_000 as Weight)
+		(45_934_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn tip_new(r: u32, t: u32, ) -> Weight {
-		(47_731_000 as Weight)
+		(31_777_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((2_000 as Weight).saturating_mul(r as Weight))
 			// Standard Error: 0
-			.saturating_add((154_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((127_000 as Weight).saturating_mul(t as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn tip(t: u32, ) -> Weight {
-		(35_215_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((712_000 as Weight).saturating_mul(t as Weight))
+		(22_361_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((584_000 as Weight).saturating_mul(t as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn close_tip(t: u32, ) -> Weight {
-		(117_027_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((375_000 as Weight).saturating_mul(t as Weight))
+		(84_470_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((326_000 as Weight).saturating_mul(t as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn slash_tip(t: u32, ) -> Weight {
-		(37_184_000 as Weight)
+		(25_214_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((11_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((8_000 as Weight).saturating_mul(t as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
diff --git a/frame/transaction-storage/src/weights.rs b/frame/transaction-storage/src/weights.rs
index 7951db8828d0..46fc664d977c 100644
--- a/frame/transaction-storage/src/weights.rs
+++ b/frame/transaction-storage/src/weights.rs
@@ -18,16 +18,14 @@
 //! Autogenerated weights for pallet_transaction_storage
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-03, STEPS: `[20, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
-// ./target/release/substrate
+// target/release/substrate
 // benchmark
-// --chain
-// dev
-// --steps
-// 20
+// --chain=dev
+// --steps=50
 // --repeat=20
 // --pallet=pallet_transaction_storage
 // --extrinsic=*
@@ -57,17 +55,17 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn store(l: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 0
-			.saturating_add((10_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add((8_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn renew() -> Weight {
-		(97_000_000 as Weight)
+		(65_933_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn check_proof_max() -> Weight {
-		(99_000_000 as Weight)
+		(163_549_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -78,17 +76,17 @@ impl WeightInfo for () {
 	fn store(l: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 0
-			.saturating_add((10_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add((8_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn renew() -> Weight {
-		(97_000_000 as Weight)
+		(65_933_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn check_proof_max() -> Weight {
-		(99_000_000 as Weight)
+		(163_549_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
diff --git a/frame/treasury/src/weights.rs b/frame/treasury/src/weights.rs
index 9d627f1c287e..b22380e3c476 100644
--- a/frame/treasury/src/weights.rs
+++ b/frame/treasury/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_treasury
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-04-26, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -54,26 +54,26 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn propose_spend() -> Weight {
-		(45_393_000 as Weight)
+		(41_763_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn reject_proposal() -> Weight {
-		(42_796_000 as Weight)
+		(39_049_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn approve_proposal(p: u32, ) -> Weight {
-		(14_153_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((94_000 as Weight).saturating_mul(p as Weight))
+		(13_547_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((124_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn on_initialize_proposals(p: u32, ) -> Weight {
-		(51_633_000 as Weight)
-			// Standard Error: 42_000
-			.saturating_add((65_705_000 as Weight).saturating_mul(p as Weight))
+		(48_990_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((59_621_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(p as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
@@ -84,26 +84,26 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn propose_spend() -> Weight {
-		(45_393_000 as Weight)
+		(41_763_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn reject_proposal() -> Weight {
-		(42_796_000 as Weight)
+		(39_049_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn approve_proposal(p: u32, ) -> Weight {
-		(14_153_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((94_000 as Weight).saturating_mul(p as Weight))
+		(13_547_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((124_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn on_initialize_proposals(p: u32, ) -> Weight {
-		(51_633_000 as Weight)
-			// Standard Error: 42_000
-			.saturating_add((65_705_000 as Weight).saturating_mul(p as Weight))
+		(48_990_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((59_621_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(p as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
diff --git a/frame/uniques/src/weights.rs b/frame/uniques/src/weights.rs
index 9272ae6026a9..a2263d6cd348 100644
--- a/frame/uniques/src/weights.rs
+++ b/frame/uniques/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_uniques
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-05-24, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -72,23 +72,23 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn create() -> Weight {
-		(55_264_000 as Weight)
+		(43_219_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_create() -> Weight {
-		(28_173_000 as Weight)
+		(21_919_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn destroy(n: u32, m: u32, a: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 32_000
-			.saturating_add((23_077_000 as Weight).saturating_mul(n as Weight))
-			// Standard Error: 32_000
-			.saturating_add((1_723_000 as Weight).saturating_mul(m as Weight))
-			// Standard Error: 32_000
-			.saturating_add((1_534_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 13_000
+			.saturating_add((16_619_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 13_000
+			.saturating_add((967_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 13_000
+			.saturating_add((834_000 as Weight).saturating_mul(a as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
@@ -97,101 +97,101 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(a as Weight)))
 	}
 	fn mint() -> Weight {
-		(73_250_000 as Weight)
+		(57_627_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn burn() -> Weight {
-		(74_443_000 as Weight)
+		(58_615_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn transfer() -> Weight {
-		(54_690_000 as Weight)
+		(43_335_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn redeposit(i: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((34_624_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 13_000
+			.saturating_add((26_322_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(i as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	fn freeze() -> Weight {
-		(39_505_000 as Weight)
+		(31_020_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn thaw() -> Weight {
-		(38_844_000 as Weight)
+		(31_012_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn freeze_class() -> Weight {
-		(28_739_000 as Weight)
+		(22_761_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn thaw_class() -> Weight {
-		(28_963_000 as Weight)
+		(22_789_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn transfer_ownership() -> Weight {
-		(65_160_000 as Weight)
+		(50_779_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn set_team() -> Weight {
-		(30_000_000 as Weight)
+		(24_045_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_asset_status() -> Weight {
-		(29_145_000 as Weight)
+		(22_925_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_attribute() -> Weight {
-		(88_923_000 as Weight)
+		(70_416_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn clear_attribute() -> Weight {
-		(79_878_000 as Weight)
+		(64_640_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn set_metadata() -> Weight {
-		(67_110_000 as Weight)
+		(53_229_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn clear_metadata() -> Weight {
-		(66_191_000 as Weight)
+		(52_145_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn set_class_metadata() -> Weight {
-		(65_558_000 as Weight)
+		(51_556_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn clear_class_metadata() -> Weight {
-		(60_135_000 as Weight)
+		(47_314_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn approve_transfer() -> Weight {
-		(40_337_000 as Weight)
+		(32_946_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn cancel_approval() -> Weight {
-		(40_770_000 as Weight)
+		(32_328_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -200,23 +200,23 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn create() -> Weight {
-		(55_264_000 as Weight)
+		(43_219_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_create() -> Weight {
-		(28_173_000 as Weight)
+		(21_919_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn destroy(n: u32, m: u32, a: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 32_000
-			.saturating_add((23_077_000 as Weight).saturating_mul(n as Weight))
-			// Standard Error: 32_000
-			.saturating_add((1_723_000 as Weight).saturating_mul(m as Weight))
-			// Standard Error: 32_000
-			.saturating_add((1_534_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 13_000
+			.saturating_add((16_619_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 13_000
+			.saturating_add((967_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 13_000
+			.saturating_add((834_000 as Weight).saturating_mul(a as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
@@ -225,101 +225,101 @@ impl WeightInfo for () {
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(a as Weight)))
 	}
 	fn mint() -> Weight {
-		(73_250_000 as Weight)
+		(57_627_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn burn() -> Weight {
-		(74_443_000 as Weight)
+		(58_615_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn transfer() -> Weight {
-		(54_690_000 as Weight)
+		(43_335_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn redeposit(i: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((34_624_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 13_000
+			.saturating_add((26_322_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(i as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	fn freeze() -> Weight {
-		(39_505_000 as Weight)
+		(31_020_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn thaw() -> Weight {
-		(38_844_000 as Weight)
+		(31_012_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn freeze_class() -> Weight {
-		(28_739_000 as Weight)
+		(22_761_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn thaw_class() -> Weight {
-		(28_963_000 as Weight)
+		(22_789_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn transfer_ownership() -> Weight {
-		(65_160_000 as Weight)
+		(50_779_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn set_team() -> Weight {
-		(30_000_000 as Weight)
+		(24_045_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_asset_status() -> Weight {
-		(29_145_000 as Weight)
+		(22_925_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_attribute() -> Weight {
-		(88_923_000 as Weight)
+		(70_416_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn clear_attribute() -> Weight {
-		(79_878_000 as Weight)
+		(64_640_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn set_metadata() -> Weight {
-		(67_110_000 as Weight)
+		(53_229_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn clear_metadata() -> Weight {
-		(66_191_000 as Weight)
+		(52_145_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn set_class_metadata() -> Weight {
-		(65_558_000 as Weight)
+		(51_556_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn clear_class_metadata() -> Weight {
-		(60_135_000 as Weight)
+		(47_314_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn approve_transfer() -> Weight {
-		(40_337_000 as Weight)
+		(32_946_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn cancel_approval() -> Weight {
-		(40_770_000 as Weight)
+		(32_328_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
diff --git a/frame/utility/src/weights.rs b/frame/utility/src/weights.rs
index dd4981cf32da..0bab97201008 100644
--- a/frame/utility/src/weights.rs
+++ b/frame/utility/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_utility
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-03, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -53,33 +53,33 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn batch(c: u32, ) -> Weight {
-		(19_099_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((640_000 as Weight).saturating_mul(c as Weight))
+		(14_618_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((610_000 as Weight).saturating_mul(c as Weight))
 	}
 	fn as_derivative() -> Weight {
-		(3_701_000 as Weight)
+		(3_175_000 as Weight)
 	}
 	fn batch_all(c: u32, ) -> Weight {
-		(19_199_000 as Weight)
+		(14_561_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((1_061_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((1_013_000 as Weight).saturating_mul(c as Weight))
 	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn batch(c: u32, ) -> Weight {
-		(19_099_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((640_000 as Weight).saturating_mul(c as Weight))
+		(14_618_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((610_000 as Weight).saturating_mul(c as Weight))
 	}
 	fn as_derivative() -> Weight {
-		(3_701_000 as Weight)
+		(3_175_000 as Weight)
 	}
 	fn batch_all(c: u32, ) -> Weight {
-		(19_199_000 as Weight)
+		(14_561_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((1_061_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((1_013_000 as Weight).saturating_mul(c as Weight))
 	}
 }
diff --git a/frame/vesting/src/weights.rs b/frame/vesting/src/weights.rs
index 1e44474fbc97..053453d757f3 100644
--- a/frame/vesting/src/weights.rs
+++ b/frame/vesting/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Weights for pallet_vesting
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! Autogenerated weights for pallet_vesting
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -49,100 +50,97 @@ pub trait WeightInfo {
 	fn vest_other_unlocked(l: u32, ) -> Weight;
 	fn vested_transfer(l: u32, ) -> Weight;
 	fn force_vested_transfer(l: u32, ) -> Weight;
-
 }
 
 /// Weights for pallet_vesting using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn vest_locked(l: u32, ) -> Weight {
-		(57_472_000 as Weight)
-			.saturating_add((155_000 as Weight).saturating_mul(l as Weight))
+		(42_905_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((232_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-
 	}
 	fn vest_unlocked(l: u32, ) -> Weight {
-		(61_681_000 as Weight)
-			.saturating_add((138_000 as Weight).saturating_mul(l as Weight))
+		(45_650_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((215_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-
 	}
 	fn vest_other_locked(l: u32, ) -> Weight {
-		(56_910_000 as Weight)
-			.saturating_add((160_000 as Weight).saturating_mul(l as Weight))
+		(42_273_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((246_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-
 	}
 	fn vest_other_unlocked(l: u32, ) -> Weight {
-		(61_319_000 as Weight)
-			.saturating_add((144_000 as Weight).saturating_mul(l as Weight))
+		(45_324_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((214_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-
 	}
 	fn vested_transfer(l: u32, ) -> Weight {
-		(124_996_000 as Weight)
-			.saturating_add((209_000 as Weight).saturating_mul(l as Weight))
+		(96_661_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((211_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-
 	}
 	fn force_vested_transfer(l: u32, ) -> Weight {
-		(123_911_000 as Weight)
-			.saturating_add((213_000 as Weight).saturating_mul(l as Weight))
+		(98_812_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((139_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
-
 	}
-
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn vest_locked(l: u32, ) -> Weight {
-		(57_472_000 as Weight)
-			.saturating_add((155_000 as Weight).saturating_mul(l as Weight))
+		(42_905_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((232_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-
 	}
 	fn vest_unlocked(l: u32, ) -> Weight {
-		(61_681_000 as Weight)
-			.saturating_add((138_000 as Weight).saturating_mul(l as Weight))
+		(45_650_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((215_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-
 	}
 	fn vest_other_locked(l: u32, ) -> Weight {
-		(56_910_000 as Weight)
-			.saturating_add((160_000 as Weight).saturating_mul(l as Weight))
+		(42_273_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((246_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-
 	}
 	fn vest_other_unlocked(l: u32, ) -> Weight {
-		(61_319_000 as Weight)
-			.saturating_add((144_000 as Weight).saturating_mul(l as Weight))
+		(45_324_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((214_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
-
 	}
 	fn vested_transfer(l: u32, ) -> Weight {
-		(124_996_000 as Weight)
-			.saturating_add((209_000 as Weight).saturating_mul(l as Weight))
+		(96_661_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((211_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
-
 	}
 	fn force_vested_transfer(l: u32, ) -> Weight {
-		(123_911_000 as Weight)
-			.saturating_add((213_000 as Weight).saturating_mul(l as Weight))
+		(98_812_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((139_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
-
 	}
-
 }

From abbe24e270b4aaa52a5ef8209e6caefa377612dc Mon Sep 17 00:00:00 2001
From: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
Date: Mon, 21 Jun 2021 15:12:58 +0200
Subject: [PATCH 0901/1194] fix some failing ui tests (#9157)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix some failing ui tests

* Update frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr

* Update frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr

* fix ui test

* fix ui test

* TRYBUILD=overwrite cargo test --workspace -- ui

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: thiolliere <gui.thiolliere@gmail.com>
---
 .../call_argument_invalid_bound.stderr        | 22 +++---
 .../call_argument_invalid_bound_2.stderr      | 74 +++++++++----------
 .../call_argument_invalid_bound_3.stderr      | 18 ++---
 .../pallet_ui/event_field_not_member.stderr   | 16 ++--
 .../storage_info_unsatisfied_nmap.stderr      |  4 +-
 .../tests/max_encoded_len_ui/union.stderr     |  4 +-
 .../ui/impl_incorrect_method_signature.stderr | 17 ++++-
 .../tests/ui/mock_only_self_reference.stderr  | 24 +++++-
 ...reference_in_impl_runtime_apis_call.stderr | 17 ++++-
 9 files changed, 121 insertions(+), 75 deletions(-)

diff --git a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.stderr b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.stderr
index ead05261b193..d32d8ada7a11 100644
--- a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.stderr
+++ b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.stderr
@@ -1,13 +1,12 @@
-error[E0369]: binary operation `==` cannot be applied to type `&<T as pallet::Config>::Bar`
+error[E0277]: `<T as pallet::Config>::Bar` doesn't implement `std::fmt::Debug`
   --> $DIR/call_argument_invalid_bound.rs:20:41
    |
 20 |         pub fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
-   |                                               ^
-   |
-help: consider further restricting this bound
+   |                                               ^ `<T as pallet::Config>::Bar` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
    |
-17 |     #[pallet::call + std::cmp::PartialEq]
-   |                    ^^^^^^^^^^^^^^^^^^^^^
+   = help: the trait `std::fmt::Debug` is not implemented for `<T as pallet::Config>::Bar`
+   = note: required because of the requirements on the impl of `std::fmt::Debug` for `&<T as pallet::Config>::Bar`
+   = note: required for the cast to the object type `dyn std::fmt::Debug`
 
 error[E0277]: the trait bound `<T as pallet::Config>::Bar: Clone` is not satisfied
   --> $DIR/call_argument_invalid_bound.rs:20:41
@@ -17,12 +16,13 @@ error[E0277]: the trait bound `<T as pallet::Config>::Bar: Clone` is not satisfi
    |
    = note: required by `clone`
 
-error[E0277]: `<T as pallet::Config>::Bar` doesn't implement `std::fmt::Debug`
+error[E0369]: binary operation `==` cannot be applied to type `&<T as pallet::Config>::Bar`
   --> $DIR/call_argument_invalid_bound.rs:20:41
    |
 20 |         pub fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
-   |                                               ^ `<T as pallet::Config>::Bar` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
+   |                                               ^
    |
-   = help: the trait `std::fmt::Debug` is not implemented for `<T as pallet::Config>::Bar`
-   = note: required because of the requirements on the impl of `std::fmt::Debug` for `&<T as pallet::Config>::Bar`
-   = note: required for the cast to the object type `dyn std::fmt::Debug`
+help: consider further restricting this bound
+   |
+17 |     #[pallet::call + std::cmp::PartialEq]
+   |                    ^^^^^^^^^^^^^^^^^^^^^
diff --git a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr
index 2a3bbe1abf4c..bad37153de7c 100644
--- a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr
+++ b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr
@@ -1,39 +1,12 @@
-error[E0277]: the trait bound `<T as pallet::Config>::Bar: WrapperTypeDecode` is not satisfied
-   --> $DIR/call_argument_invalid_bound_2.rs:20:41
-    |
-20  |         pub fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
-    |                                               ^ the trait `WrapperTypeDecode` is not implemented for `<T as pallet::Config>::Bar`
-    |
-   ::: /usr/local/cargo/registry/src/github.com-1ecc6299db9ec823/parity-scale-codec-2.1.1/src/codec.rs:277:18
-    |
-277 |     fn decode<I: Input>(input: &mut I) -> Result<Self, Error>;
-    |                  ----- required by this bound in `pallet::_::_parity_scale_codec::Decode::decode`
-    |
-    = note: required because of the requirements on the impl of `Decode` for `<T as pallet::Config>::Bar`
-
-error[E0277]: the trait bound `<T as pallet::Config>::Bar: WrapperTypeEncode` is not satisfied
-   --> $DIR/call_argument_invalid_bound_2.rs:20:41
-    |
-20  |         pub fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
-    |                                               ^ the trait `WrapperTypeEncode` is not implemented for `<T as pallet::Config>::Bar`
-    |
-   ::: /usr/local/cargo/registry/src/github.com-1ecc6299db9ec823/parity-scale-codec-2.1.1/src/codec.rs:216:21
-    |
-216 |     fn encode_to<T: Output + ?Sized>(&self, dest: &mut T) {
-    |                     ------ required by this bound in `encode_to`
-    |
-    = note: required because of the requirements on the impl of `pallet::_::_parity_scale_codec::Encode` for `<T as pallet::Config>::Bar`
-
-error[E0369]: binary operation `==` cannot be applied to type `&<T as pallet::Config>::Bar`
+error[E0277]: `<T as pallet::Config>::Bar` doesn't implement `std::fmt::Debug`
   --> $DIR/call_argument_invalid_bound_2.rs:20:41
    |
 20 |         pub fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
-   |                                               ^
-   |
-help: consider further restricting this bound
+   |                                               ^ `<T as pallet::Config>::Bar` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
    |
-17 |     #[pallet::call + std::cmp::PartialEq]
-   |                    ^^^^^^^^^^^^^^^^^^^^^
+   = help: the trait `std::fmt::Debug` is not implemented for `<T as pallet::Config>::Bar`
+   = note: required because of the requirements on the impl of `std::fmt::Debug` for `&<T as pallet::Config>::Bar`
+   = note: required for the cast to the object type `dyn std::fmt::Debug`
 
 error[E0277]: the trait bound `<T as pallet::Config>::Bar: Clone` is not satisfied
   --> $DIR/call_argument_invalid_bound_2.rs:20:41
@@ -43,12 +16,39 @@ error[E0277]: the trait bound `<T as pallet::Config>::Bar: Clone` is not satisfi
    |
    = note: required by `clone`
 
-error[E0277]: `<T as pallet::Config>::Bar` doesn't implement `std::fmt::Debug`
+error[E0369]: binary operation `==` cannot be applied to type `&<T as pallet::Config>::Bar`
   --> $DIR/call_argument_invalid_bound_2.rs:20:41
    |
 20 |         pub fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
-   |                                               ^ `<T as pallet::Config>::Bar` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
+   |                                               ^
    |
-   = help: the trait `std::fmt::Debug` is not implemented for `<T as pallet::Config>::Bar`
-   = note: required because of the requirements on the impl of `std::fmt::Debug` for `&<T as pallet::Config>::Bar`
-   = note: required for the cast to the object type `dyn std::fmt::Debug`
+help: consider further restricting this bound
+   |
+17 |     #[pallet::call + std::cmp::PartialEq]
+   |                    ^^^^^^^^^^^^^^^^^^^^^
+
+error[E0277]: the trait bound `<T as pallet::Config>::Bar: WrapperTypeEncode` is not satisfied
+   --> $DIR/call_argument_invalid_bound_2.rs:20:41
+    |
+20  |         pub fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
+    |                                               ^ the trait `WrapperTypeEncode` is not implemented for `<T as pallet::Config>::Bar`
+    |
+   ::: /usr/local/cargo/registry/src/github.com-1ecc6299db9ec823/parity-scale-codec-2.1.1/src/codec.rs:216:21
+    |
+216 |     fn encode_to<T: Output + ?Sized>(&self, dest: &mut T) {
+    |                     ------ required by this bound in `encode_to`
+    |
+    = note: required because of the requirements on the impl of `pallet::_::_parity_scale_codec::Encode` for `<T as pallet::Config>::Bar`
+
+error[E0277]: the trait bound `<T as pallet::Config>::Bar: WrapperTypeDecode` is not satisfied
+   --> $DIR/call_argument_invalid_bound_2.rs:20:41
+    |
+20  |         pub fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
+    |                                               ^ the trait `WrapperTypeDecode` is not implemented for `<T as pallet::Config>::Bar`
+    |
+   ::: /usr/local/cargo/registry/src/github.com-1ecc6299db9ec823/parity-scale-codec-2.1.1/src/codec.rs:277:18
+    |
+277 |     fn decode<I: Input>(input: &mut I) -> Result<Self, Error>;
+    |                  ----- required by this bound in `pallet::_::_parity_scale_codec::Decode::decode`
+    |
+    = note: required because of the requirements on the impl of `Decode` for `<T as pallet::Config>::Bar`
diff --git a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.stderr b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.stderr
index 73c3069719ea..b6f4494033f7 100644
--- a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.stderr
+++ b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.stderr
@@ -1,10 +1,13 @@
-error[E0369]: binary operation `==` cannot be applied to type `&Bar`
+error[E0277]: `Bar` doesn't implement `std::fmt::Debug`
   --> $DIR/call_argument_invalid_bound_3.rs:22:41
    |
 22 |         pub fn foo(origin: OriginFor<T>, bar: Bar) -> DispatchResultWithPostInfo {
-   |                                               ^^^
+   |                                               ^^^ `Bar` cannot be formatted using `{:?}`
    |
-   = note: an implementation of `std::cmp::PartialEq` might be missing for `&Bar`
+   = help: the trait `std::fmt::Debug` is not implemented for `Bar`
+   = note: add `#[derive(Debug)]` or manually implement `std::fmt::Debug`
+   = note: required because of the requirements on the impl of `std::fmt::Debug` for `&Bar`
+   = note: required for the cast to the object type `dyn std::fmt::Debug`
 
 error[E0277]: the trait bound `Bar: Clone` is not satisfied
   --> $DIR/call_argument_invalid_bound_3.rs:22:41
@@ -14,13 +17,10 @@ error[E0277]: the trait bound `Bar: Clone` is not satisfied
    |
    = note: required by `clone`
 
-error[E0277]: `Bar` doesn't implement `std::fmt::Debug`
+error[E0369]: binary operation `==` cannot be applied to type `&Bar`
   --> $DIR/call_argument_invalid_bound_3.rs:22:41
    |
 22 |         pub fn foo(origin: OriginFor<T>, bar: Bar) -> DispatchResultWithPostInfo {
-   |                                               ^^^ `Bar` cannot be formatted using `{:?}`
+   |                                               ^^^
    |
-   = help: the trait `std::fmt::Debug` is not implemented for `Bar`
-   = note: add `#[derive(Debug)]` or manually implement `std::fmt::Debug`
-   = note: required because of the requirements on the impl of `std::fmt::Debug` for `&Bar`
-   = note: required for the cast to the object type `dyn std::fmt::Debug`
+   = note: an implementation of `std::cmp::PartialEq` might be missing for `&Bar`
diff --git a/frame/support/test/tests/pallet_ui/event_field_not_member.stderr b/frame/support/test/tests/pallet_ui/event_field_not_member.stderr
index 97d4db798e61..d48012a6c952 100644
--- a/frame/support/test/tests/pallet_ui/event_field_not_member.stderr
+++ b/frame/support/test/tests/pallet_ui/event_field_not_member.stderr
@@ -1,12 +1,10 @@
-error[E0277]: `<T as pallet::Config>::Bar` doesn't implement `std::fmt::Debug`
+error[E0277]: the trait bound `<T as pallet::Config>::Bar: Clone` is not satisfied
   --> $DIR/event_field_not_member.rs:23:7
    |
 23 |         B { b: T::Bar },
-   |             ^ `<T as pallet::Config>::Bar` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
+   |             ^ the trait `Clone` is not implemented for `<T as pallet::Config>::Bar`
    |
-   = help: the trait `std::fmt::Debug` is not implemented for `<T as pallet::Config>::Bar`
-   = note: required because of the requirements on the impl of `std::fmt::Debug` for `&<T as pallet::Config>::Bar`
-   = note: required for the cast to the object type `dyn std::fmt::Debug`
+   = note: required by `clone`
 
 error[E0369]: binary operation `==` cannot be applied to type `&<T as pallet::Config>::Bar`
   --> $DIR/event_field_not_member.rs:23:7
@@ -19,10 +17,12 @@ help: consider further restricting this bound
 22 |     pub enum Event<T: Config + std::cmp::PartialEq> {
    |                              ^^^^^^^^^^^^^^^^^^^^^
 
-error[E0277]: the trait bound `<T as pallet::Config>::Bar: Clone` is not satisfied
+error[E0277]: `<T as pallet::Config>::Bar` doesn't implement `std::fmt::Debug`
   --> $DIR/event_field_not_member.rs:23:7
    |
 23 |         B { b: T::Bar },
-   |             ^ the trait `Clone` is not implemented for `<T as pallet::Config>::Bar`
+   |             ^ `<T as pallet::Config>::Bar` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
    |
-   = note: required by `clone`
+   = help: the trait `std::fmt::Debug` is not implemented for `<T as pallet::Config>::Bar`
+   = note: required because of the requirements on the impl of `std::fmt::Debug` for `&<T as pallet::Config>::Bar`
+   = note: required for the cast to the object type `dyn std::fmt::Debug`
diff --git a/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.stderr b/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.stderr
index 545520124bfe..6c92423c6a7f 100644
--- a/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.stderr
+++ b/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.stderr
@@ -4,6 +4,6 @@ error[E0277]: the trait bound `Bar: MaxEncodedLen` is not satisfied
 10 |     #[pallet::generate_storage_info]
    |               ^^^^^^^^^^^^^^^^^^^^^ the trait `MaxEncodedLen` is not implemented for `Bar`
    |
-   = note: required because of the requirements on the impl of `KeyGeneratorMaxEncodedLen` for `NMapKey<frame_support::Twox64Concat, Bar>`
-   = note: required because of the requirements on the impl of `StorageInfoTrait` for `frame_support::pallet_prelude::StorageNMap<_GeneratedPrefixForStorageFoo<T>, NMapKey<frame_support::Twox64Concat, Bar>, u32>`
+   = note: required because of the requirements on the impl of `KeyGeneratorMaxEncodedLen` for `Key<frame_support::Twox64Concat, Bar>`
+   = note: required because of the requirements on the impl of `StorageInfoTrait` for `frame_support::pallet_prelude::StorageNMap<_GeneratedPrefixForStorageFoo<T>, Key<frame_support::Twox64Concat, Bar>, u32>`
    = note: required by `storage_info`
diff --git a/max-encoded-len/tests/max_encoded_len_ui/union.stderr b/max-encoded-len/tests/max_encoded_len_ui/union.stderr
index bc5519d674d9..d09a3f4673e1 100644
--- a/max-encoded-len/tests/max_encoded_len_ui/union.stderr
+++ b/max-encoded-len/tests/max_encoded_len_ui/union.stderr
@@ -1,10 +1,10 @@
-error: Union types are not supported
+error: Union types are not supported.
  --> $DIR/union.rs:5:1
   |
 5 | union Union {
   | ^^^^^
 
-error: Union types are not supported.
+error: Union types are not supported
  --> $DIR/union.rs:5:1
   |
 5 | union Union {
diff --git a/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr b/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr
index 6b00b7268672..9dd84c24b678 100644
--- a/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr
+++ b/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr
@@ -5,7 +5,10 @@ error[E0053]: method `test` has an incompatible type for trait
    |                       --- type in trait
 ...
 19 |         fn test(data: String) {}
-   |                       ^^^^^^ expected `u64`, found struct `std::string::String`
+   |                       ^^^^^^
+   |                       |
+   |                       expected `u64`, found struct `std::string::String`
+   |                       help: change the parameter type to match the trait: `u64`
    |
    = note: expected fn pointer `fn(u64)`
               found fn pointer `fn(std::string::String)`
@@ -21,7 +24,17 @@ error[E0053]: method `Api_test_runtime_api_impl` has an incompatible type for tr
    | |_- type in trait
 16 |
 17 |   sp_api::impl_runtime_apis! {
-   |   ^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `u64`, found struct `std::string::String`
+   |   -^^^^^^^^^^^^^^^^^^^^^^^^^
+   |   |
+   |  _expected `u64`, found struct `std::string::String`
+   | |
+18 | |     impl self::Api<Block> for Runtime {
+19 | |         fn test(data: String) {}
+20 | |     }
+...  |
+32 | |     }
+33 | | }
+   | |_- help: change the parameter type to match the trait: `std::option::Option<u64>`
    |
    = note: expected fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option<u64>, Vec<_>) -> Result<_, _>`
               found fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option<std::string::String>, Vec<_>) -> Result<_, _>`
diff --git a/primitives/api/test/tests/ui/mock_only_self_reference.stderr b/primitives/api/test/tests/ui/mock_only_self_reference.stderr
index 83cfcf6ca1f9..7385fe474598 100644
--- a/primitives/api/test/tests/ui/mock_only_self_reference.stderr
+++ b/primitives/api/test/tests/ui/mock_only_self_reference.stderr
@@ -22,7 +22,17 @@ error[E0053]: method `Api_test_runtime_api_impl` has an incompatible type for tr
    | |_- type in trait
 ...
 12 |   sp_api::mock_impl_runtime_apis! {
-   |   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `u64`, found `()`
+   |   -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |   |
+   |  _expected `u64`, found `()`
+   | |
+13 | |     impl Api<Block> for MockApi {
+14 | |         fn test(self, data: u64) {}
+15 | |
+16 | |         fn test2(&mut self, data: u64) {}
+17 | |     }
+18 | | }
+   | |_- help: change the parameter type to match the trait: `Option<u64>`
    |
    = note: expected fn pointer `fn(&MockApi, &BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, Extrinsic>>, ExecutionContext, Option<u64>, Vec<_>) -> Result<_, _>`
               found fn pointer `fn(&MockApi, &BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, Extrinsic>>, ExecutionContext, Option<()>, Vec<_>) -> Result<_, _>`
@@ -40,7 +50,17 @@ error[E0053]: method `Api_test2_runtime_api_impl` has an incompatible type for t
    | |_- type in trait
 ...
 12 |   sp_api::mock_impl_runtime_apis! {
-   |   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `u64`, found `()`
+   |   -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |   |
+   |  _expected `u64`, found `()`
+   | |
+13 | |     impl Api<Block> for MockApi {
+14 | |         fn test(self, data: u64) {}
+15 | |
+16 | |         fn test2(&mut self, data: u64) {}
+17 | |     }
+18 | | }
+   | |_- help: change the parameter type to match the trait: `Option<u64>`
    |
    = note: expected fn pointer `fn(&MockApi, &BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, Extrinsic>>, ExecutionContext, Option<u64>, Vec<_>) -> Result<_, _>`
               found fn pointer `fn(&MockApi, &BlockId<sp_runtime::generic::block::Block<sp_runtime::generic::header::Header<u64, sp_runtime::traits::BlakeTwo256>, Extrinsic>>, ExecutionContext, Option<()>, Vec<_>) -> Result<_, _>`
diff --git a/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr b/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr
index 689723f8d750..a0a16c4a493d 100644
--- a/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr
+++ b/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr
@@ -5,7 +5,10 @@ error[E0053]: method `test` has an incompatible type for trait
    |                       --- type in trait
 ...
 19 |         fn test(data: &u64) {
-   |                       ^^^^ expected `u64`, found `&u64`
+   |                       ^^^^
+   |                       |
+   |                       expected `u64`, found `&u64`
+   |                       help: change the parameter type to match the trait: `u64`
    |
    = note: expected fn pointer `fn(u64)`
               found fn pointer `fn(&u64)`
@@ -21,7 +24,17 @@ error[E0053]: method `Api_test_runtime_api_impl` has an incompatible type for tr
    | |_- type in trait
 16 |
 17 |   sp_api::impl_runtime_apis! {
-   |   ^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `u64`, found `&u64`
+   |   -^^^^^^^^^^^^^^^^^^^^^^^^^
+   |   |
+   |  _expected `u64`, found `&u64`
+   | |
+18 | |     impl self::Api<Block> for Runtime {
+19 | |         fn test(data: &u64) {
+20 | |             unimplemented!()
+...  |
+34 | |     }
+35 | | }
+   | |_- help: change the parameter type to match the trait: `std::option::Option<u64>`
    |
    = note: expected fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option<u64>, Vec<_>) -> Result<_, _>`
               found fn pointer `fn(&RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall>, &BlockId<__SR_API_BLOCK__>, ExecutionContext, std::option::Option<&u64>, Vec<_>) -> Result<_, _>`

From df4a58833a650cf37fc97764bf6c9314435e3cb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Mon, 21 Jun 2021 17:02:08 +0100
Subject: [PATCH 0902/1194] grandpa: don't use block_on in
 Environment::report_equivocation (#9154)

* grandpa: don't use block_on in Environment::report_equivocation

* grandpa: add issue number to todo
---
 client/finality-grandpa/src/environment.rs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/client/finality-grandpa/src/environment.rs b/client/finality-grandpa/src/environment.rs
index 77c7ccda7daf..964e199f9096 100644
--- a/client/finality-grandpa/src/environment.rs
+++ b/client/finality-grandpa/src/environment.rs
@@ -503,19 +503,19 @@ where
 
 		let is_descendent_of = is_descendent_of(&*self.client, None);
 
-		// TODO: add proper async support here
-		let best_header = futures::executor::block_on(
-			self.select_chain
-				.best_chain()
-				.map_err(|e| Error::Blockchain(e.to_string())),
-		)?;
+		let (best_block_hash, best_block_number) = {
+			// TODO [#9158]: Use SelectChain::best_chain() to get a potentially
+			// more accurate best block
+			let info = self.client.info();
+			(info.best_hash, info.best_number)
+		};
 
 		let authority_set = self.authority_set.inner();
 
 		// block hash and number of the next pending authority set change in the
 		// given best chain.
 		let next_change = authority_set
-			.next_change(&best_header.hash(), &is_descendent_of)
+			.next_change(&best_block_hash, &is_descendent_of)
 			.map_err(|e| Error::Safety(e.to_string()))?;
 
 		// find the hash of the latest block in the current set
@@ -528,7 +528,7 @@ where
 			// the next set starts at `n` so the current one lasts until `n - 1`. if
 			// `n` is later than the best block, then the current set is still live
 			// at best block.
-			Some((_, n)) if n > *best_header.number() => best_header.hash(),
+			Some((_, n)) if n > best_block_number => best_block_hash,
 			Some((h, _)) => {
 				// this is the header at which the new set will start
 				let header = self.client.header(BlockId::Hash(h))?.expect(
@@ -541,7 +541,7 @@ where
 			}
 			// there is no pending change, the latest block for the current set is
 			// the best block.
-			None => best_header.hash(),
+			None => best_block_hash,
 		};
 
 		// generate key ownership proof at that block
@@ -570,7 +570,7 @@ where
 		self.client
 			.runtime_api()
 			.submit_report_equivocation_unsigned_extrinsic(
-				&BlockId::Hash(best_header.hash()),
+				&BlockId::Hash(best_block_hash),
 				equivocation_proof,
 				key_owner_proof,
 			)

From 97338fc60fdfcf647ba62e108d373e96acafb9c2 Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Tue, 22 Jun 2021 11:32:43 +0200
Subject: [PATCH 0903/1194] Fast sync (#8884)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* State sync

* Importing state fixes

* Bugfixes

* Sync with proof

* Status reporting

* Unsafe sync mode

* Sync test

* Cleanup

* Apply suggestions from code review

Co-authored-by: cheme <emericchevalier.pro@gmail.com>
Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>

* set_genesis_storage

* Extract keys from range proof

* Detect iter completion

* Download and import bodies with fast sync

* Replaced meta updates tuple with a struct

* Fixed reverting finalized state

* Reverted timeout

* Typo

* Doc

* Doc

* Fixed light client test

* Fixed error handling

* Tweaks

* More UpdateMeta changes

* Rename convert_transaction

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Code review suggestions

* Fixed count handling

Co-authored-by: cheme <emericchevalier.pro@gmail.com>
Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 Cargo.lock                                    |   5 +-
 client/api/src/backend.rs                     |   5 +
 client/api/src/in_mem.rs                      |  57 ++-
 client/api/src/lib.rs                         |   1 +
 client/api/src/proof_provider.rs              |  27 ++
 .../authority-discovery/src/worker/tests.rs   |   1 +
 client/cli/src/arg_enums.rs                   |  24 +
 client/cli/src/params/network_params.rs       |   9 +
 client/consensus/aura/src/lib.rs              |   6 +-
 client/consensus/babe/src/lib.rs              |  12 +-
 .../consensus/manual-seal/src/seal_block.rs   |   6 +-
 client/consensus/pow/src/worker.rs            |   7 +-
 client/db/src/bench.rs                        |  12 +
 client/db/src/lib.rs                          | 454 +++++++++++++-----
 client/db/src/light.rs                        |   7 +-
 client/db/src/storage_cache.rs                |  22 +
 client/db/src/utils.rs                        |  14 +-
 client/finality-grandpa/src/import.rs         |   6 +-
 client/informant/src/display.rs               |  17 +-
 client/light/src/backend.rs                   |  26 +-
 client/network/src/behaviour.rs               |  25 +-
 client/network/src/chain.rs                   |   1 +
 client/network/src/config.rs                  |  30 ++
 client/network/src/gossip/tests.rs            |  12 +
 client/network/src/lib.rs                     |   6 +-
 client/network/src/protocol.rs                | 157 ++++--
 client/network/src/protocol/sync.rs           | 328 ++++++++++---
 client/network/src/protocol/sync/state.rs     | 187 ++++++++
 client/network/src/schema/api.v1.proto        |  25 +
 client/network/src/service.rs                 |  14 +-
 client/network/src/service/tests.rs           |  12 +
 client/network/src/state_request_handler.rs   | 246 ++++++++++
 client/network/test/src/block_import.rs       |   2 +
 client/network/test/src/lib.rs                |  45 +-
 client/network/test/src/sync.rs               |  40 ++
 client/service/Cargo.toml                     |   1 +
 client/service/src/builder.rs                 |  22 +-
 client/service/src/chain_ops/import_blocks.rs |   2 +
 client/service/src/client/client.rs           | 223 ++++++---
 client/service/test/src/client/light.rs       |   2 +-
 primitives/blockchain/src/backend.rs          |   4 +-
 primitives/blockchain/src/error.rs            |   4 +-
 .../consensus/common/src/block_import.rs      |  65 ++-
 .../consensus/common/src/import_queue.rs      |  18 +-
 .../common/src/import_queue/basic_queue.rs    |   2 +
 primitives/consensus/common/src/lib.rs        |   3 +-
 primitives/runtime/src/generic/block.rs       |  13 +
 primitives/state-machine/src/backend.rs       |  16 +
 primitives/state-machine/src/lib.rs           | 146 +++++-
 .../src/overlayed_changes/mod.rs              |   2 +-
 .../state-machine/src/proving_backend.rs      |  19 +
 primitives/state-machine/src/trie_backend.rs  |  11 +
 .../state-machine/src/trie_backend_essence.rs |  81 +++-
 test-utils/client/src/lib.rs                  |   9 +
 54 files changed, 2120 insertions(+), 371 deletions(-)
 create mode 100644 client/network/src/protocol/sync/state.rs
 create mode 100644 client/network/src/state_request_handler.rs

diff --git a/Cargo.lock b/Cargo.lock
index a33cb02f7f0d..ffcf95820342 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8022,6 +8022,7 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-state-machine",
+ "sp-storage",
  "sp-tracing",
  "sp-transaction-pool",
  "sp-transaction-storage-proof",
@@ -10551,9 +10552,9 @@ dependencies = [
 
 [[package]]
 name = "trie-db"
-version = "0.22.3"
+version = "0.22.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec051edf7f0fc9499a2cb0947652cab2148b9d7f61cee7605e312e9f970dacaf"
+checksum = "cd81fe0c8bc2b528a51c9d2c31dae4483367a26a723a3c9a4a8120311d7774e3"
 dependencies = [
  "hash-db",
  "hashbrown",
diff --git a/client/api/src/backend.rs b/client/api/src/backend.rs
index 09e9e0cb2e17..1f1ad13067b3 100644
--- a/client/api/src/backend.rs
+++ b/client/api/src/backend.rs
@@ -41,6 +41,7 @@ use sp_consensus::BlockOrigin;
 use parking_lot::RwLock;
 
 pub use sp_state_machine::Backend as StateBackend;
+pub use sp_consensus::ImportedState;
 use std::marker::PhantomData;
 
 /// Extracts the state backend type for the given backend.
@@ -161,6 +162,10 @@ pub trait BlockImportOperation<Block: BlockT> {
 		update: TransactionForSB<Self::State, Block>,
 	) -> sp_blockchain::Result<()>;
 
+	/// Set genesis state. If `commit` is `false` the state is saved in memory, but is not written
+	/// to the database.
+	fn set_genesis_state(&mut self, storage: Storage, commit: bool) -> sp_blockchain::Result<Block::Hash>;
+
 	/// Inject storage data into the database replacing any existing data.
 	fn reset_storage(&mut self, storage: Storage) -> sp_blockchain::Result<Block::Hash>;
 
diff --git a/client/api/src/in_mem.rs b/client/api/src/in_mem.rs
index 0d40bb3354cc..916b830f6189 100644
--- a/client/api/src/in_mem.rs
+++ b/client/api/src/in_mem.rs
@@ -347,6 +347,11 @@ impl<Block: BlockT> HeaderBackend<Block> for Blockchain<Block> {
 			genesis_hash: storage.genesis_hash,
 			finalized_hash: storage.finalized_hash,
 			finalized_number: storage.finalized_number,
+			finalized_state: if storage.finalized_hash != Default::default() {
+				Some((storage.finalized_hash.clone(), storage.finalized_number))
+			} else {
+				None
+			},
 			number_leaves: storage.leaves.count()
 		}
 	}
@@ -528,6 +533,32 @@ pub struct BlockImportOperation<Block: BlockT> {
 	set_head: Option<BlockId<Block>>,
 }
 
+impl<Block: BlockT> BlockImportOperation<Block> where
+	Block::Hash: Ord,
+{
+	fn apply_storage(&mut self, storage: Storage, commit: bool) -> sp_blockchain::Result<Block::Hash> {
+		check_genesis_storage(&storage)?;
+
+		let child_delta = storage.children_default.iter()
+			.map(|(_storage_key, child_content)|
+				(
+					&child_content.child_info,
+					child_content.data.iter().map(|(k, v)| (k.as_ref(), Some(v.as_ref())))
+				)
+			);
+
+		let (root, transaction) = self.old_state.full_storage_root(
+			storage.top.iter().map(|(k, v)| (k.as_ref(), Some(v.as_ref()))),
+			child_delta,
+		);
+
+		if commit {
+			self.new_state = Some(transaction);
+		}
+		Ok(root)
+	}
+}
+
 impl<Block: BlockT> backend::BlockImportOperation<Block> for BlockImportOperation<Block> where
 	Block::Hash: Ord,
 {
@@ -569,24 +600,12 @@ impl<Block: BlockT> backend::BlockImportOperation<Block> for BlockImportOperatio
 		Ok(())
 	}
 
-	fn reset_storage(&mut self, storage: Storage) -> sp_blockchain::Result<Block::Hash> {
-		check_genesis_storage(&storage)?;
-
-		let child_delta = storage.children_default.iter()
-			.map(|(_storage_key, child_content)|
-				 (
-					 &child_content.child_info,
-					 child_content.data.iter().map(|(k, v)| (k.as_ref(), Some(v.as_ref())))
-				 )
-			);
-
-		let (root, transaction) = self.old_state.full_storage_root(
-			storage.top.iter().map(|(k, v)| (k.as_ref(), Some(v.as_ref()))),
-			child_delta,
-		);
+	fn set_genesis_state(&mut self, storage: Storage, commit: bool) -> sp_blockchain::Result<Block::Hash> {
+		self.apply_storage(storage, commit)
+	}
 
-		self.new_state = Some(transaction);
-		Ok(root)
+	fn reset_storage(&mut self, storage: Storage) -> sp_blockchain::Result<Block::Hash> {
+		self.apply_storage(storage, true)
 	}
 
 	fn insert_aux<I>(&mut self, ops: I) -> sp_blockchain::Result<()>
@@ -806,12 +825,12 @@ impl<Block: BlockT> backend::RemoteBackend<Block> for Backend<Block> where Block
 /// Check that genesis storage is valid.
 pub fn check_genesis_storage(storage: &Storage) -> sp_blockchain::Result<()> {
 	if storage.top.iter().any(|(k, _)| well_known_keys::is_child_storage_key(k)) {
-		return Err(sp_blockchain::Error::GenesisInvalid.into());
+		return Err(sp_blockchain::Error::InvalidState.into());
 	}
 
 	if storage.children_default.keys()
 		.any(|child_key| !well_known_keys::is_child_storage_key(&child_key)) {
-			return Err(sp_blockchain::Error::GenesisInvalid.into());
+			return Err(sp_blockchain::Error::InvalidState.into());
 	}
 
 	Ok(())
diff --git a/client/api/src/lib.rs b/client/api/src/lib.rs
index f3cef0e36ff4..71cf499f7994 100644
--- a/client/api/src/lib.rs
+++ b/client/api/src/lib.rs
@@ -41,6 +41,7 @@ pub use proof_provider::*;
 pub use sp_blockchain::HeaderBackend;
 
 pub use sp_state_machine::{StorageProof, ExecutionStrategy};
+pub use sp_storage::{StorageData, StorageKey, PrefixedStorageKey, ChildInfo};
 
 /// Usage Information Provider interface
 ///
diff --git a/client/api/src/proof_provider.rs b/client/api/src/proof_provider.rs
index a0dbcf1d1e80..0e9fd5318ba9 100644
--- a/client/api/src/proof_provider.rs
+++ b/client/api/src/proof_provider.rs
@@ -70,4 +70,31 @@ pub trait ProofProvider<Block: BlockT> {
 		storage_key: Option<&PrefixedStorageKey>,
 		key: &StorageKey,
 	) -> sp_blockchain::Result<ChangesProof<Block::Header>>;
+
+	/// Given a `BlockId` iterate over all storage values starting at `start_key` exclusively,
+	/// building proofs until size limit is reached. Returns combined proof and the number of collected keys.
+	fn read_proof_collection(
+		&self,
+		id: &BlockId<Block>,
+		start_key: &[u8],
+		size_limit: usize,
+	) -> sp_blockchain::Result<(StorageProof, u32)>;
+
+	/// Given a `BlockId` iterate over all storage values starting at `start_key`.
+	/// Returns collected keys and values.
+	fn storage_collection(
+		&self,
+		id: &BlockId<Block>,
+		start_key: &[u8],
+		size_limit: usize,
+	) -> sp_blockchain::Result<Vec<(Vec<u8>, Vec<u8>)>>;
+
+	/// Verify read storage proof for a set of keys.
+	/// Returns collected key-value pairs and a flag indicating if iteration is complete.
+	fn verify_range_proof(
+		&self,
+		root: Block::Hash,
+		proof: StorageProof,
+		start_key: &[u8],
+	) -> sp_blockchain::Result<(Vec<(Vec<u8>, Vec<u8>)>, bool)>;
 }
diff --git a/client/authority-discovery/src/worker/tests.rs b/client/authority-discovery/src/worker/tests.rs
index b702cd8c4008..8be23e4840bd 100644
--- a/client/authority-discovery/src/worker/tests.rs
+++ b/client/authority-discovery/src/worker/tests.rs
@@ -69,6 +69,7 @@ impl<Block: BlockT> HeaderBackend<Block> for TestApi {
 			finalized_number: Zero::zero(),
 			genesis_hash: Default::default(),
 			number_leaves: Default::default(),
+			finalized_state: None,
 		}
 	}
 
diff --git a/client/cli/src/arg_enums.rs b/client/cli/src/arg_enums.rs
index fb2f8fdbc21d..1bca67e782a3 100644
--- a/client/cli/src/arg_enums.rs
+++ b/client/cli/src/arg_enums.rs
@@ -232,6 +232,30 @@ arg_enum! {
 	}
 }
 
+arg_enum! {
+	/// Syncing mode.
+	#[allow(missing_docs)]
+	#[derive(Debug, Clone, Copy)]
+	pub enum SyncMode {
+		// Full sync. Donwnload end verify all blocks.
+		Full,
+		// Download blocks without executing them. Download latest state with proofs.
+		Fast,
+		// Download blocks without executing them. Download latest state without proofs.
+		FastUnsafe,
+	}
+}
+
+impl Into<sc_network::config::SyncMode> for SyncMode {
+	fn into(self) -> sc_network::config::SyncMode {
+		match self {
+			SyncMode::Full => sc_network::config::SyncMode::Full,
+			SyncMode::Fast => sc_network::config::SyncMode::Fast { skip_proofs: false },
+			SyncMode::FastUnsafe => sc_network::config::SyncMode::Fast { skip_proofs: true },
+		}
+	}
+}
+
 /// Default value for the `--execution-syncing` parameter.
 pub const DEFAULT_EXECUTION_SYNCING: ExecutionStrategy = ExecutionStrategy::NativeElseWasm;
 /// Default value for the `--execution-import-block` parameter.
diff --git a/client/cli/src/params/network_params.rs b/client/cli/src/params/network_params.rs
index 7549c76378be..69f4c9d1ba74 100644
--- a/client/cli/src/params/network_params.rs
+++ b/client/cli/src/params/network_params.rs
@@ -17,6 +17,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::params::node_key_params::NodeKeyParams;
+use crate::arg_enums::SyncMode;
 use sc_network::{
 	config::{NetworkConfiguration, NodeKeyConfig, NonReservedPeerMode, SetConfig, TransportConfig},
 	multiaddr::Protocol,
@@ -125,6 +126,13 @@ pub struct NetworkParams {
 	/// Join the IPFS network and serve transactions over bitswap protocol.
 	#[structopt(long)]
 	pub ipfs_server: bool,
+
+	/// Blockchain syncing mode.
+	/// Full - Download and validate full blockchain history (Default).
+	/// Fast - Download blocks and the latest state only.
+	/// FastUnsafe - Same as Fast, but do skips downloading state proofs.
+	#[structopt(long, default_value = "Full")]
+	pub sync: SyncMode,
 }
 
 impl NetworkParams {
@@ -218,6 +226,7 @@ impl NetworkParams {
 			kademlia_disjoint_query_paths: self.kademlia_disjoint_query_paths,
 			yamux_window_size: None,
 			ipfs_server: self.ipfs_server,
+			sync_mode: self.sync.into(),
 		}
 	}
 }
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index 845e920cfc11..d08ce5dfee25 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -42,7 +42,7 @@ use codec::{Encode, Decode, Codec};
 
 use sp_consensus::{
 	BlockImport, Environment, Proposer, CanAuthorWith, ForkChoiceStrategy, BlockImportParams,
-	BlockOrigin, Error as ConsensusError, SelectChain,
+	BlockOrigin, Error as ConsensusError, SelectChain, StateAction,
 };
 use sc_client_api::{backend::AuxStore, BlockOf, UsageProvider};
 use sp_blockchain::{Result as CResult, ProvideCache, HeaderBackend};
@@ -421,7 +421,9 @@ where
 			let mut import_block = BlockImportParams::new(BlockOrigin::Own, header);
 			import_block.post_digests.push(signature_digest_item);
 			import_block.body = Some(body);
-			import_block.storage_changes = Some(storage_changes);
+			import_block.state_action = StateAction::ApplyChanges(
+				sp_consensus::StorageChanges::Changes(storage_changes)
+			);
 			import_block.fork_choice = Some(ForkChoiceStrategy::LongestChain);
 
 			Ok(import_block)
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index 15d16c91f430..61b58bf1b599 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -101,6 +101,7 @@ use sp_consensus::{
 	import_queue::{BasicQueue, CacheKeyId, DefaultImportQueue, Verifier},
 	BlockCheckParams, BlockImport, BlockImportParams, BlockOrigin, Environment,
 	Error as ConsensusError, ForkChoiceStrategy, Proposer, SelectChain, SlotData,
+	StateAction,
 };
 use sp_consensus_babe::inherents::BabeInherentData;
 use sp_consensus_slots::Slot;
@@ -790,7 +791,9 @@ where
 			let mut import_block = BlockImportParams::new(BlockOrigin::Own, header);
 			import_block.post_digests.push(digest_item);
 			import_block.body = Some(body);
-			import_block.storage_changes = Some(storage_changes);
+			import_block.state_action = StateAction::ApplyChanges(
+				sp_consensus::StorageChanges::Changes(storage_changes)
+			);
 			import_block.intermediates.insert(
 				Cow::from(INTERMEDIATE_KEY),
 				Box::new(BabeIntermediate::<B> { epoch_descriptor }) as Box<_>,
@@ -1295,7 +1298,12 @@ impl<Block, Client, Inner> BlockImport<Block> for BabeBlockImport<Block, Client,
 		// early exit if block already in chain, otherwise the check for
 		// epoch changes will error when trying to re-import an epoch change
 		match self.client.status(BlockId::Hash(hash)) {
-			Ok(sp_blockchain::BlockStatus::InChain) => return Ok(ImportResult::AlreadyInChain),
+			Ok(sp_blockchain::BlockStatus::InChain) => {
+				// When re-importing existing block strip away intermediates.
+				let _ = block.take_intermediate::<BabeIntermediate<Block>>(INTERMEDIATE_KEY)?;
+				block.fork_choice = Some(ForkChoiceStrategy::Custom(false));
+				return self.inner.import_block(block, new_cache).await.map_err(Into::into)
+			},
 			Ok(sp_blockchain::BlockStatus::Unknown) => {},
 			Err(e) => return Err(ConsensusError::ClientImport(e.to_string())),
 		}
diff --git a/client/consensus/manual-seal/src/seal_block.rs b/client/consensus/manual-seal/src/seal_block.rs
index 6ddd2cb05d49..89da02ac4961 100644
--- a/client/consensus/manual-seal/src/seal_block.rs
+++ b/client/consensus/manual-seal/src/seal_block.rs
@@ -28,7 +28,7 @@ use futures::prelude::*;
 use sc_transaction_pool::txpool;
 use sp_consensus::{
 	self, BlockImport, Environment, Proposer, ForkChoiceStrategy,
-	BlockImportParams, BlockOrigin, ImportResult, SelectChain,
+	BlockImportParams, BlockOrigin, ImportResult, SelectChain, StateAction,
 };
 use sp_blockchain::HeaderBackend;
 use std::collections::HashMap;
@@ -145,7 +145,9 @@ pub async fn seal_block<B, BI, SC, C, E, P, CIDP>(
 		params.body = Some(body);
 		params.finalized = finalize;
 		params.fork_choice = Some(ForkChoiceStrategy::LongestChain);
-		params.storage_changes = Some(proposal.storage_changes);
+		params.state_action = StateAction::ApplyChanges(
+			sp_consensus::StorageChanges::Changes(proposal.storage_changes)
+		);
 
 		if let Some(digest_provider) = digest_provider {
 			digest_provider.append_block_import(&parent, &mut params, &inherent_data)?;
diff --git a/client/consensus/pow/src/worker.rs b/client/consensus/pow/src/worker.rs
index e5d76592b7fd..74fbcce81341 100644
--- a/client/consensus/pow/src/worker.rs
+++ b/client/consensus/pow/src/worker.rs
@@ -18,7 +18,8 @@
 
 use std::{pin::Pin, time::Duration, collections::HashMap, borrow::Cow};
 use sc_client_api::ImportNotifications;
-use sp_consensus::{Proposal, BlockOrigin, BlockImportParams, import_queue::BoxBlockImport};
+use sp_consensus::{Proposal, BlockOrigin, BlockImportParams, StorageChanges,
+	StateAction, import_queue::BoxBlockImport};
 use sp_runtime::{
 	generic::BlockId,
 	traits::{Block as BlockT, Header as HeaderT},
@@ -136,7 +137,9 @@ where
 			let mut import_block = BlockImportParams::new(BlockOrigin::Own, header);
 			import_block.post_digests.push(seal);
 			import_block.body = Some(body);
-			import_block.storage_changes = Some(build.proposal.storage_changes);
+			import_block.state_action = StateAction::ApplyChanges(
+				StorageChanges::Changes(build.proposal.storage_changes)
+			);
 
 			let intermediate = PowIntermediate::<Algorithm::Difficulty> {
 				difficulty: Some(build.metadata.difficulty),
diff --git a/client/db/src/bench.rs b/client/db/src/bench.rs
index 1f2f46af0079..470448df76f0 100644
--- a/client/db/src/bench.rs
+++ b/client/db/src/bench.rs
@@ -373,6 +373,18 @@ impl<B: BlockT> StateBackend<HashFor<B>> for BenchmarkingState<B> {
 		}
 	}
 
+	fn apply_to_key_values_while<F: FnMut(Vec<u8>, Vec<u8>) -> bool>(
+		&self,
+		child_info: Option<&ChildInfo>,
+		prefix: Option<&[u8]>,
+		start_at: Option<&[u8]>,
+		f: F,
+		allow_missing: bool,
+	) -> Result<bool, Self::Error> {
+		self.state.borrow().as_ref().ok_or_else(state_err)?
+			.apply_to_key_values_while(child_info, prefix, start_at, f, allow_missing)
+	}
+
 	fn apply_to_keys_while<F: FnMut(&[u8]) -> bool>(
 		&self,
 		child_info: Option<&ChildInfo>,
diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index 38b9d7a7adff..024f2e5f4e64 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -205,6 +205,17 @@ impl<B: BlockT> StateBackend<HashFor<B>> for RefTrackingState<B> {
 		self.state.for_key_values_with_prefix(prefix, f)
 	}
 
+	fn apply_to_key_values_while<F: FnMut(Vec<u8>, Vec<u8>) -> bool>(
+		&self,
+		child_info: Option<&ChildInfo>,
+		prefix: Option<&[u8]>,
+		start_at: Option<&[u8]>,
+		f: F,
+		allow_missing: bool,
+	) -> Result<bool, Self::Error> {
+		self.state.apply_to_key_values_while(child_info, prefix, start_at, f, allow_missing)
+	}
+
 	fn apply_to_keys_while<F: FnMut(&[u8]) -> bool>(
 		&self,
 		child_info: Option<&ChildInfo>,
@@ -387,6 +398,14 @@ impl<'a> sc_state_db::MetaDb for StateMetaDb<'a> {
 	}
 }
 
+struct MetaUpdate<Block: BlockT> {
+	pub hash: Block::Hash,
+	pub number: NumberFor<Block>,
+	pub is_best: bool,
+	pub is_finalized: bool,
+	pub with_state: bool,
+}
+
 fn cache_header<Hash: std::cmp::Eq + std::hash::Hash, Header>(
 	cache: &mut LinkedHashMap<Hash, Option<Header>>,
 	hash: Hash,
@@ -427,11 +446,9 @@ impl<Block: BlockT> BlockchainDb<Block> {
 
 	fn update_meta(
 		&self,
-		hash: Block::Hash,
-		number: <Block::Header as HeaderT>::Number,
-		is_best: bool,
-		is_finalized: bool
+		update: MetaUpdate<Block>,
 	) {
+		let MetaUpdate { hash, number, is_best, is_finalized, with_state } = update;
 		let mut meta = self.meta.write();
 		if number.is_zero() {
 			meta.genesis_hash = hash;
@@ -444,6 +461,9 @@ impl<Block: BlockT> BlockchainDb<Block> {
 		}
 
 		if is_finalized {
+			if with_state {
+				meta.finalized_state = Some((hash.clone(), number));
+			}
 			meta.finalized_number = number;
 			meta.finalized_hash = hash;
 		}
@@ -484,6 +504,7 @@ impl<Block: BlockT> sc_client_api::blockchain::HeaderBackend<Block> for Blockcha
 			genesis_hash: meta.genesis_hash,
 			finalized_hash: meta.finalized_hash,
 			finalized_number: meta.finalized_number,
+			finalized_state: meta.finalized_state.clone(),
 			number_leaves: self.leaves.read().count(),
 		}
 	}
@@ -754,6 +775,42 @@ impl<Block: BlockT> BlockImportOperation<Block> {
 			}
 		}
 	}
+
+	fn apply_new_state(
+		&mut self,
+		storage: Storage,
+	) -> ClientResult<Block::Hash> {
+		if storage.top.keys().any(|k| well_known_keys::is_child_storage_key(&k)) {
+			return Err(sp_blockchain::Error::InvalidState.into());
+		}
+
+		let child_delta = storage.children_default.iter().map(|(_storage_key, child_content)|(
+				&child_content.child_info,
+				child_content.data.iter().map(|(k, v)| (&k[..], Some(&v[..]))),
+		));
+
+		let mut changes_trie_config = None;
+		let (root, transaction) = self.old_state.full_storage_root(
+			storage.top.iter().map(|(k, v)| {
+				if &k[..] == well_known_keys::CHANGES_TRIE_CONFIG {
+					changes_trie_config = Some(Decode::decode(&mut &v[..]));
+				}
+				(&k[..], Some(&v[..]))
+			}),
+			child_delta
+		);
+
+		let changes_trie_config = match changes_trie_config {
+			Some(Ok(c)) => Some(c),
+			Some(Err(_)) => return Err(sp_blockchain::Error::InvalidState.into()),
+			None => None,
+		};
+
+		self.db_updates = transaction;
+		self.changes_trie_config_update = Some(changes_trie_config);
+		Ok(root)
+	}
+
 }
 
 impl<Block: BlockT> sc_client_api::backend::BlockImportOperation<Block> for BlockImportOperation<Block> {
@@ -796,35 +853,21 @@ impl<Block: BlockT> sc_client_api::backend::BlockImportOperation<Block> for Bloc
 		&mut self,
 		storage: Storage,
 	) -> ClientResult<Block::Hash> {
-		if storage.top.keys().any(|k| well_known_keys::is_child_storage_key(&k)) {
-			return Err(sp_blockchain::Error::GenesisInvalid.into());
-		}
-
-		let child_delta = storage.children_default.iter().map(|(_storage_key, child_content)|(
-			&child_content.child_info,
-			child_content.data.iter().map(|(k, v)| (&k[..], Some(&v[..]))),
-		));
-
-		let mut changes_trie_config: Option<ChangesTrieConfiguration> = None;
-		let (root, transaction) = self.old_state.full_storage_root(
-			storage.top.iter().map(|(k, v)| {
-				if &k[..] == well_known_keys::CHANGES_TRIE_CONFIG {
-					changes_trie_config = Some(
-						Decode::decode(&mut &v[..])
-							.expect("changes trie configuration is encoded properly at genesis")
-					);
-				}
-				(&k[..], Some(&v[..]))
-			}),
-			child_delta
-		);
-
-		self.db_updates = transaction;
-		self.changes_trie_config_update = Some(changes_trie_config);
+		let root = self.apply_new_state(storage)?;
 		self.commit_state = true;
 		Ok(root)
 	}
 
+	fn set_genesis_state(
+		&mut self,
+		storage: Storage,
+		commit: bool,
+	) -> ClientResult<Block::Hash> {
+		let root = self.apply_new_state(storage)?;
+		self.commit_state = commit;
+		Ok(root)
+	}
+
 	fn update_changes_trie(
 		&mut self,
 		update: ChangesTrieTransaction<HashFor<Block>, NumberFor<Block>>,
@@ -907,18 +950,39 @@ impl<Block: BlockT> sc_state_db::NodeDb for StorageDb<Block> {
 	}
 }
 
-struct DbGenesisStorage<Block: BlockT>(pub Block::Hash);
+struct DbGenesisStorage<Block: BlockT> {
+	root: Block::Hash,
+	storage: PrefixedMemoryDB<HashFor<Block>>,
+}
 
 impl<Block: BlockT> DbGenesisStorage<Block> {
+	pub fn new(root: Block::Hash, storage: PrefixedMemoryDB<HashFor<Block>>) -> Self {
+		DbGenesisStorage {
+			root,
+			storage,
+		}
+	}
+}
+
+impl<Block: BlockT> sp_state_machine::Storage<HashFor<Block>> for DbGenesisStorage<Block> {
+	fn get(&self, key: &Block::Hash, prefix: Prefix) -> Result<Option<DBValue>, String> {
+		use hash_db::HashDB;
+		Ok(self.storage.get(key, prefix))
+	}
+}
+
+struct EmptyStorage<Block: BlockT>(pub Block::Hash);
+
+impl<Block: BlockT> EmptyStorage<Block> {
 	pub fn new() -> Self {
 		let mut root = Block::Hash::default();
 		let mut mdb = MemoryDB::<HashFor<Block>>::default();
 		sp_state_machine::TrieDBMut::<HashFor<Block>>::new(&mut mdb, &mut root);
-		DbGenesisStorage(root)
+		EmptyStorage(root)
 	}
 }
 
-impl<Block: BlockT> sp_state_machine::Storage<HashFor<Block>> for DbGenesisStorage<Block> {
+impl<Block: BlockT> sp_state_machine::Storage<HashFor<Block>> for EmptyStorage<Block> {
 	fn get(&self, _key: &Block::Hash, _prefix: Prefix) -> Result<Option<DBValue>, String> {
 		Ok(None)
 	}
@@ -980,6 +1044,7 @@ pub struct Backend<Block: BlockT> {
 	transaction_storage: TransactionStorageMode,
 	io_stats: FrozenForDuration<(kvdb::IoStats, StateUsageInfo)>,
 	state_usage: Arc<StateUsageStats>,
+	genesis_state: RwLock<Option<Arc<DbGenesisStorage<Block>>>>,
 }
 
 impl<Block: BlockT> Backend<Block> {
@@ -1058,7 +1123,7 @@ impl<Block: BlockT> Backend<Block> {
 			},
 		)?;
 
-		Ok(Backend {
+		let backend = Backend {
 			storage: Arc::new(storage_db),
 			offchain_storage,
 			changes_tries_storage,
@@ -1074,7 +1139,24 @@ impl<Block: BlockT> Backend<Block> {
 			state_usage: Arc::new(StateUsageStats::new()),
 			keep_blocks: config.keep_blocks.clone(),
 			transaction_storage: config.transaction_storage.clone(),
-		})
+			genesis_state: RwLock::new(None),
+		};
+
+		// Older DB versions have no last state key. Check if the state is available and set it.
+		let info = backend.blockchain.info();
+		if info.finalized_state.is_none()
+			&& info.finalized_hash != Default::default()
+			&& sc_client_api::Backend::have_state_at(&backend, &info.finalized_hash, info.finalized_number)
+		{
+			backend.blockchain.update_meta(MetaUpdate {
+				hash: info.finalized_hash,
+				number: info.finalized_number,
+				is_best: info.finalized_hash == info.best_hash,
+				is_finalized: true,
+				with_state: true,
+			});
+		}
+		Ok(backend)
 	}
 
 	/// Handle setting head within a transaction. `route_to` should be the last
@@ -1170,10 +1252,11 @@ impl<Block: BlockT> Backend<Block> {
 		justification: Option<Justification>,
 		changes_trie_cache_ops: &mut Option<DbChangesTrieStorageTransaction<Block>>,
 		finalization_displaced: &mut Option<FinalizationDisplaced<Block::Hash, NumberFor<Block>>>,
-	) -> ClientResult<(Block::Hash, <Block::Header as HeaderT>::Number, bool, bool)> {
+	) -> ClientResult<MetaUpdate<Block>> {
 		// TODO: ensure best chain contains this block.
 		let number = *header.number();
 		self.ensure_sequential_finalization(header, last_finalized)?;
+		let with_state = sc_client_api::Backend::have_state_at(self, &hash, number);
 
 		self.note_finalized(
 			transaction,
@@ -1182,6 +1265,7 @@ impl<Block: BlockT> Backend<Block> {
 			*hash,
 			changes_trie_cache_ops,
 			finalization_displaced,
+			with_state,
 		)?;
 
 		if let Some(justification) = justification {
@@ -1191,7 +1275,13 @@ impl<Block: BlockT> Backend<Block> {
 				Justifications::from(justification).encode(),
 			);
 		}
-		Ok((*hash, number, false, true))
+		Ok(MetaUpdate {
+			hash: *hash,
+			number,
+			is_best: false,
+			is_finalized: true,
+			with_state,
+		})
 	}
 
 	// performs forced canonicalization with a delay after importing a non-finalized block.
@@ -1219,6 +1309,9 @@ impl<Block: BlockT> Backend<Block> {
 				)?.expect("existence of block with number `new_canonical` \
 					implies existence of blocks with all numbers before it; qed")
 			};
+			if !sc_client_api::Backend::have_state_at(self, &hash, new_canonical.saturated_into()) {
+				return Ok(())
+			}
 
 			trace!(target: "db", "Canonicalize block #{} ({:?})", new_canonical, hash);
 			let commit = self.storage.state_db.canonicalize_block(&hash)
@@ -1240,12 +1333,13 @@ impl<Block: BlockT> Backend<Block> {
 
 		let mut meta_updates = Vec::with_capacity(operation.finalized_blocks.len());
 		let mut last_finalized_hash = self.blockchain.meta.read().finalized_hash;
+		let mut last_finalized_num = self.blockchain.meta.read().finalized_number;
+		let best_num = self.blockchain.meta.read().best_number;
 
 		let mut changes_trie_cache_ops = None;
 		for (block, justification) in operation.finalized_blocks {
 			let block_hash = self.blockchain.expect_block_hash_from_id(&block)?;
 			let block_header = self.blockchain.expect_header(BlockId::Hash(block_hash))?;
-
 			meta_updates.push(self.finalize_block_with_transaction(
 				&mut transaction,
 				&block_hash,
@@ -1256,12 +1350,16 @@ impl<Block: BlockT> Backend<Block> {
 				&mut finalization_displaced_leaves,
 			)?);
 			last_finalized_hash = block_hash;
+			last_finalized_num = block_header.number().clone();
 		}
 
 		let imported = if let Some(pending_block) = operation.pending_block {
+
 			let hash = pending_block.header.hash();
+
 			let parent_hash = *pending_block.header.parent_hash();
 			let number = pending_block.header.number().clone();
+			let existing_header = number <= best_num && self.blockchain.header(BlockId::hash(hash))?.is_some();
 
 			// blocks are keyed by number + hash.
 			let lookup_key = utils::number_and_hash_to_lookup_key(number, hash)?;
@@ -1296,13 +1394,24 @@ impl<Block: BlockT> Backend<Block> {
 			}
 
 			if number.is_zero() {
-				transaction.set_from_vec(columns::META, meta_keys::FINALIZED_BLOCK, lookup_key);
+				transaction.set_from_vec(columns::META, meta_keys::FINALIZED_BLOCK, lookup_key.clone());
 				transaction.set(columns::META, meta_keys::GENESIS_HASH, hash.as_ref());
 
 				// for tests, because config is set from within the reset_storage
 				if operation.changes_trie_config_update.is_none() {
 					operation.changes_trie_config_update = Some(None);
 				}
+
+				if operation.commit_state {
+					transaction.set_from_vec(columns::META, meta_keys::FINALIZED_STATE, lookup_key);
+				} else {
+					// When we don't want to commit the genesis state, we still preserve it in memory
+					// to bootstrap consensus. It is queried for an initial list of authorities, etc.
+					*self.genesis_state.write() = Some(Arc::new(DbGenesisStorage::new(
+						pending_block.header.state_root().clone(),
+						operation.db_updates.clone()
+					)));
+				}
 			}
 
 			let finalized = if operation.commit_state {
@@ -1361,79 +1470,111 @@ impl<Block: BlockT> Backend<Block> {
 					changeset,
 				).map_err(|e: sc_state_db::Error<io::Error>| sp_blockchain::Error::from_state_db(e))?;
 				apply_state_commit(&mut transaction, commit);
+				if number <= last_finalized_num {
+					// Canonicalize in the db when re-importing existing blocks with state.
+					let commit = self.storage.state_db.canonicalize_block(&hash)
+						.map_err(|e: sc_state_db::Error<io::Error>| sp_blockchain::Error::from_state_db(e))?;
+					apply_state_commit(&mut transaction, commit);
+					meta_updates.push(MetaUpdate {
+						hash,
+						number,
+						is_best: false,
+						is_finalized: true,
+						with_state: true,
+					});
+				}
+
 
 				// Check if need to finalize. Genesis is always finalized instantly.
 				let finalized = number_u64 == 0 || pending_block.leaf_state.is_final();
 				finalized
 			} else {
-				false
+				number.is_zero() || pending_block.leaf_state.is_final()
 			};
 
 			let header = &pending_block.header;
 			let is_best = pending_block.leaf_state.is_best();
 			let changes_trie_updates = operation.changes_trie_updates;
-			let changes_trie_config_update = operation.changes_trie_config_update;
-			changes_trie_cache_ops = Some(self.changes_tries_storage.commit(
-				&mut transaction,
-				changes_trie_updates,
-				cache::ComplexBlockId::new(
-					*header.parent_hash(),
-					if number.is_zero() { Zero::zero() } else { number - One::one() },
-				),
-				cache::ComplexBlockId::new(hash, number),
-				header,
-				finalized,
-				changes_trie_config_update,
-				changes_trie_cache_ops,
-			)?);
-			self.state_usage.merge_sm(operation.old_state.usage_info());
-			// release state reference so that it can be finalized
-			let cache = operation.old_state.into_cache_changes();
-
-			if finalized {
-				// TODO: ensure best chain contains this block.
-				self.ensure_sequential_finalization(header, Some(last_finalized_hash))?;
-				self.note_finalized(
+			debug!(target: "db",
+				"DB Commit {:?} ({}), best={}, state={}, existing={}",
+				hash, number, is_best, operation.commit_state, existing_header,
+			);
+
+			if !existing_header {
+				let changes_trie_config_update = operation.changes_trie_config_update;
+				changes_trie_cache_ops = Some(self.changes_tries_storage.commit(
 					&mut transaction,
-					true,
+					changes_trie_updates,
+					cache::ComplexBlockId::new(
+						*header.parent_hash(),
+						if number.is_zero() { Zero::zero() } else { number - One::one() },
+					),
+					cache::ComplexBlockId::new(hash, number),
 					header,
-					hash,
-					&mut changes_trie_cache_ops,
-					&mut finalization_displaced_leaves,
-				)?;
-			} else {
-				// canonicalize blocks which are old enough, regardless of finality.
-				self.force_delayed_canonicalize(&mut transaction, hash, *header.number())?
-			}
+					finalized,
+					changes_trie_config_update,
+					changes_trie_cache_ops,
+				)?);
+
+				self.state_usage.merge_sm(operation.old_state.usage_info());
+				// release state reference so that it can be finalized
+				let cache = operation.old_state.into_cache_changes();
+
+				if finalized {
+					// TODO: ensure best chain contains this block.
+					self.ensure_sequential_finalization(header, Some(last_finalized_hash))?;
+					self.note_finalized(
+						&mut transaction,
+						true,
+						header,
+						hash,
+						&mut changes_trie_cache_ops,
+						&mut finalization_displaced_leaves,
+						operation.commit_state,
+					)?;
+				} else {
+					// canonicalize blocks which are old enough, regardless of finality.
+					self.force_delayed_canonicalize(&mut transaction, hash, *header.number())?
+				}
 
-			debug!(target: "db", "DB Commit {:?} ({}), best = {}", hash, number, is_best);
 
-			let displaced_leaf = {
-				let mut leaves = self.blockchain.leaves.write();
-				let displaced_leaf = leaves.import(hash, number, parent_hash);
-				leaves.prepare_transaction(&mut transaction, columns::META, meta_keys::LEAF_PREFIX);
+				let displaced_leaf = {
+					let mut leaves = self.blockchain.leaves.write();
+					let displaced_leaf = leaves.import(hash, number, parent_hash);
+					leaves.prepare_transaction(&mut transaction, columns::META, meta_keys::LEAF_PREFIX);
 
-				displaced_leaf
-			};
+					displaced_leaf
+				};
 
-			let mut children = children::read_children(
-				&*self.storage.db,
-				columns::META,
-				meta_keys::CHILDREN_PREFIX,
-				parent_hash,
-			)?;
-			children.push(hash);
-			children::write_children(
-				&mut transaction,
-				columns::META,
-				meta_keys::CHILDREN_PREFIX,
-				parent_hash,
-				children,
-			);
+				let mut children = children::read_children(
+					&*self.storage.db,
+					columns::META,
+					meta_keys::CHILDREN_PREFIX,
+					parent_hash,
+				)?;
+				if !children.contains(&hash) {
+					children.push(hash);
+				}
+				children::write_children(
+					&mut transaction,
+					columns::META,
+					meta_keys::CHILDREN_PREFIX,
+					parent_hash,
+					children,
+				);
 
-			meta_updates.push((hash, number, pending_block.leaf_state.is_best(), finalized));
+				meta_updates.push(MetaUpdate {
+					hash,
+					number,
+					is_best: pending_block.leaf_state.is_best(),
+					is_finalized: finalized,
+					with_state: operation.commit_state,
+				});
 
-			Some((pending_block.header, number, hash, enacted, retracted, displaced_leaf, is_best, cache))
+				Some((pending_block.header, number, hash, enacted, retracted, displaced_leaf, is_best, cache))
+			} else {
+				None
+			}
 		} else {
 			None
 		};
@@ -1448,7 +1589,13 @@ impl<Block: BlockT> Backend<Block> {
 					hash.clone(),
 					(number.clone(), hash.clone())
 				)?;
-				meta_updates.push((hash, *number, true, false));
+				meta_updates.push(MetaUpdate {
+					hash,
+					number: *number,
+					is_best: true,
+					is_finalized: false,
+					with_state: false,
+				});
 				Some((enacted, retracted))
 			} else {
 				return Err(sp_blockchain::Error::UnknownBlock(format!("Cannot set head {:?}", set_head)))
@@ -1472,6 +1619,7 @@ impl<Block: BlockT> Backend<Block> {
 			is_best,
 			mut cache,
 		)) = imported {
+			trace!(target: "db", "DB Commit done {:?}", hash);
 			let header_metadata = CachedHeaderMetadata::from(&header);
 			self.blockchain.insert_header_metadata(
 				header_metadata.hash,
@@ -1498,8 +1646,8 @@ impl<Block: BlockT> Backend<Block> {
 			self.shared_cache.lock().sync(&enacted, &retracted);
 		}
 
-		for (hash, number, is_best, is_finalized) in meta_updates {
-			self.blockchain.update_meta(hash, number, is_best, is_finalized);
+		for m in meta_updates {
+			self.blockchain.update_meta(m);
 		}
 
 		Ok(())
@@ -1515,29 +1663,35 @@ impl<Block: BlockT> Backend<Block> {
 		f_header: &Block::Header,
 		f_hash: Block::Hash,
 		changes_trie_cache_ops: &mut Option<DbChangesTrieStorageTransaction<Block>>,
-		displaced: &mut Option<FinalizationDisplaced<Block::Hash, NumberFor<Block>>>
+		displaced: &mut Option<FinalizationDisplaced<Block::Hash, NumberFor<Block>>>,
+		with_state: bool,
 	) -> ClientResult<()> {
 		let f_num = f_header.number().clone();
 
-		if self.storage.state_db.best_canonical().map(|c| f_num.saturated_into::<u64>() > c).unwrap_or(true) {
-			let lookup_key = utils::number_and_hash_to_lookup_key(f_num, f_hash.clone())?;
-			transaction.set_from_vec(columns::META, meta_keys::FINALIZED_BLOCK, lookup_key);
+		let lookup_key = utils::number_and_hash_to_lookup_key(f_num, f_hash.clone())?;
+		if with_state {
+			transaction.set_from_vec(columns::META, meta_keys::FINALIZED_STATE, lookup_key.clone());
+		}
+		transaction.set_from_vec(columns::META, meta_keys::FINALIZED_BLOCK, lookup_key);
 
+		if sc_client_api::Backend::have_state_at(self, &f_hash, f_num) &&
+			self.storage.state_db.best_canonical().map(|c| f_num.saturated_into::<u64>() > c).unwrap_or(true)
+		{
 			let commit = self.storage.state_db.canonicalize_block(&f_hash)
 				.map_err(|e: sc_state_db::Error<io::Error>| sp_blockchain::Error::from_state_db(e))?;
 			apply_state_commit(transaction, commit);
+		}
 
-			if !f_num.is_zero() {
-				let new_changes_trie_cache_ops = self.changes_tries_storage.finalize(
-					transaction,
-					*f_header.parent_hash(),
-					f_hash,
-					f_num,
-					if is_inserted { Some(&f_header) } else { None },
-					changes_trie_cache_ops.take(),
-				)?;
-				*changes_trie_cache_ops = Some(new_changes_trie_cache_ops);
-			}
+		if !f_num.is_zero() {
+			let new_changes_trie_cache_ops = self.changes_tries_storage.finalize(
+				transaction,
+				*f_header.parent_hash(),
+				f_hash,
+				f_num,
+				if is_inserted { Some(&f_header) } else { None },
+				changes_trie_cache_ops.take(),
+			)?;
+			*changes_trie_cache_ops = Some(new_changes_trie_cache_ops);
 		}
 
 		let new_displaced = self.blockchain.leaves.write().finalize_height(f_num);
@@ -1628,6 +1782,23 @@ impl<Block: BlockT> Backend<Block> {
 		}
 		Ok(())
 	}
+
+	fn empty_state(&self) -> ClientResult<SyncingCachingState<RefTrackingState<Block>, Block>> {
+		let root = EmptyStorage::<Block>::new().0; // Empty trie
+		let db_state = DbState::<Block>::new(self.storage.clone(), root);
+		let state = RefTrackingState::new(db_state, self.storage.clone(), None);
+		let caching_state = CachingState::new(
+			state,
+			self.shared_cache.clone(),
+			None,
+		);
+		Ok(SyncingCachingState::new(
+				caching_state,
+				self.state_usage.clone(),
+				self.blockchain.meta.clone(),
+				self.import_lock.clone(),
+		))
+	}
 }
 
 
@@ -1737,7 +1908,7 @@ impl<Block: BlockT> sc_client_api::backend::Backend<Block> for Backend<Block> {
 	type OffchainStorage = offchain::LocalStorage;
 
 	fn begin_operation(&self) -> ClientResult<Self::BlockImportOperation> {
-		let mut old_state = self.state_at(BlockId::Hash(Default::default()))?;
+		let mut old_state = self.empty_state()?;
 		old_state.disable_syncing();
 
 		Ok(BlockImportOperation {
@@ -1763,7 +1934,11 @@ impl<Block: BlockT> sc_client_api::backend::Backend<Block> for Backend<Block> {
 		operation: &mut Self::BlockImportOperation,
 		block: BlockId<Block>,
 	) -> ClientResult<()> {
-		operation.old_state = self.state_at(block)?;
+		if block.is_pre_genesis() {
+			operation.old_state = self.empty_state()?;
+		} else {
+			operation.old_state = self.state_at(block)?;
+		}
 		operation.old_state.disable_syncing();
 
 		operation.commit_state = true;
@@ -1800,7 +1975,7 @@ impl<Block: BlockT> sc_client_api::backend::Backend<Block> for Backend<Block> {
 		let mut displaced = None;
 
 		let mut changes_trie_cache_ops = None;
-		let (hash, number, is_best, is_finalized) = self.finalize_block_with_transaction(
+		let m = self.finalize_block_with_transaction(
 			&mut transaction,
 			&hash,
 			&header,
@@ -1810,7 +1985,7 @@ impl<Block: BlockT> sc_client_api::backend::Backend<Block> for Backend<Block> {
 			&mut displaced,
 		)?;
 		self.storage.db.commit(transaction)?;
-		self.blockchain.update_meta(hash, number, is_best, is_finalized);
+		self.blockchain.update_meta(m);
 		self.changes_tries_storage.post_commit(changes_trie_cache_ops);
 		Ok(())
 	}
@@ -1967,14 +2142,36 @@ impl<Block: BlockT> sc_client_api::backend::Backend<Block> for Backend<Block> {
 								meta_keys::FINALIZED_BLOCK,
 								key.clone()
 							);
+
 							reverted_finalized.insert(removed_hash);
+							if let Some((hash, _)) = self.blockchain.info().finalized_state {
+								if hash == best_hash {
+									if !best_number.is_zero()
+										&& self.have_state_at(&prev_hash, best_number - One::one())
+									{
+										let lookup_key = utils::number_and_hash_to_lookup_key(
+											best_number - One::one(),
+											prev_hash
+										)?;
+										transaction.set_from_vec(columns::META, meta_keys::FINALIZED_STATE, lookup_key);
+									} else {
+										transaction.remove(columns::META, meta_keys::FINALIZED_STATE);
+									}
+								}
+							}
 						}
 						transaction.set_from_vec(columns::META, meta_keys::BEST_BLOCK, key);
 						transaction.remove(columns::KEY_LOOKUP, removed.hash().as_ref());
 						children::remove_children(&mut transaction, columns::META, meta_keys::CHILDREN_PREFIX, best_hash);
 						self.storage.db.commit(transaction)?;
 						self.changes_tries_storage.post_commit(Some(changes_trie_cache_ops));
-						self.blockchain.update_meta(best_hash, best_number, true, update_finalized);
+						self.blockchain.update_meta(MetaUpdate {
+							hash: best_hash,
+							number: best_number,
+							is_best: true,
+							is_finalized: update_finalized,
+							with_state: false
+						});
 					}
 					None => return Ok(c.saturated_into::<NumberFor<Block>>())
 				}
@@ -2061,26 +2258,30 @@ impl<Block: BlockT> sc_client_api::backend::Backend<Block> for Backend<Block> {
 	fn state_at(&self, block: BlockId<Block>) -> ClientResult<Self::State> {
 		use sc_client_api::blockchain::HeaderBackend as BcHeaderBackend;
 
-		// special case for genesis initialization
-		match block {
-			BlockId::Hash(h) if h == Default::default() => {
-				let genesis_storage = DbGenesisStorage::<Block>::new();
-				let root = genesis_storage.0.clone();
-				let db_state = DbState::<Block>::new(Arc::new(genesis_storage), root);
+		let is_genesis = match &block {
+			BlockId::Number(n) if n.is_zero() => true,
+			BlockId::Hash(h) if h == &self.blockchain.meta.read().genesis_hash => true,
+			_ => false,
+		};
+		if is_genesis {
+			if let Some(genesis_state) = &*self.genesis_state.read() {
+				let root = genesis_state.root.clone();
+				let db_state = DbState::<Block>::new(genesis_state.clone(), root);
 				let state = RefTrackingState::new(db_state, self.storage.clone(), None);
 				let caching_state = CachingState::new(
 					state,
 					self.shared_cache.clone(),
 					None,
 				);
-				return Ok(SyncingCachingState::new(
+				let mut state = SyncingCachingState::new(
 					caching_state,
 					self.state_usage.clone(),
 					self.blockchain.meta.clone(),
 					self.import_lock.clone(),
-				));
-			},
-			_ => {}
+				);
+				state.disable_syncing();
+				return Ok(state)
+			}
 		}
 
 		let hash = match block {
@@ -2305,7 +2506,6 @@ pub(crate) mod tests {
 		let db = Backend::<Block>::new_test(2, 0);
 		let hash = {
 			let mut op = db.begin_operation().unwrap();
-			db.begin_state_operation(&mut op, BlockId::Hash(Default::default())).unwrap();
 			let mut header = Header {
 				number: 0,
 				parent_hash: Default::default(),
diff --git a/client/db/src/light.rs b/client/db/src/light.rs
index bf24197c5b5d..4e61a9c2ee03 100644
--- a/client/db/src/light.rs
+++ b/client/db/src/light.rs
@@ -151,9 +151,14 @@ impl<Block> BlockchainHeaderBackend<Block> for LightStorage<Block>
 		BlockchainInfo {
 			best_hash: meta.best_hash,
 			best_number: meta.best_number,
-			genesis_hash: meta.genesis_hash,
+			genesis_hash: meta.genesis_hash.clone(),
 			finalized_hash: meta.finalized_hash,
 			finalized_number: meta.finalized_number,
+			finalized_state: if meta.finalized_hash != Default::default() {
+				Some((meta.genesis_hash, Zero::zero()))
+			} else {
+				None
+			},
 			number_leaves: 1,
 		}
 	}
diff --git a/client/db/src/storage_cache.rs b/client/db/src/storage_cache.rs
index 788e011fb2f0..9934cccd155a 100644
--- a/client/db/src/storage_cache.rs
+++ b/client/db/src/storage_cache.rs
@@ -605,6 +605,17 @@ impl<S: StateBackend<HashFor<B>>, B: BlockT> StateBackend<HashFor<B>> for Cachin
 		self.state.exists_child_storage(child_info, key)
 	}
 
+	fn apply_to_key_values_while<F: FnMut(Vec<u8>, Vec<u8>) -> bool>(
+		&self,
+		child_info: Option<&ChildInfo>,
+		prefix: Option<&[u8]>,
+		start_at: Option<&[u8]>,
+		f: F,
+		allow_missing: bool,
+	) -> Result<bool, Self::Error> {
+		self.state.apply_to_key_values_while(child_info, prefix, start_at, f, allow_missing)
+	}
+
 	fn apply_to_keys_while<F: FnMut(&[u8]) -> bool>(
 		&self,
 		child_info: Option<&ChildInfo>,
@@ -788,6 +799,17 @@ impl<S: StateBackend<HashFor<B>>, B: BlockT> StateBackend<HashFor<B>> for Syncin
 		self.caching_state().exists_child_storage(child_info, key)
 	}
 
+	fn apply_to_key_values_while<F: FnMut(Vec<u8>, Vec<u8>) -> bool>(
+		&self,
+		child_info: Option<&ChildInfo>,
+		prefix: Option<&[u8]>,
+		start_at: Option<&[u8]>,
+		f: F,
+		allow_missing: bool,
+	) -> Result<bool, Self::Error> {
+		self.caching_state().apply_to_key_values_while(child_info, prefix, start_at, f, allow_missing)
+	}
+
 	fn apply_to_keys_while<F: FnMut(&[u8]) -> bool>(
 		&self,
 		child_info: Option<&ChildInfo>,
diff --git a/client/db/src/utils.rs b/client/db/src/utils.rs
index 7f82cb848912..bd6dc9841aa6 100644
--- a/client/db/src/utils.rs
+++ b/client/db/src/utils.rs
@@ -49,6 +49,8 @@ pub mod meta_keys {
 	pub const BEST_BLOCK: &[u8; 4] = b"best";
 	/// Last finalized block key.
 	pub const FINALIZED_BLOCK: &[u8; 5] = b"final";
+	/// Last finalized state key.
+	pub const FINALIZED_STATE: &[u8; 6] = b"fstate";
 	/// Meta information prefix for list-based caches.
 	pub const CACHE_META_PREFIX: &[u8; 5] = b"cache";
 	/// Meta information for changes tries key.
@@ -74,6 +76,8 @@ pub struct Meta<N, H> {
 	pub finalized_number: N,
 	/// Hash of the genesis block.
 	pub genesis_hash: H,
+	/// Finalized state, if any
+	pub finalized_state: Option<(H, N)>,
 }
 
 /// A block lookup key: used for canonical lookup from block number to hash
@@ -391,6 +395,7 @@ pub fn read_meta<Block>(db: &dyn Database<DbHash>, col_header: u32) -> Result<
 			finalized_hash: Default::default(),
 			finalized_number: Zero::zero(),
 			genesis_hash: Default::default(),
+			finalized_state: None,
 		}),
 	};
 
@@ -408,12 +413,18 @@ pub fn read_meta<Block>(db: &dyn Database<DbHash>, col_header: u32) -> Result<
 			);
 			Ok((hash, *header.number()))
 		} else {
-			Ok((genesis_hash.clone(), Zero::zero()))
+			Ok((Default::default(), Zero::zero()))
 		}
 	};
 
 	let (best_hash, best_number) = load_meta_block("best", meta_keys::BEST_BLOCK)?;
 	let (finalized_hash, finalized_number) = load_meta_block("final", meta_keys::FINALIZED_BLOCK)?;
+	let (finalized_state_hash, finalized_state_number) = load_meta_block("final_state", meta_keys::FINALIZED_STATE)?;
+	let finalized_state = if finalized_state_hash != Default::default() {
+		Some((finalized_state_hash, finalized_state_number))
+	} else {
+		None
+	};
 
 	Ok(Meta {
 		best_hash,
@@ -421,6 +432,7 @@ pub fn read_meta<Block>(db: &dyn Database<DbHash>, col_header: u32) -> Result<
 		finalized_hash,
 		finalized_number,
 		genesis_hash,
+		finalized_state,
 	})
 }
 
diff --git a/client/finality-grandpa/src/import.rs b/client/finality-grandpa/src/import.rs
index 481f38b617ea..c287cc0b3b89 100644
--- a/client/finality-grandpa/src/import.rs
+++ b/client/finality-grandpa/src/import.rs
@@ -456,7 +456,11 @@ where
 		// early exit if block already in chain, otherwise the check for
 		// authority changes will error when trying to re-import a change block
 		match self.inner.status(BlockId::Hash(hash)) {
-			Ok(BlockStatus::InChain) => return Ok(ImportResult::AlreadyInChain),
+			Ok(BlockStatus::InChain) => {
+				// Strip justifications when re-importing an existing block.
+				let _justifications = block.justifications.take();
+				return (&*self.inner).import_block(block, new_cache).await
+			}
 			Ok(BlockStatus::Unknown) => {},
 			Err(e) => return Err(ConsensusError::ClientImport(e.to_string())),
 		}
diff --git a/client/informant/src/display.rs b/client/informant/src/display.rs
index 0caef4e5fbae..00c2116fac60 100644
--- a/client/informant/src/display.rs
+++ b/client/informant/src/display.rs
@@ -93,10 +93,19 @@ impl<B: BlockT> InformantDisplay<B> {
 				(diff_bytes_inbound, diff_bytes_outbound)
 			};
 
-		let (level, status, target) = match (net_status.sync_state, net_status.best_seen_block) {
-			(SyncState::Idle, _) => ("💤", "Idle".into(), "".into()),
-			(SyncState::Downloading, None) => ("⚙️ ", format!("Preparing{}", speed), "".into()),
-			(SyncState::Downloading, Some(n)) => (
+		let (level, status, target) = match (
+			net_status.sync_state,
+			net_status.best_seen_block,
+			net_status.state_sync
+		) {
+			(_, _, Some(state)) => (
+				"⚙️ ",
+				"Downloading state".into(),
+				format!(", {}%, ({:.2}) Mib", state.percentage, (state.size as f32) / (1024f32 * 1024f32)),
+			),
+			(SyncState::Idle, _, _) => ("💤", "Idle".into(), "".into()),
+			(SyncState::Downloading, None, _) => ("⚙️ ", format!("Preparing{}", speed), "".into()),
+			(SyncState::Downloading, Some(n), None) => (
 				"⚙️ ",
 				format!("Syncing{}", speed),
 				format!(", target=#{}", n),
diff --git a/client/light/src/backend.rs b/client/light/src/backend.rs
index a7f1b8e0c169..3e53d3b81cc7 100644
--- a/client/light/src/backend.rs
+++ b/client/light/src/backend.rs
@@ -321,7 +321,7 @@ impl<S, Block> BlockImportOperation<Block> for ImportOperation<Block, S>
 		Ok(())
 	}
 
-	fn reset_storage(&mut self, input: Storage) -> ClientResult<Block::Hash> {
+	fn set_genesis_state(&mut self, input: Storage, commit: bool) -> ClientResult<Block::Hash> {
 		check_genesis_storage(&input)?;
 
 		// changes trie configuration
@@ -347,11 +347,17 @@ impl<S, Block> BlockImportOperation<Block> for ImportOperation<Block, S>
 
 		let storage_update = InMemoryBackend::from(storage);
 		let (storage_root, _) = storage_update.full_storage_root(std::iter::empty(), child_delta);
-		self.storage_update = Some(storage_update);
+		if commit {
+			self.storage_update = Some(storage_update);
+		}
 
 		Ok(storage_root)
 	}
 
+	fn reset_storage(&mut self, _input: Storage) -> ClientResult<Block::Hash> {
+		Err(ClientError::NotAvailableOnLightClient)
+	}
+
 	fn insert_aux<I>(&mut self, ops: I) -> ClientResult<()>
 		where I: IntoIterator<Item=(Vec<u8>, Option<Vec<u8>>)>
 	{
@@ -461,6 +467,22 @@ impl<H: Hasher> StateBackend<H> for GenesisOrUnavailableState<H>
 		}
 	}
 
+	fn apply_to_key_values_while<A: FnMut(Vec<u8>, Vec<u8>) -> bool>(
+		&self,
+		child_info: Option<&ChildInfo>,
+		prefix: Option<&[u8]>,
+		start_at: Option<&[u8]>,
+		action: A,
+		allow_missing: bool,
+	) -> ClientResult<bool> {
+		match *self {
+			GenesisOrUnavailableState::Genesis(ref state) =>
+				Ok(state.apply_to_key_values_while(child_info, prefix, start_at, action, allow_missing)
+					.expect(IN_MEMORY_EXPECT_PROOF)),
+			GenesisOrUnavailableState::Unavailable => Err(ClientError::NotAvailableOnLightClient),
+		}
+	}
+
 	fn apply_to_keys_while<A: FnMut(&[u8]) -> bool>(
 		&self,
 		child_info: Option<&ChildInfo>,
diff --git a/client/network/src/behaviour.rs b/client/network/src/behaviour.rs
index 17c38b6f9545..576c49d1da36 100644
--- a/client/network/src/behaviour.rs
+++ b/client/network/src/behaviour.rs
@@ -79,6 +79,11 @@ pub struct Behaviour<B: BlockT> {
 	/// [`request_responses::RequestResponsesBehaviour`].
 	#[behaviour(ignore)]
 	block_request_protocol_name: String,
+
+	/// Protocol name used to send out state requests via
+	/// [`request_responses::RequestResponsesBehaviour`].
+	#[behaviour(ignore)]
+	state_request_protocol_name: String,
 }
 
 /// Event generated by `Behaviour`.
@@ -186,6 +191,7 @@ impl<B: BlockT> Behaviour<B> {
 		light_client_request_sender: light_client_requests::sender::LightClientRequestSender<B>,
 		disco_config: DiscoveryConfig,
 		block_request_protocol_config: request_responses::ProtocolConfig,
+		state_request_protocol_config: request_responses::ProtocolConfig,
 		bitswap: Option<Bitswap<B>>,
 		light_client_request_protocol_config: request_responses::ProtocolConfig,
 		// All remaining request protocol configs.
@@ -193,7 +199,9 @@ impl<B: BlockT> Behaviour<B> {
 	) -> Result<Self, request_responses::RegisterError> {
 		// Extract protocol name and add to `request_response_protocols`.
 		let block_request_protocol_name = block_request_protocol_config.name.to_string();
+		let state_request_protocol_name = state_request_protocol_config.name.to_string();
 		request_response_protocols.push(block_request_protocol_config);
+		request_response_protocols.push(state_request_protocol_config);
 
 		request_response_protocols.push(light_client_request_protocol_config);
 
@@ -206,8 +214,8 @@ impl<B: BlockT> Behaviour<B> {
 				request_responses::RequestResponsesBehaviour::new(request_response_protocols.into_iter())?,
 			light_client_request_sender,
 			events: VecDeque::new(),
-
 			block_request_protocol_name,
+			state_request_protocol_name,
 		})
 	}
 
@@ -329,6 +337,21 @@ Behaviour<B> {
 					&target, &self.block_request_protocol_name, buf, pending_response, IfDisconnected::ImmediateError,
 				);
 			},
+			CustomMessageOutcome::StateRequest { target, request, pending_response } => {
+				let mut buf = Vec::with_capacity(request.encoded_len());
+				if let Err(err) = request.encode(&mut buf) {
+					log::warn!(
+						target: "sync",
+						"Failed to encode state request {:?}: {:?}",
+						request, err
+					);
+					return
+				}
+
+				self.request_responses.send_request(
+					&target, &self.state_request_protocol_name, buf, pending_response, IfDisconnected::ImmediateError,
+				);
+			},
 			CustomMessageOutcome::NotificationStreamOpened {
 				remote, protocol, negotiated_fallback, roles, notifications_sink
 			} => {
diff --git a/client/network/src/chain.rs b/client/network/src/chain.rs
index 081d4b0d3ac3..32d4cc9ff024 100644
--- a/client/network/src/chain.rs
+++ b/client/network/src/chain.rs
@@ -21,6 +21,7 @@
 use sp_blockchain::{Error, HeaderBackend, HeaderMetadata};
 use sc_client_api::{BlockBackend, ProofProvider};
 use sp_runtime::traits::{Block as BlockT, BlockIdTo};
+pub use sc_client_api::{StorageKey, StorageData, ImportedState};
 
 /// Local client abstraction for the network.
 pub trait Client<Block: BlockT>: HeaderBackend<Block> + ProofProvider<Block> + BlockIdTo<Block, Error = Error>
diff --git a/client/network/src/config.rs b/client/network/src/config.rs
index 4942d1b0fb87..36ae1e831b8c 100644
--- a/client/network/src/config.rs
+++ b/client/network/src/config.rs
@@ -123,6 +123,15 @@ pub struct Params<B: BlockT, H: ExHashT> {
 	/// [`crate::light_client_requests::handler::LightClientRequestHandler::new`] allowing
 	/// both outgoing and incoming requests.
 	pub light_client_request_protocol_config: RequestResponseConfig,
+
+	/// Request response configuration for the state request protocol.
+	///
+	/// Can be constructed either via
+	/// [`crate::state_requests::generate_protocol_config`] allowing outgoing but not
+	/// incoming requests, or constructed via
+	/// [`crate::state_requests::handler::StateRequestHandler::new`] allowing
+	/// both outgoing and incoming requests.
+	pub state_request_protocol_config: RequestResponseConfig,
 }
 
 /// Role of the local node.
@@ -373,6 +382,24 @@ impl From<multiaddr::Error> for ParseErr {
 	}
 }
 
+#[derive(Clone, Debug, Eq, PartialEq)]
+/// Sync operation mode.
+pub enum SyncMode {
+	/// Full block download and verification.
+	Full,
+	/// Download blocks and the latest state.
+	Fast {
+		/// Skip state proof download and verification.
+		skip_proofs: bool
+	},
+}
+
+impl Default for SyncMode {
+	fn default() -> Self {
+		SyncMode::Full
+	}
+}
+
 /// Network service configuration.
 #[derive(Clone, Debug)]
 pub struct NetworkConfiguration {
@@ -400,6 +427,8 @@ pub struct NetworkConfiguration {
 	pub transport: TransportConfig,
 	/// Maximum number of peers to ask the same blocks in parallel.
 	pub max_parallel_downloads: u32,
+	/// Initial syncing mode.
+	pub sync_mode: SyncMode,
 
 	/// True if Kademlia random discovery should be enabled.
 	///
@@ -462,6 +491,7 @@ impl NetworkConfiguration {
 				wasm_external_transport: None,
 			},
 			max_parallel_downloads: 5,
+			sync_mode: SyncMode::Full,
 			enable_dht_random_walk: true,
 			allow_non_globals_in_dht: false,
 			kademlia_disjoint_query_paths: false,
diff --git a/client/network/src/gossip/tests.rs b/client/network/src/gossip/tests.rs
index 19ac002aac86..bdef28f9bebe 100644
--- a/client/network/src/gossip/tests.rs
+++ b/client/network/src/gossip/tests.rs
@@ -17,6 +17,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::block_request_handler::BlockRequestHandler;
+use crate::state_request_handler::StateRequestHandler;
 use crate::light_client_requests::handler::LightClientRequestHandler;
 use crate::gossip::QueuedSender;
 use crate::{config,  Event, NetworkService, NetworkWorker};
@@ -107,6 +108,16 @@ fn build_test_full_node(network_config: config::NetworkConfiguration)
 		protocol_config
 	};
 
+	let state_request_protocol_config = {
+		let (handler, protocol_config) = StateRequestHandler::new(
+			&protocol_id,
+			client.clone(),
+			50,
+		);
+		async_std::task::spawn(handler.run().boxed());
+		protocol_config
+	};
+
 	let light_client_request_protocol_config = {
 		let (handler, protocol_config) = LightClientRequestHandler::new(
 			&protocol_id,
@@ -131,6 +142,7 @@ fn build_test_full_node(network_config: config::NetworkConfiguration)
 		),
 		metrics_registry: None,
 		block_request_protocol_config,
+		state_request_protocol_config,
 		light_client_request_protocol_config,
 	})
 	.unwrap();
diff --git a/client/network/src/lib.rs b/client/network/src/lib.rs
index 556e71da2383..11e235bb81ae 100644
--- a/client/network/src/lib.rs
+++ b/client/network/src/lib.rs
@@ -260,6 +260,7 @@ mod utils;
 pub mod block_request_handler;
 pub mod bitswap;
 pub mod light_client_requests;
+pub mod state_request_handler;
 pub mod config;
 pub mod error;
 pub mod gossip;
@@ -268,7 +269,8 @@ pub mod transactions;
 
 #[doc(inline)]
 pub use libp2p::{multiaddr, Multiaddr, PeerId};
-pub use protocol::{event::{DhtEvent, Event, ObservedRole}, sync::SyncState, PeerInfo};
+pub use protocol::{event::{DhtEvent, Event, ObservedRole}, PeerInfo};
+pub use protocol::sync::{SyncState, StateDownloadProgress};
 pub use service::{
 	NetworkService, NetworkWorker, RequestFailure, OutboundFailure, NotificationSender,
 	NotificationSenderReady, IfDisconnected,
@@ -321,4 +323,6 @@ pub struct NetworkStatus<B: BlockT> {
 	pub total_bytes_inbound: u64,
 	/// The total number of bytes sent.
 	pub total_bytes_outbound: u64,
+	/// State sync in progress.
+	pub state_sync: Option<protocol::sync::StateDownloadProgress>,
 }
diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index a3a490e09778..b9a189a0f384 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -22,6 +22,7 @@ use crate::{
 	error,
 	request_responses::RequestFailure,
 	utils::{interval, LruHashSet},
+	schema::v1::StateResponse,
 };
 
 use bytes::Bytes;
@@ -49,7 +50,7 @@ use sp_runtime::{
 	traits::{Block as BlockT, Header as HeaderT, NumberFor, Zero, CheckedSub},
 };
 use sp_arithmetic::traits::SaturatedConversion;
-use sync::{ChainSync, SyncState};
+use sync::{ChainSync, Status as SyncStatus};
 use std::borrow::Cow;
 use std::convert::TryFrom as _;
 use std::collections::{HashMap, HashSet, VecDeque};
@@ -179,13 +180,19 @@ pub struct Protocol<B: BlockT> {
 	block_announce_data_cache: lru::LruCache<B::Hash, Vec<u8>>,
 }
 
+#[derive(Debug)]
+enum PeerRequest<B: BlockT> {
+	Block(message::BlockRequest<B>),
+	State,
+}
+
 /// Peer information
 #[derive(Debug)]
 struct Peer<B: BlockT> {
 	info: PeerInfo<B>,
-	/// Current block request, if any. Started by emitting [`CustomMessageOutcome::BlockRequest`].
-	block_request: Option<(
-		message::BlockRequest<B>,
+	/// Current request, if any. Started by emitting [`CustomMessageOutcome::BlockRequest`].
+	request: Option<(
+		PeerRequest<B>,
 		oneshot::Receiver<Result<Vec<u8>, RequestFailure>>,
 	)>,
 	/// Holds a set of blocks known to this peer.
@@ -210,6 +217,21 @@ pub struct ProtocolConfig {
 	pub roles: Roles,
 	/// Maximum number of peers to ask the same blocks in parallel.
 	pub max_parallel_downloads: u32,
+	/// Enable state sync.
+	pub sync_mode: config::SyncMode,
+}
+
+impl ProtocolConfig {
+	fn sync_mode(&self) -> sync::SyncMode {
+		if self.roles.is_light() {
+			sync::SyncMode::Light
+		} else {
+			match self.sync_mode {
+				config::SyncMode::Full => sync::SyncMode::Full,
+				config::SyncMode::Fast { skip_proofs } => sync::SyncMode::LightState { skip_proofs },
+			}
+		}
+	}
 }
 
 impl Default for ProtocolConfig {
@@ -217,6 +239,7 @@ impl Default for ProtocolConfig {
 		ProtocolConfig {
 			roles: Roles::FULL,
 			max_parallel_downloads: 5,
+			sync_mode: config::SyncMode::Full,
 		}
 	}
 }
@@ -263,12 +286,11 @@ impl<B: BlockT> Protocol<B> {
 	) -> error::Result<(Protocol<B>, sc_peerset::PeersetHandle, Vec<(PeerId, Multiaddr)>)> {
 		let info = chain.info();
 		let sync = ChainSync::new(
-			config.roles,
+			config.sync_mode(),
 			chain.clone(),
-			&info,
 			block_announce_validator,
 			config.max_parallel_downloads,
-		);
+		).map_err(Box::new)?;
 
 		let boot_node_ids = {
 			let mut list = HashSet::new();
@@ -454,13 +476,13 @@ impl<B: BlockT> Protocol<B> {
 	pub fn num_active_peers(&self) -> usize {
 		self.peers
 			.values()
-			.filter(|p| p.block_request.is_some())
+			.filter(|p| p.request.is_some())
 			.count()
 	}
 
 	/// Current global sync state.
-	pub fn sync_state(&self) -> SyncState {
-		self.sync.status().state
+	pub fn sync_state(&self) -> SyncStatus<B> {
+		self.sync.status()
 	}
 
 	/// Target sync block number.
@@ -656,6 +678,27 @@ impl<B: BlockT> Protocol<B> {
 		}
 	}
 
+	/// Must be called in response to a [`CustomMessageOutcome::StateRequest`] being emitted.
+	/// Must contain the same `PeerId` and request that have been emitted.
+	pub fn on_state_response(
+		&mut self,
+		peer_id: PeerId,
+		response: StateResponse,
+	) -> CustomMessageOutcome<B> {
+		match self.sync.on_state_data(&peer_id, response) {
+			Ok(sync::OnStateData::Import(origin, block)) =>
+				CustomMessageOutcome::BlockImport(origin, vec![block]),
+			Ok(sync::OnStateData::Request(peer, req)) => {
+				prepare_state_request::<B>(&mut self.peers, peer, req)
+			}
+			Err(sync::BadPeer(id, repu)) => {
+				self.behaviour.disconnect_peer(&id, HARDCODED_PEERSETS_SYNC);
+				self.peerset_handle.report_peer(id, repu);
+				CustomMessageOutcome::None
+			}
+		}
+	}
+
 	/// Perform time based maintenance.
 	///
 	/// > **Note**: This method normally doesn't have to be called except for testing purposes.
@@ -736,7 +779,7 @@ impl<B: BlockT> Protocol<B> {
 				best_hash: status.best_hash,
 				best_number: status.best_number
 			},
-			block_request: None,
+			request: None,
 			known_blocks: LruHashSet::new(NonZeroUsize::new(MAX_KNOWN_BLOCKS)
 				.expect("Constant is nonzero")),
 		};
@@ -1137,7 +1180,7 @@ fn prepare_block_request<B: BlockT>(
 	let (tx, rx) = oneshot::channel();
 
 	if let Some(ref mut peer) = peers.get_mut(&who) {
-		peer.block_request = Some((request.clone(), rx));
+		peer.request = Some((PeerRequest::Block(request.clone()), rx));
 	}
 
 	let request = crate::schema::v1::BlockRequest {
@@ -1161,6 +1204,23 @@ fn prepare_block_request<B: BlockT>(
 	}
 }
 
+fn prepare_state_request<B: BlockT>(
+	peers: &mut HashMap<PeerId, Peer<B>>,
+	who: PeerId,
+	request: crate::schema::v1::StateRequest,
+) -> CustomMessageOutcome<B> {
+	let (tx, rx) = oneshot::channel();
+
+	if let Some(ref mut peer) = peers.get_mut(&who) {
+		peer.request = Some((PeerRequest::State, rx));
+	}
+	CustomMessageOutcome::StateRequest {
+		target: who,
+		request: request,
+		pending_response: tx,
+	}
+}
+
 /// Outcome of an incoming custom message.
 #[derive(Debug)]
 #[must_use]
@@ -1192,6 +1252,12 @@ pub enum CustomMessageOutcome<B: BlockT> {
 		request: crate::schema::v1::BlockRequest,
 		pending_response: oneshot::Sender<Result<Vec<u8>, RequestFailure>>,
 	},
+	/// A new storage request must be emitted.
+	StateRequest {
+		target: PeerId,
+		request: crate::schema::v1::StateRequest,
+		pending_response: oneshot::Sender<Result<Vec<u8>, RequestFailure>>,
+	},
 	/// Peer has a reported a new head of chain.
 	PeerNewBest(PeerId, NumberFor<B>),
 	/// Now connected to a new peer for syncing purposes.
@@ -1254,27 +1320,54 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 
 		// Check for finished outgoing requests.
 		let mut finished_block_requests = Vec::new();
+		let mut finished_state_requests = Vec::new();
 		for (id, peer) in self.peers.iter_mut() {
-			if let Peer { block_request: Some((_, pending_response)), .. } = peer {
+			if let Peer { request: Some((_, pending_response)), .. } = peer {
 				match pending_response.poll_unpin(cx) {
 					Poll::Ready(Ok(Ok(resp))) => {
-						let (req, _) = peer.block_request.take().unwrap();
+						let (req, _) = peer.request.take().unwrap();
+						match req {
+							PeerRequest::Block(req) => {
+								let protobuf_response = match crate::schema::v1::BlockResponse::decode(&resp[..]) {
+									Ok(proto) => proto,
+									Err(e) => {
+										debug!(
+											target: "sync",
+											"Failed to decode block response from peer {:?}: {:?}.",
+											id,
+											e
+										);
+										self.peerset_handle.report_peer(id.clone(), rep::BAD_MESSAGE);
+										self.behaviour.disconnect_peer(id, HARDCODED_PEERSETS_SYNC);
+										continue;
+									}
+								};
 
-						let protobuf_response = match crate::schema::v1::BlockResponse::decode(&resp[..]) {
-							Ok(proto) => proto,
-							Err(e) => {
-								debug!(target: "sync", "Failed to decode block request to peer {:?}: {:?}.", id, e);
-								self.peerset_handle.report_peer(id.clone(), rep::BAD_MESSAGE);
-								self.behaviour.disconnect_peer(id, HARDCODED_PEERSETS_SYNC);
-								continue;
-							}
-						};
+								finished_block_requests.push((id.clone(), req, protobuf_response));
+							},
+							PeerRequest::State => {
+								let protobuf_response = match crate::schema::v1::StateResponse::decode(&resp[..]) {
+									Ok(proto) => proto,
+									Err(e) => {
+										debug!(
+											target: "sync",
+											"Failed to decode state response from peer {:?}: {:?}.",
+											id,
+											e
+										);
+										self.peerset_handle.report_peer(id.clone(), rep::BAD_MESSAGE);
+										self.behaviour.disconnect_peer(id, HARDCODED_PEERSETS_SYNC);
+										continue;
+									}
+								};
 
-						finished_block_requests.push((id.clone(), req, protobuf_response));
+								finished_state_requests.push((id.clone(), protobuf_response));
+							},
+						}
 					},
 					Poll::Ready(Ok(Err(e))) => {
-						peer.block_request.take();
-						debug!(target: "sync", "Block request to peer {:?} failed: {:?}.", id, e);
+						peer.request.take();
+						debug!(target: "sync", "Request to peer {:?} failed: {:?}.", id, e);
 
 						match e {
 							RequestFailure::Network(OutboundFailure::Timeout) => {
@@ -1309,10 +1402,10 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 						}
 					},
 					Poll::Ready(Err(oneshot::Canceled)) => {
-						peer.block_request.take();
+						peer.request.take();
 						trace!(
 							target: "sync",
-							"Block request to peer {:?} failed due to oneshot being canceled.",
+							"Request to peer {:?} failed due to oneshot being canceled.",
 							id,
 						);
 						self.behaviour.disconnect_peer(id, HARDCODED_PEERSETS_SYNC);
@@ -1325,6 +1418,10 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 			let ev = self.on_block_response(id, req, protobuf_response);
 			self.pending_messages.push_back(ev);
 		}
+		for (id, protobuf_response) in finished_state_requests {
+			let ev = self.on_state_response(id, protobuf_response);
+			self.pending_messages.push_back(ev);
+		}
 
 		while let Poll::Ready(Some(())) = self.tick_timeout.poll_next_unpin(cx) {
 			self.tick();
@@ -1334,6 +1431,10 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 			let event = prepare_block_request(&mut self.peers, id.clone(), request);
 			self.pending_messages.push_back(event);
 		}
+		if let Some((id, request)) = self.sync.state_request() {
+			let event = prepare_state_request(&mut self.peers, id, request);
+			self.pending_messages.push_back(event);
+		}
 		for (id, request) in self.sync.justification_requests() {
 			let event = prepare_block_request(&mut self.peers, id, request);
 			self.pending_messages.push_back(event);
diff --git a/client/network/src/protocol/sync.rs b/client/network/src/protocol/sync.rs
index 7b7ac721b5b4..82df21fe9d04 100644
--- a/client/network/src/protocol/sync.rs
+++ b/client/network/src/protocol/sync.rs
@@ -31,14 +31,16 @@
 
 use codec::Encode;
 use blocks::BlockCollection;
-use sp_blockchain::{Error as ClientError, Info as BlockchainInfo, HeaderMetadata};
+use state::StateSync;
+use sp_blockchain::{Error as ClientError, HeaderMetadata};
 use sp_consensus::{BlockOrigin, BlockStatus,
 	block_validation::{BlockAnnounceValidator, Validation},
 	import_queue::{IncomingBlock, BlockImportResult, BlockImportError}
 };
 use crate::protocol::message::{
-	self, BlockAnnounce, BlockAttributes, BlockRequest, BlockResponse, Roles,
+	self, BlockAnnounce, BlockAttributes, BlockRequest, BlockResponse,
 };
+use crate::schema::v1::{StateResponse, StateRequest};
 use either::Either;
 use extra_requests::ExtraRequests;
 use libp2p::PeerId;
@@ -59,6 +61,7 @@ use futures::{task::Poll, Future, stream::FuturesUnordered, FutureExt, StreamExt
 
 mod blocks;
 mod extra_requests;
+mod state;
 
 /// Maximum blocks to request in a single packet.
 const MAX_BLOCKS_TO_REQUEST: usize = 128;
@@ -84,6 +87,9 @@ const MAX_CONCURRENT_BLOCK_ANNOUNCE_VALIDATIONS: usize = 256;
 /// See [`MAX_CONCURRENT_BLOCK_ANNOUNCE_VALIDATIONS`] for more information.
 const MAX_CONCURRENT_BLOCK_ANNOUNCE_VALIDATIONS_PER_PEER: usize = 4;
 
+/// Pick the state to sync as the latest finalized number minus this.
+const STATE_SYNC_FINALITY_THRESHOLD: u32 = 8;
+
 /// We use a heuristic that with a high likelihood, by the time
 /// `MAJOR_SYNC_BLOCKS` have been imported we'll be on the same
 /// chain as (or at least closer to) the peer so we want to delay
@@ -183,11 +189,8 @@ pub struct ChainSync<B: BlockT> {
 	best_queued_number: NumberFor<B>,
 	/// The best block hash in our queue of blocks to import
 	best_queued_hash: B::Hash,
-	/// The role of this node, e.g. light or full
-	role: Roles,
-	/// What block attributes we require for this node, usually derived from
-	/// what role we are, but could be customized
-	required_block_attributes: message::BlockAttributes,
+	/// Current mode (full/light)
+	mode: SyncMode,
 	/// Any extra justification requests.
 	extra_justifications: ExtraRequests<B>,
 	/// A set of hashes of blocks that are being downloaded or have been
@@ -209,6 +212,11 @@ pub struct ChainSync<B: BlockT> {
 	>,
 	/// Stats per peer about the number of concurrent block announce validations.
 	block_announce_validation_per_peer_stats: HashMap<PeerId, usize>,
+	/// State sync in progress, if any.
+	state_sync: Option<StateSync<B>>,
+	/// Enable importing existing blocks. This is used used after the state download to
+	/// catch up to the latest state while re-importing blocks.
+	import_existing: bool,
 }
 
 /// All the data we have about a Peer that we are trying to sync with
@@ -281,6 +289,8 @@ pub enum PeerSyncState<B: BlockT> {
 	DownloadingStale(B::Hash),
 	/// Downloading justification for given block hash.
 	DownloadingJustification(B::Hash),
+	/// Downloading state.
+	DownloadingState,
 }
 
 impl<B: BlockT> PeerSyncState<B> {
@@ -298,6 +308,15 @@ pub enum SyncState {
 	Downloading
 }
 
+/// Reported state download progress.
+#[derive(Clone, Eq, PartialEq, Debug)]
+pub struct StateDownloadProgress {
+	/// Estimated download percentage.
+	pub percentage: u32,
+	/// Total state size in bytes downloaded so far.
+	pub size: u64,
+}
+
 /// Syncing status and statistics.
 #[derive(Clone)]
 pub struct Status<B: BlockT> {
@@ -309,6 +328,8 @@ pub struct Status<B: BlockT> {
 	pub num_peers: u32,
 	/// Number of blocks queued for import
 	pub queued_blocks: u32,
+	/// State sync status in progress, if any.
+	pub state_sync: Option<StateDownloadProgress>,
 }
 
 /// A peer did not behave as expected and should be reported.
@@ -344,6 +365,15 @@ impl<B: BlockT> OnBlockData<B> {
 	}
 }
 
+/// Result of [`ChainSync::on_state_data`].
+#[derive(Debug)]
+pub enum OnStateData<B: BlockT> {
+	/// The block and state that should be imported.
+	Import(BlockOrigin, IncomingBlock<B>),
+	/// A new state request needs to be made to the given peer.
+	Request(PeerId, StateRequest)
+}
+
 /// Result of [`ChainSync::poll_block_announce_validation`].
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum PollBlockAnnounceValidation<H> {
@@ -429,6 +459,20 @@ pub enum OnBlockJustification<B: BlockT> {
 	}
 }
 
+
+/// Operation mode.
+#[derive(Debug, PartialEq, Eq)]
+pub enum SyncMode {
+	// Sync headers only
+	Light,
+	// Sync headers and block bodies
+	Full,
+	// Sync headers and the last finalied state
+	LightState {
+		skip_proofs: bool
+	},
+}
+
 /// Result of [`ChainSync::has_slot_for_block_announce_validation`].
 enum HasSlotForBlockAnnounceValidation {
 	/// Yes, there is a slot for the block announce validation.
@@ -442,27 +486,19 @@ enum HasSlotForBlockAnnounceValidation {
 impl<B: BlockT> ChainSync<B> {
 	/// Create a new instance.
 	pub fn new(
-		role: Roles,
+		mode: SyncMode,
 		client: Arc<dyn crate::chain::Client<B>>,
-		info: &BlockchainInfo<B>,
 		block_announce_validator: Box<dyn BlockAnnounceValidator<B> + Send>,
 		max_parallel_downloads: u32,
-	) -> Self {
-		let mut required_block_attributes = BlockAttributes::HEADER | BlockAttributes::JUSTIFICATION;
-
-		if role.is_full() {
-			required_block_attributes |= BlockAttributes::BODY
-		}
-
-		ChainSync {
+	) -> Result<Self, ClientError> {
+		let mut sync = ChainSync {
 			client,
 			peers: HashMap::new(),
 			blocks: BlockCollection::new(),
-			best_queued_hash: info.best_hash,
-			best_queued_number: info.best_number,
+			best_queued_hash: Default::default(),
+			best_queued_number: Zero::zero(),
 			extra_justifications: ExtraRequests::new("justification"),
-			role,
-			required_block_attributes,
+			mode,
 			queue_blocks: Default::default(),
 			fork_targets: Default::default(),
 			pending_requests: Default::default(),
@@ -471,6 +507,27 @@ impl<B: BlockT> ChainSync<B> {
 			downloaded_blocks: 0,
 			block_announce_validation: Default::default(),
 			block_announce_validation_per_peer_stats: Default::default(),
+			state_sync: None,
+			import_existing: false,
+		};
+		sync.reset_sync_start_point()?;
+		Ok(sync)
+	}
+
+	fn required_block_attributes(&self) -> BlockAttributes {
+		match self.mode {
+			SyncMode::Full => BlockAttributes::HEADER | BlockAttributes::JUSTIFICATION | BlockAttributes::BODY,
+			SyncMode::Light => BlockAttributes::HEADER | BlockAttributes::JUSTIFICATION,
+			SyncMode::LightState { .. } =>
+				BlockAttributes::HEADER | BlockAttributes::JUSTIFICATION | BlockAttributes::BODY,
+		}
+	}
+
+	fn skip_execution(&self) -> bool {
+		match self.mode {
+			SyncMode::Full => false,
+			SyncMode::Light => true,
+			SyncMode::LightState { .. } => true,
 		}
 	}
 
@@ -502,6 +559,7 @@ impl<B: BlockT> ChainSync<B> {
 			best_seen_block: best_seen,
 			num_peers: self.peers.len() as u32,
 			queued_blocks: self.queue_blocks.len() as u32,
+			state_sync: self.state_sync.as_ref().map(|s| s.progress()),
 		}
 	}
 
@@ -607,7 +665,7 @@ impl<B: BlockT> ChainSync<B> {
 				);
 				self.peers.insert(who.clone(), PeerSync {
 					peer_id: who.clone(),
-					common_number: best_number,
+					common_number: std::cmp::min(self.best_queued_number, best_number),
 					best_hash,
 					best_number,
 					state: PeerSyncState::Available,
@@ -718,7 +776,7 @@ impl<B: BlockT> ChainSync<B> {
 
 	/// Get an iterator over all block requests of all peers.
 	pub fn block_requests(&mut self) -> impl Iterator<Item = (&PeerId, BlockRequest<B>)> + '_ {
-		if self.pending_requests.is_empty() {
+		if self.pending_requests.is_empty() || self.state_sync.is_some() {
 			return Either::Left(std::iter::empty())
 		}
 		if self.queue_blocks.len() > MAX_IMPORTING_BLOCKS {
@@ -726,10 +784,10 @@ impl<B: BlockT> ChainSync<B> {
 			return Either::Left(std::iter::empty())
 		}
 		let major_sync = self.status().state == SyncState::Downloading;
+		let attrs = self.required_block_attributes();
 		let blocks = &mut self.blocks;
-		let attrs = &self.required_block_attributes;
 		let fork_targets = &mut self.fork_targets;
-		let last_finalized = self.client.info().finalized_number;
+		let last_finalized = std::cmp::min(self.best_queued_number, self.client.info().finalized_number);
 		let best_queued = self.best_queued_number;
 		let client = &self.client;
 		let queue = &self.queue_blocks;
@@ -804,6 +862,28 @@ impl<B: BlockT> ChainSync<B> {
 		Either::Right(iter)
 	}
 
+	/// Get a state request, if any
+	pub fn state_request(&mut self) -> Option<(PeerId, StateRequest)> {
+		if let Some(sync) = &self.state_sync {
+			if sync.is_complete() {
+				return None;
+			}
+			if self.peers.iter().any(|(_, peer)| peer.state == PeerSyncState::DownloadingState) {
+				// Only one pending state request is allowed.
+				return None;
+			}
+			for (id, peer) in self.peers.iter_mut() {
+				if peer.state.is_available() && peer.common_number >= sync.target_block_num() {
+					trace!(target: "sync", "New StateRequest for {}", id);
+					peer.state = PeerSyncState::DownloadingState;
+					let request = sync.next_request();
+					return Some((id.clone(), request))
+				}
+			}
+		}
+		None
+	}
+
 	/// Handle a response from the remote to a block request that we made.
 	///
 	/// `request` must be the original request that triggered `response`.
@@ -848,7 +928,9 @@ impl<B: BlockT> ChainSync<B> {
 										justifications,
 										origin: block_data.origin,
 										allow_missing_state: true,
-										import_existing: false,
+										import_existing: self.import_existing,
+										skip_execution: self.skip_execution(),
+										state: None,
 									}
 								}).collect()
 						}
@@ -870,7 +952,9 @@ impl<B: BlockT> ChainSync<B> {
 									justifications,
 									origin: Some(who.clone()),
 									allow_missing_state: true,
-									import_existing: false,
+									import_existing: self.import_existing,
+									skip_execution: self.skip_execution(),
+									state: None,
 								}
 							}).collect()
 						}
@@ -963,10 +1047,11 @@ impl<B: BlockT> ChainSync<B> {
 								peer.state = PeerSyncState::Available;
 								Vec::new()
 							}
-						}
-
-						| PeerSyncState::Available
-						| PeerSyncState::DownloadingJustification(..) => Vec::new()
+						},
+						PeerSyncState::Available
+						| PeerSyncState::DownloadingJustification(..)
+						| PeerSyncState::DownloadingState
+							=> Vec::new()
 					}
 				} else {
 					// When request.is_none() this is a block announcement. Just accept blocks.
@@ -983,6 +1068,8 @@ impl<B: BlockT> ChainSync<B> {
 							origin: Some(who.clone()),
 							allow_missing_state: true,
 							import_existing: false,
+							skip_execution: true,
+							state: None,
 						}
 					}).collect()
 				}
@@ -994,6 +1081,60 @@ impl<B: BlockT> ChainSync<B> {
 		Ok(self.validate_and_queue_blocks(new_blocks))
 	}
 
+	/// Handle a response from the remote to a state request that we made.
+	///
+	/// Returns next request if any.
+	pub fn on_state_data(
+		&mut self,
+		who: &PeerId,
+		response: StateResponse,
+	) -> Result<OnStateData<B>, BadPeer> {
+		let import_result = if let Some(sync) = &mut self.state_sync {
+			debug!(
+				target: "sync",
+				"Importing state data from {} with {} keys, {} proof nodes.",
+				who,
+				response.entries.len(),
+				response.proof.len(),
+			);
+			sync.import(response)
+		} else {
+			debug!(target: "sync", "Ignored obsolete state response from {}", who);
+			return Err(BadPeer(who.clone(), rep::NOT_REQUESTED));
+		};
+
+		match import_result {
+			state::ImportResult::Import(hash, header, state) => {
+				let origin = if self.status().state != SyncState::Downloading {
+					BlockOrigin::NetworkBroadcast
+				} else {
+					BlockOrigin::NetworkInitialSync
+				};
+
+				let block = IncomingBlock {
+					hash,
+					header: Some(header),
+					body: None,
+					justifications: None,
+					origin: None,
+					allow_missing_state: true,
+					import_existing: true,
+					skip_execution: self.skip_execution(),
+					state: Some(state),
+				};
+				debug!(target: "sync", "State sync is complete. Import is queued");
+				Ok(OnStateData::Import(origin, block))
+			}
+			state::ImportResult::Continue(request) => {
+				Ok(OnStateData::Request(who.clone(), request))
+			}
+			state::ImportResult::BadResponse => {
+				debug!(target: "sync", "Bad state data received from {}", who);
+				Err(BadPeer(who.clone(), rep::BAD_BLOCK))
+			}
+		}
+	}
+
 	fn validate_and_queue_blocks(
 		&mut self,
 		mut new_blocks: Vec<IncomingBlock<B>>,
@@ -1048,7 +1189,7 @@ impl<B: BlockT> ChainSync<B> {
 			// We only request one justification at a time
 			let justification = if let Some(block) = response.blocks.into_iter().next() {
 				if hash != block.hash {
-					info!(
+					warn!(
 						target: "sync",
 						"💔 Invalid block justification provided by {}: requested: {:?} got: {:?}", who, hash, block.hash
 					);
@@ -1137,7 +1278,7 @@ impl<B: BlockT> ChainSync<B> {
 
 					if aux.bad_justification {
 						if let Some(ref peer) = who {
-							info!("💔 Sent block with bad justification to import");
+							warn!("💔 Sent block with bad justification to import");
 							output.push(Err(BadPeer(peer.clone(), rep::BAD_JUSTIFICATION)));
 						}
 					}
@@ -1145,6 +1286,17 @@ impl<B: BlockT> ChainSync<B> {
 					if let Some(peer) = who.and_then(|p| self.peers.get_mut(&p)) {
 						peer.update_common_number(number);
 					}
+					let state_sync_complete = self.state_sync.as_ref().map_or(false, |s| s.target() == hash);
+					if state_sync_complete {
+						info!(
+							target: "sync",
+							"State sync is complete ({} MiB), restarting block sync.",
+							self.state_sync.as_ref().map_or(0, |s| s.progress().size / (1024 * 1024)),
+						);
+						self.state_sync = None;
+						self.mode = SyncMode::Full;
+						output.extend(self.restart());
+					}
 				},
 				Err(BlockImportError::IncompleteHeader(who)) => {
 					if let Some(peer) = who {
@@ -1171,7 +1323,7 @@ impl<B: BlockT> ChainSync<B> {
 				},
 				Err(BlockImportError::BadBlock(who)) => {
 					if let Some(peer) = who {
-						info!(
+						warn!(
 							target: "sync",
 							"💔 Block {:?} received from peer {} has been blacklisted",
 							hash,
@@ -1189,6 +1341,7 @@ impl<B: BlockT> ChainSync<B> {
 				e @ Err(BlockImportError::UnknownParent) |
 				e @ Err(BlockImportError::Other(_)) => {
 					warn!(target: "sync", "💔 Error importing block {:?}: {:?}", hash, e);
+					self.state_sync = None;
 					output.extend(self.restart());
 				},
 				Err(BlockImportError::Cancelled) => {}
@@ -1214,6 +1367,29 @@ impl<B: BlockT> ChainSync<B> {
 			is_descendent_of(&**client, base, block)
 		});
 
+		if let SyncMode::LightState { skip_proofs } = &self.mode {
+			if self.state_sync.is_none()
+				&& !self.peers.is_empty()
+				&& self.queue_blocks.is_empty()
+			{
+				// Finalized a recent block.
+				let mut heads: Vec<_> = self.peers.iter().map(|(_, peer)| peer.best_number).collect();
+				heads.sort();
+				let median = heads[heads.len() / 2];
+				if number + STATE_SYNC_FINALITY_THRESHOLD.saturated_into() >= median {
+					if let Ok(Some(header)) = self.client.header(BlockId::hash(hash.clone())) {
+						log::debug!(
+							target: "sync",
+							"Starting state sync for #{} ({})",
+							number,
+							hash,
+						);
+						self.state_sync = Some(StateSync::new(self.client.clone(), header, *skip_proofs));
+					}
+				}
+			}
+		}
+
 		if let Err(err) = r {
 			warn!(
 				target: "sync",
@@ -1536,7 +1712,7 @@ impl<B: BlockT> ChainSync<B> {
 			return PollBlockAnnounceValidation::Nothing { is_best, who, announce }
 		}
 
-		let requires_additional_data = !self.role.is_light() || !known_parent;
+		let requires_additional_data = self.mode != SyncMode::Light || !known_parent;
 		if !requires_additional_data {
 			trace!(
 				target: "sync",
@@ -1595,6 +1771,8 @@ impl<B: BlockT> ChainSync<B> {
 					origin: block_data.origin,
 					allow_missing_state: true,
 					import_existing: false,
+					skip_execution: self.skip_execution(),
+					state: None,
 				}
 			}).collect();
 		if !blocks.is_empty() {
@@ -1611,9 +1789,9 @@ impl<B: BlockT> ChainSync<B> {
 		&'a mut self,
 	) -> impl Iterator<Item = Result<(PeerId, BlockRequest<B>), BadPeer>> + 'a {
 		self.blocks.clear();
-		let info = self.client.info();
-		self.best_queued_hash = info.best_hash;
-		self.best_queued_number = info.best_number;
+		if let Err(e) = self.reset_sync_start_point() {
+			warn!(target: "sync", "💔  Unable to restart sync. :{:?}", e);
+		}
 		self.pending_requests.set_all();
 		debug!(target:"sync", "Restarted with {} ({})", self.best_queued_number, self.best_queued_hash);
 		let old_peers = std::mem::take(&mut self.peers);
@@ -1624,7 +1802,7 @@ impl<B: BlockT> ChainSync<B> {
 			match p.state {
 				PeerSyncState::DownloadingJustification(_) => {
 					// We make sure our commmon number is at least something we have.
-					p.common_number = info.best_number;
+					p.common_number = self.best_queued_number;
 					self.peers.insert(id, p);
 					return None;
 				}
@@ -1640,6 +1818,38 @@ impl<B: BlockT> ChainSync<B> {
 		})
 	}
 
+	/// Find a block to start sync from. If we sync with state, that's the latest block we have state for.
+	fn reset_sync_start_point(&mut self) -> Result<(), ClientError> {
+		let info = self.client.info();
+		if matches!(self.mode, SyncMode::LightState {..}) && info.finalized_state.is_some() {
+			log::warn!(
+				target: "sync",
+				"Can't use fast sync mode with a partially synced database. Reverting to full sync mode."
+			);
+			self.mode = SyncMode::Full;
+		}
+		self.import_existing = false;
+		self.best_queued_hash = info.best_hash;
+		self.best_queued_number = info.best_number;
+		if self.mode == SyncMode::Full {
+			if self.client.block_status(&BlockId::hash(info.best_hash))? != BlockStatus::InChainWithState {
+				self.import_existing = true;
+				// Latest state is missing, start with the last finalized state or genesis instead.
+				if let Some((hash, number)) = info.finalized_state {
+					log::debug!(target: "sync", "Starting from finalized state #{}", number);
+					self.best_queued_hash = hash;
+					self.best_queued_number = number;
+				} else {
+					log::debug!(target: "sync", "Restarting from genesis");
+					self.best_queued_hash = Default::default();
+					self.best_queued_number = Zero::zero();
+				}
+			}
+		}
+		log::trace!(target: "sync", "Restarted sync at #{} ({:?})", self.best_queued_number, self.best_queued_hash);
+		Ok(())
+	}
+
 	/// What is the status of the block corresponding to the given hash?
 	fn block_status(&self, hash: &B::Hash) -> Result<BlockStatus, ClientError> {
 		if self.queue_blocks.contains(hash) {
@@ -1764,7 +1974,7 @@ fn peer_block_request<B: BlockT>(
 	id: &PeerId,
 	peer: &PeerSync<B>,
 	blocks: &mut BlockCollection<B>,
-	attrs: &message::BlockAttributes,
+	attrs: message::BlockAttributes,
 	max_parallel_downloads: u32,
 	finalized: NumberFor<B>,
 	best_num: NumberFor<B>,
@@ -1815,7 +2025,7 @@ fn fork_sync_request<B: BlockT>(
 	targets: &mut HashMap<B::Hash, ForkTarget<B>>,
 	best_num: NumberFor<B>,
 	finalized: NumberFor<B>,
-	attributes: &message::BlockAttributes,
+	attributes: message::BlockAttributes,
 	check_block: impl Fn(&B::Hash) -> BlockStatus,
 ) -> Option<(B::Hash, BlockRequest<B>)> {
 	targets.retain(|hash, r| {
@@ -1994,17 +2204,15 @@ mod test {
 		// internally we should process the response as the justification not being available.
 
 		let client = Arc::new(TestClientBuilder::new().build());
-		let info = client.info();
 		let block_announce_validator = Box::new(DefaultBlockAnnounceValidator);
 		let peer_id = PeerId::random();
 
 		let mut sync = ChainSync::new(
-			Roles::AUTHORITY,
+			SyncMode::Full,
 			client.clone(),
-			&info,
 			block_announce_validator,
 			1,
-		);
+		).unwrap();
 
 		let (a1_hash, a1_number) = {
 			let a1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
@@ -2067,15 +2275,12 @@ mod test {
 	#[test]
 	fn restart_doesnt_affect_peers_downloading_finality_data() {
 		let mut client = Arc::new(TestClientBuilder::new().build());
-		let info = client.info();
-
 		let mut sync = ChainSync::new(
-			Roles::AUTHORITY,
+			SyncMode::Full,
 			client.clone(),
-			&info,
 			Box::new(DefaultBlockAnnounceValidator),
 			1,
-		);
+		).unwrap();
 
 		let peer_id1 = PeerId::random();
 		let peer_id2 = PeerId::random();
@@ -2242,15 +2447,13 @@ mod test {
 		sp_tracing::try_init_simple();
 
 		let mut client = Arc::new(TestClientBuilder::new().build());
-		let info = client.info();
 
 		let mut sync = ChainSync::new(
-			Roles::AUTHORITY,
+			SyncMode::Full,
 			client.clone(),
-			&info,
 			Box::new(DefaultBlockAnnounceValidator),
 			5,
-		);
+		).unwrap();
 
 		let peer_id1 = PeerId::random();
 		let peer_id2 = PeerId::random();
@@ -2359,12 +2562,11 @@ mod test {
 		let info = client.info();
 
 		let mut sync = ChainSync::new(
-			Roles::AUTHORITY,
+			SyncMode::Full,
 			client.clone(),
-			&info,
 			Box::new(DefaultBlockAnnounceValidator),
 			5,
-		);
+		).unwrap();
 
 		let peer_id1 = PeerId::random();
 		let peer_id2 = PeerId::random();
@@ -2481,12 +2683,11 @@ mod test {
 		let info = client.info();
 
 		let mut sync = ChainSync::new(
-			Roles::AUTHORITY,
+			SyncMode::Full,
 			client.clone(),
-			&info,
 			Box::new(DefaultBlockAnnounceValidator),
 			5,
-		);
+		).unwrap();
 
 		let finalized_block = blocks[MAX_BLOCKS_TO_LOOK_BACKWARDS as usize * 2 - 1].clone();
 		let just = (*b"TEST", Vec::new());
@@ -2592,15 +2793,12 @@ mod test {
 			.map(|_| build_block(&mut client, None, false))
 			.collect::<Vec<_>>();
 
-		let info = client.info();
-
 		let mut sync = ChainSync::new(
-			Roles::AUTHORITY,
+			SyncMode::Full,
 			client.clone(),
-			&info,
 			Box::new(DefaultBlockAnnounceValidator),
 			1,
-		);
+		).unwrap();
 
 		let peer_id1 = PeerId::random();
 		let common_block = blocks[1].clone();
diff --git a/client/network/src/protocol/sync/state.rs b/client/network/src/protocol/sync/state.rs
new file mode 100644
index 000000000000..fc9dfdbb8c37
--- /dev/null
+++ b/client/network/src/protocol/sync/state.rs
@@ -0,0 +1,187 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+use std::sync::Arc;
+use codec::{Encode, Decode};
+use sp_runtime::traits::{Block as BlockT, Header, NumberFor};
+use sc_client_api::StorageProof;
+use crate::schema::v1::{StateRequest, StateResponse, StateEntry};
+use crate::chain::{Client, ImportedState};
+use super::StateDownloadProgress;
+
+/// State sync support.
+
+/// State sync state machine. Accumulates partial state data until it
+/// is ready to be imported.
+pub struct StateSync<B: BlockT> {
+	target_block: B::Hash,
+	target_header: B::Header,
+	target_root: B::Hash,
+	last_key: Vec<u8>,
+	state: Vec<(Vec<u8>, Vec<u8>)>,
+	complete: bool,
+	client: Arc<dyn Client<B>>,
+	imported_bytes: u64,
+	skip_proof: bool,
+}
+
+/// Import state chunk result.
+pub enum ImportResult<B: BlockT> {
+	/// State is complete and ready for import.
+	Import(B::Hash, B::Header, ImportedState<B>),
+	/// Continue dowloading.
+	Continue(StateRequest),
+	/// Bad state chunk.
+	BadResponse,
+}
+
+impl<B: BlockT> StateSync<B> {
+	///  Create a new instance.
+	pub fn new(client: Arc<dyn Client<B>>, target: B::Header, skip_proof: bool) -> Self {
+		StateSync {
+			client,
+			target_block: target.hash(),
+			target_root: target.state_root().clone(),
+			target_header: target,
+			last_key: Vec::default(),
+			state: Vec::default(),
+			complete: false,
+			imported_bytes: 0,
+			skip_proof,
+		}
+	}
+
+	///  Validate and import a state reponse.
+	pub fn import(&mut self, response: StateResponse) -> ImportResult<B> {
+		if response.entries.is_empty() && response.proof.is_empty() && !response.complete {
+			log::debug!(
+				target: "sync",
+				"Bad state response",
+			);
+			return ImportResult::BadResponse;
+		}
+		if !self.skip_proof && response.proof.is_empty() {
+			log::debug!(
+				target: "sync",
+				"Missing proof",
+			);
+			return ImportResult::BadResponse;
+		}
+		let complete = if !self.skip_proof {
+			log::debug!(
+				target: "sync",
+				"Importing state from {} trie nodes",
+				response.proof.len(),
+			);
+			let proof_size = response.proof.len() as u64;
+			let proof = match StorageProof::decode(&mut response.proof.as_ref()) {
+				Ok(proof) => proof,
+				Err(e) => {
+					log::debug!(target: "sync", "Error decoding proof: {:?}", e);
+					return ImportResult::BadResponse;
+				}
+			};
+			let (values, complete) = match self.client.verify_range_proof(
+				self.target_root,
+				proof,
+				&self.last_key
+			) {
+				Err(e) => {
+					log::debug!(
+						target: "sync",
+						"StateResponse failed proof verification: {:?}",
+						e,
+					);
+					return ImportResult::BadResponse;
+				},
+				Ok(values) => values,
+			};
+			log::debug!(target: "sync", "Imported with {} keys", values.len());
+
+			if let Some(last) = values.last().map(|(k, _)| k) {
+				self.last_key = last.clone();
+			}
+
+			for (key, value) in values {
+				self.imported_bytes += key.len() as u64;
+				self.state.push((key, value))
+			};
+			self.imported_bytes += proof_size;
+			complete
+		} else {
+			log::debug!(
+				target: "sync",
+				"Importing state from {:?} to {:?}",
+				response.entries.last().map(|e| sp_core::hexdisplay::HexDisplay::from(&e.key)),
+				response.entries.first().map(|e| sp_core::hexdisplay::HexDisplay::from(&e.key)),
+			);
+
+			if let Some(e) = response.entries.last() {
+				self.last_key = e.key.clone();
+			}
+			for StateEntry { key, value } in response.entries {
+				self.imported_bytes += (key.len() + value.len()) as u64;
+				self.state.push((key, value))
+			}
+			response.complete
+		};
+		if complete {
+			self.complete = true;
+			ImportResult::Import(self.target_block.clone(), self.target_header.clone(), ImportedState {
+				block: self.target_block.clone(),
+				state: std::mem::take(&mut self.state)
+			})
+		} else {
+			ImportResult::Continue(self.next_request())
+		}
+	}
+
+	/// Produce next state request.
+	pub fn next_request(&self) -> StateRequest {
+		StateRequest {
+			block: self.target_block.encode(),
+			start: self.last_key.clone(),
+			no_proof: self.skip_proof,
+		}
+	}
+
+	/// Check if the state is complete.
+	pub fn is_complete(&self) -> bool {
+		self.complete
+	}
+
+	/// Returns target block number.
+	pub fn target_block_num(&self) -> NumberFor<B> {
+		self.target_header.number().clone()
+	}
+
+	/// Returns target block hash.
+	pub fn target(&self) -> B::Hash {
+		self.target_block.clone()
+	}
+
+	/// Returns state sync estimated progress.
+	pub fn progress(&self) -> StateDownloadProgress {
+		let percent_done = (*self.last_key.get(0).unwrap_or(&0u8) as u32) * 100 / 256;
+		StateDownloadProgress {
+			percentage: percent_done,
+			size: self.imported_bytes,
+		}
+	}
+}
+
diff --git a/client/network/src/schema/api.v1.proto b/client/network/src/schema/api.v1.proto
index 23d585b05e9c..a16fdbaebc81 100644
--- a/client/network/src/schema/api.v1.proto
+++ b/client/network/src/schema/api.v1.proto
@@ -68,3 +68,28 @@ message BlockData {
 	bytes justifications = 8; // optional
 }
 
+// Request storage data from a peer.
+message StateRequest {
+	// Block header hash.
+	bytes block = 1;
+	// Start from this key. Equivalent to <empty bytes> if omitted.
+	bytes start = 2; // optional
+	// if 'true' indicates that response should contain raw key-values, rather than proof.
+	bool no_proof = 3;
+}
+
+message StateResponse {
+	// A collection of keys-values. Only populated if `no_proof` is `true`
+	repeated StateEntry entries = 1;
+	// If `no_proof` is false in request, this contains proof nodes.
+	bytes proof = 2;
+	// Set to true when there are no more keys to return.
+	bool complete = 3;
+}
+
+// A key-value pair
+message StateEntry {
+	bytes key = 1;
+	bytes value = 2;
+}
+
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 666108363f64..0bc28288501a 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -48,7 +48,7 @@ use crate::{
 		Protocol,
 		Ready,
 		event::Event,
-		sync::SyncState,
+		sync::{SyncState, Status as SyncStatus},
 	},
 	transactions,
 	transport, ReputationChange,
@@ -196,6 +196,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 			protocol::ProtocolConfig {
 				roles: From::from(&params.role),
 				max_parallel_downloads: params.network_config.max_parallel_downloads,
+				sync_mode: params.network_config.sync_mode.clone(),
 			},
 			params.chain.clone(),
 			params.protocol_id.clone(),
@@ -331,7 +332,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 			};
 
 			let behaviour = {
-				let bitswap = if params.network_config.ipfs_server { Some(Bitswap::new(client)) } else { None };
+				let bitswap = params.network_config.ipfs_server.then(|| Bitswap::new(client));
 				let result = Behaviour::new(
 					protocol,
 					user_agent,
@@ -339,6 +340,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 					light_client_request_sender,
 					discovery_config,
 					params.block_request_protocol_config,
+					params.state_request_protocol_config,
 					bitswap,
 					params.light_client_request_protocol_config,
 					params.network_config.request_response_protocols,
@@ -442,14 +444,16 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 
 	/// High-level network status information.
 	pub fn status(&self) -> NetworkStatus<B> {
+		let status = self.sync_state();
 		NetworkStatus {
-			sync_state: self.sync_state(),
+			sync_state: status.state,
 			best_seen_block: self.best_seen_block(),
 			num_sync_peers: self.num_sync_peers(),
 			num_connected_peers: self.num_connected_peers(),
 			num_active_peers: self.num_active_peers(),
 			total_bytes_inbound: self.total_bytes_inbound(),
 			total_bytes_outbound: self.total_bytes_outbound(),
+			state_sync: status.state_sync,
 		}
 	}
 
@@ -474,7 +478,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 	}
 
 	/// Current global sync state.
-	pub fn sync_state(&self) -> SyncState {
+	pub fn sync_state(&self) -> SyncStatus<B> {
 		self.network_service.behaviour().user_protocol().sync_state()
 	}
 
@@ -1869,7 +1873,7 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 			*this.external_addresses.lock() = external_addresses;
 		}
 
-		let is_major_syncing = match this.network_service.behaviour_mut().user_protocol_mut().sync_state() {
+		let is_major_syncing = match this.network_service.behaviour_mut().user_protocol_mut().sync_state().state {
 			SyncState::Idle => false,
 			SyncState::Downloading => true,
 		};
diff --git a/client/network/src/service/tests.rs b/client/network/src/service/tests.rs
index 4e5bba8f7d33..c2e3844849f5 100644
--- a/client/network/src/service/tests.rs
+++ b/client/network/src/service/tests.rs
@@ -18,6 +18,7 @@
 
 use crate::{config, Event, NetworkService, NetworkWorker};
 use crate::block_request_handler::BlockRequestHandler;
+use crate::state_request_handler::StateRequestHandler;
 use crate::light_client_requests::handler::LightClientRequestHandler;
 
 use libp2p::PeerId;
@@ -107,6 +108,16 @@ fn build_test_full_node(config: config::NetworkConfiguration)
 		protocol_config
 	};
 
+	let state_request_protocol_config = {
+		let (handler, protocol_config) = StateRequestHandler::new(
+			&protocol_id,
+			client.clone(),
+			50,
+		);
+		async_std::task::spawn(handler.run().boxed());
+		protocol_config
+	};
+
 	let light_client_request_protocol_config = {
 		let (handler, protocol_config) = LightClientRequestHandler::new(
 			&protocol_id,
@@ -131,6 +142,7 @@ fn build_test_full_node(config: config::NetworkConfiguration)
 		),
 		metrics_registry: None,
 		block_request_protocol_config,
+		state_request_protocol_config,
 		light_client_request_protocol_config,
 	})
 	.unwrap();
diff --git a/client/network/src/state_request_handler.rs b/client/network/src/state_request_handler.rs
new file mode 100644
index 000000000000..bf47b412f46d
--- /dev/null
+++ b/client/network/src/state_request_handler.rs
@@ -0,0 +1,246 @@
+// Copyright 2020 Parity Technologies (UK) Ltd.
+// This file is part of Substrate.
+
+// Substrate is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Substrate is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Helper for handling (i.e. answering) state requests from a remote peer via the
+//! [`crate::request_responses::RequestResponsesBehaviour`].
+
+use codec::{Encode, Decode};
+use crate::chain::Client;
+use crate::config::ProtocolId;
+use crate::request_responses::{IncomingRequest, OutgoingResponse, ProtocolConfig};
+use crate::schema::v1::{StateResponse, StateRequest, StateEntry};
+use crate::{PeerId, ReputationChange};
+use futures::channel::{mpsc, oneshot};
+use futures::stream::StreamExt;
+use log::debug;
+use lru::LruCache;
+use prost::Message;
+use sp_runtime::generic::BlockId;
+use sp_runtime::traits::Block as BlockT;
+use std::sync::Arc;
+use std::time::Duration;
+use std::hash::{Hasher, Hash};
+
+const LOG_TARGET: &str = "sync";
+const MAX_RESPONSE_BYTES: usize = 2 * 1024 * 1024; // Actual reponse may be bigger.
+const MAX_NUMBER_OF_SAME_REQUESTS_PER_PEER: usize = 2;
+
+mod rep {
+	use super::ReputationChange as Rep;
+
+	/// Reputation change when a peer sent us the same request multiple times.
+	pub const SAME_REQUEST: Rep = Rep::new(i32::min_value(), "Same state request multiple times");
+}
+
+/// Generates a [`ProtocolConfig`] for the block request protocol, refusing incoming requests.
+pub fn generate_protocol_config(protocol_id: &ProtocolId) -> ProtocolConfig {
+	ProtocolConfig {
+		name: generate_protocol_name(protocol_id).into(),
+		max_request_size: 1024 * 1024,
+		max_response_size: 16 * 1024 * 1024,
+		request_timeout: Duration::from_secs(40),
+		inbound_queue: None,
+	}
+}
+
+/// Generate the state protocol name from chain specific protocol identifier.
+fn generate_protocol_name(protocol_id: &ProtocolId) -> String {
+	let mut s = String::new();
+	s.push_str("/");
+	s.push_str(protocol_id.as_ref());
+	s.push_str("/state/1");
+	s
+}
+
+/// The key of [`BlockRequestHandler::seen_requests`].
+#[derive(Eq, PartialEq, Clone)]
+struct SeenRequestsKey<B: BlockT> {
+	peer: PeerId,
+	block: B::Hash,
+	start: Vec<u8>,
+}
+
+impl<B: BlockT> Hash for SeenRequestsKey<B> {
+	fn hash<H: Hasher>(&self, state: &mut H) {
+		self.peer.hash(state);
+		self.block.hash(state);
+		self.start.hash(state);
+	}
+}
+
+/// The value of [`StateRequestHandler::seen_requests`].
+enum SeenRequestsValue {
+	/// First time we have seen the request.
+	First,
+	/// We have fulfilled the request `n` times.
+	Fulfilled(usize),
+}
+
+/// Handler for incoming block requests from a remote peer.
+pub struct StateRequestHandler<B: BlockT> {
+	client: Arc<dyn Client<B>>,
+	request_receiver: mpsc::Receiver<IncomingRequest>,
+	/// Maps from request to number of times we have seen this request.
+	///
+	/// This is used to check if a peer is spamming us with the same request.
+	seen_requests: LruCache<SeenRequestsKey<B>, SeenRequestsValue>,
+}
+
+impl<B: BlockT> StateRequestHandler<B> {
+	/// Create a new [`StateRequestHandler`].
+	pub fn new(
+		protocol_id: &ProtocolId,
+		client: Arc<dyn Client<B>>,
+		num_peer_hint: usize,
+	) -> (Self, ProtocolConfig) {
+		// Reserve enough request slots for one request per peer when we are at the maximum
+		// number of peers.
+		let (tx, request_receiver) = mpsc::channel(num_peer_hint);
+
+		let mut protocol_config = generate_protocol_config(protocol_id);
+		protocol_config.inbound_queue = Some(tx);
+
+		let seen_requests = LruCache::new(num_peer_hint * 2);
+
+		(Self { client, request_receiver, seen_requests }, protocol_config)
+	}
+
+	/// Run [`StateRequestHandler`].
+	pub async fn run(mut self) {
+		while let Some(request) = self.request_receiver.next().await {
+			let IncomingRequest { peer, payload, pending_response } = request;
+
+			match self.handle_request(payload, pending_response, &peer) {
+				Ok(()) => debug!(target: LOG_TARGET, "Handled block request from {}.", peer),
+				Err(e) => debug!(
+					target: LOG_TARGET,
+					"Failed to handle state request from {}: {}",
+					peer,
+					e,
+				),
+			}
+		}
+	}
+
+	fn handle_request(
+		&mut self,
+		payload: Vec<u8>,
+		pending_response: oneshot::Sender<OutgoingResponse>,
+		peer: &PeerId,
+	) -> Result<(), HandleRequestError> {
+		let request = StateRequest::decode(&payload[..])?;
+		let block: B::Hash = Decode::decode(&mut request.block.as_ref())?;
+
+		let key = SeenRequestsKey {
+			peer: *peer,
+			block: block.clone(),
+			start: request.start.clone(),
+		};
+
+		let mut reputation_changes = Vec::new();
+
+		match self.seen_requests.get_mut(&key) {
+			Some(SeenRequestsValue::First) => {},
+			Some(SeenRequestsValue::Fulfilled(ref mut requests)) => {
+				*requests = requests.saturating_add(1);
+
+				if *requests > MAX_NUMBER_OF_SAME_REQUESTS_PER_PEER {
+					reputation_changes.push(rep::SAME_REQUEST);
+				}
+			},
+			None => {
+				self.seen_requests.put(key.clone(), SeenRequestsValue::First);
+			}
+		}
+
+		log::trace!(
+			target: LOG_TARGET,
+			"Handling state request from {}: Block {:?}, Starting at {:?}, no_proof={}",
+			peer,
+			request.block,
+			sp_core::hexdisplay::HexDisplay::from(&request.start),
+			request.no_proof,
+		);
+
+		let result = if reputation_changes.is_empty() {
+			let mut response = StateResponse::default();
+
+			if !request.no_proof {
+				let (proof, count) = self.client.read_proof_collection(
+					&BlockId::hash(block),
+					&request.start,
+					MAX_RESPONSE_BYTES,
+				)?;
+				response.proof = proof.encode();
+				if count == 0 {
+					response.complete = true;
+				}
+			} else {
+				let entries = self.client.storage_collection(
+					&BlockId::hash(block),
+					&request.start,
+					MAX_RESPONSE_BYTES,
+				)?;
+				response.entries = entries.into_iter().map(|(key, value)| StateEntry { key, value }).collect();
+				if response.entries.is_empty() {
+					response.complete = true;
+				}
+			}
+
+			log::trace!(
+				target: LOG_TARGET,
+				"StateResponse contains {} keys, {}, proof nodes, complete={}, from {:?} to {:?}",
+				response.entries.len(),
+				response.proof.len(),
+				response.complete,
+				response.entries.first().map(|e| sp_core::hexdisplay::HexDisplay::from(&e.key)),
+				response.entries.last().map(|e| sp_core::hexdisplay::HexDisplay::from(&e.key)),
+			);
+			if let Some(value) = self.seen_requests.get_mut(&key) {
+				// If this is the first time we have processed this request, we need to change
+				// it to `Fulfilled`.
+				if let SeenRequestsValue::First = value {
+					*value = SeenRequestsValue::Fulfilled(1);
+				}
+			}
+
+			let mut data = Vec::with_capacity(response.encoded_len());
+			response.encode(&mut data)?;
+			Ok(data)
+		} else {
+			Err(())
+		};
+
+		pending_response.send(OutgoingResponse {
+			result,
+			reputation_changes,
+			sent_feedback: None,
+		}).map_err(|_| HandleRequestError::SendResponse)
+	}
+}
+
+#[derive(derive_more::Display, derive_more::From)]
+enum HandleRequestError {
+	#[display(fmt = "Failed to decode request: {}.", _0)]
+	DecodeProto(prost::DecodeError),
+	#[display(fmt = "Failed to encode response: {}.", _0)]
+	EncodeProto(prost::EncodeError),
+	#[display(fmt = "Failed to decode block hash: {}.", _0)]
+	InvalidHash(codec::Error),
+	Client(sp_blockchain::Error),
+	#[display(fmt = "Failed to send response.")]
+	SendResponse,
+}
diff --git a/client/network/test/src/block_import.rs b/client/network/test/src/block_import.rs
index b3641d4b4121..05169aba8d73 100644
--- a/client/network/test/src/block_import.rs
+++ b/client/network/test/src/block_import.rs
@@ -46,6 +46,8 @@ fn prepare_good_block() -> (TestClient, Hash, u64, PeerId, IncomingBlock<Block>)
 		origin: Some(peer_id.clone()),
 		allow_missing_state: false,
 		import_existing: false,
+		state: None,
+		skip_execution: false,
 	})
 }
 
diff --git a/client/network/test/src/lib.rs b/client/network/test/src/lib.rs
index f55444f8cf12..b6e8f897bb80 100644
--- a/client/network/test/src/lib.rs
+++ b/client/network/test/src/lib.rs
@@ -29,6 +29,7 @@ use std::{
 use libp2p::build_multiaddr;
 use log::trace;
 use sc_network::block_request_handler::{self, BlockRequestHandler};
+use sc_network::state_request_handler::{self, StateRequestHandler};
 use sc_network::light_client_requests::{self, handler::LightClientRequestHandler};
 use sp_blockchain::{
 	HeaderBackend, Result as ClientResult,
@@ -55,7 +56,7 @@ use sc_network::{
 	NetworkWorker, NetworkService, config::{ProtocolId, MultiaddrWithPeerId, NonReservedPeerMode},
 	Multiaddr,
 };
-use sc_network::config::{NetworkConfiguration, NonDefaultSetConfig, TransportConfig};
+use sc_network::config::{NetworkConfiguration, NonDefaultSetConfig, TransportConfig, SyncMode};
 use libp2p::PeerId;
 use parking_lot::Mutex;
 use sp_core::H256;
@@ -179,6 +180,19 @@ impl PeersClient {
 		}
 	}
 
+	pub fn has_state_at(&self, block: &BlockId<Block>) -> bool {
+		let header = match self.header(block).unwrap() {
+			Some(header) => header,
+			None => return false,
+		};
+		match self {
+			PeersClient::Full(_client, backend) =>
+				backend.have_state_at(&header.hash(), *header.number()),
+			PeersClient::Light(_client, backend) =>
+				backend.have_state_at(&header.hash(), *header.number()),
+		}
+	}
+
 	pub fn justifications(&self, block: &BlockId<Block>) -> ClientResult<Option<Justifications>> {
 		match *self {
 			PeersClient::Full(ref client, ref _backend) => client.justifications(block),
@@ -235,9 +249,9 @@ impl BlockImport<Block> for PeersClient {
 	) -> Result<ImportResult, Self::Error> {
 		match self {
 			PeersClient::Full(client, _) =>
-				client.import_block(block.convert_transaction(), cache).await,
+				client.import_block(block.clear_storage_changes_and_mutate(), cache).await,
 			PeersClient::Light(client, _) =>
-				client.import_block(block.convert_transaction(), cache).await,
+				client.import_block(block.clear_storage_changes_and_mutate(), cache).await,
 		}
 	}
 }
@@ -584,7 +598,7 @@ impl<I> BlockImport<Block> for BlockImportAdapter<I> where
 		block: BlockImportParams<Block, ()>,
 		cache: HashMap<well_known_cache_keys::Id, Vec<u8>>,
 	) -> Result<ImportResult, Self::Error> {
-		self.inner.import_block(block.convert_transaction(), cache).await
+		self.inner.import_block(block.clear_storage_changes_and_mutate(), cache).await
 	}
 }
 
@@ -644,6 +658,8 @@ pub struct FullPeerConfig {
 	pub connect_to_peers: Option<Vec<usize>>,
 	/// Whether the full peer should have the authority role.
 	pub is_authority: bool,
+	/// Syncing mode
+	pub sync_mode: SyncMode,
 }
 
 pub trait TestNetFactory: Sized where <Self::BlockImport as BlockImport<Block>>::Transaction: Send {
@@ -699,10 +715,13 @@ pub trait TestNetFactory: Sized where <Self::BlockImport as BlockImport<Block>>:
 
 	/// Add a full peer.
 	fn add_full_peer_with_config(&mut self, config: FullPeerConfig) {
-		let test_client_builder = match config.keep_blocks {
+		let mut test_client_builder = match config.keep_blocks {
 			Some(keep_blocks) => TestClientBuilder::with_pruning_window(keep_blocks),
 			None => TestClientBuilder::with_default_backend(),
 		};
+		if matches!(config.sync_mode, SyncMode::Fast{..}) {
+			test_client_builder = test_client_builder.set_no_genesis();
+		}
 		let backend = test_client_builder.backend();
 		let (c, longest_chain) = test_client_builder.build_with_longest_chain();
 		let client = Arc::new(c);
@@ -736,6 +755,7 @@ pub trait TestNetFactory: Sized where <Self::BlockImport as BlockImport<Block>>:
 			Default::default(),
 			None,
 		);
+		network_config.sync_mode = config.sync_mode;
 		network_config.transport = TransportConfig::MemoryOnly;
 		network_config.listen_addresses = vec![listen_addr.clone()];
 		network_config.allow_non_globals_in_dht = true;
@@ -769,6 +789,16 @@ pub trait TestNetFactory: Sized where <Self::BlockImport as BlockImport<Block>>:
 			protocol_config
 		};
 
+		let state_request_protocol_config = {
+			let (handler, protocol_config) = StateRequestHandler::new(
+				&protocol_id,
+				client.clone(),
+				50,
+			);
+			self.spawn_task(handler.run().boxed());
+			protocol_config
+		};
+
 		let light_client_request_protocol_config = {
 			let (handler, protocol_config) = LightClientRequestHandler::new(&protocol_id, client.clone());
 			self.spawn_task(handler.run().boxed());
@@ -789,6 +819,7 @@ pub trait TestNetFactory: Sized where <Self::BlockImport as BlockImport<Block>>:
 				.unwrap_or_else(|| Box::new(DefaultBlockAnnounceValidator)),
 			metrics_registry: None,
 			block_request_protocol_config,
+			state_request_protocol_config,
 			light_client_request_protocol_config,
 		}).unwrap();
 
@@ -862,6 +893,9 @@ pub trait TestNetFactory: Sized where <Self::BlockImport as BlockImport<Block>>:
 		let block_request_protocol_config = block_request_handler::generate_protocol_config(
 			&protocol_id,
 		);
+		let state_request_protocol_config = state_request_handler::generate_protocol_config(
+			&protocol_id,
+		);
 
 		let light_client_request_protocol_config =
 			light_client_requests::generate_protocol_config(&protocol_id);
@@ -879,6 +913,7 @@ pub trait TestNetFactory: Sized where <Self::BlockImport as BlockImport<Block>>:
 			block_announce_validator: Box::new(DefaultBlockAnnounceValidator),
 			metrics_registry: None,
 			block_request_protocol_config,
+			state_request_protocol_config,
 			light_client_request_protocol_config,
 		}).unwrap();
 
diff --git a/client/network/test/src/sync.rs b/client/network/test/src/sync.rs
index 553a769ec14a..56cec7e4cdfd 100644
--- a/client/network/test/src/sync.rs
+++ b/client/network/test/src/sync.rs
@@ -1087,3 +1087,43 @@ fn syncs_after_missing_announcement() {
 	net.block_until_sync();
 	assert!(net.peer(1).client().header(&BlockId::Hash(final_block)).unwrap().is_some());
 }
+
+#[test]
+fn syncs_state() {
+	sp_tracing::try_init_simple();
+	for skip_proofs in &[ false, true ] {
+		let mut net = TestNet::new(0);
+		net.add_full_peer_with_config(Default::default());
+		net.add_full_peer_with_config(FullPeerConfig {
+			sync_mode: SyncMode::Fast { skip_proofs: *skip_proofs },
+			..Default::default()
+		});
+		net.peer(0).push_blocks(64, false);
+		// Wait for peer 1 to sync header chain.
+		net.block_until_sync();
+		assert!(!net.peer(1).client().has_state_at(&BlockId::Number(64)));
+
+		let just = (*b"FRNK", Vec::new());
+		net.peer(1).client().finalize_block(BlockId::Number(60), Some(just), true).unwrap();
+		// Wait for state sync.
+		block_on(futures::future::poll_fn::<(), _>(|cx| {
+			net.poll(cx);
+			if net.peer(1).client.info().finalized_state.is_some() {
+				Poll::Ready(())
+			} else {
+				Poll::Pending
+			}
+		}));
+		assert!(!net.peer(1).client().has_state_at(&BlockId::Number(64)));
+		// Wait for the rest of the states to be imported.
+		block_on(futures::future::poll_fn::<(), _>(|cx| {
+			net.poll(cx);
+			if net.peer(1).client().has_state_at(&BlockId::Number(64)) {
+				Poll::Ready(())
+			} else {
+				Poll::Pending
+			}
+		}));
+	}
+}
+
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index 6a98cf82f3e5..a90efb02dc5f 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -55,6 +55,7 @@ sp-state-machine = { version = "0.9.0", path = "../../primitives/state-machine"
 sp-application-crypto = { version = "3.0.0", path = "../../primitives/application-crypto" }
 sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
 sp-inherents = { version = "3.0.0", path = "../../primitives/inherents" }
+sp-storage = { version = "3.0.0", path = "../../primitives/storage" }
 sc-network = { version = "0.9.0", path = "../network" }
 sc-chain-spec = { version = "3.0.0", path = "../chain-spec" }
 sc-light = { version = "3.0.0", path = "../light" }
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index ca2232279846..b0bffc3c4e12 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -43,6 +43,7 @@ use log::info;
 use sc_network::config::{Role, OnDemand};
 use sc_network::NetworkService;
 use sc_network::block_request_handler::{self, BlockRequestHandler};
+use sc_network::state_request_handler::{self, StateRequestHandler};
 use sc_network::light_client_requests::{self, handler::LightClientRequestHandler};
 use sp_runtime::generic::BlockId;
 use sp_runtime::traits::{
@@ -70,7 +71,7 @@ use sp_keystore::{CryptoStore, SyncCryptoStore, SyncCryptoStorePtr};
 use sp_runtime::BuildStorage;
 use sc_client_api::{
 	BlockBackend, BlockchainEvents,
-	backend::StorageProvider,
+	StorageProvider,
 	proof_provider::ProofProvider,
 	execution_extensions::ExecutionExtensions
 };
@@ -377,6 +378,7 @@ pub fn new_full_parts<TBl, TRtApi, TExecDisp>(
 				offchain_worker_enabled : config.offchain_worker.enabled,
 				offchain_indexing_api: config.offchain_worker.indexing_enabled,
 				wasm_runtime_overrides: config.wasm_runtime_overrides.clone(),
+				no_genesis: matches!(config.network.sync_mode, sc_network::config::SyncMode::Fast {..}),
 				wasm_runtime_substitutes,
 			},
 		)?;
@@ -912,6 +914,23 @@ pub fn build_network<TBl, TExPool, TImpQu, TCl>(
 		}
 	};
 
+	let state_request_protocol_config = {
+		if matches!(config.role, Role::Light) {
+			// Allow outgoing requests but deny incoming requests.
+			state_request_handler::generate_protocol_config(&protocol_id)
+		} else {
+			// Allow both outgoing and incoming requests.
+			let (handler, protocol_config) = StateRequestHandler::new(
+				&protocol_id,
+				client.clone(),
+				config.network.default_peers_set.in_peers as usize
+				+ config.network.default_peers_set.out_peers as usize,
+			);
+			spawn_handle.spawn("state_request_handler", handler.run());
+			protocol_config
+		}
+	};
+
 	let light_client_request_protocol_config = {
 		if matches!(config.role, Role::Light) {
 			// Allow outgoing requests but deny incoming requests.
@@ -950,6 +969,7 @@ pub fn build_network<TBl, TExPool, TImpQu, TCl>(
 		block_announce_validator,
 		metrics_registry: config.prometheus_config.as_ref().map(|config| config.registry.clone()),
 		block_request_protocol_config,
+		state_request_protocol_config,
 		light_client_request_protocol_config,
 	};
 
diff --git a/client/service/src/chain_ops/import_blocks.rs b/client/service/src/chain_ops/import_blocks.rs
index defa4128702a..90bcc94cb899 100644
--- a/client/service/src/chain_ops/import_blocks.rs
+++ b/client/service/src/chain_ops/import_blocks.rs
@@ -172,6 +172,8 @@ fn import_block_to_queue<TBl, TImpQu>(
 			origin: None,
 			allow_missing_state: false,
 			import_existing: force,
+			state: None,
+			skip_execution: false,
 		}
 	]);
 }
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index 06d9aec4e4fd..4a998a12d2b7 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -52,11 +52,12 @@ use sp_state_machine::{
 	DBValue, Backend as StateBackend, ChangesTrieAnchorBlockId,
 	prove_read, prove_child_read, ChangesTrieRootsStorage, ChangesTrieStorage,
 	ChangesTrieConfigurationRange, key_changes, key_changes_proof,
+	prove_range_read_with_size, read_range_proof_check,
 };
 use sc_executor::RuntimeVersion;
 use sp_consensus::{
 	Error as ConsensusError, BlockStatus, BlockImportParams, BlockCheckParams,
-	ImportResult, BlockOrigin, ForkChoiceStrategy,
+	ImportResult, BlockOrigin, ForkChoiceStrategy, StateAction,
 };
 use sp_blockchain::{
 	self as blockchain,
@@ -86,7 +87,7 @@ use sc_client_api::{
 	execution_extensions::ExecutionExtensions,
 	notifications::{StorageNotifications, StorageEventStream},
 	KeyIterator, CallExecutor, ExecutorProvider, ProofProvider,
-	cht, UsageProvider
+	cht, UsageProvider,
 };
 use sp_utils::mpsc::{TracingUnboundedSender, tracing_unbounded};
 use sp_blockchain::Error;
@@ -150,6 +151,11 @@ impl<H> PrePostHeader<H> {
 	}
 }
 
+enum PrepareStorageChangesResult<B: backend::Backend<Block>, Block: BlockT> {
+	Discard(ImportResult),
+	Import(Option<sp_consensus::StorageChanges<Block, backend::TransactionFor<B, Block>>>),
+}
+
 /// Create an instance of in-memory client.
 #[cfg(feature="test-helpers")]
 pub fn new_in_mem<E, Block, S, RA>(
@@ -191,6 +197,8 @@ pub struct ClientConfig<Block: BlockT> {
 	pub offchain_indexing_api: bool,
 	/// Path where WASM files exist to override the on-chain WASM.
 	pub wasm_runtime_overrides: Option<PathBuf>,
+	/// Skip writing genesis state on first start.
+	pub no_genesis: bool,
 	/// Map of WASM runtime substitute starting at the child of the given block until the runtime
 	/// version doesn't match anymore.
 	pub wasm_runtime_substitutes: HashMap<Block::Hash, Vec<u8>>,
@@ -202,6 +210,7 @@ impl<Block: BlockT> Default for ClientConfig<Block> {
 			offchain_worker_enabled: false,
 			offchain_indexing_api: false,
 			wasm_runtime_overrides: None,
+			no_genesis: false,
 			wasm_runtime_substitutes: HashMap::new(),
 		}
 	}
@@ -324,22 +333,29 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		telemetry: Option<TelemetryHandle>,
 		config: ClientConfig<Block>,
 	) -> sp_blockchain::Result<Self> {
-		if backend.blockchain().header(BlockId::Number(Zero::zero()))?.is_none() {
+		let info = backend.blockchain().info();
+		if info.finalized_state.is_none() {
 			let genesis_storage = build_genesis_storage.build_storage()
 				.map_err(sp_blockchain::Error::Storage)?;
 			let mut op = backend.begin_operation()?;
-			backend.begin_state_operation(&mut op, BlockId::Hash(Default::default()))?;
-			let state_root = op.reset_storage(genesis_storage)?;
+			let state_root = op.set_genesis_state(genesis_storage, !config.no_genesis)?;
 			let genesis_block = genesis::construct_genesis_block::<Block>(state_root.into());
 			info!("🔨 Initializing Genesis block/state (state: {}, header-hash: {})",
 				genesis_block.header().state_root(),
 				genesis_block.header().hash()
 			);
+			// Genesis may be written after some blocks have been imported and finalized.
+			// So we only finalize it when the database is empty.
+			let block_state = if info.best_hash == Default::default() {
+				NewBlockState::Final
+			} else {
+				NewBlockState::Normal
+			};
 			op.set_block_data(
 				genesis_block.deconstruct().0,
 				Some(vec![]),
 				None,
-				NewBlockState::Final
+				block_state,
 			)?;
 			backend.commit_operation(op)?;
 		}
@@ -629,6 +645,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		operation: &mut ClientImportOperation<Block, B>,
 		import_block: BlockImportParams<Block, backend::TransactionFor<B, Block>>,
 		new_cache: HashMap<CacheKeyId, Vec<u8>>,
+		storage_changes: Option<sp_consensus::StorageChanges<Block, backend::TransactionFor<B, Block>>>,
 	) -> sp_blockchain::Result<ImportResult> where
 		Self: ProvideRuntimeApi<Block>,
 		<Self as ProvideRuntimeApi<Block>>::Api: CoreApi<Block> +
@@ -640,7 +657,6 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 			justifications,
 			post_digests,
 			body,
-			storage_changes,
 			finalized,
 			auxiliary,
 			fork_choice,
@@ -718,7 +734,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		import_headers: PrePostHeader<Block::Header>,
 		justifications: Option<Justifications>,
 		body: Option<Vec<Block::Extrinsic>>,
-		storage_changes: Option<sp_api::StorageChanges<backend::StateBackendFor<B, Block>, Block>>,
+		storage_changes: Option<sp_consensus::StorageChanges<Block, backend::TransactionFor<B, Block>>>,
 		new_cache: HashMap<CacheKeyId, Vec<u8>>,
 		finalized: bool,
 		aux: Vec<(Vec<u8>, Option<Vec<u8>>)>,
@@ -735,15 +751,16 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 			(false, blockchain::BlockStatus::InChain) => return Ok(ImportResult::AlreadyInChain),
 			(false, blockchain::BlockStatus::Unknown) => {},
 			(true, blockchain::BlockStatus::InChain) =>  {},
-			(true, blockchain::BlockStatus::Unknown) =>
-				return Err(Error::UnknownBlock(format!("{:?}", hash))),
+			(true, blockchain::BlockStatus::Unknown) => {},
 		}
 
 		let info = self.backend.blockchain().info();
 
 		// the block is lower than our last finalized block so it must revert
 		// finality, refusing import.
-		if *import_headers.post().number() <= info.finalized_number {
+		if status == blockchain::BlockStatus::Unknown
+			&& *import_headers.post().number() <= info.finalized_number
+		{
 			return Err(sp_blockchain::Error::NotInFinalizedChain);
 		}
 
@@ -757,7 +774,48 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 
 		let storage_changes = match storage_changes {
 			Some(storage_changes) => {
-				self.backend.begin_state_operation(&mut operation.op, BlockId::Hash(parent_hash))?;
+				let storage_changes = match storage_changes {
+					sp_consensus::StorageChanges::Changes(storage_changes) => {
+						self.backend.begin_state_operation(&mut operation.op, BlockId::Hash(parent_hash))?;
+						let (
+							main_sc,
+							child_sc,
+							offchain_sc,
+							tx, _,
+							changes_trie_tx,
+							tx_index,
+						) = storage_changes.into_inner();
+
+						if self.config.offchain_indexing_api {
+							operation.op.update_offchain_storage(offchain_sc)?;
+						}
+
+						operation.op.update_db_storage(tx)?;
+						operation.op.update_storage(main_sc.clone(), child_sc.clone())?;
+						operation.op.update_transaction_index(tx_index)?;
+
+						if let Some(changes_trie_transaction) = changes_trie_tx {
+							operation.op.update_changes_trie(changes_trie_transaction)?;
+						}
+
+						Some((main_sc, child_sc))
+					}
+					sp_consensus::StorageChanges::Import(changes) => {
+						let storage = sp_storage::Storage {
+							top: changes.state.into_iter().collect(),
+							children_default: Default::default(),
+						};
+
+						let state_root = operation.op.reset_storage(storage)?;
+						if state_root != *import_headers.post().state_root() {
+							// State root mismatch when importing state. This should not happen in safe fast sync mode,
+							// but may happen in unsafe mode.
+							warn!("Error imporing state: State root mismatch.");
+							return Err(Error::InvalidStateRoot);
+						}
+						None
+					}
+				};
 
 				// ensure parent block is finalized to maintain invariant that
 				// finality is called sequentially.
@@ -772,29 +830,8 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 				}
 
 				operation.op.update_cache(new_cache);
+				storage_changes
 
-				let (
-					main_sc,
-					child_sc,
-					offchain_sc,
-					tx, _,
-					changes_trie_tx,
-					tx_index,
-				) = storage_changes.into_inner();
-
-				if self.config.offchain_indexing_api {
-					operation.op.update_offchain_storage(offchain_sc)?;
-				}
-
-				operation.op.update_db_storage(tx)?;
-				operation.op.update_storage(main_sc.clone(), child_sc.clone())?;
-				operation.op.update_transaction_index(tx_index)?;
-
-				if let Some(changes_trie_transaction) = changes_trie_tx {
-					operation.op.update_changes_trie(changes_trie_transaction)?;
-				}
-
-				Some((main_sc, child_sc))
 			},
 			None => None,
 		};
@@ -867,7 +904,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 	fn prepare_block_storage_changes(
 		&self,
 		import_block: &mut BlockImportParams<Block, backend::TransactionFor<B, Block>>,
-	) -> sp_blockchain::Result<Option<ImportResult>>
+	) -> sp_blockchain::Result<PrepareStorageChangesResult<B, Block>>
 		where
 			Self: ProvideRuntimeApi<Block>,
 			<Self as ProvideRuntimeApi<Block>>::Api: CoreApi<Block> +
@@ -875,21 +912,28 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 	{
 		let parent_hash = import_block.header.parent_hash();
 		let at = BlockId::Hash(*parent_hash);
-		let enact_state = match self.block_status(&at)? {
-			BlockStatus::Unknown => return Ok(Some(ImportResult::UnknownParent)),
-			BlockStatus::InChainWithState | BlockStatus::Queued => true,
-			BlockStatus::InChainPruned if import_block.allow_missing_state => false,
-			BlockStatus::InChainPruned => return Ok(Some(ImportResult::MissingState)),
-			BlockStatus::KnownBad => return Ok(Some(ImportResult::KnownBad)),
+		let state_action = std::mem::replace(&mut import_block.state_action, StateAction::Skip);
+		let (enact_state, storage_changes) = match (self.block_status(&at)?, state_action) {
+			(BlockStatus::Unknown, _) => return Ok(PrepareStorageChangesResult::Discard(ImportResult::UnknownParent)),
+			(BlockStatus::KnownBad, _) => return Ok(PrepareStorageChangesResult::Discard(ImportResult::KnownBad)),
+			(_, StateAction::Skip) => (false, None),
+			(BlockStatus::InChainPruned, StateAction::ApplyChanges(sp_consensus::StorageChanges::Changes(_))) =>
+			 	return Ok(PrepareStorageChangesResult::Discard(ImportResult::MissingState)),
+			(BlockStatus::InChainPruned, StateAction::Execute) =>
+				return Ok(PrepareStorageChangesResult::Discard(ImportResult::MissingState)),
+			(BlockStatus::InChainPruned, StateAction::ExecuteIfPossible) => (false, None),
+			(_, StateAction::Execute) => (true, None),
+			(_, StateAction::ExecuteIfPossible) => (true, None),
+			(_, StateAction::ApplyChanges(changes)) => (true, Some(changes)),
 		};
 
-		match (enact_state, &mut import_block.storage_changes, &mut import_block.body) {
+		let storage_changes = match (enact_state, storage_changes, &import_block.body) {
 			// We have storage changes and should enact the state, so we don't need to do anything
 			// here
-			(true, Some(_), _) => {},
+			(true, changes @ Some(_), _) => changes,
 			// We should enact state, but don't have any storage changes, so we need to execute the
 			// block.
-			(true, ref mut storage_changes @ None, Some(ref body)) => {
+			(true, None, Some(ref body)) => {
 				let runtime_api = self.runtime_api();
 				let execution_context = if import_block.origin == BlockOrigin::NetworkInitialSync {
 					ExecutionContext::Syncing
@@ -919,19 +963,16 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 					!= &gen_storage_changes.transaction_storage_root
 				{
 					return Err(Error::InvalidStateRoot)
-				} else {
-					**storage_changes = Some(gen_storage_changes);
 				}
+				Some(sp_consensus::StorageChanges::Changes(gen_storage_changes))
 			},
 			// No block body, no storage changes
-			(true, None, None) => {},
+			(true, None, None) => None,
 			// We should not enact the state, so we set the storage changes to `None`.
-			(false, changes, _) => {
-				changes.take();
-			}
+			(false, _, _) => None,
 		};
 
-		Ok(None)
+		Ok(PrepareStorageChangesResult::Import(storage_changes))
 	}
 
 	fn apply_finality_with_block_hash(
@@ -1307,6 +1348,68 @@ impl<B, E, Block, RA> ProofProvider<Block> for Client<B, E, Block, RA> where
 			cht::size(),
 		)
 	}
+
+	fn read_proof_collection(
+		&self,
+		id: &BlockId<Block>,
+		start_key: &[u8],
+		size_limit: usize,
+	) -> sp_blockchain::Result<(StorageProof, u32)> {
+		let state = self.state_at(id)?;
+		Ok(prove_range_read_with_size::<_, HashFor<Block>>(
+				state,
+				None,
+				None,
+				size_limit,
+				Some(start_key)
+		)?)
+	}
+
+	fn storage_collection(
+		&self,
+		id: &BlockId<Block>,
+		start_key: &[u8],
+		size_limit: usize,
+	) -> sp_blockchain::Result<Vec<(Vec<u8>, Vec<u8>)>> {
+		let state = self.state_at(id)?;
+		let mut current_key = start_key.to_vec();
+		let mut total_size = 0;
+		let mut entries = Vec::new();
+		while let Some(next_key) = state
+			.next_storage_key(&current_key)
+			.map_err(|e| sp_blockchain::Error::from_state(Box::new(e)))?
+		{
+			let value = state
+				.storage(next_key.as_ref())
+				.map_err(|e| sp_blockchain::Error::from_state(Box::new(e)))?
+				.unwrap_or_default();
+			let size = value.len() + next_key.len();
+			if total_size + size > size_limit && !entries.is_empty() {
+				break;
+			}
+			total_size += size;
+			entries.push((next_key.clone(), value));
+			current_key = next_key;
+		}
+		Ok(entries)
+
+	}
+
+	fn verify_range_proof(
+		&self,
+		root: Block::Hash,
+		proof: StorageProof,
+		start_key: &[u8],
+	) -> sp_blockchain::Result<(Vec<(Vec<u8>, Vec<u8>)>, bool)> {
+		Ok(read_range_proof_check::<HashFor<Block>>(
+				root,
+				proof,
+				None,
+				None,
+				None,
+				Some(start_key),
+		)?)
+	}
 }
 
 
@@ -1751,15 +1854,16 @@ impl<B, E, Block, RA> sp_consensus::BlockImport<Block> for &Client<B, E, Block,
 		let span = tracing::span!(tracing::Level::DEBUG, "import_block");
 		let _enter = span.enter();
 
-		if let Some(res) = self.prepare_block_storage_changes(&mut import_block).map_err(|e| {
+		let storage_changes = match self.prepare_block_storage_changes(&mut import_block).map_err(|e| {
 			warn!("Block prepare storage changes error:\n{:?}", e);
 			ConsensusError::ClientImport(e.to_string())
 		})? {
-			return Ok(res)
-		}
+			PrepareStorageChangesResult::Discard(res) => return Ok(res),
+			PrepareStorageChangesResult::Import(storage_changes) => storage_changes,
+		};
 
 		self.lock_import_and_run(|operation| {
-			self.apply_block(operation, import_block, new_cache)
+			self.apply_block(operation, import_block, new_cache, storage_changes)
 		}).map_err(|e| {
 			warn!("Block import error:\n{:?}", e);
 			ConsensusError::ClientImport(e.to_string()).into()
@@ -1801,9 +1905,14 @@ impl<B, E, Block, RA> sp_consensus::BlockImport<Block> for &Client<B, E, Block,
 		match self.block_status(&BlockId::Hash(hash))
 			.map_err(|e| ConsensusError::ClientImport(e.to_string()))?
 		{
-			BlockStatus::InChainWithState | BlockStatus::Queued if !import_existing  => return Ok(ImportResult::AlreadyInChain),
+			BlockStatus::InChainWithState | BlockStatus::Queued if !import_existing  => {
+				return Ok(ImportResult::AlreadyInChain)
+			},
 			BlockStatus::InChainWithState | BlockStatus::Queued => {},
-			BlockStatus::InChainPruned => return Ok(ImportResult::AlreadyInChain),
+			BlockStatus::InChainPruned if !import_existing => {
+				return Ok(ImportResult::AlreadyInChain)
+			},
+			BlockStatus::InChainPruned => {},
 			BlockStatus::Unknown => {},
 			BlockStatus::KnownBad => return Ok(ImportResult::KnownBad),
 		}
diff --git a/client/service/test/src/client/light.rs b/client/service/test/src/client/light.rs
index a183cbce62bd..8841d498ecfb 100644
--- a/client/service/test/src/client/light.rs
+++ b/client/service/test/src/client/light.rs
@@ -272,7 +272,7 @@ fn local_state_is_created_when_genesis_state_is_available() {
 	);
 	let mut op = backend.begin_operation().unwrap();
 	op.set_block_data(header0, None, None, NewBlockState::Final).unwrap();
-	op.reset_storage(Default::default()).unwrap();
+	op.set_genesis_state(Default::default(), true).unwrap();
 	backend.commit_operation(op).unwrap();
 
 	match backend.state_at(BlockId::Number(0)).unwrap() {
diff --git a/primitives/blockchain/src/backend.rs b/primitives/blockchain/src/backend.rs
index 3441a4f6cf54..dbce364ce798 100644
--- a/primitives/blockchain/src/backend.rs
+++ b/primitives/blockchain/src/backend.rs
@@ -269,12 +269,14 @@ pub struct Info<Block: BlockT> {
 	pub finalized_hash: Block::Hash,
 	/// Last finalized block number.
 	pub finalized_number: <<Block as BlockT>::Header as HeaderT>::Number,
+	/// Last finalized state.
+	pub finalized_state: Option<(Block::Hash, <<Block as BlockT>::Header as HeaderT>::Number)>,
 	/// Number of concurrent leave forks.
 	pub number_leaves: usize
 }
 
 /// Block status.
-#[derive(Debug, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum BlockStatus {
 	/// Already in the blockchain.
 	InChain,
diff --git a/primitives/blockchain/src/error.rs b/primitives/blockchain/src/error.rs
index 58d08d06f049..0d6ac10a8800 100644
--- a/primitives/blockchain/src/error.rs
+++ b/primitives/blockchain/src/error.rs
@@ -90,8 +90,8 @@ pub enum Error {
 	#[error("Failed to get runtime version: {0}")]
 	VersionInvalid(String),
 
-	#[error("Genesis config provided is invalid")]
-	GenesisInvalid,
+	#[error("Provided state is invalid")]
+	InvalidState,
 
 	#[error("error decoding justification for header")]
 	JustificationDecode,
diff --git a/primitives/consensus/common/src/block_import.rs b/primitives/consensus/common/src/block_import.rs
index 67978232009e..447ea5761f76 100644
--- a/primitives/consensus/common/src/block_import.rs
+++ b/primitives/consensus/common/src/block_import.rs
@@ -135,6 +135,43 @@ pub struct BlockCheckParams<Block: BlockT> {
 	pub import_existing: bool,
 }
 
+/// Precomputed storage.
+pub enum StorageChanges<Block: BlockT, Transaction> {
+	/// Changes coming from block execution.
+	Changes(sp_state_machine::StorageChanges<Transaction, HashFor<Block>, NumberFor<Block>>),
+	/// Whole new state.
+	Import(ImportedState<Block>),
+}
+
+/// Imported state data. A vector of key-value pairs that should form a trie.
+#[derive(PartialEq, Eq, Clone)]
+pub struct ImportedState<B: BlockT> {
+	/// Target block hash.
+	pub block: B::Hash,
+	/// State keys and values.
+	pub state: Vec<(Vec<u8>, Vec<u8>)>,
+}
+
+impl<B: BlockT> std::fmt::Debug for ImportedState<B> {
+	fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {
+		fmt.debug_struct("ImportedState")
+			.field("block", &self.block)
+			.finish()
+	}
+}
+
+/// Defines how a new state is computed for a given imported block.
+pub enum StateAction<Block: BlockT, Transaction> {
+	/// Apply precomputed changes coming from block execution or state sync.
+	ApplyChanges(StorageChanges<Block, Transaction>),
+	/// Execute block body (required) and compute state.
+	Execute,
+	/// Execute block body if parent state is available and compute state.
+	ExecuteIfPossible,
+	/// Don't execute or import state.
+	Skip,
+}
+
 /// Data required to import a Block.
 #[non_exhaustive]
 pub struct BlockImportParams<Block: BlockT, Transaction> {
@@ -159,11 +196,8 @@ pub struct BlockImportParams<Block: BlockT, Transaction> {
 	pub post_digests: Vec<DigestItemFor<Block>>,
 	/// The body of the block.
 	pub body: Option<Vec<Block::Extrinsic>>,
-	/// The changes to the storage to create the state for the block. If this is `Some(_)`,
-	/// the block import will not need to re-execute the block for importing it.
-	pub storage_changes: Option<
-		sp_state_machine::StorageChanges<Transaction, HashFor<Block>, NumberFor<Block>>
-	>,
+	/// Specify how the new state is computed.
+	pub state_action: StateAction<Block, Transaction>,
 	/// Is this block finalized already?
 	/// `true` implies instant finality.
 	pub finalized: bool,
@@ -182,8 +216,6 @@ pub struct BlockImportParams<Block: BlockT, Transaction> {
 	/// to modify it. If `None` is passed all the way down to bottom block
 	/// importer, the import fails with an `IncompletePipeline` error.
 	pub fork_choice: Option<ForkChoiceStrategy>,
-	/// Allow importing the block skipping state verification if parent state is missing.
-	pub allow_missing_state: bool,
 	/// Re-validate existing block.
 	pub import_existing: bool,
 	/// Cached full header hash (with post-digests applied).
@@ -201,12 +233,11 @@ impl<Block: BlockT, Transaction> BlockImportParams<Block, Transaction> {
 			justifications: None,
 			post_digests: Vec::new(),
 			body: None,
-			storage_changes: None,
+			state_action: StateAction::Execute,
 			finalized: false,
 			intermediates: HashMap::new(),
 			auxiliary: Vec::new(),
 			fork_choice: None,
-			allow_missing_state: false,
 			import_existing: false,
 			post_hash: None,
 		}
@@ -237,20 +268,28 @@ impl<Block: BlockT, Transaction> BlockImportParams<Block, Transaction> {
 
 	/// Auxiliary function for "converting" the transaction type.
 	///
-	/// Actually this just sets `storage_changes` to `None` and makes rustc think that `Self` now
+	/// Actually this just sets `StorageChanges::Changes` to `None` and makes rustc think that `Self` now
 	/// uses a different transaction type.
-	pub fn convert_transaction<Transaction2>(self) -> BlockImportParams<Block, Transaction2> {
+	pub fn clear_storage_changes_and_mutate<Transaction2>(self) -> BlockImportParams<Block, Transaction2> {
+		// Preserve imported state.
+		let state_action = match self.state_action {
+			StateAction::ApplyChanges(StorageChanges::Import(state)) =>
+				StateAction::ApplyChanges(StorageChanges::Import(state)),
+			StateAction::ApplyChanges(StorageChanges::Changes(_)) => StateAction::Skip,
+			StateAction::Execute => StateAction::Execute,
+			StateAction::ExecuteIfPossible => StateAction::ExecuteIfPossible,
+			StateAction::Skip => StateAction::Skip,
+		};
 		BlockImportParams {
 			origin: self.origin,
 			header: self.header,
 			justifications: self.justifications,
 			post_digests: self.post_digests,
 			body: self.body,
-			storage_changes: None,
+			state_action,
 			finalized: self.finalized,
 			auxiliary: self.auxiliary,
 			intermediates: self.intermediates,
-			allow_missing_state: self.allow_missing_state,
 			fork_choice: self.fork_choice,
 			import_existing: self.import_existing,
 			post_hash: self.post_hash,
diff --git a/primitives/consensus/common/src/import_queue.rs b/primitives/consensus/common/src/import_queue.rs
index 4220c7b14162..fba5b51e921c 100644
--- a/primitives/consensus/common/src/import_queue.rs
+++ b/primitives/consensus/common/src/import_queue.rs
@@ -34,7 +34,7 @@ use crate::{
 	error::Error as ConsensusError,
 	block_import::{
 		BlockImport, BlockOrigin, BlockImportParams, ImportedAux, JustificationImport, ImportResult,
-		BlockCheckParams,
+		BlockCheckParams, ImportedState, StateAction,
 	},
 	metrics::Metrics,
 };
@@ -74,8 +74,12 @@ pub struct IncomingBlock<B: BlockT> {
 	pub origin: Option<Origin>,
 	/// Allow importing the block skipping state verification if parent state is missing.
 	pub allow_missing_state: bool,
+	/// Skip block exection and state verification.
+	pub skip_execution: bool,
 	/// Re-validate existing block.
 	pub import_existing: bool,
+	/// Do not compute new state, but rather set it to the given set.
+	pub state: Option<ImportedState<B>>,
 }
 
 /// Type of keys in the blockchain cache that consensus module could use for its needs.
@@ -264,9 +268,17 @@ pub(crate) async fn import_single_block_metered<B: BlockT, V: Verifier<B>, Trans
 	if let Some(keys) = maybe_keys {
 		cache.extend(keys.into_iter());
 	}
-	import_block.allow_missing_state = block.allow_missing_state;
+	import_block.import_existing = block.import_existing;
+	let mut import_block = import_block.clear_storage_changes_and_mutate();
+	if let Some(state) = block.state {
+		import_block.state_action = StateAction::ApplyChanges(crate::StorageChanges::Import(state));
+	} else if block.skip_execution {
+		import_block.state_action = StateAction::Skip;
+	} else if block.allow_missing_state {
+		import_block.state_action = StateAction::ExecuteIfPossible;
+	}
 
-	let imported = import_handle.import_block(import_block.convert_transaction(), cache).await;
+	let imported = import_handle.import_block(import_block, cache).await;
 	if let Some(metrics) = metrics.as_ref() {
 		metrics.report_verification_and_import(started.elapsed());
 	}
diff --git a/primitives/consensus/common/src/import_queue/basic_queue.rs b/primitives/consensus/common/src/import_queue/basic_queue.rs
index 3af983952af7..5767b72dd808 100644
--- a/primitives/consensus/common/src/import_queue/basic_queue.rs
+++ b/primitives/consensus/common/src/import_queue/basic_queue.rs
@@ -564,6 +564,8 @@ mod tests {
 					origin: None,
 					allow_missing_state: false,
 					import_existing: false,
+					state: None,
+					skip_execution: false,
 				}],
 			)))
 			.unwrap();
diff --git a/primitives/consensus/common/src/lib.rs b/primitives/consensus/common/src/lib.rs
index 37df7230fd62..60e260a89282 100644
--- a/primitives/consensus/common/src/lib.rs
+++ b/primitives/consensus/common/src/lib.rs
@@ -50,7 +50,8 @@ mod metrics;
 pub use self::error::Error;
 pub use block_import::{
 	BlockCheckParams, BlockImport, BlockImportParams, BlockOrigin, ForkChoiceStrategy,
-	ImportResult, ImportedAux, JustificationImport, JustificationSyncLink,
+	ImportResult, ImportedAux, ImportedState, JustificationImport, JustificationSyncLink,
+	StateAction, StorageChanges,
 };
 pub use select_chain::SelectChain;
 pub use sp_state_machine::Backend as StateBackend;
diff --git a/primitives/runtime/src/generic/block.rs b/primitives/runtime/src/generic/block.rs
index 1b30d43ccaca..af4f9e4521e3 100644
--- a/primitives/runtime/src/generic/block.rs
+++ b/primitives/runtime/src/generic/block.rs
@@ -54,6 +54,19 @@ impl<Block: BlockT> BlockId<Block> {
 	pub fn number(number: NumberFor<Block>) -> Self {
 		BlockId::Number(number)
 	}
+
+	/// Check if this block ID refers to the pre-genesis state.
+	pub fn is_pre_genesis(&self) -> bool {
+		match self {
+			BlockId::Hash(hash) => hash == &Default::default(),
+			BlockId::Number(_) => false,
+		}
+	}
+
+	/// Create a block ID for a pre-genesis state.
+	pub fn pre_genesis() -> Self {
+		BlockId::Hash(Default::default())
+	}
 }
 
 impl<Block: BlockT> Copy for BlockId<Block> {}
diff --git a/primitives/state-machine/src/backend.rs b/primitives/state-machine/src/backend.rs
index 18b89acbc6f1..9b9953713036 100644
--- a/primitives/state-machine/src/backend.rs
+++ b/primitives/state-machine/src/backend.rs
@@ -93,6 +93,22 @@ pub trait Backend<H: Hasher>: sp_std::fmt::Debug {
 		key: &[u8]
 	) -> Result<Option<StorageKey>, Self::Error>;
 
+	/// Iterate over storage starting at key, for a given prefix and child trie.
+	/// Aborts as soon as `f` returns false.
+	/// Warning, this fails at first error when usual iteration skips errors.
+	/// If `allow_missing` is true, iteration stops when it reaches a missing trie node.
+	/// Otherwise an error is produced.
+	///
+	/// Returns `true` if trie end is reached.
+	fn apply_to_key_values_while<F: FnMut(Vec<u8>, Vec<u8>) -> bool>(
+		&self,
+		child_info: Option<&ChildInfo>,
+		prefix: Option<&[u8]>,
+		start_at: Option<&[u8]>,
+		f: F,
+		allow_missing: bool,
+	) -> Result<bool, Self::Error>;
+
 	/// Retrieve all entries keys of storage and call `f` for each of those keys.
 	/// Aborts as soon as `f` returns false.
 	fn apply_to_keys_while<F: FnMut(&[u8]) -> bool>(
diff --git a/primitives/state-machine/src/lib.rs b/primitives/state-machine/src/lib.rs
index c4ba39e16016..bc5b48f02db4 100644
--- a/primitives/state-machine/src/lib.rs
+++ b/primitives/state-machine/src/lib.rs
@@ -726,6 +726,50 @@ mod execution {
 		prove_read_on_trie_backend(trie_backend, keys)
 	}
 
+	/// Generate range storage read proof.
+	pub fn prove_range_read_with_size<B, H>(
+		mut backend: B,
+		child_info: Option<&ChildInfo>,
+		prefix: Option<&[u8]>,
+		size_limit: usize,
+		start_at: Option<&[u8]>,
+	) -> Result<(StorageProof, u32), Box<dyn Error>>
+	where
+		B: Backend<H>,
+		H: Hasher,
+		H::Out: Ord + Codec,
+	{
+		let trie_backend = backend.as_trie_backend()
+			.ok_or_else(|| Box::new(ExecutionError::UnableToGenerateProof) as Box<dyn Error>)?;
+		prove_range_read_with_size_on_trie_backend(trie_backend, child_info, prefix, size_limit, start_at)
+	}
+
+	/// Generate range storage read proof on an existing trie backend.
+	pub fn prove_range_read_with_size_on_trie_backend<S, H>(
+		trie_backend: &TrieBackend<S, H>,
+		child_info: Option<&ChildInfo>,
+		prefix: Option<&[u8]>,
+		size_limit: usize,
+		start_at: Option<&[u8]>,
+	) -> Result<(StorageProof, u32), Box<dyn Error>>
+	where
+		S: trie_backend_essence::TrieBackendStorage<H>,
+		H: Hasher,
+		H::Out: Ord + Codec,
+	{
+		let proving_backend = proving_backend::ProvingBackend::<S, H>::new(trie_backend);
+		let mut count = 0;
+		proving_backend.apply_to_key_values_while(child_info, prefix, start_at, |_key, _value| {
+			if count == 0 || proving_backend.estimate_encoded_size() <= size_limit {
+				count += 1;
+				true
+			} else {
+				false
+			}
+		}, false).map_err(|e| Box::new(e) as Box<dyn Error>)?;
+		Ok((proving_backend.extract_proof(), count))
+	}
+
 	/// Generate child storage read proof.
 	pub fn prove_child_read<B, H, I>(
 		mut backend: B,
@@ -808,6 +852,29 @@ mod execution {
 		Ok(result)
 	}
 
+	/// Check child storage range proof, generated by `prove_range_read` call.
+	pub fn read_range_proof_check<H>(
+		root: H::Out,
+		proof: StorageProof,
+		child_info: Option<&ChildInfo>,
+		prefix: Option<&[u8]>,
+		count: Option<u32>,
+		start_at: Option<&[u8]>,
+	) -> Result<(Vec<(Vec<u8>, Vec<u8>)>, bool), Box<dyn Error>>
+	where
+		H: Hasher,
+		H::Out: Ord + Codec,
+	{
+		let proving_backend = create_proof_check_backend::<H>(root, proof)?;
+		read_range_proof_check_on_proving_backend(
+			&proving_backend,
+			child_info,
+			prefix,
+			count,
+			start_at,
+		)
+	}
+
 	/// Check child storage read proof, generated by `prove_child_read` call.
 	pub fn read_child_proof_check<H, I>(
 		root: H::Out,
@@ -859,6 +926,32 @@ mod execution {
 		proving_backend.child_storage(child_info, key)
 			.map_err(|e| Box::new(e) as Box<dyn Error>)
 	}
+
+	/// Check storage range proof on pre-created proving backend.
+	///
+	/// Returns a vector with the read `key => value` pairs and a `bool` that is set to `true` when
+	/// all `key => value` pairs could be read and no more are left.
+	pub fn read_range_proof_check_on_proving_backend<H>(
+		proving_backend: &TrieBackend<MemoryDB<H>, H>,
+		child_info: Option<&ChildInfo>,
+		prefix: Option<&[u8]>,
+		count: Option<u32>,
+		start_at: Option<&[u8]>,
+	) -> Result<(Vec<(Vec<u8>, Vec<u8>)>, bool), Box<dyn Error>>
+	where
+		H: Hasher,
+		H::Out: Ord + Codec,
+	{
+		let mut values = Vec::new();
+		let result = proving_backend.apply_to_key_values_while(child_info, prefix, start_at, |key, value| {
+			values.push((key.to_vec(), value.to_vec()));
+			count.as_ref().map_or(true, |c| (values.len() as u32) < *c)
+		}, true);
+		match result {
+			Ok(completed) => Ok((values, completed)),
+			Err(e) => Err(Box::new(e) as Box<dyn Error>),
+		}
+	}
 }
 
 #[cfg(test)]
@@ -1457,7 +1550,7 @@ mod tests {
 			remote_proof.clone(),
 			&[&[0xff]],
 		).is_ok();
- 		// check that results are correct
+		// check that results are correct
 		assert_eq!(
 			local_result1.into_iter().collect::<Vec<_>>(),
 			vec![(b"value2".to_vec(), Some(vec![24]))],
@@ -1494,6 +1587,57 @@ mod tests {
 		);
 	}
 
+	#[test]
+	fn prove_read_with_size_limit_works() {
+		let remote_backend = trie_backend::tests::test_trie();
+		let remote_root = remote_backend.storage_root(::std::iter::empty()).0;
+		let (proof, count) = prove_range_read_with_size(remote_backend, None, None, 0, None).unwrap();
+		// Alwasys contains at least some nodes.
+		assert_eq!(proof.into_memory_db::<BlakeTwo256>().drain().len(), 3);
+		assert_eq!(count, 1);
+
+		let remote_backend = trie_backend::tests::test_trie();
+		let (proof, count) = prove_range_read_with_size(remote_backend, None, None, 800, Some(&[])).unwrap();
+		assert_eq!(proof.clone().into_memory_db::<BlakeTwo256>().drain().len(), 9);
+		assert_eq!(count, 85);
+		let (results, completed) = read_range_proof_check::<BlakeTwo256>(
+			remote_root,
+			proof.clone(),
+			None,
+			None,
+			Some(count),
+			None,
+		).unwrap();
+		assert_eq!(results.len() as u32, count);
+		assert_eq!(completed, false);
+		// When checking without count limit, proof may actually contain extra values.
+		let (results, completed) = read_range_proof_check::<BlakeTwo256>(
+			remote_root,
+			proof,
+			None,
+			None,
+			None,
+			None,
+		).unwrap();
+		assert_eq!(results.len() as u32, 101);
+		assert_eq!(completed, false);
+
+		let remote_backend = trie_backend::tests::test_trie();
+		let (proof, count) = prove_range_read_with_size(remote_backend, None, None, 50000, Some(&[])).unwrap();
+		assert_eq!(proof.clone().into_memory_db::<BlakeTwo256>().drain().len(), 11);
+		assert_eq!(count, 132);
+		let (results, completed) = read_range_proof_check::<BlakeTwo256>(
+			remote_root,
+			proof.clone(),
+			None,
+			None,
+			None,
+			None,
+		).unwrap();
+		assert_eq!(results.len() as u32, count);
+		assert_eq!(completed, true);
+	}
+
 	#[test]
 	fn compact_multiple_child_trie() {
 		// this root will be queried
diff --git a/primitives/state-machine/src/overlayed_changes/mod.rs b/primitives/state-machine/src/overlayed_changes/mod.rs
index c01d56ab919a..a261e084eeda 100644
--- a/primitives/state-machine/src/overlayed_changes/mod.rs
+++ b/primitives/state-machine/src/overlayed_changes/mod.rs
@@ -303,7 +303,7 @@ impl OverlayedChanges {
 	/// Set a new value for the specified key.
 	///
 	/// Can be rolled back or committed when called inside a transaction.
-	pub(crate) fn set_storage(&mut self, key: StorageKey, val: Option<StorageValue>) {
+	pub fn set_storage(&mut self, key: StorageKey, val: Option<StorageValue>) {
 		let size_write = val.as_ref().map(|x| x.len() as u64).unwrap_or(0);
 		self.stats.tally_write_overlay(size_write);
 		self.top.set(key, val, self.extrinsic_index());
diff --git a/primitives/state-machine/src/proving_backend.rs b/primitives/state-machine/src/proving_backend.rs
index d68a87f9f56a..5275aa82521c 100644
--- a/primitives/state-machine/src/proving_backend.rs
+++ b/primitives/state-machine/src/proving_backend.rs
@@ -212,6 +212,14 @@ impl<'a, S: 'a + TrieBackendStorage<H>, H: 'a + Hasher> ProvingBackend<'a, S, H>
 	pub fn extract_proof(&self) -> StorageProof {
 		self.0.essence().backend_storage().proof_recorder.to_storage_proof()
 	}
+
+	/// Returns the estimated encoded size of the proof.
+	///
+	/// The estimation is maybe bigger (by in maximum 4 bytes), but never smaller than the actual
+	/// encoded proof.
+	pub fn estimate_encoded_size(&self) -> usize {
+		self.0.essence().backend_storage().proof_recorder.estimate_encoded_size()
+	}
 }
 
 impl<'a, S: 'a + TrieBackendStorage<H>, H: 'a + Hasher> TrieBackendStorage<H>
@@ -260,6 +268,17 @@ impl<'a, S, H> Backend<H> for ProvingBackend<'a, S, H>
 		self.0.child_storage(child_info, key)
 	}
 
+	fn apply_to_key_values_while<F: FnMut(Vec<u8>, Vec<u8>) -> bool>(
+		&self,
+		child_info: Option<&ChildInfo>,
+		prefix: Option<&[u8]>,
+		start_at: Option<&[u8]>,
+		f: F,
+		allow_missing: bool,
+	) -> Result<bool, Self::Error> {
+		self.0.apply_to_key_values_while(child_info, prefix, start_at, f, allow_missing)
+	}
+
 	fn apply_to_keys_while<F: FnMut(&[u8]) -> bool>(
 		&self,
 		child_info: Option<&ChildInfo>,
diff --git a/primitives/state-machine/src/trie_backend.rs b/primitives/state-machine/src/trie_backend.rs
index 98deca23a957..6162a9866a46 100644
--- a/primitives/state-machine/src/trie_backend.rs
+++ b/primitives/state-machine/src/trie_backend.rs
@@ -113,6 +113,17 @@ impl<S: TrieBackendStorage<H>, H: Hasher> Backend<H> for TrieBackend<S, H> where
 		self.essence.for_key_values_with_prefix(prefix, f)
 	}
 
+	fn apply_to_key_values_while<F: FnMut(Vec<u8>, Vec<u8>) -> bool>(
+		&self,
+		child_info: Option<&ChildInfo>,
+		prefix: Option<&[u8]>,
+		start_at: Option<&[u8]>,
+		f: F,
+		allow_missing: bool,
+	) -> Result<bool, Self::Error> {
+		self.essence.apply_to_key_values_while(child_info, prefix, start_at, f, allow_missing)
+	}
+
 	fn apply_to_keys_while<F: FnMut(&[u8]) -> bool>(
 		&self,
 		child_info: Option<&ChildInfo>,
diff --git a/primitives/state-machine/src/trie_backend_essence.rs b/primitives/state-machine/src/trie_backend_essence.rs
index e0a24c08393c..54124e6754a5 100644
--- a/primitives/state-machine/src/trie_backend_essence.rs
+++ b/primitives/state-machine/src/trie_backend_essence.rs
@@ -189,6 +189,43 @@ impl<S: TrieBackendStorage<H>, H: Hasher> TrieBackendEssence<S, H> where H::Out:
 			.map_err(map_e)
 	}
 
+	/// Retrieve all entries keys of storage and call `f` for each of those keys.
+	/// Aborts as soon as `f` returns false.
+	///
+	/// Returns `true` when all keys were iterated.
+	pub fn apply_to_key_values_while(
+		&self,
+		child_info: Option<&ChildInfo>,
+		prefix: Option<&[u8]>,
+		start_at: Option<&[u8]>,
+		f: impl FnMut(Vec<u8>, Vec<u8>) -> bool,
+		allow_missing_nodes: bool,
+	) -> Result<bool> {
+		let mut child_root;
+		let root = if let Some(child_info) = child_info.as_ref() {
+			if let Some(fetched_child_root) = self.child_root(child_info)? {
+				child_root = H::Out::default();
+				// root is fetched from DB, not writable by runtime, so it's always valid.
+				child_root.as_mut().copy_from_slice(fetched_child_root.as_slice());
+
+				&child_root
+			} else {
+				return Ok(true);
+			}
+		} else {
+			&self.root
+		};
+
+		self.trie_iter_inner(
+			&root,
+			prefix,
+			f,
+			child_info,
+			start_at,
+			allow_missing_nodes,
+		)
+	}
+
 	/// Retrieve all entries keys of a storage and call `f` for each of those keys.
 	/// Aborts as soon as `f` returns false.
 	pub fn apply_to_keys_while<F: FnMut(&[u8]) -> bool>(
@@ -212,15 +249,15 @@ impl<S: TrieBackendStorage<H>, H: Hasher> TrieBackendEssence<S, H> where H::Out:
 			&self.root
 		};
 
-		self.trie_iter_inner(root, prefix, |k, _v| f(k), child_info)
+		let _ = self.trie_iter_inner(root, prefix, |k, _v| { f(&k); true}, child_info, None, false);
 	}
 
 	/// Execute given closure for all keys starting with prefix.
-	pub fn for_child_keys_with_prefix<F: FnMut(&[u8])>(
+	pub fn for_child_keys_with_prefix(
 		&self,
 		child_info: &ChildInfo,
 		prefix: &[u8],
-		mut f: F,
+		mut f: impl FnMut(&[u8]),
 	) {
 		let root_vec = match self.child_root(child_info) {
 			Ok(v) => v.unwrap_or_else(|| empty_child_trie_root::<Layout<H>>().encode()),
@@ -231,41 +268,43 @@ impl<S: TrieBackendStorage<H>, H: Hasher> TrieBackendEssence<S, H> where H::Out:
 		};
 		let mut root = H::Out::default();
 		root.as_mut().copy_from_slice(&root_vec);
-		self.trie_iter_inner(&root, Some(prefix), |k, _v| { f(k); true }, Some(child_info))
+		let _ = self.trie_iter_inner(&root, Some(prefix), |k, _v| { f(&k); true }, Some(child_info), None, false);
 	}
 
 	/// Execute given closure for all keys starting with prefix.
 	pub fn for_keys_with_prefix<F: FnMut(&[u8])>(&self, prefix: &[u8], mut f: F) {
-		self.trie_iter_inner(&self.root, Some(prefix), |k, _v| { f(k); true }, None)
+		let _ = self.trie_iter_inner(&self.root, Some(prefix), |k, _v| { f(&k); true }, None, None, false);
 	}
 
-	fn trie_iter_inner<F: FnMut(&[u8], &[u8]) -> bool>(
+	fn trie_iter_inner<F: FnMut(Vec<u8>, Vec<u8>) -> bool>(
 		&self,
 		root: &H::Out,
 		prefix: Option<&[u8]>,
 		mut f: F,
 		child_info: Option<&ChildInfo>,
-	) {
-		let mut iter = move |db| -> sp_std::result::Result<(), Box<TrieError<H::Out>>> {
+		start_at: Option<&[u8]>,
+		allow_missing_nodes: bool,
+	) -> Result<bool> {
+		let mut iter = move |db| -> sp_std::result::Result<bool, Box<TrieError<H::Out>>> {
 			let trie = TrieDB::<H>::new(db, root)?;
 
-			let iter = if let Some(prefix) = prefix.as_ref() {
-				TrieDBIterator::new_prefixed(&trie, prefix)?
+			let prefix = prefix.unwrap_or(&[]);
+			let iterator = if let Some(start_at) = start_at {
+				TrieDBIterator::new_prefixed_then_seek(&trie, prefix, start_at)?
 			} else {
-				TrieDBIterator::new(&trie)?
+				TrieDBIterator::new_prefixed(&trie, prefix)?
 			};
-
-			for x in iter {
+			for x in iterator {
 				let (key, value) = x?;
 
-				debug_assert!(prefix.as_ref().map(|prefix| key.starts_with(prefix)).unwrap_or(true));
+				debug_assert!(key.starts_with(prefix));
 
-				if !f(&key, &value) {
-					break;
+				if !f(key, value) {
+					return Ok(false)
 				}
 			}
 
-			Ok(())
+			Ok(true)
 		};
 
 		let result = if let Some(child_info) = child_info {
@@ -274,14 +313,16 @@ impl<S: TrieBackendStorage<H>, H: Hasher> TrieBackendEssence<S, H> where H::Out:
 		} else {
 			iter(self)
 		};
-		if let Err(e) = result {
-			debug!(target: "trie", "Error while iterating by prefix: {}", e);
+		match result {
+			Ok(completed) => Ok(completed),
+			Err(e) if matches!(*e, TrieError::IncompleteDatabase(_)) && allow_missing_nodes => Ok(false),
+			Err(e) => Err(format!("TrieDB iteration error: {}", e)),
 		}
 	}
 
 	/// Execute given closure for all key and values starting with prefix.
 	pub fn for_key_values_with_prefix<F: FnMut(&[u8], &[u8])>(&self, prefix: &[u8], mut f: F) {
-		self.trie_iter_inner(&self.root, Some(prefix), |k, v| { f(k, v); true }, None)
+		let _ = self.trie_iter_inner(&self.root, Some(prefix), |k, v| {f(&k, &v); true}, None, None, false);
 	}
 }
 
diff --git a/test-utils/client/src/lib.rs b/test-utils/client/src/lib.rs
index e343181505c9..eb810e036058 100644
--- a/test-utils/client/src/lib.rs
+++ b/test-utils/client/src/lib.rs
@@ -80,6 +80,7 @@ pub struct TestClientBuilder<Block: BlockT, Executor, Backend, G: GenesisInit> {
 	fork_blocks: ForkBlocks<Block>,
 	bad_blocks: BadBlocks<Block>,
 	enable_offchain_indexing_api: bool,
+	no_genesis: bool,
 }
 
 impl<Block: BlockT, Executor, G: GenesisInit> Default
@@ -116,6 +117,7 @@ impl<Block: BlockT, Executor, Backend, G: GenesisInit> TestClientBuilder<Block,
 			fork_blocks: None,
 			bad_blocks: None,
 			enable_offchain_indexing_api: false,
+			no_genesis: false,
 		}
 	}
 
@@ -183,6 +185,12 @@ impl<Block: BlockT, Executor, Backend, G: GenesisInit> TestClientBuilder<Block,
 		self
 	}
 
+	/// Disable writing genesis.
+	pub fn set_no_genesis(mut self) -> Self {
+		self.no_genesis = true;
+		self
+	}
+
 	/// Build the test client with the given native executor.
 	pub fn build_with_executor<RuntimeApi>(
 		self,
@@ -232,6 +240,7 @@ impl<Block: BlockT, Executor, Backend, G: GenesisInit> TestClientBuilder<Block,
 			None,
 			ClientConfig {
 				offchain_indexing_api: self.enable_offchain_indexing_api,
+				no_genesis: self.no_genesis,
 				..Default::default()
 			},
 		).expect("Creates new client");

From 4ac2a53c84d2f3ff51ba4c3c05d5ca551cb5827c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomusdrw@users.noreply.github.com>
Date: Tue, 22 Jun 2021 13:20:29 +0200
Subject: [PATCH 0904/1194] Fix allocator waste assessment in docs (#9167)

* Fix allocator comment.

* Add explanations where this comes from.

* Clarify absolute values.
---
 primitives/allocator/src/freeing_bump.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/primitives/allocator/src/freeing_bump.rs b/primitives/allocator/src/freeing_bump.rs
index 64ba136f9a35..e2a6b19e4a7f 100644
--- a/primitives/allocator/src/freeing_bump.rs
+++ b/primitives/allocator/src/freeing_bump.rs
@@ -60,8 +60,11 @@
 //!   fail.
 //!
 //! - Sizes of allocations are rounded up to the nearest order. That is, an allocation of 2,00001 MiB
-//!   will be put into the bucket of 4 MiB. Therefore, typically more than half of the space in allocation
-//!   will be wasted. This is more pronounced with larger allocation sizes.
+//!   will be put into the bucket of 4 MiB. Therefore, any allocation of size `(N, 2N]` will take
+//!   up to `2N`, thus assuming a uniform distribution of allocation sizes, the average amount in use
+//!   of a `2N` space on the heap will be `(3N + ε) / 2`. So average utilisation is going to be around
+//!   75% (`(3N + ε) / 2 / 2N`) meaning that around 25% of the space in allocation will be wasted.
+//!   This is more pronounced (in terms of absolute heap amounts) with larger allocation sizes.
 
 use crate::Error;
 use sp_std::{mem, convert::{TryFrom, TryInto}, ops::{Range, Index, IndexMut}};

From 0982f101642ef3ea9899a0779eef43a87d6c9c07 Mon Sep 17 00:00:00 2001
From: Robert Klotzner <eskimor@users.noreply.github.com>
Date: Tue, 22 Jun 2021 15:24:33 +0200
Subject: [PATCH 0905/1194] Add dummy Debug instance to authority discovery
 service. (#9156)

* Add dummy Debug instance to AuthorityDiscoveryService.

* Update client/authority-discovery/src/service.rs

More idiomatic print

Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>

Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
---
 client/authority-discovery/src/service.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/client/authority-discovery/src/service.rs b/client/authority-discovery/src/service.rs
index 1da97cbb03b5..a787ff8f51c2 100644
--- a/client/authority-discovery/src/service.rs
+++ b/client/authority-discovery/src/service.rs
@@ -16,6 +16,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+use std::fmt::Debug;
+
 use crate::ServicetoWorkerMsg;
 
 use futures::channel::{mpsc, oneshot};
@@ -30,6 +32,12 @@ pub struct Service {
 	to_worker: mpsc::Sender<ServicetoWorkerMsg>,
 }
 
+impl Debug for Service {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		f.debug_tuple("AuthorityDiscoveryService").finish()
+	}
+}
+
 /// A [`Service`] allows to interact with a [`crate::Worker`], e.g. by querying the
 /// [`crate::Worker`]'s local address cache for a given [`AuthorityId`].
 impl Service {

From 088464e9c2639ea0e9c4631ec1af2c81f99713b5 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Tue, 22 Jun 2021 18:11:42 +0200
Subject: [PATCH 0906/1194] Add `substrate-rpc-subscription` to exceptions in
 alert (#9172)

---
 .maintain/monitoring/alerting-rules/alerting-rules.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.maintain/monitoring/alerting-rules/alerting-rules.yaml b/.maintain/monitoring/alerting-rules/alerting-rules.yaml
index bc3243d732b4..a3aa1b145b34 100644
--- a/.maintain/monitoring/alerting-rules/alerting-rules.yaml
+++ b/.maintain/monitoring/alerting-rules/alerting-rules.yaml
@@ -134,7 +134,7 @@ groups:
   ##############################################################################
 
   - alert: ContinuousTaskEnded
-    expr: '(polkadot_tasks_spawned_total{task_name != "basic-authorship-proposer"} == 1)
+    expr: '(polkadot_tasks_spawned_total{task_name != "basic-authorship-proposer", task_name != "substrate-rpc-subscription"} == 1)
         - on(instance, task_name) group_left() (polkadot_tasks_ended_total == 1)'
     for: 5m
     labels:

From 6242d37f43ec5aa9b6131a8e61b8d4e71b063907 Mon Sep 17 00:00:00 2001
From: Zeke Mostov <32168567+emostov@users.noreply.github.com>
Date: Tue, 22 Jun 2021 13:36:12 -0700
Subject: [PATCH 0907/1194] try-runtime-cli: Add execute-block subcommand
 (#9077)

* Refactor remote_externalities::rpc_api

* try-runtime-cli: Adde `execute-block` subcommand

* Trivial

* Address some comments

* Use required_if & remove header-at usage

* Improve doc

* Update comment

* small tweaks

* add overwrite-code to shared params

* Update utils/frame/try-runtime/cli/src/lib.rs

Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>

* make url a shared param

* add helper for block_at (#9153)

* add helper for block_at

* remove redundant bound

* doc for fn block_at

* Update error message

Co-authored-by: kianenigma <kian@parity.io>
Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
---
 Cargo.lock                                    |   1 +
 .../election-provider-multi-phase/src/lib.rs  |   2 +-
 utils/frame/remote-externalities/src/lib.rs   |  63 ++++-
 .../frame/remote-externalities/src/rpc_api.rs |  71 +++--
 utils/frame/try-runtime/cli/Cargo.toml        |   1 +
 utils/frame/try-runtime/cli/src/lib.rs        | 262 +++++++++++++-----
 6 files changed, 298 insertions(+), 102 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ffcf95820342..ee78c31645b4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10649,6 +10649,7 @@ dependencies = [
  "sp-blockchain",
  "sp-core",
  "sp-externalities",
+ "sp-io",
  "sp-keystore",
  "sp-runtime",
  "sp-state-machine",
diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index 2bb47a877807..2864ca518d06 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -608,7 +608,7 @@ pub mod pallet {
 		type Fallback: Get<FallbackStrategy>;
 
 		/// Origin that can control this pallet. Note that any action taken by this origin (such)
-		/// as providing an emergency solution is not checked. Thus, it must be a trusted origin. 
+		/// as providing an emergency solution is not checked. Thus, it must be a trusted origin.
 		type ForceOrigin: EnsureOrigin<Self::Origin>;
 
 		/// The configuration of benchmarking.
diff --git a/utils/frame/remote-externalities/src/lib.rs b/utils/frame/remote-externalities/src/lib.rs
index a77650d04212..4b6738f3b915 100644
--- a/utils/frame/remote-externalities/src/lib.rs
+++ b/utils/frame/remote-externalities/src/lib.rs
@@ -43,10 +43,12 @@ type KeyPair = (StorageKey, StorageData);
 
 const LOG_TARGET: &str = "remote-ext";
 const DEFAULT_TARGET: &str = "wss://rpc.polkadot.io";
-const BATCH_SIZE: usize = 512;
+const BATCH_SIZE: usize = 1000;
 
 jsonrpsee_proc_macros::rpc_client_api! {
 	RpcApi<B: BlockT> {
+		#[rpc(method = "state_getStorage", positional_params)]
+		fn get_storage(prefix: StorageKey, hash: Option<B::Hash>) -> StorageData;
 		#[rpc(method = "state_getKeysPaged", positional_params)]
 		fn get_keys_paged(
 			prefix: Option<StorageKey>,
@@ -107,7 +109,7 @@ impl From<String> for Transport {
 /// A state snapshot config may be present and will be written to in that case.
 #[derive(Clone)]
 pub struct OnlineConfig<B: BlockT> {
-	/// The block number at which to connect. Will be latest finalized head if not provided.
+	/// The block hash at which to get the runtime state. Will be latest finalized head if not provided.
 	pub at: Option<B::Hash>,
 	/// An optional state snapshot file to WRITE to, not for reading. Not written if set to `None`.
 	pub state_snapshot: Option<SnapshotConfig>,
@@ -159,8 +161,11 @@ impl Default for SnapshotConfig {
 pub struct Builder<B: BlockT> {
 	/// Custom key-pairs to be injected into the externalities.
 	inject: Vec<KeyPair>,
-	/// Storage entry key prefixes to be injected into the externalities. The *hashed* prefix must be given.
+	/// Storage entry key prefixes to be injected into the externalities. The *hashed* prefix must
+	/// be given.
 	hashed_prefixes: Vec<Vec<u8>>,
+	/// Storage entry keys to be injected into the externalities. The *hashed* key must be given.
+	hashed_keys: Vec<Vec<u8>>,
 	/// connectivity mode, online or offline.
 	mode: Mode<B>,
 }
@@ -169,7 +174,12 @@ pub struct Builder<B: BlockT> {
 // that.
 impl<B: BlockT> Default for Builder<B> {
 	fn default() -> Self {
-		Self { inject: Default::default(), mode: Default::default(), hashed_prefixes: Default::default() }
+		Self {
+			inject: Default::default(),
+			mode: Default::default(),
+			hashed_prefixes: Default::default(),
+			hashed_keys: Default::default(),
+		}
 	}
 }
 
@@ -192,6 +202,17 @@ impl<B: BlockT> Builder<B> {
 
 // RPC methods
 impl<B: BlockT> Builder<B> {
+	async fn rpc_get_storage(
+		&self,
+		key: StorageKey,
+		maybe_at: Option<B::Hash>,
+	) -> Result<StorageData, &'static str> {
+		trace!(target: LOG_TARGET, "rpc: get_storage");
+		RpcApi::<B>::get_storage(self.as_online().rpc_client(), key, maybe_at).await.map_err(|e| {
+			error!("Error = {:?}", e);
+			"rpc get_storage failed."
+		})
+	}
 	/// Get the latest finalized head.
 	async fn rpc_get_head(&self) -> Result<B::Hash, &'static str> {
 		trace!(target: LOG_TARGET, "rpc: finalized_head");
@@ -281,7 +302,7 @@ impl<B: BlockT> Builder<B> {
 			let values = client.batch_request::<Option<StorageData>>(batch)
 				.await
 				.map_err(|e| {
-					log::error!(target: LOG_TARGET, "failed to execute batch {:?} due to {:?}", chunk_keys, e);
+					log::error!(target: LOG_TARGET, "failed to execute batch: {:?}. Error: {:?}", chunk_keys, e);
 					"batch failed."
 				})?;
 			assert_eq!(chunk_keys.len(), values.len());
@@ -356,11 +377,23 @@ impl<B: BlockT> Builder<B> {
 		};
 
 		for prefix in &self.hashed_prefixes {
-			info!(target: LOG_TARGET, "adding data for hashed prefix: {:?}", HexDisplay::from(prefix));
-			let additional_key_values = self.rpc_get_pairs_paged(StorageKey(prefix.to_vec()), at).await?;
+			debug!(
+				target: LOG_TARGET,
+				"adding data for hashed prefix: {:?}",
+				HexDisplay::from(prefix)
+			);
+			let additional_key_values =
+				self.rpc_get_pairs_paged(StorageKey(prefix.to_vec()), at).await?;
 			keys_and_values.extend(additional_key_values);
 		}
 
+		for key in &self.hashed_keys {
+			let key = StorageKey(key.to_vec());
+			debug!(target: LOG_TARGET, "adding data for hashed key: {:?}", HexDisplay::from(&key));
+			let value = self.rpc_get_storage(key.clone(), Some(at)).await?;
+			keys_and_values.push((key, value));
+		}
+
 		Ok(keys_and_values)
 	}
 
@@ -400,7 +433,7 @@ impl<B: BlockT> Builder<B> {
 
 		info!(
 			target: LOG_TARGET,
-			"extending externalities with {} manually injected keys",
+			"extending externalities with {} manually injected key-values",
 			self.inject.len()
 		);
 		base_kv.extend(self.inject.clone());
@@ -416,19 +449,29 @@ impl<B: BlockT> Builder<B> {
 	}
 
 	/// Inject a manual list of key and values to the storage.
-	pub fn inject(mut self, injections: &[KeyPair]) -> Self {
+	pub fn inject_key_value(mut self, injections: &[KeyPair]) -> Self {
 		for i in injections {
 			self.inject.push(i.clone());
 		}
 		self
 	}
 
-	/// Inject a hashed prefix. This is treated as-is, and should be pre-hashed. 
+	/// Inject a hashed prefix. This is treated as-is, and should be pre-hashed.
+	///
+	/// This should be used to inject a "PREFIX", like a storage (double) map.
 	pub fn inject_hashed_prefix(mut self, hashed: &[u8]) -> Self {
 		self.hashed_prefixes.push(hashed.to_vec());
 		self
 	}
 
+	/// Inject a hashed key to scrape. This is treated as-is, and should be pre-hashed.
+	///
+	/// This should be used to inject a "KEY", like a storage value.
+	pub fn inject_hashed_key(mut self, hashed: &[u8]) -> Self {
+		self.hashed_keys.push(hashed.to_vec());
+		self
+	}
+
 	/// Configure a state snapshot to be used.
 	pub fn mode(mut self, mode: Mode<B>) -> Self {
 		self.mode = mode;
diff --git a/utils/frame/remote-externalities/src/rpc_api.rs b/utils/frame/remote-externalities/src/rpc_api.rs
index e7fd021bac4a..6773bfd54bb1 100644
--- a/utils/frame/remote-externalities/src/rpc_api.rs
+++ b/utils/frame/remote-externalities/src/rpc_api.rs
@@ -18,36 +18,65 @@
 //! WS RPC API for one off RPC calls to a substrate node.
 // TODO: Consolidate one off RPC calls https://github.com/paritytech/substrate/issues/8988
 
-use super::*;
+use sp_runtime::{generic::SignedBlock, traits::{Block as BlockT, Header as HeaderT}};
+use jsonrpsee_ws_client::{WsClientBuilder, WsClient, v2::params::JsonRpcParams, traits::Client};
 
 /// Get the header of the block identified by `at`
-pub async fn get_header<B: BlockT, S: AsRef<str>>(from: S, at: B::Hash) -> Result<B::Header, String>
+pub async fn get_header<Block, S>(from: S, at: Block::Hash) -> Result<Block::Header, String>
 where
-	B::Header: serde::de::DeserializeOwned,
+	Block: BlockT,
+	Block::Header: serde::de::DeserializeOwned,
+	S: AsRef<str>,
 {
-	use jsonrpsee_ws_client::traits::Client;
-	let at = serde_json::to_value(at)
-		.map_err(|e| format!("Block hash could not be converted to JSON due to {:?}", e))?;
-	let params = vec![at];
-	let client = WsClientBuilder::default()
-		.max_request_body_size(u32::MAX)
-		.build(from.as_ref())
-		.await
-		.map_err(|e| format!("`WsClientBuilder` failed to build do to {:?}", e))?;
-	client.request::<B::Header>("chain_getHeader", JsonRpcParams::Array(params))
+	let params = vec![hash_to_json::<Block>(at)?];
+	let client = build_client(from).await?;
+
+	client.request::<Block::Header>("chain_getHeader", JsonRpcParams::Array(params))
 		.await
-		.map_err(|e| format!("chain_getHeader request failed due to {:?}", e))
+		.map_err(|e| format!("chain_getHeader request failed: {:?}", e))
 }
 
 /// Get the finalized head
-pub async fn get_finalized_head<B: BlockT, S: AsRef<str>>(from: S) -> Result<B::Hash, String> {
-	use jsonrpsee_ws_client::traits::Client;
-	let client = WsClientBuilder::default()
+pub async fn get_finalized_head<Block, S>(from: S) -> Result<Block::Hash, String>
+where
+	Block: BlockT,
+	S: AsRef<str>,
+{
+	let client = build_client(from).await?;
+
+	client.request::<Block::Hash>("chain_getFinalizedHead", JsonRpcParams::NoParams)
+		.await
+		.map_err(|e| format!("chain_getFinalizedHead request failed: {:?}", e))
+}
+
+/// Get the signed block identified by `at`.
+pub async fn get_block<Block, S>(from: S, at: Block::Hash) -> Result<Block, String>
+where
+	S: AsRef<str>,
+	Block: BlockT + serde::de::DeserializeOwned,
+	Block::Header: HeaderT,
+{
+	let params = vec![hash_to_json::<Block>(at)?];
+	let client = build_client(from).await?;
+	let signed_block = client
+		.request::<SignedBlock<Block>>("chain_getBlock", JsonRpcParams::Array(params))
+		.await
+		.map_err(|e| format!("chain_getBlock request failed: {:?}", e))?;
+
+	Ok(signed_block.block)
+}
+
+/// Convert a block hash to a serde json value.
+fn hash_to_json<Block: BlockT>(hash: Block::Hash) -> Result<serde_json::Value, String> {
+	serde_json::to_value(hash)
+		.map_err(|e| format!("Block hash could not be converted to JSON: {:?}", e))
+}
+
+/// Build a website client that connects to `from`.
+async fn build_client<S: AsRef<str>>(from: S) -> Result<WsClient, String> {
+	 WsClientBuilder::default()
 		.max_request_body_size(u32::MAX)
 		.build(from.as_ref())
 		.await
-		.map_err(|e| format!("`WsClientBuilder` failed to build do to {:?}", e))?;
-	client.request::<B::Hash>("chain_getFinalizedHead", JsonRpcParams::NoParams)
-		.await
-		.map_err(|e| format!("chain_getFinalizedHead request failed due to {:?}", e))
+		.map_err(|e| format!("`WsClientBuilder` failed to build: {:?}", e))
 }
diff --git a/utils/frame/try-runtime/cli/Cargo.toml b/utils/frame/try-runtime/cli/Cargo.toml
index f262ba4812a0..2e2335bc5fff 100644
--- a/utils/frame/try-runtime/cli/Cargo.toml
+++ b/utils/frame/try-runtime/cli/Cargo.toml
@@ -29,6 +29,7 @@ sp-blockchain = { version = "3.0.0", path = "../../../../primitives/blockchain"
 sp-runtime = { version = "3.0.0", path = "../../../../primitives/runtime" }
 sp-externalities = { version = "0.9.0", path = "../../../../primitives/externalities" }
 sp-core = { version = "3.0.0", path = "../../../../primitives/core" }
+sp-io = { version = "3.0.0", path = "../../../../primitives/io" }
 sp-keystore = { version = "0.9.0", path = "../../../../primitives/keystore" }
 frame-try-runtime = { version = "0.9.0", path = "../../../../frame/try-runtime" }
 
diff --git a/utils/frame/try-runtime/cli/src/lib.rs b/utils/frame/try-runtime/cli/src/lib.rs
index dc4cb7cd33db..e0d09ff7fbcf 100644
--- a/utils/frame/try-runtime/cli/src/lib.rs
+++ b/utils/frame/try-runtime/cli/src/lib.rs
@@ -25,13 +25,14 @@ use sc_executor::NativeExecutor;
 use sc_service::NativeExecutionDispatch;
 use sc_chain_spec::ChainSpec;
 use sp_state_machine::StateMachine;
-use sp_runtime::traits::{Block as BlockT, NumberFor};
+use sp_runtime::traits::{Block as BlockT, NumberFor, Header as HeaderT};
 use sp_core::{
 	offchain::{
 		OffchainWorkerExt, OffchainDbExt, TransactionPoolExt,
-		testing::{TestOffchainExt, TestTransactionPoolExt}
+		testing::{TestOffchainExt, TestTransactionPoolExt},
 	},
 	storage::{StorageData, StorageKey, well_known_keys},
+	hashing::twox_128,
 };
 use sp_keystore::{KeystoreExt, testing::KeyStore};
 use remote_externalities::{Builder, Mode, SnapshotConfig, OfflineConfig, OnlineConfig, rpc_api};
@@ -45,6 +46,8 @@ pub enum Command {
 	OnRuntimeUpgrade(OnRuntimeUpgradeCmd),
 	/// Execute "OffchainWorkerApi_offchain_worker" against the given runtime state.
 	OffchainWorker(OffchainWorkerCmd),
+	/// Execute "Core_execute_block" using the given block and the runtime state of the parent block.
+	ExecuteBlock(ExecuteBlockCmd),
 }
 
 #[derive(Debug, Clone, structopt::StructOpt)]
@@ -55,17 +58,14 @@ pub struct OnRuntimeUpgradeCmd {
 
 #[derive(Debug, Clone, structopt::StructOpt)]
 pub struct OffchainWorkerCmd {
-	/// Hash of the block whose header to use to execute the offchain worker.
-	#[structopt(short, long, multiple = false, parse(try_from_str = parse::hash))]
-	pub header_at: String,
-
 	#[structopt(subcommand)]
 	pub state: State,
+}
 
-	/// Whether or not to overwrite the code from state with the code from
-	/// the specified chain spec.
-	#[structopt(long)]
-	pub overwrite_code: bool,
+#[derive(Debug, Clone, structopt::StructOpt)]
+pub struct ExecuteBlockCmd {
+	#[structopt(subcommand)]
+	pub state: State,
 }
 
 #[derive(Debug, Clone, structopt::StructOpt)]
@@ -99,6 +99,46 @@ pub struct SharedParams {
 	/// sc_service::Configuration.default_heap_pages.
 	#[structopt(long)]
 	pub heap_pages: Option<u64>,
+
+	/// The block hash at which to read state. This is required for execute-block, offchain-worker,
+	/// or any command that used the live subcommand.
+	#[structopt(
+		short,
+		long,
+		multiple = false,
+		parse(try_from_str = parse::hash),
+		required_ifs(
+			&[("command", "offchain-worker"), ("command", "execute-block"), ("subcommand", "live")]
+		)
+	)]
+	block_at: String,
+
+	/// Whether or not to overwrite the code from state with the code from
+	/// the specified chain spec.
+	#[structopt(long)]
+	pub overwrite_code: bool,
+
+	/// The url to connect to.
+	// TODO having this a shared parm is a temporary hack; the url is used just
+	// to get the header/block. We should try and get that out of state, OR allow
+	// the user to feed in a header/block via file.
+	// https://github.com/paritytech/substrate/issues/9027
+	#[structopt(short, long, default_value = "ws://localhost:9944", parse(try_from_str = parse::url))]
+	url: String,
+}
+
+impl SharedParams {
+	/// Get the configured value of `block_at`, interpreted as the hash type of `Block`.
+	pub fn block_at<Block>(&self) -> sc_cli::Result<Block::Hash>
+	where
+		Block: BlockT,
+		<Block as BlockT>::Hash: FromStr,
+		<<Block as BlockT>::Hash as FromStr>::Err: Debug,
+	{
+		self.block_at
+			.parse::<<Block as BlockT>::Hash>()
+			.map_err(|e| format!("Could not parse block hash: {:?}", e).into())
+	}
 }
 
 /// Various commands to try out against runtime state at a specific block.
@@ -114,11 +154,10 @@ pub struct TryRuntimeCmd {
 /// The source of runtime state to try operations against.
 #[derive(Debug, Clone, structopt::StructOpt)]
 pub enum State {
-	/// Use a state snapshot as the source of runtime state. NOTE: for the offchain-worker command this
-	/// is only partially supported at the moment and you must have a relevant archive node exposed on
-	/// localhost:9944 in order to query the block header.
-	// TODO https://github.com/paritytech/substrate/issues/9027
+	/// Use a state snapshot as the source of runtime state. NOTE: for the offchain-worker and
+	/// execute-block command this is only partially supported and requires a archive node url.
 	Snap {
+		#[structopt(short, long)]
 		snapshot_path: PathBuf,
 	},
 
@@ -128,25 +167,16 @@ pub enum State {
 		#[structopt(short, long)]
 		snapshot_path: Option<PathBuf>,
 
-		/// The block hash at which to connect.
-		/// Will be latest finalized head if not provided.
-		#[structopt(short, long, multiple = false, parse(try_from_str = parse::hash))]
-		block_at: Option<String>,
-
 		/// The modules to scrape. If empty, entire chain state will be scraped.
 		#[structopt(short, long, require_delimiter = true)]
 		modules: Option<Vec<String>>,
-
-		/// The url to connect to.
-		#[structopt(default_value = "ws://localhost:9944", parse(try_from_str = parse::url))]
-		url: String,
-	},
+	}
 }
 
 async fn on_runtime_upgrade<Block, ExecDispatch>(
 	shared: SharedParams,
 	command: OnRuntimeUpgradeCmd,
-	config: Configuration
+	config: Configuration,
 ) -> sc_cli::Result<()>
 where
 	Block: BlockT,
@@ -158,11 +188,7 @@ where
 {
 	let wasm_method = shared.wasm_method;
 	let execution = shared.execution;
-	let heap_pages = if shared.heap_pages.is_some() {
-		shared.heap_pages
-	} else {
-		config.default_heap_pages
-	};
+	let heap_pages = shared.heap_pages.or(config.default_heap_pages);
 
 	let mut changes = Default::default();
 	let max_runtime_instances = config.max_runtime_instances;
@@ -180,22 +206,22 @@ where
 				}))
 			},
 			State::Live {
-				url,
 				snapshot_path,
-				block_at,
 				modules
 			} => Builder::<Block>::new().mode(Mode::Online(OnlineConfig {
-				transport: url.to_owned().into(),
+				transport: shared.url.to_owned().into(),
 				state_snapshot: snapshot_path.as_ref().map(SnapshotConfig::new),
 				modules: modules.to_owned().unwrap_or_default(),
-				at: block_at.as_ref()
-					.map(|b| b.parse().map_err(|e| format!("Could not parse hash: {:?}", e))).transpose()?,
+				at: Some(shared.block_at::<Block>()?),
 				..Default::default()
 			})),
 		};
 
 		let (code_key, code) = extract_code(config.chain_spec)?;
-		builder.inject(&[(code_key, code)]).build().await?
+		builder
+			.inject_key_value(&[(code_key, code)])
+			.inject_hashed_key(&[twox_128(b"System"), twox_128(b"LastRuntimeUpgrade")].concat())
+			.build().await?
 	};
 
 	let encoded_result = StateMachine::<_, _, NumberFor<Block>, _>::new(
@@ -211,10 +237,10 @@ where
 		sp_core::testing::TaskExecutor::new(),
 	)
 	.execute(execution.into())
-	.map_err(|e| format!("failed to execute 'TryRuntime_on_runtime_upgrade' due to {:?}", e))?;
+	.map_err(|e| format!("failed to execute 'TryRuntime_on_runtime_upgrade': {:?}", e))?;
 
 	let (weight, total_weight) = <(u64, u64) as Decode>::decode(&mut &*encoded_result)
-		.map_err(|e| format!("failed to decode output due to {:?}", e))?;
+		.map_err(|e| format!("failed to decode output: {:?}", e))?;
 	log::info!(
 		"TryRuntime_on_runtime_upgrade executed without errors. Consumed weight = {}, total weight = {} ({})",
 		weight,
@@ -229,7 +255,7 @@ async fn offchain_worker<Block, ExecDispatch>(
 	shared: SharedParams,
 	command: OffchainWorkerCmd,
 	config: Configuration,
-)-> sc_cli::Result<()>
+) -> sc_cli::Result<()>
 where
 	Block: BlockT,
 	Block::Hash: FromStr,
@@ -241,11 +267,7 @@ where
 {
 	let wasm_method = shared.wasm_method;
 	let execution = shared.execution;
-	let heap_pages = if shared.heap_pages.is_some() {
-		shared.heap_pages
-	} else {
-		config.default_heap_pages
-	};
+	let heap_pages = shared.heap_pages.or(config.default_heap_pages);
 
 	let mut changes = Default::default();
 	let max_runtime_instances = config.max_runtime_instances;
@@ -255,47 +277,43 @@ where
 		max_runtime_instances,
 	);
 
-	let (mode, url) = match command.state {
+	let mode = match command.state {
 			State::Live {
-				url,
 				snapshot_path,
-				block_at,
 				modules
 			} => {
+				let at = shared.block_at::<Block>()?;
 				let online_config = OnlineConfig {
-					transport: url.to_owned().into(),
+					transport: shared.url.to_owned().into(),
 					state_snapshot: snapshot_path.as_ref().map(SnapshotConfig::new),
 					modules: modules.to_owned().unwrap_or_default(),
-					at: block_at.as_ref()
-						.map(|b| b.parse().map_err(|e| format!("Could not parse hash: {:?}", e))).transpose()?,
+					at: Some(at),
 					..Default::default()
 				};
 
-				(Mode::Online(online_config), url)
+				Mode::Online(online_config)
 			},
 			State::Snap { snapshot_path } => {
-				// TODO This is a temporary hack; the url is used just to get the header. We should try
-				// and get the header out of state, OR use an arbitrary header if thats ok, OR allow
-				// the user to feed in a header via file.
-				// https://github.com/paritytech/substrate/issues/9027
-				// This assumes you have a node running on local host default
-				let url = "ws://127.0.0.1:9944".to_string();
 				let mode = Mode::Offline(OfflineConfig {
 					state_snapshot: SnapshotConfig::new(snapshot_path),
 				});
 
-				(mode, url)
+				mode
 			}
 	};
-	let builder = Builder::<Block>::new().mode(mode);
-	let mut ext = if command.overwrite_code {
+	let builder = Builder::<Block>::new()
+		.mode(mode)
+		.inject_hashed_key(&[twox_128(b"System"), twox_128(b"LastRuntimeUpgrade")].concat());
+	let mut ext = if shared.overwrite_code {
 		let (code_key, code) = extract_code(config.chain_spec)?;
-		builder.inject(&[(code_key, code)]).build().await?
+		builder.inject_key_value(&[(code_key, code)]).build().await?
 	} else {
-		builder.build().await?
+		builder
+			.inject_hashed_key(well_known_keys::CODE)
+			.build()
+			.await?
 	};
 
-	// register externality extensions in order to provide host interface for OCW to the runtime.
 	let (offchain, _offchain_state) = TestOffchainExt::new();
 	let (pool, _pool_state) = TestTransactionPoolExt::new();
 	ext.register_extension(OffchainDbExt::new(offchain.clone()));
@@ -303,10 +321,8 @@ where
 	ext.register_extension(KeystoreExt(Arc::new(KeyStore::new())));
 	ext.register_extension(TransactionPoolExt::new(pool));
 
-	let header_hash: Block::Hash = command.header_at
-		.parse()
-		.map_err(|e| format!("Could not parse header hash: {:?}", e))?;
-	let header = rpc_api::get_header::<Block, _>(url, header_hash).await?;
+	let header_hash = shared.block_at::<Block>()?;
+	let header = rpc_api::get_header::<Block, _>(shared.url, header_hash).await?;
 
 	let _ = StateMachine::<_, _, NumberFor<Block>, _>::new(
 		&ext.backend,
@@ -321,17 +337,120 @@ where
 		sp_core::testing::TaskExecutor::new(),
 	)
 	.execute(execution.into())
-	.map_err(|e| format!("failed to execute 'OffchainWorkerApi_offchain_worker' due to {:?}", e))?;
+	.map_err(|e| format!("failed to execute 'OffchainWorkerApi_offchain_worker':  {:?}", e))?;
 
 	log::info!("OffchainWorkerApi_offchain_worker executed without errors.");
 
 	Ok(())
 }
 
+async fn execute_block<Block, ExecDispatch>(
+	shared: SharedParams,
+	command: ExecuteBlockCmd,
+	config: Configuration,
+) -> sc_cli::Result<()>
+where
+	Block: BlockT + serde::de::DeserializeOwned,
+	Block::Hash: FromStr,
+	<Block::Hash as FromStr>::Err: Debug,
+	NumberFor<Block>: FromStr,
+	<NumberFor<Block> as FromStr>::Err: Debug,
+	ExecDispatch: NativeExecutionDispatch + 'static,
+{
+	let wasm_method = shared.wasm_method;
+	let execution = shared.execution;
+	let heap_pages = shared.heap_pages.or(config.default_heap_pages);
+
+	let mut changes = Default::default();
+	let max_runtime_instances = config.max_runtime_instances;
+	let executor = NativeExecutor::<ExecDispatch>::new(
+		wasm_method.into(),
+		heap_pages,
+		max_runtime_instances,
+	);
+
+	let block_hash = shared.block_at::<Block>()?;
+	let block: Block = rpc_api::get_block::<Block, _>(shared.url.clone(), block_hash).await?;
+
+	let mode = match command.state {
+		State::Snap { snapshot_path } => {
+			let mode = Mode::Offline(OfflineConfig {
+				state_snapshot: SnapshotConfig::new(snapshot_path),
+			});
+
+			mode
+		},
+		State::Live { snapshot_path, modules } => {
+			let parent_hash = block.header().parent_hash();
+
+			let mode = Mode::Online(OnlineConfig {
+				transport: shared.url.to_owned().into(),
+				state_snapshot: snapshot_path.as_ref().map(SnapshotConfig::new),
+				modules: modules.to_owned().unwrap_or_default(),
+				at: Some(parent_hash.to_owned()),
+				..Default::default()
+			});
+
+			mode
+		}
+	};
+
+	let ext = {
+		let builder = Builder::<Block>::new()
+			.mode(mode)
+			.inject_hashed_key(&[twox_128(b"System"), twox_128(b"LastRuntimeUpgrade")].concat());
+		let mut ext = if shared.overwrite_code {
+			let (code_key, code) = extract_code(config.chain_spec)?;
+			builder.inject_key_value(&[(code_key, code)]).build().await?
+		} else {
+			builder
+				.inject_hashed_key(well_known_keys::CODE)
+				.build()
+				.await?
+		};
+
+		// register externality extensions in order to provide host interface for OCW to the
+		// runtime.
+		let (offchain, _offchain_state) = TestOffchainExt::new();
+		let (pool, _pool_state) = TestTransactionPoolExt::new();
+		ext.register_extension(OffchainDbExt::new(offchain.clone()));
+		ext.register_extension(OffchainWorkerExt::new(offchain));
+		ext.register_extension(KeystoreExt(Arc::new(KeyStore::new())));
+		ext.register_extension(TransactionPoolExt::new(pool));
+
+		ext
+	};
+
+	// A digest item gets added when the runtime is processing the block, so we need to pop
+	// the last one to be consistent with what a gossiped block would contain.
+	let (mut header, extrinsics) = block.deconstruct();
+	header.digest_mut().pop();
+	let block = Block::new(header, extrinsics);
+
+	let _encoded_result = StateMachine::<_, _, NumberFor<Block>, _>::new(
+		&ext.backend,
+		None,
+		&mut changes,
+		&executor,
+		"Core_execute_block",
+		block.encode().as_ref(),
+		ext.extensions,
+		&sp_state_machine::backend::BackendRuntimeCode::new(&ext.backend).runtime_code()?,
+		sp_core::testing::TaskExecutor::new(),
+	)
+	.execute(execution.into())
+	.map_err(|e| format!("failed to execute 'Core_execute_block': {:?}", e))?;
+	debug_assert!(_encoded_result == vec![1]);
+
+	log::info!("Core_execute_block executed without errors.");
+
+	Ok(())
+}
+
 impl TryRuntimeCmd {
 	pub async fn run<Block, ExecDispatch>(&self, config: Configuration) -> sc_cli::Result<()>
 	where
-		Block: BlockT,
+		Block: BlockT + serde::de::DeserializeOwned,
 		Block::Header: serde::de::DeserializeOwned,
 		Block::Hash: FromStr,
 		<Block::Hash as FromStr>::Err: Debug,
@@ -346,6 +465,9 @@ impl TryRuntimeCmd {
 			Command::OffchainWorker(cmd) => {
 				offchain_worker::<Block, ExecDispatch>(self.shared.clone(), cmd.clone(), config).await
 			}
+			Command::ExecuteBlock(cmd) => {
+				execute_block::<Block, ExecDispatch>(self.shared.clone(), cmd.clone(), config).await
+			}
 		}
 	}
 }
@@ -363,7 +485,7 @@ impl CliConfiguration for TryRuntimeCmd {
 	}
 }
 
-/// Extract `:code` from the given chain spec and return as `StorageData` along with the 
+/// Extract `:code` from the given chain spec and return as `StorageData` along with the
 /// corresponding `StorageKey`.
 fn extract_code(spec: Box<dyn ChainSpec>) -> sc_cli::Result<(StorageKey, StorageData)> {
 	let genesis_storage = spec.build_storage()?;

From 63c4b497108cc52a101d9e0a31a3c723a27bc8d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Wed, 23 Jun 2021 06:01:11 +0100
Subject: [PATCH 0908/1194] consensus: remove unused offline tracker (#9178)

---
 primitives/consensus/common/src/lib.rs        |   1 -
 .../consensus/common/src/offline_tracker.rs   | 137 ------------------
 2 files changed, 138 deletions(-)
 delete mode 100644 primitives/consensus/common/src/offline_tracker.rs

diff --git a/primitives/consensus/common/src/lib.rs b/primitives/consensus/common/src/lib.rs
index 60e260a89282..51b2a96e1775 100644
--- a/primitives/consensus/common/src/lib.rs
+++ b/primitives/consensus/common/src/lib.rs
@@ -39,7 +39,6 @@ use futures::prelude::*;
 use sp_state_machine::StorageProof;
 
 pub mod block_validation;
-pub mod offline_tracker;
 pub mod error;
 pub mod block_import;
 mod select_chain;
diff --git a/primitives/consensus/common/src/offline_tracker.rs b/primitives/consensus/common/src/offline_tracker.rs
deleted file mode 100644
index 8e33a2c449e3..000000000000
--- a/primitives/consensus/common/src/offline_tracker.rs
+++ /dev/null
@@ -1,137 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Tracks offline validators.
-
-use std::collections::HashMap;
-use std::time::Duration;
-use wasm_timer::Instant;
-
-// time before we report a validator.
-const REPORT_TIME: Duration = Duration::from_secs(60 * 5);
-
-struct Observed {
-	last_round_end: Instant,
-	offline_since: Instant,
-}
-
-impl Observed {
-	fn new() -> Observed {
-		let now = Instant::now();
-		Observed {
-			last_round_end: now,
-			offline_since: now,
-		}
-	}
-
-	fn note_round_end(&mut self, was_online: bool) {
-		let now = Instant::now();
-
-		self.last_round_end = now;
-		if was_online {
-			self.offline_since = now;
-		}
-	}
-
-	fn is_active(&self) -> bool {
-		// can happen if clocks are not monotonic
-		if self.offline_since > self.last_round_end { return true }
-		self.last_round_end.duration_since(self.offline_since) < REPORT_TIME
-	}
-}
-
-/// Tracks offline validators and can issue a report for those offline.
-pub struct OfflineTracker<AuthorityId> {
-	observed: HashMap<AuthorityId, Observed>,
-}
-
-impl<AuthorityId: Eq + Clone + std::hash::Hash> OfflineTracker<AuthorityId> {
-	/// Create a new tracker.
-	pub fn new() -> Self {
-		OfflineTracker { observed: HashMap::new() }
-	}
-
-	/// Note new consensus is starting with the given set of validators.
-	pub fn note_new_block(&mut self, validators: &[AuthorityId]) {
-		use std::collections::HashSet;
-
-		let set: HashSet<_> = validators.iter().cloned().collect();
-		self.observed.retain(|k, _| set.contains(k));
-	}
-
-	/// Note that a round has ended.
-	pub fn note_round_end(&mut self, validator: AuthorityId, was_online: bool) {
-		self.observed.entry(validator)
-			.or_insert_with(Observed::new)
-			.note_round_end(was_online);
-	}
-
-	/// Generate a vector of indices for offline account IDs.
-	pub fn reports(&self, validators: &[AuthorityId]) -> Vec<u32> {
-		validators.iter()
-			.enumerate()
-			.filter_map(|(i, v)| if self.is_online(v) {
-				None
-			} else {
-				Some(i as u32)
-			})
-			.collect()
-	}
-
-	/// Whether reports on a validator set are consistent with our view of things.
-	pub fn check_consistency(&self, validators: &[AuthorityId], reports: &[u32]) -> bool {
-		reports.iter().cloned().all(|r| {
-			let v = match validators.get(r as usize) {
-				Some(v) => v,
-				None => return false,
-			};
-
-			// we must think all validators reported externally are offline.
-			let thinks_online = self.is_online(v);
-			!thinks_online
-		})
-	}
-
-	fn is_online(&self, v: &AuthorityId) -> bool {
-		self.observed.get(v).map(Observed::is_active).unwrap_or(true)
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-
-	#[test]
-	fn validator_offline() {
-		let mut tracker = OfflineTracker::<u64>::new();
-		let v1 = 1;
-		let v2 = 2;
-		let v3 = 3;
-		tracker.note_round_end(v1, true);
-		tracker.note_round_end(v2, true);
-		tracker.note_round_end(v3, true);
-
-		let slash_time = REPORT_TIME + Duration::from_secs(5);
-		tracker.observed.get_mut(&v1).unwrap().offline_since -= slash_time;
-		tracker.observed.get_mut(&v2).unwrap().offline_since -= slash_time;
-
-		assert_eq!(tracker.reports(&[v1, v2, v3]), vec![0, 1]);
-
-		tracker.note_new_block(&[v1, v3]);
-		assert_eq!(tracker.reports(&[v1, v2, v3]), vec![0]);
-	}
-}

From 54813c8b781104e24327cfc2a508c7b5936e55a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Wed, 23 Jun 2021 08:50:48 +0100
Subject: [PATCH 0909/1194] grandpa: fix broken line breaks in logging (#9179)

---
 client/finality-grandpa/src/authorities.rs |  7 +++----
 client/finality-grandpa/src/import.rs      |  5 ++---
 client/finality-grandpa/src/lib.rs         | 10 +++++-----
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/client/finality-grandpa/src/authorities.rs b/client/finality-grandpa/src/authorities.rs
index ececbf1d7c70..a04be72f9d31 100644
--- a/client/finality-grandpa/src/authorities.rs
+++ b/client/finality-grandpa/src/authorities.rs
@@ -295,8 +295,7 @@ where
 
 		debug!(
 			target: "afg",
-			"Inserting potential standard set change signaled at block {:?} (delayed by {:?}
-			blocks).",
+			"Inserting potential standard set change signaled at block {:?} (delayed by {:?} blocks).",
 			(&number, &hash),
 			pending.delay,
 		);
@@ -310,8 +309,8 @@ where
 
 		debug!(
 			target: "afg",
-			"There are now {} alternatives for the next pending standard change (roots), and a
-			total of {} pending standard changes (across all forks).",
+			"There are now {} alternatives for the next pending standard change (roots), and a \
+			 total of {} pending standard changes (across all forks).",
 			self.pending_standard_changes.roots().count(),
 			self.pending_standard_changes.iter().count(),
 		);
diff --git a/client/finality-grandpa/src/import.rs b/client/finality-grandpa/src/import.rs
index c287cc0b3b89..ebb26a28c348 100644
--- a/client/finality-grandpa/src/import.rs
+++ b/client/finality-grandpa/src/import.rs
@@ -372,9 +372,8 @@ where
 						self.inner.header(BlockId::Number(canon_number))
 							.map_err(|e| ConsensusError::ClientImport(e.to_string()))?
 							.expect(
-								"the given block number is less or equal than the current best
-								finalized number; current best finalized number must exist in
-								chain; qed."
+								"the given block number is less or equal than the current best finalized number; \
+								 current best finalized number must exist in chain; qed."
 							)
 							.hash();
 
diff --git a/client/finality-grandpa/src/lib.rs b/client/finality-grandpa/src/lib.rs
index a133319fdbef..6c3f0f6af37a 100644
--- a/client/finality-grandpa/src/lib.rs
+++ b/client/finality-grandpa/src/lib.rs
@@ -778,7 +778,7 @@ where
 
 				let authorities = serde_json::to_string(&authorities).expect(
 					"authorities is always at least an empty vector; \
-					elements are always of type string",
+					 elements are always of type string",
 				);
 
 				telemetry!(
@@ -945,7 +945,7 @@ where
 			.collect::<Vec<_>>();
 
 		let authorities = serde_json::to_string(&authorities).expect(
-			"authorities is always at least an empty vector; elements are always of type string",
+			"authorities is always at least an empty vector; elements are always of type string; qed.",
 		);
 
 		telemetry!(
@@ -1037,9 +1037,9 @@ where
 				let voters = Arc::new(VoterSet::new(new.authorities.into_iter())
 					.expect(
 						"new authorities come from pending change; \
-						pending change comes from `AuthoritySet`; \
-						`AuthoritySet` validates authorities is non-empty and weights are non-zero; \
-						qed."
+						 pending change comes from `AuthoritySet`; \
+						 `AuthoritySet` validates authorities is non-empty and weights are non-zero; \
+						 qed."
 					)
 				);
 

From e4d879c8347c6c1876c0095840d2c07a4fe791fc Mon Sep 17 00:00:00 2001
From: akashi6824 <thanhtung6824@gmail.com>
Date: Wed, 23 Jun 2021 15:04:40 +0700
Subject: [PATCH 0910/1194] Add PolkaFoundry, PolkaSmith SS58 address (#8623)

* Add PolkaFoundry, PolkaSmith SS58 address

* chang decimals to 18

* fix format

* fix format
---
 primitives/core/src/crypto.rs |  4 ++++
 ss58-registry.json            | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index 5be18422d0e1..9e3177f249a5 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -584,6 +584,10 @@ ss58_address_format!(
 		(77, "manta", "Manta Network, standard account (*25519).")
 	CalamariAccount =>
 		(78, "calamari", "Manta Canary Network, standard account (*25519).")
+	PolkaSmith =>
+		(98, "polkasmith", "PolkaSmith Canary Network, standard account (*25519).")
+	PolkaFoundry =>
+		(99, "polkafoundry", "PolkaFoundry Network, standard account (*25519).")
 	SocialAccount =>
 		(252, "social-network", "Social Network, standard account (*25519).")
 	Moonbeam =>
diff --git a/ss58-registry.json b/ss58-registry.json
index 9fec4b7be9f5..133cb6506fb0 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -505,6 +505,24 @@
 			"standardAccount": "*25519",
 			"website": "https://manta.network"
 		},
+		{
+			"prefix": 98,
+			"network": "polkasmith",
+			"displayName": "PolkaSmith Canary Network",
+			"symbols": ["PKS"],
+			"decimals": [18],
+			"standardAccount": "*25519",
+			"website": "https://polkafoundry.com"
+		},
+		{
+			"prefix": 99,
+			"network": "polkafoundry",
+			"displayName": "PolkaFoundry Network",
+			"symbols": ["PKF"],
+			"decimals": [18],
+			"standardAccount": "*25519",
+			"website": "https://polkafoundry.com"
+  	        },
 		{
 			"prefix": 252,
 			"network": "social-network",

From 96d7fe8b6d223a59a9668de28dbc40f8c43d5d83 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Wed, 23 Jun 2021 09:29:30 +0100
Subject: [PATCH 0911/1194] Remove Unused `AccountIndex` (#9149)

* remove unused `AccountIndex`

* Update lib.rs
---
 bin/node-template/runtime/src/lib.rs | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index 2ff4272747ee..b24d454877e0 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -52,10 +52,6 @@ pub type Signature = MultiSignature;
 /// to the public key of our transaction signing scheme.
 pub type AccountId = <<Signature as Verify>::Signer as IdentifyAccount>::AccountId;
 
-/// The type for looking up accounts. We don't expect more than 4 billion of them, but you
-/// never know...
-pub type AccountIndex = u32;
-
 /// Balance of an account.
 pub type Balance = u128;
 
@@ -65,9 +61,6 @@ pub type Index = u32;
 /// A hash of some data used by the chain.
 pub type Hash = sp_core::H256;
 
-/// Digest item type.
-pub type DigestItem = generic::DigestItem<Hash>;
-
 /// Opaque types. These are used by the CLI to instantiate machinery that don't need to know
 /// the specifics of the runtime. They can then be made to be agnostic over specific formats
 /// of data like extrinsics, allowing for them to continue syncing the network through upgrades

From 4d792cf9b95c7e3658ed52fb01f94ce64a4c6dbf Mon Sep 17 00:00:00 2001
From: Disconnect3d <dominik.b.czarnota@gmail.com>
Date: Wed, 23 Jun 2021 11:31:35 +0200
Subject: [PATCH 0912/1194] node-template: remove redundant types from runtime
 (#9161)

Removes `BlockId`, `SignedBlock` and `CheckedExtrinsic` as they are
unused within the runtime currently and the `BlockId` was defined twice.

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 bin/node-template/runtime/src/lib.rs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index b24d454877e0..e89d7f28be22 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -298,10 +298,6 @@ pub type Address = sp_runtime::MultiAddress<AccountId, ()>;
 pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
 /// Block type as expected by this runtime.
 pub type Block = generic::Block<Header, UncheckedExtrinsic>;
-/// A Block signed with a Justification
-pub type SignedBlock = generic::SignedBlock<Block>;
-/// BlockId type as expected by this runtime.
-pub type BlockId = generic::BlockId<Block>;
 /// The SignedExtension to the basic transaction logic.
 pub type SignedExtra = (
 	frame_system::CheckSpecVersion<Runtime>,
@@ -314,8 +310,6 @@ pub type SignedExtra = (
 );
 /// Unchecked extrinsic type as expected by this runtime.
 pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<Address, Call, Signature, SignedExtra>;
-/// Extrinsic type that has already been checked.
-pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, Call, SignedExtra>;
 /// Executive: handles dispatch to the various modules.
 pub type Executive = frame_executive::Executive<
 	Runtime,

From ecf1b87939f36acb4b4a087739c107815d455e7e Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Wed, 23 Jun 2021 12:34:54 +0200
Subject: [PATCH 0913/1194] fix typo (#9184)

---
 frame/support/procedural/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frame/support/procedural/src/lib.rs b/frame/support/procedural/src/lib.rs
index 2768608cb6f5..9ac648f5e795 100644
--- a/frame/support/procedural/src/lib.rs
+++ b/frame/support/procedural/src/lib.rs
@@ -384,7 +384,7 @@ pub fn derive_clone_no_bound(input: TokenStream) -> TokenStream {
 	clone_no_bound::derive_clone_no_bound(input)
 }
 
-/// Derive [`Debug`] but do not bound any generics. Docs are at `frame_support::DeriveNoBounds`.
+/// Derive [`Debug`] but do not bound any generics. Docs are at `frame_support::DebugNoBound`.
 #[proc_macro_derive(DebugNoBound)]
 pub fn derive_debug_no_bound(input: TokenStream) -> TokenStream {
 	debug_no_bound::derive_debug_no_bound(input)

From e6cd6b1240ce741f06b05ad1c59f5399e52e717a Mon Sep 17 00:00:00 2001
From: Julien <jeluard@users.noreply.github.com>
Date: Wed, 23 Jun 2021 12:44:11 +0200
Subject: [PATCH 0914/1194] Fixed typo in comment (#9182)

---
 frame/uniques/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frame/uniques/src/lib.rs b/frame/uniques/src/lib.rs
index b98a038ecff3..70a9e58d7bfa 100644
--- a/frame/uniques/src/lib.rs
+++ b/frame/uniques/src/lib.rs
@@ -389,7 +389,7 @@ pub mod pallet {
 		///
 		/// Weight: `O(n + m)` where:
 		/// - `n = witness.instances`
-		/// - `m = witness.instance_metdadatas`
+		/// - `m = witness.instance_metadatas`
 		/// - `a = witness.attributes`
 		#[pallet::weight(T::WeightInfo::destroy(
 			witness.instances,

From 7dc25343c650a4f7f15ad4e948c9094635aa6b88 Mon Sep 17 00:00:00 2001
From: Squirrel <gilescope@gmail.com>
Date: Wed, 23 Jun 2021 13:33:48 +0100
Subject: [PATCH 0915/1194] Less slices (#9176)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Less slices

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 client/executor/common/src/sandbox.rs         |  8 +++----
 client/executor/src/wasm_runtime.rs           | 20 ++++++++---------
 client/executor/wasmi/src/lib.rs              |  4 ++--
 primitives/io/src/lib.rs                      |  5 +----
 primitives/runtime/src/generic/mod.rs         |  2 +-
 primitives/state-machine/src/backend.rs       |  2 +-
 .../state-machine/src/changes_trie/build.rs   | 22 +++++++++----------
 .../state-machine/src/changes_trie/prune.rs   |  6 ++---
 primitives/state-machine/src/ext.rs           |  4 ++--
 primitives/trie/src/lib.rs                    |  8 +++----
 primitives/trie/src/node_codec.rs             |  6 ++---
 11 files changed, 41 insertions(+), 46 deletions(-)

diff --git a/client/executor/common/src/sandbox.rs b/client/executor/common/src/sandbox.rs
index 8ed294bb8398..b7838aab7f34 100644
--- a/client/executor/common/src/sandbox.rs
+++ b/client/executor/common/src/sandbox.rs
@@ -187,10 +187,10 @@ fn trap(msg: &'static str) -> Trap {
 	TrapKind::Host(Box::new(Error::Other(msg.into()))).into()
 }
 
-fn deserialize_result(serialized_result: &[u8]) -> std::result::Result<Option<RuntimeValue>, Trap> {
+fn deserialize_result(mut serialized_result: &[u8]) -> std::result::Result<Option<RuntimeValue>, Trap> {
 	use self::sandbox_primitives::HostError;
 	use sp_wasm_interface::ReturnValue;
-	let result_val = std::result::Result::<ReturnValue, HostError>::decode(&mut &serialized_result[..])
+	let result_val = std::result::Result::<ReturnValue, HostError>::decode(&mut serialized_result)
 		.map_err(|_| trap("Decoding Result<ReturnValue, HostError> failed!"))?;
 
 	match result_val {
@@ -379,10 +379,10 @@ pub enum InstantiationError {
 }
 
 fn decode_environment_definition(
-	raw_env_def: &[u8],
+	mut raw_env_def: &[u8],
 	memories: &[Option<MemoryRef>],
 ) -> std::result::Result<(Imports, GuestToSupervisorFunctionMapping), InstantiationError> {
-	let env_def = sandbox_primitives::EnvironmentDefinition::decode(&mut &raw_env_def[..])
+	let env_def = sandbox_primitives::EnvironmentDefinition::decode(&mut raw_env_def)
 		.map_err(|_| InstantiationError::EnvironmentDefinitionCorrupted)?;
 
 	let mut func_map = HashMap::new();
diff --git a/client/executor/src/wasm_runtime.rs b/client/executor/src/wasm_runtime.rs
index d721f36e8a99..d01132da180a 100644
--- a/client/executor/src/wasm_runtime.rs
+++ b/client/executor/src/wasm_runtime.rs
@@ -177,7 +177,7 @@ impl RuntimeCache {
 
 	/// Prepares a WASM module instance and executes given function for it.
 	///
-	/// This uses internal cache to find avaiable instance or create a new one.
+	/// This uses internal cache to find available instance or create a new one.
 	/// # Parameters
 	///
 	/// `code` - Provides external code or tells the executor to fetch it from storage.
@@ -196,7 +196,7 @@ impl RuntimeCache {
 	///
 	/// `f` - Function to execute.
 	///
-	/// # Returns result of `f` wrapped in an additonal result.
+	/// # Returns result of `f` wrapped in an additional result.
 	/// In case of failure one of two errors can be returned:
 	///
 	/// `Err::InvalidCode` is returned for runtime code issues.
@@ -337,7 +337,7 @@ pub fn create_wasm_runtime_with_code(
 	}
 }
 
-fn decode_version(version: &[u8]) -> Result<RuntimeVersion, WasmError> {
+fn decode_version(mut version: &[u8]) -> Result<RuntimeVersion, WasmError> {
 	let v: RuntimeVersion = sp_api::OldRuntimeVersion::decode(&mut &version[..])
 		.map_err(|_|
 				 WasmError::Instantiation(
@@ -347,7 +347,7 @@ fn decode_version(version: &[u8]) -> Result<RuntimeVersion, WasmError> {
 
 	let core_api_id = sp_core::hashing::blake2_64(b"Core");
 	if v.has_api_with(&core_api_id, |v| v >= 3) {
-		sp_api::RuntimeVersion::decode(&mut &version[..])
+		sp_api::RuntimeVersion::decode(&mut version)
 			.map_err(|_|
 				WasmError::Instantiation("failed to decode \"Core_version\" result".into())
 			)
@@ -367,9 +367,7 @@ fn decode_runtime_apis(apis: &[u8]) -> Result<Vec<([u8; 8], u32)>, WasmError> {
 			<[u8; RUNTIME_API_INFO_SIZE]>::try_from(chunk)
 				.map(sp_api::deserialize_runtime_api_info)
 				.map_err(|_| {
-					WasmError::Other(format!(
-						"a clipped runtime api info declaration"
-					))
+					WasmError::Other("a clipped runtime api info declaration".to_owned())
 				})
 		})
 		.collect::<Result<Vec<_>, WasmError>>()
@@ -383,15 +381,15 @@ fn decode_runtime_apis(apis: &[u8]) -> Result<Vec<([u8; 8], u32)>, WasmError> {
 pub fn read_embedded_version(
 	blob: &RuntimeBlob,
 ) -> Result<Option<RuntimeVersion>, WasmError> {
-	if let Some(version_section) = blob.custom_section_contents("runtime_version") {
+	if let Some(mut version_section) = blob.custom_section_contents("runtime_version") {
 		// We do not use `decode_version` here because the runtime_version section is not supposed
 		// to ever contain a legacy version. Apart from that `decode_version` relies on presence
 		// of a special API in the `apis` field to treat the input as a non-legacy version. However
 		// the structure found in the `runtime_version` always contain an empty `apis` field. Therefore
-		// the version read will be mistakingly treated as an legacy one.
-		let mut decoded_version = sp_api::RuntimeVersion::decode(&mut &version_section[..])
+		// the version read will be mistakenly treated as an legacy one.
+		let mut decoded_version = sp_api::RuntimeVersion::decode(&mut version_section)
 			.map_err(|_|
-				WasmError::Instantiation("failed to decode verison section".into())
+				WasmError::Instantiation("failed to decode version section".into())
 			)?;
 
 		// Don't stop on this and check if there is a special section that encodes all runtime APIs.
diff --git a/client/executor/wasmi/src/lib.rs b/client/executor/wasmi/src/lib.rs
index 953c5e5178a6..d4c9f4dc2e80 100644
--- a/client/executor/wasmi/src/lib.rs
+++ b/client/executor/wasmi/src/lib.rs
@@ -185,7 +185,7 @@ impl<'a> Sandbox for FunctionExecutor<'a> {
 		&mut self,
 		instance_id: u32,
 		export_name: &str,
-		args: &[u8],
+		mut args: &[u8],
 		return_val: Pointer<u8>,
 		return_val_len: WordSize,
 		state: u32,
@@ -193,7 +193,7 @@ impl<'a> Sandbox for FunctionExecutor<'a> {
 		trace!(target: "sp-sandbox", "invoke, instance_idx={}", instance_id);
 
 		// Deserialize arguments and convert them into wasmi types.
-		let args = Vec::<sp_wasm_interface::Value>::decode(&mut &args[..])
+		let args = Vec::<sp_wasm_interface::Value>::decode(&mut args)
 			.map_err(|_| "Can't decode serialized arguments for the invocation")?
 			.into_iter()
 			.map(Into::into)
diff --git a/primitives/io/src/lib.rs b/primitives/io/src/lib.rs
index 12cbf09e8650..6fb25df3d02a 100644
--- a/primitives/io/src/lib.rs
+++ b/primitives/io/src/lib.rs
@@ -29,9 +29,6 @@
 
 use sp_std::vec::Vec;
 
-#[cfg(feature = "std")]
-use sp_std::ops::Deref;
-
 #[cfg(feature = "std")]
 use tracing;
 
@@ -990,7 +987,7 @@ pub trait Offchain {
 			.local_storage_compare_and_set(
 				kind,
 				key,
-				old_value.as_ref().map(|v| v.deref()),
+				old_value.as_deref(),
 				new_value,
 			)
 	}
diff --git a/primitives/runtime/src/generic/mod.rs b/primitives/runtime/src/generic/mod.rs
index f5087eccab08..c4b28a06c901 100644
--- a/primitives/runtime/src/generic/mod.rs
+++ b/primitives/runtime/src/generic/mod.rs
@@ -44,7 +44,7 @@ fn encode_with_vec_prefix<T: Encode, F: Fn(&mut Vec<u8>)>(encoder: F) -> Vec<u8>
 	let size = ::sp_std::mem::size_of::<T>();
 	let reserve = match size {
 		0..=0b00111111 => 1,
-		0..=0b00111111_11111111 => 2,
+		0b01000000..=0b00111111_11111111 => 2,
 		_ => 4,
 	};
 	let mut v = Vec::with_capacity(reserve + size);
diff --git a/primitives/state-machine/src/backend.rs b/primitives/state-machine/src/backend.rs
index 9b9953713036..5b1f901a3ea9 100644
--- a/primitives/state-machine/src/backend.rs
+++ b/primitives/state-machine/src/backend.rs
@@ -207,7 +207,7 @@ pub trait Backend<H: Hasher>: sp_std::fmt::Debug {
 			}
 		}
 		let (root, parent_txs) = self.storage_root(delta
-			.map(|(k, v)| (&k[..], v.as_ref().map(|v| &v[..])))
+			.map(|(k, v)| (k, v.as_ref().map(|v| &v[..])))
 			.chain(
 				child_roots
 					.iter()
diff --git a/primitives/state-machine/src/changes_trie/build.rs b/primitives/state-machine/src/changes_trie/build.rs
index 1e0fc5c4d6c8..38d1ab714e7f 100644
--- a/primitives/state-machine/src/changes_trie/build.rs
+++ b/primitives/state-machine/src/changes_trie/build.rs
@@ -279,22 +279,22 @@ fn prepare_digest_input<'a, H, Number>(
 					trie_root,
 				);
 
-				trie_storage.for_key_values_with_prefix(&child_prefix, |key, value|
-					if let Ok(InputKey::ChildIndex::<Number>(trie_key)) = Decode::decode(&mut &key[..]) {
-						if let Ok(value) = <Vec<u8>>::decode(&mut &value[..]) {
+				trie_storage.for_key_values_with_prefix(&child_prefix, |mut key, mut value|
+					if let Ok(InputKey::ChildIndex::<Number>(trie_key)) = Decode::decode(&mut key) {
+						if let Ok(value) = <Vec<u8>>::decode(&mut value) {
 							let mut trie_root = <H as Hasher>::Out::default();
 							trie_root.as_mut().copy_from_slice(&value[..]);
 							children_roots.insert(trie_key.storage_key, trie_root);
 						}
 					});
 
-				trie_storage.for_keys_with_prefix(&extrinsic_prefix, |key|
-					if let Ok(InputKey::ExtrinsicIndex::<Number>(trie_key)) = Decode::decode(&mut &key[..]) {
+				trie_storage.for_keys_with_prefix(&extrinsic_prefix, |mut key|
+					if let Ok(InputKey::ExtrinsicIndex::<Number>(trie_key)) = Decode::decode(&mut key) {
 						insert_to_map(&mut map, trie_key.key);
 					});
 
-				trie_storage.for_keys_with_prefix(&digest_prefix, |key|
-					if let Ok(InputKey::DigestIndex::<Number>(trie_key)) = Decode::decode(&mut &key[..]) {
+				trie_storage.for_keys_with_prefix(&digest_prefix, |mut key|
+					if let Ok(InputKey::DigestIndex::<Number>(trie_key)) = Decode::decode(&mut key) {
 						insert_to_map(&mut map, trie_key.key);
 					});
 			}
@@ -310,13 +310,13 @@ fn prepare_digest_input<'a, H, Number>(
 					crate::changes_trie::TrieBackendStorageAdapter(storage),
 					trie_root,
 				);
-				trie_storage.for_keys_with_prefix(&extrinsic_prefix, |key|
-					if let Ok(InputKey::ExtrinsicIndex::<Number>(trie_key)) = Decode::decode(&mut &key[..]) {
+				trie_storage.for_keys_with_prefix(&extrinsic_prefix, |mut key|
+					if let Ok(InputKey::ExtrinsicIndex::<Number>(trie_key)) = Decode::decode(&mut key) {
 						insert_to_map(&mut map, trie_key.key);
 					});
 
-				trie_storage.for_keys_with_prefix(&digest_prefix, |key|
-					if let Ok(InputKey::DigestIndex::<Number>(trie_key)) = Decode::decode(&mut &key[..]) {
+				trie_storage.for_keys_with_prefix(&digest_prefix, |mut key|
+					if let Ok(InputKey::DigestIndex::<Number>(trie_key)) = Decode::decode(&mut key) {
 						insert_to_map(&mut map, trie_key.key);
 					});
 			}
diff --git a/primitives/state-machine/src/changes_trie/prune.rs b/primitives/state-machine/src/changes_trie/prune.rs
index a741b814a5c7..754e3893f966 100644
--- a/primitives/state-machine/src/changes_trie/prune.rs
+++ b/primitives/state-machine/src/changes_trie/prune.rs
@@ -66,9 +66,9 @@ pub fn prune<H: Hasher, Number: BlockNumber, F: FnMut(H::Out)>(
 			);
 			let child_prefix = ChildIndex::key_neutral_prefix(block.clone());
 			let mut children_roots = Vec::new();
-			trie_storage.for_key_values_with_prefix(&child_prefix, |key, value| {
-				if let Ok(InputKey::ChildIndex::<Number>(_trie_key)) = Decode::decode(&mut &key[..]) {
-					if let Ok(value) = <Vec<u8>>::decode(&mut &value[..]) {
+			trie_storage.for_key_values_with_prefix(&child_prefix, |mut key, mut value| {
+				if let Ok(InputKey::ChildIndex::<Number>(_trie_key)) = Decode::decode(&mut key) {
+					if let Ok(value) = <Vec<u8>>::decode(&mut value) {
 						let mut trie_root = <H as Hasher>::Out::default();
 						trie_root.as_mut().copy_from_slice(&value[..]);
 						children_roots.push(trie_root);
diff --git a/primitives/state-machine/src/ext.rs b/primitives/state-machine/src/ext.rs
index e66664647d9d..d1d636cb6561 100644
--- a/primitives/state-machine/src/ext.rs
+++ b/primitives/state-machine/src/ext.rs
@@ -637,7 +637,7 @@ where
 	}
 
 	#[cfg(feature = "std")]
-	fn storage_changes_root(&mut self, parent_hash: &[u8]) -> Result<Option<Vec<u8>>, ()> {
+	fn storage_changes_root(&mut self, mut parent_hash: &[u8]) -> Result<Option<Vec<u8>>, ()> {
 		let _guard = guard();
 		if let Some(ref root) = self.storage_transaction_cache.changes_trie_transaction_storage_root {
 			trace!(
@@ -653,7 +653,7 @@ where
 			let root = self.overlay.changes_trie_root(
 				self.backend,
 				self.changes_trie_state.as_ref(),
-				Decode::decode(&mut &parent_hash[..]).map_err(|e|
+				Decode::decode(&mut parent_hash).map_err(|e|
 					trace!(
 						target: "state",
 						"Failed to decode changes root parent hash: {}",
diff --git a/primitives/trie/src/lib.rs b/primitives/trie/src/lib.rs
index f815d2af44ad..4cfe3623812c 100644
--- a/primitives/trie/src/lib.rs
+++ b/primitives/trie/src/lib.rs
@@ -211,7 +211,7 @@ pub fn read_trie_value<L: TrieConfiguration, DB: hash_db::HashDBRef<L::Hash, tri
 	root: &TrieHash<L>,
 	key: &[u8]
 ) -> Result<Option<Vec<u8>>, Box<TrieError<L>>> {
-	Ok(TrieDB::<L>::new(&*db, root)?.get(key).map(|x| x.map(|val| val.to_vec()))?)
+	TrieDB::<L>::new(&*db, root)?.get(key).map(|x| x.map(|val| val.to_vec()))
 }
 
 /// Read a value from the trie with given Query.
@@ -225,7 +225,7 @@ pub fn read_trie_value_with<
 	key: &[u8],
 	query: Q
 ) -> Result<Option<Vec<u8>>, Box<TrieError<L>>> {
-	Ok(TrieDB::<L>::new(&*db, root)?.get_with(key, query).map(|x| x.map(|val| val.to_vec()))?)
+	TrieDB::<L>::new(&*db, root)?.get_with(key, query).map(|x| x.map(|val| val.to_vec()))
 }
 
 /// Determine the empty trie root.
@@ -317,7 +317,7 @@ pub fn read_child_trie_value<L: TrieConfiguration, DB>(
 	root.as_mut().copy_from_slice(root_slice);
 
 	let db = KeySpacedDB::new(&*db, keyspace);
-	Ok(TrieDB::<L>::new(&db, &root)?.get(key).map(|x| x.map(|val| val.to_vec()))?)
+	TrieDB::<L>::new(&db, &root)?.get(key).map(|x| x.map(|val| val.to_vec()))
 }
 
 /// Read a value from the child trie with given query.
@@ -336,7 +336,7 @@ pub fn read_child_trie_value_with<L: TrieConfiguration, Q: Query<L::Hash, Item=D
 	root.as_mut().copy_from_slice(root_slice);
 
 	let db = KeySpacedDB::new(&*db, keyspace);
-	Ok(TrieDB::<L>::new(&db, &root)?.get_with(key, query).map(|x| x.map(|val| val.to_vec()))?)
+	TrieDB::<L>::new(&db, &root)?.get_with(key, query).map(|x| x.map(|val| val.to_vec()))
 }
 
 /// `HashDB` implementation that append a encoded prefix (unique id bytes) in addition to the
diff --git a/primitives/trie/src/node_codec.rs b/primitives/trie/src/node_codec.rs
index 0c923ff024c5..296f03972c79 100644
--- a/primitives/trie/src/node_codec.rs
+++ b/primitives/trie/src/node_codec.rs
@@ -259,7 +259,7 @@ fn partial_encode(partial: Partial, node_kind: NodeKind) -> Vec<u8> {
 	if number_nibble_encoded > 0 {
 		output.push(nibble_ops::pad_right((partial.0).1));
 	}
-	output.extend_from_slice(&partial.1[..]);
+	output.extend_from_slice(partial.1);
 	output
 }
 
@@ -272,8 +272,8 @@ const BITMAP_LENGTH: usize = 2;
 pub(crate) struct Bitmap(u16);
 
 impl Bitmap {
-	pub fn decode(data: &[u8]) -> Result<Self, Error> {
-		Ok(Bitmap(u16::decode(&mut &data[..])?))
+	pub fn decode(mut data: &[u8]) -> Result<Self, Error> {
+		Ok(Bitmap(u16::decode(&mut data)?))
 	}
 
 	pub fn value_at(&self, i: usize) -> bool {

From 01ff4cef6626448998a3bcbc5be401dc15a394cf Mon Sep 17 00:00:00 2001
From: Squirrel <gilescope@gmail.com>
Date: Wed, 23 Jun 2021 13:41:46 +0100
Subject: [PATCH 0916/1194] Result<Option<>> rather than Option<Option<>>
 (#9119)

* Clearer API to code against.
---
 .../src/unsigned.rs                           | 40 +++++-----
 frame/example-offchain-worker/src/lib.rs      | 16 ++--
 frame/im-online/src/lib.rs                    | 12 ++-
 frame/session/src/historical/offchain.rs      | 22 ++---
 primitives/runtime/src/offchain/storage.rs    | 80 +++++++++++++------
 .../runtime/src/offchain/storage_lock.rs      | 35 ++++----
 primitives/trie/Cargo.toml                    |  2 +-
 7 files changed, 121 insertions(+), 86 deletions(-)

diff --git a/frame/election-provider-multi-phase/src/unsigned.rs b/frame/election-provider-multi-phase/src/unsigned.rs
index 78726c542078..543883fc035c 100644
--- a/frame/election-provider-multi-phase/src/unsigned.rs
+++ b/frame/election-provider-multi-phase/src/unsigned.rs
@@ -29,7 +29,10 @@ use sp_npos_elections::{
 	CompactSolution, ElectionResult, assignment_ratio_to_staked_normalized,
 	assignment_staked_to_ratio_normalized, is_score_better, seq_phragmen,
 };
-use sp_runtime::{offchain::storage::StorageValueRef, traits::TrailingZeroInput, SaturatedConversion};
+use sp_runtime::{
+	offchain::storage::{MutateStorageError, StorageValueRef},
+	traits::TrailingZeroInput, SaturatedConversion
+};
 use sp_std::{cmp::Ordering, convert::TryFrom, vec::Vec};
 
 /// Storage key used to store the last block number at which offchain worker ran.
@@ -98,9 +101,9 @@ fn save_solution<T: Config>(call: &Call<T>) -> Result<(), MinerError> {
 	log!(debug, "saving a call to the offchain storage.");
 	let storage = StorageValueRef::persistent(&OFFCHAIN_CACHED_CALL);
 	match storage.mutate::<_, (), _>(|_| Ok(call.clone())) {
-		Ok(Ok(_)) => Ok(()),
-		Ok(Err(_)) => Err(MinerError::FailedToStoreSolution),
-		Err(_) => {
+		Ok(_) => Ok(()),
+		Err(MutateStorageError::ConcurrentModification(_)) => Err(MinerError::FailedToStoreSolution),
+		Err(MutateStorageError::ValueFunctionFailed(_)) => {
 			// this branch should be unreachable according to the definition of
 			// `StorageValueRef::mutate`: that function should only ever `Err` if the closure we
 			// pass it returns an error. however, for safety in case the definition changes, we do
@@ -114,6 +117,7 @@ fn save_solution<T: Config>(call: &Call<T>) -> Result<(), MinerError> {
 fn restore_solution<T: Config>() -> Result<Call<T>, MinerError> {
 	StorageValueRef::persistent(&OFFCHAIN_CACHED_CALL)
 		.get()
+		.ok()
 		.flatten()
 		.ok_or(MinerError::NoStoredSolution)
 }
@@ -135,12 +139,9 @@ fn clear_offchain_repeat_frequency() {
 }
 
 /// `true` when OCW storage contains a solution
-///
-/// More precise than `restore_solution::<T>().is_ok()`; that invocation will return `false`
-/// if a solution exists but cannot be decoded, whereas this just checks whether an item is present.
 #[cfg(test)]
 fn ocw_solution_exists<T: Config>() -> bool {
-	StorageValueRef::persistent(&OFFCHAIN_CACHED_CALL).get::<Call<T>>().is_some()
+	matches!(StorageValueRef::persistent(&OFFCHAIN_CACHED_CALL).get::<Call<T>>(), Ok(Some(_)))
 }
 
 impl<T: Config> Pallet<T> {
@@ -584,13 +585,13 @@ impl<T: Config> Pallet<T> {
 		let last_block = StorageValueRef::persistent(&OFFCHAIN_LAST_BLOCK);
 
 		let mutate_stat = last_block.mutate::<_, &'static str, _>(
-			|maybe_head: Option<Option<T::BlockNumber>>| {
+			|maybe_head: Result<Option<T::BlockNumber>, _>| {
 				match maybe_head {
-					Some(Some(head)) if now < head => Err("fork."),
-					Some(Some(head)) if now >= head && now <= head + threshold => {
+					Ok(Some(head)) if now < head => Err("fork."),
+					Ok(Some(head)) if now >= head && now <= head + threshold => {
 						Err("recently executed.")
 					}
-					Some(Some(head)) if now > head + threshold => {
+					Ok(Some(head)) if now > head + threshold => {
 						// we can run again now. Write the new head.
 						Ok(now)
 					}
@@ -604,11 +605,12 @@ impl<T: Config> Pallet<T> {
 
 		match mutate_stat {
 			// all good
-			Ok(Ok(_)) => Ok(()),
+			Ok(_) => Ok(()),
 			// failed to write.
-			Ok(Err(_)) => Err(MinerError::Lock("failed to write to offchain db.")),
+			Err(MutateStorageError::ConcurrentModification(_)) =>
+				Err(MinerError::Lock("failed to write to offchain db (concurrent modification).")),
 			// fork etc.
-			Err(why) => Err(MinerError::Lock(why)),
+			Err(MutateStorageError::ValueFunctionFailed(why)) => Err(MinerError::Lock(why)),
 		}
 	}
 
@@ -1117,15 +1119,15 @@ mod tests {
 			assert!(MultiPhase::current_phase().is_unsigned());
 
 			// initially, the lock is not set.
-			assert!(guard.get::<bool>().is_none());
+			assert!(guard.get::<bool>().unwrap().is_none());
 
 			// a successful a-z execution.
 			MultiPhase::offchain_worker(25);
 			assert_eq!(pool.read().transactions.len(), 1);
 
 			// afterwards, the lock is not set either..
-			assert!(guard.get::<bool>().is_none());
-			assert_eq!(last_block.get::<BlockNumber>().unwrap().unwrap(), 25);
+			assert!(guard.get::<bool>().unwrap().is_none());
+			assert_eq!(last_block.get::<BlockNumber>().unwrap(), Some(25));
 		});
 	}
 
@@ -1280,7 +1282,7 @@ mod tests {
 			// this ensures that when the resubmit window rolls around, we're ready to regenerate
 			// from scratch if necessary
 			let mut call_cache = StorageValueRef::persistent(&OFFCHAIN_CACHED_CALL);
-			assert!(matches!(call_cache.get::<Call<Runtime>>(), Some(Some(_call))));
+			assert!(matches!(call_cache.get::<Call<Runtime>>(), Ok(Some(_call))));
 			call_cache.clear();
 
 			// attempts to resubmit the tx after the threshold has expired
diff --git a/frame/example-offchain-worker/src/lib.rs b/frame/example-offchain-worker/src/lib.rs
index 1ec2591f5ec6..b7a766ad847b 100644
--- a/frame/example-offchain-worker/src/lib.rs
+++ b/frame/example-offchain-worker/src/lib.rs
@@ -53,7 +53,7 @@ use frame_support::traits::Get;
 use sp_core::crypto::KeyTypeId;
 use sp_runtime::{
 	RuntimeDebug,
-	offchain::{http, Duration, storage::StorageValueRef},
+	offchain::{http, Duration, storage::{MutateStorageError, StorageRetrievalError, StorageValueRef}},
 	traits::Zero,
 	transaction_validity::{InvalidTransaction, ValidTransaction, TransactionValidity},
 };
@@ -366,15 +366,11 @@ impl<T: Config> Pallet<T> {
 		// low-level method of local storage API, which means that only one worker
 		// will be able to "acquire a lock" and send a transaction if multiple workers
 		// happen to be executed concurrently.
-		let res = val.mutate(|last_send: Option<Option<T::BlockNumber>>| {
-			// We match on the value decoded from the storage. The first `Option`
-			// indicates if the value was present in the storage at all,
-			// the second (inner) `Option` indicates if the value was succesfuly
-			// decoded to expected type (`T::BlockNumber` in our case).
+		let res = val.mutate(|last_send: Result<Option<T::BlockNumber>, StorageRetrievalError>| {
 			match last_send {
 				// If we already have a value in storage and the block number is recent enough
 				// we avoid sending another transaction at this time.
-				Some(Some(block)) if block_number < block + T::GracePeriod::get() => {
+				Ok(Some(block)) if block_number < block + T::GracePeriod::get() => {
 					Err(RECENTLY_SENT)
 				},
 				// In every other case we attempt to acquire the lock and send a transaction.
@@ -390,7 +386,7 @@ impl<T: Config> Pallet<T> {
 		// written to in the meantime.
 		match res {
 			// The value has been set correctly, which means we can safely send a transaction now.
-			Ok(Ok(block_number)) => {
+			Ok(block_number) => {
 				// Depending if the block is even or odd we will send a `Signed` or `Unsigned`
 				// transaction.
 				// Note that this logic doesn't really guarantee that the transactions will be sent
@@ -406,13 +402,13 @@ impl<T: Config> Pallet<T> {
 				else { TransactionType::Raw }
 			},
 			// We are in the grace period, we should not send a transaction this time.
-			Err(RECENTLY_SENT) => TransactionType::None,
+			Err(MutateStorageError::ValueFunctionFailed(RECENTLY_SENT)) => TransactionType::None,
 			// We wanted to send a transaction, but failed to write the block number (acquire a
 			// lock). This indicates that another offchain worker that was running concurrently
 			// most likely executed the same logic and succeeded at writing to storage.
 			// Thus we don't really want to send the transaction, knowing that the other run
 			// already did.
-			Ok(Err(_)) => TransactionType::None,
+			Err(MutateStorageError::ConcurrentModification(_)) => TransactionType::None,
 		}
 	}
 
diff --git a/frame/im-online/src/lib.rs b/frame/im-online/src/lib.rs
index 318e3d2de3ad..3df5df7bb4d7 100644
--- a/frame/im-online/src/lib.rs
+++ b/frame/im-online/src/lib.rs
@@ -80,7 +80,7 @@ use sp_core::offchain::OpaqueNetworkState;
 use sp_std::prelude::*;
 use sp_std::convert::TryInto;
 use sp_runtime::{
-	offchain::storage::StorageValueRef,
+	offchain::storage::{MutateStorageError, StorageRetrievalError, StorageValueRef},
 	traits::{AtLeast32BitUnsigned, Convert, Saturating, TrailingZeroInput},
 	Perbill, Permill, PerThing, RuntimeDebug, SaturatedConversion,
 };
@@ -719,14 +719,15 @@ impl<T: Config> Pallet<T> {
 			key
 		};
 		let storage = StorageValueRef::persistent(&key);
-		let res = storage.mutate(|status: Option<Option<HeartbeatStatus<T::BlockNumber>>>| {
+		let res = storage.mutate(
+			|status: Result<Option<HeartbeatStatus<T::BlockNumber>>, StorageRetrievalError>| {
 			// Check if there is already a lock for that particular block.
 			// This means that the heartbeat has already been sent, and we are just waiting
 			// for it to be included. However if it doesn't get included for INCLUDE_THRESHOLD
 			// we will re-send it.
 			match status {
 				// we are still waiting for inclusion.
-				Some(Some(status)) if status.is_recent(session_index, now) => {
+				Ok(Some(status)) if status.is_recent(session_index, now) => {
 					Err(OffchainErr::WaitingForInclusion(status.sent_at))
 				},
 				// attempt to set new status
@@ -735,7 +736,10 @@ impl<T: Config> Pallet<T> {
 					sent_at: now,
 				}),
 			}
-		})?;
+		});
+		if let Err(MutateStorageError::ValueFunctionFailed(err)) = res {
+			return Err(err);
+		}
 
 		let mut new_status = res.map_err(|_| OffchainErr::FailedToAcquireLock)?;
 
diff --git a/frame/session/src/historical/offchain.rs b/frame/session/src/historical/offchain.rs
index f675d878c1e2..68cc78029f12 100644
--- a/frame/session/src/historical/offchain.rs
+++ b/frame/session/src/historical/offchain.rs
@@ -25,7 +25,10 @@
 //! This is used in conjunction with [`ProvingTrie`](super::ProvingTrie) and
 //! the off-chain indexing API.
 
-use sp_runtime::{offchain::storage::StorageValueRef, KeyTypeId};
+use sp_runtime::{
+	offchain::storage::{MutateStorageError, StorageRetrievalError, StorageValueRef},
+	KeyTypeId
+};
 use sp_session::MembershipProof;
 
 use super::super::{Pallet as SessionModule, SessionIndex};
@@ -49,6 +52,7 @@ impl<T: Config> ValidatorSet<T> {
 		let derived_key = shared::derive_key(shared::PREFIX, session_index);
 		StorageValueRef::persistent(derived_key.as_ref())
 			.get::<Vec<(T::ValidatorId, T::FullIdentification)>>()
+			.ok()
 			.flatten()
 			.map(|validator_set| Self { validator_set })
 	}
@@ -100,19 +104,19 @@ pub fn prove_session_membership<T: Config, D: AsRef<[u8]>>(
 pub fn prune_older_than<T: Config>(first_to_keep: SessionIndex) {
 	let derived_key = shared::LAST_PRUNE.to_vec();
 	let entry = StorageValueRef::persistent(derived_key.as_ref());
-	match entry.mutate(|current: Option<Option<SessionIndex>>| -> Result<_, ()> {
+	match entry.mutate(|current: Result<Option<SessionIndex>, StorageRetrievalError>| -> Result<_, ()> {
 		match current {
-			Some(Some(current)) if current < first_to_keep => Ok(first_to_keep),
+			Ok(Some(current)) if current < first_to_keep => Ok(first_to_keep),
 			// do not move the cursor, if the new one would be behind ours
-			Some(Some(current)) => Ok(current),
-			None => Ok(first_to_keep),
+			Ok(Some(current)) => Ok(current),
+			Ok(None) => Ok(first_to_keep),
 			// if the storage contains undecodable data, overwrite with current anyways
 			// which might leak some entries being never purged, but that is acceptable
 			// in this context
-			Some(None) => Ok(first_to_keep),
+			Err(_) => Ok(first_to_keep),
 		}
 	}) {
-		Ok(Ok(new_value)) => {
+		Ok(new_value) => {
 			// on a re-org this is not necessarily true, with the above they might be equal
 			if new_value < first_to_keep {
 				for session_index in new_value..first_to_keep {
@@ -121,8 +125,8 @@ pub fn prune_older_than<T: Config>(first_to_keep: SessionIndex) {
 				}
 			}
 		}
-		Ok(Err(_)) => {} // failed to store the value calculated with the given closure
-		Err(_) => {}     // failed to calculate the value to store with the given closure
+		Err(MutateStorageError::ConcurrentModification(_)) => {}
+		Err(MutateStorageError::ValueFunctionFailed(_)) => {}
 	}
 }
 
diff --git a/primitives/runtime/src/offchain/storage.rs b/primitives/runtime/src/offchain/storage.rs
index 794ae4255a33..c6ed10c5be26 100644
--- a/primitives/runtime/src/offchain/storage.rs
+++ b/primitives/runtime/src/offchain/storage.rs
@@ -28,6 +28,25 @@ pub struct StorageValueRef<'a> {
 	kind: StorageKind,
 }
 
+/// Reason for not being able to provide the stored value
+#[derive(Debug, PartialEq, Eq)]
+pub enum StorageRetrievalError {
+	/// Value found but undecodable
+	Undecodable,
+}
+
+/// Possible errors when mutating a storage value.
+#[derive(Debug, PartialEq, Eq)]
+pub enum MutateStorageError<T, E> {
+	/// The underlying db failed to update due to a concurrent modification.
+	/// Contains the new value that was not stored.
+	ConcurrentModification(T),
+	/// The function given to us to create the value to be stored failed.
+	/// May be used to signal that having looked at the existing value,
+	/// they don't want to mutate it.
+	ValueFunctionFailed(E)
+}
+
 impl<'a> StorageValueRef<'a> {
 	/// Create a new reference to a value in the persistent local storage.
 	pub fn persistent(key: &'a [u8]) -> Self {
@@ -58,30 +77,40 @@ impl<'a> StorageValueRef<'a> {
 	/// Retrieve & decode the value from storage.
 	///
 	/// Note that if you want to do some checks based on the value
-	/// and write changes after that you should rather be using `mutate`.
+	/// and write changes after that, you should rather be using `mutate`.
 	///
-	/// The function returns `None` if the value was not found in storage,
-	/// otherwise a decoding of the value to requested type.
-	pub fn get<T: codec::Decode>(&self) -> Option<Option<T>> {
+	/// Returns the value if stored.
+	/// Returns an error if the value could not be decoded.
+	pub fn get<T: codec::Decode>(&self) -> Result<Option<T>, StorageRetrievalError> {
 		sp_io::offchain::local_storage_get(self.kind, self.key)
-			.map(|val| T::decode(&mut &*val).ok())
+			.map(|val| T::decode(&mut &*val)
+			.map_err(|_| StorageRetrievalError::Undecodable))
+			.transpose()
 	}
 
-	/// Retrieve & decode the value and set it to a new one atomically.
+	/// Retrieve & decode the current value and set it to a new value atomically.
+	///
+	/// Function `mutate_val` takes as input the current value and should
+	/// return a new value that is attempted to be written to storage.
 	///
-	/// Function `f` should return a new value that we should attempt to write to storage.
 	/// This function returns:
-	/// 1. `Ok(Ok(T))` in case the value has been successfully set.
-	/// 2. `Ok(Err(T))` in case the value was calculated by the passed closure `f`,
-	///    but it could not be stored.
-	/// 3. `Err(_)` in case `f` returns an error.
-	pub fn mutate<T, E, F>(&self, f: F) -> Result<Result<T, T>, E> where
+	/// 1. `Ok(T)` in case the value has been successfully set.
+	/// 2. `Err(MutateStorageError::ConcurrentModification(T))` in case the value was calculated
+	/// by the passed closure `mutate_val`, but it could not be stored.
+	/// 3. `Err(MutateStorageError::ValueFunctionFailed(_))` in case `mutate_val` returns an error.
+	pub fn mutate<T, E, F>(&self, mutate_val: F) -> Result<T, MutateStorageError<T,E>> where
 		T: codec::Codec,
-		F: FnOnce(Option<Option<T>>) -> Result<T, E>
+		F: FnOnce(Result<Option<T>, StorageRetrievalError>) -> Result<T, E>
 	{
 		let value = sp_io::offchain::local_storage_get(self.kind, self.key);
-		let decoded = value.as_deref().map(|mut v| T::decode(&mut v).ok());
-		let val = f(decoded)?;
+		let decoded = value.as_deref()
+			.map(|mut bytes| {
+				T::decode(&mut bytes)
+					.map_err(|_| StorageRetrievalError::Undecodable)
+			}).transpose();
+
+		let val = mutate_val(decoded).map_err(|err| MutateStorageError::ValueFunctionFailed(err))?;
+
 		let set = val.using_encoded(|new_val| {
 			sp_io::offchain::local_storage_compare_and_set(
 				self.kind,
@@ -90,11 +119,10 @@ impl<'a> StorageValueRef<'a> {
 				new_val,
 			)
 		});
-
 		if set {
-			Ok(Ok(val))
+			Ok(val)
 		} else {
-			Ok(Err(val))
+			Err(MutateStorageError::ConcurrentModification(val))
 		}
 	}
 }
@@ -117,12 +145,12 @@ mod tests {
 		t.execute_with(|| {
 			let val = StorageValue::persistent(b"testval");
 
-			assert_eq!(val.get::<u32>(), None);
+			assert_eq!(val.get::<u32>(), Ok(None));
 
 			val.set(&15_u32);
 
-			assert_eq!(val.get::<u32>(), Some(Some(15_u32)));
-			assert_eq!(val.get::<Vec<u8>>(), Some(None));
+			assert_eq!(val.get::<u32>(), Ok(Some(15_u32)));
+			assert_eq!(val.get::<Vec<u8>>(), Err(StorageRetrievalError::Undecodable));
 			assert_eq!(
 				state.read().persistent_storage.get(b"testval"),
 				Some(vec![15_u8, 0, 0, 0])
@@ -140,12 +168,12 @@ mod tests {
 			let val = StorageValue::persistent(b"testval");
 
 			let result = val.mutate::<u32, (), _>(|val| {
-				assert_eq!(val, None);
+				assert_eq!(val, Ok(None));
 
 				Ok(16_u32)
 			});
-			assert_eq!(result, Ok(Ok(16_u32)));
-			assert_eq!(val.get::<u32>(), Some(Some(16_u32)));
+			assert_eq!(result, Ok(16_u32));
+			assert_eq!(val.get::<u32>(), Ok(Some(16_u32)));
 			assert_eq!(
 				state.read().persistent_storage.get(b"testval"),
 				Some(vec![16_u8, 0, 0, 0])
@@ -153,10 +181,10 @@ mod tests {
 
 			// mutate again, but this time early-exit.
 			let res = val.mutate::<u32, (), _>(|val| {
-				assert_eq!(val, Some(Some(16_u32)));
+				assert_eq!(val, Ok(Some(16_u32)));
 				Err(())
 			});
-			assert_eq!(res, Err(()));
+			assert_eq!(res, Err(MutateStorageError::ValueFunctionFailed(())));
 		})
 	}
 }
diff --git a/primitives/runtime/src/offchain/storage_lock.rs b/primitives/runtime/src/offchain/storage_lock.rs
index c3e63a7924d7..3189a814e06f 100644
--- a/primitives/runtime/src/offchain/storage_lock.rs
+++ b/primitives/runtime/src/offchain/storage_lock.rs
@@ -61,7 +61,7 @@
 //! }
 //! ```
 
-use crate::offchain::storage::StorageValueRef;
+use crate::offchain::storage::{StorageRetrievalError, MutateStorageError, StorageValueRef};
 use crate::traits::AtLeast32BitUnsigned;
 use codec::{Codec, Decode, Encode};
 use sp_core::offchain::{Duration, Timestamp};
@@ -279,19 +279,20 @@ impl<'a, L: Lockable> StorageLock<'a, L> {
 
 	/// Extend active lock's deadline
 	fn extend_active_lock(&mut self) -> Result<<L as Lockable>::Deadline, ()> {
-		let res = self.value_ref.mutate(|s: Option<Option<L::Deadline>>| -> Result<<L as Lockable>::Deadline, ()> {
+		let res = self.value_ref.mutate(
+			|s: Result<Option<L::Deadline>, StorageRetrievalError>| -> Result<<L as Lockable>::Deadline, ()> {
 			match s {
 				// lock is present and is still active, extend the lock.
-				Some(Some(deadline)) if !<L as Lockable>::has_expired(&deadline) =>
+				Ok(Some(deadline)) if !<L as Lockable>::has_expired(&deadline) =>
 					Ok(self.lockable.deadline()),
 				// other cases
 				_ => Err(()),
 			}
 		});
 		match res {
-			Ok(Ok(deadline)) => Ok(deadline),
-			Ok(Err(_)) => Err(()),
-			Err(e) => Err(e),
+			Ok(deadline) => Ok(deadline),
+			Err(MutateStorageError::ConcurrentModification(_)) => Err(()),
+			Err(MutateStorageError::ValueFunctionFailed(e)) => Err(e),
 		}
 	}
 
@@ -301,25 +302,25 @@ impl<'a, L: Lockable> StorageLock<'a, L> {
 		new_deadline: L::Deadline,
 	) -> Result<(), <L as Lockable>::Deadline> {
 		let res = self.value_ref.mutate(
-			|s: Option<Option<L::Deadline>>|
+			|s: Result<Option<L::Deadline>, StorageRetrievalError>|
 			-> Result<<L as Lockable>::Deadline, <L as Lockable>::Deadline> {
 				match s {
 					// no lock set, we can safely acquire it
-					None => Ok(new_deadline),
+					Ok(None) => Ok(new_deadline),
 					// write was good, but read failed
-					Some(None) => Ok(new_deadline),
+					Err(_) => Ok(new_deadline),
 					// lock is set, but it is expired. We can re-acquire it.
-					Some(Some(deadline)) if <L as Lockable>::has_expired(&deadline) =>
+					Ok(Some(deadline)) if <L as Lockable>::has_expired(&deadline) =>
 						Ok(new_deadline),
 					// lock is present and is still active
-					Some(Some(deadline)) => Err(deadline),
+					Ok(Some(deadline)) => Err(deadline),
 				}
 			},
 		);
 		match res {
-			Ok(Ok(_)) => Ok(()),
-			Ok(Err(deadline)) => Err(deadline),
-			Err(e) => Err(e),
+			Ok(_) => Ok(()),
+			Err(MutateStorageError::ConcurrentModification(deadline)) => Err(deadline),
+			Err(MutateStorageError::ValueFunctionFailed(e)) => Err(e),
 		}
 	}
 
@@ -488,14 +489,14 @@ mod tests {
 
 				val.set(&VAL_1);
 
-				assert_eq!(val.get::<u32>(), Some(Some(VAL_1)));
+				assert_eq!(val.get::<u32>(), Ok(Some(VAL_1)));
 			}
 
 			{
 				let _guard = lock.lock();
 				val.set(&VAL_2);
 
-				assert_eq!(val.get::<u32>(), Some(Some(VAL_2)));
+				assert_eq!(val.get::<u32>(), Ok(Some(VAL_2)));
 			}
 		});
 		// lock must have been cleared at this point
@@ -518,7 +519,7 @@ mod tests {
 
 			val.set(&VAL_1);
 
-			assert_eq!(val.get::<u32>(), Some(Some(VAL_1)));
+			assert_eq!(val.get::<u32>(), Ok(Some(VAL_1)));
 
 			guard.forget();
 		});
diff --git a/primitives/trie/Cargo.toml b/primitives/trie/Cargo.toml
index 9584ae678d40..bf91fff31b8b 100644
--- a/primitives/trie/Cargo.toml
+++ b/primitives/trie/Cargo.toml
@@ -21,7 +21,7 @@ harness = false
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 sp-std = { version = "3.0.0", default-features = false, path = "../std" }
 hash-db = { version = "0.15.2", default-features = false }
-trie-db = { version = "0.22.3", default-features = false }
+trie-db = { version = "0.22.5", default-features = false }
 trie-root = { version = "0.16.0", default-features = false }
 memory-db = { version = "0.26.0", default-features = false }
 sp-core = { version = "3.0.0", default-features = false, path = "../core" }

From 7170fdadba633b4ed596e7c7781a1ba7db483896 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Wed, 23 Jun 2021 17:17:10 +0200
Subject: [PATCH 0917/1194] Fix alert about delay between best and finalized
 block (#9150)

* Fix alert about delay between best and finalized block

* Revert debugging changes
---
 .maintain/monitoring/alerting-rules/alerting-rules.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.maintain/monitoring/alerting-rules/alerting-rules.yaml b/.maintain/monitoring/alerting-rules/alerting-rules.yaml
index a3aa1b145b34..7a69cba66c3f 100644
--- a/.maintain/monitoring/alerting-rules/alerting-rules.yaml
+++ b/.maintain/monitoring/alerting-rules/alerting-rules.yaml
@@ -47,8 +47,8 @@ groups:
     # Under the assumption of an average block production of 6 seconds,
     # "best" and "finalized" being more than 10 blocks apart would imply
     # more than a 1 minute delay between block production and finalization.
-    expr: '(polkadot_block_height_number{status="best"} - ignoring(status)
-    polkadot_block_height_number{status="finalized"}) > 10'
+    expr: '(polkadot_block_height{status="best"} - ignoring(status)
+    polkadot_block_height{status="finalized"}) > 10'
     for: 8m
     labels:
       severity: critical

From 550d64cc7e233edf815c215b5329e1171cd59d1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomusdrw@users.noreply.github.com>
Date: Thu, 24 Jun 2021 00:10:44 +0200
Subject: [PATCH 0918/1194] Transaction Pool docs (#9056)

* Add transaction pool docs.

* Extra docs.

* Apply suggestions from code review

Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>

* Expand on some review comments.

* Update README.md

Fixed typos / spellings

Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
Co-authored-by: Squirrel <gilescope@gmail.com>
---
 .editorconfig                     |   5 +
 client/transaction-pool/README.md | 363 +++++++++++++++++++++++++++++-
 2 files changed, 367 insertions(+), 1 deletion(-)

diff --git a/.editorconfig b/.editorconfig
index 2b40ec32fac3..50cc9dacd7e4 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,6 +9,11 @@ trim_trailing_whitespace=true
 max_line_length=100
 insert_final_newline=true
 
+[*.md]
+max_line_length=80
+indent_style=space
+indent_size=2
+
 [*.yml]
 indent_style=space
 indent_size=2
diff --git a/client/transaction-pool/README.md b/client/transaction-pool/README.md
index 15e4641c1f48..28846fdbb38f 100644
--- a/client/transaction-pool/README.md
+++ b/client/transaction-pool/README.md
@@ -1,3 +1,364 @@
 Substrate transaction pool implementation.
 
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+# Problem Statement
+
+The transaction pool is responsible for maintaining a set of transactions that
+possible to include by block authors in upcoming blocks. Transactions are received
+either from networking (gossiped by other peers) or RPC (submitted locally).
+
+The main task of the pool is to prepare an ordered list of transactions for block
+authorship module. The same list is useful for gossiping to other peers, but note
+that it's not a hard requirement for the gossiped transactions to be exactly the
+same (see implementation notes below).
+
+It's within block author incentives to have the transactions stored and ordered in
+such a way to:
+
+1. Maximize block author's profits (value of the produced block)
+2. Minimize block author's amount of work (time to produce block)
+
+In the case of FRAME the first property is simply making sure that the fee per weight
+unit is the highest (high `tip` values), the second is about avoiding feeding
+transactions that cannot be part of the next block (they are invalid, obsolete, etc).
+
+From the transaction pool PoV, transactions are simply opaque blob of bytes,
+it's required to query the runtime (via `TaggedTransactionQueue` Runtime API) to
+verify transaction's mere correctness and extract any information about how the
+transaction relates to other transactions in the pool and current on-chain state.
+Only valid transactions should be stored in the pool.
+
+Each imported block can affect validity of transactions already in the pool. Block
+authors expect from the pool to get most up to date information about transactions
+that can be included in the block that they are going to build on top of the just
+imported one. The process of ensuring this property is called *pruning*. During
+pruning the pool should remove transactions which are considered invalid by the
+runtime (queried at current best imported block).
+
+Since the blockchain is not always linear, forks need to be correctly handled by
+the transaction pool as well. In case of a fork, some blocks are *retracted*
+from the canonical chain, and some other blocks get *enacted* on top of some
+common ancestor. The transactions from retrated blocks could simply be discarded,
+but it's desirable to make sure they are still considered for inclusion in case they
+are deemed valid by the runtime state at best, recently enacted block (fork the
+chain re-organized to).
+
+Transaction pool should also offer a way of tracking transaction lifecycle in the
+pool, it's broadcasting status, block inclusion, finality, etc.
+
+## Transaction Validity details
+
+Information retrieved from the the runtime are encapsulated in `TransactionValidity`
+type.
+
+```rust
+pub type TransactionValidity = Result<ValidTransaction, TransactionValidityError>;
+
+pub struct ValidTransaction {
+  pub requires: Vec<TransactionTag>,
+  pub provides: Vec<TransactionTag>,
+  pub priority: TransactionPriority,
+  pub longevity: TransactionLongevity,
+  pub propagate: bool,
+}
+
+pub enum TransactionValidityError {
+  Invalid(/* details */),
+  Unknown(/* details */),
+}
+```
+
+We will go through each of the parameter now to understand the requirements they
+create for transaction ordering.
+
+The runtime is expected to return these values in a deterministic fashion. Calling
+the API multiple times given exactly the same state must return same results.
+Field-specific rules are described below.
+
+### `requires` / `provides`
+
+These two fields contain a set of `TransactionTag`s (opaque blobs) associated with
+given transaction. Looking at these fields we can find dependencies between
+transactions and their readiness for block inclusion.
+
+The `provides` set contains properties that will be *satisfied* in case the transaction
+is successfully added to a block. `requires` contains properties that must be satisfied
+**before** the transaction can be included to a block.
+
+Note that a transaction with empty `requires` set can be added to a block immediately,
+there are no other transactions that it expects to be included before.
+
+For some given series of transactions the `provides` and `requires` fields will create
+a (simple) directed acyclic graph. The *sources* in such graph, if they don't have
+any extra `requires` tags (i.e. they have their all dependencies *satisfied*), should
+be considered for block inclusion first. Multiple transactions that are ready for
+block inclusion should be ordered by `priority` (see below).
+
+Note the process of including transactions to a block is basically building the graph,
+then selecting "the best" source vertex (transaction) with all tags satisfied and
+removing it from that graph.
+
+#### Examples
+
+- A transaction in Bitcoin-like chain will `provide` generated UTXOs and will `require`
+  UTXOs it is still awaiting for (note that it's not necessarily all require inputs,
+  since some of them might already be spendable (i.e. the UTXO is in state))
+
+- A transaction in account-based chain will `provide` a `(sender, transaction_index/nonce)`
+  (as one tag), and will `require` `(sender, nonce - 1)` in case
+  `on_chain_nonce < nonce - 1`.
+
+#### Rules & caveats
+
+- `provides` must not be empty
+- transactions with an overlap in `provides` tags are mutually exclusive
+- checking validity of transaction that `requires` tag `A` after including
+  transaction that provides that tag must not return `A` in `requires` again
+- runtime developers should avoid re-using `provides` tag (i.e. it should be unique)
+- there should be no cycles in transaction dependencies
+- caveat: on-chain state conditions may render transaction invalid despite no
+  `requires` tags
+- caveat: on-chain state conditions may render transaction valid despite some
+  `requires` tags
+- caveat: including transactions to a chain might make them valid again right away
+  (for instance UTXO transaction gets in, but since we don't store spent outputs
+  it will be valid again, awaiting the same inputs/tags to be satisfied)
+
+### `priority`
+
+Transaction priority describes importance of the transaction relative to other transactions
+in the pool. Block authors can expect benefiting from including such transactions
+before others.
+
+Note that we can't simply order transactions in the pool by `priority`, cause first
+we need to make sure that all of the transaction requirements are satisfied (see
+`requires/provides` section). However if we consider a set of transactions
+which all have their requirements (tags) satisfied, the block author should be
+choosing the ones with highest priority to include to the next block first.
+
+`priority` can be any number between `0` (lowest inclusion priority) to `u64::MAX`
+(highest inclusion priority).
+
+#### Rules & caveats
+
+- `priority` of transaction may change over time
+- on-chain conditions may affect `priority`
+- Given two transactions with overlapping `provides` tags, the one with higher
+  `priority` should be preferred. However we can also look at the total priority
+  of a subtree rooted at that transaction and compare that instead (i.e. even though
+  the transaction itself has lower `priority` it "unlocks" other high priority transactions).
+
+### `longevity`
+
+Longevity describes how long (in blocks) the transaction is expected to be
+valid. This parameter only gives a hint to the transaction pool how long
+current transaction may still be valid. Note that it does not guarantee
+the transaction is valid all that time though.
+
+#### Rules & caveats
+
+- `longevity` of transaction may change over time
+- on-chain conditions may affect `longevity`
+- After `longevity` lapses the transaction may still be valid
+
+### `propagate`
+
+This parameter instructs the pool propagate/gossip a transaction to node peers.
+By default this should be `true`, however in some cases it might be undesirable
+to propagate transactions further. Examples might include heavy transactions
+produced by block authors in offchain workers (DoS) or risking being front
+runned by someone else after finding some non trivial solution or equivocation,
+etc.
+
+### 'TransactionSource`
+
+To make it possible for the runtime to distinguish if the transaction that is
+being validated was received over the network or submitted using local RPC or
+maybe it's simply part of a block that is being imported, the transaction pool
+should pass additional `TransactionSource` parameter to the validity function
+runtime call.
+
+This can be used by runtime developers to quickly reject transactions that for
+instance are not expected to be gossiped in the network.
+
+
+### `Invalid` transaction
+
+In case the runtime returns an `Invalid` error it means the transaction cannot
+be added to a block at all. Extracting the actual reason of invalidity gives
+more details about the source. For instance `Stale` transaction just indicates
+the transaction was already included in a block, while `BadProof` signifies
+invalid signature.
+Invalidity might also be temporary. In case of `ExhaustsResources` the
+transaction does not fit to the current block, but it might be okay for the next
+one.
+
+### `Unknown` transaction
+
+In case of `Unknown` validity, the runtime cannot determine if the transaction
+is valid or not in current block. However this situation might be temporary, so
+it is expected for the transaction to be retried in the future.
+
+# Implementation
+
+An ideal transaction pool should be storing only transactions that are considered
+valid by the runtime at current best imported block.
+After every block is imported, the pool should:
+
+1. Revalidate all transactions in the pool and remove the invalid ones.
+1. Construct the transaction inclusion graph based on `provides/requires` tags.
+   Some transactions might not be reachable (have unsatisfied dependencies),
+   they should be just left out in the pool.
+1. On block author request, the graph should be copied and transactions should
+   be removed one-by-one from the graph starting from the one with highest
+   priority and all conditions satisfied.
+
+With current gossip protocol, networking should propagate transactions in the
+same order as block author would include them. Most likely it's fine if we
+propagate transactions with cumulative weight not exceeding upcoming `N`
+blocks (choosing `N` is subject to networking conditions and block times).
+
+Note that it's not a strict requirement though to propagate exactly the same
+transactions that are prepared for block inclusion. Propagation is best
+effort, especially for block authors and is not directly incentivised.
+However the networking protocol might penalise peers that send invalid or
+useless transactions so we should be nice to others. Also see below a proposal
+to instead of gossiping everyting have other peers request transactions they
+are interested in.
+
+Since the pool is expected to store more transactions than what can fit
+to a single block. Validating the entire pool on every block might not be
+feasible, so the actual implementation might need to take some shortcuts.
+
+## Suggestions & caveats
+
+1. The validity of transaction should not change significantly from block to
+   block. I.e. changes in validity should happen predicatably, e.g. `longevity`
+   decrements by 1, `priority` stays the same, `requires` changes if transaction
+   that provided a tag was included in block. `provides` does not change, etc.
+
+1. That means we don't have to revalidate every transaction after every block
+   import, but we need to take care of removing potentially stale transactions.
+
+1. Transactions with exactly the same bytes are most likely going to give the
+   same validity results. We can essentially treat them as identical.
+
+1. Watch out for re-organisations and re-importing transactions from retracted
+   blocks.
+
+1. In the past there were many issues found when running small networks with a
+   lot of re-orgs. Make sure that transactions are never lost.
+
+1. UTXO model is quite challenging. The transaction becomes valid right after
+   it's included in block, however it is waiting for exactly the same inputs to
+   be spent, so it will never really be included again.
+
+1. Note that in a non-ideal implementation the state of the pool will most
+   likely always be a bit off, i.e. some transactions might be still in the pool,
+   but they are invalid. The hard decision is about trade-offs you take.
+
+1. Note that import notification is not reliable - you might not receive a
+   notification about every imported block.
+
+## Potential implementation ideas
+
+1. Block authors remove transactions from the pool when they author a block. We
+   still store them around to re-import in case the block does not end up
+   canonical. This only works if the block is actively authoring blocks (also
+   see below).
+
+1. We don't prune, but rather remove a fixed amount of transactions from the front
+   of the pool (number based on average/max transactions per block from the
+   past) and re-validate them, reimporting the ones that are still valid.
+
+1. We periodically validate all transactions in the pool in batches.
+
+1. To minimize runtime calls, we introduce batch-verify call. Note it should reset
+   the state (overlay) after every verification.
+
+1. Consider leveraging finality. Maybe we could verify against latest finalised
+   block instead. With this the pool in different nodes can be more similar
+   which might help with gossiping (see set reconciliation). Note that finality
+   is not a strict requirement for a Substrate chain to have though.
+
+1. Perhaps we could avoid maintaining ready/future queues as currently, but
+   rather if transaction doesn't have all requirements satisfied by existing
+   transactions we attempt to re-import it in the future.
+
+1. Instead of maintaining a full pool with total ordering we attempt to maintain
+   a set of next (couple of) blocks. We could introduce batch-validate runtime
+   api  method that pretty much attempts to simulate actual block inclusion of
+   a set of such transactions (without necessarily fully running/dispatching
+   them). Importing a transaction would consist of figuring out which next block
+   this transaction have a chance to be included in and then attempting to
+   either push it back or replace some of existing transactions.
+
+1. Perhaps we could use some immutable graph structure to easily add/remove
+   transactions. We need some traversal method that takes priority and
+   reachability into account.
+
+1. It was discussed in the past to use set reconciliation strategies instead of
+simply broadcasting all/some transactions to all/selected peers. An Ethereum's
+[EIP-2464](https://github.com/ethereum/EIPs/blob/5b9685bb9c7ba0f5f921e4d3f23504f7ef08d5b1/EIPS/eip-2464.md)
+might be a good first approach to reduce transaction gossip.
+
+# Current implementation
+
+Current implementation of the pool is a result of experiences from Ethereum's
+pool implementation, but also has some warts coming from the learning process of
+Substrate's generic nature and light client support.
+
+The pool consists of basically two independent parts:
+
+1. The transaction pool itself.
+2. Maintenance background task.
+
+The pool is split into `ready` pool and `future` pool. The latter contains
+transactions that don't have their requirements satisfied, and the former holds
+transactions that can be used to build a graph of dependencies. Note that the
+graph is build ad-hoc during the traversal process (getting the `ready`
+iterator). This makes the importing process cheaper (we don't need to find the
+exact position in the queue or graph), but traversal process slower
+(logarithmic). However most of the time we will only need the beginning of the
+total ordering of transactions for block inclusion or network propagation, hence
+the decision.
+
+The maintenance task is responsible for:
+
+1. Periodically revalidating pool's transactions (revalidation queue).
+1. Handling block import notifications and doing pruning + re-importing of
+   transactions from retracted blocks.
+1. Handling finality notifications and relaying that to transaction-specific
+   listeners.
+
+Additionally we maintain a list of recently included/rejected transactions
+(`PoolRotator`) to quickly reject transactions that are unlikely to be valid
+to limit number of runtime verification calls.
+
+Each time a transaction is imported, we first verify it's validity and later
+find if the tags it `requires` can be satisfied by transactions already in
+`ready` pool. In case the transaction is imported to the `ready` pool we
+additionally *promote* transactions from `future` pool if the transaction
+happened to fulfill their requirements.
+Note we need to cater for cases where transaction might replace a already
+existing transaction in the pool. In such case we check the entire sub-tree of
+transactions that we are about to replace, compare their cumulative priority to
+determine which subtree to keep.
+
+After a block is imported we kick-off pruning procedure. We first attempt to
+figure out what tags were satisfied by transaction in that block. For each block
+transaction we either call into runtime to get it's `ValidTransaction` object,
+or we check the pool if that transaction is already known to spare the runtime
+call. From this we gather full set of `provides` tags and perform pruning of
+`ready` pool based on that. Also we promote all transactions from `future` that
+have their tags satisfied.
+
+In case we remove transactions that we are unsure if they were already included
+in current block or some block in the past, it is being added to revalidation
+queue and attempted to be re-imported by the background task in the future.
+
+Runtime calls to verify transactions are performed from a separate (limited)
+thread pool to avoid interferring too much with other subsystems of the node. We
+definitely don't want to have all cores validating network transactions, cause
+all of these transactions need to be considered untrusted (potentially DoS).

From 63ab27876dd5320760a55a8739505e3b4b511644 Mon Sep 17 00:00:00 2001
From: Squirrel <gilescope@gmail.com>
Date: Thu, 24 Jun 2021 08:20:15 +0100
Subject: [PATCH 0919/1194] Fix to support u32::MAX (#9188)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix to support u32::MAX

* Update primitives/runtime/src/random_number_generator.rs

Co-authored-by: Andronik Ordian <write@reusable.software>

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: Andronik Ordian <write@reusable.software>
---
 .../runtime/src/random_number_generator.rs       | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/primitives/runtime/src/random_number_generator.rs b/primitives/runtime/src/random_number_generator.rs
index a4d1a66370c1..41ca7c723e9c 100644
--- a/primitives/runtime/src/random_number_generator.rs
+++ b/primitives/runtime/src/random_number_generator.rs
@@ -27,6 +27,8 @@ use crate::traits::{Hash, TrailingZeroInput};
 ///
 /// It can be saved and later reloaded using the Codec traits.
 ///
+/// (It is recommended to use the `rand_chacha` crate as an alternative to this where possible.)
+///
 /// Example:
 /// ```
 /// use sp_runtime::traits::{Hash, BlakeTwo256};
@@ -63,7 +65,7 @@ impl<Hashing: Hash> RandomNumberGenerator<Hashing> {
 	/// Returns a number at least zero, at most `max`.
 	pub fn pick_u32(&mut self, max: u32) -> u32 {
 		let needed = (4 - max.leading_zeros() / 8) as usize;
-		let top = ((1 << (needed as u64 * 8)) / ((max + 1) as u64) * ((max + 1) as u64) - 1) as u32;
+		let top = ((1 << (needed as u64 * 8)) / (max as u64 + 1) * (max as u64 + 1) - 1) as u32;
 		loop {
 			if self.offset() + needed > self.current.as_ref().len() {
 				// rehash
@@ -102,3 +104,15 @@ impl<Hashing: Hash> RandomNumberGenerator<Hashing> {
 		}
 	}
 }
+
+#[cfg(test)]
+mod tests {
+	use super::RandomNumberGenerator;
+	use crate::traits::{Hash, BlakeTwo256};
+
+	#[test]
+	fn does_not_panic_on_max() {
+		let seed = BlakeTwo256::hash(b"Fourty-two");
+		let _random = RandomNumberGenerator::<BlakeTwo256>::new(seed).pick_u32(u32::MAX);
+	}
+}

From 76cc00f8e76b24b3d4f5057992c1fa9dd31d8f1e Mon Sep 17 00:00:00 2001
From: Squirrel <gilescope@gmail.com>
Date: Thu, 24 Jun 2021 11:53:49 +0100
Subject: [PATCH 0920/1194] Use MAX associated const (#9196)

* Use MAX associated const
---
 bin/node/runtime/src/impls.rs                 |  2 +-
 client/consensus/aura/src/lib.rs              |  2 +-
 .../src/communication/gossip.rs               |  2 +-
 client/informant/src/display.rs               |  2 +-
 .../notifications/upgrade/notifications.rs    |  4 +-
 client/network/src/request_responses.rs       |  4 +-
 client/network/src/service.rs                 |  8 +-
 client/network/src/service/out_events.rs      |  4 +-
 client/network/src/service/tests.rs           |  2 +-
 client/peerset/src/peersstate.rs              |  4 +-
 client/peerset/tests/fuzz.rs                  |  2 +-
 client/rpc/src/chain/mod.rs                   |  2 +-
 client/service/src/chain_ops/import_blocks.rs |  2 +-
 client/service/test/src/client/mod.rs         |  4 +-
 client/transaction-pool/graph/src/ready.rs    |  4 +-
 frame/assets/src/tests.rs                     |  8 +-
 frame/babe/src/mock.rs                        |  2 +-
 frame/balances/src/tests.rs                   | 12 +--
 frame/contracts/src/benchmarking/mod.rs       |  2 +-
 frame/contracts/src/chain_extension.rs        |  2 +-
 frame/contracts/src/wasm/runtime.rs           |  8 +-
 frame/democracy/src/benchmarking.rs           |  6 +-
 frame/democracy/src/tests/decoders.rs         |  4 +-
 frame/democracy/src/tests/preimage.rs         | 12 +--
 frame/democracy/src/tests/public_proposals.rs | 18 ++---
 frame/example/src/tests.rs                    |  2 +-
 frame/grandpa/src/mock.rs                     |  2 +-
 frame/staking/reward-curve/src/lib.rs         |  4 +-
 frame/staking/reward-curve/src/log.rs         |  2 +-
 frame/staking/src/benchmarking.rs             | 14 ++--
 frame/staking/src/testing_utils.rs            |  2 +-
 frame/staking/src/tests.rs                    |  6 +-
 frame/support/src/traits/voting.rs            |  8 +-
 frame/support/src/weights.rs                  |  2 +-
 .../tests/pallet_with_name_trait_is_valid.rs  |  2 +-
 frame/system/src/lib.rs                       |  2 +-
 frame/transaction-payment/src/lib.rs          |  6 +-
 frame/treasury/src/tests.rs                   |  4 +-
 primitives/allocator/src/freeing_bump.rs      |  2 +-
 .../fuzzer/src/multiply_by_rational.rs        |  2 +-
 primitives/arithmetic/src/biguint.rs          |  6 +-
 primitives/arithmetic/src/fixed_point.rs      | 74 +++++++++----------
 primitives/arithmetic/src/lib.rs              |  8 +-
 primitives/arithmetic/src/rational.rs         |  6 +-
 primitives/core/src/hash.rs                   |  4 +-
 primitives/core/src/offchain/mod.rs           |  2 +-
 primitives/core/src/uint.rs                   |  4 +-
 primitives/npos-elections/src/phragmen.rs     |  2 +-
 primitives/npos-elections/src/phragmms.rs     |  6 +-
 primitives/npos-elections/src/tests.rs        | 24 +++---
 .../runtime-interface/test-wasm/src/lib.rs    |  4 +-
 primitives/runtime/src/curve.rs               | 12 +--
 primitives/runtime/src/generic/era.rs         | 10 +--
 primitives/runtime/src/generic/header.rs      |  8 +-
 .../runtime/src/random_number_generator.rs    |  2 +-
 primitives/trie/src/lib.rs                    |  2 +-
 56 files changed, 178 insertions(+), 178 deletions(-)

diff --git a/bin/node/runtime/src/impls.rs b/bin/node/runtime/src/impls.rs
index 1d1488e2fae9..d3d0541b6ec0 100644
--- a/bin/node/runtime/src/impls.rs
+++ b/bin/node/runtime/src/impls.rs
@@ -307,7 +307,7 @@ mod multiplier_tests {
 	fn weight_to_fee_should_not_overflow_on_large_weights() {
 		let kb = 1024 as Weight;
 		let mb = kb * kb;
-		let max_fm = Multiplier::saturating_from_integer(i128::max_value());
+		let max_fm = Multiplier::saturating_from_integer(i128::MAX);
 
 		// check that for all values it can compute, correctly.
 		vec![
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index d08ce5dfee25..72545eda077b 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -97,7 +97,7 @@ fn slot_author<P: Pair>(slot: Slot, authorities: &[AuthorityId<P>]) -> Option<&A
 
 	let idx = *slot % (authorities.len() as u64);
 	assert!(
-		idx <= usize::max_value() as u64,
+		idx <= usize::MAX as u64,
 		"It is impossible to have a vector with length beyond the address space; qed",
 	);
 
diff --git a/client/finality-grandpa/src/communication/gossip.rs b/client/finality-grandpa/src/communication/gossip.rs
index 8f46e45d635a..1b3b5ea7c5d2 100644
--- a/client/finality-grandpa/src/communication/gossip.rs
+++ b/client/finality-grandpa/src/communication/gossip.rs
@@ -1468,7 +1468,7 @@ impl<Block: BlockT> GossipValidator<Block> {
 						"" => "",
 					);
 
-					let len = std::cmp::min(i32::max_value() as usize, data.len()) as i32;
+					let len = std::cmp::min(i32::MAX as usize, data.len()) as i32;
 					Action::Discard(Misbehavior::UndecodablePacket(len).cost())
 				}
 			}
diff --git a/client/informant/src/display.rs b/client/informant/src/display.rs
index 00c2116fac60..0b7f8bcfaf16 100644
--- a/client/informant/src/display.rs
+++ b/client/informant/src/display.rs
@@ -179,7 +179,7 @@ fn speed<B: BlockT>(
 		// algebraic approach and we stay within the realm of integers.
 		let one_thousand = NumberFor::<B>::from(1_000u32);
 		let elapsed = NumberFor::<B>::from(
-			<u32 as TryFrom<_>>::try_from(elapsed_ms).unwrap_or(u32::max_value())
+			<u32 as TryFrom<_>>::try_from(elapsed_ms).unwrap_or(u32::MAX)
 		);
 
 		let speed = diff.saturating_mul(one_thousand).checked_div(&elapsed)
diff --git a/client/network/src/protocol/notifications/upgrade/notifications.rs b/client/network/src/protocol/notifications/upgrade/notifications.rs
index e2ef26c81eba..26bb92d77656 100644
--- a/client/network/src/protocol/notifications/upgrade/notifications.rs
+++ b/client/network/src/protocol/notifications/upgrade/notifications.rs
@@ -159,7 +159,7 @@ where TSubstream: AsyncRead + AsyncWrite + Unpin + Send + 'static,
 			}
 
 			let mut codec = UviBytes::default();
-			codec.set_max_len(usize::try_from(self.max_notification_size).unwrap_or(usize::max_value()));
+			codec.set_max_len(usize::try_from(self.max_notification_size).unwrap_or(usize::MAX));
 
 			let substream = NotificationsInSubstream {
 				socket: Framed::new(socket, codec),
@@ -390,7 +390,7 @@ where TSubstream: AsyncRead + AsyncWrite + Unpin + Send + 'static,
 			}
 
 			let mut codec = UviBytes::default();
-			codec.set_max_len(usize::try_from(self.max_notification_size).unwrap_or(usize::max_value()));
+			codec.set_max_len(usize::try_from(self.max_notification_size).unwrap_or(usize::MAX));
 
 			Ok(NotificationsOutOpen {
 				handshake,
diff --git a/client/network/src/request_responses.rs b/client/network/src/request_responses.rs
index 3762cf70e71d..20469e143d41 100644
--- a/client/network/src/request_responses.rs
+++ b/client/network/src/request_responses.rs
@@ -809,7 +809,7 @@ impl RequestResponseCodec for GenericCodec {
 		// Read the length.
 		let length = unsigned_varint::aio::read_usize(&mut io).await
 			.map_err(|err| io::Error::new(io::ErrorKind::InvalidInput, err))?;
-		if length > usize::try_from(self.max_request_size).unwrap_or(usize::max_value()) {
+		if length > usize::try_from(self.max_request_size).unwrap_or(usize::MAX) {
 			return Err(io::Error::new(
 				io::ErrorKind::InvalidInput,
 				format!("Request size exceeds limit: {} > {}", length, self.max_request_size)
@@ -846,7 +846,7 @@ impl RequestResponseCodec for GenericCodec {
 			Err(err) => return Err(io::Error::new(io::ErrorKind::InvalidInput, err)),
 		};
 
-		if length > usize::try_from(self.max_response_size).unwrap_or(usize::max_value()) {
+		if length > usize::try_from(self.max_response_size).unwrap_or(usize::MAX) {
 			return Err(io::Error::new(
 				io::ErrorKind::InvalidInput,
 				format!("Response size exceeds limit: {} > {}", length, self.max_response_size)
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 0bc28288501a..fb303312093c 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -300,20 +300,20 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 				let yamux_maximum_buffer_size = {
 					let requests_max = params.network_config
 						.request_response_protocols.iter()
-						.map(|cfg| usize::try_from(cfg.max_request_size).unwrap_or(usize::max_value()));
+						.map(|cfg| usize::try_from(cfg.max_request_size).unwrap_or(usize::MAX));
 					let responses_max = params.network_config
 						.request_response_protocols.iter()
-						.map(|cfg| usize::try_from(cfg.max_response_size).unwrap_or(usize::max_value()));
+						.map(|cfg| usize::try_from(cfg.max_response_size).unwrap_or(usize::MAX));
 					let notifs_max = params.network_config
 						.extra_sets.iter()
-						.map(|cfg| usize::try_from(cfg.max_notification_size).unwrap_or(usize::max_value()));
+						.map(|cfg| usize::try_from(cfg.max_notification_size).unwrap_or(usize::MAX));
 
 					// A "default" max is added to cover all the other protocols: ping, identify,
 					// kademlia, block announces, and transactions.
 					let default_max = cmp::max(
 						1024 * 1024,
 						usize::try_from(protocol::BLOCK_ANNOUNCES_TRANSACTIONS_SUBSTREAM_SIZE)
-							.unwrap_or(usize::max_value())
+							.unwrap_or(usize::MAX)
 					);
 
 					iter::once(default_max)
diff --git a/client/network/src/service/out_events.rs b/client/network/src/service/out_events.rs
index 06c068e369da..7ec6c608a8fc 100644
--- a/client/network/src/service/out_events.rs
+++ b/client/network/src/service/out_events.rs
@@ -254,7 +254,7 @@ impl Metrics {
 						.inc_by(num);
 					self.notifications_sizes
 						.with_label_values(&[protocol, "sent", name])
-						.inc_by(num.saturating_mul(u64::try_from(message.len()).unwrap_or(u64::max_value())));
+						.inc_by(num.saturating_mul(u64::try_from(message.len()).unwrap_or(u64::MAX)));
 				}
 			},
 		}
@@ -294,7 +294,7 @@ impl Metrics {
 						.inc();
 					self.notifications_sizes
 						.with_label_values(&[&protocol, "received", name])
-						.inc_by(u64::try_from(message.len()).unwrap_or(u64::max_value()));
+						.inc_by(u64::try_from(message.len()).unwrap_or(u64::MAX));
 				}
 			},
 		}
diff --git a/client/network/src/service/tests.rs b/client/network/src/service/tests.rs
index c2e3844849f5..4a739e50628a 100644
--- a/client/network/src/service/tests.rs
+++ b/client/network/src/service/tests.rs
@@ -345,7 +345,7 @@ fn lots_of_incoming_peers_works() {
 				fallback_names: Vec::new(),
 				max_notification_size: 1024 * 1024,
 				set_config: config::SetConfig {
-					in_peers: u32::max_value(),
+					in_peers: u32::MAX,
 					.. Default::default()
 				},
 			}
diff --git a/client/peerset/src/peersstate.rs b/client/peerset/src/peersstate.rs
index 309c7e6b8f97..9f54a7714fd0 100644
--- a/client/peerset/src/peersstate.rs
+++ b/client/peerset/src/peersstate.rs
@@ -97,8 +97,8 @@ struct Node {
 	/// are indices into this `Vec`.
 	sets: Vec<MembershipState>,
 
-	/// Reputation value of the node, between `i32::min_value` (we hate that node) and
-	/// `i32::max_value` (we love that node).
+	/// Reputation value of the node, between `i32::MIN` (we hate that node) and
+	/// `i32::MAX` (we love that node).
 	reputation: i32,
 }
 
diff --git a/client/peerset/tests/fuzz.rs b/client/peerset/tests/fuzz.rs
index 8f6496294347..d951b0cc560c 100644
--- a/client/peerset/tests/fuzz.rs
+++ b/client/peerset/tests/fuzz.rs
@@ -120,7 +120,7 @@ fn test_once() {
 				// If we generate 2, adjust a random reputation.
 				2 => {
 					if let Some(id) = known_nodes.iter().choose(&mut rng) {
-						let val = Uniform::new_inclusive(i32::min_value(), i32::max_value())
+						let val = Uniform::new_inclusive(i32::min_value(), i32::MAX)
 							.sample(&mut rng);
 						peerset_handle.report_peer(id.clone(), ReputationChange::new(val, ""));
 					}
diff --git a/client/rpc/src/chain/mod.rs b/client/rpc/src/chain/mod.rs
index d3a28d534335..1380927bca2f 100644
--- a/client/rpc/src/chain/mod.rs
+++ b/client/rpc/src/chain/mod.rs
@@ -84,7 +84,7 @@ trait ChainBackend<Client, Block: BlockT>: Send + Sync + 'static
 				// FIXME <2329>: Database seems to limit the block number to u32 for no reason
 				let block_num: u32 = num_or_hex.try_into().map_err(|_| {
 					Error::from(format!(
-						"`{:?}` > u32::max_value(), the max block number is u32.",
+						"`{:?}` > u32::MAX, the max block number is u32.",
 						num_or_hex
 					))
 				})?;
diff --git a/client/service/src/chain_ops/import_blocks.rs b/client/service/src/chain_ops/import_blocks.rs
index 90bcc94cb899..330aaea4f555 100644
--- a/client/service/src/chain_ops/import_blocks.rs
+++ b/client/service/src/chain_ops/import_blocks.rs
@@ -236,7 +236,7 @@ impl<B: BlockT> Speedometer<B> {
 			// algebraic approach and we stay within the realm of integers.
 			let one_thousand = NumberFor::<B>::from(1_000u32);
 			let elapsed = NumberFor::<B>::from(
-				<u32 as TryFrom<_>>::try_from(elapsed_ms).unwrap_or(u32::max_value())
+				<u32 as TryFrom<_>>::try_from(elapsed_ms).unwrap_or(u32::MAX)
 			);
 
 			let speed = diff.saturating_mul(one_thousand).checked_div(&elapsed)
diff --git a/client/service/test/src/client/mod.rs b/client/service/test/src/client/mod.rs
index bf4105377f9c..9cd0e193fcd0 100644
--- a/client/service/test/src/client/mod.rs
+++ b/client/service/test/src/client/mod.rs
@@ -1547,7 +1547,7 @@ fn doesnt_import_blocks_that_revert_finality() {
 				cache_size: 1024,
 			},
 		},
-		u64::max_value(),
+		u64::MAX,
 	).unwrap());
 
 	let mut client = TestClientBuilder::with_backend(backend).build();
@@ -1751,7 +1751,7 @@ fn returns_status_for_pruned_blocks() {
 				cache_size: 1024,
 			},
 		},
-		u64::max_value(),
+		u64::MAX,
 	).unwrap());
 
 	let mut client = TestClientBuilder::with_backend(backend).build();
diff --git a/client/transaction-pool/graph/src/ready.rs b/client/transaction-pool/graph/src/ready.rs
index 2c0575bf1efb..ba6ca97dc675 100644
--- a/client/transaction-pool/graph/src/ready.rs
+++ b/client/transaction-pool/graph/src/ready.rs
@@ -659,7 +659,7 @@ mod tests {
 			bytes: 1,
 			hash: 5,
 			priority: 1,
-			valid_till: u64::max_value(),	// use the max_value() here for testing.
+			valid_till: u64::MAX,	// use the max here for testing.
 			requires: vec![tx1.provides[0].clone()],
 			provides: vec![],
 			propagate: true,
@@ -692,7 +692,7 @@ mod tests {
 			bytes: 1,
 			hash: 5,
 			priority: 1,
-			valid_till: u64::max_value(),	// use the max_value() here for testing.
+			valid_till: u64::MAX,	// use the max here for testing.
 			requires: vec![],
 			provides: vec![],
 			propagate: true,
diff --git a/frame/assets/src/tests.rs b/frame/assets/src/tests.rs
index b561864c8e48..b8eb2e40f8af 100644
--- a/frame/assets/src/tests.rs
+++ b/frame/assets/src/tests.rs
@@ -310,7 +310,7 @@ fn querying_total_supply_should_work() {
 		assert_eq!(Assets::balance(0, 1), 50);
 		assert_eq!(Assets::balance(0, 2), 19);
 		assert_eq!(Assets::balance(0, 3), 31);
-		assert_ok!(Assets::burn(Origin::signed(1), 0, 3, u64::max_value()));
+		assert_ok!(Assets::burn(Origin::signed(1), 0, 3, u64::MAX));
 		assert_eq!(Assets::total_supply(0), 69);
 	});
 }
@@ -457,7 +457,7 @@ fn transferring_amount_more_than_available_balance_should_not_work() {
 		assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 50));
 		assert_eq!(Assets::balance(0, 1), 50);
 		assert_eq!(Assets::balance(0, 2), 50);
-		assert_ok!(Assets::burn(Origin::signed(1), 0, 1, u64::max_value()));
+		assert_ok!(Assets::burn(Origin::signed(1), 0, 1, u64::MAX));
 		assert_eq!(Assets::balance(0, 1), 0);
 		assert_noop!(Assets::transfer(Origin::signed(1), 0, 1, 50), Error::<Test>::BalanceLow);
 		assert_noop!(Assets::transfer(Origin::signed(2), 0, 1, 51), Error::<Test>::BalanceLow);
@@ -491,7 +491,7 @@ fn burning_asset_balance_with_positive_balance_should_work() {
 		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
 		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
 		assert_eq!(Assets::balance(0, 1), 100);
-		assert_ok!(Assets::burn(Origin::signed(1), 0, 1, u64::max_value()));
+		assert_ok!(Assets::burn(Origin::signed(1), 0, 1, u64::MAX));
 		assert_eq!(Assets::balance(0, 1), 0);
 	});
 }
@@ -502,7 +502,7 @@ fn burning_asset_balance_with_zero_balance_does_nothing() {
 		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
 		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
 		assert_eq!(Assets::balance(0, 2), 0);
-		assert_ok!(Assets::burn(Origin::signed(1), 0, 2, u64::max_value()));
+		assert_ok!(Assets::burn(Origin::signed(1), 0, 2, u64::MAX));
 		assert_eq!(Assets::balance(0, 2), 0);
 		assert_eq!(Assets::total_supply(0), 100);
 	});
diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index a8d0bba9632d..6c1cc89cf1ed 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -184,7 +184,7 @@ parameter_types! {
 	pub const RewardCurve: &'static PiecewiseLinear<'static> = &REWARD_CURVE;
 	pub const MaxNominatorRewardedPerValidator: u32 = 64;
 	pub const ElectionLookahead: u64 = 0;
-	pub const StakingUnsignedPriority: u64 = u64::max_value() / 2;
+	pub const StakingUnsignedPriority: u64 = u64::MAX / 2;
 }
 
 impl onchain::Config for Test {
diff --git a/frame/balances/src/tests.rs b/frame/balances/src/tests.rs
index 3598595c7649..c98b0ecf02bf 100644
--- a/frame/balances/src/tests.rs
+++ b/frame/balances/src/tests.rs
@@ -87,7 +87,7 @@ macro_rules! decl_tests {
 		#[test]
 		fn lock_removal_should_work() {
 			<$ext_builder>::default().existential_deposit(1).monied(true).build().execute_with(|| {
-				Balances::set_lock(ID_1, &1, u64::max_value(), WithdrawReasons::all());
+				Balances::set_lock(ID_1, &1, u64::MAX, WithdrawReasons::all());
 				Balances::remove_lock(ID_1, &1);
 				assert_ok!(<Balances as Currency<_>>::transfer(&1, &2, 1, AllowDeath));
 			});
@@ -96,7 +96,7 @@ macro_rules! decl_tests {
 		#[test]
 		fn lock_replacement_should_work() {
 			<$ext_builder>::default().existential_deposit(1).monied(true).build().execute_with(|| {
-				Balances::set_lock(ID_1, &1, u64::max_value(), WithdrawReasons::all());
+				Balances::set_lock(ID_1, &1, u64::MAX, WithdrawReasons::all());
 				Balances::set_lock(ID_1, &1, 5, WithdrawReasons::all());
 				assert_ok!(<Balances as Currency<_>>::transfer(&1, &2, 1, AllowDeath));
 			});
@@ -114,7 +114,7 @@ macro_rules! decl_tests {
 		#[test]
 		fn combination_locking_should_work() {
 			<$ext_builder>::default().existential_deposit(1).monied(true).build().execute_with(|| {
-				Balances::set_lock(ID_1, &1, u64::max_value(), WithdrawReasons::empty());
+				Balances::set_lock(ID_1, &1, u64::MAX, WithdrawReasons::empty());
 				Balances::set_lock(ID_2, &1, 0, WithdrawReasons::all());
 				assert_ok!(<Balances as Currency<_>>::transfer(&1, &2, 1, AllowDeath));
 			});
@@ -513,15 +513,15 @@ macro_rules! decl_tests {
 		#[test]
 		fn transferring_too_high_value_should_not_panic() {
 			<$ext_builder>::default().build().execute_with(|| {
-				Balances::make_free_balance_be(&1, u64::max_value());
+				Balances::make_free_balance_be(&1, u64::MAX);
 				Balances::make_free_balance_be(&2, 1);
 
 				assert_err!(
-					Balances::transfer(Some(1).into(), 2, u64::max_value()),
+					Balances::transfer(Some(1).into(), 2, u64::MAX),
 					ArithmeticError::Overflow,
 				);
 
-				assert_eq!(Balances::free_balance(1), u64::max_value());
+				assert_eq!(Balances::free_balance(1), u64::MAX);
 				assert_eq!(Balances::free_balance(2), 1);
 			});
 		}
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index bb04e9b2cf32..7b77569a1f6d 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -116,7 +116,7 @@ where
 				// storage_size cannot be zero because otherwise a contract that is just above
 				// the subsistence threshold does not pay rent given a large enough subsistence
 				// threshold. But we need rent payments to occur in order to benchmark for worst cases.
-				let storage_size = u32::max_value() / 10;
+				let storage_size = u32::MAX / 10;
 
 				// Endowment should be large but not as large to inhibit rent payments.
 				// Balance will only cover half the storage
diff --git a/frame/contracts/src/chain_extension.rs b/frame/contracts/src/chain_extension.rs
index d2839dfdbc2e..ac71eca27b1c 100644
--- a/frame/contracts/src/chain_extension.rs
+++ b/frame/contracts/src/chain_extension.rs
@@ -334,7 +334,7 @@ where
 	///
 	/// If the contract supplied buffer is smaller than the passed `buffer` an `Err` is returned.
 	/// If `allow_skip` is set to true the contract is allowed to skip the copying of the buffer
-	/// by supplying the guard value of `u32::max_value()` as `out_ptr`. The
+	/// by supplying the guard value of `u32::MAX` as `out_ptr`. The
 	/// `weight_per_byte` is only charged when the write actually happens and is not skipped or
 	/// failed due to a too small output buffer.
 	pub fn write(
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index 7ca6dfed1581..8d1782e84d60 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -550,7 +550,7 @@ where
 	/// length of the buffer located at `out_ptr`. If that buffer is large enough the actual
 	/// `buf.len()` is written to this location.
 	///
-	/// If `out_ptr` is set to the sentinel value of `u32::max_value()` and `allow_skip` is true the
+	/// If `out_ptr` is set to the sentinel value of `u32::MAX` and `allow_skip` is true the
 	/// operation is skipped and `Ok` is returned. This is supposed to help callers to make copying
 	/// output optional. For example to skip copying back the output buffer of an `seal_call`
 	/// when the caller is not interested in the result.
@@ -570,7 +570,7 @@ where
 		create_token: impl FnOnce(u32) -> Option<RuntimeCosts>,
 	) -> Result<(), DispatchError>
 	{
-		if allow_skip && out_ptr == u32::max_value() {
+		if allow_skip && out_ptr == u32::MAX {
 			return Ok(());
 		}
 
@@ -892,7 +892,7 @@ define_env!(Env, <E: Ext>,
 	//
 	// The callees output buffer is copied to `output_ptr` and its length to `output_len_ptr`.
 	// The copy of the output buffer can be skipped by supplying the sentinel value
-	// of `u32::max_value()` to `output_ptr`.
+	// of `u32::MAX` to `output_ptr`.
 	//
 	// # Parameters
 	//
@@ -953,7 +953,7 @@ define_env!(Env, <E: Ext>,
 	// by the code hash. The address of this new account is copied to `address_ptr` and its length
 	// to `address_len_ptr`. The constructors output buffer is copied to `output_ptr` and its
 	// length to `output_len_ptr`. The copy of the output buffer and address can be skipped by
-	// supplying the sentinel value of `u32::max_value()` to `output_ptr` or `address_ptr`.
+	// supplying the sentinel value of `u32::MAX` to `output_ptr` or `address_ptr`.
 	//
 	// After running the constructor it is verified that the contract account holds at
 	// least the subsistence threshold. If that is not the case the instantiation fails and
diff --git a/frame/democracy/src/benchmarking.rs b/frame/democracy/src/benchmarking.rs
index 6cf35553f536..d1d3b3e62bdd 100644
--- a/frame/democracy/src/benchmarking.rs
+++ b/frame/democracy/src/benchmarking.rs
@@ -118,13 +118,13 @@ benchmarks! {
 		// Create s existing "seconds"
 		for i in 0 .. s {
 			let seconder = funded_account::<T>("seconder", i);
-			Democracy::<T>::second(RawOrigin::Signed(seconder).into(), 0, u32::max_value())?;
+			Democracy::<T>::second(RawOrigin::Signed(seconder).into(), 0, u32::MAX)?;
 		}
 
 		let deposits = Democracy::<T>::deposit_of(0).ok_or("Proposal not created")?;
 		assert_eq!(deposits.0.len(), (s + 1) as usize, "Seconds not recorded");
 		whitelist_account!(caller);
-	}: _(RawOrigin::Signed(caller), 0, u32::max_value())
+	}: _(RawOrigin::Signed(caller), 0, u32::MAX)
 	verify {
 		let deposits = Democracy::<T>::deposit_of(0).ok_or("Proposal not created")?;
 		assert_eq!(deposits.0.len(), (s + 2) as usize, "`second` benchmark did not work");
@@ -609,7 +609,7 @@ benchmarks! {
 
 		let caller = funded_account::<T>("caller", 0);
 		whitelist_account!(caller);
-	}: _(RawOrigin::Signed(caller), proposal_hash.clone(), u32::max_value())
+	}: _(RawOrigin::Signed(caller), proposal_hash.clone(), u32::MAX)
 	verify {
 		let proposal_hash = T::Hashing::hash(&encoded_proposal[..]);
 		assert!(!Preimages::<T>::contains_key(proposal_hash));
diff --git a/frame/democracy/src/tests/decoders.rs b/frame/democracy/src/tests/decoders.rs
index 32e5e3ecf7ae..c3eb9ca7e332 100644
--- a/frame/democracy/src/tests/decoders.rs
+++ b/frame/democracy/src/tests/decoders.rs
@@ -23,11 +23,11 @@ use frame_support::storage::{migration, unhashed};
 #[test]
 fn test_decode_compact_u32_at() {
 	new_test_ext().execute_with(|| {
-		let v = codec::Compact(u64::max_value());
+		let v = codec::Compact(u64::MAX);
 		migration::put_storage_value(b"test", b"", &[], v);
 		assert_eq!(decode_compact_u32_at(b"test"), None);
 
-		for v in vec![0, 10, u32::max_value()] {
+		for v in vec![0, 10, u32::MAX] {
 			let compact_v = codec::Compact(v);
 			unhashed::put(b"test", &compact_v);
 			assert_eq!(decode_compact_u32_at(b"test"), Some(v));
diff --git a/frame/democracy/src/tests/preimage.rs b/frame/democracy/src/tests/preimage.rs
index 135b167520be..a412343299d9 100644
--- a/frame/democracy/src/tests/preimage.rs
+++ b/frame/democracy/src/tests/preimage.rs
@@ -81,11 +81,11 @@ fn preimage_deposit_should_be_reapable_earlier_by_owner() {
 
 		next_block();
 		assert_noop!(
-			Democracy::reap_preimage(Origin::signed(6), set_balance_proposal_hash(2), u32::max_value()),
+			Democracy::reap_preimage(Origin::signed(6), set_balance_proposal_hash(2), u32::MAX),
 			Error::<Test>::TooEarly
 		);
 		next_block();
-		assert_ok!(Democracy::reap_preimage(Origin::signed(6), set_balance_proposal_hash(2), u32::max_value()));
+		assert_ok!(Democracy::reap_preimage(Origin::signed(6), set_balance_proposal_hash(2), u32::MAX));
 
 		assert_eq!(Balances::free_balance(6), 60);
 		assert_eq!(Balances::reserved_balance(6), 0);
@@ -96,7 +96,7 @@ fn preimage_deposit_should_be_reapable_earlier_by_owner() {
 fn preimage_deposit_should_be_reapable() {
 	new_test_ext_execute_with_cond(|operational| {
 		assert_noop!(
-				Democracy::reap_preimage(Origin::signed(5), set_balance_proposal_hash(2), u32::max_value()),
+				Democracy::reap_preimage(Origin::signed(5), set_balance_proposal_hash(2), u32::MAX),
 				Error::<Test>::PreimageMissing
 			);
 
@@ -111,12 +111,12 @@ fn preimage_deposit_should_be_reapable() {
 		next_block();
 		next_block();
 		assert_noop!(
-				Democracy::reap_preimage(Origin::signed(5), set_balance_proposal_hash(2), u32::max_value()),
+				Democracy::reap_preimage(Origin::signed(5), set_balance_proposal_hash(2), u32::MAX),
 				Error::<Test>::TooEarly
 			);
 
 		next_block();
-		assert_ok!(Democracy::reap_preimage(Origin::signed(5), set_balance_proposal_hash(2), u32::max_value()));
+		assert_ok!(Democracy::reap_preimage(Origin::signed(5), set_balance_proposal_hash(2), u32::MAX));
 		assert_eq!(Balances::reserved_balance(6), 0);
 		assert_eq!(Balances::free_balance(6), 48);
 		assert_eq!(Balances::free_balance(5), 62);
@@ -161,7 +161,7 @@ fn reaping_imminent_preimage_should_fail() {
 		assert_ok!(Democracy::vote(Origin::signed(1), r, aye(1)));
 		next_block();
 		next_block();
-		assert_noop!(Democracy::reap_preimage(Origin::signed(6), h, u32::max_value()), Error::<Test>::Imminent);
+		assert_noop!(Democracy::reap_preimage(Origin::signed(6), h, u32::MAX), Error::<Test>::Imminent);
 	});
 }
 
diff --git a/frame/democracy/src/tests/public_proposals.rs b/frame/democracy/src/tests/public_proposals.rs
index 4a4827ac7e9c..1d323d684d7f 100644
--- a/frame/democracy/src/tests/public_proposals.rs
+++ b/frame/democracy/src/tests/public_proposals.rs
@@ -35,10 +35,10 @@ fn backing_for_should_work() {
 fn deposit_for_proposals_should_be_taken() {
 	new_test_ext().execute_with(|| {
 		assert_ok!(propose_set_balance_and_note(1, 2, 5));
-		assert_ok!(Democracy::second(Origin::signed(2), 0, u32::max_value()));
-		assert_ok!(Democracy::second(Origin::signed(5), 0, u32::max_value()));
-		assert_ok!(Democracy::second(Origin::signed(5), 0, u32::max_value()));
-		assert_ok!(Democracy::second(Origin::signed(5), 0, u32::max_value()));
+		assert_ok!(Democracy::second(Origin::signed(2), 0, u32::MAX));
+		assert_ok!(Democracy::second(Origin::signed(5), 0, u32::MAX));
+		assert_ok!(Democracy::second(Origin::signed(5), 0, u32::MAX));
+		assert_ok!(Democracy::second(Origin::signed(5), 0, u32::MAX));
 		assert_eq!(Balances::free_balance(1), 5);
 		assert_eq!(Balances::free_balance(2), 15);
 		assert_eq!(Balances::free_balance(5), 35);
@@ -49,10 +49,10 @@ fn deposit_for_proposals_should_be_taken() {
 fn deposit_for_proposals_should_be_returned() {
 	new_test_ext().execute_with(|| {
 		assert_ok!(propose_set_balance_and_note(1, 2, 5));
-		assert_ok!(Democracy::second(Origin::signed(2), 0, u32::max_value()));
-		assert_ok!(Democracy::second(Origin::signed(5), 0, u32::max_value()));
-		assert_ok!(Democracy::second(Origin::signed(5), 0, u32::max_value()));
-		assert_ok!(Democracy::second(Origin::signed(5), 0, u32::max_value()));
+		assert_ok!(Democracy::second(Origin::signed(2), 0, u32::MAX));
+		assert_ok!(Democracy::second(Origin::signed(5), 0, u32::MAX));
+		assert_ok!(Democracy::second(Origin::signed(5), 0, u32::MAX));
+		assert_ok!(Democracy::second(Origin::signed(5), 0, u32::MAX));
 		fast_forward_to(3);
 		assert_eq!(Balances::free_balance(1), 10);
 		assert_eq!(Balances::free_balance(2), 20);
@@ -79,7 +79,7 @@ fn poor_seconder_should_not_work() {
 	new_test_ext().execute_with(|| {
 		assert_ok!(propose_set_balance_and_note(2, 2, 11));
 		assert_noop!(
-			Democracy::second(Origin::signed(1), 0, u32::max_value()),
+			Democracy::second(Origin::signed(1), 0, u32::MAX),
 			BalancesError::<Test, _>::InsufficientBalance
 		);
 	});
diff --git a/frame/example/src/tests.rs b/frame/example/src/tests.rs
index a290ea0f6576..c699a0bfad36 100644
--- a/frame/example/src/tests.rs
+++ b/frame/example/src/tests.rs
@@ -166,7 +166,7 @@ fn signed_ext_watch_dummy_works() {
 			WatchDummy::<Test>(PhantomData).validate(&1, &call, &info, 150)
 				.unwrap()
 				.priority,
-			u64::max_value(),
+			u64::MAX,
 		);
 		assert_eq!(
 			WatchDummy::<Test>(PhantomData).validate(&1, &call, &info, 250),
diff --git a/frame/grandpa/src/mock.rs b/frame/grandpa/src/mock.rs
index 9206b3ff2dfa..ebe5996c9dab 100644
--- a/frame/grandpa/src/mock.rs
+++ b/frame/grandpa/src/mock.rs
@@ -190,7 +190,7 @@ parameter_types! {
 	pub const RewardCurve: &'static PiecewiseLinear<'static> = &REWARD_CURVE;
 	pub const MaxNominatorRewardedPerValidator: u32 = 64;
 	pub const ElectionLookahead: u64 = 0;
-	pub const StakingUnsignedPriority: u64 = u64::max_value() / 2;
+	pub const StakingUnsignedPriority: u64 = u64::MAX / 2;
 }
 
 impl onchain::Config for Test {
diff --git a/frame/staking/reward-curve/src/lib.rs b/frame/staking/reward-curve/src/lib.rs
index 5ce6d0c3a867..de912eee99ce 100644
--- a/frame/staking/reward-curve/src/lib.rs
+++ b/frame/staking/reward-curve/src/lib.rs
@@ -275,7 +275,7 @@ impl INPoS {
 	// See web3 docs for the details
 	fn compute_opposite_after_x_ideal(&self, y: u32) -> u32 {
 		if y == self.i_0 {
-			return u32::max_value();
+			return u32::MAX;
 		}
 		// Note: the log term calculated here represents a per_million value
 		let log = log2(self.i_ideal_times_x_ideal - self.i_0, y - self.i_0);
@@ -408,7 +408,7 @@ fn generate_test_module(input: &INposInput) -> TokenStream2 {
 
 			#[test]
 			fn reward_curve_precision() {
-				for &base in [MILLION, u32::max_value()].iter() {
+				for &base in [MILLION, u32::MAX].iter() {
 					let number_of_check = 100_000.min(base);
 					for check_index in 0..=number_of_check {
 						let i = (check_index as u64 * base as u64 / number_of_check as u64) as u32;
diff --git a/frame/staking/reward-curve/src/log.rs b/frame/staking/reward-curve/src/log.rs
index 28acd5deed2b..747011a73e1d 100644
--- a/frame/staking/reward-curve/src/log.rs
+++ b/frame/staking/reward-curve/src/log.rs
@@ -33,7 +33,7 @@ fn taylor_term(k: u32, y_num: u128, y_den: u128) -> u32 {
 /// * result represents a per-million output of log2
 pub fn log2(p: u32, q: u32) -> u32 {
 	assert!(p >= q); // keep p/q bound to [1, inf)
-	assert!(p <= u32::max_value()/2);
+	assert!(p <= u32::MAX/2);
 
 	// This restriction should not be mandatory. But function is only tested and used for this.
 	assert!(p <= 1_000_000);
diff --git a/frame/staking/src/benchmarking.rs b/frame/staking/src/benchmarking.rs
index 8adf797abe9e..f7545b07c90a 100644
--- a/frame/staking/src/benchmarking.rs
+++ b/frame/staking/src/benchmarking.rs
@@ -79,9 +79,9 @@ pub fn create_validator_with_nominators<T: Config>(
 	// Give the validator n nominators, but keep total users in the system the same.
 	for i in 0 .. upper_bound {
 		let (n_stash, n_controller) = if !dead {
-			create_stash_controller::<T>(u32::max_value() - i, 100, destination.clone())?
+			create_stash_controller::<T>(u32::MAX - i, 100, destination.clone())?
 		} else {
-			create_stash_and_dead_controller::<T>(u32::max_value() - i, 100, destination.clone())?
+			create_stash_and_dead_controller::<T>(u32::MAX - i, 100, destination.clone())?
 		};
 		if i < n {
 			Staking::<T>::nominate(RawOrigin::Signed(n_controller.clone()).into(), vec![stash_lookup.clone()])?;
@@ -456,7 +456,7 @@ benchmarks! {
 			<ErasTotalStake<T>>::insert(i, BalanceOf::<T>::one());
 			ErasStartSessionIndex::<T>::insert(i, i);
 		}
-	}: _(RawOrigin::Root, EraIndex::zero(), u32::max_value())
+	}: _(RawOrigin::Root, EraIndex::zero(), u32::MAX)
 	verify {
 		assert_eq!(HistoryDepth::<T>::get(), 0);
 	}
@@ -607,13 +607,13 @@ benchmarks! {
 		RawOrigin::Root,
 		BalanceOf::<T>::max_value(),
 		BalanceOf::<T>::max_value(),
-		Some(u32::max_value()),
-		Some(u32::max_value())
+		Some(u32::MAX),
+		Some(u32::MAX)
 	) verify {
 		assert_eq!(MinNominatorBond::<T>::get(), BalanceOf::<T>::max_value());
 		assert_eq!(MinValidatorBond::<T>::get(), BalanceOf::<T>::max_value());
-		assert_eq!(MaxNominatorsCount::<T>::get(), Some(u32::max_value()));
-		assert_eq!(MaxValidatorsCount::<T>::get(), Some(u32::max_value()));
+		assert_eq!(MaxNominatorsCount::<T>::get(), Some(u32::MAX));
+		assert_eq!(MaxValidatorsCount::<T>::get(), Some(u32::MAX));
 	}
 
 	chill_other {
diff --git a/frame/staking/src/testing_utils.rs b/frame/staking/src/testing_utils.rs
index c643cb283373..18b77d59b3e2 100644
--- a/frame/staking/src/testing_utils.rs
+++ b/frame/staking/src/testing_utils.rs
@@ -150,7 +150,7 @@ pub fn create_validators_with_nominators_for_era<T: Config>(
 	for j in 0 .. nominators {
 		let balance_factor = if randomize_stake { rng.next_u32() % 255 + 10 } else { 100u32 };
 		let (_n_stash, n_controller) = create_stash_controller::<T>(
-			u32::max_value() - j,
+			u32::MAX - j,
 			balance_factor,
 			RewardDestination::Staked,
 		)?;
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index 5d42d866b133..e314a70399fd 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -1960,8 +1960,8 @@ fn phragmen_should_not_overflow() {
 #[test]
 fn reward_validator_slashing_validator_does_not_overflow() {
 	ExtBuilder::default().build_and_execute(|| {
-		let stake = u64::max_value() as Balance * 2;
-		let reward_slash = u64::max_value() as Balance * 2;
+		let stake = u64::MAX as Balance * 2;
+		let reward_slash = u64::MAX as Balance * 2;
 
 		// Assert multiplication overflows in balance arithmetic.
 		assert!(stake.checked_mul(reward_slash).is_none());
@@ -3995,7 +3995,7 @@ mod election_data_provider {
 			);
 
 			Staking::force_no_eras(Origin::root()).unwrap();
-			assert_eq!(Staking::next_election_prediction(System::block_number()), u64::max_value());
+			assert_eq!(Staking::next_election_prediction(System::block_number()), u64::MAX);
 
 			Staking::force_new_era_always(Origin::root()).unwrap();
 			assert_eq!(Staking::next_election_prediction(System::block_number()), 45 + 5);
diff --git a/frame/support/src/traits/voting.rs b/frame/support/src/traits/voting.rs
index b6913a182d30..f5afbac12955 100644
--- a/frame/support/src/traits/voting.rs
+++ b/frame/support/src/traits/voting.rs
@@ -42,20 +42,20 @@ pub trait CurrencyToVote<B> {
 
 /// An implementation of `CurrencyToVote` tailored for chain's that have a balance type of u128.
 ///
-/// The factor is the `(total_issuance / u64::max()).max(1)`, represented as u64. Let's look at the
+/// The factor is the `(total_issuance / u64::MAX).max(1)`, represented as u64. Let's look at the
 /// important cases:
 ///
-/// If the chain's total issuance is less than u64::max(), this will always be 1, which means that
+/// If the chain's total issuance is less than u64::MAX, this will always be 1, which means that
 /// the factor will not have any effect. In this case, any account's balance is also less. Thus,
 /// both of the conversions are basically an `as`; Any balance can fit in u64.
 ///
-/// If the chain's total issuance is more than 2*u64::max(), then a factor might be multiplied and
+/// If the chain's total issuance is more than 2*u64::MAX, then a factor might be multiplied and
 /// divided upon conversion.
 pub struct U128CurrencyToVote;
 
 impl U128CurrencyToVote {
 	fn factor(issuance: u128) -> u128 {
-		(issuance / u64::max_value() as u128).max(1)
+		(issuance / u64::MAX as u128).max(1)
 	}
 }
 
diff --git a/frame/support/src/weights.rs b/frame/support/src/weights.rs
index 9337ec330d1c..2b7cff8c6168 100644
--- a/frame/support/src/weights.rs
+++ b/frame/support/src/weights.rs
@@ -278,7 +278,7 @@ impl<'a> OneOrMany<DispatchClass> for &'a [DispatchClass] {
 
 /// Primitives related to priority management of Frame.
 pub mod priority {
-	/// The starting point of all Operational transactions. 3/4 of u64::max_value().
+	/// The starting point of all Operational transactions. 3/4 of u64::MAX.
 	pub const LIMIT: u64 = 13_835_058_055_282_163_711_u64;
 
 	/// Wrapper for priority of different dispatch classes.
diff --git a/frame/support/test/tests/pallet_with_name_trait_is_valid.rs b/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
index e7f44c4b9651..6f35b122f639 100644
--- a/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
+++ b/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
@@ -43,7 +43,7 @@ frame_support::decl_module! {
 	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
 		fn deposit_event() = default;
 		type Error = Error<T>;
-		const Foo: u32 = u32::max_value();
+		const Foo: u32 = u32::MAX;
 
 		#[weight = 0]
 		fn accumulate_dummy(_origin, _increase_by: T::Balance) {
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index 17ea3a71bec8..f96c43ee1c98 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -778,7 +778,7 @@ fn hash69<T: AsMut<[u8]> + Default>() -> T {
 /// This type alias represents an index of an event.
 ///
 /// We use `u32` here because this index is used as index for `Events<T>`
-/// which can't contain more than `u32::max_value()` items.
+/// which can't contain more than `u32::MAX` items.
 type EventIndex = u32;
 
 /// Type used to encode the number of references an account has.
diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
index 1ce3f75d5a01..17a4c8f81c96 100644
--- a/frame/transaction-payment/src/lib.rs
+++ b/frame/transaction-payment/src/lib.rs
@@ -1142,11 +1142,11 @@ mod tests {
 			};
 			assert_eq!(
 				Module::<Runtime>::compute_fee(
-					<u32>::max_value(),
+					u32::MAX,
 					&dispatch_info,
-					<u64>::max_value()
+					u64::MAX
 				),
-				<u64>::max_value()
+				u64::MAX
 			);
 		});
 	}
diff --git a/frame/treasury/src/tests.rs b/frame/treasury/src/tests.rs
index 408f99f29e1b..e4b6f2d664fc 100644
--- a/frame/treasury/src/tests.rs
+++ b/frame/treasury/src/tests.rs
@@ -367,8 +367,8 @@ fn genesis_funding_works() {
 #[test]
 fn max_approvals_limited() {
 	new_test_ext().execute_with(|| {
-		Balances::make_free_balance_be(&Treasury::account_id(), u64::max_value());
-		Balances::make_free_balance_be(&0, u64::max_value());
+		Balances::make_free_balance_be(&Treasury::account_id(), u64::MAX);
+		Balances::make_free_balance_be(&0, u64::MAX);
 
 		for _ in 0 .. MaxApprovals::get() {
 			assert_ok!(Treasury::propose_spend(Origin::signed(0), 100, 3));
diff --git a/primitives/allocator/src/freeing_bump.rs b/primitives/allocator/src/freeing_bump.rs
index e2a6b19e4a7f..36f5bb9c65c0 100644
--- a/primitives/allocator/src/freeing_bump.rs
+++ b/primitives/allocator/src/freeing_bump.rs
@@ -179,7 +179,7 @@ impl Order {
 }
 
 /// A special magic value for a pointer in a link that denotes the end of the linked list.
-const NIL_MARKER: u32 = u32::max_value();
+const NIL_MARKER: u32 = u32::MAX;
 
 /// A link between headers in the free list.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
diff --git a/primitives/arithmetic/fuzzer/src/multiply_by_rational.rs b/primitives/arithmetic/fuzzer/src/multiply_by_rational.rs
index 40f315ce755d..a1689716b56c 100644
--- a/primitives/arithmetic/fuzzer/src/multiply_by_rational.rs
+++ b/primitives/arithmetic/fuzzer/src/multiply_by_rational.rs
@@ -70,7 +70,7 @@ fn mul_div(a: u128, b: u128, c: u128) -> u128 {
 	let ce: U256 = c.into();
 
 	let r = ae * be / ce;
-	if r > u128::max_value().into() {
+	if r > u128::MAX.into() {
 		a
 	} else {
 		r.as_u128()
diff --git a/primitives/arithmetic/src/biguint.rs b/primitives/arithmetic/src/biguint.rs
index bfbd57f57013..859cf829246f 100644
--- a/primitives/arithmetic/src/biguint.rs
+++ b/primitives/arithmetic/src/biguint.rs
@@ -342,7 +342,7 @@ impl BigUint {
 			// step D3.0 Find an estimate of q[j], named qhat.
 			let (qhat, rhat) = {
 				// PROOF: this always fits into `Double`. In the context of Single = u8, and
-				// Double = u16, think of 255 * 256 + 255 which is just u16::max_value().
+				// Double = u16, think of 255 * 256 + 255 which is just u16::MAX.
 				let dividend =
 					Double::from(self_norm.get(j + n))
 						* B
@@ -668,14 +668,14 @@ pub mod tests {
 	fn can_try_build_numbers_from_types() {
 		use sp_std::convert::TryFrom;
 		assert_eq!(u64::try_from(with_limbs(1)).unwrap(), 1);
-		assert_eq!(u64::try_from(with_limbs(2)).unwrap(), u32::max_value() as u64 + 2);
+		assert_eq!(u64::try_from(with_limbs(2)).unwrap(), u32::MAX as u64 + 2);
 		assert_eq!(
 			u64::try_from(with_limbs(3)).unwrap_err(),
 			"cannot fit a number into u64",
 		);
 		assert_eq!(
 			u128::try_from(with_limbs(3)).unwrap(),
-			u32::max_value() as u128 + u64::max_value() as u128 + 3
+			u32::MAX as u128 + u64::MAX as u128 + 3
 		);
 	}
 
diff --git a/primitives/arithmetic/src/fixed_point.rs b/primitives/arithmetic/src/fixed_point.rs
index ec2c28f35f1c..4940c7751aa1 100644
--- a/primitives/arithmetic/src/fixed_point.rs
+++ b/primitives/arithmetic/src/fixed_point.rs
@@ -619,23 +619,23 @@ macro_rules! implement_fixed {
 				assert_eq!(from_i129::<u128>(a), None);
 
 				let a = I129 {
-					value: u128::max_value() - 1,
+					value: u128::MAX - 1,
 					negative: false,
 				};
 
 				// Max - 1 value fits.
-				assert_eq!(from_i129::<u128>(a), Some(u128::max_value() - 1));
+				assert_eq!(from_i129::<u128>(a), Some(u128::MAX - 1));
 
 				let a = I129 {
-					value: u128::max_value(),
+					value: u128::MAX,
 					negative: false,
 				};
 
 				// Max value fits.
-				assert_eq!(from_i129::<u128>(a), Some(u128::max_value()));
+				assert_eq!(from_i129::<u128>(a), Some(u128::MAX));
 
 				let a = I129 {
-					value: i128::max_value() as u128 + 1,
+					value: i128::MAX as u128 + 1,
 					negative: true,
 				};
 
@@ -643,7 +643,7 @@ macro_rules! implement_fixed {
 				assert_eq!(from_i129::<i128>(a), Some(i128::min_value()));
 
 				let a = I129 {
-					value: i128::max_value() as u128 + 1,
+					value: i128::MAX as u128 + 1,
 					negative: false,
 				};
 
@@ -651,12 +651,12 @@ macro_rules! implement_fixed {
 				assert_eq!(from_i129::<i128>(a), None);
 
 				let a = I129 {
-					value: i128::max_value() as u128,
+					value: i128::MAX as u128,
 					negative: false,
 				};
 
 				// Max value fits.
-				assert_eq!(from_i129::<i128>(a), Some(i128::max_value()));
+				assert_eq!(from_i129::<i128>(a), Some(i128::MAX));
 			}
 
 			#[test]
@@ -665,13 +665,13 @@ macro_rules! implement_fixed {
 				let b = 1i32;
 
 				// Pos + Pos => Max.
-				assert_eq!(to_bound::<_, _, i32>(a, b), i32::max_value());
+				assert_eq!(to_bound::<_, _, i32>(a, b), i32::MAX);
 
 				let a = -1i32;
 				let b = -1i32;
 
 				// Neg + Neg => Max.
-				assert_eq!(to_bound::<_, _, i32>(a, b), i32::max_value());
+				assert_eq!(to_bound::<_, _, i32>(a, b), i32::MAX);
 
 				let a = 1i32;
 				let b = -1i32;
@@ -1084,11 +1084,11 @@ macro_rules! implement_fixed {
 			fn checked_mul_int_works() {
 				let a = $name::saturating_from_integer(2);
 				// Max - 1.
-				assert_eq!(a.checked_mul_int((i128::max_value() - 1) / 2), Some(i128::max_value() - 1));
+				assert_eq!(a.checked_mul_int((i128::MAX - 1) / 2), Some(i128::MAX - 1));
 				// Max.
-				assert_eq!(a.checked_mul_int(i128::max_value() / 2), Some(i128::max_value() - 1));
+				assert_eq!(a.checked_mul_int(i128::MAX / 2), Some(i128::MAX - 1));
 				// Max + 1 => None.
-				assert_eq!(a.checked_mul_int(i128::max_value() / 2 + 1), None);
+				assert_eq!(a.checked_mul_int(i128::MAX / 2 + 1), None);
 
 				if $name::SIGNED {
 					// Min - 1.
@@ -1100,20 +1100,20 @@ macro_rules! implement_fixed {
 
 					let b = $name::saturating_from_rational(1, -2);
 					assert_eq!(b.checked_mul_int(42i128), Some(-21));
-					assert_eq!(b.checked_mul_int(u128::max_value()), None);
-					assert_eq!(b.checked_mul_int(i128::max_value()), Some(i128::max_value() / -2));
+					assert_eq!(b.checked_mul_int(u128::MAX), None);
+					assert_eq!(b.checked_mul_int(i128::MAX), Some(i128::MAX / -2));
 					assert_eq!(b.checked_mul_int(i128::min_value()), Some(i128::min_value() / -2));
 				}
 
 				let a = $name::saturating_from_rational(1, 2);
 				assert_eq!(a.checked_mul_int(42i128), Some(21));
-				assert_eq!(a.checked_mul_int(i128::max_value()), Some(i128::max_value() / 2));
+				assert_eq!(a.checked_mul_int(i128::MAX), Some(i128::MAX / 2));
 				assert_eq!(a.checked_mul_int(i128::min_value()), Some(i128::min_value() / 2));
 
 				let c = $name::saturating_from_integer(255);
 				assert_eq!(c.checked_mul_int(2i8), None);
 				assert_eq!(c.checked_mul_int(2i128), Some(510));
-				assert_eq!(c.checked_mul_int(i128::max_value()), None);
+				assert_eq!(c.checked_mul_int(i128::MAX), None);
 				assert_eq!(c.checked_mul_int(i128::min_value()), None);
 			}
 
@@ -1121,11 +1121,11 @@ macro_rules! implement_fixed {
 			fn saturating_mul_int_works() {
 				let a = $name::saturating_from_integer(2);
 				// Max - 1.
-				assert_eq!(a.saturating_mul_int((i128::max_value() - 1) / 2), i128::max_value() - 1);
+				assert_eq!(a.saturating_mul_int((i128::MAX - 1) / 2), i128::MAX - 1);
 				// Max.
-				assert_eq!(a.saturating_mul_int(i128::max_value() / 2), i128::max_value() - 1);
+				assert_eq!(a.saturating_mul_int(i128::MAX / 2), i128::MAX - 1);
 				// Max + 1 => saturates to max.
-				assert_eq!(a.saturating_mul_int(i128::max_value() / 2 + 1), i128::max_value());
+				assert_eq!(a.saturating_mul_int(i128::MAX / 2 + 1), i128::MAX);
 
 				// Min - 1.
 				assert_eq!(a.saturating_mul_int((i128::min_value() + 1) / 2), i128::min_value() + 2);
@@ -1137,20 +1137,20 @@ macro_rules! implement_fixed {
 				if $name::SIGNED {
 					let b = $name::saturating_from_rational(1, -2);
 					assert_eq!(b.saturating_mul_int(42i32), -21);
-					assert_eq!(b.saturating_mul_int(i128::max_value()), i128::max_value() / -2);
+					assert_eq!(b.saturating_mul_int(i128::MAX), i128::MAX / -2);
 					assert_eq!(b.saturating_mul_int(i128::min_value()), i128::min_value() / -2);
-					assert_eq!(b.saturating_mul_int(u128::max_value()), u128::min_value());
+					assert_eq!(b.saturating_mul_int(u128::MAX), u128::min_value());
 				}
 
 				let a = $name::saturating_from_rational(1, 2);
 				assert_eq!(a.saturating_mul_int(42i32), 21);
-				assert_eq!(a.saturating_mul_int(i128::max_value()), i128::max_value() / 2);
+				assert_eq!(a.saturating_mul_int(i128::MAX), i128::MAX / 2);
 				assert_eq!(a.saturating_mul_int(i128::min_value()), i128::min_value() / 2);
 
 				let c = $name::saturating_from_integer(255);
-				assert_eq!(c.saturating_mul_int(2i8), i8::max_value());
+				assert_eq!(c.saturating_mul_int(2i8), i8::MAX);
 				assert_eq!(c.saturating_mul_int(-2i8), i8::min_value());
-				assert_eq!(c.saturating_mul_int(i128::max_value()), i128::max_value());
+				assert_eq!(c.saturating_mul_int(i128::MAX), i128::MAX);
 				assert_eq!(c.saturating_mul_int(i128::min_value()), i128::min_value());
 			}
 
@@ -1223,7 +1223,7 @@ macro_rules! implement_fixed {
 				assert_eq!(e.checked_div_int(2.into()), Some(3));
 				assert_eq!(f.checked_div_int(2.into()), Some(2));
 
-				assert_eq!(a.checked_div_int(i128::max_value()), Some(0));
+				assert_eq!(a.checked_div_int(i128::MAX), Some(0));
 				assert_eq!(a.checked_div_int(2), Some(inner_max / (2 * accuracy)));
 				assert_eq!(a.checked_div_int(inner_max / accuracy), Some(1));
 				assert_eq!(a.checked_div_int(1i8), None);
@@ -1244,11 +1244,11 @@ macro_rules! implement_fixed {
 				assert_eq!(b.checked_div_int(2), Some(inner_min / (2 * accuracy)));
 
 				assert_eq!(c.checked_div_int(1), Some(0));
-				assert_eq!(c.checked_div_int(i128::max_value()), Some(0));
+				assert_eq!(c.checked_div_int(i128::MAX), Some(0));
 				assert_eq!(c.checked_div_int(1i8), Some(0));
 
 				assert_eq!(d.checked_div_int(1), Some(1));
-				assert_eq!(d.checked_div_int(i32::max_value()), Some(0));
+				assert_eq!(d.checked_div_int(i32::MAX), Some(0));
 				assert_eq!(d.checked_div_int(1i8), Some(1));
 
 				assert_eq!(a.checked_div_int(0), None);
@@ -1303,17 +1303,17 @@ macro_rules! implement_fixed {
 				assert_eq!($name::zero().saturating_mul_acc_int(42i8), 42i8);
 				assert_eq!($name::one().saturating_mul_acc_int(42i8), 2 * 42i8);
 
-				assert_eq!($name::one().saturating_mul_acc_int(i128::max_value()), i128::max_value());
+				assert_eq!($name::one().saturating_mul_acc_int(i128::MAX), i128::MAX);
 				assert_eq!($name::one().saturating_mul_acc_int(i128::min_value()), i128::min_value());
 
-				assert_eq!($name::one().saturating_mul_acc_int(u128::max_value() / 2), u128::max_value() - 1);
+				assert_eq!($name::one().saturating_mul_acc_int(u128::MAX / 2), u128::MAX - 1);
 				assert_eq!($name::one().saturating_mul_acc_int(u128::min_value()), u128::min_value());
 
 				if $name::SIGNED {
 					let a = $name::saturating_from_rational(-1, 2);
 					assert_eq!(a.saturating_mul_acc_int(42i8), 21i8);
 					assert_eq!(a.saturating_mul_acc_int(42u8), 21u8);
-					assert_eq!(a.saturating_mul_acc_int(u128::max_value() - 1), u128::max_value() / 2);
+					assert_eq!(a.saturating_mul_acc_int(u128::MAX - 1), u128::MAX / 2);
 				}
 			}
 
@@ -1327,7 +1327,7 @@ macro_rules! implement_fixed {
 					$name::saturating_from_integer(1125899906842624i64));
 
 				assert_eq!($name::saturating_from_integer(1).saturating_pow(1000), (1).into());
-				assert_eq!($name::saturating_from_integer(1).saturating_pow(usize::max_value()), (1).into());
+				assert_eq!($name::saturating_from_integer(1).saturating_pow(usize::MAX), (1).into());
 
 				if $name::SIGNED {
 					// Saturating.
@@ -1335,15 +1335,15 @@ macro_rules! implement_fixed {
 
 					assert_eq!($name::saturating_from_integer(-1).saturating_pow(1000), (1).into());
 					assert_eq!($name::saturating_from_integer(-1).saturating_pow(1001), 0.saturating_sub(1).into());
-					assert_eq!($name::saturating_from_integer(-1).saturating_pow(usize::max_value()), 0.saturating_sub(1).into());
-					assert_eq!($name::saturating_from_integer(-1).saturating_pow(usize::max_value() - 1), (1).into());
+					assert_eq!($name::saturating_from_integer(-1).saturating_pow(usize::MAX), 0.saturating_sub(1).into());
+					assert_eq!($name::saturating_from_integer(-1).saturating_pow(usize::MAX - 1), (1).into());
 				}
 
 				assert_eq!($name::saturating_from_integer(114209).saturating_pow(5), $name::max_value());
 
-				assert_eq!($name::saturating_from_integer(1).saturating_pow(usize::max_value()), (1).into());
-				assert_eq!($name::saturating_from_integer(0).saturating_pow(usize::max_value()), (0).into());
-				assert_eq!($name::saturating_from_integer(2).saturating_pow(usize::max_value()), $name::max_value());
+				assert_eq!($name::saturating_from_integer(1).saturating_pow(usize::MAX), (1).into());
+				assert_eq!($name::saturating_from_integer(0).saturating_pow(usize::MAX), (0).into());
+				assert_eq!($name::saturating_from_integer(2).saturating_pow(usize::MAX), $name::max_value());
 			}
 
 			#[test]
diff --git a/primitives/arithmetic/src/lib.rs b/primitives/arithmetic/src/lib.rs
index d6069ad5154d..527530d63e51 100644
--- a/primitives/arithmetic/src/lib.rs
+++ b/primitives/arithmetic/src/lib.rs
@@ -500,15 +500,15 @@ mod threshold_compare_tests {
 	#[test]
 	fn saturating_mul_works() {
 		assert_eq!(Saturating::saturating_mul(2, i32::min_value()), i32::min_value());
-		assert_eq!(Saturating::saturating_mul(2, i32::max_value()), i32::max_value());
+		assert_eq!(Saturating::saturating_mul(2, i32::MAX), i32::MAX);
 	}
 
 	#[test]
 	fn saturating_pow_works() {
 		assert_eq!(Saturating::saturating_pow(i32::min_value(), 0), 1);
-		assert_eq!(Saturating::saturating_pow(i32::max_value(), 0), 1);
+		assert_eq!(Saturating::saturating_pow(i32::MAX, 0), 1);
 		assert_eq!(Saturating::saturating_pow(i32::min_value(), 3), i32::min_value());
-		assert_eq!(Saturating::saturating_pow(i32::min_value(), 2), i32::max_value());
-		assert_eq!(Saturating::saturating_pow(i32::max_value(), 2), i32::max_value());
+		assert_eq!(Saturating::saturating_pow(i32::min_value(), 2), i32::MAX);
+		assert_eq!(Saturating::saturating_pow(i32::MAX, 2), i32::MAX);
 	}
 }
diff --git a/primitives/arithmetic/src/rational.rs b/primitives/arithmetic/src/rational.rs
index 88eaca1efb6c..feb81eb57206 100644
--- a/primitives/arithmetic/src/rational.rs
+++ b/primitives/arithmetic/src/rational.rs
@@ -267,9 +267,9 @@ mod tests {
 	use super::*;
 	use super::helpers_128bit::*;
 
-	const MAX128: u128 = u128::max_value();
-	const MAX64: u128 = u64::max_value() as u128;
-	const MAX64_2: u128 = 2 * u64::max_value() as u128;
+	const MAX128: u128 = u128::MAX;
+	const MAX64: u128 = u64::MAX as u128;
+	const MAX64_2: u128 = 2 * u64::MAX as u128;
 
 	fn r(p: u128, q: u128) -> Rational128 {
 		Rational128(p, q)
diff --git a/primitives/core/src/hash.rs b/primitives/core/src/hash.rs
index dcaafd2906de..6ef1827a1ba0 100644
--- a/primitives/core/src/hash.rs
+++ b/primitives/core/src/hash.rs
@@ -43,7 +43,7 @@ mod tests {
 			(H160::from_low_u64_be(16), "0x0000000000000000000000000000000000000010"),
 			(H160::from_low_u64_be(1_000), "0x00000000000000000000000000000000000003e8"),
 			(H160::from_low_u64_be(100_000), "0x00000000000000000000000000000000000186a0"),
-			(H160::from_low_u64_be(u64::max_value()), "0x000000000000000000000000ffffffffffffffff"),
+			(H160::from_low_u64_be(u64::MAX), "0x000000000000000000000000ffffffffffffffff"),
 		];
 
 		for (number, expected) in tests {
@@ -61,7 +61,7 @@ mod tests {
 			(H256::from_low_u64_be(16), "0x0000000000000000000000000000000000000000000000000000000000000010"),
 			(H256::from_low_u64_be(1_000), "0x00000000000000000000000000000000000000000000000000000000000003e8"),
 			(H256::from_low_u64_be(100_000), "0x00000000000000000000000000000000000000000000000000000000000186a0"),
-			(H256::from_low_u64_be(u64::max_value()), "0x000000000000000000000000000000000000000000000000ffffffffffffffff"),
+			(H256::from_low_u64_be(u64::MAX), "0x000000000000000000000000000000000000000000000000ffffffffffffffff"),
 		];
 
 		for (number, expected) in tests {
diff --git a/primitives/core/src/offchain/mod.rs b/primitives/core/src/offchain/mod.rs
index 66fc85ec7bf0..d3d2356b6ee8 100644
--- a/primitives/core/src/offchain/mod.rs
+++ b/primitives/core/src/offchain/mod.rs
@@ -282,7 +282,7 @@ impl Capabilities {
 
 	/// Return an object representing all capabilities enabled.
 	pub fn all() -> Self {
-		Self(u8::max_value())
+		Self(u8::MAX)
 	}
 
 	/// Return capabilities for rich offchain calls.
diff --git a/primitives/core/src/uint.rs b/primitives/core/src/uint.rs
index f917f472d787..ff45ad6ecf0d 100644
--- a/primitives/core/src/uint.rs
+++ b/primitives/core/src/uint.rs
@@ -39,8 +39,8 @@ mod tests {
 					($name::from(16), "0x10"),
 					($name::from(1_000), "0x3e8"),
 					($name::from(100_000), "0x186a0"),
-					($name::from(u64::max_value()), "0xffffffffffffffff"),
-					($name::from(u64::max_value()) + $name::from(1), "0x10000000000000000"),
+					($name::from(u64::MAX), "0xffffffffffffffff"),
+					($name::from(u64::MAX) + $name::from(1), "0x10000000000000000"),
 				];
 
 				for (number, expected) in tests {
diff --git a/primitives/npos-elections/src/phragmen.rs b/primitives/npos-elections/src/phragmen.rs
index a1e632acf5fd..bbead91c938f 100644
--- a/primitives/npos-elections/src/phragmen.rs
+++ b/primitives/npos-elections/src/phragmen.rs
@@ -33,7 +33,7 @@ use sp_std::prelude::*;
 
 /// The denominator used for loads. Since votes are collected as u64, the smallest ratio that we
 /// might collect is `1/approval_stake` where approval stake is the sum of votes. Hence, some number
-/// bigger than u64::max_value() is needed. For maximum accuracy we simply use u128;
+/// bigger than u64::MAX is needed. For maximum accuracy we simply use u128;
 const DEN: ExtendedBalance = ExtendedBalance::max_value();
 
 /// Execute sequential phragmen with potentially some rounds of `balancing`. The return type is list
diff --git a/primitives/npos-elections/src/phragmms.rs b/primitives/npos-elections/src/phragmms.rs
index 644535d4c41c..2a643d3673a5 100644
--- a/primitives/npos-elections/src/phragmms.rs
+++ b/primitives/npos-elections/src/phragmms.rs
@@ -181,7 +181,7 @@ pub(crate) fn apply_elected<AccountId: IdentifierT>(
 ) {
 	let elected_who = elected_ptr.borrow().who.clone();
 	let cutoff = elected_ptr.borrow().score.to_den(1)
-		.expect("(n / d) < u128::max() and (n' / 1) == (n / d), thus n' < u128::max()'; qed.")
+		.expect("(n / d) < u128::MAX and (n' / 1) == (n / d), thus n' < u128::MAX'; qed.")
 		.n();
 
 	let mut elected_backed_stake = elected_ptr.borrow().backed_stake;
@@ -386,10 +386,10 @@ mod tests {
 	#[test]
 	fn large_balance_wont_overflow() {
 		let candidates = vec![1u32, 2, 3];
-		let mut voters = (0..1000).map(|i| (10 + i, u64::max_value(), vec![1, 2, 3])).collect::<Vec<_>>();
+		let mut voters = (0..1000).map(|i| (10 + i, u64::MAX, vec![1, 2, 3])).collect::<Vec<_>>();
 
 		// give a bit more to 1 and 3.
-		voters.push((2, u64::max_value(), vec![1, 3]));
+		voters.push((2, u64::MAX, vec![1, 3]));
 
 		let ElectionResult { winners, assignments: _ } = phragmms::<_, Perbill>(2, candidates, voters, Some((2, 0))).unwrap();
 		assert_eq!(winners.into_iter().map(|(w, _)| w).collect::<Vec<_>>(), vec![1u32, 3]);
diff --git a/primitives/npos-elections/src/tests.rs b/primitives/npos-elections/src/tests.rs
index 06505721fd23..8cadff949b6f 100644
--- a/primitives/npos-elections/src/tests.rs
+++ b/primitives/npos-elections/src/tests.rs
@@ -458,11 +458,11 @@ fn phragmen_accuracy_on_large_scale_only_candidates() {
 	// candidate can have the maximum amount of tokens, and also supported by the maximum.
 	let candidates = vec![1, 2, 3, 4, 5];
 	let stake_of = create_stake_of(&[
-		(1, (u64::max_value() - 1).into()),
-		(2, (u64::max_value() - 4).into()),
-		(3, (u64::max_value() - 5).into()),
-		(4, (u64::max_value() - 3).into()),
-		(5, (u64::max_value() - 2).into()),
+		(1, (u64::MAX - 1).into()),
+		(2, (u64::MAX - 4).into()),
+		(3, (u64::MAX - 5).into()),
+		(4, (u64::MAX - 3).into()),
+		(5, (u64::MAX - 2).into()),
 	]);
 
 	let ElectionResult { winners, assignments } = seq_phragmen::<_, Perbill>(
@@ -489,13 +489,13 @@ fn phragmen_accuracy_on_large_scale_voters_and_candidates() {
 	];
 	voters.extend(auto_generate_self_voters(&candidates));
 	let stake_of = create_stake_of(&[
-		(1,  (u64::max_value() - 1).into()),
-		(2,  (u64::max_value() - 4).into()),
-		(3,  (u64::max_value() - 5).into()),
-		(4,  (u64::max_value() - 3).into()),
-		(5,  (u64::max_value() - 2).into()),
-		(13, (u64::max_value() - 10).into()),
-		(14, u64::max_value().into()),
+		(1,  (u64::MAX - 1).into()),
+		(2,  (u64::MAX - 4).into()),
+		(3,  (u64::MAX - 5).into()),
+		(4,  (u64::MAX - 3).into()),
+		(5,  (u64::MAX - 2).into()),
+		(13, (u64::MAX - 10).into()),
+		(14, u64::MAX.into()),
 	]);
 
 	let ElectionResult { winners, assignments } = seq_phragmen::<_, Perbill>(
diff --git a/primitives/runtime-interface/test-wasm/src/lib.rs b/primitives/runtime-interface/test-wasm/src/lib.rs
index 4cdf59349dd7..39f1c8b3f570 100644
--- a/primitives/runtime-interface/test-wasm/src/lib.rs
+++ b/primitives/runtime-interface/test-wasm/src/lib.rs
@@ -226,11 +226,11 @@ wasm_export_functions! {
 	}
 
 	fn test_u128_i128_as_parameter_and_return_value() {
-		for val in &[u128::max_value(), 1u128, 5000u128, u64::max_value() as u128] {
+		for val in &[u128::MAX, 1u128, 5000u128, u64::MAX as u128] {
 			assert_eq!(*val, test_api::get_and_return_u128(*val));
 		}
 
-		for val in &[i128::max_value(), i128::min_value(), 1i128, 5000i128, u64::max_value() as i128] {
+		for val in &[i128::MAX, i128::min_value(), 1i128, 5000i128, u64::MAX as i128] {
 			assert_eq!(*val, test_api::get_and_return_i128(*val));
 		}
 	}
diff --git a/primitives/runtime/src/curve.rs b/primitives/runtime/src/curve.rs
index 06f7f2c7e3f0..326ababcf5d4 100644
--- a/primitives/runtime/src/curve.rs
+++ b/primitives/runtime/src/curve.rs
@@ -112,17 +112,17 @@ fn test_multiply_by_rational_saturating() {
 	for value in 0..=div {
 		for p in 0..=div {
 			for q in 1..=div {
-				let value: u64 = (value as u128 * u64::max_value() as u128 / div as u128)
+				let value: u64 = (value as u128 * u64::MAX as u128 / div as u128)
 					.try_into().unwrap();
-				let p = (p as u64 * u32::max_value() as u64 / div as u64)
+				let p = (p as u64 * u32::MAX as u64 / div as u64)
 					.try_into().unwrap();
-				let q = (q as u64 * u32::max_value() as u64 / div as u64)
+				let q = (q as u64 * u32::MAX as u64 / div as u64)
 					.try_into().unwrap();
 
 				assert_eq!(
 					multiply_by_rational_saturating(value, p, q),
 					(value as u128 * p as u128 / q as u128)
-						.try_into().unwrap_or(u64::max_value())
+						.try_into().unwrap_or(u64::MAX)
 				);
 			}
 		}
@@ -153,9 +153,9 @@ fn test_calculate_for_fraction_times_denominator() {
 	let div = 100u32;
 	for d in 0..=div {
 		for n in 0..=d {
-			let d: u64 = (d as u128 * u64::max_value() as u128 / div as u128)
+			let d: u64 = (d as u128 * u64::MAX as u128 / div as u128)
 				.try_into().unwrap();
-			let n: u64 = (n as u128 * u64::max_value() as u128 / div as u128)
+			let n: u64 = (n as u128 * u64::MAX as u128 / div as u128)
 				.try_into().unwrap();
 
 			let res = curve.calculate_for_fraction_times_denominator(n, d);
diff --git a/primitives/runtime/src/generic/era.rs b/primitives/runtime/src/generic/era.rs
index fbda688cc407..83a9f22afe5d 100644
--- a/primitives/runtime/src/generic/era.rs
+++ b/primitives/runtime/src/generic/era.rs
@@ -97,7 +97,7 @@ impl Era {
 	/// Get the block number of the first block at which the era has ended.
 	pub fn death(self, current: u64) -> u64 {
 		match self {
-			Self::Immortal => u64::max_value(),
+			Self::Immortal => u64::MAX,
 			Self::Mortal(period, _) => self.birth(current) + period,
 		}
 	}
@@ -145,11 +145,11 @@ mod tests {
 	fn immortal_works() {
 		let e = Era::immortal();
 		assert_eq!(e.birth(0), 0);
-		assert_eq!(e.death(0), u64::max_value());
+		assert_eq!(e.death(0), u64::MAX);
 		assert_eq!(e.birth(1), 0);
-		assert_eq!(e.death(1), u64::max_value());
-		assert_eq!(e.birth(u64::max_value()), 0);
-		assert_eq!(e.death(u64::max_value()), u64::max_value());
+		assert_eq!(e.death(1), u64::MAX);
+		assert_eq!(e.birth(u64::MAX), 0);
+		assert_eq!(e.death(u64::MAX), u64::MAX);
 		assert!(e.is_immortal());
 
 		assert_eq!(e.encode(), vec![0u8]);
diff --git a/primitives/runtime/src/generic/header.rs b/primitives/runtime/src/generic/header.rs
index 69c5f5079688..def761b201ce 100644
--- a/primitives/runtime/src/generic/header.rs
+++ b/primitives/runtime/src/generic/header.rs
@@ -200,8 +200,8 @@ mod tests {
 
 		assert_eq!(serialize(0), "\"0x0\"".to_owned());
 		assert_eq!(serialize(1), "\"0x1\"".to_owned());
-		assert_eq!(serialize(u64::max_value() as u128), "\"0xffffffffffffffff\"".to_owned());
-		assert_eq!(serialize(u64::max_value() as u128 + 1), "\"0x10000000000000000\"".to_owned());
+		assert_eq!(serialize(u64::MAX as u128), "\"0xffffffffffffffff\"".to_owned());
+		assert_eq!(serialize(u64::MAX as u128 + 1), "\"0x10000000000000000\"".to_owned());
 	}
 
 	#[test]
@@ -213,7 +213,7 @@ mod tests {
 
 		assert_eq!(deserialize("\"0x0\""), 0);
 		assert_eq!(deserialize("\"0x1\""), 1);
-		assert_eq!(deserialize("\"0xffffffffffffffff\""), u64::max_value() as u128);
-		assert_eq!(deserialize("\"0x10000000000000000\""), u64::max_value() as u128 + 1);
+		assert_eq!(deserialize("\"0xffffffffffffffff\""), u64::MAX as u128);
+		assert_eq!(deserialize("\"0x10000000000000000\""), u64::MAX as u128 + 1);
 	}
 }
diff --git a/primitives/runtime/src/random_number_generator.rs b/primitives/runtime/src/random_number_generator.rs
index 41ca7c723e9c..0adf346579a9 100644
--- a/primitives/runtime/src/random_number_generator.rs
+++ b/primitives/runtime/src/random_number_generator.rs
@@ -76,7 +76,7 @@ impl<Hashing: Hash> RandomNumberGenerator<Hashing> {
 			self.offset += needed as u32;
 			let raw = u32::decode(&mut TrailingZeroInput::new(data)).unwrap_or(0);
 			if raw <= top {
-				break if max < u32::max_value() {
+				break if max < u32::MAX {
 					raw % (max + 1)
 				} else {
 					raw
diff --git a/primitives/trie/src/lib.rs b/primitives/trie/src/lib.rs
index 4cfe3623812c..a496245637a5 100644
--- a/primitives/trie/src/lib.rs
+++ b/primitives/trie/src/lib.rs
@@ -438,7 +438,7 @@ impl<'a, DB, H, T> hash_db::AsHashDB<H, T> for KeySpacedDBMut<'a, DB, H> where
 /// Constants used into trie simplification codec.
 mod trie_constants {
 	pub const EMPTY_TRIE: u8 = 0;
-	pub const NIBBLE_SIZE_BOUND: usize = u16::max_value() as usize;
+	pub const NIBBLE_SIZE_BOUND: usize = u16::MAX as usize;
 	pub const LEAF_PREFIX_MASK: u8 = 0b_01 << 6;
 	pub const BRANCH_WITHOUT_MASK: u8 = 0b_10 << 6;
 	pub const BRANCH_WITH_MASK: u8 = 0b_11 << 6;

From 8a9a8f170f556beb7c86e996f0576ae3df632f9b Mon Sep 17 00:00:00 2001
From: kotlarmilos <kotlarmilos@gmail.com>
Date: Thu, 24 Jun 2021 13:18:15 +0200
Subject: [PATCH 0921/1194] Add OriginTrail Parachain to SS58 Registry (#9067)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add OriginTrail Parachain to SS58 Registry

* Update ss58-registry.json

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 primitives/core/src/crypto.rs |  2 ++
 ss58-registry.json            | 11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index 9e3177f249a5..d9a0a69e1681 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -588,6 +588,8 @@ ss58_address_format!(
 		(98, "polkasmith", "PolkaSmith Canary Network, standard account (*25519).")
 	PolkaFoundry =>
 		(99, "polkafoundry", "PolkaFoundry Network, standard account (*25519).")
+  OriginTrailAccount =>
+		(101, "origintrail-parachain", "OriginTrail Parachain, ethereumm account (ECDSA).")
 	SocialAccount =>
 		(252, "social-network", "Social Network, standard account (*25519).")
 	Moonbeam =>
diff --git a/ss58-registry.json b/ss58-registry.json
index 133cb6506fb0..4d818dfa5b3e 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -522,7 +522,16 @@
 			"decimals": [18],
 			"standardAccount": "*25519",
 			"website": "https://polkafoundry.com"
-  	        },
+  	},
+		{
+			"prefix": 101,
+			"network": "origintrail-parachain",
+			"displayName": "OriginTrail Parachain",
+			"symbols": ["TRAC"],
+			"decimals": [18],
+			"standardAccount": "secp256k1",
+			"website": "https://origintrail.io"
+		},
 		{
 			"prefix": 252,
 			"network": "social-network",

From 77dcc4f90917f2215ee40efeacd68be9ce85db14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Thu, 24 Jun 2021 16:19:36 +0200
Subject: [PATCH 0922/1194] Remove RandomNumberGenerator (#9198)

* Remove RandomNumberGenerator

This is not used in Substrate/Polkadot. If someone else needs it, they
can copy the code or use chacha.

* :facepalm:
---
 primitives/runtime/src/lib.rs                 |   3 -
 .../runtime/src/random_number_generator.rs    | 118 ------------------
 2 files changed, 121 deletions(-)
 delete mode 100644 primitives/runtime/src/random_number_generator.rs

diff --git a/primitives/runtime/src/lib.rs b/primitives/runtime/src/lib.rs
index 8f7bbf1680c0..9bc23be1e975 100644
--- a/primitives/runtime/src/lib.rs
+++ b/primitives/runtime/src/lib.rs
@@ -54,7 +54,6 @@ pub mod offchain;
 pub mod testing;
 pub mod traits;
 pub mod transaction_validity;
-pub mod random_number_generator;
 mod runtime_string;
 mod multiaddress;
 pub mod runtime_logger;
@@ -85,8 +84,6 @@ pub use sp_arithmetic::helpers_128bit;
 /// Re-export big_uint stuff.
 pub use sp_arithmetic::biguint;
 
-pub use random_number_generator::RandomNumberGenerator;
-
 pub use either::Either;
 
 /// An abstraction over justification for a block's validity under a consensus algorithm.
diff --git a/primitives/runtime/src/random_number_generator.rs b/primitives/runtime/src/random_number_generator.rs
deleted file mode 100644
index 0adf346579a9..000000000000
--- a/primitives/runtime/src/random_number_generator.rs
+++ /dev/null
@@ -1,118 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! A simple pseudo random number generator that allows a stream of random numbers to be efficiently
-//! created from a single initial seed hash.
-
-use codec::{Encode, Decode};
-use crate::traits::{Hash, TrailingZeroInput};
-
-/// Pseudo-random number streamer. This retains the state of the random number stream. It's as
-/// secure as the combination of the seed with which it is constructed and the hash function it uses
-/// to cycle elements.
-///
-/// It can be saved and later reloaded using the Codec traits.
-///
-/// (It is recommended to use the `rand_chacha` crate as an alternative to this where possible.)
-///
-/// Example:
-/// ```
-/// use sp_runtime::traits::{Hash, BlakeTwo256};
-/// use sp_runtime::RandomNumberGenerator;
-/// let random_seed = BlakeTwo256::hash(b"Sixty-nine");
-/// let mut rng = <RandomNumberGenerator<BlakeTwo256>>::new(random_seed);
-/// assert_eq!(rng.pick_u32(100), 59);
-/// assert_eq!(rng.pick_item(&[1, 2, 3]), Some(&1));
-/// ```
-///
-/// This can use any cryptographic `Hash` function as the means of entropy-extension, and avoids
-/// needless extensions of entropy.
-///
-/// If you're persisting it over blocks, be aware that the sequence will start to repeat. This won't
-/// be a practical issue unless you're using tiny hash types (e.g. 64-bit) and pulling hundred of
-/// megabytes of data from it.
-#[derive(Encode, Decode)]
-pub struct RandomNumberGenerator<Hashing: Hash> {
-	current: Hashing::Output,
-	offset: u32,
-}
-
-impl<Hashing: Hash> RandomNumberGenerator<Hashing> {
-	/// A new source of random data.
-	pub fn new(seed: Hashing::Output) -> Self {
-		Self {
-			current: seed,
-			offset: 0,
-		}
-	}
-
-	fn offset(&self) -> usize { self.offset as usize }
-
-	/// Returns a number at least zero, at most `max`.
-	pub fn pick_u32(&mut self, max: u32) -> u32 {
-		let needed = (4 - max.leading_zeros() / 8) as usize;
-		let top = ((1 << (needed as u64 * 8)) / (max as u64 + 1) * (max as u64 + 1) - 1) as u32;
-		loop {
-			if self.offset() + needed > self.current.as_ref().len() {
-				// rehash
-				self.current = <Hashing as Hash>::hash(self.current.as_ref());
-				self.offset = 0;
-			}
-			let data = &self.current.as_ref()[self.offset()..self.offset() + needed];
-			self.offset += needed as u32;
-			let raw = u32::decode(&mut TrailingZeroInput::new(data)).unwrap_or(0);
-			if raw <= top {
-				break if max < u32::MAX {
-					raw % (max + 1)
-				} else {
-					raw
-				}
-			}
-		}
-	}
-
-	/// Returns a number at least zero, at most `max`.
-	///
-	/// This returns a `usize`, but internally it only uses `u32` so avoid consensus problems.
-	pub fn pick_usize(&mut self, max: usize) -> usize {
-		self.pick_u32(max as u32) as usize
-	}
-
-	/// Pick a random element from an array of `items`.
-	///
-	/// This is guaranteed to return `Some` except in the case that the given array `items` is
-	/// empty.
-	pub fn pick_item<'a, T>(&mut self, items: &'a [T]) -> Option<&'a T> {
-		if items.is_empty() {
-			None
-		} else {
-			Some(&items[self.pick_usize(items.len() - 1)])
-		}
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use super::RandomNumberGenerator;
-	use crate::traits::{Hash, BlakeTwo256};
-
-	#[test]
-	fn does_not_panic_on_max() {
-		let seed = BlakeTwo256::hash(b"Fourty-two");
-		let _random = RandomNumberGenerator::<BlakeTwo256>::new(seed).pick_u32(u32::MAX);
-	}
-}

From bab9deca26db20bfc914263e0542a7a1b0d8f174 Mon Sep 17 00:00:00 2001
From: Squirrel <gilescope@gmail.com>
Date: Thu, 24 Jun 2021 15:48:39 +0100
Subject: [PATCH 0923/1194] Use MIN associated const (#9199)

---
 client/network/src/protocol/sync.rs           |  2 +-
 client/network/src/state_request_handler.rs   |  2 +-
 client/peerset/src/lib.rs                     |  4 +-
 client/peerset/tests/fuzz.rs                  |  2 +-
 primitives/arithmetic/src/fixed_point.rs      | 44 +++++++++----------
 primitives/arithmetic/src/lib.rs              |  8 ++--
 .../runtime-interface/test-wasm/src/lib.rs    |  2 +-
 7 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/client/network/src/protocol/sync.rs b/client/network/src/protocol/sync.rs
index 82df21fe9d04..44fbe64bfcff 100644
--- a/client/network/src/protocol/sync.rs
+++ b/client/network/src/protocol/sync.rs
@@ -105,7 +105,7 @@ mod rep {
 
 	/// Reputation change when a peer sent us a status message with a different
 	/// genesis than us.
-	pub const GENESIS_MISMATCH: Rep = Rep::new(i32::min_value(), "Genesis mismatch");
+	pub const GENESIS_MISMATCH: Rep = Rep::new(i32::MIN, "Genesis mismatch");
 
 	/// Reputation change for peers which send us a block with an incomplete header.
 	pub const INCOMPLETE_HEADER: Rep = Rep::new(-(1 << 20), "Incomplete header");
diff --git a/client/network/src/state_request_handler.rs b/client/network/src/state_request_handler.rs
index bf47b412f46d..d340ff21bd44 100644
--- a/client/network/src/state_request_handler.rs
+++ b/client/network/src/state_request_handler.rs
@@ -42,7 +42,7 @@ mod rep {
 	use super::ReputationChange as Rep;
 
 	/// Reputation change when a peer sent us the same request multiple times.
-	pub const SAME_REQUEST: Rep = Rep::new(i32::min_value(), "Same state request multiple times");
+	pub const SAME_REQUEST: Rep = Rep::new(i32::MIN, "Same state request multiple times");
 }
 
 /// Generates a [`ProtocolConfig`] for the block request protocol, refusing incoming requests.
diff --git a/client/peerset/src/lib.rs b/client/peerset/src/lib.rs
index 36d1e1831cec..1efb21dd5389 100644
--- a/client/peerset/src/lib.rs
+++ b/client/peerset/src/lib.rs
@@ -45,7 +45,7 @@ use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedSender, TracingUnbounded
 pub use libp2p::PeerId;
 
 /// We don't accept nodes whose reputation is under this value.
-const BANNED_THRESHOLD: i32 = 82 * (i32::min_value() / 100);
+const BANNED_THRESHOLD: i32 = 82 * (i32::MIN / 100);
 /// Reputation change for a node when we get disconnected from it.
 const DISCONNECT_REPUTATION_CHANGE: i32 = -256;
 /// Amount of time between the moment we disconnect from a node and the moment we remove it from
@@ -107,7 +107,7 @@ impl ReputationChange {
 
 	/// New reputation change that forces minimum possible reputation.
 	pub const fn new_fatal(reason: &'static str) -> ReputationChange {
-		ReputationChange { value: i32::min_value(), reason }
+		ReputationChange { value: i32::MIN, reason }
 	}
 }
 
diff --git a/client/peerset/tests/fuzz.rs b/client/peerset/tests/fuzz.rs
index d951b0cc560c..96d1a48683f1 100644
--- a/client/peerset/tests/fuzz.rs
+++ b/client/peerset/tests/fuzz.rs
@@ -120,7 +120,7 @@ fn test_once() {
 				// If we generate 2, adjust a random reputation.
 				2 => {
 					if let Some(id) = known_nodes.iter().choose(&mut rng) {
-						let val = Uniform::new_inclusive(i32::min_value(), i32::MAX)
+						let val = Uniform::new_inclusive(i32::MIN, i32::MAX)
 							.sample(&mut rng);
 						peerset_handle.report_peer(id.clone(), ReputationChange::new(val, ""));
 					}
diff --git a/primitives/arithmetic/src/fixed_point.rs b/primitives/arithmetic/src/fixed_point.rs
index 4940c7751aa1..9c5078ca66f0 100644
--- a/primitives/arithmetic/src/fixed_point.rs
+++ b/primitives/arithmetic/src/fixed_point.rs
@@ -640,7 +640,7 @@ macro_rules! implement_fixed {
 				};
 
 				// Min value fits.
-				assert_eq!(from_i129::<i128>(a), Some(i128::min_value()));
+				assert_eq!(from_i129::<i128>(a), Some(i128::MIN));
 
 				let a = I129 {
 					value: i128::MAX as u128 + 1,
@@ -677,13 +677,13 @@ macro_rules! implement_fixed {
 				let b = -1i32;
 
 				// Pos + Neg => Min.
-				assert_eq!(to_bound::<_, _, i32>(a, b), i32::min_value());
+				assert_eq!(to_bound::<_, _, i32>(a, b), i32::MIN);
 
 				let a = -1i32;
 				let b = 1i32;
 
 				// Neg + Pos => Min.
-				assert_eq!(to_bound::<_, _, i32>(a, b), i32::min_value());
+				assert_eq!(to_bound::<_, _, i32>(a, b), i32::MIN);
 
 				let a = 1i32;
 				let b = -1i32;
@@ -1092,29 +1092,29 @@ macro_rules! implement_fixed {
 
 				if $name::SIGNED {
 					// Min - 1.
-					assert_eq!(a.checked_mul_int((i128::min_value() + 1) / 2), Some(i128::min_value() + 2));
+					assert_eq!(a.checked_mul_int((i128::MIN + 1) / 2), Some(i128::MIN + 2));
 					// Min.
-					assert_eq!(a.checked_mul_int(i128::min_value() / 2), Some(i128::min_value()));
+					assert_eq!(a.checked_mul_int(i128::MIN / 2), Some(i128::MIN));
 					// Min + 1 => None.
-					assert_eq!(a.checked_mul_int(i128::min_value() / 2 - 1), None);
+					assert_eq!(a.checked_mul_int(i128::MIN / 2 - 1), None);
 
 					let b = $name::saturating_from_rational(1, -2);
 					assert_eq!(b.checked_mul_int(42i128), Some(-21));
 					assert_eq!(b.checked_mul_int(u128::MAX), None);
 					assert_eq!(b.checked_mul_int(i128::MAX), Some(i128::MAX / -2));
-					assert_eq!(b.checked_mul_int(i128::min_value()), Some(i128::min_value() / -2));
+					assert_eq!(b.checked_mul_int(i128::MIN), Some(i128::MIN / -2));
 				}
 
 				let a = $name::saturating_from_rational(1, 2);
 				assert_eq!(a.checked_mul_int(42i128), Some(21));
 				assert_eq!(a.checked_mul_int(i128::MAX), Some(i128::MAX / 2));
-				assert_eq!(a.checked_mul_int(i128::min_value()), Some(i128::min_value() / 2));
+				assert_eq!(a.checked_mul_int(i128::MIN), Some(i128::MIN / 2));
 
 				let c = $name::saturating_from_integer(255);
 				assert_eq!(c.checked_mul_int(2i8), None);
 				assert_eq!(c.checked_mul_int(2i128), Some(510));
 				assert_eq!(c.checked_mul_int(i128::MAX), None);
-				assert_eq!(c.checked_mul_int(i128::min_value()), None);
+				assert_eq!(c.checked_mul_int(i128::MIN), None);
 			}
 
 			#[test]
@@ -1128,30 +1128,30 @@ macro_rules! implement_fixed {
 				assert_eq!(a.saturating_mul_int(i128::MAX / 2 + 1), i128::MAX);
 
 				// Min - 1.
-				assert_eq!(a.saturating_mul_int((i128::min_value() + 1) / 2), i128::min_value() + 2);
+				assert_eq!(a.saturating_mul_int((i128::MIN + 1) / 2), i128::MIN + 2);
 				// Min.
-				assert_eq!(a.saturating_mul_int(i128::min_value() / 2), i128::min_value());
+				assert_eq!(a.saturating_mul_int(i128::MIN / 2), i128::MIN);
 				// Min + 1 => saturates to min.
-				assert_eq!(a.saturating_mul_int(i128::min_value() / 2 - 1), i128::min_value());
+				assert_eq!(a.saturating_mul_int(i128::MIN / 2 - 1), i128::MIN);
 
 				if $name::SIGNED {
 					let b = $name::saturating_from_rational(1, -2);
 					assert_eq!(b.saturating_mul_int(42i32), -21);
 					assert_eq!(b.saturating_mul_int(i128::MAX), i128::MAX / -2);
-					assert_eq!(b.saturating_mul_int(i128::min_value()), i128::min_value() / -2);
-					assert_eq!(b.saturating_mul_int(u128::MAX), u128::min_value());
+					assert_eq!(b.saturating_mul_int(i128::MIN), i128::MIN / -2);
+					assert_eq!(b.saturating_mul_int(u128::MAX), u128::MIN);
 				}
 
 				let a = $name::saturating_from_rational(1, 2);
 				assert_eq!(a.saturating_mul_int(42i32), 21);
 				assert_eq!(a.saturating_mul_int(i128::MAX), i128::MAX / 2);
-				assert_eq!(a.saturating_mul_int(i128::min_value()), i128::min_value() / 2);
+				assert_eq!(a.saturating_mul_int(i128::MIN), i128::MIN / 2);
 
 				let c = $name::saturating_from_integer(255);
 				assert_eq!(c.saturating_mul_int(2i8), i8::MAX);
-				assert_eq!(c.saturating_mul_int(-2i8), i8::min_value());
+				assert_eq!(c.saturating_mul_int(-2i8), i8::MIN);
 				assert_eq!(c.saturating_mul_int(i128::MAX), i128::MAX);
-				assert_eq!(c.saturating_mul_int(i128::min_value()), i128::min_value());
+				assert_eq!(c.saturating_mul_int(i128::MIN), i128::MIN);
 			}
 
 			#[test]
@@ -1232,13 +1232,13 @@ macro_rules! implement_fixed {
 					// Not executed by unsigned inners.
 					assert_eq!(a.checked_div_int(0.saturating_sub(2)), Some(0.saturating_sub(inner_max / (2 * accuracy))));
 					assert_eq!(a.checked_div_int(0.saturating_sub(inner_max / accuracy)), Some(0.saturating_sub(1)));
-					assert_eq!(b.checked_div_int(i128::min_value()), Some(0));
+					assert_eq!(b.checked_div_int(i128::MIN), Some(0));
 					assert_eq!(b.checked_div_int(inner_min / accuracy), Some(1));
 					assert_eq!(b.checked_div_int(1i8), None);
 					assert_eq!(b.checked_div_int(0.saturating_sub(2)), Some(0.saturating_sub(inner_min / (2 * accuracy))));
 					assert_eq!(b.checked_div_int(0.saturating_sub(inner_min / accuracy)), Some(0.saturating_sub(1)));
-					assert_eq!(c.checked_div_int(i128::min_value()), Some(0));
-					assert_eq!(d.checked_div_int(i32::min_value()), Some(0));
+					assert_eq!(c.checked_div_int(i128::MIN), Some(0));
+					assert_eq!(d.checked_div_int(i32::MIN), Some(0));
 				}
 
 				assert_eq!(b.checked_div_int(2), Some(inner_min / (2 * accuracy)));
@@ -1304,10 +1304,10 @@ macro_rules! implement_fixed {
 				assert_eq!($name::one().saturating_mul_acc_int(42i8), 2 * 42i8);
 
 				assert_eq!($name::one().saturating_mul_acc_int(i128::MAX), i128::MAX);
-				assert_eq!($name::one().saturating_mul_acc_int(i128::min_value()), i128::min_value());
+				assert_eq!($name::one().saturating_mul_acc_int(i128::MIN), i128::MIN);
 
 				assert_eq!($name::one().saturating_mul_acc_int(u128::MAX / 2), u128::MAX - 1);
-				assert_eq!($name::one().saturating_mul_acc_int(u128::min_value()), u128::min_value());
+				assert_eq!($name::one().saturating_mul_acc_int(u128::MIN), u128::MIN);
 
 				if $name::SIGNED {
 					let a = $name::saturating_from_rational(-1, 2);
diff --git a/primitives/arithmetic/src/lib.rs b/primitives/arithmetic/src/lib.rs
index 527530d63e51..110e5c072803 100644
--- a/primitives/arithmetic/src/lib.rs
+++ b/primitives/arithmetic/src/lib.rs
@@ -499,16 +499,16 @@ mod threshold_compare_tests {
 
 	#[test]
 	fn saturating_mul_works() {
-		assert_eq!(Saturating::saturating_mul(2, i32::min_value()), i32::min_value());
+		assert_eq!(Saturating::saturating_mul(2, i32::MIN), i32::MIN);
 		assert_eq!(Saturating::saturating_mul(2, i32::MAX), i32::MAX);
 	}
 
 	#[test]
 	fn saturating_pow_works() {
-		assert_eq!(Saturating::saturating_pow(i32::min_value(), 0), 1);
+		assert_eq!(Saturating::saturating_pow(i32::MIN, 0), 1);
 		assert_eq!(Saturating::saturating_pow(i32::MAX, 0), 1);
-		assert_eq!(Saturating::saturating_pow(i32::min_value(), 3), i32::min_value());
-		assert_eq!(Saturating::saturating_pow(i32::min_value(), 2), i32::MAX);
+		assert_eq!(Saturating::saturating_pow(i32::MIN, 3), i32::MIN);
+		assert_eq!(Saturating::saturating_pow(i32::MIN, 2), i32::MAX);
 		assert_eq!(Saturating::saturating_pow(i32::MAX, 2), i32::MAX);
 	}
 }
diff --git a/primitives/runtime-interface/test-wasm/src/lib.rs b/primitives/runtime-interface/test-wasm/src/lib.rs
index 39f1c8b3f570..65a0e5c5ca44 100644
--- a/primitives/runtime-interface/test-wasm/src/lib.rs
+++ b/primitives/runtime-interface/test-wasm/src/lib.rs
@@ -230,7 +230,7 @@ wasm_export_functions! {
 			assert_eq!(*val, test_api::get_and_return_u128(*val));
 		}
 
-		for val in &[i128::MAX, i128::min_value(), 1i128, 5000i128, u64::MAX as i128] {
+		for val in &[i128::MAX, i128::MIN, 1i128, 5000i128, u64::MAX as i128] {
 			assert_eq!(*val, test_api::get_and_return_i128(*val));
 		}
 	}

From df5012292cea6f5a747ff0e32d2e3c25b73001d9 Mon Sep 17 00:00:00 2001
From: Qinxuan Chen <koushiro.cqx@gmail.com>
Date: Fri, 25 Jun 2021 11:23:36 +0800
Subject: [PATCH 0924/1194] Migrate `pallet-transaction-payment` to new pallet
 attribute macro (#9087)

* Migrate pallet-transaciont-payment to new pallet attribute macro

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* remove generic from genesis config

* fix test

* fix tests

* fix deprecated

* fix tests

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

Co-authored-by: thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Keith Yeung <kungfukeith11@gmail.com>
---
 bin/node/runtime/src/lib.rs                   |   2 +-
 frame/balances/src/tests.rs                   |   6 +-
 frame/balances/src/tests_composite.rs         |   1 +
 frame/balances/src/tests_local.rs             |   1 +
 frame/executive/src/lib.rs                    |   3 +-
 frame/transaction-payment/Cargo.toml          |  18 +-
 frame/transaction-payment/README.md           |   8 +-
 frame/transaction-payment/rpc/Cargo.toml      |   7 +-
 frame/transaction-payment/rpc/README.md       |   4 +-
 .../rpc/runtime-api/Cargo.toml                |   4 +-
 .../rpc/runtime-api/README.md                 |   4 +-
 .../rpc/runtime-api/src/lib.rs                |   2 +-
 frame/transaction-payment/rpc/src/lib.rs      |   2 +-
 frame/transaction-payment/src/lib.rs          | 232 +++++++++++-------
 frame/transaction-payment/src/payment.rs      |  13 +-
 frame/transaction-payment/src/types.rs        |   6 +-
 16 files changed, 185 insertions(+), 128 deletions(-)

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 2e11ab54e431..2ce19483e553 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -821,7 +821,7 @@ impl pallet_contracts::Config for Runtime {
 	type RentFraction = RentFraction;
 	type SurchargeReward = SurchargeReward;
 	type CallStack = [pallet_contracts::Frame<Self>; 31];
-	type WeightPrice = pallet_transaction_payment::Module<Self>;
+	type WeightPrice = pallet_transaction_payment::Pallet<Self>;
 	type WeightInfo = pallet_contracts::weights::SubstrateWeight<Self>;
 	type ChainExtension = ();
 	type DeletionQueueDepth = DeletionQueueDepth;
diff --git a/frame/balances/src/tests.rs b/frame/balances/src/tests.rs
index c98b0ecf02bf..624c2de61890 100644
--- a/frame/balances/src/tests.rs
+++ b/frame/balances/src/tests.rs
@@ -26,7 +26,7 @@ macro_rules! decl_tests {
 		use crate::*;
 		use sp_runtime::{ArithmeticError, FixedPointNumber, traits::{SignedExtension, BadOrigin}};
 		use frame_support::{
-			assert_noop, assert_storage_noop, assert_ok, assert_err, StorageValue,
+			assert_noop, assert_storage_noop, assert_ok, assert_err,
 			traits::{
 				LockableCurrency, LockIdentifier, WithdrawReasons,
 				Currency, ReservableCurrency, ExistenceRequirement::AllowDeath
@@ -148,7 +148,9 @@ macro_rules! decl_tests {
 				.monied(true)
 				.build()
 				.execute_with(|| {
-					pallet_transaction_payment::NextFeeMultiplier::put(Multiplier::saturating_from_integer(1));
+					pallet_transaction_payment::NextFeeMultiplier::<$test>::put(
+						Multiplier::saturating_from_integer(1)
+					);
 					Balances::set_lock(ID_1, &1, 10, WithdrawReasons::RESERVE);
 					assert_noop!(
 						<Balances as Currency<_>>::transfer(&1, &2, 1, AllowDeath),
diff --git a/frame/balances/src/tests_composite.rs b/frame/balances/src/tests_composite.rs
index ff10607bcee0..07ec0f377ecf 100644
--- a/frame/balances/src/tests_composite.rs
+++ b/frame/balances/src/tests_composite.rs
@@ -43,6 +43,7 @@ frame_support::construct_runtime!(
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		TransactionPayment: pallet_transaction_payment::{Pallet, Storage},
 	}
 );
 
diff --git a/frame/balances/src/tests_local.rs b/frame/balances/src/tests_local.rs
index e6de7e64b16a..a6a1a09d9cbf 100644
--- a/frame/balances/src/tests_local.rs
+++ b/frame/balances/src/tests_local.rs
@@ -45,6 +45,7 @@ frame_support::construct_runtime!(
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		TransactionPayment: pallet_transaction_payment::{Pallet, Storage},
 	}
 );
 
diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index d8004e14acda..1d2ad069f07a 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -667,6 +667,7 @@ mod tests {
 		{
 			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 			Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+			TransactionPayment: pallet_transaction_payment::{Pallet, Storage},
 			Custom: custom::{Pallet, Call, ValidateUnsigned, Inherent},
 		}
 	);
@@ -835,7 +836,7 @@ mod tests {
 				header: Header {
 					parent_hash: [69u8; 32].into(),
 					number: 1,
-					state_root: hex!("ec6bb58b0e4bc7fdf0151a0f601eb825f529fbf90b5be5b2024deba30c5cbbcb").into(),
+					state_root: hex!("1039e1a4bd0cf5deefe65f313577e70169c41c7773d6acf31ca8d671397559f5").into(),
 					extrinsics_root: hex!("03170a2e7597b7b7e3d84c05391d139a62b157e78786d8c082f29dcf4c111314").into(),
 					digest: Digest { logs: vec![], },
 				},
diff --git a/frame/transaction-payment/Cargo.toml b/frame/transaction-payment/Cargo.toml
index 2a7fbe503efa..c5c7c34a7271 100644
--- a/frame/transaction-payment/Cargo.toml
+++ b/frame/transaction-payment/Cargo.toml
@@ -15,29 +15,31 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.101", optional = true }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+smallvec = "1.4.1"
+
+sp-core = { version = "3.0.0", path = "../../primitives/core", default-features = false }
+sp-io = { version = "3.0.0", path = "../../primitives/io", default-features = false }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-smallvec = "1.4.1"
-sp-io = { version = "3.0.0", path = "../../primitives/io", default-features = false }
-sp-core = { version = "3.0.0", path = "../../primitives/core", default-features = false }
 
 [dev-dependencies]
 serde_json = "1.0.41"
-pallet-balances = { version = "3.0.0", path = "../balances" }
 sp-storage = { version = "3.0.0", path = "../../primitives/storage" }
+pallet-balances = { version = "3.0.0", path = "../balances" }
 
 [features]
 default = ["std"]
 std = [
 	"serde",
 	"codec/std",
-	"sp-std/std",
+	"sp-core/std",
+	"sp-io/std",
 	"sp-runtime/std",
+	"sp-std/std",
 	"frame-support/std",
 	"frame-system/std",
-	"sp-io/std",
-	"sp-core/std",
 ]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/transaction-payment/README.md b/frame/transaction-payment/README.md
index 7e95677a1b27..bf114246e60f 100644
--- a/frame/transaction-payment/README.md
+++ b/frame/transaction-payment/README.md
@@ -1,16 +1,16 @@
-# Transaction Payment Module
+# Transaction Payment Pallet
 
-This module provides the basic logic needed to pay the absolute minimum amount needed for a
+This pallet provides the basic logic needed to pay the absolute minimum amount needed for a
 transaction to be included. This includes:
   - _weight fee_: A fee proportional to amount of weight a transaction consumes.
   - _length fee_: A fee proportional to the encoded length of the transaction.
   - _tip_: An optional tip. Tip increases the priority of the transaction, giving it a higher
     chance to be included by the transaction queue.
 
-Additionally, this module allows one to configure:
+Additionally, this pallet allows one to configure:
   - The mapping between one unit of weight to one unit of fee via [`Config::WeightToFee`].
   - A means of updating the fee for the next block, via defining a multiplier, based on the
     final state of the chain at the end of the previous block. This can be configured via
     [`Config::FeeMultiplierUpdate`]
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/frame/transaction-payment/rpc/Cargo.toml b/frame/transaction-payment/rpc/Cargo.toml
index 102f91dcc2c0..b5e0fd91e1c5 100644
--- a/frame/transaction-payment/rpc/Cargo.toml
+++ b/frame/transaction-payment/rpc/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 license = "Apache-2.0"
 homepage = "https://substrate.dev"
 repository = "https://github.com/paritytech/substrate/"
-description = "RPC interface for the transaction payment module."
+description = "RPC interface for the transaction payment pallet."
 readme = "README.md"
 
 [package.metadata.docs.rs]
@@ -17,9 +17,10 @@ codec = { package = "parity-scale-codec", version = "2.0.0" }
 jsonrpc-core = "15.1.0"
 jsonrpc-core-client = "15.1.0"
 jsonrpc-derive = "15.1.0"
+
+sp-api = { version = "3.0.0", path = "../../../primitives/api" }
+sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
 sp-core = { version = "3.0.0", path = "../../../primitives/core" }
 sp-rpc = { version = "3.0.0", path = "../../../primitives/rpc" }
 sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
-sp-api = { version = "3.0.0", path = "../../../primitives/api" }
-sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
 pallet-transaction-payment-rpc-runtime-api = { version = "3.0.0", path = "./runtime-api" }
diff --git a/frame/transaction-payment/rpc/README.md b/frame/transaction-payment/rpc/README.md
index 21a8a7d37cae..bf2ada1ff0ab 100644
--- a/frame/transaction-payment/rpc/README.md
+++ b/frame/transaction-payment/rpc/README.md
@@ -1,3 +1,3 @@
-RPC interface for the transaction payment module.
+RPC interface for the transaction payment pallet.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/frame/transaction-payment/rpc/runtime-api/Cargo.toml b/frame/transaction-payment/rpc/runtime-api/Cargo.toml
index fede9f9dd026..bb84364a9dfe 100644
--- a/frame/transaction-payment/rpc/runtime-api/Cargo.toml
+++ b/frame/transaction-payment/rpc/runtime-api/Cargo.toml
@@ -13,16 +13,16 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-api = { version = "3.0.0", default-features = false, path = "../../../../primitives/api" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+sp-api = { version = "3.0.0", default-features = false, path = "../../../../primitives/api" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../../../primitives/runtime" }
 pallet-transaction-payment = { version = "3.0.0", default-features = false, path = "../../../transaction-payment" }
 
 [features]
 default = ["std"]
 std = [
-	"sp-api/std",
 	"codec/std",
+	"sp-api/std",
 	"sp-runtime/std",
 	"pallet-transaction-payment/std",
 ]
diff --git a/frame/transaction-payment/rpc/runtime-api/README.md b/frame/transaction-payment/rpc/runtime-api/README.md
index e453d9a3b7c8..0d81abdb1eeb 100644
--- a/frame/transaction-payment/rpc/runtime-api/README.md
+++ b/frame/transaction-payment/rpc/runtime-api/README.md
@@ -1,3 +1,3 @@
-Runtime API definition for transaction payment module.
+Runtime API definition for transaction payment pallet.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/frame/transaction-payment/rpc/runtime-api/src/lib.rs b/frame/transaction-payment/rpc/runtime-api/src/lib.rs
index bd05aec30333..696550d3ef04 100644
--- a/frame/transaction-payment/rpc/runtime-api/src/lib.rs
+++ b/frame/transaction-payment/rpc/runtime-api/src/lib.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Runtime API definition for transaction payment module.
+//! Runtime API definition for transaction payment pallet.
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
diff --git a/frame/transaction-payment/rpc/src/lib.rs b/frame/transaction-payment/rpc/src/lib.rs
index b3e892c165e3..efe9f010d139 100644
--- a/frame/transaction-payment/rpc/src/lib.rs
+++ b/frame/transaction-payment/rpc/src/lib.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! RPC interface for the transaction payment module.
+//! RPC interface for the transaction payment pallet.
 
 use std::sync::Arc;
 use std::convert::TryInto;
diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
index 17a4c8f81c96..af1fcc5bfeaa 100644
--- a/frame/transaction-payment/src/lib.rs
+++ b/frame/transaction-payment/src/lib.rs
@@ -15,9 +15,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! # Transaction Payment Module
+//! # Transaction Payment Pallet
 //!
-//! This module provides the basic logic needed to pay the absolute minimum amount needed for a
+//! This pallet provides the basic logic needed to pay the absolute minimum amount needed for a
 //! transaction to be included. This includes:
 //!   - _base fee_: This is the minimum amount a user pays for a transaction. It is declared
 //! 	as a base _weight_ in the runtime and converted to a fee using `WeightToFee`.
@@ -38,7 +38,7 @@
 //!   - `targeted_fee_adjustment`: This is a multiplier that can tune the final fee based on
 //! 	the congestion of the network.
 //!
-//! Additionally, this module allows one to configure:
+//! Additionally, this pallet allows one to configure:
 //!   - The mapping between one unit of weight to one unit of fee via [`Config::WeightToFee`].
 //!   - A means of updating the fee for the next block, via defining a multiplier, based on the
 //!     final state of the chain at the end of the previous block. This can be configured via
@@ -47,17 +47,8 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use sp_std::prelude::*;
 use codec::{Encode, Decode};
-use frame_support::{
-	decl_storage, decl_module,
-	traits::Get,
-	weights::{
-		Weight, DispatchInfo, PostDispatchInfo, GetDispatchInfo, Pays, WeightToFeePolynomial,
-		WeightToFeeCoefficient, DispatchClass,
-	},
-	dispatch::DispatchResult,
-};
+
 use sp_runtime::{
 	FixedU128, FixedPointNumber, FixedPointOperand, Perquintill, RuntimeDebug,
 	transaction_validity::{
@@ -68,23 +59,33 @@ use sp_runtime::{
 		DispatchInfoOf, PostDispatchInfoOf,
 	},
 };
+use sp_std::prelude::*;
+
+use frame_support::{
+	traits::Get,
+	weights::{
+		Weight, DispatchInfo, PostDispatchInfo, GetDispatchInfo, Pays, WeightToFeePolynomial,
+		WeightToFeeCoefficient, DispatchClass,
+	},
+	dispatch::DispatchResult,
+};
 
 mod payment;
 mod types;
 
+pub use pallet::*;
 pub use payment::*;
 pub use types::{InclusionFee, FeeDetails, RuntimeDispatchInfo};
 
 /// Fee multiplier.
 pub type Multiplier = FixedU128;
 
-type BalanceOf<T> =
-	<<T as Config>::OnChargeTransaction as OnChargeTransaction<T>>::Balance;
+type BalanceOf<T> = <<T as Config>::OnChargeTransaction as OnChargeTransaction<T>>::Balance;
 
 /// A struct to update the weight multiplier per block. It implements `Convert<Multiplier,
 /// Multiplier>`, meaning that it can convert the previous multiplier to the next one. This should
 /// be called on `on_finalize` of a block, prior to potentially cleaning the weight data from the
-/// system module.
+/// system pallet.
 ///
 /// given:
 /// 	s = previous block weight
@@ -214,10 +215,10 @@ impl<T, S, V, M> Convert<Multiplier, Multiplier> for TargetedFeeAdjustment<T, S,
 	}
 }
 
-/// Storage releases of the module.
+/// Storage releases of the pallet.
 #[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, RuntimeDebug)]
 enum Releases {
-	/// Original version of the module.
+	/// Original version of the pallet.
 	V1Ancient,
 	/// One that bumps the usage to FixedU128 from FixedI128.
 	V2,
@@ -229,44 +230,83 @@ impl Default for Releases {
 	}
 }
 
-pub trait Config: frame_system::Config {
-	/// Handler for withdrawing, refunding and depositing the transaction fee.
-	/// Transaction fees are withdrawn before the transaction is executed.
-	/// After the transaction was executed the transaction weight can be
-	/// adjusted, depending on the used resources by the transaction. If the
-	/// transaction weight is lower than expected, parts of the transaction fee
-	/// might be refunded. In the end the fees can be deposited.
-	type OnChargeTransaction: OnChargeTransaction<Self>;
+#[frame_support::pallet]
+pub mod pallet {
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+	use super::*;
 
-	/// The fee to be paid for making a transaction; the per-byte portion.
-	type TransactionByteFee: Get<BalanceOf<Self>>;
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(_);
 
-	/// Convert a weight value into a deductible fee based on the currency type.
-	type WeightToFee: WeightToFeePolynomial<Balance=BalanceOf<Self>>;
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		/// Handler for withdrawing, refunding and depositing the transaction fee.
+		/// Transaction fees are withdrawn before the transaction is executed.
+		/// After the transaction was executed the transaction weight can be
+		/// adjusted, depending on the used resources by the transaction. If the
+		/// transaction weight is lower than expected, parts of the transaction fee
+		/// might be refunded. In the end the fees can be deposited.
+		type OnChargeTransaction: OnChargeTransaction<Self>;
 
-	/// Update the multiplier of the next block, based on the previous block's weight.
-	type FeeMultiplierUpdate: MultiplierUpdate;
-}
+		/// The fee to be paid for making a transaction; the per-byte portion.
+		#[pallet::constant]
+		type TransactionByteFee: Get<BalanceOf<Self>>;
 
-decl_storage! {
-	trait Store for Module<T: Config> as TransactionPayment {
-		pub NextFeeMultiplier get(fn next_fee_multiplier): Multiplier = Multiplier::saturating_from_integer(1);
+		/// Convert a weight value into a deductible fee based on the currency type.
+		type WeightToFee: WeightToFeePolynomial<Balance = BalanceOf<Self>>;
 
-		StorageVersion build(|_: &GenesisConfig| Releases::V2): Releases;
+		/// Update the multiplier of the next block, based on the previous block's weight.
+		type FeeMultiplierUpdate: MultiplierUpdate;
 	}
-}
-
-decl_module! {
-	pub struct Module<T: Config> for enum Call where origin: T::Origin {
-		/// The fee to be paid for making a transaction; the per-byte portion.
-		const TransactionByteFee: BalanceOf<T> = T::TransactionByteFee::get();
 
+	#[pallet::extra_constants]
+	impl<T: Config> Pallet<T> {
+		//TODO: rename to snake case after https://github.com/paritytech/substrate/issues/8826 fixed.
+		#[allow(non_snake_case)]
 		/// The polynomial that is applied in order to derive fee from weight.
-		const WeightToFee: Vec<WeightToFeeCoefficient<BalanceOf<T>>> =
-			T::WeightToFee::polynomial().to_vec();
+		fn WeightToFee() -> Vec<WeightToFeeCoefficient<BalanceOf<T>>> {
+			T::WeightToFee::polynomial().to_vec()
+		}
+	}
+
+	#[pallet::type_value]
+	pub fn NextFeeMultiplierOnEmpty() -> Multiplier { Multiplier::saturating_from_integer(1) }
+
+	#[pallet::storage]
+	#[pallet::getter(fn next_fee_multiplier)]
+	pub type NextFeeMultiplier<T: Config> = StorageValue<
+		_,
+		Multiplier,
+		ValueQuery,
+		NextFeeMultiplierOnEmpty
+	>;
+
+	#[pallet::storage]
+	pub(super) type StorageVersion<T: Config> = StorageValue<_, Releases, ValueQuery>;
+
+	#[pallet::genesis_config]
+	pub struct GenesisConfig;
+
+	#[cfg(feature = "std")]
+	impl Default for GenesisConfig {
+		fn default() -> Self {
+			Self
+		}
+	}
 
-		fn on_finalize() {
-			NextFeeMultiplier::mutate(|fm| {
+	#[pallet::genesis_build]
+	impl<T: Config> GenesisBuild<T> for GenesisConfig {
+		fn build(&self) {
+			StorageVersion::<T>::put(Releases::V2);
+		}
+	}
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+		fn on_finalize(_: T::BlockNumber) {
+			<NextFeeMultiplier<T>>::mutate(|fm| {
 				*fm = T::FeeMultiplierUpdate::convert(*fm);
 			});
 		}
@@ -293,7 +333,6 @@ decl_module! {
 					"Setting `max_total` for `Normal` dispatch class is not compatible with \
 					`transaction-payment` pallet."
 				);
-
 			// add 1 percent;
 			let addition = target / 100;
 			if addition == 0 {
@@ -302,6 +341,7 @@ decl_module! {
 			}
 			target += addition;
 
+			#[cfg(any(feature = "std", test))]
 			sp_io::TestExternalities::new_empty().execute_with(|| {
 				<frame_system::Pallet<T>>::set_block_consumed_resources(target, 0);
 				let next = T::FeeMultiplierUpdate::convert(min_value);
@@ -309,17 +349,17 @@ decl_module! {
 					block saturation is more than target by 1% and multiplier is minimal then \
 					the multiplier doesn't increase."
 				);
-			})
+			});
 		}
 	}
 }
 
-impl<T: Config> Module<T> where
+impl<T: Config> Pallet<T> where
 	BalanceOf<T>: FixedPointOperand
 {
 	/// Query the data that we know about the fee of a given `call`.
 	///
-	/// This module is not and cannot be aware of the internals of a signed extension, for example
+	/// This pallet is not and cannot be aware of the internals of a signed extension, for example
 	/// a tip. It only interprets the extrinsic as some encoded value and accounts for its weight
 	/// and length, the runtime's extrinsic base weight, and the current fee multiplier.
 	///
@@ -330,7 +370,7 @@ impl<T: Config> Module<T> where
 		len: u32,
 	) -> RuntimeDispatchInfo<BalanceOf<T>>
 	where
-		T::Call: Dispatchable<Info=DispatchInfo>,
+		T::Call: Dispatchable<Info = DispatchInfo>,
 	{
 		// NOTE: we can actually make it understand `ChargeTransactionPayment`, but would be some
 		// hassle for sure. We have to make it aware of the index of `ChargeTransactionPayment` in
@@ -351,7 +391,7 @@ impl<T: Config> Module<T> where
 		len: u32,
 	) -> FeeDetails<BalanceOf<T>>
 	where
-		T::Call: Dispatchable<Info=DispatchInfo>,
+		T::Call: Dispatchable<Info = DispatchInfo>,
 	{
 		let dispatch_info = <Extrinsic as GetDispatchInfo>::get_dispatch_info(&unchecked_extrinsic);
 		Self::compute_fee_details(len, &dispatch_info, 0u32.into())
@@ -363,7 +403,7 @@ impl<T: Config> Module<T> where
 		info: &DispatchInfoOf<T::Call>,
 		tip: BalanceOf<T>,
 	) -> BalanceOf<T> where
-		T::Call: Dispatchable<Info=DispatchInfo>,
+		T::Call: Dispatchable<Info = DispatchInfo>,
 	{
 		Self::compute_fee_details(len, info, tip).final_fee()
 	}
@@ -374,7 +414,7 @@ impl<T: Config> Module<T> where
 		info: &DispatchInfoOf<T::Call>,
 		tip: BalanceOf<T>,
 	) -> FeeDetails<BalanceOf<T>> where
-		T::Call: Dispatchable<Info=DispatchInfo>,
+		T::Call: Dispatchable<Info = DispatchInfo>,
 	{
 		Self::compute_fee_raw(len, info.weight, tip, info.pays_fee, info.class)
 	}
@@ -389,7 +429,7 @@ impl<T: Config> Module<T> where
 		post_info: &PostDispatchInfoOf<T::Call>,
 		tip: BalanceOf<T>,
 	) -> BalanceOf<T> where
-		T::Call: Dispatchable<Info=DispatchInfo,PostInfo=PostDispatchInfo>,
+		T::Call: Dispatchable<Info = DispatchInfo, PostInfo = PostDispatchInfo>,
 	{
 		Self::compute_actual_fee_details(len, info, post_info, tip).final_fee()
 	}
@@ -401,7 +441,7 @@ impl<T: Config> Module<T> where
 		post_info: &PostDispatchInfoOf<T::Call>,
 		tip: BalanceOf<T>,
 	) -> FeeDetails<BalanceOf<T>> where
-		T::Call: Dispatchable<Info=DispatchInfo,PostInfo=PostDispatchInfo>,
+		T::Call: Dispatchable<Info = DispatchInfo, PostInfo = PostDispatchInfo>,
 	{
 		Self::compute_fee_raw(
 			len,
@@ -457,7 +497,7 @@ impl<T: Config> Module<T> where
 	}
 }
 
-impl<T> Convert<Weight, BalanceOf<T>> for Module<T> where
+impl<T> Convert<Weight, BalanceOf<T>> for Pallet<T> where
 	T: Config,
 	BalanceOf<T>: FixedPointOperand,
 {
@@ -467,7 +507,7 @@ impl<T> Convert<Weight, BalanceOf<T>> for Module<T> where
 	/// share that the weight contributes to the overall fee of a transaction. It is mainly
 	/// for informational purposes and not used in the actual fee calculation.
 	fn convert(weight: Weight) -> BalanceOf<T> {
-		NextFeeMultiplier::get().saturating_mul_int(Self::weight_to_fee(weight))
+		<NextFeeMultiplier<T>>::get().saturating_mul_int(Self::weight_to_fee(weight))
 	}
 }
 
@@ -477,7 +517,7 @@ impl<T> Convert<Weight, BalanceOf<T>> for Module<T> where
 pub struct ChargeTransactionPayment<T: Config>(#[codec(compact)] BalanceOf<T>);
 
 impl<T: Config> ChargeTransactionPayment<T> where
-	T::Call: Dispatchable<Info=DispatchInfo, PostInfo=PostDispatchInfo>,
+	T::Call: Dispatchable<Info = DispatchInfo, PostInfo = PostDispatchInfo>,
 	BalanceOf<T>: Send + Sync + FixedPointOperand,
 {
 	/// utility constructor. Used only in client/factory code.
@@ -499,7 +539,7 @@ impl<T: Config> ChargeTransactionPayment<T> where
 		TransactionValidityError,
 	> {
 		let tip = self.0;
-		let fee = Module::<T>::compute_fee(len as u32, info, tip);
+		let fee = Pallet::<T>::compute_fee(len as u32, info, tip);
 
 		<<T as Config>::OnChargeTransaction as OnChargeTransaction<T>>::withdraw_fee(who, call, info, fee, tip)
 			.map(|i| (fee, i))
@@ -537,7 +577,7 @@ impl<T: Config> sp_std::fmt::Debug for ChargeTransactionPayment<T> {
 
 impl<T: Config> SignedExtension for ChargeTransactionPayment<T> where
 	BalanceOf<T>: Send + Sync + From<u64> + FixedPointOperand,
-	T::Call: Dispatchable<Info=DispatchInfo, PostInfo=PostDispatchInfo>,
+	T::Call: Dispatchable<Info = DispatchInfo, PostInfo = PostDispatchInfo>,
 {
 	const IDENTIFIER: &'static str = "ChargeTransactionPayment";
 	type AccountId = T::AccountId;
@@ -586,7 +626,7 @@ impl<T: Config> SignedExtension for ChargeTransactionPayment<T> where
 		_result: &DispatchResult,
 	) -> Result<(), TransactionValidityError> {
 		let (tip, who, imbalance) = pre;
-		let actual_fee = Module::<T>::compute_actual_fee(
+		let actual_fee = Pallet::<T>::compute_actual_fee(
 			len as u32,
 			info,
 			post_info,
@@ -601,8 +641,20 @@ impl<T: Config> SignedExtension for ChargeTransactionPayment<T> where
 mod tests {
 	use super::*;
 	use crate as pallet_transaction_payment;
-	use frame_system as system;
+
+	use std::cell::RefCell;
+
 	use codec::Encode;
+	use smallvec::smallvec;
+
+	use sp_core::H256;
+	use sp_runtime::{
+		testing::{Header, TestXt},
+		traits::{BlakeTwo256, IdentityLookup, One},
+		transaction_validity::InvalidTransaction,
+		Perbill,
+	};
+
 	use frame_support::{
 		assert_noop, assert_ok, parameter_types,
 		weights::{
@@ -611,16 +663,8 @@ mod tests {
 		},
 		traits::{Currency, OnUnbalanced, Imbalance},
 	};
+	use frame_system as system;
 	use pallet_balances::Call as BalancesCall;
-	use sp_core::H256;
-	use sp_runtime::{
-		testing::{Header, TestXt},
-		traits::{BlakeTwo256, IdentityLookup, One},
-		transaction_validity::InvalidTransaction,
-		Perbill,
-	};
-	use std::cell::RefCell;
-	use smallvec::smallvec;
 
 	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 	type Block = frame_system::mocking::MockBlock<Runtime>;
@@ -728,7 +772,7 @@ mod tests {
 	pub struct DealWithFees;
 	impl OnUnbalanced<pallet_balances::NegativeImbalance<Runtime>> for DealWithFees {
 		fn on_unbalanceds<B>(
-			mut fees_then_tips: impl Iterator<Item=pallet_balances::NegativeImbalance<Runtime>>
+			mut fees_then_tips: impl Iterator<Item = pallet_balances::NegativeImbalance<Runtime>>
 		) {
 			if let Some(fees) = fees_then_tips.next() {
 				FEE_UNBALANCED_AMOUNT.with(|a| *a.borrow_mut() += fees.peek());
@@ -882,7 +926,7 @@ mod tests {
 			.execute_with(||
 		{
 			let len = 10;
-			NextFeeMultiplier::put(Multiplier::saturating_from_rational(3, 2));
+			<NextFeeMultiplier<Runtime>>::put(Multiplier::saturating_from_rational(3, 2));
 
 			let pre = ChargeTransactionPayment::<Runtime>::from(5 /* tipped */)
 				.pre_dispatch(&2, CALL, &info_from_weight(100), len)
@@ -967,7 +1011,7 @@ mod tests {
 			.execute_with(||
 		{
 			// all fees should be x1.5
-			NextFeeMultiplier::put(Multiplier::saturating_from_rational(3, 2));
+			<NextFeeMultiplier<Runtime>>::put(Multiplier::saturating_from_rational(3, 2));
 			let len = 10;
 
 			assert_ok!(
@@ -1001,7 +1045,7 @@ mod tests {
 			.execute_with(||
 		{
 			// all fees should be x1.5
-			NextFeeMultiplier::put(Multiplier::saturating_from_rational(3, 2));
+			<NextFeeMultiplier<Runtime>>::put(Multiplier::saturating_from_rational(3, 2));
 
 			assert_eq!(
 				TransactionPayment::query_info(xt, len),
@@ -1028,7 +1072,7 @@ mod tests {
 			.execute_with(||
 		{
 			// Next fee multiplier is zero
-			assert_eq!(NextFeeMultiplier::get(), Multiplier::one());
+			assert_eq!(<NextFeeMultiplier<Runtime>>::get(), Multiplier::one());
 
 			// Tip only, no fees works
 			let dispatch_info = DispatchInfo {
@@ -1036,25 +1080,25 @@ mod tests {
 				class: DispatchClass::Operational,
 				pays_fee: Pays::No,
 			};
-			assert_eq!(Module::<Runtime>::compute_fee(0, &dispatch_info, 10), 10);
+			assert_eq!(Pallet::<Runtime>::compute_fee(0, &dispatch_info, 10), 10);
 			// No tip, only base fee works
 			let dispatch_info = DispatchInfo {
 				weight: 0,
 				class: DispatchClass::Operational,
 				pays_fee: Pays::Yes,
 			};
-			assert_eq!(Module::<Runtime>::compute_fee(0, &dispatch_info, 0), 100);
+			assert_eq!(Pallet::<Runtime>::compute_fee(0, &dispatch_info, 0), 100);
 			// Tip + base fee works
-			assert_eq!(Module::<Runtime>::compute_fee(0, &dispatch_info, 69), 169);
+			assert_eq!(Pallet::<Runtime>::compute_fee(0, &dispatch_info, 69), 169);
 			// Len (byte fee) + base fee works
-			assert_eq!(Module::<Runtime>::compute_fee(42, &dispatch_info, 0), 520);
+			assert_eq!(Pallet::<Runtime>::compute_fee(42, &dispatch_info, 0), 520);
 			// Weight fee + base fee works
 			let dispatch_info = DispatchInfo {
 				weight: 1000,
 				class: DispatchClass::Operational,
 				pays_fee: Pays::Yes,
 			};
-			assert_eq!(Module::<Runtime>::compute_fee(0, &dispatch_info, 0), 1100);
+			assert_eq!(Pallet::<Runtime>::compute_fee(0, &dispatch_info, 0), 1100);
 		});
 	}
 
@@ -1068,14 +1112,14 @@ mod tests {
 			.execute_with(||
 		{
 			// Add a next fee multiplier. Fees will be x3/2.
-			NextFeeMultiplier::put(Multiplier::saturating_from_rational(3, 2));
+			<NextFeeMultiplier<Runtime>>::put(Multiplier::saturating_from_rational(3, 2));
 			// Base fee is unaffected by multiplier
 			let dispatch_info = DispatchInfo {
 				weight: 0,
 				class: DispatchClass::Operational,
 				pays_fee: Pays::Yes,
 			};
-			assert_eq!(Module::<Runtime>::compute_fee(0, &dispatch_info, 0), 100);
+			assert_eq!(Pallet::<Runtime>::compute_fee(0, &dispatch_info, 0), 100);
 
 			// Everything works together :)
 			let dispatch_info = DispatchInfo {
@@ -1085,7 +1129,7 @@ mod tests {
 			};
 			// 123 weight, 456 length, 100 base
 			assert_eq!(
-				Module::<Runtime>::compute_fee(456, &dispatch_info, 789),
+				Pallet::<Runtime>::compute_fee(456, &dispatch_info, 789),
 				100 + (3 * 123 / 2) + 4560 + 789,
 			);
 		});
@@ -1101,7 +1145,7 @@ mod tests {
 			.execute_with(||
 		{
 			// Add a next fee multiplier. All fees will be x1/2.
-			NextFeeMultiplier::put(Multiplier::saturating_from_rational(1, 2));
+			<NextFeeMultiplier<Runtime>>::put(Multiplier::saturating_from_rational(1, 2));
 
 			// Base fee is unaffected by multiplier.
 			let dispatch_info = DispatchInfo {
@@ -1109,7 +1153,7 @@ mod tests {
 				class: DispatchClass::Operational,
 				pays_fee: Pays::Yes,
 			};
-			assert_eq!(Module::<Runtime>::compute_fee(0, &dispatch_info, 0), 100);
+			assert_eq!(Pallet::<Runtime>::compute_fee(0, &dispatch_info, 0), 100);
 
 			// Everything works together.
 			let dispatch_info = DispatchInfo {
@@ -1119,7 +1163,7 @@ mod tests {
 			};
 			// 123 weight, 456 length, 100 base
 			assert_eq!(
-				Module::<Runtime>::compute_fee(456, &dispatch_info, 789),
+				Pallet::<Runtime>::compute_fee(456, &dispatch_info, 789),
 				100 + (123 / 2) + 4560 + 789,
 			);
 		});
@@ -1141,7 +1185,7 @@ mod tests {
 				pays_fee: Pays::Yes,
 			};
 			assert_eq!(
-				Module::<Runtime>::compute_fee(
+				Pallet::<Runtime>::compute_fee(
 					u32::MAX,
 					&dispatch_info,
 					u64::MAX
@@ -1250,7 +1294,7 @@ mod tests {
 			let len = 10;
 			let tip = 5;
 
-			NextFeeMultiplier::put(Multiplier::saturating_from_rational(5, 4));
+			<NextFeeMultiplier<Runtime>>::put(Multiplier::saturating_from_rational(5, 4));
 
 			let pre = ChargeTransactionPayment::<Runtime>::from(tip)
 				.pre_dispatch(&2, CALL, &info, len)
@@ -1261,7 +1305,7 @@ mod tests {
 				.unwrap();
 
 			let refund_based_fee = prev_balance - Balances::free_balance(2);
-			let actual_fee = Module::<Runtime>
+			let actual_fee = Pallet::<Runtime>
 				::compute_actual_fee(len as u32, &info, &post_info, tip);
 
 			// 33 weight, 10 length, 7 base, 5 tip
@@ -1284,7 +1328,7 @@ mod tests {
 			let len = 10;
 			let tip = 5;
 
-			NextFeeMultiplier::put(Multiplier::saturating_from_rational(5, 4));
+			<NextFeeMultiplier<Runtime>>::put(Multiplier::saturating_from_rational(5, 4));
 
 			let pre = ChargeTransactionPayment::<Runtime>::from(tip)
 				.pre_dispatch(&2, CALL, &info, len)
@@ -1295,7 +1339,7 @@ mod tests {
 				.unwrap();
 
 			let refund_based_fee = prev_balance - Balances::free_balance(2);
-			let actual_fee = Module::<Runtime>
+			let actual_fee = Pallet::<Runtime>
 				::compute_actual_fee(len as u32, &info, &post_info, tip);
 
 			// Only 5 tip is paid
diff --git a/frame/transaction-payment/src/payment.rs b/frame/transaction-payment/src/payment.rs
index 1d910de8b6ce..376cd77ce3f8 100644
--- a/frame/transaction-payment/src/payment.rs
+++ b/frame/transaction-payment/src/payment.rs
@@ -1,16 +1,19 @@
 ///! Traits and default implementation for paying transaction fees.
+
 use crate::Config;
+
 use codec::FullCodec;
-use frame_support::{
-	traits::{Currency, ExistenceRequirement, Get, Imbalance, OnUnbalanced, WithdrawReasons},
-	unsigned::TransactionValidityError,
-};
 use sp_runtime::{
 	traits::{AtLeast32BitUnsigned, DispatchInfoOf, MaybeSerializeDeserialize, PostDispatchInfoOf, Saturating, Zero},
 	transaction_validity::InvalidTransaction,
 };
 use sp_std::{fmt::Debug, marker::PhantomData};
 
+use frame_support::{
+	traits::{Currency, ExistenceRequirement, Get, Imbalance, OnUnbalanced, WithdrawReasons},
+	unsigned::TransactionValidityError,
+};
+
 type NegativeImbalanceOf<C, T> =
 	<C as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
 
@@ -47,7 +50,7 @@ pub trait OnChargeTransaction<T: Config> {
 	) -> Result<(), TransactionValidityError>;
 }
 
-/// Implements the transaction payment for a module implementing the `Currency`
+/// Implements the transaction payment for a pallet implementing the `Currency`
 /// trait (eg. the pallet_balances) using an unbalance handler (implementing
 /// `OnUnbalanced`).
 ///
diff --git a/frame/transaction-payment/src/types.rs b/frame/transaction-payment/src/types.rs
index ab771eb8ba5d..b5d46a9167a7 100644
--- a/frame/transaction-payment/src/types.rs
+++ b/frame/transaction-payment/src/types.rs
@@ -17,12 +17,14 @@
 
 //! Types for transaction-payment RPC.
 
-use sp_std::prelude::*;
-use frame_support::weights::{Weight, DispatchClass};
 use codec::{Encode, Decode};
 #[cfg(feature = "std")]
 use serde::{Serialize, Deserialize};
+
 use sp_runtime::traits::{AtLeast32BitUnsigned, Zero};
+use sp_std::prelude::*;
+
+use frame_support::weights::{Weight, DispatchClass};
 
 /// The base fee and adjusted weight and length fees constitute the _inclusion fee_.
 #[derive(Encode, Decode, Clone, Eq, PartialEq)]

From eae82abfe3221b0695e6c1c552728eeb8db26c56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Fri, 25 Jun 2021 18:27:01 +0200
Subject: [PATCH 0925/1194] contracts: Remove weight pre charging (#8976)

* Remove pre-charging for code size

* Remove pre charging when reading values of fixed size

* Add new versions of API functions that leave out parameters

* Update CHANGELOG.md

* Apply suggestions from code review

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

* Add v1 for seal_set_rent_allowance

* Remove unneeded trait bound

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>
Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
---
 frame/contracts/CHANGELOG.md                  |    5 +
 frame/contracts/fixtures/dummy.wat            |    5 +
 .../fixtures/instantiate_return_code.wat      |    6 +-
 frame/contracts/fixtures/ok_trap_revert.wat   |    2 +-
 frame/contracts/fixtures/restoration.wat      |   13 +-
 frame/contracts/src/benchmarking/code.rs      |    7 +-
 frame/contracts/src/benchmarking/mod.rs       |   88 +-
 frame/contracts/src/chain_extension.rs        |   21 +-
 frame/contracts/src/exec.rs                   |  177 +--
 frame/contracts/src/gas.rs                    |    9 -
 frame/contracts/src/lib.rs                    |   23 +-
 frame/contracts/src/rent.rs                   |   22 +-
 frame/contracts/src/schedule.rs               |   34 +-
 frame/contracts/src/tests.rs                  |   66 +-
 frame/contracts/src/wasm/code_cache.rs        |   80 +-
 frame/contracts/src/wasm/mod.rs               |   54 +-
 frame/contracts/src/wasm/runtime.rs           |  463 +++---
 frame/contracts/src/weights.rs                | 1295 ++++++++---------
 18 files changed, 1238 insertions(+), 1132 deletions(-)
 create mode 100644 frame/contracts/fixtures/dummy.wat

diff --git a/frame/contracts/CHANGELOG.md b/frame/contracts/CHANGELOG.md
index dd679f432d31..03945d7b2e34 100644
--- a/frame/contracts/CHANGELOG.md
+++ b/frame/contracts/CHANGELOG.md
@@ -42,6 +42,11 @@ output to an RPC client.
 - Make storage and fields of `Schedule` private to the crate.
 [#8359](https://github.com/paritytech/substrate/pull/8359)
 
+### Fixed
+
+- Remove pre-charging which caused wrongly estimated weights
+[#8976](https://github.com/paritytech/substrate/pull/8976)
+
 ## [v3.0.0] 2021-02-25
 
 This version constitutes the first release that brings any stability guarantees (see above).
diff --git a/frame/contracts/fixtures/dummy.wat b/frame/contracts/fixtures/dummy.wat
new file mode 100644
index 000000000000..0aeefbcb7ebf
--- /dev/null
+++ b/frame/contracts/fixtures/dummy.wat
@@ -0,0 +1,5 @@
+;; A valid contract which does nothing at all
+(module
+	(func (export "deploy"))
+	(func (export "call"))
+)
diff --git a/frame/contracts/fixtures/instantiate_return_code.wat b/frame/contracts/fixtures/instantiate_return_code.wat
index 544489329cfa..6a8654520f10 100644
--- a/frame/contracts/fixtures/instantiate_return_code.wat
+++ b/frame/contracts/fixtures/instantiate_return_code.wat
@@ -4,8 +4,8 @@
 ;; The rest of the input is forwarded to the constructor of the callee
 (module
 	(import "seal0" "seal_input" (func $seal_input (param i32 i32)))
-	(import "seal0" "seal_instantiate" (func $seal_instantiate
-		(param i32 i32 i64 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32) (result i32)
+	(import "seal1" "seal_instantiate" (func $seal_instantiate
+		(param i32 i64 i32 i32 i32 i32 i32 i32 i32 i32 i32) (result i32)
 	))
 	(import "seal0" "seal_return" (func $seal_return (param i32 i32 i32)))
 	(import "env" "memory" (memory 1 1))
@@ -29,10 +29,8 @@
 			(i32.const 8)
 			(call $seal_instantiate
 				(i32.const 16) ;; Pointer to the code hash.
-				(i32.const 32) ;; Length of the code hash.
 				(i64.const 0) ;; How much gas to devote for the execution. 0 = all.
 				(i32.const 0) ;; Pointer to the buffer with value to transfer
-				(i32.const 8) ;; Length of the buffer with value to transfer.
 				(i32.const 48) ;; Pointer to input data buffer address
 				(i32.const 4) ;; Length of input data buffer
 				(i32.const 0xffffffff) ;; u32 max sentinel value: do not copy address
diff --git a/frame/contracts/fixtures/ok_trap_revert.wat b/frame/contracts/fixtures/ok_trap_revert.wat
index b71a6435db9c..b7eaa9b700af 100644
--- a/frame/contracts/fixtures/ok_trap_revert.wat
+++ b/frame/contracts/fixtures/ok_trap_revert.wat
@@ -32,4 +32,4 @@
         ;; 2 = trap
         (unreachable)
     )
-)
\ No newline at end of file
+)
diff --git a/frame/contracts/fixtures/restoration.wat b/frame/contracts/fixtures/restoration.wat
index 3462af287081..e24e5695a356 100644
--- a/frame/contracts/fixtures/restoration.wat
+++ b/frame/contracts/fixtures/restoration.wat
@@ -1,9 +1,9 @@
 (module
 	(import "seal0" "seal_set_storage" (func $seal_set_storage (param i32 i32 i32)))
 	(import "seal0" "seal_input" (func $seal_input (param i32 i32)))
-	(import "seal0" "seal_restore_to"
+	(import "seal1" "seal_restore_to"
 		(func $seal_restore_to
-			(param i32 i32 i32 i32 i32 i32 i32 i32)
+			(param i32 i32 i32 i32 i32)
 		)
 	)
 	(import "env" "memory" (memory 1 1))
@@ -27,15 +27,12 @@
 			)
 		)
 		(call $seal_restore_to
-			;; Pointer and length of the encoded dest buffer.
+			;; Pointer to the encoded dest buffer.
 			(i32.const 340)
-			(i32.const 32)
-			;; Pointer and length of the encoded code hash buffer
+			;; Pointer to the encoded code hash buffer
 			(i32.const 308)
-			(i32.const 32)
-			;; Pointer and length of the encoded rent_allowance buffer
+			;; Pointer to the encoded rent_allowance buffer
 			(i32.const 296)
-			(i32.const 8)
 			;; Pointer and number of items in the delta buffer.
 			;; This buffer specifies multiple keys for removal before restoration.
 			(i32.const 100)
diff --git a/frame/contracts/src/benchmarking/code.rs b/frame/contracts/src/benchmarking/code.rs
index b9bd693f1c2c..6faba8a2e064 100644
--- a/frame/contracts/src/benchmarking/code.rs
+++ b/frame/contracts/src/benchmarking/code.rs
@@ -258,9 +258,14 @@ where
 
 	/// Same as `dummy` but with maximum sized linear memory and a dummy section of specified size.
 	pub fn dummy_with_bytes(dummy_bytes: u32) -> Self {
+		// We want the module to have the size `dummy_bytes`.
+		// This is not completely correct as the overhead grows when the contract grows
+		// because of variable length integer encoding. However, it is good enough to be that
+		// close for benchmarking purposes.
+		let module_overhead = 65;
 		ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
-			dummy_section: dummy_bytes,
+			dummy_section: dummy_bytes.saturating_sub(module_overhead),
 			.. Default::default()
 		}
 		.into()
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index 7b77569a1f6d..cbe5e48a4f02 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -320,6 +320,25 @@ benchmarks! {
 		Contracts::<T>::reinstrument_module(&mut module, &schedule)?;
 	}
 
+	// The weight of loading and decoding of a contract's code per kilobyte.
+	code_load {
+		let c in 0 .. T::Schedule::get().limits.code_len / 1024;
+		let WasmModule { code, hash, .. } = WasmModule::<T>::dummy_with_bytes(c * 1024);
+		Contracts::<T>::store_code_raw(code)?;
+	}: {
+		<PrefabWasmModule<T>>::from_storage_noinstr(hash)?;
+	}
+
+	// The weight of changing the refcount of a contract's code per kilobyte.
+	code_refcount {
+		let c in 0 .. T::Schedule::get().limits.code_len / 1024;
+		let WasmModule { code, hash, .. } = WasmModule::<T>::dummy_with_bytes(c * 1024);
+		Contracts::<T>::store_code_raw(code)?;
+		let mut gas_meter = GasMeter::new(Weight::max_value());
+	}: {
+		<PrefabWasmModule<T>>::add_user(hash, &mut gas_meter)?;
+	}
+
 	// This constructs a contract that is maximal expensive to instrument.
 	// It creates a maximum number of metering blocks per byte.
 	// The size of the salt influences the runtime because is is hashed in order to
@@ -352,16 +371,14 @@ benchmarks! {
 	}
 
 	// Instantiate uses a dummy contract constructor to measure the overhead of the instantiate.
-	// `c`: Size of the code in kilobytes.
 	// `s`: Size of the salt in kilobytes.
 	instantiate {
-		let c in 0 .. T::Schedule::get().limits.code_len / 1024;
 		let s in 0 .. code::max_pages::<T>() * 64;
 		let salt = vec![42u8; (s * 1024) as usize];
 		let endowment = caller_funding::<T>() / 3u32.into();
 		let caller = whitelisted_caller();
 		T::Currency::make_free_balance_be(&caller, caller_funding::<T>());
-		let WasmModule { code, hash, .. } = WasmModule::<T>::dummy_with_bytes(c * 1024);
+		let WasmModule { code, hash, .. } = WasmModule::<T>::dummy();
 		let origin = RawOrigin::Signed(caller.clone());
 		let addr = Contracts::<T>::contract_address(&caller, &hash, &salt);
 		Contracts::<T>::store_code_raw(code)?;
@@ -380,12 +397,10 @@ benchmarks! {
 	// won't call `seal_input` in its constructor to copy the data to contract memory.
 	// The dummy contract used here does not do this. The costs for the data copy is billed as
 	// part of `seal_input`.
-	// `c`: Size of the code in kilobytes.
 	call {
-		let c in 0 .. T::Schedule::get().limits.code_len / 1024;
 		let data = vec![42u8; 1024];
 		let instance = Contract::<T>::with_caller(
-			whitelisted_caller(), WasmModule::dummy_with_bytes(c * 1024), vec![], Endow::CollectRent
+			whitelisted_caller(), WasmModule::dummy(), vec![], Endow::CollectRent
 		)?;
 		let value = T::Currency::minimum_balance() * 100u32.into();
 		let origin = RawOrigin::Signed(instance.caller.clone());
@@ -720,43 +735,6 @@ benchmarks! {
 		}
 	}
 
-	seal_terminate_per_code_kb {
-		let c in 0 .. T::Schedule::get().limits.code_len / 1024;
-		let beneficiary = account::<T::AccountId>("beneficiary", 0, 0);
-		let beneficiary_bytes = beneficiary.encode();
-		let beneficiary_len = beneficiary_bytes.len();
-		let code = WasmModule::<T>::from(ModuleDefinition {
-			memory: Some(ImportedMemory::max::<T>()),
-			imported_functions: vec![ImportedFunction {
-				module: "seal0",
-				name: "seal_terminate",
-				params: vec![ValueType::I32, ValueType::I32],
-				return_type: None,
-			}],
-			data_segments: vec![
-				DataSegment {
-					offset: 0,
-					value: beneficiary_bytes,
-				},
-			],
-			call_body: Some(body::repeated(1, &[
-				Instruction::I32Const(0), // beneficiary_ptr
-				Instruction::I32Const(beneficiary_len as i32), // beneficiary_len
-				Instruction::Call(0),
-			])),
-			dummy_section: c * 1024,
-			.. Default::default()
-		});
-		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
-		let origin = RawOrigin::Signed(instance.caller.clone());
-		assert_eq!(T::Currency::total_balance(&beneficiary), 0u32.into());
-		assert_eq!(T::Currency::total_balance(&instance.account_id), Endow::max::<T>());
-	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
-	verify {
-		assert_eq!(T::Currency::total_balance(&instance.account_id), 0u32.into());
-		assert_eq!(T::Currency::total_balance(&beneficiary), Endow::max::<T>());
-	}
-
 	seal_restore_to {
 		let r in 0 .. 1;
 
@@ -836,18 +814,15 @@ benchmarks! {
 		}
 	}
 
-	// `c`: Code size of caller contract
-	// `t`: Code size of tombstone contract
 	// `d`: Number of supplied delta keys
-	seal_restore_to_per_code_kb_delta {
-		let c in 0 .. T::Schedule::get().limits.code_len / 1024;
-		let t in 0 .. T::Schedule::get().limits.code_len / 1024;
+	seal_restore_to_per_delta {
 		let d in 0 .. API_BENCHMARK_BATCHES;
-		let mut tombstone = ContractWithStorage::<T>::with_code(
-			WasmModule::<T>::dummy_with_bytes(t * 1024), 0, 0
-		)?;
+		let mut tombstone = ContractWithStorage::<T>::new(0, 0)?;
 		tombstone.evict()?;
-		let delta = create_storage::<T>(d * API_BENCHMARK_BATCH_SIZE, T::Schedule::get().limits.payload_len)?;
+		let delta = create_storage::<T>(
+			d * API_BENCHMARK_BATCH_SIZE,
+			T::Schedule::get().limits.payload_len,
+		)?;
 
 		let dest = tombstone.contract.account_id.encode();
 		let dest_len = dest.len();
@@ -909,7 +884,6 @@ benchmarks! {
 				Instruction::Call(0),
 				Instruction::End,
 			])),
-			dummy_section: c * 1024,
 			.. Default::default()
 		});
 
@@ -1393,8 +1367,7 @@ benchmarks! {
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
-	seal_call_per_code_transfer_input_output_kb {
-		let c in 0 .. T::Schedule::get().limits.code_len / 1024;
+	seal_call_per_transfer_input_output_kb {
 		let t in 0 .. 1;
 		let i in 0 .. code::max_pages::<T>() * 64;
 		let o in 0 .. (code::max_pages::<T>() - 1) * 64;
@@ -1417,7 +1390,6 @@ benchmarks! {
 				Instruction::Call(0),
 				Instruction::End,
 			])),
-			dummy_section: c * 1024,
 			.. Default::default()
 		});
 		let callees = (0..API_BENCHMARK_BATCH_SIZE)
@@ -1593,8 +1565,7 @@ benchmarks! {
 		}
 	}
 
-	seal_instantiate_per_code_input_output_salt_kb {
-		let c in 0 .. T::Schedule::get().limits.code_len / 1024;
+	seal_instantiate_per_input_output_salt_kb {
 		let i in 0 .. (code::max_pages::<T>() - 1) * 64;
 		let o in 0 .. (code::max_pages::<T>() - 1) * 64;
 		let s in 0 .. (code::max_pages::<T>() - 1) * 64;
@@ -1617,7 +1588,6 @@ benchmarks! {
 				Instruction::Call(0),
 				Instruction::End,
 			])),
-			dummy_section: c * 1024,
 			.. Default::default()
 		});
 		let hash = callee_code.hash.clone();
diff --git a/frame/contracts/src/chain_extension.rs b/frame/contracts/src/chain_extension.rs
index ac71eca27b1c..01c362f613a5 100644
--- a/frame/contracts/src/chain_extension.rs
+++ b/frame/contracts/src/chain_extension.rs
@@ -59,7 +59,7 @@ use crate::{
 	wasm::{Runtime, RuntimeCosts},
 };
 use codec::Decode;
-use frame_support::weights::Weight;
+use frame_support::{weights::Weight, traits::MaxEncodedLen};
 use sp_runtime::DispatchError;
 use sp_std::{
 	marker::PhantomData,
@@ -300,18 +300,21 @@ where
 		Ok(())
 	}
 
-	/// Reads `in_len` from contract memory and scale decodes it.
+	/// Reads and decodes a type with a size fixed at compile time from contract memory.
 	///
 	/// This function is secure and recommended for all input types of fixed size
 	/// as long as the cost of reading the memory is included in the overall already charged
 	/// weight of the chain extension. This should usually be the case when fixed input types
-	/// are used. Non fixed size types (like everything using `Vec`) usually need to use
-	/// [`in_len()`](Self::in_len) in order to properly charge the necessary weight.
-	pub fn read_as<T: Decode>(&mut self) -> Result<T> {
-		self.inner.runtime.read_sandbox_memory_as(
-			self.inner.input_ptr,
-			self.inner.input_len,
-		)
+	/// are used.
+	pub fn read_as<T: Decode + MaxEncodedLen>(&mut self) -> Result<T> {
+		self.inner.runtime.read_sandbox_memory_as(self.inner.input_ptr)
+	}
+
+	/// Reads and decodes a type with a dynamic size from contract memory.
+	///
+	/// Make sure to include `len` in your weight calculations.
+	pub fn read_as_unbounded<T: Decode>(&mut self, len: u32) -> Result<T> {
+		self.inner.runtime.read_sandbox_memory_as_unbounded(self.inner.input_ptr, len)
 	}
 
 	/// The length of the input as passed in as `input_len`.
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index 3739ab77e2b6..2b595ea6ce8d 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -168,7 +168,7 @@ pub trait Ext: sealing::Sealed {
 		value: BalanceOf<Self::T>,
 		input_data: Vec<u8>,
 		allows_reentry: bool,
-	) -> Result<(ExecReturnValue, u32), (ExecError, u32)>;
+	) -> Result<ExecReturnValue, ExecError>;
 
 	/// Instantiate a contract from the given code.
 	///
@@ -186,24 +186,16 @@ pub trait Ext: sealing::Sealed {
 		value: BalanceOf<Self::T>,
 		input_data: Vec<u8>,
 		salt: &[u8],
-	) -> Result<(AccountIdOf<Self::T>, ExecReturnValue, u32), (ExecError, u32)>;
+	) -> Result<(AccountIdOf<Self::T>, ExecReturnValue ), ExecError>;
 
 	/// Transfer all funds to `beneficiary` and delete the contract.
 	///
-	/// Returns the original code size of the terminated contract.
 	/// Since this function removes the self contract eagerly, if succeeded, no further actions should
 	/// be performed on this `Ext` instance.
 	///
 	/// This function will fail if the same contract is present on the contract
 	/// call stack.
-	///
-	/// # Return Value
-	///
-	/// Result<CodeSize, (DispatchError, CodeSize)>
-	fn terminate(
-		&mut self,
-		beneficiary: &AccountIdOf<Self::T>,
-	) -> Result<u32, (DispatchError, u32)>;
+	fn terminate(&mut self, beneficiary: &AccountIdOf<Self::T>) -> Result<(), DispatchError>;
 
 	/// Restores the given destination contract sacrificing the current one.
 	///
@@ -222,7 +214,7 @@ pub trait Ext: sealing::Sealed {
 		code_hash: CodeHash<Self::T>,
 		rent_allowance: BalanceOf<Self::T>,
 		delta: Vec<StorageKey>,
-	) -> Result<(u32, u32), (DispatchError, u32, u32)>;
+	) -> Result<(), DispatchError>;
 
 	/// Transfer some amount of funds into the specified account.
 	fn transfer(
@@ -325,6 +317,9 @@ pub enum ExportedFunction {
 /// order to be able to mock the wasm logic for testing.
 pub trait Executable<T: Config>: Sized {
 	/// Load the executable from storage.
+	///
+	/// # Note
+	/// Charges size base load and instrumentation weight from the gas meter.
 	fn from_storage(
 		code_hash: CodeHash<T>,
 		schedule: &Schedule<T>,
@@ -336,6 +331,10 @@ pub trait Executable<T: Config>: Sized {
 	/// A code module is re-instrumented on-load when it was originally instrumented with
 	/// an older schedule. This skips this step for cases where the code storage is
 	/// queried for purposes other than execution.
+	///
+	/// # Note
+	///
+	/// Does not charge from the gas meter. Do not call in contexts where this is important.
 	fn from_storage_noinstr(code_hash: CodeHash<T>) -> Result<Self, DispatchError>;
 
 	/// Decrements the refcount by one and deletes the code if it drops to zero.
@@ -344,12 +343,22 @@ pub trait Executable<T: Config>: Sized {
 	/// Increment the refcount by one. Fails if the code does not exist on-chain.
 	///
 	/// Returns the size of the original code.
-	fn add_user(code_hash: CodeHash<T>) -> Result<u32, DispatchError>;
+	///
+	/// # Note
+	///
+	/// Charges weight proportional to the code size from the gas meter.
+	fn add_user(code_hash: CodeHash<T>, gas_meter: &mut GasMeter<T>)
+		-> Result<(), DispatchError>;
 
 	/// Decrement the refcount by one and remove the code when it drops to zero.
 	///
 	/// Returns the size of the original code.
-	fn remove_user(code_hash: CodeHash<T>) -> u32;
+	///
+	/// # Note
+	///
+	/// Charges weight proportional to the code size from the gas meter
+	fn remove_user(code_hash: CodeHash<T>, gas_meter: &mut GasMeter<T>)
+		-> Result<(), DispatchError>;
 
 	/// Execute the specified exported function and return the result.
 	///
@@ -595,7 +604,7 @@ where
 		value: BalanceOf<T>,
 		input_data: Vec<u8>,
 		debug_message: Option<&'a mut Vec<u8>>,
-	) -> Result<(ExecReturnValue, u32), (ExecError, u32)> {
+	) -> Result<ExecReturnValue, ExecError> {
 		let (mut stack, executable) = Self::new(
 			FrameArgs::Call{dest, cached_info: None},
 			origin,
@@ -639,11 +648,9 @@ where
 			schedule,
 			value,
 			debug_message,
-		).map_err(|(e, _code_len)| e)?;
+		)?;
 		let account_id = stack.top_frame().account_id.clone();
-		stack.run(executable, input_data)
-			.map(|(ret, _code_len)| (account_id, ret))
-			.map_err(|(err, _code_len)| err)
+		stack.run(executable, input_data).map(|ret| (account_id, ret))
 	}
 
 	/// Create a new call stack.
@@ -654,7 +661,7 @@ where
 		schedule: &'a Schedule<T>,
 		value: BalanceOf<T>,
 		debug_message: Option<&'a mut Vec<u8>>,
-	) -> Result<(Self, E), (ExecError, u32)> {
+	) -> Result<(Self, E), ExecError> {
 		let (first_frame, executable) = Self::new_frame(args, value, gas_meter, 0, &schedule)?;
 		let stack = Self {
 			origin,
@@ -682,22 +689,20 @@ where
 		gas_meter: &mut GasMeter<T>,
 		gas_limit: Weight,
 		schedule: &Schedule<T>
-	) -> Result<(Frame<T>, E), (ExecError, u32)> {
+	) -> Result<(Frame<T>, E), ExecError> {
 		let (account_id, contract_info, executable, entry_point) = match frame_args {
 			FrameArgs::Call{dest, cached_info} => {
 				let contract = if let Some(contract) = cached_info {
 					contract
 				} else {
 					<ContractInfoOf<T>>::get(&dest)
-						.ok_or((<Error<T>>::ContractNotFound.into(), 0))
+						.ok_or(<Error<T>>::ContractNotFound.into())
 						.and_then(|contract|
-							contract.get_alive()
-								.ok_or((<Error<T>>::ContractIsTombstone.into(), 0))
+							contract.get_alive().ok_or(<Error<T>>::ContractIsTombstone)
 						)?
 				};
 
-				let executable = E::from_storage(contract.code_hash, schedule, gas_meter)
-					.map_err(|e| (e.into(), 0))?;
+				let executable = E::from_storage(contract.code_hash, schedule, gas_meter)?;
 
 				// This charges the rent and denies access to a contract that is in need of
 				// eviction by returning `None`. We cannot evict eagerly here because those
@@ -705,9 +710,8 @@ where
 				// contract.
 				// See: https://github.com/paritytech/substrate/issues/6439#issuecomment-648754324
 				let contract = Rent::<T, E>
-					::charge(&dest, contract, executable.occupied_storage())
-					.map_err(|e| (e.into(), executable.code_len()))?
-					.ok_or((Error::<T>::RentNotPaid.into(), executable.code_len()))?;
+					::charge(&dest, contract, executable.occupied_storage())?
+					.ok_or(Error::<T>::RentNotPaid)?;
 				(dest, contract, executable, ExportedFunction::Call)
 			}
 			FrameArgs::Instantiate{sender, trie_seed, executable, salt} => {
@@ -719,7 +723,7 @@ where
 					&account_id,
 					trie_id,
 					executable.code_hash().clone(),
-				).map_err(|e| (e.into(), executable.code_len()))?;
+				)?;
 				(account_id, contract, executable, ExportedFunction::Constructor)
 			}
 		};
@@ -732,8 +736,7 @@ where
 			contract_info: CachedContract::Cached(contract_info),
 			account_id,
 			entry_point,
-			nested_meter: gas_meter.nested(gas_limit)
-				.map_err(|e| (e.into(), executable.code_len()))?,
+			nested_meter: gas_meter.nested(gas_limit)?,
 			allows_reentry: true,
 		};
 
@@ -746,9 +749,9 @@ where
 		frame_args: FrameArgs<T, E>,
 		value_transferred: BalanceOf<T>,
 		gas_limit: Weight,
-	) -> Result<E, (ExecError, u32)> {
+	) -> Result<E, ExecError> {
 		if self.frames.len() == T::CallStack::size() {
-			return Err((Error::<T>::MaxCallDepthReached.into(), 0));
+			return Err(Error::<T>::MaxCallDepthReached.into());
 		}
 
 		// We need to make sure that changes made to the contract info are not discarded.
@@ -787,7 +790,7 @@ where
 		&mut self,
 		executable: E,
 		input_data: Vec<u8>
-	) -> Result<(ExecReturnValue, u32), (ExecError, u32)> {
+	) -> Result<ExecReturnValue, ExecError> {
 		let entry_point = self.top_frame().entry_point;
 		let do_transaction = || {
 			// Cache the value before calling into the constructor because that
@@ -795,17 +798,16 @@ where
 			// the same code hash we still charge the "1 block rent" as if they weren't
 			// spawned. This is OK as overcharging is always safe.
 			let occupied_storage = executable.occupied_storage();
-			let code_len = executable.code_len();
 
 			// Every call or instantiate also optionally transferres balance.
-			self.initial_transfer().map_err(|e| (ExecError::from(e), code_len))?;
+			self.initial_transfer()?;
 
 			// Call into the wasm blob.
 			let output = executable.execute(
 				self,
 				&entry_point,
 				input_data,
-			).map_err(|e| (ExecError { error: e.error, origin: ErrorOrigin::Callee }, code_len))?;
+			).map_err(|e| ExecError { error: e.error, origin: ErrorOrigin::Callee })?;
 
 			// Additional work needs to be performed in case of an instantiation.
 			if output.is_success() && entry_point == ExportedFunction::Constructor {
@@ -814,7 +816,7 @@ where
 
 				// It is not allowed to terminate a contract inside its constructor.
 				if let CachedContract::Terminated = frame.contract_info {
-					return Err((Error::<T>::TerminatedInConstructor.into(), code_len));
+					return Err(Error::<T>::TerminatedInConstructor.into());
 				}
 
 				// Collect the rent for the first block to prevent the creation of very large
@@ -823,9 +825,8 @@ where
 				// in order to keep up the guarantuee that we always leave a tombstone behind
 				// with the exception of a contract that called `seal_terminate`.
 				let contract = Rent::<T, E>
-					::charge(&account_id, frame.invalidate(), occupied_storage)
-					.map_err(|e| (e.into(), code_len))?
-					.ok_or((Error::<T>::NewContractNotFunded.into(), code_len))?;
+					::charge(&account_id, frame.invalidate(), occupied_storage)?
+					.ok_or(Error::<T>::NewContractNotFunded)?;
 				frame.contract_info = CachedContract::Cached(contract);
 
 				// Deposit an instantiation event.
@@ -835,7 +836,7 @@ where
 				));
 			}
 
-			Ok((output, code_len))
+			Ok(output)
 		};
 
 		// All changes performed by the contract are executed under a storage transaction.
@@ -843,8 +844,8 @@ where
 		// comitted or rolled back when popping the frame.
 		let (success, output) = with_transaction(|| {
 			let output = do_transaction();
-			match output {
-				Ok((ref result, _)) if result.is_success() => {
+			match &output {
+				Ok(result) if result.is_success() => {
 					TransactionOutcome::Commit((true, output))
 				},
 				_ => TransactionOutcome::Rollback((false, output)),
@@ -1055,7 +1056,7 @@ where
 		value: BalanceOf<T>,
 		input_data: Vec<u8>,
 		allows_reentry: bool,
-	) -> Result<(ExecReturnValue, u32), (ExecError, u32)> {
+	) -> Result<ExecReturnValue, ExecError> {
 		// Before pushing the new frame: Protect the caller contract against reentrancy attacks.
 		// It is important to do this before calling `allows_reentry` so that a direct recursion
 		// is caught by it.
@@ -1063,7 +1064,7 @@ where
 
 		let try_call = || {
 			if !self.allows_reentry(&to) {
-				return Err((<Error<T>>::ReentranceDenied.into(), 0));
+				return Err(<Error<T>>::ReentranceDenied.into());
 			}
 			// We ignore instantiate frames in our search for a cached contract.
 			// Otherwise it would be possible to recursively call a contract from its own
@@ -1101,9 +1102,8 @@ where
 		endowment: BalanceOf<T>,
 		input_data: Vec<u8>,
 		salt: &[u8],
-	) -> Result<(AccountIdOf<T>, ExecReturnValue, u32), (ExecError, u32)> {
-		let executable = E::from_storage(code_hash, &self.schedule, self.gas_meter())
-			.map_err(|e| (e.into(), 0))?;
+	) -> Result<(AccountIdOf<T>, ExecReturnValue), ExecError> {
+		let executable = E::from_storage(code_hash, &self.schedule, self.gas_meter())?;
 		let trie_seed = self.next_trie_seed();
 		let executable = self.push_frame(
 			FrameArgs::Instantiate {
@@ -1116,33 +1116,29 @@ where
 			gas_limit,
 		)?;
 		let account_id = self.top_frame().account_id.clone();
-		self.run(executable, input_data)
-			.map(|(ret, code_len)| (account_id, ret, code_len))
+		self.run(executable, input_data).map(|ret| (account_id, ret))
 	}
 
-	fn terminate(
-		&mut self,
-		beneficiary: &AccountIdOf<Self::T>,
-	) -> Result<u32, (DispatchError, u32)> {
+	fn terminate(&mut self, beneficiary: &AccountIdOf<Self::T>) -> Result<(), DispatchError> {
 		if self.is_recursive() {
-			return Err((Error::<T>::TerminatedWhileReentrant.into(), 0));
+			return Err(Error::<T>::TerminatedWhileReentrant.into());
 		}
 		let frame = self.top_frame_mut();
 		let info = frame.terminate();
-		Storage::<T>::queue_trie_for_deletion(&info).map_err(|e| (e, 0))?;
+		Storage::<T>::queue_trie_for_deletion(&info)?;
 		<Stack<'a, T, E>>::transfer(
 			true,
 			true,
 			&frame.account_id,
 			beneficiary,
 			T::Currency::free_balance(&frame.account_id),
-		).map_err(|e| (e, 0))?;
+		)?;
 		ContractInfoOf::<T>::remove(&frame.account_id);
-		let code_len = E::remove_user(info.code_hash);
+		E::remove_user(info.code_hash, &mut frame.nested_meter)?;
 		Contracts::<T>::deposit_event(
 			Event::Terminated(frame.account_id.clone(), beneficiary.clone()),
 		);
-		Ok(code_len)
+		Ok(())
 	}
 
 	fn restore_to(
@@ -1151,30 +1147,33 @@ where
 		code_hash: CodeHash<Self::T>,
 		rent_allowance: BalanceOf<Self::T>,
 		delta: Vec<StorageKey>,
-	) -> Result<(u32, u32), (DispatchError, u32, u32)> {
+	) -> Result<(), DispatchError> {
 		if self.is_recursive() {
-			return Err((Error::<T>::TerminatedWhileReentrant.into(), 0, 0));
+			return Err(Error::<T>::TerminatedWhileReentrant.into());
 		}
-		let origin_contract = self.top_frame_mut().contract_info().clone();
+		let frame = self.top_frame_mut();
+		let origin_contract = frame.contract_info().clone();
+		let account_id = frame.account_id.clone();
 		let result = Rent::<T, E>::restore_to(
-			&self.top_frame().account_id,
+			&account_id,
 			origin_contract,
 			dest.clone(),
 			code_hash.clone(),
 			rent_allowance,
 			delta,
+			&mut frame.nested_meter,
 		);
 		if let Ok(_) = result {
 			deposit_event::<Self::T>(
 				vec![],
 				Event::Restored(
-					self.top_frame().account_id.clone(),
+					account_id,
 					dest,
 					code_hash,
 					rent_allowance,
 				),
 			);
-			self.top_frame_mut().terminate();
+			frame.terminate();
 		}
 		result
 	}
@@ -1463,14 +1462,18 @@ mod tests {
 			MockLoader::decrement_refcount(self.code_hash);
 		}
 
-		fn add_user(code_hash: CodeHash<Test>) -> Result<u32, DispatchError> {
+		fn add_user(code_hash: CodeHash<Test>, _: &mut GasMeter<Test>)
+			-> Result<(), DispatchError>
+		{
 			MockLoader::increment_refcount(code_hash);
-			Ok(0)
+			Ok(())
 		}
 
-		fn remove_user(code_hash: CodeHash<Test>) -> u32 {
+		fn remove_user(code_hash: CodeHash<Test>, _: &mut GasMeter<Test>)
+			-> Result<(), DispatchError>
+		{
 			MockLoader::decrement_refcount(code_hash);
-			0
+			Ok(())
 		}
 
 		fn execute<E: Ext<T = Test>>(
@@ -1597,7 +1600,7 @@ mod tests {
 				None,
 			).unwrap();
 
-			assert!(!output.0.is_success());
+			assert!(!output.is_success());
 			assert_eq!(get_balance(&origin), 100);
 
 			// the rent is still charged
@@ -1658,8 +1661,8 @@ mod tests {
 			);
 
 			let output = result.unwrap();
-			assert!(output.0.is_success());
-			assert_eq!(output.0.data, Bytes(vec![1, 2, 3, 4]));
+			assert!(output.is_success());
+			assert_eq!(output.data, Bytes(vec![1, 2, 3, 4]));
 		});
 	}
 
@@ -1689,8 +1692,8 @@ mod tests {
 			);
 
 			let output = result.unwrap();
-			assert!(!output.0.is_success());
-			assert_eq!(output.0.data, Bytes(vec![1, 2, 3, 4]));
+			assert!(!output.is_success());
+			assert_eq!(output.data, Bytes(vec![1, 2, 3, 4]));
 		});
 	}
 
@@ -1770,7 +1773,7 @@ mod tests {
 					// Verify that we've got proper error and set `reached_bottom`.
 					assert_eq!(
 						r,
-						Err((Error::<Test>::MaxCallDepthReached.into(), 0))
+						Err(Error::<Test>::MaxCallDepthReached.into())
 					);
 					*reached_bottom = true;
 				} else {
@@ -2000,7 +2003,7 @@ mod tests {
 			let instantiated_contract_address = Rc::clone(&instantiated_contract_address);
 			move |ctx, _| {
 				// Instantiate a contract and save it's address in `instantiated_contract_address`.
-				let (address, output, _) = ctx.ext.instantiate(
+				let (address, output) = ctx.ext.instantiate(
 					0,
 					dummy_ch,
 					Contracts::<Test>::subsistence_threshold() * 3,
@@ -2053,10 +2056,10 @@ mod tests {
 						vec![],
 						&[],
 					),
-					Err((ExecError {
+					Err(ExecError {
 						error: DispatchError::Other("It's a trap!"),
 						origin: ErrorOrigin::Callee,
-					}, 0))
+					})
 				);
 
 				exec_success()
@@ -2293,7 +2296,7 @@ mod tests {
 				assert_ne!(original_allowance, changed_allowance);
 				ctx.ext.set_rent_allowance(changed_allowance);
 				assert_eq!(
-					ctx.ext.call(0, CHARLIE, 0, vec![], true).map(|v| v.0).map_err(|e| e.0),
+					ctx.ext.call(0, CHARLIE, 0, vec![], true),
 					exec_trapped()
 				);
 				assert_eq!(ctx.ext.rent_allowance(), changed_allowance);
@@ -2330,7 +2333,7 @@ mod tests {
 		let code = MockLoader::insert(Constructor, |ctx, _| {
 			assert_matches!(
 				ctx.ext.call(0, ctx.ext.address().clone(), 0, vec![], true),
-				Err((ExecError{error, ..}, _)) if error == <Error<Test>>::ContractNotFound.into()
+				Err(ExecError{error, ..}) if error == <Error<Test>>::ContractNotFound.into()
 			);
 			exec_success()
 		});
@@ -2426,7 +2429,7 @@ mod tests {
 		// call the contract passed as input with disabled reentry
 		let code_bob = MockLoader::insert(Call, |ctx, _| {
 			let dest = Decode::decode(&mut ctx.input_data.as_ref()).unwrap();
-			ctx.ext.call(0, dest, 0, vec![], false).map(|v| v.0).map_err(|e| e.0)
+			ctx.ext.call(0, dest, 0, vec![], false)
 		});
 
 		let code_charlie = MockLoader::insert(Call, |_, _| {
@@ -2459,7 +2462,7 @@ mod tests {
 					0,
 					BOB.encode(),
 					None,
-				).map_err(|e| e.0.error),
+				).map_err(|e| e.error),
 				<Error<Test>>::ReentranceDenied,
 			);
 		});
@@ -2469,7 +2472,7 @@ mod tests {
 	fn call_deny_reentry() {
 		let code_bob = MockLoader::insert(Call, |ctx, _| {
 			if ctx.input_data[0] == 0 {
-				ctx.ext.call(0, CHARLIE, 0, vec![], false).map(|v| v.0).map_err(|e| e.0)
+				ctx.ext.call(0, CHARLIE, 0, vec![], false)
 			} else {
 				exec_success()
 			}
@@ -2477,7 +2480,7 @@ mod tests {
 
 		// call BOB with input set to '1'
 		let code_charlie = MockLoader::insert(Call, |ctx, _| {
-			ctx.ext.call(0, BOB, 0, vec![1], true).map(|v| v.0).map_err(|e| e.0)
+			ctx.ext.call(0, BOB, 0, vec![1], true)
 		});
 
 		ExtBuilder::default().build().execute_with(|| {
@@ -2495,7 +2498,7 @@ mod tests {
 					0,
 					vec![0],
 					None,
-				).map_err(|e| e.0.error),
+				).map_err(|e| e.error),
 				<Error<Test>>::ReentranceDenied,
 			);
 		});
diff --git a/frame/contracts/src/gas.rs b/frame/contracts/src/gas.rs
index 2c19c999b56a..34ddb3ceb043 100644
--- a/frame/contracts/src/gas.rs
+++ b/frame/contracts/src/gas.rs
@@ -167,15 +167,6 @@ where
 		self.gas_left = self.gas_left.saturating_add(adjustment).min(self.gas_limit);
 	}
 
-	/// Refund previously charged gas back to the gas meter.
-	///
-	/// This can be used if a gas worst case estimation must be charged before
-	/// performing a certain action. This way the difference can be refundend when
-	/// the worst case did not happen.
-	pub fn refund(&mut self, amount: ChargedAmount) {
-		self.gas_left = self.gas_left.saturating_add(amount.0).min(self.gas_limit)
-	}
-
 	/// Returns how much gas was used.
 	pub fn gas_spent(&self) -> Weight {
 		self.gas_limit - self.gas_left
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index f7dec843a7f7..3ac56d8980cb 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -275,9 +275,7 @@ pub mod pallet {
 		/// * If the account is a regular account, any value will be transferred.
 		/// * If no account exists and the call value is not less than `existential_deposit`,
 		/// a regular account will be created and any value will be transferred.
-		#[pallet::weight(T::WeightInfo::call(T::Schedule::get().limits.code_len / 1024)
-			.saturating_add(*gas_limit)
-		)]
+		#[pallet::weight(T::WeightInfo::call().saturating_add(*gas_limit))]
 		pub fn call(
 			origin: OriginFor<T>,
 			dest: <T::Lookup as StaticLookup>::Source,
@@ -289,13 +287,10 @@ pub mod pallet {
 			let dest = T::Lookup::lookup(dest)?;
 			let mut gas_meter = GasMeter::new(gas_limit);
 			let schedule = T::Schedule::get();
-			let (result, code_len) = match ExecStack::<T, PrefabWasmModule<T>>::run_call(
+			let result = ExecStack::<T, PrefabWasmModule<T>>::run_call(
 				origin, dest, &mut gas_meter, &schedule, value, data, None,
-			) {
-				Ok((output, len)) => (Ok(output), len),
-				Err((err, len)) => (Err(err), len),
-			};
-			gas_meter.into_dispatch_result(result, T::WeightInfo::call(code_len / 1024))
+			);
+			gas_meter.into_dispatch_result(result, T::WeightInfo::call())
 		}
 
 		/// Instantiates a new contract from the supplied `code` optionally transferring
@@ -357,10 +352,7 @@ pub mod pallet {
 		/// code deployment step. Instead, the `code_hash` of an on-chain deployed wasm binary
 		/// must be supplied.
 		#[pallet::weight(
-			T::WeightInfo::instantiate(
-				T::Schedule::get().limits.code_len / 1024, salt.len() as u32 / 1024
-			)
-			.saturating_add(*gas_limit)
+			T::WeightInfo::instantiate(salt.len() as u32 / 1024).saturating_add(*gas_limit)
 		)]
 		pub fn instantiate(
 			origin: OriginFor<T>,
@@ -374,13 +366,12 @@ pub mod pallet {
 			let mut gas_meter = GasMeter::new(gas_limit);
 			let schedule = T::Schedule::get();
 			let executable = PrefabWasmModule::from_storage(code_hash, &schedule, &mut gas_meter)?;
-			let code_len = executable.code_len();
 			let result = ExecStack::<T, PrefabWasmModule<T>>::run_instantiate(
 				origin, executable, &mut gas_meter, &schedule, endowment, data, &salt, None,
 			).map(|(_address, output)| output);
 			gas_meter.into_dispatch_result(
 				result,
-				T::WeightInfo::instantiate(code_len / 1024, salt.len() as u32 / 1024),
+				T::WeightInfo::instantiate(salt.len() as u32 / 1024),
 			)
 		}
 
@@ -666,7 +657,7 @@ where
 			origin, dest, &mut gas_meter, &schedule, value, input_data, debug_message.as_mut(),
 		);
 		ContractExecResult {
-			result: result.map(|r| r.0).map_err(|r| r.0.error),
+			result: result.map_err(|r| r.error),
 			gas_consumed: gas_meter.gas_spent(),
 			debug_message: debug_message.unwrap_or_default(),
 		}
diff --git a/frame/contracts/src/rent.rs b/frame/contracts/src/rent.rs
index 68e8c57e9ade..3135862e88c9 100644
--- a/frame/contracts/src/rent.rs
+++ b/frame/contracts/src/rent.rs
@@ -20,7 +20,7 @@
 use crate::{
 	AliveContractInfo, BalanceOf, ContractInfo, ContractInfoOf, Pallet, Event,
 	TombstoneContractInfo, Config, CodeHash, Error,
-	storage::Storage, wasm::PrefabWasmModule, exec::Executable,
+	storage::Storage, wasm::PrefabWasmModule, exec::Executable, gas::GasMeter,
 };
 use sp_std::prelude::*;
 use sp_io::hashing::blake2_256;
@@ -232,10 +232,6 @@ where
 	/// Upon succesful restoration, `origin` will be destroyed, all its funds are transferred to
 	/// the restored account. The restored account will inherit the last write block and its last
 	/// deduct block will be set to the current block.
-	///
-	/// # Return Value
-	///
-	/// Result<(CallerCodeSize, DestCodeSize), (DispatchError, CallerCodeSize, DestCodesize)>
 	pub fn restore_to(
 		origin: &T::AccountId,
 		mut origin_contract: AliveContractInfo<T>,
@@ -243,18 +239,19 @@ where
 		code_hash: CodeHash<T>,
 		rent_allowance: BalanceOf<T>,
 		delta: Vec<crate::exec::StorageKey>,
-	) -> Result<(u32, u32), (DispatchError, u32, u32)> {
+		gas_meter: &mut GasMeter<T>,
+	) -> Result<(), DispatchError> {
 		let child_trie_info = origin_contract.child_trie_info();
 
 		let current_block = <frame_system::Pallet<T>>::block_number();
 
 		if origin_contract.last_write == Some(current_block) {
-			return Err((Error::<T>::InvalidContractOrigin.into(), 0, 0));
+			return Err(Error::<T>::InvalidContractOrigin.into());
 		}
 
 		let dest_tombstone = <ContractInfoOf<T>>::get(&dest)
 			.and_then(|c| c.get_tombstone())
-			.ok_or((Error::<T>::InvalidDestinationContract.into(), 0, 0))?;
+			.ok_or(Error::<T>::InvalidDestinationContract)?;
 
 		let last_write = if !delta.is_empty() {
 			Some(current_block)
@@ -263,7 +260,7 @@ where
 		};
 
 		// Fails if the code hash does not exist on chain
-		let caller_code_len = E::add_user(code_hash).map_err(|e| (e, 0, 0))?;
+		E::add_user(code_hash, gas_meter)?;
 
 		// We are allowed to eagerly modify storage even though the function can
 		// fail later due to tombstones not matching. This is because the restoration
@@ -287,13 +284,13 @@ where
 		);
 
 		if tombstone != dest_tombstone {
-			return Err((Error::<T>::InvalidTombstone.into(), caller_code_len, 0));
+			return Err(Error::<T>::InvalidTombstone.into());
 		}
 
 		origin_contract.storage_size -= bytes_taken;
 
 		<ContractInfoOf<T>>::remove(&origin);
-		let tombstone_code_len = E::remove_user(origin_contract.code_hash);
+		E::remove_user(origin_contract.code_hash, gas_meter)?;
 		<ContractInfoOf<T>>::insert(&dest, ContractInfo::Alive(AliveContractInfo::<T> {
 			code_hash,
 			rent_allowance,
@@ -306,8 +303,7 @@ where
 		let origin_free_balance = T::Currency::free_balance(&origin);
 		T::Currency::make_free_balance_be(&origin, <BalanceOf<T>>::zero());
 		T::Currency::deposit_creating(&dest, origin_free_balance);
-
-		Ok((caller_code_len, tombstone_code_len))
+		Ok(())
 	}
 
 	/// Create a new `RentStatus` struct for pass through to a requesting contract.
diff --git a/frame/contracts/src/schedule.rs b/frame/contracts/src/schedule.rs
index 0bf7c050e5df..0abe0c54d748 100644
--- a/frame/contracts/src/schedule.rs
+++ b/frame/contracts/src/schedule.rs
@@ -300,18 +300,9 @@ pub struct HostFnWeights<T: Config> {
 	/// Weight of calling `seal_terminate`.
 	pub terminate: Weight,
 
-	/// Weight per byte of the terminated contract.
-	pub terminate_per_code_byte: Weight,
-
 	/// Weight of calling `seal_restore_to`.
 	pub restore_to: Weight,
 
-	/// Weight per byte of the restoring contract.
-	pub restore_to_per_caller_code_byte: Weight,
-
-	/// Weight per byte of the restored contract.
-	pub restore_to_per_tombstone_code_byte: Weight,
-
 	/// Weight per delta key supplied to `seal_restore_to`.
 	pub restore_to_per_delta: Weight,
 
@@ -354,9 +345,6 @@ pub struct HostFnWeights<T: Config> {
 	/// Weight of calling `seal_call`.
 	pub call: Weight,
 
-	/// Weight per byte of the called contract.
-	pub call_per_code_byte: Weight,
-
 	/// Weight surcharge that is claimed if `seal_call` does a balance transfer.
 	pub call_transfer_surcharge: Weight,
 
@@ -369,9 +357,6 @@ pub struct HostFnWeights<T: Config> {
 	/// Weight of calling `seal_instantiate`.
 	pub instantiate: Weight,
 
-	/// Weight per byte of the instantiated contract.
-	pub instantiate_per_code_byte: Weight,
-
 	/// Weight per input byte supplied to `seal_instantiate`.
 	pub instantiate_per_input_byte: Weight,
 
@@ -588,11 +573,8 @@ impl<T: Config> Default for HostFnWeights<T> {
 			r#return: cost!(seal_return),
 			return_per_byte: cost_byte!(seal_return_per_kb),
 			terminate: cost!(seal_terminate),
-			terminate_per_code_byte: cost_byte!(seal_terminate_per_code_kb),
 			restore_to: cost!(seal_restore_to),
-			restore_to_per_caller_code_byte: cost_byte_args!(seal_restore_to_per_code_kb_delta, 1, 0, 0),
-			restore_to_per_tombstone_code_byte: cost_byte_args!(seal_restore_to_per_code_kb_delta, 0, 1, 0),
-			restore_to_per_delta: cost_batched_args!(seal_restore_to_per_code_kb_delta, 0, 0, 1),
+			restore_to_per_delta: cost_batched!(seal_restore_to_per_delta),
 			random: cost_batched!(seal_random),
 			deposit_event: cost_batched!(seal_deposit_event),
 			deposit_event_per_topic: cost_batched_args!(seal_deposit_event_per_topic_and_kb, 1, 0),
@@ -606,15 +588,13 @@ impl<T: Config> Default for HostFnWeights<T> {
 			get_storage_per_byte: cost_byte_batched!(seal_get_storage_per_kb),
 			transfer: cost_batched!(seal_transfer),
 			call: cost_batched!(seal_call),
-			call_per_code_byte: cost_byte_batched_args!(seal_call_per_code_transfer_input_output_kb, 1, 0, 0, 0),
-			call_transfer_surcharge: cost_batched_args!(seal_call_per_code_transfer_input_output_kb, 0, 1, 0, 0),
-			call_per_input_byte: cost_byte_batched_args!(seal_call_per_code_transfer_input_output_kb, 0, 0, 1, 0),
-			call_per_output_byte: cost_byte_batched_args!(seal_call_per_code_transfer_input_output_kb, 0, 0, 0, 1),
+			call_transfer_surcharge: cost_batched_args!(seal_call_per_transfer_input_output_kb, 1, 0, 0),
+			call_per_input_byte: cost_byte_batched_args!(seal_call_per_transfer_input_output_kb, 0, 1, 0),
+			call_per_output_byte: cost_byte_batched_args!(seal_call_per_transfer_input_output_kb, 0, 0, 1),
 			instantiate: cost_batched!(seal_instantiate),
-			instantiate_per_code_byte: cost_byte_batched_args!(seal_instantiate_per_code_input_output_salt_kb, 1, 0, 0, 0),
-			instantiate_per_input_byte: cost_byte_batched_args!(seal_instantiate_per_code_input_output_salt_kb, 0, 1, 0, 0),
-			instantiate_per_output_byte: cost_byte_batched_args!(seal_instantiate_per_code_input_output_salt_kb, 0, 0, 1, 0),
-			instantiate_per_salt_byte: cost_byte_batched_args!(seal_instantiate_per_code_input_output_salt_kb, 0, 0, 0, 1),
+			instantiate_per_input_byte: cost_byte_batched_args!(seal_instantiate_per_input_output_salt_kb, 1, 0, 0),
+			instantiate_per_output_byte: cost_byte_batched_args!(seal_instantiate_per_input_output_salt_kb, 0, 1, 0),
+			instantiate_per_salt_byte: cost_byte_batched_args!(seal_instantiate_per_input_output_salt_kb, 0, 0, 1),
 			hash_sha2_256: cost_batched!(seal_hash_sha2_256),
 			hash_sha2_256_per_byte: cost_byte_batched!(seal_hash_sha2_256_per_kb),
 			hash_keccak_256: cost_batched!(seal_hash_keccak_256),
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index 619bd8eac9d3..b3ee139008bc 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -363,7 +363,7 @@ where
 fn calling_plain_account_fails() {
 	ExtBuilder::default().build().execute_with(|| {
 		let _ = Balances::deposit_creating(&ALICE, 100_000_000);
-		let base_cost = <<Test as Config>::WeightInfo as WeightInfo>::call(0);
+		let base_cost = <<Test as Config>::WeightInfo as WeightInfo>::call();
 
 		assert_eq!(
 			Contracts::call(Origin::signed(ALICE), BOB, 0, GAS_LIMIT, Vec::new()),
@@ -1727,6 +1727,10 @@ fn self_destruct_works() {
 				Ok(_)
 			);
 
+			// The call triggers rent collection that reduces the amount of balance
+			// that remains for the beneficiary.
+			let balance_after_rent = 93_078;
+
 			pretty_assertions::assert_eq!(System::events(), vec![
 				EventRecord {
 					phase: Phase::Initialization,
@@ -1738,7 +1742,7 @@ fn self_destruct_works() {
 				EventRecord {
 					phase: Phase::Initialization,
 					event: Event::Balances(
-						pallet_balances::Event::Transfer(addr.clone(), DJANGO, 93_086)
+						pallet_balances::Event::Transfer(addr.clone(), DJANGO, balance_after_rent)
 					),
 					topics: vec![],
 				},
@@ -1761,7 +1765,7 @@ fn self_destruct_works() {
 
 			// check that the beneficiary (django) got remaining balance
 			// some rent was deducted before termination
-			assert_eq!(Balances::free_balance(DJANGO), 1_093_086);
+			assert_eq!(Balances::free_balance(DJANGO), 1_000_000 + balance_after_rent);
 		});
 }
 
@@ -2938,3 +2942,59 @@ fn debug_message_invalid_utf8() {
 		assert_err!(result.result, <Error<Test>>::DebugMessageInvalidUTF8);
 	});
 }
+
+#[test]
+fn gas_estimation_correct() {
+	let (caller_code, caller_hash) = compile_module::<Test>("call_return_code").unwrap();
+	let (callee_code, callee_hash) = compile_module::<Test>("dummy").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let subsistence = Pallet::<Test>::subsistence_threshold();
+		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
+		let _ = Balances::deposit_creating(&CHARLIE, 1000 * subsistence);
+
+		assert_ok!(
+			Contracts::instantiate_with_code(
+				Origin::signed(ALICE),
+				subsistence * 100,
+				GAS_LIMIT,
+				caller_code,
+				vec![],
+				vec![0],
+			),
+		);
+		let addr_caller = Contracts::contract_address(&ALICE, &caller_hash, &[0]);
+
+		assert_ok!(
+			Contracts::instantiate_with_code(
+				Origin::signed(ALICE),
+				subsistence * 100,
+				GAS_LIMIT,
+				callee_code,
+				vec![],
+				vec![1],
+			),
+		);
+		let addr_callee = Contracts::contract_address(&ALICE, &callee_hash, &[1]);
+
+		// Call in order to determine the gas that is required for this call
+		let result = Contracts::bare_call(
+			ALICE,
+			addr_caller.clone(),
+			0,
+			GAS_LIMIT,
+			AsRef::<[u8]>::as_ref(&addr_callee).to_vec(),
+			false,
+		);
+		assert_ok!(result.result);
+
+		// Make the same call using the estimated gas. Should succeed.
+		assert_ok!(Contracts::bare_call(
+			ALICE,
+			addr_caller,
+			0,
+			result.gas_consumed,
+			AsRef::<[u8]>::as_ref(&addr_callee).to_vec(),
+			false,
+		).result);
+	});
+}
diff --git a/frame/contracts/src/wasm/code_cache.rs b/frame/contracts/src/wasm/code_cache.rs
index 8df604cdb0e1..a2aa2b55e165 100644
--- a/frame/contracts/src/wasm/code_cache.rs
+++ b/frame/contracts/src/wasm/code_cache.rs
@@ -81,14 +81,16 @@ where
 }
 
 /// Increment the refcount of a code in-storage by one.
-pub fn increment_refcount<T: Config>(code_hash: CodeHash<T>) -> Result<u32, DispatchError>
+pub fn increment_refcount<T: Config>(code_hash: CodeHash<T>, gas_meter: &mut GasMeter<T>)
+	-> Result<(), DispatchError>
 where
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
 {
+	gas_meter.charge(CodeToken::UpdateRefcount(estimate_code_size::<T>(&code_hash)?))?;
 	<CodeStorage<T>>::mutate(code_hash, |existing| {
 		if let Some(module) = existing {
 			increment_64(&mut module.refcount);
-			Ok(module.original_code_len)
+			Ok(())
 		} else {
 			Err(Error::<T>::CodeNotFound.into())
 		}
@@ -96,23 +98,24 @@ where
 }
 
 /// Decrement the refcount of a code in-storage by one and remove the code when it drops to zero.
-pub fn decrement_refcount<T: Config>(code_hash: CodeHash<T>) -> u32
+pub fn decrement_refcount<T: Config>(code_hash: CodeHash<T>, gas_meter: &mut GasMeter<T>)
+	-> Result<(), DispatchError>
 where
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
 {
+	if let Ok(len) = estimate_code_size::<T>(&code_hash) {
+		gas_meter.charge(CodeToken::UpdateRefcount(len))?;
+	}
 	<CodeStorage<T>>::mutate_exists(code_hash, |existing| {
 		if let Some(module) = existing {
-			let code_len = module.original_code_len;
 			module.refcount = module.refcount.saturating_sub(1);
 			if module.refcount == 0 {
 				*existing = None;
 				finish_removal::<T>(code_hash);
 			}
-			code_len
-		} else {
-			0
 		}
-	})
+	});
+	Ok(())
 }
 
 /// Load code with the given code hash.
@@ -120,13 +123,24 @@ where
 /// If the module was instrumented with a lower version of schedule than
 /// the current one given as an argument, then this function will perform
 /// re-instrumentation and update the cache in the storage.
+///
+/// # Note
+///
+/// If `reinstrument` is set it is assumed that the load is performed in the context of
+/// a contract call: This means we charge the size based cased for loading the contract.
 pub fn load<T: Config>(
 	code_hash: CodeHash<T>,
-	reinstrument: Option<(&Schedule<T>, &mut GasMeter<T>)>,
+	mut reinstrument: Option<(&Schedule<T>, &mut GasMeter<T>)>,
 ) -> Result<PrefabWasmModule<T>, DispatchError>
 where
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
 {
+	// The reinstrument case coincides with the cases where we need to charge extra
+	// based upon the code size: On-chain execution.
+	if let Some((_, gas_meter)) = &mut reinstrument {
+		gas_meter.charge(CodeToken::Load(estimate_code_size::<T>(&code_hash)?))?;
+	}
+
 	let mut prefab_module = <CodeStorage<T>>::get(code_hash)
 		.ok_or_else(|| Error::<T>::CodeNotFound)?;
 	prefab_module.code_hash = code_hash;
@@ -135,7 +149,7 @@ where
 		if prefab_module.instruction_weights_version < schedule.instruction_weights.version {
 			// The instruction weights have changed.
 			// We need to re-instrument the code with the new instruction weights.
-			gas_meter.charge(InstrumentToken(prefab_module.original_code_len))?;
+			gas_meter.charge(CodeToken::Instrument(prefab_module.original_code_len))?;
 			private::reinstrument(&mut prefab_module, schedule)?;
 		}
 	}
@@ -185,14 +199,50 @@ fn increment_64(refcount: &mut u64) {
 	");
 }
 
-/// Token to be supplied to the gas meter which charges the weight needed for reinstrumenting
-/// a contract of the specified size in bytes.
+/// Get the size of the instrumented code stored at `code_hash` without loading it.
+///
+/// The returned value is slightly too large because it also contains the fields apart from
+/// `code` which are located inside [`PrefabWasmModule`]. However, those are negligible when
+/// compared to the code size. Additionally, charging too much weight is completely safe.
+fn estimate_code_size<T: Config>(code_hash: &CodeHash<T>) -> Result<u32, DispatchError>
+where
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
+{
+	let key = <CodeStorage<T>>::hashed_key_for(code_hash);
+	let mut data = [0u8; 0];
+	let len = sp_io::storage::read(&key, &mut data, 0).ok_or_else(|| Error::<T>::CodeNotFound)?;
+	Ok(len)
+}
+
+/// Costs for operations that are related to code handling.
 #[cfg_attr(test, derive(Debug, PartialEq, Eq))]
 #[derive(Clone, Copy)]
-struct InstrumentToken(u32);
+enum CodeToken {
+	/// Weight for instrumenting a contract contract of the supplied size in bytes.
+	Instrument(u32),
+	/// Weight for loading a contract per kilobyte.
+	Load(u32),
+	/// Weight for changing the refcount of a contract per kilobyte.
+	UpdateRefcount(u32),
+}
 
-impl<T: Config> Token<T> for InstrumentToken {
+impl<T> Token<T> for CodeToken
+where
+	T: Config,
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
+{
 	fn weight(&self) -> Weight {
-		T::WeightInfo::instrument(self.0 / 1024)
+		use self::CodeToken::*;
+		// In case of `Load` and `UpdateRefcount` we already covered the general costs of
+		// accessing the storage but still need to account for the actual size of the
+		// contract code. This is why we substract `T::*::(0)`. We need to do this at this
+		// point because when charging the general weight we do not know the size of
+		// the contract.
+		match *self {
+			Instrument(len) => T::WeightInfo::instrument(len / 1024),
+			Load(len) => T::WeightInfo::code_load(len / 1024).saturating_sub(T::WeightInfo::code_load(0)),
+			UpdateRefcount(len) =>
+				T::WeightInfo::code_refcount(len / 1024).saturating_sub(T::WeightInfo::code_refcount(0)),
+		}
 	}
 }
diff --git a/frame/contracts/src/wasm/mod.rs b/frame/contracts/src/wasm/mod.rs
index 5f9936c68dfb..03a409bb12fe 100644
--- a/frame/contracts/src/wasm/mod.rs
+++ b/frame/contracts/src/wasm/mod.rs
@@ -168,12 +168,16 @@ where
 		code_cache::store_decremented(self);
 	}
 
-	fn add_user(code_hash: CodeHash<T>) -> Result<u32, DispatchError> {
-		code_cache::increment_refcount::<T>(code_hash)
+	fn add_user(code_hash: CodeHash<T>, gas_meter: &mut GasMeter<T>)
+		-> Result<(), DispatchError>
+	{
+		code_cache::increment_refcount::<T>(code_hash, gas_meter)
 	}
 
-	fn remove_user(code_hash: CodeHash<T>) -> u32 {
-		code_cache::decrement_refcount::<T>(code_hash)
+	fn remove_user(code_hash: CodeHash<T>, gas_meter: &mut GasMeter<T>)
+		-> Result<(), DispatchError>
+	{
+		code_cache::decrement_refcount::<T>(code_hash, gas_meter)
 	}
 
 	fn execute<E: Ext<T = T>>(
@@ -349,14 +353,14 @@ mod tests {
 			value: u64,
 			data: Vec<u8>,
 			allows_reentry: bool,
-		) -> Result<(ExecReturnValue, u32), (ExecError, u32)> {
+		) -> Result<ExecReturnValue, ExecError> {
 			self.calls.push(CallEntry {
 				to,
 				value,
 				data,
 				allows_reentry,
 			});
-			Ok((ExecReturnValue { flags: ReturnFlags::empty(), data: call_return_data() }, 0))
+			Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: call_return_data() })
 		}
 		fn instantiate(
 			&mut self,
@@ -365,7 +369,7 @@ mod tests {
 			endowment: u64,
 			data: Vec<u8>,
 			salt: &[u8],
-		) -> Result<(AccountIdOf<Self::T>, ExecReturnValue, u32), (ExecError, u32)> {
+		) -> Result<(AccountIdOf<Self::T>, ExecReturnValue), ExecError> {
 			self.instantiates.push(InstantiateEntry {
 				code_hash: code_hash.clone(),
 				endowment,
@@ -379,7 +383,6 @@ mod tests {
 					flags: ReturnFlags::empty(),
 					data: Bytes(Vec::new()),
 				},
-				0,
 			))
 		}
 		fn transfer(
@@ -396,11 +399,11 @@ mod tests {
 		fn terminate(
 			&mut self,
 			beneficiary: &AccountIdOf<Self::T>,
-		) -> Result<u32, (DispatchError, u32)> {
+		) -> Result<(), DispatchError> {
 			self.terminations.push(TerminationEntry {
 				beneficiary: beneficiary.clone(),
 			});
-			Ok(0)
+			Ok(())
 		}
 		fn restore_to(
 			&mut self,
@@ -408,14 +411,14 @@ mod tests {
 			code_hash: H256,
 			rent_allowance: u64,
 			delta: Vec<StorageKey>,
-		) -> Result<(u32, u32), (DispatchError, u32, u32)> {
+		) -> Result<(), DispatchError> {
 			self.restores.push(RestoreEntry {
 				dest,
 				code_hash,
 				rent_allowance,
 				delta,
 			});
-			Ok((0, 0))
+			Ok(())
 		}
 		fn get_storage(&mut self, key: &StorageKey) -> Option<Vec<u8>> {
 			self.storage.get(key).cloned()
@@ -616,7 +619,7 @@ mod tests {
 	fn contract_call_forward_input() {
 		const CODE: &str = r#"
 (module
-	(import "__unstable__" "seal_call" (func $seal_call (param i32 i32 i32 i64 i32 i32 i32 i32 i32 i32) (result i32)))
+	(import "__unstable__" "seal_call" (func $seal_call (param i32 i32 i64 i32 i32 i32 i32 i32) (result i32)))
 	(import "seal0" "seal_input" (func $seal_input (param i32 i32)))
 	(import "env" "memory" (memory 1 1))
 	(func (export "call")
@@ -624,10 +627,8 @@ mod tests {
 			(call $seal_call
 				(i32.const 1) ;; Set FORWARD_INPUT bit
 				(i32.const 4)  ;; Pointer to "callee" address.
-				(i32.const 32)  ;; Length of "callee" address.
 				(i64.const 0)  ;; How much gas to devote for the execution. 0 = all.
 				(i32.const 36) ;; Pointer to the buffer with value to transfer
-				(i32.const 8)  ;; Length of the buffer with value to transfer.
 				(i32.const 44) ;; Pointer to input data buffer address
 				(i32.const 4)  ;; Length of input data buffer
 				(i32.const 4294967295) ;; u32 max value is the sentinel value: do not copy output
@@ -678,7 +679,7 @@ mod tests {
 	fn contract_call_clone_input() {
 		const CODE: &str = r#"
 (module
-	(import "__unstable__" "seal_call" (func $seal_call (param i32 i32 i32 i64 i32 i32 i32 i32 i32 i32) (result i32)))
+	(import "__unstable__" "seal_call" (func $seal_call (param i32 i32 i64 i32 i32 i32 i32 i32) (result i32)))
 	(import "seal0" "seal_input" (func $seal_input (param i32 i32)))
 	(import "seal0" "seal_return" (func $seal_return (param i32 i32 i32)))
 	(import "env" "memory" (memory 1 1))
@@ -687,10 +688,8 @@ mod tests {
 			(call $seal_call
 				(i32.const 11) ;; Set FORWARD_INPUT | CLONE_INPUT | ALLOW_REENTRY bits
 				(i32.const 4)  ;; Pointer to "callee" address.
-				(i32.const 32)  ;; Length of "callee" address.
 				(i64.const 0)  ;; How much gas to devote for the execution. 0 = all.
 				(i32.const 36) ;; Pointer to the buffer with value to transfer
-				(i32.const 8)  ;; Length of the buffer with value to transfer.
 				(i32.const 44) ;; Pointer to input data buffer address
 				(i32.const 4)  ;; Length of input data buffer
 				(i32.const 4294967295) ;; u32 max value is the sentinel value: do not copy output
@@ -741,17 +740,15 @@ mod tests {
 	fn contract_call_tail_call() {
 		const CODE: &str = r#"
 (module
-	(import "__unstable__" "seal_call" (func $seal_call (param i32 i32 i32 i64 i32 i32 i32 i32 i32 i32) (result i32)))
+	(import "__unstable__" "seal_call" (func $seal_call (param i32 i32 i64 i32 i32 i32 i32 i32) (result i32)))
 	(import "env" "memory" (memory 1 1))
 	(func (export "call")
 		(drop
 			(call $seal_call
 				(i32.const 5) ;; Set FORWARD_INPUT | TAIL_CALL bit
 				(i32.const 4)  ;; Pointer to "callee" address.
-				(i32.const 32)  ;; Length of "callee" address.
 				(i64.const 0)  ;; How much gas to devote for the execution. 0 = all.
 				(i32.const 36) ;; Pointer to the buffer with value to transfer
-				(i32.const 8)  ;; Length of the buffer with value to transfer.
 				(i32.const 0) ;; Pointer to input data buffer address
 				(i32.const 0)  ;; Length of input data buffer
 				(i32.const 4294967295) ;; u32 max value is the sentinel value: do not copy output
@@ -2000,25 +1997,18 @@ mod tests {
 "#;
 
 	#[test]
-	fn contract_decode_failure() {
+	fn contract_decode_length_ignored() {
 		let mut mock_ext = MockExt::default();
 		let result = execute(
 			CODE_DECODE_FAILURE,
 			vec![],
 			&mut mock_ext,
 		);
-
-		assert_eq!(
-			result,
-			Err(ExecError {
-				error: Error::<Test>::DecodingFailed.into(),
-				origin: ErrorOrigin::Caller,
-			})
-		);
+		// AccountID implements `MaxEncodeLen` and therefore the supplied length is
+		// no longer needed nor used to determine how much is read from contract memory.
+		assert_ok!(result);
 	}
 
-
-
 	#[test]
 	#[cfg(feature = "unstable-interface")]
 	fn rent_params_work() {
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index 8d1782e84d60..28987bba9d70 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -26,7 +26,7 @@ use crate::{
 };
 use bitflags::bitflags;
 use pwasm_utils::parity_wasm::elements::ValueType;
-use frame_support::{dispatch::DispatchError, ensure, traits::Get, weights::Weight};
+use frame_support::{dispatch::DispatchError, ensure, weights::Weight, traits::MaxEncodedLen};
 use sp_std::prelude::*;
 use codec::{Decode, DecodeAll, Encode};
 use sp_core::{Bytes, crypto::UncheckedFrom};
@@ -170,12 +170,8 @@ pub enum RuntimeCosts {
 	Return(u32),
 	/// Weight of calling `seal_terminate`.
 	Terminate,
-	/// Weight that is added to `seal_terminate` for every byte of the terminated contract.
-	TerminateSurchargeCodeSize(u32),
 	/// Weight of calling `seal_restore_to` per number of supplied delta entries.
 	RestoreTo(u32),
-	/// Weight that is added to `seal_restore_to` for the involved code sizes.
-	RestoreToSurchargeCodeSize{caller_code: u32, tombstone_code: u32},
 	/// Weight of calling `seal_random`. It includes the weight for copying the subject.
 	Random,
 	/// Weight of calling `seal_deposit_event` with the given number of topics and event size.
@@ -197,8 +193,6 @@ pub enum RuntimeCosts {
 	Transfer,
 	/// Weight of calling `seal_call` for the given input size.
 	CallBase(u32),
-	/// Weight that is added to `seal_call` for every byte of the called contract.
-	CallSurchargeCodeSize(u32),
 	/// Weight of the transfer performed during a call.
 	CallSurchargeTransfer,
 	/// Weight of output received through `seal_call` for the given size.
@@ -207,8 +201,6 @@ pub enum RuntimeCosts {
 	/// This includes the transfer as an instantiate without a value will always be below
 	/// the existential deposit and is disregarded as corner case.
 	InstantiateBase{input_data_len: u32, salt_len: u32},
-	/// Weight that is added to `seal_instantiate` for every byte of the instantiated contract.
-	InstantiateSurchargeCodeSize(u32),
 	/// Weight of output received through `seal_instantiate` for the given size.
 	InstantiateCopyOut(u32),
 	/// Weight of calling `seal_hash_sha_256` for the given input size.
@@ -221,8 +213,6 @@ pub enum RuntimeCosts {
 	HashBlake128(u32),
 	/// Weight charged by a chain extension through `seal_call_chain_extension`.
 	ChainExtension(u64),
-	/// Weight charged for copying data from the sandbox.
-	CopyIn(u32),
 }
 
 impl RuntimeCosts {
@@ -250,13 +240,8 @@ impl RuntimeCosts {
 			Return(len) => s.r#return
 				.saturating_add(s.return_per_byte.saturating_mul(len.into())),
 			Terminate => s.terminate,
-			TerminateSurchargeCodeSize(len) => s.terminate_per_code_byte.saturating_mul(len.into()),
 			RestoreTo(delta) => s.restore_to
 				.saturating_add(s.restore_to_per_delta.saturating_mul(delta.into())),
-			RestoreToSurchargeCodeSize{caller_code, tombstone_code} =>
-				s.restore_to_per_caller_code_byte.saturating_mul(caller_code.into()).saturating_add(
-					s.restore_to_per_tombstone_code_byte.saturating_mul(tombstone_code.into())
-				),
 			Random => s.random,
 			DepositEvent{num_topic, len} => s.deposit_event
 				.saturating_add(s.deposit_event_per_topic.saturating_mul(num_topic.into()))
@@ -272,14 +257,11 @@ impl RuntimeCosts {
 			Transfer => s.transfer,
 			CallBase(len) => s.call
 				.saturating_add(s.call_per_input_byte.saturating_mul(len.into())),
-			CallSurchargeCodeSize(len) => s.call_per_code_byte.saturating_mul(len.into()),
 			CallSurchargeTransfer => s.call_transfer_surcharge,
 			CallCopyOut(len) => s.call_per_output_byte.saturating_mul(len.into()),
 			InstantiateBase{input_data_len, salt_len} => s.instantiate
 				.saturating_add(s.instantiate_per_input_byte.saturating_mul(input_data_len.into()))
 				.saturating_add(s.instantiate_per_salt_byte.saturating_mul(salt_len.into())),
-			InstantiateSurchargeCodeSize(len) =>
-				s.instantiate_per_code_byte.saturating_mul(len.into()),
 			InstantiateCopyOut(len) => s.instantiate_per_output_byte
 				.saturating_mul(len.into()),
 			HashSha256(len) => s.hash_sha2_256
@@ -291,7 +273,6 @@ impl RuntimeCosts {
 			HashBlake128(len) => s.hash_blake2_128
 				.saturating_add(s.hash_blake2_128_per_byte.saturating_mul(len.into())),
 			ChainExtension(amount) => amount,
-			CopyIn(len) => s.return_per_byte.saturating_mul(len.into()),
 		};
 		RuntimeToken {
 			#[cfg(test)]
@@ -476,15 +457,6 @@ where
 		self.ext.gas_meter().charge(token)
 	}
 
-	/// Correct previously charged gas amount.
-	pub fn adjust_gas(&mut self, charged_amount: ChargedAmount, adjusted_amount: RuntimeCosts) {
-		let adjusted_amount = adjusted_amount.token(&self.ext.schedule().host_fn_weights);
-		self.ext.gas_meter().adjust_gas(
-			charged_amount,
-			adjusted_amount,
-		);
-	}
-
 	/// Read designated chunk from the sandbox memory.
 	///
 	/// Returns `Err` if one of the following conditions occurs:
@@ -511,6 +483,21 @@ where
 		self.memory.get(ptr, buf).map_err(|_| Error::<E::T>::OutOfBounds.into())
 	}
 
+	/// Reads and decodes a type with a size fixed at compile time from contract memory.
+	///
+	/// # Note
+	///
+	/// The weight of reading a fixed value is included in the overall weight of any
+	/// contract callable function.
+	pub fn read_sandbox_memory_as<D: Decode + MaxEncodedLen>(&self, ptr: u32)
+	-> Result<D, DispatchError>
+	{
+		let buf = self.read_sandbox_memory(ptr, D::max_encoded_len() as u32)?;
+		let decoded = D::decode_all(&mut &buf[..])
+			.map_err(|_| DispatchError::from(Error::<E::T>::DecodingFailed))?;
+		Ok(decoded)
+	}
+
 	/// Read designated chunk from the sandbox memory and attempt to decode into the specified type.
 	///
 	/// Returns `Err` if one of the following conditions occurs:
@@ -520,25 +507,14 @@ where
 	///
 	/// # Note
 	///
-	/// It is safe to forgo benchmarking and charging weight relative to `len` for fixed
-	/// size types (basically everything not containing a heap collection):
-	/// Despite the fact that we are usually about to read the encoding of a fixed size
-	/// type, we cannot know the encoded size of that type. We therefore are required to
-	/// use the length provided by the contract. This length is untrusted and therefore
-	/// we charge weight relative to the provided size upfront that covers the copy costs.
-	/// On success this cost is refunded as the copying was already covered in the
-	/// overall cost of the host function. This is different from `read_sandbox_memory`
-	/// where the size is dynamic and the costs resulting from that dynamic size must
-	/// be charged relative to this dynamic size anyways (before reading) by constructing
-	/// the benchmark for that.
-	pub fn read_sandbox_memory_as<D: Decode>(&mut self, ptr: u32, len: u32)
+	/// There must be an extra benchmark for determining the influence of `len` with
+	/// regard to the overall weight.
+	pub fn read_sandbox_memory_as_unbounded<D: Decode>(&self, ptr: u32, len: u32)
 	-> Result<D, DispatchError>
 	{
-		let amount = self.charge_gas(RuntimeCosts::CopyIn(len))?;
 		let buf = self.read_sandbox_memory(ptr, len)?;
 		let decoded = D::decode_all(&mut &buf[..])
 			.map_err(|_| DispatchError::from(Error::<E::T>::DecodingFailed))?;
-		self.ext.gas_meter().refund(amount);
 		Ok(decoded)
 	}
 
@@ -575,7 +551,7 @@ where
 		}
 
 		let buf_len = buf.len() as u32;
-		let len: u32 = self.read_sandbox_memory_as(out_len_ptr, 4)?;
+		let len: u32 = self.read_sandbox_memory_as(out_len_ptr)?;
 
 		if len < buf_len {
 			Err(Error::<E::T>::OutputBufferTooSmall)?
@@ -675,19 +651,18 @@ where
 		&mut self,
 		flags: CallFlags,
 		callee_ptr: u32,
-		callee_len: u32,
 		gas: u64,
 		value_ptr: u32,
-		value_len: u32,
 		input_data_ptr: u32,
 		input_data_len: u32,
 		output_ptr: u32,
 		output_len_ptr: u32
-	) -> Result<ReturnCode, TrapReason> {
+	) -> Result<ReturnCode, TrapReason>
+	{
 		self.charge_gas(RuntimeCosts::CallBase(input_data_len))?;
 		let callee: <<E as Ext>::T as frame_system::Config>::AccountId =
-			self.read_sandbox_memory_as(callee_ptr, callee_len)?;
-		let value: BalanceOf<<E as Ext>::T> = self.read_sandbox_memory_as(value_ptr, value_len)?;
+			self.read_sandbox_memory_as(callee_ptr)?;
+		let value: BalanceOf<<E as Ext>::T> = self.read_sandbox_memory_as(value_ptr)?;
 		let input_data = if flags.contains(CallFlags::CLONE_INPUT) {
 			self.input_data.as_ref().ok_or_else(|| Error::<E::T>::InputForwarded)?.clone()
 		} else if flags.contains(CallFlags::FORWARD_INPUT) {
@@ -698,23 +673,15 @@ where
 		if value > 0u32.into() {
 			self.charge_gas(RuntimeCosts::CallSurchargeTransfer)?;
 		}
-		let charged = self.charge_gas(
-			RuntimeCosts::CallSurchargeCodeSize(<E::T as Config>::Schedule::get().limits.code_len)
-		)?;
 		let ext = &mut self.ext;
 		let call_outcome = ext.call(
 			gas, callee, value, input_data, flags.contains(CallFlags::ALLOW_REENTRY),
 		);
-		let code_len = match &call_outcome {
-			Ok((_, len)) => len,
-			Err((_, len)) => len,
-		};
-		self.adjust_gas(charged, RuntimeCosts::CallSurchargeCodeSize(*code_len));
 
 		// `TAIL_CALL` only matters on an `OK` result. Otherwise the call stack comes to
 		// a halt anyways without anymore code being executed.
 		if flags.contains(CallFlags::TAIL_CALL) {
-			if let Ok((return_value, _)) = call_outcome {
+			if let Ok(return_value) = call_outcome {
 				return Err(TrapReason::Return(ReturnData {
 					flags: return_value.flags.bits(),
 					data: return_value.data.0,
@@ -722,12 +689,98 @@ where
 			}
 		}
 
-		if let Ok((output, _)) = &call_outcome {
+		if let Ok(output) = &call_outcome {
 			self.write_sandbox_output(output_ptr, output_len_ptr, &output.data, true, |len| {
 				Some(RuntimeCosts::CallCopyOut(len))
 			})?;
 		}
-		Ok(Runtime::<E>::exec_into_return_code(call_outcome.map(|r| r.0).map_err(|r| r.0))?)
+		Ok(Runtime::<E>::exec_into_return_code(call_outcome)?)
+	}
+
+	fn instantiate(
+		&mut self,
+		code_hash_ptr: u32,
+		gas: u64,
+		value_ptr: u32,
+		input_data_ptr: u32,
+		input_data_len: u32,
+		address_ptr: u32,
+		address_len_ptr: u32,
+		output_ptr: u32,
+		output_len_ptr: u32,
+		salt_ptr: u32,
+		salt_len: u32
+	) -> Result<ReturnCode, TrapReason>
+	{
+		self.charge_gas(RuntimeCosts::InstantiateBase {input_data_len, salt_len})?;
+		let code_hash: CodeHash<<E as Ext>::T> = self.read_sandbox_memory_as(code_hash_ptr)?;
+		let value: BalanceOf<<E as Ext>::T> = self.read_sandbox_memory_as(value_ptr)?;
+		let input_data = self.read_sandbox_memory(input_data_ptr, input_data_len)?;
+		let salt = self.read_sandbox_memory(salt_ptr, salt_len)?;
+		let instantiate_outcome = self.ext.instantiate(gas, code_hash, value, input_data, &salt);
+		if let Ok((address, output)) = &instantiate_outcome {
+			if !output.flags.contains(ReturnFlags::REVERT) {
+				self.write_sandbox_output(
+					address_ptr, address_len_ptr, &address.encode(), true, already_charged,
+				)?;
+			}
+			self.write_sandbox_output(output_ptr, output_len_ptr, &output.data, true, |len| {
+				Some(RuntimeCosts::InstantiateCopyOut(len))
+			})?;
+		}
+		Ok(Runtime::<E>::exec_into_return_code(instantiate_outcome.map(|(_, retval)| retval))?)
+	}
+
+	fn terminate(&mut self, beneficiary_ptr: u32) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::Terminate)?;
+		let beneficiary: <<E as Ext>::T as frame_system::Config>::AccountId =
+			self.read_sandbox_memory_as(beneficiary_ptr)?;
+		self.ext.terminate(&beneficiary)?;
+		Err(TrapReason::Termination)
+	}
+
+	fn restore_to(
+		&mut self,
+		dest_ptr: u32,
+		code_hash_ptr: u32,
+		rent_allowance_ptr: u32,
+		delta_ptr: u32,
+		delta_count: u32
+	) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::RestoreTo(delta_count))?;
+		let dest: <<E as Ext>::T as frame_system::Config>::AccountId =
+			self.read_sandbox_memory_as(dest_ptr)?;
+		let code_hash: CodeHash<<E as Ext>::T> =
+			self.read_sandbox_memory_as(code_hash_ptr)?;
+		let rent_allowance: BalanceOf<<E as Ext>::T> =
+			self.read_sandbox_memory_as(rent_allowance_ptr)?;
+		let delta = {
+			const KEY_SIZE: usize = 32;
+
+			// We can eagerly allocate because we charged for the complete delta count already
+			// We still need to make sure that the allocation isn't larger than the memory
+			// allocator can handle.
+			let max_memory = self.ext.schedule().limits.max_memory_size();
+			ensure!(
+				delta_count.saturating_mul(KEY_SIZE as u32) <= max_memory,
+				Error::<E::T>::OutOfBounds,
+			);
+			let mut delta = vec![[0; KEY_SIZE]; delta_count as usize];
+			let mut key_ptr = delta_ptr;
+
+			for i in 0..delta_count {
+				// Read the delta into the provided buffer
+				// This cannot panic because of the loop condition
+				self.read_sandbox_memory_into_buf(key_ptr, &mut delta[i as usize])?;
+
+				// Offset key_ptr to the next element.
+				key_ptr = key_ptr.checked_add(KEY_SIZE as u32).ok_or(Error::<E::T>::OutOfBounds)?;
+			}
+
+			delta
+		};
+		self.ext.restore_to(dest, code_hash, rent_allowance, delta)?;
+		Err(TrapReason::Restoration)
 	}
 }
 
@@ -838,15 +891,15 @@ define_env!(Env, <E: Ext>,
 	[seal0] seal_transfer(
 		ctx,
 		account_ptr: u32,
-		account_len: u32,
+		_account_len: u32,
 		value_ptr: u32,
-		value_len: u32
+		_value_len: u32
 	) -> ReturnCode => {
 		ctx.charge_gas(RuntimeCosts::Transfer)?;
 		let callee: <<E as Ext>::T as frame_system::Config>::AccountId =
-			ctx.read_sandbox_memory_as(account_ptr, account_len)?;
+			ctx.read_sandbox_memory_as(account_ptr)?;
 		let value: BalanceOf<<E as Ext>::T> =
-			ctx.read_sandbox_memory_as(value_ptr, value_len)?;
+			ctx.read_sandbox_memory_as(value_ptr)?;
 
 		let result = ctx.ext.transfer(&callee, value);
 		match result {
@@ -860,15 +913,23 @@ define_env!(Env, <E: Ext>,
 
 	// Make a call to another contract.
 	//
+	// # Deprecation
+	//
 	// This is equivalent to calling the newer version of this function with
 	// `flags` set to `ALLOW_REENTRY`. See the newer version for documentation.
+	//
+	// # Note
+	//
+	// The values `_callee_len` and `_value_len` are ignored because the encoded sizes
+	// of those types are fixed through `[`MaxEncodedLen`]. The fields exist for backwards
+	// compatibility. Consider switching to the newest version of this function.
 	[seal0] seal_call(
 		ctx,
 		callee_ptr: u32,
-		callee_len: u32,
+		_callee_len: u32,
 		gas: u64,
 		value_ptr: u32,
-		value_len: u32,
+		_value_len: u32,
 		input_data_ptr: u32,
 		input_data_len: u32,
 		output_ptr: u32,
@@ -877,10 +938,8 @@ define_env!(Env, <E: Ext>,
 		ctx.call(
 			CallFlags::ALLOW_REENTRY,
 			callee_ptr,
-			callee_len,
 			gas,
 			value_ptr,
-			value_len,
 			input_data_ptr,
 			input_data_len,
 			output_ptr,
@@ -899,11 +958,9 @@ define_env!(Env, <E: Ext>,
 	// - flags: See [`CallFlags`] for a documenation of the supported flags.
 	// - callee_ptr: a pointer to the address of the callee contract.
 	//   Should be decodable as an `T::AccountId`. Traps otherwise.
-	// - callee_len: length of the address buffer.
 	// - gas: how much gas to devote to the execution.
 	// - value_ptr: a pointer to the buffer with value, how much value to send.
 	//   Should be decodable as a `T::Balance`. Traps otherwise.
-	// - value_len: length of the value buffer.
 	// - input_data_ptr: a pointer to a buffer to be used as input data to the callee.
 	// - input_data_len: length of the input data buffer.
 	// - output_ptr: a pointer where the output buffer is copied to.
@@ -924,10 +981,8 @@ define_env!(Env, <E: Ext>,
 		ctx,
 		flags: u32,
 		callee_ptr: u32,
-		callee_len: u32,
 		gas: u64,
 		value_ptr: u32,
-		value_len: u32,
 		input_data_ptr: u32,
 		input_data_len: u32,
 		output_ptr: u32,
@@ -936,10 +991,8 @@ define_env!(Env, <E: Ext>,
 		ctx.call(
 			CallFlags::from_bits(flags).ok_or_else(|| "used rerved bit in CallFlags")?,
 			callee_ptr,
-			callee_len,
 			gas,
 			value_ptr,
-			value_len,
 			input_data_ptr,
 			input_data_len,
 			output_ptr,
@@ -947,6 +1000,49 @@ define_env!(Env, <E: Ext>,
 		)
 	},
 
+	// Instantiate a contract with the specified code hash.
+	//
+	// # Deprecation
+	//
+	// This is equivalent to calling the newer version of this function. The newer version
+	// drops the now unnecessary length fields.
+	//
+	// # Note
+	//
+	// The values `_code_hash_len` and `_value_len` are ignored because the encoded sizes
+	// of those types are fixed through `[`MaxEncodedLen`]. The fields exist for backwards
+	// compatibility. Consider switching to the newest version of this function.
+	[seal0] seal_instantiate(
+		ctx,
+		code_hash_ptr: u32,
+		_code_hash_len: u32,
+		gas: u64,
+		value_ptr: u32,
+		_value_len: u32,
+		input_data_ptr: u32,
+		input_data_len: u32,
+		address_ptr: u32,
+		address_len_ptr: u32,
+		output_ptr: u32,
+		output_len_ptr: u32,
+		salt_ptr: u32,
+		salt_len: u32
+	) -> ReturnCode => {
+		ctx.instantiate (
+			code_hash_ptr,
+			gas,
+			value_ptr,
+			input_data_ptr,
+			input_data_len,
+			address_ptr,
+			address_len_ptr,
+			output_ptr,
+			output_len_ptr,
+			salt_ptr,
+			salt_len,
+		)
+	},
+
 	// Instantiate a contract with the specified code hash.
 	//
 	// This function creates an account and executes the constructor defined in the code specified
@@ -962,11 +1058,9 @@ define_env!(Env, <E: Ext>,
 	// # Parameters
 	//
 	// - code_hash_ptr: a pointer to the buffer that contains the initializer code.
-	// - code_hash_len: length of the initializer code buffer.
 	// - gas: how much gas to devote to the execution of the initializer code.
 	// - value_ptr: a pointer to the buffer with value, how much value to send.
 	//   Should be decodable as a `T::Balance`. Traps otherwise.
-	// - value_len: length of the value buffer.
 	// - input_data_ptr: a pointer to a buffer to be used as input data to the initializer code.
 	// - input_data_len: length of the input data buffer.
 	// - address_ptr: a pointer where the new account's address is copied to.
@@ -992,13 +1086,11 @@ define_env!(Env, <E: Ext>,
 	// `ReturnCode::TransferFailed`
 	// `ReturnCode::NewContractNotFunded`
 	// `ReturnCode::CodeNotFound`
-	[seal0] seal_instantiate(
+	[seal1] seal_instantiate(
 		ctx,
 		code_hash_ptr: u32,
-		code_hash_len: u32,
 		gas: u64,
 		value_ptr: u32,
-		value_len: u32,
 		input_data_ptr: u32,
 		input_data_len: u32,
 		address_ptr: u32,
@@ -1008,37 +1100,35 @@ define_env!(Env, <E: Ext>,
 		salt_ptr: u32,
 		salt_len: u32
 	) -> ReturnCode => {
-		ctx.charge_gas(RuntimeCosts::InstantiateBase {input_data_len, salt_len})?;
-		let code_hash: CodeHash<<E as Ext>::T> =
-			ctx.read_sandbox_memory_as(code_hash_ptr, code_hash_len)?;
-		let value: BalanceOf<<E as Ext>::T> = ctx.read_sandbox_memory_as(value_ptr, value_len)?;
-		let input_data = ctx.read_sandbox_memory(input_data_ptr, input_data_len)?;
-		let salt = ctx.read_sandbox_memory(salt_ptr, salt_len)?;
-		let charged = ctx.charge_gas(
-			RuntimeCosts::InstantiateSurchargeCodeSize(
-				<E::T as Config>::Schedule::get().limits.code_len
-			)
-		)?;
-		let ext = &mut ctx.ext;
-		let instantiate_outcome = ext.instantiate(gas, code_hash, value, input_data, &salt);
-		let code_len = match &instantiate_outcome {
-			Ok((_, _, code_len)) => code_len,
-			Err((_, code_len)) => code_len,
-		};
-		ctx.adjust_gas(charged, RuntimeCosts::InstantiateSurchargeCodeSize(*code_len));
-		if let Ok((address, output, _)) = &instantiate_outcome {
-			if !output.flags.contains(ReturnFlags::REVERT) {
-				ctx.write_sandbox_output(
-					address_ptr, address_len_ptr, &address.encode(), true, already_charged,
-				)?;
-			}
-			ctx.write_sandbox_output(output_ptr, output_len_ptr, &output.data, true, |len| {
-				Some(RuntimeCosts::InstantiateCopyOut(len))
-			})?;
-		}
-		Ok(Runtime::<E>::exec_into_return_code(
-			instantiate_outcome.map(|(_, retval, _)| retval).map_err(|(err, _)| err)
-		)?)
+		ctx.instantiate(
+			code_hash_ptr,
+			gas,
+			value_ptr,
+			input_data_ptr,
+			input_data_len,
+			address_ptr,
+			address_len_ptr,
+			output_ptr,
+			output_len_ptr,
+			salt_ptr,
+			salt_len,
+		)
+	},
+
+	// Remove the calling account and transfer remaining balance.
+	//
+	// # Deprecation
+	//
+	// This is equivalent to calling the newer version of this function. The newer version
+	// drops the now unnecessary length fields.
+	//
+	// # Note
+	//
+	// The value `_beneficiary_len` is ignored because the encoded sizes
+	// this type is fixed through `[`MaxEncodedLen`]. The field exist for backwards
+	// compatibility. Consider switching to the newest version of this function.
+	[seal0] seal_terminate(ctx, beneficiary_ptr: u32, _beneficiary_len: u32) => {
+		ctx.terminate(beneficiary_ptr)
 	},
 
 	// Remove the calling account and transfer remaining balance.
@@ -1050,33 +1140,14 @@ define_env!(Env, <E: Ext>,
 	// - beneficiary_ptr: a pointer to the address of the beneficiary account where all
 	//   where all remaining funds of the caller are transferred.
 	//   Should be decodable as an `T::AccountId`. Traps otherwise.
-	// - beneficiary_len: length of the address buffer.
 	//
 	// # Traps
 	//
 	// - The contract is live i.e is already on the call stack.
 	// - Failed to send the balance to the beneficiary.
 	// - The deletion queue is full.
-	[seal0] seal_terminate(
-		ctx,
-		beneficiary_ptr: u32,
-		beneficiary_len: u32
-	) => {
-		ctx.charge_gas(RuntimeCosts::Terminate)?;
-		let beneficiary: <<E as Ext>::T as frame_system::Config>::AccountId =
-			ctx.read_sandbox_memory_as(beneficiary_ptr, beneficiary_len)?;
-		let charged = ctx.charge_gas(
-			RuntimeCosts::TerminateSurchargeCodeSize(
-				<E::T as Config>::Schedule::get().limits.code_len
-			)
-		)?;
-		let (result, code_len) = match ctx.ext.terminate(&beneficiary) {
-			Ok(len) => (Ok(()), len),
-			Err((err, len)) => (Err(err), len),
-		};
-		ctx.adjust_gas(charged, RuntimeCosts::TerminateSurchargeCodeSize(code_len));
-		result?;
-		Err(TrapReason::Termination)
+	[seal1] seal_terminate(ctx, beneficiary_ptr: u32) => {
+		ctx.terminate(beneficiary_ptr)
 	},
 
 	// Stores the input passed by the caller into the supplied buffer.
@@ -1323,6 +1394,38 @@ define_env!(Env, <E: Ext>,
 		)?)
 	},
 
+	// Try to restore the given destination contract sacrificing the caller.
+	//
+	// # Deprecation
+	//
+	// This is equivalent to calling the newer version of this function. The newer version
+	// drops the now unnecessary length fields.
+	//
+	// # Note
+	//
+	// The values `_dest_len`, `_code_hash_len` and `_rent_allowance_len` are ignored because
+	// the encoded sizes of those types are fixed through `[`MaxEncodedLen`]. The fields
+	// exist for backwards compatibility. Consider switching to the newest version of this function.
+	[seal0] seal_restore_to(
+		ctx,
+		dest_ptr: u32,
+		_dest_len: u32,
+		code_hash_ptr: u32,
+		_code_hash_len: u32,
+		rent_allowance_ptr: u32,
+		_rent_allowance_len: u32,
+		delta_ptr: u32,
+		delta_count: u32
+	) => {
+		ctx.restore_to(
+			dest_ptr,
+			code_hash_ptr,
+			rent_allowance_ptr,
+			delta_ptr,
+			delta_count,
+		)
+	},
+
 	// Try to restore the given destination contract sacrificing the caller.
 	//
 	// This function will compute a tombstone hash from the caller's storage and the given code hash
@@ -1339,11 +1442,11 @@ define_env!(Env, <E: Ext>,
 	// On success, the destination contract is restored. This function is diverging and
 	// stops execution even on success.
 	//
-	// - `dest_ptr`, `dest_len` - the pointer and the length of a buffer that encodes `T::AccountId`
+	// - `dest_ptr` - the pointer to a buffer that encodes `T::AccountId`
 	//    with the address of the to be restored contract.
-	// - `code_hash_ptr`, `code_hash_len` - the pointer and the length of a buffer that encodes
+	// - `code_hash_ptr` - the pointer to a buffer that encodes
 	//    a code hash of the to be restored contract.
-	// - `rent_allowance_ptr`, `rent_allowance_len` - the pointer and the length of a buffer that
+	// - `rent_allowance_ptr`  - the pointer to a buffer that
 	//    encodes the rent allowance that must be set in the case of successful restoration.
 	// - `delta_ptr` is the pointer to the start of a buffer that has `delta_count` storage keys
 	//    laid out sequentially.
@@ -1354,67 +1457,21 @@ define_env!(Env, <E: Ext>,
 	// - Tombstone hashes do not match.
 	// - The calling contract is already present on the call stack.
 	// - The supplied code_hash does not exist on-chain.
-	[seal0] seal_restore_to(
+	[seal1] seal_restore_to(
 		ctx,
 		dest_ptr: u32,
-		dest_len: u32,
 		code_hash_ptr: u32,
-		code_hash_len: u32,
 		rent_allowance_ptr: u32,
-		rent_allowance_len: u32,
 		delta_ptr: u32,
 		delta_count: u32
 	) => {
-		ctx.charge_gas(RuntimeCosts::RestoreTo(delta_count))?;
-		let dest: <<E as Ext>::T as frame_system::Config>::AccountId =
-			ctx.read_sandbox_memory_as(dest_ptr, dest_len)?;
-		let code_hash: CodeHash<<E as Ext>::T> =
-			ctx.read_sandbox_memory_as(code_hash_ptr, code_hash_len)?;
-		let rent_allowance: BalanceOf<<E as Ext>::T> =
-			ctx.read_sandbox_memory_as(rent_allowance_ptr, rent_allowance_len)?;
-		let delta = {
-			const KEY_SIZE: usize = 32;
-
-			// We can eagerly allocate because we charged for the complete delta count already
-			// We still need to make sure that the allocation isn't larger than the memory
-			// allocator can handle.
-			ensure!(
-				delta_count
-					.saturating_mul(KEY_SIZE as u32) <= ctx.ext.schedule().limits.max_memory_size(),
-				Error::<E::T>::OutOfBounds,
-			);
-			let mut delta = vec![[0; KEY_SIZE]; delta_count as usize];
-			let mut key_ptr = delta_ptr;
-
-			for i in 0..delta_count {
-				// Read the delta into the provided buffer
-				// This cannot panic because of the loop condition
-				ctx.read_sandbox_memory_into_buf(key_ptr, &mut delta[i as usize])?;
-
-				// Offset key_ptr to the next element.
-				key_ptr = key_ptr.checked_add(KEY_SIZE as u32).ok_or(Error::<E::T>::OutOfBounds)?;
-			}
-
-			delta
-		};
-
-		let max_len = <E::T as Config>::Schedule::get().limits.code_len;
-		let charged = ctx.charge_gas(RuntimeCosts::RestoreToSurchargeCodeSize {
-			caller_code: max_len,
-			tombstone_code: max_len,
-		})?;
-		let (result, caller_code, tombstone_code) = match ctx.ext.restore_to(
-			dest, code_hash, rent_allowance, delta
-		) {
-			Ok((code, tomb)) => (Ok(()), code, tomb),
-			Err((err, code, tomb)) => (Err(err), code, tomb),
-		};
-		ctx.adjust_gas(charged, RuntimeCosts::RestoreToSurchargeCodeSize {
-			caller_code,
-			tombstone_code,
-		});
-		result?;
-		Err(TrapReason::Restoration)
+		ctx.restore_to(
+			dest_ptr,
+			code_hash_ptr,
+			rent_allowance_ptr,
+			delta_ptr,
+			delta_count,
+		)
 	},
 
 	// Deposit a contract event with the data buffer and optional list of topics. There is a limit
@@ -1460,7 +1517,7 @@ define_env!(Env, <E: Ext>,
 
 		let mut topics: Vec::<TopicOf<<E as Ext>::T>> = match topics_len {
 			0 => Vec::new(),
-			_ => ctx.read_sandbox_memory_as(topics_ptr, topics_len)?,
+			_ => ctx.read_sandbox_memory_as_unbounded(topics_ptr, topics_len)?,
 		};
 
 		// If there are more than `event_topics`, then trap.
@@ -1482,17 +1539,33 @@ define_env!(Env, <E: Ext>,
 		Ok(())
 	},
 
-	// Set rent allowance of the contract
+	// Set rent allowance of the contract.
+	//
+	// # Deprecation
+	//
+	// This is equivalent to calling the newer version of this function. The newer version
+	// drops the now unnecessary length fields.
+	//
+	// # Note
+	//
+	// The value `_VALUE_len` is ignored because the encoded sizes
+	// this type is fixed through `[`MaxEncodedLen`]. The field exist for backwards
+	// compatibility. Consider switching to the newest version of this function.
+	[seal0] seal_set_rent_allowance(ctx, value_ptr: u32, _value_len: u32) => {
+		ctx.charge_gas(RuntimeCosts::SetRentAllowance)?;
+		let value: BalanceOf<<E as Ext>::T> = ctx.read_sandbox_memory_as(value_ptr)?;
+		ctx.ext.set_rent_allowance(value);
+		Ok(())
+	},
+
+	// Set rent allowance of the contract.
 	//
 	// - value_ptr: a pointer to the buffer with value, how much to allow for rent
 	//   Should be decodable as a `T::Balance`. Traps otherwise.
-	// - value_len: length of the value buffer.
-	[seal0] seal_set_rent_allowance(ctx, value_ptr: u32, value_len: u32) => {
+	[seal1] seal_set_rent_allowance(ctx, value_ptr: u32) => {
 		ctx.charge_gas(RuntimeCosts::SetRentAllowance)?;
-		let value: BalanceOf<<E as Ext>::T> =
-			ctx.read_sandbox_memory_as(value_ptr, value_len)?;
+		let value: BalanceOf<<E as Ext>::T> = ctx.read_sandbox_memory_as(value_ptr)?;
 		ctx.ext.set_rent_allowance(value);
-
 		Ok(())
 	},
 
diff --git a/frame/contracts/src/weights.rs b/frame/contracts/src/weights.rs
index 5edb4170e4ea..503d952b110e 100644
--- a/frame/contracts/src/weights.rs
+++ b/frame/contracts/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_contracts
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-06-08, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -48,9 +48,11 @@ pub trait WeightInfo {
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight;
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight;
 	fn instrument(c: u32, ) -> Weight;
+	fn code_load(c: u32, ) -> Weight;
+	fn code_refcount(c: u32, ) -> Weight;
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight;
-	fn instantiate(c: u32, s: u32, ) -> Weight;
-	fn call(c: u32, ) -> Weight;
+	fn instantiate(s: u32, ) -> Weight;
+	fn call() -> Weight;
 	fn claim_surcharge(c: u32, ) -> Weight;
 	fn seal_caller(r: u32, ) -> Weight;
 	fn seal_address(r: u32, ) -> Weight;
@@ -69,9 +71,8 @@ pub trait WeightInfo {
 	fn seal_return(r: u32, ) -> Weight;
 	fn seal_return_per_kb(n: u32, ) -> Weight;
 	fn seal_terminate(r: u32, ) -> Weight;
-	fn seal_terminate_per_code_kb(c: u32, ) -> Weight;
 	fn seal_restore_to(r: u32, ) -> Weight;
-	fn seal_restore_to_per_code_kb_delta(c: u32, t: u32, d: u32, ) -> Weight;
+	fn seal_restore_to_per_delta(d: u32, ) -> Weight;
 	fn seal_random(r: u32, ) -> Weight;
 	fn seal_deposit_event(r: u32, ) -> Weight;
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight;
@@ -84,9 +85,9 @@ pub trait WeightInfo {
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight;
 	fn seal_transfer(r: u32, ) -> Weight;
 	fn seal_call(r: u32, ) -> Weight;
-	fn seal_call_per_code_transfer_input_output_kb(c: u32, t: u32, i: u32, o: u32, ) -> Weight;
+	fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight;
 	fn seal_instantiate(r: u32, ) -> Weight;
-	fn seal_instantiate_per_code_input_output_salt_kb(c: u32, i: u32, o: u32, s: u32, ) -> Weight;
+	fn seal_instantiate_per_input_output_salt_kb(i: u32, o: u32, s: u32, ) -> Weight;
 	fn seal_hash_sha2_256(r: u32, ) -> Weight;
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight;
 	fn seal_hash_keccak_256(r: u32, ) -> Weight;
@@ -152,272 +153,270 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn on_initialize() -> Weight {
-		(3_603_000 as Weight)
+		(4_636_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 	}
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((2_217_000 as Weight).saturating_mul(k as Weight))
+			// Standard Error: 3_000
+			.saturating_add((2_851_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 6_000
-			.saturating_add((36_769_000 as Weight).saturating_mul(q as Weight))
+			// Standard Error: 11_000
+			.saturating_add((38_093_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn instrument(c: u32, ) -> Weight {
-		(54_463_000 as Weight)
-			// Standard Error: 105_000
-			.saturating_add((77_542_000 as Weight).saturating_mul(c as Weight))
+		(60_027_000 as Weight)
+			// Standard Error: 109_000
+			.saturating_add((169_008_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	fn code_load(c: u32, ) -> Weight {
+		(7_881_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_007_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+	}
+	fn code_refcount(c: u32, ) -> Weight {
+		(12_861_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((3_028_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight {
-		(184_114_000 as Weight)
-			// Standard Error: 82_000
-			.saturating_add((117_247_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 5_000
-			.saturating_add((1_542_000 as Weight).saturating_mul(s as Weight))
+		(189_624_000 as Weight)
+			// Standard Error: 120_000
+			.saturating_add((244_984_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 7_000
+			.saturating_add((1_588_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
-	fn instantiate(c: u32, s: u32, ) -> Weight {
-		(183_501_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((5_645_000 as Weight).saturating_mul(c as Weight))
+	fn instantiate(s: u32, ) -> Weight {
+		(224_867_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((1_473_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((1_476_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
-	fn call(c: u32, ) -> Weight {
-		(173_411_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((2_639_000 as Weight).saturating_mul(c as Weight))
+	fn call() -> Weight {
+		(197_338_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn claim_surcharge(c: u32, ) -> Weight {
-		(125_839_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((3_123_000 as Weight).saturating_mul(c as Weight))
+		(147_775_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((3_094_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn seal_caller(r: u32, ) -> Weight {
-		(131_793_000 as Weight)
-			// Standard Error: 84_000
-			.saturating_add((231_138_000 as Weight).saturating_mul(r as Weight))
+		(150_159_000 as Weight)
+			// Standard Error: 90_000
+			.saturating_add((274_529_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_address(r: u32, ) -> Weight {
-		(129_995_000 as Weight)
-			// Standard Error: 78_000
-			.saturating_add((231_839_000 as Weight).saturating_mul(r as Weight))
+		(140_207_000 as Weight)
+			// Standard Error: 116_000
+			.saturating_add((276_569_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(129_710_000 as Weight)
-			// Standard Error: 85_000
-			.saturating_add((227_268_000 as Weight).saturating_mul(r as Weight))
+		(156_581_000 as Weight)
+			// Standard Error: 107_000
+			.saturating_add((270_368_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_balance(r: u32, ) -> Weight {
-		(133_445_000 as Weight)
-			// Standard Error: 144_000
-			.saturating_add((487_125_000 as Weight).saturating_mul(r as Weight))
+		(141_778_000 as Weight)
+			// Standard Error: 305_000
+			.saturating_add((615_927_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(129_299_000 as Weight)
-			// Standard Error: 82_000
-			.saturating_add((227_118_000 as Weight).saturating_mul(r as Weight))
+		(138_752_000 as Weight)
+			// Standard Error: 91_000
+			.saturating_add((280_176_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(126_120_000 as Weight)
-			// Standard Error: 114_000
-			.saturating_add((227_326_000 as Weight).saturating_mul(r as Weight))
+		(141_089_000 as Weight)
+			// Standard Error: 82_000
+			.saturating_add((274_199_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(130_934_000 as Weight)
-			// Standard Error: 89_000
-			.saturating_add((226_638_000 as Weight).saturating_mul(r as Weight))
+		(140_447_000 as Weight)
+			// Standard Error: 119_000
+			.saturating_add((270_823_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(128_738_000 as Weight)
-			// Standard Error: 77_000
-			.saturating_add((227_062_000 as Weight).saturating_mul(r as Weight))
+		(138_394_000 as Weight)
+			// Standard Error: 105_000
+			.saturating_add((275_261_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_block_number(r: u32, ) -> Weight {
-		(132_375_000 as Weight)
-			// Standard Error: 88_000
-			.saturating_add((226_861_000 as Weight).saturating_mul(r as Weight))
+		(151_633_000 as Weight)
+			// Standard Error: 109_000
+			.saturating_add((269_666_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_now(r: u32, ) -> Weight {
-		(127_888_000 as Weight)
-			// Standard Error: 86_000
-			.saturating_add((227_851_000 as Weight).saturating_mul(r as Weight))
+		(129_087_000 as Weight)
+			// Standard Error: 252_000
+			.saturating_add((277_368_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(131_825_000 as Weight)
-			// Standard Error: 149_000
-			.saturating_add((420_149_000 as Weight).saturating_mul(r as Weight))
+		(176_205_000 as Weight)
+			// Standard Error: 304_000
+			.saturating_add((555_094_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_gas(r: u32, ) -> Weight {
-		(113_641_000 as Weight)
-			// Standard Error: 114_000
-			.saturating_add((113_068_000 as Weight).saturating_mul(r as Weight))
+		(129_942_000 as Weight)
+			// Standard Error: 92_000
+			.saturating_add((144_914_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_input(r: u32, ) -> Weight {
-		(122_982_000 as Weight)
-			// Standard Error: 74_000
-			.saturating_add((6_828_000 as Weight).saturating_mul(r as Weight))
+		(141_540_000 as Weight)
+			// Standard Error: 68_000
+			.saturating_add((6_576_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(131_913_000 as Weight)
+		(150_832_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((275_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((263_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_return(r: u32, ) -> Weight {
-		(114_164_000 as Weight)
-			// Standard Error: 72_000
-			.saturating_add((4_318_000 as Weight).saturating_mul(r as Weight))
+		(135_920_000 as Weight)
+			// Standard Error: 61_000
+			.saturating_add((3_733_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(123_940_000 as Weight)
+		(144_104_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((664_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((640_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_terminate(r: u32, ) -> Weight {
-		(123_340_000 as Weight)
-			// Standard Error: 99_000
-			.saturating_add((89_126_000 as Weight).saturating_mul(r as Weight))
+		(141_631_000 as Weight)
+			// Standard Error: 70_000
+			.saturating_add((112_747_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
 	}
-	fn seal_terminate_per_code_kb(c: u32, ) -> Weight {
-		(217_499_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((5_608_000 as Weight).saturating_mul(c as Weight))
-			.saturating_add(T::DbWeight::get().reads(6 as Weight))
-			.saturating_add(T::DbWeight::get().writes(5 as Weight))
-	}
 	fn seal_restore_to(r: u32, ) -> Weight {
-		(149_019_000 as Weight)
-			// Standard Error: 903_000
-			.saturating_add((87_433_000 as Weight).saturating_mul(r as Weight))
+		(168_955_000 as Weight)
+			// Standard Error: 211_000
+			.saturating_add((119_247_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((5 as Weight).saturating_mul(r as Weight)))
 	}
-	fn seal_restore_to_per_code_kb_delta(c: u32, t: u32, d: u32, ) -> Weight {
-		(18_255_000 as Weight)
-			// Standard Error: 141_000
-			.saturating_add((5_142_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 141_000
-			.saturating_add((2_478_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 1_242_000
-			.saturating_add((2_935_421_000 as Weight).saturating_mul(d as Weight))
+	fn seal_restore_to_per_delta(d: u32, ) -> Weight {
+		(0 as Weight)
+			// Standard Error: 3_299_000
+			.saturating_add((3_257_862_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
 			.saturating_add(T::DbWeight::get().writes(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
 	}
 	fn seal_random(r: u32, ) -> Weight {
-		(140_411_000 as Weight)
-			// Standard Error: 146_000
-			.saturating_add((566_687_000 as Weight).saturating_mul(r as Weight))
+		(124_927_000 as Weight)
+			// Standard Error: 407_000
+			.saturating_add((730_247_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(132_048_000 as Weight)
-			// Standard Error: 308_000
-			.saturating_add((818_622_000 as Weight).saturating_mul(r as Weight))
+		(135_014_000 as Weight)
+			// Standard Error: 892_000
+			.saturating_add((1_131_992_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_080_578_000 as Weight)
-			// Standard Error: 2_337_000
-			.saturating_add((534_525_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 460_000
-			.saturating_add((167_990_000 as Weight).saturating_mul(n as Weight))
+		(1_401_344_000 as Weight)
+			// Standard Error: 2_961_000
+			.saturating_add((701_918_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 583_000
+			.saturating_add((169_206_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(123_998_000 as Weight)
-			// Standard Error: 53_000
-			.saturating_add((155_113_000 as Weight).saturating_mul(r as Weight))
+		(146_753_000 as Weight)
+			// Standard Error: 117_000
+			.saturating_add((194_150_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_debug_message(r: u32, ) -> Weight {
-		(120_514_000 as Weight)
-			// Standard Error: 93_000
-			.saturating_add((124_243_000 as Weight).saturating_mul(r as Weight))
+		(141_972_000 as Weight)
+			// Standard Error: 114_000
+			.saturating_add((164_981_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(47_131_000 as Weight)
-			// Standard Error: 931_000
-			.saturating_add((4_033_062_000 as Weight).saturating_mul(r as Weight))
+		(549_424_000 as Weight)
+			// Standard Error: 7_901_000
+			.saturating_add((4_159_879_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(549_577_000 as Weight)
-			// Standard Error: 192_000
-			.saturating_add((57_815_000 as Weight).saturating_mul(n as Weight))
+		(682_814_000 as Weight)
+			// Standard Error: 229_000
+			.saturating_add((59_572_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn seal_clear_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_635_000
-			.saturating_add((1_214_454_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 2_889_000
+			.saturating_add((1_563_117_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -425,23 +424,23 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	}
 	fn seal_get_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 1_044_000
-			.saturating_add((883_653_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 2_414_000
+			.saturating_add((1_178_803_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(568_190_000 as Weight)
-			// Standard Error: 181_000
-			.saturating_add((106_420_000 as Weight).saturating_mul(n as Weight))
+		(696_056_000 as Weight)
+			// Standard Error: 266_000
+			.saturating_add((108_870_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_transfer(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 1_553_000
-			.saturating_add((4_810_405_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 2_764_000
+			.saturating_add((6_397_838_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
@@ -449,631 +448,625 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	}
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 8_671_000
-			.saturating_add((10_965_308_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 8_279_000
+			.saturating_add((13_318_274_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((200 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
-	fn seal_call_per_code_transfer_input_output_kb(c: u32, t: u32, i: u32, o: u32, ) -> Weight {
-		(10_138_403_000 as Weight)
-			// Standard Error: 162_000
-			.saturating_add((264_871_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 67_846_000
-			.saturating_add((3_793_372_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 21_000
-			.saturating_add((49_168_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 22_000
-			.saturating_add((71_664_000 as Weight).saturating_mul(o as Weight))
+	fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight {
+		(13_411_599_000 as Weight)
+			// Standard Error: 40_931_000
+			.saturating_add((4_291_567_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 14_000
+			.saturating_add((48_818_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 15_000
+			.saturating_add((68_502_000 as Weight).saturating_mul(o as Weight))
 			.saturating_add(T::DbWeight::get().reads(205 as Weight))
 			.saturating_add(T::DbWeight::get().writes(101 as Weight))
 			.saturating_add(T::DbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 34_546_000
-			.saturating_add((19_938_393_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 31_671_000
+			.saturating_add((24_164_540_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes((300 as Weight).saturating_mul(r as Weight)))
 	}
-	fn seal_instantiate_per_code_input_output_salt_kb(c: u32, i: u32, o: u32, s: u32, ) -> Weight {
-		(8_861_543_000 as Weight)
-			// Standard Error: 566_000
-			.saturating_add((585_057_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 80_000
-			.saturating_add((52_025_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 80_000
-			.saturating_add((75_956_000 as Weight).saturating_mul(o as Weight))
-			// Standard Error: 80_000
-			.saturating_add((198_033_000 as Weight).saturating_mul(s as Weight))
+	fn seal_instantiate_per_input_output_salt_kb(i: u32, o: u32, s: u32, ) -> Weight {
+		(17_228_488_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((50_822_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 26_000
+			.saturating_add((71_276_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 26_000
+			.saturating_add((198_669_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(206 as Weight))
 			.saturating_add(T::DbWeight::get().writes(204 as Weight))
 	}
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(129_022_000 as Weight)
-			// Standard Error: 76_000
-			.saturating_add((216_764_000 as Weight).saturating_mul(r as Weight))
+		(149_183_000 as Weight)
+			// Standard Error: 99_000
+			.saturating_add((279_233_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(414_489_000 as Weight)
+		(457_629_000 as Weight)
 			// Standard Error: 14_000
-			.saturating_add((481_873_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((480_686_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(127_636_000 as Weight)
-			// Standard Error: 104_000
-			.saturating_add((225_094_000 as Weight).saturating_mul(r as Weight))
+		(141_603_000 as Weight)
+			// Standard Error: 120_000
+			.saturating_add((283_527_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(216_668_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((331_423_000 as Weight).saturating_mul(n as Weight))
+		(463_644_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((332_183_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(129_582_000 as Weight)
-			// Standard Error: 97_000
-			.saturating_add((198_429_000 as Weight).saturating_mul(r as Weight))
+		(144_145_000 as Weight)
+			// Standard Error: 113_000
+			.saturating_add((252_640_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(288_991_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((148_497_000 as Weight).saturating_mul(n as Weight))
+		(455_101_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((149_174_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(128_711_000 as Weight)
-			// Standard Error: 94_000
-			.saturating_add((197_050_000 as Weight).saturating_mul(r as Weight))
+		(147_166_000 as Weight)
+			// Standard Error: 233_000
+			.saturating_add((254_430_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(275_444_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((148_469_000 as Weight).saturating_mul(n as Weight))
+		(445_667_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((149_178_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(20_089_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((3_376_000 as Weight).saturating_mul(r as Weight))
+		(21_505_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((7_963_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(22_187_000 as Weight)
-			// Standard Error: 31_000
-			.saturating_add((162_969_000 as Weight).saturating_mul(r as Weight))
+		(24_775_000 as Weight)
+			// Standard Error: 37_000
+			.saturating_add((157_130_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(22_292_000 as Weight)
-			// Standard Error: 39_000
-			.saturating_add((233_277_000 as Weight).saturating_mul(r as Weight))
+		(24_722_000 as Weight)
+			// Standard Error: 69_000
+			.saturating_add((240_564_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(20_083_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((12_378_000 as Weight).saturating_mul(r as Weight))
+		(21_506_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((45_277_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(20_091_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((12_195_000 as Weight).saturating_mul(r as Weight))
+		(21_587_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((42_269_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(20_082_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((6_151_000 as Weight).saturating_mul(r as Weight))
+		(21_538_000 as Weight)
+			// Standard Error: 807_000
+			.saturating_add((22_392_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(20_031_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((13_978_000 as Weight).saturating_mul(r as Weight))
+		(21_634_000 as Weight)
+			// Standard Error: 57_000
+			.saturating_add((44_203_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(20_063_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((15_524_000 as Weight).saturating_mul(r as Weight))
+		(21_531_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((33_198_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(34_332_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((117_000 as Weight).saturating_mul(e as Weight))
+		(60_960_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((151_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(20_446_000 as Weight)
-			// Standard Error: 121_000
-			.saturating_add((90_977_000 as Weight).saturating_mul(r as Weight))
+		(21_777_000 as Weight)
+			// Standard Error: 141_000
+			.saturating_add((245_105_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(28_119_000 as Weight)
-			// Standard Error: 390_000
-			.saturating_add((192_865_000 as Weight).saturating_mul(r as Weight))
+		(34_307_000 as Weight)
+			// Standard Error: 365_000
+			.saturating_add((344_623_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(228_352_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((3_891_000 as Weight).saturating_mul(p as Weight))
+		(398_310_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((4_163_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(37_745_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((3_135_000 as Weight).saturating_mul(r as Weight))
+		(40_478_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((9_991_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(37_639_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((3_541_000 as Weight).saturating_mul(r as Weight))
+		(40_427_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((8_526_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(37_639_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((4_813_000 as Weight).saturating_mul(r as Weight))
+		(40_463_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((16_497_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(23_379_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((7_757_000 as Weight).saturating_mul(r as Weight))
+		(25_998_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((18_214_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(23_378_000 as Weight)
-			// Standard Error: 68_000
-			.saturating_add((8_437_000 as Weight).saturating_mul(r as Weight))
+		(25_972_000 as Weight)
+			// Standard Error: 42_000
+			.saturating_add((18_901_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(22_245_000 as Weight)
+		(24_949_000 as Weight)
 			// Standard Error: 17_000
-			.saturating_add((3_446_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((8_541_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(20_714_000 as Weight)
-			// Standard Error: 478_000
-			.saturating_add((2_314_540_000 as Weight).saturating_mul(r as Weight))
+		(22_204_000 as Weight)
+			// Standard Error: 4_776_000
+			.saturating_add((2_198_462_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(20_126_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((5_316_000 as Weight).saturating_mul(r as Weight))
+		(21_506_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((25_302_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(20_107_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((5_344_000 as Weight).saturating_mul(r as Weight))
+		(21_523_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((25_206_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(20_135_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((5_909_000 as Weight).saturating_mul(r as Weight))
+		(21_567_000 as Weight)
+			// Standard Error: 466_000
+			.saturating_add((19_925_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(20_107_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((5_515_000 as Weight).saturating_mul(r as Weight))
+		(21_569_000 as Weight)
+			// Standard Error: 30_000
+			.saturating_add((25_027_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(20_229_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((5_113_000 as Weight).saturating_mul(r as Weight))
+		(21_536_000 as Weight)
+			// Standard Error: 193_000
+			.saturating_add((17_690_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(20_070_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((5_226_000 as Weight).saturating_mul(r as Weight))
+		(21_555_000 as Weight)
+			// Standard Error: 356_000
+			.saturating_add((17_105_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(20_090_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((5_296_000 as Weight).saturating_mul(r as Weight))
+		(21_561_000 as Weight)
+			// Standard Error: 1_038_000
+			.saturating_add((22_198_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(20_095_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((7_323_000 as Weight).saturating_mul(r as Weight))
+		(21_513_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((33_620_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(20_043_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((7_280_000 as Weight).saturating_mul(r as Weight))
+		(21_556_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((33_669_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(20_061_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((7_226_000 as Weight).saturating_mul(r as Weight))
+		(21_571_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((33_649_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(20_072_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((7_315_000 as Weight).saturating_mul(r as Weight))
+		(21_533_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((33_450_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(20_054_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((7_228_000 as Weight).saturating_mul(r as Weight))
+		(21_525_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((33_727_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(20_169_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((7_262_000 as Weight).saturating_mul(r as Weight))
+		(21_546_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((33_420_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(20_115_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((7_212_000 as Weight).saturating_mul(r as Weight))
+		(21_546_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((33_720_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(20_122_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((7_166_000 as Weight).saturating_mul(r as Weight))
+		(21_546_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((33_383_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(20_140_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((7_242_000 as Weight).saturating_mul(r as Weight))
+		(21_577_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((33_454_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(20_107_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((7_365_000 as Weight).saturating_mul(r as Weight))
+		(21_566_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((33_665_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(20_179_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((7_144_000 as Weight).saturating_mul(r as Weight))
+		(21_524_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((33_351_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(20_143_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((7_222_000 as Weight).saturating_mul(r as Weight))
+		(21_558_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((33_423_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(20_129_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((7_247_000 as Weight).saturating_mul(r as Weight))
+		(21_554_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((33_588_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(20_107_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((12_953_000 as Weight).saturating_mul(r as Weight))
+		(21_568_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((38_897_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(20_093_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((12_040_000 as Weight).saturating_mul(r as Weight))
+		(21_567_000 as Weight)
+			// Standard Error: 31_000
+			.saturating_add((38_756_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(20_102_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((12_945_000 as Weight).saturating_mul(r as Weight))
+		(21_540_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((39_244_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(20_132_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((12_199_000 as Weight).saturating_mul(r as Weight))
+		(21_581_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((38_461_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(20_155_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((7_103_000 as Weight).saturating_mul(r as Weight))
+		(21_555_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((33_367_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(20_088_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((7_213_000 as Weight).saturating_mul(r as Weight))
+		(21_523_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((33_466_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(20_060_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((7_275_000 as Weight).saturating_mul(r as Weight))
+		(21_536_000 as Weight)
+			// Standard Error: 34_000
+			.saturating_add((33_452_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(20_104_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((7_282_000 as Weight).saturating_mul(r as Weight))
+		(21_567_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((33_809_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(20_111_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((7_264_000 as Weight).saturating_mul(r as Weight))
+		(21_580_000 as Weight)
+			// Standard Error: 32_000
+			.saturating_add((33_849_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(20_096_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((7_347_000 as Weight).saturating_mul(r as Weight))
+		(21_571_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((33_799_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(20_091_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((7_370_000 as Weight).saturating_mul(r as Weight))
+		(21_559_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((33_947_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(20_102_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((7_266_000 as Weight).saturating_mul(r as Weight))
+		(21_565_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((33_754_000 as Weight).saturating_mul(r as Weight))
 	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn on_initialize() -> Weight {
-		(3_603_000 as Weight)
+		(4_636_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 	}
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((2_217_000 as Weight).saturating_mul(k as Weight))
+			// Standard Error: 3_000
+			.saturating_add((2_851_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 6_000
-			.saturating_add((36_769_000 as Weight).saturating_mul(q as Weight))
+			// Standard Error: 11_000
+			.saturating_add((38_093_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn instrument(c: u32, ) -> Weight {
-		(54_463_000 as Weight)
-			// Standard Error: 105_000
-			.saturating_add((77_542_000 as Weight).saturating_mul(c as Weight))
+		(60_027_000 as Weight)
+			// Standard Error: 109_000
+			.saturating_add((169_008_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	fn code_load(c: u32, ) -> Weight {
+		(7_881_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_007_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+	}
+	fn code_refcount(c: u32, ) -> Weight {
+		(12_861_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((3_028_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight {
-		(184_114_000 as Weight)
-			// Standard Error: 82_000
-			.saturating_add((117_247_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 5_000
-			.saturating_add((1_542_000 as Weight).saturating_mul(s as Weight))
+		(189_624_000 as Weight)
+			// Standard Error: 120_000
+			.saturating_add((244_984_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 7_000
+			.saturating_add((1_588_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
-	fn instantiate(c: u32, s: u32, ) -> Weight {
-		(183_501_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((5_645_000 as Weight).saturating_mul(c as Weight))
+	fn instantiate(s: u32, ) -> Weight {
+		(224_867_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((1_473_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((1_476_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
-	fn call(c: u32, ) -> Weight {
-		(173_411_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((2_639_000 as Weight).saturating_mul(c as Weight))
+	fn call() -> Weight {
+		(197_338_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn claim_surcharge(c: u32, ) -> Weight {
-		(125_839_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((3_123_000 as Weight).saturating_mul(c as Weight))
+		(147_775_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((3_094_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn seal_caller(r: u32, ) -> Weight {
-		(131_793_000 as Weight)
-			// Standard Error: 84_000
-			.saturating_add((231_138_000 as Weight).saturating_mul(r as Weight))
+		(150_159_000 as Weight)
+			// Standard Error: 90_000
+			.saturating_add((274_529_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_address(r: u32, ) -> Weight {
-		(129_995_000 as Weight)
-			// Standard Error: 78_000
-			.saturating_add((231_839_000 as Weight).saturating_mul(r as Weight))
+		(140_207_000 as Weight)
+			// Standard Error: 116_000
+			.saturating_add((276_569_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(129_710_000 as Weight)
-			// Standard Error: 85_000
-			.saturating_add((227_268_000 as Weight).saturating_mul(r as Weight))
+		(156_581_000 as Weight)
+			// Standard Error: 107_000
+			.saturating_add((270_368_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_balance(r: u32, ) -> Weight {
-		(133_445_000 as Weight)
-			// Standard Error: 144_000
-			.saturating_add((487_125_000 as Weight).saturating_mul(r as Weight))
+		(141_778_000 as Weight)
+			// Standard Error: 305_000
+			.saturating_add((615_927_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(129_299_000 as Weight)
-			// Standard Error: 82_000
-			.saturating_add((227_118_000 as Weight).saturating_mul(r as Weight))
+		(138_752_000 as Weight)
+			// Standard Error: 91_000
+			.saturating_add((280_176_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(126_120_000 as Weight)
-			// Standard Error: 114_000
-			.saturating_add((227_326_000 as Weight).saturating_mul(r as Weight))
+		(141_089_000 as Weight)
+			// Standard Error: 82_000
+			.saturating_add((274_199_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(130_934_000 as Weight)
-			// Standard Error: 89_000
-			.saturating_add((226_638_000 as Weight).saturating_mul(r as Weight))
+		(140_447_000 as Weight)
+			// Standard Error: 119_000
+			.saturating_add((270_823_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(128_738_000 as Weight)
-			// Standard Error: 77_000
-			.saturating_add((227_062_000 as Weight).saturating_mul(r as Weight))
+		(138_394_000 as Weight)
+			// Standard Error: 105_000
+			.saturating_add((275_261_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_block_number(r: u32, ) -> Weight {
-		(132_375_000 as Weight)
-			// Standard Error: 88_000
-			.saturating_add((226_861_000 as Weight).saturating_mul(r as Weight))
+		(151_633_000 as Weight)
+			// Standard Error: 109_000
+			.saturating_add((269_666_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_now(r: u32, ) -> Weight {
-		(127_888_000 as Weight)
-			// Standard Error: 86_000
-			.saturating_add((227_851_000 as Weight).saturating_mul(r as Weight))
+		(129_087_000 as Weight)
+			// Standard Error: 252_000
+			.saturating_add((277_368_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(131_825_000 as Weight)
-			// Standard Error: 149_000
-			.saturating_add((420_149_000 as Weight).saturating_mul(r as Weight))
+		(176_205_000 as Weight)
+			// Standard Error: 304_000
+			.saturating_add((555_094_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_gas(r: u32, ) -> Weight {
-		(113_641_000 as Weight)
-			// Standard Error: 114_000
-			.saturating_add((113_068_000 as Weight).saturating_mul(r as Weight))
+		(129_942_000 as Weight)
+			// Standard Error: 92_000
+			.saturating_add((144_914_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_input(r: u32, ) -> Weight {
-		(122_982_000 as Weight)
-			// Standard Error: 74_000
-			.saturating_add((6_828_000 as Weight).saturating_mul(r as Weight))
+		(141_540_000 as Weight)
+			// Standard Error: 68_000
+			.saturating_add((6_576_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(131_913_000 as Weight)
+		(150_832_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((275_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((263_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_return(r: u32, ) -> Weight {
-		(114_164_000 as Weight)
-			// Standard Error: 72_000
-			.saturating_add((4_318_000 as Weight).saturating_mul(r as Weight))
+		(135_920_000 as Weight)
+			// Standard Error: 61_000
+			.saturating_add((3_733_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(123_940_000 as Weight)
+		(144_104_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((664_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((640_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_terminate(r: u32, ) -> Weight {
-		(123_340_000 as Weight)
-			// Standard Error: 99_000
-			.saturating_add((89_126_000 as Weight).saturating_mul(r as Weight))
+		(141_631_000 as Weight)
+			// Standard Error: 70_000
+			.saturating_add((112_747_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
 	}
-	fn seal_terminate_per_code_kb(c: u32, ) -> Weight {
-		(217_499_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((5_608_000 as Weight).saturating_mul(c as Weight))
-			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
-	}
 	fn seal_restore_to(r: u32, ) -> Weight {
-		(149_019_000 as Weight)
-			// Standard Error: 903_000
-			.saturating_add((87_433_000 as Weight).saturating_mul(r as Weight))
+		(168_955_000 as Weight)
+			// Standard Error: 211_000
+			.saturating_add((119_247_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((4 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((5 as Weight).saturating_mul(r as Weight)))
 	}
-	fn seal_restore_to_per_code_kb_delta(c: u32, t: u32, d: u32, ) -> Weight {
-		(18_255_000 as Weight)
-			// Standard Error: 141_000
-			.saturating_add((5_142_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 141_000
-			.saturating_add((2_478_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 1_242_000
-			.saturating_add((2_935_421_000 as Weight).saturating_mul(d as Weight))
+	fn seal_restore_to_per_delta(d: u32, ) -> Weight {
+		(0 as Weight)
+			// Standard Error: 3_299_000
+			.saturating_add((3_257_862_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(7 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
 	}
 	fn seal_random(r: u32, ) -> Weight {
-		(140_411_000 as Weight)
-			// Standard Error: 146_000
-			.saturating_add((566_687_000 as Weight).saturating_mul(r as Weight))
+		(124_927_000 as Weight)
+			// Standard Error: 407_000
+			.saturating_add((730_247_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(132_048_000 as Weight)
-			// Standard Error: 308_000
-			.saturating_add((818_622_000 as Weight).saturating_mul(r as Weight))
+		(135_014_000 as Weight)
+			// Standard Error: 892_000
+			.saturating_add((1_131_992_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_080_578_000 as Weight)
-			// Standard Error: 2_337_000
-			.saturating_add((534_525_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 460_000
-			.saturating_add((167_990_000 as Weight).saturating_mul(n as Weight))
+		(1_401_344_000 as Weight)
+			// Standard Error: 2_961_000
+			.saturating_add((701_918_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 583_000
+			.saturating_add((169_206_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(123_998_000 as Weight)
-			// Standard Error: 53_000
-			.saturating_add((155_113_000 as Weight).saturating_mul(r as Weight))
+		(146_753_000 as Weight)
+			// Standard Error: 117_000
+			.saturating_add((194_150_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_debug_message(r: u32, ) -> Weight {
-		(120_514_000 as Weight)
-			// Standard Error: 93_000
-			.saturating_add((124_243_000 as Weight).saturating_mul(r as Weight))
+		(141_972_000 as Weight)
+			// Standard Error: 114_000
+			.saturating_add((164_981_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(47_131_000 as Weight)
-			// Standard Error: 931_000
-			.saturating_add((4_033_062_000 as Weight).saturating_mul(r as Weight))
+		(549_424_000 as Weight)
+			// Standard Error: 7_901_000
+			.saturating_add((4_159_879_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(549_577_000 as Weight)
-			// Standard Error: 192_000
-			.saturating_add((57_815_000 as Weight).saturating_mul(n as Weight))
+		(682_814_000 as Weight)
+			// Standard Error: 229_000
+			.saturating_add((59_572_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn seal_clear_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_635_000
-			.saturating_add((1_214_454_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 2_889_000
+			.saturating_add((1_563_117_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
@@ -1081,23 +1074,23 @@ impl WeightInfo for () {
 	}
 	fn seal_get_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 1_044_000
-			.saturating_add((883_653_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 2_414_000
+			.saturating_add((1_178_803_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(568_190_000 as Weight)
-			// Standard Error: 181_000
-			.saturating_add((106_420_000 as Weight).saturating_mul(n as Weight))
+		(696_056_000 as Weight)
+			// Standard Error: 266_000
+			.saturating_add((108_870_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_transfer(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 1_553_000
-			.saturating_add((4_810_405_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 2_764_000
+			.saturating_add((6_397_838_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
@@ -1105,358 +1098,354 @@ impl WeightInfo for () {
 	}
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 8_671_000
-			.saturating_add((10_965_308_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 8_279_000
+			.saturating_add((13_318_274_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((200 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
-	fn seal_call_per_code_transfer_input_output_kb(c: u32, t: u32, i: u32, o: u32, ) -> Weight {
-		(10_138_403_000 as Weight)
-			// Standard Error: 162_000
-			.saturating_add((264_871_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 67_846_000
-			.saturating_add((3_793_372_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 21_000
-			.saturating_add((49_168_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 22_000
-			.saturating_add((71_664_000 as Weight).saturating_mul(o as Weight))
+	fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight {
+		(13_411_599_000 as Weight)
+			// Standard Error: 40_931_000
+			.saturating_add((4_291_567_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 14_000
+			.saturating_add((48_818_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 15_000
+			.saturating_add((68_502_000 as Weight).saturating_mul(o as Weight))
 			.saturating_add(RocksDbWeight::get().reads(205 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(101 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 34_546_000
-			.saturating_add((19_938_393_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 31_671_000
+			.saturating_add((24_164_540_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((300 as Weight).saturating_mul(r as Weight)))
 	}
-	fn seal_instantiate_per_code_input_output_salt_kb(c: u32, i: u32, o: u32, s: u32, ) -> Weight {
-		(8_861_543_000 as Weight)
-			// Standard Error: 566_000
-			.saturating_add((585_057_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 80_000
-			.saturating_add((52_025_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 80_000
-			.saturating_add((75_956_000 as Weight).saturating_mul(o as Weight))
-			// Standard Error: 80_000
-			.saturating_add((198_033_000 as Weight).saturating_mul(s as Weight))
+	fn seal_instantiate_per_input_output_salt_kb(i: u32, o: u32, s: u32, ) -> Weight {
+		(17_228_488_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((50_822_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 26_000
+			.saturating_add((71_276_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 26_000
+			.saturating_add((198_669_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(206 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(204 as Weight))
 	}
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(129_022_000 as Weight)
-			// Standard Error: 76_000
-			.saturating_add((216_764_000 as Weight).saturating_mul(r as Weight))
+		(149_183_000 as Weight)
+			// Standard Error: 99_000
+			.saturating_add((279_233_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(414_489_000 as Weight)
+		(457_629_000 as Weight)
 			// Standard Error: 14_000
-			.saturating_add((481_873_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((480_686_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(127_636_000 as Weight)
-			// Standard Error: 104_000
-			.saturating_add((225_094_000 as Weight).saturating_mul(r as Weight))
+		(141_603_000 as Weight)
+			// Standard Error: 120_000
+			.saturating_add((283_527_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(216_668_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((331_423_000 as Weight).saturating_mul(n as Weight))
+		(463_644_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((332_183_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(129_582_000 as Weight)
-			// Standard Error: 97_000
-			.saturating_add((198_429_000 as Weight).saturating_mul(r as Weight))
+		(144_145_000 as Weight)
+			// Standard Error: 113_000
+			.saturating_add((252_640_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(288_991_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((148_497_000 as Weight).saturating_mul(n as Weight))
+		(455_101_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((149_174_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(128_711_000 as Weight)
-			// Standard Error: 94_000
-			.saturating_add((197_050_000 as Weight).saturating_mul(r as Weight))
+		(147_166_000 as Weight)
+			// Standard Error: 233_000
+			.saturating_add((254_430_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(275_444_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((148_469_000 as Weight).saturating_mul(n as Weight))
+		(445_667_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((149_178_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(20_089_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((3_376_000 as Weight).saturating_mul(r as Weight))
+		(21_505_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((7_963_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(22_187_000 as Weight)
-			// Standard Error: 31_000
-			.saturating_add((162_969_000 as Weight).saturating_mul(r as Weight))
+		(24_775_000 as Weight)
+			// Standard Error: 37_000
+			.saturating_add((157_130_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(22_292_000 as Weight)
-			// Standard Error: 39_000
-			.saturating_add((233_277_000 as Weight).saturating_mul(r as Weight))
+		(24_722_000 as Weight)
+			// Standard Error: 69_000
+			.saturating_add((240_564_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(20_083_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((12_378_000 as Weight).saturating_mul(r as Weight))
+		(21_506_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((45_277_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(20_091_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((12_195_000 as Weight).saturating_mul(r as Weight))
+		(21_587_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((42_269_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(20_082_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((6_151_000 as Weight).saturating_mul(r as Weight))
+		(21_538_000 as Weight)
+			// Standard Error: 807_000
+			.saturating_add((22_392_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(20_031_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((13_978_000 as Weight).saturating_mul(r as Weight))
+		(21_634_000 as Weight)
+			// Standard Error: 57_000
+			.saturating_add((44_203_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(20_063_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((15_524_000 as Weight).saturating_mul(r as Weight))
+		(21_531_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((33_198_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(34_332_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((117_000 as Weight).saturating_mul(e as Weight))
+		(60_960_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((151_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(20_446_000 as Weight)
-			// Standard Error: 121_000
-			.saturating_add((90_977_000 as Weight).saturating_mul(r as Weight))
+		(21_777_000 as Weight)
+			// Standard Error: 141_000
+			.saturating_add((245_105_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(28_119_000 as Weight)
-			// Standard Error: 390_000
-			.saturating_add((192_865_000 as Weight).saturating_mul(r as Weight))
+		(34_307_000 as Weight)
+			// Standard Error: 365_000
+			.saturating_add((344_623_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(228_352_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((3_891_000 as Weight).saturating_mul(p as Weight))
+		(398_310_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((4_163_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(37_745_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((3_135_000 as Weight).saturating_mul(r as Weight))
+		(40_478_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((9_991_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(37_639_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((3_541_000 as Weight).saturating_mul(r as Weight))
+		(40_427_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((8_526_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(37_639_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((4_813_000 as Weight).saturating_mul(r as Weight))
+		(40_463_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((16_497_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(23_379_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((7_757_000 as Weight).saturating_mul(r as Weight))
+		(25_998_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((18_214_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(23_378_000 as Weight)
-			// Standard Error: 68_000
-			.saturating_add((8_437_000 as Weight).saturating_mul(r as Weight))
+		(25_972_000 as Weight)
+			// Standard Error: 42_000
+			.saturating_add((18_901_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(22_245_000 as Weight)
+		(24_949_000 as Weight)
 			// Standard Error: 17_000
-			.saturating_add((3_446_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((8_541_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(20_714_000 as Weight)
-			// Standard Error: 478_000
-			.saturating_add((2_314_540_000 as Weight).saturating_mul(r as Weight))
+		(22_204_000 as Weight)
+			// Standard Error: 4_776_000
+			.saturating_add((2_198_462_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(20_126_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((5_316_000 as Weight).saturating_mul(r as Weight))
+		(21_506_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((25_302_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(20_107_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((5_344_000 as Weight).saturating_mul(r as Weight))
+		(21_523_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((25_206_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(20_135_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((5_909_000 as Weight).saturating_mul(r as Weight))
+		(21_567_000 as Weight)
+			// Standard Error: 466_000
+			.saturating_add((19_925_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(20_107_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((5_515_000 as Weight).saturating_mul(r as Weight))
+		(21_569_000 as Weight)
+			// Standard Error: 30_000
+			.saturating_add((25_027_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(20_229_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((5_113_000 as Weight).saturating_mul(r as Weight))
+		(21_536_000 as Weight)
+			// Standard Error: 193_000
+			.saturating_add((17_690_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(20_070_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((5_226_000 as Weight).saturating_mul(r as Weight))
+		(21_555_000 as Weight)
+			// Standard Error: 356_000
+			.saturating_add((17_105_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(20_090_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((5_296_000 as Weight).saturating_mul(r as Weight))
+		(21_561_000 as Weight)
+			// Standard Error: 1_038_000
+			.saturating_add((22_198_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(20_095_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((7_323_000 as Weight).saturating_mul(r as Weight))
+		(21_513_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((33_620_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(20_043_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((7_280_000 as Weight).saturating_mul(r as Weight))
+		(21_556_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((33_669_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(20_061_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((7_226_000 as Weight).saturating_mul(r as Weight))
+		(21_571_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((33_649_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(20_072_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((7_315_000 as Weight).saturating_mul(r as Weight))
+		(21_533_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((33_450_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(20_054_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((7_228_000 as Weight).saturating_mul(r as Weight))
+		(21_525_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((33_727_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(20_169_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((7_262_000 as Weight).saturating_mul(r as Weight))
+		(21_546_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((33_420_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(20_115_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((7_212_000 as Weight).saturating_mul(r as Weight))
+		(21_546_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((33_720_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(20_122_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((7_166_000 as Weight).saturating_mul(r as Weight))
+		(21_546_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((33_383_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(20_140_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((7_242_000 as Weight).saturating_mul(r as Weight))
+		(21_577_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((33_454_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(20_107_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((7_365_000 as Weight).saturating_mul(r as Weight))
+		(21_566_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((33_665_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(20_179_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((7_144_000 as Weight).saturating_mul(r as Weight))
+		(21_524_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((33_351_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(20_143_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((7_222_000 as Weight).saturating_mul(r as Weight))
+		(21_558_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((33_423_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(20_129_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((7_247_000 as Weight).saturating_mul(r as Weight))
+		(21_554_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((33_588_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(20_107_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((12_953_000 as Weight).saturating_mul(r as Weight))
+		(21_568_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((38_897_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(20_093_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((12_040_000 as Weight).saturating_mul(r as Weight))
+		(21_567_000 as Weight)
+			// Standard Error: 31_000
+			.saturating_add((38_756_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(20_102_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((12_945_000 as Weight).saturating_mul(r as Weight))
+		(21_540_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((39_244_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(20_132_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((12_199_000 as Weight).saturating_mul(r as Weight))
+		(21_581_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((38_461_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(20_155_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((7_103_000 as Weight).saturating_mul(r as Weight))
+		(21_555_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((33_367_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(20_088_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((7_213_000 as Weight).saturating_mul(r as Weight))
+		(21_523_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((33_466_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(20_060_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((7_275_000 as Weight).saturating_mul(r as Weight))
+		(21_536_000 as Weight)
+			// Standard Error: 34_000
+			.saturating_add((33_452_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(20_104_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((7_282_000 as Weight).saturating_mul(r as Weight))
+		(21_567_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((33_809_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(20_111_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((7_264_000 as Weight).saturating_mul(r as Weight))
+		(21_580_000 as Weight)
+			// Standard Error: 32_000
+			.saturating_add((33_849_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(20_096_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((7_347_000 as Weight).saturating_mul(r as Weight))
+		(21_571_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((33_799_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(20_091_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((7_370_000 as Weight).saturating_mul(r as Weight))
+		(21_559_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((33_947_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(20_102_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((7_266_000 as Weight).saturating_mul(r as Weight))
+		(21_565_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((33_754_000 as Weight).saturating_mul(r as Weight))
 	}
 }

From c2d6fa797e3387104dd882de35a6d148000ab65a Mon Sep 17 00:00:00 2001
From: Keith Yeung <kungfukeith11@gmail.com>
Date: Mon, 28 Jun 2021 02:17:28 -0700
Subject: [PATCH 0926/1194] Support NMap in generate_storage_alias (#9147)

* Support NMap in generate_storage_alias

* Verify that 2-key NMap is identical to DoubleMap

* Also compare key hashes and make sure they're identical

* Fix and add tests for 1-tuple NMap generated by generate_storage_alias
---
 frame/support/src/lib.rs                    | 31 ++++++++++++++++++++-
 frame/support/src/storage/generator/nmap.rs | 20 +++++++++++++
 frame/support/src/storage/types/key.rs      |  4 +--
 frame/support/src/storage/types/nmap.rs     | 24 +++++++++++-----
 4 files changed, 69 insertions(+), 10 deletions(-)

diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 45988c1c7372..638485360c58 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -100,7 +100,8 @@ impl TypeId for PalletId {
 }
 
 /// Generate a new type alias for [`storage::types::StorageValue`],
-/// [`storage::types::StorageMap`] and [`storage::types::StorageDoubleMap`].
+/// [`storage::types::StorageMap`], [`storage::types::StorageDoubleMap`]
+/// and [`storage::types::StorageNMap`].
 ///
 /// Useful for creating a *storage-like* struct for test and migrations.
 ///
@@ -154,6 +155,18 @@ macro_rules! generate_storage_alias {
 			>;
 		}
 	};
+	($pallet:ident, $name:ident => NMap<$(($key:ty, $hasher:ty),)+ $value:ty>) => {
+		$crate::paste::paste! {
+			$crate::generate_storage_alias!(@GENERATE_INSTANCE_STRUCT $pallet, $name);
+			type $name = $crate::storage::types::StorageNMap<
+				[<$name Instance>],
+				(
+					$( $crate::storage::types::Key<$hasher, $key>, )+
+				),
+				$value,
+			>;
+		}
+	};
 	($pallet:ident, $name:ident => Value<$value:ty>) => {
 		$crate::paste::paste! {
 			$crate::generate_storage_alias!(@GENERATE_INSTANCE_STRUCT $pallet, $name);
@@ -193,6 +206,22 @@ macro_rules! generate_storage_alias {
 			>;
 		}
 	};
+	(
+		$pallet:ident,
+		$name:ident<$t:ident : $bounds:tt> => NMap<$(($key:ty, $hasher:ty),)+ $value:ty>
+	) => {
+		$crate::paste::paste! {
+			$crate::generate_storage_alias!(@GENERATE_INSTANCE_STRUCT $pallet, $name);
+			#[allow(type_alias_bounds)]
+			type $name<$t : $bounds> = $crate::storage::types::StorageNMap<
+				[<$name Instance>],
+				(
+					$( $crate::storage::types::Key<$hasher, $key>, )+
+				),
+				$value,
+			>;
+		}
+	};
 	($pallet:ident, $name:ident<$t:ident : $bounds:tt> => Value<$value:ty>) => {
 		$crate::paste::paste! {
 			$crate::generate_storage_alias!(@GENERATE_INSTANCE_STRUCT $pallet, $name);
diff --git a/frame/support/src/storage/generator/nmap.rs b/frame/support/src/storage/generator/nmap.rs
index 62f188a26db8..7a320adcaab2 100755
--- a/frame/support/src/storage/generator/nmap.rs
+++ b/frame/support/src/storage/generator/nmap.rs
@@ -433,6 +433,26 @@ mod test_iterators {
 		prefix
 	}
 
+	#[test]
+	fn n_map_double_map_identical_key() {
+		sp_io::TestExternalities::default().execute_with(|| {
+			NMap::insert((1, 2), 50);
+			let key_hash = NMap::hashed_key_for((1, 2));
+
+			{
+				crate::generate_storage_alias!(Test, NMap => DoubleMap<
+					(u16, crate::Blake2_128Concat),
+					(u32, crate::Twox64Concat),
+					u64
+				>);
+
+				let value = NMap::get(1, 2).unwrap();
+				assert_eq!(value, 50);
+				assert_eq!(NMap::hashed_key_for(1, 2), key_hash);
+			}
+		});
+	}
+
 	#[test]
 	fn n_map_reversible_reversible_iteration() {
 		sp_io::TestExternalities::default().execute_with(|| {
diff --git a/frame/support/src/storage/types/key.rs b/frame/support/src/storage/types/key.rs
index a770d1b0fcea..def800f62c50 100755
--- a/frame/support/src/storage/types/key.rs
+++ b/frame/support/src/storage/types/key.rs
@@ -110,7 +110,7 @@ impl<H: StorageHasher, K: FullCodec> KeyGeneratorInner for Key<H, K> {
 	}
 }
 
-#[impl_trait_for_tuples::impl_for_tuples(2, 18)]
+#[impl_trait_for_tuples::impl_for_tuples(1, 18)]
 #[tuple_types_custom_trait_bound(KeyGeneratorInner)]
 impl KeyGenerator for Tuple {
 	for_tuples!( type Key = ( #(Tuple::Key),* ); );
@@ -150,7 +150,7 @@ impl KeyGenerator for Tuple {
 	}
 }
 
-#[impl_trait_for_tuples::impl_for_tuples(2, 18)]
+#[impl_trait_for_tuples::impl_for_tuples(1, 18)]
 #[tuple_types_custom_trait_bound(KeyGeneratorInner + KeyGeneratorMaxEncodedLen)]
 impl KeyGeneratorMaxEncodedLen for Tuple {
 	fn key_max_encoded_len() -> usize {
diff --git a/frame/support/src/storage/types/nmap.rs b/frame/support/src/storage/types/nmap.rs
index a9fc121d42d2..fd1ca47b32c9 100755
--- a/frame/support/src/storage/types/nmap.rs
+++ b/frame/support/src/storage/types/nmap.rs
@@ -423,7 +423,7 @@ mod test {
 		fn pallet_prefix() -> &'static str {
 			"test"
 		}
-		const STORAGE_PREFIX: &'static str = "foo";
+		const STORAGE_PREFIX: &'static str = "Foo";
 	}
 
 	struct ADefault;
@@ -445,7 +445,7 @@ mod test {
 		TestExternalities::default().execute_with(|| {
 			let mut k: Vec<u8> = vec![];
 			k.extend(&twox_128(b"test"));
-			k.extend(&twox_128(b"foo"));
+			k.extend(&twox_128(b"Foo"));
 			k.extend(&3u16.blake2_128_concat());
 			assert_eq!(A::hashed_key_for((&3,)).to_vec(), k);
 
@@ -458,6 +458,16 @@ mod test {
 			assert_eq!(A::get((3,)), Some(10));
 			assert_eq!(AValueQueryWithAnOnEmpty::get((3,)), 10);
 
+			{
+				crate::generate_storage_alias!(test, Foo => NMap<
+					(u16, Blake2_128Concat),
+					u32
+				>);
+
+				assert_eq!(Foo::contains_key((3,)), true);
+				assert_eq!(Foo::get((3,)), Some(10));
+			}
+
 			A::swap::<Key<Blake2_128Concat, u16>, _, _>((3,), (2,));
 			assert_eq!(A::contains_key((3,)), false);
 			assert_eq!(A::contains_key((2,)), true);
@@ -575,7 +585,7 @@ mod test {
 				AValueQueryWithAnOnEmpty::MODIFIER,
 				StorageEntryModifier::Default
 			);
-			assert_eq!(A::NAME, "foo");
+			assert_eq!(A::NAME, "Foo");
 			assert_eq!(
 				AValueQueryWithAnOnEmpty::DEFAULT.0.default_byte(),
 				98u32.encode()
@@ -617,7 +627,7 @@ mod test {
 		TestExternalities::default().execute_with(|| {
 			let mut k: Vec<u8> = vec![];
 			k.extend(&twox_128(b"test"));
-			k.extend(&twox_128(b"foo"));
+			k.extend(&twox_128(b"Foo"));
 			k.extend(&3u16.blake2_128_concat());
 			k.extend(&30u8.twox_64_concat());
 			assert_eq!(A::hashed_key_for((3, 30)).to_vec(), k);
@@ -761,7 +771,7 @@ mod test {
 				AValueQueryWithAnOnEmpty::MODIFIER,
 				StorageEntryModifier::Default
 			);
-			assert_eq!(A::NAME, "foo");
+			assert_eq!(A::NAME, "Foo");
 			assert_eq!(
 				AValueQueryWithAnOnEmpty::DEFAULT.0.default_byte(),
 				98u32.encode()
@@ -844,7 +854,7 @@ mod test {
 		TestExternalities::default().execute_with(|| {
 			let mut k: Vec<u8> = vec![];
 			k.extend(&twox_128(b"test"));
-			k.extend(&twox_128(b"foo"));
+			k.extend(&twox_128(b"Foo"));
 			k.extend(&1u16.blake2_128_concat());
 			k.extend(&10u16.blake2_128_concat());
 			k.extend(&100u16.twox_64_concat());
@@ -996,7 +1006,7 @@ mod test {
 				AValueQueryWithAnOnEmpty::MODIFIER,
 				StorageEntryModifier::Default
 			);
-			assert_eq!(A::NAME, "foo");
+			assert_eq!(A::NAME, "Foo");
 			assert_eq!(
 				AValueQueryWithAnOnEmpty::DEFAULT.0.default_byte(),
 				98u32.encode()

From c44e5d69aa408d98ce4bcca0d8d8f08a1026e5a4 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Mon, 28 Jun 2021 11:20:24 +0200
Subject: [PATCH 0927/1194] Decouple Staking and Election - Part 3: Signed
 Phase (#7910)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Base features and traits.

* pallet and unsigned phase

* add signed phase.

* remove comments

* Undo bad formattings.

* some formatting cleanup.

* Small self-cleanup.

* Add todo

* Make it all build

* self-review

* Some doc tests.

* Some changes from other PR

* Fix session test

* Update bin/node/runtime/src/lib.rs

Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>

* Fix name.

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_election_provider_multi_phase --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/election-provider-multi-phase/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* typos and verbiage

* no glob imports in signed.rs

* meaningful generic type parameters for SignedSubmission

* dedup feasibility check weight calculation

* simplify/optimize fn insert_submission

* tests: remove glob, cause to build without error

* use sp_std::vec::Vec

* maintain invariant within fn insert_submission

* fix accidentally ordering the list backward

* intentionally order the list in reverse

* get rid of unused import

* ensure signed submissions are cleared in early elect

* finalize the signed phase when appropriate

- ensure we don't leave storage lying around, even if elect called prematurely
- test that proposition
- disable the unsigned phase if a viable solution from the signed phase exists
- ensure signed phase finalization weight is accounted for

* resolve dispatch error todo

* update assumptions in submit benchmark

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_election_provider_multi_phase --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/election-provider-multi-phase/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* line length

* make a few more things pub

* restore missing import

* update ui test output

* update tests from master branch

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_election_provider_multi_phase --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/election-provider-multi-phase/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* remove duplicate definitions

* remove signed reward factor due to its attack potential

* Update frame/election-provider-multi-phase/src/signed.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* remove SignedRewardMax; no longer necessary

* compute the encoded size without actually encoding

* remove unused PostInfo

* pub use some stuff

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* ensure `pub use` things are in fact `pub`

* add event information: was another solution ejected to make room

* unconditionally run the unsigned phase even if signed was successful

* remove dead test code

* meaningful witness data name

* use errors instead of defensive `unwrap_or_default`

* get rid of a log message redundant with an event

* saturating math

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* import Saturating

* mv `fn submit` to end of call

* add log line

* Use a better data structure for SignedSubmissions instead of Vec (#8933)

* Remove: (#8748)

* `NetworkStatusSinks`
* `sc_service::SpawnTasksParams::network_status_sinks`

Also:
* `sc_service::build_network()` does not return `network_status_sinks`

* CI: fix simnet trigger (#8927)

* CI: chore

* CI: pin simnet version

* More sc-service config reexports (#8887)

* Reexport ExecutionStrategies and ExecutionStrategy

* Reexport more of the network

* Reexport the ExecutionStrategy as it's used within ExecutionStrategies

* Fix check runtime CI (#8930)

* Fix check_runtime.sh script

* contracts: Remove confusing "Related Modules" doc

* Bump parity-wasm and pwasm-utils to the newest versions everywhere (#8928)

* BROKEN: convert SignedSubmissions to BoundedBTreeSet

Eventually, once it works, this change should improve overall performance.
However, in the meantime, the trait bounds aren't playing nicely, and
this is turning into too much of a pain to handle right now as part of
/#7910. We can take care of it later.

* Simple `MaxBoundedLen` Implementations (#8793)

* implement max_values + storages info

* some formatting + doc

* sudo sanity check

* timestamp

* assets (not working)

* fix assets

* impl for proxy

* update balances

* rename StoragesInfo -> PalletStorageInfo

* merge both StorageInfoTrait and PalletStorageInfo

I think it is more future proof. In the future some storage could make
use of multiple prefix. Like one to store how much value has been
inserted, etc...

* Update frame/support/procedural/src/storage/parse.rs

Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>

* Update frame/support/procedural/src/storage/storage_struct.rs

Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>

* Fix max_size using hasher information

hasher now expose `max_len` which allows to computes their maximum len.
For hasher without concatenation, it is the size of the hash part,
for hasher with concatenation, it is the size of the hash part + max
encoded len of the key.

* fix tests

* fix ui tests

* Move `MaxBoundedLen` into its own crate (#8814)

* move MaxEncodedLen into its own crate

* remove MaxEncodedLen impl from frame-support

* add to assets and balances

* try more fixes

* fix compile

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* nits

* fix compile

* line width

* fix max-values-macro merge

* Add some derive, needed for test and other purpose

* use weak bounded vec in some cases

* Update lib.rs

* move max-encoded-len crate

* fix

* remove app crypto for now

* width

* Revert "remove app crypto for now"

This reverts commit 73623e9933d50648e0e7fe90b6171a8e45d7f5a2.

* unused variable

* more unused variables

* more fixes

* Add #[max_encoded_len_crate(...)] helper attribute

The purpose of this attribute is to reduce the surface area of
max_encoded_len changes. Crates deriving `MaxEncodedLen` do not
need to add it to `Cargo.toml`; they can instead just do

```rust
\#[derive(Encode, MaxEncodedLen)]
\#[max_encoded_len_crate(frame_support::max_encoded_len)]
struct Example;
```

* fix a ui test

* use #[max_encoded_len_crate(...)] helper in app_crypto

* remove max_encoded_len import where not necessary

* update lockfile

* fix ui test

* ui

* newline

* fix merge

* try fix ui again

* Update max-encoded-len/derive/src/lib.rs

Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>

* extract generate_crate_access_2018

* Update lib.rs

* compiler isnt smart enough

Co-authored-by: thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
Co-authored-by: Peter Goodspeed-Niklaus <peter.r.goodspeedniklaus@gmail.com>

* remove duplicate Issued/Burned events (#8935)

* weather -> whether (#8938)

* make remote ext use batch ws-client (#8916)

* make remote ext use batch ws-client

* Add debug log for key length

* better assertions

* new sanity_checl

* try and make it work with batch

* update test

* remove exctra uri

* add missing at

* remove unused rpc stuff

* improve

Co-authored-by: emostov <32168567+emostov@users.noreply.github.com>

* Make `Schedule` fields public to allow for customization (#8924)

* Make `Schedule` fields public for customization

* Fix doc typo

Co-authored-by: Andrew Jones <ascjones@gmail.com>

Co-authored-by: Andrew Jones <ascjones@gmail.com>

* Session key should be settable at genesis even for non-endowed accounts (#8942)

* Session key should be settable at genesis even for non-endowed accounts

* Docs

* Migrate pallet-scored-pool to pallet attribute macro (#8825)

* Migrate pallet-scored-pool to pallet attribute macro.

* Remove dummy event.

* Apply review suggestions.

* Bump retain_mut from 0.1.2 to 0.1.3 (#8951)

Bumps [retain_mut](https://github.com/upsuper/retain_mut) from 0.1.2 to 0.1.3.
- [Release notes](https://github.com/upsuper/retain_mut/releases)
- [Commits](https://github.com/upsuper/retain_mut/compare/v0.1.2...v0.1.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use correct CreateInherentDataProviders impl for manual seal (#8852)

* use correct CreateInherentDataProviders impl for manual seal

* add babe inherent provider

* move client into factory fn

* Refactor code a little bit (#8932)

* Optimize `next_storage_key` (#8956)

* Optimize `next_storage_key`

- Do not rely on recursion
- Use an iterator over the overlay to not always call the same method

* Fix bug

* Add deserialize for TransactionValidityError in std. (#8961)

* Add deserialize for TransactionValidityError in std.

* Fix derives

* Bump getrandom from 0.2.2 to 0.2.3 (#8952)

Bumps [getrandom](https://github.com/rust-random/getrandom) from 0.2.2 to 0.2.3.
- [Release notes](https://github.com/rust-random/getrandom/releases)
- [Changelog](https://github.com/rust-random/getrandom/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-random/getrandom/compare/v0.2.2...v0.2.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Allow usage of path in construct_runtime! (#8801)

* Allow usage of path in construct_runtime!

* Fix whitespace

* Fix whitespace

* Make expand_runtime_metadata accept slice instead of Iterator

* Include Call and Event in construct_runtime for testing

* Migrate impl_outer_event to proc macro

* Fix integrity_test_works

* Update UI test expectations

* Factor in module path while generating enum variant or fn names

* Use ParseStream::lookahead for more helpful error messages

* Remove generating outer_event_metadata

* Ensure pallets with different paths but same last path segment can coexist

* Remove unnecessary generated function

* Migrate decl_outer_config to proc macro

* Add default_filter test for expand_outer_origin

* Allow crate, self and super keywords to appear in pallet path

* Add UI test for specifying empty pallet paths in construct_runtime

* Reduce cargo doc warnings (#8947)

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update wasmtime to 0.27 (#8913)

* Update wasmtime to 0.27

A couple of notes:

- Now we are fair about unsafeness of runtime creation via an compiled artifact.
  This change was prompted by the change in wasmtime which made
  `deserialize` rightfully unsafe. Now `CodeSupplyMode` was hidden and
  the `create_runtime` now takes the blob again and there is now a new
  fn for creating a runtime with a compiled artifact.
- This is a big change for wasmtime. They switched to the modern backend
  for code generation. While this can bring performance improvements, it
  can also introduce some problems. In fact, 0.27 fixed a serious issue
  that could lead to sandbox escape. Hence we need a proper burn in.

This would require a change to PVF validation host as well.

* Filter regalloc logging

* Spellling corrections (no code changes) (#8971)

* Spelling corrections

* As this might break let's do as a separate PR

* Dependabot use correct label (#8973)

* Inject hashed prefix for remote-ext (#8960)

* Inject for remote-ext

* Update utils/frame/remote-externalities/src/lib.rs

Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com>

* Update utils/frame/remote-externalities/src/lib.rs

Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com>

* Apply suggestions from code review

* Apply suggestions from code review

Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com>

* Use `SpawnTaskHandle`s for spawning tasks in the tx pool  (#8958)

* Remove futures-diagnose

* Use `SpawnTaskHandle`s for spawning tasks in the tx pool

* Box the spawner

* Fix tests

* Use the testing task executor

* Do not spend time on verifying the signatures before calling Runtime (#8980)

* Revert "Use `SpawnTaskHandle`s for spawning tasks in the tx pool  (#8958)" (#8983)

This reverts commit bfef07c0d22ead3ab3c4e0e90ddf9b0e3537566e.

* Uniques: An economically-secure basic-featured NFT pallet (#8813)

* Uniques: An economically-secure basic-featured NFT pallet

* force_transfer

* freeze/thaw

* team management

* approvals

* Fixes

* force_asset_status

* class_metadata

* instance metadata

* Fixes

* use nmap

* Fixes

* class metadata has information field

* Intiial mock/tests and a fix

* Remove impl_non_fungibles

* Docs

* Update frame/uniques/src/lib.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Update frame/uniques/src/lib.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Update frame/uniques/src/lib.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Update frame/uniques/src/lib.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Reserve, don't transfer.

* Fixes

* Tests

* Tests

* refresh_deposit

* Tests and proper handling of metdata destruction

* test burn

* Tests

* Update impl_fungibles.rs

* Initial benchmarking

* benchmark

* Fixes

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_uniques --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/uniques/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Attributes

* Attribute metadata

* Fixes

* Update frame/uniques/README.md

* Docs

* Docs

* Docs

* Simple metadata

* Use BoundedVec

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_uniques --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/uniques/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Update frame/uniques/src/lib.rs

Co-authored-by: Lohann Paterno Coutinho Ferreira <developer@lohann.dev>

* Update frame/uniques/src/lib.rs

Co-authored-by: Lohann Paterno Coutinho Ferreira <developer@lohann.dev>

* Update frame/uniques/src/lib.rs

Co-authored-by: Lohann Paterno Coutinho Ferreira <developer@lohann.dev>

* Update frame/uniques/src/lib.rs

Co-authored-by: Lohann Paterno Coutinho Ferreira <developer@lohann.dev>

* Update frame/uniques/src/lib.rs

Co-authored-by: Lohann Paterno Coutinho Ferreira <developer@lohann.dev>

* Fixes

* Update frame/uniques/README.md

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

* Update frame/uniques/README.md

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

* Update frame/uniques/README.md

Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

* Docs

* Bump

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Parity Bot <admin@parity.io>
Co-authored-by: Lohann Paterno Coutinho Ferreira <developer@lohann.dev>
Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>

* Update WeakBoundedVec's remove and swap_remove (#8985)

Co-authored-by: Boiethios <felix-dev@daudre-vignier.fr>

* Convert another instance of Into impl to From in the macros (#8986)

* Convert another instance of Into impl to From in the macros

* Convert another location

* also fix bounded vec (#8987)

* fix most compiler errors

Mostly the work so far has been in tracking down where precisely
to insert appropriate trait bounds, and updating `fn insert_submission`.
However, there's still a compiler error remaining:

```
error[E0275]: overflow evaluating the requirement `Compact<_>: Decode`
  |
  = help: consider adding a `#![recursion_limit="256"]` attribute to your crate (`pallet_election_provider_multi_phase`)
  = note: required because of the requirements on the impl of `Decode` for `Compact<_>`
  = note: 126 redundant requirements hidden
  = note: required because of the requirements on the impl of `Decode` for `Compact<_>`
```

Next up: figure out how we ended up with that recursive bound, and fix it.

* extract type SignedSubmissionsOf<T>

Weirdly, we still encounter the recursive trait definition error here,
despite removing the trait bounds. Something weird is happening.

* impl Decode bounds on BoundedBTreeMap/Set on T, not predecessor

Otherwise, Rust gets confused and decides that the trait bound is
infinitely recursive.

For that matter, it _still_ gets confused somehow and decides
that the trait bound is infinitely recursive, but at least
this should somewhat simplify the matter.

* fix recursive trait bound problem

* minor fixes

* more little fixes

* correct semantics for try_insert

* more fixes

* derive Ord for SolutionType

* tests compile

* fix most tests, rm unnecessary one

* Transactionpool: Make `ready_at` return earlier (#8995)

`ready_at` returns when we have processed the requested block. However,
on startup we already have processed the best block and there
are no transactions in the pool on startup anyway. So, we can set `updated_at`
to the best block on startup.

Besides that `ready_at` now returns early when there are no ready nor
any future transactions in the pool.

* Discard notifications if we have failed to parse handshake (#8806)

* Migrate pallet-democracy to pallet attribute macro (#8824)

* Migrate pallet-democracy to pallet attribute macro.

* Metadata fix.

* Trigger CI.

* Add ecdsa::Pair::verify_prehashed() (#8996)

* Add ecdsa::Pair::verify_prehashed()

* turn verify_prehashed() into an associated function

* add Signature::recover_prehashed()

* Non-fungible token traits (#8993)

* Non-fungible token traits

* Docs

* Fixes

* Implement non-fungible trait for Uniques

* Update frame/uniques/src/impl_nonfungibles.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Update frame/uniques/src/impl_nonfungibles.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Removes unused import (#9007)

* Add Call Filter That Prevents Nested `batch_all` (#9009)

* add filter preventing nested `batch_all`

* more tests

* fix test

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_utility --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/utility/src/weights.rs --template=./.maintain/frame-weight-template.hbs

Co-authored-by: Parity Bot <admin@parity.io>

* Transaction pool: Ensure that we prune transactions properly (#8963)

* Transaction pool: Ensure that we prune transactions properly

There was a bug in the transaction pool that we didn't pruned
transactions properly because we called `prune_known`, instead of `prune`.

This bug was introduced by:
https://github.com/paritytech/substrate/pull/4629

This is required to have stale extrinsics being removed properly, so
that they don't fill up the tx pool.

* Fix compilation

* Fix benches

* ...

* Storage chain: Runtime module (#8624)

* Transaction storage runtime module

* WIP: Tests

* Tests, benchmarks  and docs

* Made check_proof mandatory

* Typo

* Renamed a crate

* Apply suggestions from code review

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Added weight for on_finalize

* Fixed counter mutations

* Reorganized tests

* Fixed build

* Update for the new inherent API

* Reworked for the new inherents API

* Apply suggestions from code review

Co-authored-by: cheme <emericchevalier.pro@gmail.com>
Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Store transactions in a Vec

* Added FeeDestination

* Get rid of constants

* Fixed node runtime build

* Fixed benches

* Update frame/transaction-storage/src/lib.rs

Co-authored-by: cheme <emericchevalier.pro@gmail.com>

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Co-authored-by: cheme <emericchevalier.pro@gmail.com>
Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* more useful error message (#9014)

* Named reserve (#7778)

* add NamedReservableCurrency

* move currency related trait and types into a new file

* implement NamedReservableCurrency

* remove empty reserves

* Update frame/support/src/traits.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* fix build

* bump year

* add MaxReserves

* repatriate_reserved_named should put reserved fund into named reserved

* add tests

* add some docs

* fix warning

* Update lib.rs

* fix test

* fix test

* fix

* fix

* triggier CI

* Move NamedReservableCurrency.

* Use strongly bounded vec for reserves.

* Fix test.

* remove duplicated file

* trigger CI

* Make `ReserveIdentifier` assosicated type

* add helpers

* make ReserveIdentifier assosicated type

* fix

* update

* trigger CI

* Apply suggestions from code review

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* trigger CI

* Apply suggestions from code review

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Gavin Wood <i@gavwood.com>
Co-authored-by: Shaun Wang <spxwang@gmail.com>

* update ss58 type to u16 (#8955)

* Fixed build (#9021)

* Bump parity-db (#9024)

* consensus: handle justification sync for blocks authored locally (#8698)

* consensus: add trait to control justification sync process

* network: implement JustificationSyncLink for NetworkService

* slots: handle justification sync in slot worker

* babe: fix slot worker instantiation

* aura: fix slot worker instantiation

* pow: handle justification sync in miner

* babe: fix tests

* aura: fix tests

* node: fix compilation

* node-template: fix compilation

* consensus: rename justification sync link parameter

* aura: fix test compilation

* consensus: slots: move JustificationSyncLink out of on_slot

* arithmetic: fix PerThing pow (#9030)

* arithmetic: add failing test for pow

* arithmetic: fix PerThing::pow

* Revert back to previous optimisations

Co-authored-by: Gav Wood <gavin@parity.io>

* Compact proof utilities in sp_trie. (#8574)

* validation extension in sp_io

* need paths

* arc impl

* missing host function in executor

* io to pkdot

* decode function.

* encode primitive.

* trailing tab

* multiple patch

* fix child trie logic

* restore master versionning

* bench compact proof size

* trie-db 22.3 is needed

* line width

* split line

* fixes for bench (additional root may not be needed as original issue was
with empty proof).

* revert compact from block size calculation.

* New error type for compression.

* Adding test (incomplete (failing)).
Also lacking real proof checking (no good primitives in sp-trie crate).

* There is currently no proof recording utility in sp_trie, removing
test.

* small test of child root in proof without a child proof.

* remove empty test.

* remove non compact proof size

* Missing revert.

* proof method to encode decode.

* Don't inlucde nominaotrs that back no one in the snapshot. (#9017)

* fix all_in_one test which had a logic error

* use sp_std, not std

* Periodically call `Peerset::alloc_slots` on all sets (#9025)

* Periodically call alloc_slots on all slots

* Add test

* contracts: Add new `seal_call` that offers new features (#8909)

* Add new `seal_call` that offers new features

* Fix doc typo

Co-authored-by: Michael Müller <michi@parity.io>

* Fix doc typos

Co-authored-by: Michael Müller <michi@parity.io>

* Fix comment on assert

* Update CHANGELOG.md

Co-authored-by: Michael Müller <michi@parity.io>

* fix unreserve_all_named (#9042)

* Delete legacy runtime metadata macros (#9043)

* `rpc-http-threads` cli arg (#8890)

* Add optional `rpc-http-threads` cli arg

* Update `http::ServerBuilder`threads

* allow inserting equal items into bounded map/set

* refactor: only load one solution at a time

This increases the database read load, because we read one solution
at a time. On the other hand, it substantially decreases the overall
memory load, because we _only_ read one solution at a time instead
of reading all of them.

* Emit `Bonded` event when rebonding (#9040)

* Emit `Bonded` event when rebonding

* fix borrow checker

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs

Co-authored-by: Parity Bot <admin@parity.io>

* fix tests

* Revert "Merge remote-tracking branch 'origin/master' into prgn-election-provider-multi-phase-bounded-btree-set-signed-submissions"

This reverts commit de92b1e8e0e44a74c24e270d02b6e8e6a2c37032, reversing
changes made to dae31f2018593b60dbf1d96ec96cdc35c374bb9e.

* only derive debug when std

* write after check

* SignedSubmissions doesn't ever modify storage until .put()

This makes a true check-before-write pattern possible.

* REVERT ME: demo that Drop impl doesn't work

* Revert "REVERT ME: demo that Drop impl doesn't work"

This reverts commit 3317a4bb4de2e77d5a7fff2154552a81ec081763.

* doc note about decode_len

* rename get_submission, take_submission for clarity

* add test which fails for current incorrect behavior

* inline fn insert_submission

This fixes a tricky check-before-write error, ensuring that we
really only ever modify anything if we have in fact succeeded.

Co-authored-by: Roman Proskuryakov <humbug@deeptown.org>
Co-authored-by: Denis Pisarev <denis.pisarev@parity.io>
Co-authored-by: MOZGIII <mike-n@narod.ru>
Co-authored-by: Alexander Theißen <alex.theissen@me.com>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com>
Co-authored-by: Sebastian Müller <sebastian@web3.foundation>
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Co-authored-by: emostov <32168567+emostov@users.noreply.github.com>
Co-authored-by: Andrew Jones <ascjones@gmail.com>
Co-authored-by: Gavin Wood <gavin@parity.io>
Co-authored-by: Shaun Wang <spxwang@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Seun Lanlege <seun@parity.io>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: Keith Yeung <kungfukeith11@gmail.com>
Co-authored-by: Squirrel <gilescope@gmail.com>
Co-authored-by: Sergei Shulepov <sergei@parity.io>
Co-authored-by: Ashley <ashley.ruglys@gmail.com>
Co-authored-by: Parity Bot <admin@parity.io>
Co-authored-by: Lohann Paterno Coutinho Ferreira <developer@lohann.dev>
Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>
Co-authored-by: Boiethios <Boiethios@users.noreply.github.com>
Co-authored-by: Boiethios <felix-dev@daudre-vignier.fr>
Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
Co-authored-by: Andreas Doerr <adoerr@users.noreply.github.com>
Co-authored-by: Dmitry Kashitsyn <korvin@deeptown.org>
Co-authored-by: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Co-authored-by: cheme <emericchevalier.pro@gmail.com>
Co-authored-by: Andronik Ordian <write@reusable.software>
Co-authored-by: Xiliang Chen <xlchen1291@gmail.com>
Co-authored-by: Gavin Wood <i@gavwood.com>
Co-authored-by: Jakub Pánik <jakub.panik@gmail.com>
Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
Co-authored-by: Michael Müller <michi@parity.io>
Co-authored-by: tgmichel <telmo@purestake.com>

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_election_provider_multi_phase --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/election-provider-multi-phase/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* remove duplicate weight definitions injected by benchmark bot

* check deletion overlay before getting

* clarify non-conflict between delete, insert overlays

* drain can be used wrong so is private

* update take_submission docs

* more drain improvements

* more take_submission docs

* debug assertion helps prove expectation is valid

* doc on changing SignedMaxSubmissions

* take_submission inner doc on system properties

* Apply suggestions from code review

Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com>
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* get SolutionOrSnapshotSize out of the loop

Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com>

* doc which items comprise `SignedSubmissions`

* add doc about index as unique identifier

* Add debug assertions to prove drain worked properly

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* replace take_submission with swap_out_submission

* use a match to demonstrate all cases from signed_submissions.insert

* refactor signed_submissions.insert return type

* prettify test assertion

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* improve docs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* add tests that finalize_signed_phase is idempotent

* add some debug assertions to guard against misuse of storage

* log internal logic errors instead of panicing

* don't store the reward with each signed submission

The signed reward base can be treated as a constant. It can in principle
change, but even if it's updated in the middle of an election, it's
appropriate to use the current value for the winner.

* emit Rewarded, Slashed events as appropriate

Makes it easier to see who won/lost with signed submissions.

* update docs

* use a custom enum to be explicit about the outcome of insertion

* remove outdated docs

Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
Co-authored-by: Peter Goodspeed-Niklaus <peter.r.goodspeedniklaus@gmail.com>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Roman Proskuryakov <humbug@deeptown.org>
Co-authored-by: Denis Pisarev <denis.pisarev@parity.io>
Co-authored-by: MOZGIII <mike-n@narod.ru>
Co-authored-by: Alexander Theißen <alex.theissen@me.com>
Co-authored-by: thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com>
Co-authored-by: Sebastian Müller <sebastian@web3.foundation>
Co-authored-by: emostov <32168567+emostov@users.noreply.github.com>
Co-authored-by: Andrew Jones <ascjones@gmail.com>
Co-authored-by: Gavin Wood <gavin@parity.io>
Co-authored-by: Shaun Wang <spxwang@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Seun Lanlege <seun@parity.io>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: Keith Yeung <kungfukeith11@gmail.com>
Co-authored-by: Squirrel <gilescope@gmail.com>
Co-authored-by: Sergei Shulepov <sergei@parity.io>
Co-authored-by: Ashley <ashley.ruglys@gmail.com>
Co-authored-by: Lohann Paterno Coutinho Ferreira <developer@lohann.dev>
Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>
Co-authored-by: Boiethios <Boiethios@users.noreply.github.com>
Co-authored-by: Boiethios <felix-dev@daudre-vignier.fr>
Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
Co-authored-by: Andreas Doerr <adoerr@users.noreply.github.com>
Co-authored-by: Dmitry Kashitsyn <korvin@deeptown.org>
Co-authored-by: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Co-authored-by: cheme <emericchevalier.pro@gmail.com>
Co-authored-by: Andronik Ordian <write@reusable.software>
Co-authored-by: Xiliang Chen <xlchen1291@gmail.com>
Co-authored-by: Gavin Wood <i@gavwood.com>
Co-authored-by: Jakub Pánik <jakub.panik@gmail.com>
Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
Co-authored-by: Michael Müller <michi@parity.io>
Co-authored-by: tgmichel <telmo@purestake.com>
---
 bin/node/runtime/src/lib.rs                   |  21 +-
 .../src/benchmarking.rs                       | 105 +-
 .../src/helpers.rs                            |   8 +-
 .../election-provider-multi-phase/src/lib.rs  | 272 +++++-
 .../election-provider-multi-phase/src/mock.rs |  56 +-
 .../src/signed.rs                             | 920 ++++++++++++++++++
 .../src/unsigned.rs                           |  79 +-
 .../src/weights.rs                            | 107 +-
 .../support/src/storage/bounded_btree_map.rs  |  64 +-
 .../support/src/storage/bounded_btree_set.rs  |  62 +-
 primitives/npos-elections/compact/src/lib.rs  |   2 +-
 11 files changed, 1592 insertions(+), 104 deletions(-)
 create mode 100644 frame/election-provider-multi-phase/src/signed.rs

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 2ce19483e553..fd7fd4213366 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -73,6 +73,7 @@ use pallet_session::{historical as pallet_session_historical};
 use sp_inherents::{InherentData, CheckInherentsResult};
 use static_assertions::const_assert;
 use pallet_contracts::weights::WeightInfo;
+use pallet_election_provider_multi_phase::FallbackStrategy;
 
 #[cfg(any(feature = "std", test))]
 pub use sp_runtime::BuildStorage;
@@ -516,9 +517,14 @@ parameter_types! {
 	pub const SignedPhase: u32 = EPOCH_DURATION_IN_BLOCKS / 4;
 	pub const UnsignedPhase: u32 = EPOCH_DURATION_IN_BLOCKS / 4;
 
-	// fallback: no need to do on-chain phragmen initially.
-	pub const Fallback: pallet_election_provider_multi_phase::FallbackStrategy =
-		pallet_election_provider_multi_phase::FallbackStrategy::Nothing;
+	// signed config
+	pub const SignedMaxSubmissions: u32 = 10;
+	pub const SignedRewardBase: Balance = 1 * DOLLARS;
+	pub const SignedDepositBase: Balance = 1 * DOLLARS;
+	pub const SignedDepositByte: Balance = 1 * CENTS;
+
+	// fallback: no on-chain fallback.
+	pub const Fallback: FallbackStrategy = FallbackStrategy::Nothing;
 
 	pub SolutionImprovementThreshold: Perbill = Perbill::from_rational(1u32, 10_000);
 
@@ -559,6 +565,14 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
 	type MinerMaxWeight = MinerMaxWeight;
 	type MinerMaxLength = MinerMaxLength;
 	type MinerTxPriority = MultiPhaseUnsignedPriority;
+	type SignedMaxSubmissions = SignedMaxSubmissions;
+	type SignedRewardBase = SignedRewardBase;
+	type SignedDepositBase = SignedDepositBase;
+	type SignedDepositByte = SignedDepositByte;
+	type SignedDepositWeight = ();
+	type SignedMaxWeight = MinerMaxWeight;
+	type SlashHandler = (); // burn slashes
+	type RewardHandler = (); // nothing to do upon rewards
 	type DataProvider = Staking;
 	type OnChainAccuracy = Perbill;
 	type CompactSolution = NposCompactSolution16;
@@ -1556,6 +1570,7 @@ impl_runtime_apis! {
 			add_benchmark!(params, batches, pallet_uniques, Uniques);
 			add_benchmark!(params, batches, pallet_utility, Utility);
 			add_benchmark!(params, batches, pallet_vesting, Vesting);
+			add_benchmark!(params, batches, pallet_election_provider_multi_phase, ElectionProviderMultiPhase);
 
 			if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) }
 			Ok(batches)
diff --git a/frame/election-provider-multi-phase/src/benchmarking.rs b/frame/election-provider-multi-phase/src/benchmarking.rs
index 4eade8e184e7..7988163e98f6 100644
--- a/frame/election-provider-multi-phase/src/benchmarking.rs
+++ b/frame/election-provider-multi-phase/src/benchmarking.rs
@@ -19,7 +19,7 @@
 
 use super::*;
 use crate::{Pallet as MultiPhase, unsigned::IndexAssignmentOf};
-use frame_benchmarking::impl_benchmark_test_suite;
+use frame_benchmarking::{account, impl_benchmark_test_suite};
 use frame_support::{assert_ok, traits::OnInitialize};
 use frame_system::RawOrigin;
 use rand::{prelude::SliceRandom, rngs::SmallRng, SeedableRng};
@@ -57,7 +57,7 @@ fn solution_with_size<T: Config>(
 	let targets: Vec<T::AccountId> =
 		(0..size.targets).map(|i| frame_benchmarking::account("Targets", i, SEED)).collect();
 
-	let mut rng = SmallRng::seed_from_u64(SEED as u64);
+	let mut rng = SmallRng::seed_from_u64(SEED.into());
 
 	// decide who are the winners.
 	let winners = targets
@@ -176,6 +176,39 @@ frame_benchmarking::benchmarks! {
 		assert!(<MultiPhase<T>>::current_phase().is_unsigned());
 	}
 
+	finalize_signed_phase_accept_solution {
+		let receiver = account("receiver", 0, SEED);
+		let initial_balance = T::Currency::minimum_balance() * 10u32.into();
+		T::Currency::make_free_balance_be(&receiver, initial_balance);
+		let ready: ReadySolution<T::AccountId> = Default::default();
+		let deposit: BalanceOf<T> = 10u32.into();
+		let reward: BalanceOf<T> = 20u32.into();
+
+		assert_ok!(T::Currency::reserve(&receiver, deposit));
+		assert_eq!(T::Currency::free_balance(&receiver), initial_balance - 10u32.into());
+	}: {
+		<MultiPhase<T>>::finalize_signed_phase_accept_solution(ready, &receiver, deposit, reward)
+	} verify {
+		assert_eq!(T::Currency::free_balance(&receiver), initial_balance + 20u32.into());
+		assert_eq!(T::Currency::reserved_balance(&receiver), 0u32.into());
+	}
+
+	finalize_signed_phase_reject_solution {
+		let receiver = account("receiver", 0, SEED);
+		let initial_balance = T::Currency::minimum_balance().max(One::one()) * 10u32.into();
+		let deposit: BalanceOf<T> = 10u32.into();
+		T::Currency::make_free_balance_be(&receiver, initial_balance);
+		assert_ok!(T::Currency::reserve(&receiver, deposit));
+
+		assert_eq!(T::Currency::free_balance(&receiver), initial_balance - 10u32.into());
+		assert_eq!(T::Currency::reserved_balance(&receiver), 10u32.into());
+	}: {
+		<MultiPhase<T>>::finalize_signed_phase_reject_solution(&receiver, deposit)
+	} verify {
+		assert_eq!(T::Currency::free_balance(&receiver), initial_balance - 10u32.into());
+		assert_eq!(T::Currency::reserved_balance(&receiver), 0u32.into());
+	}
+
 	on_initialize_open_unsigned_without_snapshot {
 		// need to assume signed phase was open before
 		<MultiPhase<T>>::on_initialize_open_signed().unwrap();
@@ -227,6 +260,38 @@ frame_benchmarking::benchmarks! {
 		assert!(<MultiPhase<T>>::snapshot().is_some());
 	}
 
+	submit {
+		let c in 1 .. (T::SignedMaxSubmissions::get() - 1);
+
+		// the solution will be worse than all of them meaning the score need to be checked against
+		// ~ log2(c)
+		let solution = RawSolution {
+			score: [(10_000_000u128 - 1).into(), 0, 0],
+			..Default::default()
+		};
+
+		MultiPhase::<T>::on_initialize_open_signed().expect("should be ok to start signed phase");
+		<Round<T>>::put(1);
+
+		let mut signed_submissions = SignedSubmissions::<T>::get();
+		for i in 0..c {
+			let solution = RawSolution {
+				score: [(10_000_000 + i).into(), 0, 0],
+				..Default::default()
+			};
+			let signed_submission = SignedSubmission { solution, ..Default::default() };
+			signed_submissions.insert(signed_submission);
+		}
+		signed_submissions.put();
+
+		let caller = frame_benchmarking::whitelisted_caller();
+		T::Currency::make_free_balance_be(&caller,  T::Currency::minimum_balance() * 10u32.into());
+
+	}: _(RawOrigin::Signed(caller), solution, c)
+	verify {
+		assert!(<MultiPhase<T>>::signed_submissions().len() as u32 == c + 1);
+	}
+
 	submit_unsigned {
 		// number of votes in snapshot.
 		let v in (T::BenchmarkingConfig::VOTERS[0]) .. T::BenchmarkingConfig::VOTERS[1];
@@ -234,9 +299,12 @@ frame_benchmarking::benchmarks! {
 		let t in (T::BenchmarkingConfig::TARGETS[0]) .. T::BenchmarkingConfig::TARGETS[1];
 		// number of assignments, i.e. compact.len(). This means the active nominators, thus must be
 		// a subset of `v` component.
-		let a in (T::BenchmarkingConfig::ACTIVE_VOTERS[0]) .. T::BenchmarkingConfig::ACTIVE_VOTERS[1];
+		let a in
+			(T::BenchmarkingConfig::ACTIVE_VOTERS[0]) .. T::BenchmarkingConfig::ACTIVE_VOTERS[1];
 		// number of desired targets. Must be a subset of `t` component.
-		let d in (T::BenchmarkingConfig::DESIRED_TARGETS[0]) .. T::BenchmarkingConfig::DESIRED_TARGETS[1];
+		let d in
+			(T::BenchmarkingConfig::DESIRED_TARGETS[0]) ..
+			T::BenchmarkingConfig::DESIRED_TARGETS[1];
 
 		let witness = SolutionOrSnapshotSize { voters: v, targets: t };
 		let raw_solution = solution_with_size::<T>(witness, a, d);
@@ -249,7 +317,8 @@ frame_benchmarking::benchmarks! {
 		let encoded_call = <Call<T>>::submit_unsigned(raw_solution.clone(), witness).encode();
 	}: {
 		assert_ok!(<MultiPhase<T>>::submit_unsigned(RawOrigin::None.into(), raw_solution, witness));
-		let _decoded_snap = <RoundSnapshot<T::AccountId> as Decode>::decode(&mut &*encoded_snapshot).unwrap();
+		let _decoded_snap = <RoundSnapshot<T::AccountId> as Decode>::decode(&mut &*encoded_snapshot)
+			.unwrap();
 		let _decoded_call = <Call<T> as Decode>::decode(&mut &*encoded_call).unwrap();
 	} verify {
 		assert!(<MultiPhase<T>>::queued_solution().is_some());
@@ -263,13 +332,17 @@ frame_benchmarking::benchmarks! {
 		let t in (T::BenchmarkingConfig::TARGETS[0]) .. T::BenchmarkingConfig::TARGETS[1];
 		// number of assignments, i.e. compact.len(). This means the active nominators, thus must be
 		// a subset of `v` component.
-		let a in (T::BenchmarkingConfig::ACTIVE_VOTERS[0]) .. T::BenchmarkingConfig::ACTIVE_VOTERS[1];
+		let a in
+			(T::BenchmarkingConfig::ACTIVE_VOTERS[0]) .. T::BenchmarkingConfig::ACTIVE_VOTERS[1];
 		// number of desired targets. Must be a subset of `t` component.
-		let d in (T::BenchmarkingConfig::DESIRED_TARGETS[0]) .. T::BenchmarkingConfig::DESIRED_TARGETS[1];
+		let d in
+			(T::BenchmarkingConfig::DESIRED_TARGETS[0]) ..
+			T::BenchmarkingConfig::DESIRED_TARGETS[1];
 		// Subtract this percentage from the actual encoded size
 		let f in 0 .. 95;
 
-		// Compute a random solution, then work backwards to get the lists of voters, targets, and assignments
+		// Compute a random solution, then work backwards to get the lists of voters, targets, and
+		// assignments
 		let witness = SolutionOrSnapshotSize { voters: v, targets: t };
 		let RawSolution { compact, .. } = solution_with_size::<T>(witness, a, d);
 		let RoundSnapshot { voters, targets } = MultiPhase::<T>::snapshot().unwrap();
@@ -313,7 +386,11 @@ frame_benchmarking::benchmarks! {
 	} verify {
 		let compact = CompactOf::<T>::try_from(index_assignments.as_slice()).unwrap();
 		let encoding = compact.encode();
-		log!(trace, "encoded size prediction = {}", encoded_size_of(index_assignments.as_slice()).unwrap());
+		log!(
+			trace,
+			"encoded size prediction = {}",
+			encoded_size_of(index_assignments.as_slice()).unwrap(),
+		);
 		log!(trace, "actual encoded size = {}", encoding.len());
 		assert!(encoding.len() <= desired_size);
 	}
@@ -326,9 +403,12 @@ frame_benchmarking::benchmarks! {
 		let t in (T::BenchmarkingConfig::TARGETS[0]) .. T::BenchmarkingConfig::TARGETS[1];
 		// number of assignments, i.e. compact.len(). This means the active nominators, thus must be
 		// a subset of `v` component.
-		let a in (T::BenchmarkingConfig::ACTIVE_VOTERS[0]) .. T::BenchmarkingConfig::ACTIVE_VOTERS[1];
+		let a in
+			(T::BenchmarkingConfig::ACTIVE_VOTERS[0]) .. T::BenchmarkingConfig::ACTIVE_VOTERS[1];
 		// number of desired targets. Must be a subset of `t` component.
-		let d in (T::BenchmarkingConfig::DESIRED_TARGETS[0]) .. T::BenchmarkingConfig::DESIRED_TARGETS[1];
+		let d in
+			(T::BenchmarkingConfig::DESIRED_TARGETS[0]) ..
+			T::BenchmarkingConfig::DESIRED_TARGETS[1];
 
 		let size = SolutionOrSnapshotSize { voters: v, targets: t };
 		let raw_solution = solution_with_size::<T>(size, a, d);
@@ -340,7 +420,8 @@ frame_benchmarking::benchmarks! {
 		let encoded_snapshot = <MultiPhase<T>>::snapshot().unwrap().encode();
 	}: {
 		assert_ok!(<MultiPhase<T>>::feasibility_check(raw_solution, ElectionCompute::Unsigned));
-		let _decoded_snap = <RoundSnapshot<T::AccountId> as Decode>::decode(&mut &*encoded_snapshot).unwrap();
+		let _decoded_snap = <RoundSnapshot<T::AccountId> as Decode>::decode(&mut &*encoded_snapshot)
+			.unwrap();
 	}
 }
 
diff --git a/frame/election-provider-multi-phase/src/helpers.rs b/frame/election-provider-multi-phase/src/helpers.rs
index bf5b360499cb..46eeef0a6bf7 100644
--- a/frame/election-provider-multi-phase/src/helpers.rs
+++ b/frame/election-provider-multi-phase/src/helpers.rs
@@ -47,13 +47,13 @@ pub fn generate_voter_cache<T: Config>(
 	cache
 }
 
-/// Create a function the returns the index a voter in the snapshot.
+/// Create a function that returns the index of a voter in the snapshot.
 ///
 /// The returning index type is the same as the one defined in `T::CompactSolution::Voter`.
 ///
 /// ## Warning
 ///
-/// The snapshot must be the same is the one used to create `cache`.
+/// Note that this will represent the snapshot data from which the `cache` is generated.
 pub fn voter_index_fn<T: Config>(
 	cache: &BTreeMap<T::AccountId, usize>,
 ) -> impl Fn(&T::AccountId) -> Option<CompactVoterIndexOf<T>> + '_ {
@@ -78,7 +78,7 @@ pub fn voter_index_fn_owned<T: Config>(
 ///
 /// ## Warning
 ///
-/// The snapshot must be the same is the one used to create `cache`.
+/// Note that this will represent the snapshot data from which the `cache` is generated.
 pub fn voter_index_fn_usize<T: Config>(
 	cache: &BTreeMap<T::AccountId, usize>,
 ) -> impl Fn(&T::AccountId) -> Option<usize> + '_ {
@@ -103,7 +103,7 @@ pub fn voter_index_fn_linear<T: Config>(
 	}
 }
 
-/// Create a function the returns the index to a target in the snapshot.
+/// Create a function that returns the index of a target in the snapshot.
 ///
 /// The returned index type is the same as the one defined in `T::CompactSolution::Target`.
 ///
diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index 2864ca518d06..45e04a757f0b 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -231,7 +231,7 @@ use codec::{Decode, Encode};
 use frame_support::{
 	dispatch::DispatchResultWithPostInfo,
 	ensure,
-	traits::{Currency, Get, ReservableCurrency},
+	traits::{Currency, Get, ReservableCurrency, OnUnbalanced},
 	weights::Weight,
 };
 use frame_system::{ensure_none, offchain::SendTransactionTypes};
@@ -266,10 +266,14 @@ pub mod helpers;
 
 const LOG_TARGET: &'static str = "runtime::election-provider";
 
+pub mod signed;
 pub mod unsigned;
 pub mod weights;
 
-/// The weight declaration of the pallet.
+pub use signed::{
+	BalanceOf, NegativeImbalanceOf, PositiveImbalanceOf, SignedSubmission, SignedSubmissionOf,
+	SignedSubmissions, SubmissionIndicesOf,
+};
 pub use weights::WeightInfo;
 
 /// The compact solution type used by this crate.
@@ -411,7 +415,7 @@ impl Default for ElectionCompute {
 ///
 /// Such a solution should never become effective in anyway before being checked by the
 /// `Pallet::feasibility_check`
-#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug)]
+#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, PartialOrd, Ord)]
 pub struct RawSolution<C> {
 	/// Compact election edges.
 	pub compact: C,
@@ -583,6 +587,44 @@ pub mod pallet {
 		/// this value, based on [`WeightInfo::submit_unsigned`].
 		type MinerMaxWeight: Get<Weight>;
 
+		/// Maximum number of signed submissions that can be queued.
+		///
+		/// It is best to avoid adjusting this during an election, as it impacts downstream data
+		/// structures. In particular, `SignedSubmissionIndices<T>` is bounded on this value. If you
+		/// update this value during an election, you _must_ ensure that
+		/// `SignedSubmissionIndices.len()` is less than or equal to the new value. Otherwise,
+		/// attempts to submit new solutions may cause a runtime panic.
+		#[pallet::constant]
+		type SignedMaxSubmissions: Get<u32>;
+
+		/// Maximum weight of a signed solution.
+		///
+		/// This should probably be similar to [`Config::MinerMaxWeight`].
+		#[pallet::constant]
+		type SignedMaxWeight: Get<Weight>;
+
+		/// Base reward for a signed solution
+		#[pallet::constant]
+		type SignedRewardBase: Get<BalanceOf<Self>>;
+
+		/// Base deposit for a signed solution.
+		#[pallet::constant]
+		type SignedDepositBase: Get<BalanceOf<Self>>;
+
+		/// Per-byte deposit for a signed solution.
+		#[pallet::constant]
+		type SignedDepositByte: Get<BalanceOf<Self>>;
+
+		/// Per-weight deposit for a signed solution.
+		#[pallet::constant]
+		type SignedDepositWeight: Get<BalanceOf<Self>>;
+
+		/// Handler for the slashed deposits.
+		type SlashHandler: OnUnbalanced<NegativeImbalanceOf<Self>>;
+
+		/// Handler for the rewards.
+		type RewardHandler: OnUnbalanced<PositiveImbalanceOf<Self>>;
+
 		/// Maximum length (bytes) that the mined solution should consume.
 		///
 		/// The miner will ensure that the total length of the unsigned solution will not exceed
@@ -599,6 +641,7 @@ pub mod pallet {
 			+ Eq
 			+ Clone
 			+ sp_std::fmt::Debug
+			+ Ord
 			+ CompactSolution;
 
 		/// Accuracy used for fallback on-chain election.
@@ -656,11 +699,20 @@ pub mod pallet {
 				Phase::Signed | Phase::Off
 					if remaining <= unsigned_deadline && remaining > Zero::zero() =>
 				{
-					// Determine if followed by signed or not.
+					// our needs vary according to whether or not the unsigned phase follows a signed phase
 					let (need_snapshot, enabled, signed_weight) = if current_phase == Phase::Signed {
-						// Followed by a signed phase: close the signed phase, no need for snapshot.
-						// TODO: proper weight https://github.com/paritytech/substrate/pull/7910.
-						(false, true, Weight::zero())
+						// there was previously a signed phase: close the signed phase, no need for snapshot.
+						//
+						// Notes:
+						//
+						//   - `Self::finalize_signed_phase()` also appears in `fn do_elect`. This is
+						//     a guard against the case that `elect` is called prematurely. This adds
+						//     a small amount of overhead, but that is unfortunately unavoidable.
+						let (_success, weight) = Self::finalize_signed_phase();
+						// In the future we can consider disabling the unsigned phase if the signed
+						// phase completes successfully, but for now we're enabling it unconditionally
+						// as a defensive measure.
+						(false, true, weight)
 					} else {
 						// No signed phase: create a new snapshot, definitely `enable` the unsigned
 						// phase.
@@ -807,8 +859,12 @@ pub mod pallet {
 
 			// Store the newly received solution.
 			log!(info, "queued unsigned solution with score {:?}", ready.score);
+			let ejected_a_solution = <QueuedSolution<T>>::exists();
 			<QueuedSolution<T>>::put(ready);
-			Self::deposit_event(Event::SolutionStored(ElectionCompute::Unsigned));
+			Self::deposit_event(Event::SolutionStored(
+				ElectionCompute::Unsigned,
+				ejected_a_solution,
+			));
 
 			Ok(None.into())
 		}
@@ -828,6 +884,79 @@ pub mod pallet {
 			Ok(())
 		}
 
+		/// Submit a solution for the signed phase.
+		///
+		/// The dispatch origin fo this call must be __signed__.
+		///
+		/// The solution is potentially queued, based on the claimed score and processed at the end
+		/// of the signed phase.
+		///
+		/// A deposit is reserved and recorded for the solution. Based on the outcome, the solution
+		/// might be rewarded, slashed, or get all or a part of the deposit back.
+		///
+		/// # <weight>
+		/// Queue size must be provided as witness data.
+		/// # </weight>
+		#[pallet::weight(T::WeightInfo::submit(*num_signed_submissions))]
+		pub fn submit(
+			origin: OriginFor<T>,
+			solution: RawSolution<CompactOf<T>>,
+			num_signed_submissions: u32,
+		) -> DispatchResult {
+			let who = ensure_signed(origin)?;
+
+			// ensure witness data is correct.
+			ensure!(
+				num_signed_submissions >= <SignedSubmissions<T>>::decode_len().unwrap_or_default() as u32,
+				Error::<T>::SignedInvalidWitness,
+			);
+
+			// ensure solution is timely.
+			ensure!(Self::current_phase().is_signed(), Error::<T>::PreDispatchEarlySubmission);
+
+			// NOTE: this is the only case where having separate snapshot would have been better
+			// because could do just decode_len. But we can create abstractions to do this.
+
+			// build size. Note: this is not needed for weight calc, thus not input.
+			// unlikely to ever return an error: if phase is signed, snapshot will exist.
+			let size = Self::snapshot_metadata().ok_or(Error::<T>::MissingSnapshotMetadata)?;
+
+			ensure!(
+				Self::feasibility_weight_of(&solution, size) < T::SignedMaxWeight::get(),
+				Error::<T>::SignedTooMuchWeight,
+			);
+
+			// create the submission
+			let deposit = Self::deposit_for(&solution, size);
+			let submission = SignedSubmission { who: who.clone(), deposit, solution };
+
+			// insert the submission if the queue has space or it's better than the weakest
+			// eject the weakest if the queue was full
+			let mut signed_submissions = Self::signed_submissions();
+			let maybe_removed = match signed_submissions.insert(submission) {
+				// it's an error if we failed to insert a submission: this indicates the queue was
+				// full but our solution had insufficient score to eject any solution
+				signed::InsertResult::NotInserted => return Err(Error::<T>::SignedQueueFull.into()),
+				signed::InsertResult::Inserted => None,
+				signed::InsertResult::InsertedEjecting(weakest) => Some(weakest),
+			};
+
+			// collect deposit. Thereafter, the function cannot fail.
+			T::Currency::reserve(&who, deposit)
+				.map_err(|_| Error::<T>::SignedCannotPayDeposit)?;
+
+			let ejected_a_solution = maybe_removed.is_some();
+			// if we had to remove the weakest solution, unreserve its deposit
+			if let Some(removed) = maybe_removed {
+				let _remainder = T::Currency::unreserve(&removed.who, removed.deposit);
+				debug_assert!(_remainder.is_zero());
+			}
+
+			signed_submissions.put();
+			Self::deposit_event(Event::SolutionStored(ElectionCompute::Signed, ejected_a_solution));
+			Ok(())
+		}
+
 		/// Set a solution in the queue, to be handed out to the client of this pallet in the next
 		/// call to `ElectionProvider::elect`.
 		///
@@ -860,7 +989,9 @@ pub mod pallet {
 		///
 		/// If the solution is signed, this means that it hasn't yet been processed. If the
 		/// solution is unsigned, this means that it has also been processed.
-		SolutionStored(ElectionCompute),
+		///
+		/// The `bool` is `true` when a previous solution was ejected to make room for this one.
+		SolutionStored(ElectionCompute, bool),
 		/// The election has been finalized, with `Some` of the given computation, or else if the
 		/// election failed, `None`.
 		ElectionFinalized(Option<ElectionCompute>),
@@ -883,8 +1014,20 @@ pub mod pallet {
 		PreDispatchWrongWinnerCount,
 		/// Submission was too weak, score-wise.
 		PreDispatchWeakSubmission,
+		/// The queue was full, and the solution was not better than any of the existing ones.
+		SignedQueueFull,
+		/// The origin failed to pay the deposit.
+		SignedCannotPayDeposit,
+		/// Witness data to dispatchable is invalid.
+		SignedInvalidWitness,
+		/// The signed submission consumes too much weight
+		SignedTooMuchWeight,
 		/// OCW submitted solution for wrong round
 		OcwCallWrongEra,
+		/// Snapshot metadata should exist but didn't.
+		MissingSnapshotMetadata,
+		/// `Self::insert_submission` returned an invalid index.
+		InvalidSubmissionIndex,
 		/// The call is not allowed at this point.
 		CallNotAllowed,
 	}
@@ -988,6 +1131,45 @@ pub mod pallet {
 	#[pallet::getter(fn snapshot_metadata)]
 	pub type SnapshotMetadata<T: Config> = StorageValue<_, SolutionOrSnapshotSize>;
 
+	// The following storage items collectively comprise `SignedSubmissions<T>`, and should never be
+	// accessed independently. Instead, get `Self::signed_submissions()`, modify it as desired, and
+	// then do `signed_submissions.put()` when you're done with it.
+
+	/// The next index to be assigned to an incoming signed submission.
+	///
+	/// Every accepted submission is assigned a unique index; that index is bound to that particular
+	/// submission for the duration of the election. On election finalization, the next index is
+	/// reset to 0.
+	///
+	/// We can't just use `SignedSubmissionIndices.len()`, because that's a bounded set; past its
+	/// capacity, it will simply saturate. We can't just iterate over `SignedSubmissionsMap`,
+	/// because iteration is slow. Instead, we store the value here.
+	#[pallet::storage]
+	pub(crate) type SignedSubmissionNextIndex<T: Config> = StorageValue<_, u32, ValueQuery>;
+
+	/// A sorted, bounded set of `(score, index)`, where each `index` points to a value in
+	/// `SignedSubmissions`.
+	///
+	/// We never need to process more than a single signed submission at a time. Signed submissions
+	/// can be quite large, so we're willing to pay the cost of multiple database accesses to access
+	/// them one at a time instead of reading and decoding all of them at once.
+	#[pallet::storage]
+	pub(crate) type SignedSubmissionIndices<T: Config> =
+		StorageValue<_, SubmissionIndicesOf<T>, ValueQuery>;
+
+	/// Unchecked, signed solutions.
+	///
+	/// Together with `SubmissionIndices`, this stores a bounded set of `SignedSubmissions` while
+	/// allowing us to keep only a single one in memory at a time.
+	///
+	/// Twox note: the key of the map is an auto-incrementing index which users cannot inspect or
+	/// affect; we shouldn't need a cryptographically secure hasher.
+	#[pallet::storage]
+	pub(crate) type SignedSubmissionsMap<T: Config> =
+		StorageMap<_, Twox64Concat, u32, SignedSubmissionOf<T>, ValueQuery>;
+
+	// `SignedSubmissions` items end here.
+
 	/// The minimum score that each 'untrusted' solution must attain in order to be considered
 	/// feasible.
 	///
@@ -1223,7 +1405,7 @@ impl<T: Config> Pallet<T> {
 	/// 3. Clear all snapshot data.
 	fn rotate_round() {
 		// Inc round.
-		<Round<T>>::mutate(|r| *r = *r + 1);
+		<Round<T>>::mutate(|r| *r += 1);
 
 		// Phase is off now.
 		<CurrentPhase<T>>::put(Phase::Off);
@@ -1242,6 +1424,13 @@ impl<T: Config> Pallet<T> {
 	}
 
 	fn do_elect() -> Result<(Supports<T::AccountId>, Weight), ElectionError> {
+		// We have to unconditionally try finalizing the signed phase here. There are only two
+		// possibilities:
+		//
+		// - signed phase was open, in which case this is essential for correct functioning of the system
+		// - signed phase was complete or not started, in which case finalization is idempotent and
+		//   inexpensive (1 read of an empty vector).
+		let (_, signed_finalize_weight) = Self::finalize_signed_phase();
 		<QueuedSolution<T>>::take()
 			.map_or_else(
 				|| match T::Fallback::get() {
@@ -1261,7 +1450,7 @@ impl<T: Config> Pallet<T> {
 				if Self::round() != 1 {
 					log!(info, "Finalized election round with compute {:?}.", compute);
 				}
-				(supports, weight)
+				(supports, weight.saturating_add(signed_finalize_weight))
 			})
 			.map_err(|err| {
 				Self::deposit_event(Event::ElectionFinalized(None));
@@ -1309,7 +1498,14 @@ mod feasibility_check {
 	//! more. The best way to audit and review these tests is to try and come up with a solution
 	//! that is invalid, but gets through the system as valid.
 
-	use super::{mock::*, *};
+	use super::*;
+	use crate::{
+		mock::{
+			MultiPhase, Runtime, roll_to, TargetIndex, raw_solution, EpochLength, UnsignedPhase,
+			SignedPhase, VoterIndex, ExtBuilder,
+		},
+	};
+	use frame_support::assert_noop;
 
 	const COMPUTE: ElectionCompute = ElectionCompute::OnChain;
 
@@ -1476,16 +1672,24 @@ mod feasibility_check {
 
 #[cfg(test)]
 mod tests {
-	use super::{mock::*, Event, *};
+	use super::*;
+	use crate::{
+		Phase,
+		mock::{
+			ExtBuilder, MultiPhase, Runtime, roll_to, MockWeightInfo, AccountId, TargetIndex,
+			Targets, multi_phase_events, System, SignedMaxSubmissions,
+		},
+	};
 	use frame_election_provider_support::ElectionProvider;
+	use frame_support::{assert_noop, assert_ok};
 	use sp_npos_elections::Support;
 
 	#[test]
 	fn phase_rotation_works() {
 		ExtBuilder::default().build_and_execute(|| {
 			// 0 ------- 15 ------- 25 ------- 30 ------- ------- 45 ------- 55 ------- 60
-			//           |           |                            |           |
-			//         Signed      Unsigned                     Signed     Unsigned
+			//           |           |          |                 |           |          |
+			//         Signed      Unsigned   Elect             Signed     Unsigned    Elect
 
 			assert_eq!(System::block_number(), 0);
 			assert_eq!(MultiPhase::current_phase(), Phase::Off);
@@ -1644,6 +1848,44 @@ mod tests {
 			assert!(MultiPhase::snapshot_metadata().is_none());
 			assert!(MultiPhase::desired_targets().is_none());
 			assert!(MultiPhase::queued_solution().is_none());
+			assert!(MultiPhase::signed_submissions().is_empty());
+		})
+	}
+
+	#[test]
+	fn early_termination_with_submissions() {
+		// an early termination in the signed phase, with no queued solution.
+		ExtBuilder::default().build_and_execute(|| {
+			// signed phase started at block 15 and will end at 25.
+			roll_to(14);
+			assert_eq!(MultiPhase::current_phase(), Phase::Off);
+
+			roll_to(15);
+			assert_eq!(multi_phase_events(), vec![Event::SignedPhaseStarted(1)]);
+			assert_eq!(MultiPhase::current_phase(), Phase::Signed);
+			assert_eq!(MultiPhase::round(), 1);
+
+			// fill the queue with signed submissions
+			for s in 0..SignedMaxSubmissions::get() {
+				let solution = RawSolution { score: [(5 + s).into(), 0, 0], ..Default::default() };
+				assert_ok!(MultiPhase::submit(
+					crate::mock::Origin::signed(99),
+					solution,
+					MultiPhase::signed_submissions().len() as u32
+				));
+			}
+
+			// an unexpected call to elect.
+			roll_to(20);
+			assert!(MultiPhase::elect().is_ok());
+
+			// all storage items must be cleared.
+			assert_eq!(MultiPhase::round(), 2);
+			assert!(MultiPhase::snapshot().is_none());
+			assert!(MultiPhase::snapshot_metadata().is_none());
+			assert!(MultiPhase::desired_targets().is_none());
+			assert!(MultiPhase::queued_solution().is_none());
+			assert!(MultiPhase::signed_submissions().is_empty());
 		})
 	}
 
diff --git a/frame/election-provider-multi-phase/src/mock.rs b/frame/election-provider-multi-phase/src/mock.rs
index bd035aaf8296..8840e2b935d3 100644
--- a/frame/election-provider-multi-phase/src/mock.rs
+++ b/frame/election-provider-multi-phase/src/mock.rs
@@ -260,8 +260,13 @@ parameter_types! {
 	pub static DesiredTargets: u32 = 2;
 	pub static SignedPhase: u64 = 10;
 	pub static UnsignedPhase: u64 = 5;
-	pub static MaxSignedSubmissions: u32 = 5;
-
+	pub static SignedMaxSubmissions: u32 = 5;
+	pub static SignedDepositBase: Balance = 5;
+	pub static SignedDepositByte: Balance = 0;
+	pub static SignedDepositWeight: Balance = 0;
+	pub static SignedRewardBase: Balance = 7;
+	pub static SignedRewardMax: Balance = 10;
+	pub static SignedMaxWeight: Weight = BlockWeights::get().max_block;
 	pub static MinerMaxIterations: u32 = 5;
 	pub static MinerTxPriority: u64 = 100;
 	pub static SolutionImprovementThreshold: Perbill = Perbill::zero();
@@ -304,6 +309,27 @@ impl multi_phase::weights::WeightInfo for DualMockWeightInfo {
 			<() as multi_phase::weights::WeightInfo>::on_initialize_open_unsigned_without_snapshot()
 		}
 	}
+	fn finalize_signed_phase_accept_solution() -> Weight {
+		if MockWeightInfo::get() {
+			Zero::zero()
+		} else {
+			<() as multi_phase::weights::WeightInfo>::finalize_signed_phase_accept_solution()
+		}
+	}
+	fn finalize_signed_phase_reject_solution() -> Weight {
+		if MockWeightInfo::get() {
+			Zero::zero()
+		} else {
+			<() as multi_phase::weights::WeightInfo>::finalize_signed_phase_reject_solution()
+		}
+	}
+	fn submit(c: u32) -> Weight {
+		if MockWeightInfo::get() {
+			Zero::zero()
+		} else {
+			<() as multi_phase::weights::WeightInfo>::submit(c)
+		}
+	}
 	fn elect_queued() -> Weight {
 		if MockWeightInfo::get() {
 			Zero::zero()
@@ -342,6 +368,14 @@ impl crate::Config for Runtime {
 	type MinerMaxWeight = MinerMaxWeight;
 	type MinerMaxLength = MinerMaxLength;
 	type MinerTxPriority = MinerTxPriority;
+	type SignedRewardBase = SignedRewardBase;
+	type SignedDepositBase = SignedDepositBase;
+	type SignedDepositByte = ();
+	type SignedDepositWeight = ();
+	type SignedMaxWeight = SignedMaxWeight;
+	type SignedMaxSubmissions = SignedMaxSubmissions;
+	type SlashHandler = ();
+	type RewardHandler = ();
 	type DataProvider = StakingMock;
 	type WeightInfo = DualMockWeightInfo;
 	type BenchmarkingConfig = ();
@@ -440,6 +474,20 @@ impl ExtBuilder {
 		VOTERS.with(|v| v.borrow_mut().push((who, stake, targets)));
 		self
 	}
+	pub fn signed_max_submission(self, count: u32) -> Self {
+		<SignedMaxSubmissions>::set(count);
+		self
+	}
+	pub fn signed_deposit(self, base: u64, byte: u64, weight: u64) -> Self {
+		<SignedDepositBase>::set(base);
+		<SignedDepositByte>::set(byte);
+		<SignedDepositWeight>::set(weight);
+		self
+	}
+	pub fn signed_weight(self, weight: Weight) -> Self {
+		<SignedMaxWeight>::set(weight);
+		self
+	}
 	pub fn build(self) -> sp_io::TestExternalities {
 		sp_tracing::try_init_simple();
 		let mut storage =
@@ -481,3 +529,7 @@ impl ExtBuilder {
 		self.build().execute_with(test)
 	}
 }
+
+pub(crate) fn balances(who: &u64) -> (u64, u64) {
+	(Balances::free_balance(who), Balances::reserved_balance(who))
+}
diff --git a/frame/election-provider-multi-phase/src/signed.rs b/frame/election-provider-multi-phase/src/signed.rs
new file mode 100644
index 000000000000..ba1123c1331a
--- /dev/null
+++ b/frame/election-provider-multi-phase/src/signed.rs
@@ -0,0 +1,920 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! The signed phase implementation.
+
+use crate::{
+	CompactOf, Config, ElectionCompute, Pallet, RawSolution, ReadySolution, SolutionOrSnapshotSize,
+	Weight, WeightInfo, QueuedSolution, SignedSubmissionsMap, SignedSubmissionIndices,
+	SignedSubmissionNextIndex,
+};
+use codec::{Encode, Decode, HasCompact};
+use frame_support::{
+	storage::bounded_btree_map::BoundedBTreeMap,
+	traits::{Currency, Get, OnUnbalanced, ReservableCurrency},
+	DebugNoBound,
+};
+use sp_arithmetic::traits::SaturatedConversion;
+use sp_npos_elections::{is_score_better, CompactSolution, ElectionScore};
+use sp_runtime::{
+	RuntimeDebug,
+	traits::{Saturating, Zero},
+};
+use sp_std::{
+	cmp::Ordering,
+	collections::{btree_map::BTreeMap, btree_set::BTreeSet},
+	ops::Deref,
+};
+
+/// A raw, unchecked signed submission.
+///
+/// This is just a wrapper around [`RawSolution`] and some additional info.
+#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, Default)]
+pub struct SignedSubmission<AccountId, Balance: HasCompact, CompactSolution> {
+	/// Who submitted this solution.
+	pub who: AccountId,
+	/// The deposit reserved for storing this solution.
+	pub deposit: Balance,
+	/// The raw solution itself.
+	pub solution: RawSolution<CompactSolution>,
+}
+
+impl<AccountId, Balance, CompactSolution> Ord
+	for SignedSubmission<AccountId, Balance, CompactSolution>
+where
+	AccountId: Ord,
+	Balance: Ord + HasCompact,
+	CompactSolution: Ord,
+	RawSolution<CompactSolution>: Ord,
+{
+	fn cmp(&self, other: &Self) -> Ordering {
+		self.solution
+			.score
+			.cmp(&other.solution.score)
+			.then_with(|| self.solution.cmp(&other.solution))
+			.then_with(|| self.deposit.cmp(&other.deposit))
+			.then_with(|| self.who.cmp(&other.who))
+	}
+}
+
+impl<AccountId, Balance, CompactSolution> PartialOrd
+	for SignedSubmission<AccountId, Balance, CompactSolution>
+where
+	AccountId: Ord,
+	Balance: Ord + HasCompact,
+	CompactSolution: Ord,
+	RawSolution<CompactSolution>: Ord,
+{
+	fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+		Some(self.cmp(other))
+	}
+}
+
+pub type BalanceOf<T> =
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+pub type PositiveImbalanceOf<T> = <<T as Config>::Currency as Currency<
+	<T as frame_system::Config>::AccountId,
+>>::PositiveImbalance;
+pub type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<
+	<T as frame_system::Config>::AccountId,
+>>::NegativeImbalance;
+pub type SignedSubmissionOf<T> =
+	SignedSubmission<<T as frame_system::Config>::AccountId, BalanceOf<T>, CompactOf<T>>;
+
+pub type SubmissionIndicesOf<T> =
+	BoundedBTreeMap<ElectionScore, u32, <T as Config>::SignedMaxSubmissions>;
+
+/// Outcome of [`SignedSubmissions::insert`].
+pub enum InsertResult<T: Config> {
+	/// The submission was not inserted because the queue was full and the submission had
+	/// insufficient score to eject a prior solution from the queue.
+	NotInserted,
+	/// The submission was inserted successfully without ejecting a solution.
+	Inserted,
+	/// The submission was inserted successfully. As the queue was full, this operation ejected a
+	/// prior solution, contained in this variant.
+	InsertedEjecting(SignedSubmissionOf<T>),
+}
+
+/// Mask type which pretends to be a set of `SignedSubmissionOf<T>`, while in fact delegating to the
+/// actual implementations in `SignedSubmissionIndices<T>`, `SignedSubmissionsMap<T>`, and
+/// `SignedSubmissionNextIndex<T>`.
+#[cfg_attr(feature = "std", derive(DebugNoBound))]
+pub struct SignedSubmissions<T: Config> {
+	indices: SubmissionIndicesOf<T>,
+	next_idx: u32,
+	insertion_overlay: BTreeMap<u32, SignedSubmissionOf<T>>,
+	deletion_overlay: BTreeSet<u32>,
+}
+
+impl<T: Config> SignedSubmissions<T> {
+	/// Get the signed submissions from storage.
+	pub fn get() -> Self {
+		let submissions = SignedSubmissions {
+			indices: SignedSubmissionIndices::<T>::get(),
+			next_idx: SignedSubmissionNextIndex::<T>::get(),
+			insertion_overlay: BTreeMap::new(),
+			deletion_overlay: BTreeSet::new(),
+		};
+		// validate that the stored state is sane
+		debug_assert!(submissions.indices.values().copied().max().map_or(
+			true,
+			|max_idx| submissions.next_idx > max_idx,
+		));
+		submissions
+	}
+
+	/// Put the signed submissions back into storage.
+	pub fn put(mut self) {
+		// validate that we're going to write only sane things to storage
+		debug_assert!(self.insertion_overlay.keys().copied().max().map_or(
+			true,
+			|max_idx| self.next_idx > max_idx,
+		));
+		debug_assert!(self.indices.values().copied().max().map_or(
+			true,
+			|max_idx| self.next_idx > max_idx,
+		));
+
+		SignedSubmissionIndices::<T>::put(self.indices);
+		SignedSubmissionNextIndex::<T>::put(self.next_idx);
+		for key in self.deletion_overlay {
+			self.insertion_overlay.remove(&key);
+			SignedSubmissionsMap::<T>::remove(key);
+		}
+		for (key, value) in self.insertion_overlay {
+			SignedSubmissionsMap::<T>::insert(key, value);
+		}
+	}
+
+	/// Get the submission at a particular index.
+	fn get_submission(&self, idx: u32) -> Option<SignedSubmissionOf<T>> {
+		if self.deletion_overlay.contains(&idx) {
+			// Note: can't actually remove the item from the insertion overlay (if present)
+			// because we don't want to use `&mut self` here. There may be some kind of
+			// `RefCell` optimization possible here in the future.
+			None
+		} else {
+			self.insertion_overlay
+				.get(&idx)
+				.cloned()
+				.or_else(|| SignedSubmissionsMap::<T>::try_get(idx).ok())
+		}
+	}
+
+	/// Perform three operations:
+	///
+	/// - Remove a submission (identified by score)
+	/// - Insert a new submission (identified by score and insertion index)
+	/// - Return the submission which was removed.
+	///
+	/// Note: in the case that `weakest_score` is not present in `self.indices`, this will return
+	/// `None` without inserting the new submission and without further notice.
+	///
+	/// Note: this does not enforce any ordering relation between the submission removed and that
+	/// inserted.
+	///
+	/// Note: this doesn't insert into `insertion_overlay`, the optional new insertion must be
+	/// inserted into  `insertion_overlay` to keep the variable `self` in a valid state.
+	fn swap_out_submission(
+		&mut self,
+		remove_score: ElectionScore,
+		insert: Option<(ElectionScore, u32)>,
+	) -> Option<SignedSubmissionOf<T>> {
+		let remove_idx = self.indices.remove(&remove_score)?;
+		if let Some((insert_score, insert_idx)) = insert {
+			self.indices
+				.try_insert(insert_score, insert_idx)
+				.expect("just removed an item, we must be under capacity; qed");
+		}
+
+		self.insertion_overlay.remove(&remove_idx).or_else(|| {
+			(!self.deletion_overlay.contains(&remove_idx)).then(|| {
+				self.deletion_overlay.insert(remove_idx);
+				SignedSubmissionsMap::<T>::try_get(remove_idx).ok()
+			}).flatten()
+		})
+	}
+
+	/// Iterate through the set of signed submissions in order of increasing score.
+	pub fn iter(&self) -> impl '_ + Iterator<Item = SignedSubmissionOf<T>> {
+		self.indices.iter().filter_map(move |(_score, &idx)| {
+			let maybe_submission = self.get_submission(idx);
+			if maybe_submission.is_none() {
+				log!(
+					error,
+					"SignedSubmissions internal state is invalid (idx {}); \
+					there is a logic error in code handling signed solution submissions",
+					idx,
+				)
+			}
+			maybe_submission
+		})
+	}
+
+	/// Empty the set of signed submissions, returning an iterator of signed submissions in
+	/// arbitrary order.
+	///
+	/// Note that if the iterator is dropped without consuming all elements, not all may be removed
+	/// from the underlying `SignedSubmissionsMap`, putting the storages into an invalid state.
+	///
+	/// Note that, like `put`, this function consumes `Self` and modifies storage.
+	fn drain(mut self) -> impl Iterator<Item = SignedSubmissionOf<T>> {
+		SignedSubmissionIndices::<T>::kill();
+		SignedSubmissionNextIndex::<T>::kill();
+		let insertion_overlay = sp_std::mem::take(&mut self.insertion_overlay);
+		SignedSubmissionsMap::<T>::drain()
+			.filter(move |(k, _v)| !self.deletion_overlay.contains(k))
+			.map(|(_k, v)| v)
+			.chain(insertion_overlay.into_iter().map(|(_k, v)| v))
+	}
+
+	/// Decode the length of the signed submissions without actually reading the entire struct into
+	/// memory.
+	///
+	/// Note that if you hold an instance of `SignedSubmissions`, this function does _not_
+	/// track its current length. This only decodes what is currently stored in memory.
+	pub fn decode_len() -> Option<usize> {
+		SignedSubmissionIndices::<T>::decode_len()
+	}
+
+	/// Insert a new signed submission into the set.
+	///
+	/// In the event that the new submission is not better than the current weakest according
+	/// to `is_score_better`, we do not change anything.
+	pub fn insert(
+		&mut self,
+		submission: SignedSubmissionOf<T>,
+	) -> InsertResult<T> {
+		// verify the expectation that we never reuse an index
+		debug_assert!(!self.indices.values().any(|&idx| idx == self.next_idx));
+
+		let weakest = match self.indices.try_insert(submission.solution.score, self.next_idx) {
+			Ok(Some(prev_idx)) => {
+				// a submission of equal score was already present in the set;
+				// no point editing the actual backing map as we know that the newer solution can't
+				// be better than the old. However, we do need to put the old value back.
+				self.indices
+					.try_insert(submission.solution.score, prev_idx)
+					.expect("didn't change the map size; qed");
+				return InsertResult::NotInserted;
+			}
+			Ok(None) => {
+				// successfully inserted into the set; no need to take out weakest member
+				None
+			}
+			Err((insert_score, insert_idx)) => {
+				// could not insert into the set because it is full.
+				// note that we short-circuit return here in case the iteration produces `None`.
+				// If there wasn't a weakest entry to remove, then there must be a capacity of 0,
+				// which means that we can't meaningfully proceed.
+				let weakest_score = match self.indices.iter().next() {
+					None => return InsertResult::NotInserted,
+					Some((score, _)) => *score,
+				};
+				let threshold = T::SolutionImprovementThreshold::get();
+
+				// if we haven't improved on the weakest score, don't change anything.
+				if !is_score_better(insert_score, weakest_score, threshold) {
+					return InsertResult::NotInserted;
+				}
+
+				self.swap_out_submission(weakest_score, Some((insert_score, insert_idx)))
+			}
+		};
+
+		// we've taken out the weakest, so update the storage map and the next index
+		debug_assert!(!self.insertion_overlay.contains_key(&self.next_idx));
+		self.insertion_overlay.insert(self.next_idx, submission);
+		debug_assert!(!self.deletion_overlay.contains(&self.next_idx));
+		self.next_idx += 1;
+		match weakest {
+			Some(weakest) => InsertResult::InsertedEjecting(weakest),
+			None => InsertResult::Inserted,
+		}
+	}
+
+	/// Remove the signed submission with the highest score from the set.
+	pub fn pop_last(&mut self) -> Option<SignedSubmissionOf<T>> {
+		let (score, _) = self.indices.iter().rev().next()?;
+		// deref in advance to prevent mutable-immutable borrow conflict
+		let score = *score;
+		self.swap_out_submission(score, None)
+	}
+}
+
+impl<T: Config> Deref for SignedSubmissions<T> {
+	type Target = SubmissionIndicesOf<T>;
+
+	fn deref(&self) -> &Self::Target {
+		&self.indices
+	}
+}
+
+impl<T: Config> Pallet<T> {
+	/// `Self` accessor for `SignedSubmission<T>`.
+	pub fn signed_submissions() -> SignedSubmissions<T> {
+		SignedSubmissions::<T>::get()
+	}
+
+	/// Finish the signed phase. Process the signed submissions from best to worse until a valid one
+	/// is found, rewarding the best one and slashing the invalid ones along the way.
+	///
+	/// Returns true if we have a good solution in the signed phase.
+	///
+	/// This drains the [`SignedSubmissions`], potentially storing the best valid one in
+	/// [`QueuedSolution`].
+	pub fn finalize_signed_phase() -> (bool, Weight) {
+		let mut all_submissions = Self::signed_submissions();
+		let mut found_solution = false;
+		let mut weight = T::DbWeight::get().reads(1);
+
+		let SolutionOrSnapshotSize { voters, targets } =
+			Self::snapshot_metadata().unwrap_or_default();
+
+		let reward = T::SignedRewardBase::get();
+
+		while let Some(best) = all_submissions.pop_last() {
+			let SignedSubmission { solution, who, deposit} = best;
+			let active_voters = solution.compact.voter_count() as u32;
+			let feasibility_weight = {
+				// defensive only: at the end of signed phase, snapshot will exits.
+				let desired_targets = Self::desired_targets().unwrap_or_default();
+				T::WeightInfo::feasibility_check(
+					voters,
+					targets,
+					active_voters,
+					desired_targets,
+				)
+			};
+			// the feasibility check itself has some weight
+			weight = weight.saturating_add(feasibility_weight);
+			match Self::feasibility_check(solution, ElectionCompute::Signed) {
+				Ok(ready_solution) => {
+					Self::finalize_signed_phase_accept_solution(
+						ready_solution,
+						&who,
+						deposit,
+						reward,
+					);
+					found_solution = true;
+
+					weight = weight
+						.saturating_add(T::WeightInfo::finalize_signed_phase_accept_solution());
+					break;
+				}
+				Err(_) => {
+					Self::finalize_signed_phase_reject_solution(&who, deposit);
+					weight = weight
+						.saturating_add(T::WeightInfo::finalize_signed_phase_reject_solution());
+				}
+			}
+		}
+
+		// Any unprocessed solution is pointless to even consider. Feasible or malicious,
+		// they didn't end up being used. Unreserve the bonds.
+		let discarded = all_submissions.len();
+		for SignedSubmission { who, deposit, .. } in all_submissions.drain() {
+			let _remaining = T::Currency::unreserve(&who, deposit);
+			weight = weight.saturating_add(T::DbWeight::get().writes(1));
+			debug_assert!(_remaining.is_zero());
+		}
+
+		debug_assert!(!SignedSubmissionIndices::<T>::exists());
+		debug_assert!(!SignedSubmissionNextIndex::<T>::exists());
+		debug_assert!(SignedSubmissionsMap::<T>::iter().next().is_none());
+
+		log!(debug, "closed signed phase, found solution? {}, discarded {}", found_solution, discarded);
+		(found_solution, weight)
+	}
+
+	/// Helper function for the case where a solution is accepted in the signed phase.
+	///
+	/// Extracted to facilitate with weight calculation.
+	///
+	/// Infallible
+	pub fn finalize_signed_phase_accept_solution(
+		ready_solution: ReadySolution<T::AccountId>,
+		who: &T::AccountId,
+		deposit: BalanceOf<T>,
+		reward: BalanceOf<T>,
+	) {
+		// write this ready solution.
+		<QueuedSolution<T>>::put(ready_solution);
+
+		// emit reward event
+		Self::deposit_event(crate::Event::Rewarded(who.clone()));
+
+		// unreserve deposit.
+		let _remaining = T::Currency::unreserve(who, deposit);
+		debug_assert!(_remaining.is_zero());
+
+		// Reward.
+		let positive_imbalance = T::Currency::deposit_creating(who, reward);
+		T::RewardHandler::on_unbalanced(positive_imbalance);
+	}
+
+	/// Helper function for the case where a solution is accepted in the rejected phase.
+	///
+	/// Extracted to facilitate with weight calculation.
+	///
+	/// Infallible
+	pub fn finalize_signed_phase_reject_solution(who: &T::AccountId, deposit: BalanceOf<T>) {
+		Self::deposit_event(crate::Event::Slashed(who.clone()));
+		let (negative_imbalance, _remaining) = T::Currency::slash_reserved(who, deposit);
+		debug_assert!(_remaining.is_zero());
+		T::SlashHandler::on_unbalanced(negative_imbalance);
+	}
+
+	/// The feasibility weight of the given raw solution.
+	pub fn feasibility_weight_of(
+		solution: &RawSolution<CompactOf<T>>,
+		size: SolutionOrSnapshotSize,
+	) -> Weight {
+		T::WeightInfo::feasibility_check(
+			size.voters,
+			size.targets,
+			solution.compact.voter_count() as u32,
+			solution.compact.unique_targets().len() as u32,
+		)
+	}
+
+	/// Collect a sufficient deposit to store this solution.
+	///
+	/// The deposit is composed of 3 main elements:
+	///
+	/// 1. base deposit, fixed for all submissions.
+	/// 2. a per-byte deposit, for renting the state usage.
+	/// 3. a per-weight deposit, for the potential weight usage in an upcoming on_initialize
+	pub fn deposit_for(
+		solution: &RawSolution<CompactOf<T>>,
+		size: SolutionOrSnapshotSize,
+	) -> BalanceOf<T> {
+		let encoded_len: u32 = solution.encoded_size().saturated_into();
+		let encoded_len: BalanceOf<T> = encoded_len.into();
+		let feasibility_weight = Self::feasibility_weight_of(solution, size);
+
+		let len_deposit = T::SignedDepositByte::get().saturating_mul(encoded_len);
+		let weight_deposit = T::SignedDepositWeight::get().saturating_mul(feasibility_weight.saturated_into());
+
+		T::SignedDepositBase::get().saturating_add(len_deposit).saturating_add(weight_deposit)
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use crate::{
+		Phase, Error,
+		mock::{
+			balances, ExtBuilder, MultiPhase, Origin, raw_solution, roll_to, Runtime,
+			SignedMaxSubmissions, SignedMaxWeight,
+		},
+	};
+	use frame_support::{dispatch::DispatchResult, assert_noop, assert_storage_noop, assert_ok};
+
+	fn submit_with_witness(
+		origin: Origin,
+		solution: RawSolution<CompactOf<Runtime>>,
+	) -> DispatchResult {
+		MultiPhase::submit(origin, solution, MultiPhase::signed_submissions().len() as u32)
+	}
+
+	#[test]
+	fn cannot_submit_too_early() {
+		ExtBuilder::default().build_and_execute(|| {
+			roll_to(2);
+			assert_eq!(MultiPhase::current_phase(), Phase::Off);
+
+			// create a temp snapshot only for this test.
+			MultiPhase::create_snapshot().unwrap();
+			let solution = raw_solution();
+
+			assert_noop!(
+				submit_with_witness(Origin::signed(10), solution),
+				Error::<Runtime>::PreDispatchEarlySubmission,
+			);
+		})
+	}
+
+	#[test]
+	fn wrong_witness_fails() {
+		ExtBuilder::default().build_and_execute(|| {
+			roll_to(15);
+			assert!(MultiPhase::current_phase().is_signed());
+
+			let solution = raw_solution();
+			// submit this once correctly
+			assert_ok!(submit_with_witness(Origin::signed(99), solution.clone()));
+			assert_eq!(MultiPhase::signed_submissions().len(), 1);
+
+			// now try and cheat by passing a lower queue length
+			assert_noop!(
+				MultiPhase::submit(Origin::signed(99), solution, 0),
+				Error::<Runtime>::SignedInvalidWitness,
+			);
+		})
+	}
+
+	#[test]
+	fn should_pay_deposit() {
+		ExtBuilder::default().build_and_execute(|| {
+			roll_to(15);
+			assert!(MultiPhase::current_phase().is_signed());
+
+			let solution = raw_solution();
+			assert_eq!(balances(&99), (100, 0));
+
+			assert_ok!(submit_with_witness(Origin::signed(99), solution));
+
+			assert_eq!(balances(&99), (95, 5));
+			assert_eq!(MultiPhase::signed_submissions().iter().next().unwrap().deposit, 5);
+		})
+	}
+
+	#[test]
+	fn good_solution_is_rewarded() {
+		ExtBuilder::default().build_and_execute(|| {
+			roll_to(15);
+			assert!(MultiPhase::current_phase().is_signed());
+
+			let solution = raw_solution();
+			assert_eq!(balances(&99), (100, 0));
+
+			assert_ok!(submit_with_witness(Origin::signed(99), solution));
+			assert_eq!(balances(&99), (95, 5));
+
+			assert!(MultiPhase::finalize_signed_phase().0);
+			assert_eq!(balances(&99), (100 + 7, 0));
+		})
+	}
+
+	#[test]
+	fn bad_solution_is_slashed() {
+		ExtBuilder::default().build_and_execute(|| {
+			roll_to(15);
+			assert!(MultiPhase::current_phase().is_signed());
+
+			let mut solution = raw_solution();
+			assert_eq!(balances(&99), (100, 0));
+
+			// make the solution invalid.
+			solution.score[0] += 1;
+
+			assert_ok!(submit_with_witness(Origin::signed(99), solution));
+			assert_eq!(balances(&99), (95, 5));
+
+			// no good solution was stored.
+			assert!(!MultiPhase::finalize_signed_phase().0);
+			// and the bond is gone.
+			assert_eq!(balances(&99), (95, 0));
+		})
+	}
+
+	#[test]
+	fn suppressed_solution_gets_bond_back() {
+		ExtBuilder::default().build_and_execute(|| {
+			roll_to(15);
+			assert!(MultiPhase::current_phase().is_signed());
+
+			let mut solution = raw_solution();
+			assert_eq!(balances(&99), (100, 0));
+			assert_eq!(balances(&999), (100, 0));
+
+			// submit as correct.
+			assert_ok!(submit_with_witness(Origin::signed(99), solution.clone()));
+
+			// make the solution invalid and weaker.
+			solution.score[0] -= 1;
+			assert_ok!(submit_with_witness(Origin::signed(999), solution));
+			assert_eq!(balances(&99), (95, 5));
+			assert_eq!(balances(&999), (95, 5));
+
+			// _some_ good solution was stored.
+			assert!(MultiPhase::finalize_signed_phase().0);
+
+			// 99 is rewarded.
+			assert_eq!(balances(&99), (100 + 7, 0));
+			// 999 gets everything back.
+			assert_eq!(balances(&999), (100, 0));
+		})
+	}
+
+	#[test]
+	fn cannot_submit_worse_with_full_queue() {
+		ExtBuilder::default().build_and_execute(|| {
+			roll_to(15);
+			assert!(MultiPhase::current_phase().is_signed());
+
+			for s in 0..SignedMaxSubmissions::get() {
+				// score is always getting better
+				let solution = RawSolution { score: [(5 + s).into(), 0, 0], ..Default::default() };
+				assert_ok!(submit_with_witness(Origin::signed(99), solution));
+			}
+
+
+			// weaker.
+			let solution = RawSolution { score: [4, 0, 0], ..Default::default() };
+
+			assert_noop!(
+				submit_with_witness(Origin::signed(99), solution),
+				Error::<Runtime>::SignedQueueFull,
+			);
+		})
+	}
+
+	#[test]
+	fn weakest_is_removed_if_better_provided() {
+		ExtBuilder::default().build_and_execute(|| {
+			roll_to(15);
+			assert!(MultiPhase::current_phase().is_signed());
+
+			for s in 0..SignedMaxSubmissions::get() {
+				// score is always getting better
+				let solution = RawSolution { score: [(5 + s).into(), 0, 0], ..Default::default() };
+				assert_ok!(submit_with_witness(Origin::signed(99), solution));
+			}
+
+			assert_eq!(
+				MultiPhase::signed_submissions()
+					.iter()
+					.map(|s| s.solution.score[0])
+					.collect::<Vec<_>>(),
+				vec![5, 6, 7, 8, 9]
+			);
+
+			// better.
+			let solution = RawSolution { score: [20, 0, 0], ..Default::default() };
+			assert_ok!(submit_with_witness(Origin::signed(99), solution));
+
+			// the one with score 5 was rejected, the new one inserted.
+			assert_eq!(
+				MultiPhase::signed_submissions()
+					.iter()
+					.map(|s| s.solution.score[0])
+					.collect::<Vec<_>>(),
+				vec![6, 7, 8, 9, 20]
+			);
+		})
+	}
+
+	#[test]
+	fn replace_weakest_works() {
+		ExtBuilder::default().build_and_execute(|| {
+			roll_to(15);
+			assert!(MultiPhase::current_phase().is_signed());
+
+			for s in 1..SignedMaxSubmissions::get() {
+				// score is always getting better
+				let solution = RawSolution { score: [(5 + s).into(), 0, 0], ..Default::default() };
+				assert_ok!(submit_with_witness(Origin::signed(99), solution));
+			}
+
+			let solution = RawSolution { score: [4, 0, 0], ..Default::default() };
+			assert_ok!(submit_with_witness(Origin::signed(99), solution));
+
+			assert_eq!(
+				MultiPhase::signed_submissions()
+					.iter()
+					.map(|s| s.solution.score[0])
+					.collect::<Vec<_>>(),
+				vec![4, 6, 7, 8, 9],
+			);
+
+			// better.
+			let solution = RawSolution { score: [5, 0, 0], ..Default::default() };
+			assert_ok!(submit_with_witness(Origin::signed(99), solution));
+
+			// the one with score 5 was rejected, the new one inserted.
+			assert_eq!(
+				MultiPhase::signed_submissions()
+					.iter()
+					.map(|s| s.solution.score[0])
+					.collect::<Vec<_>>(),
+				vec![5, 6, 7, 8, 9],
+			);
+		})
+	}
+
+	#[test]
+	fn early_ejected_solution_gets_bond_back() {
+		ExtBuilder::default().signed_deposit(2, 0, 0).build_and_execute(|| {
+			roll_to(15);
+			assert!(MultiPhase::current_phase().is_signed());
+
+			for s in 0..SignedMaxSubmissions::get() {
+				// score is always getting better
+				let solution = RawSolution { score: [(5 + s).into(), 0, 0], ..Default::default() };
+				assert_ok!(submit_with_witness(Origin::signed(99), solution));
+			}
+
+			assert_eq!(balances(&99).1, 2 * 5);
+			assert_eq!(balances(&999).1, 0);
+
+			// better.
+			let solution = RawSolution { score: [20, 0, 0], ..Default::default() };
+			assert_ok!(submit_with_witness(Origin::signed(999), solution));
+
+			// got one bond back.
+			assert_eq!(balances(&99).1, 2 * 4);
+			assert_eq!(balances(&999).1, 2);
+		})
+	}
+
+	#[test]
+	fn equally_good_solution_is_not_accepted() {
+		ExtBuilder::default().signed_max_submission(3).build_and_execute(|| {
+			roll_to(15);
+			assert!(MultiPhase::current_phase().is_signed());
+
+			for i in 0..SignedMaxSubmissions::get() {
+				let solution = RawSolution { score: [(5 + i).into(), 0, 0], ..Default::default() };
+				assert_ok!(submit_with_witness(Origin::signed(99), solution));
+			}
+			assert_eq!(
+				MultiPhase::signed_submissions()
+					.iter()
+					.map(|s| s.solution.score[0])
+					.collect::<Vec<_>>(),
+				vec![5, 6, 7]
+			);
+
+			// 5 is not accepted. This will only cause processing with no benefit.
+			let solution = RawSolution { score: [5, 0, 0], ..Default::default() };
+			assert_noop!(
+				submit_with_witness(Origin::signed(99), solution),
+				Error::<Runtime>::SignedQueueFull,
+			);
+		})
+	}
+
+	#[test]
+	fn all_in_one_signed_submission_scenario() {
+		// a combination of:
+		// - good_solution_is_rewarded
+		// - bad_solution_is_slashed
+		// - suppressed_solution_gets_bond_back
+		ExtBuilder::default().build_and_execute(|| {
+			roll_to(15);
+			assert!(MultiPhase::current_phase().is_signed());
+
+			assert_eq!(balances(&99), (100, 0));
+			assert_eq!(balances(&999), (100, 0));
+			assert_eq!(balances(&9999), (100, 0));
+			let solution = raw_solution();
+
+			// submit a correct one.
+			assert_ok!(submit_with_witness(Origin::signed(99), solution.clone()));
+
+			// make the solution invalidly better and submit. This ought to be slashed.
+			let mut solution_999 = solution.clone();
+			solution_999.score[0] += 1;
+			assert_ok!(submit_with_witness(Origin::signed(999), solution_999));
+
+			// make the solution invalidly worse and submit. This ought to be suppressed and
+			// returned.
+			let mut solution_9999 = solution.clone();
+			solution_9999.score[0] -= 1;
+			assert_ok!(submit_with_witness(Origin::signed(9999), solution_9999));
+
+			assert_eq!(
+				MultiPhase::signed_submissions().iter().map(|x| x.who).collect::<Vec<_>>(),
+				vec![9999, 99, 999]
+			);
+
+			// _some_ good solution was stored.
+			assert!(MultiPhase::finalize_signed_phase().0);
+
+			// 99 is rewarded.
+			assert_eq!(balances(&99), (100 + 7, 0));
+			// 999 is slashed.
+			assert_eq!(balances(&999), (95, 0));
+			// 9999 gets everything back.
+			assert_eq!(balances(&9999), (100, 0));
+		})
+	}
+
+	#[test]
+	fn cannot_consume_too_much_future_weight() {
+		ExtBuilder::default().signed_weight(40).mock_weight_info(true).build_and_execute(|| {
+			roll_to(15);
+			assert!(MultiPhase::current_phase().is_signed());
+
+			let (solution, witness) = MultiPhase::mine_solution(2).unwrap();
+			let solution_weight = <Runtime as Config>::WeightInfo::feasibility_check(
+				witness.voters,
+				witness.targets,
+				solution.compact.voter_count() as u32,
+				solution.compact.unique_targets().len() as u32,
+			);
+			// default solution will have 5 edges (5 * 5 + 10)
+			assert_eq!(solution_weight, 35);
+			assert_eq!(solution.compact.voter_count(), 5);
+			assert_eq!(<Runtime as Config>::SignedMaxWeight::get(), 40);
+
+			assert_ok!(submit_with_witness(Origin::signed(99), solution.clone()));
+
+			<SignedMaxWeight>::set(30);
+
+			// note: resubmitting the same solution is technically okay as long as the queue has
+			// space.
+			assert_noop!(
+				submit_with_witness(Origin::signed(99), solution),
+				Error::<Runtime>::SignedTooMuchWeight,
+			);
+		})
+	}
+
+	#[test]
+	fn insufficient_deposit_doesnt_store_submission() {
+		ExtBuilder::default().build_and_execute(|| {
+			roll_to(15);
+			assert!(MultiPhase::current_phase().is_signed());
+
+			let solution = raw_solution();
+
+			assert_eq!(balances(&123), (0, 0));
+			assert_noop!(
+				submit_with_witness(Origin::signed(123), solution),
+				Error::<Runtime>::SignedCannotPayDeposit,
+			);
+
+			assert_eq!(balances(&123), (0, 0));
+		})
+	}
+
+	// given a full queue, and a solution which _should_ be allowed in, but the proposer of this
+	// new solution has insufficient deposit, we should not modify storage at all
+	#[test]
+	fn insufficient_deposit_with_full_queue_works_properly() {
+		ExtBuilder::default().build_and_execute(|| {
+			roll_to(15);
+			assert!(MultiPhase::current_phase().is_signed());
+
+			for s in 0..SignedMaxSubmissions::get() {
+				// score is always getting better
+				let solution = RawSolution { score: [(5 + s).into(), 0, 0], ..Default::default() };
+				assert_ok!(submit_with_witness(Origin::signed(99), solution));
+			}
+
+			// this solution has a higher score than any in the queue
+			let solution = RawSolution {
+				score: [(5 + SignedMaxSubmissions::get()).into(), 0, 0],
+				..Default::default()
+			};
+
+			assert_eq!(balances(&123), (0, 0));
+			assert_noop!(
+				submit_with_witness(Origin::signed(123), solution),
+				Error::<Runtime>::SignedCannotPayDeposit,
+			);
+
+			assert_eq!(balances(&123), (0, 0));
+		})
+	}
+
+	#[test]
+	fn finalize_signed_phase_is_idempotent_given_no_submissions() {
+		ExtBuilder::default().build_and_execute(|| {
+			for block_number in 0..25 {
+				roll_to(block_number);
+
+				assert_eq!(SignedSubmissions::<Runtime>::decode_len().unwrap_or_default(), 0);
+				assert_storage_noop!(MultiPhase::finalize_signed_phase());
+			}
+		})
+	}
+
+	#[test]
+	fn finalize_signed_phase_is_idempotent_given_submissions() {
+		ExtBuilder::default().build_and_execute(|| {
+			roll_to(15);
+			assert!(MultiPhase::current_phase().is_signed());
+
+			let solution = raw_solution();
+
+			// submit a correct one.
+			assert_ok!(submit_with_witness(Origin::signed(99), solution.clone()));
+
+			// _some_ good solution was stored.
+			assert!(MultiPhase::finalize_signed_phase().0);
+
+			// calling it again doesn't change anything
+			assert_storage_noop!(MultiPhase::finalize_signed_phase());
+		})
+	}
+}
diff --git a/frame/election-provider-multi-phase/src/unsigned.rs b/frame/election-provider-multi-phase/src/unsigned.rs
index 543883fc035c..52ecae7afa5f 100644
--- a/frame/election-provider-multi-phase/src/unsigned.rs
+++ b/frame/election-provider-multi-phase/src/unsigned.rs
@@ -30,8 +30,10 @@ use sp_npos_elections::{
 	assignment_staked_to_ratio_normalized, is_score_better, seq_phragmen,
 };
 use sp_runtime::{
+	DispatchError,
+	SaturatedConversion,
 	offchain::storage::{MutateStorageError, StorageValueRef},
-	traits::TrailingZeroInput, SaturatedConversion
+	traits::TrailingZeroInput,
 };
 use sp_std::{cmp::Ordering, convert::TryFrom, vec::Vec};
 
@@ -57,7 +59,8 @@ pub type Assignment<T> = sp_npos_elections::Assignment<
 	CompactAccuracyOf<T>,
 >;
 
-/// The [`IndexAssignment`][sp_npos_elections::IndexAssignment] type specialized for a particular runtime `T`.
+/// The [`IndexAssignment`][sp_npos_elections::IndexAssignment] type specialized for a particular
+/// runtime `T`.
 pub type IndexAssignmentOf<T> = sp_npos_elections::IndexAssignmentOf<CompactOf<T>>;
 
 #[derive(Debug, Eq, PartialEq)]
@@ -69,7 +72,7 @@ pub enum MinerError {
 	/// Submitting a transaction to the pool failed.
 	PoolSubmissionFailed,
 	/// The pre-dispatch checks failed for the mined solution.
-	PreDispatchChecksFailed,
+	PreDispatchChecksFailed(DispatchError),
 	/// The solution generated from the miner is not feasible.
 	Feasibility(FeasibilityError),
 	/// Something went wrong fetching the lock.
@@ -234,7 +237,7 @@ impl<T: Config> Pallet<T> {
 	) -> Result<(), MinerError> {
 		Self::unsigned_pre_dispatch_checks(raw_solution).map_err(|err| {
 			log!(debug, "pre-dispatch checks failed for {} solution: {:?}", solution_type, err);
-			MinerError::PreDispatchChecksFailed
+			MinerError::PreDispatchChecksFailed(err)
 		})?;
 
 		Self::feasibility_check(raw_solution.clone(), ElectionCompute::Unsigned).map_err(|err| {
@@ -344,7 +347,11 @@ impl<T: Config> Pallet<T> {
 		// converting to `Compact`.
 		let mut index_assignments = sorted_assignments
 			.into_iter()
-			.map(|assignment| IndexAssignmentOf::<T>::new(&assignment, &voter_index, &target_index))
+			.map(|assignment| IndexAssignmentOf::<T>::new(
+				&assignment,
+				&voter_index,
+				&target_index,
+			))
 			.collect::<Result<Vec<_>, _>>()?;
 
 		// trim assignments list for weight and length.
@@ -416,7 +423,9 @@ impl<T: Config> Pallet<T> {
 			size,
 			max_weight,
 		);
-		let removing: usize = assignments.len().saturating_sub(maximum_allowed_voters.saturated_into());
+		let removing: usize = assignments.len().saturating_sub(
+			maximum_allowed_voters.saturated_into(),
+		);
 		log!(
 			debug,
 			"from {} assignments, truncating to {} for weight, removing {}",
@@ -464,7 +473,9 @@ impl<T: Config> Pallet<T> {
 			}
 		}
 		let maximum_allowed_voters =
-			if low < assignments.len() && encoded_size_of(&assignments[..low + 1])? <= max_allowed_length {
+			if low < assignments.len() &&
+				encoded_size_of(&assignments[..low + 1])? <= max_allowed_length
+			{
 				low + 1
 			} else {
 				low
@@ -674,6 +685,15 @@ mod max_weight {
 		fn on_initialize_open_unsigned_without_snapshot() -> Weight {
 			unreachable!()
 		}
+		fn finalize_signed_phase_accept_solution() -> Weight {
+			unreachable!()
+		}
+		fn finalize_signed_phase_reject_solution() -> Weight {
+			unreachable!()
+		}
+		fn submit(c: u32) -> Weight {
+			unreachable!()
+		}
 		fn submit_unsigned(v: u32, t: u32, a: u32, d: u32) -> Weight {
 			(0 * v + 0 * t + 1000 * a + 0 * d) as Weight
 		}
@@ -994,7 +1014,11 @@ mod tests {
 
 			assert_eq!(
 				MultiPhase::mine_check_save_submit().unwrap_err(),
-				MinerError::PreDispatchChecksFailed,
+				MinerError::PreDispatchChecksFailed(DispatchError::Module{
+					index: 2,
+					error: 1,
+					message: Some("PreDispatchWrongWinnerCount"),
+				}),
 			);
 		})
 	}
@@ -1199,11 +1223,17 @@ mod tests {
 			let mut storage = StorageValueRef::persistent(&OFFCHAIN_LAST_BLOCK);
 			storage.clear();
 
-			assert!(!ocw_solution_exists::<Runtime>(), "no solution should be present before we mine one");
+			assert!(
+				!ocw_solution_exists::<Runtime>(),
+				"no solution should be present before we mine one",
+			);
 
 			// creates and cache a solution
 			MultiPhase::offchain_worker(25);
-			assert!(ocw_solution_exists::<Runtime>(), "a solution must be cached after running the worker");
+			assert!(
+				ocw_solution_exists::<Runtime>(),
+				"a solution must be cached after running the worker",
+			);
 
 			// after an election, the solution must be cleared
 			// we don't actually care about the result of the election
@@ -1329,10 +1359,15 @@ mod tests {
 				_ => panic!("bad call: unexpected submission"),
 			};
 
-			// Custom(3) maps to PreDispatchChecksFailed
-			let pre_dispatch_check_error = TransactionValidityError::Invalid(InvalidTransaction::Custom(3));
+			// Custom(7) maps to PreDispatchChecksFailed
+			let pre_dispatch_check_error = TransactionValidityError::Invalid(
+				InvalidTransaction::Custom(7),
+			);
 			assert_eq!(
-				<MultiPhase as ValidateUnsigned>::validate_unsigned(TransactionSource::Local, &call)
+				<MultiPhase as ValidateUnsigned>::validate_unsigned(
+					TransactionSource::Local,
+					&call,
+				)
 					.unwrap_err(),
 				pre_dispatch_check_error,
 			);
@@ -1359,7 +1394,11 @@ mod tests {
 			let compact_clone = compact.clone();
 
 			// when
-			MultiPhase::trim_assignments_length(encoded_len, &mut assignments, encoded_size_of).unwrap();
+			MultiPhase::trim_assignments_length(
+				encoded_len,
+				&mut assignments,
+				encoded_size_of,
+			).unwrap();
 
 			// then
 			let compact = CompactOf::<Runtime>::try_from(assignments.as_slice()).unwrap();
@@ -1383,7 +1422,11 @@ mod tests {
 			let compact_clone = compact.clone();
 
 			// when
-			MultiPhase::trim_assignments_length(encoded_len as u32 - 1, &mut assignments, encoded_size_of).unwrap();
+			MultiPhase::trim_assignments_length(
+				encoded_len as u32 - 1,
+				&mut assignments,
+				encoded_size_of,
+			).unwrap();
 
 			// then
 			let compact = CompactOf::<Runtime>::try_from(assignments.as_slice()).unwrap();
@@ -1414,7 +1457,11 @@ mod tests {
 				.unwrap();
 
 			// when
-			MultiPhase::trim_assignments_length(encoded_len - 1, &mut assignments, encoded_size_of).unwrap();
+			MultiPhase::trim_assignments_length(
+				encoded_len - 1,
+				&mut assignments,
+				encoded_size_of,
+			).unwrap();
 
 			// then
 			assert_eq!(assignments.len(), count - 1, "we must have removed exactly one assignment");
diff --git a/frame/election-provider-multi-phase/src/weights.rs b/frame/election-provider-multi-phase/src/weights.rs
index 51b99bc962d4..6a245ebb5125 100644
--- a/frame/election-provider-multi-phase/src/weights.rs
+++ b/frame/election-provider-multi-phase/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_election_provider_multi_phase
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-06-20, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -47,8 +47,11 @@ pub trait WeightInfo {
 	fn on_initialize_nothing() -> Weight;
 	fn on_initialize_open_signed() -> Weight;
 	fn on_initialize_open_unsigned_with_snapshot() -> Weight;
+	fn finalize_signed_phase_accept_solution() -> Weight;
+	fn finalize_signed_phase_reject_solution() -> Weight;
 	fn on_initialize_open_unsigned_without_snapshot() -> Weight;
 	fn elect_queued() -> Weight;
+	fn submit(c: u32, ) -> Weight;
 	fn submit_unsigned(v: u32, t: u32, a: u32, d: u32, ) -> Weight;
 	fn feasibility_check(v: u32, t: u32, a: u32, d: u32, ) -> Weight;
 }
@@ -57,52 +60,69 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn on_initialize_nothing() -> Weight {
-		(24_579_000 as Weight)
+		(33_392_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(8 as Weight))
 	}
 	fn on_initialize_open_signed() -> Weight {
-		(87_463_000 as Weight)
+		(115_659_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(10 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn on_initialize_open_unsigned_with_snapshot() -> Weight {
-		(87_381_000 as Weight)
+		(114_970_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(10 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
+	fn finalize_signed_phase_accept_solution() -> Weight {
+		(51_442_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+	}
+	fn finalize_signed_phase_reject_solution() -> Weight {
+		(23_160_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
 	fn on_initialize_open_unsigned_without_snapshot() -> Weight {
-		(18_489_000 as Weight)
+		(24_101_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn elect_queued() -> Weight {
-		(6_038_989_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(6 as Weight))
+		(6_153_604_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(8 as Weight))
+	}
+	fn submit(c: u32, ) -> Weight {
+		(78_972_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((308_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn submit_unsigned(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 12_000
-			.saturating_add((3_480_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((3_572_000 as Weight).saturating_mul(v as Weight))
 			// Standard Error: 42_000
-			.saturating_add((194_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((23_000 as Weight).saturating_mul(t as Weight))
 			// Standard Error: 12_000
-			.saturating_add((10_498_000 as Weight).saturating_mul(a as Weight))
+			.saturating_add((11_529_000 as Weight).saturating_mul(a as Weight))
 			// Standard Error: 63_000
-			.saturating_add((3_074_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add((3_333_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn feasibility_check(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 7_000
-			.saturating_add((3_481_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 24_000
-			.saturating_add((385_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((3_647_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 23_000
+			.saturating_add((390_000 as Weight).saturating_mul(t as Weight))
 			// Standard Error: 7_000
-			.saturating_add((8_538_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 36_000
-			.saturating_add((3_322_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add((9_614_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 35_000
+			.saturating_add((3_405_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 	}
 }
@@ -110,52 +130,69 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn on_initialize_nothing() -> Weight {
-		(24_579_000 as Weight)
+		(33_392_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(8 as Weight))
 	}
 	fn on_initialize_open_signed() -> Weight {
-		(87_463_000 as Weight)
+		(115_659_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn on_initialize_open_unsigned_with_snapshot() -> Weight {
-		(87_381_000 as Weight)
+		(114_970_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
+	fn finalize_signed_phase_accept_solution() -> Weight {
+		(51_442_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+	}
+	fn finalize_signed_phase_reject_solution() -> Weight {
+		(23_160_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
 	fn on_initialize_open_unsigned_without_snapshot() -> Weight {
-		(18_489_000 as Weight)
+		(24_101_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn elect_queued() -> Weight {
-		(6_038_989_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(6 as Weight))
+		(6_153_604_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
+	}
+	fn submit(c: u32, ) -> Weight {
+		(78_972_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((308_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn submit_unsigned(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 12_000
-			.saturating_add((3_480_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((3_572_000 as Weight).saturating_mul(v as Weight))
 			// Standard Error: 42_000
-			.saturating_add((194_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((23_000 as Weight).saturating_mul(t as Weight))
 			// Standard Error: 12_000
-			.saturating_add((10_498_000 as Weight).saturating_mul(a as Weight))
+			.saturating_add((11_529_000 as Weight).saturating_mul(a as Weight))
 			// Standard Error: 63_000
-			.saturating_add((3_074_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add((3_333_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn feasibility_check(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 7_000
-			.saturating_add((3_481_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 24_000
-			.saturating_add((385_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((3_647_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 23_000
+			.saturating_add((390_000 as Weight).saturating_mul(t as Weight))
 			// Standard Error: 7_000
-			.saturating_add((8_538_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 36_000
-			.saturating_add((3_322_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add((9_614_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 35_000
+			.saturating_add((3_405_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 	}
 }
diff --git a/frame/support/src/storage/bounded_btree_map.rs b/frame/support/src/storage/bounded_btree_map.rs
index 8c50557618ee..0c1994d63a35 100644
--- a/frame/support/src/storage/bounded_btree_map.rs
+++ b/frame/support/src/storage/bounded_btree_map.rs
@@ -39,7 +39,8 @@ pub struct BoundedBTreeMap<K, V, S>(BTreeMap<K, V>, PhantomData<S>);
 
 impl<K, V, S> Decode for BoundedBTreeMap<K, V, S>
 where
-	BTreeMap<K, V>: Decode,
+	K: Decode + Ord,
+	V: Decode,
 	S: Get<u32>,
 {
 	fn decode<I: codec::Input>(input: &mut I) -> Result<Self, codec::Error> {
@@ -115,14 +116,15 @@ where
 		self.0.get_mut(key)
 	}
 
-	/// Exactly the same semantics as [`BTreeMap::insert`], but returns an `Err` (and is a noop) if the
-	/// new length of the map exceeds `S`.
-	pub fn try_insert(&mut self, key: K, value: V) -> Result<(), ()> {
-		if self.len() < Self::bound() {
-			self.0.insert(key, value);
-			Ok(())
+	/// Exactly the same semantics as [`BTreeMap::insert`], but returns an `Err` (and is a noop) if
+	/// the new length of the map exceeds `S`.
+	///
+	/// In the `Err` case, returns the inserted pair so it can be further used without cloning.
+	pub fn try_insert(&mut self, key: K, value: V) -> Result<Option<V>, (K, V)> {
+		if self.len() < Self::bound() || self.0.contains_key(&key) {
+			Ok(self.0.insert(key, value))
 		} else {
-			Err(())
+			Err((key, value))
 		}
 	}
 
@@ -407,4 +409,50 @@ pub mod test {
 			Err("BoundedBTreeMap exceeds its limit".into()),
 		);
 	}
+
+	#[test]
+	fn unequal_eq_impl_insert_works() {
+		// given a struct with a strange notion of equality
+		#[derive(Debug)]
+		struct Unequal(u32, bool);
+
+		impl PartialEq for Unequal {
+			fn eq(&self, other: &Self) -> bool {
+				self.0 == other.0
+			}
+		}
+		impl Eq for Unequal {}
+
+		impl Ord for Unequal {
+			fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+				self.0.cmp(&other.0)
+			}
+		}
+
+		impl PartialOrd for Unequal {
+			fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+				Some(self.cmp(other))
+			}
+		}
+
+		let mut map = BoundedBTreeMap::<Unequal, u32, Four>::new();
+
+		// when the set is full
+
+		for i in 0..4 {
+			map.try_insert(Unequal(i, false), i).unwrap();
+		}
+
+		// can't insert a new distinct member
+		map.try_insert(Unequal(5, false), 5).unwrap_err();
+
+		// but _can_ insert a distinct member which compares equal, though per the documentation,
+		// neither the set length nor the actual member are changed, but the value is
+		map.try_insert(Unequal(0, true), 6).unwrap();
+		assert_eq!(map.len(), 4);
+		let (zero_key, zero_value) = map.get_key_value(&Unequal(0, true)).unwrap();
+		assert_eq!(zero_key.0, 0);
+		assert_eq!(zero_key.1, false);
+		assert_eq!(*zero_value, 6);
+	}
 }
diff --git a/frame/support/src/storage/bounded_btree_set.rs b/frame/support/src/storage/bounded_btree_set.rs
index f551a3cbfa38..10c2300a08a0 100644
--- a/frame/support/src/storage/bounded_btree_set.rs
+++ b/frame/support/src/storage/bounded_btree_set.rs
@@ -39,7 +39,7 @@ pub struct BoundedBTreeSet<T, S>(BTreeSet<T>, PhantomData<S>);
 
 impl<T, S> Decode for BoundedBTreeSet<T, S>
 where
-	BTreeSet<T>: Decode,
+	T: Decode + Ord,
 	S: Get<u32>,
 {
 	fn decode<I: codec::Input>(input: &mut I) -> Result<Self, codec::Error> {
@@ -103,14 +103,15 @@ where
 		self.0.clear()
 	}
 
-	/// Exactly the same semantics as [`BTreeSet::insert`], but returns an `Err` (and is a noop) if the
-	/// new length of the set exceeds `S`.
-	pub fn try_insert(&mut self, item: T) -> Result<(), ()> {
-		if self.len() < Self::bound() {
-			self.0.insert(item);
-			Ok(())
+	/// Exactly the same semantics as [`BTreeSet::insert`], but returns an `Err` (and is a noop) if
+	/// the new length of the set exceeds `S`.
+	///
+	/// In the `Err` case, returns the inserted item so it can be further used without cloning.
+	pub fn try_insert(&mut self, item: T) -> Result<bool, T> {
+		if self.len() < Self::bound() || self.0.contains(&item) {
+			Ok(self.0.insert(item))
 		} else {
-			Err(())
+			Err(item)
 		}
 	}
 
@@ -393,4 +394,49 @@ pub mod test {
 			Err("BoundedBTreeSet exceeds its limit".into()),
 		);
 	}
+
+	#[test]
+	fn unequal_eq_impl_insert_works() {
+		// given a struct with a strange notion of equality
+		#[derive(Debug)]
+		struct Unequal(u32, bool);
+
+		impl PartialEq for Unequal {
+			fn eq(&self, other: &Self) -> bool {
+				self.0 == other.0
+			}
+		}
+		impl Eq for Unequal {}
+
+		impl Ord for Unequal {
+			fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+				self.0.cmp(&other.0)
+			}
+		}
+
+		impl PartialOrd for Unequal {
+			fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+				Some(self.cmp(other))
+			}
+		}
+
+		let mut set = BoundedBTreeSet::<Unequal, Four>::new();
+
+		// when the set is full
+
+		for i in 0..4 {
+			set.try_insert(Unequal(i, false)).unwrap();
+		}
+
+		// can't insert a new distinct member
+		set.try_insert(Unequal(5, false)).unwrap_err();
+
+		// but _can_ insert a distinct member which compares equal, though per the documentation,
+		// neither the set length nor the actual member are changed
+		set.try_insert(Unequal(0, true)).unwrap();
+		assert_eq!(set.len(), 4);
+		let zero_item = set.get(&Unequal(0, true)).unwrap();
+		assert_eq!(zero_item.0, 0);
+		assert_eq!(zero_item.1, false);
+	}
 }
diff --git a/primitives/npos-elections/compact/src/lib.rs b/primitives/npos-elections/compact/src/lib.rs
index e8cde8774453..0e9fbb34eea1 100644
--- a/primitives/npos-elections/compact/src/lib.rs
+++ b/primitives/npos-elections/compact/src/lib.rs
@@ -169,7 +169,7 @@ fn struct_def(
 		);
 		quote!{
 			#compact_impl
-			#[derive(Default, PartialEq, Eq, Clone, Debug)]
+			#[derive(Default, PartialEq, Eq, Clone, Debug, PartialOrd, Ord)]
 		}
 	} else {
 		// automatically derived.

From d1f905bad9eb6f8d4c3f434e8e2db2a23a0e8c1b Mon Sep 17 00:00:00 2001
From: Shinsaku Ashizawa <39494661+NoCtrlZ@users.noreply.github.com>
Date: Mon, 28 Jun 2021 19:02:31 +0900
Subject: [PATCH 0928/1194] change balance pallet reference (#9205)

---
 frame/balances/README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frame/balances/README.md b/frame/balances/README.md
index cbbfea75e684..93e424a89c72 100644
--- a/frame/balances/README.md
+++ b/frame/balances/README.md
@@ -2,9 +2,9 @@
 
 The Balances module provides functionality for handling accounts and balances.
 
-- [`balances::Trait`](https://docs.rs/pallet-balances/latest/pallet_balances/trait.Trait.html)
-- [`Call`](https://docs.rs/pallet-balances/latest/pallet_balances/enum.Call.html)
-- [`Module`](https://docs.rs/pallet-balances/latest/pallet_balances/struct.Module.html)
+- [`Config`](https://docs.rs/pallet-balances/latest/pallet_balances/pallet/trait.Config.html)
+- [`Call`](https://docs.rs/pallet-balances/latest/pallet_balances/pallet/enum.Call.html)
+- [`Pallet`](https://docs.rs/pallet-balances/latest/pallet_balances/pallet/struct.Pallet.html)
 
 ## Overview
 
@@ -113,7 +113,7 @@ fn update_ledger<T: Config>(
 
 ## Genesis config
 
-The Balances module depends on the [`GenesisConfig`](https://docs.rs/pallet-balances/latest/pallet_balances/struct.GenesisConfig.html).
+The Balances module depends on the [`GenesisConfig`](https://docs.rs/pallet-balances/latest/pallet_balances/pallet/struct.GenesisConfig.html).
 
 ## Assumptions
 

From 24b26b9cc0c5d8fcb81857b7d0f3815ad27a2b1a Mon Sep 17 00:00:00 2001
From: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
Date: Mon, 28 Jun 2021 13:45:01 +0200
Subject: [PATCH 0929/1194] move set_emergency_election_result before submit
 (#9215)

---
 .../election-provider-multi-phase/src/lib.rs  | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index 45e04a757f0b..e127e34d5572 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -884,6 +884,29 @@ pub mod pallet {
 			Ok(())
 		}
 
+		/// Set a solution in the queue, to be handed out to the client of this pallet in the next
+		/// call to `ElectionProvider::elect`.
+		///
+		/// This can only be set by `T::ForceOrigin`, and only when the phase is `Emergency`.
+		///
+		/// The solution is not checked for any feasibility and is assumed to be trustworthy, as any
+		/// feasibility check itself can in principle cause the election process to fail (due to
+		/// memory/weight constrains).
+		#[pallet::weight(T::DbWeight::get().reads_writes(1, 1))]
+		pub fn set_emergency_election_result(
+			origin: OriginFor<T>,
+			solution: ReadySolution<T::AccountId>,
+		) -> DispatchResult {
+			T::ForceOrigin::ensure_origin(origin)?;
+			ensure!(Self::current_phase().is_emergency(), <Error<T>>::CallNotAllowed);
+
+			// Note: we don't `rotate_round` at this point; the next call to
+			// `ElectionProvider::elect` will succeed and take care of that.
+
+			<QueuedSolution<T>>::put(solution);
+			Ok(())
+		}
+
 		/// Submit a solution for the signed phase.
 		///
 		/// The dispatch origin fo this call must be __signed__.
@@ -956,29 +979,6 @@ pub mod pallet {
 			Self::deposit_event(Event::SolutionStored(ElectionCompute::Signed, ejected_a_solution));
 			Ok(())
 		}
-
-		/// Set a solution in the queue, to be handed out to the client of this pallet in the next
-		/// call to `ElectionProvider::elect`.
-		///
-		/// This can only be set by `T::ForceOrigin`, and only when the phase is `Emergency`.
-		///
-		/// The solution is not checked for any feasibility and is assumed to be trustworthy, as any
-		/// feasibility check itself can in principle cause the election process to fail (due to
-		/// memory/weight constrains).
-		#[pallet::weight(T::DbWeight::get().reads_writes(1, 1))]
-		pub fn set_emergency_election_result(
-			origin: OriginFor<T>,
-			solution: ReadySolution<T::AccountId>,
-		) -> DispatchResult {
-			T::ForceOrigin::ensure_origin(origin)?;
-			ensure!(Self::current_phase().is_emergency(), <Error<T>>::CallNotAllowed);
-
-			// Note: we don't `rotate_round` at this point; the next call to
-			// `ElectionProvider::elect` will succeed and take care of that.
-
-			<QueuedSolution<T>>::put(solution);
-			Ok(())
-		}
 	}
 
 	#[pallet::event]

From c6240ce90083f9e8db94b6c33f81297c11534ea0 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Mon, 28 Jun 2021 08:54:24 -0400
Subject: [PATCH 0930/1194] Improve Staking Limits (#9193)

* only allow `chill_other` near threshold.

* improve test

* skip limit check for existing validators / nominators

* add `ChillThreshold`

* rename to `set` for consistent api

* more tests

* fix some line width
---
 frame/staking/src/benchmarking.rs |  15 +++-
 frame/staking/src/lib.rs          |  80 ++++++++++++++------
 frame/staking/src/tests.rs        | 121 ++++++++++++++++++++++++------
 frame/staking/src/weights.rs      |   6 +-
 4 files changed, 172 insertions(+), 50 deletions(-)

diff --git a/frame/staking/src/benchmarking.rs b/frame/staking/src/benchmarking.rs
index f7545b07c90a..ff7be272eec8 100644
--- a/frame/staking/src/benchmarking.rs
+++ b/frame/staking/src/benchmarking.rs
@@ -601,26 +601,33 @@ benchmarks! {
 		assert_eq!(targets.len() as u32, v);
 	}
 
-	update_staking_limits {
+	set_staking_limits {
 		// This function always does the same thing... just write to 4 storage items.
 	}: _(
 		RawOrigin::Root,
 		BalanceOf::<T>::max_value(),
 		BalanceOf::<T>::max_value(),
 		Some(u32::MAX),
-		Some(u32::MAX)
+		Some(u32::MAX),
+		Some(Percent::max_value())
 	) verify {
 		assert_eq!(MinNominatorBond::<T>::get(), BalanceOf::<T>::max_value());
 		assert_eq!(MinValidatorBond::<T>::get(), BalanceOf::<T>::max_value());
 		assert_eq!(MaxNominatorsCount::<T>::get(), Some(u32::MAX));
 		assert_eq!(MaxValidatorsCount::<T>::get(), Some(u32::MAX));
+		assert_eq!(ChillThreshold::<T>::get(), Some(Percent::from_percent(100)));
 	}
 
 	chill_other {
 		let (_, controller) = create_stash_controller::<T>(USER_SEED, 100, Default::default())?;
 		Staking::<T>::validate(RawOrigin::Signed(controller.clone()).into(), ValidatorPrefs::default())?;
-		Staking::<T>::update_staking_limits(
-			RawOrigin::Root.into(), BalanceOf::<T>::max_value(), BalanceOf::<T>::max_value(), None, None,
+		Staking::<T>::set_staking_limits(
+			RawOrigin::Root.into(),
+			BalanceOf::<T>::max_value(),
+			BalanceOf::<T>::max_value(),
+			Some(0),
+			Some(0),
+			Some(Percent::from_percent(0))
 		)?;
 		let caller = whitelisted_caller();
 	}: _(RawOrigin::Signed(caller), controller.clone())
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index ce1f5afc64c1..ec7da1be1871 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -1216,6 +1216,12 @@ pub mod pallet {
 	#[pallet::storage]
 	pub(crate) type StorageVersion<T: Config> = StorageValue<_, Releases, ValueQuery>;
 
+	/// The threshold for when users can start calling `chill_other` for other validators / nominators.
+	/// The threshold is compared to the actual number of validators / nominators (`CountFor*`) in
+	/// the system compared to the configured max (`Max*Count`).
+	#[pallet::storage]
+	pub(crate) type ChillThreshold<T: Config> = StorageValue<_, Percent, OptionQuery>;
+
 	#[pallet::genesis_config]
 	pub struct GenesisConfig<T: Config> {
 		pub history_depth: u32,
@@ -1714,16 +1720,19 @@ pub mod pallet {
 		pub fn validate(origin: OriginFor<T>, prefs: ValidatorPrefs) -> DispatchResult {
 			let controller = ensure_signed(origin)?;
 
-			// If this error is reached, we need to adjust the `MinValidatorBond` and start calling `chill_other`.
-			// Until then, we explicitly block new validators to protect the runtime.
-			if let Some(max_validators) = MaxValidatorsCount::<T>::get() {
-				ensure!(CounterForValidators::<T>::get() < max_validators, Error::<T>::TooManyValidators);
-			}
-
 			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
 			ensure!(ledger.active >= MinValidatorBond::<T>::get(), Error::<T>::InsufficientBond);
-
 			let stash = &ledger.stash;
+
+			// Only check limits if they are not already a validator.
+			if !Validators::<T>::contains_key(stash) {
+				// If this error is reached, we need to adjust the `MinValidatorBond` and start calling `chill_other`.
+				// Until then, we explicitly block new validators to protect the runtime.
+				if let Some(max_validators) = MaxValidatorsCount::<T>::get() {
+					ensure!(CounterForValidators::<T>::get() < max_validators, Error::<T>::TooManyValidators);
+				}
+			}
+
 			Self::do_remove_nominator(stash);
 			Self::do_add_validator(stash, prefs);
 			Ok(())
@@ -1755,16 +1764,19 @@ pub mod pallet {
 		) -> DispatchResult {
 			let controller = ensure_signed(origin)?;
 
-			// If this error is reached, we need to adjust the `MinNominatorBond` and start calling `chill_other`.
-			// Until then, we explicitly block new nominators to protect the runtime.
-			if let Some(max_nominators) = MaxNominatorsCount::<T>::get() {
-				ensure!(CounterForNominators::<T>::get() < max_nominators, Error::<T>::TooManyNominators);
-			}
-
 			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
 			ensure!(ledger.active >= MinNominatorBond::<T>::get(), Error::<T>::InsufficientBond);
-
 			let stash = &ledger.stash;
+
+			// Only check limits if they are not already a nominator.
+			if !Nominators::<T>::contains_key(stash) {
+				// If this error is reached, we need to adjust the `MinNominatorBond` and start calling `chill_other`.
+				// Until then, we explicitly block new nominators to protect the runtime.
+				if let Some(max_nominators) = MaxNominatorsCount::<T>::get() {
+					ensure!(CounterForNominators::<T>::get() < max_nominators, Error::<T>::TooManyNominators);
+				}
+			}
+
 			ensure!(!targets.is_empty(), Error::<T>::EmptyTargets);
 			ensure!(targets.len() <= T::MAX_NOMINATIONS as usize, Error::<T>::TooManyTargets);
 
@@ -2266,31 +2278,42 @@ pub mod pallet {
 		///
 		/// NOTE: Existing nominators and validators will not be affected by this update.
 		/// to kick people under the new limits, `chill_other` should be called.
-		#[pallet::weight(T::WeightInfo::update_staking_limits())]
-		pub fn update_staking_limits(
+		#[pallet::weight(T::WeightInfo::set_staking_limits())]
+		pub fn set_staking_limits(
 			origin: OriginFor<T>,
 			min_nominator_bond: BalanceOf<T>,
 			min_validator_bond: BalanceOf<T>,
 			max_nominator_count: Option<u32>,
 			max_validator_count: Option<u32>,
+			threshold: Option<Percent>,
 		) -> DispatchResult {
 			ensure_root(origin)?;
 			MinNominatorBond::<T>::set(min_nominator_bond);
 			MinValidatorBond::<T>::set(min_validator_bond);
 			MaxNominatorsCount::<T>::set(max_nominator_count);
 			MaxValidatorsCount::<T>::set(max_validator_count);
+			ChillThreshold::<T>::set(threshold);
 			Ok(())
 		}
 
-		/// Declare a `controller` as having no desire to either validator or nominate.
+		/// Declare a `controller` to stop participating as either a validator or nominator.
 		///
 		/// Effects will be felt at the beginning of the next era.
 		///
 		/// The dispatch origin for this call must be _Signed_, but can be called by anyone.
 		///
-		/// If the caller is the same as the controller being targeted, then no further checks
-		/// are enforced. However, this call can also be made by an third party user who witnesses
-		/// that this controller does not satisfy the minimum bond requirements to be in their role.
+		/// If the caller is the same as the controller being targeted, then no further checks are
+		/// enforced, and this function behaves just like `chill`.
+		///
+		/// If the caller is different than the controller being targeted, the following conditions
+		/// must be met:
+		/// * A `ChillThreshold` must be set and checked which defines how close to the max
+		///   nominators or validators we must reach before users can start chilling one-another.
+		/// * A `MaxNominatorCount` and `MaxValidatorCount` must be set which is used to determine
+		///   how close we are to the threshold.
+		/// * A `MinNominatorBond` and `MinValidatorBond` must be set and checked, which determines
+		///   if this is a person that should be chilled because they have not met the threshold
+		///   bond required.
 		///
 		/// This can be helpful if bond requirements are updated, and we need to remove old users
 		/// who do not satisfy these requirements.
@@ -2307,14 +2330,27 @@ pub mod pallet {
 			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
 			let stash = ledger.stash;
 
-			// If the caller is not the controller, we want to check that the minimum bond
-			// requirements are not satisfied, and thus we have reason to chill this user.
+			// In order for one user to chill another user, the following conditions must be met:
+			// * A `ChillThreshold` is set which defines how close to the max nominators or
+			//   validators we must reach before users can start chilling one-another.
+			// * A `MaxNominatorCount` and `MaxValidatorCount` which is used to determine how close
+			//   we are to the threshold.
+			// * A `MinNominatorBond` and `MinValidatorBond` which is the final condition checked to
+			//   determine this is a person that should be chilled because they have not met the
+			//   threshold bond required.
 			//
 			// Otherwise, if caller is the same as the controller, this is just like `chill`.
 			if caller != controller {
+				let threshold = ChillThreshold::<T>::get().ok_or(Error::<T>::CannotChillOther)?;
 				let min_active_bond = if Nominators::<T>::contains_key(&stash) {
+					let max_nominator_count = MaxNominatorsCount::<T>::get().ok_or(Error::<T>::CannotChillOther)?;
+					let current_nominator_count = CounterForNominators::<T>::get();
+					ensure!(threshold * max_nominator_count < current_nominator_count, Error::<T>::CannotChillOther);
 					MinNominatorBond::<T>::get()
 				} else if Validators::<T>::contains_key(&stash) {
+					let max_validator_count = MaxValidatorsCount::<T>::get().ok_or(Error::<T>::CannotChillOther)?;
+					let current_validator_count = CounterForValidators::<T>::get();
+					ensure!(threshold * max_validator_count < current_validator_count, Error::<T>::CannotChillOther);
 					MinValidatorBond::<T>::get()
 				} else {
 					Zero::zero()
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index e314a70399fd..bbb0d5522fcc 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -4050,12 +4050,18 @@ mod election_data_provider {
 				// 500 is not enough for any role
 				assert_ok!(Staking::bond(Origin::signed(3), 4, 500, RewardDestination::Controller));
 				assert_noop!(Staking::nominate(Origin::signed(4), vec![1]), Error::<Test>::InsufficientBond);
-				assert_noop!(Staking::validate(Origin::signed(4), ValidatorPrefs::default()), Error::<Test>::InsufficientBond);
+				assert_noop!(
+					Staking::validate(Origin::signed(4), ValidatorPrefs::default()),
+					Error::<Test>::InsufficientBond,
+				);
 
 				// 1000 is enough for nominator
 				assert_ok!(Staking::bond_extra(Origin::signed(3), 500));
 				assert_ok!(Staking::nominate(Origin::signed(4), vec![1]));
-				assert_noop!(Staking::validate(Origin::signed(4), ValidatorPrefs::default()), Error::<Test>::InsufficientBond);
+				assert_noop!(
+					Staking::validate(Origin::signed(4), ValidatorPrefs::default()),
+					Error::<Test>::InsufficientBond,
+				);
 
 				// 1500 is enough for validator
 				assert_ok!(Staking::bond_extra(Origin::signed(3), 500));
@@ -4083,24 +4089,80 @@ mod election_data_provider {
 			.min_nominator_bond(1_000)
 			.min_validator_bond(1_500)
 			.build_and_execute(|| {
-				// Nominator
-				assert_ok!(Staking::bond(Origin::signed(1), 2, 1000, RewardDestination::Controller));
-				assert_ok!(Staking::nominate(Origin::signed(2), vec![1]));
+				for i in 0 .. 15 {
+					let a = 4 * i;
+					let b = 4 * i + 1;
+					let c = 4 * i + 2;
+					let d = 4 * i + 3;
+					Balances::make_free_balance_be(&a, 100_000);
+					Balances::make_free_balance_be(&b, 100_000);
+					Balances::make_free_balance_be(&c, 100_000);
+					Balances::make_free_balance_be(&d, 100_000);
+
+					// Nominator
+					assert_ok!(Staking::bond(Origin::signed(a), b, 1000, RewardDestination::Controller));
+					assert_ok!(Staking::nominate(Origin::signed(b), vec![1]));
+
+					// Validator
+					assert_ok!(Staking::bond(Origin::signed(c), d, 1500, RewardDestination::Controller));
+					assert_ok!(Staking::validate(Origin::signed(d), ValidatorPrefs::default()));
+				}
 
-				// Validator
-				assert_ok!(Staking::bond(Origin::signed(3), 4, 1500, RewardDestination::Controller));
-				assert_ok!(Staking::validate(Origin::signed(4), ValidatorPrefs::default()));
+				// To chill other users, we need to:
+				// * Set a minimum bond amount
+				// * Set a limit
+				// * Set a threshold
+				//
+				// If any of these are missing, we do not have enough information to allow the
+				// `chill_other` to succeed from one user to another.
 
 				// Can't chill these users
-				assert_noop!(Staking::chill_other(Origin::signed(1), 2), Error::<Test>::CannotChillOther);
-				assert_noop!(Staking::chill_other(Origin::signed(1), 4), Error::<Test>::CannotChillOther);
-
-				// Change the minimum bond
-				assert_ok!(Staking::update_staking_limits(Origin::root(), 1_500, 2_000, None, None));
+				assert_noop!(Staking::chill_other(Origin::signed(1337), 1), Error::<Test>::CannotChillOther);
+				assert_noop!(Staking::chill_other(Origin::signed(1337), 3), Error::<Test>::CannotChillOther);
+
+				// Change the minimum bond... but no limits.
+				assert_ok!(Staking::set_staking_limits(Origin::root(), 1_500, 2_000, None, None, None));
+
+				// Still can't chill these users
+				assert_noop!(Staking::chill_other(Origin::signed(1337), 1), Error::<Test>::CannotChillOther);
+				assert_noop!(Staking::chill_other(Origin::signed(1337), 3), Error::<Test>::CannotChillOther);
+
+				// Add limits, but no threshold
+				assert_ok!(Staking::set_staking_limits(Origin::root(), 1_500, 2_000, Some(10), Some(10), None));
+
+				// Still can't chill these users
+				assert_noop!(Staking::chill_other(Origin::signed(1337), 1), Error::<Test>::CannotChillOther);
+				assert_noop!(Staking::chill_other(Origin::signed(1337), 3), Error::<Test>::CannotChillOther);
+
+				// Add threshold, but no limits
+				assert_ok!(Staking::set_staking_limits(
+					Origin::root(), 1_500, 2_000, None, None, Some(Percent::from_percent(0))
+				));
+
+				// Still can't chill these users
+				assert_noop!(Staking::chill_other(Origin::signed(1337), 1), Error::<Test>::CannotChillOther);
+				assert_noop!(Staking::chill_other(Origin::signed(1337), 3), Error::<Test>::CannotChillOther);
+
+				// Add threshold and limits
+				assert_ok!(Staking::set_staking_limits(
+					Origin::root(), 1_500, 2_000, Some(10), Some(10), Some(Percent::from_percent(75))
+				));
+
+				// 16 people total because tests start with 1 active one
+				assert_eq!(CounterForNominators::<Test>::get(), 16);
+				assert_eq!(CounterForValidators::<Test>::get(), 16);
+
+				// Users can now be chilled down to 7 people, so we try to remove 9 of them (starting with 16)
+				for i in 6 .. 15 {
+					let b = 4 * i + 1;
+					let d = 4 * i + 3;
+					assert_ok!(Staking::chill_other(Origin::signed(1337), b));
+					assert_ok!(Staking::chill_other(Origin::signed(1337), d));
+				}
 
-				// Users can now be chilled
-				assert_ok!(Staking::chill_other(Origin::signed(1), 2));
-				assert_ok!(Staking::chill_other(Origin::signed(1), 4));
+				// Cant go lower.
+				assert_noop!(Staking::chill_other(Origin::signed(1337), 1), Error::<Test>::CannotChillOther);
+				assert_noop!(Staking::chill_other(Origin::signed(1337), 3), Error::<Test>::CannotChillOther);
 			})
 	}
 
@@ -4114,36 +4176,53 @@ mod election_data_provider {
 
 			// Change the maximums
 			let max = 10;
-			assert_ok!(Staking::update_staking_limits(Origin::root(), 10, 10, Some(max), Some(max)));
+			assert_ok!(Staking::set_staking_limits(
+				Origin::root(), 10, 10, Some(max), Some(max), Some(Percent::from_percent(0))
+			));
 
 			// can create `max - validator_count` validators
-			assert_ok!(testing_utils::create_validators::<Test>(max - validator_count, 100));
+			let mut some_existing_validator = AccountId::default();
+			for i in 0 .. max - validator_count {
+				let (_, controller) = testing_utils::create_stash_controller::<Test>(
+					i + 10_000_000, 100, RewardDestination::Controller,
+				).unwrap();
+				assert_ok!(Staking::validate(Origin::signed(controller), ValidatorPrefs::default()));
+				some_existing_validator = controller;
+			}
 
 			// but no more
 			let (_, last_validator) = testing_utils::create_stash_controller::<Test>(
 				1337, 100, RewardDestination::Controller,
 			).unwrap();
+
 			assert_noop!(
 				Staking::validate(Origin::signed(last_validator), ValidatorPrefs::default()),
 				Error::<Test>::TooManyValidators,
 			);
 
 			// same with nominators
+			let mut some_existing_nominator = AccountId::default();
 			for i in 0 .. max - nominator_count {
 				let (_, controller) = testing_utils::create_stash_controller::<Test>(
-					i + 10_000_000, 100, RewardDestination::Controller,
+					i + 20_000_000, 100, RewardDestination::Controller,
 				).unwrap();
 				assert_ok!(Staking::nominate(Origin::signed(controller), vec![1]));
+				some_existing_nominator = controller;
 			}
 
 			// one more is too many
 			let (_, last_nominator) = testing_utils::create_stash_controller::<Test>(
-				20_000_000, 100, RewardDestination::Controller,
+				30_000_000, 100, RewardDestination::Controller,
 			).unwrap();
 			assert_noop!(Staking::nominate(Origin::signed(last_nominator), vec![1]), Error::<Test>::TooManyNominators);
 
+			// Re-nominate works fine
+			assert_ok!(Staking::nominate(Origin::signed(some_existing_nominator), vec![1]));
+			// Re-validate works fine
+			assert_ok!(Staking::validate(Origin::signed(some_existing_validator), ValidatorPrefs::default()));
+
 			// No problem when we set to `None` again
-			assert_ok!(Staking::update_staking_limits(Origin::root(), 10, 10, None, None));
+			assert_ok!(Staking::set_staking_limits(Origin::root(), 10, 10, None, None, None));
 			assert_ok!(Staking::nominate(Origin::signed(last_nominator), vec![1]));
 			assert_ok!(Staking::validate(Origin::signed(last_validator), ValidatorPrefs::default()));
 		})
diff --git a/frame/staking/src/weights.rs b/frame/staking/src/weights.rs
index dbf5f3fc82bf..cf14e8b22362 100644
--- a/frame/staking/src/weights.rs
+++ b/frame/staking/src/weights.rs
@@ -70,7 +70,7 @@ pub trait WeightInfo {
 	fn new_era(v: u32, n: u32, ) -> Weight;
 	fn get_npos_voters(v: u32, n: u32, s: u32, ) -> Weight;
 	fn get_npos_targets(v: u32, ) -> Weight;
-	fn update_staking_limits() -> Weight;
+	fn set_staking_limits() -> Weight;
 	fn chill_other() -> Weight;
 }
 
@@ -252,7 +252,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(v as Weight)))
 	}
-	fn update_staking_limits() -> Weight {
+	fn set_staking_limits() -> Weight {
 		(5_028_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
@@ -440,7 +440,7 @@ impl WeightInfo for () {
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(v as Weight)))
 	}
-	fn update_staking_limits() -> Weight {
+	fn set_staking_limits() -> Weight {
 		(5_028_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}

From 682e5e8efbc3aa92d3431f2c1357c33b998950b3 Mon Sep 17 00:00:00 2001
From: Joshy Orndorff <JoshOrndorff@users.noreply.github.com>
Date: Mon, 28 Jun 2021 16:13:19 -0400
Subject: [PATCH 0931/1194] Add public accessor for tip amount (#9219)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add public accessor for tip amount.

* Update frame/transaction-payment/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 frame/transaction-payment/src/lib.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
index af1fcc5bfeaa..416439e7f200 100644
--- a/frame/transaction-payment/src/lib.rs
+++ b/frame/transaction-payment/src/lib.rs
@@ -525,6 +525,11 @@ impl<T: Config> ChargeTransactionPayment<T> where
 		Self(fee)
 	}
 
+	/// Returns the tip as being choosen by the transaction sender.
+	pub fn tip(&self) -> BalanceOf<T> {
+		self.0
+	}
+
 	fn withdraw_fee(
 		&self,
 		who: &T::AccountId,

From 3355dbcdb36b52266d363b91c1dede36202be782 Mon Sep 17 00:00:00 2001
From: Shinsaku Ashizawa <39494661+NoCtrlZ@users.noreply.github.com>
Date: Tue, 29 Jun 2021 16:26:27 +0900
Subject: [PATCH 0932/1194] change reference trait to config (#9224)

---
 frame/assets/README.md             | 4 ++--
 frame/atomic-swap/README.md        | 2 +-
 frame/aura/README.md               | 2 +-
 frame/democracy/README.md          | 2 +-
 frame/elections-phragmen/README.md | 2 +-
 frame/example/README.md            | 2 +-
 frame/identity/README.md           | 2 +-
 frame/im-online/README.md          | 2 +-
 frame/multisig/README.md           | 2 +-
 frame/nicks/README.md              | 2 +-
 frame/proxy/README.md              | 2 +-
 frame/recovery/README.md           | 2 +-
 frame/scheduler/README.md          | 2 +-
 frame/scored-pool/README.md        | 2 +-
 frame/session/README.md            | 2 +-
 frame/society/README.md            | 2 +-
 frame/staking/README.md            | 8 ++++----
 frame/sudo/README.md               | 2 +-
 frame/system/README.md             | 2 +-
 frame/timestamp/README.md          | 6 +++---
 frame/utility/README.md            | 2 +-
 frame/vesting/README.md            | 2 +-
 22 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/frame/assets/README.md b/frame/assets/README.md
index f8583a5c91d7..2a62a457943f 100644
--- a/frame/assets/README.md
+++ b/frame/assets/README.md
@@ -11,9 +11,9 @@ with a fixed supply, including:
 * Asset Transfer
 * Asset Destruction
 
-To use it in your runtime, you need to implement the assets [`assets::Trait`](https://docs.rs/pallet-assets/latest/pallet_assets/trait.Trait.html).
+To use it in your runtime, you need to implement the assets [`assets::Config`](https://docs.rs/pallet-assets/latest/pallet_assets/pallet/trait.Config.html).
 
-The supported dispatchable functions are documented in the [`assets::Call`](https://docs.rs/pallet-assets/latest/pallet_assets/enum.Call.html) enum.
+The supported dispatchable functions are documented in the [`assets::Call`](https://docs.rs/pallet-assets/latest/pallet_assets/pallet/enum.Call.html) enum.
 
 ### Terminology
 
diff --git a/frame/atomic-swap/README.md b/frame/atomic-swap/README.md
index 5dd502095d79..888a64ec7e06 100644
--- a/frame/atomic-swap/README.md
+++ b/frame/atomic-swap/README.md
@@ -2,7 +2,7 @@
 
 A module for atomically sending funds.
 
-- [`atomic_swap::Trait`](https://docs.rs/pallet-atomic-swap/latest/pallet_atomic_swap/trait.Trait.html)
+- [`atomic_swap::Config`](https://docs.rs/pallet-atomic-swap/latest/pallet_atomic_swap/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-atomic-swap/latest/pallet_atomic_swap/enum.Call.html)
 - [`Module`](https://docs.rs/pallet-atomic-swap/latest/pallet_atomic_swap/struct.Module.html)
 
diff --git a/frame/aura/README.md b/frame/aura/README.md
index 73ed986dd734..89ea5010a887 100644
--- a/frame/aura/README.md
+++ b/frame/aura/README.md
@@ -1,6 +1,6 @@
 # Aura Module
 
-- [`aura::Trait`](https://docs.rs/pallet-aura/latest/pallet_aura/trait.Trait.html)
+- [`aura::Config`](https://docs.rs/pallet-aura/latest/pallet_aura/pallet/trait.Config.html)
 - [`Module`](https://docs.rs/pallet-aura/latest/pallet_aura/struct.Module.html)
 
 ## Overview
diff --git a/frame/democracy/README.md b/frame/democracy/README.md
index 6a390cc048e1..bbc5f1c65586 100644
--- a/frame/democracy/README.md
+++ b/frame/democracy/README.md
@@ -1,6 +1,6 @@
 # Democracy Pallet
 
-- [`democracy::Trait`](https://docs.rs/pallet-democracy/latest/pallet_democracy/trait.Trait.html)
+- [`democracy::Config`](https://docs.rs/pallet-democracy/latest/pallet_democracy/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-democracy/latest/pallet_democracy/enum.Call.html)
 
 ## Overview
diff --git a/frame/elections-phragmen/README.md b/frame/elections-phragmen/README.md
index 8c5940ea2d78..26b3f260da56 100644
--- a/frame/elections-phragmen/README.md
+++ b/frame/elections-phragmen/README.md
@@ -60,7 +60,7 @@ being re-elected at the end of each round.
 
 ### Module Information
 
-- [`election_sp_phragmen::Trait`](https://docs.rs/pallet-elections-phragmen/latest/pallet_elections_phragmen/trait.Trait.html)
+- [`election_sp_phragmen::Config`](https://docs.rs/pallet-elections-phragmen/latest/pallet_elections_phragmen/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-elections-phragmen/latest/pallet_elections_phragmen/enum.Call.html)
 - [`Module`](https://docs.rs/pallet-elections-phragmen/latest/pallet_elections_phragmen/struct.Module.html)
 
diff --git a/frame/example/README.md b/frame/example/README.md
index 46a0d076a969..e06dee78c3f8 100644
--- a/frame/example/README.md
+++ b/frame/example/README.md
@@ -46,7 +46,7 @@ Copy and paste this template from frame/example/src/lib.rs into file
 // Include the following links that shows what trait needs to be implemented to use the pallet
 // and the supported dispatchables that are documented in the Call enum.
 
-- \[`<INSERT_CUSTOM_PALLET_NAME>::Trait`](https://docs.rs/pallet-example/latest/pallet_example/trait.Trait.html)
+- \[`<INSERT_CUSTOM_PALLET_NAME>::Config`](https://docs.rs/pallet-example/latest/pallet_example/trait.Config.html)
 - \[`Call`](https://docs.rs/pallet-example/latest/pallet_example/enum.Call.html)
 - \[`Module`](https://docs.rs/pallet-example/latest/pallet_example/struct.Module.html)
 
diff --git a/frame/identity/README.md b/frame/identity/README.md
index 38e16d4dd490..a67c259e2537 100644
--- a/frame/identity/README.md
+++ b/frame/identity/README.md
@@ -1,6 +1,6 @@
 # Identity Module
 
-- [`identity::Trait`](https://docs.rs/pallet-identity/latest/pallet_identity/trait.Trait.html)
+- [`identity::Config`](https://docs.rs/pallet-identity/latest/pallet_identity/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-identity/latest/pallet_identity/enum.Call.html)
 
 ## Overview
diff --git a/frame/im-online/README.md b/frame/im-online/README.md
index a2ed5edc906a..46b2268f18b1 100644
--- a/frame/im-online/README.md
+++ b/frame/im-online/README.md
@@ -13,7 +13,7 @@ and includes the recent best block number of the local validators chain as well
 as the `NetworkState`.
 It is submitted as an Unsigned Transaction via off-chain workers.
 
-- [`im_online::Trait`](https://docs.rs/pallet-im-online/latest/pallet_im_online/trait.Trait.html)
+- [`im_online::Config`](https://docs.rs/pallet-im-online/latest/pallet_im_online/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-im-online/latest/pallet_im_online/enum.Call.html)
 - [`Module`](https://docs.rs/pallet-im-online/latest/pallet_im_online/struct.Module.html)
 
diff --git a/frame/multisig/README.md b/frame/multisig/README.md
index a18ef74163d0..4eab00d10820 100644
--- a/frame/multisig/README.md
+++ b/frame/multisig/README.md
@@ -1,7 +1,7 @@
 # Multisig Module
 A module for doing multisig dispatch.
 
-- [`multisig::Trait`](https://docs.rs/pallet-multisig/latest/pallet_multisig/trait.Trait.html)
+- [`multisig::Config`](https://docs.rs/pallet-multisig/latest/pallet_multisig/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-multisig/latest/pallet_multisig/enum.Call.html)
 
 ## Overview
diff --git a/frame/nicks/README.md b/frame/nicks/README.md
index 766108470bed..a2a897b044f1 100644
--- a/frame/nicks/README.md
+++ b/frame/nicks/README.md
@@ -1,6 +1,6 @@
 # Nicks Module
 
-- [`nicks::Trait`](https://docs.rs/pallet-nicks/latest/pallet_nicks/trait.Trait.html)
+- [`nicks::Config`](https://docs.rs/pallet-nicks/latest/pallet_nicks/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-nicks/latest/pallet_nicks/enum.Call.html)
 
 ## Overview
diff --git a/frame/proxy/README.md b/frame/proxy/README.md
index 20c4d2bf20b8..2eb83fab6d72 100644
--- a/frame/proxy/README.md
+++ b/frame/proxy/README.md
@@ -6,7 +6,7 @@ The accounts to which permission is delegated may be requied to announce the act
 wish to execute some duration prior to execution happens. In this case, the target account may
 reject the announcement and in doing so, veto the execution.
 
-- [`proxy::Trait`](https://docs.rs/pallet-proxy/latest/pallet_proxy/trait.Trait.html)
+- [`proxy::Config`](https://docs.rs/pallet-proxy/latest/pallet_proxy/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-proxy/latest/pallet_proxy/enum.Call.html)
 
 ## Overview
diff --git a/frame/recovery/README.md b/frame/recovery/README.md
index c45df2c666af..31416c65c46a 100644
--- a/frame/recovery/README.md
+++ b/frame/recovery/README.md
@@ -1,6 +1,6 @@
 # Recovery Pallet
 
-- [`recovery::Trait`](https://docs.rs/pallet-recovery/latest/pallet_recovery/trait.Trait.html)
+- [`recovery::Config`](https://docs.rs/pallet-recovery/latest/pallet_recovery/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-recovery/latest/pallet_recovery/enum.Call.html)
 
 ## Overview
diff --git a/frame/scheduler/README.md b/frame/scheduler/README.md
index 3d07818b15d5..9a209031d740 100644
--- a/frame/scheduler/README.md
+++ b/frame/scheduler/README.md
@@ -1,7 +1,7 @@
 # Scheduler
 A module for scheduling dispatches.
 
-- [`scheduler::Trait`](https://docs.rs/pallet-scheduler/latest/pallet_scheduler/trait.Trait.html)
+- [`scheduler::Config`](https://docs.rs/pallet-scheduler/latest/pallet_scheduler/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-scheduler/latest/pallet_scheduler/enum.Call.html)
 - [`Module`](https://docs.rs/pallet-scheduler/latest/pallet_scheduler/struct.Module.html)
 
diff --git a/frame/scored-pool/README.md b/frame/scored-pool/README.md
index 8f7198a5e11d..bf20124edf52 100644
--- a/frame/scored-pool/README.md
+++ b/frame/scored-pool/README.md
@@ -20,7 +20,7 @@ time. If an entity is currently a member, this results in removal
 from the `Pool` and `Members`; the entity is immediately replaced
 by the next highest scoring candidate in the pool, if available.
 
-- [`scored_pool::Trait`](https://docs.rs/pallet-scored-pool/latest/pallet_scored_pool/trait.Trait.html)
+- [`scored_pool::Trait`](https://docs.rs/pallet-scored-pool/latest/pallet_scored_pool/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-scored-pool/latest/pallet_scored_pool/enum.Call.html)
 - [`Module`](https://docs.rs/pallet-scored-pool/latest/pallet_scored_pool/struct.Module.html)
 
diff --git a/frame/session/README.md b/frame/session/README.md
index e1f8b7f8e023..c47b5610de09 100644
--- a/frame/session/README.md
+++ b/frame/session/README.md
@@ -3,7 +3,7 @@
 The Session module allows validators to manage their session keys, provides a function for changing
 the session length, and handles session rotation.
 
-- [`session::Trait`](https://docs.rs/pallet-session/latest/pallet_session/trait.Trait.html)
+- [`session::Trait`](https://docs.rs/pallet-session/latest/pallet_session/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-session/latest/pallet_session/enum.Call.html)
 - [`Module`](https://docs.rs/pallet-session/latest/pallet_session/struct.Module.html)
 
diff --git a/frame/society/README.md b/frame/society/README.md
index a25940f636de..809986186642 100644
--- a/frame/society/README.md
+++ b/frame/society/README.md
@@ -1,6 +1,6 @@
 # Society Module
 
-- [`society::Trait`](https://docs.rs/pallet-society/latest/pallet_society/trait.Trait.html)
+- [`society::Config`](https://docs.rs/pallet-society/latest/pallet_society/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-society/latest/pallet_society/enum.Call.html)
 
 ## Overview
diff --git a/frame/staking/README.md b/frame/staking/README.md
index a379d0a7ad5e..072353b1a586 100644
--- a/frame/staking/README.md
+++ b/frame/staking/README.md
@@ -2,7 +2,7 @@
 
 The Staking module is used to manage funds at stake by network maintainers.
 
-- [`staking::Trait`](https://docs.rs/pallet-staking/latest/pallet_staking/trait.Trait.html)
+- [`staking::Config`](https://docs.rs/pallet-staking/latest/pallet_staking/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html)
 - [`Module`](https://docs.rs/pallet-staking/latest/pallet_staking/struct.Module.html)
 
@@ -157,7 +157,7 @@ decl_module! {
 ### Era payout
 
 The era payout is computed using yearly inflation curve defined at
-[`T::RewardCurve`](https://docs.rs/pallet-staking/latest/pallet_staking/trait.Trait.html#associatedtype.RewardCurve) as such:
+[`T::RewardCurve`](https://docs.rs/pallet-staking/latest/pallet_staking/trait.Config.html#associatedtype.RewardCurve) as such:
 
 ```nocompile
 staker_payout = yearly_inflation(npos_token_staked / total_tokens) * total_tokens / era_per_year
@@ -168,7 +168,7 @@ This payout is used to reward stakers as defined in next section
 remaining_payout = max_yearly_inflation * total_tokens / era_per_year - staker_payout
 ```
 The remaining reward is send to the configurable end-point
-[`T::RewardRemainder`](https://docs.rs/pallet-staking/latest/pallet_staking/trait.Trait.html#associatedtype.RewardRemainder).
+[`T::RewardRemainder`](https://docs.rs/pallet-staking/latest/pallet_staking/trait.Config.html#associatedtype.RewardRemainder).
 
 ### Reward Calculation
 
@@ -214,7 +214,7 @@ Any funds already placed into stash can be the target of the following operation
 
 The controller account can free a portion (or all) of the funds using the
 [`unbond`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.unbond) call. Note that the funds are not immediately
-accessible. Instead, a duration denoted by [`BondingDuration`](https://docs.rs/pallet-staking/latest/pallet_staking/trait.Trait.html#associatedtype.BondingDuration)
+accessible. Instead, a duration denoted by [`BondingDuration`](https://docs.rs/pallet-staking/latest/pallet_staking/trait.Config.html#associatedtype.BondingDuration)
 (in number of eras) must pass until the funds can actually be removed. Once the
 `BondingDuration` is over, the [`withdraw_unbonded`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.withdraw_unbonded)
 call can be used to actually withdraw the funds.
diff --git a/frame/sudo/README.md b/frame/sudo/README.md
index 95ca7ce88d97..ac7de01615f3 100644
--- a/frame/sudo/README.md
+++ b/frame/sudo/README.md
@@ -1,6 +1,6 @@
 # Sudo Module
 
-- [`sudo::Trait`](https://docs.rs/pallet-sudo/latest/pallet_sudo/trait.Trait.html)
+- [`sudo::Config`](https://docs.rs/pallet-sudo/latest/pallet_sudo/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-sudo/latest/pallet_sudo/enum.Call.html)
 
 ## Overview
diff --git a/frame/system/README.md b/frame/system/README.md
index a6da7c3816d2..bc7198d2c929 100644
--- a/frame/system/README.md
+++ b/frame/system/README.md
@@ -3,7 +3,7 @@
 The System module provides low-level access to core types and cross-cutting utilities.
 It acts as the base layer for other pallets to interact with the Substrate framework components.
 
-- [`system::Trait`](https://docs.rs/frame-system/latest/frame_system/trait.Trait.html)
+- [`system::Config`](https://docs.rs/frame-system/latest/frame_system/pallet/trait.Config.html)
 
 ## Overview
 
diff --git a/frame/timestamp/README.md b/frame/timestamp/README.md
index de1fb7439222..5f8388b04f82 100644
--- a/frame/timestamp/README.md
+++ b/frame/timestamp/README.md
@@ -2,9 +2,9 @@
 
 The Timestamp module provides functionality to get and set the on-chain time.
 
-- [`timestamp::Trait`](https://docs.rs/pallet-timestamp/latest/pallet_timestamp/trait.Trait.html)
-- [`Call`](https://docs.rs/pallet-timestamp/latest/pallet_timestamp/enum.Call.html)
-- [`Module`](https://docs.rs/pallet-timestamp/latest/pallet_timestamp/struct.Module.html)
+- [`timestamp::Config`](https://docs.rs/pallet-timestamp/latest/pallet_timestamp/pallet/trait.Config.html)
+- [`Call`](https://docs.rs/pallet-timestamp/latest/pallet_timestamp/pallet/enum.Call.html)
+- [`Pallet`](https://docs.rs/pallet-timestamp/latest/pallet_timestamp/pallet/struct.Pallet.html)
 
 ## Overview
 
diff --git a/frame/utility/README.md b/frame/utility/README.md
index f7c0923cd549..1beeb66733dd 100644
--- a/frame/utility/README.md
+++ b/frame/utility/README.md
@@ -1,7 +1,7 @@
 # Utility Module
 A stateless module with helpers for dispatch management which does no re-authentication.
 
-- [`utility::Trait`](https://docs.rs/pallet-utility/latest/pallet_utility/trait.Trait.html)
+- [`utility::Config`](https://docs.rs/pallet-utility/latest/pallet_utility/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-utility/latest/pallet_utility/enum.Call.html)
 
 ## Overview
diff --git a/frame/vesting/README.md b/frame/vesting/README.md
index 811b0dc44152..c3800eb994d4 100644
--- a/frame/vesting/README.md
+++ b/frame/vesting/README.md
@@ -1,6 +1,6 @@
 # Vesting Module
 
-- [`vesting::Trait`](https://docs.rs/pallet-vesting/latest/pallet_vesting/trait.Trait.html)
+- [`vesting::Config`](https://docs.rs/pallet-vesting/latest/pallet_vesting/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-vesting/latest/pallet_vesting/enum.Call.html)
 
 ## Overview

From 3f7d2b7658cb87de61b75e3a782d17abd8a915d1 Mon Sep 17 00:00:00 2001
From: Ashley <ashley.ruglys@gmail.com>
Date: Tue, 29 Jun 2021 10:23:39 +0200
Subject: [PATCH 0933/1194] Remove `txpool` as an export of
 `sc_transaction_pool`, exporting the used components instead. (#9217)

* Remove `txpool` as an export of `sc_transaction_pool`, exporting the used components instead.

* Fix tests
---
 client/consensus/manual-seal/src/lib.rs        | 16 ++++++++--------
 client/consensus/manual-seal/src/seal_block.rs |  8 ++++----
 client/service/src/config.rs                   |  2 +-
 client/service/src/lib.rs                      |  2 +-
 client/transaction-pool/src/lib.rs             |  8 ++++----
 client/transaction-pool/src/testing/pool.rs    |  1 -
 6 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/client/consensus/manual-seal/src/lib.rs b/client/consensus/manual-seal/src/lib.rs
index 2473ac848ca3..1e8c69a752ca 100644
--- a/client/consensus/manual-seal/src/lib.rs
+++ b/client/consensus/manual-seal/src/lib.rs
@@ -29,7 +29,7 @@ use sp_blockchain::HeaderBackend;
 use sp_inherents::CreateInherentDataProviders;
 use sp_runtime::{traits::Block as BlockT, Justifications, ConsensusEngineId};
 use sc_client_api::backend::{Backend as ClientBackend, Finalizer};
-use sc_transaction_pool::txpool;
+use sc_transaction_pool::{ChainApi, Pool};
 use std::{sync::Arc, marker::PhantomData};
 use prometheus_endpoint::Registry;
 
@@ -94,7 +94,7 @@ pub fn import_queue<Block, Transaction>(
 }
 
 /// Params required to start the instant sealing authorship task.
-pub struct ManualSealParams<B: BlockT, BI, E, C: ProvideRuntimeApi<B>, A: txpool::ChainApi, SC, CS, CIDP> {
+pub struct ManualSealParams<B: BlockT, BI, E, C: ProvideRuntimeApi<B>, A: ChainApi, SC, CS, CIDP> {
 	/// Block import instance for well. importing blocks.
 	pub block_import: BI,
 
@@ -105,7 +105,7 @@ pub struct ManualSealParams<B: BlockT, BI, E, C: ProvideRuntimeApi<B>, A: txpool
 	pub client: Arc<C>,
 
 	/// Shared reference to the transaction pool.
-	pub pool: Arc<txpool::Pool<A>>,
+	pub pool: Arc<Pool<A>>,
 
 	/// Stream<Item = EngineCommands>, Basically the receiving end of a channel for sending commands to
 	/// the authorship task.
@@ -122,7 +122,7 @@ pub struct ManualSealParams<B: BlockT, BI, E, C: ProvideRuntimeApi<B>, A: txpool
 }
 
 /// Params required to start the manual sealing authorship task.
-pub struct InstantSealParams<B: BlockT, BI, E, C: ProvideRuntimeApi<B>, A: txpool::ChainApi, SC, CIDP> {
+pub struct InstantSealParams<B: BlockT, BI, E, C: ProvideRuntimeApi<B>, A: ChainApi, SC, CIDP> {
 	/// Block import instance for well. importing blocks.
 	pub block_import: BI,
 
@@ -133,7 +133,7 @@ pub struct InstantSealParams<B: BlockT, BI, E, C: ProvideRuntimeApi<B>, A: txpoo
 	pub client: Arc<C>,
 
 	/// Shared reference to the transaction pool.
-	pub pool: Arc<txpool::Pool<A>>,
+	pub pool: Arc<Pool<A>>,
 
 	/// SelectChain strategy.
 	pub select_chain: SC,
@@ -159,7 +159,7 @@ pub async fn run_manual_seal<B, BI, CB, E, C, A, SC, CS, CIDP>(
 	}: ManualSealParams<B, BI, E, C, A, SC, CS, CIDP>
 )
 	where
-		A: txpool::ChainApi<Block=B> + 'static,
+		A: ChainApi<Block=B> + 'static,
 		B: BlockT + 'static,
 		BI: BlockImport<B, Error = sp_consensus::Error, Transaction = sp_api::TransactionFor<C, B>>
 			+ Send + Sync + 'static,
@@ -227,7 +227,7 @@ pub async fn run_instant_seal<B, BI, CB, E, C, A, SC, CIDP>(
 	}: InstantSealParams<B, BI, E, C, A, SC, CIDP>
 )
 	where
-		A: txpool::ChainApi<Block=B> + 'static,
+		A: ChainApi<Block=B> + 'static,
 		B: BlockT + 'static,
 		BI: BlockImport<B, Error = sp_consensus::Error, Transaction = sp_api::TransactionFor<C, B>>
 			+ Send + Sync + 'static,
@@ -275,7 +275,7 @@ mod tests {
 		AccountKeyring::*,
 		TestClientBuilder,
 	};
-	use sc_transaction_pool::{BasicPool, RevalidationType, txpool::Options};
+	use sc_transaction_pool::{BasicPool, RevalidationType, Options};
 	use substrate_test_runtime_transaction_pool::{TestApi, uxt};
 	use sp_transaction_pool::{TransactionPool, MaintainedTransactionPool, TransactionSource};
 	use sp_runtime::generic::BlockId;
diff --git a/client/consensus/manual-seal/src/seal_block.rs b/client/consensus/manual-seal/src/seal_block.rs
index 89da02ac4961..ca35bdecb44e 100644
--- a/client/consensus/manual-seal/src/seal_block.rs
+++ b/client/consensus/manual-seal/src/seal_block.rs
@@ -25,7 +25,7 @@ use sp_runtime::{
 	generic::BlockId,
 };
 use futures::prelude::*;
-use sc_transaction_pool::txpool;
+use sc_transaction_pool::{ChainApi, Pool};
 use sp_consensus::{
 	self, BlockImport, Environment, Proposer, ForkChoiceStrategy,
 	BlockImportParams, BlockOrigin, ImportResult, SelectChain, StateAction,
@@ -40,7 +40,7 @@ use sp_api::{ProvideRuntimeApi, TransactionFor};
 pub const MAX_PROPOSAL_DURATION: u64 = 10;
 
 /// params for sealing a new block
-pub struct SealBlockParams<'a, B: BlockT, BI, SC, C: ProvideRuntimeApi<B>, E, P: txpool::ChainApi, CIDP> {
+pub struct SealBlockParams<'a, B: BlockT, BI, SC, C: ProvideRuntimeApi<B>, E, P: ChainApi, CIDP> {
 	/// if true, empty blocks(without extrinsics) will be created.
 	/// otherwise, will return Error::EmptyTransactionPool.
 	pub create_empty: bool,
@@ -51,7 +51,7 @@ pub struct SealBlockParams<'a, B: BlockT, BI, SC, C: ProvideRuntimeApi<B>, E, P:
 	/// sender to report errors/success to the rpc.
 	pub sender: rpc::Sender<CreatedBlock<<B as BlockT>::Hash>>,
 	/// transaction pool
-	pub pool: Arc<txpool::Pool<P>>,
+	pub pool: Arc<Pool<P>>,
 	/// header backend
 	pub client: Arc<C>,
 	/// Environment trait object for creating a proposer
@@ -90,7 +90,7 @@ pub async fn seal_block<B, BI, SC, C, E, P, CIDP>(
 	C: HeaderBackend<B> + ProvideRuntimeApi<B>,
 	E: Environment<B>,
 	E::Proposer: Proposer<B, Transaction = TransactionFor<C, B>>,
-	P: txpool::ChainApi<Block = B>,
+	P: ChainApi<Block = B>,
 	SC: SelectChain<B>,
 	TransactionFor<C, B>: 'static,
 	CIDP: CreateInherentDataProviders<B, ()>,
diff --git a/client/service/src/config.rs b/client/service/src/config.rs
index c91cf0a4ef5c..be14b4e322e7 100644
--- a/client/service/src/config.rs
+++ b/client/service/src/config.rs
@@ -32,7 +32,7 @@ pub use sc_executor::WasmExecutionMethod;
 pub use sc_client_api::execution_extensions::{ExecutionStrategies, ExecutionStrategy};
 
 use std::{io, future::Future, path::{PathBuf, Path}, pin::Pin, net::SocketAddr, sync::Arc};
-pub use sc_transaction_pool::txpool::Options as TransactionPoolOptions;
+pub use sc_transaction_pool::Options as TransactionPoolOptions;
 use sc_chain_spec::ChainSpec;
 use sp_core::crypto::SecretString;
 pub use sc_telemetry::TelemetryEndpoints;
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index c8ac03ee0e36..cb0f6c023372 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -65,7 +65,7 @@ pub use sc_chain_spec::{
 	NoExtension, ChainType,
 };
 pub use sp_transaction_pool::{TransactionPool, InPoolTransaction, error::IntoPoolError};
-pub use sc_transaction_pool::txpool::Options as TransactionPoolOptions;
+pub use sc_transaction_pool::Options as TransactionPoolOptions;
 pub use sc_rpc::Metadata as RpcMetadata;
 pub use sc_executor::NativeExecutionDispatch;
 #[doc(hidden)]
diff --git a/client/transaction-pool/src/lib.rs b/client/transaction-pool/src/lib.rs
index 15c75a554daa..7dd9414e9f7f 100644
--- a/client/transaction-pool/src/lib.rs
+++ b/client/transaction-pool/src/lib.rs
@@ -31,7 +31,7 @@ pub mod error;
 #[cfg(test)]
 pub mod testing;
 
-pub use sc_transaction_graph as txpool;
+pub use sc_transaction_graph::{ChainApi, Options, Pool};
 pub use crate::api::{FullChainApi, LightChainApi};
 
 use std::{collections::{HashMap, HashSet}, sync::Arc, pin::Pin, convert::TryInto};
@@ -48,7 +48,7 @@ use sp_transaction_pool::{
 	TransactionStatusStreamFor, MaintainedTransactionPool, PoolFuture, ChainEvent,
 	TransactionSource,
 };
-use sc_transaction_graph::{ChainApi, ExtrinsicHash};
+use sc_transaction_graph::{IsValidator, ExtrinsicHash};
 use wasm_timer::Instant;
 
 use prometheus_endpoint::Registry as PrometheusRegistry;
@@ -191,7 +191,7 @@ impl<PoolApi, Block> BasicPool<PoolApi, Block>
 	/// revalidation type.
 	pub fn with_revalidation_type(
 		options: sc_transaction_graph::Options,
-		is_validator: txpool::IsValidator,
+		is_validator: IsValidator,
 		pool_api: Arc<PoolApi>,
 		prometheus: Option<&PrometheusRegistry>,
 		revalidation_type: RevalidationType,
@@ -397,7 +397,7 @@ where
 	/// Create new basic transaction pool for a full node with the provided api.
 	pub fn new_full(
 		options: sc_transaction_graph::Options,
-		is_validator: txpool::IsValidator,
+		is_validator: IsValidator,
 		prometheus: Option<&PrometheusRegistry>,
 		spawner: impl SpawnEssentialNamed,
 		client: Arc<Client>,
diff --git a/client/transaction-pool/src/testing/pool.rs b/client/transaction-pool/src/testing/pool.rs
index 675a58cd4427..9232a1d13ad2 100644
--- a/client/transaction-pool/src/testing/pool.rs
+++ b/client/transaction-pool/src/testing/pool.rs
@@ -19,7 +19,6 @@
 use crate::*;
 use sp_transaction_pool::TransactionStatus;
 use futures::executor::{block_on, block_on_stream};
-use txpool::{self, Pool};
 use sp_runtime::{
 	generic::BlockId,
 	transaction_validity::{ValidTransaction, TransactionSource, InvalidTransaction},

From 8712b36e1391d8351ca75931a507667200cfb61a Mon Sep 17 00:00:00 2001
From: Miguel Hervas <miguel.hervas.lazaro@gmail.com>
Date: Wed, 30 Jun 2021 03:00:14 -0700
Subject: [PATCH 0934/1194] Prep for Altair - Add ss58 prefix (#9123)

* Prep for Altair - Add ss58 prefix

* fix indent

* fix indent
---
 ss58-registry.json | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/ss58-registry.json b/ss58-registry.json
index 4d818dfa5b3e..6d23cbce90f9 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -329,7 +329,7 @@
 			"prefix": 36,
 			"network": "centrifuge",
 			"displayName": "Centrifuge Chain",
-			"symbols": ["RAD"],
+			"symbols": ["CFG"],
 			"decimals": [18],
 			"standardAccount": "*25519",
 			"website": "https://centrifuge.io/"
@@ -522,7 +522,7 @@
 			"decimals": [18],
 			"standardAccount": "*25519",
 			"website": "https://polkafoundry.com"
-  	},
+		},
 		{
 			"prefix": 101,
 			"network": "origintrail-parachain",
@@ -532,6 +532,15 @@
 			"standardAccount": "secp256k1",
 			"website": "https://origintrail.io"
 		},
+		{
+			"prefix": 136,
+			"network": "altair",
+			"displayName": "Altair",
+			"symbols": ["AIR"],
+			"decimals": [18],
+			"standardAccount": "*25519",
+			"website": "https://centrifuge.io/"
+		},
 		{
 			"prefix": 252,
 			"network": "social-network",

From 631d4cdbcad438248c2597213918d8207d85bf6e Mon Sep 17 00:00:00 2001
From: Squirrel <gilescope@gmail.com>
Date: Wed, 30 Jun 2021 11:06:39 +0100
Subject: [PATCH 0935/1194] Move client only primitives to another dir (#9220)

* Move alloc primitive (not used in /pallets)

* Move to alternative location as not shared

* moved crates to different dir

* ren sp_chain_spec to sc_chain_spec_primatives

* merged sc-chain-spec and moved allocation up one.

* no no_std

* nudge

* Bump CI
---
 Cargo.lock                                    | 43 ++++++++-----------
 Cargo.toml                                    |  3 +-
 {primitives => client}/allocator/Cargo.toml   | 13 +++---
 {primitives => client}/allocator/README.md    |  2 +-
 {primitives => client}/allocator/src/error.rs |  8 ++--
 .../allocator/src/freeing_bump.rs             |  2 +-
 {primitives => client}/allocator/src/lib.rs   |  1 -
 client/chain-spec/Cargo.toml                  |  1 -
 client/chain-spec/src/lib.rs                  | 26 ++++++++++-
 client/executor/common/Cargo.toml             |  2 +-
 client/executor/common/src/error.rs           |  2 +-
 client/executor/runtime-test/Cargo.toml       |  4 +-
 client/executor/runtime-test/src/lib.rs       |  8 ----
 client/executor/wasmi/Cargo.toml              |  2 +-
 client/executor/wasmi/src/lib.rs              |  4 +-
 client/executor/wasmtime/Cargo.toml           |  2 +-
 client/executor/wasmtime/src/host.rs          |  2 +-
 .../executor/wasmtime/src/instance_wrapper.rs |  6 +--
 client/executor/wasmtime/src/runtime.rs       |  2 +-
 client/rpc-api/Cargo.toml                     |  2 +-
 client/rpc-api/src/system/helpers.rs          |  2 +-
 client/rpc-api/src/system/mod.rs              |  4 +-
 client/rpc/Cargo.toml                         |  2 +-
 client/rpc/src/system/mod.rs                  |  4 +-
 frame/identity/src/lib.rs                     |  3 +-
 primitives/chain-spec/Cargo.toml              | 14 ------
 primitives/chain-spec/README.md               |  3 --
 primitives/chain-spec/src/lib.rs              | 43 -------------------
 28 files changed, 76 insertions(+), 134 deletions(-)
 rename {primitives => client}/allocator/Cargo.toml (57%)
 rename {primitives => client}/allocator/README.md (76%)
 rename {primitives => client}/allocator/src/error.rs (79%)
 rename {primitives => client}/allocator/src/freeing_bump.rs (99%)
 rename {primitives => client}/allocator/src/lib.rs (95%)
 delete mode 100644 primitives/chain-spec/Cargo.toml
 delete mode 100644 primitives/chain-spec/README.md
 delete mode 100644 primitives/chain-spec/src/lib.rs

diff --git a/Cargo.lock b/Cargo.lock
index ee78c31645b4..737a762d88f0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6991,6 +6991,17 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "sc-allocator"
+version = "3.0.0"
+dependencies = [
+ "log",
+ "sp-core",
+ "sp-std",
+ "sp-wasm-interface",
+ "thiserror",
+]
+
 [[package]]
 name = "sc-authority-discovery"
 version = "0.9.0"
@@ -7079,7 +7090,6 @@ dependencies = [
  "sc-telemetry",
  "serde",
  "serde_json",
- "sp-chain-spec",
  "sp-consensus-babe",
  "sp-core",
  "sp-runtime",
@@ -7503,7 +7513,7 @@ dependencies = [
  "derive_more",
  "parity-scale-codec",
  "pwasm-utils",
- "sp-allocator",
+ "sc-allocator",
  "sp-core",
  "sp-maybe-compressed-blob",
  "sp-serializer",
@@ -7518,8 +7528,8 @@ version = "0.9.0"
 dependencies = [
  "log",
  "parity-scale-codec",
+ "sc-allocator",
  "sc-executor-common",
- "sp-allocator",
  "sp-core",
  "sp-runtime-interface",
  "sp-wasm-interface",
@@ -7536,9 +7546,9 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "parity-wasm 0.42.2",
+ "sc-allocator",
  "sc-executor-common",
  "scoped-tls",
- "sp-allocator",
  "sp-core",
  "sp-runtime-interface",
  "sp-wasm-interface",
@@ -7885,6 +7895,7 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.11.1",
  "sc-block-builder",
+ "sc-chain-spec",
  "sc-cli",
  "sc-client-api",
  "sc-executor",
@@ -7896,7 +7907,6 @@ dependencies = [
  "serde_json",
  "sp-api",
  "sp-blockchain",
- "sp-chain-spec",
  "sp-core",
  "sp-io",
  "sp-keystore",
@@ -7926,9 +7936,9 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "parking_lot 0.11.1",
+ "sc-chain-spec",
  "serde",
  "serde_json",
- "sp-chain-spec",
  "sp-core",
  "sp-rpc",
  "sp-runtime",
@@ -7958,7 +7968,7 @@ dependencies = [
 name = "sc-runtime-test"
 version = "2.0.0"
 dependencies = [
- "sp-allocator",
+ "sc-allocator",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -8665,17 +8675,6 @@ dependencies = [
  "sha-1 0.9.4",
 ]
 
-[[package]]
-name = "sp-allocator"
-version = "3.0.0"
-dependencies = [
- "log",
- "sp-core",
- "sp-std",
- "sp-wasm-interface",
- "thiserror",
-]
-
 [[package]]
 name = "sp-api"
 version = "3.0.0"
@@ -8828,14 +8827,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "sp-chain-spec"
-version = "3.0.0"
-dependencies = [
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "sp-consensus"
 version = "0.9.0"
diff --git a/Cargo.toml b/Cargo.toml
index f7552f0bbbc4..d73bf1b52de9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -49,6 +49,7 @@ members = [
 	"client/network/test",
 	"client/offchain",
 	"client/peerset",
+	"client/allocator",
 	"client/proposer-metrics",
 	"client/rpc",
 	"client/rpc-api",
@@ -129,7 +130,6 @@ members = [
 	"frame/uniques",
 	"frame/utility",
 	"frame/vesting",
-	"primitives/allocator",
 	"primitives/api",
 	"primitives/api/proc-macro",
 	"primitives/api/test",
@@ -141,7 +141,6 @@ members = [
 	"primitives/authorship",
 	"primitives/block-builder",
 	"primitives/blockchain",
-	"primitives/chain-spec",
 	"primitives/consensus/aura",
 	"primitives/consensus/babe",
 	"primitives/consensus/common",
diff --git a/primitives/allocator/Cargo.toml b/client/allocator/Cargo.toml
similarity index 57%
rename from primitives/allocator/Cargo.toml
rename to client/allocator/Cargo.toml
index 1c38cbbb9c26..e2fc69e26db1 100644
--- a/primitives/allocator/Cargo.toml
+++ b/client/allocator/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "sp-allocator"
+name = "sc-allocator"
 version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -7,18 +7,18 @@ license = "Apache-2.0"
 homepage = "https://substrate.dev"
 repository = "https://github.com/paritytech/substrate/"
 description = "Collection of allocator implementations."
-documentation = "https://docs.rs/sp-allocator"
+documentation = "https://docs.rs/sc-allocator"
 readme = "README.md"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-std = { version = "3.0.0", path = "../std", default-features = false }
-sp-core = { version = "3.0.0", path = "../core", default-features = false }
-sp-wasm-interface = { version = "3.0.0", path = "../wasm-interface", default-features = false }
+sp-std = { version = "3.0.0", path = "../../primitives/std", default-features = false }
+sp-core = { version = "3.0.0", path = "../../primitives/core", default-features = false }
+sp-wasm-interface = { version = "3.0.0", path = "../../primitives/wasm-interface", default-features = false }
 log = { version = "0.4.11", optional = true }
-thiserror = { version = "1.0.21", optional = true }
+thiserror = { version = "1.0.21" }
 
 [features]
 default = [ "std" ]
@@ -27,5 +27,4 @@ std = [
 	"sp-core/std",
 	"sp-wasm-interface/std",
 	"log",
-	"thiserror",
 ]
diff --git a/primitives/allocator/README.md b/client/allocator/README.md
similarity index 76%
rename from primitives/allocator/README.md
rename to client/allocator/README.md
index cd845e2b028e..b89348b4c695 100644
--- a/primitives/allocator/README.md
+++ b/client/allocator/README.md
@@ -1,6 +1,6 @@
 Collection of allocator implementations.
 
 This crate provides the following allocator implementations:
-- A freeing-bump allocator: [`FreeingBumpHeapAllocator`](https://docs.rs/sp-allocator/latest/sp_allocator/struct.FreeingBumpHeapAllocator.html)
+- A freeing-bump allocator: [`FreeingBumpHeapAllocator`](https://docs.rs/sc-allocator/latest/sc_allocator/struct.FreeingBumpHeapAllocator.html)
 
 License: Apache-2.0
\ No newline at end of file
diff --git a/primitives/allocator/src/error.rs b/client/allocator/src/error.rs
similarity index 79%
rename from primitives/allocator/src/error.rs
rename to client/allocator/src/error.rs
index 8464cd225d00..d28484d34f4c 100644
--- a/primitives/allocator/src/error.rs
+++ b/client/allocator/src/error.rs
@@ -17,15 +17,15 @@
 
 /// The error type used by the allocators.
 #[derive(sp_core::RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(thiserror::Error))]
+#[derive(thiserror::Error)]
 pub enum Error {
 	/// Someone tried to allocate more memory than the allowed maximum per allocation.
-	#[cfg_attr(feature = "std", error("Requested allocation size is too large"))]
+	#[error("Requested allocation size is too large")]
 	RequestedAllocationTooLarge,
 	/// Allocator run out of space.
-	#[cfg_attr(feature = "std", error("Allocator ran out of space"))]
+	#[error("Allocator ran out of space")]
 	AllocatorOutOfSpace,
 	/// Some other error occurred.
-	#[cfg_attr(feature = "std", error("Other: {0}"))]
+	#[error("Other: {0}")]
 	Other(&'static str)
 }
diff --git a/primitives/allocator/src/freeing_bump.rs b/client/allocator/src/freeing_bump.rs
similarity index 99%
rename from primitives/allocator/src/freeing_bump.rs
rename to client/allocator/src/freeing_bump.rs
index 36f5bb9c65c0..3e9b0c979036 100644
--- a/primitives/allocator/src/freeing_bump.rs
+++ b/client/allocator/src/freeing_bump.rs
@@ -495,7 +495,7 @@ impl Memory for [u8] {
 		let range =
 			heap_range(ptr, 8, self.len()).ok_or_else(|| error("write out of heap bounds"))?;
 		let bytes = val.to_le_bytes();
-		&mut self[range].copy_from_slice(&bytes[..]);
+		self[range].copy_from_slice(&bytes[..]);
 		Ok(())
 	}
 	fn size(&self) -> u32 {
diff --git a/primitives/allocator/src/lib.rs b/client/allocator/src/lib.rs
similarity index 95%
rename from primitives/allocator/src/lib.rs
rename to client/allocator/src/lib.rs
index 7d45fb5f368c..a82c7542199d 100644
--- a/primitives/allocator/src/lib.rs
+++ b/client/allocator/src/lib.rs
@@ -20,7 +20,6 @@
 //! This crate provides the following allocator implementations:
 //! - A freeing-bump allocator: [`FreeingBumpHeapAllocator`](freeing_bump::FreeingBumpHeapAllocator)
 
-#![cfg_attr(not(feature = "std"), no_std)]
 #![warn(missing_docs)]
 
 mod error;
diff --git a/client/chain-spec/Cargo.toml b/client/chain-spec/Cargo.toml
index 27850cc8400b..2eddec524cad 100644
--- a/client/chain-spec/Cargo.toml
+++ b/client/chain-spec/Cargo.toml
@@ -20,7 +20,6 @@ sp-core = { version = "3.0.0", path = "../../primitives/core" }
 serde = { version = "1.0.101", features = ["derive"] }
 serde_json = "1.0.41"
 sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
-sp-chain-spec = { version = "3.0.0", path = "../../primitives/chain-spec" }
 sc-telemetry = { version = "3.0.0", path = "../telemetry" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 sc-consensus-babe = { version = "0.9.0", path = "../consensus/babe" }
diff --git a/client/chain-spec/src/lib.rs b/client/chain-spec/src/lib.rs
index e75dafcfe025..1bfa1808ee55 100644
--- a/client/chain-spec/src/lib.rs
+++ b/client/chain-spec/src/lib.rs
@@ -115,7 +115,6 @@ pub use chain_spec::{
 };
 pub use extension::{Group, Fork, Forks, Extension, GetExtension, get_extension};
 pub use sc_chain_spec_derive::{ChainSpecExtension, ChainSpecGroup};
-pub use sp_chain_spec::{Properties, ChainType};
 
 use serde::{Serialize, de::DeserializeOwned};
 use sp_runtime::BuildStorage;
@@ -123,6 +122,31 @@ use sc_network::config::MultiaddrWithPeerId;
 use sc_telemetry::TelemetryEndpoints;
 use sp_core::storage::Storage;
 
+/// The type of a chain.
+///
+/// This can be used by tools to determine the type of a chain for displaying
+/// additional information or enabling additional features.
+#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
+pub enum ChainType {
+	/// A development chain that runs mainly on one node.
+	Development,
+	/// A local chain that runs locally on multiple nodes for testing purposes.
+	Local,
+	/// A live chain.
+	Live,
+	/// Some custom chain type.
+	Custom(String),
+}
+
+impl Default for ChainType {
+	fn default() -> Self {
+		Self::Live
+	}
+}
+
+/// Arbitrary properties defined in chain spec as a JSON object
+pub type Properties = serde_json::map::Map<String, serde_json::Value>;
+
 /// A set of traits for the runtime genesis config.
 pub trait RuntimeGenesis: Serialize + DeserializeOwned + BuildStorage {}
 impl<T: Serialize + DeserializeOwned + BuildStorage> RuntimeGenesis for T {}
diff --git a/client/executor/common/Cargo.toml b/client/executor/common/Cargo.toml
index cb238f3a96fb..75cfcd3d2d85 100644
--- a/client/executor/common/Cargo.toml
+++ b/client/executor/common/Cargo.toml
@@ -19,7 +19,7 @@ pwasm-utils = "0.18.0"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 wasmi = "0.9.0"
 sp-core = { version = "3.0.0", path = "../../../primitives/core" }
-sp-allocator = { version = "3.0.0", path = "../../../primitives/allocator" }
+sc-allocator = { version = "3.0.0", path = "../../allocator" }
 sp-wasm-interface = { version = "3.0.0", path = "../../../primitives/wasm-interface" }
 sp-maybe-compressed-blob = { version = "3.0.0", path = "../../../primitives/maybe-compressed-blob" }
 sp-serializer = { version = "3.0.0", path = "../../../primitives/serializer" }
diff --git a/client/executor/common/src/error.rs b/client/executor/common/src/error.rs
index 96329d168030..6ad4802e57a8 100644
--- a/client/executor/common/src/error.rs
+++ b/client/executor/common/src/error.rs
@@ -77,7 +77,7 @@ pub enum Error {
 	Other(String),
 
 	#[error(transparent)]
-	Allocator(#[from] sp_allocator::Error),
+	Allocator(#[from] sc_allocator::Error),
 
 	#[error("Host function {0} execution failed with: {1}")]
 	FunctionExecution(String, String),
diff --git a/client/executor/runtime-test/Cargo.toml b/client/executor/runtime-test/Cargo.toml
index 93ad463be16c..2f06556644ac 100644
--- a/client/executor/runtime-test/Cargo.toml
+++ b/client/executor/runtime-test/Cargo.toml
@@ -13,7 +13,7 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-allocator = { version = "3.0.0", default-features = false, path = "../../../primitives/allocator" }
+sc-allocator = { version = "3.0.0", default-features = false, path = "../../allocator" }
 sp-core = { version = "3.0.0", default-features = false, path = "../../../primitives/core" }
 sp-io = { version = "3.0.0", default-features = false, path = "../../../primitives/io" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
@@ -27,7 +27,7 @@ substrate-wasm-builder = { version = "4.0.0", path = "../../../utils/wasm-builde
 [features]
 default = [ "std" ]
 std = [
-	"sp-allocator/std",
+	"sc-allocator/std",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
diff --git a/client/executor/runtime-test/src/lib.rs b/client/executor/runtime-test/src/lib.rs
index 439d4f66b187..af0c9edcc32e 100644
--- a/client/executor/runtime-test/src/lib.rs
+++ b/client/executor/runtime-test/src/lib.rs
@@ -211,7 +211,6 @@ sp_core::wasm_export_functions! {
 		code
 	}
 
-
 	fn test_sandbox_get_global_val(code: Vec<u8>) -> i64 {
 		let env_builder = sp_sandbox::EnvironmentDefinitionBuilder::new();
 		let instance = if let Ok(i) = sp_sandbox::Instance::new(&code, &env_builder, &mut ()) {
@@ -227,12 +226,10 @@ sp_core::wasm_export_functions! {
 		}
 	}
 
-
 	fn test_offchain_index_set() {
 		sp_io::offchain_index::set(b"k", b"v");
 	}
 
-
 	fn test_offchain_local_storage() -> bool {
 		let kind = sp_core::offchain::StorageKind::PERSISTENT;
 		assert_eq!(sp_io::offchain::local_storage_get(kind, b"test"), None);
@@ -286,11 +283,6 @@ sp_core::wasm_export_functions! {
 		run().is_some()
 	}
 
-	// Just some test to make sure that `sp-allocator` compiles on `no_std`.
-	fn test_sp_allocator_compiles() {
-		sp_allocator::FreeingBumpHeapAllocator::new(0);
-	}
-
 	fn test_enter_span() -> u64 {
 		wasm_tracing::enter_span(Default::default())
 	}
diff --git a/client/executor/wasmi/Cargo.toml b/client/executor/wasmi/Cargo.toml
index 4c3054d5d10c..dbdf26b63d24 100644
--- a/client/executor/wasmi/Cargo.toml
+++ b/client/executor/wasmi/Cargo.toml
@@ -18,7 +18,7 @@ log = "0.4.8"
 wasmi = "0.9.0"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 sc-executor-common = { version = "0.9.0", path = "../common" }
+sc-allocator = { version = "3.0.0", path = "../../allocator" }
 sp-wasm-interface = { version = "3.0.0", path = "../../../primitives/wasm-interface" }
 sp-runtime-interface = { version = "3.0.0", path = "../../../primitives/runtime-interface" }
 sp-core = { version = "3.0.0", path = "../../../primitives/core" }
-sp-allocator = { version = "3.0.0", path = "../../../primitives/allocator" }
diff --git a/client/executor/wasmi/src/lib.rs b/client/executor/wasmi/src/lib.rs
index d4c9f4dc2e80..1bafa3949409 100644
--- a/client/executor/wasmi/src/lib.rs
+++ b/client/executor/wasmi/src/lib.rs
@@ -40,7 +40,7 @@ use sc_executor_common::runtime_blob::{RuntimeBlob, DataSegmentsSnapshot};
 
 struct FunctionExecutor<'a> {
 	sandbox_store: sandbox::Store<wasmi::FuncRef>,
-	heap: sp_allocator::FreeingBumpHeapAllocator,
+	heap: sc_allocator::FreeingBumpHeapAllocator,
 	memory: MemoryRef,
 	table: Option<TableRef>,
 	host_functions: &'a [&'static dyn Function],
@@ -59,7 +59,7 @@ impl<'a> FunctionExecutor<'a> {
 	) -> Result<Self, Error> {
 		Ok(FunctionExecutor {
 			sandbox_store: sandbox::Store::new(),
-			heap: sp_allocator::FreeingBumpHeapAllocator::new(heap_base),
+			heap: sc_allocator::FreeingBumpHeapAllocator::new(heap_base),
 			memory: m,
 			table: t,
 			host_functions,
diff --git a/client/executor/wasmtime/Cargo.toml b/client/executor/wasmtime/Cargo.toml
index 1e886d15beb1..bdaae49c24d5 100644
--- a/client/executor/wasmtime/Cargo.toml
+++ b/client/executor/wasmtime/Cargo.toml
@@ -23,7 +23,7 @@ sc-executor-common = { version = "0.9.0", path = "../common" }
 sp-wasm-interface = { version = "3.0.0", path = "../../../primitives/wasm-interface" }
 sp-runtime-interface = { version = "3.0.0", path = "../../../primitives/runtime-interface" }
 sp-core = { version = "3.0.0", path = "../../../primitives/core" }
-sp-allocator = { version = "3.0.0", path = "../../../primitives/allocator" }
+sc-allocator = { version = "3.0.0", path = "../../allocator" }
 wasmtime = "0.27.0"
 
 [dev-dependencies]
diff --git a/client/executor/wasmtime/src/host.rs b/client/executor/wasmtime/src/host.rs
index c1eb77ff81f3..3f5ac0560a6d 100644
--- a/client/executor/wasmtime/src/host.rs
+++ b/client/executor/wasmtime/src/host.rs
@@ -24,7 +24,7 @@ use crate::util;
 use std::{cell::RefCell, rc::Rc};
 use log::trace;
 use codec::{Encode, Decode};
-use sp_allocator::FreeingBumpHeapAllocator;
+use sc_allocator::FreeingBumpHeapAllocator;
 use sc_executor_common::error::Result;
 use sc_executor_common::sandbox::{self, SandboxCapabilities, SupervisorFuncIndex};
 use sp_core::sandbox as sandbox_primitives;
diff --git a/client/executor/wasmtime/src/instance_wrapper.rs b/client/executor/wasmtime/src/instance_wrapper.rs
index 866dbfb2e2bf..10c4926743cf 100644
--- a/client/executor/wasmtime/src/instance_wrapper.rs
+++ b/client/executor/wasmtime/src/instance_wrapper.rs
@@ -340,7 +340,7 @@ impl InstanceWrapper {
 
 			let range = util::checked_range(address.into(), data.len(), memory.len())
 				.ok_or_else(|| Error::Other("memory write is out of bounds".into()))?;
-			&mut memory[range].copy_from_slice(data);
+			memory[range].copy_from_slice(data);
 			Ok(())
 		}
 	}
@@ -351,7 +351,7 @@ impl InstanceWrapper {
 	/// to get more details.
 	pub fn allocate(
 		&self,
-		allocator: &mut sp_allocator::FreeingBumpHeapAllocator,
+		allocator: &mut sc_allocator::FreeingBumpHeapAllocator,
 		size: WordSize,
 	) -> Result<Pointer<u8>> {
 		unsafe {
@@ -368,7 +368,7 @@ impl InstanceWrapper {
 	/// Returns `Err` in case the given memory region cannot be deallocated.
 	pub fn deallocate(
 		&self,
-		allocator: &mut sp_allocator::FreeingBumpHeapAllocator,
+		allocator: &mut sc_allocator::FreeingBumpHeapAllocator,
 		ptr: Pointer<u8>,
 	) -> Result<()> {
 		unsafe {
diff --git a/client/executor/wasmtime/src/runtime.rs b/client/executor/wasmtime/src/runtime.rs
index 5018b11264d7..021377eeb20d 100644
--- a/client/executor/wasmtime/src/runtime.rs
+++ b/client/executor/wasmtime/src/runtime.rs
@@ -31,7 +31,7 @@ use sc_executor_common::{
 	runtime_blob::{DataSegmentsSnapshot, ExposedMutableGlobalsSet, GlobalsSnapshot, RuntimeBlob},
 	wasm_runtime::{WasmModule, WasmInstance, InvokeMethod},
 };
-use sp_allocator::FreeingBumpHeapAllocator;
+use sc_allocator::FreeingBumpHeapAllocator;
 use sp_runtime_interface::unpack_ptr_and_len;
 use sp_wasm_interface::{Function, Pointer, WordSize, Value};
 use wasmtime::{Engine, Store};
diff --git a/client/rpc-api/Cargo.toml b/client/rpc-api/Cargo.toml
index 662f4bd16fd4..87c4577c7280 100644
--- a/client/rpc-api/Cargo.toml
+++ b/client/rpc-api/Cargo.toml
@@ -25,7 +25,7 @@ parking_lot = "0.11.1"
 sp-core = { version = "3.0.0", path = "../../primitives/core" }
 sp-version = { version = "3.0.0", path = "../../primitives/version" }
 sp-runtime = { path = "../../primitives/runtime" , version = "3.0.0"}
-sp-chain-spec = { path = "../../primitives/chain-spec" , version = "3.0.0"}
+sc-chain-spec = { path = "../chain-spec" , version = "3.0.0"}
 serde = { version = "1.0.101", features = ["derive"] }
 serde_json = "1.0.41"
 sp-transaction-pool = { version = "3.0.0", path = "../../primitives/transaction-pool" }
diff --git a/client/rpc-api/src/system/helpers.rs b/client/rpc-api/src/system/helpers.rs
index c2fc807471f3..c8124d9c6752 100644
--- a/client/rpc-api/src/system/helpers.rs
+++ b/client/rpc-api/src/system/helpers.rs
@@ -20,7 +20,7 @@
 
 use std::fmt;
 use serde::{Serialize, Deserialize};
-use sp_chain_spec::{Properties, ChainType};
+use sc_chain_spec::{Properties, ChainType};
 
 /// Running node's static details.
 #[derive(Clone, Debug)]
diff --git a/client/rpc-api/src/system/mod.rs b/client/rpc-api/src/system/mod.rs
index 4252ef20ac22..e820fb2e702e 100644
--- a/client/rpc-api/src/system/mod.rs
+++ b/client/rpc-api/src/system/mod.rs
@@ -47,11 +47,11 @@ pub trait SystemApi<Hash, Number> {
 
 	/// Get the chain's type.
 	#[rpc(name = "system_chainType")]
-	fn system_type(&self) -> SystemResult<sp_chain_spec::ChainType>;
+	fn system_type(&self) -> SystemResult<sc_chain_spec::ChainType>;
 
 	/// Get a custom set of properties as a JSON object, defined in the chain spec.
 	#[rpc(name = "system_properties")]
-	fn system_properties(&self) -> SystemResult<sp_chain_spec::Properties>;
+	fn system_properties(&self) -> SystemResult<sc_chain_spec::Properties>;
 
 	/// Return health status of the node.
 	///
diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml
index a352e5fc387b..140039cab7d4 100644
--- a/client/rpc/Cargo.toml
+++ b/client/rpc/Cargo.toml
@@ -31,7 +31,7 @@ sp-utils = { version = "3.0.0", path = "../../primitives/utils" }
 sp-rpc = { version = "3.0.0", path = "../../primitives/rpc" }
 sp-keystore = { version = "0.9.0", path = "../../primitives/keystore" }
 sp-state-machine = { version = "0.9.0", path = "../../primitives/state-machine" }
-sp-chain-spec = { version = "3.0.0", path = "../../primitives/chain-spec" }
+sc-chain-spec = { version = "3.0.0", path = "../chain-spec" }
 sc-executor = { version = "0.9.0", path = "../executor" }
 sc-block-builder = { version = "0.9.0", path = "../block-builder" }
 sc-keystore = { version = "3.0.0", path = "../keystore" }
diff --git a/client/rpc/src/system/mod.rs b/client/rpc/src/system/mod.rs
index 248c2dcfed3c..d405755731cc 100644
--- a/client/rpc/src/system/mod.rs
+++ b/client/rpc/src/system/mod.rs
@@ -106,11 +106,11 @@ impl<B: traits::Block> SystemApi<B::Hash, <B::Header as HeaderT>::Number> for Sy
 		Ok(self.info.chain_name.clone())
 	}
 
-	fn system_type(&self) -> Result<sp_chain_spec::ChainType> {
+	fn system_type(&self) -> Result<sc_chain_spec::ChainType> {
 		Ok(self.info.chain_type.clone())
 	}
 
-	fn system_properties(&self) -> Result<sp_chain_spec::Properties> {
+	fn system_properties(&self) -> Result<sc_chain_spec::Properties> {
 		Ok(self.info.properties.clone())
 	}
 
diff --git a/frame/identity/src/lib.rs b/frame/identity/src/lib.rs
index b71b069ccb74..d398384887d9 100644
--- a/frame/identity/src/lib.rs
+++ b/frame/identity/src/lib.rs
@@ -141,7 +141,7 @@ impl Encode for Data {
 			Data::Raw(ref x) => {
 				let l = x.len().min(32);
 				let mut r = vec![l as u8 + 1; l + 1];
-				&mut r[1..].copy_from_slice(&x[..l as usize]);
+				r[1..].copy_from_slice(&x[..l as usize]);
 				r
 			}
 			Data::BlakeTwo256(ref h) => once(34u8).chain(h.iter().cloned()).collect(),
@@ -1161,4 +1161,3 @@ impl<T: Config> Pallet<T> {
 			.collect()
 	}
 }
-
diff --git a/primitives/chain-spec/Cargo.toml b/primitives/chain-spec/Cargo.toml
deleted file mode 100644
index ec3e731bb0e9..000000000000
--- a/primitives/chain-spec/Cargo.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-[package]
-name = "sp-chain-spec"
-version = "3.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-license = "Apache-2.0"
-homepage = "https://substrate.dev"
-repository = "https://github.com/paritytech/substrate/"
-description = "Substrate chain configurations types."
-readme = "README.md"
-
-[dependencies]
-serde = { version = "1.0.101", features = ["derive"] }
-serde_json = "1.0.41"
diff --git a/primitives/chain-spec/README.md b/primitives/chain-spec/README.md
deleted file mode 100644
index 375f14a441ab..000000000000
--- a/primitives/chain-spec/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Types and traits related to chain specifications.
-
-License: Apache-2.0
\ No newline at end of file
diff --git a/primitives/chain-spec/src/lib.rs b/primitives/chain-spec/src/lib.rs
deleted file mode 100644
index 5456718e351d..000000000000
--- a/primitives/chain-spec/src/lib.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Types and traits related to chain specifications.
-
-/// The type of a chain.
-///
-/// This can be used by tools to determine the type of a chain for displaying
-/// additional information or enabling additional features.
-#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
-pub enum ChainType {
-	/// A development chain that runs mainly on one node.
-	Development,
-	/// A local chain that runs locally on multiple nodes for testing purposes.
-	Local,
-	/// A live chain.
-	Live,
-	/// Some custom chain type.
-	Custom(String),
-}
-
-impl Default for ChainType {
-	fn default() -> Self {
-		Self::Live
-	}
-}
-
-/// Arbitrary properties defined in chain spec as a JSON object
-pub type Properties = serde_json::map::Map<String, serde_json::Value>;

From a4c8ab99d68bdfa0cc85a07ae99b7e9f289ef450 Mon Sep 17 00:00:00 2001
From: Zeke Mostov <32168567+emostov@users.noreply.github.com>
Date: Wed, 30 Jun 2021 06:02:09 -0700
Subject: [PATCH 0936/1194] pallet-vesting: Move `tests` module and create
 `mock` module (#9234)

* pallet-vesting: Move `tests` module to seperate file

* Move mock to own file

* add copyright header appache-2.0

* fix mock import paths in benchmark test macro
---
 frame/vesting/src/benchmarking.rs |   4 +-
 frame/vesting/src/lib.rs          | 499 ++----------------------------
 frame/vesting/src/mock.rs         | 140 +++++++++
 frame/vesting/src/tests.rs        | 359 +++++++++++++++++++++
 4 files changed, 525 insertions(+), 477 deletions(-)
 create mode 100644 frame/vesting/src/mock.rs
 create mode 100644 frame/vesting/src/tests.rs

diff --git a/frame/vesting/src/benchmarking.rs b/frame/vesting/src/benchmarking.rs
index 8d16a53fba2c..6fd27e187722 100644
--- a/frame/vesting/src/benchmarking.rs
+++ b/frame/vesting/src/benchmarking.rs
@@ -226,6 +226,6 @@ benchmarks! {
 
 impl_benchmark_test_suite!(
 	Vesting,
-	crate::tests::ExtBuilder::default().existential_deposit(256).build(),
-	crate::tests::Test,
+	crate::mock::ExtBuilder::default().existential_deposit(256).build(),
+	crate::mock::Test,
 );
diff --git a/frame/vesting/src/lib.rs b/frame/vesting/src/lib.rs
index 8c520b715801..b53262840f44 100644
--- a/frame/vesting/src/lib.rs
+++ b/frame/vesting/src/lib.rs
@@ -45,25 +45,35 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 mod benchmarking;
+#[cfg(test)]
+mod mock;
+#[cfg(test)]
+mod tests;
+
 pub mod weights;
 
-use sp_std::prelude::*;
-use sp_std::fmt::Debug;
-use codec::{Encode, Decode};
-use sp_runtime::{RuntimeDebug, traits::{
-	StaticLookup, Zero, AtLeast32BitUnsigned, MaybeSerializeDeserialize, Convert
-}};
-use frame_support::{ensure, pallet_prelude::*};
-use frame_support::traits::{
-	Currency, LockableCurrency, VestingSchedule, WithdrawReasons, LockIdentifier,
-	ExistenceRequirement, Get,
+use codec::{Decode, Encode};
+use frame_support::{
+	ensure,
+	pallet_prelude::*,
+	traits::{
+		Currency, ExistenceRequirement, Get, LockIdentifier, LockableCurrency, VestingSchedule,
+		WithdrawReasons,
+	},
 };
-use frame_system::{ensure_signed, ensure_root, pallet_prelude::*};
-pub use weights::WeightInfo;
+use frame_system::{ensure_root, ensure_signed, pallet_prelude::*};
 pub use pallet::*;
+use sp_runtime::{
+	traits::{AtLeast32BitUnsigned, Convert, MaybeSerializeDeserialize, StaticLookup, Zero},
+	RuntimeDebug,
+};
+use sp_std::{fmt::Debug, prelude::*};
+pub use weights::WeightInfo;
 
-type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
-type MaxLocksOf<T> = <<T as Config>::Currency as LockableCurrency<<T as frame_system::Config>::AccountId>>::MaxLocks;
+type BalanceOf<T> =
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+type MaxLocksOf<T> =
+	<<T as Config>::Currency as LockableCurrency<<T as frame_system::Config>::AccountId>>::MaxLocks;
 
 const VESTING_ID: LockIdentifier = *b"vesting ";
 
@@ -404,464 +414,3 @@ impl<T: Config> VestingSchedule<T::AccountId> for Pallet<T> where
 		debug_assert!(res.is_ok());
 	}
 }
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate as pallet_vesting;
-
-	use frame_support::{assert_ok, assert_noop, parameter_types};
-	use sp_core::H256;
-	use sp_runtime::{
-		testing::Header,
-		traits::{BlakeTwo256, IdentityLookup, Identity, BadOrigin},
-	};
-	use frame_system::RawOrigin;
-
-	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
-	type Block = frame_system::mocking::MockBlock<Test>;
-
-	frame_support::construct_runtime!(
-		pub enum Test where
-			Block = Block,
-			NodeBlock = Block,
-			UncheckedExtrinsic = UncheckedExtrinsic,
-		{
-			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-			Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-			Vesting: pallet_vesting::{Pallet, Call, Storage, Event<T>, Config<T>},
-		}
-	);
-
-	parameter_types! {
-		pub const BlockHashCount: u64 = 250;
-		pub BlockWeights: frame_system::limits::BlockWeights =
-			frame_system::limits::BlockWeights::simple_max(1024);
-	}
-	impl frame_system::Config for Test {
-		type BaseCallFilter = ();
-		type BlockWeights = ();
-		type BlockLength = ();
-		type DbWeight = ();
-		type Origin = Origin;
-		type Index = u64;
-		type BlockNumber = u64;
-		type Hash = H256;
-		type Call = Call;
-		type Hashing = BlakeTwo256;
-		type AccountId = u64;
-		type Lookup = IdentityLookup<Self::AccountId>;
-		type Header = Header;
-		type Event = Event;
-		type BlockHashCount = BlockHashCount;
-		type Version = ();
-		type PalletInfo = PalletInfo;
-		type AccountData = pallet_balances::AccountData<u64>;
-		type OnNewAccount = ();
-		type OnKilledAccount = ();
-		type SystemWeightInfo = ();
-		type SS58Prefix = ();
-		type OnSetCode = ();
-	}
-	parameter_types! {
-		pub const MaxLocks: u32 = 10;
-	}
-	impl pallet_balances::Config for Test {
-		type Balance = u64;
-		type DustRemoval = ();
-		type Event = Event;
-		type ExistentialDeposit = ExistentialDeposit;
-		type AccountStore = System;
-		type MaxLocks = MaxLocks;
-		type MaxReserves = ();
-		type ReserveIdentifier = [u8; 8];
-		type WeightInfo = ();
-	}
-	parameter_types! {
-		pub const MinVestedTransfer: u64 = 256 * 2;
-		pub static ExistentialDeposit: u64 = 0;
-	}
-	impl Config for Test {
-		type Event = Event;
-		type Currency = Balances;
-		type BlockNumberToBalance = Identity;
-		type MinVestedTransfer = MinVestedTransfer;
-		type WeightInfo = ();
-	}
-
-	pub struct ExtBuilder {
-		existential_deposit: u64,
-	}
-	impl Default for ExtBuilder {
-		fn default() -> Self {
-			Self {
-				existential_deposit: 1,
-			}
-		}
-	}
-	impl ExtBuilder {
-		pub fn existential_deposit(mut self, existential_deposit: u64) -> Self {
-			self.existential_deposit = existential_deposit;
-			self
-		}
-		pub fn build(self) -> sp_io::TestExternalities {
-			EXISTENTIAL_DEPOSIT.with(|v| *v.borrow_mut() = self.existential_deposit);
-			let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-			pallet_balances::GenesisConfig::<Test> {
-				balances: vec![
-					(1, 10 * self.existential_deposit),
-					(2, 20 * self.existential_deposit),
-					(3, 30 * self.existential_deposit),
-					(4, 40 * self.existential_deposit),
-					(12, 10 * self.existential_deposit)
-				],
-			}.assimilate_storage(&mut t).unwrap();
-			pallet_vesting::GenesisConfig::<Test> {
-				vesting: vec![
-					(1, 0, 10, 5 * self.existential_deposit),
-					(2, 10, 20, 0),
-					(12, 10, 20, 5 * self.existential_deposit)
-				],
-			}.assimilate_storage(&mut t).unwrap();
-			let mut ext = sp_io::TestExternalities::new(t);
-			ext.execute_with(|| System::set_block_number(1));
-			ext
-		}
-	}
-
-	#[test]
-	fn check_vesting_status() {
-		ExtBuilder::default()
-			.existential_deposit(256)
-			.build()
-			.execute_with(|| {
-				let user1_free_balance = Balances::free_balance(&1);
-				let user2_free_balance = Balances::free_balance(&2);
-				let user12_free_balance = Balances::free_balance(&12);
-				assert_eq!(user1_free_balance, 256 * 10); // Account 1 has free balance
-				assert_eq!(user2_free_balance, 256 * 20); // Account 2 has free balance
-				assert_eq!(user12_free_balance, 256 * 10); // Account 12 has free balance
-				let user1_vesting_schedule = VestingInfo {
-					locked: 256 * 5,
-					per_block: 128, // Vesting over 10 blocks
-					starting_block: 0,
-				};
-				let user2_vesting_schedule = VestingInfo {
-					locked: 256 * 20,
-					per_block: 256, // Vesting over 20 blocks
-					starting_block: 10,
-				};
-				let user12_vesting_schedule = VestingInfo {
-					locked: 256 * 5,
-					per_block: 64, // Vesting over 20 blocks
-					starting_block: 10,
-				};
-				assert_eq!(Vesting::vesting(&1), Some(user1_vesting_schedule)); // Account 1 has a vesting schedule
-				assert_eq!(Vesting::vesting(&2), Some(user2_vesting_schedule)); // Account 2 has a vesting schedule
-				assert_eq!(Vesting::vesting(&12), Some(user12_vesting_schedule)); // Account 12 has a vesting schedule
-
-				// Account 1 has only 128 units vested from their illiquid 256 * 5 units at block 1
-				assert_eq!(Vesting::vesting_balance(&1), Some(128 * 9));
-				// Account 2 has their full balance locked
-				assert_eq!(Vesting::vesting_balance(&2), Some(user2_free_balance));
-				// Account 12 has only their illiquid funds locked
-				assert_eq!(Vesting::vesting_balance(&12), Some(user12_free_balance - 256 * 5));
-
-				System::set_block_number(10);
-				assert_eq!(System::block_number(), 10);
-
-				// Account 1 has fully vested by block 10
-				assert_eq!(Vesting::vesting_balance(&1), Some(0));
-				// Account 2 has started vesting by block 10
-				assert_eq!(Vesting::vesting_balance(&2), Some(user2_free_balance));
-				// Account 12 has started vesting by block 10
-				assert_eq!(Vesting::vesting_balance(&12), Some(user12_free_balance - 256 * 5));
-
-				System::set_block_number(30);
-				assert_eq!(System::block_number(), 30);
-
-				assert_eq!(Vesting::vesting_balance(&1), Some(0)); // Account 1 is still fully vested, and not negative
-				assert_eq!(Vesting::vesting_balance(&2), Some(0)); // Account 2 has fully vested by block 30
-				assert_eq!(Vesting::vesting_balance(&12), Some(0)); // Account 2 has fully vested by block 30
-
-			});
-	}
-
-	#[test]
-	fn unvested_balance_should_not_transfer() {
-		ExtBuilder::default()
-			.existential_deposit(10)
-			.build()
-			.execute_with(|| {
-				let user1_free_balance = Balances::free_balance(&1);
-				assert_eq!(user1_free_balance, 100); // Account 1 has free balance
-				// Account 1 has only 5 units vested at block 1 (plus 50 unvested)
-				assert_eq!(Vesting::vesting_balance(&1), Some(45));
-				assert_noop!(
-					Balances::transfer(Some(1).into(), 2, 56),
-					pallet_balances::Error::<Test, _>::LiquidityRestrictions,
-				); // Account 1 cannot send more than vested amount
-			});
-	}
-
-	#[test]
-	fn vested_balance_should_transfer() {
-		ExtBuilder::default()
-			.existential_deposit(10)
-			.build()
-			.execute_with(|| {
-				let user1_free_balance = Balances::free_balance(&1);
-				assert_eq!(user1_free_balance, 100); // Account 1 has free balance
-				// Account 1 has only 5 units vested at block 1 (plus 50 unvested)
-				assert_eq!(Vesting::vesting_balance(&1), Some(45));
-				assert_ok!(Vesting::vest(Some(1).into()));
-				assert_ok!(Balances::transfer(Some(1).into(), 2, 55));
-			});
-	}
-
-	#[test]
-	fn vested_balance_should_transfer_using_vest_other() {
-		ExtBuilder::default()
-			.existential_deposit(10)
-			.build()
-			.execute_with(|| {
-				let user1_free_balance = Balances::free_balance(&1);
-				assert_eq!(user1_free_balance, 100); // Account 1 has free balance
-				// Account 1 has only 5 units vested at block 1 (plus 50 unvested)
-				assert_eq!(Vesting::vesting_balance(&1), Some(45));
-				assert_ok!(Vesting::vest_other(Some(2).into(), 1));
-				assert_ok!(Balances::transfer(Some(1).into(), 2, 55));
-			});
-	}
-
-	#[test]
-	fn extra_balance_should_transfer() {
-		ExtBuilder::default()
-			.existential_deposit(10)
-			.build()
-			.execute_with(|| {
-				assert_ok!(Balances::transfer(Some(3).into(), 1, 100));
-				assert_ok!(Balances::transfer(Some(3).into(), 2, 100));
-
-				let user1_free_balance = Balances::free_balance(&1);
-				assert_eq!(user1_free_balance, 200); // Account 1 has 100 more free balance than normal
-
-				let user2_free_balance = Balances::free_balance(&2);
-				assert_eq!(user2_free_balance, 300); // Account 2 has 100 more free balance than normal
-
-				// Account 1 has only 5 units vested at block 1 (plus 150 unvested)
-				assert_eq!(Vesting::vesting_balance(&1), Some(45));
-				assert_ok!(Vesting::vest(Some(1).into()));
-				assert_ok!(Balances::transfer(Some(1).into(), 3, 155)); // Account 1 can send extra units gained
-
-				// Account 2 has no units vested at block 1, but gained 100
-				assert_eq!(Vesting::vesting_balance(&2), Some(200));
-				assert_ok!(Vesting::vest(Some(2).into()));
-				assert_ok!(Balances::transfer(Some(2).into(), 3, 100)); // Account 2 can send extra units gained
-			});
-	}
-
-	#[test]
-	fn liquid_funds_should_transfer_with_delayed_vesting() {
-		ExtBuilder::default()
-			.existential_deposit(256)
-			.build()
-			.execute_with(|| {
-				let user12_free_balance = Balances::free_balance(&12);
-
-				assert_eq!(user12_free_balance, 2560); // Account 12 has free balance
-				// Account 12 has liquid funds
-				assert_eq!(Vesting::vesting_balance(&12), Some(user12_free_balance - 256 * 5));
-
-				// Account 12 has delayed vesting
-				let user12_vesting_schedule = VestingInfo {
-					locked: 256 * 5,
-					per_block: 64, // Vesting over 20 blocks
-					starting_block: 10,
-				};
-				assert_eq!(Vesting::vesting(&12), Some(user12_vesting_schedule));
-
-				// Account 12 can still send liquid funds
-				assert_ok!(Balances::transfer(Some(12).into(), 3, 256 * 5));
-			});
-	}
-
-	#[test]
-	fn vested_transfer_works() {
-		ExtBuilder::default()
-			.existential_deposit(256)
-			.build()
-			.execute_with(|| {
-				let user3_free_balance = Balances::free_balance(&3);
-				let user4_free_balance = Balances::free_balance(&4);
-				assert_eq!(user3_free_balance, 256 * 30);
-				assert_eq!(user4_free_balance, 256 * 40);
-				// Account 4 should not have any vesting yet.
-				assert_eq!(Vesting::vesting(&4), None);
-				// Make the schedule for the new transfer.
-				let new_vesting_schedule = VestingInfo {
-					locked: 256 * 5,
-					per_block: 64, // Vesting over 20 blocks
-					starting_block: 10,
-				};
-				assert_ok!(Vesting::vested_transfer(Some(3).into(), 4, new_vesting_schedule));
-				// Now account 4 should have vesting.
-				assert_eq!(Vesting::vesting(&4), Some(new_vesting_schedule));
-				// Ensure the transfer happened correctly.
-				let user3_free_balance_updated = Balances::free_balance(&3);
-				assert_eq!(user3_free_balance_updated, 256 * 25);
-				let user4_free_balance_updated = Balances::free_balance(&4);
-				assert_eq!(user4_free_balance_updated, 256 * 45);
-				// Account 4 has 5 * 256 locked.
-				assert_eq!(Vesting::vesting_balance(&4), Some(256 * 5));
-
-				System::set_block_number(20);
-				assert_eq!(System::block_number(), 20);
-
-				// Account 4 has 5 * 64 units vested by block 20.
-				assert_eq!(Vesting::vesting_balance(&4), Some(10 * 64));
-
-				System::set_block_number(30);
-				assert_eq!(System::block_number(), 30);
-
-				// Account 4 has fully vested.
-				assert_eq!(Vesting::vesting_balance(&4), Some(0));
-			});
-	}
-
-	#[test]
-	fn vested_transfer_correctly_fails() {
-		ExtBuilder::default()
-			.existential_deposit(256)
-			.build()
-			.execute_with(|| {
-				let user2_free_balance = Balances::free_balance(&2);
-				let user4_free_balance = Balances::free_balance(&4);
-				assert_eq!(user2_free_balance, 256 * 20);
-				assert_eq!(user4_free_balance, 256 * 40);
-				// Account 2 should already have a vesting schedule.
-				let user2_vesting_schedule = VestingInfo {
-					locked: 256 * 20,
-					per_block: 256, // Vesting over 20 blocks
-					starting_block: 10,
-				};
-				assert_eq!(Vesting::vesting(&2), Some(user2_vesting_schedule));
-
-				// The vesting schedule we will try to create, fails due to pre-existence of schedule.
-				let new_vesting_schedule = VestingInfo {
-					locked: 256 * 5,
-					per_block: 64, // Vesting over 20 blocks
-					starting_block: 10,
-				};
-				assert_noop!(
-					Vesting::vested_transfer(Some(4).into(), 2, new_vesting_schedule),
-					Error::<Test>::ExistingVestingSchedule,
-				);
-
-				// Fails due to too low transfer amount.
-				let new_vesting_schedule_too_low = VestingInfo {
-					locked: 256 * 1,
-					per_block: 64,
-					starting_block: 10,
-				};
-				assert_noop!(
-					Vesting::vested_transfer(Some(3).into(), 4, new_vesting_schedule_too_low),
-					Error::<Test>::AmountLow,
-				);
-
-				// Verify no currency transfer happened.
-				assert_eq!(user2_free_balance, 256 * 20);
-				assert_eq!(user4_free_balance, 256 * 40);
-			});
-	}
-
-	#[test]
-	fn force_vested_transfer_works() {
-		ExtBuilder::default()
-			.existential_deposit(256)
-			.build()
-			.execute_with(|| {
-				let user3_free_balance = Balances::free_balance(&3);
-				let user4_free_balance = Balances::free_balance(&4);
-				assert_eq!(user3_free_balance, 256 * 30);
-				assert_eq!(user4_free_balance, 256 * 40);
-				// Account 4 should not have any vesting yet.
-				assert_eq!(Vesting::vesting(&4), None);
-				// Make the schedule for the new transfer.
-				let new_vesting_schedule = VestingInfo {
-					locked: 256 * 5,
-					per_block: 64, // Vesting over 20 blocks
-					starting_block: 10,
-				};
-				assert_noop!(Vesting::force_vested_transfer(Some(4).into(), 3, 4, new_vesting_schedule), BadOrigin);
-				assert_ok!(Vesting::force_vested_transfer(RawOrigin::Root.into(), 3, 4, new_vesting_schedule));
-				// Now account 4 should have vesting.
-				assert_eq!(Vesting::vesting(&4), Some(new_vesting_schedule));
-				// Ensure the transfer happened correctly.
-				let user3_free_balance_updated = Balances::free_balance(&3);
-				assert_eq!(user3_free_balance_updated, 256 * 25);
-				let user4_free_balance_updated = Balances::free_balance(&4);
-				assert_eq!(user4_free_balance_updated, 256 * 45);
-				// Account 4 has 5 * 256 locked.
-				assert_eq!(Vesting::vesting_balance(&4), Some(256 * 5));
-
-				System::set_block_number(20);
-				assert_eq!(System::block_number(), 20);
-
-				// Account 4 has 5 * 64 units vested by block 20.
-				assert_eq!(Vesting::vesting_balance(&4), Some(10 * 64));
-
-				System::set_block_number(30);
-				assert_eq!(System::block_number(), 30);
-
-				// Account 4 has fully vested.
-				assert_eq!(Vesting::vesting_balance(&4), Some(0));
-			});
-	}
-
-	#[test]
-	fn force_vested_transfer_correctly_fails() {
-		ExtBuilder::default()
-			.existential_deposit(256)
-			.build()
-			.execute_with(|| {
-				let user2_free_balance = Balances::free_balance(&2);
-				let user4_free_balance = Balances::free_balance(&4);
-				assert_eq!(user2_free_balance, 256 * 20);
-				assert_eq!(user4_free_balance, 256 * 40);
-				// Account 2 should already have a vesting schedule.
-				let user2_vesting_schedule = VestingInfo {
-					locked: 256 * 20,
-					per_block: 256, // Vesting over 20 blocks
-					starting_block: 10,
-				};
-				assert_eq!(Vesting::vesting(&2), Some(user2_vesting_schedule));
-
-				// The vesting schedule we will try to create, fails due to pre-existence of schedule.
-				let new_vesting_schedule = VestingInfo {
-					locked: 256 * 5,
-					per_block: 64, // Vesting over 20 blocks
-					starting_block: 10,
-				};
-				assert_noop!(
-					Vesting::force_vested_transfer(RawOrigin::Root.into(), 4, 2, new_vesting_schedule),
-					Error::<Test>::ExistingVestingSchedule,
-				);
-
-				// Fails due to too low transfer amount.
-				let new_vesting_schedule_too_low = VestingInfo {
-					locked: 256 * 1,
-					per_block: 64,
-					starting_block: 10,
-				};
-				assert_noop!(
-					Vesting::force_vested_transfer(RawOrigin::Root.into(), 3, 4, new_vesting_schedule_too_low),
-					Error::<Test>::AmountLow,
-				);
-
-				// Verify no currency transfer happened.
-				assert_eq!(user2_free_balance, 256 * 20);
-				assert_eq!(user4_free_balance, 256 * 40);
-			});
-	}
-}
diff --git a/frame/vesting/src/mock.rs b/frame/vesting/src/mock.rs
new file mode 100644
index 000000000000..6fdd44aed140
--- /dev/null
+++ b/frame/vesting/src/mock.rs
@@ -0,0 +1,140 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use frame_support::parameter_types;
+use sp_core::H256;
+use sp_runtime::{
+	testing::Header,
+	traits::{BlakeTwo256, Identity, IdentityLookup},
+};
+
+use super::*;
+use crate as pallet_vesting;
+
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Vesting: pallet_vesting::{Pallet, Call, Storage, Event<T>, Config<T>},
+	}
+);
+
+parameter_types! {
+	pub const BlockHashCount: u64 = 250;
+	pub BlockWeights: frame_system::limits::BlockWeights =
+		frame_system::limits::BlockWeights::simple_max(1024);
+}
+impl frame_system::Config for Test {
+	type AccountData = pallet_balances::AccountData<u64>;
+	type AccountId = u64;
+	type BaseCallFilter = ();
+	type BlockHashCount = BlockHashCount;
+	type BlockLength = ();
+	type BlockNumber = u64;
+	type BlockWeights = ();
+	type Call = Call;
+	type DbWeight = ();
+	type Event = Event;
+	type Hash = H256;
+	type Hashing = BlakeTwo256;
+	type Header = Header;
+	type Index = u64;
+	type Lookup = IdentityLookup<Self::AccountId>;
+	type OnKilledAccount = ();
+	type OnNewAccount = ();
+	type OnSetCode = ();
+	type Origin = Origin;
+	type PalletInfo = PalletInfo;
+	type SS58Prefix = ();
+	type SystemWeightInfo = ();
+	type Version = ();
+}
+parameter_types! {
+	pub const MaxLocks: u32 = 10;
+}
+impl pallet_balances::Config for Test {
+	type AccountStore = System;
+	type Balance = u64;
+	type DustRemoval = ();
+	type Event = Event;
+	type ExistentialDeposit = ExistentialDeposit;
+	type MaxLocks = MaxLocks;
+	type MaxReserves = ();
+	type ReserveIdentifier = [u8; 8];
+	type WeightInfo = ();
+}
+parameter_types! {
+	pub const MinVestedTransfer: u64 = 256 * 2;
+	pub static ExistentialDeposit: u64 = 0;
+}
+impl Config for Test {
+	type BlockNumberToBalance = Identity;
+	type Currency = Balances;
+	type Event = Event;
+	type MinVestedTransfer = MinVestedTransfer;
+	type WeightInfo = ();
+}
+
+pub struct ExtBuilder {
+	existential_deposit: u64,
+}
+impl Default for ExtBuilder {
+	fn default() -> Self {
+		Self { existential_deposit: 1 }
+	}
+}
+impl ExtBuilder {
+	pub fn existential_deposit(mut self, existential_deposit: u64) -> Self {
+		self.existential_deposit = existential_deposit;
+		self
+	}
+
+	pub fn build(self) -> sp_io::TestExternalities {
+		EXISTENTIAL_DEPOSIT.with(|v| *v.borrow_mut() = self.existential_deposit);
+		let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+		pallet_balances::GenesisConfig::<Test> {
+			balances: vec![
+				(1, 10 * self.existential_deposit),
+				(2, 20 * self.existential_deposit),
+				(3, 30 * self.existential_deposit),
+				(4, 40 * self.existential_deposit),
+				(12, 10 * self.existential_deposit),
+			],
+		}
+		.assimilate_storage(&mut t)
+		.unwrap();
+		pallet_vesting::GenesisConfig::<Test> {
+			vesting: vec![
+				(1, 0, 10, 5 * self.existential_deposit),
+				(2, 10, 20, 0),
+				(12, 10, 20, 5 * self.existential_deposit),
+			],
+		}
+		.assimilate_storage(&mut t)
+		.unwrap();
+		let mut ext = sp_io::TestExternalities::new(t);
+		ext.execute_with(|| System::set_block_number(1));
+		ext
+	}
+}
diff --git a/frame/vesting/src/tests.rs b/frame/vesting/src/tests.rs
new file mode 100644
index 000000000000..7c59a61081d3
--- /dev/null
+++ b/frame/vesting/src/tests.rs
@@ -0,0 +1,359 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use frame_support::{assert_noop, assert_ok};
+use frame_system::RawOrigin;
+use sp_runtime::traits::BadOrigin;
+
+use super::*;
+use crate::mock::{Balances, ExtBuilder, System, Test, Vesting};
+
+#[test]
+fn check_vesting_status() {
+	ExtBuilder::default()
+		.existential_deposit(256)
+		.build()
+		.execute_with(|| {
+			let user1_free_balance = Balances::free_balance(&1);
+			let user2_free_balance = Balances::free_balance(&2);
+			let user12_free_balance = Balances::free_balance(&12);
+			assert_eq!(user1_free_balance, 256 * 10); // Account 1 has free balance
+			assert_eq!(user2_free_balance, 256 * 20); // Account 2 has free balance
+			assert_eq!(user12_free_balance, 256 * 10); // Account 12 has free balance
+			let user1_vesting_schedule = VestingInfo {
+				locked: 256 * 5,
+				per_block: 128, // Vesting over 10 blocks
+				starting_block: 0,
+			};
+			let user2_vesting_schedule = VestingInfo {
+				locked: 256 * 20,
+				per_block: 256, // Vesting over 20 blocks
+				starting_block: 10,
+			};
+			let user12_vesting_schedule = VestingInfo {
+				locked: 256 * 5,
+				per_block: 64, // Vesting over 20 blocks
+				starting_block: 10,
+			};
+			assert_eq!(Vesting::vesting(&1), Some(user1_vesting_schedule)); // Account 1 has a vesting schedule
+			assert_eq!(Vesting::vesting(&2), Some(user2_vesting_schedule)); // Account 2 has a vesting schedule
+			assert_eq!(Vesting::vesting(&12), Some(user12_vesting_schedule)); // Account 12 has a vesting schedule
+
+			// Account 1 has only 128 units vested from their illiquid 256 * 5 units at block 1
+			assert_eq!(Vesting::vesting_balance(&1), Some(128 * 9));
+			// Account 2 has their full balance locked
+			assert_eq!(Vesting::vesting_balance(&2), Some(user2_free_balance));
+			// Account 12 has only their illiquid funds locked
+			assert_eq!(Vesting::vesting_balance(&12), Some(user12_free_balance - 256 * 5));
+
+			System::set_block_number(10);
+			assert_eq!(System::block_number(), 10);
+
+			// Account 1 has fully vested by block 10
+			assert_eq!(Vesting::vesting_balance(&1), Some(0));
+			// Account 2 has started vesting by block 10
+			assert_eq!(Vesting::vesting_balance(&2), Some(user2_free_balance));
+			// Account 12 has started vesting by block 10
+			assert_eq!(Vesting::vesting_balance(&12), Some(user12_free_balance - 256 * 5));
+
+			System::set_block_number(30);
+			assert_eq!(System::block_number(), 30);
+
+			assert_eq!(Vesting::vesting_balance(&1), Some(0)); // Account 1 is still fully vested, and not negative
+			assert_eq!(Vesting::vesting_balance(&2), Some(0)); // Account 2 has fully vested by block 30
+			assert_eq!(Vesting::vesting_balance(&12), Some(0)); // Account 2 has fully vested by block 30
+
+		});
+}
+
+#[test]
+fn unvested_balance_should_not_transfer() {
+	ExtBuilder::default()
+		.existential_deposit(10)
+		.build()
+		.execute_with(|| {
+			let user1_free_balance = Balances::free_balance(&1);
+			assert_eq!(user1_free_balance, 100); // Account 1 has free balance
+			// Account 1 has only 5 units vested at block 1 (plus 50 unvested)
+			assert_eq!(Vesting::vesting_balance(&1), Some(45));
+			assert_noop!(
+				Balances::transfer(Some(1).into(), 2, 56),
+				pallet_balances::Error::<Test, _>::LiquidityRestrictions,
+			); // Account 1 cannot send more than vested amount
+		});
+}
+
+#[test]
+fn vested_balance_should_transfer() {
+	ExtBuilder::default()
+		.existential_deposit(10)
+		.build()
+		.execute_with(|| {
+			let user1_free_balance = Balances::free_balance(&1);
+			assert_eq!(user1_free_balance, 100); // Account 1 has free balance
+			// Account 1 has only 5 units vested at block 1 (plus 50 unvested)
+			assert_eq!(Vesting::vesting_balance(&1), Some(45));
+			assert_ok!(Vesting::vest(Some(1).into()));
+			assert_ok!(Balances::transfer(Some(1).into(), 2, 55));
+		});
+}
+
+#[test]
+fn vested_balance_should_transfer_using_vest_other() {
+	ExtBuilder::default()
+		.existential_deposit(10)
+		.build()
+		.execute_with(|| {
+			let user1_free_balance = Balances::free_balance(&1);
+			assert_eq!(user1_free_balance, 100); // Account 1 has free balance
+			// Account 1 has only 5 units vested at block 1 (plus 50 unvested)
+			assert_eq!(Vesting::vesting_balance(&1), Some(45));
+			assert_ok!(Vesting::vest_other(Some(2).into(), 1));
+			assert_ok!(Balances::transfer(Some(1).into(), 2, 55));
+		});
+}
+
+#[test]
+fn extra_balance_should_transfer() {
+	ExtBuilder::default()
+		.existential_deposit(10)
+		.build()
+		.execute_with(|| {
+			assert_ok!(Balances::transfer(Some(3).into(), 1, 100));
+			assert_ok!(Balances::transfer(Some(3).into(), 2, 100));
+
+			let user1_free_balance = Balances::free_balance(&1);
+			assert_eq!(user1_free_balance, 200); // Account 1 has 100 more free balance than normal
+
+			let user2_free_balance = Balances::free_balance(&2);
+			assert_eq!(user2_free_balance, 300); // Account 2 has 100 more free balance than normal
+
+			// Account 1 has only 5 units vested at block 1 (plus 150 unvested)
+			assert_eq!(Vesting::vesting_balance(&1), Some(45));
+			assert_ok!(Vesting::vest(Some(1).into()));
+			assert_ok!(Balances::transfer(Some(1).into(), 3, 155)); // Account 1 can send extra units gained
+
+			// Account 2 has no units vested at block 1, but gained 100
+			assert_eq!(Vesting::vesting_balance(&2), Some(200));
+			assert_ok!(Vesting::vest(Some(2).into()));
+			assert_ok!(Balances::transfer(Some(2).into(), 3, 100)); // Account 2 can send extra units gained
+		});
+}
+
+#[test]
+fn liquid_funds_should_transfer_with_delayed_vesting() {
+	ExtBuilder::default()
+		.existential_deposit(256)
+		.build()
+		.execute_with(|| {
+			let user12_free_balance = Balances::free_balance(&12);
+
+			assert_eq!(user12_free_balance, 2560); // Account 12 has free balance
+			// Account 12 has liquid funds
+			assert_eq!(Vesting::vesting_balance(&12), Some(user12_free_balance - 256 * 5));
+
+			// Account 12 has delayed vesting
+			let user12_vesting_schedule = VestingInfo {
+				locked: 256 * 5,
+				per_block: 64, // Vesting over 20 blocks
+				starting_block: 10,
+			};
+			assert_eq!(Vesting::vesting(&12), Some(user12_vesting_schedule));
+
+			// Account 12 can still send liquid funds
+			assert_ok!(Balances::transfer(Some(12).into(), 3, 256 * 5));
+		});
+}
+
+#[test]
+fn vested_transfer_works() {
+	ExtBuilder::default()
+		.existential_deposit(256)
+		.build()
+		.execute_with(|| {
+			let user3_free_balance = Balances::free_balance(&3);
+			let user4_free_balance = Balances::free_balance(&4);
+			assert_eq!(user3_free_balance, 256 * 30);
+			assert_eq!(user4_free_balance, 256 * 40);
+			// Account 4 should not have any vesting yet.
+			assert_eq!(Vesting::vesting(&4), None);
+			// Make the schedule for the new transfer.
+			let new_vesting_schedule = VestingInfo {
+				locked: 256 * 5,
+				per_block: 64, // Vesting over 20 blocks
+				starting_block: 10,
+			};
+			assert_ok!(Vesting::vested_transfer(Some(3).into(), 4, new_vesting_schedule));
+			// Now account 4 should have vesting.
+			assert_eq!(Vesting::vesting(&4), Some(new_vesting_schedule));
+			// Ensure the transfer happened correctly.
+			let user3_free_balance_updated = Balances::free_balance(&3);
+			assert_eq!(user3_free_balance_updated, 256 * 25);
+			let user4_free_balance_updated = Balances::free_balance(&4);
+			assert_eq!(user4_free_balance_updated, 256 * 45);
+			// Account 4 has 5 * 256 locked.
+			assert_eq!(Vesting::vesting_balance(&4), Some(256 * 5));
+
+			System::set_block_number(20);
+			assert_eq!(System::block_number(), 20);
+
+			// Account 4 has 5 * 64 units vested by block 20.
+			assert_eq!(Vesting::vesting_balance(&4), Some(10 * 64));
+
+			System::set_block_number(30);
+			assert_eq!(System::block_number(), 30);
+
+			// Account 4 has fully vested.
+			assert_eq!(Vesting::vesting_balance(&4), Some(0));
+		});
+}
+
+#[test]
+fn vested_transfer_correctly_fails() {
+	ExtBuilder::default()
+		.existential_deposit(256)
+		.build()
+		.execute_with(|| {
+			let user2_free_balance = Balances::free_balance(&2);
+			let user4_free_balance = Balances::free_balance(&4);
+			assert_eq!(user2_free_balance, 256 * 20);
+			assert_eq!(user4_free_balance, 256 * 40);
+			// Account 2 should already have a vesting schedule.
+			let user2_vesting_schedule = VestingInfo {
+				locked: 256 * 20,
+				per_block: 256, // Vesting over 20 blocks
+				starting_block: 10,
+			};
+			assert_eq!(Vesting::vesting(&2), Some(user2_vesting_schedule));
+
+			// The vesting schedule we will try to create, fails due to pre-existence of schedule.
+			let new_vesting_schedule = VestingInfo {
+				locked: 256 * 5,
+				per_block: 64, // Vesting over 20 blocks
+				starting_block: 10,
+			};
+			assert_noop!(
+				Vesting::vested_transfer(Some(4).into(), 2, new_vesting_schedule),
+				Error::<Test>::ExistingVestingSchedule,
+			);
+
+			// Fails due to too low transfer amount.
+			let new_vesting_schedule_too_low = VestingInfo {
+				locked: 256 * 1,
+				per_block: 64,
+				starting_block: 10,
+			};
+			assert_noop!(
+				Vesting::vested_transfer(Some(3).into(), 4, new_vesting_schedule_too_low),
+				Error::<Test>::AmountLow,
+			);
+
+			// Verify no currency transfer happened.
+			assert_eq!(user2_free_balance, 256 * 20);
+			assert_eq!(user4_free_balance, 256 * 40);
+		});
+}
+
+#[test]
+fn force_vested_transfer_works() {
+	ExtBuilder::default()
+		.existential_deposit(256)
+		.build()
+		.execute_with(|| {
+			let user3_free_balance = Balances::free_balance(&3);
+			let user4_free_balance = Balances::free_balance(&4);
+			assert_eq!(user3_free_balance, 256 * 30);
+			assert_eq!(user4_free_balance, 256 * 40);
+			// Account 4 should not have any vesting yet.
+			assert_eq!(Vesting::vesting(&4), None);
+			// Make the schedule for the new transfer.
+			let new_vesting_schedule = VestingInfo {
+				locked: 256 * 5,
+				per_block: 64, // Vesting over 20 blocks
+				starting_block: 10,
+			};
+			assert_noop!(Vesting::force_vested_transfer(Some(4).into(), 3, 4, new_vesting_schedule), BadOrigin);
+			assert_ok!(Vesting::force_vested_transfer(RawOrigin::Root.into(), 3, 4, new_vesting_schedule));
+			// Now account 4 should have vesting.
+			assert_eq!(Vesting::vesting(&4), Some(new_vesting_schedule));
+			// Ensure the transfer happened correctly.
+			let user3_free_balance_updated = Balances::free_balance(&3);
+			assert_eq!(user3_free_balance_updated, 256 * 25);
+			let user4_free_balance_updated = Balances::free_balance(&4);
+			assert_eq!(user4_free_balance_updated, 256 * 45);
+			// Account 4 has 5 * 256 locked.
+			assert_eq!(Vesting::vesting_balance(&4), Some(256 * 5));
+
+			System::set_block_number(20);
+			assert_eq!(System::block_number(), 20);
+
+			// Account 4 has 5 * 64 units vested by block 20.
+			assert_eq!(Vesting::vesting_balance(&4), Some(10 * 64));
+
+			System::set_block_number(30);
+			assert_eq!(System::block_number(), 30);
+
+			// Account 4 has fully vested.
+			assert_eq!(Vesting::vesting_balance(&4), Some(0));
+		});
+}
+
+#[test]
+fn force_vested_transfer_correctly_fails() {
+	ExtBuilder::default()
+		.existential_deposit(256)
+		.build()
+		.execute_with(|| {
+			let user2_free_balance = Balances::free_balance(&2);
+			let user4_free_balance = Balances::free_balance(&4);
+			assert_eq!(user2_free_balance, 256 * 20);
+			assert_eq!(user4_free_balance, 256 * 40);
+			// Account 2 should already have a vesting schedule.
+			let user2_vesting_schedule = VestingInfo {
+				locked: 256 * 20,
+				per_block: 256, // Vesting over 20 blocks
+				starting_block: 10,
+			};
+			assert_eq!(Vesting::vesting(&2), Some(user2_vesting_schedule));
+
+			// The vesting schedule we will try to create, fails due to pre-existence of schedule.
+			let new_vesting_schedule = VestingInfo {
+				locked: 256 * 5,
+				per_block: 64, // Vesting over 20 blocks
+				starting_block: 10,
+			};
+			assert_noop!(
+				Vesting::force_vested_transfer(RawOrigin::Root.into(), 4, 2, new_vesting_schedule),
+				Error::<Test>::ExistingVestingSchedule,
+			);
+
+			// Fails due to too low transfer amount.
+			let new_vesting_schedule_too_low = VestingInfo {
+				locked: 256 * 1,
+				per_block: 64,
+				starting_block: 10,
+			};
+			assert_noop!(
+				Vesting::force_vested_transfer(RawOrigin::Root.into(), 3, 4, new_vesting_schedule_too_low),
+				Error::<Test>::AmountLow,
+			);
+
+			// Verify no currency transfer happened.
+			assert_eq!(user2_free_balance, 256 * 20);
+			assert_eq!(user4_free_balance, 256 * 40);
+		});
+}

From 83808aa815a9fbc528b76cd25ae1dec57e269771 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Wed, 30 Jun 2021 22:46:28 +0200
Subject: [PATCH 0937/1194] Make a few things for staking miner (#9241)

---
 frame/election-provider-multi-phase/src/lib.rs | 4 ++--
 frame/system/src/lib.rs                        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index e127e34d5572..7aab93fb652f 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -1294,14 +1294,14 @@ impl<T: Config> Pallet<T> {
 	}
 
 	/// Kill everything created by [`Pallet::create_snapshot`].
-	pub(crate) fn kill_snapshot() {
+	pub fn kill_snapshot() {
 		<Snapshot<T>>::kill();
 		<SnapshotMetadata<T>>::kill();
 		<DesiredTargets<T>>::kill();
 	}
 
 	/// Checks the feasibility of a solution.
-	fn feasibility_check(
+	pub fn feasibility_check(
 		solution: RawSolution<CompactOf<T>>,
 		compute: ElectionCompute,
 	) -> Result<ReadySolution<T::AccountId>, FeasibilityError> {
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index f96c43ee1c98..ad57bf6a8799 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -581,7 +581,7 @@ pub mod pallet {
 	/// Events deposited for the current block.
 	#[pallet::storage]
 	#[pallet::getter(fn events)]
-	pub(super) type Events<T: Config> =
+	pub type Events<T: Config> =
 		StorageValue<_, Vec<EventRecord<T::Event, T::Hash>>, ValueQuery>;
 
 	/// The number of events in the `Events<T>` list.

From 4cb42231b31ed0dda753144f1e2958b7c78f381f Mon Sep 17 00:00:00 2001
From: Liu-Cheng Xu <xuliuchengxlc@gmail.com>
Date: Thu, 1 Jul 2021 15:12:07 +0800
Subject: [PATCH 0938/1194] Enable colored help in CLI (#9244)

Since it's already there, why not give it a chance :P
---
 client/cli/src/lib.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/cli/src/lib.rs b/client/cli/src/lib.rs
index f81c5160ca82..e170d1a196ff 100644
--- a/client/cli/src/lib.rs
+++ b/client/cli/src/lib.rs
@@ -139,6 +139,7 @@ pub trait SubstrateCli: Sized {
 				AppSettings::GlobalVersion,
 				AppSettings::ArgsNegateSubcommands,
 				AppSettings::SubcommandsNegateReqs,
+				AppSettings::ColoredHelp,
 			]);
 
 		let matches = match app.get_matches_from_safe(iter) {

From 938e3a2379599a8a80cde8d3e4ed698e5eded490 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Thu, 1 Jul 2021 11:50:24 +0200
Subject: [PATCH 0939/1194] Display Reward amount (#9245)

* name reward amount

* Fix
---
 frame/election-provider-multi-phase/src/lib.rs    | 9 ++++++---
 frame/election-provider-multi-phase/src/signed.rs | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index 7aab93fb652f..6c92f2b15718 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -982,7 +982,10 @@ pub mod pallet {
 	}
 
 	#[pallet::event]
-	#[pallet::metadata(<T as frame_system::Config>::AccountId = "AccountId")]
+	#[pallet::metadata(
+		<T as frame_system::Config>::AccountId = "AccountId",
+		BalanceOf<T> = "Balance"
+	)]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
 	pub enum Event<T: Config> {
 		/// A solution was stored with the given compute.
@@ -996,9 +999,9 @@ pub mod pallet {
 		/// election failed, `None`.
 		ElectionFinalized(Option<ElectionCompute>),
 		/// An account has been rewarded for their signed submission being finalized.
-		Rewarded(<T as frame_system::Config>::AccountId),
+		Rewarded(<T as frame_system::Config>::AccountId, BalanceOf<T>),
 		/// An account has been slashed for submitting an invalid signed submission.
-		Slashed(<T as frame_system::Config>::AccountId),
+		Slashed(<T as frame_system::Config>::AccountId, BalanceOf<T>),
 		/// The signed phase of the given round has started.
 		SignedPhaseStarted(u32),
 		/// The unsigned phase of the given round has started.
diff --git a/frame/election-provider-multi-phase/src/signed.rs b/frame/election-provider-multi-phase/src/signed.rs
index ba1123c1331a..1aaf96b8add9 100644
--- a/frame/election-provider-multi-phase/src/signed.rs
+++ b/frame/election-provider-multi-phase/src/signed.rs
@@ -417,7 +417,7 @@ impl<T: Config> Pallet<T> {
 		<QueuedSolution<T>>::put(ready_solution);
 
 		// emit reward event
-		Self::deposit_event(crate::Event::Rewarded(who.clone()));
+		Self::deposit_event(crate::Event::Rewarded(who.clone(), reward));
 
 		// unreserve deposit.
 		let _remaining = T::Currency::unreserve(who, deposit);
@@ -434,7 +434,7 @@ impl<T: Config> Pallet<T> {
 	///
 	/// Infallible
 	pub fn finalize_signed_phase_reject_solution(who: &T::AccountId, deposit: BalanceOf<T>) {
-		Self::deposit_event(crate::Event::Slashed(who.clone()));
+		Self::deposit_event(crate::Event::Slashed(who.clone(), deposit));
 		let (negative_imbalance, _remaining) = T::Currency::slash_reserved(who, deposit);
 		debug_assert!(_remaining.is_zero());
 		T::SlashHandler::on_unbalanced(negative_imbalance);

From baf37363b23fd07514090a373a00337424ee8f68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Thu, 1 Jul 2021 17:50:42 +0200
Subject: [PATCH 0940/1194] Do not call `initialize_block` before any runtime
 api (#8953)

* Do not call `initialize_block` before any runtime api

Before this change we always called `initialize_block` before calling
into the runtime. There was already support with `skip_initialize` to skip
the initialization. Almost no runtime_api requires that
`initialize_block` is called before. Actually this only leads to higher
execution times most of the time, because all runtime modules are
initialized and this is especially expensive when the block contained a
runtime upgrade.

TLDR: Do not call `initialize_block` before calling a runtime api.

* Change `validate_transaction` interface

* Fix rpc test

* Fixes and comments

* Some docs
---
 bin/node-template/runtime/src/lib.rs          |  3 +-
 bin/node/executor/tests/submit_transaction.rs |  8 +-
 bin/node/runtime/src/lib.rs                   |  3 +-
 client/api/src/call_executor.rs               |  6 +-
 client/light/src/call_executor.rs             | 75 ++---------------
 client/rpc/src/state/tests.rs                 |  2 +-
 client/service/src/client/call_executor.rs    | 15 +---
 client/service/src/client/client.rs           | 24 +-----
 client/service/test/src/client/light.rs       | 53 +++++-------
 client/transaction-pool/src/api.rs            | 54 ++++++++++---
 frame/executive/src/lib.rs                    | 20 ++++-
 .../primitives/src/lib.rs                     |  3 -
 .../api/proc-macro/src/decl_runtime_apis.rs   | 45 +----------
 .../api/proc-macro/src/impl_runtime_apis.rs   | 28 +++----
 .../proc-macro/src/mock_impl_runtime_apis.rs  |  7 ++
 primitives/api/src/lib.rs                     | 81 +++++++++----------
 primitives/api/test/tests/runtime_calls.rs    | 25 ++----
 primitives/consensus/aura/src/lib.rs          |  1 -
 primitives/offchain/src/lib.rs                |  2 -
 .../transaction-pool/src/runtime_api.rs       | 14 +++-
 primitives/version/src/lib.rs                 |  5 ++
 test-utils/runtime/src/lib.rs                 | 16 +---
 test-utils/runtime/src/system.rs              |  3 +-
 23 files changed, 192 insertions(+), 301 deletions(-)

diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index e89d7f28be22..940eb2379b11 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -365,8 +365,9 @@ impl_runtime_apis! {
 		fn validate_transaction(
 			source: TransactionSource,
 			tx: <Block as BlockT>::Extrinsic,
+			block_hash: <Block as BlockT>::Hash,
 		) -> TransactionValidity {
-			Executive::validate_transaction(source, tx)
+			Executive::validate_transaction(source, tx, block_hash)
 		}
 	}
 
diff --git a/bin/node/executor/tests/submit_transaction.rs b/bin/node/executor/tests/submit_transaction.rs
index 3de0758d8146..590bdac4db75 100644
--- a/bin/node/executor/tests/submit_transaction.rs
+++ b/bin/node/executor/tests/submit_transaction.rs
@@ -256,12 +256,16 @@ fn submitted_transaction_should_be_valid() {
 		<frame_system::Account<Runtime>>::insert(&address, account);
 
 		// check validity
-		let res = Executive::validate_transaction(source, extrinsic).unwrap();
+		let res = Executive::validate_transaction(
+			source,
+			extrinsic,
+			frame_system::BlockHash::<Runtime>::get(0),
+		).unwrap();
 
 		// We ignore res.priority since this number can change based on updates to weights and such.
 		assert_eq!(res.requires, Vec::<TransactionTag>::new());
 		assert_eq!(res.provides, vec![(address, 0).encode()]);
-		assert_eq!(res.longevity, 2048);
+		assert_eq!(res.longevity, 2047);
 		assert_eq!(res.propagate, true);
 	});
 }
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index fd7fd4213366..109a492e2c71 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -1292,8 +1292,9 @@ impl_runtime_apis! {
 		fn validate_transaction(
 			source: TransactionSource,
 			tx: <Block as BlockT>::Extrinsic,
+			block_hash: <Block as BlockT>::Hash,
 		) -> TransactionValidity {
-			Executive::validate_transaction(source, tx)
+			Executive::validate_transaction(source, tx, block_hash)
 		}
 	}
 
diff --git a/client/api/src/call_executor.rs b/client/api/src/call_executor.rs
index 3b725bf8773a..621cc292a71a 100644
--- a/client/api/src/call_executor.rs
+++ b/client/api/src/call_executor.rs
@@ -30,7 +30,7 @@ use sc_executor::{RuntimeVersion, NativeVersion};
 use sp_externalities::Extensions;
 use sp_core::NativeOrEncoded;
 
-use sp_api::{ProofRecorder, InitializeBlock, StorageTransactionCache};
+use sp_api::{ProofRecorder, StorageTransactionCache};
 use crate::execution_extensions::ExecutionExtensions;
 
 /// Executor Provider
@@ -71,8 +71,6 @@ pub trait CallExecutor<B: BlockT> {
 	/// Before executing the method, passed header is installed as the current header
 	/// of the execution context.
 	fn contextual_call<
-		'a,
-		IB: Fn() -> sp_blockchain::Result<()>,
 		EM: Fn(
 			Result<NativeOrEncoded<R>, Self::Error>,
 			Result<NativeOrEncoded<R>, Self::Error>
@@ -81,7 +79,6 @@ pub trait CallExecutor<B: BlockT> {
 		NC: FnOnce() -> result::Result<R, sp_api::ApiError> + UnwindSafe,
 	>(
 		&self,
-		initialize_block_fn: IB,
 		at: &BlockId<B>,
 		method: &str,
 		call_data: &[u8],
@@ -89,7 +86,6 @@ pub trait CallExecutor<B: BlockT> {
 		storage_transaction_cache: Option<&RefCell<
 			StorageTransactionCache<B, <Self::Backend as crate::backend::Backend<B>>::State>,
 		>>,
-		initialize_block: InitializeBlock<'a, B>,
 		execution_manager: ExecutionManager<EM>,
 		native_call: Option<NC>,
 		proof_recorder: &Option<ProofRecorder<B>>,
diff --git a/client/light/src/call_executor.rs b/client/light/src/call_executor.rs
index ae83807dc98f..c9ca3bab37be 100644
--- a/client/light/src/call_executor.rs
+++ b/client/light/src/call_executor.rs
@@ -27,7 +27,7 @@ use sp_core::{
 	convert_hash, NativeOrEncoded, traits::{CodeExecutor, SpawnNamed},
 };
 use sp_runtime::{
-	generic::BlockId, traits::{One, Block as BlockT, Header as HeaderT, HashFor},
+	generic::BlockId, traits::{Block as BlockT, Header as HeaderT, HashFor},
 };
 use sp_externalities::Extensions;
 use sp_state_machine::{
@@ -36,7 +36,7 @@ use sp_state_machine::{
 };
 use hash_db::Hasher;
 
-use sp_api::{ProofRecorder, InitializeBlock, StorageTransactionCache};
+use sp_api::{ProofRecorder, StorageTransactionCache};
 
 use sp_blockchain::{Error as ClientError, Result as ClientResult};
 
@@ -97,8 +97,6 @@ impl<Block, B, Local> CallExecutor<Block> for
 	}
 
 	fn contextual_call<
-		'a,
-		IB: Fn() -> ClientResult<()>,
 		EM: Fn(
 			Result<NativeOrEncoded<R>, Self::Error>,
 			Result<NativeOrEncoded<R>, Self::Error>
@@ -107,13 +105,11 @@ impl<Block, B, Local> CallExecutor<Block> for
 		NC: FnOnce() -> result::Result<R, sp_api::ApiError> + UnwindSafe,
 	>(
 		&self,
-		initialize_block_fn: IB,
 		at: &BlockId<Block>,
 		method: &str,
 		call_data: &[u8],
 		changes: &RefCell<OverlayedChanges>,
 		_: Option<&RefCell<StorageTransactionCache<Block, B::State>>>,
-		initialize_block: InitializeBlock<'a, Block>,
 		_manager: ExecutionManager<EM>,
 		native_call: Option<NC>,
 		recorder: &Option<ProofRecorder<Block>>,
@@ -124,7 +120,6 @@ impl<Block, B, Local> CallExecutor<Block> for
 
 		match self.backend.is_local_state_available(at) {
 			true => CallExecutor::contextual_call::<
-				_,
 				fn(
 					Result<NativeOrEncoded<R>, Local::Error>,
 					Result<NativeOrEncoded<R>, Local::Error>,
@@ -133,13 +128,11 @@ impl<Block, B, Local> CallExecutor<Block> for
 				NC
 			>(
 				&self.local,
-				initialize_block_fn,
 				at,
 				method,
 				call_data,
 				changes,
 				None,
-				initialize_block,
 				ExecutionManager::NativeWhenPossible,
 				native_call,
 				recorder,
@@ -177,7 +170,6 @@ impl<Block, B, Local> CallExecutor<Block> for
 /// Proof includes both environment preparation proof and method execution proof.
 pub fn prove_execution<Block, S, E>(
 	mut state: S,
-	header: Block::Header,
 	executor: &E,
 	method: &str,
 	call_data: &[u8],
@@ -193,31 +185,20 @@ pub fn prove_execution<Block, S, E>(
 				Box<dyn sp_state_machine::Error>
 		)?;
 
-	// prepare execution environment + record preparation proof
-	let mut changes = Default::default();
-	let (_, init_proof) = executor.prove_at_trie_state(
-		trie_state,
-		&mut changes,
-		"Core_initialize_block",
-		&header.encode(),
-	)?;
-
 	// execute method + record execution proof
 	let (result, exec_proof) = executor.prove_at_trie_state(
 		&trie_state,
-		&mut changes,
+		&mut Default::default(),
 		method,
 		call_data,
 	)?;
-	let total_proof = StorageProof::merge(vec![init_proof, exec_proof]);
 
-	Ok((result, total_proof))
+	Ok((result, exec_proof))
 }
 
 /// Check remote contextual execution proof using given backend.
 ///
-/// Method is executed using passed header as environment' current block.
-/// Proof should include both environment preparation proof and method execution proof.
+/// Proof should include the method execution proof.
 pub fn check_execution_proof<Header, E, H>(
 	executor: &E,
 	spawn_handle: Box<dyn SpawnNamed>,
@@ -229,63 +210,19 @@ pub fn check_execution_proof<Header, E, H>(
 		E: CodeExecutor + Clone + 'static,
 		H: Hasher,
 		H::Out: Ord + codec::Codec + 'static,
-{
-	check_execution_proof_with_make_header::<Header, E, H, _>(
-		executor,
-		spawn_handle,
-		request,
-		remote_proof,
-		|header| <Header as HeaderT>::new(
-			*header.number() + One::one(),
-			Default::default(),
-			Default::default(),
-			header.hash(),
-			Default::default(),
-		),
-	)
-}
-
-/// Check remote contextual execution proof using given backend and header factory.
-///
-/// Method is executed using passed header as environment' current block.
-/// Proof should include both environment preparation proof and method execution proof.
-pub fn check_execution_proof_with_make_header<Header, E, H, MakeNextHeader>(
-	executor: &E,
-	spawn_handle: Box<dyn SpawnNamed>,
-	request: &RemoteCallRequest<Header>,
-	remote_proof: StorageProof,
-	make_next_header: MakeNextHeader,
-) -> ClientResult<Vec<u8>>
-	where
-		E: CodeExecutor + Clone + 'static,
-		H: Hasher,
-		Header: HeaderT,
-		H::Out: Ord + codec::Codec + 'static,
-		MakeNextHeader: Fn(&Header) -> Header,
 {
 	let local_state_root = request.header.state_root();
 	let root: H::Out = convert_hash(&local_state_root);
 
-	// prepare execution environment + check preparation proof
+	// prepare execution environment
 	let mut changes = OverlayedChanges::default();
 	let trie_backend = create_proof_check_backend(root, remote_proof)?;
-	let next_header = make_next_header(&request.header);
 
 	// TODO: Remove when solved: https://github.com/paritytech/substrate/issues/5047
 	let backend_runtime_code = sp_state_machine::backend::BackendRuntimeCode::new(&trie_backend);
 	let runtime_code = backend_runtime_code.runtime_code()
 		.map_err(|_e| ClientError::RuntimeCodeMissing)?;
 
-	execution_proof_check_on_trie_backend::<H, Header::Number, _, _>(
-		&trie_backend,
-		&mut changes,
-		executor,
-		spawn_handle.clone(),
-		"Core_initialize_block",
-		&next_header.encode(),
-		&runtime_code,
-	)?;
-
 	// execute method
 	execution_proof_check_on_trie_backend::<H, Header::Number, _, _>(
 		&trie_backend,
diff --git a/client/rpc/src/state/tests.rs b/client/rpc/src/state/tests.rs
index e413827552c9..c9cb0bde89c1 100644
--- a/client/rpc/src/state/tests.rs
+++ b/client/rpc/src/state/tests.rs
@@ -474,7 +474,7 @@ fn should_return_runtime_version() {
 
 	let result = "{\"specName\":\"test\",\"implName\":\"parity-test\",\"authoringVersion\":1,\
 		\"specVersion\":2,\"implVersion\":2,\"apis\":[[\"0xdf6acb689907609b\",3],\
-		[\"0x37e397fc7c91f5e4\",1],[\"0xd2bc9897eed08f15\",2],[\"0x40fe3ad401f8959a\",5],\
+		[\"0x37e397fc7c91f5e4\",1],[\"0xd2bc9897eed08f15\",3],[\"0x40fe3ad401f8959a\",5],\
 		[\"0xc6e9a76309f39b09\",1],[\"0xdd718d5cc53262d4\",1],[\"0xcbca25e39f142387\",2],\
 		[\"0xf78b278be53f454c\",2],[\"0xab3c0572291feb8b\",1],[\"0xbc9d89904f5b923f\",1]],\
 		\"transactionVersion\":1}";
diff --git a/client/service/src/client/call_executor.rs b/client/service/src/client/call_executor.rs
index c8c1fee545be..a44481994760 100644
--- a/client/service/src/client/call_executor.rs
+++ b/client/service/src/client/call_executor.rs
@@ -30,7 +30,7 @@ use sp_externalities::Extensions;
 use sp_core::{
 	NativeOrEncoded, NeverNativeValue, traits::{CodeExecutor, SpawnNamed, RuntimeCode},
 };
-use sp_api::{ProofRecorder, InitializeBlock, StorageTransactionCache};
+use sp_api::{ProofRecorder, StorageTransactionCache};
 use sc_client_api::{backend, call_executor::CallExecutor};
 use super::{client::ClientConfig, wasm_override::WasmOverride, wasm_substitutes::WasmSubstitutes};
 
@@ -173,8 +173,6 @@ where
 	}
 
 	fn contextual_call<
-		'a,
-		IB: Fn() -> sp_blockchain::Result<()>,
 		EM: Fn(
 			Result<NativeOrEncoded<R>, Self::Error>,
 			Result<NativeOrEncoded<R>, Self::Error>
@@ -183,7 +181,6 @@ where
 		NC: FnOnce() -> result::Result<R, sp_api::ApiError> + UnwindSafe,
 	>(
 		&self,
-		initialize_block_fn: IB,
 		at: &BlockId<Block>,
 		method: &str,
 		call_data: &[u8],
@@ -191,21 +188,11 @@ where
 		storage_transaction_cache: Option<&RefCell<
 			StorageTransactionCache<Block, B::State>
 		>>,
-		initialize_block: InitializeBlock<'a, Block>,
 		execution_manager: ExecutionManager<EM>,
 		native_call: Option<NC>,
 		recorder: &Option<ProofRecorder<Block>>,
 		extensions: Option<Extensions>,
 	) -> Result<NativeOrEncoded<R>, sp_blockchain::Error> where ExecutionManager<EM>: Clone {
-		match initialize_block {
-			InitializeBlock::Do(ref init_block)
-				if init_block.borrow().as_ref().map(|id| id != at).unwrap_or(true) => {
-				initialize_block_fn()?;
-			},
-			// We don't need to initialize the runtime at a block.
-			_ => {},
-		}
-
 		let changes_trie_state = backend::changes_tries_state_at_block(at, self.backend.changes_trie_storage())?;
 		let mut storage_transaction_cache = storage_transaction_cache.map(|c| c.borrow_mut());
 
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index 4a998a12d2b7..ab5a0d9394c2 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -1243,18 +1243,6 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		trace!("Collected {} uncles", uncles.len());
 		Ok(uncles)
 	}
-
-	/// Prepare in-memory header that is used in execution environment.
-	fn prepare_environment_block(&self, parent: &BlockId<Block>) -> sp_blockchain::Result<Block::Header> {
-		let parent_hash = self.backend.blockchain().expect_block_hash_from_id(parent)?;
-		Ok(<<Block as BlockT>::Header as HeaderT>::new(
-			self.backend.blockchain().expect_block_number_from_id(parent)? + One::one(),
-			Default::default(),
-			Default::default(),
-			parent_hash,
-			Default::default(),
-		))
-	}
 }
 
 impl<B, E, Block, RA> UsageProvider<Block> for Client<B, E, Block, RA> where
@@ -1313,10 +1301,8 @@ impl<B, E, Block, RA> ProofProvider<Block> for Client<B, E, Block, RA> where
 		)?;
 
 		let state = self.state_at(id)?;
-		let header = self.prepare_environment_block(id)?;
 		prove_execution(
 			state,
-			header,
 			&self.executor,
 			method,
 			call_data,
@@ -1782,12 +1768,10 @@ impl<B, E, Block, RA> CallApiAt<Block> for Client<B, E, Block, RA> where
 		'a,
 		R: Encode + Decode + PartialEq,
 		NC: FnOnce() -> result::Result<R, sp_api::ApiError> + UnwindSafe,
-		C: CoreApi<Block>,
 	>(
 		&self,
-		params: CallApiAtParams<'a, Block, C, NC, B::State>,
+		params: CallApiAtParams<'a, Block, NC, B::State>,
 	) -> Result<NativeOrEncoded<R>, sp_api::ApiError> {
-		let core_api = params.core_api;
 		let at = params.at;
 
 		let (manager, extensions) = self.execution_extensions.manager_and_extensions(
@@ -1795,16 +1779,12 @@ impl<B, E, Block, RA> CallApiAt<Block> for Client<B, E, Block, RA> where
 			params.context,
 		);
 
-		self.executor.contextual_call::<_, fn(_,_) -> _,_,_>(
-			|| core_api
-				.initialize_block(at, &self.prepare_environment_block(at)?)
-				.map_err(Error::RuntimeApiError),
+		self.executor.contextual_call::<fn(_,_) -> _, _, _>(
 			at,
 			params.function,
 			&params.arguments,
 			params.overlayed_changes,
 			Some(params.storage_transaction_cache),
-			params.initialize_block,
 			manager,
 			params.native_call,
 			params.recorder,
diff --git a/client/service/test/src/client/light.rs b/client/service/test/src/client/light.rs
index 8841d498ecfb..440e0b4dd0dc 100644
--- a/client/service/test/src/client/light.rs
+++ b/client/service/test/src/client/light.rs
@@ -20,7 +20,6 @@ use sc_light::{
 	call_executor::{
 		GenesisCallExecutor,
 		check_execution_proof,
-		check_execution_proof_with_make_header,
 	},
 	fetcher::LightDataChecker,
 	blockchain::{BlockchainCache, Blockchain},
@@ -37,7 +36,7 @@ use parking_lot::Mutex;
 use substrate_test_runtime_client::{
 	runtime::{Hash, Block, Header}, TestClient, ClientBlockImportExt,
 };
-use sp_api::{InitializeBlock, StorageTransactionCache, ProofRecorder};
+use sp_api::{StorageTransactionCache, ProofRecorder};
 use sp_consensus::BlockOrigin;
 use sc_executor::{NativeExecutor, WasmExecutionMethod, RuntimeVersion, NativeVersion};
 use sp_core::{H256, NativeOrEncoded, testing::TaskExecutor};
@@ -209,8 +208,6 @@ impl CallExecutor<Block> for DummyCallExecutor {
 	}
 
 	fn contextual_call<
-		'a,
-		IB: Fn() -> ClientResult<()>,
 		EM: Fn(
 			Result<NativeOrEncoded<R>, Self::Error>,
 			Result<NativeOrEncoded<R>, Self::Error>
@@ -219,7 +216,6 @@ impl CallExecutor<Block> for DummyCallExecutor {
 		NC: FnOnce() -> Result<R, sp_api::ApiError> + UnwindSafe,
 	>(
 		&self,
-		_initialize_block_fn: IB,
 		_at: &BlockId<Block>,
 		_method: &str,
 		_call_data: &[u8],
@@ -230,7 +226,6 @@ impl CallExecutor<Block> for DummyCallExecutor {
 				<Self::Backend as sc_client_api::backend::Backend<Block>>::State,
 			>
 		>>,
-		_initialize_block: InitializeBlock<'a, Block>,
 		_execution_manager: ExecutionManager<EM>,
 		_native_call: Option<NC>,
 		_proof_recorder: &Option<ProofRecorder<Block>>,
@@ -333,36 +328,41 @@ fn execution_proof_is_generated_and_checked() {
 		(remote_result, local_result)
 	}
 
-	fn execute_with_proof_failure(remote_client: &TestClient, at: u64, method: &'static str) {
+	fn execute_with_proof_failure(remote_client: &TestClient, at: u64) {
 		let remote_block_id = BlockId::Number(at);
 		let remote_header = remote_client.header(&remote_block_id).unwrap().unwrap();
 
 		// 'fetch' execution proof from remote node
 		let (_, remote_execution_proof) = remote_client.execution_proof(
 			&remote_block_id,
-			method,
-			&[]
+			"Core_initialize_block",
+			&Header::new(
+				at,
+				Default::default(),
+				Default::default(),
+				Default::default(),
+				Default::default(),
+			).encode(),
 		).unwrap();
 
 		// check remote execution proof locally
-		let execution_result = check_execution_proof_with_make_header::<_, _, BlakeTwo256, _>(
+		let execution_result = check_execution_proof::<_, _, BlakeTwo256>(
 			&local_executor(),
 			Box::new(TaskExecutor::new()),
 			&RemoteCallRequest {
 				block: substrate_test_runtime_client::runtime::Hash::default(),
-				header: remote_header,
-				method: method.into(),
-				call_data: vec![],
+				header: remote_header.clone(),
+				method: "Core_initialize_block".into(),
+				call_data: Header::new(
+					at + 1,
+					Default::default(),
+					Default::default(),
+					remote_header.hash(),
+					remote_header.digest().clone(), // this makes next header wrong
+				).encode(),
 				retry_count: None,
 			},
 			remote_execution_proof,
-			|header| <Header as HeaderT>::new(
-				at + 1,
-				Default::default(),
-				Default::default(),
-				header.hash(),
-				header.digest().clone(), // this makes next header wrong
-			),
 		);
 		match execution_result {
 			Err(sp_blockchain::Error::Execution(_)) => (),
@@ -389,21 +389,12 @@ fn execution_proof_is_generated_and_checked() {
 	let (remote, local) = execute(&remote_client, 2, "Core_version");
 	assert_eq!(remote, local);
 
-	// check method that requires environment
-	let (_, block) = execute(&remote_client, 0, "BlockBuilder_finalize_block");
-	let local_block: Header = Decode::decode(&mut &block[..]).unwrap();
-	assert_eq!(local_block.number, 1);
-
-	let (_, block) = execute(&remote_client, 2, "BlockBuilder_finalize_block");
-	let local_block: Header = Decode::decode(&mut &block[..]).unwrap();
-	assert_eq!(local_block.number, 3);
-
 	// check that proof check doesn't panic even if proof is incorrect AND no panic handler is set
-	execute_with_proof_failure(&remote_client, 2, "Core_version");
+	execute_with_proof_failure(&remote_client, 2);
 
 	// check that proof check doesn't panic even if proof is incorrect AND panic handler is set
 	sp_panic_handler::set("TEST", "1.2.3");
-	execute_with_proof_failure(&remote_client, 2, "Core_version");
+	execute_with_proof_failure(&remote_client, 2);
 }
 
 #[test]
diff --git a/client/transaction-pool/src/api.rs b/client/transaction-pool/src/api.rs
index 74e08c3aa058..dd54e8e76947 100644
--- a/client/transaction-pool/src/api.rs
+++ b/client/transaction-pool/src/api.rs
@@ -203,24 +203,54 @@ where
 	sp_tracing::within_span!(sp_tracing::Level::TRACE, "validate_transaction";
 	{
 		let runtime_api = client.runtime_api();
-		let has_v2 = sp_tracing::within_span! { sp_tracing::Level::TRACE, "check_version";
+		let api_version = sp_tracing::within_span! { sp_tracing::Level::TRACE, "check_version";
 			runtime_api
-				.has_api_with::<dyn TaggedTransactionQueue<Block>, _>(&at, |v| v >= 2)
-				.unwrap_or_default()
-		};
+				.api_version::<dyn TaggedTransactionQueue<Block>>(&at)
+				.map_err(|e| Error::RuntimeApi(e.to_string()))?
+				.ok_or_else(|| Error::RuntimeApi(
+					format!("Could not find `TaggedTransactionQueue` api for block `{:?}`.", at)
+				))
+		}?;
+
+		let block_hash = client.to_hash(at)
+			.map_err(|e| Error::RuntimeApi(format!("{:?}", e)))?
+			.ok_or_else(|| Error::RuntimeApi(format!("Could not get hash for block `{:?}`.", at)))?;
 
-		let res = sp_tracing::within_span!(
+		use sp_api::Core;
+
+		sp_tracing::within_span!(
 			sp_tracing::Level::TRACE, "runtime::validate_transaction";
 		{
-			if has_v2 {
-				runtime_api.validate_transaction(&at, source, uxt)
+			if api_version >= 3 {
+				runtime_api.validate_transaction(&at, source, uxt, block_hash)
+					.map_err(|e| Error::RuntimeApi(e.to_string()))
 			} else {
-				#[allow(deprecated)] // old validate_transaction
-				runtime_api.validate_transaction_before_version_2(&at, uxt)
+				let block_number = client.to_number(at)
+					.map_err(|e| Error::RuntimeApi(format!("{:?}", e)))?
+					.ok_or_else(||
+						Error::RuntimeApi(format!("Could not get number for block `{:?}`.", at))
+					)?;
+
+				// The old versions require us to call `initialize_block` before.
+				runtime_api.initialize_block(at, &sp_runtime::traits::Header::new(
+					block_number + sp_runtime::traits::One::one(),
+					Default::default(),
+					Default::default(),
+					block_hash,
+					Default::default()),
+				).map_err(|e| Error::RuntimeApi(e.to_string()))?;
+
+				if api_version == 2 {
+					#[allow(deprecated)] // old validate_transaction
+					runtime_api.validate_transaction_before_version_3(&at, source, uxt)
+						.map_err(|e| Error::RuntimeApi(e.to_string()))
+				} else {
+					#[allow(deprecated)] // old validate_transaction
+					runtime_api.validate_transaction_before_version_2(&at, uxt)
+						.map_err(|e| Error::RuntimeApi(e.to_string()))
+				}
 			}
-		});
-
-		res.map_err(|e| Error::RuntimeApi(e.to_string()))
+		})
 	})
 }
 
diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index 1d2ad069f07a..c5f39e14f5fc 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -474,10 +474,18 @@ where
 	pub fn validate_transaction(
 		source: TransactionSource,
 		uxt: Block::Extrinsic,
+		block_hash: Block::Hash,
 	) -> TransactionValidity {
 		sp_io::init_tracing();
 		use sp_tracing::{enter_span, within_span};
 
+		<frame_system::Pallet<System>>::initialize(
+			&(frame_system::Pallet::<System>::block_number() + One::one()),
+			&block_hash,
+			&Default::default(),
+			frame_system::InitKind::Inspection,
+		);
+
 		enter_span!{ sp_tracing::Level::TRACE, "validate_transaction" };
 
 		let encoded_len = within_span!{ sp_tracing::Level::TRACE, "using_encoded";
@@ -1006,11 +1014,19 @@ mod tests {
 		default_with_prio_3.priority = 3;
 		t.execute_with(|| {
 			assert_eq!(
-				Executive::validate_transaction(TransactionSource::InBlock, valid.clone()),
+				Executive::validate_transaction(
+					TransactionSource::InBlock,
+					valid.clone(),
+					Default::default(),
+				),
 				Ok(default_with_prio_3),
 			);
 			assert_eq!(
-				Executive::validate_transaction(TransactionSource::InBlock, invalid.clone()),
+				Executive::validate_transaction(
+					TransactionSource::InBlock,
+					invalid.clone(),
+					Default::default(),
+				),
 				Err(TransactionValidityError::Unknown(UnknownTransaction::NoUnsignedValidator)),
 			);
 			assert_eq!(Executive::apply_extrinsic(valid), Ok(Err(DispatchError::BadOrigin)));
diff --git a/frame/merkle-mountain-range/primitives/src/lib.rs b/frame/merkle-mountain-range/primitives/src/lib.rs
index 73d4d3ecc1fc..7b562656a1e0 100644
--- a/frame/merkle-mountain-range/primitives/src/lib.rs
+++ b/frame/merkle-mountain-range/primitives/src/lib.rs
@@ -406,7 +406,6 @@ sp_api::decl_runtime_apis! {
 	/// API to interact with MMR pallet.
 	pub trait MmrApi<Hash: codec::Codec> {
 		/// Generate MMR proof for a leaf under given index.
-		#[skip_initialize_block]
 		fn generate_proof(leaf_index: u64) -> Result<(EncodableOpaqueLeaf, Proof<Hash>), Error>;
 
 		/// Verify MMR proof against on-chain MMR.
@@ -414,7 +413,6 @@ sp_api::decl_runtime_apis! {
 		/// Note this function will use on-chain MMR root hash and check if the proof
 		/// matches the hash.
 		/// See [Self::verify_proof_stateless] for a stateless verifier.
-		#[skip_initialize_block]
 		fn verify_proof(leaf: EncodableOpaqueLeaf, proof: Proof<Hash>) -> Result<(), Error>;
 
 		/// Verify MMR proof against given root hash.
@@ -423,7 +421,6 @@ sp_api::decl_runtime_apis! {
 		/// proof is verified against given MMR root hash.
 		///
 		/// The leaf data is expected to be encoded in it's compact form.
-		#[skip_initialize_block]
 		fn verify_proof_stateless(root: Hash, leaf: EncodableOpaqueLeaf, proof: Proof<Hash>)
 			-> Result<(), Error>;
 	}
diff --git a/primitives/api/proc-macro/src/decl_runtime_apis.rs b/primitives/api/proc-macro/src/decl_runtime_apis.rs
index 9fd5baba877d..4a8b49049e76 100644
--- a/primitives/api/proc-macro/src/decl_runtime_apis.rs
+++ b/primitives/api/proc-macro/src/decl_runtime_apis.rs
@@ -58,21 +58,9 @@ const CHANGED_IN_ATTRIBUTE: &str = "changed_in";
 ///
 /// Is used when a trait method was renamed.
 const RENAMED_ATTRIBUTE: &str = "renamed";
-/// The `skip_initialize_block` attribute.
-///
-/// Is used when a trait method does not require that the block is initialized
-/// before being called.
-const SKIP_INITIALIZE_BLOCK_ATTRIBUTE: &str = "skip_initialize_block";
-/// The `initialize_block` attribute.
-///
-/// A trait method tagged with this attribute, initializes the runtime at
-/// certain block.
-const INITIALIZE_BLOCK_ATTRIBUTE: &str = "initialize_block";
 /// All attributes that we support in the declaration of a runtime api trait.
 const SUPPORTED_ATTRIBUTE_NAMES: &[&str] = &[
-	CORE_TRAIT_ATTRIBUTE, API_VERSION_ATTRIBUTE, CHANGED_IN_ATTRIBUTE,
-	RENAMED_ATTRIBUTE, SKIP_INITIALIZE_BLOCK_ATTRIBUTE,
-	INITIALIZE_BLOCK_ATTRIBUTE,
+	CORE_TRAIT_ATTRIBUTE, API_VERSION_ATTRIBUTE, CHANGED_IN_ATTRIBUTE, RENAMED_ATTRIBUTE,
 ];
 
 /// The structure used for parsing the runtime api declarations.
@@ -376,15 +364,6 @@ fn generate_call_api_at_calls(decl: &ItemTrait) -> Result<TokenStream> {
 			continue;
 		}
 
-		let skip_initialize_block = attrs.contains_key(SKIP_INITIALIZE_BLOCK_ATTRIBUTE);
-		let update_initialized_block = if attrs.contains_key(INITIALIZE_BLOCK_ATTRIBUTE) {
-			quote!(
-				|| *initialized_block.borrow_mut() = Some(*at)
-			)
-		} else {
-			quote!(|| ())
-		};
-
 		// Parse the renamed attributes.
 		let mut renames = Vec::new();
 		if let Some((_, a)) = attrs
@@ -413,72 +392,54 @@ fn generate_call_api_at_calls(decl: &ItemTrait) -> Result<TokenStream> {
 				NC: FnOnce() -> std::result::Result<R, #crate_::ApiError> + std::panic::UnwindSafe,
 				Block: #crate_::BlockT,
 				T: #crate_::CallApiAt<Block>,
-				C: #crate_::Core<Block>,
 			>(
 				call_runtime_at: &T,
-				core_api: &C,
 				at: &#crate_::BlockId<Block>,
 				args: Vec<u8>,
 				changes: &std::cell::RefCell<#crate_::OverlayedChanges>,
 				storage_transaction_cache: &std::cell::RefCell<
 					#crate_::StorageTransactionCache<Block, T::StateBackend>
 				>,
-				initialized_block: &std::cell::RefCell<Option<#crate_::BlockId<Block>>>,
 				native_call: Option<NC>,
 				context: #crate_::ExecutionContext,
 				recorder: &Option<#crate_::ProofRecorder<Block>>,
 			) -> std::result::Result<#crate_::NativeOrEncoded<R>, #crate_::ApiError> {
 				let version = call_runtime_at.runtime_version_at(at)?;
-				use #crate_::InitializeBlock;
-				let initialize_block = if #skip_initialize_block {
-					InitializeBlock::Skip
-				} else {
-					InitializeBlock::Do(&initialized_block)
-				};
-				let update_initialized_block = #update_initialized_block;
 
 				#(
 					// Check if we need to call the function by an old name.
 					if version.apis.iter().any(|(s, v)| {
 						s == &ID && *v < #versions
 					}) {
-						let params = #crate_::CallApiAtParams::<_, _, fn() -> _, _> {
-							core_api,
+						let params = #crate_::CallApiAtParams::<_, fn() -> _, _> {
 							at,
 							function: #old_names,
 							native_call: None,
 							arguments: args,
 							overlayed_changes: changes,
 							storage_transaction_cache,
-							initialize_block,
 							context,
 							recorder,
 						};
 
 						let ret = call_runtime_at.call_api_at(params)?;
 
-						update_initialized_block();
 						return Ok(ret)
 					}
 				)*
 
 				let params = #crate_::CallApiAtParams {
-					core_api,
 					at,
 					function: #trait_fn_name,
 					native_call,
 					arguments: args,
 					overlayed_changes: changes,
 					storage_transaction_cache,
-					initialize_block,
 					context,
 					recorder,
 				};
 
-				let ret = call_runtime_at.call_api_at(params)?;
-
-				update_initialized_block();
-				Ok(ret)
+				call_runtime_at.call_api_at(params)
 			}
 		));
 	}
diff --git a/primitives/api/proc-macro/src/impl_runtime_apis.rs b/primitives/api/proc-macro/src/impl_runtime_apis.rs
index cf1265fdb002..e81c52bbb0b1 100644
--- a/primitives/api/proc-macro/src/impl_runtime_apis.rs
+++ b/primitives/api/proc-macro/src/impl_runtime_apis.rs
@@ -122,9 +122,9 @@ fn generate_impl_calls(
 
 				impl_calls.push((
 					impl_trait_ident.clone(),
-					 method.sig.ident.clone(),
-					 impl_call,
-					 filter_cfg_attrs(&impl_.attrs),
+					method.sig.ident.clone(),
+					impl_call,
+					filter_cfg_attrs(&impl_.attrs),
 				));
 			}
 		}
@@ -186,7 +186,7 @@ fn generate_wasm_interface(impls: &[ItemImpl]) -> Result<TokenStream> {
 
 					#c::init_runtime_logger();
 
-					let output = { #impl_ };
+					let output = (move || { #impl_ })();
 					#c::to_substrate_wasm_fn_return_value(&output)
 				}
 			)
@@ -205,7 +205,6 @@ fn generate_runtime_api_base_structures() -> Result<TokenStream> {
 		pub struct RuntimeApiImpl<Block: #crate_::BlockT, C: #crate_::CallApiAt<Block> + 'static> {
 			call: &'static C,
 			commit_on_success: std::cell::RefCell<bool>,
-			initialized_block: std::cell::RefCell<Option<#crate_::BlockId<Block>>>,
 			changes: std::cell::RefCell<#crate_::OverlayedChanges>,
 			storage_transaction_cache: std::cell::RefCell<
 				#crate_::StorageTransactionCache<Block, C::StateBackend>
@@ -265,6 +264,15 @@ fn generate_runtime_api_base_structures() -> Result<TokenStream> {
 					.map(|v| v.has_api_with(&A::ID, pred))
 			}
 
+			fn api_version<A: #crate_::RuntimeApiInfo + ?Sized>(
+				&self,
+				at: &#crate_::BlockId<Block>,
+			) -> std::result::Result<Option<u32>, #crate_::ApiError> where Self: Sized {
+				self.call
+					.runtime_version_at(at)
+					.map(|v| v.api_version(&A::ID))
+			}
+
 			fn record_proof(&mut self) {
 				self.recorder = Some(Default::default());
 			}
@@ -291,7 +299,6 @@ fn generate_runtime_api_base_structures() -> Result<TokenStream> {
 				#crate_::StorageChanges<C::StateBackend, Block>,
 				String
 			> where Self: Sized {
-				self.initialized_block.borrow_mut().take();
 				self.changes.replace(Default::default()).into_storage_changes(
 					backend,
 					changes_trie_state,
@@ -315,7 +322,6 @@ fn generate_runtime_api_base_structures() -> Result<TokenStream> {
 				RuntimeApiImpl {
 					call: unsafe { std::mem::transmute(call) },
 					commit_on_success: true.into(),
-					initialized_block: None.into(),
 					changes: Default::default(),
 					recorder: Default::default(),
 					storage_transaction_cache: Default::default(),
@@ -329,10 +335,8 @@ fn generate_runtime_api_base_structures() -> Result<TokenStream> {
 				R: #crate_::Encode + #crate_::Decode + PartialEq,
 				F: FnOnce(
 					&C,
-					&Self,
 					&std::cell::RefCell<#crate_::OverlayedChanges>,
 					&std::cell::RefCell<#crate_::StorageTransactionCache<Block, C::StateBackend>>,
-					&std::cell::RefCell<Option<#crate_::BlockId<Block>>>,
 					&Option<#crate_::ProofRecorder<Block>>,
 				) -> std::result::Result<#crate_::NativeOrEncoded<R>, E>,
 				E,
@@ -345,10 +349,8 @@ fn generate_runtime_api_base_structures() -> Result<TokenStream> {
 				}
 				let res = call_api_at(
 					&self.call,
-					self,
 					&self.changes,
 					&self.storage_transaction_cache,
-					&self.initialized_block,
 					&self.recorder,
 				);
 
@@ -501,20 +503,16 @@ impl<'a> Fold for ApiRuntimeImplToApiRuntimeApiImpl<'a> {
 					self.call_api_at(
 						|
 							call_runtime_at,
-							core_api,
 							changes,
 							storage_transaction_cache,
-							initialized_block,
 							recorder
 						| {
 							#runtime_mod_path #call_api_at_call(
 								call_runtime_at,
-								core_api,
 								at,
 								params_encoded,
 								changes,
 								storage_transaction_cache,
-								initialized_block,
 								params.map(|p| {
 									#runtime_mod_path #native_call_generator_ident ::
 										<#runtime, __SR_API_BLOCK__ #(, #trait_generic_arguments )*> (
diff --git a/primitives/api/proc-macro/src/mock_impl_runtime_apis.rs b/primitives/api/proc-macro/src/mock_impl_runtime_apis.rs
index 383cd4f635ea..738420615b62 100644
--- a/primitives/api/proc-macro/src/mock_impl_runtime_apis.rs
+++ b/primitives/api/proc-macro/src/mock_impl_runtime_apis.rs
@@ -94,6 +94,13 @@ fn implement_common_api_traits(
 				Ok(pred(A::VERSION))
 			}
 
+			fn api_version<A: #crate_::RuntimeApiInfo + ?Sized>(
+				&self,
+				_: &#crate_::BlockId<#block_type>,
+			) -> std::result::Result<Option<u32>, #crate_::ApiError> where Self: Sized {
+				Ok(Some(A::VERSION))
+			}
+
 			fn record_proof(&mut self) {
 				unimplemented!("`record_proof` not implemented for runtime api mocks")
 			}
diff --git a/primitives/api/src/lib.rs b/primitives/api/src/lib.rs
index 97342377a76c..ea023677adf3 100644
--- a/primitives/api/src/lib.rs
+++ b/primitives/api/src/lib.rs
@@ -17,20 +17,29 @@
 
 //! Substrate runtime api
 //!
-//! The Substrate runtime api is the crucial interface between the node and the runtime.
-//! Every call that goes into the runtime is done with a runtime api. The runtime apis are not fixed.
-//! Every Substrate user can define its own apis with
-//! [`decl_runtime_apis`](macro.decl_runtime_apis.html) and implement them in
-//! the runtime with [`impl_runtime_apis`](macro.impl_runtime_apis.html).
+//! The Substrate runtime api is the interface between the node and the runtime. There isn't a fixed
+//! set of runtime apis, instead it is up to the user to declare and implement these runtime apis.
+//! The declaration of a runtime api is normally done outside of a runtime, while the implementation
+//! of it has to be done in the runtime. We provide the [`decl_runtime_apis!`] macro for declaring
+//! a runtime api and the [`impl_runtime_apis!`] for implementing them. The macro docs provide more
+//! information on how to use them and what kind of attributes we support.
 //!
-//! Every Substrate runtime needs to implement the [`Core`] runtime api. This api provides the basic
-//! functionality that every runtime needs to export.
+//! It is required that each runtime implements at least the [`Core`] runtime api. This runtime api
+//! provides all the core functions that Substrate expects from a runtime.
 //!
-//! Besides the macros and the [`Core`] runtime api, this crates provides the [`Metadata`] runtime
-//! api, the [`ApiExt`] trait, the [`CallApiAt`] trait and the [`ConstructRuntimeApi`] trait.
+//! # Versioning
 //!
-//! On a meta level this implies, the client calls the generated API from the client perspective.
+//! Runtime apis support versioning. Each runtime api itself has a version attached. It is also
+//! supported to change function signatures or names in a non-breaking way. For more information on
+//! versioning check the [`decl_runtime_apis!`] macro.
 //!
+//! All runtime apis and their versions are returned as part of the [`RuntimeVersion`]. This can be
+//! used to check which runtime api version is currently provided by the on-chain runtime.
+//!
+//! # Testing
+//!
+//! For testing we provide the [`mock_impl_runtime_apis!`] macro that lets you implement a runtime
+//! api for a mocked object to use it in tests.
 //!
 //! # Logging
 //!
@@ -43,6 +52,17 @@
 //! that this feature instructs `log` and `tracing` to disable logging at compile time by setting
 //! the `max_level_off` feature for these crates. So, you should not enable this feature for a
 //! native build as otherwise the node will not output any log messages.
+//!
+//! # How does it work?
+//!
+//! Each runtime api is declared as a trait with functions. When compiled to WASM, each implemented
+//! runtime api function is exported as a function with the following naming scheme
+//! `${TRAIT_NAME}_${FUNCTION_NAME}`. Such a function has the following signature
+//! `(ptr: *u8, length: u32) -> u64`. It takes a pointer to an `u8` array and its length as an
+//! argument. This `u8` array is expected to be the SCALE encoded parameters of the function as
+//! defined in the trait. The return value is an `u64` that represents `length << 32 | pointer` of an
+//! `u8` array. This return value `u8` array contains the SCALE encoded return value as defined by
+//! the trait function. The macros take care to encode the parameters and to decode the return value.
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
@@ -99,7 +119,7 @@ pub const MAX_EXTRINSIC_DEPTH: u32 = 256;
 /// to the client side and the runtime side. This generic parameter is usable by the user.
 ///
 /// For implementing these macros you should use the
-/// [`impl_runtime_apis!`](macro.impl_runtime_apis.html) macro.
+/// [`impl_runtime_apis!`] macro.
 ///
 /// # Example
 ///
@@ -461,6 +481,12 @@ pub trait ApiExt<Block: BlockT> {
 		pred: P,
 	) -> Result<bool, ApiError> where Self: Sized;
 
+	/// Returns the version of the given api.
+	fn api_version<A: RuntimeApiInfo + ?Sized>(
+		&self,
+		at: &BlockId<Block>,
+	) -> Result<Option<u32>, ApiError> where Self: Sized;
+
 	/// Start recording all accessed trie nodes for generating proofs.
 	fn record_proof(&mut self);
 
@@ -489,31 +515,9 @@ pub trait ApiExt<Block: BlockT> {
 	> where Self: Sized;
 }
 
-/// Before calling any runtime api function, the runtime need to be initialized
-/// at the requested block. However, some functions like `execute_block` or
-/// `initialize_block` itself don't require to have the runtime initialized
-/// at the requested block.
-///
-/// `call_api_at` is instructed by this enum to do the initialization or to skip
-/// it.
-#[cfg(feature = "std")]
-#[derive(Clone, Copy)]
-pub enum InitializeBlock<'a, Block: BlockT> {
-	/// Skip initializing the runtime for a given block.
-	///
-	/// This is used by functions who do the initialization by themselves or don't require it.
-	Skip,
-	/// Initialize the runtime for a given block.
-	///
-	/// If the stored `BlockId` is `Some(_)`, the runtime is currently initialized at this block.
-	Do(&'a RefCell<Option<BlockId<Block>>>),
-}
-
 /// Parameters for [`CallApiAt::call_api_at`].
 #[cfg(feature = "std")]
-pub struct CallApiAtParams<'a, Block: BlockT, C, NC, Backend: StateBackend<HashFor<Block>>> {
-	/// A reference to something that implements the [`Core`] api.
-	pub core_api: &'a C,
+pub struct CallApiAtParams<'a, Block: BlockT, NC, Backend: StateBackend<HashFor<Block>>> {
 	/// The block id that determines the state that should be setup when calling the function.
 	pub at: &'a BlockId<Block>,
 	/// The name of the function that should be called.
@@ -529,9 +533,6 @@ pub struct CallApiAtParams<'a, Block: BlockT, C, NC, Backend: StateBackend<HashF
 	pub overlayed_changes: &'a RefCell<OverlayedChanges>,
 	/// The cache for storage transactions.
 	pub storage_transaction_cache: &'a RefCell<StorageTransactionCache<Block, Backend>>,
-	/// Determines if the function requires that `initialize_block` should be called before calling
-	/// the actual function.
-	pub initialize_block: InitializeBlock<'a, Block>,
 	/// The context this function is executed in.
 	pub context: ExecutionContext,
 	/// The optional proof recorder for recording storage accesses.
@@ -550,10 +551,9 @@ pub trait CallApiAt<Block: BlockT> {
 		'a,
 		R: Encode + Decode + PartialEq,
 		NC: FnOnce() -> result::Result<R, ApiError> + UnwindSafe,
-		C: Core<Block>,
 	>(
 		&self,
-		params: CallApiAtParams<'a, Block, C, NC, Self::StateBackend>,
+		params: CallApiAtParams<'a, Block, NC, Self::StateBackend>,
 	) -> Result<NativeOrEncoded<R>, ApiError>;
 
 	/// Returns the runtime version at the given block.
@@ -704,12 +704,9 @@ decl_runtime_apis! {
 		#[changed_in(3)]
 		fn version() -> OldRuntimeVersion;
 		/// Execute the given block.
-		#[skip_initialize_block]
 		fn execute_block(block: Block);
 		/// Initialize a block with the given header.
 		#[renamed("initialise_block", 2)]
-		#[skip_initialize_block]
-		#[initialize_block]
 		fn initialize_block(header: &<Block as BlockT>::Header);
 	}
 
diff --git a/primitives/api/test/tests/runtime_calls.rs b/primitives/api/test/tests/runtime_calls.rs
index 562735834ddc..b60c7a09cb61 100644
--- a/primitives/api/test/tests/runtime_calls.rs
+++ b/primitives/api/test/tests/runtime_calls.rs
@@ -15,11 +15,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use sp_api::ProvideRuntimeApi;
+use sp_api::{ProvideRuntimeApi, Core};
 use substrate_test_runtime_client::{
 	prelude::*,
 	DefaultTestClientBuilderExt, TestClientBuilder,
-	runtime::{TestAPI, DecodeFails, Transfer, Block},
+	runtime::{TestAPI, DecodeFails, Transfer, Block, Header},
 };
 use sp_runtime::{generic::BlockId, traits::{Header as HeaderT, HashFor}};
 use sp_state_machine::{
@@ -133,26 +133,13 @@ fn initialize_block_works() {
 	let client = TestClientBuilder::new().set_execution_strategy(ExecutionStrategy::Both).build();
 	let runtime_api = client.runtime_api();
 	let block_id = BlockId::Number(client.chain_info().best_number);
+	runtime_api.initialize_block(
+		&block_id,
+		&Header::new(1, Default::default(), Default::default(), Default::default(), Default::default()),
+	).unwrap();
 	assert_eq!(runtime_api.get_block_number(&block_id).unwrap(), 1);
 }
 
-#[test]
-fn initialize_block_is_called_only_once() {
-	let client = TestClientBuilder::new().set_execution_strategy(ExecutionStrategy::Both).build();
-	let runtime_api = client.runtime_api();
-	let block_id = BlockId::Number(client.chain_info().best_number);
-	assert_eq!(runtime_api.take_block_number(&block_id).unwrap(), Some(1));
-	assert_eq!(runtime_api.take_block_number(&block_id).unwrap(), None);
-}
-
-#[test]
-fn initialize_block_is_skipped() {
-	let client = TestClientBuilder::new().set_execution_strategy(ExecutionStrategy::Both).build();
-	let runtime_api = client.runtime_api();
-	let block_id = BlockId::Number(client.chain_info().best_number);
-	assert!(runtime_api.without_initialize_block(&block_id).unwrap());
-}
-
 #[test]
 fn record_proof_works() {
 	let (client, longest_chain) = TestClientBuilder::new()
diff --git a/primitives/consensus/aura/src/lib.rs b/primitives/consensus/aura/src/lib.rs
index ef888a2ab855..a28e681fda27 100644
--- a/primitives/consensus/aura/src/lib.rs
+++ b/primitives/consensus/aura/src/lib.rs
@@ -90,7 +90,6 @@ sp_api::decl_runtime_apis! {
 		fn slot_duration() -> SlotDuration;
 
 		// Return the current set of authorities.
-		#[skip_initialize_block]
 		fn authorities() -> Vec<AuthorityId>;
 	}
 }
diff --git a/primitives/offchain/src/lib.rs b/primitives/offchain/src/lib.rs
index ffdc2bfcc3a6..72ceca80cfbf 100644
--- a/primitives/offchain/src/lib.rs
+++ b/primitives/offchain/src/lib.rs
@@ -28,12 +28,10 @@ sp_api::decl_runtime_apis! {
 	#[api_version(2)]
 	pub trait OffchainWorkerApi {
 		/// Starts the off-chain task for given block number.
-		#[skip_initialize_block]
 		#[changed_in(2)]
 		fn offchain_worker(number: sp_runtime::traits::NumberFor<Block>);
 
 		/// Starts the off-chain task for given block header.
-		#[skip_initialize_block]
 		fn offchain_worker(header: &Block::Header);
 	}
 }
diff --git a/primitives/transaction-pool/src/runtime_api.rs b/primitives/transaction-pool/src/runtime_api.rs
index e1c3280ca2aa..42542d9f3c8b 100644
--- a/primitives/transaction-pool/src/runtime_api.rs
+++ b/primitives/transaction-pool/src/runtime_api.rs
@@ -22,22 +22,32 @@ use sp_runtime::traits::Block as BlockT;
 
 sp_api::decl_runtime_apis! {
 	/// The `TaggedTransactionQueue` api trait for interfering with the transaction queue.
-	#[api_version(2)]
+	#[api_version(3)]
 	pub trait TaggedTransactionQueue {
 		/// Validate the transaction.
 		#[changed_in(2)]
 		fn validate_transaction(tx: <Block as BlockT>::Extrinsic) -> TransactionValidity;
 
+		/// Validate the transaction.
+		#[changed_in(3)]
+		fn validate_transaction(
+			source: TransactionSource,
+			tx: <Block as BlockT>::Extrinsic,
+		) -> TransactionValidity;
+
 		/// Validate the transaction.
 		///
 		/// This method is invoked by the transaction pool to learn details about given transaction.
 		/// The implementation should make sure to verify the correctness of the transaction
-		/// against current state.
+		/// against current state. The given `block_hash` corresponds to the hash of the block
+		/// that is used as current state.
+		///
 		/// Note that this call may be performed by the pool multiple times and transactions
 		/// might be verified in any possible order.
 		fn validate_transaction(
 			source: TransactionSource,
 			tx: <Block as BlockT>::Extrinsic,
+			block_hash: Block::Hash,
 		) -> TransactionValidity;
 	}
 }
diff --git a/primitives/version/src/lib.rs b/primitives/version/src/lib.rs
index 8940e85f68a8..15b4a128924f 100644
--- a/primitives/version/src/lib.rs
+++ b/primitives/version/src/lib.rs
@@ -198,6 +198,11 @@ impl RuntimeVersion {
 	) -> bool {
 		self.apis.iter().any(|(s, v)| s == id && predicate(*v))
 	}
+
+	/// Returns the api version found for api with `id`.
+	pub fn api_version(&self, id: &ApiId) -> Option<u32> {
+		self.apis.iter().find_map(|a| (a.0 == *id).then(|| a.1))
+	}
 }
 
 #[cfg(feature = "std")]
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index 7ee1072a7b83..084f1338cd26 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -343,9 +343,6 @@ cfg_if! {
 				fn get_block_number() -> u64;
 				/// Takes and returns the initialized block number.
 				fn take_block_number() -> Option<u64>;
-				/// Returns if no block was initialized.
-				#[skip_initialize_block]
-				fn without_initialize_block() -> bool;
 				/// Test that `ed25519` crypto works in the runtime.
 				///
 				/// Returns the signature generated for the message `ed25519` and the public key.
@@ -396,9 +393,6 @@ cfg_if! {
 				fn get_block_number() -> u64;
 				/// Takes and returns the initialized block number.
 				fn take_block_number() -> Option<u64>;
-				/// Returns if no block was initialized.
-				#[skip_initialize_block]
-				fn without_initialize_block() -> bool;
 				/// Test that `ed25519` crypto works in the runtime.
 				///
 				/// Returns the signature generated for the message `ed25519` and the public key.
@@ -635,6 +629,7 @@ cfg_if! {
 				fn validate_transaction(
 					_source: TransactionSource,
 					utx: <Block as BlockT>::Extrinsic,
+					_: <Block as BlockT>::Hash,
 				) -> TransactionValidity {
 					if let Extrinsic::IncludeData(data) = utx {
 						return Ok(ValidTransaction {
@@ -720,10 +715,6 @@ cfg_if! {
 					system::get_block_number().expect("Block number is initialized")
 				}
 
-				fn without_initialize_block() -> bool {
-					system::get_block_number().is_none()
-				}
-
 				fn take_block_number() -> Option<u64> {
 					system::take_block_number()
 				}
@@ -888,6 +879,7 @@ cfg_if! {
 				fn validate_transaction(
 					_source: TransactionSource,
 					utx: <Block as BlockT>::Extrinsic,
+					_: <Block as BlockT>::Hash,
 				) -> TransactionValidity {
 					if let Extrinsic::IncludeData(data) = utx {
 						return Ok(ValidTransaction{
@@ -977,10 +969,6 @@ cfg_if! {
 					system::get_block_number().expect("Block number is initialized")
 				}
 
-				fn without_initialize_block() -> bool {
-					system::get_block_number().is_none()
-				}
-
 				fn take_block_number() -> Option<u64> {
 					system::take_block_number()
 				}
diff --git a/test-utils/runtime/src/system.rs b/test-utils/runtime/src/system.rs
index 33ef7b12d8db..ae35ded83bfc 100644
--- a/test-utils/runtime/src/system.rs
+++ b/test-utils/runtime/src/system.rs
@@ -193,7 +193,8 @@ pub fn validate_transaction(utx: Extrinsic) -> TransactionValidity {
 /// Execute a transaction outside of the block execution function.
 /// This doesn't attempt to validate anything regarding the block.
 pub fn execute_transaction(utx: Extrinsic) -> ApplyExtrinsicResult {
-	let extrinsic_index: u32 = storage::unhashed::get(well_known_keys::EXTRINSIC_INDEX).unwrap();
+	let extrinsic_index: u32 = storage::unhashed::get(well_known_keys::EXTRINSIC_INDEX)
+		.unwrap_or_default();
 	let result = execute_transaction_backend(&utx, extrinsic_index);
 	ExtrinsicData::insert(extrinsic_index, utx.encode());
 	storage::unhashed::put(well_known_keys::EXTRINSIC_INDEX, &(extrinsic_index + 1));

From 57e0bb388b5a8c3c42d01df9214d445077c377f9 Mon Sep 17 00:00:00 2001
From: Keith Yeung <kungfukeith11@gmail.com>
Date: Thu, 1 Jul 2021 10:20:15 -0700
Subject: [PATCH 0941/1194] Implement `iter_keys` function for all types of
 storage maps (#9238)

* Implement `iter_keys` function for all types of storage maps

* Remove draining iterator API

* Rename associated key iterator types

* Simplify iteration code

* add test for `iter_keys().drain()`

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 .../src/storage/generator/double_map.rs       |  43 +++++-
 frame/support/src/storage/generator/map.rs    |  19 ++-
 frame/support/src/storage/generator/nmap.rs   |  39 ++++-
 frame/support/src/storage/mod.rs              | 139 +++++++++++++++++-
 frame/support/src/storage/types/double_map.rs |  16 ++
 frame/support/src/storage/types/map.rs        |   7 +
 frame/support/src/storage/types/nmap.rs       |  20 +++
 7 files changed, 279 insertions(+), 4 deletions(-)

diff --git a/frame/support/src/storage/generator/double_map.rs b/frame/support/src/storage/generator/double_map.rs
index 836ae25bdbbc..71d8ca3c043a 100644
--- a/frame/support/src/storage/generator/double_map.rs
+++ b/frame/support/src/storage/generator/double_map.rs
@@ -18,7 +18,7 @@
 use sp_std::prelude::*;
 use sp_std::borrow::Borrow;
 use codec::{FullCodec, FullEncode, Decode, Encode, EncodeLike};
-use crate::{storage::{self, unhashed, StorageAppend, PrefixIterator}, Never};
+use crate::{storage::{self, unhashed, KeyPrefixIterator, StorageAppend, PrefixIterator}, Never};
 use crate::hash::{StorageHasher, Twox128, ReversibleStorageHasher};
 
 /// Generator for `StorageDoubleMap` used by `decl_storage`.
@@ -340,7 +340,9 @@ impl<
 	G::Hasher1: ReversibleStorageHasher,
 	G::Hasher2: ReversibleStorageHasher
 {
+	type PartialKeyIterator = KeyPrefixIterator<K2>;
 	type PrefixIterator = PrefixIterator<(K2, V)>;
+	type FullKeyIterator = KeyPrefixIterator<(K1, K2)>;
 	type Iterator = PrefixIterator<(K1, K2, V)>;
 
 	fn iter_prefix(k1: impl EncodeLike<K1>) -> Self::PrefixIterator {
@@ -356,6 +358,19 @@ impl<
 		}
 	}
 
+	fn iter_key_prefix(k1: impl EncodeLike<K1>) -> Self::PartialKeyIterator {
+		let prefix = G::storage_double_map_final_key1(k1);
+		Self::PartialKeyIterator {
+			prefix: prefix.clone(),
+			previous_key: prefix,
+			drain: false,
+			closure: |raw_key_without_prefix| {
+				let mut key_material = G::Hasher2::reverse(raw_key_without_prefix);
+				K2::decode(&mut key_material)
+			}
+		}
+	}
+
 	fn drain_prefix(k1: impl EncodeLike<K1>) -> Self::PrefixIterator {
 		let mut iterator = Self::iter_prefix(k1);
 		iterator.drain = true;
@@ -378,6 +393,22 @@ impl<
 		}
 	}
 
+	fn iter_keys() -> Self::FullKeyIterator {
+		let prefix = G::prefix_hash();
+		Self::FullKeyIterator {
+			prefix: prefix.clone(),
+			previous_key: prefix,
+			drain: false,
+			closure: |raw_key_without_prefix| {
+				let mut k1_k2_material = G::Hasher1::reverse(raw_key_without_prefix);
+				let k1 = K1::decode(&mut k1_k2_material)?;
+				let mut k2_material = G::Hasher2::reverse(k1_k2_material);
+				let k2 = K2::decode(&mut k2_material)?;
+				Ok((k1, k2))
+			}
+		}
+	}
+
 	fn drain() -> Self::Iterator {
 		let mut iterator = Self::iter();
 		iterator.drain = true;
@@ -485,6 +516,11 @@ mod test_iterators {
 				vec![(3, 3, 3), (0, 0, 0), (2, 2, 2), (1, 1, 1)],
 			);
 
+			assert_eq!(
+				DoubleMap::iter_keys().collect::<Vec<_>>(),
+				vec![(3, 3), (0, 0), (2, 2), (1, 1)],
+			);
+
 			assert_eq!(
 				DoubleMap::iter_values().collect::<Vec<_>>(),
 				vec![3, 0, 2, 1],
@@ -515,6 +551,11 @@ mod test_iterators {
 				vec![(1, 1), (2, 2), (0, 0), (3, 3)],
 			);
 
+			assert_eq!(
+				DoubleMap::iter_key_prefix(k1).collect::<Vec<_>>(),
+				vec![1, 2, 0, 3],
+			);
+
 			assert_eq!(
 				DoubleMap::iter_prefix_values(k1).collect::<Vec<_>>(),
 				vec![1, 2, 0, 3],
diff --git a/frame/support/src/storage/generator/map.rs b/frame/support/src/storage/generator/map.rs
index 9abc7883937d..e58a001c679f 100644
--- a/frame/support/src/storage/generator/map.rs
+++ b/frame/support/src/storage/generator/map.rs
@@ -20,7 +20,7 @@ use sp_std::prelude::*;
 use sp_std::borrow::Borrow;
 use codec::{FullCodec, FullEncode, Decode, Encode, EncodeLike};
 use crate::{
-	storage::{self, unhashed, StorageAppend, PrefixIterator},
+	storage::{self, unhashed, KeyPrefixIterator, StorageAppend, PrefixIterator},
 	Never, hash::{StorageHasher, Twox128, ReversibleStorageHasher},
 };
 
@@ -140,6 +140,7 @@ impl<
 	G::Hasher: ReversibleStorageHasher
 {
 	type Iterator = PrefixIterator<(K, V)>;
+	type KeyIterator = KeyPrefixIterator<K>;
 
 	/// Enumerate all elements in the map.
 	fn iter() -> Self::Iterator {
@@ -155,6 +156,20 @@ impl<
 		}
 	}
 
+	/// Enumerate all keys in the map.
+	fn iter_keys() -> Self::KeyIterator {
+		let prefix = G::prefix_hash();
+		KeyPrefixIterator {
+			prefix: prefix.clone(),
+			previous_key: prefix,
+			drain: false,
+			closure: |raw_key_without_prefix| {
+				let mut key_material = G::Hasher::reverse(raw_key_without_prefix);
+				K::decode(&mut key_material)
+			}
+		}
+	}
+
 	/// Enumerate all elements in the map.
 	fn drain() -> Self::Iterator {
 		let mut iterator = Self::iter();
@@ -378,6 +393,8 @@ mod test_iterators {
 
 			assert_eq!(Map::iter().collect::<Vec<_>>(), vec![(3, 3), (0, 0), (2, 2), (1, 1)]);
 
+			assert_eq!(Map::iter_keys().collect::<Vec<_>>(), vec![3, 0, 2, 1]);
+
 			assert_eq!(Map::iter_values().collect::<Vec<_>>(), vec![3, 0, 2, 1]);
 
 			assert_eq!(Map::drain().collect::<Vec<_>>(), vec![(3, 3), (0, 0), (2, 2), (1, 1)]);
diff --git a/frame/support/src/storage/generator/nmap.rs b/frame/support/src/storage/generator/nmap.rs
index 7a320adcaab2..49c8c94ea7a9 100755
--- a/frame/support/src/storage/generator/nmap.rs
+++ b/frame/support/src/storage/generator/nmap.rs
@@ -37,7 +37,7 @@ use crate::{
 			EncodeLikeTuple, HasKeyPrefix, HasReversibleKeyPrefix, KeyGenerator,
 			ReversibleKeyGenerator, TupleToEncodedIter,
 		},
-		unhashed, PrefixIterator, StorageAppend,
+		unhashed, KeyPrefixIterator, PrefixIterator, StorageAppend,
 	},
 	Never,
 };
@@ -310,6 +310,7 @@ where
 impl<K: ReversibleKeyGenerator, V: FullCodec, G: StorageNMap<K, V>>
 	storage::IterableStorageNMap<K, V> for G
 {
+	type KeyIterator = KeyPrefixIterator<K::Key>;
 	type Iterator = PrefixIterator<(K::Key, V)>;
 
 	fn iter_prefix<KP>(kp: KP) -> PrefixIterator<(<K as HasKeyPrefix<KP>>::Suffix, V)>
@@ -328,6 +329,19 @@ impl<K: ReversibleKeyGenerator, V: FullCodec, G: StorageNMap<K, V>>
 		}
 	}
 
+	fn iter_key_prefix<KP>(kp: KP) -> KeyPrefixIterator<<K as HasKeyPrefix<KP>>::Suffix>
+	where
+		K: HasReversibleKeyPrefix<KP>,
+	{
+		let prefix = G::storage_n_map_partial_key(kp);
+		KeyPrefixIterator {
+			prefix: prefix.clone(),
+			previous_key: prefix,
+			drain: false,
+			closure: K::decode_partial_key,
+		}
+	}
+
 	fn drain_prefix<KP>(kp: KP) -> PrefixIterator<(<K as HasKeyPrefix<KP>>::Suffix, V)>
 	where
 		K: HasReversibleKeyPrefix<KP>,
@@ -350,6 +364,19 @@ impl<K: ReversibleKeyGenerator, V: FullCodec, G: StorageNMap<K, V>>
 		}
 	}
 
+	fn iter_keys() -> Self::KeyIterator {
+		let prefix = G::prefix_hash();
+		Self::KeyIterator {
+			prefix: prefix.clone(),
+			previous_key: prefix,
+			drain: false,
+			closure: |raw_key_without_prefix| {
+				let (final_key, _) = K::decode_final_key(raw_key_without_prefix)?;
+				Ok(final_key)
+			}
+		}
+	}
+
 	fn drain() -> Self::Iterator {
 		let mut iterator = Self::iter();
 		iterator.drain = true;
@@ -471,6 +498,11 @@ mod test_iterators {
 				vec![((3, 3), 3), ((0, 0), 0), ((2, 2), 2), ((1, 1), 1)],
 			);
 
+			assert_eq!(
+				NMap::iter_keys().collect::<Vec<_>>(),
+				vec![(3, 3), (0, 0), (2, 2), (1, 1)],
+			);
+
 			assert_eq!(NMap::iter_values().collect::<Vec<_>>(), vec![3, 0, 2, 1],);
 
 			assert_eq!(
@@ -501,6 +533,11 @@ mod test_iterators {
 				vec![(1, 1), (2, 2), (0, 0), (3, 3)],
 			);
 
+			assert_eq!(
+				NMap::iter_key_prefix((k1,)).collect::<Vec<_>>(),
+				vec![1, 2, 0, 3],
+			);
+
 			assert_eq!(
 				NMap::iter_prefix_values((k1,)).collect::<Vec<_>>(),
 				vec![1, 2, 0, 3],
diff --git a/frame/support/src/storage/mod.rs b/frame/support/src/storage/mod.rs
index 6a02c6572c7f..65bd9af6c498 100644
--- a/frame/support/src/storage/mod.rs
+++ b/frame/support/src/storage/mod.rs
@@ -314,11 +314,17 @@ pub trait StorageMap<K: FullEncode, V: FullCodec> {
 pub trait IterableStorageMap<K: FullEncode, V: FullCodec>: StorageMap<K, V> {
 	/// The type that iterates over all `(key, value)`.
 	type Iterator: Iterator<Item = (K, V)>;
+	/// The type that itereates over all `key`s.
+	type KeyIterator: Iterator<Item = K>;
 
 	/// Enumerate all elements in the map in no particular order. If you alter the map while doing
 	/// this, you'll get undefined results.
 	fn iter() -> Self::Iterator;
 
+	/// Enumerate all keys in the map in no particular order, skipping over the elements. If you
+	/// alter the map while doing this, you'll get undefined results.
+	fn iter_keys() -> Self::KeyIterator;
+
 	/// Remove all elements from the map and iterate through them in no particular order. If you
 	/// add elements to the map while doing this, you'll get undefined results.
 	fn drain() -> Self::Iterator;
@@ -336,9 +342,15 @@ pub trait IterableStorageDoubleMap<
 	K2: FullCodec,
 	V: FullCodec
 >: StorageDoubleMap<K1, K2, V> {
+	/// The type that iterates over all `key2`.
+	type PartialKeyIterator: Iterator<Item = K2>;
+
 	/// The type that iterates over all `(key2, value)`.
 	type PrefixIterator: Iterator<Item = (K2, V)>;
 
+	/// The type that iterates over all `(key1, key2)`.
+	type FullKeyIterator: Iterator<Item = (K1, K2)>;
+
 	/// The type that iterates over all `(key1, key2, value)`.
 	type Iterator: Iterator<Item = (K1, K2, V)>;
 
@@ -347,6 +359,11 @@ pub trait IterableStorageDoubleMap<
 	/// results.
 	fn iter_prefix(k1: impl EncodeLike<K1>) -> Self::PrefixIterator;
 
+	/// Enumerate all second keys `k2` in the map with the same first key `k1` in no particular
+	/// order. If you add or remove values whose first key is `k1` to the map while doing this,
+	/// you'll get undefined results.
+	fn iter_key_prefix(k1: impl EncodeLike<K1>) -> Self::PartialKeyIterator;
+
 	/// Remove all elements from the map with first key `k1` and iterate through them in no
 	/// particular order. If you add elements with first key `k1` to the map while doing this,
 	/// you'll get undefined results.
@@ -356,6 +373,10 @@ pub trait IterableStorageDoubleMap<
 	/// the map while doing this, you'll get undefined results.
 	fn iter() -> Self::Iterator;
 
+	/// Enumerate all keys `k1` and `k2` in the map in no particular order. If you add or remove
+	/// values to the map while doing this, you'll get undefined results.
+	fn iter_keys() -> Self::FullKeyIterator;
+
 	/// Remove all elements from the map and iterate through them in no particular order. If you
 	/// add elements to the map while doing this, you'll get undefined results.
 	fn drain() -> Self::Iterator;
@@ -370,7 +391,10 @@ pub trait IterableStorageDoubleMap<
 /// A strongly-typed map with arbitrary number of keys in storage whose keys and values can be
 /// iterated over.
 pub trait IterableStorageNMap<K: ReversibleKeyGenerator, V: FullCodec>: StorageNMap<K, V> {
-	/// The type that iterates over all `(key1, (key2, (key3, ... (keyN, ()))), value)` tuples
+	/// The type that iterates over all `(key1, key2, key3, ... keyN)` tuples.
+	type KeyIterator: Iterator<Item = K::Key>;
+
+	/// The type that iterates over all `(key1, key2, key3, ... keyN), value)` tuples.
 	type Iterator: Iterator<Item = (K::Key, V)>;
 
 	/// Enumerate all elements in the map with prefix key `kp` in no particular order. If you add or
@@ -379,6 +403,12 @@ pub trait IterableStorageNMap<K: ReversibleKeyGenerator, V: FullCodec>: StorageN
 	fn iter_prefix<KP>(kp: KP) -> PrefixIterator<(<K as HasKeyPrefix<KP>>::Suffix, V)>
 	where K: HasReversibleKeyPrefix<KP>;
 
+	/// Enumerate all suffix keys in the map with prefix key `kp` in no particular order. If you
+	/// add or remove values whose prefix is `kp` to the map while doing this, you'll get undefined
+	/// results.
+	fn iter_key_prefix<KP>(kp: KP) -> KeyPrefixIterator<<K as HasKeyPrefix<KP>>::Suffix>
+	where K: HasReversibleKeyPrefix<KP>;
+
 	/// Remove all elements from the map with prefix key `kp` and iterate through them in no
 	/// particular order. If you add elements with prefix key `kp` to the map while doing this,
 	/// you'll get undefined results.
@@ -389,6 +419,10 @@ pub trait IterableStorageNMap<K: ReversibleKeyGenerator, V: FullCodec>: StorageN
 	/// the map while doing this, you'll get undefined results.
 	fn iter() -> Self::Iterator;
 
+	/// Enumerate all keys in the map in no particular order. If you add or remove values to the
+	/// map while doing this, you'll get undefined results.
+	fn iter_keys() -> Self::KeyIterator;
+
 	/// Remove all elements from the map and iterate through them in no particular order. If you
 	/// add elements to the map while doing this, you'll get undefined results.
 	fn drain() -> Self::Iterator;
@@ -733,6 +767,56 @@ impl<T> Iterator for PrefixIterator<T> {
 	}
 }
 
+/// Iterate over a prefix and decode raw_key into `T`.
+///
+/// If any decoding fails it skips it and continues to the next key.
+pub struct KeyPrefixIterator<T> {
+	prefix: Vec<u8>,
+	previous_key: Vec<u8>,
+	/// If true then value are removed while iterating
+	drain: bool,
+	/// Function that take `raw_key_without_prefix` and decode `T`.
+	/// `raw_key_without_prefix` is the raw storage key without the prefix iterated on.
+	closure: fn(&[u8]) -> Result<T, codec::Error>,
+}
+
+impl<T> KeyPrefixIterator<T> {
+	/// Mutate this iterator into a draining iterator; items iterated are removed from storage.
+	pub fn drain(mut self) -> Self {
+		self.drain = true;
+		self
+	}
+}
+
+impl<T> Iterator for KeyPrefixIterator<T> {
+	type Item = T;
+
+	fn next(&mut self) -> Option<Self::Item> {
+		loop {
+			let maybe_next = sp_io::storage::next_key(&self.previous_key)
+				.filter(|n| n.starts_with(&self.prefix));
+
+			if let Some(next) = maybe_next {
+				self.previous_key = next;
+				if self.drain {
+					unhashed::kill(&self.previous_key);
+				}
+				let raw_key_without_prefix = &self.previous_key[self.prefix.len()..];
+
+				match (self.closure)(raw_key_without_prefix) {
+					Ok(item) => return Some(item),
+					Err(e) => {
+						log::error!("key failed to decode at {:?}: {:?}", self.previous_key, e);
+						continue;
+					}
+				}
+			}
+
+			return None;
+		}
+	}
+}
+
 /// Iterate over a prefix of a child trie and decode raw_key and raw_value into `T`.
 ///
 /// If any decoding fails it skips the key and continues to the next one.
@@ -1276,6 +1360,59 @@ mod test {
 		});
 	}
 
+	#[test]
+	fn key_prefix_iterator_works() {
+		TestExternalities::default().execute_with(|| {
+			use crate::storage::generator::StorageMap;
+			use crate::hash::Twox64Concat;
+			struct MyStorageMap;
+			impl StorageMap<u64, u64> for MyStorageMap {
+				type Query = u64;
+				type Hasher = Twox64Concat;
+
+				fn module_prefix() -> &'static [u8] {
+					b"MyModule"
+				}
+
+				fn storage_prefix() -> &'static [u8] {
+					b"MyStorageMap"
+				}
+
+				fn from_optional_value_to_query(v: Option<u64>) -> Self::Query {
+					v.unwrap_or_default()
+				}
+
+				fn from_query_to_optional_value(v: Self::Query) -> Option<u64> {
+					Some(v)
+				}
+			}
+
+			let k = [twox_128(b"MyModule"), twox_128(b"MyStorageMap")].concat();
+			assert_eq!(MyStorageMap::prefix_hash().to_vec(), k);
+
+			// empty to start
+			assert!(MyStorageMap::iter_keys().collect::<Vec<_>>().is_empty());
+
+			MyStorageMap::insert(1, 10);
+			MyStorageMap::insert(2, 20);
+			MyStorageMap::insert(3, 30);
+			MyStorageMap::insert(4, 40);
+
+			// just looking
+			let mut keys = MyStorageMap::iter_keys().collect::<Vec<_>>();
+			keys.sort();
+			assert_eq!(keys, vec![1, 2, 3, 4]);
+
+			// draining the keys and values
+			let mut drained_keys = MyStorageMap::iter_keys().drain().collect::<Vec<_>>();
+			drained_keys.sort();
+			assert_eq!(drained_keys, vec![1, 2, 3, 4]);
+
+			// empty again
+			assert!(MyStorageMap::iter_keys().collect::<Vec<_>>().is_empty());
+		});
+	}
+
 	#[test]
 	fn child_trie_prefixed_map_works() {
 		TestExternalities::default().execute_with(|| {
diff --git a/frame/support/src/storage/types/double_map.rs b/frame/support/src/storage/types/double_map.rs
index 6f03e9b8b2dd..2220dab58dc4 100644
--- a/frame/support/src/storage/types/double_map.rs
+++ b/frame/support/src/storage/types/double_map.rs
@@ -387,6 +387,15 @@ where
 		<Self as crate::storage::IterableStorageDoubleMap<Key1, Key2, Value>>::iter_prefix(k1)
 	}
 
+	/// Enumerate all second keys `k2` in the map with the same first key `k1` in no particular
+	/// order.
+	///
+	/// If you add or remove values whose first key is `k1` to the map while doing this, you'll get
+	/// undefined results.
+	pub fn iter_key_prefix(k1: impl EncodeLike<Key1>) -> crate::storage::KeyPrefixIterator<Key2> {
+		<Self as crate::storage::IterableStorageDoubleMap<Key1, Key2, Value>>::iter_key_prefix(k1)
+	}
+
 	/// Remove all elements from the map with first key `k1` and iterate through them in no
 	/// particular order.
 	///
@@ -403,6 +412,13 @@ where
 		<Self as crate::storage::IterableStorageDoubleMap<Key1, Key2, Value>>::iter()
 	}
 
+	/// Enumerate all keys `k1` and `k2` in the map in no particular order.
+	///
+	/// If you add or remove values to the map while doing this, you'll get undefined results.
+	pub fn iter_keys() -> crate::storage::KeyPrefixIterator<(Key1, Key2)> {
+		<Self as crate::storage::IterableStorageDoubleMap<Key1, Key2, Value>>::iter_keys()
+	}
+
 	/// Remove all elements from the map and iterate through them in no particular order.
 	///
 	/// If you add elements to the map while doing this, you'll get undefined results.
diff --git a/frame/support/src/storage/types/map.rs b/frame/support/src/storage/types/map.rs
index db3a5e73c9cb..311f2f0b2c77 100644
--- a/frame/support/src/storage/types/map.rs
+++ b/frame/support/src/storage/types/map.rs
@@ -297,6 +297,13 @@ where
 		<Self as crate::storage::IterableStorageMap<Key, Value>>::iter()
 	}
 
+	/// Enumerate all keys in the map in no particular order.
+	///
+	/// If you alter the map while doing this, you'll get undefined results.
+	pub fn iter_keys() -> crate::storage::KeyPrefixIterator<Key> {
+		<Self as crate::storage::IterableStorageMap<Key, Value>>::iter_keys()
+	}
+
 	/// Remove all elements from the map and iterate through them in no particular order.
 	///
 	/// If you add elements to the map while doing this, you'll get undefined results.
diff --git a/frame/support/src/storage/types/nmap.rs b/frame/support/src/storage/types/nmap.rs
index fd1ca47b32c9..0678da22ed14 100755
--- a/frame/support/src/storage/types/nmap.rs
+++ b/frame/support/src/storage/types/nmap.rs
@@ -318,6 +318,19 @@ where
 		<Self as crate::storage::IterableStorageNMap<Key, Value>>::iter_prefix(kp)
 	}
 
+	/// Enumerate all suffix keys in the map with prefix key `kp` in no particular order.
+	///
+	/// If you add or remove values whose prefix key is `kp` to the map while doing this, you'll get
+	/// undefined results.
+	pub fn iter_key_prefix<KP>(
+		kp: KP,
+	) -> crate::storage::KeyPrefixIterator<<Key as HasKeyPrefix<KP>>::Suffix>
+	where
+		Key: HasReversibleKeyPrefix<KP>,
+	{
+		<Self as crate::storage::IterableStorageNMap<Key, Value>>::iter_key_prefix(kp)
+	}
+
 	/// Remove all elements from the map with prefix key `kp` and iterate through them in no
 	/// particular order.
 	///
@@ -339,6 +352,13 @@ where
 		<Self as crate::storage::IterableStorageNMap<Key, Value>>::iter()
 	}
 
+	/// Enumerate all keys in the map in no particular order.
+	///
+	/// If you add or remove values to the map while doing this, you'll get undefined results.
+	pub fn iter_keys() -> crate::storage::KeyPrefixIterator<Key::Key> {
+		<Self as crate::storage::IterableStorageNMap<Key, Value>>::iter_keys()
+	}
+
 	/// Remove all elements from the map and iterate through them in no particular order.
 	///
 	/// If you add elements to the map while doing this, you'll get undefined results.

From ebf2391a0361e662944e3b5fef979e24b4d98494 Mon Sep 17 00:00:00 2001
From: Alexander Popiak <alexander.popiak@parity.io>
Date: Thu, 1 Jul 2021 23:34:17 +0200
Subject: [PATCH 0942/1194] Implement `InspectEnumerable` for Uniques (#9117)

* implement InspectEnumerable in pallet_uniques

* use `iter_keys` and `iter_key_prefix`

* return an iterator instead of constructing a vec

* update comments

* additional warning about storage reads

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 .../support/src/traits/tokens/nonfungible.rs  | 14 ++++----
 .../support/src/traits/tokens/nonfungibles.rs | 18 +++++------
 frame/uniques/src/impl_nonfungibles.rs        | 32 ++++++++++++++++++-
 3 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/frame/support/src/traits/tokens/nonfungible.rs b/frame/support/src/traits/tokens/nonfungible.rs
index 348d830c5002..27e6cf8126a8 100644
--- a/frame/support/src/traits/tokens/nonfungible.rs
+++ b/frame/support/src/traits/tokens/nonfungible.rs
@@ -61,14 +61,12 @@ pub trait Inspect<AccountId> {
 
 /// Interface for enumerating assets in existence or owned by a given account over a collection
 /// of NFTs.
-///
-/// WARNING: These may be a heavy operations. Do not use when execution time is limited.
 pub trait InspectEnumerable<AccountId>: Inspect<AccountId> {
-	/// Returns the instances of an asset `class` in existence.
-	fn instances() -> Vec<Self::InstanceId>;
+	/// Returns an iterator of the instances of an asset `class` in existence.
+	fn instances() -> Box<dyn Iterator<Item = Self::InstanceId>>;
 
-	/// Returns the asset instances of all classes owned by `who`.
-	fn owned(who: &AccountId) -> Vec<Self::InstanceId>;
+	/// Returns an iterator of the asset instances of all classes owned by `who`.
+	fn owned(who: &AccountId) -> Box<dyn Iterator<Item = Self::InstanceId>>;
 }
 
 /// Trait for providing an interface for NFT-like assets which may be minted, burned and/or have
@@ -148,10 +146,10 @@ impl<
 	A: Get<<F as nonfungibles::Inspect<AccountId>>::ClassId>,
 	AccountId,
 > InspectEnumerable<AccountId> for ItemOf<F, A, AccountId> {
-	fn instances() -> Vec<Self::InstanceId> {
+	fn instances() -> Box<dyn Iterator<Item = Self::InstanceId>> {
 		<F as nonfungibles::InspectEnumerable<AccountId>>::instances(&A::get())
 	}
-	fn owned(who: &AccountId) -> Vec<Self::InstanceId> {
+	fn owned(who: &AccountId) -> Box<dyn Iterator<Item = Self::InstanceId>> {
 		<F as nonfungibles::InspectEnumerable<AccountId>>::owned_in_class(&A::get(), who)
 	}
 }
diff --git a/frame/support/src/traits/tokens/nonfungibles.rs b/frame/support/src/traits/tokens/nonfungibles.rs
index 56db553d83ac..b50c5f4d9814 100644
--- a/frame/support/src/traits/tokens/nonfungibles.rs
+++ b/frame/support/src/traits/tokens/nonfungibles.rs
@@ -95,20 +95,18 @@ pub trait Inspect<AccountId> {
 
 /// Interface for enumerating assets in existence or owned by a given account over many collections
 /// of NFTs.
-///
-/// WARNING: These may be a heavy operations. Do not use when execution time is limited.
 pub trait InspectEnumerable<AccountId>: Inspect<AccountId> {
-	/// Returns the asset classes in existence.
-	fn classes() -> Vec<Self::ClassId>;
+	/// Returns an iterator of the asset classes in existence.
+	fn classes() -> Box<dyn Iterator<Item = Self::ClassId>>;
 
-	/// Returns the instances of an asset `class` in existence.
-	fn instances(class: &Self::ClassId) -> Vec<Self::InstanceId>;
+	/// Returns an iterator of the instances of an asset `class` in existence.
+	fn instances(class: &Self::ClassId) -> Box<dyn Iterator<Item = Self::InstanceId>>;
 
-	/// Returns the asset instances of all classes owned by `who`.
-	fn owned(who: &AccountId) -> Vec<(Self::ClassId, Self::InstanceId)>;
+	/// Returns an iterator of the asset instances of all classes owned by `who`.
+	fn owned(who: &AccountId) -> Box<dyn Iterator<Item = (Self::ClassId, Self::InstanceId)>>;
 
-	/// Returns the asset instances of `class` owned by `who`.
-	fn owned_in_class(class: &Self::ClassId, who: &AccountId) -> Vec<Self::InstanceId>;
+	/// Returns an iterator of the asset instances of `class` owned by `who`.
+	fn owned_in_class(class: &Self::ClassId, who: &AccountId) -> Box<dyn Iterator<Item = Self::InstanceId>>;
 }
 
 /// Trait for providing an interface for multiple classes of NFT-like assets which may be minted,
diff --git a/frame/uniques/src/impl_nonfungibles.rs b/frame/uniques/src/impl_nonfungibles.rs
index c856e2cc5588..7113f314697a 100644
--- a/frame/uniques/src/impl_nonfungibles.rs
+++ b/frame/uniques/src/impl_nonfungibles.rs
@@ -19,7 +19,7 @@
 
 use super::*;
 use sp_std::convert::TryFrom;
-use frame_support::traits::tokens::nonfungibles::{Inspect, Mutate, Transfer};
+use frame_support::traits::tokens::nonfungibles::{Inspect, InspectEnumerable, Mutate, Transfer};
 use frame_support::BoundedSlice;
 use sp_runtime::DispatchResult;
 
@@ -106,3 +106,33 @@ impl<T: Config<I>, I: 'static> Transfer<T::AccountId> for Pallet<T, I> {
 		Self::do_transfer(class.clone(), instance.clone(), destination.clone(), |_, _| Ok(()))
 	}
 }
+
+impl<T: Config<I>, I: 'static> InspectEnumerable<T::AccountId> for Pallet<T, I> {
+	/// Returns an iterator of the asset classes in existence.
+	///
+	/// NOTE: iterating this list invokes a storage read per item.
+	fn classes() -> Box<dyn Iterator<Item = Self::ClassId>> {
+		Box::new(ClassMetadataOf::<T, I>::iter_keys())
+	}
+
+	/// Returns an iterator of the instances of an asset `class` in existence.
+	///
+	/// NOTE: iterating this list invokes a storage read per item.
+	fn instances(class: &Self::ClassId) -> Box<dyn Iterator<Item = Self::InstanceId>> {
+		Box::new(InstanceMetadataOf::<T, I>::iter_key_prefix(class))
+	}
+
+	/// Returns an iterator of the asset instances of all classes owned by `who`.
+	///
+	/// NOTE: iterating this list invokes a storage read per item.
+	fn owned(who: &T::AccountId) -> Box<dyn Iterator<Item = (Self::ClassId, Self::InstanceId)>> {
+		Box::new(Account::<T, I>::iter_key_prefix((who,)))
+	}
+
+	/// Returns an iterator of the asset instances of `class` owned by `who`.
+	///
+	/// NOTE: iterating this list invokes a storage read per item.
+	fn owned_in_class(class: &Self::ClassId, who: &T::AccountId) -> Box<dyn Iterator<Item = Self::InstanceId>> {
+		Box::new(Account::<T, I>::iter_key_prefix((who, class)))
+	}
+}

From 6b7ab8124a8b961a057bd0529780b413846d3153 Mon Sep 17 00:00:00 2001
From: radupopa2010 <radupopa2010@yahoo.com>
Date: Fri, 2 Jul 2021 12:48:14 +0200
Subject: [PATCH 0943/1194] add simnet tests (#9222)

* add simnet tests

* add link to bracap presentation of simnet

* add link to bracap presentation of simnet

* rm not needed file
---
 simnet_tests/README.md                        |  39 ++++++
 .../configs/default_local_testnet.toml        |  14 ++
 simnet_tests/run_tests.sh                     | 126 ++++++++++++++++++
 simnet_tests/tests/long/002-loadtest.feature  |   5 +
 .../tests/quick/001-smoketest.feature         |  16 +++
 5 files changed, 200 insertions(+)
 create mode 100644 simnet_tests/README.md
 create mode 100644 simnet_tests/configs/default_local_testnet.toml
 create mode 100755 simnet_tests/run_tests.sh
 create mode 100644 simnet_tests/tests/long/002-loadtest.feature
 create mode 100644 simnet_tests/tests/quick/001-smoketest.feature

diff --git a/simnet_tests/README.md b/simnet_tests/README.md
new file mode 100644
index 000000000000..cb1b13ae9850
--- /dev/null
+++ b/simnet_tests/README.md
@@ -0,0 +1,39 @@
+# Simulation tests, or high level integration tests.
+
+
+_The content of this directory is meant to be used by Parity's private CI/CD
+infrastructure with private tools. At the moment those tools are still early
+stage of development and we don't when if / when they will available for
+public use._
+
+
+## Content of this dir. 
+
+`configs` dir contains config files in toml format that describe how to
+configure the simulation network that you want to launch.
+
+`tests` dir contains [cucumber](https://cucumber.io/) files. Those are 
+Behavior-Driven Development test files that describe tests in plain English.
+Under the hood there are assertions that specific metrics should have specific
+values. 
+
+At the moment we have 2 tests: `tests/quick/001-smoketest.feature` and
+`tests/long/002-loadtest.feature`
+The load test uses a JS script that we added to simnet image and it's launched
+by this step in the cucumber file:
+`Then launch 'node' with parameters '/usr/local/bin/sub-flood --finalization --url ws://localhost:11222'`
+
+`run_test.sh` is a script meant to ease up launching a test.
+In order to use this script locally, you need to install 
+[gurke](https://github.com/paritytech/gurke)
+This script also helps preparing the test environment. Once you have access to 
+a kubernetes cluster (meaning you can do `kubectl get pods`) you can run this 
+script with no arguments, like `./run_test.sh` and tests should run.
+Kubernetes cluster can be local, spawned with 
+[kind](https://kind.sigs.k8s.io/docs/user/quick-start/#installation)
+or an instance living in the 
+[cloud](https://github.com/paritytech/gurke/blob/main/docs/How-to-setup-access-to-gke-k8s-cluster.md) 
+
+
+### [Here is link to barcamp presenation of simnet](https://www.crowdcast.io/e/ph49xu01)
+### [Here is link to the simnet repo, hosted on private gitlab](https://gitlab.parity.io/parity/simnet/-/tree/master)
diff --git a/simnet_tests/configs/default_local_testnet.toml b/simnet_tests/configs/default_local_testnet.toml
new file mode 100644
index 000000000000..066bd4c9e332
--- /dev/null
+++ b/simnet_tests/configs/default_local_testnet.toml
@@ -0,0 +1,14 @@
+[settings]
+bootnode-domain-name = "bootnode.{{get_env(name="NAMESPACE")}}.svc.cluster.local"
+
+
+[settings.setup]
+timeout = 300
+
+[settings.defaults]
+timeout = 300
+
+[nodes]
+alice = { extra-args = ["--alice"], validator = true }
+bob = { extra-args = ["--bob"], validator = true }
+charlie = { extra-args = ["--charlie"], validator = true }
diff --git a/simnet_tests/run_tests.sh b/simnet_tests/run_tests.sh
new file mode 100755
index 000000000000..3b8ac8a71dad
--- /dev/null
+++ b/simnet_tests/run_tests.sh
@@ -0,0 +1,126 @@
+#!/bin/bash
+
+### ARGS FOR THIS SCRIPT ###
+# ./${SCRIPT_NAME} NAMESPACE IMAGE LOG_PATH FEATURES
+#   NAMESPACE the kubernetes namespace where the test will run
+#   IMAGE Substrate image used to spawn network
+#   LOG_PATH path to dir where to save logs from external JS script that is run as part 
+# of step in features file
+#   FEATURES directory containing cucumber files or single  cucumber file that describes 
+# what to test.   
+#
+# All args have default values, specify args to override
+# e.g: ./${SCRIPT_NAME} test-name parity/substrate:latest logs quick
+
+set -eou pipefail
+SCRIPT_NAME="$0"
+SCRIPT_PATH=$(dirname "${SCRIPT_NAME}")     # relative
+SCRIPT_PATH=$(cd "${SCRIPT_PATH}" && pwd)   # absolutized and normalized
+
+function random_string {
+   head -1 <(fold -w 30  <(tr -dc 'a-z0-9' < /dev/urandom))
+ }
+
+#
+### Script args
+#
+
+NAMESPACE=${1:-gurke-"$(random_string)"-runtest}
+IMAGE=${2:-"parity/substrate:latest"}
+LOG_PATH=${3:-"${SCRIPT_PATH}/logs"}
+FEATURES=${4:-"ALL"}
+
+mkdir -p "${SCRIPT_PATH}"/logs
+
+echo "Running tests in namespace: ${NAMESPACE}"
+echo "Testing image: ${IMAGE}"
+echo "Storing scripts logs to: ${LOG_PATH}"
+echo "Using features files from: ${FEATURES}"
+
+#
+### Script logic
+#
+
+function forward_port {
+  # RUN_IN_CONTAINER is env var that is set in the dockerfile
+  # use the -v operator to explicitly test if a variable is set
+  if  [[ ! -v RUN_IN_CONTAINER  ]]  ; then 
+    if is_port_forward_running ; then
+      kill_previous_job
+    fi
+  fi
+  start_forwading_job 
+}
+
+FORWARD_GREP_FILTER='kubectl.*[p]ort-forward.*svc/rpc.*11222'
+
+function is_port_forward_running {
+  # shellcheck disable=SC2009
+  ps aux | grep -qE "${FORWARD_GREP_FILTER}" 
+}
+
+function kill_previous_job {
+  # shellcheck disable=SC2009
+  job_pid=$(ps aux | grep -E "${FORWARD_GREP_FILTER}" | awk '{ print $2 }')
+  echo  "INFO Killed forwading port 9944 into bootnode"
+  kill "${job_pid}"
+}
+
+function start_forwading_job {
+  kubectl -n "${NAMESPACE}" \
+          expose pod bootnode \
+          --name=rpc \
+          --type=NodePort \
+          --target-port=9944 \
+          --port=9944
+  kubectl -n "${NAMESPACE}" \
+          port-forward svc/rpc 11222:9944 &> "${LOG_PATH}/forward-${NAMESPACE}.log" &
+  sleep 2
+  echo "INFO Started forwading port 9944 into bootnode"
+}
+
+function update_api {
+  echo "INFO: Updating Polkadot JS API"
+  pwd
+  cd "${SCRIPT_PATH}"/../../sub-flood/
+  npm run build
+  cd -
+}
+
+function run_test {
+    case "${FEATURES}" in
+      quick)         
+        gurke test "${NAMESPACE}" "${SCRIPT_PATH}"/tests/quick  --log-path "${LOG_PATH}"
+        ;;
+      long)  
+        gurke test "${NAMESPACE}" "${SCRIPT_PATH}"/tests/long   --log-path "${LOG_PATH}"
+        ;;
+      ALL )  
+        gurke test "${NAMESPACE}" "${SCRIPT_PATH}"/tests        --log-path "${LOG_PATH}"
+        ;;  
+      ??* )  
+        gurke test \
+              "${NAMESPACE}" \
+              "${SCRIPT_PATH}"/"${FEATURES}" \
+              --log-path  "${LOG_PATH}"
+        ;;  
+    esac
+}
+
+
+export NAMESPACE="${NAMESPACE}"
+
+set -x  # echo the commands to stdout
+gurke spawn --config "${SCRIPT_PATH}"/configs/default_local_testnet.toml \
+            -n "${NAMESPACE}" \
+            --image "${IMAGE}"
+
+echo "INFO: Checking if pods launched correctly"
+kubectl -n "${NAMESPACE}" get pods -o wide
+
+update_api
+
+forward_port
+run_test
+
+
diff --git a/simnet_tests/tests/long/002-loadtest.feature b/simnet_tests/tests/long/002-loadtest.feature
new file mode 100644
index 000000000000..67d108ea5541
--- /dev/null
+++ b/simnet_tests/tests/long/002-loadtest.feature
@@ -0,0 +1,5 @@
+Feature: LoadTesting
+
+  Scenario: spawn 50k transactions and wait their finalization
+    Given a test network
+    Then launch 'node' with parameters '/usr/local/bin/sub-flood --finalization --url ws://localhost:11222'
diff --git a/simnet_tests/tests/quick/001-smoketest.feature b/simnet_tests/tests/quick/001-smoketest.feature
new file mode 100644
index 000000000000..a07041e4ea62
--- /dev/null
+++ b/simnet_tests/tests/quick/001-smoketest.feature
@@ -0,0 +1,16 @@
+Feature: Smoketest
+
+  Scenario: Minimal Example
+    Given a test network
+    Then alice is up
+    And alice reports substrate_node_roles is 4
+    And alice reports substrate_sub_libp2p_is_major_syncing is 0
+    When alice's best block should be above 30
+    Then alice reports block height is greater than 30
+    And alice reports peers count is at least 2
+    Then bob is up
+    And bob reports block height is greater than 30
+    And bob reports peers count is at least 2
+    Then charlie is up
+    And charlie reports block height is greater than 30
+    And charlie reports peers count is at least 2

From cf4e320398cf3b8ef8a2c240d7495c25b3b73b08 Mon Sep 17 00:00:00 2001
From: George Angelopoulos <george@usermod.net>
Date: Fri, 2 Jul 2021 16:31:02 +0300
Subject: [PATCH 0944/1194] fix prometheus log message terminology (#9256)

A prometheus "server" typically refers to the prometheus process running
on a central server which connects to various prometheus "exporters" and
collects metrics. What is implemented here in substrate is a prometheus
exporter.

This patch fixes the associated log message to avoid confusion for new
users.
---
 utils/prometheus/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/prometheus/src/lib.rs b/utils/prometheus/src/lib.rs
index d7cdfcd0443b..93a56d084fd0 100644
--- a/utils/prometheus/src/lib.rs
+++ b/utils/prometheus/src/lib.rs
@@ -127,7 +127,7 @@ mod known_os {
 			.await
 			.map_err(|_| Error::PortInUse(prometheus_addr))?;
 
-		log::info!("〽️ Prometheus server started at {}", prometheus_addr);
+		log::info!("〽️ Prometheus exporter started at {}", prometheus_addr);
 
 		let service = make_service_fn(move |_| {
 			let registry = registry.clone();

From fc49802f263529160635471c8a17888846035f5d Mon Sep 17 00:00:00 2001
From: Zeke Mostov <32168567+emostov@users.noreply.github.com>
Date: Sun, 4 Jul 2021 21:39:49 -0700
Subject: [PATCH 0945/1194] Add `Chilled` event to staking chill extrinsics
 (#9250)

* Add `Chilled` event to staking chill extrinsics

* Update do_remove_{nom, val} doc comments

* Not working: trying to match on event

* Account for chilled event in offences benchmarking

* trigger ci

* correct
---
 frame/offences/benchmarking/src/lib.rs | 27 ++++++++++++++++++--------
 frame/staking/src/lib.rs               | 24 +++++++++++++++++++----
 2 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/frame/offences/benchmarking/src/lib.rs b/frame/offences/benchmarking/src/lib.rs
index e7c61bfd989b..d424cfc751ee 100644
--- a/frame/offences/benchmarking/src/lib.rs
+++ b/frame/offences/benchmarking/src/lib.rs
@@ -208,8 +208,10 @@ fn make_offenders_im_online<T: Config>(num_offenders: u32, num_nominators: u32)
 
 #[cfg(test)]
 fn check_events<T: Config, I: Iterator<Item = <T as SystemConfig>::Event>>(expected: I) {
-	let events = System::<T>::events() .into_iter()
-		.map(|frame_system::EventRecord { event, .. }| event).collect::<Vec<_>>();
+	let events = System::<T>::events()
+		.into_iter()
+		.map(|frame_system::EventRecord { event, .. }| event)
+		.collect::<Vec<_>>();
 	let expected = expected.collect::<Vec<_>>();
 	let lengths = (events.len(), expected.len());
 	let length_mismatch = if lengths.0 != lengths.1 {
@@ -273,13 +275,19 @@ benchmarks! {
 		let bond_amount: u32 = UniqueSaturatedInto::<u32>::unique_saturated_into(bond_amount::<T>());
 		let slash_amount = slash_fraction * bond_amount;
 		let reward_amount = slash_amount * (1 + n) / 2;
+		let slash = |id| core::iter::once(
+			<T as StakingConfig>::Event::from(StakingEvent::<T>::Slash(id, BalanceOf::<T>::from(slash_amount)))
+		);
+		let chill = |id| core::iter::once(
+			<T as StakingConfig>::Event::from(StakingEvent::<T>::Chilled(id))
+		);
 		let mut slash_events = raw_offenders.into_iter()
 			.flat_map(|offender| {
-				core::iter::once(offender.stash).chain(offender.nominator_stashes.into_iter())
+				let nom_slashes = offender.nominator_stashes.into_iter().flat_map(|nom| slash(nom));
+				chill(offender.stash.clone())
+				.chain(slash(offender.stash))
+				.chain(nom_slashes)
 			})
-			.map(|stash| <T as StakingConfig>::Event::from(
-				StakingEvent::<T>::Slash(stash, BalanceOf::<T>::from(slash_amount))
-			))
 			.collect::<Vec<_>>();
 		let reward_events = reporters.into_iter()
 			.flat_map(|reporter| vec![
@@ -289,8 +297,9 @@ benchmarks! {
 				).into()
 			]);
 
-		// rewards are applied after first offender and it's nominators
-		let slash_rest = slash_events.split_off(1 + n as usize);
+		// Rewards are applied after first offender and it's nominators.
+		// We split after: offender slash + offender chill + nominator slashes.
+		let slash_rest = slash_events.split_off(2 + n as usize);
 
 		// make sure that all slashes have been applied
 		#[cfg(test)]
@@ -338,6 +347,7 @@ benchmarks! {
 			+ 1 // offence
 			+ 2 // reporter (reward + endowment)
 			+ 1 // offenders slashed
+			+ 1 // offenders chilled
 			+ n // nominators slashed
 		);
 	}
@@ -372,6 +382,7 @@ benchmarks! {
 			+ 1 // offence
 			+ 2 // reporter (reward + endowment)
 			+ 1 // offenders slashed
+			+ 1 // offenders chilled
 			+ n // nominators slashed
 		);
 	}
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index ec7da1be1871..1f22275bde9c 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -1329,6 +1329,9 @@ pub mod pallet {
 		Kicked(T::AccountId, T::AccountId),
 		/// The election failed. No new era is planned.
 		StakingElectionFailed,
+		/// An account has stopped participating as either a validator or nominator.
+		/// \[stash\]
+		Chilled(T::AccountId),
 	}
 
 	#[pallet::error]
@@ -2523,8 +2526,11 @@ impl<T: Config> Pallet<T> {
 
 	/// Chill a stash account.
 	fn chill_stash(stash: &T::AccountId) {
-		Self::do_remove_validator(stash);
-		Self::do_remove_nominator(stash);
+		let chilled_as_validator = Self::do_remove_validator(stash);
+		let chilled_as_nominator = Self::do_remove_nominator(stash);
+		if chilled_as_validator || chilled_as_nominator {
+			Self::deposit_event(Event::<T>::Chilled(stash.clone()));
+		}
 	}
 
 	/// Actually make a payment to a staker. This uses the currency's reward function
@@ -3014,10 +3020,15 @@ impl<T: Config> Pallet<T> {
 
 	/// This function will remove a nominator from the `Nominators` storage map,
 	/// and keep track of the `CounterForNominators`.
-	pub fn do_remove_nominator(who: &T::AccountId) {
+	///
+	/// Returns true if `who` was removed from `Nominators`, otherwise false.
+	pub fn do_remove_nominator(who: &T::AccountId) -> bool {
 		if Nominators::<T>::contains_key(who) {
 			Nominators::<T>::remove(who);
 			CounterForNominators::<T>::mutate(|x| x.saturating_dec());
+			true
+		} else {
+			false
 		}
 	}
 
@@ -3034,10 +3045,15 @@ impl<T: Config> Pallet<T> {
 
 	/// This function will remove a validator from the `Validators` storage map,
 	/// and keep track of the `CounterForValidators`.
-	pub fn do_remove_validator(who: &T::AccountId) {
+	///
+	/// Returns true if `who` was removed from `Validators`, otherwise false.
+	pub fn do_remove_validator(who: &T::AccountId) -> bool {
 		if Validators::<T>::contains_key(who) {
 			Validators::<T>::remove(who);
 			CounterForValidators::<T>::mutate(|x| x.saturating_dec());
+			true
+		} else {
+			false
 		}
 	}
 }

From 19c6dd2f2ab8dea8d5734f2a0f246c935b76e75e Mon Sep 17 00:00:00 2001
From: Squirrel <gilescope@gmail.com>
Date: Mon, 5 Jul 2021 11:59:39 +0100
Subject: [PATCH 0946/1194] Less duplication in test code (#9270)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Less duplication

* Const

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* less comments

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 .../transaction-pool/graph/src/base_pool.rs   | 253 ++++--------------
 1 file changed, 49 insertions(+), 204 deletions(-)

diff --git a/client/transaction-pool/graph/src/base_pool.rs b/client/transaction-pool/graph/src/base_pool.rs
index 9b644bbdb3b6..39cfe8fa9dce 100644
--- a/client/transaction-pool/graph/src/base_pool.rs
+++ b/client/transaction-pool/graph/src/base_pool.rs
@@ -538,6 +538,18 @@ mod tests {
 		BasePool::default()
 	}
 
+	const DEFAULT_TX: Transaction::<Hash, Vec<u8>> = Transaction {
+		data: vec![],
+		bytes: 1,
+		hash: 1u64,
+		priority: 5u64,
+		valid_till: 64u64,
+		requires: vec![],
+		provides: vec![],
+		propagate: true,
+		source: Source::External,
+	};
+
 	#[test]
 	fn should_import_transaction_to_ready() {
 		// given
@@ -546,14 +558,8 @@ mod tests {
 		// when
 		pool.import(Transaction {
 			data: vec![1u8],
-			bytes: 1,
-			hash: 1u64,
-			priority: 5u64,
-			valid_till: 64u64,
-			requires: vec![],
 			provides: vec![vec![1]],
-			propagate: true,
-			source: Source::External,
+			.. DEFAULT_TX.clone()
 		}).unwrap();
 
 		// then
@@ -569,25 +575,13 @@ mod tests {
 		// when
 		pool.import(Transaction {
 			data: vec![1u8],
-			bytes: 1,
-			hash: 1,
-			priority: 5u64,
-			valid_till: 64u64,
-			requires: vec![],
 			provides: vec![vec![1]],
-			propagate: true,
-			source: Source::External,
+			.. DEFAULT_TX.clone()
 		}).unwrap();
 		pool.import(Transaction {
 			data: vec![1u8],
-			bytes: 1,
-			hash: 1,
-			priority: 5u64,
-			valid_till: 64u64,
-			requires: vec![],
 			provides: vec![vec![1]],
-			propagate: true,
-			source: Source::External,
+			.. DEFAULT_TX.clone()
 		}).unwrap_err();
 
 		// then
@@ -595,7 +589,6 @@ mod tests {
 		assert_eq!(pool.ready.len(), 1);
 	}
 
-
 	#[test]
 	fn should_import_transaction_to_future_and_promote_it_later() {
 		// given
@@ -604,27 +597,17 @@ mod tests {
 		// when
 		pool.import(Transaction {
 			data: vec![1u8],
-			bytes: 1,
-			hash: 1,
-			priority: 5u64,
-			valid_till: 64u64,
 			requires: vec![vec![0]],
 			provides: vec![vec![1]],
-			propagate: true,
-			source: Source::External,
+			.. DEFAULT_TX.clone()
 		}).unwrap();
 		assert_eq!(pool.ready().count(), 0);
 		assert_eq!(pool.ready.len(), 0);
 		pool.import(Transaction {
 			data: vec![2u8],
-			bytes: 1,
 			hash: 2,
-			priority: 5u64,
-			valid_till: 64u64,
-			requires: vec![],
 			provides: vec![vec![0]],
-			propagate: true,
-			source: Source::External,
+			.. DEFAULT_TX.clone()
 		}).unwrap();
 
 		// then
@@ -640,61 +623,38 @@ mod tests {
 		// when
 		pool.import(Transaction {
 			data: vec![1u8],
-			bytes: 1,
-			hash: 1,
-			priority: 5u64,
-			valid_till: 64u64,
 			requires: vec![vec![0]],
 			provides: vec![vec![1]],
-			propagate: true,
-			source: Source::External,
+			.. DEFAULT_TX.clone()
 		}).unwrap();
 		pool.import(Transaction {
 			data: vec![3u8],
-			bytes: 1,
 			hash: 3,
-			priority: 5u64,
-			valid_till: 64u64,
 			requires: vec![vec![2]],
-			provides: vec![],
-			propagate: true,
-			source: Source::External,
+			.. DEFAULT_TX.clone()
 		}).unwrap();
 		pool.import(Transaction {
 			data: vec![2u8],
-			bytes: 1,
 			hash: 2,
-			priority: 5u64,
-			valid_till: 64u64,
 			requires: vec![vec![1]],
 			provides: vec![vec![3], vec![2]],
-			propagate: true,
-			source: Source::External,
+			.. DEFAULT_TX.clone()
 		}).unwrap();
 		pool.import(Transaction {
 			data: vec![4u8],
-			bytes: 1,
 			hash: 4,
 			priority: 1_000u64,
-			valid_till: 64u64,
 			requires: vec![vec![3], vec![4]],
-			provides: vec![],
-			propagate: true,
-			source: Source::External,
+			.. DEFAULT_TX.clone()
 		}).unwrap();
 		assert_eq!(pool.ready().count(), 0);
 		assert_eq!(pool.ready.len(), 0);
 
 		let res = pool.import(Transaction {
 			data: vec![5u8],
-			bytes: 1,
 			hash: 5,
-			priority: 5u64,
-			valid_till: 64u64,
-			requires: vec![],
 			provides: vec![vec![0], vec![4]],
-			propagate: true,
-			source: Source::External,
+			.. DEFAULT_TX.clone()
 		}).unwrap();
 
 		// then
@@ -720,25 +680,16 @@ mod tests {
 		let mut pool = pool();
 		pool.import(Transaction {
 			data: vec![1u8],
-			bytes: 1,
-			hash: 1,
-			priority: 5u64,
-			valid_till: 64u64,
 			requires: vec![vec![0]],
 			provides: vec![vec![1]],
-			propagate: true,
-			source: Source::External,
+			.. DEFAULT_TX.clone()
 		}).unwrap();
 		pool.import(Transaction {
 			data: vec![3u8],
-			bytes: 1,
 			hash: 3,
-			priority: 5u64,
-			valid_till: 64u64,
 			requires: vec![vec![1]],
 			provides: vec![vec![2]],
-			propagate: true,
-			source: Source::External,
+			.. DEFAULT_TX.clone()
 		}).unwrap();
 		assert_eq!(pool.ready().count(), 0);
 		assert_eq!(pool.ready.len(), 0);
@@ -746,14 +697,10 @@ mod tests {
 		// when
 		pool.import(Transaction {
 			data: vec![2u8],
-			bytes: 1,
 			hash: 2,
-			priority: 5u64,
-			valid_till: 64u64,
 			requires: vec![vec![2]],
 			provides: vec![vec![0]],
-			propagate: true,
-			source: Source::External,
+			.. DEFAULT_TX.clone()
 		}).unwrap();
 
 		// then
@@ -767,14 +714,10 @@ mod tests {
 		// let's close the cycle with one additional transaction
 		let res = pool.import(Transaction {
 			data: vec![4u8],
-			bytes: 1,
 			hash: 4,
 			priority: 50u64,
-			valid_till: 64u64,
-			requires: vec![],
 			provides: vec![vec![0]],
-			propagate: true,
-			source: Source::External,
+			.. DEFAULT_TX.clone()
 		}).unwrap();
 		let mut it = pool.ready().into_iter().map(|tx| tx.data[0]);
 		assert_eq!(it.next(), Some(4));
@@ -796,25 +739,16 @@ mod tests {
 		let mut pool = pool();
 		pool.import(Transaction {
 			data: vec![1u8],
-			bytes: 1,
-			hash: 1,
-			priority: 5u64,
-			valid_till: 64u64,
 			requires: vec![vec![0]],
 			provides: vec![vec![1]],
-			propagate: true,
-			source: Source::External,
+			.. DEFAULT_TX.clone()
 		}).unwrap();
 		pool.import(Transaction {
 			data: vec![3u8],
-			bytes: 1,
 			hash: 3,
-			priority: 5u64,
-			valid_till: 64u64,
 			requires: vec![vec![1]],
 			provides: vec![vec![2]],
-			propagate: true,
-			source: Source::External,
+			.. DEFAULT_TX.clone()
 		}).unwrap();
 		assert_eq!(pool.ready().count(), 0);
 		assert_eq!(pool.ready.len(), 0);
@@ -822,14 +756,10 @@ mod tests {
 		// when
 		pool.import(Transaction {
 			data: vec![2u8],
-			bytes: 1,
 			hash: 2,
-			priority: 5u64,
-			valid_till: 64u64,
 			requires: vec![vec![2]],
 			provides: vec![vec![0]],
-			propagate: true,
-			source: Source::External,
+			.. DEFAULT_TX.clone()
 		}).unwrap();
 
 		// then
@@ -843,14 +773,10 @@ mod tests {
 		// let's close the cycle with one additional transaction
 		let err = pool.import(Transaction {
 			data: vec![4u8],
-			bytes: 1,
 			hash: 4,
 			priority: 1u64, // lower priority than Tx(2)
-			valid_till: 64u64,
-			requires: vec![],
 			provides: vec![vec![0]],
-			propagate: true,
-			source: Source::External,
+			.. DEFAULT_TX.clone()
 		}).unwrap_err();
 		let mut it = pool.ready().into_iter().map(|tx| tx.data[0]);
 		assert_eq!(it.next(), None);
@@ -867,25 +793,15 @@ mod tests {
 		let mut pool = pool();
 		pool.import(Transaction {
 			data: vec![5u8; 1024],
-			bytes: 1,
 			hash: 5,
-			priority: 5u64,
-			valid_till: 64u64,
-			requires: vec![],
 			provides: vec![vec![0], vec![4]],
-			propagate: true,
-			source: Source::External,
+			.. DEFAULT_TX.clone()
 		}).expect("import 1 should be ok");
 		pool.import(Transaction {
 			data: vec![3u8; 1024],
-			bytes: 1,
 			hash: 7,
-			priority: 5u64,
-			valid_till: 64u64,
-			requires: vec![],
 			provides: vec![vec![2], vec![7]],
-			propagate: true,
-			source: Source::External,
+			.. DEFAULT_TX.clone()
 		}).expect("import 2 should be ok");
 
 		assert!(parity_util_mem::malloc_size(&pool) > 5000);
@@ -897,70 +813,43 @@ mod tests {
 		let mut pool = pool();
 		pool.import(Transaction {
 			data: vec![5u8],
-			bytes: 1,
 			hash: 5,
-			priority: 5u64,
-			valid_till: 64u64,
-			requires: vec![],
 			provides: vec![vec![0], vec![4]],
-			propagate: true,
-			source: Source::External,
+			.. DEFAULT_TX.clone()
 		}).unwrap();
 		pool.import(Transaction {
 			data: vec![1u8],
-			bytes: 1,
-			hash: 1,
-			priority: 5u64,
-			valid_till: 64u64,
 			requires: vec![vec![0]],
 			provides: vec![vec![1]],
-			propagate: true,
-			source: Source::External,
+			.. DEFAULT_TX.clone()
 		}).unwrap();
 		pool.import(Transaction {
 			data: vec![3u8],
-			bytes: 1,
 			hash: 3,
-			priority: 5u64,
-			valid_till: 64u64,
 			requires: vec![vec![2]],
-			provides: vec![],
-			propagate: true,
-			source: Source::External,
+			.. DEFAULT_TX.clone()
 		}).unwrap();
 		pool.import(Transaction {
 			data: vec![2u8],
-			bytes: 1,
 			hash: 2,
-			priority: 5u64,
-			valid_till: 64u64,
 			requires: vec![vec![1]],
 			provides: vec![vec![3], vec![2]],
-			propagate: true,
-			source: Source::External,
+			.. DEFAULT_TX.clone()
 		}).unwrap();
 		pool.import(Transaction {
 			data: vec![4u8],
-			bytes: 1,
 			hash: 4,
 			priority: 1_000u64,
-			valid_till: 64u64,
 			requires: vec![vec![3], vec![4]],
-			provides: vec![],
-			propagate: true,
-			source: Source::External,
+			.. DEFAULT_TX.clone()
 		}).unwrap();
 		// future
 		pool.import(Transaction {
 			data: vec![6u8],
-			bytes: 1,
 			hash: 6,
 			priority: 1_000u64,
-			valid_till: 64u64,
 			requires: vec![vec![11]],
-			provides: vec![],
-			propagate: true,
-			source: Source::External,
+			.. DEFAULT_TX.clone()
 		}).unwrap();
 		assert_eq!(pool.ready().count(), 5);
 		assert_eq!(pool.future.len(), 1);
@@ -980,59 +869,38 @@ mod tests {
 		// future (waiting for 0)
 		pool.import(Transaction {
 			data: vec![5u8],
-			bytes: 1,
 			hash: 5,
-			priority: 5u64,
-			valid_till: 64u64,
 			requires: vec![vec![0]],
 			provides: vec![vec![100]],
-			propagate: true,
-			source: Source::External,
+			.. DEFAULT_TX.clone()
 		}).unwrap();
 		// ready
 		pool.import(Transaction {
 			data: vec![1u8],
-			bytes: 1,
-			hash: 1,
-			priority: 5u64,
-			valid_till: 64u64,
-			requires: vec![],
 			provides: vec![vec![1]],
-			propagate: true,
-			source: Source::External,
+			.. DEFAULT_TX.clone()
 		}).unwrap();
 		pool.import(Transaction {
 			data: vec![2u8],
-			bytes: 1,
 			hash: 2,
-			priority: 5u64,
-			valid_till: 64u64,
 			requires: vec![vec![2]],
 			provides: vec![vec![3]],
-			propagate: true,
-			source: Source::External,
+			.. DEFAULT_TX.clone()
 		}).unwrap();
 		pool.import(Transaction {
 			data: vec![3u8],
-			bytes: 1,
 			hash: 3,
-			priority: 5u64,
-			valid_till: 64u64,
 			requires: vec![vec![1]],
 			provides: vec![vec![2]],
-			propagate: true,
-			source: Source::External,
+			.. DEFAULT_TX.clone()
 		}).unwrap();
 		pool.import(Transaction {
 			data: vec![4u8],
-			bytes: 1,
 			hash: 4,
 			priority: 1_000u64,
-			valid_till: 64u64,
 			requires: vec![vec![3], vec![2]],
 			provides: vec![vec![4]],
-			propagate: true,
-			source: Source::External,
+			.. DEFAULT_TX.clone()
 		}).unwrap();
 
 		assert_eq!(pool.ready().count(), 4);
@@ -1061,14 +929,11 @@ mod tests {
 		assert_eq!(
 			format!("{:?}", Transaction {
 				data: vec![4u8],
-				bytes: 1,
 				hash: 4,
 				priority: 1_000u64,
-				valid_till: 64u64,
 				requires: vec![vec![3], vec![2]],
 				provides: vec![vec![4]],
-				propagate: true,
-				source: Source::External,
+				.. DEFAULT_TX.clone()
 			}),
 			"Transaction { \
 hash: 4, priority: 1000, valid_till: 64, bytes: 1, propagate: true, \
@@ -1080,26 +945,21 @@ source: TransactionSource::External, requires: [03, 02], provides: [04], data: [
 	fn transaction_propagation() {
 		assert_eq!(Transaction {
 				data: vec![4u8],
-				bytes: 1,
 				hash: 4,
 				priority: 1_000u64,
-				valid_till: 64u64,
 				requires: vec![vec![3], vec![2]],
 				provides: vec![vec![4]],
-				propagate: true,
-				source: Source::External,
+				.. DEFAULT_TX.clone()
 		}.is_propagable(), true);
 
 		assert_eq!(Transaction {
 				data: vec![4u8],
-				bytes: 1,
 				hash: 4,
 				priority: 1_000u64,
-				valid_till: 64u64,
 				requires: vec![vec![3], vec![2]],
 				provides: vec![vec![4]],
 				propagate: false,
-				source: Source::External,
+				.. DEFAULT_TX.clone()
 		}.is_propagable(), false);
 	}
 
@@ -1114,14 +974,9 @@ source: TransactionSource::External, requires: [03, 02], provides: [04], data: [
 		// then
 		let err = pool.import(Transaction {
 			data: vec![5u8],
-			bytes: 1,
 			hash: 5,
-			priority: 5u64,
-			valid_till: 64u64,
 			requires: vec![vec![0]],
-			provides: vec![],
-			propagate: true,
-			source: Source::External,
+			.. DEFAULT_TX.clone()
 		});
 
 		if let Err(error::Error::RejectedFutureTransaction) = err {
@@ -1138,14 +993,9 @@ source: TransactionSource::External, requires: [03, 02], provides: [04], data: [
 		// when
 		pool.import(Transaction {
 			data: vec![5u8],
-			bytes: 1,
 			hash: 5,
-			priority: 5u64,
-			valid_till: 64u64,
 			requires: vec![vec![0]],
-			provides: vec![],
-			propagate: true,
-			source: Source::External,
+			.. DEFAULT_TX.clone()
 		}).unwrap();
 
 		// then
@@ -1168,14 +1018,9 @@ source: TransactionSource::External, requires: [03, 02], provides: [04], data: [
 		let flag_value = pool.with_futures_enabled(|pool, flag| {
 			pool.import(Transaction {
 				data: vec![5u8],
-				bytes: 1,
 				hash: 5,
-				priority: 5u64,
-				valid_till: 64u64,
 				requires: vec![vec![0]],
-				provides: vec![],
-				propagate: true,
-				source: Source::External,
+				.. DEFAULT_TX.clone()
 			}).unwrap();
 
 			flag

From cd48bac58bba9b35214c36fc35e65309a167541c Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Mon, 5 Jul 2021 13:23:43 +0200
Subject: [PATCH 0947/1194] pallet macro: always generate storage info on
 pallet struct (#9246)

* always implement storage info on Pallet

* fix UI test

* Fold span computation into trait and method computation

Co-authored-by: Keith Yeung <kungfukeith11@gmail.com>
---
 .../src/pallet/expand/pallet_struct.rs        | 80 ++++++++++------
 .../procedural/src/storage/storage_info.rs    | 10 +-
 .../procedural/src/storage/storage_struct.rs  | 96 ++++++++++++++++++-
 frame/support/src/lib.rs                      |  2 +
 frame/support/src/storage/types/double_map.rs | 26 +++++
 frame/support/src/storage/types/map.rs        | 24 +++++
 frame/support/src/storage/types/nmap.rs       | 22 +++++
 frame/support/src/storage/types/value.rs      | 21 ++++
 frame/support/src/traits.rs                   |  2 +-
 frame/support/src/traits/storage.rs           |  8 ++
 frame/support/test/tests/pallet.rs            | 14 +++
 ...age_ensure_span_are_ok_on_wrong_gen.stderr | 34 +++++++
 ...re_span_are_ok_on_wrong_gen_unnamed.stderr | 34 +++++++
 13 files changed, 338 insertions(+), 35 deletions(-)

diff --git a/frame/support/procedural/src/pallet/expand/pallet_struct.rs b/frame/support/procedural/src/pallet/expand/pallet_struct.rs
index b655227cfc10..3be9d60492e9 100644
--- a/frame/support/procedural/src/pallet/expand/pallet_struct.rs
+++ b/frame/support/procedural/src/pallet/expand/pallet_struct.rs
@@ -102,41 +102,59 @@ pub fn expand_pallet_struct(def: &mut Def) -> proc_macro2::TokenStream {
 		)
 	};
 
-	let storage_info = if let Some(storage_info_span) = def.pallet_struct.generate_storage_info {
-		let storage_names = &def.storages.iter().map(|storage| &storage.ident).collect::<Vec<_>>();
-		let storage_cfg_attrs = &def.storages.iter()
-			.map(|storage| &storage.cfg_attrs)
-			.collect::<Vec<_>>();
-
-		quote::quote_spanned!(storage_info_span =>
-			impl<#type_impl_gen> #frame_support::traits::StorageInfoTrait
-				for #pallet_ident<#type_use_gen>
-				#storages_where_clauses
-			{
-				fn storage_info()
-					-> #frame_support::sp_std::vec::Vec<#frame_support::traits::StorageInfo>
-				{
-					let mut res = #frame_support::sp_std::vec![];
-
-					#(
-						#(#storage_cfg_attrs)*
-						{
-							let mut storage_info = <
-								#storage_names<#type_use_gen>
-								as #frame_support::traits::StorageInfoTrait
-							>::storage_info();
-							res.append(&mut storage_info);
-						}
-					)*
-
-					res
-				}
-			}
+	// Depending on the flag `generate_storage_info` we use partial or full storage info from
+	// storage.
+	let (
+		storage_info_span,
+		storage_info_trait,
+		storage_info_method,
+	) = if let Some(span) = def.pallet_struct.generate_storage_info {
+		(
+			span,
+			quote::quote_spanned!(span => StorageInfoTrait),
+			quote::quote_spanned!(span => storage_info),
 		)
 	} else {
-		Default::default()
+		let span = def.pallet_struct.attr_span;
+		(
+			span,
+			quote::quote_spanned!(span => PartialStorageInfoTrait),
+			quote::quote_spanned!(span => partial_storage_info),
+		)
 	};
 
+	let storage_names = &def.storages.iter().map(|storage| &storage.ident).collect::<Vec<_>>();
+	let storage_cfg_attrs = &def.storages.iter()
+		.map(|storage| &storage.cfg_attrs)
+		.collect::<Vec<_>>();
+
+	let storage_info = quote::quote_spanned!(storage_info_span =>
+		impl<#type_impl_gen> #frame_support::traits::StorageInfoTrait
+			for #pallet_ident<#type_use_gen>
+			#storages_where_clauses
+		{
+			fn storage_info()
+				-> #frame_support::sp_std::vec::Vec<#frame_support::traits::StorageInfo>
+			{
+				#[allow(unused_mut)]
+				let mut res = #frame_support::sp_std::vec![];
+
+				#(
+					#(#storage_cfg_attrs)*
+					{
+						let mut storage_info = <
+							#storage_names<#type_use_gen>
+							as #frame_support::traits::#storage_info_trait
+						>::#storage_info_method();
+						res.append(&mut storage_info);
+					}
+				)*
+
+				res
+			}
+		}
+	);
+
 	quote::quote_spanned!(def.pallet_struct.attr_span =>
 		#module_error_metadata
 
diff --git a/frame/support/procedural/src/storage/storage_info.rs b/frame/support/procedural/src/storage/storage_info.rs
index ed07ccbfc71d..947f4c2bb9f6 100644
--- a/frame/support/procedural/src/storage/storage_info.rs
+++ b/frame/support/procedural/src/storage/storage_info.rs
@@ -33,10 +33,16 @@ pub fn impl_storage_info(def: &DeclStorageDefExt) -> TokenStream {
 	for line in def.storage_lines.iter() {
 		let storage_struct = &line.storage_struct;
 
+		let (trait_, method) = if def.generate_storage_info {
+			(quote!(#scrate::traits::StorageInfoTrait), quote!(storage_info))
+		} else {
+			(quote!(#scrate::traits::PartialStorageInfoTrait), quote!(partial_storage_info))
+		};
+
 		res_append_storage.extend(quote!(
 			let mut storage_info = <
-				#storage_struct as #scrate::traits::StorageInfoTrait
-			>::storage_info();
+				#storage_struct as #trait_
+			>::#method();
 			res.append(&mut storage_info);
 		));
 	}
diff --git a/frame/support/procedural/src/storage/storage_struct.rs b/frame/support/procedural/src/storage/storage_struct.rs
index c1af0ee0701f..a713f5dff003 100644
--- a/frame/support/procedural/src/storage/storage_struct.rs
+++ b/frame/support/procedural/src/storage/storage_struct.rs
@@ -399,7 +399,101 @@ pub fn decl_and_impl(def: &DeclStorageDefExt) -> TokenStream {
 				},
 			}
 		} else {
-			TokenStream::default()
+			// Implement `__partial_storage_info` which doesn't require MaxEncodedLen on keys and
+			// values.
+			match &line.storage_type {
+				StorageLineTypeDef::Simple(_) => {
+					quote!(
+						impl<#impl_trait> #scrate::traits::PartialStorageInfoTrait
+						for #storage_struct
+						#optional_storage_where_clause
+						{
+							fn partial_storage_info()
+								-> #scrate::sp_std::vec::Vec<#scrate::traits::StorageInfo>
+							{
+								#scrate::sp_std::vec![
+									#scrate::traits::StorageInfo {
+										prefix: <
+											#storage_struct as #scrate::#storage_generator_trait
+										>::storage_value_final_key(),
+										max_values: Some(1),
+										max_size: None,
+									}
+								]
+							}
+						}
+					)
+				},
+				StorageLineTypeDef::Map(_) => {
+					quote!(
+						impl<#impl_trait> #scrate::traits::PartialStorageInfoTrait
+						for #storage_struct
+						#optional_storage_where_clause
+						{
+							fn partial_storage_info()
+								-> #scrate::sp_std::vec::Vec<#scrate::traits::StorageInfo>
+							{
+								#scrate::sp_std::vec![
+									#scrate::traits::StorageInfo {
+										prefix: <
+											#storage_struct
+											as #scrate::storage::StoragePrefixedMap<#value_type>
+										>::final_prefix(),
+										max_values: #max_values,
+										max_size: None,
+									}
+								]
+							}
+						}
+					)
+				},
+				StorageLineTypeDef::DoubleMap(_) => {
+					quote!(
+						impl<#impl_trait> #scrate::traits::PartialStorageInfoTrait
+						for #storage_struct
+						#optional_storage_where_clause
+						{
+							fn partial_storage_info()
+								-> #scrate::sp_std::vec::Vec<#scrate::traits::StorageInfo>
+							{
+								#scrate::sp_std::vec![
+									#scrate::traits::StorageInfo {
+										prefix: <
+											#storage_struct
+											as #scrate::storage::StoragePrefixedMap<#value_type>
+										>::final_prefix(),
+										max_values: #max_values,
+										max_size: None,
+									}
+								]
+							}
+						}
+					)
+				},
+				StorageLineTypeDef::NMap(_) => {
+					quote!(
+						impl<#impl_trait> #scrate::traits::PartialStorageInfoTrait
+						for #storage_struct
+						#optional_storage_where_clause
+						{
+							fn partial_storage_info()
+								-> #scrate::sp_std::vec::Vec<#scrate::traits::StorageInfo>
+							{
+								#scrate::sp_std::vec![
+									#scrate::traits::StorageInfo {
+										prefix: <
+											#storage_struct
+											as #scrate::storage::StoragePrefixedMap<#value_type>
+										>::final_prefix(),
+										max_values: #max_values,
+										max_size: None,
+									}
+								]
+							}
+						}
+					)
+				},
+			}
 		};
 
 		impls.extend(quote!(
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 638485360c58..466f92dc2d1b 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -1430,6 +1430,8 @@ pub mod pallet_prelude {
 /// If the attribute set_storage_max_encoded_len is set then the macro call
 /// [`traits::StorageInfoTrait`] for each storage in the implementation of
 /// [`traits::StorageInfoTrait`] for the pallet.
+/// Otherwise it implements [`traits::StorageInfoTrait`] for the pallet using the
+/// [`traits::PartialStorageInfoTrait`] implementation of storages.
 ///
 /// # Hooks: `#[pallet::hooks]` optional
 ///
diff --git a/frame/support/src/storage/types/double_map.rs b/frame/support/src/storage/types/double_map.rs
index 2220dab58dc4..e92953b2ec3e 100644
--- a/frame/support/src/storage/types/double_map.rs
+++ b/frame/support/src/storage/types/double_map.rs
@@ -499,6 +499,32 @@ where
 	}
 }
 
+/// It doesn't require to implement `MaxEncodedLen` and give no information for `max_size`.
+impl<Prefix, Hasher1, Hasher2, Key1, Key2, Value, QueryKind, OnEmpty, MaxValues>
+	crate::traits::PartialStorageInfoTrait for
+	StorageDoubleMap<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty, MaxValues>
+where
+	Prefix: StorageInstance,
+	Hasher1: crate::hash::StorageHasher,
+	Hasher2: crate::hash::StorageHasher,
+	Key1: FullCodec,
+	Key2: FullCodec,
+	Value: FullCodec,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: Get<QueryKind::Query> + 'static,
+	MaxValues: Get<Option<u32>>,
+{
+	fn partial_storage_info() -> Vec<StorageInfo> {
+		vec![
+			StorageInfo {
+				prefix: Self::final_prefix(),
+				max_values: MaxValues::get(),
+				max_size: None
+			}
+		]
+	}
+}
+
 #[cfg(test)]
 mod test {
 	use super::*;
diff --git a/frame/support/src/storage/types/map.rs b/frame/support/src/storage/types/map.rs
index 311f2f0b2c77..4a5a86d8250b 100644
--- a/frame/support/src/storage/types/map.rs
+++ b/frame/support/src/storage/types/map.rs
@@ -375,6 +375,30 @@ where
 	}
 }
 
+/// It doesn't require to implement `MaxEncodedLen` and give no information for `max_size`.
+impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
+	crate::traits::PartialStorageInfoTrait for
+	StorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
+where
+	Prefix: StorageInstance,
+	Hasher: crate::hash::StorageHasher,
+	Key: FullCodec,
+	Value: FullCodec,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: Get<QueryKind::Query> + 'static,
+	MaxValues: Get<Option<u32>>,
+{
+	fn partial_storage_info() -> Vec<StorageInfo> {
+		vec![
+			StorageInfo {
+				prefix: Self::final_prefix(),
+				max_values: MaxValues::get(),
+				max_size: None,
+			}
+		]
+	}
+}
+
 #[cfg(test)]
 mod test {
 	use super::*;
diff --git a/frame/support/src/storage/types/nmap.rs b/frame/support/src/storage/types/nmap.rs
index 0678da22ed14..d6e043020a12 100755
--- a/frame/support/src/storage/types/nmap.rs
+++ b/frame/support/src/storage/types/nmap.rs
@@ -430,6 +430,28 @@ where
 	}
 }
 
+/// It doesn't require to implement `MaxEncodedLen` and give no information for `max_size`.
+impl<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues>
+	crate::traits::PartialStorageInfoTrait for
+	StorageNMap<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues>
+where
+	Prefix: StorageInstance,
+	Key: super::key::KeyGenerator,
+	Value: FullCodec,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: Get<QueryKind::Query> + 'static,
+	MaxValues: Get<Option<u32>>,
+{
+	fn partial_storage_info() -> Vec<StorageInfo> {
+		vec![
+			StorageInfo {
+				prefix: Self::final_prefix(),
+				max_values: MaxValues::get(),
+				max_size: None,
+			}
+		]
+	}
+}
 #[cfg(test)]
 mod test {
 	use super::*;
diff --git a/frame/support/src/storage/types/value.rs b/frame/support/src/storage/types/value.rs
index 5b37066fc394..44a0fd8dc742 100644
--- a/frame/support/src/storage/types/value.rs
+++ b/frame/support/src/storage/types/value.rs
@@ -228,6 +228,27 @@ where
 	}
 }
 
+/// It doesn't require to implement `MaxEncodedLen` and give no information for `max_size`.
+impl<Prefix, Value, QueryKind, OnEmpty>
+	crate::traits::PartialStorageInfoTrait for
+	StorageValue<Prefix, Value, QueryKind, OnEmpty>
+where
+	Prefix: StorageInstance,
+	Value: FullCodec,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static
+{
+	fn partial_storage_info() -> Vec<StorageInfo> {
+		vec![
+			StorageInfo {
+				prefix: Self::hashed_key(),
+				max_values: Some(1),
+				max_size: None,
+			}
+		]
+	}
+}
+
 #[cfg(test)]
 mod test {
 	use super::*;
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index 96e1cece5506..4eb630c6d9d7 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -74,7 +74,7 @@ pub use hooks::GenesisBuild;
 
 pub mod schedule;
 mod storage;
-pub use storage::{Instance, StorageInstance, StorageInfo, StorageInfoTrait};
+pub use storage::{Instance, PartialStorageInfoTrait, StorageInstance, StorageInfo, StorageInfoTrait};
 
 mod dispatch;
 pub use dispatch::{EnsureOrigin, OriginTrait, UnfilteredDispatchable};
diff --git a/frame/support/src/traits/storage.rs b/frame/support/src/traits/storage.rs
index 37957ceb6776..c1f97694df7c 100644
--- a/frame/support/src/traits/storage.rs
+++ b/frame/support/src/traits/storage.rs
@@ -74,3 +74,11 @@ impl StorageInfoTrait for Tuple {
 		res
 	}
 }
+
+/// Similar to [`StorageInfoTrait`], a trait to give partial information about storage.
+///
+/// This is useful when a type can give some partial information with its generic parameter doesn't
+/// implement some bounds.
+pub trait PartialStorageInfoTrait {
+	fn partial_storage_info() -> Vec<StorageInfo>;
+}
diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index 4f1e66a86894..589fca0dcd75 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -397,6 +397,9 @@ pub mod pallet2 {
 	{
 	}
 
+	#[pallet::storage]
+	pub type SomeValue<T: Config> = StorageValue<_, Vec<u32>>;
+
 	#[pallet::event]
 	pub enum Event {
 		/// Something
@@ -1247,4 +1250,15 @@ fn test_storage_info() {
 			},
 		],
 	);
+
+	assert_eq!(
+		Example2::storage_info(),
+		vec![
+			StorageInfo {
+				prefix: prefix(b"Example2", b"SomeValue"),
+				max_values: Some(1),
+				max_size: None,
+			},
+		],
+	);
 }
diff --git a/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.stderr b/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.stderr
index e2802b5e545f..aff86e333457 100644
--- a/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.stderr
+++ b/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.stderr
@@ -31,3 +31,37 @@ error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
    = note: required because of the requirements on the impl of `FullCodec` for `Bar`
    = note: required because of the requirements on the impl of `StorageValueMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
    = note: required by `frame_support::storage::types::StorageValueMetadata::NAME`
+
+error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
+ --> $DIR/storage_ensure_span_are_ok_on_wrong_gen.rs:9:12
+  |
+9 |     #[pallet::pallet]
+  |               ^^^^^^ the trait `WrapperTypeDecode` is not implemented for `Bar`
+  |
+  = note: required because of the requirements on the impl of `Decode` for `Bar`
+  = note: required because of the requirements on the impl of `FullCodec` for `Bar`
+  = note: required because of the requirements on the impl of `PartialStorageInfoTrait` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+  = note: required by `partial_storage_info`
+
+error[E0277]: the trait bound `Bar: EncodeLike` is not satisfied
+ --> $DIR/storage_ensure_span_are_ok_on_wrong_gen.rs:9:12
+  |
+9 |     #[pallet::pallet]
+  |               ^^^^^^ the trait `EncodeLike` is not implemented for `Bar`
+  |
+  = note: required because of the requirements on the impl of `FullEncode` for `Bar`
+  = note: required because of the requirements on the impl of `FullCodec` for `Bar`
+  = note: required because of the requirements on the impl of `PartialStorageInfoTrait` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+  = note: required by `partial_storage_info`
+
+error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
+ --> $DIR/storage_ensure_span_are_ok_on_wrong_gen.rs:9:12
+  |
+9 |     #[pallet::pallet]
+  |               ^^^^^^ the trait `WrapperTypeEncode` is not implemented for `Bar`
+  |
+  = note: required because of the requirements on the impl of `pallet::_::_parity_scale_codec::Encode` for `Bar`
+  = note: required because of the requirements on the impl of `FullEncode` for `Bar`
+  = note: required because of the requirements on the impl of `FullCodec` for `Bar`
+  = note: required because of the requirements on the impl of `PartialStorageInfoTrait` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+  = note: required by `partial_storage_info`
diff --git a/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.stderr b/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.stderr
index e54a8c227eea..2f4876554aa5 100644
--- a/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.stderr
+++ b/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.stderr
@@ -31,3 +31,37 @@ error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
    = note: required because of the requirements on the impl of `FullCodec` for `Bar`
    = note: required because of the requirements on the impl of `StorageValueMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
    = note: required by `frame_support::storage::types::StorageValueMetadata::NAME`
+
+error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
+ --> $DIR/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:9:12
+  |
+9 |     #[pallet::pallet]
+  |               ^^^^^^ the trait `WrapperTypeDecode` is not implemented for `Bar`
+  |
+  = note: required because of the requirements on the impl of `Decode` for `Bar`
+  = note: required because of the requirements on the impl of `FullCodec` for `Bar`
+  = note: required because of the requirements on the impl of `PartialStorageInfoTrait` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+  = note: required by `partial_storage_info`
+
+error[E0277]: the trait bound `Bar: EncodeLike` is not satisfied
+ --> $DIR/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:9:12
+  |
+9 |     #[pallet::pallet]
+  |               ^^^^^^ the trait `EncodeLike` is not implemented for `Bar`
+  |
+  = note: required because of the requirements on the impl of `FullEncode` for `Bar`
+  = note: required because of the requirements on the impl of `FullCodec` for `Bar`
+  = note: required because of the requirements on the impl of `PartialStorageInfoTrait` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+  = note: required by `partial_storage_info`
+
+error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
+ --> $DIR/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:9:12
+  |
+9 |     #[pallet::pallet]
+  |               ^^^^^^ the trait `WrapperTypeEncode` is not implemented for `Bar`
+  |
+  = note: required because of the requirements on the impl of `pallet::_::_parity_scale_codec::Encode` for `Bar`
+  = note: required because of the requirements on the impl of `FullEncode` for `Bar`
+  = note: required because of the requirements on the impl of `FullCodec` for `Bar`
+  = note: required because of the requirements on the impl of `PartialStorageInfoTrait` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+  = note: required by `partial_storage_info`

From 0d10a9d1ddd8d5b95e2ccd3b0b125ff6957943ab Mon Sep 17 00:00:00 2001
From: Trevor Arjeski <72849114+trevor-crypto@users.noreply.github.com>
Date: Mon, 5 Jul 2021 14:47:18 +0300
Subject: [PATCH 0948/1194] Bump linregress due to security vulnerability
 (#9262)

https://rustsec.org/advisories/RUSTSEC-2021-0070
---
 Cargo.lock                    | 85 +++++++++++++++++++++--------------
 frame/benchmarking/Cargo.toml |  4 +-
 2 files changed, 53 insertions(+), 36 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 737a762d88f0..1905090baa10 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -131,9 +131,9 @@ checksum = "afddf7f520a80dbf76e6f50a35bca42a2331ef227a28b3b6dc5c2e2338d114b1"
 
 [[package]]
 name = "approx"
-version = "0.3.2"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3"
+checksum = "072df7202e63b127ab55acfe16ce97013d5b97bf160489336d3f1840fd78e99e"
 dependencies = [
  "num-traits",
 ]
@@ -2189,15 +2189,6 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "generic-array"
-version = "0.13.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f797e67af32588215eaaab8327027ee8e71b9dd0b2b26996aedf20c030fce309"
-dependencies = [
- "typenum",
-]
-
 [[package]]
 name = "generic-array"
 version = "0.14.4"
@@ -3656,9 +3647,9 @@ dependencies = [
 
 [[package]]
 name = "linregress"
-version = "0.4.0"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d0ad4b5cc8385a881c561fac3501353d63d2a2b7a357b5064d71815c9a92724"
+checksum = "1e6e407dadb4ca4b31bc69c27aff00e7ca4534fdcee855159b039a7cebb5f395"
 dependencies = [
  "nalgebra",
  "statrs",
@@ -3766,9 +3757,9 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 
 [[package]]
 name = "matrixmultiply"
-version = "0.2.4"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "916806ba0031cd542105d916a97c8572e1fa6dd79c9c51e7eb43a09ec2dd84c1"
+checksum = "5a8a15b776d9dfaecd44b03c5828c2199cddff5247215858aac14624f8d6b741"
 dependencies = [
  "rawpointer",
 ]
@@ -4050,22 +4041,33 @@ dependencies = [
 
 [[package]]
 name = "nalgebra"
-version = "0.21.1"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6b6147c3d50b4f3cdabfe2ecc94a0191fd3d6ad58aefd9664cf396285883486"
+checksum = "462fffe4002f4f2e1f6a9dcf12cc1a6fc0e15989014efc02a941d3e0f5dc2120"
 dependencies = [
  "approx",
- "generic-array 0.13.3",
  "matrixmultiply",
+ "nalgebra-macros",
  "num-complex",
- "num-rational",
+ "num-rational 0.4.0",
  "num-traits",
- "rand 0.7.3",
+ "rand 0.8.3",
  "rand_distr",
  "simba",
  "typenum",
 ]
 
+[[package]]
+name = "nalgebra-macros"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01fcc0b8149b4632adc89ac3b7b31a12fb6099a0317a4eb2ebff574ef7de7218"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "names"
 version = "0.11.0"
@@ -4587,11 +4589,10 @@ dependencies = [
 
 [[package]]
 name = "num-complex"
-version = "0.2.4"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95"
+checksum = "26873667bbbb7c5182d4a37c1add32cdf09f841af72da53318fdb81543c15085"
 dependencies = [
- "autocfg",
  "num-traits",
 ]
 
@@ -4617,6 +4618,17 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "num-rational"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
 [[package]]
 name = "num-traits"
 version = "0.2.14"
@@ -6571,11 +6583,12 @@ dependencies = [
 
 [[package]]
 name = "rand_distr"
-version = "0.2.2"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96977acbdd3a6576fb1d27391900035bf3863d4a16422973a409b488cf29ffb2"
+checksum = "051b398806e42b9cd04ad9ec8f81e355d0a382c543ac6672c62f5a5b452ef142"
 dependencies = [
- "rand 0.7.3",
+ "num-traits",
+ "rand 0.8.3",
 ]
 
 [[package]]
@@ -7280,7 +7293,7 @@ dependencies = [
  "log",
  "merlin",
  "num-bigint",
- "num-rational",
+ "num-rational 0.2.4",
  "num-traits",
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -8565,14 +8578,14 @@ checksum = "0f0242b8e50dd9accdd56170e94ca1ebd223b098eb9c83539a6e367d0f36ae68"
 
 [[package]]
 name = "simba"
-version = "0.1.5"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb931b1367faadea6b1ab1c306a860ec17aaa5fa39f367d0c744e69d971a1fb2"
+checksum = "8e82063457853d00243beda9952e910b82593e4b07ae9f721b9278a99a0d3d5c"
 dependencies = [
  "approx",
  "num-complex",
  "num-traits",
- "paste 0.1.18",
+ "paste 1.0.4",
 ]
 
 [[package]]
@@ -9512,11 +9525,15 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "statrs"
-version = "0.12.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cce16f6de653e88beca7bd13780d08e09d4489dbca1f9210e041bc4852481382"
+checksum = "05bdbb8e4e78216a85785a85d3ec3183144f98d0097b9281802c019bb07a6f05"
 dependencies = [
- "rand 0.7.3",
+ "approx",
+ "lazy_static",
+ "nalgebra",
+ "num-traits",
+ "rand 0.8.3",
 ]
 
 [[package]]
@@ -11037,7 +11054,7 @@ dependencies = [
  "errno",
  "libc",
  "memory_units",
- "num-rational",
+ "num-rational 0.2.4",
  "num-traits",
  "parity-wasm 0.42.2",
  "wasmi-validation",
diff --git a/frame/benchmarking/Cargo.toml b/frame/benchmarking/Cargo.toml
index 3b20cf7dd048..beff930161a0 100644
--- a/frame/benchmarking/Cargo.toml
+++ b/frame/benchmarking/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-linregress = { version = "0.4.0", optional = true }
+linregress = { version = "0.4.3", optional = true }
 paste = "1.0"
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 sp-api = { version = "3.0.0", path = "../../primitives/api", default-features = false }
@@ -31,7 +31,7 @@ hex-literal = "0.3.1"
 serde = "1.0.101"
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"sp-runtime-interface/std",

From 32a365d549dfb123d2d14443b3e35ed908da6de4 Mon Sep 17 00:00:00 2001
From: Andronik Ordian <write@reusable.software>
Date: Mon, 5 Jul 2021 20:37:19 +0200
Subject: [PATCH 0949/1194] bump a bunch of deps in parity-common (#9263)

* bump a bunch of deps in parity-common

* primitive-types 0.10.0

* update Cargo.lock

* downgrade a few more

* this is unlikely to help

* try something

* Checkmate, Atheists!
---
 Cargo.lock                               | 97 ++++++++++++------------
 bin/node/bench/Cargo.toml                |  6 +-
 bin/node/browser-testing/Cargo.toml      |  4 +
 bin/node/browser-testing/src/lib.rs      |  1 -
 bin/node/cli/src/browser.rs              |  7 +-
 client/api/Cargo.toml                    |  4 +-
 client/db/Cargo.toml                     | 10 +--
 client/informant/Cargo.toml              |  2 +-
 client/service/Cargo.toml                |  2 +-
 client/state-db/Cargo.toml               |  2 +-
 client/transaction-pool/Cargo.toml       |  2 +-
 client/transaction-pool/graph/Cargo.toml |  2 +-
 frame/support/Cargo.toml                 |  2 +-
 max-encoded-len/Cargo.toml               |  2 +-
 primitives/arithmetic/Cargo.toml         |  2 +-
 primitives/arithmetic/fuzzer/Cargo.toml  |  2 +-
 primitives/core/Cargo.toml               |  4 +-
 primitives/database/Cargo.toml           |  2 +-
 primitives/runtime-interface/Cargo.toml  |  2 +-
 primitives/runtime/Cargo.toml            |  2 +-
 primitives/state-machine/Cargo.toml      |  2 +-
 primitives/test-primitives/Cargo.toml    |  2 +-
 primitives/trie/Cargo.toml               |  6 +-
 test-utils/runtime/Cargo.toml            |  6 +-
 utils/browser/Cargo.toml                 |  2 +-
 utils/browser/src/lib.rs                 |  4 +-
 26 files changed, 89 insertions(+), 90 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1905090baa10..5a98dc0ff96f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -96,6 +96,17 @@ version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e"
 
+[[package]]
+name = "ahash"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98"
+dependencies = [
+ "getrandom 0.2.3",
+ "once_cell",
+ "version_check",
+]
+
 [[package]]
 name = "aho-corasick"
 version = "0.7.15"
@@ -2149,7 +2160,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
 dependencies = [
  "gloo-timers",
- "send_wrapper 0.4.0",
+ "send_wrapper",
 ]
 
 [[package]]
@@ -2363,7 +2374,16 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
 dependencies = [
- "ahash",
+ "ahash 0.4.7",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
+dependencies = [
+ "ahash 0.7.4",
 ]
 
 [[package]]
@@ -2726,7 +2746,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3"
 dependencies = [
  "autocfg",
- "hashbrown",
+ "hashbrown 0.9.1",
  "serde",
 ]
 
@@ -3052,9 +3072,9 @@ dependencies = [
 
 [[package]]
 name = "kvdb"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8891bd853eff90e33024195d79d578dc984c82f9e0715fcd2b525a0c19d52811"
+checksum = "45a3f58dc069ec0e205a27f5b45920722a46faed802a0541538241af6228f512"
 dependencies = [
  "parity-util-mem",
  "smallvec 1.6.1",
@@ -3062,9 +3082,9 @@ dependencies = [
 
 [[package]]
 name = "kvdb-memorydb"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30a0da8e08caf08d384a620ec19bb6c9b85c84137248e202617fb91881f25912"
+checksum = "c3b6b85fc643f5acd0bffb2cc8a6d150209379267af0d41db72170021841f9f5"
 dependencies = [
  "kvdb",
  "parity-util-mem",
@@ -3073,9 +3093,9 @@ dependencies = [
 
 [[package]]
 name = "kvdb-rocksdb"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34446c373ccc494c2124439281c198c7636ccdc2752c06722bbffd56d459c1e4"
+checksum = "431ca65516efab86e65d96281f750ebb54277dec656fcf6c027f3d1c0cb69e4c"
 dependencies = [
  "fs-swap",
  "kvdb",
@@ -3089,24 +3109,6 @@ dependencies = [
  "smallvec 1.6.1",
 ]
 
-[[package]]
-name = "kvdb-web"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb1e98ba343d0b35f9009a8844cd2b87fa3192f7e79033ac05b00aeae0f3b0b5"
-dependencies = [
- "futures 0.3.15",
- "js-sys",
- "kvdb",
- "kvdb-memorydb",
- "log",
- "parity-util-mem",
- "parking_lot 0.11.1",
- "send_wrapper 0.5.0",
- "wasm-bindgen",
- "web-sys",
-]
-
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -3707,7 +3709,7 @@ version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f374d42cdfc1d7dbf3d3dec28afab2eb97ffbf43a3234d795b5986dbf4b90ba"
 dependencies = [
- "hashbrown",
+ "hashbrown 0.9.1",
 ]
 
 [[package]]
@@ -3838,12 +3840,12 @@ dependencies = [
 
 [[package]]
 name = "memory-db"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "814bbecfc0451fc314eeea34f05bbcd5b98a7ad7af37faee088b86a1e633f1d4"
+checksum = "de006e09d04fc301a5f7e817b75aa49801c4479a8af753764416b085337ddcc5"
 dependencies = [
  "hash-db",
- "hashbrown",
+ "hashbrown 0.11.2",
  "parity-util-mem",
 ]
 
@@ -4157,6 +4159,7 @@ dependencies = [
  "jsonrpc-core",
  "libp2p",
  "node-cli",
+ "parking_lot 0.11.1",
  "sc-rpc-api",
  "serde",
  "serde_json",
@@ -5821,12 +5824,12 @@ dependencies = [
 
 [[package]]
 name = "parity-util-mem"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "664a8c6b8e62d8f9f2f937e391982eb433ab285b4cd9545b342441e04a906e42"
+checksum = "7ad6f1acec69b95caf435bbd158d486e5a0a44fcf51531e84922c59ff09e8457"
 dependencies = [
  "cfg-if 1.0.0",
- "hashbrown",
+ "hashbrown 0.11.2",
  "impl-trait-for-tuples",
  "parity-util-mem-derive",
  "parking_lot 0.11.1",
@@ -6271,9 +6274,9 @@ dependencies = [
 
 [[package]]
 name = "primitive-types"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2415937401cb030a2a0a4d922483f945fa068f52a7dbb22ce0fe5f2b6f6adace"
+checksum = "e90f6931e6b3051e208a449c342246cb7c786ef300789b95619f46f1dd75d9b0"
 dependencies = [
  "fixed-hash",
  "impl-codec",
@@ -6837,9 +6840,9 @@ dependencies = [
 
 [[package]]
 name = "rocksdb"
-version = "0.15.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d83c02c429044d58474eaf5ae31e062d0de894e21125b47437ec0edc1397e6"
+checksum = "c749134fda8bfc90d0de643d59bfc841dcb3ac8a1062e12b6754bd60235c48b3"
 dependencies = [
  "libc",
  "librocksdb-sys",
@@ -8427,12 +8430,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0"
 
-[[package]]
-name = "send_wrapper"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "930c0acf610d3fdb5e2ab6213019aaa04e227ebe9547b0649ba599b16d788bd7"
-
 [[package]]
 name = "serde"
 version = "1.0.124"
@@ -9638,7 +9635,7 @@ dependencies = [
  "futures-timer 3.0.2",
  "getrandom 0.2.3",
  "js-sys",
- "kvdb-web",
+ "kvdb-memorydb",
  "libp2p-wasm-ext",
  "log",
  "rand 0.7.3",
@@ -10544,9 +10541,9 @@ checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41"
 
 [[package]]
 name = "trie-bench"
-version = "0.27.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "568257edb909a5c532b1f4ab38ee6b5dedfbf8775be6a55a29020513ebe3e072"
+checksum = "4edd9bdf0c2e08fd77c0fb2608179cac7ebed997ae18f58d47a2d96425ff51f0"
 dependencies = [
  "criterion",
  "hash-db",
@@ -10560,12 +10557,12 @@ dependencies = [
 
 [[package]]
 name = "trie-db"
-version = "0.22.5"
+version = "0.22.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd81fe0c8bc2b528a51c9d2c31dae4483367a26a723a3c9a4a8120311d7774e3"
+checksum = "9eac131e334e81b6b3be07399482042838adcd7957aa0010231d0813e39e02fa"
 dependencies = [
  "hash-db",
- "hashbrown",
+ "hashbrown 0.11.2",
  "log",
  "rustc-hex",
  "smallvec 1.6.1",
diff --git a/bin/node/bench/Cargo.toml b/bin/node/bench/Cargo.toml
index 93ee35d98f98..65c6a562b18b 100644
--- a/bin/node/bench/Cargo.toml
+++ b/bin/node/bench/Cargo.toml
@@ -21,8 +21,8 @@ serde = "1.0.101"
 serde_json = "1.0.41"
 structopt = "0.3"
 derive_more = "0.99.2"
-kvdb = "0.9.0"
-kvdb-rocksdb = "0.11.0"
+kvdb = "0.10.0"
+kvdb-rocksdb = "0.12.0"
 sp-trie = { version = "3.0.0", path = "../../../primitives/trie" }
 sp-core = { version = "3.0.0", path = "../../../primitives/core" }
 sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
@@ -37,7 +37,7 @@ fs_extra = "1"
 hex = "0.4.0"
 rand = { version = "0.7.2", features = ["small_rng"] }
 lazy_static = "1.4.0"
-parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
 parity-db = { version = "0.2.4" }
 sc-transaction-pool = { version = "3.0.0", path = "../../../client/transaction-pool" }
 futures = { version = "0.3.4", features = ["thread-pool"] }
diff --git a/bin/node/browser-testing/Cargo.toml b/bin/node/browser-testing/Cargo.toml
index 93bf8f5131e3..f66a0a2ea1ab 100644
--- a/bin/node/browser-testing/Cargo.toml
+++ b/bin/node/browser-testing/Cargo.toml
@@ -19,3 +19,7 @@ futures = "0.3.9"
 
 node-cli = { path = "../cli", default-features = false, features = ["browser"], version = "2.0.0"}
 sc-rpc-api = { path = "../../../client/rpc-api", version = "0.9.0"}
+
+# This is a HACK to make browser tests pass.
+# enables [`instant/wasm_bindgen`]
+parking_lot = { version = "0.11.1", features = ["wasm-bindgen"] }
diff --git a/bin/node/browser-testing/src/lib.rs b/bin/node/browser-testing/src/lib.rs
index ad18de87b3d3..a269e9cab21e 100644
--- a/bin/node/browser-testing/src/lib.rs
+++ b/bin/node/browser-testing/src/lib.rs
@@ -56,7 +56,6 @@ fn deserialize_rpc_result<T: DeserializeOwned>(js_value: JsValue) -> T {
 #[wasm_bindgen_test]
 async fn runs() {
 	let mut client = node_cli::start_client(None, "info".into())
-			.await
 			.unwrap();
 
 	// Check that the node handles rpc calls.
diff --git a/bin/node/cli/src/browser.rs b/bin/node/cli/src/browser.rs
index 49ac309d42ab..82f1921d2a6b 100644
--- a/bin/node/cli/src/browser.rs
+++ b/bin/node/cli/src/browser.rs
@@ -26,13 +26,12 @@ use browser_utils::{
 
 /// Starts the client.
 #[wasm_bindgen]
-pub async fn start_client(chain_spec: Option<String>, log_level: String) -> Result<Client, JsValue> {
+pub fn start_client(chain_spec: Option<String>, log_level: String) -> Result<Client, JsValue> {
 	start_inner(chain_spec, log_level)
-		.await
 		.map_err(|err| JsValue::from_str(&err.to_string()))
 }
 
-async fn start_inner(
+fn start_inner(
 	chain_spec: Option<String>,
 	log_directives: String,
 ) -> Result<Client, Box<dyn std::error::Error>> {
@@ -44,7 +43,7 @@ async fn start_inner(
 		None => crate::chain_spec::development_config(),
 	};
 
-	let config = browser_configuration(chain_spec).await?;
+	let config = browser_configuration(chain_spec)?;
 
 	info!("Substrate browser node");
 	info!("✌️  version {}", config.impl_version);
diff --git a/client/api/Cargo.toml b/client/api/Cargo.toml
index 637dae4a29ab..65a48954c490 100644
--- a/client/api/Cargo.toml
+++ b/client/api/Cargo.toml
@@ -24,7 +24,7 @@ futures = "0.3.1"
 hash-db = { version = "0.15.2", default-features = false }
 sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
 sp-inherents = { version = "3.0.0", default-features = false, path = "../../primitives/inherents" }
-kvdb = "0.9.0"
+kvdb = "0.10.0"
 log = "0.4.8"
 parking_lot = "0.11.1"
 lazy_static =  "1.4.0"
@@ -43,7 +43,7 @@ sp-transaction-pool = { version = "3.0.0", path = "../../primitives/transaction-
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.9.0", path = "../../utils/prometheus" }
 
 [dev-dependencies]
-kvdb-memorydb = "0.9.0"
+kvdb-memorydb = "0.10.0"
 sp-test-primitives = { version = "2.0.0", path = "../../primitives/test-primitives" }
 substrate-test-runtime = { version = "2.0.0", path = "../../test-utils/runtime"  }
 thiserror = "1.0.21"
diff --git a/client/db/Cargo.toml b/client/db/Cargo.toml
index 43bae63f09c2..2145b988891d 100644
--- a/client/db/Cargo.toml
+++ b/client/db/Cargo.toml
@@ -15,12 +15,12 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 parking_lot = "0.11.1"
 log = "0.4.8"
-kvdb = "0.9.0"
-kvdb-rocksdb = { version = "0.11.0", optional = true }
-kvdb-memorydb = "0.9.0"
+kvdb = "0.10.0"
+kvdb-rocksdb = { version = "0.12.0", optional = true }
+kvdb-memorydb = "0.10.0"
 linked-hash-map = "0.5.2"
 hash-db = "0.15.2"
-parity-util-mem = { version = "0.9.0", default-features = false, features = ["std"] }
+parity-util-mem = { version = "0.10.0", default-features = false, features = ["std"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 blake2-rfc = "0.2.18"
 
@@ -43,7 +43,7 @@ sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
 sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 quickcheck = "1.0.3"
-kvdb-rocksdb = "0.11.0"
+kvdb-rocksdb = "0.12.0"
 tempfile = "3"
 
 [features]
diff --git a/client/informant/Cargo.toml b/client/informant/Cargo.toml
index 139a5ce19a00..4238243ef96e 100644
--- a/client/informant/Cargo.toml
+++ b/client/informant/Cargo.toml
@@ -17,7 +17,7 @@ ansi_term = "0.12.1"
 futures = "0.3.9"
 futures-timer = "3.0.1"
 log = "0.4.8"
-parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
 sc-client-api = { version = "3.0.0", path = "../api" }
 sc-network = { version = "0.9.0", path = "../network" }
 sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index a90efb02dc5f..e4756b1880f3 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -79,7 +79,7 @@ sc-tracing = { version = "3.0.0", path = "../tracing" }
 sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
 tracing = "0.1.25"
 tracing-futures = { version = "0.2.4" }
-parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
 async-trait = "0.1.42"
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
diff --git a/client/state-db/Cargo.toml b/client/state-db/Cargo.toml
index d61dd7fc125a..ca538f9d651f 100644
--- a/client/state-db/Cargo.toml
+++ b/client/state-db/Cargo.toml
@@ -19,5 +19,5 @@ log = "0.4.11"
 sc-client-api = { version = "3.0.0", path = "../api" }
 sp-core = { version = "3.0.0", path = "../../primitives/core" }
 codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
-parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
 parity-util-mem-derive = "0.1.0"
diff --git a/client/transaction-pool/Cargo.toml b/client/transaction-pool/Cargo.toml
index 6b105520baec..77b551915ce1 100644
--- a/client/transaction-pool/Cargo.toml
+++ b/client/transaction-pool/Cargo.toml
@@ -18,7 +18,7 @@ thiserror = "1.0.21"
 futures = { version = "0.3.1", features = ["compat"] }
 intervalier = "0.4.0"
 log = "0.4.8"
-parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
 parking_lot = "0.11.1"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
 sc-client-api = { version = "3.0.0", path = "../api" }
diff --git a/client/transaction-pool/graph/Cargo.toml b/client/transaction-pool/graph/Cargo.toml
index 4b134c708096..9af2b152d8c6 100644
--- a/client/transaction-pool/graph/Cargo.toml
+++ b/client/transaction-pool/graph/Cargo.toml
@@ -25,7 +25,7 @@ sp-utils = { version = "3.0.0", path = "../../../primitives/utils" }
 sp-core = { version = "3.0.0", path = "../../../primitives/core" }
 sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
 sp-transaction-pool = { version = "3.0.0", path = "../../../primitives/transaction-pool" }
-parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
 linked-hash-map = "0.5.2"
 retain_mut = "0.1.3"
 
diff --git a/frame/support/Cargo.toml b/frame/support/Cargo.toml
index 0c9aacaf307b..80b3d7f0c4ec 100644
--- a/frame/support/Cargo.toml
+++ b/frame/support/Cargo.toml
@@ -37,7 +37,7 @@ log = { version = "0.4.14", default-features = false }
 [dev-dependencies]
 pretty_assertions = "0.6.1"
 frame-system = { version = "3.0.0", path = "../system" }
-parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
 
 [features]
 default = ["std"]
diff --git a/max-encoded-len/Cargo.toml b/max-encoded-len/Cargo.toml
index 994a3c6a5e13..9c0f55922481 100644
--- a/max-encoded-len/Cargo.toml
+++ b/max-encoded-len/Cargo.toml
@@ -13,7 +13,7 @@ description = "Trait MaxEncodedLen bounds the max encoded length of an item."
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 impl-trait-for-tuples = "0.2.1"
 max-encoded-len-derive = { package = "max-encoded-len-derive", version = "3.0.0", path = "derive", default-features = false, optional = true }
-primitive-types = { version = "0.9.0", default-features = false, features = ["codec"] }
+primitive-types = { version = "0.10.0", default-features = false, features = ["codec"] }
 
 [dev-dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [ "derive" ] }
diff --git a/primitives/arithmetic/Cargo.toml b/primitives/arithmetic/Cargo.toml
index 3c3b5a35c164..fa3c3b358f3a 100644
--- a/primitives/arithmetic/Cargo.toml
+++ b/primitives/arithmetic/Cargo.toml
@@ -27,7 +27,7 @@ sp-debug-derive = { version = "3.0.0", default-features = false, path = "../debu
 rand = "0.7.2"
 criterion = "0.3"
 serde_json = "1.0"
-primitive-types = "0.9.0"
+primitive-types = "0.10.0"
 
 [features]
 default = ["std"]
diff --git a/primitives/arithmetic/fuzzer/Cargo.toml b/primitives/arithmetic/fuzzer/Cargo.toml
index 2666dde9016a..c79edb99fb49 100644
--- a/primitives/arithmetic/fuzzer/Cargo.toml
+++ b/primitives/arithmetic/fuzzer/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 sp-arithmetic = { version = "3.0.0", path = ".." }
 honggfuzz = "0.5.49"
-primitive-types = "0.9.0"
+primitive-types = "0.10.0"
 num-bigint = "0.2"
 num-traits = "0.2"
 
diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml
index 0c724d61ae0c..14f24d35767e 100644
--- a/primitives/core/Cargo.toml
+++ b/primitives/core/Cargo.toml
@@ -18,7 +18,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
 log = { version = "0.4.11", default-features = false }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 byteorder = { version = "1.3.2", default-features = false }
-primitive-types = { version = "0.9.0", default-features = false, features = ["codec"] }
+primitive-types = { version = "0.10.0", default-features = false, features = ["codec"] }
 impl-serde = { version = "0.3.0", optional = true }
 wasmi = { version = "0.9.0", optional = true }
 hash-db = { version = "0.15.2", default-features = false }
@@ -36,7 +36,7 @@ parking_lot = { version = "0.11.1", optional = true }
 sp-debug-derive = { version = "3.0.0", path = "../debug-derive" }
 sp-externalities = { version = "0.9.0", optional = true, path = "../externalities" }
 sp-storage = { version = "3.0.0", default-features = false, path = "../storage" }
-parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
 futures = { version = "0.3.1", optional = true }
 dyn-clonable = { version = "0.9.0", optional = true }
 thiserror = { version = "1.0.21", optional = true }
diff --git a/primitives/database/Cargo.toml b/primitives/database/Cargo.toml
index aae7668b5ec8..f8693449af8c 100644
--- a/primitives/database/Cargo.toml
+++ b/primitives/database/Cargo.toml
@@ -12,5 +12,5 @@ readme = "README.md"
 
 [dependencies]
 parking_lot = "0.11.1"
-kvdb = "0.9.0"
+kvdb = "0.10.0"
 
diff --git a/primitives/runtime-interface/Cargo.toml b/primitives/runtime-interface/Cargo.toml
index 4099e8993388..c418ef44cef6 100644
--- a/primitives/runtime-interface/Cargo.toml
+++ b/primitives/runtime-interface/Cargo.toml
@@ -21,7 +21,7 @@ sp-runtime-interface-proc-macro = { version = "3.0.0", path = "proc-macro" }
 sp-externalities = { version = "0.9.0", optional = true, path = "../externalities" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 static_assertions = "1.0.0"
-primitive-types = { version = "0.9.0", default-features = false }
+primitive-types = { version = "0.10.0", default-features = false }
 sp-storage = { version = "3.0.0", default-features = false, path = "../storage" }
 impl-trait-for-tuples = "0.2.1"
 
diff --git a/primitives/runtime/Cargo.toml b/primitives/runtime/Cargo.toml
index aec2bc416ee3..e0fc2ed46183 100644
--- a/primitives/runtime/Cargo.toml
+++ b/primitives/runtime/Cargo.toml
@@ -26,7 +26,7 @@ log = { version = "0.4.14", default-features = false }
 paste = "1.0"
 rand = { version = "0.7.2", optional = true }
 impl-trait-for-tuples = "0.2.1"
-parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
 hash256-std-hasher = { version = "0.15.2", default-features = false }
 either = { version = "1.5", default-features = false }
 max-encoded-len = { version = "3.0.0", default-features = false, path = "../../max-encoded-len", features = [ "derive" ] }
diff --git a/primitives/state-machine/Cargo.toml b/primitives/state-machine/Cargo.toml
index 79fccef08c19..00050116280e 100644
--- a/primitives/state-machine/Cargo.toml
+++ b/primitives/state-machine/Cargo.toml
@@ -18,7 +18,7 @@ log = { version = "0.4.11", optional = true }
 thiserror = { version = "1.0.21", optional = true }
 parking_lot = { version = "0.11.1", optional = true }
 hash-db = { version = "0.15.2", default-features = false }
-trie-db = { version = "0.22.2", default-features = false }
+trie-db = { version = "0.22.6", default-features = false }
 trie-root = { version = "0.16.0", default-features = false }
 sp-trie = { version = "3.0.0", path = "../trie", default-features = false }
 sp-core = { version = "3.0.0", path = "../core", default-features = false }
diff --git a/primitives/test-primitives/Cargo.toml b/primitives/test-primitives/Cargo.toml
index fbf29db96fa4..f1f2c70bf231 100644
--- a/primitives/test-primitives/Cargo.toml
+++ b/primitives/test-primitives/Cargo.toml
@@ -17,7 +17,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
 sp-core = { version = "3.0.0", default-features = false, path = "../core" }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../runtime" }
-parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
 
 [features]
 default = [
diff --git a/primitives/trie/Cargo.toml b/primitives/trie/Cargo.toml
index bf91fff31b8b..e13bc68fb96b 100644
--- a/primitives/trie/Cargo.toml
+++ b/primitives/trie/Cargo.toml
@@ -21,13 +21,13 @@ harness = false
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 sp-std = { version = "3.0.0", default-features = false, path = "../std" }
 hash-db = { version = "0.15.2", default-features = false }
-trie-db = { version = "0.22.5", default-features = false }
+trie-db = { version = "0.22.6", default-features = false }
 trie-root = { version = "0.16.0", default-features = false }
-memory-db = { version = "0.26.0", default-features = false }
+memory-db = { version = "0.27.0", default-features = false }
 sp-core = { version = "3.0.0", default-features = false, path = "../core" }
 
 [dev-dependencies]
-trie-bench = "0.27.0"
+trie-bench = "0.28.0"
 trie-standardmap = "0.15.2"
 criterion = "0.3.3"
 hex-literal = "0.3.1"
diff --git a/test-utils/runtime/Cargo.toml b/test-utils/runtime/Cargo.toml
index 96b7efff8338..60283bb97d18 100644
--- a/test-utils/runtime/Cargo.toml
+++ b/test-utils/runtime/Cargo.toml
@@ -20,7 +20,7 @@ sp-block-builder = { version = "3.0.0", default-features = false, path = "../../
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-inherents = { version = "3.0.0", default-features = false, path = "../../primitives/inherents" }
 sp-keyring = { version = "3.0.0", optional = true, path = "../../primitives/keyring" }
-memory-db = { version = "0.26.0", default-features = false }
+memory-db = { version = "0.27.0", default-features = false }
 sp-offchain = { path = "../../primitives/offchain", default-features = false, version = "3.0.0"}
 sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
@@ -38,8 +38,8 @@ pallet-timestamp = { version = "3.0.0", default-features = false, path = "../../
 sp-finality-grandpa = { version = "3.0.0", default-features = false, path = "../../primitives/finality-grandpa" }
 sp-trie = { version = "3.0.0", default-features = false, path = "../../primitives/trie" }
 sp-transaction-pool = { version = "3.0.0", default-features = false, path = "../../primitives/transaction-pool" }
-trie-db = { version = "0.22.2", default-features = false }
-parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
+trie-db = { version = "0.22.6", default-features = false }
+parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
 sc-service = { version = "0.9.0", default-features = false, optional = true, features = ["test-helpers"], path = "../../client/service" }
 sp-state-machine = { version = "0.9.0", default-features = false, path = "../../primitives/state-machine" }
 sp-externalities = { version = "0.9.0", default-features = false, path = "../../primitives/externalities" }
diff --git a/utils/browser/Cargo.toml b/utils/browser/Cargo.toml
index 31403a5e6fa9..eac1730d5ce2 100644
--- a/utils/browser/Cargo.toml
+++ b/utils/browser/Cargo.toml
@@ -21,7 +21,7 @@ console_error_panic_hook = "0.1.6"
 js-sys = "0.3.34"
 wasm-bindgen = "0.2.73"
 wasm-bindgen-futures = "0.4.18"
-kvdb-web = "0.9.0"
+kvdb-memorydb = "0.10.0"
 sp-database = { version = "3.0.0", path = "../../primitives/database" }
 sc-informant = { version = "0.9.0", path = "../../client/informant" }
 sc-service = { version = "0.9.0", path = "../../client/service", default-features = false }
diff --git a/utils/browser/src/lib.rs b/utils/browser/src/lib.rs
index d9d77210b930..0d4937ceeee4 100644
--- a/utils/browser/src/lib.rs
+++ b/utils/browser/src/lib.rs
@@ -43,7 +43,7 @@ pub fn init_logging(pattern: &str) -> Result<(), sc_tracing::logging::Error> {
 /// Create a service configuration from a chain spec.
 ///
 /// This configuration contains good defaults for a browser light client.
-pub async fn browser_configuration<G, E>(
+pub fn browser_configuration<G, E>(
 	chain_spec: GenericChainSpec<G, E>,
 ) -> Result<Configuration, Box<dyn std::error::Error>>
 where
@@ -78,7 +78,7 @@ where
 		role: Role::Light,
 		database: {
 			info!("Opening Indexed DB database '{}'...", name);
-			let db = kvdb_web::Database::open(name, 10).await?;
+			let db = kvdb_memorydb::create(10);
 
 			DatabaseConfig::Custom(sp_database::as_database(db))
 		},

From d22f0df5ec001699f85e5be8b1a00d333b15de25 Mon Sep 17 00:00:00 2001
From: Igor Matuszewski <Xanewok@gmail.com>
Date: Mon, 5 Jul 2021 22:37:24 +0200
Subject: [PATCH 0950/1194] Remove in-tree `max-encoded-len` and use the new
 SCALE codec crate instead (#9163)

* Update impl-codec to use new upstream MaxEncodedLen trait

* Adapt crates to use the updated codec crate for `MaxEncodedLen`

* Remove max-encoded-len crate altogether

* Fix test compilation in `pallet-proxy`

* reorganize import (#9186)

* Fix remaining `MaxEncodedLen` imports

* Fix remaining old usages of max-encoded-len crate

* Fix UI test

* Manually depend on new impl-codec to fix Polkadot companion build

* Use newly released primitive-types v0.9.1 that has new codec impls

* Make sure codec deps are up-to-date in crates that use them

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
---
 Cargo.lock                                    |  46 +---
 Cargo.toml                                    |   3 -
 bin/node/runtime/Cargo.toml                   |   5 +-
 bin/node/runtime/src/lib.rs                   |   4 +-
 frame/assets/Cargo.toml                       |   2 -
 frame/balances/Cargo.toml                     |   4 +-
 frame/balances/src/lib.rs                     |   4 +-
 frame/contracts/Cargo.toml                    |   2 +-
 frame/contracts/src/chain_extension.rs        |   4 +-
 frame/contracts/src/wasm/runtime.rs           |   4 +-
 frame/proxy/Cargo.toml                        |   4 +-
 frame/proxy/src/lib.rs                        |   4 +-
 frame/proxy/src/tests.rs                      |   5 +-
 frame/support/Cargo.toml                      |   4 +-
 .../procedural/src/storage/storage_struct.rs  |   8 +-
 frame/support/src/hash.rs                     |   3 +-
 frame/support/src/lib.rs                      |   8 +-
 .../support/src/storage/bounded_btree_map.rs  |   4 +-
 .../support/src/storage/bounded_btree_set.rs  |   4 +-
 frame/support/src/storage/bounded_vec.rs      |   4 +-
 frame/support/src/storage/types/double_map.rs |   4 +-
 frame/support/src/storage/types/key.rs        |   4 +-
 frame/support/src/storage/types/map.rs        |   4 +-
 frame/support/src/storage/types/nmap.rs       |   4 +-
 frame/support/src/storage/types/value.rs      |   4 +-
 frame/support/src/storage/weak_bounded_vec.rs |   4 +-
 frame/support/src/traits.rs                   |   3 -
 frame/support/src/traits/tokens/currency.rs   |   2 +-
 frame/support/test/tests/decl_storage.rs      |   2 +-
 frame/support/test/tests/pallet.rs            |   5 +-
 .../call_argument_invalid_bound_2.stderr      |   8 +-
 frame/system/src/lib.rs                       |   4 +-
 frame/timestamp/Cargo.toml                    |   2 +-
 max-encoded-len/Cargo.toml                    |  36 ----
 max-encoded-len/derive/Cargo.toml             |  25 ---
 max-encoded-len/derive/src/lib.rs             | 204 ------------------
 max-encoded-len/src/lib.rs                    | 161 --------------
 max-encoded-len/tests/max_encoded_len.rs      | 151 -------------
 max-encoded-len/tests/max_encoded_len_ui.rs   |  27 ---
 .../max_encoded_len_ui/list_list_item.rs      |  10 -
 .../max_encoded_len_ui/list_list_item.stderr  |  18 --
 .../max_encoded_len_ui/literal_list_item.rs   |  10 -
 .../literal_list_item.stderr                  |  18 --
 .../max_encoded_len_ui/name_value_attr.rs     |  10 -
 .../max_encoded_len_ui/name_value_attr.stderr |  18 --
 .../name_value_list_item.rs                   |  10 -
 .../name_value_list_item.stderr               |  18 --
 .../max_encoded_len_ui/no_path_list_items.rs  |  10 -
 .../no_path_list_items.stderr                 |  18 --
 .../tests/max_encoded_len_ui/not_encode.rs    |   6 -
 .../max_encoded_len_ui/not_encode.stderr      |  13 --
 .../tests/max_encoded_len_ui/not_mel.rs       |  14 --
 .../tests/max_encoded_len_ui/not_mel.stderr   |  21 --
 .../tests/max_encoded_len_ui/path_attr.rs     |  10 -
 .../tests/max_encoded_len_ui/path_attr.stderr |  18 --
 .../max_encoded_len_ui/two_path_list_items.rs |  10 -
 .../two_path_list_items.stderr                |  18 --
 .../tests/max_encoded_len_ui/union.rs         |  10 -
 .../tests/max_encoded_len_ui/union.stderr     |  11 -
 .../max_encoded_len_ui/unsupported_variant.rs |  12 --
 .../unsupported_variant.stderr                |  12 --
 primitives/application-crypto/Cargo.toml      |   2 -
 primitives/application-crypto/src/lib.rs      |   6 +-
 primitives/core/Cargo.toml                    |   4 +-
 primitives/core/src/crypto.rs                 |   3 +-
 primitives/core/src/ecdsa.rs                  |   4 +-
 primitives/core/src/ed25519.rs                |   4 +-
 primitives/core/src/sr25519.rs                |   4 +-
 primitives/runtime/Cargo.toml                 |   4 +-
 primitives/runtime/src/traits.rs              |   3 +-
 70 files changed, 72 insertions(+), 1037 deletions(-)
 delete mode 100644 max-encoded-len/Cargo.toml
 delete mode 100644 max-encoded-len/derive/Cargo.toml
 delete mode 100644 max-encoded-len/derive/src/lib.rs
 delete mode 100644 max-encoded-len/src/lib.rs
 delete mode 100644 max-encoded-len/tests/max_encoded_len.rs
 delete mode 100644 max-encoded-len/tests/max_encoded_len_ui.rs
 delete mode 100644 max-encoded-len/tests/max_encoded_len_ui/list_list_item.rs
 delete mode 100644 max-encoded-len/tests/max_encoded_len_ui/list_list_item.stderr
 delete mode 100644 max-encoded-len/tests/max_encoded_len_ui/literal_list_item.rs
 delete mode 100644 max-encoded-len/tests/max_encoded_len_ui/literal_list_item.stderr
 delete mode 100644 max-encoded-len/tests/max_encoded_len_ui/name_value_attr.rs
 delete mode 100644 max-encoded-len/tests/max_encoded_len_ui/name_value_attr.stderr
 delete mode 100644 max-encoded-len/tests/max_encoded_len_ui/name_value_list_item.rs
 delete mode 100644 max-encoded-len/tests/max_encoded_len_ui/name_value_list_item.stderr
 delete mode 100644 max-encoded-len/tests/max_encoded_len_ui/no_path_list_items.rs
 delete mode 100644 max-encoded-len/tests/max_encoded_len_ui/no_path_list_items.stderr
 delete mode 100644 max-encoded-len/tests/max_encoded_len_ui/not_encode.rs
 delete mode 100644 max-encoded-len/tests/max_encoded_len_ui/not_encode.stderr
 delete mode 100644 max-encoded-len/tests/max_encoded_len_ui/not_mel.rs
 delete mode 100644 max-encoded-len/tests/max_encoded_len_ui/not_mel.stderr
 delete mode 100644 max-encoded-len/tests/max_encoded_len_ui/path_attr.rs
 delete mode 100644 max-encoded-len/tests/max_encoded_len_ui/path_attr.stderr
 delete mode 100644 max-encoded-len/tests/max_encoded_len_ui/two_path_list_items.rs
 delete mode 100644 max-encoded-len/tests/max_encoded_len_ui/two_path_list_items.stderr
 delete mode 100644 max-encoded-len/tests/max_encoded_len_ui/union.rs
 delete mode 100644 max-encoded-len/tests/max_encoded_len_ui/union.stderr
 delete mode 100644 max-encoded-len/tests/max_encoded_len_ui/unsupported_variant.rs
 delete mode 100644 max-encoded-len/tests/max_encoded_len_ui/unsupported_variant.stderr

diff --git a/Cargo.lock b/Cargo.lock
index 5a98dc0ff96f..8ca21d1d9056 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1853,7 +1853,6 @@ dependencies = [
  "frame-system",
  "impl-trait-for-tuples",
  "log",
- "max-encoded-len",
  "once_cell",
  "parity-scale-codec",
  "parity-util-mem",
@@ -2712,9 +2711,9 @@ dependencies = [
 
 [[package]]
 name = "impl-codec"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df170efa359aebdd5cb7fe78edcc67107748e4737bdca8a8fb40d15ea7a877ed"
+checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -3766,29 +3765,6 @@ dependencies = [
  "rawpointer",
 ]
 
-[[package]]
-name = "max-encoded-len"
-version = "3.0.0"
-dependencies = [
- "frame-support",
- "impl-trait-for-tuples",
- "max-encoded-len-derive",
- "parity-scale-codec",
- "primitive-types",
- "rustversion",
- "trybuild",
-]
-
-[[package]]
-name = "max-encoded-len-derive"
-version = "3.0.0"
-dependencies = [
- "proc-macro-crate 1.0.0",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "maybe-uninit"
 version = "2.0.0"
@@ -4374,7 +4350,6 @@ dependencies = [
  "frame-try-runtime",
  "hex-literal",
  "log",
- "max-encoded-len",
  "node-primitives",
  "pallet-assets",
  "pallet-authority-discovery",
@@ -4726,7 +4701,6 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "max-encoded-len",
  "pallet-balances",
  "parity-scale-codec",
  "sp-core",
@@ -4837,7 +4811,6 @@ dependencies = [
  "frame-support",
  "frame-system",
  "log",
- "max-encoded-len",
  "pallet-transaction-payment",
  "parity-scale-codec",
  "sp-core",
@@ -5364,7 +5337,6 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "max-encoded-len",
  "pallet-balances",
  "pallet-utility",
  "parity-scale-codec",
@@ -5774,24 +5746,25 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0f518afaa5a47d0d6386229b0a6e01e86427291d643aa4cabb4992219f504f8"
+checksum = "8975095a2a03bbbdc70a74ab11a4f76a6d0b84680d87c68d722531b0ac28e8a9"
 dependencies = [
  "arrayvec 0.7.0",
  "bitvec",
  "byte-slice-cast",
+ "impl-trait-for-tuples",
  "parity-scale-codec-derive",
  "serde",
 ]
 
 [[package]]
 name = "parity-scale-codec-derive"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f44c5f94427bd0b5076e8f7e15ca3f60a4d8ac0077e4793884e6fdfd8915344e"
+checksum = "40dbbfef7f0a1143c5b06e0d76a6278e25dac0bc1af4be51a0fbb73f07e7ad09"
 dependencies = [
- "proc-macro-crate 0.1.5",
+ "proc-macro-crate 1.0.0",
  "proc-macro2",
  "quote",
  "syn",
@@ -8739,7 +8712,6 @@ dependencies = [
 name = "sp-application-crypto"
 version = "3.0.0"
 dependencies = [
- "max-encoded-len",
  "parity-scale-codec",
  "serde",
  "sp-core",
@@ -8951,7 +8923,6 @@ dependencies = [
  "lazy_static",
  "libsecp256k1",
  "log",
- "max-encoded-len",
  "merlin",
  "num-traits",
  "parity-scale-codec",
@@ -9178,7 +9149,6 @@ dependencies = [
  "hash256-std-hasher",
  "impl-trait-for-tuples",
  "log",
- "max-encoded-len",
  "parity-scale-codec",
  "parity-util-mem",
  "paste 1.0.4",
diff --git a/Cargo.toml b/Cargo.toml
index d73bf1b52de9..599130c52ae3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -204,9 +204,6 @@ members = [
 	"utils/frame/rpc/system",
 	"utils/prometheus",
 	"utils/wasm-builder",
-	# temp deps
-	"max-encoded-len",
-	"max-encoded-len/derive",
 ]
 
 # The list of dependencies below (which can be both direct and indirect dependencies) are crates
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index 9b182c408579..c84c6a07b639 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 
 # third-party dependencies
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
 static_assertions = "1.1.0"
 hex-literal = { version = "0.3.1", optional = true }
 log = { version = "0.4.14", default-features = false }
@@ -90,8 +90,6 @@ pallet-transaction-storage = { version = "3.0.0", default-features = false, path
 pallet-uniques = { version = "3.0.0", default-features = false, path = "../../../frame/uniques" }
 pallet-vesting = { version = "3.0.0", default-features = false, path = "../../../frame/vesting" }
 
-max-encoded-len = { version = "3.0.0", default-features = false, path = "../../../max-encoded-len", features = [ "derive" ] }
-
 [build-dependencies]
 substrate-wasm-builder = { version = "4.0.0", path = "../../../utils/wasm-builder" }
 
@@ -166,7 +164,6 @@ std = [
 	"log/std",
 	"frame-try-runtime/std",
 	"sp-npos-elections/std",
-	"max-encoded-len/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 109a492e2c71..8291e4b6448c 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -33,7 +33,7 @@ use frame_support::{
 	},
 	traits::{
 		Currency, Imbalance, KeyOwnerProofSystem, OnUnbalanced, LockIdentifier,
-		U128CurrencyToVote, MaxEncodedLen,
+		U128CurrencyToVote,
 	},
 };
 use frame_system::{
@@ -41,7 +41,7 @@ use frame_system::{
 	limits::{BlockWeights, BlockLength}
 };
 use frame_support::{traits::InstanceFilter, PalletId};
-use codec::{Encode, Decode};
+use codec::{Encode, Decode, MaxEncodedLen};
 use sp_core::{
 	crypto::KeyTypeId,
 	u32_trait::{_1, _2, _3, _4, _5},
diff --git a/frame/assets/Cargo.toml b/frame/assets/Cargo.toml
index 7afd08d8c11f..7137cf1d789a 100644
--- a/frame/assets/Cargo.toml
+++ b/frame/assets/Cargo.toml
@@ -22,7 +22,6 @@ frame-support = { version = "3.0.0", default-features = false, path = "../suppor
 # `system` module provides us with all sorts of useful stuff and macros depend on it being around.
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
-max-encoded-len = { version = "3.0.0", default-features = false, path = "../../max-encoded-len", features = [ "derive" ] }
 
 [dev-dependencies]
 sp-core = { version = "3.0.0", path = "../../primitives/core" }
@@ -39,7 +38,6 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 	"frame-benchmarking/std",
-	"max-encoded-len/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
diff --git a/frame/balances/Cargo.toml b/frame/balances/Cargo.toml
index c4ab509aa0d4..724fadf48c52 100644
--- a/frame/balances/Cargo.toml
+++ b/frame/balances/Cargo.toml
@@ -13,14 +13,13 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
 frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 log = { version = "0.4.14", default-features = false }
-max-encoded-len = { version = "3.0.0", default-features = false, path = "../../max-encoded-len", features = [ "derive" ] }
 
 [dev-dependencies]
 sp-io = { version = "3.0.0", path = "../../primitives/io" }
@@ -37,7 +36,6 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 	"log/std",
-	"max-encoded-len/std",
 ]
 runtime-benchmarks = ["frame-benchmarking"]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index 5dccd7da267f..27b015bc1cce 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -158,11 +158,11 @@ pub mod weights;
 
 use sp_std::prelude::*;
 use sp_std::{cmp, result, mem, fmt::Debug, ops::BitOr};
-use codec::{Codec, Encode, Decode};
+use codec::{Codec, Encode, Decode, MaxEncodedLen};
 use frame_support::{
 	ensure, WeakBoundedVec,
 	traits::{
-		Currency, OnUnbalanced, TryDrop, StoredMap, MaxEncodedLen,
+		Currency, OnUnbalanced, TryDrop, StoredMap,
 		WithdrawReasons, LockIdentifier, LockableCurrency, ExistenceRequirement,
 		Imbalance, SignedImbalance, ReservableCurrency, Get, ExistenceRequirement::{AllowDeath, KeepAlive},
 		NamedReservableCurrency,
diff --git a/frame/contracts/Cargo.toml b/frame/contracts/Cargo.toml
index 9d344fb6866d..e9f7236629ab 100644
--- a/frame/contracts/Cargo.toml
+++ b/frame/contracts/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 bitflags = "1.0"
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
 log = { version = "0.4", default-features = false }
 pwasm-utils = { version = "0.18", default-features = false }
 serde = { version = "1", optional = true, features = ["derive"] }
diff --git a/frame/contracts/src/chain_extension.rs b/frame/contracts/src/chain_extension.rs
index 01c362f613a5..e72ab8cf056b 100644
--- a/frame/contracts/src/chain_extension.rs
+++ b/frame/contracts/src/chain_extension.rs
@@ -58,8 +58,8 @@ use crate::{
 	Error,
 	wasm::{Runtime, RuntimeCosts},
 };
-use codec::Decode;
-use frame_support::{weights::Weight, traits::MaxEncodedLen};
+use codec::{Decode, MaxEncodedLen};
+use frame_support::weights::Weight;
 use sp_runtime::DispatchError;
 use sp_std::{
 	marker::PhantomData,
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index 28987bba9d70..8956e3a2b445 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -26,9 +26,9 @@ use crate::{
 };
 use bitflags::bitflags;
 use pwasm_utils::parity_wasm::elements::ValueType;
-use frame_support::{dispatch::DispatchError, ensure, weights::Weight, traits::MaxEncodedLen};
+use frame_support::{dispatch::DispatchError, ensure, weights::Weight};
 use sp_std::prelude::*;
-use codec::{Decode, DecodeAll, Encode};
+use codec::{Decode, DecodeAll, Encode, MaxEncodedLen};
 use sp_core::{Bytes, crypto::UncheckedFrom};
 use sp_io::hashing::{
 	keccak_256,
diff --git a/frame/proxy/Cargo.toml b/frame/proxy/Cargo.toml
index deec8aab7268..821d26556c4e 100644
--- a/frame/proxy/Cargo.toml
+++ b/frame/proxy/Cargo.toml
@@ -13,14 +13,13 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["max-encoded-len"] }
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
 sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
 sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-max-encoded-len = { version = "3.0.0", default-features = false, path = "../../max-encoded-len", features = [ "derive" ] }
 
 frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
 
@@ -38,7 +37,6 @@ std = [
 	"frame-system/std",
 	"sp-std/std",
 	"sp-io/std",
-	"max-encoded-len/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
diff --git a/frame/proxy/src/lib.rs b/frame/proxy/src/lib.rs
index bc892b65b377..d4f430a7e8b0 100644
--- a/frame/proxy/src/lib.rs
+++ b/frame/proxy/src/lib.rs
@@ -34,7 +34,7 @@ mod benchmarking;
 pub mod weights;
 
 use sp_std::{prelude::*, convert::TryInto};
-use codec::{Encode, Decode};
+use codec::{Encode, Decode, MaxEncodedLen};
 use sp_io::hashing::blake2_256;
 use sp_runtime::{
 	DispatchResult,
@@ -45,7 +45,7 @@ use frame_support::{
 		dispatch::{DispatchResultWithPostInfo, PostDispatchInfo},
 		traits::{
 			Get, ReservableCurrency, Currency, InstanceFilter, OriginTrait,
-			IsType, IsSubType, MaxEncodedLen,
+			IsType, IsSubType,
 		},
 		weights::GetDispatchInfo,
 };
diff --git a/frame/proxy/src/tests.rs b/frame/proxy/src/tests.rs
index a2cb00d0ccc3..4383fbea0071 100644
--- a/frame/proxy/src/tests.rs
+++ b/frame/proxy/src/tests.rs
@@ -102,10 +102,7 @@ parameter_types! {
 	pub const AnnouncementDepositBase: u64 = 1;
 	pub const AnnouncementDepositFactor: u64 = 1;
 }
-#[derive(
-	Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, RuntimeDebug,
-	max_encoded_len::MaxEncodedLen,
-)]
+#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, RuntimeDebug, MaxEncodedLen)]
 pub enum ProxyType {
 	Any,
 	JustTransfer,
diff --git a/frame/support/Cargo.toml b/frame/support/Cargo.toml
index 80b3d7f0c4ec..d87f1b1ef307 100644
--- a/frame/support/Cargo.toml
+++ b/frame/support/Cargo.toml
@@ -14,9 +14,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-codec = { package = "parity-scale-codec", version = "2.1.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
 frame-metadata = { version = "13.0.0", default-features = false, path = "../metadata" }
-max-encoded-len = { version = "3.0.0", default-features = false, path = "../../max-encoded-len", features = [ "derive" ] }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
@@ -56,7 +55,6 @@ std = [
 	"sp-state-machine",
 	"frame-support-procedural/std",
 	"log/std",
-	"max-encoded-len/std",
 ]
 runtime-benchmarks = []
 try-runtime = []
diff --git a/frame/support/procedural/src/storage/storage_struct.rs b/frame/support/procedural/src/storage/storage_struct.rs
index a713f5dff003..c990bad85e21 100644
--- a/frame/support/procedural/src/storage/storage_struct.rs
+++ b/frame/support/procedural/src/storage/storage_struct.rs
@@ -267,7 +267,7 @@ pub fn decl_and_impl(def: &DeclStorageDefExt) -> TokenStream {
 								use #scrate::sp_runtime::SaturatedConversion;
 
 								let max_size = <
-									#value_type as #scrate::traits::MaxEncodedLen
+									#value_type as #scrate::codec::MaxEncodedLen
 								>::max_encoded_len()
 									.saturated_into();
 
@@ -301,7 +301,7 @@ pub fn decl_and_impl(def: &DeclStorageDefExt) -> TokenStream {
 								>::Hasher::max_len::<#key>();
 
 								let max_size = <
-									#value_type as #scrate::traits::MaxEncodedLen
+									#value_type as #scrate::codec::MaxEncodedLen
 								>::max_encoded_len()
 									.saturating_add(key_max_size)
 									.saturated_into();
@@ -342,7 +342,7 @@ pub fn decl_and_impl(def: &DeclStorageDefExt) -> TokenStream {
 								>::Hasher2::max_len::<#key2>();
 
 								let max_size = <
-									#value_type as #scrate::traits::MaxEncodedLen
+									#value_type as #scrate::codec::MaxEncodedLen
 								>::max_encoded_len()
 									.saturating_add(key1_max_size)
 									.saturating_add(key2_max_size)
@@ -378,7 +378,7 @@ pub fn decl_and_impl(def: &DeclStorageDefExt) -> TokenStream {
 								>::key_max_encoded_len();
 
 								let max_size = <
-									#value_type as #scrate::traits::MaxEncodedLen
+									#value_type as #scrate::codec::MaxEncodedLen
 								>::max_encoded_len()
 									.saturating_add(key_max_size)
 									.saturated_into();
diff --git a/frame/support/src/hash.rs b/frame/support/src/hash.rs
index 5c4bfb34f5f9..1425760051d2 100644
--- a/frame/support/src/hash.rs
+++ b/frame/support/src/hash.rs
@@ -17,10 +17,9 @@
 
 //! Hash utilities.
 
-use codec::Codec;
+use codec::{Codec, MaxEncodedLen};
 use sp_std::prelude::Vec;
 use sp_io::hashing::{blake2_128, blake2_256, twox_64, twox_128, twox_256};
-use crate::traits::MaxEncodedLen;
 
 // This trait must be kept coherent with frame-support-procedural HasherKind usage
 pub trait Hashable: Sized {
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 466f92dc2d1b..b1296a2bd01d 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -1274,7 +1274,7 @@ pub mod pallet_prelude {
 		RuntimeDebug, storage,
 		traits::{
 			Get, Hooks, IsType, GetPalletVersion, EnsureOrigin, PalletInfoAccess, StorageInfoTrait,
-			ConstU32, GetDefault, MaxEncodedLen,
+			ConstU32, GetDefault,
 		},
 		dispatch::{DispatchResultWithPostInfo, Parameter, DispatchError, DispatchResult},
 		weights::{DispatchClass, Pays, Weight},
@@ -1284,7 +1284,7 @@ pub mod pallet_prelude {
 		},
 		storage::bounded_vec::BoundedVec,
 	};
-	pub use codec::{Encode, Decode};
+	pub use codec::{Encode, Decode, MaxEncodedLen};
 	pub use crate::inherent::{InherentData, InherentIdentifier, ProvideInherent};
 	pub use sp_runtime::{
 		traits::{MaybeSerializeDeserialize, Member, ValidateUnsigned},
@@ -2376,7 +2376,3 @@ pub mod pallet_prelude {
 /// * use the newest nightly possible.
 ///
 pub use frame_support_procedural::pallet;
-
-/// The `max_encoded_len` module contains the `MaxEncodedLen` trait and derive macro, which is
-/// useful for computing upper bounds on storage size.
-pub use max_encoded_len;
diff --git a/frame/support/src/storage/bounded_btree_map.rs b/frame/support/src/storage/bounded_btree_map.rs
index 0c1994d63a35..7b3efbfbeee5 100644
--- a/frame/support/src/storage/bounded_btree_map.rs
+++ b/frame/support/src/storage/bounded_btree_map.rs
@@ -23,9 +23,9 @@ use sp_std::{
 };
 use crate::{
 	storage::StorageDecodeLength,
-	traits::{Get, MaxEncodedLen},
+	traits::Get,
 };
-use codec::{Encode, Decode};
+use codec::{Encode, Decode, MaxEncodedLen};
 
 /// A bounded map based on a B-Tree.
 ///
diff --git a/frame/support/src/storage/bounded_btree_set.rs b/frame/support/src/storage/bounded_btree_set.rs
index 10c2300a08a0..461b1de58ec8 100644
--- a/frame/support/src/storage/bounded_btree_set.rs
+++ b/frame/support/src/storage/bounded_btree_set.rs
@@ -23,9 +23,9 @@ use sp_std::{
 };
 use crate::{
 	storage::StorageDecodeLength,
-	traits::{Get, MaxEncodedLen},
+	traits::Get,
 };
-use codec::{Encode, Decode};
+use codec::{Encode, Decode, MaxEncodedLen};
 
 /// A bounded set based on a B-Tree.
 ///
diff --git a/frame/support/src/storage/bounded_vec.rs b/frame/support/src/storage/bounded_vec.rs
index d1c042b5db17..589fe0920744 100644
--- a/frame/support/src/storage/bounded_vec.rs
+++ b/frame/support/src/storage/bounded_vec.rs
@@ -20,13 +20,13 @@
 
 use sp_std::prelude::*;
 use sp_std::{convert::TryFrom, fmt, marker::PhantomData};
-use codec::{Encode, Decode, EncodeLike};
+use codec::{Encode, Decode, EncodeLike, MaxEncodedLen};
 use core::{
 	ops::{Deref, Index, IndexMut},
 	slice::SliceIndex,
 };
 use crate::{
-	traits::{Get, MaxEncodedLen},
+	traits::Get,
 	storage::{StorageDecodeLength, StorageTryAppend},
 };
 
diff --git a/frame/support/src/storage/types/double_map.rs b/frame/support/src/storage/types/double_map.rs
index e92953b2ec3e..a8ab4329ceb3 100644
--- a/frame/support/src/storage/types/double_map.rs
+++ b/frame/support/src/storage/types/double_map.rs
@@ -18,13 +18,13 @@
 //! Storage map type. Implements StorageDoubleMap, StorageIterableDoubleMap,
 //! StoragePrefixedDoubleMap traits and their methods directly.
 
-use codec::{Decode, Encode, EncodeLike, FullCodec};
+use codec::{Decode, Encode, EncodeLike, FullCodec, MaxEncodedLen};
 use crate::{
 	storage::{
 		StorageAppend, StorageTryAppend, StorageDecodeLength, StoragePrefixedMap,
 		types::{OptionQuery, QueryKindTrait, OnEmptyGetter},
 	},
-	traits::{GetDefault, StorageInstance, Get, MaxEncodedLen, StorageInfo},
+	traits::{GetDefault, StorageInstance, Get, StorageInfo},
 };
 use frame_metadata::{DefaultByteGetter, StorageEntryModifier};
 use sp_arithmetic::traits::SaturatedConversion;
diff --git a/frame/support/src/storage/types/key.rs b/frame/support/src/storage/types/key.rs
index def800f62c50..cafb501f9e41 100755
--- a/frame/support/src/storage/types/key.rs
+++ b/frame/support/src/storage/types/key.rs
@@ -17,8 +17,8 @@
 
 //! Storage key type.
 
-use crate::{hash::{ReversibleStorageHasher, StorageHasher}, traits::MaxEncodedLen};
-use codec::{Encode, EncodeLike, FullCodec};
+use crate::hash::{ReversibleStorageHasher, StorageHasher};
+use codec::{Encode, EncodeLike, FullCodec, MaxEncodedLen};
 use paste::paste;
 use sp_std::prelude::*;
 
diff --git a/frame/support/src/storage/types/map.rs b/frame/support/src/storage/types/map.rs
index 4a5a86d8250b..800cd1153a72 100644
--- a/frame/support/src/storage/types/map.rs
+++ b/frame/support/src/storage/types/map.rs
@@ -18,13 +18,13 @@
 //! Storage map type. Implements StorageMap, StorageIterableMap, StoragePrefixedMap traits and their
 //! methods directly.
 
-use codec::{FullCodec, Decode, EncodeLike, Encode};
+use codec::{FullCodec, Decode, EncodeLike, Encode, MaxEncodedLen};
 use crate::{
 	storage::{
 		StorageAppend, StorageTryAppend, StorageDecodeLength, StoragePrefixedMap,
 		types::{OptionQuery, QueryKindTrait, OnEmptyGetter},
 	},
-	traits::{GetDefault, StorageInstance, Get, MaxEncodedLen, StorageInfo},
+	traits::{GetDefault, StorageInstance, Get, StorageInfo},
 };
 use frame_metadata::{DefaultByteGetter, StorageEntryModifier};
 use sp_arithmetic::traits::SaturatedConversion;
diff --git a/frame/support/src/storage/types/nmap.rs b/frame/support/src/storage/types/nmap.rs
index d6e043020a12..b75542cbf9a2 100755
--- a/frame/support/src/storage/types/nmap.rs
+++ b/frame/support/src/storage/types/nmap.rs
@@ -26,9 +26,9 @@ use crate::{
 		},
 		KeyGenerator, PrefixIterator, StorageAppend, StorageDecodeLength, StoragePrefixedMap,
 	},
-	traits::{Get, GetDefault, StorageInstance, StorageInfo, MaxEncodedLen},
+	traits::{Get, GetDefault, StorageInstance, StorageInfo},
 };
-use codec::{Decode, Encode, EncodeLike, FullCodec};
+use codec::{Decode, Encode, EncodeLike, FullCodec, MaxEncodedLen};
 use frame_metadata::{DefaultByteGetter, StorageEntryModifier};
 use sp_runtime::SaturatedConversion;
 use sp_std::prelude::*;
diff --git a/frame/support/src/storage/types/value.rs b/frame/support/src/storage/types/value.rs
index 44a0fd8dc742..0bd171f10e68 100644
--- a/frame/support/src/storage/types/value.rs
+++ b/frame/support/src/storage/types/value.rs
@@ -17,13 +17,13 @@
 
 //! Storage value type. Implements StorageValue trait and its method directly.
 
-use codec::{FullCodec, Decode, EncodeLike, Encode};
+use codec::{FullCodec, Decode, EncodeLike, Encode, MaxEncodedLen};
 use crate::{
 	storage::{
 		StorageAppend, StorageTryAppend, StorageDecodeLength,
 		types::{OptionQuery, QueryKindTrait, OnEmptyGetter},
 	},
-	traits::{GetDefault, StorageInstance, MaxEncodedLen, StorageInfo},
+	traits::{GetDefault, StorageInstance, StorageInfo},
 };
 use frame_metadata::{DefaultByteGetter, StorageEntryModifier};
 use sp_arithmetic::traits::SaturatedConversion;
diff --git a/frame/support/src/storage/weak_bounded_vec.rs b/frame/support/src/storage/weak_bounded_vec.rs
index ca2271df4341..e5a4843000bb 100644
--- a/frame/support/src/storage/weak_bounded_vec.rs
+++ b/frame/support/src/storage/weak_bounded_vec.rs
@@ -20,13 +20,13 @@
 
 use sp_std::prelude::*;
 use sp_std::{convert::TryFrom, fmt, marker::PhantomData};
-use codec::{Encode, Decode};
+use codec::{Encode, Decode, MaxEncodedLen};
 use core::{
 	ops::{Deref, Index, IndexMut},
 	slice::SliceIndex,
 };
 use crate::{
-	traits::{Get, MaxEncodedLen},
+	traits::Get,
 	storage::{StorageDecodeLength, StorageTryAppend},
 };
 
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index 4eb630c6d9d7..e8ce07528c8a 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -81,6 +81,3 @@ pub use dispatch::{EnsureOrigin, OriginTrait, UnfilteredDispatchable};
 
 mod voting;
 pub use voting::{CurrencyToVote, SaturatingCurrencyToVote, U128CurrencyToVote};
-
-// for backwards-compatibility with existing imports
-pub use max_encoded_len::MaxEncodedLen;
diff --git a/frame/support/src/traits/tokens/currency.rs b/frame/support/src/traits/tokens/currency.rs
index a00e99b0c4ac..7882d04c035b 100644
--- a/frame/support/src/traits/tokens/currency.rs
+++ b/frame/support/src/traits/tokens/currency.rs
@@ -22,7 +22,7 @@ use sp_runtime::traits::MaybeSerializeDeserialize;
 use crate::dispatch::{DispatchResult, DispatchError};
 use super::misc::{Balance, WithdrawReasons, ExistenceRequirement};
 use super::imbalance::{Imbalance, SignedImbalance};
-use frame_support::traits::MaxEncodedLen;
+use codec::MaxEncodedLen;
 
 mod reservable;
 pub use reservable::{ReservableCurrency, NamedReservableCurrency};
diff --git a/frame/support/test/tests/decl_storage.rs b/frame/support/test/tests/decl_storage.rs
index ef7b577ab6b8..2bb408748590 100644
--- a/frame/support/test/tests/decl_storage.rs
+++ b/frame/support/test/tests/decl_storage.rs
@@ -29,7 +29,7 @@ mod tests {
 
 	pub trait Config: frame_support_test::Config {
 		type Origin2: codec::Codec + codec::EncodeLike + Default
-			+ frame_support::traits::MaxEncodedLen;
+			+ codec::MaxEncodedLen;
 	}
 
 	frame_support::decl_storage! {
diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index 589fca0dcd75..f204de69b84b 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -19,7 +19,6 @@ use frame_support::{
 	weights::{DispatchInfo, DispatchClass, Pays, GetDispatchInfo},
 	traits::{
 		GetCallName, OnInitialize, OnFinalize, OnRuntimeUpgrade, GetPalletVersion, OnGenesis,
-		MaxEncodedLen,
 	},
 	dispatch::{UnfilteredDispatchable, Parameter},
 	storage::unhashed,
@@ -48,10 +47,10 @@ impl From<SomeType6> for u64 { fn from(_t: SomeType6) -> Self { 0u64 } }
 pub struct SomeType7;
 impl From<SomeType7> for u64 { fn from(_t: SomeType7) -> Self { 0u64 } }
 
-pub trait SomeAssociation1 { type _1: Parameter + MaxEncodedLen; }
+pub trait SomeAssociation1 { type _1: Parameter + codec::MaxEncodedLen; }
 impl SomeAssociation1 for u64 { type _1 = u64; }
 
-pub trait SomeAssociation2 { type _2: Parameter + MaxEncodedLen; }
+pub trait SomeAssociation2 { type _2: Parameter + codec::MaxEncodedLen; }
 impl SomeAssociation2 for u64 { type _2 = u64; }
 
 #[frame_support::pallet]
diff --git a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr
index bad37153de7c..1ba613c66d49 100644
--- a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr
+++ b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr
@@ -33,9 +33,9 @@ error[E0277]: the trait bound `<T as pallet::Config>::Bar: WrapperTypeEncode` is
 20  |         pub fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
     |                                               ^ the trait `WrapperTypeEncode` is not implemented for `<T as pallet::Config>::Bar`
     |
-   ::: /usr/local/cargo/registry/src/github.com-1ecc6299db9ec823/parity-scale-codec-2.1.1/src/codec.rs:216:21
+   ::: /usr/local/cargo/registry/src/github.com-1ecc6299db9ec823/parity-scale-codec-2.2.0/src/codec.rs:223:21
     |
-216 |     fn encode_to<T: Output + ?Sized>(&self, dest: &mut T) {
+223 |     fn encode_to<T: Output + ?Sized>(&self, dest: &mut T) {
     |                     ------ required by this bound in `encode_to`
     |
     = note: required because of the requirements on the impl of `pallet::_::_parity_scale_codec::Encode` for `<T as pallet::Config>::Bar`
@@ -46,9 +46,9 @@ error[E0277]: the trait bound `<T as pallet::Config>::Bar: WrapperTypeDecode` is
 20  |         pub fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
     |                                               ^ the trait `WrapperTypeDecode` is not implemented for `<T as pallet::Config>::Bar`
     |
-   ::: /usr/local/cargo/registry/src/github.com-1ecc6299db9ec823/parity-scale-codec-2.1.1/src/codec.rs:277:18
+   ::: /usr/local/cargo/registry/src/github.com-1ecc6299db9ec823/parity-scale-codec-2.2.0/src/codec.rs:284:18
     |
-277 |     fn decode<I: Input>(input: &mut I) -> Result<Self, Error>;
+284 |     fn decode<I: Input>(input: &mut I) -> Result<Self, Error>;
     |                  ----- required by this bound in `pallet::_::_parity_scale_codec::Decode::decode`
     |
     = note: required because of the requirements on the impl of `Decode` for `<T as pallet::Config>::Bar`
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index ad57bf6a8799..da9e5fabd3a4 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -88,7 +88,7 @@ use frame_support::{
 	Parameter, storage,
 	traits::{
 		SortedMembers, Get, PalletInfo, OnNewAccount, OnKilledAccount, HandleLifetime,
-		StoredMap, EnsureOrigin, OriginTrait, Filter, MaxEncodedLen,
+		StoredMap, EnsureOrigin, OriginTrait, Filter,
 	},
 	weights::{
 		Weight, RuntimeDbWeight, DispatchInfo, DispatchClass,
@@ -96,7 +96,7 @@ use frame_support::{
 	},
 	dispatch::{DispatchResultWithPostInfo, DispatchResult},
 };
-use codec::{Encode, Decode, FullCodec, EncodeLike};
+use codec::{Encode, Decode, FullCodec, EncodeLike, MaxEncodedLen};
 
 #[cfg(feature = "std")]
 use frame_support::traits::GenesisBuild;
diff --git a/frame/timestamp/Cargo.toml b/frame/timestamp/Cargo.toml
index 05ea8e40c662..7a57c5e88a6f 100644
--- a/frame/timestamp/Cargo.toml
+++ b/frame/timestamp/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io", optional = true }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
diff --git a/max-encoded-len/Cargo.toml b/max-encoded-len/Cargo.toml
deleted file mode 100644
index 9c0f55922481..000000000000
--- a/max-encoded-len/Cargo.toml
+++ /dev/null
@@ -1,36 +0,0 @@
-[package]
-name = "max-encoded-len"
-version = "3.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-license = "Apache-2.0"
-homepage = "https://substrate.dev"
-repository = "https://github.com/paritytech/substrate/"
-description = "Trait MaxEncodedLen bounds the max encoded length of an item."
-
-
-[dependencies]
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-impl-trait-for-tuples = "0.2.1"
-max-encoded-len-derive = { package = "max-encoded-len-derive", version = "3.0.0", path = "derive", default-features = false, optional = true }
-primitive-types = { version = "0.10.0", default-features = false, features = ["codec"] }
-
-[dev-dependencies]
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [ "derive" ] }
-frame-support = { path = "../frame/support" }
-rustversion = "1.0.4"
-trybuild = "1.0.42"
-
-[features]
-default = [
-	"derive",
-	"std",
-]
-derive = [
-	"max-encoded-len-derive",
-]
-std = [
-	"codec/std",
-	"max-encoded-len-derive/std",
-	"primitive-types/std",
-]
diff --git a/max-encoded-len/derive/Cargo.toml b/max-encoded-len/derive/Cargo.toml
deleted file mode 100644
index 42c13dc50edd..000000000000
--- a/max-encoded-len/derive/Cargo.toml
+++ /dev/null
@@ -1,25 +0,0 @@
-[package]
-name = "max-encoded-len-derive"
-version = "3.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-license = "Apache-2.0"
-homepage = "https://substrate.dev"
-repository = "https://github.com/paritytech/substrate/"
-description = "Derive support for MaxEncodedLen"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[lib]
-proc-macro = true
-
-[dependencies]
-proc-macro2 = "1.0.6"
-proc-macro-crate = "1.0.0"
-quote = "1.0.3"
-syn = { version = "1.0.58", features = ["full"] }
-
-[features]
-default = ["std"]
-std = []
diff --git a/max-encoded-len/derive/src/lib.rs b/max-encoded-len/derive/src/lib.rs
deleted file mode 100644
index 34bf42f30cb3..000000000000
--- a/max-encoded-len/derive/src/lib.rs
+++ /dev/null
@@ -1,204 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use quote::{quote, quote_spanned};
-use syn::{
-	Data, DeriveInput, Error, Fields, GenericParam, Generics, Meta, TraitBound, Type,
-	TypeParamBound, parse_quote, spanned::Spanned,
-};
-use proc_macro_crate::{crate_name, FoundCrate};
-use proc_macro2::{Ident, Span};
-
-/// Generate the crate access for the crate using 2018 syntax.
-fn generate_crate_access_2018(def_crate: &str) -> Result<syn::Ident, Error> {
-	match crate_name(def_crate) {
-		Ok(FoundCrate::Itself) => {
-			let name = def_crate.to_string().replace("-", "_");
-			Ok(syn::Ident::new(&name, Span::call_site()))
-		},
-		Ok(FoundCrate::Name(name)) => {
-			Ok(Ident::new(&name, Span::call_site()))
-		},
-		Err(e) => {
-			Err(Error::new(Span::call_site(), e))
-		}
-	}
-}
-
-/// Derive `MaxEncodedLen`.
-#[proc_macro_derive(MaxEncodedLen, attributes(max_encoded_len_crate))]
-pub fn derive_max_encoded_len(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
-	let input: DeriveInput = match syn::parse(input) {
-		Ok(input) => input,
-		Err(e) => return e.to_compile_error().into(),
-	};
-
-	let mel_trait = match max_encoded_len_trait(&input) {
-		Ok(mel_trait) => mel_trait,
-		Err(e) => return e.to_compile_error().into(),
-	};
-
-	let name = &input.ident;
-	let generics = add_trait_bounds(input.generics, mel_trait.clone());
-	let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
-
-	let data_expr = data_length_expr(&input.data);
-
-	quote::quote!(
-		const _: () = {
-			impl #impl_generics #mel_trait for #name #ty_generics #where_clause {
-				fn max_encoded_len() -> usize {
-					#data_expr
-				}
-			}
-		};
-	)
-	.into()
-}
-
-fn max_encoded_len_trait(input: &DeriveInput) -> syn::Result<TraitBound> {
-	let mel = {
-		const EXPECT_LIST: &str = "expect: #[max_encoded_len_crate(path::to::crate)]";
-		const EXPECT_PATH: &str = "expect: path::to::crate";
-
-		macro_rules! return_err {
-			($wrong_style:expr, $err:expr) => {
-				return Err(Error::new($wrong_style.span(), $err))
-			};
-		}
-
-		let mut mel_crates = Vec::with_capacity(2);
-		mel_crates.extend(input
-			.attrs
-			.iter()
-			.filter(|attr| attr.path == parse_quote!(max_encoded_len_crate))
-			.take(2)
-			.map(|attr| {
-				let meta_list = match attr.parse_meta()? {
-					Meta::List(meta_list) => meta_list,
-					Meta::Path(wrong_style) => return_err!(wrong_style, EXPECT_LIST),
-					Meta::NameValue(wrong_style) => return_err!(wrong_style, EXPECT_LIST),
-				};
-				if meta_list.nested.len() != 1 {
-					return_err!(meta_list, "expected exactly 1 item");
-				}
-				let first_nested =
-					meta_list.nested.into_iter().next().expect("length checked above");
-				let meta = match first_nested {
-					syn::NestedMeta::Lit(l) => {
-						return_err!(l, "expected a path item, not a literal")
-					}
-					syn::NestedMeta::Meta(meta) => meta,
-				};
-				let path = match meta {
-					Meta::Path(path) => path,
-					Meta::List(ref wrong_style) => return_err!(wrong_style, EXPECT_PATH),
-					Meta::NameValue(ref wrong_style) => return_err!(wrong_style, EXPECT_PATH),
-				};
-				Ok(path)
-			})
-			.collect::<Result<Vec<_>, _>>()?);
-
-		// we have to return `Result<Ident, Error>` here in order to satisfy the trait
-		// bounds for `.or_else` for `generate_crate_access_2018`, even though `Option<Ident>`
-		// would be more natural in this circumstance.
-		match mel_crates.len() {
-			0 => Err(Error::new(
-				input.span(),
-				"this error is spurious and swallowed by the or_else below",
-			)),
-			1 => Ok(mel_crates.into_iter().next().expect("length is checked")),
-			_ => return_err!(mel_crates[1], "duplicate max_encoded_len_crate definition"),
-		}
-	}
-	.or_else(|_| generate_crate_access_2018("max-encoded-len").map(|ident| ident.into()))?;
-	Ok(parse_quote!(#mel::MaxEncodedLen))
-}
-
-// Add a bound `T: MaxEncodedLen` to every type parameter T.
-fn add_trait_bounds(mut generics: Generics, mel_trait: TraitBound) -> Generics {
-	for param in &mut generics.params {
-		if let GenericParam::Type(ref mut type_param) = *param {
-			type_param.bounds.push(TypeParamBound::Trait(mel_trait.clone()));
-		}
-	}
-	generics
-}
-
-/// generate an expression to sum up the max encoded length from several fields
-fn fields_length_expr(fields: &Fields) -> proc_macro2::TokenStream {
-	let type_iter: Box<dyn Iterator<Item = &Type>> = match fields {
-		Fields::Named(ref fields) => Box::new(fields.named.iter().map(|field| &field.ty)),
-		Fields::Unnamed(ref fields) => Box::new(fields.unnamed.iter().map(|field| &field.ty)),
-		Fields::Unit => Box::new(std::iter::empty()),
-	};
-	// expands to an expression like
-	//
-	//   0
-	//     .saturating_add(<type of first field>::max_encoded_len())
-	//     .saturating_add(<type of second field>::max_encoded_len())
-	//
-	// We match the span of each field to the span of the corresponding
-	// `max_encoded_len` call. This way, if one field's type doesn't implement
-	// `MaxEncodedLen`, the compiler's error message will underline which field
-	// caused the issue.
-	let expansion = type_iter.map(|ty| {
-		quote_spanned! {
-			ty.span() => .saturating_add(<#ty>::max_encoded_len())
-		}
-	});
-	quote! {
-		0_usize #( #expansion )*
-	}
-}
-
-// generate an expression to sum up the max encoded length of each field
-fn data_length_expr(data: &Data) -> proc_macro2::TokenStream {
-	match *data {
-		Data::Struct(ref data) => fields_length_expr(&data.fields),
-		Data::Enum(ref data) => {
-			// We need an expression expanded for each variant like
-			//
-			//   0
-			//     .max(<variant expression>)
-			//     .max(<variant expression>)
-			//     .saturating_add(1)
-			//
-			// The 1 derives from the discriminant; see
-			// https://github.com/paritytech/parity-scale-codec/
-			//   blob/f0341dabb01aa9ff0548558abb6dcc5c31c669a1/derive/src/encode.rs#L211-L216
-			//
-			// Each variant expression's sum is computed the way an equivalent struct's would be.
-
-			let expansion = data.variants.iter().map(|variant| {
-				let variant_expression = fields_length_expr(&variant.fields);
-				quote! {
-					.max(#variant_expression)
-				}
-			});
-
-			quote! {
-				0_usize #( #expansion )* .saturating_add(1)
-			}
-		}
-		Data::Union(ref data) => {
-			// https://github.com/paritytech/parity-scale-codec/
-			//   blob/f0341dabb01aa9ff0548558abb6dcc5c31c669a1/derive/src/encode.rs#L290-L293
-			Error::new(data.union_token.span(), "Union types are not supported").to_compile_error()
-		}
-	}
-}
diff --git a/max-encoded-len/src/lib.rs b/max-encoded-len/src/lib.rs
deleted file mode 100644
index e216d3b17415..000000000000
--- a/max-encoded-len/src/lib.rs
+++ /dev/null
@@ -1,161 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! `trait MaxEncodedLen` bounds the max encoded length of items.
-
-#![cfg_attr(not(feature = "std"), no_std)]
-
-use codec::{Compact, Encode};
-use impl_trait_for_tuples::impl_for_tuples;
-use core::{mem, marker::PhantomData};
-use primitive_types::{H160, H256, H512};
-
-/// Derive macro for `MaxEncodedLen`.
-///
-/// ```
-/// # use max_encoded_len::MaxEncodedLen;
-/// # use codec::Encode;
-/// #[derive(Encode, MaxEncodedLen)]
-/// struct Example;
-/// ```
-///
-/// Sometimes the `MaxEncodedLen` trait and macro are accessed without explicitly importing its
-/// crate, notably via the `frame_support::max_encoded_len` re-binding. In these circumstances,
-/// the derive macro needs some help to understand where its crate should be:
-///
-/// ```
-/// # use codec::Encode;
-/// use frame_support::max_encoded_len::MaxEncodedLen;
-///
-/// #[derive(Encode, MaxEncodedLen)]
-/// #[max_encoded_len_crate(frame_support::max_encoded_len)]
-/// struct Example;
-/// ```
-#[cfg(feature = "derive")]
-pub use max_encoded_len_derive::MaxEncodedLen;
-
-/// Items implementing `MaxEncodedLen` have a statically known maximum encoded size.
-///
-/// Some containers, such as `BoundedVec`, have enforced size limits and this trait
-/// can be implemented accurately. Other containers, such as `StorageMap`, do not have enforced size
-/// limits. For those containers, it is necessary to make a documented assumption about the maximum
-/// usage, and compute the max encoded length based on that assumption.
-pub trait MaxEncodedLen: Encode {
-	/// Upper bound, in bytes, of the maximum encoded size of this item.
-	fn max_encoded_len() -> usize;
-}
-
-macro_rules! impl_primitives {
-	( $($t:ty),+ ) => {
-		$(
-			impl MaxEncodedLen for $t {
-				fn max_encoded_len() -> usize {
-					mem::size_of::<$t>()
-				}
-			}
-		)+
-	};
-}
-
-impl_primitives!(u8, u16, u32, u64, u128, i8, i16, i32, i64, i128, bool, H160, H256, H512);
-
-macro_rules! impl_compact {
-	($( $t:ty => $e:expr; )*) => {
-		$(
-			impl MaxEncodedLen for Compact<$t> {
-				fn max_encoded_len() -> usize {
-					$e
-				}
-			}
-		)*
-	};
-}
-
-impl_compact!(
-	// github.com/paritytech/parity-scale-codec/blob/f0341dabb01aa9ff0548558abb6dcc5c31c669a1/src/compact.rs#L261
-	u8 => 2;
-	// github.com/paritytech/parity-scale-codec/blob/f0341dabb01aa9ff0548558abb6dcc5c31c669a1/src/compact.rs#L291
-	u16 => 4;
-	// github.com/paritytech/parity-scale-codec/blob/f0341dabb01aa9ff0548558abb6dcc5c31c669a1/src/compact.rs#L326
-	u32 => 5;
-	// github.com/paritytech/parity-scale-codec/blob/f0341dabb01aa9ff0548558abb6dcc5c31c669a1/src/compact.rs#L369
-	u64 => 9;
-	// github.com/paritytech/parity-scale-codec/blob/f0341dabb01aa9ff0548558abb6dcc5c31c669a1/src/compact.rs#L413
-	u128 => 17;
-);
-
-// impl_for_tuples for values 19 and higher fails because that's where the WrapperTypeEncode impl stops.
-#[impl_for_tuples(18)]
-impl MaxEncodedLen for Tuple {
-	fn max_encoded_len() -> usize {
-		let mut len: usize = 0;
-		for_tuples!( #( len = len.saturating_add(Tuple::max_encoded_len()); )* );
-		len
-	}
-}
-
-impl<T: MaxEncodedLen, const N: usize> MaxEncodedLen for [T; N] {
-	fn max_encoded_len() -> usize {
-		T::max_encoded_len().saturating_mul(N)
-	}
-}
-
-impl<T: MaxEncodedLen> MaxEncodedLen for Option<T> {
-	fn max_encoded_len() -> usize {
-		T::max_encoded_len().saturating_add(1)
-	}
-}
-
-impl<T, E> MaxEncodedLen for Result<T, E>
-where
-	T: MaxEncodedLen,
-	E: MaxEncodedLen,
-{
-	fn max_encoded_len() -> usize {
-		T::max_encoded_len().max(E::max_encoded_len()).saturating_add(1)
-	}
-}
-
-impl<T> MaxEncodedLen for PhantomData<T> {
-	fn max_encoded_len() -> usize {
-		0
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-
-	macro_rules! test_compact_length {
-		($(fn $name:ident($t:ty);)*) => {
-			$(
-				#[test]
-				fn $name() {
-					assert_eq!(Compact(<$t>::MAX).encode().len(), Compact::<$t>::max_encoded_len());
-				}
-			)*
-		};
-	}
-
-	test_compact_length!(
-		fn compact_u8(u8);
-		fn compact_u16(u16);
-		fn compact_u32(u32);
-		fn compact_u64(u64);
-		fn compact_u128(u128);
-	);
-}
diff --git a/max-encoded-len/tests/max_encoded_len.rs b/max-encoded-len/tests/max_encoded_len.rs
deleted file mode 100644
index 665ac8fa98a4..000000000000
--- a/max-encoded-len/tests/max_encoded_len.rs
+++ /dev/null
@@ -1,151 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Tests for MaxEncodedLen derive macro
-
-#![cfg(feature = "derive")]
-
-use max_encoded_len::MaxEncodedLen;
-use codec::{Compact, Encode};
-
-// These structs won't even compile if the macro isn't working right.
-
-#[derive(Encode, MaxEncodedLen)]
-struct Primitives {
-	bool: bool,
-	eight: u8,
-}
-
-#[test]
-fn primitives_max_length() {
-	assert_eq!(Primitives::max_encoded_len(), 2);
-}
-
-#[derive(Encode, MaxEncodedLen)]
-struct Composites {
-	fixed_size_array: [u8; 128],
-	tuple: (u128, u128),
-}
-
-#[test]
-fn composites_max_length() {
-	assert_eq!(Composites::max_encoded_len(), 128 + 16 + 16);
-}
-
-#[derive(Encode, MaxEncodedLen)]
-struct Generic<T> {
-	one: T,
-	two: T,
-}
-
-#[test]
-fn generic_max_length() {
-	assert_eq!(Generic::<u8>::max_encoded_len(), u8::max_encoded_len() * 2);
-	assert_eq!(Generic::<u32>::max_encoded_len(), u32::max_encoded_len() * 2);
-}
-
-#[derive(Encode, MaxEncodedLen)]
-struct TwoGenerics<T, U> {
-	t: T,
-	u: U,
-}
-
-#[test]
-fn two_generics_max_length() {
-	assert_eq!(
-		TwoGenerics::<u8, u16>::max_encoded_len(),
-		u8::max_encoded_len() + u16::max_encoded_len()
-	);
-	assert_eq!(
-		TwoGenerics::<Compact<u64>, [u16; 8]>::max_encoded_len(),
-		Compact::<u64>::max_encoded_len() + <[u16; 8]>::max_encoded_len()
-	);
-}
-
-#[derive(Encode, MaxEncodedLen)]
-struct UnitStruct;
-
-#[test]
-fn unit_struct_max_length() {
-	assert_eq!(UnitStruct::max_encoded_len(), 0);
-}
-
-#[derive(Encode, MaxEncodedLen)]
-struct TupleStruct(u8, u32);
-
-#[test]
-fn tuple_struct_max_length() {
-	assert_eq!(TupleStruct::max_encoded_len(), u8::max_encoded_len() + u32::max_encoded_len());
-}
-
-#[derive(Encode, MaxEncodedLen)]
-struct TupleGeneric<T>(T, T);
-
-#[test]
-fn tuple_generic_max_length() {
-	assert_eq!(TupleGeneric::<u8>::max_encoded_len(), u8::max_encoded_len() * 2);
-	assert_eq!(TupleGeneric::<u32>::max_encoded_len(), u32::max_encoded_len() * 2);
-}
-
-#[derive(Encode, MaxEncodedLen)]
-#[allow(unused)]
-enum UnitEnum {
-	A,
-	B,
-}
-
-#[test]
-fn unit_enum_max_length() {
-	assert_eq!(UnitEnum::max_encoded_len(), 1);
-}
-
-#[derive(Encode, MaxEncodedLen)]
-#[allow(unused)]
-enum TupleEnum {
-	A(u32),
-	B,
-}
-
-#[test]
-fn tuple_enum_max_length() {
-	assert_eq!(TupleEnum::max_encoded_len(), 1 + u32::max_encoded_len());
-}
-
-#[derive(Encode, MaxEncodedLen)]
-#[allow(unused)]
-enum StructEnum {
-	A { sixty_four: u64, one_twenty_eight: u128 },
-	B,
-}
-
-#[test]
-fn struct_enum_max_length() {
-	assert_eq!(StructEnum::max_encoded_len(), 1 + u64::max_encoded_len() + u128::max_encoded_len());
-}
-
-// ensure that enums take the max of variant length, not the sum
-#[derive(Encode, MaxEncodedLen)]
-#[allow(unused)]
-enum EnumMaxNotSum {
-	A(u32),
-	B(u32),
-}
-
-#[test]
-fn enum_max_not_sum_max_length() {
-	assert_eq!(EnumMaxNotSum::max_encoded_len(), 1 + u32::max_encoded_len());
-}
diff --git a/max-encoded-len/tests/max_encoded_len_ui.rs b/max-encoded-len/tests/max_encoded_len_ui.rs
deleted file mode 100644
index 79d6d49234ff..000000000000
--- a/max-encoded-len/tests/max_encoded_len_ui.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#[cfg(feature = "derive")]
-#[rustversion::attr(not(stable), ignore)]
-#[test]
-fn derive_no_bound_ui() {
-	// As trybuild is using `cargo check`, we don't need the real WASM binaries.
-	std::env::set_var("SKIP_WASM_BUILD", "1");
-
-	let t = trybuild::TestCases::new();
-	t.compile_fail("tests/max_encoded_len_ui/*.rs");
-}
diff --git a/max-encoded-len/tests/max_encoded_len_ui/list_list_item.rs b/max-encoded-len/tests/max_encoded_len_ui/list_list_item.rs
deleted file mode 100644
index 0cb12991fab4..000000000000
--- a/max-encoded-len/tests/max_encoded_len_ui/list_list_item.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-use codec::Encode;
-use frame_support::max_encoded_len::MaxEncodedLen;
-
-#[derive(Encode, MaxEncodedLen)]
-#[max_encoded_len_crate(foo())]
-struct Example;
-
-fn main() {
-	let _ = Example::max_encoded_len();
-}
diff --git a/max-encoded-len/tests/max_encoded_len_ui/list_list_item.stderr b/max-encoded-len/tests/max_encoded_len_ui/list_list_item.stderr
deleted file mode 100644
index 4ecd40440a46..000000000000
--- a/max-encoded-len/tests/max_encoded_len_ui/list_list_item.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error: expect: path::to::crate
- --> $DIR/list_list_item.rs:5:25
-  |
-5 | #[max_encoded_len_crate(foo())]
-  |                         ^^^
-
-error[E0599]: no function or associated item named `max_encoded_len` found for struct `Example` in the current scope
- --> $DIR/list_list_item.rs:9:19
-  |
-6 | struct Example;
-  | --------------- function or associated item `max_encoded_len` not found for this
-...
-9 |     let _ = Example::max_encoded_len();
-  |                      ^^^^^^^^^^^^^^^ function or associated item not found in `Example`
-  |
-  = help: items from traits can only be used if the trait is implemented and in scope
-  = note: the following trait defines an item `max_encoded_len`, perhaps you need to implement it:
-          candidate #1: `MaxEncodedLen`
diff --git a/max-encoded-len/tests/max_encoded_len_ui/literal_list_item.rs b/max-encoded-len/tests/max_encoded_len_ui/literal_list_item.rs
deleted file mode 100644
index f3f7a72d813b..000000000000
--- a/max-encoded-len/tests/max_encoded_len_ui/literal_list_item.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-use codec::Encode;
-use frame_support::max_encoded_len::MaxEncodedLen;
-
-#[derive(Encode, MaxEncodedLen)]
-#[max_encoded_len_crate("frame_support::max_encoded_len")]
-struct Example;
-
-fn main() {
-	let _ = Example::max_encoded_len();
-}
diff --git a/max-encoded-len/tests/max_encoded_len_ui/literal_list_item.stderr b/max-encoded-len/tests/max_encoded_len_ui/literal_list_item.stderr
deleted file mode 100644
index 118259991299..000000000000
--- a/max-encoded-len/tests/max_encoded_len_ui/literal_list_item.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error: expected a path item, not a literal
- --> $DIR/literal_list_item.rs:5:25
-  |
-5 | #[max_encoded_len_crate("frame_support::max_encoded_len")]
-  |                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error[E0599]: no function or associated item named `max_encoded_len` found for struct `Example` in the current scope
- --> $DIR/literal_list_item.rs:9:19
-  |
-6 | struct Example;
-  | --------------- function or associated item `max_encoded_len` not found for this
-...
-9 |     let _ = Example::max_encoded_len();
-  |                      ^^^^^^^^^^^^^^^ function or associated item not found in `Example`
-  |
-  = help: items from traits can only be used if the trait is implemented and in scope
-  = note: the following trait defines an item `max_encoded_len`, perhaps you need to implement it:
-          candidate #1: `MaxEncodedLen`
diff --git a/max-encoded-len/tests/max_encoded_len_ui/name_value_attr.rs b/max-encoded-len/tests/max_encoded_len_ui/name_value_attr.rs
deleted file mode 100644
index 382310d3a7dd..000000000000
--- a/max-encoded-len/tests/max_encoded_len_ui/name_value_attr.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-use codec::Encode;
-use frame_support::max_encoded_len::MaxEncodedLen;
-
-#[derive(Encode, MaxEncodedLen)]
-#[max_encoded_len_crate = "frame_support::max_encoded_len"]
-struct Example;
-
-fn main() {
-	let _ = Example::max_encoded_len();
-}
diff --git a/max-encoded-len/tests/max_encoded_len_ui/name_value_attr.stderr b/max-encoded-len/tests/max_encoded_len_ui/name_value_attr.stderr
deleted file mode 100644
index 4949631049ba..000000000000
--- a/max-encoded-len/tests/max_encoded_len_ui/name_value_attr.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error: expect: #[max_encoded_len_crate(path::to::crate)]
- --> $DIR/name_value_attr.rs:5:3
-  |
-5 | #[max_encoded_len_crate = "frame_support::max_encoded_len"]
-  |   ^^^^^^^^^^^^^^^^^^^^^
-
-error[E0599]: no function or associated item named `max_encoded_len` found for struct `Example` in the current scope
- --> $DIR/name_value_attr.rs:9:19
-  |
-6 | struct Example;
-  | --------------- function or associated item `max_encoded_len` not found for this
-...
-9 |     let _ = Example::max_encoded_len();
-  |                      ^^^^^^^^^^^^^^^ function or associated item not found in `Example`
-  |
-  = help: items from traits can only be used if the trait is implemented and in scope
-  = note: the following trait defines an item `max_encoded_len`, perhaps you need to implement it:
-          candidate #1: `MaxEncodedLen`
diff --git a/max-encoded-len/tests/max_encoded_len_ui/name_value_list_item.rs b/max-encoded-len/tests/max_encoded_len_ui/name_value_list_item.rs
deleted file mode 100644
index 44f92e8d5d99..000000000000
--- a/max-encoded-len/tests/max_encoded_len_ui/name_value_list_item.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-use codec::Encode;
-use frame_support::max_encoded_len::MaxEncodedLen;
-
-#[derive(Encode, MaxEncodedLen)]
-#[max_encoded_len_crate(path = "frame_support::max_encoded_len")]
-struct Example;
-
-fn main() {
-	let _ = Example::max_encoded_len();
-}
diff --git a/max-encoded-len/tests/max_encoded_len_ui/name_value_list_item.stderr b/max-encoded-len/tests/max_encoded_len_ui/name_value_list_item.stderr
deleted file mode 100644
index 2faa1108c49d..000000000000
--- a/max-encoded-len/tests/max_encoded_len_ui/name_value_list_item.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error: expect: path::to::crate
- --> $DIR/name_value_list_item.rs:5:25
-  |
-5 | #[max_encoded_len_crate(path = "frame_support::max_encoded_len")]
-  |                         ^^^^
-
-error[E0599]: no function or associated item named `max_encoded_len` found for struct `Example` in the current scope
- --> $DIR/name_value_list_item.rs:9:19
-  |
-6 | struct Example;
-  | --------------- function or associated item `max_encoded_len` not found for this
-...
-9 |     let _ = Example::max_encoded_len();
-  |                      ^^^^^^^^^^^^^^^ function or associated item not found in `Example`
-  |
-  = help: items from traits can only be used if the trait is implemented and in scope
-  = note: the following trait defines an item `max_encoded_len`, perhaps you need to implement it:
-          candidate #1: `MaxEncodedLen`
diff --git a/max-encoded-len/tests/max_encoded_len_ui/no_path_list_items.rs b/max-encoded-len/tests/max_encoded_len_ui/no_path_list_items.rs
deleted file mode 100644
index 069c8af5a77e..000000000000
--- a/max-encoded-len/tests/max_encoded_len_ui/no_path_list_items.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-use codec::Encode;
-use frame_support::max_encoded_len::MaxEncodedLen;
-
-#[derive(Encode, MaxEncodedLen)]
-#[max_encoded_len_crate]
-struct Example;
-
-fn main() {
-	let _ = Example::max_encoded_len();
-}
diff --git a/max-encoded-len/tests/max_encoded_len_ui/no_path_list_items.stderr b/max-encoded-len/tests/max_encoded_len_ui/no_path_list_items.stderr
deleted file mode 100644
index 4d36039d33b3..000000000000
--- a/max-encoded-len/tests/max_encoded_len_ui/no_path_list_items.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error: expect: #[max_encoded_len_crate(path::to::crate)]
- --> $DIR/no_path_list_items.rs:5:3
-  |
-5 | #[max_encoded_len_crate]
-  |   ^^^^^^^^^^^^^^^^^^^^^
-
-error[E0599]: no function or associated item named `max_encoded_len` found for struct `Example` in the current scope
- --> $DIR/no_path_list_items.rs:9:19
-  |
-6 | struct Example;
-  | --------------- function or associated item `max_encoded_len` not found for this
-...
-9 |     let _ = Example::max_encoded_len();
-  |                      ^^^^^^^^^^^^^^^ function or associated item not found in `Example`
-  |
-  = help: items from traits can only be used if the trait is implemented and in scope
-  = note: the following trait defines an item `max_encoded_len`, perhaps you need to implement it:
-          candidate #1: `MaxEncodedLen`
diff --git a/max-encoded-len/tests/max_encoded_len_ui/not_encode.rs b/max-encoded-len/tests/max_encoded_len_ui/not_encode.rs
deleted file mode 100644
index 5e8eb6035547..000000000000
--- a/max-encoded-len/tests/max_encoded_len_ui/not_encode.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use max_encoded_len::MaxEncodedLen;
-
-#[derive(MaxEncodedLen)]
-struct NotEncode;
-
-fn main() {}
diff --git a/max-encoded-len/tests/max_encoded_len_ui/not_encode.stderr b/max-encoded-len/tests/max_encoded_len_ui/not_encode.stderr
deleted file mode 100644
index 1e0ead0854a0..000000000000
--- a/max-encoded-len/tests/max_encoded_len_ui/not_encode.stderr
+++ /dev/null
@@ -1,13 +0,0 @@
-error[E0277]: the trait bound `NotEncode: parity_scale_codec::codec::WrapperTypeEncode` is not satisfied
-  --> $DIR/not_encode.rs:3:10
-   |
-3  | #[derive(MaxEncodedLen)]
-   |          ^^^^^^^^^^^^^ the trait `parity_scale_codec::codec::WrapperTypeEncode` is not implemented for `NotEncode`
-   |
-  ::: $WORKSPACE/max-encoded-len/src/lib.rs
-   |
-   | pub trait MaxEncodedLen: Encode {
-   |                          ------ required by this bound in `MaxEncodedLen`
-   |
-   = note: required because of the requirements on the impl of `parity_scale_codec::codec::Encode` for `NotEncode`
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/max-encoded-len/tests/max_encoded_len_ui/not_mel.rs b/max-encoded-len/tests/max_encoded_len_ui/not_mel.rs
deleted file mode 100644
index cbaf820ff58e..000000000000
--- a/max-encoded-len/tests/max_encoded_len_ui/not_mel.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-use codec::Encode;
-use max_encoded_len::MaxEncodedLen;
-
-#[derive(Encode)]
-struct NotMel;
-
-#[derive(Encode, MaxEncodedLen)]
-struct Generic<T> {
-	t: T,
-}
-
-fn main() {
-	let _ = Generic::<NotMel>::max_encoded_len();
-}
diff --git a/max-encoded-len/tests/max_encoded_len_ui/not_mel.stderr b/max-encoded-len/tests/max_encoded_len_ui/not_mel.stderr
deleted file mode 100644
index 0aabd4b2a393..000000000000
--- a/max-encoded-len/tests/max_encoded_len_ui/not_mel.stderr
+++ /dev/null
@@ -1,21 +0,0 @@
-error[E0599]: the function or associated item `max_encoded_len` exists for struct `Generic<NotMel>`, but its trait bounds were not satisfied
-  --> $DIR/not_mel.rs:13:29
-   |
-5  | struct NotMel;
-   | -------------- doesn't satisfy `NotMel: MaxEncodedLen`
-...
-8  | struct Generic<T> {
-   | -----------------
-   | |
-   | function or associated item `max_encoded_len` not found for this
-   | doesn't satisfy `Generic<NotMel>: MaxEncodedLen`
-...
-13 |     let _ = Generic::<NotMel>::max_encoded_len();
-   |                                ^^^^^^^^^^^^^^^ function or associated item cannot be called on `Generic<NotMel>` due to unsatisfied trait bounds
-   |
-   = note: the following trait bounds were not satisfied:
-           `NotMel: MaxEncodedLen`
-           which is required by `Generic<NotMel>: MaxEncodedLen`
-   = help: items from traits can only be used if the trait is implemented and in scope
-   = note: the following trait defines an item `max_encoded_len`, perhaps you need to implement it:
-           candidate #1: `MaxEncodedLen`
diff --git a/max-encoded-len/tests/max_encoded_len_ui/path_attr.rs b/max-encoded-len/tests/max_encoded_len_ui/path_attr.rs
deleted file mode 100644
index 069c8af5a77e..000000000000
--- a/max-encoded-len/tests/max_encoded_len_ui/path_attr.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-use codec::Encode;
-use frame_support::max_encoded_len::MaxEncodedLen;
-
-#[derive(Encode, MaxEncodedLen)]
-#[max_encoded_len_crate]
-struct Example;
-
-fn main() {
-	let _ = Example::max_encoded_len();
-}
diff --git a/max-encoded-len/tests/max_encoded_len_ui/path_attr.stderr b/max-encoded-len/tests/max_encoded_len_ui/path_attr.stderr
deleted file mode 100644
index 84745efc5e6f..000000000000
--- a/max-encoded-len/tests/max_encoded_len_ui/path_attr.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error: expect: #[max_encoded_len_crate(path::to::crate)]
- --> $DIR/path_attr.rs:5:3
-  |
-5 | #[max_encoded_len_crate]
-  |   ^^^^^^^^^^^^^^^^^^^^^
-
-error[E0599]: no function or associated item named `max_encoded_len` found for struct `Example` in the current scope
- --> $DIR/path_attr.rs:9:19
-  |
-6 | struct Example;
-  | --------------- function or associated item `max_encoded_len` not found for this
-...
-9 |     let _ = Example::max_encoded_len();
-  |                      ^^^^^^^^^^^^^^^ function or associated item not found in `Example`
-  |
-  = help: items from traits can only be used if the trait is implemented and in scope
-  = note: the following trait defines an item `max_encoded_len`, perhaps you need to implement it:
-          candidate #1: `MaxEncodedLen`
diff --git a/max-encoded-len/tests/max_encoded_len_ui/two_path_list_items.rs b/max-encoded-len/tests/max_encoded_len_ui/two_path_list_items.rs
deleted file mode 100644
index 2b29648cbaa2..000000000000
--- a/max-encoded-len/tests/max_encoded_len_ui/two_path_list_items.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-use codec::Encode;
-use frame_support::max_encoded_len::MaxEncodedLen;
-
-#[derive(Encode, MaxEncodedLen)]
-#[max_encoded_len_crate(max_encoded_len, frame_support::max_encoded_len)]
-struct Example;
-
-fn main() {
-	let _ = Example::max_encoded_len();
-}
diff --git a/max-encoded-len/tests/max_encoded_len_ui/two_path_list_items.stderr b/max-encoded-len/tests/max_encoded_len_ui/two_path_list_items.stderr
deleted file mode 100644
index 9252a4065f25..000000000000
--- a/max-encoded-len/tests/max_encoded_len_ui/two_path_list_items.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error: expected exactly 1 item
- --> $DIR/two_path_list_items.rs:5:3
-  |
-5 | #[max_encoded_len_crate(max_encoded_len, frame_support::max_encoded_len)]
-  |   ^^^^^^^^^^^^^^^^^^^^^
-
-error[E0599]: no function or associated item named `max_encoded_len` found for struct `Example` in the current scope
- --> $DIR/two_path_list_items.rs:9:19
-  |
-6 | struct Example;
-  | --------------- function or associated item `max_encoded_len` not found for this
-...
-9 |     let _ = Example::max_encoded_len();
-  |                      ^^^^^^^^^^^^^^^ function or associated item not found in `Example`
-  |
-  = help: items from traits can only be used if the trait is implemented and in scope
-  = note: the following trait defines an item `max_encoded_len`, perhaps you need to implement it:
-          candidate #1: `MaxEncodedLen`
diff --git a/max-encoded-len/tests/max_encoded_len_ui/union.rs b/max-encoded-len/tests/max_encoded_len_ui/union.rs
deleted file mode 100644
index 932c484b9e67..000000000000
--- a/max-encoded-len/tests/max_encoded_len_ui/union.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-use codec::Encode;
-use max_encoded_len::MaxEncodedLen;
-
-#[derive(Encode, MaxEncodedLen)]
-union Union {
-	a: u8,
-	b: u16,
-}
-
-fn main() {}
diff --git a/max-encoded-len/tests/max_encoded_len_ui/union.stderr b/max-encoded-len/tests/max_encoded_len_ui/union.stderr
deleted file mode 100644
index d09a3f4673e1..000000000000
--- a/max-encoded-len/tests/max_encoded_len_ui/union.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error: Union types are not supported.
- --> $DIR/union.rs:5:1
-  |
-5 | union Union {
-  | ^^^^^
-
-error: Union types are not supported
- --> $DIR/union.rs:5:1
-  |
-5 | union Union {
-  | ^^^^^
diff --git a/max-encoded-len/tests/max_encoded_len_ui/unsupported_variant.rs b/max-encoded-len/tests/max_encoded_len_ui/unsupported_variant.rs
deleted file mode 100644
index 2fa94867471b..000000000000
--- a/max-encoded-len/tests/max_encoded_len_ui/unsupported_variant.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-use codec::Encode;
-use max_encoded_len::MaxEncodedLen;
-
-#[derive(Encode)]
-struct NotMel;
-
-#[derive(Encode, MaxEncodedLen)]
-enum UnsupportedVariant {
-	NotMel(NotMel),
-}
-
-fn main() {}
diff --git a/max-encoded-len/tests/max_encoded_len_ui/unsupported_variant.stderr b/max-encoded-len/tests/max_encoded_len_ui/unsupported_variant.stderr
deleted file mode 100644
index aa10b5e4cc15..000000000000
--- a/max-encoded-len/tests/max_encoded_len_ui/unsupported_variant.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0599]: no function or associated item named `max_encoded_len` found for struct `NotMel` in the current scope
- --> $DIR/unsupported_variant.rs:9:9
-  |
-5 | struct NotMel;
-  | -------------- function or associated item `max_encoded_len` not found for this
-...
-9 |     NotMel(NotMel),
-  |            ^^^^^^ function or associated item not found in `NotMel`
-  |
-  = help: items from traits can only be used if the trait is implemented and in scope
-  = note: the following trait defines an item `max_encoded_len`, perhaps you need to implement it:
-          candidate #1: `MaxEncodedLen`
diff --git a/primitives/application-crypto/Cargo.toml b/primitives/application-crypto/Cargo.toml
index 7f3e48ae4825..050d2468aa00 100644
--- a/primitives/application-crypto/Cargo.toml
+++ b/primitives/application-crypto/Cargo.toml
@@ -20,7 +20,6 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 sp-std = { version = "3.0.0", default-features = false, path = "../std" }
 sp-io = { version = "3.0.0", default-features = false, path = "../io" }
-max-encoded-len = { version = "3.0.0", default-features = false, path = "../../max-encoded-len", features = [ "derive" ] }
 
 [features]
 default = [ "std" ]
@@ -31,7 +30,6 @@ std = [
 	"serde",
 	"sp-std/std",
 	"sp-io/std",
-	"max-encoded-len/std",
 ]
 
 # This feature enables all crypto primitives for `no_std` builds like microcontrollers
diff --git a/primitives/application-crypto/src/lib.rs b/primitives/application-crypto/src/lib.rs
index 58e5c5b7a311..ca175ddbed91 100644
--- a/primitives/application-crypto/src/lib.rs
+++ b/primitives/application-crypto/src/lib.rs
@@ -39,8 +39,6 @@ pub use sp_std::{
 	ops::Deref,
 	vec::Vec,
 };
-#[doc(hidden)]
-pub use max_encoded_len;
 
 pub mod ed25519;
 pub mod sr25519;
@@ -200,9 +198,9 @@ macro_rules! app_crypto_public_full_crypto {
 				$crate::codec::Encode,
 				$crate::codec::Decode,
 				$crate::RuntimeDebug,
-				$crate::max_encoded_len::MaxEncodedLen,
+				$crate::codec::MaxEncodedLen,
 			)]
-			#[max_encoded_len_crate($crate::max_encoded_len)]
+			#[codec(crate = $crate::codec)]
 			pub struct Public($public);
 		}
 
diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml
index 14f24d35767e..6746e8599e6c 100644
--- a/primitives/core/Cargo.toml
+++ b/primitives/core/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 sp-std = { version = "3.0.0", default-features = false, path = "../std" }
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
 log = { version = "0.4.11", default-features = false }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 byteorder = { version = "1.3.2", default-features = false }
@@ -40,7 +40,6 @@ parity-util-mem = { version = "0.10.0", default-features = false, features = ["p
 futures = { version = "0.3.1", optional = true }
 dyn-clonable = { version = "0.9.0", optional = true }
 thiserror = { version = "1.0.21", optional = true }
-max-encoded-len = { version = "3.0.0", default-features = false, path = "../../max-encoded-len", features = [ "derive" ] }
 
 # full crypto
 ed25519-dalek = { version = "1.0.1", default-features = false, features = ["u64_backend", "alloc"], optional = true }
@@ -114,7 +113,6 @@ std = [
 	"futures/thread-pool",
 	"libsecp256k1/std",
 	"dyn-clonable",
-	"max-encoded-len/std",
 ]
 
 # This feature enables all crypto primitives for `no_std` builds like microcontrollers
diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index d9a0a69e1681..a4dc7f6baa46 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -20,7 +20,6 @@
 // end::description[]
 
 use crate::{sr25519, ed25519};
-use max_encoded_len::MaxEncodedLen;
 use sp_std::hash::Hash;
 use sp_std::vec::Vec;
 use sp_std::str;
@@ -31,7 +30,7 @@ use sp_std::convert::TryFrom;
 use parking_lot::Mutex;
 #[cfg(feature = "std")]
 use rand::{RngCore, rngs::OsRng};
-use codec::{Encode, Decode};
+use codec::{Encode, Decode, MaxEncodedLen};
 #[cfg(feature = "std")]
 use regex::Regex;
 #[cfg(feature = "std")]
diff --git a/primitives/core/src/ecdsa.rs b/primitives/core/src/ecdsa.rs
index c567b3c44f6c..ffdb5f5c4c99 100644
--- a/primitives/core/src/ecdsa.rs
+++ b/primitives/core/src/ecdsa.rs
@@ -23,7 +23,7 @@
 use sp_std::vec::Vec;
 
 use sp_std::cmp::Ordering;
-use codec::{Encode, Decode};
+use codec::{Encode, Decode, MaxEncodedLen};
 
 #[cfg(feature = "full_crypto")]
 use core::convert::{TryFrom, TryInto};
@@ -52,7 +52,7 @@ pub const CRYPTO_ID: CryptoTypeId = CryptoTypeId(*b"ecds");
 type Seed = [u8; 32];
 
 /// The ECDSA compressed public key.
-#[derive(Clone, Encode, Decode, PassByInner, max_encoded_len::MaxEncodedLen)]
+#[derive(Clone, Encode, Decode, PassByInner, MaxEncodedLen)]
 pub struct Public(pub [u8; 33]);
 
 impl PartialOrd for Public {
diff --git a/primitives/core/src/ed25519.rs b/primitives/core/src/ed25519.rs
index 392dc2eec6c6..13ee4d8cdfbc 100644
--- a/primitives/core/src/ed25519.rs
+++ b/primitives/core/src/ed25519.rs
@@ -23,7 +23,7 @@
 use sp_std::vec::Vec;
 
 use crate::{hash::H256, hash::H512};
-use codec::{Encode, Decode};
+use codec::{Encode, Decode, MaxEncodedLen};
 
 #[cfg(feature = "full_crypto")]
 use core::convert::TryFrom;
@@ -56,7 +56,7 @@ type Seed = [u8; 32];
 #[cfg_attr(feature = "full_crypto", derive(Hash))]
 #[derive(
 	PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Encode, Decode, Default, PassByInner,
-	max_encoded_len::MaxEncodedLen,
+	MaxEncodedLen,
 )]
 pub struct Public(pub [u8; 32]);
 
diff --git a/primitives/core/src/sr25519.rs b/primitives/core/src/sr25519.rs
index 269f19cba007..dbfb8ba1d26f 100644
--- a/primitives/core/src/sr25519.rs
+++ b/primitives/core/src/sr25519.rs
@@ -42,7 +42,7 @@ use crate::crypto::Ss58Codec;
 
 use crate::crypto::{Public as TraitPublic, CryptoTypePublicPair, UncheckedFrom, CryptoType, Derive, CryptoTypeId};
 use crate::hash::{H256, H512};
-use codec::{Encode, Decode};
+use codec::{Encode, Decode, MaxEncodedLen};
 use sp_std::ops::Deref;
 
 #[cfg(feature = "std")]
@@ -62,7 +62,7 @@ pub const CRYPTO_ID: CryptoTypeId = CryptoTypeId(*b"sr25");
 #[cfg_attr(feature = "full_crypto", derive(Hash))]
 #[derive(
 	PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Encode, Decode, Default, PassByInner,
-	max_encoded_len::MaxEncodedLen,
+	MaxEncodedLen,
 )]
 pub struct Public(pub [u8; 32]);
 
diff --git a/primitives/runtime/Cargo.toml b/primitives/runtime/Cargo.toml
index e0fc2ed46183..b38bbbb663d4 100644
--- a/primitives/runtime/Cargo.toml
+++ b/primitives/runtime/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
 sp-core = { version = "3.0.0", default-features = false, path = "../core" }
 sp-application-crypto = { version = "3.0.0", default-features = false, path = "../application-crypto" }
 sp-arithmetic = { version = "3.0.0", default-features = false, path = "../arithmetic" }
@@ -29,7 +29,6 @@ impl-trait-for-tuples = "0.2.1"
 parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
 hash256-std-hasher = { version = "0.15.2", default-features = false }
 either = { version = "1.5", default-features = false }
-max-encoded-len = { version = "3.0.0", default-features = false, path = "../../max-encoded-len", features = [ "derive" ] }
 
 [dev-dependencies]
 serde_json = "1.0.41"
@@ -56,5 +55,4 @@ std = [
 	"parity-util-mem/std",
 	"hash256-std-hasher/std",
 	"either/use_std",
-	"max-encoded-len/std",
 ]
diff --git a/primitives/runtime/src/traits.rs b/primitives/runtime/src/traits.rs
index 2379fce9949e..fac4adf48c26 100644
--- a/primitives/runtime/src/traits.rs
+++ b/primitives/runtime/src/traits.rs
@@ -26,7 +26,7 @@ use std::str::FromStr;
 #[cfg(feature = "std")]
 use serde::{Serialize, Deserialize, de::DeserializeOwned};
 use sp_core::{self, Hasher, TypeId, RuntimeDebug};
-use crate::codec::{Codec, Encode, Decode};
+use crate::codec::{Codec, Encode, Decode, MaxEncodedLen};
 use crate::transaction_validity::{
 	ValidTransaction, TransactionSource, TransactionValidity, TransactionValidityError,
 	UnknownTransaction,
@@ -40,7 +40,6 @@ pub use sp_arithmetic::traits::{
 use sp_application_crypto::AppKey;
 use impl_trait_for_tuples::impl_for_tuples;
 use crate::DispatchResult;
-use max_encoded_len::MaxEncodedLen;
 
 /// A lazy value.
 pub trait Lazy<T: ?Sized> {

From b9eb2457c35dc9faba7f14c5664a1f0b9c259dc8 Mon Sep 17 00:00:00 2001
From: Nikolay Volf <nikvolf@gmail.com>
Date: Tue, 6 Jul 2021 00:25:40 +0300
Subject: [PATCH 0951/1194] Update CODEOWNERS (#9278)

---
 docs/CODEOWNERS | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/docs/CODEOWNERS b/docs/CODEOWNERS
index 865c8d56dff3..42d25a0a228f 100644
--- a/docs/CODEOWNERS
+++ b/docs/CODEOWNERS
@@ -23,17 +23,10 @@
 /.github/ @paritytech/ci
 /.gitlab-ci.yml @paritytech/ci
 
-# Block production
-/client/basic-authorship/ @NikVolf
-
 # Sandboxing capability of Substrate Runtime
 /primitives/sr-sandbox/ @pepyakin
 /primitives/core/src/sandbox.rs @pepyakin
 
-# Transaction pool
-/client/transaction-pool/ @NikVolf
-/primitives/transaction-pool/ @NikVolf
-
 # Offchain
 /client/offchain/ @tomusdrw
 /primitives/offchain/ @tomusdrw

From 22eec655835f72dccd62e8d2ef2d2420e153b70d Mon Sep 17 00:00:00 2001
From: ferrell-code <automatedcharlesferrell@gmail.com>
Date: Mon, 5 Jul 2021 17:40:45 -0400
Subject: [PATCH 0952/1194] Authority_discovery: expose assimilate_storage with
 GenesisBuild (#9279)

* use genesis build

* format
---
 frame/authority-discovery/src/lib.rs | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/frame/authority-discovery/src/lib.rs b/frame/authority-discovery/src/lib.rs
index 791fbda10382..7edbd8c9a8bd 100644
--- a/frame/authority-discovery/src/lib.rs
+++ b/frame/authority-discovery/src/lib.rs
@@ -25,8 +25,6 @@
 
 use sp_std::prelude::*;
 use frame_support::traits::OneSessionHandler;
-#[cfg(feature = "std")]
-use frame_support::traits::GenesisBuild;
 use sp_authority_discovery::AuthorityId;
 
 pub use pallet::*;
@@ -148,17 +146,6 @@ impl<T: Config> OneSessionHandler<T::AccountId> for Pallet<T> {
 	}
 }
 
-#[cfg(feature = "std")]
-impl GenesisConfig {
-	/// Direct implementation of `GenesisBuild::assimilate_storage`.
-	pub fn assimilate_storage<T: Config>(
-		&self,
-		storage: &mut sp_runtime::Storage
-	) -> Result<(), String> {
-		<Self as GenesisBuild<T>>::assimilate_storage(self, storage)
-	}
-}
-
 #[cfg(test)]
 mod tests {
 	use crate as pallet_authority_discovery;
@@ -172,6 +159,7 @@ mod tests {
 		Perbill, KeyTypeId,
 	};
 	use frame_support::parameter_types;
+	use frame_support::traits::GenesisBuild;
 
 	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 	type Block = frame_system::mocking::MockBlock<Test>;
@@ -302,11 +290,11 @@ mod tests {
 			.build_storage::<Test>()
 			.unwrap();
 
-		pallet_authority_discovery::GenesisConfig {
-			keys: vec![],
-		}
-		.assimilate_storage::<Test>(&mut t)
-		.unwrap();
+
+		GenesisBuild::<Test>::assimilate_storage(
+			&pallet_authority_discovery::GenesisConfig{keys: vec![]},
+			&mut t
+		).unwrap();
 
 		// Create externalities.
 		let mut externalities = TestExternalities::new(t);

From 0f5a858b67711aec131ebef68f146009c5af5ab0 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Tue, 6 Jul 2021 03:58:24 +0200
Subject: [PATCH 0953/1194] fix storage info for decl_storage (#9274)

---
 .../procedural/src/storage/storage_info.rs    |  4 --
 frame/support/test/tests/decl_storage.rs      | 41 +++++++++++++++++++
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/frame/support/procedural/src/storage/storage_info.rs b/frame/support/procedural/src/storage/storage_info.rs
index 947f4c2bb9f6..c7707f6cb724 100644
--- a/frame/support/procedural/src/storage/storage_info.rs
+++ b/frame/support/procedural/src/storage/storage_info.rs
@@ -22,10 +22,6 @@ use quote::quote;
 use super::DeclStorageDefExt;
 
 pub fn impl_storage_info(def: &DeclStorageDefExt) -> TokenStream {
-	if !def.generate_storage_info {
-		return Default::default()
-	}
-
 	let scrate = &def.hidden_crate;
 
 	let mut res_append_storage = TokenStream::new();
diff --git a/frame/support/test/tests/decl_storage.rs b/frame/support/test/tests/decl_storage.rs
index 2bb408748590..56ea217bbffe 100644
--- a/frame/support/test/tests/decl_storage.rs
+++ b/frame/support/test/tests/decl_storage.rs
@@ -651,6 +651,47 @@ mod test2 {
 	}
 
 	impl Config for TraitImpl {}
+
+	#[test]
+	fn storage_info() {
+		use frame_support::{
+			StorageHasher,
+			traits::{StorageInfoTrait, StorageInfo},
+			pallet_prelude::*,
+		};
+		let prefix = |pallet_name, storage_name| {
+			let mut res = [0u8; 32];
+			res[0..16].copy_from_slice(&Twox128::hash(pallet_name));
+			res[16..32].copy_from_slice(&Twox128::hash(storage_name));
+			res
+		};
+		pretty_assertions::assert_eq!(
+			<Module<TraitImpl>>::storage_info(),
+			vec![
+				StorageInfo {
+					prefix: prefix(b"TestStorage", b"SingleDef"),
+					max_values: Some(1),
+					max_size: None,
+				},
+				StorageInfo {
+					prefix: prefix(b"TestStorage", b"PairDef"),
+					max_values: Some(1),
+					max_size: None,
+				},
+				StorageInfo {
+					prefix: prefix(b"TestStorage", b"Single"),
+					max_values: Some(1),
+					max_size: None,
+				},
+				StorageInfo {
+					prefix: prefix(b"TestStorage", b"Pair"),
+					max_values: Some(1),
+					max_size: None,
+				},
+			],
+		);
+	}
+
 }
 
 #[cfg(test)]

From 8c868a269a3639b97c822e265624e65fedd6e73e Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Tue, 6 Jul 2021 02:08:31 -0400
Subject: [PATCH 0954/1194] fix staking version in genesis (#9280)

---
 frame/staking/src/lib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 1f22275bde9c..595255a40e0a 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -1212,7 +1212,7 @@ pub mod pallet {
 	/// True if network has been upgraded to this version.
 	/// Storage version of the pallet.
 	///
-	/// This is set to v6.0.0 for new networks.
+	/// This is set to v7.0.0 for new networks.
 	#[pallet::storage]
 	pub(crate) type StorageVersion<T: Config> = StorageValue<_, Releases, ValueQuery>;
 
@@ -1264,7 +1264,7 @@ pub mod pallet {
 			ForceEra::<T>::put(self.force_era);
 			CanceledSlashPayout::<T>::put(self.canceled_payout);
 			SlashRewardFraction::<T>::put(self.slash_reward_fraction);
-			StorageVersion::<T>::put(Releases::V6_0_0);
+			StorageVersion::<T>::put(Releases::V7_0_0);
 			MinNominatorBond::<T>::put(self.min_nominator_bond);
 			MinValidatorBond::<T>::put(self.min_validator_bond);
 

From 5af705202e1cf162df9c3565cdc239e1ff1adb17 Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Tue, 6 Jul 2021 11:51:20 +0200
Subject: [PATCH 0955/1194] Remove debug assertion (#9283)

---
 client/state-db/src/noncanonical.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/state-db/src/noncanonical.rs b/client/state-db/src/noncanonical.rs
index 1a680b16ffbe..de6d1bfcf8bb 100644
--- a/client/state-db/src/noncanonical.rs
+++ b/client/state-db/src/noncanonical.rs
@@ -524,7 +524,8 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 	/// Pin state values in memory
 	pub fn pin(&mut self, hash: &BlockHash) {
 		if self.pending_insertions.contains(hash) {
-			debug_assert!(false, "Trying to pin pending state");
+			// Pinning pending state is not implemented. Pending states
+			// won't be pruned for quite some time anyway, so it's not a big deal.
 			return;
 		}
 		let refs = self.pinned.entry(hash.clone()).or_default();

From c95f86232e9d26e14a314c1f292501ee473db071 Mon Sep 17 00:00:00 2001
From: Leonardo Custodio <leonardo@inovatso.com.br>
Date: Tue, 6 Jul 2021 07:04:40 -0300
Subject: [PATCH 0956/1194] Removed score and compute from
 set_emergency_election_result (#9271)

* Removed score and compute from set_emergency_election_result

* Supports type incorrectly set to A

* Typo
---
 frame/election-provider-multi-phase/src/lib.rs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index 6c92f2b15718..cea42fc08b46 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -401,6 +401,8 @@ pub enum ElectionCompute {
 	Signed,
 	/// Election was computed with an unsigned submission.
 	Unsigned,
+	/// Election was computed with emergency status.
+	Emergency,
 }
 
 impl Default for ElectionCompute {
@@ -895,13 +897,19 @@ pub mod pallet {
 		#[pallet::weight(T::DbWeight::get().reads_writes(1, 1))]
 		pub fn set_emergency_election_result(
 			origin: OriginFor<T>,
-			solution: ReadySolution<T::AccountId>,
+			supports: Supports<T::AccountId>,
 		) -> DispatchResult {
 			T::ForceOrigin::ensure_origin(origin)?;
 			ensure!(Self::current_phase().is_emergency(), <Error<T>>::CallNotAllowed);
 
 			// Note: we don't `rotate_round` at this point; the next call to
 			// `ElectionProvider::elect` will succeed and take care of that.
+			
+			let solution = ReadySolution {
+				supports,
+				score: [0, 0, 0],
+				compute: ElectionCompute::Emergency,
+			};
 
 			<QueuedSolution<T>>::put(solution);
 			Ok(())

From 66187cbe143dd8f70c610e0d51ead4d5888ee5c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 6 Jul 2021 12:41:27 +0200
Subject: [PATCH 0957/1194] Add function for embedding the runtime version in a
 wasm blob (#9277)

* Add function for embedding the runtime version in a wasm blob

This function can be used to add the custom section to a wasm blob with
the runtime version in it.

* Review nitpick
---
 Cargo.lock                          |  3 ++
 client/executor/Cargo.toml          |  1 +
 client/executor/src/wasm_runtime.rs | 31 ++++++++++++++++
 primitives/version/Cargo.toml       |  4 +++
 primitives/version/src/embed.rs     | 56 +++++++++++++++++++++++++++++
 primitives/version/src/lib.rs       |  3 ++
 6 files changed, 98 insertions(+)
 create mode 100644 primitives/version/src/embed.rs

diff --git a/Cargo.lock b/Cargo.lock
index 8ca21d1d9056..9bb478d57907 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7478,6 +7478,7 @@ dependencies = [
  "sp-core",
  "sp-externalities",
  "sp-io",
+ "sp-maybe-compressed-blob",
  "sp-panic-handler",
  "sp-runtime",
  "sp-runtime-interface",
@@ -9444,10 +9445,12 @@ version = "3.0.0"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
+ "parity-wasm 0.42.2",
  "serde",
  "sp-runtime",
  "sp-std",
  "sp-version-proc-macro",
+ "thiserror",
 ]
 
 [[package]]
diff --git a/client/executor/Cargo.toml b/client/executor/Cargo.toml
index 27e90ddcc85e..1f10c65e12f9 100644
--- a/client/executor/Cargo.toml
+++ b/client/executor/Cargo.toml
@@ -46,6 +46,7 @@ substrate-test-runtime = { version = "2.0.0", path = "../../test-utils/runtime"
 sp-state-machine = { version = "0.9.0", path = "../../primitives/state-machine" }
 sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
 sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
+sp-maybe-compressed-blob = { version = "3.0.0", path = "../../primitives/maybe-compressed-blob" }
 sc-tracing = { version = "3.0.0", path = "../tracing" }
 tracing = "0.1.25"
 tracing-subscriber = "0.2.18"
diff --git a/client/executor/src/wasm_runtime.rs b/client/executor/src/wasm_runtime.rs
index d01132da180a..73540aff0800 100644
--- a/client/executor/src/wasm_runtime.rs
+++ b/client/executor/src/wasm_runtime.rs
@@ -526,4 +526,35 @@ mod tests {
 		let version = decode_version(&old_runtime_version.encode()).unwrap();
 		assert_eq!(3, version.transaction_version);
 	}
+
+	#[test]
+	fn embed_runtime_version_works() {
+		let wasm = sp_maybe_compressed_blob::decompress(
+			substrate_test_runtime::wasm_binary_unwrap(),
+			sp_maybe_compressed_blob::CODE_BLOB_BOMB_LIMIT,
+		).expect("Decompressing works");
+
+		let runtime_version = RuntimeVersion {
+			spec_name: "test_replace".into(),
+			impl_name: "test_replace".into(),
+			authoring_version: 100,
+			spec_version: 100,
+			impl_version: 100,
+			apis: sp_api::create_apis_vec!([(<dyn Core::<Block>>::ID, 3)]),
+			transaction_version: 100,
+		};
+
+		let embedded = sp_version::embed::embed_runtime_version(
+			&wasm,
+			runtime_version.clone(),
+		).expect("Embedding works");
+
+		let blob = RuntimeBlob::new(&embedded).expect("Embedded blob is valid");
+		let read_version = read_embedded_version(&blob)
+			.ok()
+			.flatten()
+			.expect("Reading embedded version works");
+
+		assert_eq!(runtime_version, read_version);
+	}
 }
diff --git a/primitives/version/Cargo.toml b/primitives/version/Cargo.toml
index b50da9e9eacf..877897c54c24 100644
--- a/primitives/version/Cargo.toml
+++ b/primitives/version/Cargo.toml
@@ -21,6 +21,8 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
 sp-std = { version = "3.0.0", default-features = false, path = "../std" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../runtime" }
 sp-version-proc-macro = { version = "3.0.0", default-features = false, path = "proc-macro" }
+parity-wasm = { version = "0.42.2", optional = true }
+thiserror = { version = "1.0.21", optional = true }
 
 [features]
 default = ["std"]
@@ -30,4 +32,6 @@ std = [
 	"codec/std",
 	"sp-std/std",
 	"sp-runtime/std",
+	"parity-wasm",
+	"thiserror",
 ]
diff --git a/primitives/version/src/embed.rs b/primitives/version/src/embed.rs
new file mode 100644
index 000000000000..f32bc73d883a
--- /dev/null
+++ b/primitives/version/src/embed.rs
@@ -0,0 +1,56 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Provides functionality to embed a [`RuntimeVersion`](crate::RuntimeVersion) as custom section
+//! into a WASM file.
+
+use codec::Encode;
+use parity_wasm::elements::{Module, deserialize_buffer, serialize};
+
+#[derive(Clone, Copy, Eq, PartialEq, Debug, thiserror::Error)]
+pub enum Error {
+	#[error("Deserializing wasm failed")]
+	Deserialize,
+	#[error("Serializing wasm failed")]
+	Serialize,
+}
+
+/// Embed the given `version` to the given `wasm` blob.
+///
+/// If there was already a runtime version embedded, this will be overwritten.
+///
+/// Returns the new WASM blob.
+pub fn embed_runtime_version(
+	wasm: &[u8],
+	mut version: crate::RuntimeVersion,
+) -> Result<Vec<u8>, Error> {
+	let mut module: Module = deserialize_buffer(wasm).map_err(|_| Error::Deserialize)?;
+
+	let apis = version.apis
+		.iter()
+		.map(Encode::encode)
+		.map(|v| v.into_iter())
+		.flatten()
+		.collect::<Vec<u8>>();
+
+	module.set_custom_section("runtime_apis", apis);
+
+	version.apis.to_mut().clear();
+	module.set_custom_section("runtime_version", version.encode());
+
+	serialize(module).map_err(|_| Error::Serialize)
+}
diff --git a/primitives/version/src/lib.rs b/primitives/version/src/lib.rs
index 15b4a128924f..aa7ae3da89d5 100644
--- a/primitives/version/src/lib.rs
+++ b/primitives/version/src/lib.rs
@@ -35,6 +35,9 @@ pub use sp_std;
 #[cfg(feature = "std")]
 use sp_runtime::{traits::Block as BlockT, generic::BlockId};
 
+#[cfg(feature = "std")]
+pub mod embed;
+
 /// An attribute that accepts a version declaration of a runtime and generates a custom wasm section
 /// with the equivalent contents.
 ///

From fdfb8b301505589dd09529709e48b857fe251980 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Tue, 6 Jul 2021 12:06:11 +0100
Subject: [PATCH 0958/1194] build: fix nix shell (#9288)

* build: fix deprecated stdenv.lib in nix shell

* build: fix libclang_path in nix shell

* build: update rust toolchain in nix shell
---
 shell.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/shell.nix b/shell.nix
index a6a8d4187cd4..73453fc66da6 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,11 +1,12 @@
 let
   mozillaOverlay =
     import (builtins.fetchGit {
-      url = "https://github.com/mozilla/nixpkgs-mozilla.git";
-      rev = "57c8084c7ef41366993909c20491e359bbb90f54";
+      # TODO: revert to upstream after https://github.com/mozilla/nixpkgs-mozilla/pull/250
+      url = "https://github.com/andresilva/nixpkgs-mozilla.git";
+      rev = "7626aca57c20f3f6ee28cce8657147d9b358ea18";
     });
   nixpkgs = import <nixpkgs> { overlays = [ mozillaOverlay ]; };
-  rust-nightly = with nixpkgs; ((rustChannelOf { date = "2021-03-01"; channel = "nightly"; }).rust.override {
+  rust-nightly = with nixpkgs; ((rustChannelOf { date = "2021-07-06"; channel = "nightly"; }).rust.override {
     targets = [ "wasm32-unknown-unknown" ];
   });
 in
@@ -14,11 +15,11 @@ with nixpkgs; pkgs.mkShell {
     clang
     pkg-config
     rust-nightly
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.Security
   ];
 
-  LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
+  LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
   PROTOC = "${protobuf}/bin/protoc";
   ROCKSDB_LIB_DIR = "${rocksdb}/lib";
 }

From bf43f7420a8548f10a010e61ffab52dabadb4272 Mon Sep 17 00:00:00 2001
From: Shinsaku Ashizawa <39494661+NoCtrlZ@users.noreply.github.com>
Date: Tue, 6 Jul 2021 22:56:37 +0900
Subject: [PATCH 0959/1194] change reference module to pallet (#9281)

* change reference module to pallet

* fix inner doc

Co-authored-by: thiolliere <gui.thiolliere@gmail.com>
---
 frame/assets/README.md  | 2 +-
 frame/assets/src/lib.rs | 6 +++---
 frame/aura/README.md    | 2 +-
 frame/system/README.md  | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/frame/assets/README.md b/frame/assets/README.md
index 2a62a457943f..a99b60fa33d5 100644
--- a/frame/assets/README.md
+++ b/frame/assets/README.md
@@ -51,7 +51,7 @@ Please refer to the [`Call`](https://docs.rs/pallet-assets/latest/pallet_assets/
 * `balance` - Get the asset `id` balance of `who`.
 * `total_supply` - Get the total supply of an asset `id`.
 
-Please refer to the [`Module`](https://docs.rs/pallet-assets/latest/pallet_assets/struct.Module.html) struct for details on publicly available functions.
+Please refer to the [`Pallet`](https://docs.rs/pallet-assets/latest/pallet_assets/pallet/struct.Pallet.html) struct for details on publicly available functions.
 
 ## Usage
 
diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index 44ecbe98a017..d901f82701bf 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! # Assets Module
+//! # Assets Pallet
 //!
 //! A simple, secure module for dealing with fungible assets.
 //!
@@ -104,7 +104,7 @@
 //! * `set_team`: Changes an asset class's Admin, Freezer and Issuer; called by the asset class's
 //!   Owner.
 //!
-//! Please refer to the [`Call`](./enum.Call.html) enum and its associated variants for documentation on each function.
+//! Please refer to the [`Call`] enum and its associated variants for documentation on each function.
 //!
 //! ### Public Functions
 //! <!-- Original author of descriptions: @gavofyork -->
@@ -112,7 +112,7 @@
 //! * `balance` - Get the asset `id` balance of `who`.
 //! * `total_supply` - Get the total supply of an asset `id`.
 //!
-//! Please refer to the [`Module`](./struct.Module.html) struct for details on publicly available functions.
+//! Please refer to the [`Pallet`] struct for details on publicly available functions.
 //!
 //! ## Related Modules
 //!
diff --git a/frame/aura/README.md b/frame/aura/README.md
index 89ea5010a887..263f158d7906 100644
--- a/frame/aura/README.md
+++ b/frame/aura/README.md
@@ -1,7 +1,7 @@
 # Aura Module
 
 - [`aura::Config`](https://docs.rs/pallet-aura/latest/pallet_aura/pallet/trait.Config.html)
-- [`Module`](https://docs.rs/pallet-aura/latest/pallet_aura/struct.Module.html)
+- [`Pallet`](https://docs.rs/pallet-aura/latest/pallet_aura/pallet/struct.Pallet.html)
 
 ## Overview
 
diff --git a/frame/system/README.md b/frame/system/README.md
index bc7198d2c929..6766c3d73f4d 100644
--- a/frame/system/README.md
+++ b/frame/system/README.md
@@ -8,7 +8,7 @@ It acts as the base layer for other pallets to interact with the Substrate frame
 ## Overview
 
 The System module defines the core data types used in a Substrate runtime.
-It also provides several utility functions (see [`Module`](https://docs.rs/frame-system/latest/frame_system/struct.Module.html)) for other FRAME pallets.
+It also provides several utility functions (see [`Pallet`](https://docs.rs/frame-system/latest/frame_system/pallet/struct.Pallet.html)) for other FRAME pallets.
 
 In addition, it manages the storage items for extrinsics data, indexes, event records, and digest items,
 among other things that support the execution of the current block.
@@ -24,7 +24,7 @@ The System module does not implement any dispatchable functions.
 
 ### Public Functions
 
-See the [`Module`](https://docs.rs/frame-system/latest/frame_system/struct.Module.html) struct for details of publicly available functions.
+See the [`Pallet`](https://docs.rs/frame-system/latest/frame_system/pallet/struct.Pallet.html) struct for details of publicly available functions.
 
 ### Signed Extensions
 

From 999b3aff31d6d5c0c7d97fb99b0a12dc1d3bd4cd Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Tue, 6 Jul 2021 16:14:30 +0200
Subject: [PATCH 0960/1194] fix link (#9289)

---
 frame/support/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index b1296a2bd01d..4134c7302a4c 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -1396,7 +1396,7 @@ pub mod pallet_prelude {
 /// ```
 ///
 /// This require all storage to implement the trait [`traits::StorageInfoTrait`], thus all keys
-/// and value types must bound [`traits::MaxEncodedLen`].
+/// and value types must bound [`pallet_prelude::MaxEncodedLen`].
 ///
 /// ### Macro expansion:
 ///

From 94803c7a5c9db2679a7920eaef8144d677d9f3e7 Mon Sep 17 00:00:00 2001
From: Squirrel <gilescope@gmail.com>
Date: Tue, 6 Jul 2021 18:05:10 +0100
Subject: [PATCH 0961/1194] Docs only changes (#9258)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Docs changes to improve clarity

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
---
 client/transaction-pool/README.md               | 17 ++++++++++-------
 client/transaction-pool/graph/src/ready.rs      |  6 ++++--
 client/transaction-pool/graph/src/watcher.rs    |  3 ++-
 primitives/transaction-storage-proof/README.md  |  6 ++++--
 primitives/transaction-storage-proof/src/lib.rs | 15 +++++++++++----
 5 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/client/transaction-pool/README.md b/client/transaction-pool/README.md
index 28846fdbb38f..e4f8ccb3d810 100644
--- a/client/transaction-pool/README.md
+++ b/client/transaction-pool/README.md
@@ -79,12 +79,15 @@ Field-specific rules are described below.
 ### `requires` / `provides`
 
 These two fields contain a set of `TransactionTag`s (opaque blobs) associated with
-given transaction. Looking at these fields we can find dependencies between
-transactions and their readiness for block inclusion.
+a given transaction. This is a mechanism for the runtime to be able to
+express dependencies between transactions (that this transaction pool can take
+account of). By looking at these fields we can establish a transaction's readiness
+for block inclusion.
 
 The `provides` set contains properties that will be *satisfied* in case the transaction
-is successfully added to a block. `requires` contains properties that must be satisfied
-**before** the transaction can be included to a block.
+is successfully added to a block. Only a transaction in a block may provide a specific
+tag. `requires` contains properties that must be satisfied **before** the transaction
+can be included to a block.
 
 Note that a transaction with empty `requires` set can be added to a block immediately,
 there are no other transactions that it expects to be included before.
@@ -131,7 +134,7 @@ Transaction priority describes importance of the transaction relative to other t
 in the pool. Block authors can expect benefiting from including such transactions
 before others.
 
-Note that we can't simply order transactions in the pool by `priority`, cause first
+Note that we can't simply order transactions in the pool by `priority`, because first
 we need to make sure that all of the transaction requirements are satisfied (see
 `requires/provides` section). However if we consider a set of transactions
 which all have their requirements (tags) satisfied, the block author should be
@@ -234,7 +237,7 @@ feasible, so the actual implementation might need to take some shortcuts.
 ## Suggestions & caveats
 
 1. The validity of transaction should not change significantly from block to
-   block. I.e. changes in validity should happen predicatably, e.g. `longevity`
+   block. I.e. changes in validity should happen predictably, e.g. `longevity`
    decrements by 1, `priority` stays the same, `requires` changes if transaction
    that provided a tag was included in block. `provides` does not change, etc.
 
@@ -360,5 +363,5 @@ queue and attempted to be re-imported by the background task in the future.
 
 Runtime calls to verify transactions are performed from a separate (limited)
 thread pool to avoid interferring too much with other subsystems of the node. We
-definitely don't want to have all cores validating network transactions, cause
+definitely don't want to have all cores validating network transactions, because
 all of these transactions need to be considered untrusted (potentially DoS).
diff --git a/client/transaction-pool/graph/src/ready.rs b/client/transaction-pool/graph/src/ready.rs
index ba6ca97dc675..7b42033f9b50 100644
--- a/client/transaction-pool/graph/src/ready.rs
+++ b/client/transaction-pool/graph/src/ready.rs
@@ -108,11 +108,13 @@ Hence every hash retrieved from `provided_tags` is always present in `ready`;
 qed
 "#;
 
+/// Validated transactions that are block ready with all their dependencies met.
 #[derive(Debug, parity_util_mem::MallocSizeOf)]
 pub struct ReadyTransactions<Hash: hash::Hash + Eq, Ex> {
-	/// Insertion id
+	/// Next free insertion id (used to indicate when a transaction was inserted into the pool).
 	insertion_id: u64,
 	/// tags that are provided by Ready transactions
+	/// (only a single transaction can provide a specific tag)
 	provided_tags: HashMap<Tag, Hash>,
 	/// Transactions that are ready (i.e. don't have any requirements external to the pool)
 	ready: TrackedMap<Hash, ReadyTx<Hash, Ex>>,
@@ -235,7 +237,7 @@ impl<Hash: hash::Hash + Member + Serialize, Ex> ReadyTransactions<Hash, Ex> {
 			.fold(None, f)
 	}
 
-	/// Returns true if given hash is part of the queue.
+	/// Returns true if given transaction is part of the queue.
 	pub fn contains(&self, hash: &Hash) -> bool {
 		self.ready.read().contains_key(hash)
 	}
diff --git a/client/transaction-pool/graph/src/watcher.rs b/client/transaction-pool/graph/src/watcher.rs
index 6f8eb7c6e566..b93fe3154319 100644
--- a/client/transaction-pool/graph/src/watcher.rs
+++ b/client/transaction-pool/graph/src/watcher.rs
@@ -24,10 +24,11 @@ use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedSender, TracingUnbounded
 
 /// Extrinsic watcher.
 ///
-/// Represents a stream of status updates for particular extrinsic.
+/// Represents a stream of status updates for a particular extrinsic.
 #[derive(Debug)]
 pub struct Watcher<H, BH> {
 	receiver: TracingUnboundedReceiver<TransactionStatus<H, BH>>,
+	/// transaction hash of watched extrinsic
 	hash: H,
 }
 
diff --git a/primitives/transaction-storage-proof/README.md b/primitives/transaction-storage-proof/README.md
index 1aa1805cfc5e..4a93e1d41fa3 100644
--- a/primitives/transaction-storage-proof/README.md
+++ b/primitives/transaction-storage-proof/README.md
@@ -1,3 +1,5 @@
-Authorship Primitives
+Transaction Storage Proof Primitives
 
-License: Apache-2.0
\ No newline at end of file
+Contains types and basic code to extract storage proofs for indexed transactions.
+
+License: Apache-2.0
diff --git a/primitives/transaction-storage-proof/src/lib.rs b/primitives/transaction-storage-proof/src/lib.rs
index 825de27b2a5a..0deee8691ff8 100644
--- a/primitives/transaction-storage-proof/src/lib.rs
+++ b/primitives/transaction-storage-proof/src/lib.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Storge proof primitives. Constains types and basic code to extract storage
+//! Storage proof primitives. Constains types and basic code to extract storage
 //! proofs for indexed transactions.
 
 #![cfg_attr(not(feature = "std"), no_std)]
@@ -49,6 +49,8 @@ impl IsFatalError for InherentError {
 	}
 }
 
+/// Holds a chunk of data retrieved from storage along with
+/// a proof that the data was stored at that location in the trie.
 #[derive(Encode, Decode, Clone, PartialEq, Debug)]
 pub struct TransactionStorageProof {
 	/// Data chunk that is proved to exist.
@@ -108,7 +110,7 @@ impl sp_inherents::InherentDataProvider for InherentDataProvider {
 	}
 }
 
-/// An utility function to extract chunk index from the source of randomness.
+/// A utility function to extract a chunk index from the source of randomness.
 pub fn random_chunk(random_hash: &[u8], total_chunks: u32) -> u32 {
 	let mut buf = [0u8; 8];
 	buf.copy_from_slice(&random_hash[0..8]);
@@ -116,18 +118,24 @@ pub fn random_chunk(random_hash: &[u8], total_chunks: u32) -> u32 {
 	(random_u64 % total_chunks as u64) as u32
 }
 
-/// An utility function to enocde transaction index as trie key.
+/// A utility function to encode transaction index as trie key.
 pub fn encode_index(input: u32) -> Vec<u8> {
 	codec::Encode::encode(&codec::Compact(input))
 }
 
 /// An interface to request indexed data from the client.
 pub trait IndexedBody<B: BlockT> {
+	/// Get all indexed transactions for a block,
+	/// including renewed transactions.
+	///
+	/// Note that this will only fetch transactions
+	/// that are indexed by the runtime with `storage_index_transaction`.
 	fn block_indexed_body(
 		&self,
 		number: NumberFor<B>,
 	) -> Result<Option<Vec<Vec<u8>>>, Error>;
 
+	/// Get block number for a block hash.
 	fn number(
 		&self,
 		hash: B::Hash,
@@ -237,4 +245,3 @@ pub mod registration {
 		).unwrap();
 	}
 }
-

From 6944c0c9004b020d7f5d1d143afeceb753dfe3d7 Mon Sep 17 00:00:00 2001
From: Yang Zhou <yzhou@weicasts.com>
Date: Wed, 7 Jul 2021 02:21:45 +0800
Subject: [PATCH 0962/1194] add heiko, parallel to ss58 registry (#9254)

---
 primitives/core/src/crypto.rs |  4 ++++
 ss58-registry.json            | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index a4dc7f6baa46..7f8aecebbc6d 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -589,6 +589,10 @@ ss58_address_format!(
 		(99, "polkafoundry", "PolkaFoundry Network, standard account (*25519).")
   OriginTrailAccount =>
 		(101, "origintrail-parachain", "OriginTrail Parachain, ethereumm account (ECDSA).")
+	HeikoAccount =>
+		(110, "heiko", "Heiko, session key (*25519).")
+	ParallelAccount =>
+		(172, "parallel", "Parallel, session key (*25519).")
 	SocialAccount =>
 		(252, "social-network", "Social Network, standard account (*25519).")
 	Moonbeam =>
diff --git a/ss58-registry.json b/ss58-registry.json
index 6d23cbce90f9..50cda1905946 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -532,6 +532,15 @@
 			"standardAccount": "secp256k1",
 			"website": "https://origintrail.io"
 		},
+		{
+			"prefix": 110,
+			"network": "heiko",
+			"displayName": "Heiko",
+			"symbols": ["HKO"],
+			"decimals": [12],
+			"standardAccount": "*25519",
+			"website": "https://parallel.fi/"
+		},
 		{
 			"prefix": 136,
 			"network": "altair",
@@ -541,6 +550,15 @@
 			"standardAccount": "*25519",
 			"website": "https://centrifuge.io/"
 		},
+		{
+			"prefix": 172,
+			"network": "parallel",
+			"displayName": "Parallel",
+			"symbols": ["PARA"],
+			"decimals": [12],
+			"standardAccount": "*25519",
+			"website": "https://parallel.fi/"
+		},
 		{
 			"prefix": 252,
 			"network": "social-network",

From dff9dc6d65b4558444c357c5be884ad3a4d863a9 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Wed, 7 Jul 2021 07:31:20 +0200
Subject: [PATCH 0963/1194] clean up staking docs, remove EraElectionStatus
 references (#9287)

---
 frame/staking/src/lib.rs | 97 +++-------------------------------------
 1 file changed, 7 insertions(+), 90 deletions(-)

diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 595255a40e0a..5fe02212c650 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -1447,7 +1447,6 @@ pub mod pallet {
 		/// The dispatch origin for this call must be _Signed_ by the stash account.
 		///
 		/// Emits `Bonded`.
-		///
 		/// # <weight>
 		/// - Independent of the arguments. Moderate complexity.
 		/// - O(1).
@@ -1456,10 +1455,6 @@ pub mod pallet {
 		/// NOTE: Two of the storage writes (`Self::bonded`, `Self::payee`) are _never_ cleaned
 		/// unless the `origin` falls below _existential deposit_ and gets removed as dust.
 		/// ------------------
-		/// Weight: O(1)
-		/// DB Weight:
-		/// - Read: Bonded, Ledger, [Origin Account], Current Era, History Depth, Locks
-		/// - Write: Bonded, Payee, [Origin Account], Locks, Ledger
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::bond())]
 		pub fn bond(
@@ -1513,23 +1508,17 @@ pub mod pallet {
 		/// Add some extra amount that have appeared in the stash `free_balance` into the balance up
 		/// for staking.
 		///
+		/// The dispatch origin for this call must be _Signed_ by the stash, not the controller.
+		///
 		/// Use this if there are additional funds in your stash account that you wish to bond.
 		/// Unlike [`bond`] or [`unbond`] this function does not impose any limitation on the amount
 		/// that can be added.
 		///
-		/// The dispatch origin for this call must be _Signed_ by the stash, not the controller and
-		/// it can be only called when [`EraElectionStatus`] is `Closed`.
-		///
 		/// Emits `Bonded`.
 		///
 		/// # <weight>
 		/// - Independent of the arguments. Insignificant complexity.
 		/// - O(1).
-		/// - One DB entry.
-		/// ------------
-		/// DB Weight:
-		/// - Read: Era Election Status, Bonded, Ledger, [Origin Account], Locks
-		/// - Write: [Origin Account], Locks, Ledger
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::bond_extra())]
 		pub fn bond_extra(
@@ -1559,6 +1548,8 @@ pub mod pallet {
 		/// period ends. If this leaves an amount actively bonded less than
 		/// T::Currency::minimum_balance(), then it is increased to the full amount.
 		///
+		/// The dispatch origin for this call must be _Signed_ by the controller, not the stash.
+		///
 		/// Once the unlock period is done, you can call `withdraw_unbonded` to actually move
 		/// the funds out of management ready for transfer.
 		///
@@ -1569,27 +1560,9 @@ pub mod pallet {
 		/// If a user encounters the `InsufficientBond` error when calling this extrinsic,
 		/// they should call `chill` first in order to free up their bonded funds.
 		///
-		/// The dispatch origin for this call must be _Signed_ by the controller, not the stash.
-		/// And, it can be only called when [`EraElectionStatus`] is `Closed`.
-		///
 		/// Emits `Unbonded`.
 		///
 		/// See also [`Call::withdraw_unbonded`].
-		///
-		/// # <weight>
-		/// - Independent of the arguments. Limited but potentially exploitable complexity.
-		/// - Contains a limited number of reads.
-		/// - Each call (requires the remainder of the bonded balance to be above `minimum_balance`)
-		///   will cause a new entry to be inserted into a vector (`Ledger.unlocking`) kept in storage.
-		///   The only way to clean the aforementioned storage item is also user-controlled via
-		///   `withdraw_unbonded`.
-		/// - One DB entry.
-		/// ----------
-		/// Weight: O(1)
-		/// DB Weight:
-		/// - Read: EraElectionStatus, Ledger, CurrentEra, Locks, BalanceOf Stash,
-		/// - Write: Locks, Ledger, BalanceOf Stash,
-		/// </weight>
 		#[pallet::weight(T::WeightInfo::unbond())]
 		pub fn unbond(origin: OriginFor<T>, #[pallet::compact] value: BalanceOf<T>) -> DispatchResult {
 			let controller = ensure_signed(origin)?;
@@ -1636,30 +1609,14 @@ pub mod pallet {
 		/// This essentially frees up that balance to be used by the stash account to do
 		/// whatever it wants.
 		///
-		/// The dispatch origin for this call must be _Signed_ by the controller, not the stash.
-		/// And, it can be only called when [`EraElectionStatus`] is `Closed`.
+		/// The dispatch origin for this call must be _Signed_ by the controller.
 		///
 		/// Emits `Withdrawn`.
 		///
 		/// See also [`Call::unbond`].
 		///
 		/// # <weight>
-		/// - Could be dependent on the `origin` argument and how much `unlocking` chunks exist.
-		///  It implies `consolidate_unlocked` which loops over `Ledger.unlocking`, which is
-		///  indirectly user-controlled. See [`unbond`] for more detail.
-		/// - Contains a limited number of reads, yet the size of which could be large based on `ledger`.
-		/// - Writes are limited to the `origin` account key.
-		/// ---------------
 		/// Complexity O(S) where S is the number of slashing spans to remove
-		/// Update:
-		/// - Reads: EraElectionStatus, Ledger, Current Era, Locks, [Origin Account]
-		/// - Writes: [Origin Account], Locks, Ledger
-		/// Kill:
-		/// - Reads: EraElectionStatus, Ledger, Current Era, Bonded, Slashing Spans, [Origin
-		///   Account], Locks, BalanceOf stash
-		/// - Writes: Bonded, Slashing Spans (if S > 0), Ledger, Payee, Validators, Nominators,
-		///   [Origin Account], Locks, BalanceOf stash.
-		/// - Writes Each: SpanSlash * S
 		/// NOTE: Weight annotation is the kill scenario, we refund otherwise.
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::withdraw_unbonded_kill(*num_slashing_spans))]
@@ -1707,18 +1664,6 @@ pub mod pallet {
 		/// Effects will be felt at the beginning of the next era.
 		///
 		/// The dispatch origin for this call must be _Signed_ by the controller, not the stash.
-		/// And, it can be only called when [`EraElectionStatus`] is `Closed`.
-		///
-		/// # <weight>
-		/// - Independent of the arguments. Insignificant complexity.
-		/// - Contains a limited number of reads.
-		/// - Writes are limited to the `origin` account key.
-		/// -----------
-		/// Weight: O(1)
-		/// DB Weight:
-		/// - Read: Era Election Status, Ledger
-		/// - Write: Nominators, Validators
-		/// # </weight>
 		#[pallet::weight(T::WeightInfo::validate())]
 		pub fn validate(origin: OriginFor<T>, prefs: ValidatorPrefs) -> DispatchResult {
 			let controller = ensure_signed(origin)?;
@@ -1743,22 +1688,14 @@ pub mod pallet {
 
 		/// Declare the desire to nominate `targets` for the origin controller.
 		///
-		/// Effects will be felt at the beginning of the next era. This can only be called when
-		/// [`EraElectionStatus`] is `Closed`.
+		/// Effects will be felt at the beginning of the next era.
 		///
 		/// The dispatch origin for this call must be _Signed_ by the controller, not the stash.
-		/// And, it can be only called when [`EraElectionStatus`] is `Closed`.
 		///
 		/// # <weight>
 		/// - The transaction's complexity is proportional to the size of `targets` (N)
 		/// which is capped at CompactAssignments::LIMIT (MAX_NOMINATIONS).
 		/// - Both the reads and writes follow a similar pattern.
-		/// ---------
-		/// Weight: O(N)
-		/// where N is the number of targets
-		/// DB Weight:
-		/// - Reads: Era Election Status, Ledger, Current Era
-		/// - Writes: Validators, Nominators
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::nominate(targets.len() as u32))]
 		pub fn nominate(
@@ -1811,17 +1748,11 @@ pub mod pallet {
 		/// Effects will be felt at the beginning of the next era.
 		///
 		/// The dispatch origin for this call must be _Signed_ by the controller, not the stash.
-		/// And, it can be only called when [`EraElectionStatus`] is `Closed`.
 		///
 		/// # <weight>
 		/// - Independent of the arguments. Insignificant complexity.
 		/// - Contains one read.
 		/// - Writes are limited to the `origin` account key.
-		/// --------
-		/// Weight: O(1)
-		/// DB Weight:
-		/// - Read: EraElectionStatus, Ledger
-		/// - Write: Validators, Nominators
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::chill())]
 		pub fn chill(origin: OriginFor<T>) -> DispatchResult {
@@ -2100,8 +2031,6 @@ pub mod pallet {
 		/// The origin of this call must be _Signed_. Any account can call this function, even if
 		/// it is not one of the stakers.
 		///
-		/// This can only be called when [`EraElectionStatus`] is `Closed`.
-		///
 		/// # <weight>
 		/// - Time complexity: at most O(MaxNominatorRewardedPerValidator).
 		/// - Contains a limited number of reads and writes.
@@ -2110,11 +2039,6 @@ pub mod pallet {
 		/// Weight:
 		/// - Reward Destination Staked: O(N)
 		/// - Reward Destination Controller (Creating): O(N)
-		/// DB Weight:
-		/// - Read: EraElectionStatus, CurrentEra, HistoryDepth, ErasValidatorReward,
-		///         ErasStakersClipped, ErasRewardPoints, ErasValidatorPrefs (8 items)
-		/// - Read Each: Bonded, Ledger, Payee, Locks, System Account (5 items)
-		/// - Write Each: System Account, Locks, Ledger (3 items)
 		///
 		///   NOTE: weights are assuming that payouts are made to alive stash account (Staked).
 		///   Paying even a dead controller is cheaper weight-wise. We don't do any refunds here.
@@ -2131,17 +2055,12 @@ pub mod pallet {
 
 		/// Rebond a portion of the stash scheduled to be unlocked.
 		///
-		/// The dispatch origin must be signed by the controller, and it can be only called when
-		/// [`EraElectionStatus`] is `Closed`.
+		/// The dispatch origin must be signed by the controller.
 		///
 		/// # <weight>
 		/// - Time complexity: O(L), where L is unlocking chunks
 		/// - Bounded by `MAX_UNLOCKING_CHUNKS`.
 		/// - Storage changes: Can't increase storage, only decrease it.
-		/// ---------------
-		/// - DB Weight:
-		///     - Reads: EraElectionStatus, Ledger, Locks, [Origin Account]
-		///     - Writes: [Origin Account], Locks, Ledger
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::rebond(MAX_UNLOCKING_CHUNKS as u32))]
 		pub fn rebond(
@@ -2238,8 +2157,6 @@ pub mod pallet {
 		/// Effects will be felt at the beginning of the next era.
 		///
 		/// The dispatch origin for this call must be _Signed_ by the controller, not the stash.
-		/// And, it can be only called when [`EraElectionStatus`] is `Closed`. The controller
-		/// account should represent a validator.
 		///
 		/// - `who`: A list of nominator stash accounts who are nominating this validator which
 		///   should no longer be nominating this validator.

From 933e9c53a0e9064f2bf80508d60b16d99e3e3bd0 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Wed, 7 Jul 2021 07:32:57 +0200
Subject: [PATCH 0964/1194] Allow the allocator to track the heap changes.
 (#9291)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Allow the allocator to track the heap changes.

* fix build

* review comments

* Update client/allocator/Cargo.toml

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/allocator/Cargo.toml

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 client/allocator/Cargo.toml                   |  3 +-
 client/allocator/src/freeing_bump.rs          | 55 ++++++++++++++-----
 .../executor/wasmtime/src/instance_wrapper.rs |  2 +-
 3 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/client/allocator/Cargo.toml b/client/allocator/Cargo.toml
index e2fc69e26db1..4911e47dfd7a 100644
--- a/client/allocator/Cargo.toml
+++ b/client/allocator/Cargo.toml
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 sp-std = { version = "3.0.0", path = "../../primitives/std", default-features = false }
 sp-core = { version = "3.0.0", path = "../../primitives/core", default-features = false }
 sp-wasm-interface = { version = "3.0.0", path = "../../primitives/wasm-interface", default-features = false }
-log = { version = "0.4.11", optional = true }
+log = "0.4.11"
 thiserror = { version = "1.0.21" }
 
 [features]
@@ -26,5 +26,4 @@ std = [
 	"sp-std/std",
 	"sp-core/std",
 	"sp-wasm-interface/std",
-	"log",
 ]
diff --git a/client/allocator/src/freeing_bump.rs b/client/allocator/src/freeing_bump.rs
index 3e9b0c979036..1fc6dc31f752 100644
--- a/client/allocator/src/freeing_bump.rs
+++ b/client/allocator/src/freeing_bump.rs
@@ -85,16 +85,7 @@ fn error(msg: &'static str) -> Error {
 	Error::Other(msg)
 }
 
-/// A custom "trace" implementation that is only activated when `feature = std`.
-///
-/// Uses `wasm-heap` as default target.
-macro_rules! trace {
-	( $( $args:expr ),+ ) => {
-		sp_std::if_std! {
-			log::trace!(target: "wasm-heap", $( $args ),+);
-		}
-	}
-}
+const LOG_TARGET: &'static str = "wasm-heap";
 
 // The minimum possible allocation size is chosen to be 8 bytes because in that case we would have
 // easier time to provide the guaranteed alignment of 8.
@@ -146,6 +137,7 @@ impl Order {
 	/// `MIN_POSSIBLE_ALLOCATION <= size <= MAX_POSSIBLE_ALLOCATION`
 	fn from_size(size: u32) -> Result<Self, Error> {
 		let clamped_size = if size > MAX_POSSIBLE_ALLOCATION {
+			log::warn!(target: LOG_TARGET, "going to fail due to allocating {:?}", size);
 			return Err(Error::RequestedAllocationTooLarge);
 		} else if size < MIN_POSSIBLE_ALLOCATION {
 			MIN_POSSIBLE_ALLOCATION
@@ -331,6 +323,19 @@ pub struct FreeingBumpHeapAllocator {
 	free_lists: FreeLists,
 	total_size: u32,
 	poisoned: bool,
+	max_total_size: u32,
+	max_bumper: u32,
+}
+
+impl Drop for FreeingBumpHeapAllocator {
+	fn drop(&mut self) {
+		log::debug!(
+			target: LOG_TARGET,
+			"allocator being destroyed, max_total_size {}, max_bumper {}",
+			self.max_total_size,
+			self.max_bumper,
+		)
+	}
 }
 
 impl FreeingBumpHeapAllocator {
@@ -347,6 +352,8 @@ impl FreeingBumpHeapAllocator {
 			free_lists: FreeLists::new(),
 			total_size: 0,
 			poisoned: false,
+			max_total_size: 0,
+			max_bumper: aligned_heap_base,
 		}
 	}
 
@@ -404,7 +411,21 @@ impl FreeingBumpHeapAllocator {
 		Header::Occupied(order).write_into(mem, header_ptr)?;
 
 		self.total_size += order.size() + HEADER_SIZE;
-		trace!("Heap size is {} bytes after allocation", self.total_size);
+
+		log::trace!(
+			target: LOG_TARGET,
+			"after allocation, total_size = {}, bumper = {}.",
+			self.total_size,
+			self.bumper,
+		);
+
+		// update trackers if needed.
+		if self.total_size > self.max_total_size {
+			self.max_total_size = self.total_size;
+		}
+		if self.bumper > self.max_bumper {
+			self.max_bumper = self.bumper;
+		}
 
 		bomb.disarm();
 		Ok(Pointer::new(header_ptr + HEADER_SIZE))
@@ -442,7 +463,11 @@ impl FreeingBumpHeapAllocator {
 			.total_size
 			.checked_sub(order.size() + HEADER_SIZE)
 			.ok_or_else(|| error("Unable to subtract from total heap size without overflow"))?;
-		trace!("Heap size is {} bytes after deallocation", self.total_size);
+		log::trace!(
+			"after deallocation, total_size = {}, bumper = {}.",
+			self.total_size,
+			self.bumper,
+		);
 
 		bomb.disarm();
 		Ok(())
@@ -450,11 +475,11 @@ impl FreeingBumpHeapAllocator {
 
 	/// Increases the `bumper` by `size`.
 	///
-	/// Returns the `bumper` from before the increase.
-	/// Returns an `Error::AllocatorOutOfSpace` if the operation
-	/// would exhaust the heap.
+	/// Returns the `bumper` from before the increase. Returns an `Error::AllocatorOutOfSpace` if
+	/// the operation would exhaust the heap.
 	fn bump(bumper: &mut u32, size: u32, heap_end: u32) -> Result<u32, Error> {
 		if *bumper + size > heap_end {
+			log::error!(target: LOG_TARGET, "running out of space with current bumper {}, mem size {}", bumper, heap_end);
 			return Err(Error::AllocatorOutOfSpace);
 		}
 
diff --git a/client/executor/wasmtime/src/instance_wrapper.rs b/client/executor/wasmtime/src/instance_wrapper.rs
index 10c4926743cf..816099aee804 100644
--- a/client/executor/wasmtime/src/instance_wrapper.rs
+++ b/client/executor/wasmtime/src/instance_wrapper.rs
@@ -311,7 +311,7 @@ fn get_table(instance: &Instance) -> Option<Table> {
 		.cloned()
 }
 
-/// Functions realted to memory.
+/// Functions related to memory.
 impl InstanceWrapper {
 	/// Read data from a slice of memory into a destination buffer.
 	///

From ba727838db4d0dc9bb9a5a3fbe3994cfdf49bc11 Mon Sep 17 00:00:00 2001
From: Xiliang Chen <xlchen1291@gmail.com>
Date: Wed, 7 Jul 2021 18:25:00 +1200
Subject: [PATCH 0965/1194] move BlockNumberProvider (#9209)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* move BlockNumberProvider

* Update primitives/runtime/src/traits.rs

* Update primitives/runtime/src/traits.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 frame/system/src/lib.rs                       |  3 +--
 .../runtime/src/offchain/storage_lock.rs      | 25 +------------------
 primitives/runtime/src/traits.rs              | 23 +++++++++++++++++
 3 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index da9e5fabd3a4..e3fa45e70f7d 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -78,9 +78,8 @@ use sp_runtime::{
 		self, CheckEqual, AtLeast32Bit, Zero, Lookup, LookupError,
 		SimpleBitOps, Hash, Member, MaybeDisplay, BadOrigin,
 		MaybeSerializeDeserialize, MaybeMallocSizeOf, StaticLookup, One, Bounded,
-		Dispatchable, AtLeast32BitUnsigned, Saturating, StoredMapError,
+		Dispatchable, AtLeast32BitUnsigned, Saturating, StoredMapError, BlockNumberProvider,
 	},
-	offchain::storage_lock::BlockNumberProvider,
 };
 
 use sp_core::{ChangesTrieConfiguration, storage::well_known_keys};
diff --git a/primitives/runtime/src/offchain/storage_lock.rs b/primitives/runtime/src/offchain/storage_lock.rs
index 3189a814e06f..7ea52775c5e0 100644
--- a/primitives/runtime/src/offchain/storage_lock.rs
+++ b/primitives/runtime/src/offchain/storage_lock.rs
@@ -62,7 +62,7 @@
 //! ```
 
 use crate::offchain::storage::{StorageRetrievalError, MutateStorageError, StorageValueRef};
-use crate::traits::AtLeast32BitUnsigned;
+use crate::traits::BlockNumberProvider;
 use codec::{Codec, Decode, Encode};
 use sp_core::offchain::{Duration, Timestamp};
 use sp_io::offchain;
@@ -440,29 +440,6 @@ where
 	}
 }
 
-/// Bound for a block number source
-/// used with [`BlockAndTime<BlockNumberProvider>`](BlockAndTime).
-pub trait BlockNumberProvider {
-	/// Type of `BlockNumber` to provide.
-	type BlockNumber: Codec + Clone + Ord + Eq + AtLeast32BitUnsigned;
-	/// Returns the current block number.
-	///
-	/// Provides an abstraction over an arbitrary way of providing the
-	/// current block number.
-	///
-	/// In case of using crate `sp_runtime` without the crate `frame`
-	/// system, it is already implemented for
-	/// `frame_system::Pallet<T: Config>` as:
-	///
-	/// ```ignore
-	/// fn current_block_number() -> Self {
-	///     frame_system::Pallet<Config>::block_number()
-	/// }
-	/// ```
-	/// .
-	fn current_block_number() -> Self::BlockNumber;
-}
-
 #[cfg(test)]
 mod tests {
 	use super::*;
diff --git a/primitives/runtime/src/traits.rs b/primitives/runtime/src/traits.rs
index fac4adf48c26..f03e1be2a5ce 100644
--- a/primitives/runtime/src/traits.rs
+++ b/primitives/runtime/src/traits.rs
@@ -1459,6 +1459,29 @@ pub trait BlockIdTo<Block: self::Block> {
 	) -> Result<Option<NumberFor<Block>>, Self::Error>;
 }
 
+/// Get current block number
+pub trait BlockNumberProvider {
+	/// Type of `BlockNumber` to provide.
+	type BlockNumber: Codec + Clone + Ord + Eq + AtLeast32BitUnsigned;
+
+	/// Returns the current block number.
+	///
+	/// Provides an abstraction over an arbitrary way of providing the
+	/// current block number.
+	///
+	/// In case of using crate `sp_runtime` with the crate `frame-system`,
+	/// it is already implemented for
+	/// `frame_system::Pallet<T: Config>` as:
+	///
+	/// ```ignore
+	/// fn current_block_number() -> Self {
+	///     frame_system::Pallet<Config>::block_number()
+	/// }
+	/// ```
+	/// .
+	fn current_block_number() -> Self::BlockNumber;
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;

From 7a3a0905eb0d8211a093f52f40b7fb8f4f034f49 Mon Sep 17 00:00:00 2001
From: cheme <emericchevalier.pro@gmail.com>
Date: Wed, 7 Jul 2021 09:22:13 +0200
Subject: [PATCH 0966/1194] Paged keys rpc for child storage. (#9100)

* childstate_getKeysPaged rpc

* Rename `v` to `iter`.

* Update client/api/src/backend.rs

Co-authored-by: Alexander Popiak <alexander.popiak@gmail.com>

* Update client/api/src/backend.rs

Co-authored-by: Alexander Popiak <alexander.popiak@gmail.com>

Co-authored-by: Alexander Popiak <alexander.popiak@gmail.com>
---
 client/api/src/backend.rs             | 37 ++++++++++++++++++++++---
 client/rpc-api/src/child_state/mod.rs | 14 ++++++++++
 client/rpc/src/state/mod.rs           | 21 +++++++++++++++
 client/rpc/src/state/state_full.rs    | 25 ++++++++++++++++-
 client/rpc/src/state/state_light.rs   | 11 ++++++++
 client/service/src/client/client.rs   | 15 ++++++++++-
 client/service/test/src/client/mod.rs | 39 ++++++++++++++++++++++++---
 7 files changed, 152 insertions(+), 10 deletions(-)

diff --git a/client/api/src/backend.rs b/client/api/src/backend.rs
index 1f1ad13067b3..195fc49612ba 100644
--- a/client/api/src/backend.rs
+++ b/client/api/src/backend.rs
@@ -280,6 +280,7 @@ pub trait AuxStore {
 /// An `Iterator` that iterates keys in a given block under a prefix.
 pub struct KeyIterator<'a, State, Block> {
 	state: State,
+	child_storage: Option<ChildInfo>,
 	prefix: Option<&'a StorageKey>,
 	current_key: Vec<u8>,
 	_phantom: PhantomData<Block>,
@@ -290,6 +291,23 @@ impl <'a, State, Block> KeyIterator<'a, State, Block> {
 	pub fn new(state: State, prefix: Option<&'a StorageKey>, current_key: Vec<u8>) -> Self {
 		Self {
 			state,
+			child_storage: None,
+			prefix,
+			current_key,
+			_phantom: PhantomData,
+		}
+	}
+
+	/// Create a `KeyIterator` instance for a child storage.
+	pub fn new_child(
+		state: State,
+		child_info: ChildInfo,
+		prefix: Option<&'a StorageKey>,
+		current_key: Vec<u8>,
+	) -> Self {
+		Self {
+			state,
+			child_storage: Some(child_info),
 			prefix,
 			current_key,
 			_phantom: PhantomData,
@@ -304,10 +322,11 @@ impl<'a, State, Block> Iterator for KeyIterator<'a, State, Block> where
 	type Item = StorageKey;
 
 	fn next(&mut self) -> Option<Self::Item> {
-		let next_key = self.state
-			.next_storage_key(&self.current_key)
-			.ok()
-			.flatten()?;
+		let next_key = if let Some(child_info) = self.child_storage.as_ref() {
+			self.state.next_child_storage_key(child_info, &self.current_key)
+		} else {
+			self.state.next_storage_key(&self.current_key)
+		}.ok().flatten()?;
 		// this terminates the iterator the first time it fails.
 		if let Some(prefix) = self.prefix {
 			if !next_key.starts_with(&prefix.0[..]) {
@@ -361,6 +380,16 @@ pub trait StorageProvider<Block: BlockT, B: Backend<Block>> {
 		key_prefix: &StorageKey
 	) -> sp_blockchain::Result<Vec<StorageKey>>;
 
+	/// Given a `BlockId` and a key `prefix` and a child storage key,
+	/// return a `KeyIterator` that iterates matching storage keys in that block.
+	fn child_storage_keys_iter<'a>(
+		&self,
+		id: &BlockId<Block>,
+		child_info: ChildInfo,
+		prefix: Option<&'a StorageKey>,
+		start_key: Option<&StorageKey>
+	) -> sp_blockchain::Result<KeyIterator<'a, B::State, Block>>;
+
 	/// Given a `BlockId`, a key and a child storage key, return the hash under the key in that block.
 	fn child_storage_hash(
 		&self,
diff --git a/client/rpc-api/src/child_state/mod.rs b/client/rpc-api/src/child_state/mod.rs
index 7ab897d6174a..99990017fd82 100644
--- a/client/rpc-api/src/child_state/mod.rs
+++ b/client/rpc-api/src/child_state/mod.rs
@@ -34,6 +34,7 @@ pub trait ChildStateApi<Hash> {
 	/// RPC Metadata
 	type Metadata;
 
+	/// DEPRECATED: Please use `childstate_getKeysPaged` with proper paging support.
 	/// Returns the keys with prefix from a child storage, leave empty to get all the keys
 	#[rpc(name = "childstate_getKeys")]
 	fn storage_keys(
@@ -43,6 +44,19 @@ pub trait ChildStateApi<Hash> {
 		hash: Option<Hash>
 	) -> FutureResult<Vec<StorageKey>>;
 
+	/// Returns the keys with prefix from a child storage with pagination support.
+	/// Up to `count` keys will be returned.
+	/// If `start_key` is passed, return next keys in storage in lexicographic order.
+	#[rpc(name = "childstate_getKeysPaged", alias("childstate_getKeysPagedAt"))]
+	fn storage_keys_paged(
+		&self,
+		child_storage_key: PrefixedStorageKey,
+		prefix: Option<StorageKey>,
+		count: u32,
+		start_key: Option<StorageKey>,
+		hash: Option<Hash>,
+	) -> FutureResult<Vec<StorageKey>>;
+
 	/// Returns a child storage entry at a specific block's state.
 	#[rpc(name = "childstate_getStorage")]
 	fn storage(
diff --git a/client/rpc/src/state/mod.rs b/client/rpc/src/state/mod.rs
index ad9712a41db6..35680b0fa41d 100644
--- a/client/rpc/src/state/mod.rs
+++ b/client/rpc/src/state/mod.rs
@@ -402,6 +402,16 @@ pub trait ChildStateBackend<Block: BlockT, Client>: Send + Sync + 'static
 		prefix: StorageKey,
 	) -> FutureResult<Vec<StorageKey>>;
 
+	/// Returns the keys with prefix from a child storage with pagination support.
+	fn storage_keys_paged(
+		&self,
+		block: Option<Block::Hash>,
+		storage_key: PrefixedStorageKey,
+		prefix: Option<StorageKey>,
+		count: u32,
+		start_key: Option<StorageKey>,
+	) -> FutureResult<Vec<StorageKey>>;
+
 	/// Returns a child storage entry at a specific block's state.
 	fn storage(
 		&self,
@@ -469,6 +479,17 @@ impl<Block, Client> ChildStateApi<Block::Hash> for ChildState<Block, Client>
 		self.backend.storage_keys(block, storage_key, key_prefix)
 	}
 
+	fn storage_keys_paged(
+		&self,
+		storage_key: PrefixedStorageKey,
+		prefix: Option<StorageKey>,
+		count: u32,
+		start_key: Option<StorageKey>,
+		block: Option<Block::Hash>,
+	) -> FutureResult<Vec<StorageKey>> {
+		self.backend.storage_keys_paged(block, storage_key, prefix, count, start_key)
+	}
+
 	fn storage_hash(
 		&self,
 		storage_key: PrefixedStorageKey,
diff --git a/client/rpc/src/state/state_full.rs b/client/rpc/src/state/state_full.rs
index 218cb35f0086..58209e452e81 100644
--- a/client/rpc/src/state/state_full.rs
+++ b/client/rpc/src/state/state_full.rs
@@ -296,7 +296,7 @@ impl<BE, Block, Client> StateBackend<Block, Client> for FullState<BE, Block, Cli
 						&BlockId::Hash(block), prefix.as_ref(), start_key.as_ref()
 					)
 				)
-				.map(|v| v.take(count as usize).collect())
+				.map(|iter| iter.take(count as usize).collect())
 				.map_err(client_err)))
 	}
 
@@ -618,6 +618,29 @@ impl<BE, Block, Client> ChildStateBackend<Block, Client> for FullState<BE, Block
 				.map_err(client_err)))
 	}
 
+	fn storage_keys_paged(
+		&self,
+		block: Option<Block::Hash>,
+		storage_key: PrefixedStorageKey,
+		prefix: Option<StorageKey>,
+		count: u32,
+		start_key: Option<StorageKey>,
+	) -> FutureResult<Vec<StorageKey>> {
+		Box::new(result(
+			self.block_or_best(block)
+				.and_then(|block| {
+					let child_info = match ChildType::from_prefixed_key(&storage_key) {
+						Some((ChildType::ParentKeyId, storage_key)) => ChildInfo::new_default(storage_key),
+						None => return Err(sp_blockchain::Error::InvalidChildStorageKey),
+					};
+					self.client.child_storage_keys_iter(
+						&BlockId::Hash(block), child_info, prefix.as_ref(), start_key.as_ref(),
+					)
+				})
+				.map(|iter| iter.take(count as usize).collect())
+				.map_err(client_err)))
+	}
+
 	fn storage(
 		&self,
 		block: Option<Block::Hash>,
diff --git a/client/rpc/src/state/state_light.rs b/client/rpc/src/state/state_light.rs
index 09fefd2e02c4..a2f69df9d027 100644
--- a/client/rpc/src/state/state_light.rs
+++ b/client/rpc/src/state/state_light.rs
@@ -509,6 +509,17 @@ impl<Block, F, Client> ChildStateBackend<Block, Client> for LightState<Block, F,
 		Box::new(result(Err(client_err(ClientError::NotAvailableOnLightClient))))
 	}
 
+	fn storage_keys_paged(
+		&self,
+		_block: Option<Block::Hash>,
+		_storage_key: PrefixedStorageKey,
+		_prefix: Option<StorageKey>,
+		_count: u32,
+		_start_key: Option<StorageKey>,
+	) -> FutureResult<Vec<StorageKey>> {
+		Box::new(result(Err(client_err(ClientError::NotAvailableOnLightClient))))
+	}
+
 	fn storage(
 		&self,
 		block: Option<Block::Hash>,
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index ab5a0d9394c2..25957560f4db 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -1481,7 +1481,6 @@ impl<B, E, Block, RA> StorageProvider<Block, B> for Client<B, E, Block, RA> wher
 		Ok(keys)
 	}
 
-
 	fn storage_keys_iter<'a>(
 		&self,
 		id: &BlockId<Block>,
@@ -1496,6 +1495,20 @@ impl<B, E, Block, RA> StorageProvider<Block, B> for Client<B, E, Block, RA> wher
 		Ok(KeyIterator::new(state, prefix, start_key))
 	}
 
+	fn child_storage_keys_iter<'a>(
+		&self,
+		id: &BlockId<Block>,
+		child_info: ChildInfo,
+		prefix: Option<&'a StorageKey>,
+		start_key: Option<&StorageKey>
+	) -> sp_blockchain::Result<KeyIterator<'a, B::State, Block>> {
+		let state = self.state_at(id)?;
+		let start_key = start_key
+			.or(prefix)
+			.map(|key| key.0.clone())
+			.unwrap_or_else(Vec::new);
+		Ok(KeyIterator::new_child(state, child_info, prefix, start_key))
+	}
 
 	fn storage(
 		&self,
diff --git a/client/service/test/src/client/mod.rs b/client/service/test/src/client/mod.rs
index 9cd0e193fcd0..bdd693f57b2d 100644
--- a/client/service/test/src/client/mod.rs
+++ b/client/service/test/src/client/mod.rs
@@ -50,7 +50,7 @@ use sp_consensus::{
 	BlockOrigin, SelectChain, BlockImport, Error as ConsensusError, BlockCheckParams, ImportResult,
 	BlockStatus, BlockImportParams, ForkChoiceStrategy,
 };
-use sp_storage::StorageKey;
+use sp_storage::{StorageKey, ChildInfo};
 use sp_trie::{TrieConfiguration, trie_types::Layout};
 use sp_runtime::{generic::BlockId, DigestItem, Justifications};
 use hex_literal::hex;
@@ -1999,15 +1999,26 @@ fn imports_blocks_with_changes_tries_config_change() {
 
 #[test]
 fn storage_keys_iter_prefix_and_start_key_works() {
-	let client = substrate_test_runtime_client::new();
-
+	let child_info = ChildInfo::new_default(b"child");
+	let client = TestClientBuilder::new()
+		.add_extra_child_storage(&child_info, b"first".to_vec(), vec![0u8; 32])
+		.add_extra_child_storage(&child_info, b"second".to_vec(), vec![0u8; 32])
+		.add_extra_child_storage(&child_info, b"third".to_vec(), vec![0u8; 32])
+		.build();
+
+	let child_root = b":child_storage:default:child".to_vec();
 	let prefix = StorageKey(hex!("3a").to_vec());
+	let child_prefix = StorageKey(b"sec".to_vec());
 
 	let res: Vec<_> = client.storage_keys_iter(&BlockId::Number(0), Some(&prefix), None)
 		.unwrap()
 		.map(|x| x.0)
 		.collect();
-	assert_eq!(res, [hex!("3a636f6465").to_vec(), hex!("3a686561707061676573").to_vec()]);
+	assert_eq!(res, [
+		child_root.clone(),
+		hex!("3a636f6465").to_vec(),
+		hex!("3a686561707061676573").to_vec(),
+	]);
 
 	let res: Vec<_> = client.storage_keys_iter(&BlockId::Number(0), Some(&prefix), Some(&StorageKey(hex!("3a636f6465").to_vec())))
 		.unwrap()
@@ -2020,6 +2031,26 @@ fn storage_keys_iter_prefix_and_start_key_works() {
 		.map(|x| x.0)
 		.collect();
 	assert_eq!(res, Vec::<Vec<u8>>::new());
+
+	let res: Vec<_> = client.child_storage_keys_iter(
+		&BlockId::Number(0),
+		child_info.clone(),
+		Some(&child_prefix),
+		None,
+	).unwrap()
+		.map(|x| x.0)
+		.collect();
+	assert_eq!(res, [b"second".to_vec()]);
+
+	let res: Vec<_> = client.child_storage_keys_iter(
+		&BlockId::Number(0),
+		child_info,
+		None,
+		Some(&StorageKey(b"second".to_vec())),
+	).unwrap()
+		.map(|x| x.0)
+		.collect();
+	assert_eq!(res, [b"third".to_vec()]);
 }
 
 #[test]

From 3cd75117765c4a63d40c00aa41e1bf12135c237b Mon Sep 17 00:00:00 2001
From: Sergei Shulepov <sergei@parity.io>
Date: Wed, 7 Jul 2021 11:29:39 +0300
Subject: [PATCH 0967/1194] PVF: NaN canonicalization & deteriministic stack 
 (#9069)

* NaN canonicalization

* Introduce a simple stack depth metering

* Be explicit about the wasm features we enable

* Pull the latest latast fix for the pwasm-utils crate

* Disable `wasm_threads` as well.

* Factor out deterministic stack params

* Add more docs

* Remove redundant dep

* Refine comments

* Typo

Co-authored-by: Andronik Ordian <write@reusable.software>

Co-authored-by: Andronik Ordian <write@reusable.software>
---
 Cargo.lock                                    |   45 +-
 .../common/src/runtime_blob/runtime_blob.rs   |   19 +
 client/executor/runtime-test/src/lib.rs       |    6 +
 client/executor/src/wasm_runtime.rs           |    3 +-
 client/executor/wasmtime/Cargo.toml           |    6 +-
 client/executor/wasmtime/src/lib.rs           |    4 +
 client/executor/wasmtime/src/runtime.rs       |  127 +-
 .../wasmtime/src/test-guard-page-skip.wat     | 2293 +++++++++++++++++
 client/executor/wasmtime/src/tests.rs         |  173 ++
 9 files changed, 2610 insertions(+), 66 deletions(-)
 create mode 100644 client/executor/wasmtime/src/test-guard-page-skip.wat
 create mode 100644 client/executor/wasmtime/src/tests.rs

diff --git a/Cargo.lock b/Cargo.lock
index 9bb478d57907..0662c3da6d6a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6397,9 +6397,9 @@ dependencies = [
 
 [[package]]
 name = "pwasm-utils"
-version = "0.18.0"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0e517f47d9964362883182404b68d0b6949382c0baa40aa5ffca94f5f1e3481"
+checksum = "f0c1a2f10b47d446372a4f397c58b329aaea72b2daf9395a623a411cb8ccb54f"
 dependencies = [
  "byteorder",
  "log",
@@ -7536,13 +7536,17 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "parity-wasm 0.42.2",
+ "pwasm-utils",
  "sc-allocator",
  "sc-executor-common",
+ "sc-runtime-test",
  "scoped-tls",
  "sp-core",
+ "sp-io",
  "sp-runtime-interface",
  "sp-wasm-interface",
  "wasmtime",
+ "wat",
 ]
 
 [[package]]
@@ -8270,26 +8274,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
-[[package]]
-name = "scroll"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fda28d4b4830b807a8b43f7b0e6b5df875311b3e7621d84577188c175b6ec1ec"
-dependencies = [
- "scroll_derive",
-]
-
-[[package]]
-name = "scroll_derive"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaaae8f38bb311444cfb7f1979af0bc9240d95795f75f9ceddf6a59b79ceffa0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "sct"
 version = "0.6.0"
@@ -11070,11 +11054,9 @@ dependencies = [
  "wasmparser",
  "wasmtime-cache",
  "wasmtime-environ",
- "wasmtime-fiber",
  "wasmtime-jit",
  "wasmtime-profiling",
  "wasmtime-runtime",
- "wat",
  "winapi 0.3.9",
 ]
 
@@ -11149,17 +11131,6 @@ dependencies = [
  "wasmparser",
 ]
 
-[[package]]
-name = "wasmtime-fiber"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a089d44cd7e2465d41a53b840a5b4fca1bf6d1ecfebc970eac9592b34ea5f0b3"
-dependencies = [
- "cc",
- "libc",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "wasmtime-jit"
 version = "0.27.0"
@@ -11215,11 +11186,8 @@ checksum = "e24364d522dcd67c897c8fffc42e5bdfc57207bbb6d7eeade0da9d4a7d70105b"
 dependencies = [
  "anyhow",
  "cfg-if 1.0.0",
- "gimli 0.24.0",
  "lazy_static",
  "libc",
- "object 0.24.0",
- "scroll",
  "serde",
  "target-lexicon",
  "wasmtime-environ",
@@ -11247,7 +11215,6 @@ dependencies = [
  "region",
  "thiserror",
  "wasmtime-environ",
- "wasmtime-fiber",
  "winapi 0.3.9",
 ]
 
diff --git a/client/executor/common/src/runtime_blob/runtime_blob.rs b/client/executor/common/src/runtime_blob/runtime_blob.rs
index 82b9312dec50..e7fc15bb13e1 100644
--- a/client/executor/common/src/runtime_blob/runtime_blob.rs
+++ b/client/executor/common/src/runtime_blob/runtime_blob.rs
@@ -81,6 +81,25 @@ impl RuntimeBlob {
 		export_mutable_globals(&mut self.raw_module, "exported_internal_global");
 	}
 
+	/// Run a pass that instrument this module so as to introduce a deterministic stack height limit.
+	///
+	/// It will introduce a global mutable counter. The instrumentation will increase the counter
+	/// according to the "cost" of the callee. If the cost exceeds the `stack_depth_limit` constant,
+	/// the instrumentation will trap. The counter will be decreased as soon as the the callee returns.
+	///
+	/// The stack cost of a function is computed based on how much locals there are and the maximum
+	/// depth of the wasm operand stack.
+	pub fn inject_stack_depth_metering(self, stack_depth_limit: u32) -> Result<Self, WasmError> {
+		let injected_module =
+			pwasm_utils::stack_height::inject_limiter(self.raw_module, stack_depth_limit).map_err(
+				|e| WasmError::Other(format!("cannot inject the stack limiter: {:?}", e)),
+			)?;
+
+		Ok(Self {
+			raw_module: injected_module,
+		})
+	}
+
 	/// Perform an instrumentation that makes sure that a specific function `entry_point` is exported
 	pub fn entry_point_exists(&self, entry_point: &str) -> bool {
 		self.raw_module.export_section().map(|e| {
diff --git a/client/executor/runtime-test/src/lib.rs b/client/executor/runtime-test/src/lib.rs
index af0c9edcc32e..c37766832b46 100644
--- a/client/executor/runtime-test/src/lib.rs
+++ b/client/executor/runtime-test/src/lib.rs
@@ -109,6 +109,12 @@ sp_core::wasm_export_functions! {
 
 	fn test_exhaust_heap() -> Vec<u8> { Vec::with_capacity(16777216) }
 
+	fn test_fp_f32add(a: [u8; 4], b: [u8; 4]) -> [u8; 4] {
+		let a = f32::from_le_bytes(a);
+		let b = f32::from_le_bytes(b);
+		f32::to_le_bytes(a + b)
+	}
+
 	fn test_panic() { panic!("test panic") }
 
 	fn test_conditional_panic(input: Vec<u8>) -> Vec<u8> {
diff --git a/client/executor/src/wasm_runtime.rs b/client/executor/src/wasm_runtime.rs
index 73540aff0800..4e6febbf15b6 100644
--- a/client/executor/src/wasm_runtime.rs
+++ b/client/executor/src/wasm_runtime.rs
@@ -328,7 +328,8 @@ pub fn create_wasm_runtime_with_code(
 					cache_path: cache_path.map(ToOwned::to_owned),
 					semantics: sc_executor_wasmtime::Semantics {
 						fast_instance_reuse: true,
-						stack_depth_metering: false,
+						deterministic_stack_limit: None,
+						canonicalize_nans: false,
 					},
 				},
 				host_functions,
diff --git a/client/executor/wasmtime/Cargo.toml b/client/executor/wasmtime/Cargo.toml
index bdaae49c24d5..1b8606c440b8 100644
--- a/client/executor/wasmtime/Cargo.toml
+++ b/client/executor/wasmtime/Cargo.toml
@@ -24,7 +24,11 @@ sp-wasm-interface = { version = "3.0.0", path = "../../../primitives/wasm-interf
 sp-runtime-interface = { version = "3.0.0", path = "../../../primitives/runtime-interface" }
 sp-core = { version = "3.0.0", path = "../../../primitives/core" }
 sc-allocator = { version = "3.0.0", path = "../../allocator" }
-wasmtime = "0.27.0"
+wasmtime = { version = "0.27.0", default-features = false, features = ["cache", "parallel-compilation"] }
+pwasm-utils = { version = "0.18" }
 
 [dev-dependencies]
 assert_matches = "1.3.0"
+sc-runtime-test = { version = "2.0.0", path = "../runtime-test" }
+sp-io = { version = "3.0.0", path = "../../../primitives/io" }
+wat = "1.0"
diff --git a/client/executor/wasmtime/src/lib.rs b/client/executor/wasmtime/src/lib.rs
index 3a0c7d59f19c..74b1150f06ae 100644
--- a/client/executor/wasmtime/src/lib.rs
+++ b/client/executor/wasmtime/src/lib.rs
@@ -24,6 +24,10 @@ mod runtime;
 mod state_holder;
 mod util;
 
+#[cfg(test)]
+mod tests;
+
 pub use runtime::{
 	create_runtime, create_runtime_from_artifact, prepare_runtime_artifact, Config, Semantics,
+	DeterministicStackLimit,
 };
diff --git a/client/executor/wasmtime/src/runtime.rs b/client/executor/wasmtime/src/runtime.rs
index 021377eeb20d..8389bb087603 100644
--- a/client/executor/wasmtime/src/runtime.rs
+++ b/client/executor/wasmtime/src/runtime.rs
@@ -232,10 +232,75 @@ directory = \"{cache_dir}\"
 	Ok(())
 }
 
-fn common_config() -> wasmtime::Config {
+fn common_config(semantics: &Semantics) -> std::result::Result<wasmtime::Config, WasmError> {
 	let mut config = wasmtime::Config::new();
 	config.cranelift_opt_level(wasmtime::OptLevel::SpeedAndSize);
-	config
+	config.cranelift_nan_canonicalization(semantics.canonicalize_nans);
+
+	if let Some(DeterministicStackLimit {
+		native_stack_max, ..
+	}) = semantics.deterministic_stack_limit
+	{
+		config
+			.max_wasm_stack(native_stack_max as usize)
+			.map_err(|e| WasmError::Other(format!("cannot set max wasm stack: {}", e)))?;
+	}
+
+	// Be clear and specific about the extensions we support. If an update brings new features
+	// they should be introduced here as well.
+	config.wasm_reference_types(false);
+	config.wasm_simd(false);
+	config.wasm_bulk_memory(false);
+	config.wasm_multi_value(false);
+	config.wasm_multi_memory(false);
+	config.wasm_module_linking(false);
+	config.wasm_threads(false);
+
+	Ok(config)
+}
+
+/// Knobs for deterministic stack height limiting.
+///
+/// The WebAssembly standard defines a call/value stack but it doesn't say anything about its
+/// size except that it has to be finite. The implementations are free to choose their own notion
+/// of limit: some may count the number of calls or values, others would rely on the host machine
+/// stack and trap on reaching a guard page.
+///
+/// This obviously is a source of non-determinism during execution. This feature can be used
+/// to instrument the code so that it will count the depth of execution in some deterministic
+/// way (the machine stack limit should be so high that the deterministic limit always triggers
+/// first).
+///
+/// The deterministic stack height limiting feature allows to instrument the code so that it will
+/// count the number of items that may be on the stack. This counting will only act as an rough
+/// estimate of the actual stack limit in wasmtime. This is because wasmtime measures it's stack
+/// usage in bytes.
+///
+/// The actual number of bytes consumed by a function is not trivial to compute  without going through
+/// full compilation. Therefore, it's expected that `native_stack_max` is grealy overestimated and
+/// thus never reached in practice. The stack overflow check introduced by the instrumentation and
+/// that relies on the logical item count should be reached first.
+///
+/// See [here][stack_height] for more details of the instrumentation
+///
+/// [stack_height]: https://github.com/paritytech/wasm-utils/blob/d9432baf/src/stack_height/mod.rs#L1-L50
+pub struct DeterministicStackLimit {
+	/// A number of logical "values" that can be pushed on the wasm stack. A trap will be triggered
+	/// if exceeded.
+	///
+	/// A logical value is a local, an argument or a value pushed on operand stack.
+	pub logical_max: u32,
+	/// The maximum number of bytes for stack used by wasmtime JITed code.
+	///
+	/// It's not specified how much bytes will be consumed by a stack frame for a given wasm function
+	/// after translation into machine code. It is also not quite trivial.
+	///
+	/// Therefore, this number should be choosen conservatively. It must be so large so that it can
+	/// fit the [`logical_max`] logical values on the stack, according to the current instrumentation
+	/// algorithm.
+	///
+	/// This value cannot be 0.
+	pub native_stack_max: u32,
 }
 
 pub struct Semantics {
@@ -254,24 +319,30 @@ pub struct Semantics {
 	/// is used.
 	pub fast_instance_reuse: bool,
 
-	/// The WebAssembly standard defines a call/value stack but it doesn't say anything about its
-	/// size except that it has to be finite. The implementations are free to choose their own notion
-	/// of limit: some may count the number of calls or values, others would rely on the host machine
-	/// stack and trap on reaching a guard page.
-	///
-	/// This obviously is a source of non-determinism during execution. This feature can be used
-	/// to instrument the code so that it will count the depth of execution in some deterministic
-	/// way (the machine stack limit should be so high that the deterministic limit always triggers
-	/// first).
+	/// Specifiying `Some` will enable deterministic stack height. That is, all executor invocations
+	/// will reach stack overflow at the exactly same point across different wasmtime versions and
+	/// architectures.
 	///
-	/// See [here][stack_height] for more details of the instrumentation
+	/// This is achieved by a combination of running an instrumentation pass on input code and
+	/// configuring wasmtime accordingly.
 	///
 	/// Since this feature depends on instrumentation, it can be set only if [`CodeSupplyMode::Verbatim`]
 	/// is used.
+	pub deterministic_stack_limit: Option<DeterministicStackLimit>,
+
+	/// Controls whether wasmtime should compile floating point in a way that doesn't allow for
+	/// non-determinism.
+	///
+	/// By default, the wasm spec allows some local non-determinism wrt. certain floating point
+	/// operations. Specifically, those operations that are not defined to operate on bits (e.g. fneg)
+	/// can produce NaN values. The exact bit pattern for those is not specified and may depend
+	/// on the particular machine that executes wasmtime generated JITed machine code. That is
+	/// a source of non-deterministic values.
 	///
-	/// [stack_height]: https://github.com/paritytech/wasm-utils/blob/d9432baf/src/stack_height/mod.rs#L1-L50
-	pub stack_depth_metering: bool,
-	// Other things like nan canonicalization can be added here.
+	/// The classical runtime environment for Substrate allowed it and punted this on the runtime
+	/// developers. For PVFs, we want to ensure that execution is deterministic though. Therefore,
+	/// for PVF execution this flag is meant to be turned on.
+	pub canonicalize_nans: bool,
 }
 
 pub struct Config {
@@ -355,7 +426,7 @@ unsafe fn do_create_runtime(
 	host_functions: Vec<&'static dyn Function>,
 ) -> std::result::Result<WasmtimeRuntime, WasmError> {
 	// Create the engine, store and finally the module from the given code.
-	let mut wasmtime_config = common_config();
+	let mut wasmtime_config = common_config(&config.semantics)?;
 	if let Some(ref cache_path) = config.cache_path {
 		if let Err(reason) = setup_wasmtime_caching(cache_path, &mut wasmtime_config) {
 			log::warn!(
@@ -369,8 +440,8 @@ unsafe fn do_create_runtime(
 		.map_err(|e| WasmError::Other(format!("cannot create the engine for runtime: {}", e)))?;
 
 	let (module, snapshot_data) = match code_supply_mode {
-		CodeSupplyMode::Verbatim { mut blob } => {
-			instrument(&mut blob, &config.semantics);
+		CodeSupplyMode::Verbatim { blob } => {
+			let blob = instrument(blob, &config.semantics)?;
 
 			if config.semantics.fast_instance_reuse {
 				let data_segments_snapshot = DataSegmentsSnapshot::take(&blob).map_err(|e| {
@@ -412,25 +483,31 @@ unsafe fn do_create_runtime(
 	})
 }
 
-fn instrument(blob: &mut RuntimeBlob, semantics: &Semantics) {
+fn instrument(
+	mut blob: RuntimeBlob,
+	semantics: &Semantics,
+) -> std::result::Result<RuntimeBlob, WasmError> {
+	if let Some(DeterministicStackLimit { logical_max, .. }) = semantics.deterministic_stack_limit {
+		blob = blob.inject_stack_depth_metering(logical_max)?;
+	}
+
+	// If enabled, this should happen after all other passes that may introduce global variables.
 	if semantics.fast_instance_reuse {
 		blob.expose_mutable_globals();
 	}
 
-	if semantics.stack_depth_metering {
-		// TODO: implement deterministic stack metering https://github.com/paritytech/substrate/issues/8393
-	}
+	Ok(blob)
 }
 
 /// Takes a [`RuntimeBlob`] and precompiles it returning the serialized result of compilation. It
 /// can then be used for calling [`create_runtime`] avoiding long compilation times.
 pub fn prepare_runtime_artifact(
-	mut blob: RuntimeBlob,
+	blob: RuntimeBlob,
 	semantics: &Semantics,
 ) -> std::result::Result<Vec<u8>, WasmError> {
-	instrument(&mut blob, semantics);
+	let blob = instrument(blob, semantics)?;
 
-	let engine = Engine::new(&common_config())
+	let engine = Engine::new(&common_config(semantics)?)
 		.map_err(|e| WasmError::Other(format!("cannot create the engine: {}", e)))?;
 
 	engine
diff --git a/client/executor/wasmtime/src/test-guard-page-skip.wat b/client/executor/wasmtime/src/test-guard-page-skip.wat
new file mode 100644
index 000000000000..2f7339d45c9e
--- /dev/null
+++ b/client/executor/wasmtime/src/test-guard-page-skip.wat
@@ -0,0 +1,2293 @@
+;; This file is a modified version of
+;; https://github.com/WebAssembly/testsuite/blob/01efde81028c5b0d099eb836645a2dc5e7755449/skip-stack-guard-page.wast
+;; Licensed Apache 2.0 https://github.com/WebAssembly/testsuite/blob/01efde81028c5b0d099eb836645a2dc5e7755449/LICENSE
+
+;; This wasm module implements a Substrate Runtime with one entrypoint: `test-many-locals`. This
+;; entrypoint does not take any parameters nor returns a result. Each execution should end up with
+;; a stack overflow trap.
+;;
+;; What it does is essentially a recursive call. The function that recurses into itself declares
+;; lots of local variables. It reads into each local at the corresponding offset, recurses into itself
+;; and then writes the contents of the locals back into the memory at the same offset.
+;;
+;; The original purpose of this file in the test suite is to test skipping the guard page (hence the
+;; size 256 + 4096 + 4096). However, what's important here is to just an infinite recursion with
+;; many locals.
+;;
+;; NOTE That memory accesses are put there in an attempt to prevent eliminating the dead locals.
+;; At the moment of writing, wasmtime should be dumb enough to be tricked into thinking that the code
+;; does something.
+
+(module
+  (import "env" "memory" (memory 1))
+  (export "test-many-locals" (func $test-many-locals))
+
+  ;; The heap base is chosen so that the heap doesn't overlap with the data below.
+  (global (export "__heap_base") i32 (i32.const 8448))
+
+  (func $test-many-locals
+    (param i32 i32) (result i64)
+    (call $function-with-many-locals)
+    (i64.const 0)
+  )
+
+  (func $function-with-many-locals
+
+    ;; 1056 i64 = 8448 bytes of locals
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x000-0x007
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x008-0x00f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x010-0x017
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x018-0x01f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x020-0x027
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x028-0x02f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x030-0x037
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x038-0x03f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x040-0x047
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x048-0x04f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x050-0x057
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x058-0x05f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x060-0x067
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x068-0x06f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x070-0x077
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x078-0x07f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x080-0x087
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x088-0x08f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x090-0x097
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x098-0x09f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x0a0-0x0a7
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x0a8-0x0af
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x0b0-0x0b7
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x0b8-0x0bf
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x0c0-0x0c7
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x0c8-0x0cf
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x0d0-0x0d7
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x0d8-0x0df
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x0e0-0x0e7
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x0e8-0x0ef
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x0f0-0x0f7
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x0f8-0x0ff
+
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x100-0x107
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x108-0x10f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x110-0x117
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x118-0x11f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x120-0x127
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x128-0x12f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x130-0x137
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x138-0x13f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x140-0x147
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x148-0x14f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x150-0x157
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x158-0x15f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x160-0x167
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x168-0x16f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x170-0x177
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x178-0x17f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x180-0x187
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x188-0x18f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x190-0x197
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x198-0x19f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x1a0-0x1a7
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x1a8-0x1af
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x1b0-0x1b7
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x1b8-0x1bf
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x1c0-0x1c7
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x1c8-0x1cf
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x1d0-0x1d7
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x1d8-0x1df
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x1e0-0x1e7
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x1e8-0x1ef
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x1f0-0x1f7
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x1f8-0x1ff
+
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x200-0x207
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x208-0x20f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x210-0x217
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x218-0x21f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x220-0x227
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x228-0x22f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x230-0x237
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x238-0x23f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x240-0x247
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x248-0x24f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x250-0x257
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x258-0x25f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x260-0x267
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x268-0x26f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x270-0x277
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x278-0x27f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x280-0x287
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x288-0x28f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x290-0x297
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x298-0x29f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x2a0-0x2a7
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x2a8-0x2af
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x2b0-0x2b7
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x2b8-0x2bf
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x2c0-0x2c7
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x2c8-0x2cf
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x2d0-0x2d7
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x2d8-0x2df
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x2e0-0x2e7
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x2e8-0x2ef
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x2f0-0x2f7
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x2f8-0x2ff
+
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x300-0x307
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x308-0x30f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x310-0x317
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x318-0x31f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x320-0x327
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x328-0x32f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x330-0x337
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x338-0x33f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x340-0x347
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x348-0x34f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x350-0x357
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x358-0x35f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x360-0x367
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x368-0x36f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x370-0x377
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x378-0x37f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x380-0x387
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x388-0x38f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x390-0x397
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x398-0x39f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x3a0-0x3a7
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x3a8-0x3af
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x3b0-0x3b7
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x3b8-0x3bf
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x3c0-0x3c7
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x3c8-0x3cf
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x3d0-0x3d7
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x3d8-0x3df
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x3e0-0x3e7
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x3e8-0x3ef
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x3f0-0x3f7
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x3f8-0x3ff
+
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x400-0x407
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x408-0x40f
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x410-0x417
+    (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) (local i64) ;; 0x418-0x41f
+
+    ;; recurse first to try to make the callee access the stack below the space allocated for the locals before the locals themselves have been initialized.
+    (call $function-with-many-locals)
+
+    ;; load from memory into the locals.
+    (local.set 0x000 (i64.load offset=0x000 align=1 (i32.const 0)))
+    (local.set 0x001 (i64.load offset=0x001 align=1 (i32.const 0)))
+    (local.set 0x002 (i64.load offset=0x002 align=1 (i32.const 0)))
+    (local.set 0x003 (i64.load offset=0x003 align=1 (i32.const 0)))
+    (local.set 0x004 (i64.load offset=0x004 align=1 (i32.const 0)))
+    (local.set 0x005 (i64.load offset=0x005 align=1 (i32.const 0)))
+    (local.set 0x006 (i64.load offset=0x006 align=1 (i32.const 0)))
+    (local.set 0x007 (i64.load offset=0x007 align=1 (i32.const 0)))
+    (local.set 0x008 (i64.load offset=0x008 align=1 (i32.const 0)))
+    (local.set 0x009 (i64.load offset=0x009 align=1 (i32.const 0)))
+    (local.set 0x00a (i64.load offset=0x00a align=1 (i32.const 0)))
+    (local.set 0x00b (i64.load offset=0x00b align=1 (i32.const 0)))
+    (local.set 0x00c (i64.load offset=0x00c align=1 (i32.const 0)))
+    (local.set 0x00d (i64.load offset=0x00d align=1 (i32.const 0)))
+    (local.set 0x00e (i64.load offset=0x00e align=1 (i32.const 0)))
+    (local.set 0x00f (i64.load offset=0x00f align=1 (i32.const 0)))
+    (local.set 0x010 (i64.load offset=0x010 align=1 (i32.const 0)))
+    (local.set 0x011 (i64.load offset=0x011 align=1 (i32.const 0)))
+    (local.set 0x012 (i64.load offset=0x012 align=1 (i32.const 0)))
+    (local.set 0x013 (i64.load offset=0x013 align=1 (i32.const 0)))
+    (local.set 0x014 (i64.load offset=0x014 align=1 (i32.const 0)))
+    (local.set 0x015 (i64.load offset=0x015 align=1 (i32.const 0)))
+    (local.set 0x016 (i64.load offset=0x016 align=1 (i32.const 0)))
+    (local.set 0x017 (i64.load offset=0x017 align=1 (i32.const 0)))
+    (local.set 0x018 (i64.load offset=0x018 align=1 (i32.const 0)))
+    (local.set 0x019 (i64.load offset=0x019 align=1 (i32.const 0)))
+    (local.set 0x01a (i64.load offset=0x01a align=1 (i32.const 0)))
+    (local.set 0x01b (i64.load offset=0x01b align=1 (i32.const 0)))
+    (local.set 0x01c (i64.load offset=0x01c align=1 (i32.const 0)))
+    (local.set 0x01d (i64.load offset=0x01d align=1 (i32.const 0)))
+    (local.set 0x01e (i64.load offset=0x01e align=1 (i32.const 0)))
+    (local.set 0x01f (i64.load offset=0x01f align=1 (i32.const 0)))
+    (local.set 0x020 (i64.load offset=0x020 align=1 (i32.const 0)))
+    (local.set 0x021 (i64.load offset=0x021 align=1 (i32.const 0)))
+    (local.set 0x022 (i64.load offset=0x022 align=1 (i32.const 0)))
+    (local.set 0x023 (i64.load offset=0x023 align=1 (i32.const 0)))
+    (local.set 0x024 (i64.load offset=0x024 align=1 (i32.const 0)))
+    (local.set 0x025 (i64.load offset=0x025 align=1 (i32.const 0)))
+    (local.set 0x026 (i64.load offset=0x026 align=1 (i32.const 0)))
+    (local.set 0x027 (i64.load offset=0x027 align=1 (i32.const 0)))
+    (local.set 0x028 (i64.load offset=0x028 align=1 (i32.const 0)))
+    (local.set 0x029 (i64.load offset=0x029 align=1 (i32.const 0)))
+    (local.set 0x02a (i64.load offset=0x02a align=1 (i32.const 0)))
+    (local.set 0x02b (i64.load offset=0x02b align=1 (i32.const 0)))
+    (local.set 0x02c (i64.load offset=0x02c align=1 (i32.const 0)))
+    (local.set 0x02d (i64.load offset=0x02d align=1 (i32.const 0)))
+    (local.set 0x02e (i64.load offset=0x02e align=1 (i32.const 0)))
+    (local.set 0x02f (i64.load offset=0x02f align=1 (i32.const 0)))
+    (local.set 0x030 (i64.load offset=0x030 align=1 (i32.const 0)))
+    (local.set 0x031 (i64.load offset=0x031 align=1 (i32.const 0)))
+    (local.set 0x032 (i64.load offset=0x032 align=1 (i32.const 0)))
+    (local.set 0x033 (i64.load offset=0x033 align=1 (i32.const 0)))
+    (local.set 0x034 (i64.load offset=0x034 align=1 (i32.const 0)))
+    (local.set 0x035 (i64.load offset=0x035 align=1 (i32.const 0)))
+    (local.set 0x036 (i64.load offset=0x036 align=1 (i32.const 0)))
+    (local.set 0x037 (i64.load offset=0x037 align=1 (i32.const 0)))
+    (local.set 0x038 (i64.load offset=0x038 align=1 (i32.const 0)))
+    (local.set 0x039 (i64.load offset=0x039 align=1 (i32.const 0)))
+    (local.set 0x03a (i64.load offset=0x03a align=1 (i32.const 0)))
+    (local.set 0x03b (i64.load offset=0x03b align=1 (i32.const 0)))
+    (local.set 0x03c (i64.load offset=0x03c align=1 (i32.const 0)))
+    (local.set 0x03d (i64.load offset=0x03d align=1 (i32.const 0)))
+    (local.set 0x03e (i64.load offset=0x03e align=1 (i32.const 0)))
+    (local.set 0x03f (i64.load offset=0x03f align=1 (i32.const 0)))
+    (local.set 0x040 (i64.load offset=0x040 align=1 (i32.const 0)))
+    (local.set 0x041 (i64.load offset=0x041 align=1 (i32.const 0)))
+    (local.set 0x042 (i64.load offset=0x042 align=1 (i32.const 0)))
+    (local.set 0x043 (i64.load offset=0x043 align=1 (i32.const 0)))
+    (local.set 0x044 (i64.load offset=0x044 align=1 (i32.const 0)))
+    (local.set 0x045 (i64.load offset=0x045 align=1 (i32.const 0)))
+    (local.set 0x046 (i64.load offset=0x046 align=1 (i32.const 0)))
+    (local.set 0x047 (i64.load offset=0x047 align=1 (i32.const 0)))
+    (local.set 0x048 (i64.load offset=0x048 align=1 (i32.const 0)))
+    (local.set 0x049 (i64.load offset=0x049 align=1 (i32.const 0)))
+    (local.set 0x04a (i64.load offset=0x04a align=1 (i32.const 0)))
+    (local.set 0x04b (i64.load offset=0x04b align=1 (i32.const 0)))
+    (local.set 0x04c (i64.load offset=0x04c align=1 (i32.const 0)))
+    (local.set 0x04d (i64.load offset=0x04d align=1 (i32.const 0)))
+    (local.set 0x04e (i64.load offset=0x04e align=1 (i32.const 0)))
+    (local.set 0x04f (i64.load offset=0x04f align=1 (i32.const 0)))
+    (local.set 0x050 (i64.load offset=0x050 align=1 (i32.const 0)))
+    (local.set 0x051 (i64.load offset=0x051 align=1 (i32.const 0)))
+    (local.set 0x052 (i64.load offset=0x052 align=1 (i32.const 0)))
+    (local.set 0x053 (i64.load offset=0x053 align=1 (i32.const 0)))
+    (local.set 0x054 (i64.load offset=0x054 align=1 (i32.const 0)))
+    (local.set 0x055 (i64.load offset=0x055 align=1 (i32.const 0)))
+    (local.set 0x056 (i64.load offset=0x056 align=1 (i32.const 0)))
+    (local.set 0x057 (i64.load offset=0x057 align=1 (i32.const 0)))
+    (local.set 0x058 (i64.load offset=0x058 align=1 (i32.const 0)))
+    (local.set 0x059 (i64.load offset=0x059 align=1 (i32.const 0)))
+    (local.set 0x05a (i64.load offset=0x05a align=1 (i32.const 0)))
+    (local.set 0x05b (i64.load offset=0x05b align=1 (i32.const 0)))
+    (local.set 0x05c (i64.load offset=0x05c align=1 (i32.const 0)))
+    (local.set 0x05d (i64.load offset=0x05d align=1 (i32.const 0)))
+    (local.set 0x05e (i64.load offset=0x05e align=1 (i32.const 0)))
+    (local.set 0x05f (i64.load offset=0x05f align=1 (i32.const 0)))
+    (local.set 0x060 (i64.load offset=0x060 align=1 (i32.const 0)))
+    (local.set 0x061 (i64.load offset=0x061 align=1 (i32.const 0)))
+    (local.set 0x062 (i64.load offset=0x062 align=1 (i32.const 0)))
+    (local.set 0x063 (i64.load offset=0x063 align=1 (i32.const 0)))
+    (local.set 0x064 (i64.load offset=0x064 align=1 (i32.const 0)))
+    (local.set 0x065 (i64.load offset=0x065 align=1 (i32.const 0)))
+    (local.set 0x066 (i64.load offset=0x066 align=1 (i32.const 0)))
+    (local.set 0x067 (i64.load offset=0x067 align=1 (i32.const 0)))
+    (local.set 0x068 (i64.load offset=0x068 align=1 (i32.const 0)))
+    (local.set 0x069 (i64.load offset=0x069 align=1 (i32.const 0)))
+    (local.set 0x06a (i64.load offset=0x06a align=1 (i32.const 0)))
+    (local.set 0x06b (i64.load offset=0x06b align=1 (i32.const 0)))
+    (local.set 0x06c (i64.load offset=0x06c align=1 (i32.const 0)))
+    (local.set 0x06d (i64.load offset=0x06d align=1 (i32.const 0)))
+    (local.set 0x06e (i64.load offset=0x06e align=1 (i32.const 0)))
+    (local.set 0x06f (i64.load offset=0x06f align=1 (i32.const 0)))
+    (local.set 0x070 (i64.load offset=0x070 align=1 (i32.const 0)))
+    (local.set 0x071 (i64.load offset=0x071 align=1 (i32.const 0)))
+    (local.set 0x072 (i64.load offset=0x072 align=1 (i32.const 0)))
+    (local.set 0x073 (i64.load offset=0x073 align=1 (i32.const 0)))
+    (local.set 0x074 (i64.load offset=0x074 align=1 (i32.const 0)))
+    (local.set 0x075 (i64.load offset=0x075 align=1 (i32.const 0)))
+    (local.set 0x076 (i64.load offset=0x076 align=1 (i32.const 0)))
+    (local.set 0x077 (i64.load offset=0x077 align=1 (i32.const 0)))
+    (local.set 0x078 (i64.load offset=0x078 align=1 (i32.const 0)))
+    (local.set 0x079 (i64.load offset=0x079 align=1 (i32.const 0)))
+    (local.set 0x07a (i64.load offset=0x07a align=1 (i32.const 0)))
+    (local.set 0x07b (i64.load offset=0x07b align=1 (i32.const 0)))
+    (local.set 0x07c (i64.load offset=0x07c align=1 (i32.const 0)))
+    (local.set 0x07d (i64.load offset=0x07d align=1 (i32.const 0)))
+    (local.set 0x07e (i64.load offset=0x07e align=1 (i32.const 0)))
+    (local.set 0x07f (i64.load offset=0x07f align=1 (i32.const 0)))
+    (local.set 0x080 (i64.load offset=0x080 align=1 (i32.const 0)))
+    (local.set 0x081 (i64.load offset=0x081 align=1 (i32.const 0)))
+    (local.set 0x082 (i64.load offset=0x082 align=1 (i32.const 0)))
+    (local.set 0x083 (i64.load offset=0x083 align=1 (i32.const 0)))
+    (local.set 0x084 (i64.load offset=0x084 align=1 (i32.const 0)))
+    (local.set 0x085 (i64.load offset=0x085 align=1 (i32.const 0)))
+    (local.set 0x086 (i64.load offset=0x086 align=1 (i32.const 0)))
+    (local.set 0x087 (i64.load offset=0x087 align=1 (i32.const 0)))
+    (local.set 0x088 (i64.load offset=0x088 align=1 (i32.const 0)))
+    (local.set 0x089 (i64.load offset=0x089 align=1 (i32.const 0)))
+    (local.set 0x08a (i64.load offset=0x08a align=1 (i32.const 0)))
+    (local.set 0x08b (i64.load offset=0x08b align=1 (i32.const 0)))
+    (local.set 0x08c (i64.load offset=0x08c align=1 (i32.const 0)))
+    (local.set 0x08d (i64.load offset=0x08d align=1 (i32.const 0)))
+    (local.set 0x08e (i64.load offset=0x08e align=1 (i32.const 0)))
+    (local.set 0x08f (i64.load offset=0x08f align=1 (i32.const 0)))
+    (local.set 0x090 (i64.load offset=0x090 align=1 (i32.const 0)))
+    (local.set 0x091 (i64.load offset=0x091 align=1 (i32.const 0)))
+    (local.set 0x092 (i64.load offset=0x092 align=1 (i32.const 0)))
+    (local.set 0x093 (i64.load offset=0x093 align=1 (i32.const 0)))
+    (local.set 0x094 (i64.load offset=0x094 align=1 (i32.const 0)))
+    (local.set 0x095 (i64.load offset=0x095 align=1 (i32.const 0)))
+    (local.set 0x096 (i64.load offset=0x096 align=1 (i32.const 0)))
+    (local.set 0x097 (i64.load offset=0x097 align=1 (i32.const 0)))
+    (local.set 0x098 (i64.load offset=0x098 align=1 (i32.const 0)))
+    (local.set 0x099 (i64.load offset=0x099 align=1 (i32.const 0)))
+    (local.set 0x09a (i64.load offset=0x09a align=1 (i32.const 0)))
+    (local.set 0x09b (i64.load offset=0x09b align=1 (i32.const 0)))
+    (local.set 0x09c (i64.load offset=0x09c align=1 (i32.const 0)))
+    (local.set 0x09d (i64.load offset=0x09d align=1 (i32.const 0)))
+    (local.set 0x09e (i64.load offset=0x09e align=1 (i32.const 0)))
+    (local.set 0x09f (i64.load offset=0x09f align=1 (i32.const 0)))
+    (local.set 0x0a0 (i64.load offset=0x0a0 align=1 (i32.const 0)))
+    (local.set 0x0a1 (i64.load offset=0x0a1 align=1 (i32.const 0)))
+    (local.set 0x0a2 (i64.load offset=0x0a2 align=1 (i32.const 0)))
+    (local.set 0x0a3 (i64.load offset=0x0a3 align=1 (i32.const 0)))
+    (local.set 0x0a4 (i64.load offset=0x0a4 align=1 (i32.const 0)))
+    (local.set 0x0a5 (i64.load offset=0x0a5 align=1 (i32.const 0)))
+    (local.set 0x0a6 (i64.load offset=0x0a6 align=1 (i32.const 0)))
+    (local.set 0x0a7 (i64.load offset=0x0a7 align=1 (i32.const 0)))
+    (local.set 0x0a8 (i64.load offset=0x0a8 align=1 (i32.const 0)))
+    (local.set 0x0a9 (i64.load offset=0x0a9 align=1 (i32.const 0)))
+    (local.set 0x0aa (i64.load offset=0x0aa align=1 (i32.const 0)))
+    (local.set 0x0ab (i64.load offset=0x0ab align=1 (i32.const 0)))
+    (local.set 0x0ac (i64.load offset=0x0ac align=1 (i32.const 0)))
+    (local.set 0x0ad (i64.load offset=0x0ad align=1 (i32.const 0)))
+    (local.set 0x0ae (i64.load offset=0x0ae align=1 (i32.const 0)))
+    (local.set 0x0af (i64.load offset=0x0af align=1 (i32.const 0)))
+    (local.set 0x0b0 (i64.load offset=0x0b0 align=1 (i32.const 0)))
+    (local.set 0x0b1 (i64.load offset=0x0b1 align=1 (i32.const 0)))
+    (local.set 0x0b2 (i64.load offset=0x0b2 align=1 (i32.const 0)))
+    (local.set 0x0b3 (i64.load offset=0x0b3 align=1 (i32.const 0)))
+    (local.set 0x0b4 (i64.load offset=0x0b4 align=1 (i32.const 0)))
+    (local.set 0x0b5 (i64.load offset=0x0b5 align=1 (i32.const 0)))
+    (local.set 0x0b6 (i64.load offset=0x0b6 align=1 (i32.const 0)))
+    (local.set 0x0b7 (i64.load offset=0x0b7 align=1 (i32.const 0)))
+    (local.set 0x0b8 (i64.load offset=0x0b8 align=1 (i32.const 0)))
+    (local.set 0x0b9 (i64.load offset=0x0b9 align=1 (i32.const 0)))
+    (local.set 0x0ba (i64.load offset=0x0ba align=1 (i32.const 0)))
+    (local.set 0x0bb (i64.load offset=0x0bb align=1 (i32.const 0)))
+    (local.set 0x0bc (i64.load offset=0x0bc align=1 (i32.const 0)))
+    (local.set 0x0bd (i64.load offset=0x0bd align=1 (i32.const 0)))
+    (local.set 0x0be (i64.load offset=0x0be align=1 (i32.const 0)))
+    (local.set 0x0bf (i64.load offset=0x0bf align=1 (i32.const 0)))
+    (local.set 0x0c0 (i64.load offset=0x0c0 align=1 (i32.const 0)))
+    (local.set 0x0c1 (i64.load offset=0x0c1 align=1 (i32.const 0)))
+    (local.set 0x0c2 (i64.load offset=0x0c2 align=1 (i32.const 0)))
+    (local.set 0x0c3 (i64.load offset=0x0c3 align=1 (i32.const 0)))
+    (local.set 0x0c4 (i64.load offset=0x0c4 align=1 (i32.const 0)))
+    (local.set 0x0c5 (i64.load offset=0x0c5 align=1 (i32.const 0)))
+    (local.set 0x0c6 (i64.load offset=0x0c6 align=1 (i32.const 0)))
+    (local.set 0x0c7 (i64.load offset=0x0c7 align=1 (i32.const 0)))
+    (local.set 0x0c8 (i64.load offset=0x0c8 align=1 (i32.const 0)))
+    (local.set 0x0c9 (i64.load offset=0x0c9 align=1 (i32.const 0)))
+    (local.set 0x0ca (i64.load offset=0x0ca align=1 (i32.const 0)))
+    (local.set 0x0cb (i64.load offset=0x0cb align=1 (i32.const 0)))
+    (local.set 0x0cc (i64.load offset=0x0cc align=1 (i32.const 0)))
+    (local.set 0x0cd (i64.load offset=0x0cd align=1 (i32.const 0)))
+    (local.set 0x0ce (i64.load offset=0x0ce align=1 (i32.const 0)))
+    (local.set 0x0cf (i64.load offset=0x0cf align=1 (i32.const 0)))
+    (local.set 0x0d0 (i64.load offset=0x0d0 align=1 (i32.const 0)))
+    (local.set 0x0d1 (i64.load offset=0x0d1 align=1 (i32.const 0)))
+    (local.set 0x0d2 (i64.load offset=0x0d2 align=1 (i32.const 0)))
+    (local.set 0x0d3 (i64.load offset=0x0d3 align=1 (i32.const 0)))
+    (local.set 0x0d4 (i64.load offset=0x0d4 align=1 (i32.const 0)))
+    (local.set 0x0d5 (i64.load offset=0x0d5 align=1 (i32.const 0)))
+    (local.set 0x0d6 (i64.load offset=0x0d6 align=1 (i32.const 0)))
+    (local.set 0x0d7 (i64.load offset=0x0d7 align=1 (i32.const 0)))
+    (local.set 0x0d8 (i64.load offset=0x0d8 align=1 (i32.const 0)))
+    (local.set 0x0d9 (i64.load offset=0x0d9 align=1 (i32.const 0)))
+    (local.set 0x0da (i64.load offset=0x0da align=1 (i32.const 0)))
+    (local.set 0x0db (i64.load offset=0x0db align=1 (i32.const 0)))
+    (local.set 0x0dc (i64.load offset=0x0dc align=1 (i32.const 0)))
+    (local.set 0x0dd (i64.load offset=0x0dd align=1 (i32.const 0)))
+    (local.set 0x0de (i64.load offset=0x0de align=1 (i32.const 0)))
+    (local.set 0x0df (i64.load offset=0x0df align=1 (i32.const 0)))
+    (local.set 0x0e0 (i64.load offset=0x0e0 align=1 (i32.const 0)))
+    (local.set 0x0e1 (i64.load offset=0x0e1 align=1 (i32.const 0)))
+    (local.set 0x0e2 (i64.load offset=0x0e2 align=1 (i32.const 0)))
+    (local.set 0x0e3 (i64.load offset=0x0e3 align=1 (i32.const 0)))
+    (local.set 0x0e4 (i64.load offset=0x0e4 align=1 (i32.const 0)))
+    (local.set 0x0e5 (i64.load offset=0x0e5 align=1 (i32.const 0)))
+    (local.set 0x0e6 (i64.load offset=0x0e6 align=1 (i32.const 0)))
+    (local.set 0x0e7 (i64.load offset=0x0e7 align=1 (i32.const 0)))
+    (local.set 0x0e8 (i64.load offset=0x0e8 align=1 (i32.const 0)))
+    (local.set 0x0e9 (i64.load offset=0x0e9 align=1 (i32.const 0)))
+    (local.set 0x0ea (i64.load offset=0x0ea align=1 (i32.const 0)))
+    (local.set 0x0eb (i64.load offset=0x0eb align=1 (i32.const 0)))
+    (local.set 0x0ec (i64.load offset=0x0ec align=1 (i32.const 0)))
+    (local.set 0x0ed (i64.load offset=0x0ed align=1 (i32.const 0)))
+    (local.set 0x0ee (i64.load offset=0x0ee align=1 (i32.const 0)))
+    (local.set 0x0ef (i64.load offset=0x0ef align=1 (i32.const 0)))
+    (local.set 0x0f0 (i64.load offset=0x0f0 align=1 (i32.const 0)))
+    (local.set 0x0f1 (i64.load offset=0x0f1 align=1 (i32.const 0)))
+    (local.set 0x0f2 (i64.load offset=0x0f2 align=1 (i32.const 0)))
+    (local.set 0x0f3 (i64.load offset=0x0f3 align=1 (i32.const 0)))
+    (local.set 0x0f4 (i64.load offset=0x0f4 align=1 (i32.const 0)))
+    (local.set 0x0f5 (i64.load offset=0x0f5 align=1 (i32.const 0)))
+    (local.set 0x0f6 (i64.load offset=0x0f6 align=1 (i32.const 0)))
+    (local.set 0x0f7 (i64.load offset=0x0f7 align=1 (i32.const 0)))
+    (local.set 0x0f8 (i64.load offset=0x0f8 align=1 (i32.const 0)))
+    (local.set 0x0f9 (i64.load offset=0x0f9 align=1 (i32.const 0)))
+    (local.set 0x0fa (i64.load offset=0x0fa align=1 (i32.const 0)))
+    (local.set 0x0fb (i64.load offset=0x0fb align=1 (i32.const 0)))
+    (local.set 0x0fc (i64.load offset=0x0fc align=1 (i32.const 0)))
+    (local.set 0x0fd (i64.load offset=0x0fd align=1 (i32.const 0)))
+    (local.set 0x0fe (i64.load offset=0x0fe align=1 (i32.const 0)))
+    (local.set 0x0ff (i64.load offset=0x0ff align=1 (i32.const 0)))
+    (local.set 0x100 (i64.load offset=0x100 align=1 (i32.const 0)))
+    (local.set 0x101 (i64.load offset=0x101 align=1 (i32.const 0)))
+    (local.set 0x102 (i64.load offset=0x102 align=1 (i32.const 0)))
+    (local.set 0x103 (i64.load offset=0x103 align=1 (i32.const 0)))
+    (local.set 0x104 (i64.load offset=0x104 align=1 (i32.const 0)))
+    (local.set 0x105 (i64.load offset=0x105 align=1 (i32.const 0)))
+    (local.set 0x106 (i64.load offset=0x106 align=1 (i32.const 0)))
+    (local.set 0x107 (i64.load offset=0x107 align=1 (i32.const 0)))
+    (local.set 0x108 (i64.load offset=0x108 align=1 (i32.const 0)))
+    (local.set 0x109 (i64.load offset=0x109 align=1 (i32.const 0)))
+    (local.set 0x10a (i64.load offset=0x10a align=1 (i32.const 0)))
+    (local.set 0x10b (i64.load offset=0x10b align=1 (i32.const 0)))
+    (local.set 0x10c (i64.load offset=0x10c align=1 (i32.const 0)))
+    (local.set 0x10d (i64.load offset=0x10d align=1 (i32.const 0)))
+    (local.set 0x10e (i64.load offset=0x10e align=1 (i32.const 0)))
+    (local.set 0x10f (i64.load offset=0x10f align=1 (i32.const 0)))
+    (local.set 0x110 (i64.load offset=0x110 align=1 (i32.const 0)))
+    (local.set 0x111 (i64.load offset=0x111 align=1 (i32.const 0)))
+    (local.set 0x112 (i64.load offset=0x112 align=1 (i32.const 0)))
+    (local.set 0x113 (i64.load offset=0x113 align=1 (i32.const 0)))
+    (local.set 0x114 (i64.load offset=0x114 align=1 (i32.const 0)))
+    (local.set 0x115 (i64.load offset=0x115 align=1 (i32.const 0)))
+    (local.set 0x116 (i64.load offset=0x116 align=1 (i32.const 0)))
+    (local.set 0x117 (i64.load offset=0x117 align=1 (i32.const 0)))
+    (local.set 0x118 (i64.load offset=0x118 align=1 (i32.const 0)))
+    (local.set 0x119 (i64.load offset=0x119 align=1 (i32.const 0)))
+    (local.set 0x11a (i64.load offset=0x11a align=1 (i32.const 0)))
+    (local.set 0x11b (i64.load offset=0x11b align=1 (i32.const 0)))
+    (local.set 0x11c (i64.load offset=0x11c align=1 (i32.const 0)))
+    (local.set 0x11d (i64.load offset=0x11d align=1 (i32.const 0)))
+    (local.set 0x11e (i64.load offset=0x11e align=1 (i32.const 0)))
+    (local.set 0x11f (i64.load offset=0x11f align=1 (i32.const 0)))
+    (local.set 0x120 (i64.load offset=0x120 align=1 (i32.const 0)))
+    (local.set 0x121 (i64.load offset=0x121 align=1 (i32.const 0)))
+    (local.set 0x122 (i64.load offset=0x122 align=1 (i32.const 0)))
+    (local.set 0x123 (i64.load offset=0x123 align=1 (i32.const 0)))
+    (local.set 0x124 (i64.load offset=0x124 align=1 (i32.const 0)))
+    (local.set 0x125 (i64.load offset=0x125 align=1 (i32.const 0)))
+    (local.set 0x126 (i64.load offset=0x126 align=1 (i32.const 0)))
+    (local.set 0x127 (i64.load offset=0x127 align=1 (i32.const 0)))
+    (local.set 0x128 (i64.load offset=0x128 align=1 (i32.const 0)))
+    (local.set 0x129 (i64.load offset=0x129 align=1 (i32.const 0)))
+    (local.set 0x12a (i64.load offset=0x12a align=1 (i32.const 0)))
+    (local.set 0x12b (i64.load offset=0x12b align=1 (i32.const 0)))
+    (local.set 0x12c (i64.load offset=0x12c align=1 (i32.const 0)))
+    (local.set 0x12d (i64.load offset=0x12d align=1 (i32.const 0)))
+    (local.set 0x12e (i64.load offset=0x12e align=1 (i32.const 0)))
+    (local.set 0x12f (i64.load offset=0x12f align=1 (i32.const 0)))
+    (local.set 0x130 (i64.load offset=0x130 align=1 (i32.const 0)))
+    (local.set 0x131 (i64.load offset=0x131 align=1 (i32.const 0)))
+    (local.set 0x132 (i64.load offset=0x132 align=1 (i32.const 0)))
+    (local.set 0x133 (i64.load offset=0x133 align=1 (i32.const 0)))
+    (local.set 0x134 (i64.load offset=0x134 align=1 (i32.const 0)))
+    (local.set 0x135 (i64.load offset=0x135 align=1 (i32.const 0)))
+    (local.set 0x136 (i64.load offset=0x136 align=1 (i32.const 0)))
+    (local.set 0x137 (i64.load offset=0x137 align=1 (i32.const 0)))
+    (local.set 0x138 (i64.load offset=0x138 align=1 (i32.const 0)))
+    (local.set 0x139 (i64.load offset=0x139 align=1 (i32.const 0)))
+    (local.set 0x13a (i64.load offset=0x13a align=1 (i32.const 0)))
+    (local.set 0x13b (i64.load offset=0x13b align=1 (i32.const 0)))
+    (local.set 0x13c (i64.load offset=0x13c align=1 (i32.const 0)))
+    (local.set 0x13d (i64.load offset=0x13d align=1 (i32.const 0)))
+    (local.set 0x13e (i64.load offset=0x13e align=1 (i32.const 0)))
+    (local.set 0x13f (i64.load offset=0x13f align=1 (i32.const 0)))
+    (local.set 0x140 (i64.load offset=0x140 align=1 (i32.const 0)))
+    (local.set 0x141 (i64.load offset=0x141 align=1 (i32.const 0)))
+    (local.set 0x142 (i64.load offset=0x142 align=1 (i32.const 0)))
+    (local.set 0x143 (i64.load offset=0x143 align=1 (i32.const 0)))
+    (local.set 0x144 (i64.load offset=0x144 align=1 (i32.const 0)))
+    (local.set 0x145 (i64.load offset=0x145 align=1 (i32.const 0)))
+    (local.set 0x146 (i64.load offset=0x146 align=1 (i32.const 0)))
+    (local.set 0x147 (i64.load offset=0x147 align=1 (i32.const 0)))
+    (local.set 0x148 (i64.load offset=0x148 align=1 (i32.const 0)))
+    (local.set 0x149 (i64.load offset=0x149 align=1 (i32.const 0)))
+    (local.set 0x14a (i64.load offset=0x14a align=1 (i32.const 0)))
+    (local.set 0x14b (i64.load offset=0x14b align=1 (i32.const 0)))
+    (local.set 0x14c (i64.load offset=0x14c align=1 (i32.const 0)))
+    (local.set 0x14d (i64.load offset=0x14d align=1 (i32.const 0)))
+    (local.set 0x14e (i64.load offset=0x14e align=1 (i32.const 0)))
+    (local.set 0x14f (i64.load offset=0x14f align=1 (i32.const 0)))
+    (local.set 0x150 (i64.load offset=0x150 align=1 (i32.const 0)))
+    (local.set 0x151 (i64.load offset=0x151 align=1 (i32.const 0)))
+    (local.set 0x152 (i64.load offset=0x152 align=1 (i32.const 0)))
+    (local.set 0x153 (i64.load offset=0x153 align=1 (i32.const 0)))
+    (local.set 0x154 (i64.load offset=0x154 align=1 (i32.const 0)))
+    (local.set 0x155 (i64.load offset=0x155 align=1 (i32.const 0)))
+    (local.set 0x156 (i64.load offset=0x156 align=1 (i32.const 0)))
+    (local.set 0x157 (i64.load offset=0x157 align=1 (i32.const 0)))
+    (local.set 0x158 (i64.load offset=0x158 align=1 (i32.const 0)))
+    (local.set 0x159 (i64.load offset=0x159 align=1 (i32.const 0)))
+    (local.set 0x15a (i64.load offset=0x15a align=1 (i32.const 0)))
+    (local.set 0x15b (i64.load offset=0x15b align=1 (i32.const 0)))
+    (local.set 0x15c (i64.load offset=0x15c align=1 (i32.const 0)))
+    (local.set 0x15d (i64.load offset=0x15d align=1 (i32.const 0)))
+    (local.set 0x15e (i64.load offset=0x15e align=1 (i32.const 0)))
+    (local.set 0x15f (i64.load offset=0x15f align=1 (i32.const 0)))
+    (local.set 0x160 (i64.load offset=0x160 align=1 (i32.const 0)))
+    (local.set 0x161 (i64.load offset=0x161 align=1 (i32.const 0)))
+    (local.set 0x162 (i64.load offset=0x162 align=1 (i32.const 0)))
+    (local.set 0x163 (i64.load offset=0x163 align=1 (i32.const 0)))
+    (local.set 0x164 (i64.load offset=0x164 align=1 (i32.const 0)))
+    (local.set 0x165 (i64.load offset=0x165 align=1 (i32.const 0)))
+    (local.set 0x166 (i64.load offset=0x166 align=1 (i32.const 0)))
+    (local.set 0x167 (i64.load offset=0x167 align=1 (i32.const 0)))
+    (local.set 0x168 (i64.load offset=0x168 align=1 (i32.const 0)))
+    (local.set 0x169 (i64.load offset=0x169 align=1 (i32.const 0)))
+    (local.set 0x16a (i64.load offset=0x16a align=1 (i32.const 0)))
+    (local.set 0x16b (i64.load offset=0x16b align=1 (i32.const 0)))
+    (local.set 0x16c (i64.load offset=0x16c align=1 (i32.const 0)))
+    (local.set 0x16d (i64.load offset=0x16d align=1 (i32.const 0)))
+    (local.set 0x16e (i64.load offset=0x16e align=1 (i32.const 0)))
+    (local.set 0x16f (i64.load offset=0x16f align=1 (i32.const 0)))
+    (local.set 0x170 (i64.load offset=0x170 align=1 (i32.const 0)))
+    (local.set 0x171 (i64.load offset=0x171 align=1 (i32.const 0)))
+    (local.set 0x172 (i64.load offset=0x172 align=1 (i32.const 0)))
+    (local.set 0x173 (i64.load offset=0x173 align=1 (i32.const 0)))
+    (local.set 0x174 (i64.load offset=0x174 align=1 (i32.const 0)))
+    (local.set 0x175 (i64.load offset=0x175 align=1 (i32.const 0)))
+    (local.set 0x176 (i64.load offset=0x176 align=1 (i32.const 0)))
+    (local.set 0x177 (i64.load offset=0x177 align=1 (i32.const 0)))
+    (local.set 0x178 (i64.load offset=0x178 align=1 (i32.const 0)))
+    (local.set 0x179 (i64.load offset=0x179 align=1 (i32.const 0)))
+    (local.set 0x17a (i64.load offset=0x17a align=1 (i32.const 0)))
+    (local.set 0x17b (i64.load offset=0x17b align=1 (i32.const 0)))
+    (local.set 0x17c (i64.load offset=0x17c align=1 (i32.const 0)))
+    (local.set 0x17d (i64.load offset=0x17d align=1 (i32.const 0)))
+    (local.set 0x17e (i64.load offset=0x17e align=1 (i32.const 0)))
+    (local.set 0x17f (i64.load offset=0x17f align=1 (i32.const 0)))
+    (local.set 0x180 (i64.load offset=0x180 align=1 (i32.const 0)))
+    (local.set 0x181 (i64.load offset=0x181 align=1 (i32.const 0)))
+    (local.set 0x182 (i64.load offset=0x182 align=1 (i32.const 0)))
+    (local.set 0x183 (i64.load offset=0x183 align=1 (i32.const 0)))
+    (local.set 0x184 (i64.load offset=0x184 align=1 (i32.const 0)))
+    (local.set 0x185 (i64.load offset=0x185 align=1 (i32.const 0)))
+    (local.set 0x186 (i64.load offset=0x186 align=1 (i32.const 0)))
+    (local.set 0x187 (i64.load offset=0x187 align=1 (i32.const 0)))
+    (local.set 0x188 (i64.load offset=0x188 align=1 (i32.const 0)))
+    (local.set 0x189 (i64.load offset=0x189 align=1 (i32.const 0)))
+    (local.set 0x18a (i64.load offset=0x18a align=1 (i32.const 0)))
+    (local.set 0x18b (i64.load offset=0x18b align=1 (i32.const 0)))
+    (local.set 0x18c (i64.load offset=0x18c align=1 (i32.const 0)))
+    (local.set 0x18d (i64.load offset=0x18d align=1 (i32.const 0)))
+    (local.set 0x18e (i64.load offset=0x18e align=1 (i32.const 0)))
+    (local.set 0x18f (i64.load offset=0x18f align=1 (i32.const 0)))
+    (local.set 0x190 (i64.load offset=0x190 align=1 (i32.const 0)))
+    (local.set 0x191 (i64.load offset=0x191 align=1 (i32.const 0)))
+    (local.set 0x192 (i64.load offset=0x192 align=1 (i32.const 0)))
+    (local.set 0x193 (i64.load offset=0x193 align=1 (i32.const 0)))
+    (local.set 0x194 (i64.load offset=0x194 align=1 (i32.const 0)))
+    (local.set 0x195 (i64.load offset=0x195 align=1 (i32.const 0)))
+    (local.set 0x196 (i64.load offset=0x196 align=1 (i32.const 0)))
+    (local.set 0x197 (i64.load offset=0x197 align=1 (i32.const 0)))
+    (local.set 0x198 (i64.load offset=0x198 align=1 (i32.const 0)))
+    (local.set 0x199 (i64.load offset=0x199 align=1 (i32.const 0)))
+    (local.set 0x19a (i64.load offset=0x19a align=1 (i32.const 0)))
+    (local.set 0x19b (i64.load offset=0x19b align=1 (i32.const 0)))
+    (local.set 0x19c (i64.load offset=0x19c align=1 (i32.const 0)))
+    (local.set 0x19d (i64.load offset=0x19d align=1 (i32.const 0)))
+    (local.set 0x19e (i64.load offset=0x19e align=1 (i32.const 0)))
+    (local.set 0x19f (i64.load offset=0x19f align=1 (i32.const 0)))
+    (local.set 0x1a0 (i64.load offset=0x1a0 align=1 (i32.const 0)))
+    (local.set 0x1a1 (i64.load offset=0x1a1 align=1 (i32.const 0)))
+    (local.set 0x1a2 (i64.load offset=0x1a2 align=1 (i32.const 0)))
+    (local.set 0x1a3 (i64.load offset=0x1a3 align=1 (i32.const 0)))
+    (local.set 0x1a4 (i64.load offset=0x1a4 align=1 (i32.const 0)))
+    (local.set 0x1a5 (i64.load offset=0x1a5 align=1 (i32.const 0)))
+    (local.set 0x1a6 (i64.load offset=0x1a6 align=1 (i32.const 0)))
+    (local.set 0x1a7 (i64.load offset=0x1a7 align=1 (i32.const 0)))
+    (local.set 0x1a8 (i64.load offset=0x1a8 align=1 (i32.const 0)))
+    (local.set 0x1a9 (i64.load offset=0x1a9 align=1 (i32.const 0)))
+    (local.set 0x1aa (i64.load offset=0x1aa align=1 (i32.const 0)))
+    (local.set 0x1ab (i64.load offset=0x1ab align=1 (i32.const 0)))
+    (local.set 0x1ac (i64.load offset=0x1ac align=1 (i32.const 0)))
+    (local.set 0x1ad (i64.load offset=0x1ad align=1 (i32.const 0)))
+    (local.set 0x1ae (i64.load offset=0x1ae align=1 (i32.const 0)))
+    (local.set 0x1af (i64.load offset=0x1af align=1 (i32.const 0)))
+    (local.set 0x1b0 (i64.load offset=0x1b0 align=1 (i32.const 0)))
+    (local.set 0x1b1 (i64.load offset=0x1b1 align=1 (i32.const 0)))
+    (local.set 0x1b2 (i64.load offset=0x1b2 align=1 (i32.const 0)))
+    (local.set 0x1b3 (i64.load offset=0x1b3 align=1 (i32.const 0)))
+    (local.set 0x1b4 (i64.load offset=0x1b4 align=1 (i32.const 0)))
+    (local.set 0x1b5 (i64.load offset=0x1b5 align=1 (i32.const 0)))
+    (local.set 0x1b6 (i64.load offset=0x1b6 align=1 (i32.const 0)))
+    (local.set 0x1b7 (i64.load offset=0x1b7 align=1 (i32.const 0)))
+    (local.set 0x1b8 (i64.load offset=0x1b8 align=1 (i32.const 0)))
+    (local.set 0x1b9 (i64.load offset=0x1b9 align=1 (i32.const 0)))
+    (local.set 0x1ba (i64.load offset=0x1ba align=1 (i32.const 0)))
+    (local.set 0x1bb (i64.load offset=0x1bb align=1 (i32.const 0)))
+    (local.set 0x1bc (i64.load offset=0x1bc align=1 (i32.const 0)))
+    (local.set 0x1bd (i64.load offset=0x1bd align=1 (i32.const 0)))
+    (local.set 0x1be (i64.load offset=0x1be align=1 (i32.const 0)))
+    (local.set 0x1bf (i64.load offset=0x1bf align=1 (i32.const 0)))
+    (local.set 0x1c0 (i64.load offset=0x1c0 align=1 (i32.const 0)))
+    (local.set 0x1c1 (i64.load offset=0x1c1 align=1 (i32.const 0)))
+    (local.set 0x1c2 (i64.load offset=0x1c2 align=1 (i32.const 0)))
+    (local.set 0x1c3 (i64.load offset=0x1c3 align=1 (i32.const 0)))
+    (local.set 0x1c4 (i64.load offset=0x1c4 align=1 (i32.const 0)))
+    (local.set 0x1c5 (i64.load offset=0x1c5 align=1 (i32.const 0)))
+    (local.set 0x1c6 (i64.load offset=0x1c6 align=1 (i32.const 0)))
+    (local.set 0x1c7 (i64.load offset=0x1c7 align=1 (i32.const 0)))
+    (local.set 0x1c8 (i64.load offset=0x1c8 align=1 (i32.const 0)))
+    (local.set 0x1c9 (i64.load offset=0x1c9 align=1 (i32.const 0)))
+    (local.set 0x1ca (i64.load offset=0x1ca align=1 (i32.const 0)))
+    (local.set 0x1cb (i64.load offset=0x1cb align=1 (i32.const 0)))
+    (local.set 0x1cc (i64.load offset=0x1cc align=1 (i32.const 0)))
+    (local.set 0x1cd (i64.load offset=0x1cd align=1 (i32.const 0)))
+    (local.set 0x1ce (i64.load offset=0x1ce align=1 (i32.const 0)))
+    (local.set 0x1cf (i64.load offset=0x1cf align=1 (i32.const 0)))
+    (local.set 0x1d0 (i64.load offset=0x1d0 align=1 (i32.const 0)))
+    (local.set 0x1d1 (i64.load offset=0x1d1 align=1 (i32.const 0)))
+    (local.set 0x1d2 (i64.load offset=0x1d2 align=1 (i32.const 0)))
+    (local.set 0x1d3 (i64.load offset=0x1d3 align=1 (i32.const 0)))
+    (local.set 0x1d4 (i64.load offset=0x1d4 align=1 (i32.const 0)))
+    (local.set 0x1d5 (i64.load offset=0x1d5 align=1 (i32.const 0)))
+    (local.set 0x1d6 (i64.load offset=0x1d6 align=1 (i32.const 0)))
+    (local.set 0x1d7 (i64.load offset=0x1d7 align=1 (i32.const 0)))
+    (local.set 0x1d8 (i64.load offset=0x1d8 align=1 (i32.const 0)))
+    (local.set 0x1d9 (i64.load offset=0x1d9 align=1 (i32.const 0)))
+    (local.set 0x1da (i64.load offset=0x1da align=1 (i32.const 0)))
+    (local.set 0x1db (i64.load offset=0x1db align=1 (i32.const 0)))
+    (local.set 0x1dc (i64.load offset=0x1dc align=1 (i32.const 0)))
+    (local.set 0x1dd (i64.load offset=0x1dd align=1 (i32.const 0)))
+    (local.set 0x1de (i64.load offset=0x1de align=1 (i32.const 0)))
+    (local.set 0x1df (i64.load offset=0x1df align=1 (i32.const 0)))
+    (local.set 0x1e0 (i64.load offset=0x1e0 align=1 (i32.const 0)))
+    (local.set 0x1e1 (i64.load offset=0x1e1 align=1 (i32.const 0)))
+    (local.set 0x1e2 (i64.load offset=0x1e2 align=1 (i32.const 0)))
+    (local.set 0x1e3 (i64.load offset=0x1e3 align=1 (i32.const 0)))
+    (local.set 0x1e4 (i64.load offset=0x1e4 align=1 (i32.const 0)))
+    (local.set 0x1e5 (i64.load offset=0x1e5 align=1 (i32.const 0)))
+    (local.set 0x1e6 (i64.load offset=0x1e6 align=1 (i32.const 0)))
+    (local.set 0x1e7 (i64.load offset=0x1e7 align=1 (i32.const 0)))
+    (local.set 0x1e8 (i64.load offset=0x1e8 align=1 (i32.const 0)))
+    (local.set 0x1e9 (i64.load offset=0x1e9 align=1 (i32.const 0)))
+    (local.set 0x1ea (i64.load offset=0x1ea align=1 (i32.const 0)))
+    (local.set 0x1eb (i64.load offset=0x1eb align=1 (i32.const 0)))
+    (local.set 0x1ec (i64.load offset=0x1ec align=1 (i32.const 0)))
+    (local.set 0x1ed (i64.load offset=0x1ed align=1 (i32.const 0)))
+    (local.set 0x1ee (i64.load offset=0x1ee align=1 (i32.const 0)))
+    (local.set 0x1ef (i64.load offset=0x1ef align=1 (i32.const 0)))
+    (local.set 0x1f0 (i64.load offset=0x1f0 align=1 (i32.const 0)))
+    (local.set 0x1f1 (i64.load offset=0x1f1 align=1 (i32.const 0)))
+    (local.set 0x1f2 (i64.load offset=0x1f2 align=1 (i32.const 0)))
+    (local.set 0x1f3 (i64.load offset=0x1f3 align=1 (i32.const 0)))
+    (local.set 0x1f4 (i64.load offset=0x1f4 align=1 (i32.const 0)))
+    (local.set 0x1f5 (i64.load offset=0x1f5 align=1 (i32.const 0)))
+    (local.set 0x1f6 (i64.load offset=0x1f6 align=1 (i32.const 0)))
+    (local.set 0x1f7 (i64.load offset=0x1f7 align=1 (i32.const 0)))
+    (local.set 0x1f8 (i64.load offset=0x1f8 align=1 (i32.const 0)))
+    (local.set 0x1f9 (i64.load offset=0x1f9 align=1 (i32.const 0)))
+    (local.set 0x1fa (i64.load offset=0x1fa align=1 (i32.const 0)))
+    (local.set 0x1fb (i64.load offset=0x1fb align=1 (i32.const 0)))
+    (local.set 0x1fc (i64.load offset=0x1fc align=1 (i32.const 0)))
+    (local.set 0x1fd (i64.load offset=0x1fd align=1 (i32.const 0)))
+    (local.set 0x1fe (i64.load offset=0x1fe align=1 (i32.const 0)))
+    (local.set 0x1ff (i64.load offset=0x1ff align=1 (i32.const 0)))
+    (local.set 0x200 (i64.load offset=0x200 align=1 (i32.const 0)))
+    (local.set 0x201 (i64.load offset=0x201 align=1 (i32.const 0)))
+    (local.set 0x202 (i64.load offset=0x202 align=1 (i32.const 0)))
+    (local.set 0x203 (i64.load offset=0x203 align=1 (i32.const 0)))
+    (local.set 0x204 (i64.load offset=0x204 align=1 (i32.const 0)))
+    (local.set 0x205 (i64.load offset=0x205 align=1 (i32.const 0)))
+    (local.set 0x206 (i64.load offset=0x206 align=1 (i32.const 0)))
+    (local.set 0x207 (i64.load offset=0x207 align=1 (i32.const 0)))
+    (local.set 0x208 (i64.load offset=0x208 align=1 (i32.const 0)))
+    (local.set 0x209 (i64.load offset=0x209 align=1 (i32.const 0)))
+    (local.set 0x20a (i64.load offset=0x20a align=1 (i32.const 0)))
+    (local.set 0x20b (i64.load offset=0x20b align=1 (i32.const 0)))
+    (local.set 0x20c (i64.load offset=0x20c align=1 (i32.const 0)))
+    (local.set 0x20d (i64.load offset=0x20d align=1 (i32.const 0)))
+    (local.set 0x20e (i64.load offset=0x20e align=1 (i32.const 0)))
+    (local.set 0x20f (i64.load offset=0x20f align=1 (i32.const 0)))
+    (local.set 0x210 (i64.load offset=0x210 align=1 (i32.const 0)))
+    (local.set 0x211 (i64.load offset=0x211 align=1 (i32.const 0)))
+    (local.set 0x212 (i64.load offset=0x212 align=1 (i32.const 0)))
+    (local.set 0x213 (i64.load offset=0x213 align=1 (i32.const 0)))
+    (local.set 0x214 (i64.load offset=0x214 align=1 (i32.const 0)))
+    (local.set 0x215 (i64.load offset=0x215 align=1 (i32.const 0)))
+    (local.set 0x216 (i64.load offset=0x216 align=1 (i32.const 0)))
+    (local.set 0x217 (i64.load offset=0x217 align=1 (i32.const 0)))
+    (local.set 0x218 (i64.load offset=0x218 align=1 (i32.const 0)))
+    (local.set 0x219 (i64.load offset=0x219 align=1 (i32.const 0)))
+    (local.set 0x21a (i64.load offset=0x21a align=1 (i32.const 0)))
+    (local.set 0x21b (i64.load offset=0x21b align=1 (i32.const 0)))
+    (local.set 0x21c (i64.load offset=0x21c align=1 (i32.const 0)))
+    (local.set 0x21d (i64.load offset=0x21d align=1 (i32.const 0)))
+    (local.set 0x21e (i64.load offset=0x21e align=1 (i32.const 0)))
+    (local.set 0x21f (i64.load offset=0x21f align=1 (i32.const 0)))
+    (local.set 0x220 (i64.load offset=0x220 align=1 (i32.const 0)))
+    (local.set 0x221 (i64.load offset=0x221 align=1 (i32.const 0)))
+    (local.set 0x222 (i64.load offset=0x222 align=1 (i32.const 0)))
+    (local.set 0x223 (i64.load offset=0x223 align=1 (i32.const 0)))
+    (local.set 0x224 (i64.load offset=0x224 align=1 (i32.const 0)))
+    (local.set 0x225 (i64.load offset=0x225 align=1 (i32.const 0)))
+    (local.set 0x226 (i64.load offset=0x226 align=1 (i32.const 0)))
+    (local.set 0x227 (i64.load offset=0x227 align=1 (i32.const 0)))
+    (local.set 0x228 (i64.load offset=0x228 align=1 (i32.const 0)))
+    (local.set 0x229 (i64.load offset=0x229 align=1 (i32.const 0)))
+    (local.set 0x22a (i64.load offset=0x22a align=1 (i32.const 0)))
+    (local.set 0x22b (i64.load offset=0x22b align=1 (i32.const 0)))
+    (local.set 0x22c (i64.load offset=0x22c align=1 (i32.const 0)))
+    (local.set 0x22d (i64.load offset=0x22d align=1 (i32.const 0)))
+    (local.set 0x22e (i64.load offset=0x22e align=1 (i32.const 0)))
+    (local.set 0x22f (i64.load offset=0x22f align=1 (i32.const 0)))
+    (local.set 0x230 (i64.load offset=0x230 align=1 (i32.const 0)))
+    (local.set 0x231 (i64.load offset=0x231 align=1 (i32.const 0)))
+    (local.set 0x232 (i64.load offset=0x232 align=1 (i32.const 0)))
+    (local.set 0x233 (i64.load offset=0x233 align=1 (i32.const 0)))
+    (local.set 0x234 (i64.load offset=0x234 align=1 (i32.const 0)))
+    (local.set 0x235 (i64.load offset=0x235 align=1 (i32.const 0)))
+    (local.set 0x236 (i64.load offset=0x236 align=1 (i32.const 0)))
+    (local.set 0x237 (i64.load offset=0x237 align=1 (i32.const 0)))
+    (local.set 0x238 (i64.load offset=0x238 align=1 (i32.const 0)))
+    (local.set 0x239 (i64.load offset=0x239 align=1 (i32.const 0)))
+    (local.set 0x23a (i64.load offset=0x23a align=1 (i32.const 0)))
+    (local.set 0x23b (i64.load offset=0x23b align=1 (i32.const 0)))
+    (local.set 0x23c (i64.load offset=0x23c align=1 (i32.const 0)))
+    (local.set 0x23d (i64.load offset=0x23d align=1 (i32.const 0)))
+    (local.set 0x23e (i64.load offset=0x23e align=1 (i32.const 0)))
+    (local.set 0x23f (i64.load offset=0x23f align=1 (i32.const 0)))
+    (local.set 0x240 (i64.load offset=0x240 align=1 (i32.const 0)))
+    (local.set 0x241 (i64.load offset=0x241 align=1 (i32.const 0)))
+    (local.set 0x242 (i64.load offset=0x242 align=1 (i32.const 0)))
+    (local.set 0x243 (i64.load offset=0x243 align=1 (i32.const 0)))
+    (local.set 0x244 (i64.load offset=0x244 align=1 (i32.const 0)))
+    (local.set 0x245 (i64.load offset=0x245 align=1 (i32.const 0)))
+    (local.set 0x246 (i64.load offset=0x246 align=1 (i32.const 0)))
+    (local.set 0x247 (i64.load offset=0x247 align=1 (i32.const 0)))
+    (local.set 0x248 (i64.load offset=0x248 align=1 (i32.const 0)))
+    (local.set 0x249 (i64.load offset=0x249 align=1 (i32.const 0)))
+    (local.set 0x24a (i64.load offset=0x24a align=1 (i32.const 0)))
+    (local.set 0x24b (i64.load offset=0x24b align=1 (i32.const 0)))
+    (local.set 0x24c (i64.load offset=0x24c align=1 (i32.const 0)))
+    (local.set 0x24d (i64.load offset=0x24d align=1 (i32.const 0)))
+    (local.set 0x24e (i64.load offset=0x24e align=1 (i32.const 0)))
+    (local.set 0x24f (i64.load offset=0x24f align=1 (i32.const 0)))
+    (local.set 0x250 (i64.load offset=0x250 align=1 (i32.const 0)))
+    (local.set 0x251 (i64.load offset=0x251 align=1 (i32.const 0)))
+    (local.set 0x252 (i64.load offset=0x252 align=1 (i32.const 0)))
+    (local.set 0x253 (i64.load offset=0x253 align=1 (i32.const 0)))
+    (local.set 0x254 (i64.load offset=0x254 align=1 (i32.const 0)))
+    (local.set 0x255 (i64.load offset=0x255 align=1 (i32.const 0)))
+    (local.set 0x256 (i64.load offset=0x256 align=1 (i32.const 0)))
+    (local.set 0x257 (i64.load offset=0x257 align=1 (i32.const 0)))
+    (local.set 0x258 (i64.load offset=0x258 align=1 (i32.const 0)))
+    (local.set 0x259 (i64.load offset=0x259 align=1 (i32.const 0)))
+    (local.set 0x25a (i64.load offset=0x25a align=1 (i32.const 0)))
+    (local.set 0x25b (i64.load offset=0x25b align=1 (i32.const 0)))
+    (local.set 0x25c (i64.load offset=0x25c align=1 (i32.const 0)))
+    (local.set 0x25d (i64.load offset=0x25d align=1 (i32.const 0)))
+    (local.set 0x25e (i64.load offset=0x25e align=1 (i32.const 0)))
+    (local.set 0x25f (i64.load offset=0x25f align=1 (i32.const 0)))
+    (local.set 0x260 (i64.load offset=0x260 align=1 (i32.const 0)))
+    (local.set 0x261 (i64.load offset=0x261 align=1 (i32.const 0)))
+    (local.set 0x262 (i64.load offset=0x262 align=1 (i32.const 0)))
+    (local.set 0x263 (i64.load offset=0x263 align=1 (i32.const 0)))
+    (local.set 0x264 (i64.load offset=0x264 align=1 (i32.const 0)))
+    (local.set 0x265 (i64.load offset=0x265 align=1 (i32.const 0)))
+    (local.set 0x266 (i64.load offset=0x266 align=1 (i32.const 0)))
+    (local.set 0x267 (i64.load offset=0x267 align=1 (i32.const 0)))
+    (local.set 0x268 (i64.load offset=0x268 align=1 (i32.const 0)))
+    (local.set 0x269 (i64.load offset=0x269 align=1 (i32.const 0)))
+    (local.set 0x26a (i64.load offset=0x26a align=1 (i32.const 0)))
+    (local.set 0x26b (i64.load offset=0x26b align=1 (i32.const 0)))
+    (local.set 0x26c (i64.load offset=0x26c align=1 (i32.const 0)))
+    (local.set 0x26d (i64.load offset=0x26d align=1 (i32.const 0)))
+    (local.set 0x26e (i64.load offset=0x26e align=1 (i32.const 0)))
+    (local.set 0x26f (i64.load offset=0x26f align=1 (i32.const 0)))
+    (local.set 0x270 (i64.load offset=0x270 align=1 (i32.const 0)))
+    (local.set 0x271 (i64.load offset=0x271 align=1 (i32.const 0)))
+    (local.set 0x272 (i64.load offset=0x272 align=1 (i32.const 0)))
+    (local.set 0x273 (i64.load offset=0x273 align=1 (i32.const 0)))
+    (local.set 0x274 (i64.load offset=0x274 align=1 (i32.const 0)))
+    (local.set 0x275 (i64.load offset=0x275 align=1 (i32.const 0)))
+    (local.set 0x276 (i64.load offset=0x276 align=1 (i32.const 0)))
+    (local.set 0x277 (i64.load offset=0x277 align=1 (i32.const 0)))
+    (local.set 0x278 (i64.load offset=0x278 align=1 (i32.const 0)))
+    (local.set 0x279 (i64.load offset=0x279 align=1 (i32.const 0)))
+    (local.set 0x27a (i64.load offset=0x27a align=1 (i32.const 0)))
+    (local.set 0x27b (i64.load offset=0x27b align=1 (i32.const 0)))
+    (local.set 0x27c (i64.load offset=0x27c align=1 (i32.const 0)))
+    (local.set 0x27d (i64.load offset=0x27d align=1 (i32.const 0)))
+    (local.set 0x27e (i64.load offset=0x27e align=1 (i32.const 0)))
+    (local.set 0x27f (i64.load offset=0x27f align=1 (i32.const 0)))
+    (local.set 0x280 (i64.load offset=0x280 align=1 (i32.const 0)))
+    (local.set 0x281 (i64.load offset=0x281 align=1 (i32.const 0)))
+    (local.set 0x282 (i64.load offset=0x282 align=1 (i32.const 0)))
+    (local.set 0x283 (i64.load offset=0x283 align=1 (i32.const 0)))
+    (local.set 0x284 (i64.load offset=0x284 align=1 (i32.const 0)))
+    (local.set 0x285 (i64.load offset=0x285 align=1 (i32.const 0)))
+    (local.set 0x286 (i64.load offset=0x286 align=1 (i32.const 0)))
+    (local.set 0x287 (i64.load offset=0x287 align=1 (i32.const 0)))
+    (local.set 0x288 (i64.load offset=0x288 align=1 (i32.const 0)))
+    (local.set 0x289 (i64.load offset=0x289 align=1 (i32.const 0)))
+    (local.set 0x28a (i64.load offset=0x28a align=1 (i32.const 0)))
+    (local.set 0x28b (i64.load offset=0x28b align=1 (i32.const 0)))
+    (local.set 0x28c (i64.load offset=0x28c align=1 (i32.const 0)))
+    (local.set 0x28d (i64.load offset=0x28d align=1 (i32.const 0)))
+    (local.set 0x28e (i64.load offset=0x28e align=1 (i32.const 0)))
+    (local.set 0x28f (i64.load offset=0x28f align=1 (i32.const 0)))
+    (local.set 0x290 (i64.load offset=0x290 align=1 (i32.const 0)))
+    (local.set 0x291 (i64.load offset=0x291 align=1 (i32.const 0)))
+    (local.set 0x292 (i64.load offset=0x292 align=1 (i32.const 0)))
+    (local.set 0x293 (i64.load offset=0x293 align=1 (i32.const 0)))
+    (local.set 0x294 (i64.load offset=0x294 align=1 (i32.const 0)))
+    (local.set 0x295 (i64.load offset=0x295 align=1 (i32.const 0)))
+    (local.set 0x296 (i64.load offset=0x296 align=1 (i32.const 0)))
+    (local.set 0x297 (i64.load offset=0x297 align=1 (i32.const 0)))
+    (local.set 0x298 (i64.load offset=0x298 align=1 (i32.const 0)))
+    (local.set 0x299 (i64.load offset=0x299 align=1 (i32.const 0)))
+    (local.set 0x29a (i64.load offset=0x29a align=1 (i32.const 0)))
+    (local.set 0x29b (i64.load offset=0x29b align=1 (i32.const 0)))
+    (local.set 0x29c (i64.load offset=0x29c align=1 (i32.const 0)))
+    (local.set 0x29d (i64.load offset=0x29d align=1 (i32.const 0)))
+    (local.set 0x29e (i64.load offset=0x29e align=1 (i32.const 0)))
+    (local.set 0x29f (i64.load offset=0x29f align=1 (i32.const 0)))
+    (local.set 0x2a0 (i64.load offset=0x2a0 align=1 (i32.const 0)))
+    (local.set 0x2a1 (i64.load offset=0x2a1 align=1 (i32.const 0)))
+    (local.set 0x2a2 (i64.load offset=0x2a2 align=1 (i32.const 0)))
+    (local.set 0x2a3 (i64.load offset=0x2a3 align=1 (i32.const 0)))
+    (local.set 0x2a4 (i64.load offset=0x2a4 align=1 (i32.const 0)))
+    (local.set 0x2a5 (i64.load offset=0x2a5 align=1 (i32.const 0)))
+    (local.set 0x2a6 (i64.load offset=0x2a6 align=1 (i32.const 0)))
+    (local.set 0x2a7 (i64.load offset=0x2a7 align=1 (i32.const 0)))
+    (local.set 0x2a8 (i64.load offset=0x2a8 align=1 (i32.const 0)))
+    (local.set 0x2a9 (i64.load offset=0x2a9 align=1 (i32.const 0)))
+    (local.set 0x2aa (i64.load offset=0x2aa align=1 (i32.const 0)))
+    (local.set 0x2ab (i64.load offset=0x2ab align=1 (i32.const 0)))
+    (local.set 0x2ac (i64.load offset=0x2ac align=1 (i32.const 0)))
+    (local.set 0x2ad (i64.load offset=0x2ad align=1 (i32.const 0)))
+    (local.set 0x2ae (i64.load offset=0x2ae align=1 (i32.const 0)))
+    (local.set 0x2af (i64.load offset=0x2af align=1 (i32.const 0)))
+    (local.set 0x2b0 (i64.load offset=0x2b0 align=1 (i32.const 0)))
+    (local.set 0x2b1 (i64.load offset=0x2b1 align=1 (i32.const 0)))
+    (local.set 0x2b2 (i64.load offset=0x2b2 align=1 (i32.const 0)))
+    (local.set 0x2b3 (i64.load offset=0x2b3 align=1 (i32.const 0)))
+    (local.set 0x2b4 (i64.load offset=0x2b4 align=1 (i32.const 0)))
+    (local.set 0x2b5 (i64.load offset=0x2b5 align=1 (i32.const 0)))
+    (local.set 0x2b6 (i64.load offset=0x2b6 align=1 (i32.const 0)))
+    (local.set 0x2b7 (i64.load offset=0x2b7 align=1 (i32.const 0)))
+    (local.set 0x2b8 (i64.load offset=0x2b8 align=1 (i32.const 0)))
+    (local.set 0x2b9 (i64.load offset=0x2b9 align=1 (i32.const 0)))
+    (local.set 0x2ba (i64.load offset=0x2ba align=1 (i32.const 0)))
+    (local.set 0x2bb (i64.load offset=0x2bb align=1 (i32.const 0)))
+    (local.set 0x2bc (i64.load offset=0x2bc align=1 (i32.const 0)))
+    (local.set 0x2bd (i64.load offset=0x2bd align=1 (i32.const 0)))
+    (local.set 0x2be (i64.load offset=0x2be align=1 (i32.const 0)))
+    (local.set 0x2bf (i64.load offset=0x2bf align=1 (i32.const 0)))
+    (local.set 0x2c0 (i64.load offset=0x2c0 align=1 (i32.const 0)))
+    (local.set 0x2c1 (i64.load offset=0x2c1 align=1 (i32.const 0)))
+    (local.set 0x2c2 (i64.load offset=0x2c2 align=1 (i32.const 0)))
+    (local.set 0x2c3 (i64.load offset=0x2c3 align=1 (i32.const 0)))
+    (local.set 0x2c4 (i64.load offset=0x2c4 align=1 (i32.const 0)))
+    (local.set 0x2c5 (i64.load offset=0x2c5 align=1 (i32.const 0)))
+    (local.set 0x2c6 (i64.load offset=0x2c6 align=1 (i32.const 0)))
+    (local.set 0x2c7 (i64.load offset=0x2c7 align=1 (i32.const 0)))
+    (local.set 0x2c8 (i64.load offset=0x2c8 align=1 (i32.const 0)))
+    (local.set 0x2c9 (i64.load offset=0x2c9 align=1 (i32.const 0)))
+    (local.set 0x2ca (i64.load offset=0x2ca align=1 (i32.const 0)))
+    (local.set 0x2cb (i64.load offset=0x2cb align=1 (i32.const 0)))
+    (local.set 0x2cc (i64.load offset=0x2cc align=1 (i32.const 0)))
+    (local.set 0x2cd (i64.load offset=0x2cd align=1 (i32.const 0)))
+    (local.set 0x2ce (i64.load offset=0x2ce align=1 (i32.const 0)))
+    (local.set 0x2cf (i64.load offset=0x2cf align=1 (i32.const 0)))
+    (local.set 0x2d0 (i64.load offset=0x2d0 align=1 (i32.const 0)))
+    (local.set 0x2d1 (i64.load offset=0x2d1 align=1 (i32.const 0)))
+    (local.set 0x2d2 (i64.load offset=0x2d2 align=1 (i32.const 0)))
+    (local.set 0x2d3 (i64.load offset=0x2d3 align=1 (i32.const 0)))
+    (local.set 0x2d4 (i64.load offset=0x2d4 align=1 (i32.const 0)))
+    (local.set 0x2d5 (i64.load offset=0x2d5 align=1 (i32.const 0)))
+    (local.set 0x2d6 (i64.load offset=0x2d6 align=1 (i32.const 0)))
+    (local.set 0x2d7 (i64.load offset=0x2d7 align=1 (i32.const 0)))
+    (local.set 0x2d8 (i64.load offset=0x2d8 align=1 (i32.const 0)))
+    (local.set 0x2d9 (i64.load offset=0x2d9 align=1 (i32.const 0)))
+    (local.set 0x2da (i64.load offset=0x2da align=1 (i32.const 0)))
+    (local.set 0x2db (i64.load offset=0x2db align=1 (i32.const 0)))
+    (local.set 0x2dc (i64.load offset=0x2dc align=1 (i32.const 0)))
+    (local.set 0x2dd (i64.load offset=0x2dd align=1 (i32.const 0)))
+    (local.set 0x2de (i64.load offset=0x2de align=1 (i32.const 0)))
+    (local.set 0x2df (i64.load offset=0x2df align=1 (i32.const 0)))
+    (local.set 0x2e0 (i64.load offset=0x2e0 align=1 (i32.const 0)))
+    (local.set 0x2e1 (i64.load offset=0x2e1 align=1 (i32.const 0)))
+    (local.set 0x2e2 (i64.load offset=0x2e2 align=1 (i32.const 0)))
+    (local.set 0x2e3 (i64.load offset=0x2e3 align=1 (i32.const 0)))
+    (local.set 0x2e4 (i64.load offset=0x2e4 align=1 (i32.const 0)))
+    (local.set 0x2e5 (i64.load offset=0x2e5 align=1 (i32.const 0)))
+    (local.set 0x2e6 (i64.load offset=0x2e6 align=1 (i32.const 0)))
+    (local.set 0x2e7 (i64.load offset=0x2e7 align=1 (i32.const 0)))
+    (local.set 0x2e8 (i64.load offset=0x2e8 align=1 (i32.const 0)))
+    (local.set 0x2e9 (i64.load offset=0x2e9 align=1 (i32.const 0)))
+    (local.set 0x2ea (i64.load offset=0x2ea align=1 (i32.const 0)))
+    (local.set 0x2eb (i64.load offset=0x2eb align=1 (i32.const 0)))
+    (local.set 0x2ec (i64.load offset=0x2ec align=1 (i32.const 0)))
+    (local.set 0x2ed (i64.load offset=0x2ed align=1 (i32.const 0)))
+    (local.set 0x2ee (i64.load offset=0x2ee align=1 (i32.const 0)))
+    (local.set 0x2ef (i64.load offset=0x2ef align=1 (i32.const 0)))
+    (local.set 0x2f0 (i64.load offset=0x2f0 align=1 (i32.const 0)))
+    (local.set 0x2f1 (i64.load offset=0x2f1 align=1 (i32.const 0)))
+    (local.set 0x2f2 (i64.load offset=0x2f2 align=1 (i32.const 0)))
+    (local.set 0x2f3 (i64.load offset=0x2f3 align=1 (i32.const 0)))
+    (local.set 0x2f4 (i64.load offset=0x2f4 align=1 (i32.const 0)))
+    (local.set 0x2f5 (i64.load offset=0x2f5 align=1 (i32.const 0)))
+    (local.set 0x2f6 (i64.load offset=0x2f6 align=1 (i32.const 0)))
+    (local.set 0x2f7 (i64.load offset=0x2f7 align=1 (i32.const 0)))
+    (local.set 0x2f8 (i64.load offset=0x2f8 align=1 (i32.const 0)))
+    (local.set 0x2f9 (i64.load offset=0x2f9 align=1 (i32.const 0)))
+    (local.set 0x2fa (i64.load offset=0x2fa align=1 (i32.const 0)))
+    (local.set 0x2fb (i64.load offset=0x2fb align=1 (i32.const 0)))
+    (local.set 0x2fc (i64.load offset=0x2fc align=1 (i32.const 0)))
+    (local.set 0x2fd (i64.load offset=0x2fd align=1 (i32.const 0)))
+    (local.set 0x2fe (i64.load offset=0x2fe align=1 (i32.const 0)))
+    (local.set 0x2ff (i64.load offset=0x2ff align=1 (i32.const 0)))
+    (local.set 0x300 (i64.load offset=0x300 align=1 (i32.const 0)))
+    (local.set 0x301 (i64.load offset=0x301 align=1 (i32.const 0)))
+    (local.set 0x302 (i64.load offset=0x302 align=1 (i32.const 0)))
+    (local.set 0x303 (i64.load offset=0x303 align=1 (i32.const 0)))
+    (local.set 0x304 (i64.load offset=0x304 align=1 (i32.const 0)))
+    (local.set 0x305 (i64.load offset=0x305 align=1 (i32.const 0)))
+    (local.set 0x306 (i64.load offset=0x306 align=1 (i32.const 0)))
+    (local.set 0x307 (i64.load offset=0x307 align=1 (i32.const 0)))
+    (local.set 0x308 (i64.load offset=0x308 align=1 (i32.const 0)))
+    (local.set 0x309 (i64.load offset=0x309 align=1 (i32.const 0)))
+    (local.set 0x30a (i64.load offset=0x30a align=1 (i32.const 0)))
+    (local.set 0x30b (i64.load offset=0x30b align=1 (i32.const 0)))
+    (local.set 0x30c (i64.load offset=0x30c align=1 (i32.const 0)))
+    (local.set 0x30d (i64.load offset=0x30d align=1 (i32.const 0)))
+    (local.set 0x30e (i64.load offset=0x30e align=1 (i32.const 0)))
+    (local.set 0x30f (i64.load offset=0x30f align=1 (i32.const 0)))
+    (local.set 0x310 (i64.load offset=0x310 align=1 (i32.const 0)))
+    (local.set 0x311 (i64.load offset=0x311 align=1 (i32.const 0)))
+    (local.set 0x312 (i64.load offset=0x312 align=1 (i32.const 0)))
+    (local.set 0x313 (i64.load offset=0x313 align=1 (i32.const 0)))
+    (local.set 0x314 (i64.load offset=0x314 align=1 (i32.const 0)))
+    (local.set 0x315 (i64.load offset=0x315 align=1 (i32.const 0)))
+    (local.set 0x316 (i64.load offset=0x316 align=1 (i32.const 0)))
+    (local.set 0x317 (i64.load offset=0x317 align=1 (i32.const 0)))
+    (local.set 0x318 (i64.load offset=0x318 align=1 (i32.const 0)))
+    (local.set 0x319 (i64.load offset=0x319 align=1 (i32.const 0)))
+    (local.set 0x31a (i64.load offset=0x31a align=1 (i32.const 0)))
+    (local.set 0x31b (i64.load offset=0x31b align=1 (i32.const 0)))
+    (local.set 0x31c (i64.load offset=0x31c align=1 (i32.const 0)))
+    (local.set 0x31d (i64.load offset=0x31d align=1 (i32.const 0)))
+    (local.set 0x31e (i64.load offset=0x31e align=1 (i32.const 0)))
+    (local.set 0x31f (i64.load offset=0x31f align=1 (i32.const 0)))
+    (local.set 0x320 (i64.load offset=0x320 align=1 (i32.const 0)))
+    (local.set 0x321 (i64.load offset=0x321 align=1 (i32.const 0)))
+    (local.set 0x322 (i64.load offset=0x322 align=1 (i32.const 0)))
+    (local.set 0x323 (i64.load offset=0x323 align=1 (i32.const 0)))
+    (local.set 0x324 (i64.load offset=0x324 align=1 (i32.const 0)))
+    (local.set 0x325 (i64.load offset=0x325 align=1 (i32.const 0)))
+    (local.set 0x326 (i64.load offset=0x326 align=1 (i32.const 0)))
+    (local.set 0x327 (i64.load offset=0x327 align=1 (i32.const 0)))
+    (local.set 0x328 (i64.load offset=0x328 align=1 (i32.const 0)))
+    (local.set 0x329 (i64.load offset=0x329 align=1 (i32.const 0)))
+    (local.set 0x32a (i64.load offset=0x32a align=1 (i32.const 0)))
+    (local.set 0x32b (i64.load offset=0x32b align=1 (i32.const 0)))
+    (local.set 0x32c (i64.load offset=0x32c align=1 (i32.const 0)))
+    (local.set 0x32d (i64.load offset=0x32d align=1 (i32.const 0)))
+    (local.set 0x32e (i64.load offset=0x32e align=1 (i32.const 0)))
+    (local.set 0x32f (i64.load offset=0x32f align=1 (i32.const 0)))
+    (local.set 0x330 (i64.load offset=0x330 align=1 (i32.const 0)))
+    (local.set 0x331 (i64.load offset=0x331 align=1 (i32.const 0)))
+    (local.set 0x332 (i64.load offset=0x332 align=1 (i32.const 0)))
+    (local.set 0x333 (i64.load offset=0x333 align=1 (i32.const 0)))
+    (local.set 0x334 (i64.load offset=0x334 align=1 (i32.const 0)))
+    (local.set 0x335 (i64.load offset=0x335 align=1 (i32.const 0)))
+    (local.set 0x336 (i64.load offset=0x336 align=1 (i32.const 0)))
+    (local.set 0x337 (i64.load offset=0x337 align=1 (i32.const 0)))
+    (local.set 0x338 (i64.load offset=0x338 align=1 (i32.const 0)))
+    (local.set 0x339 (i64.load offset=0x339 align=1 (i32.const 0)))
+    (local.set 0x33a (i64.load offset=0x33a align=1 (i32.const 0)))
+    (local.set 0x33b (i64.load offset=0x33b align=1 (i32.const 0)))
+    (local.set 0x33c (i64.load offset=0x33c align=1 (i32.const 0)))
+    (local.set 0x33d (i64.load offset=0x33d align=1 (i32.const 0)))
+    (local.set 0x33e (i64.load offset=0x33e align=1 (i32.const 0)))
+    (local.set 0x33f (i64.load offset=0x33f align=1 (i32.const 0)))
+    (local.set 0x340 (i64.load offset=0x340 align=1 (i32.const 0)))
+    (local.set 0x341 (i64.load offset=0x341 align=1 (i32.const 0)))
+    (local.set 0x342 (i64.load offset=0x342 align=1 (i32.const 0)))
+    (local.set 0x343 (i64.load offset=0x343 align=1 (i32.const 0)))
+    (local.set 0x344 (i64.load offset=0x344 align=1 (i32.const 0)))
+    (local.set 0x345 (i64.load offset=0x345 align=1 (i32.const 0)))
+    (local.set 0x346 (i64.load offset=0x346 align=1 (i32.const 0)))
+    (local.set 0x347 (i64.load offset=0x347 align=1 (i32.const 0)))
+    (local.set 0x348 (i64.load offset=0x348 align=1 (i32.const 0)))
+    (local.set 0x349 (i64.load offset=0x349 align=1 (i32.const 0)))
+    (local.set 0x34a (i64.load offset=0x34a align=1 (i32.const 0)))
+    (local.set 0x34b (i64.load offset=0x34b align=1 (i32.const 0)))
+    (local.set 0x34c (i64.load offset=0x34c align=1 (i32.const 0)))
+    (local.set 0x34d (i64.load offset=0x34d align=1 (i32.const 0)))
+    (local.set 0x34e (i64.load offset=0x34e align=1 (i32.const 0)))
+    (local.set 0x34f (i64.load offset=0x34f align=1 (i32.const 0)))
+    (local.set 0x350 (i64.load offset=0x350 align=1 (i32.const 0)))
+    (local.set 0x351 (i64.load offset=0x351 align=1 (i32.const 0)))
+    (local.set 0x352 (i64.load offset=0x352 align=1 (i32.const 0)))
+    (local.set 0x353 (i64.load offset=0x353 align=1 (i32.const 0)))
+    (local.set 0x354 (i64.load offset=0x354 align=1 (i32.const 0)))
+    (local.set 0x355 (i64.load offset=0x355 align=1 (i32.const 0)))
+    (local.set 0x356 (i64.load offset=0x356 align=1 (i32.const 0)))
+    (local.set 0x357 (i64.load offset=0x357 align=1 (i32.const 0)))
+    (local.set 0x358 (i64.load offset=0x358 align=1 (i32.const 0)))
+    (local.set 0x359 (i64.load offset=0x359 align=1 (i32.const 0)))
+    (local.set 0x35a (i64.load offset=0x35a align=1 (i32.const 0)))
+    (local.set 0x35b (i64.load offset=0x35b align=1 (i32.const 0)))
+    (local.set 0x35c (i64.load offset=0x35c align=1 (i32.const 0)))
+    (local.set 0x35d (i64.load offset=0x35d align=1 (i32.const 0)))
+    (local.set 0x35e (i64.load offset=0x35e align=1 (i32.const 0)))
+    (local.set 0x35f (i64.load offset=0x35f align=1 (i32.const 0)))
+    (local.set 0x360 (i64.load offset=0x360 align=1 (i32.const 0)))
+    (local.set 0x361 (i64.load offset=0x361 align=1 (i32.const 0)))
+    (local.set 0x362 (i64.load offset=0x362 align=1 (i32.const 0)))
+    (local.set 0x363 (i64.load offset=0x363 align=1 (i32.const 0)))
+    (local.set 0x364 (i64.load offset=0x364 align=1 (i32.const 0)))
+    (local.set 0x365 (i64.load offset=0x365 align=1 (i32.const 0)))
+    (local.set 0x366 (i64.load offset=0x366 align=1 (i32.const 0)))
+    (local.set 0x367 (i64.load offset=0x367 align=1 (i32.const 0)))
+    (local.set 0x368 (i64.load offset=0x368 align=1 (i32.const 0)))
+    (local.set 0x369 (i64.load offset=0x369 align=1 (i32.const 0)))
+    (local.set 0x36a (i64.load offset=0x36a align=1 (i32.const 0)))
+    (local.set 0x36b (i64.load offset=0x36b align=1 (i32.const 0)))
+    (local.set 0x36c (i64.load offset=0x36c align=1 (i32.const 0)))
+    (local.set 0x36d (i64.load offset=0x36d align=1 (i32.const 0)))
+    (local.set 0x36e (i64.load offset=0x36e align=1 (i32.const 0)))
+    (local.set 0x36f (i64.load offset=0x36f align=1 (i32.const 0)))
+    (local.set 0x370 (i64.load offset=0x370 align=1 (i32.const 0)))
+    (local.set 0x371 (i64.load offset=0x371 align=1 (i32.const 0)))
+    (local.set 0x372 (i64.load offset=0x372 align=1 (i32.const 0)))
+    (local.set 0x373 (i64.load offset=0x373 align=1 (i32.const 0)))
+    (local.set 0x374 (i64.load offset=0x374 align=1 (i32.const 0)))
+    (local.set 0x375 (i64.load offset=0x375 align=1 (i32.const 0)))
+    (local.set 0x376 (i64.load offset=0x376 align=1 (i32.const 0)))
+    (local.set 0x377 (i64.load offset=0x377 align=1 (i32.const 0)))
+    (local.set 0x378 (i64.load offset=0x378 align=1 (i32.const 0)))
+    (local.set 0x379 (i64.load offset=0x379 align=1 (i32.const 0)))
+    (local.set 0x37a (i64.load offset=0x37a align=1 (i32.const 0)))
+    (local.set 0x37b (i64.load offset=0x37b align=1 (i32.const 0)))
+    (local.set 0x37c (i64.load offset=0x37c align=1 (i32.const 0)))
+    (local.set 0x37d (i64.load offset=0x37d align=1 (i32.const 0)))
+    (local.set 0x37e (i64.load offset=0x37e align=1 (i32.const 0)))
+    (local.set 0x37f (i64.load offset=0x37f align=1 (i32.const 0)))
+    (local.set 0x380 (i64.load offset=0x380 align=1 (i32.const 0)))
+    (local.set 0x381 (i64.load offset=0x381 align=1 (i32.const 0)))
+    (local.set 0x382 (i64.load offset=0x382 align=1 (i32.const 0)))
+    (local.set 0x383 (i64.load offset=0x383 align=1 (i32.const 0)))
+    (local.set 0x384 (i64.load offset=0x384 align=1 (i32.const 0)))
+    (local.set 0x385 (i64.load offset=0x385 align=1 (i32.const 0)))
+    (local.set 0x386 (i64.load offset=0x386 align=1 (i32.const 0)))
+    (local.set 0x387 (i64.load offset=0x387 align=1 (i32.const 0)))
+    (local.set 0x388 (i64.load offset=0x388 align=1 (i32.const 0)))
+    (local.set 0x389 (i64.load offset=0x389 align=1 (i32.const 0)))
+    (local.set 0x38a (i64.load offset=0x38a align=1 (i32.const 0)))
+    (local.set 0x38b (i64.load offset=0x38b align=1 (i32.const 0)))
+    (local.set 0x38c (i64.load offset=0x38c align=1 (i32.const 0)))
+    (local.set 0x38d (i64.load offset=0x38d align=1 (i32.const 0)))
+    (local.set 0x38e (i64.load offset=0x38e align=1 (i32.const 0)))
+    (local.set 0x38f (i64.load offset=0x38f align=1 (i32.const 0)))
+    (local.set 0x390 (i64.load offset=0x390 align=1 (i32.const 0)))
+    (local.set 0x391 (i64.load offset=0x391 align=1 (i32.const 0)))
+    (local.set 0x392 (i64.load offset=0x392 align=1 (i32.const 0)))
+    (local.set 0x393 (i64.load offset=0x393 align=1 (i32.const 0)))
+    (local.set 0x394 (i64.load offset=0x394 align=1 (i32.const 0)))
+    (local.set 0x395 (i64.load offset=0x395 align=1 (i32.const 0)))
+    (local.set 0x396 (i64.load offset=0x396 align=1 (i32.const 0)))
+    (local.set 0x397 (i64.load offset=0x397 align=1 (i32.const 0)))
+    (local.set 0x398 (i64.load offset=0x398 align=1 (i32.const 0)))
+    (local.set 0x399 (i64.load offset=0x399 align=1 (i32.const 0)))
+    (local.set 0x39a (i64.load offset=0x39a align=1 (i32.const 0)))
+    (local.set 0x39b (i64.load offset=0x39b align=1 (i32.const 0)))
+    (local.set 0x39c (i64.load offset=0x39c align=1 (i32.const 0)))
+    (local.set 0x39d (i64.load offset=0x39d align=1 (i32.const 0)))
+    (local.set 0x39e (i64.load offset=0x39e align=1 (i32.const 0)))
+    (local.set 0x39f (i64.load offset=0x39f align=1 (i32.const 0)))
+    (local.set 0x3a0 (i64.load offset=0x3a0 align=1 (i32.const 0)))
+    (local.set 0x3a1 (i64.load offset=0x3a1 align=1 (i32.const 0)))
+    (local.set 0x3a2 (i64.load offset=0x3a2 align=1 (i32.const 0)))
+    (local.set 0x3a3 (i64.load offset=0x3a3 align=1 (i32.const 0)))
+    (local.set 0x3a4 (i64.load offset=0x3a4 align=1 (i32.const 0)))
+    (local.set 0x3a5 (i64.load offset=0x3a5 align=1 (i32.const 0)))
+    (local.set 0x3a6 (i64.load offset=0x3a6 align=1 (i32.const 0)))
+    (local.set 0x3a7 (i64.load offset=0x3a7 align=1 (i32.const 0)))
+    (local.set 0x3a8 (i64.load offset=0x3a8 align=1 (i32.const 0)))
+    (local.set 0x3a9 (i64.load offset=0x3a9 align=1 (i32.const 0)))
+    (local.set 0x3aa (i64.load offset=0x3aa align=1 (i32.const 0)))
+    (local.set 0x3ab (i64.load offset=0x3ab align=1 (i32.const 0)))
+    (local.set 0x3ac (i64.load offset=0x3ac align=1 (i32.const 0)))
+    (local.set 0x3ad (i64.load offset=0x3ad align=1 (i32.const 0)))
+    (local.set 0x3ae (i64.load offset=0x3ae align=1 (i32.const 0)))
+    (local.set 0x3af (i64.load offset=0x3af align=1 (i32.const 0)))
+    (local.set 0x3b0 (i64.load offset=0x3b0 align=1 (i32.const 0)))
+    (local.set 0x3b1 (i64.load offset=0x3b1 align=1 (i32.const 0)))
+    (local.set 0x3b2 (i64.load offset=0x3b2 align=1 (i32.const 0)))
+    (local.set 0x3b3 (i64.load offset=0x3b3 align=1 (i32.const 0)))
+    (local.set 0x3b4 (i64.load offset=0x3b4 align=1 (i32.const 0)))
+    (local.set 0x3b5 (i64.load offset=0x3b5 align=1 (i32.const 0)))
+    (local.set 0x3b6 (i64.load offset=0x3b6 align=1 (i32.const 0)))
+    (local.set 0x3b7 (i64.load offset=0x3b7 align=1 (i32.const 0)))
+    (local.set 0x3b8 (i64.load offset=0x3b8 align=1 (i32.const 0)))
+    (local.set 0x3b9 (i64.load offset=0x3b9 align=1 (i32.const 0)))
+    (local.set 0x3ba (i64.load offset=0x3ba align=1 (i32.const 0)))
+    (local.set 0x3bb (i64.load offset=0x3bb align=1 (i32.const 0)))
+    (local.set 0x3bc (i64.load offset=0x3bc align=1 (i32.const 0)))
+    (local.set 0x3bd (i64.load offset=0x3bd align=1 (i32.const 0)))
+    (local.set 0x3be (i64.load offset=0x3be align=1 (i32.const 0)))
+    (local.set 0x3bf (i64.load offset=0x3bf align=1 (i32.const 0)))
+    (local.set 0x3c0 (i64.load offset=0x3c0 align=1 (i32.const 0)))
+    (local.set 0x3c1 (i64.load offset=0x3c1 align=1 (i32.const 0)))
+    (local.set 0x3c2 (i64.load offset=0x3c2 align=1 (i32.const 0)))
+    (local.set 0x3c3 (i64.load offset=0x3c3 align=1 (i32.const 0)))
+    (local.set 0x3c4 (i64.load offset=0x3c4 align=1 (i32.const 0)))
+    (local.set 0x3c5 (i64.load offset=0x3c5 align=1 (i32.const 0)))
+    (local.set 0x3c6 (i64.load offset=0x3c6 align=1 (i32.const 0)))
+    (local.set 0x3c7 (i64.load offset=0x3c7 align=1 (i32.const 0)))
+    (local.set 0x3c8 (i64.load offset=0x3c8 align=1 (i32.const 0)))
+    (local.set 0x3c9 (i64.load offset=0x3c9 align=1 (i32.const 0)))
+    (local.set 0x3ca (i64.load offset=0x3ca align=1 (i32.const 0)))
+    (local.set 0x3cb (i64.load offset=0x3cb align=1 (i32.const 0)))
+    (local.set 0x3cc (i64.load offset=0x3cc align=1 (i32.const 0)))
+    (local.set 0x3cd (i64.load offset=0x3cd align=1 (i32.const 0)))
+    (local.set 0x3ce (i64.load offset=0x3ce align=1 (i32.const 0)))
+    (local.set 0x3cf (i64.load offset=0x3cf align=1 (i32.const 0)))
+    (local.set 0x3d0 (i64.load offset=0x3d0 align=1 (i32.const 0)))
+    (local.set 0x3d1 (i64.load offset=0x3d1 align=1 (i32.const 0)))
+    (local.set 0x3d2 (i64.load offset=0x3d2 align=1 (i32.const 0)))
+    (local.set 0x3d3 (i64.load offset=0x3d3 align=1 (i32.const 0)))
+    (local.set 0x3d4 (i64.load offset=0x3d4 align=1 (i32.const 0)))
+    (local.set 0x3d5 (i64.load offset=0x3d5 align=1 (i32.const 0)))
+    (local.set 0x3d6 (i64.load offset=0x3d6 align=1 (i32.const 0)))
+    (local.set 0x3d7 (i64.load offset=0x3d7 align=1 (i32.const 0)))
+    (local.set 0x3d8 (i64.load offset=0x3d8 align=1 (i32.const 0)))
+    (local.set 0x3d9 (i64.load offset=0x3d9 align=1 (i32.const 0)))
+    (local.set 0x3da (i64.load offset=0x3da align=1 (i32.const 0)))
+    (local.set 0x3db (i64.load offset=0x3db align=1 (i32.const 0)))
+    (local.set 0x3dc (i64.load offset=0x3dc align=1 (i32.const 0)))
+    (local.set 0x3dd (i64.load offset=0x3dd align=1 (i32.const 0)))
+    (local.set 0x3de (i64.load offset=0x3de align=1 (i32.const 0)))
+    (local.set 0x3df (i64.load offset=0x3df align=1 (i32.const 0)))
+    (local.set 0x3e0 (i64.load offset=0x3e0 align=1 (i32.const 0)))
+    (local.set 0x3e1 (i64.load offset=0x3e1 align=1 (i32.const 0)))
+    (local.set 0x3e2 (i64.load offset=0x3e2 align=1 (i32.const 0)))
+    (local.set 0x3e3 (i64.load offset=0x3e3 align=1 (i32.const 0)))
+    (local.set 0x3e4 (i64.load offset=0x3e4 align=1 (i32.const 0)))
+    (local.set 0x3e5 (i64.load offset=0x3e5 align=1 (i32.const 0)))
+    (local.set 0x3e6 (i64.load offset=0x3e6 align=1 (i32.const 0)))
+    (local.set 0x3e7 (i64.load offset=0x3e7 align=1 (i32.const 0)))
+    (local.set 0x3e8 (i64.load offset=0x3e8 align=1 (i32.const 0)))
+    (local.set 0x3e9 (i64.load offset=0x3e9 align=1 (i32.const 0)))
+    (local.set 0x3ea (i64.load offset=0x3ea align=1 (i32.const 0)))
+    (local.set 0x3eb (i64.load offset=0x3eb align=1 (i32.const 0)))
+    (local.set 0x3ec (i64.load offset=0x3ec align=1 (i32.const 0)))
+    (local.set 0x3ed (i64.load offset=0x3ed align=1 (i32.const 0)))
+    (local.set 0x3ee (i64.load offset=0x3ee align=1 (i32.const 0)))
+    (local.set 0x3ef (i64.load offset=0x3ef align=1 (i32.const 0)))
+    (local.set 0x3f0 (i64.load offset=0x3f0 align=1 (i32.const 0)))
+    (local.set 0x3f1 (i64.load offset=0x3f1 align=1 (i32.const 0)))
+    (local.set 0x3f2 (i64.load offset=0x3f2 align=1 (i32.const 0)))
+    (local.set 0x3f3 (i64.load offset=0x3f3 align=1 (i32.const 0)))
+    (local.set 0x3f4 (i64.load offset=0x3f4 align=1 (i32.const 0)))
+    (local.set 0x3f5 (i64.load offset=0x3f5 align=1 (i32.const 0)))
+    (local.set 0x3f6 (i64.load offset=0x3f6 align=1 (i32.const 0)))
+    (local.set 0x3f7 (i64.load offset=0x3f7 align=1 (i32.const 0)))
+    (local.set 0x3f8 (i64.load offset=0x3f8 align=1 (i32.const 0)))
+    (local.set 0x3f9 (i64.load offset=0x3f9 align=1 (i32.const 0)))
+    (local.set 0x3fa (i64.load offset=0x3fa align=1 (i32.const 0)))
+    (local.set 0x3fb (i64.load offset=0x3fb align=1 (i32.const 0)))
+    (local.set 0x3fc (i64.load offset=0x3fc align=1 (i32.const 0)))
+    (local.set 0x3fd (i64.load offset=0x3fd align=1 (i32.const 0)))
+    (local.set 0x3fe (i64.load offset=0x3fe align=1 (i32.const 0)))
+    (local.set 0x3ff (i64.load offset=0x3ff align=1 (i32.const 0)))
+    (local.set 0x400 (i64.load offset=0x400 align=1 (i32.const 0)))
+    (local.set 0x401 (i64.load offset=0x401 align=1 (i32.const 0)))
+    (local.set 0x402 (i64.load offset=0x402 align=1 (i32.const 0)))
+    (local.set 0x403 (i64.load offset=0x403 align=1 (i32.const 0)))
+    (local.set 0x404 (i64.load offset=0x404 align=1 (i32.const 0)))
+    (local.set 0x405 (i64.load offset=0x405 align=1 (i32.const 0)))
+    (local.set 0x406 (i64.load offset=0x406 align=1 (i32.const 0)))
+    (local.set 0x407 (i64.load offset=0x407 align=1 (i32.const 0)))
+    (local.set 0x408 (i64.load offset=0x408 align=1 (i32.const 0)))
+    (local.set 0x409 (i64.load offset=0x409 align=1 (i32.const 0)))
+    (local.set 0x40a (i64.load offset=0x40a align=1 (i32.const 0)))
+    (local.set 0x40b (i64.load offset=0x40b align=1 (i32.const 0)))
+    (local.set 0x40c (i64.load offset=0x40c align=1 (i32.const 0)))
+    (local.set 0x40d (i64.load offset=0x40d align=1 (i32.const 0)))
+    (local.set 0x40e (i64.load offset=0x40e align=1 (i32.const 0)))
+    (local.set 0x40f (i64.load offset=0x40f align=1 (i32.const 0)))
+    (local.set 0x410 (i64.load offset=0x410 align=1 (i32.const 0)))
+    (local.set 0x411 (i64.load offset=0x411 align=1 (i32.const 0)))
+    (local.set 0x412 (i64.load offset=0x412 align=1 (i32.const 0)))
+    (local.set 0x413 (i64.load offset=0x413 align=1 (i32.const 0)))
+    (local.set 0x414 (i64.load offset=0x414 align=1 (i32.const 0)))
+    (local.set 0x415 (i64.load offset=0x415 align=1 (i32.const 0)))
+    (local.set 0x416 (i64.load offset=0x416 align=1 (i32.const 0)))
+    (local.set 0x417 (i64.load offset=0x417 align=1 (i32.const 0)))
+    (local.set 0x418 (i64.load offset=0x418 align=1 (i32.const 0)))
+    (local.set 0x419 (i64.load offset=0x419 align=1 (i32.const 0)))
+    (local.set 0x41a (i64.load offset=0x41a align=1 (i32.const 0)))
+    (local.set 0x41b (i64.load offset=0x41b align=1 (i32.const 0)))
+    (local.set 0x41c (i64.load offset=0x41c align=1 (i32.const 0)))
+    (local.set 0x41d (i64.load offset=0x41d align=1 (i32.const 0)))
+    (local.set 0x41e (i64.load offset=0x41e align=1 (i32.const 0)))
+    (local.set 0x41f (i64.load offset=0x41f align=1 (i32.const 0)))
+
+    ;; store the locals back to memory
+    (i64.store offset=0x000 align=1 (i32.const 0) (local.get 0x000))
+    (i64.store offset=0x001 align=1 (i32.const 0) (local.get 0x001))
+    (i64.store offset=0x002 align=1 (i32.const 0) (local.get 0x002))
+    (i64.store offset=0x003 align=1 (i32.const 0) (local.get 0x003))
+    (i64.store offset=0x004 align=1 (i32.const 0) (local.get 0x004))
+    (i64.store offset=0x005 align=1 (i32.const 0) (local.get 0x005))
+    (i64.store offset=0x006 align=1 (i32.const 0) (local.get 0x006))
+    (i64.store offset=0x007 align=1 (i32.const 0) (local.get 0x007))
+    (i64.store offset=0x008 align=1 (i32.const 0) (local.get 0x008))
+    (i64.store offset=0x009 align=1 (i32.const 0) (local.get 0x009))
+    (i64.store offset=0x00a align=1 (i32.const 0) (local.get 0x00a))
+    (i64.store offset=0x00b align=1 (i32.const 0) (local.get 0x00b))
+    (i64.store offset=0x00c align=1 (i32.const 0) (local.get 0x00c))
+    (i64.store offset=0x00d align=1 (i32.const 0) (local.get 0x00d))
+    (i64.store offset=0x00e align=1 (i32.const 0) (local.get 0x00e))
+    (i64.store offset=0x00f align=1 (i32.const 0) (local.get 0x00f))
+    (i64.store offset=0x010 align=1 (i32.const 0) (local.get 0x010))
+    (i64.store offset=0x011 align=1 (i32.const 0) (local.get 0x011))
+    (i64.store offset=0x012 align=1 (i32.const 0) (local.get 0x012))
+    (i64.store offset=0x013 align=1 (i32.const 0) (local.get 0x013))
+    (i64.store offset=0x014 align=1 (i32.const 0) (local.get 0x014))
+    (i64.store offset=0x015 align=1 (i32.const 0) (local.get 0x015))
+    (i64.store offset=0x016 align=1 (i32.const 0) (local.get 0x016))
+    (i64.store offset=0x017 align=1 (i32.const 0) (local.get 0x017))
+    (i64.store offset=0x018 align=1 (i32.const 0) (local.get 0x018))
+    (i64.store offset=0x019 align=1 (i32.const 0) (local.get 0x019))
+    (i64.store offset=0x01a align=1 (i32.const 0) (local.get 0x01a))
+    (i64.store offset=0x01b align=1 (i32.const 0) (local.get 0x01b))
+    (i64.store offset=0x01c align=1 (i32.const 0) (local.get 0x01c))
+    (i64.store offset=0x01d align=1 (i32.const 0) (local.get 0x01d))
+    (i64.store offset=0x01e align=1 (i32.const 0) (local.get 0x01e))
+    (i64.store offset=0x01f align=1 (i32.const 0) (local.get 0x01f))
+    (i64.store offset=0x020 align=1 (i32.const 0) (local.get 0x020))
+    (i64.store offset=0x021 align=1 (i32.const 0) (local.get 0x021))
+    (i64.store offset=0x022 align=1 (i32.const 0) (local.get 0x022))
+    (i64.store offset=0x023 align=1 (i32.const 0) (local.get 0x023))
+    (i64.store offset=0x024 align=1 (i32.const 0) (local.get 0x024))
+    (i64.store offset=0x025 align=1 (i32.const 0) (local.get 0x025))
+    (i64.store offset=0x026 align=1 (i32.const 0) (local.get 0x026))
+    (i64.store offset=0x027 align=1 (i32.const 0) (local.get 0x027))
+    (i64.store offset=0x028 align=1 (i32.const 0) (local.get 0x028))
+    (i64.store offset=0x029 align=1 (i32.const 0) (local.get 0x029))
+    (i64.store offset=0x02a align=1 (i32.const 0) (local.get 0x02a))
+    (i64.store offset=0x02b align=1 (i32.const 0) (local.get 0x02b))
+    (i64.store offset=0x02c align=1 (i32.const 0) (local.get 0x02c))
+    (i64.store offset=0x02d align=1 (i32.const 0) (local.get 0x02d))
+    (i64.store offset=0x02e align=1 (i32.const 0) (local.get 0x02e))
+    (i64.store offset=0x02f align=1 (i32.const 0) (local.get 0x02f))
+    (i64.store offset=0x030 align=1 (i32.const 0) (local.get 0x030))
+    (i64.store offset=0x031 align=1 (i32.const 0) (local.get 0x031))
+    (i64.store offset=0x032 align=1 (i32.const 0) (local.get 0x032))
+    (i64.store offset=0x033 align=1 (i32.const 0) (local.get 0x033))
+    (i64.store offset=0x034 align=1 (i32.const 0) (local.get 0x034))
+    (i64.store offset=0x035 align=1 (i32.const 0) (local.get 0x035))
+    (i64.store offset=0x036 align=1 (i32.const 0) (local.get 0x036))
+    (i64.store offset=0x037 align=1 (i32.const 0) (local.get 0x037))
+    (i64.store offset=0x038 align=1 (i32.const 0) (local.get 0x038))
+    (i64.store offset=0x039 align=1 (i32.const 0) (local.get 0x039))
+    (i64.store offset=0x03a align=1 (i32.const 0) (local.get 0x03a))
+    (i64.store offset=0x03b align=1 (i32.const 0) (local.get 0x03b))
+    (i64.store offset=0x03c align=1 (i32.const 0) (local.get 0x03c))
+    (i64.store offset=0x03d align=1 (i32.const 0) (local.get 0x03d))
+    (i64.store offset=0x03e align=1 (i32.const 0) (local.get 0x03e))
+    (i64.store offset=0x03f align=1 (i32.const 0) (local.get 0x03f))
+    (i64.store offset=0x040 align=1 (i32.const 0) (local.get 0x040))
+    (i64.store offset=0x041 align=1 (i32.const 0) (local.get 0x041))
+    (i64.store offset=0x042 align=1 (i32.const 0) (local.get 0x042))
+    (i64.store offset=0x043 align=1 (i32.const 0) (local.get 0x043))
+    (i64.store offset=0x044 align=1 (i32.const 0) (local.get 0x044))
+    (i64.store offset=0x045 align=1 (i32.const 0) (local.get 0x045))
+    (i64.store offset=0x046 align=1 (i32.const 0) (local.get 0x046))
+    (i64.store offset=0x047 align=1 (i32.const 0) (local.get 0x047))
+    (i64.store offset=0x048 align=1 (i32.const 0) (local.get 0x048))
+    (i64.store offset=0x049 align=1 (i32.const 0) (local.get 0x049))
+    (i64.store offset=0x04a align=1 (i32.const 0) (local.get 0x04a))
+    (i64.store offset=0x04b align=1 (i32.const 0) (local.get 0x04b))
+    (i64.store offset=0x04c align=1 (i32.const 0) (local.get 0x04c))
+    (i64.store offset=0x04d align=1 (i32.const 0) (local.get 0x04d))
+    (i64.store offset=0x04e align=1 (i32.const 0) (local.get 0x04e))
+    (i64.store offset=0x04f align=1 (i32.const 0) (local.get 0x04f))
+    (i64.store offset=0x050 align=1 (i32.const 0) (local.get 0x050))
+    (i64.store offset=0x051 align=1 (i32.const 0) (local.get 0x051))
+    (i64.store offset=0x052 align=1 (i32.const 0) (local.get 0x052))
+    (i64.store offset=0x053 align=1 (i32.const 0) (local.get 0x053))
+    (i64.store offset=0x054 align=1 (i32.const 0) (local.get 0x054))
+    (i64.store offset=0x055 align=1 (i32.const 0) (local.get 0x055))
+    (i64.store offset=0x056 align=1 (i32.const 0) (local.get 0x056))
+    (i64.store offset=0x057 align=1 (i32.const 0) (local.get 0x057))
+    (i64.store offset=0x058 align=1 (i32.const 0) (local.get 0x058))
+    (i64.store offset=0x059 align=1 (i32.const 0) (local.get 0x059))
+    (i64.store offset=0x05a align=1 (i32.const 0) (local.get 0x05a))
+    (i64.store offset=0x05b align=1 (i32.const 0) (local.get 0x05b))
+    (i64.store offset=0x05c align=1 (i32.const 0) (local.get 0x05c))
+    (i64.store offset=0x05d align=1 (i32.const 0) (local.get 0x05d))
+    (i64.store offset=0x05e align=1 (i32.const 0) (local.get 0x05e))
+    (i64.store offset=0x05f align=1 (i32.const 0) (local.get 0x05f))
+    (i64.store offset=0x060 align=1 (i32.const 0) (local.get 0x060))
+    (i64.store offset=0x061 align=1 (i32.const 0) (local.get 0x061))
+    (i64.store offset=0x062 align=1 (i32.const 0) (local.get 0x062))
+    (i64.store offset=0x063 align=1 (i32.const 0) (local.get 0x063))
+    (i64.store offset=0x064 align=1 (i32.const 0) (local.get 0x064))
+    (i64.store offset=0x065 align=1 (i32.const 0) (local.get 0x065))
+    (i64.store offset=0x066 align=1 (i32.const 0) (local.get 0x066))
+    (i64.store offset=0x067 align=1 (i32.const 0) (local.get 0x067))
+    (i64.store offset=0x068 align=1 (i32.const 0) (local.get 0x068))
+    (i64.store offset=0x069 align=1 (i32.const 0) (local.get 0x069))
+    (i64.store offset=0x06a align=1 (i32.const 0) (local.get 0x06a))
+    (i64.store offset=0x06b align=1 (i32.const 0) (local.get 0x06b))
+    (i64.store offset=0x06c align=1 (i32.const 0) (local.get 0x06c))
+    (i64.store offset=0x06d align=1 (i32.const 0) (local.get 0x06d))
+    (i64.store offset=0x06e align=1 (i32.const 0) (local.get 0x06e))
+    (i64.store offset=0x06f align=1 (i32.const 0) (local.get 0x06f))
+    (i64.store offset=0x070 align=1 (i32.const 0) (local.get 0x070))
+    (i64.store offset=0x071 align=1 (i32.const 0) (local.get 0x071))
+    (i64.store offset=0x072 align=1 (i32.const 0) (local.get 0x072))
+    (i64.store offset=0x073 align=1 (i32.const 0) (local.get 0x073))
+    (i64.store offset=0x074 align=1 (i32.const 0) (local.get 0x074))
+    (i64.store offset=0x075 align=1 (i32.const 0) (local.get 0x075))
+    (i64.store offset=0x076 align=1 (i32.const 0) (local.get 0x076))
+    (i64.store offset=0x077 align=1 (i32.const 0) (local.get 0x077))
+    (i64.store offset=0x078 align=1 (i32.const 0) (local.get 0x078))
+    (i64.store offset=0x079 align=1 (i32.const 0) (local.get 0x079))
+    (i64.store offset=0x07a align=1 (i32.const 0) (local.get 0x07a))
+    (i64.store offset=0x07b align=1 (i32.const 0) (local.get 0x07b))
+    (i64.store offset=0x07c align=1 (i32.const 0) (local.get 0x07c))
+    (i64.store offset=0x07d align=1 (i32.const 0) (local.get 0x07d))
+    (i64.store offset=0x07e align=1 (i32.const 0) (local.get 0x07e))
+    (i64.store offset=0x07f align=1 (i32.const 0) (local.get 0x07f))
+    (i64.store offset=0x080 align=1 (i32.const 0) (local.get 0x080))
+    (i64.store offset=0x081 align=1 (i32.const 0) (local.get 0x081))
+    (i64.store offset=0x082 align=1 (i32.const 0) (local.get 0x082))
+    (i64.store offset=0x083 align=1 (i32.const 0) (local.get 0x083))
+    (i64.store offset=0x084 align=1 (i32.const 0) (local.get 0x084))
+    (i64.store offset=0x085 align=1 (i32.const 0) (local.get 0x085))
+    (i64.store offset=0x086 align=1 (i32.const 0) (local.get 0x086))
+    (i64.store offset=0x087 align=1 (i32.const 0) (local.get 0x087))
+    (i64.store offset=0x088 align=1 (i32.const 0) (local.get 0x088))
+    (i64.store offset=0x089 align=1 (i32.const 0) (local.get 0x089))
+    (i64.store offset=0x08a align=1 (i32.const 0) (local.get 0x08a))
+    (i64.store offset=0x08b align=1 (i32.const 0) (local.get 0x08b))
+    (i64.store offset=0x08c align=1 (i32.const 0) (local.get 0x08c))
+    (i64.store offset=0x08d align=1 (i32.const 0) (local.get 0x08d))
+    (i64.store offset=0x08e align=1 (i32.const 0) (local.get 0x08e))
+    (i64.store offset=0x08f align=1 (i32.const 0) (local.get 0x08f))
+    (i64.store offset=0x090 align=1 (i32.const 0) (local.get 0x090))
+    (i64.store offset=0x091 align=1 (i32.const 0) (local.get 0x091))
+    (i64.store offset=0x092 align=1 (i32.const 0) (local.get 0x092))
+    (i64.store offset=0x093 align=1 (i32.const 0) (local.get 0x093))
+    (i64.store offset=0x094 align=1 (i32.const 0) (local.get 0x094))
+    (i64.store offset=0x095 align=1 (i32.const 0) (local.get 0x095))
+    (i64.store offset=0x096 align=1 (i32.const 0) (local.get 0x096))
+    (i64.store offset=0x097 align=1 (i32.const 0) (local.get 0x097))
+    (i64.store offset=0x098 align=1 (i32.const 0) (local.get 0x098))
+    (i64.store offset=0x099 align=1 (i32.const 0) (local.get 0x099))
+    (i64.store offset=0x09a align=1 (i32.const 0) (local.get 0x09a))
+    (i64.store offset=0x09b align=1 (i32.const 0) (local.get 0x09b))
+    (i64.store offset=0x09c align=1 (i32.const 0) (local.get 0x09c))
+    (i64.store offset=0x09d align=1 (i32.const 0) (local.get 0x09d))
+    (i64.store offset=0x09e align=1 (i32.const 0) (local.get 0x09e))
+    (i64.store offset=0x09f align=1 (i32.const 0) (local.get 0x09f))
+    (i64.store offset=0x0a0 align=1 (i32.const 0) (local.get 0x0a0))
+    (i64.store offset=0x0a1 align=1 (i32.const 0) (local.get 0x0a1))
+    (i64.store offset=0x0a2 align=1 (i32.const 0) (local.get 0x0a2))
+    (i64.store offset=0x0a3 align=1 (i32.const 0) (local.get 0x0a3))
+    (i64.store offset=0x0a4 align=1 (i32.const 0) (local.get 0x0a4))
+    (i64.store offset=0x0a5 align=1 (i32.const 0) (local.get 0x0a5))
+    (i64.store offset=0x0a6 align=1 (i32.const 0) (local.get 0x0a6))
+    (i64.store offset=0x0a7 align=1 (i32.const 0) (local.get 0x0a7))
+    (i64.store offset=0x0a8 align=1 (i32.const 0) (local.get 0x0a8))
+    (i64.store offset=0x0a9 align=1 (i32.const 0) (local.get 0x0a9))
+    (i64.store offset=0x0aa align=1 (i32.const 0) (local.get 0x0aa))
+    (i64.store offset=0x0ab align=1 (i32.const 0) (local.get 0x0ab))
+    (i64.store offset=0x0ac align=1 (i32.const 0) (local.get 0x0ac))
+    (i64.store offset=0x0ad align=1 (i32.const 0) (local.get 0x0ad))
+    (i64.store offset=0x0ae align=1 (i32.const 0) (local.get 0x0ae))
+    (i64.store offset=0x0af align=1 (i32.const 0) (local.get 0x0af))
+    (i64.store offset=0x0b0 align=1 (i32.const 0) (local.get 0x0b0))
+    (i64.store offset=0x0b1 align=1 (i32.const 0) (local.get 0x0b1))
+    (i64.store offset=0x0b2 align=1 (i32.const 0) (local.get 0x0b2))
+    (i64.store offset=0x0b3 align=1 (i32.const 0) (local.get 0x0b3))
+    (i64.store offset=0x0b4 align=1 (i32.const 0) (local.get 0x0b4))
+    (i64.store offset=0x0b5 align=1 (i32.const 0) (local.get 0x0b5))
+    (i64.store offset=0x0b6 align=1 (i32.const 0) (local.get 0x0b6))
+    (i64.store offset=0x0b7 align=1 (i32.const 0) (local.get 0x0b7))
+    (i64.store offset=0x0b8 align=1 (i32.const 0) (local.get 0x0b8))
+    (i64.store offset=0x0b9 align=1 (i32.const 0) (local.get 0x0b9))
+    (i64.store offset=0x0ba align=1 (i32.const 0) (local.get 0x0ba))
+    (i64.store offset=0x0bb align=1 (i32.const 0) (local.get 0x0bb))
+    (i64.store offset=0x0bc align=1 (i32.const 0) (local.get 0x0bc))
+    (i64.store offset=0x0bd align=1 (i32.const 0) (local.get 0x0bd))
+    (i64.store offset=0x0be align=1 (i32.const 0) (local.get 0x0be))
+    (i64.store offset=0x0bf align=1 (i32.const 0) (local.get 0x0bf))
+    (i64.store offset=0x0c0 align=1 (i32.const 0) (local.get 0x0c0))
+    (i64.store offset=0x0c1 align=1 (i32.const 0) (local.get 0x0c1))
+    (i64.store offset=0x0c2 align=1 (i32.const 0) (local.get 0x0c2))
+    (i64.store offset=0x0c3 align=1 (i32.const 0) (local.get 0x0c3))
+    (i64.store offset=0x0c4 align=1 (i32.const 0) (local.get 0x0c4))
+    (i64.store offset=0x0c5 align=1 (i32.const 0) (local.get 0x0c5))
+    (i64.store offset=0x0c6 align=1 (i32.const 0) (local.get 0x0c6))
+    (i64.store offset=0x0c7 align=1 (i32.const 0) (local.get 0x0c7))
+    (i64.store offset=0x0c8 align=1 (i32.const 0) (local.get 0x0c8))
+    (i64.store offset=0x0c9 align=1 (i32.const 0) (local.get 0x0c9))
+    (i64.store offset=0x0ca align=1 (i32.const 0) (local.get 0x0ca))
+    (i64.store offset=0x0cb align=1 (i32.const 0) (local.get 0x0cb))
+    (i64.store offset=0x0cc align=1 (i32.const 0) (local.get 0x0cc))
+    (i64.store offset=0x0cd align=1 (i32.const 0) (local.get 0x0cd))
+    (i64.store offset=0x0ce align=1 (i32.const 0) (local.get 0x0ce))
+    (i64.store offset=0x0cf align=1 (i32.const 0) (local.get 0x0cf))
+    (i64.store offset=0x0d0 align=1 (i32.const 0) (local.get 0x0d0))
+    (i64.store offset=0x0d1 align=1 (i32.const 0) (local.get 0x0d1))
+    (i64.store offset=0x0d2 align=1 (i32.const 0) (local.get 0x0d2))
+    (i64.store offset=0x0d3 align=1 (i32.const 0) (local.get 0x0d3))
+    (i64.store offset=0x0d4 align=1 (i32.const 0) (local.get 0x0d4))
+    (i64.store offset=0x0d5 align=1 (i32.const 0) (local.get 0x0d5))
+    (i64.store offset=0x0d6 align=1 (i32.const 0) (local.get 0x0d6))
+    (i64.store offset=0x0d7 align=1 (i32.const 0) (local.get 0x0d7))
+    (i64.store offset=0x0d8 align=1 (i32.const 0) (local.get 0x0d8))
+    (i64.store offset=0x0d9 align=1 (i32.const 0) (local.get 0x0d9))
+    (i64.store offset=0x0da align=1 (i32.const 0) (local.get 0x0da))
+    (i64.store offset=0x0db align=1 (i32.const 0) (local.get 0x0db))
+    (i64.store offset=0x0dc align=1 (i32.const 0) (local.get 0x0dc))
+    (i64.store offset=0x0dd align=1 (i32.const 0) (local.get 0x0dd))
+    (i64.store offset=0x0de align=1 (i32.const 0) (local.get 0x0de))
+    (i64.store offset=0x0df align=1 (i32.const 0) (local.get 0x0df))
+    (i64.store offset=0x0e0 align=1 (i32.const 0) (local.get 0x0e0))
+    (i64.store offset=0x0e1 align=1 (i32.const 0) (local.get 0x0e1))
+    (i64.store offset=0x0e2 align=1 (i32.const 0) (local.get 0x0e2))
+    (i64.store offset=0x0e3 align=1 (i32.const 0) (local.get 0x0e3))
+    (i64.store offset=0x0e4 align=1 (i32.const 0) (local.get 0x0e4))
+    (i64.store offset=0x0e5 align=1 (i32.const 0) (local.get 0x0e5))
+    (i64.store offset=0x0e6 align=1 (i32.const 0) (local.get 0x0e6))
+    (i64.store offset=0x0e7 align=1 (i32.const 0) (local.get 0x0e7))
+    (i64.store offset=0x0e8 align=1 (i32.const 0) (local.get 0x0e8))
+    (i64.store offset=0x0e9 align=1 (i32.const 0) (local.get 0x0e9))
+    (i64.store offset=0x0ea align=1 (i32.const 0) (local.get 0x0ea))
+    (i64.store offset=0x0eb align=1 (i32.const 0) (local.get 0x0eb))
+    (i64.store offset=0x0ec align=1 (i32.const 0) (local.get 0x0ec))
+    (i64.store offset=0x0ed align=1 (i32.const 0) (local.get 0x0ed))
+    (i64.store offset=0x0ee align=1 (i32.const 0) (local.get 0x0ee))
+    (i64.store offset=0x0ef align=1 (i32.const 0) (local.get 0x0ef))
+    (i64.store offset=0x0f0 align=1 (i32.const 0) (local.get 0x0f0))
+    (i64.store offset=0x0f1 align=1 (i32.const 0) (local.get 0x0f1))
+    (i64.store offset=0x0f2 align=1 (i32.const 0) (local.get 0x0f2))
+    (i64.store offset=0x0f3 align=1 (i32.const 0) (local.get 0x0f3))
+    (i64.store offset=0x0f4 align=1 (i32.const 0) (local.get 0x0f4))
+    (i64.store offset=0x0f5 align=1 (i32.const 0) (local.get 0x0f5))
+    (i64.store offset=0x0f6 align=1 (i32.const 0) (local.get 0x0f6))
+    (i64.store offset=0x0f7 align=1 (i32.const 0) (local.get 0x0f7))
+    (i64.store offset=0x0f8 align=1 (i32.const 0) (local.get 0x0f8))
+    (i64.store offset=0x0f9 align=1 (i32.const 0) (local.get 0x0f9))
+    (i64.store offset=0x0fa align=1 (i32.const 0) (local.get 0x0fa))
+    (i64.store offset=0x0fb align=1 (i32.const 0) (local.get 0x0fb))
+    (i64.store offset=0x0fc align=1 (i32.const 0) (local.get 0x0fc))
+    (i64.store offset=0x0fd align=1 (i32.const 0) (local.get 0x0fd))
+    (i64.store offset=0x0fe align=1 (i32.const 0) (local.get 0x0fe))
+    (i64.store offset=0x0ff align=1 (i32.const 0) (local.get 0x0ff))
+    (i64.store offset=0x100 align=1 (i32.const 0) (local.get 0x100))
+    (i64.store offset=0x101 align=1 (i32.const 0) (local.get 0x101))
+    (i64.store offset=0x102 align=1 (i32.const 0) (local.get 0x102))
+    (i64.store offset=0x103 align=1 (i32.const 0) (local.get 0x103))
+    (i64.store offset=0x104 align=1 (i32.const 0) (local.get 0x104))
+    (i64.store offset=0x105 align=1 (i32.const 0) (local.get 0x105))
+    (i64.store offset=0x106 align=1 (i32.const 0) (local.get 0x106))
+    (i64.store offset=0x107 align=1 (i32.const 0) (local.get 0x107))
+    (i64.store offset=0x108 align=1 (i32.const 0) (local.get 0x108))
+    (i64.store offset=0x109 align=1 (i32.const 0) (local.get 0x109))
+    (i64.store offset=0x10a align=1 (i32.const 0) (local.get 0x10a))
+    (i64.store offset=0x10b align=1 (i32.const 0) (local.get 0x10b))
+    (i64.store offset=0x10c align=1 (i32.const 0) (local.get 0x10c))
+    (i64.store offset=0x10d align=1 (i32.const 0) (local.get 0x10d))
+    (i64.store offset=0x10e align=1 (i32.const 0) (local.get 0x10e))
+    (i64.store offset=0x10f align=1 (i32.const 0) (local.get 0x10f))
+    (i64.store offset=0x110 align=1 (i32.const 0) (local.get 0x110))
+    (i64.store offset=0x111 align=1 (i32.const 0) (local.get 0x111))
+    (i64.store offset=0x112 align=1 (i32.const 0) (local.get 0x112))
+    (i64.store offset=0x113 align=1 (i32.const 0) (local.get 0x113))
+    (i64.store offset=0x114 align=1 (i32.const 0) (local.get 0x114))
+    (i64.store offset=0x115 align=1 (i32.const 0) (local.get 0x115))
+    (i64.store offset=0x116 align=1 (i32.const 0) (local.get 0x116))
+    (i64.store offset=0x117 align=1 (i32.const 0) (local.get 0x117))
+    (i64.store offset=0x118 align=1 (i32.const 0) (local.get 0x118))
+    (i64.store offset=0x119 align=1 (i32.const 0) (local.get 0x119))
+    (i64.store offset=0x11a align=1 (i32.const 0) (local.get 0x11a))
+    (i64.store offset=0x11b align=1 (i32.const 0) (local.get 0x11b))
+    (i64.store offset=0x11c align=1 (i32.const 0) (local.get 0x11c))
+    (i64.store offset=0x11d align=1 (i32.const 0) (local.get 0x11d))
+    (i64.store offset=0x11e align=1 (i32.const 0) (local.get 0x11e))
+    (i64.store offset=0x11f align=1 (i32.const 0) (local.get 0x11f))
+    (i64.store offset=0x120 align=1 (i32.const 0) (local.get 0x120))
+    (i64.store offset=0x121 align=1 (i32.const 0) (local.get 0x121))
+    (i64.store offset=0x122 align=1 (i32.const 0) (local.get 0x122))
+    (i64.store offset=0x123 align=1 (i32.const 0) (local.get 0x123))
+    (i64.store offset=0x124 align=1 (i32.const 0) (local.get 0x124))
+    (i64.store offset=0x125 align=1 (i32.const 0) (local.get 0x125))
+    (i64.store offset=0x126 align=1 (i32.const 0) (local.get 0x126))
+    (i64.store offset=0x127 align=1 (i32.const 0) (local.get 0x127))
+    (i64.store offset=0x128 align=1 (i32.const 0) (local.get 0x128))
+    (i64.store offset=0x129 align=1 (i32.const 0) (local.get 0x129))
+    (i64.store offset=0x12a align=1 (i32.const 0) (local.get 0x12a))
+    (i64.store offset=0x12b align=1 (i32.const 0) (local.get 0x12b))
+    (i64.store offset=0x12c align=1 (i32.const 0) (local.get 0x12c))
+    (i64.store offset=0x12d align=1 (i32.const 0) (local.get 0x12d))
+    (i64.store offset=0x12e align=1 (i32.const 0) (local.get 0x12e))
+    (i64.store offset=0x12f align=1 (i32.const 0) (local.get 0x12f))
+    (i64.store offset=0x130 align=1 (i32.const 0) (local.get 0x130))
+    (i64.store offset=0x131 align=1 (i32.const 0) (local.get 0x131))
+    (i64.store offset=0x132 align=1 (i32.const 0) (local.get 0x132))
+    (i64.store offset=0x133 align=1 (i32.const 0) (local.get 0x133))
+    (i64.store offset=0x134 align=1 (i32.const 0) (local.get 0x134))
+    (i64.store offset=0x135 align=1 (i32.const 0) (local.get 0x135))
+    (i64.store offset=0x136 align=1 (i32.const 0) (local.get 0x136))
+    (i64.store offset=0x137 align=1 (i32.const 0) (local.get 0x137))
+    (i64.store offset=0x138 align=1 (i32.const 0) (local.get 0x138))
+    (i64.store offset=0x139 align=1 (i32.const 0) (local.get 0x139))
+    (i64.store offset=0x13a align=1 (i32.const 0) (local.get 0x13a))
+    (i64.store offset=0x13b align=1 (i32.const 0) (local.get 0x13b))
+    (i64.store offset=0x13c align=1 (i32.const 0) (local.get 0x13c))
+    (i64.store offset=0x13d align=1 (i32.const 0) (local.get 0x13d))
+    (i64.store offset=0x13e align=1 (i32.const 0) (local.get 0x13e))
+    (i64.store offset=0x13f align=1 (i32.const 0) (local.get 0x13f))
+    (i64.store offset=0x140 align=1 (i32.const 0) (local.get 0x140))
+    (i64.store offset=0x141 align=1 (i32.const 0) (local.get 0x141))
+    (i64.store offset=0x142 align=1 (i32.const 0) (local.get 0x142))
+    (i64.store offset=0x143 align=1 (i32.const 0) (local.get 0x143))
+    (i64.store offset=0x144 align=1 (i32.const 0) (local.get 0x144))
+    (i64.store offset=0x145 align=1 (i32.const 0) (local.get 0x145))
+    (i64.store offset=0x146 align=1 (i32.const 0) (local.get 0x146))
+    (i64.store offset=0x147 align=1 (i32.const 0) (local.get 0x147))
+    (i64.store offset=0x148 align=1 (i32.const 0) (local.get 0x148))
+    (i64.store offset=0x149 align=1 (i32.const 0) (local.get 0x149))
+    (i64.store offset=0x14a align=1 (i32.const 0) (local.get 0x14a))
+    (i64.store offset=0x14b align=1 (i32.const 0) (local.get 0x14b))
+    (i64.store offset=0x14c align=1 (i32.const 0) (local.get 0x14c))
+    (i64.store offset=0x14d align=1 (i32.const 0) (local.get 0x14d))
+    (i64.store offset=0x14e align=1 (i32.const 0) (local.get 0x14e))
+    (i64.store offset=0x14f align=1 (i32.const 0) (local.get 0x14f))
+    (i64.store offset=0x150 align=1 (i32.const 0) (local.get 0x150))
+    (i64.store offset=0x151 align=1 (i32.const 0) (local.get 0x151))
+    (i64.store offset=0x152 align=1 (i32.const 0) (local.get 0x152))
+    (i64.store offset=0x153 align=1 (i32.const 0) (local.get 0x153))
+    (i64.store offset=0x154 align=1 (i32.const 0) (local.get 0x154))
+    (i64.store offset=0x155 align=1 (i32.const 0) (local.get 0x155))
+    (i64.store offset=0x156 align=1 (i32.const 0) (local.get 0x156))
+    (i64.store offset=0x157 align=1 (i32.const 0) (local.get 0x157))
+    (i64.store offset=0x158 align=1 (i32.const 0) (local.get 0x158))
+    (i64.store offset=0x159 align=1 (i32.const 0) (local.get 0x159))
+    (i64.store offset=0x15a align=1 (i32.const 0) (local.get 0x15a))
+    (i64.store offset=0x15b align=1 (i32.const 0) (local.get 0x15b))
+    (i64.store offset=0x15c align=1 (i32.const 0) (local.get 0x15c))
+    (i64.store offset=0x15d align=1 (i32.const 0) (local.get 0x15d))
+    (i64.store offset=0x15e align=1 (i32.const 0) (local.get 0x15e))
+    (i64.store offset=0x15f align=1 (i32.const 0) (local.get 0x15f))
+    (i64.store offset=0x160 align=1 (i32.const 0) (local.get 0x160))
+    (i64.store offset=0x161 align=1 (i32.const 0) (local.get 0x161))
+    (i64.store offset=0x162 align=1 (i32.const 0) (local.get 0x162))
+    (i64.store offset=0x163 align=1 (i32.const 0) (local.get 0x163))
+    (i64.store offset=0x164 align=1 (i32.const 0) (local.get 0x164))
+    (i64.store offset=0x165 align=1 (i32.const 0) (local.get 0x165))
+    (i64.store offset=0x166 align=1 (i32.const 0) (local.get 0x166))
+    (i64.store offset=0x167 align=1 (i32.const 0) (local.get 0x167))
+    (i64.store offset=0x168 align=1 (i32.const 0) (local.get 0x168))
+    (i64.store offset=0x169 align=1 (i32.const 0) (local.get 0x169))
+    (i64.store offset=0x16a align=1 (i32.const 0) (local.get 0x16a))
+    (i64.store offset=0x16b align=1 (i32.const 0) (local.get 0x16b))
+    (i64.store offset=0x16c align=1 (i32.const 0) (local.get 0x16c))
+    (i64.store offset=0x16d align=1 (i32.const 0) (local.get 0x16d))
+    (i64.store offset=0x16e align=1 (i32.const 0) (local.get 0x16e))
+    (i64.store offset=0x16f align=1 (i32.const 0) (local.get 0x16f))
+    (i64.store offset=0x170 align=1 (i32.const 0) (local.get 0x170))
+    (i64.store offset=0x171 align=1 (i32.const 0) (local.get 0x171))
+    (i64.store offset=0x172 align=1 (i32.const 0) (local.get 0x172))
+    (i64.store offset=0x173 align=1 (i32.const 0) (local.get 0x173))
+    (i64.store offset=0x174 align=1 (i32.const 0) (local.get 0x174))
+    (i64.store offset=0x175 align=1 (i32.const 0) (local.get 0x175))
+    (i64.store offset=0x176 align=1 (i32.const 0) (local.get 0x176))
+    (i64.store offset=0x177 align=1 (i32.const 0) (local.get 0x177))
+    (i64.store offset=0x178 align=1 (i32.const 0) (local.get 0x178))
+    (i64.store offset=0x179 align=1 (i32.const 0) (local.get 0x179))
+    (i64.store offset=0x17a align=1 (i32.const 0) (local.get 0x17a))
+    (i64.store offset=0x17b align=1 (i32.const 0) (local.get 0x17b))
+    (i64.store offset=0x17c align=1 (i32.const 0) (local.get 0x17c))
+    (i64.store offset=0x17d align=1 (i32.const 0) (local.get 0x17d))
+    (i64.store offset=0x17e align=1 (i32.const 0) (local.get 0x17e))
+    (i64.store offset=0x17f align=1 (i32.const 0) (local.get 0x17f))
+    (i64.store offset=0x180 align=1 (i32.const 0) (local.get 0x180))
+    (i64.store offset=0x181 align=1 (i32.const 0) (local.get 0x181))
+    (i64.store offset=0x182 align=1 (i32.const 0) (local.get 0x182))
+    (i64.store offset=0x183 align=1 (i32.const 0) (local.get 0x183))
+    (i64.store offset=0x184 align=1 (i32.const 0) (local.get 0x184))
+    (i64.store offset=0x185 align=1 (i32.const 0) (local.get 0x185))
+    (i64.store offset=0x186 align=1 (i32.const 0) (local.get 0x186))
+    (i64.store offset=0x187 align=1 (i32.const 0) (local.get 0x187))
+    (i64.store offset=0x188 align=1 (i32.const 0) (local.get 0x188))
+    (i64.store offset=0x189 align=1 (i32.const 0) (local.get 0x189))
+    (i64.store offset=0x18a align=1 (i32.const 0) (local.get 0x18a))
+    (i64.store offset=0x18b align=1 (i32.const 0) (local.get 0x18b))
+    (i64.store offset=0x18c align=1 (i32.const 0) (local.get 0x18c))
+    (i64.store offset=0x18d align=1 (i32.const 0) (local.get 0x18d))
+    (i64.store offset=0x18e align=1 (i32.const 0) (local.get 0x18e))
+    (i64.store offset=0x18f align=1 (i32.const 0) (local.get 0x18f))
+    (i64.store offset=0x190 align=1 (i32.const 0) (local.get 0x190))
+    (i64.store offset=0x191 align=1 (i32.const 0) (local.get 0x191))
+    (i64.store offset=0x192 align=1 (i32.const 0) (local.get 0x192))
+    (i64.store offset=0x193 align=1 (i32.const 0) (local.get 0x193))
+    (i64.store offset=0x194 align=1 (i32.const 0) (local.get 0x194))
+    (i64.store offset=0x195 align=1 (i32.const 0) (local.get 0x195))
+    (i64.store offset=0x196 align=1 (i32.const 0) (local.get 0x196))
+    (i64.store offset=0x197 align=1 (i32.const 0) (local.get 0x197))
+    (i64.store offset=0x198 align=1 (i32.const 0) (local.get 0x198))
+    (i64.store offset=0x199 align=1 (i32.const 0) (local.get 0x199))
+    (i64.store offset=0x19a align=1 (i32.const 0) (local.get 0x19a))
+    (i64.store offset=0x19b align=1 (i32.const 0) (local.get 0x19b))
+    (i64.store offset=0x19c align=1 (i32.const 0) (local.get 0x19c))
+    (i64.store offset=0x19d align=1 (i32.const 0) (local.get 0x19d))
+    (i64.store offset=0x19e align=1 (i32.const 0) (local.get 0x19e))
+    (i64.store offset=0x19f align=1 (i32.const 0) (local.get 0x19f))
+    (i64.store offset=0x1a0 align=1 (i32.const 0) (local.get 0x1a0))
+    (i64.store offset=0x1a1 align=1 (i32.const 0) (local.get 0x1a1))
+    (i64.store offset=0x1a2 align=1 (i32.const 0) (local.get 0x1a2))
+    (i64.store offset=0x1a3 align=1 (i32.const 0) (local.get 0x1a3))
+    (i64.store offset=0x1a4 align=1 (i32.const 0) (local.get 0x1a4))
+    (i64.store offset=0x1a5 align=1 (i32.const 0) (local.get 0x1a5))
+    (i64.store offset=0x1a6 align=1 (i32.const 0) (local.get 0x1a6))
+    (i64.store offset=0x1a7 align=1 (i32.const 0) (local.get 0x1a7))
+    (i64.store offset=0x1a8 align=1 (i32.const 0) (local.get 0x1a8))
+    (i64.store offset=0x1a9 align=1 (i32.const 0) (local.get 0x1a9))
+    (i64.store offset=0x1aa align=1 (i32.const 0) (local.get 0x1aa))
+    (i64.store offset=0x1ab align=1 (i32.const 0) (local.get 0x1ab))
+    (i64.store offset=0x1ac align=1 (i32.const 0) (local.get 0x1ac))
+    (i64.store offset=0x1ad align=1 (i32.const 0) (local.get 0x1ad))
+    (i64.store offset=0x1ae align=1 (i32.const 0) (local.get 0x1ae))
+    (i64.store offset=0x1af align=1 (i32.const 0) (local.get 0x1af))
+    (i64.store offset=0x1b0 align=1 (i32.const 0) (local.get 0x1b0))
+    (i64.store offset=0x1b1 align=1 (i32.const 0) (local.get 0x1b1))
+    (i64.store offset=0x1b2 align=1 (i32.const 0) (local.get 0x1b2))
+    (i64.store offset=0x1b3 align=1 (i32.const 0) (local.get 0x1b3))
+    (i64.store offset=0x1b4 align=1 (i32.const 0) (local.get 0x1b4))
+    (i64.store offset=0x1b5 align=1 (i32.const 0) (local.get 0x1b5))
+    (i64.store offset=0x1b6 align=1 (i32.const 0) (local.get 0x1b6))
+    (i64.store offset=0x1b7 align=1 (i32.const 0) (local.get 0x1b7))
+    (i64.store offset=0x1b8 align=1 (i32.const 0) (local.get 0x1b8))
+    (i64.store offset=0x1b9 align=1 (i32.const 0) (local.get 0x1b9))
+    (i64.store offset=0x1ba align=1 (i32.const 0) (local.get 0x1ba))
+    (i64.store offset=0x1bb align=1 (i32.const 0) (local.get 0x1bb))
+    (i64.store offset=0x1bc align=1 (i32.const 0) (local.get 0x1bc))
+    (i64.store offset=0x1bd align=1 (i32.const 0) (local.get 0x1bd))
+    (i64.store offset=0x1be align=1 (i32.const 0) (local.get 0x1be))
+    (i64.store offset=0x1bf align=1 (i32.const 0) (local.get 0x1bf))
+    (i64.store offset=0x1c0 align=1 (i32.const 0) (local.get 0x1c0))
+    (i64.store offset=0x1c1 align=1 (i32.const 0) (local.get 0x1c1))
+    (i64.store offset=0x1c2 align=1 (i32.const 0) (local.get 0x1c2))
+    (i64.store offset=0x1c3 align=1 (i32.const 0) (local.get 0x1c3))
+    (i64.store offset=0x1c4 align=1 (i32.const 0) (local.get 0x1c4))
+    (i64.store offset=0x1c5 align=1 (i32.const 0) (local.get 0x1c5))
+    (i64.store offset=0x1c6 align=1 (i32.const 0) (local.get 0x1c6))
+    (i64.store offset=0x1c7 align=1 (i32.const 0) (local.get 0x1c7))
+    (i64.store offset=0x1c8 align=1 (i32.const 0) (local.get 0x1c8))
+    (i64.store offset=0x1c9 align=1 (i32.const 0) (local.get 0x1c9))
+    (i64.store offset=0x1ca align=1 (i32.const 0) (local.get 0x1ca))
+    (i64.store offset=0x1cb align=1 (i32.const 0) (local.get 0x1cb))
+    (i64.store offset=0x1cc align=1 (i32.const 0) (local.get 0x1cc))
+    (i64.store offset=0x1cd align=1 (i32.const 0) (local.get 0x1cd))
+    (i64.store offset=0x1ce align=1 (i32.const 0) (local.get 0x1ce))
+    (i64.store offset=0x1cf align=1 (i32.const 0) (local.get 0x1cf))
+    (i64.store offset=0x1d0 align=1 (i32.const 0) (local.get 0x1d0))
+    (i64.store offset=0x1d1 align=1 (i32.const 0) (local.get 0x1d1))
+    (i64.store offset=0x1d2 align=1 (i32.const 0) (local.get 0x1d2))
+    (i64.store offset=0x1d3 align=1 (i32.const 0) (local.get 0x1d3))
+    (i64.store offset=0x1d4 align=1 (i32.const 0) (local.get 0x1d4))
+    (i64.store offset=0x1d5 align=1 (i32.const 0) (local.get 0x1d5))
+    (i64.store offset=0x1d6 align=1 (i32.const 0) (local.get 0x1d6))
+    (i64.store offset=0x1d7 align=1 (i32.const 0) (local.get 0x1d7))
+    (i64.store offset=0x1d8 align=1 (i32.const 0) (local.get 0x1d8))
+    (i64.store offset=0x1d9 align=1 (i32.const 0) (local.get 0x1d9))
+    (i64.store offset=0x1da align=1 (i32.const 0) (local.get 0x1da))
+    (i64.store offset=0x1db align=1 (i32.const 0) (local.get 0x1db))
+    (i64.store offset=0x1dc align=1 (i32.const 0) (local.get 0x1dc))
+    (i64.store offset=0x1dd align=1 (i32.const 0) (local.get 0x1dd))
+    (i64.store offset=0x1de align=1 (i32.const 0) (local.get 0x1de))
+    (i64.store offset=0x1df align=1 (i32.const 0) (local.get 0x1df))
+    (i64.store offset=0x1e0 align=1 (i32.const 0) (local.get 0x1e0))
+    (i64.store offset=0x1e1 align=1 (i32.const 0) (local.get 0x1e1))
+    (i64.store offset=0x1e2 align=1 (i32.const 0) (local.get 0x1e2))
+    (i64.store offset=0x1e3 align=1 (i32.const 0) (local.get 0x1e3))
+    (i64.store offset=0x1e4 align=1 (i32.const 0) (local.get 0x1e4))
+    (i64.store offset=0x1e5 align=1 (i32.const 0) (local.get 0x1e5))
+    (i64.store offset=0x1e6 align=1 (i32.const 0) (local.get 0x1e6))
+    (i64.store offset=0x1e7 align=1 (i32.const 0) (local.get 0x1e7))
+    (i64.store offset=0x1e8 align=1 (i32.const 0) (local.get 0x1e8))
+    (i64.store offset=0x1e9 align=1 (i32.const 0) (local.get 0x1e9))
+    (i64.store offset=0x1ea align=1 (i32.const 0) (local.get 0x1ea))
+    (i64.store offset=0x1eb align=1 (i32.const 0) (local.get 0x1eb))
+    (i64.store offset=0x1ec align=1 (i32.const 0) (local.get 0x1ec))
+    (i64.store offset=0x1ed align=1 (i32.const 0) (local.get 0x1ed))
+    (i64.store offset=0x1ee align=1 (i32.const 0) (local.get 0x1ee))
+    (i64.store offset=0x1ef align=1 (i32.const 0) (local.get 0x1ef))
+    (i64.store offset=0x1f0 align=1 (i32.const 0) (local.get 0x1f0))
+    (i64.store offset=0x1f1 align=1 (i32.const 0) (local.get 0x1f1))
+    (i64.store offset=0x1f2 align=1 (i32.const 0) (local.get 0x1f2))
+    (i64.store offset=0x1f3 align=1 (i32.const 0) (local.get 0x1f3))
+    (i64.store offset=0x1f4 align=1 (i32.const 0) (local.get 0x1f4))
+    (i64.store offset=0x1f5 align=1 (i32.const 0) (local.get 0x1f5))
+    (i64.store offset=0x1f6 align=1 (i32.const 0) (local.get 0x1f6))
+    (i64.store offset=0x1f7 align=1 (i32.const 0) (local.get 0x1f7))
+    (i64.store offset=0x1f8 align=1 (i32.const 0) (local.get 0x1f8))
+    (i64.store offset=0x1f9 align=1 (i32.const 0) (local.get 0x1f9))
+    (i64.store offset=0x1fa align=1 (i32.const 0) (local.get 0x1fa))
+    (i64.store offset=0x1fb align=1 (i32.const 0) (local.get 0x1fb))
+    (i64.store offset=0x1fc align=1 (i32.const 0) (local.get 0x1fc))
+    (i64.store offset=0x1fd align=1 (i32.const 0) (local.get 0x1fd))
+    (i64.store offset=0x1fe align=1 (i32.const 0) (local.get 0x1fe))
+    (i64.store offset=0x1ff align=1 (i32.const 0) (local.get 0x1ff))
+    (i64.store offset=0x200 align=1 (i32.const 0) (local.get 0x200))
+    (i64.store offset=0x201 align=1 (i32.const 0) (local.get 0x201))
+    (i64.store offset=0x202 align=1 (i32.const 0) (local.get 0x202))
+    (i64.store offset=0x203 align=1 (i32.const 0) (local.get 0x203))
+    (i64.store offset=0x204 align=1 (i32.const 0) (local.get 0x204))
+    (i64.store offset=0x205 align=1 (i32.const 0) (local.get 0x205))
+    (i64.store offset=0x206 align=1 (i32.const 0) (local.get 0x206))
+    (i64.store offset=0x207 align=1 (i32.const 0) (local.get 0x207))
+    (i64.store offset=0x208 align=1 (i32.const 0) (local.get 0x208))
+    (i64.store offset=0x209 align=1 (i32.const 0) (local.get 0x209))
+    (i64.store offset=0x20a align=1 (i32.const 0) (local.get 0x20a))
+    (i64.store offset=0x20b align=1 (i32.const 0) (local.get 0x20b))
+    (i64.store offset=0x20c align=1 (i32.const 0) (local.get 0x20c))
+    (i64.store offset=0x20d align=1 (i32.const 0) (local.get 0x20d))
+    (i64.store offset=0x20e align=1 (i32.const 0) (local.get 0x20e))
+    (i64.store offset=0x20f align=1 (i32.const 0) (local.get 0x20f))
+    (i64.store offset=0x210 align=1 (i32.const 0) (local.get 0x210))
+    (i64.store offset=0x211 align=1 (i32.const 0) (local.get 0x211))
+    (i64.store offset=0x212 align=1 (i32.const 0) (local.get 0x212))
+    (i64.store offset=0x213 align=1 (i32.const 0) (local.get 0x213))
+    (i64.store offset=0x214 align=1 (i32.const 0) (local.get 0x214))
+    (i64.store offset=0x215 align=1 (i32.const 0) (local.get 0x215))
+    (i64.store offset=0x216 align=1 (i32.const 0) (local.get 0x216))
+    (i64.store offset=0x217 align=1 (i32.const 0) (local.get 0x217))
+    (i64.store offset=0x218 align=1 (i32.const 0) (local.get 0x218))
+    (i64.store offset=0x219 align=1 (i32.const 0) (local.get 0x219))
+    (i64.store offset=0x21a align=1 (i32.const 0) (local.get 0x21a))
+    (i64.store offset=0x21b align=1 (i32.const 0) (local.get 0x21b))
+    (i64.store offset=0x21c align=1 (i32.const 0) (local.get 0x21c))
+    (i64.store offset=0x21d align=1 (i32.const 0) (local.get 0x21d))
+    (i64.store offset=0x21e align=1 (i32.const 0) (local.get 0x21e))
+    (i64.store offset=0x21f align=1 (i32.const 0) (local.get 0x21f))
+    (i64.store offset=0x220 align=1 (i32.const 0) (local.get 0x220))
+    (i64.store offset=0x221 align=1 (i32.const 0) (local.get 0x221))
+    (i64.store offset=0x222 align=1 (i32.const 0) (local.get 0x222))
+    (i64.store offset=0x223 align=1 (i32.const 0) (local.get 0x223))
+    (i64.store offset=0x224 align=1 (i32.const 0) (local.get 0x224))
+    (i64.store offset=0x225 align=1 (i32.const 0) (local.get 0x225))
+    (i64.store offset=0x226 align=1 (i32.const 0) (local.get 0x226))
+    (i64.store offset=0x227 align=1 (i32.const 0) (local.get 0x227))
+    (i64.store offset=0x228 align=1 (i32.const 0) (local.get 0x228))
+    (i64.store offset=0x229 align=1 (i32.const 0) (local.get 0x229))
+    (i64.store offset=0x22a align=1 (i32.const 0) (local.get 0x22a))
+    (i64.store offset=0x22b align=1 (i32.const 0) (local.get 0x22b))
+    (i64.store offset=0x22c align=1 (i32.const 0) (local.get 0x22c))
+    (i64.store offset=0x22d align=1 (i32.const 0) (local.get 0x22d))
+    (i64.store offset=0x22e align=1 (i32.const 0) (local.get 0x22e))
+    (i64.store offset=0x22f align=1 (i32.const 0) (local.get 0x22f))
+    (i64.store offset=0x230 align=1 (i32.const 0) (local.get 0x230))
+    (i64.store offset=0x231 align=1 (i32.const 0) (local.get 0x231))
+    (i64.store offset=0x232 align=1 (i32.const 0) (local.get 0x232))
+    (i64.store offset=0x233 align=1 (i32.const 0) (local.get 0x233))
+    (i64.store offset=0x234 align=1 (i32.const 0) (local.get 0x234))
+    (i64.store offset=0x235 align=1 (i32.const 0) (local.get 0x235))
+    (i64.store offset=0x236 align=1 (i32.const 0) (local.get 0x236))
+    (i64.store offset=0x237 align=1 (i32.const 0) (local.get 0x237))
+    (i64.store offset=0x238 align=1 (i32.const 0) (local.get 0x238))
+    (i64.store offset=0x239 align=1 (i32.const 0) (local.get 0x239))
+    (i64.store offset=0x23a align=1 (i32.const 0) (local.get 0x23a))
+    (i64.store offset=0x23b align=1 (i32.const 0) (local.get 0x23b))
+    (i64.store offset=0x23c align=1 (i32.const 0) (local.get 0x23c))
+    (i64.store offset=0x23d align=1 (i32.const 0) (local.get 0x23d))
+    (i64.store offset=0x23e align=1 (i32.const 0) (local.get 0x23e))
+    (i64.store offset=0x23f align=1 (i32.const 0) (local.get 0x23f))
+    (i64.store offset=0x240 align=1 (i32.const 0) (local.get 0x240))
+    (i64.store offset=0x241 align=1 (i32.const 0) (local.get 0x241))
+    (i64.store offset=0x242 align=1 (i32.const 0) (local.get 0x242))
+    (i64.store offset=0x243 align=1 (i32.const 0) (local.get 0x243))
+    (i64.store offset=0x244 align=1 (i32.const 0) (local.get 0x244))
+    (i64.store offset=0x245 align=1 (i32.const 0) (local.get 0x245))
+    (i64.store offset=0x246 align=1 (i32.const 0) (local.get 0x246))
+    (i64.store offset=0x247 align=1 (i32.const 0) (local.get 0x247))
+    (i64.store offset=0x248 align=1 (i32.const 0) (local.get 0x248))
+    (i64.store offset=0x249 align=1 (i32.const 0) (local.get 0x249))
+    (i64.store offset=0x24a align=1 (i32.const 0) (local.get 0x24a))
+    (i64.store offset=0x24b align=1 (i32.const 0) (local.get 0x24b))
+    (i64.store offset=0x24c align=1 (i32.const 0) (local.get 0x24c))
+    (i64.store offset=0x24d align=1 (i32.const 0) (local.get 0x24d))
+    (i64.store offset=0x24e align=1 (i32.const 0) (local.get 0x24e))
+    (i64.store offset=0x24f align=1 (i32.const 0) (local.get 0x24f))
+    (i64.store offset=0x250 align=1 (i32.const 0) (local.get 0x250))
+    (i64.store offset=0x251 align=1 (i32.const 0) (local.get 0x251))
+    (i64.store offset=0x252 align=1 (i32.const 0) (local.get 0x252))
+    (i64.store offset=0x253 align=1 (i32.const 0) (local.get 0x253))
+    (i64.store offset=0x254 align=1 (i32.const 0) (local.get 0x254))
+    (i64.store offset=0x255 align=1 (i32.const 0) (local.get 0x255))
+    (i64.store offset=0x256 align=1 (i32.const 0) (local.get 0x256))
+    (i64.store offset=0x257 align=1 (i32.const 0) (local.get 0x257))
+    (i64.store offset=0x258 align=1 (i32.const 0) (local.get 0x258))
+    (i64.store offset=0x259 align=1 (i32.const 0) (local.get 0x259))
+    (i64.store offset=0x25a align=1 (i32.const 0) (local.get 0x25a))
+    (i64.store offset=0x25b align=1 (i32.const 0) (local.get 0x25b))
+    (i64.store offset=0x25c align=1 (i32.const 0) (local.get 0x25c))
+    (i64.store offset=0x25d align=1 (i32.const 0) (local.get 0x25d))
+    (i64.store offset=0x25e align=1 (i32.const 0) (local.get 0x25e))
+    (i64.store offset=0x25f align=1 (i32.const 0) (local.get 0x25f))
+    (i64.store offset=0x260 align=1 (i32.const 0) (local.get 0x260))
+    (i64.store offset=0x261 align=1 (i32.const 0) (local.get 0x261))
+    (i64.store offset=0x262 align=1 (i32.const 0) (local.get 0x262))
+    (i64.store offset=0x263 align=1 (i32.const 0) (local.get 0x263))
+    (i64.store offset=0x264 align=1 (i32.const 0) (local.get 0x264))
+    (i64.store offset=0x265 align=1 (i32.const 0) (local.get 0x265))
+    (i64.store offset=0x266 align=1 (i32.const 0) (local.get 0x266))
+    (i64.store offset=0x267 align=1 (i32.const 0) (local.get 0x267))
+    (i64.store offset=0x268 align=1 (i32.const 0) (local.get 0x268))
+    (i64.store offset=0x269 align=1 (i32.const 0) (local.get 0x269))
+    (i64.store offset=0x26a align=1 (i32.const 0) (local.get 0x26a))
+    (i64.store offset=0x26b align=1 (i32.const 0) (local.get 0x26b))
+    (i64.store offset=0x26c align=1 (i32.const 0) (local.get 0x26c))
+    (i64.store offset=0x26d align=1 (i32.const 0) (local.get 0x26d))
+    (i64.store offset=0x26e align=1 (i32.const 0) (local.get 0x26e))
+    (i64.store offset=0x26f align=1 (i32.const 0) (local.get 0x26f))
+    (i64.store offset=0x270 align=1 (i32.const 0) (local.get 0x270))
+    (i64.store offset=0x271 align=1 (i32.const 0) (local.get 0x271))
+    (i64.store offset=0x272 align=1 (i32.const 0) (local.get 0x272))
+    (i64.store offset=0x273 align=1 (i32.const 0) (local.get 0x273))
+    (i64.store offset=0x274 align=1 (i32.const 0) (local.get 0x274))
+    (i64.store offset=0x275 align=1 (i32.const 0) (local.get 0x275))
+    (i64.store offset=0x276 align=1 (i32.const 0) (local.get 0x276))
+    (i64.store offset=0x277 align=1 (i32.const 0) (local.get 0x277))
+    (i64.store offset=0x278 align=1 (i32.const 0) (local.get 0x278))
+    (i64.store offset=0x279 align=1 (i32.const 0) (local.get 0x279))
+    (i64.store offset=0x27a align=1 (i32.const 0) (local.get 0x27a))
+    (i64.store offset=0x27b align=1 (i32.const 0) (local.get 0x27b))
+    (i64.store offset=0x27c align=1 (i32.const 0) (local.get 0x27c))
+    (i64.store offset=0x27d align=1 (i32.const 0) (local.get 0x27d))
+    (i64.store offset=0x27e align=1 (i32.const 0) (local.get 0x27e))
+    (i64.store offset=0x27f align=1 (i32.const 0) (local.get 0x27f))
+    (i64.store offset=0x280 align=1 (i32.const 0) (local.get 0x280))
+    (i64.store offset=0x281 align=1 (i32.const 0) (local.get 0x281))
+    (i64.store offset=0x282 align=1 (i32.const 0) (local.get 0x282))
+    (i64.store offset=0x283 align=1 (i32.const 0) (local.get 0x283))
+    (i64.store offset=0x284 align=1 (i32.const 0) (local.get 0x284))
+    (i64.store offset=0x285 align=1 (i32.const 0) (local.get 0x285))
+    (i64.store offset=0x286 align=1 (i32.const 0) (local.get 0x286))
+    (i64.store offset=0x287 align=1 (i32.const 0) (local.get 0x287))
+    (i64.store offset=0x288 align=1 (i32.const 0) (local.get 0x288))
+    (i64.store offset=0x289 align=1 (i32.const 0) (local.get 0x289))
+    (i64.store offset=0x28a align=1 (i32.const 0) (local.get 0x28a))
+    (i64.store offset=0x28b align=1 (i32.const 0) (local.get 0x28b))
+    (i64.store offset=0x28c align=1 (i32.const 0) (local.get 0x28c))
+    (i64.store offset=0x28d align=1 (i32.const 0) (local.get 0x28d))
+    (i64.store offset=0x28e align=1 (i32.const 0) (local.get 0x28e))
+    (i64.store offset=0x28f align=1 (i32.const 0) (local.get 0x28f))
+    (i64.store offset=0x290 align=1 (i32.const 0) (local.get 0x290))
+    (i64.store offset=0x291 align=1 (i32.const 0) (local.get 0x291))
+    (i64.store offset=0x292 align=1 (i32.const 0) (local.get 0x292))
+    (i64.store offset=0x293 align=1 (i32.const 0) (local.get 0x293))
+    (i64.store offset=0x294 align=1 (i32.const 0) (local.get 0x294))
+    (i64.store offset=0x295 align=1 (i32.const 0) (local.get 0x295))
+    (i64.store offset=0x296 align=1 (i32.const 0) (local.get 0x296))
+    (i64.store offset=0x297 align=1 (i32.const 0) (local.get 0x297))
+    (i64.store offset=0x298 align=1 (i32.const 0) (local.get 0x298))
+    (i64.store offset=0x299 align=1 (i32.const 0) (local.get 0x299))
+    (i64.store offset=0x29a align=1 (i32.const 0) (local.get 0x29a))
+    (i64.store offset=0x29b align=1 (i32.const 0) (local.get 0x29b))
+    (i64.store offset=0x29c align=1 (i32.const 0) (local.get 0x29c))
+    (i64.store offset=0x29d align=1 (i32.const 0) (local.get 0x29d))
+    (i64.store offset=0x29e align=1 (i32.const 0) (local.get 0x29e))
+    (i64.store offset=0x29f align=1 (i32.const 0) (local.get 0x29f))
+    (i64.store offset=0x2a0 align=1 (i32.const 0) (local.get 0x2a0))
+    (i64.store offset=0x2a1 align=1 (i32.const 0) (local.get 0x2a1))
+    (i64.store offset=0x2a2 align=1 (i32.const 0) (local.get 0x2a2))
+    (i64.store offset=0x2a3 align=1 (i32.const 0) (local.get 0x2a3))
+    (i64.store offset=0x2a4 align=1 (i32.const 0) (local.get 0x2a4))
+    (i64.store offset=0x2a5 align=1 (i32.const 0) (local.get 0x2a5))
+    (i64.store offset=0x2a6 align=1 (i32.const 0) (local.get 0x2a6))
+    (i64.store offset=0x2a7 align=1 (i32.const 0) (local.get 0x2a7))
+    (i64.store offset=0x2a8 align=1 (i32.const 0) (local.get 0x2a8))
+    (i64.store offset=0x2a9 align=1 (i32.const 0) (local.get 0x2a9))
+    (i64.store offset=0x2aa align=1 (i32.const 0) (local.get 0x2aa))
+    (i64.store offset=0x2ab align=1 (i32.const 0) (local.get 0x2ab))
+    (i64.store offset=0x2ac align=1 (i32.const 0) (local.get 0x2ac))
+    (i64.store offset=0x2ad align=1 (i32.const 0) (local.get 0x2ad))
+    (i64.store offset=0x2ae align=1 (i32.const 0) (local.get 0x2ae))
+    (i64.store offset=0x2af align=1 (i32.const 0) (local.get 0x2af))
+    (i64.store offset=0x2b0 align=1 (i32.const 0) (local.get 0x2b0))
+    (i64.store offset=0x2b1 align=1 (i32.const 0) (local.get 0x2b1))
+    (i64.store offset=0x2b2 align=1 (i32.const 0) (local.get 0x2b2))
+    (i64.store offset=0x2b3 align=1 (i32.const 0) (local.get 0x2b3))
+    (i64.store offset=0x2b4 align=1 (i32.const 0) (local.get 0x2b4))
+    (i64.store offset=0x2b5 align=1 (i32.const 0) (local.get 0x2b5))
+    (i64.store offset=0x2b6 align=1 (i32.const 0) (local.get 0x2b6))
+    (i64.store offset=0x2b7 align=1 (i32.const 0) (local.get 0x2b7))
+    (i64.store offset=0x2b8 align=1 (i32.const 0) (local.get 0x2b8))
+    (i64.store offset=0x2b9 align=1 (i32.const 0) (local.get 0x2b9))
+    (i64.store offset=0x2ba align=1 (i32.const 0) (local.get 0x2ba))
+    (i64.store offset=0x2bb align=1 (i32.const 0) (local.get 0x2bb))
+    (i64.store offset=0x2bc align=1 (i32.const 0) (local.get 0x2bc))
+    (i64.store offset=0x2bd align=1 (i32.const 0) (local.get 0x2bd))
+    (i64.store offset=0x2be align=1 (i32.const 0) (local.get 0x2be))
+    (i64.store offset=0x2bf align=1 (i32.const 0) (local.get 0x2bf))
+    (i64.store offset=0x2c0 align=1 (i32.const 0) (local.get 0x2c0))
+    (i64.store offset=0x2c1 align=1 (i32.const 0) (local.get 0x2c1))
+    (i64.store offset=0x2c2 align=1 (i32.const 0) (local.get 0x2c2))
+    (i64.store offset=0x2c3 align=1 (i32.const 0) (local.get 0x2c3))
+    (i64.store offset=0x2c4 align=1 (i32.const 0) (local.get 0x2c4))
+    (i64.store offset=0x2c5 align=1 (i32.const 0) (local.get 0x2c5))
+    (i64.store offset=0x2c6 align=1 (i32.const 0) (local.get 0x2c6))
+    (i64.store offset=0x2c7 align=1 (i32.const 0) (local.get 0x2c7))
+    (i64.store offset=0x2c8 align=1 (i32.const 0) (local.get 0x2c8))
+    (i64.store offset=0x2c9 align=1 (i32.const 0) (local.get 0x2c9))
+    (i64.store offset=0x2ca align=1 (i32.const 0) (local.get 0x2ca))
+    (i64.store offset=0x2cb align=1 (i32.const 0) (local.get 0x2cb))
+    (i64.store offset=0x2cc align=1 (i32.const 0) (local.get 0x2cc))
+    (i64.store offset=0x2cd align=1 (i32.const 0) (local.get 0x2cd))
+    (i64.store offset=0x2ce align=1 (i32.const 0) (local.get 0x2ce))
+    (i64.store offset=0x2cf align=1 (i32.const 0) (local.get 0x2cf))
+    (i64.store offset=0x2d0 align=1 (i32.const 0) (local.get 0x2d0))
+    (i64.store offset=0x2d1 align=1 (i32.const 0) (local.get 0x2d1))
+    (i64.store offset=0x2d2 align=1 (i32.const 0) (local.get 0x2d2))
+    (i64.store offset=0x2d3 align=1 (i32.const 0) (local.get 0x2d3))
+    (i64.store offset=0x2d4 align=1 (i32.const 0) (local.get 0x2d4))
+    (i64.store offset=0x2d5 align=1 (i32.const 0) (local.get 0x2d5))
+    (i64.store offset=0x2d6 align=1 (i32.const 0) (local.get 0x2d6))
+    (i64.store offset=0x2d7 align=1 (i32.const 0) (local.get 0x2d7))
+    (i64.store offset=0x2d8 align=1 (i32.const 0) (local.get 0x2d8))
+    (i64.store offset=0x2d9 align=1 (i32.const 0) (local.get 0x2d9))
+    (i64.store offset=0x2da align=1 (i32.const 0) (local.get 0x2da))
+    (i64.store offset=0x2db align=1 (i32.const 0) (local.get 0x2db))
+    (i64.store offset=0x2dc align=1 (i32.const 0) (local.get 0x2dc))
+    (i64.store offset=0x2dd align=1 (i32.const 0) (local.get 0x2dd))
+    (i64.store offset=0x2de align=1 (i32.const 0) (local.get 0x2de))
+    (i64.store offset=0x2df align=1 (i32.const 0) (local.get 0x2df))
+    (i64.store offset=0x2e0 align=1 (i32.const 0) (local.get 0x2e0))
+    (i64.store offset=0x2e1 align=1 (i32.const 0) (local.get 0x2e1))
+    (i64.store offset=0x2e2 align=1 (i32.const 0) (local.get 0x2e2))
+    (i64.store offset=0x2e3 align=1 (i32.const 0) (local.get 0x2e3))
+    (i64.store offset=0x2e4 align=1 (i32.const 0) (local.get 0x2e4))
+    (i64.store offset=0x2e5 align=1 (i32.const 0) (local.get 0x2e5))
+    (i64.store offset=0x2e6 align=1 (i32.const 0) (local.get 0x2e6))
+    (i64.store offset=0x2e7 align=1 (i32.const 0) (local.get 0x2e7))
+    (i64.store offset=0x2e8 align=1 (i32.const 0) (local.get 0x2e8))
+    (i64.store offset=0x2e9 align=1 (i32.const 0) (local.get 0x2e9))
+    (i64.store offset=0x2ea align=1 (i32.const 0) (local.get 0x2ea))
+    (i64.store offset=0x2eb align=1 (i32.const 0) (local.get 0x2eb))
+    (i64.store offset=0x2ec align=1 (i32.const 0) (local.get 0x2ec))
+    (i64.store offset=0x2ed align=1 (i32.const 0) (local.get 0x2ed))
+    (i64.store offset=0x2ee align=1 (i32.const 0) (local.get 0x2ee))
+    (i64.store offset=0x2ef align=1 (i32.const 0) (local.get 0x2ef))
+    (i64.store offset=0x2f0 align=1 (i32.const 0) (local.get 0x2f0))
+    (i64.store offset=0x2f1 align=1 (i32.const 0) (local.get 0x2f1))
+    (i64.store offset=0x2f2 align=1 (i32.const 0) (local.get 0x2f2))
+    (i64.store offset=0x2f3 align=1 (i32.const 0) (local.get 0x2f3))
+    (i64.store offset=0x2f4 align=1 (i32.const 0) (local.get 0x2f4))
+    (i64.store offset=0x2f5 align=1 (i32.const 0) (local.get 0x2f5))
+    (i64.store offset=0x2f6 align=1 (i32.const 0) (local.get 0x2f6))
+    (i64.store offset=0x2f7 align=1 (i32.const 0) (local.get 0x2f7))
+    (i64.store offset=0x2f8 align=1 (i32.const 0) (local.get 0x2f8))
+    (i64.store offset=0x2f9 align=1 (i32.const 0) (local.get 0x2f9))
+    (i64.store offset=0x2fa align=1 (i32.const 0) (local.get 0x2fa))
+    (i64.store offset=0x2fb align=1 (i32.const 0) (local.get 0x2fb))
+    (i64.store offset=0x2fc align=1 (i32.const 0) (local.get 0x2fc))
+    (i64.store offset=0x2fd align=1 (i32.const 0) (local.get 0x2fd))
+    (i64.store offset=0x2fe align=1 (i32.const 0) (local.get 0x2fe))
+    (i64.store offset=0x2ff align=1 (i32.const 0) (local.get 0x2ff))
+    (i64.store offset=0x300 align=1 (i32.const 0) (local.get 0x300))
+    (i64.store offset=0x301 align=1 (i32.const 0) (local.get 0x301))
+    (i64.store offset=0x302 align=1 (i32.const 0) (local.get 0x302))
+    (i64.store offset=0x303 align=1 (i32.const 0) (local.get 0x303))
+    (i64.store offset=0x304 align=1 (i32.const 0) (local.get 0x304))
+    (i64.store offset=0x305 align=1 (i32.const 0) (local.get 0x305))
+    (i64.store offset=0x306 align=1 (i32.const 0) (local.get 0x306))
+    (i64.store offset=0x307 align=1 (i32.const 0) (local.get 0x307))
+    (i64.store offset=0x308 align=1 (i32.const 0) (local.get 0x308))
+    (i64.store offset=0x309 align=1 (i32.const 0) (local.get 0x309))
+    (i64.store offset=0x30a align=1 (i32.const 0) (local.get 0x30a))
+    (i64.store offset=0x30b align=1 (i32.const 0) (local.get 0x30b))
+    (i64.store offset=0x30c align=1 (i32.const 0) (local.get 0x30c))
+    (i64.store offset=0x30d align=1 (i32.const 0) (local.get 0x30d))
+    (i64.store offset=0x30e align=1 (i32.const 0) (local.get 0x30e))
+    (i64.store offset=0x30f align=1 (i32.const 0) (local.get 0x30f))
+    (i64.store offset=0x310 align=1 (i32.const 0) (local.get 0x310))
+    (i64.store offset=0x311 align=1 (i32.const 0) (local.get 0x311))
+    (i64.store offset=0x312 align=1 (i32.const 0) (local.get 0x312))
+    (i64.store offset=0x313 align=1 (i32.const 0) (local.get 0x313))
+    (i64.store offset=0x314 align=1 (i32.const 0) (local.get 0x314))
+    (i64.store offset=0x315 align=1 (i32.const 0) (local.get 0x315))
+    (i64.store offset=0x316 align=1 (i32.const 0) (local.get 0x316))
+    (i64.store offset=0x317 align=1 (i32.const 0) (local.get 0x317))
+    (i64.store offset=0x318 align=1 (i32.const 0) (local.get 0x318))
+    (i64.store offset=0x319 align=1 (i32.const 0) (local.get 0x319))
+    (i64.store offset=0x31a align=1 (i32.const 0) (local.get 0x31a))
+    (i64.store offset=0x31b align=1 (i32.const 0) (local.get 0x31b))
+    (i64.store offset=0x31c align=1 (i32.const 0) (local.get 0x31c))
+    (i64.store offset=0x31d align=1 (i32.const 0) (local.get 0x31d))
+    (i64.store offset=0x31e align=1 (i32.const 0) (local.get 0x31e))
+    (i64.store offset=0x31f align=1 (i32.const 0) (local.get 0x31f))
+    (i64.store offset=0x320 align=1 (i32.const 0) (local.get 0x320))
+    (i64.store offset=0x321 align=1 (i32.const 0) (local.get 0x321))
+    (i64.store offset=0x322 align=1 (i32.const 0) (local.get 0x322))
+    (i64.store offset=0x323 align=1 (i32.const 0) (local.get 0x323))
+    (i64.store offset=0x324 align=1 (i32.const 0) (local.get 0x324))
+    (i64.store offset=0x325 align=1 (i32.const 0) (local.get 0x325))
+    (i64.store offset=0x326 align=1 (i32.const 0) (local.get 0x326))
+    (i64.store offset=0x327 align=1 (i32.const 0) (local.get 0x327))
+    (i64.store offset=0x328 align=1 (i32.const 0) (local.get 0x328))
+    (i64.store offset=0x329 align=1 (i32.const 0) (local.get 0x329))
+    (i64.store offset=0x32a align=1 (i32.const 0) (local.get 0x32a))
+    (i64.store offset=0x32b align=1 (i32.const 0) (local.get 0x32b))
+    (i64.store offset=0x32c align=1 (i32.const 0) (local.get 0x32c))
+    (i64.store offset=0x32d align=1 (i32.const 0) (local.get 0x32d))
+    (i64.store offset=0x32e align=1 (i32.const 0) (local.get 0x32e))
+    (i64.store offset=0x32f align=1 (i32.const 0) (local.get 0x32f))
+    (i64.store offset=0x330 align=1 (i32.const 0) (local.get 0x330))
+    (i64.store offset=0x331 align=1 (i32.const 0) (local.get 0x331))
+    (i64.store offset=0x332 align=1 (i32.const 0) (local.get 0x332))
+    (i64.store offset=0x333 align=1 (i32.const 0) (local.get 0x333))
+    (i64.store offset=0x334 align=1 (i32.const 0) (local.get 0x334))
+    (i64.store offset=0x335 align=1 (i32.const 0) (local.get 0x335))
+    (i64.store offset=0x336 align=1 (i32.const 0) (local.get 0x336))
+    (i64.store offset=0x337 align=1 (i32.const 0) (local.get 0x337))
+    (i64.store offset=0x338 align=1 (i32.const 0) (local.get 0x338))
+    (i64.store offset=0x339 align=1 (i32.const 0) (local.get 0x339))
+    (i64.store offset=0x33a align=1 (i32.const 0) (local.get 0x33a))
+    (i64.store offset=0x33b align=1 (i32.const 0) (local.get 0x33b))
+    (i64.store offset=0x33c align=1 (i32.const 0) (local.get 0x33c))
+    (i64.store offset=0x33d align=1 (i32.const 0) (local.get 0x33d))
+    (i64.store offset=0x33e align=1 (i32.const 0) (local.get 0x33e))
+    (i64.store offset=0x33f align=1 (i32.const 0) (local.get 0x33f))
+    (i64.store offset=0x340 align=1 (i32.const 0) (local.get 0x340))
+    (i64.store offset=0x341 align=1 (i32.const 0) (local.get 0x341))
+    (i64.store offset=0x342 align=1 (i32.const 0) (local.get 0x342))
+    (i64.store offset=0x343 align=1 (i32.const 0) (local.get 0x343))
+    (i64.store offset=0x344 align=1 (i32.const 0) (local.get 0x344))
+    (i64.store offset=0x345 align=1 (i32.const 0) (local.get 0x345))
+    (i64.store offset=0x346 align=1 (i32.const 0) (local.get 0x346))
+    (i64.store offset=0x347 align=1 (i32.const 0) (local.get 0x347))
+    (i64.store offset=0x348 align=1 (i32.const 0) (local.get 0x348))
+    (i64.store offset=0x349 align=1 (i32.const 0) (local.get 0x349))
+    (i64.store offset=0x34a align=1 (i32.const 0) (local.get 0x34a))
+    (i64.store offset=0x34b align=1 (i32.const 0) (local.get 0x34b))
+    (i64.store offset=0x34c align=1 (i32.const 0) (local.get 0x34c))
+    (i64.store offset=0x34d align=1 (i32.const 0) (local.get 0x34d))
+    (i64.store offset=0x34e align=1 (i32.const 0) (local.get 0x34e))
+    (i64.store offset=0x34f align=1 (i32.const 0) (local.get 0x34f))
+    (i64.store offset=0x350 align=1 (i32.const 0) (local.get 0x350))
+    (i64.store offset=0x351 align=1 (i32.const 0) (local.get 0x351))
+    (i64.store offset=0x352 align=1 (i32.const 0) (local.get 0x352))
+    (i64.store offset=0x353 align=1 (i32.const 0) (local.get 0x353))
+    (i64.store offset=0x354 align=1 (i32.const 0) (local.get 0x354))
+    (i64.store offset=0x355 align=1 (i32.const 0) (local.get 0x355))
+    (i64.store offset=0x356 align=1 (i32.const 0) (local.get 0x356))
+    (i64.store offset=0x357 align=1 (i32.const 0) (local.get 0x357))
+    (i64.store offset=0x358 align=1 (i32.const 0) (local.get 0x358))
+    (i64.store offset=0x359 align=1 (i32.const 0) (local.get 0x359))
+    (i64.store offset=0x35a align=1 (i32.const 0) (local.get 0x35a))
+    (i64.store offset=0x35b align=1 (i32.const 0) (local.get 0x35b))
+    (i64.store offset=0x35c align=1 (i32.const 0) (local.get 0x35c))
+    (i64.store offset=0x35d align=1 (i32.const 0) (local.get 0x35d))
+    (i64.store offset=0x35e align=1 (i32.const 0) (local.get 0x35e))
+    (i64.store offset=0x35f align=1 (i32.const 0) (local.get 0x35f))
+    (i64.store offset=0x360 align=1 (i32.const 0) (local.get 0x360))
+    (i64.store offset=0x361 align=1 (i32.const 0) (local.get 0x361))
+    (i64.store offset=0x362 align=1 (i32.const 0) (local.get 0x362))
+    (i64.store offset=0x363 align=1 (i32.const 0) (local.get 0x363))
+    (i64.store offset=0x364 align=1 (i32.const 0) (local.get 0x364))
+    (i64.store offset=0x365 align=1 (i32.const 0) (local.get 0x365))
+    (i64.store offset=0x366 align=1 (i32.const 0) (local.get 0x366))
+    (i64.store offset=0x367 align=1 (i32.const 0) (local.get 0x367))
+    (i64.store offset=0x368 align=1 (i32.const 0) (local.get 0x368))
+    (i64.store offset=0x369 align=1 (i32.const 0) (local.get 0x369))
+    (i64.store offset=0x36a align=1 (i32.const 0) (local.get 0x36a))
+    (i64.store offset=0x36b align=1 (i32.const 0) (local.get 0x36b))
+    (i64.store offset=0x36c align=1 (i32.const 0) (local.get 0x36c))
+    (i64.store offset=0x36d align=1 (i32.const 0) (local.get 0x36d))
+    (i64.store offset=0x36e align=1 (i32.const 0) (local.get 0x36e))
+    (i64.store offset=0x36f align=1 (i32.const 0) (local.get 0x36f))
+    (i64.store offset=0x370 align=1 (i32.const 0) (local.get 0x370))
+    (i64.store offset=0x371 align=1 (i32.const 0) (local.get 0x371))
+    (i64.store offset=0x372 align=1 (i32.const 0) (local.get 0x372))
+    (i64.store offset=0x373 align=1 (i32.const 0) (local.get 0x373))
+    (i64.store offset=0x374 align=1 (i32.const 0) (local.get 0x374))
+    (i64.store offset=0x375 align=1 (i32.const 0) (local.get 0x375))
+    (i64.store offset=0x376 align=1 (i32.const 0) (local.get 0x376))
+    (i64.store offset=0x377 align=1 (i32.const 0) (local.get 0x377))
+    (i64.store offset=0x378 align=1 (i32.const 0) (local.get 0x378))
+    (i64.store offset=0x379 align=1 (i32.const 0) (local.get 0x379))
+    (i64.store offset=0x37a align=1 (i32.const 0) (local.get 0x37a))
+    (i64.store offset=0x37b align=1 (i32.const 0) (local.get 0x37b))
+    (i64.store offset=0x37c align=1 (i32.const 0) (local.get 0x37c))
+    (i64.store offset=0x37d align=1 (i32.const 0) (local.get 0x37d))
+    (i64.store offset=0x37e align=1 (i32.const 0) (local.get 0x37e))
+    (i64.store offset=0x37f align=1 (i32.const 0) (local.get 0x37f))
+    (i64.store offset=0x380 align=1 (i32.const 0) (local.get 0x380))
+    (i64.store offset=0x381 align=1 (i32.const 0) (local.get 0x381))
+    (i64.store offset=0x382 align=1 (i32.const 0) (local.get 0x382))
+    (i64.store offset=0x383 align=1 (i32.const 0) (local.get 0x383))
+    (i64.store offset=0x384 align=1 (i32.const 0) (local.get 0x384))
+    (i64.store offset=0x385 align=1 (i32.const 0) (local.get 0x385))
+    (i64.store offset=0x386 align=1 (i32.const 0) (local.get 0x386))
+    (i64.store offset=0x387 align=1 (i32.const 0) (local.get 0x387))
+    (i64.store offset=0x388 align=1 (i32.const 0) (local.get 0x388))
+    (i64.store offset=0x389 align=1 (i32.const 0) (local.get 0x389))
+    (i64.store offset=0x38a align=1 (i32.const 0) (local.get 0x38a))
+    (i64.store offset=0x38b align=1 (i32.const 0) (local.get 0x38b))
+    (i64.store offset=0x38c align=1 (i32.const 0) (local.get 0x38c))
+    (i64.store offset=0x38d align=1 (i32.const 0) (local.get 0x38d))
+    (i64.store offset=0x38e align=1 (i32.const 0) (local.get 0x38e))
+    (i64.store offset=0x38f align=1 (i32.const 0) (local.get 0x38f))
+    (i64.store offset=0x390 align=1 (i32.const 0) (local.get 0x390))
+    (i64.store offset=0x391 align=1 (i32.const 0) (local.get 0x391))
+    (i64.store offset=0x392 align=1 (i32.const 0) (local.get 0x392))
+    (i64.store offset=0x393 align=1 (i32.const 0) (local.get 0x393))
+    (i64.store offset=0x394 align=1 (i32.const 0) (local.get 0x394))
+    (i64.store offset=0x395 align=1 (i32.const 0) (local.get 0x395))
+    (i64.store offset=0x396 align=1 (i32.const 0) (local.get 0x396))
+    (i64.store offset=0x397 align=1 (i32.const 0) (local.get 0x397))
+    (i64.store offset=0x398 align=1 (i32.const 0) (local.get 0x398))
+    (i64.store offset=0x399 align=1 (i32.const 0) (local.get 0x399))
+    (i64.store offset=0x39a align=1 (i32.const 0) (local.get 0x39a))
+    (i64.store offset=0x39b align=1 (i32.const 0) (local.get 0x39b))
+    (i64.store offset=0x39c align=1 (i32.const 0) (local.get 0x39c))
+    (i64.store offset=0x39d align=1 (i32.const 0) (local.get 0x39d))
+    (i64.store offset=0x39e align=1 (i32.const 0) (local.get 0x39e))
+    (i64.store offset=0x39f align=1 (i32.const 0) (local.get 0x39f))
+    (i64.store offset=0x3a0 align=1 (i32.const 0) (local.get 0x3a0))
+    (i64.store offset=0x3a1 align=1 (i32.const 0) (local.get 0x3a1))
+    (i64.store offset=0x3a2 align=1 (i32.const 0) (local.get 0x3a2))
+    (i64.store offset=0x3a3 align=1 (i32.const 0) (local.get 0x3a3))
+    (i64.store offset=0x3a4 align=1 (i32.const 0) (local.get 0x3a4))
+    (i64.store offset=0x3a5 align=1 (i32.const 0) (local.get 0x3a5))
+    (i64.store offset=0x3a6 align=1 (i32.const 0) (local.get 0x3a6))
+    (i64.store offset=0x3a7 align=1 (i32.const 0) (local.get 0x3a7))
+    (i64.store offset=0x3a8 align=1 (i32.const 0) (local.get 0x3a8))
+    (i64.store offset=0x3a9 align=1 (i32.const 0) (local.get 0x3a9))
+    (i64.store offset=0x3aa align=1 (i32.const 0) (local.get 0x3aa))
+    (i64.store offset=0x3ab align=1 (i32.const 0) (local.get 0x3ab))
+    (i64.store offset=0x3ac align=1 (i32.const 0) (local.get 0x3ac))
+    (i64.store offset=0x3ad align=1 (i32.const 0) (local.get 0x3ad))
+    (i64.store offset=0x3ae align=1 (i32.const 0) (local.get 0x3ae))
+    (i64.store offset=0x3af align=1 (i32.const 0) (local.get 0x3af))
+    (i64.store offset=0x3b0 align=1 (i32.const 0) (local.get 0x3b0))
+    (i64.store offset=0x3b1 align=1 (i32.const 0) (local.get 0x3b1))
+    (i64.store offset=0x3b2 align=1 (i32.const 0) (local.get 0x3b2))
+    (i64.store offset=0x3b3 align=1 (i32.const 0) (local.get 0x3b3))
+    (i64.store offset=0x3b4 align=1 (i32.const 0) (local.get 0x3b4))
+    (i64.store offset=0x3b5 align=1 (i32.const 0) (local.get 0x3b5))
+    (i64.store offset=0x3b6 align=1 (i32.const 0) (local.get 0x3b6))
+    (i64.store offset=0x3b7 align=1 (i32.const 0) (local.get 0x3b7))
+    (i64.store offset=0x3b8 align=1 (i32.const 0) (local.get 0x3b8))
+    (i64.store offset=0x3b9 align=1 (i32.const 0) (local.get 0x3b9))
+    (i64.store offset=0x3ba align=1 (i32.const 0) (local.get 0x3ba))
+    (i64.store offset=0x3bb align=1 (i32.const 0) (local.get 0x3bb))
+    (i64.store offset=0x3bc align=1 (i32.const 0) (local.get 0x3bc))
+    (i64.store offset=0x3bd align=1 (i32.const 0) (local.get 0x3bd))
+    (i64.store offset=0x3be align=1 (i32.const 0) (local.get 0x3be))
+    (i64.store offset=0x3bf align=1 (i32.const 0) (local.get 0x3bf))
+    (i64.store offset=0x3c0 align=1 (i32.const 0) (local.get 0x3c0))
+    (i64.store offset=0x3c1 align=1 (i32.const 0) (local.get 0x3c1))
+    (i64.store offset=0x3c2 align=1 (i32.const 0) (local.get 0x3c2))
+    (i64.store offset=0x3c3 align=1 (i32.const 0) (local.get 0x3c3))
+    (i64.store offset=0x3c4 align=1 (i32.const 0) (local.get 0x3c4))
+    (i64.store offset=0x3c5 align=1 (i32.const 0) (local.get 0x3c5))
+    (i64.store offset=0x3c6 align=1 (i32.const 0) (local.get 0x3c6))
+    (i64.store offset=0x3c7 align=1 (i32.const 0) (local.get 0x3c7))
+    (i64.store offset=0x3c8 align=1 (i32.const 0) (local.get 0x3c8))
+    (i64.store offset=0x3c9 align=1 (i32.const 0) (local.get 0x3c9))
+    (i64.store offset=0x3ca align=1 (i32.const 0) (local.get 0x3ca))
+    (i64.store offset=0x3cb align=1 (i32.const 0) (local.get 0x3cb))
+    (i64.store offset=0x3cc align=1 (i32.const 0) (local.get 0x3cc))
+    (i64.store offset=0x3cd align=1 (i32.const 0) (local.get 0x3cd))
+    (i64.store offset=0x3ce align=1 (i32.const 0) (local.get 0x3ce))
+    (i64.store offset=0x3cf align=1 (i32.const 0) (local.get 0x3cf))
+    (i64.store offset=0x3d0 align=1 (i32.const 0) (local.get 0x3d0))
+    (i64.store offset=0x3d1 align=1 (i32.const 0) (local.get 0x3d1))
+    (i64.store offset=0x3d2 align=1 (i32.const 0) (local.get 0x3d2))
+    (i64.store offset=0x3d3 align=1 (i32.const 0) (local.get 0x3d3))
+    (i64.store offset=0x3d4 align=1 (i32.const 0) (local.get 0x3d4))
+    (i64.store offset=0x3d5 align=1 (i32.const 0) (local.get 0x3d5))
+    (i64.store offset=0x3d6 align=1 (i32.const 0) (local.get 0x3d6))
+    (i64.store offset=0x3d7 align=1 (i32.const 0) (local.get 0x3d7))
+    (i64.store offset=0x3d8 align=1 (i32.const 0) (local.get 0x3d8))
+    (i64.store offset=0x3d9 align=1 (i32.const 0) (local.get 0x3d9))
+    (i64.store offset=0x3da align=1 (i32.const 0) (local.get 0x3da))
+    (i64.store offset=0x3db align=1 (i32.const 0) (local.get 0x3db))
+    (i64.store offset=0x3dc align=1 (i32.const 0) (local.get 0x3dc))
+    (i64.store offset=0x3dd align=1 (i32.const 0) (local.get 0x3dd))
+    (i64.store offset=0x3de align=1 (i32.const 0) (local.get 0x3de))
+    (i64.store offset=0x3df align=1 (i32.const 0) (local.get 0x3df))
+    (i64.store offset=0x3e0 align=1 (i32.const 0) (local.get 0x3e0))
+    (i64.store offset=0x3e1 align=1 (i32.const 0) (local.get 0x3e1))
+    (i64.store offset=0x3e2 align=1 (i32.const 0) (local.get 0x3e2))
+    (i64.store offset=0x3e3 align=1 (i32.const 0) (local.get 0x3e3))
+    (i64.store offset=0x3e4 align=1 (i32.const 0) (local.get 0x3e4))
+    (i64.store offset=0x3e5 align=1 (i32.const 0) (local.get 0x3e5))
+    (i64.store offset=0x3e6 align=1 (i32.const 0) (local.get 0x3e6))
+    (i64.store offset=0x3e7 align=1 (i32.const 0) (local.get 0x3e7))
+    (i64.store offset=0x3e8 align=1 (i32.const 0) (local.get 0x3e8))
+    (i64.store offset=0x3e9 align=1 (i32.const 0) (local.get 0x3e9))
+    (i64.store offset=0x3ea align=1 (i32.const 0) (local.get 0x3ea))
+    (i64.store offset=0x3eb align=1 (i32.const 0) (local.get 0x3eb))
+    (i64.store offset=0x3ec align=1 (i32.const 0) (local.get 0x3ec))
+    (i64.store offset=0x3ed align=1 (i32.const 0) (local.get 0x3ed))
+    (i64.store offset=0x3ee align=1 (i32.const 0) (local.get 0x3ee))
+    (i64.store offset=0x3ef align=1 (i32.const 0) (local.get 0x3ef))
+    (i64.store offset=0x3f0 align=1 (i32.const 0) (local.get 0x3f0))
+    (i64.store offset=0x3f1 align=1 (i32.const 0) (local.get 0x3f1))
+    (i64.store offset=0x3f2 align=1 (i32.const 0) (local.get 0x3f2))
+    (i64.store offset=0x3f3 align=1 (i32.const 0) (local.get 0x3f3))
+    (i64.store offset=0x3f4 align=1 (i32.const 0) (local.get 0x3f4))
+    (i64.store offset=0x3f5 align=1 (i32.const 0) (local.get 0x3f5))
+    (i64.store offset=0x3f6 align=1 (i32.const 0) (local.get 0x3f6))
+    (i64.store offset=0x3f7 align=1 (i32.const 0) (local.get 0x3f7))
+    (i64.store offset=0x3f8 align=1 (i32.const 0) (local.get 0x3f8))
+    (i64.store offset=0x3f9 align=1 (i32.const 0) (local.get 0x3f9))
+    (i64.store offset=0x3fa align=1 (i32.const 0) (local.get 0x3fa))
+    (i64.store offset=0x3fb align=1 (i32.const 0) (local.get 0x3fb))
+    (i64.store offset=0x3fc align=1 (i32.const 0) (local.get 0x3fc))
+    (i64.store offset=0x3fd align=1 (i32.const 0) (local.get 0x3fd))
+    (i64.store offset=0x3fe align=1 (i32.const 0) (local.get 0x3fe))
+    (i64.store offset=0x3ff align=1 (i32.const 0) (local.get 0x3ff))
+    (i64.store offset=0x400 align=1 (i32.const 0) (local.get 0x400))
+    (i64.store offset=0x401 align=1 (i32.const 0) (local.get 0x401))
+    (i64.store offset=0x402 align=1 (i32.const 0) (local.get 0x402))
+    (i64.store offset=0x403 align=1 (i32.const 0) (local.get 0x403))
+    (i64.store offset=0x404 align=1 (i32.const 0) (local.get 0x404))
+    (i64.store offset=0x405 align=1 (i32.const 0) (local.get 0x405))
+    (i64.store offset=0x406 align=1 (i32.const 0) (local.get 0x406))
+    (i64.store offset=0x407 align=1 (i32.const 0) (local.get 0x407))
+    (i64.store offset=0x408 align=1 (i32.const 0) (local.get 0x408))
+    (i64.store offset=0x409 align=1 (i32.const 0) (local.get 0x409))
+    (i64.store offset=0x40a align=1 (i32.const 0) (local.get 0x40a))
+    (i64.store offset=0x40b align=1 (i32.const 0) (local.get 0x40b))
+    (i64.store offset=0x40c align=1 (i32.const 0) (local.get 0x40c))
+    (i64.store offset=0x40d align=1 (i32.const 0) (local.get 0x40d))
+    (i64.store offset=0x40e align=1 (i32.const 0) (local.get 0x40e))
+    (i64.store offset=0x40f align=1 (i32.const 0) (local.get 0x40f))
+    (i64.store offset=0x410 align=1 (i32.const 0) (local.get 0x410))
+    (i64.store offset=0x411 align=1 (i32.const 0) (local.get 0x411))
+    (i64.store offset=0x412 align=1 (i32.const 0) (local.get 0x412))
+    (i64.store offset=0x413 align=1 (i32.const 0) (local.get 0x413))
+    (i64.store offset=0x414 align=1 (i32.const 0) (local.get 0x414))
+    (i64.store offset=0x415 align=1 (i32.const 0) (local.get 0x415))
+    (i64.store offset=0x416 align=1 (i32.const 0) (local.get 0x416))
+    (i64.store offset=0x417 align=1 (i32.const 0) (local.get 0x417))
+    (i64.store offset=0x418 align=1 (i32.const 0) (local.get 0x418))
+    (i64.store offset=0x419 align=1 (i32.const 0) (local.get 0x419))
+    (i64.store offset=0x41a align=1 (i32.const 0) (local.get 0x41a))
+    (i64.store offset=0x41b align=1 (i32.const 0) (local.get 0x41b))
+    (i64.store offset=0x41c align=1 (i32.const 0) (local.get 0x41c))
+    (i64.store offset=0x41d align=1 (i32.const 0) (local.get 0x41d))
+    (i64.store offset=0x41e align=1 (i32.const 0) (local.get 0x41e))
+    (i64.store offset=0x41f align=1 (i32.const 0) (local.get 0x41f))
+  )
+)
diff --git a/client/executor/wasmtime/src/tests.rs b/client/executor/wasmtime/src/tests.rs
new file mode 100644
index 000000000000..4066a44194a1
--- /dev/null
+++ b/client/executor/wasmtime/src/tests.rs
@@ -0,0 +1,173 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+use sc_executor_common::{
+	runtime_blob::RuntimeBlob,
+	wasm_runtime::WasmModule,
+};
+use sc_runtime_test::wasm_binary_unwrap;
+use codec::{Encode as _, Decode as _};
+use std::sync::Arc;
+
+type HostFunctions = sp_io::SubstrateHostFunctions;
+
+struct RuntimeBuilder {
+	code: Option<&'static str>,
+	fast_instance_reuse: bool,
+	canonicalize_nans: bool,
+	deterministic_stack: bool,
+	heap_pages: u32,
+}
+
+impl RuntimeBuilder {
+	/// Returns a new builder that won't use the fast instance reuse mechanism, but instead will
+	/// create a new runtime instance each time.
+	fn new_on_demand() -> Self {
+		Self {
+			code: None,
+			fast_instance_reuse: false,
+			canonicalize_nans: false,
+			deterministic_stack: false,
+			heap_pages: 1024,
+		}
+	}
+
+	fn use_wat(&mut self, code: &'static str) {
+		self.code = Some(code);
+	}
+
+	fn canonicalize_nans(&mut self, canonicalize_nans: bool) {
+		self.canonicalize_nans = canonicalize_nans;
+	}
+
+	fn deterministic_stack(&mut self, deterministic_stack: bool) {
+		self.deterministic_stack = deterministic_stack;
+	}
+
+	fn build(self) -> Arc<dyn WasmModule> {
+		let blob = {
+			let wasm: Vec<u8>;
+
+			let wasm = match self.code {
+				None => wasm_binary_unwrap(),
+				Some(wat) => {
+					wasm = wat::parse_str(wat).unwrap();
+					&wasm
+				}
+			};
+
+			RuntimeBlob::uncompress_if_needed(&wasm)
+				.expect("failed to create a runtime blob out of test runtime")
+		};
+
+		let rt = crate::create_runtime(
+			blob,
+			crate::Config {
+				heap_pages: self.heap_pages,
+				allow_missing_func_imports: true,
+				cache_path: None,
+				semantics: crate::Semantics {
+					fast_instance_reuse: self.fast_instance_reuse,
+					deterministic_stack_limit:
+						match self.deterministic_stack {
+							true => Some(crate::DeterministicStackLimit {
+								logical_max: 65536,
+								native_stack_max: 256 * 1024 * 1024,
+							}),
+							false => None,
+						},
+					canonicalize_nans: self.canonicalize_nans,
+				},
+			},
+			{
+				use sp_wasm_interface::HostFunctions as _;
+				HostFunctions::host_functions()
+			}
+		)
+		.expect("cannot create runtime");
+
+		Arc::new(rt) as Arc<dyn WasmModule>
+	}
+}
+
+#[test]
+fn test_nan_canonicalization() {
+	let runtime = {
+		let mut builder = RuntimeBuilder::new_on_demand();
+		builder.canonicalize_nans(true);
+		builder.build()
+	};
+
+	let instance = runtime
+		.new_instance()
+		.expect("failed to instantiate a runtime");
+
+	/// A NaN with canonical payload bits.
+	const CANONICAL_NAN_BITS: u32 = 0x7fc00000;
+	/// A NaN value with an abitrary payload.
+	const ARBITRARY_NAN_BITS: u32 = 0x7f812345;
+
+	// This test works like this: we essentially do
+	//
+	//     a + b
+	//
+	// where
+	//
+	//     * a is a nan with arbitrary bits in its payload
+	//     * b is 1.
+	//
+	// according to the wasm spec, if one of the inputs to the operation is a non-canonical NaN
+	// then the value be a NaN with non-deterministic payload bits.
+	//
+	// However, with the `canonicalize_nans` option turned on above, we expect that the output will
+	// be a canonical NaN.
+	//
+	// We exterpolate the results of this tests so that we assume that all intermediate computations
+	// that involve floats are sanitized and cannot produce a non-deterministic NaN.
+
+	let params = (u32::to_le_bytes(ARBITRARY_NAN_BITS), u32::to_le_bytes(1)).encode();
+	let res = {
+		let raw_result = instance.call_export(
+			"test_fp_f32add",
+			&params,
+		).unwrap();
+		u32::from_le_bytes(<[u8; 4]>::decode(&mut &raw_result[..]).unwrap())
+	};
+	assert_eq!(res, CANONICAL_NAN_BITS);
+}
+
+#[test]
+fn test_stack_depth_reaching() {
+	const TEST_GUARD_PAGE_SKIP: &str = include_str!("test-guard-page-skip.wat");
+
+	let runtime = {
+		let mut builder = RuntimeBuilder::new_on_demand();
+		builder.use_wat(TEST_GUARD_PAGE_SKIP);
+		builder.deterministic_stack(true);
+		builder.build()
+	};
+	let instance = runtime
+		.new_instance()
+		.expect("failed to instantiate a runtime");
+
+	let err = instance.call_export("test-many-locals", &[]).unwrap_err();
+
+	assert!(
+		format!("{:?}", err).starts_with("Other(\"Wasm execution trapped: wasm trap: unreachable")
+	);
+}

From 5dfcba24cf556cdf0f000070bb19a49633a06120 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Wed, 7 Jul 2021 13:11:31 +0200
Subject: [PATCH 0968/1194] Clean up sc-allocator (#9295)

---
 Cargo.lock                              |  2 --
 client/allocator/Cargo.toml             | 15 +++------------
 client/allocator/src/error.rs           |  3 +--
 client/allocator/src/freeing_bump.rs    |  2 +-
 client/executor/runtime-test/Cargo.toml |  2 --
 5 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0662c3da6d6a..be1c28c854a4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6986,7 +6986,6 @@ version = "3.0.0"
 dependencies = [
  "log",
  "sp-core",
- "sp-std",
  "sp-wasm-interface",
  "thiserror",
 ]
@@ -7962,7 +7961,6 @@ dependencies = [
 name = "sc-runtime-test"
 version = "2.0.0"
 dependencies = [
- "sc-allocator",
  "sp-core",
  "sp-io",
  "sp-runtime",
diff --git a/client/allocator/Cargo.toml b/client/allocator/Cargo.toml
index 4911e47dfd7a..43a3bae4e529 100644
--- a/client/allocator/Cargo.toml
+++ b/client/allocator/Cargo.toml
@@ -14,16 +14,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-std = { version = "3.0.0", path = "../../primitives/std", default-features = false }
-sp-core = { version = "3.0.0", path = "../../primitives/core", default-features = false }
-sp-wasm-interface = { version = "3.0.0", path = "../../primitives/wasm-interface", default-features = false }
+sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-wasm-interface = { version = "3.0.0", path = "../../primitives/wasm-interface" }
 log = "0.4.11"
-thiserror = { version = "1.0.21" }
-
-[features]
-default = [ "std" ]
-std = [
-	"sp-std/std",
-	"sp-core/std",
-	"sp-wasm-interface/std",
-]
+thiserror = "1.0.21"
diff --git a/client/allocator/src/error.rs b/client/allocator/src/error.rs
index d28484d34f4c..e880e8d0ae75 100644
--- a/client/allocator/src/error.rs
+++ b/client/allocator/src/error.rs
@@ -16,8 +16,7 @@
 // limitations under the License.
 
 /// The error type used by the allocators.
-#[derive(sp_core::RuntimeDebug)]
-#[derive(thiserror::Error)]
+#[derive(thiserror::Error, Debug)]
 pub enum Error {
 	/// Someone tried to allocate more memory than the allowed maximum per allocation.
 	#[error("Requested allocation size is too large")]
diff --git a/client/allocator/src/freeing_bump.rs b/client/allocator/src/freeing_bump.rs
index 1fc6dc31f752..0f3639803f1b 100644
--- a/client/allocator/src/freeing_bump.rs
+++ b/client/allocator/src/freeing_bump.rs
@@ -67,7 +67,7 @@
 //!   This is more pronounced (in terms of absolute heap amounts) with larger allocation sizes.
 
 use crate::Error;
-use sp_std::{mem, convert::{TryFrom, TryInto}, ops::{Range, Index, IndexMut}};
+use std::{mem, convert::{TryFrom, TryInto}, ops::{Range, Index, IndexMut}};
 use sp_wasm_interface::{Pointer, WordSize};
 
 /// The minimal alignment guaranteed by this allocator.
diff --git a/client/executor/runtime-test/Cargo.toml b/client/executor/runtime-test/Cargo.toml
index 2f06556644ac..9e1cd5bb09e3 100644
--- a/client/executor/runtime-test/Cargo.toml
+++ b/client/executor/runtime-test/Cargo.toml
@@ -13,7 +13,6 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sc-allocator = { version = "3.0.0", default-features = false, path = "../../allocator" }
 sp-core = { version = "3.0.0", default-features = false, path = "../../../primitives/core" }
 sp-io = { version = "3.0.0", default-features = false, path = "../../../primitives/io" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
@@ -27,7 +26,6 @@ substrate-wasm-builder = { version = "4.0.0", path = "../../../utils/wasm-builde
 [features]
 default = [ "std" ]
 std = [
-	"sc-allocator/std",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",

From 68264f1953790cca57ef2623d1eb6362eb0149a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Wed, 7 Jul 2021 13:44:05 +0200
Subject: [PATCH 0969/1194] Keep current block randomness in state (#9294)

* Keep current block randomness in state

Instead of killing it at the end of the block, it stays in the block for
inspection. This is required by parachains to get access to this
randomness of the relay chain.

* Fix tests
---
 frame/babe/src/lib.rs   | 8 +++-----
 frame/babe/src/tests.rs | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/frame/babe/src/lib.rs b/frame/babe/src/lib.rs
index 6ec199925be1..b52868d1d023 100644
--- a/frame/babe/src/lib.rs
+++ b/frame/babe/src/lib.rs
@@ -256,9 +256,10 @@ pub mod pallet {
 	#[pallet::getter(fn initialized)]
 	pub(super) type Initialized<T> = StorageValue<_, MaybeRandomness>;
 
-	/// Temporary value (cleared at block finalization) that includes the VRF output generated
-	/// at this block. This field should always be populated during block processing unless
+	/// This field should always be populated during block processing unless
 	/// secondary plain slots are enabled (which don't contain a VRF output).
+	///
+	/// It is set in `on_initialize`, before it will contain the value from the last block.
 	#[pallet::storage]
 	#[pallet::getter(fn author_vrf_randomness)]
 	pub(super) type AuthorVrfRandomness<T> = StorageValue<_, MaybeRandomness, ValueQuery>;
@@ -337,9 +338,6 @@ pub mod pallet {
 				Self::deposit_randomness(&randomness);
 			}
 
-			// The stored author generated VRF output is ephemeral.
-			AuthorVrfRandomness::<T>::kill();
-
 			// remove temporary "environment" entry from storage
 			Lateness::<T>::kill();
 		}
diff --git a/frame/babe/src/tests.rs b/frame/babe/src/tests.rs
index dfb398a4f477..520a808ab4a5 100644
--- a/frame/babe/src/tests.rs
+++ b/frame/babe/src/tests.rs
@@ -95,7 +95,7 @@ fn first_block_epoch_zero_start() {
 		assert_eq!(SegmentIndex::<Test>::get(), 0);
 		assert_eq!(UnderConstruction::<Test>::get(0), vec![vrf_randomness]);
 		assert_eq!(Babe::randomness(), [0; 32]);
-		assert_eq!(Babe::author_vrf_randomness(), None);
+		assert_eq!(Babe::author_vrf_randomness(), Some(vrf_randomness));
 		assert_eq!(NextRandomness::<Test>::get(), [0; 32]);
 
 		assert_eq!(header.digest.logs.len(), 2);
@@ -130,14 +130,13 @@ fn author_vrf_output_for_primary() {
 			&primary_pre_digest,
 			Default::default(),
 		);
-		assert_eq!(Babe::author_vrf_randomness(), None);
 
 		Babe::do_initialize(1);
 		assert_eq!(Babe::author_vrf_randomness(), Some(vrf_randomness));
 
 		Babe::on_finalize(1);
 		System::finalize();
-		assert_eq!(Babe::author_vrf_randomness(), None);
+		assert_eq!(Babe::author_vrf_randomness(), Some(vrf_randomness));
 	})
 }
 
@@ -156,14 +155,13 @@ fn author_vrf_output_for_secondary_vrf() {
 			&secondary_vrf_pre_digest,
 			Default::default(),
 		);
-		assert_eq!(Babe::author_vrf_randomness(), None);
 
 		Babe::do_initialize(1);
 		assert_eq!(Babe::author_vrf_randomness(), Some(vrf_randomness));
 
 		Babe::on_finalize(1);
 		System::finalize();
-		assert_eq!(Babe::author_vrf_randomness(), None);
+		assert_eq!(Babe::author_vrf_randomness(), Some(vrf_randomness));
 	})
 }
 

From 4e75f511e1357cf54c31d9e82d0cf3e39a2b8c28 Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann <ben@gnunicorn.org>
Date: Wed, 7 Jul 2021 14:33:38 +0200
Subject: [PATCH 0970/1194] Activate stale bot (#9272)

---
 .github/stale.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 .github/stale.yml

diff --git a/.github/stale.yml b/.github/stale.yml
new file mode 100644
index 000000000000..0c994e3ce1ac
--- /dev/null
+++ b/.github/stale.yml
@@ -0,0 +1,16 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 30
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 14
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - "D9-needsaudit 👮"
+# Label to use when marking an issue as stale
+staleLabel: "A3-stale"
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  Hey, is anyone still working on this? Due to the inactivity this issue has
+  been automatically marked as stale. It will be closed if no further activity
+  occurs. Thank you for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

From 78da57480f7f2f2e6b6423716ea29c3da72aef6c Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann <ben@gnunicorn.org>
Date: Wed, 7 Jul 2021 23:42:33 +0200
Subject: [PATCH 0971/1194] Update stale.yml (#9305)

---
 .github/stale.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/stale.yml b/.github/stale.yml
index 0c994e3ce1ac..61d0fd0228d9 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -7,6 +7,8 @@ exemptLabels:
   - "D9-needsaudit 👮"
 # Label to use when marking an issue as stale
 staleLabel: "A3-stale"
+# we only bother with pull requests
+only: pulls
 # Comment to post when marking an issue as stale. Set to `false` to disable
 markComment: >
   Hey, is anyone still working on this? Due to the inactivity this issue has

From 65ac8a5a070e403b49d3cc3b8b621108f0590b97 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Wed, 7 Jul 2021 18:06:06 -0400
Subject: [PATCH 0972/1194] Include `StorageInfo` in Benchmarking Pipeline
 (#9090)

* extend storageinfo

* extend_storage_info

* use vec

* add storage info to pipeline

* get read and written keys

* undo storageinfo move

* refactor keytracker

* return read / write count

* playing with key matching

* add basic `StorageInfo` constructor

* add whitelisted to returned info

* fix some test stuff

* pipe comments into benchmark data

* add_storage_comments

* add comments to template

* track only storage prefix

* Update frame/benchmarking/src/lib.rs

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* fix test

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* remove test logs

* add temp benchmark script

* Apply suggestions from code review

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* remove keytracker and use trackedstoragekey

* add comment for unknown keys

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_timestamp --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/timestamp/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* remove duplicate comments with unknown keys

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_timestamp --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/timestamp/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* refactor bench tracker, and fix results

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* fix child tries in new tracker

* extra newline

* fix unused warning

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_timestamp --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/timestamp/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* fix master merge

* storage info usage refactor

* remove now unused

* fix refactor

* use a vec for prefix

* fix tests

* also update writer to use vec

* disable read and written keys for now

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=frame_system --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/system/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Update frame/system/src/weights.rs

* fix test

* Delete weights.rs

* reset weights

Co-authored-by: Parity Bot <admin@parity.io>
Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
---
 .maintain/frame-weight-template.hbs           |   6 +
 Cargo.lock                                    |   1 +
 bin/node-template/runtime/src/lib.rs          |  12 +-
 bin/node/runtime/src/lib.rs                   |  11 +-
 client/db/src/bench.rs                        | 188 ++++++++++--------
 frame/benchmarking/src/analysis.rs            |   1 +
 frame/benchmarking/src/lib.rs                 |   5 +
 frame/benchmarking/src/utils.rs               |  17 +-
 .../procedural/src/storage/storage_struct.rs  |  76 ++++++-
 frame/support/src/storage/types/double_map.rs |   8 +-
 frame/support/src/storage/types/map.rs        |   8 +-
 frame/support/src/storage/types/nmap.rs       |   8 +-
 frame/support/src/storage/types/value.rs      |   9 +-
 frame/support/src/traits/storage.rs           |  10 +-
 frame/support/test/tests/decl_storage.rs      | 132 +++++++++---
 frame/support/test/tests/pallet.rs            |  56 ++++--
 frame/timestamp/src/benchmarking.rs           |   5 +-
 primitives/externalities/src/lib.rs           |   7 +
 primitives/state-machine/src/backend.rs       |   5 +
 primitives/state-machine/src/basic.rs         |   4 +
 primitives/state-machine/src/ext.rs           |   4 +
 primitives/state-machine/src/read_only.rs     |   4 +
 primitives/storage/src/lib.rs                 |  49 ++++-
 primitives/tasks/src/async_externalities.rs   |   4 +
 utils/frame/benchmarking-cli/Cargo.toml       |   1 +
 utils/frame/benchmarking-cli/src/command.rs   |  14 +-
 utils/frame/benchmarking-cli/src/template.hbs |   3 +
 utils/frame/benchmarking-cli/src/writer.rs    |  89 ++++++++-
 28 files changed, 552 insertions(+), 185 deletions(-)

diff --git a/.maintain/frame-weight-template.hbs b/.maintain/frame-weight-template.hbs
index 04453d2bfe24..64d8f75b00d2 100644
--- a/.maintain/frame-weight-template.hbs
+++ b/.maintain/frame-weight-template.hbs
@@ -47,6 +47,9 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	{{~#each benchmarks as |benchmark|}}
+	{{~#each benchmark.comments as |comment|}}
+	// {{comment}}
+	{{~/each}}
 	fn {{benchmark.name~}}
 	(
 		{{~#each benchmark.components as |c| ~}}
@@ -76,6 +79,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	{{~#each benchmarks as |benchmark|}}
+	{{~#each benchmark.comments as |comment|}}
+	// {{comment}}
+	{{~/each}}
 	fn {{benchmark.name~}}
 	(
 		{{~#each benchmark.components as |c| ~}}
diff --git a/Cargo.lock b/Cargo.lock
index be1c28c854a4..fd6318ef84a5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1785,6 +1785,7 @@ dependencies = [
  "Inflector",
  "chrono",
  "frame-benchmarking",
+ "frame-support",
  "handlebars",
  "parity-scale-codec",
  "sc-cli",
diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index 940eb2379b11..0d336622404c 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -31,7 +31,7 @@ pub use pallet_balances::Call as BalancesCall;
 pub use sp_runtime::{Permill, Perbill};
 pub use frame_support::{
 	construct_runtime, parameter_types, StorageValue,
-	traits::{KeyOwnerProofSystem, Randomness},
+	traits::{KeyOwnerProofSystem, Randomness, StorageInfo},
 	weights::{
 		Weight, IdentityFee,
 		constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
@@ -450,8 +450,12 @@ impl_runtime_apis! {
 	impl frame_benchmarking::Benchmark<Block> for Runtime {
 		fn dispatch_benchmark(
 			config: frame_benchmarking::BenchmarkConfig
-		) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {
+		) -> Result<
+			(Vec<frame_benchmarking::BenchmarkBatch>, Vec<StorageInfo>),
+			sp_runtime::RuntimeString,
+		> {
 			use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey};
+			use frame_support::traits::StorageInfoTrait;
 
 			use frame_system_benchmarking::Pallet as SystemBench;
 			impl frame_system_benchmarking::Config for Runtime {}
@@ -469,6 +473,8 @@ impl_runtime_apis! {
 				hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),
 			];
 
+			let storage_info = AllPalletsWithSystem::storage_info();
+
 			let mut batches = Vec::<BenchmarkBatch>::new();
 			let params = (&config, &whitelist);
 
@@ -478,7 +484,7 @@ impl_runtime_apis! {
 			add_benchmark!(params, batches, pallet_template, TemplateModule);
 
 			if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) }
-			Ok(batches)
+			Ok((batches, storage_info))
 		}
 	}
 }
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 8291e4b6448c..c29a3ebc176a 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -1509,8 +1509,13 @@ impl_runtime_apis! {
 	impl frame_benchmarking::Benchmark<Block> for Runtime {
 		fn dispatch_benchmark(
 			config: frame_benchmarking::BenchmarkConfig
-		) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {
+		) -> Result<
+			(Vec<frame_benchmarking::BenchmarkBatch>, Vec<frame_support::traits::StorageInfo>),
+			sp_runtime::RuntimeString,
+		> {
 			use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey};
+			use frame_support::traits::StorageInfoTrait;
+
 			// Trying to add benchmarks directly to the Session Pallet caused cyclic dependency
 			// issues. To get around that, we separated the Session benchmarks into its own crate,
 			// which is why we need these two lines below.
@@ -1537,6 +1542,8 @@ impl_runtime_apis! {
 				hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da95ecffd7b6c0f78751baa9d281e0bfa3a6d6f646c70792f74727372790000000000000000000000000000000000000000").to_vec().into(),
 			];
 
+			let storage_info = AllPalletsWithSystem::storage_info();
+
 			let mut batches = Vec::<BenchmarkBatch>::new();
 			let params = (&config, &whitelist);
 
@@ -1574,7 +1581,7 @@ impl_runtime_apis! {
 			add_benchmark!(params, batches, pallet_election_provider_multi_phase, ElectionProviderMultiPhase);
 
 			if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) }
-			Ok(batches)
+			Ok((batches, storage_info))
 		}
 	}
 }
diff --git a/client/db/src/bench.rs b/client/db/src/bench.rs
index 470448df76f0..4b34182a1c3b 100644
--- a/client/db/src/bench.rs
+++ b/client/db/src/bench.rs
@@ -66,40 +66,6 @@ impl<Block: BlockT> sp_state_machine::Storage<HashFor<Block>> for StorageDb<Bloc
 	}
 }
 
-/// Track whether a specific key has already been read or written to.
-#[derive(Default, Clone, Copy)]
-pub struct KeyTracker {
-	has_been_read: bool,
-	has_been_written: bool,
-}
-
-/// A simple object that counts the reads and writes at the key level to the underlying state db.
-#[derive(Default, Clone, Copy, Debug)]
-pub struct ReadWriteTracker {
-	reads: u32,
-	repeat_reads: u32,
-	writes: u32,
-	repeat_writes: u32,
-}
-
-impl ReadWriteTracker {
-	fn add_read(&mut self) {
-		self.reads += 1;
-	}
-
-	fn add_repeat_read(&mut self) {
-		self.repeat_reads += 1;
-	}
-
-	fn add_write(&mut self) {
-		self.writes += 1;
-	}
-
-	fn add_repeat_write(&mut self) {
-		self.repeat_writes += 1;
-	}
-}
-
 /// State that manages the backend database reference. Allows runtime to control the database.
 pub struct BenchmarkingState<B: BlockT> {
 	root: Cell<B::Hash>,
@@ -110,11 +76,14 @@ pub struct BenchmarkingState<B: BlockT> {
 	record: Cell<Vec<Vec<u8>>>,
 	shared_cache: SharedCache<B>, // shared cache is always empty
 	/// Key tracker for keys in the main trie.
-	main_key_tracker: RefCell<HashMap<Vec<u8>, KeyTracker>>,
+	/// We track the total number of reads and writes to these keys,
+	/// not de-duplicated for repeats.
+	main_key_tracker: RefCell<HashMap<Vec<u8>, TrackedStorageKey>>,
 	/// Key tracker for keys in a child trie.
 	/// Child trie are identified by their storage key (i.e. `ChildInfo::storage_key()`)
-	child_key_tracker: RefCell<HashMap<Vec<u8>, HashMap<Vec<u8>, KeyTracker>>>,
-	read_write_tracker: RefCell<ReadWriteTracker>,
+	/// We track the total number of reads and writes to these keys,
+	/// not de-duplicated for repeats.
+	child_key_tracker: RefCell<HashMap<Vec<u8>, HashMap<Vec<u8>, TrackedStorageKey>>>,
 	whitelist: RefCell<Vec<TrackedStorageKey>>,
 	proof_recorder: Option<ProofRecorder<B::Hash>>,
 	proof_recorder_root: Cell<B::Hash>,
@@ -137,7 +106,6 @@ impl<B: BlockT> BenchmarkingState<B> {
 			shared_cache: new_shared_cache(0, (1, 10)),
 			main_key_tracker: Default::default(),
 			child_key_tracker: Default::default(),
-			read_write_tracker: Default::default(),
 			whitelist: Default::default(),
 			proof_recorder: record_proof.then(Default::default),
 			proof_recorder_root: Cell::new(root.clone()),
@@ -191,10 +159,8 @@ impl<B: BlockT> BenchmarkingState<B> {
 		let whitelist = self.whitelist.borrow();
 
 		whitelist.iter().for_each(|key| {
-			let whitelisted = KeyTracker {
-				has_been_read: key.has_been_read,
-				has_been_written: key.has_been_written,
-			};
+			let mut whitelisted = TrackedStorageKey::new(key.key.clone());
+			whitelisted.whitelist();
 			main_key_tracker.insert(key.key.clone(), whitelisted);
 		});
 	}
@@ -203,12 +169,10 @@ impl<B: BlockT> BenchmarkingState<B> {
 		*self.main_key_tracker.borrow_mut() = HashMap::new();
 		*self.child_key_tracker.borrow_mut() = HashMap::new();
 		self.add_whitelist_to_tracker();
-		*self.read_write_tracker.borrow_mut() = Default::default();
 	}
 
 	// Childtrie is identified by its storage key (i.e. `ChildInfo::storage_key`)
 	fn add_read_key(&self, childtrie: Option<&[u8]>, key: &[u8]) {
-		let mut read_write_tracker = self.read_write_tracker.borrow_mut();
 		let mut child_key_tracker = self.child_key_tracker.borrow_mut();
 		let mut main_key_tracker = self.main_key_tracker.borrow_mut();
 
@@ -218,33 +182,21 @@ impl<B: BlockT> BenchmarkingState<B> {
 			&mut main_key_tracker
 		};
 
-		let read = match key_tracker.get(key) {
+		let should_log = match key_tracker.get_mut(key) {
 			None => {
-				let has_been_read = KeyTracker {
-					has_been_read: true,
-					has_been_written: false,
-				};
+				let mut has_been_read = TrackedStorageKey::new(key.to_vec());
+				has_been_read.add_read();
 				key_tracker.insert(key.to_vec(), has_been_read);
-				read_write_tracker.add_read();
 				true
 			},
 			Some(tracker) => {
-				if !tracker.has_been_read {
-					let has_been_read = KeyTracker {
-						has_been_read: true,
-						has_been_written: tracker.has_been_written,
-					};
-					key_tracker.insert(key.to_vec(), has_been_read);
-					read_write_tracker.add_read();
-					true
-				} else {
-					read_write_tracker.add_repeat_read();
-					false
-				}
+				let should_log = !tracker.has_been_read();
+				tracker.add_read();
+				should_log
 			}
 		};
 
-		if read {
+		if should_log {
 			if let Some(childtrie) = childtrie {
 				log::trace!(
 					target: "benchmark",
@@ -258,7 +210,6 @@ impl<B: BlockT> BenchmarkingState<B> {
 
 	// Childtrie is identified by its storage key (i.e. `ChildInfo::storage_key`)
 	fn add_write_key(&self, childtrie: Option<&[u8]>, key: &[u8]) {
-		let mut read_write_tracker = self.read_write_tracker.borrow_mut();
 		let mut child_key_tracker = self.child_key_tracker.borrow_mut();
 		let mut main_key_tracker = self.main_key_tracker.borrow_mut();
 
@@ -269,30 +220,21 @@ impl<B: BlockT> BenchmarkingState<B> {
 		};
 
 		// If we have written to the key, we also consider that we have read from it.
-		let has_been_written = KeyTracker {
-			has_been_read: true,
-			has_been_written: true,
-		};
-
-		let write = match key_tracker.get(key) {
+		let should_log = match key_tracker.get_mut(key) {
 			None => {
+				let mut has_been_written = TrackedStorageKey::new(key.to_vec());
+				has_been_written.add_write();
 				key_tracker.insert(key.to_vec(), has_been_written);
-				read_write_tracker.add_write();
 				true
 			},
 			Some(tracker) => {
-				if !tracker.has_been_written {
-					key_tracker.insert(key.to_vec(), has_been_written);
-					read_write_tracker.add_write();
-					true
-				} else {
-					read_write_tracker.add_repeat_write();
-					false
-				}
+				let should_log = !tracker.has_been_written();
+				tracker.add_write();
+				should_log
 			}
 		};
 
-		if write {
+		if should_log {
 			if let Some(childtrie) = childtrie {
 				log::trace!(
 					target: "benchmark",
@@ -303,6 +245,23 @@ impl<B: BlockT> BenchmarkingState<B> {
 			}
 		}
 	}
+
+	// Return all the tracked storage keys among main and child trie.
+	fn all_trackers(&self) -> Vec<TrackedStorageKey> {
+		let mut all_trackers = Vec::new();
+
+		self.main_key_tracker.borrow().iter().for_each(|(_, tracker)| {
+			all_trackers.push(tracker.clone());
+		});
+
+		self.child_key_tracker.borrow().iter().for_each(|(_, child_tracker)| {
+			child_tracker.iter().for_each(|(_, tracker)| {
+				all_trackers.push(tracker.clone());
+			});
+		});
+
+		all_trackers
+	}
 }
 
 fn state_err() -> String {
@@ -507,9 +466,30 @@ impl<B: BlockT> StateBackend<HashFor<B>> for BenchmarkingState<B> {
 	}
 
 	/// Get the key tracking information for the state db.
+	/// 1. `reads` - Total number of DB reads.
+	/// 2. `repeat_reads` - Total number of in-memory reads.
+	/// 3. `writes` - Total number of DB writes.
+	/// 4. `repeat_writes` - Total number of in-memory writes.
 	fn read_write_count(&self) -> (u32, u32, u32, u32) {
-		let count = *self.read_write_tracker.borrow_mut();
-		(count.reads, count.repeat_reads, count.writes, count.repeat_writes)
+		let mut reads = 0;
+		let mut repeat_reads = 0;
+		let mut writes = 0;
+		let mut repeat_writes = 0;
+
+		self.all_trackers().iter().for_each(|tracker| {
+			if !tracker.whitelisted {
+				if tracker.reads > 0 {
+					reads += 1;
+					repeat_reads += tracker.reads - 1;
+				}
+
+				if tracker.writes > 0 {
+					writes += 1;
+					repeat_writes += tracker.reads - 1;
+				}
+			}
+		});
+		(reads, repeat_reads, writes, repeat_writes)
 	}
 
 	/// Reset the key tracking information for the state db.
@@ -525,6 +505,40 @@ impl<B: BlockT> StateBackend<HashFor<B>> for BenchmarkingState<B> {
 		*self.whitelist.borrow_mut() = new;
 	}
 
+	fn get_read_and_written_keys(&self) -> Vec<(Vec<u8>, u32, u32, bool)> {
+		// We only track at the level of a key-prefix and not whitelisted for now for memory size.
+		// TODO: Refactor to enable full storage key transparency, where we can remove the
+		// `prefix_key_tracker`.
+		let mut prefix_key_tracker = HashMap::<Vec<u8>, (u32, u32, bool)>::new();
+		self.all_trackers().iter().for_each(|tracker| {
+			if !tracker.whitelisted {
+				let prefix_length = tracker.key.len().min(32);
+				let prefix = tracker.key[0..prefix_length].to_vec();
+				// each read / write of a specific key is counted at most one time, since
+				// additional reads / writes happen in the memory overlay.
+				let reads = tracker.reads.min(1);
+				let writes = tracker.writes.min(1);
+				if let Some(prefix_tracker) = prefix_key_tracker.get_mut(&prefix) {
+						prefix_tracker.0 += reads;
+						prefix_tracker.1 += writes;
+				} else {
+					prefix_key_tracker.insert(
+						prefix,
+						(
+							reads,
+							writes,
+							tracker.whitelisted,
+						),
+					);
+				}
+			}
+		});
+
+		prefix_key_tracker.iter().map(|(key, tracker)| -> (Vec<u8>, u32, u32, bool) {
+				(key.to_vec(), tracker.0, tracker.1, tracker.2)
+		}).collect::<Vec<_>>()
+	}
+
 	fn register_overlay_stats(&self, stats: &sp_state_machine::StateMachineStats) {
 		self.state.borrow_mut().as_mut().map(|s| s.register_overlay_stats(stats));
 	}
@@ -597,11 +611,11 @@ mod test {
 				]
 			).unwrap();
 
-			let rw_tracker = bench_state.read_write_tracker.borrow();
-			assert_eq!(rw_tracker.reads, 6);
-			assert_eq!(rw_tracker.repeat_reads, 0);
-			assert_eq!(rw_tracker.writes, 2);
-			assert_eq!(rw_tracker.repeat_writes, 0);
+			let rw_tracker = bench_state.read_write_count();
+			assert_eq!(rw_tracker.0, 6);
+			assert_eq!(rw_tracker.1, 0);
+			assert_eq!(rw_tracker.2, 2);
+			assert_eq!(rw_tracker.3, 0);
 			drop(rw_tracker);
 			bench_state.wipe().unwrap();
 		}
diff --git a/frame/benchmarking/src/analysis.rs b/frame/benchmarking/src/analysis.rs
index 7b6d8838fd21..f37ffba51f3d 100644
--- a/frame/benchmarking/src/analysis.rs
+++ b/frame/benchmarking/src/analysis.rs
@@ -375,6 +375,7 @@ mod tests {
 			writes,
 			repeat_writes: 0,
 			proof_size: 0,
+			keys: vec![],
 		}
 	}
 
diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
index 8160bd5d1dd2..fb4fd0801a24 100644
--- a/frame/benchmarking/src/lib.rs
+++ b/frame/benchmarking/src/lib.rs
@@ -824,6 +824,10 @@ macro_rules! impl_benchmark {
 							let finish_storage_root = $crate::benchmarking::current_time();
 							let elapsed_storage_root = finish_storage_root - start_storage_root;
 
+							// TODO: Fix memory allocation issue then re-enable
+							// let read_and_written_keys = $crate::benchmarking::get_read_and_written_keys();
+							let read_and_written_keys = Default::default();
+
 							results.push($crate::BenchmarkResults {
 								components: c.to_vec(),
 								extrinsic_time: elapsed_extrinsic,
@@ -833,6 +837,7 @@ macro_rules! impl_benchmark {
 								writes: read_write_count.2,
 								repeat_writes: read_write_count.3,
 								proof_size: diff_pov,
+								keys: read_and_written_keys,
 							});
 						}
 
diff --git a/frame/benchmarking/src/utils.rs b/frame/benchmarking/src/utils.rs
index 2db7b2e95d9d..c40434fb1a58 100644
--- a/frame/benchmarking/src/utils.rs
+++ b/frame/benchmarking/src/utils.rs
@@ -21,6 +21,7 @@ use codec::{Encode, Decode};
 use sp_std::{vec::Vec, prelude::Box};
 use sp_io::hashing::blake2_256;
 use sp_storage::TrackedStorageKey;
+use frame_support::traits::StorageInfo;
 
 /// An alphabet of possible parameters to use for benchmarking.
 #[derive(Encode, Decode, Clone, Copy, PartialEq, Debug)]
@@ -63,6 +64,7 @@ pub struct BenchmarkResults {
 	pub writes: u32,
 	pub repeat_writes: u32,
 	pub proof_size: u32,
+	pub keys: Vec<(Vec<u8>, u32, u32, bool)>,
 }
 
 /// Configuration used to setup and run runtime benchmarks.
@@ -90,7 +92,8 @@ sp_api::decl_runtime_apis! {
 	/// Runtime api for benchmarking a FRAME runtime.
 	pub trait Benchmark {
 		/// Dispatch the given benchmark.
-		fn dispatch_benchmark(config: BenchmarkConfig) -> Result<Vec<BenchmarkBatch>, sp_runtime::RuntimeString>;
+		fn dispatch_benchmark(config: BenchmarkConfig)
+			-> Result<(Vec<BenchmarkBatch>, Vec<StorageInfo>), sp_runtime::RuntimeString>;
 	}
 }
 
@@ -143,11 +146,9 @@ pub trait Benchmarking {
 		match whitelist.iter_mut().find(|x| x.key == add.key) {
 			// If we already have this key in the whitelist, update to be the most constrained value.
 			Some(item) => {
-				*item = TrackedStorageKey {
-					key: add.key,
-					has_been_read: item.has_been_read || add.has_been_read,
-					has_been_written: item.has_been_written || add.has_been_written,
-				}
+				item.reads += add.reads;
+				item.writes += add.writes;
+				item.whitelisted = item.whitelisted || add.whitelisted;
 			},
 			// If the key does not exist, add it.
 			None => {
@@ -164,6 +165,10 @@ pub trait Benchmarking {
 		self.set_whitelist(whitelist);
 	}
 
+	fn get_read_and_written_keys(&self) -> Vec<(Vec<u8>, u32, u32, bool)> {
+		self.get_read_and_written_keys()
+	}
+
 	/// Get current estimated proof size.
 	fn proof_size(&self) -> Option<u32> {
 		self.proof_size()
diff --git a/frame/support/procedural/src/storage/storage_struct.rs b/frame/support/procedural/src/storage/storage_struct.rs
index c990bad85e21..3b182983cd4e 100644
--- a/frame/support/procedural/src/storage/storage_struct.rs
+++ b/frame/support/procedural/src/storage/storage_struct.rs
@@ -273,9 +273,15 @@ pub fn decl_and_impl(def: &DeclStorageDefExt) -> TokenStream {
 
 								#scrate::sp_std::vec![
 									#scrate::traits::StorageInfo {
+										pallet_name: <
+											#storage_struct as #scrate::#storage_generator_trait
+										>::module_prefix().to_vec(),
+										storage_name: <
+											#storage_struct as #scrate::#storage_generator_trait
+										>::storage_prefix().to_vec(),
 										prefix: <
 											#storage_struct as #scrate::#storage_generator_trait
-										>::storage_value_final_key(),
+										>::storage_value_final_key().to_vec(),
 										max_values: Some(1),
 										max_size: Some(max_size),
 									}
@@ -308,10 +314,18 @@ pub fn decl_and_impl(def: &DeclStorageDefExt) -> TokenStream {
 
 								#scrate::sp_std::vec![
 									#scrate::traits::StorageInfo {
+										pallet_name: <
+											#storage_struct
+											as #scrate::storage::StoragePrefixedMap<#value_type>
+										>::module_prefix().to_vec(),
+										storage_name: <
+											#storage_struct
+											as #scrate::storage::StoragePrefixedMap<#value_type>
+										>::storage_prefix().to_vec(),
 										prefix: <
 											#storage_struct
 											as #scrate::storage::StoragePrefixedMap<#value_type>
-										>::final_prefix(),
+										>::final_prefix().to_vec(),
 										max_values: #max_values,
 										max_size: Some(max_size),
 									}
@@ -350,10 +364,18 @@ pub fn decl_and_impl(def: &DeclStorageDefExt) -> TokenStream {
 
 								#scrate::sp_std::vec![
 									#scrate::traits::StorageInfo {
+										pallet_name: <
+											#storage_struct
+											as #scrate::storage::StoragePrefixedMap<#value_type>
+										>::module_prefix().to_vec(),
+										storage_name: <
+											#storage_struct
+											as #scrate::storage::StoragePrefixedMap<#value_type>
+										>::storage_prefix().to_vec(),
 										prefix: <
 											#storage_struct
 											as #scrate::storage::StoragePrefixedMap<#value_type>
-										>::final_prefix(),
+										>::final_prefix().to_vec(),
 										max_values: #max_values,
 										max_size: Some(max_size),
 									}
@@ -385,10 +407,18 @@ pub fn decl_and_impl(def: &DeclStorageDefExt) -> TokenStream {
 
 								#scrate::sp_std::vec![
 									#scrate::traits::StorageInfo {
+										pallet_name: <
+											#storage_struct
+											as #scrate::storage::StoragePrefixedMap<#value_type>
+										>::module_prefix().to_vec(),
+										storage_name: <
+											#storage_struct
+											as #scrate::storage::StoragePrefixedMap<#value_type>
+										>::storage_prefix().to_vec(),
 										prefix: <
 											#storage_struct
 											as #scrate::storage::StoragePrefixedMap<#value_type>
-										>::final_prefix(),
+										>::final_prefix().to_vec(),
 										max_values: #max_values,
 										max_size: Some(max_size),
 									}
@@ -413,9 +443,15 @@ pub fn decl_and_impl(def: &DeclStorageDefExt) -> TokenStream {
 							{
 								#scrate::sp_std::vec![
 									#scrate::traits::StorageInfo {
+										pallet_name: <
+											#storage_struct as #scrate::#storage_generator_trait
+										>::module_prefix().to_vec(),
+										storage_name: <
+											#storage_struct as #scrate::#storage_generator_trait
+										>::storage_prefix().to_vec(),
 										prefix: <
 											#storage_struct as #scrate::#storage_generator_trait
-										>::storage_value_final_key(),
+										>::storage_value_final_key().to_vec(),
 										max_values: Some(1),
 										max_size: None,
 									}
@@ -435,10 +471,18 @@ pub fn decl_and_impl(def: &DeclStorageDefExt) -> TokenStream {
 							{
 								#scrate::sp_std::vec![
 									#scrate::traits::StorageInfo {
+										pallet_name: <
+											#storage_struct
+											as #scrate::storage::StoragePrefixedMap<#value_type>
+										>::module_prefix().to_vec(),
+										storage_name: <
+											#storage_struct
+											as #scrate::storage::StoragePrefixedMap<#value_type>
+										>::storage_prefix().to_vec(),
 										prefix: <
 											#storage_struct
 											as #scrate::storage::StoragePrefixedMap<#value_type>
-										>::final_prefix(),
+										>::final_prefix().to_vec(),
 										max_values: #max_values,
 										max_size: None,
 									}
@@ -458,10 +502,18 @@ pub fn decl_and_impl(def: &DeclStorageDefExt) -> TokenStream {
 							{
 								#scrate::sp_std::vec![
 									#scrate::traits::StorageInfo {
+										pallet_name: <
+											#storage_struct
+											as #scrate::storage::StoragePrefixedMap<#value_type>
+										>::module_prefix().to_vec(),
+										storage_name: <
+											#storage_struct
+											as #scrate::storage::StoragePrefixedMap<#value_type>
+										>::storage_prefix().to_vec(),
 										prefix: <
 											#storage_struct
 											as #scrate::storage::StoragePrefixedMap<#value_type>
-										>::final_prefix(),
+										>::final_prefix().to_vec(),
 										max_values: #max_values,
 										max_size: None,
 									}
@@ -481,10 +533,18 @@ pub fn decl_and_impl(def: &DeclStorageDefExt) -> TokenStream {
 							{
 								#scrate::sp_std::vec![
 									#scrate::traits::StorageInfo {
+										pallet_name: <
+											#storage_struct
+											as #scrate::storage::StoragePrefixedMap<#value_type>
+										>::module_prefix().to_vec(),
+										storage_name: <
+											#storage_struct
+											as #scrate::storage::StoragePrefixedMap<#value_type>
+										>::storage_prefix().to_vec(),
 										prefix: <
 											#storage_struct
 											as #scrate::storage::StoragePrefixedMap<#value_type>
-										>::final_prefix(),
+										>::final_prefix().to_vec(),
 										max_values: #max_values,
 										max_size: None,
 									}
diff --git a/frame/support/src/storage/types/double_map.rs b/frame/support/src/storage/types/double_map.rs
index a8ab4329ceb3..5143967d8c97 100644
--- a/frame/support/src/storage/types/double_map.rs
+++ b/frame/support/src/storage/types/double_map.rs
@@ -486,7 +486,9 @@ where
 	fn storage_info() -> Vec<StorageInfo> {
 		vec![
 			StorageInfo {
-				prefix: Self::final_prefix(),
+				pallet_name: Self::module_prefix().to_vec(),
+				storage_name: Self::storage_prefix().to_vec(),
+				prefix: Self::final_prefix().to_vec(),
 				max_values: MaxValues::get(),
 				max_size: Some(
 					Hasher1::max_len::<Key1>()
@@ -517,7 +519,9 @@ where
 	fn partial_storage_info() -> Vec<StorageInfo> {
 		vec![
 			StorageInfo {
-				prefix: Self::final_prefix(),
+				pallet_name: Self::module_prefix().to_vec(),
+				storage_name: Self::storage_prefix().to_vec(),
+				prefix: Self::final_prefix().to_vec(),
 				max_values: MaxValues::get(),
 				max_size: None
 			}
diff --git a/frame/support/src/storage/types/map.rs b/frame/support/src/storage/types/map.rs
index 800cd1153a72..168d5236ccfb 100644
--- a/frame/support/src/storage/types/map.rs
+++ b/frame/support/src/storage/types/map.rs
@@ -363,7 +363,9 @@ where
 	fn storage_info() -> Vec<StorageInfo> {
 		vec![
 			StorageInfo {
-				prefix: Self::final_prefix(),
+				pallet_name: Self::module_prefix().to_vec(),
+				storage_name: Self::storage_prefix().to_vec(),
+				prefix: Self::final_prefix().to_vec(),
 				max_values: MaxValues::get(),
 				max_size: Some(
 					Hasher::max_len::<Key>()
@@ -391,7 +393,9 @@ where
 	fn partial_storage_info() -> Vec<StorageInfo> {
 		vec![
 			StorageInfo {
-				prefix: Self::final_prefix(),
+				pallet_name: Self::module_prefix().to_vec(),
+				storage_name: Self::storage_prefix().to_vec(),
+				prefix: Self::final_prefix().to_vec(),
 				max_values: MaxValues::get(),
 				max_size: None,
 			}
diff --git a/frame/support/src/storage/types/nmap.rs b/frame/support/src/storage/types/nmap.rs
index b75542cbf9a2..63c27729d281 100755
--- a/frame/support/src/storage/types/nmap.rs
+++ b/frame/support/src/storage/types/nmap.rs
@@ -418,7 +418,9 @@ where
 	fn storage_info() -> Vec<StorageInfo> {
 		vec![
 			StorageInfo {
-				prefix: Self::final_prefix(),
+				pallet_name: Self::module_prefix().to_vec(),
+				storage_name: Self::storage_prefix().to_vec(),
+				prefix: Self::final_prefix().to_vec(),
 				max_values: MaxValues::get(),
 				max_size: Some(
 					Key::key_max_encoded_len()
@@ -445,7 +447,9 @@ where
 	fn partial_storage_info() -> Vec<StorageInfo> {
 		vec![
 			StorageInfo {
-				prefix: Self::final_prefix(),
+				pallet_name: Self::module_prefix().to_vec(),
+				storage_name: Self::storage_prefix().to_vec(),
+				prefix: Self::final_prefix().to_vec(),
 				max_values: MaxValues::get(),
 				max_size: None,
 			}
diff --git a/frame/support/src/storage/types/value.rs b/frame/support/src/storage/types/value.rs
index 0bd171f10e68..3fe7d4364024 100644
--- a/frame/support/src/storage/types/value.rs
+++ b/frame/support/src/storage/types/value.rs
@@ -22,6 +22,7 @@ use crate::{
 	storage::{
 		StorageAppend, StorageTryAppend, StorageDecodeLength,
 		types::{OptionQuery, QueryKindTrait, OnEmptyGetter},
+		generator::{StorageValue as StorageValueT},
 	},
 	traits::{GetDefault, StorageInstance, StorageInfo},
 };
@@ -217,7 +218,9 @@ where
 	fn storage_info() -> Vec<StorageInfo> {
 		vec![
 			StorageInfo {
-				prefix: Self::hashed_key(),
+				pallet_name: Self::module_prefix().to_vec(),
+				storage_name: Self::storage_prefix().to_vec(),
+				prefix: Self::hashed_key().to_vec(),
 				max_values: Some(1),
 				max_size: Some(
 					Value::max_encoded_len()
@@ -241,7 +244,9 @@ where
 	fn partial_storage_info() -> Vec<StorageInfo> {
 		vec![
 			StorageInfo {
-				prefix: Self::hashed_key(),
+				pallet_name: Self::module_prefix().to_vec(),
+				storage_name: Self::storage_prefix().to_vec(),
+				prefix: Self::hashed_key().to_vec(),
 				max_values: Some(1),
 				max_size: None,
 			}
diff --git a/frame/support/src/traits/storage.rs b/frame/support/src/traits/storage.rs
index c1f97694df7c..c0cbfb3a9078 100644
--- a/frame/support/src/traits/storage.rs
+++ b/frame/support/src/traits/storage.rs
@@ -48,11 +48,15 @@ pub trait StorageInstance {
 	const STORAGE_PREFIX: &'static str;
 }
 
-/// Some info about an individual storage in a pallet.
+/// Metadata about storage from the runtime.
 #[derive(codec::Encode, codec::Decode, crate::RuntimeDebug, Eq, PartialEq, Clone)]
 pub struct StorageInfo {
-	/// The prefix of the storage. All keys after the prefix are considered part of the storage
-	pub prefix: [u8; 32],
+	/// Encoded string of pallet name.
+	pub pallet_name: Vec<u8>,
+	/// Encoded string of storage name.
+	pub storage_name: Vec<u8>,
+	/// The prefix of the storage. All keys after the prefix are considered part of this storage.
+	pub prefix: Vec<u8>,
 	/// The maximum number of values in the storage, or none if no maximum specified.
 	pub max_values: Option<u32>,
 	/// The maximum size of key/values in the storage, or none if no maximum specified.
diff --git a/frame/support/test/tests/decl_storage.rs b/frame/support/test/tests/decl_storage.rs
index 56ea217bbffe..85c3d8f6756a 100644
--- a/frame/support/test/tests/decl_storage.rs
+++ b/frame/support/test/tests/decl_storage.rs
@@ -438,147 +438,205 @@ mod tests {
 			<Module<TraitImpl>>::storage_info(),
 			vec![
 				StorageInfo {
-					prefix: prefix(b"TestStorage", b"U32"),
+					pallet_name: b"TestStorage".to_vec(),
+					storage_name: b"U32".to_vec(),
+					prefix: prefix(b"TestStorage", b"U32").to_vec(),
 					max_values: Some(1),
 					max_size: Some(4),
 				},
 				StorageInfo {
-					prefix: prefix(b"TestStorage", b"PUBU32"),
+					pallet_name: b"TestStorage".to_vec(),
+					storage_name: b"PUBU32".to_vec(),
+					prefix: prefix(b"TestStorage", b"PUBU32").to_vec(),
 					max_values: Some(1),
 					max_size: Some(4),
 				},
 				StorageInfo {
-					prefix: prefix(b"TestStorage", b"U32MYDEF"),
+					pallet_name: b"TestStorage".to_vec(),
+					storage_name: b"U32MYDEF".to_vec(),
+					prefix: prefix(b"TestStorage", b"U32MYDEF").to_vec(),
 					max_values: Some(1),
 					max_size: Some(4),
 				},
 				StorageInfo {
-					prefix: prefix(b"TestStorage", b"PUBU32MYDEF"),
+					pallet_name: b"TestStorage".to_vec(),
+					storage_name: b"PUBU32MYDEF".to_vec(),
+					prefix: prefix(b"TestStorage", b"PUBU32MYDEF").to_vec(),
 					max_values: Some(1),
 					max_size: Some(4),
 				},
 				StorageInfo {
-					prefix: prefix(b"TestStorage", b"GETU32"),
+					pallet_name: b"TestStorage".to_vec(),
+					storage_name: b"GETU32".to_vec(),
+					prefix: prefix(b"TestStorage", b"GETU32").to_vec(),
 					max_values: Some(1),
 					max_size: Some(4),
 				},
 				StorageInfo {
-					prefix: prefix(b"TestStorage", b"PUBGETU32"),
+					pallet_name: b"TestStorage".to_vec(),
+					storage_name: b"PUBGETU32".to_vec(),
+					prefix: prefix(b"TestStorage", b"PUBGETU32").to_vec(),
 					max_values: Some(1),
 					max_size: Some(4),
 				},
 				StorageInfo {
-					prefix: prefix(b"TestStorage", b"GETU32WITHCONFIG"),
+					pallet_name: b"TestStorage".to_vec(),
+					storage_name: b"GETU32WITHCONFIG".to_vec(),
+					prefix: prefix(b"TestStorage", b"GETU32WITHCONFIG").to_vec(),
 					max_values: Some(1),
 					max_size: Some(4),
 				},
 				StorageInfo {
-					prefix: prefix(b"TestStorage", b"PUBGETU32WITHCONFIG"),
+					pallet_name: b"TestStorage".to_vec(),
+					storage_name: b"PUBGETU32WITHCONFIG".to_vec(),
+					prefix: prefix(b"TestStorage", b"PUBGETU32WITHCONFIG").to_vec(),
 					max_values: Some(1),
 					max_size: Some(4),
 				},
 				StorageInfo {
-					prefix: prefix(b"TestStorage", b"GETU32MYDEF"),
+					pallet_name: b"TestStorage".to_vec(),
+					storage_name: b"GETU32MYDEF".to_vec(),
+					prefix: prefix(b"TestStorage", b"GETU32MYDEF").to_vec(),
 					max_values: Some(1),
 					max_size: Some(4),
 				},
 				StorageInfo {
-					prefix: prefix(b"TestStorage", b"PUBGETU32MYDEF"),
+					pallet_name: b"TestStorage".to_vec(),
+					storage_name: b"PUBGETU32MYDEF".to_vec(),
+					prefix: prefix(b"TestStorage", b"PUBGETU32MYDEF").to_vec(),
 					max_values: Some(1),
 					max_size: Some(4),
 				},
 				StorageInfo {
-					prefix: prefix(b"TestStorage", b"GETU32WITHCONFIGMYDEF"),
+					pallet_name: b"TestStorage".to_vec(),
+					storage_name: b"GETU32WITHCONFIGMYDEF".to_vec(),
+					prefix: prefix(b"TestStorage", b"GETU32WITHCONFIGMYDEF").to_vec(),
 					max_values: Some(1),
 					max_size: Some(4),
 				},
 				StorageInfo {
-					prefix: prefix(b"TestStorage", b"PUBGETU32WITHCONFIGMYDEF"),
+					pallet_name: b"TestStorage".to_vec(),
+					storage_name: b"PUBGETU32WITHCONFIGMYDEF".to_vec(),
+					prefix: prefix(b"TestStorage", b"PUBGETU32WITHCONFIGMYDEF").to_vec(),
 					max_values: Some(1),
 					max_size: Some(4),
 				},
 				StorageInfo {
-					prefix: prefix(b"TestStorage", b"PUBGETU32WITHCONFIGMYDEFOPT"),
+					pallet_name: b"TestStorage".to_vec(),
+					storage_name: b"PUBGETU32WITHCONFIGMYDEFOPT".to_vec(),
+					prefix: prefix(b"TestStorage", b"PUBGETU32WITHCONFIGMYDEFOPT").to_vec(),
 					max_values: Some(1),
 					max_size: Some(4),
 				},
 				StorageInfo {
-					prefix: prefix(b"TestStorage", b"GetU32WithBuilder"),
+					pallet_name: b"TestStorage".to_vec(),
+					storage_name: b"GetU32WithBuilder".to_vec(),
+					prefix: prefix(b"TestStorage", b"GetU32WithBuilder").to_vec(),
 					max_values: Some(1),
 					max_size: Some(4),
 				},
 				StorageInfo {
-					prefix: prefix(b"TestStorage", b"GetOptU32WithBuilderSome"),
+					pallet_name: b"TestStorage".to_vec(),
+					storage_name: b"GetOptU32WithBuilderSome".to_vec(),
+					prefix: prefix(b"TestStorage", b"GetOptU32WithBuilderSome").to_vec(),
 					max_values: Some(1),
 					max_size: Some(4),
 				},
 				StorageInfo {
-					prefix: prefix(b"TestStorage", b"GetOptU32WithBuilderNone"),
+					pallet_name: b"TestStorage".to_vec(),
+					storage_name: b"GetOptU32WithBuilderNone".to_vec(),
+					prefix: prefix(b"TestStorage", b"GetOptU32WithBuilderNone").to_vec(),
 					max_values: Some(1),
 					max_size: Some(4),
 				},
 				StorageInfo {
-					prefix: prefix(b"TestStorage", b"MAPU32"),
+					pallet_name: b"TestStorage".to_vec(),
+					storage_name: b"MAPU32".to_vec(),
+					prefix: prefix(b"TestStorage", b"MAPU32").to_vec(),
 					max_values: Some(3),
 					max_size: Some(8 + 16),
 				},
 				StorageInfo {
-					prefix: prefix(b"TestStorage", b"PUBMAPU32"),
+					pallet_name: b"TestStorage".to_vec(),
+					storage_name: b"PUBMAPU32".to_vec(),
+					prefix: prefix(b"TestStorage", b"PUBMAPU32").to_vec(),
 					max_values: None,
 					max_size: Some(8 + 16),
 				},
 				StorageInfo {
-					prefix: prefix(b"TestStorage", b"GETMAPU32"),
+					pallet_name: b"TestStorage".to_vec(),
+					storage_name: b"GETMAPU32".to_vec(),
+					prefix: prefix(b"TestStorage", b"GETMAPU32").to_vec(),
 					max_values: None,
 					max_size: Some(8 + 16),
 				},
 				StorageInfo {
-					prefix: prefix(b"TestStorage", b"PUBGETMAPU32"),
+					pallet_name: b"TestStorage".to_vec(),
+					storage_name: b"PUBGETMAPU32".to_vec(),
+					prefix: prefix(b"TestStorage", b"PUBGETMAPU32").to_vec(),
 					max_values: None,
 					max_size: Some(8 + 16),
 				},
 				StorageInfo {
-					prefix: prefix(b"TestStorage", b"GETMAPU32MYDEF"),
+					pallet_name: b"TestStorage".to_vec(),
+					storage_name: b"GETMAPU32MYDEF".to_vec(),
+					prefix: prefix(b"TestStorage", b"GETMAPU32MYDEF").to_vec(),
 					max_values: None,
 					max_size: Some(8 + 16),
 				},
 				StorageInfo {
-					prefix: prefix(b"TestStorage", b"PUBGETMAPU32MYDEF"),
+					pallet_name: b"TestStorage".to_vec(),
+					storage_name: b"PUBGETMAPU32MYDEF".to_vec(),
+					prefix: prefix(b"TestStorage", b"PUBGETMAPU32MYDEF").to_vec(),
 					max_values: None,
 					max_size: Some(8 + 16),
 				},
 				StorageInfo {
-					prefix: prefix(b"TestStorage", b"DOUBLEMAP"),
+					pallet_name: b"TestStorage".to_vec(),
+					storage_name: b"DOUBLEMAP".to_vec(),
+					prefix: prefix(b"TestStorage", b"DOUBLEMAP").to_vec(),
 					max_values: Some(3),
 					max_size: Some(12 + 16 + 16),
 				},
 				StorageInfo {
-					prefix: prefix(b"TestStorage", b"DOUBLEMAP2"),
+					pallet_name: b"TestStorage".to_vec(),
+					storage_name: b"DOUBLEMAP2".to_vec(),
+					prefix: prefix(b"TestStorage", b"DOUBLEMAP2").to_vec(),
 					max_values: None,
 					max_size: Some(12 + 16 + 16),
 				},
 				StorageInfo {
-					prefix: prefix(b"TestStorage", b"COMPLEXTYPE1"),
+					pallet_name: b"TestStorage".to_vec(),
+					storage_name: b"COMPLEXTYPE1".to_vec(),
+					prefix: prefix(b"TestStorage", b"COMPLEXTYPE1").to_vec(),
 					max_values: Some(1),
 					max_size: Some(5),
 				},
 				StorageInfo {
-					prefix: prefix(b"TestStorage", b"COMPLEXTYPE2"),
+					pallet_name: b"TestStorage".to_vec(),
+					storage_name: b"COMPLEXTYPE2".to_vec(),
+					prefix: prefix(b"TestStorage", b"COMPLEXTYPE2").to_vec(),
 					max_values: Some(1),
 					max_size: Some(1156),
 				},
 				StorageInfo {
-					prefix: prefix(b"TestStorage", b"COMPLEXTYPE3"),
+					pallet_name: b"TestStorage".to_vec(),
+					storage_name: b"COMPLEXTYPE3".to_vec(),
+					prefix: prefix(b"TestStorage", b"COMPLEXTYPE3").to_vec(),
 					max_values: Some(1),
 					max_size: Some(100),
 				},
 				StorageInfo {
-					prefix: prefix(b"TestStorage", b"NMAP"),
+					pallet_name: b"TestStorage".to_vec(),
+					storage_name: b"NMAP".to_vec(),
+					prefix: prefix(b"TestStorage", b"NMAP").to_vec(),
 					max_values: None,
 					max_size: Some(16 + 4 + 8 + 2 + 1),
 				},
 				StorageInfo {
-					prefix: prefix(b"TestStorage", b"NMAP2"),
+					pallet_name: b"TestStorage".to_vec(),
+					storage_name: b"NMAP2".to_vec(),
+					prefix: prefix(b"TestStorage", b"NMAP2").to_vec(),
 					max_values: None,
 					max_size: Some(16 + 4 + 1),
 				},
@@ -669,22 +727,30 @@ mod test2 {
 			<Module<TraitImpl>>::storage_info(),
 			vec![
 				StorageInfo {
-					prefix: prefix(b"TestStorage", b"SingleDef"),
+					pallet_name: b"TestStorage".to_vec(),
+					storage_name: b"SingleDef".to_vec(),
+					prefix: prefix(b"TestStorage", b"SingleDef").to_vec(),
 					max_values: Some(1),
 					max_size: None,
 				},
 				StorageInfo {
-					prefix: prefix(b"TestStorage", b"PairDef"),
+					pallet_name: b"TestStorage".to_vec(),
+					storage_name: b"PairDef".to_vec(),
+					prefix: prefix(b"TestStorage", b"PairDef").to_vec(),
 					max_values: Some(1),
 					max_size: None,
 				},
 				StorageInfo {
-					prefix: prefix(b"TestStorage", b"Single"),
+					pallet_name: b"TestStorage".to_vec(),
+					storage_name: b"Single".to_vec(),
+					prefix: prefix(b"TestStorage", b"Single").to_vec(),
 					max_values: Some(1),
 					max_size: None,
 				},
 				StorageInfo {
-					prefix: prefix(b"TestStorage", b"Pair"),
+					pallet_name: b"TestStorage".to_vec(),
+					storage_name: b"Pair".to_vec(),
+					prefix: prefix(b"TestStorage", b"Pair").to_vec(),
 					max_values: Some(1),
 					max_size: None,
 				},
diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index f204de69b84b..7438cee2bcab 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -1171,54 +1171,74 @@ fn test_storage_info() {
 		Example::storage_info(),
 		vec![
 			StorageInfo {
-				prefix: prefix(b"Example", b"ValueWhereClause"),
+				pallet_name: b"Example".to_vec(),
+				storage_name: b"ValueWhereClause".to_vec(),
+				prefix: prefix(b"Example", b"ValueWhereClause").to_vec(),
 				max_values: Some(1),
 				max_size: Some(8),
 			},
 			StorageInfo {
-				prefix: prefix(b"Example", b"Value"),
+				pallet_name: b"Example".to_vec(),
+				storage_name: b"Value".to_vec(),
+				prefix: prefix(b"Example", b"Value").to_vec(),
 				max_values: Some(1),
 				max_size: Some(4),
 			},
 			StorageInfo {
-				prefix: prefix(b"Example", b"Value2"),
+				pallet_name: b"Example".to_vec(),
+				storage_name: b"Value2".to_vec(),
+				prefix: prefix(b"Example", b"Value2").to_vec(),
 				max_values: Some(1),
 				max_size: Some(8),
 			},
 			StorageInfo {
-				prefix: prefix(b"Example", b"Map"),
+				pallet_name: b"Example".to_vec(),
+				storage_name: b"Map".to_vec(),
+				prefix: prefix(b"Example", b"Map").to_vec(),
 				max_values: None,
 				max_size: Some(3 + 16),
 			},
 			StorageInfo {
-				prefix: prefix(b"Example", b"Map2"),
+				pallet_name: b"Example".to_vec(),
+				storage_name: b"Map2".to_vec(),
+				prefix: prefix(b"Example", b"Map2").to_vec(),
 				max_values: Some(3),
 				max_size: Some(6 + 8),
 			},
 			StorageInfo {
-				prefix: prefix(b"Example", b"DoubleMap"),
+				pallet_name: b"Example".to_vec(),
+				storage_name: b"DoubleMap".to_vec(),
+				prefix: prefix(b"Example", b"DoubleMap").to_vec(),
 				max_values: None,
 				max_size: Some(7 + 16 + 8),
 			},
 			StorageInfo {
-				prefix: prefix(b"Example", b"DoubleMap2"),
+				pallet_name: b"Example".to_vec(),
+				storage_name: b"DoubleMap2".to_vec(),
+				prefix: prefix(b"Example", b"DoubleMap2").to_vec(),
 				max_values: Some(5),
 				max_size: Some(14 + 8 + 16),
 			},
 			StorageInfo {
-				prefix: prefix(b"Example", b"NMap"),
+				pallet_name: b"Example".to_vec(),
+				storage_name: b"NMap".to_vec(),
+				prefix: prefix(b"Example", b"NMap").to_vec(),
 				max_values: None,
 				max_size: Some(5 + 16),
 			},
 			StorageInfo {
-				prefix: prefix(b"Example", b"NMap2"),
+				pallet_name: b"Example".to_vec(),
+				storage_name: b"NMap2".to_vec(),
+				prefix: prefix(b"Example", b"NMap2").to_vec(),
 				max_values: Some(11),
 				max_size: Some(14 + 8 + 16),
 			},
 			#[cfg(feature = "conditional-storage")]
 			{
 				StorageInfo {
-					prefix: prefix(b"Example", b"ConditionalValue"),
+					pallet_name: b"Example".to_vec(),
+					storage_name: b"ConditionalValue".to_vec(),
+					prefix: prefix(b"Example", b"ConditionalValue").to_vec(),
 					max_values: Some(1),
 					max_size: Some(4),
 				}
@@ -1226,7 +1246,9 @@ fn test_storage_info() {
 			#[cfg(feature = "conditional-storage")]
 			{
 				StorageInfo {
-					prefix: prefix(b"Example", b"ConditionalMap"),
+					pallet_name: b"Example".to_vec(),
+					storage_name: b"ConditionalMap".to_vec(),
+					prefix: prefix(b"Example", b"ConditionalMap").to_vec(),
 					max_values: Some(12),
 					max_size: Some(6 + 8),
 				}
@@ -1234,7 +1256,9 @@ fn test_storage_info() {
 			#[cfg(feature = "conditional-storage")]
 			{
 				StorageInfo {
-					prefix: prefix(b"Example", b"ConditionalDoubleMap"),
+					pallet_name: b"Example".to_vec(),
+					storage_name: b"ConditionalDoubleMap".to_vec(),
+					prefix: prefix(b"Example", b"ConditionalDoubleMap").to_vec(),
 					max_values: None,
 					max_size: Some(7 + 16 + 8),
 				}
@@ -1242,7 +1266,9 @@ fn test_storage_info() {
 			#[cfg(feature = "conditional-storage")]
 			{
 				StorageInfo {
-					prefix: prefix(b"Example", b"ConditionalNMap"),
+					pallet_name: b"Example".to_vec(),
+					storage_name: b"ConditionalNMap".to_vec(),
+					prefix: prefix(b"Example", b"ConditionalNMap").to_vec(),
 					max_values: None,
 					max_size: Some(7 + 16 + 8),
 				}
@@ -1254,7 +1280,9 @@ fn test_storage_info() {
 		Example2::storage_info(),
 		vec![
 			StorageInfo {
-				prefix: prefix(b"Example2", b"SomeValue"),
+				pallet_name: b"Example2".to_vec(),
+				storage_name: b"SomeValue".to_vec(),
+				prefix: prefix(b"Example2", b"SomeValue").to_vec(),
 				max_values: Some(1),
 				max_size: None,
 			},
diff --git a/frame/timestamp/src/benchmarking.rs b/frame/timestamp/src/benchmarking.rs
index d64fa8dc691c..5d0178dc1484 100644
--- a/frame/timestamp/src/benchmarking.rs
+++ b/frame/timestamp/src/benchmarking.rs
@@ -35,8 +35,9 @@ benchmarks! {
 		let did_update_key = crate::DidUpdate::<T>::hashed_key().to_vec();
 		frame_benchmarking::benchmarking::add_to_whitelist(TrackedStorageKey {
 			key: did_update_key,
-			has_been_read: false,
-			has_been_written: true,
+			reads: 0,
+			writes: 1,
+			whitelisted: false,
 		});
 	}: _(RawOrigin::None, t.into())
 	verify {
diff --git a/primitives/externalities/src/lib.rs b/primitives/externalities/src/lib.rs
index 7a8771bd623e..80bb5b99f315 100644
--- a/primitives/externalities/src/lib.rs
+++ b/primitives/externalities/src/lib.rs
@@ -296,6 +296,13 @@ pub trait Externalities: ExtensionStore {
 	fn proof_size(&self) -> Option<u32> {
 		None
 	}
+
+	/// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+	/// Benchmarking related functionality and shouldn't be used anywhere else!
+	/// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+	///
+	/// Get all the keys that have been read or written to during the benchmark.
+	fn get_read_and_written_keys(&self) -> Vec<(Vec<u8>, u32, u32, bool)>;
 }
 
 /// Extension for the [`Externalities`] trait.
diff --git a/primitives/state-machine/src/backend.rs b/primitives/state-machine/src/backend.rs
index 5b1f901a3ea9..0dc054ed5039 100644
--- a/primitives/state-machine/src/backend.rs
+++ b/primitives/state-machine/src/backend.rs
@@ -267,6 +267,11 @@ pub trait Backend<H: Hasher>: sp_std::fmt::Debug {
 	fn proof_size(&self) -> Option<u32> {
 		unimplemented!()
 	}
+
+	/// Extend storage info for benchmarking db
+	fn get_read_and_written_keys(&self) -> Vec<(Vec<u8>, u32, u32, bool)> {
+		unimplemented!()
+	}
 }
 
 /// Trait that allows consolidate two transactions together.
diff --git a/primitives/state-machine/src/basic.rs b/primitives/state-machine/src/basic.rs
index 08849ebcc69a..75b0c1c922e4 100644
--- a/primitives/state-machine/src/basic.rs
+++ b/primitives/state-machine/src/basic.rs
@@ -339,6 +339,10 @@ impl Externalities for BasicExternalities {
 	fn set_whitelist(&mut self, _: Vec<TrackedStorageKey>) {
 		unimplemented!("set_whitelist is not supported in Basic")
 	}
+
+	fn get_read_and_written_keys(&self) -> Vec<(Vec<u8>, u32, u32, bool)> {
+		unimplemented!("get_read_and_written_keys is not supported in Basic")
+	}
 }
 
 impl sp_externalities::ExtensionStore for BasicExternalities {
diff --git a/primitives/state-machine/src/ext.rs b/primitives/state-machine/src/ext.rs
index d1d636cb6561..d7d65b905f49 100644
--- a/primitives/state-machine/src/ext.rs
+++ b/primitives/state-machine/src/ext.rs
@@ -749,6 +749,10 @@ where
 	fn proof_size(&self) -> Option<u32> {
 		self.backend.proof_size()
 	}
+
+	fn get_read_and_written_keys(&self) -> Vec<(Vec<u8>, u32, u32, bool)> {
+		self.backend.get_read_and_written_keys()
+	}
 }
 
 impl<'a, H, N, B> Ext<'a, H, N, B>
diff --git a/primitives/state-machine/src/read_only.rs b/primitives/state-machine/src/read_only.rs
index 7b67b61eea82..01e1fb6b5b2f 100644
--- a/primitives/state-machine/src/read_only.rs
+++ b/primitives/state-machine/src/read_only.rs
@@ -203,6 +203,10 @@ impl<'a, H: Hasher, B: 'a + Backend<H>> Externalities for ReadOnlyExternalities<
 	fn set_whitelist(&mut self, _: Vec<TrackedStorageKey>) {
 		unimplemented!("set_whitelist is not supported in ReadOnlyExternalities")
 	}
+
+	fn get_read_and_written_keys(&self) -> Vec<(Vec<u8>, u32, u32, bool)> {
+		unimplemented!("get_read_and_written_keys is not supported in ReadOnlyExternalities")
+	}
 }
 
 impl<'a, H: Hasher, B: 'a + Backend<H>> sp_externalities::ExtensionStore for ReadOnlyExternalities<'a, H, B> {
diff --git a/primitives/storage/src/lib.rs b/primitives/storage/src/lib.rs
index 76557d64753b..87c10f770a8a 100644
--- a/primitives/storage/src/lib.rs
+++ b/primitives/storage/src/lib.rs
@@ -45,17 +45,56 @@ impl AsRef<[u8]> for StorageKey {
 #[cfg_attr(feature = "std", derive(Hash, PartialOrd, Ord))]
 pub struct TrackedStorageKey {
 	pub key: Vec<u8>,
-	pub has_been_read: bool,
-	pub has_been_written: bool,
+	pub reads: u32,
+	pub writes: u32,
+	pub whitelisted: bool,
 }
 
-// Easily convert a key to a `TrackedStorageKey` that has been read and written to.
+impl TrackedStorageKey {
+	/// Create a default `TrackedStorageKey`
+	pub fn new(key: Vec<u8>) -> Self {
+		Self {
+			key,
+			reads: 0,
+			writes: 0,
+			whitelisted: false,
+		}
+	}
+	/// Check if this key has been "read", i.e. it exists in the memory overlay.
+	///
+	/// Can be true if the key has been read, has been written to, or has been
+	/// whitelisted.
+	pub fn has_been_read(&self) -> bool {
+		self.whitelisted || self.reads > 0u32 || self.has_been_written()
+	}
+	/// Check if this key has been "written", i.e. a new value will be committed to the database.
+	///
+	/// Can be true if the key has been written to, or has been whitelisted.
+	pub fn has_been_written(&self) -> bool {
+		self.whitelisted || self.writes > 0u32
+	}
+	/// Add a storage read to this key.
+	pub fn add_read(&mut self) {
+		self.reads += 1;
+	}
+	/// Add a storage write to this key.
+	pub fn add_write(&mut self) {
+		self.writes += 1;
+	}
+	/// Whitelist this key.
+	pub fn whitelist(&mut self) {
+		self.whitelisted = true;
+	}
+}
+
+// Easily convert a key to a `TrackedStorageKey` that has been whitelisted.
 impl From<Vec<u8>> for TrackedStorageKey {
 	fn from(key: Vec<u8>) -> Self {
 		Self {
 			key: key,
-			has_been_read: true,
-			has_been_written: true,
+			reads: 0,
+			writes: 0,
+			whitelisted: true,
 		}
 	}
 }
diff --git a/primitives/tasks/src/async_externalities.rs b/primitives/tasks/src/async_externalities.rs
index b64614991264..8402246cb4e2 100644
--- a/primitives/tasks/src/async_externalities.rs
+++ b/primitives/tasks/src/async_externalities.rs
@@ -190,6 +190,10 @@ impl Externalities for AsyncExternalities {
 	fn set_whitelist(&mut self, _: Vec<TrackedStorageKey>) {
 		unimplemented!("set_whitelist is not supported in AsyncExternalities")
 	}
+
+	fn get_read_and_written_keys(&self) -> Vec<(Vec<u8>, u32, u32, bool)> {
+		unimplemented!("get_read_and_written_keys is not supported in AsyncExternalities")
+	}
 }
 
 impl sp_externalities::ExtensionStore for AsyncExternalities {
diff --git a/utils/frame/benchmarking-cli/Cargo.toml b/utils/frame/benchmarking-cli/Cargo.toml
index 51290e5f44ab..4a88a31b7f64 100644
--- a/utils/frame/benchmarking-cli/Cargo.toml
+++ b/utils/frame/benchmarking-cli/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 frame-benchmarking = { version = "3.1.0", path = "../../../frame/benchmarking" }
+frame-support = { version = "3.0.0", path = "../../../frame/support" }
 sp-core = { version = "3.0.0", path = "../../../primitives/core" }
 sc-service = { version = "0.9.0", default-features = false, path = "../../../client/service" }
 sc-cli = { version = "0.9.0", path = "../../../client/cli" }
diff --git a/utils/frame/benchmarking-cli/src/command.rs b/utils/frame/benchmarking-cli/src/command.rs
index 80d95d1c86dc..e1803a2c56ea 100644
--- a/utils/frame/benchmarking-cli/src/command.rs
+++ b/utils/frame/benchmarking-cli/src/command.rs
@@ -15,10 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::sync::Arc;
 use crate::BenchmarkCmd;
 use codec::{Decode, Encode};
 use frame_benchmarking::{Analysis, BenchmarkBatch, BenchmarkSelector};
+use frame_support::traits::StorageInfo;
 use sc_cli::{SharedParams, CliConfiguration, ExecutionStrategy, Result};
 use sc_client_db::BenchmarkingState;
 use sc_executor::NativeExecutor;
@@ -31,7 +31,7 @@ use sp_keystore::{
 	SyncCryptoStorePtr, KeystoreExt,
 	testing::KeyStore,
 };
-use std::fmt::Debug;
+use std::{fmt::Debug, sync::Arc};
 
 impl BenchmarkCmd {
 	/// Runs the command and benchmarks the chain.
@@ -98,13 +98,16 @@ impl BenchmarkCmd {
 		.execute(strategy.into())
 		.map_err(|e| format!("Error executing runtime benchmark: {:?}", e))?;
 
-		let results = <std::result::Result<Vec<BenchmarkBatch>, String> as Decode>::decode(&mut &result[..])
+		let results = <std::result::Result<
+				(Vec<BenchmarkBatch>, Vec<StorageInfo>),
+				String,
+			> as Decode>::decode(&mut &result[..])
 			.map_err(|e| format!("Failed to decode benchmark results: {:?}", e))?;
 
 		match results {
-			Ok(batches) => {
+			Ok((batches, storage_info)) => {
 				if let Some(output_path) = &self.output {
-					crate::writer::write_results(&batches, output_path, self)?;
+					crate::writer::write_results(&batches, &storage_info, output_path, self)?;
 				}
 
 				for batch in batches.into_iter() {
@@ -129,6 +132,7 @@ impl BenchmarkCmd {
 						print!("extrinsic_time_ns,storage_root_time_ns,reads,repeat_reads,writes,repeat_writes,proof_size_bytes\n");
 						// Print the values
 						batch.results.iter().for_each(|result| {
+
 							let parameters = &result.components;
 							parameters.iter().for_each(|param| print!("{:?},", param.1));
 							// Print extrinsic time and storage root time
diff --git a/utils/frame/benchmarking-cli/src/template.hbs b/utils/frame/benchmarking-cli/src/template.hbs
index a6f0a5ddfc82..2fcc50f82377 100644
--- a/utils/frame/benchmarking-cli/src/template.hbs
+++ b/utils/frame/benchmarking-cli/src/template.hbs
@@ -20,6 +20,9 @@ use sp_std::marker::PhantomData;
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> {{pallet}}::WeightInfo for WeightInfo<T> {
 	{{~#each benchmarks as |benchmark|}}
+	{{~#each benchmark.comments as |comment|}}
+	// {{comment}}
+	{{~/each}}
 	fn {{benchmark.name~}}
 	(
 		{{~#each benchmark.components as |c| ~}}
diff --git a/utils/frame/benchmarking-cli/src/writer.rs b/utils/frame/benchmarking-cli/src/writer.rs
index 6fd6cc6eefdc..64a4ea62f0d4 100644
--- a/utils/frame/benchmarking-cli/src/writer.rs
+++ b/utils/frame/benchmarking-cli/src/writer.rs
@@ -17,7 +17,7 @@
 
 // Outputs benchmark results to Rust files that can be ingested by the runtime.
 
-use std::collections::HashMap;
+use std::collections::{HashMap, HashSet};
 use std::fs;
 use std::path::PathBuf;
 use core::convert::TryInto;
@@ -26,8 +26,12 @@ use serde::Serialize;
 use inflector::Inflector;
 
 use crate::BenchmarkCmd;
-use frame_benchmarking::{BenchmarkBatch, BenchmarkSelector, Analysis, AnalysisChoice, RegressionModel};
+use frame_benchmarking::{
+	BenchmarkBatch, BenchmarkSelector, Analysis, AnalysisChoice, RegressionModel, BenchmarkResults,
+};
+use sp_core::hexdisplay::HexDisplay;
 use sp_runtime::traits::Zero;
+use frame_support::traits::StorageInfo;
 
 const VERSION: &'static str = env!("CARGO_PKG_VERSION");
 const TEMPLATE: &str = include_str!("./template.hbs");
@@ -59,6 +63,7 @@ struct BenchmarkData {
 	component_weight: Vec<ComponentSlope>,
 	component_reads: Vec<ComponentSlope>,
 	component_writes: Vec<ComponentSlope>,
+	comments: Vec<String>,
 }
 
 // This forwards some specific metadata from the `BenchmarkCmd`
@@ -108,6 +113,7 @@ fn io_error(s: &str) -> std::io::Error {
 // ```
 fn map_results(
 	batches: &[BenchmarkBatch],
+	storage_info: &[StorageInfo],
 	analysis_choice: &AnalysisChoice,
 ) -> Result<HashMap<(String, String), Vec<BenchmarkData>>, std::io::Error> {
 	// Skip if batches is empty.
@@ -123,7 +129,7 @@ fn map_results(
 
 		let pallet_string = String::from_utf8(batch.pallet.clone()).unwrap();
 		let instance_string = String::from_utf8(batch.instance.clone()).unwrap();
-		let benchmark_data = get_benchmark_data(batch, analysis_choice);
+		let benchmark_data = get_benchmark_data(batch, storage_info, analysis_choice);
 		pallet_benchmarks.push(benchmark_data);
 
 		// Check if this is the end of the iterator
@@ -157,8 +163,12 @@ fn extract_errors(model: &Option<RegressionModel>) -> impl Iterator<Item=u128> +
 // Analyze and return the relevant results for a given benchmark.
 fn get_benchmark_data(
 	batch: &BenchmarkBatch,
+	storage_info: &[StorageInfo],
 	analysis_choice: &AnalysisChoice,
 ) -> BenchmarkData {
+	// You can use this to put any additional comments with the benchmarking output.
+	let mut comments = Vec::<String>::new();
+
 	// Analyze benchmarks to get the linear regression.
 	let analysis_function = match analysis_choice {
 		AnalysisChoice::MinSquares => Analysis::min_squares_iqr,
@@ -229,6 +239,9 @@ fn get_benchmark_data(
 		})
 		.collect::<Vec<_>>();
 
+	// We add additional comments showing which storage items were touched.
+	add_storage_comments(&mut comments, &batch.results, storage_info);
+
 	BenchmarkData {
 		name: String::from_utf8(batch.benchmark.clone()).unwrap(),
 		components,
@@ -238,12 +251,14 @@ fn get_benchmark_data(
 		component_weight: used_extrinsic_time,
 		component_reads: used_reads,
 		component_writes: used_writes,
+		comments,
 	}
 }
 
 // Create weight file from benchmark data and Handlebars template.
 pub fn write_results(
 	batches: &[BenchmarkBatch],
+	storage_info: &[StorageInfo],
 	path: &PathBuf,
 	cmd: &BenchmarkCmd,
 ) -> Result<(), std::io::Error> {
@@ -298,7 +313,7 @@ pub fn write_results(
 	handlebars.register_escape_fn(|s| -> String { s.to_string() });
 
 	// Organize results by pallet into a JSON map
-	let all_results = map_results(batches, &analysis_choice)?;
+	let all_results = map_results(batches, storage_info, &analysis_choice)?;
 	for ((pallet, instance), results) in all_results.iter() {
 		let mut file_path = path.clone();
 		// If a user only specified a directory...
@@ -332,6 +347,57 @@ pub fn write_results(
 	Ok(())
 }
 
+// This function looks at the keys touched during the benchmark, and the storage info we collected
+// from the pallets, and creates comments with information about the storage keys touched during
+// each benchmark.
+fn add_storage_comments(
+	comments: &mut Vec<String>,
+	results: &[BenchmarkResults],
+	storage_info: &[StorageInfo],
+) {
+	let storage_info_map = storage_info.iter().map(|info| (info.prefix.clone(), info))
+		.collect::<HashMap<_, _>>();
+	// This tracks the keys we already identified, so we only generate a single comment.
+	let mut identified = HashSet::<Vec<u8>>::new();
+
+	for result in results.clone() {
+		for (key, reads, writes, whitelisted) in &result.keys {
+			// skip keys which are whitelisted
+			if *whitelisted { continue; }
+			let prefix_length = key.len().min(32);
+			let prefix = key[0..prefix_length].to_vec();
+			if identified.contains(&prefix) {
+				// skip adding comments for keys we already identified
+				continue;
+			} else {
+				// track newly identified keys
+				identified.insert(prefix.clone());
+			}
+			match storage_info_map.get(&prefix) {
+				Some(key_info) => {
+					let comment = format!(
+						"Storage: {} {} (r:{} w:{})",
+						String::from_utf8(key_info.pallet_name.clone()).expect("encoded from string"),
+						String::from_utf8(key_info.storage_name.clone()).expect("encoded from string"),
+						reads,
+						writes,
+					);
+					comments.push(comment)
+				},
+				None => {
+					let comment = format!(
+						"Storage: unknown [0x{}] (r:{} w:{})",
+						HexDisplay::from(key),
+						reads,
+						writes,
+					);
+					comments.push(comment)
+				}
+			}
+		}
+	}
+}
+
 // Add an underscore after every 3rd character, i.e. a separator for large numbers.
 fn underscore<Number>(i: Number) -> String
 	where Number: std::string::ToString
@@ -422,6 +488,7 @@ mod test {
 					writes: (base + slope * i).into(),
 					repeat_writes: 0,
 					proof_size: 0,
+					keys: vec![],
 				}
 			)
 		}
@@ -475,11 +542,15 @@ mod test {
 
 	#[test]
 	fn map_results_works() {
-		let mapped_results = map_results(&[
-			test_data(b"first", b"first", BenchmarkParameter::a, 10, 3),
-			test_data(b"first", b"second", BenchmarkParameter::b, 9, 2),
-			test_data(b"second", b"first", BenchmarkParameter::c, 3, 4),
-		], &AnalysisChoice::default()).unwrap();
+		let mapped_results = map_results(
+			&[
+				test_data(b"first", b"first", BenchmarkParameter::a, 10, 3),
+				test_data(b"first", b"second", BenchmarkParameter::b, 9, 2),
+				test_data(b"second", b"first", BenchmarkParameter::c, 3, 4),
+			],
+			&[],
+			&AnalysisChoice::default(),
+		).unwrap();
 
 		let first_benchmark = &mapped_results.get(
 			&("first_pallet".to_string(), "instance".to_string())

From 9235309a7c651fc23bdbe653834c102dc2db9c9b Mon Sep 17 00:00:00 2001
From: Keith Yeung <kungfukeith11@gmail.com>
Date: Wed, 7 Jul 2021 19:57:26 -0700
Subject: [PATCH 0973/1194] Ensure data size of identity pallet is bounded
 (#9168)

* Ensure data size of identity pallet is bounded

* Fix unit tests for identity pallet

* Move identity pallet custom types into its own module

* Make use of NoBound family traits

* Fix identity pallet benchmarks

* Enumerate type imports

* Properly convert to BoundedVec in benchmarks

* Re-export types

* Use BoundedVec when storing sub identities

* Add generate_storage_info

* Manually implement MaxEncodedLen on select types

* Use ConstU32 instead of parameter_type

* Leverage DefaultNoBound and add some comments

* Use max_encoded_len() instead of hardcoded constant

* Use MaxEncodedLen in parity-scal-codec

* Add get_mut method for WeakBoundedVec

* Use expect on an infallible operation

* Rewrite as for loop
---
 frame/identity/Cargo.toml                     |   2 +-
 frame/identity/src/benchmarking.rs            |  14 +-
 frame/identity/src/lib.rs                     | 310 ++---------------
 frame/identity/src/tests.rs                   |  71 ++--
 frame/identity/src/types.rs                   | 318 ++++++++++++++++++
 frame/support/src/storage/bounded_vec.rs      |   8 +
 frame/support/src/storage/weak_bounded_vec.rs |   8 +
 7 files changed, 406 insertions(+), 325 deletions(-)
 create mode 100644 frame/identity/src/types.rs

diff --git a/frame/identity/Cargo.toml b/frame/identity/Cargo.toml
index fce79c56f80a..ed905d407d90 100644
--- a/frame/identity/Cargo.toml
+++ b/frame/identity/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
 enumflags2 = { version = "0.6.2" }
 sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
diff --git a/frame/identity/src/benchmarking.rs b/frame/identity/src/benchmarking.rs
index 0cd2d50529dd..4fb76fcb4138 100644
--- a/frame/identity/src/benchmarking.rs
+++ b/frame/identity/src/benchmarking.rs
@@ -56,7 +56,7 @@ fn add_registrars<T: Config>(r: u32) -> Result<(), &'static str> {
 fn create_sub_accounts<T: Config>(who: &T::AccountId, s: u32) -> Result<Vec<(T::AccountId, Data)>, &'static str> {
 	let mut subs = Vec::new();
 	let who_origin = RawOrigin::Signed(who.clone());
-	let data = Data::Raw(vec![0; 32]);
+	let data = Data::Raw(vec![0; 32].try_into().unwrap());
 
 	for i in 0..s {
 		let sub_account = account("sub", i, SEED);
@@ -84,11 +84,11 @@ fn add_sub_accounts<T: Config>(who: &T::AccountId, s: u32) -> Result<Vec<(T::Acc
 
 // This creates an `IdentityInfo` object with `num_fields` extra fields.
 // All data is pre-populated with some arbitrary bytes.
-fn create_identity_info<T: Config>(num_fields: u32) -> IdentityInfo {
-	let data = Data::Raw(vec![0; 32]);
+fn create_identity_info<T: Config>(num_fields: u32) -> IdentityInfo<T::MaxAdditionalFields> {
+	let data = Data::Raw(vec![0; 32].try_into().unwrap());
 
 	let info = IdentityInfo {
-		additional: vec![(data.clone(), data.clone()); num_fields as usize],
+		additional: vec![(data.clone(), data.clone()); num_fields as usize].try_into().unwrap(),
 		display: data.clone(),
 		legal: data.clone(),
 		web: data.clone(),
@@ -353,7 +353,7 @@ benchmarks! {
 		let caller: T::AccountId = whitelisted_caller();
 		let _ = add_sub_accounts::<T>(&caller, s)?;
 		let sub = account("new_sub", 0, SEED);
-		let data = Data::Raw(vec![0; 32]);
+		let data = Data::Raw(vec![0; 32].try_into().unwrap());
 		ensure!(SubsOf::<T>::get(&caller).1.len() as u32 == s, "Subs not set.");
 	}: _(RawOrigin::Signed(caller.clone()), T::Lookup::unlookup(sub), data)
 	verify {
@@ -365,7 +365,7 @@ benchmarks! {
 
 		let caller: T::AccountId = whitelisted_caller();
 		let (sub, _) = add_sub_accounts::<T>(&caller, s)?.remove(0);
-		let data = Data::Raw(vec![1; 32]);
+		let data = Data::Raw(vec![1; 32].try_into().unwrap());
 		ensure!(SuperOf::<T>::get(&sub).unwrap().1 != data, "data already set");
 	}: _(RawOrigin::Signed(caller), T::Lookup::unlookup(sub.clone()), data.clone())
 	verify {
@@ -390,7 +390,7 @@ benchmarks! {
 		let sup = account("super", 0, SEED);
 		let _ = add_sub_accounts::<T>(&sup, s)?;
 		let sup_origin = RawOrigin::Signed(sup).into();
-		Identity::<T>::add_sub(sup_origin, T::Lookup::unlookup(caller.clone()), Data::Raw(vec![0; 32]))?;
+		Identity::<T>::add_sub(sup_origin, T::Lookup::unlookup(caller.clone()), Data::Raw(vec![0; 32].try_into().unwrap()))?;
 		ensure!(SuperOf::<T>::contains_key(&caller), "Sub doesn't exists");
 	}: _(RawOrigin::Signed(caller.clone()))
 	verify {
diff --git a/frame/identity/src/lib.rs b/frame/identity/src/lib.rs
index d398384887d9..f6e3f0639f16 100644
--- a/frame/identity/src/lib.rs
+++ b/frame/identity/src/lib.rs
@@ -74,285 +74,25 @@
 
 #[cfg(test)]
 mod tests;
+mod types;
 mod benchmarking;
 pub mod weights;
 
 use sp_std::prelude::*;
-use sp_std::{fmt::Debug, ops::Add, iter::once};
-use enumflags2::BitFlags;
-use codec::{Encode, Decode};
-use sp_runtime::RuntimeDebug;
+use sp_std::convert::TryInto;
 use sp_runtime::traits::{StaticLookup, Zero, AppendZerosInput, Saturating};
-use frame_support::traits::{Currency, ReservableCurrency, OnUnbalanced, BalanceStatus};
+use frame_support::traits::{BalanceStatus, Currency, OnUnbalanced, ReservableCurrency};
 pub use weights::WeightInfo;
 
 pub use pallet::*;
+pub use types::{
+	Data, IdentityField, IdentityFields, IdentityInfo, Judgement, RegistrarIndex,
+	RegistrarInfo, Registration,
+};
 
 type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
 
-/// Either underlying data blob if it is at most 32 bytes, or a hash of it. If the data is greater
-/// than 32-bytes then it will be truncated when encoding.
-///
-/// Can also be `None`.
-#[derive(Clone, Eq, PartialEq, RuntimeDebug)]
-pub enum Data {
-	/// No data here.
-	None,
-	/// The data is stored directly.
-	Raw(Vec<u8>),
-	/// Only the Blake2 hash of the data is stored. The preimage of the hash may be retrieved
-	/// through some hash-lookup service.
-	BlakeTwo256([u8; 32]),
-	/// Only the SHA2-256 hash of the data is stored. The preimage of the hash may be retrieved
-	/// through some hash-lookup service.
-	Sha256([u8; 32]),
-	/// Only the Keccak-256 hash of the data is stored. The preimage of the hash may be retrieved
-	/// through some hash-lookup service.
-	Keccak256([u8; 32]),
-	/// Only the SHA3-256 hash of the data is stored. The preimage of the hash may be retrieved
-	/// through some hash-lookup service.
-	ShaThree256([u8; 32]),
-}
-
-impl Decode for Data {
-	fn decode<I: codec::Input>(input: &mut I) -> sp_std::result::Result<Self, codec::Error> {
-		let b = input.read_byte()?;
-		Ok(match b {
-			0 => Data::None,
-			n @ 1 ..= 33 => {
-				let mut r = vec![0u8; n as usize - 1];
-				input.read(&mut r[..])?;
-				Data::Raw(r)
-			}
-			34 => Data::BlakeTwo256(<[u8; 32]>::decode(input)?),
-			35 => Data::Sha256(<[u8; 32]>::decode(input)?),
-			36 => Data::Keccak256(<[u8; 32]>::decode(input)?),
-			37 => Data::ShaThree256(<[u8; 32]>::decode(input)?),
-			_ => return Err(codec::Error::from("invalid leading byte")),
-		})
-	}
-}
-
-impl Encode for Data {
-	fn encode(&self) -> Vec<u8> {
-		match self {
-			Data::None => vec![0u8; 1],
-			Data::Raw(ref x) => {
-				let l = x.len().min(32);
-				let mut r = vec![l as u8 + 1; l + 1];
-				r[1..].copy_from_slice(&x[..l as usize]);
-				r
-			}
-			Data::BlakeTwo256(ref h) => once(34u8).chain(h.iter().cloned()).collect(),
-			Data::Sha256(ref h) => once(35u8).chain(h.iter().cloned()).collect(),
-			Data::Keccak256(ref h) => once(36u8).chain(h.iter().cloned()).collect(),
-			Data::ShaThree256(ref h) => once(37u8).chain(h.iter().cloned()).collect(),
-		}
-	}
-}
-impl codec::EncodeLike for Data {}
-
-impl Default for Data {
-	fn default() -> Self {
-		Self::None
-	}
-}
-
-/// An identifier for a single name registrar/identity verification service.
-pub type RegistrarIndex = u32;
-
-/// An attestation of a registrar over how accurate some `IdentityInfo` is in describing an account.
-///
-/// NOTE: Registrars may pay little attention to some fields. Registrars may want to make clear
-/// which fields their attestation is relevant for by off-chain means.
-#[derive(Copy, Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug)]
-pub enum Judgement<
-	Balance: Encode + Decode + Copy + Clone + Debug + Eq + PartialEq
-> {
-	/// The default value; no opinion is held.
-	Unknown,
-	/// No judgement is yet in place, but a deposit is reserved as payment for providing one.
-	FeePaid(Balance),
-	/// The data appears to be reasonably acceptable in terms of its accuracy, however no in depth
-	/// checks (such as in-person meetings or formal KYC) have been conducted.
-	Reasonable,
-	/// The target is known directly by the registrar and the registrar can fully attest to the
-	/// the data's accuracy.
-	KnownGood,
-	/// The data was once good but is currently out of date. There is no malicious intent in the
-	/// inaccuracy. This judgement can be removed through updating the data.
-	OutOfDate,
-	/// The data is imprecise or of sufficiently low-quality to be problematic. It is not
-	/// indicative of malicious intent. This judgement can be removed through updating the data.
-	LowQuality,
-	/// The data is erroneous. This may be indicative of malicious intent. This cannot be removed
-	/// except by the registrar.
-	Erroneous,
-}
-
-impl<
-	Balance: Encode + Decode + Copy + Clone + Debug + Eq + PartialEq
-> Judgement<Balance> {
-	/// Returns `true` if this judgement is indicative of a deposit being currently held. This means
-	/// it should not be cleared or replaced except by an operation which utilizes the deposit.
-	fn has_deposit(&self) -> bool {
-		match self {
-			Judgement::FeePaid(_) => true,
-			_ => false,
-		}
-	}
-
-	/// Returns `true` if this judgement is one that should not be generally be replaced outside
-	/// of specialized handlers. Examples include "malicious" judgements and deposit-holding
-	/// judgements.
-	fn is_sticky(&self) -> bool {
-		match self {
-			Judgement::FeePaid(_) | Judgement::Erroneous => true,
-			_ => false,
-		}
-	}
-}
-
-/// The fields that we use to identify the owner of an account with. Each corresponds to a field
-/// in the `IdentityInfo` struct.
-#[repr(u64)]
-#[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, BitFlags, RuntimeDebug)]
-pub enum IdentityField {
-	Display        = 0b0000000000000000000000000000000000000000000000000000000000000001,
-	Legal          = 0b0000000000000000000000000000000000000000000000000000000000000010,
-	Web            = 0b0000000000000000000000000000000000000000000000000000000000000100,
-	Riot           = 0b0000000000000000000000000000000000000000000000000000000000001000,
-	Email          = 0b0000000000000000000000000000000000000000000000000000000000010000,
-	PgpFingerprint = 0b0000000000000000000000000000000000000000000000000000000000100000,
-	Image          = 0b0000000000000000000000000000000000000000000000000000000001000000,
-	Twitter        = 0b0000000000000000000000000000000000000000000000000000000010000000,
-}
-
-/// Wrapper type for `BitFlags<IdentityField>` that implements `Codec`.
-#[derive(Clone, Copy, PartialEq, Default, RuntimeDebug)]
-pub struct IdentityFields(BitFlags<IdentityField>);
-
-impl Eq for IdentityFields {}
-impl Encode for IdentityFields {
-	fn using_encoded<R, F: FnOnce(&[u8]) -> R>(&self, f: F) -> R {
-		self.0.bits().using_encoded(f)
-	}
-}
-impl Decode for IdentityFields {
-	fn decode<I: codec::Input>(input: &mut I) -> sp_std::result::Result<Self, codec::Error> {
-		let field = u64::decode(input)?;
-		Ok(Self(<BitFlags<IdentityField>>::from_bits(field as u64).map_err(|_| "invalid value")?))
-	}
-}
-
-/// Information concerning the identity of the controller of an account.
-///
-/// NOTE: This should be stored at the end of the storage item to facilitate the addition of extra
-/// fields in a backwards compatible way through a specialized `Decode` impl.
-#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug)]
-#[cfg_attr(test, derive(Default))]
-pub struct IdentityInfo {
-	/// Additional fields of the identity that are not catered for with the struct's explicit
-	/// fields.
-	pub additional: Vec<(Data, Data)>,
-
-	/// A reasonable display name for the controller of the account. This should be whatever it is
-	/// that it is typically known as and should not be confusable with other entities, given
-	/// reasonable context.
-	///
-	/// Stored as UTF-8.
-	pub display: Data,
-
-	/// The full legal name in the local jurisdiction of the entity. This might be a bit
-	/// long-winded.
-	///
-	/// Stored as UTF-8.
-	pub legal: Data,
-
-	/// A representative website held by the controller of the account.
-	///
-	/// NOTE: `https://` is automatically prepended.
-	///
-	/// Stored as UTF-8.
-	pub web: Data,
-
-	/// The Riot/Matrix handle held by the controller of the account.
-	///
-	/// Stored as UTF-8.
-	pub riot: Data,
-
-	/// The email address of the controller of the account.
-	///
-	/// Stored as UTF-8.
-	pub email: Data,
-
-	/// The PGP/GPG public key of the controller of the account.
-	pub pgp_fingerprint: Option<[u8; 20]>,
-
-	/// A graphic image representing the controller of the account. Should be a company,
-	/// organization or project logo or a headshot in the case of a human.
-	pub image: Data,
-
-	/// The Twitter identity. The leading `@` character may be elided.
-	pub twitter: Data,
-}
-
-/// Information concerning the identity of the controller of an account.
-///
-/// NOTE: This is stored separately primarily to facilitate the addition of extra fields in a
-/// backwards compatible way through a specialized `Decode` impl.
-#[derive(Clone, Encode, Eq, PartialEq, RuntimeDebug)]
-pub struct Registration<
-	Balance: Encode + Decode + Copy + Clone + Debug + Eq + PartialEq
-> {
-	/// Judgements from the registrars on this identity. Stored ordered by `RegistrarIndex`. There
-	/// may be only a single judgement from each registrar.
-	pub judgements: Vec<(RegistrarIndex, Judgement<Balance>)>,
-
-	/// Amount held on deposit for this information.
-	pub deposit: Balance,
-
-	/// Information on the identity.
-	pub info: IdentityInfo,
-}
-
-impl <
-	Balance: Encode + Decode + Copy + Clone + Debug + Eq + PartialEq + Zero + Add,
-> Registration<Balance> {
-	fn total_deposit(&self) -> Balance {
-		self.deposit + self.judgements.iter()
-			.map(|(_, ref j)| if let Judgement::FeePaid(fee) = j { *fee } else { Zero::zero() })
-			.fold(Zero::zero(), |a, i| a + i)
-	}
-}
-
-impl<
-	Balance: Encode + Decode + Copy + Clone + Debug + Eq + PartialEq,
-> Decode for Registration<Balance> {
-	fn decode<I: codec::Input>(input: &mut I) -> sp_std::result::Result<Self, codec::Error> {
-		let (judgements, deposit, info) = Decode::decode(&mut AppendZerosInput::new(input))?;
-		Ok(Self { judgements, deposit, info })
-	}
-}
-
-/// Information concerning a registrar.
-#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug)]
-pub struct RegistrarInfo<
-	Balance: Encode + Decode + Clone + Debug + Eq + PartialEq,
-	AccountId: Encode + Decode + Clone + Debug + Eq + PartialEq
-> {
-	/// The account of the registrar.
-	pub account: AccountId,
-
-	/// Amount required to be given to the registrar for them to provide judgement.
-	pub fee: Balance,
-
-	/// Relevant fields for this registrar. Registrar judgements are limited to attestations on
-	/// these fields.
-	pub fields: IdentityFields,
-}
-
 #[frame_support::pallet]
 pub mod pallet {
 	use frame_support::pallet_prelude::*;
@@ -411,6 +151,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::generate_storage_info]
 	pub struct Pallet<T>(_);
 
 	/// Information that is pertinent to identify the entity behind an account.
@@ -422,7 +163,7 @@ pub mod pallet {
 		_,
 		Twox64Concat,
 		T::AccountId,
-		Registration<BalanceOf<T>>,
+		Registration<BalanceOf<T>, T::MaxRegistrars, T::MaxAdditionalFields>,
 		OptionQuery,
 	>;
 
@@ -449,7 +190,7 @@ pub mod pallet {
 		_,
 		Twox64Concat,
 		T::AccountId,
-		(BalanceOf<T>, Vec<T::AccountId>),
+		(BalanceOf<T>, BoundedVec<T::AccountId, T::MaxSubAccounts>),
 		ValueQuery,
 	>;
 
@@ -461,7 +202,7 @@ pub mod pallet {
 	#[pallet::getter(fn registrars)]
 	pub(super) type Registrars<T: Config> = StorageValue<
 		_,
-		Vec<Option<RegistrarInfo<BalanceOf<T>, T::AccountId>>>,
+		BoundedVec<Option<RegistrarInfo<BalanceOf<T>, T::AccountId>>, T::MaxRegistrars>,
 		ValueQuery,
 	>;
 
@@ -554,10 +295,10 @@ pub mod pallet {
 
 			let (i, registrar_count) = <Registrars<T>>::try_mutate(
 				|registrars| -> Result<(RegistrarIndex, usize), DispatchError> {
-					ensure!(registrars.len() < T::MaxRegistrars::get() as usize, Error::<T>::TooManyRegistrars);
-					registrars.push(Some(RegistrarInfo {
+					registrars.try_push(Some(RegistrarInfo {
 						account, fee: Zero::zero(), fields: Default::default()
-					}));
+					}))
+					.map_err(|_| Error::<T>::TooManyRegistrars)?;
 					Ok(((registrars.len() - 1) as RegistrarIndex, registrars.len()))
 				}
 			)?;
@@ -590,7 +331,7 @@ pub mod pallet {
 			T::MaxRegistrars::get().into(), // R
 			T::MaxAdditionalFields::get().into(), // X
 		))]
-		pub fn set_identity(origin: OriginFor<T>, info: IdentityInfo) -> DispatchResultWithPostInfo {
+		pub fn set_identity(origin: OriginFor<T>, info: IdentityInfo<T::MaxAdditionalFields>) -> DispatchResultWithPostInfo {
 			let sender = ensure_signed(origin)?;
 			let extra_fields = info.additional.len() as u32;
 			ensure!(extra_fields <= T::MaxAdditionalFields::get(), Error::<T>::TooManyFields);
@@ -603,7 +344,7 @@ pub mod pallet {
 					id.info = info;
 					id
 				}
-				None => Registration { info, judgements: Vec::new(), deposit: Zero::zero() },
+				None => Registration { info, judgements: BoundedVec::default(), deposit: Zero::zero() },
 			};
 
 			let old_deposit = id.deposit;
@@ -678,10 +419,11 @@ pub mod pallet {
 			for s in old_ids.iter() {
 				<SuperOf<T>>::remove(s);
 			}
-			let ids = subs.into_iter().map(|(id, name)| {
+			let mut ids = BoundedVec::<T::AccountId, T::MaxSubAccounts>::default();
+			for (id, name) in subs {
 				<SuperOf<T>>::insert(&id, (sender.clone(), name));
-				id
-			}).collect::<Vec<_>>();
+				ids.try_push(id).expect("subs length is less than T::MaxSubAccounts; qed");
+			}
 			let new_subs = ids.len();
 
 			if ids.is_empty() {
@@ -786,7 +528,10 @@ pub mod pallet {
 				} else {
 					id.judgements[i] = item
 				},
-				Err(i) => id.judgements.insert(i, item),
+				Err(i) => id
+					.judgements
+					.try_insert(i, item)
+					.map_err(|_| Error::<T>::TooManyRegistrars)?,
 			}
 
 			T::Currency::reserve(&sender, registrar.fee)?;
@@ -988,7 +733,10 @@ pub mod pallet {
 					}
 					id.judgements[position] = item
 				}
-				Err(position) => id.judgements.insert(position, item),
+				Err(position) => id
+					.judgements
+					.try_insert(position, item)
+					.map_err(|_| Error::<T>::TooManyRegistrars)?,
 			}
 
 			let judgements = id.judgements.len();
@@ -1075,7 +823,7 @@ pub mod pallet {
 				T::Currency::reserve(&sender, deposit)?;
 
 				SuperOf::<T>::insert(&sub, (sender.clone(), data));
-				sub_ids.push(sub.clone());
+				sub_ids.try_push(sub.clone()).expect("sub ids length checked above; qed");
 				*subs_deposit = subs_deposit.saturating_add(deposit);
 
 				Self::deposit_event(Event::SubIdentityAdded(sub, sender.clone(), deposit));
diff --git a/frame/identity/src/tests.rs b/frame/identity/src/tests.rs
index 262b3211b6d1..fea83dc3b10a 100644
--- a/frame/identity/src/tests.rs
+++ b/frame/identity/src/tests.rs
@@ -20,8 +20,9 @@
 use super::*;
 use crate as pallet_identity;
 
+use codec::{Encode, Decode};
 use sp_runtime::traits::BadOrigin;
-use frame_support::{assert_ok, assert_noop, parameter_types, ord_parameter_types};
+use frame_support::{assert_ok, assert_noop, parameter_types, ord_parameter_types, BoundedVec};
 use sp_core::H256;
 use frame_system::{EnsureSignedBy, EnsureOneOf, EnsureRoot};
 use sp_runtime::{
@@ -139,18 +140,18 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 	t.into()
 }
 
-fn ten() -> IdentityInfo {
+fn ten() -> IdentityInfo<MaxAdditionalFields> {
 	IdentityInfo {
-		display: Data::Raw(b"ten".to_vec()),
-		legal: Data::Raw(b"The Right Ordinal Ten, Esq.".to_vec()),
+		display: Data::Raw(b"ten".to_vec().try_into().unwrap()),
+		legal: Data::Raw(b"The Right Ordinal Ten, Esq.".to_vec().try_into().unwrap()),
 		.. Default::default()
 	}
 }
 
-fn twenty() -> IdentityInfo {
+fn twenty() -> IdentityInfo<MaxAdditionalFields> {
 	IdentityInfo {
-		display: Data::Raw(b"twenty".to_vec()),
-		legal: Data::Raw(b"The Right Ordinal Twenty, Esq.".to_vec()),
+		display: Data::Raw(b"twenty".to_vec().try_into().unwrap()),
+		legal: Data::Raw(b"The Right Ordinal Twenty, Esq.".to_vec().try_into().unwrap()),
 		.. Default::default()
 	}
 }
@@ -158,7 +159,7 @@ fn twenty() -> IdentityInfo {
 #[test]
 fn editing_subaccounts_should_work() {
 	new_test_ext().execute_with(|| {
-		let data = |x| Data::Raw(vec![x; 1]);
+		let data = |x| Data::Raw(vec![x; 1].try_into().unwrap());
 
 		assert_noop!(Identity::add_sub(Origin::signed(10), 20, data(1)), Error::<Test>::NoIdentity);
 
@@ -202,7 +203,7 @@ fn editing_subaccounts_should_work() {
 #[test]
 fn resolving_subaccount_ownership_works() {
 	new_test_ext().execute_with(|| {
-		let data = |x| Data::Raw(vec![x; 1]);
+		let data = |x| Data::Raw(vec![x; 1].try_into().unwrap());
 
 		assert_ok!(Identity::set_identity(Origin::signed(10), ten()));
 		assert_ok!(Identity::set_identity(Origin::signed(20), twenty()));
@@ -227,11 +228,11 @@ fn resolving_subaccount_ownership_works() {
 
 #[test]
 fn trailing_zeros_decodes_into_default_data() {
-	let encoded = Data::Raw(b"Hello".to_vec()).encode();
+	let encoded = Data::Raw(b"Hello".to_vec().try_into().unwrap()).encode();
 	assert!(<(Data, Data)>::decode(&mut &encoded[..]).is_err());
 	let input = &mut &encoded[..];
 	let (a, b) = <(Data, Data)>::decode(&mut AppendZerosInput::new(input)).unwrap();
-	assert_eq!(a, Data::Raw(b"Hello".to_vec()));
+	assert_eq!(a, Data::Raw(b"Hello".to_vec().try_into().unwrap()));
 	assert_eq!(b, Data::None);
 }
 
@@ -268,13 +269,9 @@ fn registration_should_work() {
 		assert_ok!(Identity::add_registrar(Origin::signed(1), 3));
 		assert_ok!(Identity::set_fee(Origin::signed(3), 0, 10));
 		let mut three_fields = ten();
-		three_fields.additional.push(Default::default());
-		three_fields.additional.push(Default::default());
-		three_fields.additional.push(Default::default());
-		assert_noop!(
-			Identity::set_identity(Origin::signed(10), three_fields),
-			Error::<Test>::TooManyFields
-		);
+		three_fields.additional.try_push(Default::default()).unwrap();
+		three_fields.additional.try_push(Default::default()).unwrap();
+		assert_eq!(three_fields.additional.try_push(Default::default()), Err(()));
 		assert_ok!(Identity::set_identity(Origin::signed(10), ten()));
 		assert_eq!(Identity::identity(10).unwrap().info, ten());
 		assert_eq!(Balances::free_balance(10), 90);
@@ -339,40 +336,40 @@ fn killing_slashing_should_work() {
 #[test]
 fn setting_subaccounts_should_work() {
 	new_test_ext().execute_with(|| {
-		let mut subs = vec![(20, Data::Raw(vec![40; 1]))];
+		let mut subs = vec![(20, Data::Raw(vec![40; 1].try_into().unwrap()))];
 		assert_noop!(Identity::set_subs(Origin::signed(10), subs.clone()), Error::<Test>::NotFound);
 
 		assert_ok!(Identity::set_identity(Origin::signed(10), ten()));
 		assert_ok!(Identity::set_subs(Origin::signed(10), subs.clone()));
 		assert_eq!(Balances::free_balance(10), 80);
-		assert_eq!(Identity::subs_of(10), (10, vec![20]));
-		assert_eq!(Identity::super_of(20), Some((10, Data::Raw(vec![40; 1]))));
+		assert_eq!(Identity::subs_of(10), (10, vec![20].try_into().unwrap()));
+		assert_eq!(Identity::super_of(20), Some((10, Data::Raw(vec![40; 1].try_into().unwrap()))));
 
 		// push another item and re-set it.
-		subs.push((30, Data::Raw(vec![50; 1])));
+		subs.push((30, Data::Raw(vec![50; 1].try_into().unwrap())));
 		assert_ok!(Identity::set_subs(Origin::signed(10), subs.clone()));
 		assert_eq!(Balances::free_balance(10), 70);
-		assert_eq!(Identity::subs_of(10), (20, vec![20, 30]));
-		assert_eq!(Identity::super_of(20), Some((10, Data::Raw(vec![40; 1]))));
-		assert_eq!(Identity::super_of(30), Some((10, Data::Raw(vec![50; 1]))));
+		assert_eq!(Identity::subs_of(10), (20, vec![20, 30].try_into().unwrap()));
+		assert_eq!(Identity::super_of(20), Some((10, Data::Raw(vec![40; 1].try_into().unwrap()))));
+		assert_eq!(Identity::super_of(30), Some((10, Data::Raw(vec![50; 1].try_into().unwrap()))));
 
 		// switch out one of the items and re-set.
-		subs[0] = (40, Data::Raw(vec![60; 1]));
+		subs[0] = (40, Data::Raw(vec![60; 1].try_into().unwrap()));
 		assert_ok!(Identity::set_subs(Origin::signed(10), subs.clone()));
 		assert_eq!(Balances::free_balance(10), 70); // no change in the balance
-		assert_eq!(Identity::subs_of(10), (20, vec![40, 30]));
+		assert_eq!(Identity::subs_of(10), (20, vec![40, 30].try_into().unwrap()));
 		assert_eq!(Identity::super_of(20), None);
-		assert_eq!(Identity::super_of(30), Some((10, Data::Raw(vec![50; 1]))));
-		assert_eq!(Identity::super_of(40), Some((10, Data::Raw(vec![60; 1]))));
+		assert_eq!(Identity::super_of(30), Some((10, Data::Raw(vec![50; 1].try_into().unwrap()))));
+		assert_eq!(Identity::super_of(40), Some((10, Data::Raw(vec![60; 1].try_into().unwrap()))));
 
 		// clear
 		assert_ok!(Identity::set_subs(Origin::signed(10), vec![]));
 		assert_eq!(Balances::free_balance(10), 90);
-		assert_eq!(Identity::subs_of(10), (0, vec![]));
+		assert_eq!(Identity::subs_of(10), (0, BoundedVec::default()));
 		assert_eq!(Identity::super_of(30), None);
 		assert_eq!(Identity::super_of(40), None);
 
-		subs.push((20, Data::Raw(vec![40; 1])));
+		subs.push((20, Data::Raw(vec![40; 1].try_into().unwrap())));
 		assert_noop!(Identity::set_subs(Origin::signed(10), subs.clone()), Error::<Test>::TooManySubAccounts);
 	});
 }
@@ -381,7 +378,7 @@ fn setting_subaccounts_should_work() {
 fn clearing_account_should_remove_subaccounts_and_refund() {
 	new_test_ext().execute_with(|| {
 		assert_ok!(Identity::set_identity(Origin::signed(10), ten()));
-		assert_ok!(Identity::set_subs(Origin::signed(10), vec![(20, Data::Raw(vec![40; 1]))]));
+		assert_ok!(Identity::set_subs(Origin::signed(10), vec![(20, Data::Raw(vec![40; 1].try_into().unwrap()))]));
 		assert_ok!(Identity::clear_identity(Origin::signed(10)));
 		assert_eq!(Balances::free_balance(10), 100);
 		assert!(Identity::super_of(20).is_none());
@@ -392,7 +389,7 @@ fn clearing_account_should_remove_subaccounts_and_refund() {
 fn killing_account_should_remove_subaccounts_and_not_refund() {
 	new_test_ext().execute_with(|| {
 		assert_ok!(Identity::set_identity(Origin::signed(10), ten()));
-		assert_ok!(Identity::set_subs(Origin::signed(10), vec![(20, Data::Raw(vec![40; 1]))]));
+		assert_ok!(Identity::set_subs(Origin::signed(10), vec![(20, Data::Raw(vec![40; 1].try_into().unwrap()))]));
 		assert_ok!(Identity::kill_identity(Origin::signed(2), 10));
 		assert_eq!(Balances::free_balance(10), 80);
 		assert!(Identity::super_of(20).is_none());
@@ -453,9 +450,11 @@ fn field_deposit_should_work() {
 		assert_ok!(Identity::set_fee(Origin::signed(3), 0, 10));
 		assert_ok!(Identity::set_identity(Origin::signed(10), IdentityInfo {
 			additional: vec![
-				(Data::Raw(b"number".to_vec()), Data::Raw(10u32.encode())),
-				(Data::Raw(b"text".to_vec()), Data::Raw(b"10".to_vec())),
-			], .. Default::default()
+				(Data::Raw(b"number".to_vec().try_into().unwrap()), Data::Raw(10u32.encode().try_into().unwrap())),
+				(Data::Raw(b"text".to_vec().try_into().unwrap()), Data::Raw(b"10".to_vec().try_into().unwrap())),
+			]
+			.try_into()
+			.unwrap(), .. Default::default()
 		}));
 		assert_eq!(Balances::free_balance(10), 70);
 	});
diff --git a/frame/identity/src/types.rs b/frame/identity/src/types.rs
new file mode 100644
index 000000000000..59781aadbd31
--- /dev/null
+++ b/frame/identity/src/types.rs
@@ -0,0 +1,318 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use codec::{Encode, Decode, MaxEncodedLen};
+use enumflags2::BitFlags;
+use frame_support::{
+    traits::{ConstU32, Get},
+    BoundedVec, CloneNoBound, PartialEqNoBound, RuntimeDebugNoBound,
+};
+use sp_std::prelude::*;
+use sp_std::{fmt::Debug, iter::once, ops::Add};
+use sp_runtime::{
+    traits::Zero,
+    RuntimeDebug,
+};
+use super::*;
+
+/// Either underlying data blob if it is at most 32 bytes, or a hash of it. If the data is greater
+/// than 32-bytes then it will be truncated when encoding.
+///
+/// Can also be `None`.
+#[derive(Clone, Eq, PartialEq, RuntimeDebug, MaxEncodedLen)]
+pub enum Data {
+	/// No data here.
+	None,
+	/// The data is stored directly.
+	Raw(BoundedVec<u8, ConstU32<32>>),
+	/// Only the Blake2 hash of the data is stored. The preimage of the hash may be retrieved
+	/// through some hash-lookup service.
+	BlakeTwo256([u8; 32]),
+	/// Only the SHA2-256 hash of the data is stored. The preimage of the hash may be retrieved
+	/// through some hash-lookup service.
+	Sha256([u8; 32]),
+	/// Only the Keccak-256 hash of the data is stored. The preimage of the hash may be retrieved
+	/// through some hash-lookup service.
+	Keccak256([u8; 32]),
+	/// Only the SHA3-256 hash of the data is stored. The preimage of the hash may be retrieved
+	/// through some hash-lookup service.
+	ShaThree256([u8; 32]),
+}
+
+impl Decode for Data {
+	fn decode<I: codec::Input>(input: &mut I) -> sp_std::result::Result<Self, codec::Error> {
+		let b = input.read_byte()?;
+		Ok(match b {
+			0 => Data::None,
+			n @ 1 ..= 33 => {
+				let mut r: BoundedVec<_, _> = vec![0u8; n as usize - 1]
+					.try_into()
+					.expect("bound checked in match arm condition; qed");
+				input.read(&mut r[..])?;
+				Data::Raw(r)
+			}
+			34 => Data::BlakeTwo256(<[u8; 32]>::decode(input)?),
+			35 => Data::Sha256(<[u8; 32]>::decode(input)?),
+			36 => Data::Keccak256(<[u8; 32]>::decode(input)?),
+			37 => Data::ShaThree256(<[u8; 32]>::decode(input)?),
+			_ => return Err(codec::Error::from("invalid leading byte")),
+		})
+	}
+}
+
+impl Encode for Data {
+	fn encode(&self) -> Vec<u8> {
+		match self {
+			Data::None => vec![0u8; 1],
+			Data::Raw(ref x) => {
+				let l = x.len().min(32);
+				let mut r = vec![l as u8 + 1; l + 1];
+				r[1..].copy_from_slice(&x[..l as usize]);
+				r
+			}
+			Data::BlakeTwo256(ref h) => once(34u8).chain(h.iter().cloned()).collect(),
+			Data::Sha256(ref h) => once(35u8).chain(h.iter().cloned()).collect(),
+			Data::Keccak256(ref h) => once(36u8).chain(h.iter().cloned()).collect(),
+			Data::ShaThree256(ref h) => once(37u8).chain(h.iter().cloned()).collect(),
+		}
+	}
+}
+impl codec::EncodeLike for Data {}
+
+impl Default for Data {
+	fn default() -> Self {
+		Self::None
+	}
+}
+
+/// An identifier for a single name registrar/identity verification service.
+pub type RegistrarIndex = u32;
+
+/// An attestation of a registrar over how accurate some `IdentityInfo` is in describing an account.
+///
+/// NOTE: Registrars may pay little attention to some fields. Registrars may want to make clear
+/// which fields their attestation is relevant for by off-chain means.
+#[derive(Copy, Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, MaxEncodedLen)]
+pub enum Judgement<
+	Balance: Encode + Decode + MaxEncodedLen + Copy + Clone + Debug + Eq + PartialEq
+> {
+	/// The default value; no opinion is held.
+	Unknown,
+	/// No judgement is yet in place, but a deposit is reserved as payment for providing one.
+	FeePaid(Balance),
+	/// The data appears to be reasonably acceptable in terms of its accuracy, however no in depth
+	/// checks (such as in-person meetings or formal KYC) have been conducted.
+	Reasonable,
+	/// The target is known directly by the registrar and the registrar can fully attest to the
+	/// the data's accuracy.
+	KnownGood,
+	/// The data was once good but is currently out of date. There is no malicious intent in the
+	/// inaccuracy. This judgement can be removed through updating the data.
+	OutOfDate,
+	/// The data is imprecise or of sufficiently low-quality to be problematic. It is not
+	/// indicative of malicious intent. This judgement can be removed through updating the data.
+	LowQuality,
+	/// The data is erroneous. This may be indicative of malicious intent. This cannot be removed
+	/// except by the registrar.
+	Erroneous,
+}
+
+impl<
+	Balance: Encode + Decode + MaxEncodedLen + Copy + Clone + Debug + Eq + PartialEq
+> Judgement<Balance> {
+	/// Returns `true` if this judgement is indicative of a deposit being currently held. This means
+	/// it should not be cleared or replaced except by an operation which utilizes the deposit.
+	pub(crate) fn has_deposit(&self) -> bool {
+		match self {
+			Judgement::FeePaid(_) => true,
+			_ => false,
+		}
+	}
+
+	/// Returns `true` if this judgement is one that should not be generally be replaced outside
+	/// of specialized handlers. Examples include "malicious" judgements and deposit-holding
+	/// judgements.
+	pub(crate) fn is_sticky(&self) -> bool {
+		match self {
+			Judgement::FeePaid(_) | Judgement::Erroneous => true,
+			_ => false,
+		}
+	}
+}
+
+/// The fields that we use to identify the owner of an account with. Each corresponds to a field
+/// in the `IdentityInfo` struct.
+#[repr(u64)]
+#[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, BitFlags, RuntimeDebug)]
+pub enum IdentityField {
+	Display        = 0b0000000000000000000000000000000000000000000000000000000000000001,
+	Legal          = 0b0000000000000000000000000000000000000000000000000000000000000010,
+	Web            = 0b0000000000000000000000000000000000000000000000000000000000000100,
+	Riot           = 0b0000000000000000000000000000000000000000000000000000000000001000,
+	Email          = 0b0000000000000000000000000000000000000000000000000000000000010000,
+	PgpFingerprint = 0b0000000000000000000000000000000000000000000000000000000000100000,
+	Image          = 0b0000000000000000000000000000000000000000000000000000000001000000,
+	Twitter        = 0b0000000000000000000000000000000000000000000000000000000010000000,
+}
+
+impl MaxEncodedLen for IdentityField {
+	fn max_encoded_len() -> usize {
+		u64::max_encoded_len()
+	}
+}
+
+/// Wrapper type for `BitFlags<IdentityField>` that implements `Codec`.
+#[derive(Clone, Copy, PartialEq, Default, RuntimeDebug)]
+pub struct IdentityFields(pub(crate) BitFlags<IdentityField>);
+
+impl MaxEncodedLen for IdentityFields {
+	fn max_encoded_len() -> usize {
+		IdentityField::max_encoded_len()
+	}
+}
+
+impl Eq for IdentityFields {}
+impl Encode for IdentityFields {
+	fn using_encoded<R, F: FnOnce(&[u8]) -> R>(&self, f: F) -> R {
+		self.0.bits().using_encoded(f)
+	}
+}
+impl Decode for IdentityFields {
+	fn decode<I: codec::Input>(input: &mut I) -> sp_std::result::Result<Self, codec::Error> {
+		let field = u64::decode(input)?;
+		Ok(Self(<BitFlags<IdentityField>>::from_bits(field as u64).map_err(|_| "invalid value")?))
+	}
+}
+
+/// Information concerning the identity of the controller of an account.
+///
+/// NOTE: This should be stored at the end of the storage item to facilitate the addition of extra
+/// fields in a backwards compatible way through a specialized `Decode` impl.
+#[derive(CloneNoBound, Encode, Decode, Eq, MaxEncodedLen, PartialEqNoBound, RuntimeDebugNoBound)]
+#[codec(mel_bound(FieldLimit: Get<u32>))]
+#[cfg_attr(test, derive(frame_support::DefaultNoBound))]
+pub struct IdentityInfo<FieldLimit: Get<u32>> {
+	/// Additional fields of the identity that are not catered for with the struct's explicit
+	/// fields.
+	pub additional: BoundedVec<(Data, Data), FieldLimit>,
+
+	/// A reasonable display name for the controller of the account. This should be whatever it is
+	/// that it is typically known as and should not be confusable with other entities, given
+	/// reasonable context.
+	///
+	/// Stored as UTF-8.
+	pub display: Data,
+
+	/// The full legal name in the local jurisdiction of the entity. This might be a bit
+	/// long-winded.
+	///
+	/// Stored as UTF-8.
+	pub legal: Data,
+
+	/// A representative website held by the controller of the account.
+	///
+	/// NOTE: `https://` is automatically prepended.
+	///
+	/// Stored as UTF-8.
+	pub web: Data,
+
+	/// The Riot/Matrix handle held by the controller of the account.
+	///
+	/// Stored as UTF-8.
+	pub riot: Data,
+
+	/// The email address of the controller of the account.
+	///
+	/// Stored as UTF-8.
+	pub email: Data,
+
+	/// The PGP/GPG public key of the controller of the account.
+	pub pgp_fingerprint: Option<[u8; 20]>,
+
+	/// A graphic image representing the controller of the account. Should be a company,
+	/// organization or project logo or a headshot in the case of a human.
+	pub image: Data,
+
+	/// The Twitter identity. The leading `@` character may be elided.
+	pub twitter: Data,
+}
+
+/// Information concerning the identity of the controller of an account.
+///
+/// NOTE: This is stored separately primarily to facilitate the addition of extra fields in a
+/// backwards compatible way through a specialized `Decode` impl.
+#[derive(CloneNoBound, Encode, Eq, MaxEncodedLen, PartialEqNoBound, RuntimeDebugNoBound)]
+#[codec(mel_bound(
+	Balance: Encode + Decode + MaxEncodedLen + Copy + Clone + Debug + Eq + PartialEq + Zero + Add,
+	MaxJudgements: Get<u32>,
+	MaxAdditionalFields: Get<u32>,
+))]
+pub struct Registration<
+	Balance: Encode + Decode + MaxEncodedLen + Copy + Clone + Debug + Eq + PartialEq,
+	MaxJudgements: Get<u32>,
+	MaxAdditionalFields: Get<u32>,
+> {
+	/// Judgements from the registrars on this identity. Stored ordered by `RegistrarIndex`. There
+	/// may be only a single judgement from each registrar.
+	pub judgements: BoundedVec<(RegistrarIndex, Judgement<Balance>), MaxJudgements>,
+
+	/// Amount held on deposit for this information.
+	pub deposit: Balance,
+
+	/// Information on the identity.
+	pub info: IdentityInfo<MaxAdditionalFields>,
+}
+
+impl <
+	Balance: Encode + Decode + MaxEncodedLen + Copy + Clone + Debug + Eq + PartialEq + Zero + Add,
+	MaxJudgements: Get<u32>,
+	MaxAdditionalFields: Get<u32>,
+> Registration<Balance, MaxJudgements, MaxAdditionalFields> {
+	pub(crate) fn total_deposit(&self) -> Balance {
+		self.deposit + self.judgements.iter()
+			.map(|(_, ref j)| if let Judgement::FeePaid(fee) = j { *fee } else { Zero::zero() })
+			.fold(Zero::zero(), |a, i| a + i)
+	}
+}
+
+impl<
+	Balance: Encode + Decode + MaxEncodedLen + Copy + Clone + Debug + Eq + PartialEq,
+	MaxJudgements: Get<u32>,
+	MaxAdditionalFields: Get<u32>,
+> Decode for Registration<Balance, MaxJudgements, MaxAdditionalFields> {
+	fn decode<I: codec::Input>(input: &mut I) -> sp_std::result::Result<Self, codec::Error> {
+		let (judgements, deposit, info) = Decode::decode(&mut AppendZerosInput::new(input))?;
+		Ok(Self { judgements, deposit, info })
+	}
+}
+
+/// Information concerning a registrar.
+#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, MaxEncodedLen)]
+pub struct RegistrarInfo<
+	Balance: Encode + Decode + Clone + Debug + Eq + PartialEq,
+	AccountId: Encode + Decode + Clone + Debug + Eq + PartialEq
+> {
+	/// The account of the registrar.
+	pub account: AccountId,
+
+	/// Amount required to be given to the registrar for them to provide judgement.
+	pub fee: Balance,
+
+	/// Relevant fields for this registrar. Registrar judgements are limited to attestations on
+	/// these fields.
+	pub fields: IdentityFields,
+}
diff --git a/frame/support/src/storage/bounded_vec.rs b/frame/support/src/storage/bounded_vec.rs
index 589fe0920744..b5b5252f9ec4 100644
--- a/frame/support/src/storage/bounded_vec.rs
+++ b/frame/support/src/storage/bounded_vec.rs
@@ -122,6 +122,14 @@ impl<T, S> BoundedVec<T, S> {
 	pub fn retain<F: FnMut(&T) -> bool>(&mut self, f: F) {
 		self.0.retain(f)
 	}
+
+	/// Exactly the same semantics as [`Vec::get_mut`].
+	pub fn get_mut<I: SliceIndex<[T]>>(
+		&mut self,
+		index: I,
+	) -> Option<&mut <I as SliceIndex<[T]>>::Output> {
+		self.0.get_mut(index)
+	}
 }
 
 impl<T, S: Get<u32>> From<BoundedVec<T, S>> for Vec<T> {
diff --git a/frame/support/src/storage/weak_bounded_vec.rs b/frame/support/src/storage/weak_bounded_vec.rs
index e5a4843000bb..a98d2182d091 100644
--- a/frame/support/src/storage/weak_bounded_vec.rs
+++ b/frame/support/src/storage/weak_bounded_vec.rs
@@ -89,6 +89,14 @@ impl<T, S> WeakBoundedVec<T, S> {
 	pub fn retain<F: FnMut(&T) -> bool>(&mut self, f: F) {
 		self.0.retain(f)
 	}
+
+	/// Exactly the same semantics as [`Vec::get_mut`].
+	pub fn get_mut<I: SliceIndex<[T]>>(
+		&mut self,
+		index: I,
+	) -> Option<&mut <I as SliceIndex<[T]>>::Output> {
+		self.0.get_mut(index)
+	}
 }
 
 impl<T, S: Get<u32>> WeakBoundedVec<T, S> {

From d3db3c1d1011983ba7565e342910a6d2095625c8 Mon Sep 17 00:00:00 2001
From: Seun Lanlege <seun@parity.io>
Date: Thu, 8 Jul 2021 14:33:34 +0100
Subject: [PATCH 0974/1194] sc-transcation-pool refactor  (#9228)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Use TransactionPool trait

* sc-transaction-pool-primitives

* sc-transaction-pool-api

* TP

* bye sc_transaction_graph

* fix line widths

* fix import errors

* fix import errors

* fix import errors 🤦🏾‍♂️

* fix import errors 🤦🏾‍♂️🤦🏾‍♂️🤦🏾‍♂️

* remove sp-keyring
---
 Cargo.lock                                    |  76 ++++-----
 Cargo.toml                                    |   2 +-
 bin/node-template/node/Cargo.toml             |   2 +-
 bin/node-template/node/src/rpc.rs             |   2 +-
 bin/node/bench/Cargo.toml                     |   2 +-
 bin/node/bench/src/construct.rs               |   8 +-
 bin/node/bench/src/txpool.rs                  |   2 +-
 bin/node/cli/Cargo.toml                       |   2 +-
 bin/node/cli/src/service.rs                   |   2 +-
 bin/node/rpc/Cargo.toml                       |   2 +-
 bin/node/rpc/src/lib.rs                       |   2 +-
 client/api/Cargo.toml                         |   2 +-
 client/api/src/client.rs                      |   5 +-
 client/api/src/execution_extensions.rs        |   7 +-
 client/basic-authorship/Cargo.toml            |   2 +-
 .../basic-authorship/src/basic_authorship.rs  |   4 +-
 client/consensus/manual-seal/Cargo.toml       |   2 +-
 client/consensus/manual-seal/src/lib.rs       |  35 ++---
 .../consensus/manual-seal/src/seal_block.rs   |  14 +-
 client/informant/Cargo.toml                   |   2 +-
 client/informant/src/lib.rs                   |   2 +-
 client/offchain/Cargo.toml                    |   2 +-
 client/offchain/src/lib.rs                    |   6 +-
 client/rpc-api/Cargo.toml                     |   2 +-
 client/rpc-api/src/author/error.rs            |   4 +-
 client/rpc-api/src/author/mod.rs              |   4 +-
 client/rpc/Cargo.toml                         |   2 +-
 client/rpc/src/author/mod.rs                  |   2 +-
 client/service/Cargo.toml                     |   1 +
 client/service/src/builder.rs                 |   2 +-
 client/service/src/lib.rs                     |  10 +-
 client/service/src/metrics.rs                 |   2 +-
 client/service/test/Cargo.toml                |   2 +-
 client/service/test/src/lib.rs                |   4 +-
 client/transaction-pool/Cargo.toml            |  17 +-
 client/transaction-pool/api/Cargo.toml        |  20 +++
 .../transaction-pool/api}/src/error.rs        |   0
 .../transaction-pool/api/src/lib.rs           |  11 +-
 .../{graph => }/benches/basics.rs             |  16 +-
 client/transaction-pool/graph/README.md       |   8 -
 client/transaction-pool/src/api.rs            |  30 ++--
 client/transaction-pool/src/error.rs          |   4 +-
 .../{graph/src => src/graph}/base_pool.rs     |   8 +-
 .../{graph/src => src/graph}/future.rs        |   2 +-
 .../{graph/src => src/graph}/listener.rs      |   2 +-
 .../{graph/src/lib.rs => src/graph/mod.rs}    |   5 +-
 .../{graph/src => src/graph}/pool.rs          |  13 +-
 .../{graph/src => src/graph}/ready.rs         |   7 +-
 .../{graph/src => src/graph}/rotator.rs       |   2 +-
 .../{graph/src => src/graph}/tracked_map.rs   |   0
 .../src => src/graph}/validated_pool.rs       |  20 +--
 .../{graph/src => src/graph}/watcher.rs       |   2 +-
 client/transaction-pool/src/lib.rs            |  72 +++++----
 client/transaction-pool/src/revalidation.rs   |  41 +----
 client/transaction-pool/src/testing/mod.rs    |  21 ---
 .../{src/testing => tests}/pool.rs            | 148 +++++++++---------
 client/transaction-pool/tests/revalidation.rs |  32 ++++
 primitives/transaction-pool/Cargo.toml        |  16 +-
 primitives/transaction-pool/src/lib.rs        |  13 +-
 .../runtime/transaction-pool/Cargo.toml       |   4 +-
 .../runtime/transaction-pool/src/lib.rs       |  16 +-
 test-utils/test-runner/Cargo.toml             |   2 +-
 test-utils/test-runner/src/node.rs            |   6 +-
 utils/frame/rpc/system/Cargo.toml             |   2 +-
 utils/frame/rpc/system/src/lib.rs             |   2 +-
 65 files changed, 379 insertions(+), 383 deletions(-)
 create mode 100644 client/transaction-pool/api/Cargo.toml
 rename {primitives/transaction-pool => client/transaction-pool/api}/src/error.rs (100%)
 rename primitives/transaction-pool/src/pool.rs => client/transaction-pool/api/src/lib.rs (98%)
 rename client/transaction-pool/{graph => }/benches/basics.rs (89%)
 delete mode 100644 client/transaction-pool/graph/README.md
 rename client/transaction-pool/{graph/src => src/graph}/base_pool.rs (99%)
 rename client/transaction-pool/{graph/src => src/graph}/future.rs (99%)
 rename client/transaction-pool/{graph/src => src/graph}/listener.rs (98%)
 rename client/transaction-pool/{graph/src/lib.rs => src/graph/mod.rs} (88%)
 rename client/transaction-pool/{graph/src => src/graph}/pool.rs (99%)
 rename client/transaction-pool/{graph/src => src/graph}/ready.rs (99%)
 rename client/transaction-pool/{graph/src => src/graph}/rotator.rs (99%)
 rename client/transaction-pool/{graph/src => src/graph}/tracked_map.rs (100%)
 rename client/transaction-pool/{graph/src => src/graph}/validated_pool.rs (97%)
 rename client/transaction-pool/{graph/src => src/graph}/watcher.rs (98%)
 delete mode 100644 client/transaction-pool/src/testing/mod.rs
 rename client/transaction-pool/{src/testing => tests}/pool.rs (88%)
 create mode 100644 client/transaction-pool/tests/revalidation.rs

diff --git a/Cargo.lock b/Cargo.lock
index fd6318ef84a5..c40c48a9b444 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4112,6 +4112,7 @@ dependencies = [
  "sc-cli",
  "sc-client-api",
  "sc-transaction-pool",
+ "sc-transaction-pool-api",
  "serde",
  "serde_json",
  "sp-consensus",
@@ -4121,7 +4122,6 @@ dependencies = [
  "sp-state-machine",
  "sp-timestamp",
  "sp-tracing",
- "sp-transaction-pool",
  "sp-trie",
  "structopt",
  "tempfile",
@@ -4200,6 +4200,7 @@ dependencies = [
  "sc-telemetry",
  "sc-tracing",
  "sc-transaction-pool",
+ "sc-transaction-pool-api",
  "serde",
  "serde_json",
  "soketto 0.4.2",
@@ -4215,7 +4216,6 @@ dependencies = [
  "sp-keystore",
  "sp-runtime",
  "sp-timestamp",
- "sp-transaction-pool",
  "sp-trie",
  "structopt",
  "substrate-browser-utils",
@@ -4313,6 +4313,7 @@ dependencies = [
  "sc-rpc",
  "sc-rpc-api",
  "sc-sync-state-rpc",
+ "sc-transaction-pool-api",
  "sp-api",
  "sp-block-builder",
  "sp-blockchain",
@@ -4320,7 +4321,6 @@ dependencies = [
  "sp-consensus-babe",
  "sp-keystore",
  "sp-runtime",
- "sp-transaction-pool",
  "substrate-frame-rpc-system",
 ]
 
@@ -4438,6 +4438,7 @@ dependencies = [
  "sc-service",
  "sc-telemetry",
  "sc-transaction-pool",
+ "sc-transaction-pool-api",
  "sp-api",
  "sp-block-builder",
  "sp-blockchain",
@@ -4448,7 +4449,6 @@ dependencies = [
  "sp-inherents",
  "sp-runtime",
  "sp-timestamp",
- "sp-transaction-pool",
  "structopt",
  "substrate-build-script-utils",
  "substrate-frame-rpc-system",
@@ -7037,13 +7037,13 @@ dependencies = [
  "sc-proposer-metrics",
  "sc-telemetry",
  "sc-transaction-pool",
+ "sc-transaction-pool-api",
  "sp-api",
  "sp-blockchain",
  "sp-consensus",
  "sp-core",
  "sp-inherents",
  "sp-runtime",
- "sp-transaction-pool",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
 ]
@@ -7147,6 +7147,7 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.11.1",
  "sc-executor",
+ "sc-transaction-pool-api",
  "sp-api",
  "sp-blockchain",
  "sp-consensus",
@@ -7160,7 +7161,6 @@ dependencies = [
  "sp-std",
  "sp-storage",
  "sp-test-primitives",
- "sp-transaction-pool",
  "sp-trie",
  "sp-utils",
  "sp-version",
@@ -7373,6 +7373,7 @@ dependencies = [
  "sc-consensus-babe",
  "sc-consensus-epochs",
  "sc-transaction-pool",
+ "sc-transaction-pool-api",
  "serde",
  "sp-api",
  "sp-blockchain",
@@ -7385,7 +7386,6 @@ dependencies = [
  "sp-keystore",
  "sp-runtime",
  "sp-timestamp",
- "sp-transaction-pool",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
  "substrate-test-runtime-transaction-pool",
@@ -7665,9 +7665,9 @@ dependencies = [
  "parity-util-mem",
  "sc-client-api",
  "sc-network",
+ "sc-transaction-pool-api",
  "sp-blockchain",
  "sp-runtime",
- "sp-transaction-pool",
  "wasm-timer",
 ]
 
@@ -7840,13 +7840,13 @@ dependencies = [
  "sc-keystore",
  "sc-network",
  "sc-transaction-pool",
+ "sc-transaction-pool-api",
  "sp-api",
  "sp-consensus",
  "sp-core",
  "sp-offchain",
  "sp-runtime",
  "sp-tracing",
- "sp-transaction-pool",
  "sp-utils",
  "substrate-test-runtime-client",
  "threadpool",
@@ -7898,6 +7898,7 @@ dependencies = [
  "sc-rpc-api",
  "sc-tracing",
  "sc-transaction-pool",
+ "sc-transaction-pool-api",
  "serde_json",
  "sp-api",
  "sp-blockchain",
@@ -7910,7 +7911,6 @@ dependencies = [
  "sp-session",
  "sp-state-machine",
  "sp-tracing",
- "sp-transaction-pool",
  "sp-utils",
  "sp-version",
  "substrate-test-runtime-client",
@@ -7931,13 +7931,13 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.11.1",
  "sc-chain-spec",
+ "sc-transaction-pool-api",
  "serde",
  "serde_json",
  "sp-core",
  "sp-rpc",
  "sp-runtime",
  "sp-tracing",
- "sp-transaction-pool",
  "sp-version",
 ]
 
@@ -8008,6 +8008,7 @@ dependencies = [
  "sc-telemetry",
  "sc-tracing",
  "sc-transaction-pool",
+ "sc-transaction-pool-api",
  "serde",
  "serde_json",
  "sp-api",
@@ -8061,6 +8062,7 @@ dependencies = [
  "sc-light",
  "sc-network",
  "sc-service",
+ "sc-transaction-pool-api",
  "sp-api",
  "sp-blockchain",
  "sp-consensus",
@@ -8071,7 +8073,6 @@ dependencies = [
  "sp-state-machine",
  "sp-storage",
  "sp-tracing",
- "sp-transaction-pool",
  "sp-trie",
  "substrate-test-runtime",
  "substrate-test-runtime-client",
@@ -8178,59 +8179,53 @@ dependencies = [
 ]
 
 [[package]]
-name = "sc-transaction-graph"
+name = "sc-transaction-pool"
 version = "3.0.0"
 dependencies = [
  "assert_matches",
  "criterion",
  "derive_more",
  "futures 0.3.15",
+ "hex",
+ "intervalier",
  "linked-hash-map",
  "log",
  "parity-scale-codec",
  "parity-util-mem",
  "parking_lot 0.11.1",
  "retain_mut",
+ "sc-block-builder",
+ "sc-client-api",
+ "sc-transaction-pool-api",
  "serde",
+ "sp-api",
  "sp-blockchain",
+ "sp-consensus",
  "sp-core",
  "sp-runtime",
+ "sp-tracing",
  "sp-transaction-pool",
  "sp-utils",
+ "substrate-prometheus-endpoint",
  "substrate-test-runtime",
+ "substrate-test-runtime-client",
+ "substrate-test-runtime-transaction-pool",
  "thiserror",
  "wasm-timer",
 ]
 
 [[package]]
-name = "sc-transaction-pool"
+name = "sc-transaction-pool-api"
 version = "3.0.0"
 dependencies = [
- "assert_matches",
+ "derive_more",
  "futures 0.3.15",
- "hex",
- "intervalier",
  "log",
  "parity-scale-codec",
- "parity-util-mem",
- "parking_lot 0.11.1",
- "sc-block-builder",
- "sc-client-api",
- "sc-transaction-graph",
- "sp-api",
+ "serde",
  "sp-blockchain",
- "sp-consensus",
- "sp-core",
- "sp-keyring",
  "sp-runtime",
- "sp-tracing",
- "sp-transaction-pool",
- "sp-utils",
- "substrate-prometheus-endpoint",
- "substrate-test-runtime-client",
- "substrate-test-runtime-transaction-pool",
  "thiserror",
- "wasm-timer",
 ]
 
 [[package]]
@@ -9368,15 +9363,8 @@ dependencies = [
 name = "sp-transaction-pool"
 version = "3.0.0"
 dependencies = [
- "derive_more",
- "futures 0.3.15",
- "log",
- "parity-scale-codec",
- "serde",
  "sp-api",
- "sp-blockchain",
  "sp-runtime",
- "thiserror",
 ]
 
 [[package]]
@@ -9654,6 +9642,7 @@ dependencies = [
  "sc-client-api",
  "sc-rpc-api",
  "sc-transaction-pool",
+ "sc-transaction-pool-api",
  "serde",
  "sp-api",
  "sp-block-builder",
@@ -9661,7 +9650,6 @@ dependencies = [
  "sp-core",
  "sp-runtime",
  "sp-tracing",
- "sp-transaction-pool",
  "substrate-test-runtime-client",
 ]
 
@@ -9778,10 +9766,10 @@ dependencies = [
  "futures 0.3.15",
  "parity-scale-codec",
  "parking_lot 0.11.1",
- "sc-transaction-graph",
+ "sc-transaction-pool",
+ "sc-transaction-pool-api",
  "sp-blockchain",
  "sp-runtime",
- "sp-transaction-pool",
  "substrate-test-runtime-client",
 ]
 
@@ -9924,8 +9912,8 @@ dependencies = [
  "sc-rpc",
  "sc-rpc-server",
  "sc-service",
- "sc-transaction-graph",
  "sc-transaction-pool",
+ "sc-transaction-pool-api",
  "sp-api",
  "sp-block-builder",
  "sp-blockchain",
diff --git a/Cargo.toml b/Cargo.toml
index 599130c52ae3..03115fe5593f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -62,7 +62,7 @@ members = [
 	"client/tracing",
 	"client/tracing/proc-macro",
 	"client/transaction-pool",
-	"client/transaction-pool/graph",
+	"client/transaction-pool/api",
 	"frame/assets",
 	"frame/atomic-swap",
 	"frame/aura",
diff --git a/bin/node-template/node/Cargo.toml b/bin/node-template/node/Cargo.toml
index d45241362fd2..88657934b1d0 100644
--- a/bin/node-template/node/Cargo.toml
+++ b/bin/node-template/node/Cargo.toml
@@ -26,7 +26,7 @@ sc-telemetry = { version = "3.0.0", path = "../../../client/telemetry" }
 sc-keystore = { version = "3.0.0", path = "../../../client/keystore" }
 sp-inherents = { version = "3.0.0", path = "../../../primitives/inherents" }
 sc-transaction-pool = { version = "3.0.0", path = "../../../client/transaction-pool" }
-sp-transaction-pool = { version = "3.0.0", path = "../../../primitives/transaction-pool" }
+sc-transaction-pool-api = { version = "3.0.0", path = "../../../client/transaction-pool/api" }
 sc-consensus-aura = { version = "0.9.0", path = "../../../client/consensus/aura" }
 sp-consensus-aura = { version = "0.9.0", path = "../../../primitives/consensus/aura" }
 sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
diff --git a/bin/node-template/node/src/rpc.rs b/bin/node-template/node/src/rpc.rs
index c1f0e0a8457b..a03d1aad2a88 100644
--- a/bin/node-template/node/src/rpc.rs
+++ b/bin/node-template/node/src/rpc.rs
@@ -12,7 +12,7 @@ use sp_api::ProvideRuntimeApi;
 use sp_blockchain::{Error as BlockChainError, HeaderMetadata, HeaderBackend};
 use sp_block_builder::BlockBuilder;
 pub use sc_rpc_api::DenyUnsafe;
-use sp_transaction_pool::TransactionPool;
+use sc_transaction_pool_api::TransactionPool;
 
 
 /// Full client dependencies.
diff --git a/bin/node/bench/Cargo.toml b/bin/node/bench/Cargo.toml
index 65c6a562b18b..523353c95ea6 100644
--- a/bin/node/bench/Cargo.toml
+++ b/bin/node/bench/Cargo.toml
@@ -26,7 +26,6 @@ kvdb-rocksdb = "0.12.0"
 sp-trie = { version = "3.0.0", path = "../../../primitives/trie" }
 sp-core = { version = "3.0.0", path = "../../../primitives/core" }
 sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
-sp-transaction-pool = { version = "3.0.0", path = "../../../primitives/transaction-pool" }
 sc-basic-authorship = { version = "0.9.0", path = "../../../client/basic-authorship" }
 sp-inherents = { version = "3.0.0", path = "../../../primitives/inherents" }
 sp-timestamp = { version = "3.0.0", default-features = false, path = "../../../primitives/timestamp" }
@@ -40,4 +39,5 @@ lazy_static = "1.4.0"
 parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
 parity-db = { version = "0.2.4" }
 sc-transaction-pool = { version = "3.0.0", path = "../../../client/transaction-pool" }
+sc-transaction-pool-api = { version = "3.0.0", path = "../../../client/transaction-pool/api" }
 futures = { version = "0.3.4", features = ["thread-pool"] }
diff --git a/bin/node/bench/src/construct.rs b/bin/node/bench/src/construct.rs
index 3dce8966f7a1..491b261518a4 100644
--- a/bin/node/bench/src/construct.rs
+++ b/bin/node/bench/src/construct.rs
@@ -39,7 +39,7 @@ use sp_runtime::{
 	traits::NumberFor,
 	OpaqueExtrinsic,
 };
-use sp_transaction_pool::{
+use sc_transaction_pool_api::{
 	ImportNotificationStream,
 	PoolFuture,
 	PoolStatus,
@@ -198,7 +198,7 @@ impl From<OpaqueExtrinsic> for PoolTransaction {
 	}
 }
 
-impl sp_transaction_pool::InPoolTransaction for PoolTransaction {
+impl sc_transaction_pool_api::InPoolTransaction for PoolTransaction {
 	type Transaction = OpaqueExtrinsic;
 	type Hash = node_primitives::Hash;
 
@@ -224,11 +224,11 @@ impl sp_transaction_pool::InPoolTransaction for PoolTransaction {
 #[derive(Clone, Debug)]
 pub struct Transactions(Vec<Arc<PoolTransaction>>);
 
-impl sp_transaction_pool::TransactionPool for Transactions {
+impl sc_transaction_pool_api::TransactionPool for Transactions {
 	type Block = Block;
 	type Hash = node_primitives::Hash;
 	type InPoolTransaction = PoolTransaction;
-	type Error = sp_transaction_pool::error::Error;
+	type Error = sc_transaction_pool_api::error::Error;
 
 	/// Returns a future that imports a bunch of unverified transactions to the pool.
 	fn submit_at(
diff --git a/bin/node/bench/src/txpool.rs b/bin/node/bench/src/txpool.rs
index b3646a92e032..ef1c816109c8 100644
--- a/bin/node/bench/src/txpool.rs
+++ b/bin/node/bench/src/txpool.rs
@@ -27,7 +27,7 @@ use node_testing::bench::{BenchDb, Profile, BlockType, KeyTypes, DatabaseType};
 
 use sc_transaction_pool::BasicPool;
 use sp_runtime::generic::BlockId;
-use sp_transaction_pool::{TransactionPool, TransactionSource};
+use sc_transaction_pool_api::{TransactionPool, TransactionSource};
 
 use crate::core::{self, Path, Mode};
 
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index 9fcd0875e8dc..c8d7d4728b03 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -56,13 +56,13 @@ sp-keyring = { version = "3.0.0", path = "../../../primitives/keyring" }
 sp-keystore = { version = "0.9.0", path = "../../../primitives/keystore" }
 sp-io = { version = "3.0.0", path = "../../../primitives/io" }
 sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
-sp-transaction-pool = { version = "3.0.0", path = "../../../primitives/transaction-pool" }
 
 # client dependencies
 sc-client-api = { version = "3.0.0", path = "../../../client/api" }
 sc-chain-spec = { version = "3.0.0", path = "../../../client/chain-spec" }
 sc-consensus = { version = "0.9.0", path = "../../../client/consensus/common" }
 sc-transaction-pool = { version = "3.0.0", path = "../../../client/transaction-pool" }
+sc-transaction-pool-api = { version = "3.0.0", path = "../../../client/transaction-pool/api" }
 sc-network = { version = "0.9.0", path = "../../../client/network" }
 sc-consensus-slots = { version = "0.9.0", path = "../../../client/consensus/slots" }
 sc-consensus-babe = { version = "0.9.0", path = "../../../client/consensus/babe" }
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index 8fa3d2ed77ce..4886b798b050 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -628,7 +628,7 @@ mod tests {
 	use sc_service_test::TestNetNode;
 	use crate::service::{new_full_base, new_light_base, NewFullBase};
 	use sp_runtime::{key_types::BABE, traits::IdentifyAccount, RuntimeAppPublic};
-	use sp_transaction_pool::{MaintainedTransactionPool, ChainEvent};
+	use sc_transaction_pool_api::{MaintainedTransactionPool, ChainEvent};
 	use sc_client_api::BlockBackend;
 	use sc_keystore::LocalKeystore;
 	use sp_inherents::InherentDataProvider;
diff --git a/bin/node/rpc/Cargo.toml b/bin/node/rpc/Cargo.toml
index fc1701d1856f..1c9f33d7c227 100644
--- a/bin/node/rpc/Cargo.toml
+++ b/bin/node/rpc/Cargo.toml
@@ -34,5 +34,5 @@ sp-keystore = { version = "0.9.0", path = "../../../primitives/keystore" }
 sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
 sp-consensus-babe = { version = "0.9.0", path = "../../../primitives/consensus/babe" }
 sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
-sp-transaction-pool = { version = "3.0.0", path = "../../../primitives/transaction-pool" }
+sc-transaction-pool-api = { version = "3.0.0", path = "../../../client/transaction-pool/api" }
 substrate-frame-rpc-system = { version = "3.0.0", path = "../../../utils/frame/rpc/system" }
diff --git a/bin/node/rpc/src/lib.rs b/bin/node/rpc/src/lib.rs
index 885ecdd42f11..ba17bf7d2c50 100644
--- a/bin/node/rpc/src/lib.rs
+++ b/bin/node/rpc/src/lib.rs
@@ -48,7 +48,7 @@ use sp_blockchain::{Error as BlockChainError, HeaderMetadata, HeaderBackend};
 use sp_consensus::SelectChain;
 use sp_consensus_babe::BabeApi;
 use sc_rpc::SubscriptionTaskExecutor;
-use sp_transaction_pool::TransactionPool;
+use sc_transaction_pool_api::TransactionPool;
 use sc_client_api::AuxStore;
 
 /// Light client extra dependencies.
diff --git a/client/api/Cargo.toml b/client/api/Cargo.toml
index 65a48954c490..044ef78a07fb 100644
--- a/client/api/Cargo.toml
+++ b/client/api/Cargo.toml
@@ -39,7 +39,7 @@ sp-runtime = { version = "3.0.0", default-features = false, path = "../../primit
 sp-state-machine = { version = "0.9.0", path = "../../primitives/state-machine" }
 sp-trie = { version = "3.0.0", path = "../../primitives/trie" }
 sp-storage = { version = "3.0.0", path = "../../primitives/storage" }
-sp-transaction-pool = { version = "3.0.0", path = "../../primitives/transaction-pool" }
+sc-transaction-pool-api = { version = "3.0.0", path = "../transaction-pool/api" }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.9.0", path = "../../utils/prometheus" }
 
 [dev-dependencies]
diff --git a/client/api/src/client.rs b/client/api/src/client.rs
index 79fb4f884431..3f4dfc8f35be 100644
--- a/client/api/src/client.rs
+++ b/client/api/src/client.rs
@@ -31,6 +31,7 @@ use crate::blockchain::Info;
 use crate::notifications::StorageEventStream;
 use sp_utils::mpsc::TracingUnboundedReceiver;
 use sp_blockchain;
+use sc_transaction_pool_api::ChainEvent;
 
 /// Type that implements `futures::Stream` of block import events.
 pub type ImportNotifications<Block> = TracingUnboundedReceiver<BlockImportNotification<Block>>;
@@ -278,7 +279,7 @@ pub struct FinalityNotification<Block: BlockT> {
 	pub header: Block::Header,
 }
 
-impl<B: BlockT> TryFrom<BlockImportNotification<B>> for sp_transaction_pool::ChainEvent<B> {
+impl<B: BlockT> TryFrom<BlockImportNotification<B>> for ChainEvent<B> {
 	type Error = ();
 
 	fn try_from(n: BlockImportNotification<B>) -> Result<Self, ()> {
@@ -293,7 +294,7 @@ impl<B: BlockT> TryFrom<BlockImportNotification<B>> for sp_transaction_pool::Cha
 	}
 }
 
-impl<B: BlockT> From<FinalityNotification<B>> for sp_transaction_pool::ChainEvent<B> {
+impl<B: BlockT> From<FinalityNotification<B>> for ChainEvent<B> {
 	fn from(n: FinalityNotification<B>) -> Self {
 		Self::Finalized {
 			hash: n.hash,
diff --git a/client/api/src/execution_extensions.rs b/client/api/src/execution_extensions.rs
index e6a7fb306e77..fbde16afc795 100644
--- a/client/api/src/execution_extensions.rs
+++ b/client/api/src/execution_extensions.rs
@@ -37,6 +37,7 @@ use sp_state_machine::{ExecutionManager, DefaultHandler};
 pub use sp_state_machine::ExecutionStrategy;
 use sp_externalities::Extensions;
 use parking_lot::RwLock;
+use sc_transaction_pool_api::OffchainSubmitTransaction;
 
 /// Execution strategies settings.
 #[derive(Debug, Clone)]
@@ -104,7 +105,7 @@ pub struct ExecutionExtensions<Block: traits::Block> {
 	// extension to be a `Weak` reference.
 	// That's also the reason why it's being registered lazily instead of
 	// during initialization.
-	transaction_pool: RwLock<Option<Weak<dyn sp_transaction_pool::OffchainSubmitTransaction<Block>>>>,
+	transaction_pool: RwLock<Option<Weak<dyn OffchainSubmitTransaction<Block>>>>,
 	extensions_factory: RwLock<Box<dyn ExtensionsFactory>>,
 }
 
@@ -150,7 +151,7 @@ impl<Block: traits::Block> ExecutionExtensions<Block> {
 
 	/// Register transaction pool extension.
 	pub fn register_transaction_pool<T>(&self, pool: &Arc<T>)
-		where T: sp_transaction_pool::OffchainSubmitTransaction<Block> + 'static
+		where T: OffchainSubmitTransaction<Block> + 'static
 	{
 		*self.transaction_pool.write() = Some(Arc::downgrade(&pool) as _);
 	}
@@ -235,7 +236,7 @@ impl<Block: traits::Block> ExecutionExtensions<Block> {
 /// A wrapper type to pass `BlockId` to the actual transaction pool.
 struct TransactionPoolAdapter<Block: traits::Block> {
 	at: BlockId<Block>,
-	pool: Arc<dyn sp_transaction_pool::OffchainSubmitTransaction<Block>>,
+	pool: Arc<dyn OffchainSubmitTransaction<Block>>,
 }
 
 impl<Block: traits::Block> offchain::TransactionPool for TransactionPoolAdapter<Block> {
diff --git a/client/basic-authorship/Cargo.toml b/client/basic-authorship/Cargo.toml
index 2047c85b0c87..47dc04a37868 100644
--- a/client/basic-authorship/Cargo.toml
+++ b/client/basic-authorship/Cargo.toml
@@ -26,7 +26,7 @@ sc-client-api = { version = "3.0.0", path = "../api" }
 sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
 sp-inherents = { version = "3.0.0", path = "../../primitives/inherents" }
 sc-telemetry = { version = "3.0.0", path = "../telemetry" }
-sp-transaction-pool = { version = "3.0.0", path = "../../primitives/transaction-pool" }
+sc-transaction-pool-api = { version = "3.0.0", path = "../../client/transaction-pool/api" }
 sc-block-builder = { version = "0.9.0", path = "../block-builder" }
 sc-proposer-metrics = { version = "0.9.0", path = "../proposer-metrics" }
 
diff --git a/client/basic-authorship/src/basic_authorship.rs b/client/basic-authorship/src/basic_authorship.rs
index 36e649fb8ed5..590f4275bf76 100644
--- a/client/basic-authorship/src/basic_authorship.rs
+++ b/client/basic-authorship/src/basic_authorship.rs
@@ -31,7 +31,7 @@ use sp_runtime::{
 	generic::BlockId,
 	traits::{Block as BlockT, Hash as HashT, Header as HeaderT, DigestFor, BlakeTwo256},
 };
-use sp_transaction_pool::{TransactionPool, InPoolTransaction};
+use sc_transaction_pool_api::{TransactionPool, InPoolTransaction};
 use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_INFO};
 use sc_block_builder::{BlockBuilderApi, BlockBuilderProvider};
 use sp_api::{ProvideRuntimeApi, ApiExt};
@@ -472,7 +472,7 @@ mod tests {
 	use substrate_test_runtime_client::{
 		prelude::*, TestClientBuilder, runtime::{Extrinsic, Transfer}, TestClientBuilderExt,
 	};
-	use sp_transaction_pool::{ChainEvent, MaintainedTransactionPool, TransactionSource};
+	use sc_transaction_pool_api::{ChainEvent, MaintainedTransactionPool, TransactionSource};
 	use sc_transaction_pool::BasicPool;
 	use sp_api::Core;
 	use sp_blockchain::HeaderBackend;
diff --git a/client/consensus/manual-seal/Cargo.toml b/client/consensus/manual-seal/Cargo.toml
index 32cc89034fb1..f7c2e98656c1 100644
--- a/client/consensus/manual-seal/Cargo.toml
+++ b/client/consensus/manual-seal/Cargo.toml
@@ -40,7 +40,7 @@ sp-core = {  path = "../../../primitives/core", version = "3.0.0"}
 sp-keystore = {  path = "../../../primitives/keystore", version = "0.9.0"}
 sp-keyring = {  path = "../../../primitives/keyring", version = "3.0.0"}
 sp-api = {  path = "../../../primitives/api", version = "3.0.0"}
-sp-transaction-pool = { path = "../../../primitives/transaction-pool", version = "3.0.0"}
+sc-transaction-pool-api = { path = "../../../client/transaction-pool/api", version = "3.0.0"}
 sp-timestamp = { path = "../../../primitives/timestamp", version = "3.0.0"}
 
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0"}
diff --git a/client/consensus/manual-seal/src/lib.rs b/client/consensus/manual-seal/src/lib.rs
index 1e8c69a752ca..5d93f6724ee9 100644
--- a/client/consensus/manual-seal/src/lib.rs
+++ b/client/consensus/manual-seal/src/lib.rs
@@ -29,7 +29,6 @@ use sp_blockchain::HeaderBackend;
 use sp_inherents::CreateInherentDataProviders;
 use sp_runtime::{traits::Block as BlockT, Justifications, ConsensusEngineId};
 use sc_client_api::backend::{Backend as ClientBackend, Finalizer};
-use sc_transaction_pool::{ChainApi, Pool};
 use std::{sync::Arc, marker::PhantomData};
 use prometheus_endpoint::Registry;
 
@@ -48,6 +47,7 @@ pub use self::{
 	rpc::{EngineCommand, CreatedBlock},
 };
 use sp_api::{ProvideRuntimeApi, TransactionFor};
+use sc_transaction_pool_api::TransactionPool;
 
 /// The `ConsensusEngineId` of Manual Seal.
 pub const MANUAL_SEAL_ENGINE_ID: ConsensusEngineId = [b'm', b'a', b'n', b'l'];
@@ -94,7 +94,7 @@ pub fn import_queue<Block, Transaction>(
 }
 
 /// Params required to start the instant sealing authorship task.
-pub struct ManualSealParams<B: BlockT, BI, E, C: ProvideRuntimeApi<B>, A: ChainApi, SC, CS, CIDP> {
+pub struct ManualSealParams<B: BlockT, BI, E, C: ProvideRuntimeApi<B>, TP, SC, CS, CIDP> {
 	/// Block import instance for well. importing blocks.
 	pub block_import: BI,
 
@@ -105,7 +105,7 @@ pub struct ManualSealParams<B: BlockT, BI, E, C: ProvideRuntimeApi<B>, A: ChainA
 	pub client: Arc<C>,
 
 	/// Shared reference to the transaction pool.
-	pub pool: Arc<Pool<A>>,
+	pub pool: Arc<TP>,
 
 	/// Stream<Item = EngineCommands>, Basically the receiving end of a channel for sending commands to
 	/// the authorship task.
@@ -122,7 +122,7 @@ pub struct ManualSealParams<B: BlockT, BI, E, C: ProvideRuntimeApi<B>, A: ChainA
 }
 
 /// Params required to start the manual sealing authorship task.
-pub struct InstantSealParams<B: BlockT, BI, E, C: ProvideRuntimeApi<B>, A: ChainApi, SC, CIDP> {
+pub struct InstantSealParams<B: BlockT, BI, E, C: ProvideRuntimeApi<B>, TP, SC, CIDP> {
 	/// Block import instance for well. importing blocks.
 	pub block_import: BI,
 
@@ -133,7 +133,7 @@ pub struct InstantSealParams<B: BlockT, BI, E, C: ProvideRuntimeApi<B>, A: Chain
 	pub client: Arc<C>,
 
 	/// Shared reference to the transaction pool.
-	pub pool: Arc<Pool<A>>,
+	pub pool: Arc<TP>,
 
 	/// SelectChain strategy.
 	pub select_chain: SC,
@@ -146,7 +146,7 @@ pub struct InstantSealParams<B: BlockT, BI, E, C: ProvideRuntimeApi<B>, A: Chain
 }
 
 /// Creates the background authorship task for the manual seal engine.
-pub async fn run_manual_seal<B, BI, CB, E, C, A, SC, CS, CIDP>(
+pub async fn run_manual_seal<B, BI, CB, E, C, TP, SC, CS, CIDP>(
 	ManualSealParams {
 		mut block_import,
 		mut env,
@@ -156,10 +156,9 @@ pub async fn run_manual_seal<B, BI, CB, E, C, A, SC, CS, CIDP>(
 		select_chain,
 		consensus_data_provider,
 		create_inherent_data_providers,
-	}: ManualSealParams<B, BI, E, C, A, SC, CS, CIDP>
+	}: ManualSealParams<B, BI, E, C, TP, SC, CS, CIDP>
 )
 	where
-		A: ChainApi<Block=B> + 'static,
 		B: BlockT + 'static,
 		BI: BlockImport<B, Error = sp_consensus::Error, Transaction = sp_api::TransactionFor<C, B>>
 			+ Send + Sync + 'static,
@@ -170,6 +169,7 @@ pub async fn run_manual_seal<B, BI, CB, E, C, A, SC, CS, CIDP>(
 		CS: Stream<Item=EngineCommand<<B as BlockT>::Hash>> + Unpin + 'static,
 		SC: SelectChain<B> + 'static,
 		TransactionFor<C, B>: 'static,
+		TP: TransactionPool<Block = B>,
 		CIDP: CreateInherentDataProviders<B, ()>,
 {
 	while let Some(command) = commands_stream.next().await {
@@ -215,7 +215,7 @@ pub async fn run_manual_seal<B, BI, CB, E, C, A, SC, CS, CIDP>(
 /// runs the background authorship task for the instant seal engine.
 /// instant-seal creates a new block for every transaction imported into
 /// the transaction pool.
-pub async fn run_instant_seal<B, BI, CB, E, C, A, SC, CIDP>(
+pub async fn run_instant_seal<B, BI, CB, E, C, TP, SC, CIDP>(
 	InstantSealParams {
 		block_import,
 		env,
@@ -224,10 +224,9 @@ pub async fn run_instant_seal<B, BI, CB, E, C, A, SC, CIDP>(
 		select_chain,
 		consensus_data_provider,
 		create_inherent_data_providers,
-	}: InstantSealParams<B, BI, E, C, A, SC, CIDP>
+	}: InstantSealParams<B, BI, E, C, TP, SC, CIDP>
 )
 	where
-		A: ChainApi<Block=B> + 'static,
 		B: BlockT + 'static,
 		BI: BlockImport<B, Error = sp_consensus::Error, Transaction = sp_api::TransactionFor<C, B>>
 			+ Send + Sync + 'static,
@@ -237,12 +236,12 @@ pub async fn run_instant_seal<B, BI, CB, E, C, A, SC, CIDP>(
 		E::Proposer: Proposer<B, Transaction = TransactionFor<C, B>>,
 		SC: SelectChain<B> + 'static,
 		TransactionFor<C, B>: 'static,
+		TP: TransactionPool<Block = B>,
 		CIDP: CreateInherentDataProviders<B, ()>,
 {
 	// instant-seal creates blocks as soon as transactions are imported
 	// into the transaction pool.
-	let commands_stream = pool.validated_pool()
-		.import_notification_stream()
+	let commands_stream = pool.import_notification_stream()
 		.map(|_| {
 			EngineCommand::SealNewBlock {
 				create_empty: false,
@@ -277,7 +276,7 @@ mod tests {
 	};
 	use sc_transaction_pool::{BasicPool, RevalidationType, Options};
 	use substrate_test_runtime_transaction_pool::{TestApi, uxt};
-	use sp_transaction_pool::{TransactionPool, MaintainedTransactionPool, TransactionSource};
+	use sc_transaction_pool_api::{TransactionPool, MaintainedTransactionPool, TransactionSource};
 	use sp_runtime::generic::BlockId;
 	use sp_consensus::ImportedAux;
 	use sc_basic_authorship::ProposerFactory;
@@ -331,7 +330,7 @@ mod tests {
 				block_import: client.clone(),
 				env,
 				client: client.clone(),
-				pool: pool.pool().clone(),
+				pool: pool.clone(),
 				commands_stream,
 				select_chain,
 				create_inherent_data_providers: |_, _| async { Ok(()) },
@@ -395,7 +394,7 @@ mod tests {
 				block_import: client.clone(),
 				env,
 				client: client.clone(),
-				pool: pool.pool().clone(),
+				pool: pool.clone(),
 				commands_stream,
 				select_chain,
 				consensus_data_provider: None,
@@ -476,7 +475,7 @@ mod tests {
 				block_import: client.clone(),
 				env,
 				client: client.clone(),
-				pool: pool.pool().clone(),
+				pool: pool.clone(),
 				commands_stream,
 				select_chain,
 				consensus_data_provider: None,
@@ -522,7 +521,7 @@ mod tests {
 		assert!(pool.submit_one(&BlockId::Number(1), SOURCE, uxt(Alice, 1)).await.is_ok());
 
 		let header = client.header(&BlockId::Number(1)).expect("db error").expect("imported above");
-		pool.maintain(sp_transaction_pool::ChainEvent::NewBestBlock {
+		pool.maintain(sc_transaction_pool_api::ChainEvent::NewBestBlock {
 			hash: header.hash(),
 			tree_route: None,
 		}).await;
diff --git a/client/consensus/manual-seal/src/seal_block.rs b/client/consensus/manual-seal/src/seal_block.rs
index ca35bdecb44e..450a7bff4cd4 100644
--- a/client/consensus/manual-seal/src/seal_block.rs
+++ b/client/consensus/manual-seal/src/seal_block.rs
@@ -25,7 +25,6 @@ use sp_runtime::{
 	generic::BlockId,
 };
 use futures::prelude::*;
-use sc_transaction_pool::{ChainApi, Pool};
 use sp_consensus::{
 	self, BlockImport, Environment, Proposer, ForkChoiceStrategy,
 	BlockImportParams, BlockOrigin, ImportResult, SelectChain, StateAction,
@@ -35,12 +34,13 @@ use std::collections::HashMap;
 use std::time::Duration;
 use sp_inherents::{CreateInherentDataProviders, InherentDataProvider};
 use sp_api::{ProvideRuntimeApi, TransactionFor};
+use sc_transaction_pool_api::TransactionPool;
 
 /// max duration for creating a proposal in secs
 pub const MAX_PROPOSAL_DURATION: u64 = 10;
 
 /// params for sealing a new block
-pub struct SealBlockParams<'a, B: BlockT, BI, SC, C: ProvideRuntimeApi<B>, E, P: ChainApi, CIDP> {
+pub struct SealBlockParams<'a, B: BlockT, BI, SC, C: ProvideRuntimeApi<B>, E, TP, CIDP> {
 	/// if true, empty blocks(without extrinsics) will be created.
 	/// otherwise, will return Error::EmptyTransactionPool.
 	pub create_empty: bool,
@@ -51,7 +51,7 @@ pub struct SealBlockParams<'a, B: BlockT, BI, SC, C: ProvideRuntimeApi<B>, E, P:
 	/// sender to report errors/success to the rpc.
 	pub sender: rpc::Sender<CreatedBlock<<B as BlockT>::Hash>>,
 	/// transaction pool
-	pub pool: Arc<Pool<P>>,
+	pub pool: Arc<TP>,
 	/// header backend
 	pub client: Arc<C>,
 	/// Environment trait object for creating a proposer
@@ -67,7 +67,7 @@ pub struct SealBlockParams<'a, B: BlockT, BI, SC, C: ProvideRuntimeApi<B>, E, P:
 }
 
 /// seals a new block with the given params
-pub async fn seal_block<B, BI, SC, C, E, P, CIDP>(
+pub async fn seal_block<B, BI, SC, C, E, TP, CIDP>(
 	SealBlockParams {
 		create_empty,
 		finalize,
@@ -80,7 +80,7 @@ pub async fn seal_block<B, BI, SC, C, E, P, CIDP>(
 		create_inherent_data_providers,
 		consensus_data_provider: digest_provider,
 		mut sender,
-	}: SealBlockParams<'_, B, BI, SC, C, E, P, CIDP>,
+	}: SealBlockParams<'_, B, BI, SC, C, E, TP, CIDP>,
 ) where
 	B: BlockT,
 	BI: BlockImport<B, Error = sp_consensus::Error, Transaction = sp_api::TransactionFor<C, B>>
@@ -90,13 +90,13 @@ pub async fn seal_block<B, BI, SC, C, E, P, CIDP>(
 	C: HeaderBackend<B> + ProvideRuntimeApi<B>,
 	E: Environment<B>,
 	E::Proposer: Proposer<B, Transaction = TransactionFor<C, B>>,
-	P: ChainApi<Block = B>,
+	TP: TransactionPool<Block = B>,
 	SC: SelectChain<B>,
 	TransactionFor<C, B>: 'static,
 	CIDP: CreateInherentDataProviders<B, ()>,
 {
 	let future = async {
-		if pool.validated_pool().status().ready == 0 && !create_empty {
+		if pool.status().ready == 0 && !create_empty {
 			return Err(Error::EmptyTransactionPool);
 		}
 
diff --git a/client/informant/Cargo.toml b/client/informant/Cargo.toml
index 4238243ef96e..f0343a6bf384 100644
--- a/client/informant/Cargo.toml
+++ b/client/informant/Cargo.toml
@@ -22,5 +22,5 @@ sc-client-api = { version = "3.0.0", path = "../api" }
 sc-network = { version = "0.9.0", path = "../network" }
 sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
 sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
-sp-transaction-pool = { version = "3.0.0", path = "../../primitives/transaction-pool" }
+sc-transaction-pool-api = { version = "3.0.0", path = "../transaction-pool/api" }
 wasm-timer = "0.2"
diff --git a/client/informant/src/lib.rs b/client/informant/src/lib.rs
index ef1533fb49f7..a05ab368e3ed 100644
--- a/client/informant/src/lib.rs
+++ b/client/informant/src/lib.rs
@@ -27,7 +27,7 @@ use sc_client_api::{BlockchainEvents, UsageProvider};
 use sc_network::NetworkService;
 use sp_blockchain::HeaderMetadata;
 use sp_runtime::traits::{Block as BlockT, Header};
-use sp_transaction_pool::TransactionPool;
+use sc_transaction_pool_api::TransactionPool;
 use std::{fmt::Display, sync::Arc, time::Duration, collections::VecDeque};
 
 mod display;
diff --git a/client/offchain/Cargo.toml b/client/offchain/Cargo.toml
index 9aca829c70d6..9f0fbdb64dcc 100644
--- a/client/offchain/Cargo.toml
+++ b/client/offchain/Cargo.toml
@@ -41,7 +41,7 @@ hyper-rustls = "0.21.0"
 sc-client-db = { version = "0.9.0", default-features = true, path = "../db" }
 sc-block-builder = { version = "0.9.0", path = "../block-builder" }
 sc-transaction-pool = { version = "3.0.0", path = "../transaction-pool" }
-sp-transaction-pool = { version = "3.0.0", path = "../../primitives/transaction-pool" }
+sc-transaction-pool-api = { version = "3.0.0", path = "../transaction-pool/api" }
 sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
 sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
diff --git a/client/offchain/src/lib.rs b/client/offchain/src/lib.rs
index 9879b857283a..21b1b7b7d21c 100644
--- a/client/offchain/src/lib.rs
+++ b/client/offchain/src/lib.rs
@@ -236,7 +236,7 @@ mod tests {
 		DefaultTestClientBuilderExt, ClientBlockImportExt,
 	};
 	use sc_transaction_pool::{BasicPool, FullChainApi};
-	use sp_transaction_pool::{TransactionPool, InPoolTransaction};
+	use sc_transaction_pool_api::{TransactionPool, InPoolTransaction};
 	use sp_consensus::BlockOrigin;
 	use sc_client_api::Backend as _;
 	use sc_block_builder::BlockBuilderProvider as _;
@@ -268,13 +268,13 @@ mod tests {
 		Arc<BasicPool<FullChainApi<TestClient, Block>, Block>>
 	);
 
-	impl sp_transaction_pool::OffchainSubmitTransaction<Block> for TestPool {
+	impl sc_transaction_pool_api::OffchainSubmitTransaction<Block> for TestPool {
 		fn submit_at(
 			&self,
 			at: &BlockId<Block>,
 			extrinsic: <Block as traits::Block>::Extrinsic,
 		) -> Result<(), ()> {
-			let source = sp_transaction_pool::TransactionSource::Local;
+			let source = sc_transaction_pool_api::TransactionSource::Local;
 			futures::executor::block_on(self.0.submit_one(&at, source, extrinsic))
 				.map(|_| ())
 				.map_err(|_| ())
diff --git a/client/rpc-api/Cargo.toml b/client/rpc-api/Cargo.toml
index 87c4577c7280..53c9a07fe008 100644
--- a/client/rpc-api/Cargo.toml
+++ b/client/rpc-api/Cargo.toml
@@ -28,6 +28,6 @@ sp-runtime = { path = "../../primitives/runtime" , version = "3.0.0"}
 sc-chain-spec = { path = "../chain-spec" , version = "3.0.0"}
 serde = { version = "1.0.101", features = ["derive"] }
 serde_json = "1.0.41"
-sp-transaction-pool = { version = "3.0.0", path = "../../primitives/transaction-pool" }
+sc-transaction-pool-api = { version = "3.0.0", path = "../transaction-pool/api" }
 sp-rpc = { version = "3.0.0", path = "../../primitives/rpc" }
 sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
diff --git a/client/rpc-api/src/author/error.rs b/client/rpc-api/src/author/error.rs
index 7c1086ab67d1..009a0a290d6b 100644
--- a/client/rpc-api/src/author/error.rs
+++ b/client/rpc-api/src/author/error.rs
@@ -37,7 +37,7 @@ pub enum Error {
 	Client(Box<dyn std::error::Error + Send>),
 	/// Transaction pool error,
 	#[display(fmt="Transaction pool error: {}", _0)]
-	Pool(sp_transaction_pool::error::Error),
+	Pool(sc_transaction_pool_api::error::Error),
 	/// Verification error
 	#[display(fmt="Extrinsic verification error: {}", _0)]
 	#[from(ignore)]
@@ -105,7 +105,7 @@ const POOL_UNACTIONABLE: i64 = POOL_INVALID_TX + 8;
 
 impl From<Error> for rpc::Error {
 	fn from(e: Error) -> Self {
-		use sp_transaction_pool::error::{Error as PoolError};
+		use sc_transaction_pool_api::error::{Error as PoolError};
 
 		match e {
 			Error::BadFormat(e) => rpc::Error {
diff --git a/client/rpc-api/src/author/mod.rs b/client/rpc-api/src/author/mod.rs
index 6ccf1ebab375..70da73ee8a00 100644
--- a/client/rpc-api/src/author/mod.rs
+++ b/client/rpc-api/src/author/mod.rs
@@ -24,7 +24,7 @@ pub mod hash;
 use jsonrpc_derive::rpc;
 use jsonrpc_pubsub::{typed::Subscriber, SubscriptionId};
 use sp_core::Bytes;
-use sp_transaction_pool::TransactionStatus;
+use sc_transaction_pool_api::TransactionStatus;
 use self::error::{FutureResult, Result};
 
 pub use self::gen_client::Client as AuthorClient;
@@ -78,7 +78,7 @@ pub trait AuthorApi<Hash, BlockHash> {
 
 	/// Submit an extrinsic to watch.
 	///
-	/// See [`TransactionStatus`](sp_transaction_pool::TransactionStatus) for details on transaction
+	/// See [`TransactionStatus`](sc_transaction_pool_api::TransactionStatus) for details on transaction
 	/// life cycle.
 	#[pubsub(
 		subscription = "author_extrinsicUpdate",
diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml
index 140039cab7d4..c4cfc40c34d6 100644
--- a/client/rpc/Cargo.toml
+++ b/client/rpc/Cargo.toml
@@ -35,13 +35,13 @@ sc-chain-spec = { version = "3.0.0", path = "../chain-spec" }
 sc-executor = { version = "0.9.0", path = "../executor" }
 sc-block-builder = { version = "0.9.0", path = "../block-builder" }
 sc-keystore = { version = "3.0.0", path = "../keystore" }
-sp-transaction-pool = { version = "3.0.0", path = "../../primitives/transaction-pool" }
 sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
 sc-tracing = { version = "3.0.0", path = "../tracing" }
 hash-db = { version = "0.15.2", default-features = false }
 parking_lot = "0.11.1"
 lazy_static = { version = "1.4.0", optional = true }
 sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
+sc-transaction-pool-api = { version = "3.0.0", path = "../transaction-pool/api" }
 
 [dev-dependencies]
 assert_matches = "1.3.0"
diff --git a/client/rpc/src/author/mod.rs b/client/rpc/src/author/mod.rs
index 4181206fdd0a..ed7899d52480 100644
--- a/client/rpc/src/author/mod.rs
+++ b/client/rpc/src/author/mod.rs
@@ -36,7 +36,7 @@ use sp_core::Bytes;
 use sp_keystore::{SyncCryptoStorePtr, SyncCryptoStore};
 use sp_api::ProvideRuntimeApi;
 use sp_runtime::generic;
-use sp_transaction_pool::{
+use sc_transaction_pool_api::{
 	TransactionPool, InPoolTransaction, TransactionStatus, TransactionSource,
 	BlockHash, TxHash, TransactionFor, error::IntoPoolError,
 };
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index e4756b1880f3..fa424a9d0b22 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -66,6 +66,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0" }
 sc-executor = { version = "0.9.0", path = "../executor" }
 sc-transaction-pool = { version = "3.0.0", path = "../transaction-pool" }
 sp-transaction-pool = { version = "3.0.0", path = "../../primitives/transaction-pool" }
+sc-transaction-pool-api = { version = "3.0.0", path = "../transaction-pool/api" }
 sp-transaction-storage-proof = { version = "3.0.0", path = "../../primitives/transaction-storage-proof" }
 sc-rpc-server = { version = "3.0.0", path = "../rpc-servers" }
 sc-rpc = { version = "3.0.0", path = "../rpc" }
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index b0bffc3c4e12..6318469a7f0b 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -60,7 +60,7 @@ use sc_telemetry::{
 	TelemetryHandle,
 	SUBSTRATE_INFO,
 };
-use sp_transaction_pool::MaintainedTransactionPool;
+use sc_transaction_pool_api::MaintainedTransactionPool;
 use prometheus_endpoint::Registry;
 use sc_client_db::{Backend, DatabaseSettings};
 use sp_core::traits::{
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index cb0f6c023372..40cb1aeea6a9 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -64,7 +64,7 @@ pub use sc_chain_spec::{
 	ChainSpec, GenericChainSpec, Properties, RuntimeGenesis, Extension as ChainSpecExtension,
 	NoExtension, ChainType,
 };
-pub use sp_transaction_pool::{TransactionPool, InPoolTransaction, error::IntoPoolError};
+pub use sc_transaction_pool_api::{TransactionPool, InPoolTransaction, error::IntoPoolError};
 pub use sc_transaction_pool::Options as TransactionPoolOptions;
 pub use sc_rpc::Metadata as RpcMetadata;
 pub use sc_executor::NativeExecutionDispatch;
@@ -456,7 +456,7 @@ where
 	Pool: TransactionPool<Block=B, Hash=H, Error=E>,
 	B: BlockT,
 	H: std::hash::Hash + Eq + sp_runtime::traits::Member + sp_runtime::traits::MaybeSerialize,
-	E: IntoPoolError + From<sp_transaction_pool::error::Error>,
+	E: IntoPoolError + From<sc_transaction_pool_api::error::Error>,
 {
 	pool.ready()
 		.filter(|t| t.is_propagable())
@@ -475,7 +475,7 @@ where
 	Pool: 'static + TransactionPool<Block=B, Hash=H, Error=E>,
 	B: BlockT,
 	H: std::hash::Hash + Eq + sp_runtime::traits::Member + sp_runtime::traits::MaybeSerialize,
-	E: 'static + IntoPoolError + From<sp_transaction_pool::error::Error>,
+	E: 'static + IntoPoolError + From<sc_transaction_pool_api::error::Error>,
 {
 	fn transactions(&self) -> Vec<(H, B::Extrinsic)> {
 		transactions_to_propagate(&*self.pool)
@@ -505,12 +505,12 @@ where
 
 		let best_block_id = BlockId::hash(self.client.info().best_hash);
 
-		let import_future = self.pool.submit_one(&best_block_id, sp_transaction_pool::TransactionSource::External, uxt);
+		let import_future = self.pool.submit_one(&best_block_id, sc_transaction_pool_api::TransactionSource::External, uxt);
 		Box::pin(async move {
 			match import_future.await {
 				Ok(_) => TransactionImport::NewGood,
 				Err(e) => match e.into_pool_error() {
-					Ok(sp_transaction_pool::error::Error::AlreadyImported(_)) => TransactionImport::KnownGood,
+					Ok(sc_transaction_pool_api::error::Error::AlreadyImported(_)) => TransactionImport::KnownGood,
 					Ok(e) => {
 						debug!("Error adding transaction to the pool: {:?}", e);
 						TransactionImport::Bad
diff --git a/client/service/src/metrics.rs b/client/service/src/metrics.rs
index 8fc48ccf8c86..7c74b327ea26 100644
--- a/client/service/src/metrics.rs
+++ b/client/service/src/metrics.rs
@@ -24,7 +24,7 @@ use prometheus_endpoint::{register, Gauge, U64, Registry, PrometheusError, Opts,
 use sc_telemetry::{telemetry, TelemetryHandle, SUBSTRATE_INFO};
 use sp_api::ProvideRuntimeApi;
 use sp_runtime::traits::{NumberFor, Block, SaturatedConversion, UniqueSaturatedInto};
-use sp_transaction_pool::{PoolStatus, MaintainedTransactionPool};
+use sc_transaction_pool_api::{PoolStatus, MaintainedTransactionPool};
 use sp_utils::metrics::register_globals;
 use sc_client_api::{ClientInfo, UsageProvider};
 use sc_network::{config::Role, NetworkStatus, NetworkService};
diff --git a/client/service/test/Cargo.toml b/client/service/test/Cargo.toml
index 2108d7e26fa8..27aa14b0d2bc 100644
--- a/client/service/test/Cargo.toml
+++ b/client/service/test/Cargo.toml
@@ -33,7 +33,7 @@ sc-network = { version = "0.9.0", path = "../../network" }
 sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
 sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
 sp-core = { version = "3.0.0", path = "../../../primitives/core" }
-sp-transaction-pool = { version = "3.0.0", path = "../../../primitives/transaction-pool" }
+sc-transaction-pool-api = { version = "3.0.0", path = "../../../client/transaction-pool/api" }
 substrate-test-runtime = { version = "2.0.0", path = "../../../test-utils/runtime" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
 sc-client-api = { version = "3.0.0", path = "../../api" }
diff --git a/client/service/test/src/lib.rs b/client/service/test/src/lib.rs
index eb437b1aba0a..44228d1575cc 100644
--- a/client/service/test/src/lib.rs
+++ b/client/service/test/src/lib.rs
@@ -47,7 +47,7 @@ use sp_blockchain::HeaderBackend;
 use sc_network::{multiaddr, Multiaddr};
 use sc_network::config::{NetworkConfiguration, TransportConfig};
 use sp_runtime::{generic::BlockId, traits::Block as BlockT};
-use sp_transaction_pool::TransactionPool;
+use sc_transaction_pool_api::TransactionPool;
 use sc_client_api::{Backend, CallExecutor};
 use parking_lot::Mutex;
 
@@ -575,7 +575,7 @@ pub fn sync<G, E, Fb, F, Lb, L, B, ExF, U>(
 	let first_user_data = &network.full_nodes[0].2;
 	let best_block = BlockId::number(first_service.client().info().best_number);
 	let extrinsic = extrinsic_factory(&first_service, first_user_data);
-	let source = sp_transaction_pool::TransactionSource::External;
+	let source = sc_transaction_pool_api::TransactionSource::External;
 
 	futures::executor::block_on(
 		first_service.transaction_pool().submit_one(&best_block, source, extrinsic)
diff --git a/client/transaction-pool/Cargo.toml b/client/transaction-pool/Cargo.toml
index 77b551915ce1..988f252a6343 100644
--- a/client/transaction-pool/Cargo.toml
+++ b/client/transaction-pool/Cargo.toml
@@ -22,21 +22,34 @@ parity-util-mem = { version = "0.10.0", default-features = false, features = ["p
 parking_lot = "0.11.1"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
 sc-client-api = { version = "3.0.0", path = "../api" }
-sc-transaction-graph = { version = "3.0.0", path = "./graph" }
 sp-api = { version = "3.0.0", path = "../../primitives/api" }
 sp-core = { version = "3.0.0", path = "../../primitives/core" }
 sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
 sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
 sp-transaction-pool = { version = "3.0.0", path = "../../primitives/transaction-pool" }
+sc-transaction-pool-api = { version = "3.0.0", path = "./api" }
 sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
 sp-utils = { version = "3.0.0", path = "../../primitives/utils" }
 wasm-timer = "0.2"
+derive_more = "0.99.2"
+serde = { version = "1.0.101", features = ["derive"] }
+linked-hash-map = "0.5.2"
+retain_mut = "0.1.3"
 
 [dev-dependencies]
 assert_matches = "1.3.0"
 hex = "0.4"
-sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
 sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
 substrate-test-runtime-transaction-pool = { version = "2.0.0", path = "../../test-utils/runtime/transaction-pool" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 sc-block-builder = { version = "0.9.0", path = "../block-builder" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
+substrate-test-runtime = { version = "2.0.0", path = "../../test-utils/runtime" }
+criterion = "0.3"
+
+[[bench]]
+name = "basics"
+harness = false
+
+[features]
+test-helpers = []
\ No newline at end of file
diff --git a/client/transaction-pool/api/Cargo.toml b/client/transaction-pool/api/Cargo.toml
new file mode 100644
index 000000000000..8ec74b17b6e9
--- /dev/null
+++ b/client/transaction-pool/api/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "sc-transaction-pool-api"
+version = "3.0.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
+license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
+homepage = "https://substrate.dev"
+repository = "https://github.com/paritytech/substrate/"
+description = "Transaction pool client facing API."
+
+[dependencies]
+futures = { version = "0.3.1"  }
+log = { version = "0.4.8" }
+serde = { version = "1.0.101", features = ["derive"] }
+thiserror = { version = "1.0.21" }
+sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
+
+codec = { package = "parity-scale-codec", version = "2.0.0" }
+derive_more = { version = "0.99.11" }
+sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
diff --git a/primitives/transaction-pool/src/error.rs b/client/transaction-pool/api/src/error.rs
similarity index 100%
rename from primitives/transaction-pool/src/error.rs
rename to client/transaction-pool/api/src/error.rs
diff --git a/primitives/transaction-pool/src/pool.rs b/client/transaction-pool/api/src/lib.rs
similarity index 98%
rename from primitives/transaction-pool/src/pool.rs
rename to client/transaction-pool/api/src/lib.rs
index b0964cab2d18..198d67f71d1b 100644
--- a/primitives/transaction-pool/src/pool.rs
+++ b/client/transaction-pool/api/src/lib.rs
@@ -15,7 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Transaction pool primitives types & Runtime API.
+//! Transaction pool client facing API.
+#![warn(missing_docs)]
+
+pub mod error;
 
 use std::{
 	collections::HashMap,
@@ -28,9 +31,9 @@ use serde::{Deserialize, Serialize};
 use sp_runtime::{
 	generic::BlockId,
 	traits::{Block as BlockT, Member, NumberFor},
-	transaction_validity::{
-		TransactionLongevity, TransactionPriority, TransactionTag, TransactionSource,
-	},
+};
+pub use sp_runtime::transaction_validity::{
+	TransactionLongevity, TransactionPriority, TransactionTag, TransactionSource,
 };
 
 /// Transaction pool status.
diff --git a/client/transaction-pool/graph/benches/basics.rs b/client/transaction-pool/benches/basics.rs
similarity index 89%
rename from client/transaction-pool/graph/benches/basics.rs
rename to client/transaction-pool/benches/basics.rs
index 0c55c931eb21..6995491ea22c 100644
--- a/client/transaction-pool/graph/benches/basics.rs
+++ b/client/transaction-pool/benches/basics.rs
@@ -19,7 +19,7 @@
 use criterion::{criterion_group, criterion_main, Criterion};
 
 use futures::{future::{ready, Ready}, executor::block_on};
-use sc_transaction_graph::*;
+use sc_transaction_pool::{*, test_helpers::*};
 use codec::Encode;
 use substrate_test_runtime::{Block, Extrinsic, Transfer, H256, AccountId};
 use sp_runtime::{
@@ -51,15 +51,15 @@ fn to_tag(nonce: u64, from: AccountId) -> Tag {
 
 impl ChainApi for TestApi {
 	type Block = Block;
-	type Error = sp_transaction_pool::error::Error;
-	type ValidationFuture = Ready<sp_transaction_pool::error::Result<TransactionValidity>>;
-	type BodyFuture = Ready<sp_transaction_pool::error::Result<Option<Vec<Extrinsic>>>>;
+	type Error = sc_transaction_pool_api::error::Error;
+	type ValidationFuture = Ready<sc_transaction_pool_api::error::Result<TransactionValidity>>;
+	type BodyFuture = Ready<sc_transaction_pool_api::error::Result<Option<Vec<Extrinsic>>>>;
 
 	fn validate_transaction(
 		&self,
 		at: &BlockId<Self::Block>,
 		_source: TransactionSource,
-		uxt: ExtrinsicFor<Self>,
+		uxt: test_helpers::ExtrinsicFor<Self>,
 	) -> Self::ValidationFuture {
 		let nonce = uxt.transfer().nonce;
 		let from = uxt.transfer().from.clone();
@@ -89,7 +89,7 @@ impl ChainApi for TestApi {
 	fn block_id_to_number(
 		&self,
 		at: &BlockId<Self::Block>,
-	) -> Result<Option<NumberFor<Self>>, Self::Error> {
+	) -> Result<Option<test_helpers::NumberFor<Self>>, Self::Error> {
 		Ok(match at {
 			BlockId::Number(num) => Some(*num),
 			BlockId::Hash(_) => None,
@@ -99,14 +99,14 @@ impl ChainApi for TestApi {
 	fn block_id_to_hash(
 		&self,
 		at: &BlockId<Self::Block>,
-	) -> Result<Option<BlockHash<Self>>, Self::Error> {
+	) -> Result<Option<test_helpers::BlockHash<Self>>, Self::Error> {
 		Ok(match at {
 			BlockId::Number(num) => Some(H256::from_low_u64_be(*num)).into(),
 			BlockId::Hash(_) => None,
 		})
 	}
 
-	fn hash_and_length(&self, uxt: &ExtrinsicFor<Self>) -> (H256, usize) {
+	fn hash_and_length(&self, uxt: &test_helpers::ExtrinsicFor<Self>) -> (H256, usize) {
 		let encoded = uxt.encode();
 		(blake2_256(&encoded).into(), encoded.len())
 	}
diff --git a/client/transaction-pool/graph/README.md b/client/transaction-pool/graph/README.md
deleted file mode 100644
index bc9cd929122f..000000000000
--- a/client/transaction-pool/graph/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Generic Transaction Pool
-
-The pool is based on dependency graph between transactions
-and their priority.
-The pool is able to return an iterator that traverses transaction
-graph in the correct order taking into account priorities and dependencies.
-
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
diff --git a/client/transaction-pool/src/api.rs b/client/transaction-pool/src/api.rs
index dd54e8e76947..2eb394f76d55 100644
--- a/client/transaction-pool/src/api.rs
+++ b/client/transaction-pool/src/api.rs
@@ -37,7 +37,7 @@ use sp_api::{ProvideRuntimeApi, ApiExt};
 use prometheus_endpoint::Registry as PrometheusRegistry;
 use sp_core::traits::SpawnEssentialNamed;
 
-use crate::{metrics::{ApiMetrics, ApiMetricsExt}, error::{self, Error}};
+use crate::{metrics::{ApiMetrics, ApiMetricsExt}, error::{self, Error}, graph};
 
 /// The transaction pool logic for full client.
 pub struct FullChainApi<Client, Block> {
@@ -103,7 +103,7 @@ impl<Client, Block> FullChainApi<Client, Block> {
 	}
 }
 
-impl<Client, Block> sc_transaction_graph::ChainApi for FullChainApi<Client, Block>
+impl<Client, Block> graph::ChainApi for FullChainApi<Client, Block>
 where
 	Block: BlockT,
 	Client: ProvideRuntimeApi<Block> + BlockBackend<Block> + BlockIdTo<Block> + HeaderBackend<Block>,
@@ -125,7 +125,7 @@ where
 		&self,
 		at: &BlockId<Self::Block>,
 		source: TransactionSource,
-		uxt: sc_transaction_graph::ExtrinsicFor<Self>,
+		uxt: graph::ExtrinsicFor<Self>,
 	) -> Self::ValidationFuture {
 		let (tx, rx) = oneshot::channel();
 		let client = self.client.clone();
@@ -158,21 +158,21 @@ where
 	fn block_id_to_number(
 		&self,
 		at: &BlockId<Self::Block>,
-	) -> error::Result<Option<sc_transaction_graph::NumberFor<Self>>> {
+	) -> error::Result<Option<graph::NumberFor<Self>>> {
 		self.client.to_number(at).map_err(|e| Error::BlockIdConversion(format!("{:?}", e)))
 	}
 
 	fn block_id_to_hash(
 		&self,
 		at: &BlockId<Self::Block>,
-	) -> error::Result<Option<sc_transaction_graph::BlockHash<Self>>> {
+	) -> error::Result<Option<graph::BlockHash<Self>>> {
 		self.client.to_hash(at).map_err(|e| Error::BlockIdConversion(format!("{:?}", e)))
 	}
 
 	fn hash_and_length(
 		&self,
-		ex: &sc_transaction_graph::ExtrinsicFor<Self>,
-	) -> (sc_transaction_graph::ExtrinsicHash<Self>, usize) {
+		ex: &graph::ExtrinsicFor<Self>,
+	) -> (graph::ExtrinsicHash<Self>, usize) {
 		ex.using_encoded(|x| {
 			(<traits::HashFor::<Block> as traits::Hash>::hash(x), x.len())
 		})
@@ -192,7 +192,7 @@ fn validate_transaction_blocking<Client, Block>(
 	client: &Client,
 	at: &BlockId<Block>,
 	source: TransactionSource,
-	uxt: sc_transaction_graph::ExtrinsicFor<FullChainApi<Client, Block>>,
+	uxt: graph::ExtrinsicFor<FullChainApi<Client, Block>>,
 ) -> error::Result<TransactionValidity>
 where
 	Block: BlockT,
@@ -269,7 +269,7 @@ where
 		&self,
 		at: &BlockId<Block>,
 		source: TransactionSource,
-		uxt: sc_transaction_graph::ExtrinsicFor<Self>,
+		uxt: graph::ExtrinsicFor<Self>,
 	) -> error::Result<TransactionValidity> {
 		validate_transaction_blocking(&*self.client, at, source, uxt)
 	}
@@ -293,7 +293,7 @@ impl<Client, F, Block> LightChainApi<Client, F, Block> {
 	}
 }
 
-impl<Client, F, Block> sc_transaction_graph::ChainApi for
+impl<Client, F, Block> graph::ChainApi for
 	LightChainApi<Client, F, Block> where
 		Block: BlockT,
 		Client: HeaderBackend<Block> + 'static,
@@ -315,7 +315,7 @@ impl<Client, F, Block> sc_transaction_graph::ChainApi for
 		&self,
 		at: &BlockId<Self::Block>,
 		source: TransactionSource,
-		uxt: sc_transaction_graph::ExtrinsicFor<Self>,
+		uxt: graph::ExtrinsicFor<Self>,
 	) -> Self::ValidationFuture {
 		let header_hash = self.client.expect_block_hash_from_id(at);
 		let header_and_hash = header_hash
@@ -349,21 +349,21 @@ impl<Client, F, Block> sc_transaction_graph::ChainApi for
 	fn block_id_to_number(
 		&self,
 		at: &BlockId<Self::Block>,
-	) -> error::Result<Option<sc_transaction_graph::NumberFor<Self>>> {
+	) -> error::Result<Option<graph::NumberFor<Self>>> {
 		Ok(self.client.block_number_from_id(at)?)
 	}
 
 	fn block_id_to_hash(
 		&self,
 		at: &BlockId<Self::Block>,
-	) -> error::Result<Option<sc_transaction_graph::BlockHash<Self>>> {
+	) -> error::Result<Option<graph::BlockHash<Self>>> {
 		Ok(self.client.block_hash_from_id(at)?)
 	}
 
 	fn hash_and_length(
 		&self,
-		ex: &sc_transaction_graph::ExtrinsicFor<Self>,
-	) -> (sc_transaction_graph::ExtrinsicHash<Self>, usize) {
+		ex: &graph::ExtrinsicFor<Self>,
+	) -> (graph::ExtrinsicHash<Self>, usize) {
 		ex.using_encoded(|x| {
 			(<<Block::Header as HeaderT>::Hashing as HashT>::hash(x), x.len())
 		})
diff --git a/client/transaction-pool/src/error.rs b/client/transaction-pool/src/error.rs
index 62c812d14704..23afab0c74a7 100644
--- a/client/transaction-pool/src/error.rs
+++ b/client/transaction-pool/src/error.rs
@@ -18,7 +18,7 @@
 
 //! Transaction pool error.
 
-use sp_transaction_pool::error::Error as TxPoolError;
+use sc_transaction_pool_api::error::Error as TxPoolError;
 
 /// Transaction pool result.
 pub type Result<T> = std::result::Result<T, Error>;
@@ -41,7 +41,7 @@ pub enum Error {
 }
 
 
-impl sp_transaction_pool::error::IntoPoolError for Error {
+impl sc_transaction_pool_api::error::IntoPoolError for Error {
 	fn into_pool_error(self) -> std::result::Result<TxPoolError, Self> {
 		match self {
 			Error::Pool(e) => Ok(e),
diff --git a/client/transaction-pool/graph/src/base_pool.rs b/client/transaction-pool/src/graph/base_pool.rs
similarity index 99%
rename from client/transaction-pool/graph/src/base_pool.rs
rename to client/transaction-pool/src/graph/base_pool.rs
index 39cfe8fa9dce..db5927ea0c99 100644
--- a/client/transaction-pool/graph/src/base_pool.rs
+++ b/client/transaction-pool/src/graph/base_pool.rs
@@ -37,10 +37,12 @@ use sp_runtime::transaction_validity::{
 	TransactionPriority as Priority,
 	TransactionSource as Source,
 };
-use sp_transaction_pool::{error, PoolStatus, InPoolTransaction};
+use sc_transaction_pool_api::{error, PoolStatus, InPoolTransaction};
 
-use crate::future::{FutureTransactions, WaitingTransaction};
-use crate::ready::ReadyTransactions;
+use super::{
+	future::{FutureTransactions, WaitingTransaction},
+	ready::ReadyTransactions,
+};
 
 /// Successful import result.
 #[derive(Debug, PartialEq, Eq)]
diff --git a/client/transaction-pool/graph/src/future.rs b/client/transaction-pool/src/graph/future.rs
similarity index 99%
rename from client/transaction-pool/graph/src/future.rs
rename to client/transaction-pool/src/graph/future.rs
index 9dcfd13808d9..083d3c7ec061 100644
--- a/client/transaction-pool/graph/src/future.rs
+++ b/client/transaction-pool/src/graph/future.rs
@@ -29,7 +29,7 @@ use sp_runtime::transaction_validity::{
 };
 use wasm_timer::Instant;
 
-use crate::base_pool::Transaction;
+use super::base_pool::Transaction;
 
 #[cfg_attr(not(target_os = "unknown"), derive(parity_util_mem::MallocSizeOf))]
 /// Transaction with partially satisfied dependencies.
diff --git a/client/transaction-pool/graph/src/listener.rs b/client/transaction-pool/src/graph/listener.rs
similarity index 98%
rename from client/transaction-pool/graph/src/listener.rs
rename to client/transaction-pool/src/graph/listener.rs
index e81c28660027..a6987711f1df 100644
--- a/client/transaction-pool/graph/src/listener.rs
+++ b/client/transaction-pool/src/graph/listener.rs
@@ -26,7 +26,7 @@ use serde::Serialize;
 use log::{debug, trace};
 use sp_runtime::traits;
 
-use crate::{watcher, ChainApi, ExtrinsicHash, BlockHash};
+use super::{watcher, ChainApi, ExtrinsicHash, BlockHash};
 
 /// Extrinsic pool default listener.
 pub struct Listener<H: hash::Hash + Eq, C: ChainApi> {
diff --git a/client/transaction-pool/graph/src/lib.rs b/client/transaction-pool/src/graph/mod.rs
similarity index 88%
rename from client/transaction-pool/graph/src/lib.rs
rename to client/transaction-pool/src/graph/mod.rs
index c61b05befa12..92e76b3ecf90 100644
--- a/client/transaction-pool/graph/src/lib.rs
+++ b/client/transaction-pool/src/graph/mod.rs
@@ -38,7 +38,8 @@ pub mod base_pool;
 pub mod watcher;
 
 pub use self::base_pool::Transaction;
+pub use validated_pool::{IsValidator, ValidatedTransaction};
 pub use self::pool::{
-	BlockHash, ChainApi, EventStream, ExtrinsicFor, ExtrinsicHash, IsValidator, NumberFor, Options,
-	Pool, TransactionFor, ValidatedTransaction,
+	BlockHash, ChainApi, EventStream, ExtrinsicFor, ExtrinsicHash,
+	NumberFor, Options, Pool, TransactionFor,
 };
diff --git a/client/transaction-pool/graph/src/pool.rs b/client/transaction-pool/src/graph/pool.rs
similarity index 99%
rename from client/transaction-pool/graph/src/pool.rs
rename to client/transaction-pool/src/graph/pool.rs
index 4f132550d703..2c24f3779f0e 100644
--- a/client/transaction-pool/graph/src/pool.rs
+++ b/client/transaction-pool/src/graph/pool.rs
@@ -29,13 +29,14 @@ use sp_runtime::{
 		TransactionValidity, TransactionTag as Tag, TransactionValidityError, TransactionSource,
 	},
 };
-use sp_transaction_pool::error;
+use sc_transaction_pool_api::error;
 use wasm_timer::Instant;
 use futures::channel::mpsc::Receiver;
 
-use crate::{base_pool as base, watcher::Watcher};
-use crate::validated_pool::ValidatedPool;
-pub use crate::validated_pool::{IsValidator, ValidatedTransaction};
+use super::{
+	base_pool as base, watcher::Watcher,
+	validated_pool::{IsValidator, ValidatedTransaction, ValidatedPool},
+};
 
 /// Modification notification event stream type;
 pub type EventStream<H> = Receiver<H>;
@@ -462,7 +463,7 @@ mod tests {
 	use parking_lot::Mutex;
 	use futures::executor::block_on;
 	use super::*;
-	use sp_transaction_pool::TransactionStatus;
+	use sc_transaction_pool_api::TransactionStatus;
 	use sp_runtime::{
 		traits::Hash,
 		transaction_validity::{ValidTransaction, InvalidTransaction, TransactionSource},
@@ -471,7 +472,7 @@ mod tests {
 	use substrate_test_runtime::{Block, Extrinsic, Transfer, H256, AccountId, Hashing};
 	use assert_matches::assert_matches;
 	use wasm_timer::Instant;
-	use crate::base_pool::Limit;
+	use super::super::base_pool::Limit;
 
 	const INVALID_NONCE: u64 = 254;
 	const SOURCE: TransactionSource = TransactionSource::External;
diff --git a/client/transaction-pool/graph/src/ready.rs b/client/transaction-pool/src/graph/ready.rs
similarity index 99%
rename from client/transaction-pool/graph/src/ready.rs
rename to client/transaction-pool/src/graph/ready.rs
index 7b42033f9b50..46f13f4e82dc 100644
--- a/client/transaction-pool/graph/src/ready.rs
+++ b/client/transaction-pool/src/graph/ready.rs
@@ -29,9 +29,9 @@ use sp_runtime::traits::Member;
 use sp_runtime::transaction_validity::{
 	TransactionTag as Tag,
 };
-use sp_transaction_pool::error;
+use sc_transaction_pool_api::error;
 
-use crate::{
+use super::{
 	base_pool::Transaction,
 	future::WaitingTransaction,
 	tracked_map::{self, ReadOnlyTrackedMap, TrackedMap},
@@ -149,7 +149,8 @@ impl<Hash: hash::Hash + Member + Serialize, Ex> ReadyTransactions<Hash, Ex> {
 	///
 	/// Transactions are returned in order:
 	/// 1. First by the dependencies:
-	///	- never return transaction that requires a tag, which was not provided by one of the previously returned transactions
+	///	- never return transaction that requires a tag, which was not provided by one of the previously
+	/// returned transactions
 	/// 2. Then by priority:
 	/// - If there are two transactions with all requirements satisfied the one with higher priority goes first.
 	/// 3. Then by the ttl that's left
diff --git a/client/transaction-pool/graph/src/rotator.rs b/client/transaction-pool/src/graph/rotator.rs
similarity index 99%
rename from client/transaction-pool/graph/src/rotator.rs
rename to client/transaction-pool/src/graph/rotator.rs
index 4c800c767183..0e4fd0abf297 100644
--- a/client/transaction-pool/graph/src/rotator.rs
+++ b/client/transaction-pool/src/graph/rotator.rs
@@ -30,7 +30,7 @@ use std::{
 use parking_lot::RwLock;
 use wasm_timer::Instant;
 
-use crate::base_pool::Transaction;
+use super::base_pool::Transaction;
 
 /// Expected size of the banned extrinsics cache.
 const EXPECTED_SIZE: usize = 2048;
diff --git a/client/transaction-pool/graph/src/tracked_map.rs b/client/transaction-pool/src/graph/tracked_map.rs
similarity index 100%
rename from client/transaction-pool/graph/src/tracked_map.rs
rename to client/transaction-pool/src/graph/tracked_map.rs
diff --git a/client/transaction-pool/graph/src/validated_pool.rs b/client/transaction-pool/src/graph/validated_pool.rs
similarity index 97%
rename from client/transaction-pool/graph/src/validated_pool.rs
rename to client/transaction-pool/src/graph/validated_pool.rs
index ec05106896f2..5feba94dc56b 100644
--- a/client/transaction-pool/graph/src/validated_pool.rs
+++ b/client/transaction-pool/src/graph/validated_pool.rs
@@ -29,17 +29,15 @@ use sp_runtime::{
 	traits::{self, SaturatedConversion},
 	transaction_validity::{TransactionTag as Tag, ValidTransaction, TransactionSource},
 };
-use sp_transaction_pool::{error, PoolStatus};
+use sc_transaction_pool_api::{error, PoolStatus};
 use wasm_timer::Instant;
 use futures::channel::mpsc::{channel, Sender};
 use retain_mut::RetainMut;
 
-use crate::base_pool::{self as base, PruneStatus};
-use crate::listener::Listener;
-use crate::rotator::PoolRotator;
-use crate::watcher::Watcher;
-use crate::pool::{
-	EventStream, Options, ChainApi, BlockHash, ExtrinsicHash, ExtrinsicFor, TransactionFor,
+use super::{
+	base_pool::{self as base, PruneStatus}, watcher::Watcher,
+	listener::Listener, rotator::PoolRotator,
+	pool::{EventStream, Options, ChainApi, BlockHash, ExtrinsicHash, ExtrinsicFor, TransactionFor},
 };
 
 /// Pre-validated transaction. Validated pool only accepts transactions wrapped in this enum.
@@ -211,7 +209,11 @@ impl<B: ChainApi> ValidatedPool<B> {
 								Ok(()) => true,
 								Err(e) => {
 									if e.is_full() {
-										log::warn!(target: "txpool", "[{:?}] Trying to notify an import but the channel is full", hash);
+										log::warn!(
+											target: "txpool",
+											"[{:?}] Trying to notify an import but the channel is full",
+											hash,
+										);
 										true
 									} else {
 										false
@@ -548,7 +550,7 @@ impl<B: ChainApi> ValidatedPool<B> {
 	}
 
 	/// Get rotator reference.
-	#[cfg(test)]
+	#[cfg(feature = "test-helpers")]
 	pub fn rotator(&self) -> &PoolRotator<ExtrinsicHash<B>> {
 		&self.rotator
 	}
diff --git a/client/transaction-pool/graph/src/watcher.rs b/client/transaction-pool/src/graph/watcher.rs
similarity index 98%
rename from client/transaction-pool/graph/src/watcher.rs
rename to client/transaction-pool/src/graph/watcher.rs
index b93fe3154319..64e6032f0c2d 100644
--- a/client/transaction-pool/graph/src/watcher.rs
+++ b/client/transaction-pool/src/graph/watcher.rs
@@ -19,7 +19,7 @@
 //! Extrinsics status updates.
 
 use futures::Stream;
-use sp_transaction_pool::TransactionStatus;
+use sc_transaction_pool_api::TransactionStatus;
 use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedSender, TracingUnboundedReceiver};
 
 /// Extrinsic watcher.
diff --git a/client/transaction-pool/src/lib.rs b/client/transaction-pool/src/lib.rs
index 7dd9414e9f7f..8f89063657c0 100644
--- a/client/transaction-pool/src/lib.rs
+++ b/client/transaction-pool/src/lib.rs
@@ -23,17 +23,23 @@
 #![warn(unused_extern_crates)]
 
 mod api;
+mod graph;
 mod revalidation;
 mod metrics;
 
 pub mod error;
 
-#[cfg(test)]
-pub mod testing;
+/// Common types for testing the transaction pool
+#[cfg(feature = "test-helpers")]
+pub mod test_helpers {
+	pub use super::{
+		graph::{ChainApi, Pool, NumberFor, BlockHash, ExtrinsicFor},
+		revalidation::RevalidationQueue,
+	};
+}
 
-pub use sc_transaction_graph::{ChainApi, Options, Pool};
+pub use graph::{Options, Transaction};
 pub use crate::api::{FullChainApi, LightChainApi};
-
 use std::{collections::{HashMap, HashSet}, sync::Arc, pin::Pin, convert::TryInto};
 use futures::{prelude::*, future::{self, ready}, channel::oneshot};
 use parking_lot::Mutex;
@@ -43,23 +49,23 @@ use sp_runtime::{
 	traits::{Block as BlockT, NumberFor, AtLeast32Bit, Extrinsic, Zero, Header as HeaderT},
 };
 use sp_core::traits::SpawnEssentialNamed;
-use sp_transaction_pool::{
+use sc_transaction_pool_api::{
 	TransactionPool, PoolStatus, ImportNotificationStream, TxHash, TransactionFor,
 	TransactionStatusStreamFor, MaintainedTransactionPool, PoolFuture, ChainEvent,
 	TransactionSource,
 };
-use sc_transaction_graph::{IsValidator, ExtrinsicHash};
+use graph::{IsValidator, ExtrinsicHash};
 use wasm_timer::Instant;
 
 use prometheus_endpoint::Registry as PrometheusRegistry;
 use crate::metrics::MetricsLink as PrometheusMetrics;
 
 type BoxedReadyIterator<Hash, Data> = Box<
-	dyn Iterator<Item=Arc<sc_transaction_graph::base_pool::Transaction<Hash, Data>>> + Send
+	dyn Iterator<Item=Arc<graph::base_pool::Transaction<Hash, Data>>> + Send
 >;
 
 type ReadyIteratorFor<PoolApi> = BoxedReadyIterator<
-	sc_transaction_graph::ExtrinsicHash<PoolApi>, sc_transaction_graph::ExtrinsicFor<PoolApi>
+	graph::ExtrinsicHash<PoolApi>, graph::ExtrinsicFor<PoolApi>
 >;
 
 type PolledIterator<PoolApi> = Pin<Box<dyn Future<Output=ReadyIteratorFor<PoolApi>> + Send>>;
@@ -73,9 +79,9 @@ pub type LightPool<Block, Client, Fetcher> = BasicPool<LightChainApi<Client, Fet
 pub struct BasicPool<PoolApi, Block>
 	where
 		Block: BlockT,
-		PoolApi: ChainApi<Block=Block>,
+		PoolApi: graph::ChainApi<Block=Block>,
 {
-	pool: Arc<sc_transaction_graph::Pool<PoolApi>>,
+	pool: Arc<graph::Pool<PoolApi>>,
 	api: Arc<PoolApi>,
 	revalidation_strategy: Arc<Mutex<RevalidationStrategy<NumberFor<Block>>>>,
 	revalidation_queue: Arc<revalidation::RevalidationQueue<PoolApi>>,
@@ -134,7 +140,7 @@ impl<T, Block: BlockT> ReadyPoll<T, Block> {
 #[cfg(not(target_os = "unknown"))]
 impl<PoolApi, Block> parity_util_mem::MallocSizeOf for BasicPool<PoolApi, Block>
 where
-	PoolApi: ChainApi<Block=Block>,
+	PoolApi: graph::ChainApi<Block=Block>,
 	Block: BlockT,
 {
 	fn size_of(&self, ops: &mut parity_util_mem::MallocSizeOfOps) -> usize {
@@ -163,14 +169,14 @@ pub enum RevalidationType {
 impl<PoolApi, Block> BasicPool<PoolApi, Block>
 	where
 		Block: BlockT,
-		PoolApi: ChainApi<Block=Block> + 'static,
+		PoolApi: graph::ChainApi<Block=Block> + 'static,
 {
 	/// Create new basic transaction pool with provided api, for tests.
-	#[cfg(test)]
+	#[cfg(feature = "test-helpers")]
 	pub fn new_test(
 		pool_api: Arc<PoolApi>,
 	) -> (Self, Pin<Box<dyn Future<Output=()> + Send>>, intervalier::BackSignalControl) {
-		let pool = Arc::new(sc_transaction_graph::Pool::new(Default::default(), true.into(), pool_api.clone()));
+		let pool = Arc::new(graph::Pool::new(Default::default(), true.into(), pool_api.clone()));
 		let (revalidation_queue, background_task, notifier) =
 			revalidation::RevalidationQueue::new_test(pool_api.clone(), pool.clone());
 		(
@@ -190,7 +196,7 @@ impl<PoolApi, Block> BasicPool<PoolApi, Block>
 	/// Create new basic transaction pool with provided api and custom
 	/// revalidation type.
 	pub fn with_revalidation_type(
-		options: sc_transaction_graph::Options,
+		options: graph::Options,
 		is_validator: IsValidator,
 		pool_api: Arc<PoolApi>,
 		prometheus: Option<&PrometheusRegistry>,
@@ -198,7 +204,7 @@ impl<PoolApi, Block> BasicPool<PoolApi, Block>
 		spawner: impl SpawnEssentialNamed,
 		best_block_number: NumberFor<Block>,
 	) -> Self {
-		let pool = Arc::new(sc_transaction_graph::Pool::new(options, is_validator, pool_api.clone()));
+		let pool = Arc::new(graph::Pool::new(options, is_validator, pool_api.clone()));
 		let (revalidation_queue, background_task) = match revalidation_type {
 			RevalidationType::Light => (
 				revalidation::RevalidationQueue::new(pool_api.clone(), pool.clone()),
@@ -233,19 +239,25 @@ impl<PoolApi, Block> BasicPool<PoolApi, Block>
 	}
 
 	/// Gets shared reference to the underlying pool.
-	pub fn pool(&self) -> &Arc<sc_transaction_graph::Pool<PoolApi>> {
+	pub fn pool(&self) -> &Arc<graph::Pool<PoolApi>> {
 		&self.pool
 	}
+
+	/// Get access to the underlying api
+	#[cfg(feature = "test-helpers")]
+	pub fn api(&self) -> &PoolApi {
+		&self.api
+	}
 }
 
 impl<PoolApi, Block> TransactionPool for BasicPool<PoolApi, Block>
 	where
 		Block: BlockT,
-		PoolApi: 'static + ChainApi<Block=Block>,
+		PoolApi: 'static + graph::ChainApi<Block=Block>,
 {
 	type Block = PoolApi::Block;
-	type Hash = sc_transaction_graph::ExtrinsicHash<PoolApi>;
-	type InPoolTransaction = sc_transaction_graph::base_pool::Transaction<
+	type Hash = graph::ExtrinsicHash<PoolApi>;
+	type InPoolTransaction = graph::base_pool::Transaction<
 		TxHash<Self>, TransactionFor<Self>
 	>;
 	type Error = PoolApi::Error;
@@ -361,7 +373,7 @@ where
 {
 	/// Create new basic transaction pool for a light node with the provided api.
 	pub fn new_light(
-		options: sc_transaction_graph::Options,
+		options: graph::Options,
 		prometheus: Option<&PrometheusRegistry>,
 		spawner: impl SpawnEssentialNamed,
 		client: Arc<Client>,
@@ -396,7 +408,7 @@ where
 {
 	/// Create new basic transaction pool for a full node with the provided api.
 	pub fn new_full(
-		options: sc_transaction_graph::Options,
+		options: graph::Options,
 		is_validator: IsValidator,
 		prometheus: Option<&PrometheusRegistry>,
 		spawner: impl SpawnEssentialNamed,
@@ -420,7 +432,7 @@ where
 	}
 }
 
-impl<Block, Client> sp_transaction_pool::LocalTransactionPool
+impl<Block, Client> sc_transaction_pool_api::LocalTransactionPool
 	for BasicPool<FullChainApi<Client, Block>, Block>
 where
 	Block: BlockT,
@@ -432,15 +444,15 @@ where
 	Client::Api: sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block>,
 {
 	type Block = Block;
-	type Hash = sc_transaction_graph::ExtrinsicHash<FullChainApi<Client, Block>>;
-	type Error = <FullChainApi<Client, Block> as ChainApi>::Error;
+	type Hash = graph::ExtrinsicHash<FullChainApi<Client, Block>>;
+	type Error = <FullChainApi<Client, Block> as graph::ChainApi>::Error;
 
 	fn submit_local(
 		&self,
 		at: &BlockId<Self::Block>,
-		xt: sp_transaction_pool::LocalTransactionFor<Self>,
+		xt: sc_transaction_pool_api::LocalTransactionFor<Self>,
 	) -> Result<Self::Hash, Self::Error> {
-		use sc_transaction_graph::ValidatedTransaction;
+		use graph::{ValidatedTransaction, ChainApi};
 		use sp_runtime::traits::SaturatedConversion;
 		use sp_runtime::transaction_validity::TransactionValidityError;
 
@@ -558,10 +570,10 @@ impl<N: Clone + Copy + AtLeast32Bit> RevalidationStatus<N> {
 }
 
 /// Prune the known txs for the given block.
-async fn prune_known_txs_for_block<Block: BlockT, Api: ChainApi<Block = Block>>(
+async fn prune_known_txs_for_block<Block: BlockT, Api: graph::ChainApi<Block = Block>>(
 	block_id: BlockId<Block>,
 	api: &Api,
-	pool: &sc_transaction_graph::Pool<Api>,
+	pool: &graph::Pool<Api>,
 ) -> Vec<ExtrinsicHash<Api>> {
 	let extrinsics = api.block_body(&block_id).await
 		.unwrap_or_else(|e| {
@@ -598,7 +610,7 @@ async fn prune_known_txs_for_block<Block: BlockT, Api: ChainApi<Block = Block>>(
 impl<PoolApi, Block> MaintainedTransactionPool for BasicPool<PoolApi, Block>
 	where
 		Block: BlockT,
-		PoolApi: 'static + ChainApi<Block=Block>,
+		PoolApi: 'static + graph::ChainApi<Block=Block>,
 {
 	fn maintain(&self, event: ChainEvent<Self::Block>) -> Pin<Box<dyn Future<Output=()> + Send>> {
 		match event {
diff --git a/client/transaction-pool/src/revalidation.rs b/client/transaction-pool/src/revalidation.rs
index fc18b0694d6e..ffc82bf619cc 100644
--- a/client/transaction-pool/src/revalidation.rs
+++ b/client/transaction-pool/src/revalidation.rs
@@ -20,7 +20,7 @@
 
 use std::{sync::Arc, pin::Pin, collections::{HashMap, HashSet, BTreeMap}};
 
-use sc_transaction_graph::{ChainApi, Pool, ExtrinsicHash, NumberFor, ValidatedTransaction};
+use crate::graph::{ChainApi, Pool, ExtrinsicHash, NumberFor, ValidatedTransaction};
 use sp_runtime::traits::{Zero, SaturatedConversion};
 use sp_runtime::generic::BlockId;
 use sp_runtime::transaction_validity::TransactionValidityError;
@@ -29,9 +29,9 @@ use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedSender, TracingUnbounded
 use futures::prelude::*;
 use std::time::Duration;
 
-#[cfg(not(test))]
+#[cfg(not(feature = "test-helpers"))]
 const BACKGROUND_REVALIDATION_INTERVAL: Duration = Duration::from_millis(200);
-#[cfg(test)]
+#[cfg(feature = "test-helpers")]
 pub const BACKGROUND_REVALIDATION_INTERVAL: Duration = Duration::from_millis(1);
 
 const MIN_BACKGROUND_REVALIDATION_BATCH_SIZE: usize = 20;
@@ -225,7 +225,7 @@ impl<Api: ChainApi> RevalidationWorker<Api> {
 
 					batch_revalidate(this.pool.clone(), this.api.clone(), this.best_block, next_batch).await;
 
-					#[cfg(test)]
+					#[cfg(feature = "test-helpers")]
 					{
 						use intervalier::Guard;
 						// only trigger test events if something was processed
@@ -293,6 +293,7 @@ where
 		}
 	}
 
+	/// New revalidation queue with background worker.
 	pub fn new_with_interval<R: intervalier::IntoStream>(
 		api: Arc<Api>,
 		pool: Arc<Pool<Api>>,
@@ -320,7 +321,7 @@ where
 	}
 
 	/// New revalidation queue with background worker and test signal.
-	#[cfg(test)]
+	#[cfg(feature = "test-helpers")]
 	pub fn new_test(api: Arc<Api>, pool: Arc<Pool<Api>>) ->
 		(Self, Pin<Box<dyn Future<Output=()> + Send>>, intervalier::BackSignalControl)
 	{
@@ -361,35 +362,5 @@ where
 
 #[cfg(test)]
 mod tests {
-	use super::*;
-	use sc_transaction_graph::Pool;
-	use sp_transaction_pool::TransactionSource;
-	use substrate_test_runtime_transaction_pool::{TestApi, uxt};
-	use futures::executor::block_on;
-	use substrate_test_runtime_client::AccountKeyring::*;
-
-	fn setup() -> (Arc<TestApi>, Pool<TestApi>) {
-		let test_api = Arc::new(TestApi::empty());
-		let pool = Pool::new(Default::default(), true.into(), test_api.clone());
-		(test_api, pool)
-	}
-
-	#[test]
-	fn smoky() {
-		let (api, pool) = setup();
-		let pool = Arc::new(pool);
-		let queue = Arc::new(RevalidationQueue::new(api.clone(), pool.clone()));
 
-		let uxt = uxt(Alice, 0);
-		let uxt_hash = block_on(
-			pool.submit_one(&BlockId::number(0), TransactionSource::External, uxt.clone())
-		).expect("Should be valid");
-
-		block_on(queue.revalidate_later(0, vec![uxt_hash]));
-
-		// revalidated in sync offload 2nd time
-		assert_eq!(api.validation_requests().len(), 2);
-		// number of ready
-		assert_eq!(pool.validated_pool().status().ready, 1);
-	}
 }
diff --git a/client/transaction-pool/src/testing/mod.rs b/client/transaction-pool/src/testing/mod.rs
deleted file mode 100644
index 9c7f1dfd7f33..000000000000
--- a/client/transaction-pool/src/testing/mod.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-//! Tests for top-level transaction pool api
-
-mod pool;
diff --git a/client/transaction-pool/src/testing/pool.rs b/client/transaction-pool/tests/pool.rs
similarity index 88%
rename from client/transaction-pool/src/testing/pool.rs
rename to client/transaction-pool/tests/pool.rs
index 9232a1d13ad2..9a9d59214d0b 100644
--- a/client/transaction-pool/src/testing/pool.rs
+++ b/client/transaction-pool/tests/pool.rs
@@ -16,11 +16,11 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::*;
-use sp_transaction_pool::TransactionStatus;
+//! Tests for top-level transaction pool api
+use sc_transaction_pool_api::{TransactionStatus, ChainEvent, MaintainedTransactionPool, TransactionPool};
 use futures::executor::{block_on, block_on_stream};
 use sp_runtime::{
-	generic::BlockId,
+	generic::BlockId, traits::Block as _,
 	transaction_validity::{ValidTransaction, TransactionSource, InvalidTransaction},
 };
 use substrate_test_runtime_client::{
@@ -30,10 +30,11 @@ use substrate_test_runtime_client::{
 use substrate_test_runtime_transaction_pool::{TestApi, uxt};
 use futures::{prelude::*, task::Poll};
 use codec::Encode;
-use std::collections::BTreeSet;
+use std::{collections::BTreeSet, sync::Arc, convert::TryInto};
 use sc_client_api::client::BlockchainEvents;
 use sc_block_builder::BlockBuilderProvider;
 use sp_consensus::BlockOrigin;
+use sc_transaction_pool::{*, test_helpers::*};
 
 fn pool() -> Pool<TestApi> {
 	Pool::new(Default::default(), true.into(), TestApi::with_alice_nonce(209).into())
@@ -142,10 +143,10 @@ fn only_prune_on_new_best() {
 	let _ = block_on(
 		pool.submit_and_watch(&BlockId::number(0), SOURCE, uxt.clone())
 	).expect("1. Imported");
-	pool.api.push_block(1, vec![uxt.clone()], true);
+	pool.api().push_block(1, vec![uxt.clone()], true);
 	assert_eq!(pool.status().ready, 1);
 
-	let header = pool.api.push_block(2, vec![uxt], true);
+	let header = pool.api().push_block(2, vec![uxt], true);
 	let event = ChainEvent::NewBestBlock {
 		hash: header.hash(),
 		tree_route: None,
@@ -220,7 +221,7 @@ fn should_prune_old_during_maintenance() {
 	block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt.clone())).expect("1. Imported");
 	assert_eq!(pool.status().ready, 1);
 
-	let header = pool.api.push_block(1, vec![xt.clone()], true);
+	let header = pool.api().push_block(1, vec![xt.clone()], true);
 
 	block_on(pool.maintain(block_event(header)));
 	assert_eq!(pool.status().ready, 0);
@@ -235,16 +236,16 @@ fn should_revalidate_during_maintenance() {
 	block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt1.clone())).expect("1. Imported");
 	block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt2.clone())).expect("2. Imported");
 	assert_eq!(pool.status().ready, 2);
-	assert_eq!(pool.api.validation_requests().len(), 2);
+	assert_eq!(pool.api().validation_requests().len(), 2);
 
-	let header = pool.api.push_block(1, vec![xt1.clone()], true);
+	let header = pool.api().push_block(1, vec![xt1.clone()], true);
 
 	block_on(pool.maintain(block_event(header)));
 	assert_eq!(pool.status().ready, 1);
 	block_on(notifier.next());
 
 	// test that pool revalidated transaction that left ready and not included in the block
-	assert_eq!(pool.api.validation_requests().len(), 3);
+	assert_eq!(pool.api().validation_requests().len(), 3);
 }
 
 #[test]
@@ -256,10 +257,10 @@ fn should_resubmit_from_retracted_during_maintenance() {
 	block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt.clone())).expect("1. Imported");
 	assert_eq!(pool.status().ready, 1);
 
-	let header = pool.api.push_block(1, vec![], true);
-	let fork_header = pool.api.push_block(1, vec![], false);
+	let header = pool.api().push_block(1, vec![], true);
+	let fork_header = pool.api().push_block(1, vec![], false);
 
-	let event = block_event_with_retracted(header, fork_header.hash(), &*pool.api);
+	let event = block_event_with_retracted(header, fork_header.hash(), &*pool.api());
 
 	block_on(pool.maintain(event));
 	assert_eq!(pool.status().ready, 1);
@@ -275,10 +276,10 @@ fn should_not_resubmit_from_retracted_during_maintenance_if_tx_is_also_in_enacte
 	block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt.clone())).expect("1. Imported");
 	assert_eq!(pool.status().ready, 1);
 
-	let header = pool.api.push_block(1, vec![xt.clone()], true);
-	let fork_header = pool.api.push_block(1, vec![xt], false);
+	let header = pool.api().push_block(1, vec![xt.clone()], true);
+	let fork_header = pool.api().push_block(1, vec![xt], false);
 
-	let event = block_event_with_retracted(header, fork_header.hash(), &*pool.api);
+	let event = block_event_with_retracted(header, fork_header.hash(), &*pool.api());
 
 	block_on(pool.maintain(event));
 	assert_eq!(pool.status().ready, 0);
@@ -293,11 +294,11 @@ fn should_not_retain_invalid_hashes_from_retracted() {
 	block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt.clone())).expect("1. Imported");
 	assert_eq!(pool.status().ready, 1);
 
-	let header = pool.api.push_block(1, vec![], true);
-	let fork_header = pool.api.push_block(1, vec![xt.clone()], false);
-	pool.api.add_invalid(&xt);
+	let header = pool.api().push_block(1, vec![], true);
+	let fork_header = pool.api().push_block(1, vec![xt.clone()], false);
+	pool.api().add_invalid(&xt);
 
-	let event = block_event_with_retracted(header, fork_header.hash(), &*pool.api);
+	let event = block_event_with_retracted(header, fork_header.hash(), &*pool.api());
 
 	block_on(pool.maintain(event));
 	block_on(notifier.next());
@@ -317,20 +318,20 @@ fn should_revalidate_across_many_blocks() {
 	block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt2.clone())).expect("1. Imported");
 	assert_eq!(pool.status().ready, 2);
 
-	let header = pool.api.push_block(1, vec![], true);
+	let header = pool.api().push_block(1, vec![], true);
 	block_on(pool.maintain(block_event(header)));
 	block_on(notifier.next());
 
 	block_on(pool.submit_one(&BlockId::number(1), SOURCE, xt3.clone())).expect("1. Imported");
 	assert_eq!(pool.status().ready, 3);
 
-	let header = pool.api.push_block(2, vec![xt1.clone()], true);
+	let header = pool.api().push_block(2, vec![xt1.clone()], true);
 	block_on(pool.maintain(block_event(header)));
 	block_on(notifier.next());
 
 	assert_eq!(pool.status().ready, 2);
 	// xt1 and xt2 validated twice, then xt3 once, then xt2 and xt3 again
-	assert_eq!(pool.api.validation_requests().len(), 7);
+	assert_eq!(pool.api().validation_requests().len(), 7);
 }
 
 
@@ -366,11 +367,11 @@ fn should_push_watchers_during_maintenance() {
 	assert_eq!(pool.status().ready, 5);
 
 	// when
-	pool.api.add_invalid(&tx3);
-	pool.api.add_invalid(&tx4);
+	pool.api().add_invalid(&tx3);
+	pool.api().add_invalid(&tx4);
 
 	// clear timer events if any
-	let header = pool.api.push_block(1, vec![], true);
+	let header = pool.api().push_block(1, vec![], true);
 	block_on(pool.maintain(block_event(header)));
 	block_on(notifier.next());
 
@@ -388,7 +389,7 @@ fn should_push_watchers_during_maintenance() {
 	);
 
 	// when
-	let header = pool.api.push_block(2, vec![tx0, tx1, tx2], true);
+	let header = pool.api().push_block(2, vec![tx0, tx1, tx2], true);
 	let header_hash = header.hash();
 	block_on(pool.maintain(block_event(header)));
 
@@ -442,9 +443,9 @@ fn finalization() {
 	let watcher = block_on(
 		pool.submit_and_watch(&BlockId::number(1), SOURCE, xt.clone())
 	).expect("1. Imported");
-	pool.api.push_block(2, vec![xt.clone()], true);
+	pool.api().push_block(2, vec![xt.clone()], true);
 
-	let header = pool.api.chain().read().block_by_number.get(&2).unwrap()[0].0.header().clone();
+	let header = pool.api().chain().read().block_by_number.get(&2).unwrap()[0].0.header().clone();
 	let event = ChainEvent::NewBestBlock {
 		hash: header.hash(),
 		tree_route: None,
@@ -474,10 +475,10 @@ fn fork_aware_finalization() {
 	let from_dave = uxt(Dave, 2);
 	let from_bob = uxt(Bob, 1);
 	let from_charlie = uxt(Charlie, 1);
-	pool.api.increment_nonce(Alice.into());
-	pool.api.increment_nonce(Dave.into());
-	pool.api.increment_nonce(Charlie.into());
-	pool.api.increment_nonce(Bob.into());
+	pool.api().increment_nonce(Alice.into());
+	pool.api().increment_nonce(Dave.into());
+	pool.api().increment_nonce(Charlie.into());
+	pool.api().increment_nonce(Bob.into());
 
 	let from_dave_watcher;
 	let from_bob_watcher;
@@ -491,7 +492,7 @@ fn fork_aware_finalization() {
 		let watcher = block_on(
 			pool.submit_and_watch(&BlockId::number(1), SOURCE, from_alice.clone())
 		).expect("1. Imported");
-		let header = pool.api.push_block(2, vec![from_alice.clone()], true);
+		let header = pool.api().push_block(2, vec![from_alice.clone()], true);
 		canon_watchers.push((watcher, header.hash()));
 		assert_eq!(pool.status().ready, 1);
 
@@ -508,7 +509,7 @@ fn fork_aware_finalization() {
 
 	// block C2
 	{
-		let header = pool.api.push_block_with_parent(b1, vec![from_dave.clone()], true);
+		let header = pool.api().push_block_with_parent(b1, vec![from_dave.clone()], true);
 		from_dave_watcher = block_on(
 			pool.submit_and_watch(&BlockId::number(1), SOURCE, from_dave.clone())
 		).expect("1. Imported");
@@ -528,7 +529,7 @@ fn fork_aware_finalization() {
 			pool.submit_and_watch(&BlockId::number(1), SOURCE, from_bob.clone())
 		).expect("1. Imported");
 		assert_eq!(pool.status().ready, 1);
-		let header = pool.api.push_block_with_parent(c2, vec![from_bob.clone()], true);
+		let header = pool.api().push_block_with_parent(c2, vec![from_bob.clone()], true);
 
 		let event = ChainEvent::NewBestBlock {
 			hash: header.hash(),
@@ -545,10 +546,10 @@ fn fork_aware_finalization() {
 			pool.submit_and_watch(&BlockId::number(1), SOURCE, from_charlie.clone())
 		).expect("1.Imported");
 		assert_eq!(pool.status().ready, 1);
-		let header = pool.api.push_block(3, vec![from_charlie.clone()], true);
+		let header = pool.api().push_block(3, vec![from_charlie.clone()], true);
 
 		canon_watchers.push((watcher, header.hash()));
-		let event = block_event_with_retracted(header.clone(), d2, &*pool.api);
+		let event = block_event_with_retracted(header.clone(), d2, &*pool.api());
 		block_on(pool.maintain(event));
 		assert_eq!(pool.status().ready, 2);
 
@@ -563,7 +564,7 @@ fn fork_aware_finalization() {
 			pool.submit_and_watch(&BlockId::number(1), SOURCE, xt.clone())
 		).expect("1. Imported");
 		assert_eq!(pool.status().ready, 3);
-		let header = pool.api.push_block(4, vec![xt.clone()], true);
+		let header = pool.api().push_block(4, vec![xt.clone()], true);
 		canon_watchers.push((w, header.hash()));
 
 		let event = ChainEvent::NewBestBlock {
@@ -581,7 +582,7 @@ fn fork_aware_finalization() {
 
 	// block e1
 	{
-		let header = pool.api.push_block(5, vec![from_dave, from_bob], true);
+		let header = pool.api().push_block(5, vec![from_dave, from_bob], true);
 		e1 = header.hash();
 		let event = ChainEvent::NewBestBlock {
 			hash: header.hash(),
@@ -636,7 +637,7 @@ fn prune_and_retract_tx_at_same_time() {
 	let (pool, _background, _) = BasicPool::new_test(api.into());
 
 	let from_alice = uxt(Alice, 1);
-	pool.api.increment_nonce(Alice.into());
+	pool.api().increment_nonce(Alice.into());
 
 	let watcher = block_on(
 		pool.submit_and_watch(&BlockId::number(1), SOURCE, from_alice.clone())
@@ -644,7 +645,7 @@ fn prune_and_retract_tx_at_same_time() {
 
 	// Block B1
 	let b1 = {
-		let header = pool.api.push_block(2, vec![from_alice.clone()], true);
+		let header = pool.api().push_block(2, vec![from_alice.clone()], true);
 		assert_eq!(pool.status().ready, 1);
 
 		let event = ChainEvent::NewBestBlock {
@@ -658,10 +659,10 @@ fn prune_and_retract_tx_at_same_time() {
 
 	// Block B2
 	let b2 = {
-		let header = pool.api.push_block(2, vec![from_alice.clone()], false);
+		let header = pool.api().push_block(2, vec![from_alice.clone()], false);
 		assert_eq!(pool.status().ready, 0);
 
-		let event = block_event_with_retracted(header.clone(), b1, &*pool.api);
+		let event = block_event_with_retracted(header.clone(), b1, &*pool.api());
 		block_on(pool.maintain(event));
 		assert_eq!(pool.status().ready, 0);
 
@@ -708,8 +709,8 @@ fn resubmit_tx_of_fork_that_is_not_part_of_retracted() {
 
 	let tx0 = uxt(Alice, 1);
 	let tx1 = uxt(Dave, 2);
-	pool.api.increment_nonce(Alice.into());
-	pool.api.increment_nonce(Dave.into());
+	pool.api().increment_nonce(Alice.into());
+	pool.api().increment_nonce(Dave.into());
 
 	let d0;
 
@@ -718,7 +719,7 @@ fn resubmit_tx_of_fork_that_is_not_part_of_retracted() {
 		let _ = block_on(
 			pool.submit_and_watch(&BlockId::number(1), SOURCE, tx0.clone())
 		).expect("1. Imported");
-		let header = pool.api.push_block(2, vec![tx0.clone()], true);
+		let header = pool.api().push_block(2, vec![tx0.clone()], true);
 		assert_eq!(pool.status().ready, 1);
 
 		let event = ChainEvent::NewBestBlock {
@@ -735,14 +736,14 @@ fn resubmit_tx_of_fork_that_is_not_part_of_retracted() {
 		let _ = block_on(
 			pool.submit_and_watch(&BlockId::number(1), SOURCE, tx1.clone())
 		).expect("1. Imported");
-		pool.api.push_block(2, vec![tx1.clone()], false);
+		pool.api().push_block(2, vec![tx1.clone()], false);
 		assert_eq!(pool.status().ready, 1);
 	}
 
 	// Block D2
 	{
-		let header = pool.api.push_block(2, vec![], false);
-		let event = block_event_with_retracted(header, d0, &*pool.api);
+		let header = pool.api().push_block(2, vec![], false);
+		let event = block_event_with_retracted(header, d0, &*pool.api());
 		block_on(pool.maintain(event));
 		assert_eq!(pool.status().ready, 2);
 	}
@@ -765,19 +766,19 @@ fn resubmit_from_retracted_fork() {
 	let tx4 = uxt(Ferdie, 2);
 	let tx5 = uxt(One, 3);
 
-	pool.api.increment_nonce(Alice.into());
-	pool.api.increment_nonce(Dave.into());
-	pool.api.increment_nonce(Bob.into());
-	pool.api.increment_nonce(Eve.into());
-	pool.api.increment_nonce(Ferdie.into());
-	pool.api.increment_nonce(One.into());
+	pool.api().increment_nonce(Alice.into());
+	pool.api().increment_nonce(Dave.into());
+	pool.api().increment_nonce(Bob.into());
+	pool.api().increment_nonce(Eve.into());
+	pool.api().increment_nonce(Ferdie.into());
+	pool.api().increment_nonce(One.into());
 
 	// Block D0
 	{
 		let _ = block_on(
 			pool.submit_and_watch(&BlockId::number(1), SOURCE, tx0.clone())
 		).expect("1. Imported");
-		let header = pool.api.push_block(2, vec![tx0.clone()], true);
+		let header = pool.api().push_block(2, vec![tx0.clone()], true);
 		assert_eq!(pool.status().ready, 1);
 
 		block_on(pool.maintain(block_event(header)));
@@ -789,7 +790,7 @@ fn resubmit_from_retracted_fork() {
 		let _ = block_on(
 			pool.submit_and_watch(&BlockId::number(1), SOURCE, tx1.clone())
 		).expect("1. Imported");
-		let header = pool.api.push_block(3, vec![tx1.clone()], true);
+		let header = pool.api().push_block(3, vec![tx1.clone()], true);
 		block_on(pool.maintain(block_event(header)));
 		assert_eq!(pool.status().ready, 0);
 	}
@@ -799,7 +800,7 @@ fn resubmit_from_retracted_fork() {
 		let _ = block_on(
 			pool.submit_and_watch(&BlockId::number(1), SOURCE, tx2.clone())
 		).expect("1. Imported");
-		let header = pool.api.push_block(4, vec![tx2.clone()], true);
+		let header = pool.api().push_block(4, vec![tx2.clone()], true);
 		block_on(pool.maintain(block_event(header.clone())));
 		assert_eq!(pool.status().ready, 0);
 		header.hash()
@@ -810,7 +811,7 @@ fn resubmit_from_retracted_fork() {
 		let _ = block_on(
 			pool.submit_and_watch(&BlockId::number(1), SOURCE, tx3.clone())
 		).expect("1. Imported");
-		let header = pool.api.push_block(2, vec![tx3.clone()], true);
+		let header = pool.api().push_block(2, vec![tx3.clone()], true);
 		assert_eq!(pool.status().ready, 1);
 		header.hash()
 	};
@@ -820,7 +821,7 @@ fn resubmit_from_retracted_fork() {
 		let _ = block_on(
 			pool.submit_and_watch(&BlockId::number(1), SOURCE, tx4.clone())
 		).expect("1. Imported");
-		let header = pool.api.push_block_with_parent(d1.clone(), vec![tx4.clone()], true);
+		let header = pool.api().push_block_with_parent(d1.clone(), vec![tx4.clone()], true);
 		assert_eq!(pool.status().ready, 2);
 		header.hash()
 	};
@@ -830,7 +831,7 @@ fn resubmit_from_retracted_fork() {
 		let _ = block_on(
 			pool.submit_and_watch(&BlockId::number(1), SOURCE, tx5.clone())
 		).expect("1. Imported");
-		let header = pool.api.push_block_with_parent(e1.clone(), vec![tx5.clone()], true);
+		let header = pool.api().push_block_with_parent(e1.clone(), vec![tx5.clone()], true);
 		// Don't announce the block event to the pool directly, because we will
 		// re-org to this block.
 		assert_eq!(pool.status().ready, 3);
@@ -841,7 +842,7 @@ fn resubmit_from_retracted_fork() {
 	let expected_ready = vec![tx3, tx4, tx5].iter().map(Encode::encode).collect::<BTreeSet<_>>();
 	assert_eq!(expected_ready, ready);
 
-	let event = block_event_with_retracted(f1_header, f0, &*pool.api);
+	let event = block_event_with_retracted(f1_header, f0, &*pool.api());
 	block_on(pool.maintain(event));
 
 	assert_eq!(pool.status().ready, 3);
@@ -862,7 +863,7 @@ fn ready_set_should_not_resolve_before_block_update() {
 #[test]
 fn ready_set_should_resolve_after_block_update() {
 	let (pool, _guard, _notifier) = maintained_pool();
-	let header = pool.api.push_block(1, vec![], true);
+	let header = pool.api().push_block(1, vec![], true);
 
 	let xt1 = uxt(Alice, 209);
 
@@ -875,7 +876,7 @@ fn ready_set_should_resolve_after_block_update() {
 #[test]
 fn ready_set_should_eventually_resolve_when_block_update_arrives() {
 	let (pool, _guard, _notifier) = maintained_pool();
-	let header = pool.api.push_block(1, vec![], true);
+	let header = pool.api().push_block(1, vec![], true);
 
 	let xt1 = uxt(Alice, 209);
 
@@ -926,7 +927,8 @@ fn should_not_accept_old_signatures() {
 
 	// generated with schnorrkel 0.1.1 from `_bytes`
 	let old_singature = sp_core::sr25519::Signature::try_from(&hex::decode(
-		"c427eb672e8c441c86d31f1a81b22b43102058e9ce237cabe9897ea5099ffd426cd1c6a1f4f2869c3df57901d36bedcb295657adb3a4355add86ed234eb83108"
+		"c427eb672e8c441c86d31f1a81b22b43102058e9ce237cabe9897ea5099ffd426\
+		cd1c6a1f4f2869c3df57901d36bedcb295657adb3a4355add86ed234eb83108"
 	).expect("hex invalid")[..]).expect("signature construction failed");
 
 	let xt = Extrinsic::Transfer {
@@ -938,7 +940,7 @@ fn should_not_accept_old_signatures() {
 	assert_matches::assert_matches!(
 		block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt.clone())),
 		Err(error::Error::Pool(
-			sp_transaction_pool::error::Error::InvalidTransaction(InvalidTransaction::BadProof)
+			sc_transaction_pool_api::error::Error::InvalidTransaction(InvalidTransaction::BadProof)
 		)),
 		"Should be invalid transaction with bad proof",
 	);
@@ -985,7 +987,7 @@ fn pruning_a_transaction_should_remove_it_from_best_transaction() {
 
 	block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt1.clone())).expect("1. Imported");
 	assert_eq!(pool.status().ready, 1);
-	let header = pool.api.push_block(1, vec![xt1.clone()], true);
+	let header = pool.api().push_block(1, vec![xt1.clone()], true);
 
 	// This will prune `xt1`.
 	block_on(pool.maintain(block_event(header)));
@@ -1002,10 +1004,10 @@ fn only_revalidate_on_best_block() {
 	block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt.clone())).expect("1. Imported");
 	assert_eq!(pool.status().ready, 1);
 
-	let header = pool.api.push_block(1, vec![], true);
+	let header = pool.api().push_block(1, vec![], true);
 
-	pool.api.push_block(2, vec![], false);
-	pool.api.push_block(2, vec![], false);
+	pool.api().push_block(2, vec![], false);
+	pool.api().push_block(2, vec![], false);
 
 	block_on(pool.maintain(block_event(header)));
 	block_on(notifier.next());
@@ -1073,7 +1075,7 @@ fn stale_transactions_are_pruned() {
 	];
 
 	// Import block
-	let header = pool.api.push_block(1, xts, true);
+	let header = pool.api().push_block(1, xts, true);
 	block_on(pool.maintain(block_event(header)));
 	// The imported transactions have a different hash and should not evict our initial
 	// transactions.
@@ -1081,7 +1083,7 @@ fn stale_transactions_are_pruned() {
 
 	// Import enough blocks to make our transactions stale
 	for n in 1..66 {
-		let header = pool.api.push_block(n, vec![], true);
+		let header = pool.api().push_block(n, vec![], true);
 		block_on(pool.maintain(block_event(header)));
 	}
 
diff --git a/client/transaction-pool/tests/revalidation.rs b/client/transaction-pool/tests/revalidation.rs
new file mode 100644
index 000000000000..d720f09a7fce
--- /dev/null
+++ b/client/transaction-pool/tests/revalidation.rs
@@ -0,0 +1,32 @@
+use sc_transaction_pool::test_helpers::{Pool, RevalidationQueue};
+use sc_transaction_pool_api::TransactionSource;
+use substrate_test_runtime_transaction_pool::{TestApi, uxt};
+use futures::executor::block_on;
+use substrate_test_runtime_client::AccountKeyring::*;
+use std::sync::Arc;
+use sp_runtime::generic::BlockId;
+
+fn setup() -> (Arc<TestApi>, Pool<TestApi>) {
+    let test_api = Arc::new(TestApi::empty());
+    let pool = Pool::new(Default::default(), true.into(), test_api.clone());
+    (test_api, pool)
+}
+
+#[test]
+fn smoky() {
+    let (api, pool) = setup();
+    let pool = Arc::new(pool);
+    let queue = Arc::new(RevalidationQueue::new(api.clone(), pool.clone()));
+
+    let uxt = uxt(Alice, 0);
+    let uxt_hash = block_on(
+        pool.submit_one(&BlockId::number(0), TransactionSource::External, uxt.clone())
+    ).expect("Should be valid");
+
+    block_on(queue.revalidate_later(0, vec![uxt_hash]));
+
+    // revalidated in sync offload 2nd time
+    assert_eq!(api.validation_requests().len(), 2);
+    // number of ready
+    assert_eq!(pool.validated_pool().status().ready, 1);
+}
\ No newline at end of file
diff --git a/primitives/transaction-pool/Cargo.toml b/primitives/transaction-pool/Cargo.toml
index d431e444d457..d6c2d716ee84 100644
--- a/primitives/transaction-pool/Cargo.toml
+++ b/primitives/transaction-pool/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 license = "Apache-2.0"
 homepage = "https://substrate.dev"
 repository = "https://github.com/paritytech/substrate/"
-description = "Transaction pool primitives types & Runtime API."
+description = "Transaction pool runtime facing API."
 documentation = "https://docs.rs/sp-transaction-pool"
 readme = "README.md"
 
@@ -14,26 +14,12 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-thiserror = { version = "1.0.21", optional = true }
-codec = { package = "parity-scale-codec", version = "2.0.0", optional = true }
-derive_more = { version = "0.99.11", optional = true }
-futures = { version = "0.3.1", optional = true }
-log = { version = "0.4.8", optional = true }
-serde = { version = "1.0.101", features = ["derive"], optional = true}
 sp-api = { version = "3.0.0", default-features = false, path = "../api" }
-sp-blockchain = { version = "3.0.0", optional = true, path = "../blockchain" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../runtime" }
 
 [features]
 default = [ "std" ]
 std = [
-	"codec",
-	"derive_more",
-	"futures",
-	"log",
-	"serde",
-	"thiserror",
 	"sp-api/std",
-	"sp-blockchain",
 	"sp-runtime/std",
 ]
diff --git a/primitives/transaction-pool/src/lib.rs b/primitives/transaction-pool/src/lib.rs
index 276c53443eb7..3c71149255ce 100644
--- a/primitives/transaction-pool/src/lib.rs
+++ b/primitives/transaction-pool/src/lib.rs
@@ -15,20 +15,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Transaction pool primitives types & Runtime API.
+//! Transaction pool runtime facing API.
 
 #![warn(missing_docs)]
 #![cfg_attr(not(feature = "std"), no_std)]
 
 pub mod runtime_api;
-#[cfg(feature = "std")]
-pub mod error;
-#[cfg(feature = "std")]
-mod pool;
-
-#[cfg(feature = "std")]
-pub use pool::*;
-
-pub use sp_runtime::transaction_validity::{
-	TransactionLongevity, TransactionPriority, TransactionTag, TransactionSource,
-};
diff --git a/test-utils/runtime/transaction-pool/Cargo.toml b/test-utils/runtime/transaction-pool/Cargo.toml
index 6e4e6524c369..f0c5a19869df 100644
--- a/test-utils/runtime/transaction-pool/Cargo.toml
+++ b/test-utils/runtime/transaction-pool/Cargo.toml
@@ -17,7 +17,7 @@ parking_lot = "0.11.1"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
 sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
-sp-transaction-pool = { version = "3.0.0", path = "../../../primitives/transaction-pool" }
-sc-transaction-graph = { version = "3.0.0", path = "../../../client/transaction-pool/graph" }
+sc-transaction-pool = { version = "3.0.0", path = "../../../client/transaction-pool", features = ["test-helpers"] }
+sc-transaction-pool-api = { version = "3.0.0", path = "../../../client/transaction-pool/api" }
 futures = { version = "0.3.1", features = ["compat"] }
 derive_more = "0.99.2"
diff --git a/test-utils/runtime/transaction-pool/src/lib.rs b/test-utils/runtime/transaction-pool/src/lib.rs
index 91f26b1921ce..b3717d22a8be 100644
--- a/test-utils/runtime/transaction-pool/src/lib.rs
+++ b/test-utils/runtime/transaction-pool/src/lib.rs
@@ -39,10 +39,10 @@ use futures::future::ready;
 
 /// Error type used by [`TestApi`].
 #[derive(Debug, derive_more::From, derive_more::Display)]
-pub struct Error(sp_transaction_pool::error::Error);
+pub struct Error(sc_transaction_pool_api::error::Error);
 
-impl sp_transaction_pool::error::IntoPoolError for Error {
-	fn into_pool_error(self) -> Result<sp_transaction_pool::error::Error, Self> {
+impl sc_transaction_pool_api::error::IntoPoolError for Error {
+	fn into_pool_error(self) -> Result<sc_transaction_pool_api::error::Error, Self> {
 		Ok(self.0)
 	}
 }
@@ -226,7 +226,7 @@ impl TestApi {
 	}
 }
 
-impl sc_transaction_graph::ChainApi for TestApi {
+impl sc_transaction_pool::test_helpers::ChainApi for TestApi {
 	type Block = Block;
 	type Error = Error;
 	type ValidationFuture = futures::future::Ready<Result<TransactionValidity, Error>>;
@@ -236,7 +236,7 @@ impl sc_transaction_graph::ChainApi for TestApi {
 		&self,
 		at: &BlockId<Self::Block>,
 		_source: TransactionSource,
-		uxt: sc_transaction_graph::ExtrinsicFor<Self>,
+		uxt: sc_transaction_pool::test_helpers::ExtrinsicFor<Self>,
 	) -> Self::ValidationFuture {
 		self.validation_requests.write().push(uxt.clone());
 
@@ -300,7 +300,7 @@ impl sc_transaction_graph::ChainApi for TestApi {
 	fn block_id_to_number(
 		&self,
 		at: &BlockId<Self::Block>,
-	) -> Result<Option<sc_transaction_graph::NumberFor<Self>>, Error> {
+	) -> Result<Option<sc_transaction_pool::test_helpers::NumberFor<Self>>, Error> {
 		Ok(match at {
 			generic::BlockId::Hash(x) => self.chain
 				.read()
@@ -314,7 +314,7 @@ impl sc_transaction_graph::ChainApi for TestApi {
 	fn block_id_to_hash(
 		&self,
 		at: &BlockId<Self::Block>,
-	) -> Result<Option<sc_transaction_graph::BlockHash<Self>>, Error> {
+	) -> Result<Option<sc_transaction_pool::test_helpers::BlockHash<Self>>, Error> {
 		Ok(match at {
 			generic::BlockId::Hash(x) => Some(x.clone()),
 			generic::BlockId::Number(num) => self.chain
@@ -327,7 +327,7 @@ impl sc_transaction_graph::ChainApi for TestApi {
 
 	fn hash_and_length(
 		&self,
-		ex: &sc_transaction_graph::ExtrinsicFor<Self>,
+		ex: &sc_transaction_pool::test_helpers::ExtrinsicFor<Self>,
 	) -> (Hash, usize) {
 		Self::hash_and_length_inner(ex)
 	}
diff --git a/test-utils/test-runner/Cargo.toml b/test-utils/test-runner/Cargo.toml
index 9e1f9fee0218..cf171b0ea5ef 100644
--- a/test-utils/test-runner/Cargo.toml
+++ b/test-utils/test-runner/Cargo.toml
@@ -15,7 +15,7 @@ sc-cli = { version = "0.9.0", path = "../../client/cli" }
 sc-basic-authorship = { version = "0.9.0", path = "../../client/basic-authorship" }
 sc-rpc = { version = "3.0.0", path = "../../client/rpc" }
 sc-transaction-pool = { version = "3.0.0", path = "../../client/transaction-pool" }
-sc-transaction-graph = { version = "3.0.0", path = "../../client/transaction-pool/graph" }
+sc-transaction-pool-api = { version = "3.0.0", path = "../../client/transaction-pool/api" }
 sc-client-api = { version = "3.0.0", path = "../../client/api" }
 sc-rpc-server = { version = "3.0.0", path = "../../client/rpc-servers" }
 manual-seal = { package = "sc-consensus-manual-seal", version = "0.9.0", path = "../../client/consensus/manual-seal" }
diff --git a/test-utils/test-runner/src/node.rs b/test-utils/test-runner/src/node.rs
index 00be12b651bc..92fc3dbcda47 100644
--- a/test-utils/test-runner/src/node.rs
+++ b/test-utils/test-runner/src/node.rs
@@ -41,7 +41,7 @@ use sp_runtime::{generic::UncheckedExtrinsic, traits::NumberFor};
 use sp_session::SessionKeys;
 use sp_state_machine::Ext;
 use sp_transaction_pool::runtime_api::TaggedTransactionQueue;
-use sp_transaction_pool::TransactionPool;
+use sc_transaction_pool_api::TransactionPool;
 
 use crate::{ChainInfo, utils::logger};
 use log::LevelFilter;
@@ -66,7 +66,7 @@ pub struct Node<T: ChainInfo> {
 			Block = T::Block,
 			Hash = <T::Block as BlockT>::Hash,
 			Error = sc_transaction_pool::error::Error,
-			InPoolTransaction = sc_transaction_graph::base_pool::Transaction<
+			InPoolTransaction = sc_transaction_pool::Transaction<
 				<T::Block as BlockT>::Hash,
 				<T::Block as BlockT>::Extrinsic,
 			>,
@@ -193,7 +193,7 @@ impl<T: ChainInfo> Node<T> {
 			block_import,
 			env,
 			client: client.clone(),
-			pool: transaction_pool.pool().clone(),
+			pool: transaction_pool.clone(),
 			commands_stream,
 			select_chain,
 			consensus_data_provider,
diff --git a/utils/frame/rpc/system/Cargo.toml b/utils/frame/rpc/system/Cargo.toml
index ea8d97a82ad3..3572400cee52 100644
--- a/utils/frame/rpc/system/Cargo.toml
+++ b/utils/frame/rpc/system/Cargo.toml
@@ -26,7 +26,7 @@ sp-api = { version = "3.0.0", path = "../../../../primitives/api" }
 frame-system-rpc-runtime-api = { version = "3.0.0", path = "../../../../frame/system/rpc/runtime-api" }
 sp-core = { version = "3.0.0", path = "../../../../primitives/core" }
 sp-blockchain = { version = "3.0.0", path = "../../../../primitives/blockchain" }
-sp-transaction-pool = { version = "3.0.0", path = "../../../../primitives/transaction-pool" }
+sc-transaction-pool-api = { version = "3.0.0", path = "../../../../client/transaction-pool/api" }
 sp-block-builder = { version = "3.0.0", path = "../../../../primitives/block-builder" }
 sc-rpc-api = { version = "0.9.0", path = "../../../../client/rpc-api" }
 
diff --git a/utils/frame/rpc/system/src/lib.rs b/utils/frame/rpc/system/src/lib.rs
index bbc51a28a59c..e80d457de98d 100644
--- a/utils/frame/rpc/system/src/lib.rs
+++ b/utils/frame/rpc/system/src/lib.rs
@@ -36,7 +36,7 @@ use sp_runtime::{
 	traits,
 };
 use sp_core::{hexdisplay::HexDisplay, Bytes};
-use sp_transaction_pool::{TransactionPool, InPoolTransaction};
+use sc_transaction_pool_api::{TransactionPool, InPoolTransaction};
 use sp_block_builder::BlockBuilder;
 use sc_rpc_api::DenyUnsafe;
 

From 279369e7e4b580e9cbc48c6cbae6ccd8f13825ae Mon Sep 17 00:00:00 2001
From: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
Date: Thu, 8 Jul 2021 19:04:38 +0200
Subject: [PATCH 0975/1194] make submit_unsigned into
 DispatchClass::Operational (#9309)

Closes #8511.
---
 frame/election-provider-multi-phase/src/lib.rs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index cea42fc08b46..f1d01a248111 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -829,11 +829,14 @@ pub mod pallet {
 		/// putting their authoring reward at risk.
 		///
 		/// No deposit or reward is associated with this submission.
-		#[pallet::weight(T::WeightInfo::submit_unsigned(
-			witness.voters,
-			witness.targets,
-			solution.compact.voter_count() as u32,
-			solution.compact.unique_targets().len() as u32
+		#[pallet::weight((
+			T::WeightInfo::submit_unsigned(
+				witness.voters,
+				witness.targets,
+				solution.compact.voter_count() as u32,
+				solution.compact.unique_targets().len() as u32
+			),
+			DispatchClass::Operational,
 		))]
 		pub fn submit_unsigned(
 			origin: OriginFor<T>,
@@ -904,7 +907,7 @@ pub mod pallet {
 
 			// Note: we don't `rotate_round` at this point; the next call to
 			// `ElectionProvider::elect` will succeed and take care of that.
-			
+
 			let solution = ReadySolution {
 				supports,
 				score: [0, 0, 0],

From deac6324a16fc4128b94a7b4c3826eebcb86917f Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Fri, 9 Jul 2021 21:55:31 +0200
Subject: [PATCH 0976/1194] Make election benchmarks more *memory-aware*
 (#9286)

* Make benchmarks a bit better with mem

* Make election benchmarks more *memory-aware*

* Fix a few errors

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_election_provider_multi_phase --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/election-provider-multi-phase/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Manually fix the weights

* Update lock file

* remove dupe

* Fix tests

* cargo update pwasm

Co-authored-by: Parity Bot <admin@parity.io>
---
 bin/node/runtime/src/lib.rs                   |  16 +-
 client/allocator/src/freeing_bump.rs          |  19 +-
 .../src/benchmarking.rs                       | 179 ++++++++++++------
 .../election-provider-multi-phase/src/lib.rs  |  39 +++-
 .../election-provider-multi-phase/src/mock.rs |  30 ++-
 .../src/unsigned.rs                           |   2 +-
 .../src/weights.rs                            | 120 ++++++------
 frame/election-provider-support/src/lib.rs    |  21 +-
 frame/staking/src/lib.rs                      |  51 +++++
 utils/frame/benchmarking-cli/src/command.rs   |  19 +-
 utils/frame/benchmarking-cli/src/lib.rs       |   8 +-
 11 files changed, 356 insertions(+), 148 deletions(-)

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index c29a3ebc176a..6a25a278f2c7 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -554,6 +554,19 @@ sp_npos_elections::generate_solution_type!(
 pub const MAX_NOMINATIONS: u32 =
 	<NposCompactSolution16 as sp_npos_elections::CompactSolution>::LIMIT as u32;
 
+/// The numbers configured here should always be more than the the maximum limits of staking pallet
+/// to ensure election snapshot will not run out of memory.
+pub struct BenchmarkConfig;
+impl pallet_election_provider_multi_phase::BenchmarkingConfig for BenchmarkConfig {
+	const VOTERS: [u32; 2] = [5_000, 10_000];
+	const TARGETS: [u32; 2] = [1_000, 2_000];
+	const ACTIVE_VOTERS: [u32; 2] = [1000, 4_000];
+	const DESIRED_TARGETS: [u32; 2] = [400, 800];
+	const SNAPSHOT_MAXIMUM_VOTERS: u32 = 25_000;
+	const MINER_MAXIMUM_VOTERS: u32 = 15_000;
+	const MAXIMUM_TARGETS: u32 = 2000;
+}
+
 impl pallet_election_provider_multi_phase::Config for Runtime {
 	type Event = Event;
 	type Currency = Balances;
@@ -579,7 +592,7 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
 	type Fallback = Fallback;
 	type WeightInfo = pallet_election_provider_multi_phase::weights::SubstrateWeight<Runtime>;
 	type ForceOrigin = EnsureRootOrHalfCouncil;
-	type BenchmarkingConfig = ();
+	type BenchmarkingConfig = BenchmarkConfig;
 }
 
 parameter_types! {
@@ -1578,7 +1591,6 @@ impl_runtime_apis! {
 			add_benchmark!(params, batches, pallet_uniques, Uniques);
 			add_benchmark!(params, batches, pallet_utility, Utility);
 			add_benchmark!(params, batches, pallet_vesting, Vesting);
-			add_benchmark!(params, batches, pallet_election_provider_multi_phase, ElectionProviderMultiPhase);
 
 			if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) }
 			Ok((batches, storage_info))
diff --git a/client/allocator/src/freeing_bump.rs b/client/allocator/src/freeing_bump.rs
index 0f3639803f1b..7f83576aedfa 100644
--- a/client/allocator/src/freeing_bump.rs
+++ b/client/allocator/src/freeing_bump.rs
@@ -38,9 +38,9 @@
 //! allocation size is capped, therefore the number of orders and thus the linked lists is as well
 //! limited. Currently, the maximum size of an allocation is 32 MiB.
 //!
-//! When the allocator serves an allocation request it first checks the linked list for the respective
-//! order. If it doesn't have any free chunks, the allocator requests memory from the bump allocator.
-//! In any case the order is stored in the header of the allocation.
+//! When the allocator serves an allocation request it first checks the linked list for the
+//! respective order. If it doesn't have any free chunks, the allocator requests memory from the
+//! bump allocator. In any case the order is stored in the header of the allocation.
 //!
 //! Upon deallocation we get the order of the allocation from its header and then add that
 //! allocation to the linked list for the respective order.
@@ -59,12 +59,13 @@
 //!   allocator was consumed by the 32 MiB allocation, allocations of all sizes except 32 MiB will
 //!   fail.
 //!
-//! - Sizes of allocations are rounded up to the nearest order. That is, an allocation of 2,00001 MiB
-//!   will be put into the bucket of 4 MiB. Therefore, any allocation of size `(N, 2N]` will take
-//!   up to `2N`, thus assuming a uniform distribution of allocation sizes, the average amount in use
-//!   of a `2N` space on the heap will be `(3N + ε) / 2`. So average utilisation is going to be around
-//!   75% (`(3N + ε) / 2 / 2N`) meaning that around 25% of the space in allocation will be wasted.
-//!   This is more pronounced (in terms of absolute heap amounts) with larger allocation sizes.
+//! - Sizes of allocations are rounded up to the nearest order. That is, an allocation of 2,00001
+//!   MiB will be put into the bucket of 4 MiB. Therefore, any allocation of size `(N, 2N]` will
+//!   take up to `2N`, thus assuming a uniform distribution of allocation sizes, the average amount
+//!   in use of a `2N` space on the heap will be `(3N + ε) / 2`. So average utilization is going to
+//!   be around 75% (`(3N + ε) / 2 / 2N`) meaning that around 25% of the space in allocation will be
+//!   wasted. This is more pronounced (in terms of absolute heap amounts) with larger allocation
+//!   sizes.
 
 use crate::Error;
 use std::{mem, convert::{TryFrom, TryInto}, ops::{Range, Index, IndexMut}};
diff --git a/frame/election-provider-multi-phase/src/benchmarking.rs b/frame/election-provider-multi-phase/src/benchmarking.rs
index 7988163e98f6..f73ead376d5e 100644
--- a/frame/election-provider-multi-phase/src/benchmarking.rs
+++ b/frame/election-provider-multi-phase/src/benchmarking.rs
@@ -20,10 +20,9 @@
 use super::*;
 use crate::{Pallet as MultiPhase, unsigned::IndexAssignmentOf};
 use frame_benchmarking::{account, impl_benchmark_test_suite};
-use frame_support::{assert_ok, traits::OnInitialize};
+use frame_support::{assert_ok, traits::Hooks};
 use frame_system::RawOrigin;
 use rand::{prelude::SliceRandom, rngs::SmallRng, SeedableRng};
-use frame_election_provider_support::Assignment;
 use sp_arithmetic::{per_things::Percent, traits::One};
 use sp_npos_elections::IndexAssignment;
 use sp_runtime::InnerOf;
@@ -38,14 +37,14 @@ fn solution_with_size<T: Config>(
 	size: SolutionOrSnapshotSize,
 	active_voters_count: u32,
 	desired_targets: u32,
-) -> RawSolution<CompactOf<T>> {
-	assert!(size.targets >= desired_targets, "must have enough targets");
-	assert!(
+) -> Result<RawSolution<CompactOf<T>>, &'static str> {
+	ensure!(size.targets >= desired_targets, "must have enough targets");
+	ensure!(
 		size.targets >= (<CompactOf<T>>::LIMIT * 2) as u32,
 		"must have enough targets for unique votes."
 	);
-	assert!(size.voters >= active_voters_count, "must have enough voters");
-	assert!(
+	ensure!(size.voters >= active_voters_count, "must have enough voters");
+	ensure!(
 		(<CompactOf<T>>::LIMIT as u32) < desired_targets,
 		"must have enough winners to give them votes."
 	);
@@ -125,7 +124,7 @@ fn solution_with_size<T: Config>(
 		.map(|(voter, _stake, votes)| {
 			let percent_per_edge: InnerOf<CompactAccuracyOf<T>> =
 				(100 / votes.len()).try_into().unwrap_or_else(|_| panic!("failed to convert"));
-			Assignment {
+			crate::unsigned::Assignment::<T> {
 				who: voter.clone(),
 				distribution: votes
 					.iter()
@@ -141,7 +140,31 @@ fn solution_with_size<T: Config>(
 	let round = <MultiPhase<T>>::round();
 
 	assert!(score[0] > 0, "score is zero, this probably means that the stakes are not set.");
-	RawSolution { compact, score, round }
+	Ok(RawSolution { compact, score, round })
+}
+
+fn set_up_data_provider<T: Config>(v: u32, t: u32) {
+	// number of votes in snapshot.
+
+	T::DataProvider::clear();
+	log!(info, "setting up with voters = {} [degree = {}], targets = {}", v, T::DataProvider::MAXIMUM_VOTES_PER_VOTER, t);
+
+	// fill targets.
+	let mut targets = (0..t).map(|i| {
+		let target = frame_benchmarking::account::<T::AccountId>("Target", i, SEED);
+		T::DataProvider::add_target(target.clone());
+		target
+	}).collect::<Vec<_>>();
+	// we should always have enough voters to fill.
+	assert!(targets.len() > T::DataProvider::MAXIMUM_VOTES_PER_VOTER as usize);
+	targets.truncate(T::DataProvider::MAXIMUM_VOTES_PER_VOTER as usize);
+
+	// fill voters.
+	(0..v).for_each(|i| {
+		let voter = frame_benchmarking::account::<T::AccountId>("Voter", i, SEED);
+		let weight = T::Currency::minimum_balance().saturated_into::<u64>() * 1000;
+		T::DataProvider::add_voter(voter, weight, targets.clone());
+	});
 }
 
 frame_benchmarking::benchmarks! {
@@ -223,14 +246,18 @@ frame_benchmarking::benchmarks! {
 
 	// a call to `<Pallet as ElectionProvider>::elect` where we only return the queued solution.
 	elect_queued {
-		// assume largest values for the election status. These will merely affect the decoding.
-		let v = T::BenchmarkingConfig::VOTERS[1];
-		let t = T::BenchmarkingConfig::TARGETS[1];
-		let a = T::BenchmarkingConfig::ACTIVE_VOTERS[1];
-		let d = T::BenchmarkingConfig::DESIRED_TARGETS[1];
+		// number of votes in snapshot.
+		let v in (T::BenchmarkingConfig::VOTERS[0]) .. T::BenchmarkingConfig::VOTERS[1];
+		// number of targets in snapshot.
+		let t in (T::BenchmarkingConfig::TARGETS[0]) .. T::BenchmarkingConfig::TARGETS[1];
+		// number of assignments, i.e. compact.len(). This means the active nominators, thus must be
+		// a subset of `v` component.
+		let a in (T::BenchmarkingConfig::ACTIVE_VOTERS[0]) .. T::BenchmarkingConfig::ACTIVE_VOTERS[1];
+		// number of desired targets. Must be a subset of `t` component.
+		let d in (T::BenchmarkingConfig::DESIRED_TARGETS[0]) .. T::BenchmarkingConfig::DESIRED_TARGETS[1];
 
 		let witness = SolutionOrSnapshotSize { voters: v, targets: t };
-		let raw_solution = solution_with_size::<T>(witness, a, d);
+		let raw_solution = solution_with_size::<T>(witness, a, d)?;
 		let ready_solution =
 			<MultiPhase<T>>::feasibility_check(raw_solution, ElectionCompute::Signed).unwrap();
 
@@ -251,15 +278,6 @@ frame_benchmarking::benchmarks! {
 		assert_eq!(<CurrentPhase<T>>::get(), <Phase<T::BlockNumber>>::Off);
 	}
 
-	#[extra]
-	create_snapshot {
-		assert!(<MultiPhase<T>>::snapshot().is_none());
-	}: {
-		<MultiPhase::<T>>::create_snapshot().unwrap()
-	} verify {
-		assert!(<MultiPhase<T>>::snapshot().is_some());
-	}
-
 	submit {
 		let c in 1 .. (T::SignedMaxSubmissions::get() - 1);
 
@@ -307,7 +325,7 @@ frame_benchmarking::benchmarks! {
 			T::BenchmarkingConfig::DESIRED_TARGETS[1];
 
 		let witness = SolutionOrSnapshotSize { voters: v, targets: t };
-		let raw_solution = solution_with_size::<T>(witness, a, d);
+		let raw_solution = solution_with_size::<T>(witness, a, d)?;
 
 		assert!(<MultiPhase<T>>::queued_solution().is_none());
 		<CurrentPhase<T>>::put(Phase::Unsigned((true, 1u32.into())));
@@ -324,6 +342,84 @@ frame_benchmarking::benchmarks! {
 		assert!(<MultiPhase<T>>::queued_solution().is_some());
 	}
 
+	// This is checking a valid solution. The worse case is indeed a valid solution.
+	feasibility_check {
+		// number of votes in snapshot.
+		let v in (T::BenchmarkingConfig::VOTERS[0]) .. T::BenchmarkingConfig::VOTERS[1];
+		// number of targets in snapshot.
+		let t in (T::BenchmarkingConfig::TARGETS[0]) .. T::BenchmarkingConfig::TARGETS[1];
+		// number of assignments, i.e. compact.len(). This means the active nominators, thus must be
+		// a subset of `v` component.
+		let a in (T::BenchmarkingConfig::ACTIVE_VOTERS[0]) .. T::BenchmarkingConfig::ACTIVE_VOTERS[1];
+		// number of desired targets. Must be a subset of `t` component.
+		let d in (T::BenchmarkingConfig::DESIRED_TARGETS[0]) .. T::BenchmarkingConfig::DESIRED_TARGETS[1];
+
+		let size = SolutionOrSnapshotSize { voters: v, targets: t };
+		let raw_solution = solution_with_size::<T>(size, a, d)?;
+
+		assert_eq!(raw_solution.compact.voter_count() as u32, a);
+		assert_eq!(raw_solution.compact.unique_targets().len() as u32, d);
+
+		// encode the most significant storage item that needs to be decoded in the dispatch.
+		let encoded_snapshot = <MultiPhase<T>>::snapshot().unwrap().encode();
+	}: {
+		assert_ok!(<MultiPhase<T>>::feasibility_check(raw_solution, ElectionCompute::Unsigned));
+		let _decoded_snap = <RoundSnapshot<T::AccountId> as Decode>::decode(&mut &*encoded_snapshot).unwrap();
+	}
+
+	// NOTE: this weight is not used anywhere, but the fact that it should succeed when execution in
+	// isolation is vital to ensure memory-safety. For the same reason, we don't care about the
+	// components iterating, we merely check that this operation will work with the "maximum"
+	// numbers.
+	//
+	// ONLY run this benchmark in isolation, and pass the `--extra` flag to enable it.
+	//
+	// NOTE: If this benchmark does not run out of memory with a given heap pages, it means that the
+	// OCW process can SURELY succeed with the given configuration, but the opposite is not true.
+	// This benchmark is doing more work than a raw call to `OffchainWorker_offchain_worker` runtime
+	// api call, since it is also setting up some mock data, which will itself exhaust the heap to
+	// some extent.
+	#[extra]
+	mine_solution_offchain_memory {
+		// number of votes in snapshot. Fixed to maximum.
+		let v = T::BenchmarkingConfig::MINER_MAXIMUM_VOTERS;
+		// number of targets in snapshot. Fixed to maximum.
+		let t  = T::BenchmarkingConfig::MAXIMUM_TARGETS;
+
+		T::DataProvider::clear();
+		set_up_data_provider::<T>(v, t);
+		let now = frame_system::Pallet::<T>::block_number();
+		<CurrentPhase<T>>::put(Phase::Unsigned((true, now)));
+		<MultiPhase::<T>>::create_snapshot().unwrap();
+	}: {
+		// we can't really verify this as it won't write anything to state, check logs.
+		<MultiPhase::<T>>::offchain_worker(now)
+	}
+
+	// NOTE: this weight is not used anywhere, but the fact that it should succeed when execution in
+	// isolation is vital to ensure memory-safety. For the same reason, we don't care about the
+	// components iterating, we merely check that this operation will work with the "maximum"
+	// numbers.
+	//
+	// ONLY run this benchmark in isolation, and pass the `--extra` flag to enable it.
+	#[extra]
+	create_snapshot_memory {
+		// number of votes in snapshot. Fixed to maximum.
+		let v = T::BenchmarkingConfig::SNAPSHOT_MAXIMUM_VOTERS;
+		// number of targets in snapshot. Fixed to maximum.
+		let t  = T::BenchmarkingConfig::MAXIMUM_TARGETS;
+
+		T::DataProvider::clear();
+		set_up_data_provider::<T>(v, t);
+		assert!(<MultiPhase<T>>::snapshot().is_none());
+	}: {
+		<MultiPhase::<T>>::create_snapshot().unwrap()
+	} verify {
+		assert!(<MultiPhase<T>>::snapshot().is_some());
+		assert_eq!(<MultiPhase<T>>::snapshot_metadata().unwrap().voters, v + t);
+		assert_eq!(<MultiPhase<T>>::snapshot_metadata().unwrap().targets, t);
+	}
+
 	#[extra]
 	trim_assignments_length {
 		// number of votes in snapshot.
@@ -344,7 +440,7 @@ frame_benchmarking::benchmarks! {
 		// Compute a random solution, then work backwards to get the lists of voters, targets, and
 		// assignments
 		let witness = SolutionOrSnapshotSize { voters: v, targets: t };
-		let RawSolution { compact, .. } = solution_with_size::<T>(witness, a, d);
+		let RawSolution { compact, .. } = solution_with_size::<T>(witness, a, d)?;
 		let RoundSnapshot { voters, targets } = MultiPhase::<T>::snapshot().unwrap();
 		let voter_at = helpers::voter_at_fn::<T>(&voters);
 		let target_at = helpers::target_at_fn::<T>(&targets);
@@ -394,39 +490,10 @@ frame_benchmarking::benchmarks! {
 		log!(trace, "actual encoded size = {}", encoding.len());
 		assert!(encoding.len() <= desired_size);
 	}
-
-	// This is checking a valid solution. The worse case is indeed a valid solution.
-	feasibility_check {
-		// number of votes in snapshot.
-		let v in (T::BenchmarkingConfig::VOTERS[0]) .. T::BenchmarkingConfig::VOTERS[1];
-		// number of targets in snapshot.
-		let t in (T::BenchmarkingConfig::TARGETS[0]) .. T::BenchmarkingConfig::TARGETS[1];
-		// number of assignments, i.e. compact.len(). This means the active nominators, thus must be
-		// a subset of `v` component.
-		let a in
-			(T::BenchmarkingConfig::ACTIVE_VOTERS[0]) .. T::BenchmarkingConfig::ACTIVE_VOTERS[1];
-		// number of desired targets. Must be a subset of `t` component.
-		let d in
-			(T::BenchmarkingConfig::DESIRED_TARGETS[0]) ..
-			T::BenchmarkingConfig::DESIRED_TARGETS[1];
-
-		let size = SolutionOrSnapshotSize { voters: v, targets: t };
-		let raw_solution = solution_with_size::<T>(size, a, d);
-
-		assert_eq!(raw_solution.compact.voter_count() as u32, a);
-		assert_eq!(raw_solution.compact.unique_targets().len() as u32, d);
-
-		// encode the most significant storage item that needs to be decoded in the dispatch.
-		let encoded_snapshot = <MultiPhase<T>>::snapshot().unwrap().encode();
-	}: {
-		assert_ok!(<MultiPhase<T>>::feasibility_check(raw_solution, ElectionCompute::Unsigned));
-		let _decoded_snap = <RoundSnapshot<T::AccountId> as Decode>::decode(&mut &*encoded_snapshot)
-			.unwrap();
-	}
 }
 
 impl_benchmark_test_suite!(
 	MultiPhase,
-	crate::mock::ExtBuilder::default().build(),
+	crate::mock::ExtBuilder::default().build_offchainify(10).0,
 	crate::mock::Runtime,
 );
diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index f1d01a248111..b41db2a42c60 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -191,8 +191,8 @@
 //! portion of the bond).
 //!
 //! **Conditionally open unsigned phase**: Currently, the unsigned phase is always opened. This is
-//! useful because an honest validator will run substrate OCW code, which should be good enough to trump
-//! a mediocre or malicious signed submission (assuming in the absence of honest signed bots).
+//! useful because an honest validator will run substrate OCW code, which should be good enough to
+//! trump a mediocre or malicious signed submission (assuming in the absence of honest signed bots).
 //! If there are signed submissions, they can be checked against an absolute measure (e.g. PJR),
 //! then we can only open the unsigned phase in extreme conditions (i.e. "no good signed solution
 //! received") to spare some work for the active validators.
@@ -308,6 +308,12 @@ pub trait BenchmarkingConfig {
 	const ACTIVE_VOTERS: [u32; 2];
 	/// Range of desired targets.
 	const DESIRED_TARGETS: [u32; 2];
+	/// Maximum number of voters expected. This is used only for memory-benchmarking of snapshot.
+	const SNAPSHOT_MAXIMUM_VOTERS: u32;
+	/// Maximum number of voters expected. This is used only for memory-benchmarking of miner.
+	const MINER_MAXIMUM_VOTERS: u32;
+	/// Maximum number of targets expected. This is used only for memory-benchmarking.
+	const MAXIMUM_TARGETS: u32;
 }
 
 impl BenchmarkingConfig for () {
@@ -315,6 +321,9 @@ impl BenchmarkingConfig for () {
 	const TARGETS: [u32; 2] = [1000, 1600];
 	const ACTIVE_VOTERS: [u32; 2] = [1000, 3000];
 	const DESIRED_TARGETS: [u32; 2] = [400, 800];
+	const SNAPSHOT_MAXIMUM_VOTERS: u32 = 10_000;
+	const MINER_MAXIMUM_VOTERS: u32 = 10_000;
+	const MAXIMUM_TARGETS: u32 = 2_000;
 }
 
 /// Current phase of the pallet.
@@ -1063,7 +1072,7 @@ pub mod pallet {
 
 				let _ = Self::unsigned_pre_dispatch_checks(solution)
 					.map_err(|err| {
-						log!(error, "unsigned transaction validation failed due to {:?}", err);
+						log!(debug, "unsigned transaction validation failed due to {:?}", err);
 						err
 					})
 					.map_err(dispatch_error_to_invalid)?;
@@ -1201,8 +1210,9 @@ impl<T: Config> Pallet<T> {
 	/// Internal logic of the offchain worker, to be executed only when the offchain lock is
 	/// acquired with success.
 	fn do_synchronized_offchain_worker(now: T::BlockNumber) {
-		log!(trace, "lock for offchain worker acquired.");
-		match Self::current_phase() {
+		let current_phase = Self::current_phase();
+		log!(trace, "lock for offchain worker acquired. Phase = {:?}", current_phase);
+		match current_phase {
 			Phase::Unsigned((true, opened)) if opened == now => {
 				// Mine a new solution, cache it, and attempt to submit it
 				let initial_output = Self::ensure_offchain_repeat_frequency(now).and_then(|_| {
@@ -1453,11 +1463,20 @@ impl<T: Config> Pallet<T> {
 						.map_err(Into::into),
 					FallbackStrategy::Nothing => Err(ElectionError::NoFallbackConfigured),
 				},
-				|ReadySolution { supports, compute, .. }| Ok((
-					supports,
-					T::WeightInfo::elect_queued(),
-					compute
-				)),
+				|ReadySolution { supports, compute, .. }| {
+					// defensive-only: snapshot must always exist by this point.
+					let metadata = Self::snapshot_metadata().unwrap_or_default();
+					let desired = supports.len() as u32;
+					let active_voters = supports
+						.iter()
+						.map(|(_, x)| x)
+						.fold(Zero::zero(), |acc, next| acc + next.voters.len() as u32);
+					Ok((
+						supports,
+						T::WeightInfo::elect_queued(metadata.voters, metadata.targets, active_voters, desired),
+						compute
+					))
+				},
 			)
 			.map(|(supports, weight, compute)| {
 				Self::deposit_event(Event::ElectionFinalized(Some(compute)));
diff --git a/frame/election-provider-multi-phase/src/mock.rs b/frame/election-provider-multi-phase/src/mock.rs
index 8840e2b935d3..1b8ee1434585 100644
--- a/frame/election-provider-multi-phase/src/mock.rs
+++ b/frame/election-provider-multi-phase/src/mock.rs
@@ -330,11 +330,11 @@ impl multi_phase::weights::WeightInfo for DualMockWeightInfo {
 			<() as multi_phase::weights::WeightInfo>::submit(c)
 		}
 	}
-	fn elect_queued() -> Weight {
+	fn elect_queued(v: u32, t: u32, a: u32, d: u32) -> Weight {
 		if MockWeightInfo::get() {
 			Zero::zero()
 		} else {
-			<() as multi_phase::weights::WeightInfo>::elect_queued()
+			<() as multi_phase::weights::WeightInfo>::elect_queued(v, t, a, d)
 		}
 	}
 	fn submit_unsigned(v: u32, t: u32, a: u32, d: u32) -> Weight {
@@ -438,6 +438,32 @@ impl ElectionDataProvider<AccountId, u64> for StakingMock {
 		Targets::set(targets);
 		Voters::set(voters);
 	}
+
+	#[cfg(any(feature = "runtime-benchmarks", test))]
+	fn clear() {
+		Targets::set(vec![]);
+		Voters::set(vec![]);
+	}
+
+	#[cfg(any(feature = "runtime-benchmarks", test))]
+	fn add_voter(voter: AccountId, weight: VoteWeight, targets: Vec<AccountId>) {
+		let mut current = Voters::get();
+		current.push((voter, weight, targets));
+		Voters::set(current);
+	}
+
+	#[cfg(any(feature = "runtime-benchmarks", test))]
+	fn add_target(target: AccountId) {
+		let mut current = Targets::get();
+		current.push(target);
+		Targets::set(current);
+
+		// to be on-par with staking, we add a self vote as well. the stake is really not that
+		// important.
+		let mut current = Voters::get();
+		current.push((target, ExistentialDeposit::get() as u64, vec![target]));
+		Voters::set(current);
+	}
 }
 
 impl ExtBuilder {
diff --git a/frame/election-provider-multi-phase/src/unsigned.rs b/frame/election-provider-multi-phase/src/unsigned.rs
index 52ecae7afa5f..aaeb5e4c0c9e 100644
--- a/frame/election-provider-multi-phase/src/unsigned.rs
+++ b/frame/election-provider-multi-phase/src/unsigned.rs
@@ -679,7 +679,7 @@ mod max_weight {
 		fn on_initialize_open_unsigned_with_snapshot() -> Weight {
 			unreachable!()
 		}
-		fn elect_queued() -> Weight {
+		fn elect_queued(_v: u32, _t: u32, _a: u32, _d: u32) -> Weight {
 			0
 		}
 		fn on_initialize_open_unsigned_without_snapshot() -> Weight {
diff --git a/frame/election-provider-multi-phase/src/weights.rs b/frame/election-provider-multi-phase/src/weights.rs
index 6a245ebb5125..0f732784c62c 100644
--- a/frame/election-provider-multi-phase/src/weights.rs
+++ b/frame/election-provider-multi-phase/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_election_provider_multi_phase
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-20, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-07-07, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -50,7 +50,7 @@ pub trait WeightInfo {
 	fn finalize_signed_phase_accept_solution() -> Weight;
 	fn finalize_signed_phase_reject_solution() -> Weight;
 	fn on_initialize_open_unsigned_without_snapshot() -> Weight;
-	fn elect_queued() -> Weight;
+	fn elect_queued(v: u32, t: u32, a: u32, d: u32, ) -> Weight;
 	fn submit(c: u32, ) -> Weight;
 	fn submit_unsigned(v: u32, t: u32, a: u32, d: u32, ) -> Weight;
 	fn feasibility_check(v: u32, t: u32, a: u32, d: u32, ) -> Weight;
@@ -60,69 +60,75 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn on_initialize_nothing() -> Weight {
-		(33_392_000 as Weight)
+		(33_170_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(8 as Weight))
 	}
 	fn on_initialize_open_signed() -> Weight {
-		(115_659_000 as Weight)
+		(113_680_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(10 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn on_initialize_open_unsigned_with_snapshot() -> Weight {
-		(114_970_000 as Weight)
+		(113_619_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(10 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn finalize_signed_phase_accept_solution() -> Weight {
-		(51_442_000 as Weight)
+		(60_184_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn finalize_signed_phase_reject_solution() -> Weight {
-		(23_160_000 as Weight)
+		(40_151_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn on_initialize_open_unsigned_without_snapshot() -> Weight {
-		(24_101_000 as Weight)
+		(23_833_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
-	fn elect_queued() -> Weight {
-		(6_153_604_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+	fn elect_queued(v: u32, _t: u32, a: u32, d: u32, ) -> Weight {
+		(51_573_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((9_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 2_000
+			.saturating_add((1_957_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 18_000
+			.saturating_add((588_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(8 as Weight))
 	}
 	fn submit(c: u32, ) -> Weight {
-		(78_972_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((308_000 as Weight).saturating_mul(c as Weight))
+		(77_469_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((281_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn submit_unsigned(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((3_572_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 42_000
-			.saturating_add((23_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 12_000
-			.saturating_add((11_529_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 63_000
-			.saturating_add((3_333_000 as Weight).saturating_mul(d as Weight))
+			// Standard Error: 5_000
+			.saturating_add((3_667_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 29_000
+			.saturating_add((497_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 9_000
+			.saturating_add((11_228_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 73_000
+			.saturating_add((4_432_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn feasibility_check(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 7_000
-			.saturating_add((3_647_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 4_000
+			.saturating_add((3_613_000 as Weight).saturating_mul(v as Weight))
 			// Standard Error: 23_000
-			.saturating_add((390_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((286_000 as Weight).saturating_mul(t as Weight))
 			// Standard Error: 7_000
-			.saturating_add((9_614_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 35_000
-			.saturating_add((3_405_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add((9_677_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 58_000
+			.saturating_add((4_178_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 	}
 }
@@ -130,69 +136,73 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn on_initialize_nothing() -> Weight {
-		(33_392_000 as Weight)
+		(33_564_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(8 as Weight))
 	}
 	fn on_initialize_open_signed() -> Weight {
-		(115_659_000 as Weight)
+		(114_561_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn on_initialize_open_unsigned_with_snapshot() -> Weight {
-		(114_970_000 as Weight)
+		(114_070_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn finalize_signed_phase_accept_solution() -> Weight {
-		(51_442_000 as Weight)
+		(59_765_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn finalize_signed_phase_reject_solution() -> Weight {
-		(23_160_000 as Weight)
+		(39_894_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn on_initialize_open_unsigned_without_snapshot() -> Weight {
-		(24_101_000 as Weight)
+		(23_591_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
-	fn elect_queued() -> Weight {
-		(6_153_604_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+	fn elect_queued(v: u32, _t: u32, a: u32, d: u32, ) -> Weight {
+		(0 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((19_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 1_000
+			.saturating_add((1_959_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 14_000
+			.saturating_add((392_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
 	}
 	fn submit(c: u32, ) -> Weight {
-		(78_972_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((308_000 as Weight).saturating_mul(c as Weight))
+		(77_616_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((213_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn submit_unsigned(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((3_572_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 8_000
+			.saturating_add((3_701_000 as Weight).saturating_mul(v as Weight))
 			// Standard Error: 42_000
-			.saturating_add((23_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 12_000
-			.saturating_add((11_529_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 63_000
-			.saturating_add((3_333_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add((75_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 14_000
+			.saturating_add((11_268_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 107_000
+			.saturating_add((5_019_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
-	fn feasibility_check(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
+	fn feasibility_check(v: u32, _t: u32, a: u32, d: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 7_000
-			.saturating_add((3_647_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 23_000
-			.saturating_add((390_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 7_000
-			.saturating_add((9_614_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 35_000
-			.saturating_add((3_405_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add((3_632_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 12_000
+			.saturating_add((9_664_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 95_000
+			.saturating_add((4_264_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 	}
 }
diff --git a/frame/election-provider-support/src/lib.rs b/frame/election-provider-support/src/lib.rs
index b846460e71f8..1d1ebf02a263 100644
--- a/frame/election-provider-support/src/lib.rs
+++ b/frame/election-provider-support/src/lib.rs
@@ -224,8 +224,25 @@ pub trait ElectionDataProvider<AccountId, BlockNumber> {
 		_voters: Vec<(AccountId, VoteWeight, Vec<AccountId>)>,
 		_targets: Vec<AccountId>,
 		_target_stake: Option<VoteWeight>,
-	) {
-	}
+	) {}
+
+	/// Utility function only to be used in benchmarking scenarios, to be implemented optionally,
+	/// else a noop.
+	///
+	/// Same as `put_snapshot`, but can add a single voter one by one.
+	#[cfg(any(feature = "runtime-benchmarks", test))]
+	fn add_voter(_voter: AccountId, _weight: VoteWeight, _targets: Vec<AccountId>) {}
+
+	/// Utility function only to be used in benchmarking scenarios, to be implemented optionally,
+	/// else a noop.
+	///
+	/// Same as `put_snapshot`, but can add a single voter one by one.
+	#[cfg(any(feature = "runtime-benchmarks", test))]
+	fn add_target(_target: AccountId) {}
+
+	/// Clear all voters and targets.
+	#[cfg(any(feature = "runtime-benchmarks", test))]
+	fn clear() {}
 }
 
 #[cfg(feature = "std")]
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 5fe02212c650..98db60d1b599 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -3049,6 +3049,57 @@ impl<T: Config> frame_election_provider_support::ElectionDataProvider<T::Account
 		)
 	}
 
+	#[cfg(any(feature = "runtime-benchmarks", test))]
+	fn add_voter(voter: T::AccountId, weight: VoteWeight, targets: Vec<T::AccountId>) {
+		use sp_std::convert::TryFrom;
+		let stake = <BalanceOf<T>>::try_from(weight).unwrap_or_else(|_| {
+			panic!("cannot convert a VoteWeight into BalanceOf, benchmark needs reconfiguring.")
+		});
+		<Bonded<T>>::insert(voter.clone(), voter.clone());
+		<Ledger<T>>::insert(
+			voter.clone(),
+			StakingLedger {
+				stash: voter.clone(),
+				active: stake,
+				total: stake,
+				unlocking: vec![],
+				claimed_rewards: vec![],
+			},
+		);
+		Self::do_add_nominator(
+			&voter,
+			Nominations { targets: targets, submitted_in: 0, suppressed: false },
+		);
+	}
+
+	#[cfg(any(feature = "runtime-benchmarks", test))]
+	fn add_target(target: T::AccountId) {
+		let stake = MinValidatorBond::<T>::get() * 100u32.into();
+		<Bonded<T>>::insert(target.clone(), target.clone());
+		<Ledger<T>>::insert(
+			target.clone(),
+			StakingLedger {
+				stash: target.clone(),
+				active: stake,
+				total: stake,
+				unlocking: vec![],
+				claimed_rewards: vec![],
+			},
+		);
+		Self::do_add_validator(
+			&target,
+			ValidatorPrefs { commission: Perbill::zero(), blocked: false },
+		);
+	}
+
+	#[cfg(any(feature = "runtime-benchmarks", test))]
+	fn clear() {
+		<Bonded<T>>::remove_all(None);
+		<Ledger<T>>::remove_all(None);
+		<Validators<T>>::remove_all(None);
+		<Nominators<T>>::remove_all(None);
+	}
+
 	#[cfg(any(feature = "runtime-benchmarks", test))]
 	fn put_snapshot(
 		voters: Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)>,
diff --git a/utils/frame/benchmarking-cli/src/command.rs b/utils/frame/benchmarking-cli/src/command.rs
index e1803a2c56ea..3bfb639dd9eb 100644
--- a/utils/frame/benchmarking-cli/src/command.rs
+++ b/utils/frame/benchmarking-cli/src/command.rs
@@ -22,15 +22,15 @@ use frame_support::traits::StorageInfo;
 use sc_cli::{SharedParams, CliConfiguration, ExecutionStrategy, Result};
 use sc_client_db::BenchmarkingState;
 use sc_executor::NativeExecutor;
-use sp_state_machine::StateMachine;
-use sp_externalities::Extensions;
 use sc_service::{Configuration, NativeExecutionDispatch};
-use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor};
-use sp_core::offchain::{OffchainWorkerExt, testing::TestOffchainExt};
-use sp_keystore::{
-	SyncCryptoStorePtr, KeystoreExt,
-	testing::KeyStore,
+use sp_core::offchain::{
+	testing::{TestOffchainExt, TestTransactionPoolExt},
+	OffchainDbExt, OffchainWorkerExt, TransactionPoolExt,
 };
+use sp_externalities::Extensions;
+use sp_keystore::{testing::KeyStore, KeystoreExt, SyncCryptoStorePtr};
+use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor};
+use sp_state_machine::StateMachine;
 use std::{fmt::Debug, sync::Arc};
 
 impl BenchmarkCmd {
@@ -73,7 +73,10 @@ impl BenchmarkCmd {
 		let mut extensions = Extensions::default();
 		extensions.register(KeystoreExt(Arc::new(KeyStore::new()) as SyncCryptoStorePtr));
 		let (offchain, _) = TestOffchainExt::new();
-		extensions.register(OffchainWorkerExt::new(offchain));
+		let (pool, _) = TestTransactionPoolExt::new();
+		extensions.register(OffchainWorkerExt::new(offchain.clone()));
+		extensions.register(OffchainDbExt::new(offchain));
+		extensions.register(TransactionPoolExt::new(pool));
 
 		let result = StateMachine::<_, _, NumberFor<BB>, _>::new(
 			&state,
diff --git a/utils/frame/benchmarking-cli/src/lib.rs b/utils/frame/benchmarking-cli/src/lib.rs
index 38dabd8c9415..0642ddabc137 100644
--- a/utils/frame/benchmarking-cli/src/lib.rs
+++ b/utils/frame/benchmarking-cli/src/lib.rs
@@ -85,7 +85,8 @@ pub struct BenchmarkCmd {
 	#[structopt(long)]
 	pub output_analysis: Option<String>,
 
-	/// Set the heap pages while running benchmarks.
+	/// Set the heap pages while running benchmarks. If not set, the default value from the client
+	/// is used.
 	#[structopt(long)]
 	pub heap_pages: Option<u64>,
 
@@ -93,7 +94,8 @@ pub struct BenchmarkCmd {
 	#[structopt(long)]
 	pub no_verify: bool,
 
-	/// Display and run extra benchmarks that would otherwise not be needed for weight construction.
+	/// Display and run extra benchmarks that would otherwise not be needed for weight
+	/// construction.
 	#[structopt(long)]
 	pub extra: bool,
 
@@ -120,7 +122,7 @@ pub struct BenchmarkCmd {
 		value_name = "METHOD",
 		possible_values = &WasmExecutionMethod::variants(),
 		case_insensitive = true,
-		default_value = "Interpreted"
+		default_value = "compiled"
 	)]
 	pub wasm_method: WasmExecutionMethod,
 

From efd54879ecbf8aac41fe809d31c7215ea3101241 Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann <ben@gnunicorn.org>
Date: Sun, 11 Jul 2021 14:17:53 +0200
Subject: [PATCH 0977/1194] Attempting to fix publishing (#9140)

* mark template and utils as non-publish

* switch to development version for testing

* activate unleash check

* maybe if I disable all rules...

* Fix isolated compilation of `max-encoded-len-derive` with `syn`

error[E0369]: binary operation `==` cannot be applied to type `syn::Path`
  --> src/lib.rs:88:29
   |
88 |             .filter(|attr| attr.path == parse_quote!(max_encoded_len_crate))
   |                            --------- ^^ ----------------------------------- _
   |                            |
   |                            syn::Path

error: aborting due to previous error

For more information about this error, try `rustc --explain E0369`.
Error: could not compile `max-encoded-len-derive`

* WIP: bump changes crates since v3 tag to next breaking

cargo unleash version bump-breaking --changed-since v3.0.0
cargo unleash version set-pre dev --changed-since v3.0.0

FIXME: Don't modify crates that are not yet released, e.g.
`max-encoded-len-derive`

* Update lockfile

* WIP: Bump sp-transaction-pool as well

* WIP: Bump sp-offchain as well

* WIP: Bump frame-system-rpc-runtime-api as well

* WIP: Bump sp-authority-discovery as well

* Manually deactivate dev-deps before `cargo unleash check`

Otherwise we run into `Cycle detected` error.

* Bump sp-consensus-slots

* Add missing Cargo.lock change

* Bump sp-consensus-vrf as well

* Bump sp-keyring as well

* Bump sp-consensus-pow as well

* Try to speed up the `unleash-check` job

Previously, the job took 106 minutes - let's see if explicitly
specifying a `CARGO_TARGET_DIR` will help

* fixup: Ensure the temp target dir exists for unleash check

* Bump pallet-transaction-payment-rpc-runtime-api as well

Needed for Polkadot

* Bump pallet-transaction-payment-rpc as well

Needed for Polkadot

* Try updating crates after patching in the Polkadot CI job

* Use another approach to update patched Substrate crates

* Try to update all sp-core versions in Polkadot CI job

* Simplify sp-core version checking

* Apply another shellcheck lint

* Just do the simplest thing I guess

* Welp don't do --offline then

* Clean up `unleash-check` job triggers

Co-authored-by: Denis Pisarev <denis.pisarev@parity.io>

* Fix a note in unleash-check cache step

* Add a note about temporary optimization in cargo-unleash

* Pin a newer version of cargo-unleash

Co-authored-by: Igor Matuszewski <xanewok@gmail.com>
Co-authored-by: Denis Pisarev <denis.pisarev@parity.io>
---
 .gitlab-ci.yml                                |  13 +-
 .../gitlab/check_polkadot_companion_build.sh  |   7 +
 Cargo.lock                                    | 350 +++++++++---------
 bin/node-template/node/Cargo.toml             |  57 +--
 bin/node-template/pallets/template/Cargo.toml |  13 +-
 bin/node-template/runtime/Cargo.toml          |  53 +--
 bin/node/bench/Cargo.toml                     |  32 +-
 bin/node/browser-testing/Cargo.toml           |   6 +-
 bin/node/cli/Cargo.toml                       | 129 +++----
 bin/node/executor/Cargo.toml                  |  50 +--
 bin/node/inspect/Cargo.toml                   |  14 +-
 bin/node/primitives/Cargo.toml                |   8 +-
 bin/node/rpc-client/Cargo.toml                |   4 +-
 bin/node/rpc/Cargo.toml                       |  46 +--
 bin/node/runtime/Cargo.toml                   | 138 +++----
 bin/node/test-runner-example/Cargo.toml       |  48 +--
 bin/node/testing/Cargo.toml                   |  62 ++--
 bin/utils/chain-spec-builder/Cargo.toml       |  11 +-
 bin/utils/subkey/Cargo.toml                   |   3 +-
 client/allocator/Cargo.toml                   |   6 +-
 client/api/Cargo.toml                         |  36 +-
 client/authority-discovery/Cargo.toml         |  22 +-
 client/basic-authorship/Cargo.toml            |  24 +-
 client/block-builder/Cargo.toml               |  20 +-
 client/chain-spec/Cargo.toml                  |  20 +-
 client/chain-spec/derive/Cargo.toml           |   2 +-
 client/cli/Cargo.toml                         |  28 +-
 client/consensus/aura/Cargo.toml              |  50 +--
 client/consensus/babe/Cargo.toml              |  58 +--
 client/consensus/babe/rpc/Cargo.toml          |  30 +-
 client/consensus/common/Cargo.toml            |  10 +-
 client/consensus/epochs/Cargo.toml            |  10 +-
 client/consensus/manual-seal/Cargo.toml       |  36 +-
 client/consensus/pow/Cargo.toml               |  20 +-
 client/consensus/slots/Cargo.toml             |  30 +-
 client/consensus/uncles/Cargo.toml            |   8 +-
 client/db/Cargo.toml                          |  28 +-
 client/executor/Cargo.toml                    |  36 +-
 client/executor/common/Cargo.toml             |  10 +-
 client/executor/runtime-test/Cargo.toml       |  14 +-
 client/executor/wasmi/Cargo.toml              |  12 +-
 client/executor/wasmtime/Cargo.toml           |  14 +-
 client/finality-grandpa-warp-sync/Cargo.toml  |  22 +-
 client/finality-grandpa/Cargo.toml            |  48 +--
 client/finality-grandpa/rpc/Cargo.toml        |  26 +-
 client/informant/Cargo.toml                   |  12 +-
 client/keystore/Cargo.toml                    |   8 +-
 client/light/Cargo.toml                       |  18 +-
 client/network-gossip/Cargo.toml              |   6 +-
 client/network/Cargo.toml                     |  24 +-
 client/network/test/Cargo.toml                |  22 +-
 client/offchain/Cargo.toml                    |  30 +-
 client/peerset/Cargo.toml                     |   4 +-
 client/rpc-api/Cargo.toml                     |  16 +-
 client/rpc-servers/Cargo.toml                 |   4 +-
 client/rpc/Cargo.toml                         |  50 +--
 client/service/Cargo.toml                     |  80 ++--
 client/service/test/Cargo.toml                |  36 +-
 client/state-db/Cargo.toml                    |   6 +-
 client/sync-state-rpc/Cargo.toml              |  18 +-
 client/telemetry/Cargo.toml                   |   2 +-
 client/tracing/Cargo.toml                     |  26 +-
 client/tracing/proc-macro/Cargo.toml          |   2 +-
 client/transaction-pool/Cargo.toml            |  26 +-
 client/transaction-pool/api/Cargo.toml        |   6 +-
 client/transaction-pool/graph/Cargo.toml      |  12 +-
 frame/assets/Cargo.toml                       |  20 +-
 frame/atomic-swap/Cargo.toml                  |  16 +-
 frame/aura/Cargo.toml                         |  22 +-
 frame/authority-discovery/Cargo.toml          |  22 +-
 frame/authorship/Cargo.toml                   |  16 +-
 frame/babe/Cargo.toml                         |  42 +--
 frame/balances/Cargo.toml                     |  18 +-
 frame/benchmarking/Cargo.toml                 |  18 +-
 frame/bounties/Cargo.toml                     |  22 +-
 frame/collective/Cargo.toml                   |  18 +-
 frame/contracts/Cargo.toml                    |  28 +-
 frame/contracts/common/Cargo.toml             |   8 +-
 frame/contracts/proc-macro/Cargo.toml         |   2 +-
 frame/contracts/rpc/Cargo.toml                |  16 +-
 frame/contracts/rpc/runtime-api/Cargo.toml    |  10 +-
 frame/democracy/Cargo.toml                    |  24 +-
 .../election-provider-multi-phase/Cargo.toml  |  38 +-
 frame/election-provider-support/Cargo.toml    |  16 +-
 frame/elections-phragmen/Cargo.toml           |  24 +-
 frame/elections/Cargo.toml                    |  16 +-
 frame/example-offchain-worker/Cargo.toml      |  16 +-
 frame/example-parallel/Cargo.toml             |  16 +-
 frame/example/Cargo.toml                      |  18 +-
 frame/executive/Cargo.toml                    |  30 +-
 frame/gilt/Cargo.toml                         |  20 +-
 frame/grandpa/Cargo.toml                      |  44 +--
 frame/identity/Cargo.toml                     |  18 +-
 frame/im-online/Cargo.toml                    |  24 +-
 frame/indices/Cargo.toml                      |  20 +-
 frame/lottery/Cargo.toml                      |  18 +-
 frame/membership/Cargo.toml                   |  16 +-
 frame/merkle-mountain-range/Cargo.toml        |  18 +-
 .../primitives/Cargo.toml                     |  14 +-
 frame/merkle-mountain-range/rpc/Cargo.toml    |  12 +-
 frame/metadata/Cargo.toml                     |   6 +-
 frame/multisig/Cargo.toml                     |  20 +-
 frame/nicks/Cargo.toml                        |  16 +-
 frame/node-authorization/Cargo.toml           |  14 +-
 frame/offences/Cargo.toml                     |  18 +-
 frame/offences/benchmarking/Cargo.toml        |  38 +-
 frame/proxy/Cargo.toml                        |  22 +-
 frame/randomness-collective-flip/Cargo.toml   |  14 +-
 frame/recovery/Cargo.toml                     |  16 +-
 frame/scheduler/Cargo.toml                    |  18 +-
 frame/scored-pool/Cargo.toml                  |  16 +-
 frame/session/Cargo.toml                      |  24 +-
 frame/session/benchmarking/Cargo.toml         |  30 +-
 frame/society/Cargo.toml                      |  16 +-
 frame/staking/Cargo.toml                      |  42 +--
 frame/staking/reward-curve/Cargo.toml         |   4 +-
 frame/staking/reward-fn/Cargo.toml            |   4 +-
 frame/sudo/Cargo.toml                         |  14 +-
 frame/support/Cargo.toml                      |  26 +-
 frame/support/procedural/Cargo.toml           |   4 +-
 frame/support/procedural/tools/Cargo.toml     |   2 +-
 frame/support/test/Cargo.toml                 |  16 +-
 frame/system/Cargo.toml                       |  16 +-
 frame/system/benchmarking/Cargo.toml          |  16 +-
 frame/system/rpc/runtime-api/Cargo.toml       |   4 +-
 frame/timestamp/Cargo.toml                    |  22 +-
 frame/tips/Cargo.toml                         |  22 +-
 frame/transaction-payment/Cargo.toml          |  18 +-
 frame/transaction-payment/rpc/Cargo.toml      |  14 +-
 .../rpc/runtime-api/Cargo.toml                |   8 +-
 frame/transaction-storage/Cargo.toml          |  24 +-
 frame/treasury/Cargo.toml                     |  20 +-
 frame/try-runtime/Cargo.toml                  |  10 +-
 frame/uniques/Cargo.toml                      |  22 +-
 frame/utility/Cargo.toml                      |  20 +-
 frame/vesting/Cargo.toml                      |  20 +-
 primitives/api/Cargo.toml                     |  14 +-
 primitives/api/proc-macro/Cargo.toml          |   2 +-
 primitives/api/test/Cargo.toml                |  18 +-
 primitives/application-crypto/Cargo.toml      |   8 +-
 primitives/application-crypto/test/Cargo.toml |  10 +-
 primitives/arithmetic/Cargo.toml              |   4 +-
 primitives/arithmetic/fuzzer/Cargo.toml       |   2 +-
 primitives/authority-discovery/Cargo.toml     |  10 +-
 primitives/authorship/Cargo.toml              |   8 +-
 primitives/block-builder/Cargo.toml           |  10 +-
 primitives/blockchain/Cargo.toml              |  12 +-
 primitives/consensus/aura/Cargo.toml          |  18 +-
 primitives/consensus/babe/Cargo.toml          |  24 +-
 primitives/consensus/common/Cargo.toml        |  20 +-
 primitives/consensus/pow/Cargo.toml           |  10 +-
 primitives/consensus/slots/Cargo.toml         |   6 +-
 primitives/consensus/vrf/Cargo.toml           |   8 +-
 primitives/core/Cargo.toml                    |  10 +-
 primitives/database/Cargo.toml                |   2 +-
 primitives/externalities/Cargo.toml           |   6 +-
 primitives/finality-grandpa/Cargo.toml        |  14 +-
 primitives/inherents/Cargo.toml               |   8 +-
 primitives/io/Cargo.toml                      |  22 +-
 primitives/keyring/Cargo.toml                 |   6 +-
 primitives/keystore/Cargo.toml                |   6 +-
 primitives/maybe-compressed-blob/Cargo.toml   |   2 +-
 primitives/npos-elections/Cargo.toml          |  14 +-
 primitives/npos-elections/compact/Cargo.toml  |   6 +-
 primitives/npos-elections/fuzzer/Cargo.toml   |   8 +-
 primitives/offchain/Cargo.toml                |  10 +-
 primitives/rpc/Cargo.toml                     |   4 +-
 primitives/runtime-interface/Cargo.toml       |  20 +-
 .../runtime-interface/proc-macro/Cargo.toml   |   2 +-
 .../test-wasm-deprecated/Cargo.toml           |  10 +-
 .../runtime-interface/test-wasm/Cargo.toml    |  10 +-
 primitives/runtime-interface/test/Cargo.toml  |  14 +-
 primitives/runtime/Cargo.toml                 |  18 +-
 primitives/sandbox/Cargo.toml                 |  10 +-
 primitives/session/Cargo.toml                 |  12 +-
 primitives/staking/Cargo.toml                 |   6 +-
 primitives/state-machine/Cargo.toml           |  12 +-
 primitives/std/Cargo.toml                     |   2 +-
 primitives/storage/Cargo.toml                 |   4 +-
 primitives/tasks/Cargo.toml                   |  12 +-
 primitives/test-primitives/Cargo.toml         |   6 +-
 primitives/timestamp/Cargo.toml               |  10 +-
 primitives/tracing/Cargo.toml                 |   4 +-
 primitives/transaction-pool/Cargo.toml        |   6 +-
 .../transaction-storage-proof/Cargo.toml      |  12 +-
 primitives/trie/Cargo.toml                    |   8 +-
 primitives/utils/Cargo.toml                   |   2 +-
 primitives/version/Cargo.toml                 |   8 +-
 primitives/version/proc-macro/Cargo.toml      |   4 +-
 primitives/wasm-interface/Cargo.toml          |   4 +-
 test-utils/Cargo.toml                         |   6 +-
 test-utils/client/Cargo.toml                  |  28 +-
 test-utils/derive/Cargo.toml                  |   2 +-
 test-utils/runtime/Cargo.toml                 |  58 +--
 test-utils/runtime/client/Cargo.toml          |  20 +-
 .../runtime/transaction-pool/Cargo.toml       |   8 +-
 test-utils/test-crate/Cargo.toml              |   4 +-
 test-utils/test-runner/Cargo.toml             |  60 +--
 utils/browser/Cargo.toml                      |  14 +-
 utils/frame/benchmarking-cli/Cargo.toml       |  24 +-
 utils/frame/frame-utilities-cli/Cargo.toml    |  12 +-
 utils/frame/remote-externalities/Cargo.toml   |  12 +-
 utils/frame/rpc/support/Cargo.toml            |   8 +-
 utils/frame/rpc/system/Cargo.toml             |  24 +-
 utils/frame/try-runtime/cli/Cargo.toml        |  31 +-
 utils/wasm-builder/Cargo.toml                 |   4 +-
 206 files changed, 2097 insertions(+), 2084 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2ffa8a4b977b..727ee2049648 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,7 +40,7 @@ variables:                         &default-vars
   ARCH:                            "x86_64"
   CI_IMAGE:                        "paritytech/ci-linux:production"
   # FIXME set to release
-  CARGO_UNLEASH_INSTALL_PARAMS:    "--version 1.0.0-alpha.11"
+  CARGO_UNLEASH_INSTALL_PARAMS:    "--version 1.0.0-alpha.12"
   CARGO_UNLEASH_PKG_DEF:           "--skip node node-* pallet-template pallet-example pallet-example-* subkey chain-spec-builder"
 
 default:
@@ -326,13 +326,14 @@ test-linux-stable:                 &test-linux
 unleash-check:
   stage:                           test
   <<:                              *docker-env
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "pipeline"
-      when: never
-    - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
+  <<:                              *test-refs-no-trigger
   script:
     - cargo install cargo-unleash ${CARGO_UNLEASH_INSTALL_PARAMS}
+    - cargo unleash de-dev-deps
+    # Reuse build artifacts when running checks (cuts down check time by 3x)
+    # TODO: Implement this optimization in cargo-unleash rather than here
+    - mkdir -p target/unleash
+    - export CARGO_TARGET_DIR=target/unleash
     - cargo unleash check ${CARGO_UNLEASH_PKG_DEF}
 
 test-frame-examples-compile-to-wasm:
diff --git a/.maintain/gitlab/check_polkadot_companion_build.sh b/.maintain/gitlab/check_polkadot_companion_build.sh
index 89780f082e45..531155b73dfc 100755
--- a/.maintain/gitlab/check_polkadot_companion_build.sh
+++ b/.maintain/gitlab/check_polkadot_companion_build.sh
@@ -88,5 +88,12 @@ fi
 # Patch all Substrate crates in Polkadot
 diener patch --crates-to-patch ../ --substrate --path Cargo.toml
 
+# We need to update specifically our patched Substrate crates so that other
+# crates that depend on them (e.g. Polkadot, BEEFY) use this unified version
+# NOTE: There's no way to only update patched crates, so we use a heuristic
+# of updating a crucial Substrate crate (`sp-core`) to minimize the impact of
+# updating unrelated dependencies
+cargo update -p sp-core
+
 # Test Polkadot pr or master branch with this Substrate commit.
 time cargo test --all --release --verbose
diff --git a/Cargo.lock b/Cargo.lock
index c40c48a9b444..38a401f11ac2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1760,7 +1760,7 @@ dependencies = [
 
 [[package]]
 name = "frame-benchmarking"
-version = "3.1.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1780,7 +1780,7 @@ dependencies = [
 
 [[package]]
 name = "frame-benchmarking-cli"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "Inflector",
  "chrono",
@@ -1803,7 +1803,7 @@ dependencies = [
 
 [[package]]
 name = "frame-election-provider-support"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1816,7 +1816,7 @@ dependencies = [
 
 [[package]]
 name = "frame-executive"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1836,7 +1836,7 @@ dependencies = [
 
 [[package]]
 name = "frame-metadata"
-version = "13.0.0"
+version = "14.0.0-dev"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -1846,7 +1846,7 @@ dependencies = [
 
 [[package]]
 name = "frame-support"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -1874,7 +1874,7 @@ dependencies = [
 
 [[package]]
 name = "frame-support-procedural"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "Inflector",
  "frame-support-procedural-tools",
@@ -1885,7 +1885,7 @@ dependencies = [
 
 [[package]]
 name = "frame-support-procedural-tools"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate 1.0.0",
@@ -1924,7 +1924,7 @@ dependencies = [
 
 [[package]]
 name = "frame-system"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "criterion",
  "frame-support",
@@ -1943,7 +1943,7 @@ dependencies = [
 
 [[package]]
 name = "frame-system-benchmarking"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -1958,7 +1958,7 @@ dependencies = [
 
 [[package]]
 name = "frame-system-rpc-runtime-api"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -1966,7 +1966,7 @@ dependencies = [
 
 [[package]]
 name = "frame-try-runtime"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -4091,7 +4091,7 @@ dependencies = [
 
 [[package]]
 name = "node-bench"
-version = "0.8.0"
+version = "0.9.0-dev"
 dependencies = [
  "derive_more",
  "fs_extra",
@@ -4129,7 +4129,7 @@ dependencies = [
 
 [[package]]
 name = "node-browser-testing"
-version = "2.0.0"
+version = "3.0.0-dev"
 dependencies = [
  "futures 0.3.15",
  "futures-timer 3.0.2",
@@ -4147,7 +4147,7 @@ dependencies = [
 
 [[package]]
 name = "node-cli"
-version = "2.0.0"
+version = "3.0.0-dev"
 dependencies = [
  "assert_cmd",
  "async-std",
@@ -4216,6 +4216,7 @@ dependencies = [
  "sp-keystore",
  "sp-runtime",
  "sp-timestamp",
+ "sp-transaction-pool",
  "sp-trie",
  "structopt",
  "substrate-browser-utils",
@@ -4229,7 +4230,7 @@ dependencies = [
 
 [[package]]
 name = "node-executor"
-version = "2.0.0"
+version = "3.0.0-dev"
 dependencies = [
  "criterion",
  "frame-benchmarking",
@@ -4266,7 +4267,7 @@ dependencies = [
 
 [[package]]
 name = "node-inspect"
-version = "0.8.0"
+version = "0.9.0-dev"
 dependencies = [
  "derive_more",
  "log",
@@ -4295,7 +4296,7 @@ dependencies = [
 
 [[package]]
 name = "node-rpc"
-version = "2.0.0"
+version = "3.0.0-dev"
 dependencies = [
  "jsonrpc-core",
  "node-primitives",
@@ -4339,7 +4340,7 @@ dependencies = [
 
 [[package]]
 name = "node-runtime"
-version = "2.0.1"
+version = "3.0.0-dev"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -4491,7 +4492,7 @@ dependencies = [
 
 [[package]]
 name = "node-testing"
-version = "2.0.0"
+version = "3.0.0-dev"
 dependencies = [
  "criterion",
  "frame-support",
@@ -4697,7 +4698,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-assets"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4712,7 +4713,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-atomic-swap"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4726,7 +4727,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-aura"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4745,7 +4746,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-authority-discovery"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4762,7 +4763,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-authorship"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4778,7 +4779,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-babe"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -4806,7 +4807,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-balances"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4822,7 +4823,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-bounties"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4839,7 +4840,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-collective"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4856,7 +4857,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-contracts"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "assert_matches",
  "bitflags",
@@ -4889,7 +4890,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-contracts-primitives"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "bitflags",
  "parity-scale-codec",
@@ -4901,7 +4902,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-contracts-proc-macro"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4910,7 +4911,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-contracts-rpc"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -4929,7 +4930,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-contracts-rpc-runtime-api"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "pallet-contracts-primitives",
  "parity-scale-codec",
@@ -4940,7 +4941,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-democracy"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4960,7 +4961,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-election-provider-multi-phase"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -4986,7 +4987,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-elections"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5001,7 +5002,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-elections-phragmen"
-version = "4.0.0"
+version = "5.0.0-dev"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5020,7 +5021,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-example"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5036,7 +5037,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-example-offchain-worker"
-version = "2.0.1"
+version = "3.0.0-dev"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5052,7 +5053,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-example-parallel"
-version = "2.0.1"
+version = "3.0.0-dev"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5067,7 +5068,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-gilt"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5083,7 +5084,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-grandpa"
-version = "3.1.0"
+version = "4.0.0-dev"
 dependencies = [
  "finality-grandpa",
  "frame-benchmarking",
@@ -5112,7 +5113,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-identity"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -5128,7 +5129,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-im-online"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5147,7 +5148,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-indices"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5163,7 +5164,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-lottery"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5180,7 +5181,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-membership"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5195,7 +5196,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-mmr"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "ckb-merkle-mountain-range",
  "env_logger 0.8.3",
@@ -5213,7 +5214,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-mmr-primitives"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5247,7 +5248,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-multisig"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5262,7 +5263,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-nicks"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5276,7 +5277,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-node-authorization"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5290,7 +5291,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-offences"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5307,7 +5308,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-offences-benchmarking"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5333,7 +5334,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-proxy"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5349,7 +5350,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-randomness-collective-flip"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5363,7 +5364,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-recovery"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -5378,7 +5379,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-scheduler"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5394,7 +5395,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-scored-pool"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5408,7 +5409,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-session"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5429,7 +5430,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-session-benchmarking"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5452,7 +5453,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-society"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-support",
  "frame-support-test",
@@ -5468,7 +5469,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-staking"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5500,7 +5501,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-staking-reward-curve"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -5511,7 +5512,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-staking-reward-fn"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "log",
  "sp-arithmetic",
@@ -5519,7 +5520,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-sudo"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5546,7 +5547,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-timestamp"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5564,7 +5565,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-tips"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5582,7 +5583,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-transaction-payment"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5600,7 +5601,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-transaction-payment-rpc"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -5616,7 +5617,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -5626,7 +5627,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-transaction-storage"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5646,7 +5647,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-treasury"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5664,7 +5665,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-uniques"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5679,7 +5680,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-utility"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5694,7 +5695,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-vesting"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -6754,7 +6755,7 @@ dependencies = [
 
 [[package]]
 name = "remote-externalities"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "env_logger 0.8.3",
  "frame-support",
@@ -6983,7 +6984,7 @@ dependencies = [
 
 [[package]]
 name = "sc-allocator"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "log",
  "sp-core",
@@ -6993,7 +6994,7 @@ dependencies = [
 
 [[package]]
 name = "sc-authority-discovery"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7025,7 +7026,7 @@ dependencies = [
 
 [[package]]
 name = "sc-basic-authorship"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "futures 0.3.15",
  "futures-timer 3.0.2",
@@ -7050,7 +7051,7 @@ dependencies = [
 
 [[package]]
 name = "sc-block-builder"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -7067,7 +7068,7 @@ dependencies = [
 
 [[package]]
 name = "sc-chain-spec"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -7086,7 +7087,7 @@ dependencies = [
 
 [[package]]
 name = "sc-chain-spec-derive"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -7096,7 +7097,7 @@ dependencies = [
 
 [[package]]
 name = "sc-cli"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "chrono",
  "fdlimit",
@@ -7134,7 +7135,7 @@ dependencies = [
 
 [[package]]
 name = "sc-client-api"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "derive_more",
  "fnv",
@@ -7171,7 +7172,7 @@ dependencies = [
 
 [[package]]
 name = "sc-client-db"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -7205,7 +7206,7 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "async-trait",
  "parking_lot 0.11.1",
@@ -7217,7 +7218,7 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-aura"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7259,7 +7260,7 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-babe"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7315,7 +7316,7 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-babe-rpc"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "derive_more",
  "futures 0.3.15",
@@ -7344,7 +7345,7 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-epochs"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -7356,7 +7357,7 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-manual-seal"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "assert_matches",
  "async-trait",
@@ -7395,7 +7396,7 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-pow"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7418,7 +7419,7 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-slots"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "async-trait",
  "futures 0.3.15",
@@ -7446,7 +7447,7 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-uncles"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "sc-client-api",
  "sp-authorship",
@@ -7456,7 +7457,7 @@ dependencies = [
 
 [[package]]
 name = "sc-executor"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "assert_matches",
  "derive_more",
@@ -7498,7 +7499,7 @@ dependencies = [
 
 [[package]]
 name = "sc-executor-common"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "derive_more",
  "parity-scale-codec",
@@ -7514,7 +7515,7 @@ dependencies = [
 
 [[package]]
 name = "sc-executor-wasmi"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7528,7 +7529,7 @@ dependencies = [
 
 [[package]]
 name = "sc-executor-wasmtime"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "assert_matches",
  "cfg-if 1.0.0",
@@ -7551,7 +7552,7 @@ dependencies = [
 
 [[package]]
 name = "sc-finality-grandpa"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "assert_matches",
  "async-trait",
@@ -7600,7 +7601,7 @@ dependencies = [
 
 [[package]]
 name = "sc-finality-grandpa-rpc"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "derive_more",
  "finality-grandpa",
@@ -7630,7 +7631,7 @@ dependencies = [
 
 [[package]]
 name = "sc-finality-grandpa-warp-sync"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "derive_more",
  "finality-grandpa",
@@ -7656,7 +7657,7 @@ dependencies = [
 
 [[package]]
 name = "sc-informant"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.15",
@@ -7673,7 +7674,7 @@ dependencies = [
 
 [[package]]
 name = "sc-keystore"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7693,7 +7694,7 @@ dependencies = [
 
 [[package]]
 name = "sc-light"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "hash-db",
  "lazy_static",
@@ -7711,7 +7712,7 @@ dependencies = [
 
 [[package]]
 name = "sc-network"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "assert_matches",
  "async-std",
@@ -7771,7 +7772,7 @@ dependencies = [
 
 [[package]]
 name = "sc-network-gossip"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "async-std",
  "futures 0.3.15",
@@ -7819,7 +7820,7 @@ dependencies = [
 
 [[package]]
 name = "sc-offchain"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
@@ -7855,7 +7856,7 @@ dependencies = [
 
 [[package]]
 name = "sc-peerset"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "futures 0.3.15",
  "libp2p",
@@ -7876,7 +7877,7 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "assert_matches",
  "futures 0.1.31",
@@ -7919,7 +7920,7 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc-api"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "derive_more",
  "futures 0.3.15",
@@ -7943,7 +7944,7 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc-server"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "futures 0.1.31",
  "jsonrpc-core",
@@ -7973,7 +7974,7 @@ dependencies = [
 
 [[package]]
 name = "sc-service"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "async-std",
  "async-trait",
@@ -8082,7 +8083,7 @@ dependencies = [
 
 [[package]]
 name = "sc-state-db"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -8096,7 +8097,7 @@ dependencies = [
 
 [[package]]
 name = "sc-sync-state-rpc"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -8115,7 +8116,7 @@ dependencies = [
 
 [[package]]
 name = "sc-telemetry"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "chrono",
  "futures 0.3.15",
@@ -8134,7 +8135,7 @@ dependencies = [
 
 [[package]]
 name = "sc-tracing"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -8170,7 +8171,7 @@ dependencies = [
 
 [[package]]
 name = "sc-tracing-proc-macro"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -8180,7 +8181,7 @@ dependencies = [
 
 [[package]]
 name = "sc-transaction-pool"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "assert_matches",
  "criterion",
@@ -8216,7 +8217,7 @@ dependencies = [
 
 [[package]]
 name = "sc-transaction-pool-api"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "derive_more",
  "futures 0.3.15",
@@ -8639,7 +8640,7 @@ dependencies = [
 
 [[package]]
 name = "sp-api"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "hash-db",
  "log",
@@ -8656,7 +8657,7 @@ dependencies = [
 
 [[package]]
 name = "sp-api-proc-macro"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate 1.0.0",
@@ -8689,7 +8690,7 @@ dependencies = [
 
 [[package]]
 name = "sp-application-crypto"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -8712,7 +8713,7 @@ dependencies = [
 
 [[package]]
 name = "sp-arithmetic"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "criterion",
  "integer-sqrt",
@@ -8740,7 +8741,7 @@ dependencies = [
 
 [[package]]
 name = "sp-authority-discovery"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8751,7 +8752,7 @@ dependencies = [
 
 [[package]]
 name = "sp-authorship"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -8762,7 +8763,7 @@ dependencies = [
 
 [[package]]
 name = "sp-block-builder"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8773,7 +8774,7 @@ dependencies = [
 
 [[package]]
 name = "sp-blockchain"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "futures 0.3.15",
  "log",
@@ -8790,7 +8791,7 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "async-trait",
  "futures 0.3.15",
@@ -8817,7 +8818,7 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-aura"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -8833,7 +8834,7 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-babe"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "async-trait",
  "merlin",
@@ -8854,7 +8855,7 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-pow"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8865,7 +8866,7 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-slots"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "parity-scale-codec",
  "sp-arithmetic",
@@ -8874,7 +8875,7 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-vrf"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -8885,7 +8886,7 @@ dependencies = [
 
 [[package]]
 name = "sp-core"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -8934,7 +8935,7 @@ dependencies = [
 
 [[package]]
 name = "sp-database"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "kvdb",
  "parking_lot 0.11.1",
@@ -8951,7 +8952,7 @@ dependencies = [
 
 [[package]]
 name = "sp-externalities"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -8961,7 +8962,7 @@ dependencies = [
 
 [[package]]
 name = "sp-finality-grandpa"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -8977,7 +8978,7 @@ dependencies = [
 
 [[package]]
 name = "sp-inherents"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "async-trait",
  "futures 0.3.15",
@@ -8991,7 +8992,7 @@ dependencies = [
 
 [[package]]
 name = "sp-io"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "futures 0.3.15",
  "hash-db",
@@ -9015,7 +9016,7 @@ dependencies = [
 
 [[package]]
 name = "sp-keyring"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -9025,7 +9026,7 @@ dependencies = [
 
 [[package]]
 name = "sp-keystore"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -9043,7 +9044,7 @@ dependencies = [
 
 [[package]]
 name = "sp-maybe-compressed-blob"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "ruzstd",
  "zstd",
@@ -9051,7 +9052,7 @@ dependencies = [
 
 [[package]]
 name = "sp-npos-elections"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "parity-scale-codec",
  "rand 0.7.3",
@@ -9066,7 +9067,7 @@ dependencies = [
 
 [[package]]
 name = "sp-npos-elections-compact"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "parity-scale-codec",
  "proc-macro-crate 1.0.0",
@@ -9094,7 +9095,7 @@ dependencies = [
 
 [[package]]
 name = "sp-offchain"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -9111,7 +9112,7 @@ dependencies = [
 
 [[package]]
 name = "sp-rpc"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -9122,7 +9123,7 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -9147,7 +9148,7 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime-interface"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -9169,7 +9170,7 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime-interface-proc-macro"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "Inflector",
  "proc-macro-crate 1.0.0",
@@ -9219,7 +9220,7 @@ dependencies = [
 
 [[package]]
 name = "sp-sandbox"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "assert_matches",
  "parity-scale-codec",
@@ -9241,7 +9242,7 @@ dependencies = [
 
 [[package]]
 name = "sp-session"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -9253,7 +9254,7 @@ dependencies = [
 
 [[package]]
 name = "sp-staking"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -9262,7 +9263,7 @@ dependencies = [
 
 [[package]]
 name = "sp-state-machine"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "hash-db",
  "hex-literal",
@@ -9287,11 +9288,11 @@ dependencies = [
 
 [[package]]
 name = "sp-std"
-version = "3.0.0"
+version = "4.0.0-dev"
 
 [[package]]
 name = "sp-storage"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -9303,7 +9304,7 @@ dependencies = [
 
 [[package]]
 name = "sp-tasks"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -9328,7 +9329,7 @@ dependencies = [
 
 [[package]]
 name = "sp-timestamp"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "async-trait",
  "futures-timer 3.0.2",
@@ -9344,7 +9345,7 @@ dependencies = [
 
 [[package]]
 name = "sp-tracing"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "erased-serde",
  "log",
@@ -9361,7 +9362,7 @@ dependencies = [
 
 [[package]]
 name = "sp-transaction-pool"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -9369,7 +9370,7 @@ dependencies = [
 
 [[package]]
 name = "sp-transaction-storage-proof"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "async-trait",
  "log",
@@ -9383,7 +9384,7 @@ dependencies = [
 
 [[package]]
 name = "sp-trie"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "criterion",
  "hash-db",
@@ -9401,7 +9402,7 @@ dependencies = [
 
 [[package]]
 name = "sp-utils"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "futures 0.3.15",
  "futures-core",
@@ -9412,7 +9413,7 @@ dependencies = [
 
 [[package]]
 name = "sp-version"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -9426,7 +9427,7 @@ dependencies = [
 
 [[package]]
 name = "sp-version-proc-macro"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "parity-scale-codec",
  "proc-macro-crate 1.0.0",
@@ -9438,7 +9439,7 @@ dependencies = [
 
 [[package]]
 name = "sp-wasm-interface"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -9570,7 +9571,7 @@ dependencies = [
 
 [[package]]
 name = "substrate-browser-utils"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "chrono",
  "console_error_panic_hook",
@@ -9602,7 +9603,7 @@ dependencies = [
 
 [[package]]
 name = "substrate-frame-cli"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -9630,7 +9631,7 @@ dependencies = [
 
 [[package]]
 name = "substrate-frame-rpc-system"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.15",
@@ -9775,7 +9776,7 @@ dependencies = [
 
 [[package]]
 name = "substrate-test-utils"
-version = "3.0.0"
+version = "4.0.0-dev"
 dependencies = [
  "futures 0.3.15",
  "sc-service",
@@ -9786,7 +9787,7 @@ dependencies = [
 
 [[package]]
 name = "substrate-test-utils-derive"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "quote",
@@ -9804,7 +9805,7 @@ dependencies = [
 
 [[package]]
 name = "substrate-wasm-builder"
-version = "4.0.0"
+version = "5.0.0-dev"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -10582,7 +10583,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 
 [[package]]
 name = "try-runtime-cli"
-version = "0.9.0"
+version = "0.10.0-dev"
 dependencies = [
  "frame-try-runtime",
  "log",
@@ -10598,7 +10599,6 @@ dependencies = [
  "sp-blockchain",
  "sp-core",
  "sp-externalities",
- "sp-io",
  "sp-keystore",
  "sp-runtime",
  "sp-state-machine",
diff --git a/bin/node-template/node/Cargo.toml b/bin/node-template/node/Cargo.toml
index 88657934b1d0..21f28764eab4 100644
--- a/bin/node-template/node/Cargo.toml
+++ b/bin/node-template/node/Cargo.toml
@@ -8,6 +8,7 @@ license = "Unlicense"
 build = "build.rs"
 homepage = "https://substrate.dev"
 repository = "https://github.com/substrate-developer-hub/substrate-node-template/"
+publish = false
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
@@ -18,39 +19,39 @@ name = "node-template"
 [dependencies]
 structopt = "0.3.8"
 
-sc-cli = { version = "0.9.0", path = "../../../client/cli", features = ["wasmtime"] }
-sp-core = { version = "3.0.0", path = "../../../primitives/core" }
-sc-executor = { version = "0.9.0", path = "../../../client/executor", features = ["wasmtime"] }
-sc-service = { version = "0.9.0", path = "../../../client/service", features = ["wasmtime"] }
-sc-telemetry = { version = "3.0.0", path = "../../../client/telemetry" }
-sc-keystore = { version = "3.0.0", path = "../../../client/keystore" }
-sp-inherents = { version = "3.0.0", path = "../../../primitives/inherents" }
-sc-transaction-pool = { version = "3.0.0", path = "../../../client/transaction-pool" }
-sc-transaction-pool-api = { version = "3.0.0", path = "../../../client/transaction-pool/api" }
-sc-consensus-aura = { version = "0.9.0", path = "../../../client/consensus/aura" }
-sp-consensus-aura = { version = "0.9.0", path = "../../../primitives/consensus/aura" }
-sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
-sc-consensus = { version = "0.9.0", path = "../../../client/consensus/common" }
-sc-finality-grandpa = { version = "0.9.0", path = "../../../client/finality-grandpa" }
-sp-finality-grandpa = { version = "3.0.0", path = "../../../primitives/finality-grandpa" }
-sc-client-api = { version = "3.0.0", path = "../../../client/api" }
-sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
-sp-timestamp = { version = "3.0.0", path = "../../../primitives/timestamp" }
+sc-cli = { version = "0.10.0-dev", path = "../../../client/cli", features = ["wasmtime"] }
+sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
+sc-executor = { version = "0.10.0-dev", path = "../../../client/executor", features = ["wasmtime"] }
+sc-service = { version = "0.10.0-dev", path = "../../../client/service", features = ["wasmtime"] }
+sc-telemetry = { version = "4.0.0-dev", path = "../../../client/telemetry" }
+sc-keystore = { version = "4.0.0-dev", path = "../../../client/keystore" }
+sp-inherents = { version = "4.0.0-dev", path = "../../../primitives/inherents" }
+sc-transaction-pool = { version = "4.0.0-dev", path = "../../../client/transaction-pool" }
+sc-transaction-pool-api = { version = "4.0.0-dev", path = "../../../client/transaction-pool/api" }
+sc-consensus-aura = { version = "0.10.0-dev", path = "../../../client/consensus/aura" }
+sp-consensus-aura = { version = "0.10.0-dev", path = "../../../primitives/consensus/aura" }
+sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
+sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/common" }
+sc-finality-grandpa = { version = "0.10.0-dev", path = "../../../client/finality-grandpa" }
+sp-finality-grandpa = { version = "4.0.0-dev", path = "../../../primitives/finality-grandpa" }
+sc-client-api = { version = "4.0.0-dev", path = "../../../client/api" }
+sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
+sp-timestamp = { version = "4.0.0-dev", path = "../../../primitives/timestamp" }
 
 # These dependencies are used for the node template's RPCs
 jsonrpc-core = "15.1.0"
-sc-rpc = { version = "3.0.0", path = "../../../client/rpc" }
-sp-api = { version = "3.0.0", path = "../../../primitives/api" }
-sc-rpc-api = { version = "0.9.0", path = "../../../client/rpc-api" }
-sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
-sp-block-builder = { version = "3.0.0", path = "../../../primitives/block-builder" }
-sc-basic-authorship = { version = "0.9.0", path = "../../../client/basic-authorship" }
-substrate-frame-rpc-system = { version = "3.0.0", path = "../../../utils/frame/rpc/system" }
-pallet-transaction-payment-rpc = { version = "3.0.0", path = "../../../frame/transaction-payment/rpc/" }
+sc-rpc = { version = "4.0.0-dev", path = "../../../client/rpc" }
+sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
+sc-rpc-api = { version = "0.10.0-dev", path = "../../../client/rpc-api" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
+sp-block-builder = { version = "4.0.0-dev", path = "../../../primitives/block-builder" }
+sc-basic-authorship = { version = "0.10.0-dev", path = "../../../client/basic-authorship" }
+substrate-frame-rpc-system = { version = "4.0.0-dev", path = "../../../utils/frame/rpc/system" }
+pallet-transaction-payment-rpc = { version = "4.0.0-dev", path = "../../../frame/transaction-payment/rpc/" }
 
 # These dependencies are used for runtime benchmarking
-frame-benchmarking = { version = "3.1.0", path = "../../../frame/benchmarking" }
-frame-benchmarking-cli = { version = "3.0.0", path = "../../../utils/frame/benchmarking-cli" }
+frame-benchmarking = { version = "4.0.0-dev", path = "../../../frame/benchmarking" }
+frame-benchmarking-cli = { version = "4.0.0-dev", path = "../../../utils/frame/benchmarking-cli" }
 
 node-template-runtime = { version = "3.0.0", path = "../runtime" }
 
diff --git a/bin/node-template/pallets/template/Cargo.toml b/bin/node-template/pallets/template/Cargo.toml
index df76d20a4a7e..60118013c11b 100644
--- a/bin/node-template/pallets/template/Cargo.toml
+++ b/bin/node-template/pallets/template/Cargo.toml
@@ -8,21 +8,22 @@ homepage = "https://substrate.dev"
 repository = "https://github.com/substrate-developer-hub/substrate-node-template/"
 description = "FRAME pallet template for defining custom runtime logic."
 readme = "README.md"
+publish = false
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-frame-support = { default-features = false, version = "3.0.0", path = "../../../../frame/support" }
-frame-system = { default-features = false,  version = "3.0.0",  path = "../../../../frame/system" }
-frame-benchmarking = { default-features = false,  version = "3.1.0",  path = "../../../../frame/benchmarking", optional = true }
+frame-support = { default-features = false, version = "4.0.0-dev", path = "../../../../frame/support" }
+frame-system = { default-features = false,  version = "4.0.0-dev",  path = "../../../../frame/system" }
+frame-benchmarking = { default-features = false,  version = "4.0.0-dev",  path = "../../../../frame/benchmarking", optional = true }
 
 [dev-dependencies]
 serde = { version = "1.0.119" }
-sp-core = { default-features = false, version = "3.0.0", path = "../../../../primitives/core" }
-sp-io = { default-features = false, version = "3.0.0", path = "../../../../primitives/io" }
-sp-runtime = { default-features = false, version = "3.0.0", path = "../../../../primitives/runtime" }
+sp-core = { default-features = false, version = "4.0.0-dev", path = "../../../../primitives/core" }
+sp-io = { default-features = false, version = "4.0.0-dev", path = "../../../../primitives/io" }
+sp-runtime = { default-features = false, version = "4.0.0-dev", path = "../../../../primitives/runtime" }
 
 [features]
 default = ['std']
diff --git a/bin/node-template/runtime/Cargo.toml b/bin/node-template/runtime/Cargo.toml
index 6234f8958aad..72e19cc62b0b 100644
--- a/bin/node-template/runtime/Cargo.toml
+++ b/bin/node-template/runtime/Cargo.toml
@@ -6,6 +6,7 @@ edition = "2018"
 license = "Unlicense"
 homepage = "https://substrate.dev"
 repository = "https://github.com/substrate-developer-hub/substrate-node-template/"
+publish = false
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
@@ -13,41 +14,41 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 
-pallet-aura = { version = "3.0.0", default-features = false, path = "../../../frame/aura" }
-pallet-balances = { version = "3.0.0", default-features = false, path = "../../../frame/balances" }
-frame-support = { version = "3.0.0", default-features = false, path = "../../../frame/support" }
-pallet-grandpa = { version = "3.1.0", default-features = false, path = "../../../frame/grandpa" }
-pallet-randomness-collective-flip = { version = "3.0.0", default-features = false, path = "../../../frame/randomness-collective-flip" }
-pallet-sudo = { version = "3.0.0", default-features = false, path = "../../../frame/sudo" }
-frame-system = { version = "3.0.0", default-features = false, path = "../../../frame/system" }
-pallet-timestamp = { version = "3.0.0", default-features = false, path = "../../../frame/timestamp" }
-pallet-transaction-payment = { version = "3.0.0", default-features = false, path = "../../../frame/transaction-payment" }
-frame-executive = { version = "3.0.0", default-features = false, path = "../../../frame/executive" }
-sp-api = { version = "3.0.0", default-features = false, path = "../../../primitives/api" }
-sp-block-builder = { path = "../../../primitives/block-builder", default-features = false, version = "3.0.0"}
-sp-consensus-aura = { version = "0.9.0", default-features = false, path = "../../../primitives/consensus/aura" }
-sp-core = { version = "3.0.0", default-features = false, path = "../../../primitives/core" }
-sp-inherents = { path = "../../../primitives/inherents", default-features = false, version = "3.0.0"}
-sp-offchain = { version = "3.0.0", default-features = false, path = "../../../primitives/offchain" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
-sp-session = { version = "3.0.0", default-features = false, path = "../../../primitives/session" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../../primitives/std" }
-sp-transaction-pool = { version = "3.0.0", default-features = false, path = "../../../primitives/transaction-pool" }
-sp-version = { version = "3.0.0", default-features = false, path = "../../../primitives/version" }
+pallet-aura = { version = "4.0.0-dev", default-features = false, path = "../../../frame/aura" }
+pallet-balances = { version = "4.0.0-dev", default-features = false, path = "../../../frame/balances" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../../../frame/support" }
+pallet-grandpa = { version = "4.0.0-dev", default-features = false, path = "../../../frame/grandpa" }
+pallet-randomness-collective-flip = { version = "4.0.0-dev", default-features = false, path = "../../../frame/randomness-collective-flip" }
+pallet-sudo = { version = "4.0.0-dev", default-features = false, path = "../../../frame/sudo" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../../../frame/system" }
+pallet-timestamp = { version = "4.0.0-dev", default-features = false, path = "../../../frame/timestamp" }
+pallet-transaction-payment = { version = "4.0.0-dev", default-features = false, path = "../../../frame/transaction-payment" }
+frame-executive = { version = "4.0.0-dev", default-features = false, path = "../../../frame/executive" }
+sp-api = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/api" }
+sp-block-builder = { path = "../../../primitives/block-builder", default-features = false, version = "4.0.0-dev"}
+sp-consensus-aura = { version = "0.10.0-dev", default-features = false, path = "../../../primitives/consensus/aura" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/core" }
+sp-inherents = { path = "../../../primitives/inherents", default-features = false, version = "4.0.0-dev"}
+sp-offchain = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/offchain" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/runtime" }
+sp-session = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/session" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/std" }
+sp-transaction-pool = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/transaction-pool" }
+sp-version = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/version" }
 
 # Used for the node template's RPCs
-frame-system-rpc-runtime-api = { version = "3.0.0", default-features = false, path = "../../../frame/system/rpc/runtime-api/" }
-pallet-transaction-payment-rpc-runtime-api = { version = "3.0.0", default-features = false, path = "../../../frame/transaction-payment/rpc/runtime-api/" }
+frame-system-rpc-runtime-api = { version = "4.0.0-dev", default-features = false, path = "../../../frame/system/rpc/runtime-api/" }
+pallet-transaction-payment-rpc-runtime-api = { version = "4.0.0-dev", default-features = false, path = "../../../frame/transaction-payment/rpc/runtime-api/" }
 
 # Used for runtime benchmarking
-frame-benchmarking = { version = "3.1.0", default-features = false, path = "../../../frame/benchmarking", optional = true }
-frame-system-benchmarking = { version = "3.0.0", default-features = false, path = "../../../frame/system/benchmarking", optional = true }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../../../frame/benchmarking", optional = true }
+frame-system-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../../../frame/system/benchmarking", optional = true }
 hex-literal = { version = "0.3.1", optional = true }
 
 pallet-template = { version = "3.0.0", default-features = false, path = "../pallets/template" }
 
 [build-dependencies]
-substrate-wasm-builder = { version = "4.0.0", path = "../../../utils/wasm-builder" }
+substrate-wasm-builder = { version = "5.0.0-dev", path = "../../../utils/wasm-builder" }
 
 [features]
 default = ["std"]
diff --git a/bin/node/bench/Cargo.toml b/bin/node/bench/Cargo.toml
index 523353c95ea6..b7b1101b92f0 100644
--- a/bin/node/bench/Cargo.toml
+++ b/bin/node/bench/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "node-bench"
-version = "0.8.0"
+version = "0.9.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Substrate node integration benchmarks."
 edition = "2018"
@@ -11,25 +11,25 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 [dependencies]
 log = "0.4.8"
 node-primitives = { version = "2.0.0", path = "../primitives" }
-node-testing = { version = "2.0.0", path = "../testing" }
-node-runtime = { version = "2.0.0", path = "../runtime" }
-sc-cli = { version = "0.9.0", path = "../../../client/cli" }
-sc-client-api = { version = "3.0.0", path = "../../../client/api/" }
-sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
-sp-state-machine = { version = "0.9.0", path = "../../../primitives/state-machine" }
+node-testing = { version = "3.0.0-dev", path = "../testing" }
+node-runtime = { version = "3.0.0-dev", path = "../runtime" }
+sc-cli = { version = "0.10.0-dev", path = "../../../client/cli" }
+sc-client-api = { version = "4.0.0-dev", path = "../../../client/api/" }
+sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
+sp-state-machine = { version = "0.10.0-dev", path = "../../../primitives/state-machine" }
 serde = "1.0.101"
 serde_json = "1.0.41"
 structopt = "0.3"
 derive_more = "0.99.2"
 kvdb = "0.10.0"
 kvdb-rocksdb = "0.12.0"
-sp-trie = { version = "3.0.0", path = "../../../primitives/trie" }
-sp-core = { version = "3.0.0", path = "../../../primitives/core" }
-sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
-sc-basic-authorship = { version = "0.9.0", path = "../../../client/basic-authorship" }
-sp-inherents = { version = "3.0.0", path = "../../../primitives/inherents" }
-sp-timestamp = { version = "3.0.0", default-features = false, path = "../../../primitives/timestamp" }
-sp-tracing = { version = "3.0.0", path = "../../../primitives/tracing" }
+sp-trie = { version = "4.0.0-dev", path = "../../../primitives/trie" }
+sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
+sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
+sc-basic-authorship = { version = "0.10.0-dev", path = "../../../client/basic-authorship" }
+sp-inherents = { version = "4.0.0-dev", path = "../../../primitives/inherents" }
+sp-timestamp = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/timestamp" }
+sp-tracing = { version = "4.0.0-dev", path = "../../../primitives/tracing" }
 hash-db = "0.15.2"
 tempfile = "3.1.0"
 fs_extra = "1"
@@ -38,6 +38,6 @@ rand = { version = "0.7.2", features = ["small_rng"] }
 lazy_static = "1.4.0"
 parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
 parity-db = { version = "0.2.4" }
-sc-transaction-pool = { version = "3.0.0", path = "../../../client/transaction-pool" }
-sc-transaction-pool-api = { version = "3.0.0", path = "../../../client/transaction-pool/api" }
+sc-transaction-pool = { version = "4.0.0-dev", path = "../../../client/transaction-pool" }
+sc-transaction-pool-api = { version = "4.0.0-dev", path = "../../../client/transaction-pool/api" }
 futures = { version = "0.3.4", features = ["thread-pool"] }
diff --git a/bin/node/browser-testing/Cargo.toml b/bin/node/browser-testing/Cargo.toml
index f66a0a2ea1ab..bb92d6d61458 100644
--- a/bin/node/browser-testing/Cargo.toml
+++ b/bin/node/browser-testing/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "node-browser-testing"
-version = "2.0.0"
+version = "3.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Tests for the in-browser light client."
 edition = "2018"
@@ -17,8 +17,8 @@ wasm-bindgen-futures = "0.4.18"
 wasm-bindgen-test = "0.3.18"
 futures = "0.3.9"
 
-node-cli = { path = "../cli", default-features = false, features = ["browser"], version = "2.0.0"}
-sc-rpc-api = { path = "../../../client/rpc-api", version = "0.9.0"}
+node-cli = { path = "../cli", default-features = false, features = ["browser"], version = "3.0.0-dev"}
+sc-rpc-api = { path = "../../../client/rpc-api", version = "0.10.0-dev"}
 
 # This is a HACK to make browser tests pass.
 # enables [`instant/wasm_bindgen`]
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index c8d7d4728b03..3b6c35ecb34f 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "node-cli"
-version = "2.0.0"
+version = "3.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Generic Substrate node implementation in Rust."
 build = "build.rs"
@@ -44,82 +44,83 @@ structopt = { version = "0.3.8", optional = true }
 parking_lot = "0.11.1"
 
 # primitives
-sp-authority-discovery = { version = "3.0.0",  path = "../../../primitives/authority-discovery" }
-sp-consensus-babe = { version = "0.9.0", path = "../../../primitives/consensus/babe" }
-grandpa-primitives = { version = "3.0.0", package = "sp-finality-grandpa", path = "../../../primitives/finality-grandpa" }
-sp-core = { version = "3.0.0", path = "../../../primitives/core" }
-sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
-sp-timestamp = { version = "3.0.0", path = "../../../primitives/timestamp" }
-sp-authorship = { version = "3.0.0", path = "../../../primitives/authorship" }
-sp-inherents = { version = "3.0.0", path = "../../../primitives/inherents" }
-sp-keyring = { version = "3.0.0", path = "../../../primitives/keyring" }
-sp-keystore = { version = "0.9.0", path = "../../../primitives/keystore" }
-sp-io = { version = "3.0.0", path = "../../../primitives/io" }
-sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
+sp-authority-discovery = { version = "4.0.0-dev",  path = "../../../primitives/authority-discovery" }
+sp-consensus-babe = { version = "0.10.0-dev", path = "../../../primitives/consensus/babe" }
+grandpa-primitives = { version = "4.0.0-dev", package = "sp-finality-grandpa", path = "../../../primitives/finality-grandpa" }
+sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
+sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
+sp-timestamp = { version = "4.0.0-dev", path = "../../../primitives/timestamp" }
+sp-authorship = { version = "4.0.0-dev", path = "../../../primitives/authorship" }
+sp-inherents = { version = "4.0.0-dev", path = "../../../primitives/inherents" }
+sp-keyring = { version = "4.0.0-dev", path = "../../../primitives/keyring" }
+sp-keystore = { version = "0.10.0-dev", path = "../../../primitives/keystore" }
+sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
+sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
+sp-transaction-pool = { version = "4.0.0-dev", path = "../../../primitives/transaction-pool" }
 
 # client dependencies
-sc-client-api = { version = "3.0.0", path = "../../../client/api" }
-sc-chain-spec = { version = "3.0.0", path = "../../../client/chain-spec" }
-sc-consensus = { version = "0.9.0", path = "../../../client/consensus/common" }
-sc-transaction-pool = { version = "3.0.0", path = "../../../client/transaction-pool" }
-sc-transaction-pool-api = { version = "3.0.0", path = "../../../client/transaction-pool/api" }
-sc-network = { version = "0.9.0", path = "../../../client/network" }
-sc-consensus-slots = { version = "0.9.0", path = "../../../client/consensus/slots" }
-sc-consensus-babe = { version = "0.9.0", path = "../../../client/consensus/babe" }
-sc-consensus-uncles = { version = "0.9.0", path = "../../../client/consensus/uncles" }
-grandpa = { version = "0.9.0", package = "sc-finality-grandpa", path = "../../../client/finality-grandpa" }
-sc-client-db = { version = "0.9.0", default-features = false, path = "../../../client/db" }
-sc-offchain = { version = "3.0.0", path = "../../../client/offchain" }
-sc-rpc = { version = "3.0.0", path = "../../../client/rpc" }
-sc-basic-authorship = { version = "0.9.0", path = "../../../client/basic-authorship" }
-sc-service = { version = "0.9.0", default-features = false, path = "../../../client/service" }
-sc-tracing = { version = "3.0.0", path = "../../../client/tracing" }
-sc-telemetry = { version = "3.0.0", path = "../../../client/telemetry" }
-sc-authority-discovery = { version = "0.9.0",  path = "../../../client/authority-discovery" }
-sc-finality-grandpa-warp-sync = { version = "0.9.0", path = "../../../client/finality-grandpa-warp-sync", optional = true }
+sc-client-api = { version = "4.0.0-dev", path = "../../../client/api" }
+sc-chain-spec = { version = "4.0.0-dev", path = "../../../client/chain-spec" }
+sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/common" }
+sc-transaction-pool = { version = "4.0.0-dev", path = "../../../client/transaction-pool" }
+sc-transaction-pool-api = { version = "4.0.0-dev", path = "../../../client/transaction-pool/api" }
+sc-network = { version = "0.10.0-dev", path = "../../../client/network" }
+sc-consensus-slots = { version = "0.10.0-dev", path = "../../../client/consensus/slots" }
+sc-consensus-babe = { version = "0.10.0-dev", path = "../../../client/consensus/babe" }
+sc-consensus-uncles = { version = "0.10.0-dev", path = "../../../client/consensus/uncles" }
+grandpa = { version = "0.10.0-dev", package = "sc-finality-grandpa", path = "../../../client/finality-grandpa" }
+sc-client-db = { version = "0.10.0-dev", default-features = false, path = "../../../client/db" }
+sc-offchain = { version = "4.0.0-dev", path = "../../../client/offchain" }
+sc-rpc = { version = "4.0.0-dev", path = "../../../client/rpc" }
+sc-basic-authorship = { version = "0.10.0-dev", path = "../../../client/basic-authorship" }
+sc-service = { version = "0.10.0-dev", default-features = false, path = "../../../client/service" }
+sc-tracing = { version = "4.0.0-dev", path = "../../../client/tracing" }
+sc-telemetry = { version = "4.0.0-dev", path = "../../../client/telemetry" }
+sc-authority-discovery = { version = "0.10.0-dev",  path = "../../../client/authority-discovery" }
+sc-finality-grandpa-warp-sync = { version = "0.10.0-dev", path = "../../../client/finality-grandpa-warp-sync", optional = true }
 
 # frame dependencies
-pallet-indices = { version = "3.0.0", path = "../../../frame/indices" }
-pallet-timestamp = { version = "3.0.0", default-features = false, path = "../../../frame/timestamp" }
-pallet-contracts = { version = "3.0.0", path = "../../../frame/contracts" }
-frame-system = { version = "3.0.0", path = "../../../frame/system" }
-pallet-balances = { version = "3.0.0", path = "../../../frame/balances" }
-pallet-transaction-payment = { version = "3.0.0", path = "../../../frame/transaction-payment" }
-frame-support = { version = "3.0.0", default-features = false, path = "../../../frame/support" }
-pallet-im-online = { version = "3.0.0", default-features = false, path = "../../../frame/im-online" }
-pallet-authority-discovery = { version = "3.0.0", path = "../../../frame/authority-discovery" }
-pallet-staking = { version = "3.0.0", path = "../../../frame/staking" }
-pallet-grandpa = { version = "3.1.0", path = "../../../frame/grandpa" }
+pallet-indices = { version = "4.0.0-dev", path = "../../../frame/indices" }
+pallet-timestamp = { version = "4.0.0-dev", default-features = false, path = "../../../frame/timestamp" }
+pallet-contracts = { version = "4.0.0-dev", path = "../../../frame/contracts" }
+frame-system = { version = "4.0.0-dev", path = "../../../frame/system" }
+pallet-balances = { version = "4.0.0-dev", path = "../../../frame/balances" }
+pallet-transaction-payment = { version = "4.0.0-dev", path = "../../../frame/transaction-payment" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../../../frame/support" }
+pallet-im-online = { version = "4.0.0-dev", default-features = false, path = "../../../frame/im-online" }
+pallet-authority-discovery = { version = "4.0.0-dev", path = "../../../frame/authority-discovery" }
+pallet-staking = { version = "4.0.0-dev", path = "../../../frame/staking" }
+pallet-grandpa = { version = "4.0.0-dev", path = "../../../frame/grandpa" }
 
 # node-specific dependencies
-node-runtime = { version = "2.0.0", path = "../runtime" }
-node-rpc = { version = "2.0.0", path = "../rpc" }
+node-runtime = { version = "3.0.0-dev", path = "../runtime" }
+node-rpc = { version = "3.0.0-dev", path = "../rpc" }
 node-primitives = { version = "2.0.0", path = "../primitives" }
-node-executor = { version = "2.0.0", path = "../executor" }
+node-executor = { version = "3.0.0-dev", path = "../executor" }
 
 # CLI-specific dependencies
-sc-cli = { version = "0.9.0", optional = true, path = "../../../client/cli" }
-frame-benchmarking-cli = { version = "3.0.0", optional = true, path = "../../../utils/frame/benchmarking-cli" }
-node-inspect = { version = "0.8.0", optional = true, path = "../inspect" }
-try-runtime-cli = { version = "0.9.0", optional = true, path = "../../../utils/frame/try-runtime/cli" }
+sc-cli = { version = "0.10.0-dev", optional = true, path = "../../../client/cli" }
+frame-benchmarking-cli = { version = "4.0.0-dev", optional = true, path = "../../../utils/frame/benchmarking-cli" }
+node-inspect = { version = "0.9.0-dev", optional = true, path = "../inspect" }
+try-runtime-cli = { version = "0.10.0-dev", optional = true, path = "../../../utils/frame/try-runtime/cli" }
 
 # WASM-specific dependencies
 wasm-bindgen = { version = "0.2.73", optional = true }
 wasm-bindgen-futures = { version = "0.4.18", optional = true }
-browser-utils = { package = "substrate-browser-utils", path = "../../../utils/browser", optional = true, version = "0.9.0"}
+browser-utils = { package = "substrate-browser-utils", path = "../../../utils/browser", optional = true, version = "0.10.0-dev"}
 libp2p-wasm-ext = { version = "0.28", features = ["websocket"], optional = true }
 
 [target.'cfg(target_arch="x86_64")'.dependencies]
-node-executor = { version = "2.0.0", path = "../executor", features = [ "wasmtime" ] }
-sc-cli = { version = "0.9.0", optional = true, path = "../../../client/cli", features = [ "wasmtime" ] }
-sc-service = { version = "0.9.0", default-features = false, path = "../../../client/service", features = [ "wasmtime" ] }
-sp-trie = { version = "3.0.0", default-features = false, path = "../../../primitives/trie", features = ["memory-tracker"] }
+node-executor = { version = "3.0.0-dev", path = "../executor", features = [ "wasmtime" ] }
+sc-cli = { version = "0.10.0-dev", optional = true, path = "../../../client/cli", features = [ "wasmtime" ] }
+sc-service = { version = "0.10.0-dev", default-features = false, path = "../../../client/service", features = [ "wasmtime" ] }
+sp-trie = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/trie", features = ["memory-tracker"] }
 
 [dev-dependencies]
-sc-keystore = { version = "3.0.0", path = "../../../client/keystore" }
-sc-consensus = { version = "0.9.0", path = "../../../client/consensus/common" }
-sc-consensus-babe = { version = "0.9.0", path = "../../../client/consensus/babe" }
-sc-consensus-epochs = { version = "0.9.0", path = "../../../client/consensus/epochs" }
+sc-keystore = { version = "4.0.0-dev", path = "../../../client/keystore" }
+sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/common" }
+sc-consensus-babe = { version = "0.10.0-dev", path = "../../../client/consensus/babe" }
+sc-consensus-epochs = { version = "0.10.0-dev", path = "../../../client/consensus/epochs" }
 sc-service-test = { version = "2.0.0", path = "../../../client/service/test" }
 futures = "0.3.9"
 tempfile = "3.1.0"
@@ -133,14 +134,14 @@ soketto = "0.4.2"
 
 [build-dependencies]
 structopt = { version = "0.3.8", optional = true }
-node-inspect = { version = "0.8.0", optional = true, path = "../inspect" }
-frame-benchmarking-cli = { version = "3.0.0", optional = true, path = "../../../utils/frame/benchmarking-cli" }
+node-inspect = { version = "0.9.0-dev", optional = true, path = "../inspect" }
+frame-benchmarking-cli = { version = "4.0.0-dev", optional = true, path = "../../../utils/frame/benchmarking-cli" }
 substrate-build-script-utils = { version = "3.0.0", optional = true, path = "../../../utils/build-script-utils" }
-substrate-frame-cli = { version = "3.0.0", optional = true, path = "../../../utils/frame/frame-utilities-cli" }
-try-runtime-cli = { version = "0.9.0", optional = true, path = "../../../utils/frame/try-runtime/cli" }
+substrate-frame-cli = { version = "4.0.0-dev", optional = true, path = "../../../utils/frame/frame-utilities-cli" }
+try-runtime-cli = { version = "0.10.0-dev", optional = true, path = "../../../utils/frame/try-runtime/cli" }
 
 [build-dependencies.sc-cli]
-version = "0.9.0"
+version = "0.10.0-dev"
 package = "sc-cli"
 path = "../../../client/cli"
 optional = true
diff --git a/bin/node/executor/Cargo.toml b/bin/node/executor/Cargo.toml
index b08d1d78b4aa..5b0617d6af8e 100644
--- a/bin/node/executor/Cargo.toml
+++ b/bin/node/executor/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "node-executor"
-version = "2.0.0"
+version = "3.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Substrate node implementation in Rust."
 edition = "2018"
@@ -14,34 +14,34 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 node-primitives = { version = "2.0.0", path = "../primitives" }
-node-runtime = { version = "2.0.0", path = "../runtime" }
-sc-executor = { version = "0.9.0", path = "../../../client/executor" }
-sp-core = { version = "3.0.0", path = "../../../primitives/core" }
-sp-keystore = { version = "0.9.0", path = "../../../primitives/keystore" }
-sp-io = { version = "3.0.0", path = "../../../primitives/io" }
-sp-state-machine = { version = "0.9.0", path = "../../../primitives/state-machine" }
-sp-trie = { version = "3.0.0", path = "../../../primitives/trie" }
+node-runtime = { version = "3.0.0-dev", path = "../runtime" }
+sc-executor = { version = "0.10.0-dev", path = "../../../client/executor" }
+sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
+sp-keystore = { version = "0.10.0-dev", path = "../../../primitives/keystore" }
+sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
+sp-state-machine = { version = "0.10.0-dev", path = "../../../primitives/state-machine" }
+sp-trie = { version = "4.0.0-dev", path = "../../../primitives/trie" }
 trie-root = "0.16.0"
-frame-benchmarking = { version = "3.1.0", path = "../../../frame/benchmarking" }
+frame-benchmarking = { version = "4.0.0-dev", path = "../../../frame/benchmarking" }
 
 [dev-dependencies]
 criterion = "0.3.0"
-frame-support = { version = "3.0.0", path = "../../../frame/support" }
-frame-system = { version = "3.0.0", path = "../../../frame/system" }
-node-testing = { version = "2.0.0", path = "../testing" }
-pallet-balances = { version = "3.0.0", path = "../../../frame/balances" }
-pallet-contracts = { version = "3.0.0", path = "../../../frame/contracts" }
-pallet-grandpa = { version = "3.1.0", path = "../../../frame/grandpa" }
-pallet-im-online = { version = "3.0.0", path = "../../../frame/im-online" }
-pallet-indices = { version = "3.0.0", path = "../../../frame/indices" }
-pallet-session = { version = "3.0.0", path = "../../../frame/session" }
-pallet-timestamp = { version = "3.0.0", path = "../../../frame/timestamp" }
-pallet-transaction-payment = { version = "3.0.0", path = "../../../frame/transaction-payment" }
-pallet-treasury = { version = "3.0.0", path = "../../../frame/treasury" }
-sp-application-crypto = { version = "3.0.0", path = "../../../primitives/application-crypto" }
-sp-consensus-babe = { version = "0.9.0", path = "../../../primitives/consensus/babe" }
-sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
-sp-externalities = { version = "0.9.0", path = "../../../primitives/externalities" }
+frame-support = { version = "4.0.0-dev", path = "../../../frame/support" }
+frame-system = { version = "4.0.0-dev", path = "../../../frame/system" }
+node-testing = { version = "3.0.0-dev", path = "../testing" }
+pallet-balances = { version = "4.0.0-dev", path = "../../../frame/balances" }
+pallet-contracts = { version = "4.0.0-dev", path = "../../../frame/contracts" }
+pallet-grandpa = { version = "4.0.0-dev", path = "../../../frame/grandpa" }
+pallet-im-online = { version = "4.0.0-dev", path = "../../../frame/im-online" }
+pallet-indices = { version = "4.0.0-dev", path = "../../../frame/indices" }
+pallet-session = { version = "4.0.0-dev", path = "../../../frame/session" }
+pallet-timestamp = { version = "4.0.0-dev", path = "../../../frame/timestamp" }
+pallet-transaction-payment = { version = "4.0.0-dev", path = "../../../frame/transaction-payment" }
+pallet-treasury = { version = "4.0.0-dev", path = "../../../frame/treasury" }
+sp-application-crypto = { version = "4.0.0-dev", path = "../../../primitives/application-crypto" }
+sp-consensus-babe = { version = "0.10.0-dev", path = "../../../primitives/consensus/babe" }
+sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
+sp-externalities = { version = "0.10.0-dev", path = "../../../primitives/externalities" }
 substrate-test-client = { version = "2.0.0", path = "../../../test-utils/client" }
 wat = "1.0"
 futures = "0.3.9"
diff --git a/bin/node/inspect/Cargo.toml b/bin/node/inspect/Cargo.toml
index 3d89a68aed30..abd54cdbcd95 100644
--- a/bin/node/inspect/Cargo.toml
+++ b/bin/node/inspect/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "node-inspect"
-version = "0.8.0"
+version = "0.9.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -14,10 +14,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 derive_more = "0.99"
 log = "0.4.8"
-sc-cli = { version = "0.9.0", path = "../../../client/cli" }
-sc-client-api = { version = "3.0.0", path = "../../../client/api" }
-sc-service = { version = "0.9.0", default-features = false, path = "../../../client/service" }
-sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
-sp-core = { version = "3.0.0", path = "../../../primitives/core" }
-sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
+sc-cli = { version = "0.10.0-dev", path = "../../../client/cli" }
+sc-client-api = { version = "4.0.0-dev", path = "../../../client/api" }
+sc-service = { version = "0.10.0-dev", default-features = false, path = "../../../client/service" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
+sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
+sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
 structopt = "0.3.8"
diff --git a/bin/node/primitives/Cargo.toml b/bin/node/primitives/Cargo.toml
index 043ec5ab21ce..170983d7e096 100644
--- a/bin/node/primitives/Cargo.toml
+++ b/bin/node/primitives/Cargo.toml
@@ -12,10 +12,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-frame-system = { version = "3.0.0", default-features = false, path = "../../../frame/system" }
-sp-application-crypto = { version = "3.0.0", default-features = false, path = "../../../primitives/application-crypto" }
-sp-core = { version = "3.0.0", default-features = false, path = "../../../primitives/core" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../../../frame/system" }
+sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/application-crypto" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/core" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/runtime" }
 
 [dev-dependencies]
 sp-serializer = { version = "3.0.0", path = "../../../primitives/serializer" }
diff --git a/bin/node/rpc-client/Cargo.toml b/bin/node/rpc-client/Cargo.toml
index 1d9819de24b6..9ccb6c0817fd 100644
--- a/bin/node/rpc-client/Cargo.toml
+++ b/bin/node/rpc-client/Cargo.toml
@@ -16,5 +16,5 @@ hyper = "~0.12.35"
 jsonrpc-core-client = { version = "15.1.0", default-features = false, features = ["http"] }
 log = "0.4.8"
 node-primitives = { version = "2.0.0", path = "../primitives" }
-sp-tracing = { version = "3.0.0", path = "../../../primitives/tracing" }
-sc-rpc = { version = "3.0.0", path = "../../../client/rpc" }
+sp-tracing = { version = "4.0.0-dev", path = "../../../primitives/tracing" }
+sc-rpc = { version = "4.0.0-dev", path = "../../../client/rpc" }
diff --git a/bin/node/rpc/Cargo.toml b/bin/node/rpc/Cargo.toml
index 1c9f33d7c227..464971379c49 100644
--- a/bin/node/rpc/Cargo.toml
+++ b/bin/node/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "node-rpc"
-version = "2.0.0"
+version = "3.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -13,26 +13,26 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 jsonrpc-core = "15.1.0"
 node-primitives = { version = "2.0.0", path = "../primitives" }
-pallet-contracts-rpc = { version = "3.0.0", path = "../../../frame/contracts/rpc/" }
+pallet-contracts-rpc = { version = "4.0.0-dev", path = "../../../frame/contracts/rpc/" }
 pallet-mmr-rpc = { version = "3.0.0", path = "../../../frame/merkle-mountain-range/rpc/" }
-pallet-transaction-payment-rpc = { version = "3.0.0", path = "../../../frame/transaction-payment/rpc/" }
-sc-client-api = { version = "3.0.0", path = "../../../client/api" }
-sc-consensus-babe = { version = "0.9.0", path = "../../../client/consensus/babe" }
-sc-consensus-babe-rpc = { version = "0.9.0", path = "../../../client/consensus/babe/rpc" }
-sc-consensus-epochs = { version = "0.9.0", path = "../../../client/consensus/epochs" }
-sc-chain-spec = { version = "3.0.0", path = "../../../client/chain-spec" }
-sc-finality-grandpa = { version = "0.9.0", path = "../../../client/finality-grandpa" }
-sc-finality-grandpa-rpc = { version = "0.9.0", path = "../../../client/finality-grandpa/rpc" }
-sc-keystore = { version = "3.0.0", path = "../../../client/keystore" }
-sc-rpc-api = { version = "0.9.0", path = "../../../client/rpc-api" }
-sc-rpc = { version = "3.0.0", path = "../../../client/rpc" }
-sc-sync-state-rpc = { version = "0.9.0", path = "../../../client/sync-state-rpc" }
-sp-api = { version = "3.0.0", path = "../../../primitives/api" }
-sp-block-builder = { version = "3.0.0", path = "../../../primitives/block-builder" }
-sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
-sp-keystore = { version = "0.9.0", path = "../../../primitives/keystore" }
-sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
-sp-consensus-babe = { version = "0.9.0", path = "../../../primitives/consensus/babe" }
-sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
-sc-transaction-pool-api = { version = "3.0.0", path = "../../../client/transaction-pool/api" }
-substrate-frame-rpc-system = { version = "3.0.0", path = "../../../utils/frame/rpc/system" }
+pallet-transaction-payment-rpc = { version = "4.0.0-dev", path = "../../../frame/transaction-payment/rpc/" }
+sc-client-api = { version = "4.0.0-dev", path = "../../../client/api" }
+sc-consensus-babe = { version = "0.10.0-dev", path = "../../../client/consensus/babe" }
+sc-consensus-babe-rpc = { version = "0.10.0-dev", path = "../../../client/consensus/babe/rpc" }
+sc-consensus-epochs = { version = "0.10.0-dev", path = "../../../client/consensus/epochs" }
+sc-chain-spec = { version = "4.0.0-dev", path = "../../../client/chain-spec" }
+sc-finality-grandpa = { version = "0.10.0-dev", path = "../../../client/finality-grandpa" }
+sc-finality-grandpa-rpc = { version = "0.10.0-dev", path = "../../../client/finality-grandpa/rpc" }
+sc-keystore = { version = "4.0.0-dev", path = "../../../client/keystore" }
+sc-rpc-api = { version = "0.10.0-dev", path = "../../../client/rpc-api" }
+sc-rpc = { version = "4.0.0-dev", path = "../../../client/rpc" }
+sc-sync-state-rpc = { version = "0.10.0-dev", path = "../../../client/sync-state-rpc" }
+sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
+sp-block-builder = { version = "4.0.0-dev", path = "../../../primitives/block-builder" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
+sp-keystore = { version = "0.10.0-dev", path = "../../../primitives/keystore" }
+sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
+sp-consensus-babe = { version = "0.10.0-dev", path = "../../../primitives/consensus/babe" }
+sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
+sc-transaction-pool-api = { version = "4.0.0-dev", path = "../../../client/transaction-pool/api" }
+substrate-frame-rpc-system = { version = "4.0.0-dev", path = "../../../utils/frame/rpc/system" }
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index c84c6a07b639..78e46edbd64e 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "node-runtime"
-version = "2.0.1"
+version = "3.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 build = "build.rs"
@@ -20,81 +20,81 @@ hex-literal = { version = "0.3.1", optional = true }
 log = { version = "0.4.14", default-features = false }
 
 # primitives
-sp-authority-discovery = { version = "3.0.0", default-features = false, path = "../../../primitives/authority-discovery" }
-sp-consensus-babe = { version = "0.9.0", default-features = false, path = "../../../primitives/consensus/babe" }
-sp-block-builder = { path = "../../../primitives/block-builder", default-features = false, version = "3.0.0"}
-sp-inherents = { version = "3.0.0", default-features = false, path = "../../../primitives/inherents" }
+sp-authority-discovery = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/authority-discovery" }
+sp-consensus-babe = { version = "0.10.0-dev", default-features = false, path = "../../../primitives/consensus/babe" }
+sp-block-builder = { path = "../../../primitives/block-builder", default-features = false, version = "4.0.0-dev"}
+sp-inherents = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/inherents" }
 node-primitives = { version = "2.0.0", default-features = false, path = "../primitives" }
-sp-offchain = { version = "3.0.0", default-features = false, path = "../../../primitives/offchain" }
-sp-core = { version = "3.0.0", default-features = false, path = "../../../primitives/core" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../../primitives/std" }
-sp-api = { version = "3.0.0", default-features = false, path = "../../../primitives/api" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
-sp-staking = { version = "3.0.0", default-features = false, path = "../../../primitives/staking" }
-sp-keyring = { version = "3.0.0", optional = true, path = "../../../primitives/keyring" }
-sp-session = { version = "3.0.0", default-features = false, path = "../../../primitives/session" }
-sp-transaction-pool = { version = "3.0.0", default-features = false, path = "../../../primitives/transaction-pool" }
-sp-version = { version = "3.0.0", default-features = false, path = "../../../primitives/version" }
-sp-npos-elections = { version = "3.0.0", default-features = false, path = "../../../primitives/npos-elections" }
+sp-offchain = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/offchain" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/core" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/std" }
+sp-api = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/api" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/runtime" }
+sp-staking = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/staking" }
+sp-keyring = { version = "4.0.0-dev", optional = true, path = "../../../primitives/keyring" }
+sp-session = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/session" }
+sp-transaction-pool = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/transaction-pool" }
+sp-version = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/version" }
+sp-npos-elections = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/npos-elections" }
 
 # frame dependencies
-frame-executive = { version = "3.0.0", default-features = false, path = "../../../frame/executive" }
-frame-benchmarking = { version = "3.1.0", default-features = false, path = "../../../frame/benchmarking", optional = true }
-frame-support = { version = "3.0.0", default-features = false, path = "../../../frame/support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../../../frame/system" }
-frame-system-benchmarking = { version = "3.0.0", default-features = false, path = "../../../frame/system/benchmarking", optional = true }
-frame-election-provider-support = { version = "3.0.0", default-features = false, path = "../../../frame/election-provider-support" }
-frame-system-rpc-runtime-api = { version = "3.0.0", default-features = false, path = "../../../frame/system/rpc/runtime-api/" }
-frame-try-runtime = { version = "0.9.0", default-features = false, path = "../../../frame/try-runtime", optional = true }
-pallet-assets = { version = "3.0.0", default-features = false, path = "../../../frame/assets" }
-pallet-authority-discovery = { version = "3.0.0", default-features = false, path = "../../../frame/authority-discovery" }
-pallet-authorship = { version = "3.0.0", default-features = false, path = "../../../frame/authorship" }
-pallet-babe = { version = "3.0.0", default-features = false, path = "../../../frame/babe" }
-pallet-balances = { version = "3.0.0", default-features = false, path = "../../../frame/balances" }
-pallet-bounties = { version = "3.0.0", default-features = false, path = "../../../frame/bounties" }
-pallet-collective = { version = "3.0.0", default-features = false, path = "../../../frame/collective" }
-pallet-contracts = { version = "3.0.0", default-features = false, path = "../../../frame/contracts" }
-pallet-contracts-primitives = { version = "3.0.0", default-features = false, path = "../../../frame/contracts/common/" }
-pallet-contracts-rpc-runtime-api = { version = "3.0.0", default-features = false, path = "../../../frame/contracts/rpc/runtime-api/" }
-pallet-democracy = { version = "3.0.0", default-features = false, path = "../../../frame/democracy" }
-pallet-election-provider-multi-phase = { version = "3.0.0", default-features = false, path = "../../../frame/election-provider-multi-phase" }
-pallet-elections-phragmen = { version = "4.0.0", default-features = false, path = "../../../frame/elections-phragmen" }
-pallet-gilt = { version = "3.0.0", default-features = false, path = "../../../frame/gilt" }
-pallet-grandpa = { version = "3.1.0", default-features = false, path = "../../../frame/grandpa" }
-pallet-im-online = { version = "3.0.0", default-features = false, path = "../../../frame/im-online" }
-pallet-indices = { version = "3.0.0", default-features = false, path = "../../../frame/indices" }
-pallet-identity = { version = "3.0.0", default-features = false, path = "../../../frame/identity" }
-pallet-lottery = { version = "3.0.0", default-features = false, path = "../../../frame/lottery" }
-pallet-membership = { version = "3.0.0", default-features = false, path = "../../../frame/membership" }
-pallet-mmr = { version = "3.0.0", default-features = false, path = "../../../frame/merkle-mountain-range" }
-pallet-multisig = { version = "3.0.0", default-features = false, path = "../../../frame/multisig" }
-pallet-offences = { version = "3.0.0", default-features = false, path = "../../../frame/offences" }
-pallet-offences-benchmarking = { version = "3.0.0", path = "../../../frame/offences/benchmarking", default-features = false, optional = true }
-pallet-proxy = { version = "3.0.0", default-features = false, path = "../../../frame/proxy" }
-pallet-randomness-collective-flip = { version = "3.0.0", default-features = false, path = "../../../frame/randomness-collective-flip" }
-pallet-recovery = { version = "3.0.0", default-features = false, path = "../../../frame/recovery" }
-pallet-session = { version = "3.0.0", features = ["historical"], path = "../../../frame/session", default-features = false }
-pallet-session-benchmarking = { version = "3.0.0", path = "../../../frame/session/benchmarking", default-features = false, optional = true }
-pallet-staking = { version = "3.0.0", default-features = false, path = "../../../frame/staking" }
-pallet-staking-reward-curve = { version = "3.0.0", default-features = false, path = "../../../frame/staking/reward-curve" }
-pallet-scheduler = { version = "3.0.0", default-features = false, path = "../../../frame/scheduler" }
-pallet-society = { version = "3.0.0", default-features = false, path = "../../../frame/society" }
-pallet-sudo = { version = "3.0.0", default-features = false, path = "../../../frame/sudo" }
-pallet-timestamp = { version = "3.0.0", default-features = false, path = "../../../frame/timestamp" }
-pallet-tips = { version = "3.0.0", default-features = false, path = "../../../frame/tips" }
-pallet-treasury = { version = "3.0.0", default-features = false, path = "../../../frame/treasury" }
-pallet-utility = { version = "3.0.0", default-features = false, path = "../../../frame/utility" }
-pallet-transaction-payment = { version = "3.0.0", default-features = false, path = "../../../frame/transaction-payment" }
-pallet-transaction-payment-rpc-runtime-api = { version = "3.0.0", default-features = false, path = "../../../frame/transaction-payment/rpc/runtime-api/" }
-pallet-transaction-storage = { version = "3.0.0", default-features = false, path = "../../../frame/transaction-storage" }
-pallet-uniques = { version = "3.0.0", default-features = false, path = "../../../frame/uniques" }
-pallet-vesting = { version = "3.0.0", default-features = false, path = "../../../frame/vesting" }
+frame-executive = { version = "4.0.0-dev", default-features = false, path = "../../../frame/executive" }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../../../frame/benchmarking", optional = true }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../../../frame/support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../../../frame/system" }
+frame-system-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../../../frame/system/benchmarking", optional = true }
+frame-election-provider-support = { version = "4.0.0-dev", default-features = false, path = "../../../frame/election-provider-support" }
+frame-system-rpc-runtime-api = { version = "4.0.0-dev", default-features = false, path = "../../../frame/system/rpc/runtime-api/" }
+frame-try-runtime = { version = "0.10.0-dev", default-features = false, path = "../../../frame/try-runtime", optional = true }
+pallet-assets = { version = "4.0.0-dev", default-features = false, path = "../../../frame/assets" }
+pallet-authority-discovery = { version = "4.0.0-dev", default-features = false, path = "../../../frame/authority-discovery" }
+pallet-authorship = { version = "4.0.0-dev", default-features = false, path = "../../../frame/authorship" }
+pallet-babe = { version = "4.0.0-dev", default-features = false, path = "../../../frame/babe" }
+pallet-balances = { version = "4.0.0-dev", default-features = false, path = "../../../frame/balances" }
+pallet-bounties = { version = "4.0.0-dev", default-features = false, path = "../../../frame/bounties" }
+pallet-collective = { version = "4.0.0-dev", default-features = false, path = "../../../frame/collective" }
+pallet-contracts = { version = "4.0.0-dev", default-features = false, path = "../../../frame/contracts" }
+pallet-contracts-primitives = { version = "4.0.0-dev", default-features = false, path = "../../../frame/contracts/common/" }
+pallet-contracts-rpc-runtime-api = { version = "4.0.0-dev", default-features = false, path = "../../../frame/contracts/rpc/runtime-api/" }
+pallet-democracy = { version = "4.0.0-dev", default-features = false, path = "../../../frame/democracy" }
+pallet-election-provider-multi-phase = { version = "4.0.0-dev", default-features = false, path = "../../../frame/election-provider-multi-phase" }
+pallet-elections-phragmen = { version = "5.0.0-dev", default-features = false, path = "../../../frame/elections-phragmen" }
+pallet-gilt = { version = "4.0.0-dev", default-features = false, path = "../../../frame/gilt" }
+pallet-grandpa = { version = "4.0.0-dev", default-features = false, path = "../../../frame/grandpa" }
+pallet-im-online = { version = "4.0.0-dev", default-features = false, path = "../../../frame/im-online" }
+pallet-indices = { version = "4.0.0-dev", default-features = false, path = "../../../frame/indices" }
+pallet-identity = { version = "4.0.0-dev", default-features = false, path = "../../../frame/identity" }
+pallet-lottery = { version = "4.0.0-dev", default-features = false, path = "../../../frame/lottery" }
+pallet-membership = { version = "4.0.0-dev", default-features = false, path = "../../../frame/membership" }
+pallet-mmr = { version = "4.0.0-dev", default-features = false, path = "../../../frame/merkle-mountain-range" }
+pallet-multisig = { version = "4.0.0-dev", default-features = false, path = "../../../frame/multisig" }
+pallet-offences = { version = "4.0.0-dev", default-features = false, path = "../../../frame/offences" }
+pallet-offences-benchmarking = { version = "4.0.0-dev", path = "../../../frame/offences/benchmarking", default-features = false, optional = true }
+pallet-proxy = { version = "4.0.0-dev", default-features = false, path = "../../../frame/proxy" }
+pallet-randomness-collective-flip = { version = "4.0.0-dev", default-features = false, path = "../../../frame/randomness-collective-flip" }
+pallet-recovery = { version = "4.0.0-dev", default-features = false, path = "../../../frame/recovery" }
+pallet-session = { version = "4.0.0-dev", features = ["historical"], path = "../../../frame/session", default-features = false }
+pallet-session-benchmarking = { version = "4.0.0-dev", path = "../../../frame/session/benchmarking", default-features = false, optional = true }
+pallet-staking = { version = "4.0.0-dev", default-features = false, path = "../../../frame/staking" }
+pallet-staking-reward-curve = { version = "4.0.0-dev", default-features = false, path = "../../../frame/staking/reward-curve" }
+pallet-scheduler = { version = "4.0.0-dev", default-features = false, path = "../../../frame/scheduler" }
+pallet-society = { version = "4.0.0-dev", default-features = false, path = "../../../frame/society" }
+pallet-sudo = { version = "4.0.0-dev", default-features = false, path = "../../../frame/sudo" }
+pallet-timestamp = { version = "4.0.0-dev", default-features = false, path = "../../../frame/timestamp" }
+pallet-tips = { version = "4.0.0-dev", default-features = false, path = "../../../frame/tips" }
+pallet-treasury = { version = "4.0.0-dev", default-features = false, path = "../../../frame/treasury" }
+pallet-utility = { version = "4.0.0-dev", default-features = false, path = "../../../frame/utility" }
+pallet-transaction-payment = { version = "4.0.0-dev", default-features = false, path = "../../../frame/transaction-payment" }
+pallet-transaction-payment-rpc-runtime-api = { version = "4.0.0-dev", default-features = false, path = "../../../frame/transaction-payment/rpc/runtime-api/" }
+pallet-transaction-storage = { version = "4.0.0-dev", default-features = false, path = "../../../frame/transaction-storage" }
+pallet-uniques = { version = "4.0.0-dev", default-features = false, path = "../../../frame/uniques" }
+pallet-vesting = { version = "4.0.0-dev", default-features = false, path = "../../../frame/vesting" }
 
 [build-dependencies]
-substrate-wasm-builder = { version = "4.0.0", path = "../../../utils/wasm-builder" }
+substrate-wasm-builder = { version = "5.0.0-dev", path = "../../../utils/wasm-builder" }
 
 [dev-dependencies]
-sp-io = { version = "3.0.0", path = "../../../primitives/io" }
+sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
 
 [features]
 default = ["std"]
diff --git a/bin/node/test-runner-example/Cargo.toml b/bin/node/test-runner-example/Cargo.toml
index 7b8658203132..5882a73982ec 100644
--- a/bin/node/test-runner-example/Cargo.toml
+++ b/bin/node/test-runner-example/Cargo.toml
@@ -8,33 +8,33 @@ publish = false
 [dependencies]
 test-runner = { path = "../../../test-utils/test-runner", version = "0.9.0" }
 
-frame-system = { version = "3.0.0", path = "../../../frame/system" }
-frame-support = { path = "../../../frame/support", version = "3.0.0" }
-frame-benchmarking = { path = "../../../frame/benchmarking", version = "3.0.0" }
-pallet-balances = { path = "../../../frame/balances", version = "3.0.0" }
-pallet-sudo = { path = "../../../frame/sudo", version = "3.0.0" }
-pallet-transaction-payment = { version = "3.0.0", path = "../../../frame/transaction-payment" }
+frame-system = { version = "4.0.0-dev", path = "../../../frame/system" }
+frame-support = { path = "../../../frame/support", version = "4.0.0-dev"}
+frame-benchmarking = { path = "../../../frame/benchmarking", version = "4.0.0-dev"}
+pallet-balances = { path = "../../../frame/balances", version = "4.0.0-dev"}
+pallet-sudo = { path = "../../../frame/sudo", version = "4.0.0-dev"}
+pallet-transaction-payment = { version = "4.0.0-dev", path = "../../../frame/transaction-payment" }
 
-node-runtime = { path = "../runtime", version = "2.0.1" }
+node-runtime = { path = "../runtime", version = "3.0.0-dev"}
 node-primitives = { version = "2.0.0", path = "../primitives" }
-node-cli = { path = "../cli", version = "2.0.0" }
+node-cli = { path = "../cli", version = "3.0.0-dev"}
 
-grandpa = { version = "0.9.0", package = "sc-finality-grandpa", path = "../../../client/finality-grandpa" }
-sp-consensus-babe = { version = "0.9.0", path = "../../../primitives/consensus/babe" }
-sc-consensus-babe = { version = "0.9.0", path = "../../../client/consensus/babe" }
-sc-consensus-manual-seal = { version = "0.9.0", path = "../../../client/consensus/manual-seal" }
-sc-service = { version = "0.9.0", default-features = false, path = "../../../client/service" }
-sc-executor = { version = "0.9.0", path = "../../../client/executor" }
-sc-client-api = { version = "3.0.0", path = "../../../client/api" }
-sc-network = { version = "0.9.0", path = "../../../client/network" }
-sc-informant = { version = "0.9.0", path = "../../../client/informant" }
-sc-consensus = { version = "0.9.0", path = "../../../client/consensus/common" }
+grandpa = { version = "0.10.0-dev", package = "sc-finality-grandpa", path = "../../../client/finality-grandpa" }
+sp-consensus-babe = { version = "0.10.0-dev", path = "../../../primitives/consensus/babe" }
+sc-consensus-babe = { version = "0.10.0-dev", path = "../../../client/consensus/babe" }
+sc-consensus-manual-seal = { version = "0.10.0-dev", path = "../../../client/consensus/manual-seal" }
+sc-service = { version = "0.10.0-dev", default-features = false, path = "../../../client/service" }
+sc-executor = { version = "0.10.0-dev", path = "../../../client/executor" }
+sc-client-api = { version = "4.0.0-dev", path = "../../../client/api" }
+sc-network = { version = "0.10.0-dev", path = "../../../client/network" }
+sc-informant = { version = "0.10.0-dev", path = "../../../client/informant" }
+sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/common" }
 
-sp-runtime = { path = "../../../primitives/runtime", version = "3.0.0" }
-sp-keyring = { version = "3.0.0", path = "../../../primitives/keyring" }
-sp-timestamp = { version = "3.0.0", path = "../../../primitives/timestamp" }
-sp-api = { version = "3.0.0",  path = "../../../primitives/api" }
-sp-inherents = { version = "3.0.0", path = "../../../primitives/inherents" }
-sp-keystore = { version = "0.9.0", path = "../../../primitives/keystore" }
+sp-runtime = { path = "../../../primitives/runtime", version = "4.0.0-dev"}
+sp-keyring = { version = "4.0.0-dev", path = "../../../primitives/keyring" }
+sp-timestamp = { version = "4.0.0-dev", path = "../../../primitives/timestamp" }
+sp-api = { version = "4.0.0-dev",  path = "../../../primitives/api" }
+sp-inherents = { version = "4.0.0-dev", path = "../../../primitives/inherents" }
+sp-keystore = { version = "0.10.0-dev", path = "../../../primitives/keystore" }
 
 log = "0.4.14"
diff --git a/bin/node/testing/Cargo.toml b/bin/node/testing/Cargo.toml
index 706816ddae67..e2a4555e6797 100644
--- a/bin/node/testing/Cargo.toml
+++ b/bin/node/testing/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "node-testing"
-version = "2.0.0"
+version = "3.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Test utilities for Substrate node."
 edition = "2018"
@@ -13,38 +13,38 @@ publish = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-pallet-balances = { version = "3.0.0", path = "../../../frame/balances" }
-sc-service = { version = "0.9.0", features = ["test-helpers", "db"],  path = "../../../client/service" }
-sc-client-db = { version = "0.9.0", path = "../../../client/db/", features = ["kvdb-rocksdb", "parity-db"] }
-sc-client-api = { version = "3.0.0", path = "../../../client/api/" }
+pallet-balances = { version = "4.0.0-dev", path = "../../../frame/balances" }
+sc-service = { version = "0.10.0-dev", features = ["test-helpers", "db"],  path = "../../../client/service" }
+sc-client-db = { version = "0.10.0-dev", path = "../../../client/db/", features = ["kvdb-rocksdb", "parity-db"] }
+sc-client-api = { version = "4.0.0-dev", path = "../../../client/api/" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-pallet-contracts = { version = "3.0.0", path = "../../../frame/contracts" }
-pallet-grandpa = { version = "3.1.0", path = "../../../frame/grandpa" }
-pallet-indices = { version = "3.0.0", path = "../../../frame/indices" }
-sp-keyring = { version = "3.0.0", path = "../../../primitives/keyring" }
-node-executor = { version = "2.0.0", path = "../executor" }
+pallet-contracts = { version = "4.0.0-dev", path = "../../../frame/contracts" }
+pallet-grandpa = { version = "4.0.0-dev", path = "../../../frame/grandpa" }
+pallet-indices = { version = "4.0.0-dev", path = "../../../frame/indices" }
+sp-keyring = { version = "4.0.0-dev", path = "../../../primitives/keyring" }
+node-executor = { version = "3.0.0-dev", path = "../executor" }
 node-primitives = { version = "2.0.0", path = "../primitives" }
-node-runtime = { version = "2.0.0", path = "../runtime" }
-sp-core = { version = "3.0.0", path = "../../../primitives/core" }
-sp-io = { version = "3.0.0", path = "../../../primitives/io" }
-frame-support = { version = "3.0.0", path = "../../../frame/support" }
-pallet-session = { version = "3.0.0", path = "../../../frame/session" }
-pallet-society = { version = "3.0.0", path = "../../../frame/society" }
-sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
-pallet-staking = { version = "3.0.0", path = "../../../frame/staking" }
-sc-executor = { version = "0.9.0", path = "../../../client/executor", features = ["wasmtime"] }
-sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
-frame-system = { version = "3.0.0", path = "../../../frame/system" }
+node-runtime = { version = "3.0.0-dev", path = "../runtime" }
+sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
+sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
+frame-support = { version = "4.0.0-dev", path = "../../../frame/support" }
+pallet-session = { version = "4.0.0-dev", path = "../../../frame/session" }
+pallet-society = { version = "4.0.0-dev", path = "../../../frame/society" }
+sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
+pallet-staking = { version = "4.0.0-dev", path = "../../../frame/staking" }
+sc-executor = { version = "0.10.0-dev", path = "../../../client/executor", features = ["wasmtime"] }
+sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
+frame-system = { version = "4.0.0-dev", path = "../../../frame/system" }
 substrate-test-client = { version = "2.0.0", path = "../../../test-utils/client" }
-pallet-timestamp = { version = "3.0.0", path = "../../../frame/timestamp" }
-pallet-transaction-payment = { version = "3.0.0", path = "../../../frame/transaction-payment" }
-pallet-treasury = { version = "3.0.0", path = "../../../frame/treasury" }
-sp-api = { version = "3.0.0", path = "../../../primitives/api" }
-sp-timestamp = { version = "3.0.0", default-features = false, path = "../../../primitives/timestamp" }
-sp-block-builder = { version = "3.0.0", path = "../../../primitives/block-builder" }
-sc-block-builder = { version = "0.9.0", path = "../../../client/block-builder" }
-sp-inherents = { version = "3.0.0", path = "../../../primitives/inherents" }
-sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
+pallet-timestamp = { version = "4.0.0-dev", path = "../../../frame/timestamp" }
+pallet-transaction-payment = { version = "4.0.0-dev", path = "../../../frame/transaction-payment" }
+pallet-treasury = { version = "4.0.0-dev", path = "../../../frame/treasury" }
+sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
+sp-timestamp = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/timestamp" }
+sp-block-builder = { version = "4.0.0-dev", path = "../../../primitives/block-builder" }
+sc-block-builder = { version = "0.10.0-dev", path = "../../../client/block-builder" }
+sp-inherents = { version = "4.0.0-dev", path = "../../../primitives/inherents" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
 log = "0.4.8"
 tempfile = "3.1.0"
 fs_extra = "1"
@@ -52,4 +52,4 @@ futures = "0.3.1"
 
 [dev-dependencies]
 criterion = "0.3.0"
-sc-cli = { version = "0.9.0", path = "../../../client/cli" }
+sc-cli = { version = "0.10.0-dev", path = "../../../client/cli" }
diff --git a/bin/utils/chain-spec-builder/Cargo.toml b/bin/utils/chain-spec-builder/Cargo.toml
index 3c60d654db94..5bdf01badc3f 100644
--- a/bin/utils/chain-spec-builder/Cargo.toml
+++ b/bin/utils/chain-spec-builder/Cargo.toml
@@ -8,16 +8,17 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.dev"
 repository = "https://github.com/paritytech/substrate/"
 readme = "README.md"
+publish = false
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 ansi_term = "0.12.1"
-sc-keystore = { version = "3.0.0", path = "../../../client/keystore" }
-sc-chain-spec = { version = "3.0.0", path = "../../../client/chain-spec" }
-node-cli = { version = "2.0.0", path = "../../node/cli" }
-sp-core = { version = "3.0.0", path = "../../../primitives/core" }
-sp-keystore = { version = "0.9.0", path = "../../../primitives/keystore" }
+sc-keystore = { version = "4.0.0-dev", path = "../../../client/keystore" }
+sc-chain-spec = { version = "4.0.0-dev", path = "../../../client/chain-spec" }
+node-cli = { version = "3.0.0-dev", path = "../../node/cli" }
+sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
+sp-keystore = { version = "0.10.0-dev", path = "../../../primitives/keystore" }
 rand = "0.7.2"
 structopt = "0.3.8"
diff --git a/bin/utils/subkey/Cargo.toml b/bin/utils/subkey/Cargo.toml
index 1adbd88c7217..9bd38a21a664 100644
--- a/bin/utils/subkey/Cargo.toml
+++ b/bin/utils/subkey/Cargo.toml
@@ -7,6 +7,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.dev"
 repository = "https://github.com/paritytech/substrate/"
 readme = "README.md"
+publish = false
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
@@ -16,5 +17,5 @@ path = "src/main.rs"
 name = "subkey"
 
 [dependencies]
-sc-cli = { version = "0.9.0", path = "../../../client/cli" }
+sc-cli = { version = "0.10.0-dev", path = "../../../client/cli" }
 structopt = "0.3.14"
diff --git a/client/allocator/Cargo.toml b/client/allocator/Cargo.toml
index 43a3bae4e529..5ebab6cf9d61 100644
--- a/client/allocator/Cargo.toml
+++ b/client/allocator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-allocator"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,7 +14,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-sp-wasm-interface = { version = "3.0.0", path = "../../primitives/wasm-interface" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+sp-wasm-interface = { version = "4.0.0-dev", path = "../../primitives/wasm-interface" }
 log = "0.4.11"
 thiserror = "1.0.21"
diff --git a/client/api/Cargo.toml b/client/api/Cargo.toml
index 044ef78a07fb..29d38147b988 100644
--- a/client/api/Cargo.toml
+++ b/client/api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-client-api"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -15,31 +15,31 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
+sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
 derive_more = "0.99.2"
-sc-executor = { version = "0.9.0", path = "../executor" }
-sp-externalities = { version = "0.9.0", path = "../../primitives/externalities" }
+sc-executor = { version = "0.10.0-dev", path = "../executor" }
+sp-externalities = { version = "0.10.0-dev", path = "../../primitives/externalities" }
 fnv = "1.0.6"
 futures = "0.3.1"
 hash-db = { version = "0.15.2", default-features = false }
-sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
-sp-inherents = { version = "3.0.0", default-features = false, path = "../../primitives/inherents" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
+sp-inherents = { version = "4.0.0-dev", default-features = false, path = "../../primitives/inherents" }
 kvdb = "0.10.0"
 log = "0.4.8"
 parking_lot = "0.11.1"
 lazy_static =  "1.4.0"
-sp-database = { version = "3.0.0", path = "../../primitives/database" }
-sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
-sp-keystore = { version = "0.9.0", default-features = false, path = "../../primitives/keystore" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-version = { version = "3.0.0", default-features = false, path = "../../primitives/version" }
-sp-api = { version = "3.0.0", path = "../../primitives/api" }
-sp-utils = { version = "3.0.0", path = "../../primitives/utils" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-state-machine = { version = "0.9.0", path = "../../primitives/state-machine" }
-sp-trie = { version = "3.0.0", path = "../../primitives/trie" }
-sp-storage = { version = "3.0.0", path = "../../primitives/storage" }
-sc-transaction-pool-api = { version = "3.0.0", path = "../transaction-pool/api" }
+sp-database = { version = "4.0.0-dev", path = "../../primitives/database" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
+sp-keystore = { version = "0.10.0-dev", default-features = false, path = "../../primitives/keystore" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-version = { version = "4.0.0-dev", default-features = false, path = "../../primitives/version" }
+sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
+sp-utils = { version = "4.0.0-dev", path = "../../primitives/utils" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-state-machine = { version = "0.10.0-dev", path = "../../primitives/state-machine" }
+sp-trie = { version = "4.0.0-dev", path = "../../primitives/trie" }
+sp-storage = { version = "4.0.0-dev", path = "../../primitives/storage" }
+sc-transaction-pool-api = { version = "4.0.0-dev", path = "../transaction-pool/api" }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.9.0", path = "../../utils/prometheus" }
 
 [dev-dependencies]
diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml
index 5b5baa999c8b..bca84d18d088 100644
--- a/client/authority-discovery/Cargo.toml
+++ b/client/authority-discovery/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-authority-discovery"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 build = "build.rs"
@@ -29,18 +29,18 @@ log = "0.4.8"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
 prost = "0.7"
 rand = "0.7.2"
-sc-client-api = { version = "3.0.0", path = "../api" }
-sc-network = { version = "0.9.0", path = "../network" }
+sc-client-api = { version = "4.0.0-dev", path = "../api" }
+sc-network = { version = "0.10.0-dev", path = "../network" }
 serde_json = "1.0.41"
-sp-authority-discovery = { version = "3.0.0", path = "../../primitives/authority-discovery" }
-sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-sp-keystore = { version = "0.9.0", path = "../../primitives/keystore" }
-sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
-sp-api = { version = "3.0.0", path = "../../primitives/api" }
+sp-authority-discovery = { version = "4.0.0-dev", path = "../../primitives/authority-discovery" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+sp-keystore = { version = "0.10.0-dev", path = "../../primitives/keystore" }
+sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
+sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
 
 [dev-dependencies]
 quickcheck = "1.0.3"
-sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
-sc-peerset = { version = "3.0.0", path = "../peerset" }
+sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
+sc-peerset = { version = "4.0.0-dev", path = "../peerset" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client"}
diff --git a/client/basic-authorship/Cargo.toml b/client/basic-authorship/Cargo.toml
index 47dc04a37868..469df55cf023 100644
--- a/client/basic-authorship/Cargo.toml
+++ b/client/basic-authorship/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-basic-authorship"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -18,19 +18,19 @@ futures = "0.3.9"
 futures-timer = "3.0.1"
 log = "0.4.8"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
-sp-api = { version = "3.0.0", path = "../../primitives/api" }
-sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
-sc-client-api = { version = "3.0.0", path = "../api" }
-sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
-sp-inherents = { version = "3.0.0", path = "../../primitives/inherents" }
-sc-telemetry = { version = "3.0.0", path = "../telemetry" }
-sc-transaction-pool-api = { version = "3.0.0", path = "../../client/transaction-pool/api" }
-sc-block-builder = { version = "0.9.0", path = "../block-builder" }
+sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
+sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
+sc-client-api = { version = "4.0.0-dev", path = "../api" }
+sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
+sp-inherents = { version = "4.0.0-dev", path = "../../primitives/inherents" }
+sc-telemetry = { version = "4.0.0-dev", path = "../telemetry" }
+sc-transaction-pool-api = { version = "4.0.0-dev", path = "../../client/transaction-pool/api" }
+sc-block-builder = { version = "0.10.0-dev", path = "../block-builder" }
 sc-proposer-metrics = { version = "0.9.0", path = "../proposer-metrics" }
 
 [dev-dependencies]
-sc-transaction-pool = { version = "3.0.0", path = "../transaction-pool" }
+sc-transaction-pool = { version = "4.0.0-dev", path = "../transaction-pool" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 parking_lot = "0.11.1"
diff --git a/client/block-builder/Cargo.toml b/client/block-builder/Cargo.toml
index 1019e2411c68..557b324efc9a 100644
--- a/client/block-builder/Cargo.toml
+++ b/client/block-builder/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-block-builder"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -14,16 +14,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 
 [dependencies]
-sp-state-machine = { version = "0.9.0", path = "../../primitives/state-machine" }
-sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
-sp-api = { version = "3.0.0", path = "../../primitives/api" }
-sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-sp-block-builder = { version = "3.0.0", path = "../../primitives/block-builder" }
-sp-inherents = { version = "3.0.0", path = "../../primitives/inherents" }
-sc-client-api = { version = "3.0.0", path = "../api" }
+sp-state-machine = { version = "0.10.0-dev", path = "../../primitives/state-machine" }
+sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
+sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+sp-block-builder = { version = "4.0.0-dev", path = "../../primitives/block-builder" }
+sp-inherents = { version = "4.0.0-dev", path = "../../primitives/inherents" }
+sc-client-api = { version = "4.0.0-dev", path = "../api" }
 codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 
 [dev-dependencies]
 substrate-test-runtime-client = { path = "../../test-utils/runtime/client" }
-sp-trie = { version = "3.0.0", path = "../../primitives/trie" }
+sp-trie = { version = "4.0.0-dev", path = "../../primitives/trie" }
diff --git a/client/chain-spec/Cargo.toml b/client/chain-spec/Cargo.toml
index 2eddec524cad..e6d9aa97153e 100644
--- a/client/chain-spec/Cargo.toml
+++ b/client/chain-spec/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-chain-spec"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -13,16 +13,16 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sc-chain-spec-derive = { version = "3.0.0", path = "./derive" }
+sc-chain-spec-derive = { version = "4.0.0-dev", path = "./derive" }
 impl-trait-for-tuples = "0.2.1"
-sc-network = { version = "0.9.0", path = "../network" }
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sc-network = { version = "0.10.0-dev", path = "../network" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 serde = { version = "1.0.101", features = ["derive"] }
 serde_json = "1.0.41"
-sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
-sc-telemetry = { version = "3.0.0", path = "../telemetry" }
+sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
+sc-telemetry = { version = "4.0.0-dev", path = "../telemetry" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-sc-consensus-babe = { version = "0.9.0", path = "../consensus/babe" }
-sp-consensus-babe = { version = "0.9.0", path = "../../primitives/consensus/babe" }
-sc-consensus-epochs = { version = "0.9.0", path = "../consensus/epochs" }
-sc-finality-grandpa = { version = "0.9.0", path = "../finality-grandpa" }
+sc-consensus-babe = { version = "0.10.0-dev", path = "../consensus/babe" }
+sp-consensus-babe = { version = "0.10.0-dev", path = "../../primitives/consensus/babe" }
+sc-consensus-epochs = { version = "0.10.0-dev", path = "../consensus/epochs" }
+sc-finality-grandpa = { version = "0.10.0-dev", path = "../finality-grandpa" }
diff --git a/client/chain-spec/derive/Cargo.toml b/client/chain-spec/derive/Cargo.toml
index 8df820a46aee..6823c139dbe5 100644
--- a/client/chain-spec/derive/Cargo.toml
+++ b/client/chain-spec/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-chain-spec-derive"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index 00a56e5fa9b8..82325238ca0f 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-cli"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Substrate CLI interface."
 edition = "2018"
@@ -24,22 +24,22 @@ hex = "0.4.2"
 rand = "0.7.3"
 tiny-bip39 = "0.8.0"
 serde_json = "1.0.41"
-sc-keystore = { version = "3.0.0", path = "../keystore" }
+sc-keystore = { version = "4.0.0-dev", path = "../keystore" }
 sp-panic-handler = { version = "3.0.0", path = "../../primitives/panic-handler" }
-sc-client-api = { version = "3.0.0", path = "../api" }
-sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
-sc-network = { version = "0.9.0", path = "../network" }
-sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
-sp-utils = { version = "3.0.0", path = "../../primitives/utils" }
-sp-version = { version = "3.0.0", path = "../../primitives/version" }
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-sp-keystore = { version = "0.9.0", path = "../../primitives/keystore" }
-sc-service = { version = "0.9.0", default-features = false, path = "../service" }
-sc-telemetry = { version = "3.0.0", path = "../telemetry" }
-sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
+sc-client-api = { version = "4.0.0-dev", path = "../api" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
+sc-network = { version = "0.10.0-dev", path = "../network" }
+sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
+sp-utils = { version = "4.0.0-dev", path = "../../primitives/utils" }
+sp-version = { version = "4.0.0-dev", path = "../../primitives/version" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+sp-keystore = { version = "0.10.0-dev", path = "../../primitives/keystore" }
+sc-service = { version = "0.10.0-dev", default-features = false, path = "../service" }
+sc-telemetry = { version = "4.0.0-dev", path = "../telemetry" }
+sp-keyring = { version = "4.0.0-dev", path = "../../primitives/keyring" }
 names = "0.11.0"
 structopt = "0.3.8"
-sc-tracing = { version = "3.0.0", path = "../tracing" }
+sc-tracing = { version = "4.0.0-dev", path = "../tracing" }
 chrono = "0.4.10"
 serde = "1.0.111"
 thiserror = "1.0.21"
diff --git a/client/consensus/aura/Cargo.toml b/client/consensus/aura/Cargo.toml
index 27c1534032f4..36187871aa88 100644
--- a/client/consensus/aura/Cargo.toml
+++ b/client/consensus/aura/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-consensus-aura"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Aura consensus algorithm for substrate"
 edition = "2018"
@@ -13,28 +13,28 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-application-crypto = { version = "3.0.0", path = "../../../primitives/application-crypto" }
-sp-consensus-aura = { version = "0.9.0", path = "../../../primitives/consensus/aura" }
-sp-block-builder = { version = "3.0.0", path = "../../../primitives/block-builder" }
-sc-block-builder = { version = "0.9.0", path = "../../block-builder" }
-sc-client-api = { version = "3.0.0", path = "../../api" }
+sp-application-crypto = { version = "4.0.0-dev", path = "../../../primitives/application-crypto" }
+sp-consensus-aura = { version = "0.10.0-dev", path = "../../../primitives/consensus/aura" }
+sp-block-builder = { version = "4.0.0-dev", path = "../../../primitives/block-builder" }
+sc-block-builder = { version = "0.10.0-dev", path = "../../block-builder" }
+sc-client-api = { version = "4.0.0-dev", path = "../../api" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
-sp-consensus-slots = { version = "0.9.0", path = "../../../primitives/consensus/slots" }
+sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
+sp-consensus-slots = { version = "0.10.0-dev", path = "../../../primitives/consensus/slots" }
 derive_more = "0.99.2"
 futures = "0.3.9"
 futures-timer = "3.0.1"
-sp-inherents = { version = "3.0.0", path = "../../../primitives/inherents" }
+sp-inherents = { version = "4.0.0-dev", path = "../../../primitives/inherents" }
 log = "0.4.8"
-sp-core = { version = "3.0.0", path = "../../../primitives/core" }
-sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
-sp-io = { version = "3.0.0", path = "../../../primitives/io" }
-sp-version = { version = "3.0.0", path = "../../../primitives/version" }
-sc-consensus-slots = { version = "0.9.0", path = "../slots" }
-sp-api = { version = "3.0.0", path = "../../../primitives/api" }
-sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
-sp-keystore = { version = "0.9.0", path = "../../../primitives/keystore" }
-sc-telemetry = { version = "3.0.0", path = "../../telemetry" }
+sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
+sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
+sp-version = { version = "4.0.0-dev", path = "../../../primitives/version" }
+sc-consensus-slots = { version = "0.10.0-dev", path = "../slots" }
+sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
+sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
+sp-keystore = { version = "0.10.0-dev", path = "../../../primitives/keystore" }
+sc-telemetry = { version = "4.0.0-dev", path = "../../telemetry" }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0"}
 async-trait = "0.1.42"
 # We enable it only for web-wasm check
@@ -42,14 +42,14 @@ async-trait = "0.1.42"
 getrandom = { version = "0.2", features = ["js"], optional = true }
 
 [dev-dependencies]
-sp-timestamp = { version = "3.0.0", path = "../../../primitives/timestamp" }
-sp-keyring = { version = "3.0.0", path = "../../../primitives/keyring" }
-sp-tracing = { version = "3.0.0", path = "../../../primitives/tracing" }
-sc-executor = { version = "0.9.0", path = "../../executor" }
-sc-keystore = { version = "3.0.0", path = "../../keystore" }
-sc-network = { version = "0.9.0", path = "../../network" }
+sp-timestamp = { version = "4.0.0-dev", path = "../../../primitives/timestamp" }
+sp-keyring = { version = "4.0.0-dev", path = "../../../primitives/keyring" }
+sp-tracing = { version = "4.0.0-dev", path = "../../../primitives/tracing" }
+sc-executor = { version = "0.10.0-dev", path = "../../executor" }
+sc-keystore = { version = "4.0.0-dev", path = "../../keystore" }
+sc-network = { version = "0.10.0-dev", path = "../../network" }
 sc-network-test = { version = "0.8.0", path = "../../network/test" }
-sc-service = { version = "0.9.0", default-features = false, path = "../../service" }
+sc-service = { version = "0.10.0-dev", default-features = false, path = "../../service" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
 tempfile = "3.1.0"
 parking_lot = "0.11.1"
diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml
index 9ada9fda6216..f9dc45ed9c6d 100644
--- a/client/consensus/babe/Cargo.toml
+++ b/client/consensus/babe/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-consensus-babe"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "BABE consensus algorithm for substrate"
 edition = "2018"
@@ -15,31 +15,31 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
-sp-consensus-babe = { version = "0.9.0", path = "../../../primitives/consensus/babe" }
-sp-core = { version = "3.0.0", path = "../../../primitives/core" }
-sp-application-crypto = { version = "3.0.0", path = "../../../primitives/application-crypto" }
-sp-keystore = { version = "0.9.0", path = "../../../primitives/keystore" }
+sp-consensus-babe = { version = "0.10.0-dev", path = "../../../primitives/consensus/babe" }
+sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
+sp-application-crypto = { version = "4.0.0-dev", path = "../../../primitives/application-crypto" }
+sp-keystore = { version = "0.10.0-dev", path = "../../../primitives/keystore" }
 num-bigint = "0.2.3"
 num-rational = "0.2.2"
 num-traits = "0.2.8"
 serde = { version = "1.0.104", features = ["derive"] }
-sp-version = { version = "3.0.0", path = "../../../primitives/version" }
-sp-io = { version = "3.0.0", path = "../../../primitives/io" }
-sp-inherents = { version = "3.0.0", path = "../../../primitives/inherents" }
-sc-telemetry = { version = "3.0.0", path = "../../telemetry" }
-sc-keystore = { version = "3.0.0", path = "../../keystore" }
-sc-client-api = { version = "3.0.0", path = "../../api" }
-sc-consensus-epochs = { version = "0.9.0", path = "../epochs" }
-sp-api = { version = "3.0.0", path = "../../../primitives/api" }
-sp-block-builder = { version = "3.0.0", path = "../../../primitives/block-builder" }
-sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
-sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
-sp-consensus-slots = { version = "0.9.0", path = "../../../primitives/consensus/slots" }
-sp-consensus-vrf = { version = "0.9.0", path = "../../../primitives/consensus/vrf" }
-sc-consensus-uncles = { version = "0.9.0", path = "../uncles" }
-sc-consensus-slots = { version = "0.9.0", path = "../slots" }
-sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
-sp-utils = { version = "3.0.0", path = "../../../primitives/utils" }
+sp-version = { version = "4.0.0-dev", path = "../../../primitives/version" }
+sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
+sp-inherents = { version = "4.0.0-dev", path = "../../../primitives/inherents" }
+sc-telemetry = { version = "4.0.0-dev", path = "../../telemetry" }
+sc-keystore = { version = "4.0.0-dev", path = "../../keystore" }
+sc-client-api = { version = "4.0.0-dev", path = "../../api" }
+sc-consensus-epochs = { version = "0.10.0-dev", path = "../epochs" }
+sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
+sp-block-builder = { version = "4.0.0-dev", path = "../../../primitives/block-builder" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
+sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
+sp-consensus-slots = { version = "0.10.0-dev", path = "../../../primitives/consensus/slots" }
+sp-consensus-vrf = { version = "0.10.0-dev", path = "../../../primitives/consensus/vrf" }
+sc-consensus-uncles = { version = "0.10.0-dev", path = "../uncles" }
+sc-consensus-slots = { version = "0.10.0-dev", path = "../slots" }
+sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
+sp-utils = { version = "4.0.0-dev", path = "../../../primitives/utils" }
 fork-tree = { version = "3.0.0", path = "../../../utils/fork-tree" }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0"}
 futures = "0.3.9"
@@ -55,14 +55,14 @@ retain_mut = "0.1.3"
 async-trait = "0.1.42"
 
 [dev-dependencies]
-sp-timestamp = { version = "3.0.0", path = "../../../primitives/timestamp" }
-sp-keyring = { version = "3.0.0", path = "../../../primitives/keyring" }
-sp-tracing = { version = "3.0.0", path = "../../../primitives/tracing" }
-sc-executor = { version = "0.9.0", path = "../../executor" }
-sc-network = { version = "0.9.0", path = "../../network" }
+sp-timestamp = { version = "4.0.0-dev", path = "../../../primitives/timestamp" }
+sp-keyring = { version = "4.0.0-dev", path = "../../../primitives/keyring" }
+sp-tracing = { version = "4.0.0-dev", path = "../../../primitives/tracing" }
+sc-executor = { version = "0.10.0-dev", path = "../../executor" }
+sc-network = { version = "0.10.0-dev", path = "../../network" }
 sc-network-test = { version = "0.8.0", path = "../../network/test" }
-sc-service = { version = "0.9.0", default-features = false, path = "../../service" }
+sc-service = { version = "0.10.0-dev", default-features = false, path = "../../service" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
-sc-block-builder = { version = "0.9.0", path = "../../block-builder" }
+sc-block-builder = { version = "0.10.0-dev", path = "../../block-builder" }
 rand_chacha = "0.2.2"
 tempfile = "3.1.0"
diff --git a/client/consensus/babe/rpc/Cargo.toml b/client/consensus/babe/rpc/Cargo.toml
index 71a1205e3c7a..12bce64c3afe 100644
--- a/client/consensus/babe/rpc/Cargo.toml
+++ b/client/consensus/babe/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-consensus-babe-rpc"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "RPC extensions for the BABE consensus algorithm"
 edition = "2018"
@@ -13,28 +13,28 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sc-consensus-babe = { version = "0.9.0", path = "../" }
-sc-rpc-api = { version = "0.9.0", path = "../../../rpc-api" }
+sc-consensus-babe = { version = "0.10.0-dev", path = "../" }
+sc-rpc-api = { version = "0.10.0-dev", path = "../../../rpc-api" }
 jsonrpc-core = "15.1.0"
 jsonrpc-core-client = "15.1.0"
 jsonrpc-derive = "15.1.0"
-sp-consensus-babe = { version = "0.9.0", path = "../../../../primitives/consensus/babe" }
+sp-consensus-babe = { version = "0.10.0-dev", path = "../../../../primitives/consensus/babe" }
 serde = { version = "1.0.104", features=["derive"] }
-sp-blockchain = { version = "3.0.0", path = "../../../../primitives/blockchain" }
-sp-runtime = { version = "3.0.0", path = "../../../../primitives/runtime" }
-sc-consensus-epochs = { version = "0.9.0", path = "../../epochs" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../../../primitives/blockchain" }
+sp-runtime = { version = "4.0.0-dev", path = "../../../../primitives/runtime" }
+sc-consensus-epochs = { version = "0.10.0-dev", path = "../../epochs" }
 futures = { version = "0.3.4", features = ["compat"] }
 derive_more = "0.99.2"
-sp-api = { version = "3.0.0", path = "../../../../primitives/api" }
-sp-consensus = { version = "0.9.0", path = "../../../../primitives/consensus/common" }
-sp-core = { version = "3.0.0", path = "../../../../primitives/core" }
-sp-application-crypto = { version = "3.0.0", path = "../../../../primitives/application-crypto" }
-sp-keystore = { version = "0.9.0", path = "../../../../primitives/keystore" }
+sp-api = { version = "4.0.0-dev", path = "../../../../primitives/api" }
+sp-consensus = { version = "0.10.0-dev", path = "../../../../primitives/consensus/common" }
+sp-core = { version = "4.0.0-dev", path = "../../../../primitives/core" }
+sp-application-crypto = { version = "4.0.0-dev", path = "../../../../primitives/application-crypto" }
+sp-keystore = { version = "0.10.0-dev", path = "../../../../primitives/keystore" }
 
 [dev-dependencies]
-sc-consensus = { version = "0.9.0", path = "../../../consensus/common" }
+sc-consensus = { version = "0.10.0-dev", path = "../../../consensus/common" }
 serde_json = "1.0.50"
-sp-keyring = { version = "3.0.0", path = "../../../../primitives/keyring" }
-sc-keystore = { version = "3.0.0", path = "../../../keystore" }
+sp-keyring = { version = "4.0.0-dev", path = "../../../../primitives/keyring" }
+sc-keystore = { version = "4.0.0-dev", path = "../../../keystore" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../../../test-utils/runtime/client" }
 tempfile = "3.1.0"
diff --git a/client/consensus/common/Cargo.toml b/client/consensus/common/Cargo.toml
index 32babb02c2bf..c8d86b06115a 100644
--- a/client/consensus/common/Cargo.toml
+++ b/client/consensus/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-consensus"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -14,8 +14,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 async-trait = "0.1"
-sc-client-api = { version = "3.0.0", path = "../../api" }
-sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
-sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
-sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
+sc-client-api = { version = "4.0.0-dev", path = "../../api" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
+sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
+sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
 parking_lot = "0.11.1"
diff --git a/client/consensus/epochs/Cargo.toml b/client/consensus/epochs/Cargo.toml
index 8e2fe7710096..78e5cc31ea07 100644
--- a/client/consensus/epochs/Cargo.toml
+++ b/client/consensus/epochs/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-consensus-epochs"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Generic epochs-based utilities for consensus"
 edition = "2018"
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 fork-tree = { version = "3.0.0", path = "../../../utils/fork-tree" }
-sp-runtime = {  path = "../../../primitives/runtime" , version = "3.0.0"}
-sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
-sc-client-api = { path = "../../api" , version = "3.0.0"}
-sc-consensus = { path = "../common" , version = "0.9.0"}
+sp-runtime = {  path = "../../../primitives/runtime" , version = "4.0.0-dev"}
+sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
+sc-client-api = { path = "../../api" , version = "4.0.0-dev"}
+sc-consensus = { path = "../common" , version = "0.10.0-dev"}
diff --git a/client/consensus/manual-seal/Cargo.toml b/client/consensus/manual-seal/Cargo.toml
index f7c2e98656c1..5cb2c13c8233 100644
--- a/client/consensus/manual-seal/Cargo.toml
+++ b/client/consensus/manual-seal/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-consensus-manual-seal"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Manual sealing engine for Substrate"
 edition = "2018"
@@ -25,29 +25,29 @@ serde = { version = "1.0", features=["derive"] }
 assert_matches = "1.3.0"
 async-trait = "0.1.42"
 
-sc-client-api = { path = "../../api", version = "3.0.0"}
-sc-consensus-babe = { path = "../../consensus/babe", version = "0.9.0"}
-sc-consensus-epochs = { path = "../../consensus/epochs", version = "0.9.0"}
-sp-consensus-babe = { path = "../../../primitives/consensus/babe", version = "0.9.0"}
+sc-client-api = { path = "../../api", version = "4.0.0-dev"}
+sc-consensus-babe = { path = "../../consensus/babe", version = "0.10.0-dev"}
+sc-consensus-epochs = { path = "../../consensus/epochs", version = "0.10.0-dev"}
+sp-consensus-babe = { path = "../../../primitives/consensus/babe", version = "0.10.0-dev"}
 
-sc-transaction-pool = { path = "../../transaction-pool", version = "3.0.0"}
-sp-blockchain = { path = "../../../primitives/blockchain", version = "3.0.0"}
-sp-consensus = { path = "../../../primitives/consensus/common", version = "0.9.0"}
-sp-consensus-slots = { path = "../../../primitives/consensus/slots", version = "0.9.0"}
-sp-inherents = { path = "../../../primitives/inherents", version = "3.0.0"}
-sp-runtime = {  path = "../../../primitives/runtime", version = "3.0.0"}
-sp-core = {  path = "../../../primitives/core", version = "3.0.0"}
-sp-keystore = {  path = "../../../primitives/keystore", version = "0.9.0"}
-sp-keyring = {  path = "../../../primitives/keyring", version = "3.0.0"}
-sp-api = {  path = "../../../primitives/api", version = "3.0.0"}
-sc-transaction-pool-api = { path = "../../../client/transaction-pool/api", version = "3.0.0"}
-sp-timestamp = { path = "../../../primitives/timestamp", version = "3.0.0"}
+sc-transaction-pool = { path = "../../transaction-pool", version = "4.0.0-dev"}
+sp-blockchain = { path = "../../../primitives/blockchain", version = "4.0.0-dev"}
+sp-consensus = { path = "../../../primitives/consensus/common", version = "0.10.0-dev"}
+sp-consensus-slots = { path = "../../../primitives/consensus/slots", version = "0.10.0-dev"}
+sp-inherents = { path = "../../../primitives/inherents", version = "4.0.0-dev"}
+sp-runtime = {  path = "../../../primitives/runtime", version = "4.0.0-dev"}
+sp-core = {  path = "../../../primitives/core", version = "4.0.0-dev"}
+sp-keystore = {  path = "../../../primitives/keystore", version = "0.10.0-dev"}
+sp-keyring = {  path = "../../../primitives/keyring", version = "4.0.0-dev"}
+sp-api = {  path = "../../../primitives/api", version = "4.0.0-dev"}
+sc-transaction-pool-api = { path = "../../../client/transaction-pool/api", version = "4.0.0-dev"}
+sp-timestamp = { path = "../../../primitives/timestamp", version = "4.0.0-dev"}
 
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0"}
 
 [dev-dependencies]
 tokio = { version = "0.2", features = ["rt-core", "macros"] }
-sc-basic-authorship = { path = "../../basic-authorship", version = "0.9.0"}
+sc-basic-authorship = { path = "../../basic-authorship", version = "0.10.0-dev"}
 substrate-test-runtime-client = { path = "../../../test-utils/runtime/client", version = "2.0.0" }
 substrate-test-runtime-transaction-pool = { path = "../../../test-utils/runtime/transaction-pool", version = "2.0.0" }
 tempfile = "3.1.0"
diff --git a/client/consensus/pow/Cargo.toml b/client/consensus/pow/Cargo.toml
index 443b852c41e5..e484665cc3f8 100644
--- a/client/consensus/pow/Cargo.toml
+++ b/client/consensus/pow/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-consensus-pow"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "PoW consensus algorithm for substrate"
 edition = "2018"
@@ -14,15 +14,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
-sp-core = { version = "3.0.0", path = "../../../primitives/core" }
-sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
-sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
-sp-api = { version = "3.0.0", path = "../../../primitives/api" }
-sc-client-api = { version = "3.0.0", path = "../../api" }
-sp-block-builder = { version = "3.0.0", path = "../../../primitives/block-builder" }
-sp-inherents = { version = "3.0.0", path = "../../../primitives/inherents" }
-sp-consensus-pow = { version = "0.9.0", path = "../../../primitives/consensus/pow" }
-sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
+sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
+sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
+sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
+sc-client-api = { version = "4.0.0-dev", path = "../../api" }
+sp-block-builder = { version = "4.0.0-dev", path = "../../../primitives/block-builder" }
+sp-inherents = { version = "4.0.0-dev", path = "../../../primitives/inherents" }
+sp-consensus-pow = { version = "0.10.0-dev", path = "../../../primitives/consensus/pow" }
+sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
 log = "0.4.8"
 futures = { version = "0.3.1", features = ["compat"] }
 futures-timer = "3.0.1"
diff --git a/client/consensus/slots/Cargo.toml b/client/consensus/slots/Cargo.toml
index 51382198f508..72c3a4ddbf35 100644
--- a/client/consensus/slots/Cargo.toml
+++ b/client/consensus/slots/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-consensus-slots"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Generic slots-based utilities for consensus"
 edition = "2018"
@@ -15,20 +15,20 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-sc-client-api = { version = "3.0.0", path = "../../api" }
-sp-core = { version = "3.0.0", path = "../../../primitives/core" }
-sp-trie = { version = "3.0.0", path = "../../../primitives/trie" }
-sp-application-crypto = { version = "3.0.0", path = "../../../primitives/application-crypto" }
-sp-arithmetic = { version = "3.0.0", path = "../../../primitives/arithmetic" }
-sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
-sp-consensus-slots = { version = "0.9.0", path = "../../../primitives/consensus/slots" }
-sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
-sp-state-machine = { version = "0.9.0", path = "../../../primitives/state-machine" }
-sp-api = { version = "3.0.0", path = "../../../primitives/api" }
-sc-telemetry = { version = "3.0.0", path = "../../telemetry" }
-sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
-sp-inherents = { version = "3.0.0", path = "../../../primitives/inherents" }
-sp-timestamp = { version = "3.0.0", path = "../../../primitives/timestamp" }
+sc-client-api = { version = "4.0.0-dev", path = "../../api" }
+sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
+sp-trie = { version = "4.0.0-dev", path = "../../../primitives/trie" }
+sp-application-crypto = { version = "4.0.0-dev", path = "../../../primitives/application-crypto" }
+sp-arithmetic = { version = "4.0.0-dev", path = "../../../primitives/arithmetic" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
+sp-consensus-slots = { version = "0.10.0-dev", path = "../../../primitives/consensus/slots" }
+sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
+sp-state-machine = { version = "0.10.0-dev", path = "../../../primitives/state-machine" }
+sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
+sc-telemetry = { version = "4.0.0-dev", path = "../../telemetry" }
+sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
+sp-inherents = { version = "4.0.0-dev", path = "../../../primitives/inherents" }
+sp-timestamp = { version = "4.0.0-dev", path = "../../../primitives/timestamp" }
 futures = "0.3.9"
 futures-timer = "3.0.1"
 log = "0.4.11"
diff --git a/client/consensus/uncles/Cargo.toml b/client/consensus/uncles/Cargo.toml
index ab88d4496fec..7e821db197b3 100644
--- a/client/consensus/uncles/Cargo.toml
+++ b/client/consensus/uncles/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-consensus-uncles"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Generic uncle inclusion utilities for consensus"
 edition = "2018"
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sc-client-api = { version = "3.0.0", path = "../../api" }
-sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
-sp-authorship = { version = "3.0.0", path = "../../../primitives/authorship" }
+sc-client-api = { version = "4.0.0-dev", path = "../../api" }
+sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
+sp-authorship = { version = "4.0.0-dev", path = "../../../primitives/authorship" }
 thiserror = "1.0.21"
diff --git a/client/db/Cargo.toml b/client/db/Cargo.toml
index 2145b988891d..5873883a11ee 100644
--- a/client/db/Cargo.toml
+++ b/client/db/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-client-db"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -24,23 +24,23 @@ parity-util-mem = { version = "0.10.0", default-features = false, features = ["s
 codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 blake2-rfc = "0.2.18"
 
-sc-client-api = { version = "3.0.0", path = "../api" }
-sp-arithmetic = { version = "3.0.0", path = "../../primitives/arithmetic" }
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
-sp-state-machine = { version = "0.9.0", path = "../../primitives/state-machine" }
-sc-executor = { version = "0.9.0", path = "../executor" }
-sc-state-db = { version = "0.9.0", path = "../state-db" }
-sp-trie = { version = "3.0.0", path = "../../primitives/trie" }
-sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
-sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
-sp-database = { version = "3.0.0", path = "../../primitives/database" }
+sc-client-api = { version = "4.0.0-dev", path = "../api" }
+sp-arithmetic = { version = "4.0.0-dev", path = "../../primitives/arithmetic" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
+sp-state-machine = { version = "0.10.0-dev", path = "../../primitives/state-machine" }
+sc-executor = { version = "0.10.0-dev", path = "../executor" }
+sc-state-db = { version = "0.10.0-dev", path = "../state-db" }
+sp-trie = { version = "4.0.0-dev", path = "../../primitives/trie" }
+sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
+sp-database = { version = "4.0.0-dev", path = "../../primitives/database" }
 parity-db = { version = "0.2.4", optional = true }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.9.0", path = "../../utils/prometheus" }
 
 [dev-dependencies]
-sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
-sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
+sp-keyring = { version = "4.0.0-dev", path = "../../primitives/keyring" }
+sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 quickcheck = "1.0.3"
 kvdb-rocksdb = "0.12.0"
diff --git a/client/executor/Cargo.toml b/client/executor/Cargo.toml
index 1f10c65e12f9..a96163f200df 100644
--- a/client/executor/Cargo.toml
+++ b/client/executor/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-executor"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -16,23 +16,23 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 derive_more = "0.99.2"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-sp-io = { version = "3.0.0", path = "../../primitives/io" }
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-sp-tasks = { version = "3.0.0", path = "../../primitives/tasks" }
-sp-trie = { version = "3.0.0", path = "../../primitives/trie" }
+sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+sp-tasks = { version = "4.0.0-dev", path = "../../primitives/tasks" }
+sp-trie = { version = "4.0.0-dev", path = "../../primitives/trie" }
 sp-serializer = { version = "3.0.0", path = "../../primitives/serializer" }
-sp-version = { version = "3.0.0", path = "../../primitives/version" }
+sp-version = { version = "4.0.0-dev", path = "../../primitives/version" }
 sp-panic-handler = { version = "3.0.0", path = "../../primitives/panic-handler" }
 wasmi = "0.9.0"
 parity-wasm = "0.42.0"
 lazy_static = "1.4.0"
-sp-api = { version = "3.0.0", path = "../../primitives/api" }
-sp-wasm-interface = { version = "3.0.0", path = "../../primitives/wasm-interface" }
-sp-runtime-interface = { version = "3.0.0", path = "../../primitives/runtime-interface" }
-sp-externalities = { version = "0.9.0", path = "../../primitives/externalities" }
-sc-executor-common = { version = "0.9.0", path = "common" }
-sc-executor-wasmi = { version = "0.9.0", path = "wasmi" }
-sc-executor-wasmtime = { version = "0.9.0", path = "wasmtime", optional = true }
+sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
+sp-wasm-interface = { version = "4.0.0-dev", path = "../../primitives/wasm-interface" }
+sp-runtime-interface = { version = "4.0.0-dev", path = "../../primitives/runtime-interface" }
+sp-externalities = { version = "0.10.0-dev", path = "../../primitives/externalities" }
+sc-executor-common = { version = "0.10.0-dev", path = "common" }
+sc-executor-wasmi = { version = "0.10.0-dev", path = "wasmi" }
+sc-executor-wasmtime = { version = "0.10.0-dev", path = "wasmtime", optional = true }
 parking_lot = "0.11.1"
 log = "0.4.8"
 libsecp256k1 = "0.3.4"
@@ -43,11 +43,11 @@ wat = "1.0"
 hex-literal = "0.3.1"
 sc-runtime-test = { version = "2.0.0", path = "runtime-test" }
 substrate-test-runtime = { version = "2.0.0", path = "../../test-utils/runtime" }
-sp-state-machine = { version = "0.9.0", path = "../../primitives/state-machine" }
-sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
-sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
-sp-maybe-compressed-blob = { version = "3.0.0", path = "../../primitives/maybe-compressed-blob" }
-sc-tracing = { version = "3.0.0", path = "../tracing" }
+sp-state-machine = { version = "0.10.0-dev", path = "../../primitives/state-machine" }
+sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
+sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
+sp-maybe-compressed-blob = { version = "4.0.0-dev", path = "../../primitives/maybe-compressed-blob" }
+sc-tracing = { version = "4.0.0-dev", path = "../tracing" }
 tracing = "0.1.25"
 tracing-subscriber = "0.2.18"
 paste = "1.0"
diff --git a/client/executor/common/Cargo.toml b/client/executor/common/Cargo.toml
index 75cfcd3d2d85..4457780f8cd8 100644
--- a/client/executor/common/Cargo.toml
+++ b/client/executor/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-executor-common"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -18,10 +18,10 @@ derive_more = "0.99.2"
 pwasm-utils = "0.18.0"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 wasmi = "0.9.0"
-sp-core = { version = "3.0.0", path = "../../../primitives/core" }
-sc-allocator = { version = "3.0.0", path = "../../allocator" }
-sp-wasm-interface = { version = "3.0.0", path = "../../../primitives/wasm-interface" }
-sp-maybe-compressed-blob = { version = "3.0.0", path = "../../../primitives/maybe-compressed-blob" }
+sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
+sc-allocator = { version = "4.0.0-dev", path = "../../allocator" }
+sp-wasm-interface = { version = "4.0.0-dev", path = "../../../primitives/wasm-interface" }
+sp-maybe-compressed-blob = { version = "4.0.0-dev", path = "../../../primitives/maybe-compressed-blob" }
 sp-serializer = { version = "3.0.0", path = "../../../primitives/serializer" }
 thiserror = "1.0.21"
 
diff --git a/client/executor/runtime-test/Cargo.toml b/client/executor/runtime-test/Cargo.toml
index 9e1cd5bb09e3..a4fbc88cf566 100644
--- a/client/executor/runtime-test/Cargo.toml
+++ b/client/executor/runtime-test/Cargo.toml
@@ -13,15 +13,15 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-core = { version = "3.0.0", default-features = false, path = "../../../primitives/core" }
-sp-io = { version = "3.0.0", default-features = false, path = "../../../primitives/io" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
-sp-sandbox = { version = "0.9.0", default-features = false, path = "../../../primitives/sandbox" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../../primitives/std" }
-sp-tasks = { version = "3.0.0", default-features = false, path = "../../../primitives/tasks" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/core" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/io" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/runtime" }
+sp-sandbox = { version = "0.10.0-dev", default-features = false, path = "../../../primitives/sandbox" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/std" }
+sp-tasks = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/tasks" }
 
 [build-dependencies]
-substrate-wasm-builder = { version = "4.0.0", path = "../../../utils/wasm-builder" }
+substrate-wasm-builder = { version = "5.0.0-dev", path = "../../../utils/wasm-builder" }
 
 [features]
 default = [ "std" ]
diff --git a/client/executor/wasmi/Cargo.toml b/client/executor/wasmi/Cargo.toml
index dbdf26b63d24..c1e5b3d26723 100644
--- a/client/executor/wasmi/Cargo.toml
+++ b/client/executor/wasmi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-executor-wasmi"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -17,8 +17,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 log = "0.4.8"
 wasmi = "0.9.0"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-sc-executor-common = { version = "0.9.0", path = "../common" }
-sc-allocator = { version = "3.0.0", path = "../../allocator" }
-sp-wasm-interface = { version = "3.0.0", path = "../../../primitives/wasm-interface" }
-sp-runtime-interface = { version = "3.0.0", path = "../../../primitives/runtime-interface" }
-sp-core = { version = "3.0.0", path = "../../../primitives/core" }
+sc-executor-common = { version = "0.10.0-dev", path = "../common" }
+sc-allocator = { version = "4.0.0-dev", path = "../../allocator" }
+sp-wasm-interface = { version = "4.0.0-dev", path = "../../../primitives/wasm-interface" }
+sp-runtime-interface = { version = "4.0.0-dev", path = "../../../primitives/runtime-interface" }
+sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
diff --git a/client/executor/wasmtime/Cargo.toml b/client/executor/wasmtime/Cargo.toml
index 1b8606c440b8..e2736cd375a3 100644
--- a/client/executor/wasmtime/Cargo.toml
+++ b/client/executor/wasmtime/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-executor-wasmtime"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -19,16 +19,16 @@ log = "0.4.8"
 scoped-tls = "1.0"
 parity-wasm = "0.42.0"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-sc-executor-common = { version = "0.9.0", path = "../common" }
-sp-wasm-interface = { version = "3.0.0", path = "../../../primitives/wasm-interface" }
-sp-runtime-interface = { version = "3.0.0", path = "../../../primitives/runtime-interface" }
-sp-core = { version = "3.0.0", path = "../../../primitives/core" }
-sc-allocator = { version = "3.0.0", path = "../../allocator" }
+sc-executor-common = { version = "0.10.0-dev", path = "../common" }
+sp-wasm-interface = { version = "4.0.0-dev", path = "../../../primitives/wasm-interface" }
+sp-runtime-interface = { version = "4.0.0-dev", path = "../../../primitives/runtime-interface" }
+sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
+sc-allocator = { version = "4.0.0-dev", path = "../../allocator" }
 wasmtime = { version = "0.27.0", default-features = false, features = ["cache", "parallel-compilation"] }
 pwasm-utils = { version = "0.18" }
 
 [dev-dependencies]
 assert_matches = "1.3.0"
 sc-runtime-test = { version = "2.0.0", path = "../runtime-test" }
-sp-io = { version = "3.0.0", path = "../../../primitives/io" }
+sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
 wat = "1.0"
diff --git a/client/finality-grandpa-warp-sync/Cargo.toml b/client/finality-grandpa-warp-sync/Cargo.toml
index 27728e159c76..43a7cc0565cd 100644
--- a/client/finality-grandpa-warp-sync/Cargo.toml
+++ b/client/finality-grandpa-warp-sync/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "A request-response protocol for handling grandpa warp sync requests"
 name = "sc-finality-grandpa-warp-sync"
-version = "0.9.0"
+version = "0.10.0-dev"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -19,18 +19,18 @@ log = "0.4.11"
 num-traits = "0.2.14"
 parking_lot = "0.11.1"
 prost = "0.7"
-sc-client-api = { version = "3.0.0", path = "../api" }
-sc-finality-grandpa = { version = "0.9.0", path = "../finality-grandpa" }
-sc-network = { version = "0.9.0", path = "../network" }
-sc-service = { version = "0.9.0", path = "../service" }
-sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
-sp-finality-grandpa = { version = "3.0.0", path = "../../primitives/finality-grandpa" }
-sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
+sc-client-api = { version = "4.0.0-dev", path = "../api" }
+sc-finality-grandpa = { version = "0.10.0-dev", path = "../finality-grandpa" }
+sc-network = { version = "0.10.0-dev", path = "../network" }
+sc-service = { version = "0.10.0-dev", path = "../service" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
+sp-finality-grandpa = { version = "4.0.0-dev", path = "../../primitives/finality-grandpa" }
+sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
 
 [dev-dependencies]
 finality-grandpa = { version = "0.14.1" }
 rand = "0.8"
-sc-block-builder = { version = "0.9.0", path = "../block-builder" }
-sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
-sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
+sc-block-builder = { version = "0.10.0-dev", path = "../block-builder" }
+sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
+sp-keyring = { version = "4.0.0-dev", path = "../../primitives/keyring" }
 substrate-test-runtime-client = { version = "2.0.0",  path = "../../test-utils/runtime/client" }
diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml
index 3cb577aee5db..8815f70f3ccf 100644
--- a/client/finality-grandpa/Cargo.toml
+++ b/client/finality-grandpa/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-finality-grandpa"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -24,26 +24,26 @@ log = "0.4.8"
 parking_lot = "0.11.1"
 rand = "0.7.2"
 parity-scale-codec = { version = "2.0.0", features = ["derive"] }
-sp-application-crypto = { version = "3.0.0", path = "../../primitives/application-crypto" }
-sp-arithmetic = { version = "3.0.0", path = "../../primitives/arithmetic" }
-sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
-sp-utils = { version = "3.0.0", path = "../../primitives/utils" }
-sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
-sc-consensus = { version = "0.9.0", path = "../consensus/common" }
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-sp-keystore = { version = "0.9.0", path = "../../primitives/keystore" }
-sp-api = { version = "3.0.0", path = "../../primitives/api" }
-sc-telemetry = { version = "3.0.0", path = "../telemetry" }
-sc-keystore = { version = "3.0.0", path = "../keystore" }
+sp-application-crypto = { version = "4.0.0-dev", path = "../../primitives/application-crypto" }
+sp-arithmetic = { version = "4.0.0-dev", path = "../../primitives/arithmetic" }
+sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
+sp-utils = { version = "4.0.0-dev", path = "../../primitives/utils" }
+sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
+sc-consensus = { version = "0.10.0-dev", path = "../consensus/common" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+sp-keystore = { version = "0.10.0-dev", path = "../../primitives/keystore" }
+sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
+sc-telemetry = { version = "4.0.0-dev", path = "../telemetry" }
+sc-keystore = { version = "4.0.0-dev", path = "../keystore" }
 serde_json = "1.0.41"
-sc-client-api = { version = "3.0.0", path = "../api" }
-sp-inherents = { version = "3.0.0", path = "../../primitives/inherents" }
-sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
-sc-network = { version = "0.9.0", path = "../network" }
-sc-network-gossip = { version = "0.9.0", path = "../network-gossip" }
-sp-finality-grandpa = { version = "3.0.0", path = "../../primitives/finality-grandpa" }
+sc-client-api = { version = "4.0.0-dev", path = "../api" }
+sp-inherents = { version = "4.0.0-dev", path = "../../primitives/inherents" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
+sc-network = { version = "0.10.0-dev", path = "../network" }
+sc-network-gossip = { version = "0.10.0-dev", path = "../network-gossip" }
+sp-finality-grandpa = { version = "4.0.0-dev", path = "../../primitives/finality-grandpa" }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
-sc-block-builder = { version = "0.9.0", path = "../block-builder" }
+sc-block-builder = { version = "0.10.0-dev", path = "../block-builder" }
 finality-grandpa = { version = "0.14.1", features = ["derive-codec"] }
 pin-project = "1.0.4"
 linked-hash-map = "0.5.2"
@@ -53,12 +53,12 @@ wasm-timer = "0.2"
 [dev-dependencies]
 assert_matches = "1.3.0"
 finality-grandpa = { version = "0.14.1", features = ["derive-codec", "test-helpers"] }
-sc-network = { version = "0.9.0", path = "../network" }
+sc-network = { version = "0.10.0-dev", path = "../network" }
 sc-network-test = { version = "0.8.0", path = "../network/test" }
-sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
+sp-keyring = { version = "4.0.0-dev", path = "../../primitives/keyring" }
 substrate-test-runtime-client = { version = "2.0.0",  path = "../../test-utils/runtime/client" }
-sp-consensus-babe = { version = "0.9.0", path = "../../primitives/consensus/babe" }
-sp-state-machine = { version = "0.9.0", path = "../../primitives/state-machine" }
-sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
+sp-consensus-babe = { version = "0.10.0-dev", path = "../../primitives/consensus/babe" }
+sp-state-machine = { version = "0.10.0-dev", path = "../../primitives/state-machine" }
+sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
 tokio = { version = "0.2", features = ["rt-core"] }
 tempfile = "3.1.0"
diff --git a/client/finality-grandpa/rpc/Cargo.toml b/client/finality-grandpa/rpc/Cargo.toml
index 97359120fcaa..e965f9279bd3 100644
--- a/client/finality-grandpa/rpc/Cargo.toml
+++ b/client/finality-grandpa/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-finality-grandpa-rpc"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "RPC extensions for the GRANDPA finality gadget"
 repository = "https://github.com/paritytech/substrate/"
@@ -9,11 +9,11 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 readme = "README.md"
 
 [dependencies]
-sc-finality-grandpa = { version = "0.9.0", path = "../" }
-sc-rpc = { version = "3.0.0", path = "../../rpc" }
-sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
-sp-core = { version = "3.0.0", path = "../../../primitives/core" }
-sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
+sc-finality-grandpa = { version = "0.10.0-dev", path = "../" }
+sc-rpc = { version = "4.0.0-dev", path = "../../rpc" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
+sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
+sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
 finality-grandpa = { version = "0.14.1", features = ["derive-codec"] }
 jsonrpc-core = "15.1.0"
 jsonrpc-core-client = "15.1.0"
@@ -25,15 +25,15 @@ serde_json = "1.0.50"
 log = "0.4.8"
 derive_more = "0.99.2"
 parity-scale-codec = { version = "2.0.0", features = ["derive"] }
-sc-client-api = { version = "3.0.0", path = "../../api" }
+sc-client-api = { version = "4.0.0-dev", path = "../../api" }
 
 [dev-dependencies]
-sc-block-builder = { version = "0.9.0", path = "../../block-builder" }
+sc-block-builder = { version = "0.10.0-dev", path = "../../block-builder" }
 sc-network-test = { version = "0.8.0", path = "../../network/test" }
-sc-rpc = { version = "3.0.0", path = "../../rpc", features = ["test-helpers"] }
-sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
-sp-core = { version = "3.0.0", path = "../../../primitives/core" }
-sp-finality-grandpa = { version = "3.0.0", path = "../../../primitives/finality-grandpa" }
-sp-keyring = { version = "3.0.0", path = "../../../primitives/keyring" }
+sc-rpc = { version = "4.0.0-dev", path = "../../rpc", features = ["test-helpers"] }
+sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
+sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
+sp-finality-grandpa = { version = "4.0.0-dev", path = "../../../primitives/finality-grandpa" }
+sp-keyring = { version = "4.0.0-dev", path = "../../../primitives/keyring" }
 substrate-test-runtime-client = { version = "2.0.0",  path = "../../../test-utils/runtime/client" }
 lazy_static = "1.4"
diff --git a/client/informant/Cargo.toml b/client/informant/Cargo.toml
index f0343a6bf384..73d2a9025303 100644
--- a/client/informant/Cargo.toml
+++ b/client/informant/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-informant"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Substrate informant."
 edition = "2018"
@@ -18,9 +18,9 @@ futures = "0.3.9"
 futures-timer = "3.0.1"
 log = "0.4.8"
 parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
-sc-client-api = { version = "3.0.0", path = "../api" }
-sc-network = { version = "0.9.0", path = "../network" }
-sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
-sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
-sc-transaction-pool-api = { version = "3.0.0", path = "../transaction-pool/api" }
+sc-client-api = { version = "4.0.0-dev", path = "../api" }
+sc-network = { version = "0.10.0-dev", path = "../network" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
+sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
+sc-transaction-pool-api = { version = "4.0.0-dev", path = "../transaction-pool/api" }
 wasm-timer = "0.2"
diff --git a/client/keystore/Cargo.toml b/client/keystore/Cargo.toml
index fd9fd162e617..b3b1d7981255 100644
--- a/client/keystore/Cargo.toml
+++ b/client/keystore/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-keystore"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -19,9 +19,9 @@ async-trait = "0.1.30"
 derive_more = "0.99.2"
 futures = "0.3.9"
 futures-util = "0.3.4"
-sp-application-crypto = { version = "3.0.0", path = "../../primitives/application-crypto" }
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-sp-keystore = { version = "0.9.0", path = "../../primitives/keystore" }
+sp-application-crypto = { version = "4.0.0-dev", path = "../../primitives/application-crypto" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+sp-keystore = { version = "0.10.0-dev", path = "../../primitives/keystore" }
 hex = "0.4.0"
 merlin = { version = "2.0", default-features = false }
 parking_lot = "0.11.1"
diff --git a/client/light/Cargo.toml b/client/light/Cargo.toml
index 1b45dbf5c0c5..4dee5d55e7d3 100644
--- a/client/light/Cargo.toml
+++ b/client/light/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "components for a light client"
 name = "sc-light"
-version = "3.0.0"
+version = "4.0.0-dev"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -14,15 +14,15 @@ readme = "README.md"
 parking_lot = "0.11.1"
 lazy_static = "1.4.0"
 hash-db = "0.15.2"
-sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
-sp-externalities = { version = "0.9.0", path = "../../primitives/externalities" }
-sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-sp-state-machine = { version = "0.9.0", path = "../../primitives/state-machine" }
-sc-client-api = { version = "3.0.0", path = "../api" }
-sp-api = { version = "3.0.0", path = "../../primitives/api" }
+sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
+sp-externalities = { version = "0.10.0-dev", path = "../../primitives/externalities" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+sp-state-machine = { version = "0.10.0-dev", path = "../../primitives/state-machine" }
+sc-client-api = { version = "4.0.0-dev", path = "../api" }
+sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-sc-executor = { version = "0.9.0", path = "../executor" }
+sc-executor = { version = "0.10.0-dev", path = "../executor" }
 
 [features]
 default = []
diff --git a/client/network-gossip/Cargo.toml b/client/network-gossip/Cargo.toml
index fc5fb9a29ce9..ed9dd45d99f8 100644
--- a/client/network-gossip/Cargo.toml
+++ b/client/network-gossip/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "Gossiping for the Substrate network protocol"
 name = "sc-network-gossip"
-version = "0.9.0"
+version = "0.10.0-dev"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -21,8 +21,8 @@ libp2p = { version = "0.37.1", default-features = false }
 log = "0.4.8"
 lru = "0.6.5"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.9.0", path = "../../utils/prometheus" }
-sc-network = { version = "0.9.0", path = "../network" }
-sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
+sc-network = { version = "0.10.0-dev", path = "../network" }
+sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
 wasm-timer = "0.2"
 tracing = "0.1.25"
 
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index 3740ebceb638..056ae5cbaa05 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "Substrate network protocol"
 name = "sc-network"
-version = "0.9.0"
+version = "0.10.0-dev"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -44,18 +44,18 @@ pin-project = "1.0.4"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.9.0", path = "../../utils/prometheus" }
 prost = "0.7"
 rand = "0.7.2"
-sc-block-builder = { version = "0.9.0", path = "../block-builder" }
-sc-client-api = { version = "3.0.0", path = "../api" }
-sc-peerset = { version = "3.0.0", path = "../peerset" }
+sc-block-builder = { version = "0.10.0-dev", path = "../block-builder" }
+sc-client-api = { version = "4.0.0-dev", path = "../api" }
+sc-peerset = { version = "4.0.0-dev", path = "../peerset" }
 serde = { version = "1.0.101", features = ["derive"] }
 serde_json = "1.0.41"
 smallvec = "1.5.0"
-sp-arithmetic = { version = "3.0.0", path = "../../primitives/arithmetic" }
-sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
-sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
-sp-utils = { version = "3.0.0", path = "../../primitives/utils" }
+sp-arithmetic = { version = "4.0.0-dev", path = "../../primitives/arithmetic" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
+sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
+sp-utils = { version = "4.0.0-dev", path = "../../primitives/utils" }
 thiserror = "1"
 unsigned-varint = { version = "0.6.0", features = ["futures", "asynchronous_codec"] }
 void = "1.0.2"
@@ -76,9 +76,9 @@ assert_matches = "1.3"
 libp2p = { version = "0.37.1", default-features = false }
 quickcheck = "1.0.3"
 rand = "0.7.2"
-sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
+sp-keyring = { version = "4.0.0-dev", path = "../../primitives/keyring" }
 sp-test-primitives = { version = "2.0.0", path = "../../primitives/test-primitives" }
-sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
+sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
 substrate-test-runtime = { version = "2.0.0", path = "../../test-utils/runtime" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 tempfile = "3.1.0"
diff --git a/client/network/test/Cargo.toml b/client/network/test/Cargo.toml
index 18a8d5cf8ca0..2fc453a8c5a3 100644
--- a/client/network/test/Cargo.toml
+++ b/client/network/test/Cargo.toml
@@ -14,24 +14,24 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 async-std = "1.6.5"
-sc-network = { version = "0.9.0", path = "../" }
+sc-network = { version = "0.10.0-dev", path = "../" }
 log = "0.4.8"
 parking_lot = "0.11.1"
 futures = "0.3.9"
 futures-timer = "3.0.1"
 rand = "0.7.2"
 libp2p = { version = "0.37.1", default-features = false }
-sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
-sc-consensus = { version = "0.9.0", path = "../../consensus/common" }
-sc-client-api = { version = "3.0.0", path = "../../api" }
-sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
-sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
-sp-core = { version = "3.0.0", path = "../../../primitives/core" }
-sc-block-builder = { version = "0.9.0", path = "../../block-builder" }
-sp-consensus-babe = { version = "0.9.0", path = "../../../primitives/consensus/babe" }
+sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
+sc-consensus = { version = "0.10.0-dev", path = "../../consensus/common" }
+sc-client-api = { version = "4.0.0-dev", path = "../../api" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
+sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
+sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
+sc-block-builder = { version = "0.10.0-dev", path = "../../block-builder" }
+sp-consensus-babe = { version = "0.10.0-dev", path = "../../../primitives/consensus/babe" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
 substrate-test-runtime = { version = "2.0.0", path = "../../../test-utils/runtime" }
 tempfile = "3.1.0"
-sp-tracing = { version = "3.0.0", path = "../../../primitives/tracing" }
-sc-service = { version = "0.9.0", default-features = false, features = ["test-helpers"],  path = "../../service" }
+sp-tracing = { version = "4.0.0-dev", path = "../../../primitives/tracing" }
+sc-service = { version = "0.10.0-dev", default-features = false, features = ["test-helpers"],  path = "../../service" }
 async-trait = "0.1.42"
diff --git a/client/offchain/Cargo.toml b/client/offchain/Cargo.toml
index 9f0fbdb64dcc..977df259f5c4 100644
--- a/client/offchain/Cargo.toml
+++ b/client/offchain/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "Substrate offchain workers"
 name = "sc-offchain"
-version = "3.0.0"
+version = "4.0.0-dev"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -23,14 +23,14 @@ log = "0.4.8"
 num_cpus = "1.10"
 parking_lot = "0.11.1"
 rand = "0.7.2"
-sc-client-api = { version = "3.0.0", path = "../api" }
-sc-keystore = { version = "3.0.0", path = "../keystore" }
-sc-network = { version = "0.9.0", path = "../network" }
-sp-api = { version = "3.0.0", path = "../../primitives/api" }
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-sp-offchain = { version = "3.0.0", path = "../../primitives/offchain" }
-sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
-sp-utils = { version = "3.0.0", path = "../../primitives/utils" }
+sc-client-api = { version = "4.0.0-dev", path = "../api" }
+sc-keystore = { version = "4.0.0-dev", path = "../keystore" }
+sc-network = { version = "0.10.0-dev", path = "../network" }
+sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+sp-offchain = { version = "4.0.0-dev", path = "../../primitives/offchain" }
+sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
+sp-utils = { version = "4.0.0-dev", path = "../../primitives/utils" }
 threadpool = "1.7"
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
@@ -38,12 +38,12 @@ hyper = "0.13.9"
 hyper-rustls = "0.21.0"
 
 [dev-dependencies]
-sc-client-db = { version = "0.9.0", default-features = true, path = "../db" }
-sc-block-builder = { version = "0.9.0", path = "../block-builder" }
-sc-transaction-pool = { version = "3.0.0", path = "../transaction-pool" }
-sc-transaction-pool-api = { version = "3.0.0", path = "../transaction-pool/api" }
-sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
-sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
+sc-client-db = { version = "0.10.0-dev", default-features = true, path = "../db" }
+sc-block-builder = { version = "0.10.0-dev", path = "../block-builder" }
+sc-transaction-pool = { version = "4.0.0-dev", path = "../transaction-pool" }
+sc-transaction-pool-api = { version = "4.0.0-dev", path = "../transaction-pool/api" }
+sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
+sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 tokio = "0.2"
 lazy_static = "1.4.0"
diff --git a/client/peerset/Cargo.toml b/client/peerset/Cargo.toml
index 5910116ec01c..1af585df5359 100644
--- a/client/peerset/Cargo.toml
+++ b/client/peerset/Cargo.toml
@@ -3,7 +3,7 @@ description = "Connectivity manager based on reputation"
 homepage = "http://parity.io"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 name = "sc-peerset"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 repository = "https://github.com/paritytech/substrate/"
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 futures = "0.3.9"
 libp2p = { version = "0.37.1", default-features = false }
-sp-utils = { version = "3.0.0", path = "../../primitives/utils"}
+sp-utils = { version = "4.0.0-dev", path = "../../primitives/utils"}
 log = "0.4.8"
 serde_json = "1.0.41"
 wasm-timer = "0.2"
diff --git a/client/rpc-api/Cargo.toml b/client/rpc-api/Cargo.toml
index 53c9a07fe008..057a692e83c7 100644
--- a/client/rpc-api/Cargo.toml
+++ b/client/rpc-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-rpc-api"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -22,12 +22,12 @@ jsonrpc-derive = "15.1.0"
 jsonrpc-pubsub = "15.1.0"
 log = "0.4.8"
 parking_lot = "0.11.1"
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-sp-version = { version = "3.0.0", path = "../../primitives/version" }
-sp-runtime = { path = "../../primitives/runtime" , version = "3.0.0"}
-sc-chain-spec = { path = "../chain-spec" , version = "3.0.0"}
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+sp-version = { version = "4.0.0-dev", path = "../../primitives/version" }
+sp-runtime = { path = "../../primitives/runtime", version = "4.0.0-dev" }
+sc-chain-spec = { path = "../chain-spec", version = "4.0.0-dev" }
 serde = { version = "1.0.101", features = ["derive"] }
 serde_json = "1.0.41"
-sc-transaction-pool-api = { version = "3.0.0", path = "../transaction-pool/api" }
-sp-rpc = { version = "3.0.0", path = "../../primitives/rpc" }
-sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
+sc-transaction-pool-api = { version = "4.0.0-dev", path = "../transaction-pool/api" }
+sp-rpc = { version = "4.0.0-dev", path = "../../primitives/rpc" }
+sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
diff --git a/client/rpc-servers/Cargo.toml b/client/rpc-servers/Cargo.toml
index 95c3e4194cd5..5f090ed3e733 100644
--- a/client/rpc-servers/Cargo.toml
+++ b/client/rpc-servers/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-rpc-server"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -20,7 +20,7 @@ log = "0.4.8"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
 serde = "1.0.101"
 serde_json = "1.0.41"
-sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
+sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
 http = { package = "jsonrpc-http-server", version = "15.1.0" }
diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml
index c4cfc40c34d6..67e78c8de8de 100644
--- a/client/rpc/Cargo.toml
+++ b/client/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-rpc"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -13,46 +13,46 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sc-rpc-api = { version = "0.9.0", path = "../rpc-api" }
-sc-client-api = { version = "3.0.0", path = "../api" }
-sp-api = { version = "3.0.0", path = "../../primitives/api" }
+sc-rpc-api = { version = "0.10.0-dev", path = "../rpc-api" }
+sc-client-api = { version = "4.0.0-dev", path = "../api" }
+sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 futures = { version = "0.3.1", features = ["compat"] }
 jsonrpc-pubsub = "15.1.0"
 log = "0.4.8"
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 rpc = { package = "jsonrpc-core", version = "15.1.0" }
-sp-version = { version = "3.0.0", path = "../../primitives/version" }
+sp-version = { version = "4.0.0-dev", path = "../../primitives/version" }
 serde_json = "1.0.41"
-sp-session = { version = "3.0.0", path = "../../primitives/session" }
-sp-offchain = { version = "3.0.0", path = "../../primitives/offchain" }
-sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
-sp-utils = { version = "3.0.0", path = "../../primitives/utils" }
-sp-rpc = { version = "3.0.0", path = "../../primitives/rpc" }
-sp-keystore = { version = "0.9.0", path = "../../primitives/keystore" }
-sp-state-machine = { version = "0.9.0", path = "../../primitives/state-machine" }
-sc-chain-spec = { version = "3.0.0", path = "../chain-spec" }
-sc-executor = { version = "0.9.0", path = "../executor" }
-sc-block-builder = { version = "0.9.0", path = "../block-builder" }
-sc-keystore = { version = "3.0.0", path = "../keystore" }
-sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
-sc-tracing = { version = "3.0.0", path = "../tracing" }
+sp-session = { version = "4.0.0-dev", path = "../../primitives/session" }
+sp-offchain = { version = "4.0.0-dev", path = "../../primitives/offchain" }
+sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
+sp-utils = { version = "4.0.0-dev", path = "../../primitives/utils" }
+sp-rpc = { version = "4.0.0-dev", path = "../../primitives/rpc" }
+sp-keystore = { version = "0.10.0-dev", path = "../../primitives/keystore" }
+sp-state-machine = { version = "0.10.0-dev", path = "../../primitives/state-machine" }
+sc-chain-spec = { version = "4.0.0-dev", path = "../chain-spec" }
+sc-executor = { version = "0.10.0-dev", path = "../executor" }
+sc-block-builder = { version = "0.10.0-dev", path = "../block-builder" }
+sc-keystore = { version = "4.0.0-dev", path = "../keystore" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
+sc-tracing = { version = "4.0.0-dev", path = "../tracing" }
 hash-db = { version = "0.15.2", default-features = false }
 parking_lot = "0.11.1"
 lazy_static = { version = "1.4.0", optional = true }
-sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
-sc-transaction-pool-api = { version = "3.0.0", path = "../transaction-pool/api" }
+sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
+sc-transaction-pool-api = { version = "4.0.0-dev", path = "../transaction-pool/api" }
 
 [dev-dependencies]
 assert_matches = "1.3.0"
 futures01 = { package = "futures", version = "0.1.29" }
 lazy_static = "1.4.0"
-sc-network = { version = "0.9.0", path = "../network" }
-sp-io = { version = "3.0.0", path = "../../primitives/io" }
+sc-network = { version = "0.10.0-dev", path = "../network" }
+sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 tokio = "0.1.22"
-sc-transaction-pool = { version = "3.0.0", path = "../transaction-pool" }
-sc-cli = { version = "0.9.0", path = "../cli" }
+sc-transaction-pool = { version = "4.0.0-dev", path = "../transaction-pool" }
+sc-cli = { version = "0.10.0-dev", path = "../cli" }
 
 [features]
 test-helpers = ["lazy_static"]
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index fa424a9d0b22..2129bc1610fa 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-service"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -40,44 +40,44 @@ pin-project = "1.0.4"
 hash-db = "0.15.2"
 serde = "1.0.101"
 serde_json = "1.0.41"
-sc-keystore = { version = "3.0.0", path = "../keystore" }
-sp-io = { version = "3.0.0", path = "../../primitives/io" }
-sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
-sp-trie = { version = "3.0.0", path = "../../primitives/trie" }
-sp-externalities = { version = "0.9.0", path = "../../primitives/externalities" }
-sp-utils = { version = "3.0.0", path = "../../primitives/utils" }
-sp-version = { version = "3.0.0", path = "../../primitives/version" }
-sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-sp-keystore = { version = "0.9.0", path = "../../primitives/keystore" }
-sp-session = { version = "3.0.0", path = "../../primitives/session" }
-sp-state-machine = { version = "0.9.0", path = "../../primitives/state-machine" }
-sp-application-crypto = { version = "3.0.0", path = "../../primitives/application-crypto" }
-sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
-sp-inherents = { version = "3.0.0", path = "../../primitives/inherents" }
-sp-storage = { version = "3.0.0", path = "../../primitives/storage" }
-sc-network = { version = "0.9.0", path = "../network" }
-sc-chain-spec = { version = "3.0.0", path = "../chain-spec" }
-sc-light = { version = "3.0.0", path = "../light" }
-sc-client-api = { version = "3.0.0", path = "../api" }
-sp-api = { version = "3.0.0", path = "../../primitives/api" }
-sc-client-db = { version = "0.9.0", default-features = false, path = "../db" }
+sc-keystore = { version = "4.0.0-dev", path = "../keystore" }
+sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
+sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
+sp-trie = { version = "4.0.0-dev", path = "../../primitives/trie" }
+sp-externalities = { version = "0.10.0-dev", path = "../../primitives/externalities" }
+sp-utils = { version = "4.0.0-dev", path = "../../primitives/utils" }
+sp-version = { version = "4.0.0-dev", path = "../../primitives/version" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+sp-keystore = { version = "0.10.0-dev", path = "../../primitives/keystore" }
+sp-session = { version = "4.0.0-dev", path = "../../primitives/session" }
+sp-state-machine = { version = "0.10.0-dev", path = "../../primitives/state-machine" }
+sp-application-crypto = { version = "4.0.0-dev", path = "../../primitives/application-crypto" }
+sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
+sp-inherents = { version = "4.0.0-dev", path = "../../primitives/inherents" }
+sp-storage = { version = "4.0.0-dev", path = "../../primitives/storage" }
+sc-network = { version = "0.10.0-dev", path = "../network" }
+sc-chain-spec = { version = "4.0.0-dev", path = "../chain-spec" }
+sc-light = { version = "4.0.0-dev", path = "../light" }
+sc-client-api = { version = "4.0.0-dev", path = "../api" }
+sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
+sc-client-db = { version = "0.10.0-dev", default-features = false, path = "../db" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-sc-executor = { version = "0.9.0", path = "../executor" }
-sc-transaction-pool = { version = "3.0.0", path = "../transaction-pool" }
-sp-transaction-pool = { version = "3.0.0", path = "../../primitives/transaction-pool" }
-sc-transaction-pool-api = { version = "3.0.0", path = "../transaction-pool/api" }
-sp-transaction-storage-proof = { version = "3.0.0", path = "../../primitives/transaction-storage-proof" }
-sc-rpc-server = { version = "3.0.0", path = "../rpc-servers" }
-sc-rpc = { version = "3.0.0", path = "../rpc" }
-sc-block-builder = { version = "0.9.0", path = "../block-builder" }
-sp-block-builder = { version = "3.0.0", path = "../../primitives/block-builder" }
-sc-informant = { version = "0.9.0", path = "../informant" }
-sc-telemetry = { version = "3.0.0", path = "../telemetry" }
-sc-offchain = { version = "3.0.0", path = "../offchain" }
+sc-executor = { version = "0.10.0-dev", path = "../executor" }
+sc-transaction-pool = { version = "4.0.0-dev", path = "../transaction-pool" }
+sp-transaction-pool = { version = "4.0.0-dev", path = "../../primitives/transaction-pool" }
+sc-transaction-pool-api = { version = "4.0.0-dev", path = "../transaction-pool/api" }
+sp-transaction-storage-proof = { version = "4.0.0-dev", path = "../../primitives/transaction-storage-proof" }
+sc-rpc-server = { version = "4.0.0-dev", path = "../rpc-servers" }
+sc-rpc = { version = "4.0.0-dev", path = "../rpc" }
+sc-block-builder = { version = "0.10.0-dev", path = "../block-builder" }
+sp-block-builder = { version = "4.0.0-dev", path = "../../primitives/block-builder" }
+sc-informant = { version = "0.10.0-dev", path = "../informant" }
+sc-telemetry = { version = "4.0.0-dev", path = "../telemetry" }
+sc-offchain = { version = "4.0.0-dev", path = "../offchain" }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
-sc-tracing = { version = "3.0.0", path = "../tracing" }
-sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
+sc-tracing = { version = "4.0.0-dev", path = "../tracing" }
+sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
 tracing = "0.1.25"
 tracing-futures = { version = "0.2.4" }
 parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
@@ -90,8 +90,8 @@ directories = "3.0.1"
 [dev-dependencies]
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 substrate-test-runtime = { version = "2.0.0", path = "../../test-utils/runtime/" }
-sp-consensus-babe = { version = "0.9.0", path = "../../primitives/consensus/babe" }
-grandpa = { version = "0.9.0", package = "sc-finality-grandpa", path = "../finality-grandpa" }
-grandpa-primitives = { version = "3.0.0", package = "sp-finality-grandpa", path = "../../primitives/finality-grandpa" }
+sp-consensus-babe = { version = "0.10.0-dev", path = "../../primitives/consensus/babe" }
+grandpa = { version = "0.10.0-dev", package = "sc-finality-grandpa", path = "../finality-grandpa" }
+grandpa-primitives = { version = "4.0.0-dev", package = "sp-finality-grandpa", path = "../../primitives/finality-grandpa" }
 tokio = { version = "0.2.25", default-features = false }
 async-std = { version = "1.6.5", default-features = false }
diff --git a/client/service/test/Cargo.toml b/client/service/test/Cargo.toml
index 27aa14b0d2bc..e7e627f919c1 100644
--- a/client/service/test/Cargo.toml
+++ b/client/service/test/Cargo.toml
@@ -19,26 +19,26 @@ futures01 = { package = "futures", version = "0.1.29" }
 log = "0.4.8"
 fdlimit = "0.2.1"
 parking_lot = "0.11.1"
-sc-light = { version = "3.0.0", path = "../../light" }
-sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
-sp-api = { version = "3.0.0", path = "../../../primitives/api" }
-sp-state-machine = { version = "0.9.0", path = "../../../primitives/state-machine" }
-sp-externalities = { version = "0.9.0", path = "../../../primitives/externalities" }
-sp-trie = { version = "3.0.0", path = "../../../primitives/trie" }
-sp-storage = { version = "3.0.0", path = "../../../primitives/storage" }
-sc-client-db = { version = "0.9.0", default-features = false, path = "../../db" }
+sc-light = { version = "4.0.0-dev", path = "../../light" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
+sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
+sp-state-machine = { version = "0.10.0-dev", path = "../../../primitives/state-machine" }
+sp-externalities = { version = "0.10.0-dev", path = "../../../primitives/externalities" }
+sp-trie = { version = "4.0.0-dev", path = "../../../primitives/trie" }
+sp-storage = { version = "4.0.0-dev", path = "../../../primitives/storage" }
+sc-client-db = { version = "0.10.0-dev", default-features = false, path = "../../db" }
 futures = { version = "0.3.1", features = ["compat"] }
-sc-service = { version = "0.9.0", features = ["test-helpers"], path = "../../service" }
-sc-network = { version = "0.9.0", path = "../../network" }
-sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
-sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
-sp-core = { version = "3.0.0", path = "../../../primitives/core" }
-sc-transaction-pool-api = { version = "3.0.0", path = "../../../client/transaction-pool/api" }
+sc-service = { version = "0.10.0-dev", features = ["test-helpers"], path = "../../service" }
+sc-network = { version = "0.10.0-dev", path = "../../network" }
+sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
+sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
+sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
+sc-transaction-pool-api = { version = "4.0.0-dev", path = "../../../client/transaction-pool/api" }
 substrate-test-runtime = { version = "2.0.0", path = "../../../test-utils/runtime" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
-sc-client-api = { version = "3.0.0", path = "../../api" }
-sc-block-builder = { version = "0.9.0", path = "../../block-builder" }
-sc-executor = { version = "0.9.0", path = "../../executor" }
+sc-client-api = { version = "4.0.0-dev", path = "../../api" }
+sc-block-builder = { version = "0.10.0-dev", path = "../../block-builder" }
+sc-executor = { version = "0.10.0-dev", path = "../../executor" }
 sp-panic-handler = { version = "3.0.0", path = "../../../primitives/panic-handler" }
 parity-scale-codec = "2.0.0"
-sp-tracing = { version = "3.0.0", path = "../../../primitives/tracing" }
+sp-tracing = { version = "4.0.0-dev", path = "../../../primitives/tracing" }
diff --git a/client/state-db/Cargo.toml b/client/state-db/Cargo.toml
index ca538f9d651f..40997f65d223 100644
--- a/client/state-db/Cargo.toml
+++ b/client/state-db/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-state-db"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -16,8 +16,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 thiserror = "1.0.21"
 parking_lot = "0.11.1"
 log = "0.4.11"
-sc-client-api = { version = "3.0.0", path = "../api" }
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sc-client-api = { version = "4.0.0-dev", path = "../api" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
 parity-util-mem-derive = "0.1.0"
diff --git a/client/sync-state-rpc/Cargo.toml b/client/sync-state-rpc/Cargo.toml
index 3ec48ac9ec57..0402d16ae008 100644
--- a/client/sync-state-rpc/Cargo.toml
+++ b/client/sync-state-rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-sync-state-rpc"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "A RPC handler to create sync states for light clients."
 edition = "2018"
@@ -17,12 +17,12 @@ thiserror = "1.0.21"
 jsonrpc-core = "15.0"
 jsonrpc-core-client = "15.0"
 jsonrpc-derive = "15.0"
-sc-chain-spec = { version = "3.0.0", path = "../chain-spec" }
-sc-client-api = { version = "3.0.0", path = "../api" }
-sc-consensus-babe = { version = "0.9.0", path = "../consensus/babe" }
-sc-consensus-epochs = { version = "0.9.0", path = "../consensus/epochs" }
-sc-finality-grandpa = { version = "0.9.0", path = "../finality-grandpa" }
-sc-rpc-api = { version = "0.9.0", path = "../rpc-api" }
+sc-chain-spec = { version = "4.0.0-dev", path = "../chain-spec" }
+sc-client-api = { version = "4.0.0-dev", path = "../api" }
+sc-consensus-babe = { version = "0.10.0-dev", path = "../consensus/babe" }
+sc-consensus-epochs = { version = "0.10.0-dev", path = "../consensus/epochs" }
+sc-finality-grandpa = { version = "0.10.0-dev", path = "../finality-grandpa" }
+sc-rpc-api = { version = "0.10.0-dev", path = "../rpc-api" }
 serde_json = "1.0.58"
-sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
-sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
+sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
diff --git a/client/telemetry/Cargo.toml b/client/telemetry/Cargo.toml
index 6e6ae408247a..e4ea3e25d63c 100644
--- a/client/telemetry/Cargo.toml
+++ b/client/telemetry/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-telemetry"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Telemetry utils"
 edition = "2018"
diff --git a/client/tracing/Cargo.toml b/client/tracing/Cargo.toml
index 1121b922494c..5d93b26dfbbc 100644
--- a/client/tracing/Cargo.toml
+++ b/client/tracing/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-tracing"
-version = "3.0.0"
+version = "4.0.0-dev"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -28,18 +28,18 @@ thiserror = "1.0.21"
 tracing = "0.1.25"
 tracing-log = "0.1.2"
 tracing-subscriber = "0.2.18"
-sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
-sp-rpc = { version = "3.0.0", path = "../../primitives/rpc" }
-sp-block-builder = { version = "3.0.0", path = "../../primitives/block-builder" }
-sp-storage = { version = "3.0.0", path = "../../primitives/storage" }
-sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
-sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
-sp-api = { version = "3.0.0", path = "../../primitives/api" }
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-sc-telemetry = { version = "3.0.0", path = "../telemetry" }
-sc-client-api = { version = "3.0.0", path = "../api" }
-sc-tracing-proc-macro = { version = "3.0.0", path = "./proc-macro" }
-sc-rpc-server =  { version = "3.0.0", path = "../rpc-servers" }
+sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
+sp-rpc = { version = "4.0.0-dev", path = "../../primitives/rpc" }
+sp-block-builder = { version = "4.0.0-dev", path = "../../primitives/block-builder" }
+sp-storage = { version = "4.0.0-dev", path = "../../primitives/storage" }
+sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
+sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+sc-telemetry = { version = "4.0.0-dev", path = "../telemetry" }
+sc-client-api = { version = "4.0.0-dev", path = "../api" }
+sc-tracing-proc-macro = { version = "4.0.0-dev", path = "./proc-macro" }
+sc-rpc-server =  { version = "4.0.0-dev", path = "../rpc-servers" }
 wasm-timer = "0.2"
 
 [target.'cfg(target_os = "unknown")'.dependencies]
diff --git a/client/tracing/proc-macro/Cargo.toml b/client/tracing/proc-macro/Cargo.toml
index 3c06a75f0a1f..fbde99a1a217 100644
--- a/client/tracing/proc-macro/Cargo.toml
+++ b/client/tracing/proc-macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-tracing-proc-macro"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/client/transaction-pool/Cargo.toml b/client/transaction-pool/Cargo.toml
index 988f252a6343..10f1ed2f09ff 100644
--- a/client/transaction-pool/Cargo.toml
+++ b/client/transaction-pool/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-transaction-pool"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -21,15 +21,15 @@ log = "0.4.8"
 parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
 parking_lot = "0.11.1"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
-sc-client-api = { version = "3.0.0", path = "../api" }
-sp-api = { version = "3.0.0", path = "../../primitives/api" }
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
-sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
-sp-transaction-pool = { version = "3.0.0", path = "../../primitives/transaction-pool" }
-sc-transaction-pool-api = { version = "3.0.0", path = "./api" }
-sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
-sp-utils = { version = "3.0.0", path = "../../primitives/utils" }
+sc-client-api = { version = "4.0.0-dev", path = "../api" }
+sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
+sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
+sp-transaction-pool = { version = "4.0.0-dev", path = "../../primitives/transaction-pool" }
+sc-transaction-pool-api = { version = "4.0.0-dev", path = "./api" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
+sp-utils = { version = "4.0.0-dev", path = "../../primitives/utils" }
 wasm-timer = "0.2"
 derive_more = "0.99.2"
 serde = { version = "1.0.101", features = ["derive"] }
@@ -39,10 +39,10 @@ retain_mut = "0.1.3"
 [dev-dependencies]
 assert_matches = "1.3.0"
 hex = "0.4"
-sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
+sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
 substrate-test-runtime-transaction-pool = { version = "2.0.0", path = "../../test-utils/runtime/transaction-pool" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
-sc-block-builder = { version = "0.9.0", path = "../block-builder" }
+sc-block-builder = { version = "0.10.0-dev", path = "../block-builder" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 substrate-test-runtime = { version = "2.0.0", path = "../../test-utils/runtime" }
 criterion = "0.3"
@@ -52,4 +52,4 @@ name = "basics"
 harness = false
 
 [features]
-test-helpers = []
\ No newline at end of file
+test-helpers = []
diff --git a/client/transaction-pool/api/Cargo.toml b/client/transaction-pool/api/Cargo.toml
index 8ec74b17b6e9..d0dcfa34fe29 100644
--- a/client/transaction-pool/api/Cargo.toml
+++ b/client/transaction-pool/api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-transaction-pool-api"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -13,8 +13,8 @@ futures = { version = "0.3.1"  }
 log = { version = "0.4.8" }
 serde = { version = "1.0.101", features = ["derive"] }
 thiserror = { version = "1.0.21" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/runtime" }
 
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 derive_more = { version = "0.99.11" }
-sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
diff --git a/client/transaction-pool/graph/Cargo.toml b/client/transaction-pool/graph/Cargo.toml
index 9af2b152d8c6..492ca89f5039 100644
--- a/client/transaction-pool/graph/Cargo.toml
+++ b/client/transaction-pool/graph/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-transaction-graph"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -20,11 +20,11 @@ log = "0.4.8"
 parking_lot = "0.11.1"
 serde = { version = "1.0.101", features = ["derive"] }
 wasm-timer = "0.2"
-sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
-sp-utils = { version = "3.0.0", path = "../../../primitives/utils" }
-sp-core = { version = "3.0.0", path = "../../../primitives/core" }
-sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
-sp-transaction-pool = { version = "3.0.0", path = "../../../primitives/transaction-pool" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
+sp-utils = { version = "4.0.0-dev", path = "../../../primitives/utils" }
+sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
+sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
+sp-transaction-pool = { version = "4.0.0-dev", path = "../../../primitives/transaction-pool" }
 parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
 linked-hash-map = "0.5.2"
 retain_mut = "0.1.3"
diff --git a/frame/assets/Cargo.toml b/frame/assets/Cargo.toml
index 7137cf1d789a..504dd6957aeb 100644
--- a/frame/assets/Cargo.toml
+++ b/frame/assets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-assets"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,20 +14,20 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 # Needed for various traits. In our case, `OnFinalize`.
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 # Needed for type-safe access to storage DB.
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
 # `system` module provides us with all sorts of useful stuff and macros depend on it being around.
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-sp-std = { version = "3.0.0", path = "../../primitives/std" }
-sp-io = { version = "3.0.0", path = "../../primitives/io" }
-pallet-balances = { version = "3.0.0", path = "../balances" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+sp-std = { version = "4.0.0-dev", path = "../../primitives/std" }
+sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
+pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/frame/atomic-swap/Cargo.toml b/frame/atomic-swap/Cargo.toml
index 4fd1284893f9..2519772ed46d 100644
--- a/frame/atomic-swap/Cargo.toml
+++ b/frame/atomic-swap/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-atomic-swap"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,15 +14,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
-sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
 
 [dev-dependencies]
-pallet-balances = { version = "3.0.0", path = "../balances" }
+pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/frame/aura/Cargo.toml b/frame/aura/Cargo.toml
index 5b247b008de2..9c4a31017bac 100644
--- a/frame/aura/Cargo.toml
+++ b/frame/aura/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-aura"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -13,19 +13,19 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-application-crypto = { version = "3.0.0", default-features = false, path = "../../primitives/application-crypto" }
+sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../../primitives/application-crypto" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-pallet-session = { version = "3.0.0", default-features = false, path = "../session" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-sp-consensus-aura = { version = "0.9.0", path = "../../primitives/consensus/aura", default-features = false }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-pallet-timestamp = { version = "3.0.0", default-features = false, path = "../timestamp" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+pallet-session = { version = "4.0.0-dev", default-features = false, path = "../session" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+sp-consensus-aura = { version = "0.10.0-dev", path = "../../primitives/consensus/aura", default-features = false }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
+pallet-timestamp = { version = "4.0.0-dev", default-features = false, path = "../timestamp" }
 
 [dev-dependencies]
-sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
-sp-io ={ version = "3.0.0", path = "../../primitives/io" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
+sp-io ={ version = "4.0.0-dev", path = "../../primitives/io" }
 lazy_static = "1.4.0"
 parking_lot = "0.11.1"
 
diff --git a/frame/authority-discovery/Cargo.toml b/frame/authority-discovery/Cargo.toml
index 25fec9118230..33faf0183e78 100644
--- a/frame/authority-discovery/Cargo.toml
+++ b/frame/authority-discovery/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-authority-discovery"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -13,19 +13,19 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-authority-discovery = { version = "3.0.0", default-features = false, path = "../../primitives/authority-discovery" }
-sp-application-crypto = { version = "3.0.0", default-features = false, path = "../../primitives/application-crypto" }
+sp-authority-discovery = { version = "4.0.0-dev", default-features = false, path = "../../primitives/authority-discovery" }
+sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../../primitives/application-crypto" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-pallet-session = { version = "3.0.0", features = ["historical" ], path = "../session", default-features = false }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+pallet-session = { version = "4.0.0-dev", features = ["historical" ], path = "../session", default-features = false }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 
 [dev-dependencies]
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-sp-io = { version = "3.0.0", path = "../../primitives/io" }
-sp-staking = { version = "3.0.0", default-features = false, path = "../../primitives/staking" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
+sp-staking = { version = "4.0.0-dev", default-features = false, path = "../../primitives/staking" }
 
 [features]
 default = ["std"]
diff --git a/frame/authorship/Cargo.toml b/frame/authorship/Cargo.toml
index 56c56e23dfc8..f0d597b6ad7e 100644
--- a/frame/authorship/Cargo.toml
+++ b/frame/authorship/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-authorship"
-version = "3.0.0"
+version = "4.0.0-dev"
 description = "Block and Uncle Author tracking for the FRAME"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -14,16 +14,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-authorship = { version = "3.0.0", default-features = false, path = "../../primitives/authorship" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+sp-authorship = { version = "4.0.0-dev", default-features = false, path = "../../primitives/authorship" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 impl-trait-for-tuples = "0.2.1"
 
 [dev-dependencies]
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-sp-io ={ version = "3.0.0", path = "../../primitives/io" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+sp-io ={ version = "4.0.0-dev", path = "../../primitives/io" }
 serde = { version = "1.0.101" }
 
 [features]
diff --git a/frame/babe/Cargo.toml b/frame/babe/Cargo.toml
index 64497eafe715..f1a93bb418e9 100644
--- a/frame/babe/Cargo.toml
+++ b/frame/babe/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-babe"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,29 +14,29 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-pallet-authorship = { version = "3.0.0", default-features = false, path = "../authorship" }
-pallet-session = { version = "3.0.0", default-features = false, path = "../session" }
-pallet-timestamp = { version = "3.0.0", default-features = false, path = "../timestamp" }
-sp-application-crypto = { version = "3.0.0", default-features = false, path = "../../primitives/application-crypto" }
-sp-consensus-babe = { version = "0.9.0", default-features = false, path = "../../primitives/consensus/babe" }
-sp-consensus-vrf = { version = "0.9.0", default-features = false, path = "../../primitives/consensus/vrf" }
-sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-session = { version = "3.0.0", default-features = false, path = "../../primitives/session" }
-sp-staking = { version = "3.0.0", default-features = false, path = "../../primitives/staking" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
+pallet-authorship = { version = "4.0.0-dev", default-features = false, path = "../authorship" }
+pallet-session = { version = "4.0.0-dev", default-features = false, path = "../session" }
+pallet-timestamp = { version = "4.0.0-dev", default-features = false, path = "../timestamp" }
+sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../../primitives/application-crypto" }
+sp-consensus-babe = { version = "0.10.0-dev", default-features = false, path = "../../primitives/consensus/babe" }
+sp-consensus-vrf = { version = "0.10.0-dev", default-features = false, path = "../../primitives/consensus/vrf" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-session = { version = "4.0.0-dev", default-features = false, path = "../../primitives/session" }
+sp-staking = { version = "4.0.0-dev", default-features = false, path = "../../primitives/staking" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
-pallet-balances = { version = "3.0.0", path = "../balances" }
-pallet-offences = { version = "3.0.0", path = "../offences" }
-pallet-staking = { version = "3.0.0", path = "../staking" }
-pallet-staking-reward-curve = { version = "3.0.0", path = "../staking/reward-curve" }
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-frame-election-provider-support = { version = "3.0.0", path = "../election-provider-support" }
+pallet-balances = { version = "4.0.0-dev", path = "../balances" }
+pallet-offences = { version = "4.0.0-dev", path = "../offences" }
+pallet-staking = { version = "4.0.0-dev", path = "../staking" }
+pallet-staking-reward-curve = { version = "4.0.0-dev", path = "../staking/reward-curve" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+frame-election-provider-support = { version = "4.0.0-dev", path = "../election-provider-support" }
 
 [features]
 default = ["std"]
diff --git a/frame/balances/Cargo.toml b/frame/balances/Cargo.toml
index 724fadf48c52..8b66f08d45d9 100644
--- a/frame/balances/Cargo.toml
+++ b/frame/balances/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-balances"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,17 +14,17 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
-sp-io = { version = "3.0.0", path = "../../primitives/io" }
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-pallet-transaction-payment = { version = "3.0.0", path = "../transaction-payment" }
+sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+pallet-transaction-payment = { version = "4.0.0-dev", path = "../transaction-payment" }
 
 [features]
 default = ["std"]
diff --git a/frame/benchmarking/Cargo.toml b/frame/benchmarking/Cargo.toml
index beff930161a0..c7908c3f97b7 100644
--- a/frame/benchmarking/Cargo.toml
+++ b/frame/benchmarking/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-benchmarking"
-version = "3.1.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -16,14 +16,14 @@ targets = ["x86_64-unknown-linux-gnu"]
 linregress = { version = "0.4.3", optional = true }
 paste = "1.0"
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-api = { version = "3.0.0", path = "../../primitives/api", default-features = false }
-sp-runtime-interface = { version = "3.0.0", path = "../../primitives/runtime-interface", default-features = false }
-sp-runtime = { version = "3.0.0", path = "../../primitives/runtime", default-features = false }
-sp-std = { version = "3.0.0", path = "../../primitives/std", default-features = false }
-sp-io = { version = "3.0.0", path = "../../primitives/io", default-features = false }
-sp-storage = { version = "3.0.0", path = "../../primitives/storage", default-features = false }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+sp-api = { version = "4.0.0-dev", path = "../../primitives/api", default-features = false }
+sp-runtime-interface = { version = "4.0.0-dev", path = "../../primitives/runtime-interface", default-features = false }
+sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime", default-features = false }
+sp-std = { version = "4.0.0-dev", path = "../../primitives/std", default-features = false }
+sp-io = { version = "4.0.0-dev", path = "../../primitives/io", default-features = false }
+sp-storage = { version = "4.0.0-dev", path = "../../primitives/storage", default-features = false }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
diff --git a/frame/bounties/Cargo.toml b/frame/bounties/Cargo.toml
index 1845f77e97a9..7385f717af10 100644
--- a/frame/bounties/Cargo.toml
+++ b/frame/bounties/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-bounties"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,19 +14,19 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-pallet-treasury = { version = "3.0.0", default-features = false, path = "../treasury" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
+pallet-treasury = { version = "4.0.0-dev", default-features = false, path = "../treasury" }
 
-frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
-sp-io ={ version = "3.0.0", path = "../../primitives/io" }
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-sp-storage = { version = "3.0.0", path = "../../primitives/storage" }
-pallet-balances = { version = "3.0.0", path = "../balances" }
+sp-io ={ version = "4.0.0-dev", path = "../../primitives/io" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+sp-storage = { version = "4.0.0-dev", path = "../../primitives/storage" }
+pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/frame/collective/Cargo.toml b/frame/collective/Cargo.toml
index c4940c87f827..4f134b2173b2 100644
--- a/frame/collective/Cargo.toml
+++ b/frame/collective/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-collective"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,18 +14,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
 hex-literal = "0.3.1"
-pallet-balances = { version = "3.0.0", path = "../balances" }
+pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/frame/contracts/Cargo.toml b/frame/contracts/Cargo.toml
index e9f7236629ab..a0d7da0c5d0c 100644
--- a/frame/contracts/Cargo.toml
+++ b/frame/contracts/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-contracts"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -26,16 +26,16 @@ rand = { version = "0.8", optional = true, default-features = false }
 rand_pcg = { version = "0.3", optional = true }
 
 # Substrate Dependencies
-frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-pallet-contracts-primitives = { version = "3.0.0", default-features = false, path = "common" }
-pallet-contracts-proc-macro = { version = "3.0.0", path = "proc-macro" }
-sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
-sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-sandbox = { version = "0.9.0", default-features = false, path = "../../primitives/sandbox" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
+pallet-contracts-primitives = { version = "4.0.0-dev", default-features = false, path = "common" }
+pallet-contracts-proc-macro = { version = "4.0.0-dev", path = "proc-macro" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-sandbox = { version = "0.10.0-dev", default-features = false, path = "../../primitives/sandbox" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 
 [dev-dependencies]
 assert_matches = "1"
@@ -45,9 +45,9 @@ pretty_assertions = "0.7"
 wat = "1"
 
 # Substrate Dependencies
-pallet-balances = { version = "3.0.0", path = "../balances" }
-pallet-timestamp = { version = "3.0.0", path = "../timestamp" }
-pallet-randomness-collective-flip = { version = "3.0.0", path = "../randomness-collective-flip" }
+pallet-balances = { version = "4.0.0-dev", path = "../balances" }
+pallet-timestamp = { version = "4.0.0-dev", path = "../timestamp" }
+pallet-randomness-collective-flip = { version = "4.0.0-dev", path = "../randomness-collective-flip" }
 
 [features]
 default = ["std"]
diff --git a/frame/contracts/common/Cargo.toml b/frame/contracts/common/Cargo.toml
index 154ceeb89134..e353b3af0471 100644
--- a/frame/contracts/common/Cargo.toml
+++ b/frame/contracts/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-contracts-primitives"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -18,9 +18,9 @@ codec = { package = "parity-scale-codec", version = "2", default-features = fals
 serde = { version = "1", features = ["derive"], optional = true }
 
 # Substrate Dependencies (This crate should not rely on frame)
-sp-core = { version = "3.0.0", path = "../../../primitives/core", default-features = false }
-sp-std = { version = "3.0.0", default-features = false, path = "../../../primitives/std" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
+sp-core = { version = "4.0.0-dev", path = "../../../primitives/core", default-features = false }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/std" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/runtime" }
 
 [features]
 default = ["std"]
diff --git a/frame/contracts/proc-macro/Cargo.toml b/frame/contracts/proc-macro/Cargo.toml
index 2bdde32e0bd4..605c69fe73e2 100644
--- a/frame/contracts/proc-macro/Cargo.toml
+++ b/frame/contracts/proc-macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-contracts-proc-macro"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/contracts/rpc/Cargo.toml b/frame/contracts/rpc/Cargo.toml
index dbd4356acc4a..32aa9e21a1a0 100644
--- a/frame/contracts/rpc/Cargo.toml
+++ b/frame/contracts/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-contracts-rpc"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -20,13 +20,13 @@ jsonrpc-derive = "15"
 serde = { version = "1", features = ["derive"] }
 
 # Substrate Dependencies
-pallet-contracts-primitives = { version = "3.0.0", path = "../common" }
-pallet-contracts-rpc-runtime-api = { version = "3.0.0", path = "./runtime-api" }
-sp-api = { version = "3.0.0", path = "../../../primitives/api" }
-sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
-sp-core = { version = "3.0.0", path = "../../../primitives/core" }
-sp-rpc = { version = "3.0.0", path = "../../../primitives/rpc" }
-sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
+pallet-contracts-primitives = { version = "4.0.0-dev", path = "../common" }
+pallet-contracts-rpc-runtime-api = { version = "4.0.0-dev", path = "./runtime-api" }
+sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
+sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
+sp-rpc = { version = "4.0.0-dev", path = "../../../primitives/rpc" }
+sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
 
 [dev-dependencies]
 serde_json = "1"
diff --git a/frame/contracts/rpc/runtime-api/Cargo.toml b/frame/contracts/rpc/runtime-api/Cargo.toml
index 8ce1c13e667e..fb5addc5a437 100644
--- a/frame/contracts/rpc/runtime-api/Cargo.toml
+++ b/frame/contracts/rpc/runtime-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-contracts-rpc-runtime-api"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -16,10 +16,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive"] }
 
 # Substrate Dependencies
-pallet-contracts-primitives = { version = "3.0.0", default-features = false, path = "../../common" }
-sp-api = { version = "3.0.0", default-features = false, path = "../../../../primitives/api" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../../../primitives/runtime" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../../../primitives/std" }
+pallet-contracts-primitives = { version = "4.0.0-dev", default-features = false, path = "../../common" }
+sp-api = { version = "4.0.0-dev", default-features = false, path = "../../../../primitives/api" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../../primitives/runtime" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../../../primitives/std" }
 
 [features]
 default = ["std"]
diff --git a/frame/democracy/Cargo.toml b/frame/democracy/Cargo.toml
index f9b0d035b089..178578992ad5 100644
--- a/frame/democracy/Cargo.toml
+++ b/frame/democracy/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-democracy"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,19 +15,19 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 
 [dev-dependencies]
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-pallet-balances = { version = "3.0.0", path = "../balances" }
-pallet-scheduler = { version = "3.0.0", path = "../scheduler" }
-sp-storage = { version = "3.0.0", path = "../../primitives/storage" }
-substrate-test-utils = { version = "3.0.0", path = "../../test-utils" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+pallet-balances = { version = "4.0.0-dev", path = "../balances" }
+pallet-scheduler = { version = "4.0.0-dev", path = "../scheduler" }
+sp-storage = { version = "4.0.0-dev", path = "../../primitives/storage" }
+substrate-test-utils = { version = "4.0.0-dev", path = "../../test-utils" }
 hex-literal = "0.3.1"
 
 [features]
diff --git a/frame/election-provider-multi-phase/Cargo.toml b/frame/election-provider-multi-phase/Cargo.toml
index cd84ef3778c5..c78fba0a569f 100644
--- a/frame/election-provider-multi-phase/Cargo.toml
+++ b/frame/election-provider-multi-phase/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-election-provider-multi-phase"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -17,19 +17,19 @@ static_assertions = "1.1.0"
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 log = { version = "0.4.14", default-features = false }
 
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 
-sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-npos-elections = { version = "3.0.0", default-features = false, path = "../../primitives/npos-elections" }
-sp-arithmetic = { version = "3.0.0", default-features = false, path = "../../primitives/arithmetic" }
-frame-election-provider-support = { version = "3.0.0", default-features = false, path = "../election-provider-support" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-npos-elections = { version = "4.0.0-dev", default-features = false, path = "../../primitives/npos-elections" }
+sp-arithmetic = { version = "4.0.0-dev", default-features = false, path = "../../primitives/arithmetic" }
+frame-election-provider-support = { version = "4.0.0-dev", default-features = false, path = "../election-provider-support" }
 
 # Optional imports for benchmarking
-frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
 rand = { version = "0.7.3", default-features = false, optional = true, features = ["alloc", "small_rng"] }
 
 [dev-dependencies]
@@ -37,14 +37,14 @@ paste = "1.0.3"
 parking_lot = "0.11.0"
 rand = { version = "0.7.3" }
 hex-literal = "0.3.1"
-substrate-test-utils = { version = "3.0.0", path = "../../test-utils" }
-sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
-sp-io = { version = "3.0.0", path = "../../primitives/io" }
-sp-npos-elections = { version = "3.0.0", default-features = false, features = [ "mocks" ], path = "../../primitives/npos-elections" }
-sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
-frame-election-provider-support = { version = "3.0.0", features = ["runtime-benchmarks"], path = "../election-provider-support" }
-pallet-balances = { version = "3.0.0", path = "../balances" }
-frame-benchmarking = { version = "3.1.0", path = "../benchmarking" }
+substrate-test-utils = { version = "4.0.0-dev", path = "../../test-utils" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
+sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
+sp-npos-elections = { version = "4.0.0-dev", default-features = false, features = [ "mocks" ], path = "../../primitives/npos-elections" }
+sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
+frame-election-provider-support = { version = "4.0.0-dev", features = ["runtime-benchmarks"], path = "../election-provider-support" }
+pallet-balances = { version = "4.0.0-dev", path = "../balances" }
+frame-benchmarking = { version = "4.0.0-dev", path = "../benchmarking" }
 
 [features]
 default = ["std"]
diff --git a/frame/election-provider-support/Cargo.toml b/frame/election-provider-support/Cargo.toml
index b360cd89eb57..c0d332315b02 100644
--- a/frame/election-provider-support/Cargo.toml
+++ b/frame/election-provider-support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-election-provider-support"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,15 +14,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-arithmetic = { version = "3.0.0", default-features = false, path = "../../primitives/arithmetic" }
-sp-npos-elections = { version = "3.0.0", default-features = false, path = "../../primitives/npos-elections" }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-arithmetic = { version = "4.0.0-dev", default-features = false, path = "../../primitives/arithmetic" }
+sp-npos-elections = { version = "4.0.0-dev", default-features = false, path = "../../primitives/npos-elections" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 
 [dev-dependencies]
-sp-npos-elections = { version = "3.0.0", path = "../../primitives/npos-elections" }
-sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
+sp-npos-elections = { version = "4.0.0-dev", path = "../../primitives/npos-elections" }
+sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
 
 [features]
 default = ["std"]
diff --git a/frame/elections-phragmen/Cargo.toml b/frame/elections-phragmen/Cargo.toml
index aa2b564f73f2..dc0088c12a57 100644
--- a/frame/elections-phragmen/Cargo.toml
+++ b/frame/elections-phragmen/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-elections-phragmen"
-version = "4.0.0"
+version = "5.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,21 +14,21 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-npos-elections = { version = "3.0.0", default-features = false, path = "../../primitives/npos-elections" }
-sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
-frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-npos-elections = { version = "4.0.0-dev", default-features = false, path = "../../primitives/npos-elections" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
 log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
 hex-literal = "0.3.1"
-pallet-balances = { version = "3.0.0", path = "../balances" }
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-substrate-test-utils = { version = "3.0.0", path = "../../test-utils" }
+pallet-balances = { version = "4.0.0-dev", path = "../balances" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+substrate-test-utils = { version = "4.0.0-dev", path = "../../test-utils" }
 
 [features]
 default = ["std"]
diff --git a/frame/elections/Cargo.toml b/frame/elections/Cargo.toml
index d4b84f5bb156..b1f49d778050 100644
--- a/frame/elections/Cargo.toml
+++ b/frame/elections/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-elections"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,16 +14,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 
 [dev-dependencies]
 hex-literal = "0.3.1"
-pallet-balances = { version = "3.0.0", path = "../balances" }
+pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/frame/example-offchain-worker/Cargo.toml b/frame/example-offchain-worker/Cargo.toml
index ea9fb9699ec6..c6b13d110951 100644
--- a/frame/example-offchain-worker/Cargo.toml
+++ b/frame/example-offchain-worker/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-example-offchain-worker"
-version = "2.0.1"
+version = "3.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Unlicense"
@@ -14,13 +14,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
-sp-keystore = { version = "0.9.0", path = "../../primitives/keystore", optional = true }
-sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
+sp-keystore = { version = "0.10.0-dev", path = "../../primitives/keystore", optional = true }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 lite-json = { version = "0.1", default-features = false }
 log = { version = "0.4.14", default-features = false }
 
diff --git a/frame/example-parallel/Cargo.toml b/frame/example-parallel/Cargo.toml
index 2c593db7ec9d..ab1b8bfbfae2 100644
--- a/frame/example-parallel/Cargo.toml
+++ b/frame/example-parallel/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-example-parallel"
-version = "2.0.1"
+version = "3.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Unlicense"
@@ -13,13 +13,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
-sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-tasks = { version = "3.0.0", default-features = false, path = "../../primitives/tasks" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-tasks = { version = "4.0.0-dev", default-features = false, path = "../../primitives/tasks" }
 
 [dev-dependencies]
 serde = { version = "1.0.101" }
diff --git a/frame/example/Cargo.toml b/frame/example/Cargo.toml
index 258648b52e5b..08d7af4ef673 100644
--- a/frame/example/Cargo.toml
+++ b/frame/example/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-example"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Unlicense"
@@ -14,17 +14,17 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-pallet-balances = { version = "3.0.0", default-features = false, path = "../balances" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
-frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
+pallet-balances = { version = "4.0.0-dev", default-features = false, path = "../balances" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
 log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
-sp-core = { version = "3.0.0", path = "../../primitives/core", default-features = false }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core", default-features = false }
 
 [features]
 default = ["std"]
diff --git a/frame/executive/Cargo.toml b/frame/executive/Cargo.toml
index a923f926a096..7b5be2ceec10 100644
--- a/frame/executive/Cargo.toml
+++ b/frame/executive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-executive"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,23 +14,23 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-tracing = { version = "3.0.0", default-features = false, path = "../../primitives/tracing" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
-sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-tracing = { version = "4.0.0-dev", default-features = false, path = "../../primitives/tracing" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
 
 [dev-dependencies]
 hex-literal = "0.3.1"
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-sp-io ={ version = "3.0.0", path = "../../primitives/io" }
-pallet-indices = { version = "3.0.0", path = "../indices" }
-pallet-balances = { version = "3.0.0", path = "../balances" }
-pallet-transaction-payment = { version = "3.0.0", path = "../transaction-payment" }
-sp-version = { version = "3.0.0", path = "../../primitives/version" }
-sp-inherents = { version = "3.0.0", path = "../../primitives/inherents" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+sp-io ={ version = "4.0.0-dev", path = "../../primitives/io" }
+pallet-indices = { version = "4.0.0-dev", path = "../indices" }
+pallet-balances = { version = "4.0.0-dev", path = "../balances" }
+pallet-transaction-payment = { version = "4.0.0-dev", path = "../transaction-payment" }
+sp-version = { version = "4.0.0-dev", path = "../../primitives/version" }
+sp-inherents = { version = "4.0.0-dev", path = "../../primitives/inherents" }
 
 [features]
 default = ["std"]
diff --git a/frame/gilt/Cargo.toml b/frame/gilt/Cargo.toml
index 0b40f6ad4d6d..a6e59a2dcd65 100644
--- a/frame/gilt/Cargo.toml
+++ b/frame/gilt/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-gilt"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,17 +14,17 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-arithmetic = { version = "3.0.0", default-features = false, path = "../../primitives/arithmetic" }
-frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-arithmetic = { version = "4.0.0-dev", default-features = false, path = "../../primitives/arithmetic" }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 
 [dev-dependencies]
-sp-io = { version = "3.0.0", path = "../../primitives/io" }
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-pallet-balances = { version = "3.0.0", path = "../balances" }
+sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/frame/grandpa/Cargo.toml b/frame/grandpa/Cargo.toml
index 5c3cac8f8218..9e60ad0fb3c8 100644
--- a/frame/grandpa/Cargo.toml
+++ b/frame/grandpa/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-grandpa"
-version = "3.1.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,31 +14,31 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-application-crypto = { version = "3.0.0", default-features = false, path = "../../primitives/application-crypto" }
-sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
-sp-finality-grandpa = { version = "3.0.0", default-features = false, path = "../../primitives/finality-grandpa" }
-sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
-sp-session = { version = "3.0.0", default-features = false, path = "../../primitives/session" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-staking = { version = "3.0.0", default-features = false, path = "../../primitives/staking" }
-frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-pallet-authorship = { version = "3.0.0", default-features = false, path = "../authorship" }
-pallet-session = { version = "3.0.0", default-features = false, path = "../session" }
+sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../../primitives/application-crypto" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
+sp-finality-grandpa = { version = "4.0.0-dev", default-features = false, path = "../../primitives/finality-grandpa" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
+sp-session = { version = "4.0.0-dev", default-features = false, path = "../../primitives/session" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-staking = { version = "4.0.0-dev", default-features = false, path = "../../primitives/staking" }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
+pallet-authorship = { version = "4.0.0-dev", default-features = false, path = "../authorship" }
+pallet-session = { version = "4.0.0-dev", default-features = false, path = "../session" }
 log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
-frame-benchmarking = { version = "3.1.0", path = "../benchmarking" }
+frame-benchmarking = { version = "4.0.0-dev", path = "../benchmarking" }
 grandpa = { package = "finality-grandpa", version = "0.14.1", features = ["derive-codec"] }
-sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
-pallet-balances = { version = "3.0.0", path = "../balances" }
-pallet-offences = { version = "3.0.0", path = "../offences" }
-pallet-staking = { version = "3.0.0", path = "../staking" }
-pallet-staking-reward-curve = { version = "3.0.0", path = "../staking/reward-curve" }
-pallet-timestamp = { version = "3.0.0", path = "../timestamp" }
-frame-election-provider-support = { version = "3.0.0", path = "../election-provider-support" }
+sp-keyring = { version = "4.0.0-dev", path = "../../primitives/keyring" }
+pallet-balances = { version = "4.0.0-dev", path = "../balances" }
+pallet-offences = { version = "4.0.0-dev", path = "../offences" }
+pallet-staking = { version = "4.0.0-dev", path = "../staking" }
+pallet-staking-reward-curve = { version = "4.0.0-dev", path = "../staking/reward-curve" }
+pallet-timestamp = { version = "4.0.0-dev", path = "../timestamp" }
+frame-election-provider-support = { version = "4.0.0-dev", path = "../election-provider-support" }
 
 [features]
 default = ["std"]
diff --git a/frame/identity/Cargo.toml b/frame/identity/Cargo.toml
index ed905d407d90..b04594b73780 100644
--- a/frame/identity/Cargo.toml
+++ b/frame/identity/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-identity"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,16 +15,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
 enumflags2 = { version = "0.6.2" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 
 [dev-dependencies]
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-pallet-balances = { version = "3.0.0", path = "../balances" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/frame/im-online/Cargo.toml b/frame/im-online/Cargo.toml
index 2e816a6bb856..1208da3b3f3d 100644
--- a/frame/im-online/Cargo.toml
+++ b/frame/im-online/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-im-online"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -13,22 +13,22 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-application-crypto = { version = "3.0.0", default-features = false, path = "../../primitives/application-crypto" }
-pallet-authorship = { version = "3.0.0", default-features = false, path = "../authorship" }
+sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../../primitives/application-crypto" }
+pallet-authorship = { version = "4.0.0-dev", default-features = false, path = "../authorship" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-staking = { version = "3.0.0", default-features = false, path = "../../primitives/staking" }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-staking = { version = "4.0.0-dev", default-features = false, path = "../../primitives/staking" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 log = { version = "0.4.14", default-features = false }
 
-frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
-pallet-session = { version = "3.0.0", path = "../session" }
+pallet-session = { version = "4.0.0-dev", path = "../session" }
 
 [features]
 default = ["std"]
diff --git a/frame/indices/Cargo.toml b/frame/indices/Cargo.toml
index 4b60ec8bc3ca..1ef4527f607b 100644
--- a/frame/indices/Cargo.toml
+++ b/frame/indices/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-indices"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,18 +14,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-keyring = { version = "3.0.0", optional = true, path = "../../primitives/keyring" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+sp-keyring = { version = "4.0.0-dev", optional = true, path = "../../primitives/keyring" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 
-frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
-pallet-balances = { version = "3.0.0", path = "../balances" }
+pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/frame/lottery/Cargo.toml b/frame/lottery/Cargo.toml
index 73de239a4d80..a0368c2e654c 100644
--- a/frame/lottery/Cargo.toml
+++ b/frame/lottery/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-lottery"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,18 +14,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 
-frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
 frame-support-test = { version = "3.0.0", path = "../support/test" }
-pallet-balances = { version = "3.0.0", path = "../balances" }
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-sp-io = { version = "3.0.0", path = "../../primitives/io" }
+pallet-balances = { version = "4.0.0-dev", path = "../balances" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
 serde = { version = "1.0.101" }
 
 [features]
diff --git a/frame/membership/Cargo.toml b/frame/membership/Cargo.toml
index 37f9552598cc..3200d986febe 100644
--- a/frame/membership/Cargo.toml
+++ b/frame/membership/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-membership"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,16 +15,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 log = { version = "0.4.0", default-features = false }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 
-frame-benchmarking = { version = "3.1.0", optional = true, default-features = false, path = "../benchmarking" }
+frame-benchmarking = { version = "4.0.0-dev", optional = true, default-features = false, path = "../benchmarking" }
 
 [dev-dependencies]
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 
 [features]
 default = ["std"]
diff --git a/frame/merkle-mountain-range/Cargo.toml b/frame/merkle-mountain-range/Cargo.toml
index 6ca451c4ab48..03b80a3339e7 100644
--- a/frame/merkle-mountain-range/Cargo.toml
+++ b/frame/merkle-mountain-range/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-mmr"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -13,15 +13,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 mmr-lib = { package = "ckb-merkle-mountain-range", default-features = false, version = "0.3.1" }
-pallet-mmr-primitives = { version = "3.0.0", default-features = false, path = "./primitives" }
-sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
-sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+pallet-mmr-primitives = { version = "4.0.0-dev", default-features = false, path = "./primitives" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 
 [dev-dependencies]
 env_logger = "0.8"
diff --git a/frame/merkle-mountain-range/primitives/Cargo.toml b/frame/merkle-mountain-range/primitives/Cargo.toml
index 62a6f4ff1cde..94b56a00640c 100644
--- a/frame/merkle-mountain-range/primitives/Cargo.toml
+++ b/frame/merkle-mountain-range/primitives/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-mmr-primitives"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -13,13 +13,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-frame-support = { version = "3.0.0", default-features = false, path = "../../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../../system" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../../system" }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-sp-api = { version = "3.0.0", default-features = false, path = "../../../primitives/api" }
-sp-core = { version = "3.0.0", default-features = false, path = "../../../primitives/core" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../../primitives/std" }
+sp-api = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/api" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/core" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/runtime" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/std" }
 log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
diff --git a/frame/merkle-mountain-range/rpc/Cargo.toml b/frame/merkle-mountain-range/rpc/Cargo.toml
index 4730dbc7ea42..38c9bbe8aa13 100644
--- a/frame/merkle-mountain-range/rpc/Cargo.toml
+++ b/frame/merkle-mountain-range/rpc/Cargo.toml
@@ -17,13 +17,13 @@ codec = { package = "parity-scale-codec", version = "2.0.0" }
 jsonrpc-core = "15.1.0"
 jsonrpc-core-client = "15.1.0"
 jsonrpc-derive = "15.1.0"
-pallet-mmr-primitives = { version = "3.0.0", path = "../primitives" }
+pallet-mmr-primitives = { version = "4.0.0-dev", path = "../primitives" }
 serde = { version = "1.0.101", features = ["derive"] }
-sp-api = { version = "3.0.0", path = "../../../primitives/api" }
-sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
-sp-core = { version = "3.0.0", path = "../../../primitives/core" }
-sp-rpc = { version = "3.0.0", path = "../../../primitives/rpc" }
-sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
+sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
+sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
+sp-rpc = { version = "4.0.0-dev", path = "../../../primitives/rpc" }
+sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
 
 [dev-dependencies]
 serde_json = "1.0.41"
diff --git a/frame/metadata/Cargo.toml b/frame/metadata/Cargo.toml
index cede8a836123..57ba40efea99 100644
--- a/frame/metadata/Cargo.toml
+++ b/frame/metadata/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-metadata"
-version = "13.0.0"
+version = "14.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,8 +15,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
 
 [features]
 default = ["std"]
diff --git a/frame/multisig/Cargo.toml b/frame/multisig/Cargo.toml
index 7657f64c819f..f53df2460968 100644
--- a/frame/multisig/Cargo.toml
+++ b/frame/multisig/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-multisig"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,18 +14,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
 
-frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-pallet-balances = { version = "3.0.0", path = "../balances" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/frame/nicks/Cargo.toml b/frame/nicks/Cargo.toml
index 12db6f905f2e..02e64491650c 100644
--- a/frame/nicks/Cargo.toml
+++ b/frame/nicks/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-nicks"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,15 +14,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 
 [dev-dependencies]
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-pallet-balances = { version = "3.0.0", path = "../balances" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/frame/node-authorization/Cargo.toml b/frame/node-authorization/Cargo.toml
index 6e657758e8e9..35b02747e400 100644
--- a/frame/node-authorization/Cargo.toml
+++ b/frame/node-authorization/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-node-authorization"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -13,12 +13,12 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
-sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 log = { version = "0.4.14", default-features = false }
 
 [features]
diff --git a/frame/offences/Cargo.toml b/frame/offences/Cargo.toml
index a34c5f6bc3a3..6d8038605cb2 100644
--- a/frame/offences/Cargo.toml
+++ b/frame/offences/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-offences"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -13,19 +13,19 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-pallet-balances = { version = "3.0.0", default-features = false, path = "../balances" }
+pallet-balances = { version = "4.0.0-dev", default-features = false, path = "../balances" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 serde = { version = "1.0.101", optional = true }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-staking = { version = "3.0.0", default-features = false, path = "../../primitives/staking" }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-staking = { version = "4.0.0-dev", default-features = false, path = "../../primitives/staking" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
-sp-io = { version = "3.0.0", path = "../../primitives/io" }
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 
 [features]
 default = ["std"]
diff --git a/frame/offences/benchmarking/Cargo.toml b/frame/offences/benchmarking/Cargo.toml
index acfb5b1b0dc8..89849d86d749 100644
--- a/frame/offences/benchmarking/Cargo.toml
+++ b/frame/offences/benchmarking/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-offences-benchmarking"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,27 +14,27 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-frame-benchmarking = { version = "3.1.0", default-features = false, path = "../../benchmarking" }
-frame-support = { version = "3.0.0", default-features = false, path = "../../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../../system" }
-pallet-babe = { version = "3.0.0", default-features = false, path = "../../babe" }
-pallet-balances = { version = "3.0.0", default-features = false, path = "../../balances" }
-pallet-grandpa = { version = "3.1.0", default-features = false, path = "../../grandpa" }
-pallet-im-online = { version = "3.0.0", default-features = false, path = "../../im-online" }
-pallet-offences = { version = "3.0.0", default-features = false, features = ["runtime-benchmarks"], path = "../../offences" }
-pallet-session = { version = "3.0.0", default-features = false, path = "../../session" }
-pallet-staking = { version = "3.0.0", default-features = false, features = ["runtime-benchmarks"], path = "../../staking" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
-sp-staking = { version = "3.0.0", default-features = false, path = "../../../primitives/staking" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../../primitives/std" }
-frame-election-provider-support = { version = "3.0.0", default-features = false, path = "../../election-provider-support" }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../../benchmarking" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../../system" }
+pallet-babe = { version = "4.0.0-dev", default-features = false, path = "../../babe" }
+pallet-balances = { version = "4.0.0-dev", default-features = false, path = "../../balances" }
+pallet-grandpa = { version = "4.0.0-dev", default-features = false, path = "../../grandpa" }
+pallet-im-online = { version = "4.0.0-dev", default-features = false, path = "../../im-online" }
+pallet-offences = { version = "4.0.0-dev", default-features = false, features = ["runtime-benchmarks"], path = "../../offences" }
+pallet-session = { version = "4.0.0-dev", default-features = false, path = "../../session" }
+pallet-staking = { version = "4.0.0-dev", default-features = false, features = ["runtime-benchmarks"], path = "../../staking" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/runtime" }
+sp-staking = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/staking" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/std" }
+frame-election-provider-support = { version = "4.0.0-dev", default-features = false, path = "../../election-provider-support" }
 
 [dev-dependencies]
-pallet-staking-reward-curve = { version = "3.0.0", path = "../../staking/reward-curve" }
-pallet-timestamp = { version = "3.0.0", path = "../../timestamp" }
+pallet-staking-reward-curve = { version = "4.0.0-dev", path = "../../staking/reward-curve" }
+pallet-timestamp = { version = "4.0.0-dev", path = "../../timestamp" }
 serde = { version = "1.0.101" }
-sp-core = { version = "3.0.0", path = "../../../primitives/core" }
-sp-io = { version = "3.0.0", path = "../../../primitives/io" }
+sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
+sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
 
 [features]
 default = ["std"]
diff --git a/frame/proxy/Cargo.toml b/frame/proxy/Cargo.toml
index 821d26556c4e..ac33c3d14c8e 100644
--- a/frame/proxy/Cargo.toml
+++ b/frame/proxy/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-proxy"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,19 +14,19 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["max-encoded-len"] }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
-sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 
-frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-pallet-balances = { version = "3.0.0", path = "../balances" }
-pallet-utility = { version = "3.0.0", path = "../utility" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+pallet-balances = { version = "4.0.0-dev", path = "../balances" }
+pallet-utility = { version = "4.0.0-dev", path = "../utility" }
 
 [features]
 default = ["std"]
diff --git a/frame/randomness-collective-flip/Cargo.toml b/frame/randomness-collective-flip/Cargo.toml
index 5ae350ffcac1..016d56142eca 100644
--- a/frame/randomness-collective-flip/Cargo.toml
+++ b/frame/randomness-collective-flip/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-randomness-collective-flip"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,15 +15,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 safe-mix = { version = "1.0", default-features = false }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 
 [dev-dependencies]
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-sp-io = { version = "3.0.0", path = "../../primitives/io" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
 
 [features]
 default = ["std"]
diff --git a/frame/recovery/Cargo.toml b/frame/recovery/Cargo.toml
index acfd2f613f83..e38f1fd35aaf 100644
--- a/frame/recovery/Cargo.toml
+++ b/frame/recovery/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-recovery"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,15 +15,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 enumflags2 = { version = "0.6.2" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 
 [dev-dependencies]
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-pallet-balances = { version = "3.0.0", path = "../balances" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/frame/scheduler/Cargo.toml b/frame/scheduler/Cargo.toml
index 8fb5d148662b..93f76b2369f2 100644
--- a/frame/scheduler/Cargo.toml
+++ b/frame/scheduler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-scheduler"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Unlicense"
@@ -11,18 +11,18 @@ readme = "README.md"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
 log = { version = "0.4.14", default-features = false }
 
-frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
-sp-core = { version = "3.0.0", path = "../../primitives/core", default-features = false }
-substrate-test-utils = { version = "3.0.0", path = "../../test-utils" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core", default-features = false }
+substrate-test-utils = { version = "4.0.0-dev", path = "../../test-utils" }
 
 [features]
 default = ["std"]
diff --git a/frame/scored-pool/Cargo.toml b/frame/scored-pool/Cargo.toml
index 0b2f4a819883..dc85e8d2ca81 100644
--- a/frame/scored-pool/Cargo.toml
+++ b/frame/scored-pool/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-scored-pool"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,15 +14,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 
 [dev-dependencies]
-pallet-balances = { version = "3.0.0", path = "../balances" }
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
+pallet-balances = { version = "4.0.0-dev", path = "../balances" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 
 [features]
 default = ["std"]
diff --git a/frame/session/Cargo.toml b/frame/session/Cargo.toml
index efe7bc133fb4..40f1e58c9283 100644
--- a/frame/session/Cargo.toml
+++ b/frame/session/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-session"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,21 +14,21 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-session = { version = "3.0.0", default-features = false, path = "../../primitives/session" }
-sp-staking = { version = "3.0.0", default-features = false, path = "../../primitives/staking" }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-pallet-timestamp = { version = "3.0.0", default-features = false, path = "../timestamp" }
-sp-trie = { version = "3.0.0", optional = true, default-features = false, path = "../../primitives/trie" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-session = { version = "4.0.0-dev", default-features = false, path = "../../primitives/session" }
+sp-staking = { version = "4.0.0-dev", default-features = false, path = "../../primitives/staking" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
+pallet-timestamp = { version = "4.0.0-dev", default-features = false, path = "../timestamp" }
+sp-trie = { version = "4.0.0-dev", optional = true, default-features = false, path = "../../primitives/trie" }
 log = { version = "0.4.0", default-features = false }
 impl-trait-for-tuples = "0.2.1"
 
 [dev-dependencies]
-sp-application-crypto = { version = "3.0.0", path = "../../primitives/application-crypto" }
+sp-application-crypto = { version = "4.0.0-dev", path = "../../primitives/application-crypto" }
 lazy_static = "1.4.0"
 
 [features]
diff --git a/frame/session/benchmarking/Cargo.toml b/frame/session/benchmarking/Cargo.toml
index 9754c16f3756..58f68899d18f 100644
--- a/frame/session/benchmarking/Cargo.toml
+++ b/frame/session/benchmarking/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-session-benchmarking"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -13,25 +13,25 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-session = { version = "3.0.0", default-features = false, path = "../../../primitives/session" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../../primitives/std" }
-frame-system = { version = "3.0.0", default-features = false, path = "../../system" }
-frame-benchmarking = { version = "3.1.0", default-features = false, path = "../../benchmarking" }
-frame-support = { version = "3.0.0", default-features = false, path = "../../support" }
-pallet-staking = { version = "3.0.0", default-features = false, features = ["runtime-benchmarks"], path = "../../staking" }
-pallet-session = { version = "3.0.0", default-features = false, path = "../../session" }
+sp-session = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/session" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/runtime" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/std" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../../system" }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../../benchmarking" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../../support" }
+pallet-staking = { version = "4.0.0-dev", default-features = false, features = ["runtime-benchmarks"], path = "../../staking" }
+pallet-session = { version = "4.0.0-dev", default-features = false, path = "../../session" }
 rand = { version = "0.7.2", default-features = false }
 
 [dev-dependencies]
 serde = { version = "1.0.101" }
 codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
-sp-core = { version = "3.0.0", path = "../../../primitives/core" }
-pallet-staking-reward-curve = { version = "3.0.0", path = "../../staking/reward-curve" }
-sp-io ={ version = "3.0.0", path = "../../../primitives/io" }
-pallet-timestamp = { version = "3.0.0", path = "../../timestamp" }
-pallet-balances = { version = "3.0.0", path = "../../balances" }
-frame-election-provider-support = { version = "3.0.0", path = "../../election-provider-support" }
+sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
+pallet-staking-reward-curve = { version = "4.0.0-dev", path = "../../staking/reward-curve" }
+sp-io ={ version = "4.0.0-dev", path = "../../../primitives/io" }
+pallet-timestamp = { version = "4.0.0-dev", path = "../../timestamp" }
+pallet-balances = { version = "4.0.0-dev", path = "../../balances" }
+frame-election-provider-support = { version = "4.0.0-dev", path = "../../election-provider-support" }
 
 [features]
 default = ["std"]
diff --git a/frame/society/Cargo.toml b/frame/society/Cargo.toml
index f9c299006198..b058733b3ce4 100644
--- a/frame/society/Cargo.toml
+++ b/frame/society/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-society"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,17 +14,17 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 rand_chacha = { version = "0.2", default-features = false }
 
 [dev-dependencies]
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-sp-io ={ version = "3.0.0", path = "../../primitives/io" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+sp-io ={ version = "4.0.0-dev", path = "../../primitives/io" }
 frame-support-test = { version = "3.0.0", path = "../support/test" }
-pallet-balances = { version = "3.0.0", path = "../balances" }
+pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/frame/staking/Cargo.toml b/frame/staking/Cargo.toml
index 908e361e667e..af5b5a976d66 100644
--- a/frame/staking/Cargo.toml
+++ b/frame/staking/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-staking"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -16,33 +16,33 @@ targets = ["x86_64-unknown-linux-gnu"]
 static_assertions = "1.1.0"
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-io ={ version = "3.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-staking = { version = "3.0.0", default-features = false, path = "../../primitives/staking" }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-pallet-session = { version = "3.0.0", default-features = false, features = ["historical"], path = "../session" }
-pallet-authorship = { version = "3.0.0", default-features = false, path = "../authorship" }
-sp-application-crypto = { version = "3.0.0", default-features = false, path = "../../primitives/application-crypto" }
-frame-election-provider-support = { version = "3.0.0", default-features = false, path = "../election-provider-support" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-io ={ version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-staking = { version = "4.0.0-dev", default-features = false, path = "../../primitives/staking" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
+pallet-session = { version = "4.0.0-dev", default-features = false, features = ["historical"], path = "../session" }
+pallet-authorship = { version = "4.0.0-dev", default-features = false, path = "../authorship" }
+sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../../primitives/application-crypto" }
+frame-election-provider-support = { version = "4.0.0-dev", default-features = false, path = "../election-provider-support" }
 log = { version = "0.4.14", default-features = false }
 paste = "1.0"
 
 # Optional imports for benchmarking
-frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
 rand_chacha = { version = "0.2", default-features = false, optional = true }
 
 [dev-dependencies]
-sp-storage = { version = "3.0.0", path = "../../primitives/storage" }
-sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-pallet-balances = { version = "3.0.0", path = "../balances" }
-pallet-timestamp = { version = "3.0.0", path = "../timestamp" }
-pallet-staking-reward-curve = { version = "3.0.0",  path = "../staking/reward-curve" }
-substrate-test-utils = { version = "3.0.0", path = "../../test-utils" }
-frame-benchmarking = { version = "3.1.0", path = "../benchmarking" }
-frame-election-provider-support = { version = "3.0.0", features = ["runtime-benchmarks"], path = "../election-provider-support" }
+sp-storage = { version = "4.0.0-dev", path = "../../primitives/storage" }
+sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+pallet-balances = { version = "4.0.0-dev", path = "../balances" }
+pallet-timestamp = { version = "4.0.0-dev", path = "../timestamp" }
+pallet-staking-reward-curve = { version = "4.0.0-dev",  path = "../staking/reward-curve" }
+substrate-test-utils = { version = "4.0.0-dev", path = "../../test-utils" }
+frame-benchmarking = { version = "4.0.0-dev", path = "../benchmarking" }
+frame-election-provider-support = { version = "4.0.0-dev", features = ["runtime-benchmarks"], path = "../election-provider-support" }
 rand_chacha = { version = "0.2" }
 parking_lot = "0.11.1"
 hex = "0.4"
diff --git a/frame/staking/reward-curve/Cargo.toml b/frame/staking/reward-curve/Cargo.toml
index fe5e0f4a947a..3b4b9db452ba 100644
--- a/frame/staking/reward-curve/Cargo.toml
+++ b/frame/staking/reward-curve/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-staking-reward-curve"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -21,4 +21,4 @@ proc-macro2 = "1.0.6"
 proc-macro-crate = "1.0.0"
 
 [dev-dependencies]
-sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
+sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
diff --git a/frame/staking/reward-fn/Cargo.toml b/frame/staking/reward-fn/Cargo.toml
index 15b17a5e716c..076e05bf2a61 100644
--- a/frame/staking/reward-fn/Cargo.toml
+++ b/frame/staking/reward-fn/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-staking-reward-fn"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [lib]
 
 [dependencies]
-sp-arithmetic = { version = "3.0.0", default-features = false, path = "../../../primitives/arithmetic" }
+sp-arithmetic = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/arithmetic" }
 log = { version = "0.4.14", default-features = false }
 
 [features]
diff --git a/frame/sudo/Cargo.toml b/frame/sudo/Cargo.toml
index a73dfaeb1d98..f19afd2d61a0 100644
--- a/frame/sudo/Cargo.toml
+++ b/frame/sudo/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-sudo"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,14 +14,14 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 
 [dev-dependencies]
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 
 [features]
 default = ["std"]
diff --git a/frame/support/Cargo.toml b/frame/support/Cargo.toml
index d87f1b1ef307..72fd4f9cd6b5 100644
--- a/frame/support/Cargo.toml
+++ b/frame/support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-support"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,19 +15,19 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
-frame-metadata = { version = "13.0.0", default-features = false, path = "../metadata" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-tracing = { version = "3.0.0", default-features = false, path = "../../primitives/tracing" }
-sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
-sp-arithmetic = { version = "3.0.0", default-features = false, path = "../../primitives/arithmetic" }
-sp-inherents = { version = "3.0.0", default-features = false, path = "../../primitives/inherents" }
-sp-staking = { version = "3.0.0", default-features = false, path = "../../primitives/staking" }
-frame-support-procedural = { version = "3.0.0", default-features = false, path = "./procedural" }
+frame-metadata = { version = "14.0.0-dev", default-features = false, path = "../metadata" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-tracing = { version = "4.0.0-dev", default-features = false, path = "../../primitives/tracing" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
+sp-arithmetic = { version = "4.0.0-dev", default-features = false, path = "../../primitives/arithmetic" }
+sp-inherents = { version = "4.0.0-dev", default-features = false, path = "../../primitives/inherents" }
+sp-staking = { version = "4.0.0-dev", default-features = false, path = "../../primitives/staking" }
+frame-support-procedural = { version = "4.0.0-dev", default-features = false, path = "./procedural" }
 paste = "1.0"
 once_cell = { version = "1", default-features = false, optional = true }
-sp-state-machine = { version = "0.9.0", optional = true, path = "../../primitives/state-machine" }
+sp-state-machine = { version = "0.10.0-dev", optional = true, path = "../../primitives/state-machine" }
 bitflags = "1.2"
 impl-trait-for-tuples = "0.2.1"
 smallvec = "1.4.1"
@@ -35,7 +35,7 @@ log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
 pretty_assertions = "0.6.1"
-frame-system = { version = "3.0.0", path = "../system" }
+frame-system = { version = "4.0.0-dev", path = "../system" }
 parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
 
 [features]
diff --git a/frame/support/procedural/Cargo.toml b/frame/support/procedural/Cargo.toml
index 4a00a24e3849..ba71a7d12c62 100644
--- a/frame/support/procedural/Cargo.toml
+++ b/frame/support/procedural/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-support-procedural"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 proc-macro = true
 
 [dependencies]
-frame-support-procedural-tools = { version = "3.0.0", path = "./tools" }
+frame-support-procedural-tools = { version = "4.0.0-dev", path = "./tools" }
 proc-macro2 = "1.0.6"
 quote = "1.0.3"
 Inflector = "0.11.4"
diff --git a/frame/support/procedural/tools/Cargo.toml b/frame/support/procedural/tools/Cargo.toml
index 316aae0a17a4..2ff49f96e4da 100644
--- a/frame/support/procedural/tools/Cargo.toml
+++ b/frame/support/procedural/tools/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-support-procedural-tools"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/frame/support/test/Cargo.toml b/frame/support/test/Cargo.toml
index ce5c8ea7de1f..001c88ba48fb 100644
--- a/frame/support/test/Cargo.toml
+++ b/frame/support/test/Cargo.toml
@@ -14,17 +14,17 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", default-features = false, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-io = { version = "3.0.0", path = "../../../primitives/io", default-features = false }
-sp-state-machine = { version = "0.9.0", optional = true, path = "../../../primitives/state-machine" }
-frame-support = { version = "3.0.0", default-features = false, path = "../" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
-sp-core = { version = "3.0.0", default-features = false, path = "../../../primitives/core" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../../primitives/std" }
+sp-io = { version = "4.0.0-dev", path = "../../../primitives/io", default-features = false }
+sp-state-machine = { version = "0.10.0-dev", optional = true, path = "../../../primitives/state-machine" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/runtime" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/core" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/std" }
 trybuild = "1.0.42"
 pretty_assertions = "0.6.1"
 rustversion = "1.0.0"
-frame-metadata = { version = "13.0.0", default-features = false, path = "../../metadata" }
-frame-system = { version = "3.0.0", default-features = false, path = "../../system" }
+frame-metadata = { version = "14.0.0-dev", default-features = false, path = "../../metadata" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../../system" }
 
 [features]
 default = ["std"]
diff --git a/frame/system/Cargo.toml b/frame/system/Cargo.toml
index 4306dbd64481..61e35c552a3e 100644
--- a/frame/system/Cargo.toml
+++ b/frame/system/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-system"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,18 +15,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "3.0.0", path = "../../primitives/io", default-features = false }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-version = { version = "3.0.0", default-features = false, path = "../../primitives/version" }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "4.0.0-dev", path = "../../primitives/io", default-features = false }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-version = { version = "4.0.0-dev", default-features = false, path = "../../primitives/version" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
 impl-trait-for-tuples = "0.2.1"
 log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
 criterion = "0.3.3"
-sp-externalities = { version = "0.9.0", path = "../../primitives/externalities" }
+sp-externalities = { version = "0.10.0-dev", path = "../../primitives/externalities" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 
 [features]
diff --git a/frame/system/benchmarking/Cargo.toml b/frame/system/benchmarking/Cargo.toml
index 1a9317c69bf4..b6a5447199b1 100644
--- a/frame/system/benchmarking/Cargo.toml
+++ b/frame/system/benchmarking/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-system-benchmarking"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,16 +14,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-std = { version = "3.0.0", default-features = false, path = "../../../primitives/std" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
-frame-benchmarking = { version = "3.1.0", default-features = false, path = "../../benchmarking" }
-frame-system = { version = "3.0.0", default-features = false, path = "../../system" }
-frame-support = { version = "3.0.0", default-features = false, path = "../../support" }
-sp-core = { version = "3.0.0", default-features = false, path = "../../../primitives/core" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/std" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/runtime" }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../../benchmarking" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../../system" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../../support" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/core" }
 
 [dev-dependencies]
 serde = { version = "1.0.101" }
-sp-io ={ version = "3.0.0", path = "../../../primitives/io" }
+sp-io ={ version = "4.0.0-dev", path = "../../../primitives/io" }
 
 [features]
 default = ["std"]
diff --git a/frame/system/rpc/runtime-api/Cargo.toml b/frame/system/rpc/runtime-api/Cargo.toml
index 56619d59ddca..fce29612b4d8 100644
--- a/frame/system/rpc/runtime-api/Cargo.toml
+++ b/frame/system/rpc/runtime-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-system-rpc-runtime-api"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-api = { version = "3.0.0", default-features = false, path = "../../../../primitives/api" }
+sp-api = { version = "4.0.0-dev", default-features = false, path = "../../../../primitives/api" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 
 [features]
diff --git a/frame/timestamp/Cargo.toml b/frame/timestamp/Cargo.toml
index 7a57c5e88a6f..7e8cd7dd751e 100644
--- a/frame/timestamp/Cargo.toml
+++ b/frame/timestamp/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-timestamp"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -16,20 +16,20 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io", optional = true }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-inherents = { version = "3.0.0", default-features = false, path = "../../primitives/inherents" }
-frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-sp-timestamp = { version = "3.0.0", default-features = false, path = "../../primitives/timestamp" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io", optional = true }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-inherents = { version = "4.0.0-dev", default-features = false, path = "../../primitives/inherents" }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
+sp-timestamp = { version = "4.0.0-dev", default-features = false, path = "../../primitives/timestamp" }
 impl-trait-for-tuples = "0.2.1"
 log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
-sp-io ={ version = "3.0.0", path = "../../primitives/io" }
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
+sp-io ={ version = "4.0.0-dev", path = "../../primitives/io" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 
 [features]
 default = ["std"]
diff --git a/frame/tips/Cargo.toml b/frame/tips/Cargo.toml
index a16c9b91327e..32deca37e741 100644
--- a/frame/tips/Cargo.toml
+++ b/frame/tips/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-tips"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,19 +15,19 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-pallet-treasury = { version = "3.0.0", default-features = false, path = "../treasury" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
+pallet-treasury = { version = "4.0.0-dev", default-features = false, path = "../treasury" }
 
-frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
-sp-io ={ version = "3.0.0", path = "../../primitives/io" }
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-sp-storage = { version = "3.0.0", path = "../../primitives/storage" }
-pallet-balances = { version = "3.0.0", path = "../balances" }
+sp-io ={ version = "4.0.0-dev", path = "../../primitives/io" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+sp-storage = { version = "4.0.0-dev", path = "../../primitives/storage" }
+pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/frame/transaction-payment/Cargo.toml b/frame/transaction-payment/Cargo.toml
index c5c7c34a7271..6406b41a5195 100644
--- a/frame/transaction-payment/Cargo.toml
+++ b/frame/transaction-payment/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-transaction-payment"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -17,18 +17,18 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
 serde = { version = "1.0.101", optional = true }
 smallvec = "1.4.1"
 
-sp-core = { version = "3.0.0", path = "../../primitives/core", default-features = false }
-sp-io = { version = "3.0.0", path = "../../primitives/io", default-features = false }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core", default-features = false }
+sp-io = { version = "4.0.0-dev", path = "../../primitives/io", default-features = false }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 
 [dev-dependencies]
 serde_json = "1.0.41"
-sp-storage = { version = "3.0.0", path = "../../primitives/storage" }
-pallet-balances = { version = "3.0.0", path = "../balances" }
+sp-storage = { version = "4.0.0-dev", path = "../../primitives/storage" }
+pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/frame/transaction-payment/rpc/Cargo.toml b/frame/transaction-payment/rpc/Cargo.toml
index b5e0fd91e1c5..785a7c9c96ab 100644
--- a/frame/transaction-payment/rpc/Cargo.toml
+++ b/frame/transaction-payment/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-transaction-payment-rpc"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -18,9 +18,9 @@ jsonrpc-core = "15.1.0"
 jsonrpc-core-client = "15.1.0"
 jsonrpc-derive = "15.1.0"
 
-sp-api = { version = "3.0.0", path = "../../../primitives/api" }
-sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
-sp-core = { version = "3.0.0", path = "../../../primitives/core" }
-sp-rpc = { version = "3.0.0", path = "../../../primitives/rpc" }
-sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
-pallet-transaction-payment-rpc-runtime-api = { version = "3.0.0", path = "./runtime-api" }
+sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
+sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
+sp-rpc = { version = "4.0.0-dev", path = "../../../primitives/rpc" }
+sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
+pallet-transaction-payment-rpc-runtime-api = { version = "4.0.0-dev", path = "./runtime-api" }
diff --git a/frame/transaction-payment/rpc/runtime-api/Cargo.toml b/frame/transaction-payment/rpc/runtime-api/Cargo.toml
index bb84364a9dfe..2f78f2439c60 100644
--- a/frame/transaction-payment/rpc/runtime-api/Cargo.toml
+++ b/frame/transaction-payment/rpc/runtime-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-transaction-payment-rpc-runtime-api"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,9 +14,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-api = { version = "3.0.0", default-features = false, path = "../../../../primitives/api" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../../../primitives/runtime" }
-pallet-transaction-payment = { version = "3.0.0", default-features = false, path = "../../../transaction-payment" }
+sp-api = { version = "4.0.0-dev", default-features = false, path = "../../../../primitives/api" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../../primitives/runtime" }
+pallet-transaction-payment = { version = "4.0.0-dev", default-features = false, path = "../../../transaction-payment" }
 
 [features]
 default = ["std"]
diff --git a/frame/transaction-storage/Cargo.toml b/frame/transaction-storage/Cargo.toml
index 8892e234d436..4504b9a07e28 100644
--- a/frame/transaction-storage/Cargo.toml
+++ b/frame/transaction-storage/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-transaction-storage"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Unlicense"
@@ -16,20 +16,20 @@ targets = ["x86_64-unknown-linux-gnu"]
 serde = { version = "1.0.101", optional = true }
 hex-literal = { version = "0.3.1", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-pallet-balances = { version = "3.0.0", default-features = false, path = "../balances" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
-sp-inherents = { version = "3.0.0", default-features = false, path = "../../primitives/inherents" }
-sp-transaction-storage-proof = { version = "3.0.0", default-features = false, path = "../../primitives/transaction-storage-proof" }
-frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
+pallet-balances = { version = "4.0.0-dev", default-features = false, path = "../balances" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
+sp-inherents = { version = "4.0.0-dev", default-features = false, path = "../../primitives/inherents" }
+sp-transaction-storage-proof = { version = "4.0.0-dev", default-features = false, path = "../../primitives/transaction-storage-proof" }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
 frame-support-test = { version = "3.0.0", path = "../support/test" }
-sp-transaction-storage-proof = { version = "3.0.0", default-features = true, path = "../../primitives/transaction-storage-proof" }
-sp-core = { version = "3.0.0", path = "../../primitives/core", default-features = false }
+sp-transaction-storage-proof = { version = "4.0.0-dev", default-features = true, path = "../../primitives/transaction-storage-proof" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core", default-features = false }
 
 [features]
 default = ["std"]
diff --git a/frame/treasury/Cargo.toml b/frame/treasury/Cargo.toml
index da0ffcb725c9..339ce196071a 100644
--- a/frame/treasury/Cargo.toml
+++ b/frame/treasury/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-treasury"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,19 +15,19 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-pallet-balances = { version = "3.0.0", default-features = false, path = "../balances" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
+pallet-balances = { version = "4.0.0-dev", default-features = false, path = "../balances" }
 impl-trait-for-tuples = "0.2.1"
 
-frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
-sp-io ={ version = "3.0.0", path = "../../primitives/io" }
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-sp-storage = { version = "3.0.0", path = "../../primitives/storage" }
+sp-io ={ version = "4.0.0-dev", path = "../../primitives/io" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+sp-storage = { version = "4.0.0-dev", path = "../../primitives/storage" }
 
 [features]
 default = ["std"]
diff --git a/frame/try-runtime/Cargo.toml b/frame/try-runtime/Cargo.toml
index 9c1919d380b8..b9eac961cf22 100644
--- a/frame/try-runtime/Cargo.toml
+++ b/frame/try-runtime/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-try-runtime"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,11 +15,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 
-sp-api = { version = "3.0.0", path = "../../primitives/api", default-features = false }
-sp-std = { version = "3.0.0", path = "../../primitives/std" , default-features = false }
-sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" , default-features = false }
+sp-api = { version = "4.0.0-dev", path = "../../primitives/api", default-features = false }
+sp-std = { version = "4.0.0-dev", path = "../../primitives/std" , default-features = false }
+sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" , default-features = false }
 
-frame-support = { version = "3.0.0", path = "../support", default-features = false }
+frame-support = { version = "4.0.0-dev", path = "../support", default-features = false }
 
 [features]
 default = [ "std" ]
diff --git a/frame/uniques/Cargo.toml b/frame/uniques/Cargo.toml
index f007744dc64a..53069b5401df 100644
--- a/frame/uniques/Cargo.toml
+++ b/frame/uniques/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-uniques"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,18 +14,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
-sp-std = { version = "3.0.0", path = "../../primitives/std" }
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-sp-io = { version = "3.0.0", path = "../../primitives/io" }
-pallet-balances = { version = "3.0.0", path = "../balances" }
+sp-std = { version = "4.0.0-dev", path = "../../primitives/std" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
+pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/frame/utility/Cargo.toml b/frame/utility/Cargo.toml
index 1eb92df4ecaa..8f9e18c610fb 100644
--- a/frame/utility/Cargo.toml
+++ b/frame/utility/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-utility"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,18 +14,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
 
-frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-pallet-balances = { version = "3.0.0", path = "../balances" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/frame/vesting/Cargo.toml b/frame/vesting/Cargo.toml
index 25890fea038d..f035bcf7d007 100644
--- a/frame/vesting/Cargo.toml
+++ b/frame/vesting/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-vesting"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,17 +15,17 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 enumflags2 = { version = "0.6.2" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-frame-support = { version = "3.0.0", default-features = false, path = "../support" }
-frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
-sp-io = { version = "3.0.0", path = "../../primitives/io" }
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-pallet-balances = { version = "3.0.0", path = "../balances" }
-sp-storage = { version = "3.0.0", path = "../../primitives/storage" }
+sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+pallet-balances = { version = "4.0.0-dev", path = "../balances" }
+sp-storage = { version = "4.0.0-dev", path = "../../primitives/storage" }
 hex-literal = "0.3.1"
 
 [features]
diff --git a/primitives/api/Cargo.toml b/primitives/api/Cargo.toml
index c284d1f4791e..07f7e100e168 100644
--- a/primitives/api/Cargo.toml
+++ b/primitives/api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-api"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,12 +14,12 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-api-proc-macro = { version = "3.0.0", path = "proc-macro" }
-sp-core = { version = "3.0.0", default-features = false, path = "../core" }
-sp-std = { version = "3.0.0", default-features = false, path = "../std" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../runtime" }
-sp-version = { version = "3.0.0", default-features = false, path = "../version" }
-sp-state-machine = { version = "0.9.0", optional = true, path = "../state-machine" }
+sp-api-proc-macro = { version = "4.0.0-dev", path = "proc-macro" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../core" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../runtime" }
+sp-version = { version = "4.0.0-dev", default-features = false, path = "../version" }
+sp-state-machine = { version = "0.10.0-dev", optional = true, path = "../state-machine" }
 hash-db = { version = "0.15.2", optional = true }
 thiserror = { version = "1.0.21", optional = true }
 
diff --git a/primitives/api/proc-macro/Cargo.toml b/primitives/api/proc-macro/Cargo.toml
index d07285fe215a..2c47554aef42 100644
--- a/primitives/api/proc-macro/Cargo.toml
+++ b/primitives/api/proc-macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-api-proc-macro"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/api/test/Cargo.toml b/primitives/api/test/Cargo.toml
index d0c45fb7545b..5c2250a2ad4c 100644
--- a/primitives/api/test/Cargo.toml
+++ b/primitives/api/test/Cargo.toml
@@ -12,16 +12,16 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-api = { version = "3.0.0", path = "../" }
+sp-api = { version = "4.0.0-dev", path = "../" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
-sp-version = { version = "3.0.0", path = "../../version" }
-sp-tracing = { version = "3.0.0", path = "../../tracing" }
-sp-runtime = { version = "3.0.0", path = "../../runtime" }
-sp-blockchain = { version = "3.0.0", path = "../../blockchain" }
-sp-consensus = { version = "0.9.0", path = "../../consensus/common" }
-sc-block-builder = { version = "0.9.0", path = "../../../client/block-builder" }
+sp-version = { version = "4.0.0-dev", path = "../../version" }
+sp-tracing = { version = "4.0.0-dev", path = "../../tracing" }
+sp-runtime = { version = "4.0.0-dev", path = "../../runtime" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../blockchain" }
+sp-consensus = { version = "0.10.0-dev", path = "../../consensus/common" }
+sc-block-builder = { version = "0.10.0-dev", path = "../../../client/block-builder" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-sp-state-machine = { version = "0.9.0", path = "../../state-machine" }
+sp-state-machine = { version = "0.10.0-dev", path = "../../state-machine" }
 trybuild = "1.0.42"
 rustversion = "1.0.0"
 
@@ -29,7 +29,7 @@ rustversion = "1.0.0"
 criterion = "0.3.0"
 futures = "0.3.9"
 log = "0.4.14"
-sp-core = { version = "3.0.0", path = "../../core" }
+sp-core = { version = "4.0.0-dev", path = "../../core" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
 
 [[bench]]
diff --git a/primitives/application-crypto/Cargo.toml b/primitives/application-crypto/Cargo.toml
index 050d2468aa00..3eee10d8c6f9 100644
--- a/primitives/application-crypto/Cargo.toml
+++ b/primitives/application-crypto/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-application-crypto"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 description = "Provides facilities for generating application specific crypto wrapper types."
@@ -15,11 +15,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 
 [dependencies]
-sp-core = { version = "3.0.0", default-features = false, path = "../core" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../core" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-sp-std = { version = "3.0.0", default-features = false, path = "../std" }
-sp-io = { version = "3.0.0", default-features = false, path = "../io" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../io" }
 
 [features]
 default = [ "std" ]
diff --git a/primitives/application-crypto/test/Cargo.toml b/primitives/application-crypto/test/Cargo.toml
index 92a2ea8f3b8c..468bfee3cc01 100644
--- a/primitives/application-crypto/test/Cargo.toml
+++ b/primitives/application-crypto/test/Cargo.toml
@@ -13,9 +13,9 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-core = { version = "3.0.0", default-features = false, path = "../../core" }
-sp-keystore = { version = "0.9.0", path = "../../keystore", default-features = false }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../core" }
+sp-keystore = { version = "0.10.0-dev", path = "../../keystore", default-features = false }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
-sp-runtime = { version = "3.0.0", path = "../../runtime" }
-sp-api = { version = "3.0.0", path = "../../api" }
-sp-application-crypto = { version = "3.0.0", path = "../" }
+sp-runtime = { version = "4.0.0-dev", path = "../../runtime" }
+sp-api = { version = "4.0.0-dev", path = "../../api" }
+sp-application-crypto = { version = "4.0.0-dev", path = "../" }
diff --git a/primitives/arithmetic/Cargo.toml b/primitives/arithmetic/Cargo.toml
index fa3c3b358f3a..77f298ad46f1 100644
--- a/primitives/arithmetic/Cargo.toml
+++ b/primitives/arithmetic/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-arithmetic"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -19,7 +19,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
 integer-sqrt = "0.1.2"
 static_assertions = "1.1.0"
 num-traits = { version = "0.2.8", default-features = false }
-sp-std = { version = "3.0.0", default-features = false, path = "../std" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 sp-debug-derive = { version = "3.0.0", default-features = false, path = "../debug-derive" }
 
diff --git a/primitives/arithmetic/fuzzer/Cargo.toml b/primitives/arithmetic/fuzzer/Cargo.toml
index c79edb99fb49..14f75132afb8 100644
--- a/primitives/arithmetic/fuzzer/Cargo.toml
+++ b/primitives/arithmetic/fuzzer/Cargo.toml
@@ -14,7 +14,7 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-arithmetic = { version = "3.0.0", path = ".." }
+sp-arithmetic = { version = "4.0.0-dev", path = ".." }
 honggfuzz = "0.5.49"
 primitive-types = "0.10.0"
 num-bigint = "0.2"
diff --git a/primitives/authority-discovery/Cargo.toml b/primitives/authority-discovery/Cargo.toml
index a32b13ca728d..c900324d8551 100644
--- a/primitives/authority-discovery/Cargo.toml
+++ b/primitives/authority-discovery/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-authority-discovery"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Authority discovery primitives"
 edition = "2018"
@@ -13,11 +13,11 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-application-crypto = { version = "3.0.0", default-features = false, path = "../application-crypto" }
+sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../application-crypto" }
 codec = { package = "parity-scale-codec", default-features = false, version = "2.0.0" }
-sp-std = { version = "3.0.0", default-features = false, path = "../std" }
-sp-api = { version = "3.0.0", default-features = false, path = "../api" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../runtime" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
+sp-api = { version = "4.0.0-dev", default-features = false, path = "../api" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../runtime" }
 
 [features]
 default = ["std"]
diff --git a/primitives/authorship/Cargo.toml b/primitives/authorship/Cargo.toml
index a9428f8422f5..f6021bd7a2ab 100644
--- a/primitives/authorship/Cargo.toml
+++ b/primitives/authorship/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-authorship"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Authorship primitives"
 edition = "2018"
@@ -13,9 +13,9 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-inherents = { version = "3.0.0", default-features = false, path = "../inherents" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../runtime" }
-sp-std = { version = "3.0.0", default-features = false, path = "../std" }
+sp-inherents = { version = "4.0.0-dev", default-features = false, path = "../inherents" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../runtime" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 async-trait = { version = "0.1.48", optional = true }
 
diff --git a/primitives/block-builder/Cargo.toml b/primitives/block-builder/Cargo.toml
index 6081e872786e..d7fa0f2ef85c 100644
--- a/primitives/block-builder/Cargo.toml
+++ b/primitives/block-builder/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-block-builder"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -13,11 +13,11 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-runtime = { version = "3.0.0", default-features = false, path = "../runtime" }
-sp-api = { version = "3.0.0", default-features = false, path = "../api" }
-sp-std = { version = "3.0.0", default-features = false, path = "../std" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../runtime" }
+sp-api = { version = "4.0.0-dev", default-features = false, path = "../api" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-inherents = { version = "3.0.0", default-features = false, path = "../inherents" }
+sp-inherents = { version = "4.0.0-dev", default-features = false, path = "../inherents" }
 
 [features]
 default = [ "std" ]
diff --git a/primitives/blockchain/Cargo.toml b/primitives/blockchain/Cargo.toml
index c37686c0df73..f3bbde497225 100644
--- a/primitives/blockchain/Cargo.toml
+++ b/primitives/blockchain/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-blockchain"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -20,8 +20,8 @@ parking_lot = "0.11.1"
 thiserror = "1.0.21"
 futures = "0.3.9"
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-consensus = { version = "0.9.0", path = "../consensus/common" }
-sp-runtime = { version = "3.0.0", path = "../runtime" }
-sp-state-machine = { version = "0.9.0", path = "../state-machine" }
-sp-database = { version = "3.0.0", path = "../database" }
-sp-api = { version = "3.0.0", path = "../api" }
+sp-consensus = { version = "0.10.0-dev", path = "../consensus/common" }
+sp-runtime = { version = "4.0.0-dev", path = "../runtime" }
+sp-state-machine = { version = "0.10.0-dev", path = "../state-machine" }
+sp-database = { version = "4.0.0-dev", path = "../database" }
+sp-api = { version = "4.0.0-dev", path = "../api" }
diff --git a/primitives/consensus/aura/Cargo.toml b/primitives/consensus/aura/Cargo.toml
index 2ae4259a21e5..f989b2a1897d 100644
--- a/primitives/consensus/aura/Cargo.toml
+++ b/primitives/consensus/aura/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-consensus-aura"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Primitives for Aura consensus"
 edition = "2018"
@@ -13,15 +13,15 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-application-crypto = { version = "3.0.0", default-features = false, path = "../../application-crypto" }
+sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../../application-crypto" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-std = { version = "3.0.0", default-features = false, path = "../../std" }
-sp-api = { version = "3.0.0", default-features = false, path = "../../api" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../runtime" }
-sp-inherents = { version = "3.0.0", default-features = false, path = "../../inherents" }
-sp-timestamp = { version = "3.0.0", default-features = false, path = "../../timestamp" }
-sp-consensus-slots = { version = "0.9.0", default-features = false, path = "../slots" }
-sp-consensus = { version = "0.9.0", path = "../common", optional = true }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../std" }
+sp-api = { version = "4.0.0-dev", default-features = false, path = "../../api" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../runtime" }
+sp-inherents = { version = "4.0.0-dev", default-features = false, path = "../../inherents" }
+sp-timestamp = { version = "4.0.0-dev", default-features = false, path = "../../timestamp" }
+sp-consensus-slots = { version = "0.10.0-dev", default-features = false, path = "../slots" }
+sp-consensus = { version = "0.10.0-dev", path = "../common", optional = true }
 async-trait = { version = "0.1.48", optional = true }
 
 [features]
diff --git a/primitives/consensus/babe/Cargo.toml b/primitives/consensus/babe/Cargo.toml
index 0fc09e11032b..aa5f29db0df7 100644
--- a/primitives/consensus/babe/Cargo.toml
+++ b/primitives/consensus/babe/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-consensus-babe"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Primitives for BABE consensus"
 edition = "2018"
@@ -13,19 +13,19 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-application-crypto = { version = "3.0.0", default-features = false, path = "../../application-crypto" }
+sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../../application-crypto" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 merlin = { version = "2.0", default-features = false }
-sp-std = { version = "3.0.0", default-features = false, path = "../../std" }
-sp-api = { version = "3.0.0", default-features = false, path = "../../api" }
-sp-consensus = { version = "0.9.0", optional = true, path = "../common" }
-sp-consensus-slots = { version = "0.9.0", default-features = false, path = "../slots" }
-sp-consensus-vrf = { version = "0.9.0", path = "../vrf", default-features = false }
-sp-core = { version = "3.0.0", default-features = false, path = "../../core" }
-sp-inherents = { version = "3.0.0", default-features = false, path = "../../inherents" }
-sp-keystore = { version = "0.9.0", default-features = false, path = "../../keystore", optional = true }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../runtime" }
-sp-timestamp = { version = "3.0.0", path = "../../timestamp", optional = true }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../std" }
+sp-api = { version = "4.0.0-dev", default-features = false, path = "../../api" }
+sp-consensus = { version = "0.10.0-dev", optional = true, path = "../common" }
+sp-consensus-slots = { version = "0.10.0-dev", default-features = false, path = "../slots" }
+sp-consensus-vrf = { version = "0.10.0-dev", path = "../vrf", default-features = false }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../core" }
+sp-inherents = { version = "4.0.0-dev", default-features = false, path = "../../inherents" }
+sp-keystore = { version = "0.10.0-dev", default-features = false, path = "../../keystore", optional = true }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../runtime" }
+sp-timestamp = { version = "4.0.0-dev", path = "../../timestamp", optional = true }
 serde = { version = "1.0.123", features = ["derive"], optional = true }
 async-trait = { version = "0.1.48", optional = true }
 
diff --git a/primitives/consensus/common/Cargo.toml b/primitives/consensus/common/Cargo.toml
index 038a28ddab35..07cc36e2e31e 100644
--- a/primitives/consensus/common/Cargo.toml
+++ b/primitives/consensus/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-consensus"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -18,17 +18,17 @@ targets = ["x86_64-unknown-linux-gnu"]
 thiserror = "1.0.21"
 libp2p = { version = "0.37.1", default-features = false }
 log = "0.4.8"
-sp-core = { path= "../../core", version = "3.0.0"}
-sp-inherents = { version = "3.0.0", path = "../../inherents" }
-sp-state-machine = { version = "0.9.0", path = "../../state-machine" }
+sp-core = { path= "../../core", version = "4.0.0-dev"}
+sp-inherents = { version = "4.0.0-dev", path = "../../inherents" }
+sp-state-machine = { version = "0.10.0-dev", path = "../../state-machine" }
 futures = { version = "0.3.1", features = ["thread-pool"] }
 futures-timer = "3.0.1"
-sp-std = { version = "3.0.0", path = "../../std" }
-sp-version = { version = "3.0.0", path = "../../version" }
-sp-runtime = { version = "3.0.0", path = "../../runtime" }
-sp-utils = { version = "3.0.0", path = "../../utils" }
-sp-trie = { version = "3.0.0", path = "../../trie" }
-sp-api = { version = "3.0.0", path = "../../api" }
+sp-std = { version = "4.0.0-dev", path = "../../std" }
+sp-version = { version = "4.0.0-dev", path = "../../version" }
+sp-runtime = { version = "4.0.0-dev", path = "../../runtime" }
+sp-utils = { version = "4.0.0-dev", path = "../../utils" }
+sp-trie = { version = "4.0.0-dev", path = "../../trie" }
+sp-api = { version = "4.0.0-dev", path = "../../api" }
 codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 parking_lot = "0.11.1"
 serde = { version = "1.0", features = ["derive"] }
diff --git a/primitives/consensus/pow/Cargo.toml b/primitives/consensus/pow/Cargo.toml
index 850f0efe47ed..f93eeca2fb24 100644
--- a/primitives/consensus/pow/Cargo.toml
+++ b/primitives/consensus/pow/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-consensus-pow"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Primitives for Aura consensus"
 edition = "2018"
@@ -13,10 +13,10 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-api = { version = "3.0.0", default-features = false, path = "../../api" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../std" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../runtime" }
-sp-core = { version = "3.0.0", default-features = false, path = "../../core" }
+sp-api = { version = "4.0.0-dev", default-features = false, path = "../../api" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../std" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../runtime" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../core" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 
 [features]
diff --git a/primitives/consensus/slots/Cargo.toml b/primitives/consensus/slots/Cargo.toml
index 46dbaca1a6ad..9619f627a0b7 100644
--- a/primitives/consensus/slots/Cargo.toml
+++ b/primitives/consensus/slots/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-consensus-slots"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Primitives for slots-based consensus"
 edition = "2018"
@@ -14,8 +14,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../runtime" }
-sp-arithmetic = { version = "3.0.0", default-features = false, path = "../../arithmetic" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../runtime" }
+sp-arithmetic = { version = "4.0.0-dev", default-features = false, path = "../../arithmetic" }
 
 [features]
 default = ["std"]
diff --git a/primitives/consensus/vrf/Cargo.toml b/primitives/consensus/vrf/Cargo.toml
index 15a9318cd446..124cbf423f06 100644
--- a/primitives/consensus/vrf/Cargo.toml
+++ b/primitives/consensus/vrf/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-consensus-vrf"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Primitives for VRF based consensus"
 edition = "2018"
@@ -15,9 +15,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { version = "2.0.0", package = "parity-scale-codec", default-features = false }
 schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated", "u64_backend"], default-features = false }
-sp-std = { version = "3.0.0", path = "../../std", default-features = false }
-sp-core = { version = "3.0.0", path = "../../core", default-features = false }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../runtime" }
+sp-std = { version = "4.0.0-dev", path = "../../std", default-features = false }
+sp-core = { version = "4.0.0-dev", path = "../../core", default-features = false }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../runtime" }
 
 [features]
 default = ["std"]
diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml
index 6746e8599e6c..e3b5613e06b6 100644
--- a/primitives/core/Cargo.toml
+++ b/primitives/core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-core"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -13,7 +13,7 @@ documentation = "https://docs.rs/sp-core"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-std = { version = "3.0.0", default-features = false, path = "../std" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
 codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
 log = { version = "0.4.11", default-features = false }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
@@ -34,8 +34,8 @@ secrecy = { version = "0.7.0", default-features = false }
 lazy_static = { version = "1.4.0", default-features = false, optional = true }
 parking_lot = { version = "0.11.1", optional = true }
 sp-debug-derive = { version = "3.0.0", path = "../debug-derive" }
-sp-externalities = { version = "0.9.0", optional = true, path = "../externalities" }
-sp-storage = { version = "3.0.0", default-features = false, path = "../storage" }
+sp-externalities = { version = "0.10.0-dev", optional = true, path = "../externalities" }
+sp-storage = { version = "4.0.0-dev", default-features = false, path = "../storage" }
 parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
 futures = { version = "0.3.1", optional = true }
 dyn-clonable = { version = "0.9.0", optional = true }
@@ -52,7 +52,7 @@ twox-hash = { version = "1.5.0", default-features = false, optional = true }
 libsecp256k1 = { version = "0.3.2", default-features = false, features = ["hmac"], optional = true }
 merlin = { version = "2.0", default-features = false, optional = true }
 
-sp-runtime-interface = { version = "3.0.0", default-features = false, path = "../runtime-interface" }
+sp-runtime-interface = { version = "4.0.0-dev", default-features = false, path = "../runtime-interface" }
 
 [dev-dependencies]
 sp-serializer = { version = "3.0.0", path = "../serializer" }
diff --git a/primitives/database/Cargo.toml b/primitives/database/Cargo.toml
index f8693449af8c..c99651d4ef04 100644
--- a/primitives/database/Cargo.toml
+++ b/primitives/database/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-database"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/externalities/Cargo.toml b/primitives/externalities/Cargo.toml
index 8552f50ec71b..52a6300688cd 100644
--- a/primitives/externalities/Cargo.toml
+++ b/primitives/externalities/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-externalities"
-version = "0.9.0"
+version = "0.10.0-dev"
 license = "Apache-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -14,8 +14,8 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-storage = { version = "3.0.0", path = "../storage", default-features = false }
-sp-std = { version = "3.0.0", path = "../std", default-features = false }
+sp-storage = { version = "4.0.0-dev", path = "../storage", default-features = false }
+sp-std = { version = "4.0.0-dev", path = "../std", default-features = false }
 environmental = { version = "1.1.3", default-features = false }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 
diff --git a/primitives/finality-grandpa/Cargo.toml b/primitives/finality-grandpa/Cargo.toml
index ec9e89105d58..57a977f61748 100644
--- a/primitives/finality-grandpa/Cargo.toml
+++ b/primitives/finality-grandpa/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-finality-grandpa"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -19,12 +19,12 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
 grandpa = { package = "finality-grandpa", version = "0.14.1", default-features = false, features = ["derive-codec"] }
 log = { version = "0.4.8", optional = true }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-sp-api = { version = "3.0.0", default-features = false, path = "../api" }
-sp-application-crypto = { version = "3.0.0", default-features = false, path = "../application-crypto" }
-sp-core = { version = "3.0.0", default-features = false, path = "../core" }
-sp-keystore = { version = "0.9.0", default-features = false, path = "../keystore", optional = true }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../runtime" }
-sp-std = { version = "3.0.0", default-features = false, path = "../std" }
+sp-api = { version = "4.0.0-dev", default-features = false, path = "../api" }
+sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../application-crypto" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../core" }
+sp-keystore = { version = "0.10.0-dev", default-features = false, path = "../keystore", optional = true }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../runtime" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
 
 [features]
 default = ["std"]
diff --git a/primitives/inherents/Cargo.toml b/primitives/inherents/Cargo.toml
index 54ce09306e19..353735f806c0 100644
--- a/primitives/inherents/Cargo.toml
+++ b/primitives/inherents/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-inherents"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,9 +15,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 
 [dependencies]
-sp-std = { version = "3.0.0", default-features = false, path = "../std" }
-sp-core = { version = "3.0.0", default-features = false, path = "../core" }
-sp-runtime = { version = "3.0.0", path = "../runtime", optional = true }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../core" }
+sp-runtime = { version = "4.0.0-dev", path = "../runtime", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.21", optional = true }
 impl-trait-for-tuples = "0.2.0"
diff --git a/primitives/io/Cargo.toml b/primitives/io/Cargo.toml
index e63fcb909573..da9a8fc83200 100644
--- a/primitives/io/Cargo.toml
+++ b/primitives/io/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-io"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -17,17 +17,17 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 hash-db = { version = "0.15.2", default-features = false }
-sp-core = { version = "3.0.0", default-features = false, path = "../core" }
-sp-keystore = { version = "0.9.0", default-features = false, optional = true, path = "../keystore" }
-sp-std = { version = "3.0.0", default-features = false, path = "../std" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../core" }
+sp-keystore = { version = "0.10.0-dev", default-features = false, optional = true, path = "../keystore" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
 libsecp256k1 = { version = "0.3.4", optional = true }
-sp-state-machine = { version = "0.9.0", optional = true, path = "../state-machine" }
-sp-wasm-interface = { version = "3.0.0", path = "../wasm-interface", default-features = false }
-sp-runtime-interface = { version = "3.0.0", default-features = false, path = "../runtime-interface" }
-sp-maybe-compressed-blob = { version = "3.0.0", optional = true, path = "../maybe-compressed-blob" }
-sp-trie = { version = "3.0.0", optional = true, path = "../trie" }
-sp-externalities = { version = "0.9.0", optional = true, path = "../externalities" }
-sp-tracing = { version = "3.0.0", default-features = false, path = "../tracing" }
+sp-state-machine = { version = "0.10.0-dev", optional = true, path = "../state-machine" }
+sp-wasm-interface = { version = "4.0.0-dev", path = "../wasm-interface", default-features = false }
+sp-runtime-interface = { version = "4.0.0-dev", default-features = false, path = "../runtime-interface" }
+sp-maybe-compressed-blob = { version = "4.0.0-dev", optional = true, path = "../maybe-compressed-blob" }
+sp-trie = { version = "4.0.0-dev", optional = true, path = "../trie" }
+sp-externalities = { version = "0.10.0-dev", optional = true, path = "../externalities" }
+sp-tracing = { version = "4.0.0-dev", default-features = false, path = "../tracing" }
 log = { version = "0.4.8", optional = true }
 futures = { version = "0.3.1", features = ["thread-pool"], optional = true }
 parking_lot = { version = "0.11.1", optional = true }
diff --git a/primitives/keyring/Cargo.toml b/primitives/keyring/Cargo.toml
index ee71687f1ef7..a14e98d3d805 100644
--- a/primitives/keyring/Cargo.toml
+++ b/primitives/keyring/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-keyring"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 
 [dependencies]
-sp-core = { version = "3.0.0", path = "../core" }
-sp-runtime = { version = "3.0.0", path = "../runtime" }
+sp-core = { version = "4.0.0-dev", path = "../core" }
+sp-runtime = { version = "4.0.0-dev", path = "../runtime" }
 lazy_static = "1.4.0"
 strum = { version = "0.20.0", features = ["derive"] }
diff --git a/primitives/keystore/Cargo.toml b/primitives/keystore/Cargo.toml
index d4ebfc1c74c6..4c2408c831b3 100644
--- a/primitives/keystore/Cargo.toml
+++ b/primitives/keystore/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-keystore"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -21,8 +21,8 @@ schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated", "u64_backen
 merlin = { version = "2.0", default-features = false }
 parking_lot = { version = "0.11.1", default-features = false }
 serde = { version = "1.0", optional = true}
-sp-core = { version = "3.0.0", path = "../core" }
-sp-externalities = { version = "0.9.0", path = "../externalities", default-features = false }
+sp-core = { version = "4.0.0-dev", path = "../core" }
+sp-externalities = { version = "0.10.0-dev", path = "../externalities", default-features = false }
 
 [dev-dependencies]
 rand = "0.7.2"
diff --git a/primitives/maybe-compressed-blob/Cargo.toml b/primitives/maybe-compressed-blob/Cargo.toml
index e647606f1595..720fc4281ca7 100644
--- a/primitives/maybe-compressed-blob/Cargo.toml
+++ b/primitives/maybe-compressed-blob/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-maybe-compressed-blob"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/npos-elections/Cargo.toml b/primitives/npos-elections/Cargo.toml
index 5bca1e0bb859..02e898051d9b 100644
--- a/primitives/npos-elections/Cargo.toml
+++ b/primitives/npos-elections/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-npos-elections"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,15 +15,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-sp-std = { version = "3.0.0", default-features = false, path = "../std" }
-sp-npos-elections-compact = { version = "3.0.0", path = "./compact" }
-sp-arithmetic = { version = "3.0.0", default-features = false, path = "../arithmetic" }
-sp-core = { version = "3.0.0", default-features = false, path = "../core" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
+sp-npos-elections-compact = { version = "4.0.0-dev", path = "./compact" }
+sp-arithmetic = { version = "4.0.0-dev", default-features = false, path = "../arithmetic" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../core" }
 
 [dev-dependencies]
-substrate-test-utils = { version = "3.0.0", path = "../../test-utils" }
+substrate-test-utils = { version = "4.0.0-dev", path = "../../test-utils" }
 rand = "0.7.3"
-sp-runtime = { version = "3.0.0", path = "../runtime" }
+sp-runtime = { version = "4.0.0-dev", path = "../runtime" }
 
 [features]
 default = ["std"]
diff --git a/primitives/npos-elections/compact/Cargo.toml b/primitives/npos-elections/compact/Cargo.toml
index 78432d777a01..7188128ad29d 100644
--- a/primitives/npos-elections/compact/Cargo.toml
+++ b/primitives/npos-elections/compact/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-npos-elections-compact"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -22,6 +22,6 @@ proc-macro-crate = "1.0.0"
 
 [dev-dependencies]
 parity-scale-codec = "2.0.1"
-sp-arithmetic = { path = "../../arithmetic" }
-sp-npos-elections = { path = ".." }
+sp-arithmetic = { path = "../../arithmetic" , version = "4.0.0-dev"}
+sp-npos-elections = { path = ".." , version = "4.0.0-dev"}
 trybuild = "1.0.42"
diff --git a/primitives/npos-elections/fuzzer/Cargo.toml b/primitives/npos-elections/fuzzer/Cargo.toml
index 3154a7861d30..775f9a1c211b 100644
--- a/primitives/npos-elections/fuzzer/Cargo.toml
+++ b/primitives/npos-elections/fuzzer/Cargo.toml
@@ -17,10 +17,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 honggfuzz = "0.5"
 rand = { version = "0.7.3", features = ["std", "small_rng"] }
-sp-arithmetic = { version = "3.0.0", path = "../../arithmetic" }
-sp-npos-elections = { version = "3.0.0", path = ".." }
-sp-runtime = { version = "3.0.0", path = "../../runtime" }
-sp-std = { version = "3.0.0", path = "../../std" }
+sp-arithmetic = { version = "4.0.0-dev", path = "../../arithmetic" }
+sp-npos-elections = { version = "4.0.0-dev", path = ".." }
+sp-runtime = { version = "4.0.0-dev", path = "../../runtime" }
+sp-std = { version = "4.0.0-dev", path = "../../std" }
 structopt = "0.3.21"
 
 [[bin]]
diff --git a/primitives/offchain/Cargo.toml b/primitives/offchain/Cargo.toml
index 1e3d0a34b26b..500d3e8b867a 100644
--- a/primitives/offchain/Cargo.toml
+++ b/primitives/offchain/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "Substrate offchain workers primitives"
 name = "sp-offchain"
-version = "3.0.0"
+version = "4.0.0-dev"
 license = "Apache-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -13,12 +13,12 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-core = { version = "3.0.0", default-features = false, path = "../core" }
-sp-api = { version = "3.0.0", default-features = false, path = "../api" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../runtime" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../core" }
+sp-api = { version = "4.0.0-dev", default-features = false, path = "../api" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../runtime" }
 
 [dev-dependencies]
-sp-state-machine = { version = "0.9.0", default-features = false, path = "../state-machine" }
+sp-state-machine = { version = "0.10.0-dev", default-features = false, path = "../state-machine" }
 
 [features]
 default = ["std"]
diff --git a/primitives/rpc/Cargo.toml b/primitives/rpc/Cargo.toml
index 9a502c99d311..e740d0be88fa 100644
--- a/primitives/rpc/Cargo.toml
+++ b/primitives/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-rpc"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", features = ["derive"] }
-sp-core = { version = "3.0.0", path = "../core" }
+sp-core = { version = "4.0.0-dev", path = "../core" }
 tracing-core = "0.1.17"
 rustc-hash = "1.1.0"
 
diff --git a/primitives/runtime-interface/Cargo.toml b/primitives/runtime-interface/Cargo.toml
index c418ef44cef6..9b51af705051 100644
--- a/primitives/runtime-interface/Cargo.toml
+++ b/primitives/runtime-interface/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-runtime-interface"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,22 +14,22 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-wasm-interface = { version = "3.0.0", path = "../wasm-interface", default-features = false }
-sp-std = { version = "3.0.0", default-features = false, path = "../std" }
-sp-tracing = { version = "3.0.0", default-features = false, path = "../tracing" }
-sp-runtime-interface-proc-macro = { version = "3.0.0", path = "proc-macro" }
-sp-externalities = { version = "0.9.0", optional = true, path = "../externalities" }
+sp-wasm-interface = { version = "4.0.0-dev", path = "../wasm-interface", default-features = false }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
+sp-tracing = { version = "4.0.0-dev", default-features = false, path = "../tracing" }
+sp-runtime-interface-proc-macro = { version = "4.0.0-dev", path = "proc-macro" }
+sp-externalities = { version = "0.10.0-dev", optional = true, path = "../externalities" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 static_assertions = "1.0.0"
 primitive-types = { version = "0.10.0", default-features = false }
-sp-storage = { version = "3.0.0", default-features = false, path = "../storage" }
+sp-storage = { version = "4.0.0-dev", default-features = false, path = "../storage" }
 impl-trait-for-tuples = "0.2.1"
 
 [dev-dependencies]
 sp-runtime-interface-test-wasm = { version = "2.0.0", path = "test-wasm" }
-sp-state-machine = { version = "0.9.0", path = "../state-machine" }
-sp-core = { version = "3.0.0", path = "../core" }
-sp-io = { version = "3.0.0", path = "../io" }
+sp-state-machine = { version = "0.10.0-dev", path = "../state-machine" }
+sp-core = { version = "4.0.0-dev", path = "../core" }
+sp-io = { version = "4.0.0-dev", path = "../io" }
 rustversion = "1.0.0"
 trybuild = "1.0.42"
 
diff --git a/primitives/runtime-interface/proc-macro/Cargo.toml b/primitives/runtime-interface/proc-macro/Cargo.toml
index ae74ff739b18..dcf8a4662b9c 100644
--- a/primitives/runtime-interface/proc-macro/Cargo.toml
+++ b/primitives/runtime-interface/proc-macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-runtime-interface-proc-macro"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/runtime-interface/test-wasm-deprecated/Cargo.toml b/primitives/runtime-interface/test-wasm-deprecated/Cargo.toml
index 91febf68ed28..3ae5d78b0ef9 100644
--- a/primitives/runtime-interface/test-wasm-deprecated/Cargo.toml
+++ b/primitives/runtime-interface/test-wasm-deprecated/Cargo.toml
@@ -13,13 +13,13 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-runtime-interface = { version = "3.0.0", default-features = false, path = "../" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../std" }
-sp-io = { version = "3.0.0", default-features = false, path = "../../io" }
-sp-core = { version = "3.0.0", default-features = false, path = "../../core" }
+sp-runtime-interface = { version = "4.0.0-dev", default-features = false, path = "../" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../std" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../io" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../core" }
 
 [build-dependencies]
-substrate-wasm-builder = { version = "4.0.0", path = "../../../utils/wasm-builder" }
+substrate-wasm-builder = { version = "5.0.0-dev", path = "../../../utils/wasm-builder" }
 
 [features]
 default = [ "std" ]
diff --git a/primitives/runtime-interface/test-wasm/Cargo.toml b/primitives/runtime-interface/test-wasm/Cargo.toml
index d0a61c5b920f..7c7d3e10b2d0 100644
--- a/primitives/runtime-interface/test-wasm/Cargo.toml
+++ b/primitives/runtime-interface/test-wasm/Cargo.toml
@@ -13,13 +13,13 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-runtime-interface = { version = "3.0.0", default-features = false, path = "../" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../std" }
-sp-io = { version = "3.0.0", default-features = false, path = "../../io" }
-sp-core = { version = "3.0.0", default-features = false, path = "../../core" }
+sp-runtime-interface = { version = "4.0.0-dev", default-features = false, path = "../" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../std" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../io" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../core" }
 
 [build-dependencies]
-substrate-wasm-builder = { version = "4.0.0", path = "../../../utils/wasm-builder" }
+substrate-wasm-builder = { version = "5.0.0-dev", path = "../../../utils/wasm-builder" }
 
 [features]
 default = [ "std" ]
diff --git a/primitives/runtime-interface/test/Cargo.toml b/primitives/runtime-interface/test/Cargo.toml
index fb9b3c4b71ed..686eb1b1a13e 100644
--- a/primitives/runtime-interface/test/Cargo.toml
+++ b/primitives/runtime-interface/test/Cargo.toml
@@ -12,14 +12,14 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-runtime-interface = { version = "3.0.0", path = "../" }
-sc-executor = { version = "0.9.0", path = "../../../client/executor" }
-sc-executor-common = { version = "0.9.0", path = "../../../client/executor/common" }
+sp-runtime-interface = { version = "4.0.0-dev", path = "../" }
+sc-executor = { version = "0.10.0-dev", path = "../../../client/executor" }
+sc-executor-common = { version = "0.10.0-dev", path = "../../../client/executor/common" }
 sp-runtime-interface-test-wasm = { version = "2.0.0", path = "../test-wasm" }
 sp-runtime-interface-test-wasm-deprecated = { version = "2.0.0", path = "../test-wasm-deprecated" }
-sp-state-machine = { version = "0.9.0", path = "../../state-machine" }
-sp-runtime = { version = "3.0.0", path = "../../runtime" }
-sp-core = { version = "3.0.0", path = "../../core" }
-sp-io = { version = "3.0.0", path = "../../io" }
+sp-state-machine = { version = "0.10.0-dev", path = "../../state-machine" }
+sp-runtime = { version = "4.0.0-dev", path = "../../runtime" }
+sp-core = { version = "4.0.0-dev", path = "../../core" }
+sp-io = { version = "4.0.0-dev", path = "../../io" }
 tracing = "0.1.25"
 tracing-core = "0.1.17"
diff --git a/primitives/runtime/Cargo.toml b/primitives/runtime/Cargo.toml
index b38bbbb663d4..78d141edb19b 100644
--- a/primitives/runtime/Cargo.toml
+++ b/primitives/runtime/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-runtime"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -17,11 +17,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
-sp-core = { version = "3.0.0", default-features = false, path = "../core" }
-sp-application-crypto = { version = "3.0.0", default-features = false, path = "../application-crypto" }
-sp-arithmetic = { version = "3.0.0", default-features = false, path = "../arithmetic" }
-sp-std = { version = "3.0.0", default-features = false, path = "../std" }
-sp-io = { version = "3.0.0", default-features = false, path = "../io" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../core" }
+sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../application-crypto" }
+sp-arithmetic = { version = "4.0.0-dev", default-features = false, path = "../arithmetic" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../io" }
 log = { version = "0.4.14", default-features = false }
 paste = "1.0"
 rand = { version = "0.7.2", optional = true }
@@ -33,10 +33,10 @@ either = { version = "1.5", default-features = false }
 [dev-dependencies]
 serde_json = "1.0.41"
 rand = "0.7.2"
-sp-state-machine = { version = "0.9.0", path = "../state-machine" }
-sp-api = { version = "3.0.0", path = "../api" }
+sp-state-machine = { version = "0.10.0-dev", path = "../state-machine" }
+sp-api = { version = "4.0.0-dev", path = "../api" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
-sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
+sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
 
 [features]
 bench = []
diff --git a/primitives/sandbox/Cargo.toml b/primitives/sandbox/Cargo.toml
index dc6103bfa6ad..f15f1c02d511 100755
--- a/primitives/sandbox/Cargo.toml
+++ b/primitives/sandbox/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-sandbox"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,10 +14,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 wasmi = { version = "0.9.0", optional = true }
-sp-core = { version = "3.0.0", default-features = false, path = "../core" }
-sp-std = { version = "3.0.0", default-features = false, path = "../std" }
-sp-io = { version = "3.0.0", default-features = false, path = "../io" }
-sp-wasm-interface = { version = "3.0.0", default-features = false, path = "../wasm-interface" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../core" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../io" }
+sp-wasm-interface = { version = "4.0.0-dev", default-features = false, path = "../wasm-interface" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 
 [dev-dependencies]
diff --git a/primitives/session/Cargo.toml b/primitives/session/Cargo.toml
index c04b271bc037..91677b474d95 100644
--- a/primitives/session/Cargo.toml
+++ b/primitives/session/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-session"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,11 +14,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-api = { version = "3.0.0", default-features = false, path = "../api" }
-sp-core = { version = "3.0.0", default-features = false, path = "../core" }
-sp-std = { version = "3.0.0", default-features = false, path = "../std" }
-sp-staking = { version = "3.0.0", default-features = false, path = "../staking" }
-sp-runtime = { version = "3.0.0", optional = true, path = "../runtime" }
+sp-api = { version = "4.0.0-dev", default-features = false, path = "../api" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../core" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
+sp-staking = { version = "4.0.0-dev", default-features = false, path = "../staking" }
+sp-runtime = { version = "4.0.0-dev", optional = true, path = "../runtime" }
 
 [features]
 default = [ "std" ]
diff --git a/primitives/staking/Cargo.toml b/primitives/staking/Cargo.toml
index cf2347082a88..85f5487da884 100644
--- a/primitives/staking/Cargo.toml
+++ b/primitives/staking/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-staking"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,8 +14,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../runtime" }
-sp-std = { version = "3.0.0", default-features = false, path = "../std" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../runtime" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
 
 [features]
 default = ["std"]
diff --git a/primitives/state-machine/Cargo.toml b/primitives/state-machine/Cargo.toml
index 00050116280e..e5c9ea989068 100644
--- a/primitives/state-machine/Cargo.toml
+++ b/primitives/state-machine/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-state-machine"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Substrate State Machine"
 edition = "2018"
@@ -20,20 +20,20 @@ parking_lot = { version = "0.11.1", optional = true }
 hash-db = { version = "0.15.2", default-features = false }
 trie-db = { version = "0.22.6", default-features = false }
 trie-root = { version = "0.16.0", default-features = false }
-sp-trie = { version = "3.0.0", path = "../trie", default-features = false }
-sp-core = { version = "3.0.0", path = "../core", default-features = false }
+sp-trie = { version = "4.0.0-dev", path = "../trie", default-features = false }
+sp-core = { version = "4.0.0-dev", path = "../core", default-features = false }
 sp-panic-handler = { version = "3.0.0", path = "../panic-handler", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 num-traits = { version = "0.2.8", default-features = false }
 rand = { version = "0.7.2", optional = true }
-sp-externalities = { version = "0.9.0", path = "../externalities", default-features = false }
+sp-externalities = { version = "0.10.0-dev", path = "../externalities", default-features = false }
 smallvec = "1.4.1"
-sp-std = { version = "3.0.0", default-features = false, path = "../std" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
 tracing = { version = "0.1.22", optional = true }
 
 [dev-dependencies]
 hex-literal = "0.3.1"
-sp-runtime = { version = "3.0.0", path = "../runtime" }
+sp-runtime = { version = "4.0.0-dev", path = "../runtime" }
 pretty_assertions = "0.6.1"
 
 [features]
diff --git a/primitives/std/Cargo.toml b/primitives/std/Cargo.toml
index bafa1ea7ef41..bf815c1c80c5 100644
--- a/primitives/std/Cargo.toml
+++ b/primitives/std/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-std"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/storage/Cargo.toml b/primitives/storage/Cargo.toml
index 7a984d920569..40566deb06b6 100644
--- a/primitives/storage/Cargo.toml
+++ b/primitives/storage/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-storage"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 description = "Storage related primitives"
@@ -14,7 +14,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-std = { version = "3.0.0", default-features = false, path = "../std" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 impl-serde = { version = "0.3.1", optional = true }
 ref-cast = "1.0.0"
diff --git a/primitives/tasks/Cargo.toml b/primitives/tasks/Cargo.toml
index 0a361b6c8dbb..ee503ae9b855 100644
--- a/primitives/tasks/Cargo.toml
+++ b/primitives/tasks/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-tasks"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,11 +15,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 log = { version = "0.4.8", optional = true }
-sp-core = { version = "3.0.0", default-features = false, path = "../core" }
-sp-externalities = { version = "0.9.0", optional = true, path = "../externalities" }
-sp-io = { version = "3.0.0", default-features = false, path = "../io" }
-sp-runtime-interface = { version = "3.0.0", default-features = false, path = "../runtime-interface" }
-sp-std = { version = "3.0.0", default-features = false, path = "../std" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../core" }
+sp-externalities = { version = "0.10.0-dev", optional = true, path = "../externalities" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../io" }
+sp-runtime-interface = { version = "4.0.0-dev", default-features = false, path = "../runtime-interface" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
 
 [dev-dependencies]
 codec = { package = "parity-scale-codec", default-features = false, version = "2.0.0" }
diff --git a/primitives/test-primitives/Cargo.toml b/primitives/test-primitives/Cargo.toml
index f1f2c70bf231..c7b901e848e1 100644
--- a/primitives/test-primitives/Cargo.toml
+++ b/primitives/test-primitives/Cargo.toml
@@ -12,11 +12,11 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-application-crypto = { version = "3.0.0", default-features = false, path = "../application-crypto" }
+sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../application-crypto" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-core = { version = "3.0.0", default-features = false, path = "../core" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../core" }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../runtime" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../runtime" }
 parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
 
 [features]
diff --git a/primitives/timestamp/Cargo.toml b/primitives/timestamp/Cargo.toml
index 3fc8e76f40f1..512635f31923 100644
--- a/primitives/timestamp/Cargo.toml
+++ b/primitives/timestamp/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-timestamp"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -13,11 +13,11 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-api = { version = "3.0.0", default-features = false, path = "../api" }
-sp-std = { version = "3.0.0", default-features = false, path = "../std" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../runtime" }
+sp-api = { version = "4.0.0-dev", default-features = false, path = "../api" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../runtime" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-inherents = { version = "3.0.0", default-features = false, path = "../inherents" }
+sp-inherents = { version = "4.0.0-dev", default-features = false, path = "../inherents" }
 wasm-timer = { version = "0.2", optional = true }
 thiserror = { version = "1.0.21", optional = true }
 log = { version = "0.4.8", optional = true }
diff --git a/primitives/tracing/Cargo.toml b/primitives/tracing/Cargo.toml
index 2c4b7dc12c74..d5fb07ad076b 100644
--- a/primitives/tracing/Cargo.toml
+++ b/primitives/tracing/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-tracing"
-version = "3.0.0"
+version = "4.0.0-dev"
 license = "Apache-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -18,7 +18,7 @@ features = ["with-tracing"]
 targets = ["x86_64-unknown-linux-gnu", "wasm32-unknown-unknown"]
 
 [dependencies]
-sp-std = { version = "3.0.0", path = "../std", default-features = false}
+sp-std = { version = "4.0.0-dev", path = "../std", default-features = false}
 codec = { version = "2.0.0", package = "parity-scale-codec", default-features = false, features = ["derive"]}
 tracing = { version = "0.1.25", default-features = false }
 tracing-core = { version = "0.1.17", default-features = false }
diff --git a/primitives/transaction-pool/Cargo.toml b/primitives/transaction-pool/Cargo.toml
index d6c2d716ee84..3f77014ac53b 100644
--- a/primitives/transaction-pool/Cargo.toml
+++ b/primitives/transaction-pool/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-transaction-pool"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -14,8 +14,8 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-api = { version = "3.0.0", default-features = false, path = "../api" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../runtime" }
+sp-api = { version = "4.0.0-dev", default-features = false, path = "../api" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../runtime" }
 
 [features]
 default = [ "std" ]
diff --git a/primitives/transaction-storage-proof/Cargo.toml b/primitives/transaction-storage-proof/Cargo.toml
index bbdcb9f989f0..b04dbbc1124d 100644
--- a/primitives/transaction-storage-proof/Cargo.toml
+++ b/primitives/transaction-storage-proof/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-transaction-storage-proof"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Transaction storage proof primitives"
 edition = "2018"
@@ -13,11 +13,11 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-inherents = { version = "3.0.0", default-features = false, path = "../inherents" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../runtime" }
-sp-std = { version = "3.0.0", default-features = false, path = "../std" }
-sp-trie = { version = "3.0.0", optional = true, path = "../trie" }
-sp-core = { version = "3.0.0", path = "../core", optional = true }
+sp-inherents = { version = "4.0.0-dev", default-features = false, path = "../inherents" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../runtime" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
+sp-trie = { version = "4.0.0-dev", optional = true, path = "../trie" }
+sp-core = { version = "4.0.0-dev", path = "../core", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 log = { version = "0.4.8", optional = true }
 async-trait = { version = "0.1.48", optional = true }
diff --git a/primitives/trie/Cargo.toml b/primitives/trie/Cargo.toml
index e13bc68fb96b..60356e0a8d6d 100644
--- a/primitives/trie/Cargo.toml
+++ b/primitives/trie/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-trie"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Patricia trie stuff using a parity-scale-codec node format"
 repository = "https://github.com/paritytech/substrate/"
@@ -19,19 +19,19 @@ harness = false
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-std = { version = "3.0.0", default-features = false, path = "../std" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
 hash-db = { version = "0.15.2", default-features = false }
 trie-db = { version = "0.22.6", default-features = false }
 trie-root = { version = "0.16.0", default-features = false }
 memory-db = { version = "0.27.0", default-features = false }
-sp-core = { version = "3.0.0", default-features = false, path = "../core" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../core" }
 
 [dev-dependencies]
 trie-bench = "0.28.0"
 trie-standardmap = "0.15.2"
 criterion = "0.3.3"
 hex-literal = "0.3.1"
-sp-runtime = { version = "3.0.0", path = "../runtime" }
+sp-runtime = { version = "4.0.0-dev", path = "../runtime" }
 
 [features]
 default = ["std"]
diff --git a/primitives/utils/Cargo.toml b/primitives/utils/Cargo.toml
index 7669cee346d0..bb5b1da59d41 100644
--- a/primitives/utils/Cargo.toml
+++ b/primitives/utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-utils"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/primitives/version/Cargo.toml b/primitives/version/Cargo.toml
index 877897c54c24..62f625d1e38e 100644
--- a/primitives/version/Cargo.toml
+++ b/primitives/version/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-version"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -18,9 +18,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 impl-serde = { version = "0.3.1", optional = true }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "3.0.0", default-features = false, path = "../std" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../runtime" }
-sp-version-proc-macro = { version = "3.0.0", default-features = false, path = "proc-macro" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../runtime" }
+sp-version-proc-macro = { version = "4.0.0-dev", default-features = false, path = "proc-macro" }
 parity-wasm = { version = "0.42.2", optional = true }
 thiserror = { version = "1.0.21", optional = true }
 
diff --git a/primitives/version/proc-macro/Cargo.toml b/primitives/version/proc-macro/Cargo.toml
index ea3144090c70..e394353e52a1 100644
--- a/primitives/version/proc-macro/Cargo.toml
+++ b/primitives/version/proc-macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-version-proc-macro"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -23,4 +23,4 @@ proc-macro-crate = "1.0.0"
 codec = { package = "parity-scale-codec", version = "2.0.0", features = [ "derive" ] }
 
 [dev-dependencies]
-sp-version = { version = "3.0.0", path = ".." }
+sp-version = { version = "4.0.0-dev", path = ".." }
diff --git a/primitives/wasm-interface/Cargo.toml b/primitives/wasm-interface/Cargo.toml
index 97171310b415..ba8a7b4e4b46 100644
--- a/primitives/wasm-interface/Cargo.toml
+++ b/primitives/wasm-interface/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-wasm-interface"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 wasmi = { version = "0.9.0", optional = true }
 impl-trait-for-tuples = "0.2.1"
-sp-std = { version = "3.0.0", path = "../std", default-features = false }
+sp-std = { version = "4.0.0-dev", path = "../std", default-features = false }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 
 [features]
diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml
index 24a794ff4802..983574915f2b 100644
--- a/test-utils/Cargo.toml
+++ b/test-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-test-utils"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -13,9 +13,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 futures = { version = "0.3.1", features = ["compat"] }
-substrate-test-utils-derive = { version = "0.9.0", path = "./derive" }
+substrate-test-utils-derive = { version = "0.10.0-dev", path = "./derive" }
 tokio = { version = "0.2.13", features = ["macros"] }
 
 [dev-dependencies]
-sc-service = { version = "0.9.0", path = "../client/service" }
+sc-service = { version = "0.10.0-dev", path = "../client/service" }
 trybuild = { version = "1.0.42", features = [ "diff" ] }
diff --git a/test-utils/client/Cargo.toml b/test-utils/client/Cargo.toml
index 925a69e41bb4..26661b8209c1 100644
--- a/test-utils/client/Cargo.toml
+++ b/test-utils/client/Cargo.toml
@@ -19,18 +19,18 @@ hash-db = "0.15.2"
 hex = "0.4"
 serde = "1.0.55"
 serde_json = "1.0.55"
-sc-client-api = { version = "3.0.0", path = "../../client/api" }
-sc-client-db = { version = "0.9.0", features = ["test-helpers"], path = "../../client/db" }
-sc-consensus = { version = "0.9.0", path = "../../client/consensus/common" }
-sc-executor = { version = "0.9.0", path = "../../client/executor" }
-sc-light = { version = "3.0.0", path = "../../client/light" }
-sc-offchain = { version = "3.0.0", path = "../../client/offchain" }
-sc-service = { version = "0.9.0", default-features = false, features = ["test-helpers"],  path = "../../client/service" }
-sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
-sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-sp-keystore = { version = "0.9.0", path = "../../primitives/keystore" }
-sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
-sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
-sp-state-machine = { version = "0.9.0", path = "../../primitives/state-machine" }
+sc-client-api = { version = "4.0.0-dev", path = "../../client/api" }
+sc-client-db = { version = "0.10.0-dev", features = ["test-helpers"], path = "../../client/db" }
+sc-consensus = { version = "0.10.0-dev", path = "../../client/consensus/common" }
+sc-executor = { version = "0.10.0-dev", path = "../../client/executor" }
+sc-light = { version = "4.0.0-dev", path = "../../client/light" }
+sc-offchain = { version = "4.0.0-dev", path = "../../client/offchain" }
+sc-service = { version = "0.10.0-dev", default-features = false, features = ["test-helpers"],  path = "../../client/service" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
+sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+sp-keystore = { version = "0.10.0-dev", path = "../../primitives/keystore" }
+sp-keyring = { version = "4.0.0-dev", path = "../../primitives/keyring" }
+sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
+sp-state-machine = { version = "0.10.0-dev", path = "../../primitives/state-machine" }
 async-trait = "0.1.42"
diff --git a/test-utils/derive/Cargo.toml b/test-utils/derive/Cargo.toml
index 501a7058c634..991183edf4ab 100644
--- a/test-utils/derive/Cargo.toml
+++ b/test-utils/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-test-utils-derive"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/test-utils/runtime/Cargo.toml b/test-utils/runtime/Cargo.toml
index 60283bb97d18..371f2fd5a13b 100644
--- a/test-utils/runtime/Cargo.toml
+++ b/test-utils/runtime/Cargo.toml
@@ -13,36 +13,36 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-application-crypto = { version = "3.0.0", default-features = false, path = "../../primitives/application-crypto" }
-sp-consensus-aura = { version = "0.9.0", default-features = false, path = "../../primitives/consensus/aura" }
-sp-consensus-babe = { version = "0.9.0", default-features = false, path = "../../primitives/consensus/babe" }
-sp-block-builder = { version = "3.0.0", default-features = false, path = "../../primitives/block-builder" }
+sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../../primitives/application-crypto" }
+sp-consensus-aura = { version = "0.10.0-dev", default-features = false, path = "../../primitives/consensus/aura" }
+sp-consensus-babe = { version = "0.10.0-dev", default-features = false, path = "../../primitives/consensus/babe" }
+sp-block-builder = { version = "4.0.0-dev", default-features = false, path = "../../primitives/block-builder" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-inherents = { version = "3.0.0", default-features = false, path = "../../primitives/inherents" }
-sp-keyring = { version = "3.0.0", optional = true, path = "../../primitives/keyring" }
+sp-inherents = { version = "4.0.0-dev", default-features = false, path = "../../primitives/inherents" }
+sp-keyring = { version = "4.0.0-dev", optional = true, path = "../../primitives/keyring" }
 memory-db = { version = "0.27.0", default-features = false }
-sp-offchain = { path = "../../primitives/offchain", default-features = false, version = "3.0.0"}
-sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
-sp-runtime-interface = { path = "../../primitives/runtime-interface", default-features = false, version = "3.0.0"}
-sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
-frame-support = { version = "3.0.0", default-features = false, path = "../../frame/support" }
-sp-version = { version = "3.0.0", default-features = false, path = "../../primitives/version" }
-sp-session = { version = "3.0.0", default-features = false, path = "../../primitives/session" }
-sp-api = { version = "3.0.0", default-features = false, path = "../../primitives/api" }
-sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
-pallet-babe = { version = "3.0.0", default-features = false, path = "../../frame/babe" }
-frame-system = { version = "3.0.0", default-features = false, path = "../../frame/system" }
-frame-system-rpc-runtime-api = { version = "3.0.0", default-features = false, path = "../../frame/system/rpc/runtime-api" }
-pallet-timestamp = { version = "3.0.0", default-features = false, path = "../../frame/timestamp" }
-sp-finality-grandpa = { version = "3.0.0", default-features = false, path = "../../primitives/finality-grandpa" }
-sp-trie = { version = "3.0.0", default-features = false, path = "../../primitives/trie" }
-sp-transaction-pool = { version = "3.0.0", default-features = false, path = "../../primitives/transaction-pool" }
+sp-offchain = { version = "4.0.0-dev", default-features = false, path = "../../primitives/offchain" }
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+sp-runtime-interface = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime-interface" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../../frame/support" }
+sp-version = { version = "4.0.0-dev", default-features = false, path = "../../primitives/version" }
+sp-session = { version = "4.0.0-dev", default-features = false, path = "../../primitives/session" }
+sp-api = { version = "4.0.0-dev", default-features = false, path = "../../primitives/api" }
+sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+pallet-babe = { version = "4.0.0-dev", default-features = false, path = "../../frame/babe" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../../frame/system" }
+frame-system-rpc-runtime-api = { version = "4.0.0-dev", default-features = false, path = "../../frame/system/rpc/runtime-api" }
+pallet-timestamp = { version = "4.0.0-dev", default-features = false, path = "../../frame/timestamp" }
+sp-finality-grandpa = { version = "4.0.0-dev", default-features = false, path = "../../primitives/finality-grandpa" }
+sp-trie = { version = "4.0.0-dev", default-features = false, path = "../../primitives/trie" }
+sp-transaction-pool = { version = "4.0.0-dev", default-features = false, path = "../../primitives/transaction-pool" }
 trie-db = { version = "0.22.6", default-features = false }
 parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
-sc-service = { version = "0.9.0", default-features = false, optional = true, features = ["test-helpers"], path = "../../client/service" }
-sp-state-machine = { version = "0.9.0", default-features = false, path = "../../primitives/state-machine" }
-sp-externalities = { version = "0.9.0", default-features = false, path = "../../primitives/externalities" }
+sc-service = { version = "0.10.0-dev", default-features = false, optional = true, features = ["test-helpers"], path = "../../client/service" }
+sp-state-machine = { version = "0.10.0-dev", default-features = false, path = "../../primitives/state-machine" }
+sp-externalities = { version = "0.10.0-dev", default-features = false, path = "../../primitives/externalities" }
 
 # 3rd party
 cfg-if = "1.0"
@@ -50,13 +50,13 @@ log = { version = "0.4.14", default-features = false }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 
 [dev-dependencies]
-sc-block-builder = { version = "0.9.0", path = "../../client/block-builder" }
-sc-executor = { version = "0.9.0", path = "../../client/executor" }
+sc-block-builder = { version = "0.10.0-dev", path = "../../client/block-builder" }
+sc-executor = { version = "0.10.0-dev", path = "../../client/executor" }
 substrate-test-runtime-client = { version = "2.0.0", path = "./client" }
 futures = "0.3.9"
 
 [build-dependencies]
-substrate-wasm-builder = { version = "4.0.0", path = "../../utils/wasm-builder" }
+substrate-wasm-builder = { version = "5.0.0-dev", path = "../../utils/wasm-builder" }
 
 [features]
 default = [
diff --git a/test-utils/runtime/client/Cargo.toml b/test-utils/runtime/client/Cargo.toml
index 0c822f0cdff8..24e9f8af2944 100644
--- a/test-utils/runtime/client/Cargo.toml
+++ b/test-utils/runtime/client/Cargo.toml
@@ -12,17 +12,17 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sc-light = { version = "3.0.0", path = "../../../client/light" }
-sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
-sc-block-builder = { version = "0.9.0", path = "../../../client/block-builder" }
+sc-light = { version = "4.0.0-dev", path = "../../../client/light" }
+sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
+sc-block-builder = { version = "0.10.0-dev", path = "../../../client/block-builder" }
 substrate-test-client = { version = "2.0.0", path = "../../client" }
-sp-core = { version = "3.0.0", path = "../../../primitives/core" }
+sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
 substrate-test-runtime = { version = "2.0.0", path = "../../runtime" }
-sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
-sp-api = { version = "3.0.0", path = "../../../primitives/api" }
-sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
+sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
+sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-sc-client-api = { version = "3.0.0", path = "../../../client/api" }
-sc-consensus = { version = "0.9.0", path = "../../../client/consensus/common" }
-sc-service = { version = "0.9.0", default-features = false, path = "../../../client/service" }
+sc-client-api = { version = "4.0.0-dev", path = "../../../client/api" }
+sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/common" }
+sc-service = { version = "0.10.0-dev", default-features = false, path = "../../../client/service" }
 futures = "0.3.9"
diff --git a/test-utils/runtime/transaction-pool/Cargo.toml b/test-utils/runtime/transaction-pool/Cargo.toml
index f0c5a19869df..420d052829aa 100644
--- a/test-utils/runtime/transaction-pool/Cargo.toml
+++ b/test-utils/runtime/transaction-pool/Cargo.toml
@@ -15,9 +15,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 substrate-test-runtime-client = { version = "2.0.0", path = "../client" }
 parking_lot = "0.11.1"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
-sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
-sc-transaction-pool = { version = "3.0.0", path = "../../../client/transaction-pool", features = ["test-helpers"] }
-sc-transaction-pool-api = { version = "3.0.0", path = "../../../client/transaction-pool/api" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
+sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
+sc-transaction-pool = { version = "4.0.0-dev", path = "../../../client/transaction-pool", features = ["test-helpers"] }
+sc-transaction-pool-api = { version = "4.0.0-dev", path = "../../../client/transaction-pool/api" }
 futures = { version = "0.3.1", features = ["compat"] }
 derive_more = "0.99.2"
diff --git a/test-utils/test-crate/Cargo.toml b/test-utils/test-crate/Cargo.toml
index 846b14fe0774..6ab53fc752ea 100644
--- a/test-utils/test-crate/Cargo.toml
+++ b/test-utils/test-crate/Cargo.toml
@@ -13,5 +13,5 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dev-dependencies]
 tokio = { version = "0.2.13", features = ["macros"] }
-test-utils = { version = "3.0.0", path = "..", package = "substrate-test-utils" }
-sc-service = { version = "0.9.0", path = "../../client/service" }
+test-utils = { version = "4.0.0-dev", path = "..", package = "substrate-test-utils" }
+sc-service = { version = "0.10.0-dev", path = "../../client/service" }
diff --git a/test-utils/test-runner/Cargo.toml b/test-utils/test-runner/Cargo.toml
index cf171b0ea5ef..a4c2bf84ab4a 100644
--- a/test-utils/test-runner/Cargo.toml
+++ b/test-utils/test-runner/Cargo.toml
@@ -7,41 +7,41 @@ publish = false
 
 [dependencies]
 # client deps
-sc-executor = { version = "0.9.0", path = "../../client/executor" }
-sc-service = { version = "0.9.0", path = "../../client/service" }
-sc-informant = { version = "0.9.0", path = "../../client/informant" }
-sc-network = { version = "0.9.0", path = "../../client/network" }
-sc-cli = { version = "0.9.0", path = "../../client/cli" }
-sc-basic-authorship = { version = "0.9.0", path = "../../client/basic-authorship" }
-sc-rpc = { version = "3.0.0", path = "../../client/rpc" }
-sc-transaction-pool = { version = "3.0.0", path = "../../client/transaction-pool" }
-sc-transaction-pool-api = { version = "3.0.0", path = "../../client/transaction-pool/api" }
-sc-client-api = { version = "3.0.0", path = "../../client/api" }
-sc-rpc-server = { version = "3.0.0", path = "../../client/rpc-servers" }
-manual-seal = { package = "sc-consensus-manual-seal", version = "0.9.0", path = "../../client/consensus/manual-seal" }
+sc-executor = { version = "0.10.0-dev", path = "../../client/executor" }
+sc-service = { version = "0.10.0-dev", path = "../../client/service" }
+sc-informant = { version = "0.10.0-dev", path = "../../client/informant" }
+sc-network = { version = "0.10.0-dev", path = "../../client/network" }
+sc-cli = { version = "0.10.0-dev", path = "../../client/cli" }
+sc-basic-authorship = { version = "0.10.0-dev", path = "../../client/basic-authorship" }
+sc-rpc = { version = "4.0.0-dev", path = "../../client/rpc" }
+sc-transaction-pool = { version = "4.0.0-dev", path = "../../client/transaction-pool" }
+sc-transaction-pool-api = { version = "4.0.0-dev", path = "../../client/transaction-pool/api" }
+sc-client-api = { version = "4.0.0-dev", path = "../../client/api" }
+sc-rpc-server = { version = "4.0.0-dev", path = "../../client/rpc-servers" }
+manual-seal = { package = "sc-consensus-manual-seal", version = "0.10.0-dev", path = "../../client/consensus/manual-seal" }
 
 # primitive deps
-sp-core = { version = "3.0.0", path = "../../primitives/core" }
-sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
-sp-block-builder = { version = "3.0.0", path = "../../primitives/block-builder" }
-sp-api = { version = "3.0.0", path = "../../primitives/api" }
-sp-io = { version = "3.0.0", path = "../../primitives/io" }
-sp-transaction-pool = { version = "3.0.0", path = "../../primitives/transaction-pool" }
-sp-consensus = { version = "0.9.0", path = "../../primitives/consensus/common" }
-sp-keystore = { version = "0.9.0", path = "../../primitives/keystore" }
-sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
-sp-session = { version = "3.0.0", path = "../../primitives/session" }
-sp-offchain = { version = "3.0.0", path = "../../primitives/offchain" }
-sp-inherents = { version = "3.0.0", path = "../../primitives/inherents" }
-sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
+sp-block-builder = { version = "4.0.0-dev", path = "../../primitives/block-builder" }
+sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
+sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
+sp-transaction-pool = { version = "4.0.0-dev", path = "../../primitives/transaction-pool" }
+sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
+sp-keystore = { version = "0.10.0-dev", path = "../../primitives/keystore" }
+sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
+sp-session = { version = "4.0.0-dev", path = "../../primitives/session" }
+sp-offchain = { version = "4.0.0-dev", path = "../../primitives/offchain" }
+sp-inherents = { version = "4.0.0-dev", path = "../../primitives/inherents" }
+sp-keyring = { version = "4.0.0-dev", path = "../../primitives/keyring" }
 
-sp-externalities = { version = "0.9.0", path = "../../primitives/externalities" }
-sp-state-machine = { version = "0.9.0", path = "../../primitives/state-machine" }
-sp-wasm-interface = { version = "3.0.0", path = "../../primitives/wasm-interface" }
-sp-runtime-interface = { version = "3.0.0", path = "../../primitives/runtime-interface" }
+sp-externalities = { version = "0.10.0-dev", path = "../../primitives/externalities" }
+sp-state-machine = { version = "0.10.0-dev", path = "../../primitives/state-machine" }
+sp-wasm-interface = { version = "4.0.0-dev", path = "../../primitives/wasm-interface" }
+sp-runtime-interface = { version = "4.0.0-dev", path = "../../primitives/runtime-interface" }
 
 # pallets
-frame-system = { version = "3.0.0", path = "../../frame/system" }
+frame-system = { version = "4.0.0-dev", path = "../../frame/system" }
 
 env_logger = "0.7.1"
 log = "0.4.8"
diff --git a/utils/browser/Cargo.toml b/utils/browser/Cargo.toml
index eac1730d5ce2..c1f4c20c3645 100644
--- a/utils/browser/Cargo.toml
+++ b/utils/browser/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-browser-utils"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Utilities for creating a browser light-client."
 edition = "2018"
@@ -22,12 +22,12 @@ js-sys = "0.3.34"
 wasm-bindgen = "0.2.73"
 wasm-bindgen-futures = "0.4.18"
 kvdb-memorydb = "0.10.0"
-sp-database = { version = "3.0.0", path = "../../primitives/database" }
-sc-informant = { version = "0.9.0", path = "../../client/informant" }
-sc-service = { version = "0.9.0", path = "../../client/service", default-features = false }
-sc-network = { path = "../../client/network", version = "0.9.0"}
-sc-chain-spec = { path = "../../client/chain-spec", version = "3.0.0"}
-sc-tracing = { path = "../../client/tracing", version = "3.0.0"}
+sp-database = { version = "4.0.0-dev", path = "../../primitives/database" }
+sc-informant = { version = "0.10.0-dev", path = "../../client/informant" }
+sc-service = { version = "0.10.0-dev", path = "../../client/service", default-features = false }
+sc-network = { path = "../../client/network", version = "0.10.0-dev"}
+sc-chain-spec = { path = "../../client/chain-spec", version = "4.0.0-dev"}
+sc-tracing = { path = "../../client/tracing", version = "4.0.0-dev"}
 
 # Imported just for the `wasm-bindgen` feature
 getrandom = { version = "0.2", features = ["js"] }
diff --git a/utils/frame/benchmarking-cli/Cargo.toml b/utils/frame/benchmarking-cli/Cargo.toml
index 4a88a31b7f64..d6f8da089f15 100644
--- a/utils/frame/benchmarking-cli/Cargo.toml
+++ b/utils/frame/benchmarking-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame-benchmarking-cli"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -13,17 +13,17 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-frame-benchmarking = { version = "3.1.0", path = "../../../frame/benchmarking" }
-frame-support = { version = "3.0.0", path = "../../../frame/support" }
-sp-core = { version = "3.0.0", path = "../../../primitives/core" }
-sc-service = { version = "0.9.0", default-features = false, path = "../../../client/service" }
-sc-cli = { version = "0.9.0", path = "../../../client/cli" }
-sc-client-db = { version = "0.9.0", path = "../../../client/db" }
-sc-executor = { version = "0.9.0", path = "../../../client/executor" }
-sp-externalities = { version = "0.9.0", path = "../../../primitives/externalities" }
-sp-keystore = { version = "0.9.0", path = "../../../primitives/keystore" }
-sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
-sp-state-machine = { version = "0.9.0", path = "../../../primitives/state-machine" }
+frame-benchmarking = { version = "4.0.0-dev", path = "../../../frame/benchmarking" }
+frame-support = { version = "4.0.0-dev", path = "../../../frame/support" }
+sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
+sc-service = { version = "0.10.0-dev", default-features = false, path = "../../../client/service" }
+sc-cli = { version = "0.10.0-dev", path = "../../../client/cli" }
+sc-client-db = { version = "0.10.0-dev", path = "../../../client/db" }
+sc-executor = { version = "0.10.0-dev", path = "../../../client/executor" }
+sp-externalities = { version = "0.10.0-dev", path = "../../../primitives/externalities" }
+sp-keystore = { version = "0.10.0-dev", path = "../../../primitives/keystore" }
+sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
+sp-state-machine = { version = "0.10.0-dev", path = "../../../primitives/state-machine" }
 codec = { version = "2.0.0", package = "parity-scale-codec" }
 structopt = "0.3.8"
 chrono = "0.4"
diff --git a/utils/frame/frame-utilities-cli/Cargo.toml b/utils/frame/frame-utilities-cli/Cargo.toml
index 1fdf4e4cd9a9..1b6597fc9f2f 100644
--- a/utils/frame/frame-utilities-cli/Cargo.toml
+++ b/utils/frame/frame-utilities-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-frame-cli"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -11,12 +11,12 @@ documentation = "https://docs.rs/substrate-frame-cli"
 readme = "README.md"
 
 [dependencies]
-sp-core = { version = "3.0.0", path = "../../../primitives/core" }
-sc-cli = { version = "0.9.0", path = "../../../client/cli" }
-sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
+sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
+sc-cli = { version = "0.10.0-dev", path = "../../../client/cli" }
+sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
 structopt = "0.3.8"
-frame-system = { version = "3.0.0", path = "../../../frame/system" }
-frame-support = { version = "3.0.0", path = "../../../frame/support" }
+frame-system = { version = "4.0.0-dev", path = "../../../frame/system" }
+frame-support = { version = "4.0.0-dev", path = "../../../frame/support" }
 
 [dev-dependencies]
 
diff --git a/utils/frame/remote-externalities/Cargo.toml b/utils/frame/remote-externalities/Cargo.toml
index a7519b7e47f3..3f51b00dd639 100644
--- a/utils/frame/remote-externalities/Cargo.toml
+++ b/utils/frame/remote-externalities/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "remote-externalities"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -23,14 +23,14 @@ codec = { package = "parity-scale-codec", version = "2.0.0" }
 serde_json = "1.0"
 serde = "1.0.0"
 
-sp-io = { version = "3.0.0", path = "../../../primitives/io" }
-sp-core = { version = "3.0.0", path = "../../../primitives/core" }
-sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
+sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
+sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
+sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
 
 [dev-dependencies]
 tokio = { version = "0.2", features = ["macros", "rt-threaded"] }
-pallet-elections-phragmen = { path = "../../../frame/elections-phragmen", version = "4.0.0" }
-frame-support = { path = "../../../frame/support", version = "3.0.0" }
+pallet-elections-phragmen = { path = "../../../frame/elections-phragmen", version = "5.0.0-dev"}
+frame-support = { path = "../../../frame/support", version = "4.0.0-dev"}
 
 [features]
 remote-test = []
diff --git a/utils/frame/rpc/support/Cargo.toml b/utils/frame/rpc/support/Cargo.toml
index ca3705b499a2..4d4631be2025 100644
--- a/utils/frame/rpc/support/Cargo.toml
+++ b/utils/frame/rpc/support/Cargo.toml
@@ -17,10 +17,10 @@ jsonrpc-client-transports = { version = "15.1.0", default-features = false, feat
 jsonrpc-core = "15.1.0"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 serde = "1"
-frame-support = { version = "3.0.0", path = "../../../../frame/support" }
-sp-storage = { version = "3.0.0", path = "../../../../primitives/storage" }
-sc-rpc-api = { version = "0.9.0", path = "../../../../client/rpc-api" }
+frame-support = { version = "4.0.0-dev", path = "../../../../frame/support" }
+sp-storage = { version = "4.0.0-dev", path = "../../../../primitives/storage" }
+sc-rpc-api = { version = "0.10.0-dev", path = "../../../../client/rpc-api" }
 
 [dev-dependencies]
-frame-system = { version = "3.0.0", path = "../../../../frame/system" }
+frame-system = { version = "4.0.0-dev", path = "../../../../frame/system" }
 tokio = "0.2"
diff --git a/utils/frame/rpc/system/Cargo.toml b/utils/frame/rpc/system/Cargo.toml
index 3572400cee52..503d8d86e4a4 100644
--- a/utils/frame/rpc/system/Cargo.toml
+++ b/utils/frame/rpc/system/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-frame-rpc-system"
-version = "3.0.0"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sc-client-api = { version = "3.0.0", path = "../../../../client/api" }
+sc-client-api = { version = "4.0.0-dev", path = "../../../../client/api" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 futures = { version = "0.3.4", features = ["compat"] }
 jsonrpc-core = "15.1.0"
@@ -21,16 +21,16 @@ jsonrpc-core-client = "15.1.0"
 jsonrpc-derive = "15.1.0"
 log = "0.4.8"
 serde = { version = "1.0.101", features = ["derive"] }
-sp-runtime = { version = "3.0.0", path = "../../../../primitives/runtime" }
-sp-api = { version = "3.0.0", path = "../../../../primitives/api" }
-frame-system-rpc-runtime-api = { version = "3.0.0", path = "../../../../frame/system/rpc/runtime-api" }
-sp-core = { version = "3.0.0", path = "../../../../primitives/core" }
-sp-blockchain = { version = "3.0.0", path = "../../../../primitives/blockchain" }
-sc-transaction-pool-api = { version = "3.0.0", path = "../../../../client/transaction-pool/api" }
-sp-block-builder = { version = "3.0.0", path = "../../../../primitives/block-builder" }
-sc-rpc-api = { version = "0.9.0", path = "../../../../client/rpc-api" }
+sp-runtime = { version = "4.0.0-dev", path = "../../../../primitives/runtime" }
+sp-api = { version = "4.0.0-dev", path = "../../../../primitives/api" }
+frame-system-rpc-runtime-api = { version = "4.0.0-dev", path = "../../../../frame/system/rpc/runtime-api" }
+sp-core = { version = "4.0.0-dev", path = "../../../../primitives/core" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../../../primitives/blockchain" }
+sc-transaction-pool-api = { version = "4.0.0-dev", path = "../../../../client/transaction-pool/api" }
+sp-block-builder = { version = "4.0.0-dev", path = "../../../../primitives/block-builder" }
+sc-rpc-api = { version = "0.10.0-dev", path = "../../../../client/rpc-api" }
 
 [dev-dependencies]
 substrate-test-runtime-client = { version = "2.0.0", path = "../../../../test-utils/runtime/client" }
-sp-tracing = { version = "3.0.0", path = "../../../../primitives/tracing" }
-sc-transaction-pool = { version = "3.0.0", path = "../../../../client/transaction-pool" }
+sp-tracing = { version = "4.0.0-dev", path = "../../../../primitives/tracing" }
+sc-transaction-pool = { version = "4.0.0-dev", path = "../../../../client/transaction-pool" }
diff --git a/utils/frame/try-runtime/cli/Cargo.toml b/utils/frame/try-runtime/cli/Cargo.toml
index 2e2335bc5fff..61bfe9290a67 100644
--- a/utils/frame/try-runtime/cli/Cargo.toml
+++ b/utils/frame/try-runtime/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "try-runtime-cli"
-version = "0.9.0"
+version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -18,19 +18,18 @@ parity-scale-codec = { version = "2.0.0" }
 serde = "1.0.0"
 structopt = "0.3.8"
 
-sc-service = { version = "0.9.0", default-features = false, path = "../../../../client/service" }
-sc-cli = { version = "0.9.0", path = "../../../../client/cli" }
-sc-executor = { version = "0.9.0", path = "../../../../client/executor" }
-sc-client-api = { version = "3.0.0", path = "../../../../client/api" }
-sc-chain-spec = { version = "3.0.0", path = "../../../../client/chain-spec" }
-sp-state-machine = { version = "0.9.0", path = "../../../../primitives/state-machine" }
-sp-api = { version = "3.0.0", path = "../../../../primitives/api" }
-sp-blockchain = { version = "3.0.0", path = "../../../../primitives/blockchain" }
-sp-runtime = { version = "3.0.0", path = "../../../../primitives/runtime" }
-sp-externalities = { version = "0.9.0", path = "../../../../primitives/externalities" }
-sp-core = { version = "3.0.0", path = "../../../../primitives/core" }
-sp-io = { version = "3.0.0", path = "../../../../primitives/io" }
-sp-keystore = { version = "0.9.0", path = "../../../../primitives/keystore" }
-frame-try-runtime = { version = "0.9.0", path = "../../../../frame/try-runtime" }
+sc-service = { version = "0.10.0-dev", default-features = false, path = "../../../../client/service" }
+sc-cli = { version = "0.10.0-dev", path = "../../../../client/cli" }
+sc-executor = { version = "0.10.0-dev", path = "../../../../client/executor" }
+sc-client-api = { version = "4.0.0-dev", path = "../../../../client/api" }
+sc-chain-spec = { version = "4.0.0-dev", path = "../../../../client/chain-spec" }
+sp-state-machine = { version = "0.10.0-dev", path = "../../../../primitives/state-machine" }
+sp-api = { version = "4.0.0-dev", path = "../../../../primitives/api" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../../../primitives/blockchain" }
+sp-runtime = { version = "4.0.0-dev", path = "../../../../primitives/runtime" }
+sp-externalities = { version = "0.10.0-dev", path = "../../../../primitives/externalities" }
+sp-core = { version = "4.0.0-dev", path = "../../../../primitives/core" }
+sp-keystore = { version = "0.10.0-dev", path = "../../../../primitives/keystore" }
+frame-try-runtime = { version = "0.10.0-dev", path = "../../../../frame/try-runtime" }
 
-remote-externalities = { version = "0.9.0", path = "../../remote-externalities" }
+remote-externalities = { version = "0.10.0-dev", path = "../../remote-externalities" }
diff --git a/utils/wasm-builder/Cargo.toml b/utils/wasm-builder/Cargo.toml
index 09c86ca76cc1..0b0182b4302a 100644
--- a/utils/wasm-builder/Cargo.toml
+++ b/utils/wasm-builder/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-wasm-builder"
-version = "4.0.0"
+version = "5.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Utility for building WASM binaries"
 edition = "2018"
@@ -21,4 +21,4 @@ walkdir = "2.3.1"
 wasm-gc-api = "0.1.11"
 atty = "0.2.13"
 ansi_term = "0.12.1"
-sp-maybe-compressed-blob = { version = "3.0.0", path = "../../primitives/maybe-compressed-blob" }
+sp-maybe-compressed-blob = { version = "4.0.0-dev", path = "../../primitives/maybe-compressed-blob" }

From 6be513d663836c5c5b8a436f5712402a1c5365a3 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Mon, 12 Jul 2021 10:50:50 +0200
Subject: [PATCH 0978/1194] Remove impl_outer_ macros (#9307)

* remove impl_outer_*

* continue to reexport some unsigned in order not to break users
---
 frame/support/src/dispatch.rs        | 228 +++--------
 frame/support/src/event.rs           | 375 +++---------------
 frame/support/src/genesis_config.rs  | 142 -------
 frame/support/src/inherent.rs        | 449 +--------------------
 frame/support/src/lib.rs             |  17 +-
 frame/support/src/origin.rs          | 569 ---------------------------
 frame/support/src/traits/dispatch.rs |   2 +-
 frame/support/src/unsigned.rs        | 172 --------
 test-utils/runtime/src/lib.rs        |  59 ++-
 9 files changed, 166 insertions(+), 1847 deletions(-)
 delete mode 100644 frame/support/src/genesis_config.rs
 delete mode 100644 frame/support/src/origin.rs
 delete mode 100644 frame/support/src/unsigned.rs

diff --git a/frame/support/src/dispatch.rs b/frame/support/src/dispatch.rs
index ee290a31d5a4..6f98dee8690b 100644
--- a/frame/support/src/dispatch.rs
+++ b/frame/support/src/dispatch.rs
@@ -101,8 +101,7 @@ impl<T> Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 /// * `Module`: The struct generated by the macro, with type `Config`.
 /// * `Call`: The enum generated for every pallet, which implements
 ///   [`Callable`](./dispatch/trait.Callable.html).
-/// * `origin`: Alias of `T::Origin`, declared by the
-///   [`impl_outer_origin!`](./macro.impl_outer_origin.html) macro.
+/// * `origin`: Alias of `T::Origin`.
 /// * `Result`: The expected return type from pallet functions.
 ///
 /// The first parameter of dispatchable functions must always be `origin`.
@@ -2164,157 +2163,6 @@ macro_rules! decl_module {
 	}
 }
 
-/// Implement a meta-dispatch module to dispatch to other dispatchers.
-#[macro_export]
-macro_rules! impl_outer_dispatch {
-	(
-		$(#[$attr:meta])*
-		pub enum $call_type:ident for $runtime:ident where origin: $origin:ty {
-			$(
-				$( #[codec(index = $index:tt)] )? $module:ident::$camelcase:ident,
-			)*
-		}
-	) => {
-		$(#[$attr])*
-		#[derive(
-			Clone, PartialEq, Eq,
-			$crate::codec::Encode,
-			$crate::codec::Decode,
-			$crate::RuntimeDebug,
-		)]
-		pub enum $call_type {
-			$(
-				$( #[codec(index = $index)] )?
-				$camelcase ( $crate::dispatch::CallableCallFor<$camelcase, $runtime> )
-			,)*
-		}
-		impl $crate::dispatch::GetDispatchInfo for $call_type {
-			fn get_dispatch_info(&self) -> $crate::dispatch::DispatchInfo {
-				match self {
-					$( $call_type::$camelcase(call) => call.get_dispatch_info(), )*
-				}
-			}
-		}
-		impl $crate::dispatch::GetCallMetadata for $call_type {
-			fn get_call_metadata(&self) -> $crate::dispatch::CallMetadata {
-				use $crate::dispatch::GetCallName;
-				match self {
-					$( $call_type::$camelcase(call) => {
-						let function_name = call.get_call_name();
-						let pallet_name = stringify!($camelcase);
-						$crate::dispatch::CallMetadata { function_name, pallet_name }
-					}, )*
-				}
-			}
-
-			fn get_module_names() -> &'static [&'static str] {
-				&[$(
-					stringify!($camelcase),
-				)*]
-			}
-
-			fn get_call_names(module: &str) -> &'static [&'static str] {
-				use $crate::dispatch::{Callable, GetCallName};
-				match module {
-					$(
-						stringify!($camelcase) =>
-							<<$camelcase as Callable<$runtime>>::Call
-								as GetCallName>::get_call_names(),
-					)*
-					_ => unreachable!(),
-				}
-			}
-		}
-		impl $crate::dispatch::Dispatchable for $call_type {
-			type Origin = $origin;
-			type Config = $call_type;
-			type Info = $crate::weights::DispatchInfo;
-			type PostInfo = $crate::weights::PostDispatchInfo;
-			fn dispatch(
-				self,
-				origin: $origin,
-			) -> $crate::dispatch::DispatchResultWithPostInfo {
-				if !<Self::Origin as $crate::traits::OriginTrait>::filter_call(&origin, &self) {
-					return $crate::sp_std::result::Result::Err($crate::dispatch::DispatchError::BadOrigin.into())
-				}
-
-				$crate::traits::UnfilteredDispatchable::dispatch_bypass_filter(self, origin)
-			}
-		}
-
-		impl $crate::traits::UnfilteredDispatchable for $call_type {
-			type Origin = $origin;
-			fn dispatch_bypass_filter(
-				self,
-				origin: $origin,
-			) -> $crate::dispatch::DispatchResultWithPostInfo {
-				$crate::impl_outer_dispatch! {
-					@DISPATCH_MATCH
-					self
-					$call_type
-					origin
-					{}
-					0;
-					$( $camelcase ),*
-				}
-			}
-		}
-
-		$(
-			impl $crate::traits::IsSubType<$crate::dispatch::CallableCallFor<$camelcase, $runtime>> for $call_type {
-				#[allow(unreachable_patterns)]
-				fn is_sub_type(&self) -> Option<&$crate::dispatch::CallableCallFor<$camelcase, $runtime>> {
-					match *self {
-						$call_type::$camelcase(ref r) => Some(r),
-						// May be unreachable
-						_ => None,
-					}
-				}
-			}
-
-			impl From<$crate::dispatch::CallableCallFor<$camelcase, $runtime>> for $call_type {
-				fn from(call: $crate::dispatch::CallableCallFor<$camelcase, $runtime>) -> Self {
-					$call_type::$camelcase(call)
-				}
-			}
-		)*
-	};
-	(@DISPATCH_MATCH
-		$self:ident
-		$call_type:ident
-		$origin:ident
-		{ $( $generated:tt )* }
-		$index:expr;
-		$name:ident
-		$( , $rest:ident )*
-	) => {
-		$crate::impl_outer_dispatch! {
-			@DISPATCH_MATCH
-			$self
-			$call_type
-			$origin
-			{
-				$( $generated )*
-				$call_type::$name(call) =>
-					$crate::traits::UnfilteredDispatchable::dispatch_bypass_filter(call, $origin),
-			}
-			$index + 1;
-			$( $rest ),*
-		}
-	};
-	(@DISPATCH_MATCH
-		$self:ident
-		$call_type:ident
-		$origin:ident
-		{ $( $generated:tt )* }
-		$index:expr;
-	) => {
-		match $self {
-			$( $generated )*
-		}
-	}
-}
-
 /// Implement metadata for dispatch.
 #[macro_export]
 #[doc(hidden)]
@@ -2619,7 +2467,7 @@ mod tests {
 	use super::*;
 	use crate::weights::{DispatchInfo, DispatchClass, Pays, RuntimeDbWeight};
 	use crate::traits::{
-		CallMetadata, GetCallMetadata, GetCallName, OnInitialize, OnFinalize, OnIdle, OnRuntimeUpgrade,
+		GetCallName, OnInitialize, OnFinalize, OnIdle, OnRuntimeUpgrade,
 		IntegrityTest, Get, PalletInfo,
 	};
 
@@ -2767,16 +2615,6 @@ mod tests {
 
 	type Test = Module<TraitImpl>;
 
-	impl_outer_origin!{
-		pub enum OuterOrigin for TraitImpl where system = system {}
-	}
-
-	impl_outer_dispatch! {
-		pub enum OuterCall for TraitImpl where origin: OuterOrigin {
-			self::Test,
-		}
-	}
-
 	impl PalletInfo for TraitImpl {
 		fn index<P: 'static>() -> Option<usize> {
 			let type_id = sp_std::any::TypeId::of::<P>();
@@ -2796,10 +2634,56 @@ mod tests {
 		}
 	}
 
+	pub struct OuterOrigin;
+
+	impl crate::traits::OriginTrait for OuterOrigin {
+		type Call = <TraitImpl as system::Config>::Call;
+		type PalletsOrigin = OuterOrigin;
+		type AccountId = <TraitImpl as system::Config>::AccountId;
+
+		fn add_filter(&mut self, _filter: impl Fn(&Self::Call) -> bool + 'static) {
+			unimplemented!("Not required in tests!")
+		}
+
+		fn reset_filter(&mut self) {
+			unimplemented!("Not required in tests!")
+		}
+
+		fn set_caller_from(&mut self, _other: impl Into<Self>) {
+			unimplemented!("Not required in tests!")
+		}
+
+		fn filter_call(&self, _call: &Self::Call) -> bool {
+			unimplemented!("Not required in tests!")
+		}
+
+		fn caller(&self) -> &Self::PalletsOrigin {
+			unimplemented!("Not required in tests!")
+		}
+
+		fn try_with_caller<R>(
+			self,
+			_f: impl FnOnce(Self::PalletsOrigin) -> Result<R, Self::PalletsOrigin>,
+		) -> Result<R, Self> {
+			unimplemented!("Not required in tests!")
+		}
+
+		fn none() -> Self {
+			unimplemented!("Not required in tests!")
+		}
+		fn root() -> Self {
+			unimplemented!("Not required in tests!")
+		}
+		fn signed(_by: <TraitImpl as system::Config>::AccountId) -> Self {
+			unimplemented!("Not required in tests!")
+		}
+	}
+
+
 	impl system::Config for TraitImpl {
 		type Origin = OuterOrigin;
 		type AccountId = u32;
-		type Call = OuterCall;
+		type Call = ();
 		type BaseCallFilter = ();
 		type BlockNumber = u32;
 		type PalletInfo = Self;
@@ -2901,26 +2785,12 @@ mod tests {
 		assert_eq!("aux_3", name);
 	}
 
-	#[test]
-	fn call_metadata() {
-		let call = OuterCall::Test(Call::<TraitImpl>::aux_3());
-		let metadata = call.get_call_metadata();
-		let expected = CallMetadata { function_name: "aux_3".into(), pallet_name: "Test".into() };
-		assert_eq!(metadata, expected);
-	}
-
 	#[test]
 	fn get_call_names() {
 		let call_names = Call::<TraitImpl>::get_call_names();
 		assert_eq!(["aux_0", "aux_1", "aux_2", "aux_3", "aux_4", "aux_5", "operational"], call_names);
 	}
 
-	#[test]
-	fn get_module_names() {
-		let module_names = OuterCall::get_module_names();
-		assert_eq!(["Test"], module_names);
-	}
-
 	#[test]
 	#[should_panic(expected = "integrity_test")]
 	fn integrity_test_should_work() {
diff --git a/frame/support/src/event.rs b/frame/support/src/event.rs
index eb666b6f028a..a1e5609e67ef 100644
--- a/frame/support/src/event.rs
+++ b/frame/support/src/event.rs
@@ -333,220 +333,6 @@ macro_rules! __events_to_metadata {
 	}
 }
 
-/// Constructs an Event type for a runtime. This is usually called automatically by the
-/// construct_runtime macro.
-#[macro_export]
-macro_rules! impl_outer_event {
-	// Macro transformations (to convert invocations with incomplete parameters to the canonical
-	// form)
-	(
-		$(#[$attr:meta])*
-		pub enum $name:ident for $runtime:ident {
-			$( $rest_events:tt )*
-		}
-	) => {
-		$crate::impl_outer_event!(
-			$( #[$attr] )*;
-			$name;
-			$runtime;
-			Modules { $( $rest_events )* };
-			{};
-		);
-	};
-	// Generic + Instance
-	(
-		$(#[$attr:meta])*;
-		$name:ident;
-		$runtime:ident;
-		Modules {
-			$( #[codec(index = $index:tt)] )? $module:ident $instance:ident<T>,
-			$( $rest_event_generic_instance:tt )*
-		};
-		{ $( $parsed:tt )* };
-	) => {
-		$crate::impl_outer_event!(
-			$( #[$attr] )*;
-			$name;
-			$runtime;
-			Modules { $( $rest_event_generic_instance )* };
-			{ $( $parsed )* $module::Event<$runtime>{ $instance } index { $( $index )? }, };
-		);
-	};
-	// Instance
-	(
-		$(#[$attr:meta])*;
-		$name:ident;
-		$runtime:ident;
-		Modules {
-			$( #[codec(index = $index:tt)] )? $module:ident $instance:ident,
-			$( $rest_event_instance:tt )*
-		};
-		{ $( $parsed:tt )* };
-	) => {
-		$crate::impl_outer_event!(
-			$( #[$attr] )*;
-			$name;
-			$runtime;
-			Modules { $( $rest_event_instance )* };
-			{ $( $parsed )* $module::Event { $instance } index { $( $index )? }, };
-		);
-	};
-	// Generic
-	(
-		$(#[$attr:meta])*;
-		$name:ident;
-		$runtime:ident;
-		Modules {
-			$( #[codec(index = $index:tt)] )? $module:ident<T>,
-			$( $rest_event_generic:tt )*
-		};
-		{ $( $parsed:tt )* };
-	) => {
-		$crate::impl_outer_event!(
-			$( #[$attr] )*;
-			$name;
-			$runtime;
-			Modules { $( $rest_event_generic )* };
-			{ $( $parsed )* $module::Event<$runtime> index { $( $index )? }, };
-		);
-	};
-	// No Generic and no Instance
-	(
-		$(#[$attr:meta])*;
-		$name:ident;
-		$runtime:ident;
-		Modules {
-			$( #[codec(index = $index:tt)] )? $module:ident,
-			$( $rest_event_no_generic_no_instance:tt )*
-		};
-		{ $( $parsed:tt )* };
-	) => {
-		$crate::impl_outer_event!(
-			$( #[$attr] )*;
-			$name;
-			$runtime;
-			Modules { $( $rest_event_no_generic_no_instance )* };
-			{ $( $parsed )* $module::Event index { $( $index )? }, };
-		);
-	};
-
-	// The main macro expansion that actually renders the Event enum code.
-	(
-		$(#[$attr:meta])*;
-		$name:ident;
-		$runtime:ident;
-		Modules {};
-		{
-			$(
-				$module_name:ident::Event
-				$( <$generic_param:ident> )?
-				$( { $generic_instance:ident } )?
-				index { $( $index:tt )? },
-			)*
-		};
-	) => {
-		$crate::paste::item! {
-			#[derive(
-				Clone, PartialEq, Eq,
-				$crate::codec::Encode,
-				$crate::codec::Decode,
-				$crate::RuntimeDebug,
-			)]
-			$(#[$attr])*
-			#[allow(non_camel_case_types)]
-			pub enum $name {
-				$(
-					$( #[codec(index = $index)] )?
-					[< $module_name $(_ $generic_instance )? >](
-						$module_name::Event < $( $generic_param )? $(, $module_name::$generic_instance )? >
-					),
-				)*
-			}
-			$(
-				impl From<$module_name::Event < $( $generic_param, )? $( $module_name::$generic_instance )? >> for $name {
-					fn from(x: $module_name::Event < $( $generic_param, )? $( $module_name::$generic_instance )? >) -> Self {
-						$name::[< $module_name $(_ $generic_instance )? >](x)
-					}
-				}
-				impl $crate::sp_std::convert::TryInto<
-					$module_name::Event < $( $generic_param, )? $( $module_name::$generic_instance )? >
-				> for $name {
-					type Error = ();
-
-					fn try_into(self) -> $crate::sp_std::result::Result<
-						$module_name::Event < $( $generic_param, )? $( $module_name::$generic_instance )? >, Self::Error
-					> {
-						match self {
-							Self::[< $module_name $(_ $generic_instance )? >](evt) => Ok(evt),
-							_ => Err(()),
-						}
-					}
-				}
-			)*
-		}
-		$crate::__impl_outer_event_json_metadata!(
-			$runtime;
-			$name;
-			$(
-				$module_name::Event
-				< $( $generic_param )? $(, $module_name::$generic_instance )? >
-				$( $generic_instance )?,
-			)*;
-		);
-	}
-}
-
-#[macro_export]
-#[doc(hidden)]
-macro_rules! __impl_outer_event_json_metadata {
-	(
-		$runtime:ident;
-		$event_name:ident;
-		$( $module_name:ident::Event < $( $generic_params:path ),* > $( $instance:ident )?, )*;
-	) => {
-		impl $runtime {
-			#[allow(dead_code)]
-			pub fn outer_event_metadata() -> $crate::event::OuterEventMetadata {
-				$crate::event::OuterEventMetadata {
-					name: $crate::event::DecodeDifferent::Encode(stringify!($event_name)),
-					events: $crate::event::DecodeDifferent::Encode(&[
-						$(
-							(
-								stringify!($module_name),
-								$crate::event::FnEncode(
-									$module_name::Event ::< $( $generic_params ),* > ::metadata
-								)
-							)
-						),*
-					])
-				}
-			}
-
-			$crate::__impl_outer_event_json_metadata! {
-				@DECL_MODULE_EVENT_FNS
-				$( $module_name < $( $generic_params ),* > $( $instance )? ; )*
-			}
-		}
-	};
-
-	(@DECL_MODULE_EVENT_FNS
-		$(
-			$module_name:ident < $( $generic_params:path ),* > $( $instance:ident )? ;
-		)*
-	) => {
-		$crate::paste::item! {
-			$(
-				#[allow(dead_code)]
-				pub fn [< __module_events_ $module_name $( _ $instance )? >] () ->
-					&'static [$crate::event::EventMetadata]
-				{
-					$module_name::Event ::< $( $generic_params ),* > ::metadata()
-				}
-			)*
-		}
-	}
-}
-
 #[cfg(test)]
 #[allow(dead_code)]
 mod tests {
@@ -697,27 +483,9 @@ mod tests {
 	#[derive(Debug, Clone, PartialEq, Eq, Encode, Decode, Serialize)]
 	pub struct TestRuntime;
 
-	impl_outer_event! {
-		pub enum TestEvent for TestRuntime {
-			system,
-			event_module<T>,
-			event_module2<T>,
-			event_module3,
-		}
-	}
-
 	#[derive(Debug, Clone, PartialEq, Eq, Encode, Decode, Serialize)]
 	pub struct TestRuntime2;
 
-	impl_outer_event! {
-		pub enum TestEventSystemRenamed for TestRuntime2 {
-			system_renamed,
-			event_module<T>,
-			#[codec(index = 5)] event_module2<T>,
-			event_module3,
-		}
-	}
-
 	impl event_module::Config for TestRuntime {
 		type Balance = u32;
 	}
@@ -733,104 +501,57 @@ mod tests {
 		type DbWeight = ();
 	}
 
-	impl event_module::Config for TestRuntime2 {
-		type Balance = u32;
-	}
-
-	impl event_module2::Config for TestRuntime2 {
-		type Balance = u32;
-	}
-
-	impl system_renamed::Config for TestRuntime2 {
-		type Origin = u32;
-		type BlockNumber = u32;
-		type PalletInfo = crate::tests::PanicPalletInfo;
-		type DbWeight = ();
-	}
-
-	impl system::Config for TestRuntime2 {
-		type Origin = u32;
-		type BlockNumber = u32;
-		type PalletInfo = crate::tests::PanicPalletInfo;
-		type DbWeight = ();
-	}
-
-	const EXPECTED_METADATA: OuterEventMetadata = OuterEventMetadata {
-		name: DecodeDifferent::Encode("TestEvent"),
-		events: DecodeDifferent::Encode(&[
-			(
-				"system",
-				FnEncode(|| &[
-					EventMetadata {
-						name: DecodeDifferent::Encode("SystemEvent"),
-						arguments: DecodeDifferent::Encode(&[]),
-						documentation: DecodeDifferent::Encode(&[]),
-					}
-				])
-			),
-			(
-				"event_module",
-				FnEncode(|| &[
-					EventMetadata {
-						name: DecodeDifferent::Encode("TestEvent"),
-						arguments: DecodeDifferent::Encode(&[ "Balance", "Origin" ]),
-						documentation: DecodeDifferent::Encode(&[ " Hi, I am a comment." ])
-					},
-					EventMetadata {
-						name: DecodeDifferent::Encode("EventWithoutParams"),
-						arguments: DecodeDifferent::Encode(&[]),
-						documentation: DecodeDifferent::Encode(&[ " Dog" ]),
-					},
-				])
-			),
-			(
-				"event_module2",
-				FnEncode(|| &[
-					EventMetadata {
-						name: DecodeDifferent::Encode("TestEvent"),
-						arguments: DecodeDifferent::Encode(&[ "BalanceRenamed" ]),
-						documentation: DecodeDifferent::Encode(&[])
-					},
-					EventMetadata {
-						name: DecodeDifferent::Encode("TestOrigin"),
-						arguments: DecodeDifferent::Encode(&[ "OriginRenamed" ]),
-						documentation: DecodeDifferent::Encode(&[]),
-					},
-				])
-			),
-			(
-				"event_module3",
-				FnEncode(|| &[
-					EventMetadata {
-						name: DecodeDifferent::Encode("HiEvent"),
-						arguments: DecodeDifferent::Encode(&[]),
-						documentation: DecodeDifferent::Encode(&[])
-					}
-				])
-			)
-		])
-	};
-
-	#[test]
-	fn outer_event_metadata() {
-		assert_eq!(EXPECTED_METADATA, TestRuntime::outer_event_metadata());
-	}
-
 	#[test]
-	fn test_codec() {
-		let runtime_1_event_module_2 = TestEvent::event_module2(
-			event_module2::Event::<TestRuntime>::TestEvent(3)
+	fn event_metadata() {
+		assert_eq!(
+			system_renamed::Event::metadata(),
+			&[
+				EventMetadata {
+					name: DecodeDifferent::Encode("SystemEvent"),
+					arguments: DecodeDifferent::Encode(&[]),
+					documentation: DecodeDifferent::Encode(&[]),
+				},
+			]
 		);
-		assert_eq!(runtime_1_event_module_2.encode()[0], 2);
-
-		let runtime_2_event_module_2 = TestEventSystemRenamed::event_module2(
-			event_module2::Event::<TestRuntime2>::TestEvent(3)
+		assert_eq!(
+			event_module::Event::<TestRuntime>::metadata(),
+			&[
+				EventMetadata {
+					name: DecodeDifferent::Encode("TestEvent"),
+					arguments: DecodeDifferent::Encode(&[ "Balance", "Origin" ]),
+					documentation: DecodeDifferent::Encode(&[ " Hi, I am a comment." ])
+				},
+				EventMetadata {
+					name: DecodeDifferent::Encode("EventWithoutParams"),
+					arguments: DecodeDifferent::Encode(&[]),
+					documentation: DecodeDifferent::Encode(&[ " Dog" ]),
+				},
+			]
+		);
+		assert_eq!(
+			event_module2::Event::<TestRuntime>::metadata(),
+			&[
+				EventMetadata {
+					name: DecodeDifferent::Encode("TestEvent"),
+					arguments: DecodeDifferent::Encode(&[ "BalanceRenamed" ]),
+					documentation: DecodeDifferent::Encode(&[])
+				},
+				EventMetadata {
+					name: DecodeDifferent::Encode("TestOrigin"),
+					arguments: DecodeDifferent::Encode(&[ "OriginRenamed" ]),
+					documentation: DecodeDifferent::Encode(&[]),
+				},
+			]
 		);
-		assert_eq!(runtime_2_event_module_2.encode()[0], 5);
-		
-		let runtime_2_event_module_3 = TestEventSystemRenamed::event_module3(
-			event_module3::Event::HiEvent
+		assert_eq!(
+			event_module3::Event::metadata(),
+			&[
+				EventMetadata {
+					name: DecodeDifferent::Encode("HiEvent"),
+					arguments: DecodeDifferent::Encode(&[]),
+					documentation: DecodeDifferent::Encode(&[])
+				}
+			],
 		);
-		assert_eq!(runtime_2_event_module_3.encode()[0], 3);
 	}
 }
diff --git a/frame/support/src/genesis_config.rs b/frame/support/src/genesis_config.rs
deleted file mode 100644
index e6ba86f9fe92..000000000000
--- a/frame/support/src/genesis_config.rs
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Macros for generating the runtime genesis config.
-
-/// Helper macro for `impl_outer_config`
-#[macro_export]
-macro_rules! __impl_outer_config_types {
-	// Generic + Instance
-	(
-		$concrete:ident $config:ident $snake:ident { $instance:ident } < $ignore:ident >;
-		$( $rest:tt )*
-	) => {
-		#[cfg(any(feature = "std", test))]
-		pub type $config = $snake::GenesisConfig<$concrete, $snake::$instance>;
-		$crate::__impl_outer_config_types! { $concrete $( $rest )* }
-	};
-	// Generic
-	(
-		$concrete:ident $config:ident $snake:ident < $ignore:ident >;
-		$( $rest:tt )*
-	) => {
-		#[cfg(any(feature = "std", test))]
-		pub type $config = $snake::GenesisConfig<$concrete>;
-		$crate::__impl_outer_config_types! { $concrete $( $rest )* }
-	};
-	// No Generic and maybe Instance
-	(
-		$concrete:ident $config:ident $snake:ident $( { $instance:ident } )?;
-		$( $rest:tt )*
-	) => {
-		#[cfg(any(feature = "std", test))]
-		pub type $config = $snake::GenesisConfig;
-		$crate::__impl_outer_config_types! { $concrete $( $rest )* }
-	};
-	($concrete:ident) => ()
-}
-
-/// Implement the runtime genesis configuration.
-///
-/// This combines all pallet genesis configurations into one runtime
-/// specific genesis configuration.
-///
-/// ```ignore
-/// pub struct GenesisConfig for Runtime where AllPalletsWithSystem = AllPalletsWithSystem {
-/// 	rust_module_one: Option<ModuleOneConfig>,
-/// 	...
-/// }
-/// ```
-#[macro_export]
-macro_rules! impl_outer_config {
-	(
-		pub struct $main:ident for $concrete:ident where
-			AllPalletsWithSystem = $all_pallets_with_system:ident
-		{
-			$( $config:ident =>
-				$snake:ident $( $instance:ident )? $( <$generic:ident> )*, )*
-		}
-	) => {
-		$crate::__impl_outer_config_types! {
-			$concrete $( $config $snake $( { $instance } )? $( <$generic> )*; )*
-		}
-
-		$crate::paste::item! {
-			#[cfg(any(feature = "std", test))]
-			use $crate::serde as __genesis_config_serde_import__;
-			#[cfg(any(feature = "std", test))]
-			#[derive($crate::serde::Serialize, $crate::serde::Deserialize, Default)]
-			#[serde(rename_all = "camelCase")]
-			#[serde(deny_unknown_fields)]
-			#[serde(crate = "__genesis_config_serde_import__")]
-			pub struct $main {
-				$(
-					pub [< $snake $(_ $instance )? >]: $config,
-				)*
-			}
-			#[cfg(any(feature = "std", test))]
-			impl $crate::sp_runtime::BuildStorage for $main {
-				fn assimilate_storage(
-					&self,
-					storage: &mut $crate::sp_runtime::Storage,
-				) -> std::result::Result<(), String> {
-					$(
-						$crate::impl_outer_config! {
-							@CALL_FN
-							$concrete;
-							$snake;
-							$( $instance )?;
-							&self.[< $snake $(_ $instance )? >];
-							storage;
-						}
-					)*
-
-					$crate::BasicExternalities::execute_with_storage(storage, || {
-						<$all_pallets_with_system as $crate::traits::OnGenesis>::on_genesis();
-					});
-
-					Ok(())
-				}
-			}
-		}
-	};
-	(@CALL_FN
-		$runtime:ident;
-		$module:ident;
-		$instance:ident;
-		$extra:expr;
-		$storage:ident;
-	) => {
-		$crate::sp_runtime::BuildModuleGenesisStorage::<$runtime, $module::$instance>::build_module_genesis_storage(
-			$extra,
-			$storage,
-		)?;
-	};
-	(@CALL_FN
-		$runtime:ident;
-		$module:ident;
-		;
-		$extra:expr;
-		$storage:ident;
-	) => {
-		$crate::sp_runtime::BuildModuleGenesisStorage::
-			<$runtime, $module::__InherentHiddenInstance>::build_module_genesis_storage(
-				$extra,
-				$storage,
-			)?;
-	}
-}
diff --git a/frame/support/src/inherent.rs b/frame/support/src/inherent.rs
index 4ce5958adbe9..cccbbbaa517c 100644
--- a/frame/support/src/inherent.rs
+++ b/frame/support/src/inherent.rs
@@ -43,8 +43,8 @@ pub trait ProvideInherent {
 	/// - `Ok(None)` indicates that this inherent is not required in this block. The default
 	/// implementation returns this.
 	///
-	/// - `Ok(Some(e))` indicates that this inherent is required in this block. The
-	/// `impl_outer_inherent!`, will call this function from its `check_extrinsics`.
+	/// - `Ok(Some(e))` indicates that this inherent is required in this block. `construct_runtime!`
+	/// will call this function from in its implementation of `fn check_extrinsics`.
 	/// If the inherent is not present, it will return `e`.
 	///
 	/// - `Err(_)` indicates that this function failed and further operations should be aborted.
@@ -80,448 +80,3 @@ pub trait ProvideInherent {
 	/// Otherwise block producer can produce invalid blocks by including them after non inherent.
 	fn is_inherent(call: &Self::Call) -> bool;
 }
-
-/// Implement the outer inherent.
-/// All given modules need to implement [`ProvideInherent`].
-///
-/// # Example
-///
-/// ```nocompile
-/// impl_outer_inherent! {
-///     impl Inherents where
-///         Block = Block,
-///         UncheckedExtrinsic = UncheckedExtrinsic,
-///         Runtime = Runtime,
-///     {
-///         timestamp,
-///         consensus,
-///         aura,
-///     }
-/// }
-/// ```
-#[macro_export]
-macro_rules! impl_outer_inherent {
-	(
-		impl Inherents where
-			Block = $block:ident,
-			UncheckedExtrinsic = $uncheckedextrinsic:ident,
-			Runtime = $runtime:ident,
-		{
-			$( $module:ident, )*
-		}
-	) => {
-		trait InherentDataExt {
-			fn create_extrinsics(&self) ->
-				$crate::inherent::Vec<<$block as $crate::inherent::BlockT>::Extrinsic>;
-			fn check_extrinsics(&self, block: &$block) -> $crate::inherent::CheckInherentsResult;
-		}
-
-		impl InherentDataExt for $crate::inherent::InherentData {
-			fn create_extrinsics(&self) ->
-				$crate::inherent::Vec<<$block as $crate::inherent::BlockT>::Extrinsic> {
-				use $crate::inherent::ProvideInherent;
-
-				let mut inherents = Vec::new();
-
-				$(
-					if let Some(inherent) = $module::create_inherent(self) {
-						let inherent = <$uncheckedextrinsic as $crate::inherent::Extrinsic>::new(
-							inherent.into(),
-							None,
-						).expect("Runtime UncheckedExtrinsic is not Opaque, so it has to return \
-							`Some`; qed");
-
-						inherents.push(inherent);
-					}
-				)*
-
-				inherents
-			}
-
-			fn check_extrinsics(&self, block: &$block) -> $crate::inherent::CheckInherentsResult {
-				use $crate::inherent::{ProvideInherent, IsFatalError};
-				use $crate::traits::{IsSubType, ExtrinsicCall};
-				use $crate::sp_runtime::traits::Block as _;
-
-				let mut result = $crate::inherent::CheckInherentsResult::new();
-
-				for xt in block.extrinsics() {
-					// Inherents are before any other extrinsics.
-					// And signed extrinsics are not inherents.
-					if $crate::inherent::Extrinsic::is_signed(xt).unwrap_or(false) {
-						break
-					}
-
-					let mut is_inherent = false;
-
-					$({
-						let call = <$uncheckedextrinsic as ExtrinsicCall>::call(xt);
-						if let Some(call) = IsSubType::<_>::is_sub_type(call) {
-							if $module::is_inherent(call) {
-								is_inherent = true;
-								if let Err(e) = $module::check_inherent(call, self) {
-									result.put_error(
-										$module::INHERENT_IDENTIFIER, &e
-									).expect("There is only one fatal error; qed");
-									if e.is_fatal_error() {
-										return result
-									}
-								}
-							}
-						}
-					})*
-
-					// Inherents are before any other extrinsics.
-					// No module marked it as inherent thus it is not.
-					if !is_inherent {
-						break
-					}
-				}
-
-				$(
-					match $module::is_inherent_required(self) {
-						Ok(Some(e)) => {
-							let found = block.extrinsics().iter().any(|xt| {
-								let is_signed = $crate::inherent::Extrinsic::is_signed(xt)
-									.unwrap_or(false);
-
-								if !is_signed {
-									let call = <
-										$uncheckedextrinsic as ExtrinsicCall
-									>::call(xt);
-									if let Some(call) = IsSubType::<_>::is_sub_type(call) {
-										$module::is_inherent(&call)
-									} else {
-										false
-									}
-								} else {
-									// Signed extrinsics are not inherents.
-									false
-								}
-							});
-
-							if !found {
-								result.put_error(
-									$module::INHERENT_IDENTIFIER, &e
-								).expect("There is only one fatal error; qed");
-								if e.is_fatal_error() {
-									return result
-								}
-							}
-						},
-						Ok(None) => (),
-						Err(e) => {
-							result.put_error(
-								$module::INHERENT_IDENTIFIER, &e
-							).expect("There is only one fatal error; qed");
-							if e.is_fatal_error() {
-								return result
-							}
-						},
-					}
-				)*
-
-				result
-			}
-		}
-
-		impl $crate::traits::EnsureInherentsAreFirst<$block> for $runtime {
-			fn ensure_inherents_are_first(block: &$block) -> Result<(), u32> {
-				use $crate::inherent::ProvideInherent;
-				use $crate::traits::{IsSubType, ExtrinsicCall};
-				use $crate::sp_runtime::traits::Block as _;
-
-				let mut first_signed_observed = false;
-
-				for (i, xt) in block.extrinsics().iter().enumerate() {
-					let is_signed = $crate::inherent::Extrinsic::is_signed(xt).unwrap_or(false);
-
-					let is_inherent = if is_signed {
-						// Signed extrinsics are not inherents.
-						false
-					} else {
-						let mut is_inherent = false;
-						$({
-							let call = <$uncheckedextrinsic as ExtrinsicCall>::call(xt);
-							if let Some(call) = IsSubType::<_>::is_sub_type(call) {
-								if $module::is_inherent(&call) {
-									is_inherent = true;
-								}
-							}
-						})*
-						is_inherent
-					};
-
-					if !is_inherent {
-						first_signed_observed = true;
-					}
-
-					if first_signed_observed && is_inherent {
-						return Err(i as u32)
-					}
-				}
-
-				Ok(())
-			}
-		}
-	};
-}
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use sp_runtime::{traits, testing::{Header, self}};
-
-	#[derive(codec::Encode, codec::Decode, Clone, PartialEq, Eq, Debug, serde::Serialize)]
-	enum Call {
-		Test(CallTest),
-		Test2(CallTest2),
-	}
-
-	impl From<CallTest> for Call {
-		fn from(call: CallTest) -> Self {
-			Self::Test(call)
-		}
-	}
-
-	impl From<CallTest2> for Call {
-		fn from(call: CallTest2) -> Self {
-			Self::Test2(call)
-		}
-	}
-
-	impl crate::traits::IsSubType<CallTest> for Call {
-		fn is_sub_type(&self) -> Option<&CallTest> {
-			match self {
-				Self::Test(test) => Some(test),
-				_ => None,
-			}
-		}
-	}
-
-	impl crate::traits::IsSubType<CallTest2> for Call {
-		fn is_sub_type(&self) -> Option<&CallTest2> {
-			match self {
-				Self::Test2(test) => Some(test),
-				_ => None,
-			}
-		}
-	}
-
-	#[derive(codec::Encode, codec::Decode, Clone, PartialEq, Eq, Debug, serde::Serialize)]
-	enum CallTest {
-		OptionalInherent(bool),
-		NotInherent,
-	}
-
-	#[derive(codec::Encode, codec::Decode, Clone, PartialEq, Eq, Debug, serde::Serialize)]
-	enum CallTest2 {
-		RequiredInherent,
-	}
-
-	struct ModuleTest;
-	impl ProvideInherent for ModuleTest {
-		type Call = CallTest;
-		type Error = sp_inherents::MakeFatalError<()>;
-		const INHERENT_IDENTIFIER: sp_inherents::InherentIdentifier = *b"test1235";
-
-		fn create_inherent(_: &InherentData) -> Option<Self::Call> {
-			Some(CallTest::OptionalInherent(true))
-		}
-
-		fn check_inherent(call: &Self::Call, _: &InherentData) -> Result<(), Self::Error> {
-			match call {
-				CallTest::OptionalInherent(true) => Ok(()),
-				CallTest::OptionalInherent(false) => Err(().into()),
-				_ => unreachable!("other calls are not inherents"),
-			}
-		}
-
-		fn is_inherent(call: &Self::Call) -> bool {
-			matches!(call, CallTest::OptionalInherent(_))
-		}
-	}
-
-	struct ModuleTest2;
-	impl ProvideInherent for ModuleTest2 {
-		type Call = CallTest2;
-		type Error = sp_inherents::MakeFatalError<()>;
-		const INHERENT_IDENTIFIER: sp_inherents::InherentIdentifier = *b"test1234";
-
-		fn create_inherent(_: &InherentData) -> Option<Self::Call> {
-			Some(CallTest2::RequiredInherent)
-		}
-
-		fn is_inherent_required(_: &InherentData) -> Result<Option<Self::Error>, Self::Error> {
-			Ok(Some(().into()))
-		}
-
-		fn is_inherent(call: &Self::Call) -> bool {
-			matches!(call, CallTest2::RequiredInherent)
-		}
-	}
-
-	type Block = testing::Block<Extrinsic>;
-
-	#[derive(codec::Encode, codec::Decode, Clone, PartialEq, Eq, Debug, serde::Serialize)]
-	struct Extrinsic {
-		signed: bool,
-		function: Call,
-	}
-
-	impl traits::Extrinsic for Extrinsic {
-		type Call = Call;
-		type SignaturePayload = ();
-
-		fn new(function: Call, signed_data: Option<()>) -> Option<Self> {
-			Some(Self {
-				function,
-				signed: signed_data.is_some(),
-			})
-		}
-
-		fn is_signed(&self) -> Option<bool> {
-			Some(self.signed)
-		}
-	}
-
-	impl crate::traits::ExtrinsicCall for Extrinsic {
-		fn call(&self) -> &Self::Call {
-			&self.function
-		}
-	}
-
-	parity_util_mem::malloc_size_of_is_0!(Extrinsic);
-
-	struct Runtime;
-
-	impl_outer_inherent! {
-		impl Inherents where
-			Block = Block,
-			UncheckedExtrinsic = Extrinsic,
-			Runtime = Runtime,
-		{
-			ModuleTest,
-			ModuleTest2,
-		}
-	}
-
-	#[test]
-	fn create_inherents_works() {
-		let inherents = InherentData::new().create_extrinsics();
-
-		let expected = vec![
-			Extrinsic { function: Call::Test(CallTest::OptionalInherent(true)), signed: false },
-			Extrinsic { function: Call::Test2(CallTest2::RequiredInherent), signed: false },
-		];
-		assert_eq!(expected, inherents);
-	}
-
-	#[test]
-	fn check_inherents_works() {
-		let block = Block::new(
-			Header::new_from_number(1),
-			vec![
-				Extrinsic { function: Call::Test2(CallTest2::RequiredInherent), signed: false },
-				Extrinsic { function: Call::Test(CallTest::OptionalInherent(true)), signed: false },
-			],
-		);
-
-		assert!(InherentData::new().check_extrinsics(&block).ok());
-
-		let block = Block::new(
-			Header::new_from_number(1),
-			vec![
-				Extrinsic { function: Call::Test2(CallTest2::RequiredInherent), signed: false },
-				Extrinsic { function: Call::Test(CallTest::OptionalInherent(false)), signed: false },
-			],
-		);
-
-		assert!(InherentData::new().check_extrinsics(&block).fatal_error());
-	}
-
-	#[test]
-	fn required_inherents_enforced() {
-		let block = Block::new(
-			Header::new_from_number(1),
-			vec![
-				Extrinsic { function: Call::Test(CallTest::OptionalInherent(true)), signed: false }
-			],
-		);
-
-		assert!(InherentData::new().check_extrinsics(&block).fatal_error());
-	}
-
-	#[test]
-	fn signed_are_not_inherent() {
-		let block = Block::new(
-			Header::new_from_number(1),
-			vec![
-				Extrinsic { function: Call::Test2(CallTest2::RequiredInherent), signed: false },
-				// NOTE: checking this call would fail, but it is not checked as it is not an
-				// inherent, because it is signed.
-				Extrinsic { function: Call::Test(CallTest::OptionalInherent(false)), signed: true },
-			],
-		);
-
-		assert!(InherentData::new().check_extrinsics(&block).ok());
-
-		let block = Block::new(
-			Header::new_from_number(1),
-			vec![
-				// NOTE: this is not considered an inherent, thus block is failing because of
-				// missing required inherent.
-				Extrinsic { function: Call::Test2(CallTest2::RequiredInherent), signed: true },
-			],
-		);
-
-		assert_eq!(
-			InherentData::new().check_extrinsics(&block).into_errors().collect::<Vec<_>>(),
-			vec![(*b"test1234", vec![])],
-		);
-	}
-
-	#[test]
-	fn inherent_first_works() {
-		use crate::traits::EnsureInherentsAreFirst;
-		let block = Block::new(
-			Header::new_from_number(1),
-			vec![
-				Extrinsic { function: Call::Test2(CallTest2::RequiredInherent), signed: false },
-				Extrinsic { function: Call::Test(CallTest::OptionalInherent(true)), signed: false },
-				Extrinsic { function: Call::Test(CallTest::NotInherent), signed: false },
-				Extrinsic { function: Call::Test(CallTest::NotInherent), signed: false },
-			],
-		);
-
-		assert!(Runtime::ensure_inherents_are_first(&block).is_ok());
-	}
-
-	#[test]
-	fn inherent_cannot_be_placed_after_non_inherent() {
-		use crate::traits::EnsureInherentsAreFirst;
-		let block = Block::new(
-			Header::new_from_number(1),
-			vec![
-				Extrinsic { function: Call::Test2(CallTest2::RequiredInherent), signed: false },
-				Extrinsic { function: Call::Test(CallTest::NotInherent), signed: false },
-				// This inherent is placed after non inherent: invalid
-				Extrinsic { function: Call::Test(CallTest::OptionalInherent(true)), signed: false },
-			],
-		);
-
-		assert_eq!(Runtime::ensure_inherents_are_first(&block).err().unwrap(), 2);
-
-		let block = Block::new(
-			Header::new_from_number(1),
-			vec![
-				Extrinsic { function: Call::Test2(CallTest2::RequiredInherent), signed: false },
-				Extrinsic { function: Call::Test(CallTest::OptionalInherent(true)), signed: true },
-				// This inherent is placed after non inherent: invalid
-				Extrinsic { function: Call::Test(CallTest::OptionalInherent(true)), signed: false },
-			],
-		);
-
-		assert_eq!(Runtime::ensure_inherents_are_first(&block).err().unwrap(), 2);
-	}
-}
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 4134c7302a4c..76405d939bc9 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -49,26 +49,29 @@ pub use log;
 #[doc(hidden)]
 pub use frame_metadata as metadata;
 
-#[macro_use]
-mod origin;
 #[macro_use]
 pub mod dispatch;
 pub mod storage;
 mod hash;
 #[macro_use]
 pub mod event;
-#[macro_use]
-pub mod genesis_config;
-#[macro_use]
 pub mod inherent;
 #[macro_use]
-pub mod unsigned;
-#[macro_use]
 pub mod error;
 pub mod traits;
 pub mod weights;
 pub mod instances;
 
+#[doc(hidden)]
+pub mod unsigned {
+	#[doc(hidden)]
+	pub use crate::sp_runtime::traits::ValidateUnsigned;
+	#[doc(hidden)]
+	pub use crate::sp_runtime::transaction_validity::{
+		TransactionValidity, UnknownTransaction, TransactionValidityError, TransactionSource,
+	};
+}
+
 pub use self::hash::{
 	Twox256, Twox128, Blake2_256, Blake2_128, Identity, Twox64Concat, Blake2_128Concat, Hashable,
 	StorageHasher, ReversibleStorageHasher
diff --git a/frame/support/src/origin.rs b/frame/support/src/origin.rs
deleted file mode 100644
index 4341c7c653e8..000000000000
--- a/frame/support/src/origin.rs
+++ /dev/null
@@ -1,569 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Macros that define an Origin type. Every function call to your runtime has an origin which
-//! specifies where the extrinsic was generated from.
-
-/// Constructs an Origin type for a runtime. This is usually called automatically by the
-/// construct_runtime macro. See also __create_decl_macro.
-#[macro_export]
-macro_rules! impl_outer_origin {
-
-	// Macro transformations (to convert invocations with incomplete parameters to the canonical
-	// form)
-	(
-		$(#[$attr:meta])*
-		pub enum $name:ident for $runtime:ident {
-			$( $rest_without_system:tt )*
-		}
-	) => {
-		$crate::impl_outer_origin! {
-			$(#[$attr])*
-			pub enum $name for $runtime where system = frame_system {
-				$( $rest_without_system )*
-			}
-		}
-	};
-
-	(
-		$(#[$attr:meta])*
-		pub enum $name:ident for $runtime:ident where
-			system = $system:ident
-			$(, system_index = $system_index:tt)?
-		{
-			$( $rest_with_system:tt )*
-		}
-	) => {
-		$crate::paste::item! {
-			$crate::impl_outer_origin!(
-				$( #[$attr] )*;
-				$name;
-				[< $name Caller >];
-				$runtime;
-				$system;
-				system_index { $( $system_index )? };
-				Modules { $( $rest_with_system )* };
-			);
-		}
-	};
-
-	// Generic + Instance
-	(
-		$(#[$attr:meta])*;
-		$name:ident;
-		$caller_name:ident;
-		$runtime:ident;
-		$system:ident;
-		system_index { $( $system_index:tt )? };
-		Modules {
-			$( #[codec(index = $index:tt)] )? $module:ident $instance:ident <T>
-			$(, $( $rest_module:tt )* )?
-		};
-		$( $parsed:tt )*
-	) => {
-		$crate::impl_outer_origin!(
-			$( #[$attr] )*;
-			$name;
-			$caller_name;
-			$runtime;
-			$system;
-			system_index { $( $system_index )? };
-			Modules { $( $( $rest_module )* )? };
-			$( $parsed )* $module <$runtime> { $instance } index { $( $index )? },
-		);
-	};
-
-	// Instance
-	(
-		$(#[$attr:meta])*;
-		$name:ident;
-		$caller_name:ident;
-		$runtime:ident;
-		$system:ident;
-		system_index { $( $system_index:tt )? };
-		Modules {
-			$( #[codec(index = $index:tt )] )? $module:ident $instance:ident
-			$(, $rest_module:tt )*
-		};
-		$( $parsed:tt )*
-	) => {
-		$crate::impl_outer_origin!(
-			$( #[$attr] )*;
-			$name;
-			$caller_name;
-			$runtime;
-			$system;
-			system_index { $( $system_index )? };
-			Modules { $( $rest_module )* };
-			$( $parsed )* $module { $instance } index { $( $index )? },
-		);
-	};
-
-	// Generic
-	(
-		$(#[$attr:meta])*;
-		$name:ident;
-		$caller_name:ident;
-		$runtime:ident;
-		$system:ident;
-		system_index { $( $system_index:tt )? };
-		Modules {
-			$( #[codec(index = $index:tt )] )? $module:ident <T>
-			$(, $( $rest_module:tt )* )?
-		};
-		$( $parsed:tt )*
-	) => {
-		$crate::impl_outer_origin!(
-			$( #[$attr] )*;
-			$name;
-			$caller_name;
-			$runtime;
-			$system;
-			system_index { $( $system_index )? };
-			Modules { $( $( $rest_module )* )? };
-			$( $parsed )* $module <$runtime> index { $( $index )? },
-		);
-	};
-
-	// No Generic and no Instance
-	(
-		$(#[$attr:meta])*;
-		$name:ident;
-		$caller_name:ident;
-		$runtime:ident;
-		$system:ident;
-		system_index { $( $system_index:tt )? };
-		Modules {
-			$( #[codec(index = $index:tt )] )? $module:ident
-			$(, $( $rest_module:tt )* )?
-		};
-		$( $parsed:tt )*
-	) => {
-		$crate::impl_outer_origin!(
-			$( #[$attr] )*;
-			$name;
-			$caller_name;
-			$runtime;
-			$system;
-			system_index { $( $system_index )? };
-			Modules { $( $( $rest_module )* )? };
-			$( $parsed )* $module index { $( $index )? },
-		);
-	};
-
-	// The main macro expansion that actually renders the Origin enum code.
-	(
-		$(#[$attr:meta])*;
-		$name:ident;
-		$caller_name:ident;
-		$runtime:ident;
-		$system:ident;
-		system_index { $( $system_index:tt )? };
-		Modules { };
-		$(
-			$module:ident
-			$( < $generic:ident > )?
-			$( { $generic_instance:ident } )?
-			index { $( $index:tt )? },
-		)*
-	) => {
-		// WARNING: All instance must hold the filter `frame_system::Config::BaseCallFilter`, except
-		// when caller is system Root. One can use `OriginTrait::reset_filter` to do so.
-		#[derive(Clone)]
-		pub struct $name {
-			caller: $caller_name,
-			filter: $crate::sp_std::rc::Rc<Box<dyn Fn(&<$runtime as $system::Config>::Call) -> bool>>,
-		}
-
-		#[cfg(not(feature = "std"))]
-		impl $crate::sp_std::fmt::Debug for $name {
-			fn fmt(
-				&self,
-				fmt: &mut $crate::sp_std::fmt::Formatter
-			) -> $crate::sp_std::result::Result<(), $crate::sp_std::fmt::Error> {
-				fmt.write_str("<wasm:stripped>")
-			}
-		}
-
-		#[cfg(feature = "std")]
-		impl $crate::sp_std::fmt::Debug for $name {
-			fn fmt(
-				&self,
-				fmt: &mut $crate::sp_std::fmt::Formatter
-			) -> $crate::sp_std::result::Result<(), $crate::sp_std::fmt::Error> {
-				fmt.debug_struct(stringify!($name))
-					.field("caller", &self.caller)
-					.field("filter", &"[function ptr]")
-					.finish()
-			}
-		}
-
-		impl $crate::traits::OriginTrait for $name {
-			type Call = <$runtime as $system::Config>::Call;
-			type PalletsOrigin = $caller_name;
-			type AccountId = <$runtime as $system::Config>::AccountId;
-
-			fn add_filter(&mut self, filter: impl Fn(&Self::Call) -> bool + 'static) {
-				let f = self.filter.clone();
-
-				self.filter = $crate::sp_std::rc::Rc::new(Box::new(move |call| {
-					f(call) && filter(call)
-				}));
-			}
-
-			fn reset_filter(&mut self) {
-				let filter = <
-					<$runtime as $system::Config>::BaseCallFilter
-					as $crate::traits::Filter<<$runtime as $system::Config>::Call>
-				>::filter;
-
-				self.filter = $crate::sp_std::rc::Rc::new(Box::new(filter));
-			}
-
-			fn set_caller_from(&mut self, other: impl Into<Self>) {
-				self.caller = other.into().caller
-			}
-
-			fn filter_call(&self, call: &Self::Call) -> bool {
-				(self.filter)(call)
-			}
-
-			fn caller(&self) -> &Self::PalletsOrigin {
-				&self.caller
-			}
-
-			fn try_with_caller<R>(
-				mut self,
-				f: impl FnOnce(Self::PalletsOrigin) -> Result<R, Self::PalletsOrigin>,
-			) -> Result<R, Self> {
-				match f(self.caller) {
-					Ok(r) => Ok(r),
-					Err(caller) => { self.caller = caller; Err(self) }
-				}
-			}
-
-			/// Create with system none origin and `frame-system::Config::BaseCallFilter`.
-			fn none() -> Self {
-				$system::RawOrigin::None.into()
-			}
-			/// Create with system root origin and no filter.
-			fn root() -> Self {
-				$system::RawOrigin::Root.into()
-			}
-			/// Create with system signed origin and `frame-system::Config::BaseCallFilter`.
-			fn signed(by: <$runtime as $system::Config>::AccountId) -> Self {
-				$system::RawOrigin::Signed(by).into()
-			}
-		}
-
-		$crate::paste::item! {
-			#[derive(Clone, PartialEq, Eq, $crate::RuntimeDebug, $crate::codec::Encode, $crate::codec::Decode)]
-			$(#[$attr])*
-			#[allow(non_camel_case_types)]
-			pub enum $caller_name {
-				$( #[codec(index = $system_index)] )?
-				system($system::Origin<$runtime>),
-				$(
-					$( #[codec(index = $index)] )?
-					[< $module $( _ $generic_instance )? >]
-					($module::Origin < $( $generic, )? $( $module::$generic_instance )? > ),
-				)*
-				#[allow(dead_code)]
-				Void($crate::Void)
-			}
-		}
-
-		// For backwards compatibility and ease of accessing these functions.
-		#[allow(dead_code)]
-		impl $name {
-			/// Create with system none origin and `frame-system::Config::BaseCallFilter`.
-			pub fn none() -> Self {
-				<$name as $crate::traits::OriginTrait>::none()
-			}
-			/// Create with system root origin and no filter.
-			pub fn root() -> Self {
-				<$name as $crate::traits::OriginTrait>::root()
-			}
-			/// Create with system signed origin and `frame-system::Config::BaseCallFilter`.
-			pub fn signed(by: <$runtime as $system::Config>::AccountId) -> Self {
-				<$name as $crate::traits::OriginTrait>::signed(by)
-			}
-		}
-
-		impl From<$system::Origin<$runtime>> for $caller_name {
-			fn from(x: $system::Origin<$runtime>) -> Self {
-				$caller_name::system(x)
-			}
-		}
-
-		impl $crate::sp_std::convert::TryFrom<$caller_name> for $system::Origin<$runtime> {
-			type Error = $caller_name;
-			fn try_from(x: $caller_name)
-				-> $crate::sp_std::result::Result<$system::Origin<$runtime>, $caller_name>
-			{
-				if let $caller_name::system(l) = x {
-					Ok(l)
-				} else {
-					Err(x)
-				}
-			}
-		}
-
-		impl From<$system::Origin<$runtime>> for $name {
-			/// Convert to runtime origin:
-			/// * root origin is built with no filter
-			/// * others use `frame-system::Config::BaseCallFilter`
-			fn from(x: $system::Origin<$runtime>) -> Self {
-				let o: $caller_name = x.into();
-				o.into()
-			}
-		}
-
-		impl From<$caller_name> for $name {
-			fn from(x: $caller_name) -> Self {
-				let mut o = $name {
-					caller: x,
-					filter: $crate::sp_std::rc::Rc::new(Box::new(|_| true)),
-				};
-
-				// Root has no filter
-				if !matches!(o.caller, $caller_name::system($system::Origin::<$runtime>::Root)) {
-					$crate::traits::OriginTrait::reset_filter(&mut o);
-				}
-
-				o
-			}
-		}
-
-		impl From<$name> for $crate::sp_std::result::Result<$system::Origin<$runtime>, $name>{
-			/// NOTE: converting to pallet origin loses the origin filter information.
-			fn from(val: $name) -> Self {
-				if let $caller_name::system(l) = val.caller {
-					Ok(l)
-				} else {
-					Err(val)
-				}
-			}
-		}
-		impl From<Option<<$runtime as $system::Config>::AccountId>> for $name {
-			/// Convert to runtime origin with caller being system signed or none and use filter
-			/// `frame-system::Config::BaseCallFilter`.
-			fn from(x: Option<<$runtime as $system::Config>::AccountId>) -> Self {
-				<$system::Origin<$runtime>>::from(x).into()
-			}
-		}
-
-		$(
-			$crate::paste::item! {
-				impl From<$module::Origin < $( $generic )? $(, $module::$generic_instance )? > > for $caller_name {
-					fn from(x: $module::Origin < $( $generic )? $(, $module::$generic_instance )? >) -> Self {
-						$caller_name::[< $module $( _ $generic_instance )? >](x)
-					}
-				}
-
-				impl From<$module::Origin < $( $generic )? $(, $module::$generic_instance )? > > for $name {
-					/// Convert to runtime origin using `frame-system::Config::BaseCallFilter`.
-					fn from(x: $module::Origin < $( $generic )? $(, $module::$generic_instance )? >) -> Self {
-						let x: $caller_name = x.into();
-						x.into()
-					}
-				}
-				impl From<$name> for $crate::sp_std::result::Result<
-						$module::Origin < $( $generic )? $(, $module::$generic_instance )? >,
-						$name,
-					>
-				{
-					/// NOTE: converting to pallet origin loses the origin filter information.
-					fn from(val: $name) -> Self {
-						if let $caller_name::[< $module $( _ $generic_instance )? >](l) = val.caller {
-							Ok(l)
-						} else {
-							Err(val)
-						}
-					}
-				}
-
-				impl $crate::sp_std::convert::TryFrom<
-					$caller_name
-				> for $module::Origin < $( $generic )? $(, $module::$generic_instance )? > {
-					type Error = $caller_name;
-					fn try_from(x: $caller_name) -> $crate::sp_std::result::Result<
-						$module::Origin < $( $generic )? $(, $module::$generic_instance )? >,
-						$caller_name,
-					> {
-						if let $caller_name::[< $module $( _ $generic_instance )? >](l) = x {
-							Ok(l)
-						} else {
-							Err(x)
-						}
-					}
-				}
-			}
-		)*
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use codec::{Encode, Decode};
-	use crate::traits::{Filter, OriginTrait};
-	mod frame_system {
-		use super::*;
-
-		pub trait Config {
-			type AccountId;
-			type Call;
-			type BaseCallFilter;
-		}
-
-		#[derive(Clone, PartialEq, Eq, Debug, Encode, Decode)]
-		pub enum RawOrigin<AccountId> {
-			Root,
-			Signed(AccountId),
-			None,
-		}
-
-		impl<AccountId> From<Option<AccountId>> for RawOrigin<AccountId> {
-			fn from(s: Option<AccountId>) -> RawOrigin<AccountId> {
-				match s {
-					Some(who) => RawOrigin::Signed(who),
-					None => RawOrigin::None,
-				}
-			}
-		}
-
-		pub type Origin<T> = RawOrigin<<T as Config>::AccountId>;
-	}
-
-	mod origin_without_generic {
-		use super::*;
-
-		#[derive(Clone, PartialEq, Eq, Debug, Encode, Decode)]
-		pub struct Origin;
-	}
-
-	mod origin_with_generic {
-		use super::*;
-
-		#[derive(Clone, PartialEq, Eq, Debug, Encode, Decode)]
-		pub struct Origin<T> {
-			t: T
-		}
-	}
-
-	#[derive(Clone, PartialEq, Eq, Debug, Encode, Decode)]
-	pub struct TestRuntime;
-
-	pub struct BaseCallFilter;
-	impl Filter<u32> for BaseCallFilter {
-		fn filter(c: &u32) -> bool {
-			*c % 2 == 0
-		}
-	}
-
-	impl frame_system::Config for TestRuntime {
-		type AccountId = u32;
-		type Call = u32;
-		type BaseCallFilter = BaseCallFilter;
-	}
-
-	impl_outer_origin!(
-		pub enum OriginWithoutSystem for TestRuntime {
-			origin_without_generic,
-			origin_with_generic<T>,
-		}
-	);
-
-	impl_outer_origin!(
-		pub enum OriginWithoutSystem2 for TestRuntime {
-			origin_with_generic<T>,
-			origin_without_generic
-		}
-	);
-
-	impl_outer_origin!(
-		pub enum OriginWithSystem for TestRuntime where system = frame_system {
-			origin_without_generic,
-			origin_with_generic<T>
-		}
-	);
-
-	impl_outer_origin!(
-		pub enum OriginWithSystem2 for TestRuntime where system = frame_system {
-			origin_with_generic<T>,
-			origin_without_generic,
-		}
-	);
-
-	impl_outer_origin!(
-		pub enum OriginEmpty for TestRuntime where system = frame_system {}
-	);
-
-	impl_outer_origin!(
-		pub enum OriginIndices for TestRuntime where system = frame_system, system_index = 11 {
-			origin_with_generic<T>,
-			#[codec(index = 10)] origin_without_generic,
-		}
-	);
-
-	#[test]
-	fn test_default_filter() {
-		assert_eq!(OriginWithSystem::root().filter_call(&0), true);
-		assert_eq!(OriginWithSystem::root().filter_call(&1), true);
-		assert_eq!(OriginWithSystem::none().filter_call(&0), true);
-		assert_eq!(OriginWithSystem::none().filter_call(&1), false);
-		assert_eq!(OriginWithSystem::signed(0).filter_call(&0), true);
-		assert_eq!(OriginWithSystem::signed(0).filter_call(&1), false);
-		assert_eq!(OriginWithSystem::from(Some(0)).filter_call(&0), true);
-		assert_eq!(OriginWithSystem::from(Some(0)).filter_call(&1), false);
-		assert_eq!(OriginWithSystem::from(None).filter_call(&0), true);
-		assert_eq!(OriginWithSystem::from(None).filter_call(&1), false);
-		assert_eq!(OriginWithSystem::from(origin_without_generic::Origin).filter_call(&0), true);
-		assert_eq!(OriginWithSystem::from(origin_without_generic::Origin).filter_call(&1), false);
-
-		let mut origin = OriginWithSystem::from(Some(0));
-
-		origin.add_filter(|c| *c % 2 == 1);
-		assert_eq!(origin.filter_call(&0), false);
-		assert_eq!(origin.filter_call(&1), false);
-
-		origin.set_caller_from(OriginWithSystem::root());
-		assert!(matches!(origin.caller, OriginWithSystemCaller::system(frame_system::RawOrigin::Root)));
-		assert_eq!(origin.filter_call(&0), false);
-		assert_eq!(origin.filter_call(&1), false);
-
-		origin.reset_filter();
-		assert_eq!(origin.filter_call(&0), true);
-		assert_eq!(origin.filter_call(&1), false);
-	}
-
-	#[test]
-	fn test_codec() {
-		use codec::Encode;
-		assert_eq!(OriginIndices::root().caller.encode()[0], 11);
-		let without_generic_variant = OriginIndicesCaller::origin_without_generic(
-			origin_without_generic::Origin
-		);
-		assert_eq!(without_generic_variant.encode()[0], 10);
-
-		assert_eq!(OriginWithoutSystem::root().caller.encode()[0], 0);
-		let without_generic_variant = OriginWithoutSystemCaller::origin_without_generic(
-			origin_without_generic::Origin
-		);
-		assert_eq!(without_generic_variant.encode()[0], 1);
-	}
-}
diff --git a/frame/support/src/traits/dispatch.rs b/frame/support/src/traits/dispatch.rs
index 6174238e3553..f82628ede18c 100644
--- a/frame/support/src/traits/dispatch.rs
+++ b/frame/support/src/traits/dispatch.rs
@@ -41,7 +41,7 @@ pub trait EnsureOrigin<OuterOrigin> {
 /// Type that can be dispatched with an origin but without checking the origin filter.
 ///
 /// Implemented for pallet dispatchable type by `decl_module` and for runtime dispatchable by
-/// `construct_runtime` and `impl_outer_dispatch`.
+/// `construct_runtime`.
 pub trait UnfilteredDispatchable {
 	/// The origin type of the runtime, (i.e. `frame_system::Config::Origin`).
 	type Origin;
diff --git a/frame/support/src/unsigned.rs b/frame/support/src/unsigned.rs
deleted file mode 100644
index 71ae31d95d19..000000000000
--- a/frame/support/src/unsigned.rs
+++ /dev/null
@@ -1,172 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#[doc(hidden)]
-pub use crate::sp_runtime::traits::ValidateUnsigned;
-#[doc(hidden)]
-pub use crate::sp_runtime::transaction_validity::{
-	TransactionValidity, UnknownTransaction, TransactionValidityError, TransactionSource,
-};
-
-
-/// Implement `ValidateUnsigned` for `Runtime`.
-/// All given modules need to implement `ValidateUnsigned`.
-///
-/// # Example
-///
-/// ```
-/// # mod timestamp {
-/// # 	pub struct Module;
-/// #
-/// # 	impl frame_support::unsigned::ValidateUnsigned for Module {
-/// # 		type Call = Call;
-/// #
-/// # 		fn validate_unsigned(_source: frame_support::unsigned::TransactionSource, _call: &Self::Call)
-/// 			-> frame_support::unsigned::TransactionValidity {
-/// # 			unimplemented!();
-/// # 		}
-/// # 	}
-/// #
-/// # 	pub enum Call {
-/// # 	}
-/// # }
-/// #
-/// # pub type Timestamp = timestamp::Module;
-/// #
-/// #
-/// # pub enum Call {
-/// # 	Timestamp(timestamp::Call),
-/// # }
-/// # #[allow(unused)]
-/// pub struct Runtime;
-///
-/// frame_support::impl_outer_validate_unsigned! {
-/// 	impl ValidateUnsigned for Runtime {
-/// 		Timestamp
-/// 	}
-/// }
-/// ```
-#[macro_export]
-macro_rules! impl_outer_validate_unsigned {
-	(
-		impl ValidateUnsigned for $runtime:ident {
-			$( $module:ident )*
-		}
-	) => {
-		impl $crate::unsigned::ValidateUnsigned for $runtime {
-			type Call = Call;
-
-			fn pre_dispatch(call: &Self::Call) -> Result<(), $crate::unsigned::TransactionValidityError> {
-				#[allow(unreachable_patterns)]
-				match call {
-					$( Call::$module(inner_call) => $module::pre_dispatch(inner_call), )*
-					// pre-dispatch should not stop inherent extrinsics, validation should prevent
-					// including arbitrary (non-inherent) extrinsics to blocks.
-					_ => Ok(()),
-				}
-			}
-
-			fn validate_unsigned(
-				#[allow(unused_variables)]
-				source: $crate::unsigned::TransactionSource,
-				call: &Self::Call,
-			) -> $crate::unsigned::TransactionValidity {
-				#[allow(unreachable_patterns)]
-				match call {
-					$( Call::$module(inner_call) => $module::validate_unsigned(source, inner_call), )*
-					_ => $crate::unsigned::UnknownTransaction::NoUnsignedValidator.into(),
-				}
-			}
-		}
-	};
-}
-
-#[cfg(test)]
-mod test_empty_call {
-	pub enum Call {}
-
-	#[allow(unused)]
-	pub struct Runtime;
-
-	impl_outer_validate_unsigned! {
-		impl ValidateUnsigned for Runtime {
-		}
-	}
-}
-
-#[cfg(test)]
-mod test_partial_and_full_call {
-	pub mod timestamp {
-		pub struct Module;
-
-		impl super::super::ValidateUnsigned for Module {
-			type Call = Call;
-
-			fn validate_unsigned(
-				_source: super::super::TransactionSource,
-				_call: &Self::Call
-			) -> super::super::TransactionValidity {
-				unimplemented!();
-			}
-		}
-
-		pub enum Call {
-			Foo,
-		}
-	}
-
-	mod test_full_unsigned {
-		pub type Timestamp = super::timestamp::Module;
-
-		pub enum Call {
-			Timestamp(super::timestamp::Call),
-		}
-
-		pub struct Runtime;
-
-		impl_outer_validate_unsigned! {
-			impl ValidateUnsigned for Runtime {
-				Timestamp
-			}
-		}
-
-		#[test]
-		fn used() {
-			let _ = Call::Timestamp(super::timestamp::Call::Foo);
-			let _ = Runtime;
-		}
-	}
-
-	mod test_not_full_unsigned {
-		pub enum Call {
-			Timestamp(super::timestamp::Call),
-		}
-
-		pub struct Runtime;
-
-		impl_outer_validate_unsigned! {
-			impl ValidateUnsigned for Runtime {
-			}
-		}
-
-		#[test]
-		fn used() {
-			let _ = Call::Timestamp(super::timestamp::Call::Foo);
-			let _ = Runtime;
-		}
-	}
-}
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index 084f1338cd26..a6ba7e39c895 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -52,7 +52,7 @@ pub use sp_core::hash::H256;
 #[cfg(any(feature = "std", test))]
 use sp_version::NativeVersion;
 use frame_support::{
-	impl_outer_origin, parameter_types,
+	parameter_types,
 	traits::KeyOwnerProofSystem,
 	weights::RuntimeDbWeight,
 };
@@ -430,8 +430,61 @@ impl GetRuntimeBlockType for Runtime {
 	type RuntimeBlock = Block;
 }
 
-impl_outer_origin!{
-	pub enum Origin for Runtime where system = frame_system {}
+#[derive(Clone, RuntimeDebug)]
+pub struct Origin;
+
+impl From<frame_system::Origin<Runtime>> for Origin {
+	fn from(_o: frame_system::Origin<Runtime>) -> Self {
+		unimplemented!("Not required in tests!")
+	}
+}
+impl Into<Result<frame_system::Origin<Runtime>, Origin>> for Origin {
+	fn into(self) -> Result<frame_system::Origin<Runtime>, Origin> {
+		unimplemented!("Not required in tests!")
+	}
+}
+
+impl frame_support::traits::OriginTrait for Origin {
+	type Call = <Runtime as frame_system::Config>::Call;
+	type PalletsOrigin = Origin;
+	type AccountId = <Runtime as frame_system::Config>::AccountId;
+
+	fn add_filter(&mut self, _filter: impl Fn(&Self::Call) -> bool + 'static) {
+		unimplemented!("Not required in tests!")
+	}
+
+	fn reset_filter(&mut self) {
+		unimplemented!("Not required in tests!")
+	}
+
+	fn set_caller_from(&mut self, _other: impl Into<Self>) {
+		unimplemented!("Not required in tests!")
+	}
+
+	fn filter_call(&self, _call: &Self::Call) -> bool {
+		unimplemented!("Not required in tests!")
+	}
+
+	fn caller(&self) -> &Self::PalletsOrigin {
+		unimplemented!("Not required in tests!")
+	}
+
+	fn try_with_caller<R>(
+		self,
+		_f: impl FnOnce(Self::PalletsOrigin) -> Result<R, Self::PalletsOrigin>,
+	) -> Result<R, Self> {
+		unimplemented!("Not required in tests!")
+	}
+
+	fn none() -> Self {
+		unimplemented!("Not required in tests!")
+	}
+	fn root() -> Self {
+		unimplemented!("Not required in tests!")
+	}
+	fn signed(_by: <Runtime as frame_system::Config>::AccountId) -> Self {
+		unimplemented!("Not required in tests!")
+	}
 }
 
 #[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug)]

From ef185e9db2653fe09d08d4ed1ec236cadd019405 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Mon, 12 Jul 2021 16:35:57 +0200
Subject: [PATCH 0979/1194] Store election snapshot in a more memory-friendly
 way. (#9275)

* Store election snapshot in a more memory-friendly way.

* fix

* re-order benchmarks

* Update frame/election-provider-multi-phase/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_election_provider_multi_phase --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/election-provider-multi-phase/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* manually fix the weights

* remove todo

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Parity Bot <admin@parity.io>
---
 .../src/benchmarking.rs                       | 24 +++++++--------
 .../election-provider-multi-phase/src/lib.rs  | 29 +++++++++++++++----
 2 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/frame/election-provider-multi-phase/src/benchmarking.rs b/frame/election-provider-multi-phase/src/benchmarking.rs
index f73ead376d5e..6cf581135f14 100644
--- a/frame/election-provider-multi-phase/src/benchmarking.rs
+++ b/frame/election-provider-multi-phase/src/benchmarking.rs
@@ -199,6 +199,18 @@ frame_benchmarking::benchmarks! {
 		assert!(<MultiPhase<T>>::current_phase().is_unsigned());
 	}
 
+	on_initialize_open_unsigned_without_snapshot {
+		// need to assume signed phase was open before
+		<MultiPhase<T>>::on_initialize_open_signed().unwrap();
+		assert!(<MultiPhase<T>>::snapshot().is_some());
+		assert!(<MultiPhase<T>>::current_phase().is_signed());
+	}: {
+		<MultiPhase<T>>::on_initialize_open_unsigned(false, true, 1u32.into()).unwrap();
+	} verify {
+		assert!(<MultiPhase<T>>::snapshot().is_some());
+		assert!(<MultiPhase<T>>::current_phase().is_unsigned());
+	}
+
 	finalize_signed_phase_accept_solution {
 		let receiver = account("receiver", 0, SEED);
 		let initial_balance = T::Currency::minimum_balance() * 10u32.into();
@@ -232,18 +244,6 @@ frame_benchmarking::benchmarks! {
 		assert_eq!(T::Currency::reserved_balance(&receiver), 0u32.into());
 	}
 
-	on_initialize_open_unsigned_without_snapshot {
-		// need to assume signed phase was open before
-		<MultiPhase<T>>::on_initialize_open_signed().unwrap();
-		assert!(<MultiPhase<T>>::snapshot().is_some());
-		assert!(<MultiPhase<T>>::current_phase().is_signed());
-	}: {
-		<MultiPhase<T>>::on_initialize_open_unsigned(false, true, 1u32.into()).unwrap();
-	} verify {
-		assert!(<MultiPhase<T>>::snapshot().is_some());
-		assert!(<MultiPhase<T>>::current_phase().is_unsigned());
-	}
-
 	// a call to `<Pallet as ElectionProvider>::elect` where we only return the queued solution.
 	elect_queued {
 		// number of votes in snapshot.
diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index b41db2a42c60..65a31e8ee95d 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -327,7 +327,7 @@ impl BenchmarkingConfig for () {
 }
 
 /// Current phase of the pallet.
-#[derive(PartialEq, Eq, Clone, Copy, Encode, Decode, RuntimeDebug)]
+#[derive(PartialEq, Eq, Clone, Copy, Encode, Decode, Debug)]
 pub enum Phase<Bn> {
 	/// Nothing, the election is not happening.
 	Off,
@@ -402,7 +402,7 @@ pub enum FallbackStrategy {
 }
 
 /// The type of `Computation` that provided this election data.
-#[derive(PartialEq, Eq, Clone, Copy, Encode, Decode, RuntimeDebug)]
+#[derive(PartialEq, Eq, Clone, Copy, Encode, Decode, Debug)]
 pub enum ElectionCompute {
 	/// Election was computed on-chain.
 	OnChain,
@@ -476,7 +476,7 @@ pub struct RoundSnapshot<A> {
 /// This is stored automatically on-chain, and it contains the **size of the entire snapshot**.
 /// This is also used in dispatchables as weight witness data and should **only contain the size of
 /// the presented solution**, not the entire snapshot.
-#[derive(PartialEq, Eq, Clone, Copy, Encode, Decode, RuntimeDebug, Default)]
+#[derive(PartialEq, Eq, Clone, Copy, Encode, Decode, Debug, Default)]
 pub struct SolutionOrSnapshotSize {
 	/// The length of voters.
 	#[codec(compact)]
@@ -1308,12 +1308,29 @@ impl<T: Config> Pallet<T> {
 		}
 
 		// Only write snapshot if all existed.
-		<SnapshotMetadata<T>>::put(SolutionOrSnapshotSize {
+		let metadata = SolutionOrSnapshotSize {
 			voters: voters.len() as u32,
 			targets: targets.len() as u32,
-		});
+		};
+		log!(debug, "creating a snapshot with metadata {:?}", metadata);
+
+		<SnapshotMetadata<T>>::put(metadata);
 		<DesiredTargets<T>>::put(desired_targets);
-		<Snapshot<T>>::put(RoundSnapshot { voters, targets });
+
+		// instead of using storage APIs, we do a manual encoding into a fixed-size buffer.
+		// `encoded_size` encodes it without storing it anywhere, this should not cause any allocation.
+		let snapshot = RoundSnapshot { voters, targets };
+		let size = snapshot.encoded_size();
+		log!(info, "snapshot pre-calculated size {:?}", size);
+		let mut buffer = Vec::with_capacity(size);
+		snapshot.encode_to(&mut buffer);
+
+		// do some checks.
+		debug_assert_eq!(buffer, snapshot.encode());
+		// buffer should have not re-allocated since.
+		debug_assert!(buffer.len() == size && size == buffer.capacity());
+
+		sp_io::storage::set(&<Snapshot<T>>::hashed_key(), &buffer);
 		Ok(w1.saturating_add(w2).saturating_add(w3).saturating_add(T::DbWeight::get().writes(3)))
 	}
 

From 00de2189b56cc3269c615b55d4c36dabf6f350ef Mon Sep 17 00:00:00 2001
From: Seun Lanlege <seun@parity.io>
Date: Mon, 12 Jul 2021 16:56:12 +0100
Subject: [PATCH 0980/1194] Update test-runner api (#9302)

* better apis

* ....

* ...

* Genensis -> UnimportedGenesis

* adds rpc for runtime upgrades

* simplify test-runner

* clean up test-runner api

* remove unused imports

* fix doc-test

* fix line width

* correct Node::clean

* correct Node::clean

* add deny rules

* remove unused extern crates

* remove mutex from node

* Update test-utils/test-runner/Cargo.toml

Co-authored-by: Andronik Ordian <write@reusable.software>

* adds docs, removes Node::clean

Co-authored-by: Andronik Ordian <write@reusable.software>
Co-authored-by: Seun Lanlege <seun@parity.io>
---
 Cargo.lock                                    |   9 +-
 bin/node/test-runner-example/Cargo.toml       |  53 +--
 bin/node/test-runner-example/src/lib.rs       | 167 ++--------
 client/cli/src/runner.rs                      |  38 ++-
 .../manual-seal/src/consensus/babe.rs         | 116 +++++--
 test-utils/test-runner/Cargo.toml             |  68 ++--
 test-utils/test-runner/src/client.rs          | 219 +++++++++++++
 test-utils/test-runner/src/host_functions.rs  |  14 +
 test-utils/test-runner/src/lib.rs             |  50 +--
 test-utils/test-runner/src/node.rs            | 305 +++++-------------
 test-utils/test-runner/src/utils.rs           |  52 ++-
 11 files changed, 551 insertions(+), 540 deletions(-)
 create mode 100644 test-utils/test-runner/src/client.rs

diff --git a/Cargo.lock b/Cargo.lock
index 38a401f11ac2..aaa4746d4ca4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9898,16 +9898,19 @@ dependencies = [
 name = "test-runner"
 version = "0.9.0"
 dependencies = [
- "env_logger 0.7.1",
  "frame-system",
  "futures 0.3.15",
  "jsonrpc-core",
  "log",
+ "num-traits",
  "sc-basic-authorship",
  "sc-cli",
  "sc-client-api",
+ "sc-consensus",
+ "sc-consensus-babe",
  "sc-consensus-manual-seal",
  "sc-executor",
+ "sc-finality-grandpa",
  "sc-informant",
  "sc-network",
  "sc-rpc",
@@ -9919,10 +9922,10 @@ dependencies = [
  "sp-block-builder",
  "sp-blockchain",
  "sp-consensus",
+ "sp-consensus-babe",
  "sp-core",
  "sp-externalities",
  "sp-inherents",
- "sp-io",
  "sp-keyring",
  "sp-keystore",
  "sp-offchain",
@@ -9959,6 +9962,7 @@ dependencies = [
  "sc-network",
  "sc-service",
  "sp-api",
+ "sp-consensus",
  "sp-consensus-babe",
  "sp-inherents",
  "sp-keyring",
@@ -10116,7 +10120,6 @@ dependencies = [
  "libc",
  "memchr",
  "mio",
- "mio-named-pipes",
  "mio-uds",
  "num_cpus",
  "pin-project-lite 0.1.12",
diff --git a/bin/node/test-runner-example/Cargo.toml b/bin/node/test-runner-example/Cargo.toml
index 5882a73982ec..3435a34c45c1 100644
--- a/bin/node/test-runner-example/Cargo.toml
+++ b/bin/node/test-runner-example/Cargo.toml
@@ -6,35 +6,36 @@ edition = "2018"
 publish = false
 
 [dependencies]
-test-runner = { path = "../../../test-utils/test-runner", version = "0.9.0" }
+test-runner = { path = "../../../test-utils/test-runner" }
 
-frame-system = { version = "4.0.0-dev", path = "../../../frame/system" }
-frame-support = { path = "../../../frame/support", version = "4.0.0-dev"}
-frame-benchmarking = { path = "../../../frame/benchmarking", version = "4.0.0-dev"}
-pallet-balances = { path = "../../../frame/balances", version = "4.0.0-dev"}
-pallet-sudo = { path = "../../../frame/sudo", version = "4.0.0-dev"}
-pallet-transaction-payment = { version = "4.0.0-dev", path = "../../../frame/transaction-payment" }
+frame-system = { path = "../../../frame/system" }
+frame-support = { path = "../../../frame/support" }
+frame-benchmarking = { path = "../../../frame/benchmarking" }
+pallet-balances = { path = "../../../frame/balances" }
+pallet-sudo = { path = "../../../frame/sudo" }
+pallet-transaction-payment = { path = "../../../frame/transaction-payment" }
 
-node-runtime = { path = "../runtime", version = "3.0.0-dev"}
-node-primitives = { version = "2.0.0", path = "../primitives" }
-node-cli = { path = "../cli", version = "3.0.0-dev"}
+node-runtime = { path = "../runtime" }
+node-primitives = { path = "../primitives" }
+node-cli = { path = "../cli" }
 
-grandpa = { version = "0.10.0-dev", package = "sc-finality-grandpa", path = "../../../client/finality-grandpa" }
-sp-consensus-babe = { version = "0.10.0-dev", path = "../../../primitives/consensus/babe" }
-sc-consensus-babe = { version = "0.10.0-dev", path = "../../../client/consensus/babe" }
-sc-consensus-manual-seal = { version = "0.10.0-dev", path = "../../../client/consensus/manual-seal" }
-sc-service = { version = "0.10.0-dev", default-features = false, path = "../../../client/service" }
-sc-executor = { version = "0.10.0-dev", path = "../../../client/executor" }
-sc-client-api = { version = "4.0.0-dev", path = "../../../client/api" }
-sc-network = { version = "0.10.0-dev", path = "../../../client/network" }
-sc-informant = { version = "0.10.0-dev", path = "../../../client/informant" }
-sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/common" }
+grandpa = { package = "sc-finality-grandpa", path = "../../../client/finality-grandpa" }
+sp-consensus-babe = { path = "../../../primitives/consensus/babe" }
+sc-consensus-babe = { path = "../../../client/consensus/babe" }
+sc-consensus-manual-seal = { path = "../../../client/consensus/manual-seal" }
+sc-service = { default-features = false, path = "../../../client/service" }
+sc-executor = { path = "../../../client/executor" }
+sc-client-api = { path = "../../../client/api" }
+sc-network = { path = "../../../client/network" }
+sc-informant = { path = "../../../client/informant" }
+sc-consensus = { path = "../../../client/consensus/common" }
 
-sp-runtime = { path = "../../../primitives/runtime", version = "4.0.0-dev"}
-sp-keyring = { version = "4.0.0-dev", path = "../../../primitives/keyring" }
-sp-timestamp = { version = "4.0.0-dev", path = "../../../primitives/timestamp" }
-sp-api = { version = "4.0.0-dev",  path = "../../../primitives/api" }
-sp-inherents = { version = "4.0.0-dev", path = "../../../primitives/inherents" }
-sp-keystore = { version = "0.10.0-dev", path = "../../../primitives/keystore" }
+sp-runtime = { path = "../../../primitives/runtime" }
+sp-consensus = { path = "../../../primitives/consensus/common" }
+sp-keyring = { path = "../../../primitives/keyring" }
+sp-timestamp = { path = "../../../primitives/timestamp" }
+sp-api = {  path = "../../../primitives/api" }
+sp-inherents = { path = "../../../primitives/inherents" }
+sp-keystore = { path = "../../../primitives/keystore" }
 
 log = "0.4.14"
diff --git a/bin/node/test-runner-example/src/lib.rs b/bin/node/test-runner-example/src/lib.rs
index 8a3f5560ec86..513c8a7d8b5c 100644
--- a/bin/node/test-runner-example/src/lib.rs
+++ b/bin/node/test-runner-example/src/lib.rs
@@ -15,23 +15,16 @@
 
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
+#![deny(unused_extern_crates, missing_docs)]
 
 //! Basic example of end to end runtime tests.
 
-use test_runner::{Node, ChainInfo, SignatureVerificationOverride, default_config};
+use test_runner::{ChainInfo, SignatureVerificationOverride};
 use grandpa::GrandpaBlockImport;
-use sc_service::{TFullBackend, TFullClient, Configuration, TaskManager, new_full_parts, TaskExecutor};
-use std::sync::Arc;
-use sp_inherents::CreateInherentDataProviders;
+use sc_service::{TFullBackend, TFullClient};
 use sc_consensus_babe::BabeBlockImport;
-use sp_keystore::SyncCryptoStorePtr;
-use sp_keyring::sr25519::Keyring::Alice;
-use sp_consensus_babe::AuthorityId;
-use sc_consensus_manual_seal::{
-	ConsensusDataProvider, consensus::babe::{BabeConsensusDataProvider, SlotTimestampProvider},
-};
-use sp_runtime::{traits::IdentifyAccount, MultiSigner, generic::Era};
-use node_cli::chain_spec::development_config;
+use sc_consensus_manual_seal::consensus::babe::SlotTimestampProvider;
+use sp_runtime::generic::Era;
 
 type BlockImport<B, BE, C, SC> = BabeBlockImport<B, C, GrandpaBlockImport<BE, B, C, SC>>;
 
@@ -74,137 +67,39 @@ impl ChainInfo for NodeTemplateChainInfo {
 			pallet_transaction_payment::ChargeTransactionPayment::<Self::Runtime>::from(0),
 		)
 	}
-
-	fn config(task_executor: TaskExecutor) -> Configuration {
-		default_config(task_executor, Box::new(development_config()))
-	}
-
-	fn create_client_parts(
-		config: &Configuration,
-	) -> Result<
-		(
-			Arc<TFullClient<Self::Block, Self::RuntimeApi, Self::Executor>>,
-			Arc<TFullBackend<Self::Block>>,
-			SyncCryptoStorePtr,
-			TaskManager,
-			Box<dyn CreateInherentDataProviders<
-				Self::Block,
-				(),
-				InherentDataProviders = Self::InherentDataProviders
-			>>,
-			Option<
-				Box<
-					dyn ConsensusDataProvider<
-						Self::Block,
-						Transaction = sp_api::TransactionFor<
-							TFullClient<Self::Block, Self::RuntimeApi, Self::Executor>,
-							Self::Block,
-						>,
-					>,
-				>,
-			>,
-			Self::SelectChain,
-			Self::BlockImport,
-		),
-		sc_service::Error,
-	> {
-		let (client, backend, keystore, task_manager) =
-			new_full_parts::<Self::Block, Self::RuntimeApi, Self::Executor>(config, None)?;
-		let client = Arc::new(client);
-
-		let select_chain = sc_consensus::LongestChain::new(backend.clone());
-
-		let (grandpa_block_import, ..) =
-			grandpa::block_import(
-				client.clone(),
-				&(client.clone() as Arc<_>),
-				select_chain.clone(),
-				None
-			)?;
-
-		let slot_duration = sc_consensus_babe::Config::get_or_compute(&*client)?;
-		let (block_import, babe_link) = sc_consensus_babe::block_import(
-			slot_duration.clone(),
-			grandpa_block_import,
-			client.clone(),
-		)?;
-
-		let consensus_data_provider = BabeConsensusDataProvider::new(
-			client.clone(),
-			keystore.sync_keystore(),
-			babe_link.epoch_changes().clone(),
-			vec![(AuthorityId::from(Alice.public()), 1000)],
-		)
-			.expect("failed to create ConsensusDataProvider");
-
-		Ok((
-			client.clone(),
-			backend,
-			keystore.sync_keystore(),
-			task_manager,
-			Box::new(move |_, _| {
-				let client = client.clone();
-				async move {
-					let timestamp = SlotTimestampProvider::new(client.clone()).map_err(|err| format!("{:?}", err))?;
-					let babe = sp_consensus_babe::inherents::InherentDataProvider::new(timestamp.slot().into());
-					Ok((timestamp, babe))
-				}
-			}),
-			Some(Box::new(consensus_data_provider)),
-			select_chain,
-			block_import,
-		))
-	}
-
-	fn dispatch_with_root(call: <Self::Runtime as frame_system::Config>::Call, node: &mut Node<Self>) {
-		let alice = MultiSigner::from(Alice.public()).into_account();
-		let call = pallet_sudo::Call::sudo(Box::new(call));
-		node.submit_extrinsic(call, alice);
-		node.seal_blocks(1);
-	}
 }
 
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use test_runner::NodeConfig;
-	use log::LevelFilter;
+	use test_runner::{Node, client_parts, ConfigOrChainSpec, build_runtime, task_executor};
+	use sp_keyring::sr25519::Keyring::Alice;
+	use node_cli::chain_spec::development_config;
+	use sp_runtime::{traits::IdentifyAccount, MultiSigner};
 
 	#[test]
 	fn test_runner() {
-		let config = NodeConfig {
-			log_targets: vec![
-				("yamux", LevelFilter::Off),
-				("multistream_select", LevelFilter::Off),
-				("libp2p", LevelFilter::Off),
-				("jsonrpc_client_transports", LevelFilter::Off),
-				("sc_network", LevelFilter::Off),
-				("tokio_reactor", LevelFilter::Off),
-				("parity-db", LevelFilter::Off),
-				("sub-libp2p", LevelFilter::Off),
-				("sync", LevelFilter::Off),
-				("peerset", LevelFilter::Off),
-				("ws", LevelFilter::Off),
-				("sc_network", LevelFilter::Off),
-				("sc_service", LevelFilter::Off),
-				("sc_basic_authorship", LevelFilter::Off),
-				("telemetry-logger", LevelFilter::Off),
-				("sc_peerset", LevelFilter::Off),
-				("rpc", LevelFilter::Off),
-				("runtime", LevelFilter::Trace),
-				("babe", LevelFilter::Debug)
-			],
-		};
-		let mut node = Node::<NodeTemplateChainInfo>::new(config).unwrap();
-		// seals blocks
-		node.seal_blocks(1);
-		// submit extrinsics
-		let alice = MultiSigner::from(Alice.public()).into_account();
-		node.submit_extrinsic(frame_system::Call::remark((b"hello world").to_vec()), alice);
-
-		// look ma, I can read state.
-		let _events = node.with_state(|| frame_system::Pallet::<node_runtime::Runtime>::events());
-		// get access to the underlying client.
-		let _client = node.client();
+		let mut tokio_runtime = build_runtime().unwrap();
+		let task_executor = task_executor(tokio_runtime.handle().clone());
+		let (rpc, task_manager, client, pool, command_sink, backend) =
+			client_parts::<NodeTemplateChainInfo>(
+				ConfigOrChainSpec::ChainSpec(Box::new(development_config()), task_executor)
+			).unwrap();
+		let node = Node::<NodeTemplateChainInfo>::new(rpc, task_manager, client, pool, command_sink, backend);
+
+		tokio_runtime.block_on(async {
+			// seals blocks
+			node.seal_blocks(1).await;
+			// submit extrinsics
+			let alice = MultiSigner::from(Alice.public()).into_account();
+			let _hash = node.submit_extrinsic(frame_system::Call::remark((b"hello world").to_vec()), alice)
+				.await
+				.unwrap();
+
+			// look ma, I can read state.
+			let _events = node.with_state(|| frame_system::Pallet::<node_runtime::Runtime>::events());
+			// get access to the underlying client.
+			let _client = node.client();
+		})
 	}
 }
diff --git a/client/cli/src/runner.rs b/client/cli/src/runner.rs
index b512588a204c..947cdd5a21e5 100644
--- a/client/cli/src/runner.rs
+++ b/client/cli/src/runner.rs
@@ -160,22 +160,7 @@ impl<C: SubstrateCli> Runner<C> {
 	/// 2020-06-03 16:14:21 ⛓  Native runtime: node-251 (substrate-node-1.tx1.au10)
 	/// ```
 	fn print_node_infos(&self) {
-		info!("{}", C::impl_name());
-		info!("✌️  version {}", C::impl_version());
-		info!(
-			"❤️  by {}, {}-{}",
-			C::author(),
-			C::copyright_start_year(),
-			Local::today().year(),
-		);
-		info!("📋 Chain specification: {}", self.config.chain_spec.name());
-		info!("🏷 Node name: {}", self.config.network.node_name);
-		info!("👤 Role: {}", self.config.display_role());
-		info!("💾 Database: {} at {}",
-			self.config.database,
-			self.config.database.path().map_or_else(|| "<unknown>".to_owned(), |p| p.display().to_string())
-		);
-		info!("⛓  Native runtime: {}", C::native_runtime_version(&self.config.chain_spec));
+		print_node_infos::<C>(self.config())
 	}
 
 	/// A helper function that runs a node with tokio and stops if the process receives the signal
@@ -229,3 +214,24 @@ impl<C: SubstrateCli> Runner<C> {
 		&mut self.config
 	}
 }
+
+/// Log information about the node itself.
+pub fn print_node_infos<C: SubstrateCli>(config: &Configuration) {
+	info!("{}", C::impl_name());
+	info!("✌️  version {}", C::impl_version());
+	info!(
+		"❤️  by {}, {}-{}",
+		C::author(),
+		C::copyright_start_year(),
+		Local::today().year(),
+	);
+	info!("📋 Chain specification: {}", config.chain_spec.name());
+	info!("🏷 Node name: {}", config.network.node_name);
+	info!("👤 Role: {}", config.display_role());
+	info!("💾 Database: {} at {}",
+		  config.database,
+		  config.database.path().map_or_else(|| "<unknown>".to_owned(), |p| p.display().to_string())
+	);
+	info!("⛓  Native runtime: {}", C::native_runtime_version(&config.chain_spec));
+}
+
diff --git a/client/consensus/manual-seal/src/consensus/babe.rs b/client/consensus/manual-seal/src/consensus/babe.rs
index 100fec912faa..fb2d47b48fed 100644
--- a/client/consensus/manual-seal/src/consensus/babe.rs
+++ b/client/consensus/manual-seal/src/consensus/babe.rs
@@ -32,7 +32,7 @@ use sp_keystore::SyncCryptoStorePtr;
 
 use sp_api::{ProvideRuntimeApi, TransactionFor};
 use sp_blockchain::{HeaderBackend, HeaderMetadata};
-use sp_consensus::BlockImportParams;
+use sp_consensus::{BlockImportParams, BlockOrigin, ForkChoiceStrategy};
 use sp_consensus_slots::Slot;
 use sp_consensus_babe::{
 	BabeApi, inherents::BabeInherentData, ConsensusLog, BABE_ENGINE_ID, AuthorityId,
@@ -41,9 +41,10 @@ use sp_consensus_babe::{
 use sp_inherents::{InherentData, InherentDataProvider, InherentIdentifier};
 use sp_runtime::{
 	traits::{DigestItemFor, DigestFor, Block as BlockT, Zero, Header},
-	generic::{Digest, BlockId},
+	generic::{Digest, BlockId}, Justifications,
 };
 use sp_timestamp::{InherentType, INHERENT_IDENTIFIER, TimestampInherentData};
+use sp_consensus::import_queue::{Verifier, CacheKeyId};
 
 /// Provides BABE-compatible predigests and BlockImportParams.
 /// Intended for use with BABE runtimes.
@@ -64,6 +65,74 @@ pub struct BabeConsensusDataProvider<B: BlockT, C> {
 	authorities: Vec<(AuthorityId, BabeAuthorityWeight)>,
 }
 
+/// Verifier to be used for babe chains
+pub struct BabeVerifier<B: BlockT, C> {
+	/// Shared epoch changes
+	epoch_changes: SharedEpochChanges<B, Epoch>,
+
+	/// Shared reference to the client.
+	client: Arc<C>,
+}
+
+impl<B: BlockT, C> BabeVerifier<B, C> {
+	/// create a nrew verifier
+	pub fn new(epoch_changes: SharedEpochChanges<B, Epoch>, client: Arc<C>) -> BabeVerifier<B, C> {
+		BabeVerifier {
+			epoch_changes,
+			client,
+		}
+	}
+}
+
+/// The verifier for the manual seal engine; instantly finalizes.
+#[async_trait::async_trait]
+impl<B, C> Verifier<B> for BabeVerifier<B, C>
+	where
+		B: BlockT,
+		C: HeaderBackend<B> + HeaderMetadata<B, Error = sp_blockchain::Error>
+{
+	async fn verify(
+		&mut self,
+		origin: BlockOrigin,
+		header: B::Header,
+		justifications: Option<Justifications>,
+		body: Option<Vec<B::Extrinsic>>,
+	) -> Result<(BlockImportParams<B, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String> {
+		let mut import_params = BlockImportParams::new(origin, header.clone());
+		import_params.justifications = justifications;
+		import_params.body = body;
+		import_params.finalized = false;
+		import_params.fork_choice = Some(ForkChoiceStrategy::LongestChain);
+
+		let pre_digest = find_pre_digest::<B>(&header)?;
+
+		let parent_hash = header.parent_hash();
+		let parent = self.client.header(BlockId::Hash(*parent_hash))
+			.ok()
+			.flatten()
+			.ok_or_else(|| format!("header for block {} not found", parent_hash))?;
+		let epoch_changes = self.epoch_changes.shared_data();
+		let epoch_descriptor = epoch_changes
+			.epoch_descriptor_for_child_of(
+				descendent_query(&*self.client),
+				&parent.hash(),
+				parent.number().clone(),
+				pre_digest.slot(),
+			)
+			.map_err(|e| format!("failed to fetch epoch_descriptor: {}", e))?
+			.ok_or_else(|| format!("{:?}", sp_consensus::Error::InvalidAuthoritiesSet))?;
+		// drop the lock
+		drop(epoch_changes);
+
+		import_params.intermediates.insert(
+			Cow::from(INTERMEDIATE_KEY),
+			Box::new(BabeIntermediate::<B> { epoch_descriptor }) as Box<_>,
+		);
+
+		Ok((import_params, None))
+	}
+}
+
 impl<B, C> BabeConsensusDataProvider<B, C>
 	where
 		B: BlockT,
@@ -166,27 +235,32 @@ impl<B, C> ConsensusDataProvider<B> for BabeConsensusDataProvider<B, C>
 				.map_err(|e| Error::StringError(format!("failed to fetch epoch_descriptor: {}", e)))?
 				.ok_or_else(|| sp_consensus::Error::InvalidAuthoritiesSet)?;
 
-			let epoch_mut = match epoch_descriptor {
+			match epoch_descriptor {
 				ViableEpochDescriptor::Signaled(identifier, _epoch_header) => {
-					epoch_changes.epoch_mut(&identifier)
-						.ok_or_else(|| sp_consensus::Error::InvalidAuthoritiesSet)?
+					let epoch_mut = epoch_changes.epoch_mut(&identifier)
+						.ok_or_else(|| sp_consensus::Error::InvalidAuthoritiesSet)?;
+
+					// mutate the current epoch
+					epoch_mut.authorities = self.authorities.clone();
+
+					let next_epoch = ConsensusLog::NextEpochData(NextEpochDescriptor {
+						authorities: self.authorities.clone(),
+						// copy the old randomness
+						randomness: epoch_mut.randomness.clone(),
+					});
+
+					vec![
+						DigestItemFor::<B>::PreRuntime(BABE_ENGINE_ID, predigest.encode()),
+						DigestItemFor::<B>::Consensus(BABE_ENGINE_ID, next_epoch.encode())
+					]
 				},
-				_ => unreachable!("we couldn't claim a slot, so this isn't the genesis epoch; qed")
-			};
-
-			// mutate the current epoch
-			epoch_mut.authorities = self.authorities.clone();
-
-			let next_epoch = ConsensusLog::NextEpochData(NextEpochDescriptor {
-				authorities: self.authorities.clone(),
-				// copy the old randomness
-				randomness: epoch_mut.randomness.clone(),
-			});
-
-			vec![
-				DigestItemFor::<B>::PreRuntime(BABE_ENGINE_ID, predigest.encode()),
-				DigestItemFor::<B>::Consensus(BABE_ENGINE_ID, next_epoch.encode())
-			]
+				ViableEpochDescriptor::UnimportedGenesis(_) => {
+					// since this is the genesis, secondary predigest works for now.
+					vec![
+						DigestItemFor::<B>::PreRuntime(BABE_ENGINE_ID, predigest.encode()),
+					]
+				}
+			}
 		};
 
 		Ok(Digest { logs })
diff --git a/test-utils/test-runner/Cargo.toml b/test-utils/test-runner/Cargo.toml
index a4c2bf84ab4a..0eb02d941712 100644
--- a/test-utils/test-runner/Cargo.toml
+++ b/test-utils/test-runner/Cargo.toml
@@ -7,46 +7,48 @@ publish = false
 
 [dependencies]
 # client deps
-sc-executor = { version = "0.10.0-dev", path = "../../client/executor" }
-sc-service = { version = "0.10.0-dev", path = "../../client/service" }
-sc-informant = { version = "0.10.0-dev", path = "../../client/informant" }
-sc-network = { version = "0.10.0-dev", path = "../../client/network" }
-sc-cli = { version = "0.10.0-dev", path = "../../client/cli" }
-sc-basic-authorship = { version = "0.10.0-dev", path = "../../client/basic-authorship" }
-sc-rpc = { version = "4.0.0-dev", path = "../../client/rpc" }
-sc-transaction-pool = { version = "4.0.0-dev", path = "../../client/transaction-pool" }
-sc-transaction-pool-api = { version = "4.0.0-dev", path = "../../client/transaction-pool/api" }
-sc-client-api = { version = "4.0.0-dev", path = "../../client/api" }
-sc-rpc-server = { version = "4.0.0-dev", path = "../../client/rpc-servers" }
-manual-seal = { package = "sc-consensus-manual-seal", version = "0.10.0-dev", path = "../../client/consensus/manual-seal" }
+sc-executor = { path = "../../client/executor" }
+sc-service = { path = "../../client/service" }
+sc-informant = { path = "../../client/informant" }
+sc-network = { path = "../../client/network" }
+sc-cli = { path = "../../client/cli" }
+sc-basic-authorship = { path = "../../client/basic-authorship" }
+sc-rpc = { path = "../../client/rpc" }
+sc-transaction-pool = { path = "../../client/transaction-pool" }
+grandpa = { package = "sc-finality-grandpa", path = "../../client/finality-grandpa" }
+sp-consensus-babe = { path = "../../primitives/consensus/babe" }
+sc-consensus-babe = { path = "../../client/consensus/babe" }
+sc-consensus = { path = "../../client/consensus/common" }
+sc-transaction-pool-api = { path = "../../client/transaction-pool/api" }
+sc-client-api = { path = "../../client/api" }
+sc-rpc-server = { path = "../../client/rpc-servers" }
+manual-seal = { package = "sc-consensus-manual-seal", path = "../../client/consensus/manual-seal" }
 
 # primitive deps
-sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
-sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
-sp-block-builder = { version = "4.0.0-dev", path = "../../primitives/block-builder" }
-sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
-sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
-sp-transaction-pool = { version = "4.0.0-dev", path = "../../primitives/transaction-pool" }
-sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
-sp-keystore = { version = "0.10.0-dev", path = "../../primitives/keystore" }
-sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
-sp-session = { version = "4.0.0-dev", path = "../../primitives/session" }
-sp-offchain = { version = "4.0.0-dev", path = "../../primitives/offchain" }
-sp-inherents = { version = "4.0.0-dev", path = "../../primitives/inherents" }
-sp-keyring = { version = "4.0.0-dev", path = "../../primitives/keyring" }
+sp-core = { path = "../../primitives/core" }
+sp-blockchain = { path = "../../primitives/blockchain" }
+sp-block-builder = { path = "../../primitives/block-builder" }
+sp-api = { path = "../../primitives/api" }
+sp-transaction-pool = { path = "../../primitives/transaction-pool" }
+sp-consensus = { path = "../../primitives/consensus/common" }
+sp-keystore = { path = "../../primitives/keystore" }
+sp-runtime = { path = "../../primitives/runtime" }
+sp-session = { path = "../../primitives/session" }
+sp-offchain = { path = "../../primitives/offchain" }
+sp-inherents = { path = "../../primitives/inherents" }
+sp-keyring = { path = "../../primitives/keyring" }
 
-sp-externalities = { version = "0.10.0-dev", path = "../../primitives/externalities" }
-sp-state-machine = { version = "0.10.0-dev", path = "../../primitives/state-machine" }
-sp-wasm-interface = { version = "4.0.0-dev", path = "../../primitives/wasm-interface" }
-sp-runtime-interface = { version = "4.0.0-dev", path = "../../primitives/runtime-interface" }
+sp-externalities = { path = "../../primitives/externalities" }
+sp-state-machine = { path = "../../primitives/state-machine" }
+sp-wasm-interface = { path = "../../primitives/wasm-interface" }
+sp-runtime-interface = { path = "../../primitives/runtime-interface" }
 
 # pallets
-frame-system = { version = "4.0.0-dev", path = "../../frame/system" }
+frame-system = { path = "../../frame/system" }
 
-env_logger = "0.7.1"
 log = "0.4.8"
 futures = { package = "futures", version = "0.3", features = ["compat"] }
-tokio = { version = "0.2", features = ["full"] }
-
+tokio = { version = "0.2", features = ["signal"] }
 # Calling RPC
 jsonrpc-core = "15.1"
+num-traits = "0.2.14"
diff --git a/test-utils/test-runner/src/client.rs b/test-utils/test-runner/src/client.rs
new file mode 100644
index 000000000000..4c562fbc66ed
--- /dev/null
+++ b/test-utils/test-runner/src/client.rs
@@ -0,0 +1,219 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+//! Client parts
+use sp_transaction_pool::runtime_api::TaggedTransactionQueue;
+use sp_consensus_babe::BabeApi;
+use crate::{ChainInfo, default_config};
+use manual_seal::consensus::babe::{BabeConsensusDataProvider, SlotTimestampProvider};
+use sp_keyring::sr25519::Keyring::Alice;
+use std::str::FromStr;
+use sp_runtime::traits::Header;
+use futures::channel::mpsc;
+use jsonrpc_core::MetaIoHandler;
+use manual_seal::{run_manual_seal, EngineCommand, ManualSealParams, import_queue, rpc::{ManualSeal, ManualSealApi}};
+use sc_client_api::backend::Backend;
+use sc_service::{
+    build_network, spawn_tasks, BuildNetworkParams, SpawnTasksParams, TFullBackend,
+    TFullClient, TaskManager, new_full_parts, Configuration, ChainSpec, TaskExecutor,
+};
+use sc_transaction_pool::BasicPool;
+use sc_transaction_pool_api::TransactionPool;
+use sp_api::{ApiExt, ConstructRuntimeApi, Core, Metadata};
+use sp_block_builder::BlockBuilder;
+use sp_runtime::traits::Block as BlockT;
+use sp_session::SessionKeys;
+use sp_offchain::OffchainWorkerApi;
+use std::sync::Arc;
+
+type ClientParts<T> = (
+    Arc<MetaIoHandler<sc_rpc::Metadata, sc_rpc_server::RpcMiddleware>>,
+    TaskManager,
+    Arc<TFullClient<<T as ChainInfo>::Block, <T as ChainInfo>::RuntimeApi, <T as ChainInfo>::Executor>>,
+    Arc<dyn TransactionPool<
+        Block = <T as ChainInfo>::Block,
+        Hash = <<T as ChainInfo>::Block as BlockT>::Hash,
+        Error = sc_transaction_pool::error::Error,
+        InPoolTransaction = sc_transaction_pool::Transaction<
+            <<T as ChainInfo>::Block as BlockT>::Hash,
+            <<T as ChainInfo>::Block as BlockT>::Extrinsic,
+        >,
+    >>,
+    mpsc::Sender<EngineCommand<<<T as ChainInfo>::Block as BlockT>::Hash>>,
+    Arc<TFullBackend<<T as ChainInfo>::Block>>,
+);
+
+/// Provide the config or chain spec for a given chain
+pub enum ConfigOrChainSpec {
+    /// Configuration object
+    Config(Configuration),
+    /// Chain spec object
+    ChainSpec(Box<dyn ChainSpec>, TaskExecutor)
+}
+/// Creates all the client parts you need for [`Node`]
+pub fn client_parts<T>(config_or_chain_spec: ConfigOrChainSpec) -> Result<ClientParts<T>, sc_service::Error>
+    where
+        T: ChainInfo + 'static,
+        <T::RuntimeApi as ConstructRuntimeApi<T::Block, TFullClient<T::Block, T::RuntimeApi, T::Executor>>>::RuntimeApi:
+        Core<T::Block> + Metadata<T::Block> + OffchainWorkerApi<T::Block> + SessionKeys<T::Block>
+        + TaggedTransactionQueue<T::Block> + BlockBuilder<T::Block> + BabeApi<T::Block>
+        + ApiExt<T::Block, StateBackend = <TFullBackend<T::Block> as Backend<T::Block>>::State>,
+        <T::Runtime as frame_system::Config>::Call: From<frame_system::Call<T::Runtime>>,
+        <<T as ChainInfo>::Block as BlockT>::Hash: FromStr,
+        <<<T as ChainInfo>::Block as BlockT>::Header as Header>::Number: num_traits::cast::AsPrimitive<usize>,
+{
+    use sp_consensus_babe::AuthorityId;
+    let config = match config_or_chain_spec {
+        ConfigOrChainSpec::Config(config) => config,
+        ConfigOrChainSpec::ChainSpec(chain_spec, task_executor) => {
+            default_config(task_executor, chain_spec)
+        },
+    };
+
+    let (client, backend, keystore, mut task_manager) =
+        new_full_parts::<T::Block, T::RuntimeApi, T::Executor>(&config, None)?;
+    let client = Arc::new(client);
+
+    let select_chain = sc_consensus::LongestChain::new(backend.clone());
+
+    let (grandpa_block_import, ..) =
+        grandpa::block_import(client.clone(), &(client.clone() as Arc<_>), select_chain.clone(), None)?;
+
+    let slot_duration = sc_consensus_babe::Config::get_or_compute(&*client)?;
+    let (block_import, babe_link) = sc_consensus_babe::block_import(
+        slot_duration.clone(),
+        grandpa_block_import,
+        client.clone(),
+    )?;
+
+    let consensus_data_provider = BabeConsensusDataProvider::new(
+        client.clone(),
+        keystore.sync_keystore(),
+        babe_link.epoch_changes().clone(),
+        vec![(AuthorityId::from(Alice.public()), 1000)],
+    )
+        .expect("failed to create ConsensusDataProvider");
+
+    let import_queue =
+        import_queue(Box::new(block_import.clone()), &task_manager.spawn_essential_handle(), None);
+
+    let transaction_pool = BasicPool::new_full(
+        config.transaction_pool.clone(),
+        true.into(),
+        config.prometheus_registry(),
+        task_manager.spawn_essential_handle(),
+        client.clone(),
+    );
+
+    let (network, system_rpc_tx, network_starter) = {
+        let params = BuildNetworkParams {
+            config: &config,
+            client: client.clone(),
+            transaction_pool: transaction_pool.clone(),
+            spawn_handle: task_manager.spawn_handle(),
+            import_queue,
+            on_demand: None,
+            block_announce_validator_builder: None,
+        };
+        build_network(params)?
+    };
+
+    // offchain workers
+    sc_service::build_offchain_workers(
+        &config,
+        task_manager.spawn_handle(),
+        client.clone(),
+        network.clone(),
+    );
+
+    // Proposer object for block authorship.
+    let env = sc_basic_authorship::ProposerFactory::new(
+        task_manager.spawn_handle(),
+        client.clone(),
+        transaction_pool.clone(),
+        config.prometheus_registry(),
+        None
+    );
+
+    // Channel for the rpc handler to communicate with the authorship task.
+    let (command_sink, commands_stream) = mpsc::channel(10);
+
+    let rpc_sink = command_sink.clone();
+
+    let rpc_handlers = {
+        let params = SpawnTasksParams {
+            config,
+            client: client.clone(),
+            backend: backend.clone(),
+            task_manager: &mut task_manager,
+            keystore: keystore.sync_keystore(),
+            on_demand: None,
+            transaction_pool: transaction_pool.clone(),
+            rpc_extensions_builder: Box::new(move |_, _| {
+                let mut io = jsonrpc_core::IoHandler::default();
+                io.extend_with(
+                    ManualSealApi::to_delegate(ManualSeal::new(rpc_sink.clone()))
+                );
+                io
+            }),
+            remote_blockchain: None,
+            network,
+            system_rpc_tx,
+            telemetry: None
+        };
+        spawn_tasks(params)?
+    };
+
+    let cloned_client = client.clone();
+    let create_inherent_data_providers = Box::new(move |_, _| {
+        let client = cloned_client.clone();
+        async move {
+            let timestamp = SlotTimestampProvider::new(client.clone()).map_err(|err| format!("{:?}", err))?;
+            let babe = sp_consensus_babe::inherents::InherentDataProvider::new(timestamp.slot().into());
+            Ok((timestamp, babe))
+        }
+    });
+
+    // Background authorship future.
+    let authorship_future = run_manual_seal(ManualSealParams {
+        block_import,
+        env,
+        client: client.clone(),
+        pool: transaction_pool.clone(),
+        commands_stream,
+        select_chain,
+        consensus_data_provider: Some(Box::new(consensus_data_provider)),
+        create_inherent_data_providers,
+    });
+
+    // spawn the authorship task as an essential task.
+    task_manager
+        .spawn_essential_handle()
+        .spawn("manual-seal", authorship_future);
+
+    network_starter.start_network();
+    let rpc_handler = rpc_handlers.io_handler();
+
+    Ok((
+        rpc_handler,
+        task_manager,
+        client,
+        transaction_pool,
+        command_sink,
+        backend,
+    ))
+}
\ No newline at end of file
diff --git a/test-utils/test-runner/src/host_functions.rs b/test-utils/test-runner/src/host_functions.rs
index ca8790683e6c..534d4a23fdcc 100644
--- a/test-utils/test-runner/src/host_functions.rs
+++ b/test-utils/test-runner/src/host_functions.rs
@@ -16,6 +16,20 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+/// Use this to override host functions.
+/// eg
+/// ```rust
+/// use test_runner::override_host_functions;
+/// pub struct SignatureVerificationOverride;
+///
+/// impl sp_wasm_interface::HostFunctions for SignatureVerificationOverride {
+///     fn host_functions() -> Vec<&'static dyn sp_wasm_interface::Function> {
+///         override_host_functions!(
+///             "ext_crypto_ecdsa_verify_version_1", EcdsaVerify,
+///         )
+///     }
+/// }
+/// ```
 #[macro_export]
 macro_rules! override_host_functions {
     ($($fn_name:expr, $name:ident,)*) => {{
diff --git a/test-utils/test-runner/src/lib.rs b/test-utils/test-runner/src/lib.rs
index 000d3efc3e96..1976d132b7c5 100644
--- a/test-utils/test-runner/src/lib.rs
+++ b/test-utils/test-runner/src/lib.rs
@@ -15,6 +15,7 @@
 
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
+#![deny(missing_docs, unused_extern_crates)]
 
 //! Test runner
 //! # Substrate Test Runner
@@ -226,16 +227,14 @@
 //! }
 //! ```
 
-use manual_seal::consensus::ConsensusDataProvider;
 use sc_executor::NativeExecutionDispatch;
-use sc_service::{Configuration, TFullBackend, TFullClient, TaskManager, TaskExecutor};
+use sc_service::TFullClient;
 use sp_api::{ConstructRuntimeApi, TransactionFor};
 use sp_consensus::{BlockImport, SelectChain};
-use sp_inherents::{CreateInherentDataProviders, InherentDataProvider};
-use sp_keystore::SyncCryptoStorePtr;
+use sp_inherents::InherentDataProvider;
 use sp_runtime::traits::{Block as BlockT, SignedExtension};
-use std::sync::Arc;
 
+mod client;
 mod node;
 mod utils;
 mod host_functions;
@@ -243,6 +242,7 @@ mod host_functions;
 pub use host_functions::*;
 pub use node::*;
 pub use utils::*;
+pub use client::*;
 
 /// Wrapper trait for concrete type required by this testing framework.
 pub trait ChainInfo: Sized {
@@ -282,44 +282,4 @@ pub trait ChainInfo: Sized {
 
 	/// Signed extras, this function is caled in an externalities provided environment.
 	fn signed_extras(from: <Self::Runtime as frame_system::Config>::AccountId) -> Self::SignedExtras;
-
-	/// config factory
-	fn config(task_executor: TaskExecutor) -> Configuration;
-
-	/// Attempt to create client parts, including block import,
-	/// select chain strategy and consensus data provider.
-	fn create_client_parts(
-		config: &Configuration,
-	) -> Result<
-		(
-			Arc<TFullClient<Self::Block, Self::RuntimeApi, Self::Executor>>,
-			Arc<TFullBackend<Self::Block>>,
-			SyncCryptoStorePtr,
-			TaskManager,
-			Box<
-				dyn CreateInherentDataProviders<
-					Self::Block,
-					(),
-					InherentDataProviders = Self::InherentDataProviders
-				>
-			>,
-			Option<
-				Box<
-					dyn ConsensusDataProvider<
-						Self::Block,
-						Transaction = TransactionFor<
-							TFullClient<Self::Block, Self::RuntimeApi, Self::Executor>,
-							Self::Block,
-						>,
-					>,
-				>,
-			>,
-			Self::SelectChain,
-			Self::BlockImport,
-		),
-		sc_service::Error,
-	>;
-
-	/// Given a call and a handle to the node, execute the call with root privileges.
-	fn dispatch_with_root(call: <Self::Runtime as frame_system::Config>::Call, node: &mut Node<Self>);
 }
diff --git a/test-utils/test-runner/src/node.rs b/test-utils/test-runner/src/node.rs
index 92fc3dbcda47..b1e5854798ee 100644
--- a/test-utils/test-runner/src/node.rs
+++ b/test-utils/test-runner/src/node.rs
@@ -20,31 +20,20 @@ use std::sync::Arc;
 
 use futures::{FutureExt, SinkExt, channel::{mpsc, oneshot}};
 use jsonrpc_core::MetaIoHandler;
-use manual_seal::{run_manual_seal, EngineCommand, ManualSealParams};
-use sc_cli::build_runtime;
-use sc_client_api::{
-	backend::{self, Backend}, CallExecutor, ExecutorProvider,
-};
-use sc_service::{
-	build_network, spawn_tasks, BuildNetworkParams, SpawnTasksParams,
-	TFullBackend, TFullCallExecutor, TFullClient, TaskManager, TaskType,
-};
-use sc_transaction_pool::BasicPool;
-use sp_api::{ApiExt, ConstructRuntimeApi, Core, Metadata, OverlayedChanges, StorageTransactionCache};
-use sp_block_builder::BlockBuilder;
+use manual_seal::EngineCommand;
+use sc_client_api::{backend::{self, Backend}, CallExecutor, ExecutorProvider};
+use sc_service::{TFullBackend, TFullCallExecutor, TFullClient, TaskManager};
+use sp_api::{OverlayedChanges, StorageTransactionCache};
 use sp_blockchain::HeaderBackend;
 use sp_core::ExecutionContext;
-use sp_offchain::OffchainWorkerApi;
-use sp_runtime::traits::{Block as BlockT, Extrinsic};
-use sp_runtime::{generic::BlockId, transaction_validity::TransactionSource, MultiSignature, MultiAddress};
-use sp_runtime::{generic::UncheckedExtrinsic, traits::NumberFor};
-use sp_session::SessionKeys;
-use sp_state_machine::Ext;
-use sp_transaction_pool::runtime_api::TaggedTransactionQueue;
+use sp_runtime::{
+	generic::{BlockId, UncheckedExtrinsic},
+	traits::{Block as BlockT, Header, Extrinsic, NumberFor},
+	transaction_validity::TransactionSource, MultiSignature, MultiAddress
+};
+use crate::ChainInfo;
 use sc_transaction_pool_api::TransactionPool;
-
-use crate::{ChainInfo, utils::logger};
-use log::LevelFilter;
+use sp_state_machine::Ext;
 
 /// This holds a reference to a running node on another thread,
 /// the node process is dropped when this struct is dropped
@@ -52,26 +41,20 @@ use log::LevelFilter;
 pub struct Node<T: ChainInfo> {
 	/// rpc handler for communicating with the node over rpc.
 	rpc_handler: Arc<MetaIoHandler<sc_rpc::Metadata, sc_rpc_server::RpcMiddleware>>,
-	/// Stream of log lines
-	log_stream: mpsc::UnboundedReceiver<String>,
-	/// node tokio runtime
-	_runtime: tokio::runtime::Runtime,
 	/// handle to the running node.
-	_task_manager: Option<TaskManager>,
+	task_manager: Option<TaskManager>,
 	/// client instance
 	client: Arc<TFullClient<T::Block, T::RuntimeApi, T::Executor>>,
 	/// transaction pool
-	pool: Arc<
-		dyn TransactionPool<
-			Block = T::Block,
-			Hash = <T::Block as BlockT>::Hash,
-			Error = sc_transaction_pool::error::Error,
-			InPoolTransaction = sc_transaction_pool::Transaction<
-				<T::Block as BlockT>::Hash,
-				<T::Block as BlockT>::Extrinsic,
-			>,
+	pool: Arc<dyn TransactionPool<
+		Block = <T as ChainInfo>::Block,
+		Hash = <<T as ChainInfo>::Block as BlockT>::Hash,
+		Error = sc_transaction_pool::error::Error,
+		InPoolTransaction = sc_transaction_pool::Transaction<
+			<<T as ChainInfo>::Block as BlockT>::Hash,
+			<<T as ChainInfo>::Block as BlockT>::Extrinsic,
 		>,
-	>,
+	>>,
 	/// channel to communicate with manual seal on.
 	manual_seal_command_sink: mpsc::Sender<EngineCommand<<T::Block as BlockT>::Hash>>,
 	/// backend type.
@@ -80,149 +63,48 @@ pub struct Node<T: ChainInfo> {
 	initial_block_number: NumberFor<T::Block>
 }
 
-/// Configuration options for the node.
-pub struct NodeConfig {
-	/// A set of log targets you'd like to enable/disbale
-	pub log_targets: Vec<(&'static str, LevelFilter)>,
-}
-
 type EventRecord<T> = frame_system::EventRecord<<T as frame_system::Config>::Event, <T as frame_system::Config>::Hash>;
 
-impl<T: ChainInfo> Node<T> {
-	/// Starts a node with the manual-seal authorship.
-	pub fn new(node_config: NodeConfig) -> Result<Self, sc_service::Error>
+impl<T> Node<T>
 	where
-		<T::RuntimeApi as ConstructRuntimeApi<T::Block, TFullClient<T::Block, T::RuntimeApi, T::Executor>>>::RuntimeApi:
-			Core<T::Block>
-				+ Metadata<T::Block>
-				+ OffchainWorkerApi<T::Block>
-				+ SessionKeys<T::Block>
-				+ TaggedTransactionQueue<T::Block>
-				+ BlockBuilder<T::Block>
-				+ ApiExt<T::Block, StateBackend = <TFullBackend<T::Block> as Backend<T::Block>>::State>,
-	{
-		let NodeConfig { log_targets, } = node_config;
-		let tokio_runtime = build_runtime().unwrap();
-		let runtime_handle = tokio_runtime.handle().clone();
-		let task_executor = move |fut, task_type| match task_type {
-			TaskType::Async => runtime_handle.spawn(fut).map(drop),
-			TaskType::Blocking => runtime_handle
-				.spawn_blocking(move || futures::executor::block_on(fut))
-				.map(drop),
-		};
-		// unbounded logs, should be fine, test is shortlived.
-		let (log_sink, log_stream) = mpsc::unbounded();
-
-		logger(log_targets, tokio_runtime.handle().clone(), log_sink);
-		let config = T::config(task_executor.into());
-
-		let (
-			client,
-			backend,
-			keystore,
-			mut task_manager,
-			create_inherent_data_providers,
-			consensus_data_provider,
-			select_chain,
-			block_import,
-		) = T::create_client_parts(&config)?;
-
-		let import_queue =
-			manual_seal::import_queue(Box::new(block_import.clone()), &task_manager.spawn_essential_handle(), None);
-
-		let transaction_pool = BasicPool::new_full(
-			config.transaction_pool.clone(),
-			true.into(),
-			config.prometheus_registry(),
-			task_manager.spawn_essential_handle(),
-			client.clone(),
-		);
-
-		let (network, system_rpc_tx, network_starter) = {
-			let params = BuildNetworkParams {
-				config: &config,
-				client: client.clone(),
-				transaction_pool: transaction_pool.clone(),
-				spawn_handle: task_manager.spawn_handle(),
-				import_queue,
-				on_demand: None,
-				block_announce_validator_builder: None,
-			};
-			build_network(params)?
-		};
-
-		sc_service::build_offchain_workers(
-			&config,
-			task_manager.spawn_handle(),
-			client.clone(),
-			network.clone(),
-		);
-
-		// Proposer object for block authorship.
-		let env = sc_basic_authorship::ProposerFactory::new(
-			task_manager.spawn_handle(),
-			client.clone(),
-			transaction_pool.clone(),
-			config.prometheus_registry(),
-			None
-		);
-
-		// Channel for the rpc handler to communicate with the authorship task.
-		let (command_sink, commands_stream) = mpsc::channel(10);
-
-		let rpc_handlers = {
-			let params = SpawnTasksParams {
-				config,
-				client: client.clone(),
-				backend: backend.clone(),
-				task_manager: &mut task_manager,
-				keystore,
-				on_demand: None,
-				transaction_pool: transaction_pool.clone(),
-				rpc_extensions_builder: Box::new(move |_, _| jsonrpc_core::IoHandler::default()),
-				remote_blockchain: None,
-				network,
-				system_rpc_tx,
-				telemetry: None
-			};
-			spawn_tasks(params)?
-		};
-
-		// Background authorship future.
-		let authorship_future = run_manual_seal(ManualSealParams {
-			block_import,
-			env,
-			client: client.clone(),
-			pool: transaction_pool.clone(),
-			commands_stream,
-			select_chain,
-			consensus_data_provider,
-			create_inherent_data_providers,
-		});
-
-		// spawn the authorship task as an essential task.
-		task_manager
-			.spawn_essential_handle()
-			.spawn("manual-seal", authorship_future);
-
-		network_starter.start_network();
-		let rpc_handler = rpc_handlers.io_handler();
-		let initial_number = client.info().best_number;
-
-		Ok(Self {
+		T: ChainInfo,
+		<<T::Block as BlockT>::Header as Header>::Number: From<u32>,
+{
+	/// Creates a new node.
+	pub fn new(
+		rpc_handler: Arc<MetaIoHandler<sc_rpc::Metadata, sc_rpc_server::RpcMiddleware>>,
+		task_manager: TaskManager,
+		client: Arc<TFullClient<T::Block, T::RuntimeApi, T::Executor>>,
+		pool: Arc<dyn TransactionPool<
+			Block = <T as ChainInfo>::Block,
+			Hash = <<T as ChainInfo>::Block as BlockT>::Hash,
+			Error = sc_transaction_pool::error::Error,
+			InPoolTransaction = sc_transaction_pool::Transaction<
+				<<T as ChainInfo>::Block as BlockT>::Hash,
+				<<T as ChainInfo>::Block as BlockT>::Extrinsic,
+			>,
+		>>,
+		command_sink: mpsc::Sender<EngineCommand<<T::Block as BlockT>::Hash>>,
+		backend: Arc<TFullBackend<T::Block>>,
+	) -> Self {
+		Self {
 			rpc_handler,
-			_task_manager: Some(task_manager),
-			_runtime: tokio_runtime,
-			client,
-			pool: transaction_pool,
+			task_manager: Some(task_manager),
+			client: client.clone(),
+			pool,
 			backend,
-			log_stream,
 			manual_seal_command_sink: command_sink,
-			initial_block_number: initial_number,
-		})
+			initial_block_number: client.info().best_number,
+		}
 	}
 
-	/// Returns a reference to the rpc handlers.
+	/// Returns a reference to the rpc handlers, use this to send rpc requests.
+	/// eg
+	/// ```ignore
+	/// 	let request = r#"{"jsonrpc":"2.0","method":"engine_createBlock","params": [true, true],"id":1}"#;
+	///		let response = node.rpc_handler()
+	/// 		.handle_request_sync(request, Default::default());
+	/// ```
 	pub fn rpc_handler(&self) -> Arc<MetaIoHandler<sc_rpc::Metadata, sc_rpc_server::RpcMiddleware>> {
 		self.rpc_handler.clone()
 	}
@@ -262,11 +144,11 @@ impl<T: ChainInfo> Node<T> {
 	}
 
 	/// submit some extrinsic to the node, providing the sending account.
-	pub fn submit_extrinsic(
-		&mut self,
+	pub async fn submit_extrinsic(
+		&self,
 		call: impl Into<<T::Runtime as frame_system::Config>::Call>,
 		from: <T::Runtime as frame_system::Config>::AccountId,
-	) -> <T::Block as BlockT>::Hash
+	) -> Result<<T::Block as BlockT>::Hash, sc_transaction_pool::error::Error>
 	where
 		<T::Block as BlockT>::Extrinsic: From<
 			UncheckedExtrinsic<
@@ -294,11 +176,7 @@ impl<T: ChainInfo> Node<T> {
 		.expect("UncheckedExtrinsic::new() always returns Some");
 		let at = self.client.info().best_hash;
 
-		self._runtime
-			.block_on(
-				self.pool.submit_one(&BlockId::Hash(at), TransactionSource::Local, ext.into()),
-			)
-			.unwrap()
+		self.pool.submit_one(&BlockId::Hash(at), TransactionSource::Local, ext.into()).await
 	}
 
 	/// Get the events of the most recently produced block
@@ -306,24 +184,9 @@ impl<T: ChainInfo> Node<T> {
 		self.with_state(|| frame_system::Pallet::<T::Runtime>::events())
 	}
 
-	/// Checks the node logs for a specific entry.
-	pub fn assert_log_line(&mut self, content: &str) {
-		futures::executor::block_on(async {
-			use futures::StreamExt;
-
-			while let Some(log_line) = self.log_stream.next().await {
-				if log_line.contains(content) {
-					return;
-				}
-			}
-
-			panic!("Could not find {} in logs content", content);
-		});
-	}
-
 	/// Instructs manual seal to seal new, possibly empty blocks.
-	pub fn seal_blocks(&mut self, num: usize) {
-		let (tokio, sink) = (&mut self._runtime, &mut self.manual_seal_command_sink);
+	pub async fn seal_blocks(&self, num: usize) {
+		let mut sink =  self.manual_seal_command_sink.clone();
 
 		for count in 0..num {
 			let (sender, future_block) = oneshot::channel();
@@ -334,15 +197,13 @@ impl<T: ChainInfo> Node<T> {
 				sender: Some(sender),
 			});
 
-			tokio.block_on(async {
-				const ERROR: &'static str = "manual-seal authorship task is shutting down";
-				future.await.expect(ERROR);
+			const ERROR: &'static str = "manual-seal authorship task is shutting down";
+			future.await.expect(ERROR);
 
-				match future_block.await.expect(ERROR) {
-					Ok(block) => log::info!("sealed {} (hash: {}) of {} blocks", count + 1, block.hash, num),
-					Err(err) => log::error!("failed to seal block {} of {}, error: {:?}", count + 1, num, err),
-				}
-			});
+			match future_block.await.expect(ERROR) {
+				Ok(block) => log::info!("sealed {} (hash: {}) of {} blocks", count + 1, block.hash, num),
+				Err(err) => log::error!("failed to seal block {} of {}, error: {:?}", count + 1, num, err),
+			}
 		}
 	}
 
@@ -351,32 +212,24 @@ impl<T: ChainInfo> Node<T> {
 		self.backend.revert(count, true).expect("Failed to revert blocks: ");
 	}
 
-	/// Revert all blocks added since creation of the node.
-	pub fn clean(&self) {
-		// if a db path was specified, revert all blocks we've added
-		if let Some(_) = std::env::var("DB_BASE_PATH").ok() {
-			let diff = self.client.info().best_number - self.initial_block_number;
-			self.revert_blocks(diff);
+	/// so you've decided to run the test runner as a binary, use this to shutdown gracefully.
+	pub async fn until_shutdown(mut self) {
+		let manager = self.task_manager.take();
+		if let Some(mut task_manager) = manager {
+			let task = task_manager.future().fuse();
+			let signal = tokio::signal::ctrl_c();
+			futures::pin_mut!(signal);
+			futures::future::select(task, signal).await;
+			// we don't really care whichever comes first.
+			task_manager.clean_shutdown().await
 		}
 	}
-
-	/// Performs a runtime upgrade given a wasm blob.
-	pub fn upgrade_runtime(&mut self, wasm: Vec<u8>)
-		where
-			<T::Runtime as frame_system::Config>::Call: From<frame_system::Call<T::Runtime>>
-	{
-		let call = frame_system::Call::set_code(wasm);
-		T::dispatch_with_root(call.into(), self);
-	}
 }
 
 impl<T: ChainInfo> Drop for Node<T> {
 	fn drop(&mut self) {
-		self.clean();
-
-		if let Some(mut task_manager) = self._task_manager.take() {
-			// if this isn't called the node will live forever
-			task_manager.terminate()
-		}
+		// Revert all blocks added since creation of the node.
+		let diff = self.client.info().best_number - self.initial_block_number;
+		self.revert_blocks(diff);
 	}
 }
diff --git a/test-utils/test-runner/src/utils.rs b/test-utils/test-runner/src/utils.rs
index fae527ededf9..9e722bcc510a 100644
--- a/test-utils/test-runner/src/utils.rs
+++ b/test-utils/test-runner/src/utils.rs
@@ -16,17 +16,20 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use futures::{Sink, SinkExt};
-use std::fmt;
-use std::io::Write;
-use log::LevelFilter;
-use sc_service::{BasePath, ChainSpec, Configuration, TaskExecutor, DatabaseConfig, KeepBlocks, TransactionStorageMode};
+use sc_service::{
+	BasePath, ChainSpec, Configuration, TaskExecutor,
+	DatabaseConfig, KeepBlocks, TransactionStorageMode, TaskType,
+};
 use sp_keyring::sr25519::Keyring::Alice;
 use sc_network::{multiaddr, config::{NetworkConfiguration, TransportConfig, Role}};
 use sc_informant::OutputFormat;
 use sc_service::config::KeystoreConfig;
 use sc_executor::WasmExecutionMethod;
 use sc_client_api::execution_extensions::ExecutionStrategies;
+use tokio::runtime::Handle;
+use futures::FutureExt;
+
+pub use sc_cli::build_runtime;
 
 /// Base db path gotten from env
 pub fn base_path() -> BasePath {
@@ -37,35 +40,6 @@ pub fn base_path() -> BasePath {
 	}
 }
 
-/// Builds the global logger.
-pub fn logger<S>(
-	log_targets: Vec<(&'static str, LevelFilter)>,
-	executor: tokio::runtime::Handle,
-	log_sink: S,
-)
-where
-	S: Sink<String> + Clone + Unpin + Send + Sync + 'static,
-	S::Error: Send + Sync + fmt::Debug,
-{
-	let mut builder = env_logger::builder();
-	builder.format(move |buf: &mut env_logger::fmt::Formatter, record: &log::Record| {
-		let entry = format!("{} {} {}", record.level(), record.target(), record.args());
-		let res = writeln!(buf, "{}", entry);
-
-		let mut log_sink_clone = log_sink.clone();
-		let _ = executor.spawn(async move {
-			log_sink_clone.send(entry).await.expect("log_stream is dropped");
-		});
-		res
-	});
-	builder.write_style(env_logger::WriteStyle::Always);
-
-	for (module, level) in log_targets {
-		builder.filter_module(module, level);
-	}
-	let _ = builder.is_test(true).try_init();
-}
-
 /// Produces a default configuration object, suitable for use with most set ups.
 pub fn default_config(task_executor: TaskExecutor, mut chain_spec: Box<dyn ChainSpec>) -> Configuration {
 	let base_path = base_path();
@@ -150,3 +124,13 @@ pub fn default_config(task_executor: TaskExecutor, mut chain_spec: Box<dyn Chain
 		transaction_storage: TransactionStorageMode::BlockBody,
 	}
 }
+
+/// Produce a task executor given a handle to a tokio runtime
+pub fn task_executor(handle: Handle) -> TaskExecutor {
+	let task_executor = move |fut, task_type| match task_type {
+		TaskType::Async => handle.spawn(fut).map(drop),
+		TaskType::Blocking => handle.spawn_blocking(move || futures::executor::block_on(fut)).map(drop),
+	};
+
+	task_executor.into()
+}

From 2543f6f6d80b374da8a2986a258987f20c0c28c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Mon, 12 Jul 2021 22:40:27 +0200
Subject: [PATCH 0981/1194] contracts: Allow contracts to dispatch calls into
 the runtime (#9276)

* contracts: Allow contracts to dispatch calls into the runtime

* Fix RPC tests

* Fix typo

* Replace () by AllowAllFilter and DenyAllFilter

* Add rust doc

* Fixup for `()` removal

* Fix lowest gas calculation

* Rename AllowAllFilter and DenyAllFilter

* Updated changelog
---
 Cargo.lock                                    |   1 +
 .../pallets/template/src/mock.rs              |   2 +-
 bin/node-template/runtime/src/lib.rs          |   2 +-
 bin/node/runtime/src/lib.rs                   |  12 +-
 docs/Upgrading-2.0-to-3.0.md                  |   2 +-
 frame/assets/src/mock.rs                      |   2 +-
 frame/atomic-swap/src/tests.rs                |   2 +-
 frame/aura/src/mock.rs                        |   2 +-
 frame/authority-discovery/src/lib.rs          |   4 +-
 frame/authorship/src/lib.rs                   |   2 +-
 frame/babe/src/mock.rs                        |   2 +-
 frame/balances/src/tests_composite.rs         |   2 +-
 frame/balances/src/tests_local.rs             |   2 +-
 frame/balances/src/tests_reentrancy.rs        |   2 +-
 frame/benchmarking/src/tests.rs               |   2 +-
 frame/bounties/src/tests.rs                   |   2 +-
 frame/collective/src/lib.rs                   |   2 +-
 frame/contracts/CHANGELOG.md                  |   3 +
 frame/contracts/Cargo.toml                    |   1 +
 frame/contracts/common/src/lib.rs             |   9 ++
 frame/contracts/fixtures/call_runtime.wat     |  33 +++++
 frame/contracts/fixtures/call_with_limit.wat  |  37 +++++
 frame/contracts/rpc/src/lib.rs                |  12 +-
 frame/contracts/src/chain_extension.rs        |  16 ++-
 frame/contracts/src/exec.rs                   | 135 +++++++++++++++++-
 frame/contracts/src/gas.rs                    |  38 ++++-
 frame/contracts/src/lib.rs                    |  49 ++++++-
 frame/contracts/src/tests.rs                  | 118 +++++++++++++--
 frame/contracts/src/wasm/mod.rs               |  99 ++++++++++++-
 frame/contracts/src/wasm/runtime.rs           |  77 +++++++++-
 .../election-provider-multi-phase/src/mock.rs |   2 +-
 frame/elections-phragmen/src/lib.rs           |   2 +-
 frame/elections/src/mock.rs                   |   2 +-
 frame/example-offchain-worker/src/tests.rs    |   2 +-
 frame/example-parallel/src/tests.rs           |   2 +-
 frame/example/src/tests.rs                    |   2 +-
 frame/executive/src/lib.rs                    |   2 +-
 frame/gilt/src/mock.rs                        |   2 +-
 frame/grandpa/src/mock.rs                     |   2 +-
 frame/identity/src/tests.rs                   |   2 +-
 frame/im-online/src/mock.rs                   |   2 +-
 frame/indices/src/mock.rs                     |   2 +-
 frame/lottery/src/mock.rs                     |   2 +-
 frame/membership/src/lib.rs                   |   2 +-
 frame/merkle-mountain-range/src/mock.rs       |   2 +-
 frame/nicks/src/lib.rs                        |   2 +-
 frame/node-authorization/src/mock.rs          |   2 +-
 frame/offences/benchmarking/src/mock.rs       |   2 +-
 frame/offences/src/mock.rs                    |   2 +-
 frame/randomness-collective-flip/src/lib.rs   |   2 +-
 frame/recovery/src/mock.rs                    |   2 +-
 frame/scored-pool/src/mock.rs                 |   2 +-
 frame/session/benchmarking/src/mock.rs        |   2 +-
 frame/session/src/mock.rs                     |   2 +-
 frame/society/src/mock.rs                     |   2 +-
 frame/staking/fuzzer/src/mock.rs              |   2 +-
 frame/staking/src/mock.rs                     |   2 +-
 frame/support/src/dispatch.rs                 |   2 +-
 frame/support/src/traits.rs                   |   1 +
 frame/support/src/traits/filter.rs            |  12 +-
 frame/support/test/tests/construct_runtime.rs |   2 +-
 frame/support/test/tests/instance.rs          |   2 +-
 frame/support/test/tests/issue2219.rs         |   2 +-
 frame/support/test/tests/pallet.rs            |   2 +-
 .../test/tests/pallet_compatibility.rs        |   2 +-
 .../tests/pallet_compatibility_instance.rs    |   2 +-
 frame/support/test/tests/pallet_instance.rs   |   2 +-
 frame/support/test/tests/pallet_version.rs    |   2 +-
 .../tests/pallet_with_name_trait_is_valid.rs  |   2 +-
 frame/system/benches/bench.rs                 |   2 +-
 frame/system/benchmarking/src/mock.rs         |   2 +-
 frame/system/src/mock.rs                      |   2 +-
 frame/timestamp/src/lib.rs                    |   2 +-
 frame/tips/src/tests.rs                       |   2 +-
 frame/transaction-payment/src/lib.rs          |   2 +-
 frame/transaction-storage/src/mock.rs         |   2 +-
 frame/treasury/src/tests.rs                   |   2 +-
 frame/uniques/src/mock.rs                     |   2 +-
 frame/vesting/src/mock.rs                     |   2 +-
 test-utils/runtime/src/lib.rs                 |   2 +-
 80 files changed, 674 insertions(+), 107 deletions(-)
 create mode 100644 frame/contracts/fixtures/call_runtime.wat
 create mode 100644 frame/contracts/fixtures/call_with_limit.wat

diff --git a/Cargo.lock b/Cargo.lock
index aaa4746d4ca4..3b8ec81c02db 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4871,6 +4871,7 @@ dependencies = [
  "pallet-contracts-proc-macro",
  "pallet-randomness-collective-flip",
  "pallet-timestamp",
+ "pallet-utility",
  "parity-scale-codec",
  "paste 1.0.4",
  "pretty_assertions 0.7.2",
diff --git a/bin/node-template/pallets/template/src/mock.rs b/bin/node-template/pallets/template/src/mock.rs
index 8719bcb4df2d..9bea61df22ed 100644
--- a/bin/node-template/pallets/template/src/mock.rs
+++ b/bin/node-template/pallets/template/src/mock.rs
@@ -27,7 +27,7 @@ parameter_types! {
 }
 
 impl system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index 0d336622404c..c92eb8a1aadf 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -146,7 +146,7 @@ parameter_types! {
 
 impl frame_system::Config for Runtime {
 	/// The basic call filter to use in dispatchable.
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	/// Block & extrinsics weights: base values and limits.
 	type BlockWeights = BlockWeights;
 	/// The maximum length of a block (in bytes).
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 6a25a278f2c7..4c8f1a829870 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -33,7 +33,7 @@ use frame_support::{
 	},
 	traits::{
 		Currency, Imbalance, KeyOwnerProofSystem, OnUnbalanced, LockIdentifier,
-		U128CurrencyToVote,
+		U128CurrencyToVote, AllowAll, DenyAll,
 	},
 };
 use frame_system::{
@@ -193,7 +193,7 @@ parameter_types! {
 const_assert!(NORMAL_DISPATCH_RATIO.deconstruct() >= AVERAGE_ON_INITIALIZE_RATIO.deconstruct());
 
 impl frame_system::Config for Runtime {
-	type BaseCallFilter = ();
+	type BaseCallFilter = AllowAll;
 	type BlockWeights = RuntimeBlockWeights;
 	type BlockLength = RuntimeBlockLength;
 	type DbWeight = RocksDbWeight;
@@ -839,6 +839,14 @@ impl pallet_contracts::Config for Runtime {
 	type Randomness = RandomnessCollectiveFlip;
 	type Currency = Balances;
 	type Event = Event;
+	type Call = Call;
+	/// The safest default is to allow no calls at all.
+	///
+	/// Runtimes should whitelist dispatchables that are allowed to be called from contracts
+	/// and make sure they are stable. Dispatchables exposed to contracts are not allowed to
+	/// change because that would break already deployed contracts. The `Call` structure itself
+	/// is not allowed to change the indices of existing pallets, too.
+	type CallFilter = DenyAll;
 	type RentPayment = ();
 	type SignedClaimHandicap = SignedClaimHandicap;
 	type TombstoneDeposit = TombstoneDeposit;
diff --git a/docs/Upgrading-2.0-to-3.0.md b/docs/Upgrading-2.0-to-3.0.md
index 46f01ab7824c..914b7b788d2e 100644
--- a/docs/Upgrading-2.0-to-3.0.md
+++ b/docs/Upgrading-2.0-to-3.0.md
@@ -143,7 +143,7 @@ And update the overall definition for weights on frame and a few related types a
 +const_assert!(NORMAL_DISPATCH_RATIO.deconstruct() >= AVERAGE_ON_INITIALIZE_RATIO.deconstruct());
 +
 +impl frame_system::Config for Runtime {
- 	type BaseCallFilter = ();
+ 	type BaseCallFilter = frame_support::traits::AllowAll;
 +	type BlockWeights = RuntimeBlockWeights;
 +	type BlockLength = RuntimeBlockLength;
 +	type DbWeight = RocksDbWeight;
diff --git a/frame/assets/src/mock.rs b/frame/assets/src/mock.rs
index cf99eed703cd..429548a5d1c2 100644
--- a/frame/assets/src/mock.rs
+++ b/frame/assets/src/mock.rs
@@ -43,7 +43,7 @@ parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 }
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type Origin = Origin;
diff --git a/frame/atomic-swap/src/tests.rs b/frame/atomic-swap/src/tests.rs
index f41874a1eec4..11e74be9b4e7 100644
--- a/frame/atomic-swap/src/tests.rs
+++ b/frame/atomic-swap/src/tests.rs
@@ -31,7 +31,7 @@ parameter_types! {
 		frame_system::limits::BlockWeights::simple_max(1024);
 }
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/aura/src/mock.rs b/frame/aura/src/mock.rs
index 443ac9890ac7..aff6b76a7a49 100644
--- a/frame/aura/src/mock.rs
+++ b/frame/aura/src/mock.rs
@@ -48,7 +48,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/authority-discovery/src/lib.rs b/frame/authority-discovery/src/lib.rs
index 7edbd8c9a8bd..1f480926209e 100644
--- a/frame/authority-discovery/src/lib.rs
+++ b/frame/authority-discovery/src/lib.rs
@@ -50,7 +50,7 @@ pub mod pallet {
 		Vec<AuthorityId>,
 		ValueQuery,
 	>;
-	
+
 	#[pallet::storage]
 	#[pallet::getter(fn next_keys)]
 	/// Keys of the next authority set.
@@ -212,7 +212,7 @@ mod tests {
 	}
 
 	impl frame_system::Config for Test {
-		type BaseCallFilter = ();
+		type BaseCallFilter = frame_support::traits::AllowAll;
 		type BlockWeights = ();
 		type BlockLength = ();
 		type DbWeight = ();
diff --git a/frame/authorship/src/lib.rs b/frame/authorship/src/lib.rs
index d40fb93b901a..de60d1a4caac 100644
--- a/frame/authorship/src/lib.rs
+++ b/frame/authorship/src/lib.rs
@@ -440,7 +440,7 @@ mod tests {
 	}
 
 	impl frame_system::Config for Test {
-		type BaseCallFilter = ();
+		type BaseCallFilter = frame_support::traits::AllowAll;
 		type BlockWeights = ();
 		type BlockLength = ();
 		type DbWeight = ();
diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index 6c1cc89cf1ed..ea54e9f7cea8 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -70,7 +70,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/balances/src/tests_composite.rs b/frame/balances/src/tests_composite.rs
index 07ec0f377ecf..1d90b3e70b92 100644
--- a/frame/balances/src/tests_composite.rs
+++ b/frame/balances/src/tests_composite.rs
@@ -54,7 +54,7 @@ parameter_types! {
 	pub static ExistentialDeposit: u64 = 0;
 }
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = BlockWeights;
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/balances/src/tests_local.rs b/frame/balances/src/tests_local.rs
index a6a1a09d9cbf..36351252b445 100644
--- a/frame/balances/src/tests_local.rs
+++ b/frame/balances/src/tests_local.rs
@@ -56,7 +56,7 @@ parameter_types! {
 	pub static ExistentialDeposit: u64 = 0;
 }
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = BlockWeights;
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/balances/src/tests_reentrancy.rs b/frame/balances/src/tests_reentrancy.rs
index caca7d78d0ff..2a3a60dfde84 100644
--- a/frame/balances/src/tests_reentrancy.rs
+++ b/frame/balances/src/tests_reentrancy.rs
@@ -64,7 +64,7 @@ parameter_types! {
 	pub static ExistentialDeposit: u64 = 0;
 }
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = BlockWeights;
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/benchmarking/src/tests.rs b/frame/benchmarking/src/tests.rs
index 0869ae68c7e0..646609c7c1e1 100644
--- a/frame/benchmarking/src/tests.rs
+++ b/frame/benchmarking/src/tests.rs
@@ -82,7 +82,7 @@ frame_support::construct_runtime!(
 );
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/bounties/src/tests.rs b/frame/bounties/src/tests.rs
index 3a53ffd56ac1..54973bf9b2fd 100644
--- a/frame/bounties/src/tests.rs
+++ b/frame/bounties/src/tests.rs
@@ -59,7 +59,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/collective/src/lib.rs b/frame/collective/src/lib.rs
index a7039887db60..c14ef9df64fe 100644
--- a/frame/collective/src/lib.rs
+++ b/frame/collective/src/lib.rs
@@ -986,7 +986,7 @@ mod tests {
 			frame_system::limits::BlockWeights::simple_max(1024);
 	}
 	impl frame_system::Config for Test {
-		type BaseCallFilter = ();
+		type BaseCallFilter = frame_support::traits::AllowAll;
 		type BlockWeights = ();
 		type BlockLength = ();
 		type DbWeight = ();
diff --git a/frame/contracts/CHANGELOG.md b/frame/contracts/CHANGELOG.md
index 03945d7b2e34..494c041d1bc8 100644
--- a/frame/contracts/CHANGELOG.md
+++ b/frame/contracts/CHANGELOG.md
@@ -20,6 +20,9 @@ In other words: Upgrading this pallet will not break pre-existing contracts.
 
 ### Added
 
+- Allow contracts to dispatch calls into the runtime (**unstable**)
+[#9276](https://github.com/paritytech/substrate/pull/9276)
+
 - New **unstable** version of `seal_call` that offers more features.
 [#8909](https://github.com/paritytech/substrate/pull/8909)
 
diff --git a/frame/contracts/Cargo.toml b/frame/contracts/Cargo.toml
index a0d7da0c5d0c..9424698091b2 100644
--- a/frame/contracts/Cargo.toml
+++ b/frame/contracts/Cargo.toml
@@ -48,6 +48,7 @@ wat = "1"
 pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 pallet-timestamp = { version = "4.0.0-dev", path = "../timestamp" }
 pallet-randomness-collective-flip = { version = "4.0.0-dev", path = "../randomness-collective-flip" }
+pallet-utility = { version = "4.0.0-dev", path = "../utility" }
 
 [features]
 default = ["std"]
diff --git a/frame/contracts/common/src/lib.rs b/frame/contracts/common/src/lib.rs
index 04c541a59a39..098ffd64b8e8 100644
--- a/frame/contracts/common/src/lib.rs
+++ b/frame/contracts/common/src/lib.rs
@@ -37,6 +37,15 @@ use serde::{Serialize, Deserialize};
 pub struct ContractResult<T> {
 	/// How much gas was consumed during execution.
 	pub gas_consumed: u64,
+	/// How much gas is required as gas limit in order to execute this call.
+	///
+	/// This value should be used to determine the gas limit for on-chain execution.
+	///
+	/// # Note
+	///
+	/// This can only different from [`Self::gas_consumed`] when weight pre charging
+	/// is used. Currently, only `seal_call_runtime` makes use of pre charging.
+	pub gas_required: u64,
 	/// An optional debug message. This message is only filled when explicitly requested
 	/// by the code that calls into the contract. Otherwise it is empty.
 	///
diff --git a/frame/contracts/fixtures/call_runtime.wat b/frame/contracts/fixtures/call_runtime.wat
new file mode 100644
index 000000000000..d5467f6e95e3
--- /dev/null
+++ b/frame/contracts/fixtures/call_runtime.wat
@@ -0,0 +1,33 @@
+;; This passes its input to `seal_call_runtime` and returns the return value to its caller.
+(module
+	(import "__unstable__" "seal_call_runtime" (func $seal_call_runtime (param i32 i32) (result i32)))
+	(import "seal0" "seal_input" (func $seal_input (param i32 i32)))
+	(import "seal0" "seal_return" (func $seal_return (param i32 i32 i32)))
+	(import "env" "memory" (memory 1 1))
+
+	;; 0x1000 = 4k in little endian
+	;; size of input buffer
+	(data (i32.const 0) "\00\10")
+
+	(func (export "call")
+		;; Receive the encoded call
+		(call $seal_input
+			(i32.const 4)	;; Pointer to the input buffer
+			(i32.const 0)	;; Size of the length buffer
+		)
+		;; Just use the call passed as input and store result to memory
+		(i32.store (i32.const 0)
+			(call $seal_call_runtime
+				(i32.const 4)				;; Pointer where the call is stored
+				(i32.load (i32.const 0))	;; Size of the call
+			)
+		)
+		(call $seal_return
+			(i32.const 0)	;; flags
+			(i32.const 0)	;; returned value
+			(i32.const 4)	;; length of returned value
+		)
+	)
+
+	(func (export "deploy"))
+)
diff --git a/frame/contracts/fixtures/call_with_limit.wat b/frame/contracts/fixtures/call_with_limit.wat
new file mode 100644
index 000000000000..abb870826727
--- /dev/null
+++ b/frame/contracts/fixtures/call_with_limit.wat
@@ -0,0 +1,37 @@
+;; This expects [account_id, gas_limit] as input and calls the account_id with the supplied gas_limit.
+;; It returns the result of the call as output data.
+(module
+	(import "seal0" "seal_input" (func $seal_input (param i32 i32)))
+	(import "seal0" "seal_call" (func $seal_call (param i32 i32 i64 i32 i32 i32 i32 i32 i32) (result i32)))
+	(import "seal0" "seal_return" (func $seal_return (param i32 i32 i32)))
+	(import "env" "memory" (memory 1 1))
+
+	;; 0x1000 = 4k in little endian
+	;; size of input buffer
+	(data (i32.const 0) "\00\10")
+
+	(func (export "deploy"))
+
+	(func (export "call")
+		;; Receive the encoded call + gas_limit
+		(call $seal_input
+			(i32.const 4)	;; Pointer to the input buffer
+			(i32.const 0)	;; Size of the length buffer
+		)
+		(i32.store
+			(i32.const 0)
+			(call $seal_call
+				(i32.const 4) ;; Pointer to "callee" address.
+				(i32.const 32) ;; Length of "callee" address.
+				(i64.load (i32.const 36)) ;; How much gas to devote for the execution.
+				(i32.const 0) ;; Pointer to the buffer with value to transfer
+				(i32.const 0) ;; Length of the buffer with value to transfer.
+				(i32.const 0) ;; Pointer to input data buffer address
+				(i32.const 0) ;; Length of input data buffer
+				(i32.const 0xffffffff) ;; u32 max sentinel value: do not copy output
+				(i32.const 0) ;; Ptr to output buffer len
+			)
+		)
+		(call $seal_return (i32.const 0) (i32.const 0) (i32.const 4))
+	)
+)
diff --git a/frame/contracts/rpc/src/lib.rs b/frame/contracts/rpc/src/lib.rs
index 1250d3cb285e..3b95e9850165 100644
--- a/frame/contracts/rpc/src/lib.rs
+++ b/frame/contracts/rpc/src/lib.rs
@@ -385,7 +385,8 @@ mod tests {
 		}
 		test(r#"{
 			"gasConsumed": 5000,
-			"debugMessage": "0x68656c704f6b",
+			"gasRequired": 8000,
+			"debugMessage": "HelloWorld",
 			"result": {
 			  "Ok": {
 				"flags": 5,
@@ -395,7 +396,8 @@ mod tests {
 		}"#);
 		test(r#"{
 			"gasConsumed": 3400,
-			"debugMessage": "0x68656c70457272",
+			"gasRequired": 5200,
+			"debugMessage": "HelloWorld",
 			"result": {
 			  "Err": "BadOrigin"
 			}
@@ -411,7 +413,8 @@ mod tests {
 		}
 		test(r#"{
 			"gasConsumed": 5000,
-			"debugMessage": "0x68656c704f6b",
+			"gasRequired": 8000,
+			"debugMessage": "HelloWorld",
 			"result": {
 			   "Ok": {
 				  "result": {
@@ -425,7 +428,8 @@ mod tests {
 		}"#);
 		test(r#"{
 			"gasConsumed": 3400,
-			"debugMessage": "0x68656c70457272",
+			"gasRequired": 5200,
+			"debugMessage": "HelloWorld",
 			"result": {
 			  "Err": "BadOrigin"
 			}
diff --git a/frame/contracts/src/chain_extension.rs b/frame/contracts/src/chain_extension.rs
index e72ab8cf056b..bb352c3a93d6 100644
--- a/frame/contracts/src/chain_extension.rs
+++ b/frame/contracts/src/chain_extension.rs
@@ -57,6 +57,7 @@
 use crate::{
 	Error,
 	wasm::{Runtime, RuntimeCosts},
+	gas::ChargedAmount,
 };
 use codec::{Decode, MaxEncodedLen};
 use frame_support::weights::Weight;
@@ -167,11 +168,22 @@ where
 	/// `weight`. It returns `Err` otherwise. In this case the chain extension should
 	/// abort the execution and pass through the error.
 	///
+	/// The returned value can be used to with [`Self::adjust_weight`]. Other than that
+	/// it has no purpose.
+	///
 	/// # Note
 	///
 	/// Weight is synonymous with gas in substrate.
-	pub fn charge_weight(&mut self, amount: Weight) -> Result<()> {
-		self.inner.runtime.charge_gas(RuntimeCosts::ChainExtension(amount)).map(|_| ())
+	pub fn charge_weight(&mut self, amount: Weight) -> Result<ChargedAmount> {
+		self.inner.runtime.charge_gas(RuntimeCosts::ChainExtension(amount))
+	}
+
+	/// Adjust a previously charged amount down to its actual amount.
+	///
+	/// This is when a maximum a priori amount was charged and then should be partially
+	/// refunded to match the actual amount.
+	pub fn adjust_weight(&mut self, charged: ChargedAmount, actual_weight: Weight) {
+		self.inner.runtime.adjust_gas(charged, RuntimeCosts::ChainExtension(actual_weight))
 	}
 
 	/// Grants access to the execution environment of the current contract call.
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index 2b595ea6ce8d..ae1585afbb89 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -28,12 +28,13 @@ use sp_std::{
 };
 use sp_runtime::{Perbill, traits::{Convert, Saturating}};
 use frame_support::{
-	dispatch::{DispatchResult, DispatchError},
+	dispatch::{DispatchResult, DispatchError, DispatchResultWithPostInfo, Dispatchable},
 	storage::{with_transaction, TransactionOutcome},
-	traits::{ExistenceRequirement, Currency, Time, Randomness, Get},
+	traits::{ExistenceRequirement, Currency, Time, Randomness, Get, OriginTrait, Filter},
 	weights::Weight,
 	ensure, DefaultNoBound,
 };
+use frame_system::RawOrigin;
 use pallet_contracts_primitives::{ExecReturnValue};
 use smallvec::{SmallVec, Array};
 
@@ -300,6 +301,9 @@ pub trait Ext: sealing::Sealed {
 	///
 	/// Returns `true` if debug message recording is enabled. Otherwise `false` is returned.
 	fn append_debug_buffer(&mut self, msg: &str) -> bool;
+
+	/// Call some dispatchable and return the result.
+	fn call_runtime(&self, call: <Self::T as Config>::Call) -> DispatchResultWithPostInfo;
 }
 
 /// Describes the different functions that can be exported by an [`Executable`].
@@ -1291,6 +1295,12 @@ where
 			false
 		}
 	}
+
+	fn call_runtime(&self, call: <Self::T as Config>::Call) -> DispatchResultWithPostInfo {
+		let mut origin: T::Origin = RawOrigin::Signed(self.address().clone()).into();
+		origin.add_filter(T::CallFilter::filter);
+		call.dispatch(origin)
+	}
 }
 
 fn deposit_event<T: Config>(
@@ -1326,10 +1336,10 @@ mod sealing {
 mod tests {
 	use super::*;
 	use crate::{
-		gas::GasMeter, tests::{ExtBuilder, Test, Event as MetaEvent},
+		gas::GasMeter,
 		storage::Storage,
 		tests::{
-			ALICE, BOB, CHARLIE,
+			ALICE, BOB, CHARLIE, Call, TestFilter, ExtBuilder, Test, Event as MetaEvent,
 			test_utils::{place_contract, set_balance, get_balance},
 		},
 		exec::ExportedFunction::*,
@@ -1337,12 +1347,15 @@ mod tests {
 	};
 	use codec::{Encode, Decode};
 	use sp_core::Bytes;
-	use sp_runtime::DispatchError;
+	use sp_runtime::{DispatchError, traits::{BadOrigin, Hash}};
 	use assert_matches::assert_matches;
 	use std::{cell::RefCell, collections::HashMap, rc::Rc};
 	use pretty_assertions::{assert_eq, assert_ne};
 	use pallet_contracts_primitives::ReturnFlags;
 	use frame_support::{assert_ok, assert_err};
+	use frame_system::{EventRecord, Phase};
+
+	type System = frame_system::Pallet<Test>;
 
 	type MockStack<'a> = Stack<'a, Test, MockExecutable>;
 
@@ -1353,7 +1366,7 @@ mod tests {
 	}
 
 	fn events() -> Vec<Event<Test>> {
-		<frame_system::Pallet<Test>>::events()
+		System::events()
 			.into_iter()
 			.filter_map(|meta| match meta.event {
 				MetaEvent::Contracts(contract_event) => Some(contract_event),
@@ -2503,4 +2516,114 @@ mod tests {
 			);
 		});
 	}
+
+	#[test]
+	fn call_runtime_works() {
+		let code_hash = MockLoader::insert(Call, |ctx, _| {
+			let call = Call::System(frame_system::Call::remark_with_event(b"Hello World".to_vec()));
+			ctx.ext.call_runtime(call).unwrap();
+			exec_success()
+		});
+
+		ExtBuilder::default().build().execute_with(|| {
+			let subsistence = Contracts::<Test>::subsistence_threshold();
+			let schedule = <Test as Config>::Schedule::get();
+			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
+			set_balance(&ALICE, subsistence * 10);
+			place_contract(&BOB, code_hash);
+			System::reset_events();
+			MockStack::run_call(
+				ALICE,
+				BOB,
+				&mut gas_meter,
+				&schedule,
+				0,
+				vec![],
+				None,
+			).unwrap();
+
+			let remark_hash = <Test as frame_system::Config>::Hashing::hash(b"Hello World");
+			assert_eq!(System::events(), vec![
+				EventRecord {
+					phase: Phase::Initialization,
+					event: MetaEvent::System(frame_system::Event::Remarked(BOB, remark_hash)),
+					topics: vec![],
+				},
+			]);
+		});
+	}
+
+	#[test]
+	fn call_runtime_filter() {
+		let code_hash = MockLoader::insert(Call, |ctx, _| {
+			use frame_system::Call as SysCall;
+			use pallet_balances::Call as BalanceCall;
+			use pallet_utility::Call as UtilCall;
+
+			// remark should still be allowed
+			let allowed_call = Call::System(SysCall::remark_with_event(b"Hello".to_vec()));
+
+			// transfers are disallowed by the `TestFiler` (see below)
+			let forbidden_call = Call::Balances(BalanceCall::transfer(CHARLIE, 22));
+
+			// simple cases: direct call
+			assert_err!(
+				ctx.ext.call_runtime(forbidden_call.clone()),
+				BadOrigin,
+			);
+
+			// as part of a patch: return is OK (but it interrupted the batch)
+			assert_ok!(
+				ctx.ext.call_runtime(Call::Utility(UtilCall::batch(vec![
+					allowed_call.clone(), forbidden_call, allowed_call
+				]))),
+			);
+
+			// the transfer wasn't performed
+			assert_eq!(get_balance(&CHARLIE), 0);
+
+			exec_success()
+		});
+
+		TestFilter::set_filter(|call| {
+			match call {
+				Call::Balances(pallet_balances::Call::transfer(_, _)) => false,
+				_ => true,
+			}
+		});
+
+		ExtBuilder::default().build().execute_with(|| {
+			let subsistence = Contracts::<Test>::subsistence_threshold();
+			let schedule = <Test as Config>::Schedule::get();
+			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
+			set_balance(&ALICE, subsistence * 10);
+			place_contract(&BOB, code_hash);
+			System::reset_events();
+			MockStack::run_call(
+				ALICE,
+				BOB,
+				&mut gas_meter,
+				&schedule,
+				0,
+				vec![],
+				None,
+			).unwrap();
+
+			let remark_hash = <Test as frame_system::Config>::Hashing::hash(b"Hello");
+			assert_eq!(System::events(), vec![
+				EventRecord {
+					phase: Phase::Initialization,
+					event: MetaEvent::System(frame_system::Event::Remarked(BOB, remark_hash)),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: MetaEvent::Utility(
+						pallet_utility::Event::BatchInterrupted(1, BadOrigin.into()),
+					),
+					topics: vec![],
+				},
+			]);
+		});
+	}
 }
diff --git a/frame/contracts/src/gas.rs b/frame/contracts/src/gas.rs
index 34ddb3ceb043..64f410c4cef2 100644
--- a/frame/contracts/src/gas.rs
+++ b/frame/contracts/src/gas.rs
@@ -79,6 +79,8 @@ pub struct GasMeter<T: Config> {
 	gas_limit: Weight,
 	/// Amount of gas left from initial gas limit. Can reach zero.
 	gas_left: Weight,
+	/// Due to `adjust_gas` and `nested` the `gas_left` can temporarily dip below its final value.
+	gas_left_lowest: Weight,
 	_phantom: PhantomData<T>,
 	#[cfg(test)]
 	tokens: Vec<ErasedToken>,
@@ -92,6 +94,7 @@ where
 		GasMeter {
 			gas_limit,
 			gas_left: gas_limit,
+			gas_left_lowest: gas_limit,
 			_phantom: PhantomData,
 			#[cfg(test)]
 			tokens: Vec::new(),
@@ -122,6 +125,19 @@ where
 
 	/// Absorb the remaining gas of a nested meter after we are done using it.
 	pub fn absorb_nested(&mut self, nested: Self) {
+		if self.gas_left == 0 {
+			// All of the remaining gas was inherited by the nested gas meter. When absorbing
+			// we can therefore safely inherit the lowest gas that the nested gas meter experienced
+			// as long as it is lower than the lowest gas that was experienced by the parent.
+			// We cannot call `self.gas_left_lowest()` here because in the state that this
+			// code is run the parent gas meter has `0` gas left.
+			self.gas_left_lowest = nested.gas_left_lowest().min(self.gas_left_lowest);
+		} else {
+			// The nested gas meter was created with a fixed amount that did not consume all of the
+			// parents (self) gas. The lowest gas that self will experience is when the nested
+			// gas was pre charged with the fixed amount.
+			self.gas_left_lowest = self.gas_left_lowest();
+		}
 		self.gas_left += nested.gas_left;
 	}
 
@@ -163,12 +179,21 @@ where
 	/// This is when a maximum a priori amount was charged and then should be partially
 	/// refunded to match the actual amount.
 	pub fn adjust_gas<Tok: Token<T>>(&mut self, charged_amount: ChargedAmount, token: Tok) {
+		self.gas_left_lowest = self.gas_left_lowest();
 		let adjustment = charged_amount.0.saturating_sub(token.weight());
 		self.gas_left = self.gas_left.saturating_add(adjustment).min(self.gas_limit);
 	}
 
-	/// Returns how much gas was used.
-	pub fn gas_spent(&self) -> Weight {
+	/// Returns the amount of gas that is required to run the same call.
+	///
+	/// This can be different from `gas_spent` because due to `adjust_gas` the amount of
+	/// spent gas can temporarily drop and be refunded later.
+	pub fn gas_required(&self) -> Weight {
+		self.gas_limit - self.gas_left_lowest()
+	}
+
+	/// Returns how much gas was spent
+	pub fn gas_consumed(&self) -> Weight {
 		self.gas_limit - self.gas_left
 	}
 
@@ -179,14 +204,15 @@ where
 
 	/// Turn this GasMeter into a DispatchResult that contains the actually used gas.
 	pub fn into_dispatch_result<R, E>(
-		self, result: Result<R, E>,
+		self,
+		result: Result<R, E>,
 		base_weight: Weight,
 	) -> DispatchResultWithPostInfo
 	where
 		E: Into<ExecError>,
 	{
 		let post_info = PostDispatchInfo {
-			actual_weight: Some(self.gas_spent().saturating_add(base_weight)),
+			actual_weight: Some(self.gas_consumed().saturating_add(base_weight)),
 			pays_fee: Default::default(),
 		};
 
@@ -195,6 +221,10 @@ where
 			.map_err(|e| DispatchErrorWithPostInfo { post_info, error: e.into().error })
 	}
 
+	fn gas_left_lowest(&self) -> Weight {
+		self.gas_left_lowest.min(self.gas_left)
+	}
+
 	#[cfg(test)]
 	pub fn tokens(&self) -> &[ErasedToken] {
 		&self.tokens
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index 3ac56d8980cb..116ca6ce1888 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -118,8 +118,9 @@ use sp_runtime::{
 	Perbill,
 };
 use frame_support::{
-	traits::{OnUnbalanced, Currency, Get, Time, Randomness},
-	weights::{Weight, PostDispatchInfo, WithPostDispatchInfo},
+	traits::{OnUnbalanced, Currency, Get, Time, Randomness, Filter},
+	weights::{Weight, PostDispatchInfo, WithPostDispatchInfo, GetDispatchInfo},
+	dispatch::Dispatchable,
 };
 use frame_system::Pallet as System;
 use pallet_contracts_primitives::{
@@ -154,6 +155,41 @@ pub mod pallet {
 		/// The overarching event type.
 		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
 
+		/// The overarching call type.
+		type Call:
+			Dispatchable<Origin=Self::Origin, PostInfo=PostDispatchInfo> +
+			GetDispatchInfo +
+			codec::Decode +
+			IsType<<Self as frame_system::Config>::Call>;
+
+		/// Filter that is applied to calls dispatched by contracts.
+		///
+		/// Use this filter to control which dispatchables are callable by contracts.
+		/// This is applied in **addition** to [`frame_system::Config::BaseCallFilter`].
+		/// It is recommended to treat this as a whitelist.
+		///
+		/// # Subsistence Threshold
+		///
+		/// The runtime **must** make sure that any allowed dispatchable makes sure that the
+		/// `total_balance` of the contract stays above [`Pallet::subsistence_threshold()`].
+		/// Otherwise contracts can clutter the storage with their tombstones without
+		/// deposting the correct amount of balance.
+		///
+		/// # Stability
+		///
+		/// The runtime **must** make sure that all dispatchables that are callable by
+		/// contracts remain stable. In addition [`Self::Call`] itself must remain stable.
+		/// This means that no existing variants are allowed to switch their positions.
+		///
+		/// # Note
+		///
+		/// Note that dispatchables that are called via contracts do not spawn their
+		/// own wasm instance for each call (as opposed to when called via a transaction).
+		/// Therefore please make sure to be restrictive about which dispatchables are allowed
+		/// in order to not introduce a new DoS vector like memory allocation patterns that can
+		/// be exploited to drive the runtime into a panic.
+		type CallFilter: Filter<<Self as frame_system::Config>::Call>;
+
 		/// Handler for rent payments.
 		type RentPayment: OnUnbalanced<NegativeImbalanceOf<Self>>;
 
@@ -658,7 +694,8 @@ where
 		);
 		ContractExecResult {
 			result: result.map_err(|r| r.error),
-			gas_consumed: gas_meter.gas_spent(),
+			gas_consumed: gas_meter.gas_consumed(),
+			gas_required: gas_meter.gas_required(),
 			debug_message: debug_message.unwrap_or_default(),
 		}
 	}
@@ -699,7 +736,8 @@ where
 			Ok(executable) => executable,
 			Err(error) => return ContractInstantiateResult {
 				result: Err(error.into()),
-				gas_consumed: gas_meter.gas_spent(),
+				gas_consumed: gas_meter.gas_consumed(),
+				gas_required: gas_meter.gas_required(),
 				debug_message: Vec::new(),
 			}
 		};
@@ -727,7 +765,8 @@ where
 		});
 		ContractInstantiateResult {
 			result: result.map_err(|e| e.error),
-			gas_consumed: gas_meter.gas_spent(),
+			gas_consumed: gas_meter.gas_consumed(),
+			gas_required: gas_meter.gas_required(),
 			debug_message: debug_message.unwrap_or_default(),
 		}
 	}
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index b3ee139008bc..ea5fbccb0f2a 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -40,13 +40,14 @@ use sp_io::hashing::blake2_256;
 use frame_support::{
 	assert_ok, assert_err, assert_err_ignore_postinfo,
 	parameter_types, assert_storage_noop,
-	traits::{Currency, ReservableCurrency, OnInitialize},
+	traits::{Currency, ReservableCurrency, OnInitialize, Filter},
 	weights::{Weight, PostDispatchInfo, DispatchClass, constants::WEIGHT_PER_SECOND},
 	dispatch::DispatchErrorWithPostInfo,
 	storage::child,
 };
 use frame_system::{self as system, EventRecord, Phase};
 use pretty_assertions::assert_eq;
+use std::cell::RefCell;
 
 use crate as pallet_contracts;
 
@@ -63,6 +64,7 @@ frame_support::construct_runtime!(
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
 		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
 		Randomness: pallet_randomness_collective_flip::{Pallet, Storage},
+		Utility: pallet_utility::{Pallet, Call, Storage, Event},
 		Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>},
 	}
 );
@@ -125,7 +127,7 @@ pub mod test_utils {
 }
 
 thread_local! {
-	static TEST_EXTENSION: sp_std::cell::RefCell<TestExtension> = Default::default();
+	static TEST_EXTENSION: RefCell<TestExtension> = Default::default();
 }
 
 pub struct TestExtension {
@@ -211,7 +213,7 @@ parameter_types! {
 	pub static ExistentialDeposit: u64 = 0;
 }
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = BlockWeights;
 	type BlockLength = ();
 	type DbWeight = ();
@@ -256,6 +258,11 @@ impl pallet_timestamp::Config for Test {
 	type MinimumPeriod = MinimumPeriod;
 	type WeightInfo = ();
 }
+impl pallet_utility::Config for Test {
+	type Event = Event;
+	type Call = Call;
+	type WeightInfo = ();
+}
 parameter_types! {
 	pub const SignedClaimHandicap: u64 = 2;
 	pub const TombstoneDeposit: u64 = 16;
@@ -269,9 +276,6 @@ parameter_types! {
 	pub const DeletionWeightLimit: Weight = 500_000_000_000;
 	pub const MaxCodeSize: u32 = 2 * 1024;
 	pub MySchedule: Schedule<Test> = <Schedule<Test>>::default();
-}
-
-parameter_types! {
 	pub const TransactionByteFee: u64 = 0;
 }
 
@@ -281,11 +285,32 @@ impl Convert<Weight, BalanceOf<Self>> for Test {
 	}
 }
 
+/// A filter whose filter function can be swapped at runtime.
+pub struct TestFilter;
+
+thread_local! {
+	static CALL_FILTER: RefCell<fn(&Call) -> bool> = RefCell::new(|_| true);
+}
+
+impl TestFilter {
+	pub fn set_filter(filter: fn(&Call) -> bool) {
+		CALL_FILTER.with(|fltr| *fltr.borrow_mut() = filter);
+	}
+}
+
+impl Filter<Call> for TestFilter {
+	fn filter(call: &Call) -> bool {
+		CALL_FILTER.with(|fltr| fltr.borrow()(call))
+	}
+}
+
 impl Config for Test {
 	type Time = Timestamp;
 	type Randomness = Randomness;
 	type Currency = Balances;
 	type Event = Event;
+	type Call = Call;
+	type CallFilter = TestFilter;
 	type RentPayment = ();
 	type SignedClaimHandicap = SignedClaimHandicap;
 	type TombstoneDeposit = TombstoneDeposit;
@@ -2944,8 +2969,8 @@ fn debug_message_invalid_utf8() {
 }
 
 #[test]
-fn gas_estimation_correct() {
-	let (caller_code, caller_hash) = compile_module::<Test>("call_return_code").unwrap();
+fn gas_estimation_nested_call_fixed_limit() {
+	let (caller_code, caller_hash) = compile_module::<Test>("call_with_limit").unwrap();
 	let (callee_code, callee_hash) = compile_module::<Test>("dummy").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
 		let subsistence = Pallet::<Test>::subsistence_threshold();
@@ -2976,24 +3001,93 @@ fn gas_estimation_correct() {
 		);
 		let addr_callee = Contracts::contract_address(&ALICE, &callee_hash, &[1]);
 
+		let input: Vec<u8> = AsRef::<[u8]>::as_ref(&addr_callee)
+			.iter()
+			.cloned()
+			.chain((GAS_LIMIT / 5).to_le_bytes())
+			.collect();
+
 		// Call in order to determine the gas that is required for this call
 		let result = Contracts::bare_call(
 			ALICE,
 			addr_caller.clone(),
 			0,
 			GAS_LIMIT,
-			AsRef::<[u8]>::as_ref(&addr_callee).to_vec(),
+			input.clone(),
 			false,
 		);
-		assert_ok!(result.result);
+		assert_ok!(&result.result);
+
+		assert!(result.gas_required > result.gas_consumed);
 
 		// Make the same call using the estimated gas. Should succeed.
 		assert_ok!(Contracts::bare_call(
 			ALICE,
 			addr_caller,
 			0,
-			result.gas_consumed,
-			AsRef::<[u8]>::as_ref(&addr_callee).to_vec(),
+			result.gas_required,
+			input,
+			false,
+		).result);
+	});
+}
+
+#[test]
+#[cfg(feature = "unstable-interface")]
+fn gas_estimation_call_runtime() {
+	let (caller_code, caller_hash) = compile_module::<Test>("call_runtime").unwrap();
+	let (callee_code, callee_hash) = compile_module::<Test>("dummy").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let subsistence = Pallet::<Test>::subsistence_threshold();
+		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
+		let _ = Balances::deposit_creating(&CHARLIE, 1000 * subsistence);
+
+		assert_ok!(
+			Contracts::instantiate_with_code(
+				Origin::signed(ALICE),
+				subsistence * 100,
+				GAS_LIMIT,
+				caller_code,
+				vec![],
+				vec![0],
+			),
+		);
+		let addr_caller = Contracts::contract_address(&ALICE, &caller_hash, &[0]);
+
+		assert_ok!(
+			Contracts::instantiate_with_code(
+				Origin::signed(ALICE),
+				subsistence * 100,
+				GAS_LIMIT,
+				callee_code,
+				vec![],
+				vec![1],
+			),
+		);
+		let addr_callee = Contracts::contract_address(&ALICE, &callee_hash, &[1]);
+
+		// Call something trivial with a huge gas limit so that we can observe the effects
+		// of pre-charging. This should create a difference between consumed and required.
+		let call = Call::Contracts(crate::Call::call(addr_callee, 0, GAS_LIMIT / 3, vec![]));
+		let result = Contracts::bare_call(
+			ALICE,
+			addr_caller.clone(),
+			0,
+			GAS_LIMIT,
+			call.encode(),
+			false,
+		);
+		assert_ok!(&result.result);
+
+		assert!(result.gas_required > result.gas_consumed);
+
+		// Make the same call using the required gas. Should succeed.
+		assert_ok!(Contracts::bare_call(
+			ALICE,
+			addr_caller,
+			0,
+			result.gas_required,
+			call.encode(),
 			false,
 		).result);
 	});
diff --git a/frame/contracts/src/wasm/mod.rs b/frame/contracts/src/wasm/mod.rs
index 03a409bb12fe..ef45f35d0dae 100644
--- a/frame/contracts/src/wasm/mod.rs
+++ b/frame/contracts/src/wasm/mod.rs
@@ -254,18 +254,22 @@ mod tests {
 		rent::RentStatus,
 		tests::{Test, Call, ALICE, BOB},
 	};
-	use std::collections::HashMap;
+	use std::{
+		borrow::BorrowMut,
+		cell::RefCell,
+		collections::HashMap,
+	};
 	use sp_core::{Bytes, H256};
 	use hex_literal::hex;
 	use sp_runtime::DispatchError;
-	use frame_support::{assert_ok, dispatch::DispatchResult, weights::Weight};
+	use frame_support::{
+		assert_ok,
+		dispatch::{DispatchResult, DispatchResultWithPostInfo},
+		weights::Weight,
+	};
 	use assert_matches::assert_matches;
 	use pallet_contracts_primitives::{ExecReturnValue, ReturnFlags};
 	use pretty_assertions::assert_eq;
-	use sp_std::borrow::BorrowMut;
-
-	#[derive(Debug, PartialEq, Eq)]
-	struct DispatchEntry(Call);
 
 	#[derive(Debug, PartialEq, Eq)]
 	struct RestoreEntry {
@@ -313,6 +317,7 @@ mod tests {
 		restores: Vec<RestoreEntry>,
 		// (topics, data)
 		events: Vec<(Vec<H256>, Vec<u8>)>,
+		runtime_calls: RefCell<Vec<Call>>,
 		schedule: Schedule<Test>,
 		rent_params: RentParams<Test>,
 		gas_meter: GasMeter<Test>,
@@ -335,6 +340,7 @@ mod tests {
 				transfers: Default::default(),
 				restores: Default::default(),
 				events: Default::default(),
+				runtime_calls: Default::default(),
 				schedule: Default::default(),
 				rent_params: Default::default(),
 				gas_meter: GasMeter::new(10_000_000_000),
@@ -481,6 +487,10 @@ mod tests {
 			self.debug_buffer.extend(msg.as_bytes());
 			true
 		}
+		fn call_runtime(&self, call: <Self::T as Config>::Call) -> DispatchResultWithPostInfo {
+			self.runtime_calls.borrow_mut().push(call);
+			Ok(Default::default())
+		}
 	}
 
 	fn execute<E: BorrowMut<MockExt>>(
@@ -2160,4 +2170,81 @@ mod tests {
 			})
 		);
 	}
+
+	#[cfg(feature = "unstable-interface")]
+	const CODE_CALL_RUNTIME: &str = r#"
+(module
+	(import "__unstable__" "seal_call_runtime" (func $seal_call_runtime (param i32 i32) (result i32)))
+	(import "seal0" "seal_input" (func $seal_input (param i32 i32)))
+	(import "seal0" "seal_return" (func $seal_return (param i32 i32 i32)))
+	(import "env" "memory" (memory 1 1))
+
+	;; 0x1000 = 4k in little endian
+	;; size of input buffer
+	(data (i32.const 0) "\00\10")
+
+	(func (export "call")
+		;; Receive the encoded call
+		(call $seal_input
+			(i32.const 4)	;; Pointer to the input buffer
+			(i32.const 0)	;; Size of the length buffer
+		)
+		;; Just use the call passed as input and store result to memory
+		(i32.store (i32.const 0)
+			(call $seal_call_runtime
+				(i32.const 4)				;; Pointer where the call is stored
+				(i32.load (i32.const 0))	;; Size of the call
+			)
+		)
+		(call $seal_return
+			(i32.const 0)	;; flags
+			(i32.const 0)	;; returned value
+			(i32.const 4)	;; length of returned value
+		)
+	)
+
+	(func (export "deploy"))
+)
+"#;
+
+	#[test]
+	#[cfg(feature = "unstable-interface")]
+	fn call_runtime_works() {
+		use std::convert::TryInto;
+		let call = Call::System(frame_system::Call::remark(b"Hello World".to_vec()));
+		let mut ext = MockExt::default();
+		let result = execute(
+			CODE_CALL_RUNTIME,
+			call.encode(),
+			&mut ext,
+		).unwrap();
+		assert_eq!(
+			*ext.runtime_calls.borrow(),
+			vec![call],
+		);
+		// 0 = ReturnCode::Success
+		assert_eq!(u32::from_le_bytes(result.data.0.try_into().unwrap()), 0);
+	}
+
+	#[test]
+	#[cfg(feature = "unstable-interface")]
+	fn call_runtime_panics_on_invalid_call() {
+		let mut ext = MockExt::default();
+		let result = execute(
+			CODE_CALL_RUNTIME,
+			vec![0x42],
+			&mut ext,
+		);
+		assert_eq!(
+			result,
+			Err(ExecError {
+				error: Error::<Test>::DecodingFailed.into(),
+				origin: ErrorOrigin::Caller,
+			})
+		);
+		assert_eq!(
+			*ext.runtime_calls.borrow(),
+			vec![],
+		);
+	}
 }
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index 8956e3a2b445..7b6004a84f06 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -76,6 +76,9 @@ pub enum ReturnCode {
 	/// recording was disabled.
 	#[cfg(feature = "unstable-interface")]
 	LoggingDisabled = 9,
+	/// The call dispatched by `seal_call_runtime` was executed but returned an error.
+	#[cfg(feature = "unstable-interface")]
+	CallRuntimeReturnedError = 10,
 }
 
 impl ConvertibleToWasm for ReturnCode {
@@ -213,6 +216,12 @@ pub enum RuntimeCosts {
 	HashBlake128(u32),
 	/// Weight charged by a chain extension through `seal_call_chain_extension`.
 	ChainExtension(u64),
+	/// Weight charged for copying data from the sandbox.
+	#[cfg(feature = "unstable-interface")]
+	CopyIn(u32),
+	/// Weight charged for calling into the runtime.
+	#[cfg(feature = "unstable-interface")]
+	CallRuntime(Weight),
 }
 
 impl RuntimeCosts {
@@ -273,6 +282,10 @@ impl RuntimeCosts {
 			HashBlake128(len) => s.hash_blake2_128
 				.saturating_add(s.hash_blake2_128_per_byte.saturating_mul(len.into())),
 			ChainExtension(amount) => amount,
+			#[cfg(feature = "unstable-interface")]
+			CopyIn(len) => s.return_per_byte.saturating_mul(len.into()),
+			#[cfg(feature = "unstable-interface")]
+			CallRuntime(weight) => weight,
 		};
 		RuntimeToken {
 			#[cfg(test)]
@@ -457,6 +470,15 @@ where
 		self.ext.gas_meter().charge(token)
 	}
 
+	/// Adjust a previously charged amount down to its actual amount.
+	///
+	/// This is when a maximum a priori amount was charged and then should be partially
+	/// refunded to match the actual amount.
+	pub fn adjust_gas(&mut self, charged: ChargedAmount, actual_costs: RuntimeCosts) {
+		let token = actual_costs.token(&self.ext.schedule().host_fn_weights);
+		self.ext.gas_meter().adjust_gas(charged, token);
+	}
+
 	/// Read designated chunk from the sandbox memory.
 	///
 	/// Returns `Err` if one of the following conditions occurs:
@@ -797,7 +819,6 @@ where
 // data passed to the supervisor will lead to a trap. This is not documented explicitly
 // for every function.
 define_env!(Env, <E: Ext>,
-
 	// Account for used gas. Traps if gas used is greater than gas limit.
 	//
 	// NOTE: This is a implementation defined call and is NOT a part of the public API.
@@ -1808,4 +1829,58 @@ define_env!(Env, <E: Ext>,
 			out_ptr, out_len_ptr, &rent_status, false, already_charged
 		)?)
 	},
+
+	// Call some dispatchable of the runtime.
+	//
+	// This function decodes the passed in data as the overarching `Call` type of the
+	// runtime and dispatches it. The weight as specified in the runtime is charged
+	// from the gas meter. Any weight refunds made by the dispatchable are considered.
+	//
+	// The filter specified by `Config::CallFilter` is attached to the origin of
+	// the dispatched call.
+	//
+	// # Parameters
+	//
+	// - `input_ptr`: the pointer into the linear memory where the input data is placed.
+	// - `input_len`: the length of the input data in bytes.
+	//
+	// # Return Value
+	//
+	// Returns `ReturnCode::Success` when the dispatchable was succesfully executed and
+	// returned `Ok`. When the dispatchable was exeuted but returned an error
+	// `ReturnCode::CallRuntimeReturnedError` is returned. The full error is not
+	// provided because it is not guaranteed to be stable.
+	//
+	// # Comparison with `ChainExtension`
+	//
+	// Just as a chain extension this API allows the runtime to extend the functionality
+	// of contracts. While making use of this function is generelly easier it cannot be
+	// used in call cases. Consider writing a chain extension if you need to do perform
+	// one of the following tasks:
+	//
+	// - Return data.
+	// - Provide functionality **exclusively** to contracts.
+	// - Provide custom weights.
+	// - Avoid the need to keep the `Call` data structure stable.
+	//
+	// # Unstable
+	//
+	// This function is unstable and subject to change (or removal) in the future. Do not
+	// deploy a contract using it to a production chain.
+	[__unstable__] seal_call_runtime(ctx, call_ptr: u32, call_len: u32) -> ReturnCode => {
+		use frame_support::{dispatch::GetDispatchInfo, weights::extract_actual_weight};
+		ctx.charge_gas(RuntimeCosts::CopyIn(call_len))?;
+		let call: <E::T as Config>::Call = ctx.read_sandbox_memory_as_unbounded(
+			call_ptr, call_len
+		)?;
+		let dispatch_info = call.get_dispatch_info();
+		let charged = ctx.charge_gas(RuntimeCosts::CallRuntime(dispatch_info.weight))?;
+		let result = ctx.ext.call_runtime(call);
+		let actual_weight = extract_actual_weight(&result, &dispatch_info);
+		ctx.adjust_gas(charged, RuntimeCosts::CallRuntime(actual_weight));
+		match result {
+			Ok(_) => Ok(ReturnCode::Success),
+			Err(_) => Ok(ReturnCode::CallRuntimeReturnedError),
+		}
+	},
 );
diff --git a/frame/election-provider-multi-phase/src/mock.rs b/frame/election-provider-multi-phase/src/mock.rs
index 1b8ee1434585..55fa58590ce7 100644
--- a/frame/election-provider-multi-phase/src/mock.rs
+++ b/frame/election-provider-multi-phase/src/mock.rs
@@ -199,7 +199,7 @@ pub fn witness() -> SolutionOrSnapshotSize {
 
 impl frame_system::Config for Runtime {
 	type SS58Prefix = ();
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u64;
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index 8a1680633ef7..db4af14328bf 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -1123,7 +1123,7 @@ mod tests {
 	}
 
 	impl frame_system::Config for Test {
-		type BaseCallFilter = ();
+		type BaseCallFilter = frame_support::traits::AllowAll;
 		type BlockWeights = BlockWeights;
 		type BlockLength = ();
 		type DbWeight = ();
diff --git a/frame/elections/src/mock.rs b/frame/elections/src/mock.rs
index 7eef7f490998..4df6da829a18 100644
--- a/frame/elections/src/mock.rs
+++ b/frame/elections/src/mock.rs
@@ -36,7 +36,7 @@ parameter_types! {
 		frame_system::limits::BlockWeights::simple_max(1024);
 }
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/example-offchain-worker/src/tests.rs b/frame/example-offchain-worker/src/tests.rs
index ee47aa5629fd..7d16e5949034 100644
--- a/frame/example-offchain-worker/src/tests.rs
+++ b/frame/example-offchain-worker/src/tests.rs
@@ -60,7 +60,7 @@ parameter_types! {
 		frame_system::limits::BlockWeights::simple_max(1024);
 }
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/example-parallel/src/tests.rs b/frame/example-parallel/src/tests.rs
index 56cb73ebb08b..395290c0bf6e 100644
--- a/frame/example-parallel/src/tests.rs
+++ b/frame/example-parallel/src/tests.rs
@@ -44,7 +44,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type Origin = Origin;
 	type Call = Call;
 	type PalletInfo = PalletInfo;
diff --git a/frame/example/src/tests.rs b/frame/example/src/tests.rs
index c699a0bfad36..68a923792180 100644
--- a/frame/example/src/tests.rs
+++ b/frame/example/src/tests.rs
@@ -54,7 +54,7 @@ parameter_types! {
 		frame_system::limits::BlockWeights::simple_max(1024);
 }
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index c5f39e14f5fc..719a94e6fb1b 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -694,7 +694,7 @@ mod tests {
 		};
 	}
 	impl frame_system::Config for Runtime {
-		type BaseCallFilter = ();
+		type BaseCallFilter = frame_support::traits::AllowAll;
 		type BlockWeights = BlockWeights;
 		type BlockLength = ();
 		type DbWeight = ();
diff --git a/frame/gilt/src/mock.rs b/frame/gilt/src/mock.rs
index fb888515496b..aeff70610d4b 100644
--- a/frame/gilt/src/mock.rs
+++ b/frame/gilt/src/mock.rs
@@ -48,7 +48,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type Origin = Origin;
diff --git a/frame/grandpa/src/mock.rs b/frame/grandpa/src/mock.rs
index ebe5996c9dab..768564c30105 100644
--- a/frame/grandpa/src/mock.rs
+++ b/frame/grandpa/src/mock.rs
@@ -75,7 +75,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/identity/src/tests.rs b/frame/identity/src/tests.rs
index fea83dc3b10a..7a8bb4fa6d92 100644
--- a/frame/identity/src/tests.rs
+++ b/frame/identity/src/tests.rs
@@ -50,7 +50,7 @@ parameter_types! {
 		frame_system::limits::BlockWeights::simple_max(1024);
 }
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type Origin = Origin;
diff --git a/frame/im-online/src/mock.rs b/frame/im-online/src/mock.rs
index 4bc976476a67..3d7d6d73cd83 100644
--- a/frame/im-online/src/mock.rs
+++ b/frame/im-online/src/mock.rs
@@ -118,7 +118,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Runtime {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/indices/src/mock.rs b/frame/indices/src/mock.rs
index bd9e9c33af25..46c1d814acb6 100644
--- a/frame/indices/src/mock.rs
+++ b/frame/indices/src/mock.rs
@@ -46,7 +46,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/lottery/src/mock.rs b/frame/lottery/src/mock.rs
index 07593c17e508..885e81bb32ea 100644
--- a/frame/lottery/src/mock.rs
+++ b/frame/lottery/src/mock.rs
@@ -56,7 +56,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/membership/src/lib.rs b/frame/membership/src/lib.rs
index 62c9e5eae1a6..0d95af4e6f4a 100644
--- a/frame/membership/src/lib.rs
+++ b/frame/membership/src/lib.rs
@@ -491,7 +491,7 @@ mod tests {
 	}
 
 	impl frame_system::Config for Test {
-		type BaseCallFilter = ();
+		type BaseCallFilter = frame_support::traits::AllowAll;
 		type BlockWeights = ();
 		type BlockLength = ();
 		type DbWeight = ();
diff --git a/frame/merkle-mountain-range/src/mock.rs b/frame/merkle-mountain-range/src/mock.rs
index 3c8a5d284566..0d89021ae966 100644
--- a/frame/merkle-mountain-range/src/mock.rs
+++ b/frame/merkle-mountain-range/src/mock.rs
@@ -49,7 +49,7 @@ parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 }
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type Origin = Origin;
 	type Call = Call;
 	type Index = u64;
diff --git a/frame/nicks/src/lib.rs b/frame/nicks/src/lib.rs
index 1e0ef90e0a3a..afdcca7e91a5 100644
--- a/frame/nicks/src/lib.rs
+++ b/frame/nicks/src/lib.rs
@@ -275,7 +275,7 @@ mod tests {
 			frame_system::limits::BlockWeights::simple_max(1024);
 	}
 	impl frame_system::Config for Test {
-		type BaseCallFilter = ();
+		type BaseCallFilter = frame_support::traits::AllowAll;
 		type BlockWeights = ();
 		type BlockLength = ();
 		type DbWeight = ();
diff --git a/frame/node-authorization/src/mock.rs b/frame/node-authorization/src/mock.rs
index 3f4f894cdf7e..e952ed900d4b 100644
--- a/frame/node-authorization/src/mock.rs
+++ b/frame/node-authorization/src/mock.rs
@@ -48,7 +48,7 @@ parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 }
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type DbWeight = ();
 	type BlockWeights = ();
 	type BlockLength = ();
diff --git a/frame/offences/benchmarking/src/mock.rs b/frame/offences/benchmarking/src/mock.rs
index cd72780ec5ad..4e7a63c58a40 100644
--- a/frame/offences/benchmarking/src/mock.rs
+++ b/frame/offences/benchmarking/src/mock.rs
@@ -43,7 +43,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/offences/src/mock.rs b/frame/offences/src/mock.rs
index fff1973e334e..5818ae71687b 100644
--- a/frame/offences/src/mock.rs
+++ b/frame/offences/src/mock.rs
@@ -85,7 +85,7 @@ parameter_types! {
 		frame_system::limits::BlockWeights::simple_max(2 * WEIGHT_PER_SECOND);
 }
 impl frame_system::Config for Runtime {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = RocksDbWeight;
diff --git a/frame/randomness-collective-flip/src/lib.rs b/frame/randomness-collective-flip/src/lib.rs
index eaefa9ac86c3..1ff7d4382da1 100644
--- a/frame/randomness-collective-flip/src/lib.rs
+++ b/frame/randomness-collective-flip/src/lib.rs
@@ -195,7 +195,7 @@ mod tests {
 	}
 
 	impl frame_system::Config for Test {
-		type BaseCallFilter = ();
+		type BaseCallFilter = frame_support::traits::AllowAll;
 		type BlockWeights = ();
 		type BlockLength = BlockLength;
 		type DbWeight = ();
diff --git a/frame/recovery/src/mock.rs b/frame/recovery/src/mock.rs
index 6a0abab2bd12..9139cc12ce54 100644
--- a/frame/recovery/src/mock.rs
+++ b/frame/recovery/src/mock.rs
@@ -48,7 +48,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/scored-pool/src/mock.rs b/frame/scored-pool/src/mock.rs
index 44a28234a2a8..30dc48dd19d0 100644
--- a/frame/scored-pool/src/mock.rs
+++ b/frame/scored-pool/src/mock.rs
@@ -57,7 +57,7 @@ ord_parameter_types! {
 }
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/session/benchmarking/src/mock.rs b/frame/session/benchmarking/src/mock.rs
index 591e54f067bb..a3f9b6b447c3 100644
--- a/frame/session/benchmarking/src/mock.rs
+++ b/frame/session/benchmarking/src/mock.rs
@@ -45,7 +45,7 @@ frame_support::construct_runtime!(
 );
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/session/src/mock.rs b/frame/session/src/mock.rs
index 3459ab73d6af..1462b2326777 100644
--- a/frame/session/src/mock.rs
+++ b/frame/session/src/mock.rs
@@ -228,7 +228,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/society/src/mock.rs b/frame/society/src/mock.rs
index 5e156caa282e..18cdda678da6 100644
--- a/frame/society/src/mock.rs
+++ b/frame/society/src/mock.rs
@@ -69,7 +69,7 @@ ord_parameter_types! {
 }
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/staking/fuzzer/src/mock.rs b/frame/staking/fuzzer/src/mock.rs
index 4ac1a10364e6..98181ca2694d 100644
--- a/frame/staking/fuzzer/src/mock.rs
+++ b/frame/staking/fuzzer/src/mock.rs
@@ -42,7 +42,7 @@ frame_support::construct_runtime!(
 );
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index e0079cc3f375..3242a40ccd45 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -128,7 +128,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = RocksDbWeight;
diff --git a/frame/support/src/dispatch.rs b/frame/support/src/dispatch.rs
index 6f98dee8690b..12c1161a6a6c 100644
--- a/frame/support/src/dispatch.rs
+++ b/frame/support/src/dispatch.rs
@@ -2684,7 +2684,7 @@ mod tests {
 		type Origin = OuterOrigin;
 		type AccountId = u32;
 		type Call = ();
-		type BaseCallFilter = ();
+		type BaseCallFilter = frame_support::traits::AllowAll;
 		type BlockNumber = u32;
 		type PalletInfo = Self;
 		type DbWeight = ();
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index e8ce07528c8a..ec47331285ef 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -45,6 +45,7 @@ pub use validation::{
 mod filter;
 pub use filter::{
 	Filter, FilterStack, FilterStackGuard, ClearFilterGuard, InstanceFilter, IntegrityTest,
+	AllowAll, DenyAll,
 };
 
 mod misc;
diff --git a/frame/support/src/traits/filter.rs b/frame/support/src/traits/filter.rs
index f884a8ece72e..4b70fa177e5c 100644
--- a/frame/support/src/traits/filter.rs
+++ b/frame/support/src/traits/filter.rs
@@ -25,10 +25,20 @@ pub trait Filter<T> {
 	fn filter(_: &T) -> bool;
 }
 
-impl<T> Filter<T> for () {
+/// A [`Filter`] that allows any value.
+pub enum AllowAll {}
+
+/// A [`Filter`] that denies any value.
+pub enum DenyAll {}
+
+impl<T> Filter<T> for AllowAll {
 	fn filter(_: &T) -> bool { true }
 }
 
+impl<T> Filter<T> for DenyAll {
+	fn filter(_: &T) -> bool { false }
+}
+
 /// Trait to add a constraint onto the filter.
 pub trait FilterStack<T>: Filter<T> {
 	/// The type used to archive the stack.
diff --git a/frame/support/test/tests/construct_runtime.rs b/frame/support/test/tests/construct_runtime.rs
index 98d0c45d2425..dde7f6d53f8e 100644
--- a/frame/support/test/tests/construct_runtime.rs
+++ b/frame/support/test/tests/construct_runtime.rs
@@ -225,7 +225,7 @@ pub type BlockNumber = u64;
 pub type Index = u64;
 
 impl system::Config for Runtime {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type Hash = H256;
 	type Origin = Origin;
 	type BlockNumber = BlockNumber;
diff --git a/frame/support/test/tests/instance.rs b/frame/support/test/tests/instance.rs
index d952fd82eb0d..7d18a8368eda 100644
--- a/frame/support/test/tests/instance.rs
+++ b/frame/support/test/tests/instance.rs
@@ -255,7 +255,7 @@ pub type BlockNumber = u64;
 pub type Index = u64;
 
 impl system::Config for Runtime {
-	type BaseCallFilter= ();
+	type BaseCallFilter= frame_support::traits::AllowAll;
 	type Hash = H256;
 	type Origin = Origin;
 	type BlockNumber = BlockNumber;
diff --git a/frame/support/test/tests/issue2219.rs b/frame/support/test/tests/issue2219.rs
index 4525e8c1a1fe..78a79055a389 100644
--- a/frame/support/test/tests/issue2219.rs
+++ b/frame/support/test/tests/issue2219.rs
@@ -158,7 +158,7 @@ pub type Block = generic::Block<Header, UncheckedExtrinsic>;
 pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, Call, Signature, ()>;
 
 impl system::Config for Runtime {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type Hash = H256;
 	type Origin = Origin;
 	type BlockNumber = BlockNumber;
diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index 7438cee2bcab..59ebd2e71e59 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -448,7 +448,7 @@ frame_support::parameter_types!(
 );
 
 impl frame_system::Config for Runtime {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u32;
diff --git a/frame/support/test/tests/pallet_compatibility.rs b/frame/support/test/tests/pallet_compatibility.rs
index db01d15e5daa..3c055b9f45ae 100644
--- a/frame/support/test/tests/pallet_compatibility.rs
+++ b/frame/support/test/tests/pallet_compatibility.rs
@@ -203,7 +203,7 @@ frame_support::parameter_types!(
 );
 
 impl frame_system::Config for Runtime {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u32;
diff --git a/frame/support/test/tests/pallet_compatibility_instance.rs b/frame/support/test/tests/pallet_compatibility_instance.rs
index 63e71c8bf255..fd5d5fb7fdbb 100644
--- a/frame/support/test/tests/pallet_compatibility_instance.rs
+++ b/frame/support/test/tests/pallet_compatibility_instance.rs
@@ -198,7 +198,7 @@ impl frame_system::Config for Runtime {
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u32;
diff --git a/frame/support/test/tests/pallet_instance.rs b/frame/support/test/tests/pallet_instance.rs
index ccac97100a4b..11f9497b7bec 100644
--- a/frame/support/test/tests/pallet_instance.rs
+++ b/frame/support/test/tests/pallet_instance.rs
@@ -250,7 +250,7 @@ frame_support::parameter_types!(
 );
 
 impl frame_system::Config for Runtime {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u32;
diff --git a/frame/support/test/tests/pallet_version.rs b/frame/support/test/tests/pallet_version.rs
index 5c33d45aea64..ed0bf52a0346 100644
--- a/frame/support/test/tests/pallet_version.rs
+++ b/frame/support/test/tests/pallet_version.rs
@@ -144,7 +144,7 @@ frame_support::parameter_types!(
 );
 
 impl frame_system::Config for Runtime {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = BlockNumber;
diff --git a/frame/support/test/tests/pallet_with_name_trait_is_valid.rs b/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
index 6f35b122f639..665bbc2b5c51 100644
--- a/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
+++ b/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
@@ -126,7 +126,7 @@ mod tests {
 	}
 
 	impl frame_system::Config for Runtime {
-		type BaseCallFilter = ();
+		type BaseCallFilter = frame_support::traits::AllowAll;
 		type Origin = Origin;
 		type Index = u64;
 		type BlockNumber = u64;
diff --git a/frame/system/benches/bench.rs b/frame/system/benches/bench.rs
index 47980a88164e..02ea48bdde03 100644
--- a/frame/system/benches/bench.rs
+++ b/frame/system/benches/bench.rs
@@ -67,7 +67,7 @@ frame_support::parameter_types! {
 		);
 }
 impl system::Config for Runtime {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = ();
 	type BlockLength = BlockLength;
 	type DbWeight = ();
diff --git a/frame/system/benchmarking/src/mock.rs b/frame/system/benchmarking/src/mock.rs
index 253945a598bd..b375c9fcb509 100644
--- a/frame/system/benchmarking/src/mock.rs
+++ b/frame/system/benchmarking/src/mock.rs
@@ -39,7 +39,7 @@ frame_support::construct_runtime!(
 );
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/system/src/mock.rs b/frame/system/src/mock.rs
index 0f53532eb8f6..e9b6fb7d968e 100644
--- a/frame/system/src/mock.rs
+++ b/frame/system/src/mock.rs
@@ -85,7 +85,7 @@ impl OnKilledAccount<u64> for RecordKilled {
 }
 
 impl Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = RuntimeBlockWeights;
 	type BlockLength = RuntimeBlockLength;
 	type Origin = Origin;
diff --git a/frame/timestamp/src/lib.rs b/frame/timestamp/src/lib.rs
index f7dd7378d8ab..e9b6388340b2 100644
--- a/frame/timestamp/src/lib.rs
+++ b/frame/timestamp/src/lib.rs
@@ -326,7 +326,7 @@ mod tests {
 			frame_system::limits::BlockWeights::simple_max(1024);
 	}
 	impl frame_system::Config for Test {
-		type BaseCallFilter = ();
+		type BaseCallFilter = frame_support::traits::AllowAll;
 		type BlockWeights = ();
 		type BlockLength = ();
 		type DbWeight = ();
diff --git a/frame/tips/src/tests.rs b/frame/tips/src/tests.rs
index 6063f0954bd8..cb58ba6aabd6 100644
--- a/frame/tips/src/tests.rs
+++ b/frame/tips/src/tests.rs
@@ -58,7 +58,7 @@ parameter_types! {
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
index 416439e7f200..25fce83e6993 100644
--- a/frame/transaction-payment/src/lib.rs
+++ b/frame/transaction-payment/src/lib.rs
@@ -715,7 +715,7 @@ mod tests {
 	}
 
 	impl frame_system::Config for Runtime {
-		type BaseCallFilter = ();
+		type BaseCallFilter = frame_support::traits::AllowAll;
 		type BlockWeights = BlockWeights;
 		type BlockLength = ();
 		type DbWeight = ();
diff --git a/frame/transaction-storage/src/mock.rs b/frame/transaction-storage/src/mock.rs
index 03dacf8a98e8..344d7b736953 100644
--- a/frame/transaction-storage/src/mock.rs
+++ b/frame/transaction-storage/src/mock.rs
@@ -51,7 +51,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type Origin = Origin;
diff --git a/frame/treasury/src/tests.rs b/frame/treasury/src/tests.rs
index e4b6f2d664fc..dbd5b22741ba 100644
--- a/frame/treasury/src/tests.rs
+++ b/frame/treasury/src/tests.rs
@@ -54,7 +54,7 @@ parameter_types! {
 		frame_system::limits::BlockWeights::simple_max(1024);
 }
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/uniques/src/mock.rs b/frame/uniques/src/mock.rs
index 336a262358b2..254acd6c419c 100644
--- a/frame/uniques/src/mock.rs
+++ b/frame/uniques/src/mock.rs
@@ -43,7 +43,7 @@ parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 }
 impl frame_system::Config for Test {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type Origin = Origin;
diff --git a/frame/vesting/src/mock.rs b/frame/vesting/src/mock.rs
index 6fdd44aed140..45bfb788ba72 100644
--- a/frame/vesting/src/mock.rs
+++ b/frame/vesting/src/mock.rs
@@ -48,7 +48,7 @@ parameter_types! {
 impl frame_system::Config for Test {
 	type AccountData = pallet_balances::AccountData<u64>;
 	type AccountId = u64;
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockHashCount = BlockHashCount;
 	type BlockLength = ();
 	type BlockNumber = u64;
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index a6ba7e39c895..1023b77939bb 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -541,7 +541,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Runtime {
-	type BaseCallFilter = ();
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type BlockWeights = RuntimeBlockWeights;
 	type BlockLength = RuntimeBlockLength;
 	type Origin = Origin;

From e0638a1a518fe3f93269f1db4360ae9b4cc698e3 Mon Sep 17 00:00:00 2001
From: Qinxuan Chen <koushiro.cqx@gmail.com>
Date: Tue, 13 Jul 2021 15:26:58 +0800
Subject: [PATCH 0982/1194] Migrate `pallet-treasury` to the new pallet
 attribute macro (#9197)

* Migrate pallet-treasury to the new pallet attribute macro

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* Fix bounties/tips tests

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* fix

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* Update frame/treasury/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Update frame/treasury/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* use `GenesisBuild`

* fix imports

Co-authored-by: thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 bin/node/executor/tests/basic.rs   |   6 +-
 frame/bounties/src/benchmarking.rs |   2 +-
 frame/bounties/src/tests.rs        |  12 +-
 frame/tips/src/lib.rs              |   2 +-
 frame/tips/src/tests.rs            |   6 +-
 frame/treasury/Cargo.toml          |  10 +-
 frame/treasury/README.md           |   8 +-
 frame/treasury/src/benchmarking.rs |  19 +-
 frame/treasury/src/lib.rs          | 350 ++++++++++++++++-------------
 frame/treasury/src/tests.rs        |  18 +-
 10 files changed, 235 insertions(+), 198 deletions(-)

diff --git a/bin/node/executor/tests/basic.rs b/bin/node/executor/tests/basic.rs
index af9843715f13..4e1736679590 100644
--- a/bin/node/executor/tests/basic.rs
+++ b/bin/node/executor/tests/basic.rs
@@ -363,7 +363,7 @@ fn full_native_block_import_works() {
 			},
 			EventRecord {
 				phase: Phase::ApplyExtrinsic(1),
-				event: Event::Treasury(pallet_treasury::RawEvent::Deposit(fees * 8 / 10)),
+				event: Event::Treasury(pallet_treasury::Event::Deposit(fees * 8 / 10)),
 				topics: vec![],
 			},
 			EventRecord {
@@ -417,7 +417,7 @@ fn full_native_block_import_works() {
 			},
 			EventRecord {
 				phase: Phase::ApplyExtrinsic(1),
-				event: Event::Treasury(pallet_treasury::RawEvent::Deposit(fees * 8 / 10)),
+				event: Event::Treasury(pallet_treasury::Event::Deposit(fees * 8 / 10)),
 				topics: vec![],
 			},
 			EventRecord {
@@ -440,7 +440,7 @@ fn full_native_block_import_works() {
 			},
 			EventRecord {
 				phase: Phase::ApplyExtrinsic(2),
-				event: Event::Treasury(pallet_treasury::RawEvent::Deposit(fees * 8 / 10)),
+				event: Event::Treasury(pallet_treasury::Event::Deposit(fees * 8 / 10)),
 				topics: vec![],
 			},
 			EventRecord {
diff --git a/frame/bounties/src/benchmarking.rs b/frame/bounties/src/benchmarking.rs
index b07427db284b..23542e6c31b8 100644
--- a/frame/bounties/src/benchmarking.rs
+++ b/frame/bounties/src/benchmarking.rs
@@ -27,7 +27,7 @@ use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark
 use frame_support::traits::OnInitialize;
 
 use crate::Module as Bounties;
-use pallet_treasury::Module as Treasury;
+use pallet_treasury::Pallet as Treasury;
 
 const SEED: u32 = 0;
 
diff --git a/frame/bounties/src/tests.rs b/frame/bounties/src/tests.rs
index 54973bf9b2fd..2e96d8271e13 100644
--- a/frame/bounties/src/tests.rs
+++ b/frame/bounties/src/tests.rs
@@ -25,7 +25,7 @@ use std::cell::RefCell;
 
 use frame_support::{
 	assert_noop, assert_ok, parameter_types, weights::Weight, traits::OnInitialize,
-	PalletId
+	PalletId, pallet_prelude::GenesisBuild,
 };
 
 use sp_core::H256;
@@ -146,7 +146,7 @@ impl Config for Test {
 	type WeightInfo = ();
 }
 
-type TreasuryError = pallet_treasury::Error::<Test, pallet_treasury::DefaultInstance>;
+type TreasuryError = pallet_treasury::Error::<Test>;
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
@@ -154,7 +154,7 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 		// Total issuance will be 200 with treasury account initialized at ED.
 		balances: vec![(0, 100), (1, 98), (2, 1)],
 	}.assimilate_storage(&mut t).unwrap();
-	pallet_treasury::GenesisConfig::default().assimilate_storage::<Test, _>(&mut t).unwrap();
+	GenesisBuild::<Test>::assimilate_storage(&pallet_treasury::GenesisConfig, &mut t).unwrap();
 	t.into()
 }
 
@@ -268,7 +268,7 @@ fn reject_already_rejected_spend_proposal_fails() {
 fn reject_non_existent_spend_proposal_fails() {
 	new_test_ext().execute_with(|| {
 		assert_noop!(Treasury::reject_proposal(Origin::root(), 0),
-		pallet_treasury::Error::<Test, pallet_treasury::DefaultInstance>::InvalidIndex);
+		pallet_treasury::Error::<Test, _>::InvalidIndex);
 	});
 }
 
@@ -457,7 +457,7 @@ fn close_bounty_works() {
 		assert_eq!(Balances::free_balance(0), 100 - deposit);
 
 		assert_eq!(Bounties::bounties(0), None);
-		assert!(!pallet_treasury::Proposals::<Test>::contains_key(0));
+		assert!(!pallet_treasury::Proposals::<Test, _>::contains_key(0));
 
 		assert_eq!(Bounties::bounty_descriptions(0), None);
 	});
@@ -897,7 +897,7 @@ fn genesis_funding_works() {
 		// Total issuance will be 200 with treasury account initialized with 100.
 		balances: vec![(0, 100), (Treasury::account_id(), initial_funding)],
 	}.assimilate_storage(&mut t).unwrap();
-	pallet_treasury::GenesisConfig::default().assimilate_storage::<Test, _>(&mut t).unwrap();
+	GenesisBuild::<Test>::assimilate_storage(&pallet_treasury::GenesisConfig, &mut t).unwrap();
 	let mut t: sp_io::TestExternalities = t.into();
 
 	t.execute_with(|| {
diff --git a/frame/tips/src/lib.rs b/frame/tips/src/lib.rs
index b31468797ce4..e57f0d7b8df0 100644
--- a/frame/tips/src/lib.rs
+++ b/frame/tips/src/lib.rs
@@ -501,7 +501,7 @@ impl<T: Config> Module<T> {
 		tips.sort_by_key(|i| i.1);
 
 		let treasury = Self::account_id();
-		let max_payout = pallet_treasury::Module::<T>::pot();
+		let max_payout = pallet_treasury::Pallet::<T>::pot();
 
 		let mut payout = tips[tips.len() / 2].1.min(max_payout);
 		if !tip.deposit.is_zero() {
diff --git a/frame/tips/src/tests.rs b/frame/tips/src/tests.rs
index cb58ba6aabd6..7cf4c31a6495 100644
--- a/frame/tips/src/tests.rs
+++ b/frame/tips/src/tests.rs
@@ -25,7 +25,7 @@ use std::cell::RefCell;
 use frame_support::{
 	assert_noop, assert_ok, parameter_types,
 	weights::Weight, traits::SortedMembers,
-	PalletId
+	PalletId, pallet_prelude::GenesisBuild,
 };
 use sp_runtime::Permill;
 use sp_core::H256;
@@ -169,7 +169,7 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 		// Total issuance will be 200 with treasury account initialized at ED.
 		balances: vec![(0, 100), (1, 98), (2, 1)],
 	}.assimilate_storage(&mut t).unwrap();
-	pallet_treasury::GenesisConfig::default().assimilate_storage::<Test, _>(&mut t).unwrap();
+	GenesisBuild::<Test>::assimilate_storage(&pallet_treasury::GenesisConfig, &mut t).unwrap();
 	t.into()
 }
 
@@ -485,7 +485,7 @@ fn genesis_funding_works() {
 		// Total issuance will be 200 with treasury account initialized with 100.
 		balances: vec![(0, 100), (Treasury::account_id(), initial_funding)],
 	}.assimilate_storage(&mut t).unwrap();
-	pallet_treasury::GenesisConfig::default().assimilate_storage::<Test, _>(&mut t).unwrap();
+	GenesisBuild::<Test>::assimilate_storage(&pallet_treasury::GenesisConfig, &mut t).unwrap();
 	let mut t: sp_io::TestExternalities = t.into();
 
 	t.execute_with(|| {
diff --git a/frame/treasury/Cargo.toml b/frame/treasury/Cargo.toml
index 339ce196071a..95c54dafe131 100644
--- a/frame/treasury/Cargo.toml
+++ b/frame/treasury/Cargo.toml
@@ -13,16 +13,18 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+serde = { version = "1.0.101", features = ["derive"], optional = true }
+impl-trait-for-tuples = "0.2.1"
+
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 pallet-balances = { version = "4.0.0-dev", default-features = false, path = "../balances" }
-impl-trait-for-tuples = "0.2.1"
 
-frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
 sp-io ={ version = "4.0.0-dev", path = "../../primitives/io" }
@@ -32,8 +34,8 @@ sp-storage = { version = "4.0.0-dev", path = "../../primitives/storage" }
 [features]
 default = ["std"]
 std = [
-	"serde",
 	"codec/std",
+	"serde",
 	"sp-std/std",
 	"sp-runtime/std",
 	"frame-support/std",
diff --git a/frame/treasury/README.md b/frame/treasury/README.md
index 4b061359fea7..4945d79d1429 100644
--- a/frame/treasury/README.md
+++ b/frame/treasury/README.md
@@ -1,11 +1,11 @@
-# Treasury Module
+# Treasury Pallet
 
-The Treasury module provides a "pot" of funds that can be managed by stakeholders in the system and
+The Treasury pallet provides a "pot" of funds that can be managed by stakeholders in the system and
 a structure for making spending proposals from this pot.
 
 ## Overview
 
-The Treasury Module itself provides the pot to store funds, and a means for stakeholders to propose,
+The Treasury Pallet itself provides the pot to store funds, and a means for stakeholders to propose,
 approve, and deny expenditures. The chain will need to provide a method (e.g.inflation, fees) for
 collecting funds.
 
@@ -19,7 +19,7 @@ and use the funds to pay developers.
   approved.
 - **Deposit:** Funds that a proposer must lock when making a proposal. The deposit will be returned
   or slashed if the proposal is approved or rejected respectively.
-- **Pot:** Unspent funds accumulated by the treasury module.
+- **Pot:** Unspent funds accumulated by the treasury pallet.
 
 ## Interface
 
diff --git a/frame/treasury/src/benchmarking.rs b/frame/treasury/src/benchmarking.rs
index 64ecbebe0bff..cc5db8ce94c7 100644
--- a/frame/treasury/src/benchmarking.rs
+++ b/frame/treasury/src/benchmarking.rs
@@ -19,18 +19,16 @@
 
 #![cfg(feature = "runtime-benchmarks")]
 
-use super::*;
+use super::{*, Pallet as Treasury};
 
+use frame_benchmarking::{benchmarks_instance_pallet, account, impl_benchmark_test_suite};
+use frame_support::{traits::OnInitialize, ensure};
 use frame_system::RawOrigin;
-use frame_benchmarking::{benchmarks_instance, account, impl_benchmark_test_suite};
-use frame_support::traits::OnInitialize;
-
-use crate::Module as Treasury;
 
 const SEED: u32 = 0;
 
 // Create the pre-requisite information needed to create a treasury `propose_spend`.
-fn setup_proposal<T: Config<I>, I: Instance>(u: u32) -> (
+fn setup_proposal<T: Config<I>, I: 'static>(u: u32) -> (
 	T::AccountId,
 	BalanceOf<T, I>,
 	<T::Lookup as StaticLookup>::Source,
@@ -44,7 +42,7 @@ fn setup_proposal<T: Config<I>, I: Instance>(u: u32) -> (
 }
 
 // Create proposals that are approved for use in `on_initialize`.
-fn create_approved_proposals<T: Config<I>, I: Instance>(n: u32) -> Result<(), &'static str> {
+fn create_approved_proposals<T: Config<I>, I: 'static>(n: u32) -> Result<(), &'static str> {
 	for i in 0 .. n {
 		let (caller, value, lookup) = setup_proposal::<T, I>(i);
 		Treasury::<T, I>::propose_spend(
@@ -52,21 +50,20 @@ fn create_approved_proposals<T: Config<I>, I: Instance>(n: u32) -> Result<(), &'
 			value,
 			lookup
 		)?;
-		let proposal_id = <ProposalCount<I>>::get() - 1;
+		let proposal_id = <ProposalCount<T, I>>::get() - 1;
 		Treasury::<T, I>::approve_proposal(RawOrigin::Root.into(), proposal_id)?;
 	}
 	ensure!(<Approvals<T, I>>::get().len() == n as usize, "Not all approved");
 	Ok(())
 }
 
-fn setup_pot_account<T: Config<I>, I: Instance>() {
+fn setup_pot_account<T: Config<I>, I: 'static>() {
 	let pot_account = Treasury::<T, I>::account_id();
 	let value = T::Currency::minimum_balance().saturating_mul(1_000_000_000u32.into());
 	let _ = T::Currency::make_free_balance_be(&pot_account, value);
 }
 
-benchmarks_instance! {
-
+benchmarks_instance_pallet! {
 	propose_spend {
 		let (caller, value, beneficiary_lookup) = setup_proposal::<T, _>(SEED);
 		// Whitelist caller account from further DB operations.
diff --git a/frame/treasury/src/lib.rs b/frame/treasury/src/lib.rs
index 6028f1fbe4c7..3951a553ad65 100644
--- a/frame/treasury/src/lib.rs
+++ b/frame/treasury/src/lib.rs
@@ -15,9 +15,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! # Treasury Module
+//! # Treasury Pallet
 //!
-//! The Treasury module provides a "pot" of funds that can be managed by stakeholders in the system
+//! The Treasury pallet provides a "pot" of funds that can be managed by stakeholders in the system
 //! and a structure for making spending proposals from this pot.
 //!
 //! - [`Config`]
@@ -25,7 +25,7 @@
 //!
 //! ## Overview
 //!
-//! The Treasury Module itself provides the pot to store funds, and a means for stakeholders to
+//! The Treasury Pallet itself provides the pot to store funds, and a means for stakeholders to
 //! propose, approve, and deny expenditures. The chain will need to provide a method (e.g.
 //! inflation, fees) for collecting funds.
 //!
@@ -40,7 +40,7 @@
 //!   approved.
 //! - **Deposit:** Funds that a proposer must lock when making a proposal. The deposit will be
 //!   returned or slashed if the proposal is approved or rejected respectively.
-//! - **Pot:** Unspent funds accumulated by the treasury module.
+//! - **Pot:** Unspent funds accumulated by the treasury pallet.
 //!
 //! ## Interface
 //!
@@ -53,89 +53,42 @@
 //!
 //! ## GenesisConfig
 //!
-//! The Treasury module depends on the [`GenesisConfig`].
+//! The Treasury pallet depends on the [`GenesisConfig`].
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
 #[cfg(test)]
 mod tests;
 mod benchmarking;
-
 pub mod weights;
 
+use codec::{Encode, Decode};
+
 use sp_std::prelude::*;
-use frame_support::{
-	decl_module, decl_storage, decl_event, ensure, print, decl_error,
-	PalletId, BoundedVec, storage::TryAppendValue,
-};
-use frame_support::traits::{
-	Currency, Get, Imbalance, OnUnbalanced, ExistenceRequirement::KeepAlive,
-	ReservableCurrency, WithdrawReasons,
-};
 use sp_runtime::{
 	Permill, RuntimeDebug,
 	traits::{
 		Zero, StaticLookup, AccountIdConversion, Saturating
 	}
 };
-use frame_support::weights::{Weight, DispatchClass};
-use frame_support::traits::EnsureOrigin;
-use codec::{Encode, Decode};
-use frame_system::ensure_signed;
+
+use frame_support::{print, PalletId};
+use frame_support::traits::{
+	Currency, Get, Imbalance, OnUnbalanced, ExistenceRequirement::KeepAlive,
+	ReservableCurrency, WithdrawReasons
+};
+use frame_support::weights::Weight;
+
 pub use weights::WeightInfo;
+pub use pallet::*;
 
-pub type BalanceOf<T, I=DefaultInstance> =
+pub type BalanceOf<T, I = ()> =
 	<<T as Config<I>>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
-pub type PositiveImbalanceOf<T, I=DefaultInstance> =
+pub type PositiveImbalanceOf<T, I = ()> =
 	<<T as Config<I>>::Currency as Currency<<T as frame_system::Config>::AccountId>>::PositiveImbalance;
-pub type NegativeImbalanceOf<T, I=DefaultInstance> =
+pub type NegativeImbalanceOf<T, I = ()> =
 	<<T as Config<I>>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
 
-pub trait Config<I=DefaultInstance>: frame_system::Config {
-	/// The treasury's module id, used for deriving its sovereign account ID.
-	type PalletId: Get<PalletId>;
-
-	/// The staking balance.
-	type Currency: Currency<Self::AccountId> + ReservableCurrency<Self::AccountId>;
-
-	/// Origin from which approvals must come.
-	type ApproveOrigin: EnsureOrigin<Self::Origin>;
-
-	/// Origin from which rejections must come.
-	type RejectOrigin: EnsureOrigin<Self::Origin>;
-
-	/// The overarching event type.
-	type Event: From<Event<Self, I>> + Into<<Self as frame_system::Config>::Event>;
-
-	/// Handler for the unbalanced decrease when slashing for a rejected proposal or bounty.
-	type OnSlash: OnUnbalanced<NegativeImbalanceOf<Self, I>>;
-
-	/// Fraction of a proposal's value that should be bonded in order to place the proposal.
-	/// An accepted proposal gets these back. A rejected proposal does not.
-	type ProposalBond: Get<Permill>;
-
-	/// Minimum amount of funds that should be placed in a deposit for making a proposal.
-	type ProposalBondMinimum: Get<BalanceOf<Self, I>>;
-
-	/// Period between successive spends.
-	type SpendPeriod: Get<Self::BlockNumber>;
-
-	/// Percentage of spare funds (if any) that are burnt per spend period.
-	type Burn: Get<Permill>;
-
-	/// Handler for the unbalanced decrease when treasury funds are burned.
-	type BurnDestination: OnUnbalanced<NegativeImbalanceOf<Self, I>>;
-
-	/// Weight information for extrinsics in this pallet.
-	type WeightInfo: WeightInfo;
-
-	/// Runtime hooks to external pallet using treasury to compute spend funds.
-	type SpendFunds: SpendFunds<Self, I>;
-
-	/// The maximum number of approvals that can wait in the spending queue.
-	type MaxApprovals: Get<u32>;
-}
-
 /// A trait to allow the Treasury Pallet to spend it's funds for other purposes.
 /// There is an expectation that the implementer of this trait will correctly manage
 /// the mutable variables passed to it:
@@ -149,7 +102,7 @@ pub trait Config<I=DefaultInstance>: frame_system::Config {
 ///    not enough funds, mark this value as `true`. This will prevent the treasury
 ///    from burning the excess funds.
 #[impl_trait_for_tuples::impl_for_tuples(30)]
-pub trait SpendFunds<T: Config<I>, I=DefaultInstance> {
+pub trait SpendFunds<T: Config<I>, I: 'static = ()> {
 	fn spend_funds(
 		budget_remaining: &mut BalanceOf<T, I>,
 		imbalance: &mut PositiveImbalanceOf<T, I>,
@@ -175,58 +128,154 @@ pub struct Proposal<AccountId, Balance> {
 	bond: Balance,
 }
 
-decl_storage! {
-	trait Store for Module<T: Config<I>, I: Instance=DefaultInstance> as Treasury {
-		/// Number of proposals that have been made.
-		ProposalCount get(fn proposal_count): ProposalIndex;
+#[frame_support::pallet]
+pub mod pallet {
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+	use super::*;
+
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T, I = ()>(PhantomData<(T, I)>);
+
+	#[pallet::config]
+	pub trait Config<I: 'static = ()>: frame_system::Config {
+		/// The staking balance.
+		type Currency: Currency<Self::AccountId> + ReservableCurrency<Self::AccountId>;
+
+		/// Origin from which approvals must come.
+		type ApproveOrigin: EnsureOrigin<Self::Origin>;
+
+		/// Origin from which rejections must come.
+		type RejectOrigin: EnsureOrigin<Self::Origin>;
+
+		/// The overarching event type.
+		type Event: From<Event<Self, I>> + IsType<<Self as frame_system::Config>::Event>;
+
+		/// Handler for the unbalanced decrease when slashing for a rejected proposal or bounty.
+		type OnSlash: OnUnbalanced<NegativeImbalanceOf<Self, I>>;
+
+		/// Fraction of a proposal's value that should be bonded in order to place the proposal.
+		/// An accepted proposal gets these back. A rejected proposal does not.
+		#[pallet::constant]
+		type ProposalBond: Get<Permill>;
+
+		/// Minimum amount of funds that should be placed in a deposit for making a proposal.
+		#[pallet::constant]
+		type ProposalBondMinimum: Get<BalanceOf<Self, I>>;
+
+		/// Period between successive spends.
+		#[pallet::constant]
+		type SpendPeriod: Get<Self::BlockNumber>;
+
+		/// Percentage of spare funds (if any) that are burnt per spend period.
+		#[pallet::constant]
+		type Burn: Get<Permill>;
+
+		/// The treasury's pallet id, used for deriving its sovereign account ID.
+		#[pallet::constant]
+		type PalletId: Get<PalletId>;
+
+		/// Handler for the unbalanced decrease when treasury funds are burned.
+		type BurnDestination: OnUnbalanced<NegativeImbalanceOf<Self, I>>;
+
+		/// Weight information for extrinsics in this pallet.
+		type WeightInfo: WeightInfo;
 
-		/// Proposals that have been made.
-		pub Proposals get(fn proposals):
-			map hasher(twox_64_concat) ProposalIndex
-			=> Option<Proposal<T::AccountId, BalanceOf<T, I>>>;
+		/// Runtime hooks to external pallet using treasury to compute spend funds.
+		type SpendFunds: SpendFunds<Self, I>;
 
-		/// Proposal indices that have been approved but not yet awarded.
-		pub Approvals get(fn approvals): BoundedVec<ProposalIndex, T::MaxApprovals>;
+		/// The maximum number of approvals that can wait in the spending queue.
+		type MaxApprovals: Get<u32>;
+	}
+
+	/// Number of proposals that have been made.
+	#[pallet::storage]
+	#[pallet::getter(fn proposal_count)]
+	pub(crate) type ProposalCount<T, I = ()> = StorageValue<_, ProposalIndex, ValueQuery>;
+
+	/// Proposals that have been made.
+	#[pallet::storage]
+	#[pallet::getter(fn proposals)]
+	pub type Proposals<T: Config<I>, I: 'static = ()> = StorageMap<
+		_,
+		Twox64Concat,
+		ProposalIndex,
+		Proposal<T::AccountId, BalanceOf<T, I>>,
+		OptionQuery
+	>;
+
+	/// Proposal indices that have been approved but not yet awarded.
+	#[pallet::storage]
+	#[pallet::getter(fn approvals)]
+	pub type Approvals<T: Config<I>, I: 'static = ()> = StorageValue<
+		_,
+		BoundedVec<ProposalIndex, T::MaxApprovals>,
+		ValueQuery
+	>;
+
+	#[pallet::genesis_config]
+	pub struct GenesisConfig;
+
+	#[cfg(feature = "std")]
+	impl Default for GenesisConfig {
+		fn default() -> Self {
+			Self
+		}
+	}
+
+	#[cfg(feature = "std")]
+	impl GenesisConfig {
+		/// Direct implementation of `GenesisBuild::assimilate_storage`.
+		#[deprecated(note = "use `<GensisConfig<T, I> as GenesisBuild<T, I>>::assimilate_storage` instead")]
+		pub fn assimilate_storage<T: Config<I>, I: 'static>(
+			&self,
+			storage: &mut sp_runtime::Storage
+		) -> Result<(), String> {
+			<Self as GenesisBuild<T, I>>::assimilate_storage(self, storage)
+		}
 	}
-	add_extra_genesis {
-		build(|_config| {
+
+	#[pallet::genesis_build]
+	impl<T: Config<I>, I: 'static> GenesisBuild<T, I> for GenesisConfig {
+		fn build(&self) {
 			// Create Treasury account
-			let account_id = <Module<T, I>>::account_id();
+			let account_id = <Pallet<T, I>>::account_id();
 			let min = T::Currency::minimum_balance();
 			if T::Currency::free_balance(&account_id) < min {
 				let _ = T::Currency::make_free_balance_be(&account_id, min);
 			}
-		});
+		}
 	}
-}
 
-decl_event!(
-	pub enum Event<T, I=DefaultInstance>
-	where
-		Balance = BalanceOf<T, I>,
-		<T as frame_system::Config>::AccountId,
-	{
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	#[pallet::metadata(T::AccountId = "AccountId", BalanceOf<T, I> = "Balance")]
+	pub enum Event<T: Config<I>, I: 'static = ()> {
 		/// New proposal. \[proposal_index\]
 		Proposed(ProposalIndex),
 		/// We have ended a spend period and will now allocate funds. \[budget_remaining\]
-		Spending(Balance),
+		Spending(BalanceOf<T, I>),
 		/// Some funds have been allocated. \[proposal_index, award, beneficiary\]
-		Awarded(ProposalIndex, Balance, AccountId),
+		Awarded(ProposalIndex, BalanceOf<T, I>, T::AccountId),
 		/// A proposal was rejected; funds were slashed. \[proposal_index, slashed\]
-		Rejected(ProposalIndex, Balance),
+		Rejected(ProposalIndex, BalanceOf<T, I>),
 		/// Some of our funds have been burnt. \[burn\]
-		Burnt(Balance),
+		Burnt(BalanceOf<T, I>),
 		/// Spending has finished; this is the amount that rolls over until next spend.
 		/// \[budget_remaining\]
-		Rollover(Balance),
+		Rollover(BalanceOf<T, I>),
 		/// Some funds have been deposited. \[deposit\]
-		Deposit(Balance),
+		Deposit(BalanceOf<T, I>),
 	}
-);
 
-decl_error! {
-	/// Error for the treasury module.
-	pub enum Error for Module<T: Config<I>, I: Instance> {
+	/// Old name generated by `decl_event`.
+    #[deprecated(note = "use `Event` instead")]
+    pub type RawEvent<T, I = ()> = Event<T, I>;
+
+	/// Error for the treasury pallet.
+	#[pallet::error]
+	pub enum Error<T, I = ()> {
 		/// Proposer's balance is too low.
 		InsufficientProposersBalance,
 		/// No proposal or bounty at that index.
@@ -234,33 +283,28 @@ decl_error! {
 		/// Too many approvals in the queue.
 		TooManyApprovals,
 	}
-}
-
-decl_module! {
-	pub struct Module<T: Config<I>, I: Instance=DefaultInstance>
-		for enum Call
-		where origin: T::Origin
-	{
-		/// Fraction of a proposal's value that should be bonded in order to place the proposal.
-		/// An accepted proposal gets these back. A rejected proposal does not.
-		const ProposalBond: Permill = T::ProposalBond::get();
-
-		/// Minimum amount of funds that should be placed in a deposit for making a proposal.
-		const ProposalBondMinimum: BalanceOf<T, I> = T::ProposalBondMinimum::get();
-
-		/// Period between successive spends.
-		const SpendPeriod: T::BlockNumber = T::SpendPeriod::get();
 
-		/// Percentage of spare funds (if any) that are burnt per spend period.
-		const Burn: Permill = T::Burn::get();
-
-		/// The treasury's module id, used for deriving its sovereign account ID.
-		const PalletId: PalletId = T::PalletId::get();
-
-		type Error = Error<T, I>;
-
-		fn deposit_event() = default;
+	#[pallet::hooks]
+	impl<T: Config<I>, I: 'static> Hooks<BlockNumberFor<T>> for Pallet<T, I> {
+		/// # <weight>
+		/// - Complexity: `O(A)` where `A` is the number of approvals
+		/// - Db reads and writes: `Approvals`, `pot account data`
+		/// - Db reads and writes per approval:
+		///   `Proposals`, `proposer account data`, `beneficiary account data`
+		/// - The weight is overestimated if some approvals got missed.
+		/// # </weight>
+		fn on_initialize(n: T::BlockNumber) -> Weight {
+			// Check to see if we should spend some funds!
+			if (n % T::SpendPeriod::get()).is_zero() {
+				Self::spend_funds()
+			} else {
+				0
+			}
+		}
+	}
 
+	#[pallet::call]
+	impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		/// Put forward a suggestion for spending. A deposit proportional to the value
 		/// is reserved and slashed if the proposal is rejected. It is returned once the
 		/// proposal is awarded.
@@ -270,12 +314,12 @@ decl_module! {
 		/// - DbReads: `ProposalCount`, `origin account`
 		/// - DbWrites: `ProposalCount`, `Proposals`, `origin account`
 		/// # </weight>
-		#[weight = T::WeightInfo::propose_spend()]
+		#[pallet::weight(T::WeightInfo::propose_spend())]
 		pub fn propose_spend(
-			origin,
-			#[compact] value: BalanceOf<T, I>,
+			origin: OriginFor<T>,
+			#[pallet::compact] value: BalanceOf<T, I>,
 			beneficiary: <T::Lookup as StaticLookup>::Source
-		) {
+		) -> DispatchResult {
 			let proposer = ensure_signed(origin)?;
 			let beneficiary = T::Lookup::lookup(beneficiary)?;
 
@@ -284,10 +328,11 @@ decl_module! {
 				.map_err(|_| Error::<T, I>::InsufficientProposersBalance)?;
 
 			let c = Self::proposal_count();
-			<ProposalCount<I>>::put(c + 1);
+			<ProposalCount<T, I>>::put(c + 1);
 			<Proposals<T, I>>::insert(c, Proposal { proposer, value, beneficiary, bond });
 
-			Self::deposit_event(RawEvent::Proposed(c));
+			Self::deposit_event(Event::Proposed(c));
+			Ok(())
 		}
 
 		/// Reject a proposed spend. The original deposit will be slashed.
@@ -299,8 +344,11 @@ decl_module! {
 		/// - DbReads: `Proposals`, `rejected proposer account`
 		/// - DbWrites: `Proposals`, `rejected proposer account`
 		/// # </weight>
-		#[weight = (T::WeightInfo::reject_proposal(), DispatchClass::Operational)]
-		pub fn reject_proposal(origin, #[compact] proposal_id: ProposalIndex) {
+		#[pallet::weight((T::WeightInfo::reject_proposal(), DispatchClass::Operational))]
+		pub fn reject_proposal(
+			origin: OriginFor<T>,
+			#[pallet::compact] proposal_id: ProposalIndex
+		) -> DispatchResult {
 			T::RejectOrigin::ensure_origin(origin)?;
 
 			let proposal = <Proposals<T, I>>::take(&proposal_id).ok_or(Error::<T, I>::InvalidIndex)?;
@@ -309,6 +357,7 @@ decl_module! {
 			T::OnSlash::on_unbalanced(imbalance);
 
 			Self::deposit_event(Event::<T, I>::Rejected(proposal_id, value));
+			Ok(())
 		}
 
 		/// Approve a proposal. At a later time, the proposal will be allocated to the beneficiary
@@ -321,33 +370,21 @@ decl_module! {
 		/// - DbReads: `Proposals`, `Approvals`
 		/// - DbWrite: `Approvals`
 		/// # </weight>
-		#[weight = (T::WeightInfo::approve_proposal(T::MaxApprovals::get()), DispatchClass::Operational)]
-		pub fn approve_proposal(origin, #[compact] proposal_id: ProposalIndex) {
+		#[pallet::weight((T::WeightInfo::approve_proposal(T::MaxApprovals::get()), DispatchClass::Operational))]
+		pub fn approve_proposal(
+			origin: OriginFor<T>,
+			#[pallet::compact] proposal_id: ProposalIndex
+		) -> DispatchResult {
 			T::ApproveOrigin::ensure_origin(origin)?;
 
 			ensure!(<Proposals<T, I>>::contains_key(proposal_id), Error::<T, I>::InvalidIndex);
 			Approvals::<T, I>::try_append(proposal_id).map_err(|_| Error::<T, I>::TooManyApprovals)?;
-		}
-
-		/// # <weight>
-		/// - Complexity: `O(A)` where `A` is the number of approvals
-		/// - Db reads and writes: `Approvals`, `pot account data`
-		/// - Db reads and writes per approval:
-		///   `Proposals`, `proposer account data`, `beneficiary account data`
-		/// - The weight is overestimated if some approvals got missed.
-		/// # </weight>
-		fn on_initialize(n: T::BlockNumber) -> Weight {
-			// Check to see if we should spend some funds!
-			if (n % T::SpendPeriod::get()).is_zero() {
-				Self::spend_funds()
-			} else {
-				0
-			}
+			Ok(())
 		}
 	}
 }
 
-impl<T: Config<I>, I: Instance> Module<T, I> {
+impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	// Add public immutables and private mutables.
 
 	/// The account ID of the treasury pot.
@@ -368,7 +405,7 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 		let mut total_weight: Weight = Zero::zero();
 
 		let mut budget_remaining = Self::pot();
-		Self::deposit_event(RawEvent::Spending(budget_remaining));
+		Self::deposit_event(Event::Spending(budget_remaining));
 		let account_id = Self::account_id();
 
 		let mut missed_any = false;
@@ -389,7 +426,7 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 						// provide the allocation.
 						imbalance.subsume(T::Currency::deposit_creating(&p.beneficiary, p.value));
 
-						Self::deposit_event(RawEvent::Awarded(index, p.value, p.beneficiary));
+						Self::deposit_event(Event::Awarded(index, p.value, p.beneficiary));
 						false
 					} else {
 						missed_any = true;
@@ -415,7 +452,7 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 			let (debit, credit) = T::Currency::pair(burn);
 			imbalance.subsume(debit);
 			T::BurnDestination::on_unbalanced(credit);
-			Self::deposit_event(RawEvent::Burnt(burn))
+			Self::deposit_event(Event::Burnt(burn))
 		}
 
 		// Must never be an error, but better to be safe.
@@ -433,7 +470,7 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 			drop(problem);
 		}
 
-		Self::deposit_event(RawEvent::Rollover(budget_remaining));
+		Self::deposit_event(Event::Rollover(budget_remaining));
 
 		total_weight
 	}
@@ -445,16 +482,15 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 			// Must never be less than 0 but better be safe.
 			.saturating_sub(T::Currency::minimum_balance())
 	}
-
 }
 
-impl<T: Config<I>, I: Instance> OnUnbalanced<NegativeImbalanceOf<T, I>> for Module<T, I> {
+impl<T: Config<I>, I: 'static> OnUnbalanced<NegativeImbalanceOf<T, I>> for Pallet<T, I> {
 	fn on_nonzero_unbalanced(amount: NegativeImbalanceOf<T, I>) {
 		let numeric_amount = amount.peek();
 
 		// Must resolve into existing but better to be safe.
 		let _ = T::Currency::resolve_creating(&Self::account_id(), amount);
 
-		Self::deposit_event(RawEvent::Deposit(numeric_amount));
+		Self::deposit_event(Event::Deposit(numeric_amount));
 	}
 }
diff --git a/frame/treasury/src/tests.rs b/frame/treasury/src/tests.rs
index dbd5b22741ba..a59491e1f6e9 100644
--- a/frame/treasury/src/tests.rs
+++ b/frame/treasury/src/tests.rs
@@ -19,13 +19,7 @@
 
 #![cfg(test)]
 
-use crate as treasury;
-use super::*;
 use std::cell::RefCell;
-use frame_support::{
-	assert_noop, assert_ok, parameter_types,
-	traits::OnInitialize, PalletId
-};
 
 use sp_core::H256;
 use sp_runtime::{
@@ -33,6 +27,14 @@ use sp_runtime::{
 	traits::{BlakeTwo256, IdentityLookup},
 };
 
+use frame_support::{
+	assert_noop, assert_ok, parameter_types,
+	traits::OnInitialize, PalletId, pallet_prelude::GenesisBuild,
+};
+
+use crate as treasury;
+use super::*;
+
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
@@ -129,7 +131,7 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 		// Total issuance will be 200 with treasury account initialized at ED.
 		balances: vec![(0, 100), (1, 98), (2, 1)],
 	}.assimilate_storage(&mut t).unwrap();
-	treasury::GenesisConfig::default().assimilate_storage::<Test, _>(&mut t).unwrap();
+	GenesisBuild::<Test>::assimilate_storage(&crate::GenesisConfig, &mut t).unwrap();
 	t.into()
 }
 
@@ -355,7 +357,7 @@ fn genesis_funding_works() {
 		// Total issuance will be 200 with treasury account initialized with 100.
 		balances: vec![(0, 100), (Treasury::account_id(), initial_funding)],
 	}.assimilate_storage(&mut t).unwrap();
-	treasury::GenesisConfig::default().assimilate_storage::<Test, _>(&mut t).unwrap();
+	GenesisBuild::<Test>::assimilate_storage(&crate::GenesisConfig, &mut t).unwrap();
 	let mut t: sp_io::TestExternalities = t.into();
 
 	t.execute_with(|| {

From b369ee4f5b38022a73a3c28d500a93b8843c3dd1 Mon Sep 17 00:00:00 2001
From: Zeke Mostov <32168567+emostov@users.noreply.github.com>
Date: Tue, 13 Jul 2021 00:34:54 -0700
Subject: [PATCH 0983/1194] pallet-collective: Do not vote `aye` with `propose`
 (#9323)

* pallet-collective Add option to not vote `aye` with  `propose`

* Test: propose_with_no_self_vote_works

* Param doc grammar

* Update benchmarks

* Revert changes

* Do note vote when proposing

* Update benchmarks

* Reduce diff on benchmarks

* Reduce diff on tests

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_treasury --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/treasury/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_treasury --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/treasury/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* manual bench

* manual bench 2

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_treasury --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/treasury/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_treasury --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/treasury/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_treasury --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/treasury/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_treasury --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/treasury/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_treasury --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/treasury/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_collective --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/collective/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* motion_with_no_votes_closes_with_disapproval

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_collective --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/collective/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_treasury --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/treasury/src/weights.rs --template=./.maintain/frame-weight-template.hbs

Co-authored-by: Parity Bot <admin@parity.io>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmal.com>
---
 frame/collective/src/benchmarking.rs |  14 ++-
 frame/collective/src/lib.rs          | 114 ++++++++++++++++++++++--
 frame/collective/src/weights.rs      | 128 +++++++++++++--------------
 frame/treasury/src/weights.rs        |  36 ++++----
 4 files changed, 199 insertions(+), 93 deletions(-)

diff --git a/frame/collective/src/benchmarking.rs b/frame/collective/src/benchmarking.rs
index 1f78f07cf923..7faaa31dc801 100644
--- a/frame/collective/src/benchmarking.rs
+++ b/frame/collective/src/benchmarking.rs
@@ -250,8 +250,7 @@ benchmarks_instance! {
 
 		let index = p - 1;
 		// Have almost everyone vote aye on last proposal, while keeping it from passing.
-		// Proposer already voted aye so we start at 1.
-		for j in 1 .. m - 3 {
+		for j in 0 .. m - 3 {
 			let voter = &members[j as usize];
 			let approve = true;
 			Collective::<T, _>::vote(
@@ -326,8 +325,7 @@ benchmarks_instance! {
 
 		let index = p - 1;
 		// Have most everyone vote aye on last proposal, while keeping it from passing.
-		// Proposer already voted aye so we start at 1.
-		for j in 1 .. m - 2 {
+		for j in 0 .. m - 2 {
 			let voter = &members[j as usize];
 			let approve = true;
 			Collective::<T, _>::vote(
@@ -560,6 +558,14 @@ benchmarks_instance! {
 			last_hash = T::Hashing::hash_of(&proposal);
 		}
 
+		// The prime member votes aye, so abstentions default to aye.
+		Collective::<T, _>::vote(
+			SystemOrigin::Signed(caller.clone()).into(),
+			last_hash.clone(),
+			p - 1,
+			true // Vote aye.
+		)?;
+
 		// Have almost everyone vote nay on last proposal, while keeping it from failing.
 		// A few abstainers will be the aye votes needed to pass the vote.
 		for j in 2 .. m - 1 {
diff --git a/frame/collective/src/lib.rs b/frame/collective/src/lib.rs
index c14ef9df64fe..00e976bfb9f6 100644
--- a/frame/collective/src/lib.rs
+++ b/frame/collective/src/lib.rs
@@ -476,8 +476,10 @@ decl_module! {
 				let index = Self::proposal_count();
 				<ProposalCount<I>>::mutate(|i| *i += 1);
 				<ProposalOf<T, I>>::insert(proposal_hash, *proposal);
-				let end = system::Pallet::<T>::block_number() + T::MotionDuration::get();
-				let votes = Votes { index, threshold, ayes: vec![who.clone()], nays: vec![], end };
+				let votes = {
+					let end = system::Pallet::<T>::block_number() + T::MotionDuration::get();
+					Votes { index, threshold, ayes: vec![], nays: vec![], end }
+				};
 				<Voting<T, I>>::insert(proposal_hash, votes);
 
 				Self::deposit_event(RawEvent::Proposed(who, index, proposal_hash, threshold));
@@ -1094,6 +1096,7 @@ mod tests {
 			let hash = BlakeTwo256::hash_of(&proposal);
 
 			assert_ok!(Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone()), proposal_len));
+			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, true));
 			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 0, true));
 
 			System::set_block_number(3);
@@ -1108,6 +1111,7 @@ mod tests {
 			let record = |event| EventRecord { phase: Phase::Initialization, event, topics: vec![] };
 			assert_eq!(System::events(), vec![
 				record(Event::Collective(RawEvent::Proposed(1, 0, hash.clone(), 3))),
+				record(Event::Collective(RawEvent::Voted(1, hash.clone(), true, 1, 0))),
 				record(Event::Collective(RawEvent::Voted(2, hash.clone(), true, 2, 0))),
 				record(Event::Collective(RawEvent::Closed(hash.clone(), 2, 1))),
 				record(Event::Collective(RawEvent::Disapproved(hash.clone())))
@@ -1125,6 +1129,7 @@ mod tests {
 			// Set 1 as prime voter
 			Prime::<Test, Instance1>::set(Some(1));
 			assert_ok!(Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone()), proposal_len));
+			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, true));
 			// With 1's prime vote, this should pass
 			System::set_block_number(4);
 			assert_noop!(
@@ -1162,6 +1167,7 @@ mod tests {
 			assert_ok!(Collective::set_members(Origin::root(), vec![1, 2, 3], Some(3), MaxMembers::get()));
 
 			assert_ok!(Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone()), proposal_len));
+			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, true));
 			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 0, true));
 
 			System::set_block_number(4);
@@ -1170,6 +1176,7 @@ mod tests {
 			let record = |event| EventRecord { phase: Phase::Initialization, event, topics: vec![] };
 			assert_eq!(System::events(), vec![
 				record(Event::Collective(RawEvent::Proposed(1, 0, hash.clone(), 3))),
+				record(Event::Collective(RawEvent::Voted(1, hash.clone(), true, 1, 0))),
 				record(Event::Collective(RawEvent::Voted(2, hash.clone(), true, 2, 0))),
 				record(Event::Collective(RawEvent::Closed(hash.clone(), 2, 1))),
 				record(Event::Collective(RawEvent::Disapproved(hash.clone())))
@@ -1187,6 +1194,7 @@ mod tests {
 			assert_ok!(Collective::set_members(Origin::root(), vec![1, 2, 3], Some(1), MaxMembers::get()));
 
 			assert_ok!(Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone()), proposal_len));
+			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, true));
 			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 0, true));
 
 			System::set_block_number(4);
@@ -1195,6 +1203,7 @@ mod tests {
 			let record = |event| EventRecord { phase: Phase::Initialization, event, topics: vec![] };
 			assert_eq!(System::events(), vec![
 				record(Event::Collective(RawEvent::Proposed(1, 0, hash.clone(), 3))),
+				record(Event::Collective(RawEvent::Voted(1, hash.clone(), true, 1, 0))),
 				record(Event::Collective(RawEvent::Voted(2, hash.clone(), true, 2, 0))),
 				record(Event::Collective(RawEvent::Closed(hash.clone(), 3, 0))),
 				record(Event::Collective(RawEvent::Approved(hash.clone()))),
@@ -1213,6 +1222,7 @@ mod tests {
 			assert_ok!(CollectiveMajority::set_members(Origin::root(), vec![1, 2, 3, 4, 5], Some(5), MaxMembers::get()));
 
 			assert_ok!(CollectiveMajority::propose(Origin::signed(1), 5, Box::new(proposal.clone()), proposal_len));
+			assert_ok!(CollectiveMajority::vote(Origin::signed(1), hash.clone(), 0, true));
 			assert_ok!(CollectiveMajority::vote(Origin::signed(2), hash.clone(), 0, true));
 			assert_ok!(CollectiveMajority::vote(Origin::signed(3), hash.clone(), 0, true));
 
@@ -1222,6 +1232,7 @@ mod tests {
 			let record = |event| EventRecord { phase: Phase::Initialization, event, topics: vec![] };
 			assert_eq!(System::events(), vec![
 				record(Event::CollectiveMajority(RawEvent::Proposed(1, 0, hash.clone(), 5))),
+				record(Event::CollectiveMajority(RawEvent::Voted(1, hash.clone(), true, 1, 0))),
 				record(Event::CollectiveMajority(RawEvent::Voted(2, hash.clone(), true, 2, 0))),
 				record(Event::CollectiveMajority(RawEvent::Voted(3, hash.clone(), true, 3, 0))),
 				record(Event::CollectiveMajority(RawEvent::Closed(hash.clone(), 5, 0))),
@@ -1239,6 +1250,7 @@ mod tests {
 			let hash = BlakeTwo256::hash_of(&proposal);
 			let end = 4;
 			assert_ok!(Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone()), proposal_len));
+			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, true));
 			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 0, true));
 			assert_eq!(
 				Collective::voting(&hash),
@@ -1254,6 +1266,7 @@ mod tests {
 			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
 			let hash = BlakeTwo256::hash_of(&proposal);
 			assert_ok!(Collective::propose(Origin::signed(2), 2, Box::new(proposal.clone()), proposal_len));
+			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 1, true));
 			assert_ok!(Collective::vote(Origin::signed(3), hash.clone(), 1, false));
 			assert_eq!(
 				Collective::voting(&hash),
@@ -1275,6 +1288,7 @@ mod tests {
 			let hash = BlakeTwo256::hash_of(&proposal);
 			let end = 4;
 			assert_ok!(Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone()), proposal_len));
+			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, true));
 			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 0, true));
 			assert_eq!(
 				Collective::voting(&hash),
@@ -1290,6 +1304,7 @@ mod tests {
 			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
 			let hash = BlakeTwo256::hash_of(&proposal);
 			assert_ok!(Collective::propose(Origin::signed(2), 2, Box::new(proposal.clone()), proposal_len));
+			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 1, true));
 			assert_ok!(Collective::vote(Origin::signed(3), hash.clone(), 1, false));
 			assert_eq!(
 				Collective::voting(&hash),
@@ -1315,7 +1330,7 @@ mod tests {
 			assert_eq!(Collective::proposal_of(&hash), Some(proposal));
 			assert_eq!(
 				Collective::voting(&hash),
-				Some(Votes { index: 0, threshold: 3, ayes: vec![1], nays: vec![], end })
+				Some(Votes { index: 0, threshold: 3, ayes: vec![], nays: vec![], end })
 			);
 
 			assert_eq!(System::events(), vec![
@@ -1336,10 +1351,15 @@ mod tests {
 	#[test]
 	fn limit_active_proposals() {
 		new_test_ext().execute_with(|| {
-			for i in 0..MaxProposals::get() {
+			for i in 0 .. MaxProposals::get() {
 				let proposal = make_proposal(i as u64);
 				let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
-				assert_ok!(Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone()), proposal_len));
+				assert_ok!(Collective::propose(
+					Origin::signed(1),
+					3,
+					Box::new(proposal.clone()),
+					proposal_len
+				));
 			}
 			let proposal = make_proposal(MaxProposals::get() as u64 + 1);
 			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
@@ -1421,26 +1441,36 @@ mod tests {
 	}
 
 	#[test]
-	fn motions_revoting_works() {
+	fn motions_vote_after_works() {
 		new_test_ext().execute_with(|| {
 			let proposal = make_proposal(42);
 			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
 			let hash: H256 = proposal.blake2_256().into();
 			let end = 4;
 			assert_ok!(Collective::propose(Origin::signed(1), 2, Box::new(proposal.clone()), proposal_len));
+			// Initially there a no votes when the motion is proposed.
+			assert_eq!(
+				Collective::voting(&hash),
+				Some(Votes { index: 0, threshold: 2, ayes: vec![], nays: vec![], end })
+			);
+			// Cast first aye vote.
+			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, true));
 			assert_eq!(
 				Collective::voting(&hash),
 				Some(Votes { index: 0, threshold: 2, ayes: vec![1], nays: vec![], end })
 			);
+			// Try to cast a duplicate aye vote.
 			assert_noop!(
 				Collective::vote(Origin::signed(1), hash.clone(), 0, true),
 				Error::<Test, Instance1>::DuplicateVote,
 			);
+			// Cast a nay vote.
 			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, false));
 			assert_eq!(
 				Collective::voting(&hash),
 				Some(Votes { index: 0, threshold: 2, ayes: vec![], nays: vec![1], end })
 			);
+			// Try to cast a duplicate nay vote.
 			assert_noop!(
 				Collective::vote(Origin::signed(1), hash.clone(), 0, false),
 				Error::<Test, Instance1>::DuplicateVote,
@@ -1457,6 +1487,18 @@ mod tests {
 					)),
 					topics: vec![],
 				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: Event::Collective(RawEvent::Voted(
+						1,
+						hex!["68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"]
+							.into(),
+						true,
+						1,
+						0,
+					)),
+					topics: vec![],
+				},
 				EventRecord {
 					phase: Phase::Initialization,
 					event: Event::Collective(RawEvent::Voted(
@@ -1489,7 +1531,7 @@ mod tests {
 			);
 			assert_eq!(
 				Collective::voting(&hash),
-				Some(Votes { index: 0, threshold: 2, ayes: vec![1], nays: vec![], end })
+				Some(Votes { index: 0, threshold: 2, ayes: vec![], nays: vec![], end })
 			);
 
 			// For the motion, acc 2's first vote, expecting Ok with Pays::No.
@@ -1586,6 +1628,7 @@ mod tests {
 			let proposal_weight = proposal.get_dispatch_info().weight;
 			let hash: H256 = proposal.blake2_256().into();
 			assert_ok!(Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone()), proposal_len));
+			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, true));
 			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 0, false));
 			assert_ok!(Collective::close(Origin::signed(2), hash.clone(), 0, proposal_weight, proposal_len));
 
@@ -1601,6 +1644,17 @@ mod tests {
 						)),
 					topics: vec![],
 				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: Event::Collective(RawEvent::Voted(
+						1,
+						hex!["68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"].into(),
+						true,
+						1,
+						0,
+					)),
+					topics: vec![],
+				},
 				EventRecord {
 					phase: Phase::Initialization,
 					event: Event::Collective(RawEvent::Voted(
@@ -1638,6 +1692,7 @@ mod tests {
 			let proposal_weight = proposal.get_dispatch_info().weight;
 			let hash: H256 = proposal.blake2_256().into();
 			assert_ok!(Collective::propose(Origin::signed(1), 2, Box::new(proposal.clone()), proposal_len));
+			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, true));
 			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 0, true));
 			assert_ok!(Collective::close(Origin::signed(2), hash.clone(), 0, proposal_weight, proposal_len));
 
@@ -1652,6 +1707,17 @@ mod tests {
 					)),
 					topics: vec![],
 				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: Event::Collective(RawEvent::Voted(
+						1,
+						hex!["68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"].into(),
+						true,
+						1,
+						0,
+					)),
+					topics: vec![],
+				},
 				EventRecord {
 					phase: Phase::Initialization,
 					event: Event::Collective(RawEvent::Voted(
@@ -1689,6 +1755,37 @@ mod tests {
 		});
 	}
 
+	#[test]
+	fn motion_with_no_votes_closes_with_disapproval() {
+		new_test_ext().execute_with(|| {
+			let record = |event| EventRecord { phase: Phase::Initialization, event, topics: vec![] };
+			let proposal = make_proposal(42);
+			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
+			let proposal_weight = proposal.get_dispatch_info().weight;
+			let hash: H256 = proposal.blake2_256().into();
+			assert_ok!(Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone()), proposal_len));
+			assert_eq!(System::events()[0], record(Event::Collective(RawEvent::Proposed(1, 0, hash.clone(), 3))));
+
+			// Closing the motion too early is not possible because it has neither
+			// an approving or disapproving simple majority due to the lack of votes.
+			assert_noop!(
+				Collective::close(Origin::signed(2), hash.clone(), 0, proposal_weight, proposal_len),
+				Error::<Test, Instance1>::TooEarly
+			);
+
+			// Once the motion duration passes,
+			let closing_block = System::block_number() + MotionDuration::get();
+			System::set_block_number(closing_block);
+			// we can successfully close the motion.
+			assert_ok!(Collective::close(Origin::signed(2), hash.clone(), 0, proposal_weight, proposal_len));
+
+			// Events show that the close ended in a disapproval.
+			assert_eq!(System::events()[1], record(Event::Collective(RawEvent::Closed(hash.clone(), 0, 3))));
+			assert_eq!(System::events()[2], record(Event::Collective(RawEvent::Disapproved(hash.clone()))));
+		})
+
+	}
+
 	#[test]
 	fn close_disapprove_does_not_care_about_weight_or_len() {
 		// This test confirms that if you close a proposal that would be disapproved,
@@ -1700,6 +1797,7 @@ mod tests {
 			let hash: H256 = proposal.blake2_256().into();
 			assert_ok!(Collective::propose(Origin::signed(1), 2, Box::new(proposal.clone()), proposal_len));
 			// First we make the proposal succeed
+			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, true));
 			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 0, true));
 			// It will not close with bad weight/len information
 			assert_noop!(
@@ -1726,12 +1824,14 @@ mod tests {
 			let hash: H256 = proposal.blake2_256().into();
 			assert_ok!(Collective::propose(Origin::signed(1), 2, Box::new(proposal.clone()), proposal_len));
 			// Proposal would normally succeed
+			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, true));
 			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 0, true));
 			// But Root can disapprove and remove it anyway
 			assert_ok!(Collective::disapprove_proposal(Origin::root(), hash.clone()));
 			let record = |event| EventRecord { phase: Phase::Initialization, event, topics: vec![] };
 			assert_eq!(System::events(), vec![
 				record(Event::Collective(RawEvent::Proposed(1, 0, hash.clone(), 2))),
+				record(Event::Collective(RawEvent::Voted(1, hash.clone(), true, 1, 0))),
 				record(Event::Collective(RawEvent::Voted(2, hash.clone(), true, 2, 0))),
 				record(Event::Collective(RawEvent::Disapproved(hash.clone()))),
 			]);
diff --git a/frame/collective/src/weights.rs b/frame/collective/src/weights.rs
index 46bd999344ad..2bbec4d7cc3d 100644
--- a/frame/collective/src/weights.rs
+++ b/frame/collective/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_collective
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2021-07-13, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -62,94 +62,94 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn set_members(m: u32, n: u32, p: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 5_000
-			.saturating_add((15_266_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((14_534_000 as Weight).saturating_mul(m as Weight))
 			// Standard Error: 5_000
-			.saturating_add((39_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((160_000 as Weight).saturating_mul(n as Weight))
 			// Standard Error: 5_000
-			.saturating_add((20_899_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((20_189_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(p as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
 	}
 	fn execute(b: u32, m: u32, ) -> Weight {
-		(21_945_000 as Weight)
+		(23_177_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
 			// Standard Error: 0
-			.saturating_add((93_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((89_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 	}
 	fn propose_execute(b: u32, m: u32, ) -> Weight {
-		(26_316_000 as Weight)
+		(28_063_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
 			// Standard Error: 0
-			.saturating_add((184_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((174_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 	}
 	fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight {
-		(42_664_000 as Weight)
+		(46_515_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add((5_000 as Weight).saturating_mul(b as Weight))
 			// Standard Error: 2_000
-			.saturating_add((166_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((91_000 as Weight).saturating_mul(m as Weight))
 			// Standard Error: 2_000
-			.saturating_add((435_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((486_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn vote(m: u32, ) -> Weight {
-		(43_750_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((198_000 as Weight).saturating_mul(m as Weight))
+		(38_491_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((209_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn close_early_disapproved(m: u32, p: u32, ) -> Weight {
-		(44_153_000 as Weight)
+		(44_903_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((185_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((181_000 as Weight).saturating_mul(m as Weight))
 			// Standard Error: 0
-			.saturating_add((454_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((350_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		(65_478_000 as Weight)
+		(57_416_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
-			// Standard Error: 2_000
-			.saturating_add((167_000 as Weight).saturating_mul(m as Weight))
-			// Standard Error: 2_000
-			.saturating_add((434_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
+			// Standard Error: 1_000
+			.saturating_add((217_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 1_000
+			.saturating_add((485_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn close_disapproved(m: u32, p: u32, ) -> Weight {
-		(49_001_000 as Weight)
+		(50_134_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((189_000 as Weight).saturating_mul(m as Weight))
 			// Standard Error: 0
-			.saturating_add((464_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((487_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn close_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		(65_049_000 as Weight)
+		(65_901_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
 			// Standard Error: 1_000
-			.saturating_add((192_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((186_000 as Weight).saturating_mul(m as Weight))
 			// Standard Error: 1_000
-			.saturating_add((469_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((482_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn disapprove_proposal(p: u32, ) -> Weight {
-		(27_288_000 as Weight)
+		(28_849_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((477_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((494_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
@@ -160,94 +160,94 @@ impl WeightInfo for () {
 	fn set_members(m: u32, n: u32, p: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 5_000
-			.saturating_add((15_266_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((14_534_000 as Weight).saturating_mul(m as Weight))
 			// Standard Error: 5_000
-			.saturating_add((39_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((160_000 as Weight).saturating_mul(n as Weight))
 			// Standard Error: 5_000
-			.saturating_add((20_899_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((20_189_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(p as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
 	}
 	fn execute(b: u32, m: u32, ) -> Weight {
-		(21_945_000 as Weight)
+		(23_177_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
 			// Standard Error: 0
-			.saturating_add((93_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((89_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 	}
 	fn propose_execute(b: u32, m: u32, ) -> Weight {
-		(26_316_000 as Weight)
+		(28_063_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
 			// Standard Error: 0
-			.saturating_add((184_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((174_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 	}
 	fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight {
-		(42_664_000 as Weight)
+		(46_515_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add((5_000 as Weight).saturating_mul(b as Weight))
 			// Standard Error: 2_000
-			.saturating_add((166_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((91_000 as Weight).saturating_mul(m as Weight))
 			// Standard Error: 2_000
-			.saturating_add((435_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((486_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn vote(m: u32, ) -> Weight {
-		(43_750_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((198_000 as Weight).saturating_mul(m as Weight))
+		(38_491_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((209_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn close_early_disapproved(m: u32, p: u32, ) -> Weight {
-		(44_153_000 as Weight)
+		(44_903_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((185_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((181_000 as Weight).saturating_mul(m as Weight))
 			// Standard Error: 0
-			.saturating_add((454_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((350_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		(65_478_000 as Weight)
+		(57_416_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
-			// Standard Error: 2_000
-			.saturating_add((167_000 as Weight).saturating_mul(m as Weight))
-			// Standard Error: 2_000
-			.saturating_add((434_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
+			// Standard Error: 1_000
+			.saturating_add((217_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 1_000
+			.saturating_add((485_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn close_disapproved(m: u32, p: u32, ) -> Weight {
-		(49_001_000 as Weight)
+		(50_134_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((189_000 as Weight).saturating_mul(m as Weight))
 			// Standard Error: 0
-			.saturating_add((464_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((487_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn close_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		(65_049_000 as Weight)
+		(65_901_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
 			// Standard Error: 1_000
-			.saturating_add((192_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((186_000 as Weight).saturating_mul(m as Weight))
 			// Standard Error: 1_000
-			.saturating_add((469_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((482_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn disapprove_proposal(p: u32, ) -> Weight {
-		(27_288_000 as Weight)
+		(28_849_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((477_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((494_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
diff --git a/frame/treasury/src/weights.rs b/frame/treasury/src/weights.rs
index b22380e3c476..d293399e7b48 100644
--- a/frame/treasury/src/weights.rs
+++ b/frame/treasury/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_treasury
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2021-07-13, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -54,26 +54,26 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn propose_spend() -> Weight {
-		(41_763_000 as Weight)
+		(42_325_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn reject_proposal() -> Weight {
-		(39_049_000 as Weight)
+		(39_633_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn approve_proposal(p: u32, ) -> Weight {
-		(13_547_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((124_000 as Weight).saturating_mul(p as Weight))
+		(14_337_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((116_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn on_initialize_proposals(p: u32, ) -> Weight {
-		(48_990_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((59_621_000 as Weight).saturating_mul(p as Weight))
+		(50_379_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((59_595_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(p as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
@@ -84,26 +84,26 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn propose_spend() -> Weight {
-		(41_763_000 as Weight)
+		(42_325_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn reject_proposal() -> Weight {
-		(39_049_000 as Weight)
+		(39_633_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn approve_proposal(p: u32, ) -> Weight {
-		(13_547_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((124_000 as Weight).saturating_mul(p as Weight))
+		(14_337_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((116_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn on_initialize_proposals(p: u32, ) -> Weight {
-		(48_990_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((59_621_000 as Weight).saturating_mul(p as Weight))
+		(50_379_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((59_595_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(p as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))

From 7d8e67beada5f3827a7b9bc1d46094af485fa5a6 Mon Sep 17 00:00:00 2001
From: Zeke Mostov <32168567+emostov@users.noreply.github.com>
Date: Tue, 13 Jul 2021 01:01:11 -0700
Subject: [PATCH 0984/1194] Check for duplicate members in genesis of
 pallet-membership & pallet-collective  (#9325)

* Ensure no duplicate members in collective and membership genesis

* Test build panics

* Massage comments

* Use btreeset
---
 frame/collective/src/lib.rs | 17 ++++++++++++++++-
 frame/membership/src/lib.rs | 14 ++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/frame/collective/src/lib.rs b/frame/collective/src/lib.rs
index 00e976bfb9f6..a6e44b96feaa 100644
--- a/frame/collective/src/lib.rs
+++ b/frame/collective/src/lib.rs
@@ -211,7 +211,13 @@ decl_storage! {
 	add_extra_genesis {
 		config(phantom): sp_std::marker::PhantomData<I>;
 		config(members): Vec<T::AccountId>;
-		build(|config| Module::<T, I>::initialize_members(&config.members))
+		build(|config| {
+			use sp_std::collections::btree_set::BTreeSet;
+			let members_set: BTreeSet<_> = config.members.iter().collect();
+			assert!(members_set.len() == config.members.len(), "Members cannot contain duplicate accounts.");
+
+			Module::<T, I>::initialize_members(&config.members)
+		});
 	}
 }
 
@@ -1837,4 +1843,13 @@ mod tests {
 			]);
 		})
 	}
+
+	#[test]
+	#[should_panic(expected = "Members cannot contain duplicate accounts.")]
+	fn genesis_build_panics_with_duplicate_members() {
+		collective::GenesisConfig::<Test> {
+			members: vec![1, 2, 3, 1],
+			phantom: Default::default(),
+		}.build_storage().unwrap();
+	}
 }
diff --git a/frame/membership/src/lib.rs b/frame/membership/src/lib.rs
index 0d95af4e6f4a..c834ed23659e 100644
--- a/frame/membership/src/lib.rs
+++ b/frame/membership/src/lib.rs
@@ -84,6 +84,11 @@ decl_storage! {
 		config(phantom): sp_std::marker::PhantomData<I>;
 		build(|config: &Self| {
 			let mut members = config.members.clone();
+
+			use sp_std::collections::btree_set::BTreeSet;
+			let members_set: BTreeSet<_> = config.members.iter().collect();
+			assert!(members_set.len() == config.members.len(), "Members cannot contain duplicate accounts.");
+
 			members.sort();
 			T::MembershipInitialized::initialize_members(&members);
 			<Members<T, I>>::put(members);
@@ -706,4 +711,13 @@ mod tests {
 			assert_eq!(PRIME.with(|m| *m.borrow()), Membership::prime());
 		});
 	}
+
+	#[test]
+	#[should_panic(expected = "Members cannot contain duplicate accounts.")]
+	fn genesis_build_panics_with_duplicate_members() {
+		pallet_membership::GenesisConfig::<Test> {
+			members: vec![1, 2, 3, 1],
+			phantom: Default::default(),
+		}.build_storage().unwrap();
+	}
 }

From c625c2ad924a5f58fbe4efbe937255c42eb3f7eb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jul 2021 08:09:05 +0000
Subject: [PATCH 0985/1194] Bump serde from 1.0.124 to 1.0.126 (#9099)

Bumps [serde](https://github.com/serde-rs/serde) from 1.0.124 to 1.0.126.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.124...v1.0.126)

---
updated-dependencies:
- dependency-name: serde
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                                        | 8 ++++----
 bin/node-template/pallets/template/Cargo.toml     | 2 +-
 bin/node/bench/Cargo.toml                         | 2 +-
 bin/node/browser-testing/Cargo.toml               | 2 +-
 bin/node/cli/Cargo.toml                           | 2 +-
 client/chain-spec/Cargo.toml                      | 2 +-
 client/cli/Cargo.toml                             | 2 +-
 client/consensus/babe/Cargo.toml                  | 2 +-
 client/consensus/babe/rpc/Cargo.toml              | 2 +-
 client/network/Cargo.toml                         | 2 +-
 client/rpc-api/Cargo.toml                         | 2 +-
 client/rpc-servers/Cargo.toml                     | 2 +-
 client/service/Cargo.toml                         | 2 +-
 client/telemetry/Cargo.toml                       | 2 +-
 client/tracing/Cargo.toml                         | 2 +-
 client/transaction-pool/Cargo.toml                | 2 +-
 client/transaction-pool/api/Cargo.toml            | 2 +-
 frame/authorship/Cargo.toml                       | 2 +-
 frame/benchmarking/Cargo.toml                     | 2 +-
 frame/democracy/Cargo.toml                        | 2 +-
 frame/example-parallel/Cargo.toml                 | 2 +-
 frame/lottery/Cargo.toml                          | 2 +-
 frame/merkle-mountain-range/primitives/Cargo.toml | 2 +-
 frame/merkle-mountain-range/rpc/Cargo.toml        | 2 +-
 frame/metadata/Cargo.toml                         | 2 +-
 frame/offences/Cargo.toml                         | 2 +-
 frame/session/benchmarking/Cargo.toml             | 2 +-
 frame/staking/Cargo.toml                          | 2 +-
 frame/support/Cargo.toml                          | 2 +-
 frame/support/test/Cargo.toml                     | 2 +-
 frame/system/Cargo.toml                           | 2 +-
 frame/system/benchmarking/Cargo.toml              | 2 +-
 frame/tips/Cargo.toml                             | 2 +-
 frame/transaction-payment/Cargo.toml              | 2 +-
 frame/transaction-storage/Cargo.toml              | 2 +-
 frame/treasury/Cargo.toml                         | 2 +-
 primitives/application-crypto/Cargo.toml          | 2 +-
 primitives/arithmetic/Cargo.toml                  | 2 +-
 primitives/consensus/babe/Cargo.toml              | 2 +-
 primitives/core/Cargo.toml                        | 2 +-
 primitives/finality-grandpa/Cargo.toml            | 2 +-
 primitives/npos-elections/Cargo.toml              | 2 +-
 primitives/rpc/Cargo.toml                         | 2 +-
 primitives/runtime/Cargo.toml                     | 2 +-
 primitives/serializer/Cargo.toml                  | 2 +-
 primitives/storage/Cargo.toml                     | 2 +-
 primitives/test-primitives/Cargo.toml             | 2 +-
 primitives/tracing/Cargo.toml                     | 2 +-
 primitives/version/Cargo.toml                     | 2 +-
 test-utils/client/Cargo.toml                      | 2 +-
 test-utils/runtime/Cargo.toml                     | 2 +-
 utils/frame/benchmarking-cli/Cargo.toml           | 2 +-
 utils/frame/remote-externalities/Cargo.toml       | 2 +-
 utils/frame/rpc/system/Cargo.toml                 | 2 +-
 utils/frame/try-runtime/cli/Cargo.toml            | 2 +-
 55 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3b8ec81c02db..62657bbe3d58 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8386,9 +8386,9 @@ checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0"
 
 [[package]]
 name = "serde"
-version = "1.0.124"
+version = "1.0.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd761ff957cb2a45fbb9ab3da6512de9de55872866160b23c25f1a841e99d29f"
+checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03"
 dependencies = [
  "serde_derive",
 ]
@@ -8405,9 +8405,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.124"
+version = "1.0.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1800f7693e94e186f5e25a28291ae1570da908aff7d97a095dec1e56ff99069b"
+checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/bin/node-template/pallets/template/Cargo.toml b/bin/node-template/pallets/template/Cargo.toml
index 60118013c11b..2e9746d0b8c3 100644
--- a/bin/node-template/pallets/template/Cargo.toml
+++ b/bin/node-template/pallets/template/Cargo.toml
@@ -20,7 +20,7 @@ frame-system = { default-features = false,  version = "4.0.0-dev",  path = "../.
 frame-benchmarking = { default-features = false,  version = "4.0.0-dev",  path = "../../../../frame/benchmarking", optional = true }
 
 [dev-dependencies]
-serde = { version = "1.0.119" }
+serde = { version = "1.0.126" }
 sp-core = { default-features = false, version = "4.0.0-dev", path = "../../../../primitives/core" }
 sp-io = { default-features = false, version = "4.0.0-dev", path = "../../../../primitives/io" }
 sp-runtime = { default-features = false, version = "4.0.0-dev", path = "../../../../primitives/runtime" }
diff --git a/bin/node/bench/Cargo.toml b/bin/node/bench/Cargo.toml
index b7b1101b92f0..ac643a1109c5 100644
--- a/bin/node/bench/Cargo.toml
+++ b/bin/node/bench/Cargo.toml
@@ -17,7 +17,7 @@ sc-cli = { version = "0.10.0-dev", path = "../../../client/cli" }
 sc-client-api = { version = "4.0.0-dev", path = "../../../client/api/" }
 sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
 sp-state-machine = { version = "0.10.0-dev", path = "../../../primitives/state-machine" }
-serde = "1.0.101"
+serde = "1.0.126"
 serde_json = "1.0.41"
 structopt = "0.3"
 derive_more = "0.99.2"
diff --git a/bin/node/browser-testing/Cargo.toml b/bin/node/browser-testing/Cargo.toml
index bb92d6d61458..17b3966766b9 100644
--- a/bin/node/browser-testing/Cargo.toml
+++ b/bin/node/browser-testing/Cargo.toml
@@ -10,7 +10,7 @@ license = "Apache-2.0"
 futures-timer = "3.0.2"
 libp2p = { version = "0.37.1", default-features = false }
 jsonrpc-core = "15.0.0"
-serde = "1.0.106"
+serde = "1.0.126"
 serde_json = "1.0.48"
 wasm-bindgen = { version = "=0.2.73", features = ["serde-serialize"] }
 wasm-bindgen-futures = "0.4.18"
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index 3b6c35ecb34f..7c8c2d0e3d86 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -35,7 +35,7 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 # third-party dependencies
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-serde = { version = "1.0.102", features = ["derive"] }
+serde = { version = "1.0.126", features = ["derive"] }
 futures = { version = "0.3.9", features = ["compat"] }
 hex-literal = "0.3.1"
 log = "0.4.8"
diff --git a/client/chain-spec/Cargo.toml b/client/chain-spec/Cargo.toml
index e6d9aa97153e..fcc5bc3bda94 100644
--- a/client/chain-spec/Cargo.toml
+++ b/client/chain-spec/Cargo.toml
@@ -17,7 +17,7 @@ sc-chain-spec-derive = { version = "4.0.0-dev", path = "./derive" }
 impl-trait-for-tuples = "0.2.1"
 sc-network = { version = "0.10.0-dev", path = "../network" }
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
-serde = { version = "1.0.101", features = ["derive"] }
+serde = { version = "1.0.126", features = ["derive"] }
 serde_json = "1.0.41"
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
 sc-telemetry = { version = "4.0.0-dev", path = "../telemetry" }
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index 82325238ca0f..f38686d22865 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -41,7 +41,7 @@ names = "0.11.0"
 structopt = "0.3.8"
 sc-tracing = { version = "4.0.0-dev", path = "../tracing" }
 chrono = "0.4.10"
-serde = "1.0.111"
+serde = "1.0.126"
 thiserror = "1.0.21"
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml
index f9dc45ed9c6d..cfcf503ebaa4 100644
--- a/client/consensus/babe/Cargo.toml
+++ b/client/consensus/babe/Cargo.toml
@@ -22,7 +22,7 @@ sp-keystore = { version = "0.10.0-dev", path = "../../../primitives/keystore" }
 num-bigint = "0.2.3"
 num-rational = "0.2.2"
 num-traits = "0.2.8"
-serde = { version = "1.0.104", features = ["derive"] }
+serde = { version = "1.0.126", features = ["derive"] }
 sp-version = { version = "4.0.0-dev", path = "../../../primitives/version" }
 sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
 sp-inherents = { version = "4.0.0-dev", path = "../../../primitives/inherents" }
diff --git a/client/consensus/babe/rpc/Cargo.toml b/client/consensus/babe/rpc/Cargo.toml
index 12bce64c3afe..5081edf25594 100644
--- a/client/consensus/babe/rpc/Cargo.toml
+++ b/client/consensus/babe/rpc/Cargo.toml
@@ -19,7 +19,7 @@ jsonrpc-core = "15.1.0"
 jsonrpc-core-client = "15.1.0"
 jsonrpc-derive = "15.1.0"
 sp-consensus-babe = { version = "0.10.0-dev", path = "../../../../primitives/consensus/babe" }
-serde = { version = "1.0.104", features=["derive"] }
+serde = { version = "1.0.126", features=["derive"] }
 sp-blockchain = { version = "4.0.0-dev", path = "../../../../primitives/blockchain" }
 sp-runtime = { version = "4.0.0-dev", path = "../../../../primitives/runtime" }
 sc-consensus-epochs = { version = "0.10.0-dev", path = "../../epochs" }
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index 056ae5cbaa05..7ca98150f9dd 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -47,7 +47,7 @@ rand = "0.7.2"
 sc-block-builder = { version = "0.10.0-dev", path = "../block-builder" }
 sc-client-api = { version = "4.0.0-dev", path = "../api" }
 sc-peerset = { version = "4.0.0-dev", path = "../peerset" }
-serde = { version = "1.0.101", features = ["derive"] }
+serde = { version = "1.0.126", features = ["derive"] }
 serde_json = "1.0.41"
 smallvec = "1.5.0"
 sp-arithmetic = { version = "4.0.0-dev", path = "../../primitives/arithmetic" }
diff --git a/client/rpc-api/Cargo.toml b/client/rpc-api/Cargo.toml
index 057a692e83c7..0ed17813ee75 100644
--- a/client/rpc-api/Cargo.toml
+++ b/client/rpc-api/Cargo.toml
@@ -26,7 +26,7 @@ sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 sp-version = { version = "4.0.0-dev", path = "../../primitives/version" }
 sp-runtime = { path = "../../primitives/runtime", version = "4.0.0-dev" }
 sc-chain-spec = { path = "../chain-spec", version = "4.0.0-dev" }
-serde = { version = "1.0.101", features = ["derive"] }
+serde = { version = "1.0.126", features = ["derive"] }
 serde_json = "1.0.41"
 sc-transaction-pool-api = { version = "4.0.0-dev", path = "../transaction-pool/api" }
 sp-rpc = { version = "4.0.0-dev", path = "../../primitives/rpc" }
diff --git a/client/rpc-servers/Cargo.toml b/client/rpc-servers/Cargo.toml
index 5f090ed3e733..025d586c4e53 100644
--- a/client/rpc-servers/Cargo.toml
+++ b/client/rpc-servers/Cargo.toml
@@ -18,7 +18,7 @@ jsonrpc-core = "15.1.0"
 pubsub = { package = "jsonrpc-pubsub", version = "15.1.0" }
 log = "0.4.8"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
-serde = "1.0.101"
+serde = "1.0.126"
 serde_json = "1.0.41"
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
 
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index 2129bc1610fa..5359c8018947 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -38,7 +38,7 @@ wasm-timer = "0.2"
 exit-future = "0.2.0"
 pin-project = "1.0.4"
 hash-db = "0.15.2"
-serde = "1.0.101"
+serde = "1.0.126"
 serde_json = "1.0.41"
 sc-keystore = { version = "4.0.0-dev", path = "../keystore" }
 sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
diff --git a/client/telemetry/Cargo.toml b/client/telemetry/Cargo.toml
index e4ea3e25d63c..eb0daf2d583b 100644
--- a/client/telemetry/Cargo.toml
+++ b/client/telemetry/Cargo.toml
@@ -22,7 +22,7 @@ libp2p = { version = "0.37.1", default-features = false, features = ["dns-async-
 log = "0.4.8"
 pin-project = "1.0.4"
 rand = "0.7.2"
-serde = { version = "1.0.101", features = ["derive"] }
+serde = { version = "1.0.126", features = ["derive"] }
 take_mut = "0.2.2"
 void = "1.0.2"
 serde_json = "1.0.41"
diff --git a/client/tracing/Cargo.toml b/client/tracing/Cargo.toml
index 5d93b26dfbbc..97d27161d210 100644
--- a/client/tracing/Cargo.toml
+++ b/client/tracing/Cargo.toml
@@ -22,7 +22,7 @@ parking_lot = "0.11.1"
 regex = "1.4.2"
 rustc-hash = "1.1.0"
 erased-serde = "0.3.9"
-serde = "1.0.101"
+serde = "1.0.126"
 serde_json = "1.0.41"
 thiserror = "1.0.21"
 tracing = "0.1.25"
diff --git a/client/transaction-pool/Cargo.toml b/client/transaction-pool/Cargo.toml
index 10f1ed2f09ff..846bc68931bd 100644
--- a/client/transaction-pool/Cargo.toml
+++ b/client/transaction-pool/Cargo.toml
@@ -32,7 +32,7 @@ sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
 sp-utils = { version = "4.0.0-dev", path = "../../primitives/utils" }
 wasm-timer = "0.2"
 derive_more = "0.99.2"
-serde = { version = "1.0.101", features = ["derive"] }
+serde = { version = "1.0.126", features = ["derive"] }
 linked-hash-map = "0.5.2"
 retain_mut = "0.1.3"
 
diff --git a/client/transaction-pool/api/Cargo.toml b/client/transaction-pool/api/Cargo.toml
index d0dcfa34fe29..b49d47e53fe3 100644
--- a/client/transaction-pool/api/Cargo.toml
+++ b/client/transaction-pool/api/Cargo.toml
@@ -11,7 +11,7 @@ description = "Transaction pool client facing API."
 [dependencies]
 futures = { version = "0.3.1"  }
 log = { version = "0.4.8" }
-serde = { version = "1.0.101", features = ["derive"] }
+serde = { version = "1.0.126", features = ["derive"] }
 thiserror = { version = "1.0.21" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/runtime" }
 
diff --git a/frame/authorship/Cargo.toml b/frame/authorship/Cargo.toml
index f0d597b6ad7e..64a5f20769d2 100644
--- a/frame/authorship/Cargo.toml
+++ b/frame/authorship/Cargo.toml
@@ -24,7 +24,7 @@ impl-trait-for-tuples = "0.2.1"
 [dev-dependencies]
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 sp-io ={ version = "4.0.0-dev", path = "../../primitives/io" }
-serde = { version = "1.0.101" }
+serde = { version = "1.0.126" }
 
 [features]
 default = ["std"]
diff --git a/frame/benchmarking/Cargo.toml b/frame/benchmarking/Cargo.toml
index c7908c3f97b7..69c107256e4d 100644
--- a/frame/benchmarking/Cargo.toml
+++ b/frame/benchmarking/Cargo.toml
@@ -28,7 +28,7 @@ log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
 hex-literal = "0.3.1"
-serde = "1.0.101"
+serde = "1.0.126"
 
 [features]
 default = ["std"]
diff --git a/frame/democracy/Cargo.toml b/frame/democracy/Cargo.toml
index 178578992ad5..5170fc2a3a29 100644
--- a/frame/democracy/Cargo.toml
+++ b/frame/democracy/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.101", optional = true, features = ["derive"] }
+serde = { version = "1.0.126", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
diff --git a/frame/example-parallel/Cargo.toml b/frame/example-parallel/Cargo.toml
index ab1b8bfbfae2..761d0e4ff14d 100644
--- a/frame/example-parallel/Cargo.toml
+++ b/frame/example-parallel/Cargo.toml
@@ -22,7 +22,7 @@ sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primit
 sp-tasks = { version = "4.0.0-dev", default-features = false, path = "../../primitives/tasks" }
 
 [dev-dependencies]
-serde = { version = "1.0.101" }
+serde = { version = "1.0.126" }
 
 [features]
 default = ["std"]
diff --git a/frame/lottery/Cargo.toml b/frame/lottery/Cargo.toml
index a0368c2e654c..237345805d20 100644
--- a/frame/lottery/Cargo.toml
+++ b/frame/lottery/Cargo.toml
@@ -26,7 +26,7 @@ frame-support-test = { version = "3.0.0", path = "../support/test" }
 pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
-serde = { version = "1.0.101" }
+serde = { version = "1.0.126" }
 
 [features]
 default = ["std"]
diff --git a/frame/merkle-mountain-range/primitives/Cargo.toml b/frame/merkle-mountain-range/primitives/Cargo.toml
index 94b56a00640c..04b744ffb0ab 100644
--- a/frame/merkle-mountain-range/primitives/Cargo.toml
+++ b/frame/merkle-mountain-range/primitives/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../../support" }
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../../system" }
-serde = { version = "1.0.101", optional = true, features = ["derive"] }
+serde = { version = "1.0.126", optional = true, features = ["derive"] }
 sp-api = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/api" }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/core" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/runtime" }
diff --git a/frame/merkle-mountain-range/rpc/Cargo.toml b/frame/merkle-mountain-range/rpc/Cargo.toml
index 38c9bbe8aa13..b99a8f35c081 100644
--- a/frame/merkle-mountain-range/rpc/Cargo.toml
+++ b/frame/merkle-mountain-range/rpc/Cargo.toml
@@ -18,7 +18,7 @@ jsonrpc-core = "15.1.0"
 jsonrpc-core-client = "15.1.0"
 jsonrpc-derive = "15.1.0"
 pallet-mmr-primitives = { version = "4.0.0-dev", path = "../primitives" }
-serde = { version = "1.0.101", features = ["derive"] }
+serde = { version = "1.0.126", features = ["derive"] }
 sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
 sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
diff --git a/frame/metadata/Cargo.toml b/frame/metadata/Cargo.toml
index 57ba40efea99..332ce5b70c26 100644
--- a/frame/metadata/Cargo.toml
+++ b/frame/metadata/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.101", optional = true, features = ["derive"] }
+serde = { version = "1.0.126", optional = true, features = ["derive"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
 
diff --git a/frame/offences/Cargo.toml b/frame/offences/Cargo.toml
index 6d8038605cb2..c4295747d649 100644
--- a/frame/offences/Cargo.toml
+++ b/frame/offences/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 pallet-balances = { version = "4.0.0-dev", default-features = false, path = "../balances" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
-serde = { version = "1.0.101", optional = true }
+serde = { version = "1.0.126", optional = true }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 sp-staking = { version = "4.0.0-dev", default-features = false, path = "../../primitives/staking" }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
diff --git a/frame/session/benchmarking/Cargo.toml b/frame/session/benchmarking/Cargo.toml
index 58f68899d18f..2f8e069347bc 100644
--- a/frame/session/benchmarking/Cargo.toml
+++ b/frame/session/benchmarking/Cargo.toml
@@ -24,7 +24,7 @@ pallet-session = { version = "4.0.0-dev", default-features = false, path = "../.
 rand = { version = "0.7.2", default-features = false }
 
 [dev-dependencies]
-serde = { version = "1.0.101" }
+serde = { version = "1.0.126" }
 codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
 pallet-staking-reward-curve = { version = "4.0.0-dev", path = "../../staking/reward-curve" }
diff --git a/frame/staking/Cargo.toml b/frame/staking/Cargo.toml
index af5b5a976d66..285fb11cc52c 100644
--- a/frame/staking/Cargo.toml
+++ b/frame/staking/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 static_assertions = "1.1.0"
-serde = { version = "1.0.101", optional = true }
+serde = { version = "1.0.126", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-io ={ version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
diff --git a/frame/support/Cargo.toml b/frame/support/Cargo.toml
index 72fd4f9cd6b5..ed3a2f45a2e1 100644
--- a/frame/support/Cargo.toml
+++ b/frame/support/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.101", optional = true, features = ["derive"] }
+serde = { version = "1.0.126", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
 frame-metadata = { version = "14.0.0-dev", default-features = false, path = "../metadata" }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
diff --git a/frame/support/test/Cargo.toml b/frame/support/test/Cargo.toml
index 001c88ba48fb..9dd0156e72c1 100644
--- a/frame/support/test/Cargo.toml
+++ b/frame/support/test/Cargo.toml
@@ -12,7 +12,7 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.101", default-features = false, features = ["derive"] }
+serde = { version = "1.0.126", default-features = false, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-io = { version = "4.0.0-dev", path = "../../../primitives/io", default-features = false }
 sp-state-machine = { version = "0.10.0-dev", optional = true, path = "../../../primitives/state-machine" }
diff --git a/frame/system/Cargo.toml b/frame/system/Cargo.toml
index 61e35c552a3e..744a3cc22aea 100644
--- a/frame/system/Cargo.toml
+++ b/frame/system/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.101", optional = true, features = ["derive"] }
+serde = { version = "1.0.126", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
diff --git a/frame/system/benchmarking/Cargo.toml b/frame/system/benchmarking/Cargo.toml
index b6a5447199b1..2daa42366f77 100644
--- a/frame/system/benchmarking/Cargo.toml
+++ b/frame/system/benchmarking/Cargo.toml
@@ -22,7 +22,7 @@ frame-support = { version = "4.0.0-dev", default-features = false, path = "../..
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/core" }
 
 [dev-dependencies]
-serde = { version = "1.0.101" }
+serde = { version = "1.0.126" }
 sp-io ={ version = "4.0.0-dev", path = "../../../primitives/io" }
 
 [features]
diff --git a/frame/tips/Cargo.toml b/frame/tips/Cargo.toml
index 32deca37e741..a0b554166c04 100644
--- a/frame/tips/Cargo.toml
+++ b/frame/tips/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.101", optional = true, features = ["derive"] }
+serde = { version = "1.0.126", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
diff --git a/frame/transaction-payment/Cargo.toml b/frame/transaction-payment/Cargo.toml
index 6406b41a5195..16f09d3e1d2d 100644
--- a/frame/transaction-payment/Cargo.toml
+++ b/frame/transaction-payment/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.101", optional = true }
+serde = { version = "1.0.126", optional = true }
 smallvec = "1.4.1"
 
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core", default-features = false }
diff --git a/frame/transaction-storage/Cargo.toml b/frame/transaction-storage/Cargo.toml
index 4504b9a07e28..af6b66d2a01e 100644
--- a/frame/transaction-storage/Cargo.toml
+++ b/frame/transaction-storage/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.101", optional = true }
+serde = { version = "1.0.126", optional = true }
 hex-literal = { version = "0.3.1", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
diff --git a/frame/treasury/Cargo.toml b/frame/treasury/Cargo.toml
index 95c54dafe131..424119577d7e 100644
--- a/frame/treasury/Cargo.toml
+++ b/frame/treasury/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.101", features = ["derive"], optional = true }
+serde = { version = "1.0.126", features = ["derive"], optional = true }
 impl-trait-for-tuples = "0.2.1"
 
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
diff --git a/primitives/application-crypto/Cargo.toml b/primitives/application-crypto/Cargo.toml
index 3eee10d8c6f9..dd9d7f22d242 100644
--- a/primitives/application-crypto/Cargo.toml
+++ b/primitives/application-crypto/Cargo.toml
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../core" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.101", optional = true, features = ["derive"] }
+serde = { version = "1.0.126", optional = true, features = ["derive"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
 sp-io = { version = "4.0.0-dev", default-features = false, path = "../io" }
 
diff --git a/primitives/arithmetic/Cargo.toml b/primitives/arithmetic/Cargo.toml
index 77f298ad46f1..b43e12cd78d8 100644
--- a/primitives/arithmetic/Cargo.toml
+++ b/primitives/arithmetic/Cargo.toml
@@ -20,7 +20,7 @@ integer-sqrt = "0.1.2"
 static_assertions = "1.1.0"
 num-traits = { version = "0.2.8", default-features = false }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
-serde = { version = "1.0.101", optional = true, features = ["derive"] }
+serde = { version = "1.0.126", optional = true, features = ["derive"] }
 sp-debug-derive = { version = "3.0.0", default-features = false, path = "../debug-derive" }
 
 [dev-dependencies]
diff --git a/primitives/consensus/babe/Cargo.toml b/primitives/consensus/babe/Cargo.toml
index aa5f29db0df7..264bc1a654c6 100644
--- a/primitives/consensus/babe/Cargo.toml
+++ b/primitives/consensus/babe/Cargo.toml
@@ -26,7 +26,7 @@ sp-inherents = { version = "4.0.0-dev", default-features = false, path = "../../
 sp-keystore = { version = "0.10.0-dev", default-features = false, path = "../../keystore", optional = true }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../runtime" }
 sp-timestamp = { version = "4.0.0-dev", path = "../../timestamp", optional = true }
-serde = { version = "1.0.123", features = ["derive"], optional = true }
+serde = { version = "1.0.126", features = ["derive"], optional = true }
 async-trait = { version = "0.1.48", optional = true }
 
 [features]
diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml
index e3b5613e06b6..711fcc37e855 100644
--- a/primitives/core/Cargo.toml
+++ b/primitives/core/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
 codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
 log = { version = "0.4.11", default-features = false }
-serde = { version = "1.0.101", optional = true, features = ["derive"] }
+serde = { version = "1.0.126", optional = true, features = ["derive"] }
 byteorder = { version = "1.3.2", default-features = false }
 primitive-types = { version = "0.10.0", default-features = false, features = ["codec"] }
 impl-serde = { version = "0.3.0", optional = true }
diff --git a/primitives/finality-grandpa/Cargo.toml b/primitives/finality-grandpa/Cargo.toml
index 57a977f61748..895270d01219 100644
--- a/primitives/finality-grandpa/Cargo.toml
+++ b/primitives/finality-grandpa/Cargo.toml
@@ -18,7 +18,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 grandpa = { package = "finality-grandpa", version = "0.14.1", default-features = false, features = ["derive-codec"] }
 log = { version = "0.4.8", optional = true }
-serde = { version = "1.0.101", optional = true, features = ["derive"] }
+serde = { version = "1.0.126", optional = true, features = ["derive"] }
 sp-api = { version = "4.0.0-dev", default-features = false, path = "../api" }
 sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../application-crypto" }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../core" }
diff --git a/primitives/npos-elections/Cargo.toml b/primitives/npos-elections/Cargo.toml
index 02e898051d9b..902b3040ba49 100644
--- a/primitives/npos-elections/Cargo.toml
+++ b/primitives/npos-elections/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.101", optional = true, features = ["derive"] }
+serde = { version = "1.0.126", optional = true, features = ["derive"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
 sp-npos-elections-compact = { version = "4.0.0-dev", path = "./compact" }
 sp-arithmetic = { version = "4.0.0-dev", default-features = false, path = "../arithmetic" }
diff --git a/primitives/rpc/Cargo.toml b/primitives/rpc/Cargo.toml
index e740d0be88fa..227fc0fb9fc2 100644
--- a/primitives/rpc/Cargo.toml
+++ b/primitives/rpc/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.101", features = ["derive"] }
+serde = { version = "1.0.126", features = ["derive"] }
 sp-core = { version = "4.0.0-dev", path = "../core" }
 tracing-core = "0.1.17"
 rustc-hash = "1.1.0"
diff --git a/primitives/runtime/Cargo.toml b/primitives/runtime/Cargo.toml
index 78d141edb19b..ad4b0477184e 100644
--- a/primitives/runtime/Cargo.toml
+++ b/primitives/runtime/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 
 [dependencies]
-serde = { version = "1.0.101", optional = true, features = ["derive"] }
+serde = { version = "1.0.126", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../core" }
 sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../application-crypto" }
diff --git a/primitives/serializer/Cargo.toml b/primitives/serializer/Cargo.toml
index 51b53b43a40b..8f03d8f97293 100644
--- a/primitives/serializer/Cargo.toml
+++ b/primitives/serializer/Cargo.toml
@@ -14,5 +14,5 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = "1.0.101"
+serde = "1.0.126"
 serde_json = "1.0.41"
diff --git a/primitives/storage/Cargo.toml b/primitives/storage/Cargo.toml
index 40566deb06b6..1a05fb996919 100644
--- a/primitives/storage/Cargo.toml
+++ b/primitives/storage/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
-serde = { version = "1.0.101", optional = true, features = ["derive"] }
+serde = { version = "1.0.126", optional = true, features = ["derive"] }
 impl-serde = { version = "0.3.1", optional = true }
 ref-cast = "1.0.0"
 sp-debug-derive = { version = "3.0.0", path = "../debug-derive" }
diff --git a/primitives/test-primitives/Cargo.toml b/primitives/test-primitives/Cargo.toml
index c7b901e848e1..5aed5d679dd4 100644
--- a/primitives/test-primitives/Cargo.toml
+++ b/primitives/test-primitives/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../application-crypto" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../core" }
-serde = { version = "1.0.101", optional = true, features = ["derive"] }
+serde = { version = "1.0.126", optional = true, features = ["derive"] }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../runtime" }
 parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
 
diff --git a/primitives/tracing/Cargo.toml b/primitives/tracing/Cargo.toml
index d5fb07ad076b..451da77a817e 100644
--- a/primitives/tracing/Cargo.toml
+++ b/primitives/tracing/Cargo.toml
@@ -26,7 +26,7 @@ log = { version = "0.4.8", optional = true }
 tracing-subscriber = { version = "0.2.18", optional = true, features = ["tracing-log"] }
 parking_lot = { version = "0.10.0", optional = true }
 erased-serde = { version = "0.3.9", optional = true }
-serde = { version = "1.0.101", optional = true }
+serde = { version = "1.0.126", optional = true }
 serde_json = { version = "1.0.41", optional = true }
 slog = { version = "2.5.2", features = ["nested-values"], optional = true }
 
diff --git a/primitives/version/Cargo.toml b/primitives/version/Cargo.toml
index 62f625d1e38e..1cd3e7c72475 100644
--- a/primitives/version/Cargo.toml
+++ b/primitives/version/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 impl-serde = { version = "0.3.1", optional = true }
-serde = { version = "1.0.101", optional = true, features = ["derive"] }
+serde = { version = "1.0.126", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../runtime" }
diff --git a/test-utils/client/Cargo.toml b/test-utils/client/Cargo.toml
index 26661b8209c1..99dbb6cd2a28 100644
--- a/test-utils/client/Cargo.toml
+++ b/test-utils/client/Cargo.toml
@@ -17,7 +17,7 @@ futures = "0.3.9"
 futures01 = { package = "futures", version = "0.1.29" }
 hash-db = "0.15.2"
 hex = "0.4"
-serde = "1.0.55"
+serde = "1.0.126"
 serde_json = "1.0.55"
 sc-client-api = { version = "4.0.0-dev", path = "../../client/api" }
 sc-client-db = { version = "0.10.0-dev", features = ["test-helpers"], path = "../../client/db" }
diff --git a/test-utils/runtime/Cargo.toml b/test-utils/runtime/Cargo.toml
index 371f2fd5a13b..2a4be6787dd7 100644
--- a/test-utils/runtime/Cargo.toml
+++ b/test-utils/runtime/Cargo.toml
@@ -47,7 +47,7 @@ sp-externalities = { version = "0.10.0-dev", default-features = false, path = ".
 # 3rd party
 cfg-if = "1.0"
 log = { version = "0.4.14", default-features = false }
-serde = { version = "1.0.101", optional = true, features = ["derive"] }
+serde = { version = "1.0.126", optional = true, features = ["derive"] }
 
 [dev-dependencies]
 sc-block-builder = { version = "0.10.0-dev", path = "../../client/block-builder" }
diff --git a/utils/frame/benchmarking-cli/Cargo.toml b/utils/frame/benchmarking-cli/Cargo.toml
index d6f8da089f15..9bae97101977 100644
--- a/utils/frame/benchmarking-cli/Cargo.toml
+++ b/utils/frame/benchmarking-cli/Cargo.toml
@@ -27,7 +27,7 @@ sp-state-machine = { version = "0.10.0-dev", path = "../../../primitives/state-m
 codec = { version = "2.0.0", package = "parity-scale-codec" }
 structopt = "0.3.8"
 chrono = "0.4"
-serde = "1.0.116"
+serde = "1.0.126"
 handlebars = "3.5.0"
 Inflector = "0.11.4"
 
diff --git a/utils/frame/remote-externalities/Cargo.toml b/utils/frame/remote-externalities/Cargo.toml
index 3f51b00dd639..392eccf64b3a 100644
--- a/utils/frame/remote-externalities/Cargo.toml
+++ b/utils/frame/remote-externalities/Cargo.toml
@@ -21,7 +21,7 @@ env_logger = "0.8.2"
 log = "0.4.11"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 serde_json = "1.0"
-serde = "1.0.0"
+serde = "1.0.126"
 
 sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
 sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
diff --git a/utils/frame/rpc/system/Cargo.toml b/utils/frame/rpc/system/Cargo.toml
index 503d8d86e4a4..909da94624a1 100644
--- a/utils/frame/rpc/system/Cargo.toml
+++ b/utils/frame/rpc/system/Cargo.toml
@@ -20,7 +20,7 @@ jsonrpc-core = "15.1.0"
 jsonrpc-core-client = "15.1.0"
 jsonrpc-derive = "15.1.0"
 log = "0.4.8"
-serde = { version = "1.0.101", features = ["derive"] }
+serde = { version = "1.0.126", features = ["derive"] }
 sp-runtime = { version = "4.0.0-dev", path = "../../../../primitives/runtime" }
 sp-api = { version = "4.0.0-dev", path = "../../../../primitives/api" }
 frame-system-rpc-runtime-api = { version = "4.0.0-dev", path = "../../../../frame/system/rpc/runtime-api" }
diff --git a/utils/frame/try-runtime/cli/Cargo.toml b/utils/frame/try-runtime/cli/Cargo.toml
index 61bfe9290a67..827239e290be 100644
--- a/utils/frame/try-runtime/cli/Cargo.toml
+++ b/utils/frame/try-runtime/cli/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 log = "0.4.8"
 parity-scale-codec = { version = "2.0.0" }
-serde = "1.0.0"
+serde = "1.0.126"
 structopt = "0.3.8"
 
 sc-service = { version = "0.10.0-dev", default-features = false, path = "../../../../client/service" }

From bfca1a91f7607d7395591f7341335fd4a27064da Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jul 2021 09:48:59 +0000
Subject: [PATCH 0986/1194] Bump async-trait from 0.1.48 to 0.1.50 (#8977)

Bumps [async-trait](https://github.com/dtolnay/async-trait) from 0.1.48 to 0.1.50.
- [Release notes](https://github.com/dtolnay/async-trait/releases)
- [Commits](https://github.com/dtolnay/async-trait/compare/0.1.48...0.1.50)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                                      | 4 ++--
 client/consensus/aura/Cargo.toml                | 2 +-
 client/consensus/babe/Cargo.toml                | 2 +-
 client/consensus/manual-seal/Cargo.toml         | 2 +-
 client/consensus/pow/Cargo.toml                 | 2 +-
 client/consensus/slots/Cargo.toml               | 2 +-
 client/finality-grandpa/Cargo.toml              | 2 +-
 client/keystore/Cargo.toml                      | 2 +-
 client/network/test/Cargo.toml                  | 2 +-
 client/service/Cargo.toml                       | 2 +-
 primitives/authorship/Cargo.toml                | 2 +-
 primitives/consensus/aura/Cargo.toml            | 2 +-
 primitives/consensus/babe/Cargo.toml            | 2 +-
 primitives/consensus/common/Cargo.toml          | 2 +-
 primitives/inherents/Cargo.toml                 | 2 +-
 primitives/keystore/Cargo.toml                  | 2 +-
 primitives/timestamp/Cargo.toml                 | 2 +-
 primitives/transaction-storage-proof/Cargo.toml | 2 +-
 test-utils/client/Cargo.toml                    | 2 +-
 19 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 62657bbe3d58..8acb97b85b41 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -364,9 +364,9 @@ checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0"
 
 [[package]]
 name = "async-trait"
-version = "0.1.48"
+version = "0.1.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36ea56748e10732c49404c153638a15ec3d6211ec5ff35d9bb20e13b93576adf"
+checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/client/consensus/aura/Cargo.toml b/client/consensus/aura/Cargo.toml
index 36187871aa88..f5a8aaf9dadb 100644
--- a/client/consensus/aura/Cargo.toml
+++ b/client/consensus/aura/Cargo.toml
@@ -36,7 +36,7 @@ sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
 sp-keystore = { version = "0.10.0-dev", path = "../../../primitives/keystore" }
 sc-telemetry = { version = "4.0.0-dev", path = "../../telemetry" }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0"}
-async-trait = "0.1.42"
+async-trait = "0.1.50"
 # We enable it only for web-wasm check
 # See https://docs.rs/getrandom/0.2.1/getrandom/#webassembly-support
 getrandom = { version = "0.2", features = ["js"], optional = true }
diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml
index cfcf503ebaa4..e76e293df5bb 100644
--- a/client/consensus/babe/Cargo.toml
+++ b/client/consensus/babe/Cargo.toml
@@ -52,7 +52,7 @@ merlin = "2.0"
 pdqselect = "0.1.0"
 derive_more = "0.99.2"
 retain_mut = "0.1.3"
-async-trait = "0.1.42"
+async-trait = "0.1.50"
 
 [dev-dependencies]
 sp-timestamp = { version = "4.0.0-dev", path = "../../../primitives/timestamp" }
diff --git a/client/consensus/manual-seal/Cargo.toml b/client/consensus/manual-seal/Cargo.toml
index 5cb2c13c8233..8a236b0591b8 100644
--- a/client/consensus/manual-seal/Cargo.toml
+++ b/client/consensus/manual-seal/Cargo.toml
@@ -23,7 +23,7 @@ parking_lot = "0.11.1"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 serde = { version = "1.0", features=["derive"] }
 assert_matches = "1.3.0"
-async-trait = "0.1.42"
+async-trait = "0.1.50"
 
 sc-client-api = { path = "../../api", version = "4.0.0-dev"}
 sc-consensus-babe = { path = "../../consensus/babe", version = "0.10.0-dev"}
diff --git a/client/consensus/pow/Cargo.toml b/client/consensus/pow/Cargo.toml
index e484665cc3f8..77ed9ba04ce9 100644
--- a/client/consensus/pow/Cargo.toml
+++ b/client/consensus/pow/Cargo.toml
@@ -29,4 +29,4 @@ futures-timer = "3.0.1"
 parking_lot = "0.11.1"
 derive_more = "0.99.2"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0"}
-async-trait = "0.1.42"
+async-trait = "0.1.50"
diff --git a/client/consensus/slots/Cargo.toml b/client/consensus/slots/Cargo.toml
index 72c3a4ddbf35..22697e94d358 100644
--- a/client/consensus/slots/Cargo.toml
+++ b/client/consensus/slots/Cargo.toml
@@ -34,7 +34,7 @@ futures-timer = "3.0.1"
 log = "0.4.11"
 thiserror = "1.0.21"
 impl-trait-for-tuples = "0.2.1"
-async-trait = "0.1.42"
+async-trait = "0.1.50"
 
 [dev-dependencies]
 substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml
index 8815f70f3ccf..706538e80724 100644
--- a/client/finality-grandpa/Cargo.toml
+++ b/client/finality-grandpa/Cargo.toml
@@ -47,7 +47,7 @@ sc-block-builder = { version = "0.10.0-dev", path = "../block-builder" }
 finality-grandpa = { version = "0.14.1", features = ["derive-codec"] }
 pin-project = "1.0.4"
 linked-hash-map = "0.5.2"
-async-trait = "0.1.42"
+async-trait = "0.1.50"
 wasm-timer = "0.2"
 
 [dev-dependencies]
diff --git a/client/keystore/Cargo.toml b/client/keystore/Cargo.toml
index b3b1d7981255..a9b53f348ab7 100644
--- a/client/keystore/Cargo.toml
+++ b/client/keystore/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 
 [dependencies]
-async-trait = "0.1.30"
+async-trait = "0.1.50"
 derive_more = "0.99.2"
 futures = "0.3.9"
 futures-util = "0.3.4"
diff --git a/client/network/test/Cargo.toml b/client/network/test/Cargo.toml
index 2fc453a8c5a3..c5915594d444 100644
--- a/client/network/test/Cargo.toml
+++ b/client/network/test/Cargo.toml
@@ -34,4 +34,4 @@ substrate-test-runtime = { version = "2.0.0", path = "../../../test-utils/runtim
 tempfile = "3.1.0"
 sp-tracing = { version = "4.0.0-dev", path = "../../../primitives/tracing" }
 sc-service = { version = "0.10.0-dev", default-features = false, features = ["test-helpers"],  path = "../../service" }
-async-trait = "0.1.42"
+async-trait = "0.1.50"
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index 5359c8018947..65393647f3ea 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -81,7 +81,7 @@ sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
 tracing = "0.1.25"
 tracing-futures = { version = "0.2.4" }
 parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
-async-trait = "0.1.42"
+async-trait = "0.1.50"
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
 tempfile = "3.1.0"
diff --git a/primitives/authorship/Cargo.toml b/primitives/authorship/Cargo.toml
index f6021bd7a2ab..15e4dc57ff5a 100644
--- a/primitives/authorship/Cargo.toml
+++ b/primitives/authorship/Cargo.toml
@@ -17,7 +17,7 @@ sp-inherents = { version = "4.0.0-dev", default-features = false, path = "../inh
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../runtime" }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-async-trait = { version = "0.1.48", optional = true }
+async-trait = { version = "0.1.50", optional = true }
 
 [features]
 default = [ "std" ]
diff --git a/primitives/consensus/aura/Cargo.toml b/primitives/consensus/aura/Cargo.toml
index f989b2a1897d..1feb04b5bc57 100644
--- a/primitives/consensus/aura/Cargo.toml
+++ b/primitives/consensus/aura/Cargo.toml
@@ -22,7 +22,7 @@ sp-inherents = { version = "4.0.0-dev", default-features = false, path = "../../
 sp-timestamp = { version = "4.0.0-dev", default-features = false, path = "../../timestamp" }
 sp-consensus-slots = { version = "0.10.0-dev", default-features = false, path = "../slots" }
 sp-consensus = { version = "0.10.0-dev", path = "../common", optional = true }
-async-trait = { version = "0.1.48", optional = true }
+async-trait = { version = "0.1.50", optional = true }
 
 [features]
 default = ["std"]
diff --git a/primitives/consensus/babe/Cargo.toml b/primitives/consensus/babe/Cargo.toml
index 264bc1a654c6..0428d8e22288 100644
--- a/primitives/consensus/babe/Cargo.toml
+++ b/primitives/consensus/babe/Cargo.toml
@@ -27,7 +27,7 @@ sp-keystore = { version = "0.10.0-dev", default-features = false, path = "../../
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../runtime" }
 sp-timestamp = { version = "4.0.0-dev", path = "../../timestamp", optional = true }
 serde = { version = "1.0.126", features = ["derive"], optional = true }
-async-trait = { version = "0.1.48", optional = true }
+async-trait = { version = "0.1.50", optional = true }
 
 [features]
 default = ["std"]
diff --git a/primitives/consensus/common/Cargo.toml b/primitives/consensus/common/Cargo.toml
index 07cc36e2e31e..5a9d1814bd63 100644
--- a/primitives/consensus/common/Cargo.toml
+++ b/primitives/consensus/common/Cargo.toml
@@ -34,7 +34,7 @@ parking_lot = "0.11.1"
 serde = { version = "1.0", features = ["derive"] }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0"}
 wasm-timer = "0.2.5"
-async-trait = "0.1.42"
+async-trait = "0.1.50"
 
 [dev-dependencies]
 futures = "0.3.9"
diff --git a/primitives/inherents/Cargo.toml b/primitives/inherents/Cargo.toml
index 353735f806c0..23558750b5cf 100644
--- a/primitives/inherents/Cargo.toml
+++ b/primitives/inherents/Cargo.toml
@@ -21,7 +21,7 @@ sp-runtime = { version = "4.0.0-dev", path = "../runtime", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.21", optional = true }
 impl-trait-for-tuples = "0.2.0"
-async-trait = { version = "0.1.30", optional = true }
+async-trait = { version = "0.1.50", optional = true }
 
 [dev-dependencies]
 futures = "0.3.9"
diff --git a/primitives/keystore/Cargo.toml b/primitives/keystore/Cargo.toml
index 4c2408c831b3..35c66ef93f7a 100644
--- a/primitives/keystore/Cargo.toml
+++ b/primitives/keystore/Cargo.toml
@@ -13,7 +13,7 @@ documentation = "https://docs.rs/sp-core"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-async-trait = "0.1.30"
+async-trait = "0.1.50"
 derive_more = "0.99.2"
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 futures = { version = "0.3.1" }
diff --git a/primitives/timestamp/Cargo.toml b/primitives/timestamp/Cargo.toml
index 512635f31923..137faa3725b4 100644
--- a/primitives/timestamp/Cargo.toml
+++ b/primitives/timestamp/Cargo.toml
@@ -22,7 +22,7 @@ wasm-timer = { version = "0.2", optional = true }
 thiserror = { version = "1.0.21", optional = true }
 log = { version = "0.4.8", optional = true }
 futures-timer = { version = "3.0.2", optional = true }
-async-trait = { version = "0.1.48", optional = true }
+async-trait = { version = "0.1.50", optional = true }
 
 [features]
 default = [ "std" ]
diff --git a/primitives/transaction-storage-proof/Cargo.toml b/primitives/transaction-storage-proof/Cargo.toml
index b04dbbc1124d..0b5065be8219 100644
--- a/primitives/transaction-storage-proof/Cargo.toml
+++ b/primitives/transaction-storage-proof/Cargo.toml
@@ -20,7 +20,7 @@ sp-trie = { version = "4.0.0-dev", optional = true, path = "../trie" }
 sp-core = { version = "4.0.0-dev", path = "../core", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 log = { version = "0.4.8", optional = true }
-async-trait = { version = "0.1.48", optional = true }
+async-trait = { version = "0.1.50", optional = true }
 
 [features]
 default = [ "std" ]
diff --git a/test-utils/client/Cargo.toml b/test-utils/client/Cargo.toml
index 99dbb6cd2a28..a647aeaedc4f 100644
--- a/test-utils/client/Cargo.toml
+++ b/test-utils/client/Cargo.toml
@@ -33,4 +33,4 @@ sp-keystore = { version = "0.10.0-dev", path = "../../primitives/keystore" }
 sp-keyring = { version = "4.0.0-dev", path = "../../primitives/keyring" }
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
 sp-state-machine = { version = "0.10.0-dev", path = "../../primitives/state-machine" }
-async-trait = "0.1.42"
+async-trait = "0.1.50"

From cf086eeb894e61b45c732b3dad2ce4dcc54fa1af Mon Sep 17 00:00:00 2001
From: chenwei <chenwei767@gmail.com>
Date: Tue, 13 Jul 2021 18:43:57 +0800
Subject: [PATCH 0987/1194] Fix docs on `generate_storage_alias!`. (#9314)

* Fix docs on `generate_storage_alias!`.

* Update frame/support/src/lib.rs

* Update frame/support/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
---
 frame/support/src/lib.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 76405d939bc9..34836dd5518e 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -115,11 +115,12 @@ impl TypeId for PalletId {
 /// // generate a storage value with type u32.
 /// generate_storage_alias!(Prefix, StorageName => Value<u32>);
 ///
-/// // generate a double map from `(u32, u32)` (with hasher `Twox64Concat`) to `Vec<u8>`
+/// // generate a double map from `(u32, u32)` (with hashers `Twox64Concat` for each key) 
+/// // to `Vec<u8>`
 /// generate_storage_alias!(
 /// 	OtherPrefix, OtherStorageName => DoubleMap<
-/// 		(u32, u32),
-/// 		(u32, u32),
+/// 		(u32, Twox64Concat),
+/// 		(u32, Twox64Concat),
 /// 		Vec<u8>
 /// 	>
 /// );
@@ -127,7 +128,7 @@ impl TypeId for PalletId {
 /// // generate a map from `Config::AccountId` (with hasher `Twox64Concat`) to `Vec<u8>`
 /// trait Config { type AccountId: codec::FullCodec; }
 /// generate_storage_alias!(
-/// 	Prefix, GenericStorage<T: Config> => Map<(Twox64Concat, T::AccountId), Vec<u8>>
+/// 	Prefix, GenericStorage<T: Config> => Map<(T::AccountId, Twox64Concat), Vec<u8>>
 /// );
 /// # fn main() {}
 /// ```

From 993907f9deb180795b291ba752b9c204165d74dc Mon Sep 17 00:00:00 2001
From: David <dvdplm@gmail.com>
Date: Tue, 13 Jul 2021 22:01:36 +0200
Subject: [PATCH 0988/1194] Upgrade remote-externalities to use jsonrpsee v0.3
 (#9342)

---
 Cargo.lock                                    | 77 +++++++++++++++----
 utils/frame/remote-externalities/Cargo.toml   |  4 +-
 utils/frame/remote-externalities/src/lib.rs   |  4 +-
 .../frame/remote-externalities/src/rpc_api.rs |  9 ++-
 4 files changed, 76 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8acb97b85b41..b552ac3f92b4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -445,6 +445,19 @@ dependencies = [
  "rustc-demangle",
 ]
 
+[[package]]
+name = "bae"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec107f431ee3d8a8e45e6dd117adab769556ef463959e77bf6a4888d5fd500cf"
+dependencies = [
+ "heck",
+ "proc-macro-error 0.4.12",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "base-x"
 version = "0.2.8"
@@ -2981,11 +2994,12 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-proc-macros"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b4c85cfa6767333f3e5f3b2f2f765dad2727b0033ee270ae07c599bf43ed5ae"
+checksum = "f37924e16300e249a52a22cabb5632f846dc9760b39355f5e8bc70cd23dc6300"
 dependencies = [
  "Inflector",
+ "bae",
  "proc-macro-crate 1.0.0",
  "proc-macro2",
  "quote",
@@ -2994,9 +3008,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-types"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0cf7bd4e93b3b56e59131de7f24afbea871faf914e97bcdd942c86927ab0172"
+checksum = "d67724d368c59e08b557a516cf8fcc51100e7a708850f502e1044b151fe89788"
 dependencies = [
  "async-trait",
  "beef",
@@ -3006,15 +3020,15 @@ dependencies = [
  "log",
  "serde",
  "serde_json",
- "soketto 0.5.0",
+ "soketto 0.6.0",
  "thiserror",
 ]
 
 [[package]]
 name = "jsonrpsee-ws-client"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ec51150965544e1a4468f372bdab8545243a1b045d4ab272023aac74c60de32"
+checksum = "8e2834b6e7f57ce9a4412ed4d6dc95125d2c8612e68f86b9d9a07369164e4198"
 dependencies = [
  "async-trait",
  "fnv",
@@ -3026,7 +3040,7 @@ dependencies = [
  "rustls-native-certs 0.5.0",
  "serde",
  "serde_json",
- "soketto 0.5.0",
+ "soketto 0.6.0",
  "thiserror",
  "tokio 0.2.25",
  "tokio-rustls 0.15.0",
@@ -3991,7 +4005,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85ee3c48cb9d9b275ad967a0e96715badc13c6029adb92f34fa17b9ff28fd81f"
 dependencies = [
  "proc-macro-crate 0.1.5",
- "proc-macro-error",
+ "proc-macro-error 1.0.4",
  "proc-macro2",
  "quote",
  "syn",
@@ -6279,16 +6293,42 @@ dependencies = [
  "toml",
 ]
 
+[[package]]
+name = "proc-macro-error"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18f33027081eba0a6d8aba6d1b1c3a3be58cbb12106341c2d5759fcd9b5277e7"
+dependencies = [
+ "proc-macro-error-attr 0.4.12",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "version_check",
+]
+
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
- "proc-macro-error-attr",
+ "proc-macro-error-attr 1.0.4",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a5b4b77fdb63c1eca72173d68d24501c54ab1269409f6b672c85deb18af69de"
+dependencies = [
  "proc-macro2",
  "quote",
  "syn",
+ "syn-mid",
  "version_check",
 ]
 
@@ -8626,9 +8666,9 @@ dependencies = [
 
 [[package]]
 name = "soketto"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4919971d141dbadaa0e82b5d369e2d7666c98e4625046140615ca363e50d4daa"
+checksum = "a74e48087dbeed4833785c2f3352b59140095dc192dce966a3bfc155020a439f"
 dependencies = [
  "base64 0.13.0",
  "bytes 1.0.1",
@@ -9522,7 +9562,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90"
 dependencies = [
  "heck",
- "proc-macro-error",
+ "proc-macro-error 1.0.4",
  "proc-macro2",
  "quote",
  "syn",
@@ -9842,6 +9882,17 @@ dependencies = [
  "unicode-xid",
 ]
 
+[[package]]
+name = "syn-mid"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baa8e7560a164edb1621a55d18a0c59abf49d360f47aa7b821061dd7eea7fac9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "synstructure"
 version = "0.12.4"
diff --git a/utils/frame/remote-externalities/Cargo.toml b/utils/frame/remote-externalities/Cargo.toml
index 392eccf64b3a..705ba2ed0298 100644
--- a/utils/frame/remote-externalities/Cargo.toml
+++ b/utils/frame/remote-externalities/Cargo.toml
@@ -13,8 +13,8 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-jsonrpsee-ws-client = { version = "0.2.0", default-features = false, features = ["tokio02"] }
-jsonrpsee-proc-macros = "0.2.0"
+jsonrpsee-ws-client = { version = "0.3.0", default-features = false, features = ["tokio02"] }
+jsonrpsee-proc-macros = "0.3.0"
 
 hex = "0.4.0"
 env_logger = "0.8.2"
diff --git a/utils/frame/remote-externalities/src/lib.rs b/utils/frame/remote-externalities/src/lib.rs
index 4b6738f3b915..4c1aeccf5041 100644
--- a/utils/frame/remote-externalities/src/lib.rs
+++ b/utils/frame/remote-externalities/src/lib.rs
@@ -34,7 +34,7 @@ use sp_core::{
 use codec::{Encode, Decode};
 use sp_runtime::traits::Block as BlockT;
 use jsonrpsee_ws_client::{
-	WsClientBuilder, WsClient, v2::params::JsonRpcParams,
+	WsClientBuilder, WsClient, types::v2::params::JsonRpcParams,
 };
 
 pub mod rpc_api;
@@ -275,7 +275,7 @@ impl<B: BlockT> Builder<B> {
 		prefix: StorageKey,
 		at: B::Hash,
 	) -> Result<Vec<KeyPair>, &'static str> {
-		use jsonrpsee_ws_client::traits::Client;
+		use jsonrpsee_ws_client::types::traits::Client;
 		use serde_json::to_value;
 		let keys = self.get_keys_paged(prefix, at).await?;
 		let keys_count = keys.len();
diff --git a/utils/frame/remote-externalities/src/rpc_api.rs b/utils/frame/remote-externalities/src/rpc_api.rs
index 6773bfd54bb1..59d6bba8dd86 100644
--- a/utils/frame/remote-externalities/src/rpc_api.rs
+++ b/utils/frame/remote-externalities/src/rpc_api.rs
@@ -19,7 +19,14 @@
 // TODO: Consolidate one off RPC calls https://github.com/paritytech/substrate/issues/8988
 
 use sp_runtime::{generic::SignedBlock, traits::{Block as BlockT, Header as HeaderT}};
-use jsonrpsee_ws_client::{WsClientBuilder, WsClient, v2::params::JsonRpcParams, traits::Client};
+use jsonrpsee_ws_client::{
+	WsClientBuilder,
+	WsClient,
+	types::{
+		v2::params::JsonRpcParams,
+		traits::Client
+	},
+};
 
 /// Get the header of the block identified by `at`
 pub async fn get_header<Block, S>(from: S, at: Block::Hash) -> Result<Block::Header, String>

From b7dbfb228b1ec0976010625edb8ee0758d086b95 Mon Sep 17 00:00:00 2001
From: Liu-Cheng Xu <xuliuchengxlc@gmail.com>
Date: Wed, 14 Jul 2021 18:23:03 +0800
Subject: [PATCH 0989/1194] Impl InherentDataProviderExt for more tuples
 (#9282)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Impl InherentDataProviderExt for more tuples

Currently the inherent data provider only supports up to 4 entries due to the limit of
InherentDataProviderExt, which is not enough for a chain with more than 4 inherent data providers.
This patch simply impls InherentDataProviderExt for more tuples.

* Nit

* Apply suggestions from code review

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
---
 client/consensus/slots/src/lib.rs | 63 +++++++++++++------------------
 1 file changed, 26 insertions(+), 37 deletions(-)

diff --git a/client/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs
index 1ec89a6f519a..c410f173e90a 100644
--- a/client/consensus/slots/src/lib.rs
+++ b/client/consensus/slots/src/lib.rs
@@ -454,47 +454,36 @@ pub trait InherentDataProviderExt {
 	fn slot(&self) -> Slot;
 }
 
-impl<T, S, P> InherentDataProviderExt for (T, S, P)
-where
-	T: Deref<Target = Timestamp>,
-	S: Deref<Target = Slot>,
-{
-	fn timestamp(&self) -> Timestamp {
-		*self.0.deref()
-	}
-
-	fn slot(&self) -> Slot {
-		*self.1.deref()
-	}
-}
-
-impl<T, S, P, R> InherentDataProviderExt for (T, S, P, R)
-where
-	T: Deref<Target = Timestamp>,
-	S: Deref<Target = Slot>,
-{
-	fn timestamp(&self) -> Timestamp {
-		*self.0.deref()
-	}
+/// Small macro for implementing `InherentDataProviderExt` for inherent data provider tuple.
+macro_rules! impl_inherent_data_provider_ext_tuple {
+	( T, S $(, $TN:ident)* $( , )?) => {
+		impl<T, S, $( $TN ),*>  InherentDataProviderExt for (T, S, $($TN),*)
+		where
+			T: Deref<Target = Timestamp>,
+			S: Deref<Target = Slot>,
+		{
+			fn timestamp(&self) -> Timestamp {
+				*self.0.deref()
+			}
 
-	fn slot(&self) -> Slot {
-		*self.1.deref()
+			fn slot(&self) -> Slot {
+				*self.1.deref()
+			}
+		}
 	}
 }
 
-impl<T, S> InherentDataProviderExt for (T, S)
-where
-	T: Deref<Target = Timestamp>,
-	S: Deref<Target = Slot>,
-{
-	fn timestamp(&self) -> Timestamp {
-		*self.0.deref()
-	}
-
-	fn slot(&self) -> Slot {
-		*self.1.deref()
-	}
-}
+impl_inherent_data_provider_ext_tuple!(T, S);
+impl_inherent_data_provider_ext_tuple!(T, S, A);
+impl_inherent_data_provider_ext_tuple!(T, S, A, B);
+impl_inherent_data_provider_ext_tuple!(T, S, A, B, C);
+impl_inherent_data_provider_ext_tuple!(T, S, A, B, C, D);
+impl_inherent_data_provider_ext_tuple!(T, S, A, B, C, D, E);
+impl_inherent_data_provider_ext_tuple!(T, S, A, B, C, D, E, F);
+impl_inherent_data_provider_ext_tuple!(T, S, A, B, C, D, E, F, G);
+impl_inherent_data_provider_ext_tuple!(T, S, A, B, C, D, E, F, G, H);
+impl_inherent_data_provider_ext_tuple!(T, S, A, B, C, D, E, F, G, H, I);
+impl_inherent_data_provider_ext_tuple!(T, S, A, B, C, D, E, F, G, H, I, J);
 
 /// Start a new slot worker.
 ///

From d66c472ea15f5e04a8b9f757f318ec381b946f64 Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Wed, 14 Jul 2021 13:29:03 +0200
Subject: [PATCH 0990/1194] Improve shared state cache contention (#9321)

---
 client/db/src/lib.rs           |  4 +-
 client/db/src/storage_cache.rs | 69 +++++++++++++++++++---------------
 2 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index 024f2e5f4e64..4e3d3cf36fe9 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -1643,7 +1643,7 @@ impl<Block: BlockT> Backend<Block> {
 		self.changes_tries_storage.post_commit(changes_trie_cache_ops);
 
 		if let Some((enacted, retracted)) = cache_update {
-			self.shared_cache.lock().sync(&enacted, &retracted);
+			self.shared_cache.write().sync(&enacted, &retracted);
 		}
 
 		for m in meta_updates {
@@ -2052,7 +2052,7 @@ impl<Block: BlockT> sc_client_api::backend::Backend<Block> for Backend<Block> {
 		);
 		let database_cache = MemorySize::from_bytes(0);
 		let state_cache = MemorySize::from_bytes(
-			(*&self.shared_cache).lock().used_storage_cache_size(),
+			(*&self.shared_cache).read().used_storage_cache_size(),
 		);
 		let state_db = self.storage.state_db.memory_info();
 
diff --git a/client/db/src/storage_cache.rs b/client/db/src/storage_cache.rs
index 9934cccd155a..e4b595146546 100644
--- a/client/db/src/storage_cache.rs
+++ b/client/db/src/storage_cache.rs
@@ -23,7 +23,7 @@
 use std::collections::{VecDeque, HashSet, HashMap};
 use std::sync::Arc;
 use std::hash::Hash as StdHash;
-use parking_lot::{Mutex, RwLock, RwLockUpgradableReadGuard};
+use parking_lot::{RwLock, RwLockUpgradableReadGuard};
 use linked_hash_map::{LinkedHashMap, Entry};
 use hash_db::Hasher;
 use sp_runtime::traits::{Block as BlockT, Header, HashFor, NumberFor};
@@ -222,7 +222,7 @@ impl<B: BlockT> Cache<B> {
 	}
 }
 
-pub type SharedCache<B> = Arc<Mutex<Cache<B>>>;
+pub type SharedCache<B> = Arc<RwLock<Cache<B>>>;
 
 /// Fix lru storage size for hash (small 64ko).
 const FIX_LRU_HASH_SIZE: usize = 65_536;
@@ -234,7 +234,7 @@ pub fn new_shared_cache<B: BlockT>(
 ) -> SharedCache<B> {
 	let top = child_ratio.1.saturating_sub(child_ratio.0);
 	Arc::new(
-		Mutex::new(
+		RwLock::new(
 			Cache {
 				lru_storage: LRUMap(
 					LinkedHashMap::new(), 0, shared_cache_size * top / child_ratio.1
@@ -337,7 +337,7 @@ impl<B: BlockT> CacheChanges<B> {
 		commit_number: Option<NumberFor<B>>,
 		is_best: bool,
 	) {
-		let mut cache = self.shared_cache.lock();
+		let mut cache = self.shared_cache.write();
 		trace!(
 			"Syncing cache, id = (#{:?}, {:?}), parent={:?}, best={}",
 			commit_number,
@@ -527,12 +527,15 @@ impl<S: StateBackend<HashFor<B>>, B: BlockT> StateBackend<HashFor<B>> for Cachin
 
 			return Ok(entry)
 		}
-		let mut cache = self.cache.shared_cache.lock();
-		if Self::is_allowed(Some(key), None, &self.cache.parent_hash, &cache.modifications) {
-			if let Some(entry) = cache.lru_storage.get(key).map(|a| a.clone()) {
-				trace!("Found in shared cache: {:?}", HexDisplay::from(&key));
-				self.usage.tally_key_read(key, entry.as_ref(), true);
-				return Ok(entry)
+		{
+			let cache = self.cache.shared_cache.upgradable_read();
+			if Self::is_allowed(Some(key), None, &self.cache.parent_hash, &cache.modifications) {
+				let mut cache = RwLockUpgradableReadGuard::upgrade(cache);
+				if let Some(entry) = cache.lru_storage.get(key).map(|a| a.clone()) {
+					trace!("Found in shared cache: {:?}", HexDisplay::from(&key));
+					self.usage.tally_key_read(key, entry.as_ref(), true);
+					return Ok(entry)
+				}
 			}
 		}
 		trace!("Cache miss: {:?}", HexDisplay::from(&key));
@@ -548,11 +551,14 @@ impl<S: StateBackend<HashFor<B>>, B: BlockT> StateBackend<HashFor<B>> for Cachin
 			trace!("Found hash in local cache: {:?}", HexDisplay::from(&key));
 			return Ok(entry)
 		}
-		let mut cache = self.cache.shared_cache.lock();
-		if Self::is_allowed(Some(key), None, &self.cache.parent_hash, &cache.modifications) {
-			if let Some(entry) = cache.lru_hashes.get(key).map(|a| a.0.clone()) {
-				trace!("Found hash in shared cache: {:?}", HexDisplay::from(&key));
-				return Ok(entry)
+		{
+			let cache = self.cache.shared_cache.upgradable_read();
+			if Self::is_allowed(Some(key), None, &self.cache.parent_hash, &cache.modifications) {
+				let mut cache = RwLockUpgradableReadGuard::upgrade(cache);
+				if let Some(entry) = cache.lru_hashes.get(key).map(|a| a.0.clone()) {
+					trace!("Found hash in shared cache: {:?}", HexDisplay::from(&key));
+					return Ok(entry)
+				}
 			}
 		}
 		trace!("Cache hash miss: {:?}", HexDisplay::from(&key));
@@ -574,13 +580,16 @@ impl<S: StateBackend<HashFor<B>>, B: BlockT> StateBackend<HashFor<B>> for Cachin
 				self.usage.tally_child_key_read(&key, entry, true)
 			)
 		}
-		let mut cache = self.cache.shared_cache.lock();
-		if Self::is_allowed(None, Some(&key), &self.cache.parent_hash, &cache.modifications) {
-			if let Some(entry) = cache.lru_child_storage.get(&key).map(|a| a.clone()) {
-				trace!("Found in shared cache: {:?}", key);
-				return Ok(
-					self.usage.tally_child_key_read(&key, entry, true)
-				)
+		{
+			let cache = self.cache.shared_cache.upgradable_read();
+			if Self::is_allowed(None, Some(&key), &self.cache.parent_hash, &cache.modifications) {
+				let mut cache = RwLockUpgradableReadGuard::upgrade(cache);
+				if let Some(entry) = cache.lru_child_storage.get(&key).map(|a| a.clone()) {
+					trace!("Found in shared cache: {:?}", key);
+					return Ok(
+						self.usage.tally_child_key_read(&key, entry, true)
+					)
+				}
 			}
 		}
 		trace!("Cache miss: {:?}", key);
@@ -1274,7 +1283,7 @@ mod tests {
 			true,
 		);
 		// 32 key, 3 byte size
-		assert_eq!(shared.lock().used_storage_cache_size(), 35 /* bytes */);
+		assert_eq!(shared.read().used_storage_cache_size(), 35 /* bytes */);
 
 		let key = H256::random()[..].to_vec();
 		s.cache.sync_cache(
@@ -1287,7 +1296,7 @@ mod tests {
 			true,
 		);
 		// 35 + (2 * 32) key, 2 byte size
-		assert_eq!(shared.lock().used_storage_cache_size(), 101 /* bytes */);
+		assert_eq!(shared.read().used_storage_cache_size(), 101 /* bytes */);
 	}
 
 	#[test]
@@ -1313,7 +1322,7 @@ mod tests {
 			true,
 		);
 		// 32 key, 4 byte size
-		assert_eq!(shared.lock().used_storage_cache_size(), 36 /* bytes */);
+		assert_eq!(shared.read().used_storage_cache_size(), 36 /* bytes */);
 
 		let key = H256::random()[..].to_vec();
 		s.cache.sync_cache(
@@ -1326,7 +1335,7 @@ mod tests {
 			true,
 		);
 		// 32 key, 2 byte size
-		assert_eq!(shared.lock().used_storage_cache_size(), 34 /* bytes */);
+		assert_eq!(shared.read().used_storage_cache_size(), 34 /* bytes */);
 	}
 
 	#[test]
@@ -1379,7 +1388,7 @@ mod tests {
 
 		// Restart (or unknown block?), clear caches.
 		{
-			let mut cache = s.cache.shared_cache.lock();
+			let mut cache = s.cache.shared_cache.write();
 			let cache = &mut *cache;
 			cache.lru_storage.clear();
 			cache.lru_hashes.clear();
@@ -1426,7 +1435,7 @@ mod tests {
 			Some(1),
 			true,
 		);
-		assert_eq!(shared.lock().lru_storage.get(&key).unwrap(), &Some(vec![1]));
+		assert_eq!(shared.write().lru_storage.get(&key).unwrap(), &Some(vec![1]));
 
 		let mut s = CachingState::new(
 			InMemoryBackend::<BlakeTwo256>::default(),
@@ -1445,7 +1454,7 @@ mod tests {
 			false,
 		);
 
-		assert_eq!(shared.lock().lru_storage.get(&key).unwrap(), &Some(vec![1]));
+		assert_eq!(shared.write().lru_storage.get(&key).unwrap(), &Some(vec![1]));
 
 		let mut s = CachingState::new(
 			InMemoryBackend::<BlakeTwo256>::default(),
@@ -1800,7 +1809,7 @@ mod qc {
 
 							std::mem::swap(fork_chain, &mut new_fork);
 
-							self.shared.lock().sync(&retracted, &enacted);
+							self.shared.write().sync(&retracted, &enacted);
 
 							self.head_state(
 								self.canon.last()

From 846cd08dcef98110ec37b3f8710207d695dadb28 Mon Sep 17 00:00:00 2001
From: Qinxuan Chen <koushiro.cqx@gmail.com>
Date: Thu, 15 Jul 2021 05:30:31 +0800
Subject: [PATCH 0991/1194] Migrate `pallet-mmr` to the new pallet attribute
 macro (#9181)

* Migrate pallet-mmr to the new pallet attribute macro

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* fix typo

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* use instance macro

Co-authored-by: thiolliere <gui.thiolliere@gmail.com>
---
 frame/merkle-mountain-range/Cargo.toml        |  19 ++-
 .../primitives/Cargo.toml                     |  14 +-
 frame/merkle-mountain-range/rpc/Cargo.toml    |   4 +-
 frame/merkle-mountain-range/rpc/src/lib.rs    |   1 +
 .../merkle-mountain-range/src/benchmarking.rs |  10 +-
 frame/merkle-mountain-range/src/lib.rs        | 160 ++++++++++--------
 frame/merkle-mountain-range/src/mmr/mmr.rs    |  10 +-
 .../merkle-mountain-range/src/mmr/storage.rs  |  18 +-
 frame/merkle-mountain-range/src/mmr/utils.rs  |   2 +-
 frame/merkle-mountain-range/src/mock.rs       |   2 +-
 frame/merkle-mountain-range/src/tests.rs      |  24 +--
 11 files changed, 144 insertions(+), 120 deletions(-)

diff --git a/frame/merkle-mountain-range/Cargo.toml b/frame/merkle-mountain-range/Cargo.toml
index 03b80a3339e7..28de91b0604e 100644
--- a/frame/merkle-mountain-range/Cargo.toml
+++ b/frame/merkle-mountain-range/Cargo.toml
@@ -13,16 +13,19 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
-frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
-frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 mmr-lib = { package = "ckb-merkle-mountain-range", default-features = false, version = "0.3.1" }
-pallet-mmr-primitives = { version = "4.0.0-dev", default-features = false, path = "./primitives" }
+
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
 sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
+
+pallet-mmr-primitives = { version = "4.0.0-dev", default-features = false, path = "./primitives" }
+
 [dev-dependencies]
 env_logger = "0.8"
 hex-literal = "0.3"
@@ -31,15 +34,15 @@ hex-literal = "0.3"
 default = ["std"]
 std = [
 	"codec/std",
-	"frame-benchmarking/std",
-	"frame-support/std",
-	"frame-system/std",
 	"mmr-lib/std",
-	"pallet-mmr-primitives/std",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
+	"frame-benchmarking/std",
+	"frame-support/std",
+	"frame-system/std",
+	"pallet-mmr-primitives/std",
 ]
 runtime-benchmarks = ["frame-benchmarking"]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/merkle-mountain-range/primitives/Cargo.toml b/frame/merkle-mountain-range/primitives/Cargo.toml
index 04b744ffb0ab..07b2f8ae3a3a 100644
--- a/frame/merkle-mountain-range/primitives/Cargo.toml
+++ b/frame/merkle-mountain-range/primitives/Cargo.toml
@@ -13,14 +13,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-frame-support = { version = "4.0.0-dev", default-features = false, path = "../../support" }
-frame-system = { version = "4.0.0-dev", default-features = false, path = "../../system" }
+log = { version = "0.4.14", default-features = false }
 serde = { version = "1.0.126", optional = true, features = ["derive"] }
+
 sp-api = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/api" }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/core" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/runtime" }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/std" }
-log = { version = "0.4.14", default-features = false }
+
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../../support" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../../system" }
 
 [dev-dependencies]
 hex-literal = "0.3"
@@ -29,12 +31,12 @@ hex-literal = "0.3"
 default = ["std"]
 std = [
 	"codec/std",
-	"frame-support/std",
-	"frame-system/std",
+	"log/std",
 	"serde",
 	"sp-api/std",
 	"sp-core/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"log/std",
+	"frame-support/std",
+	"frame-system/std",
 ]
diff --git a/frame/merkle-mountain-range/rpc/Cargo.toml b/frame/merkle-mountain-range/rpc/Cargo.toml
index b99a8f35c081..637abe60c2e4 100644
--- a/frame/merkle-mountain-range/rpc/Cargo.toml
+++ b/frame/merkle-mountain-range/rpc/Cargo.toml
@@ -17,13 +17,15 @@ codec = { package = "parity-scale-codec", version = "2.0.0" }
 jsonrpc-core = "15.1.0"
 jsonrpc-core-client = "15.1.0"
 jsonrpc-derive = "15.1.0"
-pallet-mmr-primitives = { version = "4.0.0-dev", path = "../primitives" }
 serde = { version = "1.0.126", features = ["derive"] }
+
 sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
 sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
 sp-rpc = { version = "4.0.0-dev", path = "../../../primitives/rpc" }
 sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
 
+pallet-mmr-primitives = { version = "4.0.0-dev", path = "../primitives" }
+
 [dev-dependencies]
 serde_json = "1.0.41"
diff --git a/frame/merkle-mountain-range/rpc/src/lib.rs b/frame/merkle-mountain-range/rpc/src/lib.rs
index 5277f4fa475f..fb46fc6280b8 100644
--- a/frame/merkle-mountain-range/rpc/src/lib.rs
+++ b/frame/merkle-mountain-range/rpc/src/lib.rs
@@ -25,6 +25,7 @@ use codec::{Codec, Encode};
 use jsonrpc_core::{Error, ErrorCode, Result};
 use jsonrpc_derive::rpc;
 use serde::{Deserialize, Serialize};
+
 use sp_api::ProvideRuntimeApi;
 use sp_blockchain::HeaderBackend;
 use sp_core::Bytes;
diff --git a/frame/merkle-mountain-range/src/benchmarking.rs b/frame/merkle-mountain-range/src/benchmarking.rs
index f64e2e39aaa4..af7531a00bdc 100644
--- a/frame/merkle-mountain-range/src/benchmarking.rs
+++ b/frame/merkle-mountain-range/src/benchmarking.rs
@@ -21,24 +21,24 @@
 
 use crate::*;
 use frame_support::traits::OnInitialize;
-use frame_benchmarking::{benchmarks, impl_benchmark_test_suite};
+use frame_benchmarking::{benchmarks_instance_pallet, impl_benchmark_test_suite};
 
-benchmarks! {
+benchmarks_instance_pallet! {
 	on_initialize {
 		let x in 1 .. 1_000;
 
 		let leaves = x as u64;
 	}: {
 		for b in 0..leaves {
-			Module::<T>::on_initialize((b as u32).into());
+			Pallet::<T, I>::on_initialize((b as u32).into());
 		}
 	} verify {
-		assert_eq!(crate::NumberOfLeaves::<DefaultInstance>::get(), leaves);
+		assert_eq!(crate::NumberOfLeaves::<T, I>::get(), leaves);
 	}
 }
 
 impl_benchmark_test_suite!(
-	Module,
+	Pallet,
 	crate::tests::new_test_ext(),
 	crate::mock::Test,
 );
diff --git a/frame/merkle-mountain-range/src/lib.rs b/frame/merkle-mountain-range/src/lib.rs
index a8e707c7ac4e..307326b59b65 100644
--- a/frame/merkle-mountain-range/src/lib.rs
+++ b/frame/merkle-mountain-range/src/lib.rs
@@ -58,10 +58,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use codec::Encode;
-use frame_support::{
-	decl_module, decl_storage,
-	weights::Weight,
-};
+use frame_support::weights::Weight;
 use sp_runtime::traits;
 
 mod default_weights;
@@ -74,86 +71,105 @@ mod mock;
 mod tests;
 
 pub use pallet_mmr_primitives as primitives;
+pub use pallet::*;
 
 pub trait WeightInfo {
 	fn on_initialize(peaks: u64) -> Weight;
 }
 
-/// This pallet's configuration trait
-pub trait Config<I = DefaultInstance>: frame_system::Config {
-	/// Prefix for elements stored in the Off-chain DB via Indexing API.
-	///
-	/// Each node of the MMR is inserted both on-chain and off-chain via Indexing API.
-	/// The former does not store full leaf content, just it's compact version (hash),
-	/// and some of the inner mmr nodes might be pruned from on-chain storage.
-	/// The later will contain all the entries in their full form.
-	///
-	/// Each node is stored in the Off-chain DB under key derived from the [`Self::INDEXING_PREFIX`] and
-	/// it's in-tree index (MMR position).
-	const INDEXING_PREFIX: &'static [u8];
-
-	/// A hasher type for MMR.
-	///
-	/// To construct trie nodes that result in merging (bagging) two peaks, depending on the node
-	/// kind we take either:
-	/// - The node (hash) itself if it's an inner node.
-	/// - The hash of SCALE-encoding of the leaf data if it's a leaf node.
-	///
-	/// Then we create a tuple of these two hashes, SCALE-encode it (concatenate) and
-	/// hash, to obtain a new MMR inner node - the new peak.
-	type Hashing: traits::Hash<Output = <Self as Config<I>>::Hash>;
-
-	/// The hashing output type.
-	///
-	/// This type is actually going to be stored in the MMR.
-	/// Required to be provided again, to satisfy trait bounds for storage items.
-	type Hash: traits::Member + traits::MaybeSerializeDeserialize + sp_std::fmt::Debug
-		+ sp_std::hash::Hash + AsRef<[u8]> + AsMut<[u8]> + Copy + Default + codec::Codec
-		+ codec::EncodeLike;
+#[frame_support::pallet]
+pub mod pallet {
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+	use super::*;
 
-	/// Data stored in the leaf nodes.
-	///
-	/// The [LeafData](primitives::LeafDataProvider) is responsible for returning the entire leaf
-	/// data that will be inserted to the MMR.
-	/// [LeafDataProvider](primitives::LeafDataProvider)s can be composed into tuples to put
-	/// multiple elements into the tree. In such a case it might be worth using [primitives::Compact]
-	/// to make MMR proof for one element of the tuple leaner.
-	///
-	/// Note that the leaf at each block MUST be unique. You may want to include a block hash or block
-	/// number as an easiest way to ensure that.
-	type LeafData: primitives::LeafDataProvider;
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T, I = ()>(PhantomData<(T, I)>);
 
-	/// A hook to act on the new MMR root.
-	///
-	/// For some applications it might be beneficial to make the MMR root available externally
-	/// apart from having it in the storage. For instance you might output it in the header digest
-	/// (see [`frame_system::Pallet::deposit_log`]) to make it available for Light Clients.
-	/// Hook complexity should be `O(1)`.
-	type OnNewRoot: primitives::OnNewRoot<<Self as Config<I>>::Hash>;
+	/// This pallet's configuration trait
+	#[pallet::config]
+	pub trait Config<I: 'static = ()>: frame_system::Config {
+		/// Prefix for elements stored in the Off-chain DB via Indexing API.
+		///
+		/// Each node of the MMR is inserted both on-chain and off-chain via Indexing API.
+		/// The former does not store full leaf content, just it's compact version (hash),
+		/// and some of the inner mmr nodes might be pruned from on-chain storage.
+		/// The latter will contain all the entries in their full form.
+		///
+		/// Each node is stored in the Off-chain DB under key derived from the [`Self::INDEXING_PREFIX`] and
+		/// it's in-tree index (MMR position).
+		const INDEXING_PREFIX: &'static [u8];
 
-	/// Weights for this pallet.
-	type WeightInfo: WeightInfo;
-}
+		/// A hasher type for MMR.
+		///
+		/// To construct trie nodes that result in merging (bagging) two peaks, depending on the node
+		/// kind we take either:
+		/// - The node (hash) itself if it's an inner node.
+		/// - The hash of SCALE-encoding of the leaf data if it's a leaf node.
+		///
+		/// Then we create a tuple of these two hashes, SCALE-encode it (concatenate) and
+		/// hash, to obtain a new MMR inner node - the new peak.
+		type Hashing: traits::Hash<Output = <Self as Config<I>>::Hash>;
 
-decl_storage! {
-	trait Store for Module<T: Config<I>, I: Instance = DefaultInstance> as MerkleMountainRange {
-		/// Latest MMR Root hash.
-		pub RootHash get(fn mmr_root_hash): <T as Config<I>>::Hash;
+		/// The hashing output type.
+		///
+		/// This type is actually going to be stored in the MMR.
+		/// Required to be provided again, to satisfy trait bounds for storage items.
+		type Hash: traits::Member + traits::MaybeSerializeDeserialize + sp_std::fmt::Debug
+			+ sp_std::hash::Hash + AsRef<[u8]> + AsMut<[u8]> + Copy + Default + codec::Codec
+			+ codec::EncodeLike;
 
-		/// Current size of the MMR (number of leaves).
-		pub NumberOfLeaves get(fn mmr_leaves): u64;
+		/// Data stored in the leaf nodes.
+		///
+		/// The [LeafData](primitives::LeafDataProvider) is responsible for returning the entire leaf
+		/// data that will be inserted to the MMR.
+		/// [LeafDataProvider](primitives::LeafDataProvider)s can be composed into tuples to put
+		/// multiple elements into the tree. In such a case it might be worth using [primitives::Compact]
+		/// to make MMR proof for one element of the tuple leaner.
+		///
+		/// Note that the leaf at each block MUST be unique. You may want to include a block hash or block
+		/// number as an easiest way to ensure that.
+		type LeafData: primitives::LeafDataProvider;
 
-		/// Hashes of the nodes in the MMR.
+		/// A hook to act on the new MMR root.
 		///
-		/// Note this collection only contains MMR peaks, the inner nodes (and leaves)
-		/// are pruned and only stored in the Offchain DB.
-		pub Nodes get(fn mmr_peak): map hasher(identity) u64 => Option<<T as Config<I>>::Hash>;
+		/// For some applications it might be beneficial to make the MMR root available externally
+		/// apart from having it in the storage. For instance you might output it in the header digest
+		/// (see [`frame_system::Pallet::deposit_log`]) to make it available for Light Clients.
+		/// Hook complexity should be `O(1)`.
+		type OnNewRoot: primitives::OnNewRoot<<Self as Config<I>>::Hash>;
+
+		/// Weights for this pallet.
+		type WeightInfo: WeightInfo;
 	}
-}
 
-decl_module! {
-	/// A public part of the pallet.
-	pub struct Module<T: Config<I>, I: Instance = DefaultInstance> for enum Call where origin: T::Origin {
+	/// Latest MMR Root hash.
+	#[pallet::storage]
+	#[pallet::getter(fn mmr_root_hash)]
+	pub type RootHash<T: Config<I>, I: 'static = ()> = StorageValue<_, <T as Config<I>>::Hash, ValueQuery>;
+
+	/// Current size of the MMR (number of leaves).
+	#[pallet::storage]
+	#[pallet::getter(fn mmr_leaves)]
+	pub type NumberOfLeaves<T, I = ()> = StorageValue<_, u64, ValueQuery>;
+
+	/// Hashes of the nodes in the MMR.
+	///
+	/// Note this collection only contains MMR peaks, the inner nodes (and leaves)
+	/// are pruned and only stored in the Offchain DB.
+	#[pallet::storage]
+	#[pallet::getter(fn mmr_peak)]
+	pub type Nodes<T: Config<I>, I: 'static = ()> = StorageMap<
+		_,
+		Identity,
+		u64,
+		<T as Config<I>>::Hash,
+		OptionQuery
+	>;
+
+	#[pallet::hooks]
+	impl<T: Config<I>, I: 'static> Hooks<BlockNumberFor<T>> for Pallet<T, I> {
 		fn on_initialize(_n: T::BlockNumber) -> Weight {
 			use primitives::LeafDataProvider;
 			let leaves = Self::mmr_leaves();
@@ -167,7 +183,7 @@ decl_module! {
 			let (leaves, root) = mmr.finalize().expect("MMR finalize never fails.");
 			<T::OnNewRoot as primitives::OnNewRoot<_>>::on_new_root(&root);
 
-			<NumberOfLeaves>::put(leaves);
+			<NumberOfLeaves<T, I>>::put(leaves);
 			<RootHash<T, I>>::put(root);
 
 			let peaks_after = mmr::utils::NodesUtils::new(leaves).number_of_peaks();
@@ -207,7 +223,7 @@ pub fn verify_leaf_proof<H, L>(
 	}
 }
 
-impl<T: Config<I>, I: Instance> Module<T, I> {
+impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	fn offchain_key(pos: u64) -> sp_std::prelude::Vec<u8> {
 		(T::INDEXING_PREFIX, pos).encode()
 	}
diff --git a/frame/merkle-mountain-range/src/mmr/mmr.rs b/frame/merkle-mountain-range/src/mmr/mmr.rs
index a3d373bfd2e9..53b76ba8000a 100644
--- a/frame/merkle-mountain-range/src/mmr/mmr.rs
+++ b/frame/merkle-mountain-range/src/mmr/mmr.rs
@@ -16,7 +16,7 @@
 // limitations under the License.
 
 use crate::{
-	Config, HashingOf, Instance,
+	Config, HashingOf,
 	mmr::{
 		Node, NodeOf, Hasher,
 		storage::{Storage, OffchainStorage, RuntimeStorage},
@@ -58,7 +58,7 @@ pub fn verify_leaf_proof<H, L>(
 /// vs [Off-chain](crate::mmr::storage::OffchainStorage)).
 pub struct Mmr<StorageType, T, I, L> where
 	T: Config<I>,
-	I: Instance,
+	I: 'static,
 	L: primitives::FullLeaf,
 	Storage<StorageType, T, I, L>: mmr_lib::MMRStore<NodeOf<T, I, L>>,
 {
@@ -72,7 +72,7 @@ pub struct Mmr<StorageType, T, I, L> where
 
 impl<StorageType, T, I, L> Mmr<StorageType, T, I, L> where
 	T: Config<I>,
-	I: Instance,
+	I: 'static,
 	L: primitives::FullLeaf,
 	Storage<StorageType, T, I, L>: mmr_lib::MMRStore<NodeOf<T, I, L>>,
 {
@@ -116,7 +116,7 @@ impl<StorageType, T, I, L> Mmr<StorageType, T, I, L> where
 /// Runtime specific MMR functions.
 impl<T, I, L> Mmr<RuntimeStorage, T, I, L> where
 	T: Config<I>,
-	I: Instance,
+	I: 'static,
 	L: primitives::FullLeaf,
 {
 
@@ -145,7 +145,7 @@ impl<T, I, L> Mmr<RuntimeStorage, T, I, L> where
 /// Off-chain specific MMR functions.
 impl<T, I, L> Mmr<OffchainStorage, T, I, L> where
 	T: Config<I>,
-	I: Instance,
+	I: 'static,
 	L: primitives::FullLeaf + codec::Decode,
 {
 	/// Generate a proof for given leaf index.
diff --git a/frame/merkle-mountain-range/src/mmr/storage.rs b/frame/merkle-mountain-range/src/mmr/storage.rs
index 021c0716b12e..65fe19556630 100644
--- a/frame/merkle-mountain-range/src/mmr/storage.rs
+++ b/frame/merkle-mountain-range/src/mmr/storage.rs
@@ -18,12 +18,12 @@
 //! A MMR storage implementations.
 
 use codec::Encode;
-use crate::mmr::{NodeOf, Node};
-use crate::{NumberOfLeaves, Nodes, Module, Config, Instance, primitives};
-use frame_support::{StorageMap, StorageValue};
 #[cfg(not(feature = "std"))]
 use sp_std::prelude::Vec;
 
+use crate::mmr::{NodeOf, Node};
+use crate::{NumberOfLeaves, Nodes, Pallet, Config, primitives};
+
 /// A marker type for runtime-specific storage implementation.
 ///
 /// Allows appending new items to the MMR and proof verification.
@@ -56,11 +56,11 @@ impl<StorageType, T, I, L> Default for Storage<StorageType, T, I, L> {
 
 impl<T, I, L> mmr_lib::MMRStore<NodeOf<T, I, L>> for Storage<OffchainStorage, T, I, L> where
 	T: Config<I>,
-	I: Instance,
+	I: 'static,
 	L: primitives::FullLeaf + codec::Decode,
 {
 	fn get_elem(&self, pos: u64) -> mmr_lib::Result<Option<NodeOf<T, I, L>>> {
-		let key = Module::<T, I>::offchain_key(pos);
+		let key = Pallet::<T, I>::offchain_key(pos);
 		// Retrieve the element from Off-chain DB.
 		Ok(sp_io::offchain
 			::local_storage_get(sp_core::offchain::StorageKind::PERSISTENT, &key)
@@ -74,7 +74,7 @@ impl<T, I, L> mmr_lib::MMRStore<NodeOf<T, I, L>> for Storage<OffchainStorage, T,
 
 impl<T, I, L> mmr_lib::MMRStore<NodeOf<T, I, L>> for Storage<RuntimeStorage, T, I, L> where
 	T: Config<I>,
-	I: Instance,
+	I: 'static,
 	L: primitives::FullLeaf,
 {
 	fn get_elem(&self, pos: u64) -> mmr_lib::Result<Option<NodeOf<T, I, L>>> {
@@ -84,7 +84,7 @@ impl<T, I, L> mmr_lib::MMRStore<NodeOf<T, I, L>> for Storage<RuntimeStorage, T,
 	}
 
 	fn append(&mut self, pos: u64, elems: Vec<NodeOf<T, I, L>>) -> mmr_lib::Result<()> {
-		let mut leaves = crate::NumberOfLeaves::<I>::get();
+		let mut leaves = crate::NumberOfLeaves::<T, I>::get();
 		let mut size = crate::mmr::utils::NodesUtils::new(leaves).size();
 		if pos != size {
 			return Err(mmr_lib::Error::InconsistentStore);
@@ -94,7 +94,7 @@ impl<T, I, L> mmr_lib::MMRStore<NodeOf<T, I, L>> for Storage<RuntimeStorage, T,
 			// on-chain we only store the hash (even if it's a leaf)
 			<Nodes<T, I>>::insert(size, elem.hash());
 			// Indexing API is used to store the full leaf content.
-			let key = Module::<T, I>::offchain_key(size);
+			let key = Pallet::<T, I>::offchain_key(size);
 			elem.using_encoded(|elem| sp_io::offchain_index::set(&key, elem));
 			size += 1;
 
@@ -103,7 +103,7 @@ impl<T, I, L> mmr_lib::MMRStore<NodeOf<T, I, L>> for Storage<RuntimeStorage, T,
 			}
 		}
 
-		NumberOfLeaves::<I>::put(leaves);
+		NumberOfLeaves::<T, I>::put(leaves);
 
 		Ok(())
 	}
diff --git a/frame/merkle-mountain-range/src/mmr/utils.rs b/frame/merkle-mountain-range/src/mmr/utils.rs
index e966367b71f2..34ae6e1a3c78 100644
--- a/frame/merkle-mountain-range/src/mmr/utils.rs
+++ b/frame/merkle-mountain-range/src/mmr/utils.rs
@@ -114,7 +114,7 @@ mod tests {
 				let mut mmr = crate::mmr::Mmr::<
 					crate::mmr::storage::RuntimeStorage,
 					crate::mock::Test,
-					crate::DefaultInstance,
+					_,
 					_,
 				>::new(0);
 				for i in 0..*s {
diff --git a/frame/merkle-mountain-range/src/mock.rs b/frame/merkle-mountain-range/src/mock.rs
index 0d89021ae966..cfd8212e6984 100644
--- a/frame/merkle-mountain-range/src/mock.rs
+++ b/frame/merkle-mountain-range/src/mock.rs
@@ -41,7 +41,7 @@ frame_support::construct_runtime!(
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-		MMR: pallet_mmr::{Pallet, Call, Storage},
+		MMR: pallet_mmr::{Pallet, Storage},
 	}
 );
 
diff --git a/frame/merkle-mountain-range/src/tests.rs b/frame/merkle-mountain-range/src/tests.rs
index dfaf60ef2eab..5640468ac93a 100644
--- a/frame/merkle-mountain-range/src/tests.rs
+++ b/frame/merkle-mountain-range/src/tests.rs
@@ -91,14 +91,14 @@ fn should_start_empty() {
 			crate::RootHash::<Test>::get(),
 			"0000000000000000000000000000000000000000000000000000000000000000".parse().unwrap()
 		);
-		assert_eq!(crate::NumberOfLeaves::<DefaultInstance>::get(), 0);
+		assert_eq!(crate::NumberOfLeaves::<Test>::get(), 0);
 		assert_eq!(crate::Nodes::<Test>::get(0), None);
 
 		// when
 		let weight = new_block();
 
 		// then
-		assert_eq!(crate::NumberOfLeaves::<DefaultInstance>::get(), 1);
+		assert_eq!(crate::NumberOfLeaves::<Test>::get(), 1);
 		assert_eq!(crate::Nodes::<Test>::get(0),
 			Some(hex("4320435e8c3318562dba60116bdbcc0b82ffcecb9bb39aae3300cfda3ad0b8b0")));
 		assert_eq!(
@@ -119,7 +119,7 @@ fn should_append_to_mmr_when_on_initialize_is_called() {
 		new_block();
 
 		// then
-		assert_eq!(crate::NumberOfLeaves::<DefaultInstance>::get(), 2);
+		assert_eq!(crate::NumberOfLeaves::<Test>::get(), 2);
 		assert_eq!((
 			crate::Nodes::<Test>::get(0),
 			crate::Nodes::<Test>::get(1),
@@ -160,7 +160,7 @@ fn should_construct_larger_mmr_correctly() {
 		init_chain(7);
 
 		// then
-		assert_eq!(crate::NumberOfLeaves::<DefaultInstance>::get(), 7);
+		assert_eq!(crate::NumberOfLeaves::<Test>::get(), 7);
 		assert_eq!((
 			crate::Nodes::<Test>::get(0),
 			crate::Nodes::<Test>::get(10),
@@ -186,9 +186,9 @@ fn should_generate_proofs_correctly() {
 	register_offchain_ext(&mut ext);
 	ext.execute_with(|| {
 		// when generate proofs for all leaves
-		let proofs = (0_u64..crate::NumberOfLeaves::<DefaultInstance>::get())
+		let proofs = (0_u64..crate::NumberOfLeaves::<Test>::get())
 			.into_iter()
-			.map(|leaf_index| crate::Module::<Test>::generate_proof(leaf_index).unwrap())
+			.map(|leaf_index| crate::Pallet::<Test>::generate_proof(leaf_index).unwrap())
 			.collect::<Vec<_>>();
 
 		// then
@@ -245,7 +245,7 @@ fn should_verify() {
 	register_offchain_ext(&mut ext);
 	let (leaf, proof5) = ext.execute_with(|| {
 		// when
-		crate::Module::<Test>::generate_proof(5).unwrap()
+		crate::Pallet::<Test>::generate_proof(5).unwrap()
 	});
 
 	// Now to verify the proof, we really shouldn't require offchain storage or extension.
@@ -255,7 +255,7 @@ fn should_verify() {
 	ext2.execute_with(|| {
 		init_chain(7);
 		// then
-		assert_eq!(crate::Module::<Test>::verify_leaf(leaf, proof5), Ok(()));
+		assert_eq!(crate::Pallet::<Test>::verify_leaf(leaf, proof5), Ok(()));
 	});
 }
 
@@ -274,9 +274,9 @@ fn verification_should_be_stateless() {
 	register_offchain_ext(&mut ext);
 	let (leaf, proof5) = ext.execute_with(|| {
 		// when
-		crate::Module::<Test>::generate_proof(5).unwrap()
+		crate::Pallet::<Test>::generate_proof(5).unwrap()
 	});
-	let root = ext.execute_with(|| crate::Module::<Test>::mmr_root_hash());
+	let root = ext.execute_with(|| crate::Pallet::<Test>::mmr_root_hash());
 
 	// Verify proof without relying on any on-chain data.
 	let leaf = crate::primitives::DataOrHash::Data(leaf);
@@ -295,10 +295,10 @@ fn should_verify_on_the_next_block_since_there_is_no_pruning_yet() {
 
 	ext.execute_with(|| {
 		// when
-		let (leaf, proof5) = crate::Module::<Test>::generate_proof(5).unwrap();
+		let (leaf, proof5) = crate::Pallet::<Test>::generate_proof(5).unwrap();
 		new_block();
 
 		// then
-		assert_eq!(crate::Module::<Test>::verify_leaf(leaf, proof5), Ok(()));
+		assert_eq!(crate::Pallet::<Test>::verify_leaf(leaf, proof5), Ok(()));
 	});
 }

From 0c971e0e154efe7918cc687ab99d477901fb4219 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Thu, 15 Jul 2021 12:02:32 +0200
Subject: [PATCH 0992/1194] contracts: Way to many locals where generated for
 benchmarks (fixed that) (#9353)

---
 frame/contracts/src/benchmarking/code.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frame/contracts/src/benchmarking/code.rs b/frame/contracts/src/benchmarking/code.rs
index 6faba8a2e064..cd13e3be6df3 100644
--- a/frame/contracts/src/benchmarking/code.rs
+++ b/frame/contracts/src/benchmarking/code.rs
@@ -508,7 +508,7 @@ pub mod body {
 	/// Replace the locals of the supplied `body` with `num` i64 locals.
 	pub fn inject_locals(body: &mut FuncBody, num: u32) {
 		use self::elements::Local;
-		*body.locals_mut() = (0..num).map(|i| Local::new(i, ValueType::I64)).collect()
+		*body.locals_mut() = vec![Local::new(num, ValueType::I64)];
 	}
 }
 

From fe663ed0e982e9a767a15d548f663dc0df294ca7 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Fri, 16 Jul 2021 09:24:26 +0200
Subject: [PATCH 0993/1194] Fix invalid link in doc (#9351)

* fix invalid link

* Update client/executor/common/src/runtime_blob/globals_snapshot.rs

* more fix
---
 .../src/runtime_blob/globals_snapshot.rs      |  4 ++-
 client/executor/wasmtime/src/runtime.rs       | 14 +++++-----
 client/network/src/config.rs                  |  4 +--
 .../src/light_client_requests/handler.rs      |  3 ++-
 .../src/light_client_requests/sender.rs       |  7 ++---
 frame/contracts/rpc/runtime-api/src/lib.rs    |  4 +--
 .../election-provider-multi-phase/src/lib.rs  |  2 +-
 frame/elections-phragmen/src/lib.rs           |  5 ++--
 frame/elections/src/lib.rs                    | 26 +++++++++++++------
 frame/scheduler/src/lib.rs                    |  2 +-
 frame/session/src/lib.rs                      |  2 +-
 frame/staking/src/lib.rs                      | 10 +++----
 test-utils/test-runner/src/client.rs          |  4 +--
 13 files changed, 52 insertions(+), 35 deletions(-)

diff --git a/client/executor/common/src/runtime_blob/globals_snapshot.rs b/client/executor/common/src/runtime_blob/globals_snapshot.rs
index a43814e1d4e1..acdefef2e64e 100644
--- a/client/executor/common/src/runtime_blob/globals_snapshot.rs
+++ b/client/executor/common/src/runtime_blob/globals_snapshot.rs
@@ -47,7 +47,9 @@ pub trait InstanceGlobals {
 /// A set of exposed mutable globals.
 ///
 /// This is set of globals required to create a [`GlobalsSnapshot`] and that are collected from
-/// a runtime blob that was instrumented by [`InstrumentModule::expose_mutable_globals`].
+/// a runtime blob that was instrumented by
+/// [`RuntimeBlob::expose_mutable_globals`](super::RuntimeBlob::expose_mutable_globals`).
+
 ///
 /// If the code wasn't instrumented then it would be empty and snapshot would do nothing.
 pub struct ExposedMutableGlobalsSet(Vec<String>);
diff --git a/client/executor/wasmtime/src/runtime.rs b/client/executor/wasmtime/src/runtime.rs
index 8389bb087603..0a3c0488a247 100644
--- a/client/executor/wasmtime/src/runtime.rs
+++ b/client/executor/wasmtime/src/runtime.rs
@@ -296,8 +296,8 @@ pub struct DeterministicStackLimit {
 	/// after translation into machine code. It is also not quite trivial.
 	///
 	/// Therefore, this number should be choosen conservatively. It must be so large so that it can
-	/// fit the [`logical_max`] logical values on the stack, according to the current instrumentation
-	/// algorithm.
+	/// fit the [`logical_max`](Self::logical_max) logical values on the stack, according to the current
+	/// instrumentation algorithm.
 	///
 	/// This value cannot be 0.
 	pub native_stack_max: u32,
@@ -315,8 +315,9 @@ pub struct Semantics {
 	/// This is not a problem for a standard substrate runtime execution because it's up to the
 	/// runtime itself to make sure that it doesn't involve any non-determinism.
 	///
-	/// Since this feature depends on instrumentation, it can be set only if [`CodeSupplyMode::Verbatim`]
-	/// is used.
+	/// Since this feature depends on instrumentation, it can be set only if runtime is
+	/// instantiated using the runtime blob, e.g. using [`create_runtime`].
+	// I.e. if [`CodeSupplyMode::Verbatim`] is used.
 	pub fast_instance_reuse: bool,
 
 	/// Specifiying `Some` will enable deterministic stack height. That is, all executor invocations
@@ -326,8 +327,9 @@ pub struct Semantics {
 	/// This is achieved by a combination of running an instrumentation pass on input code and
 	/// configuring wasmtime accordingly.
 	///
-	/// Since this feature depends on instrumentation, it can be set only if [`CodeSupplyMode::Verbatim`]
-	/// is used.
+	/// Since this feature depends on instrumentation, it can be set only if runtime is
+	/// instantiated using the runtime blob, e.g. using [`create_runtime`].
+	// I.e. if [`CodeSupplyMode::Verbatim`] is used.
 	pub deterministic_stack_limit: Option<DeterministicStackLimit>,
 
 	/// Controls whether wasmtime should compile floating point in a way that doesn't allow for
diff --git a/client/network/src/config.rs b/client/network/src/config.rs
index 36ae1e831b8c..a6aa5feea5bd 100644
--- a/client/network/src/config.rs
+++ b/client/network/src/config.rs
@@ -127,9 +127,9 @@ pub struct Params<B: BlockT, H: ExHashT> {
 	/// Request response configuration for the state request protocol.
 	///
 	/// Can be constructed either via
-	/// [`crate::state_requests::generate_protocol_config`] allowing outgoing but not
+	/// [`crate::block_request_handler::generate_protocol_config`] allowing outgoing but not
 	/// incoming requests, or constructed via
-	/// [`crate::state_requests::handler::StateRequestHandler::new`] allowing
+	/// [`crate::state_request_handler::StateRequestHandler::new`] allowing
 	/// both outgoing and incoming requests.
 	pub state_request_protocol_config: RequestResponseConfig,
 }
diff --git a/client/network/src/light_client_requests/handler.rs b/client/network/src/light_client_requests/handler.rs
index c0932a466418..1cfae0a3cb1d 100644
--- a/client/network/src/light_client_requests/handler.rs
+++ b/client/network/src/light_client_requests/handler.rs
@@ -19,7 +19,8 @@
 //! Helper for incoming light client requests.
 //!
 //! Handle (i.e. answer) incoming light client requests from a remote peer received via
-//! [`crate::request_responses::RequestResponsesBehaviour`] with [`LightClientRequestHandler`].
+//! [`crate::request_responses::RequestResponsesBehaviour`] with
+//! [`LightClientRequestHandler`](handler::LightClientRequestHandler).
 
 use codec::{self, Encode, Decode};
 use crate::{
diff --git a/client/network/src/light_client_requests/sender.rs b/client/network/src/light_client_requests/sender.rs
index 7cb224344a9a..77efa1b982e7 100644
--- a/client/network/src/light_client_requests/sender.rs
+++ b/client/network/src/light_client_requests/sender.rs
@@ -18,15 +18,16 @@
 
 //! Helper for outgoing light client requests.
 //!
-//! Call [`LightClientRequestSender::send_request`] to send out light client requests. It will:
+//! Call [`LightClientRequestSender::request`](sender::LightClientRequestSender::request)
+//! to send out light client requests. It will:
 //!
 //! 1. Build the request.
 //!
 //! 2. Forward the request to [`crate::request_responses::RequestResponsesBehaviour`] via
-//! [`OutEvent::SendRequest`].
+//! [`OutEvent::SendRequest`](sender::OutEvent::SendRequest).
 //!
 //! 3. Wait for the response and forward the response via the [`futures::channel::oneshot::Sender`] provided earlier
-//! with [`LightClientRequestSender::send_request`].
+//! with [`LightClientRequestSender::request`](sender::LightClientRequestSender::request).
 
 use codec::{self, Encode, Decode};
 use crate::{
diff --git a/frame/contracts/rpc/runtime-api/src/lib.rs b/frame/contracts/rpc/runtime-api/src/lib.rs
index 943931ec0c84..bb65e1b83739 100644
--- a/frame/contracts/rpc/runtime-api/src/lib.rs
+++ b/frame/contracts/rpc/runtime-api/src/lib.rs
@@ -39,7 +39,7 @@ sp_api::decl_runtime_apis! {
 	{
 		/// Perform a call from a specified account to a given contract.
 		///
-		/// See [`pallet_contracts::Pallet::call`].
+		/// See `pallet_contracts::Pallet::call`.
 		fn call(
 			origin: AccountId,
 			dest: AccountId,
@@ -50,7 +50,7 @@ sp_api::decl_runtime_apis! {
 
 		/// Instantiate a new contract.
 		///
-		/// See [`pallet_contracts::Pallet::instantiate`].
+		/// See `pallet_contracts::Pallet::instantiate`.
 		fn instantiate(
 			origin: AccountId,
 			endowment: Balance,
diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index 65a31e8ee95d..d66b971d8073 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -126,7 +126,7 @@
 //!
 //! A call to `T::ElectionProvider::elect` is made, and `Ok(_)` cannot be returned, then the pallet
 //! proceeds to the [`Phase::Emergency`]. During this phase, any solution can be submitted from
-//! [`T::ForceOrigin`], without any checking. Once submitted, the forced solution is kept in
+//! [`Config::ForceOrigin`], without any checking. Once submitted, the forced solution is kept in
 //! [`QueuedSolution`] until the next call to `T::ElectionProvider::elect`, where it is returned and
 //! [`Phase`] goes back to `Off`.
 //!
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index db4af14328bf..a3232ac0d28f 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -402,8 +402,9 @@ pub mod pallet {
 		///   origin is removed as a runner-up.
 		/// - `origin` is a current member. In this case, the deposit is unreserved and origin is
 		///   removed as a member, consequently not being a candidate for the next round anymore.
-		///   Similar to [`remove_members`], if replacement runners exists, they are immediately
-		///   used. If the prime is renouncing, then no prime will exist until the next round.
+		///   Similar to [`remove_member`](Self::remove_member), if replacement runners exists,
+		///   they are immediately used. If the prime is renouncing, then no prime will exist until
+		///   the next round.
 		///
 		/// The dispatch origin of this call must be signed, and have one of the above roles.
 		///
diff --git a/frame/elections/src/lib.rs b/frame/elections/src/lib.rs
index b53671393562..54bdb1f90dde 100644
--- a/frame/elections/src/lib.rs
+++ b/frame/elections/src/lib.rs
@@ -484,8 +484,9 @@ pub mod pallet {
 		/// Set candidate approvals. Approval slots stay valid as long as candidates in those slots
 		/// are registered.
 		///
-		/// Locks `value` from the balance of `origin` indefinitely. Only [`retract_voter`] or
-		/// [`reap_inactive_voter`] can unlock the balance.
+		/// Locks `value` from the balance of `origin` indefinitely. Only
+		/// [`retract_voter`](Self::retract_voter) or
+		/// [`reap_inactive_voter`](Self::reap_inactive_voter) can unlock the balance.
 		///
 		/// `hint` argument is interpreted differently based on:
 		/// - if `origin` is setting approvals for the first time: The index will be checked for
@@ -493,7 +494,7 @@ pub mod pallet {
 		///   - if the hint is correctly pointing to a hole, no fee is deducted from `origin`.
 		///   - Otherwise, the call will succeed but the index is ignored and simply a push to the
 		///     last chunk with free space happens. If the new push causes a new chunk to be
-		///     created, a fee indicated by [`VotingFee`] is deducted.
+		///     created, a fee indicated by [`Config::VotingFee`] is deducted.
 		/// - if `origin` is already a voter: the index __must__ be valid and point to the correct
 		///   position of the `origin` in the current voters list.
 		///
@@ -521,7 +522,11 @@ pub mod pallet {
 		/// must now be either unregistered or registered to a candidate that registered the slot
 		/// after the voter gave their last approval set.
 		///
-		/// Both indices must be provided as explained in [`voter_at`] function.
+		/// Both indices must be provided according to the following principle:
+		/// Voter index does not take holes into account. This means that any account submitting an
+		/// index at any point in time should submit:
+		/// `VOTER_SET_SIZE * set_index + local_index`, meaning that you are ignoring all holes in
+		/// the first `set_index` sets.
 		///
 		/// May be called by anyone. Returns the voter deposit to `signed`.
 		///
@@ -596,9 +601,13 @@ pub mod pallet {
 
 		/// Remove a voter. All votes are cancelled and the voter deposit is returned.
 		///
-		/// The index must be provided as explained in [`voter_at`] function.
+		/// The index must be provided according to the following principle:
+		/// Voter index does not take holes into account. This means that any account submitting an
+		/// index at any point in time should submit:
+		/// `VOTER_SET_SIZE * set_index + local_index`, meaning that you are ignoring all holes in
+		/// the first `set_index` sets.
 		///
-		/// Also removes the lock on the balance of the voter. See [`do_set_approvals()`].
+		/// Also removes the lock on the balance of the voter.
 		///
 		/// # <weight>
 		/// - O(1).
@@ -624,8 +633,9 @@ pub mod pallet {
 		///
 		/// Account must have enough transferrable funds in it to pay the bond.
 		///
-		/// NOTE: if `origin` has already assigned approvals via [`set_approvals`],
-		/// it will NOT have any usable funds to pass candidacy bond and must first retract.
+		/// NOTE: if `origin` has already assigned approvals via
+		/// [`set_approvals`](Self::set_approvals), it will NOT have any usable funds to pass
+		/// candidacy bond and must first retract.
 		/// Note that setting approvals will lock the entire balance of the voter until
 		/// retraction or being reported.
 		///
diff --git a/frame/scheduler/src/lib.rs b/frame/scheduler/src/lib.rs
index a3520f3b21f7..f1abea29e153 100644
--- a/frame/scheduler/src/lib.rs
+++ b/frame/scheduler/src/lib.rs
@@ -461,7 +461,7 @@ pub mod pallet {
 		/// Schedule a named task after a delay.
 		///
 		/// # <weight>
-		/// Same as [`schedule_named`].
+		/// Same as [`schedule_named`](Self::schedule_named).
 		/// # </weight>
 		#[pallet::weight(<T as Config>::WeightInfo::schedule_named(T::MaxScheduledPerBlock::get()))]
 		pub fn schedule_named_after(
diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs
index 933aff02972f..5095ed015465 100644
--- a/frame/session/src/lib.rs
+++ b/frame/session/src/lib.rs
@@ -241,7 +241,7 @@ pub trait SessionManager<ValidatorId> {
 	/// Same as `new_session`, but it this should only be called at genesis.
 	///
 	/// The session manager might decide to treat this in a different way. Default impl is simply
-	/// using [`new_session`].
+	/// using [`new_session`](Self::new_session).
 	fn new_session_genesis(new_index: SessionIndex) -> Option<Vec<ValidatorId>> {
 		Self::new_session(new_index)
 	}
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 98db60d1b599..340e1a2a3f07 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -1204,7 +1204,7 @@ pub mod pallet {
 
 	/// The last planned session scheduled by the session pallet.
 	///
-	/// This is basically in sync with the call to [`SessionManager::new_session`].
+	/// This is basically in sync with the call to [`pallet_session::SessionManager::new_session`].
 	#[pallet::storage]
 	#[pallet::getter(fn current_planned_session)]
 	pub type CurrentPlannedSession<T> = StorageValue<_, SessionIndex, ValueQuery>;
@@ -1511,8 +1511,8 @@ pub mod pallet {
 		/// The dispatch origin for this call must be _Signed_ by the stash, not the controller.
 		///
 		/// Use this if there are additional funds in your stash account that you wish to bond.
-		/// Unlike [`bond`] or [`unbond`] this function does not impose any limitation on the amount
-		/// that can be added.
+		/// Unlike [`bond`](Self::bond) or [`unbond`](Self::unbond) this function does not impose any limitation
+		/// on the amount that can be added.
 		///
 		/// Emits `Bonded`.
 		///
@@ -1849,7 +1849,7 @@ pub mod pallet {
 		/// The dispatch origin must be Root.
 		///
 		/// # <weight>
-		/// Same as [`set_validator_count`].
+		/// Same as [`Self::set_validator_count`].
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::set_validator_count())]
 		pub fn increase_validator_count(
@@ -1866,7 +1866,7 @@ pub mod pallet {
 		/// The dispatch origin must be Root.
 		///
 		/// # <weight>
-		/// Same as [`set_validator_count`].
+		/// Same as [`Self::set_validator_count`].
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::set_validator_count())]
 		pub fn scale_validator_count(origin: OriginFor<T>, factor: Percent) -> DispatchResult {
diff --git a/test-utils/test-runner/src/client.rs b/test-utils/test-runner/src/client.rs
index 4c562fbc66ed..4cadfe58c605 100644
--- a/test-utils/test-runner/src/client.rs
+++ b/test-utils/test-runner/src/client.rs
@@ -64,7 +64,7 @@ pub enum ConfigOrChainSpec {
     /// Chain spec object
     ChainSpec(Box<dyn ChainSpec>, TaskExecutor)
 }
-/// Creates all the client parts you need for [`Node`]
+/// Creates all the client parts you need for [`Node`](crate::node::Node)
 pub fn client_parts<T>(config_or_chain_spec: ConfigOrChainSpec) -> Result<ClientParts<T>, sc_service::Error>
     where
         T: ChainInfo + 'static,
@@ -216,4 +216,4 @@ pub fn client_parts<T>(config_or_chain_spec: ConfigOrChainSpec) -> Result<Client
         command_sink,
         backend,
     ))
-}
\ No newline at end of file
+}

From 254bc43afa0db0a9d98ea92467845b6652c54de9 Mon Sep 17 00:00:00 2001
From: Keith Yeung <kungfukeith11@gmail.com>
Date: Fri, 16 Jul 2021 07:07:19 -0700
Subject: [PATCH 0994/1194] Emit error when Config part is imported but without
 the std feature (#9225)

* Emit error when Config part is imported but without the std feature

* Add UI test for missing std feature on GenesisConfig

* Update frame/support/test/Cargo.toml

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Remove unused imports

* Unify all dummy party checker macros

* Fix

* Dispaly pallet_path::GenesisConfig instead of PalletConfig in error message

* Revert changes to construct_runtime_ui.rs

* Add additional parameter for dummy part checker macro

* Apply suggestions from code review

* fix master merge: update version

* update Cargo.lock

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
---
 Cargo.lock                                    |  10 ++
 .../src/construct_runtime/expand/config.rs    |   5 +-
 .../procedural/src/dummy_part_checker.rs      |  72 +++---------
 .../src/pallet/expand/genesis_config.rs       | 109 +++++++++++++-----
 frame/support/test/Cargo.toml                 |   2 +
 frame/support/test/pallet/Cargo.toml          |  25 ++++
 frame/support/test/pallet/src/lib.rs          |  46 ++++++++
 .../no_std_genesis_config.rs                  |  24 ++++
 .../no_std_genesis_config.stderr              |  66 +++++++++++
 9 files changed, 269 insertions(+), 90 deletions(-)
 create mode 100644 frame/support/test/pallet/Cargo.toml
 create mode 100644 frame/support/test/pallet/src/lib.rs
 create mode 100644 frame/support/test/tests/construct_runtime_ui/no_std_genesis_config.rs
 create mode 100644 frame/support/test/tests/construct_runtime_ui/no_std_genesis_config.stderr

diff --git a/Cargo.lock b/Cargo.lock
index b552ac3f92b4..bd6bcff83fd5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1922,6 +1922,7 @@ version = "3.0.0"
 dependencies = [
  "frame-metadata",
  "frame-support",
+ "frame-support-test-pallet",
  "frame-system",
  "parity-scale-codec",
  "pretty_assertions 0.6.1",
@@ -1935,6 +1936,15 @@ dependencies = [
  "trybuild",
 ]
 
+[[package]]
+name = "frame-support-test-pallet"
+version = "4.0.0-dev"
+dependencies = [
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+]
+
 [[package]]
 name = "frame-system"
 version = "4.0.0-dev"
diff --git a/frame/support/procedural/src/construct_runtime/expand/config.rs b/frame/support/procedural/src/construct_runtime/expand/config.rs
index b87d3685beea..8dc2710b192d 100644
--- a/frame/support/procedural/src/construct_runtime/expand/config.rs
+++ b/frame/support/procedural/src/construct_runtime/expand/config.rs
@@ -18,7 +18,7 @@
 use crate::construct_runtime::Pallet;
 use inflector::Inflector;
 use proc_macro2::TokenStream;
-use quote::{format_ident, quote};
+use quote::{ToTokens, format_ident, quote};
 use syn::Ident;
 
 pub fn expand_outer_config(
@@ -35,6 +35,7 @@ pub fn expand_outer_config(
 		if let Some(pallet_entry) = decl.find_part("Config") {
 			let path = &decl.path;
 			let pallet_name = &decl.name;
+			let path_str = path.into_token_stream().to_string();
 			let config = format_ident!("{}Config", pallet_name);
 			let field_name = &Ident::new(
 				&pallet_name.to_string().to_snake_case(),
@@ -47,6 +48,8 @@ pub fn expand_outer_config(
 			build_storage_calls.extend(expand_config_build_storage_call(scrate, runtime, decl, &field_name));
 			query_genesis_config_part_macros.push(quote! {
 				#path::__substrate_genesis_config_check::is_genesis_config_defined!(#pallet_name);
+				#[cfg(feature = "std")]
+				#path::__substrate_genesis_config_check::is_std_enabled_for_genesis!(#pallet_name, #path_str);
 			});
 		}
 	}
diff --git a/frame/support/procedural/src/dummy_part_checker.rs b/frame/support/procedural/src/dummy_part_checker.rs
index 8bc893b3123f..f1649aebe970 100644
--- a/frame/support/procedural/src/dummy_part_checker.rs
+++ b/frame/support/procedural/src/dummy_part_checker.rs
@@ -9,96 +9,54 @@ pub fn generate_dummy_part_checker(input: TokenStream) -> TokenStream {
 
 	let count = COUNTER.with(|counter| counter.borrow_mut().inc());
 
-	let genesis_config_macro_ident = syn::Ident::new(
-		&format!("__is_genesis_config_defined_{}", count),
-		proc_macro2::Span::call_site(),
-	);
-	let event_macro_ident = syn::Ident::new(
-		&format!("__is_event_part_defined_{}", count),
-		proc_macro2::Span::call_site(),
-	);
-	let inherent_macro_ident = syn::Ident::new(
-		&format!("__is_inherent_part_defined_{}", count),
-		proc_macro2::Span::call_site(),
-	);
-	let validate_unsigned_macro_ident = syn::Ident::new(
-		&format!("__is_validate_unsigned_part_defined_{}", count),
-		proc_macro2::Span::call_site(),
-	);
-	let call_macro_ident = syn::Ident::new(
-		&format!("__is_call_part_defined_{}", count),
-		proc_macro2::Span::call_site(),
-	);
-	let origin_macro_ident = syn::Ident::new(
-		&format!("__is_origin_part_defined_{}", count),
+	let no_op_macro_ident = syn::Ident::new(
+		&format!("__dummy_part_checker_{}", count),
 		proc_macro2::Span::call_site(),
 	);
 
 	quote::quote!(
+		#[macro_export]
+		#[doc(hidden)]
+		macro_rules! #no_op_macro_ident {
+			( $( $tt:tt )* ) => {};
+		}
+
 		#[doc(hidden)]
 		pub mod __substrate_genesis_config_check {
-			#[macro_export]
 			#[doc(hidden)]
-			macro_rules! #genesis_config_macro_ident {
-				($pallet_name:ident) => {};
-			}
+			pub use #no_op_macro_ident as is_genesis_config_defined;
 			#[doc(hidden)]
-			pub use #genesis_config_macro_ident as is_genesis_config_defined;
+			pub use #no_op_macro_ident as is_std_enabled_for_genesis;
 		}
 
 		#[doc(hidden)]
 		pub mod __substrate_event_check {
-			#[macro_export]
-			#[doc(hidden)]
-			macro_rules! #event_macro_ident {
-				($pallet_name:ident) => {};
-			}
 			#[doc(hidden)]
-			pub use #event_macro_ident as is_event_part_defined;
+			pub use #no_op_macro_ident as is_event_part_defined;
 		}
 
 		#[doc(hidden)]
 		pub mod __substrate_inherent_check {
-			#[macro_export]
 			#[doc(hidden)]
-			macro_rules! #inherent_macro_ident {
-				($pallet_name:ident) => {};
-			}
-			#[doc(hidden)]
-			pub use #inherent_macro_ident as is_inherent_part_defined;
+			pub use #no_op_macro_ident as is_inherent_part_defined;
 		}
 
 		#[doc(hidden)]
 		pub mod __substrate_validate_unsigned_check {
-			#[macro_export]
-			#[doc(hidden)]
-			macro_rules! #validate_unsigned_macro_ident {
-				($pallet_name:ident) => {};
-			}
 			#[doc(hidden)]
-			pub use #validate_unsigned_macro_ident as is_validate_unsigned_part_defined;
+			pub use #no_op_macro_ident as is_validate_unsigned_part_defined;
 		}
 
 		#[doc(hidden)]
 		pub mod __substrate_call_check {
-			#[macro_export]
 			#[doc(hidden)]
-			macro_rules! #call_macro_ident {
-				($pallet_name:ident) => {};
-			}
-			#[doc(hidden)]
-			pub use #call_macro_ident as is_call_part_defined;
+			pub use #no_op_macro_ident as is_call_part_defined;
 		}
 
 		#[doc(hidden)]
 		pub mod __substrate_origin_check {
-			#[macro_export]
-			#[doc(hidden)]
-			macro_rules! #origin_macro_ident {
-				($pallet_name:ident) => {};
-			}
 			#[doc(hidden)]
-			pub use #origin_macro_ident as is_origin_part_defined;
+			pub use #no_op_macro_ident as is_origin_part_defined;
 		}
 	).into()
 }
diff --git a/frame/support/procedural/src/pallet/expand/genesis_config.rs b/frame/support/procedural/src/pallet/expand/genesis_config.rs
index ac0bdacefc77..013b9016c2f4 100644
--- a/frame/support/procedural/src/pallet/expand/genesis_config.rs
+++ b/frame/support/procedural/src/pallet/expand/genesis_config.rs
@@ -23,39 +23,60 @@ use syn::{Ident, spanned::Spanned};
 pub fn expand_genesis_config(def: &mut Def) -> proc_macro2::TokenStream {
 	let count = COUNTER.with(|counter| counter.borrow_mut().inc());
 
-	let (genesis_config, macro_ident) = if let Some(genesis_config) = &def.genesis_config {
-		let ident = Ident::new(
-			&format!("__is_genesis_config_defined_{}", count),
-			genesis_config.genesis_config.span(),
-		);
-		(genesis_config, ident)
-	} else {
-		let macro_ident = Ident::new(
-			&format!("__is_genesis_config_defined_{}", count),
-			def.item.span(),
-		);
-
-		return quote::quote! {
-			#[doc(hidden)]
-			pub mod __substrate_genesis_config_check {
-				#[macro_export]
+	let (genesis_config, def_macro_ident, std_macro_ident) =
+		if let Some(genesis_config) = &def.genesis_config {
+			let def_macro_ident = Ident::new(
+				&format!("__is_genesis_config_defined_{}", count),
+				genesis_config.genesis_config.span(),
+			);
+
+			let std_macro_ident = Ident::new(
+				&format!("__is_std_macro_defined_for_genesis_{}", count),
+				genesis_config.genesis_config.span(),
+			);
+
+			(genesis_config, def_macro_ident, std_macro_ident)
+		} else {
+			let def_macro_ident = Ident::new(
+				&format!("__is_genesis_config_defined_{}", count),
+				def.item.span(),
+			);
+
+			let std_macro_ident = Ident::new(
+				&format!("__is_std_enabled_for_genesis_{}", count),
+				def.item.span(),
+			);
+
+			return quote::quote! {
 				#[doc(hidden)]
-				macro_rules! #macro_ident {
-					($pallet_name:ident) => {
-						compile_error!(concat!(
-							"`",
-							stringify!($pallet_name),
-							"` does not have #[pallet::genesis_config] defined, perhaps you should \
-							remove `Config` from construct_runtime?",
-						));
+				pub mod __substrate_genesis_config_check {
+					#[macro_export]
+					#[doc(hidden)]
+					macro_rules! #def_macro_ident {
+						($pallet_name:ident) => {
+							compile_error!(concat!(
+								"`",
+								stringify!($pallet_name),
+								"` does not have #[pallet::genesis_config] defined, perhaps you should \
+								remove `Config` from construct_runtime?",
+							));
+						}
 					}
+
+					#[macro_export]
+					#[doc(hidden)]
+					macro_rules! #std_macro_ident {
+						($pallet_name:ident, $pallet_path:expr) => {};
+					}
+
+					#[doc(hidden)]
+					pub use #def_macro_ident as is_genesis_config_defined;
+					#[doc(hidden)]
+					pub use #std_macro_ident as is_std_enabled_for_genesis;
 				}
-	
-				#[doc(hidden)]
-				pub use #macro_ident as is_genesis_config_defined;
-			}
+			};
 		};
-	};
+
 	let frame_support = &def.frame_support;
 
 	let genesis_config_item = &mut def.item.content.as_mut()
@@ -94,12 +115,36 @@ pub fn expand_genesis_config(def: &mut Def) -> proc_macro2::TokenStream {
 		pub mod __substrate_genesis_config_check {
 			#[macro_export]
 			#[doc(hidden)]
-			macro_rules! #macro_ident {
+			macro_rules! #def_macro_ident {
 				($pallet_name:ident) => {};
 			}
-	
+
+			#[cfg(not(feature = "std"))]
+			#[macro_export]
+			#[doc(hidden)]
+			macro_rules! #std_macro_ident {
+				($pallet_name:ident, $pallet_path:expr) => {
+					compile_error!(concat!(
+						"`",
+						stringify!($pallet_name),
+						"` does not have the std feature enabled, this will cause the `",
+						$pallet_path,
+						"::GenesisConfig` type to be undefined."
+					));
+				};
+			}
+
+			#[cfg(feature = "std")]
+			#[macro_export]
+			#[doc(hidden)]
+			macro_rules! #std_macro_ident {
+				($pallet_name:ident, $pallet_path:expr) => {};
+			}
+
+			#[doc(hidden)]
+			pub use #def_macro_ident as is_genesis_config_defined;
 			#[doc(hidden)]
-			pub use #macro_ident as is_genesis_config_defined;
+			pub use #std_macro_ident as is_std_enabled_for_genesis;
 		}
 	}
 }
diff --git a/frame/support/test/Cargo.toml b/frame/support/test/Cargo.toml
index 9dd0156e72c1..bfd5b6ec62ff 100644
--- a/frame/support/test/Cargo.toml
+++ b/frame/support/test/Cargo.toml
@@ -25,6 +25,8 @@ pretty_assertions = "0.6.1"
 rustversion = "1.0.0"
 frame-metadata = { version = "14.0.0-dev", default-features = false, path = "../../metadata" }
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../../system" }
+# The "std" feature for this pallet is never activated on purpose, in order to test construct_runtime error message
+test-pallet = { package = "frame-support-test-pallet", default-features = false, path = "pallet" }
 
 [features]
 default = ["std"]
diff --git a/frame/support/test/pallet/Cargo.toml b/frame/support/test/pallet/Cargo.toml
new file mode 100644
index 000000000000..3a421ecc461f
--- /dev/null
+++ b/frame/support/test/pallet/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+name = "frame-support-test-pallet"
+version = "4.0.0-dev"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
+license = "Apache-2.0"
+publish = false
+homepage = "https://substrate.dev"
+repository = "https://github.com/paritytech/substrate/"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../../" }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../../../system" }
+
+[features]
+default = ["std"]
+std = [
+	"codec/std",
+	"frame-support/std",
+	"frame-system/std",
+]
diff --git a/frame/support/test/pallet/src/lib.rs b/frame/support/test/pallet/src/lib.rs
new file mode 100644
index 000000000000..f9f94b06a0a5
--- /dev/null
+++ b/frame/support/test/pallet/src/lib.rs
@@ -0,0 +1,46 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+pub use pallet::*;
+
+#[frame_support::pallet]
+pub mod pallet {
+	#[allow(unused_imports)]
+	use frame_support::pallet_prelude::*;
+	#[allow(unused_imports)]
+	use frame_system::pallet_prelude::*;
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(_);
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::genesis_config]
+	pub struct GenesisConfig {}
+
+	#[cfg(feature = "std")]
+	impl Default for GenesisConfig {
+		fn default() -> Self {
+			Self {}
+		}
+	}
+
+	#[pallet::genesis_build]
+	impl<T: Config> GenesisBuild<T> for GenesisConfig {
+		fn build(&self) {}
+	}
+}
diff --git a/frame/support/test/tests/construct_runtime_ui/no_std_genesis_config.rs b/frame/support/test/tests/construct_runtime_ui/no_std_genesis_config.rs
new file mode 100644
index 000000000000..89774eb8a770
--- /dev/null
+++ b/frame/support/test/tests/construct_runtime_ui/no_std_genesis_config.rs
@@ -0,0 +1,24 @@
+use frame_support::construct_runtime;
+use sp_runtime::{generic, traits::BlakeTwo256};
+use sp_core::sr25519;
+
+pub type Signature = sr25519::Signature;
+pub type BlockNumber = u64;
+pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
+pub type Block = generic::Block<Header, UncheckedExtrinsic>;
+pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, Call, Signature, ()>;
+
+impl test_pallet::Config for Runtime {}
+
+construct_runtime! {
+	pub enum Runtime where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic
+	{
+		System: system::{Pallet, Call, Storage, Config, Event<T>},
+		Pallet: test_pallet::{Pallet, Config},
+	}
+}
+
+fn main() {}
diff --git a/frame/support/test/tests/construct_runtime_ui/no_std_genesis_config.stderr b/frame/support/test/tests/construct_runtime_ui/no_std_genesis_config.stderr
new file mode 100644
index 000000000000..6ae37ccf9b92
--- /dev/null
+++ b/frame/support/test/tests/construct_runtime_ui/no_std_genesis_config.stderr
@@ -0,0 +1,66 @@
+error: `Pallet` does not have the std feature enabled, this will cause the `test_pallet::GenesisConfig` type to be undefined.
+  --> $DIR/no_std_genesis_config.rs:13:1
+   |
+13 | / construct_runtime! {
+14 | |     pub enum Runtime where
+15 | |         Block = Block,
+16 | |         NodeBlock = Block,
+...  |
+21 | |     }
+22 | | }
+   | |_^
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0433]: failed to resolve: use of undeclared crate or module `system`
+  --> $DIR/no_std_genesis_config.rs:19:11
+   |
+19 |         System: system::{Pallet, Call, Storage, Config, Event<T>},
+   |                 ^^^^^^ use of undeclared crate or module `system`
+
+error[E0433]: failed to resolve: use of undeclared crate or module `system`
+  --> $DIR/no_std_genesis_config.rs:13:1
+   |
+13 | / construct_runtime! {
+14 | |     pub enum Runtime where
+15 | |         Block = Block,
+16 | |         NodeBlock = Block,
+...  |
+21 | |     }
+22 | | }
+   | |_^ not found in `system`
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+help: consider importing this enum
+   |
+1  | use frame_system::RawOrigin;
+   |
+
+error[E0412]: cannot find type `GenesisConfig` in crate `test_pallet`
+  --> $DIR/no_std_genesis_config.rs:13:1
+   |
+13 | / construct_runtime! {
+14 | |     pub enum Runtime where
+15 | |         Block = Block,
+16 | |         NodeBlock = Block,
+...  |
+21 | |     }
+22 | | }
+   | |_^ not found in `test_pallet`
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+help: consider importing this struct
+   |
+1  | use frame_system::GenesisConfig;
+   |
+
+error[E0277]: the trait bound `Runtime: frame_system::pallet::Config` is not satisfied
+  --> $DIR/no_std_genesis_config.rs:11:6
+   |
+11 | impl test_pallet::Config for Runtime {}
+   |      ^^^^^^^^^^^^^^^^^^^ the trait `frame_system::pallet::Config` is not implemented for `Runtime`
+   |
+  ::: $WORKSPACE/frame/support/test/pallet/src/lib.rs
+   |
+   |     pub trait Config: frame_system::Config {}
+   |                       -------------------- required by this bound in `Config`

From b47244cdbeaf9370aa4668acffe6397e760deda6 Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Fri, 16 Jul 2021 18:45:26 +0200
Subject: [PATCH 0995/1194] Replace DB assertion with error (#9362)

* Replace DB assert with error

* Update client/db/src/lib.rs

Co-authored-by: cheme <emericchevalier.pro@gmail.com>

Co-authored-by: cheme <emericchevalier.pro@gmail.com>
---
 client/db/src/lib.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index 4e3d3cf36fe9..977d55b3cc67 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -1306,8 +1306,12 @@ impl<Block: BlockT> Backend<Block> {
 				sc_client_api::blockchain::HeaderBackend::hash(
 					&self.blockchain,
 					new_canonical.saturated_into(),
-				)?.expect("existence of block with number `new_canonical` \
-					implies existence of blocks with all numbers before it; qed")
+				)?.ok_or_else(|| sp_blockchain::Error::Backend(format!(
+					"Can't canonicalize missing block number #{} when importing {:?} (#{})",
+					new_canonical,
+					hash,
+					number,
+				)))?
 			};
 			if !sc_client_api::Backend::have_state_at(self, &hash, new_canonical.saturated_into()) {
 				return Ok(())

From 02fe835151b5dd04939df9a7d396cb762fc6eabd Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Sat, 17 Jul 2021 10:58:37 +0200
Subject: [PATCH 0996/1194] Storage chains sync (#9171)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Sync storage chains

* Test

* Apply suggestions from code review

Co-authored-by: cheme <emericchevalier.pro@gmail.com>

* Separate block body and indexed body

* Update client/db/src/lib.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

Co-authored-by: cheme <emericchevalier.pro@gmail.com>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
---
 client/api/src/backend.rs                     |  1 +
 client/api/src/in_mem.rs                      |  1 +
 client/cli/src/arg_enums.rs                   | 10 ++-
 client/db/src/changes_tries_storage.rs        |  6 +-
 client/db/src/lib.rs                          | 43 ++++++++++-
 client/light/src/backend.rs                   |  1 +
 client/network/src/block_request_handler.rs   | 14 ++++
 client/network/src/config.rs                  |  4 +-
 client/network/src/lib.rs                     |  1 -
 client/network/src/protocol.rs                | 14 +++-
 client/network/src/protocol/message.rs        |  4 +
 client/network/src/protocol/sync.rs           | 77 +++++++++----------
 client/network/src/protocol/sync/blocks.rs    |  1 +
 client/network/src/schema/api.v1.proto        |  2 +
 client/network/test/src/block_import.rs       |  1 +
 client/network/test/src/lib.rs                | 10 ++-
 client/network/test/src/sync.rs               | 38 ++++++++-
 client/service/src/builder.rs                 | 15 +++-
 client/service/src/chain_ops/import_blocks.rs |  1 +
 client/service/src/client/client.rs           |  5 ++
 client/service/test/src/client/light.rs       |  2 +-
 .../consensus/common/src/block_import.rs      |  4 +
 .../consensus/common/src/import_queue.rs      |  3 +
 .../common/src/import_queue/basic_queue.rs    |  1 +
 test-utils/client/src/lib.rs                  | 10 +++
 test-utils/runtime/src/lib.rs                 |  2 +
 test-utils/runtime/src/system.rs              |  9 +++
 27 files changed, 221 insertions(+), 59 deletions(-)

diff --git a/client/api/src/backend.rs b/client/api/src/backend.rs
index 195fc49612ba..b09995f887c4 100644
--- a/client/api/src/backend.rs
+++ b/client/api/src/backend.rs
@@ -149,6 +149,7 @@ pub trait BlockImportOperation<Block: BlockT> {
 		&mut self,
 		header: Block::Header,
 		body: Option<Vec<Block::Extrinsic>>,
+		indexed_body: Option<Vec<Vec<u8>>>,
 		justifications: Option<Justifications>,
 		state: NewBlockState,
 	) -> sp_blockchain::Result<()>;
diff --git a/client/api/src/in_mem.rs b/client/api/src/in_mem.rs
index 916b830f6189..505b69981694 100644
--- a/client/api/src/in_mem.rs
+++ b/client/api/src/in_mem.rs
@@ -572,6 +572,7 @@ impl<Block: BlockT> backend::BlockImportOperation<Block> for BlockImportOperatio
 		&mut self,
 		header: <Block as BlockT>::Header,
 		body: Option<Vec<<Block as BlockT>::Extrinsic>>,
+		_indexed_body: Option<Vec<Vec<u8>>>,
 		justifications: Option<Justifications>,
 		state: NewBlockState,
 	) -> sp_blockchain::Result<()> {
diff --git a/client/cli/src/arg_enums.rs b/client/cli/src/arg_enums.rs
index 1bca67e782a3..d9a421037629 100644
--- a/client/cli/src/arg_enums.rs
+++ b/client/cli/src/arg_enums.rs
@@ -250,8 +250,14 @@ impl Into<sc_network::config::SyncMode> for SyncMode {
 	fn into(self) -> sc_network::config::SyncMode {
 		match self {
 			SyncMode::Full => sc_network::config::SyncMode::Full,
-			SyncMode::Fast => sc_network::config::SyncMode::Fast { skip_proofs: false },
-			SyncMode::FastUnsafe => sc_network::config::SyncMode::Fast { skip_proofs: true },
+			SyncMode::Fast => sc_network::config::SyncMode::Fast {
+				skip_proofs: false,
+				storage_chain_mode: false,
+			},
+			SyncMode::FastUnsafe => sc_network::config::SyncMode::Fast {
+				skip_proofs: true,
+				storage_chain_mode: false,
+			},
 		}
 	}
 }
diff --git a/client/db/src/changes_tries_storage.rs b/client/db/src/changes_tries_storage.rs
index 860ca4173051..3863099a09f9 100644
--- a/client/db/src/changes_tries_storage.rs
+++ b/client/db/src/changes_tries_storage.rs
@@ -572,7 +572,7 @@ mod tests {
 		};
 		let mut op = backend.begin_operation().unwrap();
 		backend.begin_state_operation(&mut op, block_id).unwrap();
-		op.set_block_data(header, None, None, NewBlockState::Best).unwrap();
+		op.set_block_data(header, None, None, None, NewBlockState::Best).unwrap();
 		op.update_changes_trie((changes_trie_update, ChangesTrieCacheAction::Clear)).unwrap();
 		backend.commit_operation(op).unwrap();
 
@@ -916,7 +916,7 @@ mod tests {
 		backend.begin_state_operation(&mut op, BlockId::Hash(block2)).unwrap();
 		op.mark_finalized(BlockId::Hash(block1), None).unwrap();
 		op.mark_finalized(BlockId::Hash(block2), None).unwrap();
-		op.set_block_data(header3, None, None, NewBlockState::Final).unwrap();
+		op.set_block_data(header3, None, None, None, NewBlockState::Final).unwrap();
 		backend.commit_operation(op).unwrap();
 
 		// insert more unfinalized headers
@@ -941,7 +941,7 @@ mod tests {
 		op.mark_finalized(BlockId::Hash(block4), None).unwrap();
 		op.mark_finalized(BlockId::Hash(block5), None).unwrap();
 		op.mark_finalized(BlockId::Hash(block6), None).unwrap();
-		op.set_block_data(header7, None, None, NewBlockState::Final).unwrap();
+		op.set_block_data(header7, None, None, None, NewBlockState::Final).unwrap();
 		backend.commit_operation(op).unwrap();
 	}
 
diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index 977d55b3cc67..505c7b9d49ea 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -74,6 +74,7 @@ use sp_arithmetic::traits::Saturating;
 use sp_runtime::{generic::{DigestItem, BlockId}, Justification, Justifications, Storage};
 use sp_runtime::traits::{
 	Block as BlockT, Header as HeaderT, NumberFor, Zero, One, SaturatedConversion, HashFor,
+	Hash,
 };
 use sp_state_machine::{
 	DBValue, ChangesTrieTransaction, ChangesTrieCacheAction, UsageInfo as StateUsageInfo,
@@ -384,6 +385,7 @@ struct PendingBlock<Block: BlockT> {
 	header: Block::Header,
 	justifications: Option<Justifications>,
 	body: Option<Vec<Block::Extrinsic>>,
+	indexed_body: Option<Vec<Vec<u8>>>,
 	leaf_state: NewBlockState,
 }
 
@@ -824,6 +826,7 @@ impl<Block: BlockT> sc_client_api::backend::BlockImportOperation<Block> for Bloc
 		&mut self,
 		header: Block::Header,
 		body: Option<Vec<Block::Extrinsic>>,
+		indexed_body: Option<Vec<Vec<u8>>>,
 		justifications: Option<Justifications>,
 		leaf_state: NewBlockState,
 	) -> ClientResult<()> {
@@ -834,6 +837,7 @@ impl<Block: BlockT> sc_client_api::backend::BlockImportOperation<Block> for Bloc
 		self.pending_block = Some(PendingBlock {
 			header,
 			body,
+			indexed_body,
 			justifications,
 			leaf_state,
 		});
@@ -1068,7 +1072,7 @@ impl<Block: BlockT> Backend<Block> {
 
 	/// Create new memory-backed client backend for tests.
 	#[cfg(any(test, feature = "test-helpers"))]
-	fn new_test_with_tx_storage(
+	pub fn new_test_with_tx_storage(
 		keep_blocks: u32,
 		canonicalization_delay: u64,
 		transaction_storage: TransactionStorageMode,
@@ -1393,6 +1397,16 @@ impl<Block: BlockT> Backend<Block> {
 					},
 				}
 			}
+			if let Some(body) = pending_block.indexed_body {
+				match self.transaction_storage {
+					TransactionStorageMode::BlockBody => {
+						debug!(target: "db", "Commit: ignored indexed block body");
+					},
+					TransactionStorageMode::StorageChain => {
+						apply_indexed_body::<Block>(&mut transaction, body);
+					},
+				}
+			}
 			if let Some(justifications) = pending_block.justifications {
 				transaction.set_from_vec(columns::JUSTIFICATIONS, &lookup_key, justifications.encode());
 			}
@@ -1881,6 +1895,20 @@ fn apply_index_ops<Block: BlockT>(
 	extrinsic_headers.encode()
 }
 
+fn apply_indexed_body<Block: BlockT>(
+	transaction: &mut Transaction<DbHash>,
+	body: Vec<Vec<u8>>,
+) {
+	for extrinsic in body {
+		let hash = sp_runtime::traits::BlakeTwo256::hash(&extrinsic);
+		transaction.store(
+			columns::TRANSACTION,
+			DbHash::from_slice(hash.as_ref()),
+			extrinsic,
+		);
+	}
+}
+
 impl<Block> sc_client_api::backend::AuxStore for Backend<Block> where Block: BlockT {
 	fn insert_aux<
 		'a,
@@ -2439,7 +2467,7 @@ pub(crate) mod tests {
 		};
 		let mut op = backend.begin_operation().unwrap();
 		backend.begin_state_operation(&mut op, block_id).unwrap();
-		op.set_block_data(header, Some(body), None, NewBlockState::Best).unwrap();
+		op.set_block_data(header, Some(body), None, None, NewBlockState::Best).unwrap();
 		if let Some(index) = transaction_index {
 			op.update_transaction_index(index).unwrap();
 		}
@@ -2481,6 +2509,7 @@ pub(crate) mod tests {
 						header,
 						Some(vec![]),
 						None,
+						None,
 						NewBlockState::Best,
 					).unwrap();
 					db.commit_operation(op).unwrap();
@@ -2537,6 +2566,7 @@ pub(crate) mod tests {
 				header.clone(),
 				Some(vec![]),
 				None,
+				None,
 				NewBlockState::Best,
 			).unwrap();
 
@@ -2579,6 +2609,7 @@ pub(crate) mod tests {
 				header,
 				Some(vec![]),
 				None,
+				None,
 				NewBlockState::Best,
 			).unwrap();
 
@@ -2622,6 +2653,7 @@ pub(crate) mod tests {
 				header,
 				Some(vec![]),
 				None,
+				None,
 				NewBlockState::Best,
 			).unwrap();
 
@@ -2659,6 +2691,7 @@ pub(crate) mod tests {
 				header,
 				Some(vec![]),
 				None,
+				None,
 				NewBlockState::Best,
 			).unwrap();
 
@@ -2695,6 +2728,7 @@ pub(crate) mod tests {
 				header,
 				Some(vec![]),
 				None,
+				None,
 				NewBlockState::Best,
 			).unwrap();
 
@@ -2730,6 +2764,7 @@ pub(crate) mod tests {
 				header,
 				Some(vec![]),
 				None,
+				None,
 				NewBlockState::Best,
 			).unwrap();
 
@@ -3067,6 +3102,7 @@ pub(crate) mod tests {
 				header.clone(),
 				Some(vec![]),
 				None,
+				None,
 				NewBlockState::Best,
 			).unwrap();
 
@@ -3106,6 +3142,7 @@ pub(crate) mod tests {
 				header,
 				Some(vec![]),
 				None,
+				None,
 				NewBlockState::Normal,
 			).unwrap();
 
@@ -3118,7 +3155,7 @@ pub(crate) mod tests {
 			let header = backend.blockchain().header(BlockId::Hash(hash1)).unwrap().unwrap();
 			let mut op = backend.begin_operation().unwrap();
 			backend.begin_state_operation(&mut op, BlockId::Hash(hash0)).unwrap();
-			op.set_block_data(header, None, None, NewBlockState::Best).unwrap();
+			op.set_block_data(header, None, None, None, NewBlockState::Best).unwrap();
 			backend.commit_operation(op).unwrap();
 		}
 
diff --git a/client/light/src/backend.rs b/client/light/src/backend.rs
index 3e53d3b81cc7..425720c1d777 100644
--- a/client/light/src/backend.rs
+++ b/client/light/src/backend.rs
@@ -293,6 +293,7 @@ impl<S, Block> BlockImportOperation<Block> for ImportOperation<Block, S>
 		&mut self,
 		header: Block::Header,
 		_body: Option<Vec<Block::Extrinsic>>,
+		_indexed_body: Option<Vec<Vec<u8>>>,
 		_justifications: Option<Justifications>,
 		state: NewBlockState,
 	) -> ClientResult<()> {
diff --git a/client/network/src/block_request_handler.rs b/client/network/src/block_request_handler.rs
index 19367b110469..ce65e5eca345 100644
--- a/client/network/src/block_request_handler.rs
+++ b/client/network/src/block_request_handler.rs
@@ -264,6 +264,7 @@ impl<B: BlockT> BlockRequestHandler<B> {
 	) -> Result<BlockResponse, HandleRequestError> {
 		let get_header = attributes.contains(BlockAttributes::HEADER);
 		let get_body = attributes.contains(BlockAttributes::BODY);
+		let get_indexed_body = attributes.contains(BlockAttributes::INDEXED_BODY);
 		let get_justification = attributes.contains(BlockAttributes::JUSTIFICATION);
 
 		let mut blocks = Vec::new();
@@ -321,6 +322,18 @@ impl<B: BlockT> BlockRequestHandler<B> {
 				Vec::new()
 			};
 
+			let indexed_body =  if get_indexed_body {
+				match self.client.block_indexed_body(&BlockId::Hash(hash))? {
+					Some(transactions) => transactions,
+					None => {
+						log::trace!(target: LOG_TARGET, "Missing indexed block data for block request.");
+						break;
+					}
+				}
+			} else {
+				Vec::new()
+			};
+
 			let block_data = crate::schema::v1::BlockData {
 				hash: hash.encode(),
 				header: if get_header {
@@ -334,6 +347,7 @@ impl<B: BlockT> BlockRequestHandler<B> {
 				justification,
 				is_empty_justification,
 				justifications,
+				indexed_body,
 			};
 
 			total_size += block_data.body.len();
diff --git a/client/network/src/config.rs b/client/network/src/config.rs
index a6aa5feea5bd..8cc467a7fb9f 100644
--- a/client/network/src/config.rs
+++ b/client/network/src/config.rs
@@ -390,7 +390,9 @@ pub enum SyncMode {
 	/// Download blocks and the latest state.
 	Fast {
 		/// Skip state proof download and verification.
-		skip_proofs: bool
+		skip_proofs: bool,
+		/// Download indexed transactions for recent blocks.
+		storage_chain_mode: bool,
 	},
 }
 
diff --git a/client/network/src/lib.rs b/client/network/src/lib.rs
index 11e235bb81ae..b43836cacaa5 100644
--- a/client/network/src/lib.rs
+++ b/client/network/src/lib.rs
@@ -263,7 +263,6 @@ pub mod light_client_requests;
 pub mod state_request_handler;
 pub mod config;
 pub mod error;
-pub mod gossip;
 pub mod network_state;
 pub mod transactions;
 
diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index b9a189a0f384..eaed7ffcccac 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -228,7 +228,13 @@ impl ProtocolConfig {
 		} else {
 			match self.sync_mode {
 				config::SyncMode::Full => sync::SyncMode::Full,
-				config::SyncMode::Fast { skip_proofs } => sync::SyncMode::LightState { skip_proofs },
+				config::SyncMode::Fast {
+					skip_proofs,
+					storage_chain_mode,
+				} => sync::SyncMode::LightState {
+					skip_proofs,
+					storage_chain_mode
+				},
 			}
 		}
 	}
@@ -597,6 +603,11 @@ impl<B: BlockT> Protocol<B> {
 				} else {
 					None
 				},
+				indexed_body: if request.fields.contains(message::BlockAttributes::INDEXED_BODY) {
+					Some(block_data.indexed_body)
+				} else {
+					None
+				},
 				receipt: if !block_data.message_queue.is_empty() {
 					Some(block_data.receipt)
 				} else {
@@ -965,6 +976,7 @@ impl<B: BlockT> Protocol<B> {
 						hash: header.hash(),
 						header: Some(header),
 						body: None,
+						indexed_body: None,
 						receipt: None,
 						message_queue: None,
 						justification: None,
diff --git a/client/network/src/protocol/message.rs b/client/network/src/protocol/message.rs
index dc6beac99aa0..50d0fd796902 100644
--- a/client/network/src/protocol/message.rs
+++ b/client/network/src/protocol/message.rs
@@ -77,6 +77,8 @@ bitflags! {
 		const MESSAGE_QUEUE = 0b00001000;
 		/// Include a justification for the block.
 		const JUSTIFICATION = 0b00010000;
+		/// Include indexed transactions for a block.
+		const INDEXED_BODY = 0b00100000;
 	}
 }
 
@@ -248,6 +250,8 @@ pub mod generic {
 		pub header: Option<Header>,
 		/// Block body if requested.
 		pub body: Option<Vec<Extrinsic>>,
+		/// Block body indexed transactions if requested.
+		pub indexed_body: Option<Vec<Vec<u8>>>,
 		/// Block receipt if requested.
 		pub receipt: Option<Vec<u8>>,
 		/// Block message queue if requested.
diff --git a/client/network/src/protocol/sync.rs b/client/network/src/protocol/sync.rs
index 44fbe64bfcff..55b64c157c65 100644
--- a/client/network/src/protocol/sync.rs
+++ b/client/network/src/protocol/sync.rs
@@ -469,7 +469,8 @@ pub enum SyncMode {
 	Full,
 	// Sync headers and the last finalied state
 	LightState {
-		skip_proofs: bool
+		storage_chain_mode: bool,
+		skip_proofs: bool,
 	},
 }
 
@@ -518,8 +519,10 @@ impl<B: BlockT> ChainSync<B> {
 		match self.mode {
 			SyncMode::Full => BlockAttributes::HEADER | BlockAttributes::JUSTIFICATION | BlockAttributes::BODY,
 			SyncMode::Light => BlockAttributes::HEADER | BlockAttributes::JUSTIFICATION,
-			SyncMode::LightState { .. } =>
+			SyncMode::LightState { storage_chain_mode: false, .. } =>
 				BlockAttributes::HEADER | BlockAttributes::JUSTIFICATION | BlockAttributes::BODY,
+			SyncMode::LightState { storage_chain_mode: true, .. } =>
+				BlockAttributes::HEADER | BlockAttributes::JUSTIFICATION | BlockAttributes::INDEXED_BODY,
 		}
 	}
 
@@ -914,25 +917,7 @@ impl<B: BlockT> ChainSync<B> {
 							peer.state = PeerSyncState::Available;
 							validate_blocks::<B>(&blocks, who, Some(request))?;
 							self.blocks.insert(start_block, blocks, who.clone());
-							self.blocks
-								.drain(self.best_queued_number + One::one())
-								.into_iter()
-								.map(|block_data| {
-									let justifications = block_data.block.justifications.or(
-										legacy_justification_mapping(block_data.block.justification)
-									);
-									IncomingBlock {
-										hash: block_data.block.hash,
-										header: block_data.block.header,
-										body: block_data.block.body,
-										justifications,
-										origin: block_data.origin,
-										allow_missing_state: true,
-										import_existing: self.import_existing,
-										skip_execution: self.skip_execution(),
-										state: None,
-									}
-								}).collect()
+							self.drain_blocks()
 						}
 						PeerSyncState::DownloadingStale(_) => {
 							peer.state = PeerSyncState::Available;
@@ -949,6 +934,7 @@ impl<B: BlockT> ChainSync<B> {
 									hash: b.hash,
 									header: b.header,
 									body: b.body,
+									indexed_body: None,
 									justifications,
 									origin: Some(who.clone()),
 									allow_missing_state: true,
@@ -1064,6 +1050,7 @@ impl<B: BlockT> ChainSync<B> {
 							hash: b.hash,
 							header: b.header,
 							body: b.body,
+							indexed_body: None,
 							justifications,
 							origin: Some(who.clone()),
 							allow_missing_state: true,
@@ -1115,6 +1102,7 @@ impl<B: BlockT> ChainSync<B> {
 					hash,
 					header: Some(header),
 					body: None,
+					indexed_body: None,
 					justifications: None,
 					origin: None,
 					allow_missing_state: true,
@@ -1367,7 +1355,7 @@ impl<B: BlockT> ChainSync<B> {
 			is_descendent_of(&**client, base, block)
 		});
 
-		if let SyncMode::LightState { skip_proofs } = &self.mode {
+		if let SyncMode::LightState { skip_proofs, .. } = &self.mode {
 			if self.state_sync.is_none()
 				&& !self.peers.is_empty()
 				&& self.queue_blocks.is_empty()
@@ -1757,24 +1745,7 @@ impl<B: BlockT> ChainSync<B> {
 			target.peers.remove(who);
 			!target.peers.is_empty()
 		});
-		let blocks: Vec<_> = self.blocks
-			.drain(self.best_queued_number + One::one())
-			.into_iter()
-			.map(|block_data| {
-				let justifications =
-					legacy_justification_mapping(block_data.block.justification);
-				IncomingBlock {
-					hash: block_data.block.hash,
-					header: block_data.block.header,
-					body: block_data.block.body,
-					justifications,
-					origin: block_data.origin,
-					allow_missing_state: true,
-					import_existing: false,
-					skip_execution: self.skip_execution(),
-					state: None,
-				}
-			}).collect();
+		let blocks = self.drain_blocks();
 		if !blocks.is_empty() {
 			Some(self.validate_and_queue_blocks(blocks))
 		} else {
@@ -1878,6 +1849,31 @@ impl<B: BlockT> ChainSync<B> {
 			_priv: ()
 		}
 	}
+
+	/// Drain the downloaded block set up to the first gap.
+	fn drain_blocks(&mut self) -> Vec<IncomingBlock<B>> {
+		self.blocks
+			.drain(self.best_queued_number + One::one())
+			.into_iter()
+			.map(|block_data| {
+				let justifications = block_data.block.justifications.or(
+					legacy_justification_mapping(block_data.block.justification)
+				);
+				IncomingBlock {
+					hash: block_data.block.hash,
+					header: block_data.block.header,
+					body: block_data.block.body,
+					indexed_body: block_data.block.indexed_body,
+					justifications,
+					origin: block_data.origin,
+					allow_missing_state: true,
+					import_existing: self.import_existing,
+					skip_execution: self.skip_execution(),
+					state: None,
+				}
+			}).collect()
+	}
+
 }
 
 // This is purely during a backwards compatible transitionary period and should be removed
@@ -2383,6 +2379,7 @@ mod test {
 					hash: b.hash(),
 					header: Some(b.header().clone()),
 					body: Some(b.deconstruct().1),
+					indexed_body: None,
 					receipt: None,
 					message_queue: None,
 					justification: None,
diff --git a/client/network/src/protocol/sync/blocks.rs b/client/network/src/protocol/sync/blocks.rs
index 81f9cffacaab..01b5f6016f8a 100644
--- a/client/network/src/protocol/sync/blocks.rs
+++ b/client/network/src/protocol/sync/blocks.rs
@@ -225,6 +225,7 @@ mod test {
 			hash: H256::random(),
 			header: None,
 			body: None,
+			indexed_body: None,
 			message_queue: None,
 			receipt: None,
 			justification: None,
diff --git a/client/network/src/schema/api.v1.proto b/client/network/src/schema/api.v1.proto
index a16fdbaebc81..c5333c7dcdbf 100644
--- a/client/network/src/schema/api.v1.proto
+++ b/client/network/src/schema/api.v1.proto
@@ -66,6 +66,8 @@ message BlockData {
 	// is because empty justifications, like all justifications, are paired with a non-empty
 	// consensus engine ID.
 	bytes justifications = 8; // optional
+	// Indexed block body if requestd.
+	repeated bytes indexed_body = 9; // optional
 }
 
 // Request storage data from a peer.
diff --git a/client/network/test/src/block_import.rs b/client/network/test/src/block_import.rs
index 05169aba8d73..6d3ceb4a933d 100644
--- a/client/network/test/src/block_import.rs
+++ b/client/network/test/src/block_import.rs
@@ -42,6 +42,7 @@ fn prepare_good_block() -> (TestClient, Hash, u64, PeerId, IncomingBlock<Block>)
 		hash,
 		header,
 		body: Some(Vec::new()),
+		indexed_body: None,
 		justifications,
 		origin: Some(peer_id.clone()),
 		allow_missing_state: false,
diff --git a/client/network/test/src/lib.rs b/client/network/test/src/lib.rs
index b6e8f897bb80..900e05e26a78 100644
--- a/client/network/test/src/lib.rs
+++ b/client/network/test/src/lib.rs
@@ -660,6 +660,8 @@ pub struct FullPeerConfig {
 	pub is_authority: bool,
 	/// Syncing mode
 	pub sync_mode: SyncMode,
+	/// Enable transaction indexing.
+	pub storage_chain: bool,
 }
 
 pub trait TestNetFactory: Sized where <Self::BlockImport as BlockImport<Block>>::Transaction: Send {
@@ -715,9 +717,11 @@ pub trait TestNetFactory: Sized where <Self::BlockImport as BlockImport<Block>>:
 
 	/// Add a full peer.
 	fn add_full_peer_with_config(&mut self, config: FullPeerConfig) {
-		let mut test_client_builder = match config.keep_blocks {
-			Some(keep_blocks) => TestClientBuilder::with_pruning_window(keep_blocks),
-			None => TestClientBuilder::with_default_backend(),
+		let mut test_client_builder = match (config.keep_blocks, config.storage_chain) {
+			(Some(keep_blocks), true) => TestClientBuilder::with_tx_storage(keep_blocks),
+			(None, true) => TestClientBuilder::with_tx_storage(u32::MAX),
+			(Some(keep_blocks), false) => TestClientBuilder::with_pruning_window(keep_blocks),
+			(None, false) => TestClientBuilder::with_default_backend(),
 		};
 		if matches!(config.sync_mode, SyncMode::Fast{..}) {
 			test_client_builder = test_client_builder.set_no_genesis();
diff --git a/client/network/test/src/sync.rs b/client/network/test/src/sync.rs
index 56cec7e4cdfd..f998c9ebde75 100644
--- a/client/network/test/src/sync.rs
+++ b/client/network/test/src/sync.rs
@@ -1095,7 +1095,7 @@ fn syncs_state() {
 		let mut net = TestNet::new(0);
 		net.add_full_peer_with_config(Default::default());
 		net.add_full_peer_with_config(FullPeerConfig {
-			sync_mode: SyncMode::Fast { skip_proofs: *skip_proofs },
+			sync_mode: SyncMode::Fast { skip_proofs: *skip_proofs, storage_chain_mode: false },
 			..Default::default()
 		});
 		net.peer(0).push_blocks(64, false);
@@ -1127,3 +1127,39 @@ fn syncs_state() {
 	}
 }
 
+#[test]
+fn syncs_indexed_blocks() {
+	use sp_runtime::traits::Hash;
+	sp_tracing::try_init_simple();
+	let mut net = TestNet::new(0);
+	let mut n: u64 = 0;
+	net.add_full_peer_with_config(FullPeerConfig {
+		storage_chain: true,
+		..Default::default()
+	});
+	net.add_full_peer_with_config(FullPeerConfig {
+		storage_chain: true,
+		sync_mode: SyncMode::Fast { skip_proofs: false, storage_chain_mode: true },
+		..Default::default()
+	});
+	net.peer(0).generate_blocks_at(
+		BlockId::number(0),
+		64,
+		BlockOrigin::Own, |mut builder| {
+			let ex = Extrinsic::Store(n.to_le_bytes().to_vec());
+			n += 1;
+			builder.push(ex).unwrap();
+			builder.build().unwrap().block
+		},
+		false,
+		true,
+		true,
+	);
+	let indexed_key = sp_runtime::traits::BlakeTwo256::hash(&42u64.to_le_bytes());
+	assert!(net.peer(0).client().as_full().unwrap().indexed_transaction(&indexed_key).unwrap().is_some());
+	assert!(net.peer(1).client().as_full().unwrap().indexed_transaction(&indexed_key).unwrap().is_none());
+
+	net.block_until_sync();
+	assert!(net.peer(1).client().as_full().unwrap().indexed_transaction(&indexed_key).unwrap().is_some());
+}
+
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index 6318469a7f0b..46590ce8e8c6 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -21,7 +21,7 @@ use crate::{
 	start_rpc_servers, build_network_future, TransactionPoolAdapter, TaskManager, SpawnTaskHandle,
 	metrics::MetricsService,
 	client::{light, Client, ClientConfig},
-	config::{Configuration, KeystoreConfig, PrometheusConfig},
+	config::{Configuration, KeystoreConfig, PrometheusConfig, TransactionStorageMode},
 };
 use sc_client_api::{
 	light::RemoteBlockchain, ForkBlocks, BadBlocks, UsageProvider, ExecutorProvider,
@@ -40,7 +40,7 @@ use futures::{
 };
 use sc_keystore::LocalKeystore;
 use log::info;
-use sc_network::config::{Role, OnDemand};
+use sc_network::config::{Role, OnDemand, SyncMode};
 use sc_network::NetworkService;
 use sc_network::block_request_handler::{self, BlockRequestHandler};
 use sc_network::state_request_handler::{self, StateRequestHandler};
@@ -946,7 +946,7 @@ pub fn build_network<TBl, TExPool, TImpQu, TCl>(
 		}
 	};
 
-	let network_params = sc_network::config::Params {
+	let mut network_params = sc_network::config::Params {
 		role: config.role.clone(),
 		executor: {
 			let spawn_handle = Clone::clone(&spawn_handle);
@@ -973,6 +973,15 @@ pub fn build_network<TBl, TExPool, TImpQu, TCl>(
 		light_client_request_protocol_config,
 	};
 
+	// Storage chains don't keep full block history and can't be synced in full mode.
+	// Force fast sync when storage chain mode is enabled.
+	if matches!(config.transaction_storage, TransactionStorageMode::StorageChain) {
+		network_params.network_config.sync_mode = SyncMode::Fast {
+			storage_chain_mode: true,
+			skip_proofs: false,
+		};
+	}
+
 	let has_bootnodes = !network_params.network_config.boot_nodes.is_empty();
 	let network_mut = sc_network::NetworkWorker::new(network_params)?;
 	let network = network_mut.service().clone();
diff --git a/client/service/src/chain_ops/import_blocks.rs b/client/service/src/chain_ops/import_blocks.rs
index 330aaea4f555..75ea6670f352 100644
--- a/client/service/src/chain_ops/import_blocks.rs
+++ b/client/service/src/chain_ops/import_blocks.rs
@@ -168,6 +168,7 @@ fn import_block_to_queue<TBl, TImpQu>(
 			hash,
 			header: Some(header),
 			body: Some(extrinsics),
+			indexed_body: None,
 			justifications: signed_block.justifications,
 			origin: None,
 			allow_missing_state: false,
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index 25957560f4db..8e808a3d824b 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -355,6 +355,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 				genesis_block.deconstruct().0,
 				Some(vec![]),
 				None,
+				None,
 				block_state,
 			)?;
 			backend.commit_operation(op)?;
@@ -657,6 +658,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 			justifications,
 			post_digests,
 			body,
+			indexed_body,
 			finalized,
 			auxiliary,
 			fork_choice,
@@ -695,6 +697,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 			import_headers,
 			justifications,
 			body,
+			indexed_body,
 			storage_changes,
 			new_cache,
 			finalized,
@@ -734,6 +737,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		import_headers: PrePostHeader<Block::Header>,
 		justifications: Option<Justifications>,
 		body: Option<Vec<Block::Extrinsic>>,
+		indexed_body: Option<Vec<Vec<u8>>>,
 		storage_changes: Option<sp_consensus::StorageChanges<Block, backend::TransactionFor<B, Block>>>,
 		new_cache: HashMap<CacheKeyId, Vec<u8>>,
 		finalized: bool,
@@ -871,6 +875,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		operation.op.set_block_data(
 			import_headers.post().clone(),
 			body,
+			indexed_body,
 			justifications,
 			leaf_state,
 		)?;
diff --git a/client/service/test/src/client/light.rs b/client/service/test/src/client/light.rs
index 440e0b4dd0dc..4d620139fa49 100644
--- a/client/service/test/src/client/light.rs
+++ b/client/service/test/src/client/light.rs
@@ -266,7 +266,7 @@ fn local_state_is_created_when_genesis_state_is_available() {
 		Arc::new(DummyBlockchain::new(DummyStorage::new())),
 	);
 	let mut op = backend.begin_operation().unwrap();
-	op.set_block_data(header0, None, None, NewBlockState::Final).unwrap();
+	op.set_block_data(header0, None, None, None, NewBlockState::Final).unwrap();
 	op.set_genesis_state(Default::default(), true).unwrap();
 	backend.commit_operation(op).unwrap();
 
diff --git a/primitives/consensus/common/src/block_import.rs b/primitives/consensus/common/src/block_import.rs
index 447ea5761f76..a444e15095ef 100644
--- a/primitives/consensus/common/src/block_import.rs
+++ b/primitives/consensus/common/src/block_import.rs
@@ -196,6 +196,8 @@ pub struct BlockImportParams<Block: BlockT, Transaction> {
 	pub post_digests: Vec<DigestItemFor<Block>>,
 	/// The body of the block.
 	pub body: Option<Vec<Block::Extrinsic>>,
+	/// Indexed transaction body of the block.
+	pub indexed_body: Option<Vec<Vec<u8>>>,
 	/// Specify how the new state is computed.
 	pub state_action: StateAction<Block, Transaction>,
 	/// Is this block finalized already?
@@ -233,6 +235,7 @@ impl<Block: BlockT, Transaction> BlockImportParams<Block, Transaction> {
 			justifications: None,
 			post_digests: Vec::new(),
 			body: None,
+			indexed_body: None,
 			state_action: StateAction::Execute,
 			finalized: false,
 			intermediates: HashMap::new(),
@@ -286,6 +289,7 @@ impl<Block: BlockT, Transaction> BlockImportParams<Block, Transaction> {
 			justifications: self.justifications,
 			post_digests: self.post_digests,
 			body: self.body,
+			indexed_body: self.indexed_body,
 			state_action,
 			finalized: self.finalized,
 			auxiliary: self.auxiliary,
diff --git a/primitives/consensus/common/src/import_queue.rs b/primitives/consensus/common/src/import_queue.rs
index fba5b51e921c..6cac6b1ff920 100644
--- a/primitives/consensus/common/src/import_queue.rs
+++ b/primitives/consensus/common/src/import_queue.rs
@@ -68,6 +68,8 @@ pub struct IncomingBlock<B: BlockT> {
 	pub header: Option<<B as BlockT>::Header>,
 	/// Block body if requested.
 	pub body: Option<Vec<<B as BlockT>::Extrinsic>>,
+	/// Indexed block body if requested.
+	pub indexed_body: Option<Vec<Vec<u8>>>,
 	/// Justification(s) if requested.
 	pub justifications: Option<Justifications>,
 	/// The peer, we received this from
@@ -269,6 +271,7 @@ pub(crate) async fn import_single_block_metered<B: BlockT, V: Verifier<B>, Trans
 		cache.extend(keys.into_iter());
 	}
 	import_block.import_existing = block.import_existing;
+	import_block.indexed_body = block.indexed_body;
 	let mut import_block = import_block.clear_storage_changes_and_mutate();
 	if let Some(state) = block.state {
 		import_block.state_action = StateAction::ApplyChanges(crate::StorageChanges::Import(state));
diff --git a/primitives/consensus/common/src/import_queue/basic_queue.rs b/primitives/consensus/common/src/import_queue/basic_queue.rs
index 5767b72dd808..8dd40d84df30 100644
--- a/primitives/consensus/common/src/import_queue/basic_queue.rs
+++ b/primitives/consensus/common/src/import_queue/basic_queue.rs
@@ -560,6 +560,7 @@ mod tests {
 					hash,
 					header: Some(header),
 					body: None,
+					indexed_body: None,
 					justifications: None,
 					origin: None,
 					allow_missing_state: false,
diff --git a/test-utils/client/src/lib.rs b/test-utils/client/src/lib.rs
index eb810e036058..0971c00d7842 100644
--- a/test-utils/client/src/lib.rs
+++ b/test-utils/client/src/lib.rs
@@ -102,6 +102,16 @@ impl<Block: BlockT, Executor, G: GenesisInit> TestClientBuilder<Block, Executor,
 		let backend = Arc::new(Backend::new_test(keep_blocks, 0));
 		Self::with_backend(backend)
 	}
+
+	/// Create new `TestClientBuilder` with default backend and storage chain mode
+	pub fn with_tx_storage(keep_blocks: u32) -> Self {
+		let backend = Arc::new(Backend::new_test_with_tx_storage(
+			keep_blocks,
+			0,
+			sc_client_db::TransactionStorageMode::StorageChain,
+		));
+		Self::with_backend(backend)
+	}
 }
 
 impl<Block: BlockT, Executor, Backend, G: GenesisInit> TestClientBuilder<Block, Executor, Backend, G> {
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index 1023b77939bb..f4c722ab12c2 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -167,6 +167,7 @@ pub enum Extrinsic {
 	ChangesTrieConfigUpdate(Option<ChangesTrieConfiguration>),
 	OffchainIndexSet(Vec<u8>, Vec<u8>),
 	OffchainIndexClear(Vec<u8>),
+	Store(Vec<u8>),
 }
 
 parity_util_mem::malloc_size_of_is_0!(Extrinsic); // non-opaque extrinsic does not need this
@@ -199,6 +200,7 @@ impl BlindCheckable for Extrinsic {
 				Ok(Extrinsic::OffchainIndexSet(key, value)),
 			Extrinsic::OffchainIndexClear(key) =>
 				Ok(Extrinsic::OffchainIndexClear(key)),
+			Extrinsic::Store(data) => Ok(Extrinsic::Store(data)),
 		}
 	}
 }
diff --git a/test-utils/runtime/src/system.rs b/test-utils/runtime/src/system.rs
index ae35ded83bfc..c4b88c09e8d2 100644
--- a/test-utils/runtime/src/system.rs
+++ b/test-utils/runtime/src/system.rs
@@ -272,6 +272,8 @@ fn execute_transaction_backend(utx: &Extrinsic, extrinsic_index: u32) -> ApplyEx
 			sp_io::offchain_index::clear(&key);
 			Ok(Ok(()))
 		}
+		Extrinsic::Store(data) =>
+			execute_store(data.clone()),
 	}
 }
 
@@ -301,6 +303,13 @@ fn execute_transfer_backend(tx: &Transfer) -> ApplyExtrinsicResult {
 	Ok(Ok(()))
 }
 
+fn execute_store(data: Vec<u8>) -> ApplyExtrinsicResult {
+	let content_hash = sp_io::hashing::blake2_256(&data);
+	let extrinsic_index: u32 = storage::unhashed::get(well_known_keys::EXTRINSIC_INDEX).unwrap();
+	sp_io::transaction_index::index(extrinsic_index, data.len() as u32, content_hash);
+	Ok(Ok(()))
+}
+
 fn execute_new_authorities_backend(new_authorities: &[AuthorityId]) -> ApplyExtrinsicResult {
 	NewAuthorities::put(new_authorities.to_vec());
 	Ok(Ok(()))

From 5f992bdac489ba56edbd022663d4ffa27b34dea6 Mon Sep 17 00:00:00 2001
From: Keith Yeung <kungfukeith11@gmail.com>
Date: Sun, 18 Jul 2021 11:01:00 -0700
Subject: [PATCH 0997/1194] Generate storage info for treasury pallet (#9368)

---
 frame/treasury/Cargo.toml | 2 +-
 frame/treasury/src/lib.rs | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/frame/treasury/Cargo.toml b/frame/treasury/Cargo.toml
index 424119577d7e..4e362ab0ac1c 100644
--- a/frame/treasury/Cargo.toml
+++ b/frame/treasury/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
 serde = { version = "1.0.126", features = ["derive"], optional = true }
 impl-trait-for-tuples = "0.2.1"
 
diff --git a/frame/treasury/src/lib.rs b/frame/treasury/src/lib.rs
index 3951a553ad65..dd89ec079152 100644
--- a/frame/treasury/src/lib.rs
+++ b/frame/treasury/src/lib.rs
@@ -62,7 +62,7 @@ mod tests;
 mod benchmarking;
 pub mod weights;
 
-use codec::{Encode, Decode};
+use codec::{Encode, Decode, MaxEncodedLen};
 
 use sp_std::prelude::*;
 use sp_runtime::{
@@ -116,7 +116,7 @@ pub type ProposalIndex = u32;
 
 /// A spending proposal.
 #[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug)]
+#[derive(Encode, Decode, Clone, PartialEq, Eq, MaxEncodedLen, RuntimeDebug)]
 pub struct Proposal<AccountId, Balance> {
 	/// The account proposing it.
 	proposer: AccountId,
@@ -136,6 +136,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::generate_storage_info]
 	pub struct Pallet<T, I = ()>(PhantomData<(T, I)>);
 
 	#[pallet::config]

From 0803f7d953938aa65de36993ed74cecb1f7b5407 Mon Sep 17 00:00:00 2001
From: Falco Hirschenberger <falco.hirschenberger@gmail.com>
Date: Sun, 18 Jul 2021 20:27:39 +0200
Subject: [PATCH 0998/1194] Add missing #[pallet::constant] annotations to
 pallets (#9367)

fixing #9306
---
 frame/assets/src/lib.rs                        | 5 +++++
 frame/atomic-swap/src/lib.rs                   | 1 +
 frame/authorship/src/lib.rs                    | 1 +
 frame/balances/src/lib.rs                      | 2 ++
 frame/democracy/src/lib.rs                     | 2 ++
 frame/election-provider-multi-phase/src/lib.rs | 4 ++++
 frame/gilt/src/lib.rs                          | 1 +
 frame/im-online/src/lib.rs                     | 1 +
 frame/lottery/src/lib.rs                       | 1 +
 frame/scheduler/src/lib.rs                     | 2 ++
 frame/scored-pool/src/lib.rs                   | 2 ++
 frame/treasury/src/lib.rs                      | 1 +
 frame/uniques/src/lib.rs                       | 8 ++++++++
 13 files changed, 31 insertions(+)

diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index d901f82701bf..2531f14f45d0 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -189,19 +189,24 @@ pub mod pallet {
 		type ForceOrigin: EnsureOrigin<Self::Origin>;
 
 		/// The basic amount of funds that must be reserved for an asset.
+		#[pallet::constant]
 		type AssetDeposit: Get<DepositBalanceOf<Self, I>>;
 
 		/// The basic amount of funds that must be reserved when adding metadata to your asset.
+		#[pallet::constant]
 		type MetadataDepositBase: Get<DepositBalanceOf<Self, I>>;
 
 		/// The additional funds that must be reserved for the number of bytes you store in your
 		/// metadata.
+		#[pallet::constant]
 		type MetadataDepositPerByte: Get<DepositBalanceOf<Self, I>>;
 
 		/// The amount of funds that must be reserved when creating a new approval.
+		#[pallet::constant]
 		type ApprovalDeposit: Get<DepositBalanceOf<Self, I>>;
 
 		/// The maximum length of a name or symbol stored on-chain.
+		#[pallet::constant]
 		type StringLimit: Get<u32>;
 
 		/// A hook to allow a per-asset, per-account minimum balance to be enforced. This must be
diff --git a/frame/atomic-swap/src/lib.rs b/frame/atomic-swap/src/lib.rs
index 4c19a61bb72f..829328a74e4c 100644
--- a/frame/atomic-swap/src/lib.rs
+++ b/frame/atomic-swap/src/lib.rs
@@ -159,6 +159,7 @@ pub mod pallet {
 		/// If B sees A is on a blockchain with larger proof length limit, then it should kindly refuse
 		/// to accept the atomic swap request if A generates the proof, and asks that B generates the
 		/// proof instead.
+		#[pallet::constant]
 		type ProofLimit: Get<u32>;
 	}
 
diff --git a/frame/authorship/src/lib.rs b/frame/authorship/src/lib.rs
index de60d1a4caac..ca03320306d3 100644
--- a/frame/authorship/src/lib.rs
+++ b/frame/authorship/src/lib.rs
@@ -137,6 +137,7 @@ pub mod pallet {
 		/// The number of blocks back we should accept uncles.
 		/// This means that we will deal with uncle-parents that are
 		/// `UncleGenerations + 1` before `now`.
+		#[pallet::constant]
 		type UncleGenerations: Get<Self::BlockNumber>;
 		/// A filter for uncles within a block. This is for implementing
 		/// further constraints on what uncles can be included, other than their ancestry.
diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index 27b015bc1cce..6e3a3b1e2ff8 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -214,9 +214,11 @@ pub mod pallet {
 
 		/// The maximum number of locks that should exist on an account.
 		/// Not strictly enforced, but used for weight estimation.
+		#[pallet::constant]
 		type MaxLocks: Get<u32>;
 
 		/// The maximum number of named reserves that can exist on an account.
+		#[pallet::constant]
 		type MaxReserves: Get<u32>;
 
 		/// The id type for named reserves.
diff --git a/frame/democracy/src/lib.rs b/frame/democracy/src/lib.rs
index 6ebe917f56ae..4eace01a5680 100644
--- a/frame/democracy/src/lib.rs
+++ b/frame/democracy/src/lib.rs
@@ -301,6 +301,7 @@ pub mod pallet {
 		/// Indicator for whether an emergency origin is even allowed to happen. Some chains may want
 		/// to set this permanently to `false`, others may want to condition it on things such as
 		/// an upgrade having happened recently.
+		#[pallet::constant]
 		type InstantAllowed: Get<bool>;
 
 		/// Minimum voting period allowed for a fast-track referendum.
@@ -355,6 +356,7 @@ pub mod pallet {
 		type WeightInfo: WeightInfo;
 
 		/// The maximum number of public proposals that can exist at any time.
+		#[pallet::constant]
 		type MaxProposals: Get<u32>;
 	}
 
diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index d66b971d8073..e552335d0253 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -587,15 +587,18 @@ pub mod pallet {
 		type OffchainRepeat: Get<Self::BlockNumber>;
 
 		/// The priority of the unsigned transaction submitted in the unsigned-phase
+		#[pallet::constant]
 		type MinerTxPriority: Get<TransactionPriority>;
 		/// Maximum number of iteration of balancing that will be executed in the embedded miner of
 		/// the pallet.
+		#[pallet::constant]
 		type MinerMaxIterations: Get<u32>;
 
 		/// Maximum weight that the miner should consume.
 		///
 		/// The miner will ensure that the total weight of the unsigned solution will not exceed
 		/// this value, based on [`WeightInfo::submit_unsigned`].
+		#[pallet::constant]
 		type MinerMaxWeight: Get<Weight>;
 
 		/// Maximum number of signed submissions that can be queued.
@@ -640,6 +643,7 @@ pub mod pallet {
 		///
 		/// The miner will ensure that the total length of the unsigned solution will not exceed
 		/// this value.
+		#[pallet::constant]
 		type MinerMaxLength: Get<u32>;
 
 		/// Something that will provide the election data.
diff --git a/frame/gilt/src/lib.rs b/frame/gilt/src/lib.rs
index 23596a8b6e14..6956191ecb4d 100644
--- a/frame/gilt/src/lib.rs
+++ b/frame/gilt/src/lib.rs
@@ -117,6 +117,7 @@ pub mod pallet {
 
 		/// The issuance to ignore. This is subtracted from the `Currency`'s `total_issuance` to get
 		/// the issuance by which we inflate or deflate the gilt.
+		#[pallet::constant]
 		type IgnoredIssuance: Get<BalanceOf<Self>>;
 
 		/// Number of duration queues in total. This sets the maximum duration supported, which is
diff --git a/frame/im-online/src/lib.rs b/frame/im-online/src/lib.rs
index 3df5df7bb4d7..90ba04f3b60d 100644
--- a/frame/im-online/src/lib.rs
+++ b/frame/im-online/src/lib.rs
@@ -280,6 +280,7 @@ pub mod pallet {
 		///
 		/// This is exposed so that it can be tuned for particular runtime, when
 		/// multiple pallets send unsigned transactions.
+		#[pallet::constant]
 		type UnsignedPriority: Get<TransactionPriority>;
 
 		/// Weight information for extrinsics in this pallet.
diff --git a/frame/lottery/src/lib.rs b/frame/lottery/src/lib.rs
index 53cadbf02b94..c979500b36f0 100644
--- a/frame/lottery/src/lib.rs
+++ b/frame/lottery/src/lib.rs
@@ -156,6 +156,7 @@ pub mod pallet {
 		/// Number of time we should try to generate a random number that has no modulo bias.
 		/// The larger this number, the more potential computation is used for picking the winner,
 		/// but also the more likely that the chosen winner is done fairly.
+		#[pallet::constant]
 		type MaxGenerateRandom: Get<u32>;
 
 		/// Weight information for extrinsics in this pallet.
diff --git a/frame/scheduler/src/lib.rs b/frame/scheduler/src/lib.rs
index f1abea29e153..4fdf1891be99 100644
--- a/frame/scheduler/src/lib.rs
+++ b/frame/scheduler/src/lib.rs
@@ -148,6 +148,7 @@ pub mod pallet {
 
 		/// The maximum weight that may be scheduled per block for any dispatchables of less priority
 		/// than `schedule::HARD_DEADLINE`.
+		#[pallet::constant]
 		type MaximumWeight: Get<Weight>;
 
 		/// Required origin to schedule or cancel calls.
@@ -155,6 +156,7 @@ pub mod pallet {
 
 		/// The maximum number of scheduled calls in the queue for a single block.
 		/// Not strictly enforced, but used for weight estimation.
+		#[pallet::constant]
 		type MaxScheduledPerBlock: Get<u32>;
 
 		/// Weight information for extrinsics in this pallet.
diff --git a/frame/scored-pool/src/lib.rs b/frame/scored-pool/src/lib.rs
index 2279bdfbfc5f..5892862b4307 100644
--- a/frame/scored-pool/src/lib.rs
+++ b/frame/scored-pool/src/lib.rs
@@ -141,10 +141,12 @@ pub mod pallet {
 		// The deposit which is reserved from candidates if they want to
 		// start a candidacy. The deposit gets returned when the candidacy is
 		// withdrawn or when the candidate is kicked.
+		#[pallet::constant]
 		type CandidateDeposit: Get<BalanceOf<Self, I>>;
 
 		/// Every `Period` blocks the `Members` are filled with the highest scoring
 		/// members in the `Pool`.
+		#[pallet::constant]
 		type Period: Get<Self::BlockNumber>;
 
 		/// The receiver of the signal for when the membership has been initialized.
diff --git a/frame/treasury/src/lib.rs b/frame/treasury/src/lib.rs
index dd89ec079152..b6b9097e3a36 100644
--- a/frame/treasury/src/lib.rs
+++ b/frame/treasury/src/lib.rs
@@ -187,6 +187,7 @@ pub mod pallet {
 		type SpendFunds: SpendFunds<Self, I>;
 
 		/// The maximum number of approvals that can wait in the spending queue.
+		#[pallet::constant]
 		type MaxApprovals: Get<u32>;
 	}
 
diff --git a/frame/uniques/src/lib.rs b/frame/uniques/src/lib.rs
index 70a9e58d7bfa..2275be6419ca 100644
--- a/frame/uniques/src/lib.rs
+++ b/frame/uniques/src/lib.rs
@@ -79,28 +79,36 @@ pub mod pallet {
 		type ForceOrigin: EnsureOrigin<Self::Origin>;
 
 		/// The basic amount of funds that must be reserved for an asset class.
+		#[pallet::constant]
 		type ClassDeposit: Get<DepositBalanceOf<Self, I>>;
 
 		/// The basic amount of funds that must be reserved for an asset instance.
+		#[pallet::constant]
 		type InstanceDeposit: Get<DepositBalanceOf<Self, I>>;
 
 		/// The basic amount of funds that must be reserved when adding metadata to your asset.
+		#[pallet::constant]
 		type MetadataDepositBase: Get<DepositBalanceOf<Self, I>>;
 
 		/// The basic amount of funds that must be reserved when adding an attribute to an asset.
+		#[pallet::constant]
 		type AttributeDepositBase: Get<DepositBalanceOf<Self, I>>;
 
 		/// The additional funds that must be reserved for the number of bytes store in metadata,
 		/// either "normal" metadata or attribute metadata.
+		#[pallet::constant]
 		type DepositPerByte: Get<DepositBalanceOf<Self, I>>;
 
 		/// The maximum length of data stored on-chain.
+		#[pallet::constant]
 		type StringLimit: Get<u32>;
 
 		/// The maximum length of an attribute key.
+		#[pallet::constant]
 		type KeyLimit: Get<u32>;
 
 		/// The maximum length of an attribute value.
+		#[pallet::constant]
 		type ValueLimit: Get<u32>;
 
 		/// Weight information for extrinsics in this pallet.

From 61a1d9c0587037d2df46c94d4feb7e971efaf790 Mon Sep 17 00:00:00 2001
From: Antoine Estienne <estienne.antoine@gmail.com>
Date: Mon, 19 Jul 2021 09:38:44 +0200
Subject: [PATCH 0999/1194] change moonbeam to secp256k1 (#9337)

---
 ss58-registry.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ss58-registry.json b/ss58-registry.json
index 50cda1905946..e46d097e25db 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -574,7 +574,7 @@
 			"displayName": "Moonbeam",
 			"symbols": ["GLMR"],
 			"decimals": [18],
-			"standardAccount": "*25519",
+			"standardAccount": "secp256k1",
 			"website": "https://moonbeam.network"
 		},
 		{
@@ -583,7 +583,7 @@
 			"displayName": "Moonriver",
 			"symbols": ["MOVR"],
 			"decimals": [18],
-			"standardAccount": "*25519",
+			"standardAccount": "secp256k1",
 			"website": "https://moonbeam.network"
 		},
 		{

From 88f147a9849688b22ea9f2689e636c30e030242a Mon Sep 17 00:00:00 2001
From: Pierre Besson <pierre.besson@parity.io>
Date: Mon, 19 Jul 2021 11:42:47 +0200
Subject: [PATCH 1000/1194] remove the kubernetes helm chart (#9364)

---
 .maintain/kubernetes/Chart.yaml               |  12 --
 .maintain/kubernetes/README.md                |  47 ------
 .../templates/poddisruptionbudget.yaml        |  10 --
 .maintain/kubernetes/templates/secrets.yaml   |  11 --
 .maintain/kubernetes/templates/service.yaml   |  54 -------
 .../kubernetes/templates/serviceaccount.yaml  |  10 --
 .../kubernetes/templates/statefulset.yaml     | 139 ------------------
 .maintain/kubernetes/values.yaml              |  59 --------
 8 files changed, 342 deletions(-)
 delete mode 100644 .maintain/kubernetes/Chart.yaml
 delete mode 100644 .maintain/kubernetes/README.md
 delete mode 100644 .maintain/kubernetes/templates/poddisruptionbudget.yaml
 delete mode 100644 .maintain/kubernetes/templates/secrets.yaml
 delete mode 100644 .maintain/kubernetes/templates/service.yaml
 delete mode 100644 .maintain/kubernetes/templates/serviceaccount.yaml
 delete mode 100644 .maintain/kubernetes/templates/statefulset.yaml
 delete mode 100644 .maintain/kubernetes/values.yaml

diff --git a/.maintain/kubernetes/Chart.yaml b/.maintain/kubernetes/Chart.yaml
deleted file mode 100644
index 8e000ae09f1c..000000000000
--- a/.maintain/kubernetes/Chart.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: substrate
-version: 0.2
-appVersion: 0.9.1
-description: "Substrate: The platform for blockchain innovators"
-home: https://substrate.network/
-icon: https://substrate.network/favicon.ico
-sources:
-  - https://github.com/paritytech/substrate/
-maintainers:
-  - name: Paritytech Devops Team
-    email: devops-team@parity.io
-tillerVersion: ">=2.8.0"
diff --git a/.maintain/kubernetes/README.md b/.maintain/kubernetes/README.md
deleted file mode 100644
index 0f3ec3899037..000000000000
--- a/.maintain/kubernetes/README.md
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-# Substrate Kubernetes Helm Chart
-
-This [Helm Chart](https://helm.sh/) can be used for deploying containerized 
-**Substrate** to a [Kubernetes](https://kubernetes.io/) cluster.
-
-
-## Prerequisites
-
-- Tested on Kubernetes 1.10.7-gke.6
-
-## Installation
-
-To install the chart with the release name `my-release` into namespace 
-`my-namespace` from within this directory:
-
-```console
-$ helm install --namespace my-namespace --name my-release --values values.yaml ./
-```
-
-The command deploys Substrate on the Kubernetes cluster in the configuration 
-given in `values.yaml`. When the namespace is omitted it'll be installed in 
-the default one.
-
-
-## Removal of the Chart
-
-To uninstall/delete the `my-release` deployment:
-
-```console
-$ helm delete --namespace my-namespace my-release
-```
-
-The command removes all the Kubernetes components associated with the chart and deletes the release.
-
-
-## Upgrading
-
-Once the chart is installed and a new version should be deployed helm takes 
-care of this by
-
-```console
-$ helm upgrade --namespace my-namespace --values values.yaml my-release ./
-```
-
-
diff --git a/.maintain/kubernetes/templates/poddisruptionbudget.yaml b/.maintain/kubernetes/templates/poddisruptionbudget.yaml
deleted file mode 100644
index 56958b1fbafd..000000000000
--- a/.maintain/kubernetes/templates/poddisruptionbudget.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: policy/v1beta1
-kind: PodDisruptionBudget
-metadata:
-  name: {{ .Values.GitlabEnvSlug | default .Values.app }}
-spec:
-  selector:
-    matchLabels:
-      app: {{ .Values.GitlabEnvSlug | default .Values.app }}
-  maxUnavailable: 1
-
diff --git a/.maintain/kubernetes/templates/secrets.yaml b/.maintain/kubernetes/templates/secrets.yaml
deleted file mode 100644
index 97e73ae7ff03..000000000000
--- a/.maintain/kubernetes/templates/secrets.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-{{- if .Values.validator.keys }}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ .Values.app }}-secrets
-  labels:
-    app: {{ .Values.GitlabEnvSlug | default .Values.app }}
-type: Opaque
-data:
-  secrets: {{ .Values.validator.keys | default "" }}
-{{- end }}
diff --git a/.maintain/kubernetes/templates/service.yaml b/.maintain/kubernetes/templates/service.yaml
deleted file mode 100644
index b14bb74c10a1..000000000000
--- a/.maintain/kubernetes/templates/service.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-# see:
-# https://kubernetes.io/docs/tutorials/services/
-# https://kubernetes.io/docs/concepts/services-networking/service/
-# headless service for rpc
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Values.app }}-rpc
-spec:
-  ports:
-  - port: 9933
-    name: http-rpc
-  - port: 9944
-    name: websocket-rpc
-  selector:
-    app: {{ .Values.GitlabEnvSlug | default .Values.app }}
-  sessionAffinity: None
-  type: ClusterIP
-  clusterIP: None
----
-{{- if .Values.listen_node_port }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Values.app }}
-spec:
-  ports:
-  - port: 30333
-    name: p2p
-    nodePort: 30333
-    protocol: TCP
-  selector:
-    app: {{ .Values.GitlabEnvSlug | default .Values.app }}
-  sessionAffinity: None
-  type: NodePort
-  # don't route external traffic to non-local pods
-  externalTrafficPolicy: Local
-{{- else if .Values.validator.keys }}
-{{- $root := . -}}
-{{- range until (int .Values.nodes.replicas) }}
----
-kind: Service
-apiVersion: v1
-metadata:
-  name: {{ $root.Values.app }}-{{ . }}
-spec:
-  selector:
-    statefulset.kubernetes.io/pod-name: {{ $root.Values.app }}-{{ . }}
-  ports:
-    - port: 30333
-      targetPort: 30333
-      protocol: TCP
-{{- end }}
-{{- end }}
diff --git a/.maintain/kubernetes/templates/serviceaccount.yaml b/.maintain/kubernetes/templates/serviceaccount.yaml
deleted file mode 100644
index 53d016bffedf..000000000000
--- a/.maintain/kubernetes/templates/serviceaccount.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-{{- if .Values.rbac.enable }}
-# service account for substrate pods themselves
-# no permissions for the api are required
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  labels:
-    app: {{ .Values.GitlabEnvSlug | default .Values.app }}
-  name: {{ .Values.rbac.name }}
-{{- end }}
diff --git a/.maintain/kubernetes/templates/statefulset.yaml b/.maintain/kubernetes/templates/statefulset.yaml
deleted file mode 100644
index 0f34b3507a1d..000000000000
--- a/.maintain/kubernetes/templates/statefulset.yaml
+++ /dev/null
@@ -1,139 +0,0 @@
-# https://kubernetes.io/docs/tutorials/stateful-application/basic-stateful-set/
-# https://cloud.google.com/kubernetes-engine/docs/concepts/statefulset
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: {{ .Values.app }}
-spec:
-  selector:
-    matchLabels:
-      app: {{ .Values.GitlabEnvSlug | default .Values.app }}
-  serviceName: {{ .Values.app }}
-  replicas: {{ .Values.nodes.replicas }}
-  updateStrategy:
-    type: RollingUpdate
-  podManagementPolicy: Parallel
-  template:
-    metadata:
-      labels:
-        app: {{ .Values.GitlabEnvSlug | default .Values.app }}
-    spec:
-      {{- if .Values.rbac.enable }}
-      serviceAccountName: {{ .Values.rbac.name }}
-      {{- else }}
-      serviceAccountName: default
-      {{- end }}
-      affinity:
-        nodeAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            nodeSelectorTerms:
-            - matchExpressions:
-                - key: node
-                  operator: In
-                  values:
-                  - substrate
-        {{- if .Values.listen_node_port }}
-        podAntiAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            - labelSelector:
-                matchExpressions:
-                  - key: "app"
-                    operator: In
-                    values:
-                    - {{ .Values.app }}
-              topologyKey: "kubernetes.io/hostname"
-        {{- end }}
-      terminationGracePeriodSeconds: 300
-      {{- if .Values.validator.keys }}
-      volumes:
-        - name: {{ .Values.app }}-validator-secrets
-          secret:
-            secretName: {{ .Values.app }}-secrets
-      initContainers:
-      - name: prepare-secrets
-        image: busybox
-        command: [ "/bin/sh" ]
-        args:
-          - -c
-          - sed -n -r "s/^${POD_NAME}-key ([^ ]+)$/\1/p" /etc/validator/secrets > {{ .Values.image.basepath }}/key;
-            sed -n -r "s/^${POD_NAME}-node-key ([^ ]+)$/\1/p" /etc/validator/secrets > {{ .Values.image.basepath }}/node-key;
-            sed -n -r "s/^${POD_NAME}-name ([^ ]+)$/\1/p" /etc/validator/secrets > {{ .Values.image.basepath }}/name;
-            test -s {{ .Values.image.basepath }}/name || echo "${POD_NAME}" > {{ .Values.image.basepath }}/name
-        env:
-          # from (workaround for hostname)
-          # https://kubernetes.io/docs/tasks/inject-data-application/environment-variable-expose-pod-information/
-          - name: POD_NAME
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.name
-        volumeMounts:
-        - name: {{ .Values.app }}-validator-secrets
-          readOnly: true
-          mountPath: "/etc/validator"
-        - name: {{ .Values.app }}dir
-          mountPath: {{ .Values.image.basepath }}
-      {{- end }}
-      containers:
-      - name: {{ .Values.app }}
-        imagePullPolicy: "{{ .Values.image.pullPolicy }}"
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-        {{- if .Values.resources }}
-        resources:
-          requests:
-            memory: {{ .Values.resources.memory }}
-            cpu: {{ .Values.resources.cpu }}
-        {{- end }}
-        ports:
-        - containerPort: 30333
-          name: p2p
-        - containerPort: 9933
-          name: http-rpc
-        - containerPort: 9944
-          name: websocket-rpc
-        command: ["/bin/sh"]
-        args:
-          - -c
-          - exec /usr/local/bin/substrate
-            --base-path {{ .Values.image.basepath }}
-            {{- if .Values.validator.keys }}
-            --validator
-            --name $(cat {{ .Values.image.basepath }}/name)
-            --key $(cat {{ .Values.image.basepath }}/key)
-            --node-key $(cat {{ .Values.image.basepath }}/node-key)
-            {{- else }}
-            --name $(POD_NAME)
-            {{- end }}
-            {{- range .Values.nodes.args }} {{ . }} {{- end }}
-        env:
-          - name: POD_NAME
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.name
-        volumeMounts:
-        - name: {{ .Values.app }}dir
-          mountPath: {{ .Values.image.basepath }}
-        readinessProbe:
-          httpGet:
-            path: /health
-            port: http-rpc
-          initialDelaySeconds: 10
-          periodSeconds: 10
-        livenessProbe:
-          httpGet:
-            path: /health
-            port: http-rpc
-          initialDelaySeconds: 10
-          periodSeconds: 10
-      securityContext:
-        runAsUser: 1000
-        fsGroup: 1000
-  volumeClaimTemplates:
-  - metadata:
-      name: {{ .Values.app }}dir
-    spec:
-      accessModes: [ "ReadWriteOnce" ]
-      storageClassName: ssd
-      resources:
-        requests:
-          storage: 32Gi
-
diff --git a/.maintain/kubernetes/values.yaml b/.maintain/kubernetes/values.yaml
deleted file mode 100644
index 4c3cb5c7d702..000000000000
--- a/.maintain/kubernetes/values.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-# set tag manually --set image.tag=latest
-image:
-  repository: parity/substrate
-  tag: latest
-  pullPolicy: Always
-  basepath: /substrate
-
-
-# if set to true a service account for substrate will be created
-rbac:
-  enable: true
-  name: substrate
-
-
-# name of the statefulset
-app: substrate
-listen_node_port: true
-
-nodes:
-  replicas: 2
-  args:
-    # name and data directory are set by the chart itself
-    # key and node-key may be provided on commandline invocation
-    #
-    # - --chain
-    # - krummelanke
-    # serve rpc within the local network
-    # - fenced off the world via firewall
-    # - used for health checks
-    - --rpc-external
-    - --ws-external
-    # - --log
-    # - sub-libp2p=trace
-
-
-validator: {}
-  # providing 'keys' string via --set commandline parameter will run the nodes
-  # in validator mode (--validator).
-  #
-  # name, key and node-key can be given in a base64 encoded keyfile string (at
-  # validator.keys) which has the following format:
-  #
-  # substrate-0-name <node-name>
-  # substrate-0-key <key-seed>
-  # substrate-0-node-key <node-secret-key>
-  # substrate-1-name <node-name>
-  # substrate-1-key <key-seed>
-  # substrate-1-node-key <node-secret-key>
-  #
-  # pod names are canonical. changing these or providing different amount of
-  # keys than the replicas count will lead to behavior no one ever has
-  # experienced before.
-
-
-# maybe adopt resource limits here to the nodes of the pool
-# resources:
-#   memory: "5Gi"
-#   cpu: "1.5"
-

From 04f6f68397b05ca443cc1bba332b0833445a1508 Mon Sep 17 00:00:00 2001
From: Ashley <ashley.ruglys@gmail.com>
Date: Mon, 19 Jul 2021 15:43:08 +0200
Subject: [PATCH 1001/1194] Add a `rustfmt.toml` (#8982)

* Force push to clean up PR mess

* Update rustfmt.toml

Co-authored-by: Squirrel <gilescope@gmail.com>

* Run `cargo fmt` again with Giles' changes

* Unformat utils

Co-authored-by: Squirrel <gilescope@gmail.com>
---
 rustfmt.toml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 rustfmt.toml

diff --git a/rustfmt.toml b/rustfmt.toml
new file mode 100644
index 000000000000..1c9ebe03c02e
--- /dev/null
+++ b/rustfmt.toml
@@ -0,0 +1,22 @@
+# Basic
+hard_tabs = true
+max_width = 100
+use_small_heuristics = "Max"
+# Imports
+imports_granularity = "Crate"
+reorder_imports = true
+# Consistency
+newline_style = "Unix"
+normalize_comments = true
+normalize_doc_attributes = true
+# Misc
+chain_width = 80
+spaces_around_ranges = false
+binop_separator = "Back"
+reorder_impl_items = false
+match_arm_leading_pipes = "Preserve"
+match_arm_blocks = false
+match_block_trailing_comma = true
+trailing_comma = "Vertical"
+trailing_semicolon = false
+use_field_init_shorthand = true

From 03d4d0d7c129eec3d3ab2876bddbe5d6dfa1f178 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 20 Jul 2021 10:39:26 +0200
Subject: [PATCH 1002/1194] Remove `IncRefError`, `DecRefError` and
 `StoredMapError` (#9384)

All of them are a subset of `DispatchError` anyway, no need to have
special errors IMHO.
---
 frame/assets/src/impl_stored_map.rs    |  6 +--
 frame/assets/src/lib.rs                |  5 +--
 frame/balances/src/lib.rs              | 12 +++---
 frame/support/src/traits/misc.rs       |  6 +--
 frame/support/src/traits/stored_map.rs | 24 ++++++------
 frame/system/src/lib.rs                | 54 ++++++++------------------
 frame/system/src/tests.rs              |  8 ++--
 primitives/runtime/src/lib.rs          |  9 -----
 primitives/runtime/src/traits.rs       | 19 ---------
 9 files changed, 45 insertions(+), 98 deletions(-)

diff --git a/frame/assets/src/impl_stored_map.rs b/frame/assets/src/impl_stored_map.rs
index 6e91e5c1322f..4c1ff1a0c602 100644
--- a/frame/assets/src/impl_stored_map.rs
+++ b/frame/assets/src/impl_stored_map.rs
@@ -29,7 +29,7 @@ impl<T: Config<I>, I: 'static> StoredMap<(T::AssetId, T::AccountId), T::Extra> f
 		}
 	}
 
-	fn try_mutate_exists<R, E: From<StoredMapError>>(
+	fn try_mutate_exists<R, E: From<DispatchError>>(
 		id_who: &(T::AssetId, T::AccountId),
 		f: impl FnOnce(&mut Option<T::Extra>) -> Result<R, E>,
 	) -> Result<R, E> {
@@ -46,11 +46,11 @@ impl<T: Config<I>, I: 'static> StoredMap<(T::AssetId, T::AccountId), T::Extra> f
 				if let Some(ref mut account) = maybe_account {
 					account.extra = extra;
 				} else {
-					Err(StoredMapError::NoProviders)?;
+					Err(DispatchError::NoProviders)?;
 				}
 			} else {
 				// They want to delete it. Let this pass if the item never existed anyway.
-				ensure!(maybe_account.is_none(), StoredMapError::ConsumerRemaining);
+				ensure!(maybe_account.is_none(), DispatchError::ConsumerRemaining);
 			}
 			Ok(r)
 		})
diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index 2531f14f45d0..5c1370ed2852 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -141,10 +141,7 @@ pub use types::*;
 use sp_std::{prelude::*, borrow::Borrow, convert::TryInto};
 use sp_runtime::{
 	TokenError, ArithmeticError,
-	traits::{
-		AtLeast32BitUnsigned, Zero, StaticLookup, Saturating, CheckedSub, CheckedAdd, Bounded,
-		StoredMapError,
-	}
+	traits::{AtLeast32BitUnsigned, Zero, StaticLookup, Saturating, CheckedSub, CheckedAdd, Bounded}
 };
 use codec::HasCompact;
 use frame_support::{ensure, dispatch::{DispatchError, DispatchResult}};
diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index 6e3a3b1e2ff8..7a092a75b23d 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -175,7 +175,7 @@ use sp_runtime::{
 	RuntimeDebug, DispatchResult, DispatchError, ArithmeticError,
 	traits::{
 		Zero, AtLeast32BitUnsigned, StaticLookup, CheckedAdd, CheckedSub,
-		MaybeSerializeDeserialize, Saturating, Bounded, StoredMapError,
+		MaybeSerializeDeserialize, Saturating, Bounded,
 	},
 };
 use frame_system as system;
@@ -830,8 +830,8 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	pub fn mutate_account<R>(
 		who: &T::AccountId,
 		f: impl FnOnce(&mut AccountData<T::Balance>) -> R,
-	) -> Result<R, StoredMapError> {
-		Self::try_mutate_account(who, |a, _| -> Result<R, StoredMapError> { Ok(f(a)) })
+	) -> Result<R, DispatchError> {
+		Self::try_mutate_account(who, |a, _| -> Result<R, DispatchError> { Ok(f(a)) })
 	}
 
 	/// Mutate an account to some new value, or delete it entirely with `None`. Will enforce
@@ -843,7 +843,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	///
 	/// NOTE: LOW-LEVEL: This will not attempt to maintain total issuance. It is expected that
 	/// the caller will do this.
-	fn try_mutate_account<R, E: From<StoredMapError>>(
+	fn try_mutate_account<R, E: From<DispatchError>>(
 		who: &T::AccountId,
 		f: impl FnOnce(&mut AccountData<T::Balance>, bool) -> Result<R, E>,
 	) -> Result<R, E> {
@@ -867,7 +867,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	///
 	/// NOTE: LOW-LEVEL: This will not attempt to maintain total issuance. It is expected that
 	/// the caller will do this.
-	fn try_mutate_account_with_dust<R, E: From<StoredMapError>>(
+	fn try_mutate_account_with_dust<R, E: From<DispatchError>>(
 		who: &T::AccountId,
 		f: impl FnOnce(&mut AccountData<T::Balance>, bool) -> Result<R, E>,
 	) -> Result<(R, DustCleaner<T, I>), E> {
@@ -1449,7 +1449,7 @@ impl<T: Config<I>, I: 'static> Currency<T::AccountId> for Pallet<T, I> where
 
 		for attempt in 0..2 {
 			match Self::try_mutate_account(who,
-				|account, _is_new| -> Result<(Self::NegativeImbalance, Self::Balance), StoredMapError> {
+				|account, _is_new| -> Result<(Self::NegativeImbalance, Self::Balance), DispatchError> {
 					// Best value is the most amount we can slash following liveness rules.
 					let best_value = match attempt {
 						// First attempt we try to slash the full amount, and see if liveness issues happen.
diff --git a/frame/support/src/traits/misc.rs b/frame/support/src/traits/misc.rs
index 7ec29522cbc7..9cab2626cd6c 100644
--- a/frame/support/src/traits/misc.rs
+++ b/frame/support/src/traits/misc.rs
@@ -17,7 +17,7 @@
 
 //! Smaller traits used in FRAME which don't need their own file.
 
-use sp_runtime::traits::{StoredMapError, Block as BlockT};
+use sp_runtime::{traits::Block as BlockT, DispatchError};
 use sp_arithmetic::traits::AtLeast32Bit;
 use crate::dispatch::Parameter;
 
@@ -157,10 +157,10 @@ pub trait OnKilledAccount<AccountId> {
 /// A simple, generic one-parameter event notifier/handler.
 pub trait HandleLifetime<T> {
 	/// An account was created.
-	fn created(_t: &T) -> Result<(), StoredMapError> { Ok(()) }
+	fn created(_t: &T) -> Result<(), DispatchError> { Ok(()) }
 
 	/// An account was killed.
-	fn killed(_t: &T) -> Result<(), StoredMapError> { Ok(()) }
+	fn killed(_t: &T) -> Result<(), DispatchError> { Ok(()) }
 }
 
 impl<T> HandleLifetime<T> for () {}
diff --git a/frame/support/src/traits/stored_map.rs b/frame/support/src/traits/stored_map.rs
index 10964541ab32..0e1660df546f 100644
--- a/frame/support/src/traits/stored_map.rs
+++ b/frame/support/src/traits/stored_map.rs
@@ -18,7 +18,7 @@
 //! Traits and associated datatypes for managing abstract stored values.
 
 use codec::FullCodec;
-use sp_runtime::traits::StoredMapError;
+use sp_runtime::DispatchError;
 use crate::storage::StorageMap;
 use crate::traits::misc::HandleLifetime;
 
@@ -31,7 +31,7 @@ pub trait StoredMap<K, T: Default> {
 
 	/// Maybe mutate the item only if an `Ok` value is returned from `f`. Do nothing if an `Err` is
 	/// returned. It is removed or reset to default value if it has been mutated to `None`
-	fn try_mutate_exists<R, E: From<StoredMapError>>(
+	fn try_mutate_exists<R, E: From<DispatchError>>(
 		k: &K,
 		f: impl FnOnce(&mut Option<T>) -> Result<R, E>,
 	) -> Result<R, E>;
@@ -39,7 +39,7 @@ pub trait StoredMap<K, T: Default> {
 	// Everything past here has a default implementation.
 
 	/// Mutate the item.
-	fn mutate<R>(k: &K, f: impl FnOnce(&mut T) -> R) -> Result<R, StoredMapError> {
+	fn mutate<R>(k: &K, f: impl FnOnce(&mut T) -> R) -> Result<R, DispatchError> {
 		Self::mutate_exists(k, |maybe_account| match maybe_account {
 			Some(ref mut account) => f(account),
 			x @ None => {
@@ -57,15 +57,15 @@ pub trait StoredMap<K, T: Default> {
 	fn mutate_exists<R>(
 		k: &K,
 		f: impl FnOnce(&mut Option<T>) -> R,
-	) -> Result<R, StoredMapError> {
-		Self::try_mutate_exists(k, |x| -> Result<R, StoredMapError> { Ok(f(x)) })
+	) -> Result<R, DispatchError> {
+		Self::try_mutate_exists(k, |x| -> Result<R, DispatchError> { Ok(f(x)) })
 	}
 
 	/// Set the item to something new.
-	fn insert(k: &K, t: T) -> Result<(), StoredMapError> { Self::mutate(k, |i| *i = t) }
+	fn insert(k: &K, t: T) -> Result<(), DispatchError> { Self::mutate(k, |i| *i = t) }
 
 	/// Remove the item or otherwise replace it with its default value; we don't care which.
-	fn remove(k: &K) -> Result<(), StoredMapError> { Self::mutate_exists(k, |x| *x = None) }
+	fn remove(k: &K) -> Result<(), DispatchError> { Self::mutate_exists(k, |x| *x = None) }
 }
 
 /// A shim for placing around a storage item in order to use it as a `StoredValue`. Ideally this
@@ -87,27 +87,27 @@ impl<
 	T: FullCodec + Default,
 > StoredMap<K, T> for StorageMapShim<S, L, K, T> {
 	fn get(k: &K) -> T { S::get(k) }
-	fn insert(k: &K, t: T) -> Result<(), StoredMapError> {
+	fn insert(k: &K, t: T) -> Result<(), DispatchError> {
 		if !S::contains_key(&k) {
 			L::created(k)?;
 		}
 		S::insert(k, t);
 		Ok(())
 	}
-	fn remove(k: &K) -> Result<(), StoredMapError> {
+	fn remove(k: &K) -> Result<(), DispatchError> {
 		if S::contains_key(&k) {
 			L::killed(&k)?;
 			S::remove(k);
 		}
 		Ok(())
 	}
-	fn mutate<R>(k: &K, f: impl FnOnce(&mut T) -> R) -> Result<R, StoredMapError> {
+	fn mutate<R>(k: &K, f: impl FnOnce(&mut T) -> R) -> Result<R, DispatchError> {
 		if !S::contains_key(&k) {
 			L::created(k)?;
 		}
 		Ok(S::mutate(k, f))
 	}
-	fn mutate_exists<R>(k: &K, f: impl FnOnce(&mut Option<T>) -> R) -> Result<R, StoredMapError> {
+	fn mutate_exists<R>(k: &K, f: impl FnOnce(&mut Option<T>) -> R) -> Result<R, DispatchError> {
 		S::try_mutate_exists(k, |maybe_value| {
 			let existed = maybe_value.is_some();
 			let r = f(maybe_value);
@@ -121,7 +121,7 @@ impl<
 			Ok(r)
 		})
 	}
-	fn try_mutate_exists<R, E: From<StoredMapError>>(
+	fn try_mutate_exists<R, E: From<DispatchError>>(
 		k: &K,
 		f: impl FnOnce(&mut Option<T>) -> Result<R, E>,
 	) -> Result<R, E> {
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index e3fa45e70f7d..1c16514750d9 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -78,7 +78,7 @@ use sp_runtime::{
 		self, CheckEqual, AtLeast32Bit, Zero, Lookup, LookupError,
 		SimpleBitOps, Hash, Member, MaybeDisplay, BadOrigin,
 		MaybeSerializeDeserialize, MaybeMallocSizeOf, StaticLookup, One, Bounded,
-		Dispatchable, AtLeast32BitUnsigned, Saturating, StoredMapError, BlockNumberProvider,
+		Dispatchable, AtLeast32BitUnsigned, Saturating, BlockNumberProvider,
 	},
 };
 
@@ -1025,20 +1025,6 @@ pub enum DecRefStatus {
 	Exists,
 }
 
-/// Some resultant status relevant to decrementing a provider reference.
-#[derive(Eq, PartialEq, RuntimeDebug)]
-pub enum DecRefError {
-	/// Account cannot have the last provider reference removed while there is a consumer.
-	ConsumerRemaining,
-}
-
-/// Some resultant status relevant to incrementing a consumer reference.
-#[derive(Eq, PartialEq, RuntimeDebug)]
-pub enum IncRefError {
-	/// Account cannot introduce a consumer while there are no providers.
-	NoProviders,
-}
-
 impl<T: Config> Pallet<T> {
 	pub fn account_exists(who: &T::AccountId) -> bool {
 		Account::<T>::contains_key(who)
@@ -1085,7 +1071,7 @@ impl<T: Config> Pallet<T> {
 	/// Decrement the provider reference counter on an account.
 	///
 	/// This *MUST* only be done once for every time you called `inc_providers` on `who`.
-	pub fn dec_providers(who: &T::AccountId) -> Result<DecRefStatus, DecRefError> {
+	pub fn dec_providers(who: &T::AccountId) -> Result<DecRefStatus, DispatchError> {
 		Account::<T>::try_mutate_exists(who, |maybe_account| {
 			if let Some(mut account) = maybe_account.take() {
 				if account.providers == 0 {
@@ -1105,7 +1091,7 @@ impl<T: Config> Pallet<T> {
 					}
 					(1, c, _) if c > 0 => {
 						// Cannot remove last provider if there are consumers.
-						Err(DecRefError::ConsumerRemaining)
+						Err(DispatchError::ConsumerRemaining)
 					}
 					(x, _, _) => {
 						// Account will continue to exist as there is either > 1 provider or
@@ -1191,12 +1177,12 @@ impl<T: Config> Pallet<T> {
 	/// Increment the reference counter on an account.
 	///
 	/// The account `who`'s `providers` must be non-zero or this will return an error.
-	pub fn inc_consumers(who: &T::AccountId) -> Result<(), IncRefError> {
+	pub fn inc_consumers(who: &T::AccountId) -> Result<(), DispatchError> {
 		Account::<T>::try_mutate(who, |a| if a.providers > 0 {
 			a.consumers = a.consumers.saturating_add(1);
 			Ok(())
 		} else {
-			Err(IncRefError::NoProviders)
+			Err(DispatchError::NoProviders)
 		})
 	}
 
@@ -1559,27 +1545,23 @@ impl<T: Config> Pallet<T> {
 /// Event handler which registers a provider when created.
 pub struct Provider<T>(PhantomData<T>);
 impl<T: Config> HandleLifetime<T::AccountId> for Provider<T> {
-	fn created(t: &T::AccountId) -> Result<(), StoredMapError> {
+	fn created(t: &T::AccountId) -> Result<(), DispatchError> {
 		Pallet::<T>::inc_providers(t);
 		Ok(())
 	}
-	fn killed(t: &T::AccountId) -> Result<(), StoredMapError> {
-		Pallet::<T>::dec_providers(t)
-			.map(|_| ())
-			.or_else(|e| match e {
-				DecRefError::ConsumerRemaining => Err(StoredMapError::ConsumerRemaining),
-			})
+	fn killed(t: &T::AccountId) -> Result<(), DispatchError> {
+		Pallet::<T>::dec_providers(t).map(|_| ())
 	}
 }
 
 /// Event handler which registers a self-sufficient when created.
 pub struct SelfSufficient<T>(PhantomData<T>);
 impl<T: Config> HandleLifetime<T::AccountId> for SelfSufficient<T> {
-	fn created(t: &T::AccountId) -> Result<(), StoredMapError> {
+	fn created(t: &T::AccountId) -> Result<(), DispatchError> {
 		Pallet::<T>::inc_sufficients(t);
 		Ok(())
 	}
-	fn killed(t: &T::AccountId) -> Result<(), StoredMapError> {
+	fn killed(t: &T::AccountId) -> Result<(), DispatchError> {
 		Pallet::<T>::dec_sufficients(t);
 		Ok(())
 	}
@@ -1588,13 +1570,10 @@ impl<T: Config> HandleLifetime<T::AccountId> for SelfSufficient<T> {
 /// Event handler which registers a consumer when created.
 pub struct Consumer<T>(PhantomData<T>);
 impl<T: Config> HandleLifetime<T::AccountId> for Consumer<T> {
-	fn created(t: &T::AccountId) -> Result<(), StoredMapError> {
+	fn created(t: &T::AccountId) -> Result<(), DispatchError> {
 		Pallet::<T>::inc_consumers(t)
-			.map_err(|e| match e {
-				IncRefError::NoProviders => StoredMapError::NoProviders
-			})
 	}
-	fn killed(t: &T::AccountId) -> Result<(), StoredMapError> {
+	fn killed(t: &T::AccountId) -> Result<(), DispatchError> {
 		Pallet::<T>::dec_consumers(t);
 		Ok(())
 	}
@@ -1623,7 +1602,7 @@ impl<T: Config> StoredMap<T::AccountId, T::AccountData> for Pallet<T> {
 		Account::<T>::get(k).data
 	}
 
-	fn try_mutate_exists<R, E: From<StoredMapError>>(
+	fn try_mutate_exists<R, E: From<DispatchError>>(
 		k: &T::AccountId,
 		f: impl FnOnce(&mut Option<T::AccountData>) -> Result<R, E>,
 	) -> Result<R, E> {
@@ -1635,10 +1614,9 @@ impl<T: Config> StoredMap<T::AccountId, T::AccountData> for Pallet<T> {
 		if !was_providing && is_providing {
 			Self::inc_providers(k);
 		} else if was_providing && !is_providing {
-			match Self::dec_providers(k) {
-				Err(DecRefError::ConsumerRemaining) => Err(StoredMapError::ConsumerRemaining)?,
-				Ok(DecRefStatus::Reaped) => return Ok(result),
-				Ok(DecRefStatus::Exists) => {
+			match Self::dec_providers(k)? {
+				DecRefStatus::Reaped => return Ok(result),
+				DecRefStatus::Exists => {
 					// Update value as normal...
 				}
 			}
diff --git a/frame/system/src/tests.rs b/frame/system/src/tests.rs
index df28e2c118c2..77d4baee88ac 100644
--- a/frame/system/src/tests.rs
+++ b/frame/system/src/tests.rs
@@ -121,18 +121,18 @@ fn sufficient_cannot_support_consumer() {
 		assert_eq!(System::inc_sufficients(&0), IncRefStatus::Created);
 		System::inc_account_nonce(&0);
 		assert_eq!(System::account_nonce(&0), 1);
-		assert_noop!(System::inc_consumers(&0), IncRefError::NoProviders);
+		assert_noop!(System::inc_consumers(&0), DispatchError::NoProviders);
 
 		assert_eq!(System::inc_providers(&0), IncRefStatus::Existed);
 		assert_ok!(System::inc_consumers(&0));
-		assert_noop!(System::dec_providers(&0), DecRefError::ConsumerRemaining);
+		assert_noop!(System::dec_providers(&0), DispatchError::ConsumerRemaining);
 	});
 }
 
 #[test]
 fn provider_required_to_support_consumer() {
 	new_test_ext().execute_with(|| {
-		assert_noop!(System::inc_consumers(&0), IncRefError::NoProviders);
+		assert_noop!(System::inc_consumers(&0), DispatchError::NoProviders);
 
 		assert_eq!(System::inc_providers(&0), IncRefStatus::Created);
 		System::inc_account_nonce(&0);
@@ -143,7 +143,7 @@ fn provider_required_to_support_consumer() {
 		assert_eq!(System::account_nonce(&0), 1);
 
 		assert_ok!(System::inc_consumers(&0));
-		assert_noop!(System::dec_providers(&0), DecRefError::ConsumerRemaining);
+		assert_noop!(System::dec_providers(&0), DispatchError::ConsumerRemaining);
 
 		System::dec_consumers(&0);
 		assert_eq!(System::dec_providers(&0).unwrap(), DecRefStatus::Reaped);
diff --git a/primitives/runtime/src/lib.rs b/primitives/runtime/src/lib.rs
index 9bc23be1e975..6ad721079fb7 100644
--- a/primitives/runtime/src/lib.rs
+++ b/primitives/runtime/src/lib.rs
@@ -516,15 +516,6 @@ impl From<crate::traits::BadOrigin> for DispatchError {
 	}
 }
 
-impl From<crate::traits::StoredMapError> for DispatchError {
-	fn from(e: crate::traits::StoredMapError) -> Self {
-		match e {
-			crate::traits::StoredMapError::ConsumerRemaining => Self::ConsumerRemaining,
-			crate::traits::StoredMapError::NoProviders => Self::NoProviders,
-		}
-	}
-}
-
 /// Description of what went wrong when trying to complete an operation on a token.
 #[derive(Eq, PartialEq, Clone, Copy, Encode, Decode, Debug)]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
diff --git a/primitives/runtime/src/traits.rs b/primitives/runtime/src/traits.rs
index f03e1be2a5ce..4396c9759823 100644
--- a/primitives/runtime/src/traits.rs
+++ b/primitives/runtime/src/traits.rs
@@ -152,25 +152,6 @@ impl From<BadOrigin> for &'static str {
 	}
 }
 
-/// Error that can be returned by our impl of `StoredMap`.
-#[derive(Encode, Decode, RuntimeDebug)]
-pub enum StoredMapError {
-	/// Attempt to create map value when it is a consumer and there are no providers in place.
-	NoProviders,
-	/// Attempt to anull/remove value when it is the last provider and there is still at
-	/// least one consumer left.
-	ConsumerRemaining,
-}
-
-impl From<StoredMapError> for &'static str {
-	fn from(e: StoredMapError) -> &'static str {
-		match e {
-			StoredMapError::NoProviders => "No providers",
-			StoredMapError::ConsumerRemaining => "Consumer remaining",
-		}
-	}
-}
-
 /// An error that indicates that a lookup failed.
 #[derive(Encode, Decode, RuntimeDebug)]
 pub struct LookupError;

From 84f2d3de88a638943109b9991b6b1ca51041c70a Mon Sep 17 00:00:00 2001
From: Xiliang Chen <xlchen1291@gmail.com>
Date: Wed, 21 Jul 2021 02:40:11 +1200
Subject: [PATCH 1003/1194] include dispatch result in the Executed event
 (#9315)

* include dispatch result in the Executed event

* fix

* trigger CI
---
 frame/democracy/src/benchmarking.rs | 4 ++--
 frame/democracy/src/lib.rs          | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/frame/democracy/src/benchmarking.rs b/frame/democracy/src/benchmarking.rs
index d1d3b3e62bdd..ef2c7de27ba5 100644
--- a/frame/democracy/src/benchmarking.rs
+++ b/frame/democracy/src/benchmarking.rs
@@ -25,7 +25,7 @@ use frame_support::{
 	traits::{Currency, Get, EnsureOrigin, OnInitialize, UnfilteredDispatchable, schedule::DispatchTime},
 };
 use frame_system::{RawOrigin, Pallet as System, self};
-use sp_runtime::traits::{Bounded, One};
+use sp_runtime::traits::{Bounded, One, BadOrigin};
 
 use crate::Pallet as Democracy;
 
@@ -759,7 +759,7 @@ benchmarks! {
 	}: enact_proposal(RawOrigin::Root, proposal_hash, 0)
 	verify {
 		// Fails due to mismatched origin
-		assert_last_event::<T>(Event::<T>::Executed(0, false).into());
+		assert_last_event::<T>(Event::<T>::Executed(0, Err(BadOrigin.into())).into());
 	}
 
 	#[extra]
diff --git a/frame/democracy/src/lib.rs b/frame/democracy/src/lib.rs
index 4eace01a5680..42b00b8682a4 100644
--- a/frame/democracy/src/lib.rs
+++ b/frame/democracy/src/lib.rs
@@ -512,8 +512,8 @@ pub mod pallet {
 		NotPassed(ReferendumIndex),
 		/// A referendum has been cancelled. \[ref_index\]
 		Cancelled(ReferendumIndex),
-		/// A proposal has been enacted. \[ref_index, is_ok\]
-		Executed(ReferendumIndex, bool),
+		/// A proposal has been enacted. \[ref_index, result\]
+		Executed(ReferendumIndex, DispatchResult),
 		/// An account has delegated their vote to another account. \[who, target\]
 		Delegated(T::AccountId, T::AccountId),
 		/// An \[account\] has cancelled a previous delegation operation.
@@ -1654,8 +1654,9 @@ impl<T: Config> Pallet<T> {
 				debug_assert!(err_amount.is_zero());
 				Self::deposit_event(Event::<T>::PreimageUsed(proposal_hash, provider, deposit));
 
-				let ok = proposal.dispatch(frame_system::RawOrigin::Root.into()).is_ok();
-				Self::deposit_event(Event::<T>::Executed(index, ok));
+				let res = proposal.dispatch(frame_system::RawOrigin::Root.into())
+					.map(|_| ()).map_err(|e| e.error);
+				Self::deposit_event(Event::<T>::Executed(index, res));
 
 				Ok(())
 			} else {

From f31dff7f1885e04e5b166175f95ddd786c952f43 Mon Sep 17 00:00:00 2001
From: Alexander Popiak <alexander.popiak@parity.io>
Date: Tue, 20 Jul 2021 16:55:54 +0200
Subject: [PATCH 1004/1194] Balance to Asset Balance Conversion (#9076)

* add BalanceConversion trait and implementation

* derive some useful traits on Imbalance

* Update frame/support/src/traits/tokens/fungibles/imbalance.rs

Co-authored-by: Xiliang Chen <xlchen1291@gmail.com>

* make BalanceConversion error type configurable

* add RuntimeDebug import and derive traits on other Imbalance

* formatting

* move BalanceConversion trait to frame-support

* add necessary trait import

Co-authored-by: Xiliang Chen <xlchen1291@gmail.com>
---
 frame/assets/src/lib.rs                       |  6 +-
 frame/assets/src/tests.rs                     | 28 ++++++++-
 frame/assets/src/types.rs                     | 59 +++++++++++++++++++
 frame/support/src/traits/tokens.rs            |  3 +-
 .../src/traits/tokens/fungible/imbalance.rs   |  3 +-
 .../src/traits/tokens/fungibles/imbalance.rs  |  3 +-
 frame/support/src/traits/tokens/misc.rs       |  6 ++
 7 files changed, 99 insertions(+), 9 deletions(-)

diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index 5c1370ed2852..5fe167df3f44 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -144,7 +144,7 @@ use sp_runtime::{
 	traits::{AtLeast32BitUnsigned, Zero, StaticLookup, Saturating, CheckedSub, CheckedAdd, Bounded}
 };
 use codec::HasCompact;
-use frame_support::{ensure, dispatch::{DispatchError, DispatchResult}};
+use frame_support::pallet_prelude::*;
 use frame_support::traits::{Currency, ReservableCurrency, BalanceStatus::Reserved, StoredMap};
 use frame_support::traits::tokens::{WithdrawConsequence, DepositConsequence, fungibles};
 use frame_system::Config as SystemConfig;
@@ -154,10 +154,6 @@ pub use pallet::*;
 
 #[frame_support::pallet]
 pub mod pallet {
-	use frame_support::{
-		dispatch::DispatchResult,
-		pallet_prelude::*,
-	};
 	use frame_system::pallet_prelude::*;
 	use super::*;
 
diff --git a/frame/assets/src/tests.rs b/frame/assets/src/tests.rs
index b8eb2e40f8af..c2cf9acf29bd 100644
--- a/frame/assets/src/tests.rs
+++ b/frame/assets/src/tests.rs
@@ -19,7 +19,7 @@
 
 use super::*;
 use crate::{Error, mock::*};
-use sp_runtime::TokenError;
+use sp_runtime::{TokenError, traits::ConvertInto};
 use frame_support::{assert_ok, assert_noop, traits::Currency};
 use pallet_balances::Error as BalancesError;
 
@@ -699,3 +699,29 @@ fn force_asset_status_should_work(){
 		assert_eq!(Assets::total_supply(0), 200);
 	});
 }
+
+#[test]
+fn balance_conversion_should_work() {
+	new_test_ext().execute_with(|| {
+		use frame_support::traits::tokens::BalanceConversion;
+
+		let id = 42;
+		assert_ok!(Assets::force_create(Origin::root(), id, 1, true, 10));
+		let not_sufficient = 23;
+		assert_ok!(Assets::force_create(Origin::root(), not_sufficient, 1, false, 10));
+
+		assert_eq!(
+			BalanceToAssetBalance::<Balances, Test, ConvertInto>::to_asset_balance(100, 1234),
+			Err(ConversionError::AssetMissing)
+		);
+		assert_eq!(
+			BalanceToAssetBalance::<Balances, Test, ConvertInto>::to_asset_balance(100, not_sufficient),
+			Err(ConversionError::AssetNotSufficient)
+		);
+		// 10 / 1 == 10 -> the conversion should 10x the value
+		assert_eq!(
+			BalanceToAssetBalance::<Balances, Test, ConvertInto>::to_asset_balance(100, id),
+			Ok(100 * 10)
+		);
+	});
+}
diff --git a/frame/assets/src/types.rs b/frame/assets/src/types.rs
index afd6b536cf18..478905eb68a3 100644
--- a/frame/assets/src/types.rs
+++ b/frame/assets/src/types.rs
@@ -20,6 +20,10 @@
 use super::*;
 use frame_support::pallet_prelude::*;
 
+use frame_support::traits::{fungible, tokens::BalanceConversion};
+use sp_runtime::{FixedPointNumber, FixedPointOperand, FixedU128};
+use sp_runtime::traits::Convert;
+
 pub(super) type DepositBalanceOf<T, I = ()> =
 	<<T as Config<I>>::Currency as Currency<<T as SystemConfig>::AccountId>>::Balance;
 
@@ -177,3 +181,58 @@ impl From<TransferFlags> for DebitFlags {
 		}
 	}
 }
+
+/// Possible errors when converting between external and asset balances.
+#[derive(Eq, PartialEq, Copy, Clone, RuntimeDebug, Encode, Decode)]
+pub enum ConversionError {
+	/// The external minimum balance must not be zero.
+	MinBalanceZero,
+	/// The asset is not present in storage.
+	AssetMissing,
+	/// The asset is not sufficient and thus does not have a reliable `min_balance` so it cannot be converted.
+	AssetNotSufficient,
+}
+
+// Type alias for `frame_system`'s account id.
+type AccountIdOf<T> = <T as frame_system::Config>::AccountId;
+// This pallet's asset id and balance type.
+type AssetIdOf<T, I> = <T as Config<I>>::AssetId;
+type AssetBalanceOf<T, I> = <T as Config<I>>::Balance;
+// Generic fungible balance type.
+type BalanceOf<F, T> = <F as fungible::Inspect<AccountIdOf<T>>>::Balance;
+
+/// Converts a balance value into an asset balance based on the ratio between the fungible's
+/// minimum balance and the minimum asset balance.
+pub struct BalanceToAssetBalance<F, T, CON, I = ()>(PhantomData<(F, T, CON, I)>);
+impl<F, T, CON, I> BalanceConversion<BalanceOf<F, T>, AssetIdOf<T, I>, AssetBalanceOf<T, I>>
+for BalanceToAssetBalance<F, T, CON, I>
+where
+	F: fungible::Inspect<AccountIdOf<T>>,
+	T: Config<I>,
+	I: 'static,
+	CON: Convert<BalanceOf<F, T>, AssetBalanceOf<T, I>>,
+	BalanceOf<F, T>: FixedPointOperand + Zero,
+	AssetBalanceOf<T, I>: FixedPointOperand + Zero,
+{
+	type Error = ConversionError;
+
+	/// Convert the given balance value into an asset balance based on the ratio between the fungible's
+	/// minimum balance and the minimum asset balance.
+	///
+	/// Will return `Err` if the asset is not found, not sufficient or the fungible's minimum balance is zero.
+	fn to_asset_balance(
+		balance: BalanceOf<F, T>,
+		asset_id: AssetIdOf<T, I>,
+	) -> Result<AssetBalanceOf<T, I>, ConversionError> {
+		let asset = Asset::<T, I>::get(asset_id).ok_or(ConversionError::AssetMissing)?;
+		// only sufficient assets have a min balance with reliable value
+		ensure!(asset.is_sufficient, ConversionError::AssetNotSufficient);
+		let min_balance = CON::convert(F::minimum_balance());
+		// make sure we don't divide by zero
+		ensure!(!min_balance.is_zero(), ConversionError::MinBalanceZero);
+		let balance = CON::convert(balance);
+		// balance * asset.min_balance / min_balance
+		Ok(FixedU128::saturating_from_rational(asset.min_balance, min_balance)
+			.saturating_mul_int(balance))
+	}
+}
diff --git a/frame/support/src/traits/tokens.rs b/frame/support/src/traits/tokens.rs
index ac316b82b03e..faf8ebfd306c 100644
--- a/frame/support/src/traits/tokens.rs
+++ b/frame/support/src/traits/tokens.rs
@@ -25,6 +25,7 @@ pub mod nonfungible;
 pub mod nonfungibles;
 mod misc;
 pub use misc::{
-	WithdrawConsequence, DepositConsequence, ExistenceRequirement, BalanceStatus, WithdrawReasons,
+	BalanceConversion, BalanceStatus,  DepositConsequence,
+	ExistenceRequirement, WithdrawConsequence, WithdrawReasons,
 };
 pub use imbalance::Imbalance;
diff --git a/frame/support/src/traits/tokens/fungible/imbalance.rs b/frame/support/src/traits/tokens/fungible/imbalance.rs
index c084fa97fbec..ab3694359ce9 100644
--- a/frame/support/src/traits/tokens/fungible/imbalance.rs
+++ b/frame/support/src/traits/tokens/fungible/imbalance.rs
@@ -20,7 +20,7 @@
 
 use super::*;
 use sp_std::marker::PhantomData;
-use sp_runtime::traits::Zero;
+use sp_runtime::{RuntimeDebug, traits::Zero};
 use super::misc::Balance;
 use super::balanced::Balanced;
 use crate::traits::misc::{TryDrop, SameOrOther};
@@ -39,6 +39,7 @@ pub trait HandleImbalanceDrop<Balance> {
 ///
 /// Importantly, it has a special `Drop` impl, and cannot be created outside of this module.
 #[must_use]
+#[derive(RuntimeDebug, Eq, PartialEq)]
 pub struct Imbalance<
 	B: Balance,
 	OnDrop: HandleImbalanceDrop<B>,
diff --git a/frame/support/src/traits/tokens/fungibles/imbalance.rs b/frame/support/src/traits/tokens/fungibles/imbalance.rs
index ecc415cb568b..9ecdeac1d4f0 100644
--- a/frame/support/src/traits/tokens/fungibles/imbalance.rs
+++ b/frame/support/src/traits/tokens/fungibles/imbalance.rs
@@ -20,7 +20,7 @@
 
 use super::*;
 use sp_std::marker::PhantomData;
-use sp_runtime::traits::Zero;
+use sp_runtime::{RuntimeDebug, traits::Zero};
 use super::fungibles::{AssetId, Balance};
 use super::balanced::Balanced;
 use crate::traits::misc::{TryDrop, SameOrOther};
@@ -37,6 +37,7 @@ pub trait HandleImbalanceDrop<AssetId, Balance> {
 ///
 /// Importantly, it has a special `Drop` impl, and cannot be created outside of this module.
 #[must_use]
+#[derive(RuntimeDebug, Eq, PartialEq)]
 pub struct Imbalance<
 	A: AssetId,
 	B: Balance,
diff --git a/frame/support/src/traits/tokens/misc.rs b/frame/support/src/traits/tokens/misc.rs
index 0c55ac79182c..97c111798caa 100644
--- a/frame/support/src/traits/tokens/misc.rs
+++ b/frame/support/src/traits/tokens/misc.rs
@@ -167,3 +167,9 @@ impl<T: FullCodec + Copy + Eq + PartialEq + Debug> AssetId for T {}
 /// Simple amalgamation trait to collect together properties for a Balance under one roof.
 pub trait Balance: AtLeast32BitUnsigned + FullCodec + Copy + Default + Debug {}
 impl<T: AtLeast32BitUnsigned + FullCodec + Copy + Default + Debug> Balance for T {}
+
+/// Converts a balance value into an asset balance.
+pub trait BalanceConversion<InBalance, AssetId, OutBalance> {
+	type Error;
+	fn to_asset_balance(balance: InBalance, asset_id: AssetId) -> Result<OutBalance, Self::Error>;
+}

From 02d66442a9afd6986fce69b5f6ee07d10afa7d77 Mon Sep 17 00:00:00 2001
From: Denis Pisarev <denis.pisarev@parity.io>
Date: Tue, 20 Jul 2021 18:37:58 +0200
Subject: [PATCH 1005/1194] CI: fix docs pub (#9341)

* CI: debug

* CI: debug aws sync

* exclude locfile

* exclude locfile 2

* exclude doesn't work

* root files

* CI: remove lockfile

* CI: satisfy aws cli

* CI: typo

* CI: undebug

* CI: undebug docs jobs
---
 .gitlab-ci.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 727ee2049648..1ff57bf0f79a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -531,6 +531,7 @@ build-rust-doc:
   script:
     - RUSTDOCFLAGS="--html-in-header $(pwd)/.maintain/rustdoc-header.html"
         time cargo +nightly doc --no-deps --workspace --all-features --verbose
+    - rm -f ./target/doc/.lock
     - mv ./target/doc ./crate-docs
     - echo "<meta http-equiv=refresh content=0;url=sc_service/index.html>" > ./crate-docs/index.html
     - sccache -s
@@ -643,6 +644,7 @@ publish-s3-doc:
         echo "./crate-docs/index.html not present, build:rust:doc:release job not complete";
         exit 1
       )
+    - ls -lah crate-docs
     - aws s3 sync --delete --size-only --only-show-errors
         ./crate-docs/ s3://${BUCKET}/${PREFIX}/
   after_script:
@@ -708,8 +710,8 @@ trigger-simnet:
   variables:
     TRGR_PROJECT:                  ${CI_PROJECT_NAME}
     TRGR_REF:                      ${CI_COMMIT_REF_NAME}
-    # simnet project ID
+    # Simnet project ID
     DWNSTRM_ID:                    332
   script:
-    # API trigger for a simnet job
+    # API trigger for a Simnet job
     - .maintain/gitlab/trigger_pipeline.sh --simnet-version=${SIMNET_REF}

From dbd21b967dfc98a44a43fdb96c468c21df51916e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Wed, 21 Jul 2021 00:20:34 +0200
Subject: [PATCH 1006/1194] Fix custom on runtime upgrade not being called
 (#9399)

When the `Executive` was used through the `ExecuteBlock` trait, the
custom on runtime upgrade wasn't called. This happened because we forgot
to forward the type and it instead used default type `()` that doesn't
do anything. This pr fixes it by forwarding the type and also adds a
regression test.
---
 frame/executive/src/lib.rs | 56 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 55 insertions(+), 1 deletion(-)

diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index 719a94e6fb1b..a11a5172dc95 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -179,7 +179,14 @@ where
 	UnsignedValidator: ValidateUnsigned<Call=CallOf<Block::Extrinsic, Context>>,
 {
 	fn execute_block(block: Block) {
-		Executive::<System, Block, Context, UnsignedValidator, AllPallets>::execute_block(block);
+		Executive::<
+			System,
+			Block,
+			Context,
+			UnsignedValidator,
+			AllPallets,
+			COnRuntimeUpgrade,
+		>::execute_block(block);
 	}
 }
 
@@ -1193,6 +1200,53 @@ mod tests {
 		});
 	}
 
+	/// Regression test that ensures that the custom on runtime upgrade is called when executive is
+	/// used through the `ExecuteBlock` trait.
+	#[test]
+	fn custom_runtime_upgrade_is_called_when_using_execute_block_trait() {
+		let xt = TestXt::new(Call::Balances(BalancesCall::transfer(33, 0)), sign_extra(1, 0, 0));
+
+		let header = new_test_ext(1).execute_with(|| {
+			// Make sure `on_runtime_upgrade` is called.
+			RUNTIME_VERSION.with(|v| *v.borrow_mut() = sp_version::RuntimeVersion {
+				spec_version: 1,
+				..Default::default()
+			});
+
+			// Let's build some fake block.
+			Executive::initialize_block(&Header::new(
+				1,
+				H256::default(),
+				H256::default(),
+				[69u8; 32].into(),
+				Digest::default(),
+			));
+
+			Executive::apply_extrinsic(xt.clone()).unwrap().unwrap();
+
+			Executive::finalize_block()
+		});
+
+		// Reset to get the correct new genesis below.
+		RUNTIME_VERSION.with(|v| *v.borrow_mut() = sp_version::RuntimeVersion {
+			spec_version: 0,
+			..Default::default()
+		});
+
+		new_test_ext(1).execute_with(|| {
+			// Make sure `on_runtime_upgrade` is called.
+			RUNTIME_VERSION.with(|v| *v.borrow_mut() = sp_version::RuntimeVersion {
+				spec_version: 1,
+				..Default::default()
+			});
+
+			<Executive as ExecuteBlock<Block<TestXt>>>::execute_block(Block::new(header, vec![xt]));
+
+			assert_eq!(&sp_io::storage::get(TEST_KEY).unwrap()[..], *b"module");
+			assert_eq!(sp_io::storage::get(CUSTOM_ON_RUNTIME_KEY).unwrap(), true.encode());
+		});
+	}
+
 	#[test]
 	fn all_weights_are_recorded_correctly() {
 		new_test_ext(1).execute_with(|| {

From 1d5abf01abafdb6c15bcd0172f5de09fd87c5fbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Wed, 21 Jul 2021 16:32:32 +0200
Subject: [PATCH 1007/1194] Run cargo fmt on the whole code base (#9394)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Run cargo fmt on the whole code base

* Second run

* Add CI check

* Fix compilation

* More unnecessary braces

* Handle weights

* Use --all

* Use correct attributes...

* Fix UI tests

* AHHHHHHHHH

* :facepalm:

* Docs

* Fix compilation

* :shrug:

* Please stop

* :facepalm: x 2

* More

* make rustfmt.toml consistent with polkadot

Co-authored-by: André Silva <andrerfosilva@gmail.com>
---
 .gitlab-ci.yml                                |    8 +
 .maintain/frame-weight-template.hbs           |    1 +
 bin/node-template/node/src/chain_spec.rs      |  103 +-
 bin/node-template/node/src/cli.rs             |    2 +-
 bin/node-template/node/src/command.rs         |   47 +-
 bin/node-template/node/src/lib.rs             |    2 +-
 bin/node-template/node/src/rpc.rs             |   30 +-
 bin/node-template/node/src/service.rs         |  154 +-
 .../pallets/template/src/benchmarking.rs      |   10 +-
 bin/node-template/pallets/template/src/lib.rs |    3 +-
 .../pallets/template/src/mock.rs              |    7 +-
 .../pallets/template/src/tests.rs             |    9 +-
 bin/node-template/runtime/src/lib.rs          |   46 +-
 bin/node/bench/src/construct.rs               |  120 +-
 bin/node/bench/src/core.rs                    |   22 +-
 bin/node/bench/src/generator.rs               |    7 +-
 bin/node/bench/src/import.rs                  |   32 +-
 bin/node/bench/src/main.rs                    |   37 +-
 bin/node/bench/src/simple_trie.rs             |    8 +-
 bin/node/bench/src/state_sizes.rs             |    2 +-
 bin/node/bench/src/tempdb.rs                  |   52 +-
 bin/node/bench/src/trie.rs                    |   47 +-
 bin/node/bench/src/txpool.rs                  |   42 +-
 bin/node/browser-testing/src/lib.rs           |   20 +-
 bin/node/cli/build.rs                         |   11 +-
 bin/node/cli/src/browser.rs                   |   15 +-
 bin/node/cli/src/chain_spec.rs                |  313 +-
 bin/node/cli/src/cli.rs                       |    2 +-
 bin/node/cli/src/command.rs                   |   75 +-
 bin/node/cli/src/service.rs                   |  480 ++-
 bin/node/cli/tests/common.rs                  |   22 +-
 bin/node/cli/tests/export_import_flow.rs      |   38 +-
 .../tests/running_the_node_and_interrupt.rs   |    9 +-
 bin/node/cli/tests/telemetry.rs               |   35 +-
 bin/node/cli/tests/temp_base_path_works.rs    |   39 +-
 bin/node/cli/tests/version.rs                 |   34 +-
 bin/node/cli/tests/websocket_server.rs        |   11 +-
 bin/node/executor/benches/bench.rs            |  200 +-
 bin/node/executor/src/lib.rs                  |    2 +-
 bin/node/executor/tests/basic.rs              |  304 +-
 bin/node/executor/tests/common.rs             |   95 +-
 bin/node/executor/tests/fees.rs               |   75 +-
 bin/node/executor/tests/submit_transaction.rs |  108 +-
 bin/node/inspect/src/cli.rs                   |    2 +-
 bin/node/inspect/src/command.rs               |   10 +-
 bin/node/inspect/src/lib.rs                   |  135 +-
 bin/node/primitives/src/lib.rs                |    5 +-
 bin/node/rpc-client/src/main.rs               |   23 +-
 bin/node/rpc/src/lib.rs                       |  143 +-
 bin/node/runtime/src/constants.rs             |    4 +-
 bin/node/runtime/src/impls.rs                 |   79 +-
 bin/node/runtime/src/lib.rs                   |  189 +-
 bin/node/test-runner-example/src/lib.rs       |   44 +-
 bin/node/testing/src/bench.rs                 |  262 +-
 bin/node/testing/src/client.rs                |   20 +-
 bin/node/testing/src/genesis.rs               |   71 +-
 bin/node/testing/src/keyring.rs               |   37 +-
 bin/node/testing/src/lib.rs                   |    2 +-
 bin/utils/chain-spec-builder/src/main.rs      |  102 +-
 bin/utils/subkey/src/lib.rs                   |    8 +-
 client/allocator/src/error.rs                 |    2 +-
 client/allocator/src/freeing_bump.rs          |   38 +-
 client/allocator/src/lib.rs                   |    2 +-
 client/api/src/backend.rs                     |  164 +-
 client/api/src/call_executor.rs               |   46 +-
 client/api/src/cht.rs                         |  224 +-
 client/api/src/client.rs                      |   41 +-
 client/api/src/execution_extensions.rs        |   68 +-
 client/api/src/in_mem.rs                      |  362 ++-
 client/api/src/leaves.rs                      |   79 +-
 client/api/src/lib.rs                         |   27 +-
 client/api/src/light.rs                       |  131 +-
 client/api/src/notifications.rs               |  286 +-
 client/api/src/proof_provider.rs              |   18 +-
 client/authority-discovery/src/interval.rs    |   18 +-
 client/authority-discovery/src/lib.rs         |   26 +-
 client/authority-discovery/src/service.rs     |   15 +-
 client/authority-discovery/src/tests.rs       |   24 +-
 client/authority-discovery/src/worker.rs      |  272 +-
 .../src/worker/addr_cache.rs                  |   77 +-
 .../authority-discovery/src/worker/tests.rs   |  435 +--
 .../basic-authorship/src/basic_authorship.rs  |  463 +--
 client/basic-authorship/src/lib.rs            |   15 +-
 client/block-builder/src/lib.rs               |   91 +-
 client/chain-spec/derive/src/impls.rs         |   73 +-
 client/chain-spec/src/chain_spec.rs           |  190 +-
 client/chain-spec/src/extension.rs            |  130 +-
 client/chain-spec/src/lib.rs                  |   32 +-
 client/cli/src/arg_enums.rs                   |   17 +-
 client/cli/src/commands/build_spec_cmd.rs     |   16 +-
 client/cli/src/commands/check_block_cmd.rs    |   10 +-
 client/cli/src/commands/export_blocks_cmd.rs  |   23 +-
 client/cli/src/commands/export_state_cmd.rs   |    8 +-
 client/cli/src/commands/generate.rs           |   19 +-
 client/cli/src/commands/generate_node_key.rs  |    9 +-
 client/cli/src/commands/import_blocks_cmd.rs  |   31 +-
 client/cli/src/commands/insert_key.rs         |   75 +-
 client/cli/src/commands/inspect_key.rs        |    7 +-
 client/cli/src/commands/inspect_node_key.rs   |   16 +-
 client/cli/src/commands/key.rs                |    7 +-
 client/cli/src/commands/mod.rs                |   41 +-
 client/cli/src/commands/purge_chain_cmd.rs    |   25 +-
 client/cli/src/commands/revert_cmd.rs         |   20 +-
 client/cli/src/commands/run_cmd.rs            |   69 +-
 client/cli/src/commands/sign.rs               |   24 +-
 client/cli/src/commands/utils.rs              |   49 +-
 client/cli/src/commands/vanity.rs             |   77 +-
 client/cli/src/commands/verify.rs             |   33 +-
 client/cli/src/config.rs                      |   64 +-
 client/cli/src/lib.rs                         |    2 +-
 client/cli/src/params/database_params.rs      |    2 +-
 client/cli/src/params/import_params.rs        |   39 +-
 client/cli/src/params/keystore_params.rs      |   13 +-
 client/cli/src/params/mod.rs                  |   37 +-
 client/cli/src/params/network_params.rs       |   27 +-
 client/cli/src/params/node_key_params.rs      |   54 +-
 .../cli/src/params/offchain_worker_params.rs  |   13 +-
 client/cli/src/params/pruning_params.rs       |    6 +-
 client/cli/src/params/shared_params.rs        |    7 +-
 client/cli/src/runner.rs                      |   57 +-
 client/consensus/aura/src/import_queue.rs     |  177 +-
 client/consensus/aura/src/lib.rs              |  365 ++-
 client/consensus/babe/rpc/src/lib.rs          |  112 +-
 client/consensus/babe/src/authorship.rs       |  115 +-
 client/consensus/babe/src/aux_schema.rs       |  150 +-
 client/consensus/babe/src/lib.rs              |  641 ++--
 client/consensus/babe/src/migration.rs        |   18 +-
 client/consensus/babe/src/tests.rs            |  413 +--
 client/consensus/babe/src/verification.rs     |  141 +-
 client/consensus/common/src/longest_chain.rs  |   27 +-
 client/consensus/common/src/shared_data.rs    |   17 +-
 client/consensus/epochs/src/lib.rs            |  503 ++-
 client/consensus/epochs/src/migration.rs      |   12 +-
 client/consensus/manual-seal/src/consensus.rs |   14 +-
 .../manual-seal/src/consensus/babe.rs         |  183 +-
 client/consensus/manual-seal/src/error.rs     |   14 +-
 .../manual-seal/src/finalize_block.rs         |   30 +-
 client/consensus/manual-seal/src/lib.rs       |  370 +--
 client/consensus/manual-seal/src/rpc.rs       |   40 +-
 .../consensus/manual-seal/src/seal_block.rs   |   55 +-
 client/consensus/pow/src/lib.rs               |  195 +-
 client/consensus/pow/src/worker.rs            |   55 +-
 client/consensus/slots/src/aux_schema.rs      |  152 +-
 client/consensus/slots/src/lib.rs             |  319 +-
 client/consensus/slots/src/slots.rs           |   29 +-
 client/consensus/uncles/src/lib.rs            |    5 +-
 client/db/src/bench.rs                        |  201 +-
 client/db/src/cache/list_cache.rs             | 1483 ++++++---
 client/db/src/cache/list_entry.rs             |   88 +-
 client/db/src/cache/list_storage.rs           |  145 +-
 client/db/src/cache/mod.rs                    |  124 +-
 client/db/src/changes_tries_storage.rs        |  499 ++-
 client/db/src/children.rs                     |   18 +-
 client/db/src/lib.rs                          | 1282 ++++----
 client/db/src/light.rs                        |  495 +--
 client/db/src/offchain.rs                     |   17 +-
 client/db/src/parity_db.rs                    |   32 +-
 client/db/src/stats.rs                        |   11 +-
 client/db/src/storage_cache.rs                |  632 ++--
 client/db/src/upgrade.rs                      |   70 +-
 client/db/src/utils.rs                        |  178 +-
 client/executor/common/src/lib.rs             |    2 +-
 .../runtime_blob/data_segments_snapshot.rs    |   10 +-
 .../src/runtime_blob/globals_snapshot.rs      |    7 +-
 .../executor/common/src/runtime_blob/mod.rs   |    2 +-
 .../common/src/runtime_blob/runtime_blob.rs   |   52 +-
 client/executor/common/src/sandbox.rs         |  149 +-
 client/executor/runtime-test/src/lib.rs       |  699 ++--
 .../executor/src/integration_tests/linux.rs   |   12 +-
 .../src/integration_tests/linux/smaps.rs      |    6 +-
 client/executor/src/integration_tests/mod.rs  |  307 +-
 .../executor/src/integration_tests/sandbox.rs |  155 +-
 client/executor/src/lib.rs                    |   19 +-
 client/executor/src/native_executor.rs        |  244 +-
 client/executor/src/wasm_runtime.rs           |  177 +-
 client/executor/wasmi/src/lib.rs              |  181 +-
 client/executor/wasmtime/src/host.rs          |   50 +-
 client/executor/wasmtime/src/imports.rs       |   96 +-
 .../executor/wasmtime/src/instance_wrapper.rs |  106 +-
 client/executor/wasmtime/src/lib.rs           |    6 +-
 client/executor/wasmtime/src/runtime.rs       |   81 +-
 client/executor/wasmtime/src/tests.rs         |   39 +-
 client/finality-grandpa-warp-sync/src/lib.rs  |   59 +-
 .../finality-grandpa-warp-sync/src/proof.rs   |   58 +-
 client/finality-grandpa/rpc/src/finality.rs   |    5 +-
 client/finality-grandpa/rpc/src/lib.rs        |  100 +-
 .../finality-grandpa/rpc/src/notification.rs  |    4 +-
 client/finality-grandpa/rpc/src/report.rs     |   13 +-
 client/finality-grandpa/src/authorities.rs    |  507 ++-
 client/finality-grandpa/src/aux_schema.rs     |  348 +-
 .../src/communication/gossip.rs               |  794 ++---
 .../finality-grandpa/src/communication/mod.rs |  299 +-
 .../src/communication/periodic.rs             |   40 +-
 .../src/communication/tests.rs                |  247 +-
 client/finality-grandpa/src/environment.rs    |  279 +-
 client/finality-grandpa/src/finality_proof.rs |  117 +-
 client/finality-grandpa/src/import.rs         |  113 +-
 client/finality-grandpa/src/justification.rs  |   85 +-
 client/finality-grandpa/src/lib.rs            |  305 +-
 client/finality-grandpa/src/notification.rs   |   17 +-
 client/finality-grandpa/src/observer.rs       |   72 +-
 client/finality-grandpa/src/tests.rs          |  513 +--
 client/finality-grandpa/src/until_imported.rs |  475 ++-
 client/finality-grandpa/src/voting_rule.rs    |  109 +-
 client/informant/src/display.rs               |   72 +-
 client/informant/src/lib.rs                   |   30 +-
 client/keystore/src/lib.rs                    |   18 +-
 client/keystore/src/local.rs                  |  296 +-
 client/light/src/backend.rs                   |  185 +-
 client/light/src/blockchain.rs                |   84 +-
 client/light/src/call_executor.rs             |   93 +-
 client/light/src/fetcher.rs                   |  226 +-
 client/light/src/lib.rs                       |   17 +-
 client/network-gossip/src/bridge.rs           |  243 +-
 client/network-gossip/src/lib.rs              |   27 +-
 client/network-gossip/src/state_machine.rs    |  180 +-
 client/network-gossip/src/validator.rs        |   13 +-
 client/network/build.rs                       |    7 +-
 client/network/src/behaviour.rs               |  184 +-
 client/network/src/bitswap.rs                 |   94 +-
 client/network/src/block_request_handler.rs   |  104 +-
 client/network/src/chain.rs                   |   34 +-
 client/network/src/config.rs                  |  161 +-
 client/network/src/discovery.rs               |  445 +--
 client/network/src/error.rs                   |    6 +-
 client/network/src/lib.rs                     |   20 +-
 client/network/src/light_client_requests.rs   |  122 +-
 .../src/light_client_requests/handler.rs      |  161 +-
 .../src/light_client_requests/sender.rs       |  458 ++-
 client/network/src/network_state.rs           |   13 +-
 client/network/src/on_demand_layer.rs         |   36 +-
 client/network/src/peer_info.rs               |  116 +-
 client/network/src/protocol.rs                |  720 +++--
 client/network/src/protocol/event.rs          |    3 +-
 client/network/src/protocol/message.rs        |   63 +-
 client/network/src/protocol/notifications.rs  |    8 +-
 .../src/protocol/notifications/behaviour.rs   |  764 +++--
 .../src/protocol/notifications/handler.rs     |  327 +-
 .../src/protocol/notifications/tests.rs       |  167 +-
 .../src/protocol/notifications/upgrade.rs     |   17 +-
 .../protocol/notifications/upgrade/collec.rs  |   14 +-
 .../notifications/upgrade/notifications.rs    |  188 +-
 client/network/src/protocol/sync.rs           | 1109 +++----
 client/network/src/protocol/sync/blocks.rs    |  192 +-
 .../src/protocol/sync/extra_requests.rs       |  132 +-
 client/network/src/protocol/sync/state.rs     |   67 +-
 client/network/src/request_responses.rs       |  648 ++--
 client/network/src/service.rs                 |  886 +++--
 client/network/src/service/metrics.rs         |   52 +-
 client/network/src/service/out_events.rs      |   72 +-
 client/network/src/service/tests.rs           |  305 +-
 client/network/src/state_request_handler.rs   |   55 +-
 client/network/src/transactions.rs            |  122 +-
 client/network/src/transport.rs               |   45 +-
 client/network/src/utils.rs                   |   10 +-
 client/network/test/src/block_import.rs       |   67 +-
 client/network/test/src/lib.rs                |  469 +--
 client/network/test/src/sync.rs               |  192 +-
 client/offchain/src/api.rs                    |  113 +-
 client/offchain/src/api/http.rs               |  414 +--
 client/offchain/src/api/http_dummy.rs         |   62 +-
 client/offchain/src/api/timestamp.rs          |   18 +-
 client/offchain/src/lib.rs                    |  171 +-
 client/peerset/src/lib.rs                     |  183 +-
 client/peerset/src/peersstate.rs              |  245 +-
 client/peerset/tests/fuzz.rs                  |  105 +-
 client/proposer-metrics/src/lib.rs            |   18 +-
 client/rpc-api/src/author/error.rs            |   20 +-
 client/rpc-api/src/author/hash.rs             |    2 +-
 client/rpc-api/src/author/mod.rs              |   26 +-
 client/rpc-api/src/chain/error.rs             |    2 +-
 client/rpc-api/src/chain/mod.rs               |    4 +-
 client/rpc-api/src/child_state/mod.rs         |   12 +-
 client/rpc-api/src/helpers.rs                 |    2 +-
 client/rpc-api/src/lib.rs                     |    2 +-
 client/rpc-api/src/metadata.rs                |    6 +-
 client/rpc-api/src/offchain/error.rs          |    4 +-
 client/rpc-api/src/offchain/mod.rs            |    4 +-
 client/rpc-api/src/state/error.rs             |    2 +-
 client/rpc-api/src/state/helpers.rs           |    2 +-
 client/rpc-api/src/state/mod.rs               |  106 +-
 client/rpc-api/src/system/error.rs            |    4 +-
 client/rpc-api/src/system/helpers.rs          |   20 +-
 client/rpc-api/src/system/mod.rs              |   36 +-
 client/rpc-servers/src/lib.rs                 |   64 +-
 client/rpc-servers/src/middleware.rs          |   36 +-
 client/rpc/src/author/mod.rs                  |  132 +-
 client/rpc/src/author/tests.rs                |  107 +-
 client/rpc/src/chain/chain_full.rs            |   38 +-
 client/rpc/src/chain/chain_light.rs           |   56 +-
 client/rpc/src/chain/mod.rs                   |  139 +-
 client/rpc/src/chain/tests.rs                 |   35 +-
 client/rpc/src/lib.rs                         |    4 +-
 client/rpc/src/offchain/mod.rs                |   11 +-
 client/rpc/src/offchain/tests.rs              |    2 +-
 client/rpc/src/state/mod.rs                   |  196 +-
 client/rpc/src/state/state_full.rs            |  386 ++-
 client/rpc/src/state/state_light.rs           |  534 +--
 client/rpc/src/state/tests.rs                 |  242 +-
 client/rpc/src/system/mod.rs                  |   67 +-
 client/rpc/src/system/tests.rs                |  180 +-
 client/rpc/src/testing.rs                     |    4 +-
 client/service/src/builder.rs                 |  573 ++--
 client/service/src/chain_ops/check_block.rs   |   14 +-
 client/service/src/chain_ops/export_blocks.rs |   25 +-
 .../service/src/chain_ops/export_raw_state.rs |   17 +-
 client/service/src/chain_ops/import_blocks.rs |  201 +-
 client/service/src/chain_ops/revert_chain.rs  |    4 +-
 client/service/src/client/block_rules.rs      |   15 +-
 client/service/src/client/call_executor.rs    |  155 +-
 client/service/src/client/client.rs           |  955 +++---
 client/service/src/client/genesis.rs          |   17 +-
 client/service/src/client/light.rs            |   43 +-
 client/service/src/client/mod.rs              |   10 +-
 client/service/src/client/wasm_override.rs    |   72 +-
 client/service/src/client/wasm_substitutes.rs |   45 +-
 client/service/src/config.rs                  |   51 +-
 client/service/src/error.rs                   |    4 +-
 client/service/src/lib.rs                     |  259 +-
 client/service/src/metrics.rs                 |  161 +-
 client/service/src/task_manager/mod.rs        |   72 +-
 .../src/task_manager/prometheus_future.rs     |   14 +-
 client/service/src/task_manager/tests.rs      |   11 +-
 client/service/test/src/client/db.rs          |    7 +-
 client/service/test/src/client/light.rs       |  575 ++--
 client/service/test/src/client/mod.rs         | 1341 ++++----
 client/service/test/src/lib.rs                |  278 +-
 client/state-db/src/lib.rs                    |  165 +-
 client/state-db/src/noncanonical.rs           |  258 +-
 client/state-db/src/pruning.rs                |   73 +-
 client/state-db/src/test.rs                   |   18 +-
 client/sync-state-rpc/src/lib.rs              |   59 +-
 client/telemetry/src/endpoints.rs             |   25 +-
 client/telemetry/src/lib.rs                   |   67 +-
 client/telemetry/src/node.rs                  |   57 +-
 client/telemetry/src/transport.rs             |    8 +-
 client/tracing/proc-macro/src/lib.rs          |    9 +-
 client/tracing/src/block/mod.rs               |  122 +-
 client/tracing/src/lib.rs                     |   81 +-
 client/tracing/src/logging/directives.rs      |   18 +-
 client/tracing/src/logging/event_format.rs    |   27 +-
 .../tracing/src/logging/layers/console_log.rs |   10 +-
 .../src/logging/layers/prefix_layer.rs        |    6 +-
 client/tracing/src/logging/mod.rs             |   58 +-
 client/transaction-pool/api/src/error.rs      |   12 +-
 client/transaction-pool/api/src/lib.rs        |   65 +-
 client/transaction-pool/benches/basics.rs     |   53 +-
 client/transaction-pool/src/api.rs            |  158 +-
 client/transaction-pool/src/error.rs          |    1 -
 .../transaction-pool/src/graph/base_pool.rs   |  428 +--
 client/transaction-pool/src/graph/future.rs   |   68 +-
 client/transaction-pool/src/graph/listener.rs |   19 +-
 client/transaction-pool/src/graph/mod.rs      |   14 +-
 client/transaction-pool/src/graph/pool.rs     |  509 +--
 client/transaction-pool/src/graph/ready.rs    |  149 +-
 client/transaction-pool/src/graph/rotator.rs  |   35 +-
 .../transaction-pool/src/graph/tracked_map.rs |   32 +-
 .../src/graph/validated_pool.rs               |  171 +-
 client/transaction-pool/src/graph/watcher.rs  |   14 +-
 client/transaction-pool/src/lib.rs            |  280 +-
 client/transaction-pool/src/metrics.rs        |   14 +-
 client/transaction-pool/src/revalidation.rs   |  108 +-
 client/transaction-pool/tests/pool.rs         |  317 +-
 client/transaction-pool/tests/revalidation.rs |   40 +-
 frame/assets/src/benchmarking.rs              |   66 +-
 frame/assets/src/extra_mutator.rs             |    5 +-
 frame/assets/src/functions.rs                 |   31 +-
 frame/assets/src/impl_fungibles.rs            |   59 +-
 frame/assets/src/lib.rs                       |  224 +-
 frame/assets/src/mock.rs                      |   10 +-
 frame/assets/src/tests.rs                     |  157 +-
 frame/assets/src/types.rs                     |   20 +-
 frame/assets/src/weights.rs                   |    1 +
 frame/atomic-swap/src/lib.rs                  |   76 +-
 frame/atomic-swap/src/tests.rs                |   27 +-
 frame/aura/src/lib.rs                         |   51 +-
 frame/aura/src/migrations.rs                  |    6 +-
 frame/aura/src/mock.rs                        |   13 +-
 frame/aura/src/tests.rs                       |    2 +-
 frame/authority-discovery/src/lib.rs          |   71 +-
 frame/authorship/src/lib.rs                   |  198 +-
 frame/babe/src/benchmarking.rs                |    5 +-
 frame/babe/src/default_weights.rs             |    3 +-
 frame/babe/src/equivocation.rs                |   37 +-
 frame/babe/src/lib.rs                         |  204 +-
 frame/babe/src/mock.rs                        |   82 +-
 frame/babe/src/randomness.rs                  |    2 +-
 frame/babe/src/tests.rs                       |  223 +-
 frame/balances/src/benchmarking.rs            |    5 +-
 frame/balances/src/lib.rs                     |  705 ++--
 frame/balances/src/tests_composite.rs         |   29 +-
 frame/balances/src/tests_local.rs             |  100 +-
 frame/balances/src/tests_reentrancy.rs        |  230 +-
 frame/balances/src/weights.rs                 |    1 +
 frame/benchmarking/src/analysis.rs            |  401 ++-
 frame/benchmarking/src/lib.rs                 |   29 +-
 frame/benchmarking/src/tests.rs               |   42 +-
 frame/benchmarking/src/utils.rs               |   50 +-
 frame/bounties/src/benchmarking.rs            |   31 +-
 frame/bounties/src/lib.rs                     |   40 +-
 frame/bounties/src/tests.rs                   |  318 +-
 frame/bounties/src/weights.rs                 |    1 +
 frame/collective/src/benchmarking.rs          |   16 +-
 frame/collective/src/lib.rs                   |  983 ++++--
 frame/collective/src/weights.rs               |    1 +
 frame/contracts/common/src/lib.rs             |    4 +-
 frame/contracts/proc-macro/src/lib.rs         |   24 +-
 frame/contracts/rpc/runtime-api/src/lib.rs    |    4 +-
 frame/contracts/rpc/src/lib.rs                |   72 +-
 frame/contracts/src/benchmarking/code.rs      |  265 +-
 frame/contracts/src/benchmarking/mod.rs       |   64 +-
 frame/contracts/src/benchmarking/sandbox.rs   |   17 +-
 frame/contracts/src/chain_extension.rs        |   58 +-
 frame/contracts/src/exec.rs                   |  718 ++---
 frame/contracts/src/gas.rs                    |   27 +-
 frame/contracts/src/lib.rs                    |  217 +-
 frame/contracts/src/migration.rs              |    6 +-
 frame/contracts/src/rent.rs                   |  179 +-
 frame/contracts/src/schedule.rs               |  140 +-
 frame/contracts/src/storage.rs                |   98 +-
 frame/contracts/src/tests.rs                  | 2862 ++++++++---------
 frame/contracts/src/wasm/code_cache.rs        |   72 +-
 frame/contracts/src/wasm/env_def/macros.rs    |   33 +-
 frame/contracts/src/wasm/env_def/mod.rs       |   11 +-
 frame/contracts/src/wasm/mod.rs               |  447 +--
 frame/contracts/src/wasm/prepare.rs           |  298 +-
 frame/contracts/src/wasm/runtime.rs           |  193 +-
 frame/contracts/src/weights.rs                |    1 +
 frame/democracy/src/benchmarking.rs           |   48 +-
 frame/democracy/src/conviction.rs             |   16 +-
 frame/democracy/src/lib.rs                    |  298 +-
 frame/democracy/src/tests.rs                  |   39 +-
 frame/democracy/src/tests/cancellation.rs     |    6 +-
 frame/democracy/src/tests/decoders.rs         |    8 +-
 .../democracy/src/tests/external_proposing.rs |   65 +-
 frame/democracy/src/tests/fast_tracking.rs    |   15 +-
 frame/democracy/src/tests/lock_voting.rs      |   53 +-
 frame/democracy/src/tests/preimage.rs         |   72 +-
 frame/democracy/src/tests/public_proposals.rs |    5 +-
 frame/democracy/src/tests/scheduling.rs       |   10 +-
 frame/democracy/src/tests/voting.rs           |   11 +-
 frame/democracy/src/types.rs                  |   76 +-
 frame/democracy/src/vote.rs                   |   36 +-
 frame/democracy/src/vote_threshold.rs         |   51 +-
 frame/democracy/src/weights.rs                |    1 +
 .../src/benchmarking.rs                       |   34 +-
 .../src/helpers.rs                            |   16 +-
 .../election-provider-multi-phase/src/lib.rs  |  160 +-
 .../election-provider-multi-phase/src/mock.rs |   14 +-
 .../src/signed.rs                             |  158 +-
 .../src/unsigned.rs                           |  356 +-
 .../src/weights.rs                            |    1 +
 frame/election-provider-support/src/lib.rs    |    7 +-
 .../election-provider-support/src/onchain.rs  |   29 +-
 frame/elections-phragmen/src/benchmarking.rs  |   70 +-
 frame/elections-phragmen/src/lib.rs           |  763 ++---
 frame/elections-phragmen/src/migrations/v3.rs |   91 +-
 frame/elections-phragmen/src/migrations/v4.rs |   16 +-
 frame/elections-phragmen/src/weights.rs       |    1 +
 frame/elections/src/lib.rs                    |  271 +-
 frame/elections/src/mock.rs                   |   56 +-
 frame/elections/src/tests.rs                  |  679 ++--
 frame/example-offchain-worker/src/lib.rs      |  150 +-
 frame/example-offchain-worker/src/tests.rs    |   83 +-
 frame/example-parallel/src/lib.rs             |   22 +-
 frame/example-parallel/src/tests.rs           |    5 +-
 frame/example/src/benchmarking.rs             |    4 +-
 frame/example/src/lib.rs                      |   46 +-
 frame/example/src/tests.rs                    |   14 +-
 frame/example/src/weights.rs                  |    1 +
 frame/executive/src/lib.rs                    |  333 +-
 frame/gilt/src/benchmarking.rs                |   22 +-
 frame/gilt/src/lib.rs                         |  157 +-
 frame/gilt/src/mock.rs                        |   15 +-
 frame/gilt/src/tests.rs                       |  376 ++-
 frame/gilt/src/weights.rs                     |    1 +
 frame/grandpa/src/benchmarking.rs             |    7 +-
 frame/grandpa/src/default_weights.rs          |    6 +-
 frame/grandpa/src/equivocation.rs             |   22 +-
 frame/grandpa/src/lib.rs                      |   99 +-
 frame/grandpa/src/migrations/v3_1.rs          |   31 +-
 frame/grandpa/src/mock.rs                     |   46 +-
 frame/grandpa/src/tests.rs                    |  240 +-
 frame/identity/src/benchmarking.rs            |   40 +-
 frame/identity/src/lib.rs                     |  234 +-
 frame/identity/src/tests.rs                   |  122 +-
 frame/identity/src/types.rs                   |   81 +-
 frame/identity/src/weights.rs                 |    1 +
 frame/im-online/src/benchmarking.rs           |   32 +-
 frame/im-online/src/lib.rs                    |  236 +-
 frame/im-online/src/mock.rs                   |   32 +-
 frame/im-online/src/tests.rs                  |  151 +-
 frame/im-online/src/weights.rs                |    1 +
 frame/indices/src/benchmarking.rs             |    9 +-
 frame/indices/src/lib.rs                      |   42 +-
 frame/indices/src/mock.rs                     |   12 +-
 frame/indices/src/tests.rs                    |   10 +-
 frame/indices/src/weights.rs                  |    1 +
 frame/lottery/src/benchmarking.rs             |   10 +-
 frame/lottery/src/lib.rs                      |  129 +-
 frame/lottery/src/mock.rs                     |    8 +-
 frame/lottery/src/tests.rs                    |   21 +-
 frame/lottery/src/weights.rs                  |    1 +
 frame/membership/src/lib.rs                   |   63 +-
 frame/membership/src/weights.rs               |    1 +
 .../primitives/src/lib.rs                     |   92 +-
 frame/merkle-mountain-range/rpc/src/lib.rs    |   49 +-
 .../merkle-mountain-range/src/benchmarking.rs |    8 +-
 .../src/default_weights.rs                    |    8 +-
 frame/merkle-mountain-range/src/lib.rs        |   75 +-
 frame/merkle-mountain-range/src/mmr/mmr.rs    |   72 +-
 frame/merkle-mountain-range/src/mmr/mod.rs    |    4 +-
 .../merkle-mountain-range/src/mmr/storage.rs  |   27 +-
 frame/merkle-mountain-range/src/mmr/utils.rs  |    9 +-
 frame/merkle-mountain-range/src/mock.rs       |   18 +-
 frame/merkle-mountain-range/src/tests.rs      |  190 +-
 frame/metadata/src/lib.rs                     |   83 +-
 frame/multisig/src/benchmarking.rs            |   16 +-
 frame/multisig/src/lib.rs                     |  213 +-
 frame/multisig/src/tests.rs                   |  424 ++-
 frame/multisig/src/weights.rs                 |    1 +
 frame/nicks/src/lib.rs                        |   51 +-
 frame/node-authorization/src/lib.rs           |   64 +-
 frame/node-authorization/src/mock.rs          |   14 +-
 frame/node-authorization/src/tests.rs         |  118 +-
 frame/node-authorization/src/weights.rs       |    1 +
 frame/offences/benchmarking/src/lib.rs        |  129 +-
 frame/offences/benchmarking/src/mock.rs       |   19 +-
 frame/offences/src/lib.rs                     |   69 +-
 frame/offences/src/migration.rs               |    9 +-
 frame/offences/src/mock.rs                    |   40 +-
 frame/offences/src/tests.rs                   |  135 +-
 frame/proxy/src/benchmarking.rs               |   12 +-
 frame/proxy/src/lib.rs                        |  165 +-
 frame/proxy/src/tests.rs                      |  156 +-
 frame/proxy/src/weights.rs                    |    1 +
 frame/randomness-collective-flip/src/lib.rs   |   44 +-
 frame/recovery/src/lib.rs                     |   74 +-
 frame/recovery/src/mock.rs                    |   14 +-
 frame/recovery/src/tests.rs                   |  114 +-
 frame/scheduler/src/benchmarking.rs           |   14 +-
 frame/scheduler/src/lib.rs                    |  284 +-
 frame/scheduler/src/weights.rs                |    1 +
 frame/scored-pool/src/lib.rs                  |   92 +-
 frame/scored-pool/src/mock.rs                 |   37 +-
 frame/scored-pool/src/tests.rs                |   51 +-
 frame/session/benchmarking/src/lib.rs         |   29 +-
 frame/session/benchmarking/src/mock.rs        |    5 +-
 frame/session/src/historical/mod.rs           |   90 +-
 frame/session/src/historical/offchain.rs      |   92 +-
 frame/session/src/historical/onchain.rs       |    7 +-
 frame/session/src/historical/shared.rs        |    8 +-
 frame/session/src/lib.rs                      |  128 +-
 frame/session/src/mock.rs                     |   44 +-
 frame/session/src/tests.rs                    |  121 +-
 frame/session/src/weights.rs                  |    1 +
 frame/society/src/lib.rs                      |  269 +-
 frame/society/src/mock.rs                     |   29 +-
 frame/society/src/tests.rs                    |   74 +-
 frame/staking/reward-curve/src/lib.rs         |  138 +-
 frame/staking/reward-curve/src/log.rs         |    8 +-
 frame/staking/reward-fn/src/lib.rs            |   41 +-
 frame/staking/reward-fn/tests/test.rs         |    4 +-
 frame/staking/src/benchmarking.rs             |   52 +-
 frame/staking/src/inflation.rs                |   21 +-
 frame/staking/src/lib.rs                      |  583 ++--
 frame/staking/src/mock.rs                     |  215 +-
 frame/staking/src/slashing.rs                 |  130 +-
 frame/staking/src/testing_utils.rs            |   81 +-
 frame/staking/src/tests.rs                    | 1640 +++++-----
 frame/staking/src/weights.rs                  |    1 +
 frame/sudo/src/lib.rs                         |   17 +-
 frame/sudo/src/mock.rs                        |   40 +-
 frame/sudo/src/tests.rs                       |   14 +-
 .../support/procedural/src/clone_no_bound.rs  |   82 +-
 .../src/construct_runtime/expand/call.rs      |    8 +-
 .../src/construct_runtime/expand/config.rs    |   23 +-
 .../src/construct_runtime/expand/event.rs     |   20 +-
 .../src/construct_runtime/expand/metadata.rs  |   26 +-
 .../src/construct_runtime/expand/origin.rs    |   47 +-
 .../procedural/src/construct_runtime/mod.rs   |  116 +-
 .../procedural/src/construct_runtime/parse.rs |   69 +-
 .../support/procedural/src/debug_no_bound.rs  |   93 +-
 .../procedural/src/default_no_bound.rs        |   55 +-
 .../procedural/src/dummy_part_checker.rs      |   14 +-
 frame/support/procedural/src/key_prefix.rs    |   14 +-
 frame/support/procedural/src/lib.rs           |   51 +-
 .../procedural/src/pallet/expand/call.rs      |   27 +-
 .../procedural/src/pallet/expand/config.rs    |    2 +-
 .../procedural/src/pallet/expand/constants.rs |   91 +-
 .../procedural/src/pallet/expand/error.rs     |   47 +-
 .../procedural/src/pallet/expand/event.rs     |   55 +-
 .../src/pallet/expand/genesis_build.rs        |    4 +-
 .../src/pallet/expand/genesis_config.rs       |   28 +-
 .../procedural/src/pallet/expand/hooks.rs     |    2 +-
 .../procedural/src/pallet/expand/inherent.rs  |    7 +-
 .../procedural/src/pallet/expand/instances.rs |    7 +-
 .../procedural/src/pallet/expand/mod.rs       |   22 +-
 .../procedural/src/pallet/expand/origin.rs    |    4 +-
 .../src/pallet/expand/pallet_struct.rs        |   40 +-
 .../procedural/src/pallet/expand/storage.rs   |  243 +-
 .../src/pallet/expand/store_trait.rs          |   10 +-
 .../src/pallet/expand/validate_unsigned.rs    |   10 +-
 frame/support/procedural/src/pallet/mod.rs    |    9 +-
 .../procedural/src/pallet/parse/call.rs       |   45 +-
 .../procedural/src/pallet/parse/config.rs     |  104 +-
 .../procedural/src/pallet/parse/error.rs      |   24 +-
 .../procedural/src/pallet/parse/event.rs      |   33 +-
 .../src/pallet/parse/extra_constants.rs       |   17 +-
 .../src/pallet/parse/genesis_build.rs         |   18 +-
 .../src/pallet/parse/genesis_config.rs        |   15 +-
 .../procedural/src/pallet/parse/helper.rs     |  142 +-
 .../procedural/src/pallet/parse/hooks.rs      |   17 +-
 .../procedural/src/pallet/parse/inherent.rs   |   10 +-
 .../procedural/src/pallet/parse/mod.rs        |   74 +-
 .../procedural/src/pallet/parse/origin.rs     |   20 +-
 .../src/pallet/parse/pallet_struct.rs         |   22 +-
 .../procedural/src/pallet/parse/storage.rs    |  243 +-
 .../procedural/src/pallet/parse/type_value.rs |   17 +-
 .../src/pallet/parse/validate_unsigned.rs     |   10 +-
 .../support/procedural/src/pallet_version.rs  |    6 +-
 .../procedural/src/partial_eq_no_bound.rs     |   53 +-
 .../src/storage/genesis_config/builder_def.rs |   26 +-
 .../genesis_config/genesis_config_def.rs      |   96 +-
 .../src/storage/genesis_config/mod.rs         |   35 +-
 .../support/procedural/src/storage/getters.rs |   16 +-
 .../procedural/src/storage/instance_trait.rs  |   27 +-
 .../procedural/src/storage/metadata.rs        |   37 +-
 frame/support/procedural/src/storage/mod.rs   |  164 +-
 frame/support/procedural/src/storage/parse.rs |  164 +-
 .../src/storage/print_pallet_upgrade.rs       |  139 +-
 .../procedural/src/storage/storage_info.rs    |    2 +-
 .../procedural/src/storage/storage_struct.rs  |   29 +-
 .../procedural/src/storage/store_trait.rs     |   24 +-
 frame/support/procedural/src/transactional.rs |    2 +-
 .../procedural/tools/derive/src/lib.rs        |   32 +-
 frame/support/procedural/tools/src/lib.rs     |   16 +-
 frame/support/procedural/tools/src/syn_ext.rs |   62 +-
 frame/support/src/dispatch.rs                 |   87 +-
 frame/support/src/error.rs                    |    4 +-
 frame/support/src/event.rs                    |   63 +-
 frame/support/src/hash.rs                     |   18 +-
 frame/support/src/inherent.rs                 |   10 +-
 frame/support/src/lib.rs                      |  421 +--
 .../support/src/storage/bounded_btree_map.rs  |   15 +-
 .../support/src/storage/bounded_btree_set.rs  |   19 +-
 frame/support/src/storage/bounded_vec.rs      |   17 +-
 frame/support/src/storage/child.rs            |  135 +-
 .../src/storage/generator/double_map.rs       |  158 +-
 frame/support/src/storage/generator/map.rs    |   78 +-
 frame/support/src/storage/generator/mod.rs    |   56 +-
 frame/support/src/storage/generator/nmap.rs   |   48 +-
 frame/support/src/storage/generator/value.rs  |    9 +-
 frame/support/src/storage/hashed.rs           |    2 +-
 frame/support/src/storage/migration.rs        |   64 +-
 frame/support/src/storage/mod.rs              |  166 +-
 frame/support/src/storage/types/double_map.rs |  182 +-
 frame/support/src/storage/types/key.rs        |   27 +-
 frame/support/src/storage/types/map.rs        |  129 +-
 frame/support/src/storage/types/mod.rs        |    2 +-
 frame/support/src/storage/types/nmap.rs       |  236 +-
 frame/support/src/storage/types/value.rs      |  120 +-
 frame/support/src/storage/unhashed.rs         |    2 +-
 frame/support/src/storage/weak_bounded_vec.rs |   15 +-
 frame/support/src/traits.rs                   |   53 +-
 frame/support/src/traits/filter.rs            |   31 +-
 frame/support/src/traits/hooks.rs             |   30 +-
 frame/support/src/traits/members.rs           |   40 +-
 frame/support/src/traits/metadata.rs          |   17 +-
 frame/support/src/traits/misc.rs              |   54 +-
 frame/support/src/traits/schedule.rs          |   10 +-
 frame/support/src/traits/stored_map.rs        |   33 +-
 frame/support/src/traits/tokens.rs            |   10 +-
 frame/support/src/traits/tokens/currency.rs   |   37 +-
 .../src/traits/tokens/currency/lockable.rs    |   14 +-
 .../src/traits/tokens/currency/reservable.rs  |   37 +-
 frame/support/src/traits/tokens/fungible.rs   |  131 +-
 .../src/traits/tokens/fungible/balanced.rs    |   64 +-
 .../src/traits/tokens/fungible/imbalance.rs   |   56 +-
 frame/support/src/traits/tokens/fungibles.rs  |   65 +-
 .../src/traits/tokens/fungibles/balanced.rs   |   64 +-
 .../src/traits/tokens/fungibles/imbalance.rs  |   50 +-
 frame/support/src/traits/tokens/imbalance.rs  |   27 +-
 .../traits/tokens/imbalance/on_unbalanced.rs  |    9 +-
 .../tokens/imbalance/signed_imbalance.rs      |   17 +-
 .../traits/tokens/imbalance/split_two_ways.rs |   29 +-
 frame/support/src/traits/tokens/misc.rs       |   12 +-
 .../support/src/traits/tokens/nonfungible.rs  |   57 +-
 .../support/src/traits/tokens/nonfungibles.rs |   50 +-
 frame/support/src/traits/validation.rs        |   30 +-
 frame/support/src/traits/voting.rs            |    7 +-
 frame/support/src/weights.rs                  |  143 +-
 frame/support/test/src/pallet_version.rs      |    5 +-
 frame/support/test/tests/construct_runtime.rs |  390 ++-
 frame/support/test/tests/decl_storage.rs      |  649 ++--
 frame/support/test/tests/derive_no_bound.rs   |   66 +-
 frame/support/test/tests/final_keys.rs        |   14 +-
 frame/support/test/tests/genesisconfig.rs     |    4 +-
 frame/support/test/tests/instance.rs          |  173 +-
 frame/support/test/tests/issue2219.rs         |   32 +-
 frame/support/test/tests/pallet.rs            |  415 ++-
 .../test/tests/pallet_compatibility.rs        |   52 +-
 .../tests/pallet_compatibility_instance.rs    |   48 +-
 frame/support/test/tests/pallet_instance.rs   |  182 +-
 .../genesis_default_not_satisfied.stderr      |    4 +-
 .../tests/pallet_ui/hooks_invalid_item.stderr |    4 +-
 frame/support/test/tests/pallet_version.rs    |   41 +-
 .../tests/pallet_with_name_trait_is_valid.rs  |    5 +-
 .../support/test/tests/storage_transaction.rs |   10 +-
 frame/support/test/tests/system.rs            |   12 +-
 frame/system/benches/bench.rs                 |   23 +-
 frame/system/benchmarking/src/lib.rs          |   21 +-
 frame/system/src/extensions/check_genesis.rs  |    2 +-
 .../system/src/extensions/check_mortality.rs  |   18 +-
 frame/system/src/extensions/check_nonce.rs    |   49 +-
 .../src/extensions/check_spec_version.rs      |    7 +-
 .../system/src/extensions/check_tx_version.rs |    7 +-
 frame/system/src/extensions/check_weight.rs   |  232 +-
 frame/system/src/extensions/mod.rs            |    1 -
 frame/system/src/lib.rs                       |  380 ++-
 frame/system/src/limits.rs                    |   57 +-
 frame/system/src/mock.rs                      |   27 +-
 frame/system/src/mocking.rs                   |    5 +-
 frame/system/src/offchain.rs                  |  280 +-
 frame/system/src/tests.rs                     |  194 +-
 frame/system/src/weights.rs                   |    1 +
 frame/timestamp/src/benchmarking.rs           |   10 +-
 frame/timestamp/src/lib.rs                    |   44 +-
 frame/timestamp/src/weights.rs                |    1 +
 frame/tips/src/benchmarking.rs                |   29 +-
 frame/tips/src/lib.rs                         |   48 +-
 frame/tips/src/tests.rs                       |   99 +-
 frame/tips/src/weights.rs                     |    1 +
 frame/transaction-payment/rpc/src/lib.rs      |   50 +-
 frame/transaction-payment/src/lib.rs          |  833 ++---
 frame/transaction-payment/src/payment.rs      |   33 +-
 frame/transaction-payment/src/types.rs        |   23 +-
 frame/transaction-storage/src/benchmarking.rs |   29 +-
 frame/transaction-storage/src/lib.rs          |   84 +-
 frame/transaction-storage/src/mock.rs         |   17 +-
 frame/transaction-storage/src/tests.rs        |   63 +-
 frame/transaction-storage/src/weights.rs      |    1 +
 frame/treasury/src/benchmarking.rs            |   28 +-
 frame/treasury/src/lib.rs                     |   84 +-
 frame/treasury/src/tests.rs                   |   33 +-
 frame/treasury/src/weights.rs                 |    1 +
 frame/try-runtime/src/lib.rs                  |    2 +-
 frame/uniques/src/benchmarking.rs             |   58 +-
 frame/uniques/src/functions.rs                |   44 +-
 frame/uniques/src/impl_nonfungibles.rs        |   25 +-
 frame/uniques/src/lib.rs                      |   73 +-
 frame/uniques/src/mock.rs                     |    7 +-
 frame/uniques/src/tests.rs                    |  136 +-
 frame/uniques/src/types.rs                    |    6 +-
 frame/uniques/src/weights.rs                  |    1 +
 frame/utility/src/benchmarking.rs             |    8 +-
 frame/utility/src/lib.rs                      |   43 +-
 frame/utility/src/tests.rs                    |  148 +-
 frame/utility/src/weights.rs                  |    1 +
 frame/vesting/src/benchmarking.rs             |    7 +-
 frame/vesting/src/lib.rs                      |   90 +-
 frame/vesting/src/tests.rs                    |  568 ++--
 frame/vesting/src/weights.rs                  |    1 +
 .../api/proc-macro/src/decl_runtime_apis.rs   |  340 +-
 .../api/proc-macro/src/impl_runtime_apis.rs   |  265 +-
 primitives/api/proc-macro/src/lib.rs          |    2 +-
 .../proc-macro/src/mock_impl_runtime_apis.rs  |  109 +-
 primitives/api/proc-macro/src/utils.rs        |  121 +-
 primitives/api/src/lib.rs                     |   93 +-
 primitives/api/test/benches/bench.rs          |   19 +-
 primitives/api/test/tests/decl_and_impl.rs    |   35 +-
 primitives/api/test/tests/runtime_calls.rs    |   85 +-
 primitives/application-crypto/src/ecdsa.rs    |    4 +-
 primitives/application-crypto/src/ed25519.rs  |    4 +-
 primitives/application-crypto/src/lib.rs      |  166 +-
 primitives/application-crypto/src/sr25519.rs  |    4 +-
 primitives/application-crypto/src/traits.rs   |   20 +-
 .../application-crypto/test/src/ecdsa.rs      |   22 +-
 .../application-crypto/test/src/ed25519.rs    |   22 +-
 primitives/application-crypto/test/src/lib.rs |    4 +-
 .../application-crypto/test/src/sr25519.rs    |   22 +-
 primitives/arithmetic/benches/bench.rs        |    6 +-
 primitives/arithmetic/fuzzer/src/biguint.rs   |   58 +-
 .../arithmetic/fuzzer/src/fixed_point.rs      |    8 +-
 .../fuzzer/src/multiply_by_rational.rs        |    2 +-
 primitives/arithmetic/fuzzer/src/normalize.rs |   13 +-
 .../fuzzer/src/per_thing_rational.rs          |   10 +-
 primitives/arithmetic/src/biguint.rs          |   96 +-
 primitives/arithmetic/src/fixed_point.rs      |  336 +-
 primitives/arithmetic/src/helpers_128bit.rs   |   17 +-
 primitives/arithmetic/src/lib.rs              |  148 +-
 primitives/arithmetic/src/per_things.rs       |  202 +-
 primitives/arithmetic/src/rational.rs         |   96 +-
 primitives/arithmetic/src/traits.rs           |  223 +-
 primitives/authority-discovery/src/lib.rs     |    6 +-
 primitives/authorship/src/lib.rs              |    8 +-
 primitives/blockchain/src/backend.rs          |   68 +-
 primitives/blockchain/src/error.rs            |   13 +-
 primitives/blockchain/src/header_metadata.rs  |   55 +-
 primitives/blockchain/src/lib.rs              |    4 +-
 primitives/consensus/aura/src/digests.rs      |    9 +-
 primitives/consensus/aura/src/inherents.rs    |   25 +-
 primitives/consensus/aura/src/lib.rs          |    6 +-
 primitives/consensus/babe/src/digests.rs      |   12 +-
 primitives/consensus/babe/src/inherents.rs    |   11 +-
 primitives/consensus/babe/src/lib.rs          |   33 +-
 .../consensus/common/src/block_import.rs      |   58 +-
 .../consensus/common/src/block_validation.rs  |    5 +-
 primitives/consensus/common/src/error.rs      |   10 +-
 primitives/consensus/common/src/evaluation.rs |    8 +-
 .../consensus/common/src/import_queue.rs      |  139 +-
 .../common/src/import_queue/basic_queue.rs    |   81 +-
 .../common/src/import_queue/buffered_link.rs  |   32 +-
 primitives/consensus/common/src/lib.rs        |   59 +-
 primitives/consensus/common/src/metrics.rs    |   44 +-
 .../consensus/common/src/select_chain.rs      |    1 -
 primitives/consensus/pow/src/lib.rs           |    4 +-
 primitives/consensus/vrf/src/schnorrkel.rs    |   38 +-
 primitives/core/benches/bench.rs              |   81 +-
 primitives/core/src/changes_trie.rs           |  123 +-
 primitives/core/src/crypto.rs                 |  450 ++-
 primitives/core/src/ecdsa.rs                  |  146 +-
 primitives/core/src/ed25519.rs                |  117 +-
 primitives/core/src/hash.rs                   |   53 +-
 primitives/core/src/hasher.rs                 |    8 +-
 primitives/core/src/hexdisplay.rs             |   26 +-
 primitives/core/src/lib.rs                    |   64 +-
 primitives/core/src/offchain/mod.rs           |  110 +-
 primitives/core/src/offchain/storage.rs       |   21 +-
 primitives/core/src/offchain/testing.rs       |  103 +-
 primitives/core/src/sandbox.rs                |   44 +-
 primitives/core/src/sr25519.rs                |  165 +-
 primitives/core/src/testing.rs                |    6 +-
 primitives/core/src/traits.rs                 |   18 +-
 primitives/core/src/u32_trait.rs              |  546 +++-
 primitives/core/src/uint.rs                   |   47 +-
 primitives/database/src/kvdb.rs               |   59 +-
 primitives/database/src/lib.rs                |   11 +-
 primitives/database/src/mem.rs                |   32 +-
 primitives/debug-derive/src/impls.rs          |  126 +-
 primitives/debug-derive/src/lib.rs            |    3 +-
 primitives/debug-derive/tests/tests.rs        |   26 +-
 primitives/externalities/src/extensions.rs    |   27 +-
 primitives/externalities/src/lib.rs           |   63 +-
 primitives/externalities/src/scope_limited.rs |    3 +-
 primitives/finality-grandpa/src/lib.rs        |   40 +-
 primitives/inherents/src/client_side.rs       |    6 +-
 primitives/inherents/src/lib.rs               |   47 +-
 primitives/io/src/batch_verifier.rs           |   34 +-
 primitives/io/src/lib.rs                      |  357 +-
 primitives/keyring/src/ed25519.rs             |   56 +-
 primitives/keyring/src/sr25519.rs             |   59 +-
 primitives/keystore/src/lib.rs                |   59 +-
 primitives/keystore/src/testing.rs            |  243 +-
 primitives/keystore/src/vrf.rs                |   12 +-
 primitives/maybe-compressed-blob/src/lib.rs   |   11 +-
 primitives/npos-elections/benches/phragmen.rs |   41 +-
 .../npos-elections/compact/src/assignment.rs  |  106 +-
 .../npos-elections/compact/src/codec.rs       |  117 +-
 .../compact/src/index_assignment.rs           |    2 +-
 primitives/npos-elections/compact/src/lib.rs  |   98 +-
 .../npos-elections/fuzzer/src/common.rs       |    6 +-
 .../npos-elections/fuzzer/src/compact.rs      |    8 +-
 .../fuzzer/src/phragmen_balancing.rs          |   39 +-
 .../npos-elections/fuzzer/src/phragmen_pjr.rs |    1 -
 .../fuzzer/src/phragmms_balancing.rs          |   39 +-
 .../npos-elections/fuzzer/src/reduce.rs       |   64 +-
 primitives/npos-elections/src/assignments.rs  |   46 +-
 primitives/npos-elections/src/balancing.rs    |   46 +-
 primitives/npos-elections/src/helpers.rs      |   17 +-
 primitives/npos-elections/src/lib.rs          |   94 +-
 primitives/npos-elections/src/mock.rs         |  132 +-
 primitives/npos-elections/src/node.rs         |   55 +-
 primitives/npos-elections/src/phragmen.rs     |   19 +-
 primitives/npos-elections/src/phragmms.rs     |  171 +-
 primitives/npos-elections/src/pjr.rs          |  225 +-
 primitives/npos-elections/src/reduce.rs       |  450 +--
 primitives/npos-elections/src/tests.rs        |  776 ++---
 primitives/panic-handler/src/lib.rs           |   48 +-
 primitives/rpc/src/lib.rs                     |   18 +-
 primitives/rpc/src/list.rs                    |    2 +-
 primitives/rpc/src/number.rs                  |    7 +-
 primitives/rpc/src/tracing.rs                 |    6 +-
 .../runtime-interface/proc-macro/src/lib.rs   |   18 +-
 .../proc-macro/src/pass_by/codec.rs           |    6 +-
 .../proc-macro/src/pass_by/enum_.rs           |   19 +-
 .../proc-macro/src/pass_by/inner.rs           |   19 +-
 .../bare_function_interface.rs                |  110 +-
 .../host_function_interface.rs                |  326 +-
 .../src/runtime_interface/trait_decl_impl.rs  |   63 +-
 .../runtime-interface/proc-macro/src/utils.rs |  135 +-
 primitives/runtime-interface/src/impls.rs     |   38 +-
 primitives/runtime-interface/src/lib.rs       |   10 +-
 primitives/runtime-interface/src/pass_by.rs   |   60 +-
 primitives/runtime-interface/src/wasm.rs      |    5 +-
 .../test-wasm-deprecated/src/lib.rs           |    6 +-
 .../runtime-interface/test-wasm/src/lib.rs    |    8 +-
 primitives/runtime-interface/test/src/lib.rs  |   63 +-
 primitives/runtime/src/curve.rs               |   37 +-
 primitives/runtime/src/generic/block.rs       |   16 +-
 .../runtime/src/generic/checked_extrinsic.rs  |   19 +-
 primitives/runtime/src/generic/digest.rs      |   63 +-
 primitives/runtime/src/generic/era.rs         |   36 +-
 primitives/runtime/src/generic/header.rs      |  150 +-
 primitives/runtime/src/generic/mod.rs         |   22 +-
 primitives/runtime/src/generic/tests.rs       |   41 +-
 .../src/generic/unchecked_extrinsic.rs        |  140 +-
 primitives/runtime/src/lib.rs                 |  222 +-
 primitives/runtime/src/multiaddress.rs        |    8 +-
 primitives/runtime/src/offchain/http.rs       |  105 +-
 primitives/runtime/src/offchain/storage.rs    |   48 +-
 .../runtime/src/offchain/storage_lock.rs      |   41 +-
 primitives/runtime/src/runtime_logger.rs      |   17 +-
 primitives/runtime/src/runtime_string.rs      |    7 +-
 primitives/runtime/src/testing.rs             |  102 +-
 primitives/runtime/src/traits.rs              |  304 +-
 .../runtime/src/transaction_validity.rs       |   51 +-
 primitives/sandbox/src/lib.rs                 |   22 +-
 primitives/serializer/src/lib.rs              |    7 +-
 primitives/session/src/lib.rs                 |    9 +-
 primitives/staking/src/offence.rs             |    9 +-
 primitives/state-machine/src/backend.rs       |  106 +-
 primitives/state-machine/src/basic.rs         |  153 +-
 .../state-machine/src/changes_trie/build.rs   | 1144 ++++---
 .../src/changes_trie/build_cache.rs           |   73 +-
 .../src/changes_trie/build_iterator.rs        |  160 +-
 .../src/changes_trie/changes_iterator.rs      |  463 +--
 .../state-machine/src/changes_trie/input.rs   |    8 +-
 .../state-machine/src/changes_trie/mod.rs     |  197 +-
 .../state-machine/src/changes_trie/prune.rs   |   85 +-
 .../state-machine/src/changes_trie/storage.rs |   51 +-
 .../src/changes_trie/surface_iterator.rs      |  164 +-
 primitives/state-machine/src/error.rs         |    1 -
 primitives/state-machine/src/ext.rs           |  300 +-
 .../state-machine/src/in_memory_backend.rs    |   64 +-
 primitives/state-machine/src/lib.rs           |  611 ++--
 .../src/overlayed_changes/changeset.rs        |  164 +-
 .../src/overlayed_changes/mod.rs              |  267 +-
 .../src/overlayed_changes/offchain.rs         |   22 +-
 .../state-machine/src/proving_backend.rs      |  205 +-
 primitives/state-machine/src/read_only.rs     |   72 +-
 primitives/state-machine/src/stats.rs         |    4 +-
 primitives/state-machine/src/testing.rs       |   95 +-
 primitives/state-machine/src/trie_backend.rs  |   96 +-
 .../state-machine/src/trie_backend_essence.rs |  171 +-
 primitives/std/src/lib.rs                     |   26 +-
 primitives/storage/src/lib.rs                 |   49 +-
 primitives/tasks/src/async_externalities.rs   |   48 +-
 primitives/tasks/src/lib.rs                   |  155 +-
 primitives/test-primitives/src/lib.rs         |   16 +-
 primitives/timestamp/src/lib.rs               |   16 +-
 primitives/tracing/src/lib.rs                 |   55 +-
 primitives/tracing/src/types.rs               |  271 +-
 .../transaction-pool/src/runtime_api.rs       |    6 +-
 .../transaction-storage-proof/src/lib.rs      |   74 +-
 primitives/trie/benches/bench.rs              |    2 +-
 primitives/trie/src/error.rs                  |   10 +-
 primitives/trie/src/lib.rs                    |  355 +-
 primitives/trie/src/node_codec.rs             |   87 +-
 primitives/trie/src/node_header.rs            |   26 +-
 primitives/trie/src/storage_proof.rs          |   39 +-
 primitives/trie/src/trie_codec.rs             |   67 +-
 primitives/trie/src/trie_stream.rs            |   53 +-
 primitives/utils/src/metrics.rs               |   19 +-
 primitives/utils/src/mpsc.rs                  |   86 +-
 primitives/utils/src/status_sinks.rs          |   29 +-
 .../proc-macro/src/decl_runtime_version.rs    |   81 +-
 primitives/version/src/embed.rs               |    5 +-
 primitives/version/src/lib.rs                 |   67 +-
 primitives/wasm-interface/src/lib.rs          |   40 +-
 primitives/wasm-interface/src/wasmi_impl.rs   |    2 +-
 rustfmt.toml                                  |    2 -
 test-utils/client/src/client_ext.rs           |   67 +-
 test-utils/client/src/lib.rs                  |  180 +-
 test-utils/derive/src/lib.rs                  |    6 +-
 .../runtime/client/src/block_builder_ext.rs   |   22 +-
 test-utils/runtime/client/src/lib.rs          |  152 +-
 test-utils/runtime/client/src/trait_tests.rs  |  489 ++-
 test-utils/runtime/src/genesismap.rs          |   62 +-
 test-utils/runtime/src/lib.rs                 |  187 +-
 test-utils/runtime/src/system.rs              |  193 +-
 .../runtime/transaction-pool/src/lib.rs       |  139 +-
 test-utils/src/lib.rs                         |   10 +-
 test-utils/test-runner/src/client.rs          |  376 +--
 test-utils/test-runner/src/host_functions.rs  |   20 +-
 test-utils/test-runner/src/lib.rs             |   25 +-
 test-utils/test-runner/src/node.rs            |   99 +-
 test-utils/test-runner/src/utils.rs           |   40 +-
 utils/browser/src/lib.rs                      |   45 +-
 utils/build-script-utils/src/git.rs           |   10 +-
 utils/build-script-utils/src/lib.rs           |    2 +-
 utils/build-script-utils/src/version.rs       |    6 +-
 utils/fork-tree/src/lib.rs                    |  444 +--
 utils/frame/benchmarking-cli/src/command.rs   |   52 +-
 utils/frame/benchmarking-cli/src/writer.rs    |  201 +-
 utils/frame/frame-utilities-cli/src/lib.rs    |    1 -
 .../frame-utilities-cli/src/pallet_id.rs      |   28 +-
 utils/frame/remote-externalities/src/lib.rs   |   71 +-
 .../frame/remote-externalities/src/rpc_api.rs |   21 +-
 utils/frame/rpc/support/src/lib.rs            |   25 +-
 utils/frame/rpc/system/src/lib.rs             |  164 +-
 utils/frame/try-runtime/cli/src/lib.rs        |  146 +-
 utils/frame/try-runtime/cli/src/parse.rs      |    7 +-
 utils/prometheus/src/lib.rs                   |   55 +-
 utils/prometheus/src/networking.rs            |   28 +-
 utils/prometheus/src/sourced.rs               |   45 +-
 utils/wasm-builder/src/builder.rs             |   40 +-
 utils/wasm-builder/src/lib.rs                 |   26 +-
 utils/wasm-builder/src/prerequisites.rs       |   65 +-
 utils/wasm-builder/src/wasm_project.rs        |  188 +-
 1010 files changed, 53418 insertions(+), 51287 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1ff57bf0f79a..2cef2d8badcc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -233,6 +233,14 @@ cargo-deny:
   # FIXME: Temorarily allow to fail.
   allow_failure:                   true
 
+cargo-fmt:
+  stage:                           test
+  <<:                              *docker-env
+  <<:                              *test-refs
+  script:
+    - cargo +nightly fmt --all -- --check
+  allow_failure:                   true
+
 cargo-check-benches:
   stage:                           test
   <<:                              *docker-env
diff --git a/.maintain/frame-weight-template.hbs b/.maintain/frame-weight-template.hbs
index 64d8f75b00d2..2f1fa742f078 100644
--- a/.maintain/frame-weight-template.hbs
+++ b/.maintain/frame-weight-template.hbs
@@ -26,6 +26,7 @@
 // {{arg}}
 {{/each}}
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
diff --git a/bin/node-template/node/src/chain_spec.rs b/bin/node-template/node/src/chain_spec.rs
index 5093a77b571e..7009b3be5c27 100644
--- a/bin/node-template/node/src/chain_spec.rs
+++ b/bin/node-template/node/src/chain_spec.rs
@@ -1,12 +1,12 @@
-use sp_core::{Pair, Public, sr25519};
 use node_template_runtime::{
-	AccountId, AuraConfig, BalancesConfig, GenesisConfig, GrandpaConfig,
-	SudoConfig, SystemConfig, WASM_BINARY, Signature
+	AccountId, AuraConfig, BalancesConfig, GenesisConfig, GrandpaConfig, Signature, SudoConfig,
+	SystemConfig, WASM_BINARY,
 };
+use sc_service::ChainType;
 use sp_consensus_aura::sr25519::AuthorityId as AuraId;
+use sp_core::{sr25519, Pair, Public};
 use sp_finality_grandpa::AuthorityId as GrandpaId;
-use sp_runtime::traits::{Verify, IdentifyAccount};
-use sc_service::ChainType;
+use sp_runtime::traits::{IdentifyAccount, Verify};
 
 // The URL for the telemetry server.
 // const STAGING_TELEMETRY_URL: &str = "wss://telemetry.polkadot.io/submit/";
@@ -24,18 +24,16 @@ pub fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Pu
 type AccountPublic = <Signature as Verify>::Signer;
 
 /// Generate an account ID from seed.
-pub fn get_account_id_from_seed<TPublic: Public>(seed: &str) -> AccountId where
-	AccountPublic: From<<TPublic::Pair as Pair>::Public>
+pub fn get_account_id_from_seed<TPublic: Public>(seed: &str) -> AccountId
+where
+	AccountPublic: From<<TPublic::Pair as Pair>::Public>,
 {
 	AccountPublic::from(get_from_seed::<TPublic>(seed)).into_account()
 }
 
 /// Generate an Aura authority key.
 pub fn authority_keys_from_seed(s: &str) -> (AuraId, GrandpaId) {
-	(
-		get_from_seed::<AuraId>(s),
-		get_from_seed::<GrandpaId>(s),
-	)
+	(get_from_seed::<AuraId>(s), get_from_seed::<GrandpaId>(s))
 }
 
 pub fn development_config() -> Result<ChainSpec, String> {
@@ -47,23 +45,23 @@ pub fn development_config() -> Result<ChainSpec, String> {
 		// ID
 		"dev",
 		ChainType::Development,
-		move || testnet_genesis(
-			wasm_binary,
-			// Initial PoA authorities
-			vec![
-				authority_keys_from_seed("Alice"),
-			],
-			// Sudo account
-			get_account_id_from_seed::<sr25519::Public>("Alice"),
-			// Pre-funded accounts
-			vec![
+		move || {
+			testnet_genesis(
+				wasm_binary,
+				// Initial PoA authorities
+				vec![authority_keys_from_seed("Alice")],
+				// Sudo account
 				get_account_id_from_seed::<sr25519::Public>("Alice"),
-				get_account_id_from_seed::<sr25519::Public>("Bob"),
-				get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
-				get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
-			],
-			true,
-		),
+				// Pre-funded accounts
+				vec![
+					get_account_id_from_seed::<sr25519::Public>("Alice"),
+					get_account_id_from_seed::<sr25519::Public>("Bob"),
+					get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
+					get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
+				],
+				true,
+			)
+		},
 		// Bootnodes
 		vec![],
 		// Telemetry
@@ -86,32 +84,31 @@ pub fn local_testnet_config() -> Result<ChainSpec, String> {
 		// ID
 		"local_testnet",
 		ChainType::Local,
-		move || testnet_genesis(
-			wasm_binary,
-			// Initial PoA authorities
-			vec![
-				authority_keys_from_seed("Alice"),
-				authority_keys_from_seed("Bob"),
-			],
-			// Sudo account
-			get_account_id_from_seed::<sr25519::Public>("Alice"),
-			// Pre-funded accounts
-			vec![
+		move || {
+			testnet_genesis(
+				wasm_binary,
+				// Initial PoA authorities
+				vec![authority_keys_from_seed("Alice"), authority_keys_from_seed("Bob")],
+				// Sudo account
 				get_account_id_from_seed::<sr25519::Public>("Alice"),
-				get_account_id_from_seed::<sr25519::Public>("Bob"),
-				get_account_id_from_seed::<sr25519::Public>("Charlie"),
-				get_account_id_from_seed::<sr25519::Public>("Dave"),
-				get_account_id_from_seed::<sr25519::Public>("Eve"),
-				get_account_id_from_seed::<sr25519::Public>("Ferdie"),
-				get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
-				get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
-				get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
-				get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
-				get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
-				get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
-			],
-			true,
-		),
+				// Pre-funded accounts
+				vec![
+					get_account_id_from_seed::<sr25519::Public>("Alice"),
+					get_account_id_from_seed::<sr25519::Public>("Bob"),
+					get_account_id_from_seed::<sr25519::Public>("Charlie"),
+					get_account_id_from_seed::<sr25519::Public>("Dave"),
+					get_account_id_from_seed::<sr25519::Public>("Eve"),
+					get_account_id_from_seed::<sr25519::Public>("Ferdie"),
+					get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
+					get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
+					get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
+					get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
+					get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
+					get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
+				],
+				true,
+			)
+		},
 		// Bootnodes
 		vec![],
 		// Telemetry
@@ -141,7 +138,7 @@ fn testnet_genesis(
 		},
 		balances: BalancesConfig {
 			// Configure endowed accounts with initial balance of 1 << 60.
-			balances: endowed_accounts.iter().cloned().map(|k|(k, 1 << 60)).collect(),
+			balances: endowed_accounts.iter().cloned().map(|k| (k, 1 << 60)).collect(),
 		},
 		aura: AuraConfig {
 			authorities: initial_authorities.iter().map(|x| (x.0.clone())).collect(),
diff --git a/bin/node-template/node/src/cli.rs b/bin/node-template/node/src/cli.rs
index 947123a6bbf5..8b551051c1b1 100644
--- a/bin/node-template/node/src/cli.rs
+++ b/bin/node-template/node/src/cli.rs
@@ -1,5 +1,5 @@
-use structopt::StructOpt;
 use sc_cli::RunCmd;
+use structopt::StructOpt;
 
 #[derive(Debug, StructOpt)]
 pub struct Cli {
diff --git a/bin/node-template/node/src/command.rs b/bin/node-template/node/src/command.rs
index e61dd8641882..d3a04e0ae91e 100644
--- a/bin/node-template/node/src/command.rs
+++ b/bin/node-template/node/src/command.rs
@@ -15,11 +15,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::{chain_spec, service};
-use crate::cli::{Cli, Subcommand};
-use sc_cli::{SubstrateCli, RuntimeVersion, Role, ChainSpec};
-use sc_service::PartialComponents;
+use crate::{
+	chain_spec,
+	cli::{Cli, Subcommand},
+	service,
+};
 use node_template_runtime::Block;
+use sc_cli::{ChainSpec, Role, RuntimeVersion, SubstrateCli};
+use sc_service::PartialComponents;
 
 impl SubstrateCli for Cli {
 	fn impl_name() -> String {
@@ -50,9 +53,8 @@ impl SubstrateCli for Cli {
 		Ok(match id {
 			"dev" => Box::new(chain_spec::development_config()?),
 			"" | "local" => Box::new(chain_spec::local_testnet_config()?),
-			path => Box::new(chain_spec::ChainSpec::from_json_file(
-				std::path::PathBuf::from(path),
-			)?),
+			path =>
+				Box::new(chain_spec::ChainSpec::from_json_file(std::path::PathBuf::from(path))?),
 		})
 	}
 
@@ -74,32 +76,30 @@ pub fn run() -> sc_cli::Result<()> {
 		Some(Subcommand::CheckBlock(cmd)) => {
 			let runner = cli.create_runner(cmd)?;
 			runner.async_run(|config| {
-				let PartialComponents { client, task_manager, import_queue, ..}
-					= service::new_partial(&config)?;
+				let PartialComponents { client, task_manager, import_queue, .. } =
+					service::new_partial(&config)?;
 				Ok((cmd.run(client, import_queue), task_manager))
 			})
 		},
 		Some(Subcommand::ExportBlocks(cmd)) => {
 			let runner = cli.create_runner(cmd)?;
 			runner.async_run(|config| {
-				let PartialComponents { client, task_manager, ..}
-					= service::new_partial(&config)?;
+				let PartialComponents { client, task_manager, .. } = service::new_partial(&config)?;
 				Ok((cmd.run(client, config.database), task_manager))
 			})
 		},
 		Some(Subcommand::ExportState(cmd)) => {
 			let runner = cli.create_runner(cmd)?;
 			runner.async_run(|config| {
-				let PartialComponents { client, task_manager, ..}
-					= service::new_partial(&config)?;
+				let PartialComponents { client, task_manager, .. } = service::new_partial(&config)?;
 				Ok((cmd.run(client, config.chain_spec), task_manager))
 			})
 		},
 		Some(Subcommand::ImportBlocks(cmd)) => {
 			let runner = cli.create_runner(cmd)?;
 			runner.async_run(|config| {
-				let PartialComponents { client, task_manager, import_queue, ..}
-					= service::new_partial(&config)?;
+				let PartialComponents { client, task_manager, import_queue, .. } =
+					service::new_partial(&config)?;
 				Ok((cmd.run(client, import_queue), task_manager))
 			})
 		},
@@ -110,29 +110,30 @@ pub fn run() -> sc_cli::Result<()> {
 		Some(Subcommand::Revert(cmd)) => {
 			let runner = cli.create_runner(cmd)?;
 			runner.async_run(|config| {
-				let PartialComponents { client, task_manager, backend, ..}
-					= service::new_partial(&config)?;
+				let PartialComponents { client, task_manager, backend, .. } =
+					service::new_partial(&config)?;
 				Ok((cmd.run(client, backend), task_manager))
 			})
 		},
-		Some(Subcommand::Benchmark(cmd)) => {
+		Some(Subcommand::Benchmark(cmd)) =>
 			if cfg!(feature = "runtime-benchmarks") {
 				let runner = cli.create_runner(cmd)?;
 
 				runner.sync_run(|config| cmd.run::<Block, service::Executor>(config))
 			} else {
 				Err("Benchmarking wasn't enabled when building the node. \
-				You can enable it with `--features runtime-benchmarks`.".into())
-			}
-		},
+				You can enable it with `--features runtime-benchmarks`."
+					.into())
+			},
 		None => {
 			let runner = cli.create_runner(&cli.run)?;
 			runner.run_node_until_exit(|config| async move {
 				match config.role {
 					Role::Light => service::new_light(config),
 					_ => service::new_full(config),
-				}.map_err(sc_cli::Error::Service)
+				}
+				.map_err(sc_cli::Error::Service)
 			})
-		}
+		},
 	}
 }
diff --git a/bin/node-template/node/src/lib.rs b/bin/node-template/node/src/lib.rs
index 777c4f0a7714..f117b8aae619 100644
--- a/bin/node-template/node/src/lib.rs
+++ b/bin/node-template/node/src/lib.rs
@@ -1,3 +1,3 @@
 pub mod chain_spec;
-pub mod service;
 pub mod rpc;
+pub mod service;
diff --git a/bin/node-template/node/src/rpc.rs b/bin/node-template/node/src/rpc.rs
index a03d1aad2a88..d23b23178ec2 100644
--- a/bin/node-template/node/src/rpc.rs
+++ b/bin/node-template/node/src/rpc.rs
@@ -8,12 +8,11 @@
 use std::sync::Arc;
 
 use node_template_runtime::{opaque::Block, AccountId, Balance, Index};
-use sp_api::ProvideRuntimeApi;
-use sp_blockchain::{Error as BlockChainError, HeaderMetadata, HeaderBackend};
-use sp_block_builder::BlockBuilder;
 pub use sc_rpc_api::DenyUnsafe;
 use sc_transaction_pool_api::TransactionPool;
-
+use sp_api::ProvideRuntimeApi;
+use sp_block_builder::BlockBuilder;
+use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
 
 /// Full client dependencies.
 pub struct FullDeps<C, P> {
@@ -26,34 +25,25 @@ pub struct FullDeps<C, P> {
 }
 
 /// Instantiate all full RPC extensions.
-pub fn create_full<C, P>(
-	deps: FullDeps<C, P>,
-) -> jsonrpc_core::IoHandler<sc_rpc::Metadata> where
+pub fn create_full<C, P>(deps: FullDeps<C, P>) -> jsonrpc_core::IoHandler<sc_rpc::Metadata>
+where
 	C: ProvideRuntimeApi<Block>,
-	C: HeaderBackend<Block> + HeaderMetadata<Block, Error=BlockChainError> + 'static,
+	C: HeaderBackend<Block> + HeaderMetadata<Block, Error = BlockChainError> + 'static,
 	C: Send + Sync + 'static,
 	C::Api: substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>,
 	C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance>,
 	C::Api: BlockBuilder<Block>,
 	P: TransactionPool + 'static,
 {
-	use substrate_frame_rpc_system::{FullSystem, SystemApi};
 	use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApi};
+	use substrate_frame_rpc_system::{FullSystem, SystemApi};
 
 	let mut io = jsonrpc_core::IoHandler::default();
-	let FullDeps {
-		client,
-		pool,
-		deny_unsafe,
-	} = deps;
+	let FullDeps { client, pool, deny_unsafe } = deps;
 
-	io.extend_with(
-		SystemApi::to_delegate(FullSystem::new(client.clone(), pool, deny_unsafe))
-	);
+	io.extend_with(SystemApi::to_delegate(FullSystem::new(client.clone(), pool, deny_unsafe)));
 
-	io.extend_with(
-		TransactionPaymentApi::to_delegate(TransactionPayment::new(client.clone()))
-	);
+	io.extend_with(TransactionPaymentApi::to_delegate(TransactionPayment::new(client.clone())));
 
 	// Extend this RPC with a custom API by using the following syntax.
 	// `YourRpcStruct` should have a reference to a client, which is needed
diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
index c19824e9eaa3..d97f29c00bca 100644
--- a/bin/node-template/node/src/service.rs
+++ b/bin/node-template/node/src/service.rs
@@ -1,17 +1,17 @@
 //! Service and ServiceFactory implementation. Specialized wrapper over substrate service.
 
-use std::{sync::Arc, time::Duration};
-use sc_client_api::{ExecutorProvider, RemoteBackend};
 use node_template_runtime::{self, opaque::Block, RuntimeApi};
-use sc_service::{error::Error as ServiceError, Configuration, TaskManager};
+use sc_client_api::{ExecutorProvider, RemoteBackend};
+use sc_consensus_aura::{ImportQueueParams, SlotProportion, StartAuraParams};
 use sc_executor::native_executor_instance;
 pub use sc_executor::NativeExecutor;
-use sp_consensus_aura::sr25519::AuthorityPair as AuraPair;
-use sc_consensus_aura::{ImportQueueParams, StartAuraParams, SlotProportion};
 use sc_finality_grandpa::SharedVoterState;
 use sc_keystore::LocalKeystore;
+use sc_service::{error::Error as ServiceError, Configuration, TaskManager};
 use sc_telemetry::{Telemetry, TelemetryWorker};
 use sp_consensus::SlotData;
+use sp_consensus_aura::sr25519::AuthorityPair as AuraPair;
+use std::{sync::Arc, time::Duration};
 
 // Our native executor instance.
 native_executor_instance!(
@@ -25,22 +25,35 @@ type FullClient = sc_service::TFullClient<Block, RuntimeApi, Executor>;
 type FullBackend = sc_service::TFullBackend<Block>;
 type FullSelectChain = sc_consensus::LongestChain<FullBackend, Block>;
 
-pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponents<
-	FullClient, FullBackend, FullSelectChain,
-	sp_consensus::DefaultImportQueue<Block, FullClient>,
-	sc_transaction_pool::FullPool<Block, FullClient>,
-	(
-		sc_finality_grandpa::GrandpaBlockImport<FullBackend, Block, FullClient, FullSelectChain>,
-		sc_finality_grandpa::LinkHalf<Block, FullClient, FullSelectChain>,
-		Option<Telemetry>,
-	)
->, ServiceError> {
+pub fn new_partial(
+	config: &Configuration,
+) -> Result<
+	sc_service::PartialComponents<
+		FullClient,
+		FullBackend,
+		FullSelectChain,
+		sp_consensus::DefaultImportQueue<Block, FullClient>,
+		sc_transaction_pool::FullPool<Block, FullClient>,
+		(
+			sc_finality_grandpa::GrandpaBlockImport<
+				FullBackend,
+				Block,
+				FullClient,
+				FullSelectChain,
+			>,
+			sc_finality_grandpa::LinkHalf<Block, FullClient, FullSelectChain>,
+			Option<Telemetry>,
+		),
+	>,
+	ServiceError,
+> {
 	if config.keystore_remote.is_some() {
-		return Err(ServiceError::Other(
-			format!("Remote Keystores are not supported.")))
+		return Err(ServiceError::Other(format!("Remote Keystores are not supported.")))
 	}
 
-	let telemetry = config.telemetry_endpoints.clone()
+	let telemetry = config
+		.telemetry_endpoints
+		.clone()
 		.filter(|x| !x.is_empty())
 		.map(|endpoints| -> Result<_, sc_telemetry::Error> {
 			let worker = TelemetryWorker::new(16)?;
@@ -56,11 +69,10 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 		)?;
 	let client = Arc::new(client);
 
-	let telemetry = telemetry
-		.map(|(worker, telemetry)| {
-			task_manager.spawn_handle().spawn("telemetry", worker.run());
-			telemetry
-		});
+	let telemetry = telemetry.map(|(worker, telemetry)| {
+		task_manager.spawn_handle().spawn("telemetry", worker.run());
+		telemetry
+	});
 
 	let select_chain = sc_consensus::LongestChain::new(backend.clone());
 
@@ -81,8 +93,8 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 
 	let slot_duration = sc_consensus_aura::slot_duration(&*client)?.slot_duration();
 
-	let import_queue = sc_consensus_aura::import_queue::<AuraPair, _, _, _, _, _, _>(
-		ImportQueueParams {
+	let import_queue =
+		sc_consensus_aura::import_queue::<AuraPair, _, _, _, _, _, _>(ImportQueueParams {
 			block_import: grandpa_block_import.clone(),
 			justification_import: Some(Box::new(grandpa_block_import.clone())),
 			client: client.clone(),
@@ -98,12 +110,13 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 				Ok((timestamp, slot))
 			},
 			spawner: &task_manager.spawn_essential_handle(),
-			can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()),
+			can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(
+				client.executor().clone(),
+			),
 			registry: config.prometheus_registry(),
 			check_for_equivocation: Default::default(),
 			telemetry: telemetry.as_ref().map(|x| x.handle()),
-		},
-	)?;
+		})?;
 
 	Ok(sc_service::PartialComponents {
 		client,
@@ -140,10 +153,11 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 	if let Some(url) = &config.keystore_remote {
 		match remote_keystore(url) {
 			Ok(k) => keystore_container.set_remote_keystore(k),
-			Err(e) => {
-				return Err(ServiceError::Other(
-					format!("Error hooking up remote keystore for {}: {}", url, e)))
-			}
+			Err(e) =>
+				return Err(ServiceError::Other(format!(
+					"Error hooking up remote keystore for {}: {}",
+					url, e
+				))),
 		};
 	}
 
@@ -162,7 +176,10 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 
 	if config.offchain_worker.enabled {
 		sc_service::build_offchain_workers(
-			&config, task_manager.spawn_handle(), client.clone(), network.clone(),
+			&config,
+			task_manager.spawn_handle(),
+			client.clone(),
+			network.clone(),
 		);
 	}
 
@@ -178,32 +195,27 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		let pool = transaction_pool.clone();
 
 		Box::new(move |deny_unsafe, _| {
-			let deps = crate::rpc::FullDeps {
-				client: client.clone(),
-				pool: pool.clone(),
-				deny_unsafe,
-			};
+			let deps =
+				crate::rpc::FullDeps { client: client.clone(), pool: pool.clone(), deny_unsafe };
 
 			crate::rpc::create_full(deps)
 		})
 	};
 
-	let _rpc_handlers = sc_service::spawn_tasks(
-		sc_service::SpawnTasksParams {
-			network: network.clone(),
-			client: client.clone(),
-			keystore: keystore_container.sync_keystore(),
-			task_manager: &mut task_manager,
-			transaction_pool: transaction_pool.clone(),
-			rpc_extensions_builder,
-			on_demand: None,
-			remote_blockchain: None,
-			backend,
-			system_rpc_tx,
-			config,
-			telemetry: telemetry.as_mut(),
-		},
-	)?;
+	let _rpc_handlers = sc_service::spawn_tasks(sc_service::SpawnTasksParams {
+		network: network.clone(),
+		client: client.clone(),
+		keystore: keystore_container.sync_keystore(),
+		task_manager: &mut task_manager,
+		transaction_pool: transaction_pool.clone(),
+		rpc_extensions_builder,
+		on_demand: None,
+		remote_blockchain: None,
+		backend,
+		system_rpc_tx,
+		config,
+		telemetry: telemetry.as_mut(),
+	})?;
 
 	if role.is_authority() {
 		let proposer_factory = sc_basic_authorship::ProposerFactory::new(
@@ -257,11 +269,8 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 
 	// 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 role.is_authority() {
-		Some(keystore_container.sync_keystore())
-	} else {
-		None
-	};
+	let keystore =
+		if role.is_authority() { Some(keystore_container.sync_keystore()) } else { None };
 
 	let grandpa_config = sc_finality_grandpa::Config {
 		// FIXME #1578 make this available through chainspec
@@ -295,7 +304,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		// if it fails we take down the service with it.
 		task_manager.spawn_essential_handle().spawn_blocking(
 			"grandpa-voter",
-			sc_finality_grandpa::run_grandpa_voter(grandpa_config)?
+			sc_finality_grandpa::run_grandpa_voter(grandpa_config)?,
 		);
 	}
 
@@ -305,7 +314,9 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 
 /// Builds a new service for a light client.
 pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError> {
-	let telemetry = config.telemetry_endpoints.clone()
+	let telemetry = config
+		.telemetry_endpoints
+		.clone()
 		.filter(|x| !x.is_empty())
 		.map(|endpoints| -> Result<_, sc_telemetry::Error> {
 			let worker = TelemetryWorker::new(16)?;
@@ -320,11 +331,10 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
 			telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()),
 		)?;
 
-	let mut telemetry = telemetry
-		.map(|(worker, telemetry)| {
-			task_manager.spawn_handle().spawn("telemetry", worker.run());
-			telemetry
-		});
+	let mut telemetry = telemetry.map(|(worker, telemetry)| {
+		task_manager.spawn_handle().spawn("telemetry", worker.run());
+		telemetry
+	});
 
 	config.network.extra_sets.push(sc_finality_grandpa::grandpa_peers_set_config());
 
@@ -347,8 +357,8 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
 
 	let slot_duration = sc_consensus_aura::slot_duration(&*client)?.slot_duration();
 
-	let import_queue = sc_consensus_aura::import_queue::<AuraPair, _, _, _, _, _, _>(
-		ImportQueueParams {
+	let import_queue =
+		sc_consensus_aura::import_queue::<AuraPair, _, _, _, _, _, _>(ImportQueueParams {
 			block_import: grandpa_block_import.clone(),
 			justification_import: Some(Box::new(grandpa_block_import.clone())),
 			client: client.clone(),
@@ -368,8 +378,7 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
 			registry: config.prometheus_registry(),
 			check_for_equivocation: Default::default(),
 			telemetry: telemetry.as_ref().map(|x| x.handle()),
-		},
-	)?;
+		})?;
 
 	let (network, system_rpc_tx, network_starter) =
 		sc_service::build_network(sc_service::BuildNetworkParams {
@@ -384,7 +393,10 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
 
 	if config.offchain_worker.enabled {
 		sc_service::build_offchain_workers(
-			&config, task_manager.spawn_handle(), client.clone(), network.clone(),
+			&config,
+			task_manager.spawn_handle(),
+			client.clone(),
+			network.clone(),
 		);
 	}
 
diff --git a/bin/node-template/pallets/template/src/benchmarking.rs b/bin/node-template/pallets/template/src/benchmarking.rs
index 93d7fa395ad6..2117c048cfbd 100644
--- a/bin/node-template/pallets/template/src/benchmarking.rs
+++ b/bin/node-template/pallets/template/src/benchmarking.rs
@@ -2,10 +2,10 @@
 
 use super::*;
 
-use frame_system::RawOrigin;
-use frame_benchmarking::{benchmarks, whitelisted_caller, impl_benchmark_test_suite};
 #[allow(unused)]
 use crate::Pallet as Template;
+use frame_benchmarking::{benchmarks, impl_benchmark_test_suite, whitelisted_caller};
+use frame_system::RawOrigin;
 
 benchmarks! {
 	do_something {
@@ -17,8 +17,4 @@ benchmarks! {
 	}
 }
 
-impl_benchmark_test_suite!(
-	Template,
-	crate::mock::new_test_ext(),
-	crate::mock::Test,
-);
+impl_benchmark_test_suite!(Template, crate::mock::new_test_ext(), crate::mock::Test);
diff --git a/bin/node-template/pallets/template/src/lib.rs b/bin/node-template/pallets/template/src/lib.rs
index 373a56f44419..7a9830a21eb2 100644
--- a/bin/node-template/pallets/template/src/lib.rs
+++ b/bin/node-template/pallets/template/src/lib.rs
@@ -3,7 +3,6 @@
 /// Edit this file to define custom logic or remove it if it is not needed.
 /// Learn more about FRAME and the core library of Substrate FRAME pallets:
 /// <https://substrate.dev/docs/en/knowledgebase/runtime/frame>
-
 pub use pallet::*;
 
 #[cfg(test)]
@@ -63,7 +62,7 @@ pub mod pallet {
 	// These functions materialize as "extrinsics", which are often compared to transactions.
 	// Dispatchable functions must be annotated with a weight and must return a DispatchResult.
 	#[pallet::call]
-	impl<T:Config> Pallet<T> {
+	impl<T: Config> Pallet<T> {
 		/// An example dispatchable that takes a singles value as a parameter, writes the value to
 		/// storage and emits an event. This function must be dispatched by a signed extrinsic.
 		#[pallet::weight(10_000 + T::DbWeight::get().writes(1))]
diff --git a/bin/node-template/pallets/template/src/mock.rs b/bin/node-template/pallets/template/src/mock.rs
index 9bea61df22ed..76742477000f 100644
--- a/bin/node-template/pallets/template/src/mock.rs
+++ b/bin/node-template/pallets/template/src/mock.rs
@@ -1,10 +1,11 @@
 use crate as pallet_template;
-use sp_core::H256;
 use frame_support::parameter_types;
+use frame_system as system;
+use sp_core::H256;
 use sp_runtime::{
-	traits::{BlakeTwo256, IdentityLookup}, testing::Header,
+	testing::Header,
+	traits::{BlakeTwo256, IdentityLookup},
 };
-use frame_system as system;
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
diff --git a/bin/node-template/pallets/template/src/tests.rs b/bin/node-template/pallets/template/src/tests.rs
index 3356b29ff359..220565860172 100644
--- a/bin/node-template/pallets/template/src/tests.rs
+++ b/bin/node-template/pallets/template/src/tests.rs
@@ -1,5 +1,5 @@
-use crate::{Error, mock::*};
-use frame_support::{assert_ok, assert_noop};
+use crate::{mock::*, Error};
+use frame_support::{assert_noop, assert_ok};
 
 #[test]
 fn it_works_for_default_value() {
@@ -15,9 +15,6 @@ fn it_works_for_default_value() {
 fn correct_error_for_none_value() {
 	new_test_ext().execute_with(|| {
 		// Ensure the expected error is thrown when no value is present.
-		assert_noop!(
-			TemplateModule::cause_error(Origin::signed(1)),
-			Error::<Test>::NoneValue
-		);
+		assert_noop!(TemplateModule::cause_error(Origin::signed(1)), Error::<Test>::NoneValue);
 	});
 }
diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index c92eb8a1aadf..f9eaa96153eb 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -1,43 +1,44 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 // `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.
-#![recursion_limit="256"]
+#![recursion_limit = "256"]
 
 // Make the WASM binary available.
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
-use sp_std::prelude::*;
-use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
-use sp_runtime::{
-	ApplyExtrinsicResult, generic, create_runtime_str, impl_opaque_keys, MultiSignature,
-	transaction_validity::{TransactionValidity, TransactionSource},
-};
-use sp_runtime::traits::{
-	BlakeTwo256, Block as BlockT, AccountIdLookup, Verify, IdentifyAccount, NumberFor,
+use pallet_grandpa::{
+	fg_primitives, AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList,
 };
 use sp_api::impl_runtime_apis;
 use sp_consensus_aura::sr25519::AuthorityId as AuraId;
-use pallet_grandpa::{AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList};
-use pallet_grandpa::fg_primitives;
-use sp_version::RuntimeVersion;
+use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
+use sp_runtime::{
+	create_runtime_str, generic, impl_opaque_keys,
+	traits::{AccountIdLookup, BlakeTwo256, Block as BlockT, IdentifyAccount, NumberFor, Verify},
+	transaction_validity::{TransactionSource, TransactionValidity},
+	ApplyExtrinsicResult, MultiSignature,
+};
+use sp_std::prelude::*;
 #[cfg(feature = "std")]
 use sp_version::NativeVersion;
+use sp_version::RuntimeVersion;
 
 // A few exports that help ease life for downstream crates.
-#[cfg(any(feature = "std", test))]
-pub use sp_runtime::BuildStorage;
-pub use pallet_timestamp::Call as TimestampCall;
-pub use pallet_balances::Call as BalancesCall;
-pub use sp_runtime::{Permill, Perbill};
 pub use frame_support::{
-	construct_runtime, parameter_types, StorageValue,
+	construct_runtime, parameter_types,
 	traits::{KeyOwnerProofSystem, Randomness, StorageInfo},
 	weights::{
-		Weight, IdentityFee,
 		constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
+		IdentityFee, Weight,
 	},
+	StorageValue,
 };
+pub use pallet_balances::Call as BalancesCall;
+pub use pallet_timestamp::Call as TimestampCall;
 use pallet_transaction_payment::CurrencyAdapter;
+#[cfg(any(feature = "std", test))]
+pub use sp_runtime::BuildStorage;
+pub use sp_runtime::{Perbill, Permill};
 
 /// Import the template pallet.
 pub use pallet_template;
@@ -123,10 +124,7 @@ pub const DAYS: BlockNumber = HOURS * 24;
 /// The version information used to identify this runtime when compiled natively.
 #[cfg(feature = "std")]
 pub fn native_version() -> NativeVersion {
-	NativeVersion {
-		runtime_version: VERSION,
-		can_author_with: Default::default(),
-	}
+	NativeVersion { runtime_version: VERSION, can_author_with: Default::default() }
 }
 
 const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);
@@ -306,7 +304,7 @@ pub type SignedExtra = (
 	frame_system::CheckEra<Runtime>,
 	frame_system::CheckNonce<Runtime>,
 	frame_system::CheckWeight<Runtime>,
-	pallet_transaction_payment::ChargeTransactionPayment<Runtime>
+	pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
 );
 /// Unchecked extrinsic type as expected by this runtime.
 pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<Address, Call, Signature, SignedExtra>;
diff --git a/bin/node/bench/src/construct.rs b/bin/node/bench/src/construct.rs
index 491b261518a4..eeeb833c1ff1 100644
--- a/bin/node/bench/src/construct.rs
+++ b/bin/node/bench/src/construct.rs
@@ -24,36 +24,22 @@
 //! DO NOT depend on user input). Thus transaction generation should be
 //! based on randomized data.
 
-use std::{
-	borrow::Cow,
-	collections::HashMap,
-	pin::Pin,
-	sync::Arc,
-};
 use futures::Future;
+use std::{borrow::Cow, collections::HashMap, pin::Pin, sync::Arc};
 
 use node_primitives::Block;
-use node_testing::bench::{BenchDb, Profile, BlockType, KeyTypes, DatabaseType};
-use sp_runtime::{
-	generic::BlockId,
-	traits::NumberFor,
-	OpaqueExtrinsic,
-};
+use node_testing::bench::{BenchDb, BlockType, DatabaseType, KeyTypes, Profile};
 use sc_transaction_pool_api::{
-	ImportNotificationStream,
-	PoolFuture,
-	PoolStatus,
-	TransactionFor,
-	TransactionSource,
-	TransactionStatusStreamFor,
-	TxHash,
+	ImportNotificationStream, PoolFuture, PoolStatus, TransactionFor, TransactionSource,
+	TransactionStatusStreamFor, TxHash,
 };
 use sp_consensus::{Environment, Proposer};
 use sp_inherents::InherentDataProvider;
+use sp_runtime::{generic::BlockId, traits::NumberFor, OpaqueExtrinsic};
 
 use crate::{
 	common::SizeType,
-	core::{self, Path, Mode},
+	core::{self, Mode, Path},
 };
 
 pub struct ConstructionBenchmarkDescription {
@@ -72,7 +58,6 @@ pub struct ConstructionBenchmark {
 
 impl core::BenchmarkDescription for ConstructionBenchmarkDescription {
 	fn path(&self) -> Path {
-
 		let mut path = Path::new(&["node", "proposer"]);
 
 		match self.profile {
@@ -104,11 +89,7 @@ impl core::BenchmarkDescription for ConstructionBenchmarkDescription {
 	fn setup(self: Box<Self>) -> Box<dyn core::Benchmark> {
 		let mut extrinsics: Vec<Arc<PoolTransaction>> = Vec::new();
 
-		let mut bench_db = BenchDb::with_key_types(
-			self.database_type,
-			50_000,
-			self.key_types
-		);
+		let mut bench_db = BenchDb::with_key_types(self.database_type, 50_000, self.key_types);
 
 		let client = bench_db.client();
 
@@ -127,11 +108,9 @@ impl core::BenchmarkDescription for ConstructionBenchmarkDescription {
 	fn name(&self) -> Cow<'static, str> {
 		format!(
 			"Block construction ({:?}/{}, {:?}, {:?} backend)",
-			self.block_type,
-			self.size,
-			self.profile,
-			self.database_type,
-		).into()
+			self.block_type, self.size, self.profile, self.database_type,
+		)
+		.into()
 	}
 }
 
@@ -139,7 +118,9 @@ impl core::Benchmark for ConstructionBenchmark {
 	fn run(&mut self, mode: Mode) -> std::time::Duration {
 		let context = self.database.create_context(self.profile);
 
-		let _ = context.client.runtime_version_at(&BlockId::Number(0))
+		let _ = context
+			.client
+			.runtime_version_at(&BlockId::Number(0))
 			.expect("Failed to get runtime version")
 			.spec_version;
 
@@ -158,20 +139,25 @@ impl core::Benchmark for ConstructionBenchmark {
 
 		let start = std::time::Instant::now();
 
-		let proposer = futures::executor::block_on(proposer_factory.init(
-			&context.client.header(&BlockId::number(0))
-				.expect("Database error querying block #0")
-				.expect("Block #0 should exist"),
-		)).expect("Proposer initialization failed");
-
-		let _block = futures::executor::block_on(
-			proposer.propose(
-				timestamp_provider.create_inherent_data().expect("Create inherent data failed"),
-				Default::default(),
-				std::time::Duration::from_secs(20),
-				None,
+		let proposer = futures::executor::block_on(
+			proposer_factory.init(
+				&context
+					.client
+					.header(&BlockId::number(0))
+					.expect("Database error querying block #0")
+					.expect("Block #0 should exist"),
 			),
-		).map(|r| r.block).expect("Proposing failed");
+		)
+		.expect("Proposer initialization failed");
+
+		let _block = futures::executor::block_on(proposer.propose(
+			timestamp_provider.create_inherent_data().expect("Create inherent data failed"),
+			Default::default(),
+			std::time::Duration::from_secs(20),
+			None,
+		))
+		.map(|r| r.block)
+		.expect("Proposing failed");
 
 		let elapsed = start.elapsed();
 
@@ -191,10 +177,7 @@ pub struct PoolTransaction {
 
 impl From<OpaqueExtrinsic> for PoolTransaction {
 	fn from(e: OpaqueExtrinsic) -> Self {
-		PoolTransaction {
-			data: e,
-			hash: node_primitives::Hash::zero(),
-		}
+		PoolTransaction { data: e, hash: node_primitives::Hash::zero() }
 	}
 }
 
@@ -210,15 +193,25 @@ impl sc_transaction_pool_api::InPoolTransaction for PoolTransaction {
 		&self.hash
 	}
 
-	fn priority(&self) -> &u64 { unimplemented!() }
+	fn priority(&self) -> &u64 {
+		unimplemented!()
+	}
 
-	fn longevity(&self) -> &u64 { unimplemented!() }
+	fn longevity(&self) -> &u64 {
+		unimplemented!()
+	}
 
-	fn requires(&self) -> &[Vec<u8>] { unimplemented!() }
+	fn requires(&self) -> &[Vec<u8>] {
+		unimplemented!()
+	}
 
-	fn provides(&self) -> &[Vec<u8>] { unimplemented!() }
+	fn provides(&self) -> &[Vec<u8>] {
+		unimplemented!()
+	}
 
-	fn is_propagable(&self) -> bool { unimplemented!() }
+	fn is_propagable(&self) -> bool {
+		unimplemented!()
+	}
 }
 
 #[derive(Clone, Debug)]
@@ -236,7 +229,7 @@ impl sc_transaction_pool_api::TransactionPool for Transactions {
 		_at: &BlockId<Self::Block>,
 		_source: TransactionSource,
 		_xts: Vec<TransactionFor<Self>>,
-	) -> PoolFuture<Vec<Result<node_primitives::Hash, Self::Error>>, Self::Error>  {
+	) -> PoolFuture<Vec<Result<node_primitives::Hash, Self::Error>>, Self::Error> {
 		unimplemented!()
 	}
 
@@ -259,14 +252,21 @@ impl sc_transaction_pool_api::TransactionPool for Transactions {
 		unimplemented!()
 	}
 
-	fn ready_at(&self, _at: NumberFor<Self::Block>)
-		-> Pin<Box<dyn Future<Output=Box<dyn Iterator<Item=Arc<Self::InPoolTransaction>> + Send>> + Send>>
-	{
-		let iter: Box<dyn Iterator<Item=Arc<PoolTransaction>> + Send> = Box::new(self.0.clone().into_iter());
+	fn ready_at(
+		&self,
+		_at: NumberFor<Self::Block>,
+	) -> Pin<
+		Box<
+			dyn Future<Output = Box<dyn Iterator<Item = Arc<Self::InPoolTransaction>> + Send>>
+				+ Send,
+		>,
+	> {
+		let iter: Box<dyn Iterator<Item = Arc<PoolTransaction>> + Send> =
+			Box::new(self.0.clone().into_iter());
 		Box::pin(futures::future::ready(iter))
 	}
 
-	fn ready(&self) -> Box<dyn Iterator<Item=Arc<Self::InPoolTransaction>> + Send> {
+	fn ready(&self) -> Box<dyn Iterator<Item = Arc<Self::InPoolTransaction>> + Send> {
 		unimplemented!()
 	}
 
diff --git a/bin/node/bench/src/core.rs b/bin/node/bench/src/core.rs
index 26b7f92b1448..56c0f3526a4d 100644
--- a/bin/node/bench/src/core.rs
+++ b/bin/node/bench/src/core.rs
@@ -16,8 +16,11 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use std::{fmt, borrow::{Cow, ToOwned}};
 use serde::Serialize;
+use std::{
+	borrow::{Cow, ToOwned},
+	fmt,
+};
 
 pub struct Path(Vec<String>);
 
@@ -33,7 +36,11 @@ impl Path {
 	}
 
 	pub fn full(&self) -> String {
-		self.0.iter().fold(String::new(), |mut val, next| { val.push_str("::"); val.push_str(next); val })
+		self.0.iter().fold(String::new(), |mut val, next| {
+			val.push_str("::");
+			val.push_str(next);
+			val
+		})
 	}
 
 	pub fn has(&self, path: &str) -> bool {
@@ -115,10 +122,7 @@ impl fmt::Display for BenchmarkOutput {
 	}
 }
 
-pub fn run_benchmark(
-	benchmark: Box<dyn BenchmarkDescription>,
-	mode: Mode,
-) -> BenchmarkOutput {
+pub fn run_benchmark(benchmark: Box<dyn BenchmarkDescription>, mode: Mode) -> BenchmarkOutput {
 	let name = benchmark.name().to_owned();
 	let mut benchmark = benchmark.setup();
 
@@ -133,11 +137,7 @@ pub fn run_benchmark(
 	let raw_average = (durations.iter().sum::<u128>() / (durations.len() as u128)) as u64;
 	let average = (durations.iter().skip(10).take(30).sum::<u128>() / 30) as u64;
 
-	BenchmarkOutput {
-		name: name.into(),
-		raw_average,
-		average,
-	}
+	BenchmarkOutput { name: name.into(), raw_average, average }
 }
 
 macro_rules! matrix(
diff --git a/bin/node/bench/src/generator.rs b/bin/node/bench/src/generator.rs
index c540ae147c9f..e3aa1192b5d1 100644
--- a/bin/node/bench/src/generator.rs
+++ b/bin/node/bench/src/generator.rs
@@ -30,14 +30,15 @@ use crate::simple_trie::SimpleTrie;
 /// return root.
 pub fn generate_trie(
 	db: Arc<dyn KeyValueDB>,
-	key_values: impl IntoIterator<Item=(Vec<u8>, Vec<u8>)>,
+	key_values: impl IntoIterator<Item = (Vec<u8>, Vec<u8>)>,
 ) -> Hash {
 	let mut root = Hash::default();
 
 	let (db, overlay) = {
 		let mut overlay = HashMap::new();
 		overlay.insert(
-			hex::decode("03170a2e7597b7b7e3d84c05391d139a62b157e78786d8c082f29dcf4c111314").expect("null key is valid"),
+			hex::decode("03170a2e7597b7b7e3d84c05391d139a62b157e78786d8c082f29dcf4c111314")
+				.expect("null key is valid"),
 			Some(vec![0]),
 		);
 		let mut trie = SimpleTrie { db, overlay: &mut overlay };
@@ -50,7 +51,7 @@ pub fn generate_trie(
 
 			trie_db.commit();
 		}
-		( trie.db, overlay )
+		(trie.db, overlay)
 	};
 
 	let mut transaction = db.transaction();
diff --git a/bin/node/bench/src/import.rs b/bin/node/bench/src/import.rs
index b4fee58dac02..a4056b49f7f4 100644
--- a/bin/node/bench/src/import.rs
+++ b/bin/node/bench/src/import.rs
@@ -32,15 +32,15 @@
 
 use std::borrow::Cow;
 
-use node_testing::bench::{BenchDb, Profile, BlockType, KeyTypes, DatabaseType};
 use node_primitives::Block;
+use node_testing::bench::{BenchDb, BlockType, DatabaseType, KeyTypes, Profile};
 use sc_client_api::backend::Backend;
 use sp_runtime::generic::BlockId;
 use sp_state_machine::InspectState;
 
 use crate::{
 	common::SizeType,
-	core::{self, Path, Mode},
+	core::{self, Mode, Path},
 };
 
 pub struct ImportBenchmarkDescription {
@@ -60,7 +60,6 @@ pub struct ImportBenchmark {
 
 impl core::BenchmarkDescription for ImportBenchmarkDescription {
 	fn path(&self) -> Path {
-
 		let mut path = Path::new(&["node", "import"]);
 
 		match self.profile {
@@ -91,11 +90,7 @@ impl core::BenchmarkDescription for ImportBenchmarkDescription {
 
 	fn setup(self: Box<Self>) -> Box<dyn core::Benchmark> {
 		let profile = self.profile;
-		let mut bench_db = BenchDb::with_key_types(
-			self.database_type,
-			50_000,
-			self.key_types
-		);
+		let mut bench_db = BenchDb::with_key_types(self.database_type, 50_000, self.key_types);
 		let block = bench_db.generate_block(self.block_type.to_content(self.size.transactions()));
 		Box::new(ImportBenchmark {
 			database: bench_db,
@@ -108,11 +103,9 @@ impl core::BenchmarkDescription for ImportBenchmarkDescription {
 	fn name(&self) -> Cow<'static, str> {
 		format!(
 			"Block import ({:?}/{}, {:?}, {:?} backend)",
-			self.block_type,
-			self.size,
-			self.profile,
-			self.database_type,
-		).into()
+			self.block_type, self.size, self.profile, self.database_type,
+		)
+		.into()
 	}
 }
 
@@ -120,7 +113,9 @@ impl core::Benchmark for ImportBenchmark {
 	fn run(&mut self, mode: Mode) -> std::time::Duration {
 		let mut context = self.database.create_context(self.profile);
 
-		let _ = context.client.runtime_version_at(&BlockId::Number(0))
+		let _ = context
+			.client
+			.runtime_version_at(&BlockId::Number(0))
 			.expect("Failed to get runtime version")
 			.spec_version;
 
@@ -133,7 +128,8 @@ impl core::Benchmark for ImportBenchmark {
 		let elapsed = start.elapsed();
 
 		// Sanity checks.
-		context.client
+		context
+			.client
 			.state_at(&BlockId::number(1))
 			.expect("state_at failed for block#1")
 			.inspect_state(|| {
@@ -155,19 +151,17 @@ impl core::Benchmark for ImportBenchmark {
 					BlockType::Noop => {
 						assert_eq!(
 							node_runtime::System::events().len(),
-
 							// should be 2 per signed extrinsic + 1 per unsigned
 							// we have 1 unsigned and the rest are signed in the block
 							// those 2 events per signed are:
 							//    - deposit event for charging transaction fee
 							//    - extrinsic success
-							(self.block.extrinsics.len() - 1) *  2 + 1,
+							(self.block.extrinsics.len() - 1) * 2 + 1,
 						);
 					},
 					_ => {},
 				}
-			}
-		);
+			});
 
 		if mode == Mode::Profile {
 			std::thread::park_timeout(std::time::Duration::from_secs(1));
diff --git a/bin/node/bench/src/main.rs b/bin/node/bench/src/main.rs
index 40e9e1577777..4b006b387d0e 100644
--- a/bin/node/bench/src/main.rs
+++ b/bin/node/bench/src/main.rs
@@ -18,9 +18,10 @@
 
 mod common;
 mod construct;
-#[macro_use] mod core;
-mod import;
+#[macro_use]
+mod core;
 mod generator;
+mod import;
 mod simple_trie;
 mod state_sizes;
 mod tempdb;
@@ -29,15 +30,15 @@ mod txpool;
 
 use structopt::StructOpt;
 
-use node_testing::bench::{Profile, KeyTypes, BlockType, DatabaseType as BenchDataBaseType};
+use node_testing::bench::{BlockType, DatabaseType as BenchDataBaseType, KeyTypes, Profile};
 
 use crate::{
 	common::SizeType,
+	construct::ConstructionBenchmarkDescription,
 	core::{run_benchmark, Mode as BenchmarkMode},
-	tempdb::DatabaseType,
 	import::ImportBenchmarkDescription,
-	trie::{TrieReadBenchmarkDescription, TrieWriteBenchmarkDescription, DatabaseSize},
-	construct::ConstructionBenchmarkDescription,
+	tempdb::DatabaseType,
+	trie::{DatabaseSize, TrieReadBenchmarkDescription, TrieWriteBenchmarkDescription},
 	txpool::PoolBenchmarkDescription,
 };
 
@@ -92,14 +93,25 @@ fn main() {
 			SizeType::Large,
 			SizeType::Full,
 			SizeType::Custom(opt.transactions.unwrap_or(0)),
-		].iter() {
+		]
+		.iter()
+		{
 			for block_type in [
 				BlockType::RandomTransfersKeepAlive,
 				BlockType::RandomTransfersReaping,
 				BlockType::Noop,
-			].iter() {
-				for database_type in [BenchDataBaseType::RocksDb, BenchDataBaseType::ParityDb].iter() {
-					import_benchmarks.push((profile, size.clone(), block_type.clone(), database_type));
+			]
+			.iter()
+			{
+				for database_type in
+					[BenchDataBaseType::RocksDb, BenchDataBaseType::ParityDb].iter()
+				{
+					import_benchmarks.push((
+						profile,
+						size.clone(),
+						block_type.clone(),
+						database_type,
+					));
 				}
 			}
 		}
@@ -163,7 +175,7 @@ fn main() {
 				println!("{}: {}", benchmark.name(), benchmark.path().full())
 			}
 		}
-		return;
+		return
 	}
 
 	let mut results = Vec::new();
@@ -183,7 +195,8 @@ fn main() {
 	}
 
 	if opt.json {
-		let json_result: String = serde_json::to_string(&results).expect("Failed to construct json");
+		let json_result: String =
+			serde_json::to_string(&results).expect("Failed to construct json");
 		println!("{}", json_result);
 	}
 }
diff --git a/bin/node/bench/src/simple_trie.rs b/bin/node/bench/src/simple_trie.rs
index a29b51a38af5..651772c71575 100644
--- a/bin/node/bench/src/simple_trie.rs
+++ b/bin/node/bench/src/simple_trie.rs
@@ -18,10 +18,10 @@
 
 use std::{collections::HashMap, sync::Arc};
 
+use hash_db::{AsHashDB, HashDB, Hasher as _, Prefix};
 use kvdb::KeyValueDB;
 use node_primitives::Hash;
 use sp_trie::DBValue;
-use hash_db::{HashDB, AsHashDB, Prefix, Hasher as _};
 
 pub type Hasher = sp_core::Blake2Hasher;
 
@@ -32,7 +32,9 @@ pub struct SimpleTrie<'a> {
 }
 
 impl<'a> AsHashDB<Hasher, DBValue> for SimpleTrie<'a> {
-	fn as_hash_db(&self) -> &dyn hash_db::HashDB<Hasher, DBValue> { &*self }
+	fn as_hash_db(&self) -> &dyn hash_db::HashDB<Hasher, DBValue> {
+		&*self
+	}
 
 	fn as_hash_db_mut<'b>(&'b mut self) -> &'b mut (dyn HashDB<Hasher, DBValue> + 'b) {
 		&mut *self
@@ -43,7 +45,7 @@ impl<'a> HashDB<Hasher, DBValue> for SimpleTrie<'a> {
 	fn get(&self, key: &Hash, prefix: Prefix) -> Option<DBValue> {
 		let key = sp_trie::prefixed_key::<Hasher>(key, prefix);
 		if let Some(value) = self.overlay.get(&key) {
-			return value.clone();
+			return value.clone()
 		}
 		self.db.get(0, &key).expect("Database backend error")
 	}
diff --git a/bin/node/bench/src/state_sizes.rs b/bin/node/bench/src/state_sizes.rs
index f9288c105489..27112ed42d45 100644
--- a/bin/node/bench/src/state_sizes.rs
+++ b/bin/node/bench/src/state_sizes.rs
@@ -17,7 +17,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 /// Kusama value size distribution
-pub const KUSAMA_STATE_DISTRIBUTION: &'static[(u32, u32)] = &[
+pub const KUSAMA_STATE_DISTRIBUTION: &'static [(u32, u32)] = &[
 	(32, 35),
 	(33, 20035),
 	(34, 5369),
diff --git a/bin/node/bench/src/tempdb.rs b/bin/node/bench/src/tempdb.rs
index 31ef71fba7b5..3c1c0f250e49 100644
--- a/bin/node/bench/src/tempdb.rs
+++ b/bin/node/bench/src/tempdb.rs
@@ -16,9 +16,9 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+use kvdb::{DBTransaction, KeyValueDB};
+use kvdb_rocksdb::{Database, DatabaseConfig};
 use std::{io, path::PathBuf, sync::Arc};
-use kvdb::{KeyValueDB, DBTransaction};
-use kvdb_rocksdb::{DatabaseConfig, Database};
 
 #[derive(Debug, Clone, Copy, derive_more::Display)]
 pub enum DatabaseType {
@@ -44,13 +44,14 @@ impl KeyValueDB for ParityDbWrapper {
 
 	/// Write a transaction of changes to the buffer.
 	fn write(&self, transaction: DBTransaction) -> io::Result<()> {
-		self.0.commit(
-			transaction.ops.iter().map(|op| match op {
-				kvdb::DBOp::Insert { col, key, value } => (*col as u8, &key[key.len() - 32..], Some(value.to_vec())),
+		self.0
+			.commit(transaction.ops.iter().map(|op| match op {
+				kvdb::DBOp::Insert { col, key, value } =>
+					(*col as u8, &key[key.len() - 32..], Some(value.to_vec())),
 				kvdb::DBOp::Delete { col, key } => (*col as u8, &key[key.len() - 32..], None),
-				kvdb::DBOp::DeletePrefix { col: _, prefix: _ } => unimplemented!()
-			})
-		).expect("db error");
+				kvdb::DBOp::DeletePrefix { col: _, prefix: _ } => unimplemented!(),
+			}))
+			.expect("db error");
 		Ok(())
 	}
 
@@ -90,21 +91,19 @@ impl TempDatabase {
 		match db_type {
 			DatabaseType::RocksDb => {
 				let db_cfg = DatabaseConfig::with_columns(1);
-				let db = Database::open(&db_cfg, &self.0.path().to_string_lossy()).expect("Database backend error");
+				let db = Database::open(&db_cfg, &self.0.path().to_string_lossy())
+					.expect("Database backend error");
 				Arc::new(db)
 			},
-			DatabaseType::ParityDb => {
-				Arc::new(ParityDbWrapper({
-					let mut options = parity_db::Options::with_columns(self.0.path(), 1);
-					let mut column_options = &mut options.columns[0];
-					column_options.ref_counted = true;
-					column_options.preimage = true;
-					column_options.uniform = true;
-					parity_db::Db::open(&options).expect("db open error")
-				}))
-			}
+			DatabaseType::ParityDb => Arc::new(ParityDbWrapper({
+				let mut options = parity_db::Options::with_columns(self.0.path(), 1);
+				let mut column_options = &mut options.columns[0];
+				column_options.ref_counted = true;
+				column_options.preimage = true;
+				column_options.uniform = true;
+				parity_db::Db::open(&options).expect("db open error")
+			})),
 		}
-
 	}
 }
 
@@ -121,15 +120,10 @@ impl Clone for TempDatabase {
 		);
 		let self_db_files = std::fs::read_dir(self_dir)
 			.expect("failed to list file in seed dir")
-			.map(|f_result|
-				f_result.expect("failed to read file in seed db")
-					.path()
-			).collect::<Vec<PathBuf>>();
-		fs_extra::copy_items(
-			&self_db_files,
-			new_dir.path(),
-			&fs_extra::dir::CopyOptions::new(),
-		).expect("Copy of seed database is ok");
+			.map(|f_result| f_result.expect("failed to read file in seed db").path())
+			.collect::<Vec<PathBuf>>();
+		fs_extra::copy_items(&self_db_files, new_dir.path(), &fs_extra::dir::CopyOptions::new())
+			.expect("Copy of seed database is ok");
 
 		TempDatabase(new_dir)
 	}
diff --git a/bin/node/bench/src/trie.rs b/bin/node/bench/src/trie.rs
index a3e7620473d9..a17e386ca879 100644
--- a/bin/node/bench/src/trie.rs
+++ b/bin/node/bench/src/trie.rs
@@ -18,13 +18,13 @@
 
 //! Trie benchmark (integrated).
 
-use std::{borrow::Cow, collections::HashMap, sync::Arc};
+use hash_db::Prefix;
 use kvdb::KeyValueDB;
 use lazy_static::lazy_static;
 use rand::Rng;
-use hash_db::Prefix;
 use sp_state_machine::Backend as _;
 use sp_trie::{trie_types::TrieDBMut, TrieMut as _};
+use std::{borrow::Cow, collections::HashMap, sync::Arc};
 
 use node_primitives::Hash;
 
@@ -32,7 +32,7 @@ use crate::{
 	core::{self, Mode, Path},
 	generator::generate_trie,
 	simple_trie::SimpleTrie,
-	tempdb::{TempDatabase, DatabaseType},
+	tempdb::{DatabaseType, TempDatabase},
 };
 
 pub const SAMPLE_SIZE: usize = 100;
@@ -142,10 +142,7 @@ impl core::BenchmarkDescription for TrieReadBenchmarkDescription {
 		assert_eq!(warmup_keys.len(), SAMPLE_SIZE);
 		assert_eq!(query_keys.len(), SAMPLE_SIZE);
 
-		let root = generate_trie(
-			database.open(self.database_type),
-			key_values,
-		);
+		let root = generate_trie(database.open(self.database_type), key_values);
 
 		Box::new(TrieReadBenchmark {
 			database,
@@ -162,7 +159,8 @@ impl core::BenchmarkDescription for TrieReadBenchmarkDescription {
 			self.database_size,
 			pretty_print(self.database_size.keys()),
 			self.database_type,
-		).into()
+		)
+		.into()
 	}
 }
 
@@ -182,12 +180,10 @@ impl core::Benchmark for TrieReadBenchmark {
 		let storage: Arc<dyn sp_state_machine::Storage<sp_core::Blake2Hasher>> =
 			Arc::new(Storage(db.open(self.database_type)));
 
-		let trie_backend = sp_state_machine::TrieBackend::new(
-			storage,
-			self.root,
-		);
+		let trie_backend = sp_state_machine::TrieBackend::new(storage, self.root);
 		for (warmup_key, warmup_value) in self.warmup_keys.iter() {
-			let value = trie_backend.storage(&warmup_key[..])
+			let value = trie_backend
+				.storage(&warmup_key[..])
 				.expect("Failed to get key: db error")
 				.expect("Warmup key should exist");
 
@@ -218,7 +214,6 @@ pub struct TrieWriteBenchmarkDescription {
 	pub database_type: DatabaseType,
 }
 
-
 impl core::BenchmarkDescription for TrieWriteBenchmarkDescription {
 	fn path(&self) -> Path {
 		let mut path = Path::new(&["trie", "write"]);
@@ -253,10 +248,7 @@ impl core::BenchmarkDescription for TrieWriteBenchmarkDescription {
 
 		assert_eq!(warmup_keys.len(), SAMPLE_SIZE);
 
-		let root = generate_trie(
-			database.open(self.database_type),
-			key_values,
-		);
+		let root = generate_trie(database.open(self.database_type), key_values);
 
 		Box::new(TrieWriteBenchmark {
 			database,
@@ -272,7 +264,8 @@ impl core::BenchmarkDescription for TrieWriteBenchmarkDescription {
 			self.database_size,
 			pretty_print(self.database_size.keys()),
 			self.database_type,
-		).into()
+		)
+		.into()
 	}
 }
 
@@ -292,15 +285,13 @@ impl core::Benchmark for TrieWriteBenchmark {
 		let mut new_root = self.root.clone();
 
 		let mut overlay = HashMap::new();
-		let mut trie = SimpleTrie {
-			db: kvdb.clone(),
-			overlay: &mut overlay,
-		};
-		let mut trie_db_mut = TrieDBMut::from_existing(&mut trie, &mut new_root)
-			.expect("Failed to create TrieDBMut");
+		let mut trie = SimpleTrie { db: kvdb.clone(), overlay: &mut overlay };
+		let mut trie_db_mut =
+			TrieDBMut::from_existing(&mut trie, &mut new_root).expect("Failed to create TrieDBMut");
 
 		for (warmup_key, warmup_value) in self.warmup_keys.iter() {
-			let value = trie_db_mut.get(&warmup_key[..])
+			let value = trie_db_mut
+				.get(&warmup_key[..])
 				.expect("Failed to get key: db error")
 				.expect("Warmup key should exist");
 
@@ -367,7 +358,9 @@ impl SizePool {
 
 	fn value<R: Rng>(&self, rng: &mut R) -> Vec<u8> {
 		let sr = (rng.next_u64() % self.total as u64) as u32;
-		let mut range = self.distribution.range((std::ops::Bound::Included(sr), std::ops::Bound::Unbounded));
+		let mut range = self
+			.distribution
+			.range((std::ops::Bound::Included(sr), std::ops::Bound::Unbounded));
 		let size = *range.next().unwrap().1 as usize;
 		random_vec(rng, size)
 	}
diff --git a/bin/node/bench/src/txpool.rs b/bin/node/bench/src/txpool.rs
index ef1c816109c8..b0db73453485 100644
--- a/bin/node/bench/src/txpool.rs
+++ b/bin/node/bench/src/txpool.rs
@@ -23,13 +23,13 @@
 
 use std::borrow::Cow;
 
-use node_testing::bench::{BenchDb, Profile, BlockType, KeyTypes, DatabaseType};
+use node_testing::bench::{BenchDb, BlockType, DatabaseType, KeyTypes, Profile};
 
 use sc_transaction_pool::BasicPool;
-use sp_runtime::generic::BlockId;
 use sc_transaction_pool_api::{TransactionPool, TransactionSource};
+use sp_runtime::generic::BlockId;
 
-use crate::core::{self, Path, Mode};
+use crate::core::{self, Mode, Path};
 
 pub struct PoolBenchmarkDescription {
 	pub database_type: DatabaseType,
@@ -46,11 +46,7 @@ impl core::BenchmarkDescription for PoolBenchmarkDescription {
 
 	fn setup(self: Box<Self>) -> Box<dyn core::Benchmark> {
 		Box::new(PoolBenchmark {
-			database: BenchDb::with_key_types(
-				self.database_type,
-				50_000,
-				KeyTypes::Sr25519,
-			),
+			database: BenchDb::with_key_types(self.database_type, 50_000, KeyTypes::Sr25519),
 		})
 	}
 
@@ -63,7 +59,9 @@ impl core::Benchmark for PoolBenchmark {
 	fn run(&mut self, mode: Mode) -> std::time::Duration {
 		let context = self.database.create_context(Profile::Wasm);
 
-		let _ = context.client.runtime_version_at(&BlockId::Number(0))
+		let _ = context
+			.client
+			.runtime_version_at(&BlockId::Number(0))
 			.expect("Failed to get runtime version")
 			.spec_version;
 
@@ -80,22 +78,20 @@ impl core::Benchmark for PoolBenchmark {
 			context.client.clone(),
 		);
 
-		let generated_transactions = self.database.block_content(
-			BlockType::RandomTransfersKeepAlive.to_content(Some(100)),
-			&context.client,
-		).into_iter().collect::<Vec<_>>();
+		let generated_transactions = self
+			.database
+			.block_content(
+				BlockType::RandomTransfersKeepAlive.to_content(Some(100)),
+				&context.client,
+			)
+			.into_iter()
+			.collect::<Vec<_>>();
 
 		let start = std::time::Instant::now();
-		let submissions = generated_transactions.into_iter().map(|tx| {
-			txpool.submit_one(
-				&BlockId::Number(0),
-				TransactionSource::External,
-				tx,
-			)
-		});
-		futures::executor::block_on(
-			futures::future::join_all(submissions)
-		);
+		let submissions = generated_transactions
+			.into_iter()
+			.map(|tx| txpool.submit_one(&BlockId::Number(0), TransactionSource::External, tx));
+		futures::executor::block_on(futures::future::join_all(submissions));
 		let elapsed = start.elapsed();
 
 		if mode == Mode::Profile {
diff --git a/bin/node/browser-testing/src/lib.rs b/bin/node/browser-testing/src/lib.rs
index a269e9cab21e..35804bef2168 100644
--- a/bin/node/browser-testing/src/lib.rs
+++ b/bin/node/browser-testing/src/lib.rs
@@ -28,11 +28,11 @@
 //! flag and open a browser to the url that `wasm-pack test` outputs.
 //! For more infomation see <https://rustwasm.github.io/docs/wasm-pack/>.
 
-use wasm_bindgen_test::{wasm_bindgen_test, wasm_bindgen_test_configure};
-use wasm_bindgen_futures::JsFuture;
-use wasm_bindgen::JsValue;
-use jsonrpc_core::types::{MethodCall, Success, Version, Params, Id};
+use jsonrpc_core::types::{Id, MethodCall, Params, Success, Version};
 use serde::de::DeserializeOwned;
+use wasm_bindgen::JsValue;
+use wasm_bindgen_futures::JsFuture;
+use wasm_bindgen_test::{wasm_bindgen_test, wasm_bindgen_test_configure};
 
 wasm_bindgen_test_configure!(run_in_browser);
 
@@ -41,8 +41,9 @@ fn rpc_call(method: &str) -> String {
 		jsonrpc: Some(Version::V2),
 		method: method.into(),
 		params: Params::None,
-		id: Id::Num(1)
-	}).unwrap()
+		id: Id::Num(1),
+	})
+	.unwrap()
 }
 
 fn deserialize_rpc_result<T: DeserializeOwned>(js_value: JsValue) -> T {
@@ -55,15 +56,12 @@ fn deserialize_rpc_result<T: DeserializeOwned>(js_value: JsValue) -> T {
 
 #[wasm_bindgen_test]
 async fn runs() {
-	let mut client = node_cli::start_client(None, "info".into())
-			.unwrap();
+	let mut client = node_cli::start_client(None, "info".into()).unwrap();
 
 	// Check that the node handles rpc calls.
 	// TODO: Re-add the code that checks if the node is syncing.
 	let chain_name: String = deserialize_rpc_result(
-		JsFuture::from(client.rpc_send(&rpc_call("system_chain")))
-			.await
-			.unwrap()
+		JsFuture::from(client.rpc_send(&rpc_call("system_chain"))).await.unwrap(),
 	);
 	assert_eq!(chain_name, "Development");
 }
diff --git a/bin/node/cli/build.rs b/bin/node/cli/build.rs
index befcdaea6d9c..90aec2222c9e 100644
--- a/bin/node/cli/build.rs
+++ b/bin/node/cli/build.rs
@@ -25,8 +25,8 @@ fn main() {
 mod cli {
 	include!("src/cli.rs");
 
-	use std::{fs, env, path::Path};
 	use sc_cli::structopt::clap::Shell;
+	use std::{env, fs, path::Path};
 	use substrate_build_script_utils::{generate_cargo_keys, rerun_if_git_head_changed};
 
 	pub fn main() {
@@ -51,9 +51,12 @@ mod cli {
 			Some(dir) => dir,
 		};
 		let path = Path::new(&outdir)
-			.parent().unwrap()
-			.parent().unwrap()
-			.parent().unwrap()
+			.parent()
+			.unwrap()
+			.parent()
+			.unwrap()
+			.parent()
+			.unwrap()
 			.join("completion-scripts");
 
 		fs::create_dir(&path).ok();
diff --git a/bin/node/cli/src/browser.rs b/bin/node/cli/src/browser.rs
index 82f1921d2a6b..dee93180e70d 100644
--- a/bin/node/cli/src/browser.rs
+++ b/bin/node/cli/src/browser.rs
@@ -17,18 +17,14 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::chain_spec::ChainSpec;
+use browser_utils::{browser_configuration, init_logging, set_console_error_panic_hook, Client};
 use log::info;
 use wasm_bindgen::prelude::*;
-use browser_utils::{
-	Client,
-	browser_configuration, init_logging, set_console_error_panic_hook,
-};
 
 /// Starts the client.
 #[wasm_bindgen]
 pub fn start_client(chain_spec: Option<String>, log_level: String) -> Result<Client, JsValue> {
-	start_inner(chain_spec, log_level)
-		.map_err(|err| JsValue::from_str(&err.to_string()))
+	start_inner(chain_spec, log_level).map_err(|err| JsValue::from_str(&err.to_string()))
 }
 
 fn start_inner(
@@ -53,10 +49,9 @@ fn start_inner(
 	info!("👤 Role: {:?}", config.role);
 
 	// Create the service. This is the most heavy initialization step.
-	let (task_manager, rpc_handlers) =
-		crate::service::new_light_base(config)
-			.map(|(components, rpc_handlers, _, _, _)| (components, rpc_handlers))
-			.map_err(|e| format!("{:?}", e))?;
+	let (task_manager, rpc_handlers) = crate::service::new_light_base(config)
+		.map(|(components, rpc_handlers, _, _, _)| (components, rpc_handlers))
+		.map_err(|e| format!("{:?}", e))?;
 
 	Ok(browser_utils::start_client(task_manager, rpc_handlers))
 }
diff --git a/bin/node/cli/src/chain_spec.rs b/bin/node/cli/src/chain_spec.rs
index e3ba16b9de6f..2891736e5c22 100644
--- a/bin/node/cli/src/chain_spec.rs
+++ b/bin/node/cli/src/chain_spec.rs
@@ -18,25 +18,26 @@
 
 //! Substrate chain configurations.
 
-use sc_chain_spec::ChainSpecExtension;
-use sp_core::{Pair, Public, crypto::UncheckedInto, sr25519};
-use serde::{Serialize, Deserialize};
+use grandpa_primitives::AuthorityId as GrandpaId;
+use hex_literal::hex;
 use node_runtime::{
-	AuthorityDiscoveryConfig, BabeConfig, BalancesConfig, CouncilConfig,
-	DemocracyConfig, GrandpaConfig, ImOnlineConfig, SessionConfig, SessionKeys, StakerStatus,
-	StakingConfig, ElectionsConfig, IndicesConfig, SocietyConfig, SudoConfig, SystemConfig,
-	TechnicalCommitteeConfig, wasm_binary_unwrap, MAX_NOMINATIONS,
+	constants::currency::*, wasm_binary_unwrap, AuthorityDiscoveryConfig, BabeConfig,
+	BalancesConfig, Block, CouncilConfig, DemocracyConfig, ElectionsConfig, GrandpaConfig,
+	ImOnlineConfig, IndicesConfig, SessionConfig, SessionKeys, SocietyConfig, StakerStatus,
+	StakingConfig, SudoConfig, SystemConfig, TechnicalCommitteeConfig, MAX_NOMINATIONS,
 };
-use node_runtime::Block;
-use node_runtime::constants::currency::*;
+use pallet_im_online::sr25519::AuthorityId as ImOnlineId;
+use sc_chain_spec::ChainSpecExtension;
 use sc_service::ChainType;
-use hex_literal::hex;
 use sc_telemetry::TelemetryEndpoints;
-use grandpa_primitives::{AuthorityId as GrandpaId};
-use sp_consensus_babe::{AuthorityId as BabeId};
-use pallet_im_online::sr25519::{AuthorityId as ImOnlineId};
+use serde::{Deserialize, Serialize};
 use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId;
-use sp_runtime::{Perbill, traits::{Verify, IdentifyAccount}};
+use sp_consensus_babe::AuthorityId as BabeId;
+use sp_core::{crypto::UncheckedInto, sr25519, Pair, Public};
+use sp_runtime::{
+	traits::{IdentifyAccount, Verify},
+	Perbill,
+};
 
 pub use node_primitives::{AccountId, Balance, Signature};
 pub use node_runtime::GenesisConfig;
@@ -59,10 +60,7 @@ pub struct Extensions {
 }
 
 /// Specialized `ChainSpec`.
-pub type ChainSpec = sc_service::GenericChainSpec<
-	GenesisConfig,
-	Extensions,
->;
+pub type ChainSpec = sc_service::GenericChainSpec<GenesisConfig, Extensions>;
 /// Flaming Fir testnet generator
 pub fn flaming_fir_config() -> Result<ChainSpec, String> {
 	ChainSpec::from_json_bytes(&include_bytes!("../res/flaming-fir.json")[..])
@@ -84,65 +82,94 @@ fn staging_testnet_config_genesis() -> GenesisConfig {
 	// and
 	// for i in 1 2 3 4 ; do for j in session; do subkey --ed25519 inspect "$secret"//fir//$j//$i; done; done
 
-	let initial_authorities: Vec<(AccountId, AccountId, GrandpaId, BabeId, ImOnlineId, AuthorityDiscoveryId)> = vec![(
-		// 5Fbsd6WXDGiLTxunqeK5BATNiocfCqu9bS1yArVjCgeBLkVy
-		hex!["9c7a2ee14e565db0c69f78c7b4cd839fbf52b607d867e9e9c5a79042898a0d12"].into(),
-		// 5EnCiV7wSHeNhjW3FSUwiJNkcc2SBkPLn5Nj93FmbLtBjQUq
-		hex!["781ead1e2fa9ccb74b44c19d29cb2a7a4b5be3972927ae98cd3877523976a276"].into(),
-		// 5Fb9ayurnxnaXj56CjmyQLBiadfRCqUbL2VWNbbe1nZU6wiC
-		hex!["9becad03e6dcac03cee07edebca5475314861492cdfc96a2144a67bbe9699332"].unchecked_into(),
-		// 5EZaeQ8djPcq9pheJUhgerXQZt9YaHnMJpiHMRhwQeinqUW8
-		hex!["6e7e4eb42cbd2e0ab4cae8708ce5509580b8c04d11f6758dbf686d50fe9f9106"].unchecked_into(),
-		// 5EZaeQ8djPcq9pheJUhgerXQZt9YaHnMJpiHMRhwQeinqUW8
-		hex!["6e7e4eb42cbd2e0ab4cae8708ce5509580b8c04d11f6758dbf686d50fe9f9106"].unchecked_into(),
-		// 5EZaeQ8djPcq9pheJUhgerXQZt9YaHnMJpiHMRhwQeinqUW8
-		hex!["6e7e4eb42cbd2e0ab4cae8708ce5509580b8c04d11f6758dbf686d50fe9f9106"].unchecked_into(),
-	),(
-		// 5ERawXCzCWkjVq3xz1W5KGNtVx2VdefvZ62Bw1FEuZW4Vny2
-		hex!["68655684472b743e456907b398d3a44c113f189e56d1bbfd55e889e295dfde78"].into(),
-		// 5Gc4vr42hH1uDZc93Nayk5G7i687bAQdHHc9unLuyeawHipF
-		hex!["c8dc79e36b29395413399edaec3e20fcca7205fb19776ed8ddb25d6f427ec40e"].into(),
-		// 5EockCXN6YkiNCDjpqqnbcqd4ad35nU4RmA1ikM4YeRN4WcE
-		hex!["7932cff431e748892fa48e10c63c17d30f80ca42e4de3921e641249cd7fa3c2f"].unchecked_into(),
-		// 5DhLtiaQd1L1LU9jaNeeu9HJkP6eyg3BwXA7iNMzKm7qqruQ
-		hex!["482dbd7297a39fa145c570552249c2ca9dd47e281f0c500c971b59c9dcdcd82e"].unchecked_into(),
-		// 5DhLtiaQd1L1LU9jaNeeu9HJkP6eyg3BwXA7iNMzKm7qqruQ
-		hex!["482dbd7297a39fa145c570552249c2ca9dd47e281f0c500c971b59c9dcdcd82e"].unchecked_into(),
-		// 5DhLtiaQd1L1LU9jaNeeu9HJkP6eyg3BwXA7iNMzKm7qqruQ
-		hex!["482dbd7297a39fa145c570552249c2ca9dd47e281f0c500c971b59c9dcdcd82e"].unchecked_into(),
-	),(
-		// 5DyVtKWPidondEu8iHZgi6Ffv9yrJJ1NDNLom3X9cTDi98qp
-		hex!["547ff0ab649283a7ae01dbc2eb73932eba2fb09075e9485ff369082a2ff38d65"].into(),
-		// 5FeD54vGVNpFX3PndHPXJ2MDakc462vBCD5mgtWRnWYCpZU9
-		hex!["9e42241d7cd91d001773b0b616d523dd80e13c6c2cab860b1234ef1b9ffc1526"].into(),
-		// 5E1jLYfLdUQKrFrtqoKgFrRvxM3oQPMbf6DfcsrugZZ5Bn8d
-		hex!["5633b70b80a6c8bb16270f82cca6d56b27ed7b76c8fd5af2986a25a4788ce440"].unchecked_into(),
-		// 5DhKqkHRkndJu8vq7pi2Q5S3DfftWJHGxbEUNH43b46qNspH
-		hex!["482a3389a6cf42d8ed83888cfd920fec738ea30f97e44699ada7323f08c3380a"].unchecked_into(),
-		// 5DhKqkHRkndJu8vq7pi2Q5S3DfftWJHGxbEUNH43b46qNspH
-		hex!["482a3389a6cf42d8ed83888cfd920fec738ea30f97e44699ada7323f08c3380a"].unchecked_into(),
-		// 5DhKqkHRkndJu8vq7pi2Q5S3DfftWJHGxbEUNH43b46qNspH
-		hex!["482a3389a6cf42d8ed83888cfd920fec738ea30f97e44699ada7323f08c3380a"].unchecked_into(),
-	),(
-		// 5HYZnKWe5FVZQ33ZRJK1rG3WaLMztxWrrNDb1JRwaHHVWyP9
-		hex!["f26cdb14b5aec7b2789fd5ca80f979cef3761897ae1f37ffb3e154cbcc1c2663"].into(),
-		// 5EPQdAQ39WQNLCRjWsCk5jErsCitHiY5ZmjfWzzbXDoAoYbn
-		hex!["66bc1e5d275da50b72b15de072a2468a5ad414919ca9054d2695767cf650012f"].into(),
-		// 5DMa31Hd5u1dwoRKgC4uvqyrdK45RHv3CpwvpUC1EzuwDit4
-		hex!["3919132b851ef0fd2dae42a7e734fe547af5a6b809006100f48944d7fae8e8ef"].unchecked_into(),
-		// 5C4vDQxA8LTck2xJEy4Yg1hM9qjDt4LvTQaMo4Y8ne43aU6x
-		hex!["00299981a2b92f878baaf5dbeba5c18d4e70f2a1fcd9c61b32ea18daf38f4378"].unchecked_into(),
-		// 5C4vDQxA8LTck2xJEy4Yg1hM9qjDt4LvTQaMo4Y8ne43aU6x
-		hex!["00299981a2b92f878baaf5dbeba5c18d4e70f2a1fcd9c61b32ea18daf38f4378"].unchecked_into(),
-		// 5C4vDQxA8LTck2xJEy4Yg1hM9qjDt4LvTQaMo4Y8ne43aU6x
-		hex!["00299981a2b92f878baaf5dbeba5c18d4e70f2a1fcd9c61b32ea18daf38f4378"].unchecked_into(),
-	)];
+	let initial_authorities: Vec<(
+		AccountId,
+		AccountId,
+		GrandpaId,
+		BabeId,
+		ImOnlineId,
+		AuthorityDiscoveryId,
+	)> = vec![
+		(
+			// 5Fbsd6WXDGiLTxunqeK5BATNiocfCqu9bS1yArVjCgeBLkVy
+			hex!["9c7a2ee14e565db0c69f78c7b4cd839fbf52b607d867e9e9c5a79042898a0d12"].into(),
+			// 5EnCiV7wSHeNhjW3FSUwiJNkcc2SBkPLn5Nj93FmbLtBjQUq
+			hex!["781ead1e2fa9ccb74b44c19d29cb2a7a4b5be3972927ae98cd3877523976a276"].into(),
+			// 5Fb9ayurnxnaXj56CjmyQLBiadfRCqUbL2VWNbbe1nZU6wiC
+			hex!["9becad03e6dcac03cee07edebca5475314861492cdfc96a2144a67bbe9699332"]
+				.unchecked_into(),
+			// 5EZaeQ8djPcq9pheJUhgerXQZt9YaHnMJpiHMRhwQeinqUW8
+			hex!["6e7e4eb42cbd2e0ab4cae8708ce5509580b8c04d11f6758dbf686d50fe9f9106"]
+				.unchecked_into(),
+			// 5EZaeQ8djPcq9pheJUhgerXQZt9YaHnMJpiHMRhwQeinqUW8
+			hex!["6e7e4eb42cbd2e0ab4cae8708ce5509580b8c04d11f6758dbf686d50fe9f9106"]
+				.unchecked_into(),
+			// 5EZaeQ8djPcq9pheJUhgerXQZt9YaHnMJpiHMRhwQeinqUW8
+			hex!["6e7e4eb42cbd2e0ab4cae8708ce5509580b8c04d11f6758dbf686d50fe9f9106"]
+				.unchecked_into(),
+		),
+		(
+			// 5ERawXCzCWkjVq3xz1W5KGNtVx2VdefvZ62Bw1FEuZW4Vny2
+			hex!["68655684472b743e456907b398d3a44c113f189e56d1bbfd55e889e295dfde78"].into(),
+			// 5Gc4vr42hH1uDZc93Nayk5G7i687bAQdHHc9unLuyeawHipF
+			hex!["c8dc79e36b29395413399edaec3e20fcca7205fb19776ed8ddb25d6f427ec40e"].into(),
+			// 5EockCXN6YkiNCDjpqqnbcqd4ad35nU4RmA1ikM4YeRN4WcE
+			hex!["7932cff431e748892fa48e10c63c17d30f80ca42e4de3921e641249cd7fa3c2f"]
+				.unchecked_into(),
+			// 5DhLtiaQd1L1LU9jaNeeu9HJkP6eyg3BwXA7iNMzKm7qqruQ
+			hex!["482dbd7297a39fa145c570552249c2ca9dd47e281f0c500c971b59c9dcdcd82e"]
+				.unchecked_into(),
+			// 5DhLtiaQd1L1LU9jaNeeu9HJkP6eyg3BwXA7iNMzKm7qqruQ
+			hex!["482dbd7297a39fa145c570552249c2ca9dd47e281f0c500c971b59c9dcdcd82e"]
+				.unchecked_into(),
+			// 5DhLtiaQd1L1LU9jaNeeu9HJkP6eyg3BwXA7iNMzKm7qqruQ
+			hex!["482dbd7297a39fa145c570552249c2ca9dd47e281f0c500c971b59c9dcdcd82e"]
+				.unchecked_into(),
+		),
+		(
+			// 5DyVtKWPidondEu8iHZgi6Ffv9yrJJ1NDNLom3X9cTDi98qp
+			hex!["547ff0ab649283a7ae01dbc2eb73932eba2fb09075e9485ff369082a2ff38d65"].into(),
+			// 5FeD54vGVNpFX3PndHPXJ2MDakc462vBCD5mgtWRnWYCpZU9
+			hex!["9e42241d7cd91d001773b0b616d523dd80e13c6c2cab860b1234ef1b9ffc1526"].into(),
+			// 5E1jLYfLdUQKrFrtqoKgFrRvxM3oQPMbf6DfcsrugZZ5Bn8d
+			hex!["5633b70b80a6c8bb16270f82cca6d56b27ed7b76c8fd5af2986a25a4788ce440"]
+				.unchecked_into(),
+			// 5DhKqkHRkndJu8vq7pi2Q5S3DfftWJHGxbEUNH43b46qNspH
+			hex!["482a3389a6cf42d8ed83888cfd920fec738ea30f97e44699ada7323f08c3380a"]
+				.unchecked_into(),
+			// 5DhKqkHRkndJu8vq7pi2Q5S3DfftWJHGxbEUNH43b46qNspH
+			hex!["482a3389a6cf42d8ed83888cfd920fec738ea30f97e44699ada7323f08c3380a"]
+				.unchecked_into(),
+			// 5DhKqkHRkndJu8vq7pi2Q5S3DfftWJHGxbEUNH43b46qNspH
+			hex!["482a3389a6cf42d8ed83888cfd920fec738ea30f97e44699ada7323f08c3380a"]
+				.unchecked_into(),
+		),
+		(
+			// 5HYZnKWe5FVZQ33ZRJK1rG3WaLMztxWrrNDb1JRwaHHVWyP9
+			hex!["f26cdb14b5aec7b2789fd5ca80f979cef3761897ae1f37ffb3e154cbcc1c2663"].into(),
+			// 5EPQdAQ39WQNLCRjWsCk5jErsCitHiY5ZmjfWzzbXDoAoYbn
+			hex!["66bc1e5d275da50b72b15de072a2468a5ad414919ca9054d2695767cf650012f"].into(),
+			// 5DMa31Hd5u1dwoRKgC4uvqyrdK45RHv3CpwvpUC1EzuwDit4
+			hex!["3919132b851ef0fd2dae42a7e734fe547af5a6b809006100f48944d7fae8e8ef"]
+				.unchecked_into(),
+			// 5C4vDQxA8LTck2xJEy4Yg1hM9qjDt4LvTQaMo4Y8ne43aU6x
+			hex!["00299981a2b92f878baaf5dbeba5c18d4e70f2a1fcd9c61b32ea18daf38f4378"]
+				.unchecked_into(),
+			// 5C4vDQxA8LTck2xJEy4Yg1hM9qjDt4LvTQaMo4Y8ne43aU6x
+			hex!["00299981a2b92f878baaf5dbeba5c18d4e70f2a1fcd9c61b32ea18daf38f4378"]
+				.unchecked_into(),
+			// 5C4vDQxA8LTck2xJEy4Yg1hM9qjDt4LvTQaMo4Y8ne43aU6x
+			hex!["00299981a2b92f878baaf5dbeba5c18d4e70f2a1fcd9c61b32ea18daf38f4378"]
+				.unchecked_into(),
+		),
+	];
 
 	// generated with secret: subkey inspect "$secret"/fir
 	let root_key: AccountId = hex![
 		// 5Ff3iXP75ruzroPWRP2FYBHWnmGGBSb63857BgnzCoXNxfPo
 		"9ee5e5bdc0ec239eb164f865ecc345ce4c88e76ee002e0f7e318097347471809"
-	].into();
+	]
+	.into();
 
 	let endowed_accounts: Vec<AccountId> = vec![root_key.clone()];
 
@@ -158,8 +185,10 @@ pub fn staging_testnet_config() -> ChainSpec {
 		ChainType::Live,
 		staging_testnet_config_genesis,
 		boot_nodes,
-		Some(TelemetryEndpoints::new(vec![(STAGING_TELEMETRY_URL.to_string(), 0)])
-			.expect("Staging telemetry url is valid; qed")),
+		Some(
+			TelemetryEndpoints::new(vec![(STAGING_TELEMETRY_URL.to_string(), 0)])
+				.expect("Staging telemetry url is valid; qed"),
+		),
 		None,
 		None,
 		Default::default(),
@@ -174,21 +203,17 @@ pub fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Pu
 }
 
 /// Helper function to generate an account ID from seed
-pub fn get_account_id_from_seed<TPublic: Public>(seed: &str) -> AccountId where
-	AccountPublic: From<<TPublic::Pair as Pair>::Public>
+pub fn get_account_id_from_seed<TPublic: Public>(seed: &str) -> AccountId
+where
+	AccountPublic: From<<TPublic::Pair as Pair>::Public>,
 {
 	AccountPublic::from(get_from_seed::<TPublic>(seed)).into_account()
 }
 
 /// Helper function to generate stash, controller and session key from seed
-pub fn authority_keys_from_seed(seed: &str) -> (
-	AccountId,
-	AccountId,
-	GrandpaId,
-	BabeId,
-	ImOnlineId,
-	AuthorityDiscoveryId,
-) {
+pub fn authority_keys_from_seed(
+	seed: &str,
+) -> (AccountId, AccountId, GrandpaId, BabeId, ImOnlineId, AuthorityDiscoveryId) {
 	(
 		get_account_id_from_seed::<sr25519::Public>(&format!("{}//stash", seed)),
 		get_account_id_from_seed::<sr25519::Public>(seed),
@@ -230,11 +255,15 @@ pub fn testnet_genesis(
 		]
 	});
 	// endow all authorities and nominators.
-	initial_authorities.iter().map(|x| &x.0).chain(initial_nominators.iter()).for_each(|x| {
-		if !endowed_accounts.contains(&x) {
-			endowed_accounts.push(x.clone())
-		}
-	});
+	initial_authorities
+		.iter()
+		.map(|x| &x.0)
+		.chain(initial_nominators.iter())
+		.for_each(|x| {
+			if !endowed_accounts.contains(&x) {
+				endowed_accounts.push(x.clone())
+			}
+		});
 
 	// stakers: all validators and nominators.
 	let mut rng = rand::thread_rng();
@@ -266,22 +295,20 @@ pub fn testnet_genesis(
 			changes_trie_config: Default::default(),
 		},
 		balances: BalancesConfig {
-			balances: endowed_accounts.iter().cloned()
-				.map(|x| (x, ENDOWMENT))
-				.collect()
-		},
-		indices: IndicesConfig {
-			indices: vec![],
+			balances: endowed_accounts.iter().cloned().map(|x| (x, ENDOWMENT)).collect(),
 		},
+		indices: IndicesConfig { indices: vec![] },
 		session: SessionConfig {
-			keys: initial_authorities.iter().map(|x| {
-				(x.0.clone(), x.0.clone(), session_keys(
-					x.2.clone(),
-					x.3.clone(),
-					x.4.clone(),
-					x.5.clone(),
-				))
-			}).collect::<Vec<_>>(),
+			keys: initial_authorities
+				.iter()
+				.map(|x| {
+					(
+						x.0.clone(),
+						x.0.clone(),
+						session_keys(x.2.clone(), x.3.clone(), x.4.clone(), x.5.clone()),
+					)
+				})
+				.collect::<Vec<_>>(),
 		},
 		staking: StakingConfig {
 			validator_count: initial_authorities.len() as u32,
@@ -289,47 +316,42 @@ pub fn testnet_genesis(
 			invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(),
 			slash_reward_fraction: Perbill::from_percent(10),
 			stakers,
-			.. Default::default()
+			..Default::default()
 		},
 		democracy: DemocracyConfig::default(),
 		elections: ElectionsConfig {
-			members: endowed_accounts.iter()
-						.take((num_endowed_accounts + 1) / 2)
-						.cloned()
-						.map(|member| (member, STASH))
-						.collect(),
+			members: endowed_accounts
+				.iter()
+				.take((num_endowed_accounts + 1) / 2)
+				.cloned()
+				.map(|member| (member, STASH))
+				.collect(),
 		},
 		council: CouncilConfig::default(),
 		technical_committee: TechnicalCommitteeConfig {
-			members: endowed_accounts.iter()
-						.take((num_endowed_accounts + 1) / 2)
-						.cloned()
-						.collect(),
+			members: endowed_accounts
+				.iter()
+				.take((num_endowed_accounts + 1) / 2)
+				.cloned()
+				.collect(),
 			phantom: Default::default(),
 		},
-		sudo: SudoConfig {
-			key: root_key,
-		},
+		sudo: SudoConfig { key: root_key },
 		babe: BabeConfig {
 			authorities: vec![],
 			epoch_config: Some(node_runtime::BABE_GENESIS_EPOCH_CONFIG),
 		},
-		im_online: ImOnlineConfig {
-			keys: vec![],
-		},
-		authority_discovery: AuthorityDiscoveryConfig {
-			keys: vec![],
-		},
-		grandpa: GrandpaConfig {
-			authorities: vec![],
-		},
+		im_online: ImOnlineConfig { keys: vec![] },
+		authority_discovery: AuthorityDiscoveryConfig { keys: vec![] },
+		grandpa: GrandpaConfig { authorities: vec![] },
 		technical_membership: Default::default(),
 		treasury: Default::default(),
 		society: SocietyConfig {
-			members: endowed_accounts.iter()
-						.take((num_endowed_accounts + 1) / 2)
-						.cloned()
-						.collect(),
+			members: endowed_accounts
+				.iter()
+				.take((num_endowed_accounts + 1) / 2)
+				.cloned()
+				.collect(),
 			pot: 0,
 			max_members: 999,
 		},
@@ -341,9 +363,7 @@ pub fn testnet_genesis(
 
 fn development_config_genesis() -> GenesisConfig {
 	testnet_genesis(
-		vec![
-			authority_keys_from_seed("Alice"),
-		],
+		vec![authority_keys_from_seed("Alice")],
 		vec![],
 		get_account_id_from_seed::<sr25519::Public>("Alice"),
 		None,
@@ -367,10 +387,7 @@ pub fn development_config() -> ChainSpec {
 
 fn local_testnet_genesis() -> GenesisConfig {
 	testnet_genesis(
-		vec![
-			authority_keys_from_seed("Alice"),
-			authority_keys_from_seed("Bob"),
-		],
+		vec![authority_keys_from_seed("Alice"), authority_keys_from_seed("Bob")],
 		vec![],
 		get_account_id_from_seed::<sr25519::Public>("Alice"),
 		None,
@@ -401,9 +418,7 @@ pub(crate) mod tests {
 
 	fn local_testnet_genesis_instant_single() -> GenesisConfig {
 		testnet_genesis(
-			vec![
-				authority_keys_from_seed("Alice"),
-			],
+			vec![authority_keys_from_seed("Alice")],
 			vec![],
 			get_account_id_from_seed::<sr25519::Public>("Alice"),
 			None,
@@ -446,14 +461,24 @@ pub(crate) mod tests {
 		sc_service_test::connectivity(
 			integration_test_config_with_two_authorities(),
 			|config| {
-				let NewFullBase { task_manager, client, network, transaction_pool, .. }
-					= new_full_base(config,|_, _| ())?;
-				Ok(sc_service_test::TestNetComponents::new(task_manager, client, network, transaction_pool))
+				let NewFullBase { task_manager, client, network, transaction_pool, .. } =
+					new_full_base(config, |_, _| ())?;
+				Ok(sc_service_test::TestNetComponents::new(
+					task_manager,
+					client,
+					network,
+					transaction_pool,
+				))
 			},
 			|config| {
 				let (keep_alive, _, client, network, transaction_pool) = new_light_base(config)?;
-				Ok(sc_service_test::TestNetComponents::new(keep_alive, client, network, transaction_pool))
-			}
+				Ok(sc_service_test::TestNetComponents::new(
+					keep_alive,
+					client,
+					network,
+					transaction_pool,
+				))
+			},
 		);
 	}
 
diff --git a/bin/node/cli/src/cli.rs b/bin/node/cli/src/cli.rs
index 11ea58f4068d..850581748fde 100644
--- a/bin/node/cli/src/cli.rs
+++ b/bin/node/cli/src/cli.rs
@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use sc_cli::{RunCmd, KeySubcommand, SignCmd, VanityCmd, VerifyCmd};
+use sc_cli::{KeySubcommand, RunCmd, SignCmd, VanityCmd, VerifyCmd};
 use structopt::StructOpt;
 
 /// An overarching CLI command definition.
diff --git a/bin/node/cli/src/command.rs b/bin/node/cli/src/command.rs
index 1ef1da6ba681..b904ea99e8f9 100644
--- a/bin/node/cli/src/command.rs
+++ b/bin/node/cli/src/command.rs
@@ -16,12 +16,11 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::{chain_spec, service, Cli, Subcommand};
+use crate::{chain_spec, service, service::new_partial, Cli, Subcommand};
 use node_executor::Executor;
 use node_runtime::{Block, RuntimeApi};
-use sc_cli::{Result, SubstrateCli, RuntimeVersion, Role, ChainSpec};
+use sc_cli::{ChainSpec, Result, Role, RuntimeVersion, SubstrateCli};
 use sc_service::PartialComponents;
-use crate::service::new_partial;
 
 impl SubstrateCli for Cli {
 	fn impl_name() -> String {
@@ -49,17 +48,19 @@ impl SubstrateCli for Cli {
 	}
 
 	fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {
-		let spec =
-			match id {
-				"" => return Err("Please specify which chain you want to run, e.g. --dev or --chain=local".into()),
-				"dev" => Box::new(chain_spec::development_config()),
-				"local" => Box::new(chain_spec::local_testnet_config()),
-				"fir" | "flaming-fir" => Box::new(chain_spec::flaming_fir_config()?),
-				"staging" => Box::new(chain_spec::staging_testnet_config()),
-				path => Box::new(chain_spec::ChainSpec::from_json_file(
-					std::path::PathBuf::from(path),
-				)?),
-			};
+		let spec = match id {
+			"" =>
+				return Err(
+					"Please specify which chain you want to run, e.g. --dev or --chain=local"
+						.into(),
+				),
+			"dev" => Box::new(chain_spec::development_config()),
+			"local" => Box::new(chain_spec::local_testnet_config()),
+			"fir" | "flaming-fir" => Box::new(chain_spec::flaming_fir_config()?),
+			"staging" => Box::new(chain_spec::staging_testnet_config()),
+			path =>
+				Box::new(chain_spec::ChainSpec::from_json_file(std::path::PathBuf::from(path))?),
+		};
 		Ok(spec)
 	}
 
@@ -79,24 +80,25 @@ pub fn run() -> Result<()> {
 				match config.role {
 					Role::Light => service::new_light(config),
 					_ => service::new_full(config),
-				}.map_err(sc_cli::Error::Service)
+				}
+				.map_err(sc_cli::Error::Service)
 			})
-		}
+		},
 		Some(Subcommand::Inspect(cmd)) => {
 			let runner = cli.create_runner(cmd)?;
 
 			runner.sync_run(|config| cmd.run::<Block, RuntimeApi, Executor>(config))
-		}
-		Some(Subcommand::Benchmark(cmd)) => {
+		},
+		Some(Subcommand::Benchmark(cmd)) =>
 			if cfg!(feature = "runtime-benchmarks") {
 				let runner = cli.create_runner(cmd)?;
 
 				runner.sync_run(|config| cmd.run::<Block, Executor>(config))
 			} else {
 				Err("Benchmarking wasn't enabled when building the node. \
-				You can enable it with `--features runtime-benchmarks`.".into())
-			}
-		}
+				You can enable it with `--features runtime-benchmarks`."
+					.into())
+			},
 		Some(Subcommand::Key(cmd)) => cmd.run(&cli),
 		Some(Subcommand::Sign(cmd)) => cmd.run(),
 		Some(Subcommand::Verify(cmd)) => cmd.run(),
@@ -108,32 +110,30 @@ pub fn run() -> Result<()> {
 		Some(Subcommand::CheckBlock(cmd)) => {
 			let runner = cli.create_runner(cmd)?;
 			runner.async_run(|config| {
-				let PartialComponents { client, task_manager, import_queue, ..}
-					= new_partial(&config)?;
+				let PartialComponents { client, task_manager, import_queue, .. } =
+					new_partial(&config)?;
 				Ok((cmd.run(client, import_queue), task_manager))
 			})
 		},
 		Some(Subcommand::ExportBlocks(cmd)) => {
 			let runner = cli.create_runner(cmd)?;
 			runner.async_run(|config| {
-				let PartialComponents { client, task_manager, ..}
-					= new_partial(&config)?;
+				let PartialComponents { client, task_manager, .. } = new_partial(&config)?;
 				Ok((cmd.run(client, config.database), task_manager))
 			})
 		},
 		Some(Subcommand::ExportState(cmd)) => {
 			let runner = cli.create_runner(cmd)?;
 			runner.async_run(|config| {
-				let PartialComponents { client, task_manager, ..}
-					= new_partial(&config)?;
+				let PartialComponents { client, task_manager, .. } = new_partial(&config)?;
 				Ok((cmd.run(client, config.chain_spec), task_manager))
 			})
 		},
 		Some(Subcommand::ImportBlocks(cmd)) => {
 			let runner = cli.create_runner(cmd)?;
 			runner.async_run(|config| {
-				let PartialComponents { client, task_manager, import_queue, ..}
-					= new_partial(&config)?;
+				let PartialComponents { client, task_manager, import_queue, .. } =
+					new_partial(&config)?;
 				Ok((cmd.run(client, import_queue), task_manager))
 			})
 		},
@@ -144,8 +144,7 @@ pub fn run() -> Result<()> {
 		Some(Subcommand::Revert(cmd)) => {
 			let runner = cli.create_runner(cmd)?;
 			runner.async_run(|config| {
-				let PartialComponents { client, task_manager, backend, ..}
-					= new_partial(&config)?;
+				let PartialComponents { client, task_manager, backend, .. } = new_partial(&config)?;
 				Ok((cmd.run(client, backend), task_manager))
 			})
 		},
@@ -156,18 +155,16 @@ pub fn run() -> Result<()> {
 				// we don't need any of the components of new_partial, just a runtime, or a task
 				// manager to do `async_run`.
 				let registry = config.prometheus_config.as_ref().map(|cfg| &cfg.registry);
-				let task_manager = sc_service::TaskManager::new(
-					config.task_executor.clone(),
-					registry,
-				).map_err(|e| sc_cli::Error::Service(sc_service::Error::Prometheus(e)))?;
+				let task_manager =
+					sc_service::TaskManager::new(config.task_executor.clone(), registry)
+						.map_err(|e| sc_cli::Error::Service(sc_service::Error::Prometheus(e)))?;
 
 				Ok((cmd.run::<Block, Executor>(config), task_manager))
 			})
 		},
 		#[cfg(not(feature = "try-runtime"))]
-		Some(Subcommand::TryRuntime) => {
-			Err("TryRuntime wasn't enabled when building the node. \
-				You can enable it with `--features try-runtime`.".into())
-		},
+		Some(Subcommand::TryRuntime) => Err("TryRuntime wasn't enabled when building the node. \
+				You can enable it with `--features try-runtime`."
+			.into()),
 	}
 }
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index 4886b798b050..47bc5f5b021f 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -20,20 +20,17 @@
 
 //! Service implementation. Specialized wrapper over substrate service.
 
-use std::sync::Arc;
-use sc_consensus_babe;
+use futures::prelude::*;
+use node_executor::Executor;
 use node_primitives::Block;
 use node_runtime::RuntimeApi;
-use sc_service::{
-	config::Configuration, error::Error as ServiceError, RpcHandlers, TaskManager,
-};
-use sc_network::{Event, NetworkService};
-use sp_runtime::traits::Block as BlockT;
-use futures::prelude::*;
 use sc_client_api::{ExecutorProvider, RemoteBackend};
-use node_executor::Executor;
+use sc_consensus_babe::{self, SlotProportion};
+use sc_network::{Event, NetworkService};
+use sc_service::{config::Configuration, error::Error as ServiceError, RpcHandlers, TaskManager};
 use sc_telemetry::{Telemetry, TelemetryWorker};
-use sc_consensus_babe::SlotProportion;
+use sp_runtime::traits::Block as BlockT;
+use std::sync::Arc;
 
 type FullClient = sc_service::TFullClient<Block, RuntimeApi, Executor>;
 type FullBackend = sc_service::TFullBackend<Block>;
@@ -44,25 +41,29 @@ type LightClient = sc_service::TLightClient<Block, RuntimeApi, Executor>;
 
 pub fn new_partial(
 	config: &Configuration,
-) -> Result<sc_service::PartialComponents<
-	FullClient, FullBackend, FullSelectChain,
-	sp_consensus::DefaultImportQueue<Block, FullClient>,
-	sc_transaction_pool::FullPool<Block, FullClient>,
-	(
-		impl Fn(
-			node_rpc::DenyUnsafe,
-			sc_rpc::SubscriptionTaskExecutor,
-		) -> node_rpc::IoHandler,
+) -> Result<
+	sc_service::PartialComponents<
+		FullClient,
+		FullBackend,
+		FullSelectChain,
+		sp_consensus::DefaultImportQueue<Block, FullClient>,
+		sc_transaction_pool::FullPool<Block, FullClient>,
 		(
-			sc_consensus_babe::BabeBlockImport<Block, FullClient, FullGrandpaBlockImport>,
-			grandpa::LinkHalf<Block, FullClient, FullSelectChain>,
-			sc_consensus_babe::BabeLink<Block>,
+			impl Fn(node_rpc::DenyUnsafe, sc_rpc::SubscriptionTaskExecutor) -> node_rpc::IoHandler,
+			(
+				sc_consensus_babe::BabeBlockImport<Block, FullClient, FullGrandpaBlockImport>,
+				grandpa::LinkHalf<Block, FullClient, FullSelectChain>,
+				sc_consensus_babe::BabeLink<Block>,
+			),
+			grandpa::SharedVoterState,
+			Option<Telemetry>,
 		),
-		grandpa::SharedVoterState,
-		Option<Telemetry>,
-	)
->, ServiceError> {
-	let telemetry = config.telemetry_endpoints.clone()
+	>,
+	ServiceError,
+> {
+	let telemetry = config
+		.telemetry_endpoints
+		.clone()
 		.filter(|x| !x.is_empty())
 		.map(|endpoints| -> Result<_, sc_telemetry::Error> {
 			let worker = TelemetryWorker::new(16)?;
@@ -78,11 +79,10 @@ pub fn new_partial(
 		)?;
 	let client = Arc::new(client);
 
-	let telemetry = telemetry
-		.map(|(worker, telemetry)| {
-			task_manager.spawn_handle().spawn("telemetry", worker.run());
-			telemetry
-		});
+	let telemetry = telemetry.map(|(worker, telemetry)| {
+		task_manager.spawn_handle().spawn("telemetry", worker.run());
+		telemetry
+	});
 
 	let select_chain = sc_consensus::LongestChain::new(backend.clone());
 
@@ -115,21 +115,19 @@ pub fn new_partial(
 		Some(Box::new(justification_import)),
 		client.clone(),
 		select_chain.clone(),
-		move |_, ()| {
-			async move {
-				let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
+		move |_, ()| async move {
+			let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
 
-				let slot =
-					sp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_duration(
-						*timestamp,
-						slot_duration,
-					);
+			let slot =
+				sp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_duration(
+					*timestamp,
+					slot_duration,
+				);
 
-				let uncles =
-					sp_authorship::InherentDataProvider::<<Block as BlockT>::Header>::check_inherents();
+			let uncles =
+				sp_authorship::InherentDataProvider::<<Block as BlockT>::Header>::check_inherents();
 
-				Ok((timestamp, slot, uncles))
-			}
+			Ok((timestamp, slot, uncles))
 		},
 		&task_manager.spawn_essential_handle(),
 		config.prometheus_registry(),
@@ -213,7 +211,7 @@ pub fn new_full_base(
 	with_startup_data: impl FnOnce(
 		&sc_consensus_babe::BabeBlockImport<Block, FullClient, FullGrandpaBlockImport>,
 		&sc_consensus_babe::BabeLink<Block>,
-	)
+	),
 ) -> Result<NewFullBase, ServiceError> {
 	let sc_service::PartialComponents {
 		client,
@@ -238,7 +236,7 @@ pub fn new_full_base(
 			task_manager.spawn_handle(),
 			backend.clone(),
 			import_setup.1.shared_authority_set().clone(),
-		)
+		),
 	);
 
 	let (network, system_rpc_tx, network_starter) =
@@ -254,7 +252,10 @@ pub fn new_full_base(
 
 	if config.offchain_worker.enabled {
 		sc_service::build_offchain_workers(
-			&config, task_manager.spawn_handle(), client.clone(), network.clone(),
+			&config,
+			task_manager.spawn_handle(),
+			client.clone(),
+			network.clone(),
 		);
 	}
 
@@ -266,22 +267,20 @@ pub fn new_full_base(
 	let enable_grandpa = !config.disable_grandpa;
 	let prometheus_registry = config.prometheus_registry().cloned();
 
-	let _rpc_handlers = sc_service::spawn_tasks(
-		sc_service::SpawnTasksParams {
-			config,
-			backend: backend.clone(),
-			client: client.clone(),
-			keystore: keystore_container.sync_keystore(),
-			network: network.clone(),
-			rpc_extensions_builder: Box::new(rpc_extensions_builder),
-			transaction_pool: transaction_pool.clone(),
-			task_manager: &mut task_manager,
-			on_demand: None,
-			remote_blockchain: None,
-			system_rpc_tx,
-			telemetry: telemetry.as_mut(),
-		},
-	)?;
+	let _rpc_handlers = sc_service::spawn_tasks(sc_service::SpawnTasksParams {
+		config,
+		backend: backend.clone(),
+		client: client.clone(),
+		keystore: keystore_container.sync_keystore(),
+		network: network.clone(),
+		rpc_extensions_builder: Box::new(rpc_extensions_builder),
+		transaction_pool: transaction_pool.clone(),
+		task_manager: &mut task_manager,
+		on_demand: None,
+		remote_blockchain: None,
+		system_rpc_tx,
+		telemetry: telemetry.as_mut(),
+	})?;
 
 	let (block_import, grandpa_link, babe_link) = import_setup;
 
@@ -343,36 +342,37 @@ pub fn new_full_base(
 
 	// Spawn authority discovery module.
 	if role.is_authority() {
-		let authority_discovery_role = sc_authority_discovery::Role::PublishAndDiscover(
-			keystore_container.keystore(),
-		);
-		let dht_event_stream = network.event_stream("authority-discovery")
-			.filter_map(|e| async move { match e {
-				Event::Dht(e) => Some(e),
-				_ => None,
-			}});
-		let (authority_discovery_worker, _service) = sc_authority_discovery::new_worker_and_service_with_config(
-			sc_authority_discovery::WorkerConfig {
-				publish_non_global_ips: auth_disc_publish_non_global_ips,
-				..Default::default()
-			},
-			client.clone(),
-			network.clone(),
-			Box::pin(dht_event_stream),
-			authority_discovery_role,
-			prometheus_registry.clone(),
-		);
+		let authority_discovery_role =
+			sc_authority_discovery::Role::PublishAndDiscover(keystore_container.keystore());
+		let dht_event_stream =
+			network.event_stream("authority-discovery").filter_map(|e| async move {
+				match e {
+					Event::Dht(e) => Some(e),
+					_ => None,
+				}
+			});
+		let (authority_discovery_worker, _service) =
+			sc_authority_discovery::new_worker_and_service_with_config(
+				sc_authority_discovery::WorkerConfig {
+					publish_non_global_ips: auth_disc_publish_non_global_ips,
+					..Default::default()
+				},
+				client.clone(),
+				network.clone(),
+				Box::pin(dht_event_stream),
+				authority_discovery_role,
+				prometheus_registry.clone(),
+			);
 
-		task_manager.spawn_handle().spawn("authority-discovery-worker", authority_discovery_worker.run());
+		task_manager
+			.spawn_handle()
+			.spawn("authority-discovery-worker", authority_discovery_worker.run());
 	}
 
 	// 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 role.is_authority() {
-		Some(keystore_container.sync_keystore())
-	} else {
-		None
-	};
+	let keystore =
+		if role.is_authority() { Some(keystore_container.sync_keystore()) } else { None };
 
 	let config = grandpa::Config {
 		// FIXME #1578 make this available through chainspec
@@ -404,46 +404,41 @@ pub fn new_full_base(
 
 		// the GRANDPA voter task is considered infallible, i.e.
 		// if it fails we take down the service with it.
-		task_manager.spawn_essential_handle().spawn_blocking(
-			"grandpa-voter",
-			grandpa::run_grandpa_voter(grandpa_config)?
-		);
+		task_manager
+			.spawn_essential_handle()
+			.spawn_blocking("grandpa-voter", grandpa::run_grandpa_voter(grandpa_config)?);
 	}
 
 	network_starter.start_network();
-	Ok(NewFullBase {
-		task_manager,
-		client,
-		network,
-		transaction_pool,
-	})
+	Ok(NewFullBase { task_manager, client, network, transaction_pool })
 }
 
 /// Builds a new service for a full client.
-pub fn new_full(
-	config: Configuration,
-) -> Result<TaskManager, ServiceError> {
-	new_full_base(config, |_, _| ()).map(|NewFullBase { task_manager, .. }| {
-		task_manager
-	})
+pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
+	new_full_base(config, |_, _| ()).map(|NewFullBase { task_manager, .. }| task_manager)
 }
 
 pub fn new_light_base(
 	mut config: Configuration,
-) -> Result<(
-	TaskManager,
-	RpcHandlers,
-	Arc<LightClient>,
-	Arc<NetworkService<Block, <Block as BlockT>::Hash>>,
-	Arc<sc_transaction_pool::LightPool<Block, LightClient, sc_network::config::OnDemand<Block>>>
-), ServiceError> {
-	let telemetry = config.telemetry_endpoints.clone()
+) -> Result<
+	(
+		TaskManager,
+		RpcHandlers,
+		Arc<LightClient>,
+		Arc<NetworkService<Block, <Block as BlockT>::Hash>>,
+		Arc<
+			sc_transaction_pool::LightPool<Block, LightClient, sc_network::config::OnDemand<Block>>,
+		>,
+	),
+	ServiceError,
+> {
+	let telemetry = config
+		.telemetry_endpoints
+		.clone()
 		.filter(|x| !x.is_empty())
 		.map(|endpoints| -> Result<_, sc_telemetry::Error> {
 			#[cfg(feature = "browser")]
-			let transport = Some(
-				sc_telemetry::ExtTransport::new(libp2p_wasm_ext::ffi::websocket_transport())
-			);
+			let transport = Some(sc_telemetry::ExtTransport::new(libp2p_wasm_ext::ffi::websocket_transport()));
 			#[cfg(not(feature = "browser"))]
 			let transport = None;
 
@@ -459,11 +454,10 @@ pub fn new_light_base(
 			telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()),
 		)?;
 
-	let mut telemetry = telemetry
-		.map(|(worker, telemetry)| {
-			task_manager.spawn_handle().spawn("telemetry", worker.run());
-			telemetry
-		});
+	let mut telemetry = telemetry.map(|(worker, telemetry)| {
+		task_manager.spawn_handle().spawn("telemetry", worker.run());
+		telemetry
+	});
 
 	config.network.extra_sets.push(grandpa::grandpa_peers_set_config());
 
@@ -567,71 +561,60 @@ pub fn new_light_base(
 
 	let rpc_extensions = node_rpc::create_light(light_deps);
 
-	let rpc_handlers =
-		sc_service::spawn_tasks(sc_service::SpawnTasksParams {
-			on_demand: Some(on_demand),
-			remote_blockchain: Some(backend.remote_blockchain()),
-			rpc_extensions_builder: Box::new(sc_service::NoopRpcExtensionBuilder(rpc_extensions)),
-			client: client.clone(),
-			transaction_pool: transaction_pool.clone(),
-			keystore: keystore_container.sync_keystore(),
-			config, backend, system_rpc_tx,
-			network: network.clone(),
-			task_manager: &mut task_manager,
-			telemetry: telemetry.as_mut(),
-		})?;
+	let rpc_handlers = sc_service::spawn_tasks(sc_service::SpawnTasksParams {
+		on_demand: Some(on_demand),
+		remote_blockchain: Some(backend.remote_blockchain()),
+		rpc_extensions_builder: Box::new(sc_service::NoopRpcExtensionBuilder(rpc_extensions)),
+		client: client.clone(),
+		transaction_pool: transaction_pool.clone(),
+		keystore: keystore_container.sync_keystore(),
+		config,
+		backend,
+		system_rpc_tx,
+		network: network.clone(),
+		task_manager: &mut task_manager,
+		telemetry: telemetry.as_mut(),
+	})?;
 
 	network_starter.start_network();
-	Ok((
-		task_manager,
-		rpc_handlers,
-		client,
-		network,
-		transaction_pool,
-	))
+	Ok((task_manager, rpc_handlers, client, network, transaction_pool))
 }
 
 /// Builds a new service for a light client.
-pub fn new_light(
-	config: Configuration,
-) -> Result<TaskManager, ServiceError> {
-	new_light_base(config).map(|(task_manager, _, _, _, _)| {
-		task_manager
-	})
+pub fn new_light(config: Configuration) -> Result<TaskManager, ServiceError> {
+	new_light_base(config).map(|(task_manager, _, _, _, _)| task_manager)
 }
 
 #[cfg(test)]
 mod tests {
-	use std::{sync::Arc, borrow::Cow, convert::TryInto};
-	use sc_consensus_babe::{CompatibleDigestItem, BabeIntermediate, INTERMEDIATE_KEY};
+	use crate::service::{new_full_base, new_light_base, NewFullBase};
+	use codec::Encode;
+	use node_primitives::{Block, DigestItem, Signature};
+	use node_runtime::{
+		constants::{currency::CENTS, time::SLOT_DURATION},
+		Address, BalancesCall, Call, UncheckedExtrinsic,
+	};
+	use sc_client_api::BlockBackend;
+	use sc_consensus_babe::{BabeIntermediate, CompatibleDigestItem, INTERMEDIATE_KEY};
 	use sc_consensus_epochs::descendent_query;
+	use sc_keystore::LocalKeystore;
+	use sc_service_test::TestNetNode;
+	use sc_transaction_pool_api::{ChainEvent, MaintainedTransactionPool};
 	use sp_consensus::{
-		Environment, Proposer, BlockImportParams, BlockOrigin, ForkChoiceStrategy, BlockImport,
-	};
-	use node_primitives::{Block, DigestItem, Signature};
-	use node_runtime::{BalancesCall, Call, UncheckedExtrinsic, Address};
-	use node_runtime::constants::{currency::CENTS, time::SLOT_DURATION};
-	use codec::Encode;
-	use sp_core::{
-		crypto::Pair as CryptoPair,
-		H256,
-		Public
+		BlockImport, BlockImportParams, BlockOrigin, Environment, ForkChoiceStrategy, Proposer,
 	};
-	use sp_keystore::{SyncCryptoStorePtr, SyncCryptoStore};
+	use sp_core::{crypto::Pair as CryptoPair, Public, H256};
+	use sp_inherents::InherentDataProvider;
+	use sp_keyring::AccountKeyring;
+	use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr};
 	use sp_runtime::{
-		generic::{BlockId, Era, Digest, SignedPayload},
-		traits::{Block as BlockT, Header as HeaderT},
-		traits::Verify,
+		generic::{BlockId, Digest, Era, SignedPayload},
+		key_types::BABE,
+		traits::{Block as BlockT, Header as HeaderT, IdentifyAccount, Verify},
+		RuntimeAppPublic,
 	};
 	use sp_timestamp;
-	use sp_keyring::AccountKeyring;
-	use sc_service_test::TestNetNode;
-	use crate::service::{new_full_base, new_light_base, NewFullBase};
-	use sp_runtime::{key_types::BABE, traits::IdentifyAccount, RuntimeAppPublic};
-	use sc_transaction_pool_api::{MaintainedTransactionPool, ChainEvent};
-	use sc_client_api::BlockBackend;
-	use sc_keystore::LocalKeystore;
-	use sp_inherents::InherentDataProvider;
+	use std::{borrow::Cow, convert::TryInto, sync::Arc};
 
 	type AccountPublic = <Signature as Verify>::Signer;
 
@@ -641,10 +624,12 @@ mod tests {
 	#[ignore]
 	fn test_sync() {
 		let keystore_path = tempfile::tempdir().expect("Creates keystore path");
-		let keystore: SyncCryptoStorePtr = Arc::new(LocalKeystore::open(keystore_path.path(), None)
-			.expect("Creates keystore"));
-		let alice: sp_consensus_babe::AuthorityId = SyncCryptoStore::sr25519_generate_new(&*keystore, BABE, Some("//Alice"))
-			.expect("Creates authority pair").into();
+		let keystore: SyncCryptoStorePtr =
+			Arc::new(LocalKeystore::open(keystore_path.path(), None).expect("Creates keystore"));
+		let alice: sp_consensus_babe::AuthorityId =
+			SyncCryptoStore::sr25519_generate_new(&*keystore, BABE, Some("//Alice"))
+				.expect("Creates authority pair")
+				.into();
 
 		let chain_spec = crate::chain_spec::tests::integration_test_config_with_single_authority();
 
@@ -660,25 +645,31 @@ mod tests {
 			chain_spec,
 			|config| {
 				let mut setup_handles = None;
-				let NewFullBase {
-					task_manager, client, network, transaction_pool, ..
-				} = new_full_base(config,
-					|
-						block_import: &sc_consensus_babe::BabeBlockImport<Block, _, _>,
-						babe_link: &sc_consensus_babe::BabeLink<Block>,
-					| {
-						setup_handles = Some((block_import.clone(), babe_link.clone()));
-					}
-				)?;
+				let NewFullBase { task_manager, client, network, transaction_pool, .. } =
+					new_full_base(
+						config,
+						|block_import: &sc_consensus_babe::BabeBlockImport<Block, _, _>,
+						 babe_link: &sc_consensus_babe::BabeLink<Block>| {
+							setup_handles = Some((block_import.clone(), babe_link.clone()));
+						},
+					)?;
 
 				let node = sc_service_test::TestNetComponents::new(
-					task_manager, client, network, transaction_pool
+					task_manager,
+					client,
+					network,
+					transaction_pool,
 				);
 				Ok((node, setup_handles.unwrap()))
 			},
 			|config| {
 				let (keep_alive, _, client, network, transaction_pool) = new_light_base(config)?;
-				Ok(sc_service_test::TestNetComponents::new(keep_alive, client, network, transaction_pool))
+				Ok(sc_service_test::TestNetComponents::new(
+					keep_alive,
+					client,
+					network,
+					transaction_pool,
+				))
 			},
 			|service, &mut (ref mut block_import, ref babe_link)| {
 				let parent_id = BlockId::number(service.client().chain_info().best_number);
@@ -686,14 +677,9 @@ mod tests {
 				let parent_hash = parent_header.hash();
 				let parent_number = *parent_header.number();
 
-				futures::executor::block_on(
-					service.transaction_pool().maintain(
-						ChainEvent::NewBestBlock {
-							hash: parent_header.hash(),
-							tree_route: None,
-						},
-					)
-				);
+				futures::executor::block_on(service.transaction_pool().maintain(
+					ChainEvent::NewBestBlock { hash: parent_header.hash(), tree_route: None },
+				));
 
 				let mut proposer_factory = sc_basic_authorship::ProposerFactory::new(
 					service.spawn_handle(),
@@ -708,23 +694,30 @@ mod tests {
 				// even though there's only one authority some slots might be empty,
 				// so we must keep trying the next slots until we can claim one.
 				let (babe_pre_digest, epoch_descriptor) = loop {
-					let epoch_descriptor = babe_link.epoch_changes().shared_data().epoch_descriptor_for_child_of(
-						descendent_query(&*service.client()),
-						&parent_hash,
-						parent_number,
-						slot.into(),
-					).unwrap().unwrap();
-
-					let epoch = babe_link.epoch_changes().shared_data().epoch_data(
-						&epoch_descriptor,
-						|slot| sc_consensus_babe::Epoch::genesis(&babe_link.config(), slot),
-					).unwrap();
-
-					if let Some(babe_pre_digest) = sc_consensus_babe::authorship::claim_slot(
-						slot.into(),
-						&epoch,
-						&keystore,
-					).map(|(digest, _)| digest) {
+					let epoch_descriptor = babe_link
+						.epoch_changes()
+						.shared_data()
+						.epoch_descriptor_for_child_of(
+							descendent_query(&*service.client()),
+							&parent_hash,
+							parent_number,
+							slot.into(),
+						)
+						.unwrap()
+						.unwrap();
+
+					let epoch = babe_link
+						.epoch_changes()
+						.shared_data()
+						.epoch_data(&epoch_descriptor, |slot| {
+							sc_consensus_babe::Epoch::genesis(&babe_link.config(), slot)
+						})
+						.unwrap();
+
+					if let Some(babe_pre_digest) =
+						sc_consensus_babe::authorship::claim_slot(slot.into(), &epoch, &keystore)
+							.map(|(digest, _)| digest)
+					{
 						break (babe_pre_digest, epoch_descriptor)
 					}
 
@@ -736,19 +729,21 @@ mod tests {
 						std::time::Duration::from_millis(SLOT_DURATION * slot).into(),
 					),
 					sp_consensus_babe::inherents::InherentDataProvider::new(slot.into()),
-				).create_inherent_data().expect("Creates inherent data");
+				)
+					.create_inherent_data()
+					.expect("Creates inherent data");
 
 				digest.push(<DigestItem as CompatibleDigestItem>::babe_pre_digest(babe_pre_digest));
 
 				let new_block = futures::executor::block_on(async move {
 					let proposer = proposer_factory.init(&parent_header).await;
-					proposer.unwrap().propose(
-						inherent_data,
-						digest,
-						std::time::Duration::from_secs(1),
-						None,
-					).await
-				}).expect("Error making test block").block;
+					proposer
+						.unwrap()
+						.propose(inherent_data, digest, std::time::Duration::from_secs(1), None)
+						.await
+				})
+				.expect("Error making test block")
+				.block;
 
 				let (new_header, new_body) = new_block.deconstruct();
 				let pre_hash = new_header.hash();
@@ -760,10 +755,12 @@ mod tests {
 					sp_consensus_babe::AuthorityId::ID,
 					&alice.to_public_crypto_pair(),
 					&to_sign,
-				).unwrap().unwrap().try_into().unwrap();
-				let item = <DigestItem as CompatibleDigestItem>::babe_seal(
-					signature,
-				);
+				)
+				.unwrap()
+				.unwrap()
+				.try_into()
+				.unwrap();
+				let item = <DigestItem as CompatibleDigestItem>::babe_seal(signature);
 				slot += 1;
 
 				let mut params = BlockImportParams::new(BlockOrigin::File, new_header);
@@ -811,19 +808,13 @@ mod tests {
 				let raw_payload = SignedPayload::from_raw(
 					function,
 					extra,
-					(spec_version, transaction_version, genesis_hash, genesis_hash, (), (), ())
+					(spec_version, transaction_version, genesis_hash, genesis_hash, (), (), ()),
 				);
-				let signature = raw_payload.using_encoded(|payload|	{
-					signer.sign(payload)
-				});
+				let signature = raw_payload.using_encoded(|payload| signer.sign(payload));
 				let (function, extra, _) = raw_payload.deconstruct();
 				index += 1;
-				UncheckedExtrinsic::new_signed(
-					function,
-					from.into(),
-					signature.into(),
-					extra,
-				).into()
+				UncheckedExtrinsic::new_signed(function, from.into(), signature.into(), extra)
+					.into()
 			},
 		);
 	}
@@ -834,18 +825,25 @@ mod tests {
 		sc_service_test::consensus(
 			crate::chain_spec::tests::integration_test_config_with_two_authorities(),
 			|config| {
-				let NewFullBase { task_manager, client, network, transaction_pool, .. }
-					= new_full_base(config,|_, _| ())?;
-				Ok(sc_service_test::TestNetComponents::new(task_manager, client, network, transaction_pool))
+				let NewFullBase { task_manager, client, network, transaction_pool, .. } =
+					new_full_base(config, |_, _| ())?;
+				Ok(sc_service_test::TestNetComponents::new(
+					task_manager,
+					client,
+					network,
+					transaction_pool,
+				))
 			},
 			|config| {
 				let (keep_alive, _, client, network, transaction_pool) = new_light_base(config)?;
-				Ok(sc_service_test::TestNetComponents::new(keep_alive, client, network, transaction_pool))
+				Ok(sc_service_test::TestNetComponents::new(
+					keep_alive,
+					client,
+					network,
+					transaction_pool,
+				))
 			},
-			vec![
-				"//Alice".into(),
-				"//Bob".into(),
-			],
+			vec!["//Alice".into(), "//Bob".into()],
 		)
 	}
 }
diff --git a/bin/node/cli/tests/common.rs b/bin/node/cli/tests/common.rs
index c3bb96555da5..50776202d79e 100644
--- a/bin/node/cli/tests/common.rs
+++ b/bin/node/cli/tests/common.rs
@@ -18,11 +18,18 @@
 
 #![cfg(unix)]
 
-use std::{process::{Child, ExitStatus}, thread, time::Duration, path::Path};
 use assert_cmd::cargo::cargo_bin;
-use std::{convert::TryInto, process::Command};
-use nix::sys::signal::{kill, Signal::SIGINT};
-use nix::unistd::Pid;
+use nix::{
+	sys::signal::{kill, Signal::SIGINT},
+	unistd::Pid,
+};
+use std::{
+	convert::TryInto,
+	path::Path,
+	process::{Child, Command, ExitStatus},
+	thread,
+	time::Duration,
+};
 
 /// Wait for the given `child` the given number of `secs`.
 ///
@@ -50,12 +57,7 @@ pub fn wait_for(child: &mut Child, secs: usize) -> Option<ExitStatus> {
 pub fn run_dev_node_for_a_while(base_path: &Path) {
 	let mut cmd = Command::new(cargo_bin("substrate"));
 
-	let mut cmd = cmd
-		.args(&["--dev"])
-		.arg("-d")
-		.arg(base_path)
-		.spawn()
-		.unwrap();
+	let mut cmd = cmd.args(&["--dev"]).arg("-d").arg(base_path).spawn().unwrap();
 
 	// Let it produce some blocks.
 	thread::sleep(Duration::from_secs(30));
diff --git a/bin/node/cli/tests/export_import_flow.rs b/bin/node/cli/tests/export_import_flow.rs
index 02fba49e834e..583445434d39 100644
--- a/bin/node/cli/tests/export_import_flow.rs
+++ b/bin/node/cli/tests/export_import_flow.rs
@@ -19,9 +19,9 @@
 #![cfg(unix)]
 
 use assert_cmd::cargo::cargo_bin;
-use std::{process::Command, fs, path::PathBuf};
-use tempfile::{tempdir, TempDir};
 use regex::Regex;
+use std::{fs, path::PathBuf, process::Command};
+use tempfile::{tempdir, TempDir};
 
 pub mod common;
 
@@ -63,26 +63,23 @@ impl<'a> ExportImportRevertExecutor<'a> {
 	fn new(
 		base_path: &'a TempDir,
 		exported_blocks_file: &'a PathBuf,
-		db_path: &'a PathBuf
+		db_path: &'a PathBuf,
 	) -> Self {
-		Self {
-			base_path,
-			exported_blocks_file,
-			db_path,
-			num_exported_blocks: None,
-		}
+		Self { base_path, exported_blocks_file, db_path, num_exported_blocks: None }
 	}
 
 	/// Helper method to run a command. Returns a string corresponding to what has been logged.
-	fn run_block_command(&self,
+	fn run_block_command(
+		&self,
 		sub_command: SubCommand,
 		format_opt: FormatOpt,
-		expected_to_fail: bool
+		expected_to_fail: bool,
 	) -> String {
 		let sub_command_str = sub_command.to_string();
 		// Adding "--binary" if need be.
 		let arguments: Vec<&str> = match format_opt {
-			FormatOpt::Binary => vec![&sub_command_str, "--dev", "--pruning", "archive", "--binary", "-d"],
+			FormatOpt::Binary =>
+				vec![&sub_command_str, "--dev", "--pruning", "archive", "--binary", "-d"],
 			FormatOpt::Json => vec![&sub_command_str, "--dev", "--pruning", "archive", "-d"],
 		};
 
@@ -94,7 +91,7 @@ impl<'a> ExportImportRevertExecutor<'a> {
 			SubCommand::ImportBlocks => {
 				tmp = tempdir().unwrap();
 				tmp.path()
-			}
+			},
 		};
 
 		// Running the command and capturing the output.
@@ -144,16 +141,13 @@ impl<'a> ExportImportRevertExecutor<'a> {
 		if !expected_to_fail {
 			// Using regex to find out how much block we imported,
 			// and what's the best current block.
-			let re = Regex::new(r"Imported (?P<imported>\d*) blocks. Best: #(?P<best>\d*)").unwrap();
+			let re =
+				Regex::new(r"Imported (?P<imported>\d*) blocks. Best: #(?P<best>\d*)").unwrap();
 			let caps = re.captures(&log).expect("capture should have succeeded");
 			let imported = caps["imported"].parse::<u64>().unwrap();
 			let best = caps["best"].parse::<u64>().unwrap();
 
-			assert_eq!(
-				imported,
-				best,
-				"numbers of blocks imported and best number differs"
-			);
+			assert_eq!(imported, best, "numbers of blocks imported and best number differs");
 			assert_eq!(
 				best,
 				self.num_exported_blocks.expect("number of exported blocks cannot be None; qed"),
@@ -195,11 +189,7 @@ fn export_import_revert() {
 
 	common::run_dev_node_for_a_while(base_path.path());
 
-	let mut executor = ExportImportRevertExecutor::new(
-		&base_path,
-		&exported_blocks_file,
-		&db_path,
-	);
+	let mut executor = ExportImportRevertExecutor::new(&base_path, &exported_blocks_file, &db_path);
 
 	// Binary and binary should work.
 	executor.run(FormatOpt::Binary, FormatOpt::Binary, false);
diff --git a/bin/node/cli/tests/running_the_node_and_interrupt.rs b/bin/node/cli/tests/running_the_node_and_interrupt.rs
index 05eb9a7027b7..7a945a30a416 100644
--- a/bin/node/cli/tests/running_the_node_and_interrupt.rs
+++ b/bin/node/cli/tests/running_the_node_and_interrupt.rs
@@ -25,8 +25,13 @@ pub mod common;
 #[test]
 #[cfg(unix)]
 fn running_the_node_works_and_can_be_interrupted() {
-	use nix::sys::signal::{kill, Signal::{self, SIGINT, SIGTERM}};
-	use nix::unistd::Pid;
+	use nix::{
+		sys::signal::{
+			kill,
+			Signal::{self, SIGINT, SIGTERM},
+		},
+		unistd::Pid,
+	};
 
 	fn run_command_and_kill(signal: Signal) {
 		let base_path = tempdir().expect("could not create a temp dir");
diff --git a/bin/node/cli/tests/telemetry.rs b/bin/node/cli/tests/telemetry.rs
index 0b90f56a0399..78a306284c4a 100644
--- a/bin/node/cli/tests/telemetry.rs
+++ b/bin/node/cli/tests/telemetry.rs
@@ -17,10 +17,11 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use assert_cmd::cargo::cargo_bin;
-use nix::sys::signal::{kill, Signal::SIGINT};
-use nix::unistd::Pid;
-use std::convert::TryInto;
-use std::process;
+use nix::{
+	sys::signal::{kill, Signal::SIGINT},
+	unistd::Pid,
+};
+use std::{convert::TryInto, process};
 
 pub mod common;
 pub mod websocket_server;
@@ -45,27 +46,22 @@ async fn telemetry_works() {
 				Event::ConnectionOpen { address } => {
 					println!("New connection from {:?}", address);
 					server.accept();
-				}
+				},
 
 				// Received a message from a connection.
 				Event::BinaryFrame { message, .. } => {
 					let json: serde_json::Value = serde_json::from_slice(&message).unwrap();
-					let object = json
-						.as_object()
-						.unwrap()
-						.get("payload")
-						.unwrap()
-						.as_object()
-						.unwrap();
+					let object =
+						json.as_object().unwrap().get("payload").unwrap().as_object().unwrap();
 					if matches!(object.get("best"), Some(serde_json::Value::String(_))) {
-						break;
+						break
 					}
-				}
+				},
 
 				Event::TextFrame { .. } => panic!("Got a TextFrame over the socket, this is a bug"),
 
 				// Connection has been closed.
-				Event::ConnectionError { .. } => {}
+				Event::ConnectionError { .. } => {},
 			}
 		}
 	});
@@ -83,16 +79,11 @@ async fn telemetry_works() {
 
 	server_task.await;
 
-	assert!(
-		substrate.try_wait().unwrap().is_none(),
-		"the process should still be running"
-	);
+	assert!(substrate.try_wait().unwrap().is_none(), "the process should still be running");
 
 	// Stop the process
 	kill(Pid::from_raw(substrate.id().try_into().unwrap()), SIGINT).unwrap();
-	assert!(common::wait_for(&mut substrate, 40)
-		.map(|x| x.success())
-		.unwrap_or_default());
+	assert!(common::wait_for(&mut substrate, 40).map(|x| x.success()).unwrap_or_default());
 
 	let output = substrate.wait_with_output().unwrap();
 
diff --git a/bin/node/cli/tests/temp_base_path_works.rs b/bin/node/cli/tests/temp_base_path_works.rs
index 0152ddb464dc..c107740b9b0a 100644
--- a/bin/node/cli/tests/temp_base_path_works.rs
+++ b/bin/node/cli/tests/temp_base_path_works.rs
@@ -19,15 +19,19 @@
 #![cfg(unix)]
 
 use assert_cmd::cargo::cargo_bin;
-use nix::sys::signal::{kill, Signal::SIGINT};
-use nix::unistd::Pid;
+use nix::{
+	sys::signal::{kill, Signal::SIGINT},
+	unistd::Pid,
+};
 use regex::Regex;
-use std::convert::TryInto;
-use std::io::Read;
-use std::path::PathBuf;
-use std::process::{Command, Stdio};
-use std::thread;
-use std::time::Duration;
+use std::{
+	convert::TryInto,
+	io::Read,
+	path::PathBuf,
+	process::{Command, Stdio},
+	thread,
+	time::Duration,
+};
 
 pub mod common;
 
@@ -44,29 +48,18 @@ fn temp_base_path_works() {
 
 	// Let it produce some blocks.
 	thread::sleep(Duration::from_secs(30));
-	assert!(
-		cmd.try_wait().unwrap().is_none(),
-		"the process should still be running"
-	);
+	assert!(cmd.try_wait().unwrap().is_none(), "the process should still be running");
 
 	// Stop the process
 	kill(Pid::from_raw(cmd.id().try_into().unwrap()), SIGINT).unwrap();
-	assert!(common::wait_for(&mut cmd, 40)
-		.map(|x| x.success())
-		.unwrap_or_default());
+	assert!(common::wait_for(&mut cmd, 40).map(|x| x.success()).unwrap_or_default());
 
 	// Ensure the database has been deleted
 	let mut stderr = String::new();
 	cmd.stderr.unwrap().read_to_string(&mut stderr).unwrap();
 	let re = Regex::new(r"Database: .+ at (\S+)").unwrap();
-	let db_path = PathBuf::from(
-		re.captures(stderr.as_str())
-			.unwrap()
-			.get(1)
-			.unwrap()
-			.as_str()
-			.to_string(),
-	);
+	let db_path =
+		PathBuf::from(re.captures(stderr.as_str()).unwrap().get(1).unwrap().as_str().to_string());
 
 	assert!(!db_path.exists());
 }
diff --git a/bin/node/cli/tests/version.rs b/bin/node/cli/tests/version.rs
index 38e4b1fbda72..5ed3a9a8800c 100644
--- a/bin/node/cli/tests/version.rs
+++ b/bin/node/cli/tests/version.rs
@@ -22,61 +22,45 @@ use regex::Regex;
 use std::process::Command;
 
 fn expected_regex() -> Regex {
-	Regex::new(r"^substrate (\d+\.\d+\.\d+(?:-.+?)?)-([a-f\d]+|unknown)-(.+?)-(.+?)(?:-(.+))?$").unwrap()
+	Regex::new(r"^substrate (\d+\.\d+\.\d+(?:-.+?)?)-([a-f\d]+|unknown)-(.+?)-(.+?)(?:-(.+))?$")
+		.unwrap()
 }
 
 #[test]
 fn version_is_full() {
 	let expected = expected_regex();
-	let output = Command::new(cargo_bin("substrate"))
-		.args(&["--version"])
-		.output()
-		.unwrap();
+	let output = Command::new(cargo_bin("substrate")).args(&["--version"]).output().unwrap();
 
-	assert!(
-		output.status.success(),
-		"command returned with non-success exit code"
-	);
+	assert!(output.status.success(), "command returned with non-success exit code");
 
 	let output = String::from_utf8_lossy(&output.stdout).trim().to_owned();
-	let captures = expected
-		.captures(output.as_str())
-		.expect("could not parse version in output");
+	let captures = expected.captures(output.as_str()).expect("could not parse version in output");
 
 	assert_eq!(&captures[1], env!("CARGO_PKG_VERSION"));
 	assert_eq!(&captures[3], TARGET_ARCH.as_str());
 	assert_eq!(&captures[4], TARGET_OS.as_str());
-	assert_eq!(
-		captures.get(5).map(|x| x.as_str()),
-		TARGET_ENV.map(|x| x.as_str())
-	);
+	assert_eq!(captures.get(5).map(|x| x.as_str()), TARGET_ENV.map(|x| x.as_str()));
 }
 
 #[test]
 fn test_regex_matches_properly() {
 	let expected = expected_regex();
 
-	let captures = expected
-		.captures("substrate 2.0.0-da487d19d-x86_64-linux-gnu")
-		.unwrap();
+	let captures = expected.captures("substrate 2.0.0-da487d19d-x86_64-linux-gnu").unwrap();
 	assert_eq!(&captures[1], "2.0.0");
 	assert_eq!(&captures[2], "da487d19d");
 	assert_eq!(&captures[3], "x86_64");
 	assert_eq!(&captures[4], "linux");
 	assert_eq!(captures.get(5).map(|x| x.as_str()), Some("gnu"));
 
-	let captures = expected
-		.captures("substrate 2.0.0-alpha.5-da487d19d-x86_64-linux-gnu")
-		.unwrap();
+	let captures = expected.captures("substrate 2.0.0-alpha.5-da487d19d-x86_64-linux-gnu").unwrap();
 	assert_eq!(&captures[1], "2.0.0-alpha.5");
 	assert_eq!(&captures[2], "da487d19d");
 	assert_eq!(&captures[3], "x86_64");
 	assert_eq!(&captures[4], "linux");
 	assert_eq!(captures.get(5).map(|x| x.as_str()), Some("gnu"));
 
-	let captures = expected
-		.captures("substrate 2.0.0-alpha.5-da487d19d-x86_64-linux")
-		.unwrap();
+	let captures = expected.captures("substrate 2.0.0-alpha.5-da487d19d-x86_64-linux").unwrap();
 	assert_eq!(&captures[1], "2.0.0-alpha.5");
 	assert_eq!(&captures[2], "da487d19d");
 	assert_eq!(&captures[3], "x86_64");
diff --git a/bin/node/cli/tests/websocket_server.rs b/bin/node/cli/tests/websocket_server.rs
index a8af1c359952..658b8de46345 100644
--- a/bin/node/cli/tests/websocket_server.rs
+++ b/bin/node/cli/tests/websocket_server.rs
@@ -116,7 +116,6 @@ impl WsServer {
 	/// # Panic
 	///
 	/// Panics if no connection is pending.
-	///
 	pub fn accept(&mut self) {
 		let pending_incoming = self.pending_incoming.take().expect("no pending socket");
 
@@ -129,15 +128,10 @@ impl WsServer {
 			};
 
 			match server
-				.send_response(&{
-					Response::Accept {
-						key: &websocket_key,
-						protocol: None,
-					}
-				})
+				.send_response(&{ Response::Accept { key: &websocket_key, protocol: None } })
 				.await
 			{
-				Ok(()) => {}
+				Ok(()) => {},
 				Err(err) => return Err(Box::new(err) as Box<_>),
 			};
 
@@ -153,7 +147,6 @@ impl WsServer {
 	/// # Panic
 	///
 	/// Panics if no connection is pending.
-	///
 	pub fn reject(&mut self) {
 		let _ = self.pending_incoming.take().expect("no pending socket");
 	}
diff --git a/bin/node/executor/benches/bench.rs b/bin/node/executor/benches/bench.rs
index d21aedd1d184..8ac4b9015080 100644
--- a/bin/node/executor/benches/bench.rs
+++ b/bin/node/executor/benches/bench.rs
@@ -16,29 +16,33 @@
 // limitations under the License.
 
 use codec::{Decode, Encode};
-use criterion::{BatchSize, Criterion, criterion_group, criterion_main};
+use criterion::{criterion_group, criterion_main, BatchSize, Criterion};
+use frame_support::Hashable;
 use node_executor::Executor;
 use node_primitives::{BlockNumber, Hash};
 use node_runtime::{
-	Block, BuildStorage, Call, CheckedExtrinsic, GenesisConfig, Header, UncheckedExtrinsic,
+	constants::currency::*, Block, BuildStorage, Call, CheckedExtrinsic, GenesisConfig, Header,
+	UncheckedExtrinsic,
 };
-use node_runtime::constants::currency::*;
 use node_testing::keyring::*;
-use sp_core::{NativeOrEncoded, NeverNativeValue};
-use sp_core::storage::well_known_keys;
-use sp_core::traits::{CodeExecutor, RuntimeCode};
-use frame_support::Hashable;
-use sp_state_machine::TestExternalities as CoreTestExternalities;
-use sc_executor::{NativeExecutor, RuntimeInfo, WasmExecutionMethod, Externalities};
+use sc_executor::{Externalities, NativeExecutor, RuntimeInfo, WasmExecutionMethod};
+use sp_core::{
+	storage::well_known_keys,
+	traits::{CodeExecutor, RuntimeCode},
+	NativeOrEncoded, NeverNativeValue,
+};
 use sp_runtime::traits::BlakeTwo256;
+use sp_state_machine::TestExternalities as CoreTestExternalities;
 
 criterion_group!(benches, bench_execute_block);
 criterion_main!(benches);
 
 /// The wasm runtime code.
 pub fn compact_code_unwrap() -> &'static [u8] {
-	node_runtime::WASM_BINARY.expect("Development wasm binary is not available. \
-									  Testing is only supported with the flag disabled.")
+	node_runtime::WASM_BINARY.expect(
+		"Development wasm binary is not available. \
+									  Testing is only supported with the flag disabled.",
+	)
 }
 
 const GENESIS_HASH: [u8; 32] = [69u8; 32];
@@ -66,7 +70,9 @@ fn new_test_ext(genesis_config: &GenesisConfig) -> TestExternalities<BlakeTwo256
 		compact_code_unwrap(),
 		genesis_config.build_storage().unwrap(),
 	);
-	test_ext.ext().place_storage(well_known_keys::HEAP_PAGES.to_vec(), Some(HEAP_PAGES.encode()));
+	test_ext
+		.ext()
+		.place_storage(well_known_keys::HEAP_PAGES.to_vec(), Some(HEAP_PAGES.encode()));
 	test_ext
 }
 
@@ -77,16 +83,16 @@ fn construct_block<E: Externalities>(
 	parent_hash: Hash,
 	extrinsics: Vec<CheckedExtrinsic>,
 ) -> (Vec<u8>, Hash) {
-	use sp_trie::{TrieConfiguration, trie_types::Layout};
+	use sp_trie::{trie_types::Layout, TrieConfiguration};
 
 	// sign extrinsics.
 	let extrinsics = extrinsics.into_iter().map(sign).collect::<Vec<_>>();
 
 	// calculate the header fields that we can.
-	let extrinsics_root = Layout::<BlakeTwo256>::ordered_trie_root(
-		extrinsics.iter().map(Encode::encode)
-	).to_fixed_bytes()
-		.into();
+	let extrinsics_root =
+		Layout::<BlakeTwo256>::ordered_trie_root(extrinsics.iter().map(Encode::encode))
+			.to_fixed_bytes()
+			.into();
 
 	let header = Header {
 		parent_hash,
@@ -103,34 +109,44 @@ fn construct_block<E: Externalities>(
 	};
 
 	// execute the block to get the real header.
-	executor.call::<NeverNativeValue, fn() -> _>(
-		ext,
-		&runtime_code,
-		"Core_initialize_block",
-		&header.encode(),
-		true,
-		None,
-	).0.unwrap();
-
-	for i in extrinsics.iter() {
-		executor.call::<NeverNativeValue, fn() -> _>(
+	executor
+		.call::<NeverNativeValue, fn() -> _>(
 			ext,
 			&runtime_code,
-			"BlockBuilder_apply_extrinsic",
-			&i.encode(),
+			"Core_initialize_block",
+			&header.encode(),
 			true,
 			None,
-		).0.unwrap();
+		)
+		.0
+		.unwrap();
+
+	for i in extrinsics.iter() {
+		executor
+			.call::<NeverNativeValue, fn() -> _>(
+				ext,
+				&runtime_code,
+				"BlockBuilder_apply_extrinsic",
+				&i.encode(),
+				true,
+				None,
+			)
+			.0
+			.unwrap();
 	}
 
-	let header = match executor.call::<NeverNativeValue, fn() -> _>(
-		ext,
-		&runtime_code,
-		"BlockBuilder_finalize_block",
-		&[0u8;0],
-		true,
-		None,
-	).0.unwrap() {
+	let header = match executor
+		.call::<NeverNativeValue, fn() -> _>(
+			ext,
+			&runtime_code,
+			"BlockBuilder_finalize_block",
+			&[0u8; 0],
+			true,
+			None,
+		)
+		.0
+		.unwrap()
+	{
 		NativeOrEncoded::Native(_) => unreachable!(),
 		NativeOrEncoded::Encoded(h) => Header::decode(&mut &h[..]).unwrap(),
 	};
@@ -139,29 +155,21 @@ fn construct_block<E: Externalities>(
 	(Block { header, extrinsics }.encode(), hash.into())
 }
 
-fn test_blocks(genesis_config: &GenesisConfig, executor: &NativeExecutor<Executor>)
-	-> Vec<(Vec<u8>, Hash)>
-{
+fn test_blocks(
+	genesis_config: &GenesisConfig,
+	executor: &NativeExecutor<Executor>,
+) -> Vec<(Vec<u8>, Hash)> {
 	let mut test_ext = new_test_ext(genesis_config);
-	let mut block1_extrinsics = vec![
-		CheckedExtrinsic {
-			signed: None,
-			function: Call::Timestamp(pallet_timestamp::Call::set(0)),
-		},
-	];
-	block1_extrinsics.extend((0..20).map(|i| {
-		CheckedExtrinsic {
-			signed: Some((alice(), signed_extra(i, 0))),
-			function: Call::Balances(pallet_balances::Call::transfer(bob().into(), 1 * DOLLARS)),
-		}
+	let mut block1_extrinsics = vec![CheckedExtrinsic {
+		signed: None,
+		function: Call::Timestamp(pallet_timestamp::Call::set(0)),
+	}];
+	block1_extrinsics.extend((0..20).map(|i| CheckedExtrinsic {
+		signed: Some((alice(), signed_extra(i, 0))),
+		function: Call::Balances(pallet_balances::Call::transfer(bob().into(), 1 * DOLLARS)),
 	}));
-	let block1 = construct_block(
-		executor,
-		&mut test_ext.ext(),
-		1,
-		GENESIS_HASH.into(),
-		block1_extrinsics,
-	);
+	let block1 =
+		construct_block(executor, &mut test_ext.ext(), 1, GENESIS_HASH.into(), block1_extrinsics);
 
 	vec![block1]
 }
@@ -176,47 +184,47 @@ fn bench_execute_block(c: &mut Criterion) {
 	];
 
 	for strategy in execution_methods {
-		group.bench_function(
-			format!("{:?}", strategy),
-			|b| {
-				let genesis_config = node_testing::genesis::config(false, Some(compact_code_unwrap()));
-				let (use_native, wasm_method) = match strategy {
-					ExecutionMethod::Native => (true, WasmExecutionMethod::Interpreted),
-					ExecutionMethod::Wasm(wasm_method) => (false, wasm_method),
-				};
-
-				let executor = NativeExecutor::new(wasm_method, None, 8);
-				let runtime_code = RuntimeCode {
-					code_fetcher: &sp_core::traits::WrappedRuntimeCode(compact_code_unwrap().into()),
-					hash: vec![1, 2, 3],
-					heap_pages: None,
-				};
-
-				// Get the runtime version to initialize the runtimes cache.
-				{
-					let mut test_ext = new_test_ext(&genesis_config);
-					executor.runtime_version(&mut test_ext.ext(), &runtime_code).unwrap();
-				}
-
-				let blocks = test_blocks(&genesis_config, &executor);
-
-				b.iter_batched_ref(
-					|| new_test_ext(&genesis_config),
-					|test_ext| {
-						for block in blocks.iter() {
-							executor.call::<NeverNativeValue, fn() -> _>(
+		group.bench_function(format!("{:?}", strategy), |b| {
+			let genesis_config = node_testing::genesis::config(false, Some(compact_code_unwrap()));
+			let (use_native, wasm_method) = match strategy {
+				ExecutionMethod::Native => (true, WasmExecutionMethod::Interpreted),
+				ExecutionMethod::Wasm(wasm_method) => (false, wasm_method),
+			};
+
+			let executor = NativeExecutor::new(wasm_method, None, 8);
+			let runtime_code = RuntimeCode {
+				code_fetcher: &sp_core::traits::WrappedRuntimeCode(compact_code_unwrap().into()),
+				hash: vec![1, 2, 3],
+				heap_pages: None,
+			};
+
+			// Get the runtime version to initialize the runtimes cache.
+			{
+				let mut test_ext = new_test_ext(&genesis_config);
+				executor.runtime_version(&mut test_ext.ext(), &runtime_code).unwrap();
+			}
+
+			let blocks = test_blocks(&genesis_config, &executor);
+
+			b.iter_batched_ref(
+				|| new_test_ext(&genesis_config),
+				|test_ext| {
+					for block in blocks.iter() {
+						executor
+							.call::<NeverNativeValue, fn() -> _>(
 								&mut test_ext.ext(),
 								&runtime_code,
 								"Core_execute_block",
 								&block.0,
 								use_native,
 								None,
-							).0.unwrap();
-						}
-					},
-					BatchSize::LargeInput,
-				);
-			},
-		);
+							)
+							.0
+							.unwrap();
+					}
+				},
+				BatchSize::LargeInput,
+			);
+		});
 	}
 }
diff --git a/bin/node/executor/src/lib.rs b/bin/node/executor/src/lib.rs
index e7fb09a19c51..0f4bfcf2eee2 100644
--- a/bin/node/executor/src/lib.rs
+++ b/bin/node/executor/src/lib.rs
@@ -18,8 +18,8 @@
 //! A `CodeExecutor` specialization which uses natively compiled runtime when the wasm to be
 //! executed is equivalent to the natively compiled code.
 
-pub use sc_executor::NativeExecutor;
 use sc_executor::native_executor_instance;
+pub use sc_executor::NativeExecutor;
 
 // Declare an instance of the native executor named `Executor`. Include the wasm binary as the
 // equivalent wasm code.
diff --git a/bin/node/executor/tests/basic.rs b/bin/node/executor/tests/basic.rs
index 4e1736679590..f3beb93f598b 100644
--- a/bin/node/executor/tests/basic.rs
+++ b/bin/node/executor/tests/basic.rs
@@ -15,30 +15,28 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use codec::{Encode, Decode, Joiner};
+use codec::{Decode, Encode, Joiner};
 use frame_support::{
 	traits::Currency,
-	weights::{GetDispatchInfo, DispatchInfo, DispatchClass},
+	weights::{DispatchClass, DispatchInfo, GetDispatchInfo},
 };
-use sp_core::{NeverNativeValue, traits::Externalities, storage::well_known_keys};
+use frame_system::{self, AccountInfo, EventRecord, Phase};
+use sp_core::{storage::well_known_keys, traits::Externalities, NeverNativeValue};
 use sp_runtime::{
-	ApplyExtrinsicResult,
-	traits::Hash as HashT,
-	transaction_validity::InvalidTransaction,
+	traits::Hash as HashT, transaction_validity::InvalidTransaction, ApplyExtrinsicResult,
 };
-use frame_system::{self, EventRecord, Phase, AccountInfo};
 
+use node_primitives::{Balance, Hash};
 use node_runtime::{
-	Header, Block, UncheckedExtrinsic, CheckedExtrinsic, Call, Runtime, Balances,
-	System, TransactionPayment, Event,
-	constants::{time::SLOT_DURATION, currency::*},
+	constants::{currency::*, time::SLOT_DURATION},
+	Balances, Block, Call, CheckedExtrinsic, Event, Header, Runtime, System, TransactionPayment,
+	UncheckedExtrinsic,
 };
-use node_primitives::{Balance, Hash};
-use wat;
 use node_testing::keyring::*;
+use wat;
 
 pub mod common;
-use self::common::{*, sign};
+use self::common::{sign, *};
 
 /// The wasm runtime binary which hasn't undergone the compacting process.
 ///
@@ -46,8 +44,10 @@ use self::common::{*, sign};
 /// have to execute provided wasm code instead of the native equivalent. This trick is used to
 /// test code paths that differ between native and wasm versions.
 pub fn bloaty_code_unwrap() -> &'static [u8] {
-	node_runtime::WASM_BINARY_BLOATY.expect("Development wasm binary is not available. \
-											 Testing is only supported with the flag disabled.")
+	node_runtime::WASM_BINARY_BLOATY.expect(
+		"Development wasm binary is not available. \
+											 Testing is only supported with the flag disabled.",
+	)
 }
 
 /// Default transfer fee. This will use the same logic that is implemented in transaction-payment module.
@@ -87,7 +87,10 @@ fn changes_trie_block() -> (Vec<u8>, Hash) {
 			},
 			CheckedExtrinsic {
 				signed: Some((alice(), signed_extra(0, 0))),
-				function: Call::Balances(pallet_balances::Call::transfer(bob().into(), 69 * DOLLARS)),
+				function: Call::Balances(pallet_balances::Call::transfer(
+					bob().into(),
+					69 * DOLLARS,
+				)),
 			},
 		],
 		(time / SLOT_DURATION).into(),
@@ -111,7 +114,10 @@ fn blocks() -> ((Vec<u8>, Hash), (Vec<u8>, Hash)) {
 			},
 			CheckedExtrinsic {
 				signed: Some((alice(), signed_extra(0, 0))),
-				function: Call::Balances(pallet_balances::Call::transfer(bob().into(), 69 * DOLLARS)),
+				function: Call::Balances(pallet_balances::Call::transfer(
+					bob().into(),
+					69 * DOLLARS,
+				)),
 			},
 		],
 		(time1 / SLOT_DURATION).into(),
@@ -128,12 +134,18 @@ fn blocks() -> ((Vec<u8>, Hash), (Vec<u8>, Hash)) {
 			},
 			CheckedExtrinsic {
 				signed: Some((bob(), signed_extra(0, 0))),
-				function: Call::Balances(pallet_balances::Call::transfer(alice().into(), 5 * DOLLARS)),
+				function: Call::Balances(pallet_balances::Call::transfer(
+					alice().into(),
+					5 * DOLLARS,
+				)),
 			},
 			CheckedExtrinsic {
 				signed: Some((alice(), signed_extra(1, 0))),
-				function: Call::Balances(pallet_balances::Call::transfer(bob().into(), 15 * DOLLARS)),
-			}
+				function: Call::Balances(pallet_balances::Call::transfer(
+					bob().into(),
+					15 * DOLLARS,
+				)),
+			},
 		],
 		(time2 / SLOT_DURATION).into(),
 	);
@@ -158,7 +170,7 @@ fn block_with_size(time: u64, nonce: u32, size: usize) -> (Vec<u8>, Hash) {
 			CheckedExtrinsic {
 				signed: Some((alice(), signed_extra(nonce, 0))),
 				function: Call::System(frame_system::Call::remark(vec![0; size])),
-			}
+			},
 		],
 		(time * 1000 / SLOT_DURATION).into(),
 	)
@@ -169,7 +181,7 @@ fn panic_execution_with_foreign_code_gives_error() {
 	let mut t = new_test_ext(bloaty_code_unwrap(), false);
 	t.insert(
 		<frame_system::Account<Runtime>>::hashed_key_for(alice()),
-		(69u128, 0u32, 0u128, 0u128, 0u128).encode()
+		(69u128, 0u32, 0u128, 0u128, 0u128).encode(),
 	);
 	t.insert(<pallet_balances::TotalIssuance<Runtime>>::hashed_key().to_vec(), 69_u128.encode());
 	t.insert(<frame_system::BlockHash<Runtime>>::hashed_key_for(0), vec![0u8; 32]);
@@ -180,7 +192,8 @@ fn panic_execution_with_foreign_code_gives_error() {
 		&vec![].and(&from_block_number(1u32)),
 		true,
 		None,
-	).0;
+	)
+	.0;
 	assert!(r.is_ok());
 	let v = executor_call::<NeverNativeValue, fn() -> _>(
 		&mut t,
@@ -188,7 +201,9 @@ fn panic_execution_with_foreign_code_gives_error() {
 		&vec![].and(&xt()),
 		true,
 		None,
-	).0.unwrap();
+	)
+	.0
+	.unwrap();
 	let r = ApplyExtrinsicResult::decode(&mut &v.as_encoded()[..]).unwrap();
 	assert_eq!(r, Err(InvalidTransaction::Payment.into()));
 }
@@ -198,7 +213,7 @@ fn bad_extrinsic_with_native_equivalent_code_gives_error() {
 	let mut t = new_test_ext(compact_code_unwrap(), false);
 	t.insert(
 		<frame_system::Account<Runtime>>::hashed_key_for(alice()),
-		(0u32, 0u32, 0u32, 69u128, 0u128, 0u128, 0u128).encode()
+		(0u32, 0u32, 0u32, 69u128, 0u128, 0u128, 0u128).encode(),
 	);
 	t.insert(<pallet_balances::TotalIssuance<Runtime>>::hashed_key().to_vec(), 69_u128.encode());
 	t.insert(<frame_system::BlockHash<Runtime>>::hashed_key_for(0), vec![0u8; 32]);
@@ -209,7 +224,8 @@ fn bad_extrinsic_with_native_equivalent_code_gives_error() {
 		&vec![].and(&from_block_number(1u32)),
 		true,
 		None,
-	).0;
+	)
+	.0;
 	assert!(r.is_ok());
 	let v = executor_call::<NeverNativeValue, fn() -> _>(
 		&mut t,
@@ -217,7 +233,9 @@ fn bad_extrinsic_with_native_equivalent_code_gives_error() {
 		&vec![].and(&xt()),
 		true,
 		None,
-	).0.unwrap();
+	)
+	.0
+	.unwrap();
 	let r = ApplyExtrinsicResult::decode(&mut &v.as_encoded()[..]).unwrap();
 	assert_eq!(r, Err(InvalidTransaction::Payment.into()));
 }
@@ -229,19 +247,21 @@ fn successful_execution_with_native_equivalent_code_gives_ok() {
 		<frame_system::Account<Runtime>>::hashed_key_for(alice()),
 		AccountInfo::<<Runtime as frame_system::Config>::Index, _> {
 			data: (111 * DOLLARS, 0u128, 0u128, 0u128),
-			.. Default::default()
-		}.encode(),
+			..Default::default()
+		}
+		.encode(),
 	);
 	t.insert(
 		<frame_system::Account<Runtime>>::hashed_key_for(bob()),
 		AccountInfo::<<Runtime as frame_system::Config>::Index, _> {
 			data: (0 * DOLLARS, 0u128, 0u128, 0u128),
-			.. Default::default()
-		}.encode(),
+			..Default::default()
+		}
+		.encode(),
 	);
 	t.insert(
 		<pallet_balances::TotalIssuance<Runtime>>::hashed_key().to_vec(),
-		(111 * DOLLARS).encode()
+		(111 * DOLLARS).encode(),
 	);
 	t.insert(<frame_system::BlockHash<Runtime>>::hashed_key_for(0), vec![0u8; 32]);
 
@@ -251,7 +271,8 @@ fn successful_execution_with_native_equivalent_code_gives_ok() {
 		&vec![].and(&from_block_number(1u32)),
 		true,
 		None,
-	).0;
+	)
+	.0;
 	assert!(r.is_ok());
 
 	let fees = t.execute_with(|| transfer_fee(&xt()));
@@ -262,7 +283,8 @@ fn successful_execution_with_native_equivalent_code_gives_ok() {
 		&vec![].and(&xt()),
 		true,
 		None,
-	).0;
+	)
+	.0;
 	assert!(r.is_ok());
 
 	t.execute_with(|| {
@@ -278,19 +300,21 @@ fn successful_execution_with_foreign_code_gives_ok() {
 		<frame_system::Account<Runtime>>::hashed_key_for(alice()),
 		AccountInfo::<<Runtime as frame_system::Config>::Index, _> {
 			data: (111 * DOLLARS, 0u128, 0u128, 0u128),
-			.. Default::default()
-		}.encode(),
+			..Default::default()
+		}
+		.encode(),
 	);
 	t.insert(
 		<frame_system::Account<Runtime>>::hashed_key_for(bob()),
 		AccountInfo::<<Runtime as frame_system::Config>::Index, _> {
 			data: (0 * DOLLARS, 0u128, 0u128, 0u128),
-			.. Default::default()
-		}.encode(),
+			..Default::default()
+		}
+		.encode(),
 	);
 	t.insert(
 		<pallet_balances::TotalIssuance<Runtime>>::hashed_key().to_vec(),
-		(111 * DOLLARS).encode()
+		(111 * DOLLARS).encode(),
 	);
 	t.insert(<frame_system::BlockHash<Runtime>>::hashed_key_for(0), vec![0u8; 32]);
 
@@ -300,7 +324,8 @@ fn successful_execution_with_foreign_code_gives_ok() {
 		&vec![].and(&from_block_number(1u32)),
 		true,
 		None,
-	).0;
+	)
+	.0;
 	assert!(r.is_ok());
 
 	let fees = t.execute_with(|| transfer_fee(&xt()));
@@ -311,7 +336,8 @@ fn successful_execution_with_foreign_code_gives_ok() {
 		&vec![].and(&xt()),
 		true,
 		None,
-	).0;
+	)
+	.0;
 	assert!(r.is_ok());
 
 	t.execute_with(|| {
@@ -330,7 +356,9 @@ fn full_native_block_import_works() {
 	let mut fees = t.execute_with(|| transfer_fee(&xt()));
 
 	let transfer_weight = default_transfer_call().get_dispatch_info().weight;
-	let timestamp_weight = pallet_timestamp::Call::set::<Runtime>(Default::default()).get_dispatch_info().weight;
+	let timestamp_weight = pallet_timestamp::Call::set::<Runtime>(Default::default())
+		.get_dispatch_info()
+		.weight;
 
 	executor_call::<NeverNativeValue, fn() -> _>(
 		&mut t,
@@ -338,7 +366,9 @@ fn full_native_block_import_works() {
 		&block1.0,
 		true,
 		None,
-	).0.unwrap();
+	)
+	.0
+	.unwrap();
 
 	t.execute_with(|| {
 		assert_eq!(Balances::total_balance(&alice()), 42 * DOLLARS - fees);
@@ -347,9 +377,11 @@ fn full_native_block_import_works() {
 		let events = vec![
 			EventRecord {
 				phase: Phase::ApplyExtrinsic(0),
-				event: Event::System(frame_system::Event::ExtrinsicSuccess(
-					DispatchInfo { weight: timestamp_weight, class: DispatchClass::Mandatory, ..Default::default() }
-				)),
+				event: Event::System(frame_system::Event::ExtrinsicSuccess(DispatchInfo {
+					weight: timestamp_weight,
+					class: DispatchClass::Mandatory,
+					..Default::default()
+				})),
 				topics: vec![],
 			},
 			EventRecord {
@@ -368,9 +400,10 @@ fn full_native_block_import_works() {
 			},
 			EventRecord {
 				phase: Phase::ApplyExtrinsic(1),
-				event: Event::System(frame_system::Event::ExtrinsicSuccess(
-					DispatchInfo { weight: transfer_weight, ..Default::default() }
-				)),
+				event: Event::System(frame_system::Event::ExtrinsicSuccess(DispatchInfo {
+					weight: transfer_weight,
+					..Default::default()
+				})),
 				topics: vec![],
 			},
 		];
@@ -385,34 +418,33 @@ fn full_native_block_import_works() {
 		&block2.0,
 		true,
 		None,
-	).0.unwrap();
+	)
+	.0
+	.unwrap();
 
 	t.execute_with(|| {
 		assert_eq!(
 			Balances::total_balance(&alice()),
 			alice_last_known_balance - 10 * DOLLARS - fees,
 		);
-		assert_eq!(
-			Balances::total_balance(&bob()),
-			179 * DOLLARS - fees,
-		);
+		assert_eq!(Balances::total_balance(&bob()), 179 * DOLLARS - fees,);
 		let events = vec![
 			EventRecord {
 				phase: Phase::ApplyExtrinsic(0),
-				event: Event::System(frame_system::Event::ExtrinsicSuccess(
-					DispatchInfo { weight: timestamp_weight, class: DispatchClass::Mandatory, ..Default::default() }
-				)),
+				event: Event::System(frame_system::Event::ExtrinsicSuccess(DispatchInfo {
+					weight: timestamp_weight,
+					class: DispatchClass::Mandatory,
+					..Default::default()
+				})),
 				topics: vec![],
 			},
 			EventRecord {
 				phase: Phase::ApplyExtrinsic(1),
-				event: Event::Balances(
-					pallet_balances::Event::Transfer(
-						bob().into(),
-						alice().into(),
-						5 * DOLLARS,
-					)
-				),
+				event: Event::Balances(pallet_balances::Event::Transfer(
+					bob().into(),
+					alice().into(),
+					5 * DOLLARS,
+				)),
 				topics: vec![],
 			},
 			EventRecord {
@@ -422,20 +454,19 @@ fn full_native_block_import_works() {
 			},
 			EventRecord {
 				phase: Phase::ApplyExtrinsic(1),
-				event: Event::System(frame_system::Event::ExtrinsicSuccess(
-					DispatchInfo { weight: transfer_weight, ..Default::default() }
-				)),
+				event: Event::System(frame_system::Event::ExtrinsicSuccess(DispatchInfo {
+					weight: transfer_weight,
+					..Default::default()
+				})),
 				topics: vec![],
 			},
 			EventRecord {
 				phase: Phase::ApplyExtrinsic(2),
-				event: Event::Balances(
-					pallet_balances::Event::Transfer(
-						alice().into(),
-						bob().into(),
-						15 * DOLLARS,
-					)
-				),
+				event: Event::Balances(pallet_balances::Event::Transfer(
+					alice().into(),
+					bob().into(),
+					15 * DOLLARS,
+				)),
 				topics: vec![],
 			},
 			EventRecord {
@@ -445,9 +476,10 @@ fn full_native_block_import_works() {
 			},
 			EventRecord {
 				phase: Phase::ApplyExtrinsic(2),
-				event: Event::System(frame_system::Event::ExtrinsicSuccess(
-					DispatchInfo { weight: transfer_weight, ..Default::default() }
-				)),
+				event: Event::System(frame_system::Event::ExtrinsicSuccess(DispatchInfo {
+					weight: transfer_weight,
+					..Default::default()
+				})),
 				topics: vec![],
 			},
 		];
@@ -470,7 +502,9 @@ fn full_wasm_block_import_works() {
 		&block1.0,
 		false,
 		None,
-	).0.unwrap();
+	)
+	.0
+	.unwrap();
 
 	t.execute_with(|| {
 		assert_eq!(Balances::total_balance(&alice()), 42 * DOLLARS - fees);
@@ -486,17 +520,16 @@ fn full_wasm_block_import_works() {
 		&block2.0,
 		false,
 		None,
-	).0.unwrap();
+	)
+	.0
+	.unwrap();
 
 	t.execute_with(|| {
 		assert_eq!(
 			Balances::total_balance(&alice()),
 			alice_last_known_balance - 10 * DOLLARS - fees,
 		);
-		assert_eq!(
-			Balances::total_balance(&bob()),
-			179 * DOLLARS - 1 * fees,
-		);
+		assert_eq!(Balances::total_balance(&bob()), 179 * DOLLARS - 1 * fees,);
 	});
 }
 
@@ -600,11 +633,7 @@ fn deploying_wasm_contract_should_work() {
 	let transfer_code = wat::parse_str(CODE_TRANSFER).unwrap();
 	let transfer_ch = <Runtime as frame_system::Config>::Hashing::hash(&transfer_code);
 
-	let addr = pallet_contracts::Pallet::<Runtime>::contract_address(
-		&charlie(),
-		&transfer_ch,
-		&[],
-	);
+	let addr = pallet_contracts::Pallet::<Runtime>::contract_address(&charlie(), &transfer_ch, &[]);
 
 	let subsistence = pallet_contracts::Pallet::<Runtime>::subsistence_threshold();
 
@@ -627,19 +656,17 @@ fn deploying_wasm_contract_should_work() {
 						transfer_code,
 						Vec::new(),
 						Vec::new(),
-					)
+					),
 				),
 			},
 			CheckedExtrinsic {
 				signed: Some((charlie(), signed_extra(1, 0))),
-				function: Call::Contracts(
-					pallet_contracts::Call::call::<Runtime>(
-						sp_runtime::MultiAddress::Id(addr.clone()),
-						10,
-						500_000_000,
-						vec![0x00, 0x01, 0x02, 0x03]
-					)
-				),
+				function: Call::Contracts(pallet_contracts::Call::call::<Runtime>(
+					sp_runtime::MultiAddress::Id(addr.clone()),
+					10,
+					500_000_000,
+					vec![0x00, 0x01, 0x02, 0x03],
+				)),
 			},
 		],
 		(time / SLOT_DURATION).into(),
@@ -647,20 +674,14 @@ fn deploying_wasm_contract_should_work() {
 
 	let mut t = new_test_ext(compact_code_unwrap(), false);
 
-	executor_call::<NeverNativeValue, fn() -> _>(
-		&mut t,
-		"Core_execute_block",
-		&b.0,
-		false,
-		None,
-	).0.unwrap();
+	executor_call::<NeverNativeValue, fn() -> _>(&mut t, "Core_execute_block", &b.0, false, None)
+		.0
+		.unwrap();
 
 	t.execute_with(|| {
 		// Verify that the contract does exist by querying some of its storage items
 		// It does not matter that the storage item itself does not exist.
-		assert!(
-			&pallet_contracts::Pallet::<Runtime>::get_storage(addr, Default::default()).is_ok()
-		);
+		assert!(&pallet_contracts::Pallet::<Runtime>::get_storage(addr, Default::default()).is_ok());
 	});
 }
 
@@ -676,7 +697,8 @@ fn wasm_big_block_import_fails() {
 		&block_with_size(42, 0, 120_000).0,
 		false,
 		None,
-	).0;
+	)
+	.0;
 	assert!(result.is_err()); // Err(Wasmi(Trap(Trap { kind: Host(AllocatorOutOfSpace) })))
 }
 
@@ -690,7 +712,9 @@ fn native_big_block_import_succeeds() {
 		&block_with_size(42, 0, 120_000).0,
 		true,
 		None,
-	).0.unwrap();
+	)
+	.0
+	.unwrap();
 }
 
 #[test]
@@ -700,15 +724,15 @@ fn native_big_block_import_fails_on_fallback() {
 	// We set the heap pages to 8 because we know that should give an OOM in WASM with the given block.
 	set_heap_pages(&mut t.ext(), 8);
 
-	assert!(
-		executor_call::<NeverNativeValue, fn() -> _>(
-			&mut t,
-			"Core_execute_block",
-			&block_with_size(42, 0, 120_000).0,
-			false,
-			None,
-		).0.is_err()
-	);
+	assert!(executor_call::<NeverNativeValue, fn() -> _>(
+		&mut t,
+		"Core_execute_block",
+		&block_with_size(42, 0, 120_000).0,
+		false,
+		None,
+	)
+	.0
+	.is_err());
 }
 
 #[test]
@@ -718,8 +742,9 @@ fn panic_execution_gives_error() {
 		<frame_system::Account<Runtime>>::hashed_key_for(alice()),
 		AccountInfo::<<Runtime as frame_system::Config>::Index, _> {
 			data: (0 * DOLLARS, 0u128, 0u128, 0u128),
-			.. Default::default()
-		}.encode(),
+			..Default::default()
+		}
+		.encode(),
 	);
 	t.insert(<pallet_balances::TotalIssuance<Runtime>>::hashed_key().to_vec(), 0_u128.encode());
 	t.insert(<frame_system::BlockHash<Runtime>>::hashed_key_for(0), vec![0u8; 32]);
@@ -730,7 +755,8 @@ fn panic_execution_gives_error() {
 		&vec![].and(&from_block_number(1u32)),
 		false,
 		None,
-	).0;
+	)
+	.0;
 	assert!(r.is_ok());
 	let r = executor_call::<NeverNativeValue, fn() -> _>(
 		&mut t,
@@ -738,7 +764,10 @@ fn panic_execution_gives_error() {
 		&vec![].and(&xt()),
 		false,
 		None,
-	).0.unwrap().into_encoded();
+	)
+	.0
+	.unwrap()
+	.into_encoded();
 	let r = ApplyExtrinsicResult::decode(&mut &r[..]).unwrap();
 	assert_eq!(r, Err(InvalidTransaction::Payment.into()));
 }
@@ -750,19 +779,21 @@ fn successful_execution_gives_ok() {
 		<frame_system::Account<Runtime>>::hashed_key_for(alice()),
 		AccountInfo::<<Runtime as frame_system::Config>::Index, _> {
 			data: (111 * DOLLARS, 0u128, 0u128, 0u128),
-			.. Default::default()
-		}.encode(),
+			..Default::default()
+		}
+		.encode(),
 	);
 	t.insert(
 		<frame_system::Account<Runtime>>::hashed_key_for(bob()),
 		AccountInfo::<<Runtime as frame_system::Config>::Index, _> {
 			data: (0 * DOLLARS, 0u128, 0u128, 0u128),
-			.. Default::default()
-		}.encode(),
+			..Default::default()
+		}
+		.encode(),
 	);
 	t.insert(
 		<pallet_balances::TotalIssuance<Runtime>>::hashed_key().to_vec(),
-		(111 * DOLLARS).encode()
+		(111 * DOLLARS).encode(),
 	);
 	t.insert(<frame_system::BlockHash<Runtime>>::hashed_key_for(0), vec![0u8; 32]);
 
@@ -772,7 +803,8 @@ fn successful_execution_gives_ok() {
 		&vec![].and(&from_block_number(1u32)),
 		false,
 		None,
-	).0;
+	)
+	.0;
 	assert!(r.is_ok());
 	t.execute_with(|| {
 		assert_eq!(Balances::total_balance(&alice()), 111 * DOLLARS);
@@ -786,7 +818,10 @@ fn successful_execution_gives_ok() {
 		&vec![].and(&xt()),
 		false,
 		None,
-	).0.unwrap().into_encoded();
+	)
+	.0
+	.unwrap()
+	.into_encoded();
 	ApplyExtrinsicResult::decode(&mut &r[..])
 		.unwrap()
 		.expect("Extrinsic could not be applied")
@@ -811,7 +846,9 @@ fn full_native_block_import_works_with_changes_trie() {
 		&block.encode(),
 		true,
 		None,
-	).0.unwrap();
+	)
+	.0
+	.unwrap();
 
 	assert!(t.ext().storage_changes_root(&GENESIS_HASH).unwrap().is_some());
 }
@@ -827,7 +864,9 @@ fn full_wasm_block_import_works_with_changes_trie() {
 		&block1.0,
 		false,
 		None,
-	).0.unwrap();
+	)
+	.0
+	.unwrap();
 
 	assert!(t.ext().storage_changes_root(&GENESIS_HASH).unwrap().is_some());
 }
@@ -835,8 +874,7 @@ fn full_wasm_block_import_works_with_changes_trie() {
 #[test]
 fn should_import_block_with_test_client() {
 	use node_testing::client::{
-		ClientBlockImportExt, TestClientBuilderExt, TestClientBuilder,
-		sp_consensus::BlockOrigin,
+		sp_consensus::BlockOrigin, ClientBlockImportExt, TestClientBuilder, TestClientBuilderExt,
 	};
 
 	let mut client = TestClientBuilder::new().build();
diff --git a/bin/node/executor/tests/common.rs b/bin/node/executor/tests/common.rs
index 635155b5d00b..414b335406be 100644
--- a/bin/node/executor/tests/common.rs
+++ b/bin/node/executor/tests/common.rs
@@ -15,34 +15,32 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use codec::{Encode, Decode};
-use frame_system::offchain::AppCrypto;
+use codec::{Decode, Encode};
 use frame_support::Hashable;
-use sp_state_machine::TestExternalities as CoreTestExternalities;
-use sp_consensus_babe::{BABE_ENGINE_ID, Slot, digests::{PreDigest, SecondaryPlainPreDigest}};
+use frame_system::offchain::AppCrypto;
+use sc_executor::{error::Result, NativeExecutor, WasmExecutionMethod};
+use sp_consensus_babe::{
+	digests::{PreDigest, SecondaryPlainPreDigest},
+	Slot, BABE_ENGINE_ID,
+};
 use sp_core::{
-	NeverNativeValue, NativeOrEncoded,
 	crypto::KeyTypeId,
 	sr25519::Signature,
 	traits::{CodeExecutor, RuntimeCode},
+	NativeOrEncoded, NeverNativeValue,
 };
 use sp_runtime::{
-	ApplyExtrinsicResult,
-	MultiSigner,
-	MultiSignature,
-	Digest,
-	DigestItem,
-	traits::{Header as HeaderT, BlakeTwo256},
+	traits::{BlakeTwo256, Header as HeaderT},
+	ApplyExtrinsicResult, Digest, DigestItem, MultiSignature, MultiSigner,
 };
-use sc_executor::{NativeExecutor, WasmExecutionMethod};
-use sc_executor::error::Result;
+use sp_state_machine::TestExternalities as CoreTestExternalities;
 
 use node_executor::Executor;
+use node_primitives::{BlockNumber, Hash};
 use node_runtime::{
-	Header, Block, UncheckedExtrinsic, CheckedExtrinsic, Runtime, BuildStorage,
-	constants::currency::*,
+	constants::currency::*, Block, BuildStorage, CheckedExtrinsic, Header, Runtime,
+	UncheckedExtrinsic,
 };
-use node_primitives::{Hash, BlockNumber};
 use node_testing::keyring::*;
 use sp_externalities::Externalities;
 
@@ -50,8 +48,8 @@ pub const TEST_KEY_TYPE_ID: KeyTypeId = KeyTypeId(*b"test");
 
 pub mod sr25519 {
 	mod app_sr25519 {
-		use sp_application_crypto::{app_crypto, sr25519};
 		use super::super::TEST_KEY_TYPE_ID;
+		use sp_application_crypto::{app_crypto, sr25519};
 		app_crypto!(sr25519, TEST_KEY_TYPE_ID);
 	}
 
@@ -72,8 +70,10 @@ impl AppCrypto<MultiSigner, MultiSignature> for TestAuthorityId {
 /// as canonical. This is why `native_executor_instance` also uses the compact version of the
 /// runtime.
 pub fn compact_code_unwrap() -> &'static [u8] {
-	node_runtime::WASM_BINARY.expect("Development wasm binary is not available. \
-									  Testing is only supported with the flag disabled.")
+	node_runtime::WASM_BINARY.expect(
+		"Development wasm binary is not available. \
+									  Testing is only supported with the flag disabled.",
+	)
 }
 
 pub const GENESIS_HASH: [u8; 32] = [69u8; 32];
@@ -101,8 +101,9 @@ pub fn executor() -> NativeExecutor<Executor> {
 }
 
 pub fn executor_call<
-	R:Decode + Encode + PartialEq,
-	NC: FnOnce() -> std::result::Result<R, Box<dyn std::error::Error + Send + Sync>> + std::panic::UnwindSafe
+	R: Decode + Encode + PartialEq,
+	NC: FnOnce() -> std::result::Result<R, Box<dyn std::error::Error + Send + Sync>>
+		+ std::panic::UnwindSafe,
 >(
 	t: &mut TestExternalities<BlakeTwo256>,
 	method: &str,
@@ -120,20 +121,15 @@ pub fn executor_call<
 		heap_pages: heap_pages.and_then(|hp| Decode::decode(&mut &hp[..]).ok()),
 	};
 
-	executor().call::<R, NC>(
-		&mut t,
-		&runtime_code,
-		method,
-		data,
-		use_native,
-		native_call,
-	)
+	executor().call::<R, NC>(&mut t, &runtime_code, method, data, use_native, native_call)
 }
 
 pub fn new_test_ext(code: &[u8], support_changes_trie: bool) -> TestExternalities<BlakeTwo256> {
 	let mut ext = TestExternalities::new_with_code(
 		code,
-		node_testing::genesis::config(support_changes_trie, Some(code)).build_storage().unwrap(),
+		node_testing::genesis::config(support_changes_trie, Some(code))
+			.build_storage()
+			.unwrap(),
 	);
 	ext.changes_trie_storage().insert(0, GENESIS_HASH.into(), Default::default());
 	ext
@@ -150,7 +146,7 @@ pub fn construct_block(
 	extrinsics: Vec<CheckedExtrinsic>,
 	babe_slot: Slot,
 ) -> (Vec<u8>, Hash) {
-	use sp_trie::{TrieConfiguration, trie_types::Layout};
+	use sp_trie::{trie_types::Layout, TrieConfiguration};
 
 	// sign extrinsics.
 	let extrinsics = extrinsics.into_iter().map(sign).collect::<Vec<_>>();
@@ -167,15 +163,14 @@ pub fn construct_block(
 		extrinsics_root,
 		state_root: Default::default(),
 		digest: Digest {
-			logs: vec![
-				DigestItem::PreRuntime(
-					BABE_ENGINE_ID,
-					PreDigest::SecondaryPlain(SecondaryPlainPreDigest {
-						slot: babe_slot,
-						authority_index: 42,
-					}).encode()
-				),
-			],
+			logs: vec![DigestItem::PreRuntime(
+				BABE_ENGINE_ID,
+				PreDigest::SecondaryPlain(SecondaryPlainPreDigest {
+					slot: babe_slot,
+					authority_index: 42,
+				})
+				.encode(),
+			)],
 		},
 	};
 
@@ -186,7 +181,9 @@ pub fn construct_block(
 		&header.encode(),
 		true,
 		None,
-	).0.unwrap();
+	)
+	.0
+	.unwrap();
 
 	for extrinsic in extrinsics.iter() {
 		// Try to apply the `extrinsic`. It should be valid, in the sense that it passes
@@ -197,8 +194,13 @@ pub fn construct_block(
 			&extrinsic.encode(),
 			true,
 			None,
-		).0.expect("application of an extrinsic failed").into_encoded();
-		match ApplyExtrinsicResult::decode(&mut &r[..]).expect("apply result deserialization failed") {
+		)
+		.0
+		.expect("application of an extrinsic failed")
+		.into_encoded();
+		match ApplyExtrinsicResult::decode(&mut &r[..])
+			.expect("apply result deserialization failed")
+		{
 			Ok(_) => {},
 			Err(e) => panic!("Applying extrinsic failed: {:?}", e),
 		}
@@ -207,10 +209,13 @@ pub fn construct_block(
 	let header = match executor_call::<NeverNativeValue, fn() -> _>(
 		env,
 		"BlockBuilder_finalize_block",
-		&[0u8;0],
+		&[0u8; 0],
 		true,
 		None,
-	).0.unwrap() {
+	)
+	.0
+	.unwrap()
+	{
 		NativeOrEncoded::Native(_) => unreachable!(),
 		NativeOrEncoded::Encoded(h) => Header::decode(&mut &h[..]).unwrap(),
 	};
diff --git a/bin/node/executor/tests/fees.rs b/bin/node/executor/tests/fees.rs
index 5474adbd32a8..3bc9179da2b3 100644
--- a/bin/node/executor/tests/fees.rs
+++ b/bin/node/executor/tests/fees.rs
@@ -18,20 +18,21 @@
 use codec::{Encode, Joiner};
 use frame_support::{
 	traits::Currency,
-	weights::{GetDispatchInfo, constants::ExtrinsicBaseWeight, IdentityFee, WeightToFeePolynomial},
+	weights::{
+		constants::ExtrinsicBaseWeight, GetDispatchInfo, IdentityFee, WeightToFeePolynomial,
+	},
 };
-use sp_core::NeverNativeValue;
-use sp_runtime::{Perbill, traits::One};
+use node_primitives::Balance;
 use node_runtime::{
-	CheckedExtrinsic, Call, Runtime, Balances, TransactionPayment, Multiplier,
-	TransactionByteFee,
-	constants::{time::SLOT_DURATION, currency::*},
+	constants::{currency::*, time::SLOT_DURATION},
+	Balances, Call, CheckedExtrinsic, Multiplier, Runtime, TransactionByteFee, TransactionPayment,
 };
-use node_primitives::Balance;
 use node_testing::keyring::*;
+use sp_core::NeverNativeValue;
+use sp_runtime::{traits::One, Perbill};
 
 pub mod common;
-use self::common::{*, sign};
+use self::common::{sign, *};
 
 #[test]
 fn fee_multiplier_increases_and_decreases_on_big_weight() {
@@ -60,7 +61,7 @@ fn fee_multiplier_increases_and_decreases_on_big_weight() {
 			CheckedExtrinsic {
 				signed: Some((charlie(), signed_extra(0, 0))),
 				function: Call::System(frame_system::Call::fill_block(Perbill::from_percent(60))),
-			}
+			},
 		],
 		(time1 / SLOT_DURATION).into(),
 	);
@@ -79,7 +80,7 @@ fn fee_multiplier_increases_and_decreases_on_big_weight() {
 			CheckedExtrinsic {
 				signed: Some((charlie(), signed_extra(1, 0))),
 				function: Call::System(frame_system::Call::remark(vec![0; 1])),
-			}
+			},
 		],
 		(time2 / SLOT_DURATION).into(),
 	);
@@ -97,7 +98,9 @@ fn fee_multiplier_increases_and_decreases_on_big_weight() {
 		&block1.0,
 		true,
 		None,
-	).0.unwrap();
+	)
+	.0
+	.unwrap();
 
 	// weight multiplier is increased for next block.
 	t.execute_with(|| {
@@ -114,7 +117,9 @@ fn fee_multiplier_increases_and_decreases_on_big_weight() {
 		&block2.0,
 		true,
 		None,
-	).0.unwrap();
+	)
+	.0
+	.unwrap();
 
 	// weight multiplier is increased for next block.
 	t.execute_with(|| {
@@ -131,7 +136,8 @@ fn new_account_info(free_dollars: u128) -> Vec<u8> {
 		providers: 0,
 		sufficients: 0,
 		data: (free_dollars * DOLLARS, 0 * DOLLARS, 0 * DOLLARS, 0 * DOLLARS),
-	}.encode()
+	}
+	.encode()
 }
 
 #[test]
@@ -148,7 +154,7 @@ fn transaction_fee_is_correct() {
 	t.insert(<frame_system::Account<Runtime>>::hashed_key_for(bob()), new_account_info(10));
 	t.insert(
 		<pallet_balances::TotalIssuance<Runtime>>::hashed_key().to_vec(),
-		(110 * DOLLARS).encode()
+		(110 * DOLLARS).encode(),
 	);
 	t.insert(<frame_system::BlockHash<Runtime>>::hashed_key_for(0), vec![0u8; 32]);
 
@@ -164,7 +170,8 @@ fn transaction_fee_is_correct() {
 		&vec![].and(&from_block_number(1u32)),
 		true,
 		None,
-	).0;
+	)
+	.0;
 
 	assert!(r.is_ok());
 	let r = executor_call::<NeverNativeValue, fn() -> _>(
@@ -173,7 +180,8 @@ fn transaction_fee_is_correct() {
 		&vec![].and(&xt.clone()),
 		true,
 		None,
-	).0;
+	)
+	.0;
 	assert!(r.is_ok());
 
 	t.execute_with(|| {
@@ -228,15 +236,20 @@ fn block_weight_capacity_report() {
 
 	loop {
 		let num_transfers = block_number * factor;
-		let mut xts = (0..num_transfers).map(|i| CheckedExtrinsic {
-			signed: Some((charlie(), signed_extra(nonce + i as Index, 0))),
-			function: Call::Balances(pallet_balances::Call::transfer(bob().into(), 0)),
-		}).collect::<Vec<CheckedExtrinsic>>();
-
-		xts.insert(0, CheckedExtrinsic {
-			signed: None,
-			function: Call::Timestamp(pallet_timestamp::Call::set(time * 1000)),
-		});
+		let mut xts = (0..num_transfers)
+			.map(|i| CheckedExtrinsic {
+				signed: Some((charlie(), signed_extra(nonce + i as Index, 0))),
+				function: Call::Balances(pallet_balances::Call::transfer(bob().into(), 0)),
+			})
+			.collect::<Vec<CheckedExtrinsic>>();
+
+		xts.insert(
+			0,
+			CheckedExtrinsic {
+				signed: None,
+				function: Call::Timestamp(pallet_timestamp::Call::set(time * 1000)),
+			},
+		);
 
 		// NOTE: this is super slow. Can probably be improved.
 		let block = construct_block(
@@ -262,7 +275,8 @@ fn block_weight_capacity_report() {
 			&block.0,
 			true,
 			None,
-		).0;
+		)
+		.0;
 
 		println!(" || Result = {:?}", r);
 		assert!(r.is_ok());
@@ -307,7 +321,11 @@ fn block_length_capacity_report() {
 				},
 				CheckedExtrinsic {
 					signed: Some((charlie(), signed_extra(nonce, 0))),
-					function: Call::System(frame_system::Call::remark(vec![0u8; (block_number * factor) as usize])),
+					function: Call::System(frame_system::Call::remark(vec![
+						0u8;
+						(block_number * factor)
+							as usize
+					])),
 				},
 			],
 			(time * 1000 / SLOT_DURATION).into(),
@@ -327,7 +345,8 @@ fn block_length_capacity_report() {
 			&block.0,
 			true,
 			None,
-		).0;
+		)
+		.0;
 
 		println!(" || Result = {:?}", r);
 		assert!(r.is_ok());
diff --git a/bin/node/executor/tests/submit_transaction.rs b/bin/node/executor/tests/submit_transaction.rs
index 590bdac4db75..c83e48c8c933 100644
--- a/bin/node/executor/tests/submit_transaction.rs
+++ b/bin/node/executor/tests/submit_transaction.rs
@@ -15,26 +15,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::sync::Arc;
-use node_runtime::{
-	Executive, Indices, Runtime, UncheckedExtrinsic,
-};
-use sp_application_crypto::AppKey;
-use sp_core::{
-	offchain::{
-		TransactionPoolExt,
-		testing::TestTransactionPoolExt,
-	},
-};
-use sp_keystore::{KeystoreExt, SyncCryptoStore, testing::KeyStore};
-use frame_system::{
-	offchain::{
-		Signer,
-		SubmitTransaction,
-		SendSignedTransaction,
-	}
-};
 use codec::Decode;
+use frame_system::offchain::{SendSignedTransaction, Signer, SubmitTransaction};
+use node_runtime::{Executive, Indices, Runtime, UncheckedExtrinsic};
+use sp_application_crypto::AppKey;
+use sp_core::offchain::{testing::TestTransactionPoolExt, TransactionPoolExt};
+use sp_keystore::{testing::KeyStore, KeystoreExt, SyncCryptoStore};
+use std::sync::Arc;
 
 pub mod common;
 use self::common::*;
@@ -56,8 +43,10 @@ fn should_submit_unsigned_transaction() {
 		};
 
 		let call = pallet_im_online::Call::heartbeat(heartbeat_data, signature);
-		SubmitTransaction::<Runtime, pallet_im_online::Call<Runtime>>::submit_unsigned_transaction(call.into())
-			.unwrap();
+		SubmitTransaction::<Runtime, pallet_im_online::Call<Runtime>>::submit_unsigned_transaction(
+			call.into(),
+		)
+		.unwrap();
 
 		assert_eq!(state.read().transactions.len(), 1)
 	});
@@ -75,23 +64,26 @@ fn should_submit_signed_transaction() {
 	SyncCryptoStore::sr25519_generate_new(
 		&keystore,
 		sr25519::AuthorityId::ID,
-		Some(&format!("{}/hunter1", PHRASE))
-	).unwrap();
+		Some(&format!("{}/hunter1", PHRASE)),
+	)
+	.unwrap();
 	SyncCryptoStore::sr25519_generate_new(
 		&keystore,
 		sr25519::AuthorityId::ID,
-		Some(&format!("{}/hunter2", PHRASE))
-	).unwrap();
+		Some(&format!("{}/hunter2", PHRASE)),
+	)
+	.unwrap();
 	SyncCryptoStore::sr25519_generate_new(
 		&keystore,
 		sr25519::AuthorityId::ID,
-		Some(&format!("{}/hunter3", PHRASE))
-	).unwrap();
+		Some(&format!("{}/hunter3", PHRASE)),
+	)
+	.unwrap();
 	t.register_extension(KeystoreExt(Arc::new(keystore)));
 
 	t.execute_with(|| {
-		let results = Signer::<Runtime, TestAuthorityId>::all_accounts()
-			.send_signed_transaction(|_| {
+		let results =
+			Signer::<Runtime, TestAuthorityId>::all_accounts().send_signed_transaction(|_| {
 				pallet_balances::Call::transfer(Default::default(), Default::default())
 			});
 
@@ -112,18 +104,20 @@ fn should_submit_signed_twice_from_the_same_account() {
 	SyncCryptoStore::sr25519_generate_new(
 		&keystore,
 		sr25519::AuthorityId::ID,
-		Some(&format!("{}/hunter1", PHRASE))
-	).unwrap();
+		Some(&format!("{}/hunter1", PHRASE)),
+	)
+	.unwrap();
 	SyncCryptoStore::sr25519_generate_new(
 		&keystore,
 		sr25519::AuthorityId::ID,
-		Some(&format!("{}/hunter2", PHRASE))
-	).unwrap();
+		Some(&format!("{}/hunter2", PHRASE)),
+	)
+	.unwrap();
 	t.register_extension(KeystoreExt(Arc::new(keystore)));
 
 	t.execute_with(|| {
-		let result = Signer::<Runtime, TestAuthorityId>::any_account()
-			.send_signed_transaction(|_| {
+		let result =
+			Signer::<Runtime, TestAuthorityId>::any_account().send_signed_transaction(|_| {
 				pallet_balances::Call::transfer(Default::default(), Default::default())
 			});
 
@@ -131,8 +125,8 @@ fn should_submit_signed_twice_from_the_same_account() {
 		assert_eq!(state.read().transactions.len(), 1);
 
 		// submit another one from the same account. The nonce should be incremented.
-		let result = Signer::<Runtime, TestAuthorityId>::any_account()
-			.send_signed_transaction(|_| {
+		let result =
+			Signer::<Runtime, TestAuthorityId>::any_account().send_signed_transaction(|_| {
 				pallet_balances::Call::transfer(Default::default(), Default::default())
 			});
 
@@ -147,10 +141,7 @@ fn should_submit_signed_twice_from_the_same_account() {
 		}
 		let nonce1 = nonce(UncheckedExtrinsic::decode(&mut &*s.transactions[0]).unwrap());
 		let nonce2 = nonce(UncheckedExtrinsic::decode(&mut &*s.transactions[1]).unwrap());
-		assert!(
-			nonce1 != nonce2,
-			"Transactions should have different nonces. Got: {:?}", nonce1
-		);
+		assert!(nonce1 != nonce2, "Transactions should have different nonces. Got: {:?}", nonce1);
 	});
 }
 
@@ -161,14 +152,12 @@ fn should_submit_signed_twice_from_all_accounts() {
 	t.register_extension(TransactionPoolExt::new(pool));
 
 	let keystore = KeyStore::new();
-	keystore.sr25519_generate_new(
-		sr25519::AuthorityId::ID,
-		Some(&format!("{}/hunter1", PHRASE))
-	).unwrap();
-	keystore.sr25519_generate_new(
-		sr25519::AuthorityId::ID,
-		Some(&format!("{}/hunter2", PHRASE))
-	).unwrap();
+	keystore
+		.sr25519_generate_new(sr25519::AuthorityId::ID, Some(&format!("{}/hunter1", PHRASE)))
+		.unwrap();
+	keystore
+		.sr25519_generate_new(sr25519::AuthorityId::ID, Some(&format!("{}/hunter2", PHRASE)))
+		.unwrap();
 	t.register_extension(KeystoreExt(Arc::new(keystore)));
 
 	t.execute_with(|| {
@@ -217,8 +206,10 @@ fn should_submit_signed_twice_from_all_accounts() {
 #[test]
 fn submitted_transaction_should_be_valid() {
 	use codec::Encode;
-	use sp_runtime::transaction_validity::{TransactionSource, TransactionTag};
-	use sp_runtime::traits::StaticLookup;
+	use sp_runtime::{
+		traits::StaticLookup,
+		transaction_validity::{TransactionSource, TransactionTag},
+	};
 
 	let mut t = new_test_ext(compact_code_unwrap(), false);
 	let (pool, state) = TestTransactionPoolExt::new();
@@ -227,13 +218,15 @@ fn submitted_transaction_should_be_valid() {
 	let keystore = KeyStore::new();
 	SyncCryptoStore::sr25519_generate_new(
 		&keystore,
-		sr25519::AuthorityId::ID, Some(&format!("{}/hunter1", PHRASE))
-	).unwrap();
+		sr25519::AuthorityId::ID,
+		Some(&format!("{}/hunter1", PHRASE)),
+	)
+	.unwrap();
 	t.register_extension(KeystoreExt(Arc::new(keystore)));
 
 	t.execute_with(|| {
-		let results = Signer::<Runtime, TestAuthorityId>::all_accounts()
-			.send_signed_transaction(|_| {
+		let results =
+			Signer::<Runtime, TestAuthorityId>::all_accounts().send_signed_transaction(|_| {
 				pallet_balances::Call::transfer(Default::default(), Default::default())
 			});
 		let len = results.len();
@@ -252,7 +245,7 @@ fn submitted_transaction_should_be_valid() {
 		let author = extrinsic.signature.clone().unwrap().0;
 		let address = Indices::lookup(author).unwrap();
 		let data = pallet_balances::AccountData { free: 5_000_000_000_000, ..Default::default() };
-		let account = frame_system::AccountInfo { data, .. Default::default() };
+		let account = frame_system::AccountInfo { data, ..Default::default() };
 		<frame_system::Account<Runtime>>::insert(&address, account);
 
 		// check validity
@@ -260,7 +253,8 @@ fn submitted_transaction_should_be_valid() {
 			source,
 			extrinsic,
 			frame_system::BlockHash::<Runtime>::get(0),
-		).unwrap();
+		)
+		.unwrap();
 
 		// We ignore res.priority since this number can change based on updates to weights and such.
 		assert_eq!(res.requires, Vec::<TransactionTag>::new());
diff --git a/bin/node/inspect/src/cli.rs b/bin/node/inspect/src/cli.rs
index abdbedc296d0..c054fedaf57c 100644
--- a/bin/node/inspect/src/cli.rs
+++ b/bin/node/inspect/src/cli.rs
@@ -18,8 +18,8 @@
 
 //! Structs to easily compose inspect sub-command for CLI.
 
-use std::fmt::Debug;
 use sc_cli::{ImportParams, SharedParams};
+use std::fmt::Debug;
 use structopt::StructOpt;
 
 /// The `inspect` command used to print decoded chain data.
diff --git a/bin/node/inspect/src/command.rs b/bin/node/inspect/src/command.rs
index 9c14a71375f5..a2c63d684bf9 100644
--- a/bin/node/inspect/src/command.rs
+++ b/bin/node/inspect/src/command.rs
@@ -18,8 +18,10 @@
 
 //! Command ran by the CLI
 
-use crate::cli::{InspectCmd, InspectSubCmd};
-use crate::Inspector;
+use crate::{
+	cli::{InspectCmd, InspectSubCmd},
+	Inspector,
+};
 use sc_cli::{CliConfiguration, ImportParams, Result, SharedParams};
 use sc_service::{new_full_client, Configuration, NativeExecutionDispatch};
 use sp_runtime::traits::Block;
@@ -43,13 +45,13 @@ impl InspectCmd {
 				let res = inspect.block(input).map_err(|e| format!("{}", e))?;
 				println!("{}", res);
 				Ok(())
-			}
+			},
 			InspectSubCmd::Extrinsic { input } => {
 				let input = input.parse()?;
 				let res = inspect.extrinsic(input).map_err(|e| format!("{}", e))?;
 				println!("{}", res);
 				Ok(())
-			}
+			},
 		}
 	}
 }
diff --git a/bin/node/inspect/src/lib.rs b/bin/node/inspect/src/lib.rs
index 3abb9e9ff41e..30e7250ea2c6 100644
--- a/bin/node/inspect/src/lib.rs
+++ b/bin/node/inspect/src/lib.rs
@@ -27,33 +27,27 @@
 pub mod cli;
 pub mod command;
 
-use std::{
-	fmt,
-	fmt::Debug,
-	marker::PhantomData,
-	str::FromStr,
-};
-use codec::{Encode, Decode};
+use codec::{Decode, Encode};
 use sc_client_api::BlockBackend;
 use sp_blockchain::HeaderBackend;
 use sp_core::hexdisplay::HexDisplay;
 use sp_runtime::{
 	generic::BlockId,
-	traits::{Block, HashFor, NumberFor, Hash}
+	traits::{Block, Hash, HashFor, NumberFor},
 };
+use std::{fmt, fmt::Debug, marker::PhantomData, str::FromStr};
 
 /// A helper type for a generic block input.
-pub type BlockAddressFor<TBlock> = BlockAddress<
-	<HashFor<TBlock> as Hash>::Output,
-	NumberFor<TBlock>
->;
+pub type BlockAddressFor<TBlock> =
+	BlockAddress<<HashFor<TBlock> as Hash>::Output, NumberFor<TBlock>>;
 
 /// A Pretty formatter implementation.
 pub trait PrettyPrinter<TBlock: Block> {
 	/// Nicely format block.
 	fn fmt_block(&self, fmt: &mut fmt::Formatter, block: &TBlock) -> fmt::Result;
 	/// Nicely format extrinsic.
-	fn fmt_extrinsic(&self, fmt: &mut fmt::Formatter, extrinsic: &TBlock::Extrinsic) -> fmt::Result;
+	fn fmt_extrinsic(&self, fmt: &mut fmt::Formatter, extrinsic: &TBlock::Extrinsic)
+		-> fmt::Result;
 }
 
 /// Default dummy debug printer.
@@ -72,7 +66,11 @@ impl<TBlock: Block> PrettyPrinter<TBlock> for DebugPrinter {
 		Ok(())
 	}
 
-	fn fmt_extrinsic(&self, fmt: &mut fmt::Formatter, extrinsic: &TBlock::Extrinsic) -> fmt::Result {
+	fn fmt_extrinsic(
+		&self,
+		fmt: &mut fmt::Formatter,
+		extrinsic: &TBlock::Extrinsic,
+	) -> fmt::Result {
 		writeln!(fmt, " {:#?}", extrinsic)?;
 		writeln!(fmt, " Bytes: {:?}", HexDisplay::from(&extrinsic.encode()))?;
 		Ok(())
@@ -101,15 +99,14 @@ impl std::error::Error for Error {
 }
 
 /// A helper trait to access block headers and bodies.
-pub trait ChainAccess<TBlock: Block>:
-	HeaderBackend<TBlock> +
-	BlockBackend<TBlock>
-{}
+pub trait ChainAccess<TBlock: Block>: HeaderBackend<TBlock> + BlockBackend<TBlock> {}
 
-impl<T, TBlock> ChainAccess<TBlock> for T where
+impl<T, TBlock> ChainAccess<TBlock> for T
+where
 	TBlock: Block,
 	T: sp_blockchain::HeaderBackend<TBlock> + sc_client_api::BlockBackend<TBlock>,
-{}
+{
+}
 
 /// Blockchain inspector.
 pub struct Inspector<TBlock: Block, TPrinter: PrettyPrinter<TBlock> = DebugPrinter> {
@@ -120,22 +117,16 @@ pub struct Inspector<TBlock: Block, TPrinter: PrettyPrinter<TBlock> = DebugPrint
 
 impl<TBlock: Block, TPrinter: PrettyPrinter<TBlock>> Inspector<TBlock, TPrinter> {
 	/// Create new instance of the inspector with default printer.
-	pub fn new(
-		chain: impl ChainAccess<TBlock> + 'static,
-	) -> Self where TPrinter: Default {
+	pub fn new(chain: impl ChainAccess<TBlock> + 'static) -> Self
+	where
+		TPrinter: Default,
+	{
 		Self::with_printer(chain, Default::default())
 	}
 
 	/// Customize pretty-printing of the data.
-	pub fn with_printer(
-		chain: impl ChainAccess<TBlock> + 'static,
-		printer: TPrinter,
-	) -> Self {
-		Inspector {
-			chain: Box::new(chain) as _,
-			printer,
-			_block: Default::default(),
-		}
+	pub fn with_printer(chain: impl ChainAccess<TBlock> + 'static, printer: TPrinter) -> Self {
+		Inspector { chain: Box::new(chain) as _, printer, _block: Default::default() }
 	}
 
 	/// Get a pretty-printed block.
@@ -153,25 +144,27 @@ impl<TBlock: Block, TPrinter: PrettyPrinter<TBlock>> Inspector<TBlock, TPrinter>
 
 	fn get_block(&self, input: BlockAddressFor<TBlock>) -> Result<TBlock, Error> {
 		Ok(match input {
-			BlockAddress::Bytes(bytes) => {
-				TBlock::decode(&mut &*bytes)?
-			},
+			BlockAddress::Bytes(bytes) => TBlock::decode(&mut &*bytes)?,
 			BlockAddress::Number(number) => {
 				let id = BlockId::number(number);
 				let not_found = format!("Could not find block {:?}", id);
-				let body = self.chain.block_body(&id)?
-					.ok_or_else(|| Error::NotFound(not_found.clone()))?;
-				let header = self.chain.header(id)?
+				let body = self
+					.chain
+					.block_body(&id)?
 					.ok_or_else(|| Error::NotFound(not_found.clone()))?;
+				let header =
+					self.chain.header(id)?.ok_or_else(|| Error::NotFound(not_found.clone()))?;
 				TBlock::new(header, body)
 			},
 			BlockAddress::Hash(hash) => {
 				let id = BlockId::hash(hash);
 				let not_found = format!("Could not find block {:?}", id);
-				let body = self.chain.block_body(&id)?
-					.ok_or_else(|| Error::NotFound(not_found.clone()))?;
-				let header = self.chain.header(id)?
+				let body = self
+					.chain
+					.block_body(&id)?
 					.ok_or_else(|| Error::NotFound(not_found.clone()))?;
+				let header =
+					self.chain.header(id)?.ok_or_else(|| Error::NotFound(not_found.clone()))?;
 				TBlock::new(header, body)
 			},
 		})
@@ -192,16 +185,14 @@ impl<TBlock: Block, TPrinter: PrettyPrinter<TBlock>> Inspector<TBlock, TPrinter>
 		let ext = match input {
 			ExtrinsicAddress::Block(block, index) => {
 				let block = self.get_block(block)?;
-				block.extrinsics()
-					.get(index)
-					.cloned()
-					.ok_or_else(|| Error::NotFound(format!(
-						"Could not find extrinsic {} in block {:?}", index, block
-					)))?
+				block.extrinsics().get(index).cloned().ok_or_else(|| {
+					Error::NotFound(format!(
+						"Could not find extrinsic {} in block {:?}",
+						index, block
+					))
+				})?
 			},
-			ExtrinsicAddress::Bytes(bytes) => {
-				TBlock::Extrinsic::decode(&mut &*bytes)?
-			}
+			ExtrinsicAddress::Bytes(bytes) => TBlock::Extrinsic::decode(&mut &*bytes)?,
 		};
 
 		Ok(format!("{}", ExtrinsicPrinter(ext, &self.printer)))
@@ -234,12 +225,12 @@ impl<Hash: FromStr, Number: FromStr> FromStr for BlockAddress<Hash, Number> {
 		}
 
 		// then assume it's bytes (hex-encoded)
-		sp_core::bytes::from_hex(s)
-			.map(Self::Bytes)
-			.map_err(|e| format!(
+		sp_core::bytes::from_hex(s).map(Self::Bytes).map_err(|e| {
+			format!(
 				"Given string does not look like hash or number. It could not be parsed as bytes either: {}",
 				e
-			))
+			)
+		})
 	}
 }
 
@@ -263,11 +254,13 @@ impl<Hash: FromStr + Debug, Number: FromStr + Debug> FromStr for ExtrinsicAddres
 
 		// split by a bunch of different characters
 		let mut it = s.split(|c| c == '.' || c == ':' || c == ' ');
-		let block = it.next()
+		let block = it
+			.next()
 			.expect("First element of split iterator is never empty; qed")
 			.parse()?;
 
-		let index = it.next()
+		let index = it
+			.next()
 			.ok_or_else(|| format!("Extrinsic index missing: example \"5:0\""))?
 			.parse()
 			.map_err(|e| format!("Invalid index format: {}", e))?;
@@ -290,10 +283,10 @@ mod tests {
 		let b2 = BlockAddress::from_str("0");
 		let b3 = BlockAddress::from_str("0x0012345f");
 
-
-		assert_eq!(b0, Ok(BlockAddress::Hash(
-			"3BfC20f0B9aFcAcE800D73D2191166FF16540258".parse().unwrap()
-		)));
+		assert_eq!(
+			b0,
+			Ok(BlockAddress::Hash("3BfC20f0B9aFcAcE800D73D2191166FF16540258".parse().unwrap()))
+		);
 		assert_eq!(b1, Ok(BlockAddress::Number(1234)));
 		assert_eq!(b2, Ok(BlockAddress::Number(0)));
 		assert_eq!(b3, Ok(BlockAddress::Bytes(vec![0, 0x12, 0x34, 0x5f])));
@@ -310,20 +303,16 @@ mod tests {
 		let b2 = ExtrinsicAddress::from_str("0 0");
 		let b3 = ExtrinsicAddress::from_str("0x0012345f");
 
-
 		assert_eq!(e0, Err("Extrinsic index missing: example \"5:0\"".into()));
-		assert_eq!(b0, Ok(ExtrinsicAddress::Block(
-			BlockAddress::Hash("3BfC20f0B9aFcAcE800D73D2191166FF16540258".parse().unwrap()),
-			5
-		)));
-		assert_eq!(b1, Ok(ExtrinsicAddress::Block(
-			BlockAddress::Number(1234),
-			0
-		)));
-		assert_eq!(b2, Ok(ExtrinsicAddress::Block(
-			BlockAddress::Number(0),
-			0
-		)));
+		assert_eq!(
+			b0,
+			Ok(ExtrinsicAddress::Block(
+				BlockAddress::Hash("3BfC20f0B9aFcAcE800D73D2191166FF16540258".parse().unwrap()),
+				5
+			))
+		);
+		assert_eq!(b1, Ok(ExtrinsicAddress::Block(BlockAddress::Number(1234), 0)));
+		assert_eq!(b2, Ok(ExtrinsicAddress::Block(BlockAddress::Number(0), 0)));
 		assert_eq!(b3, Ok(ExtrinsicAddress::Bytes(vec![0, 0x12, 0x34, 0x5f])));
 	}
 }
diff --git a/bin/node/primitives/src/lib.rs b/bin/node/primitives/src/lib.rs
index 9470adc399f9..dade598c704d 100644
--- a/bin/node/primitives/src/lib.rs
+++ b/bin/node/primitives/src/lib.rs
@@ -18,11 +18,12 @@
 //! Low-level types used throughout the Substrate code.
 
 #![warn(missing_docs)]
-
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use sp_runtime::{
-	generic, traits::{Verify, BlakeTwo256, IdentifyAccount}, OpaqueExtrinsic, MultiSignature
+	generic,
+	traits::{BlakeTwo256, IdentifyAccount, Verify},
+	MultiSignature, OpaqueExtrinsic,
 };
 
 /// An index to a block.
diff --git a/bin/node/rpc-client/src/main.rs b/bin/node/rpc-client/src/main.rs
index ddd8a50ad36e..46e700a73911 100644
--- a/bin/node/rpc-client/src/main.rs
+++ b/bin/node/rpc-client/src/main.rs
@@ -24,15 +24,9 @@
 
 use futures::Future;
 use hyper::rt;
+use jsonrpc_core_client::{transports::http, RpcError};
 use node_primitives::Hash;
-use sc_rpc::author::{
-	AuthorClient,
-	hash::ExtrinsicOrHash,
-};
-use jsonrpc_core_client::{
-	transports::http,
-	RpcError,
-};
+use sc_rpc::author::{hash::ExtrinsicOrHash, AuthorClient};
 
 fn main() {
 	sp_tracing::try_init_simple();
@@ -41,9 +35,7 @@ fn main() {
 		let uri = "http://localhost:9933";
 
 		http::connect(uri)
-			.and_then(|client: AuthorClient<Hash, Hash>| {
-				remove_all_extrinsics(client)
-			})
+			.and_then(|client: AuthorClient<Hash, Hash>| remove_all_extrinsics(client))
 			.map_err(|e| {
 				println!("Error: {:?}", e);
 			})
@@ -58,11 +50,14 @@ fn main() {
 ///
 /// As the result of running the code the entire content of the transaction pool is going
 /// to be removed and the extrinsics are going to be temporarily banned.
-fn remove_all_extrinsics(client: AuthorClient<Hash, Hash>) -> impl Future<Item=(), Error=RpcError> {
-	client.pending_extrinsics()
+fn remove_all_extrinsics(
+	client: AuthorClient<Hash, Hash>,
+) -> impl Future<Item = (), Error = RpcError> {
+	client
+		.pending_extrinsics()
 		.and_then(move |pending| {
 			client.remove_extrinsic(
-				pending.into_iter().map(|tx| ExtrinsicOrHash::Extrinsic(tx.into())).collect()
+				pending.into_iter().map(|tx| ExtrinsicOrHash::Extrinsic(tx.into())).collect(),
 			)
 		})
 		.map(|removed| {
diff --git a/bin/node/rpc/src/lib.rs b/bin/node/rpc/src/lib.rs
index ba17bf7d2c50..1b326eda6c19 100644
--- a/bin/node/rpc/src/lib.rs
+++ b/bin/node/rpc/src/lib.rs
@@ -32,24 +32,24 @@
 
 use std::sync::Arc;
 
-use sp_keystore::SyncCryptoStorePtr;
-use node_primitives::{Block, BlockNumber, AccountId, Index, Balance, Hash};
+use node_primitives::{AccountId, Balance, Block, BlockNumber, Hash, Index};
+use sc_client_api::AuxStore;
 use sc_consensus_babe::{Config, Epoch};
 use sc_consensus_babe_rpc::BabeRpcHandler;
 use sc_consensus_epochs::SharedEpochChanges;
 use sc_finality_grandpa::{
-	SharedVoterState, SharedAuthoritySet, FinalityProofProvider, GrandpaJustificationStream
+	FinalityProofProvider, GrandpaJustificationStream, SharedAuthoritySet, SharedVoterState,
 };
 use sc_finality_grandpa_rpc::GrandpaRpcHandler;
+use sc_rpc::SubscriptionTaskExecutor;
 pub use sc_rpc_api::DenyUnsafe;
+use sc_transaction_pool_api::TransactionPool;
 use sp_api::ProvideRuntimeApi;
 use sp_block_builder::BlockBuilder;
-use sp_blockchain::{Error as BlockChainError, HeaderMetadata, HeaderBackend};
+use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
 use sp_consensus::SelectChain;
 use sp_consensus_babe::BabeApi;
-use sc_rpc::SubscriptionTaskExecutor;
-use sc_transaction_pool_api::TransactionPool;
-use sc_client_api::AuxStore;
+use sp_keystore::SyncCryptoStorePtr;
 
 /// Light client extra dependencies.
 pub struct LightDeps<C, F, P> {
@@ -111,9 +111,15 @@ pub type IoHandler = jsonrpc_core::IoHandler<sc_rpc::Metadata>;
 /// Instantiate all Full RPC extensions.
 pub fn create_full<C, P, SC, B>(
 	deps: FullDeps<C, P, SC, B>,
-) -> jsonrpc_core::IoHandler<sc_rpc_api::Metadata> where
-	C: ProvideRuntimeApi<Block> + HeaderBackend<Block> + AuxStore +
-		HeaderMetadata<Block, Error=BlockChainError> + Sync + Send + 'static,
+) -> jsonrpc_core::IoHandler<sc_rpc_api::Metadata>
+where
+	C: ProvideRuntimeApi<Block>
+		+ HeaderBackend<Block>
+		+ AuxStore
+		+ HeaderMetadata<Block, Error = BlockChainError>
+		+ Sync
+		+ Send
+		+ 'static,
 	C::Api: substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>,
 	C::Api: pallet_contracts_rpc::ContractsRuntimeApi<Block, AccountId, Balance, BlockNumber, Hash>,
 	C::Api: pallet_mmr_rpc::MmrRuntimeApi<Block, <Block as sp_runtime::traits::Block>::Hash>,
@@ -121,31 +127,19 @@ pub fn create_full<C, P, SC, B>(
 	C::Api: BabeApi<Block>,
 	C::Api: BlockBuilder<Block>,
 	P: TransactionPool + 'static,
-	SC: SelectChain<Block> +'static,
+	SC: SelectChain<Block> + 'static,
 	B: sc_client_api::Backend<Block> + Send + Sync + 'static,
 	B::State: sc_client_api::backend::StateBackend<sp_runtime::traits::HashFor<Block>>,
 {
-	use substrate_frame_rpc_system::{FullSystem, SystemApi};
 	use pallet_contracts_rpc::{Contracts, ContractsApi};
-	use pallet_mmr_rpc::{MmrApi, Mmr};
+	use pallet_mmr_rpc::{Mmr, MmrApi};
 	use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApi};
+	use substrate_frame_rpc_system::{FullSystem, SystemApi};
 
 	let mut io = jsonrpc_core::IoHandler::default();
-	let FullDeps {
-		client,
-		pool,
-		select_chain,
-		chain_spec,
-		deny_unsafe,
-		babe,
-		grandpa,
-	} = deps;
+	let FullDeps { client, pool, select_chain, chain_spec, deny_unsafe, babe, grandpa } = deps;
 
-	let BabeDeps {
-		keystore,
-		babe_config,
-		shared_epoch_changes,
-	} = babe;
+	let BabeDeps { keystore, babe_config, shared_epoch_changes } = babe;
 	let GrandpaDeps {
 		shared_voter_state,
 		shared_authority_set,
@@ -154,64 +148,45 @@ pub fn create_full<C, P, SC, B>(
 		finality_provider,
 	} = grandpa;
 
-	io.extend_with(
-		SystemApi::to_delegate(FullSystem::new(client.clone(), pool, deny_unsafe))
-	);
+	io.extend_with(SystemApi::to_delegate(FullSystem::new(client.clone(), pool, deny_unsafe)));
 	// Making synchronous calls in light client freezes the browser currently,
 	// more context: https://github.com/paritytech/substrate/pull/3480
 	// These RPCs should use an asynchronous caller instead.
-	io.extend_with(
-		ContractsApi::to_delegate(Contracts::new(client.clone()))
-	);
-	io.extend_with(
-		MmrApi::to_delegate(Mmr::new(client.clone()))
-	);
-	io.extend_with(
-		TransactionPaymentApi::to_delegate(TransactionPayment::new(client.clone()))
-	);
-	io.extend_with(
-		sc_consensus_babe_rpc::BabeApi::to_delegate(
-			BabeRpcHandler::new(
-				client.clone(),
-				shared_epoch_changes.clone(),
-				keystore,
-				babe_config,
-				select_chain,
-				deny_unsafe,
-			),
-		)
-	);
-	io.extend_with(
-		sc_finality_grandpa_rpc::GrandpaApi::to_delegate(
-			GrandpaRpcHandler::new(
-				shared_authority_set.clone(),
-				shared_voter_state,
-				justification_stream,
-				subscription_executor,
-				finality_provider,
-			)
-		)
-	);
-
-	io.extend_with(
-		sc_sync_state_rpc::SyncStateRpcApi::to_delegate(
-			sc_sync_state_rpc::SyncStateRpcHandler::new(
-				chain_spec,
-				client,
-				shared_authority_set,
-				shared_epoch_changes,
-				deny_unsafe,
-			)
-		)
-	);
+	io.extend_with(ContractsApi::to_delegate(Contracts::new(client.clone())));
+	io.extend_with(MmrApi::to_delegate(Mmr::new(client.clone())));
+	io.extend_with(TransactionPaymentApi::to_delegate(TransactionPayment::new(client.clone())));
+	io.extend_with(sc_consensus_babe_rpc::BabeApi::to_delegate(BabeRpcHandler::new(
+		client.clone(),
+		shared_epoch_changes.clone(),
+		keystore,
+		babe_config,
+		select_chain,
+		deny_unsafe,
+	)));
+	io.extend_with(sc_finality_grandpa_rpc::GrandpaApi::to_delegate(GrandpaRpcHandler::new(
+		shared_authority_set.clone(),
+		shared_voter_state,
+		justification_stream,
+		subscription_executor,
+		finality_provider,
+	)));
+
+	io.extend_with(sc_sync_state_rpc::SyncStateRpcApi::to_delegate(
+		sc_sync_state_rpc::SyncStateRpcHandler::new(
+			chain_spec,
+			client,
+			shared_authority_set,
+			shared_epoch_changes,
+			deny_unsafe,
+		),
+	));
 
 	io
 }
 
 /// Instantiate all Light RPC extensions.
-pub fn create_light<C, P, M, F>(
-	deps: LightDeps<C, F, P>,
-) -> jsonrpc_core::IoHandler<M> where
+pub fn create_light<C, P, M, F>(deps: LightDeps<C, F, P>) -> jsonrpc_core::IoHandler<M>
+where
 	C: sp_blockchain::HeaderBackend<Block>,
 	C: Send + Sync + 'static,
 	F: sc_client_api::light::Fetcher<Block> + 'static,
@@ -220,16 +195,14 @@ pub fn create_light<C, P, M, F>(
 {
 	use substrate_frame_rpc_system::{LightSystem, SystemApi};
 
-	let LightDeps {
+	let LightDeps { client, pool, remote_blockchain, fetcher } = deps;
+	let mut io = jsonrpc_core::IoHandler::default();
+	io.extend_with(SystemApi::<Hash, AccountId, Index>::to_delegate(LightSystem::new(
 		client,
-		pool,
 		remote_blockchain,
-		fetcher
-	} = deps;
-	let mut io = jsonrpc_core::IoHandler::default();
-	io.extend_with(
-		SystemApi::<Hash, AccountId, Index>::to_delegate(LightSystem::new(client, remote_blockchain, fetcher, pool))
-	);
+		fetcher,
+		pool,
+	)));
 
 	io
 }
diff --git a/bin/node/runtime/src/constants.rs b/bin/node/runtime/src/constants.rs
index 2f6ad002a928..7533025a70b0 100644
--- a/bin/node/runtime/src/constants.rs
+++ b/bin/node/runtime/src/constants.rs
@@ -22,7 +22,7 @@ pub mod currency {
 	use node_primitives::Balance;
 
 	pub const MILLICENTS: Balance = 1_000_000_000;
-	pub const CENTS: Balance = 1_000 * MILLICENTS;    // assume this is worth about a cent.
+	pub const CENTS: Balance = 1_000 * MILLICENTS; // assume this is worth about a cent.
 	pub const DOLLARS: Balance = 100 * CENTS;
 
 	pub const fn deposit(items: u32, bytes: u32) -> Balance {
@@ -32,7 +32,7 @@ pub mod currency {
 
 /// Time.
 pub mod time {
-	use node_primitives::{Moment, BlockNumber};
+	use node_primitives::{BlockNumber, Moment};
 
 	/// Since BABE is probabilistic this is the average expected block time that
 	/// we are targeting. Blocks will be produced at a minimum duration defined
diff --git a/bin/node/runtime/src/impls.rs b/bin/node/runtime/src/impls.rs
index d3d0541b6ec0..e315a45e698c 100644
--- a/bin/node/runtime/src/impls.rs
+++ b/bin/node/runtime/src/impls.rs
@@ -17,8 +17,8 @@
 
 //! Some configurable implementations as associated type for the substrate runtime.
 
-use frame_support::traits::{OnUnbalanced, Currency};
-use crate::{Balances, Authorship, NegativeImbalance};
+use crate::{Authorship, Balances, NegativeImbalance};
+use frame_support::traits::{Currency, OnUnbalanced};
 
 pub struct Author;
 impl OnUnbalanced<NegativeImbalance> for Author {
@@ -29,19 +29,24 @@ impl OnUnbalanced<NegativeImbalance> for Author {
 
 #[cfg(test)]
 mod multiplier_tests {
-	use sp_runtime::{assert_eq_error_rate, FixedPointNumber, traits::{Convert, One, Zero}};
 	use pallet_transaction_payment::{Multiplier, TargetedFeeAdjustment};
+	use sp_runtime::{
+		assert_eq_error_rate,
+		traits::{Convert, One, Zero},
+		FixedPointNumber,
+	};
 
 	use crate::{
 		constants::{currency::*, time::*},
-		TransactionPayment, Runtime, TargetBlockFullness,
-		AdjustmentVariable, System, MinimumMultiplier,
-		RuntimeBlockWeights as BlockWeights,
+		AdjustmentVariable, MinimumMultiplier, Runtime, RuntimeBlockWeights as BlockWeights,
+		System, TargetBlockFullness, TransactionPayment,
 	};
-	use frame_support::weights::{Weight, WeightToFeePolynomial, DispatchClass};
+	use frame_support::weights::{DispatchClass, Weight, WeightToFeePolynomial};
 
 	fn max_normal() -> Weight {
-		BlockWeights::get().get(DispatchClass::Normal).max_total
+		BlockWeights::get()
+			.get(DispatchClass::Normal)
+			.max_total
 			.unwrap_or_else(|| BlockWeights::get().max_block)
 	}
 
@@ -64,7 +69,7 @@ mod multiplier_tests {
 	}
 
 	// update based on reference impl.
-	fn truth_value_update(block_weight: Weight, previous: Multiplier) -> Multiplier  {
+	fn truth_value_update(block_weight: Weight, previous: Multiplier) -> Multiplier {
 		let accuracy = Multiplier::accuracy() as f64;
 		let previous_float = previous.into_inner() as f64 / accuracy;
 		// bump if it is zero.
@@ -81,15 +86,20 @@ mod multiplier_tests {
 		// Current saturation in terms of weight
 		let s = block_weight;
 
-		let t1 = v * (s/m - ss/m);
-		let t2 = v.powi(2) * (s/m - ss/m).powi(2) / 2.0;
+		let t1 = v * (s / m - ss / m);
+		let t2 = v.powi(2) * (s / m - ss / m).powi(2) / 2.0;
 		let next_float = previous_float * (1.0 + t1 + t2);
 		Multiplier::from_float(next_float)
 	}
 
-	fn run_with_system_weight<F>(w: Weight, assertions: F) where F: Fn() -> () {
-		let mut t: sp_io::TestExternalities =
-			frame_system::GenesisConfig::default().build_storage::<Runtime>().unwrap().into();
+	fn run_with_system_weight<F>(w: Weight, assertions: F)
+	where
+		F: Fn() -> (),
+	{
+		let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::default()
+			.build_storage::<Runtime>()
+			.unwrap()
+			.into();
 		t.execute_with(|| {
 			System::set_block_consumed_resources(w, 0);
 			assertions()
@@ -157,7 +167,9 @@ mod multiplier_tests {
 			loop {
 				let next = runtime_multiplier_update(fm);
 				fm = next;
-				if fm == min_multiplier() { break; }
+				if fm == min_multiplier() {
+					break
+				}
 				iterations += 1;
 			}
 			assert!(iterations > 533_333);
@@ -198,7 +210,9 @@ mod multiplier_tests {
 			loop {
 				let next = runtime_multiplier_update(fm);
 				// if no change, panic. This should never happen in this case.
-				if fm == next { panic!("The fee should ever increase"); }
+				if fm == next {
+					panic!("The fee should ever increase");
+				}
 				fm = next;
 				iterations += 1;
 				let fee =
@@ -225,7 +239,7 @@ mod multiplier_tests {
 			let next = runtime_multiplier_update(fm);
 			assert_eq_error_rate!(
 				next,
-				truth_value_update(target() / 4 , fm),
+				truth_value_update(target() / 4, fm),
 				Multiplier::from_inner(100),
 			);
 
@@ -237,12 +251,11 @@ mod multiplier_tests {
 			let next = runtime_multiplier_update(fm);
 			assert_eq_error_rate!(
 				next,
-				truth_value_update(target() / 2 , fm),
+				truth_value_update(target() / 2, fm),
 				Multiplier::from_inner(100),
 			);
 			// Light block. Multiplier is reduced a little.
 			assert!(next < fm);
-
 		});
 		run_with_system_weight(target(), || {
 			let next = runtime_multiplier_update(fm);
@@ -259,7 +272,7 @@ mod multiplier_tests {
 			let next = runtime_multiplier_update(fm);
 			assert_eq_error_rate!(
 				next,
-				truth_value_update(target() * 2 , fm),
+				truth_value_update(target() * 2, fm),
 				Multiplier::from_inner(100),
 			);
 
@@ -326,28 +339,24 @@ mod multiplier_tests {
 			BlockWeights::get().max_block,
 			Weight::max_value() / 2,
 			Weight::max_value(),
-		].into_iter().for_each(|i| {
+		]
+		.into_iter()
+		.for_each(|i| {
 			run_with_system_weight(i, || {
 				let next = runtime_multiplier_update(Multiplier::one());
 				let truth = truth_value_update(i, Multiplier::one());
-				assert_eq_error_rate!(
-					truth,
-					next,
-					Multiplier::from_inner(50_000_000)
-				);
+				assert_eq_error_rate!(truth, next, Multiplier::from_inner(50_000_000));
 			});
 		});
 
 		// Some values that are all above the target and will cause an increase.
 		let t = target();
-		vec![t + 100, t * 2, t * 4]
-			.into_iter()
-			.for_each(|i| {
-				run_with_system_weight(i, || {
-					let fm = runtime_multiplier_update(max_fm);
-					// won't grow. The convert saturates everything.
-					assert_eq!(fm, max_fm);
-				})
-			});
+		vec![t + 100, t * 2, t * 4].into_iter().for_each(|i| {
+			run_with_system_weight(i, || {
+				let fm = runtime_multiplier_update(max_fm);
+				// won't grow. The convert saturates everything.
+				assert_eq!(fm, max_fm);
+			})
+		});
 	}
 }
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 4c8f1a829870..82e3a9f7e084 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -22,67 +22,67 @@
 // `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.
 #![recursion_limit = "256"]
 
-
-use sp_std::prelude::*;
+use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::{
-	construct_runtime, parameter_types, RuntimeDebug,
+	construct_runtime, parameter_types,
+	traits::{
+		AllowAll, Currency, DenyAll, Imbalance, InstanceFilter, KeyOwnerProofSystem,
+		LockIdentifier, OnUnbalanced, U128CurrencyToVote,
+	},
 	weights::{
-		Weight, IdentityFee,
 		constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
-		DispatchClass,
-	},
-	traits::{
-		Currency, Imbalance, KeyOwnerProofSystem, OnUnbalanced, LockIdentifier,
-		U128CurrencyToVote, AllowAll, DenyAll,
+		DispatchClass, IdentityFee, Weight,
 	},
+	PalletId, RuntimeDebug,
 };
 use frame_system::{
-	EnsureRoot, EnsureOneOf,
-	limits::{BlockWeights, BlockLength}
+	limits::{BlockLength, BlockWeights},
+	EnsureOneOf, EnsureRoot,
+};
+pub use node_primitives::{AccountId, Signature};
+use node_primitives::{AccountIndex, Balance, BlockNumber, Hash, Index, Moment};
+use pallet_contracts::weights::WeightInfo;
+use pallet_election_provider_multi_phase::FallbackStrategy;
+use pallet_grandpa::{
+	fg_primitives, AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList,
 };
-use frame_support::{traits::InstanceFilter, PalletId};
-use codec::{Encode, Decode, MaxEncodedLen};
+use pallet_im_online::sr25519::AuthorityId as ImOnlineId;
+use pallet_session::historical as pallet_session_historical;
+pub use pallet_transaction_payment::{CurrencyAdapter, Multiplier, TargetedFeeAdjustment};
+use pallet_transaction_payment::{FeeDetails, RuntimeDispatchInfo};
+use sp_api::impl_runtime_apis;
+use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId;
 use sp_core::{
 	crypto::KeyTypeId,
 	u32_trait::{_1, _2, _3, _4, _5},
 	OpaqueMetadata,
 };
-pub use node_primitives::{AccountId, Signature};
-use node_primitives::{AccountIndex, Balance, BlockNumber, Hash, Index, Moment};
-use sp_api::impl_runtime_apis;
+use sp_inherents::{CheckInherentsResult, InherentData};
 use sp_runtime::{
-	Permill, Perbill, Perquintill, Percent, ApplyExtrinsicResult, impl_opaque_keys, generic,
-	create_runtime_str, FixedPointNumber,
-};
-use sp_runtime::curve::PiecewiseLinear;
-use sp_runtime::transaction_validity::{TransactionValidity, TransactionSource, TransactionPriority};
-use sp_runtime::traits::{
-	self, BlakeTwo256, Block as BlockT, StaticLookup, SaturatedConversion, ConvertInto, OpaqueKeys,
-	NumberFor,
+	create_runtime_str,
+	curve::PiecewiseLinear,
+	generic, impl_opaque_keys,
+	traits::{
+		self, BlakeTwo256, Block as BlockT, ConvertInto, NumberFor, OpaqueKeys,
+		SaturatedConversion, StaticLookup,
+	},
+	transaction_validity::{TransactionPriority, TransactionSource, TransactionValidity},
+	ApplyExtrinsicResult, FixedPointNumber, Perbill, Percent, Permill, Perquintill,
 };
-use sp_version::RuntimeVersion;
+use sp_std::prelude::*;
 #[cfg(any(feature = "std", test))]
 use sp_version::NativeVersion;
-use pallet_grandpa::{AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList};
-use pallet_grandpa::fg_primitives;
-use pallet_im_online::sr25519::AuthorityId as ImOnlineId;
-use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId;
-use pallet_transaction_payment::{FeeDetails, RuntimeDispatchInfo};
-pub use pallet_transaction_payment::{Multiplier, TargetedFeeAdjustment, CurrencyAdapter};
-use pallet_session::{historical as pallet_session_historical};
-use sp_inherents::{InherentData, CheckInherentsResult};
+use sp_version::RuntimeVersion;
 use static_assertions::const_assert;
-use pallet_contracts::weights::WeightInfo;
-use pallet_election_provider_multi_phase::FallbackStrategy;
 
 #[cfg(any(feature = "std", test))]
-pub use sp_runtime::BuildStorage;
+pub use frame_system::Call as SystemCall;
 #[cfg(any(feature = "std", test))]
 pub use pallet_balances::Call as BalancesCall;
 #[cfg(any(feature = "std", test))]
-pub use frame_system::Call as SystemCall;
-#[cfg(any(feature = "std", test))]
 pub use pallet_staking::StakerStatus;
+#[cfg(any(feature = "std", test))]
+pub use sp_runtime::BuildStorage;
 
 /// Implementations of some helper traits passed into runtime modules as associated types.
 pub mod impls;
@@ -90,7 +90,7 @@ use impls::Author;
 
 /// Constant values used within the runtime.
 pub mod constants;
-use constants::{time::*, currency::*};
+use constants::{currency::*, time::*};
 use sp_runtime::generic::Era;
 
 // Make the WASM binary available.
@@ -100,9 +100,11 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 /// Wasm binary unwrapped. If built with `SKIP_WASM_BUILD`, the function panics.
 #[cfg(feature = "std")]
 pub fn wasm_binary_unwrap() -> &'static [u8] {
-	WASM_BINARY.expect("Development wasm binary is not available. This means the client is \
+	WASM_BINARY.expect(
+		"Development wasm binary is not available. This means the client is \
 						built with `SKIP_WASM_BUILD` flag and it is only usable for \
-						production chains. Please rebuild with the flag disabled.")
+						production chains. Please rebuild with the flag disabled.",
+	)
 }
 
 /// Runtime version.
@@ -125,23 +127,20 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 pub const BABE_GENESIS_EPOCH_CONFIG: sp_consensus_babe::BabeEpochConfiguration =
 	sp_consensus_babe::BabeEpochConfiguration {
 		c: PRIMARY_PROBABILITY,
-		allowed_slots: sp_consensus_babe::AllowedSlots::PrimaryAndSecondaryPlainSlots
+		allowed_slots: sp_consensus_babe::AllowedSlots::PrimaryAndSecondaryPlainSlots,
 	};
 
 /// Native version.
 #[cfg(any(feature = "std", test))]
 pub fn native_version() -> NativeVersion {
-	NativeVersion {
-		runtime_version: VERSION,
-		can_author_with: Default::default(),
-	}
+	NativeVersion { runtime_version: VERSION, can_author_with: Default::default() }
 }
 
 type NegativeImbalance = <Balances as Currency<AccountId>>::NegativeImbalance;
 
 pub struct DealWithFees;
 impl OnUnbalanced<NegativeImbalance> for DealWithFees {
-	fn on_unbalanceds<B>(mut fees_then_tips: impl Iterator<Item=NegativeImbalance>) {
+	fn on_unbalanceds<B>(mut fees_then_tips: impl Iterator<Item = NegativeImbalance>) {
 		if let Some(fees) = fees_then_tips.next() {
 			// for fees, 80% to treasury, 20% to author
 			let mut split = fees.ration(80, 20);
@@ -256,14 +255,20 @@ parameter_types! {
 }
 
 /// The type used to represent the kinds of proxying allowed.
-#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, RuntimeDebug, MaxEncodedLen)]
+#[derive(
+	Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, RuntimeDebug, MaxEncodedLen,
+)]
 pub enum ProxyType {
 	Any,
 	NonTransfer,
 	Governance,
 	Staking,
 }
-impl Default for ProxyType { fn default() -> Self { Self::Any } }
+impl Default for ProxyType {
+	fn default() -> Self {
+		Self::Any
+	}
+}
 impl InstanceFilter<Call> for ProxyType {
 	fn filter(&self, c: &Call) -> bool {
 		match self {
@@ -271,19 +276,16 @@ impl InstanceFilter<Call> for ProxyType {
 			ProxyType::NonTransfer => !matches!(
 				c,
 				Call::Balances(..) |
-				Call::Assets(..) |
-				Call::Uniques(..) |
-				Call::Vesting(pallet_vesting::Call::vested_transfer(..)) |
-				Call::Indices(pallet_indices::Call::transfer(..))
+					Call::Assets(..) | Call::Uniques(..) |
+					Call::Vesting(pallet_vesting::Call::vested_transfer(..)) |
+					Call::Indices(pallet_indices::Call::transfer(..))
 			),
 			ProxyType::Governance => matches!(
 				c,
 				Call::Democracy(..) |
-				Call::Council(..) |
-				Call::Society(..) |
-				Call::TechnicalCommittee(..) |
-				Call::Elections(..) |
-				Call::Treasury(..)
+					Call::Council(..) | Call::Society(..) |
+					Call::TechnicalCommittee(..) |
+					Call::Elections(..) | Call::Treasury(..)
 			),
 			ProxyType::Staking => matches!(c, Call::Staking(..)),
 		}
@@ -500,15 +502,16 @@ impl pallet_staking::Config for Runtime {
 	type SlashCancelOrigin = EnsureOneOf<
 		AccountId,
 		EnsureRoot<AccountId>,
-		pallet_collective::EnsureProportionAtLeast<_3, _4, AccountId, CouncilCollective>
+		pallet_collective::EnsureProportionAtLeast<_3, _4, AccountId, CouncilCollective>,
 	>;
 	type SessionInterface = Self;
 	type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
 	type NextNewSession = Session;
 	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
 	type ElectionProvider = ElectionProviderMultiPhase;
-	type GenesisElectionProvider =
-		onchain::OnChainSequentialPhragmen<pallet_election_provider_multi_phase::OnChainConfig<Self>>;
+	type GenesisElectionProvider = onchain::OnChainSequentialPhragmen<
+		pallet_election_provider_multi_phase::OnChainConfig<Self>,
+	>;
 	type WeightInfo = pallet_staking::weights::SubstrateWeight<Runtime>;
 }
 
@@ -618,20 +621,26 @@ impl pallet_democracy::Config for Runtime {
 	type VotingPeriod = VotingPeriod;
 	type MinimumDeposit = MinimumDeposit;
 	/// A straight majority of the council can decide what their next motion is.
-	type ExternalOrigin = pallet_collective::EnsureProportionAtLeast<_1, _2, AccountId, CouncilCollective>;
+	type ExternalOrigin =
+		pallet_collective::EnsureProportionAtLeast<_1, _2, AccountId, CouncilCollective>;
 	/// A super-majority can have the next scheduled referendum be a straight majority-carries vote.
-	type ExternalMajorityOrigin = pallet_collective::EnsureProportionAtLeast<_3, _4, AccountId, CouncilCollective>;
+	type ExternalMajorityOrigin =
+		pallet_collective::EnsureProportionAtLeast<_3, _4, AccountId, CouncilCollective>;
 	/// A unanimous council can have the next scheduled referendum be a straight default-carries
 	/// (NTB) vote.
-	type ExternalDefaultOrigin = pallet_collective::EnsureProportionAtLeast<_1, _1, AccountId, CouncilCollective>;
+	type ExternalDefaultOrigin =
+		pallet_collective::EnsureProportionAtLeast<_1, _1, AccountId, CouncilCollective>;
 	/// Two thirds of the technical committee can have an ExternalMajority/ExternalDefault vote
 	/// be tabled immediately and with a shorter voting/enactment period.
-	type FastTrackOrigin = pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, TechnicalCollective>;
-	type InstantOrigin = pallet_collective::EnsureProportionAtLeast<_1, _1, AccountId, TechnicalCollective>;
+	type FastTrackOrigin =
+		pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, TechnicalCollective>;
+	type InstantOrigin =
+		pallet_collective::EnsureProportionAtLeast<_1, _1, AccountId, TechnicalCollective>;
 	type InstantAllowed = InstantAllowed;
 	type FastTrackVotingPeriod = FastTrackVotingPeriod;
 	// To cancel a proposal which has been passed, 2/3 of the council must agree to it.
-	type CancellationOrigin = pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, CouncilCollective>;
+	type CancellationOrigin =
+		pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, CouncilCollective>;
 	// To cancel a proposal before it has been passed, the technical committee must be unanimous or
 	// Root must agree.
 	type CancelProposalOrigin = EnsureOneOf<
@@ -728,7 +737,7 @@ impl pallet_collective::Config<TechnicalCollective> for Runtime {
 type EnsureRootOrHalfCouncil = EnsureOneOf<
 	AccountId,
 	EnsureRoot<AccountId>,
-	pallet_collective::EnsureProportionMoreThan<_1, _2, AccountId, CouncilCollective>
+	pallet_collective::EnsureProportionMoreThan<_1, _2, AccountId, CouncilCollective>,
 >;
 impl pallet_membership::Config<pallet_membership::Instance1> for Runtime {
 	type Event = Event;
@@ -768,12 +777,12 @@ impl pallet_treasury::Config for Runtime {
 	type ApproveOrigin = EnsureOneOf<
 		AccountId,
 		EnsureRoot<AccountId>,
-		pallet_collective::EnsureProportionAtLeast<_3, _5, AccountId, CouncilCollective>
+		pallet_collective::EnsureProportionAtLeast<_3, _5, AccountId, CouncilCollective>,
 	>;
 	type RejectOrigin = EnsureOneOf<
 		AccountId,
 		EnsureRoot<AccountId>,
-		pallet_collective::EnsureProportionMoreThan<_1, _2, AccountId, CouncilCollective>
+		pallet_collective::EnsureProportionMoreThan<_1, _2, AccountId, CouncilCollective>,
 	>;
 	type Event = Event;
 	type OnSlash = ();
@@ -876,8 +885,8 @@ parameter_types! {
 }
 
 impl<LocalCall> frame_system::offchain::CreateSignedTransaction<LocalCall> for Runtime
-	where
-		Call: From<LocalCall>,
+where
+	Call: From<LocalCall>,
 {
 	fn create_transaction<C: frame_system::offchain::AppCrypto<Self::Public, Self::Signature>>(
 		call: Call,
@@ -887,10 +896,8 @@ impl<LocalCall> frame_system::offchain::CreateSignedTransaction<LocalCall> for R
 	) -> Option<(Call, <UncheckedExtrinsic as traits::Extrinsic>::SignaturePayload)> {
 		let tip = 0;
 		// take the biggest period possible.
-		let period = BlockHashCount::get()
-			.checked_next_power_of_two()
-			.map(|c| c / 2)
-			.unwrap_or(2) as u64;
+		let period =
+			BlockHashCount::get().checked_next_power_of_two().map(|c| c / 2).unwrap_or(2) as u64;
 		let current_block = System::block_number()
 			.saturated_into::<u64>()
 			// The `System::block_number` is initialized with `n+1`,
@@ -911,10 +918,7 @@ impl<LocalCall> frame_system::offchain::CreateSignedTransaction<LocalCall> for R
 				log::warn!("Unable to create signed payload: {:?}", e);
 			})
 			.ok()?;
-		let signature = raw_payload
-			.using_encoded(|payload| {
-				C::sign(payload, public)
-			})?;
+		let signature = raw_payload.using_encoded(|payload| C::sign(payload, public))?;
 		let address = Indices::unlookup(account);
 		let (call, extra, _) = raw_payload.deconstruct();
 		Some((call, (address, signature.into(), extra)))
@@ -926,7 +930,8 @@ impl frame_system::offchain::SigningTypes for Runtime {
 	type Signature = Signature;
 }
 
-impl<C> frame_system::offchain::SendTransactionTypes<C> for Runtime where
+impl<C> frame_system::offchain::SendTransactionTypes<C> for Runtime
+where
 	Call: From<C>,
 {
 	type Extrinsic = UncheckedExtrinsic;
@@ -965,8 +970,11 @@ impl pallet_grandpa::Config for Runtime {
 		GrandpaId,
 	)>>::IdentificationTuple;
 
-	type HandleEquivocation =
-		pallet_grandpa::EquivocationHandler<Self::KeyOwnerIdentification, Offences, ReportLongevity>;
+	type HandleEquivocation = pallet_grandpa::EquivocationHandler<
+		Self::KeyOwnerIdentification,
+		Offences,
+		ReportLongevity,
+	>;
 
 	type WeightInfo = ();
 }
@@ -1036,7 +1044,8 @@ impl pallet_society::Config for Runtime {
 	type MembershipChanged = ();
 	type RotationPeriod = RotationPeriod;
 	type MaxLockDuration = MaxLockDuration;
-	type FounderSetOrigin = pallet_collective::EnsureProportionMoreThan<_1, _2, AccountId, CouncilCollective>;
+	type FounderSetOrigin =
+		pallet_collective::EnsureProportionMoreThan<_1, _2, AccountId, CouncilCollective>;
 	type SuspensionJudgementOrigin = pallet_society::EnsureFounder<Runtime>;
 	type MaxCandidateIntake = MaxCandidateIntake;
 	type ChallengePeriod = ChallengePeriod;
@@ -1261,11 +1270,7 @@ mod mmr {
 	use super::Runtime;
 	pub use pallet_mmr::primitives::*;
 
-	pub type Leaf = <
-		<Runtime as pallet_mmr::Config>::LeafData
-		as
-		LeafDataProvider
-	>::LeafData;
+	pub type Leaf = <<Runtime as pallet_mmr::Config>::LeafData as LeafDataProvider>::LeafData;
 	pub type Hash = <Runtime as pallet_mmr::Config>::Hash;
 	pub type Hashing = <Runtime as pallet_mmr::Config>::Hashing;
 }
@@ -1613,9 +1618,11 @@ mod tests {
 
 	#[test]
 	fn validate_transaction_submitter_bounds() {
-		fn is_submit_signed_transaction<T>() where
+		fn is_submit_signed_transaction<T>()
+		where
 			T: CreateSignedTransaction<Call>,
-		{}
+		{
+		}
 
 		is_submit_signed_transaction::<Runtime>();
 	}
diff --git a/bin/node/test-runner-example/src/lib.rs b/bin/node/test-runner-example/src/lib.rs
index 513c8a7d8b5c..f0b306db6b0c 100644
--- a/bin/node/test-runner-example/src/lib.rs
+++ b/bin/node/test-runner-example/src/lib.rs
@@ -19,12 +19,12 @@
 
 //! Basic example of end to end runtime tests.
 
-use test_runner::{ChainInfo, SignatureVerificationOverride};
 use grandpa::GrandpaBlockImport;
-use sc_service::{TFullBackend, TFullClient};
 use sc_consensus_babe::BabeBlockImport;
 use sc_consensus_manual_seal::consensus::babe::SlotTimestampProvider;
+use sc_service::{TFullBackend, TFullClient};
 use sp_runtime::generic::Era;
+use test_runner::{ChainInfo, SignatureVerificationOverride};
 
 type BlockImport<B, BE, C, SC> = BabeBlockImport<B, C, GrandpaBlockImport<BE, B, C, SC>>;
 
@@ -54,15 +54,20 @@ impl ChainInfo for NodeTemplateChainInfo {
 		Self::SelectChain,
 	>;
 	type SignedExtras = node_runtime::SignedExtra;
-	type InherentDataProviders = (SlotTimestampProvider, sp_consensus_babe::inherents::InherentDataProvider);
+	type InherentDataProviders =
+		(SlotTimestampProvider, sp_consensus_babe::inherents::InherentDataProvider);
 
-	fn signed_extras(from: <Self::Runtime as frame_system::Config>::AccountId) -> Self::SignedExtras {
+	fn signed_extras(
+		from: <Self::Runtime as frame_system::Config>::AccountId,
+	) -> Self::SignedExtras {
 		(
 			frame_system::CheckSpecVersion::<Self::Runtime>::new(),
 			frame_system::CheckTxVersion::<Self::Runtime>::new(),
 			frame_system::CheckGenesis::<Self::Runtime>::new(),
 			frame_system::CheckMortality::<Self::Runtime>::from(Era::Immortal),
-			frame_system::CheckNonce::<Self::Runtime>::from(frame_system::Pallet::<Self::Runtime>::account_nonce(from)),
+			frame_system::CheckNonce::<Self::Runtime>::from(
+				frame_system::Pallet::<Self::Runtime>::account_nonce(from),
+			),
 			frame_system::CheckWeight::<Self::Runtime>::new(),
 			pallet_transaction_payment::ChargeTransactionPayment::<Self::Runtime>::from(0),
 		)
@@ -72,32 +77,43 @@ impl ChainInfo for NodeTemplateChainInfo {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use test_runner::{Node, client_parts, ConfigOrChainSpec, build_runtime, task_executor};
-	use sp_keyring::sr25519::Keyring::Alice;
 	use node_cli::chain_spec::development_config;
+	use sp_keyring::sr25519::Keyring::Alice;
 	use sp_runtime::{traits::IdentifyAccount, MultiSigner};
+	use test_runner::{build_runtime, client_parts, task_executor, ConfigOrChainSpec, Node};
 
 	#[test]
 	fn test_runner() {
 		let mut tokio_runtime = build_runtime().unwrap();
 		let task_executor = task_executor(tokio_runtime.handle().clone());
-		let (rpc, task_manager, client, pool, command_sink, backend) =
-			client_parts::<NodeTemplateChainInfo>(
-				ConfigOrChainSpec::ChainSpec(Box::new(development_config()), task_executor)
-			).unwrap();
-		let node = Node::<NodeTemplateChainInfo>::new(rpc, task_manager, client, pool, command_sink, backend);
+		let (rpc, task_manager, client, pool, command_sink, backend) = client_parts::<
+			NodeTemplateChainInfo,
+		>(
+			ConfigOrChainSpec::ChainSpec(Box::new(development_config()), task_executor),
+		)
+		.unwrap();
+		let node = Node::<NodeTemplateChainInfo>::new(
+			rpc,
+			task_manager,
+			client,
+			pool,
+			command_sink,
+			backend,
+		);
 
 		tokio_runtime.block_on(async {
 			// seals blocks
 			node.seal_blocks(1).await;
 			// submit extrinsics
 			let alice = MultiSigner::from(Alice.public()).into_account();
-			let _hash = node.submit_extrinsic(frame_system::Call::remark((b"hello world").to_vec()), alice)
+			let _hash = node
+				.submit_extrinsic(frame_system::Call::remark((b"hello world").to_vec()), alice)
 				.await
 				.unwrap();
 
 			// look ma, I can read state.
-			let _events = node.with_state(|| frame_system::Pallet::<node_runtime::Runtime>::events());
+			let _events =
+				node.with_state(|| frame_system::Pallet::<node_runtime::Runtime>::events());
 			// get access to the underlying client.
 			let _client = node.client();
 		})
diff --git a/bin/node/testing/src/bench.rs b/bin/node/testing/src/bench.rs
index edb99c617771..ceca493874dc 100644
--- a/bin/node/testing/src/bench.rs
+++ b/bin/node/testing/src/bench.rs
@@ -22,44 +22,42 @@
 //! can pregenerate seed database and `clone` it for every iteration of your benchmarks
 //! or tests to get consistent, smooth benchmark experience!
 
-use std::{sync::Arc, path::{Path, PathBuf}, collections::BTreeMap};
+use std::{
+	collections::BTreeMap,
+	path::{Path, PathBuf},
+	sync::Arc,
+};
 
+use crate::{
+	client::{Backend, Client},
+	keyring::*,
+};
+use codec::{Decode, Encode};
+use futures::executor;
 use node_primitives::Block;
-use crate::client::{Client, Backend};
-use crate::keyring::*;
+use node_runtime::{
+	constants::currency::DOLLARS, AccountId, BalancesCall, Call, CheckedExtrinsic, MinimumPeriod,
+	Signature, SystemCall, UncheckedExtrinsic,
+};
+use sc_block_builder::BlockBuilderProvider;
+use sc_client_api::{
+	execution_extensions::{ExecutionExtensions, ExecutionStrategies},
+	BlockBackend, ExecutionStrategy,
+};
 use sc_client_db::PruningMode;
 use sc_executor::{NativeExecutor, WasmExecutionMethod};
+use sp_api::ProvideRuntimeApi;
+use sp_block_builder::BlockBuilder;
 use sp_consensus::{
-	BlockOrigin, BlockImport, BlockImportParams,
-	ForkChoiceStrategy, ImportResult, ImportedAux
+	BlockImport, BlockImportParams, BlockOrigin, ForkChoiceStrategy, ImportResult, ImportedAux,
 };
+use sp_core::{blake2_256, ed25519, sr25519, traits::SpawnNamed, ExecutionContext, Pair, Public};
+use sp_inherents::InherentData;
 use sp_runtime::{
 	generic::BlockId,
+	traits::{Block as BlockT, IdentifyAccount, Verify, Zero},
 	OpaqueExtrinsic,
-	traits::{Block as BlockT, Verify, Zero, IdentifyAccount},
-};
-use codec::{Decode, Encode};
-use node_runtime::{
-	Call,
-	CheckedExtrinsic,
-	constants::currency::DOLLARS,
-	UncheckedExtrinsic,
-	MinimumPeriod,
-	SystemCall,
-	BalancesCall,
-	AccountId,
-	Signature,
-};
-use sp_core::{ExecutionContext, blake2_256, traits::SpawnNamed, Pair, Public, sr25519, ed25519};
-use sp_api::ProvideRuntimeApi;
-use sp_block_builder::BlockBuilder;
-use sp_inherents::InherentData;
-use sc_client_api::{
-	ExecutionStrategy, BlockBackend,
-	execution_extensions::{ExecutionExtensions, ExecutionStrategies},
 };
-use sc_block_builder::BlockBuilderProvider;
-use futures::executor;
 
 /// Keyring full of accounts for benching.
 ///
@@ -92,19 +90,21 @@ impl BenchPair {
 ///
 /// Will panic if cache drop is impossbile.
 pub fn drop_system_cache() {
-	#[cfg(target_os = "windows")] {
+	#[cfg(target_os = "windows")]
+	{
 		log::warn!(
 			target: "bench-logistics",
 			"Clearing system cache on windows is not supported. Benchmark might totally be wrong.",
 		);
-		return;
+		return
 	}
 
 	std::process::Command::new("sync")
 		.output()
 		.expect("Failed to execute system cache clear");
 
-	#[cfg(target_os = "linux")] {
+	#[cfg(target_os = "linux")]
+	{
 		log::trace!(target: "bench-logistics", "Clearing system cache...");
 		std::process::Command::new("echo")
 			.args(&["3", ">", "/proc/sys/vm/drop_caches", "2>", "/dev/null"])
@@ -133,7 +133,8 @@ pub fn drop_system_cache() {
 		log::trace!(target: "bench-logistics", "Clearing system cache done!");
 	}
 
-	#[cfg(target_os = "macos")] {
+	#[cfg(target_os = "macos")]
+	{
 		log::trace!(target: "bench-logistics", "Clearing system cache...");
 		if let Err(err) = std::process::Command::new("purge").output() {
 			log::error!("purge error {:?}: ", err);
@@ -169,15 +170,10 @@ impl Clone for BenchDb {
 		);
 		let seed_db_files = std::fs::read_dir(seed_dir)
 			.expect("failed to list file in seed dir")
-			.map(|f_result|
-				f_result.expect("failed to read file in seed db")
-					.path()
-			).collect::<Vec<PathBuf>>();
-		fs_extra::copy_items(
-			&seed_db_files,
-			dir.path(),
-			&fs_extra::dir::CopyOptions::new(),
-		).expect("Copy of seed database is ok");
+			.map(|f_result| f_result.expect("failed to read file in seed db").path())
+			.collect::<Vec<PathBuf>>();
+		fs_extra::copy_items(&seed_db_files, dir.path(), &fs_extra::dir::CopyOptions::new())
+			.expect("Copy of seed database is ok");
 
 		// We clear system cache after db clone but before any warmups.
 		// This populates system cache with some data unrelated to actual
@@ -204,10 +200,7 @@ pub enum BlockType {
 impl BlockType {
 	/// Create block content description with specified number of transactions.
 	pub fn to_content(self, size: Option<usize>) -> BlockContent {
-		BlockContent {
-			block_type: self,
-			size,
-		}
+		BlockContent { block_type: self, size }
 	}
 }
 
@@ -230,13 +223,8 @@ pub enum DatabaseType {
 impl DatabaseType {
 	fn into_settings(self, path: PathBuf) -> sc_client_db::DatabaseSettingsSrc {
 		match self {
-			Self::RocksDb => sc_client_db::DatabaseSettingsSrc::RocksDb {
-				path,
-				cache_size: 512,
-			},
-			Self::ParityDb => sc_client_db::DatabaseSettingsSrc::ParityDb {
-				path,
-			}
+			Self::RocksDb => sc_client_db::DatabaseSettingsSrc::RocksDb { path, cache_size: 512 },
+			Self::ParityDb => sc_client_db::DatabaseSettingsSrc::ParityDb { path },
 		}
 	}
 }
@@ -251,10 +239,7 @@ pub struct TaskExecutor {
 
 impl TaskExecutor {
 	fn new() -> Self {
-		Self {
-			pool: executor::ThreadPool::new()
-				.expect("Failed to create task executor")
-		}
+		Self { pool: executor::ThreadPool::new().expect("Failed to create task executor") }
 	}
 }
 
@@ -279,21 +264,17 @@ pub struct BlockContentIterator<'a> {
 
 impl<'a> BlockContentIterator<'a> {
 	fn new(content: BlockContent, keyring: &'a BenchKeyring, client: &Client) -> Self {
-		let runtime_version = client.runtime_version_at(&BlockId::number(0))
+		let runtime_version = client
+			.runtime_version_at(&BlockId::number(0))
 			.expect("There should be runtime version at 0");
 
-		let genesis_hash = client.block_hash(Zero::zero())
+		let genesis_hash = client
+			.block_hash(Zero::zero())
 			.expect("Database error?")
 			.expect("Genesis block always exists; qed")
 			.into();
 
-		BlockContentIterator {
-			iteration: 0,
-			content,
-			keyring,
-			runtime_version,
-			genesis_hash,
-		}
+		BlockContentIterator { iteration: 0, content, keyring, runtime_version, genesis_hash }
 	}
 }
 
@@ -302,41 +283,36 @@ impl<'a> Iterator for BlockContentIterator<'a> {
 
 	fn next(&mut self) -> Option<Self::Item> {
 		if self.content.size.map(|size| size <= self.iteration).unwrap_or(false) {
-			return None;
+			return None
 		}
 
 		let sender = self.keyring.at(self.iteration);
-		let receiver = get_account_id_from_seed::<sr25519::Public>(
-			&format!("random-user//{}", self.iteration)
-		);
+		let receiver = get_account_id_from_seed::<sr25519::Public>(&format!(
+			"random-user//{}",
+			self.iteration
+		));
 
 		let signed = self.keyring.sign(
 			CheckedExtrinsic {
-				signed: Some((sender, signed_extra(0, node_runtime::ExistentialDeposit::get() + 1))),
+				signed: Some((
+					sender,
+					signed_extra(0, node_runtime::ExistentialDeposit::get() + 1),
+				)),
 				function: match self.content.block_type {
-					BlockType::RandomTransfersKeepAlive => {
-						Call::Balances(
-							BalancesCall::transfer_keep_alive(
-								sp_runtime::MultiAddress::Id(receiver),
-								node_runtime::ExistentialDeposit::get() + 1,
-							)
-						)
-					},
+					BlockType::RandomTransfersKeepAlive =>
+						Call::Balances(BalancesCall::transfer_keep_alive(
+							sp_runtime::MultiAddress::Id(receiver),
+							node_runtime::ExistentialDeposit::get() + 1,
+						)),
 					BlockType::RandomTransfersReaping => {
-						Call::Balances(
-							BalancesCall::transfer(
-								sp_runtime::MultiAddress::Id(receiver),
-								// Transfer so that ending balance would be 1 less than existential deposit
-								// so that we kill the sender account.
-								100*DOLLARS - (node_runtime::ExistentialDeposit::get() - 1),
-							)
-						)
-					},
-					BlockType::Noop => {
-						Call::System(
-							SystemCall::remark(Vec::new())
-						)
+						Call::Balances(BalancesCall::transfer(
+							sp_runtime::MultiAddress::Id(receiver),
+							// Transfer so that ending balance would be 1 less than existential deposit
+							// so that we kill the sender account.
+							100 * DOLLARS - (node_runtime::ExistentialDeposit::get() - 1),
+						))
 					},
+					BlockType::Noop => Call::System(SystemCall::remark(Vec::new())),
 				},
 			},
 			self.runtime_version.spec_version,
@@ -346,8 +322,7 @@ impl<'a> Iterator for BlockContentIterator<'a> {
 
 		let encoded = Encode::encode(&signed);
 
-		let opaque = OpaqueExtrinsic::decode(&mut &encoded[..])
-			.expect("Failed  to decode opaque");
+		let opaque = OpaqueExtrinsic::decode(&mut &encoded[..]).expect("Failed  to decode opaque");
 
 		self.iteration += 1;
 
@@ -373,12 +348,8 @@ impl BenchDb {
 			"Created seed db at {}",
 			dir.path().to_string_lossy(),
 		);
-		let (_client, _backend, _task_executor) = Self::bench_client(
-			database_type,
-			dir.path(),
-			Profile::Native,
-			&keyring,
-		);
+		let (_client, _backend, _task_executor) =
+			Self::bench_client(database_type, dir.path(), Profile::Native, &keyring);
 		let directory_guard = Guard(dir);
 
 		BenchDb { keyring, directory_guard, database_type }
@@ -408,7 +379,7 @@ impl BenchDb {
 		keyring: &BenchKeyring,
 	) -> (Client, std::sync::Arc<Backend>, TaskExecutor) {
 		let db_config = sc_client_db::DatabaseSettings {
-			state_cache_size: 16*1024*1024,
+			state_cache_size: 16 * 1024 * 1024,
 			state_cache_child_ratio: Some((0, 100)),
 			state_pruning: PruningMode::ArchiveAll,
 			source: database_type.into_settings(dir.into()),
@@ -429,7 +400,8 @@ impl BenchDb {
 			None,
 			None,
 			Default::default(),
-		).expect("Should not fail");
+		)
+		.expect("Should not fail");
 
 		(client, backend, task_executor)
 	}
@@ -445,12 +417,14 @@ impl BenchDb {
 			.put_data(sp_timestamp::INHERENT_IDENTIFIER, &timestamp)
 			.expect("Put timestamp failed");
 
-		client.runtime_api()
+		client
+			.runtime_api()
 			.inherent_extrinsics_with_context(
 				&BlockId::number(0),
 				ExecutionContext::BlockConstruction,
 				inherent_data,
-			).expect("Get inherents failed")
+			)
+			.expect("Get inherents failed")
 	}
 
 	/// Iterate over some block content with transaction signed using this database keyring.
@@ -474,9 +448,7 @@ impl BenchDb {
 	pub fn generate_block(&mut self, content: BlockContent) -> Block {
 		let client = self.client();
 
-		let mut block = client
-			.new_block(Default::default())
-			.expect("Block creation failed");
+		let mut block = client.new_block(Default::default()).expect("Block creation failed");
 
 		for extrinsic in self.generate_inherents(&client) {
 			block.push(extrinsic).expect("Push inherent failed");
@@ -486,14 +458,12 @@ impl BenchDb {
 		for opaque in self.block_content(content, &client) {
 			match block.push(opaque) {
 				Err(sp_blockchain::Error::ApplyExtrinsicFailed(
-						sp_blockchain::ApplyExtrinsicFailed::Validity(e)
-				)) if e.exhausted_resources() => {
-					break;
-				},
+					sp_blockchain::ApplyExtrinsicFailed::Validity(e),
+				)) if e.exhausted_resources() => break,
 				Err(err) => panic!("Error pushing transaction: {:?}", err),
 				Ok(_) => {},
 			}
-		};
+		}
 
 		let block = block.build().expect("Block build failed").block;
 
@@ -514,12 +484,8 @@ impl BenchDb {
 	/// Clone this database and create context for testing/benchmarking.
 	pub fn create_context(&self, profile: Profile) -> BenchContext {
 		let BenchDb { directory_guard, keyring, database_type } = self.clone();
-		let (client, backend, task_executor) = Self::bench_client(
-			database_type,
-			directory_guard.path(),
-			profile,
-			&keyring
-		);
+		let (client, backend, task_executor) =
+			Self::bench_client(database_type, directory_guard.path(), profile, &keyring);
 
 		BenchContext {
 			client: Arc::new(client),
@@ -549,7 +515,8 @@ impl BenchKeyring {
 			let seed = format!("//endowed-user/{}", n);
 			let (account_id, pair) = match key_types {
 				KeyTypes::Sr25519 => {
-					let pair = sr25519::Pair::from_string(&seed, None).expect("failed to generate pair");
+					let pair =
+						sr25519::Pair::from_string(&seed, None).expect("failed to generate pair");
 					let account_id = AccountPublic::from(pair.public()).into_account();
 					(account_id, BenchPair::Sr25519(pair))
 				},
@@ -581,28 +548,34 @@ impl BenchKeyring {
 		xt: CheckedExtrinsic,
 		spec_version: u32,
 		tx_version: u32,
-		genesis_hash: [u8; 32]
+		genesis_hash: [u8; 32],
 	) -> UncheckedExtrinsic {
 		match xt.signed {
 			Some((signed, extra)) => {
-				let payload = (xt.function, extra.clone(), spec_version, tx_version, genesis_hash, genesis_hash);
+				let payload = (
+					xt.function,
+					extra.clone(),
+					spec_version,
+					tx_version,
+					genesis_hash,
+					genesis_hash,
+				);
 				let key = self.accounts.get(&signed).expect("Account id not found in keyring");
-				let signature = payload.using_encoded(|b| {
-					if b.len() > 256 {
-						key.sign(&sp_io::hashing::blake2_256(b))
-					} else {
-						key.sign(b)
-					}
-				}).into();
+				let signature = payload
+					.using_encoded(|b| {
+						if b.len() > 256 {
+							key.sign(&sp_io::hashing::blake2_256(b))
+						} else {
+							key.sign(b)
+						}
+					})
+					.into();
 				UncheckedExtrinsic {
 					signature: Some((sp_runtime::MultiAddress::Id(signed), signature, extra)),
 					function: payload.0,
 				}
-			}
-			None => UncheckedExtrinsic {
-				signature: None,
-				function: xt.function,
 			},
+			None => UncheckedExtrinsic { signature: None, function: xt.function },
 		}
 	}
 
@@ -641,7 +614,7 @@ impl Profile {
 				block_construction: ExecutionStrategy::NativeElseWasm,
 				offchain_worker: ExecutionStrategy::NativeElseWasm,
 				other: ExecutionStrategy::NativeElseWasm,
-			}
+			},
 		}
 	}
 }
@@ -676,7 +649,7 @@ fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Public
 
 fn get_account_id_from_seed<TPublic: Public>(seed: &str) -> AccountId
 where
-	AccountPublic: From<<TPublic::Pair as Pair>::Public>
+	AccountPublic: From<<TPublic::Pair as Pair>::Public>,
 {
 	AccountPublic::from(get_from_seed::<TPublic>(seed)).into_account()
 }
@@ -684,24 +657,25 @@ where
 impl BenchContext {
 	/// Import some block.
 	pub fn import_block(&mut self, block: Block) {
-		let mut import_params = BlockImportParams::new(BlockOrigin::NetworkBroadcast, block.header.clone());
+		let mut import_params =
+			BlockImportParams::new(BlockOrigin::NetworkBroadcast, block.header.clone());
 		import_params.body = Some(block.extrinsics().to_vec());
 		import_params.fork_choice = Some(ForkChoiceStrategy::LongestChain);
 
 		assert_eq!(self.client.chain_info().best_number, 0);
 
 		assert_eq!(
-			futures::executor::block_on(self.client.import_block(import_params, Default::default()))
-				.expect("Failed to import block"),
-			ImportResult::Imported(
-				ImportedAux {
-					header_only: false,
-					clear_justification_requests: false,
-					needs_justification: false,
-					bad_justification: false,
-					is_new_best: true,
-				}
+			futures::executor::block_on(
+				self.client.import_block(import_params, Default::default())
 			)
+			.expect("Failed to import block"),
+			ImportResult::Imported(ImportedAux {
+				header_only: false,
+				clear_justification_requests: false,
+				needs_justification: false,
+				bad_justification: false,
+				is_new_best: true,
+			})
 		);
 
 		assert_eq!(self.client.chain_info().best_number, 1);
diff --git a/bin/node/testing/src/client.rs b/bin/node/testing/src/client.rs
index d53519950dc1..9538cd47d88a 100644
--- a/bin/node/testing/src/client.rs
+++ b/bin/node/testing/src/client.rs
@@ -18,8 +18,8 @@
 
 //! Utilities to build a `TestClient` for `node-runtime`.
 
-use sp_runtime::BuildStorage;
 use sc_service::client;
+use sp_runtime::BuildStorage;
 /// Re-export test-client utilities.
 pub use substrate_test_client::*;
 
@@ -61,13 +61,15 @@ pub trait TestClientBuilderExt: Sized {
 	fn build(self) -> Client;
 }
 
-impl TestClientBuilderExt for substrate_test_client::TestClientBuilder<
-	node_primitives::Block,
-	client::LocalCallExecutor<node_primitives::Block, Backend, Executor>,
-	Backend,
-	GenesisParameters,
-> {
-	fn new() -> Self{
+impl TestClientBuilderExt
+	for substrate_test_client::TestClientBuilder<
+		node_primitives::Block,
+		client::LocalCallExecutor<node_primitives::Block, Backend, Executor>,
+		Backend,
+		GenesisParameters,
+	>
+{
+	fn new() -> Self {
 		Self::default()
 	}
 
@@ -75,5 +77,3 @@ impl TestClientBuilderExt for substrate_test_client::TestClientBuilder<
 		self.build_with_native_executor(None).0
 	}
 }
-
-
diff --git a/bin/node/testing/src/genesis.rs b/bin/node/testing/src/genesis.rs
index 3a6d51f1971e..50c1e6f9d20b 100644
--- a/bin/node/testing/src/genesis.rs
+++ b/bin/node/testing/src/genesis.rs
@@ -19,14 +19,13 @@
 //! Genesis Configuration.
 
 use crate::keyring::*;
-use sp_keyring::{Ed25519Keyring, Sr25519Keyring};
 use node_runtime::{
-	GenesisConfig, BalancesConfig, SessionConfig, StakingConfig, SystemConfig,
-	GrandpaConfig, IndicesConfig, SocietyConfig, wasm_binary_unwrap,
-	AccountId, StakerStatus, BabeConfig, BABE_GENESIS_EPOCH_CONFIG,
+	constants::currency::*, wasm_binary_unwrap, AccountId, BabeConfig, BalancesConfig,
+	GenesisConfig, GrandpaConfig, IndicesConfig, SessionConfig, SocietyConfig, StakerStatus,
+	StakingConfig, SystemConfig, BABE_GENESIS_EPOCH_CONFIG,
 };
-use node_runtime::constants::currency::*;
 use sp_core::ChangesTrieConfiguration;
+use sp_keyring::{Ed25519Keyring, Sr25519Keyring};
 use sp_runtime::Perbill;
 
 /// Create genesis runtime configuration for tests.
@@ -41,7 +40,6 @@ pub fn config_endowed(
 	code: Option<&[u8]>,
 	extra_endowed: Vec<AccountId>,
 ) -> GenesisConfig {
-
 	let mut endowed = vec![
 		(alice(), 111 * DOLLARS),
 		(bob(), 100 * DOLLARS),
@@ -51,59 +49,44 @@ pub fn config_endowed(
 		(ferdie(), 100 * DOLLARS),
 	];
 
-	endowed.extend(
-		extra_endowed.into_iter().map(|endowed| (endowed, 100*DOLLARS))
-	);
+	endowed.extend(extra_endowed.into_iter().map(|endowed| (endowed, 100 * DOLLARS)));
 
 	GenesisConfig {
 		system: SystemConfig {
-			changes_trie_config: if support_changes_trie { Some(ChangesTrieConfiguration {
-				digest_interval: 2,
-				digest_levels: 2,
-			}) } else { None },
+			changes_trie_config: if support_changes_trie {
+				Some(ChangesTrieConfiguration { digest_interval: 2, digest_levels: 2 })
+			} else {
+				None
+			},
 			code: code.map(|x| x.to_vec()).unwrap_or_else(|| wasm_binary_unwrap().to_vec()),
 		},
-		indices: IndicesConfig {
-			indices: vec![],
-		},
-		balances: BalancesConfig {
-			balances: endowed,
-		},
+		indices: IndicesConfig { indices: vec![] },
+		balances: BalancesConfig { balances: endowed },
 		session: SessionConfig {
 			keys: vec![
-				(dave(), alice(), to_session_keys(
-					&Ed25519Keyring::Alice,
-					&Sr25519Keyring::Alice,
-				)),
-				(eve(), bob(), to_session_keys(
-					&Ed25519Keyring::Bob,
-					&Sr25519Keyring::Bob,
-				)),
-				(ferdie(), charlie(), to_session_keys(
-					&Ed25519Keyring::Charlie,
-					&Sr25519Keyring::Charlie,
-				)),
-			]
+				(dave(), alice(), to_session_keys(&Ed25519Keyring::Alice, &Sr25519Keyring::Alice)),
+				(eve(), bob(), to_session_keys(&Ed25519Keyring::Bob, &Sr25519Keyring::Bob)),
+				(
+					ferdie(),
+					charlie(),
+					to_session_keys(&Ed25519Keyring::Charlie, &Sr25519Keyring::Charlie),
+				),
+			],
 		},
 		staking: StakingConfig {
 			stakers: vec![
 				(dave(), alice(), 111 * DOLLARS, StakerStatus::Validator),
 				(eve(), bob(), 100 * DOLLARS, StakerStatus::Validator),
-				(ferdie(), charlie(), 100 * DOLLARS, StakerStatus::Validator)
+				(ferdie(), charlie(), 100 * DOLLARS, StakerStatus::Validator),
 			],
 			validator_count: 3,
 			minimum_validator_count: 0,
 			slash_reward_fraction: Perbill::from_percent(10),
 			invulnerables: vec![alice(), bob(), charlie()],
-			.. Default::default()
-		},
-		babe: BabeConfig {
-			authorities: vec![],
-			epoch_config: Some(BABE_GENESIS_EPOCH_CONFIG),
-		},
-		grandpa: GrandpaConfig {
-			authorities: vec![],
+			..Default::default()
 		},
+		babe: BabeConfig { authorities: vec![], epoch_config: Some(BABE_GENESIS_EPOCH_CONFIG) },
+		grandpa: GrandpaConfig { authorities: vec![] },
 		im_online: Default::default(),
 		authority_discovery: Default::default(),
 		democracy: Default::default(),
@@ -113,11 +96,7 @@ pub fn config_endowed(
 		elections: Default::default(),
 		sudo: Default::default(),
 		treasury: Default::default(),
-		society: SocietyConfig {
-			members: vec![alice(), bob()],
-			pot: 0,
-			max_members: 999,
-		},
+		society: SocietyConfig { members: vec![alice(), bob()], pot: 0, max_members: 999 },
 		vesting: Default::default(),
 		gilt: Default::default(),
 		transaction_storage: Default::default(),
diff --git a/bin/node/testing/src/keyring.rs b/bin/node/testing/src/keyring.rs
index da61040206ea..4e2d88b4bba3 100644
--- a/bin/node/testing/src/keyring.rs
+++ b/bin/node/testing/src/keyring.rs
@@ -18,11 +18,11 @@
 
 //! Test accounts.
 
-use sp_keyring::{AccountKeyring, Sr25519Keyring, Ed25519Keyring};
+use codec::Encode;
 use node_primitives::{AccountId, Balance, Index};
-use node_runtime::{CheckedExtrinsic, UncheckedExtrinsic, SessionKeys, SignedExtra};
+use node_runtime::{CheckedExtrinsic, SessionKeys, SignedExtra, UncheckedExtrinsic};
+use sp_keyring::{AccountKeyring, Ed25519Keyring, Sr25519Keyring};
 use sp_runtime::generic::Era;
-use codec::Encode;
 
 /// Alice's account id.
 pub fn alice() -> AccountId {
@@ -81,26 +81,31 @@ pub fn signed_extra(nonce: Index, extra_fee: Balance) -> SignedExtra {
 }
 
 /// Sign given `CheckedExtrinsic`.
-pub fn sign(xt: CheckedExtrinsic, spec_version: u32, tx_version: u32, genesis_hash: [u8; 32]) -> UncheckedExtrinsic {
+pub fn sign(
+	xt: CheckedExtrinsic,
+	spec_version: u32,
+	tx_version: u32,
+	genesis_hash: [u8; 32],
+) -> UncheckedExtrinsic {
 	match xt.signed {
 		Some((signed, extra)) => {
-			let payload = (xt.function, extra.clone(), spec_version, tx_version, genesis_hash, genesis_hash);
+			let payload =
+				(xt.function, extra.clone(), spec_version, tx_version, genesis_hash, genesis_hash);
 			let key = AccountKeyring::from_account_id(&signed).unwrap();
-			let signature = payload.using_encoded(|b| {
-				if b.len() > 256 {
-					key.sign(&sp_io::hashing::blake2_256(b))
-				} else {
-					key.sign(b)
-				}
-			}).into();
+			let signature = payload
+				.using_encoded(|b| {
+					if b.len() > 256 {
+						key.sign(&sp_io::hashing::blake2_256(b))
+					} else {
+						key.sign(b)
+					}
+				})
+				.into();
 			UncheckedExtrinsic {
 				signature: Some((sp_runtime::MultiAddress::Id(signed), signature, extra)),
 				function: payload.0,
 			}
-		}
-		None => UncheckedExtrinsic {
-			signature: None,
-			function: xt.function,
 		},
+		None => UncheckedExtrinsic { signature: None, function: xt.function },
 	}
 }
diff --git a/bin/node/testing/src/lib.rs b/bin/node/testing/src/lib.rs
index c5792bccee80..a3392bcb29d5 100644
--- a/bin/node/testing/src/lib.rs
+++ b/bin/node/testing/src/lib.rs
@@ -20,7 +20,7 @@
 
 #![warn(missing_docs)]
 
+pub mod bench;
 pub mod client;
 pub mod genesis;
 pub mod keyring;
-pub mod bench;
diff --git a/bin/utils/chain-spec-builder/src/main.rs b/bin/utils/chain-spec-builder/src/main.rs
index a3f8eaa1f854..60d46dcfeee5 100644
--- a/bin/utils/chain-spec-builder/src/main.rs
+++ b/bin/utils/chain-spec-builder/src/main.rs
@@ -16,19 +16,23 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use std::{fs, path::{Path, PathBuf}, sync::Arc};
+use std::{
+	fs,
+	path::{Path, PathBuf},
+	sync::Arc,
+};
 
 use ansi_term::Style;
-use rand::{Rng, distributions::Alphanumeric, rngs::OsRng};
+use rand::{distributions::Alphanumeric, rngs::OsRng, Rng};
 use structopt::StructOpt;
 
-use sc_keystore::LocalKeystore;
 use node_cli::chain_spec::{self, AccountId};
+use sc_keystore::LocalKeystore;
 use sp_core::{
-	sr25519,
 	crypto::{Public, Ss58Codec},
+	sr25519,
 };
-use sp_keystore::{SyncCryptoStorePtr, SyncCryptoStore};
+use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr};
 
 /// A utility to easily create a testnet chain spec definition with a given set
 /// of authorities and endowed accounts and/or generate random accounts.
@@ -86,10 +90,8 @@ impl ChainSpecBuilder {
 	/// Returns the path where the chain spec should be saved.
 	fn chain_spec_path(&self) -> &Path {
 		match self {
-			ChainSpecBuilder::New { chain_spec_path, .. } =>
-				chain_spec_path.as_path(),
-			ChainSpecBuilder::Generate { chain_spec_path, .. } =>
-				chain_spec_path.as_path(),
+			ChainSpecBuilder::New { chain_spec_path, .. } => chain_spec_path.as_path(),
+			ChainSpecBuilder::Generate { chain_spec_path, .. } => chain_spec_path.as_path(),
 		}
 	}
 }
@@ -125,11 +127,15 @@ fn generate_chain_spec(
 			.map_err(|err| format!("Failed to parse account address: {:?}", err))
 	};
 
-	let nominator_accounts =
-		nominator_accounts.into_iter().map(parse_account).collect::<Result<Vec<_>, String>>()?;
+	let nominator_accounts = nominator_accounts
+		.into_iter()
+		.map(parse_account)
+		.collect::<Result<Vec<_>, String>>()?;
 
-	let endowed_accounts =
-		endowed_accounts.into_iter().map(parse_account).collect::<Result<Vec<_>, String>>()?;
+	let endowed_accounts = endowed_accounts
+		.into_iter()
+		.map(parse_account)
+		.collect::<Result<Vec<_>, String>>()?;
 
 	let sudo_account = parse_account(sudo_account)?;
 
@@ -137,7 +143,14 @@ fn generate_chain_spec(
 		"Custom",
 		"custom",
 		sc_chain_spec::ChainType::Live,
-		move || genesis_constructor(&authority_seeds, &nominator_accounts, &endowed_accounts, &sudo_account),
+		move || {
+			genesis_constructor(
+				&authority_seeds,
+				&nominator_accounts,
+				&endowed_accounts,
+				&sudo_account,
+			)
+		},
 		vec![],
 		None,
 		None,
@@ -148,42 +161,26 @@ fn generate_chain_spec(
 	chain_spec.as_json(false).map_err(|err| err)
 }
 
-fn generate_authority_keys_and_store(
-	seeds: &[String],
-	keystore_path: &Path,
-) -> Result<(), String> {
+fn generate_authority_keys_and_store(seeds: &[String], keystore_path: &Path) -> Result<(), String> {
 	for (n, seed) in seeds.into_iter().enumerate() {
-		let keystore: SyncCryptoStorePtr = Arc::new(LocalKeystore::open(
-			keystore_path.join(format!("auth-{}", n)),
-			None,
-		).map_err(|err| err.to_string())?);
+		let keystore: SyncCryptoStorePtr = Arc::new(
+			LocalKeystore::open(keystore_path.join(format!("auth-{}", n)), None)
+				.map_err(|err| err.to_string())?,
+		);
 
 		let (_, _, grandpa, babe, im_online, authority_discovery) =
 			chain_spec::authority_keys_from_seed(seed);
 
 		let insert_key = |key_type, public| {
-			SyncCryptoStore::insert_unknown(
-				&*keystore,
-				key_type,
-				&format!("//{}", seed),
-				public,
-			).map_err(|_| format!("Failed to insert key: {}", grandpa))
+			SyncCryptoStore::insert_unknown(&*keystore, key_type, &format!("//{}", seed), public)
+				.map_err(|_| format!("Failed to insert key: {}", grandpa))
 		};
 
-		insert_key(
-			sp_core::crypto::key_types::BABE,
-			babe.as_slice(),
-		)?;
+		insert_key(sp_core::crypto::key_types::BABE, babe.as_slice())?;
 
-		insert_key(
-			sp_core::crypto::key_types::GRANDPA,
-			grandpa.as_slice(),
-		)?;
+		insert_key(sp_core::crypto::key_types::GRANDPA, grandpa.as_slice())?;
 
-		insert_key(
-			sp_core::crypto::key_types::IM_ONLINE,
-			im_online.as_slice(),
-		)?;
+		insert_key(sp_core::crypto::key_types::IM_ONLINE, im_online.as_slice())?;
 
 		insert_key(
 			sp_core::crypto::key_types::AUTHORITY_DISCOVERY,
@@ -206,10 +203,7 @@ fn print_seeds(
 	println!("{}", header.paint("Authority seeds"));
 
 	for (n, seed) in authority_seeds.iter().enumerate() {
-		println!("{} //{}",
-			entry.paint(format!("auth-{}:", n)),
-			seed,
-		);
+		println!("{} //{}", entry.paint(format!("auth-{}:", n)), seed,);
 	}
 
 	println!("{}", header.paint("Nominator seeds"));
@@ -223,10 +217,7 @@ fn print_seeds(
 	if !endowed_seeds.is_empty() {
 		println!("{}", header.paint("Endowed seeds"));
 		for (n, seed) in endowed_seeds.iter().enumerate() {
-			println!("{} //{}",
-				entry.paint(format!("endowed-{}:", n)),
-				seed,
-			);
+			println!("{} //{}", entry.paint(format!("endowed-{}:", n)), seed,);
 		}
 
 		println!();
@@ -260,10 +251,7 @@ fn main() -> Result<(), String> {
 			print_seeds(&authority_seeds, &nominator_seeds, &endowed_seeds, &sudo_seed);
 
 			if let Some(keystore_path) = keystore_path {
-				generate_authority_keys_and_store(
-					&authority_seeds,
-					&keystore_path,
-				)?;
+				generate_authority_keys_and_store(&authority_seeds, &keystore_path)?;
 			}
 
 			let nominator_accounts = nominator_seeds
@@ -284,7 +272,7 @@ fn main() -> Result<(), String> {
 				chain_spec::get_account_id_from_seed::<sr25519::Public>(&sudo_seed).to_ss58check();
 
 			(authority_seeds, nominator_accounts, endowed_accounts, sudo_account)
-		}
+		},
 		ChainSpecBuilder::New {
 			authority_seeds,
 			nominator_accounts,
@@ -294,12 +282,8 @@ fn main() -> Result<(), String> {
 		} => (authority_seeds, nominator_accounts, endowed_accounts, sudo_account),
 	};
 
-	let json = generate_chain_spec(
-		authority_seeds,
-		nominator_accounts,
-		endowed_accounts,
-		sudo_account,
-	)?;
+	let json =
+		generate_chain_spec(authority_seeds, nominator_accounts, endowed_accounts, sudo_account)?;
 
 	fs::write(chain_spec_path, json).map_err(|err| err.to_string())
 }
diff --git a/bin/utils/subkey/src/lib.rs b/bin/utils/subkey/src/lib.rs
index 5e9f04418a6b..5052d1b104c2 100644
--- a/bin/utils/subkey/src/lib.rs
+++ b/bin/utils/subkey/src/lib.rs
@@ -16,17 +16,17 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use structopt::StructOpt;
 use sc_cli::{
-	Error, VanityCmd, SignCmd, VerifyCmd, GenerateNodeKeyCmd, GenerateCmd, InspectKeyCmd,
-	InspectNodeKeyCmd
+	Error, GenerateCmd, GenerateNodeKeyCmd, InspectKeyCmd, InspectNodeKeyCmd, SignCmd, VanityCmd,
+	VerifyCmd,
 };
+use structopt::StructOpt;
 
 #[derive(Debug, StructOpt)]
 #[structopt(
 	name = "subkey",
 	author = "Parity Team <admin@parity.io>",
-	about = "Utility for generating and restoring with Substrate keys",
+	about = "Utility for generating and restoring with Substrate keys"
 )]
 pub enum Subkey {
 	/// Generate a random node libp2p key, save it to file or print it to stdout
diff --git a/client/allocator/src/error.rs b/client/allocator/src/error.rs
index e880e8d0ae75..2b2cc127dcfb 100644
--- a/client/allocator/src/error.rs
+++ b/client/allocator/src/error.rs
@@ -26,5 +26,5 @@ pub enum Error {
 	AllocatorOutOfSpace,
 	/// Some other error occurred.
 	#[error("Other: {0}")]
-	Other(&'static str)
+	Other(&'static str),
 }
diff --git a/client/allocator/src/freeing_bump.rs b/client/allocator/src/freeing_bump.rs
index 7f83576aedfa..105ef954ddf1 100644
--- a/client/allocator/src/freeing_bump.rs
+++ b/client/allocator/src/freeing_bump.rs
@@ -68,8 +68,12 @@
 //!   sizes.
 
 use crate::Error;
-use std::{mem, convert::{TryFrom, TryInto}, ops::{Range, Index, IndexMut}};
 use sp_wasm_interface::{Pointer, WordSize};
+use std::{
+	convert::{TryFrom, TryInto},
+	mem,
+	ops::{Index, IndexMut, Range},
+};
 
 /// The minimal alignment guaranteed by this allocator.
 ///
@@ -139,7 +143,7 @@ impl Order {
 	fn from_size(size: u32) -> Result<Self, Error> {
 		let clamped_size = if size > MAX_POSSIBLE_ALLOCATION {
 			log::warn!(target: LOG_TARGET, "going to fail due to allocating {:?}", size);
-			return Err(Error::RequestedAllocationTooLarge);
+			return Err(Error::RequestedAllocationTooLarge)
 		} else if size < MIN_POSSIBLE_ALLOCATION {
 			MIN_POSSIBLE_ALLOCATION
 		} else {
@@ -216,7 +220,6 @@ impl Link {
 /// ```
 ///
 /// ## Occupied header
-///
 /// ```ignore
 /// 64             32                  0
 //  +--------------+-------------------+
@@ -290,9 +293,7 @@ struct FreeLists {
 impl FreeLists {
 	/// Creates the free empty lists.
 	fn new() -> Self {
-		Self {
-			heads: [Link::Nil; N_ORDERS]
-		}
+		Self { heads: [Link::Nil; N_ORDERS] }
 	}
 
 	/// Replaces a given link for the specified order and returns the old one.
@@ -397,15 +398,11 @@ impl FreeingBumpHeapAllocator {
 				self.free_lists[order] = next_free;
 
 				header_ptr
-			}
+			},
 			Link::Nil => {
 				// Corresponding free list is empty. Allocate a new item.
-				Self::bump(
-					&mut self.bumper,
-					order.size() + HEADER_SIZE,
-					mem.size(),
-				)?
-			}
+				Self::bump(&mut self.bumper, order.size() + HEADER_SIZE, mem.size())?
+			},
 		};
 
 		// Write the order in the occupied header.
@@ -440,7 +437,11 @@ impl FreeingBumpHeapAllocator {
 	///
 	/// - `mem` - a slice representing the linear memory on which this allocator operates.
 	/// - `ptr` - pointer to the allocated chunk
-	pub fn deallocate<M: Memory + ?Sized>(&mut self, mem: &mut M, ptr: Pointer<u8>) -> Result<(), Error> {
+	pub fn deallocate<M: Memory + ?Sized>(
+		&mut self,
+		mem: &mut M,
+		ptr: Pointer<u8>,
+	) -> Result<(), Error> {
 		if self.poisoned {
 			return Err(error("the allocator has been poisoned"))
 		}
@@ -480,8 +481,13 @@ impl FreeingBumpHeapAllocator {
 	/// the operation would exhaust the heap.
 	fn bump(bumper: &mut u32, size: u32, heap_end: u32) -> Result<u32, Error> {
 		if *bumper + size > heap_end {
-			log::error!(target: LOG_TARGET, "running out of space with current bumper {}, mem size {}", bumper, heap_end);
-			return Err(Error::AllocatorOutOfSpace);
+			log::error!(
+				target: LOG_TARGET,
+				"running out of space with current bumper {}, mem size {}",
+				bumper,
+				heap_end
+			);
+			return Err(Error::AllocatorOutOfSpace)
 		}
 
 		let res = *bumper;
diff --git a/client/allocator/src/lib.rs b/client/allocator/src/lib.rs
index a82c7542199d..4493db3c7d14 100644
--- a/client/allocator/src/lib.rs
+++ b/client/allocator/src/lib.rs
@@ -25,5 +25,5 @@
 mod error;
 mod freeing_bump;
 
-pub use freeing_bump::FreeingBumpHeapAllocator;
 pub use error::Error;
+pub use freeing_bump::FreeingBumpHeapAllocator;
diff --git a/client/api/src/backend.rs b/client/api/src/backend.rs
index b09995f887c4..965e0151c3cb 100644
--- a/client/api/src/backend.rs
+++ b/client/api/src/backend.rs
@@ -18,30 +18,32 @@
 
 //! Substrate Client data backend
 
-use std::sync::Arc;
-use std::collections::{HashMap, HashSet};
-use sp_core::ChangesTrieConfigurationRange;
-use sp_core::offchain::OffchainStorage;
-use sp_runtime::{generic::BlockId, Justification, Justifications, Storage};
-use sp_runtime::traits::{Block as BlockT, NumberFor, HashFor};
-use sp_state_machine::{
-	ChangesTrieState, ChangesTrieStorage as StateChangesTrieStorage, ChangesTrieTransaction,
-	StorageCollection, ChildStorageCollection, OffchainChangesCollection, IndexOperation,
-};
-use sp_storage::{StorageData, StorageKey, PrefixedStorageKey, ChildInfo};
 use crate::{
-	blockchain::{
-		Backend as BlockchainBackend, well_known_cache_keys
-	},
+	blockchain::{well_known_cache_keys, Backend as BlockchainBackend},
 	light::RemoteBlockchain,
 	UsageInfo,
 };
+use parking_lot::RwLock;
 use sp_blockchain;
 use sp_consensus::BlockOrigin;
-use parking_lot::RwLock;
+use sp_core::{offchain::OffchainStorage, ChangesTrieConfigurationRange};
+use sp_runtime::{
+	generic::BlockId,
+	traits::{Block as BlockT, HashFor, NumberFor},
+	Justification, Justifications, Storage,
+};
+use sp_state_machine::{
+	ChangesTrieState, ChangesTrieStorage as StateChangesTrieStorage, ChangesTrieTransaction,
+	ChildStorageCollection, IndexOperation, OffchainChangesCollection, StorageCollection,
+};
+use sp_storage::{ChildInfo, PrefixedStorageKey, StorageData, StorageKey};
+use std::{
+	collections::{HashMap, HashSet},
+	sync::Arc,
+};
 
-pub use sp_state_machine::Backend as StateBackend;
 pub use sp_consensus::ImportedState;
+pub use sp_state_machine::Backend as StateBackend;
 use std::marker::PhantomData;
 
 /// Extracts the state backend type for the given backend.
@@ -90,16 +92,17 @@ pub fn apply_aux<'a, 'b: 'a, 'c: 'a, B, Block, D, I>(
 	insert: I,
 	delete: D,
 ) -> sp_blockchain::Result<()>
-	where
-		Block: BlockT,
-		B: Backend<Block>,
-		I: IntoIterator<Item=&'a(&'c [u8], &'c [u8])>,
-		D: IntoIterator<Item=&'a &'b [u8]>,
+where
+	Block: BlockT,
+	B: Backend<Block>,
+	I: IntoIterator<Item = &'a (&'c [u8], &'c [u8])>,
+	D: IntoIterator<Item = &'a &'b [u8]>,
 {
 	operation.op.insert_aux(
-		insert.into_iter()
+		insert
+			.into_iter()
 			.map(|(k, v)| (k.to_vec(), Some(v.to_vec())))
-			.chain(delete.into_iter().map(|k| (k.to_vec(), None)))
+			.chain(delete.into_iter().map(|k| (k.to_vec(), None))),
 	)
 }
 
@@ -165,7 +168,11 @@ pub trait BlockImportOperation<Block: BlockT> {
 
 	/// Set genesis state. If `commit` is `false` the state is saved in memory, but is not written
 	/// to the database.
-	fn set_genesis_state(&mut self, storage: Storage, commit: bool) -> sp_blockchain::Result<Block::Hash>;
+	fn set_genesis_state(
+		&mut self,
+		storage: Storage,
+		commit: bool,
+	) -> sp_blockchain::Result<Block::Hash>;
 
 	/// Inject storage data into the database replacing any existing data.
 	fn reset_storage(&mut self, storage: Storage) -> sp_blockchain::Result<Block::Hash>;
@@ -182,7 +189,7 @@ pub trait BlockImportOperation<Block: BlockT> {
 		&mut self,
 		_offchain_update: OffchainChangesCollection,
 	) -> sp_blockchain::Result<()> {
-		 Ok(())
+		Ok(())
 	}
 
 	/// Inject changes trie data into the database.
@@ -195,7 +202,8 @@ pub trait BlockImportOperation<Block: BlockT> {
 	///
 	/// Values are `None` if should be deleted.
 	fn insert_aux<I>(&mut self, ops: I) -> sp_blockchain::Result<()>
-		where I: IntoIterator<Item=(Vec<u8>, Option<Vec<u8>>)>;
+	where
+		I: IntoIterator<Item = (Vec<u8>, Option<Vec<u8>>)>;
 
 	/// Mark a block as finalized.
 	fn mark_finalized(
@@ -209,16 +217,17 @@ pub trait BlockImportOperation<Block: BlockT> {
 	fn mark_head(&mut self, id: BlockId<Block>) -> sp_blockchain::Result<()>;
 
 	/// Add a transaction index operation.
-	fn update_transaction_index(&mut self, index: Vec<IndexOperation>) -> sp_blockchain::Result<()>;
+	fn update_transaction_index(&mut self, index: Vec<IndexOperation>)
+		-> sp_blockchain::Result<()>;
 }
 
 /// Interface for performing operations on the backend.
 pub trait LockImportRun<Block: BlockT, B: Backend<Block>> {
 	/// Lock the import lock, and run operations inside.
 	fn lock_import_and_run<R, Err, F>(&self, f: F) -> Result<R, Err>
-		where
-			F: FnOnce(&mut ClientImportOperation<Block, B>) -> Result<R, Err>,
-			Err: From<sp_blockchain::Error>;
+	where
+		F: FnOnce(&mut ClientImportOperation<Block, B>) -> Result<R, Err>,
+		Err: From<sp_blockchain::Error>;
 }
 
 /// Finalize Facilities
@@ -270,9 +279,13 @@ pub trait AuxStore {
 		'a,
 		'b: 'a,
 		'c: 'a,
-		I: IntoIterator<Item=&'a(&'c [u8], &'c [u8])>,
-		D: IntoIterator<Item=&'a &'b [u8]>,
-	>(&self, insert: I, delete: D) -> sp_blockchain::Result<()>;
+		I: IntoIterator<Item = &'a (&'c [u8], &'c [u8])>,
+		D: IntoIterator<Item = &'a &'b [u8]>,
+	>(
+		&self,
+		insert: I,
+		delete: D,
+	) -> sp_blockchain::Result<()>;
 
 	/// Query auxiliary data from key-value store.
 	fn get_aux(&self, key: &[u8]) -> sp_blockchain::Result<Option<Vec<u8>>>;
@@ -287,16 +300,10 @@ pub struct KeyIterator<'a, State, Block> {
 	_phantom: PhantomData<Block>,
 }
 
-impl <'a, State, Block> KeyIterator<'a, State, Block> {
+impl<'a, State, Block> KeyIterator<'a, State, Block> {
 	/// create a KeyIterator instance
 	pub fn new(state: State, prefix: Option<&'a StorageKey>, current_key: Vec<u8>) -> Self {
-		Self {
-			state,
-			child_storage: None,
-			prefix,
-			current_key,
-			_phantom: PhantomData,
-		}
+		Self { state, child_storage: None, prefix, current_key, _phantom: PhantomData }
 	}
 
 	/// Create a `KeyIterator` instance for a child storage.
@@ -306,17 +313,12 @@ impl <'a, State, Block> KeyIterator<'a, State, Block> {
 		prefix: Option<&'a StorageKey>,
 		current_key: Vec<u8>,
 	) -> Self {
-		Self {
-			state,
-			child_storage: Some(child_info),
-			prefix,
-			current_key,
-			_phantom: PhantomData,
-		}
+		Self { state, child_storage: Some(child_info), prefix, current_key, _phantom: PhantomData }
 	}
 }
 
-impl<'a, State, Block> Iterator for KeyIterator<'a, State, Block> where
+impl<'a, State, Block> Iterator for KeyIterator<'a, State, Block>
+where
 	Block: BlockT,
 	State: StateBackend<HashFor<Block>>,
 {
@@ -327,11 +329,13 @@ impl<'a, State, Block> Iterator for KeyIterator<'a, State, Block> where
 			self.state.next_child_storage_key(child_info, &self.current_key)
 		} else {
 			self.state.next_storage_key(&self.current_key)
-		}.ok().flatten()?;
+		}
+		.ok()
+		.flatten()?;
 		// this terminates the iterator the first time it fails.
 		if let Some(prefix) = self.prefix {
 			if !next_key.starts_with(&prefix.0[..]) {
-				return None;
+				return None
 			}
 		}
 		self.current_key = next_key.clone();
@@ -342,19 +346,31 @@ impl<'a, State, Block> Iterator for KeyIterator<'a, State, Block> where
 /// Provides acess to storage primitives
 pub trait StorageProvider<Block: BlockT, B: Backend<Block>> {
 	/// Given a `BlockId` and a key, return the value under the key in that block.
-	fn storage(&self, id: &BlockId<Block>, key: &StorageKey) -> sp_blockchain::Result<Option<StorageData>>;
+	fn storage(
+		&self,
+		id: &BlockId<Block>,
+		key: &StorageKey,
+	) -> sp_blockchain::Result<Option<StorageData>>;
 
 	/// Given a `BlockId` and a key prefix, return the matching storage keys in that block.
-	fn storage_keys(&self, id: &BlockId<Block>, key_prefix: &StorageKey) -> sp_blockchain::Result<Vec<StorageKey>>;
+	fn storage_keys(
+		&self,
+		id: &BlockId<Block>,
+		key_prefix: &StorageKey,
+	) -> sp_blockchain::Result<Vec<StorageKey>>;
 
 	/// Given a `BlockId` and a key, return the value under the hash in that block.
-	fn storage_hash(&self, id: &BlockId<Block>, key: &StorageKey) -> sp_blockchain::Result<Option<Block::Hash>>;
+	fn storage_hash(
+		&self,
+		id: &BlockId<Block>,
+		key: &StorageKey,
+	) -> sp_blockchain::Result<Option<Block::Hash>>;
 
 	/// Given a `BlockId` and a key prefix, return the matching child storage keys and values in that block.
 	fn storage_pairs(
 		&self,
 		id: &BlockId<Block>,
-		key_prefix: &StorageKey
+		key_prefix: &StorageKey,
 	) -> sp_blockchain::Result<Vec<(StorageKey, StorageData)>>;
 
 	/// Given a `BlockId` and a key prefix, return a `KeyIterator` iterates matching storage keys in that block.
@@ -362,7 +378,7 @@ pub trait StorageProvider<Block: BlockT, B: Backend<Block>> {
 		&self,
 		id: &BlockId<Block>,
 		prefix: Option<&'a StorageKey>,
-		start_key: Option<&StorageKey>
+		start_key: Option<&StorageKey>,
 	) -> sp_blockchain::Result<KeyIterator<'a, B::State, Block>>;
 
 	/// Given a `BlockId`, a key and a child storage key, return the value under the key in that block.
@@ -370,7 +386,7 @@ pub trait StorageProvider<Block: BlockT, B: Backend<Block>> {
 		&self,
 		id: &BlockId<Block>,
 		child_info: &ChildInfo,
-		key: &StorageKey
+		key: &StorageKey,
 	) -> sp_blockchain::Result<Option<StorageData>>;
 
 	/// Given a `BlockId`, a key prefix, and a child storage key, return the matching child storage keys.
@@ -378,7 +394,7 @@ pub trait StorageProvider<Block: BlockT, B: Backend<Block>> {
 		&self,
 		id: &BlockId<Block>,
 		child_info: &ChildInfo,
-		key_prefix: &StorageKey
+		key_prefix: &StorageKey,
 	) -> sp_blockchain::Result<Vec<StorageKey>>;
 
 	/// Given a `BlockId` and a key `prefix` and a child storage key,
@@ -388,7 +404,7 @@ pub trait StorageProvider<Block: BlockT, B: Backend<Block>> {
 		id: &BlockId<Block>,
 		child_info: ChildInfo,
 		prefix: Option<&'a StorageKey>,
-		start_key: Option<&StorageKey>
+		start_key: Option<&StorageKey>,
 	) -> sp_blockchain::Result<KeyIterator<'a, B::State, Block>>;
 
 	/// Given a `BlockId`, a key and a child storage key, return the hash under the key in that block.
@@ -396,7 +412,7 @@ pub trait StorageProvider<Block: BlockT, B: Backend<Block>> {
 		&self,
 		id: &BlockId<Block>,
 		child_info: &ChildInfo,
-		key: &StorageKey
+		key: &StorageKey,
 	) -> sp_blockchain::Result<Option<Block::Hash>>;
 
 	/// Get longest range within [first; last] that is possible to use in `key_changes`
@@ -418,7 +434,7 @@ pub trait StorageProvider<Block: BlockT, B: Backend<Block>> {
 		first: NumberFor<Block>,
 		last: BlockId<Block>,
 		storage_key: Option<&PrefixedStorageKey>,
-		key: &StorageKey
+		key: &StorageKey,
 	) -> sp_blockchain::Result<Vec<(NumberFor<Block>, u32)>>;
 }
 
@@ -511,20 +527,20 @@ pub trait Backend<Block: BlockT>: AuxStore + Send + Sync {
 	) -> sp_blockchain::Result<(NumberFor<Block>, HashSet<Block::Hash>)>;
 
 	/// Discard non-best, unfinalized leaf block.
-	fn remove_leaf_block(
-		&self,
-		hash: &Block::Hash,
-	) -> sp_blockchain::Result<()>;
+	fn remove_leaf_block(&self, hash: &Block::Hash) -> sp_blockchain::Result<()>;
 
 	/// Insert auxiliary data into key-value store.
 	fn insert_aux<
 		'a,
 		'b: 'a,
 		'c: 'a,
-		I: IntoIterator<Item=&'a(&'c [u8], &'c [u8])>,
-		D: IntoIterator<Item=&'a &'b [u8]>,
-	>(&self, insert: I, delete: D) -> sp_blockchain::Result<()>
-	{
+		I: IntoIterator<Item = &'a (&'c [u8], &'c [u8])>,
+		D: IntoIterator<Item = &'a &'b [u8]>,
+	>(
+		&self,
+		insert: I,
+		delete: D,
+	) -> sp_blockchain::Result<()> {
 		AuxStore::insert_aux(self, insert, delete)
 	}
 	/// Query auxiliary data from key-value store.
@@ -548,9 +564,10 @@ pub trait PrunableStateChangesTrieStorage<Block: BlockT>:
 	/// Get reference to StateChangesTrieStorage.
 	fn storage(&self) -> &dyn StateChangesTrieStorage<HashFor<Block>, NumberFor<Block>>;
 	/// Get configuration at given block.
-	fn configuration_at(&self, at: &BlockId<Block>) -> sp_blockchain::Result<
-		ChangesTrieConfigurationRange<NumberFor<Block>, Block::Hash>
-	>;
+	fn configuration_at(
+		&self,
+		at: &BlockId<Block>,
+	) -> sp_blockchain::Result<ChangesTrieConfigurationRange<NumberFor<Block>, Block::Hash>>;
 	/// Get end block (inclusive) of oldest pruned max-level (or skewed) digest trie blocks range.
 	/// It is guaranteed that we have no any changes tries before (and including) this block.
 	/// It is guaranteed that all existing changes tries after this block are not yet pruned (if created).
@@ -584,7 +601,8 @@ pub fn changes_tries_state_at_block<'a, Block: BlockT>(
 
 	let config_range = storage.configuration_at(block)?;
 	match config_range.config {
-		Some(config) => Ok(Some(ChangesTrieState::new(config, config_range.zero.0, storage.storage()))),
+		Some(config) =>
+			Ok(Some(ChangesTrieState::new(config, config_range.zero.0, storage.storage()))),
 		None => Ok(None),
 	}
 }
diff --git a/client/api/src/call_executor.rs b/client/api/src/call_executor.rs
index 621cc292a71a..2d19c9fe3504 100644
--- a/client/api/src/call_executor.rs
+++ b/client/api/src/call_executor.rs
@@ -18,20 +18,19 @@
 
 //! A method call executor interface.
 
-use std::{panic::UnwindSafe, result, cell::RefCell};
-use codec::{Encode, Decode};
+use codec::{Decode, Encode};
+use sc_executor::{NativeVersion, RuntimeVersion};
+use sp_core::NativeOrEncoded;
+use sp_externalities::Extensions;
 use sp_runtime::{
-	generic::BlockId, traits::{Block as BlockT, HashFor},
-};
-use sp_state_machine::{
-	OverlayedChanges, ExecutionManager, ExecutionStrategy, StorageProof,
+	generic::BlockId,
+	traits::{Block as BlockT, HashFor},
 };
-use sc_executor::{RuntimeVersion, NativeVersion};
-use sp_externalities::Extensions;
-use sp_core::NativeOrEncoded;
+use sp_state_machine::{ExecutionManager, ExecutionStrategy, OverlayedChanges, StorageProof};
+use std::{cell::RefCell, panic::UnwindSafe, result};
 
-use sp_api::{ProofRecorder, StorageTransactionCache};
 use crate::execution_extensions::ExecutionExtensions;
+use sp_api::{ProofRecorder, StorageTransactionCache};
 
 /// Executor Provider
 pub trait ExecutorProvider<Block: BlockT> {
@@ -73,7 +72,7 @@ pub trait CallExecutor<B: BlockT> {
 	fn contextual_call<
 		EM: Fn(
 			Result<NativeOrEncoded<R>, Self::Error>,
-			Result<NativeOrEncoded<R>, Self::Error>
+			Result<NativeOrEncoded<R>, Self::Error>,
 		) -> Result<NativeOrEncoded<R>, Self::Error>,
 		R: Encode + Decode + PartialEq,
 		NC: FnOnce() -> result::Result<R, sp_api::ApiError> + UnwindSafe,
@@ -83,14 +82,18 @@ pub trait CallExecutor<B: BlockT> {
 		method: &str,
 		call_data: &[u8],
 		changes: &RefCell<OverlayedChanges>,
-		storage_transaction_cache: Option<&RefCell<
-			StorageTransactionCache<B, <Self::Backend as crate::backend::Backend<B>>::State>,
-		>>,
+		storage_transaction_cache: Option<
+			&RefCell<
+				StorageTransactionCache<B, <Self::Backend as crate::backend::Backend<B>>::State>,
+			>,
+		>,
 		execution_manager: ExecutionManager<EM>,
 		native_call: Option<NC>,
 		proof_recorder: &Option<ProofRecorder<B>>,
 		extensions: Option<Extensions>,
-	) -> sp_blockchain::Result<NativeOrEncoded<R>> where ExecutionManager<EM>: Clone;
+	) -> sp_blockchain::Result<NativeOrEncoded<R>>
+	where
+		ExecutionManager<EM>: Clone;
 
 	/// Extract RuntimeVersion of given block
 	///
@@ -105,12 +108,13 @@ pub trait CallExecutor<B: BlockT> {
 		mut state: S,
 		overlay: &mut OverlayedChanges,
 		method: &str,
-		call_data: &[u8]
+		call_data: &[u8],
 	) -> Result<(Vec<u8>, StorageProof), sp_blockchain::Error> {
-		let trie_state = state.as_trie_backend()
-			.ok_or_else(||
-				sp_blockchain::Error::from_state(Box::new(sp_state_machine::ExecutionError::UnableToGenerateProof) as Box<_>)
-			)?;
+		let trie_state = state.as_trie_backend().ok_or_else(|| {
+			sp_blockchain::Error::from_state(Box::new(
+				sp_state_machine::ExecutionError::UnableToGenerateProof,
+			) as Box<_>)
+		})?;
 		self.prove_at_trie_state(trie_state, overlay, method, call_data)
 	}
 
@@ -122,7 +126,7 @@ pub trait CallExecutor<B: BlockT> {
 		trie_state: &sp_state_machine::TrieBackend<S, HashFor<B>>,
 		overlay: &mut OverlayedChanges,
 		method: &str,
-		call_data: &[u8]
+		call_data: &[u8],
 	) -> Result<(Vec<u8>, StorageProof), sp_blockchain::Error>;
 
 	/// Get runtime version if supported.
diff --git a/client/api/src/cht.rs b/client/api/src/cht.rs
index 96a5a272916e..50b54a17f8c0 100644
--- a/client/api/src/cht.rs
+++ b/client/api/src/cht.rs
@@ -25,15 +25,15 @@
 //! root hash. A correct proof implies that the claimed block is identical to the one
 //! we discarded.
 
-use hash_db;
 use codec::Encode;
+use hash_db;
 use sp_trie;
 
-use sp_core::{H256, convert_hash};
-use sp_runtime::traits::{Header as HeaderT, AtLeast32Bit, Zero, One};
+use sp_core::{convert_hash, H256};
+use sp_runtime::traits::{AtLeast32Bit, Header as HeaderT, One, Zero};
 use sp_state_machine::{
-	MemoryDB, TrieBackend, Backend as StateBackend, StorageProof, InMemoryBackend,
-	prove_read_on_trie_backend, read_proof_check, read_proof_check_on_proving_backend
+	prove_read_on_trie_backend, read_proof_check, read_proof_check_on_proving_backend,
+	Backend as StateBackend, InMemoryBackend, MemoryDB, StorageProof, TrieBackend,
 };
 
 use sp_blockchain::{Error as ClientError, Result as ClientResult};
@@ -49,17 +49,17 @@ pub fn size<N: From<u32>>() -> N {
 
 /// Returns Some(cht_number) if CHT is need to be built when the block with given number is canonized.
 pub fn is_build_required<N>(cht_size: N, block_num: N) -> Option<N>
-	where
-		N: Clone + AtLeast32Bit,
+where
+	N: Clone + AtLeast32Bit,
 {
 	let block_cht_num = block_to_cht_number(cht_size.clone(), block_num.clone())?;
 	let two = N::one() + N::one();
 	if block_cht_num < two {
-		return None;
+		return None
 	}
 	let cht_start = start_number(cht_size, block_cht_num.clone());
 	if cht_start != block_num {
-		return None;
+		return None
 	}
 
 	Some(block_cht_num - two)
@@ -67,13 +67,13 @@ pub fn is_build_required<N>(cht_size: N, block_num: N) -> Option<N>
 
 /// Returns Some(max_cht_number) if CHT has ever been built given maximal canonical block number.
 pub fn max_cht_number<N>(cht_size: N, max_canonical_block: N) -> Option<N>
-	where
-		N: Clone + AtLeast32Bit,
+where
+	N: Clone + AtLeast32Bit,
 {
 	let max_cht_number = block_to_cht_number(cht_size, max_canonical_block)?;
 	let two = N::one() + N::one();
 	if max_cht_number < two {
-		return None;
+		return None
 	}
 	Some(max_cht_number - two)
 }
@@ -86,16 +86,16 @@ pub fn compute_root<Header, Hasher, I>(
 	cht_num: Header::Number,
 	hashes: I,
 ) -> ClientResult<Hasher::Out>
-	where
-		Header: HeaderT,
-		Hasher: hash_db::Hasher,
-		Hasher::Out: Ord,
-		I: IntoIterator<Item=ClientResult<Option<Header::Hash>>>,
+where
+	Header: HeaderT,
+	Hasher: hash_db::Hasher,
+	Hasher::Out: Ord,
+	I: IntoIterator<Item = ClientResult<Option<Header::Hash>>>,
 {
 	use sp_trie::TrieConfiguration;
-	Ok(sp_trie::trie_types::Layout::<Hasher>::trie_root(
-		build_pairs::<Header, I>(cht_size, cht_num, hashes)?
-	))
+	Ok(sp_trie::trie_types::Layout::<Hasher>::trie_root(build_pairs::<Header, I>(
+		cht_size, cht_num, hashes,
+	)?))
 }
 
 /// Build CHT-based header proof.
@@ -103,26 +103,28 @@ pub fn build_proof<Header, Hasher, BlocksI, HashesI>(
 	cht_size: Header::Number,
 	cht_num: Header::Number,
 	blocks: BlocksI,
-	hashes: HashesI
+	hashes: HashesI,
 ) -> ClientResult<StorageProof>
-	where
-		Header: HeaderT,
-		Hasher: hash_db::Hasher,
-		Hasher::Out: Ord + codec::Codec,
-		BlocksI: IntoIterator<Item=Header::Number>,
-		HashesI: IntoIterator<Item=ClientResult<Option<Header::Hash>>>,
+where
+	Header: HeaderT,
+	Hasher: hash_db::Hasher,
+	Hasher::Out: Ord + codec::Codec,
+	BlocksI: IntoIterator<Item = Header::Number>,
+	HashesI: IntoIterator<Item = ClientResult<Option<Header::Hash>>>,
 {
 	let transaction = build_pairs::<Header, _>(cht_size, cht_num, hashes)?
 		.into_iter()
 		.map(|(k, v)| (k, Some(v)))
 		.collect::<Vec<_>>();
 	let mut storage = InMemoryBackend::<Hasher>::default().update(vec![(None, transaction)]);
-	let trie_storage = storage.as_trie_backend()
+	let trie_storage = storage
+		.as_trie_backend()
 		.expect("InMemoryState::as_trie_backend always returns Some; qed");
 	prove_read_on_trie_backend(
 		trie_storage,
 		blocks.into_iter().map(|number| encode_cht_key(number)),
-	).map_err(ClientError::from_state)
+	)
+	.map_err(ClientError::from_state)
 }
 
 /// Check CHT-based header proof.
@@ -132,25 +134,24 @@ pub fn check_proof<Header, Hasher>(
 	remote_hash: Header::Hash,
 	remote_proof: StorageProof,
 ) -> ClientResult<()>
-	where
-		Header: HeaderT,
-		Hasher: hash_db::Hasher,
-		Hasher::Out: Ord + codec::Codec,
+where
+	Header: HeaderT,
+	Hasher: hash_db::Hasher,
+	Hasher::Out: Ord + codec::Codec,
 {
 	do_check_proof::<Header, Hasher, _>(
 		local_root,
 		local_number,
 		remote_hash,
-		move |local_root, local_cht_key|
+		move |local_root, local_cht_key| {
 			read_proof_check::<Hasher, _>(
 				local_root,
 				remote_proof,
 				::std::iter::once(local_cht_key),
 			)
-			.map(|mut map| map
-				.remove(local_cht_key)
-				.expect("checked proof of local_cht_key; qed"))
-			.map_err(ClientError::from_state),
+			.map(|mut map| map.remove(local_cht_key).expect("checked proof of local_cht_key; qed"))
+			.map_err(ClientError::from_state)
+		},
 	)
 }
 
@@ -161,20 +162,19 @@ pub fn check_proof_on_proving_backend<Header, Hasher>(
 	remote_hash: Header::Hash,
 	proving_backend: &TrieBackend<MemoryDB<Hasher>, Hasher>,
 ) -> ClientResult<()>
-	where
-		Header: HeaderT,
-		Hasher: hash_db::Hasher,
-		Hasher::Out: Ord + codec::Codec,
+where
+	Header: HeaderT,
+	Hasher: hash_db::Hasher,
+	Hasher::Out: Ord + codec::Codec,
 {
 	do_check_proof::<Header, Hasher, _>(
 		local_root,
 		local_number,
 		remote_hash,
-		|_, local_cht_key|
-			read_proof_check_on_proving_backend::<Hasher>(
-				proving_backend,
-				local_cht_key,
-			).map_err(ClientError::from_state),
+		|_, local_cht_key| {
+			read_proof_check_on_proving_backend::<Hasher>(proving_backend, local_cht_key)
+				.map_err(ClientError::from_state)
+		},
 	)
 }
 
@@ -185,22 +185,22 @@ fn do_check_proof<Header, Hasher, F>(
 	remote_hash: Header::Hash,
 	checker: F,
 ) -> ClientResult<()>
-	where
-		Header: HeaderT,
-		Hasher: hash_db::Hasher,
-		Hasher::Out: Ord,
-		F: FnOnce(Hasher::Out, &[u8]) -> ClientResult<Option<Vec<u8>>>,
+where
+	Header: HeaderT,
+	Hasher: hash_db::Hasher,
+	Hasher::Out: Ord,
+	F: FnOnce(Hasher::Out, &[u8]) -> ClientResult<Option<Vec<u8>>>,
 {
 	let root: Hasher::Out = convert_hash(&local_root);
 	let local_cht_key = encode_cht_key(local_number);
 	let local_cht_value = checker(root, &local_cht_key)?;
 	let local_cht_value = local_cht_value.ok_or_else(|| ClientError::InvalidCHTProof)?;
-	let local_hash = decode_cht_value(&local_cht_value).ok_or_else(|| ClientError::InvalidCHTProof)?;
+	let local_hash =
+		decode_cht_value(&local_cht_value).ok_or_else(|| ClientError::InvalidCHTProof)?;
 	match &local_hash[..] == remote_hash.as_ref() {
 		true => Ok(()),
 		false => Err(ClientError::InvalidCHTProof.into()),
 	}
-
 }
 
 /// Group ordered blocks by CHT number and call functor with blocks of each group.
@@ -210,29 +210,31 @@ pub fn for_each_cht_group<Header, I, F, P>(
 	mut functor: F,
 	mut functor_param: P,
 ) -> ClientResult<()>
-	where
-		Header: HeaderT,
-		I: IntoIterator<Item=Header::Number>,
-		F: FnMut(P, Header::Number, Vec<Header::Number>) -> ClientResult<P>,
+where
+	Header: HeaderT,
+	I: IntoIterator<Item = Header::Number>,
+	F: FnMut(P, Header::Number, Vec<Header::Number>) -> ClientResult<P>,
 {
 	let mut current_cht_num = None;
 	let mut current_cht_blocks = Vec::new();
 	for block in blocks {
-		let new_cht_num = block_to_cht_number(cht_size, block).ok_or_else(|| ClientError::Backend(format!(
-				"Cannot compute CHT root for the block #{}", block))
-			)?;
+		let new_cht_num = block_to_cht_number(cht_size, block).ok_or_else(|| {
+			ClientError::Backend(format!("Cannot compute CHT root for the block #{}", block))
+		})?;
 
 		let advance_to_next_cht = current_cht_num.is_some() && current_cht_num != Some(new_cht_num);
 		if advance_to_next_cht {
-			let current_cht_num = current_cht_num.expect("advance_to_next_cht is true;
-				it is true only when current_cht_num is Some; qed");
-			assert!(new_cht_num > current_cht_num, "for_each_cht_group only supports ordered iterators");
-
-			functor_param = functor(
-				functor_param,
-				current_cht_num,
-				std::mem::take(&mut current_cht_blocks),
-			)?;
+			let current_cht_num = current_cht_num.expect(
+				"advance_to_next_cht is true;
+				it is true only when current_cht_num is Some; qed",
+			);
+			assert!(
+				new_cht_num > current_cht_num,
+				"for_each_cht_group only supports ordered iterators"
+			);
+
+			functor_param =
+				functor(functor_param, current_cht_num, std::mem::take(&mut current_cht_blocks))?;
 		}
 
 		current_cht_blocks.push(block);
@@ -240,11 +242,7 @@ pub fn for_each_cht_group<Header, I, F, P>(
 	}
 
 	if let Some(current_cht_num) = current_cht_num {
-		functor(
-			functor_param,
-			current_cht_num,
-			std::mem::take(&mut current_cht_blocks),
-		)?;
+		functor(functor_param, current_cht_num, std::mem::take(&mut current_cht_blocks))?;
 	}
 
 	Ok(())
@@ -254,26 +252,22 @@ pub fn for_each_cht_group<Header, I, F, P>(
 fn build_pairs<Header, I>(
 	cht_size: Header::Number,
 	cht_num: Header::Number,
-	hashes: I
+	hashes: I,
 ) -> ClientResult<Vec<(Vec<u8>, Vec<u8>)>>
-	where
-		Header: HeaderT,
-		I: IntoIterator<Item=ClientResult<Option<Header::Hash>>>,
+where
+	Header: HeaderT,
+	I: IntoIterator<Item = ClientResult<Option<Header::Hash>>>,
 {
 	let start_num = start_number(cht_size, cht_num);
 	let mut pairs = Vec::new();
 	let mut hash_index = Header::Number::zero();
 	for hash in hashes.into_iter() {
-		let hash = hash?.ok_or_else(|| ClientError::from(
-			ClientError::MissingHashRequiredForCHT
-		))?;
-		pairs.push((
-			encode_cht_key(start_num + hash_index).to_vec(),
-			encode_cht_value(hash)
-		));
+		let hash =
+			hash?.ok_or_else(|| ClientError::from(ClientError::MissingHashRequiredForCHT))?;
+		pairs.push((encode_cht_key(start_num + hash_index).to_vec(), encode_cht_value(hash)));
 		hash_index += Header::Number::one();
 		if hash_index == cht_size {
-			break;
+			break
 		}
 	}
 
@@ -325,7 +319,6 @@ pub fn decode_cht_value(value: &[u8]) -> Option<H256> {
 		32 => Some(H256::from_slice(&value[0..32])),
 		_ => None,
 	}
-
 }
 
 #[cfg(test)]
@@ -379,8 +372,12 @@ mod tests {
 
 	#[test]
 	fn build_pairs_fails_when_no_enough_blocks() {
-		assert!(build_pairs::<Header, _>(SIZE as _, 0,
-			::std::iter::repeat_with(|| Ok(Some(H256::from_low_u64_be(1)))).take(SIZE as usize / 2)).is_err());
+		assert!(build_pairs::<Header, _>(
+			SIZE as _,
+			0,
+			::std::iter::repeat_with(|| Ok(Some(H256::from_low_u64_be(1)))).take(SIZE as usize / 2)
+		)
+		.is_err());
 	}
 
 	#[test]
@@ -391,9 +388,12 @@ mod tests {
 			::std::iter::repeat_with(|| Ok(Some(H256::from_low_u64_be(1))))
 				.take(SIZE as usize / 2)
 				.chain(::std::iter::once(Ok(None)))
-				.chain(::std::iter::repeat_with(|| Ok(Some(H256::from_low_u64_be(2))))
-					.take(SIZE as usize / 2 - 1))
-		).is_err());
+				.chain(
+					::std::iter::repeat_with(|| Ok(Some(H256::from_low_u64_be(2))))
+						.take(SIZE as usize / 2 - 1)
+				)
+		)
+		.is_err());
 	}
 
 	#[test]
@@ -401,9 +401,9 @@ mod tests {
 		assert!(compute_root::<Header, BlakeTwo256, _>(
 			SIZE as _,
 			42,
-			::std::iter::repeat_with(|| Ok(Some(H256::from_low_u64_be(1))))
-				.take(SIZE as usize)
-		).is_ok());
+			::std::iter::repeat_with(|| Ok(Some(H256::from_low_u64_be(1)))).take(SIZE as usize)
+		)
+		.is_ok());
 	}
 
 	#[test]
@@ -413,9 +413,9 @@ mod tests {
 			SIZE as _,
 			0,
 			vec![(SIZE * 1000) as u64],
-			::std::iter::repeat_with(|| Ok(Some(H256::from_low_u64_be(1))))
-				.take(SIZE as usize)
-		).is_err());
+			::std::iter::repeat_with(|| Ok(Some(H256::from_low_u64_be(1)))).take(SIZE as usize)
+		)
+		.is_err());
 	}
 
 	#[test]
@@ -424,9 +424,9 @@ mod tests {
 			SIZE as _,
 			0,
 			vec![(SIZE / 2) as u64],
-			::std::iter::repeat_with(|| Ok(Some(H256::from_low_u64_be(1))))
-				.take(SIZE as usize)
-		).is_ok());
+			::std::iter::repeat_with(|| Ok(Some(H256::from_low_u64_be(1)))).take(SIZE as usize)
+		)
+		.is_ok());
 	}
 
 	#[test]
@@ -447,19 +447,27 @@ mod tests {
 		let _ = for_each_cht_group::<Header, _, _, _>(
 			cht_size,
 			vec![
-				cht_size * 2 + 1, cht_size * 2 + 2, cht_size * 2 + 5,
-				cht_size * 4 + 1, cht_size * 4 + 7,
-				cht_size * 6 + 1
-			], |_, cht_num, blocks| {
+				cht_size * 2 + 1,
+				cht_size * 2 + 2,
+				cht_size * 2 + 5,
+				cht_size * 4 + 1,
+				cht_size * 4 + 7,
+				cht_size * 6 + 1,
+			],
+			|_, cht_num, blocks| {
 				match cht_num {
-					2 => assert_eq!(blocks, vec![cht_size * 2 + 1, cht_size * 2 + 2, cht_size * 2 + 5]),
+					2 => assert_eq!(
+						blocks,
+						vec![cht_size * 2 + 1, cht_size * 2 + 2, cht_size * 2 + 5]
+					),
 					4 => assert_eq!(blocks, vec![cht_size * 4 + 1, cht_size * 4 + 7]),
 					6 => assert_eq!(blocks, vec![cht_size * 6 + 1]),
 					_ => unreachable!(),
 				}
 
 				Ok(())
-			}, ()
+			},
+			(),
 		);
 	}
 }
diff --git a/client/api/src/client.rs b/client/api/src/client.rs
index 3f4dfc8f35be..69c89f1aa5f6 100644
--- a/client/api/src/client.rs
+++ b/client/api/src/client.rs
@@ -18,20 +18,19 @@
 
 //! A set of APIs supported by the client along with their primitives.
 
-use std::{fmt, collections::HashSet, sync::Arc, convert::TryFrom};
+use sp_consensus::BlockOrigin;
 use sp_core::storage::StorageKey;
 use sp_runtime::{
-	traits::{Block as BlockT, NumberFor},
 	generic::{BlockId, SignedBlock},
+	traits::{Block as BlockT, NumberFor},
 	Justifications,
 };
-use sp_consensus::BlockOrigin;
+use std::{collections::HashSet, convert::TryFrom, fmt, sync::Arc};
 
-use crate::blockchain::Info;
-use crate::notifications::StorageEventStream;
-use sp_utils::mpsc::TracingUnboundedReceiver;
-use sp_blockchain;
+use crate::{blockchain::Info, notifications::StorageEventStream};
 use sc_transaction_pool_api::ChainEvent;
+use sp_blockchain;
+use sp_utils::mpsc::TracingUnboundedReceiver;
 
 /// Type that implements `futures::Stream` of block import events.
 pub type ImportNotifications<Block> = TracingUnboundedReceiver<BlockImportNotification<Block>>;
@@ -82,7 +81,7 @@ pub trait BlockBackend<Block: BlockT> {
 	/// Get block body by ID. Returns `None` if the body is not stored.
 	fn block_body(
 		&self,
-		id: &BlockId<Block>
+		id: &BlockId<Block>,
 	) -> sp_blockchain::Result<Option<Vec<<Block as BlockT>::Extrinsic>>>;
 
 	/// Get all indexed transactions for a block,
@@ -99,7 +98,8 @@ pub trait BlockBackend<Block: BlockT> {
 	fn block(&self, id: &BlockId<Block>) -> sp_blockchain::Result<Option<SignedBlock<Block>>>;
 
 	/// Get block status.
-	fn block_status(&self, id: &BlockId<Block>) -> sp_blockchain::Result<sp_consensus::BlockStatus>;
+	fn block_status(&self, id: &BlockId<Block>)
+		-> sp_blockchain::Result<sp_consensus::BlockStatus>;
 
 	/// Get block justifications for the block with the given id.
 	fn justifications(&self, id: &BlockId<Block>) -> sp_blockchain::Result<Option<Justifications>>;
@@ -107,14 +107,11 @@ pub trait BlockBackend<Block: BlockT> {
 	/// Get block hash by number.
 	fn block_hash(&self, number: NumberFor<Block>) -> sp_blockchain::Result<Option<Block::Hash>>;
 
-	/// Get single indexed transaction by content hash. 
+	/// Get single indexed transaction by content hash.
 	///
 	/// Note that this will only fetch transactions
 	/// that are indexed by the runtime with `storage_index_transaction`.
-	fn indexed_transaction(
-		&self,
-		hash: &Block::Hash,
-	) -> sp_blockchain::Result<Option<Vec<u8>>>;
+	fn indexed_transaction(&self, hash: &Block::Hash) -> sp_blockchain::Result<Option<Vec<u8>>>;
 
 	/// Check if transaction index exists.
 	fn has_indexed_transaction(&self, hash: &Block::Hash) -> sp_blockchain::Result<bool> {
@@ -125,8 +122,11 @@ pub trait BlockBackend<Block: BlockT> {
 /// Provide a list of potential uncle headers for a given block.
 pub trait ProvideUncles<Block: BlockT> {
 	/// Gets the uncles of the block with `target_hash` going back `max_generation` ancestors.
-	fn uncles(&self, target_hash: Block::Hash, max_generation: NumberFor<Block>)
-		-> sp_blockchain::Result<Vec<Block::Header>>;
+	fn uncles(
+		&self,
+		target_hash: Block::Hash,
+		max_generation: NumberFor<Block>,
+	) -> sp_blockchain::Result<Vec<Block::Header>>;
 }
 
 /// Client info
@@ -284,10 +284,7 @@ impl<B: BlockT> TryFrom<BlockImportNotification<B>> for ChainEvent<B> {
 
 	fn try_from(n: BlockImportNotification<B>) -> Result<Self, ()> {
 		if n.is_new_best {
-			Ok(Self::NewBestBlock {
-				hash: n.hash,
-				tree_route: n.tree_route,
-			})
+			Ok(Self::NewBestBlock { hash: n.hash, tree_route: n.tree_route })
 		} else {
 			Err(())
 		}
@@ -296,8 +293,6 @@ impl<B: BlockT> TryFrom<BlockImportNotification<B>> for ChainEvent<B> {
 
 impl<B: BlockT> From<FinalityNotification<B>> for ChainEvent<B> {
 	fn from(n: FinalityNotification<B>) -> Self {
-		Self::Finalized {
-			hash: n.hash,
-		}
+		Self::Finalized { hash: n.hash }
 	}
 }
diff --git a/client/api/src/execution_extensions.rs b/client/api/src/execution_extensions.rs
index fbde16afc795..ec44294b8a96 100644
--- a/client/api/src/execution_extensions.rs
+++ b/client/api/src/execution_extensions.rs
@@ -22,22 +22,19 @@
 //! strategy for the runtime calls and provide the right `Externalities`
 //! extensions to support APIs for particular execution context & capabilities.
 
-use std::sync::{Weak, Arc};
 use codec::Decode;
+use parking_lot::RwLock;
+use sc_transaction_pool_api::OffchainSubmitTransaction;
 use sp_core::{
+	offchain::{self, OffchainDbExt, OffchainWorkerExt, TransactionPoolExt},
 	ExecutionContext,
-	offchain::{self, OffchainWorkerExt, TransactionPoolExt, OffchainDbExt},
 };
+use sp_externalities::Extensions;
 use sp_keystore::{KeystoreExt, SyncCryptoStorePtr};
-use sp_runtime::{
-	generic::BlockId,
-	traits,
-};
-use sp_state_machine::{ExecutionManager, DefaultHandler};
+use sp_runtime::{generic::BlockId, traits};
 pub use sp_state_machine::ExecutionStrategy;
-use sp_externalities::Extensions;
-use parking_lot::RwLock;
-use sc_transaction_pool_api::OffchainSubmitTransaction;
+use sp_state_machine::{DefaultHandler, ExecutionManager};
+use std::sync::{Arc, Weak};
 
 /// Execution strategies settings.
 #[derive(Debug, Clone)]
@@ -151,7 +148,8 @@ impl<Block: traits::Block> ExecutionExtensions<Block> {
 
 	/// Register transaction pool extension.
 	pub fn register_transaction_pool<T>(&self, pool: &Arc<T>)
-		where T: OffchainSubmitTransaction<Block> + 'static
+	where
+		T: OffchainSubmitTransaction<Block> + 'static,
 	{
 		*self.transaction_pool.write() = Some(Arc::downgrade(&pool) as _);
 	}
@@ -171,14 +169,10 @@ impl<Block: traits::Block> ExecutionExtensions<Block> {
 
 		if capabilities.has(offchain::Capability::TransactionPool) {
 			if let Some(pool) = self.transaction_pool.read().as_ref().and_then(|x| x.upgrade()) {
-				extensions.register(
-					TransactionPoolExt(
-						Box::new(TransactionPoolAdapter {
-							at: *at,
-							pool,
-						}) as _
-					),
-				);
+				extensions
+					.register(TransactionPoolExt(
+						Box::new(TransactionPoolAdapter { at: *at, pool }) as _,
+					));
 			}
 		}
 
@@ -186,19 +180,18 @@ impl<Block: traits::Block> ExecutionExtensions<Block> {
 			capabilities.has(offchain::Capability::OffchainDbWrite)
 		{
 			if let Some(offchain_db) = self.offchain_db.as_ref() {
-				extensions.register(
-					OffchainDbExt::new(offchain::LimitedExternalities::new(
-						capabilities,
-						offchain_db.create(),
-					))
-				);
+				extensions.register(OffchainDbExt::new(offchain::LimitedExternalities::new(
+					capabilities,
+					offchain_db.create(),
+				)));
 			}
 		}
 
 		if let ExecutionContext::OffchainCall(Some(ext)) = context {
-			extensions.register(
-				OffchainWorkerExt::new(offchain::LimitedExternalities::new(capabilities, ext.0)),
-			);
+			extensions.register(OffchainWorkerExt::new(offchain::LimitedExternalities::new(
+				capabilities,
+				ext.0,
+			)));
 		}
 
 		extensions
@@ -212,21 +205,14 @@ impl<Block: traits::Block> ExecutionExtensions<Block> {
 		&self,
 		at: &BlockId<Block>,
 		context: ExecutionContext,
-	) -> (
-		ExecutionManager<DefaultHandler<R, E>>,
-		Extensions,
-	) {
+	) -> (ExecutionManager<DefaultHandler<R, E>>, Extensions) {
 		let manager = match context {
-			ExecutionContext::BlockConstruction =>
-				self.strategies.block_construction.get_manager(),
-			ExecutionContext::Syncing =>
-				self.strategies.syncing.get_manager(),
-			ExecutionContext::Importing =>
-				self.strategies.importing.get_manager(),
+			ExecutionContext::BlockConstruction => self.strategies.block_construction.get_manager(),
+			ExecutionContext::Syncing => self.strategies.syncing.get_manager(),
+			ExecutionContext::Importing => self.strategies.importing.get_manager(),
 			ExecutionContext::OffchainCall(Some((_, capabilities))) if capabilities.has_all() =>
 				self.strategies.offchain_worker.get_manager(),
-			ExecutionContext::OffchainCall(_) =>
-				self.strategies.other.get_manager(),
+			ExecutionContext::OffchainCall(_) => self.strategies.other.get_manager(),
 		};
 
 		(manager, self.extensions(at, context))
@@ -245,7 +231,7 @@ impl<Block: traits::Block> offchain::TransactionPool for TransactionPoolAdapter<
 			Ok(xt) => xt,
 			Err(e) => {
 				log::warn!("Unable to decode extrinsic: {:?}: {}", data, e);
-				return Err(());
+				return Err(())
 			},
 		};
 
diff --git a/client/api/src/in_mem.rs b/client/api/src/in_mem.rs
index 505b69981694..e8fce19f8124 100644
--- a/client/api/src/in_mem.rs
+++ b/client/api/src/in_mem.rs
@@ -18,30 +18,31 @@
 
 //! In memory client backend
 
-use std::collections::{HashMap, HashSet};
-use std::ptr;
-use std::sync::Arc;
 use parking_lot::RwLock;
+use sp_blockchain::{CachedHeaderMetadata, HeaderMetadata};
 use sp_core::{
-	storage::well_known_keys, offchain::storage::InMemOffchainStorage as OffchainStorage,
+	offchain::storage::InMemOffchainStorage as OffchainStorage, storage::well_known_keys,
+};
+use sp_runtime::{
+	generic::BlockId,
+	traits::{Block as BlockT, HashFor, Header as HeaderT, NumberFor, Zero},
+	Justification, Justifications, Storage,
 };
-use sp_runtime::generic::BlockId;
-use sp_runtime::traits::{Block as BlockT, Header as HeaderT, Zero, NumberFor, HashFor};
-use sp_runtime::{Justification, Justifications, Storage};
 use sp_state_machine::{
-	ChangesTrieTransaction, InMemoryBackend, Backend as StateBackend, StorageCollection,
-	ChildStorageCollection, IndexOperation,
+	Backend as StateBackend, ChangesTrieTransaction, ChildStorageCollection, InMemoryBackend,
+	IndexOperation, StorageCollection,
+};
+use std::{
+	collections::{HashMap, HashSet},
+	ptr,
+	sync::Arc,
 };
-use sp_blockchain::{CachedHeaderMetadata, HeaderMetadata};
 
 use crate::{
 	backend::{self, NewBlockState, ProvideChtRoots},
-	blockchain::{
-		self, BlockStatus, HeaderBackend, well_known_cache_keys::Id as CacheKeyId
-	},
-	UsageInfo,
-	light,
+	blockchain::{self, well_known_cache_keys::Id as CacheKeyId, BlockStatus, HeaderBackend},
 	leaves::LeafSet,
+	light, UsageInfo,
 };
 
 struct PendingBlock<B: BlockT> {
@@ -56,7 +57,11 @@ enum StoredBlock<B: BlockT> {
 }
 
 impl<B: BlockT> StoredBlock<B> {
-	fn new(header: B::Header, body: Option<Vec<B::Extrinsic>>, just: Option<Justifications>) -> Self {
+	fn new(
+		header: B::Header,
+		body: Option<Vec<B::Extrinsic>>,
+		just: Option<Justifications>,
+	) -> Self {
 		match body {
 			Some(body) => StoredBlock::Full(B::new(header, body), just),
 			None => StoredBlock::Header(header, just),
@@ -72,7 +77,7 @@ impl<B: BlockT> StoredBlock<B> {
 
 	fn justifications(&self) -> Option<&Justifications> {
 		match *self {
-			StoredBlock::Header(_, ref j) | StoredBlock::Full(_, ref j) => j.as_ref()
+			StoredBlock::Header(_, ref j) | StoredBlock::Full(_, ref j) => j.as_ref(),
 		}
 	}
 
@@ -89,7 +94,7 @@ impl<B: BlockT> StoredBlock<B> {
 			StoredBlock::Full(block, just) => {
 				let (header, body) = block.deconstruct();
 				(header, Some(body), just)
-			}
+			},
 		}
 	}
 }
@@ -123,9 +128,7 @@ impl<Block: BlockT> Default for Blockchain<Block> {
 impl<Block: BlockT + Clone> Clone for Blockchain<Block> {
 	fn clone(&self) -> Self {
 		let storage = Arc::new(RwLock::new(self.storage.read().clone()));
-		Blockchain {
-			storage,
-		}
+		Blockchain { storage }
 	}
 }
 
@@ -140,23 +143,20 @@ impl<Block: BlockT> Blockchain<Block> {
 
 	/// Create new in-memory blockchain storage.
 	pub fn new() -> Blockchain<Block> {
-		let storage = Arc::new(RwLock::new(
-			BlockchainStorage {
-				blocks: HashMap::new(),
-				hashes: HashMap::new(),
-				best_hash: Default::default(),
-				best_number: Zero::zero(),
-				finalized_hash: Default::default(),
-				finalized_number: Zero::zero(),
-				genesis_hash: Default::default(),
-				header_cht_roots: HashMap::new(),
-				changes_trie_cht_roots: HashMap::new(),
-				leaves: LeafSet::new(),
-				aux: HashMap::new(),
-			}));
-		Blockchain {
-			storage,
-		}
+		let storage = Arc::new(RwLock::new(BlockchainStorage {
+			blocks: HashMap::new(),
+			hashes: HashMap::new(),
+			best_hash: Default::default(),
+			best_number: Zero::zero(),
+			finalized_hash: Default::default(),
+			finalized_number: Zero::zero(),
+			genesis_hash: Default::default(),
+			header_cht_roots: HashMap::new(),
+			changes_trie_cht_roots: HashMap::new(),
+			leaves: LeafSet::new(),
+			aux: HashMap::new(),
+		}));
+		Blockchain { storage }
 	}
 
 	/// Insert a block header and associated data.
@@ -175,8 +175,12 @@ impl<Block: BlockT> Blockchain<Block> {
 
 		{
 			let mut storage = self.storage.write();
-			storage.leaves.import(hash.clone(), number.clone(), header.parent_hash().clone());
-			storage.blocks.insert(hash.clone(), StoredBlock::new(header, body, justifications));
+			storage
+				.leaves
+				.import(hash.clone(), number.clone(), header.parent_hash().clone());
+			storage
+				.blocks
+				.insert(hash.clone(), StoredBlock::new(header, body, justifications));
 
 			if let NewBlockState::Final = new_state {
 				storage.finalized_hash = hash;
@@ -200,7 +204,7 @@ impl<Block: BlockT> Blockchain<Block> {
 	pub fn equals_to(&self, other: &Self) -> bool {
 		// Check ptr equality first to avoid double read locks.
 		if ptr::eq(self, other) {
-			return true;
+			return true
 		}
 		self.canon_equals_to(other) && self.storage.read().blocks == other.storage.read().blocks
 	}
@@ -209,14 +213,14 @@ impl<Block: BlockT> Blockchain<Block> {
 	pub fn canon_equals_to(&self, other: &Self) -> bool {
 		// Check ptr equality first to avoid double read locks.
 		if ptr::eq(self, other) {
-			return true;
+			return true
 		}
 		let this = self.storage.read();
 		let other = other.storage.read();
-			this.hashes == other.hashes
-			&& this.best_hash == other.best_hash
-			&& this.best_number == other.best_number
-			&& this.genesis_hash == other.genesis_hash
+		this.hashes == other.hashes &&
+			this.best_hash == other.best_hash &&
+			this.best_number == other.best_number &&
+			this.genesis_hash == other.genesis_hash
 	}
 
 	/// Insert header CHT root.
@@ -226,7 +230,8 @@ impl<Block: BlockT> Blockchain<Block> {
 
 	/// Set an existing block as head.
 	pub fn set_head(&self, id: BlockId<Block>) -> sp_blockchain::Result<()> {
-		let header = self.header(id)?
+		let header = self
+			.header(id)?
 			.ok_or_else(|| sp_blockchain::Error::UnknownBlock(format!("{}", id)))?;
 
 		self.apply_head(&header)
@@ -270,7 +275,11 @@ impl<Block: BlockT> Blockchain<Block> {
 		Ok(())
 	}
 
-	fn finalize_header(&self, id: BlockId<Block>, justification: Option<Justification>) -> sp_blockchain::Result<()> {
+	fn finalize_header(
+		&self,
+		id: BlockId<Block>,
+		justification: Option<Justification>,
+	) -> sp_blockchain::Result<()> {
 		let hash = match self.header(id)? {
 			Some(h) => h.hash(),
 			None => return Err(sp_blockchain::Error::UnknownBlock(format!("{}", id))),
@@ -280,11 +289,13 @@ impl<Block: BlockT> Blockchain<Block> {
 		storage.finalized_hash = hash;
 
 		if justification.is_some() {
-			let block = storage.blocks.get_mut(&hash)
+			let block = storage
+				.blocks
+				.get_mut(&hash)
 				.expect("hash was fetched from a block in the db; qed");
 
 			let block_justifications = match block {
-				StoredBlock::Header(_, ref mut j) | StoredBlock::Full(_, ref mut j) => j
+				StoredBlock::Header(_, ref mut j) | StoredBlock::Full(_, ref mut j) => j,
 			};
 
 			*block_justifications = justification.map(Justifications::from);
@@ -293,9 +304,11 @@ impl<Block: BlockT> Blockchain<Block> {
 		Ok(())
 	}
 
-	fn append_justification(&self, id: BlockId<Block>, justification: Justification)
-		-> sp_blockchain::Result<()>
-	{
+	fn append_justification(
+		&self,
+		id: BlockId<Block>,
+		justification: Justification,
+	) -> sp_blockchain::Result<()> {
 		let hash = self.expect_block_hash_from_id(&id)?;
 		let mut storage = self.storage.write();
 
@@ -305,14 +318,14 @@ impl<Block: BlockT> Blockchain<Block> {
 			.expect("hash was fetched from a block in the db; qed");
 
 		let block_justifications = match block {
-			StoredBlock::Header(_, ref mut j) | StoredBlock::Full(_, ref mut j) => j
+			StoredBlock::Header(_, ref mut j) | StoredBlock::Full(_, ref mut j) => j,
 		};
 
 		if let Some(stored_justifications) = block_justifications {
 			if !stored_justifications.append(justification) {
 				return Err(sp_blockchain::Error::BadJustification(
-					"Duplicate consensus engine ID".into()
-				));
+					"Duplicate consensus engine ID".into(),
+				))
 			}
 		} else {
 			*block_justifications = Some(Justifications::from(justification));
@@ -333,10 +346,13 @@ impl<Block: BlockT> Blockchain<Block> {
 }
 
 impl<Block: BlockT> HeaderBackend<Block> for Blockchain<Block> {
-	fn header(&self, id: BlockId<Block>) -> sp_blockchain::Result<Option<<Block as BlockT>::Header>> {
-		Ok(self.id(id).and_then(|hash| {
-			self.storage.read().blocks.get(&hash).map(|b| b.header().clone())
-		}))
+	fn header(
+		&self,
+		id: BlockId<Block>,
+	) -> sp_blockchain::Result<Option<<Block as BlockT>::Header>> {
+		Ok(self
+			.id(id)
+			.and_then(|hash| self.storage.read().blocks.get(&hash).map(|b| b.header().clone())))
 	}
 
 	fn info(&self) -> blockchain::Info<Block> {
@@ -352,7 +368,7 @@ impl<Block: BlockT> HeaderBackend<Block> for Blockchain<Block> {
 			} else {
 				None
 			},
-			number_leaves: storage.leaves.count()
+			number_leaves: storage.leaves.count(),
 		}
 	}
 
@@ -367,7 +383,10 @@ impl<Block: BlockT> HeaderBackend<Block> for Blockchain<Block> {
 		Ok(self.storage.read().blocks.get(&hash).map(|b| *b.header().number()))
 	}
 
-	fn hash(&self, number: <<Block as BlockT>::Header as HeaderT>::Number) -> sp_blockchain::Result<Option<Block::Hash>> {
+	fn hash(
+		&self,
+		number: <<Block as BlockT>::Header as HeaderT>::Number,
+	) -> sp_blockchain::Result<Option<Block::Hash>> {
 		Ok(self.id(BlockId::Number(number)))
 	}
 }
@@ -375,9 +394,15 @@ impl<Block: BlockT> HeaderBackend<Block> for Blockchain<Block> {
 impl<Block: BlockT> HeaderMetadata<Block> for Blockchain<Block> {
 	type Error = sp_blockchain::Error;
 
-	fn header_metadata(&self, hash: Block::Hash) -> Result<CachedHeaderMetadata<Block>, Self::Error> {
-		self.header(BlockId::hash(hash))?.map(|header| CachedHeaderMetadata::from(&header))
-			.ok_or_else(|| sp_blockchain::Error::UnknownBlock(format!("header not found: {}", hash)))
+	fn header_metadata(
+		&self,
+		hash: Block::Hash,
+	) -> Result<CachedHeaderMetadata<Block>, Self::Error> {
+		self.header(BlockId::hash(hash))?
+			.map(|header| CachedHeaderMetadata::from(&header))
+			.ok_or_else(|| {
+				sp_blockchain::Error::UnknownBlock(format!("header not found: {}", hash))
+			})
 	}
 
 	fn insert_header_metadata(&self, _hash: Block::Hash, _metadata: CachedHeaderMetadata<Block>) {
@@ -389,17 +414,27 @@ impl<Block: BlockT> HeaderMetadata<Block> for Blockchain<Block> {
 }
 
 impl<Block: BlockT> blockchain::Backend<Block> for Blockchain<Block> {
-	fn body(&self, id: BlockId<Block>) -> sp_blockchain::Result<Option<Vec<<Block as BlockT>::Extrinsic>>> {
+	fn body(
+		&self,
+		id: BlockId<Block>,
+	) -> sp_blockchain::Result<Option<Vec<<Block as BlockT>::Extrinsic>>> {
 		Ok(self.id(id).and_then(|hash| {
-			self.storage.read().blocks.get(&hash)
+			self.storage
+				.read()
+				.blocks
+				.get(&hash)
 				.and_then(|b| b.extrinsics().map(|x| x.to_vec()))
 		}))
 	}
 
 	fn justifications(&self, id: BlockId<Block>) -> sp_blockchain::Result<Option<Justifications>> {
-		Ok(self.id(id).and_then(|hash| self.storage.read().blocks.get(&hash).and_then(|b|
-			b.justifications().map(|x| x.clone()))
-		))
+		Ok(self.id(id).and_then(|hash| {
+			self.storage
+				.read()
+				.blocks
+				.get(&hash)
+				.and_then(|b| b.justifications().map(|x| x.clone()))
+		}))
 	}
 
 	fn last_finalized(&self) -> sp_blockchain::Result<Block::Hash> {
@@ -418,16 +453,13 @@ impl<Block: BlockT> blockchain::Backend<Block> for Blockchain<Block> {
 		unimplemented!()
 	}
 
-	fn indexed_transaction(
-		&self,
-		_hash: &Block::Hash,
-	) -> sp_blockchain::Result<Option<Vec<u8>>> {
+	fn indexed_transaction(&self, _hash: &Block::Hash) -> sp_blockchain::Result<Option<Vec<u8>>> {
 		unimplemented!("Not supported by the in-mem backend.")
 	}
 
 	fn block_indexed_body(
 		&self,
-		_id: BlockId<Block>
+		_id: BlockId<Block>,
 	) -> sp_blockchain::Result<Option<Vec<Vec<u8>>>> {
 		unimplemented!("Not supported by the in-mem backend.")
 	}
@@ -444,9 +476,13 @@ impl<Block: BlockT> backend::AuxStore for Blockchain<Block> {
 		'a,
 		'b: 'a,
 		'c: 'a,
-		I: IntoIterator<Item=&'a(&'c [u8], &'c [u8])>,
-		D: IntoIterator<Item=&'a &'b [u8]>,
-	>(&self, insert: I, delete: D) -> sp_blockchain::Result<()> {
+		I: IntoIterator<Item = &'a (&'c [u8], &'c [u8])>,
+		D: IntoIterator<Item = &'a &'b [u8]>,
+	>(
+		&self,
+		insert: I,
+		delete: D,
+	) -> sp_blockchain::Result<()> {
 		let mut storage = self.storage.write();
 		for (k, v) in insert {
 			storage.aux.insert(k.to_vec(), v.to_vec());
@@ -463,8 +499,8 @@ impl<Block: BlockT> backend::AuxStore for Blockchain<Block> {
 }
 
 impl<Block: BlockT> light::Storage<Block> for Blockchain<Block>
-	where
-		Block::Hash: From<[u8; 32]>,
+where
+	Block::Hash: From<[u8; 32]>,
 {
 	fn import_header(
 		&self,
@@ -507,8 +543,14 @@ impl<Block: BlockT> ProvideChtRoots<Block> for Blockchain<Block> {
 		_cht_size: NumberFor<Block>,
 		block: NumberFor<Block>,
 	) -> sp_blockchain::Result<Option<Block::Hash>> {
-		self.storage.read().header_cht_roots.get(&block).cloned()
-			.ok_or_else(|| sp_blockchain::Error::Backend(format!("Header CHT for block {} not exists", block)))
+		self.storage
+			.read()
+			.header_cht_roots
+			.get(&block)
+			.cloned()
+			.ok_or_else(|| {
+				sp_blockchain::Error::Backend(format!("Header CHT for block {} not exists", block))
+			})
 			.map(Some)
 	}
 
@@ -517,8 +559,17 @@ impl<Block: BlockT> ProvideChtRoots<Block> for Blockchain<Block> {
 		_cht_size: NumberFor<Block>,
 		block: NumberFor<Block>,
 	) -> sp_blockchain::Result<Option<Block::Hash>> {
-		self.storage.read().changes_trie_cht_roots.get(&block).cloned()
-			.ok_or_else(|| sp_blockchain::Error::Backend(format!("Changes trie CHT for block {} not exists", block)))
+		self.storage
+			.read()
+			.changes_trie_cht_roots
+			.get(&block)
+			.cloned()
+			.ok_or_else(|| {
+				sp_blockchain::Error::Backend(format!(
+					"Changes trie CHT for block {} not exists",
+					block
+				))
+			})
 			.map(Some)
 	}
 }
@@ -527,25 +578,30 @@ impl<Block: BlockT> ProvideChtRoots<Block> for Blockchain<Block> {
 pub struct BlockImportOperation<Block: BlockT> {
 	pending_block: Option<PendingBlock<Block>>,
 	old_state: InMemoryBackend<HashFor<Block>>,
-	new_state: Option<<InMemoryBackend<HashFor<Block>> as StateBackend<HashFor<Block>>>::Transaction>,
+	new_state:
+		Option<<InMemoryBackend<HashFor<Block>> as StateBackend<HashFor<Block>>>::Transaction>,
 	aux: Vec<(Vec<u8>, Option<Vec<u8>>)>,
 	finalized_blocks: Vec<(BlockId<Block>, Option<Justification>)>,
 	set_head: Option<BlockId<Block>>,
 }
 
-impl<Block: BlockT> BlockImportOperation<Block> where
+impl<Block: BlockT> BlockImportOperation<Block>
+where
 	Block::Hash: Ord,
 {
-	fn apply_storage(&mut self, storage: Storage, commit: bool) -> sp_blockchain::Result<Block::Hash> {
+	fn apply_storage(
+		&mut self,
+		storage: Storage,
+		commit: bool,
+	) -> sp_blockchain::Result<Block::Hash> {
 		check_genesis_storage(&storage)?;
 
-		let child_delta = storage.children_default.iter()
-			.map(|(_storage_key, child_content)|
-				(
-					&child_content.child_info,
-					child_content.data.iter().map(|(k, v)| (k.as_ref(), Some(v.as_ref())))
-				)
-			);
+		let child_delta = storage.children_default.iter().map(|(_storage_key, child_content)| {
+			(
+				&child_content.child_info,
+				child_content.data.iter().map(|(k, v)| (k.as_ref(), Some(v.as_ref()))),
+			)
+		});
 
 		let (root, transaction) = self.old_state.full_storage_root(
 			storage.top.iter().map(|(k, v)| (k.as_ref(), Some(v.as_ref()))),
@@ -559,7 +615,8 @@ impl<Block: BlockT> BlockImportOperation<Block> where
 	}
 }
 
-impl<Block: BlockT> backend::BlockImportOperation<Block> for BlockImportOperation<Block> where
+impl<Block: BlockT> backend::BlockImportOperation<Block> for BlockImportOperation<Block>
+where
 	Block::Hash: Ord,
 {
 	type State = InMemoryBackend<HashFor<Block>>;
@@ -577,10 +634,8 @@ impl<Block: BlockT> backend::BlockImportOperation<Block> for BlockImportOperatio
 		state: NewBlockState,
 	) -> sp_blockchain::Result<()> {
 		assert!(self.pending_block.is_none(), "Only one block per operation is allowed");
-		self.pending_block = Some(PendingBlock {
-			block: StoredBlock::new(header, body, justifications),
-			state,
-		});
+		self.pending_block =
+			Some(PendingBlock { block: StoredBlock::new(header, body, justifications), state });
 		Ok(())
 	}
 
@@ -601,7 +656,11 @@ impl<Block: BlockT> backend::BlockImportOperation<Block> for BlockImportOperatio
 		Ok(())
 	}
 
-	fn set_genesis_state(&mut self, storage: Storage, commit: bool) -> sp_blockchain::Result<Block::Hash> {
+	fn set_genesis_state(
+		&mut self,
+		storage: Storage,
+		commit: bool,
+	) -> sp_blockchain::Result<Block::Hash> {
 		self.apply_storage(storage, commit)
 	}
 
@@ -610,7 +669,8 @@ impl<Block: BlockT> backend::BlockImportOperation<Block> for BlockImportOperatio
 	}
 
 	fn insert_aux<I>(&mut self, ops: I) -> sp_blockchain::Result<()>
-		where I: IntoIterator<Item=(Vec<u8>, Option<Vec<u8>>)>
+	where
+		I: IntoIterator<Item = (Vec<u8>, Option<Vec<u8>>)>,
 	{
 		self.aux.append(&mut ops.into_iter().collect());
 		Ok(())
@@ -639,7 +699,10 @@ impl<Block: BlockT> backend::BlockImportOperation<Block> for BlockImportOperatio
 		Ok(())
 	}
 
-	fn update_transaction_index(&mut self, _index: Vec<IndexOperation>) -> sp_blockchain::Result<()> {
+	fn update_transaction_index(
+		&mut self,
+		_index: Vec<IndexOperation>,
+	) -> sp_blockchain::Result<()> {
 		Ok(())
 	}
 }
@@ -648,13 +711,19 @@ impl<Block: BlockT> backend::BlockImportOperation<Block> for BlockImportOperatio
 ///
 /// > **Warning**: Doesn't support all the features necessary for a proper database. Only use this
 /// > struct for testing purposes. Do **NOT** use in production.
-pub struct Backend<Block: BlockT> where Block::Hash: Ord {
+pub struct Backend<Block: BlockT>
+where
+	Block::Hash: Ord,
+{
 	states: RwLock<HashMap<Block::Hash, InMemoryBackend<HashFor<Block>>>>,
 	blockchain: Blockchain<Block>,
 	import_lock: RwLock<()>,
 }
 
-impl<Block: BlockT> Backend<Block> where Block::Hash: Ord {
+impl<Block: BlockT> Backend<Block>
+where
+	Block::Hash: Ord,
+{
 	/// Create a new instance of in-mem backend.
 	pub fn new() -> Self {
 		Backend {
@@ -665,14 +734,21 @@ impl<Block: BlockT> Backend<Block> where Block::Hash: Ord {
 	}
 }
 
-impl<Block: BlockT> backend::AuxStore for Backend<Block> where Block::Hash: Ord {
+impl<Block: BlockT> backend::AuxStore for Backend<Block>
+where
+	Block::Hash: Ord,
+{
 	fn insert_aux<
 		'a,
 		'b: 'a,
 		'c: 'a,
-		I: IntoIterator<Item=&'a(&'c [u8], &'c [u8])>,
-		D: IntoIterator<Item=&'a &'b [u8]>,
-	>(&self, insert: I, delete: D) -> sp_blockchain::Result<()> {
+		I: IntoIterator<Item = &'a (&'c [u8], &'c [u8])>,
+		D: IntoIterator<Item = &'a &'b [u8]>,
+	>(
+		&self,
+		insert: I,
+		delete: D,
+	) -> sp_blockchain::Result<()> {
 		self.blockchain.insert_aux(insert, delete)
 	}
 
@@ -681,7 +757,10 @@ impl<Block: BlockT> backend::AuxStore for Backend<Block> where Block::Hash: Ord
 	}
 }
 
-impl<Block: BlockT> backend::Backend<Block> for Backend<Block> where Block::Hash: Ord {
+impl<Block: BlockT> backend::Backend<Block> for Backend<Block>
+where
+	Block::Hash: Ord,
+{
 	type BlockImportOperation = BlockImportOperation<Block>;
 	type Blockchain = Blockchain<Block>;
 	type State = InMemoryBackend<HashFor<Block>>;
@@ -708,10 +787,7 @@ impl<Block: BlockT> backend::Backend<Block> for Backend<Block> where Block::Hash
 		Ok(())
 	}
 
-	fn commit_operation(
-		&self,
-		operation: Self::BlockImportOperation,
-	) -> sp_blockchain::Result<()> {
+	fn commit_operation(&self, operation: Self::BlockImportOperation) -> sp_blockchain::Result<()> {
 		if !operation.finalized_blocks.is_empty() {
 			for (block, justification) in operation.finalized_blocks {
 				self.blockchain.finalize_header(block, justification)?;
@@ -779,13 +855,13 @@ impl<Block: BlockT> backend::Backend<Block> for Backend<Block> where Block::Hash
 
 	fn state_at(&self, block: BlockId<Block>) -> sp_blockchain::Result<Self::State> {
 		match block {
-			BlockId::Hash(h) if h == Default::default() => {
-				return Ok(Self::State::default());
-			},
+			BlockId::Hash(h) if h == Default::default() => return Ok(Self::State::default()),
 			_ => {},
 		}
 
-		self.blockchain.id(block).and_then(|id| self.states.read().get(&id).cloned())
+		self.blockchain
+			.id(block)
+			.and_then(|id| self.states.read().get(&id).cloned())
 			.ok_or_else(|| sp_blockchain::Error::UnknownBlock(format!("{}", block)))
 	}
 
@@ -797,10 +873,7 @@ impl<Block: BlockT> backend::Backend<Block> for Backend<Block> where Block::Hash
 		Ok((Zero::zero(), HashSet::new()))
 	}
 
-	fn remove_leaf_block(
-		&self,
-		_hash: &Block::Hash,
-	) -> sp_blockchain::Result<()> {
+	fn remove_leaf_block(&self, _hash: &Block::Hash) -> sp_blockchain::Result<()> {
 		Ok(())
 	}
 
@@ -811,9 +884,13 @@ impl<Block: BlockT> backend::Backend<Block> for Backend<Block> where Block::Hash
 
 impl<Block: BlockT> backend::LocalBackend<Block> for Backend<Block> where Block::Hash: Ord {}
 
-impl<Block: BlockT> backend::RemoteBackend<Block> for Backend<Block> where Block::Hash: Ord {
+impl<Block: BlockT> backend::RemoteBackend<Block> for Backend<Block>
+where
+	Block::Hash: Ord,
+{
 	fn is_local_state_available(&self, block: &BlockId<Block>) -> bool {
-		self.blockchain.expect_block_number_from_id(block)
+		self.blockchain
+			.expect_block_number_from_id(block)
 			.map(|num| num.is_zero())
 			.unwrap_or(false)
 	}
@@ -826,12 +903,15 @@ impl<Block: BlockT> backend::RemoteBackend<Block> for Backend<Block> where Block
 /// Check that genesis storage is valid.
 pub fn check_genesis_storage(storage: &Storage) -> sp_blockchain::Result<()> {
 	if storage.top.iter().any(|(k, _)| well_known_keys::is_child_storage_key(k)) {
-		return Err(sp_blockchain::Error::InvalidState.into());
+		return Err(sp_blockchain::Error::InvalidState.into())
 	}
 
-	if storage.children_default.keys()
-		.any(|child_key| !well_known_keys::is_child_storage_key(&child_key)) {
-			return Err(sp_blockchain::Error::InvalidState.into());
+	if storage
+		.children_default
+		.keys()
+		.any(|child_key| !well_known_keys::is_child_storage_key(&child_key))
+	{
+		return Err(sp_blockchain::Error::InvalidState.into())
 	}
 
 	Ok(())
@@ -839,10 +919,10 @@ pub fn check_genesis_storage(storage: &Storage) -> sp_blockchain::Result<()> {
 
 #[cfg(test)]
 mod tests {
-	use crate::{NewBlockState, in_mem::Blockchain};
+	use crate::{in_mem::Blockchain, NewBlockState};
 	use sp_api::{BlockId, HeaderT};
-	use sp_runtime::{ConsensusEngineId, Justifications};
 	use sp_blockchain::Backend;
+	use sp_runtime::{ConsensusEngineId, Justifications};
 	use substrate_test_runtime::{Block, Header, H256};
 
 	pub const ID1: ConsensusEngineId = *b"TST1";
@@ -853,7 +933,13 @@ mod tests {
 			0 => Default::default(),
 			_ => header(number - 1).hash(),
 		};
-		Header::new(number, H256::from_low_u64_be(0), H256::from_low_u64_be(0), parent_hash, Default::default())
+		Header::new(
+			number,
+			H256::from_low_u64_be(0),
+			H256::from_low_u64_be(0),
+			parent_hash,
+			Default::default(),
+		)
 	}
 
 	fn test_blockchain() -> Blockchain<Block> {
@@ -862,10 +948,18 @@ mod tests {
 		let just1 = Some(Justifications::from((ID1, vec![1])));
 		let just2 = None;
 		let just3 = Some(Justifications::from((ID1, vec![3])));
-		blockchain.insert(header(0).hash(), header(0), just0, None, NewBlockState::Final).unwrap();
-		blockchain.insert(header(1).hash(), header(1), just1, None, NewBlockState::Final).unwrap();
-		blockchain.insert(header(2).hash(), header(2), just2, None, NewBlockState::Best).unwrap();
-		blockchain.insert(header(3).hash(), header(3), just3, None, NewBlockState::Final).unwrap();
+		blockchain
+			.insert(header(0).hash(), header(0), just0, None, NewBlockState::Final)
+			.unwrap();
+		blockchain
+			.insert(header(1).hash(), header(1), just1, None, NewBlockState::Final)
+			.unwrap();
+		blockchain
+			.insert(header(2).hash(), header(2), just2, None, NewBlockState::Best)
+			.unwrap();
+		blockchain
+			.insert(header(3).hash(), header(3), just3, None, NewBlockState::Final)
+			.unwrap();
 		blockchain
 	}
 
diff --git a/client/api/src/leaves.rs b/client/api/src/leaves.rs
index 0474d5bb8fe1..db5a25b451c5 100644
--- a/client/api/src/leaves.rs
+++ b/client/api/src/leaves.rs
@@ -18,12 +18,11 @@
 
 //! Helper for managing the set of available leaves in the chain for DB implementations.
 
-use std::collections::BTreeMap;
-use std::cmp::Reverse;
+use codec::{Decode, Encode};
+use sp_blockchain::{Error, Result};
 use sp_database::{Database, Transaction};
 use sp_runtime::traits::AtLeast32Bit;
-use codec::{Encode, Decode};
-use sp_blockchain::{Error, Result};
+use std::{cmp::Reverse, collections::BTreeMap};
 
 type DbHash = sp_core::H256;
 
@@ -57,7 +56,7 @@ impl<H, N: Ord> FinalizationDisplaced<H, N> {
 	}
 
 	/// Iterate over all displaced leaves.
-	pub fn leaves(&self) -> impl IntoIterator<Item=&H> {
+	pub fn leaves(&self) -> impl IntoIterator<Item = &H> {
 		self.leaves.values().flatten()
 	}
 }
@@ -72,17 +71,14 @@ pub struct LeafSet<H, N> {
 	pending_removed: Vec<H>,
 }
 
-impl<H, N> LeafSet<H, N> where
+impl<H, N> LeafSet<H, N>
+where
 	H: Clone + PartialEq + Decode + Encode,
 	N: std::fmt::Debug + Clone + AtLeast32Bit + Decode + Encode,
 {
 	/// Construct a new, blank leaf set.
 	pub fn new() -> Self {
-		Self {
-			storage: BTreeMap::new(),
-			pending_added: Vec::new(),
-			pending_removed: Vec::new(),
-		}
+		Self { storage: BTreeMap::new(), pending_added: Vec::new(), pending_removed: Vec::new() }
 	}
 
 	/// Read the leaf list from the DB, using given prefix for keys.
@@ -98,14 +94,10 @@ impl<H, N> LeafSet<H, N> where
 				for (number, hashes) in vals.into_iter() {
 					storage.insert(Reverse(number), hashes);
 				}
-			}
+			},
 			None => {},
 		}
-		Ok(Self {
-			storage,
-			pending_added: Vec::new(),
-			pending_removed: Vec::new(),
-		})
+		Ok(Self { storage, pending_added: Vec::new(), pending_removed: Vec::new() })
 	}
 
 	/// update the leaf list on import. returns a displaced leaf if there was one.
@@ -119,10 +111,7 @@ impl<H, N> LeafSet<H, N> where
 				self.pending_removed.push(parent_hash.clone());
 				Some(ImportDisplaced {
 					new_hash: hash.clone(),
-					displaced: LeafSetItem {
-						hash: parent_hash,
-						number: new_number,
-					},
+					displaced: LeafSetItem { hash: parent_hash, number: new_number },
 				})
 			} else {
 				None
@@ -144,16 +133,15 @@ impl<H, N> LeafSet<H, N> where
 	/// will be pruned soon afterwards anyway.
 	pub fn finalize_height(&mut self, number: N) -> FinalizationDisplaced<H, N> {
 		let boundary = if number == N::zero() {
-			return FinalizationDisplaced { leaves: BTreeMap::new() };
+			return FinalizationDisplaced { leaves: BTreeMap::new() }
 		} else {
 			number - N::one()
 		};
 
 		let below_boundary = self.storage.split_off(&Reverse(boundary));
-		self.pending_removed.extend(below_boundary.values().flat_map(|h| h.iter()).cloned());
-		FinalizationDisplaced {
-			leaves: below_boundary,
-		}
+		self.pending_removed
+			.extend(below_boundary.values().flat_map(|h| h.iter()).cloned());
+		FinalizationDisplaced { leaves: below_boundary }
 	}
 
 	/// Undo all pending operations.
@@ -169,7 +157,9 @@ impl<H, N> LeafSet<H, N> where
 	/// Revert to the given block height by dropping all leaves in the leaf set
 	/// with a block number higher than the target.
 	pub fn revert(&mut self, best_hash: H, best_number: N) {
-		let items = self.storage.iter()
+		let items = self
+			.storage
+			.iter()
 			.flat_map(|(number, hashes)| hashes.iter().map(move |h| (h.clone(), number.clone())))
 			.collect::<Vec<_>>();
 
@@ -185,7 +175,8 @@ impl<H, N> LeafSet<H, N> where
 		}
 
 		let best_number = Reverse(best_number);
-		let leaves_contains_best = self.storage
+		let leaves_contains_best = self
+			.storage
 			.get(&best_number)
 			.map_or(false, |hashes| hashes.contains(&best_hash));
 
@@ -209,7 +200,12 @@ impl<H, N> LeafSet<H, N> where
 	}
 
 	/// Write the leaf list to the database transaction.
-	pub fn prepare_transaction(&mut self, tx: &mut Transaction<DbHash>, column: u32, prefix: &[u8]) {
+	pub fn prepare_transaction(
+		&mut self,
+		tx: &mut Transaction<DbHash>,
+		column: u32,
+		prefix: &[u8],
+	) {
 		let leaves: Vec<_> = self.storage.iter().map(|(n, h)| (n.0.clone(), h.clone())).collect();
 		tx.set_from_vec(column, prefix, leaves.encode());
 		self.pending_added.clear();
@@ -218,7 +214,9 @@ impl<H, N> LeafSet<H, N> where
 
 	/// Check if given block is a leaf.
 	pub fn contains(&self, number: N, hash: H) -> bool {
-		self.storage.get(&Reverse(number)).map_or(false, |hashes| hashes.contains(&hash))
+		self.storage
+			.get(&Reverse(number))
+			.map_or(false, |hashes| hashes.contains(&hash))
 	}
 
 	fn insert_leaf(&mut self, number: Reverse<N>, hash: H) {
@@ -230,14 +228,18 @@ impl<H, N> LeafSet<H, N> where
 		let mut empty = false;
 		let removed = self.storage.get_mut(number).map_or(false, |leaves| {
 			let mut found = false;
-			leaves.retain(|h| if h == hash {
-				found = true;
-				false
-			} else {
-				true
+			leaves.retain(|h| {
+				if h == hash {
+					found = true;
+					false
+				} else {
+					true
+				}
 			});
 
-			if leaves.is_empty() { empty = true }
+			if leaves.is_empty() {
+				empty = true
+			}
 
 			found
 		});
@@ -255,7 +257,8 @@ pub struct Undo<'a, H: 'a, N: 'a> {
 	inner: &'a mut LeafSet<H, N>,
 }
 
-impl<'a, H: 'a, N: 'a> Undo<'a, H, N> where
+impl<'a, H: 'a, N: 'a> Undo<'a, H, N>
+where
 	H: Clone + PartialEq + Decode + Encode,
 	N: std::fmt::Debug + Clone + AtLeast32Bit + Decode + Encode,
 {
@@ -329,7 +332,7 @@ mod tests {
 	fn two_leaves_same_height_can_be_included() {
 		let mut set = LeafSet::new();
 
-		set.import(1_1u32, 10u32,0u32);
+		set.import(1_1u32, 10u32, 0u32);
 		set.import(1_2, 10, 0);
 
 		assert!(set.storage.contains_key(&Reverse(10)));
diff --git a/client/api/src/lib.rs b/client/api/src/lib.rs
index 71cf499f7994..16935b1e846c 100644
--- a/client/api/src/lib.rs
+++ b/client/api/src/lib.rs
@@ -21,30 +21,28 @@
 
 pub mod backend;
 pub mod call_executor;
-pub mod client;
 pub mod cht;
+pub mod client;
 pub mod execution_extensions;
 pub mod in_mem;
-pub mod light;
 pub mod leaves;
+pub mod light;
 pub mod notifications;
 pub mod proof_provider;
 
-pub use sp_blockchain as blockchain;
 pub use backend::*;
-pub use notifications::*;
 pub use call_executor::*;
 pub use client::*;
 pub use light::*;
 pub use notifications::*;
 pub use proof_provider::*;
+pub use sp_blockchain as blockchain;
 pub use sp_blockchain::HeaderBackend;
 
-pub use sp_state_machine::{StorageProof, ExecutionStrategy};
-pub use sp_storage::{StorageData, StorageKey, PrefixedStorageKey, ChildInfo};
+pub use sp_state_machine::{ExecutionStrategy, StorageProof};
+pub use sp_storage::{ChildInfo, PrefixedStorageKey, StorageData, StorageKey};
 
 /// Usage Information Provider interface
-///
 pub trait UsageProvider<Block: sp_runtime::traits::Block> {
 	/// Get usage info about current client.
 	fn usage_info(&self) -> ClientInfo<Block>;
@@ -52,7 +50,7 @@ pub trait UsageProvider<Block: sp_runtime::traits::Block> {
 
 /// Utility methods for the client.
 pub mod utils {
-	use sp_blockchain::{HeaderBackend, HeaderMetadata, Error};
+	use sp_blockchain::{Error, HeaderBackend, HeaderMetadata};
 	use sp_runtime::traits::Block as BlockT;
 	use std::borrow::Borrow;
 
@@ -66,19 +64,24 @@ pub mod utils {
 		client: &'a T,
 		current: Option<(Block::Hash, Block::Hash)>,
 	) -> impl Fn(&Block::Hash, &Block::Hash) -> Result<bool, Error> + 'a
-		where T: HeaderBackend<Block> + HeaderMetadata<Block, Error = Error>,
+	where
+		T: HeaderBackend<Block> + HeaderMetadata<Block, Error = Error>,
 	{
 		move |base, hash| {
-			if base == hash { return Ok(false); }
+			if base == hash {
+				return Ok(false)
+			}
 
 			let current = current.as_ref().map(|(c, p)| (c.borrow(), p.borrow()));
 
 			let mut hash = hash;
 			if let Some((current_hash, current_parent_hash)) = current {
-				if base == current_hash { return Ok(false); }
+				if base == current_hash {
+					return Ok(false)
+				}
 				if hash == current_hash {
 					if base == current_parent_hash {
-						return Ok(true);
+						return Ok(true)
 					} else {
 						hash = current_parent_hash;
 					}
diff --git a/client/api/src/light.rs b/client/api/src/light.rs
index a068e2d4a341..8638ddf741f3 100644
--- a/client/api/src/light.rs
+++ b/client/api/src/light.rs
@@ -18,23 +18,26 @@
 
 //! Substrate light client interfaces
 
-use std::sync::Arc;
-use std::collections::{BTreeMap, HashMap};
-use std::future::Future;
+use std::{
+	collections::{BTreeMap, HashMap},
+	future::Future,
+	sync::Arc,
+};
 
-use sp_runtime::{
-	traits::{
-		Block as BlockT, Header as HeaderT, NumberFor,
-	},
-	generic::BlockId
+use crate::{
+	backend::{AuxStore, NewBlockState},
+	ProvideChtRoots, UsageInfo,
 };
-use sp_core::{ChangesTrieConfigurationRange, storage::PrefixedStorageKey};
-use sp_state_machine::StorageProof;
 use sp_blockchain::{
-	HeaderMetadata, well_known_cache_keys, HeaderBackend, Cache as BlockchainCache,
-	Error as ClientError, Result as ClientResult,
+	well_known_cache_keys, Cache as BlockchainCache, Error as ClientError, HeaderBackend,
+	HeaderMetadata, Result as ClientResult,
+};
+use sp_core::{storage::PrefixedStorageKey, ChangesTrieConfigurationRange};
+use sp_runtime::{
+	generic::BlockId,
+	traits::{Block as BlockT, Header as HeaderT, NumberFor},
 };
-use crate::{backend::{AuxStore, NewBlockState}, UsageInfo, ProvideChtRoots};
+use sp_state_machine::StorageProof;
 
 /// Remote call request.
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
@@ -142,48 +145,48 @@ pub struct RemoteBodyRequest<Header: HeaderT> {
 /// is correct (see FetchedDataChecker) and return already checked data.
 pub trait Fetcher<Block: BlockT>: Send + Sync {
 	/// Remote header future.
-	type RemoteHeaderResult: Future<Output = Result<
-		Block::Header,
-		ClientError,
-	>> + Unpin + Send + 'static;
+	type RemoteHeaderResult: Future<Output = Result<Block::Header, ClientError>>
+		+ Unpin
+		+ Send
+		+ 'static;
 	/// Remote storage read future.
-	type RemoteReadResult: Future<Output = Result<
-		HashMap<Vec<u8>, Option<Vec<u8>>>,
-		ClientError,
-	>> + Unpin + Send + 'static;
+	type RemoteReadResult: Future<Output = Result<HashMap<Vec<u8>, Option<Vec<u8>>>, ClientError>>
+		+ Unpin
+		+ Send
+		+ 'static;
 	/// Remote call result future.
-	type RemoteCallResult: Future<Output = Result<
-		Vec<u8>,
-		ClientError,
-	>> + Unpin + Send + 'static;
+	type RemoteCallResult: Future<Output = Result<Vec<u8>, ClientError>> + Unpin + Send + 'static;
 	/// Remote changes result future.
-	type RemoteChangesResult: Future<Output = Result<
-		Vec<(NumberFor<Block>, u32)>,
-		ClientError,
-	>> + Unpin + Send + 'static;
+	type RemoteChangesResult: Future<Output = Result<Vec<(NumberFor<Block>, u32)>, ClientError>>
+		+ Unpin
+		+ Send
+		+ 'static;
 	/// Remote block body result future.
-	type RemoteBodyResult: Future<Output = Result<
-		Vec<Block::Extrinsic>,
-		ClientError,
-	>> + Unpin + Send + 'static;
+	type RemoteBodyResult: Future<Output = Result<Vec<Block::Extrinsic>, ClientError>>
+		+ Unpin
+		+ Send
+		+ 'static;
 
 	/// Fetch remote header.
-	fn remote_header(&self, request: RemoteHeaderRequest<Block::Header>) -> Self::RemoteHeaderResult;
-	/// Fetch remote storage value.
-	fn remote_read(
+	fn remote_header(
 		&self,
-		request: RemoteReadRequest<Block::Header>
-	) -> Self::RemoteReadResult;
+		request: RemoteHeaderRequest<Block::Header>,
+	) -> Self::RemoteHeaderResult;
+	/// Fetch remote storage value.
+	fn remote_read(&self, request: RemoteReadRequest<Block::Header>) -> Self::RemoteReadResult;
 	/// Fetch remote storage child value.
 	fn remote_read_child(
 		&self,
-		request: RemoteReadChildRequest<Block::Header>
+		request: RemoteReadChildRequest<Block::Header>,
 	) -> Self::RemoteReadResult;
 	/// Fetch remote call result.
 	fn remote_call(&self, request: RemoteCallRequest<Block::Header>) -> Self::RemoteCallResult;
 	/// Fetch remote changes ((block number, extrinsic index)) where given key has been changed
 	/// at a given blocks range.
-	fn remote_changes(&self, request: RemoteChangesRequest<Block::Header>) -> Self::RemoteChangesResult;
+	fn remote_changes(
+		&self,
+		request: RemoteChangesRequest<Block::Header>,
+	) -> Self::RemoteChangesResult;
 	/// Fetch remote block body
 	fn remote_body(&self, request: RemoteBodyRequest<Block::Header>) -> Self::RemoteBodyResult;
 }
@@ -222,20 +225,22 @@ pub trait FetchChecker<Block: BlockT>: Send + Sync {
 	fn check_changes_proof(
 		&self,
 		request: &RemoteChangesRequest<Block::Header>,
-		proof: ChangesProof<Block::Header>
+		proof: ChangesProof<Block::Header>,
 	) -> ClientResult<Vec<(NumberFor<Block>, u32)>>;
 	/// Check remote body proof.
 	fn check_body_proof(
 		&self,
 		request: &RemoteBodyRequest<Block::Header>,
-		body: Vec<Block::Extrinsic>
+		body: Vec<Block::Extrinsic>,
 	) -> ClientResult<Vec<Block::Extrinsic>>;
 }
 
-
 /// Light client blockchain storage.
-pub trait Storage<Block: BlockT>: AuxStore + HeaderBackend<Block>
-	+ HeaderMetadata<Block, Error=ClientError> + ProvideChtRoots<Block>
+pub trait Storage<Block: BlockT>:
+	AuxStore
+	+ HeaderBackend<Block>
+	+ HeaderMetadata<Block, Error = ClientError>
+	+ ProvideChtRoots<Block>
 {
 	/// Store new header. Should refuse to revert any finalized blocks.
 	///
@@ -280,10 +285,10 @@ pub enum LocalOrRemote<Data, Request> {
 /// locally, or fetches required data from remote node.
 pub trait RemoteBlockchain<Block: BlockT>: Send + Sync {
 	/// Get block header.
-	fn header(&self, id: BlockId<Block>) -> ClientResult<LocalOrRemote<
-		Block::Header,
-		RemoteHeaderRequest<Block::Header>,
-	>>;
+	fn header(
+		&self,
+		id: BlockId<Block>,
+	) -> ClientResult<LocalOrRemote<Block::Header, RemoteHeaderRequest<Block::Header>>>;
 }
 
 /// Returns future that resolves header either locally, or remotely.
@@ -295,11 +300,8 @@ pub fn future_header<Block: BlockT, F: Fetcher<Block>>(
 	use futures::future::{ready, Either, FutureExt};
 
 	match blockchain.header(id) {
-		Ok(LocalOrRemote::Remote(request)) => Either::Left(
-			fetcher
-				.remote_header(request)
-				.then(|header| ready(header.map(Some)))
-		),
+		Ok(LocalOrRemote::Remote(request)) =>
+			Either::Left(fetcher.remote_header(request).then(|header| ready(header.map(Some)))),
 		Ok(LocalOrRemote::Unknown) => Either::Right(ready(Ok(None))),
 		Ok(LocalOrRemote::Local(local_header)) => Either::Right(ready(Ok(Some(local_header)))),
 		Err(err) => Either::Right(ready(Err(err))),
@@ -308,11 +310,11 @@ pub fn future_header<Block: BlockT, F: Fetcher<Block>>(
 
 #[cfg(test)]
 pub mod tests {
+	use super::*;
 	use futures::future::Ready;
 	use parking_lot::Mutex;
 	use sp_blockchain::Error as ClientError;
-	use sp_test_primitives::{Block, Header, Extrinsic};
-	use super::*;
+	use sp_test_primitives::{Block, Extrinsic, Header};
 
 	#[derive(Debug, thiserror::Error)]
 	#[error("Not implemented on test node")]
@@ -322,12 +324,11 @@ pub mod tests {
 		fn into(self) -> ClientError {
 			ClientError::Application(Box::new(self))
 		}
-	}	
-	
+	}
+
 	pub type OkCallFetcher = Mutex<Vec<u8>>;
 
-	fn not_implemented_in_tests<T>() -> Ready<Result<T, ClientError>>
-	{
+	fn not_implemented_in_tests<T>() -> Ready<Result<T, ClientError>> {
 		futures::future::ready(Err(MockError.into()))
 	}
 
@@ -346,7 +347,10 @@ pub mod tests {
 			not_implemented_in_tests()
 		}
 
-		fn remote_read_child(&self, _request: RemoteReadChildRequest<Header>) -> Self::RemoteReadResult {
+		fn remote_read_child(
+			&self,
+			_request: RemoteReadChildRequest<Header>,
+		) -> Self::RemoteReadResult {
 			not_implemented_in_tests()
 		}
 
@@ -354,7 +358,10 @@ pub mod tests {
 			futures::future::ready(Ok((*self.lock()).clone()))
 		}
 
-		fn remote_changes(&self, _request: RemoteChangesRequest<Header>) -> Self::RemoteChangesResult {
+		fn remote_changes(
+			&self,
+			_request: RemoteChangesRequest<Header>,
+		) -> Self::RemoteChangesResult {
 			not_implemented_in_tests()
 		}
 
diff --git a/client/api/src/notifications.rs b/client/api/src/notifications.rs
index b043a332d667..3532568f9bd5 100644
--- a/client/api/src/notifications.rs
+++ b/client/api/src/notifications.rs
@@ -19,15 +19,15 @@
 //! Storage notifications
 
 use std::{
-	collections::{HashSet, HashMap},
+	collections::{HashMap, HashSet},
 	sync::Arc,
 };
 
-use fnv::{FnvHashSet, FnvHashMap};
-use sp_core::storage::{StorageKey, StorageData};
+use fnv::{FnvHashMap, FnvHashSet};
+use prometheus_endpoint::{register, CounterVec, Opts, Registry, U64};
+use sp_core::storage::{StorageData, StorageKey};
 use sp_runtime::traits::Block as BlockT;
-use sp_utils::mpsc::{TracingUnboundedSender, TracingUnboundedReceiver, tracing_unbounded};
-use prometheus_endpoint::{Registry, CounterVec, Opts, U64, register};
+use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 
 /// Storage change set
 #[derive(Debug)]
@@ -40,29 +40,34 @@ pub struct StorageChangeSet {
 
 impl StorageChangeSet {
 	/// Convert the change set into iterator over storage items.
-	pub fn iter<'a>(&'a self)
-		-> impl Iterator<Item=(Option<&'a StorageKey>, &'a StorageKey, Option<&'a StorageData>)> + 'a {
-		let top = self.changes
+	pub fn iter<'a>(
+		&'a self,
+	) -> impl Iterator<Item = (Option<&'a StorageKey>, &'a StorageKey, Option<&'a StorageData>)> + 'a
+	{
+		let top = self
+			.changes
 			.iter()
 			.filter(move |&(key, _)| match self.filter {
 				Some(ref filter) => filter.contains(key),
 				None => true,
 			})
-			.map(move |(k,v)| (None, k, v.as_ref()));
-		let children = self.child_changes
+			.map(move |(k, v)| (None, k, v.as_ref()));
+		let children = self
+			.child_changes
 			.iter()
-			.filter_map(move |(sk, changes)| 
-				self.child_filters.as_ref().and_then(|cf|
-					cf.get(sk).map(|filter| changes
+			.filter_map(move |(sk, changes)| {
+				self.child_filters.as_ref().and_then(|cf| {
+					cf.get(sk).map(|filter| {
+						changes
 							.iter()
 							.filter(move |&(key, _)| match filter {
 								Some(ref filter) => filter.contains(key),
 								None => true,
 							})
-							.map(move |(k,v)| (Some(sk), k, v.as_ref()))
-					)
-				)
-			)
+							.map(move |(k, v)| (Some(sk), k, v.as_ref()))
+					})
+				})
+			})
 			.flatten();
 		top.chain(children)
 	}
@@ -82,15 +87,18 @@ pub struct StorageNotifications<Block: BlockT> {
 	next_id: SubscriberId,
 	wildcard_listeners: FnvHashSet<SubscriberId>,
 	listeners: HashMap<StorageKey, FnvHashSet<SubscriberId>>,
-	child_listeners: HashMap<StorageKey, (
-		HashMap<StorageKey, FnvHashSet<SubscriberId>>,
-		FnvHashSet<SubscriberId>
-	)>,
-	sinks: FnvHashMap<SubscriberId, (
-		TracingUnboundedSender<(Block::Hash, StorageChangeSet)>,
-		Option<HashSet<StorageKey>>,
-		Option<HashMap<StorageKey, Option<HashSet<StorageKey>>>>,
-	)>,
+	child_listeners: HashMap<
+		StorageKey,
+		(HashMap<StorageKey, FnvHashSet<SubscriberId>>, FnvHashSet<SubscriberId>),
+	>,
+	sinks: FnvHashMap<
+		SubscriberId,
+		(
+			TracingUnboundedSender<(Block::Hash, StorageChangeSet)>,
+			Option<HashSet<StorageKey>>,
+			Option<HashMap<StorageKey, Option<HashSet<StorageKey>>>>,
+		),
+	>,
 }
 
 impl<Block: BlockT> Default for StorageNotifications<Block> {
@@ -110,16 +118,17 @@ impl<Block: BlockT> StorageNotifications<Block> {
 	/// Initialize a new StorageNotifications
 	/// optionally pass a prometheus registry to send subscriber metrics to
 	pub fn new(prometheus_registry: Option<Registry>) -> Self {
-		let metrics = prometheus_registry.and_then(|r|
+		let metrics = prometheus_registry.and_then(|r| {
 			CounterVec::new(
 				Opts::new(
 					"storage_notification_subscribers",
-					"Number of subscribers in storage notification sytem"
+					"Number of subscribers in storage notification sytem",
 				),
-				&["action"], //added | removed
-			).and_then(|g| register(g, &r))
+				&["action"], // added | removed
+			)
+			.and_then(|g| register(g, &r))
 			.ok()
-		);
+		});
 
 		StorageNotifications {
 			metrics,
@@ -137,17 +146,16 @@ impl<Block: BlockT> StorageNotifications<Block> {
 	pub fn trigger(
 		&mut self,
 		hash: &Block::Hash,
-		changeset: impl Iterator<Item=(Vec<u8>, Option<Vec<u8>>)>,
+		changeset: impl Iterator<Item = (Vec<u8>, Option<Vec<u8>>)>,
 		child_changeset: impl Iterator<
-			Item=(Vec<u8>, impl Iterator<Item=(Vec<u8>, Option<Vec<u8>>)>)
+			Item = (Vec<u8>, impl Iterator<Item = (Vec<u8>, Option<Vec<u8>>)>),
 		>,
 	) {
-
 		let has_wildcard = !self.wildcard_listeners.is_empty();
 
 		// early exit if no listeners
 		if !has_wildcard && self.listeners.is_empty() && self.child_listeners.is_empty() {
-			return;
+			return
 		}
 
 		let mut subscribers = self.wildcard_listeners.clone();
@@ -193,24 +201,29 @@ impl<Block: BlockT> StorageNotifications<Block> {
 
 		// Don't send empty notifications
 		if changes.is_empty() && child_changes.is_empty() {
-			return;
+			return
 		}
 
 		let changes = Arc::new(changes);
 		let child_changes = Arc::new(child_changes);
 		// Trigger the events
 
-		let to_remove = self.sinks
+		let to_remove = self
+			.sinks
 			.iter()
 			.filter_map(|(subscriber, &(ref sink, ref filter, ref child_filters))| {
 				let should_remove = {
 					if subscribers.contains(subscriber) {
-						sink.unbounded_send((hash.clone(), StorageChangeSet {
-							changes: changes.clone(),
-							child_changes: child_changes.clone(),
-							filter: filter.clone(),
-							child_filters: child_filters.clone(),
-						})).is_err()
+						sink.unbounded_send((
+							hash.clone(),
+							StorageChangeSet {
+								changes: changes.clone(),
+								child_changes: child_changes.clone(),
+								filter: filter.clone(),
+								child_filters: child_filters.clone(),
+							},
+						))
+						.is_err()
 					} else {
 						sink.is_closed()
 					}
@@ -221,7 +234,8 @@ impl<Block: BlockT> StorageNotifications<Block> {
 				} else {
 					None
 				}
-			}).collect::<Vec<_>>();
+			})
+			.collect::<Vec<_>>();
 
 		for sub_id in to_remove {
 			self.remove_subscriber(sub_id);
@@ -233,13 +247,12 @@ impl<Block: BlockT> StorageNotifications<Block> {
 		filters: &Option<HashSet<StorageKey>>,
 		listeners: &mut HashMap<StorageKey, FnvHashSet<SubscriberId>>,
 		wildcards: &mut FnvHashSet<SubscriberId>,
-	){
+	) {
 		match filters {
 			None => {
 				wildcards.remove(subscriber);
 			},
-			Some(filters) => {
-
+			Some(filters) =>
 				for key in filters.iter() {
 					let remove_key = match listeners.get_mut(key) {
 						Some(ref mut set) => {
@@ -252,8 +265,7 @@ impl<Block: BlockT> StorageNotifications<Block> {
 					if remove_key {
 						listeners.remove(key);
 					}
-				}
-			}
+				},
 		}
 	}
 
@@ -267,7 +279,6 @@ impl<Block: BlockT> StorageNotifications<Block> {
 			);
 			if let Some(child_filters) = child_filters.as_ref() {
 				for (c_key, filters) in child_filters {
-
 					if let Some((listeners, wildcards)) = self.child_listeners.get_mut(&c_key) {
 						Self::remove_subscriber_from(
 							&subscriber,
@@ -293,20 +304,24 @@ impl<Block: BlockT> StorageNotifications<Block> {
 		filter_keys: &Option<impl AsRef<[StorageKey]>>,
 		listeners: &mut HashMap<StorageKey, FnvHashSet<SubscriberId>>,
 		wildcards: &mut FnvHashSet<SubscriberId>,
-	) -> Option<HashSet<StorageKey>>
-	{
+	) -> Option<HashSet<StorageKey>> {
 		match filter_keys {
 			None => {
 				wildcards.insert(current_id);
 				None
 			},
-			Some(keys) => Some(keys.as_ref().iter().map(|key| {
-				listeners
-					.entry(key.clone())
-					.or_insert_with(Default::default)
-					.insert(current_id);
-				key.clone()
-			}).collect())
+			Some(keys) => Some(
+				keys.as_ref()
+					.iter()
+					.map(|key| {
+						listeners
+							.entry(key.clone())
+							.or_insert_with(Default::default)
+							.insert(current_id);
+						key.clone()
+					})
+					.collect(),
+			),
 		}
 	}
 
@@ -327,21 +342,20 @@ impl<Block: BlockT> StorageNotifications<Block> {
 			&mut self.wildcard_listeners,
 		);
 		let child_keys = filter_child_keys.map(|filter_child_keys| {
-			filter_child_keys.iter().map(|(c_key, o_keys)| {
-				let (c_listeners, c_wildcards) = self.child_listeners
-					.entry(c_key.clone())
-					.or_insert_with(Default::default);
-
-				(c_key.clone(), Self::listen_from(
-					current_id,
-					o_keys,
-					&mut *c_listeners,
-					&mut *c_wildcards,
-				))
-			}).collect()
+			filter_child_keys
+				.iter()
+				.map(|(c_key, o_keys)| {
+					let (c_listeners, c_wildcards) =
+						self.child_listeners.entry(c_key.clone()).or_insert_with(Default::default);
+
+					(
+						c_key.clone(),
+						Self::listen_from(current_id, o_keys, &mut *c_listeners, &mut *c_wildcards),
+					)
+				})
+				.collect()
 		});
 
-
 		// insert sink
 		let (tx, rx) = tracing_unbounded("mpsc_storage_notification_items");
 		self.sinks.insert(current_id, (tx, keys, child_keys));
@@ -356,8 +370,8 @@ impl<Block: BlockT> StorageNotifications<Block> {
 
 #[cfg(test)]
 mod tests {
-	use sp_runtime::testing::{H256 as Hash, Block as RawBlock, ExtrinsicWrapper};
 	use super::*;
+	use sp_runtime::testing::{Block as RawBlock, ExtrinsicWrapper, H256 as Hash};
 	use std::iter::{empty, Empty};
 
 	type TestChangeSet = (
@@ -369,10 +383,12 @@ mod tests {
 	impl From<TestChangeSet> for StorageChangeSet {
 		fn from(changes: TestChangeSet) -> Self {
 			// warning hardcoded child trie wildcard to test upon
-			let child_filters = Some([
-				(StorageKey(vec![4]), None),
-				(StorageKey(vec![5]), None),
-			].iter().cloned().collect());
+			let child_filters = Some(
+				[(StorageKey(vec![4]), None), (StorageKey(vec![5]), None)]
+					.iter()
+					.cloned()
+					.collect(),
+			);
 			StorageChangeSet {
 				changes: Arc::new(changes.0),
 				child_changes: Arc::new(changes.1),
@@ -396,34 +412,40 @@ mod tests {
 		// given
 		let mut notifications = StorageNotifications::<Block>::default();
 		let child_filter = [(StorageKey(vec![4]), None)];
-		let mut recv = futures::executor::block_on_stream(
-			notifications.listen(None, Some(&child_filter[..]))
-		);
+		let mut recv =
+			futures::executor::block_on_stream(notifications.listen(None, Some(&child_filter[..])));
 
 		// when
-		let changeset = vec![
-			(vec![2], Some(vec![3])),
-			(vec![3], None),
-		];
-		let c_changeset_1 = vec![
-			(vec![5], Some(vec![4])),
-			(vec![6], None),
-		];
+		let changeset = vec![(vec![2], Some(vec![3])), (vec![3], None)];
+		let c_changeset_1 = vec![(vec![5], Some(vec![4])), (vec![6], None)];
 		let c_changeset = vec![(vec![4], c_changeset_1)];
 		notifications.trigger(
 			&Hash::from_low_u64_be(1),
 			changeset.into_iter(),
-			c_changeset.into_iter().map(|(a,b)| (a, b.into_iter())),
+			c_changeset.into_iter().map(|(a, b)| (a, b.into_iter())),
 		);
 
 		// then
-		assert_eq!(recv.next().unwrap(), (Hash::from_low_u64_be(1), (vec![
-			(StorageKey(vec![2]), Some(StorageData(vec![3]))),
-			(StorageKey(vec![3]), None),
-		], vec![(StorageKey(vec![4]), vec![
-			(StorageKey(vec![5]), Some(StorageData(vec![4]))),
-			(StorageKey(vec![6]), None),
-		])]).into()));
+		assert_eq!(
+			recv.next().unwrap(),
+			(
+				Hash::from_low_u64_be(1),
+				(
+					vec![
+						(StorageKey(vec![2]), Some(StorageData(vec![3]))),
+						(StorageKey(vec![3]), None),
+					],
+					vec![(
+						StorageKey(vec![4]),
+						vec![
+							(StorageKey(vec![5]), Some(StorageData(vec![4]))),
+							(StorageKey(vec![6]), None),
+						]
+					)]
+				)
+					.into()
+			)
+		);
 	}
 
 	#[test]
@@ -432,44 +454,52 @@ mod tests {
 		let mut notifications = StorageNotifications::<Block>::default();
 		let child_filter = [(StorageKey(vec![4]), Some(vec![StorageKey(vec![5])]))];
 		let mut recv1 = futures::executor::block_on_stream(
-			notifications.listen(Some(&[StorageKey(vec![1])]), None)
+			notifications.listen(Some(&[StorageKey(vec![1])]), None),
 		);
 		let mut recv2 = futures::executor::block_on_stream(
-			notifications.listen(Some(&[StorageKey(vec![2])]), None)
+			notifications.listen(Some(&[StorageKey(vec![2])]), None),
 		);
 		let mut recv3 = futures::executor::block_on_stream(
-			notifications.listen(Some(&[]), Some(&child_filter))
+			notifications.listen(Some(&[]), Some(&child_filter)),
 		);
 
 		// when
-		let changeset = vec![
-			(vec![2], Some(vec![3])),
-			(vec![1], None),
-		];
-		let c_changeset_1 = vec![
-			(vec![5], Some(vec![4])),
-			(vec![6], None),
-		];
+		let changeset = vec![(vec![2], Some(vec![3])), (vec![1], None)];
+		let c_changeset_1 = vec![(vec![5], Some(vec![4])), (vec![6], None)];
 
 		let c_changeset = vec![(vec![4], c_changeset_1)];
 		notifications.trigger(
 			&Hash::from_low_u64_be(1),
 			changeset.into_iter(),
-			c_changeset.into_iter().map(|(a,b)| (a, b.into_iter())),
+			c_changeset.into_iter().map(|(a, b)| (a, b.into_iter())),
 		);
 
 		// then
-		assert_eq!(recv1.next().unwrap(), (Hash::from_low_u64_be(1), (vec![
-			(StorageKey(vec![1]), None),
-		], vec![]).into()));
-		assert_eq!(recv2.next().unwrap(), (Hash::from_low_u64_be(1), (vec![
-			(StorageKey(vec![2]), Some(StorageData(vec![3]))),
-		], vec![]).into()));
-		assert_eq!(recv3.next().unwrap(), (Hash::from_low_u64_be(1), (vec![],
-		vec![
-			(StorageKey(vec![4]), vec![(StorageKey(vec![5]), Some(StorageData(vec![4])))]),
-		]).into()));
-
+		assert_eq!(
+			recv1.next().unwrap(),
+			(Hash::from_low_u64_be(1), (vec![(StorageKey(vec![1]), None),], vec![]).into())
+		);
+		assert_eq!(
+			recv2.next().unwrap(),
+			(
+				Hash::from_low_u64_be(1),
+				(vec![(StorageKey(vec![2]), Some(StorageData(vec![3]))),], vec![]).into()
+			)
+		);
+		assert_eq!(
+			recv3.next().unwrap(),
+			(
+				Hash::from_low_u64_be(1),
+				(
+					vec![],
+					vec![(
+						StorageKey(vec![4]),
+						vec![(StorageKey(vec![5]), Some(StorageData(vec![4])))]
+					),]
+				)
+					.into()
+			)
+		);
 	}
 
 	#[test]
@@ -479,27 +509,21 @@ mod tests {
 		{
 			let child_filter = [(StorageKey(vec![4]), Some(vec![StorageKey(vec![5])]))];
 			let _recv1 = futures::executor::block_on_stream(
-				notifications.listen(Some(&[StorageKey(vec![1])]), None)
+				notifications.listen(Some(&[StorageKey(vec![1])]), None),
 			);
 			let _recv2 = futures::executor::block_on_stream(
-				notifications.listen(Some(&[StorageKey(vec![2])]), None)
-			);
-			let _recv3 = futures::executor::block_on_stream(
-				notifications.listen(None, None)
-			);
-			let _recv4 = futures::executor::block_on_stream(
-				notifications.listen(None, Some(&child_filter))
+				notifications.listen(Some(&[StorageKey(vec![2])]), None),
 			);
+			let _recv3 = futures::executor::block_on_stream(notifications.listen(None, None));
+			let _recv4 =
+				futures::executor::block_on_stream(notifications.listen(None, Some(&child_filter)));
 			assert_eq!(notifications.listeners.len(), 2);
 			assert_eq!(notifications.wildcard_listeners.len(), 2);
 			assert_eq!(notifications.child_listeners.len(), 1);
 		}
 
 		// when
-		let changeset = vec![
-			(vec![2], Some(vec![3])),
-			(vec![1], None),
-		];
+		let changeset = vec![(vec![2], Some(vec![3])), (vec![1], None)];
 		let c_changeset = empty::<(_, Empty<_>)>();
 		notifications.trigger(&Hash::from_low_u64_be(1), changeset.into_iter(), c_changeset);
 
diff --git a/client/api/src/proof_provider.rs b/client/api/src/proof_provider.rs
index 0e9fd5318ba9..ad0989c74396 100644
--- a/client/api/src/proof_provider.rs
+++ b/client/api/src/proof_provider.rs
@@ -17,12 +17,9 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Proof utilities
-use sp_runtime::{
-	generic::BlockId,
-	traits::{Block as BlockT},
-};
-use crate::{StorageProof, ChangesProof};
-use sp_storage::{ChildInfo, StorageKey, PrefixedStorageKey};
+use crate::{ChangesProof, StorageProof};
+use sp_runtime::{generic::BlockId, traits::Block as BlockT};
+use sp_storage::{ChildInfo, PrefixedStorageKey, StorageKey};
 
 /// Interface for providing block proving utilities.
 pub trait ProofProvider<Block: BlockT> {
@@ -30,7 +27,7 @@ pub trait ProofProvider<Block: BlockT> {
 	fn read_proof(
 		&self,
 		id: &BlockId<Block>,
-		keys: &mut dyn Iterator<Item=&[u8]>,
+		keys: &mut dyn Iterator<Item = &[u8]>,
 	) -> sp_blockchain::Result<StorageProof>;
 
 	/// Reads child storage value at a given block + storage_key + key, returning
@@ -39,7 +36,7 @@ pub trait ProofProvider<Block: BlockT> {
 		&self,
 		id: &BlockId<Block>,
 		child_info: &ChildInfo,
-		keys: &mut dyn Iterator<Item=&[u8]>,
+		keys: &mut dyn Iterator<Item = &[u8]>,
 	) -> sp_blockchain::Result<StorageProof>;
 
 	/// Execute a call to a contract on top of state in a block of given hash
@@ -53,7 +50,10 @@ pub trait ProofProvider<Block: BlockT> {
 		call_data: &[u8],
 	) -> sp_blockchain::Result<(Vec<u8>, StorageProof)>;
 	/// Reads given header and generates CHT-based header proof.
-	fn header_proof(&self, id: &BlockId<Block>) -> sp_blockchain::Result<(Block::Header, StorageProof)>;
+	fn header_proof(
+		&self,
+		id: &BlockId<Block>,
+	) -> sp_blockchain::Result<(Block::Header, StorageProof)>;
 
 	/// Get proof for computation of (block, extrinsic) pairs where key has been changed at given blocks range.
 	/// `min` is the hash of the first block, which changes trie root is known to the requester - when we're using
diff --git a/client/authority-discovery/src/interval.rs b/client/authority-discovery/src/interval.rs
index 0710487203d5..f4e7c43e60d2 100644
--- a/client/authority-discovery/src/interval.rs
+++ b/client/authority-discovery/src/interval.rs
@@ -16,13 +16,13 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use futures::stream::Stream;
-use futures::future::FutureExt;
-use futures::ready;
+use futures::{future::FutureExt, ready, stream::Stream};
 use futures_timer::Delay;
-use std::pin::Pin;
-use std::task::{Context, Poll};
-use std::time::Duration;
+use std::{
+	pin::Pin,
+	task::{Context, Poll},
+	time::Duration,
+};
 
 /// Exponentially increasing interval
 ///
@@ -37,11 +37,7 @@ impl ExpIncInterval {
 	/// Create a new [`ExpIncInterval`].
 	pub fn new(start: Duration, max: Duration) -> Self {
 		let delay = Delay::new(start);
-		Self {
-			max,
-			next: start * 2,
-			delay,
-		}
+		Self { max, next: start * 2, delay }
 	}
 
 	/// Fast forward the exponentially increasing interval to the configured maximum.
diff --git a/client/authority-discovery/src/lib.rs b/client/authority-discovery/src/lib.rs
index ab6338963da4..4929ce69917a 100644
--- a/client/authority-discovery/src/lib.rs
+++ b/client/authority-discovery/src/lib.rs
@@ -26,18 +26,23 @@
 //!
 //! See [`Worker`] and [`Service`] for more documentation.
 
-pub use crate::{service::Service, worker::{NetworkProvider, Worker, Role}};
+pub use crate::{
+	service::Service,
+	worker::{NetworkProvider, Role, Worker},
+};
 
 use std::{sync::Arc, time::Duration};
 
-use futures::channel::{mpsc, oneshot};
-use futures::Stream;
+use futures::{
+	channel::{mpsc, oneshot},
+	Stream,
+};
 
 use sc_client_api::blockchain::HeaderBackend;
 use sc_network::{DhtEvent, Multiaddr, PeerId};
+use sp_api::ProvideRuntimeApi;
 use sp_authority_discovery::{AuthorityDiscoveryApi, AuthorityId};
 use sp_runtime::traits::Block as BlockT;
-use sp_api::ProvideRuntimeApi;
 
 mod error;
 mod interval;
@@ -141,15 +146,8 @@ where
 {
 	let (to_worker, from_service) = mpsc::channel(0);
 
-	let worker = Worker::new(
-		from_service,
-		client,
-		network,
-		dht_event_rx,
-		role,
-		prometheus_registry,
-		config,
-	);
+	let worker =
+		Worker::new(from_service, client, network, dht_event_rx, role, prometheus_registry, config);
 	let service = Service::new(to_worker);
 
 	(worker, service)
@@ -160,5 +158,5 @@ pub(crate) enum ServicetoWorkerMsg {
 	/// See [`Service::get_addresses_by_authority_id`].
 	GetAddressesByAuthorityId(AuthorityId, oneshot::Sender<Option<Vec<Multiaddr>>>),
 	/// See [`Service::get_authority_id_by_peer_id`].
-	GetAuthorityIdByPeerId(PeerId, oneshot::Sender<Option<AuthorityId>>)
+	GetAuthorityIdByPeerId(PeerId, oneshot::Sender<Option<AuthorityId>>),
 }
diff --git a/client/authority-discovery/src/service.rs b/client/authority-discovery/src/service.rs
index a787ff8f51c2..2e5ae66e4dd4 100644
--- a/client/authority-discovery/src/service.rs
+++ b/client/authority-discovery/src/service.rs
@@ -20,8 +20,10 @@ use std::fmt::Debug;
 
 use crate::ServicetoWorkerMsg;
 
-use futures::channel::{mpsc, oneshot};
-use futures::SinkExt;
+use futures::{
+	channel::{mpsc, oneshot},
+	SinkExt,
+};
 
 use sc_network::{Multiaddr, PeerId};
 use sp_authority_discovery::AuthorityId;
@@ -42,9 +44,7 @@ impl Debug for Service {
 /// [`crate::Worker`]'s local address cache for a given [`AuthorityId`].
 impl Service {
 	pub(crate) fn new(to_worker: mpsc::Sender<ServicetoWorkerMsg>) -> Self {
-		Self {
-			to_worker,
-		}
+		Self { to_worker }
 	}
 
 	/// Get the addresses for the given [`AuthorityId`] from the local address
@@ -59,7 +59,10 @@ impl Service {
 	/// enforced today, given that there are still authorities out there
 	/// publishing the addresses of their sentry nodes on the DHT. In the future
 	/// this guarantee can be provided.
-	pub async fn get_addresses_by_authority_id(&mut self, authority: AuthorityId) -> Option<Vec<Multiaddr>> {
+	pub async fn get_addresses_by_authority_id(
+		&mut self,
+		authority: AuthorityId,
+	) -> Option<Vec<Multiaddr>> {
 		let (tx, rx) = oneshot::channel();
 
 		self.to_worker
diff --git a/client/authority-discovery/src/tests.rs b/client/authority-discovery/src/tests.rs
index 78e978e07a1a..ef2c2f24634b 100644
--- a/client/authority-discovery/src/tests.rs
+++ b/client/authority-discovery/src/tests.rs
@@ -16,15 +16,24 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::{new_worker_and_service, worker::{tests::{TestApi, TestNetwork}, Role}};
+use crate::{
+	new_worker_and_service,
+	worker::{
+		tests::{TestApi, TestNetwork},
+		Role,
+	},
+};
 
-use std::sync::Arc;
 use futures::{channel::mpsc::channel, executor::LocalPool, task::LocalSpawn};
-use libp2p::core::{multiaddr::{Multiaddr, Protocol}, PeerId};
+use libp2p::core::{
+	multiaddr::{Multiaddr, Protocol},
+	PeerId,
+};
+use std::sync::Arc;
 
 use sp_authority_discovery::AuthorityId;
 use sp_core::crypto::key_types;
-use sp_keystore::{CryptoStore, testing::KeyStore};
+use sp_keystore::{testing::KeyStore, CryptoStore};
 
 #[test]
 fn get_addresses_and_authority_id() {
@@ -44,13 +53,12 @@ fn get_addresses_and_authority_id() {
 	});
 
 	let remote_peer_id = PeerId::random();
-	let remote_addr = "/ip6/2001:db8:0:0:0:0:0:2/tcp/30333".parse::<Multiaddr>()
+	let remote_addr = "/ip6/2001:db8:0:0:0:0:0:2/tcp/30333"
+		.parse::<Multiaddr>()
 		.unwrap()
 		.with(Protocol::P2p(remote_peer_id.clone().into()));
 
-	let test_api = Arc::new(TestApi {
-		authorities: vec![],
-	});
+	let test_api = Arc::new(TestApi { authorities: vec![] });
 
 	let (mut worker, mut service) = new_worker_and_service(
 		test_api,
diff --git a/client/authority-discovery/src/worker.rs b/client/authority-discovery/src/worker.rs
index bb9207e4e7ea..905d17c72c04 100644
--- a/client/authority-discovery/src/worker.rs
+++ b/client/authority-discovery/src/worker.rs
@@ -16,43 +16,49 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::{error::{Error, Result}, interval::ExpIncInterval, ServicetoWorkerMsg};
+use crate::{
+	error::{Error, Result},
+	interval::ExpIncInterval,
+	ServicetoWorkerMsg,
+};
 
-use std::collections::{HashMap, HashSet};
-use std::convert::TryInto;
-use std::marker::PhantomData;
-use std::sync::Arc;
-use std::time::Duration;
+use std::{
+	collections::{HashMap, HashSet},
+	convert::TryInto,
+	marker::PhantomData,
+	sync::Arc,
+	time::Duration,
+};
 
-use futures::channel::mpsc;
-use futures::{future, FutureExt, Stream, StreamExt, stream::Fuse};
+use futures::{channel::mpsc, future, stream::Fuse, FutureExt, Stream, StreamExt};
 
 use addr_cache::AddrCache;
 use async_trait::async_trait;
 use codec::Decode;
 use ip_network::IpNetwork;
-use libp2p::{core::multiaddr, multihash::{Multihash, Hasher}};
+use libp2p::{
+	core::multiaddr,
+	multihash::{Hasher, Multihash},
+};
 use log::{debug, error, log_enabled};
-use prometheus_endpoint::{Counter, CounterVec, Gauge, Opts, U64, register};
+use prometheus_endpoint::{register, Counter, CounterVec, Gauge, Opts, U64};
 use prost::Message;
 use rand::{seq::SliceRandom, thread_rng};
 use sc_client_api::blockchain::HeaderBackend;
-use sc_network::{
-	DhtEvent,
-	ExHashT,
-	Multiaddr,
-	NetworkStateInfo,
-	PeerId,
+use sc_network::{DhtEvent, ExHashT, Multiaddr, NetworkStateInfo, PeerId};
+use sp_api::ProvideRuntimeApi;
+use sp_authority_discovery::{
+	AuthorityDiscoveryApi, AuthorityId, AuthorityPair, AuthoritySignature,
 };
-use sp_authority_discovery::{AuthorityDiscoveryApi, AuthorityId, AuthoritySignature, AuthorityPair};
 use sp_core::crypto::{key_types, CryptoTypePublicPair, Pair};
 use sp_keystore::CryptoStore;
-use sp_runtime::{traits::Block as BlockT, generic::BlockId};
-use sp_api::ProvideRuntimeApi;
+use sp_runtime::{generic::BlockId, traits::Block as BlockT};
 
 mod addr_cache;
 /// Dht payload schemas generated from Protobuf definitions via Prost crate in build.rs.
-mod schema { include!(concat!(env!("OUT_DIR"), "/authority_discovery.rs")); }
+mod schema {
+	include!(concat!(env!("OUT_DIR"), "/authority_discovery.rs"));
+}
 #[cfg(test)]
 pub mod tests;
 
@@ -72,7 +78,6 @@ pub enum Role {
 	Discover,
 }
 
-
 /// An authority discovery [`Worker`] can publish the local node's addresses as well as discover
 /// those of other nodes via a Kademlia DHT.
 ///
@@ -141,8 +146,7 @@ where
 	Block: BlockT + Unpin + 'static,
 	Network: NetworkProvider,
 	Client: ProvideRuntimeApi<Block> + Send + Sync + 'static + HeaderBackend<Block>,
-	<Client as ProvideRuntimeApi<Block>>::Api:
-		AuthorityDiscoveryApi<Block>,
+	<Client as ProvideRuntimeApi<Block>>::Api: AuthorityDiscoveryApi<Block>,
 	DhtEventStream: Stream<Item = DhtEvent> + Unpin,
 {
 	/// Construct a [`Worker`].
@@ -161,33 +165,24 @@ where
 		// thus timely retries are not needed. For this reasoning use an exponentially increasing
 		// interval for `publish_interval`, `query_interval` and `priority_group_set_interval`
 		// instead of a constant interval.
-		let publish_interval = ExpIncInterval::new(
-			Duration::from_secs(2),
-			config.max_publish_interval,
-		);
-		let query_interval = ExpIncInterval::new(
-			Duration::from_secs(2),
-			config.max_query_interval,
-		);
+		let publish_interval =
+			ExpIncInterval::new(Duration::from_secs(2), config.max_publish_interval);
+		let query_interval = ExpIncInterval::new(Duration::from_secs(2), config.max_query_interval);
 
 		// An `ExpIncInterval` is overkill here because the interval is constant, but consistency
 		// is more simple.
-		let publish_if_changed_interval = ExpIncInterval::new(
-			config.keystore_refresh_interval,
-			config.keystore_refresh_interval
-		);
+		let publish_if_changed_interval =
+			ExpIncInterval::new(config.keystore_refresh_interval, config.keystore_refresh_interval);
 
 		let addr_cache = AddrCache::new();
 
 		let metrics = match prometheus_registry {
-			Some(registry) => {
-				match Metrics::register(&registry) {
-					Ok(metrics) => Some(metrics),
-					Err(e) => {
-						error!(target: LOG_TARGET, "Failed to register metrics: {:?}", e);
-						None
-					},
-				}
+			Some(registry) => match Metrics::register(&registry) {
+				Ok(metrics) => Some(metrics),
+				Err(e) => {
+					error!(target: LOG_TARGET, "Failed to register metrics: {:?}", e);
+					None
+				},
 			},
 			None => None,
 		};
@@ -262,23 +257,23 @@ where
 				let _ = sender.send(
 					self.addr_cache.get_addresses_by_authority_id(&authority).map(Clone::clone),
 				);
-			}
+			},
 			ServicetoWorkerMsg::GetAuthorityIdByPeerId(peer_id, sender) => {
-				let _ = sender.send(
-					self.addr_cache.get_authority_id_by_peer_id(&peer_id).map(Clone::clone),
-				);
-			}
+				let _ = sender
+					.send(self.addr_cache.get_authority_id_by_peer_id(&peer_id).map(Clone::clone));
+			},
 		}
 	}
 
 	fn addresses_to_publish(&self) -> impl Iterator<Item = Multiaddr> {
 		let peer_id: Multihash = self.network.local_peer_id().into();
 		let publish_non_global_ips = self.publish_non_global_ips;
-		self.network.external_addresses()
+		self.network
+			.external_addresses()
 			.into_iter()
 			.filter(move |a| {
 				if publish_non_global_ips {
-					return true;
+					return true
 				}
 
 				a.iter().all(|p| match p {
@@ -321,9 +316,9 @@ where
 
 		if let Some(metrics) = &self.metrics {
 			metrics.publish.inc();
-			metrics.amount_addresses_last_published.set(
-				addresses.len().try_into().unwrap_or(std::u64::MAX),
-			);
+			metrics
+				.amount_addresses_last_published
+				.set(addresses.len().try_into().unwrap_or(std::u64::MAX));
 		}
 
 		let mut serialized_addresses = vec![];
@@ -332,30 +327,26 @@ where
 			.map_err(Error::EncodingProto)?;
 
 		let keys_vec = keys.iter().cloned().collect::<Vec<_>>();
-		let signatures = key_store.sign_with_all(
-			key_types::AUTHORITY_DISCOVERY,
-			keys_vec.clone(),
-			serialized_addresses.as_slice(),
-		).await.map_err(|_| Error::Signing)?;
+		let signatures = key_store
+			.sign_with_all(
+				key_types::AUTHORITY_DISCOVERY,
+				keys_vec.clone(),
+				serialized_addresses.as_slice(),
+			)
+			.await
+			.map_err(|_| Error::Signing)?;
 
 		for (sign_result, key) in signatures.into_iter().zip(keys_vec.iter()) {
 			let mut signed_addresses = vec![];
 
 			// Verify that all signatures exist for all provided keys.
-			let signature = sign_result.ok()
-				.flatten()
-				.ok_or_else(|| Error::MissingSignature(key.clone()))?;
-			schema::SignedAuthorityAddresses {
-				addresses: serialized_addresses.clone(),
-				signature,
-			}
-			.encode(&mut signed_addresses)
+			let signature =
+				sign_result.ok().flatten().ok_or_else(|| Error::MissingSignature(key.clone()))?;
+			schema::SignedAuthorityAddresses { addresses: serialized_addresses.clone(), signature }
+				.encode(&mut signed_addresses)
 				.map_err(Error::EncodingProto)?;
 
-			self.network.put_value(
-				hash_authority_id(key.1.as_ref()),
-				signed_addresses,
-			);
+			self.network.put_value(hash_authority_id(key.1.as_ref()), signed_addresses);
 		}
 
 		self.latest_published_keys = keys;
@@ -367,11 +358,11 @@ where
 		let id = BlockId::hash(self.client.info().best_hash);
 
 		let local_keys = match &self.role {
-			Role::PublishAndDiscover(key_store) => {
-				key_store.sr25519_public_keys(
-					key_types::AUTHORITY_DISCOVERY
-				).await.into_iter().collect::<HashSet<_>>()
-			},
+			Role::PublishAndDiscover(key_store) => key_store
+				.sr25519_public_keys(key_types::AUTHORITY_DISCOVERY)
+				.await
+				.into_iter()
+				.collect::<HashSet<_>>(),
 			Role::Discover => HashSet::new(),
 		};
 
@@ -393,9 +384,9 @@ where
 		self.in_flight_lookups.clear();
 
 		if let Some(metrics) = &self.metrics {
-			metrics.requests_pending.set(
-				self.pending_lookups.len().try_into().unwrap_or(std::u64::MAX),
-			);
+			metrics
+				.requests_pending
+				.set(self.pending_lookups.len().try_into().unwrap_or(std::u64::MAX));
 		}
 
 		Ok(())
@@ -408,15 +399,14 @@ where
 				None => return,
 			};
 			let hash = hash_authority_id(authority_id.as_ref());
-			self.network
-				.get_value(&hash);
+			self.network.get_value(&hash);
 			self.in_flight_lookups.insert(hash, authority_id);
 
 			if let Some(metrics) = &self.metrics {
 				metrics.requests.inc();
-				metrics.requests_pending.set(
-					self.pending_lookups.len().try_into().unwrap_or(std::u64::MAX),
-				);
+				metrics
+					.requests_pending
+					.set(self.pending_lookups.len().try_into().unwrap_or(std::u64::MAX));
 			}
 		}
 	}
@@ -431,10 +421,7 @@ where
 
 				if log_enabled!(log::Level::Debug) {
 					let hashes: Vec<_> = v.iter().map(|(hash, _value)| hash.clone()).collect();
-					debug!(
-						target: LOG_TARGET,
-						"Value for hash '{:?}' found on Dht.", hashes,
-					);
+					debug!(target: LOG_TARGET, "Value for hash '{:?}' found on Dht.", hashes,);
 				}
 
 				if let Err(e) = self.handle_dht_value_found_event(v) {
@@ -442,22 +429,16 @@ where
 						metrics.handle_value_found_event_failure.inc();
 					}
 
-					debug!(
-						target: LOG_TARGET,
-						"Failed to handle Dht value found event: {:?}", e,
-					);
+					debug!(target: LOG_TARGET, "Failed to handle Dht value found event: {:?}", e,);
 				}
-			}
+			},
 			DhtEvent::ValueNotFound(hash) => {
 				if let Some(metrics) = &self.metrics {
 					metrics.dht_event_received.with_label_values(&["value_not_found"]).inc();
 				}
 
 				if self.in_flight_lookups.remove(&hash).is_some() {
-					debug!(
-						target: LOG_TARGET,
-						"Value for hash '{:?}' not found on Dht.", hash
-					)
+					debug!(target: LOG_TARGET, "Value for hash '{:?}' not found on Dht.", hash)
 				} else {
 					debug!(
 						target: LOG_TARGET,
@@ -475,21 +456,15 @@ where
 					metrics.dht_event_received.with_label_values(&["value_put"]).inc();
 				}
 
-				debug!(
-					target: LOG_TARGET,
-					"Successfully put hash '{:?}' on Dht.", hash,
-				)
+				debug!(target: LOG_TARGET, "Successfully put hash '{:?}' on Dht.", hash,)
 			},
 			DhtEvent::ValuePutFailed(hash) => {
 				if let Some(metrics) = &self.metrics {
 					metrics.dht_event_received.with_label_values(&["value_put_failed"]).inc();
 				}
 
-				debug!(
-					target: LOG_TARGET,
-					"Failed to put hash '{:?}' on Dht.", hash
-				)
-			}
+				debug!(target: LOG_TARGET, "Failed to put hash '{:?}' on Dht.", hash)
+			},
 		}
 	}
 
@@ -498,34 +473,36 @@ where
 		values: Vec<(libp2p::kad::record::Key, Vec<u8>)>,
 	) -> Result<()> {
 		// Ensure `values` is not empty and all its keys equal.
-		let remote_key = values.iter().fold(Ok(None), |acc, (key, _)| {
-			match acc {
+		let remote_key = values
+			.iter()
+			.fold(Ok(None), |acc, (key, _)| match acc {
 				Ok(None) => Ok(Some(key.clone())),
-				Ok(Some(ref prev_key)) if prev_key != key => Err(
-					Error::ReceivingDhtValueFoundEventWithDifferentKeys
-				),
+				Ok(Some(ref prev_key)) if prev_key != key =>
+					Err(Error::ReceivingDhtValueFoundEventWithDifferentKeys),
 				x @ Ok(_) => x,
 				Err(e) => Err(e),
-			}
-		})?.ok_or(Error::ReceivingDhtValueFoundEventWithNoRecords)?;
+			})?
+			.ok_or(Error::ReceivingDhtValueFoundEventWithNoRecords)?;
 
-		let authority_id: AuthorityId = self.in_flight_lookups
+		let authority_id: AuthorityId = self
+			.in_flight_lookups
 			.remove(&remote_key)
 			.ok_or(Error::ReceivingUnexpectedRecord)?;
 
 		let local_peer_id = self.network.local_peer_id();
 
-		let remote_addresses: Vec<Multiaddr> = values.into_iter()
+		let remote_addresses: Vec<Multiaddr> = values
+			.into_iter()
 			.map(|(_k, v)| {
 				let schema::SignedAuthorityAddresses { signature, addresses } =
 					schema::SignedAuthorityAddresses::decode(v.as_slice())
-					.map_err(Error::DecodingProto)?;
+						.map_err(Error::DecodingProto)?;
 
 				let signature = AuthoritySignature::decode(&mut &signature[..])
 					.map_err(Error::EncodingDecodingScale)?;
 
 				if !AuthorityPair::verify(&signature, &addresses, &authority_id) {
-					return Err(Error::VerifyingDhtPayload);
+					return Err(Error::VerifyingDhtPayload)
 				}
 
 				let addresses = schema::AuthorityAddresses::decode(addresses.as_slice())
@@ -542,40 +519,41 @@ where
 			.into_iter()
 			.flatten()
 			// Ignore [`Multiaddr`]s without [`PeerId`] and own addresses.
-			.filter(|addr| addr.iter().any(|protocol| {
-				// Parse to PeerId first as Multihashes of old and new PeerId
-				// representation don't equal.
-				//
-				// See https://github.com/libp2p/rust-libp2p/issues/555 for
-				// details.
-				if let multiaddr::Protocol::P2p(hash) = protocol {
-					let peer_id = match PeerId::from_multihash(hash) {
-						Ok(peer_id) => peer_id,
-						Err(_) => return false, // Discard address.
-					};
-
-					// Discard if equal to local peer id, keep if it differs.
-					return !(peer_id == local_peer_id);
-				}
+			.filter(|addr| {
+				addr.iter().any(|protocol| {
+					// Parse to PeerId first as Multihashes of old and new PeerId
+					// representation don't equal.
+					//
+					// See https://github.com/libp2p/rust-libp2p/issues/555 for
+					// details.
+					if let multiaddr::Protocol::P2p(hash) = protocol {
+						let peer_id = match PeerId::from_multihash(hash) {
+							Ok(peer_id) => peer_id,
+							Err(_) => return false, // Discard address.
+						};
+
+						// Discard if equal to local peer id, keep if it differs.
+						return !(peer_id == local_peer_id)
+					}
 
-				false // `protocol` is not a [`Protocol::P2p`], let's keep looking.
-			}))
+					false // `protocol` is not a [`Protocol::P2p`], let's keep looking.
+				})
+			})
 			.take(MAX_ADDRESSES_PER_AUTHORITY)
 			.collect();
 
 		if !remote_addresses.is_empty() {
 			self.addr_cache.insert(authority_id, remote_addresses);
 			if let Some(metrics) = &self.metrics {
-				metrics.known_authorities_count.set(
-					self.addr_cache.num_ids().try_into().unwrap_or(std::u64::MAX)
-				);
+				metrics
+					.known_authorities_count
+					.set(self.addr_cache.num_ids().try_into().unwrap_or(std::u64::MAX));
 			}
 		}
 		Ok(())
 	}
 
 	/// Retrieve our public keys within the current and next authority set.
-	//
 	// A node might have multiple authority discovery keys within its keystore, e.g. an old one and
 	// one for the upcoming session. In addition it could be participating in the current and (/ or)
 	// next authority set with two keys. The function does not return all of the local authority
@@ -591,14 +569,16 @@ where
 			.collect::<HashSet<_>>();
 
 		let id = BlockId::hash(client.info().best_hash);
-		let authorities = client.runtime_api()
+		let authorities = client
+			.runtime_api()
 			.authorities(&id)
 			.map_err(|e| Error::CallingRuntime(e.into()))?
 			.into_iter()
 			.map(std::convert::Into::into)
 			.collect::<HashSet<_>>();
 
-		let intersection = local_pub_keys.intersection(&authorities)
+		let intersection = local_pub_keys
+			.intersection(&authorities)
 			.cloned()
 			.map(std::convert::Into::into)
 			.collect();
@@ -655,7 +635,7 @@ impl Metrics {
 			publish: register(
 				Counter::new(
 					"authority_discovery_times_published_total",
-					"Number of times authority discovery has published external addresses."
+					"Number of times authority discovery has published external addresses.",
 				)?,
 				registry,
 			)?,
@@ -663,7 +643,7 @@ impl Metrics {
 				Gauge::new(
 					"authority_discovery_amount_external_addresses_last_published",
 					"Number of external addresses published when authority discovery last \
-					 published addresses."
+					 published addresses.",
 				)?,
 				registry,
 			)?,
@@ -671,14 +651,14 @@ impl Metrics {
 				Counter::new(
 					"authority_discovery_authority_addresses_requested_total",
 					"Number of times authority discovery has requested external addresses of a \
-					 single authority."
+					 single authority.",
 				)?,
 				registry,
 			)?,
 			requests_pending: register(
 				Gauge::new(
 					"authority_discovery_authority_address_requests_pending",
-					"Number of pending authority address requests."
+					"Number of pending authority address requests.",
 				)?,
 				registry,
 			)?,
@@ -686,7 +666,7 @@ impl Metrics {
 				CounterVec::new(
 					Opts::new(
 						"authority_discovery_dht_event_received",
-						"Number of dht events received by authority discovery."
+						"Number of dht events received by authority discovery.",
 					),
 					&["name"],
 				)?,
@@ -695,14 +675,14 @@ impl Metrics {
 			handle_value_found_event_failure: register(
 				Counter::new(
 					"authority_discovery_handle_value_found_event_failure",
-					"Number of times handling a dht value found event failed."
+					"Number of times handling a dht value found event failed.",
 				)?,
 				registry,
 			)?,
 			known_authorities_count: register(
 				Gauge::new(
 					"authority_discovery_known_authorities_count",
-					"Number of authorities known by authority discovery."
+					"Number of authorities known by authority discovery.",
 				)?,
 				registry,
 			)?,
diff --git a/client/authority-discovery/src/worker/addr_cache.rs b/client/authority-discovery/src/worker/addr_cache.rs
index c9b0711803ba..3f9cee476d68 100644
--- a/client/authority-discovery/src/worker/addr_cache.rs
+++ b/client/authority-discovery/src/worker/addr_cache.rs
@@ -19,8 +19,8 @@
 use libp2p::core::multiaddr::{Multiaddr, Protocol};
 use std::collections::HashMap;
 
-use sp_authority_discovery::AuthorityId;
 use sc_network::PeerId;
+use sp_authority_discovery::AuthorityId;
 
 /// Cache for [`AuthorityId`] -> [`Vec<Multiaddr>`] and [`PeerId`] -> [`AuthorityId`] mappings.
 pub(super) struct AddrCache {
@@ -45,27 +45,34 @@ impl AddrCache {
 		addresses.sort_unstable_by(|a, b| a.as_ref().cmp(b.as_ref()));
 
 		// Insert into `self.peer_id_to_authority_id`.
-		let peer_ids = addresses.iter()
+		let peer_ids = addresses
+			.iter()
 			.map(|a| peer_id_from_multiaddr(a))
 			.filter_map(|peer_id| peer_id);
 		for peer_id in peer_ids.clone() {
-			let former_auth = match self.peer_id_to_authority_id.insert(peer_id, authority_id.clone()) {
-				Some(a) if a != authority_id => a,
-				_ => continue,
-			};
+			let former_auth =
+				match self.peer_id_to_authority_id.insert(peer_id, authority_id.clone()) {
+					Some(a) if a != authority_id => a,
+					_ => continue,
+				};
 
 			// PeerId was associated to a different authority id before.
 			// Remove corresponding authority from `self.authority_id_to_addresses`.
 			let former_auth_addrs = match self.authority_id_to_addresses.get_mut(&former_auth) {
 				Some(a) => a,
-				None => { debug_assert!(false); continue }
+				None => {
+					debug_assert!(false);
+					continue
+				},
 			};
 			former_auth_addrs.retain(|a| peer_id_from_multiaddr(a).map_or(true, |p| p != peer_id));
 		}
 
 		// Insert into `self.authority_id_to_addresses`.
-		for former_addr in
-			self.authority_id_to_addresses.insert(authority_id.clone(), addresses.clone()).unwrap_or_default()
+		for former_addr in self
+			.authority_id_to_addresses
+			.insert(authority_id.clone(), addresses.clone())
+			.unwrap_or_default()
 		{
 			// Must remove from `self.peer_id_to_authority_id` any PeerId formerly associated
 			// to that authority but that can't be found in its new addresses.
@@ -87,7 +94,10 @@ impl AddrCache {
 	}
 
 	/// Returns the addresses for the given [`AuthorityId`].
-	pub fn get_addresses_by_authority_id(&self, authority_id: &AuthorityId) -> Option<&Vec<Multiaddr>> {
+	pub fn get_addresses_by_authority_id(
+		&self,
+		authority_id: &AuthorityId,
+	) -> Option<&Vec<Multiaddr>> {
 		self.authority_id_to_addresses.get(&authority_id)
 	}
 
@@ -100,7 +110,9 @@ impl AddrCache {
 	/// [`AuthorityId`]s.
 	pub fn retain_ids(&mut self, authority_ids: &Vec<AuthorityId>) {
 		// The below logic could be replaced by `BtreeMap::drain_filter` once it stabilized.
-		let authority_ids_to_remove = self.authority_id_to_addresses.iter()
+		let authority_ids_to_remove = self
+			.authority_id_to_addresses
+			.iter()
 			.filter(|(id, _addresses)| !authority_ids.contains(id))
 			.map(|entry| entry.0)
 			.cloned()
@@ -111,7 +123,8 @@ impl AddrCache {
 			let addresses = self.authority_id_to_addresses.remove(&authority_id_to_remove);
 
 			// Remove other entries from `self.peer_id_to_authority_id`.
-			let peer_ids = addresses.iter()
+			let peer_ids = addresses
+				.iter()
 				.flatten()
 				.map(|a| peer_id_from_multiaddr(a))
 				.filter_map(|peer_id| peer_id);
@@ -125,10 +138,12 @@ impl AddrCache {
 }
 
 fn peer_id_from_multiaddr(addr: &Multiaddr) -> Option<PeerId> {
-	addr.iter().last().and_then(|protocol| if let Protocol::P2p(multihash) = protocol {
-		PeerId::from_multihash(multihash).ok()
-	} else {
-		None
+	addr.iter().last().and_then(|protocol| {
+		if let Protocol::P2p(multihash) = protocol {
+			PeerId::from_multihash(multihash).ok()
+		} else {
+			None
+		}
 	})
 }
 
@@ -159,9 +174,11 @@ mod tests {
 		fn arbitrary(g: &mut Gen) -> Self {
 			let seed = (0..32).map(|_| u8::arbitrary(g)).collect::<Vec<_>>();
 			let peer_id = PeerId::from_multihash(
-				Multihash::wrap(multihash::Code::Sha2_256.into(), &seed).unwrap()
-			).unwrap();
-			let multiaddr = "/ip6/2001:db8:0:0:0:0:0:2/tcp/30333".parse::<Multiaddr>()
+				Multihash::wrap(multihash::Code::Sha2_256.into(), &seed).unwrap(),
+			)
+			.unwrap();
+			let multiaddr = "/ip6/2001:db8:0:0:0:0:0:2/tcp/30333"
+				.parse::<Multiaddr>()
 				.unwrap()
 				.with(Protocol::P2p(peer_id.into()));
 
@@ -176,12 +193,15 @@ mod tests {
 		fn arbitrary(g: &mut Gen) -> Self {
 			let seed = (0..32).map(|_| u8::arbitrary(g)).collect::<Vec<_>>();
 			let peer_id = PeerId::from_multihash(
-				Multihash::wrap(multihash::Code::Sha2_256.into(), &seed).unwrap()
-			).unwrap();
-			let multiaddr1 = "/ip6/2001:db8:0:0:0:0:0:2/tcp/30333".parse::<Multiaddr>()
+				Multihash::wrap(multihash::Code::Sha2_256.into(), &seed).unwrap(),
+			)
+			.unwrap();
+			let multiaddr1 = "/ip6/2001:db8:0:0:0:0:0:2/tcp/30333"
+				.parse::<Multiaddr>()
 				.unwrap()
 				.with(Protocol::P2p(peer_id.clone().into()));
-			let multiaddr2 = "/ip6/2002:db8:0:0:0:0:0:2/tcp/30133".parse::<Multiaddr>()
+			let multiaddr2 = "/ip6/2002:db8:0:0:0:0:0:2/tcp/30133"
+				.parse::<Multiaddr>()
 				.unwrap()
 				.with(Protocol::P2p(peer_id.into()));
 			TestMultiaddrsSamePeerCombo(multiaddr1, multiaddr2)
@@ -219,11 +239,13 @@ mod tests {
 			cache.retain_ids(&vec![first.0, second.0]);
 
 			assert_eq!(
-				None, cache.get_addresses_by_authority_id(&third.0),
+				None,
+				cache.get_addresses_by_authority_id(&third.0),
 				"Expect `get_addresses_by_authority_id` to not return `None` for third authority."
 			);
 			assert_eq!(
-				None, cache.get_authority_id_by_peer_id(&peer_id_from_multiaddr(&third.1).unwrap()),
+				None,
+				cache.get_authority_id_by_peer_id(&peer_id_from_multiaddr(&third.1).unwrap()),
 				"Expect `get_authority_id_by_peer_id` to return `None` for third authority."
 			);
 
@@ -253,7 +275,10 @@ mod tests {
 			let mut cache = AddrCache::new();
 
 			cache.insert(authority1.clone(), vec![multiaddr1.clone()]);
-			cache.insert(authority1.clone(), vec![multiaddr2.clone(), multiaddr3.clone(), multiaddr4.clone()]);
+			cache.insert(
+				authority1.clone(),
+				vec![multiaddr2.clone(), multiaddr3.clone(), multiaddr4.clone()],
+			);
 
 			assert_eq!(
 				None,
diff --git a/client/authority-discovery/src/worker/tests.rs b/client/authority-discovery/src/worker/tests.rs
index 8be23e4840bd..b2f6ff544cb0 100644
--- a/client/authority-discovery/src/worker/tests.rs
+++ b/client/authority-discovery/src/worker/tests.rs
@@ -18,21 +18,26 @@
 
 use crate::worker::schema;
 
-use std::{sync::{Arc, Mutex}, task::Poll};
+use std::{
+	sync::{Arc, Mutex},
+	task::Poll,
+};
 
 use async_trait::async_trait;
-use futures::channel::mpsc::{self, channel};
-use futures::executor::{block_on, LocalPool};
-use futures::future::FutureExt;
-use futures::sink::SinkExt;
-use futures::task::LocalSpawn;
-use libp2p::{kad, core::multiaddr, PeerId};
+use futures::{
+	channel::mpsc::{self, channel},
+	executor::{block_on, LocalPool},
+	future::FutureExt,
+	sink::SinkExt,
+	task::LocalSpawn,
+};
+use libp2p::{core::multiaddr, kad, PeerId};
 use prometheus_endpoint::prometheus::default_registry;
 
-use sp_api::{ProvideRuntimeApi, ApiRef};
+use sp_api::{ApiRef, ProvideRuntimeApi};
 use sp_core::crypto::Public;
 use sp_keystore::{testing::KeyStore, CryptoStore};
-use sp_runtime::traits::{Zero, Block as BlockT, NumberFor};
+use sp_runtime::traits::{Block as BlockT, NumberFor, Zero};
 use substrate_test_runtime_client::runtime::Block;
 
 use super::*;
@@ -46,9 +51,7 @@ impl ProvideRuntimeApi<Block> for TestApi {
 	type Api = RuntimeApi;
 
 	fn runtime_api<'a>(&'a self) -> ApiRef<'a, Self::Api> {
-		RuntimeApi {
-			authorities: self.authorities.clone(),
-		}.into()
+		RuntimeApi { authorities: self.authorities.clone() }.into()
 	}
 }
 
@@ -135,10 +138,7 @@ impl Default for TestNetwork {
 		let (tx, rx) = mpsc::unbounded();
 		TestNetwork {
 			peer_id: PeerId::random(),
-			external_addresses: vec![
-				"/ip6/2001:db8::/tcp/30333"
-					.parse().unwrap(),
-			],
+			external_addresses: vec!["/ip6/2001:db8::/tcp/30333".parse().unwrap()],
 			put_value_call: Default::default(),
 			get_value_call: Default::default(),
 			event_sender: tx,
@@ -151,11 +151,17 @@ impl Default for TestNetwork {
 impl NetworkProvider for TestNetwork {
 	fn put_value(&self, key: kad::record::Key, value: Vec<u8>) {
 		self.put_value_call.lock().unwrap().push((key.clone(), value.clone()));
-		self.event_sender.clone().unbounded_send(TestNetworkEvent::PutCalled(key, value)).unwrap();
+		self.event_sender
+			.clone()
+			.unbounded_send(TestNetworkEvent::PutCalled(key, value))
+			.unwrap();
 	}
 	fn get_value(&self, key: &kad::record::Key) {
 		self.get_value_call.lock().unwrap().push(key.clone());
-		self.event_sender.clone().unbounded_send(TestNetworkEvent::GetCalled(key.clone())).unwrap();
+		self.event_sender
+			.clone()
+			.unbounded_send(TestNetworkEvent::GetCalled(key.clone()))
+			.unwrap();
 	}
 }
 
@@ -175,9 +181,8 @@ async fn build_dht_event(
 	key_store: &KeyStore,
 ) -> (libp2p::kad::record::Key, Vec<u8>) {
 	let mut serialized_addresses = vec![];
-	schema::AuthorityAddresses {
-		addresses: addresses.into_iter().map(|a| a.to_vec()).collect()
-	}.encode(&mut serialized_addresses)
+	schema::AuthorityAddresses { addresses: addresses.into_iter().map(|a| a.to_vec()).collect() }
+		.encode(&mut serialized_addresses)
 		.map_err(Error::EncodingProto)
 		.unwrap();
 
@@ -192,11 +197,9 @@ async fn build_dht_event(
 		.unwrap();
 
 	let mut signed_addresses = vec![];
-	schema::SignedAuthorityAddresses {
-		addresses: serialized_addresses.clone(),
-		signature,
-	}
-	.encode(&mut signed_addresses).unwrap();
+	schema::SignedAuthorityAddresses { addresses: serialized_addresses.clone(), signature }
+		.encode(&mut signed_addresses)
+		.unwrap();
 
 	let key = hash_authority_id(&public_key.to_raw_vec());
 	let value = signed_addresses;
@@ -208,9 +211,7 @@ fn new_registers_metrics() {
 	let (_dht_event_tx, dht_event_rx) = mpsc::channel(1000);
 	let network: Arc<TestNetwork> = Arc::new(Default::default());
 	let key_store = KeyStore::new();
-	let test_api = Arc::new(TestApi {
-		authorities: vec![],
-	});
+	let test_api = Arc::new(TestApi { authorities: vec![] });
 
 	let registry = prometheus_endpoint::Registry::new();
 
@@ -275,65 +276,67 @@ fn publish_discover_cycle() {
 
 	let key_store = KeyStore::new();
 
-	let _ = pool.spawner().spawn_local_obj(async move {
-		let node_a_public = key_store
-			.sr25519_generate_new(key_types::AUTHORITY_DISCOVERY, None)
-			.await
-			.unwrap();
-		let test_api = Arc::new(TestApi {
-			authorities: vec![node_a_public.into()],
-		});
-
-		let (_to_worker, from_service) = mpsc::channel(0);
-		let mut worker = Worker::new(
-			from_service,
-			test_api,
-			network.clone(),
-			Box::pin(dht_event_rx),
-			Role::PublishAndDiscover(key_store.into()),
-			None,
-			Default::default(),
-		);
-
-		worker.publish_ext_addresses(false).await.unwrap();
-
-		// Expect authority discovery to put a new record onto the dht.
-		assert_eq!(network.put_value_call.lock().unwrap().len(), 1);
-
-		let dht_event = {
-			let (key, value) = network.put_value_call.lock().unwrap().pop().unwrap();
-			sc_network::DhtEvent::ValueFound(vec![(key, value)])
-		};
-
-		// Node B discovering node A's address.
-
-		let (mut dht_event_tx, dht_event_rx) = channel(1000);
-		let test_api = Arc::new(TestApi {
-			// Make sure node B identifies node A as an authority.
-			authorities: vec![node_a_public.into()],
-		});
-		let network: Arc<TestNetwork> = Arc::new(Default::default());
-		let key_store = KeyStore::new();
-
-		let (_to_worker, from_service) = mpsc::channel(0);
-		let mut worker = Worker::new(
-			from_service,
-			test_api,
-			network.clone(),
-			Box::pin(dht_event_rx),
-			Role::PublishAndDiscover(key_store.into()),
-			None,
-			Default::default(),
-		);
-
-		dht_event_tx.try_send(dht_event.clone()).unwrap();
-
-		worker.refill_pending_lookups_queue().await.unwrap();
-		worker.start_new_lookups();
-
-		// Make authority discovery handle the event.
-		worker.handle_dht_event(dht_event).await;
-	}.boxed_local().into());
+	let _ = pool.spawner().spawn_local_obj(
+		async move {
+			let node_a_public = key_store
+				.sr25519_generate_new(key_types::AUTHORITY_DISCOVERY, None)
+				.await
+				.unwrap();
+			let test_api = Arc::new(TestApi { authorities: vec![node_a_public.into()] });
+
+			let (_to_worker, from_service) = mpsc::channel(0);
+			let mut worker = Worker::new(
+				from_service,
+				test_api,
+				network.clone(),
+				Box::pin(dht_event_rx),
+				Role::PublishAndDiscover(key_store.into()),
+				None,
+				Default::default(),
+			);
+
+			worker.publish_ext_addresses(false).await.unwrap();
+
+			// Expect authority discovery to put a new record onto the dht.
+			assert_eq!(network.put_value_call.lock().unwrap().len(), 1);
+
+			let dht_event = {
+				let (key, value) = network.put_value_call.lock().unwrap().pop().unwrap();
+				sc_network::DhtEvent::ValueFound(vec![(key, value)])
+			};
+
+			// Node B discovering node A's address.
+
+			let (mut dht_event_tx, dht_event_rx) = channel(1000);
+			let test_api = Arc::new(TestApi {
+				// Make sure node B identifies node A as an authority.
+				authorities: vec![node_a_public.into()],
+			});
+			let network: Arc<TestNetwork> = Arc::new(Default::default());
+			let key_store = KeyStore::new();
+
+			let (_to_worker, from_service) = mpsc::channel(0);
+			let mut worker = Worker::new(
+				from_service,
+				test_api,
+				network.clone(),
+				Box::pin(dht_event_rx),
+				Role::PublishAndDiscover(key_store.into()),
+				None,
+				Default::default(),
+			);
+
+			dht_event_tx.try_send(dht_event.clone()).unwrap();
+
+			worker.refill_pending_lookups_queue().await.unwrap();
+			worker.start_new_lookups();
+
+			// Make authority discovery handle the event.
+			worker.handle_dht_event(dht_event).await;
+		}
+		.boxed_local()
+		.into(),
+	);
 
 	pool.run();
 }
@@ -345,9 +348,7 @@ fn terminate_when_event_stream_terminates() {
 	let (dht_event_tx, dht_event_rx) = channel(1000);
 	let network: Arc<TestNetwork> = Arc::new(Default::default());
 	let key_store = KeyStore::new();
-	let test_api = Arc::new(TestApi {
-		authorities: vec![],
-	});
+	let test_api = Arc::new(TestApi { authorities: vec![] });
 
 	let (to_worker, from_service) = mpsc::channel(0);
 	let worker = Worker::new(
@@ -358,7 +359,8 @@ fn terminate_when_event_stream_terminates() {
 		Role::PublishAndDiscover(key_store.into()),
 		None,
 		Default::default(),
-	).run();
+	)
+	.run();
 	futures::pin_mut!(worker);
 
 	block_on(async {
@@ -367,7 +369,8 @@ fn terminate_when_event_stream_terminates() {
 		// Drop sender side of service channel.
 		drop(to_worker);
 		assert_eq!(
-			Poll::Pending, futures::poll!(&mut worker),
+			Poll::Pending,
+			futures::poll!(&mut worker),
 			"Expect the authority discovery module not to terminate once the \
 			sender side of the service channel is closed.",
 		);
@@ -377,7 +380,8 @@ fn terminate_when_event_stream_terminates() {
 		drop(dht_event_tx);
 
 		assert_eq!(
-			Poll::Ready(()), futures::poll!(&mut worker),
+			Poll::Ready(()),
+			futures::poll!(&mut worker),
 			"Expect the authority discovery module to terminate once the \
 			 sending side of the dht event channel is closed.",
 		);
@@ -390,14 +394,13 @@ fn dont_stop_polling_dht_event_stream_after_bogus_event() {
 		let peer_id = PeerId::random();
 		let address: Multiaddr = "/ip6/2001:db8:0:0:0:0:0:1/tcp/30333".parse().unwrap();
 
-		address.with(multiaddr::Protocol::P2p(
-			peer_id.into(),
-		))
+		address.with(multiaddr::Protocol::P2p(peer_id.into()))
 	};
 	let remote_key_store = KeyStore::new();
-	let remote_public_key: AuthorityId = block_on(
-		remote_key_store.sr25519_generate_new(key_types::AUTHORITY_DISCOVERY, None),
-	).unwrap().into();
+	let remote_public_key: AuthorityId =
+		block_on(remote_key_store.sr25519_generate_new(key_types::AUTHORITY_DISCOVERY, None))
+			.unwrap()
+			.into();
 
 	let (mut dht_event_tx, dht_event_rx) = channel(1);
 	let (network, mut network_events) = {
@@ -407,9 +410,7 @@ fn dont_stop_polling_dht_event_stream_after_bogus_event() {
 	};
 
 	let key_store = KeyStore::new();
-	let test_api = Arc::new(TestApi {
-		authorities: vec![remote_public_key.clone()],
-	});
+	let test_api = Arc::new(TestApi { authorities: vec![remote_public_key.clone()] });
 	let mut pool = LocalPool::new();
 
 	let (mut to_worker, from_service) = mpsc::channel(1);
@@ -427,30 +428,35 @@ fn dont_stop_polling_dht_event_stream_after_bogus_event() {
 	//
 	// As this is a local pool, only one future at a time will have the CPU and
 	// can make progress until the future returns `Pending`.
-	let _ = pool.spawner().spawn_local_obj(async move {
-		// Refilling `pending_lookups` only happens every X minutes. Fast
-		// forward by calling `refill_pending_lookups_queue` directly.
-		worker.refill_pending_lookups_queue().await.unwrap();
-		worker.run().await
-	}.boxed_local().into());
+	let _ = pool.spawner().spawn_local_obj(
+		async move {
+			// Refilling `pending_lookups` only happens every X minutes. Fast
+			// forward by calling `refill_pending_lookups_queue` directly.
+			worker.refill_pending_lookups_queue().await.unwrap();
+			worker.run().await
+		}
+		.boxed_local()
+		.into(),
+	);
 
 	pool.run_until(async {
 		// Assert worker to trigger a lookup for the one and only authority.
-		assert!(matches!(
-			network_events.next().await,
-			Some(TestNetworkEvent::GetCalled(_))
-		));
+		assert!(matches!(network_events.next().await, Some(TestNetworkEvent::GetCalled(_))));
 
 		// Send an event that should generate an error
-		dht_event_tx.send(DhtEvent::ValueFound(Default::default())).await
+		dht_event_tx
+			.send(DhtEvent::ValueFound(Default::default()))
+			.await
 			.expect("Channel has capacity of 1.");
 
 		// Make previously triggered lookup succeed.
 		let dht_event = {
 			let (key, value) = build_dht_event(
 				vec![remote_multiaddr.clone()],
-				remote_public_key.clone(), &remote_key_store,
-			).await;
+				remote_public_key.clone(),
+				&remote_key_store,
+			)
+			.await;
 			sc_network::DhtEvent::ValueFound(vec![(key, value)])
 		};
 		dht_event_tx.send(dht_event).await.expect("Channel has capacity of 1.");
@@ -458,10 +464,10 @@ fn dont_stop_polling_dht_event_stream_after_bogus_event() {
 		// Expect authority discovery to function normally, now knowing the
 		// address for the remote node.
 		let (sender, addresses) = futures::channel::oneshot::channel();
-		to_worker.send(ServicetoWorkerMsg::GetAddressesByAuthorityId(
-			remote_public_key,
-			sender,
-		)).await.expect("Channel has capacity of 1.");
+		to_worker
+			.send(ServicetoWorkerMsg::GetAddressesByAuthorityId(remote_public_key, sender))
+			.await
+			.expect("Channel has capacity of 1.");
 		assert_eq!(Some(vec![remote_multiaddr]), addresses.await.unwrap());
 	});
 }
@@ -469,23 +475,19 @@ fn dont_stop_polling_dht_event_stream_after_bogus_event() {
 #[test]
 fn limit_number_of_addresses_added_to_cache_per_authority() {
 	let remote_key_store = KeyStore::new();
-	let remote_public = block_on(remote_key_store
-		.sr25519_generate_new(key_types::AUTHORITY_DISCOVERY, None))
-		.unwrap();
+	let remote_public =
+		block_on(remote_key_store.sr25519_generate_new(key_types::AUTHORITY_DISCOVERY, None))
+			.unwrap();
 
-	let addresses = (0..100).map(|_| {
-		let peer_id = PeerId::random();
-		let address: Multiaddr = "/ip6/2001:db8:0:0:0:0:0:1/tcp/30333".parse().unwrap();
-		address.with(multiaddr::Protocol::P2p(
-			peer_id.into(),
-		))
-	}).collect();
+	let addresses = (0..100)
+		.map(|_| {
+			let peer_id = PeerId::random();
+			let address: Multiaddr = "/ip6/2001:db8:0:0:0:0:0:1/tcp/30333".parse().unwrap();
+			address.with(multiaddr::Protocol::P2p(peer_id.into()))
+		})
+		.collect();
 
-	let dht_event = block_on(build_dht_event(
-		addresses,
-		remote_public.into(),
-		&remote_key_store,
-	));
+	let dht_event = block_on(build_dht_event(addresses, remote_public.into(), &remote_key_store));
 
 	let (_dht_event_tx, dht_event_rx) = channel(1);
 
@@ -506,16 +508,20 @@ fn limit_number_of_addresses_added_to_cache_per_authority() {
 	worker.handle_dht_value_found_event(vec![dht_event]).unwrap();
 	assert_eq!(
 		MAX_ADDRESSES_PER_AUTHORITY,
-		worker.addr_cache.get_addresses_by_authority_id(&remote_public.into()).unwrap().len(),
+		worker
+			.addr_cache
+			.get_addresses_by_authority_id(&remote_public.into())
+			.unwrap()
+			.len(),
 	);
 }
 
 #[test]
 fn do_not_cache_addresses_without_peer_id() {
 	let remote_key_store = KeyStore::new();
-	let remote_public = block_on(remote_key_store
-		.sr25519_generate_new(key_types::AUTHORITY_DISCOVERY, None))
-		.unwrap();
+	let remote_public =
+		block_on(remote_key_store.sr25519_generate_new(key_types::AUTHORITY_DISCOVERY, None))
+			.unwrap();
 
 	let multiaddr_with_peer_id = {
 		let peer_id = PeerId::random();
@@ -524,21 +530,17 @@ fn do_not_cache_addresses_without_peer_id() {
 		address.with(multiaddr::Protocol::P2p(peer_id.into()))
 	};
 
-	let multiaddr_without_peer_id: Multiaddr = "/ip6/2001:db8:0:0:0:0:0:1/tcp/30333".parse().unwrap();
+	let multiaddr_without_peer_id: Multiaddr =
+		"/ip6/2001:db8:0:0:0:0:0:1/tcp/30333".parse().unwrap();
 
 	let dht_event = block_on(build_dht_event(
-		vec![
-			multiaddr_with_peer_id.clone(),
-			multiaddr_without_peer_id,
-		],
+		vec![multiaddr_with_peer_id.clone(), multiaddr_without_peer_id],
 		remote_public.into(),
 		&remote_key_store,
 	));
 
 	let (_dht_event_tx, dht_event_rx) = channel(1);
-	let local_test_api = Arc::new(TestApi {
-		authorities: vec![remote_public.into()],
-	});
+	let local_test_api = Arc::new(TestApi { authorities: vec![remote_public.into()] });
 	let local_network: Arc<TestNetwork> = Arc::new(Default::default());
 	let local_key_store = KeyStore::new();
 
@@ -578,9 +580,7 @@ fn addresses_to_publish_adds_p2p() {
 	let (_to_worker, from_service) = mpsc::channel(0);
 	let worker = Worker::new(
 		from_service,
-		Arc::new(TestApi {
-			authorities: vec![],
-		}),
+		Arc::new(TestApi { authorities: vec![] }),
 		network.clone(),
 		Box::pin(dht_event_rx),
 		Role::PublishAndDiscover(Arc::new(KeyStore::new())),
@@ -605,17 +605,16 @@ fn addresses_to_publish_respects_existing_p2p_protocol() {
 	let network: Arc<TestNetwork> = Arc::new(TestNetwork {
 		external_addresses: vec![
 			"/ip6/2001:db8::/tcp/30333/p2p/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSupNKC"
-				.parse().unwrap(),
+				.parse()
+				.unwrap(),
 		],
-		.. Default::default()
+		..Default::default()
 	});
 
 	let (_to_worker, from_service) = mpsc::channel(0);
 	let worker = Worker::new(
 		from_service,
-		Arc::new(TestApi {
-			authorities: vec![],
-		}),
+		Arc::new(TestApi { authorities: vec![] }),
 		network.clone(),
 		Box::pin(dht_event_rx),
 		Role::PublishAndDiscover(Arc::new(KeyStore::new())),
@@ -624,7 +623,8 @@ fn addresses_to_publish_respects_existing_p2p_protocol() {
 	);
 
 	assert_eq!(
-		network.external_addresses, worker.addresses_to_publish().collect::<Vec<_>>(),
+		network.external_addresses,
+		worker.addresses_to_publish().collect::<Vec<_>>(),
 		"Expected Multiaddr from `TestNetwork` to not be altered.",
 	);
 }
@@ -635,21 +635,21 @@ fn lookup_throttling() {
 		let peer_id = PeerId::random();
 		let address: Multiaddr = "/ip6/2001:db8:0:0:0:0:0:1/tcp/30333".parse().unwrap();
 
-		address.with(multiaddr::Protocol::P2p(
-			peer_id.into(),
-		))
+		address.with(multiaddr::Protocol::P2p(peer_id.into()))
 	};
 	let remote_key_store = KeyStore::new();
-	let remote_public_keys: Vec<AuthorityId> = (0..20).map(|_| {
-		block_on(remote_key_store
-				 .sr25519_generate_new(key_types::AUTHORITY_DISCOVERY, None))
-				 .unwrap().into()
-	}).collect();
-	let remote_hash_to_key = remote_public_keys.iter()
+	let remote_public_keys: Vec<AuthorityId> = (0..20)
+		.map(|_| {
+			block_on(remote_key_store.sr25519_generate_new(key_types::AUTHORITY_DISCOVERY, None))
+				.unwrap()
+				.into()
+		})
+		.collect();
+	let remote_hash_to_key = remote_public_keys
+		.iter()
 		.map(|k| (hash_authority_id(k.as_ref()), k.clone()))
 		.collect::<HashMap<_, _>>();
 
-
 	let (mut dht_event_tx, dht_event_rx) = channel(1);
 	let (_to_worker, from_service) = mpsc::channel(0);
 	let mut network = TestNetwork::default();
@@ -668,56 +668,61 @@ fn lookup_throttling() {
 	let mut pool = LocalPool::new();
 	let metrics = worker.metrics.clone().unwrap();
 
-	let _ = pool.spawner().spawn_local_obj(async move {
-		// Refilling `pending_lookups` only happens every X minutes. Fast
-		// forward by calling `refill_pending_lookups_queue` directly.
-		worker.refill_pending_lookups_queue().await.unwrap();
-		worker.run().await
-	}.boxed_local().into());
+	let _ = pool.spawner().spawn_local_obj(
+		async move {
+			// Refilling `pending_lookups` only happens every X minutes. Fast
+			// forward by calling `refill_pending_lookups_queue` directly.
+			worker.refill_pending_lookups_queue().await.unwrap();
+			worker.run().await
+		}
+		.boxed_local()
+		.into(),
+	);
 
-	pool.run_until(async {
-		// Assert worker to trigger MAX_IN_FLIGHT_LOOKUPS lookups.
-		for _ in 0..MAX_IN_FLIGHT_LOOKUPS {
+	pool.run_until(
+		async {
+			// Assert worker to trigger MAX_IN_FLIGHT_LOOKUPS lookups.
+			for _ in 0..MAX_IN_FLIGHT_LOOKUPS {
+				assert!(matches!(receiver.next().await, Some(TestNetworkEvent::GetCalled(_))));
+			}
+			assert_eq!(
+				metrics.requests_pending.get(),
+				(remote_public_keys.len() - MAX_IN_FLIGHT_LOOKUPS) as u64
+			);
+			assert_eq!(network.get_value_call.lock().unwrap().len(), MAX_IN_FLIGHT_LOOKUPS);
+
+			// Make first lookup succeed.
+			let remote_hash = network.get_value_call.lock().unwrap().pop().unwrap();
+			let remote_key: AuthorityId = remote_hash_to_key.get(&remote_hash).unwrap().clone();
+			let dht_event = {
+				let (key, value) =
+					build_dht_event(vec![remote_multiaddr.clone()], remote_key, &remote_key_store)
+						.await;
+				sc_network::DhtEvent::ValueFound(vec![(key, value)])
+			};
+			dht_event_tx.send(dht_event).await.expect("Channel has capacity of 1.");
+
+			// Assert worker to trigger another lookup.
 			assert!(matches!(receiver.next().await, Some(TestNetworkEvent::GetCalled(_))));
+			assert_eq!(
+				metrics.requests_pending.get(),
+				(remote_public_keys.len() - MAX_IN_FLIGHT_LOOKUPS - 1) as u64
+			);
+			assert_eq!(network.get_value_call.lock().unwrap().len(), MAX_IN_FLIGHT_LOOKUPS);
+
+			// Make second one fail.
+			let remote_hash = network.get_value_call.lock().unwrap().pop().unwrap();
+			let dht_event = sc_network::DhtEvent::ValueNotFound(remote_hash);
+			dht_event_tx.send(dht_event).await.expect("Channel has capacity of 1.");
+
+			// Assert worker to trigger another lookup.
+			assert!(matches!(receiver.next().await, Some(TestNetworkEvent::GetCalled(_))));
+			assert_eq!(
+				metrics.requests_pending.get(),
+				(remote_public_keys.len() - MAX_IN_FLIGHT_LOOKUPS - 2) as u64
+			);
+			assert_eq!(network.get_value_call.lock().unwrap().len(), MAX_IN_FLIGHT_LOOKUPS);
 		}
-		assert_eq!(
-			metrics.requests_pending.get(),
-			(remote_public_keys.len() - MAX_IN_FLIGHT_LOOKUPS) as u64
-		);
-		assert_eq!(network.get_value_call.lock().unwrap().len(), MAX_IN_FLIGHT_LOOKUPS);
-
-		// Make first lookup succeed.
-		let remote_hash = network.get_value_call.lock().unwrap().pop().unwrap();
-		let remote_key: AuthorityId = remote_hash_to_key.get(&remote_hash).unwrap().clone();
-		let dht_event = {
-			let (key, value) = build_dht_event(
-				vec![remote_multiaddr.clone()],
-				remote_key,
-				&remote_key_store
-			).await;
-			sc_network::DhtEvent::ValueFound(vec![(key, value)])
-		};
-		dht_event_tx.send(dht_event).await.expect("Channel has capacity of 1.");
-
-		// Assert worker to trigger another lookup.
-		assert!(matches!(receiver.next().await, Some(TestNetworkEvent::GetCalled(_))));
-		assert_eq!(
-			metrics.requests_pending.get(),
-			(remote_public_keys.len() - MAX_IN_FLIGHT_LOOKUPS - 1) as u64
-		);
-		assert_eq!(network.get_value_call.lock().unwrap().len(), MAX_IN_FLIGHT_LOOKUPS);
-
-		// Make second one fail.
-		let remote_hash = network.get_value_call.lock().unwrap().pop().unwrap();
-		let dht_event = sc_network::DhtEvent::ValueNotFound(remote_hash);
-		dht_event_tx.send(dht_event).await.expect("Channel has capacity of 1.");
-
-		// Assert worker to trigger another lookup.
-		assert!(matches!(receiver.next().await, Some(TestNetworkEvent::GetCalled(_))));
-		assert_eq!(
-			metrics.requests_pending.get(),
-			(remote_public_keys.len() - MAX_IN_FLIGHT_LOOKUPS - 2) as u64
-		);
-		assert_eq!(network.get_value_call.lock().unwrap().len(), MAX_IN_FLIGHT_LOOKUPS);
-	}.boxed_local());
+		.boxed_local(),
+	);
 }
diff --git a/client/basic-authorship/src/basic_authorship.rs b/client/basic-authorship/src/basic_authorship.rs
index 590f4275bf76..b60606294890 100644
--- a/client/basic-authorship/src/basic_authorship.rs
+++ b/client/basic-authorship/src/basic_authorship.rs
@@ -20,24 +20,30 @@
 
 // FIXME #1021 move this into sp-consensus
 
-use std::{pin::Pin, time, sync::Arc};
-use sc_client_api::backend;
 use codec::{Decode, Encode};
-use sp_consensus::{evaluation, Proposal, ProofRecording, DisableProofRecording, EnableProofRecording};
+use futures::{
+	channel::oneshot,
+	future,
+	future::{Future, FutureExt},
+	select,
+};
+use log::{debug, error, info, trace, warn};
+use sc_block_builder::{BlockBuilderApi, BlockBuilderProvider};
+use sc_client_api::backend;
+use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_INFO};
+use sc_transaction_pool_api::{InPoolTransaction, TransactionPool};
+use sp_api::{ApiExt, ProvideRuntimeApi};
+use sp_blockchain::{ApplyExtrinsicFailed::Validity, Error::ApplyExtrinsicFailed, HeaderBackend};
+use sp_consensus::{
+	evaluation, DisableProofRecording, EnableProofRecording, ProofRecording, Proposal,
+};
 use sp_core::traits::SpawnNamed;
 use sp_inherents::InherentData;
-use log::{error, info, debug, trace, warn};
 use sp_runtime::{
 	generic::BlockId,
-	traits::{Block as BlockT, Hash as HashT, Header as HeaderT, DigestFor, BlakeTwo256},
+	traits::{BlakeTwo256, Block as BlockT, DigestFor, Hash as HashT, Header as HeaderT},
 };
-use sc_transaction_pool_api::{TransactionPool, InPoolTransaction};
-use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_INFO};
-use sc_block_builder::{BlockBuilderApi, BlockBuilderProvider};
-use sp_api::{ProvideRuntimeApi, ApiExt};
-use futures::{future, future::{Future, FutureExt}, channel::oneshot, select};
-use sp_blockchain::{HeaderBackend, ApplyExtrinsicFailed::Validity, Error::ApplyExtrinsicFailed};
-use std::marker::PhantomData;
+use std::{marker::PhantomData, pin::Pin, sync::Arc, time};
 
 use prometheus_endpoint::Registry as PrometheusRegistry;
 use sc_proposer_metrics::MetricsLink as PrometheusMetrics;
@@ -141,14 +147,18 @@ impl<A, B, C, PR> ProposerFactory<A, B, C, PR> {
 }
 
 impl<B, Block, C, A, PR> ProposerFactory<A, B, C, PR>
-	where
-		A: TransactionPool<Block = Block> + 'static,
-		B: backend::Backend<Block> + Send + Sync + 'static,
-		Block: BlockT,
-		C: BlockBuilderProvider<B, Block, C> + HeaderBackend<Block> + ProvideRuntimeApi<Block>
-			+ Send + Sync + 'static,
-		C::Api: ApiExt<Block, StateBackend = backend::StateBackendFor<B, Block>>
-			+ BlockBuilderApi<Block>,
+where
+	A: TransactionPool<Block = Block> + 'static,
+	B: backend::Backend<Block> + Send + Sync + 'static,
+	Block: BlockT,
+	C: BlockBuilderProvider<B, Block, C>
+		+ HeaderBackend<Block>
+		+ ProvideRuntimeApi<Block>
+		+ Send
+		+ Sync
+		+ 'static,
+	C::Api:
+		ApiExt<Block, StateBackend = backend::StateBackendFor<B, Block>> + BlockBuilderApi<Block>,
 {
 	fn init_with_now(
 		&mut self,
@@ -180,26 +190,26 @@ impl<B, Block, C, A, PR> ProposerFactory<A, B, C, PR>
 	}
 }
 
-impl<A, B, Block, C, PR> sp_consensus::Environment<Block> for
-	ProposerFactory<A, B, C, PR>
-		where
-			A: TransactionPool<Block = Block> + 'static,
-			B: backend::Backend<Block> + Send + Sync + 'static,
-			Block: BlockT,
-			C: BlockBuilderProvider<B, Block, C> + HeaderBackend<Block> + ProvideRuntimeApi<Block>
-				+ Send + Sync + 'static,
-			C::Api: ApiExt<Block, StateBackend = backend::StateBackendFor<B, Block>>
-				+ BlockBuilderApi<Block>,
-			PR: ProofRecording,
+impl<A, B, Block, C, PR> sp_consensus::Environment<Block> for ProposerFactory<A, B, C, PR>
+where
+	A: TransactionPool<Block = Block> + 'static,
+	B: backend::Backend<Block> + Send + Sync + 'static,
+	Block: BlockT,
+	C: BlockBuilderProvider<B, Block, C>
+		+ HeaderBackend<Block>
+		+ ProvideRuntimeApi<Block>
+		+ Send
+		+ Sync
+		+ 'static,
+	C::Api:
+		ApiExt<Block, StateBackend = backend::StateBackendFor<B, Block>> + BlockBuilderApi<Block>,
+	PR: ProofRecording,
 {
 	type CreateProposer = future::Ready<Result<Self::Proposer, Self::Error>>;
 	type Proposer = Proposer<B, Block, C, A, PR>;
 	type Error = sp_blockchain::Error;
 
-	fn init(
-		&mut self,
-		parent_header: &<Block as BlockT>::Header,
-	) -> Self::CreateProposer {
+	fn init(&mut self, parent_header: &<Block as BlockT>::Header) -> Self::CreateProposer {
 		future::ready(Ok(self.init_with_now(parent_header, Box::new(time::Instant::now))))
 	}
 }
@@ -220,22 +230,28 @@ pub struct Proposer<B, Block: BlockT, C, A: TransactionPool, PR> {
 	_phantom: PhantomData<(B, PR)>,
 }
 
-impl<A, B, Block, C, PR> sp_consensus::Proposer<Block> for
-	Proposer<B, Block, C, A, PR>
-		where
-			A: TransactionPool<Block = Block> + 'static,
-			B: backend::Backend<Block> + Send + Sync + 'static,
-			Block: BlockT,
-			C: BlockBuilderProvider<B, Block, C> + HeaderBackend<Block> + ProvideRuntimeApi<Block>
-				+ Send + Sync + 'static,
-			C::Api: ApiExt<Block, StateBackend = backend::StateBackendFor<B, Block>>
-				+ BlockBuilderApi<Block>,
-			PR: ProofRecording,
+impl<A, B, Block, C, PR> sp_consensus::Proposer<Block> for Proposer<B, Block, C, A, PR>
+where
+	A: TransactionPool<Block = Block> + 'static,
+	B: backend::Backend<Block> + Send + Sync + 'static,
+	Block: BlockT,
+	C: BlockBuilderProvider<B, Block, C>
+		+ HeaderBackend<Block>
+		+ ProvideRuntimeApi<Block>
+		+ Send
+		+ Sync
+		+ 'static,
+	C::Api:
+		ApiExt<Block, StateBackend = backend::StateBackendFor<B, Block>> + BlockBuilderApi<Block>,
+	PR: ProofRecording,
 {
 	type Transaction = backend::TransactionFor<B, Block>;
-	type Proposal = Pin<Box<dyn Future<
-		Output = Result<Proposal<Block, Self::Transaction, PR::Proof>, Self::Error>
-	> + Send>>;
+	type Proposal = Pin<
+		Box<
+			dyn Future<Output = Result<Proposal<Block, Self::Transaction, PR::Proof>, Self::Error>>
+				+ Send,
+		>,
+	>;
 	type Error = sp_blockchain::Error;
 	type ProofRecording = PR;
 	type Proof = PR::Proof;
@@ -250,36 +266,38 @@ impl<A, B, Block, C, PR> sp_consensus::Proposer<Block> for
 		let (tx, rx) = oneshot::channel();
 		let spawn_handle = self.spawn_handle.clone();
 
-		spawn_handle.spawn_blocking("basic-authorship-proposer", Box::pin(async move {
-			// leave some time for evaluation and block finalization (33%)
-			let deadline = (self.now)() + max_duration - max_duration / 3;
-			let res = self.propose_with(
-				inherent_data,
-				inherent_digests,
-				deadline,
-				block_size_limit,
-			).await;
-			if tx.send(res).is_err() {
-				trace!("Could not send block production result to proposer!");
-			}
-		}));
+		spawn_handle.spawn_blocking(
+			"basic-authorship-proposer",
+			Box::pin(async move {
+				// leave some time for evaluation and block finalization (33%)
+				let deadline = (self.now)() + max_duration - max_duration / 3;
+				let res = self
+					.propose_with(inherent_data, inherent_digests, deadline, block_size_limit)
+					.await;
+				if tx.send(res).is_err() {
+					trace!("Could not send block production result to proposer!");
+				}
+			}),
+		);
 
-		async move {
-			rx.await?
-		}.boxed()
+		async move { rx.await? }.boxed()
 	}
 }
 
 impl<A, B, Block, C, PR> Proposer<B, Block, C, A, PR>
-	where
-		A: TransactionPool<Block = Block>,
-		B: backend::Backend<Block> + Send + Sync + 'static,
-		Block: BlockT,
-		C: BlockBuilderProvider<B, Block, C> + HeaderBackend<Block> + ProvideRuntimeApi<Block>
-			+ Send + Sync + 'static,
-		C::Api: ApiExt<Block, StateBackend = backend::StateBackendFor<B, Block>>
-			+ BlockBuilderApi<Block>,
-		PR: ProofRecording,
+where
+	A: TransactionPool<Block = Block>,
+	B: backend::Backend<Block> + Send + Sync + 'static,
+	Block: BlockT,
+	C: BlockBuilderProvider<B, Block, C>
+		+ HeaderBackend<Block>
+		+ ProvideRuntimeApi<Block>
+		+ Send
+		+ Sync
+		+ 'static,
+	C::Api:
+		ApiExt<Block, StateBackend = backend::StateBackendFor<B, Block>> + BlockBuilderApi<Block>,
+	PR: ProofRecording,
 {
 	async fn propose_with(
 		self,
@@ -287,30 +305,30 @@ impl<A, B, Block, C, PR> Proposer<B, Block, C, A, PR>
 		inherent_digests: DigestFor<Block>,
 		deadline: time::Instant,
 		block_size_limit: Option<usize>,
-	) -> Result<Proposal<Block, backend::TransactionFor<B, Block>, PR::Proof>, sp_blockchain::Error> {
+	) -> Result<Proposal<Block, backend::TransactionFor<B, Block>, PR::Proof>, sp_blockchain::Error>
+	{
 		/// If the block is full we will attempt to push at most
 		/// this number of transactions before quitting for real.
 		/// It allows us to increase block utilization.
 		const MAX_SKIPPED_TRANSACTIONS: usize = 8;
 
-		let mut block_builder = self.client.new_block_at(
-			&self.parent_id,
-			inherent_digests,
-			PR::ENABLED,
-		)?;
+		let mut block_builder =
+			self.client.new_block_at(&self.parent_id, inherent_digests, PR::ENABLED)?;
 
 		for inherent in block_builder.create_inherents(inherent_data)? {
 			match block_builder.push(inherent) {
 				Err(ApplyExtrinsicFailed(Validity(e))) if e.exhausted_resources() =>
 					warn!("⚠️  Dropping non-mandatory inherent from overweight block."),
 				Err(ApplyExtrinsicFailed(Validity(e))) if e.was_mandatory() => {
-					error!("❌️ Mandatory inherent extrinsic returned error. Block cannot be produced.");
+					error!(
+						"❌️ Mandatory inherent extrinsic returned error. Block cannot be produced."
+					);
 					Err(ApplyExtrinsicFailed(Validity(e)))?
-				}
+				},
 				Err(e) => {
 					warn!("❗️ Inherent extrinsic returned unexpected error: {}. Dropping.", e);
-				}
-				Ok(_) => {}
+				},
+				Ok(_) => {},
 			}
 		}
 
@@ -320,9 +338,8 @@ impl<A, B, Block, C, PR> Proposer<B, Block, C, A, PR>
 		let mut unqueue_invalid = Vec::new();
 
 		let mut t1 = self.transaction_pool.ready_at(self.parent_number).fuse();
-		let mut t2 = futures_timer::Delay::new(
-			deadline.saturating_duration_since((self.now)()) / 8,
-		).fuse();
+		let mut t2 =
+			futures_timer::Delay::new(deadline.saturating_duration_since((self.now)()) / 8).fuse();
 
 		let pending_iterator = select! {
 			res = t1 => res,
@@ -349,15 +366,14 @@ impl<A, B, Block, C, PR> Proposer<B, Block, C, A, PR>
 					"Consensus deadline reached when pushing block transactions, \
 					proceeding with proposing."
 				);
-				break;
+				break
 			}
 
 			let pending_tx_data = pending_tx.data().clone();
 			let pending_tx_hash = pending_tx.hash().clone();
 
-			let block_size = block_builder.estimate_block_size(
-				self.include_proof_in_block_size_estimation,
-			);
+			let block_size =
+				block_builder.estimate_block_size(self.include_proof_in_block_size_estimation);
 			if block_size + pending_tx_data.encoded_size() > block_size_limit {
 				if skipped < MAX_SKIPPED_TRANSACTIONS {
 					skipped += 1;
@@ -366,11 +382,11 @@ impl<A, B, Block, C, PR> Proposer<B, Block, C, A, PR>
 						 but will try {} more transactions before quitting.",
 						MAX_SKIPPED_TRANSACTIONS - skipped,
 					);
-					continue;
+					continue
 				} else {
 					debug!("Reached block size limit, proceeding with proposing.");
 					hit_block_size_limit = true;
-					break;
+					break
 				}
 			}
 
@@ -379,9 +395,8 @@ impl<A, B, Block, C, PR> Proposer<B, Block, C, A, PR>
 				Ok(()) => {
 					transaction_pushed = true;
 					debug!("[{:?}] Pushed to the block.", pending_tx_hash);
-				}
-				Err(ApplyExtrinsicFailed(Validity(e)))
-						if e.exhausted_resources() => {
+				},
+				Err(ApplyExtrinsicFailed(Validity(e))) if e.exhausted_resources() => {
 					if skipped < MAX_SKIPPED_TRANSACTIONS {
 						skipped += 1;
 						debug!(
@@ -390,20 +405,20 @@ impl<A, B, Block, C, PR> Proposer<B, Block, C, A, PR>
 						);
 					} else {
 						debug!("Block is full, proceed with proposing.");
-						break;
+						break
 					}
-				}
+				},
 				Err(e) if skipped > 0 => {
 					trace!(
 						"[{:?}] Ignoring invalid transaction when skipping: {}",
 						pending_tx_hash,
 						e
 					);
-				}
+				},
 				Err(e) => {
 					debug!("[{:?}] Invalid transaction: {}", pending_tx_hash, e);
 					unqueue_invalid.push(pending_tx_hash);
-				}
+				},
 			}
 		}
 
@@ -418,12 +433,10 @@ impl<A, B, Block, C, PR> Proposer<B, Block, C, A, PR>
 
 		let (block, storage_changes, proof) = block_builder.build()?.into_inner();
 
-		self.metrics.report(
-			|metrics| {
-				metrics.number_of_transactions.set(block.extrinsics().len() as u64);
-				metrics.block_constructed.observe(block_timer.elapsed().as_secs_f64());
-			}
-		);
+		self.metrics.report(|metrics| {
+			metrics.number_of_transactions.set(block.extrinsics().len() as u64);
+			metrics.block_constructed.observe(block_timer.elapsed().as_secs_f64());
+		});
 
 		info!(
 			"🎁 Prepared block for proposing at {} [hash: {:?}; parent_hash: {}; extrinsics ({}): [{}]]",
@@ -449,16 +462,14 @@ impl<A, B, Block, C, PR> Proposer<B, Block, C, A, PR>
 			error!("Failed to verify block encoding/decoding");
 		}
 
-		if let Err(err) = evaluation::evaluate_initial(
-			&block,
-			&self.parent_hash,
-			self.parent_number,
-		) {
+		if let Err(err) =
+			evaluation::evaluate_initial(&block, &self.parent_hash, self.parent_number)
+		{
 			error!("Failed to evaluate authored block: {:?}", err);
 		}
 
-		let proof = PR::into_proof(proof)
-			.map_err(|e| sp_blockchain::Error::Application(Box::new(e)))?;
+		let proof =
+			PR::into_proof(proof).map_err(|e| sp_blockchain::Error::Application(Box::new(e)))?;
 		Ok(Proposal { block, proof, storage_changes })
 	}
 }
@@ -467,19 +478,20 @@ impl<A, B, Block, C, PR> Proposer<B, Block, C, A, PR>
 mod tests {
 	use super::*;
 
+	use futures::executor::block_on;
 	use parking_lot::Mutex;
-	use sp_consensus::{BlockOrigin, Proposer};
-	use substrate_test_runtime_client::{
-		prelude::*, TestClientBuilder, runtime::{Extrinsic, Transfer}, TestClientBuilderExt,
-	};
-	use sc_transaction_pool_api::{ChainEvent, MaintainedTransactionPool, TransactionSource};
+	use sc_client_api::Backend;
 	use sc_transaction_pool::BasicPool;
+	use sc_transaction_pool_api::{ChainEvent, MaintainedTransactionPool, TransactionSource};
 	use sp_api::Core;
 	use sp_blockchain::HeaderBackend;
+	use sp_consensus::{BlockOrigin, Environment, Proposer};
 	use sp_runtime::traits::NumberFor;
-	use sc_client_api::Backend;
-	use futures::executor::block_on;
-	use sp_consensus::Environment;
+	use substrate_test_runtime_client::{
+		prelude::*,
+		runtime::{Extrinsic, Transfer},
+		TestClientBuilder, TestClientBuilderExt,
+	};
 
 	const SOURCE: TransactionSource = TransactionSource::External;
 
@@ -489,16 +501,15 @@ mod tests {
 			nonce,
 			from: AccountKeyring::Alice.into(),
 			to: Default::default(),
-		}.into_signed_tx()
+		}
+		.into_signed_tx()
 	}
 
 	fn chain_event<B: BlockT>(header: B::Header) -> ChainEvent<B>
-		where NumberFor<B>: From<u64>
+	where
+		NumberFor<B>: From<u64>,
 	{
-		ChainEvent::NewBestBlock {
-			hash: header.hash(),
-			tree_route: None,
-		}
+		ChainEvent::NewBestBlock { hash: header.hash(), tree_route: None }
 	}
 
 	#[test]
@@ -514,25 +525,20 @@ mod tests {
 			client.clone(),
 		);
 
-		block_on(
-			txpool.submit_at(&BlockId::number(0), SOURCE, vec![extrinsic(0), extrinsic(1)])
-		).unwrap();
+		block_on(txpool.submit_at(&BlockId::number(0), SOURCE, vec![extrinsic(0), extrinsic(1)]))
+			.unwrap();
 
 		block_on(
 			txpool.maintain(chain_event(
-				client.header(&BlockId::Number(0u64))
+				client
+					.header(&BlockId::Number(0u64))
 					.expect("header get error")
-					.expect("there should be header")
-			))
+					.expect("there should be header"),
+			)),
 		);
 
-		let mut proposer_factory = ProposerFactory::new(
-			spawner.clone(),
-			client.clone(),
-			txpool.clone(),
-			None,
-			None,
-		);
+		let mut proposer_factory =
+			ProposerFactory::new(spawner.clone(), client.clone(), txpool.clone(), None, None);
 
 		let cell = Mutex::new((false, time::Instant::now()));
 		let proposer = proposer_factory.init_with_now(
@@ -541,20 +547,21 @@ mod tests {
 				let mut value = cell.lock();
 				if !value.0 {
 					value.0 = true;
-					return value.1;
+					return value.1
 				}
 				let old = value.1;
 				let new = old + time::Duration::from_secs(2);
 				*value = (true, new);
 				old
-			})
+			}),
 		);
 
 		// when
 		let deadline = time::Duration::from_secs(3);
-		let block = block_on(
-			proposer.propose(Default::default(), Default::default(), deadline, None)
-		).map(|r| r.block).unwrap();
+		let block =
+			block_on(proposer.propose(Default::default(), Default::default(), deadline, None))
+				.map(|r| r.block)
+				.unwrap();
 
 		// then
 		// block should have some extrinsics although we have some more in the pool.
@@ -574,13 +581,8 @@ mod tests {
 			client.clone(),
 		);
 
-		let mut proposer_factory = ProposerFactory::new(
-			spawner.clone(),
-			client.clone(),
-			txpool.clone(),
-			None,
-			None,
-		);
+		let mut proposer_factory =
+			ProposerFactory::new(spawner.clone(), client.clone(), txpool.clone(), None, None);
 
 		let cell = Mutex::new((false, time::Instant::now()));
 		let proposer = proposer_factory.init_with_now(
@@ -589,18 +591,18 @@ mod tests {
 				let mut value = cell.lock();
 				if !value.0 {
 					value.0 = true;
-					return value.1;
+					return value.1
 				}
 				let new = value.1 + time::Duration::from_secs(160);
 				*value = (true, new);
 				new
-			})
+			}),
 		);
 
 		let deadline = time::Duration::from_secs(1);
-		block_on(
-			proposer.propose(Default::default(), Default::default(), deadline, None)
-		).map(|r| r.block).unwrap();
+		block_on(proposer.propose(Default::default(), Default::default(), deadline, None))
+			.map(|r| r.block)
+			.unwrap();
 	}
 
 	#[test]
@@ -619,25 +621,19 @@ mod tests {
 		let genesis_hash = client.info().best_hash;
 		let block_id = BlockId::Hash(genesis_hash);
 
-		block_on(
-			txpool.submit_at(&BlockId::number(0), SOURCE, vec![extrinsic(0)]),
-		).unwrap();
+		block_on(txpool.submit_at(&BlockId::number(0), SOURCE, vec![extrinsic(0)])).unwrap();
 
 		block_on(
 			txpool.maintain(chain_event(
-				client.header(&BlockId::Number(0u64))
+				client
+					.header(&BlockId::Number(0u64))
 					.expect("header get error")
 					.expect("there should be header"),
-			))
+			)),
 		);
 
-		let mut proposer_factory = ProposerFactory::new(
-			spawner.clone(),
-			client.clone(),
-			txpool.clone(),
-			None,
-			None,
-		);
+		let mut proposer_factory =
+			ProposerFactory::new(spawner.clone(), client.clone(), txpool.clone(), None, None);
 
 		let proposer = proposer_factory.init_with_now(
 			&client.header(&block_id).unwrap().unwrap(),
@@ -645,9 +641,9 @@ mod tests {
 		);
 
 		let deadline = time::Duration::from_secs(9);
-		let proposal = block_on(
-			proposer.propose(Default::default(), Default::default(), deadline, None),
-		).unwrap();
+		let proposal =
+			block_on(proposer.propose(Default::default(), Default::default(), deadline, None))
+				.unwrap();
 
 		assert_eq!(proposal.block.extrinsics().len(), 1);
 
@@ -655,16 +651,13 @@ mod tests {
 		api.execute_block(&block_id, proposal.block).unwrap();
 
 		let state = backend.state_at(block_id).unwrap();
-		let changes_trie_state = backend::changes_tries_state_at_block(
-			&block_id,
-			backend.changes_trie_storage(),
-		).unwrap();
+		let changes_trie_state =
+			backend::changes_tries_state_at_block(&block_id, backend.changes_trie_storage())
+				.unwrap();
 
-		let storage_changes = api.into_storage_changes(
-			&state,
-			changes_trie_state.as_ref(),
-			genesis_hash,
-		).unwrap();
+		let storage_changes = api
+			.into_storage_changes(&state, changes_trie_state.as_ref(), genesis_hash)
+			.unwrap();
 
 		assert_eq!(
 			proposal.storage_changes.transaction_storage_root,
@@ -685,8 +678,10 @@ mod tests {
 			client.clone(),
 		);
 
-		block_on(
-			txpool.submit_at(&BlockId::number(0), SOURCE, vec![
+		block_on(txpool.submit_at(
+			&BlockId::number(0),
+			SOURCE,
+			vec![
 				extrinsic(0),
 				extrinsic(1),
 				Transfer {
@@ -704,22 +699,16 @@ mod tests {
 				}.into_resources_exhausting_tx(),
 				extrinsic(5),
 				extrinsic(6),
-			])
-		).unwrap();
-
-		let mut proposer_factory = ProposerFactory::new(
-			spawner.clone(),
-			client.clone(),
-			txpool.clone(),
-			None,
-			None,
-		);
-		let mut propose_block = |
-			client: &TestClient,
-			number,
-			expected_block_extrinsics,
-			expected_pool_transactions,
-		| {
+			],
+		))
+		.unwrap();
+
+		let mut proposer_factory =
+			ProposerFactory::new(spawner.clone(), client.clone(), txpool.clone(), None, None);
+		let mut propose_block = |client: &TestClient,
+		                         number,
+		                         expected_block_extrinsics,
+		                         expected_pool_transactions| {
 			let proposer = proposer_factory.init_with_now(
 				&client.header(&BlockId::number(number)).unwrap().unwrap(),
 				Box::new(move || time::Instant::now()),
@@ -727,9 +716,10 @@ mod tests {
 
 			// when
 			let deadline = time::Duration::from_secs(9);
-			let block = block_on(
-				proposer.propose(Default::default(), Default::default(), deadline, None)
-			).map(|r| r.block).unwrap();
+			let block =
+				block_on(proposer.propose(Default::default(), Default::default(), deadline, None))
+					.map(|r| r.block)
+					.unwrap();
 
 			// then
 			// block should have some extrinsics although we have some more in the pool.
@@ -741,10 +731,11 @@ mod tests {
 
 		block_on(
 			txpool.maintain(chain_event(
-				client.header(&BlockId::Number(0u64))
+				client
+					.header(&BlockId::Number(0u64))
 					.expect("header get error")
-					.expect("there should be header")
-			))
+					.expect("there should be header"),
+			)),
 		);
 
 		// let's create one block and import it
@@ -753,10 +744,11 @@ mod tests {
 
 		block_on(
 			txpool.maintain(chain_event(
-				client.header(&BlockId::Number(1))
+				client
+					.header(&BlockId::Number(1))
 					.expect("header get error")
-					.expect("there should be header")
-			))
+					.expect("there should be header"),
+			)),
 		);
 
 		// now let's make sure that we can still make some progress
@@ -775,7 +767,8 @@ mod tests {
 			spawner.clone(),
 			client.clone(),
 		);
-		let genesis_header = client.header(&BlockId::Number(0u64))
+		let genesis_header = client
+			.header(&BlockId::Number(0u64))
 			.expect("header get error")
 			.expect("there should be header");
 
@@ -784,40 +777,43 @@ mod tests {
 			.map(|v| Extrinsic::IncludeData(vec![v as u8; 10]))
 			.collect::<Vec<_>>();
 
-		let block_limit = genesis_header.encoded_size()
-			+ extrinsics.iter().take(extrinsics_num - 1).map(Encode::encoded_size).sum::<usize>()
-			+ Vec::<Extrinsic>::new().encoded_size();
+		let block_limit = genesis_header.encoded_size() +
+			extrinsics
+				.iter()
+				.take(extrinsics_num - 1)
+				.map(Encode::encoded_size)
+				.sum::<usize>() +
+			Vec::<Extrinsic>::new().encoded_size();
 
-		block_on(
-			txpool.submit_at(&BlockId::number(0), SOURCE, extrinsics)
-		).unwrap();
+		block_on(txpool.submit_at(&BlockId::number(0), SOURCE, extrinsics)).unwrap();
 
 		block_on(txpool.maintain(chain_event(genesis_header.clone())));
 
-		let mut proposer_factory = ProposerFactory::new(
-			spawner.clone(),
-			client.clone(),
-			txpool.clone(),
-			None,
-			None,
-		);
+		let mut proposer_factory =
+			ProposerFactory::new(spawner.clone(), client.clone(), txpool.clone(), None, None);
 
 		let proposer = block_on(proposer_factory.init(&genesis_header)).unwrap();
 
 		// Give it enough time
 		let deadline = time::Duration::from_secs(300);
-		let block = block_on(
-			proposer.propose(Default::default(), Default::default(), deadline, Some(block_limit))
-		).map(|r| r.block).unwrap();
+		let block = block_on(proposer.propose(
+			Default::default(),
+			Default::default(),
+			deadline,
+			Some(block_limit),
+		))
+		.map(|r| r.block)
+		.unwrap();
 
 		// Based on the block limit, one transaction shouldn't be included.
 		assert_eq!(block.extrinsics().len(), extrinsics_num - 1);
 
 		let proposer = block_on(proposer_factory.init(&genesis_header)).unwrap();
 
-		let block = block_on(
-			proposer.propose(Default::default(), Default::default(), deadline, None,
-		)).map(|r| r.block).unwrap();
+		let block =
+			block_on(proposer.propose(Default::default(), Default::default(), deadline, None))
+				.map(|r| r.block)
+				.unwrap();
 
 		// Without a block limit we should include all of them
 		assert_eq!(block.extrinsics().len(), extrinsics_num);
@@ -833,9 +829,14 @@ mod tests {
 		let proposer = block_on(proposer_factory.init(&genesis_header)).unwrap();
 
 		// Give it enough time
-		let block = block_on(
-			proposer.propose(Default::default(), Default::default(), deadline, Some(block_limit))
-		).map(|r| r.block).unwrap();
+		let block = block_on(proposer.propose(
+			Default::default(),
+			Default::default(),
+			deadline,
+			Some(block_limit),
+		))
+		.map(|r| r.block)
+		.unwrap();
 
 		// The block limit didn't changed, but we now include the proof in the estimation of the
 		// block size and thus, one less transaction should fit into the limit.
diff --git a/client/basic-authorship/src/lib.rs b/client/basic-authorship/src/lib.rs
index 133b833cdddc..2b2fe554efdf 100644
--- a/client/basic-authorship/src/lib.rs
+++ b/client/basic-authorship/src/lib.rs
@@ -41,12 +41,12 @@
 //! # );
 //! // The first step is to create a `ProposerFactory`.
 //! let mut proposer_factory = ProposerFactory::new(
-//!		spawner,
-//!		client.clone(),
-//!		txpool.clone(),
-//!		None,
-//!		None,
-//!	);
+//! 		spawner,
+//! 		client.clone(),
+//! 		txpool.clone(),
+//! 		None,
+//! 		None,
+//! 	);
 //!
 //! // From this factory, we create a `Proposer`.
 //! let proposer = proposer_factory.init(
@@ -69,8 +69,7 @@
 //! let block = futures::executor::block_on(future).unwrap();
 //! println!("Generated block: {:?}", block.block);
 //! ```
-//!
 
 mod basic_authorship;
 
-pub use crate::basic_authorship::{ProposerFactory, Proposer, DEFAULT_BLOCK_SIZE_LIMIT};
+pub use crate::basic_authorship::{Proposer, ProposerFactory, DEFAULT_BLOCK_SIZE_LIMIT};
diff --git a/client/block-builder/src/lib.rs b/client/block-builder/src/lib.rs
index 7d391f8fb85b..e89421edfb16 100644
--- a/client/block-builder/src/lib.rs
+++ b/client/block-builder/src/lib.rs
@@ -28,14 +28,14 @@
 
 use codec::Encode;
 
-use sp_runtime::{
-	generic::BlockId,
-	traits::{Header as HeaderT, Hash, Block as BlockT, HashFor, DigestFor, NumberFor, One},
+use sp_api::{
+	ApiExt, ApiRef, Core, ProvideRuntimeApi, StorageChanges, StorageProof, TransactionOutcome,
 };
 use sp_blockchain::{ApplyExtrinsicFailed, Error};
 use sp_core::ExecutionContext;
-use sp_api::{
-	Core, ApiExt, ApiRef, ProvideRuntimeApi, StorageChanges, StorageProof, TransactionOutcome,
+use sp_runtime::{
+	generic::BlockId,
+	traits::{Block as BlockT, DigestFor, Hash, HashFor, Header as HeaderT, NumberFor, One},
 };
 
 pub use sp_block_builder::BlockBuilder as BlockBuilderApi;
@@ -94,7 +94,9 @@ pub struct BuiltBlock<Block: BlockT, StateBackend: backend::StateBackend<HashFor
 	pub proof: Option<StorageProof>,
 }
 
-impl<Block: BlockT, StateBackend: backend::StateBackend<HashFor<Block>>> BuiltBlock<Block, StateBackend> {
+impl<Block: BlockT, StateBackend: backend::StateBackend<HashFor<Block>>>
+	BuiltBlock<Block, StateBackend>
+{
 	/// Convert into the inner values.
 	pub fn into_inner(self) -> (Block, StorageChanges<StateBackend, Block>, Option<StorageProof>) {
 		(self.block, self.storage_changes, self.proof)
@@ -103,11 +105,11 @@ impl<Block: BlockT, StateBackend: backend::StateBackend<HashFor<Block>>> BuiltBl
 
 /// Block builder provider
 pub trait BlockBuilderProvider<B, Block, RA>
-	where
-		Block: BlockT,
-		B: backend::Backend<Block>,
-		Self: Sized,
-		RA: ProvideRuntimeApi<Block>,
+where
+	Block: BlockT,
+	B: backend::Backend<Block>,
+	Self: Sized,
+	RA: ProvideRuntimeApi<Block>,
 {
 	/// Create a new block, built on top of `parent`.
 	///
@@ -143,7 +145,8 @@ impl<'a, Block, A, B> BlockBuilder<'a, Block, A, B>
 where
 	Block: BlockT,
 	A: ProvideRuntimeApi<Block> + 'a,
-	A::Api: BlockBuilderApi<Block> + ApiExt<Block, StateBackend = backend::StateBackendFor<B, Block>>,
+	A::Api:
+		BlockBuilderApi<Block> + ApiExt<Block, StateBackend = backend::StateBackendFor<B, Block>>,
 	B: backend::Backend<Block>,
 {
 	/// Create a new instance of builder based on the given `parent_hash` and `parent_number`.
@@ -177,9 +180,7 @@ where
 
 		let block_id = BlockId::Hash(parent_hash);
 
-		api.initialize_block_with_context(
-			&block_id, ExecutionContext::BlockConstruction, &header,
-		)?;
+		api.initialize_block_with_context(&block_id, ExecutionContext::BlockConstruction, &header)?;
 
 		Ok(Self {
 			parent_hash,
@@ -207,12 +208,10 @@ where
 				Ok(Ok(_)) => {
 					extrinsics.push(xt);
 					TransactionOutcome::Commit(Ok(()))
-				}
-				Ok(Err(tx_validity)) => {
-					TransactionOutcome::Rollback(
-						Err(ApplyExtrinsicFailed::Validity(tx_validity).into()),
-					)
 				},
+				Ok(Err(tx_validity)) => TransactionOutcome::Rollback(Err(
+					ApplyExtrinsicFailed::Validity(tx_validity).into(),
+				)),
 				Err(e) => TransactionOutcome::Rollback(Err(Error::from(e))),
 			}
 		})
@@ -224,9 +223,9 @@ where
 	/// supplied by `self.api`, combined as [`BuiltBlock`].
 	/// The storage proof will be `Some(_)` when proof recording was enabled.
 	pub fn build(mut self) -> Result<BuiltBlock<Block, backend::StateBackendFor<B, Block>>, Error> {
-		let header = self.api.finalize_block_with_context(
-			&self.block_id, ExecutionContext::BlockConstruction
-		)?;
+		let header = self
+			.api
+			.finalize_block_with_context(&self.block_id, ExecutionContext::BlockConstruction)?;
 
 		debug_assert_eq!(
 			header.extrinsics_root().clone(),
@@ -244,11 +243,10 @@ where
 		)?;
 		let parent_hash = self.parent_hash;
 
-		let storage_changes = self.api.into_storage_changes(
-			&state,
-			changes_trie_state.as_ref(),
-			parent_hash,
-		).map_err(|e| sp_blockchain::Error::StorageChanges(e))?;
+		let storage_changes = self
+			.api
+			.into_storage_changes(&state, changes_trie_state.as_ref(), parent_hash)
+			.map_err(|e| sp_blockchain::Error::StorageChanges(e))?;
 
 		Ok(BuiltBlock {
 			block: <Block as BlockT>::new(header, self.extrinsics),
@@ -265,15 +263,17 @@ where
 		inherent_data: sp_inherents::InherentData,
 	) -> Result<Vec<Block::Extrinsic>, Error> {
 		let block_id = self.block_id;
-		self.api.execute_in_transaction(move |api| {
-			// `create_inherents` should not change any state, to ensure this we always rollback
-			// the transaction.
-			TransactionOutcome::Rollback(api.inherent_extrinsics_with_context(
-				&block_id,
-				ExecutionContext::BlockConstruction,
-				inherent_data
-			))
-		}).map_err(|e| Error::Application(Box::new(e)))
+		self.api
+			.execute_in_transaction(move |api| {
+				// `create_inherents` should not change any state, to ensure this we always rollback
+				// the transaction.
+				TransactionOutcome::Rollback(api.inherent_extrinsics_with_context(
+					&block_id,
+					ExecutionContext::BlockConstruction,
+					inherent_data,
+				))
+			})
+			.map_err(|e| Error::Application(Box::new(e)))
 	}
 
 	/// Estimate the size of the block in the current state.
@@ -312,19 +312,22 @@ mod tests {
 			RecordProof::Yes,
 			Default::default(),
 			&*backend,
-		).unwrap().build().unwrap();
+		)
+		.unwrap()
+		.build()
+		.unwrap();
 
 		let proof = block.proof.expect("Proof is build on request");
 
 		let backend = sp_state_machine::create_proof_check_backend::<Blake2Hasher>(
 			block.storage_changes.transaction_storage_root,
 			proof,
-		).unwrap();
+		)
+		.unwrap();
 
-		assert!(
-			backend.storage(&sp_core::storage::well_known_keys::CODE)
-				.unwrap_err()
-				.contains("Database missing expected key"),
-		);
+		assert!(backend
+			.storage(&sp_core::storage::well_known_keys::CODE)
+			.unwrap_err()
+			.contains("Database missing expected key"),);
 	}
 }
diff --git a/client/chain-spec/derive/src/impls.rs b/client/chain-spec/derive/src/impls.rs
index 39984d4df104..73634dcca42e 100644
--- a/client/chain-spec/derive/src/impls.rs
+++ b/client/chain-spec/derive/src/impls.rs
@@ -17,9 +17,9 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use proc_macro2::{Span, TokenStream};
-use quote::quote;
-use syn::{DeriveInput, Ident, Error};
 use proc_macro_crate::{crate_name, FoundCrate};
+use quote::quote;
+use syn::{DeriveInput, Error, Ident};
 
 const CRATE_NAME: &str = "sc-chain-spec";
 const ATTRIBUTE_NAME: &str = "forks";
@@ -31,14 +31,18 @@ const ATTRIBUTE_NAME: &str = "forks";
 pub fn extension_derive(ast: &DeriveInput) -> proc_macro::TokenStream {
 	derive(ast, |crate_name, name, generics: &syn::Generics, field_names, field_types, fields| {
 		let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
-		let forks = fields.named.iter().find_map(|f| {
-			if f.attrs.iter().any(|attr| attr.path.is_ident(ATTRIBUTE_NAME)) {
-				let typ = &f.ty;
-				Some(quote! { #typ })
-			} else {
-				None
-			}
-		}).unwrap_or_else(|| quote! { #crate_name::NoExtension });
+		let forks = fields
+			.named
+			.iter()
+			.find_map(|f| {
+				if f.attrs.iter().any(|attr| attr.path.is_ident(ATTRIBUTE_NAME)) {
+					let typ = &f.ty;
+					Some(quote! { #typ })
+				} else {
+					None
+				}
+			})
+			.unwrap_or_else(|| quote! { #crate_name::NoExtension });
 
 		quote! {
 			impl #impl_generics #crate_name::Extension for #name #ty_generics #where_clause {
@@ -80,13 +84,12 @@ pub fn group_derive(ast: &DeriveInput) -> proc_macro::TokenStream {
 			Ok(FoundCrate::Itself) => Ident::new("serde", Span::call_site()),
 			Ok(FoundCrate::Name(name)) => Ident::new(&name, Span::call_site()),
 			Err(e) => {
-				let err = Error::new(
-					Span::call_site(),
-					&format!("Could not find `serde` crate: {}", e),
-				).to_compile_error();
+				let err =
+					Error::new(Span::call_site(), &format!("Could not find `serde` crate: {}", e))
+						.to_compile_error();
 
-				return quote!( #err ).into();
-			}
+				return quote!( #err ).into()
+			},
 		};
 
 		quote! {
@@ -131,14 +134,20 @@ pub fn group_derive(ast: &DeriveInput) -> proc_macro::TokenStream {
 pub fn derive(
 	ast: &DeriveInput,
 	derive: impl Fn(
-		&Ident, &Ident, &syn::Generics, Vec<&Ident>, Vec<&syn::Type>, &syn::FieldsNamed,
+		&Ident,
+		&Ident,
+		&syn::Generics,
+		Vec<&Ident>,
+		Vec<&syn::Type>,
+		&syn::FieldsNamed,
 	) -> TokenStream,
 ) -> proc_macro::TokenStream {
 	let err = || {
 		let err = Error::new(
 			Span::call_site(),
-			"ChainSpecGroup is only available for structs with named fields."
-		).to_compile_error();
+			"ChainSpecGroup is only available for structs with named fields.",
+		)
+		.to_compile_error();
 		quote!( #err ).into()
 	};
 
@@ -168,47 +177,35 @@ pub fn derive(
 	derive(&crate_name, name, &ast.generics, field_names, field_types, fields).into()
 }
 
-fn generate_fork_fields(
-	crate_name: &Ident,
-	names: &[&Ident],
-	types: &[&syn::Type],
-) -> TokenStream {
+fn generate_fork_fields(crate_name: &Ident, names: &[&Ident], types: &[&syn::Type]) -> TokenStream {
 	let crate_name = std::iter::repeat(crate_name);
 	quote! {
 		#( pub #names: Option<<#types as #crate_name::Group>::Fork>, )*
 	}
 }
 
-fn generate_base_to_fork(
-	fork_name: &Ident,
-	names: &[&Ident],
-) -> TokenStream {
+fn generate_base_to_fork(fork_name: &Ident, names: &[&Ident]) -> TokenStream {
 	let names2 = names.to_vec();
 
-	quote!{
+	quote! {
 		#fork_name {
 			#( #names: Some(self.#names2.to_fork()), )*
 		}
 	}
 }
 
-fn generate_combine_with(
-	names: &[&Ident],
-) -> TokenStream {
+fn generate_combine_with(names: &[&Ident]) -> TokenStream {
 	let names2 = names.to_vec();
 
-	quote!{
+	quote! {
 		#( self.#names.combine_with(other.#names2); )*
 	}
 }
 
-fn generate_fork_to_base(
-	fork: &Ident,
-	names: &[&Ident],
-) -> TokenStream {
+fn generate_fork_to_base(fork: &Ident, names: &[&Ident]) -> TokenStream {
 	let names2 = names.to_vec();
 
-	quote!{
+	quote! {
 		Some(#fork {
 			#( #names: self.#names2?.to_base()?, )*
 		})
diff --git a/client/chain-spec/src/chain_spec.rs b/client/chain-spec/src/chain_spec.rs
index 59b55707e182..681ab8ea640a 100644
--- a/client/chain-spec/src/chain_spec.rs
+++ b/client/chain-spec/src/chain_spec.rs
@@ -19,15 +19,20 @@
 //! Substrate chain configurations.
 #![warn(missing_docs)]
 
-use std::{borrow::Cow, fs::File, path::PathBuf, sync::Arc, collections::HashMap};
-use serde::{Serialize, Deserialize};
-use sp_core::{storage::{StorageKey, StorageData, ChildInfo, Storage, StorageChild}, Bytes};
-use sp_runtime::BuildStorage;
-use serde_json as json;
-use crate::{RuntimeGenesis, ChainType, extension::GetExtension, Properties};
+use crate::{extension::GetExtension, ChainType, Properties, RuntimeGenesis};
 use sc_network::config::MultiaddrWithPeerId;
 use sc_telemetry::TelemetryEndpoints;
-use sp_runtime::traits::{Block as BlockT, NumberFor};
+use serde::{Deserialize, Serialize};
+use serde_json as json;
+use sp_core::{
+	storage::{ChildInfo, Storage, StorageChild, StorageData, StorageKey},
+	Bytes,
+};
+use sp_runtime::{
+	traits::{Block as BlockT, NumberFor},
+	BuildStorage,
+};
+use std::{borrow::Cow, collections::HashMap, fs::File, path::PathBuf, sync::Arc};
 
 enum GenesisSource<G> {
 	File(PathBuf),
@@ -56,8 +61,8 @@ impl<G: RuntimeGenesis> GenesisSource<G> {
 
 		match self {
 			Self::File(path) => {
-				let file = File::open(path)
-					.map_err(|e| format!("Error opening spec file: {}", e))?;
+				let file =
+					File::open(path).map_err(|e| format!("Error opening spec file: {}", e))?;
 				let genesis: GenesisContainer<G> = json::from_reader(file)
 					.map_err(|e| format!("Error parsing spec file: {}", e))?;
 				Ok(genesis.genesis)
@@ -69,22 +74,25 @@ impl<G: RuntimeGenesis> GenesisSource<G> {
 			},
 			Self::Factory(f) => Ok(Genesis::Runtime(f())),
 			Self::Storage(storage) => {
-				let top = storage.top
+				let top = storage
+					.top
 					.iter()
 					.map(|(k, v)| (StorageKey(k.clone()), StorageData(v.clone())))
 					.collect();
 
-				let children_default = storage.children_default
+				let children_default = storage
+					.children_default
 					.iter()
-					.map(|(k, child)|
-						 (
-							 StorageKey(k.clone()),
-							 child.data
+					.map(|(k, child)| {
+						(
+							StorageKey(k.clone()),
+							child
+								.data
 								.iter()
 								.map(|(k, v)| (StorageKey(k.clone()), StorageData(v.clone())))
-								.collect()
-						 )
-					)
+								.collect(),
+						)
+					})
 					.collect();
 
 				Ok(Genesis::Raw(RawGenesis { top, children_default }))
@@ -99,24 +107,24 @@ impl<G: RuntimeGenesis, E> BuildStorage for ChainSpec<G, E> {
 			Genesis::Runtime(gc) => gc.build_storage(),
 			Genesis::Raw(RawGenesis { top: map, children_default: children_map }) => Ok(Storage {
 				top: map.into_iter().map(|(k, v)| (k.0, v.0)).collect(),
-				children_default: children_map.into_iter().map(|(storage_key, child_content)| {
-					let child_info = ChildInfo::new_default(storage_key.0.as_slice());
-					(
-						storage_key.0,
-						StorageChild {
-							data: child_content.into_iter().map(|(k, v)| (k.0, v.0)).collect(),
-							child_info,
-						},
-					)
-				}).collect(),
+				children_default: children_map
+					.into_iter()
+					.map(|(storage_key, child_content)| {
+						let child_info = ChildInfo::new_default(storage_key.0.as_slice());
+						(
+							storage_key.0,
+							StorageChild {
+								data: child_content.into_iter().map(|(k, v)| (k.0, v.0)).collect(),
+								child_info,
+							},
+						)
+					})
+					.collect(),
 			}),
 		}
 	}
 
-	fn assimilate_storage(
-		&self,
-		_: &mut Storage,
-	) -> Result<(), String> {
+	fn assimilate_storage(&self, _: &mut Storage) -> Result<(), String> {
 		Err("`assimilate_storage` not implemented for `ChainSpec`.".into())
 	}
 }
@@ -181,10 +189,7 @@ pub struct ChainSpec<G, E = NoExtension> {
 
 impl<G, E: Clone> Clone for ChainSpec<G, E> {
 	fn clone(&self) -> Self {
-		ChainSpec {
-			client_spec: self.client_spec.clone(),
-			genesis: self.genesis.clone(),
-		}
+		ChainSpec { client_spec: self.client_spec.clone(), genesis: self.genesis.clone() }
 	}
 }
 
@@ -258,10 +263,7 @@ impl<G, E> ChainSpec<G, E> {
 			code_substitutes: HashMap::new(),
 		};
 
-		ChainSpec {
-			client_spec,
-			genesis: GenesisSource::Factory(Arc::new(constructor)),
-		}
+		ChainSpec { client_spec, genesis: GenesisSource::Factory(Arc::new(constructor)) }
 	}
 
 	/// Type of the chain.
@@ -281,22 +283,15 @@ impl<G, E: serde::de::DeserializeOwned> ChainSpec<G, E> {
 		let json = json.into();
 		let client_spec = json::from_slice(json.as_ref())
 			.map_err(|e| format!("Error parsing spec file: {}", e))?;
-		Ok(ChainSpec {
-			client_spec,
-			genesis: GenesisSource::Binary(json),
-		})
+		Ok(ChainSpec { client_spec, genesis: GenesisSource::Binary(json) })
 	}
 
 	/// Parse json file into a `ChainSpec`
 	pub fn from_json_file(path: PathBuf) -> Result<Self, String> {
-		let file = File::open(&path)
-			.map_err(|e| format!("Error opening spec file: {}", e))?;
-		let client_spec = json::from_reader(file)
-			.map_err(|e| format!("Error parsing spec file: {}", e))?;
-		Ok(ChainSpec {
-			client_spec,
-			genesis: GenesisSource::File(path),
-		})
+		let file = File::open(&path).map_err(|e| format!("Error opening spec file: {}", e))?;
+		let client_spec =
+			json::from_reader(file).map_err(|e| format!("Error parsing spec file: {}", e))?;
+		Ok(ChainSpec { client_spec, genesis: GenesisSource::File(path) })
 	}
 }
 
@@ -312,33 +307,34 @@ impl<G: RuntimeGenesis, E: serde::Serialize + Clone + 'static> ChainSpec<G, E> {
 		let genesis = match (raw, self.genesis.resolve()?) {
 			(true, Genesis::Runtime(g)) => {
 				let storage = g.build_storage()?;
-				let top = storage.top.into_iter()
-					.map(|(k, v)| (StorageKey(k), StorageData(v)))
-					.collect();
-				let children_default = storage.children_default.into_iter()
-					.map(|(sk, child)| (
-						StorageKey(sk),
-						child.data.into_iter()
-							.map(|(k, v)| (StorageKey(k), StorageData(v)))
-							.collect(),
-					))
+				let top =
+					storage.top.into_iter().map(|(k, v)| (StorageKey(k), StorageData(v))).collect();
+				let children_default = storage
+					.children_default
+					.into_iter()
+					.map(|(sk, child)| {
+						(
+							StorageKey(sk),
+							child
+								.data
+								.into_iter()
+								.map(|(k, v)| (StorageKey(k), StorageData(v)))
+								.collect(),
+						)
+					})
 					.collect();
 
 				Genesis::Raw(RawGenesis { top, children_default })
 			},
 			(_, genesis) => genesis,
 		};
-		Ok(JsonContainer {
-			client_spec: self.client_spec.clone(),
-			genesis,
-		})
+		Ok(JsonContainer { client_spec: self.client_spec.clone(), genesis })
 	}
 
 	/// Dump to json string.
 	pub fn as_json(&self, raw: bool) -> Result<String, String> {
 		let container = self.json_container(raw)?;
-		json::to_string_pretty(&container)
-			.map_err(|e| format!("Error generating spec json: {}", e))
+		json::to_string_pretty(&container).map_err(|e| format!("Error generating spec json: {}", e))
 	}
 }
 
@@ -404,7 +400,11 @@ where
 	}
 
 	fn code_substitutes(&self) -> std::collections::HashMap<String, Vec<u8>> {
-		self.client_spec.code_substitutes.iter().map(|(h, c)| (h.clone(), c.0.clone())).collect()
+		self.client_spec
+			.code_substitutes
+			.iter()
+			.map(|(h, c)| (h.clone(), c.0.clone()))
+			.collect()
 	}
 }
 
@@ -417,7 +417,8 @@ pub struct LightSyncState<Block: BlockT> {
 	/// The babe weight of the finalized block.
 	pub babe_finalized_block_weight: sp_consensus_babe::BabeBlockWeight,
 	/// The authority set for grandpa.
-	pub grandpa_authority_set: sc_finality_grandpa::AuthoritySet<<Block as BlockT>::Hash, NumberFor<Block>>,
+	pub grandpa_authority_set:
+		sc_finality_grandpa::AuthoritySet<<Block as BlockT>::Hash, NumberFor<Block>>,
 }
 
 impl<Block: BlockT> LightSyncState<Block> {
@@ -427,25 +428,25 @@ impl<Block: BlockT> LightSyncState<Block> {
 
 		SerializableLightSyncState {
 			finalized_block_header: StorageData(self.finalized_block_header.encode()),
-			babe_epoch_changes:
-				StorageData(self.babe_epoch_changes.encode()),
-			babe_finalized_block_weight:
-				self.babe_finalized_block_weight,
-			grandpa_authority_set:
-				StorageData(self.grandpa_authority_set.encode()),
+			babe_epoch_changes: StorageData(self.babe_epoch_changes.encode()),
+			babe_finalized_block_weight: self.babe_finalized_block_weight,
+			grandpa_authority_set: StorageData(self.grandpa_authority_set.encode()),
 		}
 	}
 
 	/// Convert from a `SerializableLightSyncState`.
-	pub fn from_serializable(serialized: &SerializableLightSyncState) -> Result<Self, codec::Error> {
+	pub fn from_serializable(
+		serialized: &SerializableLightSyncState,
+	) -> Result<Self, codec::Error> {
 		Ok(Self {
-			finalized_block_header: codec::Decode::decode(&mut &serialized.finalized_block_header.0[..])?,
-			babe_epoch_changes:
-				codec::Decode::decode(&mut &serialized.babe_epoch_changes.0[..])?,
-			babe_finalized_block_weight:
-				serialized.babe_finalized_block_weight,
-			grandpa_authority_set:
-				codec::Decode::decode(&mut &serialized.grandpa_authority_set.0[..])?,
+			finalized_block_header: codec::Decode::decode(
+				&mut &serialized.finalized_block_header.0[..],
+			)?,
+			babe_epoch_changes: codec::Decode::decode(&mut &serialized.babe_epoch_changes.0[..])?,
+			babe_finalized_block_weight: serialized.babe_finalized_block_weight,
+			grandpa_authority_set: codec::Decode::decode(
+				&mut &serialized.grandpa_authority_set.0[..],
+			)?,
 		})
 	}
 }
@@ -469,12 +470,9 @@ mod tests {
 	struct Genesis(HashMap<String, String>);
 
 	impl BuildStorage for Genesis {
-		fn assimilate_storage(
-			&self,
-			storage: &mut Storage,
-		) -> Result<(), String> {
+		fn assimilate_storage(&self, storage: &mut Storage) -> Result<(), String> {
 			storage.top.extend(
-				self.0.iter().map(|(a, b)| (a.clone().into_bytes(), b.clone().into_bytes()))
+				self.0.iter().map(|(a, b)| (a.clone().into_bytes(), b.clone().into_bytes())),
 			);
 			Ok(())
 		}
@@ -485,11 +483,10 @@ mod tests {
 	#[test]
 	fn should_deserialize_example_chain_spec() {
 		let spec1 = TestSpec::from_json_bytes(Cow::Owned(
-			include_bytes!("../res/chain_spec.json").to_vec()
-		)).unwrap();
-		let spec2 = TestSpec::from_json_file(
-			PathBuf::from("./res/chain_spec.json")
-		).unwrap();
+			include_bytes!("../res/chain_spec.json").to_vec(),
+		))
+		.unwrap();
+		let spec2 = TestSpec::from_json_file(PathBuf::from("./res/chain_spec.json")).unwrap();
 
 		assert_eq!(spec1.as_json(false), spec2.as_json(false));
 		assert_eq!(spec2.chain_type(), ChainType::Live)
@@ -506,8 +503,9 @@ mod tests {
 	#[test]
 	fn should_deserialize_chain_spec_with_extensions() {
 		let spec = TestSpec2::from_json_bytes(Cow::Owned(
-			include_bytes!("../res/chain_spec2.json").to_vec()
-		)).unwrap();
+			include_bytes!("../res/chain_spec2.json").to_vec(),
+		))
+		.unwrap();
 
 		assert_eq!(spec.extensions().my_property, "Test Extension");
 	}
diff --git a/client/chain-spec/src/extension.rs b/client/chain-spec/src/extension.rs
index 2a6126e4ce2c..665f51303b6a 100644
--- a/client/chain-spec/src/extension.rs
+++ b/client/chain-spec/src/extension.rs
@@ -18,19 +18,21 @@
 
 //! Chain Spec extensions helpers.
 
-use std::fmt::Debug;
-use std::any::{TypeId, Any};
+use std::{
+	any::{Any, TypeId},
+	fmt::Debug,
+};
 
 use std::collections::BTreeMap;
 
-use serde::{Serialize, Deserialize, de::DeserializeOwned};
+use serde::{de::DeserializeOwned, Deserialize, Serialize};
 
 /// A `ChainSpec` extension.
 ///
 /// This trait is implemented automatically by `ChainSpecGroup` macro.
 pub trait Group: Clone + Sized {
 	/// An associated type containing fork definition.
-	type Fork: Fork<Base=Self>;
+	type Fork: Fork<Base = Self>;
 
 	/// Convert to fork type.
 	fn to_fork(self) -> Self::Fork;
@@ -45,7 +47,7 @@ pub trait Group: Clone + Sized {
 /// a complete set of parameters
 pub trait Fork: Serialize + DeserializeOwned + Clone + Sized {
 	/// A base `Group` type.
-	type Base: Group<Fork=Self>;
+	type Base: Group<Fork = Self>;
 
 	/// Combine with another struct.
 	///
@@ -128,7 +130,8 @@ pub trait Extension: Serialize + DeserializeOwned + Clone {
 	fn get_any(&self, t: TypeId) -> &dyn Any;
 
 	/// Get forkable extensions of specific type.
-	fn forks<BlockNumber, T>(&self) -> Option<Forks<BlockNumber, T>> where
+	fn forks<BlockNumber, T>(&self) -> Option<Forks<BlockNumber, T>>
+	where
 		BlockNumber: Ord + Clone + 'static,
 		T: Group + 'static,
 		<Self::Forks as IsForks>::Extension: Extension,
@@ -142,8 +145,12 @@ pub trait Extension: Serialize + DeserializeOwned + Clone {
 impl Extension for crate::NoExtension {
 	type Forks = Self;
 
-	fn get<T: 'static>(&self) -> Option<&T> { None }
-	fn get_any(&self, _t: TypeId) -> &dyn Any { self }
+	fn get<T: 'static>(&self) -> Option<&T> {
+		None
+	}
+	fn get_any(&self, _t: TypeId) -> &dyn Any {
+		self
+	}
 }
 
 pub trait IsForks {
@@ -166,14 +173,12 @@ pub struct Forks<BlockNumber: Ord, T: Group> {
 
 impl<B: Ord, T: Group + Default> Default for Forks<B, T> {
 	fn default() -> Self {
-		Self {
-			base: Default::default(),
-			forks: Default::default(),
-		}
+		Self { base: Default::default(), forks: Default::default() }
 	}
 }
 
-impl<B: Ord, T: Group> Forks<B, T> where
+impl<B: Ord, T: Group> Forks<B, T>
+where
 	T::Fork: Debug,
 {
 	/// Create new fork definition given the base and the forks.
@@ -195,7 +200,8 @@ impl<B: Ord, T: Group> Forks<B, T> where
 	}
 }
 
-impl<B, T> IsForks for Forks<B, T> where
+impl<B, T> IsForks for Forks<B, T>
+where
 	B: Ord + 'static,
 	T: Group + 'static,
 {
@@ -203,29 +209,31 @@ impl<B, T> IsForks for Forks<B, T> where
 	type Extension = T;
 }
 
-impl<B: Ord + Clone, T: Group + Extension> Forks<B, T> where
+impl<B: Ord + Clone, T: Group + Extension> Forks<B, T>
+where
 	T::Fork: Extension,
 {
 	/// Get forks definition for a subset of this extension.
 	///
 	/// Returns the `Forks` struct, but limited to a particular type
 	/// within the extension.
-	pub fn for_type<X>(&self) -> Option<Forks<B, X>> where
+	pub fn for_type<X>(&self) -> Option<Forks<B, X>>
+	where
 		X: Group + 'static,
 	{
 		let base = self.base.get::<X>()?.clone();
-		let forks = self.forks.iter().filter_map(|(k, v)| {
-			Some((k.clone(), v.get::<Option<X::Fork>>()?.clone()?))
-		}).collect();
-
-		Some(Forks {
-			base,
-			forks,
-		})
+		let forks = self
+			.forks
+			.iter()
+			.filter_map(|(k, v)| Some((k.clone(), v.get::<Option<X::Fork>>()?.clone()?)))
+			.collect();
+
+		Some(Forks { base, forks })
 	}
 }
 
-impl<B, E> Extension for Forks<B, E> where
+impl<B, E> Extension for Forks<B, E>
+where
 	B: Serialize + DeserializeOwned + Ord + Clone + 'static,
 	E: Extension + Group + 'static,
 {
@@ -245,7 +253,8 @@ impl<B, E> Extension for Forks<B, E> where
 		}
 	}
 
-	fn forks<BlockNumber, T>(&self) -> Option<Forks<BlockNumber, T>> where
+	fn forks<BlockNumber, T>(&self) -> Option<Forks<BlockNumber, T>>
+	where
 		BlockNumber: Ord + Clone + 'static,
 		T: Group + 'static,
 		<Self::Forks as IsForks>::Extension: Extension,
@@ -266,7 +275,7 @@ pub trait GetExtension {
 	fn get_any(&self, t: TypeId) -> &dyn Any;
 }
 
-impl <E: Extension> GetExtension for E {
+impl<E: Extension> GetExtension for E {
 	fn get_any(&self, t: TypeId) -> &dyn Any {
 		Extension::get_any(self, t)
 	}
@@ -281,7 +290,7 @@ pub fn get_extension<T: 'static>(e: &dyn GetExtension) -> Option<&T> {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use sc_chain_spec_derive::{ChainSpecGroup, ChainSpecExtension};
+	use sc_chain_spec_derive::{ChainSpecExtension, ChainSpecGroup};
 	// Make the proc macro work for tests and doc tests.
 	use crate as sc_chain_spec;
 
@@ -297,7 +306,9 @@ mod tests {
 		pub test: u8,
 	}
 
-	#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, ChainSpecGroup, ChainSpecExtension)]
+	#[derive(
+		Debug, Clone, PartialEq, Serialize, Deserialize, ChainSpecGroup, ChainSpecExtension,
+	)]
 	#[serde(deny_unknown_fields)]
 	pub struct Extensions {
 		pub ext1: Extension1,
@@ -315,11 +326,12 @@ mod tests {
 
 	#[test]
 	fn forks_should_work_correctly() {
-		use super::Extension as _ ;
+		use super::Extension as _;
 
 		// We first need to deserialize into a `Value` because of the following bug:
 		// https://github.com/serde-rs/json/issues/505
-		let ext_val: serde_json::Value = serde_json::from_str(r#"
+		let ext_val: serde_json::Value = serde_json::from_str(
+			r#"
 {
 	"test": 11,
 	"forkable": {
@@ -342,40 +354,40 @@ mod tests {
 		}
 	}
 }
-		"#).unwrap();
+		"#,
+		)
+		.unwrap();
 
 		let ext: Ext2 = serde_json::from_value(ext_val).unwrap();
 
-		assert_eq!(ext.get::<Extension1>(), Some(&Extension1 {
-			test: 11
-		}));
+		assert_eq!(ext.get::<Extension1>(), Some(&Extension1 { test: 11 }));
 
 		// get forks definition
 		let forks = ext.get::<Forks<u64, Extensions>>().unwrap();
-		assert_eq!(forks.at_block(0), Extensions {
-			ext1: Extension1 { test: 15 },
-			ext2: Extension2 { test: 123 },
-		});
-		assert_eq!(forks.at_block(1), Extensions {
-			ext1: Extension1 { test: 5 },
-			ext2: Extension2 { test: 123 },
-		});
-		assert_eq!(forks.at_block(2), Extensions {
-			ext1: Extension1 { test: 5 },
-			ext2: Extension2 { test: 5 },
-		});
-		assert_eq!(forks.at_block(4), Extensions {
-			ext1: Extension1 { test: 5 },
-			ext2: Extension2 { test: 5 },
-		});
-		assert_eq!(forks.at_block(5), Extensions {
-			ext1: Extension1 { test: 5 },
-			ext2: Extension2 { test: 1 },
-		});
-		assert_eq!(forks.at_block(10), Extensions {
-			ext1: Extension1 { test: 5 },
-			ext2: Extension2 { test: 1 },
-		});
+		assert_eq!(
+			forks.at_block(0),
+			Extensions { ext1: Extension1 { test: 15 }, ext2: Extension2 { test: 123 } }
+		);
+		assert_eq!(
+			forks.at_block(1),
+			Extensions { ext1: Extension1 { test: 5 }, ext2: Extension2 { test: 123 } }
+		);
+		assert_eq!(
+			forks.at_block(2),
+			Extensions { ext1: Extension1 { test: 5 }, ext2: Extension2 { test: 5 } }
+		);
+		assert_eq!(
+			forks.at_block(4),
+			Extensions { ext1: Extension1 { test: 5 }, ext2: Extension2 { test: 5 } }
+		);
+		assert_eq!(
+			forks.at_block(5),
+			Extensions { ext1: Extension1 { test: 5 }, ext2: Extension2 { test: 1 } }
+		);
+		assert_eq!(
+			forks.at_block(10),
+			Extensions { ext1: Extension1 { test: 5 }, ext2: Extension2 { test: 1 } }
+		);
 		assert!(forks.at_block(10).get::<Extension2>().is_some());
 
 		// filter forks for `Extension2`
diff --git a/client/chain-spec/src/lib.rs b/client/chain-spec/src/lib.rs
index 1bfa1808ee55..ac580802a5d5 100644
--- a/client/chain-spec/src/lib.rs
+++ b/client/chain-spec/src/lib.rs
@@ -35,7 +35,7 @@
 //!
 //! #[derive(Clone, Debug, serde::Serialize, serde::Deserialize, ChainSpecExtension)]
 //! pub struct MyExtension {
-//!		pub known_blocks: HashMap<u64, String>,
+//! 		pub known_blocks: HashMap<u64, String>,
 //! }
 //!
 //! pub type MyChainSpec<G> = GenericChainSpec<G, MyExtension>;
@@ -53,19 +53,19 @@
 //!
 //! #[derive(Clone, Debug, serde::Serialize, serde::Deserialize, ChainSpecGroup)]
 //! pub struct ClientParams {
-//!		max_block_size: usize,
-//!		max_extrinsic_size: usize,
+//! 		max_block_size: usize,
+//! 		max_extrinsic_size: usize,
 //! }
 //!
 //! #[derive(Clone, Debug, serde::Serialize, serde::Deserialize, ChainSpecGroup)]
 //! pub struct PoolParams {
-//!		max_transaction_size: usize,
+//! 		max_transaction_size: usize,
 //! }
 //!
 //! #[derive(Clone, Debug, serde::Serialize, serde::Deserialize, ChainSpecGroup, ChainSpecExtension)]
 //! pub struct Extension {
-//!		pub client: ClientParams,
-//!		pub pool: PoolParams,
+//! 		pub client: ClientParams,
+//! 		pub pool: PoolParams,
 //! }
 //!
 //! pub type BlockNumber = u64;
@@ -88,20 +88,20 @@
 //!
 //! #[derive(Clone, Debug, Serialize, Deserialize, ChainSpecGroup)]
 //! pub struct ClientParams {
-//!		max_block_size: usize,
-//!		max_extrinsic_size: usize,
+//! 		max_block_size: usize,
+//! 		max_extrinsic_size: usize,
 //! }
 //!
 //! #[derive(Clone, Debug, Serialize, Deserialize, ChainSpecGroup)]
 //! pub struct PoolParams {
-//!		max_transaction_size: usize,
+//! 		max_transaction_size: usize,
 //! }
 //!
 //! #[derive(Clone, Debug, Serialize, Deserialize, ChainSpecExtension)]
 //! pub struct Extension {
-//!		pub client: ClientParams,
-//!		#[forks]
-//!		pub pool: Forks<u64, PoolParams>,
+//! 		pub client: ClientParams,
+//! 		#[forks]
+//! 		pub pool: Forks<u64, PoolParams>,
 //! }
 //!
 //! pub type MyChainSpec<G> = GenericChainSpec<G, Extension>;
@@ -111,16 +111,16 @@ mod chain_spec;
 mod extension;
 
 pub use chain_spec::{
-	ChainSpec as GenericChainSpec, NoExtension, LightSyncState, SerializableLightSyncState,
+	ChainSpec as GenericChainSpec, LightSyncState, NoExtension, SerializableLightSyncState,
 };
-pub use extension::{Group, Fork, Forks, Extension, GetExtension, get_extension};
+pub use extension::{get_extension, Extension, Fork, Forks, GetExtension, Group};
 pub use sc_chain_spec_derive::{ChainSpecExtension, ChainSpecGroup};
 
-use serde::{Serialize, de::DeserializeOwned};
-use sp_runtime::BuildStorage;
 use sc_network::config::MultiaddrWithPeerId;
 use sc_telemetry::TelemetryEndpoints;
+use serde::{de::DeserializeOwned, Serialize};
 use sp_core::storage::Storage;
+use sp_runtime::BuildStorage;
 
 /// The type of a chain.
 ///
diff --git a/client/cli/src/arg_enums.rs b/client/cli/src/arg_enums.rs
index d9a421037629..83b1c57e071a 100644
--- a/client/cli/src/arg_enums.rs
+++ b/client/cli/src/arg_enums.rs
@@ -74,9 +74,8 @@ impl WasmExecutionMethod {
 impl Into<sc_service::config::WasmExecutionMethod> for WasmExecutionMethod {
 	fn into(self) -> sc_service::config::WasmExecutionMethod {
 		match self {
-			WasmExecutionMethod::Interpreted => {
-				sc_service::config::WasmExecutionMethod::Interpreted
-			}
+			WasmExecutionMethod::Interpreted =>
+				sc_service::config::WasmExecutionMethod::Interpreted,
 			#[cfg(feature = "wasmtime")]
 			WasmExecutionMethod::Compiled => sc_service::config::WasmExecutionMethod::Compiled,
 			#[cfg(not(feature = "wasmtime"))]
@@ -250,14 +249,10 @@ impl Into<sc_network::config::SyncMode> for SyncMode {
 	fn into(self) -> sc_network::config::SyncMode {
 		match self {
 			SyncMode::Full => sc_network::config::SyncMode::Full,
-			SyncMode::Fast => sc_network::config::SyncMode::Fast {
-				skip_proofs: false,
-				storage_chain_mode: false,
-			},
-			SyncMode::FastUnsafe => sc_network::config::SyncMode::Fast {
-				skip_proofs: true,
-				storage_chain_mode: false,
-			},
+			SyncMode::Fast =>
+				sc_network::config::SyncMode::Fast { skip_proofs: false, storage_chain_mode: false },
+			SyncMode::FastUnsafe =>
+				sc_network::config::SyncMode::Fast { skip_proofs: true, storage_chain_mode: false },
 		}
 	}
 }
diff --git a/client/cli/src/commands/build_spec_cmd.rs b/client/cli/src/commands/build_spec_cmd.rs
index 78ad3b64724d..75fdf07643ee 100644
--- a/client/cli/src/commands/build_spec_cmd.rs
+++ b/client/cli/src/commands/build_spec_cmd.rs
@@ -16,15 +16,19 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::error;
-use crate::params::NodeKeyParams;
-use crate::params::SharedParams;
-use crate::CliConfiguration;
+use crate::{
+	error,
+	params::{NodeKeyParams, SharedParams},
+	CliConfiguration,
+};
 use log::info;
 use sc_network::config::build_multiaddr;
-use sc_service::{config::{MultiaddrWithPeerId, NetworkConfiguration}, ChainSpec};
-use structopt::StructOpt;
+use sc_service::{
+	config::{MultiaddrWithPeerId, NetworkConfiguration},
+	ChainSpec,
+};
 use std::io::Write;
+use structopt::StructOpt;
 
 /// The `build-spec` command used to build a specification.
 #[derive(Debug, StructOpt, Clone)]
diff --git a/client/cli/src/commands/check_block_cmd.rs b/client/cli/src/commands/check_block_cmd.rs
index a47245de0f78..07a76319dca3 100644
--- a/client/cli/src/commands/check_block_cmd.rs
+++ b/client/cli/src/commands/check_block_cmd.rs
@@ -17,7 +17,9 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{
-	CliConfiguration, error, params::{ImportParams, SharedParams, BlockNumberOrHash},
+	error,
+	params::{BlockNumberOrHash, ImportParams, SharedParams},
+	CliConfiguration,
 };
 use sc_client_api::{BlockBackend, UsageProvider};
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT};
@@ -48,11 +50,7 @@ pub struct CheckBlockCmd {
 
 impl CheckBlockCmd {
 	/// Run the check-block command
-	pub async fn run<B, C, IQ>(
-		&self,
-		client: Arc<C>,
-		import_queue: IQ,
-	) -> error::Result<()>
+	pub async fn run<B, C, IQ>(&self, client: Arc<C>, import_queue: IQ) -> error::Result<()>
 	where
 		B: BlockT + for<'de> serde::Deserialize<'de>,
 		C: BlockBackend<B> + UsageProvider<B> + Send + Sync + 'static,
diff --git a/client/cli/src/commands/export_blocks_cmd.rs b/client/cli/src/commands/export_blocks_cmd.rs
index 4153c80a0545..0ed8e3ff3591 100644
--- a/client/cli/src/commands/export_blocks_cmd.rs
+++ b/client/cli/src/commands/export_blocks_cmd.rs
@@ -16,21 +16,16 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::error;
-use crate::params::{GenericNumber, DatabaseParams, PruningParams, SharedParams};
-use crate::CliConfiguration;
-use log::info;
-use sc_service::{
-	config::DatabaseConfig, chain_ops::export_blocks,
+use crate::{
+	error,
+	params::{DatabaseParams, GenericNumber, PruningParams, SharedParams},
+	CliConfiguration,
 };
+use log::info;
 use sc_client_api::{BlockBackend, UsageProvider};
+use sc_service::{chain_ops::export_blocks, config::DatabaseConfig};
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT};
-use std::fmt::Debug;
-use std::fs;
-use std::io;
-use std::path::PathBuf;
-use std::str::FromStr;
-use std::sync::Arc;
+use std::{fmt::Debug, fs, io, path::PathBuf, str::FromStr, sync::Arc};
 use structopt::StructOpt;
 
 /// The `export-blocks` command used to export blocks.
@@ -95,9 +90,7 @@ impl ExportBlocksCmd {
 			None => Box::new(io::stdout()),
 		};
 
-		export_blocks(client, file, from.into(), to, binary)
-			.await
-			.map_err(Into::into)
+		export_blocks(client, file, from.into(), to, binary).await.map_err(Into::into)
 	}
 }
 
diff --git a/client/cli/src/commands/export_state_cmd.rs b/client/cli/src/commands/export_state_cmd.rs
index e154c3a50221..36eabd2c24f5 100644
--- a/client/cli/src/commands/export_state_cmd.rs
+++ b/client/cli/src/commands/export_state_cmd.rs
@@ -17,13 +17,15 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{
-	CliConfiguration, error, params::{PruningParams, SharedParams, BlockNumberOrHash},
+	error,
+	params::{BlockNumberOrHash, PruningParams, SharedParams},
+	CliConfiguration,
 };
 use log::info;
+use sc_client_api::{StorageProvider, UsageProvider};
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT};
-use std::{fmt::Debug, str::FromStr, io::Write, sync::Arc};
+use std::{fmt::Debug, io::Write, str::FromStr, sync::Arc};
 use structopt::StructOpt;
-use sc_client_api::{StorageProvider, UsageProvider};
 
 /// The `export-state` command used to export the state of a given block into
 /// a chain spec.
diff --git a/client/cli/src/commands/generate.rs b/client/cli/src/commands/generate.rs
index 42214d2f5e45..7032ebd72e0c 100644
--- a/client/cli/src/commands/generate.rs
+++ b/client/cli/src/commands/generate.rs
@@ -16,12 +16,12 @@
 // limitations under the License.
 
 //! Implementation of the `generate` subcommand
-use bip39::{MnemonicType, Mnemonic, Language};
-use structopt::StructOpt;
 use crate::{
-	utils::print_from_uri, KeystoreParams, Error,
-	with_crypto_scheme, NetworkSchemeFlag, OutputTypeFlag, CryptoSchemeFlag,
+	utils::print_from_uri, with_crypto_scheme, CryptoSchemeFlag, Error, KeystoreParams,
+	NetworkSchemeFlag, OutputTypeFlag,
 };
+use bip39::{Language, Mnemonic, MnemonicType};
+use structopt::StructOpt;
 
 /// The `generate` command
 #[derive(Debug, StructOpt, Clone)]
@@ -52,12 +52,11 @@ impl GenerateCmd {
 	/// Run the command
 	pub fn run(&self) -> Result<(), Error> {
 		let words = match self.words {
-			Some(words) => {
-				MnemonicType::for_word_count(words)
-					.map_err(|_| {
-						Error::Input("Invalid number of words given for phrase: must be 12/15/18/21/24".into())
-					})?
-			},
+			Some(words) => MnemonicType::for_word_count(words).map_err(|_| {
+				Error::Input(
+					"Invalid number of words given for phrase: must be 12/15/18/21/24".into(),
+				)
+			})?,
 			None => MnemonicType::Words12,
 		};
 		let mnemonic = Mnemonic::new(words, Language::English);
diff --git a/client/cli/src/commands/generate_node_key.rs b/client/cli/src/commands/generate_node_key.rs
index ec22c6298adb..74a4197f3662 100644
--- a/client/cli/src/commands/generate_node_key.rs
+++ b/client/cli/src/commands/generate_node_key.rs
@@ -18,9 +18,9 @@
 //! Implementation of the `generate-node-key` subcommand
 
 use crate::Error;
-use structopt::StructOpt;
-use std::{path::PathBuf, fs};
 use libp2p::identity::{ed25519 as libp2p_ed25519, PublicKey};
+use std::{fs, path::PathBuf};
+use structopt::StructOpt;
 
 /// The `generate-node-key` command
 #[derive(Debug, StructOpt)]
@@ -59,15 +59,14 @@ impl GenerateNodeKeyCmd {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use tempfile::Builder;
 	use std::io::Read;
+	use tempfile::Builder;
 
 	#[test]
 	fn generate_node_key() {
 		let mut file = Builder::new().prefix("keyfile").tempfile().unwrap();
 		let file_path = file.path().display().to_string();
-		let generate =
-			GenerateNodeKeyCmd::from_iter(&["generate-node-key", "--file", &file_path]);
+		let generate = GenerateNodeKeyCmd::from_iter(&["generate-node-key", "--file", &file_path]);
 		assert!(generate.run().is_ok());
 		let mut buf = String::new();
 		assert!(file.read_to_string(&mut buf).is_ok());
diff --git a/client/cli/src/commands/import_blocks_cmd.rs b/client/cli/src/commands/import_blocks_cmd.rs
index 89f70d06813c..9b211b88d556 100644
--- a/client/cli/src/commands/import_blocks_cmd.rs
+++ b/client/cli/src/commands/import_blocks_cmd.rs
@@ -16,19 +16,22 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::error;
-use crate::params::ImportParams;
-use crate::params::SharedParams;
-use crate::CliConfiguration;
+use crate::{
+	error,
+	params::{ImportParams, SharedParams},
+	CliConfiguration,
+};
+use sc_client_api::UsageProvider;
 use sc_service::chain_ops::import_blocks;
 use sp_runtime::traits::Block as BlockT;
-use std::fmt::Debug;
-use std::fs;
-use std::io::{self, Read, Seek};
-use std::path::PathBuf;
-use std::sync::Arc;
+use std::{
+	fmt::Debug,
+	fs,
+	io::{self, Read, Seek},
+	path::PathBuf,
+	sync::Arc,
+};
 use structopt::StructOpt;
-use sc_client_api::UsageProvider;
 
 /// The `import-blocks` command used to import blocks.
 #[derive(Debug, StructOpt)]
@@ -63,11 +66,7 @@ impl<T: Read + Seek> ReadPlusSeek for T {}
 
 impl ImportBlocksCmd {
 	/// Run the import-blocks command
-	pub async fn run<B, C, IQ>(
-		&self,
-		client: Arc<C>,
-		import_queue: IQ,
-	) -> error::Result<()>
+	pub async fn run<B, C, IQ>(&self, client: Arc<C>, import_queue: IQ) -> error::Result<()>
 	where
 		C: UsageProvider<B> + Send + Sync + 'static,
 		B: BlockT + for<'de> serde::Deserialize<'de>,
@@ -79,7 +78,7 @@ impl ImportBlocksCmd {
 				let mut buffer = Vec::new();
 				io::stdin().read_to_end(&mut buffer)?;
 				Box::new(io::Cursor::new(buffer))
-			}
+			},
 		};
 
 		import_blocks(client, import_queue, file, false, self.binary)
diff --git a/client/cli/src/commands/insert_key.rs b/client/cli/src/commands/insert_key.rs
index f166db85c156..05055dc53c1e 100644
--- a/client/cli/src/commands/insert_key.rs
+++ b/client/cli/src/commands/insert_key.rs
@@ -18,22 +18,18 @@
 //! Implementation of the `insert` subcommand
 
 use crate::{
-	Error, KeystoreParams, CryptoSchemeFlag, SharedParams, utils, with_crypto_scheme,
-	SubstrateCli,
+	utils, with_crypto_scheme, CryptoSchemeFlag, Error, KeystoreParams, SharedParams, SubstrateCli,
 };
-use std::{sync::Arc, convert::TryFrom};
-use structopt::StructOpt;
-use sp_core::{crypto::KeyTypeId, crypto::SecretString};
-use sp_keystore::{SyncCryptoStorePtr, SyncCryptoStore};
 use sc_keystore::LocalKeystore;
-use sc_service::config::{KeystoreConfig, BasePath};
+use sc_service::config::{BasePath, KeystoreConfig};
+use sp_core::crypto::{KeyTypeId, SecretString};
+use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr};
+use std::{convert::TryFrom, sync::Arc};
+use structopt::StructOpt;
 
 /// The `insert` command
 #[derive(Debug, StructOpt, Clone)]
-#[structopt(
-	name = "insert",
-	about = "Insert a key to the keystore of a node."
-)]
+#[structopt(name = "insert", about = "Insert a key to the keystore of a node.")]
 pub struct InsertKeyCmd {
 	/// The secret key URI.
 	/// If the value is a file, the file content is used as URI.
@@ -62,7 +58,8 @@ impl InsertKeyCmd {
 	/// Run the command
 	pub fn run<C: SubstrateCli>(&self, cli: &C) -> Result<(), Error> {
 		let suri = utils::read_uri(self.suri.as_ref())?;
-		let base_path = self.shared_params
+		let base_path = self
+			.shared_params
 			.base_path()
 			.unwrap_or_else(|| BasePath::from_project("", "", &C::executable_name()));
 		let chain_id = self.shared_params.chain_id(self.shared_params.is_dev());
@@ -78,10 +75,11 @@ impl InsertKeyCmd {
 				let keystore: SyncCryptoStorePtr = Arc::new(LocalKeystore::open(path, password)?);
 				(keystore, public)
 			},
-			_ => unreachable!("keystore_config always returns path and password; qed")
+			_ => unreachable!("keystore_config always returns path and password; qed"),
 		};
 
-		let key_type = KeyTypeId::try_from(self.key_type.as_str()).map_err(|_| Error::KeyTypeInvalid)?;
+		let key_type =
+			KeyTypeId::try_from(self.key_type.as_str()).map_err(|_| Error::KeyTypeInvalid)?;
 
 		SyncCryptoStore::insert_unknown(&*keystore, key_type, &suri, &public[..])
 			.map_err(|_| Error::KeyStoreOperation)?;
@@ -98,10 +96,10 @@ fn to_vec<P: sp_core::Pair>(uri: &str, pass: Option<SecretString>) -> Result<Vec
 #[cfg(test)]
 mod tests {
 	use super::*;
+	use sc_service::{ChainSpec, ChainType, GenericChainSpec, NoExtension};
+	use sp_core::{sr25519::Pair, Pair as _, Public};
 	use structopt::StructOpt;
 	use tempfile::TempDir;
-	use sp_core::{sr25519::Pair, Pair as _, Public};
-	use sc_service::{ChainSpec, GenericChainSpec, ChainType, NoExtension};
 
 	struct Cli;
 
@@ -135,21 +133,17 @@ mod tests {
 		}
 
 		fn load_spec(&self, _: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {
-			Ok(
-				Box::new(
-					GenericChainSpec::from_genesis(
-						"test",
-						"test_id",
-						ChainType::Development,
-						|| unimplemented!("Not required in tests"),
-						Vec::new(),
-						None,
-						None,
-						None,
-						NoExtension::None,
-					),
-				),
-			)
+			Ok(Box::new(GenericChainSpec::from_genesis(
+				"test",
+				"test_id",
+				ChainType::Development,
+				|| unimplemented!("Not required in tests"),
+				Vec::new(),
+				None,
+				None,
+				None,
+				NoExtension::None,
+			)))
 		}
 	}
 
@@ -159,15 +153,20 @@ mod tests {
 		let path_str = format!("{}", path.path().display());
 		let (key, uri, _) = Pair::generate_with_phrase(None);
 
-		let inspect = InsertKeyCmd::from_iter(
-			&["insert-key", "-d", &path_str, "--key-type", "test", "--suri", &uri],
-		);
+		let inspect = InsertKeyCmd::from_iter(&[
+			"insert-key",
+			"-d",
+			&path_str,
+			"--key-type",
+			"test",
+			"--suri",
+			&uri,
+		]);
 		assert!(inspect.run(&Cli).is_ok());
 
-		let keystore = LocalKeystore::open(
-			path.path().join("chains").join("test_id").join("keystore"),
-			None,
-		).unwrap();
+		let keystore =
+			LocalKeystore::open(path.path().join("chains").join("test_id").join("keystore"), None)
+				.unwrap();
 		assert!(keystore.has_keys(&[(key.public().to_raw_vec(), KeyTypeId(*b"test"))]));
 	}
 }
diff --git a/client/cli/src/commands/inspect_key.rs b/client/cli/src/commands/inspect_key.rs
index a60b6cd93a76..277c9015f4da 100644
--- a/client/cli/src/commands/inspect_key.rs
+++ b/client/cli/src/commands/inspect_key.rs
@@ -18,8 +18,8 @@
 //! Implementation of the `inspect` subcommand
 
 use crate::{
-	utils::{self, print_from_uri, print_from_public}, KeystoreParams,
-	with_crypto_scheme, NetworkSchemeFlag, OutputTypeFlag, CryptoSchemeFlag, Error,
+	utils::{self, print_from_public, print_from_uri},
+	with_crypto_scheme, CryptoSchemeFlag, Error, KeystoreParams, NetworkSchemeFlag, OutputTypeFlag,
 };
 use structopt::StructOpt;
 /// The `inspect` command
@@ -103,8 +103,7 @@ mod tests {
 			"remember fiber forum demise paper uniform squirrel feel access exclude casual effort";
 		let seed = "0xad1fb77243b536b90cfe5f0d351ab1b1ac40e3890b41dc64f766ee56340cfca5";
 
-		let inspect =
-			InspectKeyCmd::from_iter(&["inspect-key", words, "--password", "12345"]);
+		let inspect = InspectKeyCmd::from_iter(&["inspect-key", words, "--password", "12345"]);
 		assert!(inspect.run().is_ok());
 
 		let inspect = InspectKeyCmd::from_iter(&["inspect-key", seed]);
diff --git a/client/cli/src/commands/inspect_node_key.rs b/client/cli/src/commands/inspect_node_key.rs
index 4db32aefb5fb..92a71f897505 100644
--- a/client/cli/src/commands/inspect_node_key.rs
+++ b/client/cli/src/commands/inspect_node_key.rs
@@ -18,9 +18,8 @@
 //! Implementation of the `inspect-node-key` subcommand
 
 use crate::{Error, NetworkSchemeFlag};
-use std::fs;
-use libp2p::identity::{PublicKey, ed25519};
-use std::path::PathBuf;
+use libp2p::identity::{ed25519, PublicKey};
+use std::{fs, path::PathBuf};
 use structopt::StructOpt;
 
 /// The `inspect-node-key` command
@@ -42,10 +41,10 @@ pub struct InspectNodeKeyCmd {
 impl InspectNodeKeyCmd {
 	/// runs the command
 	pub fn run(&self) -> Result<(), Error> {
-		let mut file_content = hex::decode(fs::read(&self.file)?)
-			.map_err(|_| "failed to decode secret as hex")?;
-		let secret = ed25519::SecretKey::from_bytes(&mut file_content)
-			.map_err(|_| "Bad node key file")?;
+		let mut file_content =
+			hex::decode(fs::read(&self.file)?).map_err(|_| "failed to decode secret as hex")?;
+		let secret =
+			ed25519::SecretKey::from_bytes(&mut file_content).map_err(|_| "Bad node key file")?;
 
 		let keypair = ed25519::Keypair::from(secret);
 		let peer_id = PublicKey::Ed25519(keypair.public()).into_peer_id();
@@ -58,8 +57,7 @@ impl InspectNodeKeyCmd {
 
 #[cfg(test)]
 mod tests {
-	use super::*;
-	use super::super::GenerateNodeKeyCmd;
+	use super::{super::GenerateNodeKeyCmd, *};
 
 	#[test]
 	fn inspect_node_key() {
diff --git a/client/cli/src/commands/key.rs b/client/cli/src/commands/key.rs
index 34602657da94..8e1103a8ca51 100644
--- a/client/cli/src/commands/key.rs
+++ b/client/cli/src/commands/key.rs
@@ -21,11 +21,8 @@ use crate::{Error, SubstrateCli};
 use structopt::StructOpt;
 
 use super::{
-	insert_key::InsertKeyCmd,
-	inspect_key::InspectKeyCmd,
-	generate::GenerateCmd,
-	inspect_node_key::InspectNodeKeyCmd,
-	generate_node_key::GenerateNodeKeyCmd,
+	generate::GenerateCmd, generate_node_key::GenerateNodeKeyCmd, insert_key::InsertKeyCmd,
+	inspect_key::InspectKeyCmd, inspect_node_key::InspectNodeKeyCmd,
 };
 
 /// Key utilities for the cli.
diff --git a/client/cli/src/commands/mod.rs b/client/cli/src/commands/mod.rs
index 8c0d6acd6a51..9e7c5689b49c 100644
--- a/client/cli/src/commands/mod.rs
+++ b/client/cli/src/commands/mod.rs
@@ -19,37 +19,26 @@ mod build_spec_cmd;
 mod check_block_cmd;
 mod export_blocks_cmd;
 mod export_state_cmd;
-mod import_blocks_cmd;
-mod purge_chain_cmd;
-mod sign;
-mod verify;
-mod vanity;
-mod revert_cmd;
-mod run_cmd;
-mod generate_node_key;
 mod generate;
+mod generate_node_key;
+mod import_blocks_cmd;
 mod insert_key;
-mod inspect_node_key;
 mod inspect_key;
+mod inspect_node_key;
 mod key;
+mod purge_chain_cmd;
+mod revert_cmd;
+mod run_cmd;
+mod sign;
 pub mod utils;
+mod vanity;
+mod verify;
 
 pub use self::{
-	build_spec_cmd::BuildSpecCmd,
-	check_block_cmd::CheckBlockCmd,
-	export_blocks_cmd::ExportBlocksCmd,
-	export_state_cmd::ExportStateCmd,
-	import_blocks_cmd::ImportBlocksCmd,
-	purge_chain_cmd::PurgeChainCmd,
-	sign::SignCmd,
-	generate::GenerateCmd,
-	insert_key::InsertKeyCmd,
-	inspect_key::InspectKeyCmd,
-	generate_node_key::GenerateNodeKeyCmd,
-	inspect_node_key::InspectNodeKeyCmd,
-	key::KeySubcommand,
-	vanity::VanityCmd,
-	verify::VerifyCmd,
-	revert_cmd::RevertCmd,
-	run_cmd::RunCmd,
+	build_spec_cmd::BuildSpecCmd, check_block_cmd::CheckBlockCmd,
+	export_blocks_cmd::ExportBlocksCmd, export_state_cmd::ExportStateCmd, generate::GenerateCmd,
+	generate_node_key::GenerateNodeKeyCmd, import_blocks_cmd::ImportBlocksCmd,
+	insert_key::InsertKeyCmd, inspect_key::InspectKeyCmd, inspect_node_key::InspectNodeKeyCmd,
+	key::KeySubcommand, purge_chain_cmd::PurgeChainCmd, revert_cmd::RevertCmd, run_cmd::RunCmd,
+	sign::SignCmd, vanity::VanityCmd, verify::VerifyCmd,
 };
diff --git a/client/cli/src/commands/purge_chain_cmd.rs b/client/cli/src/commands/purge_chain_cmd.rs
index c61e21a6a5ad..590046aa779b 100644
--- a/client/cli/src/commands/purge_chain_cmd.rs
+++ b/client/cli/src/commands/purge_chain_cmd.rs
@@ -16,13 +16,17 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::error;
-use crate::params::{DatabaseParams, SharedParams};
-use crate::CliConfiguration;
+use crate::{
+	error,
+	params::{DatabaseParams, SharedParams},
+	CliConfiguration,
+};
 use sc_service::DatabaseConfig;
-use std::fmt::Debug;
-use std::fs;
-use std::io::{self, Write};
+use std::{
+	fmt::Debug,
+	fs,
+	io::{self, Write},
+};
 use structopt::StructOpt;
 
 /// The `purge-chain` command used to remove the whole chain.
@@ -44,10 +48,9 @@ pub struct PurgeChainCmd {
 impl PurgeChainCmd {
 	/// Run the purge command
 	pub fn run(&self, database_config: DatabaseConfig) -> error::Result<()> {
-		let db_path = database_config.path()
-			.ok_or_else(||
-				error::Error::Input("Cannot purge custom database implementation".into())
-		)?;
+		let db_path = database_config.path().ok_or_else(|| {
+			error::Error::Input("Cannot purge custom database implementation".into())
+		})?;
 
 		if !self.yes {
 			print!("Are you sure to remove {:?}? [y/N]: ", &db_path);
@@ -61,7 +64,7 @@ impl PurgeChainCmd {
 				Some('y') | Some('Y') => {},
 				_ => {
 					println!("Aborted");
-					return Ok(());
+					return Ok(())
 				},
 			}
 		}
diff --git a/client/cli/src/commands/revert_cmd.rs b/client/cli/src/commands/revert_cmd.rs
index 2745ce2c6524..9ad49a03aa5f 100644
--- a/client/cli/src/commands/revert_cmd.rs
+++ b/client/cli/src/commands/revert_cmd.rs
@@ -16,16 +16,16 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::error;
-use crate::params::{GenericNumber, PruningParams, SharedParams};
-use crate::CliConfiguration;
+use crate::{
+	error,
+	params::{GenericNumber, PruningParams, SharedParams},
+	CliConfiguration,
+};
+use sc_client_api::{Backend, UsageProvider};
 use sc_service::chain_ops::revert_chain;
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT};
-use std::fmt::Debug;
-use std::str::FromStr;
-use std::sync::Arc;
+use std::{fmt::Debug, str::FromStr, sync::Arc};
 use structopt::StructOpt;
-use sc_client_api::{Backend, UsageProvider};
 
 /// The `revert` command used revert the chain to a previous state.
 #[derive(Debug, StructOpt)]
@@ -45,11 +45,7 @@ pub struct RevertCmd {
 
 impl RevertCmd {
 	/// Run the revert command
-	pub async fn run<B, BA, C>(
-		&self,
-		client: Arc<C>,
-		backend: Arc<BA>,
-	) -> error::Result<()>
+	pub async fn run<B, BA, C>(&self, client: Arc<C>, backend: Arc<BA>) -> error::Result<()>
 	where
 		B: BlockT,
 		BA: Backend<B>,
diff --git a/client/cli/src/commands/run_cmd.rs b/client/cli/src/commands/run_cmd.rs
index 285ffc9fdca1..2b5a3632543b 100644
--- a/client/cli/src/commands/run_cmd.rs
+++ b/client/cli/src/commands/run_cmd.rs
@@ -16,15 +16,15 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::arg_enums::RpcMethods;
-use crate::error::{Error, Result};
-use crate::params::ImportParams;
-use crate::params::KeystoreParams;
-use crate::params::NetworkParams;
-use crate::params::OffchainWorkerParams;
-use crate::params::SharedParams;
-use crate::params::TransactionPoolParams;
-use crate::CliConfiguration;
+use crate::{
+	arg_enums::RpcMethods,
+	error::{Error, Result},
+	params::{
+		ImportParams, KeystoreParams, NetworkParams, OffchainWorkerParams, SharedParams,
+		TransactionPoolParams,
+	},
+	CliConfiguration,
+};
 use regex::Regex;
 use sc_service::{
 	config::{BasePath, PrometheusConfig, TransactionPoolOptions},
@@ -308,7 +308,7 @@ impl CliConfiguration for RunCmd {
 			Error::Input(format!(
 				"Invalid node name '{}'. Reason: {}. If unsure, use none.",
 				name, msg
-		))
+			))
 		})?;
 
 		Ok(name)
@@ -363,18 +363,13 @@ impl CliConfiguration for RunCmd {
 		Ok(if self.no_prometheus {
 			None
 		} else {
-			let interface = if self.prometheus_external {
-				Ipv4Addr::UNSPECIFIED
-			} else {
-				Ipv4Addr::LOCALHOST
-			};
-
-			Some(PrometheusConfig::new_with_default_registry(
-				SocketAddr::new(
-					interface.into(),
-					self.prometheus_port.unwrap_or(default_listen_port),
-				)
-			))
+			let interface =
+				if self.prometheus_external { Ipv4Addr::UNSPECIFIED } else { Ipv4Addr::LOCALHOST };
+
+			Some(PrometheusConfig::new_with_default_registry(SocketAddr::new(
+				interface.into(),
+				self.prometheus_port.unwrap_or(default_listen_port),
+			)))
 		})
 	}
 
@@ -416,7 +411,7 @@ impl CliConfiguration for RunCmd {
 			self.rpc_external,
 			self.unsafe_rpc_external,
 			self.rpc_methods,
-			self.validator
+			self.validator,
 		)?;
 
 		Ok(Some(SocketAddr::new(interface, self.rpc_port.unwrap_or(default_listen_port))))
@@ -466,19 +461,19 @@ impl CliConfiguration for RunCmd {
 pub fn is_node_name_valid(_name: &str) -> std::result::Result<(), &str> {
 	let name = _name.to_string();
 	if name.chars().count() >= crate::NODE_NAME_MAX_LENGTH {
-		return Err("Node name too long");
+		return Err("Node name too long")
 	}
 
 	let invalid_chars = r"[\\.@]";
 	let re = Regex::new(invalid_chars).unwrap();
 	if re.is_match(&name) {
-		return Err("Node name should not contain invalid chars such as '.' and '@'");
+		return Err("Node name should not contain invalid chars such as '.' and '@'")
 	}
 
 	let invalid_patterns = r"(https?:\\/+)?(www)+";
 	let re = Regex::new(invalid_patterns).unwrap();
 	if re.is_match(&name) {
-		return Err("Node name should not contain urls");
+		return Err("Node name should not contain urls")
 	}
 
 	Ok(())
@@ -497,7 +492,7 @@ fn rpc_interface(
 		or `--rpc-methods=unsafe` if you understand the risks. See the options \
 		description for more information."
 				.to_owned(),
-		));
+		))
 	}
 
 	if is_external || is_unsafe_external {
@@ -537,11 +532,10 @@ fn parse_telemetry_endpoints(s: &str) -> std::result::Result<(String, u8), Telem
 		None => Err(TelemetryParsingError::MissingVerbosity),
 		Some(pos_) => {
 			let url = s[..pos_].to_string();
-			let verbosity = s[pos_ + 1..]
-				.parse()
-				.map_err(TelemetryParsingError::VerbosityParsingError)?;
+			let verbosity =
+				s[pos_ + 1..].parse().map_err(TelemetryParsingError::VerbosityParsingError)?;
 			Ok((url, verbosity))
-		}
+		},
 	}
 }
 
@@ -574,17 +568,13 @@ fn parse_cors(s: &str) -> std::result::Result<Cors, Box<dyn std::error::Error>>
 		match part {
 			"all" | "*" => {
 				is_all = true;
-				break;
-			}
+				break
+			},
 			other => origins.push(other.to_owned()),
 		}
 	}
 
-	Ok(if is_all {
-		Cors::All
-	} else {
-		Cors::List(origins)
-	})
+	Ok(if is_all { Cors::All } else { Cors::List(origins) })
 }
 
 #[cfg(test)]
@@ -600,7 +590,8 @@ mod tests {
 	fn tests_node_name_bad() {
 		assert!(is_node_name_valid(
 			"very very long names are really not very cool for the ui at all, really they're not"
-		).is_err());
+		)
+		.is_err());
 		assert!(is_node_name_valid("Dots.not.Ok").is_err());
 		assert!(is_node_name_valid("http://visit.me").is_err());
 		assert!(is_node_name_valid("https://visit.me").is_err());
diff --git a/client/cli/src/commands/sign.rs b/client/cli/src/commands/sign.rs
index 5d487861428f..20aacd9bf002 100644
--- a/client/cli/src/commands/sign.rs
+++ b/client/cli/src/commands/sign.rs
@@ -5,7 +5,7 @@
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or 
+// the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
 // This program is distributed in the hope that it will be useful,
@@ -18,15 +18,12 @@
 
 //! Implementation of the `sign` subcommand
 use crate::{error, utils, with_crypto_scheme, CryptoSchemeFlag, KeystoreParams};
-use structopt::StructOpt;
 use sp_core::crypto::SecretString;
+use structopt::StructOpt;
 
 /// The `sign` command
 #[derive(Debug, StructOpt, Clone)]
-#[structopt(
-	name = "sign",
-	about = "Sign a message, with a given (secret) key"
-)]
+#[structopt(name = "sign", about = "Sign a message, with a given (secret) key")]
 pub struct SignCmd {
 	/// The secret key URI.
 	/// If the value is a file, the file content is used as URI.
@@ -52,7 +49,6 @@ pub struct SignCmd {
 	pub crypto_scheme: CryptoSchemeFlag,
 }
 
-
 impl SignCmd {
 	/// Run the command
 	pub fn run(&self) -> error::Result<()> {
@@ -60,17 +56,19 @@ impl SignCmd {
 		let suri = utils::read_uri(self.suri.as_ref())?;
 		let password = self.keystore_params.read_password()?;
 
-		let signature = with_crypto_scheme!(
-			self.crypto_scheme.scheme,
-			sign(&suri, password, message)
-		)?;
+		let signature =
+			with_crypto_scheme!(self.crypto_scheme.scheme, sign(&suri, password, message))?;
 
 		println!("{}", signature);
 		Ok(())
 	}
 }
 
-fn sign<P: sp_core::Pair>(suri: &str, password: Option<SecretString>, message: Vec<u8>) ->  error::Result<String> {
+fn sign<P: sp_core::Pair>(
+	suri: &str,
+	password: Option<SecretString>,
+	message: Vec<u8>,
+) -> error::Result<String> {
 	let pair = utils::pair_from_suri::<P>(suri, password)?;
 	Ok(format!("{}", hex::encode(pair.sign(&message))))
 }
@@ -91,7 +89,7 @@ mod test {
 			"--message",
 			&seed[2..],
 			"--password",
-			"12345"
+			"12345",
 		]);
 		assert!(sign.run().is_ok());
 	}
diff --git a/client/cli/src/commands/utils.rs b/client/cli/src/commands/utils.rs
index 69372e624095..fa783f7a95a5 100644
--- a/client/cli/src/commands/utils.rs
+++ b/client/cli/src/commands/utils.rs
@@ -22,9 +22,8 @@ use crate::{
 	OutputType,
 };
 use serde_json::json;
-use sp_core::crypto::{ExposeSecret, SecretString, Zeroize};
 use sp_core::{
-	crypto::{Ss58AddressFormat, Ss58Codec},
+	crypto::{ExposeSecret, SecretString, Ss58AddressFormat, Ss58Codec, Zeroize},
 	hexdisplay::HexDisplay,
 	Pair,
 };
@@ -88,7 +87,7 @@ pub fn print_from_uri<Pair>(
 					"{}",
 					serde_json::to_string_pretty(&json).expect("Json pretty print failed")
 				);
-			}
+			},
 			OutputType::Text => {
 				println!(
 					"Secret phrase `{}` is account:\n  \
@@ -102,12 +101,9 @@ pub fn print_from_uri<Pair>(
 					format_public_key::<Pair>(public_key.clone()),
 					public_key.to_ss58check_with_version(network_override),
 					format_account_id::<Pair>(public_key),
-					pair.public()
-						.into()
-						.into_account()
-						.to_ss58check_with_version(network_override),
+					pair.public().into().into_account().to_ss58check_with_version(network_override),
 				);
-			}
+			},
 		}
 	} else if let Ok((pair, seed)) = Pair::from_string_with_seed(uri, password.clone()) {
 		let public_key = pair.public();
@@ -127,7 +123,7 @@ pub fn print_from_uri<Pair>(
 					"{}",
 					serde_json::to_string_pretty(&json).expect("Json pretty print failed")
 				);
-			}
+			},
 			OutputType::Text => {
 				println!(
 					"Secret Key URI `{}` is account:\n  \
@@ -137,20 +133,13 @@ pub fn print_from_uri<Pair>(
 					Account ID:        {}\n  \
 					SS58 Address:      {}",
 					uri,
-					if let Some(seed) = seed {
-						format_seed::<Pair>(seed)
-					} else {
-						"n/a".into()
-					},
+					if let Some(seed) = seed { format_seed::<Pair>(seed) } else { "n/a".into() },
 					format_public_key::<Pair>(public_key.clone()),
 					public_key.to_ss58check_with_version(network_override),
 					format_account_id::<Pair>(public_key),
-					pair.public()
-						.into()
-						.into_account()
-						.to_ss58check_with_version(network_override),
+					pair.public().into().into_account().to_ss58check_with_version(network_override),
 				);
-			}
+			},
 		}
 	} else if let Ok((public_key, network)) = Pair::Public::from_string_with_version(uri) {
 		let network_override = network_override.unwrap_or(network);
@@ -170,7 +159,7 @@ pub fn print_from_uri<Pair>(
 					"{}",
 					serde_json::to_string_pretty(&json).expect("Json pretty print failed")
 				);
-			}
+			},
 			OutputType::Text => {
 				println!(
 					"Public Key URI `{}` is account:\n  \
@@ -186,7 +175,7 @@ pub fn print_from_uri<Pair>(
 					format_account_id::<Pair>(public_key.clone()),
 					public_key.to_ss58check_with_version(network_override),
 				);
-			}
+			},
 		}
 	} else {
 		println!("Invalid phrase/URI given");
@@ -220,11 +209,8 @@ where
 				"ss58Address": public_key.to_ss58check_with_version(network_override),
 			});
 
-			println!(
-				"{}",
-				serde_json::to_string_pretty(&json).expect("Json pretty print failed")
-			);
-		}
+			println!("{}", serde_json::to_string_pretty(&json).expect("Json pretty print failed"));
+		},
 		OutputType::Text => {
 			println!(
 				"Network ID/version: {}\n  \
@@ -238,7 +224,7 @@ where
 				format_account_id::<Pair>(public_key.clone()),
 				public_key.to_ss58check_with_version(network_override),
 			);
-		}
+		},
 	}
 
 	Ok(())
@@ -273,10 +259,7 @@ fn format_account_id<P: sp_core::Pair>(public_key: PublicFor<P>) -> String
 where
 	PublicFor<P>: Into<MultiSigner>,
 {
-	format!(
-		"0x{}",
-		HexDisplay::from(&public_key.into().into_account().as_ref())
-	)
+	format!("0x{}", HexDisplay::from(&public_key.into().into_account().as_ref()))
 }
 
 /// helper method for decoding hex
@@ -294,13 +277,13 @@ pub fn read_message(msg: Option<&String>, should_decode: bool) -> Result<Vec<u8>
 	match msg {
 		Some(m) => {
 			message = decode_hex(m)?;
-		}
+		},
 		None => {
 			std::io::stdin().lock().read_to_end(&mut message)?;
 			if should_decode {
 				message = decode_hex(&message)?;
 			}
-		}
+		},
 	}
 	Ok(message)
 }
diff --git a/client/cli/src/commands/vanity.rs b/client/cli/src/commands/vanity.rs
index ce1f079db878..daeb81e86a1a 100644
--- a/client/cli/src/commands/vanity.rs
+++ b/client/cli/src/commands/vanity.rs
@@ -5,7 +5,7 @@
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or 
+// the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
 // This program is distributed in the hope that it will be useful,
@@ -19,21 +19,17 @@
 //! implementation of the `vanity` subcommand
 
 use crate::{
-	error, utils, with_crypto_scheme,
-	CryptoSchemeFlag, NetworkSchemeFlag, OutputTypeFlag,
+	error, utils, with_crypto_scheme, CryptoSchemeFlag, NetworkSchemeFlag, OutputTypeFlag,
 };
-use sp_core::crypto::{Ss58Codec, Ss58AddressFormat};
-use structopt::StructOpt;
 use rand::{rngs::OsRng, RngCore};
+use sp_core::crypto::{Ss58AddressFormat, Ss58Codec};
 use sp_runtime::traits::IdentifyAccount;
+use structopt::StructOpt;
 use utils::print_from_uri;
 
 /// The `vanity` command
 #[derive(Debug, StructOpt, Clone)]
-#[structopt(
-	name = "vanity",
-	about = "Generate a seed that provides a vanity address"
-)]
+#[structopt(name = "vanity", about = "Generate a seed that provides a vanity address")]
 pub struct VanityCmd {
 	/// Desired pattern
 	#[structopt(long, parse(try_from_str = assert_non_empty_string))]
@@ -78,10 +74,10 @@ fn generate_key<Pair>(
 	desired: &str,
 	network_override: Ss58AddressFormat,
 ) -> Result<String, &'static str>
-	where
-		Pair: sp_core::Pair,
-		Pair::Public: IdentifyAccount,
-		<Pair::Public as IdentifyAccount>::AccountId: Ss58Codec,
+where
+	Pair: sp_core::Pair,
+	Pair::Public: IdentifyAccount,
+	<Pair::Public as IdentifyAccount>::AccountId: Ss58Codec,
 {
 	println!("Generating key containing pattern '{}'", desired);
 
@@ -104,7 +100,7 @@ fn generate_key<Pair>(
 			best = score;
 			if best >= top {
 				println!("best: {} == top: {}", best, top);
-				return Ok(utils::format_seed::<Pair>(seed.clone()));
+				return Ok(utils::format_seed::<Pair>(seed.clone()))
 			}
 		}
 		done += 1;
@@ -129,11 +125,11 @@ fn next_seed(seed: &mut [u8]) {
 		match seed[i] {
 			255 => {
 				seed[i] = 0;
-			}
+			},
 			_ => {
 				seed[i] += 1;
-				break;
-			}
+				break
+			},
 		}
 	}
 }
@@ -145,7 +141,7 @@ fn calculate_score(_desired: &str, key: &str) -> usize {
 		let snip_size = _desired.len() - truncate;
 		let truncated = &_desired[0..snip_size];
 		if let Some(pos) = key.find(truncated) {
-			return (47 - pos) + (snip_size * 48);
+			return (47 - pos) + (snip_size * 48)
 		}
 	}
 	0
@@ -160,15 +156,13 @@ fn assert_non_empty_string(pattern: &str) -> Result<String, &'static str> {
 	}
 }
 
-
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use sp_core::{crypto::Ss58Codec, Pair};
-	use sp_core::sr25519;
+	use sp_core::{crypto::Ss58Codec, sr25519, Pair};
+	use structopt::StructOpt;
 	#[cfg(feature = "bench")]
 	use test::Bencher;
-	use structopt::StructOpt;
 
 	#[test]
 	fn vanity() {
@@ -179,25 +173,21 @@ mod tests {
 	#[test]
 	fn test_generation_with_single_char() {
 		let seed = generate_key::<sr25519::Pair>("ab", Default::default()).unwrap();
-		assert!(
-			sr25519::Pair::from_seed_slice(&hex::decode(&seed[2..]).unwrap())
-				.unwrap()
-				.public()
-				.to_ss58check()
-				.contains("ab")
-		);
+		assert!(sr25519::Pair::from_seed_slice(&hex::decode(&seed[2..]).unwrap())
+			.unwrap()
+			.public()
+			.to_ss58check()
+			.contains("ab"));
 	}
 
 	#[test]
 	fn generate_key_respects_network_override() {
 		let seed = generate_key::<sr25519::Pair>("ab", Ss58AddressFormat::PolkadotAccount).unwrap();
-		assert!(
-			sr25519::Pair::from_seed_slice(&hex::decode(&seed[2..]).unwrap())
-				.unwrap()
-				.public()
-				.to_ss58check_with_version(Ss58AddressFormat::PolkadotAccount)
-				.contains("ab")
-		);
+		assert!(sr25519::Pair::from_seed_slice(&hex::decode(&seed[2..]).unwrap())
+			.unwrap()
+			.public()
+			.to_ss58check_with_version(Ss58AddressFormat::PolkadotAccount)
+			.contains("ab"));
 	}
 
 	#[test]
@@ -208,10 +198,7 @@ mod tests {
 
 	#[test]
 	fn test_score_100() {
-		let score = calculate_score(
-			"Polkadot",
-			"5PolkadotwHY5k9GpdTgpqs9xjuNvtv8EcwCFpEeyEf3KHim",
-		);
+		let score = calculate_score("Polkadot", "5PolkadotwHY5k9GpdTgpqs9xjuNvtv8EcwCFpEeyEf3KHim");
 		assert_eq!(score, 430);
 	}
 
@@ -219,10 +206,7 @@ mod tests {
 	fn test_score_50_2() {
 		// 50% for the position + 50% for the size
 		assert_eq!(
-			calculate_score(
-				"Polkadot",
-				"5PolkXXXXwHY5k9GpdTgpqs9xjuNvtv8EcwCFpEeyEf3KHim"
-			),
+			calculate_score("Polkadot", "5PolkXXXXwHY5k9GpdTgpqs9xjuNvtv8EcwCFpEeyEf3KHim"),
 			238
 		);
 	}
@@ -230,10 +214,7 @@ mod tests {
 	#[test]
 	fn test_score_0() {
 		assert_eq!(
-			calculate_score(
-				"Polkadot",
-				"5GUWv4bLCchGUHJrzULXnh4JgXsMpTKRnjuXTY7Qo1Kh9uYK"
-			),
+			calculate_score("Polkadot", "5GUWv4bLCchGUHJrzULXnh4JgXsMpTKRnjuXTY7Qo1Kh9uYK"),
 			0
 		);
 	}
diff --git a/client/cli/src/commands/verify.rs b/client/cli/src/commands/verify.rs
index c6ce3ef9d69c..760793374242 100644
--- a/client/cli/src/commands/verify.rs
+++ b/client/cli/src/commands/verify.rs
@@ -5,7 +5,7 @@
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or 
+// the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 
 // This program is distributed in the hope that it will be useful,
@@ -19,7 +19,7 @@
 //! implementation of the `verify` subcommand
 
 use crate::{error, utils, with_crypto_scheme, CryptoSchemeFlag};
-use sp_core::{Public, crypto::Ss58Codec};
+use sp_core::{crypto::Ss58Codec, Public};
 use structopt::StructOpt;
 
 /// The `verify` command
@@ -57,32 +57,23 @@ impl VerifyCmd {
 		let message = utils::read_message(self.message.as_ref(), self.hex)?;
 		let sig_data = utils::decode_hex(&self.sig)?;
 		let uri = utils::read_uri(self.uri.as_ref())?;
-		let uri = if uri.starts_with("0x") {
-			&uri[2..]
-		} else {
-			&uri
-		};
-
-		with_crypto_scheme!(
-			self.crypto_scheme.scheme,
-			verify(sig_data, message, uri)
-		)
+		let uri = if uri.starts_with("0x") { &uri[2..] } else { &uri };
+
+		with_crypto_scheme!(self.crypto_scheme.scheme, verify(sig_data, message, uri))
 	}
 }
 
 fn verify<Pair>(sig_data: Vec<u8>, message: Vec<u8>, uri: &str) -> error::Result<()>
-	where
-		Pair: sp_core::Pair,
-		Pair::Signature: Default + AsMut<[u8]>,
+where
+	Pair: sp_core::Pair,
+	Pair::Signature: Default + AsMut<[u8]>,
 {
 	let mut signature = Pair::Signature::default();
 	if sig_data.len() != signature.as_ref().len() {
-		return Err(
-			error::Error::SignatureInvalidLength {
-				read: sig_data.len(),
-				expected: signature.as_ref().len(),
-			}
-		);
+		return Err(error::Error::SignatureInvalidLength {
+			read: sig_data.len(),
+			expected: signature.as_ref().len(),
+		})
 	}
 	signature.as_mut().copy_from_slice(&sig_data);
 
diff --git a/client/cli/src/config.rs b/client/cli/src/config.rs
index 8e435da253c0..d58615641050 100644
--- a/client/cli/src/config.rs
+++ b/client/cli/src/config.rs
@@ -18,24 +18,24 @@
 
 //! Configuration trait for a CLI based on substrate
 
-use crate::arg_enums::Database;
-use crate::error::Result;
 use crate::{
-	DatabaseParams, ImportParams, KeystoreParams, NetworkParams, NodeKeyParams,
-	OffchainWorkerParams, PruningParams, SharedParams, SubstrateCli,
+	arg_enums::Database, error::Result, DatabaseParams, ImportParams, KeystoreParams,
+	NetworkParams, NodeKeyParams, OffchainWorkerParams, PruningParams, SharedParams, SubstrateCli,
 };
 use log::warn;
 use names::{Generator, Name};
 use sc_client_api::execution_extensions::ExecutionStrategies;
-use sc_service::config::{
-	BasePath, Configuration, DatabaseConfig, ExtTransport, KeystoreConfig, NetworkConfiguration,
-	NodeKeyConfig, OffchainWorkerConfig, PrometheusConfig, PruningMode, Role, RpcMethods,
-	TaskExecutor, TelemetryEndpoints, TransactionPoolOptions, WasmExecutionMethod,
+use sc_service::{
+	config::{
+		BasePath, Configuration, DatabaseConfig, ExtTransport, KeystoreConfig,
+		NetworkConfiguration, NodeKeyConfig, OffchainWorkerConfig, PrometheusConfig, PruningMode,
+		Role, RpcMethods, TaskExecutor, TelemetryEndpoints, TransactionPoolOptions,
+		WasmExecutionMethod,
+	},
+	ChainSpec, KeepBlocks, TracingReceiver, TransactionStorageMode,
 };
-use sc_service::{ChainSpec, TracingReceiver, KeepBlocks, TransactionStorageMode};
 use sc_tracing::logging::LoggerBuilder;
-use std::net::SocketAddr;
-use std::path::PathBuf;
+use std::{net::SocketAddr, path::PathBuf};
 
 /// The maximum number of characters for a node name.
 pub(crate) const NODE_NAME_MAX_LENGTH: usize = 64;
@@ -178,12 +178,7 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 				default_listen_port,
 			)
 		} else {
-			NetworkConfiguration::new(
-				node_name,
-				client_id,
-				node_key,
-				Some(net_config_dir),
-			)
+			NetworkConfiguration::new(node_name, client_id, node_key, Some(net_config_dir))
 		})
 	}
 
@@ -201,14 +196,13 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 	///
 	/// By default this is retrieved from `DatabaseParams` if it is available. Otherwise its `None`.
 	fn database_cache_size(&self) -> Result<Option<usize>> {
-		Ok(self.database_params()
-			.map(|x| x.database_cache_size())
-			.unwrap_or_default())
+		Ok(self.database_params().map(|x| x.database_cache_size()).unwrap_or_default())
 	}
 
 	/// Get the database transaction storage scheme.
 	fn database_transaction_storage(&self) -> Result<TransactionStorageMode> {
-		Ok(self.database_params()
+		Ok(self
+			.database_params()
 			.map(|x| x.transaction_storage())
 			.unwrap_or(TransactionStorageMode::BlockBody))
 	}
@@ -228,13 +222,8 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 		database: Database,
 	) -> Result<DatabaseConfig> {
 		Ok(match database {
-			Database::RocksDb => DatabaseConfig::RocksDb {
-				path: base_path.join("db"),
-				cache_size,
-			},
-			Database::ParityDb => DatabaseConfig::ParityDb {
-				path: base_path.join("paritydb"),
-			},
+			Database::RocksDb => DatabaseConfig::RocksDb { path: base_path.join("db"), cache_size },
+			Database::ParityDb => DatabaseConfig::ParityDb { path: base_path.join("paritydb") },
 		})
 	}
 
@@ -242,9 +231,7 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 	///
 	/// By default this is retrieved from `ImportParams` if it is available. Otherwise its `0`.
 	fn state_cache_size(&self) -> Result<usize> {
-		Ok(self.import_params()
-			.map(|x| x.state_cache_size())
-			.unwrap_or_default())
+		Ok(self.import_params().map(|x| x.state_cache_size()).unwrap_or_default())
 	}
 
 	/// Get the state cache child ratio (if any).
@@ -293,18 +280,14 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 	/// By default this is retrieved from `ImportParams` if it is available. Otherwise its
 	/// `WasmExecutionMethod::default()`.
 	fn wasm_method(&self) -> Result<WasmExecutionMethod> {
-		Ok(self.import_params()
-			.map(|x| x.wasm_method())
-			.unwrap_or_default())
+		Ok(self.import_params().map(|x| x.wasm_method()).unwrap_or_default())
 	}
 
 	/// Get the path where WASM overrides live.
 	///
 	/// By default this is `None`.
 	fn wasm_runtime_overrides(&self) -> Option<PathBuf> {
-		self.import_params()
-			.map(|x| x.wasm_runtime_overrides())
-			.unwrap_or_default()
+		self.import_params().map(|x| x.wasm_runtime_overrides()).unwrap_or_default()
 	}
 
 	/// Get the execution strategies.
@@ -502,10 +485,7 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 		let (keystore_remote, keystore) = self.keystore_config(&config_dir)?;
 		let telemetry_endpoints = self.telemetry_endpoints(&chain_spec)?;
 
-		let unsafe_pruning = self
-			.import_params()
-			.map(|p| p.unsafe_pruning)
-			.unwrap_or(false);
+		let unsafe_pruning = self.import_params().map(|p| p.unsafe_pruning).unwrap_or(false);
 
 		Ok(Configuration {
 			impl_name: C::impl_name(),
@@ -628,7 +608,7 @@ pub fn generate_node_name() -> String {
 		let count = node_name.chars().count();
 
 		if count < NODE_NAME_MAX_LENGTH {
-			return node_name;
+			return node_name
 		}
 	}
 }
diff --git a/client/cli/src/lib.rs b/client/cli/src/lib.rs
index e170d1a196ff..0d5051bc113e 100644
--- a/client/cli/src/lib.rs
+++ b/client/cli/src/lib.rs
@@ -159,7 +159,7 @@ pub trait SubstrateCli: Sized {
 					let _ = std::io::stdout().write_all(e.message.as_bytes());
 					std::process::exit(0);
 				}
-			}
+			},
 		};
 
 		<Self as StructOpt>::from_clap(&matches)
diff --git a/client/cli/src/params/database_params.rs b/client/cli/src/params/database_params.rs
index d468f1555556..4d6cf5f1d367 100644
--- a/client/cli/src/params/database_params.rs
+++ b/client/cli/src/params/database_params.rs
@@ -17,8 +17,8 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::arg_enums::Database;
-use structopt::StructOpt;
 use sc_service::TransactionStorageMode;
+use structopt::StructOpt;
 
 /// Parameters for block import.
 #[derive(Debug, StructOpt, Clone)]
diff --git a/client/cli/src/params/import_params.rs b/client/cli/src/params/import_params.rs
index a62ec98a9702..9248e210eb66 100644
--- a/client/cli/src/params/import_params.rs
+++ b/client/cli/src/params/import_params.rs
@@ -16,16 +16,17 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::arg_enums::{
-	ExecutionStrategy, WasmExecutionMethod, DEFAULT_EXECUTION_BLOCK_CONSTRUCTION,
-	DEFAULT_EXECUTION_IMPORT_BLOCK, DEFAULT_EXECUTION_IMPORT_BLOCK_VALIDATOR,
-	DEFAULT_EXECUTION_OFFCHAIN_WORKER, DEFAULT_EXECUTION_OTHER, DEFAULT_EXECUTION_SYNCING,
+use crate::{
+	arg_enums::{
+		ExecutionStrategy, WasmExecutionMethod, DEFAULT_EXECUTION_BLOCK_CONSTRUCTION,
+		DEFAULT_EXECUTION_IMPORT_BLOCK, DEFAULT_EXECUTION_IMPORT_BLOCK_VALIDATOR,
+		DEFAULT_EXECUTION_OFFCHAIN_WORKER, DEFAULT_EXECUTION_OTHER, DEFAULT_EXECUTION_SYNCING,
+	},
+	params::{DatabaseParams, PruningParams},
 };
-use crate::params::DatabaseParams;
-use crate::params::PruningParams;
 use sc_client_api::execution_extensions::ExecutionStrategies;
-use structopt::StructOpt;
 use std::path::PathBuf;
+use structopt::StructOpt;
 
 #[cfg(feature = "wasmtime")]
 const WASM_METHOD_DEFAULT: &str = "Compiled";
@@ -73,11 +74,7 @@ pub struct ImportParams {
 	pub execution_strategies: ExecutionStrategiesParams,
 
 	/// Specify the state cache size.
-	#[structopt(
-		long = "state-cache-size",
-		value_name = "Bytes",
-		default_value = "67108864"
-	)]
+	#[structopt(long = "state-cache-size", value_name = "Bytes", default_value = "67108864")]
 	pub state_cache_size: usize,
 }
 
@@ -102,11 +99,7 @@ impl ImportParams {
 	pub fn execution_strategies(&self, is_dev: bool, is_validator: bool) -> ExecutionStrategies {
 		let exec = &self.execution_strategies;
 		let exec_all_or = |strat: Option<ExecutionStrategy>, default: ExecutionStrategy| {
-			let default = if is_dev {
-				ExecutionStrategy::Native
-			} else {
-				default
-			};
+			let default = if is_dev { ExecutionStrategy::Native } else { default };
 
 			exec.execution.unwrap_or_else(|| strat.unwrap_or(default)).into()
 		};
@@ -120,10 +113,14 @@ impl ImportParams {
 		ExecutionStrategies {
 			syncing: exec_all_or(exec.execution_syncing, DEFAULT_EXECUTION_SYNCING),
 			importing: exec_all_or(exec.execution_import_block, default_execution_import_block),
-			block_construction:
-				exec_all_or(exec.execution_block_construction, DEFAULT_EXECUTION_BLOCK_CONSTRUCTION),
-			offchain_worker:
-				exec_all_or(exec.execution_offchain_worker, DEFAULT_EXECUTION_OFFCHAIN_WORKER),
+			block_construction: exec_all_or(
+				exec.execution_block_construction,
+				DEFAULT_EXECUTION_BLOCK_CONSTRUCTION,
+			),
+			offchain_worker: exec_all_or(
+				exec.execution_offchain_worker,
+				DEFAULT_EXECUTION_OFFCHAIN_WORKER,
+			),
 			other: exec_all_or(exec.execution_other, DEFAULT_EXECUTION_OTHER),
 		}
 	}
diff --git a/client/cli/src/params/keystore_params.rs b/client/cli/src/params/keystore_params.rs
index 2975c9bf5041..4eb5e5dc6c2d 100644
--- a/client/cli/src/params/keystore_params.rs
+++ b/client/cli/src/params/keystore_params.rs
@@ -16,12 +16,14 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::error::Result;
+use crate::{error, error::Result};
 use sc_service::config::KeystoreConfig;
-use std::{fs, path::{PathBuf, Path}};
-use structopt::StructOpt;
-use crate::error;
 use sp_core::crypto::SecretString;
+use std::{
+	fs,
+	path::{Path, PathBuf},
+};
+use structopt::StructOpt;
 
 /// default sub directory for the key store
 const DEFAULT_KEYSTORE_CONFIG_PATH: &'static str = "keystore";
@@ -81,8 +83,7 @@ impl KeystoreParams {
 			#[cfg(target_os = "unknown")]
 			None
 		} else if let Some(ref file) = self.password_filename {
-			let password = fs::read_to_string(file)
-				.map_err(|e| format!("{}", e))?;
+			let password = fs::read_to_string(file).map_err(|e| format!("{}", e))?;
 			Some(SecretString::new(password))
 		} else {
 			self.password.clone()
diff --git a/client/cli/src/params/mod.rs b/client/cli/src/params/mod.rs
index 0769e5a87adc..431e1750b2b8 100644
--- a/client/cli/src/params/mod.rs
+++ b/client/cli/src/params/mod.rs
@@ -25,21 +25,20 @@ mod pruning_params;
 mod shared_params;
 mod transaction_pool_params;
 
-use std::{fmt::Debug, str::FromStr, convert::TryFrom};
-use sp_runtime::{generic::BlockId, traits::{Block as BlockT, NumberFor}};
+use crate::arg_enums::{CryptoScheme, OutputType};
 use sp_core::crypto::Ss58AddressFormat;
-use crate::arg_enums::{OutputType, CryptoScheme};
+use sp_runtime::{
+	generic::BlockId,
+	traits::{Block as BlockT, NumberFor},
+};
+use std::{convert::TryFrom, fmt::Debug, str::FromStr};
 use structopt::StructOpt;
 
-pub use crate::params::database_params::*;
-pub use crate::params::import_params::*;
-pub use crate::params::keystore_params::*;
-pub use crate::params::network_params::*;
-pub use crate::params::node_key_params::*;
-pub use crate::params::offchain_worker_params::*;
-pub use crate::params::pruning_params::*;
-pub use crate::params::shared_params::*;
-pub use crate::params::transaction_pool_params::*;
+pub use crate::params::{
+	database_params::*, import_params::*, keystore_params::*, network_params::*,
+	node_key_params::*, offchain_worker_params::*, pruning_params::*, shared_params::*,
+	transaction_pool_params::*,
+};
 
 /// Wrapper type of `String` that holds an unsigned integer of arbitrary size, formatted as a decimal.
 #[derive(Debug, Clone)]
@@ -50,10 +49,7 @@ impl FromStr for GenericNumber {
 
 	fn from_str(block_number: &str) -> Result<Self, Self::Err> {
 		if let Some(pos) = block_number.chars().position(|d| !d.is_digit(10)) {
-			Err(format!(
-				"Expected block number, found illegal digit at position: {}",
-				pos,
-			))
+			Err(format!("Expected block number, found illegal digit at position: {}", pos,))
 		} else {
 			Ok(Self(block_number.to_owned()))
 		}
@@ -66,9 +62,9 @@ impl GenericNumber {
 	/// See `https://doc.rust-lang.org/std/primitive.str.html#method.parse` for more elaborate
 	/// documentation.
 	pub fn parse<N>(&self) -> Result<N, String>
-		where
-			N: FromStr,
-			N::Err: std::fmt::Debug,
+	where
+		N: FromStr,
+		N::Err: std::fmt::Debug,
 	{
 		FromStr::from_str(&self.0).map_err(|e| format!("Failed to parse block number: {:?}", e))
 	}
@@ -109,7 +105,7 @@ impl BlockNumberOrHash {
 		if self.0.starts_with("0x") {
 			Ok(BlockId::Hash(
 				FromStr::from_str(&self.0[2..])
-					.map_err(|e| format!("Failed to parse block hash: {:?}", e))?
+					.map_err(|e| format!("Failed to parse block hash: {:?}", e))?,
 			))
 		} else {
 			GenericNumber(self.0.clone()).parse().map(BlockId::Number)
@@ -117,7 +113,6 @@ impl BlockNumberOrHash {
 	}
 }
 
-
 /// Optional flag for specifying crypto algorithm
 #[derive(Debug, StructOpt, Clone)]
 pub struct CryptoSchemeFlag {
diff --git a/client/cli/src/params/network_params.rs b/client/cli/src/params/network_params.rs
index 69f4c9d1ba74..185a93f66b3d 100644
--- a/client/cli/src/params/network_params.rs
+++ b/client/cli/src/params/network_params.rs
@@ -16,13 +16,17 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::params::node_key_params::NodeKeyParams;
-use crate::arg_enums::SyncMode;
+use crate::{arg_enums::SyncMode, params::node_key_params::NodeKeyParams};
 use sc_network::{
-	config::{NetworkConfiguration, NodeKeyConfig, NonReservedPeerMode, SetConfig, TransportConfig},
+	config::{
+		NetworkConfiguration, NodeKeyConfig, NonReservedPeerMode, SetConfig, TransportConfig,
+	},
 	multiaddr::Protocol,
 };
-use sc_service::{ChainSpec, ChainType, config::{Multiaddr, MultiaddrWithPeerId}};
+use sc_service::{
+	config::{Multiaddr, MultiaddrWithPeerId},
+	ChainSpec, ChainType,
+};
 use std::{borrow::Cow, path::PathBuf};
 use structopt::StructOpt;
 
@@ -97,11 +101,7 @@ pub struct NetworkParams {
 	///
 	/// This allows downloading announced blocks from multiple peers. Decrease to save
 	/// traffic and risk increased latency.
-	#[structopt(
-		long = "max-parallel-downloads",
-		value_name = "COUNT",
-		default_value = "5"
-	)]
+	#[structopt(long = "max-parallel-downloads", value_name = "COUNT", default_value = "5")]
 	pub max_parallel_downloads: u32,
 
 	#[allow(missing_docs)]
@@ -184,15 +184,16 @@ impl NetworkParams {
 		let chain_type = chain_spec.chain_type();
 		// Activate if the user explicitly requested local discovery, `--dev` is given or the
 		// chain type is `Local`/`Development`
-		let allow_non_globals_in_dht = self.discover_local
-			|| is_dev
-			|| matches!(chain_type, ChainType::Local | ChainType::Development);
+		let allow_non_globals_in_dht =
+			self.discover_local ||
+				is_dev || matches!(chain_type, ChainType::Local | ChainType::Development);
 
 		let allow_private_ipv4 = match (self.allow_private_ipv4, self.no_private_ipv4) {
 			(true, true) => unreachable!("`*_private_ipv4` flags are mutually exclusive; qed"),
 			(true, false) => true,
 			(false, true) => false,
-			(false, false) => is_dev || matches!(chain_type, ChainType::Local | ChainType::Development),
+			(false, false) =>
+				is_dev || matches!(chain_type, ChainType::Local | ChainType::Development),
 		};
 
 		NetworkConfiguration {
diff --git a/client/cli/src/params/node_key_params.rs b/client/cli/src/params/node_key_params.rs
index d5823341aa69..bc5606752a88 100644
--- a/client/cli/src/params/node_key_params.rs
+++ b/client/cli/src/params/node_key_params.rs
@@ -16,13 +16,12 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use sc_network::{config::identity::ed25519, config::NodeKeyConfig};
+use sc_network::config::{identity::ed25519, NodeKeyConfig};
 use sp_core::H256;
 use std::{path::PathBuf, str::FromStr};
 use structopt::StructOpt;
 
-use crate::arg_enums::NodeKeyType;
-use crate::error;
+use crate::{arg_enums::NodeKeyType, error};
 
 /// The file name of the node's Ed25519 secret key inside the chain-specific
 /// network config directory, if neither `--node-key` nor `--node-key-file`
@@ -103,12 +102,12 @@ impl NodeKeyParams {
 					sc_network::config::Secret::File(
 						self.node_key_file
 							.clone()
-							.unwrap_or_else(|| net_config_dir.join(NODE_KEY_ED25519_FILE))
+							.unwrap_or_else(|| net_config_dir.join(NODE_KEY_ED25519_FILE)),
 					)
 				};
 
 				NodeKeyConfig::Ed25519(secret)
-			}
+			},
 		})
 	}
 }
@@ -120,13 +119,11 @@ fn invalid_node_key(e: impl std::fmt::Display) -> error::Error {
 
 /// Parse a Ed25519 secret key from a hex string into a `sc_network::Secret`.
 fn parse_ed25519_secret(hex: &str) -> error::Result<sc_network::config::Ed25519Secret> {
-	H256::from_str(&hex)
-		.map_err(invalid_node_key)
-		.and_then(|bytes| {
-			ed25519::SecretKey::from_bytes(bytes)
-				.map(sc_network::config::Secret::Input)
-				.map_err(invalid_node_key)
-		})
+	H256::from_str(&hex).map_err(invalid_node_key).and_then(|bytes| {
+		ed25519::SecretKey::from_bytes(bytes)
+			.map(sc_network::config::Secret::Input)
+			.map_err(invalid_node_key)
+	})
 }
 
 #[cfg(test)]
@@ -151,9 +148,7 @@ mod tests {
 				params.node_key(net_config_dir).and_then(|c| match c {
 					NodeKeyConfig::Ed25519(sc_network::config::Secret::Input(ref ski))
 						if node_key_type == NodeKeyType::Ed25519 && &sk[..] == ski.as_ref() =>
-					{
-						Ok(())
-					}
+						Ok(()),
 					_ => Err(error::Error::Input("Unexpected node key config".into())),
 				})
 			})
@@ -171,14 +166,14 @@ mod tests {
 				node_key_file: Some(file),
 			};
 
-			let node_key = params.node_key(&PathBuf::from("not-used"))
+			let node_key = params
+				.node_key(&PathBuf::from("not-used"))
 				.expect("Creates node key config")
 				.into_keypair()
 				.expect("Creates node key pair");
 
 			match node_key {
-				Keypair::Ed25519(ref pair)
-					if pair.secret().as_ref() == key.as_ref() => {}
+				Keypair::Ed25519(ref pair) if pair.secret().as_ref() == key.as_ref() => {},
 				_ => panic!("Invalid key"),
 			}
 		}
@@ -202,11 +197,7 @@ mod tests {
 		{
 			NodeKeyType::variants().iter().try_for_each(|t| {
 				let node_key_type = NodeKeyType::from_str(t).unwrap();
-				f(NodeKeyParams {
-					node_key_type,
-					node_key: None,
-					node_key_file: None,
-				})
+				f(NodeKeyParams { node_key_type, node_key: None, node_key_file: None })
 			})
 		}
 
@@ -214,17 +205,12 @@ mod tests {
 			with_def_params(|params| {
 				let dir = PathBuf::from(net_config_dir.clone());
 				let typ = params.node_key_type;
-				params
-					.node_key(net_config_dir)
-					.and_then(move |c| match c {
-						NodeKeyConfig::Ed25519(sc_network::config::Secret::File(ref f))
-						if typ == NodeKeyType::Ed25519
-								&& f == &dir.join(NODE_KEY_ED25519_FILE) =>
-						{
-							Ok(())
-						}
-						_ => Err(error::Error::Input("Unexpected node key config".into())),
-					})
+				params.node_key(net_config_dir).and_then(move |c| match c {
+					NodeKeyConfig::Ed25519(sc_network::config::Secret::File(ref f))
+						if typ == NodeKeyType::Ed25519 && f == &dir.join(NODE_KEY_ED25519_FILE) =>
+						Ok(()),
+					_ => Err(error::Error::Input("Unexpected node key config".into())),
+				})
 			})
 		}
 
diff --git a/client/cli/src/params/offchain_worker_params.rs b/client/cli/src/params/offchain_worker_params.rs
index a6d65e4027a2..685328ef1779 100644
--- a/client/cli/src/params/offchain_worker_params.rs
+++ b/client/cli/src/params/offchain_worker_params.rs
@@ -27,8 +27,7 @@ use sc_network::config::Role;
 use sc_service::config::OffchainWorkerConfig;
 use structopt::StructOpt;
 
-use crate::error;
-use crate::OffchainWorkerEnabled;
+use crate::{error, OffchainWorkerEnabled};
 
 /// Offchain worker related parameters.
 #[derive(Debug, StructOpt, Clone)]
@@ -49,10 +48,7 @@ pub struct OffchainWorkerParams {
 	///
 	/// Enables a runtime to write directly to a offchain workers
 	/// DB during block import.
-	#[structopt(
-		long = "enable-offchain-indexing",
-		value_name = "ENABLE_OFFCHAIN_INDEXING"
-	)]
+	#[structopt(long = "enable-offchain-indexing", value_name = "ENABLE_OFFCHAIN_INDEXING")]
 	pub indexing_enabled: bool,
 }
 
@@ -67,9 +63,6 @@ impl OffchainWorkerParams {
 		};
 
 		let indexing_enabled = self.indexing_enabled;
-		Ok(OffchainWorkerConfig {
-			enabled,
-			indexing_enabled,
-		})
+		Ok(OffchainWorkerConfig { enabled, indexing_enabled })
 	}
 }
diff --git a/client/cli/src/params/pruning_params.rs b/client/cli/src/params/pruning_params.rs
index 32abaa9a755b..28c7fa301cc6 100644
--- a/client/cli/src/params/pruning_params.rs
+++ b/client/cli/src/params/pruning_params.rs
@@ -17,7 +17,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::error;
-use sc_service::{PruningMode, Role, KeepBlocks};
+use sc_service::{KeepBlocks, PruningMode, Role};
 use structopt::StructOpt;
 
 /// Parameters to define the pruning mode
@@ -54,13 +54,13 @@ impl PruningParams {
 						"Validators should run with state pruning disabled (i.e. archive). \
 						You can ignore this check with `--unsafe-pruning`."
 							.to_string(),
-					));
+					))
 				}
 
 				PruningMode::keep_blocks(s.parse().map_err(|_| {
 					error::Error::Input("Invalid pruning mode specified".to_string())
 				})?)
-			}
+			},
 		})
 	}
 
diff --git a/client/cli/src/params/shared_params.rs b/client/cli/src/params/shared_params.rs
index c0317c280a9d..5ded5846e34c 100644
--- a/client/cli/src/params/shared_params.rs
+++ b/client/cli/src/params/shared_params.rs
@@ -16,10 +16,10 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+use crate::arg_enums::TracingReceiver;
 use sc_service::config::BasePath;
 use std::path::PathBuf;
 use structopt::StructOpt;
-use crate::arg_enums::TracingReceiver;
 
 /// Shared parameters used by all `CoreParams`.
 #[derive(Debug, StructOpt, Clone)]
@@ -88,13 +88,12 @@ impl SharedParams {
 	pub fn chain_id(&self, is_dev: bool) -> String {
 		match self.chain {
 			Some(ref chain) => chain.clone(),
-			None => {
+			None =>
 				if is_dev {
 					"dev".into()
 				} else {
 					"".into()
-				}
-			}
+				},
 		}
 	}
 
diff --git a/client/cli/src/runner.rs b/client/cli/src/runner.rs
index 947cdd5a21e5..f305f8cbbeaf 100644
--- a/client/cli/src/runner.rs
+++ b/client/cli/src/runner.rs
@@ -16,19 +16,13 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::CliConfiguration;
-use crate::Result;
-use crate::SubstrateCli;
+use crate::{error::Error as CliError, CliConfiguration, Result, SubstrateCli};
 use chrono::prelude::*;
-use futures::pin_mut;
-use futures::select;
-use futures::{future, future::FutureExt, Future};
+use futures::{future, future::FutureExt, pin_mut, select, Future};
 use log::info;
-use sc_service::{Configuration, TaskType, TaskManager};
+use sc_service::{Configuration, Error as ServiceError, TaskManager, TaskType};
 use sp_utils::metrics::{TOKIO_THREADS_ALIVE, TOKIO_THREADS_TOTAL};
 use std::marker::PhantomData;
-use sc_service::Error as ServiceError;
-use crate::error::Error as CliError;
 
 #[cfg(target_family = "unix")]
 async fn main<F, E>(func: F) -> std::result::Result<(), E>
@@ -119,27 +113,19 @@ pub struct Runner<C: SubstrateCli> {
 
 impl<C: SubstrateCli> Runner<C> {
 	/// Create a new runtime with the command provided in argument
-	pub fn new<T: CliConfiguration>(
-		cli: &C,
-		command: &T,
-	) -> Result<Runner<C>> {
+	pub fn new<T: CliConfiguration>(cli: &C, command: &T) -> Result<Runner<C>> {
 		let tokio_runtime = build_runtime()?;
 		let runtime_handle = tokio_runtime.handle().clone();
 
-		let task_executor = move |fut, task_type| {
-			match task_type {
-				TaskType::Async => runtime_handle.spawn(fut).map(drop),
-				TaskType::Blocking =>
-					runtime_handle.spawn_blocking(move || futures::executor::block_on(fut))
-						.map(drop),
-			}
+		let task_executor = move |fut, task_type| match task_type {
+			TaskType::Async => runtime_handle.spawn(fut).map(drop),
+			TaskType::Blocking => runtime_handle
+				.spawn_blocking(move || futures::executor::block_on(fut))
+				.map(drop),
 		};
 
 		Ok(Runner {
-			config: command.create_configuration(
-				cli,
-				task_executor.into(),
-			)?,
+			config: command.create_configuration(cli, task_executor.into())?,
 			tokio_runtime,
 			phantom: PhantomData,
 		})
@@ -183,7 +169,7 @@ impl<C: SubstrateCli> Runner<C> {
 	/// A helper function that runs a command with the configuration of this node.
 	pub fn sync_run<E>(
 		self,
-		runner: impl FnOnce(Configuration) -> std::result::Result<(), E>
+		runner: impl FnOnce(Configuration) -> std::result::Result<(), E>,
 	) -> std::result::Result<(), E>
 	where
 		E: std::error::Error + Send + Sync + 'static + From<ServiceError>,
@@ -194,7 +180,8 @@ impl<C: SubstrateCli> Runner<C> {
 	/// A helper function that runs a future with tokio and stops if the process receives
 	/// the signal `SIGTERM` or `SIGINT`.
 	pub fn async_run<F, E>(
-		self, runner: impl FnOnce(Configuration) -> std::result::Result<(F, TaskManager), E>,
+		self,
+		runner: impl FnOnce(Configuration) -> std::result::Result<(F, TaskManager), E>,
 	) -> std::result::Result<(), E>
 	where
 		F: Future<Output = std::result::Result<(), E>>,
@@ -219,19 +206,17 @@ impl<C: SubstrateCli> Runner<C> {
 pub fn print_node_infos<C: SubstrateCli>(config: &Configuration) {
 	info!("{}", C::impl_name());
 	info!("✌️  version {}", C::impl_version());
-	info!(
-		"❤️  by {}, {}-{}",
-		C::author(),
-		C::copyright_start_year(),
-		Local::today().year(),
-	);
+	info!("❤️  by {}, {}-{}", C::author(), C::copyright_start_year(), Local::today().year(),);
 	info!("📋 Chain specification: {}", config.chain_spec.name());
 	info!("🏷 Node name: {}", config.network.node_name);
 	info!("👤 Role: {}", config.display_role());
-	info!("💾 Database: {} at {}",
-		  config.database,
-		  config.database.path().map_or_else(|| "<unknown>".to_owned(), |p| p.display().to_string())
+	info!(
+		"💾 Database: {} at {}",
+		config.database,
+		config
+			.database
+			.path()
+			.map_or_else(|| "<unknown>".to_owned(), |p| p.display().to_string())
 	);
 	info!("⛓  Native runtime: {}", C::native_runtime_version(&config.chain_spec));
 }
-
diff --git a/client/consensus/aura/src/import_queue.rs b/client/consensus/aura/src/import_queue.rs
index c3faa5382686..a8036f28f164 100644
--- a/client/consensus/aura/src/import_queue.rs
+++ b/client/consensus/aura/src/import_queue.rs
@@ -18,36 +18,37 @@
 
 //! Module implementing the logic for verifying and importing AuRa blocks.
 
-use crate::{AuthorityId, find_pre_digest, slot_author, aura_err, Error, authorities};
-use std::{
-	sync::Arc, marker::PhantomData, hash::Hash, fmt::Debug,
-};
+use crate::{aura_err, authorities, find_pre_digest, slot_author, AuthorityId, Error};
+use codec::{Codec, Decode, Encode};
 use log::{debug, info, trace};
 use prometheus_endpoint::Registry;
-use codec::{Encode, Decode, Codec};
+use sc_client_api::{backend::AuxStore, BlockOf, UsageProvider};
+use sc_consensus_slots::{check_equivocation, CheckedHeader, InherentDataProviderExt};
+use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_DEBUG, CONSENSUS_TRACE};
+use sp_api::{ApiExt, ProvideRuntimeApi};
+use sp_block_builder::BlockBuilder as BlockBuilderApi;
+use sp_blockchain::{
+	well_known_cache_keys::{self, Id as CacheKeyId},
+	HeaderBackend, ProvideCache,
+};
 use sp_consensus::{
-	BlockImport, CanAuthorWith, ForkChoiceStrategy, BlockImportParams,
-	BlockOrigin, Error as ConsensusError,
-	import_queue::{
-		Verifier, BasicQueue, DefaultImportQueue, BoxJustificationImport,
-	},
+	import_queue::{BasicQueue, BoxJustificationImport, DefaultImportQueue, Verifier},
+	BlockImport, BlockImportParams, BlockOrigin, CanAuthorWith, Error as ConsensusError,
+	ForkChoiceStrategy,
 };
-use sc_client_api::{BlockOf, UsageProvider, backend::AuxStore};
-use sp_blockchain::{well_known_cache_keys::{self, Id as CacheKeyId}, ProvideCache, HeaderBackend};
-use sp_block_builder::BlockBuilder as BlockBuilderApi;
-use sp_runtime::{generic::{BlockId, OpaqueDigestItemId}, Justifications};
-use sp_runtime::traits::{Block as BlockT, Header, DigestItemFor};
-use sp_api::ProvideRuntimeApi;
+use sp_consensus_aura::{
+	digests::CompatibleDigestItem, inherents::AuraInherentData, AuraApi, ConsensusLog,
+	AURA_ENGINE_ID,
+};
+use sp_consensus_slots::Slot;
 use sp_core::crypto::Pair;
 use sp_inherents::{CreateInherentDataProviders, InherentDataProvider as _};
-use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_TRACE, CONSENSUS_DEBUG};
-use sc_consensus_slots::{CheckedHeader, check_equivocation, InherentDataProviderExt};
-use sp_consensus_slots::Slot;
-use sp_api::ApiExt;
-use sp_consensus_aura::{
-	digests::CompatibleDigestItem, AuraApi, inherents::AuraInherentData,
-	ConsensusLog, AURA_ENGINE_ID,
+use sp_runtime::{
+	generic::{BlockId, OpaqueDigestItemId},
+	traits::{Block as BlockT, DigestItemFor, Header},
+	Justifications,
 };
+use std::{fmt::Debug, hash::Hash, marker::PhantomData, sync::Arc};
 
 /// check a header has been signed by the right key. If the slot is too far in the future, an error
 /// will be returned. If it's successful, returns the pre-header and the digest item
@@ -61,7 +62,8 @@ fn check_header<C, B: BlockT, P: Pair>(
 	hash: B::Hash,
 	authorities: &[AuthorityId<P>],
 	check_for_equivocation: CheckForEquivocation,
-) -> Result<CheckedHeader<B::Header, (Slot, DigestItemFor<B>)>, Error<B>> where
+) -> Result<CheckedHeader<B::Header, (Slot, DigestItemFor<B>)>, Error<B>>
+where
 	DigestItemFor<B>: CompatibleDigestItem<P::Signature>,
 	P::Signature: Codec,
 	C: sc_client_api::backend::AuxStore,
@@ -69,9 +71,7 @@ fn check_header<C, B: BlockT, P: Pair>(
 {
 	let seal = header.digest_mut().pop().ok_or_else(|| Error::HeaderUnsealed(hash))?;
 
-	let sig = seal.as_aura_seal().ok_or_else(|| {
-		aura_err(Error::HeaderBadSeal(hash))
-	})?;
+	let sig = seal.as_aura_seal().ok_or_else(|| aura_err(Error::HeaderBadSeal(hash)))?;
 
 	let slot = find_pre_digest::<B, P::Signature>(&header)?;
 
@@ -81,20 +81,17 @@ fn check_header<C, B: BlockT, P: Pair>(
 	} else {
 		// check the signature is valid under the expected authority and
 		// chain state.
-		let expected_author = slot_author::<P>(slot, &authorities)
-			.ok_or_else(|| Error::SlotAuthorNotFound)?;
+		let expected_author =
+			slot_author::<P>(slot, &authorities).ok_or_else(|| Error::SlotAuthorNotFound)?;
 
 		let pre_hash = header.hash();
 
 		if P::verify(&sig, pre_hash.as_ref(), expected_author) {
 			if check_for_equivocation.check_for_equivocation() {
-				if let Some(equivocation_proof) = check_equivocation(
-					client,
-					slot_now,
-					slot,
-					&header,
-					expected_author,
-				).map_err(Error::Client)? {
+				if let Some(equivocation_proof) =
+					check_equivocation(client, slot_now, slot, &header, expected_author)
+						.map_err(Error::Client)?
+				{
 					info!(
 						target: "aura",
 						"Slot author is equivocating at slot {} with headers {:?} and {:?}",
@@ -141,7 +138,8 @@ impl<C, P, CAW, CIDP> AuraVerifier<C, P, CAW, CIDP> {
 	}
 }
 
-impl<C, P, CAW, CIDP> AuraVerifier<C, P, CAW, CIDP> where
+impl<C, P, CAW, CIDP> AuraVerifier<C, P, CAW, CIDP>
+where
 	P: Send + Sync + 'static,
 	CAW: Send + Sync + 'static,
 	CIDP: Send,
@@ -152,8 +150,10 @@ impl<C, P, CAW, CIDP> AuraVerifier<C, P, CAW, CIDP> where
 		block_id: BlockId<B>,
 		inherent_data: sp_inherents::InherentData,
 		create_inherent_data_providers: CIDP::InherentDataProviders,
-	) -> Result<(), Error<B>> where
-		C: ProvideRuntimeApi<B>, C::Api: BlockBuilderApi<B>,
+	) -> Result<(), Error<B>>
+	where
+		C: ProvideRuntimeApi<B>,
+		C::Api: BlockBuilderApi<B>,
 		CAW: CanAuthorWith<B>,
 		CIDP: CreateInherentDataProviders<B, ()>,
 	{
@@ -167,11 +167,11 @@ impl<C, P, CAW, CIDP> AuraVerifier<C, P, CAW, CIDP> where
 			return Ok(())
 		}
 
-		let inherent_res = self.client.runtime_api().check_inherents(
-			&block_id,
-			block,
-			inherent_data,
-		).map_err(|e| Error::Client(e.into()))?;
+		let inherent_res = self
+			.client
+			.runtime_api()
+			.check_inherents(&block_id, block, inherent_data)
+			.map_err(|e| Error::Client(e.into()))?;
 
 		if !inherent_res.ok() {
 			for (i, e) in inherent_res.into_errors() {
@@ -187,13 +187,14 @@ impl<C, P, CAW, CIDP> AuraVerifier<C, P, CAW, CIDP> where
 }
 
 #[async_trait::async_trait]
-impl<B: BlockT, C, P, CAW, CIDP> Verifier<B> for AuraVerifier<C, P, CAW, CIDP> where
-	C: ProvideRuntimeApi<B> +
-		Send +
-		Sync +
-		sc_client_api::backend::AuxStore +
-		ProvideCache<B> +
-		BlockOf,
+impl<B: BlockT, C, P, CAW, CIDP> Verifier<B> for AuraVerifier<C, P, CAW, CIDP>
+where
+	C: ProvideRuntimeApi<B>
+		+ Send
+		+ Sync
+		+ sc_client_api::backend::AuxStore
+		+ ProvideCache<B>
+		+ BlockOf,
 	C::Api: BlockBuilderApi<B> + AuraApi<B, AuthorityId<P>> + ApiExt<B>,
 	DigestItemFor<B>: CompatibleDigestItem<P::Signature>,
 	P: Pair + Send + Sync + 'static,
@@ -215,15 +216,14 @@ impl<B: BlockT, C, P, CAW, CIDP> Verifier<B> for AuraVerifier<C, P, CAW, CIDP> w
 		let authorities = authorities(self.client.as_ref(), &BlockId::Hash(parent_hash))
 			.map_err(|e| format!("Could not fetch authorities at {:?}: {:?}", parent_hash, e))?;
 
-		let create_inherent_data_providers = self.create_inherent_data_providers
-			.create_inherent_data_providers(
-				parent_hash,
-				(),
-			)
+		let create_inherent_data_providers = self
+			.create_inherent_data_providers
+			.create_inherent_data_providers(parent_hash, ())
 			.await
 			.map_err(|e| Error::<B>::Client(sp_blockchain::Error::Application(e)))?;
 
-		let mut inherent_data = create_inherent_data_providers.create_inherent_data()
+		let mut inherent_data = create_inherent_data_providers
+			.create_inherent_data()
 			.map_err(Error::<B>::Inherent)?;
 
 		let slot_now = create_inherent_data_providers.slot();
@@ -238,7 +238,8 @@ impl<B: BlockT, C, P, CAW, CIDP> Verifier<B> for AuraVerifier<C, P, CAW, CIDP> w
 			hash,
 			&authorities[..],
 			self.check_for_equivocation,
-		).map_err(|e| e.to_string())?;
+		)
+		.map_err(|e| e.to_string())?;
 		match checked_header {
 			CheckedHeader::Checked(pre_header, (slot, seal)) => {
 				// if the body is passed through, we need to use the runtime
@@ -250,7 +251,8 @@ impl<B: BlockT, C, P, CAW, CIDP> Verifier<B> for AuraVerifier<C, P, CAW, CIDP> w
 					inherent_data.aura_replace_inherent_data(slot);
 
 					// skip the inherents verification if the runtime API is old.
-					if self.client
+					if self
+						.client
 						.runtime_api()
 						.has_api_with::<dyn BlockBuilderApi<B>, _>(
 							&BlockId::Hash(parent_hash),
@@ -263,7 +265,9 @@ impl<B: BlockT, C, P, CAW, CIDP> Verifier<B> for AuraVerifier<C, P, CAW, CIDP> w
 							BlockId::Hash(parent_hash),
 							inherent_data,
 							create_inherent_data_providers,
-						).await.map_err(|e| e.to_string())?;
+						)
+						.await
+						.map_err(|e| e.to_string())?;
 					}
 
 					let (_, inner_body) = block.deconstruct();
@@ -279,16 +283,18 @@ impl<B: BlockT, C, P, CAW, CIDP> Verifier<B> for AuraVerifier<C, P, CAW, CIDP> w
 				);
 
 				// Look for an authorities-change log.
-				let maybe_keys = pre_header.digest()
+				let maybe_keys = pre_header
+					.digest()
 					.logs()
 					.iter()
-					.filter_map(|l| l.try_to::<ConsensusLog<AuthorityId<P>>>(
-						OpaqueDigestItemId::Consensus(&AURA_ENGINE_ID)
-					))
+					.filter_map(|l| {
+						l.try_to::<ConsensusLog<AuthorityId<P>>>(OpaqueDigestItemId::Consensus(
+							&AURA_ENGINE_ID,
+						))
+					})
 					.find_map(|l| match l {
-						ConsensusLog::AuthoritiesChange(a) => Some(
-							vec![(well_known_cache_keys::AUTHORITIES, a.encode())]
-						),
+						ConsensusLog::AuthoritiesChange(a) =>
+							Some(vec![(well_known_cache_keys::AUTHORITIES, a.encode())]),
 						_ => None,
 					});
 
@@ -300,7 +306,7 @@ impl<B: BlockT, C, P, CAW, CIDP> Verifier<B> for AuraVerifier<C, P, CAW, CIDP> w
 				import_block.post_hash = Some(hash);
 
 				Ok((import_block, maybe_keys))
-			}
+			},
 			CheckedHeader::Deferred(a, b) => {
 				debug!(target: "aura", "Checking {:?} failed; {:?}, {:?}.", hash, a, b);
 				telemetry!(
@@ -312,7 +318,7 @@ impl<B: BlockT, C, P, CAW, CIDP> Verifier<B> for AuraVerifier<C, P, CAW, CIDP> w
 					"b" => ?b,
 				);
 				Err(format!("Header {:?} rejected: too far in the future", hash))
-			}
+			},
 		}
 	}
 }
@@ -375,8 +381,9 @@ pub fn import_queue<'a, P, Block, I, C, S, CAW, CIDP>(
 		can_author_with,
 		check_for_equivocation,
 		telemetry,
-	}: ImportQueueParams<'a, Block, I, C, S, CAW, CIDP>
-) -> Result<DefaultImportQueue<Block, C>, sp_consensus::Error> where
+	}: ImportQueueParams<'a, Block, I, C, S, CAW, CIDP>,
+) -> Result<DefaultImportQueue<Block, C>, sp_consensus::Error>
+where
 	Block: BlockT,
 	C::Api: BlockBuilderApi<Block> + AuraApi<Block, AuthorityId<P>> + ApiExt<Block>,
 	C: 'static
@@ -388,7 +395,7 @@ pub fn import_queue<'a, P, Block, I, C, S, CAW, CIDP>(
 		+ AuxStore
 		+ UsageProvider<Block>
 		+ HeaderBackend<Block>,
-	I: BlockImport<Block, Error=ConsensusError, Transaction = sp_api::TransactionFor<C, Block>>
+	I: BlockImport<Block, Error = ConsensusError, Transaction = sp_api::TransactionFor<C, Block>>
 		+ Send
 		+ Sync
 		+ 'static,
@@ -401,23 +408,15 @@ pub fn import_queue<'a, P, Block, I, C, S, CAW, CIDP>(
 	CIDP: CreateInherentDataProviders<Block, ()> + Sync + Send + 'static,
 	CIDP::InherentDataProviders: InherentDataProviderExt + Send + Sync,
 {
-	let verifier = build_verifier::<P, _, _, _>(
-		BuildVerifierParams {
-			client,
-			create_inherent_data_providers,
-			can_author_with,
-			check_for_equivocation,
-			telemetry,
-		},
-	);
+	let verifier = build_verifier::<P, _, _, _>(BuildVerifierParams {
+		client,
+		create_inherent_data_providers,
+		can_author_with,
+		check_for_equivocation,
+		telemetry,
+	});
 
-	Ok(BasicQueue::new(
-		verifier,
-		Box::new(block_import),
-		justification_import,
-		spawner,
-		registry,
-	))
+	Ok(BasicQueue::new(verifier, Box::new(block_import), justification_import, spawner, registry))
 }
 
 /// Parameters of [`build_verifier`].
@@ -442,7 +441,7 @@ pub fn build_verifier<P, C, CIDP, CAW>(
 		can_author_with,
 		check_for_equivocation,
 		telemetry,
-	}: BuildVerifierParams<C, CIDP, CAW>
+	}: BuildVerifierParams<C, CIDP, CAW>,
 ) -> AuraVerifier<C, P, CAW, CIDP> {
 	AuraVerifier::<_, P, _, _>::new(
 		client,
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index 72545eda077b..341b0ed25cc4 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -31,50 +31,53 @@
 //! NOTE: Aura itself is designed to be generic over the crypto used.
 #![forbid(missing_docs, unsafe_code)]
 use std::{
-	sync::Arc, marker::PhantomData, hash::Hash, fmt::Debug, pin::Pin,
 	convert::{TryFrom, TryInto},
+	fmt::Debug,
+	hash::Hash,
+	marker::PhantomData,
+	pin::Pin,
+	sync::Arc,
 };
 
 use futures::prelude::*;
 use log::{debug, trace};
 
-use codec::{Encode, Decode, Codec};
+use codec::{Codec, Decode, Encode};
 
-use sp_consensus::{
-	BlockImport, Environment, Proposer, CanAuthorWith, ForkChoiceStrategy, BlockImportParams,
-	BlockOrigin, Error as ConsensusError, SelectChain, StateAction,
-};
 use sc_client_api::{backend::AuxStore, BlockOf, UsageProvider};
-use sp_blockchain::{Result as CResult, ProvideCache, HeaderBackend};
-use sp_core::crypto::Public;
-use sp_application_crypto::{AppKey, AppPublic};
-use sp_runtime::{generic::BlockId, traits::NumberFor};
-use sp_runtime::traits::{Block as BlockT, Header, DigestItemFor, Zero, Member};
-use sp_api::ProvideRuntimeApi;
-use sp_core::crypto::Pair;
-use sp_keystore::{SyncCryptoStorePtr, SyncCryptoStore};
-use sp_inherents::CreateInherentDataProviders;
-use sc_telemetry::TelemetryHandle;
 use sc_consensus_slots::{
-	SlotInfo, BackoffAuthoringBlocksStrategy, InherentDataProviderExt, StorageChanges,
+	BackoffAuthoringBlocksStrategy, InherentDataProviderExt, SlotInfo, StorageChanges,
+};
+use sc_telemetry::TelemetryHandle;
+use sp_api::ProvideRuntimeApi;
+use sp_application_crypto::{AppKey, AppPublic};
+use sp_blockchain::{HeaderBackend, ProvideCache, Result as CResult};
+use sp_consensus::{
+	BlockImport, BlockImportParams, BlockOrigin, CanAuthorWith, Environment,
+	Error as ConsensusError, ForkChoiceStrategy, Proposer, SelectChain, StateAction,
 };
 use sp_consensus_slots::Slot;
+use sp_core::crypto::{Pair, Public};
+use sp_inherents::CreateInherentDataProviders;
+use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr};
+use sp_runtime::{
+	generic::BlockId,
+	traits::{Block as BlockT, DigestItemFor, Header, Member, NumberFor, Zero},
+};
 
 mod import_queue;
 
-pub use sp_consensus_aura::{
-	ConsensusLog, AuraApi, AURA_ENGINE_ID, digests::CompatibleDigestItem,
-	inherents::{
-		InherentType as AuraInherent,
-		INHERENT_IDENTIFIER, InherentDataProvider,
-	},
-};
-pub use sp_consensus::SyncOracle;
 pub use import_queue::{
-	ImportQueueParams, import_queue, CheckForEquivocation,
-	build_verifier, BuildVerifierParams, AuraVerifier,
+	build_verifier, import_queue, AuraVerifier, BuildVerifierParams, CheckForEquivocation,
+	ImportQueueParams,
 };
 pub use sc_consensus_slots::SlotProportion;
+pub use sp_consensus::SyncOracle;
+pub use sp_consensus_aura::{
+	digests::CompatibleDigestItem,
+	inherents::{InherentDataProvider, InherentType as AuraInherent, INHERENT_IDENTIFIER},
+	AuraApi, ConsensusLog, AURA_ENGINE_ID,
+};
 
 type AuthorityId<P> = <P as Pair>::Public;
 
@@ -82,7 +85,8 @@ type AuthorityId<P> = <P as Pair>::Public;
 pub type SlotDuration = sc_consensus_slots::SlotDuration<sp_consensus_aura::SlotDuration>;
 
 /// Get type of `SlotDuration` for Aura.
-pub fn slot_duration<A, B, C>(client: &C) -> CResult<SlotDuration> where
+pub fn slot_duration<A, B, C>(client: &C) -> CResult<SlotDuration>
+where
 	A: Codec,
 	B: BlockT,
 	C: AuxStore + ProvideRuntimeApi<B> + UsageProvider<B>,
@@ -93,7 +97,9 @@ pub fn slot_duration<A, B, C>(client: &C) -> CResult<SlotDuration> where
 
 /// Get slot author for given block along with authorities.
 fn slot_author<P: Pair>(slot: Slot, authorities: &[AuthorityId<P>]) -> Option<&AuthorityId<P>> {
-	if authorities.is_empty() { return None }
+	if authorities.is_empty() {
+		return None
+	}
 
 	let idx = *slot % (authorities.len() as u64);
 	assert!(
@@ -101,9 +107,10 @@ fn slot_author<P: Pair>(slot: Slot, authorities: &[AuthorityId<P>]) -> Option<&A
 		"It is impossible to have a vector with length beyond the address space; qed",
 	);
 
-	let current_author = authorities.get(idx as usize)
-		.expect("authorities not empty; index constrained to list length;\
-				this is a valid index; qed");
+	let current_author = authorities.get(idx as usize).expect(
+		"authorities not empty; index constrained to list length;\
+				this is a valid index; qed",
+	);
 
 	Some(current_author)
 }
@@ -325,9 +332,8 @@ where
 	type BlockImport = I;
 	type SyncOracle = SO;
 	type JustificationSyncLink = L;
-	type CreateProposer = Pin<Box<
-		dyn Future<Output = Result<E::Proposer, sp_consensus::Error>> + Send + 'static
-	>>;
+	type CreateProposer =
+		Pin<Box<dyn Future<Output = Result<E::Proposer, sp_consensus::Error>> + Send + 'static>>;
 	type Proposer = E::Proposer;
 	type Claim = P::Public;
 	type EpochData = Vec<AuthorityId<P>>;
@@ -376,22 +382,25 @@ where
 		slot: Slot,
 		_claim: &Self::Claim,
 	) -> Vec<sp_runtime::DigestItem<B::Hash>> {
-		vec![
-			<DigestItemFor<B> as CompatibleDigestItem<P::Signature>>::aura_pre_digest(slot),
-		]
+		vec![<DigestItemFor<B> as CompatibleDigestItem<P::Signature>>::aura_pre_digest(slot)]
 	}
 
-	fn block_import_params(&self) -> Box<dyn Fn(
-		B::Header,
-		&B::Hash,
-		Vec<B::Extrinsic>,
-		StorageChanges<sp_api::TransactionFor<C, B>, B>,
-		Self::Claim,
-		Self::EpochData,
-	) -> Result<
-		sp_consensus::BlockImportParams<B, sp_api::TransactionFor<C, B>>,
-		sp_consensus::Error> + Send + 'static>
-	{
+	fn block_import_params(
+		&self,
+	) -> Box<
+		dyn Fn(
+				B::Header,
+				&B::Hash,
+				Vec<B::Extrinsic>,
+				StorageChanges<sp_api::TransactionFor<C, B>, B>,
+				Self::Claim,
+				Self::EpochData,
+			) -> Result<
+				sp_consensus::BlockImportParams<B, sp_api::TransactionFor<C, B>>,
+				sp_consensus::Error,
+			> + Send
+			+ 'static,
+	> {
 		let keystore = self.keystore.clone();
 		Box::new(move |header, header_hash, body, storage_changes, public, _epoch| {
 			// sign the pre-sealed hash of the block and then
@@ -402,28 +411,28 @@ where
 				&*keystore,
 				<AuthorityId<P> as AppKey>::ID,
 				&public_type_pair,
-				header_hash.as_ref()
-			).map_err(|e| sp_consensus::Error::CannotSign(
-				public.clone(), e.to_string(),
-			))?
-			.ok_or_else(|| sp_consensus::Error::CannotSign(
-				public.clone(), "Could not find key in keystore.".into(),
-			))?;
-			let signature = signature.clone().try_into()
-				.map_err(|_| sp_consensus::Error::InvalidSignature(
-					signature, public
-				))?;
-
-			let signature_digest_item = <
-				DigestItemFor<B> as CompatibleDigestItem<P::Signature>
-			>::aura_seal(signature);
+				header_hash.as_ref(),
+			)
+			.map_err(|e| sp_consensus::Error::CannotSign(public.clone(), e.to_string()))?
+			.ok_or_else(|| {
+				sp_consensus::Error::CannotSign(
+					public.clone(),
+					"Could not find key in keystore.".into(),
+				)
+			})?;
+			let signature = signature
+				.clone()
+				.try_into()
+				.map_err(|_| sp_consensus::Error::InvalidSignature(signature, public))?;
+
+			let signature_digest_item =
+				<DigestItemFor<B> as CompatibleDigestItem<P::Signature>>::aura_seal(signature);
 
 			let mut import_block = BlockImportParams::new(BlockOrigin::Own, header);
 			import_block.post_digests.push(signature_digest_item);
 			import_block.body = Some(body);
-			import_block.state_action = StateAction::ApplyChanges(
-				sp_consensus::StorageChanges::Changes(storage_changes)
-			);
+			import_block.state_action =
+				StateAction::ApplyChanges(sp_consensus::StorageChanges::Changes(storage_changes));
 			import_block.fork_choice = Some(ForkChoiceStrategy::LongestChain);
 
 			Ok(import_block)
@@ -443,7 +452,7 @@ where
 					self.client.info().finalized_number,
 					slot,
 					self.logging_target(),
-				);
+				)
 			}
 		}
 		false
@@ -458,9 +467,11 @@ where
 	}
 
 	fn proposer(&mut self, block: &B::Header) -> Self::CreateProposer {
-		Box::pin(self.env.init(block).map_err(|e| {
-			sp_consensus::Error::ClientImport(format!("{:?}", e)).into()
-		}))
+		Box::pin(
+			self.env
+				.init(block)
+				.map_err(|e| sp_consensus::Error::ClientImport(format!("{:?}", e)).into()),
+		)
 	}
 
 	fn telemetry(&self) -> Option<TelemetryHandle> {
@@ -515,7 +526,7 @@ impl<B: BlockT> std::convert::From<Error<B>> for String {
 
 fn find_pre_digest<B: BlockT, Signature: Codec>(header: &B::Header) -> Result<Slot, Error<B>> {
 	if header.number().is_zero() {
-		return Ok(0.into());
+		return Ok(0.into())
 	}
 
 	let mut pre_digest: Option<Slot> = None;
@@ -530,13 +541,15 @@ fn find_pre_digest<B: BlockT, Signature: Codec>(header: &B::Header) -> Result<Sl
 	pre_digest.ok_or_else(|| aura_err(Error::NoDigestFound))
 }
 
-fn authorities<A, B, C>(client: &C, at: &BlockId<B>) -> Result<Vec<A>, ConsensusError> where
+fn authorities<A, B, C>(client: &C, at: &BlockId<B>) -> Result<Vec<A>, ConsensusError>
+where
 	A: Codec + Debug,
 	B: BlockT,
 	C: ProvideRuntimeApi<B> + BlockOf + ProvideCache<B>,
 	C::Api: AuraApi<B, A>,
 {
-	client.runtime_api()
+	client
+		.runtime_api()
 		.authorities(at)
 		.ok()
 		.ok_or_else(|| sp_consensus::Error::InvalidAuthoritiesSet.into())
@@ -545,26 +558,31 @@ fn authorities<A, B, C>(client: &C, at: &BlockId<B>) -> Result<Vec<A>, Consensus
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use sp_consensus::{
-		NoNetwork as DummyOracle, Proposal, AlwaysCanAuthor, DisableProofRecording,
-		import_queue::BoxJustificationImport, SlotData,
-	};
-	use sc_network_test::{Block as TestBlock, *};
-	use sp_runtime::traits::{Block as BlockT, DigestFor};
-	use sc_network::config::ProtocolConfig;
 	use parking_lot::Mutex;
-	use sp_keyring::sr25519::Keyring;
-	use sc_client_api::BlockchainEvents;
-	use sp_consensus_aura::sr25519::AuthorityPair;
-	use sc_consensus_slots::{SimpleSlotWorker, BackoffAuthoringOnFinalizedHeadLagging};
-	use std::{task::Poll, time::{Instant, Duration}};
 	use sc_block_builder::BlockBuilderProvider;
-	use sp_runtime::traits::Header as _;
-	use substrate_test_runtime_client::{TestClient, runtime::{Header, H256}};
+	use sc_client_api::BlockchainEvents;
+	use sc_consensus_slots::{BackoffAuthoringOnFinalizedHeadLagging, SimpleSlotWorker};
 	use sc_keystore::LocalKeystore;
+	use sc_network::config::ProtocolConfig;
+	use sc_network_test::{Block as TestBlock, *};
 	use sp_application_crypto::key_types::AURA;
+	use sp_consensus::{
+		import_queue::BoxJustificationImport, AlwaysCanAuthor, DisableProofRecording,
+		NoNetwork as DummyOracle, Proposal, SlotData,
+	};
+	use sp_consensus_aura::sr25519::AuthorityPair;
 	use sp_inherents::InherentData;
+	use sp_keyring::sr25519::Keyring;
+	use sp_runtime::traits::{Block as BlockT, DigestFor, Header as _};
 	use sp_timestamp::InherentDataProvider as TimestampInherentDataProvider;
+	use std::{
+		task::Poll,
+		time::{Duration, Instant},
+	};
+	use substrate_test_runtime_client::{
+		runtime::{Header, H256},
+		TestClient,
+	};
 
 	type Error = sp_blockchain::Error;
 
@@ -576,19 +594,15 @@ mod tests {
 		type CreateProposer = futures::future::Ready<Result<DummyProposer, Error>>;
 		type Error = Error;
 
-		fn init(&mut self, parent_header: &<TestBlock as BlockT>::Header)
-			-> Self::CreateProposer
-		{
+		fn init(&mut self, parent_header: &<TestBlock as BlockT>::Header) -> Self::CreateProposer {
 			futures::future::ready(Ok(DummyProposer(parent_header.number + 1, self.0.clone())))
 		}
 	}
 
 	impl Proposer<TestBlock> for DummyProposer {
 		type Error = Error;
-		type Transaction = sc_client_api::TransactionFor<
-			substrate_test_runtime_client::Backend,
-			TestBlock
-		>;
+		type Transaction =
+			sc_client_api::TransactionFor<substrate_test_runtime_client::Backend, TestBlock>;
 		type Proposal = future::Ready<Result<Proposal<TestBlock, Self::Transaction, ()>, Error>>;
 		type ProofRecording = DisableProofRecording;
 		type Proof = ();
@@ -616,11 +630,13 @@ mod tests {
 		PeersFullClient,
 		AuthorityPair,
 		AlwaysCanAuthor,
-		Box<dyn CreateInherentDataProviders<
-			TestBlock,
-			(),
-			InherentDataProviders = (TimestampInherentDataProvider, InherentDataProvider)
-		>>
+		Box<
+			dyn CreateInherentDataProviders<
+				TestBlock,
+				(),
+				InherentDataProviders = (TimestampInherentDataProvider, InherentDataProvider),
+			>,
+		>,
 	>;
 	type AuraPeer = Peer<(), PeersClient>;
 
@@ -635,14 +651,15 @@ mod tests {
 
 		/// Create new test network with peers and given config.
 		fn from_config(_config: &ProtocolConfig) -> Self {
-			AuraTestNet {
-				peers: Vec::new(),
-			}
+			AuraTestNet { peers: Vec::new() }
 		}
 
-		fn make_verifier(&self, client: PeersClient, _cfg: &ProtocolConfig, _peer_data: &())
-			-> Self::Verifier
-		{
+		fn make_verifier(
+			&self,
+			client: PeersClient,
+			_cfg: &ProtocolConfig,
+			_peer_data: &(),
+		) -> Self::Verifier {
 			match client {
 				PeersClient::Full(client, _) => {
 					let slot_duration = slot_duration(&*client).expect("slot duration available");
@@ -668,7 +685,10 @@ mod tests {
 			}
 		}
 
-		fn make_block_import(&self, client: PeersClient) -> (
+		fn make_block_import(
+			&self,
+			client: PeersClient,
+		) -> (
 			BlockImportAdapter<Self::BlockImport>,
 			Option<BoxJustificationImport<Block>>,
 			Self::PeerData,
@@ -693,11 +713,7 @@ mod tests {
 		sp_tracing::try_init_simple();
 		let net = AuraTestNet::new(3);
 
-		let peers = &[
-			(0, Keyring::Alice),
-			(1, Keyring::Bob),
-			(2, Keyring::Charlie),
-		];
+		let peers = &[(0, Keyring::Alice), (1, Keyring::Bob), (2, Keyring::Charlie)];
 
 		let net = Arc::new(Mutex::new(net));
 		let mut import_notifications = Vec::new();
@@ -710,9 +726,9 @@ mod tests {
 			let client = peer.client().as_full().expect("full clients are created").clone();
 			let select_chain = peer.select_chain().expect("full client has a select chain");
 			let keystore_path = tempfile::tempdir().expect("Creates keystore path");
-			let keystore = Arc::new(LocalKeystore::open(keystore_path.path(), None)
-				.expect("Creates keystore."));
-
+			let keystore = Arc::new(
+				LocalKeystore::open(keystore_path.path(), None).expect("Creates keystore."),
+			);
 
 			SyncCryptoStore::sr25519_generate_new(&*keystore, AURA, Some(&key.to_seed()))
 				.expect("Creates authority key");
@@ -720,38 +736,46 @@ mod tests {
 
 			let environ = DummyFactory(client.clone());
 			import_notifications.push(
-				client.import_notification_stream()
-					.take_while(|n| future::ready(!(n.origin != BlockOrigin::Own && n.header.number() < &5)))
-					.for_each(move |_| future::ready(()))
+				client
+					.import_notification_stream()
+					.take_while(|n| {
+						future::ready(!(n.origin != BlockOrigin::Own && n.header.number() < &5))
+					})
+					.for_each(move |_| future::ready(())),
 			);
 
 			let slot_duration = slot_duration(&*client).expect("slot duration available");
 
-			aura_futures.push(start_aura::<AuthorityPair, _, _, _, _, _, _, _, _, _, _, _>(StartAuraParams {
-				slot_duration,
-				block_import: client.clone(),
-				select_chain,
-				client,
-				proposer_factory: environ,
-				sync_oracle: DummyOracle,
-				justification_sync_link: (),
-				create_inherent_data_providers: |_, _| async {
-					let timestamp = TimestampInherentDataProvider::from_system_time();
-					let slot = InherentDataProvider::from_timestamp_and_duration(
-						*timestamp,
-						Duration::from_secs(6),
-					);
-
-					Ok((timestamp, slot))
-				},
-				force_authoring: false,
-				backoff_authoring_blocks: Some(BackoffAuthoringOnFinalizedHeadLagging::default()),
-				keystore,
-				can_author_with: sp_consensus::AlwaysCanAuthor,
-				block_proposal_slot_portion: SlotProportion::new(0.5),
-				max_block_proposal_slot_portion: None,
-				telemetry: None,
-			}).expect("Starts aura"));
+			aura_futures.push(
+				start_aura::<AuthorityPair, _, _, _, _, _, _, _, _, _, _, _>(StartAuraParams {
+					slot_duration,
+					block_import: client.clone(),
+					select_chain,
+					client,
+					proposer_factory: environ,
+					sync_oracle: DummyOracle,
+					justification_sync_link: (),
+					create_inherent_data_providers: |_, _| async {
+						let timestamp = TimestampInherentDataProvider::from_system_time();
+						let slot = InherentDataProvider::from_timestamp_and_duration(
+							*timestamp,
+							Duration::from_secs(6),
+						);
+
+						Ok((timestamp, slot))
+					},
+					force_authoring: false,
+					backoff_authoring_blocks: Some(
+						BackoffAuthoringOnFinalizedHeadLagging::default(),
+					),
+					keystore,
+					can_author_with: sp_consensus::AlwaysCanAuthor,
+					block_proposal_slot_portion: SlotProportion::new(0.5),
+					max_block_proposal_slot_portion: None,
+					telemetry: None,
+				})
+				.expect("Starts aura"),
+			);
 		}
 
 		futures::executor::block_on(future::select(
@@ -759,10 +783,7 @@ mod tests {
 				net.lock().poll(cx);
 				Poll::<()>::Pending
 			}),
-			future::select(
-				future::join_all(aura_futures),
-				future::join_all(import_notifications)
-			)
+			future::select(future::join_all(aura_futures), future::join_all(import_notifications)),
 		));
 	}
 
@@ -771,11 +792,14 @@ mod tests {
 		let client = substrate_test_runtime_client::new();
 
 		assert_eq!(client.chain_info().best_number, 0);
-		assert_eq!(authorities(&client, &BlockId::Number(0)).unwrap(), vec![
-			Keyring::Alice.public().into(),
-			Keyring::Bob.public().into(),
-			Keyring::Charlie.public().into()
-		]);
+		assert_eq!(
+			authorities(&client, &BlockId::Number(0)).unwrap(),
+			vec![
+				Keyring::Alice.public().into(),
+				Keyring::Bob.public().into(),
+				Keyring::Charlie.public().into()
+			]
+		);
 	}
 
 	#[test]
@@ -785,12 +809,11 @@ mod tests {
 		let mut authorities = vec![
 			Keyring::Alice.public().into(),
 			Keyring::Bob.public().into(),
-			Keyring::Charlie.public().into()
+			Keyring::Charlie.public().into(),
 		];
 
 		let keystore_path = tempfile::tempdir().expect("Creates keystore path");
-		let keystore = LocalKeystore::open(keystore_path.path(), None)
-			.expect("Creates keystore.");
+		let keystore = LocalKeystore::open(keystore_path.path(), None).expect("Creates keystore.");
 		let public = SyncCryptoStore::sr25519_generate_new(&keystore, AuthorityPair::ID, None)
 			.expect("Key should be created");
 		authorities.push(public.into());
@@ -822,7 +845,7 @@ mod tests {
 			H256::from_low_u64_be(0),
 			H256::from_low_u64_be(0),
 			Default::default(),
-			Default::default()
+			Default::default(),
 		);
 		assert!(worker.claim_slot(&head, 0.into(), &authorities).is_none());
 		assert!(worker.claim_slot(&head, 1.into(), &authorities).is_none());
@@ -839,12 +862,13 @@ mod tests {
 		let net = AuraTestNet::new(4);
 
 		let keystore_path = tempfile::tempdir().expect("Creates keystore path");
-		let keystore = LocalKeystore::open(keystore_path.path(), None)
-			.expect("Creates keystore.");
+		let keystore = LocalKeystore::open(keystore_path.path(), None).expect("Creates keystore.");
 		SyncCryptoStore::sr25519_generate_new(
 			&keystore,
-			AuthorityPair::ID, Some(&Keyring::Alice.to_seed()),
-		).expect("Key should be created");
+			AuthorityPair::ID,
+			Some(&Keyring::Alice.to_seed()),
+		)
+		.expect("Key should be created");
 
 		let net = Arc::new(Mutex::new(net));
 
@@ -870,17 +894,16 @@ mod tests {
 
 		let head = client.header(&BlockId::Number(0)).unwrap().unwrap();
 
-		let res = futures::executor::block_on(worker.on_slot(
-			SlotInfo {
-				slot: 0.into(),
-				timestamp: 0.into(),
-				ends_at: Instant::now() + Duration::from_secs(100),
-				inherent_data: InherentData::new(),
-				duration: Duration::from_millis(1000),
-				chain_head: head,
-				block_size_limit: None,
-			}
-		)).unwrap();
+		let res = futures::executor::block_on(worker.on_slot(SlotInfo {
+			slot: 0.into(),
+			timestamp: 0.into(),
+			ends_at: Instant::now() + Duration::from_secs(100),
+			inherent_data: InherentData::new(),
+			duration: Duration::from_millis(1000),
+			chain_head: head,
+			block_size_limit: None,
+		}))
+		.unwrap();
 
 		// The returned block should be imported and we should be able to get its header by now.
 		assert!(client.header(&BlockId::Hash(res.block.hash())).unwrap().is_some());
diff --git a/client/consensus/babe/rpc/src/lib.rs b/client/consensus/babe/rpc/src/lib.rs
index e16c24acaca3..e85a43065537 100644
--- a/client/consensus/babe/rpc/src/lib.rs
+++ b/client/consensus/babe/rpc/src/lib.rs
@@ -18,30 +18,21 @@
 
 //! RPC api for babe.
 
-use sc_consensus_babe::{Epoch, authorship, Config};
 use futures::{FutureExt as _, TryFutureExt as _};
-use jsonrpc_core::{
-	Error as RpcError,
-	futures::future as rpc_future,
-};
+use jsonrpc_core::{futures::future as rpc_future, Error as RpcError};
 use jsonrpc_derive::rpc;
+use sc_consensus_babe::{authorship, Config, Epoch};
 use sc_consensus_epochs::{descendent_query, Epoch as EpochT, SharedEpochChanges};
-use sp_consensus_babe::{
-	AuthorityId,
-	BabeApi as BabeRuntimeApi,
-	digests::PreDigest,
-};
+use sc_rpc_api::DenyUnsafe;
 use serde::{Deserialize, Serialize};
-use sp_core::{
-	crypto::Public,
-};
+use sp_api::{BlockId, ProvideRuntimeApi};
 use sp_application_crypto::AppKey;
-use sp_keystore::{SyncCryptoStorePtr, SyncCryptoStore};
-use sc_rpc_api::DenyUnsafe;
-use sp_api::{ProvideRuntimeApi, BlockId};
+use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
+use sp_consensus::{Error as ConsensusError, SelectChain};
+use sp_consensus_babe::{digests::PreDigest, AuthorityId, BabeApi as BabeRuntimeApi};
+use sp_core::crypto::Public;
+use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr};
 use sp_runtime::traits::{Block as BlockT, Header as _};
-use sp_consensus::{SelectChain, Error as ConsensusError};
-use sp_blockchain::{HeaderBackend, HeaderMetadata, Error as BlockChainError};
 use std::{collections::HashMap, sync::Arc};
 
 type FutureResult<T> = Box<dyn rpc_future::Future<Item = T, Error = RpcError> + Send>;
@@ -81,14 +72,7 @@ impl<B: BlockT, C, SC> BabeRpcHandler<B, C, SC> {
 		select_chain: SC,
 		deny_unsafe: DenyUnsafe,
 	) -> Self {
-		Self {
-			client,
-			shared_epoch_changes,
-			keystore,
-			babe_config,
-			select_chain,
-			deny_unsafe,
-		}
+		Self { client, shared_epoch_changes, keystore, babe_config, select_chain, deny_unsafe }
 	}
 }
 
@@ -104,16 +88,10 @@ where
 {
 	fn epoch_authorship(&self) -> FutureResult<HashMap<AuthorityId, EpochAuthorship>> {
 		if let Err(err) = self.deny_unsafe.check_if_safe() {
-			return Box::new(rpc_future::err(err.into()));
+			return Box::new(rpc_future::err(err.into()))
 		}
 
-		let (
-			babe_config,
-			keystore,
-			shared_epoch,
-			client,
-			select_chain,
-		) = (
+		let (babe_config, keystore, shared_epoch, client, select_chain) = (
 			self.babe_config.clone(),
 			self.keystore.clone(),
 			self.shared_epoch_changes.clone(),
@@ -126,14 +104,9 @@ where
 				.runtime_api()
 				.current_epoch_start(&BlockId::Hash(header.hash()))
 				.map_err(|err| Error::StringError(format!("{:?}", err)))?;
-			let epoch = epoch_data(
-				&shared_epoch,
-				&client,
-				&babe_config,
-				*epoch_start,
-				&select_chain,
-			)
-			.await?;
+			let epoch =
+				epoch_data(&shared_epoch, &client, &babe_config, *epoch_start, &select_chain)
+					.await?;
 			let (epoch_start, epoch_end) = (epoch.start_slot(), epoch.end_slot());
 
 			let mut claims: HashMap<AuthorityId, EpochAuthorship> = HashMap::new();
@@ -163,10 +136,10 @@ where
 					match claim {
 						PreDigest::Primary { .. } => {
 							claims.entry(key).or_default().primary.push(slot);
-						}
+						},
 						PreDigest::SecondaryPlain { .. } => {
 							claims.entry(key).or_default().secondary.push(slot);
-						}
+						},
 						PreDigest::SecondaryVRF { .. } => {
 							claims.entry(key).or_default().secondary_vrf.push(slot.into());
 						},
@@ -199,7 +172,7 @@ pub enum Error {
 	/// Consensus error
 	Consensus(ConsensusError),
 	/// Errors that can be formatted as a String
-	StringError(String)
+	StringError(String),
 }
 
 impl From<Error> for jsonrpc_core::Error {
@@ -226,13 +199,15 @@ where
 	SC: SelectChain<B>,
 {
 	let parent = select_chain.best_chain().await?;
-	epoch_changes.shared_data().epoch_data_for_child_of(
-		descendent_query(&**client),
-		&parent.hash(),
-		parent.number().clone(),
-		slot.into(),
-		|slot| Epoch::genesis(&babe_config, slot),
-	)
+	epoch_changes
+		.shared_data()
+		.epoch_data_for_child_of(
+			descendent_query(&**client),
+			&parent.hash(),
+			parent.number().clone(),
+			slot.into(),
+			|slot| Epoch::genesis(&babe_config, slot),
+		)
 		.map_err(|e| Error::Consensus(ConsensusError::ChainLookup(format!("{:?}", e))))?
 		.ok_or(Error::Consensus(ConsensusError::InvalidAuthoritiesSet))
 }
@@ -240,31 +215,27 @@ where
 #[cfg(test)]
 mod tests {
 	use super::*;
+	use sc_keystore::LocalKeystore;
+	use sp_application_crypto::AppPair;
+	use sp_core::crypto::key_types::BABE;
+	use sp_keyring::Sr25519Keyring;
+	use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr};
 	use substrate_test_runtime_client::{
-		runtime::Block,
-		Backend,
-		DefaultTestClientBuilderExt,
-		TestClient,
+		runtime::Block, Backend, DefaultTestClientBuilderExt, TestClient, TestClientBuilder,
 		TestClientBuilderExt,
-		TestClientBuilder,
 	};
-	use sp_application_crypto::AppPair;
-	use sp_keyring::Sr25519Keyring;
-	use sp_core::{crypto::key_types::BABE};
-	use sp_keystore::{SyncCryptoStorePtr, SyncCryptoStore};
-	use sc_keystore::LocalKeystore;
 
-	use std::sync::Arc;
-	use sc_consensus_babe::{Config, block_import, AuthorityPair};
 	use jsonrpc_core::IoHandler;
+	use sc_consensus_babe::{block_import, AuthorityPair, Config};
+	use std::sync::Arc;
 
 	/// creates keystore backed by a temp file
 	fn create_temp_keystore<P: AppPair>(
 		authority: Sr25519Keyring,
 	) -> (SyncCryptoStorePtr, tempfile::TempDir) {
 		let keystore_path = tempfile::tempdir().expect("Creates keystore path");
-		let keystore = Arc::new(LocalKeystore::open(keystore_path.path(), None)
-			.expect("Creates keystore"));
+		let keystore =
+			Arc::new(LocalKeystore::open(keystore_path.path(), None).expect("Creates keystore"));
 		SyncCryptoStore::sr25519_generate_new(&*keystore, BABE, Some(&authority.to_seed()))
 			.expect("Creates authority key");
 
@@ -272,17 +243,14 @@ mod tests {
 	}
 
 	fn test_babe_rpc_handler(
-		deny_unsafe: DenyUnsafe
+		deny_unsafe: DenyUnsafe,
 	) -> BabeRpcHandler<Block, TestClient, sc_consensus::LongestChain<Backend, Block>> {
 		let builder = TestClientBuilder::new();
 		let (client, longest_chain) = builder.build_with_longest_chain();
 		let client = Arc::new(client);
 		let config = Config::get_or_compute(&*client).expect("config available");
-		let (_, link) = block_import(
-			config.clone(),
-			client.clone(),
-			client.clone(),
-		).expect("can initialize block-import");
+		let (_, link) = block_import(config.clone(), client.clone(), client.clone())
+			.expect("can initialize block-import");
 
 		let epoch_changes = link.epoch_changes().clone();
 		let keystore = create_temp_keystore::<AuthorityPair>(Sr25519Keyring::Alice).0;
diff --git a/client/consensus/babe/src/authorship.rs b/client/consensus/babe/src/authorship.rs
index 2a90ca3b94c0..609f96c83c19 100644
--- a/client/consensus/babe/src/authorship.rs
+++ b/client/consensus/babe/src/authorship.rs
@@ -18,23 +18,17 @@
 
 //! BABE authority selection and slot claiming.
 
+use super::Epoch;
+use codec::Encode;
+use schnorrkel::{keys::PublicKey, vrf::VRFInOut};
 use sp_application_crypto::AppKey;
 use sp_consensus_babe::{
-	BABE_VRF_PREFIX, AuthorityId, BabeAuthorityWeight, make_transcript, make_transcript_data,
-	Slot,
-};
-use sp_consensus_babe::digests::{
-	PreDigest, PrimaryPreDigest, SecondaryPlainPreDigest, SecondaryVRFPreDigest,
+	digests::{PreDigest, PrimaryPreDigest, SecondaryPlainPreDigest, SecondaryVRFPreDigest},
+	make_transcript, make_transcript_data, AuthorityId, BabeAuthorityWeight, Slot, BABE_VRF_PREFIX,
 };
 use sp_consensus_vrf::schnorrkel::{VRFOutput, VRFProof};
-use sp_core::{U256, blake2_256, crypto::Public};
-use sp_keystore::{SyncCryptoStorePtr, SyncCryptoStore};
-use codec::Encode;
-use schnorrkel::{
-	keys::PublicKey,
-	vrf::VRFInOut,
-};
-use super::Epoch;
+use sp_core::{blake2_256, crypto::Public, U256};
+use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr};
 
 /// Calculates the primary selection threshold for a given authority, taking
 /// into account `c` (`1 - c` represents the probability of a slot being empty).
@@ -49,8 +43,7 @@ pub(super) fn calculate_primary_threshold(
 
 	let c = c.0 as f64 / c.1 as f64;
 
-	let theta =
-		authorities[authority_index].1 as f64 /
+	let theta = authorities[authority_index].1 as f64 /
 		authorities.iter().map(|(_, weight)| weight).sum::<u64>() as f64;
 
 	assert!(theta > 0.0, "authority with weight 0.");
@@ -74,14 +67,14 @@ pub(super) fn calculate_primary_threshold(
 		"returns None when the given value is negative; \
 		 p is defined as `1 - n` where n is defined in (0, 1]; \
 		 p must be a value in [0, 1); \
-		 qed."
+		 qed.",
 	);
 
 	let denom = p.denom().to_biguint().expect(
 		"returns None when the given value is negative; \
 		 p is defined as `1 - n` where n is defined in (0, 1]; \
 		 p must be a value in [0, 1); \
-		 qed."
+		 qed.",
 	);
 
 	((BigUint::one() << 128) * numer / denom).to_u128().expect(
@@ -108,7 +101,7 @@ pub(super) fn secondary_slot_author(
 	randomness: [u8; 32],
 ) -> Option<&AuthorityId> {
 	if authorities.is_empty() {
-		return None;
+		return None
 	}
 
 	let rand = U256::from((randomness, slot).using_encoded(blake2_256));
@@ -116,9 +109,10 @@ pub(super) fn secondary_slot_author(
 	let authorities_len = U256::from(authorities.len());
 	let idx = rand % authorities_len;
 
-	let expected_author = authorities.get(idx.as_u32() as usize)
-		.expect("authorities not empty; index constrained to list length; \
-				this is a valid index; qed");
+	let expected_author = authorities.get(idx.as_u32() as usize).expect(
+		"authorities not empty; index constrained to list length; \
+				this is a valid index; qed",
+	);
 
 	Some(&expected_author.0)
 }
@@ -136,23 +130,15 @@ fn claim_secondary_slot(
 	let Epoch { authorities, randomness, epoch_index, .. } = epoch;
 
 	if authorities.is_empty() {
-		return None;
+		return None
 	}
 
-	let expected_author = secondary_slot_author(
-		slot,
-		authorities,
-		*randomness,
-	)?;
+	let expected_author = secondary_slot_author(slot, authorities, *randomness)?;
 
 	for (authority_id, authority_index) in keys {
 		if authority_id == expected_author {
 			let pre_digest = if author_secondary_vrf {
-				let transcript_data = make_transcript_data(
-					randomness,
-					slot,
-					*epoch_index,
-				);
+				let transcript_data = make_transcript_data(randomness, slot, *epoch_index);
 				let result = SyncCryptoStore::sr25519_vrf_sign(
 					&**keystore,
 					AuthorityId::ID,
@@ -169,7 +155,10 @@ fn claim_secondary_slot(
 				} else {
 					None
 				}
-			} else if SyncCryptoStore::has_keys(&**keystore, &[(authority_id.to_raw_vec(), AuthorityId::ID)]) {
+			} else if SyncCryptoStore::has_keys(
+				&**keystore,
+				&[(authority_id.to_raw_vec(), AuthorityId::ID)],
+			) {
 				Some(PreDigest::SecondaryPlain(SecondaryPlainPreDigest {
 					slot,
 					authority_index: *authority_index as u32,
@@ -179,7 +168,7 @@ fn claim_secondary_slot(
 			};
 
 			if let Some(pre_digest) = pre_digest {
-				return Some((pre_digest, authority_id.clone()));
+				return Some((pre_digest, authority_id.clone()))
 			}
 		}
 	}
@@ -196,7 +185,9 @@ pub fn claim_slot(
 	epoch: &Epoch,
 	keystore: &SyncCryptoStorePtr,
 ) -> Option<(PreDigest, AuthorityId)> {
-	let authorities = epoch.authorities.iter()
+	let authorities = epoch
+		.authorities
+		.iter()
 		.enumerate()
 		.map(|(index, a)| (a.0.clone(), index))
 		.collect::<Vec<_>>();
@@ -211,22 +202,21 @@ pub fn claim_slot_using_keys(
 	keystore: &SyncCryptoStorePtr,
 	keys: &[(AuthorityId, usize)],
 ) -> Option<(PreDigest, AuthorityId)> {
-	claim_primary_slot(slot, epoch, epoch.config.c, keystore, &keys)
-		.or_else(|| {
-			if epoch.config.allowed_slots.is_secondary_plain_slots_allowed() ||
-				epoch.config.allowed_slots.is_secondary_vrf_slots_allowed()
-			{
-				claim_secondary_slot(
-					slot,
-					&epoch,
-					keys,
-					&keystore,
-					epoch.config.allowed_slots.is_secondary_vrf_slots_allowed(),
-				)
-			} else {
-				None
-			}
-		})
+	claim_primary_slot(slot, epoch, epoch.config.c, keystore, &keys).or_else(|| {
+		if epoch.config.allowed_slots.is_secondary_plain_slots_allowed() ||
+			epoch.config.allowed_slots.is_secondary_vrf_slots_allowed()
+		{
+			claim_secondary_slot(
+				slot,
+				&epoch,
+				keys,
+				&keystore,
+				epoch.config.allowed_slots.is_secondary_vrf_slots_allowed(),
+			)
+		} else {
+			None
+		}
+	})
 }
 
 /// Claim a primary slot if it is our turn.  Returns `None` if it is not our turn.
@@ -243,16 +233,8 @@ fn claim_primary_slot(
 	let Epoch { authorities, randomness, epoch_index, .. } = epoch;
 
 	for (authority_id, authority_index) in keys {
-		let transcript = make_transcript(
-			randomness,
-			slot,
-			*epoch_index
-		);
-		let transcript_data = make_transcript_data(
-			randomness,
-			slot,
-			*epoch_index
-		);
+		let transcript = make_transcript(randomness, slot, *epoch_index);
+		let transcript_data = make_transcript_data(randomness, slot, *epoch_index);
 		// Compute the threshold we will use.
 		//
 		// We already checked that authorities contains `key.public()`, so it can't
@@ -279,7 +261,7 @@ fn claim_primary_slot(
 					authority_index: *authority_index as u32,
 				});
 
-				return Some((pre_digest, authority_id.clone()));
+				return Some((pre_digest, authority_id.clone()))
 			}
 		}
 	}
@@ -290,10 +272,10 @@ fn claim_primary_slot(
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use std::sync::Arc;
-	use sp_core::{sr25519::Pair, crypto::Pair as _};
-	use sp_consensus_babe::{AuthorityId, BabeEpochConfiguration, AllowedSlots};
 	use sc_keystore::LocalKeystore;
+	use sp_consensus_babe::{AllowedSlots, AuthorityId, BabeEpochConfiguration};
+	use sp_core::{crypto::Pair as _, sr25519::Pair};
+	use std::sync::Arc;
 
 	#[test]
 	fn claim_secondary_plain_slot_works() {
@@ -302,7 +284,8 @@ mod tests {
 			&*keystore,
 			AuthorityId::ID,
 			Some(sp_core::crypto::DEV_PHRASE),
-		).unwrap();
+		)
+		.unwrap();
 
 		let authorities = vec![
 			(AuthorityId::from(Pair::generate().0.public()), 5),
diff --git a/client/consensus/babe/src/aux_schema.rs b/client/consensus/babe/src/aux_schema.rs
index 69c1a1930bbb..4be7dff3eedc 100644
--- a/client/consensus/babe/src/aux_schema.rs
+++ b/client/consensus/babe/src/aux_schema.rs
@@ -18,15 +18,15 @@
 
 //! Schema for BABE epoch changes in the aux-db.
 
-use log::info;
 use codec::{Decode, Encode};
+use log::info;
 
+use crate::{migration::EpochV0, Epoch};
 use sc_client_api::backend::AuxStore;
-use sp_blockchain::{Result as ClientResult, Error as ClientError};
-use sp_runtime::traits::Block as BlockT;
+use sc_consensus_epochs::{migration::EpochChangesForV0, EpochChangesFor, SharedEpochChanges};
+use sp_blockchain::{Error as ClientError, Result as ClientResult};
 use sp_consensus_babe::{BabeBlockWeight, BabeGenesisConfiguration};
-use sc_consensus_epochs::{EpochChangesFor, SharedEpochChanges, migration::EpochChangesForV0};
-use crate::{Epoch, migration::EpochV0};
+use sp_runtime::traits::Block as BlockT;
 
 const BABE_EPOCH_CHANGES_VERSION: &[u8] = b"babe_epoch_changes_version";
 const BABE_EPOCH_CHANGES_KEY: &[u8] = b"babe_epoch_changes";
@@ -38,16 +38,16 @@ pub fn block_weight_key<H: Encode>(block_hash: H) -> Vec<u8> {
 }
 
 fn load_decode<B, T>(backend: &B, key: &[u8]) -> ClientResult<Option<T>>
-	where
-		B: AuxStore,
-		T: Decode,
+where
+	B: AuxStore,
+	T: Decode,
 {
 	let corrupt = |e: codec::Error| {
 		ClientError::Backend(format!("BABE DB is corrupted. Decode error: {}", e))
 	};
 	match backend.get_aux(key)? {
 		None => Ok(None),
-		Some(t) => T::decode(&mut &t[..]).map(Some).map_err(corrupt)
+		Some(t) => T::decode(&mut &t[..]).map(Some).map_err(corrupt),
 	}
 }
 
@@ -59,32 +59,26 @@ pub fn load_epoch_changes<Block: BlockT, B: AuxStore>(
 	let version = load_decode::<_, u32>(backend, BABE_EPOCH_CHANGES_VERSION)?;
 
 	let maybe_epoch_changes = match version {
-		None => load_decode::<_, EpochChangesForV0<Block, EpochV0>>(
-			backend,
-			BABE_EPOCH_CHANGES_KEY,
-		)?.map(|v0| v0.migrate().map(|_, _, epoch| epoch.migrate(config))),
-		Some(1) => load_decode::<_, EpochChangesFor<Block, EpochV0>>(
-			backend,
-			BABE_EPOCH_CHANGES_KEY,
-		)?.map(|v1| v1.map(|_, _, epoch| epoch.migrate(config))),
-		Some(BABE_EPOCH_CHANGES_CURRENT_VERSION) => load_decode::<_, EpochChangesFor<Block, Epoch>>(
-			backend,
-			BABE_EPOCH_CHANGES_KEY,
-		)?,
-		Some(other) => {
-			return Err(ClientError::Backend(
-				format!("Unsupported BABE DB version: {:?}", other)
-			))
-		},
+		None =>
+			load_decode::<_, EpochChangesForV0<Block, EpochV0>>(backend, BABE_EPOCH_CHANGES_KEY)?
+				.map(|v0| v0.migrate().map(|_, _, epoch| epoch.migrate(config))),
+		Some(1) =>
+			load_decode::<_, EpochChangesFor<Block, EpochV0>>(backend, BABE_EPOCH_CHANGES_KEY)?
+				.map(|v1| v1.map(|_, _, epoch| epoch.migrate(config))),
+		Some(BABE_EPOCH_CHANGES_CURRENT_VERSION) =>
+			load_decode::<_, EpochChangesFor<Block, Epoch>>(backend, BABE_EPOCH_CHANGES_KEY)?,
+		Some(other) =>
+			return Err(ClientError::Backend(format!("Unsupported BABE DB version: {:?}", other))),
 	};
 
-	let epoch_changes = SharedEpochChanges::<Block, Epoch>::new(maybe_epoch_changes.unwrap_or_else(|| {
-		info!(
-			target: "babe",
-			"👶 Creating empty BABE epoch changes on what appears to be first startup.",
-		);
-		EpochChangesFor::<Block, Epoch>::default()
-	}));
+	let epoch_changes =
+		SharedEpochChanges::<Block, Epoch>::new(maybe_epoch_changes.unwrap_or_else(|| {
+			info!(
+				target: "babe",
+				"👶 Creating empty BABE epoch changes on what appears to be first startup.",
+			);
+			EpochChangesFor::<Block, Epoch>::default()
+		}));
 
 	// rebalance the tree after deserialization. this isn't strictly necessary
 	// since the tree is now rebalanced on every update operation. but since the
@@ -99,15 +93,16 @@ pub fn load_epoch_changes<Block: BlockT, B: AuxStore>(
 pub(crate) fn write_epoch_changes<Block: BlockT, F, R>(
 	epoch_changes: &EpochChangesFor<Block, Epoch>,
 	write_aux: F,
-) -> R where
+) -> R
+where
 	F: FnOnce(&[(&'static [u8], &[u8])]) -> R,
 {
 	BABE_EPOCH_CHANGES_CURRENT_VERSION.using_encoded(|version| {
 		let encoded_epoch_changes = epoch_changes.encode();
-		write_aux(
-			&[(BABE_EPOCH_CHANGES_KEY, encoded_epoch_changes.as_slice()),
-			  (BABE_EPOCH_CHANGES_VERSION, version)],
-		)
+		write_aux(&[
+			(BABE_EPOCH_CHANGES_KEY, encoded_epoch_changes.as_slice()),
+			(BABE_EPOCH_CHANGES_VERSION, version),
+		])
 	})
 }
 
@@ -116,15 +111,12 @@ pub(crate) fn write_block_weight<H: Encode, F, R>(
 	block_hash: H,
 	block_weight: BabeBlockWeight,
 	write_aux: F,
-) -> R where
+) -> R
+where
 	F: FnOnce(&[(Vec<u8>, &[u8])]) -> R,
 {
 	let key = block_weight_key(block_hash);
-	block_weight.using_encoded(|s|
-		write_aux(
-			&[(key, s)],
-		)
-	)
+	block_weight.using_encoded(|s| write_aux(&[(key, s)]))
 }
 
 /// Load the cumulative chain-weight associated with a block.
@@ -140,13 +132,13 @@ mod test {
 	use super::*;
 	use crate::migration::EpochV0;
 	use fork_tree::ForkTree;
-	use substrate_test_runtime_client;
+	use sc_consensus_epochs::{EpochHeader, PersistedEpoch, PersistedEpochHeader};
+	use sc_network_test::Block as TestBlock;
+	use sp_consensus::Error as ConsensusError;
+	use sp_consensus_babe::{AllowedSlots, BabeGenesisConfiguration};
 	use sp_core::H256;
 	use sp_runtime::traits::NumberFor;
-	use sp_consensus_babe::{AllowedSlots, BabeGenesisConfiguration};
-	use sc_consensus_epochs::{PersistedEpoch, PersistedEpochHeader, EpochHeader};
-	use sp_consensus::Error as ConsensusError;
-	use sc_network_test::Block as TestBlock;
+	use substrate_test_runtime_client;
 
 	#[test]
 	fn load_decode_from_v0_epoch_changes() {
@@ -159,26 +151,30 @@ mod test {
 		};
 		let client = substrate_test_runtime_client::new();
 		let mut v0_tree = ForkTree::<H256, NumberFor<TestBlock>, _>::new();
-		v0_tree.import::<_, ConsensusError>(
-			Default::default(),
-			Default::default(),
-			PersistedEpoch::Regular(epoch),
-			&|_, _| Ok(false), // Test is single item only so this can be set to false.
-		).unwrap();
-
-		client.insert_aux(
-			&[(BABE_EPOCH_CHANGES_KEY,
-			   &EpochChangesForV0::<TestBlock, EpochV0>::from_raw(v0_tree).encode()[..])],
-			&[],
-		).unwrap();
-
-		assert_eq!(
-			load_decode::<_, u32>(&client, BABE_EPOCH_CHANGES_VERSION).unwrap(),
-			None,
-		);
+		v0_tree
+			.import::<_, ConsensusError>(
+				Default::default(),
+				Default::default(),
+				PersistedEpoch::Regular(epoch),
+				&|_, _| Ok(false), // Test is single item only so this can be set to false.
+			)
+			.unwrap();
+
+		client
+			.insert_aux(
+				&[(
+					BABE_EPOCH_CHANGES_KEY,
+					&EpochChangesForV0::<TestBlock, EpochV0>::from_raw(v0_tree).encode()[..],
+				)],
+				&[],
+			)
+			.unwrap();
+
+		assert_eq!(load_decode::<_, u32>(&client, BABE_EPOCH_CHANGES_VERSION).unwrap(), None,);
 
 		let epoch_changes = load_epoch_changes::<TestBlock, _>(
-			&client, &BabeGenesisConfiguration {
+			&client,
+			&BabeGenesisConfiguration {
 				slot_duration: 10,
 				epoch_length: 4,
 				c: (3, 10),
@@ -186,10 +182,12 @@ mod test {
 				randomness: Default::default(),
 				allowed_slots: AllowedSlots::PrimaryAndSecondaryPlainSlots,
 			},
-		).unwrap();
+		)
+		.unwrap();
 
 		assert!(
-			epoch_changes.shared_data()
+			epoch_changes
+				.shared_data()
 				.tree()
 				.iter()
 				.map(|(_, _, epoch)| epoch.clone())
@@ -200,16 +198,10 @@ mod test {
 				})],
 		); // PersistedEpochHeader does not implement Debug, so we use assert! directly.
 
-		write_epoch_changes::<TestBlock, _, _>(
-			&epoch_changes.shared_data(),
-			|values| {
-				client.insert_aux(values, &[]).unwrap();
-			},
-		);
+		write_epoch_changes::<TestBlock, _, _>(&epoch_changes.shared_data(), |values| {
+			client.insert_aux(values, &[]).unwrap();
+		});
 
-		assert_eq!(
-			load_decode::<_, u32>(&client, BABE_EPOCH_CHANGES_VERSION).unwrap(),
-			Some(2),
-		);
+		assert_eq!(load_decode::<_, u32>(&client, BABE_EPOCH_CHANGES_VERSION).unwrap(), Some(2),);
 	}
 }
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index 61b58bf1b599..315bd4e9921a 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -71,9 +71,13 @@ use std::{
 };
 
 use codec::{Decode, Encode};
-use futures::channel::mpsc::{channel, Receiver, Sender};
-use futures::channel::oneshot;
-use futures::prelude::*;
+use futures::{
+	channel::{
+		mpsc::{channel, Receiver, Sender},
+		oneshot,
+	},
+	prelude::*,
+};
 use log::{debug, info, log, trace, warn};
 use parking_lot::Mutex;
 use prometheus_endpoint::Registry;
@@ -89,18 +93,16 @@ use sc_consensus_slots::{
 	SlotInfo, StorageChanges,
 };
 use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_DEBUG, CONSENSUS_TRACE};
-use sp_api::ApiExt;
-use sp_api::{NumberFor, ProvideRuntimeApi};
+use sp_api::{ApiExt, NumberFor, ProvideRuntimeApi};
 use sp_application_crypto::AppKey;
 use sp_block_builder::BlockBuilder as BlockBuilderApi;
 use sp_blockchain::{
 	Error as ClientError, HeaderBackend, HeaderMetadata, ProvideCache, Result as ClientResult,
 };
-use sp_consensus::{import_queue::BoxJustificationImport, CanAuthorWith, ImportResult};
 use sp_consensus::{
-	import_queue::{BasicQueue, CacheKeyId, DefaultImportQueue, Verifier},
-	BlockCheckParams, BlockImport, BlockImportParams, BlockOrigin, Environment,
-	Error as ConsensusError, ForkChoiceStrategy, Proposer, SelectChain, SlotData,
+	import_queue::{BasicQueue, BoxJustificationImport, CacheKeyId, DefaultImportQueue, Verifier},
+	BlockCheckParams, BlockImport, BlockImportParams, BlockOrigin, CanAuthorWith, Environment,
+	Error as ConsensusError, ForkChoiceStrategy, ImportResult, Proposer, SelectChain, SlotData,
 	StateAction,
 };
 use sp_consensus_babe::inherents::BabeInherentData;
@@ -159,7 +161,7 @@ impl EpochT for Epoch {
 
 	fn increment(
 		&self,
-		(descriptor, config): (NextEpochDescriptor, BabeEpochConfiguration)
+		(descriptor, config): (NextEpochDescriptor, BabeEpochConfiguration),
 	) -> Epoch {
 		Epoch {
 			epoch_index: self.epoch_index + 1,
@@ -183,10 +185,7 @@ impl EpochT for Epoch {
 impl Epoch {
 	/// Create the genesis epoch (epoch #0). This is defined to start at the slot of
 	/// the first block, so that has to be provided.
-	pub fn genesis(
-		genesis_config: &BabeGenesisConfiguration,
-		slot: Slot,
-	) -> Epoch {
+	pub fn genesis(genesis_config: &BabeGenesisConfiguration, slot: Slot) -> Epoch {
 		Epoch {
 			epoch_index: 0,
 			start_slot: slot,
@@ -253,7 +252,11 @@ pub enum Error<B: BlockT> {
 	#[display(fmt = "No secondary author expected.")]
 	NoSecondaryAuthorExpected,
 	/// VRF verification of block by author failed
-	#[display(fmt = "VRF verification of block by author {:?} failed: threshold {} exceeded", _0, _1)]
+	#[display(
+		fmt = "VRF verification of block by author {:?} failed: threshold {} exceeded",
+		_0,
+		_1
+	)]
 	VRFVerificationOfBlockFailed(AuthorityId, u128),
 	/// VRF verification failed
 	#[display(fmt = "VRF verification failed: {:?}", _0)]
@@ -320,35 +323,36 @@ pub struct Config(sc_consensus_slots::SlotDuration<BabeGenesisConfiguration>);
 impl Config {
 	/// Either fetch the slot duration from disk or compute it from the genesis
 	/// state.
-	pub fn get_or_compute<B: BlockT, C>(client: &C) -> ClientResult<Self> where
-		C: AuxStore + ProvideRuntimeApi<B> + UsageProvider<B>, C::Api: BabeApi<B>,
+	pub fn get_or_compute<B: BlockT, C>(client: &C) -> ClientResult<Self>
+	where
+		C: AuxStore + ProvideRuntimeApi<B> + UsageProvider<B>,
+		C::Api: BabeApi<B>,
 	{
 		trace!(target: "babe", "Getting slot duration");
 		match sc_consensus_slots::SlotDuration::get_or_compute(client, |a, b| {
-			let has_api_v1 = a.has_api_with::<dyn BabeApi<B>, _>(
-				&b, |v| v == 1,
-			)?;
-			let has_api_v2 = a.has_api_with::<dyn BabeApi<B>, _>(
-				&b, |v| v == 2,
-			)?;
+			let has_api_v1 = a.has_api_with::<dyn BabeApi<B>, _>(&b, |v| v == 1)?;
+			let has_api_v2 = a.has_api_with::<dyn BabeApi<B>, _>(&b, |v| v == 2)?;
 
 			if has_api_v1 {
-				#[allow(deprecated)] {
+				#[allow(deprecated)]
+				{
 					Ok(a.configuration_before_version_2(b)?.into())
 				}
 			} else if has_api_v2 {
 				a.configuration(b).map_err(Into::into)
 			} else {
 				Err(sp_blockchain::Error::VersionInvalid(
-					"Unsupported or invalid BabeApi version".to_string()
+					"Unsupported or invalid BabeApi version".to_string(),
 				))
 			}
-		}).map(Self) {
+		})
+		.map(Self)
+		{
 			Ok(s) => Ok(s),
 			Err(s) => {
 				warn!(target: "babe", "Failed to get slot duration");
 				Err(s)
-			}
+			},
 		}
 	}
 
@@ -502,7 +506,8 @@ where
 
 	let (worker_tx, worker_rx) = channel(HANDLE_BUFFER_SIZE);
 
-	let answer_requests = answer_requests(worker_rx, config.0, client, babe_link.epoch_changes.clone());
+	let answer_requests =
+		answer_requests(worker_rx, config.0, client, babe_link.epoch_changes.clone());
 	Ok(BabeWorker {
 		inner: Box::pin(future::join(inner, answer_requests).map(|_| ())),
 		slot_notification_sinks,
@@ -515,28 +520,37 @@ async fn answer_requests<B: BlockT, C>(
 	genesis_config: sc_consensus_slots::SlotDuration<BabeGenesisConfiguration>,
 	client: Arc<C>,
 	epoch_changes: SharedEpochChanges<B, Epoch>,
-)
-	where C: ProvideRuntimeApi<B> + ProvideCache<B> + ProvideUncles<B> + BlockchainEvents<B>
-	+ HeaderBackend<B> + HeaderMetadata<B, Error = ClientError> + Send + Sync + 'static,
+) where
+	C: ProvideRuntimeApi<B>
+		+ ProvideCache<B>
+		+ ProvideUncles<B>
+		+ BlockchainEvents<B>
+		+ HeaderBackend<B>
+		+ HeaderMetadata<B, Error = ClientError>
+		+ Send
+		+ Sync
+		+ 'static,
 {
 	while let Some(request) = request_rx.next().await {
 		match request {
 			BabeRequest::EpochForChild(parent_hash, parent_number, slot_number, response) => {
 				let lookup = || {
 					let epoch_changes = epoch_changes.shared_data();
-					let epoch_descriptor = epoch_changes.epoch_descriptor_for_child_of(
-						descendent_query(&*client),
-						&parent_hash,
-						parent_number,
-						slot_number,
-					)
+					let epoch_descriptor = epoch_changes
+						.epoch_descriptor_for_child_of(
+							descendent_query(&*client),
+							&parent_hash,
+							parent_number,
+							slot_number,
+						)
 						.map_err(|e| Error::<B>::ForkTree(Box::new(e)))?
 						.ok_or_else(|| Error::<B>::FetchEpoch(parent_hash))?;
 
-					let viable_epoch = epoch_changes.viable_epoch(
-						&epoch_descriptor,
-						|slot| Epoch::genesis(&genesis_config, slot)
-					).ok_or_else(|| Error::<B>::FetchEpoch(parent_hash))?;
+					let viable_epoch = epoch_changes
+						.viable_epoch(&epoch_descriptor, |slot| {
+							Epoch::genesis(&genesis_config, slot)
+						})
+						.ok_or_else(|| Error::<B>::FetchEpoch(parent_hash))?;
 
 					Ok(sp_consensus_babe::Epoch {
 						epoch_index: viable_epoch.as_ref().epoch_index,
@@ -549,7 +563,7 @@ async fn answer_requests<B: BlockT, C>(
 				};
 
 				let _ = response.send(lookup());
-			}
+			},
 		}
 	}
 }
@@ -584,7 +598,7 @@ impl<B: BlockT> BabeWorkerHandle<B> {
 /// Worker for Babe which implements `Future<Output=()>`. This must be polled.
 #[must_use]
 pub struct BabeWorker<B: BlockT> {
-	inner: Pin<Box<dyn futures::Future<Output=()> + Send + 'static>>,
+	inner: Pin<Box<dyn futures::Future<Output = ()> + Send + 'static>>,
 	slot_notification_sinks: SlotNotificationSinks<B>,
 	handle: BabeWorkerHandle<B>,
 }
@@ -593,7 +607,7 @@ impl<B: BlockT> BabeWorker<B> {
 	/// Return an event stream of notifications for when new slot happens, and the corresponding
 	/// epoch descriptor.
 	pub fn slot_notification_stream(
-		&self
+		&self,
 	) -> Receiver<(Slot, ViableEpochDescriptor<B::Hash, NumberFor<B>, Epoch>)> {
 		const CHANNEL_BUFFER_SIZE: usize = 1024;
 
@@ -613,7 +627,7 @@ impl<B: BlockT> futures::Future for BabeWorker<B> {
 
 	fn poll(
 		mut self: Pin<&mut Self>,
-		cx: &mut futures::task::Context
+		cx: &mut futures::task::Context,
 	) -> futures::task::Poll<Self::Output> {
 		self.inner.as_mut().poll(cx)
 	}
@@ -621,7 +635,7 @@ impl<B: BlockT> futures::Future for BabeWorker<B> {
 
 /// Slot notification sinks.
 type SlotNotificationSinks<B> = Arc<
-	Mutex<Vec<Sender<(Slot, ViableEpochDescriptor<<B as BlockT>::Hash, NumberFor<B>, Epoch>)>>>
+	Mutex<Vec<Sender<(Slot, ViableEpochDescriptor<<B as BlockT>::Hash, NumberFor<B>, Epoch>)>>>,
 >;
 
 struct BabeSlotWorker<B: BlockT, C, E, I, SO, L, BS> {
@@ -662,9 +676,8 @@ where
 	type Claim = (PreDigest, AuthorityId);
 	type SyncOracle = SO;
 	type JustificationSyncLink = L;
-	type CreateProposer = Pin<Box<
-		dyn Future<Output = Result<E::Proposer, sp_consensus::Error>> + Send + 'static
-	>>;
+	type CreateProposer =
+		Pin<Box<dyn Future<Output = Result<E::Proposer, sp_consensus::Error>> + Send + 'static>>;
 	type Proposer = E::Proposer;
 	type BlockImport = I;
 
@@ -681,12 +694,14 @@ where
 		parent: &B::Header,
 		slot: Slot,
 	) -> Result<Self::EpochData, ConsensusError> {
-		self.epoch_changes.shared_data().epoch_descriptor_for_child_of(
-			descendent_query(&*self.client),
-			&parent.hash(),
-			parent.number().clone(),
-			slot,
-		)
+		self.epoch_changes
+			.shared_data()
+			.epoch_descriptor_for_child_of(
+				descendent_query(&*self.client),
+				&parent.hash(),
+				parent.number().clone(),
+				slot,
+			)
 			.map_err(|e| ConsensusError::ChainLookup(format!("{:?}", e)))?
 			.ok_or(sp_consensus::Error::InvalidAuthoritiesSet)
 	}
@@ -707,10 +722,10 @@ where
 		debug!(target: "babe", "Attempting to claim slot {}", slot);
 		let s = authorship::claim_slot(
 			slot,
-			self.epoch_changes.shared_data().viable_epoch(
-				&epoch_descriptor,
-				|slot| Epoch::genesis(&self.config, slot)
-			)?.as_ref(),
+			self.epoch_changes
+				.shared_data()
+				.viable_epoch(&epoch_descriptor, |slot| Epoch::genesis(&self.config, slot))?
+				.as_ref(),
 			&self.keystore,
 		);
 
@@ -727,20 +742,18 @@ where
 		slot: Slot,
 		epoch_descriptor: &ViableEpochDescriptor<B::Hash, NumberFor<B>, Epoch>,
 	) {
-		self.slot_notification_sinks.lock()
-			.retain_mut(|sink| {
-				match sink.try_send((slot, epoch_descriptor.clone())) {
-					Ok(()) => true,
-					Err(e) => {
-						if e.is_full() {
-							warn!(target: "babe", "Trying to notify a slot but the channel is full");
-							true
-						} else {
-							false
-						}
+		self.slot_notification_sinks.lock().retain_mut(|sink| {
+			match sink.try_send((slot, epoch_descriptor.clone())) {
+				Ok(()) => true,
+				Err(e) =>
+					if e.is_full() {
+						warn!(target: "babe", "Trying to notify a slot but the channel is full");
+						true
+					} else {
+						false
 					},
-				}
-			});
+			}
+		});
 	}
 
 	fn pre_digest_data(
@@ -748,59 +761,64 @@ where
 		_slot: Slot,
 		claim: &Self::Claim,
 	) -> Vec<sp_runtime::DigestItem<B::Hash>> {
-		vec![
-			<DigestItemFor<B> as CompatibleDigestItem>::babe_pre_digest(claim.0.clone()),
-		]
+		vec![<DigestItemFor<B> as CompatibleDigestItem>::babe_pre_digest(claim.0.clone())]
 	}
 
-	fn block_import_params(&self) -> Box<dyn Fn(
-		B::Header,
-		&B::Hash,
-		Vec<B::Extrinsic>,
-		StorageChanges<I::Transaction, B>,
-		Self::Claim,
-		Self::EpochData,
-	) -> Result<
-		sp_consensus::BlockImportParams<B, I::Transaction>,
-		sp_consensus::Error> + Send + 'static>
-	{
+	fn block_import_params(
+		&self,
+	) -> Box<
+		dyn Fn(
+				B::Header,
+				&B::Hash,
+				Vec<B::Extrinsic>,
+				StorageChanges<I::Transaction, B>,
+				Self::Claim,
+				Self::EpochData,
+			) -> Result<sp_consensus::BlockImportParams<B, I::Transaction>, sp_consensus::Error>
+			+ Send
+			+ 'static,
+	> {
 		let keystore = self.keystore.clone();
-		Box::new(move |header, header_hash, body, storage_changes, (_, public), epoch_descriptor| {
-			// sign the pre-sealed hash of the block and then
-			// add it to a digest item.
-			let public_type_pair = public.clone().into();
-			let public = public.to_raw_vec();
-			let signature = SyncCryptoStore::sign_with(
-				&*keystore,
-				<AuthorityId as AppKey>::ID,
-				&public_type_pair,
-				header_hash.as_ref()
-			)
-			.map_err(|e| sp_consensus::Error::CannotSign(
-				public.clone(), e.to_string(),
-			))?
-			.ok_or_else(|| sp_consensus::Error::CannotSign(
-				public.clone(), "Could not find key in keystore.".into(),
-			))?;
-			let signature: AuthoritySignature = signature.clone().try_into()
-				.map_err(|_| sp_consensus::Error::InvalidSignature(
-					signature, public
-				))?;
-			let digest_item = <DigestItemFor<B> as CompatibleDigestItem>::babe_seal(signature.into());
-
-			let mut import_block = BlockImportParams::new(BlockOrigin::Own, header);
-			import_block.post_digests.push(digest_item);
-			import_block.body = Some(body);
-			import_block.state_action = StateAction::ApplyChanges(
-				sp_consensus::StorageChanges::Changes(storage_changes)
-			);
-			import_block.intermediates.insert(
-				Cow::from(INTERMEDIATE_KEY),
-				Box::new(BabeIntermediate::<B> { epoch_descriptor }) as Box<_>,
-			);
+		Box::new(
+			move |header, header_hash, body, storage_changes, (_, public), epoch_descriptor| {
+				// sign the pre-sealed hash of the block and then
+				// add it to a digest item.
+				let public_type_pair = public.clone().into();
+				let public = public.to_raw_vec();
+				let signature = SyncCryptoStore::sign_with(
+					&*keystore,
+					<AuthorityId as AppKey>::ID,
+					&public_type_pair,
+					header_hash.as_ref(),
+				)
+				.map_err(|e| sp_consensus::Error::CannotSign(public.clone(), e.to_string()))?
+				.ok_or_else(|| {
+					sp_consensus::Error::CannotSign(
+						public.clone(),
+						"Could not find key in keystore.".into(),
+					)
+				})?;
+				let signature: AuthoritySignature = signature
+					.clone()
+					.try_into()
+					.map_err(|_| sp_consensus::Error::InvalidSignature(signature, public))?;
+				let digest_item =
+					<DigestItemFor<B> as CompatibleDigestItem>::babe_seal(signature.into());
+
+				let mut import_block = BlockImportParams::new(BlockOrigin::Own, header);
+				import_block.post_digests.push(digest_item);
+				import_block.body = Some(body);
+				import_block.state_action = StateAction::ApplyChanges(
+					sp_consensus::StorageChanges::Changes(storage_changes),
+				);
+				import_block.intermediates.insert(
+					Cow::from(INTERMEDIATE_KEY),
+					Box::new(BabeIntermediate::<B> { epoch_descriptor }) as Box<_>,
+				);
 
-			Ok(import_block)
-		})
+				Ok(import_block)
+			},
+		)
 	}
 
 	fn force_authoring(&self) -> bool {
@@ -809,8 +827,8 @@ where
 
 	fn should_backoff(&self, slot: Slot, chain_head: &B::Header) -> bool {
 		if let Some(ref strategy) = self.backoff_authoring_blocks {
-			if let Ok(chain_head_slot) = find_pre_digest::<B>(chain_head)
-				.map(|digest| digest.slot())
+			if let Ok(chain_head_slot) =
+				find_pre_digest::<B>(chain_head).map(|digest| digest.slot())
 			{
 				return strategy.should_backoff(
 					*chain_head.number(),
@@ -818,7 +836,7 @@ where
 					self.client.info().finalized_number,
 					slot,
 					self.logging_target(),
-				);
+				)
 			}
 		}
 		false
@@ -833,9 +851,11 @@ where
 	}
 
 	fn proposer(&mut self, block: &B::Header) -> Self::CreateProposer {
-		Box::pin(self.env.init(block).map_err(|e| {
-			sp_consensus::Error::ClientImport(format!("{:?}", e))
-		}))
+		Box::pin(
+			self.env
+				.init(block)
+				.map_err(|e| sp_consensus::Error::ClientImport(format!("{:?}", e))),
+		)
 	}
 
 	fn telemetry(&self) -> Option<TelemetryHandle> {
@@ -865,7 +885,7 @@ pub fn find_pre_digest<B: BlockT>(header: &B::Header) -> Result<PreDigest, Error
 		return Ok(PreDigest::SecondaryPlain(SecondaryPlainPreDigest {
 			slot: 0.into(),
 			authority_index: 0,
-		}));
+		}))
 	}
 
 	let mut pre_digest: Option<_> = None;
@@ -881,16 +901,19 @@ pub fn find_pre_digest<B: BlockT>(header: &B::Header) -> Result<PreDigest, Error
 }
 
 /// Extract the BABE epoch change digest from the given header, if it exists.
-fn find_next_epoch_digest<B: BlockT>(header: &B::Header)
-	-> Result<Option<NextEpochDescriptor>, Error<B>>
-	where DigestItemFor<B>: CompatibleDigestItem,
+fn find_next_epoch_digest<B: BlockT>(
+	header: &B::Header,
+) -> Result<Option<NextEpochDescriptor>, Error<B>>
+where
+	DigestItemFor<B>: CompatibleDigestItem,
 {
 	let mut epoch_digest: Option<_> = None;
 	for log in header.digest().logs() {
 		trace!(target: "babe", "Checking log {:?}, looking for epoch change digest.", log);
 		let log = log.try_to::<ConsensusLog>(OpaqueDigestItemId::Consensus(&BABE_ENGINE_ID));
 		match (log, epoch_digest.is_some()) {
-			(Some(ConsensusLog::NextEpochData(_)), true) => return Err(babe_err(Error::MultipleEpochChangeDigests)),
+			(Some(ConsensusLog::NextEpochData(_)), true) =>
+				return Err(babe_err(Error::MultipleEpochChangeDigests)),
 			(Some(ConsensusLog::NextEpochData(epoch)), false) => epoch_digest = Some(epoch),
 			_ => trace!(target: "babe", "Ignoring digest not meant for us"),
 		}
@@ -900,16 +923,19 @@ fn find_next_epoch_digest<B: BlockT>(header: &B::Header)
 }
 
 /// Extract the BABE config change digest from the given header, if it exists.
-fn find_next_config_digest<B: BlockT>(header: &B::Header)
-	-> Result<Option<NextConfigDescriptor>, Error<B>>
-	where DigestItemFor<B>: CompatibleDigestItem,
+fn find_next_config_digest<B: BlockT>(
+	header: &B::Header,
+) -> Result<Option<NextConfigDescriptor>, Error<B>>
+where
+	DigestItemFor<B>: CompatibleDigestItem,
 {
 	let mut config_digest: Option<_> = None;
 	for log in header.digest().logs() {
 		trace!(target: "babe", "Checking log {:?}, looking for epoch change digest.", log);
 		let log = log.try_to::<ConsensusLog>(OpaqueDigestItemId::Consensus(&BABE_ENGINE_ID));
 		match (log, config_digest.is_some()) {
-			(Some(ConsensusLog::NextConfigData(_)), true) => return Err(babe_err(Error::MultipleConfigChangeDigests)),
+			(Some(ConsensusLog::NextConfigData(_)), true) =>
+				return Err(babe_err(Error::MultipleConfigChangeDigests)),
 			(Some(ConsensusLog::NextConfigData(config)), false) => config_digest = Some(config),
 			_ => trace!(target: "babe", "Ignoring digest not meant for us"),
 		}
@@ -974,11 +1000,11 @@ where
 			return Ok(())
 		}
 
-		let inherent_res = self.client.runtime_api().check_inherents(
-			&block_id,
-			block,
-			inherent_data,
-		).map_err(Error::RuntimeApi)?;
+		let inherent_res = self
+			.client
+			.runtime_api()
+			.check_inherents(&block_id, block, inherent_data)
+			.map_err(Error::RuntimeApi)?;
 
 		if !inherent_res.ok() {
 			for (i, e) in inherent_res.into_errors() {
@@ -1003,7 +1029,7 @@ where
 		// don't report any equivocations during initial sync
 		// as they are most likely stale.
 		if *origin == BlockOrigin::NetworkInitialSync {
-			return Ok(());
+			return Ok(())
 		}
 
 		// check if authorship of this header is an equivocation and return a proof if so.
@@ -1053,8 +1079,8 @@ where
 				Some(proof) => proof,
 				None => {
 					debug!(target: "babe", "Equivocation offender is not part of the authority set.");
-					return Ok(());
-				}
+					return Ok(())
+				},
 			},
 		};
 
@@ -1074,13 +1100,8 @@ where
 	}
 }
 
-type BlockVerificationResult<Block> = Result<
-	(
-		BlockImportParams<Block, ()>,
-		Option<Vec<(CacheKeyId, Vec<u8>)>>,
-	),
-	String,
->;
+type BlockVerificationResult<Block> =
+	Result<(BlockImportParams<Block, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String>;
 
 #[async_trait::async_trait]
 impl<Block, Client, SelectChain, CAW, CIDP> Verifier<Block>
@@ -1129,24 +1150,26 @@ where
 
 		let slot_now = create_inherent_data_providers.slot();
 
-		let parent_header_metadata = self.client.header_metadata(parent_hash)
+		let parent_header_metadata = self
+			.client
+			.header_metadata(parent_hash)
 			.map_err(Error::<Block>::FetchParentHeader)?;
 
 		let pre_digest = find_pre_digest::<Block>(&header)?;
 		let (check_header, epoch_descriptor) = {
 			let epoch_changes = self.epoch_changes.shared_data();
-			let epoch_descriptor = epoch_changes.epoch_descriptor_for_child_of(
-				descendent_query(&*self.client),
-				&parent_hash,
-				parent_header_metadata.number,
-				pre_digest.slot(),
-			)
-			.map_err(|e| Error::<Block>::ForkTree(Box::new(e)))?
-			.ok_or_else(|| Error::<Block>::FetchEpoch(parent_hash))?;
-			let viable_epoch = epoch_changes.viable_epoch(
-				&epoch_descriptor,
-				|slot| Epoch::genesis(&self.config, slot)
-			).ok_or_else(|| Error::<Block>::FetchEpoch(parent_hash))?;
+			let epoch_descriptor = epoch_changes
+				.epoch_descriptor_for_child_of(
+					descendent_query(&*self.client),
+					&parent_hash,
+					parent_header_metadata.number,
+					pre_digest.slot(),
+				)
+				.map_err(|e| Error::<Block>::ForkTree(Box::new(e)))?
+				.ok_or_else(|| Error::<Block>::FetchEpoch(parent_hash))?;
+			let viable_epoch = epoch_changes
+				.viable_epoch(&epoch_descriptor, |slot| Epoch::genesis(&self.config, slot))
+				.ok_or_else(|| Error::<Block>::FetchEpoch(parent_hash))?;
 
 			// We add one to the current slot to allow for some small drift.
 			// FIXME #1019 in the future, alter this queue to allow deferring of headers
@@ -1162,20 +1185,25 @@ where
 
 		match check_header {
 			CheckedHeader::Checked(pre_header, verified_info) => {
-				let babe_pre_digest = verified_info.pre_digest.as_babe_pre_digest()
+				let babe_pre_digest = verified_info
+					.pre_digest
+					.as_babe_pre_digest()
 					.expect("check_header always returns a pre-digest digest item; qed");
 				let slot = babe_pre_digest.slot();
 
 				// the header is valid but let's check if there was something else already
 				// proposed at the same slot by the given author. if there was, we will
 				// report the equivocation to the runtime.
-				if let Err(err) = self.check_and_report_equivocation(
-					slot_now,
-					slot,
-					&header,
-					&verified_info.author,
-					&origin,
-				).await {
+				if let Err(err) = self
+					.check_and_report_equivocation(
+						slot_now,
+						slot,
+						&header,
+						&verified_info.author,
+						&origin,
+					)
+					.await
+				{
 					warn!(target: "babe", "Error checking/reporting BABE equivocation: {:?}", err);
 				}
 
@@ -1183,7 +1211,8 @@ where
 				// to check that the internally-set timestamp in the inherents
 				// actually matches the slot set in the seal.
 				if let Some(inner_body) = body.take() {
-					let mut inherent_data = create_inherent_data_providers.create_inherent_data()
+					let mut inherent_data = create_inherent_data_providers
+						.create_inherent_data()
 						.map_err(Error::<Block>::CreateInherents)?;
 					inherent_data.babe_replace_inherent_data(slot);
 					let block = Block::new(pre_header.clone(), inner_body);
@@ -1193,7 +1222,8 @@ where
 						BlockId::Hash(parent_hash),
 						inherent_data,
 						create_inherent_data_providers,
-					).await?;
+					)
+					.await?;
 
 					let (_, inner_body) = block.deconstruct();
 					body = Some(inner_body);
@@ -1218,7 +1248,7 @@ where
 				import_block.post_hash = Some(hash);
 
 				Ok((import_block, Default::default()))
-			}
+			},
 			CheckedHeader::Deferred(a, b) => {
 				debug!(target: "babe", "Checking {:?} failed; {:?}, {:?}.", hash, a, b);
 				telemetry!(
@@ -1228,7 +1258,7 @@ where
 					"hash" => ?hash, "a" => ?a, "b" => ?b
 				);
 				Err(Error::<Block>::TooFarInFuture(hash).into())
-			}
+			},
 		}
 	}
 }
@@ -1266,22 +1296,23 @@ impl<Block: BlockT, Client, I> BabeBlockImport<Block, Client, I> {
 		block_import: I,
 		config: Config,
 	) -> Self {
-		BabeBlockImport {
-			client,
-			inner: block_import,
-			epoch_changes,
-			config,
-		}
+		BabeBlockImport { client, inner: block_import, epoch_changes, config }
 	}
 }
 
 #[async_trait::async_trait]
-impl<Block, Client, Inner> BlockImport<Block> for BabeBlockImport<Block, Client, Inner> where
+impl<Block, Client, Inner> BlockImport<Block> for BabeBlockImport<Block, Client, Inner>
+where
 	Block: BlockT,
 	Inner: BlockImport<Block, Transaction = sp_api::TransactionFor<Client, Block>> + Send + Sync,
 	Inner::Error: Into<ConsensusError>,
-	Client: HeaderBackend<Block> + HeaderMetadata<Block, Error = sp_blockchain::Error>
-		+ AuxStore + ProvideRuntimeApi<Block> + ProvideCache<Block> + Send + Sync,
+	Client: HeaderBackend<Block>
+		+ HeaderMetadata<Block, Error = sp_blockchain::Error>
+		+ AuxStore
+		+ ProvideRuntimeApi<Block>
+		+ ProvideCache<Block>
+		+ Send
+		+ Sync,
 	Client::Api: BabeApi<Block> + ApiExt<Block>,
 {
 	type Error = ConsensusError;
@@ -1308,30 +1339,33 @@ impl<Block, Client, Inner> BlockImport<Block> for BabeBlockImport<Block, Client,
 			Err(e) => return Err(ConsensusError::ClientImport(e.to_string())),
 		}
 
-		let pre_digest = find_pre_digest::<Block>(&block.header)
-			.expect("valid babe headers must contain a predigest; \
-					 header has been already verified; qed");
+		let pre_digest = find_pre_digest::<Block>(&block.header).expect(
+			"valid babe headers must contain a predigest; \
+					 header has been already verified; qed",
+		);
 		let slot = pre_digest.slot();
 
 		let parent_hash = *block.header.parent_hash();
-		let parent_header = self.client.header(BlockId::Hash(parent_hash))
+		let parent_header = self
+			.client
+			.header(BlockId::Hash(parent_hash))
 			.map_err(|e| ConsensusError::ChainLookup(e.to_string()))?
-			.ok_or_else(|| ConsensusError::ChainLookup(babe_err(
-				Error::<Block>::ParentUnavailable(parent_hash, hash)
-			).into()))?;
-
-		let parent_slot = find_pre_digest::<Block>(&parent_header)
-			.map(|d| d.slot())
-			.expect("parent is non-genesis; valid BABE headers contain a pre-digest; \
-					header has already been verified; qed");
+			.ok_or_else(|| {
+				ConsensusError::ChainLookup(
+					babe_err(Error::<Block>::ParentUnavailable(parent_hash, hash)).into(),
+				)
+			})?;
+
+		let parent_slot = find_pre_digest::<Block>(&parent_header).map(|d| d.slot()).expect(
+			"parent is non-genesis; valid BABE headers contain a pre-digest; \
+					header has already been verified; qed",
+		);
 
 		// make sure that slot number is strictly increasing
 		if slot <= parent_slot {
-			return Err(
-				ConsensusError::ClientImport(babe_err(
-					Error::<Block>::SlotMustIncrease(parent_slot, slot)
-				).into())
-			);
+			return Err(ConsensusError::ClientImport(
+				babe_err(Error::<Block>::SlotMustIncrease(parent_slot, slot)).into(),
+			))
 		}
 
 		// if there's a pending epoch we'll save the previous epoch changes here
@@ -1354,14 +1388,16 @@ impl<Block, Client, Inner> BlockImport<Block> for BabeBlockImport<Block, Client,
 				} else {
 					aux_schema::load_block_weight(&*self.client, parent_hash)
 						.map_err(|e| ConsensusError::ClientImport(e.to_string()))?
-					.ok_or_else(|| ConsensusError::ClientImport(
-						babe_err(Error::<Block>::ParentBlockNoAssociatedWeight(hash)).into()
-					))?
+						.ok_or_else(|| {
+							ConsensusError::ClientImport(
+								babe_err(Error::<Block>::ParentBlockNoAssociatedWeight(hash))
+									.into(),
+							)
+						})?
 				};
 
-				let intermediate = block.take_intermediate::<BabeIntermediate<Block>>(
-					INTERMEDIATE_KEY
-				)?;
+				let intermediate =
+					block.take_intermediate::<BabeIntermediate<Block>>(INTERMEDIATE_KEY)?;
 
 				let epoch_descriptor = intermediate.epoch_descriptor;
 				let first_in_epoch = parent_slot < epoch_descriptor.start_slot();
@@ -1379,27 +1415,18 @@ impl<Block, Client, Inner> BlockImport<Block> for BabeBlockImport<Block, Client,
 			match (first_in_epoch, next_epoch_digest.is_some(), next_config_digest.is_some()) {
 				(true, true, _) => {},
 				(false, false, false) => {},
-				(false, false, true) => {
-					return Err(
-						ConsensusError::ClientImport(
-							babe_err(Error::<Block>::UnexpectedConfigChange).into(),
-						)
-					)
-				},
-				(true, false, _) => {
-					return Err(
-						ConsensusError::ClientImport(
-							babe_err(Error::<Block>::ExpectedEpochChange(hash, slot)).into(),
-						)
-					)
-				},
-				(false, true, _) => {
-					return Err(
-						ConsensusError::ClientImport(
-							babe_err(Error::<Block>::UnexpectedEpochChange).into(),
-						)
-					)
-				},
+				(false, false, true) =>
+					return Err(ConsensusError::ClientImport(
+						babe_err(Error::<Block>::UnexpectedConfigChange).into(),
+					)),
+				(true, false, _) =>
+					return Err(ConsensusError::ClientImport(
+						babe_err(Error::<Block>::ExpectedEpochChange(hash, slot)).into(),
+					)),
+				(false, true, _) =>
+					return Err(ConsensusError::ClientImport(
+						babe_err(Error::<Block>::UnexpectedEpochChange).into(),
+					)),
 			}
 
 			let info = self.client.info();
@@ -1407,16 +1434,15 @@ impl<Block, Client, Inner> BlockImport<Block> for BabeBlockImport<Block, Client,
 			if let Some(next_epoch_descriptor) = next_epoch_digest {
 				old_epoch_changes = Some((*epoch_changes).clone());
 
-				let viable_epoch = epoch_changes.viable_epoch(
-					&epoch_descriptor,
-					|slot| Epoch::genesis(&self.config, slot)
-				).ok_or_else(|| {
-					ConsensusError::ClientImport(Error::<Block>::FetchEpoch(parent_hash).into())
-				})?;
+				let viable_epoch = epoch_changes
+					.viable_epoch(&epoch_descriptor, |slot| Epoch::genesis(&self.config, slot))
+					.ok_or_else(|| {
+						ConsensusError::ClientImport(Error::<Block>::FetchEpoch(parent_hash).into())
+					})?;
 
-				let epoch_config = next_config_digest.map(Into::into).unwrap_or_else(
-					|| viable_epoch.as_ref().config.clone()
-				);
+				let epoch_config = next_config_digest
+					.map(Into::into)
+					.unwrap_or_else(|| viable_epoch.as_ref().config.clone());
 
 				// restrict info logging during initial sync to avoid spam
 				let log_level = if block.origin == BlockOrigin::NetworkInitialSync {
@@ -1450,43 +1476,40 @@ impl<Block, Client, Inner> BlockImport<Block> for BabeBlockImport<Block, Client,
 				// used by pruning may not know about the block that is being
 				// imported.
 				let prune_and_import = || {
-					prune_finalized(
-						self.client.clone(),
-						&mut epoch_changes,
-					)?;
-
-					epoch_changes.import(
-						descendent_query(&*self.client),
-						hash,
-						number,
-						*block.header.parent_hash(),
-						next_epoch,
-					).map_err(|e| ConsensusError::ClientImport(format!("{:?}", e)))?;
+					prune_finalized(self.client.clone(), &mut epoch_changes)?;
+
+					epoch_changes
+						.import(
+							descendent_query(&*self.client),
+							hash,
+							number,
+							*block.header.parent_hash(),
+							next_epoch,
+						)
+						.map_err(|e| ConsensusError::ClientImport(format!("{:?}", e)))?;
 
 					Ok(())
 				};
 
 				if let Err(e) = prune_and_import() {
 					debug!(target: "babe", "Failed to launch next epoch: {:?}", e);
-					*epoch_changes = old_epoch_changes.expect("set `Some` above and not taken; qed");
-					return Err(e);
+					*epoch_changes =
+						old_epoch_changes.expect("set `Some` above and not taken; qed");
+					return Err(e)
 				}
 
-				crate::aux_schema::write_epoch_changes::<Block, _, _>(
-					&*epoch_changes,
-					|insert| block.auxiliary.extend(
-						insert.iter().map(|(k, v)| (k.to_vec(), Some(v.to_vec())))
-					)
-				);
+				crate::aux_schema::write_epoch_changes::<Block, _, _>(&*epoch_changes, |insert| {
+					block
+						.auxiliary
+						.extend(insert.iter().map(|(k, v)| (k.to_vec(), Some(v.to_vec()))))
+				});
 			}
 
-			aux_schema::write_block_weight(
-				hash,
-				total_weight,
-				|values| block.auxiliary.extend(
-					values.iter().map(|(k, v)| (k.to_vec(), Some(v.to_vec())))
-				),
-			);
+			aux_schema::write_block_weight(hash, total_weight, |values| {
+				block
+					.auxiliary
+					.extend(values.iter().map(|(k, v)| (k.to_vec(), Some(v.to_vec()))))
+			});
 
 			// The fork choice rule is that we pick the heaviest chain (i.e.
 			// more primary blocks), if there's a tie we go with the longest
@@ -1501,9 +1524,11 @@ impl<Block, Client, Inner> BlockImport<Block> for BabeBlockImport<Block, Client,
 				} else {
 					aux_schema::load_block_weight(&*self.client, last_best)
 						.map_err(|e| ConsensusError::ChainLookup(format!("{:?}", e)))?
-					.ok_or_else(
-						|| ConsensusError::ChainLookup("No block weight for parent header.".to_string())
-					)?
+						.ok_or_else(|| {
+							ConsensusError::ChainLookup(
+								"No block weight for parent header.".to_string(),
+							)
+						})?
 				};
 
 				Some(ForkChoiceStrategy::Custom(if total_weight > last_best_weight {
@@ -1544,30 +1569,38 @@ impl<Block, Client, Inner> BlockImport<Block> for BabeBlockImport<Block, Client,
 fn prune_finalized<Block, Client>(
 	client: Arc<Client>,
 	epoch_changes: &mut EpochChangesFor<Block, Epoch>,
-) -> Result<(), ConsensusError> where
+) -> Result<(), ConsensusError>
+where
 	Block: BlockT,
 	Client: HeaderBackend<Block> + HeaderMetadata<Block, Error = sp_blockchain::Error>,
 {
 	let info = client.info();
 
 	let finalized_slot = {
-		let finalized_header = client.header(BlockId::Hash(info.finalized_hash))
+		let finalized_header = client
+			.header(BlockId::Hash(info.finalized_hash))
 			.map_err(|e| ConsensusError::ClientImport(format!("{:?}", e)))?
-			.expect("best finalized hash was given by client; \
-				 finalized headers must exist in db; qed");
+			.expect(
+				"best finalized hash was given by client; \
+				 finalized headers must exist in db; qed",
+			);
 
 		find_pre_digest::<Block>(&finalized_header)
-			.expect("finalized header must be valid; \
-					 valid blocks have a pre-digest; qed")
+			.expect(
+				"finalized header must be valid; \
+					 valid blocks have a pre-digest; qed",
+			)
 			.slot()
 	};
 
-	epoch_changes.prune_finalized(
-		descendent_query(&*client),
-		&info.finalized_hash,
-		info.finalized_number,
-		finalized_slot,
-	).map_err(|e| ConsensusError::ClientImport(format!("{:?}", e)))?;
+	epoch_changes
+		.prune_finalized(
+			descendent_query(&*client),
+			&info.finalized_hash,
+			info.finalized_number,
+			finalized_slot,
+		)
+		.map_err(|e| ConsensusError::ClientImport(format!("{:?}", e)))?;
 
 	Ok(())
 }
@@ -1586,25 +1619,14 @@ where
 	Client: AuxStore + HeaderBackend<Block> + HeaderMetadata<Block, Error = sp_blockchain::Error>,
 {
 	let epoch_changes = aux_schema::load_epoch_changes::<Block, _>(&*client, &config)?;
-	let link = BabeLink {
-		epoch_changes: epoch_changes.clone(),
-		config: config.clone(),
-	};
+	let link = BabeLink { epoch_changes: epoch_changes.clone(), config: config.clone() };
 
 	// NOTE: this isn't entirely necessary, but since we didn't use to prune the
 	// epoch tree it is useful as a migration, so that nodes prune long trees on
 	// startup rather than waiting until importing the next epoch change block.
-	prune_finalized(
-		client.clone(),
-		&mut epoch_changes.shared_data(),
-	)?;
+	prune_finalized(client.clone(), &mut epoch_changes.shared_data())?;
 
-	let import = BabeBlockImport::new(
-		client,
-		epoch_changes,
-		wrapped_block_import,
-		config,
-	);
+	let import = BabeBlockImport::new(client, epoch_changes, wrapped_block_import, config);
 
 	Ok((import, link))
 }
@@ -1629,12 +1651,23 @@ pub fn import_queue<Block: BlockT, Client, SelectChain, Inner, CAW, CIDP>(
 	registry: Option<&Registry>,
 	can_author_with: CAW,
 	telemetry: Option<TelemetryHandle>,
-) -> ClientResult<DefaultImportQueue<Block, Client>> where
-	Inner: BlockImport<Block, Error = ConsensusError, Transaction = sp_api::TransactionFor<Client, Block>>
-		+ Send + Sync + 'static,
-	Client: ProvideRuntimeApi<Block> + ProvideCache<Block> + HeaderBackend<Block>
-		+ HeaderMetadata<Block, Error = sp_blockchain::Error> + AuxStore
-		+ Send + Sync + 'static,
+) -> ClientResult<DefaultImportQueue<Block, Client>>
+where
+	Inner: BlockImport<
+			Block,
+			Error = ConsensusError,
+			Transaction = sp_api::TransactionFor<Client, Block>,
+		> + Send
+		+ Sync
+		+ 'static,
+	Client: ProvideRuntimeApi<Block>
+		+ ProvideCache<Block>
+		+ HeaderBackend<Block>
+		+ HeaderMetadata<Block, Error = sp_blockchain::Error>
+		+ AuxStore
+		+ Send
+		+ Sync
+		+ 'static,
 	Client::Api: BlockBuilderApi<Block> + BabeApi<Block> + ApiExt<Block>,
 	SelectChain: sp_consensus::SelectChain<Block> + 'static,
 	CAW: CanAuthorWith<Block> + Send + Sync + 'static,
@@ -1651,11 +1684,5 @@ pub fn import_queue<Block: BlockT, Client, SelectChain, Inner, CAW, CIDP>(
 		client,
 	};
 
-	Ok(BasicQueue::new(
-		verifier,
-		Box::new(block_import),
-		justification_import,
-		spawner,
-		registry,
-	))
+	Ok(BasicQueue::new(verifier, Box::new(block_import), justification_import, spawner, registry))
 }
diff --git a/client/consensus/babe/src/migration.rs b/client/consensus/babe/src/migration.rs
index fec73667da48..a248c9da24db 100644
--- a/client/consensus/babe/src/migration.rs
+++ b/client/consensus/babe/src/migration.rs
@@ -16,12 +16,12 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use codec::{Encode, Decode};
-use sc_consensus_epochs::Epoch as EpochT;
 use crate::{
-	Epoch, AuthorityId, BabeAuthorityWeight, BabeGenesisConfiguration,
-	BabeEpochConfiguration, VRF_OUTPUT_LENGTH, NextEpochDescriptor,
+	AuthorityId, BabeAuthorityWeight, BabeEpochConfiguration, BabeGenesisConfiguration, Epoch,
+	NextEpochDescriptor, VRF_OUTPUT_LENGTH,
 };
+use codec::{Decode, Encode};
+use sc_consensus_epochs::Epoch as EpochT;
 use sp_consensus_slots::Slot;
 
 /// BABE epoch information, version 0.
@@ -43,10 +43,7 @@ impl EpochT for EpochV0 {
 	type NextEpochDescriptor = NextEpochDescriptor;
 	type Slot = Slot;
 
-	fn increment(
-		&self,
-		descriptor: NextEpochDescriptor
-	) -> EpochV0 {
+	fn increment(&self, descriptor: NextEpochDescriptor) -> EpochV0 {
 		EpochV0 {
 			epoch_index: self.epoch_index + 1,
 			start_slot: self.start_slot + self.duration,
@@ -74,10 +71,7 @@ impl EpochV0 {
 			duration: self.duration,
 			authorities: self.authorities,
 			randomness: self.randomness,
-			config: BabeEpochConfiguration {
-				c: config.c,
-				allowed_slots: config.allowed_slots,
-			},
+			config: BabeEpochConfiguration { c: config.c, allowed_slots: config.allowed_slots },
 		}
 	}
 }
diff --git a/client/consensus/babe/src/tests.rs b/client/consensus/babe/src/tests.rs
index 3392ffade98e..18c016bbf103 100644
--- a/client/consensus/babe/src/tests.rs
+++ b/client/consensus/babe/src/tests.rs
@@ -23,35 +23,33 @@
 #![allow(deprecated)]
 use super::*;
 use authorship::claim_slot;
-use sp_core::crypto::Pair;
-use sp_keystore::{
-	SyncCryptoStore,
-	vrf::make_transcript as transcript_from_data,
-};
-use sp_consensus_babe::{
-	AuthorityPair, Slot, AllowedSlots, make_transcript, make_transcript_data,
-	inherents::InherentDataProvider,
-};
-use sc_consensus_slots::BackoffAuthoringOnFinalizedHeadLagging;
+use futures::executor::block_on;
+use log::debug;
+use rand::RngCore;
+use rand_chacha::{rand_core::SeedableRng, ChaChaRng};
 use sc_block_builder::{BlockBuilder, BlockBuilderProvider};
+use sc_client_api::{backend::TransactionFor, BlockchainEvents};
+use sc_consensus_slots::BackoffAuthoringOnFinalizedHeadLagging;
+use sc_keystore::LocalKeystore;
+use sc_network::config::ProtocolConfig;
+use sc_network_test::{Block as TestBlock, *};
+use sp_application_crypto::key_types::BABE;
 use sp_consensus::{
-	NoNetwork as DummyOracle, Proposal, DisableProofRecording, AlwaysCanAuthor,
 	import_queue::{BoxBlockImport, BoxJustificationImport},
+	AlwaysCanAuthor, DisableProofRecording, NoNetwork as DummyOracle, Proposal,
 };
-use sc_network_test::{Block as TestBlock, *};
-use sc_network::config::ProtocolConfig;
-use sp_runtime::{generic::DigestItem, traits::{Block as BlockT, DigestFor}};
-use sc_client_api::{BlockchainEvents, backend::TransactionFor};
-use log::debug;
-use std::{time::Duration, cell::RefCell, task::Poll};
-use rand::RngCore;
-use rand_chacha::{
-	rand_core::SeedableRng, ChaChaRng,
+use sp_consensus_babe::{
+	inherents::InherentDataProvider, make_transcript, make_transcript_data, AllowedSlots,
+	AuthorityPair, Slot,
+};
+use sp_core::crypto::Pair;
+use sp_keystore::{vrf::make_transcript as transcript_from_data, SyncCryptoStore};
+use sp_runtime::{
+	generic::DigestItem,
+	traits::{Block as BlockT, DigestFor},
 };
-use sc_keystore::LocalKeystore;
-use sp_application_crypto::key_types::BABE;
-use futures::executor::block_on;
 use sp_timestamp::InherentDataProvider as TimestampInherentDataProvider;
+use std::{cell::RefCell, task::Poll, time::Duration};
 
 type Item = DigestItem<Hash>;
 
@@ -95,10 +93,7 @@ impl Environment<TestBlock> for DummyFactory {
 	type Proposer = DummyProposer;
 	type Error = Error;
 
-	fn init(&mut self, parent_header: &<TestBlock as BlockT>::Header)
-		-> Self::CreateProposer
-	{
-
+	fn init(&mut self, parent_header: &<TestBlock as BlockT>::Header) -> Self::CreateProposer {
 		let parent_slot = crate::find_pre_digest::<TestBlock>(parent_header)
 			.expect("parent header has a pre-digest")
 			.slot();
@@ -113,23 +108,24 @@ impl Environment<TestBlock> for DummyFactory {
 }
 
 impl DummyProposer {
-	fn propose_with(&mut self, pre_digests: DigestFor<TestBlock>)
-		-> future::Ready<
-			Result<
-				Proposal<
-					TestBlock,
-					sc_client_api::TransactionFor<substrate_test_runtime_client::Backend, TestBlock>,
-					()
-				>,
-				Error
-			>
-		>
-	{
-		let block_builder = self.factory.client.new_block_at(
-			&BlockId::Hash(self.parent_hash),
-			pre_digests,
-			false,
-		).unwrap();
+	fn propose_with(
+		&mut self,
+		pre_digests: DigestFor<TestBlock>,
+	) -> future::Ready<
+		Result<
+			Proposal<
+				TestBlock,
+				sc_client_api::TransactionFor<substrate_test_runtime_client::Backend, TestBlock>,
+				(),
+			>,
+			Error,
+		>,
+	> {
+		let block_builder = self
+			.factory
+			.client
+			.new_block_at(&BlockId::Hash(self.parent_hash), pre_digests, false)
+			.unwrap();
 
 		let mut block = match block_builder.build().map_err(|e| e.into()) {
 			Ok(b) => b.block,
@@ -143,13 +139,14 @@ impl DummyProposer {
 		// figure out if we should add a consensus digest, since the test runtime
 		// doesn't.
 		let epoch_changes = self.factory.epoch_changes.shared_data();
-		let epoch = epoch_changes.epoch_data_for_child_of(
-			descendent_query(&*self.factory.client),
-			&self.parent_hash,
-			self.parent_number,
-			this_slot,
-			|slot| Epoch::genesis(&self.factory.config, slot),
-		)
+		let epoch = epoch_changes
+			.epoch_data_for_child_of(
+				descendent_query(&*self.factory.client),
+				&self.parent_hash,
+				self.parent_number,
+				this_slot,
+				|slot| Epoch::genesis(&self.factory.config, slot),
+			)
 			.expect("client has data to find epoch")
 			.expect("can compute epoch for baked block");
 
@@ -162,7 +159,8 @@ impl DummyProposer {
 			let digest_data = ConsensusLog::NextEpochData(NextEpochDescriptor {
 				authorities: epoch.authorities.clone(),
 				randomness: epoch.randomness.clone(),
-			}).encode();
+			})
+			.encode();
 			let digest = DigestItem::Consensus(BABE_ENGINE_ID, digest_data);
 			block.header.digest_mut().push(digest)
 		}
@@ -176,7 +174,8 @@ impl DummyProposer {
 
 impl Proposer<TestBlock> for DummyProposer {
 	type Error = Error;
-	type Transaction = sc_client_api::TransactionFor<substrate_test_runtime_client::Backend, TestBlock>;
+	type Transaction =
+		sc_client_api::TransactionFor<substrate_test_runtime_client::Backend, TestBlock>;
 	type Proposal = future::Ready<Result<Proposal<TestBlock, Self::Transaction, ()>, Error>>;
 	type ProofRecording = DisableProofRecording;
 	type Proof = ();
@@ -201,9 +200,9 @@ pub struct PanickingBlockImport<B>(B);
 
 #[async_trait::async_trait]
 impl<B: BlockImport<TestBlock>> BlockImport<TestBlock> for PanickingBlockImport<B>
-	where
-		B::Transaction: Send,
-		B: Send,
+where
+	B::Transaction: Send,
+	B: Send,
 {
 	type Error = B::Error;
 	type Transaction = B::Transaction;
@@ -233,10 +232,8 @@ pub struct BabeTestNet {
 type TestHeader = <TestBlock as BlockT>::Header;
 type TestExtrinsic = <TestBlock as BlockT>::Extrinsic;
 
-type TestSelectChain = substrate_test_runtime_client::LongestChain<
-	substrate_test_runtime_client::Backend,
-	TestBlock,
->;
+type TestSelectChain =
+	substrate_test_runtime_client::LongestChain<substrate_test_runtime_client::Backend, TestBlock>;
 
 pub struct TestVerifier {
 	inner: BabeVerifier<
@@ -244,11 +241,13 @@ pub struct TestVerifier {
 		PeersFullClient,
 		TestSelectChain,
 		AlwaysCanAuthor,
-		Box<dyn CreateInherentDataProviders<
-			TestBlock,
-			(),
-			InherentDataProviders = (TimestampInherentDataProvider, InherentDataProvider)
-		>>
+		Box<
+			dyn CreateInherentDataProviders<
+				TestBlock,
+				(),
+				InherentDataProviders = (TimestampInherentDataProvider, InherentDataProvider),
+			>,
+		>,
 	>,
 	mutator: Mutator,
 }
@@ -274,7 +273,12 @@ impl Verifier<TestBlock> for TestVerifier {
 pub struct PeerData {
 	link: BabeLink<TestBlock>,
 	block_import: Mutex<
-		Option<BoxBlockImport<TestBlock, TransactionFor<substrate_test_runtime_client::Backend, TestBlock>>>
+		Option<
+			BoxBlockImport<
+				TestBlock,
+				TransactionFor<substrate_test_runtime_client::Backend, TestBlock>,
+			>,
+		>,
 	>,
 }
 
@@ -286,32 +290,27 @@ impl TestNetFactory for BabeTestNet {
 	/// Create new test network with peers and given config.
 	fn from_config(_config: &ProtocolConfig) -> Self {
 		debug!(target: "babe", "Creating test network from config");
-		BabeTestNet {
-			peers: Vec::new(),
-		}
+		BabeTestNet { peers: Vec::new() }
 	}
 
-	fn make_block_import(&self, client: PeersClient)
-		-> (
-			BlockImportAdapter<Self::BlockImport>,
-			Option<BoxJustificationImport<Block>>,
-			Option<PeerData>,
-		)
-	{
+	fn make_block_import(
+		&self,
+		client: PeersClient,
+	) -> (
+		BlockImportAdapter<Self::BlockImport>,
+		Option<BoxJustificationImport<Block>>,
+		Option<PeerData>,
+	) {
 		let client = client.as_full().expect("only full clients are tested");
 
 		let config = Config::get_or_compute(&*client).expect("config available");
-		let (block_import, link) = crate::block_import(
-			config,
-			client.clone(),
-			client.clone(),
-		).expect("can initialize block-import");
+		let (block_import, link) = crate::block_import(config, client.clone(), client.clone())
+			.expect("can initialize block-import");
 
 		let block_import = PanickingBlockImport(block_import);
 
-		let data_block_import = Mutex::new(
-			Some(Box::new(block_import.clone()) as BoxBlockImport<_, _>)
-		);
+		let data_block_import =
+			Mutex::new(Some(Box::new(block_import.clone()) as BoxBlockImport<_, _>));
 		(
 			BlockImportAdapter::new(block_import),
 			None,
@@ -324,16 +323,16 @@ impl TestNetFactory for BabeTestNet {
 		client: PeersClient,
 		_cfg: &ProtocolConfig,
 		maybe_link: &Option<PeerData>,
-	)
-		-> Self::Verifier
-	{
+	) -> Self::Verifier {
 		use substrate_test_runtime_client::DefaultTestClientBuilderExt;
 
 		let client = client.as_full().expect("only full clients are used in test");
 		trace!(target: "babe", "Creating a verifier");
 
 		// ensure block import and verifier are linked correctly.
-		let data = maybe_link.as_ref().expect("babe link always provided to verifier instantiation");
+		let data = maybe_link
+			.as_ref()
+			.expect("babe link always provided to verifier instantiation");
 
 		let (_, longest_chain) = TestClientBuilder::new().build_with_longest_chain();
 
@@ -369,10 +368,7 @@ impl TestNetFactory for BabeTestNet {
 		&self.peers
 	}
 
-	fn mut_peers<F: FnOnce(&mut Vec<BabePeer>)>(
-		&mut self,
-		closure: F,
-	) {
+	fn mut_peers<F: FnOnce(&mut Vec<BabePeer>)>(&mut self, closure: F) {
 		closure(&mut self.peers);
 	}
 }
@@ -382,9 +378,7 @@ impl TestNetFactory for BabeTestNet {
 fn rejects_empty_block() {
 	sp_tracing::try_init_simple();
 	let mut net = BabeTestNet::new(3);
-	let block_builder = |builder: BlockBuilder<_, _, _>| {
-		builder.build().unwrap().block
-	};
+	let block_builder = |builder: BlockBuilder<_, _, _>| builder.build().unwrap().block;
 	net.mut_peers(|peer| {
 		peer[0].generate_blocks(1, BlockOrigin::NetworkInitialSync, block_builder);
 	})
@@ -397,11 +391,7 @@ fn run_one_test(mutator: impl Fn(&mut TestHeader, Stage) + Send + Sync + 'static
 	MUTATOR.with(|m| *m.borrow_mut() = mutator.clone());
 	let net = BabeTestNet::new(3);
 
-	let peers = &[
-		(0, "//Alice"),
-		(1, "//Bob"),
-		(2, "//Charlie"),
-	];
+	let peers = &[(0, "//Alice"), (1, "//Bob"), (2, "//Charlie")];
 
 	let net = Arc::new(Mutex::new(net));
 	let mut import_notifications = Vec::new();
@@ -415,9 +405,10 @@ fn run_one_test(mutator: impl Fn(&mut TestHeader, Stage) + Send + Sync + 'static
 		let select_chain = peer.select_chain().expect("Full client has select_chain");
 
 		let keystore_path = tempfile::tempdir().expect("Creates keystore path");
-		let keystore: SyncCryptoStorePtr = Arc::new(LocalKeystore::open(keystore_path.path(), None)
-			.expect("Creates keystore"));
-		SyncCryptoStore::sr25519_generate_new(&*keystore, BABE, Some(seed)).expect("Generates authority key");
+		let keystore: SyncCryptoStorePtr =
+			Arc::new(LocalKeystore::open(keystore_path.path(), None).expect("Creates keystore"));
+		SyncCryptoStore::sr25519_generate_new(&*keystore, BABE, Some(seed))
+			.expect("Generates authority key");
 		keystore_paths.push(keystore_path);
 
 		let mut got_own = false;
@@ -435,47 +426,54 @@ fn run_one_test(mutator: impl Fn(&mut TestHeader, Stage) + Send + Sync + 'static
 		import_notifications.push(
 			// run each future until we get one of our own blocks with number higher than 5
 			// that was produced locally.
-			client.import_notification_stream()
-				.take_while(move |n| future::ready(n.header.number() < &5 || {
-					if n.origin == BlockOrigin::Own {
-						got_own = true;
-					} else {
-						got_other = true;
-					}
-
-					// continue until we have at least one block of our own
-					// and one of another peer.
-					!(got_own && got_other)
-				}))
-				.for_each(|_| future::ready(()) )
+			client
+				.import_notification_stream()
+				.take_while(move |n| {
+					future::ready(
+						n.header.number() < &5 || {
+							if n.origin == BlockOrigin::Own {
+								got_own = true;
+							} else {
+								got_other = true;
+							}
+
+							// continue until we have at least one block of our own
+							// and one of another peer.
+							!(got_own && got_other)
+						},
+					)
+				})
+				.for_each(|_| future::ready(())),
 		);
 
+		babe_futures.push(
+			start_babe(BabeParams {
+				block_import: data.block_import.lock().take().expect("import set up during init"),
+				select_chain,
+				client,
+				env: environ,
+				sync_oracle: DummyOracle,
+				create_inherent_data_providers: Box::new(|_, _| async {
+					let timestamp = TimestampInherentDataProvider::from_system_time();
+					let slot = InherentDataProvider::from_timestamp_and_duration(
+						*timestamp,
+						Duration::from_secs(6),
+					);
 
-		babe_futures.push(start_babe(BabeParams {
-			block_import: data.block_import.lock().take().expect("import set up during init"),
-			select_chain,
-			client,
-			env: environ,
-			sync_oracle: DummyOracle,
-			create_inherent_data_providers: Box::new(|_, _| async {
-				let timestamp = TimestampInherentDataProvider::from_system_time();
-				let slot = InherentDataProvider::from_timestamp_and_duration(
-					*timestamp,
-					Duration::from_secs(6),
-				);
-
-				Ok((timestamp, slot))
-			}),
-			force_authoring: false,
-			backoff_authoring_blocks: Some(BackoffAuthoringOnFinalizedHeadLagging::default()),
-			babe_link: data.link.clone(),
-			keystore,
-			can_author_with: sp_consensus::AlwaysCanAuthor,
-			justification_sync_link: (),
-			block_proposal_slot_portion: SlotProportion::new(0.5),
-			max_block_proposal_slot_portion: None,
-			telemetry: None,
-		}).expect("Starts babe"));
+					Ok((timestamp, slot))
+				}),
+				force_authoring: false,
+				backoff_authoring_blocks: Some(BackoffAuthoringOnFinalizedHeadLagging::default()),
+				babe_link: data.link.clone(),
+				keystore,
+				can_author_with: sp_consensus::AlwaysCanAuthor,
+				justification_sync_link: (),
+				block_proposal_slot_portion: SlotProportion::new(0.5),
+				max_block_proposal_slot_portion: None,
+				telemetry: None,
+			})
+			.expect("Starts babe"),
+		);
 	}
 	block_on(future::select(
 		futures::future::poll_fn(move |cx| {
@@ -489,7 +487,7 @@ fn run_one_test(mutator: impl Fn(&mut TestHeader, Stage) + Send + Sync + 'static
 
 			Poll::<()>::Pending
 		}),
-		future::select(future::join_all(import_notifications), future::join_all(babe_futures))
+		future::select(future::join_all(import_notifications), future::join_all(babe_futures)),
 	));
 }
 
@@ -503,7 +501,8 @@ fn authoring_blocks() {
 fn rejects_missing_inherent_digest() {
 	run_one_test(|header: &mut TestHeader, stage| {
 		let v = std::mem::take(&mut header.digest_mut().logs);
-		header.digest_mut().logs = v.into_iter()
+		header.digest_mut().logs = v
+			.into_iter()
 			.filter(|v| stage == Stage::PostSeal || v.as_babe_pre_digest().is_none())
 			.collect()
 	})
@@ -514,7 +513,8 @@ fn rejects_missing_inherent_digest() {
 fn rejects_missing_seals() {
 	run_one_test(|header: &mut TestHeader, stage| {
 		let v = std::mem::take(&mut header.digest_mut().logs);
-		header.digest_mut().logs = v.into_iter()
+		header.digest_mut().logs = v
+			.into_iter()
 			.filter(|v| stage == Stage::PreSeal || v.as_babe_seal().is_none())
 			.collect()
 	})
@@ -525,7 +525,8 @@ fn rejects_missing_seals() {
 fn rejects_missing_consensus_digests() {
 	run_one_test(|header: &mut TestHeader, stage| {
 		let v = std::mem::take(&mut header.digest_mut().logs);
-		header.digest_mut().logs = v.into_iter()
+		header.digest_mut().logs = v
+			.into_iter()
 			.filter(|v| stage == Stage::PostSeal || v.as_next_epoch_descriptor().is_none())
 			.collect()
 	});
@@ -560,8 +561,8 @@ fn sig_is_not_pre_digest() {
 fn can_author_block() {
 	sp_tracing::try_init_simple();
 	let keystore_path = tempfile::tempdir().expect("Creates keystore path");
-	let keystore: SyncCryptoStorePtr = Arc::new(LocalKeystore::open(keystore_path.path(), None)
-		.expect("Creates keystore"));
+	let keystore: SyncCryptoStorePtr =
+		Arc::new(LocalKeystore::open(keystore_path.path(), None).expect("Creates keystore"));
 	let public = SyncCryptoStore::sr25519_generate_new(&*keystore, BABE, Some("//Alice"))
 		.expect("Generates authority pair");
 
@@ -601,8 +602,8 @@ fn can_author_block() {
 			None => i += 1,
 			Some(s) => {
 				debug!(target: "babe", "Authored block {:?}", s.0);
-				break;
-			}
+				break
+			},
 		}
 	}
 }
@@ -622,26 +623,27 @@ fn propose_and_import_block<Transaction: Send + 'static>(
 	});
 
 	let pre_digest = sp_runtime::generic::Digest {
-		logs: vec![
-			Item::babe_pre_digest(
-				PreDigest::SecondaryPlain(SecondaryPlainPreDigest {
-					authority_index: 0,
-					slot,
-				}),
-			),
-		],
+		logs: vec![Item::babe_pre_digest(PreDigest::SecondaryPlain(SecondaryPlainPreDigest {
+			authority_index: 0,
+			slot,
+		}))],
 	};
 
 	let parent_hash = parent.hash();
 
 	let mut block = futures::executor::block_on(proposer.propose_with(pre_digest)).unwrap().block;
 
-	let epoch_descriptor = proposer_factory.epoch_changes.shared_data().epoch_descriptor_for_child_of(
-		descendent_query(&*proposer_factory.client),
-		&parent_hash,
-		*parent.number(),
-		slot,
-	).unwrap().unwrap();
+	let epoch_descriptor = proposer_factory
+		.epoch_changes
+		.shared_data()
+		.epoch_descriptor_for_child_of(
+			descendent_query(&*proposer_factory.client),
+			&parent_hash,
+			*parent.number(),
+			slot,
+		)
+		.unwrap()
+		.unwrap();
 
 	let seal = {
 		// sign the pre-sealed hash of the block and then
@@ -706,13 +708,12 @@ fn importing_block_one_sets_genesis_epoch() {
 	let genesis_epoch = Epoch::genesis(&data.link.config, 999.into());
 
 	let epoch_changes = data.link.epoch_changes.shared_data();
-	let epoch_for_second_block = epoch_changes.epoch_data_for_child_of(
-		descendent_query(&*client),
-		&block_hash,
-		1,
-		1000.into(),
-		|slot| Epoch::genesis(&data.link.config, slot),
-	).unwrap().unwrap();
+	let epoch_for_second_block = epoch_changes
+		.epoch_data_for_child_of(descendent_query(&*client), &block_hash, 1, 1000.into(), |slot| {
+			Epoch::genesis(&data.link.config, slot)
+		})
+		.unwrap()
+		.unwrap();
 
 	assert_eq!(epoch_for_second_block, genesis_epoch);
 }
@@ -779,16 +780,10 @@ fn importing_epoch_change_block_prunes_tree() {
 	let fork_3 = propose_and_import_blocks(BlockId::Hash(canon_hashes[18]), 10);
 
 	// We should be tracking a total of 9 epochs in the fork tree
-	assert_eq!(
-		epoch_changes.shared_data().tree().iter().count(),
-		9,
-	);
+	assert_eq!(epoch_changes.shared_data().tree().iter().count(), 9,);
 
 	// And only one root
-	assert_eq!(
-		epoch_changes.shared_data().tree().roots().count(),
-		1,
-	);
+	assert_eq!(epoch_changes.shared_data().tree().roots().count(), 1,);
 
 	// We finalize block #13 from the canon chain, so on the next epoch
 	// change the tree should be pruned, to not contain F (#7).
@@ -796,32 +791,47 @@ fn importing_epoch_change_block_prunes_tree() {
 	propose_and_import_blocks(BlockId::Hash(client.chain_info().best_hash), 7);
 
 	// at this point no hashes from the first fork must exist on the tree
-	assert!(
-		!epoch_changes.shared_data().tree().iter().map(|(h, _, _)| h).any(|h| fork_1.contains(h)),
-	);
+	assert!(!epoch_changes
+		.shared_data()
+		.tree()
+		.iter()
+		.map(|(h, _, _)| h)
+		.any(|h| fork_1.contains(h)),);
 
 	// but the epoch changes from the other forks must still exist
-	assert!(
-		epoch_changes.shared_data().tree().iter().map(|(h, _, _)| h).any(|h| fork_2.contains(h))
-	);
-
-	assert!(
-		epoch_changes.shared_data().tree().iter().map(|(h, _, _)| h).any(|h| fork_3.contains(h)),
-	);
+	assert!(epoch_changes
+		.shared_data()
+		.tree()
+		.iter()
+		.map(|(h, _, _)| h)
+		.any(|h| fork_2.contains(h)));
+
+	assert!(epoch_changes
+		.shared_data()
+		.tree()
+		.iter()
+		.map(|(h, _, _)| h)
+		.any(|h| fork_3.contains(h)),);
 
 	// finalizing block #25 from the canon chain should prune out the second fork
 	client.finalize_block(BlockId::Hash(canon_hashes[24]), None, false).unwrap();
 	propose_and_import_blocks(BlockId::Hash(client.chain_info().best_hash), 8);
 
 	// at this point no hashes from the second fork must exist on the tree
-	assert!(
-		!epoch_changes.shared_data().tree().iter().map(|(h, _, _)| h).any(|h| fork_2.contains(h)),
-	);
+	assert!(!epoch_changes
+		.shared_data()
+		.tree()
+		.iter()
+		.map(|(h, _, _)| h)
+		.any(|h| fork_2.contains(h)),);
 
 	// while epoch changes from the last fork should still exist
-	assert!(
-		epoch_changes.shared_data().tree().iter().map(|(h, _, _)| h).any(|h| fork_3.contains(h)),
-	);
+	assert!(epoch_changes
+		.shared_data()
+		.tree()
+		.iter()
+		.map(|(h, _, _)| h)
+		.any(|h| fork_3.contains(h)),);
 }
 
 #[test]
@@ -856,20 +866,15 @@ fn verify_slots_are_strictly_increasing() {
 
 	// we should fail to import this block since the slot number didn't increase.
 	// we will panic due to the `PanickingBlockImport` defined above.
-	propose_and_import_block(
-		&b1,
-		Some(999.into()),
-		&mut proposer_factory,
-		&mut block_import,
-	);
+	propose_and_import_block(&b1, Some(999.into()), &mut proposer_factory, &mut block_import);
 }
 
 #[test]
 fn babe_transcript_generation_match() {
 	sp_tracing::try_init_simple();
 	let keystore_path = tempfile::tempdir().expect("Creates keystore path");
-	let keystore: SyncCryptoStorePtr = Arc::new(LocalKeystore::open(keystore_path.path(), None)
-		.expect("Creates keystore"));
+	let keystore: SyncCryptoStorePtr =
+		Arc::new(LocalKeystore::open(keystore_path.path(), None).expect("Creates keystore"));
 	let public = SyncCryptoStore::sr25519_generate_new(&*keystore, BABE, Some("//Alice"))
 		.expect("Generates authority pair");
 
@@ -890,9 +895,7 @@ fn babe_transcript_generation_match() {
 
 	let test = |t: merlin::Transcript| -> [u8; 16] {
 		let mut b = [0u8; 16];
-		t.build_rng()
-			.finalize(&mut ChaChaRng::from_seed([0u8;32]))
-			.fill_bytes(&mut b);
+		t.build_rng().finalize(&mut ChaChaRng::from_seed([0u8; 32])).fill_bytes(&mut b);
 		b
 	};
 	debug_assert!(test(orig_transcript) == test(transcript_from_data(new_transcript)));
diff --git a/client/consensus/babe/src/verification.rs b/client/consensus/babe/src/verification.rs
index 469286f5110d..af118312dd07 100644
--- a/client/consensus/babe/src/verification.rs
+++ b/client/consensus/babe/src/verification.rs
@@ -17,18 +17,22 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Verification for BABE headers.
-use sp_runtime::{traits::Header, traits::DigestItemFor};
-use sp_core::{Pair, Public};
-use sp_consensus_babe::{make_transcript, AuthoritySignature, AuthorityPair, AuthorityId};
-use sp_consensus_babe::digests::{
-	PreDigest, PrimaryPreDigest, SecondaryPlainPreDigest, SecondaryVRFPreDigest,
-	CompatibleDigestItem
+use super::{
+	authorship::{calculate_primary_threshold, check_primary_threshold, secondary_slot_author},
+	babe_err, find_pre_digest, BlockT, Epoch, Error,
 };
+use log::{debug, trace};
 use sc_consensus_slots::CheckedHeader;
+use sp_consensus_babe::{
+	digests::{
+		CompatibleDigestItem, PreDigest, PrimaryPreDigest, SecondaryPlainPreDigest,
+		SecondaryVRFPreDigest,
+	},
+	make_transcript, AuthorityId, AuthorityPair, AuthoritySignature,
+};
 use sp_consensus_slots::Slot;
-use log::{debug, trace};
-use super::{find_pre_digest, babe_err, Epoch, BlockT, Error};
-use super::authorship::{calculate_primary_threshold, check_primary_threshold, secondary_slot_author};
+use sp_core::{Pair, Public};
+use sp_runtime::traits::{DigestItemFor, Header};
 
 /// BABE verification parameters
 pub(super) struct VerificationParams<'a, B: 'a + BlockT> {
@@ -57,26 +61,24 @@ pub(super) struct VerificationParams<'a, B: 'a + BlockT> {
 /// with each having different validation logic.
 pub(super) fn check_header<B: BlockT + Sized>(
 	params: VerificationParams<B>,
-) -> Result<CheckedHeader<B::Header, VerifiedHeaderInfo<B>>, Error<B>> where
+) -> Result<CheckedHeader<B::Header, VerifiedHeaderInfo<B>>, Error<B>>
+where
 	DigestItemFor<B>: CompatibleDigestItem,
 {
-	let VerificationParams {
-		mut header,
-		pre_digest,
-		slot_now,
-		epoch,
-	} = params;
+	let VerificationParams { mut header, pre_digest, slot_now, epoch } = params;
 
 	let authorities = &epoch.authorities;
 	let pre_digest = pre_digest.map(Ok).unwrap_or_else(|| find_pre_digest::<B>(&header))?;
 
 	trace!(target: "babe", "Checking header");
-	let seal = header.digest_mut().pop()
+	let seal = header
+		.digest_mut()
+		.pop()
 		.ok_or_else(|| babe_err(Error::HeaderUnsealed(header.hash())))?;
 
-	let sig = seal.as_babe_seal().ok_or_else(|| {
-		babe_err(Error::HeaderBadSeal(header.hash()))
-	})?;
+	let sig = seal
+		.as_babe_seal()
+		.ok_or_else(|| babe_err(Error::HeaderBadSeal(header.hash())))?;
 
 	// the pre-hash of the header doesn't include the seal
 	// and that's what we sign
@@ -84,7 +86,7 @@ pub(super) fn check_header<B: BlockT + Sized>(
 
 	if pre_digest.slot() > slot_now {
 		header.digest_mut().push(seal);
-		return Ok(CheckedHeader::Deferred(header, pre_digest.slot()));
+		return Ok(CheckedHeader::Deferred(header, pre_digest.slot()))
 	}
 
 	let author = match authorities.get(pre_digest.authority_index() as usize) {
@@ -100,45 +102,31 @@ pub(super) fn check_header<B: BlockT + Sized>(
 				primary.slot,
 			);
 
-			check_primary_header::<B>(
-				pre_hash,
-				primary,
-				sig,
-				&epoch,
-				epoch.config.c,
-			)?;
+			check_primary_header::<B>(pre_hash, primary, sig, &epoch, epoch.config.c)?;
 		},
-		PreDigest::SecondaryPlain(secondary) if epoch.config.allowed_slots.is_secondary_plain_slots_allowed() => {
+		PreDigest::SecondaryPlain(secondary)
+			if epoch.config.allowed_slots.is_secondary_plain_slots_allowed() =>
+		{
 			debug!(target: "babe",
 				"Verifying secondary plain block #{} at slot: {}",
 				header.number(),
 				secondary.slot,
 			);
 
-			check_secondary_plain_header::<B>(
-				pre_hash,
-				secondary,
-				sig,
-				&epoch,
-			)?;
-		},
-		PreDigest::SecondaryVRF(secondary) if epoch.config.allowed_slots.is_secondary_vrf_slots_allowed() => {
+			check_secondary_plain_header::<B>(pre_hash, secondary, sig, &epoch)?;
+		}
+		PreDigest::SecondaryVRF(secondary)
+			if epoch.config.allowed_slots.is_secondary_vrf_slots_allowed() =>
+		{
 			debug!(target: "babe",
 				"Verifying secondary VRF block #{} at slot: {}",
 				header.number(),
 				secondary.slot,
 			);
 
-			check_secondary_vrf_header::<B>(
-				pre_hash,
-				secondary,
-				sig,
-				&epoch,
-			)?;
-		},
-		_ => {
-			return Err(babe_err(Error::SecondarySlotAssignmentsDisabled));
+			check_secondary_vrf_header::<B>(pre_hash, secondary, sig, &epoch)?;
 		}
+		_ => return Err(babe_err(Error::SecondarySlotAssignmentsDisabled)),
 	}
 
 	let info = VerifiedHeaderInfo {
@@ -170,27 +158,20 @@ fn check_primary_header<B: BlockT + Sized>(
 
 	if AuthorityPair::verify(&signature, pre_hash, &author) {
 		let (inout, _) = {
-			let transcript = make_transcript(
-				&epoch.randomness,
-				pre_digest.slot,
-				epoch.epoch_index,
-			);
+			let transcript = make_transcript(&epoch.randomness, pre_digest.slot, epoch.epoch_index);
 
-			schnorrkel::PublicKey::from_bytes(author.as_slice()).and_then(|p| {
-				p.vrf_verify(transcript, &pre_digest.vrf_output, &pre_digest.vrf_proof)
-			}).map_err(|s| {
-				babe_err(Error::VRFVerificationFailed(s))
-			})?
+			schnorrkel::PublicKey::from_bytes(author.as_slice())
+				.and_then(|p| {
+					p.vrf_verify(transcript, &pre_digest.vrf_output, &pre_digest.vrf_proof)
+				})
+				.map_err(|s| babe_err(Error::VRFVerificationFailed(s)))?
 		};
 
-		let threshold = calculate_primary_threshold(
-			c,
-			&epoch.authorities,
-			pre_digest.authority_index as usize,
-		);
+		let threshold =
+			calculate_primary_threshold(c, &epoch.authorities, pre_digest.authority_index as usize);
 
 		if !check_primary_threshold(&inout, threshold) {
-			return Err(babe_err(Error::VRFVerificationOfBlockFailed(author.clone(), threshold)));
+			return Err(babe_err(Error::VRFVerificationOfBlockFailed(author.clone(), threshold)))
 		}
 
 		Ok(())
@@ -211,16 +192,14 @@ fn check_secondary_plain_header<B: BlockT>(
 ) -> Result<(), Error<B>> {
 	// check the signature is valid under the expected authority and
 	// chain state.
-	let expected_author = secondary_slot_author(
-		pre_digest.slot,
-		&epoch.authorities,
-		epoch.randomness,
-	).ok_or_else(|| Error::NoSecondaryAuthorExpected)?;
+	let expected_author =
+		secondary_slot_author(pre_digest.slot, &epoch.authorities, epoch.randomness)
+			.ok_or_else(|| Error::NoSecondaryAuthorExpected)?;
 
 	let author = &epoch.authorities[pre_digest.authority_index as usize].0;
 
 	if expected_author != author {
-		return Err(Error::InvalidAuthor(expected_author.clone(), author.clone()));
+		return Err(Error::InvalidAuthor(expected_author.clone(), author.clone()))
 	}
 
 	if AuthorityPair::verify(&signature, pre_hash.as_ref(), author) {
@@ -239,30 +218,22 @@ fn check_secondary_vrf_header<B: BlockT>(
 ) -> Result<(), Error<B>> {
 	// check the signature is valid under the expected authority and
 	// chain state.
-	let expected_author = secondary_slot_author(
-		pre_digest.slot,
-		&epoch.authorities,
-		epoch.randomness,
-	).ok_or_else(|| Error::NoSecondaryAuthorExpected)?;
+	let expected_author =
+		secondary_slot_author(pre_digest.slot, &epoch.authorities, epoch.randomness)
+			.ok_or_else(|| Error::NoSecondaryAuthorExpected)?;
 
 	let author = &epoch.authorities[pre_digest.authority_index as usize].0;
 
 	if expected_author != author {
-		return Err(Error::InvalidAuthor(expected_author.clone(), author.clone()));
+		return Err(Error::InvalidAuthor(expected_author.clone(), author.clone()))
 	}
 
 	if AuthorityPair::verify(&signature, pre_hash.as_ref(), author) {
-		let transcript = make_transcript(
-			&epoch.randomness,
-			pre_digest.slot,
-			epoch.epoch_index,
-		);
-
-		schnorrkel::PublicKey::from_bytes(author.as_slice()).and_then(|p| {
-			p.vrf_verify(transcript, &pre_digest.vrf_output, &pre_digest.vrf_proof)
-		}).map_err(|s| {
-			babe_err(Error::VRFVerificationFailed(s))
-		})?;
+		let transcript = make_transcript(&epoch.randomness, pre_digest.slot, epoch.epoch_index);
+
+		schnorrkel::PublicKey::from_bytes(author.as_slice())
+			.and_then(|p| p.vrf_verify(transcript, &pre_digest.vrf_output, &pre_digest.vrf_proof))
+			.map_err(|s| babe_err(Error::VRFVerificationFailed(s)))?;
 
 		Ok(())
 	} else {
diff --git a/client/consensus/common/src/longest_chain.rs b/client/consensus/common/src/longest_chain.rs
index e1fbb600fa44..b1f7f94f9eb2 100644
--- a/client/consensus/common/src/longest_chain.rs
+++ b/client/consensus/common/src/longest_chain.rs
@@ -18,30 +18,26 @@
 
 //! Longest chain implementation
 
-use std::sync::Arc;
-use std::marker::PhantomData;
 use sc_client_api::backend;
-use sp_consensus::{SelectChain, Error as ConsensusError};
 use sp_blockchain::{Backend, HeaderBackend};
+use sp_consensus::{Error as ConsensusError, SelectChain};
 use sp_runtime::{
-	traits::{NumberFor, Block as BlockT},
 	generic::BlockId,
+	traits::{Block as BlockT, NumberFor},
 };
+use std::{marker::PhantomData, sync::Arc};
 
 /// Implement Longest Chain Select implementation
 /// where 'longest' is defined as the highest number of blocks
 pub struct LongestChain<B, Block> {
 	backend: Arc<B>,
-	_phantom: PhantomData<Block>
+	_phantom: PhantomData<Block>,
 }
 
 impl<B, Block> Clone for LongestChain<B, Block> {
 	fn clone(&self) -> Self {
 		let backend = self.backend.clone();
-		LongestChain {
-			backend,
-			_phantom: Default::default()
-		}
+		LongestChain { backend, _phantom: Default::default() }
 	}
 }
 
@@ -52,21 +48,22 @@ where
 {
 	/// Instantiate a new LongestChain for Backend B
 	pub fn new(backend: Arc<B>) -> Self {
-		LongestChain {
-			backend,
-			_phantom: Default::default(),
-		}
+		LongestChain { backend, _phantom: Default::default() }
 	}
 
 	fn best_block_header(&self) -> sp_blockchain::Result<<Block as BlockT>::Header> {
 		let info = self.backend.blockchain().info();
 		let import_lock = self.backend.get_import_lock();
-		let best_hash = self.backend
+		let best_hash = self
+			.backend
 			.blockchain()
 			.best_containing(info.best_hash, None, import_lock)?
 			.unwrap_or(info.best_hash);
 
-		Ok(self.backend.blockchain().header(BlockId::Hash(best_hash))?
+		Ok(self
+			.backend
+			.blockchain()
+			.header(BlockId::Hash(best_hash))?
 			.expect("given block hash was fetched from block in db; qed"))
 	}
 
diff --git a/client/consensus/common/src/shared_data.rs b/client/consensus/common/src/shared_data.rs
index 8132a42a4b92..e1797bc6f517 100644
--- a/client/consensus/common/src/shared_data.rs
+++ b/client/consensus/common/src/shared_data.rs
@@ -18,8 +18,8 @@
 
 //! Provides a generic wrapper around shared data. See [`SharedData`] for more information.
 
+use parking_lot::{Condvar, MappedMutexGuard, Mutex, MutexGuard};
 use std::sync::Arc;
-use parking_lot::{Mutex, MappedMutexGuard, Condvar, MutexGuard};
 
 /// Created by [`SharedDataLocked::release_mutex`].
 ///
@@ -75,8 +75,7 @@ impl<'a, T> SharedDataLocked<'a, T> {
 	/// Release the mutex, but keep the shared data locked.
 	pub fn release_mutex(mut self) -> SharedDataLockedUpgradable<T> {
 		SharedDataLockedUpgradable {
-			shared_data: self.shared_data.take()
-				.expect("`shared_data` is only taken on drop; qed"),
+			shared_data: self.shared_data.take().expect("`shared_data` is only taken on drop; qed"),
 		}
 	}
 }
@@ -132,7 +131,7 @@ struct SharedDataInner<T> {
 /// # Example
 ///
 /// ```
-///# use sc_consensus::shared_data::SharedData;
+/// # use sc_consensus::shared_data::SharedData;
 ///
 /// let shared_data = SharedData::new(String::from("hello world"));
 ///
@@ -174,10 +173,7 @@ pub struct SharedData<T> {
 
 impl<T> Clone for SharedData<T> {
 	fn clone(&self) -> Self {
-		Self {
-			inner: self.inner.clone(),
-			cond_var: self.cond_var.clone(),
-		}
+		Self { inner: self.inner.clone(), cond_var: self.cond_var.clone() }
 	}
 }
 
@@ -228,10 +224,7 @@ impl<T> SharedData<T> {
 		debug_assert!(!guard.locked);
 		guard.locked = true;
 
-		SharedDataLocked {
-			inner: guard,
-			shared_data: Some(self.clone()),
-		}
+		SharedDataLocked { inner: guard, shared_data: Some(self.clone()) }
 	}
 }
 
diff --git a/client/consensus/epochs/src/lib.rs b/client/consensus/epochs/src/lib.rs
index 98a3e8353051..e93724e5895f 100644
--- a/client/consensus/epochs/src/lib.rs
+++ b/client/consensus/epochs/src/lib.rs
@@ -20,12 +20,16 @@
 
 pub mod migration;
 
-use std::{ops::Add, collections::BTreeMap, borrow::{Borrow, BorrowMut}};
-use codec::{Encode, Decode};
+use codec::{Decode, Encode};
 use fork_tree::ForkTree;
 use sc_client_api::utils::is_descendent_of;
-use sp_blockchain::{HeaderMetadata, HeaderBackend, Error as ClientError};
+use sp_blockchain::{Error as ClientError, HeaderBackend, HeaderMetadata};
 use sp_runtime::traits::{Block as BlockT, NumberFor, One, Zero};
+use std::{
+	borrow::{Borrow, BorrowMut},
+	collections::BTreeMap,
+	ops::Add,
+};
 
 /// A builder for `is_descendent_of` functions.
 pub trait IsDescendentOfBuilder<Hash> {
@@ -41,8 +45,7 @@ pub trait IsDescendentOfBuilder<Hash> {
 	/// details aren't yet stored, but its parent is.
 	///
 	/// The format of `current` when `Some` is `(current, current_parent)`.
-	fn build_is_descendent_of(&self, current: Option<(Hash, Hash)>)
-		-> Self::IsDescendentOf;
+	fn build_is_descendent_of(&self, current: Option<(Hash, Hash)>) -> Self::IsDescendentOf;
 }
 
 /// Produce a descendent query object given the client.
@@ -55,16 +58,18 @@ pub fn descendent_query<H, Block>(client: &H) -> HeaderBackendDescendentBuilder<
 pub struct HeaderBackendDescendentBuilder<H, Block>(H, std::marker::PhantomData<Block>);
 
 impl<'a, H, Block> IsDescendentOfBuilder<Block::Hash>
-	for HeaderBackendDescendentBuilder<&'a H, Block> where
-	H: HeaderBackend<Block> + HeaderMetadata<Block, Error=ClientError>,
+	for HeaderBackendDescendentBuilder<&'a H, Block>
+where
+	H: HeaderBackend<Block> + HeaderMetadata<Block, Error = ClientError>,
 	Block: BlockT,
 {
 	type Error = ClientError;
 	type IsDescendentOf = Box<dyn Fn(&Block::Hash, &Block::Hash) -> Result<bool, ClientError> + 'a>;
 
-	fn build_is_descendent_of(&self, current: Option<(Block::Hash, Block::Hash)>)
-		-> Self::IsDescendentOf
-	{
+	fn build_is_descendent_of(
+		&self,
+		current: Option<(Block::Hash, Block::Hash)>,
+	) -> Self::IsDescendentOf {
 		Box::new(is_descendent_of(self.0, current))
 	}
 }
@@ -90,10 +95,7 @@ pub trait Epoch {
 
 impl<'a, E: Epoch> From<&'a E> for EpochHeader<E> {
 	fn from(epoch: &'a E) -> EpochHeader<E> {
-		Self {
-			start_slot: epoch.start_slot(),
-			end_slot: epoch.end_slot(),
-		}
+		Self { start_slot: epoch.start_slot(), end_slot: epoch.end_slot() }
 	}
 }
 
@@ -109,10 +111,7 @@ pub struct EpochHeader<E: Epoch> {
 
 impl<E: Epoch> Clone for EpochHeader<E> {
 	fn clone(&self) -> Self {
-		Self {
-			start_slot: self.start_slot,
-			end_slot: self.end_slot,
-		}
+		Self { start_slot: self.start_slot, end_slot: self.end_slot }
 	}
 }
 
@@ -149,7 +148,8 @@ pub enum ViableEpoch<E, ERef = E> {
 	Signaled(ERef),
 }
 
-impl<E, ERef> AsRef<E> for ViableEpoch<E, ERef> where
+impl<E, ERef> AsRef<E> for ViableEpoch<E, ERef>
+where
 	ERef: Borrow<E>,
 {
 	fn as_ref(&self) -> &E {
@@ -160,7 +160,8 @@ impl<E, ERef> AsRef<E> for ViableEpoch<E, ERef> where
 	}
 }
 
-impl<E, ERef> AsMut<E> for ViableEpoch<E, ERef> where
+impl<E, ERef> AsMut<E> for ViableEpoch<E, ERef>
+where
 	ERef: BorrowMut<E>,
 {
 	fn as_mut(&mut self) -> &mut E {
@@ -171,7 +172,8 @@ impl<E, ERef> AsMut<E> for ViableEpoch<E, ERef> where
 	}
 }
 
-impl<E, ERef> ViableEpoch<E, ERef> where
+impl<E, ERef> ViableEpoch<E, ERef>
+where
 	E: Epoch + Clone,
 	ERef: Borrow<E>,
 {
@@ -187,18 +189,14 @@ impl<E, ERef> ViableEpoch<E, ERef> where
 	/// Get cloned value for the viable epoch.
 	pub fn into_cloned(self) -> ViableEpoch<E, E> {
 		match self {
-			ViableEpoch::UnimportedGenesis(e) =>
-				ViableEpoch::UnimportedGenesis(e),
+			ViableEpoch::UnimportedGenesis(e) => ViableEpoch::UnimportedGenesis(e),
 			ViableEpoch::Signaled(e) => ViableEpoch::Signaled(e.borrow().clone()),
 		}
 	}
 
 	/// Increment the epoch, yielding an `IncrementedEpoch` to be imported
 	/// into the fork-tree.
-	pub fn increment(
-		&self,
-		next_descriptor: E::NextEpochDescriptor
-	) -> IncrementedEpoch<E> {
+	pub fn increment(&self, next_descriptor: E::NextEpochDescriptor) -> IncrementedEpoch<E> {
 		let next = self.as_ref().increment(next_descriptor);
 		let to_persist = match *self {
 			ViableEpoch::UnimportedGenesis(ref epoch_0) =>
@@ -216,7 +214,7 @@ pub enum ViableEpochDescriptor<Hash, Number, E: Epoch> {
 	/// The epoch is an unimported genesis, with given start slot number.
 	UnimportedGenesis(E::Slot),
 	/// The epoch is signaled and has been imported, with given identifier and header.
-	Signaled(EpochIdentifier<Hash, Number>, EpochHeader<E>)
+	Signaled(EpochIdentifier<Hash, Number>, EpochHeader<E>),
 }
 
 impl<Hash, Number, E: Epoch> ViableEpochDescriptor<Hash, Number, E> {
@@ -243,8 +241,7 @@ impl<'a, E: Epoch> From<&'a PersistedEpoch<E>> for PersistedEpochHeader<E> {
 		match epoch {
 			PersistedEpoch::Genesis(ref epoch_0, ref epoch_1) =>
 				PersistedEpochHeader::Genesis(epoch_0.into(), epoch_1.into()),
-			PersistedEpoch::Regular(ref epoch_n) =>
-				PersistedEpochHeader::Regular(epoch_n.into()),
+			PersistedEpoch::Regular(ref epoch_n) => PersistedEpochHeader::Regular(epoch_n.into()),
 		}
 	}
 }
@@ -312,7 +309,8 @@ fn fake_head_hash<H: AsRef<[u8]> + AsMut<[u8]> + Clone>(parent_hash: &H) -> H {
 	h
 }
 
-impl<Hash, Number, E: Epoch> Default for EpochChanges<Hash, Number, E> where
+impl<Hash, Number, E: Epoch> Default for EpochChanges<Hash, Number, E>
+where
 	Hash: PartialEq + Ord,
 	Number: Ord,
 {
@@ -321,9 +319,10 @@ impl<Hash, Number, E: Epoch> Default for EpochChanges<Hash, Number, E> where
 	}
 }
 
-impl<Hash, Number, E: Epoch> EpochChanges<Hash, Number, E> where
+impl<Hash, Number, E: Epoch> EpochChanges<Hash, Number, E>
+where
 	Hash: PartialEq + Ord + AsRef<[u8]> + AsMut<[u8]> + Copy,
-	Number: Ord + One + Zero + Add<Output=Number> + Copy,
+	Number: Ord + One + Zero + Add<Output = Number> + Copy,
 {
 	/// Create a new epoch change.
 	pub fn new() -> Self {
@@ -337,51 +336,38 @@ impl<Hash, Number, E: Epoch> EpochChanges<Hash, Number, E> where
 	}
 
 	/// Map the epoch changes from one storing data to a different one.
-	pub fn map<B, F>(self, mut f: F) -> EpochChanges<Hash, Number, B> where
-		B: Epoch<Slot=E::Slot>,
+	pub fn map<B, F>(self, mut f: F) -> EpochChanges<Hash, Number, B>
+	where
+		B: Epoch<Slot = E::Slot>,
 		F: FnMut(&Hash, &Number, E) -> B,
 	{
 		EpochChanges {
-			inner: self.inner.map(&mut |_, _, header| {
-				match header {
-					PersistedEpochHeader::Genesis(epoch_0, epoch_1) => {
-						PersistedEpochHeader::Genesis(
-							EpochHeader {
-								start_slot: epoch_0.start_slot,
-								end_slot: epoch_0.end_slot,
-							},
-							EpochHeader {
-								start_slot: epoch_1.start_slot,
-								end_slot: epoch_1.end_slot,
-							},
-						)
-					},
-					PersistedEpochHeader::Regular(epoch_n) => {
-						PersistedEpochHeader::Regular(
-							EpochHeader {
-								start_slot: epoch_n.start_slot,
-								end_slot: epoch_n.end_slot,
-							},
-						)
-					},
-				}
+			inner: self.inner.map(&mut |_, _, header| match header {
+				PersistedEpochHeader::Genesis(epoch_0, epoch_1) => PersistedEpochHeader::Genesis(
+					EpochHeader { start_slot: epoch_0.start_slot, end_slot: epoch_0.end_slot },
+					EpochHeader { start_slot: epoch_1.start_slot, end_slot: epoch_1.end_slot },
+				),
+				PersistedEpochHeader::Regular(epoch_n) =>
+					PersistedEpochHeader::Regular(EpochHeader {
+						start_slot: epoch_n.start_slot,
+						end_slot: epoch_n.end_slot,
+					}),
 			}),
-			epochs: self.epochs.into_iter().map(|((hash, number), epoch)| {
-				let bepoch = match epoch {
-					PersistedEpoch::Genesis(epoch_0, epoch_1) => {
-						PersistedEpoch::Genesis(
+			epochs: self
+				.epochs
+				.into_iter()
+				.map(|((hash, number), epoch)| {
+					let bepoch = match epoch {
+						PersistedEpoch::Genesis(epoch_0, epoch_1) => PersistedEpoch::Genesis(
 							f(&hash, &number, epoch_0),
 							f(&hash, &number, epoch_1),
-						)
-					},
-					PersistedEpoch::Regular(epoch_n) => {
-						PersistedEpoch::Regular(
-							f(&hash, &number, epoch_n)
-						)
-					},
-				};
-				((hash, number), bepoch)
-			}).collect(),
+						),
+						PersistedEpoch::Regular(epoch_n) =>
+							PersistedEpoch::Regular(f(&hash, &number, epoch_n)),
+					};
+					((hash, number), bepoch)
+				})
+				.collect(),
 		}
 	}
 
@@ -395,25 +381,17 @@ impl<Hash, Number, E: Epoch> EpochChanges<Hash, Number, E> where
 		number: Number,
 		slot: E::Slot,
 	) -> Result<(), fork_tree::Error<D::Error>> {
-		let is_descendent_of = descendent_of_builder
-			.build_is_descendent_of(None);
+		let is_descendent_of = descendent_of_builder.build_is_descendent_of(None);
 
 		let predicate = |epoch: &PersistedEpochHeader<E>| match *epoch {
-			PersistedEpochHeader::Genesis(_, ref epoch_1) =>
-				slot >= epoch_1.end_slot,
-			PersistedEpochHeader::Regular(ref epoch_n) =>
-				slot >= epoch_n.end_slot,
+			PersistedEpochHeader::Genesis(_, ref epoch_1) => slot >= epoch_1.end_slot,
+			PersistedEpochHeader::Regular(ref epoch_n) => slot >= epoch_n.end_slot,
 		};
 
 		// prune any epochs which could not be _live_ as of the children of the
 		// finalized block, i.e. re-root the fork tree to the oldest ancestor of
 		// (hash, number) where epoch.end_slot() >= finalized_slot
-		let removed = self.inner.prune(
-			hash,
-			&number,
-			&is_descendent_of,
-			&predicate,
-		)?;
+		let removed = self.inner.prune(hash, &number, &is_descendent_of, &predicate)?;
 
 		for (hash, number, _) in removed {
 			self.epochs.remove(&(hash, number));
@@ -424,18 +402,18 @@ impl<Hash, Number, E: Epoch> EpochChanges<Hash, Number, E> where
 
 	/// Get a reference to an epoch with given identifier.
 	pub fn epoch(&self, id: &EpochIdentifier<Hash, Number>) -> Option<&E> {
-		self.epochs.get(&(id.hash, id.number))
-			.and_then(|v| {
-				match v {
-					PersistedEpoch::Genesis(ref epoch_0, _)
-						if id.position == EpochIdentifierPosition::Genesis0 => Some(epoch_0),
-					PersistedEpoch::Genesis(_, ref epoch_1)
-						if id.position == EpochIdentifierPosition::Genesis1 => Some(epoch_1),
-					PersistedEpoch::Regular(ref epoch_n)
-						if id.position == EpochIdentifierPosition::Regular => Some(epoch_n),
-					_ => None,
-				}
-			})
+		self.epochs.get(&(id.hash, id.number)).and_then(|v| match v {
+			PersistedEpoch::Genesis(ref epoch_0, _)
+				if id.position == EpochIdentifierPosition::Genesis0 =>
+				Some(epoch_0),
+			PersistedEpoch::Genesis(_, ref epoch_1)
+				if id.position == EpochIdentifierPosition::Genesis1 =>
+				Some(epoch_1),
+			PersistedEpoch::Regular(ref epoch_n)
+				if id.position == EpochIdentifierPosition::Regular =>
+				Some(epoch_n),
+			_ => None,
+		})
 	}
 
 	/// Get a reference to a viable epoch with given descriptor.
@@ -443,33 +421,32 @@ impl<Hash, Number, E: Epoch> EpochChanges<Hash, Number, E> where
 		&self,
 		descriptor: &ViableEpochDescriptor<Hash, Number, E>,
 		make_genesis: G,
-	) -> Option<ViableEpoch<E, &E>> where
-		G: FnOnce(E::Slot) -> E
+	) -> Option<ViableEpoch<E, &E>>
+	where
+		G: FnOnce(E::Slot) -> E,
 	{
 		match descriptor {
-			ViableEpochDescriptor::UnimportedGenesis(slot) => {
-				Some(ViableEpoch::UnimportedGenesis(make_genesis(*slot)))
-			},
-			ViableEpochDescriptor::Signaled(identifier, _) => {
-				self.epoch(&identifier).map(ViableEpoch::Signaled)
-			},
+			ViableEpochDescriptor::UnimportedGenesis(slot) =>
+				Some(ViableEpoch::UnimportedGenesis(make_genesis(*slot))),
+			ViableEpochDescriptor::Signaled(identifier, _) =>
+				self.epoch(&identifier).map(ViableEpoch::Signaled),
 		}
 	}
 
 	/// Get a mutable reference to an epoch with given identifier.
 	pub fn epoch_mut(&mut self, id: &EpochIdentifier<Hash, Number>) -> Option<&mut E> {
-		self.epochs.get_mut(&(id.hash, id.number))
-			.and_then(|v| {
-				match v {
-					PersistedEpoch::Genesis(ref mut epoch_0, _)
-						if id.position == EpochIdentifierPosition::Genesis0 => Some(epoch_0),
-					PersistedEpoch::Genesis(_, ref mut epoch_1)
-						if id.position == EpochIdentifierPosition::Genesis1 => Some(epoch_1),
-					PersistedEpoch::Regular(ref mut epoch_n)
-						if id.position == EpochIdentifierPosition::Regular => Some(epoch_n),
-					_ => None,
-				}
-			})
+		self.epochs.get_mut(&(id.hash, id.number)).and_then(|v| match v {
+			PersistedEpoch::Genesis(ref mut epoch_0, _)
+				if id.position == EpochIdentifierPosition::Genesis0 =>
+				Some(epoch_0),
+			PersistedEpoch::Genesis(_, ref mut epoch_1)
+				if id.position == EpochIdentifierPosition::Genesis1 =>
+				Some(epoch_1),
+			PersistedEpoch::Regular(ref mut epoch_n)
+				if id.position == EpochIdentifierPosition::Regular =>
+				Some(epoch_n),
+			_ => None,
+		})
 	}
 
 	/// Get a mutable reference to a viable epoch with given descriptor.
@@ -477,16 +454,15 @@ impl<Hash, Number, E: Epoch> EpochChanges<Hash, Number, E> where
 		&mut self,
 		descriptor: &ViableEpochDescriptor<Hash, Number, E>,
 		make_genesis: G,
-	) -> Option<ViableEpoch<E, &mut E>> where
-		G: FnOnce(E::Slot) -> E
+	) -> Option<ViableEpoch<E, &mut E>>
+	where
+		G: FnOnce(E::Slot) -> E,
 	{
 		match descriptor {
-			ViableEpochDescriptor::UnimportedGenesis(slot) => {
-				Some(ViableEpoch::UnimportedGenesis(make_genesis(*slot)))
-			},
-			ViableEpochDescriptor::Signaled(identifier, _) => {
-				self.epoch_mut(&identifier).map(ViableEpoch::Signaled)
-			},
+			ViableEpochDescriptor::UnimportedGenesis(slot) =>
+				Some(ViableEpoch::UnimportedGenesis(make_genesis(*slot))),
+			ViableEpochDescriptor::Signaled(identifier, _) =>
+				self.epoch_mut(&identifier).map(ViableEpoch::Signaled),
 		}
 	}
 
@@ -497,18 +473,15 @@ impl<Hash, Number, E: Epoch> EpochChanges<Hash, Number, E> where
 	pub fn epoch_data<G>(
 		&self,
 		descriptor: &ViableEpochDescriptor<Hash, Number, E>,
-		make_genesis: G
-	) -> Option<E> where
+		make_genesis: G,
+	) -> Option<E>
+	where
 		G: FnOnce(E::Slot) -> E,
 		E: Clone,
 	{
 		match descriptor {
-			ViableEpochDescriptor::UnimportedGenesis(slot) => {
-				Some(make_genesis(*slot))
-			},
-			ViableEpochDescriptor::Signaled(identifier, _) => {
-				self.epoch(&identifier).cloned()
-			},
+			ViableEpochDescriptor::UnimportedGenesis(slot) => Some(make_genesis(*slot)),
+			ViableEpochDescriptor::Signaled(identifier, _) => self.epoch(&identifier).cloned(),
 		}
 	}
 
@@ -524,7 +497,8 @@ impl<Hash, Number, E: Epoch> EpochChanges<Hash, Number, E> where
 		parent_number: Number,
 		slot: E::Slot,
 		make_genesis: G,
-	) -> Result<Option<E>, fork_tree::Error<D::Error>> where
+	) -> Result<Option<E>, fork_tree::Error<D::Error>>
+	where
 		G: FnOnce(E::Slot) -> E,
 		E: Clone,
 	{
@@ -532,7 +506,7 @@ impl<Hash, Number, E: Epoch> EpochChanges<Hash, Number, E> where
 			descendent_of_builder,
 			parent_hash,
 			parent_number,
-			slot
+			slot,
 		)?;
 
 		Ok(descriptor.and_then(|des| self.epoch_data(&des, make_genesis)))
@@ -555,8 +529,8 @@ impl<Hash, Number, E: Epoch> EpochChanges<Hash, Number, E> where
 		// "descends" from our parent-hash.
 		let fake_head_hash = fake_head_hash(parent_hash);
 
-		let is_descendent_of = descendent_of_builder
-			.build_is_descendent_of(Some((fake_head_hash, *parent_hash)));
+		let is_descendent_of =
+			descendent_of_builder.build_is_descendent_of(Some((fake_head_hash, *parent_hash)));
 
 		if parent_number == Zero::zero() {
 			// need to insert the genesis epoch.
@@ -569,37 +543,41 @@ impl<Hash, Number, E: Epoch> EpochChanges<Hash, Number, E> where
 		// at epoch_1 -- all we're doing here is figuring out which node
 		// we need.
 		let predicate = |epoch: &PersistedEpochHeader<E>| match *epoch {
-			PersistedEpochHeader::Genesis(ref epoch_0, _) =>
-				epoch_0.start_slot <= slot,
-			PersistedEpochHeader::Regular(ref epoch_n) =>
-				epoch_n.start_slot <= slot,
+			PersistedEpochHeader::Genesis(ref epoch_0, _) => epoch_0.start_slot <= slot,
+			PersistedEpochHeader::Regular(ref epoch_n) => epoch_n.start_slot <= slot,
 		};
 
-		self.inner.find_node_where(
-			&fake_head_hash,
-			&(parent_number + One::one()),
-			&is_descendent_of,
-			&predicate,
-		)
+		self.inner
+			.find_node_where(
+				&fake_head_hash,
+				&(parent_number + One::one()),
+				&is_descendent_of,
+				&predicate,
+			)
 			.map(|n| {
-				n.map(|node| (match node.data {
-					// Ok, we found our node.
-					// and here we figure out which of the internal epochs
-					// of a genesis node to use based on their start slot.
-					PersistedEpochHeader::Genesis(ref epoch_0, ref epoch_1) =>
-						if epoch_1.start_slot <= slot {
-							(EpochIdentifierPosition::Genesis1, epoch_1.clone())
-						} else {
-							(EpochIdentifierPosition::Genesis0, epoch_0.clone())
+				n.map(|node| {
+					(
+						match node.data {
+							// Ok, we found our node.
+							// and here we figure out which of the internal epochs
+							// of a genesis node to use based on their start slot.
+							PersistedEpochHeader::Genesis(ref epoch_0, ref epoch_1) =>
+								if epoch_1.start_slot <= slot {
+									(EpochIdentifierPosition::Genesis1, epoch_1.clone())
+								} else {
+									(EpochIdentifierPosition::Genesis0, epoch_0.clone())
+								},
+							PersistedEpochHeader::Regular(ref epoch_n) =>
+								(EpochIdentifierPosition::Regular, epoch_n.clone()),
 						},
-					PersistedEpochHeader::Regular(ref epoch_n) =>
-						(EpochIdentifierPosition::Regular, epoch_n.clone()),
-				}, node)).map(|((position, header), node)| {
-					ViableEpochDescriptor::Signaled(EpochIdentifier {
-						position,
-						hash: node.hash,
-						number: node.number
-					}, header)
+						node,
+					)
+				})
+				.map(|((position, header), node)| {
+					ViableEpochDescriptor::Signaled(
+						EpochIdentifier { position, hash: node.hash, number: node.number },
+						header,
+					)
 				})
 			})
 	}
@@ -617,16 +595,11 @@ impl<Hash, Number, E: Epoch> EpochChanges<Hash, Number, E> where
 		parent_hash: Hash,
 		epoch: IncrementedEpoch<E>,
 	) -> Result<(), fork_tree::Error<D::Error>> {
-		let is_descendent_of = descendent_of_builder
-			.build_is_descendent_of(Some((hash, parent_hash)));
+		let is_descendent_of =
+			descendent_of_builder.build_is_descendent_of(Some((hash, parent_hash)));
 		let header = PersistedEpochHeader::<E>::from(&epoch.0);
 
-		let res = self.inner.import(
-			hash,
-			number,
-			header,
-			&is_descendent_of,
-		);
+		let res = self.inner.import(hash, number, header, &is_descendent_of);
 
 		match res {
 			Ok(_) | Err(fork_tree::Error::Duplicate) => {
@@ -653,8 +626,7 @@ pub type SharedEpochChanges<Block, Epoch> =
 
 #[cfg(test)]
 mod tests {
-	use super::*;
-	use super::Epoch as EpochT;
+	use super::{Epoch as EpochT, *};
 
 	#[derive(Debug, PartialEq)]
 	pub struct TestError;
@@ -667,15 +639,14 @@ mod tests {
 
 	impl std::error::Error for TestError {}
 
-	impl<'a, F: 'a , H: 'a + PartialEq + std::fmt::Debug> IsDescendentOfBuilder<H> for &'a F
-		where F: Fn(&H, &H) -> Result<bool, TestError>
+	impl<'a, F: 'a, H: 'a + PartialEq + std::fmt::Debug> IsDescendentOfBuilder<H> for &'a F
+	where
+		F: Fn(&H, &H) -> Result<bool, TestError>,
 	{
 		type Error = TestError;
 		type IsDescendentOf = Box<dyn Fn(&H, &H) -> Result<bool, TestError> + 'a>;
 
-		fn build_is_descendent_of(&self, current: Option<(H, H)>)
-			-> Self::IsDescendentOf
-		{
+		fn build_is_descendent_of(&self, current: Option<(H, H)>) -> Self::IsDescendentOf {
 			let f = *self;
 			Box::new(move |base, head| {
 				let mut head = head;
@@ -683,7 +654,7 @@ mod tests {
 				if let Some((ref c_head, ref c_parent)) = current {
 					if head == c_head {
 						if base == c_parent {
-							return Ok(true);
+							return Ok(true)
 						} else {
 							head = c_parent;
 						}
@@ -709,10 +680,7 @@ mod tests {
 		type Slot = Slot;
 
 		fn increment(&self, _: ()) -> Self {
-			Epoch {
-				start_slot: self.start_slot + self.duration,
-				duration: self.duration,
-			}
+			Epoch { start_slot: self.start_slot + self.duration, duration: self.duration }
 		}
 
 		fn end_slot(&self) -> Slot {
@@ -726,7 +694,6 @@ mod tests {
 
 	#[test]
 	fn genesis_epoch_is_created_but_not_imported() {
-		//
 		// A - B
 		//  \
 		//   — C
@@ -741,12 +708,10 @@ mod tests {
 		};
 
 		let epoch_changes = EpochChanges::<_, _, Epoch>::new();
-		let genesis_epoch = epoch_changes.epoch_descriptor_for_child_of(
-			&is_descendent_of,
-			b"0",
-			0,
-			10101,
-		).unwrap().unwrap();
+		let genesis_epoch = epoch_changes
+			.epoch_descriptor_for_child_of(&is_descendent_of, b"0", 0, 10101)
+			.unwrap()
+			.unwrap();
 
 		match genesis_epoch {
 			ViableEpochDescriptor::UnimportedGenesis(slot) => {
@@ -755,12 +720,10 @@ mod tests {
 			_ => panic!("should be unimported genesis"),
 		};
 
-		let genesis_epoch_2 = epoch_changes.epoch_descriptor_for_child_of(
-			&is_descendent_of,
-			b"0",
-			0,
-			10102,
-		).unwrap().unwrap();
+		let genesis_epoch_2 = epoch_changes
+			.epoch_descriptor_for_child_of(&is_descendent_of, b"0", 0, 10102)
+			.unwrap()
+			.unwrap();
 
 		match genesis_epoch_2 {
 			ViableEpochDescriptor::UnimportedGenesis(slot) => {
@@ -772,7 +735,6 @@ mod tests {
 
 	#[test]
 	fn epoch_changes_between_blocks() {
-		//
 		// A - B
 		//  \
 		//   — C
@@ -786,34 +748,23 @@ mod tests {
 			}
 		};
 
-		let make_genesis = |slot| Epoch {
-			start_slot: slot,
-			duration: 100,
-		};
+		let make_genesis = |slot| Epoch { start_slot: slot, duration: 100 };
 
 		let mut epoch_changes = EpochChanges::<_, _, Epoch>::new();
-		let genesis_epoch = epoch_changes.epoch_descriptor_for_child_of(
-			&is_descendent_of,
-			b"0",
-			0,
-			100,
-		).unwrap().unwrap();
+		let genesis_epoch = epoch_changes
+			.epoch_descriptor_for_child_of(&is_descendent_of, b"0", 0, 100)
+			.unwrap()
+			.unwrap();
 
 		assert_eq!(genesis_epoch, ViableEpochDescriptor::UnimportedGenesis(100));
 
-		let import_epoch_1 = epoch_changes
-			.viable_epoch(&genesis_epoch, &make_genesis)
-			.unwrap()
-			.increment(());
+		let import_epoch_1 =
+			epoch_changes.viable_epoch(&genesis_epoch, &make_genesis).unwrap().increment(());
 		let epoch_1 = import_epoch_1.as_ref().clone();
 
-		epoch_changes.import(
-			&is_descendent_of,
-			*b"A",
-			1,
-			*b"0",
-			import_epoch_1,
-		).unwrap();
+		epoch_changes
+			.import(&is_descendent_of, *b"A", 1, *b"0", import_epoch_1)
+			.unwrap();
 		let genesis_epoch = epoch_changes.epoch_data(&genesis_epoch, &make_genesis).unwrap();
 
 		assert!(is_descendent_of(b"0", b"A").unwrap());
@@ -823,13 +774,10 @@ mod tests {
 
 		{
 			// x is still within the genesis epoch.
-			let x = epoch_changes.epoch_data_for_child_of(
-				&is_descendent_of,
-				b"A",
-				1,
-				end_slot - 1,
-				&make_genesis,
-			).unwrap().unwrap();
+			let x = epoch_changes
+				.epoch_data_for_child_of(&is_descendent_of, b"A", 1, end_slot - 1, &make_genesis)
+				.unwrap()
+				.unwrap();
 
 			assert_eq!(x, genesis_epoch);
 		}
@@ -837,13 +785,10 @@ mod tests {
 		{
 			// x is now at the next epoch, because the block is now at the
 			// start slot of epoch 1.
-			let x = epoch_changes.epoch_data_for_child_of(
-				&is_descendent_of,
-				b"A",
-				1,
-				end_slot,
-				&make_genesis,
-			).unwrap().unwrap();
+			let x = epoch_changes
+				.epoch_data_for_child_of(&is_descendent_of, b"A", 1, end_slot, &make_genesis)
+				.unwrap()
+				.unwrap();
 
 			assert_eq!(x, epoch_1);
 		}
@@ -851,13 +796,16 @@ mod tests {
 		{
 			// x is now at the next epoch, because the block is now after
 			// start slot of epoch 1.
-			let x = epoch_changes.epoch_data_for_child_of(
-				&is_descendent_of,
-				b"A",
-				1,
-				epoch_1.end_slot() - 1,
-				&make_genesis,
-			).unwrap().unwrap();
+			let x = epoch_changes
+				.epoch_data_for_child_of(
+					&is_descendent_of,
+					b"A",
+					1,
+					epoch_1.end_slot() - 1,
+					&make_genesis,
+				)
+				.unwrap()
+				.unwrap();
 
 			assert_eq!(x, epoch_1);
 		}
@@ -880,90 +828,65 @@ mod tests {
 
 		let duration = 100;
 
-		let make_genesis = |slot| Epoch {
-			start_slot: slot,
-			duration,
-		};
+		let make_genesis = |slot| Epoch { start_slot: slot, duration };
 
 		let mut epoch_changes = EpochChanges::new();
 		let next_descriptor = ();
 
 		// insert genesis epoch for A
 		{
-			let genesis_epoch_a_descriptor = epoch_changes.epoch_descriptor_for_child_of(
-				&is_descendent_of,
-				b"0",
-				0,
-				100,
-			).unwrap().unwrap();
+			let genesis_epoch_a_descriptor = epoch_changes
+				.epoch_descriptor_for_child_of(&is_descendent_of, b"0", 0, 100)
+				.unwrap()
+				.unwrap();
 
 			let incremented_epoch = epoch_changes
 				.viable_epoch(&genesis_epoch_a_descriptor, &make_genesis)
 				.unwrap()
 				.increment(next_descriptor.clone());
 
-			epoch_changes.import(
-				&is_descendent_of,
-				*b"A",
-				1,
-				*b"0",
-				incremented_epoch,
-			).unwrap();
+			epoch_changes
+				.import(&is_descendent_of, *b"A", 1, *b"0", incremented_epoch)
+				.unwrap();
 		}
 
 		// insert genesis epoch for X
 		{
-			let genesis_epoch_x_descriptor = epoch_changes.epoch_descriptor_for_child_of(
-				&is_descendent_of,
-				b"0",
-				0,
-				1000,
-			).unwrap().unwrap();
+			let genesis_epoch_x_descriptor = epoch_changes
+				.epoch_descriptor_for_child_of(&is_descendent_of, b"0", 0, 1000)
+				.unwrap()
+				.unwrap();
 
 			let incremented_epoch = epoch_changes
 				.viable_epoch(&genesis_epoch_x_descriptor, &make_genesis)
 				.unwrap()
 				.increment(next_descriptor.clone());
 
-			epoch_changes.import(
-				&is_descendent_of,
-				*b"X",
-				1,
-				*b"0",
-				incremented_epoch,
-			).unwrap();
+			epoch_changes
+				.import(&is_descendent_of, *b"X", 1, *b"0", incremented_epoch)
+				.unwrap();
 		}
 
 		// now check that the genesis epochs for our respective block 1s
 		// respect the chain structure.
 		{
-			let epoch_for_a_child = epoch_changes.epoch_data_for_child_of(
-				&is_descendent_of,
-				b"A",
-				1,
-				101,
-				&make_genesis,
-			).unwrap().unwrap();
+			let epoch_for_a_child = epoch_changes
+				.epoch_data_for_child_of(&is_descendent_of, b"A", 1, 101, &make_genesis)
+				.unwrap()
+				.unwrap();
 
 			assert_eq!(epoch_for_a_child, make_genesis(100));
 
-			let epoch_for_x_child = epoch_changes.epoch_data_for_child_of(
-				&is_descendent_of,
-				b"X",
-				1,
-				1001,
-				&make_genesis,
-			).unwrap().unwrap();
+			let epoch_for_x_child = epoch_changes
+				.epoch_data_for_child_of(&is_descendent_of, b"X", 1, 1001, &make_genesis)
+				.unwrap()
+				.unwrap();
 
 			assert_eq!(epoch_for_x_child, make_genesis(1000));
 
-			let epoch_for_x_child_before_genesis = epoch_changes.epoch_data_for_child_of(
-				&is_descendent_of,
-				b"X",
-				1,
-				101,
-				&make_genesis,
-			).unwrap();
+			let epoch_for_x_child_before_genesis = epoch_changes
+				.epoch_data_for_child_of(&is_descendent_of, b"X", 1, 101, &make_genesis)
+				.unwrap();
 
 			// even though there is a genesis epoch at that slot, it's not in
 			// this chain.
diff --git a/client/consensus/epochs/src/migration.rs b/client/consensus/epochs/src/migration.rs
index 6e7baba8053a..49e08240df8c 100644
--- a/client/consensus/epochs/src/migration.rs
+++ b/client/consensus/epochs/src/migration.rs
@@ -18,11 +18,11 @@
 
 //! Migration types for epoch changes.
 
-use std::collections::BTreeMap;
-use codec::{Encode, Decode};
+use crate::{Epoch, EpochChanges, PersistedEpoch, PersistedEpochHeader};
+use codec::{Decode, Encode};
 use fork_tree::ForkTree;
 use sp_runtime::traits::{Block as BlockT, NumberFor};
-use crate::{Epoch, EpochChanges, PersistedEpoch, PersistedEpochHeader};
+use std::collections::BTreeMap;
 
 /// Legacy definition of epoch changes.
 #[derive(Clone, Encode, Decode)]
@@ -31,9 +31,11 @@ pub struct EpochChangesV0<Hash, Number, E: Epoch> {
 }
 
 /// Type alias for legacy definition of epoch changes.
-pub type EpochChangesForV0<Block, Epoch> = EpochChangesV0<<Block as BlockT>::Hash, NumberFor<Block>, Epoch>;
+pub type EpochChangesForV0<Block, Epoch> =
+	EpochChangesV0<<Block as BlockT>::Hash, NumberFor<Block>, Epoch>;
 
-impl<Hash, Number, E: Epoch> EpochChangesV0<Hash, Number, E> where
+impl<Hash, Number, E: Epoch> EpochChangesV0<Hash, Number, E>
+where
 	Hash: PartialEq + Ord + Copy,
 	Number: Ord + Copy,
 {
diff --git a/client/consensus/manual-seal/src/consensus.rs b/client/consensus/manual-seal/src/consensus.rs
index 0cfd99cab5c9..1f7ee413b71d 100644
--- a/client/consensus/manual-seal/src/consensus.rs
+++ b/client/consensus/manual-seal/src/consensus.rs
@@ -19,26 +19,30 @@
 //! Extensions for manual seal to produce blocks valid for any runtime.
 use super::Error;
 
-use sp_runtime::traits::{Block as BlockT, DigestFor};
-use sp_inherents::InherentData;
 use sp_consensus::BlockImportParams;
+use sp_inherents::InherentData;
+use sp_runtime::traits::{Block as BlockT, DigestFor};
 
 pub mod babe;
 
-/// Consensus data provider, manual seal uses this trait object for authoring blocks valid 
+/// Consensus data provider, manual seal uses this trait object for authoring blocks valid
 /// for any runtime.
 pub trait ConsensusDataProvider<B: BlockT>: Send + Sync {
 	/// Block import transaction type
 	type Transaction;
 
 	/// Attempt to create a consensus digest.
-	fn create_digest(&self, parent: &B::Header, inherents: &InherentData) -> Result<DigestFor<B>, Error>;
+	fn create_digest(
+		&self,
+		parent: &B::Header,
+		inherents: &InherentData,
+	) -> Result<DigestFor<B>, Error>;
 
 	/// set up the neccessary import params.
 	fn append_block_import(
 		&self,
 		parent: &B::Header,
 		params: &mut BlockImportParams<B, Self::Transaction>,
-		inherents: &InherentData
+		inherents: &InherentData,
 	) -> Result<(), Error>;
 }
diff --git a/client/consensus/manual-seal/src/consensus/babe.rs b/client/consensus/manual-seal/src/consensus/babe.rs
index fb2d47b48fed..3773c7c3cf12 100644
--- a/client/consensus/manual-seal/src/consensus/babe.rs
+++ b/client/consensus/manual-seal/src/consensus/babe.rs
@@ -21,30 +21,40 @@
 use super::ConsensusDataProvider;
 use crate::Error;
 use codec::Encode;
-use std::{borrow::Cow, sync::{Arc, atomic}, time::SystemTime};
 use sc_client_api::{AuxStore, UsageProvider};
 use sc_consensus_babe::{
-	Config, Epoch, authorship, CompatibleDigestItem, BabeIntermediate, INTERMEDIATE_KEY,
-	find_pre_digest,
+	authorship, find_pre_digest, BabeIntermediate, CompatibleDigestItem, Config, Epoch,
+	INTERMEDIATE_KEY,
+};
+use sc_consensus_epochs::{
+	descendent_query, EpochHeader, SharedEpochChanges, ViableEpochDescriptor,
 };
-use sc_consensus_epochs::{SharedEpochChanges, descendent_query, ViableEpochDescriptor, EpochHeader};
 use sp_keystore::SyncCryptoStorePtr;
+use std::{
+	borrow::Cow,
+	sync::{atomic, Arc},
+	time::SystemTime,
+};
 
 use sp_api::{ProvideRuntimeApi, TransactionFor};
 use sp_blockchain::{HeaderBackend, HeaderMetadata};
-use sp_consensus::{BlockImportParams, BlockOrigin, ForkChoiceStrategy};
-use sp_consensus_slots::Slot;
+use sp_consensus::{
+	import_queue::{CacheKeyId, Verifier},
+	BlockImportParams, BlockOrigin, ForkChoiceStrategy,
+};
 use sp_consensus_babe::{
-	BabeApi, inherents::BabeInherentData, ConsensusLog, BABE_ENGINE_ID, AuthorityId,
-	digests::{PreDigest, SecondaryPlainPreDigest, NextEpochDescriptor}, BabeAuthorityWeight,
+	digests::{NextEpochDescriptor, PreDigest, SecondaryPlainPreDigest},
+	inherents::BabeInherentData,
+	AuthorityId, BabeApi, BabeAuthorityWeight, ConsensusLog, BABE_ENGINE_ID,
 };
+use sp_consensus_slots::Slot;
 use sp_inherents::{InherentData, InherentDataProvider, InherentIdentifier};
 use sp_runtime::{
-	traits::{DigestItemFor, DigestFor, Block as BlockT, Zero, Header},
-	generic::{Digest, BlockId}, Justifications,
+	generic::{BlockId, Digest},
+	traits::{Block as BlockT, DigestFor, DigestItemFor, Header, Zero},
+	Justifications,
 };
-use sp_timestamp::{InherentType, INHERENT_IDENTIFIER, TimestampInherentData};
-use sp_consensus::import_queue::{Verifier, CacheKeyId};
+use sp_timestamp::{InherentType, TimestampInherentData, INHERENT_IDENTIFIER};
 
 /// Provides BABE-compatible predigests and BlockImportParams.
 /// Intended for use with BABE runtimes.
@@ -77,19 +87,16 @@ pub struct BabeVerifier<B: BlockT, C> {
 impl<B: BlockT, C> BabeVerifier<B, C> {
 	/// create a nrew verifier
 	pub fn new(epoch_changes: SharedEpochChanges<B, Epoch>, client: Arc<C>) -> BabeVerifier<B, C> {
-		BabeVerifier {
-			epoch_changes,
-			client,
-		}
+		BabeVerifier { epoch_changes, client }
 	}
 }
 
 /// The verifier for the manual seal engine; instantly finalizes.
 #[async_trait::async_trait]
 impl<B, C> Verifier<B> for BabeVerifier<B, C>
-	where
-		B: BlockT,
-		C: HeaderBackend<B> + HeaderMetadata<B, Error = sp_blockchain::Error>
+where
+	B: BlockT,
+	C: HeaderBackend<B> + HeaderMetadata<B, Error = sp_blockchain::Error>,
 {
 	async fn verify(
 		&mut self,
@@ -107,7 +114,9 @@ impl<B, C> Verifier<B> for BabeVerifier<B, C>
 		let pre_digest = find_pre_digest::<B>(&header)?;
 
 		let parent_hash = header.parent_hash();
-		let parent = self.client.header(BlockId::Hash(*parent_hash))
+		let parent = self
+			.client
+			.header(BlockId::Hash(*parent_hash))
 			.ok()
 			.flatten()
 			.ok_or_else(|| format!("header for block {} not found", parent_hash))?;
@@ -134,14 +143,14 @@ impl<B, C> Verifier<B> for BabeVerifier<B, C>
 }
 
 impl<B, C> BabeConsensusDataProvider<B, C>
-	where
-		B: BlockT,
-		C: AuxStore
-			+ HeaderBackend<B>
-			+ ProvideRuntimeApi<B>
-			+ HeaderMetadata<B, Error = sp_blockchain::Error>
-			+ UsageProvider<B>,
-		C::Api: BabeApi<B>,
+where
+	B: BlockT,
+	C: AuxStore
+		+ HeaderBackend<B>
+		+ ProvideRuntimeApi<B>
+		+ HeaderMetadata<B, Error = sp_blockchain::Error>
+		+ UsageProvider<B>,
+	C::Api: BabeApi<B>,
 {
 	pub fn new(
 		client: Arc<C>,
@@ -155,13 +164,7 @@ impl<B, C> BabeConsensusDataProvider<B, C>
 
 		let config = Config::get_or_compute(&*client)?;
 
-		Ok(Self {
-			config,
-			client,
-			keystore,
-			epoch_changes,
-			authorities,
-		})
+		Ok(Self { config, client, keystore, epoch_changes, authorities })
 	}
 
 	fn epoch(&self, parent: &B::Header, slot: Slot) -> Result<Epoch, Error> {
@@ -177,10 +180,7 @@ impl<B, C> BabeConsensusDataProvider<B, C>
 			.ok_or_else(|| sp_consensus::Error::InvalidAuthoritiesSet)?;
 
 		let epoch = epoch_changes
-			.viable_epoch(
-				&epoch_descriptor,
-				|slot| Epoch::genesis(&self.config, slot),
-			)
+			.viable_epoch(&epoch_descriptor, |slot| Epoch::genesis(&self.config, slot))
 			.ok_or_else(|| {
 				log::info!(target: "babe", "create_digest: no viable_epoch :(");
 				sp_consensus::Error::InvalidAuthoritiesSet
@@ -191,38 +191,37 @@ impl<B, C> BabeConsensusDataProvider<B, C>
 }
 
 impl<B, C> ConsensusDataProvider<B> for BabeConsensusDataProvider<B, C>
-	where
-		B: BlockT,
-		C: AuxStore
-			+ HeaderBackend<B>
-			+ HeaderMetadata<B, Error = sp_blockchain::Error>
-			+ UsageProvider<B>
-			+ ProvideRuntimeApi<B>,
-		C::Api: BabeApi<B>,
+where
+	B: BlockT,
+	C: AuxStore
+		+ HeaderBackend<B>
+		+ HeaderMetadata<B, Error = sp_blockchain::Error>
+		+ UsageProvider<B>
+		+ ProvideRuntimeApi<B>,
+	C::Api: BabeApi<B>,
 {
 	type Transaction = TransactionFor<C, B>;
 
-	fn create_digest(&self, parent: &B::Header, inherents: &InherentData) -> Result<DigestFor<B>, Error> {
-		let slot = inherents.babe_inherent_data()?
+	fn create_digest(
+		&self,
+		parent: &B::Header,
+		inherents: &InherentData,
+	) -> Result<DigestFor<B>, Error> {
+		let slot = inherents
+			.babe_inherent_data()?
 			.ok_or_else(|| Error::StringError("No babe inherent data".into()))?;
 		let epoch = self.epoch(parent, slot)?;
 
 		// this is a dev node environment, we should always be able to claim a slot.
-		let logs =  if let Some((predigest, _)) = authorship::claim_slot(
-			slot,
-			&epoch,
-			&self.keystore,
-		) {
-			vec![
-				<DigestItemFor<B> as CompatibleDigestItem>::babe_pre_digest(predigest),
-			]
+		let logs = if let Some((predigest, _)) =
+			authorship::claim_slot(slot, &epoch, &self.keystore)
+		{
+			vec![<DigestItemFor<B> as CompatibleDigestItem>::babe_pre_digest(predigest)]
 		} else {
 			// well we couldn't claim a slot because this is an existing chain and we're not in the authorities.
 			// we need to tell BabeBlockImport that the epoch has changed, and we put ourselves in the authorities.
-			let predigest = PreDigest::SecondaryPlain(SecondaryPlainPreDigest {
-				slot,
-				authority_index: 0_u32,
-			});
+			let predigest =
+				PreDigest::SecondaryPlain(SecondaryPlainPreDigest { slot, authority_index: 0_u32 });
 
 			let mut epoch_changes = self.epoch_changes.shared_data();
 			let epoch_descriptor = epoch_changes
@@ -232,12 +231,15 @@ impl<B, C> ConsensusDataProvider<B> for BabeConsensusDataProvider<B, C>
 					parent.number().clone(),
 					slot,
 				)
-				.map_err(|e| Error::StringError(format!("failed to fetch epoch_descriptor: {}", e)))?
+				.map_err(|e| {
+					Error::StringError(format!("failed to fetch epoch_descriptor: {}", e))
+				})?
 				.ok_or_else(|| sp_consensus::Error::InvalidAuthoritiesSet)?;
 
 			match epoch_descriptor {
 				ViableEpochDescriptor::Signaled(identifier, _epoch_header) => {
-					let epoch_mut = epoch_changes.epoch_mut(&identifier)
+					let epoch_mut = epoch_changes
+						.epoch_mut(&identifier)
 						.ok_or_else(|| sp_consensus::Error::InvalidAuthoritiesSet)?;
 
 					// mutate the current epoch
@@ -251,15 +253,13 @@ impl<B, C> ConsensusDataProvider<B> for BabeConsensusDataProvider<B, C>
 
 					vec![
 						DigestItemFor::<B>::PreRuntime(BABE_ENGINE_ID, predigest.encode()),
-						DigestItemFor::<B>::Consensus(BABE_ENGINE_ID, next_epoch.encode())
+						DigestItemFor::<B>::Consensus(BABE_ENGINE_ID, next_epoch.encode()),
 					]
 				},
 				ViableEpochDescriptor::UnimportedGenesis(_) => {
 					// since this is the genesis, secondary predigest works for now.
-					vec![
-						DigestItemFor::<B>::PreRuntime(BABE_ENGINE_ID, predigest.encode()),
-					]
-				}
+					vec![DigestItemFor::<B>::PreRuntime(BABE_ENGINE_ID, predigest.encode())]
+				},
 			}
 		};
 
@@ -270,9 +270,10 @@ impl<B, C> ConsensusDataProvider<B> for BabeConsensusDataProvider<B, C>
 		&self,
 		parent: &B::Header,
 		params: &mut BlockImportParams<B, Self::Transaction>,
-		inherents: &InherentData
+		inherents: &InherentData,
 	) -> Result<(), Error> {
-		let slot = inherents.babe_inherent_data()?
+		let slot = inherents
+			.babe_inherent_data()?
 			.ok_or_else(|| Error::StringError("No babe inherent data".into()))?;
 		let epoch_changes = self.epoch_changes.shared_data();
 		let mut epoch_descriptor = epoch_changes
@@ -289,27 +290,27 @@ impl<B, C> ConsensusDataProvider<B> for BabeConsensusDataProvider<B, C>
 		// a quick check to see if we're in the authorities
 		let epoch = self.epoch(parent, slot)?;
 		let (authority, _) = self.authorities.first().expect("authorities is non-emptyp; qed");
-		let has_authority = epoch.authorities.iter()
-			.find(|(id, _)| *id == *authority)
-			.is_some();
+		let has_authority = epoch.authorities.iter().find(|(id, _)| *id == *authority).is_some();
 
 		if !has_authority {
 			log::info!(target: "manual-seal", "authority not found");
-			let timestamp = inherents.timestamp_inherent_data()?
+			let timestamp = inherents
+				.timestamp_inherent_data()?
 				.ok_or_else(|| Error::StringError("No timestamp inherent data".into()))?;
 			let slot = *timestamp / self.config.slot_duration;
 			// manually hard code epoch descriptor
 			epoch_descriptor = match epoch_descriptor {
-				ViableEpochDescriptor::Signaled(identifier, _header) => {
+				ViableEpochDescriptor::Signaled(identifier, _header) =>
 					ViableEpochDescriptor::Signaled(
 						identifier,
 						EpochHeader {
 							start_slot: slot.into(),
 							end_slot: (slot * self.config.epoch_length).into(),
 						},
-					)
-				},
-				_ => unreachable!("we're not in the authorities, so this isn't the genesis epoch; qed")
+					),
+				_ => unreachable!(
+					"we're not in the authorities, so this isn't the genesis epoch; qed"
+				),
 			};
 		}
 
@@ -326,16 +327,16 @@ impl<B, C> ConsensusDataProvider<B> for BabeConsensusDataProvider<B, C>
 /// Mocks the timestamp inherent to always produce the timestamp for the next babe slot.
 pub struct SlotTimestampProvider {
 	time: atomic::AtomicU64,
-	slot_duration: u64
+	slot_duration: u64,
 }
 
 impl SlotTimestampProvider {
 	/// Create a new mocked time stamp provider.
 	pub fn new<B, C>(client: Arc<C>) -> Result<Self, Error>
-		where
-			B: BlockT,
-			C: AuxStore + HeaderBackend<B> + ProvideRuntimeApi<B> + UsageProvider<B>,
-			C::Api: BabeApi<B>,
+	where
+		B: BlockT,
+		C: AuxStore + HeaderBackend<B> + ProvideRuntimeApi<B> + UsageProvider<B>,
+		C::Api: BabeApi<B>,
 	{
 		let slot_duration = Config::get_or_compute(&*client)?.slot_duration;
 		let info = client.info();
@@ -355,10 +356,7 @@ impl SlotTimestampProvider {
 				.as_millis() as u64
 		};
 
-		Ok(Self {
-			time: atomic::AtomicU64::new(time),
-			slot_duration,
-		})
+		Ok(Self { time: atomic::AtomicU64::new(time), slot_duration })
 	}
 
 	/// Get the current slot number
@@ -369,12 +367,13 @@ impl SlotTimestampProvider {
 
 #[async_trait::async_trait]
 impl InherentDataProvider for SlotTimestampProvider {
-	fn provide_inherent_data(&self, inherent_data: &mut InherentData) -> Result<(), sp_inherents::Error> {
+	fn provide_inherent_data(
+		&self,
+		inherent_data: &mut InherentData,
+	) -> Result<(), sp_inherents::Error> {
 		// we update the time here.
-		let duration: InherentType = self.time.fetch_add(
-			self.slot_duration,
-			atomic::Ordering::SeqCst,
-		).into();
+		let duration: InherentType =
+			self.time.fetch_add(self.slot_duration, atomic::Ordering::SeqCst).into();
 		inherent_data.put_data(INHERENT_IDENTIFIER, &duration)?;
 		Ok(())
 	}
diff --git a/client/consensus/manual-seal/src/error.rs b/client/consensus/manual-seal/src/error.rs
index 77140c835a3e..cd7fc0ee73ce 100644
--- a/client/consensus/manual-seal/src/error.rs
+++ b/client/consensus/manual-seal/src/error.rs
@@ -19,10 +19,10 @@
 //! A manual sealing engine: the engine listens for rpc calls to seal blocks and create forks.
 //! This is suitable for a testing environment.
 
-use sp_consensus::{Error as ConsensusError, ImportResult};
+use futures::channel::{mpsc::SendError, oneshot};
 use sp_blockchain::Error as BlockchainError;
+use sp_consensus::{Error as ConsensusError, ImportResult};
 use sp_inherents::Error as InherentsError;
-use futures::channel::{oneshot, mpsc::SendError};
 
 /// Error code for rpc
 mod codes {
@@ -63,14 +63,14 @@ pub enum Error {
 	#[display(fmt = "{}", _0)]
 	#[from(ignore)]
 	StringError(String),
-	///send error
+	/// send error
 	#[display(fmt = "Consensus process is terminating")]
 	Canceled(oneshot::Canceled),
-	///send error
+	/// send error
 	#[display(fmt = "Consensus process is terminating")]
 	SendError(SendError),
 	/// Some other error.
-	#[display(fmt="Other error: {}", _0)]
+	#[display(fmt = "Other error: {}", _0)]
 	Other(Box<dyn std::error::Error + Send>),
 }
 
@@ -85,7 +85,7 @@ impl Error {
 			InherentError(_) => codes::INHERENTS_ERROR,
 			BlockchainError(_) => codes::BLOCKCHAIN_ERROR,
 			SendError(_) | Canceled(_) => codes::SERVER_SHUTTING_DOWN,
-			_ => codes::UNKNOWN_ERROR
+			_ => codes::UNKNOWN_ERROR,
 		}
 	}
 }
@@ -95,7 +95,7 @@ impl std::convert::From<Error> for jsonrpc_core::Error {
 		jsonrpc_core::Error {
 			code: jsonrpc_core::ErrorCode::ServerError(error.to_code()),
 			message: format!("{}", error),
-			data: None
+			data: None,
 		}
 	}
 }
diff --git a/client/consensus/manual-seal/src/finalize_block.rs b/client/consensus/manual-seal/src/finalize_block.rs
index 76ae6eeeae5a..a5ddf1d162f7 100644
--- a/client/consensus/manual-seal/src/finalize_block.rs
+++ b/client/consensus/manual-seal/src/finalize_block.rs
@@ -19,14 +19,9 @@
 //! Block finalization utilities
 
 use crate::rpc;
-use sp_runtime::{
-	Justification,
-	traits::Block as BlockT,
-	generic::BlockId,
-};
-use std::sync::Arc;
 use sc_client_api::backend::{Backend as ClientBackend, Finalizer};
-use std::marker::PhantomData;
+use sp_runtime::{generic::BlockId, traits::Block as BlockT, Justification};
+use std::{marker::PhantomData, sync::Arc};
 
 /// params for block finalization.
 pub struct FinalizeBlockParams<B: BlockT, F, CB> {
@@ -42,30 +37,23 @@ pub struct FinalizeBlockParams<B: BlockT, F, CB> {
 	pub _phantom: PhantomData<CB>,
 }
 
-
 /// finalizes a block in the backend with the given params.
 pub async fn finalize_block<B, F, CB>(params: FinalizeBlockParams<B, F, CB>)
-	where
-		B: BlockT,
-		F: Finalizer<B, CB>,
-		CB: ClientBackend<B>,
+where
+	B: BlockT,
+	F: Finalizer<B, CB>,
+	CB: ClientBackend<B>,
 {
-	let FinalizeBlockParams {
-		hash,
-		mut sender,
-		justification,
-		finalizer,
-		..
-	} = params;
+	let FinalizeBlockParams { hash, mut sender, justification, finalizer, .. } = params;
 
 	match finalizer.finalize_block(BlockId::Hash(hash), justification, true) {
 		Err(e) => {
 			log::warn!("Failed to finalize block {:?}", e);
 			rpc::send_result(&mut sender, Err(e.into()))
-		}
+		},
 		Ok(()) => {
 			log::info!("✅ Successfully finalized block: {}", hash);
 			rpc::send_result(&mut sender, Ok(()))
-		}
+		},
 	}
 }
diff --git a/client/consensus/manual-seal/src/lib.rs b/client/consensus/manual-seal/src/lib.rs
index 5d93f6724ee9..1aacd22aa7bb 100644
--- a/client/consensus/manual-seal/src/lib.rs
+++ b/client/consensus/manual-seal/src/lib.rs
@@ -20,17 +20,17 @@
 //! This is suitable for a testing environment.
 
 use futures::prelude::*;
+use prometheus_endpoint::Registry;
+use sc_client_api::backend::{Backend as ClientBackend, Finalizer};
+use sp_blockchain::HeaderBackend;
 use sp_consensus::{
-	Environment, Proposer, SelectChain, BlockImport,
-	ForkChoiceStrategy, BlockImportParams, BlockOrigin,
-	import_queue::{Verifier, BasicQueue, CacheKeyId, BoxBlockImport},
+	import_queue::{BasicQueue, BoxBlockImport, CacheKeyId, Verifier},
+	BlockImport, BlockImportParams, BlockOrigin, Environment, ForkChoiceStrategy, Proposer,
+	SelectChain,
 };
-use sp_blockchain::HeaderBackend;
 use sp_inherents::CreateInherentDataProviders;
-use sp_runtime::{traits::Block as BlockT, Justifications, ConsensusEngineId};
-use sc_client_api::backend::{Backend as ClientBackend, Finalizer};
-use std::{sync::Arc, marker::PhantomData};
-use prometheus_endpoint::Registry;
+use sp_runtime::{traits::Block as BlockT, ConsensusEngineId, Justifications};
+use std::{marker::PhantomData, sync::Arc};
 
 mod error;
 mod finalize_block;
@@ -40,14 +40,14 @@ pub mod consensus;
 pub mod rpc;
 
 pub use self::{
-	error::Error,
 	consensus::ConsensusDataProvider,
+	error::Error,
 	finalize_block::{finalize_block, FinalizeBlockParams},
-	seal_block::{SealBlockParams, seal_block, MAX_PROPOSAL_DURATION},
-	rpc::{EngineCommand, CreatedBlock},
+	rpc::{CreatedBlock, EngineCommand},
+	seal_block::{seal_block, SealBlockParams, MAX_PROPOSAL_DURATION},
 };
-use sp_api::{ProvideRuntimeApi, TransactionFor};
 use sc_transaction_pool_api::TransactionPool;
+use sp_api::{ProvideRuntimeApi, TransactionFor};
 
 /// The `ConsensusEngineId` of Manual Seal.
 pub const MANUAL_SEAL_ENGINE_ID: ConsensusEngineId = [b'm', b'a', b'n', b'l'];
@@ -80,17 +80,11 @@ pub fn import_queue<Block, Transaction>(
 	spawner: &impl sp_core::traits::SpawnEssentialNamed,
 	registry: Option<&Registry>,
 ) -> BasicQueue<Block, Transaction>
-	where
-		Block: BlockT,
-		Transaction: Send + Sync + 'static,
+where
+	Block: BlockT,
+	Transaction: Send + Sync + 'static,
 {
-	BasicQueue::new(
-		ManualSealVerifier,
-		block_import,
-		None,
-		spawner,
-		registry,
-	)
+	BasicQueue::new(ManualSealVerifier, block_import, None, spawner, registry)
 }
 
 /// Params required to start the instant sealing authorship task.
@@ -115,7 +109,8 @@ pub struct ManualSealParams<B: BlockT, BI, E, C: ProvideRuntimeApi<B>, TP, SC, C
 	pub select_chain: SC,
 
 	/// Digest provider for inclusion in blocks.
-	pub consensus_data_provider: Option<Box<dyn ConsensusDataProvider<B, Transaction = TransactionFor<C, B>>>>,
+	pub consensus_data_provider:
+		Option<Box<dyn ConsensusDataProvider<B, Transaction = TransactionFor<C, B>>>>,
 
 	/// Something that can create the inherent data providers.
 	pub create_inherent_data_providers: CIDP,
@@ -139,7 +134,8 @@ pub struct InstantSealParams<B: BlockT, BI, E, C: ProvideRuntimeApi<B>, TP, SC,
 	pub select_chain: SC,
 
 	/// Digest provider for inclusion in blocks.
-	pub consensus_data_provider: Option<Box<dyn ConsensusDataProvider<B, Transaction = TransactionFor<C, B>>>>,
+	pub consensus_data_provider:
+		Option<Box<dyn ConsensusDataProvider<B, Transaction = TransactionFor<C, B>>>>,
 
 	/// Something that can create the inherent data providers.
 	pub create_inherent_data_providers: CIDP,
@@ -156,58 +152,52 @@ pub async fn run_manual_seal<B, BI, CB, E, C, TP, SC, CS, CIDP>(
 		select_chain,
 		consensus_data_provider,
 		create_inherent_data_providers,
-	}: ManualSealParams<B, BI, E, C, TP, SC, CS, CIDP>
-)
-	where
-		B: BlockT + 'static,
-		BI: BlockImport<B, Error = sp_consensus::Error, Transaction = sp_api::TransactionFor<C, B>>
-			+ Send + Sync + 'static,
-		C: HeaderBackend<B> + Finalizer<B, CB> + ProvideRuntimeApi<B> + 'static,
-		CB: ClientBackend<B> + 'static,
-		E: Environment<B> + 'static,
-		E::Proposer: Proposer<B, Transaction = TransactionFor<C, B>>,
-		CS: Stream<Item=EngineCommand<<B as BlockT>::Hash>> + Unpin + 'static,
-		SC: SelectChain<B> + 'static,
-		TransactionFor<C, B>: 'static,
-		TP: TransactionPool<Block = B>,
-		CIDP: CreateInherentDataProviders<B, ()>,
+	}: ManualSealParams<B, BI, E, C, TP, SC, CS, CIDP>,
+) where
+	B: BlockT + 'static,
+	BI: BlockImport<B, Error = sp_consensus::Error, Transaction = sp_api::TransactionFor<C, B>>
+		+ Send
+		+ Sync
+		+ 'static,
+	C: HeaderBackend<B> + Finalizer<B, CB> + ProvideRuntimeApi<B> + 'static,
+	CB: ClientBackend<B> + 'static,
+	E: Environment<B> + 'static,
+	E::Proposer: Proposer<B, Transaction = TransactionFor<C, B>>,
+	CS: Stream<Item = EngineCommand<<B as BlockT>::Hash>> + Unpin + 'static,
+	SC: SelectChain<B> + 'static,
+	TransactionFor<C, B>: 'static,
+	TP: TransactionPool<Block = B>,
+	CIDP: CreateInherentDataProviders<B, ()>,
 {
 	while let Some(command) = commands_stream.next().await {
 		match command {
-			EngineCommand::SealNewBlock {
-				create_empty,
-				finalize,
-				parent_hash,
-				sender,
-			} => {
-				seal_block(
-					SealBlockParams {
-						sender,
-						parent_hash,
-						finalize,
-						create_empty,
-						env: &mut env,
-						select_chain: &select_chain,
-						block_import: &mut block_import,
-						consensus_data_provider: consensus_data_provider.as_ref().map(|p| &**p),
-						pool: pool.clone(),
-						client: client.clone(),
-						create_inherent_data_providers: &create_inherent_data_providers,
-					}
-				).await;
-			}
+			EngineCommand::SealNewBlock { create_empty, finalize, parent_hash, sender } => {
+				seal_block(SealBlockParams {
+					sender,
+					parent_hash,
+					finalize,
+					create_empty,
+					env: &mut env,
+					select_chain: &select_chain,
+					block_import: &mut block_import,
+					consensus_data_provider: consensus_data_provider.as_ref().map(|p| &**p),
+					pool: pool.clone(),
+					client: client.clone(),
+					create_inherent_data_providers: &create_inherent_data_providers,
+				})
+				.await;
+			},
 			EngineCommand::FinalizeBlock { hash, sender, justification } => {
 				let justification = justification.map(|j| (MANUAL_SEAL_ENGINE_ID, j));
-				finalize_block(
-					FinalizeBlockParams {
-						hash,
-						sender,
-						justification,
-						finalizer: client.clone(),
-						_phantom: PhantomData,
-					}
-				).await
-			}
+				finalize_block(FinalizeBlockParams {
+					hash,
+					sender,
+					justification,
+					finalizer: client.clone(),
+					_phantom: PhantomData,
+				})
+				.await
+			},
 		}
 	}
 }
@@ -224,63 +214,57 @@ pub async fn run_instant_seal<B, BI, CB, E, C, TP, SC, CIDP>(
 		select_chain,
 		consensus_data_provider,
 		create_inherent_data_providers,
-	}: InstantSealParams<B, BI, E, C, TP, SC, CIDP>
-)
-	where
-		B: BlockT + 'static,
-		BI: BlockImport<B, Error = sp_consensus::Error, Transaction = sp_api::TransactionFor<C, B>>
-			+ Send + Sync + 'static,
-		C: HeaderBackend<B> + Finalizer<B, CB> + ProvideRuntimeApi<B> + 'static,
-		CB: ClientBackend<B> + 'static,
-		E: Environment<B> + 'static,
-		E::Proposer: Proposer<B, Transaction = TransactionFor<C, B>>,
-		SC: SelectChain<B> + 'static,
-		TransactionFor<C, B>: 'static,
-		TP: TransactionPool<Block = B>,
-		CIDP: CreateInherentDataProviders<B, ()>,
+	}: InstantSealParams<B, BI, E, C, TP, SC, CIDP>,
+) where
+	B: BlockT + 'static,
+	BI: BlockImport<B, Error = sp_consensus::Error, Transaction = sp_api::TransactionFor<C, B>>
+		+ Send
+		+ Sync
+		+ 'static,
+	C: HeaderBackend<B> + Finalizer<B, CB> + ProvideRuntimeApi<B> + 'static,
+	CB: ClientBackend<B> + 'static,
+	E: Environment<B> + 'static,
+	E::Proposer: Proposer<B, Transaction = TransactionFor<C, B>>,
+	SC: SelectChain<B> + 'static,
+	TransactionFor<C, B>: 'static,
+	TP: TransactionPool<Block = B>,
+	CIDP: CreateInherentDataProviders<B, ()>,
 {
 	// instant-seal creates blocks as soon as transactions are imported
 	// into the transaction pool.
-	let commands_stream = pool.import_notification_stream()
-		.map(|_| {
-			EngineCommand::SealNewBlock {
-				create_empty: false,
-				finalize: false,
-				parent_hash: None,
-				sender: None,
-			}
-		});
-
-	run_manual_seal(
-		ManualSealParams {
-			block_import,
-			env,
-			client,
-			pool,
-			commands_stream,
-			select_chain,
-			consensus_data_provider,
-			create_inherent_data_providers,
-		}
-	).await
+	let commands_stream = pool.import_notification_stream().map(|_| EngineCommand::SealNewBlock {
+		create_empty: false,
+		finalize: false,
+		parent_hash: None,
+		sender: None,
+	});
+
+	run_manual_seal(ManualSealParams {
+		block_import,
+		env,
+		client,
+		pool,
+		commands_stream,
+		select_chain,
+		consensus_data_provider,
+		create_inherent_data_providers,
+	})
+	.await
 }
 
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use substrate_test_runtime_client::{
-		DefaultTestClientBuilderExt,
-		TestClientBuilderExt,
-		AccountKeyring::*,
-		TestClientBuilder,
-	};
-	use sc_transaction_pool::{BasicPool, RevalidationType, Options};
-	use substrate_test_runtime_transaction_pool::{TestApi, uxt};
-	use sc_transaction_pool_api::{TransactionPool, MaintainedTransactionPool, TransactionSource};
-	use sp_runtime::generic::BlockId;
-	use sp_consensus::ImportedAux;
 	use sc_basic_authorship::ProposerFactory;
 	use sc_client_api::BlockBackend;
+	use sc_transaction_pool::{BasicPool, Options, RevalidationType};
+	use sc_transaction_pool_api::{MaintainedTransactionPool, TransactionPool, TransactionSource};
+	use sp_consensus::ImportedAux;
+	use sp_runtime::generic::BlockId;
+	use substrate_test_runtime_client::{
+		AccountKeyring::*, DefaultTestClientBuilderExt, TestClientBuilder, TestClientBuilderExt,
+	};
+	use substrate_test_runtime_transaction_pool::{uxt, TestApi};
 
 	fn api() -> Arc<TestApi> {
 		Arc::new(TestApi::empty())
@@ -303,40 +287,32 @@ mod tests {
 			spawner.clone(),
 			0,
 		));
-		let env = ProposerFactory::new(
-			spawner.clone(),
-			client.clone(),
-			pool.clone(),
-			None,
-			None,
-		);
+		let env = ProposerFactory::new(spawner.clone(), client.clone(), pool.clone(), None, None);
 		// this test checks that blocks are created as soon as transactions are imported into the pool.
 		let (sender, receiver) = futures::channel::oneshot::channel();
 		let mut sender = Arc::new(Some(sender));
-		let commands_stream = pool.pool().validated_pool().import_notification_stream()
-			.map(move |_| {
+		let commands_stream =
+			pool.pool().validated_pool().import_notification_stream().map(move |_| {
 				// we're only going to submit one tx so this fn will only be called once.
-				let mut_sender =  Arc::get_mut(&mut sender).unwrap();
+				let mut_sender = Arc::get_mut(&mut sender).unwrap();
 				let sender = std::mem::take(mut_sender);
 				EngineCommand::SealNewBlock {
 					create_empty: false,
 					finalize: true,
 					parent_hash: None,
-					sender
+					sender,
 				}
 			});
-		let future = run_manual_seal(
-			ManualSealParams {
-				block_import: client.clone(),
-				env,
-				client: client.clone(),
-				pool: pool.clone(),
-				commands_stream,
-				select_chain,
-				create_inherent_data_providers: |_, _| async { Ok(()) },
-				consensus_data_provider: None,
-			}
-		);
+		let future = run_manual_seal(ManualSealParams {
+			block_import: client.clone(),
+			env,
+			client: client.clone(),
+			pool: pool.clone(),
+			commands_stream,
+			select_chain,
+			create_inherent_data_providers: |_, _| async { Ok(()) },
+			consensus_data_provider: None,
+		});
 		std::thread::spawn(|| {
 			let mut rt = tokio::runtime::Runtime::new().unwrap();
 			// spawn the background authorship task
@@ -380,27 +356,19 @@ mod tests {
 			spawner.clone(),
 			0,
 		));
-		let env = ProposerFactory::new(
-			spawner.clone(),
-			client.clone(),
-			pool.clone(),
-			None,
-			None,
-		);
+		let env = ProposerFactory::new(spawner.clone(), client.clone(), pool.clone(), None, None);
 		// this test checks that blocks are created as soon as an engine command is sent over the stream.
 		let (mut sink, commands_stream) = futures::channel::mpsc::channel(1024);
-		let future = run_manual_seal(
-			ManualSealParams {
-				block_import: client.clone(),
-				env,
-				client: client.clone(),
-				pool: pool.clone(),
-				commands_stream,
-				select_chain,
-				consensus_data_provider: None,
-				create_inherent_data_providers: |_, _| async { Ok(()) },
-			}
-		);
+		let future = run_manual_seal(ManualSealParams {
+			block_import: client.clone(),
+			env,
+			client: client.clone(),
+			pool: pool.clone(),
+			commands_stream,
+			select_chain,
+			consensus_data_provider: None,
+			create_inherent_data_providers: |_, _| async { Ok(()) },
+		});
 		std::thread::spawn(|| {
 			let mut rt = tokio::runtime::Runtime::new().unwrap();
 			// spawn the background authorship task
@@ -416,7 +384,9 @@ mod tests {
 			sender: Some(tx),
 			create_empty: false,
 			finalize: false,
-		}).await.unwrap();
+		})
+		.await
+		.unwrap();
 		let created_block = rx.await.unwrap().unwrap();
 
 		// assert that the background task returns ok
@@ -439,8 +409,10 @@ mod tests {
 		sink.send(EngineCommand::FinalizeBlock {
 			sender: Some(tx),
 			hash: header.hash(),
-			justification: None
-		}).await.unwrap();
+			justification: None,
+		})
+		.await
+		.unwrap();
 		// assert that the background task returns ok
 		assert_eq!(rx.await.unwrap().unwrap(), ());
 	}
@@ -461,27 +433,19 @@ mod tests {
 			spawner.clone(),
 			0,
 		));
-		let env = ProposerFactory::new(
-			spawner.clone(),
-			client.clone(),
-			pool.clone(),
-			None,
-			None,
-		);
+		let env = ProposerFactory::new(spawner.clone(), client.clone(), pool.clone(), None, None);
 		// this test checks that blocks are created as soon as an engine command is sent over the stream.
 		let (mut sink, commands_stream) = futures::channel::mpsc::channel(1024);
-		let future = run_manual_seal(
-			ManualSealParams {
-				block_import: client.clone(),
-				env,
-				client: client.clone(),
-				pool: pool.clone(),
-				commands_stream,
-				select_chain,
-				consensus_data_provider: None,
-				create_inherent_data_providers: |_, _| async { Ok(()) },
-			}
-		);
+		let future = run_manual_seal(ManualSealParams {
+			block_import: client.clone(),
+			env,
+			client: client.clone(),
+			pool: pool.clone(),
+			commands_stream,
+			select_chain,
+			consensus_data_provider: None,
+			create_inherent_data_providers: |_, _| async { Ok(()) },
+		});
 		std::thread::spawn(|| {
 			let mut rt = tokio::runtime::Runtime::new().unwrap();
 			// spawn the background authorship task
@@ -498,7 +462,9 @@ mod tests {
 			sender: Some(tx),
 			create_empty: false,
 			finalize: false,
-		}).await.unwrap();
+		})
+		.await
+		.unwrap();
 		let created_block = rx.await.unwrap().unwrap();
 		pool_api.increment_nonce(Alice.into());
 
@@ -524,31 +490,35 @@ mod tests {
 		pool.maintain(sc_transaction_pool_api::ChainEvent::NewBestBlock {
 			hash: header.hash(),
 			tree_route: None,
-		}).await;
+		})
+		.await;
 
 		let (tx1, rx1) = futures::channel::oneshot::channel();
-		assert!(sink.send(EngineCommand::SealNewBlock {
-			parent_hash: Some(created_block.hash),
-			sender: Some(tx1),
-			create_empty: false,
-			finalize: false,
-		}).await.is_ok());
-		assert_matches::assert_matches!(
-			rx1.await.expect("should be no error receiving"),
-			Ok(_)
-		);
+		assert!(sink
+			.send(EngineCommand::SealNewBlock {
+				parent_hash: Some(created_block.hash),
+				sender: Some(tx1),
+				create_empty: false,
+				finalize: false,
+			})
+			.await
+			.is_ok());
+		assert_matches::assert_matches!(rx1.await.expect("should be no error receiving"), Ok(_));
 		let block = client.block(&BlockId::Number(2)).unwrap().unwrap().block;
 		pool_api.add_block(block, true);
 		pool_api.increment_nonce(Alice.into());
 
 		assert!(pool.submit_one(&BlockId::Number(1), SOURCE, uxt(Bob, 0)).await.is_ok());
 		let (tx2, rx2) = futures::channel::oneshot::channel();
-		assert!(sink.send(EngineCommand::SealNewBlock {
-			parent_hash: Some(created_block.hash),
-			sender: Some(tx2),
-			create_empty: false,
-			finalize: false,
-		}).await.is_ok());
+		assert!(sink
+			.send(EngineCommand::SealNewBlock {
+				parent_hash: Some(created_block.hash),
+				sender: Some(tx2),
+				create_empty: false,
+				finalize: false,
+			})
+			.await
+			.is_ok());
 		let imported = rx2.await.unwrap().unwrap();
 		// assert that fork block is in the db
 		assert!(client.header(&BlockId::Hash(imported.hash)).unwrap().is_some())
diff --git a/client/consensus/manual-seal/src/rpc.rs b/client/consensus/manual-seal/src/rpc.rs
index eb056f22fed8..0f686bc26e7d 100644
--- a/client/consensus/manual-seal/src/rpc.rs
+++ b/client/consensus/manual-seal/src/rpc.rs
@@ -18,18 +18,16 @@
 
 //! RPC interface for the `ManualSeal` Engine.
 
-use sp_consensus::ImportedAux;
-use jsonrpc_core::Error;
-use jsonrpc_derive::rpc;
+pub use self::gen_client::Client as ManualSealClient;
 use futures::{
 	channel::{mpsc, oneshot},
-	TryFutureExt,
-	FutureExt,
-	SinkExt
+	FutureExt, SinkExt, TryFutureExt,
 };
+use jsonrpc_core::Error;
+use jsonrpc_derive::rpc;
 use serde::{Deserialize, Serialize};
+use sp_consensus::ImportedAux;
 use sp_runtime::EncodedJustification;
-pub use self::gen_client::Client as ManualSealClient;
 
 /// Future's type for jsonrpc
 type FutureResult<T> = Box<dyn jsonrpc_core::futures::Future<Item = T, Error = Error> + Send>;
@@ -63,7 +61,7 @@ pub enum EngineCommand<Hash> {
 		sender: Sender<()>,
 		/// finalization justification
 		justification: Option<EncodedJustification>,
-	}
+	},
 }
 
 /// RPC trait that provides methods for interacting with the manual-seal authorship task over rpc.
@@ -75,7 +73,7 @@ pub trait ManualSealApi<Hash> {
 		&self,
 		create_empty: bool,
 		finalize: bool,
-		parent_hash: Option<Hash>
+		parent_hash: Option<Hash>,
 	) -> FutureResult<CreatedBlock<Hash>>;
 
 	/// Instructs the manual-seal authorship task to finalize a block
@@ -83,7 +81,7 @@ pub trait ManualSealApi<Hash> {
 	fn finalize_block(
 		&self,
 		hash: Hash,
-		justification: Option<EncodedJustification>
+		justification: Option<EncodedJustification>,
 	) -> FutureResult<bool>;
 }
 
@@ -98,7 +96,7 @@ pub struct CreatedBlock<Hash> {
 	/// hash of the created block.
 	pub hash: Hash,
 	/// some extra details about the import operation
-	pub aux: ImportedAux
+	pub aux: ImportedAux,
 }
 
 impl<Hash> ManualSeal<Hash> {
@@ -113,7 +111,7 @@ impl<Hash: Send + 'static> ManualSealApi<Hash> for ManualSeal<Hash> {
 		&self,
 		create_empty: bool,
 		finalize: bool,
-		parent_hash: Option<Hash>
+		parent_hash: Option<Hash>,
 	) -> FutureResult<CreatedBlock<Hash>> {
 		let mut sink = self.import_block_channel.clone();
 		let future = async move {
@@ -126,18 +124,22 @@ impl<Hash: Send + 'static> ManualSealApi<Hash> for ManualSeal<Hash> {
 			};
 			sink.send(command).await?;
 			receiver.await?
-		}.boxed();
+		}
+		.boxed();
 
 		Box::new(future.map_err(Error::from).compat())
 	}
 
-	fn finalize_block(&self, hash: Hash, justification: Option<EncodedJustification>) -> FutureResult<bool> {
+	fn finalize_block(
+		&self,
+		hash: Hash,
+		justification: Option<EncodedJustification>,
+	) -> FutureResult<bool> {
 		let mut sink = self.import_block_channel.clone();
 		let future = async move {
 			let (sender, receiver) = oneshot::channel();
-			sink.send(
-				EngineCommand::FinalizeBlock { hash, sender: Some(sender), justification }
-			).await?;
+			sink.send(EngineCommand::FinalizeBlock { hash, sender: Some(sender), justification })
+				.await?;
 
 			receiver.await?.map(|_| true)
 		};
@@ -150,7 +152,7 @@ impl<Hash: Send + 'static> ManualSealApi<Hash> for ManualSeal<Hash> {
 /// to the rpc
 pub fn send_result<T: std::fmt::Debug>(
 	sender: &mut Sender<T>,
-	result: std::result::Result<T, crate::Error>
+	result: std::result::Result<T, crate::Error>,
 ) {
 	if let Some(sender) = sender.take() {
 		if let Err(err) = sender.send(result) {
@@ -160,7 +162,7 @@ pub fn send_result<T: std::fmt::Debug>(
 		// instant seal doesn't report errors over rpc, simply log them.
 		match result {
 			Ok(r) => log::info!("Instant Seal success: {:?}", r),
-			Err(e) => log::error!("Instant Seal encountered an error: {}", e)
+			Err(e) => log::error!("Instant Seal encountered an error: {}", e),
 		}
 	}
 }
diff --git a/client/consensus/manual-seal/src/seal_block.rs b/client/consensus/manual-seal/src/seal_block.rs
index 450a7bff4cd4..be97e0ccc360 100644
--- a/client/consensus/manual-seal/src/seal_block.rs
+++ b/client/consensus/manual-seal/src/seal_block.rs
@@ -18,23 +18,21 @@
 
 //! Block sealing utilities
 
-use crate::{Error, rpc, CreatedBlock, ConsensusDataProvider};
-use std::sync::Arc;
-use sp_runtime::{
-	traits::{Block as BlockT, Header as HeaderT},
-	generic::BlockId,
-};
+use crate::{rpc, ConsensusDataProvider, CreatedBlock, Error};
 use futures::prelude::*;
+use sc_transaction_pool_api::TransactionPool;
+use sp_api::{ProvideRuntimeApi, TransactionFor};
+use sp_blockchain::HeaderBackend;
 use sp_consensus::{
-	self, BlockImport, Environment, Proposer, ForkChoiceStrategy,
-	BlockImportParams, BlockOrigin, ImportResult, SelectChain, StateAction,
+	self, BlockImport, BlockImportParams, BlockOrigin, Environment, ForkChoiceStrategy,
+	ImportResult, Proposer, SelectChain, StateAction,
 };
-use sp_blockchain::HeaderBackend;
-use std::collections::HashMap;
-use std::time::Duration;
 use sp_inherents::{CreateInherentDataProviders, InherentDataProvider};
-use sp_api::{ProvideRuntimeApi, TransactionFor};
-use sc_transaction_pool_api::TransactionPool;
+use sp_runtime::{
+	generic::BlockId,
+	traits::{Block as BlockT, Header as HeaderT},
+};
+use std::{collections::HashMap, sync::Arc, time::Duration};
 
 /// max duration for creating a proposal in secs
 pub const MAX_PROPOSAL_DURATION: u64 = 10;
@@ -59,7 +57,8 @@ pub struct SealBlockParams<'a, B: BlockT, BI, SC, C: ProvideRuntimeApi<B>, E, TP
 	/// SelectChain object
 	pub select_chain: &'a SC,
 	/// Digest provider for inclusion in blocks.
-	pub consensus_data_provider: Option<&'a dyn ConsensusDataProvider<B, Transaction = TransactionFor<C, B>>>,
+	pub consensus_data_provider:
+		Option<&'a dyn ConsensusDataProvider<B, Transaction = TransactionFor<C, B>>>,
 	/// block import object
 	pub block_import: &'a mut BI,
 	/// Something that can create the inherent data providers.
@@ -97,7 +96,7 @@ pub async fn seal_block<B, BI, SC, C, E, TP, CIDP>(
 {
 	let future = async {
 		if pool.status().ready == 0 && !create_empty {
-			return Err(Error::EmptyTransactionPool);
+			return Err(Error::EmptyTransactionPool)
 		}
 
 		// get the header to build this new block on.
@@ -129,12 +128,15 @@ pub async fn seal_block<B, BI, SC, C, E, TP, CIDP>(
 			Default::default()
 		};
 
-		let proposal = proposer.propose(
-			inherent_data.clone(),
-			digest,
-			Duration::from_secs(MAX_PROPOSAL_DURATION),
-			None,
-		).map_err(|err| Error::StringError(format!("{:?}", err))).await?;
+		let proposal = proposer
+			.propose(
+				inherent_data.clone(),
+				digest,
+				Duration::from_secs(MAX_PROPOSAL_DURATION),
+				None,
+			)
+			.map_err(|err| Error::StringError(format!("{:?}", err)))
+			.await?;
 
 		if proposal.block.extrinsics().len() == inherents_len && !create_empty {
 			return Err(Error::EmptyTransactionPool)
@@ -145,18 +147,17 @@ pub async fn seal_block<B, BI, SC, C, E, TP, CIDP>(
 		params.body = Some(body);
 		params.finalized = finalize;
 		params.fork_choice = Some(ForkChoiceStrategy::LongestChain);
-		params.state_action = StateAction::ApplyChanges(
-			sp_consensus::StorageChanges::Changes(proposal.storage_changes)
-		);
+		params.state_action = StateAction::ApplyChanges(sp_consensus::StorageChanges::Changes(
+			proposal.storage_changes,
+		));
 
 		if let Some(digest_provider) = digest_provider {
 			digest_provider.append_block_import(&parent, &mut params, &inherent_data)?;
 		}
 
 		match block_import.import_block(params, HashMap::new()).await? {
-			ImportResult::Imported(aux) => {
-				Ok(CreatedBlock { hash: <B as BlockT>::Header::hash(&header), aux })
-			},
+			ImportResult::Imported(aux) =>
+				Ok(CreatedBlock { hash: <B as BlockT>::Header::hash(&header), aux }),
 			other => Err(other.into()),
 		}
 	};
diff --git a/client/consensus/pow/src/lib.rs b/client/consensus/pow/src/lib.rs
index e71726564ebe..7e5b5a59c917 100644
--- a/client/consensus/pow/src/lib.rs
+++ b/client/consensus/pow/src/lib.rs
@@ -41,34 +41,33 @@
 
 mod worker;
 
-pub use crate::worker::{MiningWorker, MiningMetadata, MiningBuild};
+pub use crate::worker::{MiningBuild, MiningMetadata, MiningWorker};
 
-use std::{
-	sync::Arc, borrow::Cow, collections::HashMap, marker::PhantomData,
-	cmp::Ordering, time::Duration,
-};
+use codec::{Decode, Encode};
 use futures::{Future, StreamExt};
+use log::*;
 use parking_lot::Mutex;
-use sc_client_api::{BlockOf, backend::AuxStore, BlockchainEvents};
-use sp_blockchain::{HeaderBackend, ProvideCache, well_known_cache_keys::Id as CacheKeyId};
-use sp_block_builder::BlockBuilder as BlockBuilderApi;
-use sp_runtime::{Justifications, RuntimeString};
-use sp_runtime::generic::{BlockId, Digest, DigestItem};
-use sp_runtime::traits::{Block as BlockT, Header as HeaderT};
+use prometheus_endpoint::Registry;
+use sc_client_api::{self, backend::AuxStore, BlockOf, BlockchainEvents};
 use sp_api::ProvideRuntimeApi;
+use sp_block_builder::BlockBuilder as BlockBuilderApi;
+use sp_blockchain::{well_known_cache_keys::Id as CacheKeyId, HeaderBackend, ProvideCache};
+use sp_consensus::{
+	import_queue::{BasicQueue, BoxBlockImport, BoxJustificationImport, Verifier},
+	BlockCheckParams, BlockImport, BlockImportParams, BlockOrigin, CanAuthorWith, Environment,
+	Error as ConsensusError, ForkChoiceStrategy, ImportResult, Proposer, SelectChain, SyncOracle,
+};
 use sp_consensus_pow::{Seal, TotalDifficulty, POW_ENGINE_ID};
 use sp_inherents::{CreateInherentDataProviders, InherentDataProvider};
-use sp_consensus::{
-	BlockImportParams, BlockOrigin, ForkChoiceStrategy, SyncOracle, Environment, Proposer,
-	SelectChain, Error as ConsensusError, CanAuthorWith, BlockImport, BlockCheckParams, ImportResult,
+use sp_runtime::{
+	generic::{BlockId, Digest, DigestItem},
+	traits::{Block as BlockT, Header as HeaderT},
+	Justifications, RuntimeString,
 };
-use sp_consensus::import_queue::{
-	BoxBlockImport, BasicQueue, Verifier, BoxJustificationImport,
+use std::{
+	borrow::Cow, cmp::Ordering, collections::HashMap, marker::PhantomData, sync::Arc,
+	time::Duration,
 };
-use codec::{Encode, Decode};
-use prometheus_endpoint::Registry;
-use sc_client_api;
-use log::*;
 
 use crate::worker::UntilImportedOrTimeout;
 
@@ -102,7 +101,7 @@ pub enum Error<B: BlockT> {
 	CheckInherents(sp_inherents::Error),
 	#[display(
 		fmt = "Checking inherents unknown error for identifier: {:?}",
-		"String::from_utf8_lossy(_0)",
+		"String::from_utf8_lossy(_0)"
 	)]
 	CheckInherentsUnknownError(sp_inherents::InherentIdentifier),
 	#[display(fmt = "Multiple pre-runtime digests")]
@@ -153,7 +152,8 @@ pub struct PowAux<Difficulty> {
 	pub total_difficulty: Difficulty,
 }
 
-impl<Difficulty> PowAux<Difficulty> where
+impl<Difficulty> PowAux<Difficulty>
+where
 	Difficulty: Decode + Default,
 {
 	/// Read the auxiliary from client.
@@ -193,11 +193,7 @@ pub trait PowAlgorithm<B: BlockT> {
 	/// breaking algorithms will help to protect against selfish mining.
 	///
 	/// Returns if the new seal should be considered best block.
-	fn break_tie(
-		&self,
-		_own_seal: &Seal,
-		_new_seal: &Seal,
-	) -> bool {
+	fn break_tie(&self, _own_seal: &Seal, _new_seal: &Seal) -> bool {
 		false
 	}
 	/// Verify that the difficulty is valid against given seal.
@@ -238,7 +234,8 @@ impl<B: BlockT, I: Clone, C, S: Clone, Algorithm: Clone, CAW: Clone, CIDP> Clone
 	}
 }
 
-impl<B, I, C, S, Algorithm, CAW, CIDP> PowBlockImport<B, I, C, S, Algorithm, CAW, CIDP> where
+impl<B, I, C, S, Algorithm, CAW, CIDP> PowBlockImport<B, I, C, S, Algorithm, CAW, CIDP>
+where
 	B: BlockT,
 	I: BlockImport<B, Transaction = sp_api::TransactionFor<C, B>> + Send + Sync,
 	I::Error: Into<ConsensusError>,
@@ -289,14 +286,15 @@ impl<B, I, C, S, Algorithm, CAW, CIDP> PowBlockImport<B, I, C, S, Algorithm, CAW
 			return Ok(())
 		}
 
-		let inherent_data = inherent_data_providers.create_inherent_data()
+		let inherent_data = inherent_data_providers
+			.create_inherent_data()
 			.map_err(|e| Error::CreateInherents(e))?;
 
-		let inherent_res = self.client.runtime_api().check_inherents(
-			&block_id,
-			block,
-			inherent_data,
-		).map_err(|e| Error::Client(e.into()))?;
+		let inherent_res = self
+			.client
+			.runtime_api()
+			.check_inherents(&block_id, block, inherent_data)
+			.map_err(|e| Error::Client(e.into()))?;
 
 		if !inherent_res.ok() {
 			for (identifier, error) in inherent_res.into_errors() {
@@ -358,20 +356,19 @@ where
 			self.check_inherents(
 				check_block.clone(),
 				BlockId::Hash(parent_hash),
-				self.create_inherent_data_providers.create_inherent_data_providers(
-					parent_hash,
-					(),
-				).await?,
-			).await?;
+				self.create_inherent_data_providers
+					.create_inherent_data_providers(parent_hash, ())
+					.await?,
+			)
+			.await?;
 
 			block.body = Some(check_block.deconstruct().1);
 		}
 
 		let inner_seal = fetch_seal::<B>(block.post_digests.last(), block.header.hash())?;
 
-		let intermediate = block.take_intermediate::<PowIntermediate::<Algorithm::Difficulty>>(
-			INTERMEDIATE_KEY
-		)?;
+		let intermediate =
+			block.take_intermediate::<PowIntermediate<Algorithm::Difficulty>>(INTERMEDIATE_KEY)?;
 
 		let difficulty = match intermediate.difficulty {
 			Some(difficulty) => difficulty,
@@ -401,14 +398,12 @@ where
 					Ordering::Less => false,
 					Ordering::Greater => true,
 					Ordering::Equal => {
-						let best_inner_seal = fetch_seal::<B>(
-							best_header.digest().logs.last(),
-							best_hash,
-						)?;
+						let best_inner_seal =
+							fetch_seal::<B>(best_header.digest().logs.last(), best_hash)?;
 
 						self.algorithm.break_tie(&best_inner_seal, &inner_seal)
 					},
-				}
+				},
 			));
 		}
 
@@ -423,35 +418,33 @@ pub struct PowVerifier<B: BlockT, Algorithm> {
 }
 
 impl<B: BlockT, Algorithm> PowVerifier<B, Algorithm> {
-	pub fn new(
-		algorithm: Algorithm,
-	) -> Self {
+	pub fn new(algorithm: Algorithm) -> Self {
 		Self { algorithm, _marker: PhantomData }
 	}
 
 	fn check_header(
 		&self,
 		mut header: B::Header,
-	) -> Result<(B::Header, DigestItem<B::Hash>), Error<B>> where
+	) -> Result<(B::Header, DigestItem<B::Hash>), Error<B>>
+	where
 		Algorithm: PowAlgorithm<B>,
 	{
 		let hash = header.hash();
 
 		let (seal, inner_seal) = match header.digest_mut().pop() {
-			Some(DigestItem::Seal(id, seal)) => {
+			Some(DigestItem::Seal(id, seal)) =>
 				if id == POW_ENGINE_ID {
 					(DigestItem::Seal(id, seal.clone()), seal)
 				} else {
 					return Err(Error::WrongEngine(id))
-				}
-			},
+				},
 			_ => return Err(Error::HeaderUnsealed(hash)),
 		};
 
 		let pre_hash = header.hash();
 
 		if !self.algorithm.preliminary_verify(&pre_hash, &inner_seal)?.unwrap_or(true) {
-			return Err(Error::FailedPreliminaryVerify);
+			return Err(Error::FailedPreliminaryVerify)
 		}
 
 		Ok((header, seal))
@@ -459,7 +452,8 @@ impl<B: BlockT, Algorithm> PowVerifier<B, Algorithm> {
 }
 
 #[async_trait::async_trait]
-impl<B: BlockT, Algorithm> Verifier<B> for PowVerifier<B, Algorithm> where
+impl<B: BlockT, Algorithm> Verifier<B> for PowVerifier<B, Algorithm>
+where
 	Algorithm: PowAlgorithm<B> + Send + Sync,
 	Algorithm::Difficulty: 'static + Send,
 {
@@ -473,18 +467,15 @@ impl<B: BlockT, Algorithm> Verifier<B> for PowVerifier<B, Algorithm> where
 		let hash = header.hash();
 		let (checked_header, seal) = self.check_header(header)?;
 
-		let intermediate = PowIntermediate::<Algorithm::Difficulty> {
-			difficulty: None,
-		};
+		let intermediate = PowIntermediate::<Algorithm::Difficulty> { difficulty: None };
 
 		let mut import_block = BlockImportParams::new(origin, checked_header);
 		import_block.post_digests.push(seal);
 		import_block.body = body;
 		import_block.justifications = justifications;
-		import_block.intermediates.insert(
-			Cow::from(INTERMEDIATE_KEY),
-			Box::new(intermediate) as Box<_>
-		);
+		import_block
+			.intermediates
+			.insert(Cow::from(INTERMEDIATE_KEY), Box::new(intermediate) as Box<_>);
 		import_block.post_hash = Some(hash);
 
 		Ok((import_block, None))
@@ -501,10 +492,8 @@ pub fn import_queue<B, Transaction, Algorithm>(
 	algorithm: Algorithm,
 	spawner: &impl sp_core::traits::SpawnEssentialNamed,
 	registry: Option<&Registry>,
-) -> Result<
-	PowImportQueue<B, Transaction>,
-	sp_consensus::Error
-> where
+) -> Result<PowImportQueue<B, Transaction>, sp_consensus::Error>
+where
 	B: BlockT,
 	Transaction: Send + Sync + 'static,
 	Algorithm: PowAlgorithm<B> + Clone + Send + Sync + 'static,
@@ -512,13 +501,7 @@ pub fn import_queue<B, Transaction, Algorithm>(
 {
 	let verifier = PowVerifier::new(algorithm);
 
-	Ok(BasicQueue::new(
-		verifier,
-		block_import,
-		justification_import,
-		spawner,
-		registry,
-	))
+	Ok(BasicQueue::new(verifier, block_import, justification_import, spawner, registry))
 }
 
 /// Start the mining worker for PoW. This function provides the necessary helper functions that can
@@ -573,13 +556,13 @@ where
 	let task = async move {
 		loop {
 			if timer.next().await.is_none() {
-				break;
+				break
 			}
 
 			if sync_oracle.is_major_syncing() {
 				debug!(target: "pow", "Skipping proposal due to sync.");
 				worker.lock().on_major_syncing();
-				return;
+				return
 			}
 
 			let best_header = match select_chain.best_chain().await {
@@ -591,8 +574,8 @@ where
 						 Select best chain error: {:?}",
 						err
 					);
-					return;
-				}
+					return
+				},
 			};
 			let best_hash = best_header.hash();
 
@@ -603,11 +586,11 @@ where
 					 Probably a node update is required!",
 					err,
 				);
-				return;
+				return
 			}
 
 			if worker.lock().best_hash() == Some(best_hash) {
-				return;
+				return
 			}
 
 			// The worker is locked for the duration of the whole proposing period. Within this period,
@@ -622,23 +605,25 @@ where
 						 Fetch difficulty failed: {:?}",
 						err,
 					);
-					return;
+					return
 				},
 			};
 
-			let inherent_data_providers =
-				match create_inherent_data_providers.create_inherent_data_providers(best_hash, ()).await {
-					Ok(x) => x,
-					Err(err) => {
-						warn!(
-							target: "pow",
-							"Unable to propose new block for authoring. \
-							 Creating inherent data providers failed: {:?}",
-							err,
-						);
-						return;
-					},
-				};
+			let inherent_data_providers = match create_inherent_data_providers
+				.create_inherent_data_providers(best_hash, ())
+				.await
+			{
+				Ok(x) => x,
+				Err(err) => {
+					warn!(
+						target: "pow",
+						"Unable to propose new block for authoring. \
+						 Creating inherent data providers failed: {:?}",
+						err,
+					);
+					return
+				},
+			};
 
 			let inherent_data = match inherent_data_providers.create_inherent_data() {
 				Ok(r) => r,
@@ -649,7 +634,7 @@ where
 						 Creating inherent data failed: {:?}",
 						e,
 					);
-					return;
+					return
 				},
 			};
 
@@ -673,12 +658,10 @@ where
 				},
 			};
 
-			let proposal = match proposer.propose(
-				inherent_data,
-				inherent_digest,
-				build_time.clone(),
-				None,
-			).await {
+			let proposal = match proposer
+				.propose(inherent_data, inherent_digest, build_time.clone(), None)
+				.await
+			{
 				Ok(x) => x,
 				Err(err) => {
 					warn!(
@@ -714,9 +697,8 @@ fn find_pre_digest<B: BlockT>(header: &B::Header) -> Result<Option<Vec<u8>>, Err
 	for log in header.digest().logs() {
 		trace!(target: "pow", "Checking log {:?}, looking for pre runtime digest", log);
 		match (log, pre_digest.is_some()) {
-			(DigestItem::PreRuntime(POW_ENGINE_ID, _), true) => {
-				return Err(Error::MultiplePreRuntimeDigests)
-			},
+			(DigestItem::PreRuntime(POW_ENGINE_ID, _), true) =>
+				return Err(Error::MultiplePreRuntimeDigests),
 			(DigestItem::PreRuntime(POW_ENGINE_ID, v), false) => {
 				pre_digest = Some(v.clone());
 			},
@@ -733,13 +715,12 @@ fn fetch_seal<B: BlockT>(
 	hash: B::Hash,
 ) -> Result<Vec<u8>, Error<B>> {
 	match digest {
-		Some(DigestItem::Seal(id, seal)) => {
+		Some(DigestItem::Seal(id, seal)) =>
 			if id == &POW_ENGINE_ID {
 				Ok(seal.clone())
 			} else {
 				return Err(Error::<B>::WrongEngine(*id).into())
-			}
-		},
+			},
 		_ => return Err(Error::<B>::HeaderUnsealed(hash).into()),
 	}
 }
diff --git a/client/consensus/pow/src/worker.rs b/client/consensus/pow/src/worker.rs
index 74fbcce81341..572ed364c8f8 100644
--- a/client/consensus/pow/src/worker.rs
+++ b/client/consensus/pow/src/worker.rs
@@ -16,20 +16,25 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use std::{pin::Pin, time::Duration, collections::HashMap, borrow::Cow};
+use futures::{
+	prelude::*,
+	task::{Context, Poll},
+};
+use futures_timer::Delay;
+use log::*;
 use sc_client_api::ImportNotifications;
-use sp_consensus::{Proposal, BlockOrigin, BlockImportParams, StorageChanges,
-	StateAction, import_queue::BoxBlockImport};
+use sp_consensus::{
+	import_queue::BoxBlockImport, BlockImportParams, BlockOrigin, Proposal, StateAction,
+	StorageChanges,
+};
 use sp_runtime::{
 	generic::BlockId,
 	traits::{Block as BlockT, Header as HeaderT},
 	DigestItem,
 };
-use futures::{prelude::*, task::{Context, Poll}};
-use futures_timer::Delay;
-use log::*;
+use std::{borrow::Cow, collections::HashMap, pin::Pin, time::Duration};
 
-use crate::{INTERMEDIATE_KEY, POW_ENGINE_ID, Seal, PowAlgorithm, PowIntermediate};
+use crate::{PowAlgorithm, PowIntermediate, Seal, INTERMEDIATE_KEY, POW_ENGINE_ID};
 
 /// Mining metadata. This is the information needed to start an actual mining loop.
 #[derive(Clone, Eq, PartialEq)]
@@ -49,7 +54,7 @@ pub struct MiningBuild<
 	Block: BlockT,
 	Algorithm: PowAlgorithm<Block>,
 	C: sp_api::ProvideRuntimeApi<Block>,
-	Proof
+	Proof,
 > {
 	/// Mining metadata.
 	pub metadata: MiningMetadata<Block::Hash, Algorithm::Difficulty>,
@@ -90,10 +95,7 @@ where
 		self.build = None;
 	}
 
-	pub(crate) fn on_build(
-		&mut self,
-		build: MiningBuild<Block, Algorithm, C, Proof>,
-	) {
+	pub(crate) fn on_build(&mut self, build: MiningBuild<Block, Algorithm, C, Proof>) {
 		self.build = Some(build);
 	}
 
@@ -137,23 +139,25 @@ where
 			let mut import_block = BlockImportParams::new(BlockOrigin::Own, header);
 			import_block.post_digests.push(seal);
 			import_block.body = Some(body);
-			import_block.state_action = StateAction::ApplyChanges(
-				StorageChanges::Changes(build.proposal.storage_changes)
-			);
+			import_block.state_action =
+				StateAction::ApplyChanges(StorageChanges::Changes(build.proposal.storage_changes));
 
 			let intermediate = PowIntermediate::<Algorithm::Difficulty> {
 				difficulty: Some(build.metadata.difficulty),
 			};
 
-			import_block.intermediates.insert(
-				Cow::from(INTERMEDIATE_KEY),
-				Box::new(intermediate) as Box<_>,
-			);
+			import_block
+				.intermediates
+				.insert(Cow::from(INTERMEDIATE_KEY), Box::new(intermediate) as Box<_>);
 
 			let header = import_block.post_header();
 			match self.block_import.import_block(import_block, HashMap::default()).await {
 				Ok(res) => {
-					res.handle_justification(&header.hash(), *header.number(), &mut self.justification_sync_link);
+					res.handle_justification(
+						&header.hash(),
+						*header.number(),
+						&mut self.justification_sync_link,
+					);
 
 					info!(
 						target: "pow",
@@ -190,15 +194,8 @@ pub struct UntilImportedOrTimeout<Block: BlockT> {
 
 impl<Block: BlockT> UntilImportedOrTimeout<Block> {
 	/// Create a new stream using the given import notification and timeout duration.
-	pub fn new(
-		import_notifications: ImportNotifications<Block>,
-		timeout: Duration,
-	) -> Self {
-		Self {
-			import_notifications,
-			timeout,
-			inner_delay: None,
-		}
+	pub fn new(import_notifications: ImportNotifications<Block>, timeout: Duration) -> Self {
+		Self { import_notifications, timeout, inner_delay: None }
 	}
 }
 
diff --git a/client/consensus/slots/src/aux_schema.rs b/client/consensus/slots/src/aux_schema.rs
index db94ec48855e..af92a3a0d60f 100644
--- a/client/consensus/slots/src/aux_schema.rs
+++ b/client/consensus/slots/src/aux_schema.rs
@@ -18,9 +18,9 @@
 
 //! Schema for slots in the aux-db.
 
-use codec::{Encode, Decode};
+use codec::{Decode, Encode};
 use sc_client_api::backend::AuxStore;
-use sp_blockchain::{Result as ClientResult, Error as ClientError};
+use sp_blockchain::{Error as ClientError, Result as ClientResult};
 use sp_consensus_slots::{EquivocationProof, Slot};
 use sp_runtime::traits::Header;
 
@@ -33,17 +33,17 @@ pub const MAX_SLOT_CAPACITY: u64 = 1000;
 pub const PRUNING_BOUND: u64 = 2 * MAX_SLOT_CAPACITY;
 
 fn load_decode<C, T>(backend: &C, key: &[u8]) -> ClientResult<Option<T>>
-	where
-		C: AuxStore,
-		T: Decode,
+where
+	C: AuxStore,
+	T: Decode,
 {
 	match backend.get_aux(key)? {
 		None => Ok(None),
 		Some(t) => T::decode(&mut &t[..])
-			.map_err(
-				|e| ClientError::Backend(format!("Slots DB is corrupted. Decode error: {}", e)),
-			)
-			.map(Some)
+			.map_err(|e| {
+				ClientError::Backend(format!("Slots DB is corrupted. Decode error: {}", e))
+			})
+			.map(Some),
 	}
 }
 
@@ -57,14 +57,14 @@ pub fn check_equivocation<C, H, P>(
 	header: &H,
 	signer: &P,
 ) -> ClientResult<Option<EquivocationProof<H, P>>>
-	where
-		H: Header,
-		C: AuxStore,
-		P: Clone + Encode + Decode + PartialEq,
+where
+	H: Header,
+	C: AuxStore,
+	P: Clone + Encode + Decode + PartialEq,
 {
 	// We don't check equivocations for old headers out of our capacity.
 	if slot_now.saturating_sub(*slot) > Slot::from(MAX_SLOT_CAPACITY) {
-		return Ok(None);
+		return Ok(None)
 	}
 
 	// Key for this slot.
@@ -72,17 +72,16 @@ pub fn check_equivocation<C, H, P>(
 	slot.using_encoded(|s| curr_slot_key.extend(s));
 
 	// Get headers of this slot.
-	let mut headers_with_sig = load_decode::<_, Vec<(H, P)>>(backend, &curr_slot_key[..])?
-		.unwrap_or_else(Vec::new);
+	let mut headers_with_sig =
+		load_decode::<_, Vec<(H, P)>>(backend, &curr_slot_key[..])?.unwrap_or_else(Vec::new);
 
 	// Get first slot saved.
 	let slot_header_start = SLOT_HEADER_START.to_vec();
-	let first_saved_slot = load_decode::<_, Slot>(backend, &slot_header_start[..])?
-		.unwrap_or(slot);
+	let first_saved_slot = load_decode::<_, Slot>(backend, &slot_header_start[..])?.unwrap_or(slot);
 
 	if slot_now < first_saved_slot {
 		// The code below assumes that slots will be visited sequentially.
-		return Ok(None);
+		return Ok(None)
 	}
 
 	for (prev_header, prev_signer) in headers_with_sig.iter() {
@@ -96,7 +95,7 @@ pub fn check_equivocation<C, H, P>(
 					offender: signer.clone(),
 					first_header: prev_header.clone(),
 					second_header: header.clone(),
-				}));
+				}))
 			} else {
 				// We don't need to continue in case of duplicated header,
 				// since it's already saved and a possible equivocation
@@ -135,12 +134,11 @@ pub fn check_equivocation<C, H, P>(
 
 #[cfg(test)]
 mod test {
-	use sp_core::{sr25519, Pair};
-	use sp_core::hash::H256;
-	use sp_runtime::testing::{Header as HeaderTest, Digest as DigestTest};
+	use sp_core::{hash::H256, sr25519, Pair};
+	use sp_runtime::testing::{Digest as DigestTest, Header as HeaderTest};
 	use substrate_test_runtime_client;
 
-	use super::{MAX_SLOT_CAPACITY, PRUNING_BOUND, check_equivocation};
+	use super::{check_equivocation, MAX_SLOT_CAPACITY, PRUNING_BOUND};
 
 	fn create_header(number: u64) -> HeaderTest {
 		// so that different headers for the same number get different hashes
@@ -151,7 +149,7 @@ mod test {
 			number,
 			state_root: Default::default(),
 			extrinsics_root: Default::default(),
-			digest: DigestTest { logs: vec![], },
+			digest: DigestTest { logs: vec![] },
 		};
 
 		header
@@ -171,79 +169,55 @@ mod test {
 		let header6 = create_header(3); // @ slot 4
 
 		// It's ok to sign same headers.
-		assert!(
-			check_equivocation(
-				&client,
-				2.into(),
-				2.into(),
-				&header1,
-				&public,
-			).unwrap().is_none(),
-		);
-
-		assert!(
-			check_equivocation(
-				&client,
-				3.into(),
-				2.into(),
-				&header1,
-				&public,
-			).unwrap().is_none(),
-		);
+		assert!(check_equivocation(&client, 2.into(), 2.into(), &header1, &public,)
+			.unwrap()
+			.is_none(),);
+
+		assert!(check_equivocation(&client, 3.into(), 2.into(), &header1, &public,)
+			.unwrap()
+			.is_none(),);
 
 		// But not two different headers at the same slot.
-		assert!(
-			check_equivocation(
-				&client,
-				4.into(),
-				2.into(),
-				&header2,
-				&public,
-			).unwrap().is_some(),
-		);
+		assert!(check_equivocation(&client, 4.into(), 2.into(), &header2, &public,)
+			.unwrap()
+			.is_some(),);
 
 		// Different slot is ok.
-		assert!(
-			check_equivocation(
-				&client,
-				5.into(),
-				4.into(),
-				&header3,
-				&public,
-			).unwrap().is_none(),
-		);
+		assert!(check_equivocation(&client, 5.into(), 4.into(), &header3, &public,)
+			.unwrap()
+			.is_none(),);
 
 		// Here we trigger pruning and save header 4.
-		assert!(
-			check_equivocation(
-				&client,
-				(PRUNING_BOUND + 2).into(),
-				(MAX_SLOT_CAPACITY + 4).into(),
-				&header4,
-				&public,
-			).unwrap().is_none(),
-		);
+		assert!(check_equivocation(
+			&client,
+			(PRUNING_BOUND + 2).into(),
+			(MAX_SLOT_CAPACITY + 4).into(),
+			&header4,
+			&public,
+		)
+		.unwrap()
+		.is_none(),);
 
 		// This fails because header 5 is an equivocation of header 4.
-		assert!(
-			check_equivocation(
-				&client,
-				(PRUNING_BOUND + 3).into(),
-				(MAX_SLOT_CAPACITY + 4).into(),
-				&header5,
-				&public,
-			).unwrap().is_some(),
-		);
+		assert!(check_equivocation(
+			&client,
+			(PRUNING_BOUND + 3).into(),
+			(MAX_SLOT_CAPACITY + 4).into(),
+			&header5,
+			&public,
+		)
+		.unwrap()
+		.is_some(),);
 
 		// This is ok because we pruned the corresponding header. Shows that we are pruning.
-		assert!(
-			check_equivocation(
-				&client,
-				(PRUNING_BOUND + 4).into(),
-				4.into(),
-				&header6,
-				&public,
-			).unwrap().is_none(),
-		);
+		assert!(check_equivocation(
+			&client,
+			(PRUNING_BOUND + 4).into(),
+			4.into(),
+			&header6,
+			&public,
+		)
+		.unwrap()
+		.is_none(),);
 	}
 }
diff --git a/client/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs
index c410f173e90a..b9b337c7edef 100644
--- a/client/consensus/slots/src/lib.rs
+++ b/client/consensus/slots/src/lib.rs
@@ -25,19 +25,19 @@
 #![forbid(unsafe_code)]
 #![warn(missing_docs)]
 
-mod slots;
 mod aux_schema;
+mod slots;
 
+pub use aux_schema::{check_equivocation, MAX_SLOT_CAPACITY, PRUNING_BOUND};
 pub use slots::SlotInfo;
 use slots::Slots;
-pub use aux_schema::{check_equivocation, MAX_SLOT_CAPACITY, PRUNING_BOUND};
 
-use std::{fmt::Debug, ops::Deref, time::Duration};
 use codec::{Decode, Encode};
 use futures::{future::Either, Future, TryFutureExt};
 use futures_timer::Delay;
 use log::{debug, error, info, warn};
-use sp_api::{ProvideRuntimeApi, ApiRef};
+use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_DEBUG, CONSENSUS_INFO, CONSENSUS_WARN};
+use sp_api::{ApiRef, ProvideRuntimeApi};
 use sp_arithmetic::traits::BaseArithmetic;
 use sp_consensus::{
 	BlockImport, CanAuthorWith, JustificationSyncLink, Proposer, SelectChain, SlotData, SyncOracle,
@@ -46,10 +46,10 @@ use sp_consensus_slots::Slot;
 use sp_inherents::CreateInherentDataProviders;
 use sp_runtime::{
 	generic::BlockId,
-	traits::{Block as BlockT, Header as HeaderT, HashFor, NumberFor}
+	traits::{Block as BlockT, HashFor, Header as HeaderT, NumberFor},
 };
-use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_DEBUG, CONSENSUS_WARN, CONSENSUS_INFO};
 use sp_timestamp::Timestamp;
+use std::{fmt::Debug, ops::Deref, time::Duration};
 
 /// The changes that need to applied to the storage to create the state for a block.
 ///
@@ -76,10 +76,7 @@ pub trait SlotWorker<B: BlockT, Proof> {
 	///
 	/// Returns a future that resolves to a [`SlotResult`] iff a block was successfully built in
 	/// the slot. Otherwise `None` is returned.
-	async fn on_slot(
-		&mut self,
-		slot_info: SlotInfo<B>,
-	) -> Option<SlotResult<B, Proof>>;
+	async fn on_slot(&mut self, slot_info: SlotInfo<B>) -> Option<SlotResult<B, Proof>>;
 }
 
 /// A skeleton implementation for `SlotWorker` which tries to claim a slot at
@@ -89,7 +86,8 @@ pub trait SlotWorker<B: BlockT, Proof> {
 pub trait SimpleSlotWorker<B: BlockT> {
 	/// A handle to a `BlockImport`.
 	type BlockImport: BlockImport<B, Transaction = <Self::Proposer as Proposer<B>>::Transaction>
-		+ Send + 'static;
+		+ Send
+		+ 'static;
 
 	/// A handle to a `SyncOracle`.
 	type SyncOracle: SyncOracle;
@@ -100,7 +98,9 @@ pub trait SimpleSlotWorker<B: BlockT> {
 
 	/// The type of future resolving to the proposer.
 	type CreateProposer: Future<Output = Result<Self::Proposer, sp_consensus::Error>>
-		+ Send + Unpin + 'static;
+		+ Send
+		+ Unpin
+		+ 'static;
 
 	/// The type of proposer to use to build blocks.
 	type Proposer: Proposer<B> + Send;
@@ -139,12 +139,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 
 	/// Notifies the given slot. Similar to `claim_slot`, but will be called no matter whether we
 	/// need to author blocks or not.
-	fn notify_slot(
-		&self,
-		_header: &B::Header,
-		_slot: Slot,
-		_epoch_data: &Self::EpochData,
-	) {}
+	fn notify_slot(&self, _header: &B::Header, _slot: Slot, _epoch_data: &Self::EpochData) {}
 
 	/// Return the pre digest data to include in a block authored with the given claim.
 	fn pre_digest_data(
@@ -154,18 +149,24 @@ pub trait SimpleSlotWorker<B: BlockT> {
 	) -> Vec<sp_runtime::DigestItem<B::Hash>>;
 
 	/// Returns a function which produces a `BlockImportParams`.
-	fn block_import_params(&self) -> Box<
+	fn block_import_params(
+		&self,
+	) -> Box<
 		dyn Fn(
-			B::Header,
-			&B::Hash,
-			Vec<B::Extrinsic>,
-			StorageChanges<<Self::BlockImport as BlockImport<B>>::Transaction, B>,
-			Self::Claim,
-			Self::EpochData,
-		) -> Result<
-				sp_consensus::BlockImportParams<B, <Self::BlockImport as BlockImport<B>>::Transaction>,
-				sp_consensus::Error
-			> + Send + 'static
+				B::Header,
+				&B::Hash,
+				Vec<B::Extrinsic>,
+				StorageChanges<<Self::BlockImport as BlockImport<B>>::Transaction, B>,
+				Self::Claim,
+				Self::EpochData,
+			) -> Result<
+				sp_consensus::BlockImportParams<
+					B,
+					<Self::BlockImport as BlockImport<B>>::Transaction,
+				>,
+				sp_consensus::Error,
+			> + Send
+			+ 'static,
 	>;
 
 	/// Whether to force authoring if offline.
@@ -194,10 +195,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 	fn telemetry(&self) -> Option<TelemetryHandle>;
 
 	/// Remaining duration for proposing.
-	fn proposing_remaining_duration(
-		&self,
-		slot_info: &SlotInfo<B>,
-	) -> Duration;
+	fn proposing_remaining_duration(&self, slot_info: &SlotInfo<B>) -> Duration;
 
 	/// Implements [`SlotWorker::on_slot`].
 	async fn on_slot(
@@ -213,8 +211,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 		let proposing_remaining = if proposing_remaining_duration == Duration::default() {
 			debug!(
 				target: logging_target,
-				"Skipping proposal slot {} since there's no time left to propose",
-				slot,
+				"Skipping proposal slot {} since there's no time left to propose", slot,
 			);
 
 			return None
@@ -240,8 +237,8 @@ pub trait SimpleSlotWorker<B: BlockT> {
 					"err" => ?err,
 				);
 
-				return None;
-			}
+				return None
+			},
 		};
 
 		self.notify_slot(&slot_info.chain_head, slot, &epoch_data);
@@ -260,13 +257,13 @@ pub trait SimpleSlotWorker<B: BlockT> {
 				"authorities_len" => authorities_len,
 			);
 
-			return None;
+			return None
 		}
 
 		let claim = self.claim_slot(&slot_info.chain_head, slot, &epoch_data)?;
 
 		if self.should_backoff(slot, &slot_info.chain_head) {
-			return None;
+			return None
 		}
 
 		debug!(
@@ -289,9 +286,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 			Err(err) => {
 				warn!(
 					target: logging_target,
-					"Unable to author block in slot {:?}: {:?}",
-					slot,
-					err,
+					"Unable to author block in slot {:?}: {:?}", slot, err,
 				);
 
 				telemetry!(
@@ -303,7 +298,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 				);
 
 				return None
-			}
+			},
 		};
 
 		let logs = self.pre_digest_data(slot, &claim);
@@ -311,34 +306,29 @@ pub trait SimpleSlotWorker<B: BlockT> {
 		// deadline our production to 98% of the total time left for proposing. As we deadline
 		// the proposing below to the same total time left, the 2% margin should be enough for
 		// the result to be returned.
-		let proposing = proposer.propose(
-			slot_info.inherent_data,
-			sp_runtime::generic::Digest {
-				logs,
-			},
-			proposing_remaining_duration.mul_f32(0.98),
-			None,
-		).map_err(|e| sp_consensus::Error::ClientImport(format!("{:?}", e)));
+		let proposing = proposer
+			.propose(
+				slot_info.inherent_data,
+				sp_runtime::generic::Digest { logs },
+				proposing_remaining_duration.mul_f32(0.98),
+				None,
+			)
+			.map_err(|e| sp_consensus::Error::ClientImport(format!("{:?}", e)));
 
 		let proposal = match futures::future::select(proposing, proposing_remaining).await {
 			Either::Left((Ok(p), _)) => p,
 			Either::Left((Err(err), _)) => {
-				warn!(
-					target: logging_target,
-					"Proposing failed: {:?}",
-					err,
-				);
+				warn!(target: logging_target, "Proposing failed: {:?}", err,);
 
 				return None
 			},
 			Either::Right(_) => {
 				info!(
 					target: logging_target,
-					"⌛️ Discarding proposal for slot {}; block production took too long",
-					slot,
+					"⌛️ Discarding proposal for slot {}; block production took too long", slot,
 				);
 				// If the node was compiled with debug, tell the user to use release optimizations.
-				#[cfg(build_type="debug")]
+				#[cfg(build_type = "debug")]
 				info!(
 					target: logging_target,
 					"👉 Recompile your node in `--release` mode to mitigate this problem.",
@@ -373,14 +363,10 @@ pub trait SimpleSlotWorker<B: BlockT> {
 		) {
 			Ok(bi) => bi,
 			Err(err) => {
-				warn!(
-					target: logging_target,
-					"Failed to create block import params: {:?}",
-					err,
-				);
+				warn!(target: logging_target, "Failed to create block import params: {:?}", err,);
 
 				return None
-			}
+			},
 		};
 
 		info!(
@@ -401,17 +387,14 @@ pub trait SimpleSlotWorker<B: BlockT> {
 		);
 
 		let header = block_import_params.post_header();
-		match block_import
-			.import_block(block_import_params, Default::default())
-			.await
-		{
+		match block_import.import_block(block_import_params, Default::default()).await {
 			Ok(res) => {
 				res.handle_justification(
 					&header.hash(),
 					*header.number(),
 					self.justification_sync_link(),
 				);
-			}
+			},
 			Err(err) => {
 				warn!(
 					target: logging_target,
@@ -425,18 +408,17 @@ pub trait SimpleSlotWorker<B: BlockT> {
 					"hash" => ?parent_hash,
 					"err" => ?err,
 				);
-			}
+			},
 		}
 
-		Some(SlotResult {
-			block: B::new(header, body),
-			storage_proof,
-		})
+		Some(SlotResult { block: B::new(header, body), storage_proof })
 	}
 }
 
 #[async_trait::async_trait]
-impl<B: BlockT, T: SimpleSlotWorker<B> + Send> SlotWorker<B, <T::Proposer as Proposer<B>>::Proof> for T {
+impl<B: BlockT, T: SimpleSlotWorker<B> + Send> SlotWorker<B, <T::Proposer as Proposer<B>>::Proof>
+	for T
+{
 	async fn on_slot(
 		&mut self,
 		slot_info: SlotInfo<B>,
@@ -496,8 +478,7 @@ pub async fn start_slot_worker<B, C, W, T, SO, CIDP, CAW, Proof>(
 	mut sync_oracle: SO,
 	create_inherent_data_providers: CIDP,
 	can_author_with: CAW,
-)
-where
+) where
 	B: BlockT,
 	C: SelectChain<B>,
 	W: SlotWorker<B, Proof>,
@@ -509,28 +490,25 @@ where
 {
 	let SlotDuration(slot_duration) = slot_duration;
 
-	let mut slots = Slots::new(
-		slot_duration.slot_duration(),
-		create_inherent_data_providers,
-		client,
-	);
+	let mut slots =
+		Slots::new(slot_duration.slot_duration(), create_inherent_data_providers, client);
 
 	loop {
 		let slot_info = match slots.next_slot().await {
 			Ok(r) => r,
 			Err(e) => {
 				warn!(target: "slots", "Error while polling for next slot: {:?}", e);
-				return;
-			}
+				return
+			},
 		};
 
 		if sync_oracle.is_major_syncing() {
 			debug!(target: "slots", "Skipping proposal slot due to sync.");
-			continue;
+			continue
 		}
 
-		if let Err(err) = can_author_with
-			.can_author_with(&BlockId::Hash(slot_info.chain_head.hash()))
+		if let Err(err) =
+			can_author_with.can_author_with(&BlockId::Hash(slot_info.chain_head.hash()))
 		{
 			warn!(
 				target: "slots",
@@ -559,7 +537,10 @@ pub enum CheckedHeader<H, S> {
 
 #[derive(Debug, thiserror::Error)]
 #[allow(missing_docs)]
-pub enum Error<T> where T: Debug {
+pub enum Error<T>
+where
+	T: Debug,
+{
 	#[error("Slot duration is invalid: {0:?}")]
 	SlotDurationInvalid(SlotDuration<T>),
 }
@@ -591,25 +572,23 @@ impl<T: Clone + Send + Sync + 'static> SlotDuration<T> {
 	///
 	/// `slot_key` is marked as `'static`, as it should really be a
 	/// compile-time constant.
-	pub fn get_or_compute<B: BlockT, C, CB>(client: &C, cb: CB) -> sp_blockchain::Result<Self> where
+	pub fn get_or_compute<B: BlockT, C, CB>(client: &C, cb: CB) -> sp_blockchain::Result<Self>
+	where
 		C: sc_client_api::backend::AuxStore + sc_client_api::UsageProvider<B>,
 		C: ProvideRuntimeApi<B>,
 		CB: FnOnce(ApiRef<C::Api>, &BlockId<B>) -> sp_blockchain::Result<T>,
 		T: SlotData + Encode + Decode + Debug,
 	{
 		let slot_duration = match client.get_aux(T::SLOT_KEY)? {
-			Some(v) => <T as codec::Decode>::decode(&mut &v[..])
-				.map(SlotDuration)
-				.map_err(|_| {
-					sp_blockchain::Error::Backend({
-						error!(target: "slots", "slot duration kept in invalid format");
-						"slot duration kept in invalid format".to_string()
-					})
-				}),
+			Some(v) => <T as codec::Decode>::decode(&mut &v[..]).map(SlotDuration).map_err(|_| {
+				sp_blockchain::Error::Backend({
+					error!(target: "slots", "slot duration kept in invalid format");
+					"slot duration kept in invalid format".to_string()
+				})
+			}),
 			None => {
 				let best_hash = client.usage_info().chain.best_hash;
-				let slot_duration =
-					cb(client.runtime_api(), &BlockId::hash(best_hash))?;
+				let slot_duration = cb(client.runtime_api(), &BlockId::hash(best_hash))?;
 
 				info!(
 					"⏱  Loaded block-time = {:?} from block {:?}",
@@ -621,11 +600,13 @@ impl<T: Clone + Send + Sync + 'static> SlotDuration<T> {
 					.using_encoded(|s| client.insert_aux(&[(T::SLOT_KEY, &s[..])], &[]))?;
 
 				Ok(SlotDuration(slot_duration))
-			}
+			},
 		}?;
 
 		if slot_duration.slot_duration() == Default::default() {
-			return Err(sp_blockchain::Error::Application(Box::new(Error::SlotDurationInvalid(slot_duration))))
+			return Err(sp_blockchain::Error::Application(Box::new(Error::SlotDurationInvalid(
+				slot_duration,
+			))))
 		}
 
 		Ok(slot_duration)
@@ -687,9 +668,7 @@ pub fn proposing_remaining_duration<Block: BlockT>(
 ) -> Duration {
 	use sp_runtime::traits::Zero;
 
-	let proposing_duration = slot_info
-		.duration
-		.mul_f32(block_proposal_slot_portion.get());
+	let proposing_duration = slot_info.duration.mul_f32(block_proposal_slot_portion.get());
 
 	let slot_remaining = slot_info
 		.ends_at
@@ -700,7 +679,7 @@ pub fn proposing_remaining_duration<Block: BlockT>(
 
 	// If parent is genesis block, we don't require any lenience factor.
 	if slot_info.chain_head.number().is_zero() {
-		return proposing_duration;
+		return proposing_duration
 	}
 
 	let parent_slot = match parent_slot {
@@ -723,9 +702,7 @@ pub fn proposing_remaining_duration<Block: BlockT>(
 			if let Some(ref max_block_proposal_slot_portion) = max_block_proposal_slot_portion {
 				std::cmp::min(
 					lenient_proposing_duration,
-					slot_info
-						.duration
-						.mul_f32(max_block_proposal_slot_portion.get()),
+					slot_info.duration.mul_f32(max_block_proposal_slot_portion.get()),
 				)
 			} else {
 				lenient_proposing_duration
@@ -853,7 +830,7 @@ impl<N: BaseArithmetic> Default for BackoffAuthoringOnFinalizedHeadLagging<N> {
 
 impl<N> BackoffAuthoringBlocksStrategy<N> for BackoffAuthoringOnFinalizedHeadLagging<N>
 where
-	N: BaseArithmetic + Copy
+	N: BaseArithmetic + Copy,
 {
 	fn should_backoff(
 		&self,
@@ -865,12 +842,12 @@ where
 	) -> bool {
 		// This should not happen, but we want to keep the previous behaviour if it does.
 		if slot_now <= chain_head_slot {
-			return false;
+			return false
 		}
 
 		let unfinalized_block_length = chain_head_number - finalized_number;
-		let interval = unfinalized_block_length.saturating_sub(self.unfinalized_slack)
-			/ self.authoring_bias;
+		let interval =
+			unfinalized_block_length.saturating_sub(self.unfinalized_slack) / self.authoring_bias;
 		let interval = interval.min(self.max_interval);
 
 		// We're doing arithmetic between block and slot numbers.
@@ -906,9 +883,9 @@ impl<N> BackoffAuthoringBlocksStrategy<N> for () {
 #[cfg(test)]
 mod test {
 	use super::*;
+	use sp_api::NumberFor;
 	use std::time::{Duration, Instant};
 	use substrate_test_runtime_client::runtime::{Block, Header};
-	use sp_api::NumberFor;
 
 	const SLOT_DURATION: Duration = Duration::from_millis(6000);
 
@@ -945,10 +922,7 @@ mod test {
 		}
 
 		// but we cap it to a maximum of 20 slots
-		assert_eq!(
-			super::slot_lenience_linear(1u64.into(), &slot(23)),
-			Some(SLOT_DURATION * 20),
-		);
+		assert_eq!(super::slot_lenience_linear(1u64.into(), &slot(23)), Some(SLOT_DURATION * 20),);
 	}
 
 	#[test]
@@ -1041,7 +1015,15 @@ mod test {
 		let slot_now = 2;
 
 		let should_backoff: Vec<bool> = (slot_now..1000)
-			.map(|s| strategy.should_backoff(head_number, head_slot.into(), finalized_number, s.into(), "slots"))
+			.map(|s| {
+				strategy.should_backoff(
+					head_number,
+					head_slot.into(),
+					finalized_number,
+					s.into(),
+					"slots",
+				)
+			})
 			.collect();
 
 		// Should always be false, since the head isn't advancing
@@ -1105,7 +1087,15 @@ mod test {
 		let max_interval = strategy.max_interval;
 
 		let should_backoff: Vec<bool> = (slot_now..200)
-			.map(|s| strategy.should_backoff(head_number, head_slot.into(), finalized_number, s.into(), "slots"))
+			.map(|s| {
+				strategy.should_backoff(
+					head_number,
+					head_slot.into(),
+					finalized_number,
+					s.into(),
+					"slots",
+				)
+			})
 			.collect();
 
 		// Should backoff (true) until we are `max_interval` number of slots ahead of the chain
@@ -1123,11 +1113,7 @@ mod test {
 		};
 
 		let finalized_number = 2;
-		let mut head_state = HeadState {
-			head_number: 4,
-			head_slot: 10,
-			slot_now: 11,
-		};
+		let mut head_state = HeadState { head_number: 4, head_slot: 10, slot_now: 11 };
 
 		let should_backoff = |head_state: &HeadState| -> bool {
 			<dyn BackoffAuthoringBlocksStrategy<NumberFor<Block>>>::should_backoff(
@@ -1155,32 +1141,27 @@ mod test {
 		// Gradually start to backoff more and more frequently
 		let expected = [
 			false, false, false, false, false, // no effect
-			true, false,
-			true, false, // 1:1
-			true, true, false,
-			true, true, false, // 2:1
-			true, true, true, false,
-			true, true, true, false, // 3:1
-			true, true, true, true, false,
-			true, true, true, true, false, // 4:1
-			true, true, true, true, true, false,
-			true, true, true, true, true, false, // 5:1
-			true, true, true, true, true, true, false,
-			true, true, true, true, true, true, false, // 6:1
-			true, true, true, true, true, true, true, false,
-			true, true, true, true, true, true, true, false, // 7:1
-			true, true, true, true, true, true, true, true, false,
-			true, true, true, true, true, true, true, true, false, // 8:1
-			true, true, true, true, true, true, true, true, true, false,
-			true, true, true, true, true, true, true, true, true, false, // 9:1
-			true, true, true, true, true, true, true, true, true, true, false,
-			true, true, true, true, true, true, true, true, true, true, false, // 10:1
-			true, true, true, true, true, true, true, true, true, true, true, false,
-			true, true, true, true, true, true, true, true, true, true, true, false, // 11:1
-			true, true, true, true, true, true, true, true, true, true, true, true, false,
-			true, true, true, true, true, true, true, true, true, true, true, true, false, // 12:1
+			true, false, true, false, // 1:1
+			true, true, false, true, true, false, // 2:1
+			true, true, true, false, true, true, true, false, // 3:1
+			true, true, true, true, false, true, true, true, true, false, // 4:1
+			true, true, true, true, true, false, true, true, true, true, true, false, // 5:1
+			true, true, true, true, true, true, false, true, true, true, true, true, true,
+			false, // 6:1
+			true, true, true, true, true, true, true, false, true, true, true, true, true, true,
+			true, false, // 7:1
+			true, true, true, true, true, true, true, true, false, true, true, true, true, true,
+			true, true, true, false, // 8:1
+			true, true, true, true, true, true, true, true, true, false, true, true, true, true,
+			true, true, true, true, true, false, // 9:1
+			true, true, true, true, true, true, true, true, true, true, false, true, true, true,
+			true, true, true, true, true, true, true, false, // 10:1
+			true, true, true, true, true, true, true, true, true, true, true, false, true, true,
+			true, true, true, true, true, true, true, true, true, false, // 11:1
+			true, true, true, true, true, true, true, true, true, true, true, true, false, true,
+			true, true, true, true, true, true, true, true, true, true, true, false, // 12:1
 			true, true, true, true,
-	];
+		];
 
 		assert_eq!(backoff.as_slice(), &expected[..]);
 	}
@@ -1195,11 +1176,7 @@ mod test {
 
 		let finalized_number = 2;
 		let starting_slot = 11;
-		let mut head_state = HeadState {
-			head_number: 4,
-			head_slot: 10,
-			slot_now: starting_slot,
-		};
+		let mut head_state = HeadState { head_number: 4, head_slot: 10, slot_now: starting_slot };
 
 		let should_backoff = |head_state: &HeadState| -> bool {
 			<dyn BackoffAuthoringBlocksStrategy<NumberFor<Block>>>::should_backoff(
@@ -1240,30 +1217,22 @@ mod test {
 		assert_eq!(last_slot - last_two_claimed.next().unwrap(), 92);
 		assert_eq!(last_slot - last_two_claimed.next().unwrap(), 92 + expected_distance);
 
-		let intervals: Vec<_> = slots_claimed
-			.windows(2)
-			.map(|x| x[1] - x[0])
-			.collect();
+		let intervals: Vec<_> = slots_claimed.windows(2).map(|x| x[1] - x[0]).collect();
 
 		// The key thing is that the distance between claimed slots is capped to `max_interval + 1`
 		// assert_eq!(max_observed_interval, Some(&expected_distance));
 		assert_eq!(intervals.iter().max(), Some(&expected_distance));
 
 		// But lets assert all distances, which we expect to grow linearly until `max_interval + 1`
-		let expected_intervals: Vec<_> = (0..497)
-			.map(|i| (i/2).max(1).min(expected_distance) )
-			.collect();
+		let expected_intervals: Vec<_> =
+			(0..497).map(|i| (i / 2).max(1).min(expected_distance)).collect();
 
 		assert_eq!(intervals, expected_intervals);
 	}
 
 	fn run_until_max_interval(param: BackoffAuthoringOnFinalizedHeadLagging<u64>) -> (u64, u64) {
 		let finalized_number = 0;
-		let mut head_state = HeadState {
-			head_number: 0,
-			head_slot: 0,
-			slot_now: 1,
-		};
+		let mut head_state = HeadState { head_number: 0, head_slot: 0, slot_now: 1 };
 
 		let should_backoff = |head_state: &HeadState| -> bool {
 			<dyn BackoffAuthoringBlocksStrategy<NumberFor<Block>>>::should_backoff(
@@ -1277,8 +1246,8 @@ mod test {
 		};
 
 		// Number of blocks until we reach the max interval
-		let block_for_max_interval
-			= param.max_interval * param.authoring_bias + param.unfinalized_slack;
+		let block_for_max_interval =
+			param.max_interval * param.authoring_bias + param.unfinalized_slack;
 
 		while head_state.head_number < block_for_max_interval {
 			if should_backoff(&head_state) {
@@ -1294,15 +1263,15 @@ mod test {
 	}
 
 	// Denoting
-	//	C: unfinalized_slack
-	//	M: authoring_bias
-	//	X: max_interval
+	// 	C: unfinalized_slack
+	// 	M: authoring_bias
+	// 	X: max_interval
 	// then the number of slots to reach the max interval can be computed from
-	//	(start_slot + C) + M * sum(n, 1, X)
+	// 	(start_slot + C) + M * sum(n, 1, X)
 	// or
-	//	(start_slot + C) + M * X*(X+1)/2
+	// 	(start_slot + C) + M * X*(X+1)/2
 	fn expected_time_to_reach_max_interval(
-		param: &BackoffAuthoringOnFinalizedHeadLagging<u64>
+		param: &BackoffAuthoringOnFinalizedHeadLagging<u64>,
 	) -> (u64, u64) {
 		let c = param.unfinalized_slack;
 		let m = param.authoring_bias;
diff --git a/client/consensus/slots/src/slots.rs b/client/consensus/slots/src/slots.rs
index 1e6dadcdf5cf..d994aff1fc61 100644
--- a/client/consensus/slots/src/slots.rs
+++ b/client/consensus/slots/src/slots.rs
@@ -20,23 +20,21 @@
 //!
 //! This is used instead of `futures_timer::Interval` because it was unreliable.
 
-use super::{Slot, InherentDataProviderExt};
+use super::{InherentDataProviderExt, Slot};
 use sp_consensus::{Error, SelectChain};
-use sp_inherents::{InherentData, CreateInherentDataProviders, InherentDataProvider};
+use sp_inherents::{CreateInherentDataProviders, InherentData, InherentDataProvider};
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT};
 
-use std::time::{Duration, Instant};
 use futures_timer::Delay;
+use std::time::{Duration, Instant};
 
 /// Returns current duration since unix epoch.
 pub fn duration_now() -> Duration {
 	use std::time::SystemTime;
 	let now = SystemTime::now();
-	now.duration_since(SystemTime::UNIX_EPOCH).unwrap_or_else(|e| panic!(
-		"Current time {:?} is before unix epoch. Something is wrong: {:?}",
-		now,
-		e,
-	))
+	now.duration_since(SystemTime::UNIX_EPOCH).unwrap_or_else(|e| {
+		panic!("Current time {:?} is before unix epoch. Something is wrong: {:?}", now, e,)
+	})
 }
 
 /// Returns the duration until the next slot from now.
@@ -104,11 +102,7 @@ pub(crate) struct Slots<Block, C, IDP> {
 
 impl<Block, C, IDP> Slots<Block, C, IDP> {
 	/// Create a new `Slots` stream.
-	pub fn new(
-		slot_duration: Duration,
-		create_inherent_data_providers: IDP,
-		client: C,
-	) -> Self {
+	pub fn new(slot_duration: Duration, create_inherent_data_providers: IDP, client: C) -> Self {
 		Slots {
 			last_slot: 0.into(),
 			slot_duration,
@@ -135,7 +129,7 @@ where
 					// schedule wait.
 					let wait_dur = time_until_next_slot(self.slot_duration);
 					Some(Delay::new(wait_dur))
-				}
+				},
 				Some(d) => Some(d),
 			};
 
@@ -161,11 +155,12 @@ where
 					);
 					// Let's try at the next slot..
 					self.inner_delay.take();
-					continue;
-				}
+					continue
+				},
 			};
 
-			let inherent_data_providers = self.create_inherent_data_providers
+			let inherent_data_providers = self
+				.create_inherent_data_providers
 				.create_inherent_data_providers(chain_head.hash(), ())
 				.await?;
 
diff --git a/client/consensus/uncles/src/lib.rs b/client/consensus/uncles/src/lib.rs
index cfae0528a627..368a994cfe52 100644
--- a/client/consensus/uncles/src/lib.rs
+++ b/client/consensus/uncles/src/lib.rs
@@ -19,7 +19,7 @@
 //! Uncles functionality for Substrate.
 
 use sc_client_api::ProvideUncles;
-use sp_runtime::{traits::Block as BlockT, generic::BlockId};
+use sp_runtime::{generic::BlockId, traits::Block as BlockT};
 
 #[derive(Debug, thiserror::Error)]
 pub enum Error<B: BlockT> {
@@ -34,7 +34,8 @@ const MAX_UNCLE_GENERATIONS: u32 = 8;
 pub fn create_uncles_inherent_data_provider<B, C>(
 	client: &C,
 	parent: B::Hash,
-) -> Result<sp_authorship::InherentDataProvider<B::Header>, sc_client_api::blockchain::Error> where
+) -> Result<sp_authorship::InherentDataProvider<B::Header>, sc_client_api::blockchain::Error>
+where
 	B: BlockT,
 	C: ProvideUncles<B>,
 {
diff --git a/client/db/src/bench.rs b/client/db/src/bench.rs
index 4b34182a1c3b..c21119bd1176 100644
--- a/client/db/src/bench.rs
+++ b/client/db/src/bench.rs
@@ -18,27 +18,31 @@
 
 //! State backend that's useful for benchmarking
 
-use std::sync::Arc;
-use std::cell::{Cell, RefCell};
-use std::collections::HashMap;
+use std::{
+	cell::{Cell, RefCell},
+	collections::HashMap,
+	sync::Arc,
+};
 
-use hash_db::{Prefix, Hasher};
-use sp_trie::{MemoryDB, prefixed_key};
+use crate::storage_cache::{new_shared_cache, CachingState, SharedCache};
+use hash_db::{Hasher, Prefix};
+use kvdb::{DBTransaction, KeyValueDB};
 use sp_core::{
+	hexdisplay::HexDisplay,
 	storage::{ChildInfo, TrackedStorageKey},
-	hexdisplay::HexDisplay
 };
-use sp_runtime::traits::{Block as BlockT, HashFor};
-use sp_runtime::Storage;
+use sp_runtime::{
+	traits::{Block as BlockT, HashFor},
+	Storage,
+};
 use sp_state_machine::{
-	DBValue, backend::Backend as StateBackend, StorageCollection, ChildStorageCollection, ProofRecorder,
+	backend::Backend as StateBackend, ChildStorageCollection, DBValue, ProofRecorder,
+	StorageCollection,
 };
-use kvdb::{KeyValueDB, DBTransaction};
-use crate::storage_cache::{CachingState, SharedCache, new_shared_cache};
+use sp_trie::{prefixed_key, MemoryDB};
 
-type DbState<B> = sp_state_machine::TrieBackend<
-	Arc<dyn sp_state_machine::Storage<HashFor<B>>>, HashFor<B>
->;
+type DbState<B> =
+	sp_state_machine::TrieBackend<Arc<dyn sp_state_machine::Storage<HashFor<B>>>, HashFor<B>>;
 
 type State<B> = CachingState<DbState<B>, B>;
 
@@ -53,14 +57,17 @@ impl<Block: BlockT> sp_state_machine::Storage<HashFor<Block>> for StorageDb<Bloc
 		let prefixed_key = prefixed_key::<HashFor<Block>>(key, prefix);
 		if let Some(recorder) = &self.proof_recorder {
 			if let Some(v) = recorder.get(&key) {
-				return Ok(v.clone());
+				return Ok(v.clone())
 			}
-			let backend_value = self.db.get(0, &prefixed_key)
+			let backend_value = self
+				.db
+				.get(0, &prefixed_key)
 				.map_err(|e| format!("Database backend error: {:?}", e))?;
 			recorder.record(key.clone(), backend_value.clone());
 			Ok(backend_value)
 		} else {
-			self.db.get(0, &prefixed_key)
+			self.db
+				.get(0, &prefixed_key)
 				.map_err(|e| format!("Database backend error: {:?}", e))
 		}
 	}
@@ -91,7 +98,11 @@ pub struct BenchmarkingState<B: BlockT> {
 
 impl<B: BlockT> BenchmarkingState<B> {
 	/// Create a new instance that creates a database in a temporary dir.
-	pub fn new(genesis: Storage, _cache_size_mb: Option<usize>, record_proof: bool) -> Result<Self, String> {
+	pub fn new(
+		genesis: Storage,
+		_cache_size_mb: Option<usize>,
+		record_proof: bool,
+	) -> Result<Self, String> {
 		let mut root = B::Hash::default();
 		let mut mdb = MemoryDB::<HashFor<B>>::default();
 		sp_state_machine::TrieDBMut::<HashFor<B>>::new(&mut mdb, &mut root);
@@ -114,14 +125,17 @@ impl<B: BlockT> BenchmarkingState<B> {
 		state.add_whitelist_to_tracker();
 
 		state.reopen()?;
-		let child_delta = genesis.children_default.iter().map(|(_storage_key, child_content)| (
-			&child_content.child_info,
-			child_content.data.iter().map(|(k, v)| (k.as_ref(), Some(v.as_ref()))),
-		));
-		let (root, transaction): (B::Hash, _) = state.state.borrow_mut().as_mut().unwrap().full_storage_root(
-			genesis.top.iter().map(|(k, v)| (k.as_ref(), Some(v.as_ref()))),
-			child_delta,
-		);
+		let child_delta = genesis.children_default.iter().map(|(_storage_key, child_content)| {
+			(
+				&child_content.child_info,
+				child_content.data.iter().map(|(k, v)| (k.as_ref(), Some(v.as_ref()))),
+			)
+		});
+		let (root, transaction): (B::Hash, _) =
+			state.state.borrow_mut().as_mut().unwrap().full_storage_root(
+				genesis.top.iter().map(|(k, v)| (k.as_ref(), Some(v.as_ref()))),
+				child_delta,
+			);
 		state.genesis = transaction.clone().drain();
 		state.genesis_root = root.clone();
 		state.commit(root, transaction, Vec::new(), Vec::new())?;
@@ -143,12 +157,12 @@ impl<B: BlockT> BenchmarkingState<B> {
 		let storage_db = Arc::new(StorageDb::<B> {
 			db,
 			proof_recorder: self.proof_recorder.clone(),
-			_block: Default::default()
+			_block: Default::default(),
 		});
 		*self.state.borrow_mut() = Some(State::new(
 			DbState::<B>::new(storage_db, self.root.get()),
 			self.shared_cache.clone(),
-			None
+			None,
 		));
 		Ok(())
 	}
@@ -178,7 +192,7 @@ impl<B: BlockT> BenchmarkingState<B> {
 
 		let key_tracker = if let Some(childtrie) = childtrie {
 			child_key_tracker.entry(childtrie.to_vec()).or_insert_with(|| HashMap::new())
-	 	} else {
+		} else {
 			&mut main_key_tracker
 		};
 
@@ -193,7 +207,7 @@ impl<B: BlockT> BenchmarkingState<B> {
 				let should_log = !tracker.has_been_read();
 				tracker.add_read();
 				should_log
-			}
+			},
 		};
 
 		if should_log {
@@ -215,7 +229,7 @@ impl<B: BlockT> BenchmarkingState<B> {
 
 		let key_tracker = if let Some(childtrie) = childtrie {
 			child_key_tracker.entry(childtrie.to_vec()).or_insert_with(|| HashMap::new())
-	 	} else {
+		} else {
 			&mut main_key_tracker
 		};
 
@@ -231,7 +245,7 @@ impl<B: BlockT> BenchmarkingState<B> {
 				let should_log = !tracker.has_been_written();
 				tracker.add_write();
 				should_log
-			}
+			},
 		};
 
 		if should_log {
@@ -269,7 +283,7 @@ fn state_err() -> String {
 }
 
 impl<B: BlockT> StateBackend<HashFor<B>> for BenchmarkingState<B> {
-	type Error =  <DbState<B> as StateBackend<HashFor<B>>>::Error;
+	type Error = <DbState<B> as StateBackend<HashFor<B>>>::Error;
 	type Transaction = <DbState<B> as StateBackend<HashFor<B>>>::Transaction;
 	type TrieBackendStorage = <DbState<B> as StateBackend<HashFor<B>>>::TrieBackendStorage;
 
@@ -289,7 +303,11 @@ impl<B: BlockT> StateBackend<HashFor<B>> for BenchmarkingState<B> {
 		key: &[u8],
 	) -> Result<Option<Vec<u8>>, Self::Error> {
 		self.add_read_key(Some(child_info.storage_key()), key);
-		self.state.borrow().as_ref().ok_or_else(state_err)?.child_storage(child_info, key)
+		self.state
+			.borrow()
+			.as_ref()
+			.ok_or_else(state_err)?
+			.child_storage(child_info, key)
 	}
 
 	fn exists_storage(&self, key: &[u8]) -> Result<bool, Self::Error> {
@@ -303,7 +321,11 @@ impl<B: BlockT> StateBackend<HashFor<B>> for BenchmarkingState<B> {
 		key: &[u8],
 	) -> Result<bool, Self::Error> {
 		self.add_read_key(Some(child_info.storage_key()), key);
-		self.state.borrow().as_ref().ok_or_else(state_err)?.exists_child_storage(child_info, key)
+		self.state
+			.borrow()
+			.as_ref()
+			.ok_or_else(state_err)?
+			.exists_child_storage(child_info, key)
 	}
 
 	fn next_storage_key(&self, key: &[u8]) -> Result<Option<Vec<u8>>, Self::Error> {
@@ -317,7 +339,11 @@ impl<B: BlockT> StateBackend<HashFor<B>> for BenchmarkingState<B> {
 		key: &[u8],
 	) -> Result<Option<Vec<u8>>, Self::Error> {
 		self.add_read_key(Some(child_info.storage_key()), key);
-		self.state.borrow().as_ref().ok_or_else(state_err)?.next_child_storage_key(child_info, key)
+		self.state
+			.borrow()
+			.as_ref()
+			.ok_or_else(state_err)?
+			.next_child_storage_key(child_info, key)
 	}
 
 	fn for_keys_with_prefix<F: FnMut(&[u8])>(&self, prefix: &[u8], f: F) {
@@ -340,8 +366,13 @@ impl<B: BlockT> StateBackend<HashFor<B>> for BenchmarkingState<B> {
 		f: F,
 		allow_missing: bool,
 	) -> Result<bool, Self::Error> {
-		self.state.borrow().as_ref().ok_or_else(state_err)?
-			.apply_to_key_values_while(child_info, prefix, start_at, f, allow_missing)
+		self.state.borrow().as_ref().ok_or_else(state_err)?.apply_to_key_values_while(
+			child_info,
+			prefix,
+			start_at,
+			f,
+			allow_missing,
+		)
 	}
 
 	fn apply_to_keys_while<F: FnMut(&[u8]) -> bool>(
@@ -368,17 +399,29 @@ impl<B: BlockT> StateBackend<HashFor<B>> for BenchmarkingState<B> {
 
 	fn storage_root<'a>(
 		&self,
-		delta: impl Iterator<Item=(&'a [u8], Option<&'a [u8]>)>,
-	) -> (B::Hash, Self::Transaction) where B::Hash: Ord {
-		self.state.borrow().as_ref().map_or(Default::default(), |s| s.storage_root(delta))
+		delta: impl Iterator<Item = (&'a [u8], Option<&'a [u8]>)>,
+	) -> (B::Hash, Self::Transaction)
+	where
+		B::Hash: Ord,
+	{
+		self.state
+			.borrow()
+			.as_ref()
+			.map_or(Default::default(), |s| s.storage_root(delta))
 	}
 
 	fn child_storage_root<'a>(
 		&self,
 		child_info: &ChildInfo,
-		delta: impl Iterator<Item=(&'a [u8], Option<&'a [u8]>)>,
-	) -> (B::Hash, bool, Self::Transaction) where B::Hash: Ord {
-		self.state.borrow().as_ref().map_or(Default::default(), |s| s.child_storage_root(child_info, delta))
+		delta: impl Iterator<Item = (&'a [u8], Option<&'a [u8]>)>,
+	) -> (B::Hash, bool, Self::Transaction)
+	where
+		B::Hash: Ord,
+	{
+		self.state
+			.borrow()
+			.as_ref()
+			.map_or(Default::default(), |s| s.child_storage_root(child_info, delta))
 	}
 
 	fn pairs(&self) -> Vec<(Vec<u8>, Vec<u8>)> {
@@ -389,17 +432,16 @@ impl<B: BlockT> StateBackend<HashFor<B>> for BenchmarkingState<B> {
 		self.state.borrow().as_ref().map_or(Default::default(), |s| s.keys(prefix))
 	}
 
-	fn child_keys(
-		&self,
-		child_info: &ChildInfo,
-		prefix: &[u8],
-	) -> Vec<Vec<u8>> {
-		self.state.borrow().as_ref().map_or(Default::default(), |s| s.child_keys(child_info, prefix))
+	fn child_keys(&self, child_info: &ChildInfo, prefix: &[u8]) -> Vec<Vec<u8>> {
+		self.state
+			.borrow()
+			.as_ref()
+			.map_or(Default::default(), |s| s.child_keys(child_info, prefix))
 	}
 
-	fn as_trie_backend(&mut self)
-		-> Option<&sp_state_machine::TrieBackend<Self::TrieBackendStorage, HashFor<B>>>
-	{
+	fn as_trie_backend(
+		&mut self,
+	) -> Option<&sp_state_machine::TrieBackend<Self::TrieBackendStorage, HashFor<B>>> {
 		None
 	}
 
@@ -425,7 +467,8 @@ impl<B: BlockT> StateBackend<HashFor<B>> for BenchmarkingState<B> {
 			let mut record = self.record.take();
 			record.extend(keys);
 			self.record.set(record);
-			db.write(db_transaction).map_err(|_| String::from("Error committing transaction"))?;
+			db.write(db_transaction)
+				.map_err(|_| String::from("Error committing transaction"))?;
 			self.root.set(storage_root);
 			self.db.set(Some(db));
 
@@ -455,7 +498,8 @@ impl<B: BlockT> StateBackend<HashFor<B>> for BenchmarkingState<B> {
 					None => db_transaction.delete(0, &key),
 				}
 			}
-			db.write(db_transaction).map_err(|_| String::from("Error committing transaction"))?;
+			db.write(db_transaction)
+				.map_err(|_| String::from("Error committing transaction"))?;
 			self.db.set(Some(db));
 		}
 
@@ -519,24 +563,20 @@ impl<B: BlockT> StateBackend<HashFor<B>> for BenchmarkingState<B> {
 				let reads = tracker.reads.min(1);
 				let writes = tracker.writes.min(1);
 				if let Some(prefix_tracker) = prefix_key_tracker.get_mut(&prefix) {
-						prefix_tracker.0 += reads;
-						prefix_tracker.1 += writes;
+					prefix_tracker.0 += reads;
+					prefix_tracker.1 += writes;
 				} else {
-					prefix_key_tracker.insert(
-						prefix,
-						(
-							reads,
-							writes,
-							tracker.whitelisted,
-						),
-					);
+					prefix_key_tracker.insert(prefix, (reads, writes, tracker.whitelisted));
 				}
 			}
 		});
 
-		prefix_key_tracker.iter().map(|(key, tracker)| -> (Vec<u8>, u32, u32, bool) {
+		prefix_key_tracker
+			.iter()
+			.map(|(key, tracker)| -> (Vec<u8>, u32, u32, bool) {
 				(key.to_vec(), tracker.0, tracker.1, tracker.2)
-		}).collect::<Vec<_>>()
+			})
+			.collect::<Vec<_>>()
 	}
 
 	fn register_overlay_stats(&self, stats: &sp_state_machine::StateMachineStats) {
@@ -544,7 +584,10 @@ impl<B: BlockT> StateBackend<HashFor<B>> for BenchmarkingState<B> {
 	}
 
 	fn usage_info(&self) -> sp_state_machine::UsageInfo {
-		self.state.borrow().as_ref().map_or(sp_state_machine::UsageInfo::empty(), |s| s.usage_info())
+		self.state
+			.borrow()
+			.as_ref()
+			.map_or(sp_state_machine::UsageInfo::empty(), |s| s.usage_info())
 	}
 
 	fn proof_size(&self) -> Option<u32> {
@@ -585,8 +628,8 @@ mod test {
 
 	#[test]
 	fn read_to_main_and_child_tries() {
-		let bench_state = BenchmarkingState::<crate::tests::Block>::new(Default::default(), None, false)
-			.unwrap();
+		let bench_state =
+			BenchmarkingState::<crate::tests::Block>::new(Default::default(), None, false).unwrap();
 
 		for _ in 0..2 {
 			let child1 = sp_core::storage::ChildInfo::new_default(b"child1");
@@ -600,16 +643,14 @@ mod test {
 			bench_state.child_storage(&child1, b"bar").unwrap();
 			bench_state.child_storage(&child2, b"bar").unwrap();
 
-			bench_state.commit(
-				Default::default(),
-				Default::default(),
-				vec![
-					("foo".as_bytes().to_vec(), None)
-				],
-				vec![
-					("child1".as_bytes().to_vec(), vec![("foo".as_bytes().to_vec(), None)])
-				]
-			).unwrap();
+			bench_state
+				.commit(
+					Default::default(),
+					Default::default(),
+					vec![("foo".as_bytes().to_vec(), None)],
+					vec![("child1".as_bytes().to_vec(), vec![("foo".as_bytes().to_vec(), None)])],
+				)
+				.unwrap();
 
 			let rw_tracker = bench_state.read_write_count();
 			assert_eq!(rw_tracker.0, 6);
diff --git a/client/db/src/cache/list_cache.rs b/client/db/src/cache/list_cache.rs
index 341105b16a5b..9499ae2a89f4 100644
--- a/client/db/src/cache/list_cache.rs
+++ b/client/db/src/cache/list_cache.rs
@@ -41,18 +41,18 @@
 //! Finalized entry E1 is pruned when block B is finalized so that:
 //! EntryAt(B.number - prune_depth).points_to(E1)
 
-use std::collections::{BTreeSet, BTreeMap};
+use std::collections::{BTreeMap, BTreeSet};
 
 use log::warn;
 
 use sp_blockchain::{Error as ClientError, Result as ClientResult};
-use sp_runtime::traits::{
-	Block as BlockT, NumberFor, Zero, Bounded, CheckedSub
-};
+use sp_runtime::traits::{Block as BlockT, Bounded, CheckedSub, NumberFor, Zero};
 
-use crate::cache::{CacheItemT, ComplexBlockId, EntryType};
-use crate::cache::list_entry::{Entry, StorageEntry};
-use crate::cache::list_storage::{Storage, StorageTransaction, Metadata};
+use crate::cache::{
+	list_entry::{Entry, StorageEntry},
+	list_storage::{Metadata, Storage, StorageTransaction},
+	CacheItemT, ComplexBlockId, EntryType,
+};
 
 /// Pruning strategy.
 #[derive(Debug, Clone, Copy)]
@@ -132,8 +132,8 @@ impl<Block: BlockT, T: CacheItemT, S: Storage<Block, T>> ListCache<Block, T, S>
 		pruning_strategy: PruningStrategy<NumberFor<Block>>,
 		best_finalized_block: ComplexBlockId<Block>,
 	) -> ClientResult<Self> {
-		let (best_finalized_entry, unfinalized) = storage.read_meta()
-			.and_then(|meta| read_forks(&storage, meta))?;
+		let (best_finalized_entry, unfinalized) =
+			storage.read_meta().and_then(|meta| read_forks(&storage, meta))?;
 
 		Ok(ListCache {
 			storage,
@@ -167,7 +167,7 @@ impl<Block: BlockT, T: CacheItemT, S: Storage<Block, T>> ListCache<Block, T, S>
 			// BUT since we're not guaranteeing to provide correct values for forks
 			// behind the finalized block, check if the block is finalized first
 			if !chain::is_finalized_block(&self.storage, &at, Bounded::max_value())? {
-				return Err(ClientError::NotInFinalizedChain);
+				return Err(ClientError::NotInFinalizedChain)
 			}
 
 			self.best_finalized_entry.as_ref()
@@ -184,18 +184,21 @@ impl<Block: BlockT, T: CacheItemT, S: Storage<Block, T>> ListCache<Block, T, S>
 			match self.find_unfinalized_fork(&at)? {
 				Some(fork) => Some(&fork.head),
 				None => match self.best_finalized_entry.as_ref() {
-					Some(best_finalized_entry) if chain::is_connected_to_block(
-						&self.storage,
-						&at,
-						&best_finalized_entry.valid_from,
-					)? => Some(best_finalized_entry),
+					Some(best_finalized_entry)
+						if chain::is_connected_to_block(
+							&self.storage,
+							&at,
+							&best_finalized_entry.valid_from,
+						)? =>
+						Some(best_finalized_entry),
 					_ => None,
 				},
 			}
 		};
 
 		match head {
-			Some(head) => head.search_best_before(&self.storage, at.number)
+			Some(head) => head
+				.search_best_before(&self.storage, at.number)
 				.map(|e| e.map(|e| (e.0.valid_from, e.1, e.0.value))),
 			None => Ok(None),
 		}
@@ -213,7 +216,8 @@ impl<Block: BlockT, T: CacheItemT, S: Storage<Block, T>> ListCache<Block, T, S>
 		entry_type: EntryType,
 		operations: &mut CommitOperations<Block, T>,
 	) -> ClientResult<()> {
-		Ok(operations.append(self.do_on_block_insert(tx, parent, block, value, entry_type, operations)?))
+		Ok(operations
+			.append(self.do_on_block_insert(tx, parent, block, value, entry_type, operations)?))
 	}
 
 	/// When previously inserted block is finalized.
@@ -242,25 +246,25 @@ impl<Block: BlockT, T: CacheItemT, S: Storage<Block, T>> ListCache<Block, T, S>
 		for op in ops.operations {
 			match op {
 				CommitOperation::AppendNewBlock(index, best_block) => {
-					let mut fork = self.unfinalized.get_mut(index)
-						.expect("ListCache is a crate-private type;
+					let mut fork = self.unfinalized.get_mut(index).expect(
+						"ListCache is a crate-private type;
 							internal clients of ListCache are committing transaction while cache is locked;
-							CommitOperation holds valid references while cache is locked; qed");
+							CommitOperation holds valid references while cache is locked; qed",
+					);
 					fork.best_block = Some(best_block);
 				},
 				CommitOperation::AppendNewEntry(index, entry) => {
-					let mut fork = self.unfinalized.get_mut(index)
-						.expect("ListCache is a crate-private type;
+					let mut fork = self.unfinalized.get_mut(index).expect(
+						"ListCache is a crate-private type;
 							internal clients of ListCache are committing transaction while cache is locked;
-							CommitOperation holds valid references while cache is locked; qed");
+							CommitOperation holds valid references while cache is locked; qed",
+					);
 					fork.best_block = Some(entry.valid_from.clone());
 					fork.head = entry;
 				},
 				CommitOperation::AddNewFork(entry) => {
-					self.unfinalized.push(Fork {
-						best_block: Some(entry.valid_from.clone()),
-						head: entry,
-					});
+					self.unfinalized
+						.push(Fork { best_block: Some(entry.valid_from.clone()), head: entry });
 				},
 				CommitOperation::BlockFinalized(block, finalizing_entry, forks) => {
 					self.best_finalized_block = block;
@@ -275,7 +279,9 @@ impl<Block: BlockT, T: CacheItemT, S: Storage<Block, T>> ListCache<Block, T, S>
 					for (fork_index, updated_fork) in forks.into_iter().rev() {
 						match updated_fork {
 							Some(updated_fork) => self.unfinalized[fork_index] = updated_fork,
-							None => { self.unfinalized.remove(fork_index); },
+							None => {
+								self.unfinalized.remove(fork_index);
+							},
 						}
 					}
 				},
@@ -296,17 +302,17 @@ impl<Block: BlockT, T: CacheItemT, S: Storage<Block, T>> ListCache<Block, T, S>
 		let prev_operation = operations.operations.last();
 		debug_assert!(
 			entry_type != EntryType::Final ||
-			self.best_finalized_block.hash == parent.hash ||
-			match prev_operation {
-				Some(&CommitOperation::BlockFinalized(ref best_finalized_block, _, _))
-					=> best_finalized_block.hash == parent.hash,
-				_ => false,
-			}
+				self.best_finalized_block.hash == parent.hash ||
+				match prev_operation {
+					Some(&CommitOperation::BlockFinalized(ref best_finalized_block, _, _)) =>
+						best_finalized_block.hash == parent.hash,
+					_ => false,
+				}
 		);
 
 		// we do not store any values behind finalized
 		if block.number != Zero::zero() && self.best_finalized_block.number >= block.number {
-			return Ok(None);
+			return Ok(None)
 		}
 
 		// if the block is not final, it is possibly appended to/forking from existing unfinalized fork
@@ -316,14 +322,14 @@ impl<Block: BlockT, T: CacheItemT, S: Storage<Block, T>> ListCache<Block, T, S>
 
 			// when value hasn't changed and block isn't final, there's nothing we need to do
 			if value.is_none() {
-				return Ok(None);
+				return Ok(None)
 			}
 
 			// first: try to find fork that is known to has the best block we're appending to
 			for (index, fork) in self.unfinalized.iter().enumerate() {
 				if fork.try_append(&parent) {
 					fork_and_action = Some((index, ForkAppendResult::Append));
-					break;
+					break
 				}
 			}
 
@@ -331,11 +337,14 @@ impl<Block: BlockT, T: CacheItemT, S: Storage<Block, T>> ListCache<Block, T, S>
 			// - we're appending to the fork for the first time after restart;
 			// - we're forking existing unfinalized fork from the middle;
 			if fork_and_action.is_none() {
-				let best_finalized_entry_block = self.best_finalized_entry.as_ref().map(|f| f.valid_from.number);
+				let best_finalized_entry_block =
+					self.best_finalized_entry.as_ref().map(|f| f.valid_from.number);
 				for (index, fork) in self.unfinalized.iter().enumerate() {
-					if let Some(action) = fork.try_append_or_fork(&self.storage, &parent, best_finalized_entry_block)? {
+					if let Some(action) =
+						fork.try_append_or_fork(&self.storage, &parent, best_finalized_entry_block)?
+					{
 						fork_and_action = Some((index, action));
-						break;
+						break
 					}
 				}
 			}
@@ -350,9 +359,14 @@ impl<Block: BlockT, T: CacheItemT, S: Storage<Block, T>> ListCache<Block, T, S>
 					};
 
 					tx.insert_storage_entry(&block, &new_storage_entry);
-					let operation = CommitOperation::AppendNewEntry(index, new_storage_entry.into_entry(block));
-					tx.update_meta(self.best_finalized_entry.as_ref(), &self.unfinalized, &operation);
-					return Ok(Some(operation));
+					let operation =
+						CommitOperation::AppendNewEntry(index, new_storage_entry.into_entry(block));
+					tx.update_meta(
+						self.best_finalized_entry.as_ref(),
+						&self.unfinalized,
+						&operation,
+					);
+					return Ok(Some(operation))
 				},
 				// fork from the middle of unfinalized fork
 				Some((_, ForkAppendResult::Fork(prev_valid_from))) => {
@@ -363,9 +377,14 @@ impl<Block: BlockT, T: CacheItemT, S: Storage<Block, T>> ListCache<Block, T, S>
 					};
 
 					tx.insert_storage_entry(&block, &new_storage_entry);
-					let operation = CommitOperation::AddNewFork(new_storage_entry.into_entry(block));
-					tx.update_meta(self.best_finalized_entry.as_ref(), &self.unfinalized, &operation);
-					return Ok(Some(operation));
+					let operation =
+						CommitOperation::AddNewFork(new_storage_entry.into_entry(block));
+					tx.update_meta(
+						self.best_finalized_entry.as_ref(),
+						&self.unfinalized,
+						&operation,
+					);
+					return Ok(Some(operation))
 				},
 				None => (),
 			}
@@ -389,12 +408,17 @@ impl<Block: BlockT, T: CacheItemT, S: Storage<Block, T>> ListCache<Block, T, S>
 			return Ok(match new_storage_entry {
 				Some(new_storage_entry) => {
 					tx.insert_storage_entry(&block, &new_storage_entry);
-					let operation = CommitOperation::AddNewFork(new_storage_entry.into_entry(block));
-					tx.update_meta(self.best_finalized_entry.as_ref(), &self.unfinalized, &operation);
+					let operation =
+						CommitOperation::AddNewFork(new_storage_entry.into_entry(block));
+					tx.update_meta(
+						self.best_finalized_entry.as_ref(),
+						&self.unfinalized,
+						&operation,
+					);
 					Some(operation)
 				},
 				None => None,
-			});
+			})
 		}
 
 		// cleanup database from abandoned unfinalized forks and obsolete finalized entries
@@ -404,7 +428,11 @@ impl<Block: BlockT, T: CacheItemT, S: Storage<Block, T>> ListCache<Block, T, S>
 		match new_storage_entry {
 			Some(new_storage_entry) => {
 				tx.insert_storage_entry(&block, &new_storage_entry);
-				let operation = CommitOperation::BlockFinalized(block.clone(), Some(new_storage_entry.into_entry(block)), abandoned_forks);
+				let operation = CommitOperation::BlockFinalized(
+					block.clone(),
+					Some(new_storage_entry.into_entry(block)),
+					abandoned_forks,
+				);
 				tx.update_meta(self.best_finalized_entry.as_ref(), &self.unfinalized, &operation);
 				Ok(Some(operation))
 			},
@@ -423,16 +451,16 @@ impl<Block: BlockT, T: CacheItemT, S: Storage<Block, T>> ListCache<Block, T, S>
 		let prev_operation = operations.operations.last();
 		debug_assert!(
 			self.best_finalized_block.hash == parent.hash ||
-			match prev_operation {
-				Some(&CommitOperation::BlockFinalized(ref best_finalized_block, _, _))
-					=> best_finalized_block.hash == parent.hash,
-				_ => false,
-			}
+				match prev_operation {
+					Some(&CommitOperation::BlockFinalized(ref best_finalized_block, _, _)) =>
+						best_finalized_block.hash == parent.hash,
+					_ => false,
+				}
 		);
 
 		// there could be at most one entry that is finalizing
-		let finalizing_entry = self.storage.read_entry(&block)?
-			.map(|entry| entry.into_entry(block.clone()));
+		let finalizing_entry =
+			self.storage.read_entry(&block)?.map(|entry| entry.into_entry(block.clone()));
 
 		// cleanup database from abandoned unfinalized forks and obsolete finalized entries
 		let abandoned_forks = self.destroy_abandoned_forks(tx, &block, prev_operation);
@@ -457,12 +485,13 @@ impl<Block: BlockT, T: CacheItemT, S: Storage<Block, T>> ListCache<Block, T, S>
 		for (index, fork) in self.unfinalized.iter().enumerate() {
 			// we only need to truncate fork if its head is ancestor of truncated block
 			if fork.head.valid_from.number < reverted_block.number {
-				continue;
+				continue
 			}
 
 			// we only need to truncate fork if its head is connected to truncated block
-			if !chain::is_connected_to_block(&self.storage, reverted_block, &fork.head.valid_from)? {
-				continue;
+			if !chain::is_connected_to_block(&self.storage, reverted_block, &fork.head.valid_from)?
+			{
+				continue
 			}
 
 			let updated_fork = fork.truncate(
@@ -485,7 +514,7 @@ impl<Block: BlockT, T: CacheItemT, S: Storage<Block, T>> ListCache<Block, T, S>
 	fn prune_finalized_entries<Tx: StorageTransaction<Block, T>>(
 		&self,
 		tx: &mut Tx,
-		block: &ComplexBlockId<Block>
+		block: &ComplexBlockId<Block>,
 	) {
 		let prune_depth = match self.pruning_strategy {
 			PruningStrategy::ByDepth(prune_depth) => prune_depth,
@@ -515,18 +544,13 @@ impl<Block: BlockT, T: CacheItemT, S: Storage<Block, T>> ListCache<Block, T, S>
 			};
 
 			// truncate ancient entry
-			tx.insert_storage_entry(&ancient_block, &StorageEntry {
-				prev_valid_from: None,
-				value: current_entry.value,
-			});
+			tx.insert_storage_entry(
+				&ancient_block,
+				&StorageEntry { prev_valid_from: None, value: current_entry.value },
+			);
 
 			// destroy 'fork' ending with previous entry
-			destroy_fork(
-				first_entry_to_truncate,
-				&self.storage,
-				tx,
-				None,
-			)
+			destroy_fork(first_entry_to_truncate, &self.storage, tx, None)
 		};
 
 		if let Err(error) = do_pruning() {
@@ -543,16 +567,17 @@ impl<Block: BlockT, T: CacheItemT, S: Storage<Block, T>> ListCache<Block, T, S>
 	) -> BTreeSet<usize> {
 		// if some block has been finalized already => take it into account
 		let prev_abandoned_forks = match prev_operation {
-			Some(&CommitOperation::BlockFinalized(_, _, ref abandoned_forks)) => Some(abandoned_forks),
+			Some(&CommitOperation::BlockFinalized(_, _, ref abandoned_forks)) =>
+				Some(abandoned_forks),
 			_ => None,
 		};
 
 		let mut destroyed = prev_abandoned_forks.cloned().unwrap_or_else(|| BTreeSet::new());
-		let live_unfinalized = self.unfinalized.iter()
-			.enumerate()
-			.filter(|(idx, _)| prev_abandoned_forks
+		let live_unfinalized = self.unfinalized.iter().enumerate().filter(|(idx, _)| {
+			prev_abandoned_forks
 				.map(|prev_abandoned_forks| !prev_abandoned_forks.contains(idx))
-				.unwrap_or(true));
+				.unwrap_or(true)
+		});
 		for (index, fork) in live_unfinalized {
 			if fork.head.valid_from.number == block.number {
 				destroyed.insert(index);
@@ -574,7 +599,7 @@ impl<Block: BlockT, T: CacheItemT, S: Storage<Block, T>> ListCache<Block, T, S>
 	) -> ClientResult<Option<&Fork<Block, T>>> {
 		for unfinalized in &self.unfinalized {
 			if unfinalized.matches(&self.storage, block)? {
-				return Ok(Some(&unfinalized));
+				return Ok(Some(&unfinalized))
 			}
 		}
 
@@ -597,7 +622,8 @@ impl<Block: BlockT, T: CacheItemT> Fork<Block, T> {
 		let range = self.head.search_best_range_before(storage, block.number)?;
 		match range {
 			None => Ok(false),
-			Some((begin, end)) => chain::is_connected_to_range(storage, block, (&begin, end.as_ref())),
+			Some((begin, end)) =>
+				chain::is_connected_to_range(storage, block, (&begin, end.as_ref())),
 		}
 	}
 
@@ -628,19 +654,19 @@ impl<Block: BlockT, T: CacheItemT> Fork<Block, T> {
 
 		// check if the parent is connected to the beginning of the range
 		if !chain::is_connected_to_block(storage, parent, &begin)? {
-			return Ok(None);
+			return Ok(None)
 		}
 
 		// the block is connected to the begin-entry. If begin is the head entry
 		// => we need to append new block to the fork
 		if begin == self.head.valid_from {
-			return Ok(Some(ForkAppendResult::Append));
+			return Ok(Some(ForkAppendResult::Append))
 		}
 
 		// the parent block belongs to this fork AND it is located after last finalized entry
 		// => we need to make a new fork
 		if best_finalized_entry_block.map(|f| begin.number > f).unwrap_or(true) {
-			return Ok(Some(ForkAppendResult::Fork(begin)));
+			return Ok(Some(ForkAppendResult::Fork(begin)))
 		}
 
 		Ok(None)
@@ -653,12 +679,7 @@ impl<Block: BlockT, T: CacheItemT> Fork<Block, T> {
 		tx: &mut Tx,
 		best_finalized_block: Option<NumberFor<Block>>,
 	) -> ClientResult<()> {
-		destroy_fork(
-			self.head.valid_from.clone(),
-			storage,
-			tx,
-			best_finalized_block,
-		)
+		destroy_fork(self.head.valid_from.clone(), storage, tx, best_finalized_block)
 	}
 
 	/// Truncate fork by deleting all entries that are descendants of given block.
@@ -674,18 +695,15 @@ impl<Block: BlockT, T: CacheItemT> Fork<Block, T> {
 			// read pointer to previous entry
 			let entry = storage.require_entry(&current)?;
 
- 			// truncation stops when we have reached the ancestor of truncated block
+			// truncation stops when we have reached the ancestor of truncated block
 			if current.number < reverting_block {
 				// if we have reached finalized block => destroy fork
 				if chain::is_finalized_block(storage, &current, best_finalized_block)? {
-					return Ok(None);
+					return Ok(None)
 				}
 
 				// else fork needs to be updated
-				return Ok(Some(Fork {
-					best_block: None,
-					head: entry.into_entry(current),
-				}));
+				return Ok(Some(Fork { best_block: None, head: entry.into_entry(current) }))
 			}
 
 			tx.remove_storage_entry(&current);
@@ -707,7 +725,9 @@ impl<Block: BlockT, T: CacheItemT> Default for CommitOperations<Block, T> {
 
 // This should never be allowed for non-test code to avoid revealing its internals.
 #[cfg(test)]
-impl<Block: BlockT, T: CacheItemT> From<Vec<CommitOperation<Block, T>>> for CommitOperations<Block, T> {
+impl<Block: BlockT, T: CacheItemT> From<Vec<CommitOperation<Block, T>>>
+	for CommitOperations<Block, T>
+{
 	fn from(operations: Vec<CommitOperation<Block, T>>) -> Self {
 		CommitOperations { operations }
 	}
@@ -725,30 +745,36 @@ impl<Block: BlockT, T: CacheItemT> CommitOperations<Block, T> {
 			Some(last_operation) => last_operation,
 			None => {
 				self.operations.push(new_operation);
-				return;
+				return
 			},
 		};
 
 		// we are able (and obliged to) to merge two consequent block finalization operations
 		match last_operation {
-			CommitOperation::BlockFinalized(old_finalized_block, old_finalized_entry, old_abandoned_forks) => {
-				match new_operation {
-					CommitOperation::BlockFinalized(new_finalized_block, new_finalized_entry, new_abandoned_forks) => {
-						self.operations.push(CommitOperation::BlockFinalized(
-							new_finalized_block,
-							new_finalized_entry,
-							new_abandoned_forks,
-						));
-					},
-					_ => {
-						self.operations.push(CommitOperation::BlockFinalized(
-							old_finalized_block,
-							old_finalized_entry,
-							old_abandoned_forks,
-						));
-						self.operations.push(new_operation);
-					},
-				}
+			CommitOperation::BlockFinalized(
+				old_finalized_block,
+				old_finalized_entry,
+				old_abandoned_forks,
+			) => match new_operation {
+				CommitOperation::BlockFinalized(
+					new_finalized_block,
+					new_finalized_entry,
+					new_abandoned_forks,
+				) => {
+					self.operations.push(CommitOperation::BlockFinalized(
+						new_finalized_block,
+						new_finalized_entry,
+						new_abandoned_forks,
+					));
+				},
+				_ => {
+					self.operations.push(CommitOperation::BlockFinalized(
+						old_finalized_block,
+						old_finalized_entry,
+						old_abandoned_forks,
+					));
+					self.operations.push(new_operation);
+				},
 			},
 			_ => {
 				self.operations.push(last_operation);
@@ -759,7 +785,12 @@ impl<Block: BlockT, T: CacheItemT> CommitOperations<Block, T> {
 }
 
 /// Destroy fork by deleting all unfinalized entries.
-pub fn destroy_fork<Block: BlockT, T: CacheItemT, S: Storage<Block, T>, Tx: StorageTransaction<Block, T>>(
+pub fn destroy_fork<
+	Block: BlockT,
+	T: CacheItemT,
+	S: Storage<Block, T>,
+	Tx: StorageTransaction<Block, T>,
+>(
 	head_valid_from: ComplexBlockId<Block>,
 	storage: &S,
 	tx: &mut Tx,
@@ -770,7 +801,7 @@ pub fn destroy_fork<Block: BlockT, T: CacheItemT, S: Storage<Block, T>, Tx: Stor
 		// optionally: deletion stops when we found entry at finalized block
 		if let Some(best_finalized_block) = best_finalized_block {
 			if chain::is_finalized_block(storage, &current, best_finalized_block)? {
-				return Ok(());
+				return Ok(())
 			}
 		}
 
@@ -788,8 +819,8 @@ pub fn destroy_fork<Block: BlockT, T: CacheItemT, S: Storage<Block, T>, Tx: Stor
 
 /// Blockchain related functions.
 mod chain {
-	use sp_runtime::traits::Header as HeaderT;
 	use super::*;
+	use sp_runtime::traits::Header as HeaderT;
 
 	/// Is the block1 connected both ends of the range.
 	pub fn is_connected_to_range<Block: BlockT, T: CacheItemT, S: Storage<Block, T>>(
@@ -798,8 +829,8 @@ mod chain {
 		range: (&ComplexBlockId<Block>, Option<&ComplexBlockId<Block>>),
 	) -> ClientResult<bool> {
 		let (begin, end) = range;
-		Ok(is_connected_to_block(storage, block, begin)?
-			&& match end {
+		Ok(is_connected_to_block(storage, block, begin)? &&
+			match end {
 				Some(end) => is_connected_to_block(storage, block, end)?,
 				None => true,
 			})
@@ -812,10 +843,12 @@ mod chain {
 		block2: &ComplexBlockId<Block>,
 	) -> ClientResult<bool> {
 		let (begin, end) = if *block1 > *block2 { (block2, block1) } else { (block1, block2) };
-		let mut current = storage.read_header(&end.hash)?
+		let mut current = storage
+			.read_header(&end.hash)?
 			.ok_or_else(|| ClientError::UnknownBlock(format!("{}", end.hash)))?;
 		while *current.number() > begin.number {
-			current = storage.read_header(current.parent_hash())?
+			current = storage
+				.read_header(current.parent_hash())?
 				.ok_or_else(|| ClientError::UnknownBlock(format!("{}", current.parent_hash())))?;
 		}
 
@@ -829,11 +862,10 @@ mod chain {
 		best_finalized_block: NumberFor<Block>,
 	) -> ClientResult<bool> {
 		if block.number > best_finalized_block {
-			return Ok(false);
+			return Ok(false)
 		}
 
-		storage.read_id(block.number)
-			.map(|hash| hash.as_ref() == Some(&block.hash))
+		storage.read_id(block.number).map(|hash| hash.as_ref() == Some(&block.hash))
 	}
 }
 
@@ -843,17 +875,19 @@ fn read_forks<Block: BlockT, T: CacheItemT, S: Storage<Block, T>>(
 	meta: Metadata<Block>,
 ) -> ClientResult<(Option<Entry<Block, T>>, Vec<Fork<Block, T>>)> {
 	let finalized = match meta.finalized {
-		Some(finalized) => Some(storage.require_entry(&finalized)?
-			.into_entry(finalized)),
+		Some(finalized) => Some(storage.require_entry(&finalized)?.into_entry(finalized)),
 		None => None,
 	};
 
-	let unfinalized = meta.unfinalized.into_iter()
-		.map(|unfinalized| storage.require_entry(&unfinalized)
-			.map(|storage_entry| Fork {
+	let unfinalized = meta
+		.unfinalized
+		.into_iter()
+		.map(|unfinalized| {
+			storage.require_entry(&unfinalized).map(|storage_entry| Fork {
 				best_block: None,
 				head: storage_entry.into_entry(unfinalized),
-			}))
+			})
+		})
 		.collect::<Result<_, _>>()?;
 
 	Ok((finalized, unfinalized))
@@ -861,10 +895,10 @@ fn read_forks<Block: BlockT, T: CacheItemT, S: Storage<Block, T>>(
 
 #[cfg(test)]
 mod tests {
-	use substrate_test_runtime_client::runtime::H256;
-	use sp_runtime::testing::{Header, Block as RawBlock, ExtrinsicWrapper};
-	use crate::cache::list_storage::tests::{DummyStorage, FaultyStorage, DummyTransaction};
 	use super::*;
+	use crate::cache::list_storage::tests::{DummyStorage, DummyTransaction, FaultyStorage};
+	use sp_runtime::testing::{Block as RawBlock, ExtrinsicWrapper, Header};
+	use substrate_test_runtime_client::runtime::H256;
 
 	type Block = RawBlock<ExtrinsicWrapper<u64>>;
 
@@ -882,7 +916,11 @@ mod tests {
 
 	fn test_header(number: u64) -> Header {
 		Header {
-			parent_hash: if number == 0 { Default::default() } else { test_header(number - 1).hash() },
+			parent_hash: if number == 0 {
+				Default::default()
+			} else {
+				test_header(number - 1).hash()
+			},
 			number,
 			state_root: Default::default(),
 			extrinsics_root: Default::default(),
@@ -909,28 +947,54 @@ mod tests {
 		// when block is earlier than best finalized block AND it is not finalized
 		// --- 50 ---
 		// ----------> [100]
-		assert!(ListCache::<_, u64, _>::new(DummyStorage::new(), PruningStrategy::ByDepth(1024), test_id(100))
-			.unwrap().value_at_block(&test_id(50)).is_err());
+		assert!(ListCache::<_, u64, _>::new(
+			DummyStorage::new(),
+			PruningStrategy::ByDepth(1024),
+			test_id(100)
+		)
+		.unwrap()
+		.value_at_block(&test_id(50))
+		.is_err());
 		// when block is earlier than best finalized block AND it is finalized AND value is some
 		// [30] ---- 50 ---> [100]
-		assert_eq!(ListCache::new(
-			DummyStorage::new()
-				.with_meta(Some(test_id(100)), Vec::new())
-				.with_id(50, H256::from_low_u64_be(50))
-				.with_entry(test_id(100), StorageEntry { prev_valid_from: Some(test_id(30)), value: 100 })
-				.with_entry(test_id(30), StorageEntry { prev_valid_from: None, value: 30 }),
-			PruningStrategy::ByDepth(1024), test_id(100)
-		).unwrap().value_at_block(&test_id(50)).unwrap(), Some((test_id(30), Some(test_id(100)), 30)));
+		assert_eq!(
+			ListCache::new(
+				DummyStorage::new()
+					.with_meta(Some(test_id(100)), Vec::new())
+					.with_id(50, H256::from_low_u64_be(50))
+					.with_entry(
+						test_id(100),
+						StorageEntry { prev_valid_from: Some(test_id(30)), value: 100 }
+					)
+					.with_entry(test_id(30), StorageEntry { prev_valid_from: None, value: 30 }),
+				PruningStrategy::ByDepth(1024),
+				test_id(100)
+			)
+			.unwrap()
+			.value_at_block(&test_id(50))
+			.unwrap(),
+			Some((test_id(30), Some(test_id(100)), 30))
+		);
 		// when block is the best finalized block AND value is some
 		// ---> [100]
-		assert_eq!(ListCache::new(
-			DummyStorage::new()
-				.with_meta(Some(test_id(100)), Vec::new())
-				.with_id(100, H256::from_low_u64_be(100))
-				.with_entry(test_id(100), StorageEntry { prev_valid_from: Some(test_id(30)), value: 100 })
-				.with_entry(test_id(30), StorageEntry { prev_valid_from: None, value: 30 }),
-			PruningStrategy::ByDepth(1024), test_id(100)
-		).unwrap().value_at_block(&test_id(100)).unwrap(), Some((test_id(100), None, 100)));
+		assert_eq!(
+			ListCache::new(
+				DummyStorage::new()
+					.with_meta(Some(test_id(100)), Vec::new())
+					.with_id(100, H256::from_low_u64_be(100))
+					.with_entry(
+						test_id(100),
+						StorageEntry { prev_valid_from: Some(test_id(30)), value: 100 }
+					)
+					.with_entry(test_id(30), StorageEntry { prev_valid_from: None, value: 30 }),
+				PruningStrategy::ByDepth(1024),
+				test_id(100)
+			)
+			.unwrap()
+			.value_at_block(&test_id(100))
+			.unwrap(),
+			Some((test_id(100), None, 100))
+		);
 		// when block is parallel to the best finalized block
 		// ---- 100
 		// ---> [100]
@@ -938,81 +1002,138 @@ mod tests {
 			DummyStorage::new()
 				.with_meta(Some(test_id(100)), Vec::new())
 				.with_id(50, H256::from_low_u64_be(50))
-				.with_entry(test_id(100), StorageEntry { prev_valid_from: Some(test_id(30)), value: 100 })
+				.with_entry(
+					test_id(100),
+					StorageEntry { prev_valid_from: Some(test_id(30)), value: 100 }
+				)
 				.with_entry(test_id(30), StorageEntry { prev_valid_from: None, value: 30 }),
-			PruningStrategy::ByDepth(1024), test_id(100)
-		).unwrap().value_at_block(&ComplexBlockId::new(H256::from_low_u64_be(2), 100)).is_err());
+			PruningStrategy::ByDepth(1024),
+			test_id(100)
+		)
+		.unwrap()
+		.value_at_block(&ComplexBlockId::new(H256::from_low_u64_be(2), 100))
+		.is_err());
 
 		// when block is later than last finalized block AND there are no forks AND finalized value is Some
 		// ---> [100] --- 200
-		assert_eq!(ListCache::new(
-			DummyStorage::new()
-				.with_meta(Some(test_id(100)), Vec::new())
-				.with_id(50, H256::from_low_u64_be(50))
-				.with_entry(test_id(100), StorageEntry { prev_valid_from: Some(test_id(30)), value: 100 }),
-			PruningStrategy::ByDepth(1024), test_id(100)
-		).unwrap().value_at_block(&test_id(200)).unwrap(), Some((test_id(100), None, 100)));
+		assert_eq!(
+			ListCache::new(
+				DummyStorage::new()
+					.with_meta(Some(test_id(100)), Vec::new())
+					.with_id(50, H256::from_low_u64_be(50))
+					.with_entry(
+						test_id(100),
+						StorageEntry { prev_valid_from: Some(test_id(30)), value: 100 }
+					),
+				PruningStrategy::ByDepth(1024),
+				test_id(100)
+			)
+			.unwrap()
+			.value_at_block(&test_id(200))
+			.unwrap(),
+			Some((test_id(100), None, 100))
+		);
 
 		// when block is later than last finalized block AND there are no matching forks
 		// AND block is connected to finalized block AND finalized value is Some
 		//           --- 3
 		// ---> [2] /---------> [4]
-		assert_eq!(ListCache::new(
-			DummyStorage::new()
-				.with_meta(Some(correct_id(2)), vec![correct_id(4)])
-				.with_entry(correct_id(2), StorageEntry { prev_valid_from: None, value: 2 })
-				.with_entry(correct_id(4), StorageEntry { prev_valid_from: Some(correct_id(2)), value: 4 })
-				.with_header(test_header(2))
-				.with_header(test_header(3))
-				.with_header(test_header(4))
-				.with_header(fork_header(0, 2, 3)),
-			PruningStrategy::ByDepth(1024), test_id(2)
-		).unwrap().value_at_block(&fork_id(0, 2, 3)).unwrap(), Some((correct_id(2), None, 2)));
+		assert_eq!(
+			ListCache::new(
+				DummyStorage::new()
+					.with_meta(Some(correct_id(2)), vec![correct_id(4)])
+					.with_entry(correct_id(2), StorageEntry { prev_valid_from: None, value: 2 })
+					.with_entry(
+						correct_id(4),
+						StorageEntry { prev_valid_from: Some(correct_id(2)), value: 4 }
+					)
+					.with_header(test_header(2))
+					.with_header(test_header(3))
+					.with_header(test_header(4))
+					.with_header(fork_header(0, 2, 3)),
+				PruningStrategy::ByDepth(1024),
+				test_id(2)
+			)
+			.unwrap()
+			.value_at_block(&fork_id(0, 2, 3))
+			.unwrap(),
+			Some((correct_id(2), None, 2))
+		);
 		// when block is later than last finalized block AND there are no matching forks
 		// AND block is not connected to finalized block
 		//    ---   2  --- 3
 		// 1 /---> [2] ---------> [4]
-		assert_eq!(ListCache::new(
-			DummyStorage::new()
-				.with_meta(Some(correct_id(2)), vec![correct_id(4)])
-				.with_entry(correct_id(2), StorageEntry { prev_valid_from: None, value: 2 })
-				.with_entry(correct_id(4), StorageEntry { prev_valid_from: Some(correct_id(2)), value: 4 })
-				.with_header(test_header(1))
-				.with_header(test_header(2))
-				.with_header(test_header(3))
-				.with_header(test_header(4))
-				.with_header(fork_header(0, 1, 3))
-				.with_header(fork_header(0, 1, 2)),
-			PruningStrategy::ByDepth(1024), test_id(2)
-		).unwrap().value_at_block(&fork_id(0, 1, 3)).unwrap(), None);
+		assert_eq!(
+			ListCache::new(
+				DummyStorage::new()
+					.with_meta(Some(correct_id(2)), vec![correct_id(4)])
+					.with_entry(correct_id(2), StorageEntry { prev_valid_from: None, value: 2 })
+					.with_entry(
+						correct_id(4),
+						StorageEntry { prev_valid_from: Some(correct_id(2)), value: 4 }
+					)
+					.with_header(test_header(1))
+					.with_header(test_header(2))
+					.with_header(test_header(3))
+					.with_header(test_header(4))
+					.with_header(fork_header(0, 1, 3))
+					.with_header(fork_header(0, 1, 2)),
+				PruningStrategy::ByDepth(1024),
+				test_id(2)
+			)
+			.unwrap()
+			.value_at_block(&fork_id(0, 1, 3))
+			.unwrap(),
+			None
+		);
 
 		// when block is later than last finalized block AND it appends to unfinalized fork from the end
 		// AND unfinalized value is Some
 		// ---> [2] ---> [4] ---> 5
-		assert_eq!(ListCache::new(
-			DummyStorage::new()
-				.with_meta(Some(correct_id(2)), vec![correct_id(4)])
-				.with_entry(correct_id(2), StorageEntry { prev_valid_from: None, value: 2 })
-				.with_entry(correct_id(4), StorageEntry { prev_valid_from: Some(correct_id(2)), value: 4 })
-				.with_header(test_header(4))
-				.with_header(test_header(5)),
-			PruningStrategy::ByDepth(1024), test_id(2)
-		).unwrap().value_at_block(&correct_id(5)).unwrap(), Some((correct_id(4), None, 4)));
+		assert_eq!(
+			ListCache::new(
+				DummyStorage::new()
+					.with_meta(Some(correct_id(2)), vec![correct_id(4)])
+					.with_entry(correct_id(2), StorageEntry { prev_valid_from: None, value: 2 })
+					.with_entry(
+						correct_id(4),
+						StorageEntry { prev_valid_from: Some(correct_id(2)), value: 4 }
+					)
+					.with_header(test_header(4))
+					.with_header(test_header(5)),
+				PruningStrategy::ByDepth(1024),
+				test_id(2)
+			)
+			.unwrap()
+			.value_at_block(&correct_id(5))
+			.unwrap(),
+			Some((correct_id(4), None, 4))
+		);
 		// when block is later than last finalized block AND it does not fits unfinalized fork
 		// AND it is connected to the finalized block AND finalized value is Some
 		// ---> [2] ----------> [4]
 		//          \--- 3
-		assert_eq!(ListCache::new(
-			DummyStorage::new()
-				.with_meta(Some(correct_id(2)), vec![correct_id(4)])
-				.with_entry(correct_id(4), StorageEntry { prev_valid_from: Some(correct_id(2)), value: 4 })
-				.with_entry(correct_id(2), StorageEntry { prev_valid_from: None, value: 2 })
-				.with_header(test_header(2))
-				.with_header(test_header(3))
-				.with_header(test_header(4))
-				.with_header(fork_header(0, 2, 3)),
-			PruningStrategy::ByDepth(1024), test_id(2)
-		).unwrap().value_at_block(&fork_id(0, 2, 3)).unwrap(), Some((correct_id(2), None, 2)));
+		assert_eq!(
+			ListCache::new(
+				DummyStorage::new()
+					.with_meta(Some(correct_id(2)), vec![correct_id(4)])
+					.with_entry(
+						correct_id(4),
+						StorageEntry { prev_valid_from: Some(correct_id(2)), value: 4 }
+					)
+					.with_entry(correct_id(2), StorageEntry { prev_valid_from: None, value: 2 })
+					.with_header(test_header(2))
+					.with_header(test_header(3))
+					.with_header(test_header(4))
+					.with_header(fork_header(0, 2, 3)),
+				PruningStrategy::ByDepth(1024),
+				test_id(2)
+			)
+			.unwrap()
+			.value_at_block(&fork_id(0, 2, 3))
+			.unwrap(),
+			Some((correct_id(2), None, 2))
+		);
 	}
 
 	#[test]
@@ -1022,7 +1143,8 @@ mod tests {
 
 		// when trying to insert block < finalized number
 		let mut ops = Default::default();
-		assert!(ListCache::new(DummyStorage::new(), PruningStrategy::ByDepth(1024), test_id(100)).unwrap()
+		assert!(ListCache::new(DummyStorage::new(), PruningStrategy::ByDepth(1024), test_id(100))
+			.unwrap()
 			.do_on_block_insert(
 				&mut DummyTransaction::new(),
 				test_id(49),
@@ -1030,9 +1152,12 @@ mod tests {
 				Some(50),
 				nfin,
 				&mut ops,
-			).unwrap().is_none());
+			)
+			.unwrap()
+			.is_none());
 		// when trying to insert block @ finalized number
-		assert!(ListCache::new(DummyStorage::new(), PruningStrategy::ByDepth(1024), test_id(100)).unwrap()
+		assert!(ListCache::new(DummyStorage::new(), PruningStrategy::ByDepth(1024), test_id(100))
+			.unwrap()
 			.do_on_block_insert(
 				&mut DummyTransaction::new(),
 				test_id(99),
@@ -1040,7 +1165,9 @@ mod tests {
 				Some(100),
 				nfin,
 				&Default::default(),
-			).unwrap().is_none());
+			)
+			.unwrap()
+			.is_none());
 
 		// when trying to insert non-final block AND it appends to the best block of unfinalized fork
 		// AND new value is the same as in the fork' best block
@@ -1048,12 +1175,23 @@ mod tests {
 			DummyStorage::new()
 				.with_meta(None, vec![test_id(4)])
 				.with_entry(test_id(4), StorageEntry { prev_valid_from: None, value: 4 }),
-			PruningStrategy::ByDepth(1024), test_id(2)
-		).unwrap();
+			PruningStrategy::ByDepth(1024),
+			test_id(2),
+		)
+		.unwrap();
 		cache.unfinalized[0].best_block = Some(test_id(4));
 		let mut tx = DummyTransaction::new();
 		assert_eq!(
-			cache.do_on_block_insert(&mut tx, test_id(4), test_id(5), Some(4), nfin, &Default::default()).unwrap(),
+			cache
+				.do_on_block_insert(
+					&mut tx,
+					test_id(4),
+					test_id(5),
+					Some(4),
+					nfin,
+					&Default::default()
+				)
+				.unwrap(),
 			Some(CommitOperation::AppendNewBlock(0, test_id(5))),
 		);
 		assert!(tx.inserted_entries().is_empty());
@@ -1063,12 +1201,24 @@ mod tests {
 		// AND new value is the same as in the fork' best block
 		let mut tx = DummyTransaction::new();
 		assert_eq!(
-			cache.do_on_block_insert(&mut tx, test_id(4), test_id(5), Some(5), nfin, &Default::default()).unwrap(),
+			cache
+				.do_on_block_insert(
+					&mut tx,
+					test_id(4),
+					test_id(5),
+					Some(5),
+					nfin,
+					&Default::default()
+				)
+				.unwrap(),
 			Some(CommitOperation::AppendNewEntry(0, Entry { valid_from: test_id(5), value: 5 })),
 		);
 		assert_eq!(*tx.inserted_entries(), vec![test_id(5).hash].into_iter().collect());
 		assert!(tx.removed_entries().is_empty());
-		assert_eq!(*tx.updated_meta(), Some(Metadata { finalized: None, unfinalized: vec![test_id(5)] }));
+		assert_eq!(
+			*tx.updated_meta(),
+			Some(Metadata { finalized: None, unfinalized: vec![test_id(5)] })
+		);
 
 		// when trying to insert non-final block AND it is the first block that appends to the best block of unfinalized fork
 		// AND new value is the same as in the fork' best block
@@ -1077,18 +1227,22 @@ mod tests {
 				.with_meta(None, vec![correct_id(4)])
 				.with_entry(correct_id(4), StorageEntry { prev_valid_from: None, value: 4 })
 				.with_header(test_header(4)),
-			PruningStrategy::ByDepth(1024), test_id(2)
-		).unwrap();
+			PruningStrategy::ByDepth(1024),
+			test_id(2),
+		)
+		.unwrap();
 		let mut tx = DummyTransaction::new();
 		assert_eq!(
-			cache.do_on_block_insert(
-				&mut tx,
-				correct_id(4),
-				correct_id(5),
-				Some(4),
-				nfin,
-				&Default::default(),
-			).unwrap(),
+			cache
+				.do_on_block_insert(
+					&mut tx,
+					correct_id(4),
+					correct_id(5),
+					Some(4),
+					nfin,
+					&Default::default(),
+				)
+				.unwrap(),
 			Some(CommitOperation::AppendNewBlock(0, correct_id(5))),
 		);
 		assert!(tx.inserted_entries().is_empty());
@@ -1098,40 +1252,64 @@ mod tests {
 		// AND new value is the same as in the fork' best block
 		let mut tx = DummyTransaction::new();
 		assert_eq!(
-			cache.do_on_block_insert(
-				&mut tx,
-				correct_id(4),
-				correct_id(5),
-				Some(5),
-				nfin,
-				&Default::default(),
-			).unwrap(),
+			cache
+				.do_on_block_insert(
+					&mut tx,
+					correct_id(4),
+					correct_id(5),
+					Some(5),
+					nfin,
+					&Default::default(),
+				)
+				.unwrap(),
 			Some(CommitOperation::AppendNewEntry(0, Entry { valid_from: correct_id(5), value: 5 })),
 		);
 		assert_eq!(*tx.inserted_entries(), vec![correct_id(5).hash].into_iter().collect());
 		assert!(tx.removed_entries().is_empty());
-		assert_eq!(*tx.updated_meta(), Some(Metadata { finalized: None, unfinalized: vec![correct_id(5)] }));
+		assert_eq!(
+			*tx.updated_meta(),
+			Some(Metadata { finalized: None, unfinalized: vec![correct_id(5)] })
+		);
 
 		// when trying to insert non-final block AND it forks unfinalized fork
 		let cache = ListCache::new(
 			DummyStorage::new()
 				.with_meta(Some(correct_id(2)), vec![correct_id(4)])
-				.with_entry(correct_id(4), StorageEntry { prev_valid_from: Some(correct_id(2)), value: 4 })
+				.with_entry(
+					correct_id(4),
+					StorageEntry { prev_valid_from: Some(correct_id(2)), value: 4 },
+				)
 				.with_entry(correct_id(2), StorageEntry { prev_valid_from: None, value: 2 })
 				.with_header(test_header(2))
 				.with_header(test_header(3))
 				.with_header(test_header(4)),
-			PruningStrategy::ByDepth(1024), correct_id(2)
-		).unwrap();
+			PruningStrategy::ByDepth(1024),
+			correct_id(2),
+		)
+		.unwrap();
 		let mut tx = DummyTransaction::new();
 		assert_eq!(
-			cache.do_on_block_insert(&mut tx, correct_id(3), fork_id(0, 3, 4), Some(14), nfin, &Default::default())
+			cache
+				.do_on_block_insert(
+					&mut tx,
+					correct_id(3),
+					fork_id(0, 3, 4),
+					Some(14),
+					nfin,
+					&Default::default()
+				)
 				.unwrap(),
 			Some(CommitOperation::AddNewFork(Entry { valid_from: fork_id(0, 3, 4), value: 14 })),
 		);
 		assert_eq!(*tx.inserted_entries(), vec![fork_id(0, 3, 4).hash].into_iter().collect());
 		assert!(tx.removed_entries().is_empty());
-		assert_eq!(*tx.updated_meta(), Some(Metadata { finalized: Some(correct_id(2)), unfinalized: vec![correct_id(4), fork_id(0, 3, 4)] }));
+		assert_eq!(
+			*tx.updated_meta(),
+			Some(Metadata {
+				finalized: Some(correct_id(2)),
+				unfinalized: vec![correct_id(4), fork_id(0, 3, 4)]
+			})
+		);
 
 		// when trying to insert non-final block AND there are no unfinalized forks
 		// AND value is the same as last finalized
@@ -1139,11 +1317,21 @@ mod tests {
 			DummyStorage::new()
 				.with_meta(Some(correct_id(2)), vec![])
 				.with_entry(correct_id(2), StorageEntry { prev_valid_from: None, value: 2 }),
-			PruningStrategy::ByDepth(1024), correct_id(2)
-		).unwrap();
+			PruningStrategy::ByDepth(1024),
+			correct_id(2),
+		)
+		.unwrap();
 		let mut tx = DummyTransaction::new();
 		assert_eq!(
-			cache.do_on_block_insert(&mut tx, correct_id(2), correct_id(3), Some(2), nfin, &Default::default())
+			cache
+				.do_on_block_insert(
+					&mut tx,
+					correct_id(2),
+					correct_id(3),
+					Some(2),
+					nfin,
+					&Default::default()
+				)
 				.unwrap(),
 			None,
 		);
@@ -1156,23 +1344,46 @@ mod tests {
 			DummyStorage::new()
 				.with_meta(Some(correct_id(2)), vec![])
 				.with_entry(correct_id(2), StorageEntry { prev_valid_from: None, value: 2 }),
-			PruningStrategy::ByDepth(1024), correct_id(2)
-		).unwrap();
+			PruningStrategy::ByDepth(1024),
+			correct_id(2),
+		)
+		.unwrap();
 		let mut tx = DummyTransaction::new();
 		assert_eq!(
-			cache.do_on_block_insert(&mut tx, correct_id(2), correct_id(3), Some(3), nfin, &Default::default())
+			cache
+				.do_on_block_insert(
+					&mut tx,
+					correct_id(2),
+					correct_id(3),
+					Some(3),
+					nfin,
+					&Default::default()
+				)
 				.unwrap(),
 			Some(CommitOperation::AddNewFork(Entry { valid_from: correct_id(3), value: 3 })),
 		);
 		assert_eq!(*tx.inserted_entries(), vec![correct_id(3).hash].into_iter().collect());
 		assert!(tx.removed_entries().is_empty());
-		assert_eq!(*tx.updated_meta(), Some(Metadata { finalized: Some(correct_id(2)), unfinalized: vec![correct_id(3)] }));
+		assert_eq!(
+			*tx.updated_meta(),
+			Some(Metadata { finalized: Some(correct_id(2)), unfinalized: vec![correct_id(3)] })
+		);
 
 		// when inserting finalized entry AND there are no previous finalized entries
-		let cache = ListCache::new(DummyStorage::new(), PruningStrategy::ByDepth(1024), correct_id(2)).unwrap();
+		let cache =
+			ListCache::new(DummyStorage::new(), PruningStrategy::ByDepth(1024), correct_id(2))
+				.unwrap();
 		let mut tx = DummyTransaction::new();
 		assert_eq!(
-			cache.do_on_block_insert(&mut tx, correct_id(2), correct_id(3), Some(3), fin, &Default::default())
+			cache
+				.do_on_block_insert(
+					&mut tx,
+					correct_id(2),
+					correct_id(3),
+					Some(3),
+					fin,
+					&Default::default()
+				)
 				.unwrap(),
 			Some(CommitOperation::BlockFinalized(
 				correct_id(3),
@@ -1182,17 +1393,31 @@ mod tests {
 		);
 		assert_eq!(*tx.inserted_entries(), vec![correct_id(3).hash].into_iter().collect());
 		assert!(tx.removed_entries().is_empty());
-		assert_eq!(*tx.updated_meta(), Some(Metadata { finalized: Some(correct_id(3)), unfinalized: vec![] }));
+		assert_eq!(
+			*tx.updated_meta(),
+			Some(Metadata { finalized: Some(correct_id(3)), unfinalized: vec![] })
+		);
 		// when inserting finalized entry AND value is the same as in previous finalized
 		let cache = ListCache::new(
 			DummyStorage::new()
 				.with_meta(Some(correct_id(2)), vec![])
 				.with_entry(correct_id(2), StorageEntry { prev_valid_from: None, value: 2 }),
-			PruningStrategy::ByDepth(1024), correct_id(2)
-		).unwrap();
+			PruningStrategy::ByDepth(1024),
+			correct_id(2),
+		)
+		.unwrap();
 		let mut tx = DummyTransaction::new();
 		assert_eq!(
-			cache.do_on_block_insert(&mut tx, correct_id(2), correct_id(3), Some(2), fin, &Default::default()).unwrap(),
+			cache
+				.do_on_block_insert(
+					&mut tx,
+					correct_id(2),
+					correct_id(3),
+					Some(2),
+					fin,
+					&Default::default()
+				)
+				.unwrap(),
 			Some(CommitOperation::BlockFinalized(correct_id(3), None, Default::default())),
 		);
 		assert!(tx.inserted_entries().is_empty());
@@ -1201,7 +1426,16 @@ mod tests {
 		// when inserting finalized entry AND value differs from previous finalized
 		let mut tx = DummyTransaction::new();
 		assert_eq!(
-			cache.do_on_block_insert(&mut tx, correct_id(2), correct_id(3), Some(3), fin, &Default::default()).unwrap(),
+			cache
+				.do_on_block_insert(
+					&mut tx,
+					correct_id(2),
+					correct_id(3),
+					Some(3),
+					fin,
+					&Default::default()
+				)
+				.unwrap(),
 			Some(CommitOperation::BlockFinalized(
 				correct_id(3),
 				Some(Entry { valid_from: correct_id(3), value: 3 }),
@@ -1210,7 +1444,10 @@ mod tests {
 		);
 		assert_eq!(*tx.inserted_entries(), vec![correct_id(3).hash].into_iter().collect());
 		assert!(tx.removed_entries().is_empty());
-		assert_eq!(*tx.updated_meta(), Some(Metadata { finalized: Some(correct_id(3)), unfinalized: vec![] }));
+		assert_eq!(
+			*tx.updated_meta(),
+			Some(Metadata { finalized: Some(correct_id(3)), unfinalized: vec![] })
+		);
 
 		// inserting finalized entry removes abandoned fork EVEN if new entry is not inserted
 		let cache = ListCache::new(
@@ -1218,12 +1455,27 @@ mod tests {
 				.with_meta(Some(correct_id(2)), vec![fork_id(0, 1, 3)])
 				.with_entry(correct_id(2), StorageEntry { prev_valid_from: None, value: 2 })
 				.with_entry(fork_id(0, 1, 3), StorageEntry { prev_valid_from: None, value: 13 }),
-			PruningStrategy::ByDepth(1024), correct_id(2)
-		).unwrap();
+			PruningStrategy::ByDepth(1024),
+			correct_id(2),
+		)
+		.unwrap();
 		let mut tx = DummyTransaction::new();
 		assert_eq!(
-			cache.do_on_block_insert(&mut tx, correct_id(2), correct_id(3), Some(2), fin, &Default::default()).unwrap(),
-			Some(CommitOperation::BlockFinalized(correct_id(3), None, vec![0].into_iter().collect())),
+			cache
+				.do_on_block_insert(
+					&mut tx,
+					correct_id(2),
+					correct_id(3),
+					Some(2),
+					fin,
+					&Default::default()
+				)
+				.unwrap(),
+			Some(CommitOperation::BlockFinalized(
+				correct_id(3),
+				None,
+				vec![0].into_iter().collect()
+			)),
 		);
 	}
 
@@ -1234,12 +1486,19 @@ mod tests {
 			DummyStorage::new()
 				.with_meta(Some(correct_id(2)), vec![correct_id(5)])
 				.with_entry(correct_id(2), StorageEntry { prev_valid_from: None, value: 2 })
-				.with_entry(correct_id(5), StorageEntry { prev_valid_from: Some(correct_id(2)), value: 5 }),
-			PruningStrategy::ByDepth(1024), correct_id(2)
-		).unwrap();
+				.with_entry(
+					correct_id(5),
+					StorageEntry { prev_valid_from: Some(correct_id(2)), value: 5 },
+				),
+			PruningStrategy::ByDepth(1024),
+			correct_id(2),
+		)
+		.unwrap();
 		let mut tx = DummyTransaction::new();
 		assert_eq!(
-			cache.do_on_block_finalize(&mut tx, correct_id(2), correct_id(3), &Default::default()).unwrap(),
+			cache
+				.do_on_block_finalize(&mut tx, correct_id(2), correct_id(3), &Default::default())
+				.unwrap(),
 			Some(CommitOperation::BlockFinalized(correct_id(3), None, Default::default())),
 		);
 		assert!(tx.inserted_entries().is_empty());
@@ -1253,12 +1512,19 @@ mod tests {
 			DummyStorage::new()
 				.with_meta(Some(correct_id(2)), vec![correct_id(5)])
 				.with_entry(correct_id(2), StorageEntry { prev_valid_from: None, value: 2 })
-				.with_entry(correct_id(5), StorageEntry { prev_valid_from: Some(correct_id(2)), value: 5 }),
-			PruningStrategy::ByDepth(1024), correct_id(4)
-		).unwrap();
+				.with_entry(
+					correct_id(5),
+					StorageEntry { prev_valid_from: Some(correct_id(2)), value: 5 },
+				),
+			PruningStrategy::ByDepth(1024),
+			correct_id(4),
+		)
+		.unwrap();
 		let mut tx = DummyTransaction::new();
 		assert_eq!(
-			cache.do_on_block_finalize(&mut tx, correct_id(4), correct_id(5), &Default::default()).unwrap(),
+			cache
+				.do_on_block_finalize(&mut tx, correct_id(4), correct_id(5), &Default::default())
+				.unwrap(),
 			Some(CommitOperation::BlockFinalized(
 				correct_id(5),
 				Some(Entry { valid_from: correct_id(5), value: 5 }),
@@ -1267,19 +1533,30 @@ mod tests {
 		);
 		assert!(tx.inserted_entries().is_empty());
 		assert!(tx.removed_entries().is_empty());
-		assert_eq!(*tx.updated_meta(), Some(Metadata { finalized: Some(correct_id(5)), unfinalized: vec![] }));
+		assert_eq!(
+			*tx.updated_meta(),
+			Some(Metadata { finalized: Some(correct_id(5)), unfinalized: vec![] })
+		);
 		// finalization removes abandoned forks
 		let cache = ListCache::new(
 			DummyStorage::new()
 				.with_meta(Some(correct_id(2)), vec![fork_id(0, 1, 3)])
 				.with_entry(correct_id(2), StorageEntry { prev_valid_from: None, value: 2 })
 				.with_entry(fork_id(0, 1, 3), StorageEntry { prev_valid_from: None, value: 13 }),
-			PruningStrategy::ByDepth(1024), correct_id(2)
-		).unwrap();
+			PruningStrategy::ByDepth(1024),
+			correct_id(2),
+		)
+		.unwrap();
 		let mut tx = DummyTransaction::new();
 		assert_eq!(
-			cache.do_on_block_finalize(&mut tx, correct_id(2), correct_id(3), &Default::default()).unwrap(),
-			Some(CommitOperation::BlockFinalized(correct_id(3), None, vec![0].into_iter().collect())),
+			cache
+				.do_on_block_finalize(&mut tx, correct_id(2), correct_id(3), &Default::default())
+				.unwrap(),
+			Some(CommitOperation::BlockFinalized(
+				correct_id(3),
+				None,
+				vec![0].into_iter().collect()
+			)),
 		);
 	}
 
@@ -1289,34 +1566,50 @@ mod tests {
 			DummyStorage::new()
 				.with_meta(Some(correct_id(2)), vec![correct_id(5), correct_id(6)])
 				.with_entry(correct_id(2), StorageEntry { prev_valid_from: None, value: 2 })
-				.with_entry(correct_id(5), StorageEntry { prev_valid_from: Some(correct_id(2)), value: 5 })
-				.with_entry(correct_id(6), StorageEntry { prev_valid_from: Some(correct_id(5)), value: 6 }),
-			PruningStrategy::ByDepth(1024), correct_id(2)
-		).unwrap();
+				.with_entry(
+					correct_id(5),
+					StorageEntry { prev_valid_from: Some(correct_id(2)), value: 5 },
+				)
+				.with_entry(
+					correct_id(6),
+					StorageEntry { prev_valid_from: Some(correct_id(5)), value: 6 },
+				),
+			PruningStrategy::ByDepth(1024),
+			correct_id(2),
+		)
+		.unwrap();
 
 		// when new block is appended to unfinalized fork
 		cache.on_transaction_commit(vec![CommitOperation::AppendNewBlock(0, correct_id(6))].into());
 		assert_eq!(cache.unfinalized[0].best_block, Some(correct_id(6)));
 		// when new entry is appended to unfinalized fork
-		cache.on_transaction_commit(vec![
-			CommitOperation::AppendNewEntry(0, Entry { valid_from: correct_id(7), value: 7 }),
-		].into());
+		cache.on_transaction_commit(
+			vec![CommitOperation::AppendNewEntry(0, Entry { valid_from: correct_id(7), value: 7 })]
+				.into(),
+		);
 		assert_eq!(cache.unfinalized[0].best_block, Some(correct_id(7)));
 		assert_eq!(cache.unfinalized[0].head, Entry { valid_from: correct_id(7), value: 7 });
 		// when new fork is added
-		cache.on_transaction_commit(vec![
-			CommitOperation::AddNewFork(Entry { valid_from: correct_id(10), value: 10 }),
-		].into());
+		cache.on_transaction_commit(
+			vec![CommitOperation::AddNewFork(Entry { valid_from: correct_id(10), value: 10 })]
+				.into(),
+		);
 		assert_eq!(cache.unfinalized[2].best_block, Some(correct_id(10)));
 		assert_eq!(cache.unfinalized[2].head, Entry { valid_from: correct_id(10), value: 10 });
 		// when block is finalized + entry is finalized + unfinalized forks are deleted
-		cache.on_transaction_commit(vec![CommitOperation::BlockFinalized(
-			correct_id(20),
-			Some(Entry { valid_from: correct_id(20), value: 20 }),
-			vec![0, 1, 2].into_iter().collect(),
-		)].into());
+		cache.on_transaction_commit(
+			vec![CommitOperation::BlockFinalized(
+				correct_id(20),
+				Some(Entry { valid_from: correct_id(20), value: 20 }),
+				vec![0, 1, 2].into_iter().collect(),
+			)]
+			.into(),
+		);
 		assert_eq!(cache.best_finalized_block, correct_id(20));
-		assert_eq!(cache.best_finalized_entry, Some(Entry { valid_from: correct_id(20), value: 20 }));
+		assert_eq!(
+			cache.best_finalized_entry,
+			Some(Entry { valid_from: correct_id(20), value: 20 })
+		);
 		assert!(cache.unfinalized.is_empty());
 	}
 
@@ -1324,45 +1617,88 @@ mod tests {
 	fn list_find_unfinalized_fork_works() {
 		// ----------> [3]
 		// --- [2] ---------> 4 ---> [5]
-		assert_eq!(ListCache::new(
-			DummyStorage::new()
-				.with_meta(None, vec![fork_id(0, 1, 3), correct_id(5)])
-				.with_entry(fork_id(0, 1, 3), StorageEntry { prev_valid_from: Some(correct_id(1)), value: 13 })
-				.with_entry(correct_id(5), StorageEntry { prev_valid_from: Some(correct_id(2)), value: 5 })
-				.with_entry(correct_id(2), StorageEntry { prev_valid_from: None, value: 2 })
-				.with_header(test_header(2))
-				.with_header(test_header(3))
-				.with_header(test_header(4))
-				.with_header(test_header(5)),
-			PruningStrategy::ByDepth(1024), correct_id(0)
-		).unwrap().find_unfinalized_fork((&correct_id(4)).into()).unwrap().unwrap().head.valid_from, correct_id(5));
+		assert_eq!(
+			ListCache::new(
+				DummyStorage::new()
+					.with_meta(None, vec![fork_id(0, 1, 3), correct_id(5)])
+					.with_entry(
+						fork_id(0, 1, 3),
+						StorageEntry { prev_valid_from: Some(correct_id(1)), value: 13 }
+					)
+					.with_entry(
+						correct_id(5),
+						StorageEntry { prev_valid_from: Some(correct_id(2)), value: 5 }
+					)
+					.with_entry(correct_id(2), StorageEntry { prev_valid_from: None, value: 2 })
+					.with_header(test_header(2))
+					.with_header(test_header(3))
+					.with_header(test_header(4))
+					.with_header(test_header(5)),
+				PruningStrategy::ByDepth(1024),
+				correct_id(0)
+			)
+			.unwrap()
+			.find_unfinalized_fork((&correct_id(4)).into())
+			.unwrap()
+			.unwrap()
+			.head
+			.valid_from,
+			correct_id(5)
+		);
 		// --- [2] ---------------> [5]
 		// ----------> [3] ---> 4
-		assert_eq!(ListCache::new(
-			DummyStorage::new()
-				.with_meta(None, vec![correct_id(5), fork_id(0, 1, 3)])
-				.with_entry(fork_id(0, 1, 3), StorageEntry { prev_valid_from: Some(correct_id(1)), value: 13 })
-				.with_entry(correct_id(5), StorageEntry { prev_valid_from: Some(correct_id(2)), value: 5 })
-				.with_entry(correct_id(2), StorageEntry { prev_valid_from: Some(correct_id(1)), value: 2 })
-				.with_header(test_header(2))
-				.with_header(test_header(3))
-				.with_header(test_header(4))
-				.with_header(test_header(5))
-				.with_header(fork_header(0, 1, 2))
-				.with_header(fork_header(0, 1, 3))
-				.with_header(fork_header(0, 1, 4)),
-			PruningStrategy::ByDepth(1024), correct_id(0)
-		).unwrap()
-			.find_unfinalized_fork((&fork_id(0, 1, 4)).into()).unwrap().unwrap().head.valid_from, fork_id(0, 1, 3));
+		assert_eq!(
+			ListCache::new(
+				DummyStorage::new()
+					.with_meta(None, vec![correct_id(5), fork_id(0, 1, 3)])
+					.with_entry(
+						fork_id(0, 1, 3),
+						StorageEntry { prev_valid_from: Some(correct_id(1)), value: 13 }
+					)
+					.with_entry(
+						correct_id(5),
+						StorageEntry { prev_valid_from: Some(correct_id(2)), value: 5 }
+					)
+					.with_entry(
+						correct_id(2),
+						StorageEntry { prev_valid_from: Some(correct_id(1)), value: 2 }
+					)
+					.with_header(test_header(2))
+					.with_header(test_header(3))
+					.with_header(test_header(4))
+					.with_header(test_header(5))
+					.with_header(fork_header(0, 1, 2))
+					.with_header(fork_header(0, 1, 3))
+					.with_header(fork_header(0, 1, 4)),
+				PruningStrategy::ByDepth(1024),
+				correct_id(0)
+			)
+			.unwrap()
+			.find_unfinalized_fork((&fork_id(0, 1, 4)).into())
+			.unwrap()
+			.unwrap()
+			.head
+			.valid_from,
+			fork_id(0, 1, 3)
+		);
 		// --- [2] ---------------> [5]
 		// ----------> [3]
 		// -----------------> 4
 		assert!(ListCache::new(
 			DummyStorage::new()
 				.with_meta(None, vec![correct_id(5), fork_id(0, 1, 3)])
-				.with_entry(fork_id(0, 1, 3), StorageEntry { prev_valid_from: Some(correct_id(1)), value: 13 })
-				.with_entry(correct_id(5), StorageEntry { prev_valid_from: Some(correct_id(2)), value: 5 })
-				.with_entry(correct_id(2), StorageEntry { prev_valid_from: Some(correct_id(1)), value: 2 })
+				.with_entry(
+					fork_id(0, 1, 3),
+					StorageEntry { prev_valid_from: Some(correct_id(1)), value: 13 }
+				)
+				.with_entry(
+					correct_id(5),
+					StorageEntry { prev_valid_from: Some(correct_id(2)), value: 5 }
+				)
+				.with_entry(
+					correct_id(2),
+					StorageEntry { prev_valid_from: Some(correct_id(1)), value: 2 }
+				)
 				.with_header(test_header(2))
 				.with_header(test_header(3))
 				.with_header(test_header(4))
@@ -1372,89 +1708,167 @@ mod tests {
 				.with_header(fork_header(1, 1, 2))
 				.with_header(fork_header(1, 1, 3))
 				.with_header(fork_header(1, 1, 4)),
-			PruningStrategy::ByDepth(1024), correct_id(0)
-		).unwrap().find_unfinalized_fork((&fork_id(1, 1, 4)).into()).unwrap().is_none());
+			PruningStrategy::ByDepth(1024),
+			correct_id(0)
+		)
+		.unwrap()
+		.find_unfinalized_fork((&fork_id(1, 1, 4)).into())
+		.unwrap()
+		.is_none());
 	}
 
 	#[test]
 	fn fork_matches_works() {
 		// when block is not within list range
 		let storage = DummyStorage::new()
-			.with_entry(test_id(100), StorageEntry { prev_valid_from: Some(test_id(50)), value: 100 })
+			.with_entry(
+				test_id(100),
+				StorageEntry { prev_valid_from: Some(test_id(50)), value: 100 },
+			)
 			.with_entry(test_id(50), StorageEntry { prev_valid_from: None, value: 50 });
-		assert_eq!(Fork::<_, u64> { best_block: None, head: Entry { valid_from: test_id(100), value: 0 } }
-			.matches(&storage, (&test_id(20)).into()).unwrap(), false);
+		assert_eq!(
+			Fork::<_, u64> { best_block: None, head: Entry { valid_from: test_id(100), value: 0 } }
+				.matches(&storage, (&test_id(20)).into())
+				.unwrap(),
+			false
+		);
 		// when block is not connected to the begin block
 		let storage = DummyStorage::new()
-			.with_entry(correct_id(5), StorageEntry { prev_valid_from: Some(correct_id(3)), value: 100 })
+			.with_entry(
+				correct_id(5),
+				StorageEntry { prev_valid_from: Some(correct_id(3)), value: 100 },
+			)
 			.with_entry(correct_id(3), StorageEntry { prev_valid_from: None, value: 200 })
 			.with_header(test_header(5))
 			.with_header(test_header(4))
 			.with_header(test_header(3))
 			.with_header(fork_header(0, 2, 4))
 			.with_header(fork_header(0, 2, 3));
-		assert_eq!(Fork::<_, u64> { best_block: None, head: Entry { valid_from: correct_id(5), value: 100 } }
-			.matches(&storage, (&fork_id(0, 2, 4)).into()).unwrap(), false);
+		assert_eq!(
+			Fork::<_, u64> {
+				best_block: None,
+				head: Entry { valid_from: correct_id(5), value: 100 }
+			}
+			.matches(&storage, (&fork_id(0, 2, 4)).into())
+			.unwrap(),
+			false
+		);
 		// when block is not connected to the end block
 		let storage = DummyStorage::new()
-			.with_entry(correct_id(5), StorageEntry { prev_valid_from: Some(correct_id(3)), value: 100 })
+			.with_entry(
+				correct_id(5),
+				StorageEntry { prev_valid_from: Some(correct_id(3)), value: 100 },
+			)
 			.with_entry(correct_id(3), StorageEntry { prev_valid_from: None, value: 200 })
 			.with_header(test_header(5))
 			.with_header(test_header(4))
 			.with_header(test_header(3))
 			.with_header(fork_header(0, 3, 4));
-		assert_eq!(Fork::<_, u64> { best_block: None, head: Entry { valid_from: correct_id(5), value: 100 } }
-			.matches(&storage, (&fork_id(0, 3, 4)).into()).unwrap(), false);
+		assert_eq!(
+			Fork::<_, u64> {
+				best_block: None,
+				head: Entry { valid_from: correct_id(5), value: 100 }
+			}
+			.matches(&storage, (&fork_id(0, 3, 4)).into())
+			.unwrap(),
+			false
+		);
 		// when block is connected to the begin block AND end is open
 		let storage = DummyStorage::new()
 			.with_entry(correct_id(5), StorageEntry { prev_valid_from: None, value: 100 })
 			.with_header(test_header(5))
 			.with_header(test_header(6));
-		assert_eq!(Fork::<_, u64> { best_block: None, head: Entry { valid_from: correct_id(5), value: 100 } }
-			.matches(&storage, (&correct_id(6)).into()).unwrap(), true);
+		assert_eq!(
+			Fork::<_, u64> {
+				best_block: None,
+				head: Entry { valid_from: correct_id(5), value: 100 }
+			}
+			.matches(&storage, (&correct_id(6)).into())
+			.unwrap(),
+			true
+		);
 		// when block is connected to the begin block AND to the end block
 		let storage = DummyStorage::new()
-			.with_entry(correct_id(5), StorageEntry { prev_valid_from: Some(correct_id(3)), value: 100 })
+			.with_entry(
+				correct_id(5),
+				StorageEntry { prev_valid_from: Some(correct_id(3)), value: 100 },
+			)
 			.with_entry(correct_id(3), StorageEntry { prev_valid_from: None, value: 200 })
 			.with_header(test_header(5))
 			.with_header(test_header(4))
 			.with_header(test_header(3));
-		assert_eq!(Fork::<_, u64> { best_block: None, head: Entry { valid_from: correct_id(5), value: 100 } }
-			.matches(&storage, (&correct_id(4)).into()).unwrap(), true);
+		assert_eq!(
+			Fork::<_, u64> {
+				best_block: None,
+				head: Entry { valid_from: correct_id(5), value: 100 }
+			}
+			.matches(&storage, (&correct_id(4)).into())
+			.unwrap(),
+			true
+		);
 	}
 
 	#[test]
 	fn fork_try_append_works() {
 		// when best block is unknown
-		assert_eq!(Fork::<_, u64> { best_block: None, head: Entry { valid_from: test_id(100), value: 0 } }
-			.try_append(&test_id(100)), false);
+		assert_eq!(
+			Fork::<_, u64> { best_block: None, head: Entry { valid_from: test_id(100), value: 0 } }
+				.try_append(&test_id(100)),
+			false
+		);
 		// when best block is known but different
-		assert_eq!(Fork::<_, u64> { best_block: None, head: Entry { valid_from: test_id(100), value: 0 } }
-			.try_append(&test_id(101)), false);
+		assert_eq!(
+			Fork::<_, u64> { best_block: None, head: Entry { valid_from: test_id(100), value: 0 } }
+				.try_append(&test_id(101)),
+			false
+		);
 		// when best block is known and the same
-		assert_eq!(Fork::<_, u64> { best_block: Some(test_id(100)), head: Entry { valid_from: test_id(100), value: 0 } }
-			.try_append(&test_id(100)), true);
+		assert_eq!(
+			Fork::<_, u64> {
+				best_block: Some(test_id(100)),
+				head: Entry { valid_from: test_id(100), value: 0 }
+			}
+			.try_append(&test_id(100)),
+			true
+		);
 	}
 
 	#[test]
 	fn fork_try_append_or_fork_works() {
 		// when there's no entry before parent
 		let storage = DummyStorage::new()
-			.with_entry(test_id(100), StorageEntry { prev_valid_from: Some(test_id(50)), value: 100 })
+			.with_entry(
+				test_id(100),
+				StorageEntry { prev_valid_from: Some(test_id(50)), value: 100 },
+			)
 			.with_entry(test_id(50), StorageEntry { prev_valid_from: None, value: 50 });
-		assert_eq!(Fork::<_, u64> { best_block: None, head: Entry { valid_from: test_id(100), value: 0 } }
-			.try_append_or_fork(&storage, &test_id(30), None).unwrap(), None);
+		assert_eq!(
+			Fork::<_, u64> { best_block: None, head: Entry { valid_from: test_id(100), value: 0 } }
+				.try_append_or_fork(&storage, &test_id(30), None)
+				.unwrap(),
+			None
+		);
 		// when parent does not belong to the fork
 		let storage = DummyStorage::new()
-			.with_entry(correct_id(5), StorageEntry { prev_valid_from: Some(correct_id(3)), value: 100 })
+			.with_entry(
+				correct_id(5),
+				StorageEntry { prev_valid_from: Some(correct_id(3)), value: 100 },
+			)
 			.with_entry(correct_id(3), StorageEntry { prev_valid_from: None, value: 200 })
 			.with_header(test_header(5))
 			.with_header(test_header(4))
 			.with_header(test_header(3))
 			.with_header(fork_header(0, 2, 4))
 			.with_header(fork_header(0, 2, 3));
-		assert_eq!(Fork::<_, u64> { best_block: None, head: Entry { valid_from: correct_id(5), value: 100 } }
-			.try_append_or_fork(&storage, &fork_id(0, 2, 4), None).unwrap(), None);
+		assert_eq!(
+			Fork::<_, u64> {
+				best_block: None,
+				head: Entry { valid_from: correct_id(5), value: 100 }
+			}
+			.try_append_or_fork(&storage, &fork_id(0, 2, 4), None)
+			.unwrap(),
+			None
+		);
 		// when the entry before parent is the head entry
 		let storage = DummyStorage::new()
 			.with_entry(
@@ -1463,30 +1877,57 @@ mod tests {
 			)
 			.with_header(test_header(6))
 			.with_header(test_header(5));
-		assert_eq!(Fork::<_, u64> { best_block: None, head: Entry { valid_from: correct_id(5), value: 100 } }
-			.try_append_or_fork(&storage, &correct_id(6), None).unwrap(), Some(ForkAppendResult::Append));
+		assert_eq!(
+			Fork::<_, u64> {
+				best_block: None,
+				head: Entry { valid_from: correct_id(5), value: 100 }
+			}
+			.try_append_or_fork(&storage, &correct_id(6), None)
+			.unwrap(),
+			Some(ForkAppendResult::Append)
+		);
 		// when the parent located after last finalized entry
 		let storage = DummyStorage::new()
-			.with_entry(correct_id(6), StorageEntry { prev_valid_from: Some(correct_id(3)), value: 100 })
+			.with_entry(
+				correct_id(6),
+				StorageEntry { prev_valid_from: Some(correct_id(3)), value: 100 },
+			)
 			.with_entry(correct_id(3), StorageEntry { prev_valid_from: None, value: 200 })
 			.with_header(test_header(6))
 			.with_header(test_header(5))
 			.with_header(test_header(4))
 			.with_header(test_header(3))
 			.with_header(fork_header(0, 4, 5));
-		assert_eq!(Fork::<_, u64> { best_block: None, head: Entry { valid_from: correct_id(6), value: 100 } }
-			.try_append_or_fork(&storage, &fork_id(0, 4, 5), None).unwrap(), Some(ForkAppendResult::Fork(ComplexBlockId::new(test_header(3).hash(), 3))));
+		assert_eq!(
+			Fork::<_, u64> {
+				best_block: None,
+				head: Entry { valid_from: correct_id(6), value: 100 }
+			}
+			.try_append_or_fork(&storage, &fork_id(0, 4, 5), None)
+			.unwrap(),
+			Some(ForkAppendResult::Fork(ComplexBlockId::new(test_header(3).hash(), 3)))
+		);
 		// when the parent located before last finalized entry
 		let storage = DummyStorage::new()
-			.with_entry(correct_id(6), StorageEntry { prev_valid_from: Some(correct_id(3)), value: 100 })
+			.with_entry(
+				correct_id(6),
+				StorageEntry { prev_valid_from: Some(correct_id(3)), value: 100 },
+			)
 			.with_entry(correct_id(3), StorageEntry { prev_valid_from: None, value: 200 })
 			.with_header(test_header(6))
 			.with_header(test_header(5))
 			.with_header(test_header(4))
 			.with_header(test_header(3))
 			.with_header(fork_header(0, 4, 5));
-		assert_eq!(Fork::<_, u64> { best_block: None, head: Entry { valid_from: correct_id(6), value: 100 } }
-			.try_append_or_fork(&storage, &fork_id(0, 4, 5), Some(3)).unwrap(), None);
+		assert_eq!(
+			Fork::<_, u64> {
+				best_block: None,
+				head: Entry { valid_from: correct_id(6), value: 100 }
+			}
+			.try_append_or_fork(&storage, &fork_id(0, 4, 5), Some(3))
+			.unwrap(),
+			None
+		);
 	}
 
 	#[test]
@@ -1495,12 +1936,16 @@ mod tests {
 		let storage = DummyStorage::new().with_id(100, H256::from_low_u64_be(100));
 		let mut tx = DummyTransaction::new();
 		Fork::<_, u64> { best_block: None, head: Entry { valid_from: test_id(100), value: 0 } }
-			.destroy(&storage, &mut tx, Some(200)).unwrap();
+			.destroy(&storage, &mut tx, Some(200))
+			.unwrap();
 		assert!(tx.removed_entries().is_empty());
 		// when we reach finalized entry with iterations
 		let storage = DummyStorage::new()
 			.with_id(10, H256::from_low_u64_be(10))
-			.with_entry(test_id(100), StorageEntry { prev_valid_from: Some(test_id(50)), value: 100 })
+			.with_entry(
+				test_id(100),
+				StorageEntry { prev_valid_from: Some(test_id(50)), value: 100 },
+			)
 			.with_entry(test_id(50), StorageEntry { prev_valid_from: Some(test_id(20)), value: 50 })
 			.with_entry(test_id(20), StorageEntry { prev_valid_from: Some(test_id(10)), value: 20 })
 			.with_entry(test_id(10), StorageEntry { prev_valid_from: Some(test_id(5)), value: 10 })
@@ -1508,120 +1953,192 @@ mod tests {
 			.with_entry(test_id(3), StorageEntry { prev_valid_from: None, value: 0 });
 		let mut tx = DummyTransaction::new();
 		Fork::<_, u64> { best_block: None, head: Entry { valid_from: test_id(100), value: 0 } }
-			.destroy(&storage, &mut tx, Some(200)).unwrap();
-		assert_eq!(*tx.removed_entries(),
-			vec![test_id(100).hash, test_id(50).hash, test_id(20).hash].into_iter().collect());
+			.destroy(&storage, &mut tx, Some(200))
+			.unwrap();
+		assert_eq!(
+			*tx.removed_entries(),
+			vec![test_id(100).hash, test_id(50).hash, test_id(20).hash]
+				.into_iter()
+				.collect()
+		);
 		// when we reach beginning of fork before finalized block
 		let storage = DummyStorage::new()
 			.with_id(10, H256::from_low_u64_be(10))
-			.with_entry(test_id(100), StorageEntry { prev_valid_from: Some(test_id(50)), value: 100 })
+			.with_entry(
+				test_id(100),
+				StorageEntry { prev_valid_from: Some(test_id(50)), value: 100 },
+			)
 			.with_entry(test_id(50), StorageEntry { prev_valid_from: None, value: 50 });
 		let mut tx = DummyTransaction::new();
 		Fork::<_, u64> { best_block: None, head: Entry { valid_from: test_id(100), value: 0 } }
-			.destroy(&storage, &mut tx, Some(200)).unwrap();
-		assert_eq!(*tx.removed_entries(),
-			vec![test_id(100).hash, test_id(50).hash].into_iter().collect());
+			.destroy(&storage, &mut tx, Some(200))
+			.unwrap();
+		assert_eq!(
+			*tx.removed_entries(),
+			vec![test_id(100).hash, test_id(50).hash].into_iter().collect()
+		);
 	}
 
 	#[test]
 	fn is_connected_to_block_fails() {
 		// when storage returns error
-		assert!(
-			chain::is_connected_to_block::<_, u64, _>(
-				&FaultyStorage,
-				(&test_id(1)).into(),
-				&test_id(100),
-			).is_err(),
-		);
+		assert!(chain::is_connected_to_block::<_, u64, _>(
+			&FaultyStorage,
+			(&test_id(1)).into(),
+			&test_id(100),
+		)
+		.is_err(),);
 		// when there's no header in the storage
-		assert!(
-			chain::is_connected_to_block::<_, u64, _>(
-				&DummyStorage::new(),
-				(&test_id(1)).into(),
-				&test_id(100),
-			).is_err(),
-		);
+		assert!(chain::is_connected_to_block::<_, u64, _>(
+			&DummyStorage::new(),
+			(&test_id(1)).into(),
+			&test_id(100),
+		)
+		.is_err(),);
 	}
 
 	#[test]
 	fn is_connected_to_block_works() {
 		// when without iterations we end up with different block
-		assert_eq!(chain::is_connected_to_block::<_, u64, _>(&DummyStorage::new()
-			.with_header(test_header(1)),
-			(&test_id(1)).into(), &correct_id(1)).unwrap(), false);
+		assert_eq!(
+			chain::is_connected_to_block::<_, u64, _>(
+				&DummyStorage::new().with_header(test_header(1)),
+				(&test_id(1)).into(),
+				&correct_id(1)
+			)
+			.unwrap(),
+			false
+		);
 		// when with ASC iterations we end up with different block
-		assert_eq!(chain::is_connected_to_block::<_, u64, _>(&DummyStorage::new()
-			.with_header(test_header(0))
-			.with_header(test_header(1))
-			.with_header(test_header(2)),
-			(&test_id(0)).into(), &correct_id(2)).unwrap(), false);
+		assert_eq!(
+			chain::is_connected_to_block::<_, u64, _>(
+				&DummyStorage::new()
+					.with_header(test_header(0))
+					.with_header(test_header(1))
+					.with_header(test_header(2)),
+				(&test_id(0)).into(),
+				&correct_id(2)
+			)
+			.unwrap(),
+			false
+		);
 		// when with DESC iterations we end up with different block
-		assert_eq!(chain::is_connected_to_block::<_, u64, _>(&DummyStorage::new()
-			.with_header(test_header(0))
-			.with_header(test_header(1))
-			.with_header(test_header(2)),
-			(&correct_id(2)).into(), &test_id(0)).unwrap(), false);
+		assert_eq!(
+			chain::is_connected_to_block::<_, u64, _>(
+				&DummyStorage::new()
+					.with_header(test_header(0))
+					.with_header(test_header(1))
+					.with_header(test_header(2)),
+				(&correct_id(2)).into(),
+				&test_id(0)
+			)
+			.unwrap(),
+			false
+		);
 		// when without iterations we end up with the same block
-		assert_eq!(chain::is_connected_to_block::<_, u64, _>(&DummyStorage::new()
-			.with_header(test_header(1)),
-			(&correct_id(1)).into(), &correct_id(1)).unwrap(), true);
+		assert_eq!(
+			chain::is_connected_to_block::<_, u64, _>(
+				&DummyStorage::new().with_header(test_header(1)),
+				(&correct_id(1)).into(),
+				&correct_id(1)
+			)
+			.unwrap(),
+			true
+		);
 		// when with ASC iterations we end up with the same block
-		assert_eq!(chain::is_connected_to_block::<_, u64, _>(&DummyStorage::new()
-			.with_header(test_header(0))
-			.with_header(test_header(1))
-			.with_header(test_header(2)),
-			(&correct_id(0)).into(), &correct_id(2)).unwrap(), true);
+		assert_eq!(
+			chain::is_connected_to_block::<_, u64, _>(
+				&DummyStorage::new()
+					.with_header(test_header(0))
+					.with_header(test_header(1))
+					.with_header(test_header(2)),
+				(&correct_id(0)).into(),
+				&correct_id(2)
+			)
+			.unwrap(),
+			true
+		);
 		// when with DESC iterations we end up with the same block
-		assert_eq!(chain::is_connected_to_block::<_, u64, _>(&DummyStorage::new()
-			.with_header(test_header(0))
-			.with_header(test_header(1))
-			.with_header(test_header(2)),
-			(&correct_id(2)).into(), &correct_id(0)).unwrap(), true);
+		assert_eq!(
+			chain::is_connected_to_block::<_, u64, _>(
+				&DummyStorage::new()
+					.with_header(test_header(0))
+					.with_header(test_header(1))
+					.with_header(test_header(2)),
+				(&correct_id(2)).into(),
+				&correct_id(0)
+			)
+			.unwrap(),
+			true
+		);
 	}
 
 	#[test]
 	fn is_finalized_block_fails() {
 		// when storage returns error
 		assert!(chain::is_finalized_block::<_, u64, _>(&FaultyStorage, &test_id(1), 100).is_err());
-
 	}
 
 	#[test]
 	fn is_finalized_block_works() {
 		// when number of block is larger than last finalized block
-		assert_eq!(chain::is_finalized_block::<_, u64, _>(&DummyStorage::new(), &test_id(100), 1).unwrap(), false);
+		assert_eq!(
+			chain::is_finalized_block::<_, u64, _>(&DummyStorage::new(), &test_id(100), 1).unwrap(),
+			false
+		);
 		// when there's no hash for this block number in the database
-		assert_eq!(chain::is_finalized_block::<_, u64, _>(&DummyStorage::new(), &test_id(1), 100).unwrap(), false);
+		assert_eq!(
+			chain::is_finalized_block::<_, u64, _>(&DummyStorage::new(), &test_id(1), 100).unwrap(),
+			false
+		);
 		// when there's different hash for this block number in the database
-		assert_eq!(chain::is_finalized_block::<_, u64, _>(&DummyStorage::new()
-			.with_id(1, H256::from_low_u64_be(2)), &test_id(1), 100).unwrap(), false);
+		assert_eq!(
+			chain::is_finalized_block::<_, u64, _>(
+				&DummyStorage::new().with_id(1, H256::from_low_u64_be(2)),
+				&test_id(1),
+				100
+			)
+			.unwrap(),
+			false
+		);
 		// when there's the same hash for this block number in the database
-		assert_eq!(chain::is_finalized_block::<_, u64, _>(&DummyStorage::new()
-			.with_id(1, H256::from_low_u64_be(1)), &test_id(1), 100).unwrap(), true);
+		assert_eq!(
+			chain::is_finalized_block::<_, u64, _>(
+				&DummyStorage::new().with_id(1, H256::from_low_u64_be(1)),
+				&test_id(1),
+				100
+			)
+			.unwrap(),
+			true
+		);
 	}
 
 	#[test]
 	fn read_forks_fails() {
 		// when storage returns error during finalized entry read
-		assert!(read_forks::<Block, u64, _>(&FaultyStorage, Metadata {
-			finalized: Some(test_id(1)),
-			unfinalized: vec![],
-		}).is_err());
+		assert!(read_forks::<Block, u64, _>(
+			&FaultyStorage,
+			Metadata { finalized: Some(test_id(1)), unfinalized: vec![] }
+		)
+		.is_err());
 		// when storage returns error during unfinalized entry read
-		assert!(read_forks::<Block, u64, _>(&FaultyStorage, Metadata {
-			finalized: None,
-			unfinalized: vec![test_id(1)],
-		}).is_err());
+		assert!(read_forks::<Block, u64, _>(
+			&FaultyStorage,
+			Metadata { finalized: None, unfinalized: vec![test_id(1)] }
+		)
+		.is_err());
 		// when finalized entry is not found
-		assert!(read_forks::<Block, u64, _>(&DummyStorage::new(), Metadata {
-			finalized: Some(test_id(1)),
-			unfinalized: vec![],
-		}).is_err());
+		assert!(read_forks::<Block, u64, _>(
+			&DummyStorage::new(),
+			Metadata { finalized: Some(test_id(1)), unfinalized: vec![] }
+		)
+		.is_err());
 		// when unfinalized entry is not found
-		assert!(read_forks::<Block, u64, _>(&DummyStorage::new(), Metadata {
-			finalized: None,
-			unfinalized: vec![test_id(1)],
-		}).is_err());
+		assert!(read_forks::<Block, u64, _>(
+			&DummyStorage::new(),
+			Metadata { finalized: None, unfinalized: vec![test_id(1)] }
+		)
+		.is_err());
 	}
 
 	#[test]
@@ -1638,23 +2155,40 @@ mod tests {
 			],
 		);
 
-		assert_eq!(expected, read_forks(&storage, Metadata {
-			finalized: Some(test_id(10)),
-			unfinalized: vec![test_id(20), test_id(30)],
-		}).unwrap());
+		assert_eq!(
+			expected,
+			read_forks(
+				&storage,
+				Metadata {
+					finalized: Some(test_id(10)),
+					unfinalized: vec![test_id(20), test_id(30)],
+				}
+			)
+			.unwrap()
+		);
 	}
 
 	#[test]
 	fn ancient_entries_are_pruned_when_pruning_enabled() {
 		fn do_test(strategy: PruningStrategy<u64>) {
-			let cache = ListCache::new(DummyStorage::new()
-				.with_id(10, H256::from_low_u64_be(10))
-				.with_id(20, H256::from_low_u64_be(20))
-				.with_id(30, H256::from_low_u64_be(30))
-				.with_entry(test_id(10), StorageEntry { prev_valid_from: None, value: 10 })
-				.with_entry(test_id(20), StorageEntry { prev_valid_from: Some(test_id(10)), value: 20 })
-				.with_entry(test_id(30), StorageEntry { prev_valid_from: Some(test_id(20)), value: 30 }),
-			strategy, test_id(9)).unwrap();
+			let cache = ListCache::new(
+				DummyStorage::new()
+					.with_id(10, H256::from_low_u64_be(10))
+					.with_id(20, H256::from_low_u64_be(20))
+					.with_id(30, H256::from_low_u64_be(30))
+					.with_entry(test_id(10), StorageEntry { prev_valid_from: None, value: 10 })
+					.with_entry(
+						test_id(20),
+						StorageEntry { prev_valid_from: Some(test_id(10)), value: 20 },
+					)
+					.with_entry(
+						test_id(30),
+						StorageEntry { prev_valid_from: Some(test_id(20)), value: 30 },
+					),
+				strategy,
+				test_id(9),
+			)
+			.unwrap();
 			let mut tx = DummyTransaction::new();
 
 			// when finalizing entry #10: no entries pruned
@@ -1678,7 +2212,10 @@ mod tests {
 				},
 				PruningStrategy::ByDepth(_) => {
 					assert_eq!(*tx.removed_entries(), vec![test_id(10).hash].into_iter().collect());
-					assert_eq!(*tx.inserted_entries(), vec![test_id(20).hash].into_iter().collect());
+					assert_eq!(
+						*tx.inserted_entries(),
+						vec![test_id(20).hash].into_iter().collect()
+					);
 				},
 			}
 		}
@@ -1696,15 +2233,36 @@ mod tests {
 		//          -> (3') -> 4' -> 5'
 		let mut cache = ListCache::new(
 			DummyStorage::new()
-				.with_meta(Some(correct_id(1)), vec![correct_id(5), fork_id(1, 2, 5), fork_id(2, 4, 5)])
+				.with_meta(
+					Some(correct_id(1)),
+					vec![correct_id(5), fork_id(1, 2, 5), fork_id(2, 4, 5)],
+				)
 				.with_id(1, correct_id(1).hash)
 				.with_entry(correct_id(1), StorageEntry { prev_valid_from: None, value: 1 })
-				.with_entry(correct_id(3), StorageEntry { prev_valid_from: Some(correct_id(1)), value: 3 })
-				.with_entry(correct_id(4), StorageEntry { prev_valid_from: Some(correct_id(3)), value: 4 })
-				.with_entry(correct_id(5), StorageEntry { prev_valid_from: Some(correct_id(4)), value: 5 })
-				.with_entry(fork_id(1, 2, 4), StorageEntry { prev_valid_from: Some(correct_id(1)), value: 14 })
-				.with_entry(fork_id(1, 2, 5), StorageEntry { prev_valid_from: Some(fork_id(1, 2, 4)), value: 15 })
-				.with_entry(fork_id(2, 4, 5), StorageEntry { prev_valid_from: Some(correct_id(4)), value: 25 })
+				.with_entry(
+					correct_id(3),
+					StorageEntry { prev_valid_from: Some(correct_id(1)), value: 3 },
+				)
+				.with_entry(
+					correct_id(4),
+					StorageEntry { prev_valid_from: Some(correct_id(3)), value: 4 },
+				)
+				.with_entry(
+					correct_id(5),
+					StorageEntry { prev_valid_from: Some(correct_id(4)), value: 5 },
+				)
+				.with_entry(
+					fork_id(1, 2, 4),
+					StorageEntry { prev_valid_from: Some(correct_id(1)), value: 14 },
+				)
+				.with_entry(
+					fork_id(1, 2, 5),
+					StorageEntry { prev_valid_from: Some(fork_id(1, 2, 4)), value: 15 },
+				)
+				.with_entry(
+					fork_id(2, 4, 5),
+					StorageEntry { prev_valid_from: Some(correct_id(4)), value: 25 },
+				)
 				.with_header(test_header(1))
 				.with_header(test_header(2))
 				.with_header(test_header(3))
@@ -1714,29 +2272,40 @@ mod tests {
 				.with_header(fork_header(1, 2, 4))
 				.with_header(fork_header(1, 2, 5))
 				.with_header(fork_header(2, 4, 5)),
-			PruningStrategy::ByDepth(1024), correct_id(1)
-		).unwrap();
+			PruningStrategy::ByDepth(1024),
+			correct_id(1),
+		)
+		.unwrap();
 
 		// when 5 is reverted: entry 5 is truncated
 		let op = cache.do_on_block_revert(&mut DummyTransaction::new(), &correct_id(5)).unwrap();
-		assert_eq!(op, CommitOperation::BlockReverted(vec![
-			(0, Some(Fork { best_block: None, head: Entry { valid_from: correct_id(4), value: 4 } })),
-		].into_iter().collect()));
+		assert_eq!(
+			op,
+			CommitOperation::BlockReverted(
+				vec![(
+					0,
+					Some(Fork {
+						best_block: None,
+						head: Entry { valid_from: correct_id(4), value: 4 }
+					})
+				),]
+				.into_iter()
+				.collect()
+			)
+		);
 		cache.on_transaction_commit(vec![op].into());
 
 		// when 3 is reverted: entries 4+5' are truncated
 		let op = cache.do_on_block_revert(&mut DummyTransaction::new(), &correct_id(3)).unwrap();
-		assert_eq!(op, CommitOperation::BlockReverted(vec![
-			(0, None),
-			(2, None),
-		].into_iter().collect()));
+		assert_eq!(
+			op,
+			CommitOperation::BlockReverted(vec![(0, None), (2, None),].into_iter().collect())
+		);
 		cache.on_transaction_commit(vec![op].into());
 
 		// when 2 is reverted: entries 4'+5' are truncated
 		let op = cache.do_on_block_revert(&mut DummyTransaction::new(), &correct_id(2)).unwrap();
-		assert_eq!(op, CommitOperation::BlockReverted(vec![
-			(0, None),
-		].into_iter().collect()));
+		assert_eq!(op, CommitOperation::BlockReverted(vec![(0, None),].into_iter().collect()));
 		cache.on_transaction_commit(vec![op].into());
 	}
 
diff --git a/client/db/src/cache/list_entry.rs b/client/db/src/cache/list_entry.rs
index 94d4eb9f49b2..7cee7a514626 100644
--- a/client/db/src/cache/list_entry.rs
+++ b/client/db/src/cache/list_entry.rs
@@ -18,12 +18,11 @@
 
 //! List-cache storage entries.
 
+use codec::{Decode, Encode};
 use sp_blockchain::Result as ClientResult;
 use sp_runtime::traits::{Block as BlockT, NumberFor};
-use codec::{Encode, Decode};
 
-use crate::cache::{CacheItemT, ComplexBlockId};
-use crate::cache::list_storage::{Storage};
+use crate::cache::{list_storage::Storage, CacheItemT, ComplexBlockId};
 
 /// Single list-based cache entry.
 #[derive(Debug)]
@@ -52,10 +51,8 @@ impl<Block: BlockT, T: CacheItemT> Entry<Block, T> {
 		match value {
 			Some(value) => match self.value == value {
 				true => None,
-				false => Some(StorageEntry {
-					prev_valid_from: Some(self.valid_from.clone()),
-					value,
-				}),
+				false =>
+					Some(StorageEntry { prev_valid_from: Some(self.valid_from.clone()), value }),
 			},
 			None => None,
 		}
@@ -67,7 +64,8 @@ impl<Block: BlockT, T: CacheItemT> Entry<Block, T> {
 		storage: &S,
 		block: NumberFor<Block>,
 	) -> ClientResult<Option<(ComplexBlockId<Block>, Option<ComplexBlockId<Block>>)>> {
-		Ok(self.search_best_before(storage, block)?
+		Ok(self
+			.search_best_before(storage, block)?
 			.map(|(entry, next)| (entry.valid_from, next)))
 	}
 
@@ -86,14 +84,14 @@ impl<Block: BlockT, T: CacheItemT> Entry<Block, T> {
 		let mut current = self.valid_from.clone();
 		if block >= self.valid_from.number {
 			let value = self.value.clone();
-			return Ok(Some((Entry { valid_from: current, value }, next)));
+			return Ok(Some((Entry { valid_from: current, value }, next)))
 		}
 
 		// else - travel back in time
 		loop {
 			let entry = storage.require_entry(&current)?;
 			if block >= current.number {
-				return Ok(Some((Entry { valid_from: current, value: entry.value }, next)));
+				return Ok(Some((Entry { valid_from: current, value: entry.value }, next)))
 			}
 
 			next = Some(current);
@@ -108,18 +106,15 @@ impl<Block: BlockT, T: CacheItemT> Entry<Block, T> {
 impl<Block: BlockT, T: CacheItemT> StorageEntry<Block, T> {
 	/// Converts storage entry into an entry, valid from given block.
 	pub fn into_entry(self, valid_from: ComplexBlockId<Block>) -> Entry<Block, T> {
-		Entry {
-			valid_from,
-			value: self.value,
-		}
+		Entry { valid_from, value: self.value }
 	}
 }
 
 #[cfg(test)]
 mod tests {
-	use crate::cache::list_storage::tests::{DummyStorage, FaultyStorage};
-	use substrate_test_runtime_client::runtime::{H256, Block};
 	use super::*;
+	use crate::cache::list_storage::tests::{DummyStorage, FaultyStorage};
+	use substrate_test_runtime_client::runtime::{Block, H256};
 
 	fn test_id(number: u64) -> ComplexBlockId<Block> {
 		ComplexBlockId::new(H256::from_low_u64_be(number), number)
@@ -132,36 +127,61 @@ mod tests {
 		// when trying to update with the same Some value
 		assert_eq!(Entry { valid_from: test_id(1), value: 1 }.try_update(Some(1)), None);
 		// when trying to update with different Some value
-		assert_eq!(Entry { valid_from: test_id(1), value: 1 }.try_update(Some(2)),
-			Some(StorageEntry { prev_valid_from: Some(test_id(1)), value: 2 }));
+		assert_eq!(
+			Entry { valid_from: test_id(1), value: 1 }.try_update(Some(2)),
+			Some(StorageEntry { prev_valid_from: Some(test_id(1)), value: 2 })
+		);
 	}
 
 	#[test]
 	fn entry_search_best_before_fails() {
 		// when storage returns error
 		assert!(Entry::<_, u64> { valid_from: test_id(100), value: 42 }
-			.search_best_before(&FaultyStorage, 50).is_err());
+			.search_best_before(&FaultyStorage, 50)
+			.is_err());
 	}
 
 	#[test]
 	fn entry_search_best_before_works() {
 		// when block is better than our best block
-		assert_eq!(Entry::<_, u64> { valid_from: test_id(100), value: 100 }
-			.search_best_before(&DummyStorage::new(), 150).unwrap(),
-		Some((Entry::<_, u64> { valid_from: test_id(100), value: 100 }, None)));
+		assert_eq!(
+			Entry::<_, u64> { valid_from: test_id(100), value: 100 }
+				.search_best_before(&DummyStorage::new(), 150)
+				.unwrap(),
+			Some((Entry::<_, u64> { valid_from: test_id(100), value: 100 }, None))
+		);
 		// when block is found between two entries
-		assert_eq!(Entry::<_, u64> { valid_from: test_id(100), value: 100 }
-			.search_best_before(&DummyStorage::new()
-				.with_entry(test_id(100), StorageEntry { prev_valid_from: Some(test_id(50)), value: 100 })
-				.with_entry(test_id(50), StorageEntry { prev_valid_from: Some(test_id(30)), value: 50 }),
-			75).unwrap(),
-		Some((Entry::<_, u64> { valid_from: test_id(50), value: 50 }, Some(test_id(100)))));
+		assert_eq!(
+			Entry::<_, u64> { valid_from: test_id(100), value: 100 }
+				.search_best_before(
+					&DummyStorage::new()
+						.with_entry(
+							test_id(100),
+							StorageEntry { prev_valid_from: Some(test_id(50)), value: 100 }
+						)
+						.with_entry(
+							test_id(50),
+							StorageEntry { prev_valid_from: Some(test_id(30)), value: 50 }
+						),
+					75
+				)
+				.unwrap(),
+			Some((Entry::<_, u64> { valid_from: test_id(50), value: 50 }, Some(test_id(100))))
+		);
 		// when block is not found
-		assert_eq!(Entry::<_, u64> { valid_from: test_id(100), value: 100 }
-			.search_best_before(&DummyStorage::new()
-				.with_entry(test_id(100), StorageEntry { prev_valid_from: Some(test_id(50)), value: 100 })
-				.with_entry(test_id(50), StorageEntry { prev_valid_from: None, value: 50 }),
-			30).unwrap(),
-		None);
+		assert_eq!(
+			Entry::<_, u64> { valid_from: test_id(100), value: 100 }
+				.search_best_before(
+					&DummyStorage::new()
+						.with_entry(
+							test_id(100),
+							StorageEntry { prev_valid_from: Some(test_id(50)), value: 100 }
+						)
+						.with_entry(test_id(50), StorageEntry { prev_valid_from: None, value: 50 }),
+					30
+				)
+				.unwrap(),
+			None
+		);
 	}
 }
diff --git a/client/db/src/cache/list_storage.rs b/client/db/src/cache/list_storage.rs
index e4b3677b4ab3..bb47b8dab5a7 100644
--- a/client/db/src/cache/list_storage.rs
+++ b/client/db/src/cache/list_storage.rs
@@ -20,17 +20,23 @@
 
 use std::sync::Arc;
 
+use crate::utils::{self, meta_keys};
+use codec::{Decode, Encode};
 use sp_blockchain::{Error as ClientError, Result as ClientResult};
-use codec::{Encode, Decode};
-use sp_runtime::generic::BlockId;
-use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor};
 use sp_database::{Database, Transaction};
-use crate::utils::{self, meta_keys};
-
-use crate::cache::{CacheItemT, ComplexBlockId};
-use crate::cache::list_cache::{CommitOperation, Fork};
-use crate::cache::list_entry::{Entry, StorageEntry};
-use crate::DbHash;
+use sp_runtime::{
+	generic::BlockId,
+	traits::{Block as BlockT, Header as HeaderT, NumberFor},
+};
+
+use crate::{
+	cache::{
+		list_cache::{CommitOperation, Fork},
+		list_entry::{Entry, StorageEntry},
+		CacheItemT, ComplexBlockId,
+	},
+	DbHash,
+};
 
 /// Single list-cache metadata.
 #[derive(Debug)]
@@ -54,14 +60,21 @@ pub trait Storage<Block: BlockT, T: CacheItemT> {
 	fn read_meta(&self) -> ClientResult<Metadata<Block>>;
 
 	/// Reads cache entry from the storage.
-	fn read_entry(&self, at: &ComplexBlockId<Block>) -> ClientResult<Option<StorageEntry<Block, T>>>;
+	fn read_entry(
+		&self,
+		at: &ComplexBlockId<Block>,
+	) -> ClientResult<Option<StorageEntry<Block, T>>>;
 
 	/// Reads referenced (and thus existing) cache entry from the storage.
 	fn require_entry(&self, at: &ComplexBlockId<Block>) -> ClientResult<StorageEntry<Block, T>> {
-		self.read_entry(at)
-			.and_then(|entry| entry
-				.ok_or_else(|| ClientError::from(
-					ClientError::Backend(format!("Referenced cache entry at {:?} is not found", at)))))
+		self.read_entry(at).and_then(|entry| {
+			entry.ok_or_else(|| {
+				ClientError::from(ClientError::Backend(format!(
+					"Referenced cache entry at {:?} is not found",
+					at
+				)))
+			})
+		})
 	}
 }
 
@@ -111,10 +124,14 @@ impl DbStorage {
 	}
 
 	/// Get reference to the database.
-	pub fn db(&self) -> &Arc<dyn Database<DbHash>> { &self.db }
+	pub fn db(&self) -> &Arc<dyn Database<DbHash>> {
+		&self.db
+	}
 
 	/// Get reference to the database columns.
-	pub fn columns(&self) -> &DbColumns { &self.columns }
+	pub fn columns(&self) -> &DbColumns {
+		&self.columns
+	}
 
 	/// Encode block id for storing as a key in cache column.
 	/// We append prefix to the actual encoding to allow several caches
@@ -128,25 +145,35 @@ impl DbStorage {
 
 impl<Block: BlockT, T: CacheItemT> Storage<Block, T> for DbStorage {
 	fn read_id(&self, at: NumberFor<Block>) -> ClientResult<Option<Block::Hash>> {
-		utils::read_header::<Block>(&*self.db, self.columns.key_lookup, self.columns.header, BlockId::Number(at))
-			.map(|maybe_header| maybe_header.map(|header| header.hash()))
+		utils::read_header::<Block>(
+			&*self.db,
+			self.columns.key_lookup,
+			self.columns.header,
+			BlockId::Number(at),
+		)
+		.map(|maybe_header| maybe_header.map(|header| header.hash()))
 	}
 
 	fn read_header(&self, at: &Block::Hash) -> ClientResult<Option<Block::Header>> {
-		utils::read_header::<Block>(&*self.db, self.columns.key_lookup, self.columns.header, BlockId::Hash(*at))
+		utils::read_header::<Block>(
+			&*self.db,
+			self.columns.key_lookup,
+			self.columns.header,
+			BlockId::Hash(*at),
+		)
 	}
 
 	fn read_meta(&self) -> ClientResult<Metadata<Block>> {
 		match self.db.get(self.columns.meta, &self.meta_key) {
 			Some(meta) => meta::decode(&*meta),
-			None => Ok(Metadata {
-				finalized: None,
-				unfinalized: Vec::new(),
-			})
+			None => Ok(Metadata { finalized: None, unfinalized: Vec::new() }),
 		}
 	}
 
-	fn read_entry(&self, at: &ComplexBlockId<Block>) -> ClientResult<Option<StorageEntry<Block, T>>> {
+	fn read_entry(
+		&self,
+		at: &ComplexBlockId<Block>,
+	) -> ClientResult<Option<StorageEntry<Block, T>>> {
 		match self.db.get(self.columns.cache, &self.encode_block_id(at)) {
 			Some(entry) => StorageEntry::<Block, T>::decode(&mut &entry[..])
 				.map_err(|_| ClientError::Backend("Failed to decode cache entry".into()))
@@ -171,7 +198,11 @@ impl<'a> DbStorageTransaction<'a> {
 
 impl<'a, Block: BlockT, T: CacheItemT> StorageTransaction<Block, T> for DbStorageTransaction<'a> {
 	fn insert_storage_entry(&mut self, at: &ComplexBlockId<Block>, entry: &StorageEntry<Block, T>) {
-		self.tx.set_from_vec(self.storage.columns.cache, &self.storage.encode_block_id(at), entry.encode());
+		self.tx.set_from_vec(
+			self.storage.columns.cache,
+			&self.storage.encode_block_id(at),
+			entry.encode(),
+		);
 	}
 
 	fn remove_storage_entry(&mut self, at: &ComplexBlockId<Block>) {
@@ -187,7 +218,8 @@ impl<'a, Block: BlockT, T: CacheItemT> StorageTransaction<Block, T> for DbStorag
 		self.tx.set_from_vec(
 			self.storage.columns.meta,
 			&self.storage.meta_key,
-			meta::encode(best_finalized_entry, unfinalized, operation));
+			meta::encode(best_finalized_entry, unfinalized, operation),
+		);
 	}
 }
 
@@ -206,10 +238,11 @@ mod meta {
 	pub fn encode<Block: BlockT, T: CacheItemT>(
 		best_finalized_entry: Option<&Entry<Block, T>>,
 		unfinalized: &[Fork<Block, T>],
-		op: &CommitOperation<Block, T>
+		op: &CommitOperation<Block, T>,
 	) -> Vec<u8> {
 		let mut finalized = best_finalized_entry.as_ref().map(|entry| &entry.valid_from);
-		let mut unfinalized = unfinalized.iter().map(|fork| &fork.head().valid_from).collect::<Vec<_>>();
+		let mut unfinalized =
+			unfinalized.iter().map(|fork| &fork.head().valid_from).collect::<Vec<_>>();
 
 		match op {
 			CommitOperation::AppendNewBlock(_, _) => (),
@@ -230,8 +263,11 @@ mod meta {
 			CommitOperation::BlockReverted(ref forks) => {
 				for (fork_index, updated_fork) in forks.iter().rev() {
 					match updated_fork {
-						Some(updated_fork) => unfinalized[*fork_index] = &updated_fork.head().valid_from,
-						None => { unfinalized.remove(*fork_index); },
+						Some(updated_fork) =>
+							unfinalized[*fork_index] = &updated_fork.head().valid_from,
+						None => {
+							unfinalized.remove(*fork_index);
+						},
 					}
 				}
 			},
@@ -243,10 +279,12 @@ mod meta {
 	/// Decode meta information.
 	pub fn decode<Block: BlockT>(encoded: &[u8]) -> ClientResult<Metadata<Block>> {
 		let input = &mut &*encoded;
-		let finalized: Option<ComplexBlockId<Block>> = Decode::decode(input)
-			.map_err(|_| ClientError::from(ClientError::Backend("Error decoding cache meta".into())))?;
-		let unfinalized: Vec<ComplexBlockId<Block>> = Decode::decode(input)
-			.map_err(|_| ClientError::from(ClientError::Backend("Error decoding cache meta".into())))?;
+		let finalized: Option<ComplexBlockId<Block>> = Decode::decode(input).map_err(|_| {
+			ClientError::from(ClientError::Backend("Error decoding cache meta".into()))
+		})?;
+		let unfinalized: Vec<ComplexBlockId<Block>> = Decode::decode(input).map_err(|_| {
+			ClientError::from(ClientError::Backend("Error decoding cache meta".into()))
+		})?;
 
 		Ok(Metadata { finalized, unfinalized })
 	}
@@ -254,8 +292,8 @@ mod meta {
 
 #[cfg(test)]
 pub mod tests {
-	use std::collections::{HashMap, HashSet};
 	use super::*;
+	use std::collections::{HashMap, HashSet};
 
 	pub struct FaultyStorage;
 
@@ -272,7 +310,10 @@ pub mod tests {
 			Err(ClientError::Backend("TestError".into()))
 		}
 
-		fn read_entry(&self, _at: &ComplexBlockId<Block>) -> ClientResult<Option<StorageEntry<Block, T>>> {
+		fn read_entry(
+			&self,
+			_at: &ComplexBlockId<Block>,
+		) -> ClientResult<Option<StorageEntry<Block, T>>> {
 			Err(ClientError::Backend("TestError".into()))
 		}
 	}
@@ -287,17 +328,18 @@ pub mod tests {
 	impl<Block: BlockT, T: CacheItemT> DummyStorage<Block, T> {
 		pub fn new() -> Self {
 			DummyStorage {
-				meta: Metadata {
-					finalized: None,
-					unfinalized: Vec::new(),
-				},
+				meta: Metadata { finalized: None, unfinalized: Vec::new() },
 				ids: HashMap::new(),
 				headers: HashMap::new(),
 				entries: HashMap::new(),
 			}
 		}
 
-		pub fn with_meta(mut self, finalized: Option<ComplexBlockId<Block>>, unfinalized: Vec<ComplexBlockId<Block>>) -> Self {
+		pub fn with_meta(
+			mut self,
+			finalized: Option<ComplexBlockId<Block>>,
+			unfinalized: Vec<ComplexBlockId<Block>>,
+		) -> Self {
 			self.meta.finalized = finalized;
 			self.meta.unfinalized = unfinalized;
 			self
@@ -313,7 +355,11 @@ pub mod tests {
 			self
 		}
 
-		pub fn with_entry(mut self, at: ComplexBlockId<Block>, entry: StorageEntry<Block, T>) -> Self {
+		pub fn with_entry(
+			mut self,
+			at: ComplexBlockId<Block>,
+			entry: StorageEntry<Block, T>,
+		) -> Self {
 			self.entries.insert(at.hash, entry);
 			self
 		}
@@ -332,7 +378,10 @@ pub mod tests {
 			Ok(self.meta.clone())
 		}
 
-		fn read_entry(&self, at: &ComplexBlockId<Block>) -> ClientResult<Option<StorageEntry<Block, T>>> {
+		fn read_entry(
+			&self,
+			at: &ComplexBlockId<Block>,
+		) -> ClientResult<Option<StorageEntry<Block, T>>> {
 			Ok(self.entries.get(&at.hash).cloned())
 		}
 	}
@@ -366,7 +415,11 @@ pub mod tests {
 	}
 
 	impl<Block: BlockT, T: CacheItemT> StorageTransaction<Block, T> for DummyTransaction<Block> {
-		fn insert_storage_entry(&mut self, at: &ComplexBlockId<Block>, _entry: &StorageEntry<Block, T>) {
+		fn insert_storage_entry(
+			&mut self,
+			at: &ComplexBlockId<Block>,
+			_entry: &StorageEntry<Block, T>,
+		) {
 			self.inserted_entries.insert(at.hash);
 		}
 
@@ -380,7 +433,9 @@ pub mod tests {
 			unfinalized: &[Fork<Block, T>],
 			operation: &CommitOperation<Block, T>,
 		) {
-			self.updated_meta = Some(meta::decode(&meta::encode(best_finalized_entry, unfinalized, operation)).unwrap());
+			self.updated_meta = Some(
+				meta::decode(&meta::encode(best_finalized_entry, unfinalized, operation)).unwrap(),
+			);
 		}
 	}
 }
diff --git a/client/db/src/cache/mod.rs b/client/db/src/cache/mod.rs
index 005d25b90f93..5502896aced2 100644
--- a/client/db/src/cache/mod.rs
+++ b/client/db/src/cache/mod.rs
@@ -18,17 +18,27 @@
 
 //! DB-backed cache of blockchain data.
 
-use std::{sync::Arc, collections::{HashMap, hash_map::Entry}};
 use parking_lot::RwLock;
-
-use sc_client_api::blockchain::{well_known_cache_keys::{self, Id as CacheKeyId}, Cache as BlockchainCache};
-use sp_blockchain::{Result as ClientResult, HeaderMetadataCache};
+use std::{
+	collections::{hash_map::Entry, HashMap},
+	sync::Arc,
+};
+
+use crate::{
+	utils::{self, COLUMN_META},
+	DbHash,
+};
+use codec::{Decode, Encode};
+use sc_client_api::blockchain::{
+	well_known_cache_keys::{self, Id as CacheKeyId},
+	Cache as BlockchainCache,
+};
+use sp_blockchain::{HeaderMetadataCache, Result as ClientResult};
 use sp_database::{Database, Transaction};
-use codec::{Encode, Decode};
-use sp_runtime::generic::BlockId;
-use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor, Zero};
-use crate::utils::{self, COLUMN_META};
-use crate::DbHash;
+use sp_runtime::{
+	generic::BlockId,
+	traits::{Block as BlockT, Header as HeaderT, NumberFor, Zero},
+};
 
 use self::list_cache::{ListCache, PruningStrategy};
 
@@ -118,7 +128,10 @@ impl<Block: BlockT> DbCache<Block> {
 	}
 
 	/// Begin cache transaction.
-	pub fn transaction<'a>(&'a mut self, tx: &'a mut Transaction<DbHash>) -> DbCacheTransaction<'a, Block> {
+	pub fn transaction<'a>(
+		&'a mut self,
+		tx: &'a mut Transaction<DbHash>,
+	) -> DbCacheTransaction<'a, Block> {
 		DbCacheTransaction {
 			cache: self,
 			tx,
@@ -164,7 +177,7 @@ impl<Block: BlockT> DbCache<Block> {
 			self.key_lookup_column,
 			self.header_column,
 			self.cache_column,
-			&self.best_finalized_block
+			&self.best_finalized_block,
 		)
 	}
 }
@@ -184,19 +197,16 @@ fn get_cache_helper<'a, Block: BlockT>(
 		Entry::Occupied(entry) => Ok(entry.into_mut()),
 		Entry::Vacant(entry) => {
 			let cache = ListCache::new(
-				self::list_storage::DbStorage::new(name.to_vec(), db.clone(),
-					self::list_storage::DbColumns {
-						meta: COLUMN_META,
-						key_lookup,
-						header,
-						cache,
-					},
+				self::list_storage::DbStorage::new(
+					name.to_vec(),
+					db.clone(),
+					self::list_storage::DbColumns { meta: COLUMN_META, key_lookup, header, cache },
 				),
 				cache_pruning_strategy(name),
 				best_finalized_block.clone(),
 			)?;
 			Ok(entry.insert(cache))
-		}
+		},
 	}
 }
 
@@ -210,10 +220,7 @@ pub struct DbCacheTransactionOps<Block: BlockT> {
 impl<Block: BlockT> DbCacheTransactionOps<Block> {
 	/// Empty transaction ops.
 	pub fn empty() -> DbCacheTransactionOps<Block> {
-		DbCacheTransactionOps {
-			cache_at_ops: HashMap::new(),
-			best_finalized_block: None,
-		}
+		DbCacheTransactionOps { cache_at_ops: HashMap::new(), best_finalized_block: None }
 	}
 }
 
@@ -244,19 +251,21 @@ impl<'a, Block: BlockT> DbCacheTransaction<'a, Block> {
 	) -> ClientResult<Self> {
 		// prepare list of caches that are not update
 		// (we might still need to do some cache maintenance in this case)
-		let missed_caches = self.cache.cache_at.keys()
+		let missed_caches = self
+			.cache
+			.cache_at
+			.keys()
 			.filter(|cache| !data_at.contains_key(*cache))
 			.cloned()
 			.collect::<Vec<_>>();
 
-		let mut insert_op = |name: CacheKeyId, value: Option<Vec<u8>>| -> Result<(), sp_blockchain::Error> {
+		let mut insert_op = |name: CacheKeyId,
+		                     value: Option<Vec<u8>>|
+		 -> Result<(), sp_blockchain::Error> {
 			let cache = self.cache.get_cache(name)?;
 			let cache_ops = self.cache_at_ops.entry(name).or_default();
 			cache.on_block_insert(
-				&mut self::list_storage::DbStorageTransaction::new(
-					cache.storage(),
-					&mut self.tx,
-				),
+				&mut self::list_storage::DbStorageTransaction::new(cache.storage(), &mut self.tx),
 				parent.clone(),
 				block.clone(),
 				value,
@@ -271,8 +280,7 @@ impl<'a, Block: BlockT> DbCacheTransaction<'a, Block> {
 		missed_caches.into_iter().try_for_each(|name| insert_op(name, None))?;
 
 		match entry_type {
-			EntryType::Final | EntryType::Genesis =>
-				self.best_finalized_block = Some(block),
+			EntryType::Final | EntryType::Genesis => self.best_finalized_block = Some(block),
 			EntryType::NonFinal => (),
 		}
 
@@ -288,10 +296,7 @@ impl<'a, Block: BlockT> DbCacheTransaction<'a, Block> {
 		for (name, cache) in self.cache.cache_at.iter() {
 			let cache_ops = self.cache_at_ops.entry(*name).or_default();
 			cache.on_block_finalize(
-				&mut self::list_storage::DbStorageTransaction::new(
-					cache.storage(),
-					&mut self.tx
-				),
+				&mut self::list_storage::DbStorageTransaction::new(cache.storage(), &mut self.tx),
 				parent.clone(),
 				block.clone(),
 				cache_ops,
@@ -304,17 +309,11 @@ impl<'a, Block: BlockT> DbCacheTransaction<'a, Block> {
 	}
 
 	/// When block is reverted.
-	pub fn on_block_revert(
-		mut self,
-		reverted_block: &ComplexBlockId<Block>,
-	) -> ClientResult<Self> {
+	pub fn on_block_revert(mut self, reverted_block: &ComplexBlockId<Block>) -> ClientResult<Self> {
 		for (name, cache) in self.cache.cache_at.iter() {
 			let cache_ops = self.cache_at_ops.entry(*name).or_default();
 			cache.on_block_revert(
-				&mut self::list_storage::DbStorageTransaction::new(
-					cache.storage(),
-					&mut self.tx
-				),
+				&mut self::list_storage::DbStorageTransaction::new(cache.storage(), &mut self.tx),
 				reverted_block,
 				cache_ops,
 			)?;
@@ -352,7 +351,9 @@ impl<Block: BlockT> BlockchainCache<Block> for DbCacheSync<Block> {
 		&self,
 		key: &CacheKeyId,
 		at: &BlockId<Block>,
-	) -> ClientResult<Option<((NumberFor<Block>, Block::Hash), Option<(NumberFor<Block>, Block::Hash)>, Vec<u8>)>> {
+	) -> ClientResult<
+		Option<((NumberFor<Block>, Block::Hash), Option<(NumberFor<Block>, Block::Hash)>, Vec<u8>)>,
+	> {
 		let mut cache = self.0.write();
 		let header_metadata_cache = cache.header_metadata_cache.clone();
 		let cache = cache.get_cache(*key)?;
@@ -360,36 +361,39 @@ impl<Block: BlockT> BlockchainCache<Block> for DbCacheSync<Block> {
 		let db = storage.db();
 		let columns = storage.columns();
 		let at = match *at {
-			BlockId::Hash(hash) => {
-				match header_metadata_cache.header_metadata(hash) {
-					Some(metadata) => ComplexBlockId::new(hash, metadata.number),
-					None => {
-						let header = utils::require_header::<Block>(
-							&**db,
-							columns.key_lookup,
-							columns.header,
-							BlockId::Hash(hash.clone()))?;
-						ComplexBlockId::new(hash, *header.number())
-					}
-				}
+			BlockId::Hash(hash) => match header_metadata_cache.header_metadata(hash) {
+				Some(metadata) => ComplexBlockId::new(hash, metadata.number),
+				None => {
+					let header = utils::require_header::<Block>(
+						&**db,
+						columns.key_lookup,
+						columns.header,
+						BlockId::Hash(hash.clone()),
+					)?;
+					ComplexBlockId::new(hash, *header.number())
+				},
 			},
 			BlockId::Number(number) => {
 				let hash = utils::require_header::<Block>(
 					&**db,
 					columns.key_lookup,
 					columns.header,
-					BlockId::Number(number.clone()))?.hash();
+					BlockId::Number(number.clone()),
+				)?
+				.hash();
 				ComplexBlockId::new(hash, number)
 			},
 		};
 
-		cache.value_at_block(&at)
-			.map(|block_and_value| block_and_value.map(|(begin_block, end_block, value)|
+		cache.value_at_block(&at).map(|block_and_value| {
+			block_and_value.map(|(begin_block, end_block, value)| {
 				(
 					(begin_block.number, begin_block.hash),
 					end_block.map(|end_block| (end_block.number, end_block.hash)),
 					value,
-				)))
+				)
+			})
+		})
 	}
 }
 
diff --git a/client/db/src/changes_tries_storage.rs b/client/db/src/changes_tries_storage.rs
index 3863099a09f9..6b948a2d2c5c 100644
--- a/client/db/src/changes_tries_storage.rs
+++ b/client/db/src/changes_tries_storage.rs
@@ -18,33 +18,43 @@
 
 //! DB-backed changes tries storage.
 
-use std::collections::{HashMap, HashSet};
-use std::sync::Arc;
-use hash_db::Prefix;
+use crate::{
+	cache::{
+		ComplexBlockId, DbCache, DbCacheSync, DbCacheTransactionOps, EntryType as CacheEntryType,
+	},
+	utils::{self, meta_keys, Meta},
+	Database, DbHash,
+};
 use codec::{Decode, Encode};
+use hash_db::Prefix;
 use parking_lot::RwLock;
-use sp_blockchain::{Error as ClientError, Result as ClientResult};
-use sp_trie::MemoryDB;
 use sc_client_api::backend::PrunableStateChangesTrieStorage;
-use sp_blockchain::{well_known_cache_keys, Cache as BlockchainCache, HeaderMetadataCache};
-use sp_core::{ChangesTrieConfiguration, ChangesTrieConfigurationRange, convert_hash};
-use sp_core::storage::PrefixedStorageKey;
+use sp_blockchain::{
+	well_known_cache_keys, Cache as BlockchainCache, Error as ClientError, HeaderMetadataCache,
+	Result as ClientResult,
+};
+use sp_core::{
+	convert_hash, storage::PrefixedStorageKey, ChangesTrieConfiguration,
+	ChangesTrieConfigurationRange,
+};
 use sp_database::Transaction;
-use sp_runtime::traits::{
-	Block as BlockT, Header as HeaderT, HashFor, NumberFor, One, Zero, CheckedSub,
+use sp_runtime::{
+	generic::{BlockId, ChangesTrieSignal, DigestItem},
+	traits::{Block as BlockT, CheckedSub, HashFor, Header as HeaderT, NumberFor, One, Zero},
 };
-use sp_runtime::generic::{BlockId, DigestItem, ChangesTrieSignal};
 use sp_state_machine::{ChangesTrieBuildCache, ChangesTrieCacheAction};
-use crate::{Database, DbHash};
-use crate::utils::{self, Meta, meta_keys};
-use crate::cache::{
-	DbCacheSync, DbCache, DbCacheTransactionOps,
-	ComplexBlockId, EntryType as CacheEntryType,
+use sp_trie::MemoryDB;
+use std::{
+	collections::{HashMap, HashSet},
+	sync::Arc,
 };
 
 /// Extract new changes trie configuration (if available) from the header.
-pub fn extract_new_configuration<Header: HeaderT>(header: &Header) -> Option<&Option<ChangesTrieConfiguration>> {
-	header.digest()
+pub fn extract_new_configuration<Header: HeaderT>(
+	header: &Header,
+) -> Option<&Option<ChangesTrieConfiguration>> {
+	header
+		.digest()
 		.log(DigestItem::as_changes_trie_signal)
 		.and_then(ChangesTrieSignal::as_new_configuration)
 }
@@ -68,10 +78,7 @@ impl<Block: BlockT> DbChangesTrieStorageTransaction<Block> {
 
 impl<Block: BlockT> From<DbCacheTransactionOps<Block>> for DbChangesTrieStorageTransaction<Block> {
 	fn from(cache_ops: DbCacheTransactionOps<Block>) -> Self {
-		DbChangesTrieStorageTransaction {
-			cache_ops,
-			new_config: None,
-		}
+		DbChangesTrieStorageTransaction { cache_ops, new_config: None }
 	}
 }
 
@@ -173,21 +180,25 @@ impl<Block: BlockT> DbChangesTrieStorage<Block> {
 		let new_configuration = match new_configuration {
 			Some(new_configuration) => new_configuration,
 			None if !finalized => return Ok(DbCacheTransactionOps::empty().into()),
-			None => return self.finalize(
-				tx,
-				parent_block.hash,
-				block.hash,
-				block.number,
-				Some(new_header),
-				cache_tx,
-			),
+			None =>
+				return self.finalize(
+					tx,
+					parent_block.hash,
+					block.hash,
+					block.number,
+					Some(new_header),
+					cache_tx,
+				),
 		};
 
 		// update configuration cache
 		let mut cache_at = HashMap::new();
 		cache_at.insert(well_known_cache_keys::CHANGES_TRIE_CONFIG, new_configuration.encode());
 		Ok(DbChangesTrieStorageTransaction::from(match cache_tx {
-			Some(cache_tx) => self.cache.0.write()
+			Some(cache_tx) => self
+				.cache
+				.0
+				.write()
 				.transaction_with_ops(tx, cache_tx.cache_ops)
 				.on_block_insert(
 					parent_block,
@@ -196,7 +207,10 @@ impl<Block: BlockT> DbChangesTrieStorage<Block> {
 					if finalized { CacheEntryType::Final } else { CacheEntryType::NonFinal },
 				)?
 				.into_ops(),
-			None => self.cache.0.write()
+			None => self
+				.cache
+				.0
+				.write()
 				.transaction(tx)
 				.on_block_insert(
 					parent_block,
@@ -205,7 +219,8 @@ impl<Block: BlockT> DbChangesTrieStorage<Block> {
 					if finalized { CacheEntryType::Final } else { CacheEntryType::NonFinal },
 				)?
 				.into_ops(),
-		}).with_new_config(Some(new_configuration)))
+		})
+		.with_new_config(Some(new_configuration)))
 	}
 
 	/// Called when block is finalized.
@@ -226,7 +241,7 @@ impl<Block: BlockT> DbChangesTrieStorage<Block> {
 		if cache_tx.is_some() {
 			if let Some(new_header) = new_header {
 				if new_header.hash() == block_hash {
-					return Ok(cache_tx.expect("guarded by cache_tx.is_some(); qed"));
+					return Ok(cache_tx.expect("guarded by cache_tx.is_some(); qed"))
 				}
 			}
 		}
@@ -237,22 +252,21 @@ impl<Block: BlockT> DbChangesTrieStorage<Block> {
 		let parent_block = ComplexBlockId::new(parent_block_hash, parent_block_num);
 		Ok(match cache_tx {
 			Some(cache_tx) => DbChangesTrieStorageTransaction::from(
-				self.cache.0.write()
+				self.cache
+					.0
+					.write()
 					.transaction_with_ops(tx, cache_tx.cache_ops)
-					.on_block_finalize(
-						parent_block,
-						block,
-					)?
-					.into_ops()
-			).with_new_config(cache_tx.new_config),
+					.on_block_finalize(parent_block, block)?
+					.into_ops(),
+			)
+			.with_new_config(cache_tx.new_config),
 			None => DbChangesTrieStorageTransaction::from(
-				self.cache.0.write()
+				self.cache
+					.0
+					.write()
 					.transaction(tx)
-					.on_block_finalize(
-						parent_block,
-						block,
-					)?
-					.into_ops()
+					.on_block_finalize(parent_block, block)?
+					.into_ops(),
 			),
 		})
 	}
@@ -263,23 +277,24 @@ impl<Block: BlockT> DbChangesTrieStorage<Block> {
 		tx: &mut Transaction<DbHash>,
 		block: &ComplexBlockId<Block>,
 	) -> ClientResult<DbChangesTrieStorageTransaction<Block>> {
-		Ok(self.cache.0.write().transaction(tx)
-			.on_block_revert(block)?
-			.into_ops()
-			.into())
+		Ok(self.cache.0.write().transaction(tx).on_block_revert(block)?.into_ops().into())
 	}
 
 	/// When transaction has been committed.
 	pub fn post_commit(&self, tx: Option<DbChangesTrieStorageTransaction<Block>>) {
 		if let Some(tx) = tx {
-			self.cache.0.write().commit(tx.cache_ops)
-				.expect("only fails if cache with given name isn't loaded yet;\
-						cache is already loaded because there is tx; qed");
+			self.cache.0.write().commit(tx.cache_ops).expect(
+				"only fails if cache with given name isn't loaded yet;\
+						cache is already loaded because there is tx; qed",
+			);
 		}
 	}
 
 	/// Commit changes into changes trie build cache.
-	pub fn commit_build_cache(&self, cache_update: ChangesTrieCacheAction<Block::Hash, NumberFor<Block>>) {
+	pub fn commit_build_cache(
+		&self,
+		cache_update: ChangesTrieCacheAction<Block::Hash, NumberFor<Block>>,
+	) {
 		self.build_cache.write().perform(cache_update);
 	}
 
@@ -307,7 +322,7 @@ impl<Block: BlockT> DbChangesTrieStorage<Block> {
 			// 2) or we are (or were) in period where changes tries are disabled
 			if let Some((begin, end)) = tries_meta.oldest_digest_range {
 				if block_num <= end || block_num - end <= min_blocks_to_keep.into() {
-					break;
+					break
 				}
 
 				tries_meta.oldest_pruned_digest_range_end = end;
@@ -333,7 +348,8 @@ impl<Block: BlockT> DbChangesTrieStorage<Block> {
 					self.key_lookup_column,
 					self.header_column,
 					BlockId::Number(next_digest_range_start),
-				)?.hash(),
+				)?
+				.hash(),
 			};
 
 			let config_for_new_block = new_header
@@ -341,21 +357,18 @@ impl<Block: BlockT> DbChangesTrieStorage<Block> {
 				.unwrap_or(false);
 			let next_config = match cache_tx {
 				Some(cache_tx) if config_for_new_block && cache_tx.new_config.is_some() => {
-					let config = cache_tx
-						.new_config
-						.clone()
-						.expect("guarded by is_some(); qed");
+					let config = cache_tx.new_config.clone().expect("guarded by is_some(); qed");
 					ChangesTrieConfigurationRange {
 						zero: (block_num, block_hash),
 						end: None,
 						config,
 					}
 				},
-				_ if config_for_new_block => {
-					self.configuration_at(&BlockId::Hash(*new_header.expect(
-						"config_for_new_block is only true when new_header is passed; qed"
-					).parent_hash()))?
-				},
+				_ if config_for_new_block => self.configuration_at(&BlockId::Hash(
+					*new_header
+						.expect("config_for_new_block is only true when new_header is passed; qed")
+						.parent_hash(),
+				))?,
 				_ => self.configuration_at(&BlockId::Hash(next_digest_range_start_hash))?,
 			};
 			if let Some(config) = next_config.config {
@@ -370,11 +383,11 @@ impl<Block: BlockT> DbChangesTrieStorage<Block> {
 				}
 
 				tries_meta.oldest_digest_range = Some(oldest_digest_range);
-				continue;
+				continue
 			}
 
 			tries_meta.oldest_digest_range = None;
-			break;
+			break
 		}
 
 		write_tries_meta(tx, self.meta_column, &*tries_meta);
@@ -383,17 +396,23 @@ impl<Block: BlockT> DbChangesTrieStorage<Block> {
 }
 
 impl<Block: BlockT> PrunableStateChangesTrieStorage<Block> for DbChangesTrieStorage<Block> {
-	fn storage(&self) -> &dyn sp_state_machine::ChangesTrieStorage<HashFor<Block>, NumberFor<Block>> {
+	fn storage(
+		&self,
+	) -> &dyn sp_state_machine::ChangesTrieStorage<HashFor<Block>, NumberFor<Block>> {
 		self
 	}
 
-	fn configuration_at(&self, at: &BlockId<Block>) -> ClientResult<
-		ChangesTrieConfigurationRange<NumberFor<Block>, Block::Hash>
-	> {
+	fn configuration_at(
+		&self,
+		at: &BlockId<Block>,
+	) -> ClientResult<ChangesTrieConfigurationRange<NumberFor<Block>, Block::Hash>> {
 		self.cache
 			.get_at(&well_known_cache_keys::CHANGES_TRIE_CONFIG, at)?
-			.and_then(|(zero, end, encoded)| Decode::decode(&mut &encoded[..]).ok()
-				.map(|config| ChangesTrieConfigurationRange { zero, end, config }))
+			.and_then(|(zero, end, encoded)| {
+				Decode::decode(&mut &encoded[..])
+					.ok()
+					.map(|config| ChangesTrieConfigurationRange { zero, end, config })
+			})
 			.ok_or_else(|| ClientError::ErrorReadingChangesTriesConfig)
 	}
 
@@ -409,14 +428,21 @@ impl<Block: BlockT> sp_state_machine::ChangesTrieRootsStorage<HashFor<Block>, Nu
 		&self,
 		hash: Block::Hash,
 	) -> Result<sp_state_machine::ChangesTrieAnchorBlockId<Block::Hash, NumberFor<Block>>, String> {
-		utils::read_header::<Block>(&*self.db, self.key_lookup_column, self.header_column, BlockId::Hash(hash))
-			.map_err(|e| e.to_string())
-			.and_then(|maybe_header| maybe_header.map(|header|
-				sp_state_machine::ChangesTrieAnchorBlockId {
+		utils::read_header::<Block>(
+			&*self.db,
+			self.key_lookup_column,
+			self.header_column,
+			BlockId::Hash(hash),
+		)
+		.map_err(|e| e.to_string())
+		.and_then(|maybe_header| {
+			maybe_header
+				.map(|header| sp_state_machine::ChangesTrieAnchorBlockId {
 					hash,
 					number: *header.number(),
-				}
-			).ok_or_else(|| format!("Unknown header: {}", hash)))
+				})
+				.ok_or_else(|| format!("Unknown header: {}", hash))
+		})
 	}
 
 	fn root(
@@ -426,7 +452,10 @@ impl<Block: BlockT> sp_state_machine::ChangesTrieRootsStorage<HashFor<Block>, Nu
 	) -> Result<Option<Block::Hash>, String> {
 		// check API requirement: we can't get NEXT block(s) based on anchor
 		if block > anchor.number {
-			return Err(format!("Can't get changes trie root at {} using anchor at {}", block, anchor.number));
+			return Err(format!(
+				"Can't get changes trie root at {} using anchor at {}",
+				block, anchor.number
+			))
 		}
 
 		// we need to get hash of the block to resolve changes trie root
@@ -438,8 +467,12 @@ impl<Block: BlockT> sp_state_machine::ChangesTrieRootsStorage<HashFor<Block>, Nu
 			let mut current_num = anchor.number;
 			let mut current_hash: Block::Hash = convert_hash(&anchor.hash);
 			let maybe_anchor_header: Block::Header = utils::require_header::<Block>(
-				&*self.db, self.key_lookup_column, self.header_column, BlockId::Number(current_num)
-			).map_err(|e| e.to_string())?;
+				&*self.db,
+				self.key_lookup_column,
+				self.header_column,
+				BlockId::Number(current_num),
+			)
+			.map_err(|e| e.to_string())?;
 			if maybe_anchor_header.hash() == current_hash {
 				// if anchor is canonicalized, then the block is also canonicalized
 				BlockId::Number(block)
@@ -449,8 +482,12 @@ impl<Block: BlockT> sp_state_machine::ChangesTrieRootsStorage<HashFor<Block>, Nu
 				// back from the anchor to the block with given number
 				while current_num != block {
 					let current_header: Block::Header = utils::require_header::<Block>(
-						&*self.db, self.key_lookup_column, self.header_column, BlockId::Hash(current_hash)
-					).map_err(|e| e.to_string())?;
+						&*self.db,
+						self.key_lookup_column,
+						self.header_column,
+						BlockId::Hash(current_hash),
+					)
+					.map_err(|e| e.to_string())?;
 
 					current_hash = *current_header.parent_hash();
 					current_num = current_num - One::one();
@@ -460,18 +497,16 @@ impl<Block: BlockT> sp_state_machine::ChangesTrieRootsStorage<HashFor<Block>, Nu
 			}
 		};
 
-		Ok(
-			utils::require_header::<Block>(
-				&*self.db,
-				self.key_lookup_column,
-				self.header_column,
-				block_id,
-			)
-			.map_err(|e| e.to_string())?
-			.digest()
-			.log(DigestItem::as_changes_trie_root)
-			.cloned()
+		Ok(utils::require_header::<Block>(
+			&*self.db,
+			self.key_lookup_column,
+			self.header_column,
+			block_id,
 		)
+		.map_err(|e| e.to_string())?
+		.digest()
+		.log(DigestItem::as_changes_trie_root)
+		.cloned())
 	}
 }
 
@@ -480,7 +515,9 @@ impl<Block> sp_state_machine::ChangesTrieStorage<HashFor<Block>, NumberFor<Block
 where
 	Block: BlockT,
 {
-	fn as_roots_storage(&self) -> &dyn sp_state_machine::ChangesTrieRootsStorage<HashFor<Block>, NumberFor<Block>> {
+	fn as_roots_storage(
+		&self,
+	) -> &dyn sp_state_machine::ChangesTrieRootsStorage<HashFor<Block>, NumberFor<Block>> {
 		self
 	}
 
@@ -503,8 +540,9 @@ fn read_tries_meta<Block: BlockT>(
 	meta_column: u32,
 ) -> ClientResult<ChangesTriesMeta<Block>> {
 	match db.get(meta_column, meta_keys::CHANGES_TRIES_META) {
-		Some(h) => Decode::decode(&mut &h[..])
-			.map_err(|err| ClientError::Backend(format!("Error decoding changes tries metadata: {}", err))),
+		Some(h) => Decode::decode(&mut &h[..]).map_err(|err| {
+			ClientError::Backend(format!("Error decoding changes tries metadata: {}", err))
+		}),
 		None => Ok(ChangesTriesMeta {
 			oldest_digest_range: None,
 			oldest_pruned_digest_range_end: Zero::zero(),
@@ -523,18 +561,23 @@ fn write_tries_meta<Block: BlockT>(
 
 #[cfg(test)]
 mod tests {
+	use super::*;
+	use crate::{
+		tests::{insert_header, prepare_changes, Block},
+		Backend,
+	};
 	use hash_db::EMPTY_PREFIX;
 	use sc_client_api::backend::{
-		Backend as ClientBackend, NewBlockState, BlockImportOperation, PrunableStateChangesTrieStorage,
+		Backend as ClientBackend, BlockImportOperation, NewBlockState,
+		PrunableStateChangesTrieStorage,
 	};
 	use sp_blockchain::HeaderBackend as BlockchainHeaderBackend;
 	use sp_core::H256;
-	use sp_runtime::testing::{Digest, Header};
-	use sp_runtime::traits::{Hash, BlakeTwo256};
+	use sp_runtime::{
+		testing::{Digest, Header},
+		traits::{BlakeTwo256, Hash},
+	};
 	use sp_state_machine::{ChangesTrieRootsStorage, ChangesTrieStorage};
-	use crate::Backend;
-	use crate::tests::{Block, insert_header, prepare_changes};
-	use super::*;
 
 	fn changes(number: u64) -> Option<Vec<(Vec<u8>, Vec<u8>)>> {
 		Some(vec![(number.to_le_bytes().to_vec(), number.to_le_bytes().to_vec())])
@@ -554,7 +597,9 @@ mod tests {
 			digest.push(DigestItem::ChangesTrieRoot(root));
 			changes_trie_update = update;
 		}
-		digest.push(DigestItem::ChangesTrieSignal(ChangesTrieSignal::NewConfiguration(new_configuration)));
+		digest.push(DigestItem::ChangesTrieSignal(ChangesTrieSignal::NewConfiguration(
+			new_configuration,
+		)));
 
 		let header = Header {
 			number,
@@ -573,7 +618,8 @@ mod tests {
 		let mut op = backend.begin_operation().unwrap();
 		backend.begin_state_operation(&mut op, block_id).unwrap();
 		op.set_block_data(header, None, None, None, NewBlockState::Best).unwrap();
-		op.update_changes_trie((changes_trie_update, ChangesTrieCacheAction::Clear)).unwrap();
+		op.update_changes_trie((changes_trie_update, ChangesTrieCacheAction::Clear))
+			.unwrap();
 		backend.commit_operation(op).unwrap();
 
 		header_hash
@@ -584,11 +630,13 @@ mod tests {
 		let backend = Backend::<Block>::new_test(1000, 100);
 		backend.changes_tries_storage.meta.write().finalized_number = 1000;
 
-		let check_changes = |backend: &Backend<Block>, block: u64, changes: Vec<(Vec<u8>, Vec<u8>)>| {
+		let check_changes = |backend: &Backend<Block>,
+		                     block: u64,
+		                     changes: Vec<(Vec<u8>, Vec<u8>)>| {
 			let (changes_root, mut changes_trie_update) = prepare_changes(changes);
 			let anchor = sp_state_machine::ChangesTrieAnchorBlockId {
 				hash: backend.blockchain().header(BlockId::Number(block)).unwrap().unwrap().hash(),
-				number: block
+				number: block,
 			};
 			assert_eq!(backend.changes_tries_storage.root(&anchor, block), Ok(Some(changes_root)));
 
@@ -605,7 +653,13 @@ mod tests {
 		];
 		let changes2 = vec![(b"key_at_2".to_vec(), b"val_at_2".to_vec())];
 
-		let block0 = insert_header(&backend, 0, Default::default(), Some(changes0.clone()), Default::default());
+		let block0 = insert_header(
+			&backend,
+			0,
+			Default::default(),
+			Some(changes0.clone()),
+			Default::default(),
+		);
 		let block1 = insert_header(&backend, 1, block0, Some(changes1.clone()), Default::default());
 		let _ = insert_header(&backend, 2, block1, Some(changes2.clone()), Default::default());
 
@@ -622,19 +676,29 @@ mod tests {
 		let changes0 = vec![(b"k0".to_vec(), b"v0".to_vec())];
 		let changes1 = vec![(b"k1".to_vec(), b"v1".to_vec())];
 		let changes2 = vec![(b"k2".to_vec(), b"v2".to_vec())];
-		let block0 = insert_header(&backend, 0, Default::default(), Some(changes0.clone()), Default::default());
+		let block0 = insert_header(
+			&backend,
+			0,
+			Default::default(),
+			Some(changes0.clone()),
+			Default::default(),
+		);
 		let block1 = insert_header(&backend, 1, block0, Some(changes1.clone()), Default::default());
 		let block2 = insert_header(&backend, 2, block1, Some(changes2.clone()), Default::default());
 
 		let changes2_1_0 = vec![(b"k3".to_vec(), b"v3".to_vec())];
 		let changes2_1_1 = vec![(b"k4".to_vec(), b"v4".to_vec())];
-		let block2_1_0 = insert_header(&backend, 3, block2, Some(changes2_1_0.clone()), Default::default());
-		let block2_1_1 = insert_header(&backend, 4, block2_1_0, Some(changes2_1_1.clone()), Default::default());
+		let block2_1_0 =
+			insert_header(&backend, 3, block2, Some(changes2_1_0.clone()), Default::default());
+		let block2_1_1 =
+			insert_header(&backend, 4, block2_1_0, Some(changes2_1_1.clone()), Default::default());
 
 		let changes2_2_0 = vec![(b"k5".to_vec(), b"v5".to_vec())];
 		let changes2_2_1 = vec![(b"k6".to_vec(), b"v6".to_vec())];
-		let block2_2_0 = insert_header(&backend, 3, block2, Some(changes2_2_0.clone()), Default::default());
-		let block2_2_1 = insert_header(&backend, 4, block2_2_0, Some(changes2_2_1.clone()), Default::default());
+		let block2_2_0 =
+			insert_header(&backend, 3, block2, Some(changes2_2_0.clone()), Default::default());
+		let block2_2_1 =
+			insert_header(&backend, 4, block2_2_0, Some(changes2_2_1.clone()), Default::default());
 
 		// finalize block1
 		backend.changes_tries_storage.meta.write().finalized_number = 1;
@@ -680,7 +744,12 @@ mod tests {
 			if number == 0 {
 				Default::default()
 			} else {
-				backend.blockchain().header(BlockId::Number(number - 1)).unwrap().unwrap().hash()
+				backend
+					.blockchain()
+					.header(BlockId::Number(number - 1))
+					.unwrap()
+					.unwrap()
+					.hash()
 			}
 		};
 
@@ -698,12 +767,14 @@ mod tests {
 			let trie_root = backend
 				.blockchain()
 				.header(BlockId::Number(number))
-				.unwrap().unwrap()
+				.unwrap()
+				.unwrap()
 				.digest()
 				.log(DigestItem::as_changes_trie_root)
 				.cloned();
 			match trie_root {
-				Some(trie_root) => backend.changes_tries_storage.get(&trie_root, EMPTY_PREFIX).unwrap().is_none(),
+				Some(trie_root) =>
+					backend.changes_tries_storage.get(&trie_root, EMPTY_PREFIX).unwrap().is_none(),
 				None => true,
 			}
 		};
@@ -711,14 +782,10 @@ mod tests {
 		let finalize_block = |number| {
 			let header = backend.blockchain().header(BlockId::Number(number)).unwrap().unwrap();
 			let mut tx = Transaction::new();
-			let cache_ops = backend.changes_tries_storage.finalize(
-				&mut tx,
-				*header.parent_hash(),
-				header.hash(),
-				number,
-				None,
-				None,
-			).unwrap();
+			let cache_ops = backend
+				.changes_tries_storage
+				.finalize(&mut tx, *header.parent_hash(), header.hash(), number, None, None)
+				.unwrap();
 			backend.storage.db.commit(tx).unwrap();
 			backend.changes_tries_storage.post_commit(Some(cache_ops));
 		};
@@ -737,11 +804,23 @@ mod tests {
 		(0..6).for_each(|number| insert_regular_header(false, number));
 		insert_header_with_configuration_change(&backend, 6, parent_hash(6), None, config_at_6);
 		(7..17).for_each(|number| insert_regular_header(true, number));
-		insert_header_with_configuration_change(&backend, 17, parent_hash(17), changes(17), config_at_17);
+		insert_header_with_configuration_change(
+			&backend,
+			17,
+			parent_hash(17),
+			changes(17),
+			config_at_17,
+		);
 		(18..21).for_each(|number| insert_regular_header(false, number));
 		insert_header_with_configuration_change(&backend, 21, parent_hash(21), None, config_at_21);
 		(22..32).for_each(|number| insert_regular_header(true, number));
-		insert_header_with_configuration_change(&backend, 32, parent_hash(32), changes(32), config_at_32);
+		insert_header_with_configuration_change(
+			&backend,
+			32,
+			parent_hash(32),
+			changes(32),
+			config_at_32,
+		);
 		(33..50).for_each(|number| insert_regular_header(true, number));
 
 		// when only genesis is finalized, nothing is pruned
@@ -826,29 +905,24 @@ mod tests {
 		let backend = Backend::<Block>::new_test(1000, 100);
 
 		// configurations at blocks
-		let config_at_1 = Some(ChangesTrieConfiguration {
-			digest_interval: 4,
-			digest_levels: 2,
-		});
-		let config_at_3 = Some(ChangesTrieConfiguration {
-			digest_interval: 8,
-			digest_levels: 1,
-		});
+		let config_at_1 = Some(ChangesTrieConfiguration { digest_interval: 4, digest_levels: 2 });
+		let config_at_3 = Some(ChangesTrieConfiguration { digest_interval: 8, digest_levels: 1 });
 		let config_at_5 = None;
-		let config_at_7 = Some(ChangesTrieConfiguration {
-			digest_interval: 8,
-			digest_levels: 1,
-		});
+		let config_at_7 = Some(ChangesTrieConfiguration { digest_interval: 8, digest_levels: 1 });
 
 		// insert some blocks
 		let block0 = insert_header(&backend, 0, Default::default(), None, Default::default());
-		let block1 = insert_header_with_configuration_change(&backend, 1, block0, None, config_at_1.clone());
+		let block1 =
+			insert_header_with_configuration_change(&backend, 1, block0, None, config_at_1.clone());
 		let block2 = insert_header(&backend, 2, block1, None, Default::default());
-		let block3 = insert_header_with_configuration_change(&backend, 3, block2, None, config_at_3.clone());
+		let block3 =
+			insert_header_with_configuration_change(&backend, 3, block2, None, config_at_3.clone());
 		let block4 = insert_header(&backend, 4, block3, None, Default::default());
-		let block5 = insert_header_with_configuration_change(&backend, 5, block4, None, config_at_5.clone());
+		let block5 =
+			insert_header_with_configuration_change(&backend, 5, block4, None, config_at_5.clone());
 		let block6 = insert_header(&backend, 6, block5, None, Default::default());
-		let block7 = insert_header_with_configuration_change(&backend, 7, block6, None, config_at_7.clone());
+		let block7 =
+			insert_header_with_configuration_change(&backend, 7, block6, None, config_at_7.clone());
 
 		// test configuration cache
 		let storage = &backend.changes_tries_storage;
@@ -887,17 +961,48 @@ mod tests {
 		let mut backend = Backend::<Block>::new_test(10, 10);
 		backend.changes_tries_storage.min_blocks_to_keep = Some(8);
 
-		let configs = (0..=7).map(|i| Some(ChangesTrieConfiguration::new(2, i))).collect::<Vec<_>>();
+		let configs =
+			(0..=7).map(|i| Some(ChangesTrieConfiguration::new(2, i))).collect::<Vec<_>>();
 
 		// insert unfinalized headers
-		let block0 = insert_header_with_configuration_change(&backend, 0, Default::default(), None, configs[0].clone());
-		let block1 = insert_header_with_configuration_change(&backend, 1, block0, changes(1), configs[1].clone());
-		let block2 = insert_header_with_configuration_change(&backend, 2, block1, changes(2), configs[2].clone());
+		let block0 = insert_header_with_configuration_change(
+			&backend,
+			0,
+			Default::default(),
+			None,
+			configs[0].clone(),
+		);
+		let block1 = insert_header_with_configuration_change(
+			&backend,
+			1,
+			block0,
+			changes(1),
+			configs[1].clone(),
+		);
+		let block2 = insert_header_with_configuration_change(
+			&backend,
+			2,
+			block1,
+			changes(2),
+			configs[2].clone(),
+		);
 
 		let side_config2_1 = Some(ChangesTrieConfiguration::new(3, 2));
 		let side_config2_2 = Some(ChangesTrieConfiguration::new(3, 3));
-		let block2_1 = insert_header_with_configuration_change(&backend, 2, block1, changes(8), side_config2_1.clone());
-		let _ = insert_header_with_configuration_change(&backend, 3, block2_1, changes(9), side_config2_2.clone());
+		let block2_1 = insert_header_with_configuration_change(
+			&backend,
+			2,
+			block1,
+			changes(8),
+			side_config2_1.clone(),
+		);
+		let _ = insert_header_with_configuration_change(
+			&backend,
+			3,
+			block2_1,
+			changes(9),
+			side_config2_2.clone(),
+		);
 
 		// insert finalized header => 4 headers are finalized at once
 		let header3 = Header {
@@ -905,9 +1010,9 @@ mod tests {
 			parent_hash: block2,
 			state_root: Default::default(),
 			digest: Digest {
-				logs: vec![
-					DigestItem::ChangesTrieSignal(ChangesTrieSignal::NewConfiguration(configs[3].clone())),
-				],
+				logs: vec![DigestItem::ChangesTrieSignal(ChangesTrieSignal::NewConfiguration(
+					configs[3].clone(),
+				))],
 			},
 			extrinsics_root: Default::default(),
 		};
@@ -920,9 +1025,27 @@ mod tests {
 		backend.commit_operation(op).unwrap();
 
 		// insert more unfinalized headers
-		let block4 = insert_header_with_configuration_change(&backend, 4, block3, changes(4), configs[4].clone());
-		let block5 = insert_header_with_configuration_change(&backend, 5, block4, changes(5), configs[5].clone());
-		let block6 = insert_header_with_configuration_change(&backend, 6, block5, changes(6), configs[6].clone());
+		let block4 = insert_header_with_configuration_change(
+			&backend,
+			4,
+			block3,
+			changes(4),
+			configs[4].clone(),
+		);
+		let block5 = insert_header_with_configuration_change(
+			&backend,
+			5,
+			block4,
+			changes(5),
+			configs[5].clone(),
+		);
+		let block6 = insert_header_with_configuration_change(
+			&backend,
+			6,
+			block5,
+			changes(6),
+			configs[6].clone(),
+		);
 
 		// insert finalized header => 4 headers are finalized at once
 		let header7 = Header {
@@ -930,9 +1053,9 @@ mod tests {
 			parent_hash: block6,
 			state_root: Default::default(),
 			digest: Digest {
-				logs: vec![
-					DigestItem::ChangesTrieSignal(ChangesTrieSignal::NewConfiguration(configs[7].clone())),
-				],
+				logs: vec![DigestItem::ChangesTrieSignal(ChangesTrieSignal::NewConfiguration(
+					configs[7].clone(),
+				))],
 			},
 			extrinsics_root: Default::default(),
 		};
@@ -950,23 +1073,33 @@ mod tests {
 		let backend = Backend::<Block>::new_test(10, 10);
 
 		let config0 = Some(ChangesTrieConfiguration::new(2, 5));
-		let block0 = insert_header_with_configuration_change(&backend, 0, Default::default(), None, config0);
+		let block0 =
+			insert_header_with_configuration_change(&backend, 0, Default::default(), None, config0);
 		let config1 = Some(ChangesTrieConfiguration::new(2, 6));
-		let block1 = insert_header_with_configuration_change(&backend, 1, block0, changes(0), config1);
+		let block1 =
+			insert_header_with_configuration_change(&backend, 1, block0, changes(0), config1);
 		let just1 = Some((*b"TEST", vec![42]));
 		backend.finalize_block(BlockId::Number(1), just1).unwrap();
 		let config2 = Some(ChangesTrieConfiguration::new(2, 7));
-		let block2 = insert_header_with_configuration_change(&backend, 2, block1, changes(1), config2);
+		let block2 =
+			insert_header_with_configuration_change(&backend, 2, block1, changes(1), config2);
 		let config2_1 = Some(ChangesTrieConfiguration::new(2, 8));
-		let _ = insert_header_with_configuration_change(&backend, 3, block2, changes(10), config2_1);
+		let _ =
+			insert_header_with_configuration_change(&backend, 3, block2, changes(10), config2_1);
 		let config2_2 = Some(ChangesTrieConfiguration::new(2, 9));
-		let block2_2 = insert_header_with_configuration_change(&backend, 3, block2, changes(20), config2_2);
+		let block2_2 =
+			insert_header_with_configuration_change(&backend, 3, block2, changes(20), config2_2);
 		let config2_3 = Some(ChangesTrieConfiguration::new(2, 10));
-		let _ = insert_header_with_configuration_change(&backend, 4, block2_2, changes(30), config2_3);
+		let _ =
+			insert_header_with_configuration_change(&backend, 4, block2_2, changes(30), config2_3);
 
 		// before truncate there are 2 unfinalized forks - block2_1+block2_3
 		assert_eq!(
-			backend.changes_tries_storage.cache.0.write()
+			backend
+				.changes_tries_storage
+				.cache
+				.0
+				.write()
 				.get_cache(well_known_cache_keys::CHANGES_TRIE_CONFIG)
 				.unwrap()
 				.unfinalized()
@@ -979,7 +1112,11 @@ mod tests {
 		// after truncating block2_3 - there are 2 unfinalized forks - block2_1+block2_2
 		backend.revert(1, false).unwrap();
 		assert_eq!(
-			backend.changes_tries_storage.cache.0.write()
+			backend
+				.changes_tries_storage
+				.cache
+				.0
+				.write()
 				.get_cache(well_known_cache_keys::CHANGES_TRIE_CONFIG)
 				.unwrap()
 				.unfinalized()
@@ -993,7 +1130,11 @@ mod tests {
 		// the 1st one points to the block #3 because it isn't truncated
 		backend.revert(1, false).unwrap();
 		assert_eq!(
-			backend.changes_tries_storage.cache.0.write()
+			backend
+				.changes_tries_storage
+				.cache
+				.0
+				.write()
 				.get_cache(well_known_cache_keys::CHANGES_TRIE_CONFIG)
 				.unwrap()
 				.unfinalized()
@@ -1005,15 +1146,17 @@ mod tests {
 
 		// after truncating block2 - there are no unfinalized forks
 		backend.revert(1, false).unwrap();
-		assert!(
-			backend.changes_tries_storage.cache.0.write()
-				.get_cache(well_known_cache_keys::CHANGES_TRIE_CONFIG)
-				.unwrap()
-				.unfinalized()
-				.iter()
-				.map(|fork| fork.head().valid_from.number)
-				.collect::<Vec<_>>()
-				.is_empty(),
-		);
+		assert!(backend
+			.changes_tries_storage
+			.cache
+			.0
+			.write()
+			.get_cache(well_known_cache_keys::CHANGES_TRIE_CONFIG)
+			.unwrap()
+			.unfinalized()
+			.iter()
+			.map(|fork| fork.head().valid_from.number)
+			.collect::<Vec<_>>()
+			.is_empty(),);
 	}
 }
diff --git a/client/db/src/children.rs b/client/db/src/children.rs
index 62352e6d0614..c11e4204997d 100644
--- a/client/db/src/children.rs
+++ b/client/db/src/children.rs
@@ -18,17 +18,22 @@
 
 //! Functionality for reading and storing children hashes from db.
 
-use codec::{Encode, Decode};
+use crate::DbHash;
+use codec::{Decode, Encode};
 use sp_blockchain;
-use std::hash::Hash;
 use sp_database::{Database, Transaction};
-use crate::DbHash;
+use std::hash::Hash;
 
 /// Returns the hashes of the children blocks of the block with `parent_hash`.
 pub fn read_children<
 	K: Eq + Hash + Clone + Encode + Decode,
 	V: Eq + Hash + Clone + Encode + Decode,
->(db: &dyn Database<DbHash>, column: u32, prefix: &[u8], parent_hash: K) -> sp_blockchain::Result<Vec<V>> {
+>(
+	db: &dyn Database<DbHash>,
+	column: u32,
+	prefix: &[u8],
+	parent_hash: K,
+) -> sp_blockchain::Result<Vec<V>> {
 	let mut buf = prefix.to_vec();
 	parent_hash.using_encoded(|s| buf.extend(s));
 
@@ -65,9 +70,7 @@ pub fn write_children<
 }
 
 /// Prepare transaction to remove the children of `parent_hash`.
-pub fn remove_children<
-	K: Eq + Hash + Clone + Encode + Decode,
->(
+pub fn remove_children<K: Eq + Hash + Clone + Encode + Decode>(
 	tx: &mut Transaction<DbHash>,
 	column: u32,
 	prefix: &[u8],
@@ -78,7 +81,6 @@ pub fn remove_children<
 	tx.remove(column, &key);
 }
 
-
 #[cfg(test)]
 mod tests {
 	use super::*;
diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index 505c7b9d49ea..3369b5fad055 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -34,63 +34,72 @@ pub mod offchain;
 #[cfg(any(feature = "with-kvdb-rocksdb", test))]
 pub mod bench;
 
-mod children;
 mod cache;
 mod changes_tries_storage;
+mod children;
+#[cfg(feature = "with-parity-db")]
+mod parity_db;
+mod stats;
 mod storage_cache;
 #[cfg(any(feature = "with-kvdb-rocksdb", test))]
 mod upgrade;
 mod utils;
-mod stats;
-#[cfg(feature = "with-parity-db")]
-mod parity_db;
 
-use std::sync::Arc;
-use std::path::{Path, PathBuf};
-use std::io;
-use std::collections::{HashMap, HashSet};
-use parking_lot::{Mutex, RwLock};
 use linked_hash_map::LinkedHashMap;
-use log::{trace, debug, warn};
+use log::{debug, trace, warn};
+use parking_lot::{Mutex, RwLock};
+use std::{
+	collections::{HashMap, HashSet},
+	io,
+	path::{Path, PathBuf},
+	sync::Arc,
+};
 
+use crate::{
+	changes_tries_storage::{DbChangesTrieStorage, DbChangesTrieStorageTransaction},
+	stats::StateUsageStats,
+	storage_cache::{new_shared_cache, CachingState, SharedCache, SyncingCachingState},
+	utils::{meta_keys, read_db, read_meta, DatabaseType, Meta},
+};
+use codec::{Decode, Encode};
+use hash_db::Prefix;
 use sc_client_api::{
-	UsageInfo, MemoryInfo, IoInfo, MemorySize,
-	backend::{NewBlockState, PrunableStateChangesTrieStorage, ProvideChtRoots},
-	leaves::{LeafSet, FinalizationDisplaced}, cht,
+	backend::{NewBlockState, ProvideChtRoots, PrunableStateChangesTrieStorage},
+	cht,
+	leaves::{FinalizationDisplaced, LeafSet},
 	utils::is_descendent_of,
+	IoInfo, MemoryInfo, MemorySize, UsageInfo,
 };
+use sc_state_db::StateDb;
+use sp_arithmetic::traits::Saturating;
 use sp_blockchain::{
-	Result as ClientResult, Error as ClientError,
-	well_known_cache_keys, Backend as _, HeaderBackend,
+	well_known_cache_keys, Backend as _, CachedHeaderMetadata, Error as ClientError, HeaderBackend,
+	HeaderMetadata, HeaderMetadataCache, Result as ClientResult,
+};
+use sp_core::{
+	offchain::OffchainOverlayedChange,
+	storage::{well_known_keys, ChildInfo},
+	ChangesTrieConfiguration,
 };
-use codec::{Decode, Encode};
-use hash_db::Prefix;
-use sp_trie::{MemoryDB, PrefixedMemoryDB, prefixed_key};
 use sp_database::Transaction;
-use sp_core::ChangesTrieConfiguration;
-use sp_core::offchain::OffchainOverlayedChange;
-use sp_core::storage::{well_known_keys, ChildInfo};
-use sp_arithmetic::traits::Saturating;
-use sp_runtime::{generic::{DigestItem, BlockId}, Justification, Justifications, Storage};
-use sp_runtime::traits::{
-	Block as BlockT, Header as HeaderT, NumberFor, Zero, One, SaturatedConversion, HashFor,
-	Hash,
+use sp_runtime::{
+	generic::{BlockId, DigestItem},
+	traits::{
+		Block as BlockT, Hash, HashFor, Header as HeaderT, NumberFor, One, SaturatedConversion,
+		Zero,
+	},
+	Justification, Justifications, Storage,
 };
 use sp_state_machine::{
-	DBValue, ChangesTrieTransaction, ChangesTrieCacheAction, UsageInfo as StateUsageInfo,
-	StorageCollection, ChildStorageCollection, OffchainChangesCollection,
-	backend::Backend as StateBackend, StateMachineStats, IndexOperation,
+	backend::Backend as StateBackend, ChangesTrieCacheAction, ChangesTrieTransaction,
+	ChildStorageCollection, DBValue, IndexOperation, OffchainChangesCollection, StateMachineStats,
+	StorageCollection, UsageInfo as StateUsageInfo,
 };
-use crate::utils::{DatabaseType, Meta, meta_keys, read_db, read_meta};
-use crate::changes_tries_storage::{DbChangesTrieStorage, DbChangesTrieStorageTransaction};
-use sc_state_db::StateDb;
-use sp_blockchain::{CachedHeaderMetadata, HeaderMetadata, HeaderMetadataCache};
-use crate::storage_cache::{CachingState, SyncingCachingState, SharedCache, new_shared_cache};
-use crate::stats::StateUsageStats;
+use sp_trie::{prefixed_key, MemoryDB, PrefixedMemoryDB};
 
 // Re-export the Database trait so that one can pass an implementation of it.
-pub use sp_database::Database;
 pub use sc_state_db::PruningMode;
+pub use sp_database::Database;
 
 #[cfg(any(feature = "with-kvdb-rocksdb", test))]
 pub use bench::BenchmarkingState;
@@ -102,9 +111,8 @@ const CACHE_HEADERS: usize = 8;
 const DEFAULT_CHILD_RATIO: (usize, usize) = (1, 10);
 
 /// DB-backed patricia trie state, transaction type is an overlay of changes to commit.
-pub type DbState<B> = sp_state_machine::TrieBackend<
-	Arc<dyn sp_state_machine::Storage<HashFor<B>>>, HashFor<B>
->;
+pub type DbState<B> =
+	sp_state_machine::TrieBackend<Arc<dyn sp_state_machine::Storage<HashFor<B>>>, HashFor<B>>;
 
 const DB_HASH_LEN: usize = 32;
 /// Hash type that this backend uses for the database.
@@ -131,11 +139,7 @@ pub struct RefTrackingState<Block: BlockT> {
 
 impl<B: BlockT> RefTrackingState<B> {
 	fn new(state: DbState<B>, storage: Arc<StorageDb<B>>, parent_hash: Option<B::Hash>) -> Self {
-		RefTrackingState {
-			state,
-			parent_hash,
-			storage,
-		}
+		RefTrackingState { state, parent_hash, storage }
 	}
 }
 
@@ -154,7 +158,7 @@ impl<Block: BlockT> std::fmt::Debug for RefTrackingState<Block> {
 }
 
 impl<B: BlockT> StateBackend<HashFor<B>> for RefTrackingState<B> {
-	type Error =  <DbState<B> as StateBackend<HashFor<B>>>::Error;
+	type Error = <DbState<B> as StateBackend<HashFor<B>>>::Error;
 	type Transaction = <DbState<B> as StateBackend<HashFor<B>>>::Transaction;
 	type TrieBackendStorage = <DbState<B> as StateBackend<HashFor<B>>>::TrieBackendStorage;
 
@@ -214,7 +218,8 @@ impl<B: BlockT> StateBackend<HashFor<B>> for RefTrackingState<B> {
 		f: F,
 		allow_missing: bool,
 	) -> Result<bool, Self::Error> {
-		self.state.apply_to_key_values_while(child_info, prefix, start_at, f, allow_missing)
+		self.state
+			.apply_to_key_values_while(child_info, prefix, start_at, f, allow_missing)
 	}
 
 	fn apply_to_keys_while<F: FnMut(&[u8]) -> bool>(
@@ -237,16 +242,22 @@ impl<B: BlockT> StateBackend<HashFor<B>> for RefTrackingState<B> {
 
 	fn storage_root<'a>(
 		&self,
-		delta: impl Iterator<Item=(&'a [u8], Option<&'a [u8]>)>,
-	) -> (B::Hash, Self::Transaction) where B::Hash: Ord {
+		delta: impl Iterator<Item = (&'a [u8], Option<&'a [u8]>)>,
+	) -> (B::Hash, Self::Transaction)
+	where
+		B::Hash: Ord,
+	{
 		self.state.storage_root(delta)
 	}
 
 	fn child_storage_root<'a>(
 		&self,
 		child_info: &ChildInfo,
-		delta: impl Iterator<Item=(&'a [u8], Option<&'a [u8]>)>,
-	) -> (B::Hash, bool, Self::Transaction) where B::Hash: Ord {
+		delta: impl Iterator<Item = (&'a [u8], Option<&'a [u8]>)>,
+	) -> (B::Hash, bool, Self::Transaction)
+	where
+		B::Hash: Ord,
+	{
 		self.state.child_storage_root(child_info, delta)
 	}
 
@@ -258,17 +269,13 @@ impl<B: BlockT> StateBackend<HashFor<B>> for RefTrackingState<B> {
 		self.state.keys(prefix)
 	}
 
-	fn child_keys(
-		&self,
-		child_info: &ChildInfo,
-		prefix: &[u8],
-	) -> Vec<Vec<u8>> {
+	fn child_keys(&self, child_info: &ChildInfo, prefix: &[u8]) -> Vec<Vec<u8>> {
 		self.state.child_keys(child_info, prefix)
 	}
 
-	fn as_trie_backend(&mut self)
-		-> Option<&sp_state_machine::TrieBackend<Self::TrieBackendStorage, HashFor<B>>>
-	{
+	fn as_trie_backend(
+		&mut self,
+	) -> Option<&sp_state_machine::TrieBackend<Self::TrieBackendStorage, HashFor<B>>> {
 		self.state.as_trie_backend()
 	}
 
@@ -432,7 +439,7 @@ pub struct BlockchainDb<Block: BlockT> {
 impl<Block: BlockT> BlockchainDb<Block> {
 	fn new(
 		db: Arc<dyn Database<DbHash>>,
-		transaction_storage: TransactionStorageMode
+		transaction_storage: TransactionStorageMode,
 	) -> ClientResult<Self> {
 		let meta = read_meta::<Block>(&*db, columns::HEADER)?;
 		let leaves = LeafSet::read_from_db(&*db, columns::META, meta_keys::LEAF_PREFIX)?;
@@ -446,10 +453,7 @@ impl<Block: BlockT> BlockchainDb<Block> {
 		})
 	}
 
-	fn update_meta(
-		&self,
-		update: MetaUpdate<Block>,
-	) {
+	fn update_meta(&self, update: MetaUpdate<Block>) {
 		let MetaUpdate { hash, number, is_best, is_finalized, with_state } = update;
 		let mut meta = self.meta.write();
 		if number.is_zero() {
@@ -473,10 +477,9 @@ impl<Block: BlockT> BlockchainDb<Block> {
 
 	// Get block changes trie root, if available.
 	fn changes_trie_root(&self, block: BlockId<Block>) -> ClientResult<Option<Block::Hash>> {
-		self.header(block)
-			.map(|header| header.and_then(|header|
-				header.digest().log(DigestItem::as_changes_trie_root)
-					.cloned()))
+		self.header(block).map(|header| {
+			header.and_then(|header| header.digest().log(DigestItem::as_changes_trie_root).cloned())
+		})
 	}
 }
 
@@ -486,15 +489,15 @@ impl<Block: BlockT> sc_client_api::blockchain::HeaderBackend<Block> for Blockcha
 			BlockId::Hash(h) => {
 				let mut cache = self.header_cache.lock();
 				if let Some(result) = cache.get_refresh(h) {
-					return Ok(result.clone());
+					return Ok(result.clone())
 				}
-				let header = utils::read_header(&*self.db, columns::KEY_LOOKUP, columns::HEADER, id)?;
+				let header =
+					utils::read_header(&*self.db, columns::KEY_LOOKUP, columns::HEADER, id)?;
 				cache_header(&mut cache, h.clone(), header.clone());
 				Ok(header)
-			}
-			BlockId::Number(_) => {
-				utils::read_header(&*self.db, columns::KEY_LOOKUP, columns::HEADER, id)
-			}
+			},
+			BlockId::Number(_) =>
+				utils::read_header(&*self.db, columns::KEY_LOOKUP, columns::HEADER, id),
 		}
 	}
 
@@ -527,10 +530,11 @@ impl<Block: BlockT> sc_client_api::blockchain::HeaderBackend<Block> for Blockcha
 	}
 
 	fn hash(&self, number: NumberFor<Block>) -> ClientResult<Option<Block::Hash>> {
-		self.header(BlockId::Number(number)).and_then(|maybe_header| match maybe_header {
-			Some(header) => Ok(Some(header.hash().clone())),
-			None => Ok(None),
-		})
+		self.header(BlockId::Number(number))
+			.and_then(|maybe_header| match maybe_header {
+				Some(header) => Ok(Some(header.hash().clone())),
+				None => Ok(None),
+			})
 	}
 }
 
@@ -543,40 +547,51 @@ impl<Block: BlockT> sc_client_api::blockchain::Backend<Block> for BlockchainDb<B
 		match self.transaction_storage {
 			TransactionStorageMode::BlockBody => match Decode::decode(&mut &body[..]) {
 				Ok(body) => Ok(Some(body)),
-				Err(err) => return Err(sp_blockchain::Error::Backend(
-					format!("Error decoding body: {}", err)
-				)),
+				Err(err) =>
+					return Err(sp_blockchain::Error::Backend(format!(
+						"Error decoding body: {}",
+						err
+					))),
 			},
 			TransactionStorageMode::StorageChain => {
 				match Vec::<ExtrinsicHeader>::decode(&mut &body[..]) {
 					Ok(index) => {
-						let extrinsics: ClientResult<Vec<Block::Extrinsic>> = index.into_iter().map(
-							| ExtrinsicHeader { indexed_hash, data } | {
+						let extrinsics: ClientResult<Vec<Block::Extrinsic>> = index
+							.into_iter()
+							.map(|ExtrinsicHeader { indexed_hash, data }| {
 								let decode_result = if indexed_hash != Default::default() {
 									match self.db.get(columns::TRANSACTION, indexed_hash.as_ref()) {
 										Some(t) => {
-											let mut input = utils::join_input(data.as_ref(), t.as_ref());
+											let mut input =
+												utils::join_input(data.as_ref(), t.as_ref());
 											Block::Extrinsic::decode(&mut input)
 										},
-										None => return Err(sp_blockchain::Error::Backend(
-											format!("Missing indexed transaction {:?}", indexed_hash))
-										)
+										None =>
+											return Err(sp_blockchain::Error::Backend(format!(
+												"Missing indexed transaction {:?}",
+												indexed_hash
+											))),
 									}
 								} else {
 									Block::Extrinsic::decode(&mut data.as_ref())
 								};
-								decode_result.map_err(|err| sp_blockchain::Error::Backend(
-									format!("Error decoding extrinsic: {}", err))
-								)
-							}
-						).collect();
+								decode_result.map_err(|err| {
+									sp_blockchain::Error::Backend(format!(
+										"Error decoding extrinsic: {}",
+										err
+									))
+								})
+							})
+							.collect();
 						Ok(Some(extrinsics?))
-					}
-					Err(err) => return Err(sp_blockchain::Error::Backend(
-						format!("Error decoding body list: {}", err)
-					)),
+					},
+					Err(err) =>
+						return Err(sp_blockchain::Error::Backend(format!(
+							"Error decoding body list: {}",
+							err
+						))),
 				}
-			}
+			},
 		}
 	}
 
@@ -584,10 +599,12 @@ impl<Block: BlockT> sc_client_api::blockchain::Backend<Block> for BlockchainDb<B
 		match read_db(&*self.db, columns::KEY_LOOKUP, columns::JUSTIFICATIONS, id)? {
 			Some(justifications) => match Decode::decode(&mut &justifications[..]) {
 				Ok(justifications) => Ok(Some(justifications)),
-				Err(err) => return Err(sp_blockchain::Error::Backend(
-					format!("Error decoding justifications: {}", err)
-				)),
-			}
+				Err(err) =>
+					return Err(sp_blockchain::Error::Backend(format!(
+						"Error decoding justifications: {}",
+						err
+					))),
+			},
 			None => Ok(None),
 		}
 	}
@@ -631,19 +648,23 @@ impl<Block: BlockT> sc_client_api::blockchain::Backend<Block> for BlockchainDb<B
 							if indexed_hash != Default::default() {
 								match self.db.get(columns::TRANSACTION, indexed_hash.as_ref()) {
 									Some(t) => transactions.push(t),
-									None => return Err(sp_blockchain::Error::Backend(
-										format!("Missing indexed transaction {:?}", indexed_hash))
-									)
+									None =>
+										return Err(sp_blockchain::Error::Backend(format!(
+											"Missing indexed transaction {:?}",
+											indexed_hash
+										))),
 								}
 							}
 						}
 						Ok(Some(transactions))
-					}
-					Err(err) => return Err(sp_blockchain::Error::Backend(
-							format!("Error decoding body list: {}", err)
-					)),
+					},
+					Err(err) =>
+						return Err(sp_blockchain::Error::Backend(format!(
+							"Error decoding body list: {}",
+							err
+						))),
 				}
-			}
+			},
 		}
 	}
 }
@@ -657,17 +678,25 @@ impl<Block: BlockT> sc_client_api::blockchain::ProvideCache<Block> for Blockchai
 impl<Block: BlockT> HeaderMetadata<Block> for BlockchainDb<Block> {
 	type Error = sp_blockchain::Error;
 
-	fn header_metadata(&self, hash: Block::Hash) -> Result<CachedHeaderMetadata<Block>, Self::Error> {
-		self.header_metadata_cache.header_metadata(hash).map_or_else(|| {
-			self.header(BlockId::hash(hash))?.map(|header| {
-				let header_metadata = CachedHeaderMetadata::from(&header);
-				self.header_metadata_cache.insert_header_metadata(
-					header_metadata.hash,
-					header_metadata.clone(),
-				);
-				header_metadata
-			}).ok_or_else(|| ClientError::UnknownBlock(format!("header not found in db: {}", hash)))
-		}, Ok)
+	fn header_metadata(
+		&self,
+		hash: Block::Hash,
+	) -> Result<CachedHeaderMetadata<Block>, Self::Error> {
+		self.header_metadata_cache.header_metadata(hash).map_or_else(
+			|| {
+				self.header(BlockId::hash(hash))?
+					.map(|header| {
+						let header_metadata = CachedHeaderMetadata::from(&header);
+						self.header_metadata_cache
+							.insert_header_metadata(header_metadata.hash, header_metadata.clone());
+						header_metadata
+					})
+					.ok_or_else(|| {
+						ClientError::UnknownBlock(format!("header not found in db: {}", hash))
+					})
+			},
+			Ok,
+		)
 	}
 
 	fn insert_header_metadata(&self, hash: Block::Hash, metadata: CachedHeaderMetadata<Block>) {
@@ -701,8 +730,11 @@ impl<Block: BlockT> ProvideChtRoots<Block> for BlockchainDb<Block> {
 		});
 
 		cht::compute_root::<Block::Header, HashFor<Block>, _>(
-			cht::size(), cht_number, cht_range.map(|num| self.hash(num))
-		).map(Some)
+			cht::size(),
+			cht_number,
+			cht_range.map(|num| self.hash(num)),
+		)
+		.map(Some)
 	}
 
 	fn changes_trie_cht_root(
@@ -728,7 +760,8 @@ impl<Block: BlockT> ProvideChtRoots<Block> for BlockchainDb<Block> {
 			cht::size(),
 			cht_number,
 			cht_range.map(|num| self.changes_trie_root(BlockId::Number(num))),
-		).map(Some)
+		)
+		.map(Some)
 	}
 }
 
@@ -759,8 +792,7 @@ impl<Block: BlockT> BlockImportOperation<Block> {
 			match value_operation {
 				OffchainOverlayedChange::SetValue(val) =>
 					transaction.set_from_vec(columns::OFFCHAIN, &key, val),
-				OffchainOverlayedChange::Remove =>
-					transaction.remove(columns::OFFCHAIN, &key),
+				OffchainOverlayedChange::Remove => transaction.remove(columns::OFFCHAIN, &key),
 			}
 		}
 
@@ -778,18 +810,17 @@ impl<Block: BlockT> BlockImportOperation<Block> {
 		}
 	}
 
-	fn apply_new_state(
-		&mut self,
-		storage: Storage,
-	) -> ClientResult<Block::Hash> {
+	fn apply_new_state(&mut self, storage: Storage) -> ClientResult<Block::Hash> {
 		if storage.top.keys().any(|k| well_known_keys::is_child_storage_key(&k)) {
-			return Err(sp_blockchain::Error::InvalidState.into());
+			return Err(sp_blockchain::Error::InvalidState.into())
 		}
 
-		let child_delta = storage.children_default.iter().map(|(_storage_key, child_content)|(
+		let child_delta = storage.children_default.iter().map(|(_storage_key, child_content)| {
+			(
 				&child_content.child_info,
 				child_content.data.iter().map(|(k, v)| (&k[..], Some(&v[..]))),
-		));
+			)
+		});
 
 		let mut changes_trie_config = None;
 		let (root, transaction) = self.old_state.full_storage_root(
@@ -799,7 +830,7 @@ impl<Block: BlockT> BlockImportOperation<Block> {
 				}
 				(&k[..], Some(&v[..]))
 			}),
-			child_delta
+			child_delta,
 		);
 
 		let changes_trie_config = match changes_trie_config {
@@ -812,10 +843,11 @@ impl<Block: BlockT> BlockImportOperation<Block> {
 		self.changes_trie_config_update = Some(changes_trie_config);
 		Ok(root)
 	}
-
 }
 
-impl<Block: BlockT> sc_client_api::backend::BlockImportOperation<Block> for BlockImportOperation<Block> {
+impl<Block: BlockT> sc_client_api::backend::BlockImportOperation<Block>
+	for BlockImportOperation<Block>
+{
 	type State = SyncingCachingState<RefTrackingState<Block>, Block>;
 
 	fn state(&self) -> ClientResult<Option<&Self::State>> {
@@ -831,16 +863,13 @@ impl<Block: BlockT> sc_client_api::backend::BlockImportOperation<Block> for Bloc
 		leaf_state: NewBlockState,
 	) -> ClientResult<()> {
 		assert!(self.pending_block.is_none(), "Only one block per operation is allowed");
-		if let Some(changes_trie_config_update) = changes_tries_storage::extract_new_configuration(&header) {
+		if let Some(changes_trie_config_update) =
+			changes_tries_storage::extract_new_configuration(&header)
+		{
 			self.changes_trie_config_update = Some(changes_trie_config_update.clone());
 		}
-		self.pending_block = Some(PendingBlock {
-			header,
-			body,
-			indexed_body,
-			justifications,
-			leaf_state,
-		});
+		self.pending_block =
+			Some(PendingBlock { header, body, indexed_body, justifications, leaf_state });
 		Ok(())
 	}
 
@@ -853,20 +882,13 @@ impl<Block: BlockT> sc_client_api::backend::BlockImportOperation<Block> for Bloc
 		Ok(())
 	}
 
-	fn reset_storage(
-		&mut self,
-		storage: Storage,
-	) -> ClientResult<Block::Hash> {
+	fn reset_storage(&mut self, storage: Storage) -> ClientResult<Block::Hash> {
 		let root = self.apply_new_state(storage)?;
 		self.commit_state = true;
 		Ok(root)
 	}
 
-	fn set_genesis_state(
-		&mut self,
-		storage: Storage,
-		commit: bool,
-	) -> ClientResult<Block::Hash> {
+	fn set_genesis_state(&mut self, storage: Storage, commit: bool) -> ClientResult<Block::Hash> {
 		let root = self.apply_new_state(storage)?;
 		self.commit_state = commit;
 		Ok(root)
@@ -882,7 +904,8 @@ impl<Block: BlockT> sc_client_api::backend::BlockImportOperation<Block> for Bloc
 	}
 
 	fn insert_aux<I>(&mut self, ops: I) -> ClientResult<()>
-		where I: IntoIterator<Item=(Vec<u8>, Option<Vec<u8>>)>
+	where
+		I: IntoIterator<Item = (Vec<u8>, Option<Vec<u8>>)>,
 	{
 		self.aux_ops.append(&mut ops.into_iter().collect());
 		Ok(())
@@ -961,10 +984,7 @@ struct DbGenesisStorage<Block: BlockT> {
 
 impl<Block: BlockT> DbGenesisStorage<Block> {
 	pub fn new(root: Block::Hash, storage: PrefixedMemoryDB<HashFor<Block>>) -> Self {
-		DbGenesisStorage {
-			root,
-			storage,
-		}
+		DbGenesisStorage { root, storage }
 	}
 }
 
@@ -1012,13 +1032,13 @@ pub(crate) struct FrozenForDuration<T: Clone> {
 
 impl<T: Clone> FrozenForDuration<T> {
 	fn new(duration: std::time::Duration) -> Self {
-		Self {
-			duration,
-			value: Frozen { at: std::time::Instant::now(), value: None }.into(),
-		}
+		Self { duration, value: Frozen { at: std::time::Instant::now(), value: None }.into() }
 	}
 
-	fn take_or_else<F>(&self, f: F) -> T where F: FnOnce() -> T {
+	fn take_or_else<F>(&self, f: F) -> T
+	where
+		F: FnOnce() -> T,
+	{
 		let mut lock = self.value.lock();
 		if lock.at.elapsed() > self.duration || lock.value.is_none() {
 			let new_value = f();
@@ -1104,7 +1124,8 @@ impl<Block: BlockT> Backend<Block> {
 			config.state_pruning.clone(),
 			!config.source.supports_ref_counting(),
 			&StateMetaDb(&*db),
-		).map_err(map_e)?;
+		)
+		.map_err(map_e)?;
 		let storage_db = StorageDb {
 			db: db.clone(),
 			state_db,
@@ -1120,11 +1141,7 @@ impl<Block: BlockT> Backend<Block> {
 			columns::HEADER,
 			columns::CACHE,
 			meta,
-			if is_archive_pruning {
-				None
-			} else {
-				Some(MIN_BLOCKS_TO_KEEP_CHANGES_TRIES_FOR)
-			},
+			if is_archive_pruning { None } else { Some(MIN_BLOCKS_TO_KEEP_CHANGES_TRIES_FOR) },
 		)?;
 
 		let backend = Backend {
@@ -1148,10 +1165,13 @@ impl<Block: BlockT> Backend<Block> {
 
 		// Older DB versions have no last state key. Check if the state is available and set it.
 		let info = backend.blockchain.info();
-		if info.finalized_state.is_none()
-			&& info.finalized_hash != Default::default()
-			&& sc_client_api::Backend::have_state_at(&backend, &info.finalized_hash, info.finalized_number)
-		{
+		if info.finalized_state.is_none() &&
+			info.finalized_hash != Default::default() &&
+			sc_client_api::Backend::have_state_at(
+				&backend,
+				&info.finalized_hash,
+				info.finalized_number,
+			) {
 			backend.blockchain.update_meta(MetaUpdate {
 				hash: info.finalized_hash,
 				number: info.finalized_number,
@@ -1183,11 +1203,7 @@ impl<Block: BlockT> Backend<Block> {
 
 		// cannot find tree route with empty DB.
 		if meta.best_hash != Default::default() {
-			let tree_route = sp_blockchain::tree_route(
-				&self.blockchain,
-				meta.best_hash,
-				route_to,
-			)?;
+			let tree_route = sp_blockchain::tree_route(&self.blockchain, meta.best_hash, route_to)?;
 
 			// uncanonicalize: check safety violations and ensure the numbers no longer
 			// point to these block hashes in the key mapping.
@@ -1198,15 +1214,11 @@ impl<Block: BlockT> Backend<Block> {
 						(&r.number, &r.hash)
 					);
 
-					return Err(::sp_blockchain::Error::NotInFinalizedChain.into());
+					return Err(::sp_blockchain::Error::NotInFinalizedChain.into())
 				}
 
 				retracted.push(r.hash.clone());
-				utils::remove_number_to_key_mapping(
-					transaction,
-					columns::KEY_LOOKUP,
-					r.number
-				)?;
+				utils::remove_number_to_key_mapping(transaction, columns::KEY_LOOKUP, r.number)?;
 			}
 
 			// canonicalize: set the number lookup to map to this block's hash.
@@ -1216,7 +1228,7 @@ impl<Block: BlockT> Backend<Block> {
 					transaction,
 					columns::KEY_LOOKUP,
 					e.number,
-					e.hash
+					e.hash,
 				)?;
 			}
 		}
@@ -1238,11 +1250,15 @@ impl<Block: BlockT> Backend<Block> {
 		header: &Block::Header,
 		last_finalized: Option<Block::Hash>,
 	) -> ClientResult<()> {
-		let last_finalized = last_finalized.unwrap_or_else(|| self.blockchain.meta.read().finalized_hash);
+		let last_finalized =
+			last_finalized.unwrap_or_else(|| self.blockchain.meta.read().finalized_hash);
 		if *header.parent_hash() != last_finalized {
-			return Err(::sp_blockchain::Error::NonSequentialFinalization(
-				format!("Last finalized {:?} not parent of {:?}", last_finalized, header.hash()),
-			).into());
+			return Err(::sp_blockchain::Error::NonSequentialFinalization(format!(
+				"Last finalized {:?} not parent of {:?}",
+				last_finalized,
+				header.hash()
+			))
+			.into())
 		}
 		Ok(())
 	}
@@ -1279,13 +1295,7 @@ impl<Block: BlockT> Backend<Block> {
 				Justifications::from(justification).encode(),
 			);
 		}
-		Ok(MetaUpdate {
-			hash: *hash,
-			number,
-			is_best: false,
-			is_finalized: true,
-			with_state,
-		})
+		Ok(MetaUpdate { hash: *hash, number, is_best: false, is_finalized: true, with_state })
 	}
 
 	// performs forced canonicalization with a delay after importing a non-finalized block.
@@ -1294,9 +1304,7 @@ impl<Block: BlockT> Backend<Block> {
 		transaction: &mut Transaction<DbHash>,
 		hash: Block::Hash,
 		number: NumberFor<Block>,
-	)
-		-> ClientResult<()>
-	{
+	) -> ClientResult<()> {
 		let number_u64 = number.saturated_into::<u64>();
 		if number_u64 > self.canonicalization_delay {
 			let new_canonical = number_u64 - self.canonicalization_delay;
@@ -1310,29 +1318,28 @@ impl<Block: BlockT> Backend<Block> {
 				sc_client_api::blockchain::HeaderBackend::hash(
 					&self.blockchain,
 					new_canonical.saturated_into(),
-				)?.ok_or_else(|| sp_blockchain::Error::Backend(format!(
-					"Can't canonicalize missing block number #{} when importing {:?} (#{})",
-					new_canonical,
-					hash,
-					number,
-				)))?
+				)?
+				.ok_or_else(|| {
+					sp_blockchain::Error::Backend(format!(
+						"Can't canonicalize missing block number #{} when importing {:?} (#{})",
+						new_canonical, hash, number,
+					))
+				})?
 			};
 			if !sc_client_api::Backend::have_state_at(self, &hash, new_canonical.saturated_into()) {
 				return Ok(())
 			}
 
 			trace!(target: "db", "Canonicalize block #{} ({:?})", new_canonical, hash);
-			let commit = self.storage.state_db.canonicalize_block(&hash)
-				.map_err(|e: sc_state_db::Error<io::Error>| sp_blockchain::Error::from_state_db(e))?;
+			let commit = self.storage.state_db.canonicalize_block(&hash).map_err(
+				|e: sc_state_db::Error<io::Error>| sp_blockchain::Error::from_state_db(e),
+			)?;
 			apply_state_commit(transaction, commit);
 		}
 		Ok(())
 	}
 
-	fn try_commit_operation(
-		&self,
-		mut operation: BlockImportOperation<Block>,
-	) -> ClientResult<()> {
+	fn try_commit_operation(&self, mut operation: BlockImportOperation<Block>) -> ClientResult<()> {
 		let mut transaction = Transaction::new();
 		let mut finalization_displaced_leaves = None;
 
@@ -1362,12 +1369,12 @@ impl<Block: BlockT> Backend<Block> {
 		}
 
 		let imported = if let Some(pending_block) = operation.pending_block {
-
 			let hash = pending_block.header.hash();
 
 			let parent_hash = *pending_block.header.parent_hash();
 			let number = pending_block.header.number().clone();
-			let existing_header = number <= best_num && self.blockchain.header(BlockId::hash(hash))?.is_some();
+			let existing_header =
+				number <= best_num && self.blockchain.header(BlockId::hash(hash))?.is_some();
 
 			// blocks are keyed by number + hash.
 			let lookup_key = utils::number_and_hash_to_lookup_key(number, hash)?;
@@ -1378,12 +1385,7 @@ impl<Block: BlockT> Backend<Block> {
 				(Default::default(), Default::default())
 			};
 
-			utils::insert_hash_to_key_mapping(
-				&mut transaction,
-				columns::KEY_LOOKUP,
-				number,
-				hash,
-			)?;
+			utils::insert_hash_to_key_mapping(&mut transaction, columns::KEY_LOOKUP, number, hash)?;
 
 			transaction.set_from_vec(columns::HEADER, &lookup_key, pending_block.header.encode());
 			if let Some(body) = pending_block.body {
@@ -1392,7 +1394,8 @@ impl<Block: BlockT> Backend<Block> {
 						transaction.set_from_vec(columns::BODY, &lookup_key, body.encode());
 					},
 					TransactionStorageMode::StorageChain => {
-						let body = apply_index_ops::<Block>(&mut transaction, body, operation.index_ops);
+						let body =
+							apply_index_ops::<Block>(&mut transaction, body, operation.index_ops);
 						transaction.set_from_vec(columns::BODY, &lookup_key, body);
 					},
 				}
@@ -1408,11 +1411,19 @@ impl<Block: BlockT> Backend<Block> {
 				}
 			}
 			if let Some(justifications) = pending_block.justifications {
-				transaction.set_from_vec(columns::JUSTIFICATIONS, &lookup_key, justifications.encode());
+				transaction.set_from_vec(
+					columns::JUSTIFICATIONS,
+					&lookup_key,
+					justifications.encode(),
+				);
 			}
 
 			if number.is_zero() {
-				transaction.set_from_vec(columns::META, meta_keys::FINALIZED_BLOCK, lookup_key.clone());
+				transaction.set_from_vec(
+					columns::META,
+					meta_keys::FINALIZED_BLOCK,
+					lookup_key.clone(),
+				);
 				transaction.set(columns::META, meta_keys::GENESIS_HASH, hash.as_ref());
 
 				// for tests, because config is set from within the reset_storage
@@ -1427,13 +1438,14 @@ impl<Block: BlockT> Backend<Block> {
 					// to bootstrap consensus. It is queried for an initial list of authorities, etc.
 					*self.genesis_state.write() = Some(Arc::new(DbGenesisStorage::new(
 						pending_block.header.state_root().clone(),
-						operation.db_updates.clone()
+						operation.db_updates.clone(),
 					)));
 				}
 			}
 
 			let finalized = if operation.commit_state {
-				let mut changeset: sc_state_db::ChangeSet<Vec<u8>> = sc_state_db::ChangeSet::default();
+				let mut changeset: sc_state_db::ChangeSet<Vec<u8>> =
+					sc_state_db::ChangeSet::default();
 				let mut ops: u64 = 0;
 				let mut bytes: u64 = 0;
 				let mut removal: u64 = 0;
@@ -1441,7 +1453,7 @@ impl<Block: BlockT> Backend<Block> {
 				for (mut key, (val, rc)) in operation.db_updates.drain() {
 					if !self.storage.prefix_keys {
 						// Strip prefix
-						key.drain(0 .. key.len() - DB_HASH_LEN);
+						key.drain(0..key.len() - DB_HASH_LEN);
 					};
 					if rc > 0 {
 						ops += 1;
@@ -1450,7 +1462,7 @@ impl<Block: BlockT> Backend<Block> {
 							changeset.inserted.push((key, val.to_vec()));
 						} else {
 							changeset.inserted.push((key.clone(), val.to_vec()));
-							for _ in 0 .. rc - 1 {
+							for _ in 0..rc - 1 {
 								changeset.inserted.push((key.clone(), Default::default()));
 							}
 						}
@@ -1460,7 +1472,7 @@ impl<Block: BlockT> Backend<Block> {
 						if rc == -1 {
 							changeset.deleted.push(key);
 						} else {
-							for _ in 0 .. -rc {
+							for _ in 0..-rc {
 								changeset.deleted.push(key.clone());
 							}
 						}
@@ -1471,27 +1483,32 @@ impl<Block: BlockT> Backend<Block> {
 
 				let mut ops: u64 = 0;
 				let mut bytes: u64 = 0;
-				for (key, value) in operation.storage_updates.iter()
-					.chain(operation.child_storage_updates.iter().flat_map(|(_, s)| s.iter())) {
-						ops += 1;
-						bytes += key.len() as u64;
-						if let Some(v) = value.as_ref() {
-							bytes += v.len() as u64;
-						}
+				for (key, value) in operation
+					.storage_updates
+					.iter()
+					.chain(operation.child_storage_updates.iter().flat_map(|(_, s)| s.iter()))
+				{
+					ops += 1;
+					bytes += key.len() as u64;
+					if let Some(v) = value.as_ref() {
+						bytes += v.len() as u64;
+					}
 				}
 				self.state_usage.tally_writes(ops, bytes);
 				let number_u64 = number.saturated_into::<u64>();
-				let commit = self.storage.state_db.insert_block(
-					&hash,
-					number_u64,
-					&pending_block.header.parent_hash(),
-					changeset,
-				).map_err(|e: sc_state_db::Error<io::Error>| sp_blockchain::Error::from_state_db(e))?;
+				let commit = self
+					.storage
+					.state_db
+					.insert_block(&hash, number_u64, &pending_block.header.parent_hash(), changeset)
+					.map_err(|e: sc_state_db::Error<io::Error>| {
+						sp_blockchain::Error::from_state_db(e)
+					})?;
 				apply_state_commit(&mut transaction, commit);
 				if number <= last_finalized_num {
 					// Canonicalize in the db when re-importing existing blocks with state.
-					let commit = self.storage.state_db.canonicalize_block(&hash)
-						.map_err(|e: sc_state_db::Error<io::Error>| sp_blockchain::Error::from_state_db(e))?;
+					let commit = self.storage.state_db.canonicalize_block(&hash).map_err(
+						|e: sc_state_db::Error<io::Error>| sp_blockchain::Error::from_state_db(e),
+					)?;
 					apply_state_commit(&mut transaction, commit);
 					meta_updates.push(MetaUpdate {
 						hash,
@@ -1502,7 +1519,6 @@ impl<Block: BlockT> Backend<Block> {
 					});
 				}
 
-
 				// Check if need to finalize. Genesis is always finalized instantly.
 				let finalized = number_u64 == 0 || pending_block.leaf_state.is_final();
 				finalized
@@ -1555,11 +1571,14 @@ impl<Block: BlockT> Backend<Block> {
 					self.force_delayed_canonicalize(&mut transaction, hash, *header.number())?
 				}
 
-
 				let displaced_leaf = {
 					let mut leaves = self.blockchain.leaves.write();
 					let displaced_leaf = leaves.import(hash, number, parent_hash);
-					leaves.prepare_transaction(&mut transaction, columns::META, meta_keys::LEAF_PREFIX);
+					leaves.prepare_transaction(
+						&mut transaction,
+						columns::META,
+						meta_keys::LEAF_PREFIX,
+					);
 
 					displaced_leaf
 				};
@@ -1589,7 +1608,16 @@ impl<Block: BlockT> Backend<Block> {
 					with_state: operation.commit_state,
 				});
 
-				Some((pending_block.header, number, hash, enacted, retracted, displaced_leaf, is_best, cache))
+				Some((
+					pending_block.header,
+					number,
+					hash,
+					enacted,
+					retracted,
+					displaced_leaf,
+					is_best,
+					cache,
+				))
 			} else {
 				None
 			}
@@ -1598,14 +1626,16 @@ impl<Block: BlockT> Backend<Block> {
 		};
 
 		let cache_update = if let Some(set_head) = operation.set_head {
-			if let Some(header) = sc_client_api::blockchain::HeaderBackend::header(&self.blockchain, set_head)? {
+			if let Some(header) =
+				sc_client_api::blockchain::HeaderBackend::header(&self.blockchain, set_head)?
+			{
 				let number = header.number();
 				let hash = header.hash();
 
 				let (enacted, retracted) = self.set_head_with_transaction(
 					&mut transaction,
 					hash.clone(),
-					(number.clone(), hash.clone())
+					(number.clone(), hash.clone()),
 				)?;
 				meta_updates.push(MetaUpdate {
 					hash,
@@ -1616,7 +1646,10 @@ impl<Block: BlockT> Backend<Block> {
 				});
 				Some((enacted, retracted))
 			} else {
-				return Err(sp_blockchain::Error::UnknownBlock(format!("Cannot set head {:?}", set_head)))
+				return Err(sp_blockchain::Error::UnknownBlock(format!(
+					"Cannot set head {:?}",
+					set_head
+				)))
 			}
 		} else {
 			None
@@ -1636,13 +1669,11 @@ impl<Block: BlockT> Backend<Block> {
 			_displaced_leaf,
 			is_best,
 			mut cache,
-		)) = imported {
+		)) = imported
+		{
 			trace!(target: "db", "DB Commit done {:?}", hash);
 			let header_metadata = CachedHeaderMetadata::from(&header);
-			self.blockchain.insert_header_metadata(
-				header_metadata.hash,
-				header_metadata,
-			);
+			self.blockchain.insert_header_metadata(header_metadata.hash, header_metadata);
 			cache_header(&mut self.blockchain.header_cache.lock(), hash, Some(header));
 			cache.sync_cache(
 				&enacted,
@@ -1693,10 +1724,15 @@ impl<Block: BlockT> Backend<Block> {
 		transaction.set_from_vec(columns::META, meta_keys::FINALIZED_BLOCK, lookup_key);
 
 		if sc_client_api::Backend::have_state_at(self, &f_hash, f_num) &&
-			self.storage.state_db.best_canonical().map(|c| f_num.saturated_into::<u64>() > c).unwrap_or(true)
+			self.storage
+				.state_db
+				.best_canonical()
+				.map(|c| f_num.saturated_into::<u64>() > c)
+				.unwrap_or(true)
 		{
-			let commit = self.storage.state_db.canonicalize_block(&f_hash)
-				.map_err(|e: sc_state_db::Error<io::Error>| sp_blockchain::Error::from_state_db(e))?;
+			let commit = self.storage.state_db.canonicalize_block(&f_hash).map_err(
+				|e: sc_state_db::Error<io::Error>| sp_blockchain::Error::from_state_db(e),
+			)?;
 			apply_state_commit(transaction, commit);
 		}
 
@@ -1779,23 +1815,21 @@ impl<Block: BlockT> Backend<Block> {
 					TransactionStorageMode::BlockBody => {},
 					TransactionStorageMode::StorageChain => {
 						match Vec::<ExtrinsicHeader>::decode(&mut &body[..]) {
-							Ok(body) => {
+							Ok(body) =>
 								for ExtrinsicHeader { indexed_hash, .. } in body {
 									if indexed_hash != Default::default() {
-										transaction.release(
-											columns::TRANSACTION,
-											indexed_hash,
-										);
+										transaction.release(columns::TRANSACTION, indexed_hash);
 									}
-								}
-							}
-							Err(err) => return Err(sp_blockchain::Error::Backend(
-									format!("Error decoding body list: {}", err)
-							)),
+								},
+							Err(err) =>
+								return Err(sp_blockchain::Error::Backend(format!(
+									"Error decoding body list: {}",
+									err
+								))),
 						}
-					}
+					},
 				}
-			}
+			},
 			None => return Ok(()),
 		}
 		Ok(())
@@ -1805,22 +1839,20 @@ impl<Block: BlockT> Backend<Block> {
 		let root = EmptyStorage::<Block>::new().0; // Empty trie
 		let db_state = DbState::<Block>::new(self.storage.clone(), root);
 		let state = RefTrackingState::new(db_state, self.storage.clone(), None);
-		let caching_state = CachingState::new(
-			state,
-			self.shared_cache.clone(),
-			None,
-		);
+		let caching_state = CachingState::new(state, self.shared_cache.clone(), None);
 		Ok(SyncingCachingState::new(
-				caching_state,
-				self.state_usage.clone(),
-				self.blockchain.meta.clone(),
-				self.import_lock.clone(),
+			caching_state,
+			self.state_usage.clone(),
+			self.blockchain.meta.clone(),
+			self.import_lock.clone(),
 		))
 	}
 }
 
-
-fn apply_state_commit(transaction: &mut Transaction<DbHash>, commit: sc_state_db::CommitSet<Vec<u8>>) {
+fn apply_state_commit(
+	transaction: &mut Transaction<DbHash>,
+	commit: sc_state_db::CommitSet<Vec<u8>>,
+) {
 	for (key, val) in commit.data.inserted.into_iter() {
 		transaction.set_from_vec(columns::STATE, &key[..], val);
 	}
@@ -1847,10 +1879,10 @@ fn apply_index_ops<Block: BlockT>(
 		match op {
 			IndexOperation::Insert { extrinsic, hash, size } => {
 				index_map.insert(extrinsic, (hash, size));
-			}
+			},
 			IndexOperation::Renew { extrinsic, hash } => {
 				renewed_map.insert(extrinsic, DbHash::from_slice(hash.as_ref()));
-			}
+			},
 		}
 	}
 	for (index, extrinsic) in body.into_iter().enumerate() {
@@ -1858,10 +1890,7 @@ fn apply_index_ops<Block: BlockT>(
 		let extrinsic_header = if let Some(hash) = renewed_map.get(&(index as u32)) {
 			// Bump ref counter
 			transaction.reference(columns::TRANSACTION, DbHash::from_slice(hash.as_ref()));
-			ExtrinsicHeader {
-				indexed_hash: hash.clone(),
-				data: extrinsic,
-			}
+			ExtrinsicHeader { indexed_hash: hash.clone(), data: extrinsic }
 		} else {
 			match index_map.get(&(index as u32)) {
 				Some((hash, size)) if *size as usize <= extrinsic.len() => {
@@ -1876,12 +1905,7 @@ fn apply_index_ops<Block: BlockT>(
 						data: extrinsic[..offset].to_vec(),
 					}
 				},
-				_ => {
-					ExtrinsicHeader {
-						indexed_hash: Default::default(),
-						data: extrinsic,
-					}
-				}
+				_ => ExtrinsicHeader { indexed_hash: Default::default(), data: extrinsic },
 			}
 		};
 		extrinsic_headers.push(extrinsic_header);
@@ -1895,28 +1919,28 @@ fn apply_index_ops<Block: BlockT>(
 	extrinsic_headers.encode()
 }
 
-fn apply_indexed_body<Block: BlockT>(
-	transaction: &mut Transaction<DbHash>,
-	body: Vec<Vec<u8>>,
-) {
+fn apply_indexed_body<Block: BlockT>(transaction: &mut Transaction<DbHash>, body: Vec<Vec<u8>>) {
 	for extrinsic in body {
 		let hash = sp_runtime::traits::BlakeTwo256::hash(&extrinsic);
-		transaction.store(
-			columns::TRANSACTION,
-			DbHash::from_slice(hash.as_ref()),
-			extrinsic,
-		);
+		transaction.store(columns::TRANSACTION, DbHash::from_slice(hash.as_ref()), extrinsic);
 	}
 }
 
-impl<Block> sc_client_api::backend::AuxStore for Backend<Block> where Block: BlockT {
+impl<Block> sc_client_api::backend::AuxStore for Backend<Block>
+where
+	Block: BlockT,
+{
 	fn insert_aux<
 		'a,
 		'b: 'a,
 		'c: 'a,
-		I: IntoIterator<Item=&'a(&'c [u8], &'c [u8])>,
-		D: IntoIterator<Item=&'a &'b [u8]>,
-	>(&self, insert: I, delete: D) -> ClientResult<()> {
+		I: IntoIterator<Item = &'a (&'c [u8], &'c [u8])>,
+		D: IntoIterator<Item = &'a &'b [u8]>,
+	>(
+		&self,
+		insert: I,
+		delete: D,
+	) -> ClientResult<()> {
 		let mut transaction = Transaction::new();
 		for (k, v) in insert {
 			transaction.set(columns::AUX, k, v);
@@ -1977,10 +2001,7 @@ impl<Block: BlockT> sc_client_api::backend::Backend<Block> for Backend<Block> {
 		Ok(())
 	}
 
-	fn commit_operation(
-		&self,
-		operation: Self::BlockImportOperation,
-	) -> ClientResult<()> {
+	fn commit_operation(&self, operation: Self::BlockImportOperation) -> ClientResult<()> {
 		let usage = operation.old_state.usage_info();
 		self.state_usage.merge_sm(usage);
 
@@ -1992,7 +2013,7 @@ impl<Block: BlockT> sc_client_api::backend::Backend<Block> for Backend<Block> {
 			e @ Err(_) => {
 				self.storage.state_db.revert_pending();
 				e
-			}
+			},
 		}
 	}
 
@@ -2037,23 +2058,22 @@ impl<Block: BlockT> sc_client_api::backend::Backend<Block> for Backend<Block> {
 		let last_finalized = self.blockchain.last_finalized()?;
 
 		// We can do a quick check first, before doing a proper but more expensive check
-		if number > self.blockchain.info().finalized_number
-			|| (hash != last_finalized && !is_descendent_of(&hash, &last_finalized)?)
+		if number > self.blockchain.info().finalized_number ||
+			(hash != last_finalized && !is_descendent_of(&hash, &last_finalized)?)
 		{
-			return Err(ClientError::NotInFinalizedChain);
+			return Err(ClientError::NotInFinalizedChain)
 		}
 
-		let justifications =
-			if let Some(mut stored_justifications) = self.blockchain.justifications(block)? {
-				if !stored_justifications.append(justification) {
-					return Err(ClientError::BadJustification(
-						"Duplicate consensus engine ID".into()
-					));
-				}
-				stored_justifications
-			} else {
-				Justifications::from(justification)
-			};
+		let justifications = if let Some(mut stored_justifications) =
+			self.blockchain.justifications(block)?
+		{
+			if !stored_justifications.append(justification) {
+				return Err(ClientError::BadJustification("Duplicate consensus engine ID".into()))
+			}
+			stored_justifications
+		} else {
+			Justifications::from(justification)
+		};
 
 		transaction.set_from_vec(
 			columns::JUSTIFICATIONS,
@@ -2075,25 +2095,20 @@ impl<Block: BlockT> sc_client_api::backend::Backend<Block> for Backend<Block> {
 	}
 
 	fn usage_info(&self) -> Option<UsageInfo> {
-		let (io_stats, state_stats) = self.io_stats.take_or_else(||
+		let (io_stats, state_stats) = self.io_stats.take_or_else(|| {
 			(
 				// TODO: implement DB stats and cache size retrieval
 				kvdb::IoStats::empty(),
 				self.state_usage.take(),
 			)
-		);
+		});
 		let database_cache = MemorySize::from_bytes(0);
-		let state_cache = MemorySize::from_bytes(
-			(*&self.shared_cache).read().used_storage_cache_size(),
-		);
+		let state_cache =
+			MemorySize::from_bytes((*&self.shared_cache).read().used_storage_cache_size());
 		let state_db = self.storage.state_db.memory_info();
 
 		Some(UsageInfo {
-			memory: MemoryInfo {
-				state_cache,
-				database_cache,
-				state_db,
-			},
+			memory: MemoryInfo { state_cache, database_cache, state_db },
 			io: IoInfo {
 				transactions: io_stats.transactions,
 				bytes_read: io_stats.bytes_read,
@@ -2123,29 +2138,31 @@ impl<Block: BlockT> sc_client_api::backend::Backend<Block> for Backend<Block> {
 		let finalized = self.blockchain.info().finalized_number;
 
 		let revertible = best_number - finalized;
-		let n = if !revert_finalized && revertible < n {
-			revertible
-		} else {
-			n
-		};
+		let n = if !revert_finalized && revertible < n { revertible } else { n };
 
 		let mut revert_blocks = || -> ClientResult<NumberFor<Block>> {
-			for c in 0 .. n.saturated_into::<u64>() {
+			for c in 0..n.saturated_into::<u64>() {
 				if best_number.is_zero() {
 					return Ok(c.saturated_into::<NumberFor<Block>>())
 				}
 				let mut transaction = Transaction::new();
 				let removed_number = best_number;
-				let removed = self.blockchain.header(BlockId::Number(best_number))?.ok_or_else(
-					|| sp_blockchain::Error::UnknownBlock(
-						format!("Error reverting to {}. Block hash not found.", best_number)))?;
+				let removed =
+					self.blockchain.header(BlockId::Number(best_number))?.ok_or_else(|| {
+						sp_blockchain::Error::UnknownBlock(format!(
+							"Error reverting to {}. Block hash not found.",
+							best_number
+						))
+					})?;
 				let removed_hash = removed.hash();
 
 				let prev_number = best_number.saturating_sub(One::one());
-				let prev_hash = self.blockchain.hash(prev_number)?.ok_or_else(
-					|| sp_blockchain::Error::UnknownBlock(
-						format!("Error reverting to {}. Block hash not found.", best_number))
-				)?;
+				let prev_hash = self.blockchain.hash(prev_number)?.ok_or_else(|| {
+					sp_blockchain::Error::UnknownBlock(format!(
+						"Error reverting to {}. Block hash not found.",
+						best_number
+					))
+				})?;
 
 				if !self.have_state_at(&prev_hash, prev_number) {
 					return Ok(c.saturated_into::<NumberFor<Block>>())
@@ -2160,41 +2177,49 @@ impl<Block: BlockT> sc_client_api::backend::Backend<Block> for Backend<Block> {
 
 						let update_finalized = best_number < finalized;
 
-						let key = utils::number_and_hash_to_lookup_key(best_number.clone(), &best_hash)?;
+						let key =
+							utils::number_and_hash_to_lookup_key(best_number.clone(), &best_hash)?;
 						let changes_trie_cache_ops = self.changes_tries_storage.revert(
 							&mut transaction,
-							&cache::ComplexBlockId::new(
-								removed.hash(),
-								removed_number,
-							),
+							&cache::ComplexBlockId::new(removed.hash(), removed_number),
 						)?;
 						if update_finalized {
 							transaction.set_from_vec(
 								columns::META,
 								meta_keys::FINALIZED_BLOCK,
-								key.clone()
+								key.clone(),
 							);
 
 							reverted_finalized.insert(removed_hash);
 							if let Some((hash, _)) = self.blockchain.info().finalized_state {
 								if hash == best_hash {
-									if !best_number.is_zero()
-										&& self.have_state_at(&prev_hash, best_number - One::one())
+									if !best_number.is_zero() &&
+										self.have_state_at(&prev_hash, best_number - One::one())
 									{
 										let lookup_key = utils::number_and_hash_to_lookup_key(
 											best_number - One::one(),
-											prev_hash
+											prev_hash,
 										)?;
-										transaction.set_from_vec(columns::META, meta_keys::FINALIZED_STATE, lookup_key);
+										transaction.set_from_vec(
+											columns::META,
+											meta_keys::FINALIZED_STATE,
+											lookup_key,
+										);
 									} else {
-										transaction.remove(columns::META, meta_keys::FINALIZED_STATE);
+										transaction
+											.remove(columns::META, meta_keys::FINALIZED_STATE);
 									}
 								}
 							}
 						}
 						transaction.set_from_vec(columns::META, meta_keys::BEST_BLOCK, key);
 						transaction.remove(columns::KEY_LOOKUP, removed.hash().as_ref());
-						children::remove_children(&mut transaction, columns::META, meta_keys::CHILDREN_PREFIX, best_hash);
+						children::remove_children(
+							&mut transaction,
+							columns::META,
+							meta_keys::CHILDREN_PREFIX,
+							best_hash,
+						);
 						self.storage.db.commit(transaction)?;
 						self.changes_tries_storage.post_commit(Some(changes_trie_cache_ops));
 						self.blockchain.update_meta(MetaUpdate {
@@ -2202,10 +2227,10 @@ impl<Block: BlockT> sc_client_api::backend::Backend<Block> for Backend<Block> {
 							number: best_number,
 							is_best: true,
 							is_finalized: update_finalized,
-							with_state: false
+							with_state: false,
 						});
-					}
-					None => return Ok(c.saturated_into::<NumberFor<Block>>())
+					},
+					None => return Ok(c.saturated_into::<NumberFor<Block>>()),
 				}
 			}
 
@@ -2230,36 +2255,27 @@ impl<Block: BlockT> sc_client_api::backend::Backend<Block> for Backend<Block> {
 		Ok((reverted, reverted_finalized))
 	}
 
-	fn remove_leaf_block(
-		&self,
-		hash: &Block::Hash,
-	) -> ClientResult<()> {
+	fn remove_leaf_block(&self, hash: &Block::Hash) -> ClientResult<()> {
 		let best_hash = self.blockchain.info().best_hash;
 
 		if best_hash == *hash {
-			return Err(
-				sp_blockchain::Error::Backend(
-					format!("Can't remove best block {:?}", hash)
-				)
-			)
+			return Err(sp_blockchain::Error::Backend(format!("Can't remove best block {:?}", hash)))
 		}
 
 		let hdr = self.blockchain.header_metadata(hash.clone())?;
 		if !self.have_state_at(&hash, hdr.number) {
-			return Err(
-				sp_blockchain::Error::UnknownBlock(
-					format!("State already discarded for {:?}", hash)
-				)
-			)
+			return Err(sp_blockchain::Error::UnknownBlock(format!(
+				"State already discarded for {:?}",
+				hash
+			)))
 		}
 
 		let mut leaves = self.blockchain.leaves.write();
 		if !leaves.contains(hdr.number, *hash) {
-			return Err(
-				sp_blockchain::Error::Backend(
-					format!("Can't remove non-leaf block {:?}", hash)
-				)
-			)
+			return Err(sp_blockchain::Error::Backend(format!(
+				"Can't remove non-leaf block {:?}",
+				hash
+			)))
 		}
 
 		let mut transaction = Transaction::new();
@@ -2267,13 +2283,9 @@ impl<Block: BlockT> sc_client_api::backend::Backend<Block> for Backend<Block> {
 			apply_state_commit(&mut transaction, commit);
 		}
 		transaction.remove(columns::KEY_LOOKUP, hash.as_ref());
-		let changes_trie_cache_ops = self.changes_tries_storage.revert(
-			&mut transaction,
-			&cache::ComplexBlockId::new(
-				*hash,
-				hdr.number,
-			),
-		)?;
+		let changes_trie_cache_ops = self
+			.changes_tries_storage
+			.revert(&mut transaction, &cache::ComplexBlockId::new(*hash, hdr.number))?;
 
 		self.changes_tries_storage.post_commit(Some(changes_trie_cache_ops));
 		leaves.revert(hash.clone(), hdr.number);
@@ -2300,11 +2312,7 @@ impl<Block: BlockT> sc_client_api::backend::Backend<Block> for Backend<Block> {
 				let root = genesis_state.root.clone();
 				let db_state = DbState::<Block>::new(genesis_state.clone(), root);
 				let state = RefTrackingState::new(db_state, self.storage.clone(), None);
-				let caching_state = CachingState::new(
-					state,
-					self.shared_cache.clone(),
-					None,
-				);
+				let caching_state = CachingState::new(state, self.shared_cache.clone(), None);
 				let mut state = SyncingCachingState::new(
 					caching_state,
 					self.state_usage.clone(),
@@ -2318,33 +2326,26 @@ impl<Block: BlockT> sc_client_api::backend::Backend<Block> for Backend<Block> {
 
 		let hash = match block {
 			BlockId::Hash(h) => h,
-			BlockId::Number(n) => self.blockchain.hash(n)?.ok_or_else(||
+			BlockId::Number(n) => self.blockchain.hash(n)?.ok_or_else(|| {
 				sp_blockchain::Error::UnknownBlock(format!("Unknown block number {}", n))
-			)?,
+			})?,
 		};
 
 		match self.blockchain.header_metadata(hash) {
 			Ok(ref hdr) => {
 				if !self.have_state_at(&hash, hdr.number) {
-					return Err(
-						sp_blockchain::Error::UnknownBlock(
-							format!("State already discarded for {:?}", block)
-						)
-					)
+					return Err(sp_blockchain::Error::UnknownBlock(format!(
+						"State already discarded for {:?}",
+						block
+					)))
 				}
 				if let Ok(()) = self.storage.state_db.pin(&hash) {
 					let root = hdr.state_root;
 					let db_state = DbState::<Block>::new(self.storage.clone(), root);
-					let state = RefTrackingState::new(
-						db_state,
-						self.storage.clone(),
-						Some(hash.clone()),
-					);
-					let caching_state = CachingState::new(
-						state,
-						self.shared_cache.clone(),
-						Some(hash),
-					);
+					let state =
+						RefTrackingState::new(db_state, self.storage.clone(), Some(hash.clone()));
+					let caching_state =
+						CachingState::new(state, self.shared_cache.clone(), Some(hash));
 					Ok(SyncingCachingState::new(
 						caching_state,
 						self.state_usage.clone(),
@@ -2352,11 +2353,10 @@ impl<Block: BlockT> sc_client_api::backend::Backend<Block> for Backend<Block> {
 						self.import_lock.clone(),
 					))
 				} else {
-					Err(
-						sp_blockchain::Error::UnknownBlock(
-							format!("State already discarded for {:?}", block)
-						)
-					)
+					Err(sp_blockchain::Error::UnknownBlock(format!(
+						"State already discarded for {:?}",
+						block
+					)))
 				}
 			},
 			Err(e) => Err(e),
@@ -2366,13 +2366,13 @@ impl<Block: BlockT> sc_client_api::backend::Backend<Block> for Backend<Block> {
 	fn have_state_at(&self, hash: &Block::Hash, number: NumberFor<Block>) -> bool {
 		if self.is_archive {
 			match self.blockchain.header_metadata(hash.clone()) {
-				Ok(header) => {
-					sp_state_machine::Storage::get(
-						self.storage.as_ref(),
-						&header.state_root,
-						(&[], None),
-					).unwrap_or(None).is_some()
-				},
+				Ok(header) => sp_state_machine::Storage::get(
+					self.storage.as_ref(),
+					&header.state_root,
+					(&[], None),
+				)
+				.unwrap_or(None)
+				.is_some(),
 				_ => false,
 			}
 		} else {
@@ -2389,18 +2389,22 @@ impl<Block: BlockT> sc_client_api::backend::LocalBackend<Block> for Backend<Bloc
 
 #[cfg(test)]
 pub(crate) mod tests {
-	use hash_db::{HashDB, EMPTY_PREFIX};
 	use super::*;
 	use crate::columns;
-	use sp_core::H256;
-	use sc_client_api::backend::{Backend as BTrait, BlockImportOperation as Op};
-	use sc_client_api::blockchain::Backend as BLBTrait;
-	use sp_runtime::ConsensusEngineId;
-	use sp_runtime::testing::{Header, Block as RawBlock, ExtrinsicWrapper};
-	use sp_runtime::traits::{Hash, BlakeTwo256};
-	use sp_runtime::generic::DigestItem;
-	use sp_state_machine::{TrieMut, TrieDBMut};
+	use hash_db::{HashDB, EMPTY_PREFIX};
+	use sc_client_api::{
+		backend::{Backend as BTrait, BlockImportOperation as Op},
+		blockchain::Backend as BLBTrait,
+	};
 	use sp_blockchain::{lowest_common_ancestor, tree_route};
+	use sp_core::H256;
+	use sp_runtime::{
+		generic::DigestItem,
+		testing::{Block as RawBlock, ExtrinsicWrapper, Header},
+		traits::{BlakeTwo256, Hash},
+		ConsensusEngineId,
+	};
+	use sp_state_machine::{TrieDBMut, TrieMut};
 
 	const CONS0_ENGINE_ID: ConsensusEngineId = *b"CON0";
 	const CONS1_ENGINE_ID: ConsensusEngineId = *b"CON1";
@@ -2411,10 +2415,8 @@ pub(crate) mod tests {
 		let mut changes_root = H256::default();
 		let mut changes_trie_update = MemoryDB::<BlakeTwo256>::default();
 		{
-			let mut trie = TrieDBMut::<BlakeTwo256>::new(
-				&mut changes_trie_update,
-				&mut changes_root
-			);
+			let mut trie =
+				TrieDBMut::<BlakeTwo256>::new(&mut changes_trie_update, &mut changes_root);
 			for (key, value) in changes {
 				trie.insert(&key, &value).unwrap();
 			}
@@ -2471,7 +2473,8 @@ pub(crate) mod tests {
 		if let Some(index) = transaction_index {
 			op.update_transaction_index(index).unwrap();
 		}
-		op.update_changes_trie((changes_trie_update, ChangesTrieCacheAction::Clear)).unwrap();
+		op.update_changes_trie((changes_trie_update, ChangesTrieCacheAction::Clear))
+			.unwrap();
 		backend.commit_operation(op).unwrap();
 
 		header_hash
@@ -2505,13 +2508,8 @@ pub(crate) mod tests {
 						extrinsics_root: Default::default(),
 					};
 
-					op.set_block_data(
-						header,
-						Some(vec![]),
-						None,
-						None,
-						NewBlockState::Best,
-					).unwrap();
+					op.set_block_data(header, Some(vec![]), None, None, NewBlockState::Best)
+						.unwrap();
 					db.commit_operation(op).unwrap();
 				}
 
@@ -2520,14 +2518,18 @@ pub(crate) mod tests {
 			db.storage.db.clone()
 		};
 
-		let backend = Backend::<Block>::new(DatabaseSettings {
-			state_cache_size: 16777216,
-			state_cache_child_ratio: Some((50, 100)),
-			state_pruning: PruningMode::keep_blocks(1),
-			source: DatabaseSettingsSrc::Custom(backing),
-			keep_blocks: KeepBlocks::All,
-			transaction_storage: TransactionStorageMode::BlockBody,
-		}, 0).unwrap();
+		let backend = Backend::<Block>::new(
+			DatabaseSettings {
+				state_cache_size: 16777216,
+				state_cache_child_ratio: Some((50, 100)),
+				state_pruning: PruningMode::keep_blocks(1),
+				source: DatabaseSettingsSrc::Custom(backing),
+				keep_blocks: KeepBlocks::All,
+				transaction_storage: TransactionStorageMode::BlockBody,
+			},
+			0,
+		)
+		.unwrap();
 		assert_eq!(backend.blockchain().info().best_number, 9);
 		for i in 0..10 {
 			assert!(backend.blockchain().hash(i).unwrap().is_some())
@@ -2547,28 +2549,22 @@ pub(crate) mod tests {
 				extrinsics_root: Default::default(),
 			};
 
-			let storage = vec![
-				(vec![1, 3, 5], vec![2, 4, 6]),
-				(vec![1, 2, 3], vec![9, 9, 9]),
-			];
+			let storage = vec![(vec![1, 3, 5], vec![2, 4, 6]), (vec![1, 2, 3], vec![9, 9, 9])];
 
-			header.state_root = op.old_state.storage_root(storage
-				.iter()
-				.map(|(x, y)| (&x[..], Some(&y[..])))
-			).0.into();
+			header.state_root = op
+				.old_state
+				.storage_root(storage.iter().map(|(x, y)| (&x[..], Some(&y[..]))))
+				.0
+				.into();
 			let hash = header.hash();
 
 			op.reset_storage(Storage {
 				top: storage.into_iter().collect(),
 				children_default: Default::default(),
-			}).unwrap();
-			op.set_block_data(
-				header.clone(),
-				Some(vec![]),
-				None,
-				None,
-				NewBlockState::Best,
-			).unwrap();
+			})
+			.unwrap();
+			op.set_block_data(header.clone(), Some(vec![]), None, None, NewBlockState::Best)
+				.unwrap();
 
 			db.commit_operation(op).unwrap();
 
@@ -2592,26 +2588,17 @@ pub(crate) mod tests {
 				extrinsics_root: Default::default(),
 			};
 
-			let storage = vec![
-				(vec![1, 3, 5], None),
-				(vec![5, 5, 5], Some(vec![4, 5, 6])),
-			];
+			let storage = vec![(vec![1, 3, 5], None), (vec![5, 5, 5], Some(vec![4, 5, 6]))];
 
-			let (root, overlay) = op.old_state.storage_root(
-				storage.iter()
-					.map(|(k, v)| (&k[..], v.as_ref().map(|v| &v[..])))
-			);
+			let (root, overlay) = op
+				.old_state
+				.storage_root(storage.iter().map(|(k, v)| (&k[..], v.as_ref().map(|v| &v[..]))));
 			op.update_db_storage(overlay).unwrap();
 			header.state_root = root.into();
 
 			op.update_storage(storage, Vec::new()).unwrap();
-			op.set_block_data(
-				header,
-				Some(vec![]),
-				None,
-				None,
-				NewBlockState::Best,
-			).unwrap();
+			op.set_block_data(header, Some(vec![]), None, None, NewBlockState::Best)
+				.unwrap();
 
 			db.commit_operation(op).unwrap();
 
@@ -2631,7 +2618,9 @@ pub(crate) mod tests {
 
 		let hash = {
 			let mut op = backend.begin_operation().unwrap();
-			backend.begin_state_operation(&mut op, BlockId::Hash(Default::default())).unwrap();
+			backend
+				.begin_state_operation(&mut op, BlockId::Hash(Default::default()))
+				.unwrap();
 			let mut header = Header {
 				number: 0,
 				parent_hash: Default::default(),
@@ -2646,22 +2635,22 @@ pub(crate) mod tests {
 			op.reset_storage(Storage {
 				top: Default::default(),
 				children_default: Default::default(),
-			}).unwrap();
+			})
+			.unwrap();
 
 			key = op.db_updates.insert(EMPTY_PREFIX, b"hello");
-			op.set_block_data(
-				header,
-				Some(vec![]),
-				None,
-				None,
-				NewBlockState::Best,
-			).unwrap();
+			op.set_block_data(header, Some(vec![]), None, None, NewBlockState::Best)
+				.unwrap();
 
 			backend.commit_operation(op).unwrap();
-			assert_eq!(backend.storage.db.get(
-				columns::STATE,
-				&sp_trie::prefixed_key::<BlakeTwo256>(&key, EMPTY_PREFIX)
-			).unwrap(), &b"hello"[..]);
+			assert_eq!(
+				backend
+					.storage
+					.db
+					.get(columns::STATE, &sp_trie::prefixed_key::<BlakeTwo256>(&key, EMPTY_PREFIX))
+					.unwrap(),
+				&b"hello"[..]
+			);
 			hash
 		};
 
@@ -2678,28 +2667,27 @@ pub(crate) mod tests {
 
 			let storage: Vec<(_, _)> = vec![];
 
-			header.state_root = op.old_state.storage_root(storage
-				.iter()
-				.cloned()
-				.map(|(x, y)| (x, Some(y)))
-			).0.into();
+			header.state_root = op
+				.old_state
+				.storage_root(storage.iter().cloned().map(|(x, y)| (x, Some(y))))
+				.0
+				.into();
 			let hash = header.hash();
 
 			op.db_updates.insert(EMPTY_PREFIX, b"hello");
 			op.db_updates.remove(&key, EMPTY_PREFIX);
-			op.set_block_data(
-				header,
-				Some(vec![]),
-				None,
-				None,
-				NewBlockState::Best,
-			).unwrap();
+			op.set_block_data(header, Some(vec![]), None, None, NewBlockState::Best)
+				.unwrap();
 
 			backend.commit_operation(op).unwrap();
-			assert_eq!(backend.storage.db.get(
-				columns::STATE,
-				&sp_trie::prefixed_key::<BlakeTwo256>(&key, EMPTY_PREFIX)
-			).unwrap(), &b"hello"[..]);
+			assert_eq!(
+				backend
+					.storage
+					.db
+					.get(columns::STATE, &sp_trie::prefixed_key::<BlakeTwo256>(&key, EMPTY_PREFIX))
+					.unwrap(),
+				&b"hello"[..]
+			);
 			hash
 		};
 
@@ -2716,28 +2704,24 @@ pub(crate) mod tests {
 
 			let storage: Vec<(_, _)> = vec![];
 
-			header.state_root = op.old_state.storage_root(storage
-				.iter()
-				.cloned()
-				.map(|(x, y)| (x, Some(y)))
-			).0.into();
+			header.state_root = op
+				.old_state
+				.storage_root(storage.iter().cloned().map(|(x, y)| (x, Some(y))))
+				.0
+				.into();
 			let hash = header.hash();
 
 			op.db_updates.remove(&key, EMPTY_PREFIX);
-			op.set_block_data(
-				header,
-				Some(vec![]),
-				None,
-				None,
-				NewBlockState::Best,
-			).unwrap();
+			op.set_block_data(header, Some(vec![]), None, None, NewBlockState::Best)
+				.unwrap();
 
 			backend.commit_operation(op).unwrap();
 
-			assert!(backend.storage.db.get(
-				columns::STATE,
-				&sp_trie::prefixed_key::<BlakeTwo256>(&key, EMPTY_PREFIX)
-			).is_some());
+			assert!(backend
+				.storage
+				.db
+				.get(columns::STATE, &sp_trie::prefixed_key::<BlakeTwo256>(&key, EMPTY_PREFIX))
+				.is_some());
 			hash
 		};
 
@@ -2754,34 +2738,31 @@ pub(crate) mod tests {
 
 			let storage: Vec<(_, _)> = vec![];
 
-			header.state_root = op.old_state.storage_root(storage
-				.iter()
-				.cloned()
-				.map(|(x, y)| (x, Some(y)))
-			).0.into();
+			header.state_root = op
+				.old_state
+				.storage_root(storage.iter().cloned().map(|(x, y)| (x, Some(y))))
+				.0
+				.into();
 
-			op.set_block_data(
-				header,
-				Some(vec![]),
-				None,
-				None,
-				NewBlockState::Best,
-			).unwrap();
+			op.set_block_data(header, Some(vec![]), None, None, NewBlockState::Best)
+				.unwrap();
 
 			backend.commit_operation(op).unwrap();
-			assert!(backend.storage.db.get(
-				columns::STATE,
-				&sp_trie::prefixed_key::<BlakeTwo256>(&key, EMPTY_PREFIX)
-			).is_none());
+			assert!(backend
+				.storage
+				.db
+				.get(columns::STATE, &sp_trie::prefixed_key::<BlakeTwo256>(&key, EMPTY_PREFIX))
+				.is_none());
 		}
 
 		backend.finalize_block(BlockId::Number(1), None).unwrap();
 		backend.finalize_block(BlockId::Number(2), None).unwrap();
 		backend.finalize_block(BlockId::Number(3), None).unwrap();
-		assert!(backend.storage.db.get(
-			columns::STATE,
-			&sp_trie::prefixed_key::<BlakeTwo256>(&key, EMPTY_PREFIX)
-		).is_none());
+		assert!(backend
+			.storage
+			.db
+			.get(columns::STATE, &sp_trie::prefixed_key::<BlakeTwo256>(&key, EMPTY_PREFIX))
+			.is_none());
 	}
 
 	#[test]
@@ -2803,8 +2784,14 @@ pub(crate) mod tests {
 			let tree_route = tree_route(blockchain, a3, b2).unwrap();
 
 			assert_eq!(tree_route.common_block().hash, block0);
-			assert_eq!(tree_route.retracted().iter().map(|r| r.hash).collect::<Vec<_>>(), vec![a3, a2, a1]);
-			assert_eq!(tree_route.enacted().iter().map(|r| r.hash).collect::<Vec<_>>(), vec![b1, b2]);
+			assert_eq!(
+				tree_route.retracted().iter().map(|r| r.hash).collect::<Vec<_>>(),
+				vec![a3, a2, a1]
+			);
+			assert_eq!(
+				tree_route.enacted().iter().map(|r| r.hash).collect::<Vec<_>>(),
+				vec![b1, b2]
+			);
 		}
 
 		{
@@ -2812,14 +2799,20 @@ pub(crate) mod tests {
 
 			assert_eq!(tree_route.common_block().hash, a1);
 			assert!(tree_route.retracted().is_empty());
-			assert_eq!(tree_route.enacted().iter().map(|r| r.hash).collect::<Vec<_>>(), vec![a2, a3]);
+			assert_eq!(
+				tree_route.enacted().iter().map(|r| r.hash).collect::<Vec<_>>(),
+				vec![a2, a3]
+			);
 		}
 
 		{
 			let tree_route = tree_route(blockchain, a3, a1).unwrap();
 
 			assert_eq!(tree_route.common_block().hash, a1);
-			assert_eq!(tree_route.retracted().iter().map(|r| r.hash).collect::<Vec<_>>(), vec![a3, a2]);
+			assert_eq!(
+				tree_route.retracted().iter().map(|r| r.hash).collect::<Vec<_>>(),
+				vec![a3, a2]
+			);
 			assert!(tree_route.enacted().is_empty());
 		}
 
@@ -2845,7 +2838,10 @@ pub(crate) mod tests {
 
 			assert_eq!(tree_route.common_block().hash, block0);
 			assert!(tree_route.retracted().is_empty());
-			assert_eq!(tree_route.enacted().iter().map(|r| r.hash).collect::<Vec<_>>(), vec![block1]);
+			assert_eq!(
+				tree_route.enacted().iter().map(|r| r.hash).collect::<Vec<_>>(),
+				vec![block1]
+			);
 		}
 	}
 
@@ -2943,20 +2939,25 @@ pub(crate) mod tests {
 
 	#[test]
 	fn test_leaves_with_complex_block_tree() {
-		let backend: Arc<Backend<substrate_test_runtime_client::runtime::Block>> = Arc::new(Backend::new_test(20, 20));
+		let backend: Arc<Backend<substrate_test_runtime_client::runtime::Block>> =
+			Arc::new(Backend::new_test(20, 20));
 		substrate_test_runtime_client::trait_tests::test_leaves_for_backend(backend);
 	}
 
 	#[test]
 	fn test_children_with_complex_block_tree() {
-		let backend: Arc<Backend<substrate_test_runtime_client::runtime::Block>> = Arc::new(Backend::new_test(20, 20));
+		let backend: Arc<Backend<substrate_test_runtime_client::runtime::Block>> =
+			Arc::new(Backend::new_test(20, 20));
 		substrate_test_runtime_client::trait_tests::test_children_for_backend(backend);
 	}
 
 	#[test]
 	fn test_blockchain_query_by_number_gets_canonical() {
-		let backend: Arc<Backend<substrate_test_runtime_client::runtime::Block>> = Arc::new(Backend::new_test(20, 20));
-		substrate_test_runtime_client::trait_tests::test_blockchain_query_by_number_gets_canonical(backend);
+		let backend: Arc<Backend<substrate_test_runtime_client::runtime::Block>> =
+			Arc::new(Backend::new_test(20, 20));
+		substrate_test_runtime_client::trait_tests::test_blockchain_query_by_number_gets_canonical(
+			backend,
+		);
 	}
 
 	#[test]
@@ -2974,7 +2975,10 @@ pub(crate) mod tests {
 		let block2_b = insert_header(&backend, 2, block1_b, None, Default::default());
 		let block2_c = insert_header(&backend, 2, block1_b, None, [1; 32].into());
 
-		assert_eq!(backend.blockchain().leaves().unwrap(), vec![block2_a, block2_b, block2_c, block1_c]);
+		assert_eq!(
+			backend.blockchain().leaves().unwrap(),
+			vec![block2_a, block2_b, block2_c, block1_c]
+		);
 
 		backend.finalize_block(BlockId::hash(block1_a), None).unwrap();
 		backend.finalize_block(BlockId::hash(block2_a), None).unwrap();
@@ -2985,7 +2989,8 @@ pub(crate) mod tests {
 
 	#[test]
 	fn test_aux() {
-		let backend: Backend<substrate_test_runtime_client::runtime::Block> = Backend::new_test(0, 0);
+		let backend: Backend<substrate_test_runtime_client::runtime::Block> =
+			Backend::new_test(0, 0);
 		assert!(backend.get_aux(b"test").unwrap().is_none());
 		backend.insert_aux(&[(&b"test"[..], &b"hello"[..])], &[]).unwrap();
 		assert_eq!(b"hello", &backend.get_aux(b"test").unwrap().unwrap()[..]);
@@ -2995,7 +3000,7 @@ pub(crate) mod tests {
 
 	#[test]
 	fn test_finalize_block_with_justification() {
-		use sc_client_api::blockchain::{Backend as BlockChainBackend};
+		use sc_client_api::blockchain::Backend as BlockChainBackend;
 
 		let backend = Backend::<Block>::new_test(10, 10);
 
@@ -3013,7 +3018,7 @@ pub(crate) mod tests {
 
 	#[test]
 	fn test_append_justification_to_finalized_block() {
-		use sc_client_api::blockchain::{Backend as BlockChainBackend};
+		use sc_client_api::blockchain::Backend as BlockChainBackend;
 
 		let backend = Backend::<Block>::new_test(10, 10);
 
@@ -3021,10 +3026,7 @@ pub(crate) mod tests {
 		let _ = insert_header(&backend, 1, block0, None, Default::default());
 
 		let just0 = (CONS0_ENGINE_ID, vec![1, 2, 3]);
-		backend.finalize_block(
-			BlockId::Number(1),
-			Some(just0.clone().into()),
-		).unwrap();
+		backend.finalize_block(BlockId::Number(1), Some(just0.clone().into())).unwrap();
 
 		let just1 = (CONS1_ENGINE_ID, vec![4, 5]);
 		backend.append_justification(BlockId::Number(1), just1.clone()).unwrap();
@@ -3077,7 +3079,9 @@ pub(crate) mod tests {
 
 		let hash0 = {
 			let mut op = backend.begin_operation().unwrap();
-			backend.begin_state_operation(&mut op, BlockId::Hash(Default::default())).unwrap();
+			backend
+				.begin_state_operation(&mut op, BlockId::Hash(Default::default()))
+				.unwrap();
 			let mut header = Header {
 				number: 0,
 				parent_hash: Default::default(),
@@ -3088,30 +3092,28 @@ pub(crate) mod tests {
 
 			let storage = vec![(b"test".to_vec(), b"test".to_vec())];
 
-			header.state_root = op.old_state.storage_root(storage
-				.iter()
-				.map(|(x, y)| (&x[..], Some(&y[..])))
-			).0.into();
+			header.state_root = op
+				.old_state
+				.storage_root(storage.iter().map(|(x, y)| (&x[..], Some(&y[..]))))
+				.0
+				.into();
 			let hash = header.hash();
 
 			op.reset_storage(Storage {
 				top: storage.into_iter().collect(),
 				children_default: Default::default(),
-			}).unwrap();
-			op.set_block_data(
-				header.clone(),
-				Some(vec![]),
-				None,
-				None,
-				NewBlockState::Best,
-			).unwrap();
+			})
+			.unwrap();
+			op.set_block_data(header.clone(), Some(vec![]), None, None, NewBlockState::Best)
+				.unwrap();
 
 			backend.commit_operation(op).unwrap();
 
 			hash
 		};
 
-		let block0_hash = backend.state_at(BlockId::Hash(hash0))
+		let block0_hash = backend
+			.state_at(BlockId::Hash(hash0))
 			.unwrap()
 			.storage_hash(&b"test"[..])
 			.unwrap();
@@ -3129,22 +3131,16 @@ pub(crate) mod tests {
 
 			let storage = vec![(b"test".to_vec(), Some(b"test2".to_vec()))];
 
-			let (root, overlay) = op.old_state.storage_root(
-				storage.iter()
-					.map(|(k, v)| (&k[..], v.as_ref().map(|v| &v[..])))
-			);
+			let (root, overlay) = op
+				.old_state
+				.storage_root(storage.iter().map(|(k, v)| (&k[..], v.as_ref().map(|v| &v[..]))));
 			op.update_db_storage(overlay).unwrap();
 			header.state_root = root.into();
 			let hash = header.hash();
 
 			op.update_storage(storage, Vec::new()).unwrap();
-			op.set_block_data(
-				header,
-				Some(vec![]),
-				None,
-				None,
-				NewBlockState::Normal,
-			).unwrap();
+			op.set_block_data(header, Some(vec![]), None, None, NewBlockState::Normal)
+				.unwrap();
 
 			backend.commit_operation(op).unwrap();
 
@@ -3159,7 +3155,8 @@ pub(crate) mod tests {
 			backend.commit_operation(op).unwrap();
 		}
 
-		let block1_hash = backend.state_at(BlockId::Hash(hash1))
+		let block1_hash = backend
+			.state_at(BlockId::Hash(hash1))
 			.unwrap()
 			.storage_hash(&b"test"[..])
 			.unwrap();
@@ -3189,7 +3186,8 @@ pub(crate) mod tests {
 		let backend = Backend::<Block>::new_test(10, 10);
 
 		// insert 1 + SIZE + SIZE + 1 blocks so that CHT#0 is created
-		let mut prev_hash = insert_header(&backend, 0, Default::default(), None, Default::default());
+		let mut prev_hash =
+			insert_header(&backend, 0, Default::default(), None, Default::default());
 		let cht_size: u64 = cht::size();
 		for i in 1..1 + cht_size + cht_size + 1 {
 			prev_hash = insert_header(&backend, i, prev_hash, None, Default::default());
@@ -3197,12 +3195,18 @@ pub(crate) mod tests {
 
 		let blockchain = backend.blockchain();
 
-		let cht_root_1 = blockchain.header_cht_root(cht_size, cht::start_number(cht_size, 0))
-			.unwrap().unwrap();
-		let cht_root_2 = blockchain.header_cht_root(cht_size, cht::start_number(cht_size, 0) + cht_size / 2)
-			.unwrap().unwrap();
-		let cht_root_3 = blockchain.header_cht_root(cht_size, cht::end_number(cht_size, 0))
-			.unwrap().unwrap();
+		let cht_root_1 = blockchain
+			.header_cht_root(cht_size, cht::start_number(cht_size, 0))
+			.unwrap()
+			.unwrap();
+		let cht_root_2 = blockchain
+			.header_cht_root(cht_size, cht::start_number(cht_size, 0) + cht_size / 2)
+			.unwrap()
+			.unwrap();
+		let cht_root_3 = blockchain
+			.header_cht_root(cht_size, cht::end_number(cht_size, 0))
+			.unwrap()
+			.unwrap();
 		assert_eq!(cht_root_1, cht_root_2);
 		assert_eq!(cht_root_2, cht_root_3);
 	}
@@ -3213,8 +3217,16 @@ pub(crate) mod tests {
 			let backend = Backend::<Block>::new_test_with_tx_storage(2, 0, *storage);
 			let mut blocks = Vec::new();
 			let mut prev_hash = Default::default();
-			for i in 0 .. 5 {
-				let hash = insert_block(&backend, i, prev_hash, None, Default::default(), vec![i.into()], None);
+			for i in 0..5 {
+				let hash = insert_block(
+					&backend,
+					i,
+					prev_hash,
+					None,
+					Default::default(),
+					vec![i.into()],
+					None,
+				);
 				blocks.push(hash);
 				prev_hash = hash;
 			}
@@ -3222,7 +3234,7 @@ pub(crate) mod tests {
 			{
 				let mut op = backend.begin_operation().unwrap();
 				backend.begin_state_operation(&mut op, BlockId::Hash(blocks[4])).unwrap();
-				for i in 1 .. 5 {
+				for i in 1..5 {
 					op.mark_finalized(BlockId::Hash(blocks[i]), None).unwrap();
 				}
 				backend.commit_operation(op).unwrap();
@@ -3238,15 +3250,20 @@ pub(crate) mod tests {
 
 	#[test]
 	fn prune_blocks_on_finalize_with_fork() {
-		let backend = Backend::<Block>::new_test_with_tx_storage(
-			2,
-			10,
-			TransactionStorageMode::StorageChain
-		);
+		let backend =
+			Backend::<Block>::new_test_with_tx_storage(2, 10, TransactionStorageMode::StorageChain);
 		let mut blocks = Vec::new();
 		let mut prev_hash = Default::default();
-		for i in 0 .. 5 {
-			let hash = insert_block(&backend, i, prev_hash, None, Default::default(), vec![i.into()], None);
+		for i in 0..5 {
+			let hash = insert_block(
+				&backend,
+				i,
+				prev_hash,
+				None,
+				Default::default(),
+				vec![i.into()],
+				None,
+			);
 			blocks.push(hash);
 			prev_hash = hash;
 		}
@@ -3259,15 +3276,23 @@ pub(crate) mod tests {
 			None,
 			sp_core::H256::random(),
 			vec![2.into()],
-			None
+			None,
+		);
+		insert_block(
+			&backend,
+			3,
+			fork_hash_root,
+			None,
+			H256::random(),
+			vec![3.into(), 11.into()],
+			None,
 		);
-		insert_block(&backend, 3, fork_hash_root, None, H256::random(), vec![3.into(), 11.into()], None);
 		let mut op = backend.begin_operation().unwrap();
 		backend.begin_state_operation(&mut op, BlockId::Hash(blocks[4])).unwrap();
 		op.mark_head(BlockId::Hash(blocks[4])).unwrap();
 		backend.commit_operation(op).unwrap();
 
-		for i in 1 .. 5 {
+		for i in 1..5 {
 			let mut op = backend.begin_operation().unwrap();
 			backend.begin_state_operation(&mut op, BlockId::Hash(blocks[4])).unwrap();
 			op.mark_finalized(BlockId::Hash(blocks[i]), None).unwrap();
@@ -3284,16 +3309,13 @@ pub(crate) mod tests {
 
 	#[test]
 	fn renew_transaction_storage() {
-		let backend = Backend::<Block>::new_test_with_tx_storage(
-			2,
-			10,
-			TransactionStorageMode::StorageChain
-		);
+		let backend =
+			Backend::<Block>::new_test_with_tx_storage(2, 10, TransactionStorageMode::StorageChain);
 		let mut blocks = Vec::new();
 		let mut prev_hash = Default::default();
 		let x1 = ExtrinsicWrapper::from(0u64).encode();
-		let x1_hash = <HashFor::<Block> as sp_core::Hasher>::hash(&x1[1..]);
-		for i in 0 .. 10 {
+		let x1_hash = <HashFor<Block> as sp_core::Hasher>::hash(&x1[1..]);
+		for i in 0..10 {
 			let mut index = Vec::new();
 			if i == 0 {
 				index.push(IndexOperation::Insert {
@@ -3303,10 +3325,7 @@ pub(crate) mod tests {
 				});
 			} else if i < 5 {
 				// keep renewing 1st
-				index.push(IndexOperation::Renew {
-					extrinsic: 0,
-					hash: x1_hash.as_ref().to_vec(),
-				});
+				index.push(IndexOperation::Renew { extrinsic: 0, hash: x1_hash.as_ref().to_vec() });
 			} // else stop renewing
 			let hash = insert_block(
 				&backend,
@@ -3315,13 +3334,13 @@ pub(crate) mod tests {
 				None,
 				Default::default(),
 				vec![i.into()],
-				Some(index)
+				Some(index),
 			);
 			blocks.push(hash);
 			prev_hash = hash;
 		}
 
-		for i in 1 .. 10 {
+		for i in 1..10 {
 			let mut op = backend.begin_operation().unwrap();
 			backend.begin_state_operation(&mut op, BlockId::Hash(blocks[4])).unwrap();
 			op.mark_finalized(BlockId::Hash(blocks[i]), None).unwrap();
@@ -3337,15 +3356,20 @@ pub(crate) mod tests {
 
 	#[test]
 	fn remove_leaf_block_works() {
-		let backend = Backend::<Block>::new_test_with_tx_storage(
-			2,
-			10,
-			TransactionStorageMode::StorageChain
-		);
+		let backend =
+			Backend::<Block>::new_test_with_tx_storage(2, 10, TransactionStorageMode::StorageChain);
 		let mut blocks = Vec::new();
 		let mut prev_hash = Default::default();
-		for i in 0 .. 2 {
-			let hash = insert_block(&backend, i, prev_hash, None, Default::default(), vec![i.into()], None);
+		for i in 0..2 {
+			let hash = insert_block(
+				&backend,
+				i,
+				prev_hash,
+				None,
+				Default::default(),
+				vec![i.into()],
+				None,
+			);
 			blocks.push(hash);
 			prev_hash = hash;
 		}
@@ -3358,7 +3382,7 @@ pub(crate) mod tests {
 			None,
 			sp_core::H256::random(),
 			vec![42.into()],
-			None
+			None,
 		);
 		assert!(backend.remove_leaf_block(&best_hash).is_err());
 		assert!(backend.have_state_at(&prev_hash, 1));
diff --git a/client/db/src/light.rs b/client/db/src/light.rs
index 4e61a9c2ee03..ded5e598fc68 100644
--- a/client/db/src/light.rs
+++ b/client/db/src/light.rs
@@ -18,31 +18,31 @@
 
 //! RocksDB-based light client blockchain storage.
 
-use std::{sync::Arc, collections::HashMap};
-use std::convert::TryInto;
 use parking_lot::RwLock;
+use std::{collections::HashMap, convert::TryInto, sync::Arc};
 
+use crate::{
+	cache::{ComplexBlockId, DbCache, DbCacheSync, EntryType as CacheEntryType},
+	utils::{self, block_id_to_lookup_key, meta_keys, read_db, read_meta, DatabaseType, Meta},
+	DatabaseSettings, DbHash, FrozenForDuration,
+};
+use codec::{Decode, Encode};
+use log::{debug, trace, warn};
 use sc_client_api::{
-	cht, backend::{AuxStore, NewBlockState, ProvideChtRoots}, UsageInfo,
-	blockchain::{
-		BlockStatus, Cache as BlockchainCache, Info as BlockchainInfo,
-	},
-	Storage,
+	backend::{AuxStore, NewBlockState, ProvideChtRoots},
+	blockchain::{BlockStatus, Cache as BlockchainCache, Info as BlockchainInfo},
+	cht, Storage, UsageInfo,
 };
 use sp_blockchain::{
-	CachedHeaderMetadata, HeaderMetadata, HeaderMetadataCache,
-	Error as ClientError, Result as ClientResult,
-	HeaderBackend as BlockchainHeaderBackend,
-	well_known_cache_keys,
+	well_known_cache_keys, CachedHeaderMetadata, Error as ClientError,
+	HeaderBackend as BlockchainHeaderBackend, HeaderMetadata, HeaderMetadataCache,
+	Result as ClientResult,
 };
 use sp_database::{Database, Transaction};
-use codec::{Decode, Encode};
-use sp_runtime::generic::{DigestItem, BlockId};
-use sp_runtime::traits::{Block as BlockT, Header as HeaderT, Zero, One, NumberFor, HashFor};
-use crate::cache::{DbCacheSync, DbCache, ComplexBlockId, EntryType as CacheEntryType};
-use crate::utils::{self, meta_keys, DatabaseType, Meta, read_db, block_id_to_lookup_key, read_meta};
-use crate::{DatabaseSettings, FrozenForDuration, DbHash};
-use log::{trace, warn, debug};
+use sp_runtime::{
+	generic::{BlockId, DigestItem},
+	traits::{Block as BlockT, HashFor, Header as HeaderT, NumberFor, One, Zero},
+};
 
 pub(crate) mod columns {
 	pub const META: u32 = crate::utils::COLUMN_META;
@@ -139,8 +139,8 @@ impl<Block: BlockT> LightStorage<Block> {
 }
 
 impl<Block> BlockchainHeaderBackend<Block> for LightStorage<Block>
-	where
-		Block: BlockT,
+where
+	Block: BlockT,
 {
 	fn header(&self, id: BlockId<Block>) -> ClientResult<Option<Block::Header>> {
 		utils::read_header(&*self.db, columns::KEY_LOOKUP, columns::HEADER, id)
@@ -165,12 +165,8 @@ impl<Block> BlockchainHeaderBackend<Block> for LightStorage<Block>
 
 	fn status(&self, id: BlockId<Block>) -> ClientResult<BlockStatus> {
 		let exists = match id {
-			BlockId::Hash(_) => read_db(
-				&*self.db,
-				columns::KEY_LOOKUP,
-				columns::HEADER,
-				id
-			)?.is_some(),
+			BlockId::Hash(_) =>
+				read_db(&*self.db, columns::KEY_LOOKUP, columns::HEADER, id)?.is_some(),
 			BlockId::Number(n) => n <= self.meta.read().best_number,
 		};
 		match exists {
@@ -180,7 +176,9 @@ impl<Block> BlockchainHeaderBackend<Block> for LightStorage<Block>
 	}
 
 	fn number(&self, hash: Block::Hash) -> ClientResult<Option<NumberFor<Block>>> {
-		if let Some(lookup_key) = block_id_to_lookup_key::<Block>(&*self.db, columns::KEY_LOOKUP, BlockId::Hash(hash))? {
+		if let Some(lookup_key) =
+			block_id_to_lookup_key::<Block>(&*self.db, columns::KEY_LOOKUP, BlockId::Hash(hash))?
+		{
 			let number = utils::lookup_key_to_number(&lookup_key)?;
 			Ok(Some(number))
 		} else {
@@ -196,17 +194,25 @@ impl<Block> BlockchainHeaderBackend<Block> for LightStorage<Block>
 impl<Block: BlockT> HeaderMetadata<Block> for LightStorage<Block> {
 	type Error = ClientError;
 
-	fn header_metadata(&self, hash: Block::Hash) -> Result<CachedHeaderMetadata<Block>, Self::Error> {
-		self.header_metadata_cache.header_metadata(hash).map_or_else(|| {
-			self.header(BlockId::hash(hash))?.map(|header| {
-				let header_metadata = CachedHeaderMetadata::from(&header);
-				self.header_metadata_cache.insert_header_metadata(
-					header_metadata.hash,
-					header_metadata.clone(),
-				);
-				header_metadata
-			}).ok_or_else(|| ClientError::UnknownBlock(format!("header not found in db: {}", hash)))
-		}, Ok)
+	fn header_metadata(
+		&self,
+		hash: Block::Hash,
+	) -> Result<CachedHeaderMetadata<Block>, Self::Error> {
+		self.header_metadata_cache.header_metadata(hash).map_or_else(
+			|| {
+				self.header(BlockId::hash(hash))?
+					.map(|header| {
+						let header_metadata = CachedHeaderMetadata::from(&header);
+						self.header_metadata_cache
+							.insert_header_metadata(header_metadata.hash, header_metadata.clone());
+						header_metadata
+					})
+					.ok_or_else(|| {
+						ClientError::UnknownBlock(format!("header not found in db: {}", hash))
+					})
+			},
+			Ok,
+		)
 	}
 
 	fn insert_header_metadata(&self, hash: Block::Hash, metadata: CachedHeaderMetadata<Block>) {
@@ -221,10 +227,9 @@ impl<Block: BlockT> HeaderMetadata<Block> for LightStorage<Block> {
 impl<Block: BlockT> LightStorage<Block> {
 	// Get block changes trie root, if available.
 	fn changes_trie_root(&self, block: BlockId<Block>) -> ClientResult<Option<Block::Hash>> {
-		self.header(block)
-			.map(|header| header.and_then(|header|
-				header.digest().log(DigestItem::as_changes_trie_root)
-					.cloned()))
+		self.header(block).map(|header| {
+			header.and_then(|header| header.digest().log(DigestItem::as_changes_trie_root).cloned())
+		})
 	}
 
 	/// Handle setting head within a transaction. `route_to` should be the last
@@ -251,14 +256,16 @@ impl<Block: BlockT> LightStorage<Block> {
 			for retracted in tree_route.retracted() {
 				if retracted.hash == meta.finalized_hash {
 					// TODO: can we recover here?
-					warn!("Safety failure: reverting finalized block {:?}",
-						  (&retracted.number, &retracted.hash));
+					warn!(
+						"Safety failure: reverting finalized block {:?}",
+						(&retracted.number, &retracted.hash)
+					);
 				}
 
 				utils::remove_number_to_key_mapping(
 					transaction,
 					columns::KEY_LOOKUP,
-					retracted.number
+					retracted.number,
 				)?;
 			}
 
@@ -267,7 +274,7 @@ impl<Block: BlockT> LightStorage<Block> {
 					transaction,
 					columns::KEY_LOOKUP,
 					enacted.number,
-					enacted.hash
+					enacted.hash,
 				)?;
 			}
 		}
@@ -292,10 +299,11 @@ impl<Block: BlockT> LightStorage<Block> {
 	) -> ClientResult<()> {
 		let meta = self.meta.read();
 		if &meta.finalized_hash != header.parent_hash() {
-			return Err(::sp_blockchain::Error::NonSequentialFinalization(
-				format!("Last finalized {:?} not parent of {:?}",
-					meta.finalized_hash, hash),
-			).into())
+			return Err(::sp_blockchain::Error::NonSequentialFinalization(format!(
+				"Last finalized {:?} not parent of {:?}",
+				meta.finalized_hash, hash
+			))
+			.into())
 		}
 
 		let lookup_key = utils::number_and_hash_to_lookup_key(header.number().clone(), hash)?;
@@ -313,12 +321,14 @@ impl<Block: BlockT> LightStorage<Block> {
 			});
 
 			let new_header_cht_root = cht::compute_root::<Block::Header, HashFor<Block>, _>(
-				cht::size(), new_cht_number, cht_range.map(|num| self.hash(num))
+				cht::size(),
+				new_cht_number,
+				cht_range.map(|num| self.hash(num)),
 			)?;
 			transaction.set(
 				columns::CHT,
 				&cht_key(HEADER_CHT_PREFIX, new_cht_start)?,
-				new_header_cht_root.as_ref()
+				new_header_cht_root.as_ref(),
 			);
 
 			// if the header includes changes trie root, let's build a changes tries roots CHT
@@ -329,14 +339,16 @@ impl<Block: BlockT> LightStorage<Block> {
 					current_num = current_num + One::one();
 					Some(old_current_num)
 				});
-				let new_changes_trie_cht_root = cht::compute_root::<Block::Header, HashFor<Block>, _>(
-					cht::size(), new_cht_number, cht_range
-						.map(|num| self.changes_trie_root(BlockId::Number(num)))
-				)?;
+				let new_changes_trie_cht_root =
+					cht::compute_root::<Block::Header, HashFor<Block>, _>(
+						cht::size(),
+						new_cht_number,
+						cht_range.map(|num| self.changes_trie_root(BlockId::Number(num))),
+					)?;
 				transaction.set(
 					columns::CHT,
 					&cht_key(CHANGES_TRIE_CHT_PREFIX, new_cht_start)?,
-					new_changes_trie_cht_root.as_ref()
+					new_changes_trie_cht_root.as_ref(),
 				);
 			}
 
@@ -354,7 +366,7 @@ impl<Block: BlockT> LightStorage<Block> {
 						transaction,
 						columns::KEY_LOOKUP,
 						prune_block,
-						hash
+						hash,
 					)?;
 					transaction.remove(columns::HEADER, &lookup_key);
 				}
@@ -370,7 +382,7 @@ impl<Block: BlockT> LightStorage<Block> {
 		&self,
 		cht_type: u8,
 		cht_size: NumberFor<Block>,
-		block: NumberFor<Block>
+		block: NumberFor<Block>,
 	) -> ClientResult<Option<Block::Hash>> {
 		let no_cht_for_block = || ClientError::Backend(format!("Missing CHT for block {}", block));
 
@@ -383,7 +395,8 @@ impl<Block: BlockT> LightStorage<Block> {
 		}
 
 		let cht_start = cht::start_number(cht_size, cht_number);
-		self.db.get(columns::CHT, &cht_key(cht_type, cht_start)?)
+		self.db
+			.get(columns::CHT, &cht_key(cht_type, cht_start)?)
 			.ok_or_else(no_cht_for_block)
 			.and_then(|hash| Block::Hash::decode(&mut &*hash).map_err(|_| no_cht_for_block()))
 			.map(Some)
@@ -391,15 +404,20 @@ impl<Block: BlockT> LightStorage<Block> {
 }
 
 impl<Block> AuxStore for LightStorage<Block>
-	where Block: BlockT,
+where
+	Block: BlockT,
 {
 	fn insert_aux<
 		'a,
 		'b: 'a,
 		'c: 'a,
-		I: IntoIterator<Item=&'a(&'c [u8], &'c [u8])>,
-		D: IntoIterator<Item=&'a &'b [u8]>,
-	>(&self, insert: I, delete: D) -> ClientResult<()> {
+		I: IntoIterator<Item = &'a (&'c [u8], &'c [u8])>,
+		D: IntoIterator<Item = &'a &'b [u8]>,
+	>(
+		&self,
+		insert: I,
+		delete: D,
+	) -> ClientResult<()> {
 		let mut transaction = Transaction::new();
 		for (k, v) in insert {
 			transaction.set(columns::AUX, k, v);
@@ -418,7 +436,8 @@ impl<Block> AuxStore for LightStorage<Block>
 }
 
 impl<Block> Storage<Block> for LightStorage<Block>
-	where Block: BlockT,
+where
+	Block: BlockT,
 {
 	fn import_header(
 		&self,
@@ -447,19 +466,12 @@ impl<Block> Storage<Block> for LightStorage<Block>
 			self.set_head_with_transaction(&mut transaction, parent_hash, (number, hash))?;
 		}
 
-		utils::insert_hash_to_key_mapping(
-			&mut transaction,
-			columns::KEY_LOOKUP,
-			number,
-			hash,
-		)?;
+		utils::insert_hash_to_key_mapping(&mut transaction, columns::KEY_LOOKUP, number, hash)?;
 		transaction.set_from_vec(columns::HEADER, &lookup_key, header.encode());
 
 		let header_metadata = CachedHeaderMetadata::from(&header);
-		self.header_metadata_cache.insert_header_metadata(
-			header.hash().clone(),
-			header_metadata,
-		);
+		self.header_metadata_cache
+			.insert_header_metadata(header.hash().clone(), header_metadata);
 
 		let is_genesis = number.is_zero();
 		if is_genesis {
@@ -474,25 +486,28 @@ impl<Block> Storage<Block> for LightStorage<Block>
 		};
 
 		if finalized {
-			self.note_finalized(
-				&mut transaction,
-				&header,
-				hash,
-			)?;
+			self.note_finalized(&mut transaction, &header, hash)?;
 		}
 
 		// update changes trie configuration cache
 		if !cache_at.contains_key(&well_known_cache_keys::CHANGES_TRIE_CONFIG) {
-			if let Some(new_configuration) = crate::changes_tries_storage::extract_new_configuration(&header) {
-				cache_at.insert(well_known_cache_keys::CHANGES_TRIE_CONFIG, new_configuration.encode());
+			if let Some(new_configuration) =
+				crate::changes_tries_storage::extract_new_configuration(&header)
+			{
+				cache_at
+					.insert(well_known_cache_keys::CHANGES_TRIE_CONFIG, new_configuration.encode());
 			}
 		}
 
 		{
 			let mut cache = self.cache.0.write();
-			let cache_ops = cache.transaction(&mut transaction)
+			let cache_ops = cache
+				.transaction(&mut transaction)
 				.on_block_insert(
-					ComplexBlockId::new(*header.parent_hash(), if number.is_zero() { Zero::zero() } else { number - One::one() }),
+					ComplexBlockId::new(
+						*header.parent_hash(),
+						if number.is_zero() { Zero::zero() } else { number - One::one() },
+					),
 					ComplexBlockId::new(hash, number),
 					cache_at,
 					if finalized { CacheEntryType::Final } else { CacheEntryType::NonFinal },
@@ -502,9 +517,10 @@ impl<Block> Storage<Block> for LightStorage<Block>
 			debug!("Light DB Commit {:?} ({})", hash, number);
 
 			self.db.commit(transaction)?;
-			cache.commit(cache_ops)
-				.expect("only fails if cache with given name isn't loaded yet;\
-						cache is already loaded because there are cache_ops; qed");
+			cache.commit(cache_ops).expect(
+				"only fails if cache with given name isn't loaded yet;\
+						cache is already loaded because there are cache_ops; qed",
+			);
 		}
 
 		self.update_meta(hash, number, leaf_state.is_best(), finalized);
@@ -518,7 +534,11 @@ impl<Block> Storage<Block> for LightStorage<Block>
 			let number = header.number();
 
 			let mut transaction = Transaction::new();
-			self.set_head_with_transaction(&mut transaction, hash.clone(), (number.clone(), hash.clone()))?;
+			self.set_head_with_transaction(
+				&mut transaction,
+				hash.clone(),
+				(number.clone(), hash.clone()),
+			)?;
 			self.db.commit(transaction)?;
 			self.update_meta(hash, header.number().clone(), true, false);
 
@@ -536,17 +556,22 @@ impl<Block> Storage<Block> for LightStorage<Block>
 			self.note_finalized(&mut transaction, &header, hash.clone())?;
 			{
 				let mut cache = self.cache.0.write();
-				let cache_ops = cache.transaction(&mut transaction)
+				let cache_ops = cache
+					.transaction(&mut transaction)
 					.on_block_finalize(
-						ComplexBlockId::new(*header.parent_hash(), if number.is_zero() { Zero::zero() } else { number - One::one() }),
-						ComplexBlockId::new(hash, number)
+						ComplexBlockId::new(
+							*header.parent_hash(),
+							if number.is_zero() { Zero::zero() } else { number - One::one() },
+						),
+						ComplexBlockId::new(hash, number),
 					)?
 					.into_ops();
 
 				self.db.commit(transaction)?;
-				cache.commit(cache_ops)
-					.expect("only fails if cache with given name isn't loaded yet;\
-							cache is already loaded because there are cache_ops; qed");
+				cache.commit(cache_ops).expect(
+					"only fails if cache with given name isn't loaded yet;\
+							cache is already loaded because there are cache_ops; qed",
+				);
 			}
 			self.update_meta(hash, header.number().clone(), false, true);
 
@@ -566,7 +591,7 @@ impl<Block> Storage<Block> for LightStorage<Block>
 
 	#[cfg(not(target_os = "unknown"))]
 	fn usage_info(&self) -> Option<UsageInfo> {
-		use sc_client_api::{MemoryInfo, IoInfo, MemorySize};
+		use sc_client_api::{IoInfo, MemoryInfo, MemorySize};
 
 		// TODO: reimplement IO stats
 		let database_cache = MemorySize::from_bytes(0);
@@ -591,7 +616,7 @@ impl<Block> Storage<Block> for LightStorage<Block>
 				state_reads_cache: 0,
 				state_writes_cache: 0,
 				state_writes_nodes: 0,
-			}
+			},
 		})
 	}
 
@@ -602,7 +627,8 @@ impl<Block> Storage<Block> for LightStorage<Block>
 }
 
 impl<Block> ProvideChtRoots<Block> for LightStorage<Block>
-	where Block: BlockT,
+where
+	Block: BlockT,
 {
 	fn header_cht_root(
 		&self,
@@ -630,12 +656,14 @@ fn cht_key<N: TryInto<u32>>(cht_type: u8, block: N) -> ClientResult<[u8; 5]> {
 
 #[cfg(test)]
 pub(crate) mod tests {
+	use super::*;
 	use sc_client_api::cht;
-	use sp_core::ChangesTrieConfiguration;
-	use sp_runtime::generic::{DigestItem, ChangesTrieSignal};
-	use sp_runtime::testing::{H256 as Hash, Header, Block as RawBlock, ExtrinsicWrapper};
 	use sp_blockchain::{lowest_common_ancestor, tree_route};
-	use super::*;
+	use sp_core::ChangesTrieConfiguration;
+	use sp_runtime::{
+		generic::{ChangesTrieSignal, DigestItem},
+		testing::{Block as RawBlock, ExtrinsicWrapper, Header, H256 as Hash},
+	};
 
 	type Block = RawBlock<ExtrinsicWrapper<u32>>;
 	type AuthorityId = sp_core::ed25519::Public;
@@ -652,7 +680,10 @@ pub(crate) mod tests {
 
 	fn header_with_changes_trie(parent: &Hash, number: u64) -> Header {
 		let mut header = default_header(parent, number);
-		header.digest.logs.push(DigestItem::ChangesTrieRoot([(number % 256) as u8; 32].into()));
+		header
+			.digest
+			.logs
+			.push(DigestItem::ChangesTrieRoot([(number % 256) as u8; 32].into()));
 		header
 	}
 
@@ -698,7 +729,8 @@ pub(crate) mod tests {
 	#[test]
 	fn returns_known_header() {
 		let db = LightStorage::new_test();
-		let known_hash = insert_block(&db, HashMap::new(), || default_header(&Default::default(), 0));
+		let known_hash =
+			insert_block(&db, HashMap::new(), || default_header(&Default::default(), 0));
 		let header_by_hash = db.header(BlockId::Hash(known_hash)).unwrap().unwrap();
 		let header_by_number = db.header(BlockId::Number(0)).unwrap().unwrap();
 		assert_eq!(header_by_hash, header_by_number);
@@ -714,7 +746,8 @@ pub(crate) mod tests {
 	#[test]
 	fn returns_info() {
 		let db = LightStorage::new_test();
-		let genesis_hash = insert_block(&db, HashMap::new(), || default_header(&Default::default(), 0));
+		let genesis_hash =
+			insert_block(&db, HashMap::new(), || default_header(&Default::default(), 0));
 		let info = db.info();
 		assert_eq!(info.best_hash, genesis_hash);
 		assert_eq!(info.best_number, 0);
@@ -729,17 +762,22 @@ pub(crate) mod tests {
 	#[test]
 	fn returns_block_status() {
 		let db = LightStorage::new_test();
-		let genesis_hash = insert_block(&db, HashMap::new(), || default_header(&Default::default(), 0));
+		let genesis_hash =
+			insert_block(&db, HashMap::new(), || default_header(&Default::default(), 0));
 		assert_eq!(db.status(BlockId::Hash(genesis_hash)).unwrap(), BlockStatus::InChain);
 		assert_eq!(db.status(BlockId::Number(0)).unwrap(), BlockStatus::InChain);
-		assert_eq!(db.status(BlockId::Hash(Hash::from_low_u64_be(1))).unwrap(), BlockStatus::Unknown);
+		assert_eq!(
+			db.status(BlockId::Hash(Hash::from_low_u64_be(1))).unwrap(),
+			BlockStatus::Unknown
+		);
 		assert_eq!(db.status(BlockId::Number(1)).unwrap(), BlockStatus::Unknown);
 	}
 
 	#[test]
 	fn returns_block_hash() {
 		let db = LightStorage::new_test();
-		let genesis_hash = insert_block(&db, HashMap::new(), || default_header(&Default::default(), 0));
+		let genesis_hash =
+			insert_block(&db, HashMap::new(), || default_header(&Default::default(), 0));
 		assert_eq!(db.hash(0).unwrap(), Some(genesis_hash));
 		assert_eq!(db.hash(1).unwrap(), None);
 	}
@@ -749,7 +787,8 @@ pub(crate) mod tests {
 		let raw_db = Arc::new(sp_database::MemDb::default());
 		let db = LightStorage::from_kvdb(raw_db.clone()).unwrap();
 
-		let genesis_hash = insert_block(&db, HashMap::new(), || default_header(&Default::default(), 0));
+		let genesis_hash =
+			insert_block(&db, HashMap::new(), || default_header(&Default::default(), 0));
 		assert_eq!(raw_db.count(columns::HEADER), 1);
 		assert_eq!(raw_db.count(columns::KEY_LOOKUP), 2);
 
@@ -760,43 +799,41 @@ pub(crate) mod tests {
 
 	#[test]
 	fn finalized_ancient_headers_are_replaced_with_cht() {
-		fn insert_headers<F: Fn(&Hash, u64) -> Header>(header_producer: F) ->
-			(Arc<sp_database::MemDb>, LightStorage<Block>)
-		{
+		fn insert_headers<F: Fn(&Hash, u64) -> Header>(
+			header_producer: F,
+		) -> (Arc<sp_database::MemDb>, LightStorage<Block>) {
 			let raw_db = Arc::new(sp_database::MemDb::default());
 			let db = LightStorage::from_kvdb(raw_db.clone()).unwrap();
 			let cht_size: u64 = cht::size();
 			let ucht_size: usize = cht_size as _;
 
 			// insert genesis block header (never pruned)
-			let mut prev_hash = insert_final_block(&db, HashMap::new(), || header_producer(&Default::default(), 0));
+			let mut prev_hash =
+				insert_final_block(&db, HashMap::new(), || header_producer(&Default::default(), 0));
 
 			// insert SIZE blocks && ensure that nothing is pruned
 
 			for number in 0..cht::size() {
-				prev_hash = insert_block(&db, HashMap::new(), || header_producer(&prev_hash, 1 + number));
+				prev_hash =
+					insert_block(&db, HashMap::new(), || header_producer(&prev_hash, 1 + number));
 			}
 			assert_eq!(raw_db.count(columns::HEADER), 1 + ucht_size);
 			assert_eq!(raw_db.count(columns::CHT), 0);
 
 			// insert next SIZE blocks && ensure that nothing is pruned
 			for number in 0..(cht_size as _) {
-				prev_hash = insert_block(
-					&db,
-					HashMap::new(),
-					|| header_producer(&prev_hash, 1 + cht_size + number),
-				);
+				prev_hash = insert_block(&db, HashMap::new(), || {
+					header_producer(&prev_hash, 1 + cht_size + number)
+				});
 			}
 			assert_eq!(raw_db.count(columns::HEADER), 1 + ucht_size + ucht_size);
 			assert_eq!(raw_db.count(columns::CHT), 0);
 
 			// insert block #{2 * cht::size() + 1} && check that new CHT is created + headers of this CHT are pruned
 			// nothing is yet finalized, so nothing is pruned.
-			prev_hash = insert_block(
-				&db,
-				HashMap::new(),
-				|| header_producer(&prev_hash, 1 + cht_size + cht_size),
-			);
+			prev_hash = insert_block(&db, HashMap::new(), || {
+				header_producer(&prev_hash, 1 + cht_size + cht_size)
+			});
 			assert_eq!(raw_db.count(columns::HEADER), 2 + ucht_size + ucht_size);
 			assert_eq!(raw_db.count(columns::CHT), 0);
 
@@ -839,7 +876,10 @@ pub(crate) mod tests {
 	#[test]
 	fn get_cht_fails_for_non_existent_cht() {
 		let cht_size: u64 = cht::size();
-		assert!(LightStorage::<Block>::new_test().header_cht_root(cht_size, cht_size / 2).unwrap().is_none());
+		assert!(LightStorage::<Block>::new_test()
+			.header_cht_root(cht_size, cht_size / 2)
+			.unwrap()
+			.is_none());
 	}
 
 	#[test]
@@ -847,26 +887,41 @@ pub(crate) mod tests {
 		let db = LightStorage::new_test();
 
 		// insert 1 + SIZE + SIZE + 1 blocks so that CHT#0 is created
-		let mut prev_hash = insert_final_block(&db, HashMap::new(), || header_with_changes_trie(&Default::default(), 0));
+		let mut prev_hash = insert_final_block(&db, HashMap::new(), || {
+			header_with_changes_trie(&Default::default(), 0)
+		});
 		let cht_size: u64 = cht::size();
 		let ucht_size: usize = cht_size as _;
 		for i in 1..1 + ucht_size + ucht_size + 1 {
-			prev_hash = insert_block(&db, HashMap::new(), || header_with_changes_trie(&prev_hash, i as u64));
+			prev_hash = insert_block(&db, HashMap::new(), || {
+				header_with_changes_trie(&prev_hash, i as u64)
+			});
 			db.finalize_header(BlockId::Hash(prev_hash)).unwrap();
 		}
 
-		let cht_root_1 = db.header_cht_root(cht_size, cht::start_number(cht_size, 0)).unwrap().unwrap();
-		let cht_root_2 = db.header_cht_root(cht_size, cht::start_number(cht_size, 0) + cht_size / 2).unwrap().unwrap();
-		let cht_root_3 = db.header_cht_root(cht_size, cht::end_number(cht_size, 0)).unwrap().unwrap();
+		let cht_root_1 =
+			db.header_cht_root(cht_size, cht::start_number(cht_size, 0)).unwrap().unwrap();
+		let cht_root_2 = db
+			.header_cht_root(cht_size, cht::start_number(cht_size, 0) + cht_size / 2)
+			.unwrap()
+			.unwrap();
+		let cht_root_3 =
+			db.header_cht_root(cht_size, cht::end_number(cht_size, 0)).unwrap().unwrap();
 		assert_eq!(cht_root_1, cht_root_2);
 		assert_eq!(cht_root_2, cht_root_3);
 
-		let cht_root_1 = db.changes_trie_cht_root(cht_size, cht::start_number(cht_size, 0)).unwrap().unwrap();
-		let cht_root_2 = db.changes_trie_cht_root(
-			cht_size,
-			cht::start_number(cht_size, 0) + cht_size / 2,
-		).unwrap().unwrap();
-		let cht_root_3 = db.changes_trie_cht_root(cht_size, cht::end_number(cht_size, 0)).unwrap().unwrap();
+		let cht_root_1 = db
+			.changes_trie_cht_root(cht_size, cht::start_number(cht_size, 0))
+			.unwrap()
+			.unwrap();
+		let cht_root_2 = db
+			.changes_trie_cht_root(cht_size, cht::start_number(cht_size, 0) + cht_size / 2)
+			.unwrap()
+			.unwrap();
+		let cht_root_3 = db
+			.changes_trie_cht_root(cht_size, cht::end_number(cht_size, 0))
+			.unwrap()
+			.unwrap();
 		assert_eq!(cht_root_1, cht_root_2);
 		assert_eq!(cht_root_2, cht_root_3);
 	}
@@ -882,15 +937,23 @@ pub(crate) mod tests {
 		let a3 = insert_block(&db, HashMap::new(), || default_header(&a2, 3));
 
 		// fork from genesis: 2 prong.
-		let b1 = insert_block(&db, HashMap::new(), || header_with_extrinsics_root(&block0, 1, Hash::from([1; 32])));
+		let b1 = insert_block(&db, HashMap::new(), || {
+			header_with_extrinsics_root(&block0, 1, Hash::from([1; 32]))
+		});
 		let b2 = insert_block(&db, HashMap::new(), || default_header(&b1, 2));
 
 		{
 			let tree_route = tree_route(&db, a3, b2).unwrap();
 
 			assert_eq!(tree_route.common_block().hash, block0);
-			assert_eq!(tree_route.retracted().iter().map(|r| r.hash).collect::<Vec<_>>(), vec![a3, a2, a1]);
-			assert_eq!(tree_route.enacted().iter().map(|r| r.hash).collect::<Vec<_>>(), vec![b1, b2]);
+			assert_eq!(
+				tree_route.retracted().iter().map(|r| r.hash).collect::<Vec<_>>(),
+				vec![a3, a2, a1]
+			);
+			assert_eq!(
+				tree_route.enacted().iter().map(|r| r.hash).collect::<Vec<_>>(),
+				vec![b1, b2]
+			);
 		}
 
 		{
@@ -898,14 +961,20 @@ pub(crate) mod tests {
 
 			assert_eq!(tree_route.common_block().hash, a1);
 			assert!(tree_route.retracted().is_empty());
-			assert_eq!(tree_route.enacted().iter().map(|r| r.hash).collect::<Vec<_>>(), vec![a2, a3]);
+			assert_eq!(
+				tree_route.enacted().iter().map(|r| r.hash).collect::<Vec<_>>(),
+				vec![a2, a3]
+			);
 		}
 
 		{
 			let tree_route = tree_route(&db, a3, a1).unwrap();
 
 			assert_eq!(tree_route.common_block().hash, a1);
-			assert_eq!(tree_route.retracted().iter().map(|r| r.hash).collect::<Vec<_>>(), vec![a3, a2]);
+			assert_eq!(
+				tree_route.retracted().iter().map(|r| r.hash).collect::<Vec<_>>(),
+				vec![a3, a2]
+			);
 			assert!(tree_route.enacted().is_empty());
 		}
 
@@ -929,7 +998,9 @@ pub(crate) mod tests {
 		let a3 = insert_block(&db, HashMap::new(), || default_header(&a2, 3));
 
 		// fork from genesis: 2 prong.
-		let b1 = insert_block(&db, HashMap::new(), || header_with_extrinsics_root(&block0, 1, Hash::from([1; 32])));
+		let b1 = insert_block(&db, HashMap::new(), || {
+			header_with_extrinsics_root(&block0, 1, Hash::from([1; 32]))
+		});
 		let b2 = insert_block(&db, HashMap::new(), || default_header(&b1, 2));
 
 		{
@@ -979,7 +1050,11 @@ pub(crate) mod tests {
 	fn authorities_are_cached() {
 		let db = LightStorage::new_test();
 
-		fn run_checks(db: &LightStorage<Block>, max: u64, checks: &[(u64, Option<Vec<AuthorityId>>)]) {
+		fn run_checks(
+			db: &LightStorage<Block>,
+			max: u64,
+			checks: &[(u64, Option<Vec<AuthorityId>>)],
+		) {
 			for (at, expected) in checks.iter().take_while(|(at, _)| *at <= max) {
 				let actual = authorities(db.cache(), BlockId::Number(*at));
 				assert_eq!(*expected, actual);
@@ -990,14 +1065,21 @@ pub(crate) mod tests {
 			HashMap::new()
 		}
 
-		fn make_authorities(authorities: Vec<AuthorityId>) -> HashMap<well_known_cache_keys::Id, Vec<u8>> {
+		fn make_authorities(
+			authorities: Vec<AuthorityId>,
+		) -> HashMap<well_known_cache_keys::Id, Vec<u8>> {
 			let mut map = HashMap::new();
 			map.insert(well_known_cache_keys::AUTHORITIES, authorities.encode());
 			map
 		}
 
-		fn authorities(cache: &dyn BlockchainCache<Block>, at: BlockId<Block>) -> Option<Vec<AuthorityId>> {
-			cache.get_at(&well_known_cache_keys::AUTHORITIES, &at).unwrap_or(None)
+		fn authorities(
+			cache: &dyn BlockchainCache<Block>,
+			at: BlockId<Block>,
+		) -> Option<Vec<AuthorityId>> {
+			cache
+				.get_at(&well_known_cache_keys::AUTHORITIES, &at)
+				.unwrap_or(None)
 				.and_then(|(_, _, val)| Decode::decode(&mut &val[..]).ok())
 		}
 
@@ -1021,17 +1103,27 @@ pub(crate) mod tests {
 				(6, Some(vec![auth1(), auth2()])),
 			];
 
-			let hash0 = insert_final_block(&db, same_authorities(), || default_header(&Default::default(), 0));
+			let hash0 = insert_final_block(&db, same_authorities(), || {
+				default_header(&Default::default(), 0)
+			});
 			run_checks(&db, 0, &checks);
 			let hash1 = insert_final_block(&db, same_authorities(), || default_header(&hash0, 1));
 			run_checks(&db, 1, &checks);
-			let hash2 = insert_final_block(&db, make_authorities(vec![auth1()]), || default_header(&hash1, 2));
+			let hash2 = insert_final_block(&db, make_authorities(vec![auth1()]), || {
+				default_header(&hash1, 2)
+			});
 			run_checks(&db, 2, &checks);
-			let hash3 = insert_final_block(&db, make_authorities(vec![auth1()]), || default_header(&hash2, 3));
+			let hash3 = insert_final_block(&db, make_authorities(vec![auth1()]), || {
+				default_header(&hash2, 3)
+			});
 			run_checks(&db, 3, &checks);
-			let hash4 = insert_final_block(&db, make_authorities(vec![auth1(), auth2()]), || default_header(&hash3, 4));
+			let hash4 = insert_final_block(&db, make_authorities(vec![auth1(), auth2()]), || {
+				default_header(&hash3, 4)
+			});
 			run_checks(&db, 4, &checks);
-			let hash5 = insert_final_block(&db, make_authorities(vec![auth1(), auth2()]), || default_header(&hash4, 5));
+			let hash5 = insert_final_block(&db, make_authorities(vec![auth1(), auth2()]), || {
+				default_header(&hash4, 5)
+			});
 			run_checks(&db, 5, &checks);
 			let hash6 = insert_final_block(&db, same_authorities(), || default_header(&hash5, 6));
 			run_checks(&db, 6, &checks);
@@ -1043,9 +1135,14 @@ pub(crate) mod tests {
 			// some older non-best blocks are inserted
 			// ... -> B2(1) -> B2_1(1) -> B2_2(2)
 			// => the cache ignores all writes before best finalized block
-			let hash2_1 = insert_non_best_block(&db, make_authorities(vec![auth1()]), || default_header(&hash2, 3));
+			let hash2_1 = insert_non_best_block(&db, make_authorities(vec![auth1()]), || {
+				default_header(&hash2, 3)
+			});
 			assert_eq!(None, authorities(db.cache(), BlockId::Hash(hash2_1)));
-			let hash2_2 = insert_non_best_block(&db, make_authorities(vec![auth1(), auth2()]), || default_header(&hash2_1, 4));
+			let hash2_2 =
+				insert_non_best_block(&db, make_authorities(vec![auth1(), auth2()]), || {
+					default_header(&hash2_1, 4)
+				});
 			assert_eq!(None, authorities(db.cache(), BlockId::Hash(hash2_2)));
 		}
 
@@ -1056,51 +1153,41 @@ pub(crate) mod tests {
 			//                     \> B6_1_1(5)
 			//                     \> B6_1_2(6) -> B6_1_3(7)
 
-			let hash7 = insert_block(&db, make_authorities(vec![auth3()]), || default_header(&hash6, 7));
-			assert_eq!(
-				authorities(db.cache(), BlockId::Hash(hash6)),
-				Some(vec![auth1(), auth2()]),
-			);
+			let hash7 =
+				insert_block(&db, make_authorities(vec![auth3()]), || default_header(&hash6, 7));
+			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6)), Some(vec![auth1(), auth2()]),);
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash7)), Some(vec![auth3()]));
-			let hash8 = insert_block(&db, make_authorities(vec![auth3()]), || default_header(&hash7, 8));
-			assert_eq!(
-				authorities(db.cache(), BlockId::Hash(hash6)),
-				Some(vec![auth1(), auth2()]),
-			);
+			let hash8 =
+				insert_block(&db, make_authorities(vec![auth3()]), || default_header(&hash7, 8));
+			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6)), Some(vec![auth1(), auth2()]),);
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash7)), Some(vec![auth3()]));
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash8)), Some(vec![auth3()]));
-			let hash6_1 = insert_block(&db, make_authorities(vec![auth4()]), || default_header(&hash6, 7));
-			assert_eq!(
-				authorities(db.cache(), BlockId::Hash(hash6)),
-				Some(vec![auth1(), auth2()]),
-			);
+			let hash6_1 =
+				insert_block(&db, make_authorities(vec![auth4()]), || default_header(&hash6, 7));
+			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6)), Some(vec![auth1(), auth2()]),);
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash7)), Some(vec![auth3()]));
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash8)), Some(vec![auth3()]));
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6_1)), Some(vec![auth4()]));
-			let hash6_1_1 = insert_non_best_block(&db, make_authorities(vec![auth5()]), || default_header(&hash6_1, 8));
-			assert_eq!(
-				authorities(db.cache(), BlockId::Hash(hash6)),
-				Some(vec![auth1(), auth2()]),
-			);
+			let hash6_1_1 = insert_non_best_block(&db, make_authorities(vec![auth5()]), || {
+				default_header(&hash6_1, 8)
+			});
+			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6)), Some(vec![auth1(), auth2()]),);
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash7)), Some(vec![auth3()]));
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash8)), Some(vec![auth3()]));
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6_1)), Some(vec![auth4()]));
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6_1_1)), Some(vec![auth5()]));
-			let hash6_1_2 = insert_non_best_block(&db, make_authorities(vec![auth6()]), || default_header(&hash6_1, 8));
-			assert_eq!(
-				authorities(db.cache(), BlockId::Hash(hash6)),
-				Some(vec![auth1(), auth2()]),
-			);
+			let hash6_1_2 = insert_non_best_block(&db, make_authorities(vec![auth6()]), || {
+				default_header(&hash6_1, 8)
+			});
+			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6)), Some(vec![auth1(), auth2()]),);
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash7)), Some(vec![auth3()]));
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash8)), Some(vec![auth3()]));
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6_1)), Some(vec![auth4()]));
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6_1_1)), Some(vec![auth5()]));
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6_1_2)), Some(vec![auth6()]));
-			let hash6_2 = insert_block(&db, make_authorities(vec![auth4()]), || default_header(&hash6_1, 8));
-			assert_eq!(
-				authorities(db.cache(), BlockId::Hash(hash6)),
-				Some(vec![auth1(), auth2()]),
-			);
+			let hash6_2 =
+				insert_block(&db, make_authorities(vec![auth4()]), || default_header(&hash6_1, 8));
+			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6)), Some(vec![auth1(), auth2()]),);
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash7)), Some(vec![auth3()]));
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash8)), Some(vec![auth3()]));
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6_1)), Some(vec![auth4()]));
@@ -1114,10 +1201,7 @@ pub(crate) mod tests {
 		{
 			// finalize block hash6_1
 			db.finalize_header(BlockId::Hash(hash6_1)).unwrap();
-			assert_eq!(
-				authorities(db.cache(), BlockId::Hash(hash6)),
-				Some(vec![auth1(), auth2()]),
-			);
+			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6)), Some(vec![auth1(), auth2()]),);
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash7)), None);
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash8)), None);
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6_1)), Some(vec![auth4()]));
@@ -1126,10 +1210,7 @@ pub(crate) mod tests {
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6_2)), Some(vec![auth4()]));
 			// finalize block hash6_2
 			db.finalize_header(BlockId::Hash(hash6_2)).unwrap();
-			assert_eq!(
-				authorities(db.cache(), BlockId::Hash(hash6)),
-				Some(vec![auth1(), auth2()]),
-			);
+			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6)), Some(vec![auth1(), auth2()]),);
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash7)), None);
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash8)), None);
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6_1)), Some(vec![auth4()]));
@@ -1142,7 +1223,8 @@ pub(crate) mod tests {
 	#[test]
 	fn database_is_reopened() {
 		let db = LightStorage::new_test();
-		let hash0 = insert_final_block(&db, HashMap::new(), || default_header(&Default::default(), 0));
+		let hash0 =
+			insert_final_block(&db, HashMap::new(), || default_header(&Default::default(), 0));
 		assert_eq!(db.info().best_hash, hash0);
 		assert_eq!(db.header(BlockId::Hash(hash0)).unwrap().unwrap().hash(), hash0);
 
@@ -1157,7 +1239,8 @@ pub(crate) mod tests {
 		let db = LightStorage::<Block>::new_test();
 
 		// insert aux1 + aux2 using direct store access
-		db.insert_aux(&[(&[1][..], &[101][..]), (&[2][..], &[102][..])], ::std::iter::empty()).unwrap();
+		db.insert_aux(&[(&[1][..], &[101][..]), (&[2][..], &[102][..])], ::std::iter::empty())
+			.unwrap();
 
 		// check aux values
 		assert_eq!(db.get_aux(&[1]).unwrap(), Some(vec![101]));
@@ -1165,10 +1248,13 @@ pub(crate) mod tests {
 		assert_eq!(db.get_aux(&[3]).unwrap(), None);
 
 		// delete aux1 + insert aux3 using import operation
-		db.import_header(default_header(&Default::default(), 0), HashMap::new(), NewBlockState::Best, vec![
-			(vec![3], Some(vec![103])),
-			(vec![1], None),
-		]).unwrap();
+		db.import_header(
+			default_header(&Default::default(), 0),
+			HashMap::new(),
+			NewBlockState::Best,
+			vec![(vec![3], Some(vec![103])), (vec![1], None)],
+		)
+		.unwrap();
 
 		// check aux values
 		assert_eq!(db.get_aux(&[1]).unwrap(), None);
@@ -1208,7 +1294,8 @@ pub(crate) mod tests {
 		};
 
 		// restart && check that after restart value is read from the cache
-		let db = LightStorage::<Block>::from_kvdb(storage as Arc<_>).expect("failed to create test-db");
+		let db =
+			LightStorage::<Block>::from_kvdb(storage as Arc<_>).expect("failed to create test-db");
 		assert_eq!(
 			db.cache().get_at(b"test", &BlockId::Number(0)).unwrap(),
 			Some(((0, genesis_hash.unwrap()), None, vec![42])),
@@ -1224,7 +1311,9 @@ pub(crate) mod tests {
 		// insert block#0 && block#1 (no value for cache is provided)
 		let hash0 = insert_block(&db, HashMap::new(), || default_header(&Default::default(), 0));
 		assert_eq!(
-			db.cache().get_at(&well_known_cache_keys::CHANGES_TRIE_CONFIG, &BlockId::Number(0)).unwrap()
+			db.cache()
+				.get_at(&well_known_cache_keys::CHANGES_TRIE_CONFIG, &BlockId::Number(0))
+				.unwrap()
 				.map(|(_, _, v)| ChangesTrieConfiguration::decode(&mut &v[..]).unwrap()),
 			None,
 		);
@@ -1232,13 +1321,15 @@ pub(crate) mod tests {
 		// insert configuration at block#1 (starts from block#2)
 		insert_block(&db, HashMap::new(), || {
 			let mut header = default_header(&hash0, 1);
-			header.digest_mut().push(
-				DigestItem::ChangesTrieSignal(ChangesTrieSignal::NewConfiguration(new_config.clone()))
-			);
+			header.digest_mut().push(DigestItem::ChangesTrieSignal(
+				ChangesTrieSignal::NewConfiguration(new_config.clone()),
+			));
 			header
 		});
 		assert_eq!(
-			db.cache().get_at(&well_known_cache_keys::CHANGES_TRIE_CONFIG, &BlockId::Number(1)).unwrap()
+			db.cache()
+				.get_at(&well_known_cache_keys::CHANGES_TRIE_CONFIG, &BlockId::Number(1))
+				.unwrap()
 				.map(|(_, _, v)| Option::<ChangesTrieConfiguration>::decode(&mut &v[..]).unwrap()),
 			Some(new_config),
 		);
diff --git a/client/db/src/offchain.rs b/client/db/src/offchain.rs
index df45c4946e62..c31273ff07c6 100644
--- a/client/db/src/offchain.rs
+++ b/client/db/src/offchain.rs
@@ -21,8 +21,8 @@
 use std::{collections::HashMap, sync::Arc};
 
 use crate::{columns, Database, DbHash, Transaction};
-use parking_lot::Mutex;
 use log::error;
+use parking_lot::Mutex;
 
 /// Offchain local storage
 #[derive(Clone)]
@@ -33,8 +33,7 @@ pub struct LocalStorage {
 
 impl std::fmt::Debug for LocalStorage {
 	fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {
-		fmt.debug_struct("LocalStorage")
-			.finish()
+		fmt.debug_struct("LocalStorage").finish()
 	}
 }
 
@@ -49,10 +48,7 @@ impl LocalStorage {
 
 	/// Create offchain local storage with given `KeyValueDB` backend.
 	pub fn new(db: Arc<dyn Database<DbHash>>) -> Self {
-		Self {
-			db,
-			locks: Default::default(),
-		}
+		Self { db, locks: Default::default() }
 	}
 }
 
@@ -118,11 +114,7 @@ impl sp_core::offchain::OffchainStorage for LocalStorage {
 
 /// Concatenate the prefix and key to create an offchain key in the db.
 pub(crate) fn concatenate_prefix_and_key(prefix: &[u8], key: &[u8]) -> Vec<u8> {
-	prefix
-		.iter()
-		.chain(key.into_iter())
-		.cloned()
-		.collect()
+	prefix.iter().chain(key.into_iter()).cloned().collect()
 }
 
 #[cfg(test)]
@@ -155,5 +147,4 @@ mod tests {
 		assert_eq!(storage.get(prefix, key), Some(b"asd".to_vec()));
 		assert!(storage.locks.lock().is_empty(), "Locks map should be empty!");
 	}
-
 }
diff --git a/client/db/src/parity_db.rs b/client/db/src/parity_db.rs
index ed39c1e9f669..07f58baf0154 100644
--- a/client/db/src/parity_db.rs
+++ b/client/db/src/parity_db.rs
@@ -15,27 +15,29 @@
 
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
+use crate::{
+	columns,
+	utils::{DatabaseType, NUM_COLUMNS},
+};
 /// A `Database` adapter for parity-db.
-
-use sp_database::{Database, Change, ColumnId, Transaction, error::DatabaseError};
-use crate::utils::{DatabaseType, NUM_COLUMNS};
-use crate::columns;
+use sp_database::{error::DatabaseError, Change, ColumnId, Database, Transaction};
 
 struct DbAdapter(parity_db::Db);
 
 fn handle_err<T>(result: parity_db::Result<T>) -> T {
 	match result {
 		Ok(r) => r,
-		Err(e) =>  {
+		Err(e) => {
 			panic!("Critical database error: {:?}", e);
-		}
+		},
 	}
 }
 
 /// Wrap parity-db database into a trait object that implements `sp_database::Database`
-pub fn open<H: Clone + AsRef<[u8]>>(path: &std::path::Path, db_type: DatabaseType)
-	-> parity_db::Result<std::sync::Arc<dyn Database<H>>>
-{
+pub fn open<H: Clone + AsRef<[u8]>>(
+	path: &std::path::Path,
+	db_type: DatabaseType,
+) -> parity_db::Result<std::sync::Arc<dyn Database<H>>> {
 	let mut config = parity_db::Options::with_columns(path, NUM_COLUMNS as u8);
 	config.sync = true; // Flush each commit
 	if db_type == DatabaseType::Full {
@@ -50,13 +52,11 @@ pub fn open<H: Clone + AsRef<[u8]>>(path: &std::path::Path, db_type: DatabaseTyp
 
 impl<H: Clone + AsRef<[u8]>> Database<H> for DbAdapter {
 	fn commit(&self, transaction: Transaction<H>) -> Result<(), DatabaseError> {
-		handle_err(self.0.commit(transaction.0.into_iter().map(|change|
-			match change {
-				Change::Set(col, key, value) => (col as u8, key, Some(value)),
-				Change::Remove(col, key) => (col as u8, key, None),
-				_ => unimplemented!(),
-			}))
-		);
+		handle_err(self.0.commit(transaction.0.into_iter().map(|change| match change {
+			Change::Set(col, key, value) => (col as u8, key, Some(value)),
+			Change::Remove(col, key) => (col as u8, key, None),
+			_ => unimplemented!(),
+		})));
 
 		Ok(())
 	}
diff --git a/client/db/src/stats.rs b/client/db/src/stats.rs
index 3fd93db931d0..9223142ef5ab 100644
--- a/client/db/src/stats.rs
+++ b/client/db/src/stats.rs
@@ -65,7 +65,10 @@ impl StateUsageStats {
 
 	/// Tally one key read.
 	pub fn tally_key_read(&self, key: &[u8], val: Option<&Vec<u8>>, cache: bool) {
-		self.tally_read(key.len() as u64 + val.as_ref().map(|x| x.len() as u64).unwrap_or(0), cache);
+		self.tally_read(
+			key.len() as u64 + val.as_ref().map(|x| x.len() as u64).unwrap_or(0),
+			cache,
+		);
 	}
 
 	/// Tally one child key read.
@@ -103,9 +106,11 @@ impl StateUsageStats {
 		self.reads.fetch_add(info.reads.ops, AtomicOrdering::Relaxed);
 		self.bytes_read.fetch_add(info.reads.bytes, AtomicOrdering::Relaxed);
 		self.writes_nodes.fetch_add(info.nodes_writes.ops, AtomicOrdering::Relaxed);
-		self.bytes_written_nodes.fetch_add(info.nodes_writes.bytes, AtomicOrdering::Relaxed);
+		self.bytes_written_nodes
+			.fetch_add(info.nodes_writes.bytes, AtomicOrdering::Relaxed);
 		self.removed_nodes.fetch_add(info.removed_nodes.ops, AtomicOrdering::Relaxed);
-		self.bytes_removed_nodes.fetch_add(info.removed_nodes.bytes, AtomicOrdering::Relaxed);
+		self.bytes_removed_nodes
+			.fetch_add(info.removed_nodes.bytes, AtomicOrdering::Relaxed);
 		self.reads_cache.fetch_add(info.cache_reads.ops, AtomicOrdering::Relaxed);
 		self.bytes_read_cache.fetch_add(info.cache_reads.bytes, AtomicOrdering::Relaxed);
 	}
diff --git a/client/db/src/storage_cache.rs b/client/db/src/storage_cache.rs
index e4b595146546..d5aa43e8bac9 100644
--- a/client/db/src/storage_cache.rs
+++ b/client/db/src/storage_cache.rs
@@ -20,21 +20,22 @@
 //! Tracks changes over the span of a few recent blocks and handles forks
 //! by tracking/removing cache entries for conflicting changes.
 
-use std::collections::{VecDeque, HashSet, HashMap};
-use std::sync::Arc;
-use std::hash::Hash as StdHash;
-use parking_lot::{RwLock, RwLockUpgradableReadGuard};
-use linked_hash_map::{LinkedHashMap, Entry};
+use crate::{stats::StateUsageStats, utils::Meta};
 use hash_db::Hasher;
-use sp_runtime::traits::{Block as BlockT, Header, HashFor, NumberFor};
-use sp_core::hexdisplay::HexDisplay;
-use sp_core::storage::ChildInfo;
+use linked_hash_map::{Entry, LinkedHashMap};
+use log::trace;
+use parking_lot::{RwLock, RwLockUpgradableReadGuard};
+use sp_core::{hexdisplay::HexDisplay, storage::ChildInfo};
+use sp_runtime::traits::{Block as BlockT, HashFor, Header, NumberFor};
 use sp_state_machine::{
-	backend::Backend as StateBackend, TrieBackend, StorageKey, StorageValue,
-	StorageCollection, ChildStorageCollection,
+	backend::Backend as StateBackend, ChildStorageCollection, StorageCollection, StorageKey,
+	StorageValue, TrieBackend,
+};
+use std::{
+	collections::{HashMap, HashSet, VecDeque},
+	hash::Hash as StdHash,
+	sync::Arc,
 };
-use log::trace;
-use crate::{utils::Meta, stats::StateUsageStats};
 
 const STATE_CACHE_BLOCKS: usize = 12;
 
@@ -75,7 +76,7 @@ impl EstimateSize for Vec<u8> {
 
 impl EstimateSize for Option<Vec<u8>> {
 	fn estimate_size(&self) -> usize {
-		self.as_ref().map(|v|v.capacity()).unwrap_or(0)
+		self.as_ref().map(|v| v.capacity()).unwrap_or(0)
 	}
 }
 
@@ -84,7 +85,7 @@ struct OptionHOut<T: AsRef<[u8]>>(Option<T>);
 impl<T: AsRef<[u8]>> EstimateSize for OptionHOut<T> {
 	fn estimate_size(&self) -> usize {
 		// capacity would be better
-		self.0.as_ref().map(|v|v.as_ref().len()).unwrap_or(0)
+		self.0.as_ref().map(|v| v.as_ref().len()).unwrap_or(0)
 	}
 }
 
@@ -125,20 +126,22 @@ impl<K: EstimateSize + Eq + StdHash, V: EstimateSize> LRUMap<K, V> {
 		};
 
 		while *storage_used_size > limit {
-			if let Some((k,v)) = lmap.pop_front() {
+			if let Some((k, v)) = lmap.pop_front() {
 				*storage_used_size -= k.estimate_size();
 				*storage_used_size -= v.estimate_size();
 			} else {
 				// can happen fairly often as we get value from multiple lru
 				// and only remove from a single lru
-				break;
+				break
 			}
 		}
 	}
 
-	fn get<Q:?Sized>(&mut self, k: &Q) -> Option<&mut V>
-		where K: std::borrow::Borrow<Q>,
-			Q: StdHash + Eq {
+	fn get<Q: ?Sized>(&mut self, k: &Q) -> Option<&mut V>
+	where
+		K: std::borrow::Borrow<Q>,
+		Q: StdHash + Eq,
+	{
 		self.0.get_refresh(k)
 	}
 
@@ -149,15 +152,13 @@ impl<K: EstimateSize + Eq + StdHash, V: EstimateSize> LRUMap<K, V> {
 		self.0.clear();
 		self.1 = 0;
 	}
-
 }
 
 impl<B: BlockT> Cache<B> {
 	/// Returns the used memory size of the storage cache in bytes.
 	pub fn used_storage_cache_size(&self) -> usize {
-		self.lru_storage.used_size()
-			+ self.lru_child_storage.used_size()
-			//  ignore small hashes storage and self.lru_hashes.used_size()
+		self.lru_storage.used_size() + self.lru_child_storage.used_size()
+		//  ignore small hashes storage and self.lru_hashes.used_size()
 	}
 
 	/// Synchronize the shared cache with the best block state.
@@ -233,20 +234,16 @@ pub fn new_shared_cache<B: BlockT>(
 	child_ratio: (usize, usize),
 ) -> SharedCache<B> {
 	let top = child_ratio.1.saturating_sub(child_ratio.0);
-	Arc::new(
-		RwLock::new(
-			Cache {
-				lru_storage: LRUMap(
-					LinkedHashMap::new(), 0, shared_cache_size * top / child_ratio.1
-				),
-				lru_hashes: LRUMap(LinkedHashMap::new(), 0, FIX_LRU_HASH_SIZE),
-				lru_child_storage: LRUMap(
-					LinkedHashMap::new(), 0, shared_cache_size * child_ratio.0 / child_ratio.1
-				),
-				modifications: VecDeque::new(),
-			}
-		)
-	)
+	Arc::new(RwLock::new(Cache {
+		lru_storage: LRUMap(LinkedHashMap::new(), 0, shared_cache_size * top / child_ratio.1),
+		lru_hashes: LRUMap(LinkedHashMap::new(), 0, FIX_LRU_HASH_SIZE),
+		lru_child_storage: LRUMap(
+			LinkedHashMap::new(),
+			0,
+			shared_cache_size * child_ratio.0 / child_ratio.1,
+		),
+		modifications: VecDeque::new(),
+	}))
 }
 
 #[derive(Debug)]
@@ -393,16 +390,15 @@ impl<B: BlockT> CacheChanges<B> {
 			}
 		}
 
-		if let (
-			Some(ref number), Some(ref hash), Some(ref parent))
-				= (commit_number, commit_hash, self.parent_hash)
+		if let (Some(ref number), Some(ref hash), Some(ref parent)) =
+			(commit_number, commit_hash, self.parent_hash)
 		{
 			if cache.modifications.len() == STATE_CACHE_BLOCKS {
 				cache.modifications.pop_back();
 			}
 			let mut modifications = HashSet::new();
 			let mut child_modifications = HashSet::new();
-			child_changes.into_iter().for_each(|(sk, changes)|
+			child_changes.into_iter().for_each(|(sk, changes)| {
 				for (k, v) in changes.into_iter() {
 					let k = (sk.clone(), k);
 					if is_best {
@@ -410,7 +406,7 @@ impl<B: BlockT> CacheChanges<B> {
 					}
 					child_modifications.insert(k);
 				}
-			);
+			});
 			for (k, v) in changes.into_iter() {
 				if is_best {
 					cache.lru_hashes.remove(&k);
@@ -428,7 +424,9 @@ impl<B: BlockT> CacheChanges<B> {
 				is_canon: is_best,
 				parent: parent.clone(),
 			};
-			let insert_at = cache.modifications.iter()
+			let insert_at = cache
+				.modifications
+				.iter()
 				.enumerate()
 				.find(|(_, m)| m.number < *number)
 				.map(|(i, _)| i);
@@ -471,13 +469,16 @@ impl<S: StateBackend<HashFor<B>>, B: BlockT> CachingState<S, B> {
 		key: Option<&[u8]>,
 		child_key: Option<&ChildStorageKey>,
 		parent_hash: &Option<B::Hash>,
-		modifications: &VecDeque<BlockChanges<B::Header>>
+		modifications: &VecDeque<BlockChanges<B::Header>>,
 	) -> bool {
 		let mut parent = match *parent_hash {
 			None => {
-				trace!("Cache lookup skipped for {:?}: no parent hash", key.as_ref().map(HexDisplay::from));
-				return false;
-			}
+				trace!(
+					"Cache lookup skipped for {:?}: no parent hash",
+					key.as_ref().map(HexDisplay::from)
+				);
+				return false
+			},
 			Some(ref parent) => parent,
 		};
 		// Ignore all storage entries modified in later blocks.
@@ -488,20 +489,23 @@ impl<S: StateBackend<HashFor<B>>, B: BlockT> CachingState<S, B> {
 		for m in modifications {
 			if &m.hash == parent {
 				if m.is_canon {
-					return true;
+					return true
 				}
 				parent = &m.parent;
 			}
 			if let Some(key) = key {
 				if m.storage.contains(key) {
-					trace!("Cache lookup skipped for {:?}: modified in a later block", HexDisplay::from(&key));
-					return false;
+					trace!(
+						"Cache lookup skipped for {:?}: modified in a later block",
+						HexDisplay::from(&key)
+					);
+					return false
 				}
 			}
 			if let Some(child_key) = child_key {
 				if m.child_storage.contains(child_key) {
 					trace!("Cache lookup skipped for {:?}: modified in a later block", child_key);
-					return false;
+					return false
 				}
 			}
 		}
@@ -540,7 +544,9 @@ impl<S: StateBackend<HashFor<B>>, B: BlockT> StateBackend<HashFor<B>> for Cachin
 		}
 		trace!("Cache miss: {:?}", HexDisplay::from(&key));
 		let value = self.state.storage(key)?;
-		RwLockUpgradableReadGuard::upgrade(local_cache).storage.insert(key.to_vec(), value.clone());
+		RwLockUpgradableReadGuard::upgrade(local_cache)
+			.storage
+			.insert(key.to_vec(), value.clone());
 		self.usage.tally_key_read(key, value.as_ref(), false);
 		Ok(value)
 	}
@@ -563,7 +569,9 @@ impl<S: StateBackend<HashFor<B>>, B: BlockT> StateBackend<HashFor<B>> for Cachin
 		}
 		trace!("Cache hash miss: {:?}", HexDisplay::from(&key));
 		let hash = self.state.storage_hash(key)?;
-		RwLockUpgradableReadGuard::upgrade(local_cache).hashes.insert(key.to_vec(), hash);
+		RwLockUpgradableReadGuard::upgrade(local_cache)
+			.hashes
+			.insert(key.to_vec(), hash);
 		Ok(hash)
 	}
 
@@ -576,9 +584,7 @@ impl<S: StateBackend<HashFor<B>>, B: BlockT> StateBackend<HashFor<B>> for Cachin
 		let local_cache = self.cache.local_cache.upgradable_read();
 		if let Some(entry) = local_cache.child_storage.get(&key).cloned() {
 			trace!("Found in local cache: {:?}", key);
-			return Ok(
-				self.usage.tally_child_key_read(&key, entry, true)
-			)
+			return Ok(self.usage.tally_child_key_read(&key, entry, true))
 		}
 		{
 			let cache = self.cache.shared_cache.upgradable_read();
@@ -586,9 +592,7 @@ impl<S: StateBackend<HashFor<B>>, B: BlockT> StateBackend<HashFor<B>> for Cachin
 				let mut cache = RwLockUpgradableReadGuard::upgrade(cache);
 				if let Some(entry) = cache.lru_child_storage.get(&key).map(|a| a.clone()) {
 					trace!("Found in shared cache: {:?}", key);
-					return Ok(
-						self.usage.tally_child_key_read(&key, entry, true)
-					)
+					return Ok(self.usage.tally_child_key_read(&key, entry, true))
 				}
 			}
 		}
@@ -596,9 +600,11 @@ impl<S: StateBackend<HashFor<B>>, B: BlockT> StateBackend<HashFor<B>> for Cachin
 		let value = self.state.child_storage(child_info, &key.1[..])?;
 
 		// just pass it through the usage counter
-		let value =	self.usage.tally_child_key_read(&key, value, false);
+		let value = self.usage.tally_child_key_read(&key, value, false);
 
-		RwLockUpgradableReadGuard::upgrade(local_cache).child_storage.insert(key, value.clone());
+		RwLockUpgradableReadGuard::upgrade(local_cache)
+			.child_storage
+			.insert(key, value.clone());
 		Ok(value)
 	}
 
@@ -622,7 +628,8 @@ impl<S: StateBackend<HashFor<B>>, B: BlockT> StateBackend<HashFor<B>> for Cachin
 		f: F,
 		allow_missing: bool,
 	) -> Result<bool, Self::Error> {
-		self.state.apply_to_key_values_while(child_info, prefix, start_at, f, allow_missing)
+		self.state
+			.apply_to_key_values_while(child_info, prefix, start_at, f, allow_missing)
 	}
 
 	fn apply_to_keys_while<F: FnMut(&[u8]) -> bool>(
@@ -665,16 +672,22 @@ impl<S: StateBackend<HashFor<B>>, B: BlockT> StateBackend<HashFor<B>> for Cachin
 
 	fn storage_root<'a>(
 		&self,
-		delta: impl Iterator<Item=(&'a [u8], Option<&'a [u8]>)>,
-	) -> (B::Hash, Self::Transaction) where B::Hash: Ord {
+		delta: impl Iterator<Item = (&'a [u8], Option<&'a [u8]>)>,
+	) -> (B::Hash, Self::Transaction)
+	where
+		B::Hash: Ord,
+	{
 		self.state.storage_root(delta)
 	}
 
 	fn child_storage_root<'a>(
 		&self,
 		child_info: &ChildInfo,
-		delta: impl Iterator<Item=(&'a [u8], Option<&'a [u8]>)>,
-	) -> (B::Hash, bool, Self::Transaction) where B::Hash: Ord {
+		delta: impl Iterator<Item = (&'a [u8], Option<&'a [u8]>)>,
+	) -> (B::Hash, bool, Self::Transaction)
+	where
+		B::Hash: Ord,
+	{
 		self.state.child_storage_root(child_info, delta)
 	}
 
@@ -686,11 +699,7 @@ impl<S: StateBackend<HashFor<B>>, B: BlockT> StateBackend<HashFor<B>> for Cachin
 		self.state.keys(prefix)
 	}
 
-	fn child_keys(
-		&self,
-		child_info: &ChildInfo,
-		prefix: &[u8],
-	) -> Vec<Vec<u8>> {
+	fn child_keys(&self, child_info: &ChildInfo, prefix: &[u8]) -> Vec<Vec<u8>> {
 		self.state.child_keys(child_info, prefix)
 	}
 
@@ -739,13 +748,7 @@ impl<S, B: BlockT> SyncingCachingState<S, B> {
 		meta: Arc<RwLock<Meta<NumberFor<B>, B::Hash>>>,
 		lock: Arc<RwLock<()>>,
 	) -> Self {
-		Self {
-			caching_state: Some(caching_state),
-			state_usage,
-			meta,
-			lock,
-			disable_syncing: false,
-		}
+		Self { caching_state: Some(caching_state), state_usage, meta, lock, disable_syncing: false }
 	}
 
 	/// Returns the reference to the internal [`CachingState`].
@@ -775,7 +778,9 @@ impl<S, B: BlockT> std::fmt::Debug for SyncingCachingState<S, B> {
 	}
 }
 
-impl<S: StateBackend<HashFor<B>>, B: BlockT> StateBackend<HashFor<B>> for SyncingCachingState<S, B> {
+impl<S: StateBackend<HashFor<B>>, B: BlockT> StateBackend<HashFor<B>>
+	for SyncingCachingState<S, B>
+{
 	type Error = S::Error;
 	type Transaction = S::Transaction;
 	type TrieBackendStorage = S::TrieBackendStorage;
@@ -816,7 +821,13 @@ impl<S: StateBackend<HashFor<B>>, B: BlockT> StateBackend<HashFor<B>> for Syncin
 		f: F,
 		allow_missing: bool,
 	) -> Result<bool, Self::Error> {
-		self.caching_state().apply_to_key_values_while(child_info, prefix, start_at, f, allow_missing)
+		self.caching_state().apply_to_key_values_while(
+			child_info,
+			prefix,
+			start_at,
+			f,
+			allow_missing,
+		)
 	}
 
 	fn apply_to_keys_while<F: FnMut(&[u8]) -> bool>(
@@ -859,16 +870,22 @@ impl<S: StateBackend<HashFor<B>>, B: BlockT> StateBackend<HashFor<B>> for Syncin
 
 	fn storage_root<'a>(
 		&self,
-		delta: impl Iterator<Item=(&'a [u8], Option<&'a [u8]>)>,
-	) -> (B::Hash, Self::Transaction) where B::Hash: Ord {
+		delta: impl Iterator<Item = (&'a [u8], Option<&'a [u8]>)>,
+	) -> (B::Hash, Self::Transaction)
+	where
+		B::Hash: Ord,
+	{
 		self.caching_state().storage_root(delta)
 	}
 
 	fn child_storage_root<'a>(
 		&self,
 		child_info: &ChildInfo,
-		delta: impl Iterator<Item=(&'a [u8], Option<&'a [u8]>)>,
-	) -> (B::Hash, bool, Self::Transaction) where B::Hash: Ord {
+		delta: impl Iterator<Item = (&'a [u8], Option<&'a [u8]>)>,
+	) -> (B::Hash, bool, Self::Transaction)
+	where
+		B::Hash: Ord,
+	{
 		self.caching_state().child_storage_root(child_info, delta)
 	}
 
@@ -880,11 +897,7 @@ impl<S: StateBackend<HashFor<B>>, B: BlockT> StateBackend<HashFor<B>> for Syncin
 		self.caching_state().keys(prefix)
 	}
 
-	fn child_keys(
-		&self,
-		child_info: &ChildInfo,
-		prefix: &[u8],
-	) -> Vec<Vec<u8>> {
+	fn child_keys(&self, child_info: &ChildInfo, prefix: &[u8]) -> Vec<Vec<u8>> {
 		self.caching_state().child_keys(child_info, prefix)
 	}
 
@@ -907,7 +920,7 @@ impl<S: StateBackend<HashFor<B>>, B: BlockT> StateBackend<HashFor<B>> for Syncin
 impl<S, B: BlockT> Drop for SyncingCachingState<S, B> {
 	fn drop(&mut self) {
 		if self.disable_syncing {
-			return;
+			return
 		}
 
 		if let Some(mut caching_state) = self.caching_state.take() {
@@ -926,8 +939,8 @@ impl<S, B: BlockT> Drop for SyncingCachingState<S, B> {
 mod tests {
 	use super::*;
 	use sp_runtime::{
+		testing::{Block as RawBlock, ExtrinsicWrapper, H256},
 		traits::BlakeTwo256,
-		testing::{H256, Block as RawBlock, ExtrinsicWrapper},
 	};
 	use sp_state_machine::InMemoryBackend;
 
@@ -935,7 +948,7 @@ mod tests {
 
 	#[test]
 	fn smoke() {
-		//init_log();
+		// init_log();
 		let root_parent = H256::random();
 		let key = H256::random()[..].to_vec();
 		let h0 = H256::random();
@@ -965,18 +978,12 @@ mod tests {
 			true,
 		);
 
-		let mut s = CachingState::new(
-			InMemoryBackend::<BlakeTwo256>::default(),
-			shared.clone(),
-			Some(h0),
-		);
+		let mut s =
+			CachingState::new(InMemoryBackend::<BlakeTwo256>::default(), shared.clone(), Some(h0));
 		s.cache.sync_cache(&[], &[], vec![], vec![], Some(h1a), Some(1), true);
 
-		let mut s = CachingState::new(
-			InMemoryBackend::<BlakeTwo256>::default(),
-			shared.clone(),
-			Some(h0),
-		);
+		let mut s =
+			CachingState::new(InMemoryBackend::<BlakeTwo256>::default(), shared.clone(), Some(h0));
 		s.cache.sync_cache(
 			&[],
 			&[],
@@ -987,11 +994,8 @@ mod tests {
 			false,
 		);
 
-		let mut s = CachingState::new(
-			InMemoryBackend::<BlakeTwo256>::default(),
-			shared.clone(),
-			Some(h1b),
-		);
+		let mut s =
+			CachingState::new(InMemoryBackend::<BlakeTwo256>::default(), shared.clone(), Some(h1b));
 		s.cache.sync_cache(
 			&[],
 			&[],
@@ -1002,11 +1006,8 @@ mod tests {
 			false,
 		);
 
-		let mut s = CachingState::new(
-			InMemoryBackend::<BlakeTwo256>::default(),
-			shared.clone(),
-			Some(h1a),
-		);
+		let mut s =
+			CachingState::new(InMemoryBackend::<BlakeTwo256>::default(), shared.clone(), Some(h1a));
 		s.cache.sync_cache(
 			&[],
 			&[],
@@ -1017,48 +1018,30 @@ mod tests {
 			true,
 		);
 
-		let mut s = CachingState::new(
-			InMemoryBackend::<BlakeTwo256>::default(),
-			shared.clone(),
-			Some(h2a),
-		);
+		let mut s =
+			CachingState::new(InMemoryBackend::<BlakeTwo256>::default(), shared.clone(), Some(h2a));
 		s.cache.sync_cache(&[], &[], vec![], vec![], Some(h3a), Some(3), true);
 
-		let s = CachingState::new(
-			InMemoryBackend::<BlakeTwo256>::default(),
-			shared.clone(),
-			Some(h3a),
-		);
+		let s =
+			CachingState::new(InMemoryBackend::<BlakeTwo256>::default(), shared.clone(), Some(h3a));
 		assert_eq!(s.storage(&key).unwrap().unwrap(), vec![5]);
 
-		let s = CachingState::new(
-			InMemoryBackend::<BlakeTwo256>::default(),
-			shared.clone(),
-			Some(h1a),
-		);
+		let s =
+			CachingState::new(InMemoryBackend::<BlakeTwo256>::default(), shared.clone(), Some(h1a));
 		assert!(s.storage(&key).unwrap().is_none());
 
-		let s = CachingState::new(
-			InMemoryBackend::<BlakeTwo256>::default(),
-			shared.clone(),
-			Some(h2b),
-		);
+		let s =
+			CachingState::new(InMemoryBackend::<BlakeTwo256>::default(), shared.clone(), Some(h2b));
 		assert!(s.storage(&key).unwrap().is_none());
 
-		let s = CachingState::new(
-			InMemoryBackend::<BlakeTwo256>::default(),
-			shared.clone(),
-			Some(h1b),
-		);
+		let s =
+			CachingState::new(InMemoryBackend::<BlakeTwo256>::default(), shared.clone(), Some(h1b));
 		assert!(s.storage(&key).unwrap().is_none());
 
 		// reorg to 3b
 		// blocks  [ 3b(c) 3a 2a 2b(c) 1b 1a 0 ]
-		let mut s = CachingState::new(
-			InMemoryBackend::<BlakeTwo256>::default(),
-			shared.clone(),
-			Some(h2b),
-		);
+		let mut s =
+			CachingState::new(InMemoryBackend::<BlakeTwo256>::default(), shared.clone(), Some(h2b));
 		s.cache.sync_cache(
 			&[h1b, h2b, h3b],
 			&[h1a, h2a, h3a],
@@ -1068,11 +1051,8 @@ mod tests {
 			Some(3),
 			true,
 		);
-		let s = CachingState::new(
-			InMemoryBackend::<BlakeTwo256>::default(),
-			shared.clone(),
-			Some(h3a),
-		);
+		let s =
+			CachingState::new(InMemoryBackend::<BlakeTwo256>::default(), shared.clone(), Some(h3a));
 		assert!(s.storage(&key).unwrap().is_none());
 	}
 
@@ -1087,7 +1067,7 @@ mod tests {
 		let h2b = H256::random();
 		let h3b = H256::random();
 
-		let shared = new_shared_cache::<Block>(256*1024, (0,1));
+		let shared = new_shared_cache::<Block>(256 * 1024, (0, 1));
 
 		let mut s = CachingState::new(
 			InMemoryBackend::<BlakeTwo256>::default(),
@@ -1104,18 +1084,12 @@ mod tests {
 			true,
 		);
 
-		let mut s = CachingState::new(
-			InMemoryBackend::<BlakeTwo256>::default(),
-			shared.clone(),
-			Some(h1),
-		);
+		let mut s =
+			CachingState::new(InMemoryBackend::<BlakeTwo256>::default(), shared.clone(), Some(h1));
 		s.cache.sync_cache(&[], &[], vec![], vec![], Some(h2a), Some(2), true);
 
-		let mut s = CachingState::new(
-			InMemoryBackend::<BlakeTwo256>::default(),
-			shared.clone(),
-			Some(h1),
-		);
+		let mut s =
+			CachingState::new(InMemoryBackend::<BlakeTwo256>::default(), shared.clone(), Some(h1));
 		s.cache.sync_cache(
 			&[],
 			&[],
@@ -1126,11 +1100,8 @@ mod tests {
 			false,
 		);
 
-		let mut s = CachingState::new(
-			InMemoryBackend::<BlakeTwo256>::default(),
-			shared.clone(),
-			Some(h2b),
-		);
+		let mut s =
+			CachingState::new(InMemoryBackend::<BlakeTwo256>::default(), shared.clone(), Some(h2b));
 		s.cache.sync_cache(
 			&[],
 			&[],
@@ -1141,11 +1112,8 @@ mod tests {
 			false,
 		);
 
-		let s = CachingState::new(
-			InMemoryBackend::<BlakeTwo256>::default(),
-			shared.clone(),
-			Some(h2a),
-		);
+		let s =
+			CachingState::new(InMemoryBackend::<BlakeTwo256>::default(), shared.clone(), Some(h2a));
 		assert_eq!(s.storage(&key).unwrap().unwrap(), vec![2]);
 	}
 
@@ -1159,7 +1127,7 @@ mod tests {
 		let h3a = H256::random();
 		let h3b = H256::random();
 
-		let shared = new_shared_cache::<Block>(256*1024, (0,1));
+		let shared = new_shared_cache::<Block>(256 * 1024, (0, 1));
 
 		let mut s = CachingState::new(
 			InMemoryBackend::<BlakeTwo256>::default(),
@@ -1168,18 +1136,12 @@ mod tests {
 		);
 		s.cache.sync_cache(&[], &[], vec![], vec![], Some(h1), Some(1), true);
 
-		let mut s = CachingState::new(
-			InMemoryBackend::<BlakeTwo256>::default(),
-			shared.clone(),
-			Some(h1),
-		);
+		let mut s =
+			CachingState::new(InMemoryBackend::<BlakeTwo256>::default(), shared.clone(), Some(h1));
 		s.cache.sync_cache(&[], &[], vec![], vec![], Some(h2a), Some(2), true);
 
-		let mut s = CachingState::new(
-			InMemoryBackend::<BlakeTwo256>::default(),
-			shared.clone(),
-			Some(h2a),
-		);
+		let mut s =
+			CachingState::new(InMemoryBackend::<BlakeTwo256>::default(), shared.clone(), Some(h2a));
 		s.cache.sync_cache(
 			&[],
 			&[],
@@ -1190,18 +1152,12 @@ mod tests {
 			true,
 		);
 
-		let mut s = CachingState::new(
-			InMemoryBackend::<BlakeTwo256>::default(),
-			shared.clone(),
-			Some(h1),
-		);
+		let mut s =
+			CachingState::new(InMemoryBackend::<BlakeTwo256>::default(), shared.clone(), Some(h1));
 		s.cache.sync_cache(&[], &[], vec![], vec![], Some(h2b), Some(2), false);
 
-		let mut s = CachingState::new(
-			InMemoryBackend::<BlakeTwo256>::default(),
-			shared.clone(),
-			Some(h2b),
-		);
+		let mut s =
+			CachingState::new(InMemoryBackend::<BlakeTwo256>::default(), shared.clone(), Some(h2b));
 		s.cache.sync_cache(
 			&[],
 			&[],
@@ -1212,11 +1168,8 @@ mod tests {
 			false,
 		);
 
-		let s = CachingState::new(
-			InMemoryBackend::<BlakeTwo256>::default(),
-			shared.clone(),
-			Some(h3a),
-		);
+		let s =
+			CachingState::new(InMemoryBackend::<BlakeTwo256>::default(), shared.clone(), Some(h3a));
 		assert_eq!(s.storage(&key).unwrap().unwrap(), vec![2]);
 	}
 
@@ -1227,15 +1180,11 @@ mod tests {
 		let h1a = H256::random();
 		let h1b = H256::random();
 
-		let shared = new_shared_cache::<Block>(256*1024, (0,1));
+		let shared = new_shared_cache::<Block>(256 * 1024, (0, 1));
 		let mut backend = InMemoryBackend::<BlakeTwo256>::default();
 		backend.insert(std::iter::once((None, vec![(key.clone(), Some(vec![1]))])));
 
-		let mut s = CachingState::new(
-			backend.clone(),
-			shared.clone(),
-			Some(root_parent),
-		);
+		let mut s = CachingState::new(backend.clone(), shared.clone(), Some(root_parent));
 		s.cache.sync_cache(
 			&[],
 			&[],
@@ -1246,29 +1195,23 @@ mod tests {
 			true,
 		);
 
-		let mut s = CachingState::new(
-			backend.clone(),
-			shared.clone(),
-			Some(root_parent),
-		);
+		let mut s = CachingState::new(backend.clone(), shared.clone(), Some(root_parent));
 		s.cache.sync_cache(&[], &[h1a], vec![], vec![], Some(h1b), Some(1), true);
 
-		let s = CachingState::new(
-			backend.clone(),
-			shared.clone(),
-			Some(h1b),
-		);
+		let s = CachingState::new(backend.clone(), shared.clone(), Some(h1b));
 		assert_eq!(s.storage_hash(&key).unwrap().unwrap(), BlakeTwo256::hash(&vec![1]));
 	}
 
 	#[test]
 	fn should_track_used_size_correctly() {
 		let root_parent = H256::random();
-		let shared = new_shared_cache::<Block>(109, ((109-36), 109));
+		let shared = new_shared_cache::<Block>(109, ((109 - 36), 109));
 		let h0 = H256::random();
 
 		let mut s = CachingState::new(
-			InMemoryBackend::<BlakeTwo256>::default(), shared.clone(), Some(root_parent.clone()),
+			InMemoryBackend::<BlakeTwo256>::default(),
+			shared.clone(),
+			Some(root_parent.clone()),
 		);
 
 		let key = H256::random()[..].to_vec();
@@ -1302,7 +1245,7 @@ mod tests {
 	#[test]
 	fn should_remove_lru_items_based_on_tracking_used_size() {
 		let root_parent = H256::random();
-		let shared = new_shared_cache::<Block>(36*3, (2,3));
+		let shared = new_shared_cache::<Block>(36 * 3, (2, 3));
 		let h0 = H256::random();
 
 		let mut s = CachingState::new(
@@ -1364,11 +1307,8 @@ mod tests {
 			true,
 		);
 
-		let mut s = CachingState::new(
-			InMemoryBackend::<BlakeTwo256>::default(),
-			shared.clone(),
-			Some(h0),
-		);
+		let mut s =
+			CachingState::new(InMemoryBackend::<BlakeTwo256>::default(), shared.clone(), Some(h0));
 		s.cache.sync_cache(
 			&[],
 			&[],
@@ -1379,11 +1319,8 @@ mod tests {
 			true,
 		);
 
-		let mut s = CachingState::new(
-			InMemoryBackend::<BlakeTwo256>::default(),
-			shared.clone(),
-			Some(h1),
-		);
+		let mut s =
+			CachingState::new(InMemoryBackend::<BlakeTwo256>::default(), shared.clone(), Some(h1));
 		assert_eq!(s.storage(&key).unwrap(), Some(vec![3]));
 
 		// Restart (or unknown block?), clear caches.
@@ -1402,11 +1339,8 @@ mod tests {
 		// New value is propagated.
 		s.cache.sync_cache(&[], &[], vec![], vec![], None, None, true);
 
-		let s = CachingState::new(
-			InMemoryBackend::<BlakeTwo256>::default(),
-			shared.clone(),
-			Some(h1),
-		);
+		let s =
+			CachingState::new(InMemoryBackend::<BlakeTwo256>::default(), shared.clone(), Some(h1));
 		assert_eq!(s.storage(&key).unwrap(), None);
 	}
 
@@ -1419,7 +1353,7 @@ mod tests {
 		let h1 = H256::random();
 		let h2 = H256::random();
 
-		let shared = new_shared_cache::<Block>(256*1024, (0,1));
+		let shared = new_shared_cache::<Block>(256 * 1024, (0, 1));
 
 		let mut s = CachingState::new(
 			InMemoryBackend::<BlakeTwo256>::default(),
@@ -1437,11 +1371,8 @@ mod tests {
 		);
 		assert_eq!(shared.write().lru_storage.get(&key).unwrap(), &Some(vec![1]));
 
-		let mut s = CachingState::new(
-			InMemoryBackend::<BlakeTwo256>::default(),
-			shared.clone(),
-			Some(h1),
-		);
+		let mut s =
+			CachingState::new(InMemoryBackend::<BlakeTwo256>::default(), shared.clone(), Some(h1));
 
 		// commit as non-best
 		s.cache.sync_cache(
@@ -1456,36 +1387,25 @@ mod tests {
 
 		assert_eq!(shared.write().lru_storage.get(&key).unwrap(), &Some(vec![1]));
 
-		let mut s = CachingState::new(
-			InMemoryBackend::<BlakeTwo256>::default(),
-			shared.clone(),
-			Some(h1),
-		);
+		let mut s =
+			CachingState::new(InMemoryBackend::<BlakeTwo256>::default(), shared.clone(), Some(h1));
 
 		// commit again as best with no changes
-		s.cache.sync_cache(
-			&[],
-			&[],
-			vec![],
-			vec![],
-			Some(h2),
-			Some(2),
-			true,
-		);
+		s.cache.sync_cache(&[], &[], vec![], vec![], Some(h2), Some(2), true);
 		assert_eq!(s.storage(&key).unwrap(), None);
 	}
 }
 
 #[cfg(test)]
 mod qc {
-	use std::collections::{HashMap, hash_map::Entry};
+	use std::collections::{hash_map::Entry, HashMap};
 
-	use quickcheck::{quickcheck, TestResult, Arbitrary};
+	use quickcheck::{quickcheck, Arbitrary, TestResult};
 
 	use super::*;
 	use sp_runtime::{
+		testing::{Block as RawBlock, ExtrinsicWrapper, H256},
 		traits::BlakeTwo256,
-		testing::{H256, Block as RawBlock, ExtrinsicWrapper},
 	};
 	use sp_state_machine::InMemoryBackend;
 
@@ -1507,28 +1427,24 @@ mod qc {
 		fn new_next(&self, hash: H256, changes: KeySet) -> Self {
 			let mut state = self.state.clone();
 
-			for (k, v) in self.state.iter() { state.insert(k.clone(), v.clone()); }
-			for (k, v) in changes.clone().into_iter() { state.insert(k, v); }
-
-			Self {
-				hash,
-				parent: self.hash,
-				changes,
-				state,
+			for (k, v) in self.state.iter() {
+				state.insert(k.clone(), v.clone());
 			}
+			for (k, v) in changes.clone().into_iter() {
+				state.insert(k, v);
+			}
+
+			Self { hash, parent: self.hash, changes, state }
 		}
 
 		fn new(hash: H256, parent: H256, changes: KeySet) -> Self {
 			let mut state = KeyMap::new();
 
-			for (k, v) in changes.clone().into_iter() { state.insert(k, v); }
-
-			Self {
-				hash,
-				parent,
-				state,
-				changes,
+			for (k, v) in changes.clone().into_iter() {
+				state.insert(k, v);
 			}
+
+			Self { hash, parent, state, changes }
 		}
 
 		fn purge(&mut self, other_changes: &KeySet) {
@@ -1552,30 +1468,26 @@ mod qc {
 			let buf = (0..32).map(|_| u8::arbitrary(gen)).collect::<Vec<_>>();
 
 			match path {
-				0..=175 => {
-					Action::Next {
-						hash: H256::from_slice(&buf[..]),
-						changes: {
-							let mut set = Vec::new();
-							for _ in 0..<u32>::arbitrary(gen)/(64*256*256*256) {
-								set.push((vec![u8::arbitrary(gen)], Some(vec![u8::arbitrary(gen)])));
-							}
-							set
+				0..=175 => Action::Next {
+					hash: H256::from_slice(&buf[..]),
+					changes: {
+						let mut set = Vec::new();
+						for _ in 0..<u32>::arbitrary(gen) / (64 * 256 * 256 * 256) {
+							set.push((vec![u8::arbitrary(gen)], Some(vec![u8::arbitrary(gen)])));
 						}
-					}
+						set
+					},
 				},
-				176..=220 => {
-					Action::Fork {
-						hash: H256::from_slice(&buf[..]),
-						depth: ((u8::arbitrary(gen)) / 32) as usize,
-						changes: {
-							let mut set = Vec::new();
-							for _ in 0..<u32>::arbitrary(gen)/(64*256*256*256) {
-								set.push((vec![u8::arbitrary(gen)], Some(vec![u8::arbitrary(gen)])));
-							}
-							set
+				176..=220 => Action::Fork {
+					hash: H256::from_slice(&buf[..]),
+					depth: ((u8::arbitrary(gen)) / 32) as usize,
+					changes: {
+						let mut set = Vec::new();
+						for _ in 0..<u32>::arbitrary(gen) / (64 * 256 * 256 * 256) {
+							set.push((vec![u8::arbitrary(gen)], Some(vec![u8::arbitrary(gen)])));
 						}
-					}
+						set
+					},
 				},
 				221..=240 => {
 					Action::ReorgWithImport {
@@ -1586,7 +1498,7 @@ mod qc {
 				_ => {
 					Action::FinalizationReorg {
 						fork_depth: ((u8::arbitrary(gen)) / 32) as usize, // 0-7
-						depth: ((u8::arbitrary(gen)) / 64) as usize, // 0-3
+						depth: ((u8::arbitrary(gen)) / 64) as usize,      // 0-3
 					}
 				},
 			}
@@ -1601,13 +1513,9 @@ mod qc {
 
 	impl Mutator {
 		fn new_empty() -> Self {
-			let shared = new_shared_cache::<Block>(256*1024, (0,1));
+			let shared = new_shared_cache::<Block>(256 * 1024, (0, 1));
 
-			Self {
-				shared,
-				canon: vec![],
-				forks: HashMap::new(),
-			}
+			Self { shared, canon: vec![], forks: HashMap::new() }
 		}
 
 		fn head_state(&self, hash: H256) -> CachingState<InMemoryBackend<BlakeTwo256>, Block> {
@@ -1626,11 +1534,12 @@ mod qc {
 			&mut self,
 			action: Action,
 		) -> CachingState<InMemoryBackend<BlakeTwo256>, Block> {
-			self.mutate(action).expect("Expected to provide only valid actions to the mutate_static")
+			self.mutate(action)
+				.expect("Expected to provide only valid actions to the mutate_static")
 		}
 
 		fn canon_len(&self) -> usize {
-			return self.canon.len();
+			return self.canon.len()
 		}
 
 		fn head_storage_ref(&self) -> &KeyMap {
@@ -1648,10 +1557,10 @@ mod qc {
 			let state = match action {
 				Action::Fork { depth, hash, changes } => {
 					let pos = self.canon.len() as isize - depth as isize;
-					if pos < 0 || self.canon.len() == 0 || pos >= (self.canon.len()-1) as isize
+					if pos < 0 || self.canon.len() == 0 || pos >= (self.canon.len() - 1) as isize
 					// no fork on top also, thus len-1
 					{
-						return Err(());
+						return Err(())
 					}
 
 					let pos = pos as usize;
@@ -1661,7 +1570,8 @@ mod qc {
 					let (total_h, parent) = match self.forks.entry(fork_at) {
 						Entry::Occupied(occupied) => {
 							let chain = occupied.into_mut();
-							let parent = chain.last().expect("No empty forks are ever created").clone();
+							let parent =
+								chain.last().expect("No empty forks are ever created").clone();
 							let mut node = parent.new_next(hash, changes.clone());
 
 							for earlier in chain.iter() {
@@ -1677,7 +1587,7 @@ mod qc {
 							vacant.insert(vec![canon_parent.new_next(hash, changes.clone())]);
 
 							(pos + 1, fork_at)
-						}
+						},
 					};
 
 					let mut state = CachingState::new(
@@ -1704,9 +1614,7 @@ mod qc {
 							let parent_hash = H256::from(&[0u8; 32]);
 							(Node::new(hash, parent_hash, changes.clone()), parent_hash)
 						},
-						Some(parent) => {
-							(parent.new_next(hash, changes.clone()), parent.hash)
-						}
+						Some(parent) => (parent.new_next(hash, changes.clone()), parent.hash),
 					};
 
 					// delete cache entries for earlier
@@ -1741,22 +1649,26 @@ mod qc {
 				},
 				Action::ReorgWithImport { depth, hash } => {
 					let pos = self.canon.len() as isize - depth as isize;
-					if pos < 0 || pos+1 >= self.canon.len() as isize { return Err(()); }
+					if pos < 0 || pos + 1 >= self.canon.len() as isize {
+						return Err(())
+					}
 					let fork_at = self.canon[pos as usize].hash;
 					let pos = pos as usize;
 
 					match self.forks.get_mut(&fork_at) {
 						Some(chain) => {
-							let mut new_fork = self.canon.drain(pos+1..).collect::<Vec<Node>>();
+							let mut new_fork = self.canon.drain(pos + 1..).collect::<Vec<Node>>();
 
-							let retracted: Vec<H256> = new_fork.iter().map(|node| node.hash).collect();
+							let retracted: Vec<H256> =
+								new_fork.iter().map(|node| node.hash).collect();
 							let enacted: Vec<H256> = chain.iter().map(|node| node.hash).collect();
 
 							std::mem::swap(chain, &mut new_fork);
 
-							let mut node = new_fork.last().map(
-								|node| node.new_next(hash, vec![])
-							).expect("No empty fork ever created!");
+							let mut node = new_fork
+								.last()
+								.map(|node| node.new_next(hash, vec![]))
+								.expect("No empty fork ever created!");
 
 							for invalidators in chain.iter().chain(new_fork.iter()) {
 								node.purge(&invalidators.changes);
@@ -1784,44 +1696,54 @@ mod qc {
 							);
 
 							state
-						}
+						},
 						None => {
-							return Err(()); // no reorg without a fork atm!
+							return Err(()) // no reorg without a fork atm!
 						},
 					}
 				},
 				Action::FinalizationReorg { fork_depth, depth } => {
 					let pos = self.canon.len() as isize - fork_depth as isize;
-					if pos < 0 || pos+1 >= self.canon.len() as isize { return Err(()); }
+					if pos < 0 || pos + 1 >= self.canon.len() as isize {
+						return Err(())
+					}
 					let fork_at = self.canon[pos as usize].hash;
 					let pos = pos as usize;
 
 					match self.forks.get_mut(&fork_at) {
 						Some(fork_chain) => {
-							let sync_pos = fork_chain.len() as isize - fork_chain.len() as isize - depth as isize;
-							if sync_pos < 0 || sync_pos >= fork_chain.len() as isize { return Err (()); }
+							let sync_pos = fork_chain.len() as isize -
+								fork_chain.len() as isize - depth as isize;
+							if sync_pos < 0 || sync_pos >= fork_chain.len() as isize {
+								return Err(())
+							}
 							let sync_pos = sync_pos as usize;
 
-							let mut new_fork = self.canon.drain(pos+1..).collect::<Vec<Node>>();
+							let mut new_fork = self.canon.drain(pos + 1..).collect::<Vec<Node>>();
 
-							let retracted: Vec<H256> = new_fork.iter().map(|node| node.hash).collect();
-							let enacted: Vec<H256> = fork_chain.iter().take(sync_pos+1).map(|node| node.hash).collect();
+							let retracted: Vec<H256> =
+								new_fork.iter().map(|node| node.hash).collect();
+							let enacted: Vec<H256> = fork_chain
+								.iter()
+								.take(sync_pos + 1)
+								.map(|node| node.hash)
+								.collect();
 
 							std::mem::swap(fork_chain, &mut new_fork);
 
 							self.shared.write().sync(&retracted, &enacted);
 
 							self.head_state(
-								self.canon.last()
-								.expect("wasn't forking to emptiness so there should be one!")
-								.hash
+								self.canon
+									.last()
+									.expect("wasn't forking to emptiness so there should be one!")
+									.hash,
 							)
 						},
 						None => {
-							return Err(()); // no reorg to nothing pls!
-						}
+							return Err(()) // no reorg to nothing pls!
+						},
 					}
-
 				},
 			};
 
@@ -1841,14 +1763,27 @@ mod qc {
 		let h3b = H256::random();
 
 		let mut mutator = Mutator::new_empty();
-		mutator.mutate_static(Action::Next { hash: h0, changes: vec![(key.clone(), Some(vec![2]))] });
+		mutator
+			.mutate_static(Action::Next { hash: h0, changes: vec![(key.clone(), Some(vec![2]))] });
 		mutator.mutate_static(Action::Next { hash: h1a, changes: vec![] });
-		mutator.mutate_static(Action::Fork { depth: 2, hash: h1b, changes: vec![(key.clone(), Some(vec![3]))] });
-		mutator.mutate_static(Action::Fork { depth: 2, hash: h2b, changes: vec![(key.clone(), Some(vec![4]))] });
-		mutator.mutate_static(Action::Next { hash: h2a, changes: vec![(key.clone(), Some(vec![5]))] });
+		mutator.mutate_static(Action::Fork {
+			depth: 2,
+			hash: h1b,
+			changes: vec![(key.clone(), Some(vec![3]))],
+		});
+		mutator.mutate_static(Action::Fork {
+			depth: 2,
+			hash: h2b,
+			changes: vec![(key.clone(), Some(vec![4]))],
+		});
+		mutator
+			.mutate_static(Action::Next { hash: h2a, changes: vec![(key.clone(), Some(vec![5]))] });
 		mutator.mutate_static(Action::Next { hash: h3a, changes: vec![] });
 
-		assert_eq!(mutator.head_state(h3a).storage(&key).unwrap().expect("there should be a value"), vec![5]);
+		assert_eq!(
+			mutator.head_state(h3a).storage(&key).unwrap().expect("there should be a value"),
+			vec![5]
+		);
 		assert!(mutator.head_state(h1a).storage(&key).unwrap().is_none());
 		assert!(mutator.head_state(h2b).storage(&key).unwrap().is_none());
 		assert!(mutator.head_state(h1b).storage(&key).unwrap().is_none());
@@ -1862,18 +1797,17 @@ mod qc {
 
 		for key in Mutator::key_permutations() {
 			match (head_state.storage(&key).unwrap(), mutator.head_storage_ref().get(&key)) {
-				(Some(x), Some(y)) => {
+				(Some(x), Some(y)) =>
 					if Some(&x) != y.as_ref() {
 						eprintln!("{:?} != {:?}", x, y);
-						return false;
-					}
-				},
+						return false
+					},
 				(None, Some(_y)) => {
 					// TODO: cache miss is not tracked atm
 				},
 				(Some(x), None) => {
 					eprintln!("{:?} != <missing>", x);
-					return false;
+					return false
 				},
 				_ => continue,
 			}
@@ -1886,18 +1820,17 @@ mod qc {
 			let head_state = mutator.head_state(node.hash);
 			for key in Mutator::key_permutations() {
 				match (head_state.storage(&key).unwrap(), node.state.get(&key)) {
-					(Some(x), Some(y)) => {
+					(Some(x), Some(y)) =>
 						if Some(&x) != y.as_ref() {
 							eprintln!("at [{}]: {:?} != {:?}", node.hash, x, y);
-							return false;
-						}
-					},
+							return false
+						},
 					(None, Some(_y)) => {
 						// cache miss is not tracked atm
 					},
 					(Some(x), None) => {
 						eprintln!("at [{}]: {:?} != <missing>", node.hash, x);
-						return false;
+						return false
 					},
 					_ => continue,
 				}
@@ -1918,16 +1851,27 @@ mod qc {
 		let mut mutator = Mutator::new_empty();
 		mutator.mutate_static(Action::Next { hash: h0, changes: vec![] });
 		mutator.mutate_static(Action::Next { hash: h1, changes: vec![] });
-		mutator.mutate_static(Action::Next { hash: h2, changes: vec![(key.clone(), Some(vec![2]))] });
-		mutator.mutate_static(Action::Fork { depth: 2, hash: h1b, changes: vec![(key.clone(), Some(vec![3]))] });
+		mutator
+			.mutate_static(Action::Next { hash: h2, changes: vec![(key.clone(), Some(vec![2]))] });
+		mutator.mutate_static(Action::Fork {
+			depth: 2,
+			hash: h1b,
+			changes: vec![(key.clone(), Some(vec![3]))],
+		});
 		mutator.mutate_static(Action::ReorgWithImport { depth: 2, hash: h2b });
 
 		assert!(is_head_match(&mutator))
 	}
 
-	fn key(k: u8) -> Vec<u8> { vec![k] }
-	fn val(v: u8) -> Option<Vec<u8>> { Some(vec![v]) }
-	fn keyval(k: u8, v: u8) -> KeySet { vec![(key(k), val(v))] }
+	fn key(k: u8) -> Vec<u8> {
+		vec![k]
+	}
+	fn val(v: u8) -> Option<Vec<u8>> {
+		Some(vec![v])
+	}
+	fn keyval(k: u8, v: u8) -> KeySet {
+		vec![(key(k), val(v))]
+	}
 
 	#[test]
 	fn reorg2() {
@@ -1941,7 +1885,7 @@ mod qc {
 		let mut mutator = Mutator::new_empty();
 		mutator.mutate_static(Action::Next { hash: h0, changes: keyval(1, 1) });
 		mutator.mutate_static(Action::Next { hash: h1a, changes: keyval(1, 1) });
-		mutator.mutate_static(Action::Fork { depth: 2, hash: h1b, changes: keyval(2, 2 ) });
+		mutator.mutate_static(Action::Fork { depth: 2, hash: h1b, changes: keyval(2, 2) });
 
 		mutator.mutate_static(Action::Next { hash: h2a, changes: keyval(3, 3) });
 		mutator.mutate_static(Action::Next { hash: h3a, changes: keyval(4, 4) });
diff --git a/client/db/src/upgrade.rs b/client/db/src/upgrade.rs
index ea91b8253e1d..fe0abaed1b07 100644
--- a/client/db/src/upgrade.rs
+++ b/client/db/src/upgrade.rs
@@ -18,14 +18,16 @@
 
 //! Database upgrade logic.
 
-use std::fs;
-use std::io::{Read, Write, ErrorKind};
-use std::path::{Path, PathBuf};
+use std::{
+	fs,
+	io::{ErrorKind, Read, Write},
+	path::{Path, PathBuf},
+};
 
-use sp_runtime::traits::Block as BlockT;
 use crate::{columns, utils::DatabaseType};
-use kvdb_rocksdb::{Database, DatabaseConfig};
 use codec::{Decode, Encode};
+use kvdb_rocksdb::{Database, DatabaseConfig};
+use sp_runtime::traits::Block as BlockT;
 
 /// Version file name.
 const VERSION_FILE_NAME: &'static str = "db_version";
@@ -38,19 +40,28 @@ const V1_NUM_COLUMNS: u32 = 11;
 const V2_NUM_COLUMNS: u32 = 12;
 
 /// Upgrade database to current version.
-pub fn upgrade_db<Block: BlockT>(db_path: &Path, db_type: DatabaseType) -> sp_blockchain::Result<()> {
+pub fn upgrade_db<Block: BlockT>(
+	db_path: &Path,
+	db_type: DatabaseType,
+) -> sp_blockchain::Result<()> {
 	let is_empty = db_path.read_dir().map_or(true, |mut d| d.next().is_none());
 	if !is_empty {
 		let db_version = current_version(db_path)?;
 		match db_version {
-			0 => Err(sp_blockchain::Error::Backend(format!("Unsupported database version: {}", db_version)))?,
+			0 => Err(sp_blockchain::Error::Backend(format!(
+				"Unsupported database version: {}",
+				db_version
+			)))?,
 			1 => {
 				migrate_1_to_2::<Block>(db_path, db_type)?;
 				migrate_2_to_3::<Block>(db_path, db_type)?
 			},
 			2 => migrate_2_to_3::<Block>(db_path, db_type)?,
 			CURRENT_VERSION => (),
-			_ => Err(sp_blockchain::Error::Backend(format!("Future database version: {}", db_version)))?,
+			_ => Err(sp_blockchain::Error::Backend(format!(
+				"Future database version: {}",
+				db_version
+			)))?,
 		}
 	}
 
@@ -60,8 +71,12 @@ pub fn upgrade_db<Block: BlockT>(db_path: &Path, db_type: DatabaseType) -> sp_bl
 /// Migration from version1 to version2:
 /// 1) the number of columns has changed from 11 to 12;
 /// 2) transactions column is added;
-fn migrate_1_to_2<Block: BlockT>(db_path: &Path, _db_type: DatabaseType) -> sp_blockchain::Result<()> {
-	let db_path = db_path.to_str()
+fn migrate_1_to_2<Block: BlockT>(
+	db_path: &Path,
+	_db_type: DatabaseType,
+) -> sp_blockchain::Result<()> {
+	let db_path = db_path
+		.to_str()
 		.ok_or_else(|| sp_blockchain::Error::Backend("Invalid database path".into()))?;
 	let db_cfg = DatabaseConfig::with_columns(V1_NUM_COLUMNS);
 	let db = Database::open(&db_cfg, db_path).map_err(db_err)?;
@@ -70,8 +85,12 @@ fn migrate_1_to_2<Block: BlockT>(db_path: &Path, _db_type: DatabaseType) -> sp_b
 
 /// Migration from version2 to version3:
 /// - The format of the stored Justification changed to support multiple Justifications.
-fn migrate_2_to_3<Block: BlockT>(db_path: &Path, _db_type: DatabaseType) -> sp_blockchain::Result<()> {
-	let db_path = db_path.to_str()
+fn migrate_2_to_3<Block: BlockT>(
+	db_path: &Path,
+	_db_type: DatabaseType,
+) -> sp_blockchain::Result<()> {
+	let db_path = db_path
+		.to_str()
 		.ok_or_else(|| sp_blockchain::Error::Backend("Invalid database path".into()))?;
 	let db_cfg = DatabaseConfig::with_columns(V2_NUM_COLUMNS);
 	let db = Database::open(&db_cfg, db_path).map_err(db_err)?;
@@ -137,10 +156,11 @@ fn version_file_path(path: &Path) -> PathBuf {
 
 #[cfg(test)]
 mod tests {
-	use sc_state_db::PruningMode;
-	use crate::{DatabaseSettings, DatabaseSettingsSrc, KeepBlocks, TransactionStorageMode};
-	use crate::tests::Block;
 	use super::*;
+	use crate::{
+		tests::Block, DatabaseSettings, DatabaseSettingsSrc, KeepBlocks, TransactionStorageMode,
+	};
+	use sc_state_db::PruningMode;
 
 	fn create_db(db_path: &Path, version: Option<u32>) {
 		if let Some(version) = version {
@@ -151,14 +171,18 @@ mod tests {
 	}
 
 	fn open_database(db_path: &Path) -> sp_blockchain::Result<()> {
-		crate::utils::open_database::<Block>(&DatabaseSettings {
-			state_cache_size: 0,
-			state_cache_child_ratio: None,
-			state_pruning: PruningMode::ArchiveAll,
-			source: DatabaseSettingsSrc::RocksDb { path: db_path.to_owned(), cache_size: 128 },
-			keep_blocks: KeepBlocks::All,
-			transaction_storage: TransactionStorageMode::BlockBody,
-		}, DatabaseType::Full).map(|_| ())
+		crate::utils::open_database::<Block>(
+			&DatabaseSettings {
+				state_cache_size: 0,
+				state_cache_child_ratio: None,
+				state_pruning: PruningMode::ArchiveAll,
+				source: DatabaseSettingsSrc::RocksDb { path: db_path.to_owned(), cache_size: 128 },
+				keep_blocks: KeepBlocks::All,
+				transaction_storage: TransactionStorageMode::BlockBody,
+			},
+			DatabaseType::Full,
+		)
+		.map(|_| ())
 	}
 
 	#[test]
diff --git a/client/db/src/utils.rs b/client/db/src/utils.rs
index bd6dc9841aa6..fc2324f35af6 100644
--- a/client/db/src/utils.rs
+++ b/client/db/src/utils.rs
@@ -19,24 +19,27 @@
 //! Db-based backend utility structures and functions, used by both
 //! full and light storages.
 
-use std::sync::Arc;
-use std::convert::TryInto;
+use std::{convert::TryInto, sync::Arc};
 
 use log::debug;
 
+use crate::{Database, DatabaseSettings, DatabaseSettingsSrc, DbHash};
 use codec::Decode;
-use sp_trie::DBValue;
 use sp_database::Transaction;
-use sp_runtime::generic::BlockId;
-use sp_runtime::traits::{
-	Block as BlockT, Header as HeaderT, Zero,
-	UniqueSaturatedFrom, UniqueSaturatedInto,
+use sp_runtime::{
+	generic::BlockId,
+	traits::{Block as BlockT, Header as HeaderT, UniqueSaturatedFrom, UniqueSaturatedInto, Zero},
 };
-use crate::{DatabaseSettings, DatabaseSettingsSrc, Database, DbHash};
+use sp_trie::DBValue;
 
 /// Number of columns in the db. Must be the same for both full && light dbs.
 /// Otherwise RocksDb will fail to open database && check its type.
-#[cfg(any(feature = "with-kvdb-rocksdb", feature = "with-parity-db", feature = "test-helpers", test))]
+#[cfg(any(
+	feature = "with-kvdb-rocksdb",
+	feature = "with-parity-db",
+	feature = "test-helpers",
+	test
+))]
 pub const NUM_COLUMNS: u32 = 12;
 /// Meta column. The set of keys in the column is shared by full && light storages.
 pub const COLUMN_META: u32 = 0;
@@ -98,24 +101,17 @@ pub enum DatabaseType {
 /// In the current database schema, this kind of key is only used for
 /// lookups into an index, NOT for storing header data or others.
 pub fn number_index_key<N: TryInto<u32>>(n: N) -> sp_blockchain::Result<NumberIndexKey> {
-	let n = n.try_into().map_err(|_|
+	let n = n.try_into().map_err(|_| {
 		sp_blockchain::Error::Backend("Block number cannot be converted to u32".into())
-	)?;
-
-	Ok([
-		(n >> 24) as u8,
-		((n >> 16) & 0xff) as u8,
-		((n >> 8) & 0xff) as u8,
-		(n & 0xff) as u8
-	])
+	})?;
+
+	Ok([(n >> 24) as u8, ((n >> 16) & 0xff) as u8, ((n >> 8) & 0xff) as u8, (n & 0xff) as u8])
 }
 
 /// Convert number and hash into long lookup key for blocks that are
 /// not in the canonical chain.
-pub fn number_and_hash_to_lookup_key<N, H>(
-	number: N,
-	hash: H,
-) -> sp_blockchain::Result<Vec<u8>>	where
+pub fn number_and_hash_to_lookup_key<N, H>(number: N, hash: H) -> sp_blockchain::Result<Vec<u8>>
+where
 	N: TryInto<u32>,
 	H: AsRef<[u8]>,
 {
@@ -126,16 +122,15 @@ pub fn number_and_hash_to_lookup_key<N, H>(
 
 /// Convert block lookup key into block number.
 /// all block lookup keys start with the block number.
-pub fn lookup_key_to_number<N>(key: &[u8]) -> sp_blockchain::Result<N> where
-	N: From<u32>
+pub fn lookup_key_to_number<N>(key: &[u8]) -> sp_blockchain::Result<N>
+where
+	N: From<u32>,
 {
 	if key.len() < 4 {
-		return Err(sp_blockchain::Error::Backend("Invalid block key".into()));
+		return Err(sp_blockchain::Error::Backend("Invalid block key".into()))
 	}
-	Ok((key[0] as u32) << 24
-		| (key[1] as u32) << 16
-		| (key[2] as u32) << 8
-		| (key[3] as u32)).map(Into::into)
+	Ok((key[0] as u32) << 24 | (key[1] as u32) << 16 | (key[2] as u32) << 8 | (key[3] as u32))
+		.map(Into::into)
 }
 
 /// Delete number to hash mapping in DB transaction.
@@ -197,17 +192,15 @@ pub fn insert_hash_to_key_mapping<N: TryInto<u32>, H: AsRef<[u8]> + Clone>(
 pub fn block_id_to_lookup_key<Block>(
 	db: &dyn Database<DbHash>,
 	key_lookup_col: u32,
-	id: BlockId<Block>
-) -> Result<Option<Vec<u8>>, sp_blockchain::Error> where
+	id: BlockId<Block>,
+) -> Result<Option<Vec<u8>>, sp_blockchain::Error>
+where
 	Block: BlockT,
 	::sp_runtime::traits::NumberFor<Block>: UniqueSaturatedFrom<u64> + UniqueSaturatedInto<u64>,
 {
 	Ok(match id {
-		BlockId::Number(n) => db.get(
-			key_lookup_col,
-			number_index_key(n)?.as_ref(),
-		),
-		BlockId::Hash(h) => db.get(key_lookup_col, h.as_ref())
+		BlockId::Number(n) => db.get(key_lookup_col, number_index_key(n)?.as_ref()),
+		BlockId::Hash(h) => db.get(key_lookup_col, h.as_ref()),
 	})
 }
 
@@ -218,9 +211,10 @@ pub fn open_database<Block: BlockT>(
 ) -> sp_blockchain::Result<Arc<dyn Database<DbHash>>> {
 	#[allow(unused)]
 	fn db_open_error(feat: &'static str) -> sp_blockchain::Error {
-		sp_blockchain::Error::Backend(
-			format!("`{}` feature not enabled, database can not be opened", feat),
-		)
+		sp_blockchain::Error::Backend(format!(
+			"`{}` feature not enabled, database can not be opened",
+			feat
+		))
 	}
 
 	let db: Arc<dyn Database<DbHash>> = match &config.source {
@@ -231,14 +225,16 @@ pub fn open_database<Block: BlockT>(
 
 			// and now open database assuming that it has the latest version
 			let mut db_config = kvdb_rocksdb::DatabaseConfig::with_columns(NUM_COLUMNS);
-			let path = path.to_str()
+			let path = path
+				.to_str()
 				.ok_or_else(|| sp_blockchain::Error::Backend("Invalid database path".into()))?;
 
 			let mut memory_budget = std::collections::HashMap::new();
 			match db_type {
 				DatabaseType::Full => {
 					let state_col_budget = (*cache_size as f64 * 0.9) as usize;
-					let other_col_budget = (cache_size - state_col_budget) / (NUM_COLUMNS as usize - 1);
+					let other_col_budget =
+						(cache_size - state_col_budget) / (NUM_COLUMNS as usize - 1);
 
 					for i in 0..NUM_COLUMNS {
 						if i == crate::columns::STATE {
@@ -267,7 +263,7 @@ pub fn open_database<Block: BlockT>(
 						path,
 						col_budget,
 					);
-				}
+				},
 			}
 			db_config.memory_budget = memory_budget;
 
@@ -276,18 +272,12 @@ pub fn open_database<Block: BlockT>(
 			sp_database::as_database(db)
 		},
 		#[cfg(not(any(feature = "with-kvdb-rocksdb", test)))]
-		DatabaseSettingsSrc::RocksDb { .. } => {
-			return Err(db_open_error("with-kvdb-rocksdb"));
-		},
+		DatabaseSettingsSrc::RocksDb { .. } => return Err(db_open_error("with-kvdb-rocksdb")),
 		#[cfg(feature = "with-parity-db")]
-		DatabaseSettingsSrc::ParityDb { path } => {
-			crate::parity_db::open(&path, db_type)
-				.map_err(|e| sp_blockchain::Error::Backend(format!("{}", e)))?
-		},
+		DatabaseSettingsSrc::ParityDb { path } => crate::parity_db::open(&path, db_type)
+			.map_err(|e| sp_blockchain::Error::Backend(format!("{}", e)))?,
 		#[cfg(not(feature = "with-parity-db"))]
-		DatabaseSettingsSrc::ParityDb { .. } => {
-			return Err(db_open_error("with-parity-db"))
-		},
+		DatabaseSettingsSrc::ParityDb { .. } => return Err(db_open_error("with-parity-db")),
 		DatabaseSettingsSrc::Custom(db) => db.clone(),
 	};
 
@@ -297,14 +287,19 @@ pub fn open_database<Block: BlockT>(
 }
 
 /// Check database type.
-pub fn check_database_type(db: &dyn Database<DbHash>, db_type: DatabaseType) -> sp_blockchain::Result<()> {
+pub fn check_database_type(
+	db: &dyn Database<DbHash>,
+	db_type: DatabaseType,
+) -> sp_blockchain::Result<()> {
 	match db.get(COLUMN_META, meta_keys::TYPE) {
-		Some(stored_type) => {
+		Some(stored_type) =>
 			if db_type.as_str().as_bytes() != &*stored_type {
-				return Err(sp_blockchain::Error::Backend(
-					format!("Unexpected database type. Expected: {}", db_type.as_str())).into());
-			}
-		},
+				return Err(sp_blockchain::Error::Backend(format!(
+					"Unexpected database type. Expected: {}",
+					db_type.as_str()
+				))
+				.into())
+			},
 		None => {
 			let mut transaction = Transaction::new();
 			transaction.set(COLUMN_META, meta_keys::TYPE, db_type.as_str().as_bytes());
@@ -320,10 +315,10 @@ pub fn read_db<Block>(
 	db: &dyn Database<DbHash>,
 	col_index: u32,
 	col: u32,
-	id: BlockId<Block>
+	id: BlockId<Block>,
 ) -> sp_blockchain::Result<Option<DBValue>>
-	where
-		Block: BlockT,
+where
+	Block: BlockT,
 {
 	block_id_to_lookup_key(db, col_index, id).and_then(|key| match key {
 		Some(key) => Ok(db.get(col, key.as_ref())),
@@ -358,10 +353,8 @@ pub fn read_header<Block: BlockT>(
 	match read_db(db, col_index, col, id)? {
 		Some(header) => match Block::Header::decode(&mut &header[..]) {
 			Ok(header) => Ok(Some(header)),
-			Err(_) => return Err(
-				sp_blockchain::Error::Backend("Error decoding header".into())
-			),
-		}
+			Err(_) => return Err(sp_blockchain::Error::Backend("Error decoding header".into())),
+		},
 		None => Ok(None),
 	}
 }
@@ -373,34 +366,35 @@ pub fn require_header<Block: BlockT>(
 	col: u32,
 	id: BlockId<Block>,
 ) -> sp_blockchain::Result<Block::Header> {
-	read_header(db, col_index, col, id)
-		.and_then(|header| header.ok_or_else(||
-			sp_blockchain::Error::UnknownBlock(format!("Require header: {}", id))
-		))
+	read_header(db, col_index, col, id).and_then(|header| {
+		header.ok_or_else(|| sp_blockchain::Error::UnknownBlock(format!("Require header: {}", id)))
+	})
 }
 
 /// Read meta from the database.
-pub fn read_meta<Block>(db: &dyn Database<DbHash>, col_header: u32) -> Result<
-	Meta<<<Block as BlockT>::Header as HeaderT>::Number, Block::Hash>,
-	sp_blockchain::Error,
->
-	where
-		Block: BlockT,
+pub fn read_meta<Block>(
+	db: &dyn Database<DbHash>,
+	col_header: u32,
+) -> Result<Meta<<<Block as BlockT>::Header as HeaderT>::Number, Block::Hash>, sp_blockchain::Error>
+where
+	Block: BlockT,
 {
 	let genesis_hash: Block::Hash = match read_genesis_hash(db)? {
 		Some(genesis_hash) => genesis_hash,
-		None => return Ok(Meta {
-			best_hash: Default::default(),
-			best_number: Zero::zero(),
-			finalized_hash: Default::default(),
-			finalized_number: Zero::zero(),
-			genesis_hash: Default::default(),
-			finalized_state: None,
-		}),
+		None =>
+			return Ok(Meta {
+				best_hash: Default::default(),
+				best_number: Zero::zero(),
+				finalized_hash: Default::default(),
+				finalized_number: Zero::zero(),
+				genesis_hash: Default::default(),
+				finalized_state: None,
+			}),
 	};
 
 	let load_meta_block = |desc, key| -> Result<_, sp_blockchain::Error> {
-		if let Some(Some(header)) = db.get(COLUMN_META, key)
+		if let Some(Some(header)) = db
+			.get(COLUMN_META, key)
 			.and_then(|id| db.get(col_header, &id).map(|b| Block::Header::decode(&mut &b[..]).ok()))
 		{
 			let hash = header.hash();
@@ -419,7 +413,8 @@ pub fn read_meta<Block>(db: &dyn Database<DbHash>, col_header: u32) -> Result<
 
 	let (best_hash, best_number) = load_meta_block("best", meta_keys::BEST_BLOCK)?;
 	let (finalized_hash, finalized_number) = load_meta_block("final", meta_keys::FINALIZED_BLOCK)?;
-	let (finalized_state_hash, finalized_state_number) = load_meta_block("final_state", meta_keys::FINALIZED_STATE)?;
+	let (finalized_state_hash, finalized_state_number) =
+		load_meta_block("final_state", meta_keys::FINALIZED_STATE)?;
 	let finalized_state = if finalized_state_hash != Default::default() {
 		Some((finalized_state_hash, finalized_state_number))
 	} else {
@@ -437,13 +432,14 @@ pub fn read_meta<Block>(db: &dyn Database<DbHash>, col_header: u32) -> Result<
 }
 
 /// Read genesis hash from database.
-pub fn read_genesis_hash<Hash: Decode>(db: &dyn Database<DbHash>) -> sp_blockchain::Result<Option<Hash>> {
+pub fn read_genesis_hash<Hash: Decode>(
+	db: &dyn Database<DbHash>,
+) -> sp_blockchain::Result<Option<Hash>> {
 	match db.get(COLUMN_META, meta_keys::GENESIS_HASH) {
 		Some(h) => match Decode::decode(&mut &h[..]) {
 			Ok(h) => Ok(Some(h)),
-			Err(err) => Err(sp_blockchain::Error::Backend(
-				format!("Error decoding genesis hash: {}", err)
-			)),
+			Err(err) =>
+				Err(sp_blockchain::Error::Backend(format!("Error decoding genesis hash: {}", err))),
 		},
 		None => Ok(None),
 	}
@@ -461,7 +457,7 @@ impl DatabaseType {
 
 pub(crate) struct JoinInput<'a, 'b>(&'a [u8], &'b [u8]);
 
-pub(crate) fn join_input<'a, 'b>(i1: &'a[u8], i2: &'b [u8]) -> JoinInput<'a, 'b> {
+pub(crate) fn join_input<'a, 'b>(i1: &'a [u8], i2: &'b [u8]) -> JoinInput<'a, 'b> {
 	JoinInput(i1, i2)
 }
 
@@ -486,8 +482,8 @@ impl<'a, 'b> codec::Input for JoinInput<'a, 'b> {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use sp_runtime::testing::{Block as RawBlock, ExtrinsicWrapper};
 	use codec::Input;
+	use sp_runtime::testing::{Block as RawBlock, ExtrinsicWrapper};
 	type Block = RawBlock<ExtrinsicWrapper<u32>>;
 
 	#[test]
diff --git a/client/executor/common/src/lib.rs b/client/executor/common/src/lib.rs
index 25e06314aba3..ef73ecd90e28 100644
--- a/client/executor/common/src/lib.rs
+++ b/client/executor/common/src/lib.rs
@@ -22,6 +22,6 @@
 #![deny(unused_crate_dependencies)]
 
 pub mod error;
+pub mod runtime_blob;
 pub mod sandbox;
 pub mod wasm_runtime;
-pub mod runtime_blob;
diff --git a/client/executor/common/src/runtime_blob/data_segments_snapshot.rs b/client/executor/common/src/runtime_blob/data_segments_snapshot.rs
index 269ad0858325..5c3fedbdc963 100644
--- a/client/executor/common/src/runtime_blob/data_segments_snapshot.rs
+++ b/client/executor/common/src/runtime_blob/data_segments_snapshot.rs
@@ -16,10 +16,10 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::error::{self, Error};
 use super::RuntimeBlob;
-use std::mem;
+use crate::error::{self, Error};
 use pwasm_utils::parity_wasm::elements::Instruction;
+use std::mem;
 
 /// This is a snapshot of data segments specialzied for a particular instantiation.
 ///
@@ -49,7 +49,7 @@ impl DataSegmentsSnapshot {
 
 				// [op, End]
 				if init_expr.len() != 2 {
-					return Err(Error::InitializerHasTooManyExpressions);
+					return Err(Error::InitializerHasTooManyExpressions)
 				}
 				let offset = match &init_expr[0] {
 					Instruction::I32Const(v) => *v as u32,
@@ -60,8 +60,8 @@ impl DataSegmentsSnapshot {
 						// At the moment of writing the Substrate Runtime Interface does not provide
 						// any globals. There is nothing that prevents us from supporting this
 						// if/when we gain those.
-						return Err(Error::ImportedGlobalsUnsupported);
-					}
+						return Err(Error::ImportedGlobalsUnsupported)
+					},
 					insn => return Err(Error::InvalidInitializerExpression(format!("{:?}", insn))),
 				};
 
diff --git a/client/executor/common/src/runtime_blob/globals_snapshot.rs b/client/executor/common/src/runtime_blob/globals_snapshot.rs
index acdefef2e64e..6a29ff8bae36 100644
--- a/client/executor/common/src/runtime_blob/globals_snapshot.rs
+++ b/client/executor/common/src/runtime_blob/globals_snapshot.rs
@@ -50,17 +50,14 @@ pub trait InstanceGlobals {
 /// a runtime blob that was instrumented by
 /// [`RuntimeBlob::expose_mutable_globals`](super::RuntimeBlob::expose_mutable_globals`).
 
-///
 /// If the code wasn't instrumented then it would be empty and snapshot would do nothing.
 pub struct ExposedMutableGlobalsSet(Vec<String>);
 
 impl ExposedMutableGlobalsSet {
 	/// Collect the set from the given runtime blob. See the struct documentation for details.
 	pub fn collect(runtime_blob: &RuntimeBlob) -> Self {
-		let global_names = runtime_blob
-			.exported_internal_global_names()
-			.map(ToOwned::to_owned)
-			.collect();
+		let global_names =
+			runtime_blob.exported_internal_global_names().map(ToOwned::to_owned).collect();
 		Self(global_names)
 	}
 }
diff --git a/client/executor/common/src/runtime_blob/mod.rs b/client/executor/common/src/runtime_blob/mod.rs
index 372df7bd97eb..43d6e5e7a0df 100644
--- a/client/executor/common/src/runtime_blob/mod.rs
+++ b/client/executor/common/src/runtime_blob/mod.rs
@@ -53,5 +53,5 @@ mod globals_snapshot;
 mod runtime_blob;
 
 pub use data_segments_snapshot::DataSegmentsSnapshot;
-pub use globals_snapshot::{GlobalsSnapshot, ExposedMutableGlobalsSet, InstanceGlobals};
+pub use globals_snapshot::{ExposedMutableGlobalsSet, GlobalsSnapshot, InstanceGlobals};
 pub use runtime_blob::RuntimeBlob;
diff --git a/client/executor/common/src/runtime_blob/runtime_blob.rs b/client/executor/common/src/runtime_blob/runtime_blob.rs
index e7fc15bb13e1..b7f71193449c 100644
--- a/client/executor/common/src/runtime_blob/runtime_blob.rs
+++ b/client/executor/common/src/runtime_blob/runtime_blob.rs
@@ -16,13 +16,11 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+use crate::error::WasmError;
 use pwasm_utils::{
-	parity_wasm::elements::{
-		DataSegment, Module, deserialize_buffer, serialize, Internal,
-	},
 	export_mutable_globals,
+	parity_wasm::elements::{deserialize_buffer, serialize, DataSegment, Internal, Module},
 };
-use crate::error::WasmError;
 
 /// A bunch of information collected from a WebAssembly module.
 #[derive(Clone)]
@@ -53,11 +51,7 @@ impl RuntimeBlob {
 
 	/// Extract the data segments from the given wasm code.
 	pub(super) fn data_segments(&self) -> Vec<DataSegment> {
-		self.raw_module
-			.data_section()
-			.map(|ds| ds.entries())
-			.unwrap_or(&[])
-			.to_vec()
+		self.raw_module.data_section().map(|ds| ds.entries()).unwrap_or(&[]).to_vec()
 	}
 
 	/// The number of globals defined in locally in this module.
@@ -70,10 +64,7 @@ impl RuntimeBlob {
 
 	/// The number of imports of globals.
 	pub fn imported_globals_count(&self) -> u32 {
-		self.raw_module
-			.import_section()
-			.map(|is| is.globals() as u32)
-			.unwrap_or(0)
+		self.raw_module.import_section().map(|is| is.globals() as u32).unwrap_or(0)
 	}
 
 	/// Perform an instrumentation that makes sure that the mutable globals are exported.
@@ -95,35 +86,29 @@ impl RuntimeBlob {
 				|e| WasmError::Other(format!("cannot inject the stack limiter: {:?}", e)),
 			)?;
 
-		Ok(Self {
-			raw_module: injected_module,
-		})
+		Ok(Self { raw_module: injected_module })
 	}
 
 	/// Perform an instrumentation that makes sure that a specific function `entry_point` is exported
 	pub fn entry_point_exists(&self, entry_point: &str) -> bool {
-		self.raw_module.export_section().map(|e| {
-			e.entries()
-			.iter()
-			.any(|e| matches!(e.internal(), Internal::Function(_)) && e.field() == entry_point)
-		}).unwrap_or_default()
+		self.raw_module
+			.export_section()
+			.map(|e| {
+				e.entries().iter().any(|e| {
+					matches!(e.internal(), Internal::Function(_)) && e.field() == entry_point
+				})
+			})
+			.unwrap_or_default()
 	}
 
 	/// Returns an iterator of all globals which were exported by [`expose_mutable_globals`].
 	pub(super) fn exported_internal_global_names<'module>(
 		&'module self,
 	) -> impl Iterator<Item = &'module str> {
-		let exports = self
-			.raw_module
-			.export_section()
-			.map(|es| es.entries())
-			.unwrap_or(&[]);
+		let exports = self.raw_module.export_section().map(|es| es.entries()).unwrap_or(&[]);
 		exports.iter().filter_map(|export| match export.internal() {
-			Internal::Global(_)
-				if export.field().starts_with("exported_internal_global") =>
-			{
-				Some(export.field())
-			}
+			Internal::Global(_) if export.field().starts_with("exported_internal_global") =>
+				Some(export.field()),
 			_ => None,
 		})
 	}
@@ -135,12 +120,11 @@ impl RuntimeBlob {
 			.custom_sections()
 			.find(|cs| cs.name() == section_name)
 			.map(|cs| cs.payload())
-		}
+	}
 
 	/// Consumes this runtime blob and serializes it.
 	pub fn serialize(self) -> Vec<u8> {
-		serialize(self.raw_module)
-			.expect("serializing into a vec should succeed; qed")
+		serialize(self.raw_module).expect("serializing into a vec should succeed; qed")
 	}
 
 	/// Destructure this structure into the underlying parity-wasm Module.
diff --git a/client/executor/common/src/sandbox.rs b/client/executor/common/src/sandbox.rs
index b7838aab7f34..63f9cc4f258e 100644
--- a/client/executor/common/src/sandbox.rs
+++ b/client/executor/common/src/sandbox.rs
@@ -21,15 +21,15 @@
 //! Sandboxing is baked by wasmi at the moment. In future, however, we would like to add/switch to
 //! a compiled execution engine.
 
-use crate::error::{Result, Error};
-use std::{collections::HashMap, rc::Rc};
+use crate::error::{Error, Result};
 use codec::{Decode, Encode};
 use sp_core::sandbox as sandbox_primitives;
+use sp_wasm_interface::{FunctionContext, Pointer, WordSize};
+use std::{collections::HashMap, rc::Rc};
 use wasmi::{
-	Externals, ImportResolver, MemoryInstance, MemoryRef, Module, ModuleInstance,
-	ModuleRef, RuntimeArgs, RuntimeValue, Trap, TrapKind, memory_units::Pages,
+	memory_units::Pages, Externals, ImportResolver, MemoryInstance, MemoryRef, Module,
+	ModuleInstance, ModuleRef, RuntimeArgs, RuntimeValue, Trap, TrapKind,
 };
-use sp_wasm_interface::{FunctionContext, Pointer, WordSize};
 
 /// Index of a function inside the supervisor.
 ///
@@ -83,15 +83,9 @@ impl ImportResolver for Imports {
 		field_name: &str,
 		signature: &::wasmi::Signature,
 	) -> std::result::Result<wasmi::FuncRef, wasmi::Error> {
-		let key = (
-			module_name.as_bytes().to_owned(),
-			field_name.as_bytes().to_owned(),
-		);
+		let key = (module_name.as_bytes().to_owned(), field_name.as_bytes().to_owned());
 		let idx = *self.func_map.get(&key).ok_or_else(|| {
-			wasmi::Error::Instantiation(format!(
-				"Export {}:{} not found",
-				module_name, field_name
-			))
+			wasmi::Error::Instantiation(format!("Export {}:{} not found", module_name, field_name))
 		})?;
 		Ok(wasmi::FuncInstance::alloc_host(signature.clone(), idx.0))
 	}
@@ -102,11 +96,9 @@ impl ImportResolver for Imports {
 		field_name: &str,
 		_memory_type: &::wasmi::MemoryDescriptor,
 	) -> std::result::Result<MemoryRef, wasmi::Error> {
-		let key = (
-			module_name.as_bytes().to_vec(),
-			field_name.as_bytes().to_vec(),
-		);
-		let mem = self.memories_map
+		let key = (module_name.as_bytes().to_vec(), field_name.as_bytes().to_vec());
+		let mem = self
+			.memories_map
 			.get(&key)
 			.ok_or_else(|| {
 				wasmi::Error::Instantiation(format!(
@@ -124,10 +116,7 @@ impl ImportResolver for Imports {
 		field_name: &str,
 		_global_type: &::wasmi::GlobalDescriptor,
 	) -> std::result::Result<wasmi::GlobalRef, wasmi::Error> {
-		Err(wasmi::Error::Instantiation(format!(
-			"Export {}:{} not found",
-			module_name, field_name
-		)))
+		Err(wasmi::Error::Instantiation(format!("Export {}:{} not found", module_name, field_name)))
 	}
 
 	fn resolve_table(
@@ -136,10 +125,7 @@ impl ImportResolver for Imports {
 		field_name: &str,
 		_table_type: &::wasmi::TableDescriptor,
 	) -> std::result::Result<wasmi::TableRef, wasmi::Error> {
-		Err(wasmi::Error::Instantiation(format!(
-			"Export {}:{} not found",
-			module_name, field_name
-		)))
+		Err(wasmi::Error::Instantiation(format!("Export {}:{} not found", module_name, field_name)))
 	}
 }
 
@@ -187,7 +173,9 @@ fn trap(msg: &'static str) -> Trap {
 	TrapKind::Host(Box::new(Error::Other(msg.into()))).into()
 }
 
-fn deserialize_result(mut serialized_result: &[u8]) -> std::result::Result<Option<RuntimeValue>, Trap> {
+fn deserialize_result(
+	mut serialized_result: &[u8],
+) -> std::result::Result<Option<RuntimeValue>, Trap> {
 	use self::sandbox_primitives::HostError;
 	use sp_wasm_interface::ReturnValue;
 	let result_val = std::result::Result::<ReturnValue, HostError>::decode(&mut serialized_result)
@@ -222,7 +210,8 @@ impl<'a, FE: SandboxCapabilities + 'a> Externals for GuestExternals<'a, FE> {
 			);
 
 		// Serialize arguments into a byte vector.
-		let invoke_args_data: Vec<u8> = args.as_ref()
+		let invoke_args_data: Vec<u8> = args
+			.as_ref()
 			.iter()
 			.cloned()
 			.map(sp_wasm_interface::Value::from)
@@ -240,10 +229,7 @@ impl<'a, FE: SandboxCapabilities + 'a> Externals for GuestExternals<'a, FE> {
 			.map_err(|_| trap("Can't allocate memory in supervisor for the arguments"))?;
 
 		let deallocate = |this: &mut GuestExternals<FE>, ptr, fail_msg| {
-			this
-				.supervisor_externals
-				.deallocate_memory(ptr)
-				.map_err(|_| trap(fail_msg))
+			this.supervisor_externals.deallocate_memory(ptr).map_err(|_| trap(fail_msg))
 		};
 
 		if self
@@ -251,8 +237,12 @@ impl<'a, FE: SandboxCapabilities + 'a> Externals for GuestExternals<'a, FE> {
 			.write_memory(invoke_args_ptr, &invoke_args_data)
 			.is_err()
 		{
-			deallocate(self, invoke_args_ptr, "Failed dealloction after failed write of invoke arguments")?;
-			return Err(trap("Can't write invoke args into memory"));
+			deallocate(
+				self,
+				invoke_args_ptr,
+				"Failed dealloction after failed write of invoke arguments",
+			)?;
+			return Err(trap("Can't write invoke args into memory"))
 		}
 
 		let result = self.supervisor_externals.invoke(
@@ -263,7 +253,11 @@ impl<'a, FE: SandboxCapabilities + 'a> Externals for GuestExternals<'a, FE> {
 			func_idx,
 		);
 
-		deallocate(self, invoke_args_ptr, "Can't deallocate memory for dispatch thunk's invoke arguments")?;
+		deallocate(
+			self,
+			invoke_args_ptr,
+			"Can't deallocate memory for dispatch thunk's invoke arguments",
+		)?;
 		let result = result?;
 
 		// dispatch_thunk returns pointer to serialized arguments.
@@ -276,13 +270,18 @@ impl<'a, FE: SandboxCapabilities + 'a> Externals for GuestExternals<'a, FE> {
 			(Pointer::new(ptr), len)
 		};
 
-		let serialized_result_val = self.supervisor_externals
+		let serialized_result_val = self
+			.supervisor_externals
 			.read_memory(serialized_result_val_ptr, serialized_result_val_len)
 			.map_err(|_| trap("Can't read the serialized result from dispatch thunk"));
 
-		deallocate(self, serialized_result_val_ptr, "Can't deallocate memory for dispatch thunk's result")
-			.and_then(|_| serialized_result_val)
-			.and_then(|serialized_result_val| deserialize_result(&serialized_result_val))
+		deallocate(
+			self,
+			serialized_result_val_ptr,
+			"Can't deallocate memory for dispatch thunk's result",
+		)
+		.and_then(|_| serialized_result_val)
+		.and_then(|serialized_result_val| deserialize_result(&serialized_result_val))
 	}
 }
 
@@ -296,11 +295,7 @@ where
 	FE: SandboxCapabilities,
 	F: FnOnce(&mut GuestExternals<FE>) -> R,
 {
-	let mut guest_externals = GuestExternals {
-		supervisor_externals,
-		sandbox_instance,
-		state,
-	};
+	let mut guest_externals = GuestExternals { supervisor_externals, sandbox_instance, state };
 	f(&mut guest_externals)
 }
 
@@ -332,32 +327,23 @@ impl<FR> SandboxInstance<FR> {
 	///
 	/// The `state` parameter can be used to provide custom data for
 	/// these syscall implementations.
-	pub fn invoke<FE: SandboxCapabilities<SupervisorFuncRef=FR>>(
+	pub fn invoke<FE: SandboxCapabilities<SupervisorFuncRef = FR>>(
 		&self,
 		export_name: &str,
 		args: &[RuntimeValue],
 		supervisor_externals: &mut FE,
 		state: u32,
 	) -> std::result::Result<Option<wasmi::RuntimeValue>, wasmi::Error> {
-		with_guest_externals(
-			supervisor_externals,
-			self,
-			state,
-			|guest_externals| {
-				self.instance
-					.invoke_export(export_name, args, guest_externals)
-			},
-		)
+		with_guest_externals(supervisor_externals, self, state, |guest_externals| {
+			self.instance.invoke_export(export_name, args, guest_externals)
+		})
 	}
 
 	/// Get the value from a global with the given `name`.
 	///
 	/// Returns `Some(_)` if the global could be found.
 	pub fn get_global_val(&self, name: &str) -> Option<sp_wasm_interface::Value> {
-		let global = self.instance
-			.export_by_name(name)?
-			.as_global()?
-			.get();
+		let global = self.instance.export_by_name(name)?.as_global()?.get();
 
 		Some(global.into())
 	}
@@ -398,7 +384,7 @@ fn decode_environment_definition(
 				let externals_idx =
 					guest_to_supervisor_mapping.define(SupervisorFuncIndex(func_idx as usize));
 				func_map.insert((module, field), externals_idx);
-			}
+			},
 			sandbox_primitives::ExternEntity::Memory(memory_idx) => {
 				let memory_ref = memories
 					.get(memory_idx as usize)
@@ -406,17 +392,11 @@ fn decode_environment_definition(
 					.ok_or_else(|| InstantiationError::EnvironmentDefinitionCorrupted)?
 					.ok_or_else(|| InstantiationError::EnvironmentDefinitionCorrupted)?;
 				memories_map.insert((module, field), memory_ref);
-			}
+			},
 		}
 	}
 
-	Ok((
-		Imports {
-			func_map,
-			memories_map,
-		},
-		guest_to_supervisor_mapping,
-	))
+	Ok((Imports { func_map, memories_map }, guest_to_supervisor_mapping))
 }
 
 /// An environment in which the guest module is instantiated.
@@ -435,10 +415,7 @@ impl GuestEnvironment {
 	) -> std::result::Result<Self, InstantiationError> {
 		let (imports, guest_to_supervisor_mapping) =
 			decode_environment_definition(raw_env_def, &store.memories)?;
-		Ok(Self {
-			imports,
-			guest_to_supervisor_mapping,
-		})
+		Ok(Self { imports, guest_to_supervisor_mapping })
 	}
 }
 
@@ -493,16 +470,11 @@ pub fn instantiate<'a, FE: SandboxCapabilities>(
 		guest_to_supervisor_mapping: host_env.guest_to_supervisor_mapping,
 	});
 
-	with_guest_externals(
-		supervisor_externals,
-		&sandbox_instance,
-		state,
-		|guest_externals| {
-			instance
-				.run_start(guest_externals)
-				.map_err(|_| InstantiationError::StartTrapped)
-		},
-	)?;
+	with_guest_externals(supervisor_externals, &sandbox_instance, state, |guest_externals| {
+		instance
+			.run_start(guest_externals)
+			.map_err(|_| InstantiationError::StartTrapped)
+	})?;
 
 	Ok(UnregisteredInstance { sandbox_instance })
 }
@@ -519,10 +491,7 @@ pub struct Store<FR> {
 impl<FR> Store<FR> {
 	/// Create a new empty sandbox store.
 	pub fn new() -> Self {
-		Store {
-			instances: Vec::new(),
-			memories: Vec::new(),
-		}
+		Store { instances: Vec::new(), memories: Vec::new() }
 	}
 
 	/// Create a new memory instance and return it's index.
@@ -537,11 +506,7 @@ impl<FR> Store<FR> {
 			specified_limit => Some(Pages(specified_limit as usize)),
 		};
 
-		let mem =
-			MemoryInstance::alloc(
-				Pages(initial as usize),
-				maximum,
-			)?;
+		let mem = MemoryInstance::alloc(Pages(initial as usize), maximum)?;
 
 		let mem_idx = self.memories.len();
 		self.memories.push(Some(mem));
@@ -589,7 +554,7 @@ impl<FR> Store<FR> {
 			Some(memory) => {
 				*memory = None;
 				Ok(())
-			}
+			},
 		}
 	}
 
@@ -606,7 +571,7 @@ impl<FR> Store<FR> {
 			Some(instance) => {
 				*instance = None;
 				Ok(())
-			}
+			},
 		}
 	}
 
diff --git a/client/executor/runtime-test/src/lib.rs b/client/executor/runtime-test/src/lib.rs
index c37766832b46..11771b183e3c 100644
--- a/client/executor/runtime-test/src/lib.rs
+++ b/client/executor/runtime-test/src/lib.rs
@@ -7,22 +7,28 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 /// Wasm binary unwrapped. If built with `SKIP_WASM_BUILD`, the function panics.
 #[cfg(feature = "std")]
 pub fn wasm_binary_unwrap() -> &'static [u8] {
-	WASM_BINARY.expect("Development wasm binary is not available. Testing is only \
-						supported with the flag disabled.")
+	WASM_BINARY.expect(
+		"Development wasm binary is not available. Testing is only \
+						supported with the flag disabled.",
+	)
 }
 
 #[cfg(not(feature = "std"))]
-use sp_std::{vec::Vec, vec};
+use sp_std::{vec, vec::Vec};
 
+#[cfg(not(feature = "std"))]
+use sp_core::{ed25519, sr25519};
 #[cfg(not(feature = "std"))]
 use sp_io::{
-	storage, hashing::{blake2_128, blake2_256, sha2_256, twox_128, twox_256},
-	crypto::{ed25519_verify, sr25519_verify}, wasm_tracing,
+	crypto::{ed25519_verify, sr25519_verify},
+	hashing::{blake2_128, blake2_256, sha2_256, twox_128, twox_256},
+	storage, wasm_tracing,
 };
 #[cfg(not(feature = "std"))]
-use sp_runtime::{print, traits::{BlakeTwo256, Hash}};
-#[cfg(not(feature = "std"))]
-use sp_core::{ed25519, sr25519};
+use sp_runtime::{
+	print,
+	traits::{BlakeTwo256, Hash},
+};
 #[cfg(not(feature = "std"))]
 use sp_sandbox::Value;
 
@@ -48,347 +54,347 @@ static mut MUTABLE_STATIC: u64 = 32;
 static mut MUTABLE_STATIC_BSS: u64 = 0;
 
 sp_core::wasm_export_functions! {
-	fn test_calling_missing_external() {
-		unsafe { missing_external() }
-	}
-
-	fn test_calling_yet_another_missing_external() {
-		unsafe { yet_another_missing_external() }
-	}
-
-	fn test_data_in(input: Vec<u8>) -> Vec<u8> {
-		print("set_storage");
-		storage::set(b"input", &input);
-
-		print("storage");
-		let foo = storage::get(b"foo").unwrap();
-
-		print("set_storage");
-		storage::set(b"baz", &foo);
-
-		print("finished!");
-		b"all ok!".to_vec()
-	}
-
-	fn test_clear_prefix(input: Vec<u8>) -> Vec<u8> {
-		storage::clear_prefix(&input, None);
-		b"all ok!".to_vec()
-	}
-
-	fn test_empty_return() {}
-
-	fn test_dirty_plenty_memory(heap_base: u32, heap_pages: u32) {
-		// This piece of code will dirty multiple pages of memory. The number of pages is given by
-		// the `heap_pages`. It's unit is a wasm page (64KiB). The first page to be cleared
-		// is a wasm page that that follows the one that holds the `heap_base` address.
-		//
-		// This function dirties the **host** pages. I.e. we dirty 4KiB at a time and it will take
-		// 16 writes to process a single wasm page.
-
-		let mut heap_ptr = heap_base as usize;
-
-		// Find the next wasm page boundary.
-		let heap_ptr = round_up_to(heap_ptr, 65536);
-
-		// Make it an actual pointer
-		let heap_ptr = heap_ptr as *mut u8;
-
-		// Traverse the host pages and make each one dirty
-		let host_pages = heap_pages as usize * 16;
-		for i in 0..host_pages {
-			unsafe {
-				// technically this is an UB, but there is no way Rust can find this out.
-				heap_ptr.add(i * 4096).write(0);
-			}
-		}
-
-		fn round_up_to(n: usize, divisor: usize) -> usize {
-			(n + divisor - 1) / divisor
-		}
-	}
-
-	fn test_exhaust_heap() -> Vec<u8> { Vec::with_capacity(16777216) }
-
-	fn test_fp_f32add(a: [u8; 4], b: [u8; 4]) -> [u8; 4] {
-		let a = f32::from_le_bytes(a);
-		let b = f32::from_le_bytes(b);
-		f32::to_le_bytes(a + b)
-	}
-
-	fn test_panic() { panic!("test panic") }
-
-	fn test_conditional_panic(input: Vec<u8>) -> Vec<u8> {
-		if input.len() > 0 {
-			panic!("test panic")
-		}
-
-		input
-	}
-
-	fn test_blake2_256(input: Vec<u8>) -> Vec<u8> {
-		blake2_256(&input).to_vec()
-	}
-
-	fn test_blake2_128(input: Vec<u8>) -> Vec<u8> {
-		blake2_128(&input).to_vec()
-	}
-
-	fn test_sha2_256(input: Vec<u8>) -> Vec<u8> {
-		sha2_256(&input).to_vec()
-	}
-
-	fn test_twox_256(input: Vec<u8>) -> Vec<u8> {
-		twox_256(&input).to_vec()
-	}
-
-	fn test_twox_128(input: Vec<u8>) -> Vec<u8> {
-		twox_128(&input).to_vec()
-	}
-
-	fn test_ed25519_verify(input: Vec<u8>) -> bool {
-		let mut pubkey = [0; 32];
-		let mut sig = [0; 64];
-
-		pubkey.copy_from_slice(&input[0..32]);
-		sig.copy_from_slice(&input[32..96]);
-
-		let msg = b"all ok!";
-		ed25519_verify(&ed25519::Signature(sig), &msg[..], &ed25519::Public(pubkey))
-	}
-
-	fn test_sr25519_verify(input: Vec<u8>) -> bool {
-		let mut pubkey = [0; 32];
-		let mut sig = [0; 64];
-
-		pubkey.copy_from_slice(&input[0..32]);
-		sig.copy_from_slice(&input[32..96]);
-
-		let msg = b"all ok!";
-		sr25519_verify(&sr25519::Signature(sig), &msg[..], &sr25519::Public(pubkey))
-	}
-
-	fn test_ordered_trie_root() -> Vec<u8> {
-		BlakeTwo256::ordered_trie_root(
-			vec![
-				b"zero"[..].into(),
-				b"one"[..].into(),
-				b"two"[..].into(),
-			],
-		).as_ref().to_vec()
-	}
-
-	fn test_sandbox(code: Vec<u8>) -> bool {
-		execute_sandboxed(&code, &[]).is_ok()
-	}
+   fn test_calling_missing_external() {
+	   unsafe { missing_external() }
+   }
 
-	fn test_sandbox_args(code: Vec<u8>) -> bool {
-		execute_sandboxed(
-			&code,
-			&[
-				Value::I32(0x12345678),
-				Value::I64(0x1234567887654321),
-			],
-		).is_ok()
-	}
-
-	fn test_sandbox_return_val(code: Vec<u8>) -> bool {
-		let ok = match execute_sandboxed(
-			&code,
-			&[
-				Value::I32(0x1336),
-			]
-		) {
-			Ok(sp_sandbox::ReturnValue::Value(Value::I32(0x1337))) => true,
-			_ => false,
-		};
-
-		ok
-	}
-
-	fn test_sandbox_instantiate(code: Vec<u8>) -> u8 {
-		let env_builder = sp_sandbox::EnvironmentDefinitionBuilder::new();
-		let code = match sp_sandbox::Instance::new(&code, &env_builder, &mut ()) {
-			Ok(_) => 0,
-			Err(sp_sandbox::Error::Module) => 1,
-			Err(sp_sandbox::Error::Execution) => 2,
-			Err(sp_sandbox::Error::OutOfBounds) => 3,
-		};
-
-		code
-	}
-
-	fn test_sandbox_get_global_val(code: Vec<u8>) -> i64 {
-		let env_builder = sp_sandbox::EnvironmentDefinitionBuilder::new();
-		let instance = if let Ok(i) = sp_sandbox::Instance::new(&code, &env_builder, &mut ()) {
-			i
-		} else {
-			return 20;
-		};
-
-		match instance.get_global_val("test_global") {
-			Some(sp_sandbox::Value::I64(val)) => val,
-			None => 30,
-			val => 40,
-		}
-	}
-
-	fn test_offchain_index_set() {
-		sp_io::offchain_index::set(b"k", b"v");
-	}
-
-	fn test_offchain_local_storage() -> bool {
-		let kind = sp_core::offchain::StorageKind::PERSISTENT;
-		assert_eq!(sp_io::offchain::local_storage_get(kind, b"test"), None);
-		sp_io::offchain::local_storage_set(kind, b"test", b"asd");
-		assert_eq!(sp_io::offchain::local_storage_get(kind, b"test"), Some(b"asd".to_vec()));
-
-		let res = sp_io::offchain::local_storage_compare_and_set(
-			kind,
-			b"test",
-			Some(b"asd".to_vec()),
-			b"",
-		);
-		assert_eq!(sp_io::offchain::local_storage_get(kind, b"test"), Some(b"".to_vec()));
-		res
-	}
-
-	fn test_offchain_local_storage_with_none() {
-		let kind = sp_core::offchain::StorageKind::PERSISTENT;
-		assert_eq!(sp_io::offchain::local_storage_get(kind, b"test"), None);
-
-		let res = sp_io::offchain::local_storage_compare_and_set(kind, b"test", None, b"value");
-		assert_eq!(res, true);
-		assert_eq!(sp_io::offchain::local_storage_get(kind, b"test"), Some(b"value".to_vec()));
-	}
+   fn test_calling_yet_another_missing_external() {
+	   unsafe { yet_another_missing_external() }
+   }
 
-	fn test_offchain_http() -> bool {
-		use sp_core::offchain::HttpRequestStatus;
-		let run = || -> Option<()> {
-			let id = sp_io::offchain::http_request_start(
-				"POST",
-				"http://localhost:12345",
-				&[],
-			).ok()?;
-			sp_io::offchain::http_request_add_header(id, "X-Auth", "test").ok()?;
-			sp_io::offchain::http_request_write_body(id, &[1, 2, 3, 4], None).ok()?;
-			sp_io::offchain::http_request_write_body(id, &[], None).ok()?;
-			let status = sp_io::offchain::http_response_wait(&[id], None);
-			assert!(status == vec![HttpRequestStatus::Finished(200)], "Expected Finished(200) status.");
-			let headers = sp_io::offchain::http_response_headers(id);
-			assert_eq!(headers, vec![(b"X-Auth".to_vec(), b"hello".to_vec())]);
-			let mut buffer = vec![0; 64];
-			let read = sp_io::offchain::http_response_read_body(id, &mut buffer, None).ok()?;
-			assert_eq!(read, 3);
-			assert_eq!(&buffer[0..read as usize], &[1, 2, 3]);
-			let read = sp_io::offchain::http_response_read_body(id, &mut buffer, None).ok()?;
-			assert_eq!(read, 0);
-
-			Some(())
-		};
+   fn test_data_in(input: Vec<u8>) -> Vec<u8> {
+	   print("set_storage");
+	   storage::set(b"input", &input);
 
-		run().is_some()
-	}
+	   print("storage");
+	   let foo = storage::get(b"foo").unwrap();
 
-	fn test_enter_span() -> u64 {
-		wasm_tracing::enter_span(Default::default())
-	}
+	   print("set_storage");
+	   storage::set(b"baz", &foo);
 
-	fn test_exit_span(span_id: u64) {
-		wasm_tracing::exit(span_id)
-	}
+	   print("finished!");
+	   b"all ok!".to_vec()
+   }
 
-	fn test_nested_spans() {
-		sp_io::init_tracing();
-		let span_id = wasm_tracing::enter_span(Default::default());
-		{
-			sp_io::init_tracing();
-			let span_id = wasm_tracing::enter_span(Default::default());
-			wasm_tracing::exit(span_id);
-		}
-		wasm_tracing::exit(span_id);
-	}
-
-	fn returns_mutable_static() -> u64 {
-		unsafe {
-			MUTABLE_STATIC += 1;
-			MUTABLE_STATIC
-		}
-	}
-
-	fn returns_mutable_static_bss() -> u64 {
-		unsafe {
-			MUTABLE_STATIC_BSS += 1;
-			MUTABLE_STATIC_BSS
-		}
-	}
-
-	fn allocates_huge_stack_array(trap: bool) -> Vec<u8> {
-		// Allocate a stack frame that is approx. 75% of the stack (assuming it is 1MB).
-		// This will just decrease (stacks in wasm32-u-u grow downwards) the stack
-		// pointer. This won't trap on the current compilers.
-		let mut data = [0u8; 1024 * 768];
-
-		// Then make sure we actually write something to it.
-		//
-		// If:
-		// 1. the stack area is placed at the beginning of the linear memory space, and
-		// 2. the stack pointer points to out-of-bounds area, and
-		// 3. a write is performed around the current stack pointer.
-		//
-		// then a trap should happen.
-		//
-		for (i, v) in data.iter_mut().enumerate() {
-			*v = i as u8; // deliberate truncation
-		}
-
-		if trap {
-			// There is a small chance of this to be pulled up in theory. In practice
-			// the probability of that is rather low.
-			panic!()
-		}
-
-		data.to_vec()
-	}
-
-	// Check that the heap at `heap_base + offset` don't contains the test message.
-	// After the check succeeds the test message is written into the heap.
-	//
-	// It is expected that the given pointer is not allocated.
-	fn check_and_set_in_heap(heap_base: u32, offset: u32) {
-		let test_message = b"Hello invalid heap memory";
-		let ptr = unsafe { (heap_base + offset) as *mut u8 };
-
-		let message_slice = unsafe { sp_std::slice::from_raw_parts_mut(ptr, test_message.len()) };
-
-		assert_ne!(test_message, message_slice);
-		message_slice.copy_from_slice(test_message);
-	}
-
-	fn test_spawn() {
-		let data = vec![1u8, 2u8];
-		let data_new = sp_tasks::spawn(tasks::incrementer, data).join();
-
-		assert_eq!(data_new, vec![2u8, 3u8]);
-	}
-
-	fn test_nested_spawn() {
-		let data = vec![7u8, 13u8];
-		let data_new = sp_tasks::spawn(tasks::parallel_incrementer, data).join();
-
-		assert_eq!(data_new, vec![10u8, 16u8]);
-	}
-
-	fn test_panic_in_spawned() {
-		sp_tasks::spawn(tasks::panicker, vec![]).join();
-	}
- }
+   fn test_clear_prefix(input: Vec<u8>) -> Vec<u8> {
+	   storage::clear_prefix(&input, None);
+	   b"all ok!".to_vec()
+   }
+
+   fn test_empty_return() {}
+
+   fn test_dirty_plenty_memory(heap_base: u32, heap_pages: u32) {
+	   // This piece of code will dirty multiple pages of memory. The number of pages is given by
+	   // the `heap_pages`. It's unit is a wasm page (64KiB). The first page to be cleared
+	   // is a wasm page that that follows the one that holds the `heap_base` address.
+	   //
+	   // This function dirties the **host** pages. I.e. we dirty 4KiB at a time and it will take
+	   // 16 writes to process a single wasm page.
+
+	   let mut heap_ptr = heap_base as usize;
+
+	   // Find the next wasm page boundary.
+	   let heap_ptr = round_up_to(heap_ptr, 65536);
+
+	   // Make it an actual pointer
+	   let heap_ptr = heap_ptr as *mut u8;
+
+	   // Traverse the host pages and make each one dirty
+	   let host_pages = heap_pages as usize * 16;
+	   for i in 0..host_pages {
+		   unsafe {
+			   // technically this is an UB, but there is no way Rust can find this out.
+			   heap_ptr.add(i * 4096).write(0);
+		   }
+	   }
+
+	   fn round_up_to(n: usize, divisor: usize) -> usize {
+		   (n + divisor - 1) / divisor
+	   }
+   }
+
+   fn test_exhaust_heap() -> Vec<u8> { Vec::with_capacity(16777216) }
+
+   fn test_fp_f32add(a: [u8; 4], b: [u8; 4]) -> [u8; 4] {
+	   let a = f32::from_le_bytes(a);
+	   let b = f32::from_le_bytes(b);
+	   f32::to_le_bytes(a + b)
+   }
+
+   fn test_panic() { panic!("test panic") }
+
+   fn test_conditional_panic(input: Vec<u8>) -> Vec<u8> {
+	   if input.len() > 0 {
+		   panic!("test panic")
+	   }
+
+	   input
+   }
+
+   fn test_blake2_256(input: Vec<u8>) -> Vec<u8> {
+	   blake2_256(&input).to_vec()
+   }
+
+   fn test_blake2_128(input: Vec<u8>) -> Vec<u8> {
+	   blake2_128(&input).to_vec()
+   }
+
+   fn test_sha2_256(input: Vec<u8>) -> Vec<u8> {
+	   sha2_256(&input).to_vec()
+   }
+
+   fn test_twox_256(input: Vec<u8>) -> Vec<u8> {
+	   twox_256(&input).to_vec()
+   }
+
+   fn test_twox_128(input: Vec<u8>) -> Vec<u8> {
+	   twox_128(&input).to_vec()
+   }
+
+   fn test_ed25519_verify(input: Vec<u8>) -> bool {
+	   let mut pubkey = [0; 32];
+	   let mut sig = [0; 64];
+
+	   pubkey.copy_from_slice(&input[0..32]);
+	   sig.copy_from_slice(&input[32..96]);
+
+	   let msg = b"all ok!";
+	   ed25519_verify(&ed25519::Signature(sig), &msg[..], &ed25519::Public(pubkey))
+   }
+
+   fn test_sr25519_verify(input: Vec<u8>) -> bool {
+	   let mut pubkey = [0; 32];
+	   let mut sig = [0; 64];
+
+	   pubkey.copy_from_slice(&input[0..32]);
+	   sig.copy_from_slice(&input[32..96]);
+
+	   let msg = b"all ok!";
+	   sr25519_verify(&sr25519::Signature(sig), &msg[..], &sr25519::Public(pubkey))
+   }
+
+   fn test_ordered_trie_root() -> Vec<u8> {
+	   BlakeTwo256::ordered_trie_root(
+		   vec![
+			   b"zero"[..].into(),
+			   b"one"[..].into(),
+			   b"two"[..].into(),
+		   ],
+	   ).as_ref().to_vec()
+   }
+
+   fn test_sandbox(code: Vec<u8>) -> bool {
+	   execute_sandboxed(&code, &[]).is_ok()
+   }
+
+   fn test_sandbox_args(code: Vec<u8>) -> bool {
+	   execute_sandboxed(
+		   &code,
+		   &[
+			   Value::I32(0x12345678),
+			   Value::I64(0x1234567887654321),
+		   ],
+	   ).is_ok()
+   }
+
+   fn test_sandbox_return_val(code: Vec<u8>) -> bool {
+	   let ok = match execute_sandboxed(
+		   &code,
+		   &[
+			   Value::I32(0x1336),
+		   ]
+	   ) {
+		   Ok(sp_sandbox::ReturnValue::Value(Value::I32(0x1337))) => true,
+		   _ => false,
+	   };
+
+	   ok
+   }
+
+   fn test_sandbox_instantiate(code: Vec<u8>) -> u8 {
+	   let env_builder = sp_sandbox::EnvironmentDefinitionBuilder::new();
+	   let code = match sp_sandbox::Instance::new(&code, &env_builder, &mut ()) {
+		   Ok(_) => 0,
+		   Err(sp_sandbox::Error::Module) => 1,
+		   Err(sp_sandbox::Error::Execution) => 2,
+		   Err(sp_sandbox::Error::OutOfBounds) => 3,
+	   };
+
+	   code
+   }
+
+   fn test_sandbox_get_global_val(code: Vec<u8>) -> i64 {
+	   let env_builder = sp_sandbox::EnvironmentDefinitionBuilder::new();
+	   let instance = if let Ok(i) = sp_sandbox::Instance::new(&code, &env_builder, &mut ()) {
+		   i
+	   } else {
+		   return 20;
+	   };
+
+	   match instance.get_global_val("test_global") {
+		   Some(sp_sandbox::Value::I64(val)) => val,
+		   None => 30,
+		   val => 40,
+	   }
+   }
+
+   fn test_offchain_index_set() {
+	   sp_io::offchain_index::set(b"k", b"v");
+   }
+
+   fn test_offchain_local_storage() -> bool {
+	   let kind = sp_core::offchain::StorageKind::PERSISTENT;
+	   assert_eq!(sp_io::offchain::local_storage_get(kind, b"test"), None);
+	   sp_io::offchain::local_storage_set(kind, b"test", b"asd");
+	   assert_eq!(sp_io::offchain::local_storage_get(kind, b"test"), Some(b"asd".to_vec()));
+
+	   let res = sp_io::offchain::local_storage_compare_and_set(
+		   kind,
+		   b"test",
+		   Some(b"asd".to_vec()),
+		   b"",
+	   );
+	   assert_eq!(sp_io::offchain::local_storage_get(kind, b"test"), Some(b"".to_vec()));
+	   res
+   }
+
+   fn test_offchain_local_storage_with_none() {
+	   let kind = sp_core::offchain::StorageKind::PERSISTENT;
+	   assert_eq!(sp_io::offchain::local_storage_get(kind, b"test"), None);
+
+	   let res = sp_io::offchain::local_storage_compare_and_set(kind, b"test", None, b"value");
+	   assert_eq!(res, true);
+	   assert_eq!(sp_io::offchain::local_storage_get(kind, b"test"), Some(b"value".to_vec()));
+   }
+
+   fn test_offchain_http() -> bool {
+	   use sp_core::offchain::HttpRequestStatus;
+	   let run = || -> Option<()> {
+		   let id = sp_io::offchain::http_request_start(
+			   "POST",
+			   "http://localhost:12345",
+			   &[],
+		   ).ok()?;
+		   sp_io::offchain::http_request_add_header(id, "X-Auth", "test").ok()?;
+		   sp_io::offchain::http_request_write_body(id, &[1, 2, 3, 4], None).ok()?;
+		   sp_io::offchain::http_request_write_body(id, &[], None).ok()?;
+		   let status = sp_io::offchain::http_response_wait(&[id], None);
+		   assert!(status == vec![HttpRequestStatus::Finished(200)], "Expected Finished(200) status.");
+		   let headers = sp_io::offchain::http_response_headers(id);
+		   assert_eq!(headers, vec![(b"X-Auth".to_vec(), b"hello".to_vec())]);
+		   let mut buffer = vec![0; 64];
+		   let read = sp_io::offchain::http_response_read_body(id, &mut buffer, None).ok()?;
+		   assert_eq!(read, 3);
+		   assert_eq!(&buffer[0..read as usize], &[1, 2, 3]);
+		   let read = sp_io::offchain::http_response_read_body(id, &mut buffer, None).ok()?;
+		   assert_eq!(read, 0);
+
+		   Some(())
+	   };
+
+	   run().is_some()
+   }
+
+   fn test_enter_span() -> u64 {
+	   wasm_tracing::enter_span(Default::default())
+   }
+
+   fn test_exit_span(span_id: u64) {
+	   wasm_tracing::exit(span_id)
+   }
+
+   fn test_nested_spans() {
+	   sp_io::init_tracing();
+	   let span_id = wasm_tracing::enter_span(Default::default());
+	   {
+		   sp_io::init_tracing();
+		   let span_id = wasm_tracing::enter_span(Default::default());
+		   wasm_tracing::exit(span_id);
+	   }
+	   wasm_tracing::exit(span_id);
+   }
+
+   fn returns_mutable_static() -> u64 {
+	   unsafe {
+		   MUTABLE_STATIC += 1;
+		   MUTABLE_STATIC
+	   }
+   }
+
+   fn returns_mutable_static_bss() -> u64 {
+	   unsafe {
+		   MUTABLE_STATIC_BSS += 1;
+		   MUTABLE_STATIC_BSS
+	   }
+   }
+
+   fn allocates_huge_stack_array(trap: bool) -> Vec<u8> {
+	   // Allocate a stack frame that is approx. 75% of the stack (assuming it is 1MB).
+	   // This will just decrease (stacks in wasm32-u-u grow downwards) the stack
+	   // pointer. This won't trap on the current compilers.
+	   let mut data = [0u8; 1024 * 768];
+
+	   // Then make sure we actually write something to it.
+	   //
+	   // If:
+	   // 1. the stack area is placed at the beginning of the linear memory space, and
+	   // 2. the stack pointer points to out-of-bounds area, and
+	   // 3. a write is performed around the current stack pointer.
+	   //
+	   // then a trap should happen.
+	   //
+	   for (i, v) in data.iter_mut().enumerate() {
+		   *v = i as u8; // deliberate truncation
+	   }
+
+	   if trap {
+		   // There is a small chance of this to be pulled up in theory. In practice
+		   // the probability of that is rather low.
+		   panic!()
+	   }
+
+	   data.to_vec()
+   }
+
+   // Check that the heap at `heap_base + offset` don't contains the test message.
+   // After the check succeeds the test message is written into the heap.
+   //
+   // It is expected that the given pointer is not allocated.
+   fn check_and_set_in_heap(heap_base: u32, offset: u32) {
+	   let test_message = b"Hello invalid heap memory";
+	   let ptr = unsafe { (heap_base + offset) as *mut u8 };
+
+	   let message_slice = unsafe { sp_std::slice::from_raw_parts_mut(ptr, test_message.len()) };
+
+	   assert_ne!(test_message, message_slice);
+	   message_slice.copy_from_slice(test_message);
+   }
+
+   fn test_spawn() {
+	   let data = vec![1u8, 2u8];
+	   let data_new = sp_tasks::spawn(tasks::incrementer, data).join();
+
+	   assert_eq!(data_new, vec![2u8, 3u8]);
+   }
+
+   fn test_nested_spawn() {
+	   let data = vec![7u8, 13u8];
+	   let data_new = sp_tasks::spawn(tasks::parallel_incrementer, data).join();
+
+	   assert_eq!(data_new, vec![10u8, 16u8]);
+   }
+
+   fn test_panic_in_spawned() {
+	   sp_tasks::spawn(tasks::panicker, vec![]).join();
+   }
+}
 
- #[cfg(not(feature = "std"))]
- mod tasks {
+#[cfg(not(feature = "std"))]
+mod tasks {
 	use sp_std::prelude::*;
 
 	pub fn incrementer(data: Vec<u8>) -> Vec<u8> {
-	   data.into_iter().map(|v| v + 1).collect()
+		data.into_iter().map(|v| v + 1).collect()
 	}
 
 	pub fn panicker(_: Vec<u8>) -> Vec<u8> {
@@ -396,11 +402,11 @@ sp_core::wasm_export_functions! {
 	}
 
 	pub fn parallel_incrementer(data: Vec<u8>) -> Vec<u8> {
-	   let first = data.into_iter().map(|v| v + 2).collect::<Vec<_>>();
-	   let second = sp_tasks::spawn(incrementer, first).join();
-	   second
+		let first = data.into_iter().map(|v| v + 2).collect::<Vec<_>>();
+		let second = sp_tasks::spawn(incrementer, first).join();
+		second
 	}
- }
+}
 
 #[cfg(not(feature = "std"))]
 fn execute_sandboxed(
@@ -416,7 +422,7 @@ fn execute_sandboxed(
 		args: &[Value],
 	) -> Result<sp_sandbox::ReturnValue, sp_sandbox::HostError> {
 		if args.len() != 1 {
-			return Err(sp_sandbox::HostError);
+			return Err(sp_sandbox::HostError)
 		}
 		let condition = args[0].as_i32().ok_or_else(|| sp_sandbox::HostError)?;
 		if condition != 0 {
@@ -430,7 +436,7 @@ fn execute_sandboxed(
 		args: &[Value],
 	) -> Result<sp_sandbox::ReturnValue, sp_sandbox::HostError> {
 		if args.len() != 1 {
-			return Err(sp_sandbox::HostError);
+			return Err(sp_sandbox::HostError)
 		}
 		let inc_by = args[0].as_i32().ok_or_else(|| sp_sandbox::HostError)?;
 		e.counter += inc_by as u32;
@@ -445,7 +451,8 @@ fn execute_sandboxed(
 		env_builder.add_host_func("env", "inc_counter", env_inc_counter);
 		let memory = match sp_sandbox::Memory::new(1, Some(16)) {
 			Ok(m) => m,
-			Err(_) => unreachable!("
+			Err(_) => unreachable!(
+				"
 				Memory::new() can return Err only if parameters are borked; \
 				We passing params here explicitly and they're correct; \
 				Memory::new() can't return a Error qed"
diff --git a/client/executor/src/integration_tests/linux.rs b/client/executor/src/integration_tests/linux.rs
index 057cc1332717..7e0696973dc7 100644
--- a/client/executor/src/integration_tests/linux.rs
+++ b/client/executor/src/integration_tests/linux.rs
@@ -23,8 +23,8 @@
 // borthersome.
 #![cfg(feature = "wasmtime")]
 
-use crate::WasmExecutionMethod;
 use super::mk_test_runtime;
+use crate::WasmExecutionMethod;
 use codec::Encode as _;
 
 mod smaps;
@@ -54,17 +54,11 @@ fn memory_consumption_compiled() {
 	}
 
 	instance
-		.call_export(
-			"test_dirty_plenty_memory",
-			&(heap_base as u32, 1u32).encode(),
-		)
+		.call_export("test_dirty_plenty_memory", &(heap_base as u32, 1u32).encode())
 		.unwrap();
 	let probe_1 = probe_rss(&*instance);
 	instance
-		.call_export(
-			"test_dirty_plenty_memory",
-			&(heap_base as u32, 1024u32).encode(),
-		)
+		.call_export("test_dirty_plenty_memory", &(heap_base as u32, 1024u32).encode())
 		.unwrap();
 	let probe_2 = probe_rss(&*instance);
 
diff --git a/client/executor/src/integration_tests/linux/smaps.rs b/client/executor/src/integration_tests/linux/smaps.rs
index 8088a5a3ea95..b23a188b93a2 100644
--- a/client/executor/src/integration_tests/linux/smaps.rs
+++ b/client/executor/src/integration_tests/linux/smaps.rs
@@ -19,8 +19,7 @@
 //! A tool for extracting information about the memory consumption of the current process from
 //! the procfs.
 
-use std::ops::Range;
-use std::collections::BTreeMap;
+use std::{collections::BTreeMap, ops::Range};
 
 /// An interface to the /proc/self/smaps
 ///
@@ -69,7 +68,8 @@ impl Smaps {
 	}
 
 	fn get_map(&self, addr: usize) -> &BTreeMap<String, usize> {
-		&self.0
+		&self
+			.0
 			.iter()
 			.find(|(range, _)| addr >= range.start && addr < range.end)
 			.unwrap()
diff --git a/client/executor/src/integration_tests/mod.rs b/client/executor/src/integration_tests/mod.rs
index 0762306309df..dabead4799dc 100644
--- a/client/executor/src/integration_tests/mod.rs
+++ b/client/executor/src/integration_tests/mod.rs
@@ -20,20 +20,22 @@
 mod linux;
 mod sandbox;
 
-use std::sync::Arc;
-use codec::{Encode, Decode};
+use codec::{Decode, Encode};
 use hex_literal::hex;
+use sc_executor_common::{runtime_blob::RuntimeBlob, wasm_runtime::WasmModule};
+use sc_runtime_test::wasm_binary_unwrap;
 use sp_core::{
-	blake2_128, blake2_256, ed25519, sr25519, map, Pair,
-	offchain::{OffchainWorkerExt, OffchainDbExt, testing},
+	blake2_128, blake2_256, ed25519, map,
+	offchain::{testing, OffchainDbExt, OffchainWorkerExt},
+	sr25519,
 	traits::Externalities,
+	Pair,
 };
-use sc_runtime_test::wasm_binary_unwrap;
+use sp_runtime::traits::BlakeTwo256;
 use sp_state_machine::TestExternalities as CoreTestExternalities;
-use sp_trie::{TrieConfiguration, trie_types::Layout};
+use sp_trie::{trie_types::Layout, TrieConfiguration};
 use sp_wasm_interface::HostFunctions as _;
-use sp_runtime::traits::BlakeTwo256;
-use sc_executor_common::{wasm_runtime::WasmModule, runtime_blob::RuntimeBlob};
+use std::sync::Arc;
 use tracing_subscriber::layer::SubscriberExt;
 
 use crate::WasmExecutionMethod;
@@ -96,12 +98,7 @@ fn returning_should_work(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
 
-	let output = call_in_wasm(
-		"test_empty_return",
-		&[],
-		wasm_method,
-		&mut ext,
-	).unwrap();
+	let output = call_in_wasm("test_empty_return", &[], wasm_method, &mut ext).unwrap();
 	assert_eq!(output, vec![0u8; 0]);
 }
 
@@ -164,28 +161,13 @@ fn panicking_should_work(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
 
-	let output = call_in_wasm(
-		"test_panic",
-		&[],
-		wasm_method,
-		&mut ext,
-	);
+	let output = call_in_wasm("test_panic", &[], wasm_method, &mut ext);
 	assert!(output.is_err());
 
-	let output = call_in_wasm(
-		"test_conditional_panic",
-		&[0],
-		wasm_method,
-		&mut ext,
-	);
+	let output = call_in_wasm("test_conditional_panic", &[0], wasm_method, &mut ext);
 	assert_eq!(Decode::decode(&mut &output.unwrap()[..]), Ok(Vec::<u8>::new()));
 
-	let output = call_in_wasm(
-		"test_conditional_panic",
-		&vec![2].encode(),
-		wasm_method,
-		&mut ext,
-	);
+	let output = call_in_wasm("test_conditional_panic", &vec![2].encode(), wasm_method, &mut ext);
 	assert!(output.is_err());
 }
 
@@ -197,12 +179,9 @@ fn storage_should_work(wasm_method: WasmExecutionMethod) {
 		let mut ext = ext.ext();
 		ext.set_storage(b"foo".to_vec(), b"bar".to_vec());
 
-		let output = call_in_wasm(
-			"test_data_in",
-			&b"Hello world".to_vec().encode(),
-			wasm_method,
-			&mut ext,
-		).unwrap();
+		let output =
+			call_in_wasm("test_data_in", &b"Hello world".to_vec().encode(), wasm_method, &mut ext)
+				.unwrap();
 
 		assert_eq!(output, b"all ok!".to_vec().encode());
 	}
@@ -230,12 +209,9 @@ fn clear_prefix_should_work(wasm_method: WasmExecutionMethod) {
 		ext.set_storage(b"bbb".to_vec(), b"5".to_vec());
 
 		// This will clear all entries which prefix is "ab".
-		let output = call_in_wasm(
-			"test_clear_prefix",
-			&b"ab".to_vec().encode(),
-			wasm_method,
-			&mut ext,
-		).unwrap();
+		let output =
+			call_in_wasm("test_clear_prefix", &b"ab".to_vec().encode(), wasm_method, &mut ext)
+				.unwrap();
 
 		assert_eq!(output, b"all ok!".to_vec().encode());
 	}
@@ -256,21 +232,12 @@ fn blake2_256_should_work(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
 	assert_eq!(
-		call_in_wasm(
-			"test_blake2_256",
-			&[0],
-			wasm_method,
-			&mut ext,
-		).unwrap(),
+		call_in_wasm("test_blake2_256", &[0], wasm_method, &mut ext,).unwrap(),
 		blake2_256(&b""[..]).to_vec().encode(),
 	);
 	assert_eq!(
-		call_in_wasm(
-			"test_blake2_256",
-			&b"Hello world!".to_vec().encode(),
-			wasm_method,
-			&mut ext,
-		).unwrap(),
+		call_in_wasm("test_blake2_256", &b"Hello world!".to_vec().encode(), wasm_method, &mut ext,)
+			.unwrap(),
 		blake2_256(&b"Hello world!"[..]).to_vec().encode(),
 	);
 }
@@ -280,21 +247,12 @@ fn blake2_128_should_work(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
 	assert_eq!(
-		call_in_wasm(
-			"test_blake2_128",
-			&[0],
-			wasm_method,
-			&mut ext,
-		).unwrap(),
+		call_in_wasm("test_blake2_128", &[0], wasm_method, &mut ext,).unwrap(),
 		blake2_128(&b""[..]).to_vec().encode(),
 	);
 	assert_eq!(
-		call_in_wasm(
-			"test_blake2_128",
-			&b"Hello world!".to_vec().encode(),
-			wasm_method,
-			&mut ext,
-		).unwrap(),
+		call_in_wasm("test_blake2_128", &b"Hello world!".to_vec().encode(), wasm_method, &mut ext,)
+			.unwrap(),
 		blake2_128(&b"Hello world!"[..]).to_vec().encode(),
 	);
 }
@@ -304,25 +262,14 @@ fn sha2_256_should_work(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
 	assert_eq!(
-		call_in_wasm(
-			"test_sha2_256",
-			&[0],
-			wasm_method,
-			&mut ext,
-		)
-		.unwrap(),
+		call_in_wasm("test_sha2_256", &[0], wasm_method, &mut ext,).unwrap(),
 		hex!("e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")
 			.to_vec()
 			.encode(),
 	);
 	assert_eq!(
-		call_in_wasm(
-			"test_sha2_256",
-			&b"Hello world!".to_vec().encode(),
-			wasm_method,
-			&mut ext,
-		)
-		.unwrap(),
+		call_in_wasm("test_sha2_256", &b"Hello world!".to_vec().encode(), wasm_method, &mut ext,)
+			.unwrap(),
 		hex!("c0535e4be2b79ffd93291305436bf889314e4a3faec05ecffcbb7df31ad9e51a")
 			.to_vec()
 			.encode(),
@@ -334,26 +281,17 @@ fn twox_256_should_work(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
 	assert_eq!(
-		call_in_wasm(
-			"test_twox_256",
-			&[0],
-			wasm_method,
-			&mut ext,
-		).unwrap(),
-		hex!(
-				"99e9d85137db46ef4bbea33613baafd56f963c64b1f3685a4eb4abd67ff6203a"
-			).to_vec().encode(),
+		call_in_wasm("test_twox_256", &[0], wasm_method, &mut ext,).unwrap(),
+		hex!("99e9d85137db46ef4bbea33613baafd56f963c64b1f3685a4eb4abd67ff6203a")
+			.to_vec()
+			.encode(),
 	);
 	assert_eq!(
-		call_in_wasm(
-			"test_twox_256",
-			&b"Hello world!".to_vec().encode(),
-			wasm_method,
-			&mut ext,
-		).unwrap(),
-		hex!(
-				"b27dfd7f223f177f2a13647b533599af0c07f68bda23d96d059da2b451a35a74"
-			).to_vec().encode(),
+		call_in_wasm("test_twox_256", &b"Hello world!".to_vec().encode(), wasm_method, &mut ext,)
+			.unwrap(),
+		hex!("b27dfd7f223f177f2a13647b533599af0c07f68bda23d96d059da2b451a35a74")
+			.to_vec()
+			.encode(),
 	);
 }
 
@@ -362,21 +300,12 @@ fn twox_128_should_work(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
 	assert_eq!(
-		call_in_wasm(
-			"test_twox_128",
-			&[0],
-			wasm_method,
-			&mut ext,
-		).unwrap(),
+		call_in_wasm("test_twox_128", &[0], wasm_method, &mut ext,).unwrap(),
 		hex!("99e9d85137db46ef4bbea33613baafd5").to_vec().encode(),
 	);
 	assert_eq!(
-		call_in_wasm(
-			"test_twox_128",
-			&b"Hello world!".to_vec().encode(),
-			wasm_method,
-			&mut ext,
-		).unwrap(),
+		call_in_wasm("test_twox_128", &b"Hello world!".to_vec().encode(), wasm_method, &mut ext,)
+			.unwrap(),
 		hex!("b27dfd7f223f177f2a13647b533599af").to_vec().encode(),
 	);
 }
@@ -392,12 +321,7 @@ fn ed25519_verify_should_work(wasm_method: WasmExecutionMethod) {
 	calldata.extend_from_slice(sig.as_ref());
 
 	assert_eq!(
-		call_in_wasm(
-			"test_ed25519_verify",
-			&calldata.encode(),
-			wasm_method,
-			&mut ext,
-		).unwrap(),
+		call_in_wasm("test_ed25519_verify", &calldata.encode(), wasm_method, &mut ext,).unwrap(),
 		true.encode(),
 	);
 
@@ -407,12 +331,7 @@ fn ed25519_verify_should_work(wasm_method: WasmExecutionMethod) {
 	calldata.extend_from_slice(other_sig.as_ref());
 
 	assert_eq!(
-		call_in_wasm(
-			"test_ed25519_verify",
-			&calldata.encode(),
-			wasm_method,
-			&mut ext,
-		).unwrap(),
+		call_in_wasm("test_ed25519_verify", &calldata.encode(), wasm_method, &mut ext,).unwrap(),
 		false.encode(),
 	);
 }
@@ -428,12 +347,7 @@ fn sr25519_verify_should_work(wasm_method: WasmExecutionMethod) {
 	calldata.extend_from_slice(sig.as_ref());
 
 	assert_eq!(
-		call_in_wasm(
-			"test_sr25519_verify",
-			&calldata.encode(),
-			wasm_method,
-			&mut ext,
-		).unwrap(),
+		call_in_wasm("test_sr25519_verify", &calldata.encode(), wasm_method, &mut ext,).unwrap(),
 		true.encode(),
 	);
 
@@ -443,12 +357,7 @@ fn sr25519_verify_should_work(wasm_method: WasmExecutionMethod) {
 	calldata.extend_from_slice(other_sig.as_ref());
 
 	assert_eq!(
-		call_in_wasm(
-			"test_sr25519_verify",
-			&calldata.encode(),
-			wasm_method,
-			&mut ext,
-		).unwrap(),
+		call_in_wasm("test_sr25519_verify", &calldata.encode(), wasm_method, &mut ext,).unwrap(),
 		false.encode(),
 	);
 }
@@ -458,12 +367,7 @@ fn ordered_trie_root_should_work(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let trie_input = vec![b"zero".to_vec(), b"one".to_vec(), b"two".to_vec()];
 	assert_eq!(
-		call_in_wasm(
-			"test_ordered_trie_root",
-			&[0],
-			wasm_method,
-			&mut ext.ext(),
-		).unwrap(),
+		call_in_wasm("test_ordered_trie_root", &[0], wasm_method, &mut ext.ext(),).unwrap(),
 		Layout::<BlakeTwo256>::ordered_trie_root(trie_input.iter()).as_bytes().encode(),
 	);
 }
@@ -473,17 +377,14 @@ fn offchain_index(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let (offchain, _state) = testing::TestOffchainExt::new();
 	ext.register_extension(OffchainWorkerExt::new(offchain));
-	call_in_wasm(
-		"test_offchain_index_set",
-		&[0],
-		wasm_method,
-		&mut ext.ext(),
-	).unwrap();
+	call_in_wasm("test_offchain_index_set", &[0], wasm_method, &mut ext.ext()).unwrap();
 
 	use sp_core::offchain::OffchainOverlayedChange;
-	let data = ext.overlayed_changes().clone().offchain_drain_committed().find(|(k, _v)| {
-		k == &(sp_core::offchain::STORAGE_PREFIX.to_vec(), b"k".to_vec())
-	});
+	let data = ext
+		.overlayed_changes()
+		.clone()
+		.offchain_drain_committed()
+		.find(|(k, _v)| k == &(sp_core::offchain::STORAGE_PREFIX.to_vec(), b"k".to_vec()));
 	assert_eq!(data.map(|data| data.1), Some(OffchainOverlayedChange::SetValue(b"v".to_vec())));
 }
 
@@ -494,12 +395,7 @@ fn offchain_local_storage_should_work(wasm_method: WasmExecutionMethod) {
 	ext.register_extension(OffchainDbExt::new(offchain.clone()));
 	ext.register_extension(OffchainWorkerExt::new(offchain));
 	assert_eq!(
-		call_in_wasm(
-			"test_offchain_local_storage",
-			&[0],
-			wasm_method,
-			&mut ext.ext(),
-		).unwrap(),
+		call_in_wasm("test_offchain_local_storage", &[0], wasm_method, &mut ext.ext(),).unwrap(),
 		true.encode(),
 	);
 	assert_eq!(state.read().persistent_storage.get(b"test"), Some(vec![]));
@@ -511,24 +407,18 @@ fn offchain_http_should_work(wasm_method: WasmExecutionMethod) {
 	let (offchain, state) = testing::TestOffchainExt::new();
 	ext.register_extension(OffchainWorkerExt::new(offchain));
 	state.write().expect_request(testing::PendingRequest {
-			method: "POST".into(),
-			uri: "http://localhost:12345".into(),
-			body: vec![1, 2, 3, 4],
-			headers: vec![("X-Auth".to_owned(), "test".to_owned())],
-			sent: true,
-			response: Some(vec![1, 2, 3]),
-			response_headers: vec![("X-Auth".to_owned(), "hello".to_owned())],
-			..Default::default()
-		},
-	);
+		method: "POST".into(),
+		uri: "http://localhost:12345".into(),
+		body: vec![1, 2, 3, 4],
+		headers: vec![("X-Auth".to_owned(), "test".to_owned())],
+		sent: true,
+		response: Some(vec![1, 2, 3]),
+		response_headers: vec![("X-Auth".to_owned(), "hello".to_owned())],
+		..Default::default()
+	});
 
 	assert_eq!(
-		call_in_wasm(
-			"test_offchain_http",
-			&[0],
-			wasm_method,
-			&mut ext.ext(),
-		).unwrap(),
+		call_in_wasm("test_offchain_http", &[0], wasm_method, &mut ext.ext(),).unwrap(),
 		true.encode(),
 	);
 }
@@ -539,7 +429,7 @@ fn should_trap_when_heap_exhausted(wasm_method: WasmExecutionMethod) {
 
 	let executor = crate::WasmExecutor::new(
 		wasm_method,
-		Some(17),  // `17` is the initial number of pages compiled into the binary.
+		Some(17), // `17` is the initial number of pages compiled into the binary.
 		HostFunctions::host_functions(),
 		8,
 		None,
@@ -593,17 +483,13 @@ fn returns_mutable_static_bss(wasm_method: WasmExecutionMethod) {
 	let runtime = mk_test_runtime(wasm_method, 1024);
 
 	let instance = runtime.new_instance().unwrap();
-	let res = instance
-		.call_export("returns_mutable_static_bss", &[0])
-		.unwrap();
+	let res = instance.call_export("returns_mutable_static_bss", &[0]).unwrap();
 	assert_eq!(1, u64::decode(&mut &res[..]).unwrap());
 
 	// We expect that every invocation will need to return the initial
 	// value plus one. If the value increases more than that then it is
 	// a sign that the wasm runtime preserves the memory content.
-	let res = instance
-		.call_export("returns_mutable_static_bss", &[0])
-		.unwrap();
+	let res = instance.call_export("returns_mutable_static_bss", &[0]).unwrap();
 	assert_eq!(1, u64::decode(&mut &res[..]).unwrap());
 }
 
@@ -638,7 +524,8 @@ fn heap_is_reset_between_calls(wasm_method: WasmExecutionMethod) {
 	let runtime = mk_test_runtime(wasm_method, 1024);
 	let instance = runtime.new_instance().unwrap();
 
-	let heap_base = instance.get_global_const("__heap_base")
+	let heap_base = instance
+		.get_global_const("__heap_base")
 		.expect("`__heap_base` is valid")
 		.expect("`__heap_base` exists")
 		.as_i32()
@@ -689,8 +576,8 @@ fn parallel_execution(wasm_method: WasmExecutionMethod) {
 
 test_wasm_execution!(wasm_tracing_should_work);
 fn wasm_tracing_should_work(wasm_method: WasmExecutionMethod) {
-	use std::sync::Mutex;
 	use sc_tracing::{SpanDatum, TraceEvent};
+	use std::sync::Mutex;
 
 	struct TestTraceHandler(Arc<Mutex<Vec<SpanDatum>>>);
 
@@ -706,36 +593,23 @@ fn wasm_tracing_should_work(wasm_method: WasmExecutionMethod) {
 	let handler = TestTraceHandler(traces.clone());
 
 	// Create subscriber with wasm_tracing disabled
-	let test_subscriber = tracing_subscriber::fmt().finish().with(
-		sc_tracing::ProfilingLayer::new_with_handler(
-			Box::new(handler), "default"
-		)
-	);
+	let test_subscriber = tracing_subscriber::fmt()
+		.finish()
+		.with(sc_tracing::ProfilingLayer::new_with_handler(Box::new(handler), "default"));
 
 	let _guard = tracing::subscriber::set_default(test_subscriber);
 
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
 
-	let span_id = call_in_wasm(
-		"test_enter_span",
-		Default::default(),
-		wasm_method,
-		&mut ext,
-	).unwrap();
+	let span_id =
+		call_in_wasm("test_enter_span", Default::default(), wasm_method, &mut ext).unwrap();
 
 	let span_id = u64::decode(&mut &span_id[..]).unwrap();
 
-	assert!(
-		span_id > 0
-	);
+	assert!(span_id > 0);
 
-	call_in_wasm(
-		"test_exit_span",
-		&span_id.encode(),
-		wasm_method,
-		&mut ext,
-	).unwrap();
+	call_in_wasm("test_exit_span", &span_id.encode(), wasm_method, &mut ext).unwrap();
 
 	// Check there is only the single trace
 	let len = traces.lock().unwrap().len();
@@ -747,12 +621,7 @@ fn wasm_tracing_should_work(wasm_method: WasmExecutionMethod) {
 	assert_eq!(span_datum.name, "");
 	assert_eq!(values.bool_values.get("wasm").unwrap(), &true);
 
-	call_in_wasm(
-		"test_nested_spans",
-		Default::default(),
-		wasm_method,
-		&mut ext,
-	).unwrap();
+	call_in_wasm("test_nested_spans", Default::default(), wasm_method, &mut ext).unwrap();
 	let len = traces.lock().unwrap().len();
 	assert_eq!(len, 2);
 }
@@ -762,12 +631,7 @@ fn spawning_runtime_instance_should_work(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
 
-	call_in_wasm(
-		"test_spawn",
-		&[],
-		wasm_method,
-		&mut ext,
-	).unwrap();
+	call_in_wasm("test_spawn", &[], wasm_method, &mut ext).unwrap();
 }
 
 test_wasm_execution!(spawning_runtime_instance_nested_should_work);
@@ -775,12 +639,7 @@ fn spawning_runtime_instance_nested_should_work(wasm_method: WasmExecutionMethod
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
 
-	call_in_wasm(
-		"test_nested_spawn",
-		&[],
-		wasm_method,
-		&mut ext,
-	).unwrap();
+	call_in_wasm("test_nested_spawn", &[], wasm_method, &mut ext).unwrap();
 }
 
 test_wasm_execution!(panic_in_spawned_instance_panics_on_joining_its_result);
@@ -788,12 +647,8 @@ fn panic_in_spawned_instance_panics_on_joining_its_result(wasm_method: WasmExecu
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
 
-	let error_result = call_in_wasm(
-		"test_panic_in_spawned",
-		&[],
-		wasm_method,
-		&mut ext,
-	).unwrap_err();
+	let error_result =
+		call_in_wasm("test_panic_in_spawned", &[], wasm_method, &mut ext).unwrap_err();
 
 	assert!(format!("{}", error_result).contains("Spawned task"));
 }
diff --git a/client/executor/src/integration_tests/sandbox.rs b/client/executor/src/integration_tests/sandbox.rs
index 7ce9c94a2db8..ee3b295ae8a8 100644
--- a/client/executor/src/integration_tests/sandbox.rs
+++ b/client/executor/src/integration_tests/sandbox.rs
@@ -16,9 +16,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use super::{TestExternalities, call_in_wasm};
-use crate::WasmExecutionMethod;
-use crate::test_wasm_execution;
+use super::{call_in_wasm, TestExternalities};
+use crate::{test_wasm_execution, WasmExecutionMethod};
 
 use codec::Encode;
 
@@ -27,7 +26,8 @@ fn sandbox_should_work(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
 
-	let code = wat::parse_str(r#"
+	let code = wat::parse_str(
+		r#"
 		(module
 			(import "env" "assert" (func $assert (param i32)))
 			(import "env" "inc_counter" (func $inc_counter (param i32) (result i32)))
@@ -46,17 +46,12 @@ fn sandbox_should_work(wasm_method: WasmExecutionMethod) {
 				call $assert
 			)
 		)
-		"#).unwrap().encode();
+		"#,
+	)
+	.unwrap()
+	.encode();
 
-	assert_eq!(
-		call_in_wasm(
-			"test_sandbox",
-			&code,
-			wasm_method,
-			&mut ext,
-		).unwrap(),
-		true.encode(),
-	);
+	assert_eq!(call_in_wasm("test_sandbox", &code, wasm_method, &mut ext,).unwrap(), true.encode(),);
 }
 
 test_wasm_execution!(sandbox_trap);
@@ -64,7 +59,8 @@ fn sandbox_trap(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
 
-	let code = wat::parse_str(r#"
+	let code = wat::parse_str(
+		r#"
 		(module
 			(import "env" "assert" (func $assert (param i32)))
 			(func (export "call")
@@ -72,17 +68,11 @@ fn sandbox_trap(wasm_method: WasmExecutionMethod) {
 				call $assert
 			)
 		)
-		"#).unwrap();
+		"#,
+	)
+	.unwrap();
 
-	assert_eq!(
-		call_in_wasm(
-			"test_sandbox",
-			&code,
-			wasm_method,
-			&mut ext,
-		).unwrap(),
-		vec![0],
-	);
+	assert_eq!(call_in_wasm("test_sandbox", &code, wasm_method, &mut ext,).unwrap(), vec![0],);
 }
 
 test_wasm_execution!(start_called);
@@ -90,7 +80,8 @@ fn start_called(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
 
-	let code = wat::parse_str(r#"
+	let code = wat::parse_str(
+		r#"
 		(module
 			(import "env" "assert" (func $assert (param i32)))
 			(import "env" "inc_counter" (func $inc_counter (param i32) (result i32)))
@@ -115,17 +106,12 @@ fn start_called(wasm_method: WasmExecutionMethod) {
 				call $assert
 			)
 		)
-		"#).unwrap().encode();
+		"#,
+	)
+	.unwrap()
+	.encode();
 
-	assert_eq!(
-		call_in_wasm(
-			"test_sandbox",
-			&code,
-			wasm_method,
-			&mut ext,
-		).unwrap(),
-		true.encode(),
-	);
+	assert_eq!(call_in_wasm("test_sandbox", &code, wasm_method, &mut ext,).unwrap(), true.encode(),);
 }
 
 test_wasm_execution!(invoke_args);
@@ -133,7 +119,8 @@ fn invoke_args(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
 
-	let code = wat::parse_str(r#"
+	let code = wat::parse_str(
+		r#"
 		(module
 			(import "env" "assert" (func $assert (param i32)))
 
@@ -154,15 +141,13 @@ fn invoke_args(wasm_method: WasmExecutionMethod) {
 				)
 			)
 		)
-		"#).unwrap().encode();
+		"#,
+	)
+	.unwrap()
+	.encode();
 
 	assert_eq!(
-		call_in_wasm(
-			"test_sandbox_args",
-			&code,
-			wasm_method,
-			&mut ext,
-		).unwrap(),
+		call_in_wasm("test_sandbox_args", &code, wasm_method, &mut ext,).unwrap(),
 		true.encode(),
 	);
 }
@@ -172,7 +157,8 @@ fn return_val(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
 
-	let code = wat::parse_str(r#"
+	let code = wat::parse_str(
+		r#"
 		(module
 			(func (export "call") (param $x i32) (result i32)
 				(i32.add
@@ -181,15 +167,13 @@ fn return_val(wasm_method: WasmExecutionMethod) {
 				)
 			)
 		)
-		"#).unwrap().encode();
+		"#,
+	)
+	.unwrap()
+	.encode();
 
 	assert_eq!(
-		call_in_wasm(
-			"test_sandbox_return_val",
-			&code,
-			wasm_method,
-			&mut ext,
-		).unwrap(),
+		call_in_wasm("test_sandbox_return_val", &code, wasm_method, &mut ext,).unwrap(),
 		true.encode(),
 	);
 }
@@ -199,22 +183,21 @@ fn unlinkable_module(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
 
-	let code = wat::parse_str(r#"
+	let code = wat::parse_str(
+		r#"
 		(module
 			(import "env" "non-existent" (func))
 
 			(func (export "call")
 			)
 		)
-		"#).unwrap().encode();
+		"#,
+	)
+	.unwrap()
+	.encode();
 
 	assert_eq!(
-		call_in_wasm(
-			"test_sandbox_instantiate",
-			&code,
-			wasm_method,
-			&mut ext,
-		).unwrap(),
+		call_in_wasm("test_sandbox_instantiate", &code, wasm_method, &mut ext,).unwrap(),
 		1u8.encode(),
 	);
 }
@@ -228,12 +211,7 @@ fn corrupted_module(wasm_method: WasmExecutionMethod) {
 	let code = vec![0u8, 0, 0, 0, 1, 0, 0, 0].encode();
 
 	assert_eq!(
-		call_in_wasm(
-			"test_sandbox_instantiate",
-			&code,
-			wasm_method,
-			&mut ext,
-		).unwrap(),
+		call_in_wasm("test_sandbox_instantiate", &code, wasm_method, &mut ext,).unwrap(),
 		1u8.encode(),
 	);
 }
@@ -243,7 +221,8 @@ fn start_fn_ok(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
 
-	let code = wat::parse_str(r#"
+	let code = wat::parse_str(
+		r#"
 		(module
 			(func (export "call")
 			)
@@ -253,15 +232,13 @@ fn start_fn_ok(wasm_method: WasmExecutionMethod) {
 
 			(start $start)
 		)
-		"#).unwrap().encode();
+		"#,
+	)
+	.unwrap()
+	.encode();
 
 	assert_eq!(
-		call_in_wasm(
-			"test_sandbox_instantiate",
-			&code,
-			wasm_method,
-			&mut ext,
-		).unwrap(),
+		call_in_wasm("test_sandbox_instantiate", &code, wasm_method, &mut ext,).unwrap(),
 		0u8.encode(),
 	);
 }
@@ -271,7 +248,8 @@ fn start_fn_traps(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
 
-	let code = wat::parse_str(r#"
+	let code = wat::parse_str(
+		r#"
 		(module
 			(func (export "call")
 			)
@@ -282,15 +260,13 @@ fn start_fn_traps(wasm_method: WasmExecutionMethod) {
 
 			(start $start)
 		)
-		"#).unwrap().encode();
+		"#,
+	)
+	.unwrap()
+	.encode();
 
 	assert_eq!(
-		call_in_wasm(
-			"test_sandbox_instantiate",
-			&code,
-			wasm_method,
-			&mut ext,
-		).unwrap(),
+		call_in_wasm("test_sandbox_instantiate", &code, wasm_method, &mut ext,).unwrap(),
 		2u8.encode(),
 	);
 }
@@ -300,19 +276,18 @@ fn get_global_val_works(wasm_method: WasmExecutionMethod) {
 	let mut ext = TestExternalities::default();
 	let mut ext = ext.ext();
 
-	let code = wat::parse_str(r#"
+	let code = wat::parse_str(
+		r#"
 		(module
 			(global (export "test_global") i64 (i64.const 500))
 		)
-		"#).unwrap().encode();
+		"#,
+	)
+	.unwrap()
+	.encode();
 
 	assert_eq!(
-		call_in_wasm(
-			"test_sandbox_get_global_val",
-			&code,
-			wasm_method,
-			&mut ext,
-		).unwrap(),
+		call_in_wasm("test_sandbox_get_global_val", &code, wasm_method, &mut ext,).unwrap(),
 		500i64.encode(),
 	);
 }
diff --git a/client/executor/src/lib.rs b/client/executor/src/lib.rs
index c0cbf9c94daf..f4b972a86f27 100644
--- a/client/executor/src/lib.rs
+++ b/client/executor/src/lib.rs
@@ -29,26 +29,25 @@
 //! wasm engine used, instance cache.
 
 #![warn(missing_docs)]
-#![recursion_limit="128"]
+#![recursion_limit = "128"]
 
 #[macro_use]
 mod native_executor;
-mod wasm_runtime;
 #[cfg(test)]
 mod integration_tests;
+mod wasm_runtime;
 
-pub use wasmi;
+pub use codec::Codec;
 pub use native_executor::{
-	with_externalities_safe, NativeExecutor, WasmExecutor, NativeExecutionDispatch,
+	with_externalities_safe, NativeExecutionDispatch, NativeExecutor, WasmExecutor,
 };
-pub use sp_version::{RuntimeVersion, NativeVersion};
-pub use codec::Codec;
 #[doc(hidden)]
-pub use sp_core::traits::{Externalities};
+pub use sp_core::traits::Externalities;
+pub use sp_version::{NativeVersion, RuntimeVersion};
 #[doc(hidden)]
 pub use sp_wasm_interface;
-pub use wasm_runtime::WasmExecutionMethod;
-pub use wasm_runtime::read_embedded_version;
+pub use wasm_runtime::{read_embedded_version, WasmExecutionMethod};
+pub use wasmi;
 
 pub use sc_executor_common::{error, sandbox};
 
@@ -68,10 +67,10 @@ pub trait RuntimeInfo {
 #[cfg(test)]
 mod tests {
 	use super::*;
+	use sc_executor_common::runtime_blob::RuntimeBlob;
 	use sc_runtime_test::wasm_binary_unwrap;
 	use sp_io::TestExternalities;
 	use sp_wasm_interface::HostFunctions;
-	use sc_executor_common::runtime_blob::RuntimeBlob;
 
 	#[test]
 	fn call_in_interpreted_wasm_works() {
diff --git a/client/executor/src/native_executor.rs b/client/executor/src/native_executor.rs
index 6fc34b6f1a32..e54803d2d074 100644
--- a/client/executor/src/native_executor.rs
+++ b/client/executor/src/native_executor.rs
@@ -17,32 +17,36 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{
-	RuntimeInfo, error::{Error, Result},
+	error::{Error, Result},
 	wasm_runtime::{RuntimeCache, WasmExecutionMethod},
+	RuntimeInfo,
 };
 
 use std::{
 	collections::HashMap,
-	panic::{UnwindSafe, AssertUnwindSafe},
-	result,
-	sync::{Arc, atomic::{AtomicU64, Ordering}, mpsc},
+	panic::{AssertUnwindSafe, UnwindSafe},
 	path::PathBuf,
+	result,
+	sync::{
+		atomic::{AtomicU64, Ordering},
+		mpsc, Arc,
+	},
 };
 
-use sp_version::{NativeVersion, RuntimeVersion};
 use codec::{Decode, Encode};
-use sp_core::{
-	NativeOrEncoded,
-	traits::{CodeExecutor, Externalities, RuntimeCode, RuntimeSpawnExt, RuntimeSpawn},
-};
 use log::trace;
-use sp_wasm_interface::{HostFunctions, Function};
 use sc_executor_common::{
-	wasm_runtime::{WasmInstance, WasmModule, InvokeMethod},
 	runtime_blob::RuntimeBlob,
+	wasm_runtime::{InvokeMethod, WasmInstance, WasmModule},
+};
+use sp_core::{
+	traits::{CodeExecutor, Externalities, RuntimeCode, RuntimeSpawn, RuntimeSpawnExt},
+	NativeOrEncoded,
 };
 use sp_externalities::ExternalitiesExt as _;
 use sp_tasks::new_async_externalities;
+use sp_version::{NativeVersion, RuntimeVersion};
+use sp_wasm_interface::{Function, HostFunctions};
 
 /// Default num of pages for the heap
 const DEFAULT_HEAP_PAGES: u64 = 2048;
@@ -51,25 +55,23 @@ const DEFAULT_HEAP_PAGES: u64 = 2048;
 ///
 /// If the inner closure panics, it will be caught and return an error.
 pub fn with_externalities_safe<F, U>(ext: &mut dyn Externalities, f: F) -> Result<U>
-	where F: UnwindSafe + FnOnce() -> U
+where
+	F: UnwindSafe + FnOnce() -> U,
 {
-	sp_externalities::set_and_run_with_externalities(
-		ext,
-		move || {
-			// Substrate uses custom panic hook that terminates process on panic. Disable
-			// termination for the native call.
-			let _guard = sp_panic_handler::AbortGuard::force_unwind();
-			std::panic::catch_unwind(f).map_err(|e| {
-				if let Some(err) = e.downcast_ref::<String>() {
-					Error::RuntimePanicked(err.clone())
-				} else if let Some(err) = e.downcast_ref::<&'static str>() {
-					Error::RuntimePanicked(err.to_string())
-				} else {
-					Error::RuntimePanicked("Unknown panic".into())
-				}
-			})
-		},
-	)
+	sp_externalities::set_and_run_with_externalities(ext, move || {
+		// Substrate uses custom panic hook that terminates process on panic. Disable
+		// termination for the native call.
+		let _guard = sp_panic_handler::AbortGuard::force_unwind();
+		std::panic::catch_unwind(f).map_err(|e| {
+			if let Some(err) = e.downcast_ref::<String>() {
+				Error::RuntimePanicked(err.clone())
+			} else if let Some(err) = e.downcast_ref::<&'static str>() {
+				Error::RuntimePanicked(err.to_string())
+			} else {
+				Error::RuntimePanicked("Unknown panic".into())
+			}
+		})
+	})
 }
 
 /// Delegate for dispatching a CodeExecutor call.
@@ -163,7 +165,8 @@ impl WasmExecutor {
 		allow_missing_host_functions: bool,
 		f: F,
 	) -> Result<R>
-		where F: FnOnce(
+	where
+		F: FnOnce(
 			AssertUnwindSafe<&Arc<dyn WasmModule>>,
 			AssertUnwindSafe<&dyn WasmInstance>,
 			Option<&RuntimeVersion>,
@@ -182,7 +185,7 @@ impl WasmExecutor {
 				let instance = AssertUnwindSafe(instance);
 				let ext = AssertUnwindSafe(ext);
 				f(module, instance, version, ext)
-			}
+			},
 		)? {
 			Ok(r) => r,
 			Err(e) => Err(e),
@@ -245,7 +248,7 @@ impl sp_core::traits::ReadRuntimeVersion for WasmExecutor {
 			.map_err(|e| format!("Failed to read the static section: {:?}", e))
 			.map(|v| v.map(|v| v.encode()))?
 		{
-			return Ok(version);
+			return Ok(version)
 		}
 
 		// If the blob didn't have embedded runtime version section, we fallback to the legacy
@@ -296,13 +299,13 @@ impl<D: NativeExecutionDispatch> NativeExecutor<D> {
 			.into_iter()
 			// filter out any host function overrides provided.
 			.filter(|host_fn| {
-				extended.iter()
+				extended
+					.iter()
 					.find(|ext_host_fn| host_fn.name() == ext_host_fn.name())
 					.is_none()
 			})
 			.collect::<Vec<_>>();
 
-
 		// Add the custom host functions provided by the user.
 		host_functions.extend(extended);
 		let wasm_executor = WasmExecutor::new(
@@ -331,13 +334,10 @@ impl<D: NativeExecutionDispatch> RuntimeInfo for NativeExecutor<D> {
 		ext: &mut dyn Externalities,
 		runtime_code: &RuntimeCode,
 	) -> Result<RuntimeVersion> {
-		self.wasm.with_instance(
-			runtime_code,
-			ext,
-			false,
-			|_module, _instance, version, _ext|
-				Ok(version.cloned().ok_or_else(|| Error::ApiError("Unknown version".into()))),
-		)
+		self.wasm
+			.with_instance(runtime_code, ext, false, |_module, _instance, version, _ext| {
+				Ok(version.cloned().ok_or_else(|| Error::ApiError("Unknown version".into())))
+			})
 	}
 }
 
@@ -358,70 +358,67 @@ impl RuntimeSpawn for RuntimeInstanceSpawn {
 
 		let module = self.module.clone();
 		let scheduler = self.scheduler.clone();
-		self.scheduler.spawn("executor-extra-runtime-instance", Box::pin(async move {
-			let module = AssertUnwindSafe(module);
-
-			let async_ext = match new_async_externalities(scheduler.clone()) {
-				Ok(val) => val,
-				Err(e) => {
-					log::error!(
-						target: "executor",
-						"Failed to setup externalities for async context: {}",
-						e,
-					);
-
-					// This will drop sender and receiver end will panic
-					return;
-				}
-			};
-
-			let mut async_ext = match async_ext.with_runtime_spawn(
-				Box::new(RuntimeInstanceSpawn::new(module.clone(), scheduler))
-			) {
-				Ok(val) => val,
-				Err(e) => {
-					log::error!(
-						target: "executor",
-						"Failed to setup runtime extension for async externalities: {}",
-						e,
-					);
-
-					// This will drop sender and receiver end will panic
-					return;
-				}
-			};
+		self.scheduler.spawn(
+			"executor-extra-runtime-instance",
+			Box::pin(async move {
+				let module = AssertUnwindSafe(module);
+
+				let async_ext = match new_async_externalities(scheduler.clone()) {
+					Ok(val) => val,
+					Err(e) => {
+						log::error!(
+							target: "executor",
+							"Failed to setup externalities for async context: {}",
+							e,
+						);
+
+						// This will drop sender and receiver end will panic
+						return
+					},
+				};
+
+				let mut async_ext = match async_ext.with_runtime_spawn(Box::new(
+					RuntimeInstanceSpawn::new(module.clone(), scheduler),
+				)) {
+					Ok(val) => val,
+					Err(e) => {
+						log::error!(
+							target: "executor",
+							"Failed to setup runtime extension for async externalities: {}",
+							e,
+						);
 
-			let result = with_externalities_safe(
-				&mut async_ext,
-				move || {
+						// This will drop sender and receiver end will panic
+						return
+					},
+				};
 
+				let result = with_externalities_safe(&mut async_ext, move || {
 					// FIXME: Should be refactored to shared "instance factory".
 					// Instantiating wasm here every time is suboptimal at the moment, shared
 					// pool of instances should be used.
 					//
 					// https://github.com/paritytech/substrate/issues/7354
-					let instance = module.new_instance()
-						.expect("Failed to create new instance from module");
+					let instance =
+						module.new_instance().expect("Failed to create new instance from module");
 
-					instance.call(
-						InvokeMethod::TableWithWrapper { dispatcher_ref, func },
-						&data[..],
-					).expect("Failed to invoke instance.")
-				}
-			);
-
-			match result {
-				Ok(output) => {
-					let _ = sender.send(output);
-				},
-				Err(error) => {
-					// If execution is panicked, the `join` in the original runtime code will panic as well,
-					// since the sender is dropped without sending anything.
-					log::error!("Call error in spawned task: {:?}", error);
-				},
-			}
-		}));
+					instance
+						.call(InvokeMethod::TableWithWrapper { dispatcher_ref, func }, &data[..])
+						.expect("Failed to invoke instance.")
+				});
 
+				match result {
+					Ok(output) => {
+						let _ = sender.send(output);
+					},
+					Err(error) => {
+						// If execution is panicked, the `join` in the original runtime code will panic as well,
+						// since the sender is dropped without sending anything.
+						log::error!("Call error in spawned task: {:?}", error);
+					},
+				}
+			}),
+		);
 
 		new_handle
 	}
@@ -438,12 +435,7 @@ impl RuntimeInstanceSpawn {
 		module: Arc<dyn WasmModule>,
 		scheduler: Box<dyn sp_core::traits::SpawnNamed>,
 	) -> Self {
-		Self {
-			module,
-			scheduler,
-			counter: 0.into(),
-			tasks: HashMap::new().into(),
-		}
+		Self { module, scheduler, counter: 0.into(), tasks: HashMap::new().into() }
 	}
 
 	fn with_externalities_and_module(
@@ -495,17 +487,13 @@ impl<D: NativeExecutionDispatch + 'static> CodeExecutor for NativeExecutor<D> {
 			ext,
 			false,
 			|module, instance, onchain_version, mut ext| {
-				let onchain_version = onchain_version.ok_or_else(
-					|| Error::ApiError("Unknown version".into())
-				)?;
+				let onchain_version =
+					onchain_version.ok_or_else(|| Error::ApiError("Unknown version".into()))?;
 
-				let can_call_with = onchain_version.can_call_with(&self.native_version.runtime_version);
+				let can_call_with =
+					onchain_version.can_call_with(&self.native_version.runtime_version);
 
-				match (
-					use_native,
-					can_call_with,
-					native_call,
-				) {
+				match (use_native, can_call_with, native_call) {
 					(_, false, _) | (false, _, _) => {
 						if !can_call_with {
 							trace!(
@@ -516,13 +504,10 @@ impl<D: NativeExecutionDispatch + 'static> CodeExecutor for NativeExecutor<D> {
 							);
 						}
 
-						with_externalities_safe(
-							&mut **ext,
-							move || {
-								preregister_builtin_ext(module.clone());
-								instance.call_export(method, data).map(NativeOrEncoded::Encoded)
-							}
-						)
+						with_externalities_safe(&mut **ext, move || {
+							preregister_builtin_ext(module.clone());
+							instance.call_export(method, data).map(NativeOrEncoded::Encoded)
+						})
 					},
 					(true, true, Some(call)) => {
 						trace!(
@@ -535,13 +520,10 @@ impl<D: NativeExecutionDispatch + 'static> CodeExecutor for NativeExecutor<D> {
 
 						used_native = true;
 						let res = with_externalities_safe(&mut **ext, move || (call)())
-							.and_then(|r| r
-								.map(NativeOrEncoded::Native)
-								.map_err(Error::ApiError)
-							);
+							.and_then(|r| r.map(NativeOrEncoded::Native).map_err(Error::ApiError));
 
 						Ok(res)
-					}
+					},
 					_ => {
 						trace!(
 							target: "executor",
@@ -552,9 +534,9 @@ impl<D: NativeExecutionDispatch + 'static> CodeExecutor for NativeExecutor<D> {
 
 						used_native = true;
 						Ok(D::dispatch(&mut **ext, method, data).map(NativeOrEncoded::Encoded))
-					}
+					},
 				}
-			}
+			},
 		);
 		(result, used_native)
 	}
@@ -617,7 +599,6 @@ impl<D: NativeExecutionDispatch> sp_core::traits::ReadRuntimeVersion for NativeE
 ///
 /// When you have multiple interfaces, you can give the host functions as a tuple e.g.:
 /// `(my_interface::HostFunctions, my_interface2::HostFunctions)`
-///
 #[macro_export]
 macro_rules! native_executor_instance {
 	( $pub:vis $name:ident, $dispatcher:path, $version:path $(,)?) => {
@@ -675,16 +656,9 @@ mod tests {
 
 	#[test]
 	fn native_executor_registers_custom_interface() {
-		let executor = NativeExecutor::<MyExecutor>::new(
-			WasmExecutionMethod::Interpreted,
-			None,
-			8,
-		);
+		let executor = NativeExecutor::<MyExecutor>::new(WasmExecutionMethod::Interpreted, None, 8);
 		my_interface::HostFunctions::host_functions().iter().for_each(|function| {
-			assert_eq!(
-				executor.wasm.host_functions.iter().filter(|f| f == &function).count(),
-				2,
-			);
+			assert_eq!(executor.wasm.host_functions.iter().filter(|f| f == &function).count(), 2,);
 		});
 
 		my_interface::say_hello_world("hey");
diff --git a/client/executor/src/wasm_runtime.rs b/client/executor/src/wasm_runtime.rs
index 4e6febbf15b6..8674e7239255 100644
--- a/client/executor/src/wasm_runtime.rs
+++ b/client/executor/src/wasm_runtime.rs
@@ -21,17 +21,19 @@
 //! The primary means of accessing the runtimes is through a cache which saves the reusable
 //! components of the runtime that are expensive to initialize.
 
-use std::sync::Arc;
 use crate::error::{Error, WasmError};
-use parking_lot::Mutex;
 use codec::Decode;
-use sp_core::traits::{Externalities, RuntimeCode, FetchRuntimeCode};
-use sp_version::RuntimeVersion;
-use std::panic::AssertUnwindSafe;
-use std::path::{Path, PathBuf};
+use parking_lot::Mutex;
 use sc_executor_common::{
-	wasm_runtime::{WasmModule, WasmInstance},
 	runtime_blob::RuntimeBlob,
+	wasm_runtime::{WasmInstance, WasmModule},
+};
+use sp_core::traits::{Externalities, FetchRuntimeCode, RuntimeCode};
+use sp_version::RuntimeVersion;
+use std::{
+	panic::AssertUnwindSafe,
+	path::{Path, PathBuf},
+	sync::Arc,
 };
 
 use sp_wasm_interface::Function;
@@ -70,27 +72,26 @@ struct VersionedRuntime {
 
 impl VersionedRuntime {
 	/// Run the given closure `f` with an instance of this runtime.
-	fn with_instance<'c, R, F>(
-		&self,
-		ext: &mut dyn Externalities,
-		f: F,
-	) -> Result<R, Error>
-		where F: FnOnce(
+	fn with_instance<'c, R, F>(&self, ext: &mut dyn Externalities, f: F) -> Result<R, Error>
+	where
+		F: FnOnce(
 			&Arc<dyn WasmModule>,
 			&dyn WasmInstance,
 			Option<&RuntimeVersion>,
-			&mut dyn Externalities)
-		-> Result<R, Error>,
+			&mut dyn Externalities,
+		) -> Result<R, Error>,
 	{
 		// Find a free instance
-		let instance = self.instances
+		let instance = self
+			.instances
 			.iter()
 			.enumerate()
 			.find_map(|(index, i)| i.try_lock().map(|i| (index, i)));
 
 		match instance {
 			Some((index, mut locked)) => {
-				let (instance, new_inst) = locked.take()
+				let (instance, new_inst) = locked
+					.take()
 					.map(|r| Ok((r, false)))
 					.unwrap_or_else(|| self.module.new_instance().map(|i| (i, true)))?;
 
@@ -131,7 +132,7 @@ impl VersionedRuntime {
 				let instance = self.module.new_instance()?;
 
 				f(&self.module, &*instance, self.version.as_ref(), ext)
-			}
+			},
 		}
 	}
 }
@@ -168,11 +169,7 @@ impl RuntimeCache {
 	/// `cache_path` allows to specify an optional directory where the executor can store files
 	/// for caching.
 	pub fn new(max_runtime_instances: usize, cache_path: Option<PathBuf>) -> RuntimeCache {
-		RuntimeCache {
-			runtimes: Default::default(),
-			max_runtime_instances,
-			cache_path,
-		}
+		RuntimeCache { runtimes: Default::default(), max_runtime_instances, cache_path }
 	}
 
 	/// Prepares a WASM module instance and executes given function for it.
@@ -213,29 +210,31 @@ impl RuntimeCache {
 		allow_missing_func_imports: bool,
 		f: F,
 	) -> Result<Result<R, Error>, Error>
-		where F: FnOnce(
+	where
+		F: FnOnce(
 			&Arc<dyn WasmModule>,
 			&dyn WasmInstance,
 			Option<&RuntimeVersion>,
-			&mut dyn Externalities)
-		-> Result<R, Error>,
+			&mut dyn Externalities,
+		) -> Result<R, Error>,
 	{
 		let code_hash = &runtime_code.hash;
 		let heap_pages = runtime_code.heap_pages.unwrap_or(default_heap_pages);
 
 		let mut runtimes = self.runtimes.lock(); // this must be released prior to calling f
-		let pos = runtimes.iter().position(|r| r.as_ref().map_or(
-			false,
-			|r| r.wasm_method == wasm_method &&
-				r.code_hash == *code_hash &&
-				r.heap_pages == heap_pages
-		));
+		let pos = runtimes.iter().position(|r| {
+			r.as_ref().map_or(false, |r| {
+				r.wasm_method == wasm_method &&
+					r.code_hash == *code_hash &&
+					r.heap_pages == heap_pages
+			})
+		});
 
 		let runtime = match pos {
 			Some(n) => runtimes[n]
 				.clone()
 				.expect("`position` only returns `Some` for entries that are `Some`"),
-			None =>  {
+			None => {
 				let code = runtime_code.fetch_runtime_code().ok_or(WasmError::CodeNotFound)?;
 
 				#[cfg(not(target_os = "unknown"))]
@@ -262,30 +261,29 @@ impl RuntimeCache {
 							result.version,
 							time.elapsed().as_millis(),
 						);
-					}
+					},
 					Err(ref err) => {
 						log::warn!(target: "wasm-runtime", "Cannot create a runtime: {:?}", err);
-					}
+					},
 				}
 
 				Arc::new(result?)
-			}
+			},
 		};
 
 		// Rearrange runtimes by last recently used.
 		match pos {
 			Some(0) => {},
-			Some(n) => {
-				for i in (1 .. n + 1).rev() {
+			Some(n) =>
+				for i in (1..n + 1).rev() {
 					runtimes.swap(i, i - 1);
-				}
-			}
+				},
 			None => {
-				runtimes[MAX_RUNTIMES-1] = Some(runtime.clone());
-				for i in (1 .. MAX_RUNTIMES).rev() {
+				runtimes[MAX_RUNTIMES - 1] = Some(runtime.clone());
+				for i in (1..MAX_RUNTIMES).rev() {
 					runtimes.swap(i, i - 1);
 				}
-			}
+			},
 		}
 		drop(runtimes);
 
@@ -317,49 +315,48 @@ pub fn create_wasm_runtime_with_code(
 				allow_missing_func_imports,
 			)
 			.map(|runtime| -> Arc<dyn WasmModule> { Arc::new(runtime) })
-		}
+		},
 		#[cfg(feature = "wasmtime")]
-		WasmExecutionMethod::Compiled => {
-			sc_executor_wasmtime::create_runtime(
-				blob,
-				sc_executor_wasmtime::Config {
-					heap_pages: heap_pages as u32,
-					allow_missing_func_imports,
-					cache_path: cache_path.map(ToOwned::to_owned),
-					semantics: sc_executor_wasmtime::Semantics {
-						fast_instance_reuse: true,
-						deterministic_stack_limit: None,
-						canonicalize_nans: false,
-					},
+		WasmExecutionMethod::Compiled => sc_executor_wasmtime::create_runtime(
+			blob,
+			sc_executor_wasmtime::Config {
+				heap_pages: heap_pages as u32,
+				allow_missing_func_imports,
+				cache_path: cache_path.map(ToOwned::to_owned),
+				semantics: sc_executor_wasmtime::Semantics {
+					fast_instance_reuse: true,
+					deterministic_stack_limit: None,
+					canonicalize_nans: false,
 				},
-				host_functions,
-			).map(|runtime| -> Arc<dyn WasmModule> { Arc::new(runtime) })
-		},
+			},
+			host_functions,
+		)
+		.map(|runtime| -> Arc<dyn WasmModule> { Arc::new(runtime) }),
 	}
 }
 
 fn decode_version(mut version: &[u8]) -> Result<RuntimeVersion, WasmError> {
 	let v: RuntimeVersion = sp_api::OldRuntimeVersion::decode(&mut &version[..])
-		.map_err(|_|
-				 WasmError::Instantiation(
-					 "failed to decode \"Core_version\" result using old runtime version".into(),
-				 )
-		)?.into();
+		.map_err(|_| {
+			WasmError::Instantiation(
+				"failed to decode \"Core_version\" result using old runtime version".into(),
+			)
+		})?
+		.into();
 
 	let core_api_id = sp_core::hashing::blake2_64(b"Core");
 	if v.has_api_with(&core_api_id, |v| v >= 3) {
-		sp_api::RuntimeVersion::decode(&mut version)
-			.map_err(|_|
-				WasmError::Instantiation("failed to decode \"Core_version\" result".into())
-			)
+		sp_api::RuntimeVersion::decode(&mut version).map_err(|_| {
+			WasmError::Instantiation("failed to decode \"Core_version\" result".into())
+		})
 	} else {
 		Ok(v)
 	}
 }
 
 fn decode_runtime_apis(apis: &[u8]) -> Result<Vec<([u8; 8], u32)>, WasmError> {
-	use std::convert::TryFrom;
 	use sp_api::RUNTIME_API_INFO_SIZE;
+	use std::convert::TryFrom;
 
 	apis.chunks(RUNTIME_API_INFO_SIZE)
 		.map(|chunk| {
@@ -367,9 +364,7 @@ fn decode_runtime_apis(apis: &[u8]) -> Result<Vec<([u8; 8], u32)>, WasmError> {
 			// completely divide by `RUNTIME_API_INFO_SIZE`.
 			<[u8; RUNTIME_API_INFO_SIZE]>::try_from(chunk)
 				.map(sp_api::deserialize_runtime_api_info)
-				.map_err(|_| {
-					WasmError::Other("a clipped runtime api info declaration".to_owned())
-				})
+				.map_err(|_| WasmError::Other("a clipped runtime api info declaration".to_owned()))
 		})
 		.collect::<Result<Vec<_>, WasmError>>()
 }
@@ -379,9 +374,7 @@ fn decode_runtime_apis(apis: &[u8]) -> Result<Vec<([u8; 8], u32)>, WasmError> {
 ///
 /// If there are no such sections, it returns `None`. If there is an error during decoding those
 /// sections, `Err` will be returned.
-pub fn read_embedded_version(
-	blob: &RuntimeBlob,
-) -> Result<Option<RuntimeVersion>, WasmError> {
+pub fn read_embedded_version(blob: &RuntimeBlob) -> Result<Option<RuntimeVersion>, WasmError> {
 	if let Some(mut version_section) = blob.custom_section_contents("runtime_version") {
 		// We do not use `decode_version` here because the runtime_version section is not supposed
 		// to ever contain a legacy version. Apart from that `decode_version` relies on presence
@@ -389,9 +382,7 @@ pub fn read_embedded_version(
 		// the structure found in the `runtime_version` always contain an empty `apis` field. Therefore
 		// the version read will be mistakenly treated as an legacy one.
 		let mut decoded_version = sp_api::RuntimeVersion::decode(&mut version_section)
-			.map_err(|_|
-				WasmError::Instantiation("failed to decode version section".into())
-			)?;
+			.map_err(|_| WasmError::Instantiation("failed to decode version section".into()))?;
 
 		// Don't stop on this and check if there is a special section that encodes all runtime APIs.
 		if let Some(apis_section) = blob.custom_section_contents("runtime_apis") {
@@ -443,10 +434,10 @@ fn create_versioned_wasm_runtime(
 			// The following unwind safety assertion is OK because if the method call panics, the
 			// runtime will be dropped.
 			let runtime = AssertUnwindSafe(runtime.as_ref());
-			crate::native_executor::with_externalities_safe(
-				&mut **ext,
-				move || runtime.new_instance()?.call("Core_version".into(), &[])
-			).map_err(|_| WasmError::Instantiation("panic in call to get runtime version".into()))?
+			crate::native_executor::with_externalities_safe(&mut **ext, move || {
+				runtime.new_instance()?.call("Core_version".into(), &[])
+			})
+			.map_err(|_| WasmError::Instantiation("panic in call to get runtime version".into()))?
 		};
 
 		if let Ok(version_buf) = version_result {
@@ -457,23 +448,16 @@ fn create_versioned_wasm_runtime(
 	let mut instances = Vec::with_capacity(max_instances);
 	instances.resize_with(max_instances, || Mutex::new(None));
 
-	Ok(VersionedRuntime {
-		code_hash,
-		module: runtime,
-		version,
-		heap_pages,
-		wasm_method,
-		instances,
-	})
+	Ok(VersionedRuntime { code_hash, module: runtime, version, heap_pages, wasm_method, instances })
 }
 
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use sp_wasm_interface::HostFunctions;
+	use codec::Encode;
 	use sp_api::{Core, RuntimeApiInfo};
+	use sp_wasm_interface::HostFunctions;
 	use substrate_test_runtime::Block;
-	use codec::Encode;
 
 	#[test]
 	fn host_functions_are_equal() {
@@ -533,7 +517,8 @@ mod tests {
 		let wasm = sp_maybe_compressed_blob::decompress(
 			substrate_test_runtime::wasm_binary_unwrap(),
 			sp_maybe_compressed_blob::CODE_BLOB_BOMB_LIMIT,
-		).expect("Decompressing works");
+		)
+		.expect("Decompressing works");
 
 		let runtime_version = RuntimeVersion {
 			spec_name: "test_replace".into(),
@@ -545,10 +530,8 @@ mod tests {
 			transaction_version: 100,
 		};
 
-		let embedded = sp_version::embed::embed_runtime_version(
-			&wasm,
-			runtime_version.clone(),
-		).expect("Embedding works");
+		let embedded = sp_version::embed::embed_runtime_version(&wasm, runtime_version.clone())
+			.expect("Embedding works");
 
 		let blob = RuntimeBlob::new(&embedded).expect("Embedded blob is valid");
 		let read_version = read_embedded_version(&blob)
diff --git a/client/executor/wasmi/src/lib.rs b/client/executor/wasmi/src/lib.rs
index 1bafa3949409..d11d867e9a1b 100644
--- a/client/executor/wasmi/src/lib.rs
+++ b/client/executor/wasmi/src/lib.rs
@@ -18,25 +18,26 @@
 
 //! This crate provides an implementation of `WasmModule` that is baked by wasmi.
 
-use std::{str, cell::RefCell, sync::Arc};
-use wasmi::{
-	Module, ModuleInstance, MemoryInstance, MemoryRef, TableRef, ImportsBuilder, ModuleRef,
-	FuncInstance, memory_units::Pages,
-	RuntimeValue::{I32, I64, self},
+use codec::{Decode, Encode};
+use log::{debug, error, trace};
+use sc_executor_common::{
+	error::{Error, WasmError},
+	runtime_blob::{DataSegmentsSnapshot, RuntimeBlob},
+	sandbox,
+	wasm_runtime::{InvokeMethod, WasmInstance, WasmModule},
 };
-use codec::{Encode, Decode};
 use sp_core::sandbox as sandbox_primitives;
-use log::{error, trace, debug};
+use sp_runtime_interface::unpack_ptr_and_len;
 use sp_wasm_interface::{
-	FunctionContext, Pointer, WordSize, Sandbox, MemoryId, Result as WResult, Function,
+	Function, FunctionContext, MemoryId, Pointer, Result as WResult, Sandbox, WordSize,
 };
-use sp_runtime_interface::unpack_ptr_and_len;
-use sc_executor_common::wasm_runtime::{WasmModule, WasmInstance, InvokeMethod};
-use sc_executor_common::{
-	error::{Error, WasmError},
-	sandbox,
+use std::{cell::RefCell, str, sync::Arc};
+use wasmi::{
+	memory_units::Pages,
+	FuncInstance, ImportsBuilder, MemoryInstance, MemoryRef, Module, ModuleInstance, ModuleRef,
+	RuntimeValue::{self, I32, I64},
+	TableRef,
 };
-use sc_executor_common::runtime_blob::{RuntimeBlob, DataSegmentsSnapshot};
 
 struct FunctionExecutor<'a> {
 	sandbox_store: sandbox::Store<wasmi::FuncRef>,
@@ -109,16 +110,14 @@ impl<'a> FunctionContext for FunctionExecutor<'a> {
 
 	fn allocate_memory(&mut self, size: WordSize) -> WResult<Pointer<u8>> {
 		let heap = &mut self.heap;
-		self.memory.with_direct_access_mut(|mem| {
-			heap.allocate(mem, size).map_err(|e| e.to_string())
-		})
+		self.memory
+			.with_direct_access_mut(|mem| heap.allocate(mem, size).map_err(|e| e.to_string()))
 	}
 
 	fn deallocate_memory(&mut self, ptr: Pointer<u8>) -> WResult<()> {
 		let heap = &mut self.heap;
-		self.memory.with_direct_access_mut(|mem| {
-			heap.deallocate(mem, ptr).map_err(|e| e.to_string())
-		})
+		self.memory
+			.with_direct_access_mut(|mem| heap.deallocate(mem, ptr).map_err(|e| e.to_string()))
 	}
 
 	fn sandbox(&mut self) -> &mut dyn Sandbox {
@@ -173,11 +172,7 @@ impl<'a> Sandbox for FunctionExecutor<'a> {
 		self.sandbox_store.memory_teardown(memory_id).map_err(|e| e.to_string())
 	}
 
-	fn memory_new(
-		&mut self,
-		initial: u32,
-		maximum: u32,
-	) -> WResult<MemoryId> {
+	fn memory_new(&mut self, initial: u32, maximum: u32) -> WResult<MemoryId> {
 		self.sandbox_store.new_memory(initial, maximum).map_err(|e| e.to_string())
 	}
 
@@ -213,7 +208,7 @@ impl<'a> Sandbox for FunctionExecutor<'a> {
 					self.write_memory(return_val, val).map_err(|_| "Return value buffer is OOB")?;
 					Ok(sandbox_primitives::ERR_OK)
 				})
-			}
+			},
 			Err(_) => Ok(sandbox_primitives::ERR_EXECUTION),
 		}
 	}
@@ -231,9 +226,12 @@ impl<'a> Sandbox for FunctionExecutor<'a> {
 	) -> WResult<u32> {
 		// Extract a dispatch thunk from instance's table by the specified index.
 		let dispatch_thunk = {
-			let table = self.table.as_ref()
+			let table = self
+				.table
+				.as_ref()
 				.ok_or_else(|| "Runtime doesn't have a table; sandbox is unavailable")?;
-			table.get(dispatch_thunk_id)
+			table
+				.get(dispatch_thunk_id)
 				.map_err(|_| "dispatch_thunk_idx is out of the table bounds")?
 				.ok_or_else(|| "dispatch_thunk_idx points on an empty table entry")?
 		};
@@ -248,8 +246,7 @@ impl<'a> Sandbox for FunctionExecutor<'a> {
 				.map(|i| i.register(&mut self.sandbox_store))
 			{
 				Ok(instance_idx) => instance_idx,
-				Err(sandbox::InstantiationError::StartTrapped) =>
-					sandbox_primitives::ERR_EXECUTION,
+				Err(sandbox::InstantiationError::StartTrapped) => sandbox_primitives::ERR_EXECUTION,
 				Err(_) => sandbox_primitives::ERR_MODULE,
 			};
 
@@ -288,7 +285,7 @@ struct Resolver<'a> {
 
 impl<'a> Resolver<'a> {
 	fn new(
-		host_functions: &'a[&'static dyn Function],
+		host_functions: &'a [&'static dyn Function],
 		allow_missing_func_imports: bool,
 		heap_pages: usize,
 	) -> Resolver<'a> {
@@ -303,25 +300,23 @@ impl<'a> Resolver<'a> {
 }
 
 impl<'a> wasmi::ModuleImportResolver for Resolver<'a> {
-	fn resolve_func(&self, name: &str, signature: &wasmi::Signature)
-		-> std::result::Result<wasmi::FuncRef, wasmi::Error>
-	{
+	fn resolve_func(
+		&self,
+		name: &str,
+		signature: &wasmi::Signature,
+	) -> std::result::Result<wasmi::FuncRef, wasmi::Error> {
 		let signature = sp_wasm_interface::Signature::from(signature);
 		for (function_index, function) in self.host_functions.iter().enumerate() {
 			if name == function.name() {
 				if signature == function.signature() {
-					return Ok(
-						wasmi::FuncInstance::alloc_host(signature.into(), function_index),
-					)
+					return Ok(wasmi::FuncInstance::alloc_host(signature.into(), function_index))
 				} else {
-					return Err(wasmi::Error::Instantiation(
-						format!(
-							"Invalid signature for function `{}` expected `{:?}`, got `{:?}`",
-							function.name(),
-							signature,
-							function.signature(),
-						),
-					))
+					return Err(wasmi::Error::Instantiation(format!(
+						"Invalid signature for function `{}` expected `{:?}`, got `{:?}`",
+						function.name(),
+						signature,
+						function.signature(),
+					)))
 				}
 			}
 		}
@@ -333,9 +328,7 @@ impl<'a> wasmi::ModuleImportResolver for Resolver<'a> {
 
 			Ok(wasmi::FuncInstance::alloc_host(signature.into(), id))
 		} else {
-			Err(wasmi::Error::Instantiation(
-				format!("Export {} not found", name),
-			))
+			Err(wasmi::Error::Instantiation(format!("Export {} not found", name)))
 		}
 	}
 
@@ -346,15 +339,14 @@ impl<'a> wasmi::ModuleImportResolver for Resolver<'a> {
 	) -> Result<MemoryRef, wasmi::Error> {
 		if field_name == "memory" {
 			match &mut *self.import_memory.borrow_mut() {
-				Some(_) => Err(wasmi::Error::Instantiation(
-					"Memory can not be imported twice!".into(),
-				)),
+				Some(_) =>
+					Err(wasmi::Error::Instantiation("Memory can not be imported twice!".into())),
 				memory_ref @ None => {
 					if memory_type
-							.maximum()
-							.map(|m| m.saturating_sub(memory_type.initial()))
-							.map(|m| self.heap_pages > m as usize)
-							.unwrap_or(false)
+						.maximum()
+						.map(|m| m.saturating_sub(memory_type.initial()))
+						.map(|m| self.heap_pages > m as usize)
+						.unwrap_or(false)
 					{
 						Err(wasmi::Error::Instantiation(format!(
 							"Heap pages ({}) is greater than imported memory maximum ({}).",
@@ -372,35 +364,40 @@ impl<'a> wasmi::ModuleImportResolver for Resolver<'a> {
 						*memory_ref = Some(memory.clone());
 						Ok(memory)
 					}
-				}
+				},
 			}
 		} else {
-			Err(wasmi::Error::Instantiation(
-				format!("Unknown memory reference with name: {}", field_name),
-			))
+			Err(wasmi::Error::Instantiation(format!(
+				"Unknown memory reference with name: {}",
+				field_name
+			)))
 		}
 	}
 }
 
 impl<'a> wasmi::Externals for FunctionExecutor<'a> {
-	fn invoke_index(&mut self, index: usize, args: wasmi::RuntimeArgs)
-		-> Result<Option<wasmi::RuntimeValue>, wasmi::Trap>
-	{
+	fn invoke_index(
+		&mut self,
+		index: usize,
+		args: wasmi::RuntimeArgs,
+	) -> Result<Option<wasmi::RuntimeValue>, wasmi::Trap> {
 		let mut args = args.as_ref().iter().copied().map(Into::into);
 
 		if let Some(function) = self.host_functions.get(index) {
-			function.execute(self, &mut args)
+			function
+				.execute(self, &mut args)
 				.map_err(|msg| Error::FunctionExecution(function.name().to_string(), msg))
 				.map_err(wasmi::Trap::from)
 				.map(|v| v.map(Into::into))
-		} else if self.allow_missing_func_imports
-			&& index >= self.host_functions.len()
-			&& index < self.host_functions.len() + self.missing_functions.len()
+		} else if self.allow_missing_func_imports &&
+			index >= self.host_functions.len() &&
+			index < self.host_functions.len() + self.missing_functions.len()
 		{
 			Err(Error::from(format!(
 				"Function `{}` is only a stub. Calling a stub is not allowed.",
 				self.missing_functions[index - self.host_functions.len()],
-			)).into())
+			))
+			.into())
 		} else {
 			Err(Error::from(format!("Could not find host function with index: {}", index)).into())
 		}
@@ -462,25 +459,26 @@ fn call_in_wasm_module(
 	function_executor.write_memory(offset, data)?;
 
 	let result = match method {
-		InvokeMethod::Export(method) => {
-			module_instance.invoke_export(
-				method,
-				&[I32(u32::from(offset) as i32), I32(data.len() as i32)],
-				&mut function_executor,
-			)
-		},
+		InvokeMethod::Export(method) => module_instance.invoke_export(
+			method,
+			&[I32(u32::from(offset) as i32), I32(data.len() as i32)],
+			&mut function_executor,
+		),
 		InvokeMethod::Table(func_ref) => {
-			let func = table.ok_or(Error::NoTable)?
+			let func = table
+				.ok_or(Error::NoTable)?
 				.get(func_ref)?
 				.ok_or(Error::NoTableEntryWithIndex(func_ref))?;
 			FuncInstance::invoke(
 				&func,
 				&[I32(u32::from(offset) as i32), I32(data.len() as i32)],
 				&mut function_executor,
-			).map_err(Into::into)
+			)
+			.map_err(Into::into)
 		},
 		InvokeMethod::TableWithWrapper { dispatcher_ref, func } => {
-			let dispatcher = table.ok_or(Error::NoTable)?
+			let dispatcher = table
+				.ok_or(Error::NoTable)?
 				.get(dispatcher_ref)?
 				.ok_or(Error::NoTableEntryWithIndex(dispatcher_ref))?;
 
@@ -488,7 +486,8 @@ fn call_in_wasm_module(
 				&dispatcher,
 				&[I32(func as _), I32(u32::from(offset) as i32), I32(data.len() as i32)],
 				&mut function_executor,
-			).map_err(Into::into)
+			)
+			.map_err(Into::into)
 		},
 	};
 
@@ -518,15 +517,12 @@ fn instantiate_module(
 ) -> Result<(ModuleRef, Vec<String>, MemoryRef), Error> {
 	let resolver = Resolver::new(host_functions, allow_missing_func_imports, heap_pages);
 	// start module instantiation. Don't run 'start' function yet.
-	let intermediate_instance = ModuleInstance::new(
-		module,
-		&ImportsBuilder::new().with_resolver("env", &resolver),
-	)?;
+	let intermediate_instance =
+		ModuleInstance::new(module, &ImportsBuilder::new().with_resolver("env", &resolver))?;
 
 	// Verify that the module has the heap base global variable.
 	let _ = get_heap_base(intermediate_instance.not_started_instance())?;
 
-
 	// Get the memory reference. Runtimes should import memory, but to be backwards
 	// compatible we also support exported memory.
 	let memory = match resolver.import_memory.into_inner() {
@@ -541,7 +537,7 @@ fn instantiate_module(
 			memory.grow(Pages(heap_pages)).map_err(|_| Error::Runtime)?;
 
 			memory
-		}
+		},
 	};
 
 	if intermediate_instance.has_start() {
@@ -592,9 +588,7 @@ impl GlobalValsSnapshot {
 			// the instance should be the same as used for preserving and
 			// we iterate the same way it as we do it for preserving values that means that the
 			// types should be the same and all the values are mutable. So no error is expected/
-			global_ref
-				.set(*global_val)
-				.map_err(|_| WasmError::ApplySnapshotFailed)?;
+			global_ref.set(*global_val).map_err(|_| WasmError::ApplySnapshotFailed)?;
 		}
 		Ok(())
 	}
@@ -624,7 +618,8 @@ impl WasmModule for WasmiRuntime {
 			&self.module,
 			&self.host_functions,
 			self.allow_missing_func_imports,
-		).map_err(|e| WasmError::Instantiation(e.to_string()))?;
+		)
+		.map_err(|e| WasmError::Instantiation(e.to_string()))?;
 
 		Ok(Box::new(WasmiInstance {
 			instance,
@@ -646,11 +641,11 @@ pub fn create_runtime(
 	host_functions: Vec<&'static dyn Function>,
 	allow_missing_func_imports: bool,
 ) -> Result<WasmiRuntime, WasmError> {
-	let data_segments_snapshot = DataSegmentsSnapshot::take(&blob)
-		.map_err(|e| WasmError::Other(e.to_string()))?;
+	let data_segments_snapshot =
+		DataSegmentsSnapshot::take(&blob).map_err(|e| WasmError::Other(e.to_string()))?;
 
-	let module = Module::from_parity_wasm_module(blob.into_inner())
-		.map_err(|_| WasmError::InvalidModule)?;
+	let module =
+		Module::from_parity_wasm_module(blob.into_inner()).map_err(|_| WasmError::InvalidModule)?;
 
 	let global_vals_snapshot = {
 		let (instance, _, _) = instantiate_module(
@@ -734,7 +729,7 @@ impl WasmInstance for WasmiInstance {
 					.as_global()
 					.ok_or_else(|| format!("`{}` is not a global", name))?
 					.get()
-					.into()
+					.into(),
 			)),
 			None => Ok(None),
 		}
diff --git a/client/executor/wasmtime/src/host.rs b/client/executor/wasmtime/src/host.rs
index 3f5ac0560a6d..ee0e82928db2 100644
--- a/client/executor/wasmtime/src/host.rs
+++ b/client/executor/wasmtime/src/host.rs
@@ -19,16 +19,17 @@
 //! This module defines `HostState` and `HostContext` structs which provide logic and state
 //! required for execution of host.
 
-use crate::instance_wrapper::InstanceWrapper;
-use crate::util;
-use std::{cell::RefCell, rc::Rc};
+use crate::{instance_wrapper::InstanceWrapper, util};
+use codec::{Decode, Encode};
 use log::trace;
-use codec::{Encode, Decode};
 use sc_allocator::FreeingBumpHeapAllocator;
-use sc_executor_common::error::Result;
-use sc_executor_common::sandbox::{self, SandboxCapabilities, SupervisorFuncIndex};
+use sc_executor_common::{
+	error::Result,
+	sandbox::{self, SandboxCapabilities, SupervisorFuncIndex},
+};
 use sp_core::sandbox as sandbox_primitives;
 use sp_wasm_interface::{FunctionContext, MemoryId, Pointer, Sandbox, WordSize};
+use std::{cell::RefCell, rc::Rc};
 use wasmtime::{Func, Val};
 
 /// Wrapper type for pointer to a Wasm table entry.
@@ -108,7 +109,7 @@ impl<'a> SandboxCapabilities for HostContext<'a> {
 						"Supervisor function returned {} results, expected 1",
 						ret_vals.len()
 					)
-					.into());
+					.into())
 				} else {
 					&ret_vals[0]
 				};
@@ -116,9 +117,9 @@ impl<'a> SandboxCapabilities for HostContext<'a> {
 				if let Some(ret_val) = ret_val.i64() {
 					Ok(ret_val)
 				} else {
-					return Err("Supervisor function returned unexpected result!".into());
+					return Err("Supervisor function returned unexpected result!".into())
 				}
-			}
+			},
 			Err(err) => Err(err.to_string().into()),
 		}
 	}
@@ -130,15 +131,11 @@ impl<'a> sp_wasm_interface::FunctionContext for HostContext<'a> {
 		address: Pointer<u8>,
 		dest: &mut [u8],
 	) -> sp_wasm_interface::Result<()> {
-		self.instance
-			.read_memory_into(address, dest)
-			.map_err(|e| e.to_string())
+		self.instance.read_memory_into(address, dest).map_err(|e| e.to_string())
 	}
 
 	fn write_memory(&mut self, address: Pointer<u8>, data: &[u8]) -> sp_wasm_interface::Result<()> {
-		self.instance
-			.write_memory_from(address, data)
-			.map_err(|e| e.to_string())
+		self.instance.write_memory_from(address, data).map_err(|e| e.to_string())
 	}
 
 	fn allocate_memory(&mut self, size: WordSize) -> sp_wasm_interface::Result<Pointer<u8>> {
@@ -166,11 +163,8 @@ impl<'a> Sandbox for HostContext<'a> {
 		buf_ptr: Pointer<u8>,
 		buf_len: WordSize,
 	) -> sp_wasm_interface::Result<u32> {
-		let sandboxed_memory = self
-			.sandbox_store
-			.borrow()
-			.memory(memory_id)
-			.map_err(|e| e.to_string())?;
+		let sandboxed_memory =
+			self.sandbox_store.borrow().memory(memory_id).map_err(|e| e.to_string())?;
 		sandboxed_memory.with_direct_access(|sandboxed_memory| {
 			let len = buf_len as usize;
 			let src_range = match util::checked_range(offset as usize, len, sandboxed_memory.len())
@@ -200,11 +194,8 @@ impl<'a> Sandbox for HostContext<'a> {
 		val_ptr: Pointer<u8>,
 		val_len: WordSize,
 	) -> sp_wasm_interface::Result<u32> {
-		let sandboxed_memory = self
-			.sandbox_store
-			.borrow()
-			.memory(memory_id)
-			.map_err(|e| e.to_string())?;
+		let sandboxed_memory =
+			self.sandbox_store.borrow().memory(memory_id).map_err(|e| e.to_string())?;
 		sandboxed_memory.with_direct_access_mut(|sandboxed_memory| {
 			let len = val_len as usize;
 			let supervisor_mem_size = self.instance.memory_size() as usize;
@@ -259,11 +250,8 @@ impl<'a> Sandbox for HostContext<'a> {
 			.map(Into::into)
 			.collect::<Vec<_>>();
 
-		let instance = self
-			.sandbox_store
-			.borrow()
-			.instance(instance_id)
-			.map_err(|e| e.to_string())?;
+		let instance =
+			self.sandbox_store.borrow().instance(instance_id).map_err(|e| e.to_string())?;
 		let result = instance.invoke(export_name, &args, self, state);
 
 		match result {
@@ -278,7 +266,7 @@ impl<'a> Sandbox for HostContext<'a> {
 						.map_err(|_| "can't write return value")?;
 					Ok(sandbox_primitives::ERR_OK)
 				})
-			}
+			},
 			Err(_) => Ok(sandbox_primitives::ERR_EXECUTION),
 		}
 	}
diff --git a/client/executor/wasmtime/src/imports.rs b/client/executor/wasmtime/src/imports.rs
index f66e3042fba5..0e5094db5119 100644
--- a/client/executor/wasmtime/src/imports.rs
+++ b/client/executor/wasmtime/src/imports.rs
@@ -21,8 +21,8 @@ use sc_executor_common::error::WasmError;
 use sp_wasm_interface::{Function, ValueType};
 use std::any::Any;
 use wasmtime::{
-	Extern, ExternType, Func, FuncType, ImportType, Limits, Memory, MemoryType, Module,
-	Trap, Val, Store,
+	Extern, ExternType, Func, FuncType, ImportType, Limits, Memory, MemoryType, Module, Store,
+	Trap, Val,
 };
 
 pub struct Imports {
@@ -51,36 +51,29 @@ pub fn resolve_imports(
 				"host doesn't provide any imports from non-env module: {}:{}",
 				import_ty.module(),
 				name,
-			)));
+			)))
 		}
 
 		let resolved = match name {
 			"memory" => {
 				memory_import_index = Some(externs.len());
 				resolve_memory_import(store, &import_ty, heap_pages)?
-			}
-			_ => resolve_func_import(
-				store,
-				&import_ty,
-				host_functions,
-				allow_missing_func_imports,
-			)?,
+			},
+			_ =>
+				resolve_func_import(store, &import_ty, host_functions, allow_missing_func_imports)?,
 		};
 		externs.push(resolved);
 	}
-	Ok(Imports {
-		memory_import_index,
-		externs,
-	})
+	Ok(Imports { memory_import_index, externs })
 }
 
 /// When the module linking proposal is supported the import's name can be `None`.
 /// Because we are not using this proposal we could safely unwrap the name.
 /// However, we opt for an error in order to avoid panics at all costs.
 fn import_name<'a, 'b: 'a>(import: &'a ImportType<'b>) -> Result<&'a str, WasmError> {
-	let name = import.name().ok_or_else(||
+	let name = import.name().ok_or_else(|| {
 		WasmError::Other("The module linking proposal is not supported.".to_owned())
-	)?;
+	})?;
 	Ok(name)
 }
 
@@ -91,21 +84,17 @@ fn resolve_memory_import(
 ) -> Result<Extern, WasmError> {
 	let requested_memory_ty = match import_ty.ty() {
 		ExternType::Memory(memory_ty) => memory_ty,
-		_ => {
+		_ =>
 			return Err(WasmError::Other(format!(
 				"this import must be of memory type: {}:{}",
 				import_ty.module(),
 				import_name(&import_ty)?,
-			)))
-		}
+			))),
 	};
 
 	// Increment the min (a.k.a initial) number of pages by `heap_pages` and check if it exceeds the
 	// maximum specified by the import.
-	let initial = requested_memory_ty
-		.limits()
-		.min()
-		.saturating_add(heap_pages);
+	let initial = requested_memory_ty.limits().min().saturating_add(heap_pages);
 	if let Some(max) = requested_memory_ty.limits().max() {
 		if initial > max {
 			return Err(WasmError::Other(format!(
@@ -113,7 +102,7 @@ fn resolve_memory_import(
 				by the runtime wasm module {}",
 				initial,
 				max,
-			)));
+			)))
 		}
 	}
 
@@ -137,37 +126,31 @@ fn resolve_func_import(
 
 	let func_ty = match import_ty.ty() {
 		ExternType::Func(func_ty) => func_ty,
-		_ => {
+		_ =>
 			return Err(WasmError::Other(format!(
 				"host doesn't provide any non function imports besides 'memory': {}:{}",
 				import_ty.module(),
 				name,
-			)));
-		}
+			))),
 	};
 
-	let host_func = match host_functions
-		.iter()
-		.find(|host_func| host_func.name() == name)
-	{
+	let host_func = match host_functions.iter().find(|host_func| host_func.name() == name) {
 		Some(host_func) => host_func,
-		None if allow_missing_func_imports => {
-			return Ok(MissingHostFuncHandler::new(import_ty)?.into_extern(store, &func_ty));
-		}
-		None => {
+		None if allow_missing_func_imports =>
+			return Ok(MissingHostFuncHandler::new(import_ty)?.into_extern(store, &func_ty)),
+		None =>
 			return Err(WasmError::Other(format!(
 				"host doesn't provide such function: {}:{}",
 				import_ty.module(),
 				name,
-			)));
-		}
+			))),
 	};
 	if &func_ty != &wasmtime_func_sig(*host_func) {
 		return Err(WasmError::Other(format!(
 			"signature mismatch for: {}:{}",
 			import_ty.module(),
 			name,
-		)));
+		)))
 	}
 
 	Ok(HostFuncHandler::new(*host_func).into_extern(store))
@@ -218,7 +201,7 @@ fn call_static(
 			);
 			wasmtime_results[0] = util::into_wasmtime_val(ret_val);
 			Ok(())
-		}
+		},
 		Ok(None) => {
 			debug_assert!(
 				wasmtime_results.len() == 0,
@@ -226,26 +209,22 @@ fn call_static(
 				correspond to the number of results returned by the host function",
 			);
 			Ok(())
-		}
+		},
 		Err(msg) => Err(Trap::new(msg)),
 	}
 }
 
 impl HostFuncHandler {
 	fn new(host_func: &'static dyn Function) -> Self {
-		Self {
-			host_func,
-		}
+		Self { host_func }
 	}
 
 	fn into_extern(self, store: &Store) -> Extern {
 		let host_func = self.host_func;
 		let func_ty = wasmtime_func_sig(self.host_func);
-		let func = Func::new(store, func_ty,
-			move |_, params, result| {
-				call_static(host_func, params, result)
-			}
-		);
+		let func = Func::new(store, func_ty, move |_, params, result| {
+			call_static(host_func, params, result)
+		});
 		Extern::Func(func)
 	}
 }
@@ -266,28 +245,17 @@ impl MissingHostFuncHandler {
 
 	fn into_extern(self, store: &Store, func_ty: &FuncType) -> Extern {
 		let Self { module, name } = self;
-		let func = Func::new(store, func_ty.clone(),
-			move |_, _, _| Err(Trap::new(format!(
-				"call to a missing function {}:{}",
-				module, name
-			)))
-		);
+		let func = Func::new(store, func_ty.clone(), move |_, _, _| {
+			Err(Trap::new(format!("call to a missing function {}:{}", module, name)))
+		});
 		Extern::Func(func)
 	}
 }
 
 fn wasmtime_func_sig(func: &dyn Function) -> wasmtime::FuncType {
 	let signature = func.signature();
-	let params = signature
-		.args
-		.iter()
-		.cloned()
-		.map(into_wasmtime_val_type);
-	let results = signature
-		.return_value
-		.iter()
-		.cloned()
-		.map(into_wasmtime_val_type);
+	let params = signature.args.iter().cloned().map(into_wasmtime_val_type);
+	let results = signature.return_value.iter().cloned().map(into_wasmtime_val_type);
 	wasmtime::FuncType::new(params, results)
 }
 
diff --git a/client/executor/wasmtime/src/instance_wrapper.rs b/client/executor/wasmtime/src/instance_wrapper.rs
index 816099aee804..80cf2b60f492 100644
--- a/client/executor/wasmtime/src/instance_wrapper.rs
+++ b/client/executor/wasmtime/src/instance_wrapper.rs
@@ -19,26 +19,23 @@
 //! Defines data and logic needed for interaction with an WebAssembly instance of a substrate
 //! runtime module.
 
-use crate::util;
-use crate::imports::Imports;
+use crate::{imports::Imports, util};
 
-use std::{slice, marker};
 use sc_executor_common::{
 	error::{Error, Result},
 	runtime_blob,
 	wasm_runtime::InvokeMethod,
 };
-use sp_wasm_interface::{Pointer, WordSize, Value};
-use wasmtime::{Instance, Module, Memory, Table, Val, Func, Extern, Global, Store};
+use sp_wasm_interface::{Pointer, Value, WordSize};
+use std::{marker, slice};
+use wasmtime::{Extern, Func, Global, Instance, Memory, Module, Store, Table, Val};
 
 /// Invoked entrypoint format.
 pub enum EntryPointType {
 	/// Direct call.
 	///
 	/// Call is made by providing only payload reference and length.
-	Direct {
-		entrypoint: wasmtime::TypedFunc<(u32, u32), u64>,
-	},
+	Direct { entrypoint: wasmtime::TypedFunc<(u32, u32), u64> },
 	/// Indirect call.
 	///
 	/// Call is made by providing payload reference and length, and extra argument
@@ -66,17 +63,10 @@ impl EntryPoint {
 		}
 
 		match self.call_type {
-			EntryPointType::Direct { ref entrypoint } => {
-				entrypoint.call((data_ptr, data_len)).map_err(handle_trap)
-			}
-			EntryPointType::Wrapped {
-				func,
-				ref dispatcher,
-			} => {
-				dispatcher
-					.call((func, data_ptr, data_len))
-					.map_err(handle_trap)
-			}
+			EntryPointType::Direct { ref entrypoint } =>
+				entrypoint.call((data_ptr, data_len)).map_err(handle_trap),
+			EntryPointType::Wrapped { func, ref dispatcher } =>
+				dispatcher.call((func, data_ptr, data_len)).map_err(handle_trap),
 		}
 	}
 
@@ -85,9 +75,7 @@ impl EntryPoint {
 			.typed::<(u32, u32), u64>()
 			.map_err(|_| "Invalid signature for direct entry point")?
 			.clone();
-		Ok(Self {
-			call_type: EntryPointType::Direct { entrypoint },
-		})
+		Ok(Self { call_type: EntryPointType::Direct { entrypoint } })
 	}
 
 	pub fn wrapped(
@@ -98,9 +86,7 @@ impl EntryPoint {
 			.typed::<(u32, u32, u32), u64>()
 			.map_err(|_| "Invalid signature for wrapped entry point")?
 			.clone();
-		Ok(Self {
-			call_type: EntryPointType::Wrapped { func, dispatcher },
-		})
+		Ok(Self { call_type: EntryPointType::Wrapped { func, dispatcher } })
 	}
 }
 
@@ -127,7 +113,6 @@ fn extern_memory(extern_: &Extern) -> Option<&Memory> {
 	}
 }
 
-
 fn extern_global(extern_: &Extern) -> Option<&Global> {
 	match extern_ {
 		Extern::Global(glob) => Some(glob),
@@ -156,15 +141,13 @@ impl InstanceWrapper {
 			.map_err(|e| Error::from(format!("cannot instantiate: {}", e)))?;
 
 		let memory = match imports.memory_import_index {
-			Some(memory_idx) => {
-				extern_memory(&imports.externs[memory_idx])
-					.expect("only memory can be at the `memory_idx`; qed")
-					.clone()
-			}
+			Some(memory_idx) => extern_memory(&imports.externs[memory_idx])
+				.expect("only memory can be at the `memory_idx`; qed")
+				.clone(),
 			None => {
 				let memory = get_linear_memory(&instance)?;
 				if !memory.grow(heap_pages).is_ok() {
-					return Err("failed top increase the linear memory size".into());
+					return Err("failed top increase the linear memory size".into())
 				}
 				memory
 			},
@@ -186,42 +169,38 @@ impl InstanceWrapper {
 		Ok(match method {
 			InvokeMethod::Export(method) => {
 				// Resolve the requested method and verify that it has a proper signature.
-				let export = self
-					.instance
-					.get_export(method)
-					.ok_or_else(|| Error::from(format!("Exported method {} is not found", method)))?;
+				let export = self.instance.get_export(method).ok_or_else(|| {
+					Error::from(format!("Exported method {} is not found", method))
+				})?;
 				let func = extern_func(&export)
 					.ok_or_else(|| Error::from(format!("Export {} is not a function", method)))?
 					.clone();
-				EntryPoint::direct(func)
-					.map_err(|_|
-						Error::from(format!(
-							"Exported function '{}' has invalid signature.",
-							method,
-						))
-					)?
+				EntryPoint::direct(func).map_err(|_| {
+					Error::from(format!("Exported function '{}' has invalid signature.", method,))
+				})?
 			},
 			InvokeMethod::Table(func_ref) => {
-				let table = self.instance.get_table("__indirect_function_table").ok_or(Error::NoTable)?;
-				let val = table.get(func_ref)
-					.ok_or(Error::NoTableEntryWithIndex(func_ref))?;
+				let table =
+					self.instance.get_table("__indirect_function_table").ok_or(Error::NoTable)?;
+				let val = table.get(func_ref).ok_or(Error::NoTableEntryWithIndex(func_ref))?;
 				let func = val
 					.funcref()
 					.ok_or(Error::TableElementIsNotAFunction(func_ref))?
 					.ok_or(Error::FunctionRefIsNull(func_ref))?
 					.clone();
 
-				EntryPoint::direct(func)
-					.map_err(|_|
-						Error::from(format!(
-							"Function @{} in exported table has invalid signature for direct call.",
-							func_ref,
-						))
-					)?
-				},
+				EntryPoint::direct(func).map_err(|_| {
+					Error::from(format!(
+						"Function @{} in exported table has invalid signature for direct call.",
+						func_ref,
+					))
+				})?
+			},
 			InvokeMethod::TableWithWrapper { dispatcher_ref, func } => {
-				let table = self.instance.get_table("__indirect_function_table").ok_or(Error::NoTable)?;
-				let val = table.get(dispatcher_ref)
+				let table =
+					self.instance.get_table("__indirect_function_table").ok_or(Error::NoTable)?;
+				let val = table
+					.get(dispatcher_ref)
 					.ok_or(Error::NoTableEntryWithIndex(dispatcher_ref))?;
 				let dispatcher = val
 					.funcref()
@@ -229,13 +208,12 @@ impl InstanceWrapper {
 					.ok_or(Error::FunctionRefIsNull(dispatcher_ref))?
 					.clone();
 
-				EntryPoint::wrapped(dispatcher, func)
-					.map_err(|_|
-						Error::from(format!(
-							"Function @{} in exported table has invalid signature for wrapped call.",
-							dispatcher_ref,
-						))
-					)?
+				EntryPoint::wrapped(dispatcher, func).map_err(|_| {
+					Error::from(format!(
+						"Function @{} in exported table has invalid signature for wrapped call.",
+						dispatcher_ref,
+					))
+				})?
 			},
 		})
 	}
@@ -426,7 +404,7 @@ impl InstanceWrapper {
 	/// relied upon. Thus this function acts as a hint.
 	pub fn decommit(&self) {
 		if self.memory.data_size() == 0 {
-			return;
+			return
 		}
 
 		cfg_if::cfg_if! {
diff --git a/client/executor/wasmtime/src/lib.rs b/client/executor/wasmtime/src/lib.rs
index 74b1150f06ae..62b0b205f6de 100644
--- a/client/executor/wasmtime/src/lib.rs
+++ b/client/executor/wasmtime/src/lib.rs
@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-///! Defines a `WasmRuntime` that uses the Wasmtime JIT to execute.
+/// ! Defines a `WasmRuntime` that uses the Wasmtime JIT to execute.
 mod host;
 mod imports;
 mod instance_wrapper;
@@ -28,6 +28,6 @@ mod util;
 mod tests;
 
 pub use runtime::{
-	create_runtime, create_runtime_from_artifact, prepare_runtime_artifact, Config, Semantics,
-	DeterministicStackLimit,
+	create_runtime, create_runtime_from_artifact, prepare_runtime_artifact, Config,
+	DeterministicStackLimit, Semantics,
 };
diff --git a/client/executor/wasmtime/src/runtime.rs b/client/executor/wasmtime/src/runtime.rs
index 0a3c0488a247..b69eac6266bb 100644
--- a/client/executor/wasmtime/src/runtime.rs
+++ b/client/executor/wasmtime/src/runtime.rs
@@ -18,22 +18,26 @@
 
 //! Defines the compiled Wasm runtime that uses Wasmtime internally.
 
-use crate::host::HostState;
-use crate::imports::{Imports, resolve_imports};
-use crate::instance_wrapper::{InstanceWrapper, EntryPoint};
-use crate::state_holder;
-
-use std::{path::PathBuf, rc::Rc};
-use std::sync::Arc;
-use std::path::Path;
+use crate::{
+	host::HostState,
+	imports::{resolve_imports, Imports},
+	instance_wrapper::{EntryPoint, InstanceWrapper},
+	state_holder,
+};
+
+use sc_allocator::FreeingBumpHeapAllocator;
 use sc_executor_common::{
 	error::{Result, WasmError},
 	runtime_blob::{DataSegmentsSnapshot, ExposedMutableGlobalsSet, GlobalsSnapshot, RuntimeBlob},
-	wasm_runtime::{WasmModule, WasmInstance, InvokeMethod},
+	wasm_runtime::{InvokeMethod, WasmInstance, WasmModule},
 };
-use sc_allocator::FreeingBumpHeapAllocator;
 use sp_runtime_interface::unpack_ptr_and_len;
-use sp_wasm_interface::{Function, Pointer, WordSize, Value};
+use sp_wasm_interface::{Function, Pointer, Value, WordSize};
+use std::{
+	path::{Path, PathBuf},
+	rc::Rc,
+	sync::Arc,
+};
 use wasmtime::{Engine, Store};
 
 enum Strategy {
@@ -102,7 +106,8 @@ impl WasmModule for WasmtimeRuntime {
 			// the mutable globals were collected. Here, it is easy to see that there is only a single
 			// runtime blob and thus it's the same that was used for both creating the instance and
 			// collecting the mutable globals.
-			let globals_snapshot = GlobalsSnapshot::take(&snapshot_data.mutable_globals, &instance_wrapper);
+			let globals_snapshot =
+				GlobalsSnapshot::take(&snapshot_data.mutable_globals, &instance_wrapper);
 
 			Strategy::FastInstanceReuse {
 				instance_wrapper: Rc::new(instance_wrapper),
@@ -150,14 +155,15 @@ impl WasmInstance for WasmtimeInstance {
 				globals_snapshot.apply(&**instance_wrapper);
 				let allocator = FreeingBumpHeapAllocator::new(*heap_base);
 
-				let result = perform_call(data, Rc::clone(&instance_wrapper), entrypoint, allocator);
+				let result =
+					perform_call(data, Rc::clone(&instance_wrapper), entrypoint, allocator);
 
 				// Signal to the OS that we are done with the linear memory and that it can be
 				// reclaimed.
 				instance_wrapper.decommit();
 
 				result
-			}
+			},
 			Strategy::RecreateInstance(instance_creator) => {
 				let instance_wrapper = instance_creator.instantiate()?;
 				let heap_base = instance_wrapper.extract_heap_base()?;
@@ -165,18 +171,16 @@ impl WasmInstance for WasmtimeInstance {
 
 				let allocator = FreeingBumpHeapAllocator::new(heap_base);
 				perform_call(data, Rc::new(instance_wrapper), entrypoint, allocator)
-			}
+			},
 		}
 	}
 
 	fn get_global_const(&self, name: &str) -> Result<Option<Value>> {
 		match &self.strategy {
-			Strategy::FastInstanceReuse {
-				instance_wrapper, ..
-			} => instance_wrapper.get_global_val(name),
-			Strategy::RecreateInstance(instance_creator) => {
-				instance_creator.instantiate()?.get_global_val(name)
-			}
+			Strategy::FastInstanceReuse { instance_wrapper, .. } =>
+				instance_wrapper.get_global_val(name),
+			Strategy::RecreateInstance(instance_creator) =>
+				instance_creator.instantiate()?.get_global_val(name),
 		}
 	}
 
@@ -186,10 +190,9 @@ impl WasmInstance for WasmtimeInstance {
 				// We do not keep the wasm instance around, therefore there is no linear memory
 				// associated with it.
 				None
-			}
-			Strategy::FastInstanceReuse {
-				instance_wrapper, ..
-			} => Some(instance_wrapper.base_ptr()),
+			},
+			Strategy::FastInstanceReuse { instance_wrapper, .. } =>
+				Some(instance_wrapper.base_ptr()),
 		}
 	}
 }
@@ -237,9 +240,8 @@ fn common_config(semantics: &Semantics) -> std::result::Result<wasmtime::Config,
 	config.cranelift_opt_level(wasmtime::OptLevel::SpeedAndSize);
 	config.cranelift_nan_canonicalization(semantics.canonicalize_nans);
 
-	if let Some(DeterministicStackLimit {
-		native_stack_max, ..
-	}) = semantics.deterministic_stack_limit
+	if let Some(DeterministicStackLimit { native_stack_max, .. }) =
+		semantics.deterministic_stack_limit
 	{
 		config
 			.max_wasm_stack(native_stack_max as usize)
@@ -411,11 +413,7 @@ pub unsafe fn create_runtime_from_artifact(
 	config: Config,
 	host_functions: Vec<&'static dyn Function>,
 ) -> std::result::Result<WasmtimeRuntime, WasmError> {
-	do_create_runtime(
-		CodeSupplyMode::Artifact { compiled_artifact },
-		config,
-		host_functions,
-	)
+	do_create_runtime(CodeSupplyMode::Artifact { compiled_artifact }, config, host_functions)
 }
 
 /// # Safety
@@ -456,16 +454,13 @@ unsafe fn do_create_runtime(
 				let module = wasmtime::Module::new(&engine, &blob.serialize())
 					.map_err(|e| WasmError::Other(format!("cannot create module: {}", e)))?;
 
-				(module, Some(InstanceSnapshotData {
-					data_segments_snapshot,
-					mutable_globals,
-				}))
+				(module, Some(InstanceSnapshotData { data_segments_snapshot, mutable_globals }))
 			} else {
 				let module = wasmtime::Module::new(&engine, &blob.serialize())
 					.map_err(|e| WasmError::Other(format!("cannot create module: {}", e)))?;
 				(module, None)
 			}
-		}
+		},
 		CodeSupplyMode::Artifact { compiled_artifact } => {
 			// SAFETY: The unsafity of `deserialize` is covered by this function. The
 			//         responsibilities to maintain the invariants are passed to the caller.
@@ -473,16 +468,10 @@ unsafe fn do_create_runtime(
 				.map_err(|e| WasmError::Other(format!("cannot deserialize module: {}", e)))?;
 
 			(module, None)
-		}
+		},
 	};
 
-	Ok(WasmtimeRuntime {
-		module: Arc::new(module),
-		snapshot_data,
-		config,
-		host_functions,
-		engine,
-	})
+	Ok(WasmtimeRuntime { module: Arc::new(module), snapshot_data, config, host_functions, engine })
 }
 
 fn instrument(
diff --git a/client/executor/wasmtime/src/tests.rs b/client/executor/wasmtime/src/tests.rs
index 4066a44194a1..7933578b8049 100644
--- a/client/executor/wasmtime/src/tests.rs
+++ b/client/executor/wasmtime/src/tests.rs
@@ -16,12 +16,9 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use sc_executor_common::{
-	runtime_blob::RuntimeBlob,
-	wasm_runtime::WasmModule,
-};
+use codec::{Decode as _, Encode as _};
+use sc_executor_common::{runtime_blob::RuntimeBlob, wasm_runtime::WasmModule};
 use sc_runtime_test::wasm_binary_unwrap;
-use codec::{Encode as _, Decode as _};
 use std::sync::Arc;
 
 type HostFunctions = sp_io::SubstrateHostFunctions;
@@ -68,7 +65,7 @@ impl RuntimeBuilder {
 				Some(wat) => {
 					wasm = wat::parse_str(wat).unwrap();
 					&wasm
-				}
+				},
 			};
 
 			RuntimeBlob::uncompress_if_needed(&wasm)
@@ -83,21 +80,20 @@ impl RuntimeBuilder {
 				cache_path: None,
 				semantics: crate::Semantics {
 					fast_instance_reuse: self.fast_instance_reuse,
-					deterministic_stack_limit:
-						match self.deterministic_stack {
-							true => Some(crate::DeterministicStackLimit {
-								logical_max: 65536,
-								native_stack_max: 256 * 1024 * 1024,
-							}),
-							false => None,
-						},
+					deterministic_stack_limit: match self.deterministic_stack {
+						true => Some(crate::DeterministicStackLimit {
+							logical_max: 65536,
+							native_stack_max: 256 * 1024 * 1024,
+						}),
+						false => None,
+					},
 					canonicalize_nans: self.canonicalize_nans,
 				},
 			},
 			{
 				use sp_wasm_interface::HostFunctions as _;
 				HostFunctions::host_functions()
-			}
+			},
 		)
 		.expect("cannot create runtime");
 
@@ -113,9 +109,7 @@ fn test_nan_canonicalization() {
 		builder.build()
 	};
 
-	let instance = runtime
-		.new_instance()
-		.expect("failed to instantiate a runtime");
+	let instance = runtime.new_instance().expect("failed to instantiate a runtime");
 
 	/// A NaN with canonical payload bits.
 	const CANONICAL_NAN_BITS: u32 = 0x7fc00000;
@@ -142,10 +136,7 @@ fn test_nan_canonicalization() {
 
 	let params = (u32::to_le_bytes(ARBITRARY_NAN_BITS), u32::to_le_bytes(1)).encode();
 	let res = {
-		let raw_result = instance.call_export(
-			"test_fp_f32add",
-			&params,
-		).unwrap();
+		let raw_result = instance.call_export("test_fp_f32add", &params).unwrap();
 		u32::from_le_bytes(<[u8; 4]>::decode(&mut &raw_result[..]).unwrap())
 	};
 	assert_eq!(res, CANONICAL_NAN_BITS);
@@ -161,9 +152,7 @@ fn test_stack_depth_reaching() {
 		builder.deterministic_stack(true);
 		builder.build()
 	};
-	let instance = runtime
-		.new_instance()
-		.expect("failed to instantiate a runtime");
+	let instance = runtime.new_instance().expect("failed to instantiate a runtime");
 
 	let err = instance.call_export("test-many-locals", &[]).unwrap_err();
 
diff --git a/client/finality-grandpa-warp-sync/src/lib.rs b/client/finality-grandpa-warp-sync/src/lib.rs
index c0ef93e625fd..c74c4d15f9f4 100644
--- a/client/finality-grandpa-warp-sync/src/lib.rs
+++ b/client/finality-grandpa-warp-sync/src/lib.rs
@@ -17,17 +17,20 @@
 //! Helper for handling (i.e. answering) grandpa warp sync requests from a remote peer.
 
 use codec::{Decode, Encode};
-use sc_network::config::{IncomingRequest, OutgoingResponse, ProtocolId, RequestResponseConfig};
-use sc_client_api::Backend;
-use sp_runtime::traits::NumberFor;
-use futures::channel::{mpsc, oneshot};
-use futures::stream::StreamExt;
+use futures::{
+	channel::{mpsc, oneshot},
+	stream::StreamExt,
+};
 use log::debug;
-use sp_runtime::traits::Block as BlockT;
-use std::time::Duration;
-use std::sync::Arc;
-use sc_service::{SpawnTaskHandle, config::{Configuration, Role}};
+use sc_client_api::Backend;
 use sc_finality_grandpa::SharedAuthoritySet;
+use sc_network::config::{IncomingRequest, OutgoingResponse, ProtocolId, RequestResponseConfig};
+use sc_service::{
+	config::{Configuration, Role},
+	SpawnTaskHandle,
+};
+use sp_runtime::traits::{Block as BlockT, NumberFor};
+use std::{sync::Arc, time::Duration};
 
 mod proof;
 
@@ -50,11 +53,8 @@ where
 		generate_request_response_config(protocol_id.clone())
 	} else {
 		// Allow both outgoing and incoming requests.
-		let (handler, request_response_config) = GrandpaWarpSyncRequestHandler::new(
-			protocol_id.clone(),
-			backend.clone(),
-			authority_set,
-		);
+		let (handler, request_response_config) =
+			GrandpaWarpSyncRequestHandler::new(protocol_id.clone(), backend.clone(), authority_set);
 		spawn_handle.spawn("grandpa-warp-sync", handler.run());
 		request_response_config
 	}
@@ -108,12 +108,7 @@ impl<TBlock: BlockT, TBackend: Backend<TBlock>> GrandpaWarpSyncRequestHandler<TB
 		request_response_config.inbound_queue = Some(tx);
 
 		(
-			Self {
-				backend,
-				request_receiver,
-				_phantom: std::marker::PhantomData,
-				authority_set,
-			},
+			Self { backend, request_receiver, _phantom: std::marker::PhantomData, authority_set },
 			request_response_config,
 		)
 	}
@@ -123,7 +118,8 @@ impl<TBlock: BlockT, TBackend: Backend<TBlock>> GrandpaWarpSyncRequestHandler<TB
 		payload: Vec<u8>,
 		pending_response: oneshot::Sender<OutgoingResponse>,
 	) -> Result<(), HandleRequestError>
-		where NumberFor<TBlock>: sc_finality_grandpa::BlockNumberOps,
+	where
+		NumberFor<TBlock>: sc_finality_grandpa::BlockNumberOps,
 	{
 		let request = Request::<TBlock>::decode(&mut &payload[..])?;
 
@@ -133,26 +129,29 @@ impl<TBlock: BlockT, TBackend: Backend<TBlock>> GrandpaWarpSyncRequestHandler<TB
 			&self.authority_set.authority_set_changes(),
 		)?;
 
-		pending_response.send(OutgoingResponse {
-			result: Ok(proof.encode()),
-			reputation_changes: Vec::new(),
-			sent_feedback: None,
-		}).map_err(|_| HandleRequestError::SendResponse)
+		pending_response
+			.send(OutgoingResponse {
+				result: Ok(proof.encode()),
+				reputation_changes: Vec::new(),
+				sent_feedback: None,
+			})
+			.map_err(|_| HandleRequestError::SendResponse)
 	}
 
 	/// Run [`GrandpaWarpSyncRequestHandler`].
 	pub async fn run(mut self)
-		where NumberFor<TBlock>: sc_finality_grandpa::BlockNumberOps,
+	where
+		NumberFor<TBlock>: sc_finality_grandpa::BlockNumberOps,
 	{
 		while let Some(request) = self.request_receiver.next().await {
 			let IncomingRequest { peer, payload, pending_response } = request;
 
 			match self.handle_request(payload, pending_response) {
-				Ok(()) => debug!(target: LOG_TARGET, "Handled grandpa warp sync request from {}.", peer),
+				Ok(()) =>
+					debug!(target: LOG_TARGET, "Handled grandpa warp sync request from {}.", peer),
 				Err(e) => debug!(
 					target: LOG_TARGET,
-					"Failed to handle grandpa warp sync request from {}: {}",
-					peer, e,
+					"Failed to handle grandpa warp sync request from {}: {}", peer, e,
 				),
 			}
 		}
diff --git a/client/finality-grandpa-warp-sync/src/proof.rs b/client/finality-grandpa-warp-sync/src/proof.rs
index 87a622026782..d2484a800e63 100644
--- a/client/finality-grandpa-warp-sync/src/proof.rs
+++ b/client/finality-grandpa-warp-sync/src/proof.rs
@@ -72,7 +72,7 @@ impl<Block: BlockT> WarpSyncProof<Block> {
 		if begin_number > blockchain.info().finalized_number {
 			return Err(HandleRequestError::InvalidRequest(
 				"Start block is not finalized".to_string(),
-			));
+			))
 		}
 
 		let canon_hash = blockchain.hash(begin_number)?.expect(
@@ -84,15 +84,15 @@ impl<Block: BlockT> WarpSyncProof<Block> {
 		if canon_hash != begin {
 			return Err(HandleRequestError::InvalidRequest(
 				"Start block is not in the finalized chain".to_string(),
-			));
+			))
 		}
 
 		let mut proofs = Vec::new();
 		let mut proofs_encoded_len = 0;
 		let mut proof_limit_reached = false;
 
-		let set_changes = set_changes.iter_from(begin_number)
-			.ok_or(HandleRequestError::MissingData)?;
+		let set_changes =
+			set_changes.iter_from(begin_number).ok_or(HandleRequestError::MissingData)?;
 
 		for (_, last_block) in set_changes {
 			let header = blockchain.header(BlockId::Number(*last_block))?.expect(
@@ -105,7 +105,7 @@ impl<Block: BlockT> WarpSyncProof<Block> {
 				// if it doesn't contain a signal for standard change then the set must have changed
 				// through a forced changed, in which case we stop collecting proofs as the chain of
 				// trust in authority handoffs was broken.
-				break;
+				break
 			}
 
 			let justification = blockchain
@@ -119,10 +119,7 @@ impl<Block: BlockT> WarpSyncProof<Block> {
 
 			let justification = GrandpaJustification::<Block>::decode(&mut &justification[..])?;
 
-			let proof = WarpSyncFragment {
-				header: header.clone(),
-				justification,
-			};
+			let proof = WarpSyncFragment { header: header.clone(), justification };
 			let proof_size = proof.encoded_size();
 
 			// Check for the limit. We remove some bytes from the maximum size, because we're only
@@ -130,7 +127,7 @@ impl<Block: BlockT> WarpSyncProof<Block> {
 			// room for rest of the data (the size of the `Vec` and the boolean).
 			if proofs_encoded_len + proof_size >= MAX_WARP_SYNC_PROOF_SIZE - 50 {
 				proof_limit_reached = true;
-				break;
+				break
 			}
 
 			proofs_encoded_len += proof_size;
@@ -158,19 +155,13 @@ impl<Block: BlockT> WarpSyncProof<Block> {
 				let header = blockchain.header(BlockId::Hash(latest_justification.target().1))?
 					.expect("header hash corresponds to a justification in db; must exist in db as well; qed.");
 
-				proofs.push(WarpSyncFragment {
-					header,
-					justification: latest_justification,
-				})
+				proofs.push(WarpSyncFragment { header, justification: latest_justification })
 			}
 
 			true
 		};
 
-		let final_outcome = WarpSyncProof {
-			proofs,
-			is_finished,
-		};
+		let final_outcome = WarpSyncProof { proofs, is_finished };
 		debug_assert!(final_outcome.encoded_size() <= MAX_WARP_SYNC_PROOF_SIZE);
 		Ok(final_outcome)
 	}
@@ -196,8 +187,8 @@ impl<Block: BlockT> WarpSyncProof<Block> {
 
 			if proof.justification.target().1 != proof.header.hash() {
 				return Err(HandleRequestError::InvalidProof(
-					"mismatch between header and justification".to_owned()
-				));
+					"mismatch between header and justification".to_owned(),
+				))
 			}
 
 			if let Some(scheduled_change) = find_scheduled_change::<Block>(&proof.header) {
@@ -208,7 +199,7 @@ impl<Block: BlockT> WarpSyncProof<Block> {
 				// set change.
 				return Err(HandleRequestError::InvalidProof(
 					"Header is missing authority set change digest".to_string(),
-				));
+				))
 			}
 		}
 
@@ -249,12 +240,7 @@ mod tests {
 		let mut authority_set_changes = Vec::new();
 
 		for n in 1..=100 {
-			let mut block = client
-				.new_block(Default::default())
-				.unwrap()
-				.build()
-				.unwrap()
-				.block;
+			let mut block = client.new_block(Default::default()).unwrap().build().unwrap().block;
 
 			let mut new_authorities = None;
 
@@ -277,10 +263,7 @@ mod tests {
 				let digest = sp_runtime::generic::DigestItem::Consensus(
 					sp_finality_grandpa::GRANDPA_ENGINE_ID,
 					sp_finality_grandpa::ConsensusLog::ScheduledChange(
-						sp_finality_grandpa::ScheduledChange {
-							delay: 0u64,
-							next_authorities,
-						},
+						sp_finality_grandpa::ScheduledChange { delay: 0u64, next_authorities },
 					)
 					.encode(),
 				);
@@ -300,10 +283,7 @@ mod tests {
 
 				let mut precommits = Vec::new();
 				for keyring in &current_authorities {
-					let precommit = finality_grandpa::Precommit {
-						target_hash,
-						target_number,
-					};
+					let precommit = finality_grandpa::Precommit { target_hash, target_number };
 
 					let msg = finality_grandpa::Message::Precommit(precommit.clone());
 					let encoded = sp_finality_grandpa::localized_payload(42, current_set_id, &msg);
@@ -318,18 +298,14 @@ mod tests {
 					precommits.push(precommit);
 				}
 
-				let commit = finality_grandpa::Commit {
-					target_hash,
-					target_number,
-					precommits,
-				};
+				let commit = finality_grandpa::Commit { target_hash, target_number, precommits };
 
 				let justification = GrandpaJustification::from_commit(&client, 42, commit).unwrap();
 
 				client
 					.finalize_block(
 						BlockId::Hash(target_hash),
-						Some((GRANDPA_ENGINE_ID, justification.encode()))
+						Some((GRANDPA_ENGINE_ID, justification.encode())),
 					)
 					.unwrap();
 
diff --git a/client/finality-grandpa/rpc/src/finality.rs b/client/finality-grandpa/rpc/src/finality.rs
index cfd8f68e5ce6..62e3502fc718 100644
--- a/client/finality-grandpa/rpc/src/finality.rs
+++ b/client/finality-grandpa/rpc/src/finality.rs
@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 use sc_finality_grandpa::FinalityProofProvider;
 use sp_runtime::traits::{Block as BlockT, NumberFor};
@@ -44,7 +44,6 @@ where
 		&self,
 		block: NumberFor<Block>,
 	) -> Result<Option<EncodedFinalityProof>, sc_finality_grandpa::FinalityProofError> {
-		self.prove_finality(block)
-			.map(|x| x.map(|y| EncodedFinalityProof(y.into())))
+		self.prove_finality(block).map(|x| x.map(|y| EncodedFinalityProof(y.into())))
 	}
 }
diff --git a/client/finality-grandpa/rpc/src/lib.rs b/client/finality-grandpa/rpc/src/lib.rs
index 2e7354e5fda6..42d8630d10f8 100644
--- a/client/finality-grandpa/rpc/src/lib.rs
+++ b/client/finality-grandpa/rpc/src/lib.rs
@@ -19,17 +19,16 @@
 //! RPC API for GRANDPA.
 #![warn(missing_docs)]
 
-use std::sync::Arc;
-use futures::{FutureExt, TryFutureExt, TryStreamExt, StreamExt};
-use log::warn;
-use jsonrpc_derive::rpc;
-use jsonrpc_pubsub::{typed::Subscriber, SubscriptionId, manager::SubscriptionManager};
+use futures::{FutureExt, StreamExt, TryFutureExt, TryStreamExt};
 use jsonrpc_core::futures::{
+	future::{Executor as Executor01, Future as Future01},
 	sink::Sink as Sink01,
 	stream::Stream as Stream01,
-	future::Future as Future01,
-	future::Executor as Executor01,
 };
+use jsonrpc_derive::rpc;
+use jsonrpc_pubsub::{manager::SubscriptionManager, typed::Subscriber, SubscriptionId};
+use log::warn;
+use std::sync::Arc;
 
 mod error;
 mod finality;
@@ -40,8 +39,8 @@ use sc_finality_grandpa::GrandpaJustificationStream;
 use sp_runtime::traits::{Block as BlockT, NumberFor};
 
 use finality::{EncodedFinalityProof, RpcFinalityProofProvider};
-use report::{ReportAuthoritySet, ReportVoterState, ReportedRoundStates};
 use notification::JustificationNotification;
+use report::{ReportAuthoritySet, ReportVoterState, ReportedRoundStates};
 
 type FutureResult<T> =
 	Box<dyn jsonrpc_core::futures::Future<Item = T, Error = jsonrpc_core::Error> + Send>;
@@ -67,7 +66,7 @@ pub trait GrandpaApi<Notification, Hash, Number> {
 	fn subscribe_justifications(
 		&self,
 		metadata: Self::Metadata,
-		subscriber: Subscriber<Notification>
+		subscriber: Subscriber<Notification>,
 	);
 
 	/// Unsubscribe from receiving notifications about recently finalized blocks.
@@ -79,16 +78,13 @@ pub trait GrandpaApi<Notification, Hash, Number> {
 	fn unsubscribe_justifications(
 		&self,
 		metadata: Option<Self::Metadata>,
-		id: SubscriptionId
+		id: SubscriptionId,
 	) -> jsonrpc_core::Result<bool>;
 
 	/// Prove finality for the given block number by returning the Justification for the last block
 	/// in the set and all the intermediary headers to link them together.
 	#[rpc(name = "grandpa_proveFinality")]
-	fn prove_finality(
-		&self,
-		block: Number,
-	) -> FutureResult<Option<EncodedFinalityProof>>;
+	fn prove_finality(&self, block: Number) -> FutureResult<Option<EncodedFinalityProof>>;
 }
 
 /// Implements the GrandpaApi RPC trait for interacting with GRANDPA.
@@ -115,13 +111,7 @@ impl<AuthoritySet, VoterState, Block: BlockT, ProofProvider>
 		E: Executor01<Box<dyn Future01<Item = (), Error = ()> + Send>> + Send + Sync + 'static,
 	{
 		let manager = SubscriptionManager::new(Arc::new(executor));
-		Self {
-			authority_set,
-			voter_state,
-			justification_stream,
-			manager,
-			finality_proof_provider,
-		}
+		Self { authority_set, voter_state, justification_stream, manager, finality_proof_provider }
 	}
 }
 
@@ -145,10 +135,12 @@ where
 	fn subscribe_justifications(
 		&self,
 		_metadata: Self::Metadata,
-		subscriber: Subscriber<JustificationNotification>
+		subscriber: Subscriber<JustificationNotification>,
 	) {
-		let stream = self.justification_stream.subscribe()
-			.map(|x| Ok::<_,()>(JustificationNotification::from(x)))
+		let stream = self
+			.justification_stream
+			.subscribe()
+			.map(|x| Ok::<_, ()>(JustificationNotification::from(x)))
 			.map_err(|e| warn!("Notification stream error: {:?}", e))
 			.compat();
 
@@ -163,7 +155,7 @@ where
 	fn unsubscribe_justifications(
 		&self,
 		_metadata: Option<Self::Metadata>,
-		id: SubscriptionId
+		id: SubscriptionId,
 	) -> jsonrpc_core::Result<bool> {
 		Ok(self.manager.cancel(id))
 	}
@@ -181,7 +173,7 @@ where
 					error::Error::ProveFinalityFailed(e)
 				})
 				.map_err(jsonrpc_core::Error::from)
-				.compat()
+				.compat(),
 		)
 	}
 }
@@ -189,14 +181,13 @@ where
 #[cfg(test)]
 mod tests {
 	use super::*;
+	use jsonrpc_core::{types::Params, Notification, Output};
 	use std::{collections::HashSet, convert::TryInto, sync::Arc};
-	use jsonrpc_core::{Notification, Output, types::Params};
 
-	use parity_scale_codec::{Encode, Decode};
+	use parity_scale_codec::{Decode, Encode};
 	use sc_block_builder::{BlockBuilder, RecordProof};
 	use sc_finality_grandpa::{
-		report, AuthorityId, GrandpaJustificationSender, GrandpaJustification,
-		FinalityProof,
+		report, AuthorityId, FinalityProof, GrandpaJustification, GrandpaJustificationSender,
 	};
 	use sp_blockchain::HeaderBackend;
 	use sp_core::crypto::Public;
@@ -204,9 +195,7 @@ mod tests {
 	use sp_runtime::traits::{Block as BlockT, Header as HeaderT};
 	use substrate_test_runtime_client::{
 		runtime::{Block, Header, H256},
-		DefaultTestClientBuilderExt,
-		TestClientBuilderExt,
-		TestClientBuilder,
+		DefaultTestClientBuilderExt, TestClientBuilder, TestClientBuilderExt,
 	};
 
 	struct TestAuthoritySet;
@@ -253,14 +242,14 @@ mod tests {
 	impl<Block: BlockT> RpcFinalityProofProvider<Block> for TestFinalityProofProvider {
 		fn rpc_prove_finality(
 			&self,
-			_block: NumberFor<Block>
+			_block: NumberFor<Block>,
 		) -> Result<Option<EncodedFinalityProof>, sc_finality_grandpa::FinalityProofError> {
 			Ok(Some(EncodedFinalityProof(
 				self.finality_proof
 					.as_ref()
 					.expect("Don't call rpc_prove_finality without setting the FinalityProof")
 					.encode()
-					.into()
+					.into(),
 			)))
 		}
 	}
@@ -290,17 +279,14 @@ mod tests {
 
 			let background_rounds = vec![(1, past_round_state)].into_iter().collect();
 
-			Some(report::VoterState {
-				background_rounds,
-				best_round: (2, best_round_state),
-			})
+			Some(report::VoterState { background_rounds, best_round: (2, best_round_state) })
 		}
 	}
 
-	fn setup_io_handler<VoterState>(voter_state: VoterState) -> (
-		jsonrpc_core::MetaIoHandler<sc_rpc::Metadata>,
-		GrandpaJustificationSender<Block>,
-	) where
+	fn setup_io_handler<VoterState>(
+		voter_state: VoterState,
+	) -> (jsonrpc_core::MetaIoHandler<sc_rpc::Metadata>, GrandpaJustificationSender<Block>)
+	where
 		VoterState: ReportVoterState + Send + Sync + 'static,
 	{
 		setup_io_handler_with_finality_proofs(voter_state, None)
@@ -309,10 +295,8 @@ mod tests {
 	fn setup_io_handler_with_finality_proofs<VoterState>(
 		voter_state: VoterState,
 		finality_proof: Option<FinalityProof<Header>>,
-	) -> (
-		jsonrpc_core::MetaIoHandler<sc_rpc::Metadata>,
-		GrandpaJustificationSender<Block>,
-	) where
+	) -> (jsonrpc_core::MetaIoHandler<sc_rpc::Metadata>, GrandpaJustificationSender<Block>)
+	where
 		VoterState: ReportVoterState + Send + Sync + 'static,
 	{
 		let (justification_sender, justification_stream) = GrandpaJustificationStream::channel();
@@ -345,7 +329,7 @@ mod tests {
 
 	#[test]
 	fn working_rpc_handler() {
-		let (io,  _) = setup_io_handler(TestVoterState);
+		let (io, _) = setup_io_handler(TestVoterState);
 
 		let request = r#"{"jsonrpc":"2.0","method":"grandpa_roundState","params":[],"id":1}"#;
 		let response = "{\"jsonrpc\":\"2.0\",\"result\":{\
@@ -378,7 +362,8 @@ mod tests {
 		let (meta, _) = setup_session();
 
 		// Subscribe
-		let sub_request = r#"{"jsonrpc":"2.0","method":"grandpa_subscribeJustifications","params":[],"id":1}"#;
+		let sub_request =
+			r#"{"jsonrpc":"2.0","method":"grandpa_subscribeJustifications","params":[],"id":1}"#;
 		let resp = io.handle_request_sync(sub_request, meta.clone());
 		let resp: Output = serde_json::from_str(&resp.unwrap()).unwrap();
 
@@ -410,7 +395,8 @@ mod tests {
 		let (meta, _) = setup_session();
 
 		// Subscribe
-		let sub_request = r#"{"jsonrpc":"2.0","method":"grandpa_subscribeJustifications","params":[],"id":1}"#;
+		let sub_request =
+			r#"{"jsonrpc":"2.0","method":"grandpa_subscribeJustifications","params":[],"id":1}"#;
 		let resp = io.handle_request_sync(sub_request, meta.clone());
 		let resp: Output = serde_json::from_str(&resp.unwrap()).unwrap();
 		assert!(matches!(resp, Output::Success(_)));
@@ -440,7 +426,10 @@ mod tests {
 			RecordProof::No,
 			Default::default(),
 			&*backend,
-		).unwrap().build().unwrap();
+		)
+		.unwrap()
+		.build()
+		.unwrap();
 
 		let block = built_block.block;
 		let block_hash = block.hash();
@@ -501,8 +490,7 @@ mod tests {
 			_ => panic!(),
 		};
 
-		let recv_sub_id: String =
-			serde_json::from_value(json_map["subscription"].take()).unwrap();
+		let recv_sub_id: String = serde_json::from_value(json_map["subscription"].take()).unwrap();
 		let recv_justification: sp_core::Bytes =
 			serde_json::from_value(json_map["result"].take()).unwrap();
 		let recv_justification: GrandpaJustification<Block> =
@@ -520,10 +508,8 @@ mod tests {
 			justification: create_justification().encode(),
 			unknown_headers: vec![header(2)],
 		};
-		let (io,  _) = setup_io_handler_with_finality_proofs(
-			TestVoterState,
-			Some(finality_proof.clone()),
-		);
+		let (io, _) =
+			setup_io_handler_with_finality_proofs(TestVoterState, Some(finality_proof.clone()));
 
 		let request =
 			"{\"jsonrpc\":\"2.0\",\"method\":\"grandpa_proveFinality\",\"params\":[42],\"id\":1}";
diff --git a/client/finality-grandpa/rpc/src/notification.rs b/client/finality-grandpa/rpc/src/notification.rs
index 4c9141be3631..68944e903e0f 100644
--- a/client/finality-grandpa/rpc/src/notification.rs
+++ b/client/finality-grandpa/rpc/src/notification.rs
@@ -16,10 +16,10 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use serde::{Serialize, Deserialize};
 use parity_scale_codec::Encode;
-use sp_runtime::traits::Block as BlockT;
 use sc_finality_grandpa::GrandpaJustification;
+use serde::{Deserialize, Serialize};
+use sp_runtime::traits::Block as BlockT;
 
 /// An encoded justification proving that the given header has been finalized
 #[derive(Clone, Serialize, Deserialize)]
diff --git a/client/finality-grandpa/rpc/src/report.rs b/client/finality-grandpa/rpc/src/report.rs
index 0482d90f58f0..fef8f2265995 100644
--- a/client/finality-grandpa/rpc/src/report.rs
+++ b/client/finality-grandpa/rpc/src/report.rs
@@ -44,11 +44,8 @@ where
 	H: Clone + Debug + Eq,
 {
 	fn get(&self) -> (u64, HashSet<AuthorityId>) {
-		let current_voters: HashSet<AuthorityId> = self
-			.current_authorities()
-			.iter()
-			.map(|p| p.0.clone())
-			.collect();
+		let current_voters: HashSet<AuthorityId> =
+			self.current_authorities().iter().map(|p| p.0.clone()).collect();
 
 		(self.set_id(), current_voters)
 	}
@@ -152,10 +149,6 @@ impl ReportedRoundStates {
 			.map(|(round, round_state)| RoundState::from(*round, round_state, &current_voters))
 			.collect::<Result<Vec<_>, Error>>()?;
 
-		Ok(Self {
-			set_id,
-			best,
-			background,
-		})
+		Ok(Self { set_id, best, background })
 	}
 }
diff --git a/client/finality-grandpa/src/authorities.rs b/client/finality-grandpa/src/authorities.rs
index a04be72f9d31..60a347acc35b 100644
--- a/client/finality-grandpa/src/authorities.rs
+++ b/client/finality-grandpa/src/authorities.rs
@@ -18,18 +18,16 @@
 
 //! Utilities for dealing with authorities, authority sets, and handoffs.
 
-use std::cmp::Ord;
-use std::fmt::Debug;
-use std::ops::Add;
+use std::{cmp::Ord, fmt::Debug, ops::Add};
 
-use fork_tree::ForkTree;
-use parking_lot::MappedMutexGuard;
 use finality_grandpa::voter_set::VoterSet;
-use parity_scale_codec::{Encode, Decode};
+use fork_tree::ForkTree;
 use log::debug;
+use parity_scale_codec::{Decode, Encode};
+use parking_lot::MappedMutexGuard;
+use sc_consensus::shared_data::{SharedData, SharedDataLocked};
 use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_INFO};
 use sp_finality_grandpa::{AuthorityId, AuthorityList};
-use sc_consensus::shared_data::{SharedData, SharedDataLocked};
 
 use crate::SetId;
 
@@ -77,9 +75,7 @@ pub struct SharedAuthoritySet<H, N> {
 
 impl<H, N> Clone for SharedAuthoritySet<H, N> {
 	fn clone(&self) -> Self {
-		SharedAuthoritySet {
-			inner: self.inner.clone(),
-		}
+		SharedAuthoritySet { inner: self.inner.clone() }
 	}
 }
 
@@ -92,16 +88,15 @@ impl<H, N> SharedAuthoritySet<H, N> {
 	/// Returns access to the [`AuthoritySet`] and locks it.
 	///
 	/// For more information see [`SharedDataLocked`].
-	pub(crate) fn inner_locked(
-		&self,
-	) -> SharedDataLocked<AuthoritySet<H, N>> {
+	pub(crate) fn inner_locked(&self) -> SharedDataLocked<AuthoritySet<H, N>> {
 		self.inner.shared_data_locked()
 	}
 }
 
 impl<H: Eq, N> SharedAuthoritySet<H, N>
-where N: Add<Output=N> + Ord + Clone + Debug,
-	  H: Clone + Debug
+where
+	N: Add<Output = N> + Ord + Clone + Debug,
+	H: Clone + Debug,
 {
 	/// Get the earliest limit-block number that's higher or equal to the given
 	/// min number, if any.
@@ -136,9 +131,7 @@ where N: Add<Output=N> + Ord + Clone + Debug,
 
 impl<H, N> From<AuthoritySet<H, N>> for SharedAuthoritySet<H, N> {
 	fn from(set: AuthoritySet<H, N>) -> Self {
-		SharedAuthoritySet {
-			inner: SharedData::new(set),
-		}
+		SharedAuthoritySet { inner: SharedData::new(set) }
 	}
 }
 
@@ -191,7 +184,7 @@ where
 	/// Get a genesis set with given authorities.
 	pub(crate) fn genesis(initial: AuthorityList) -> Option<Self> {
 		if Self::invalid_authority_list(&initial) {
-			return None;
+			return None
 		}
 
 		Some(AuthoritySet {
@@ -212,7 +205,7 @@ where
 		authority_set_changes: AuthoritySetChanges<N>,
 	) -> Option<Self> {
 		if Self::invalid_authority_list(&authorities) {
-			return None;
+			return None
 		}
 
 		Some(AuthoritySet {
@@ -255,7 +248,7 @@ where
 		for change in &self.pending_forced_changes {
 			if is_descendent_of(&change.canon_hash, best_hash)? {
 				forced = Some((change.canon_hash.clone(), change.canon_height.clone()));
-				break;
+				break
 			}
 		}
 
@@ -263,16 +256,13 @@ where
 		for (_, _, change) in self.pending_standard_changes.roots() {
 			if is_descendent_of(&change.canon_hash, best_hash)? {
 				standard = Some((change.canon_hash.clone(), change.canon_height.clone()));
-				break;
+				break
 			}
 		}
 
 		let earliest = match (forced, standard) {
-			(Some(forced), Some(standard)) => Some(if forced.1 < standard.1 {
-				forced
-			} else {
-				standard
-			}),
+			(Some(forced), Some(standard)) =>
+				Some(if forced.1 < standard.1 { forced } else { standard }),
 			(Some(forced), None) => Some(forced),
 			(None, Some(standard)) => Some(standard),
 			(None, None) => None,
@@ -300,12 +290,7 @@ where
 			pending.delay,
 		);
 
-		self.pending_standard_changes.import(
-			hash,
-			number,
-			pending,
-			is_descendent_of,
-		)?;
+		self.pending_standard_changes.import(hash, number, pending, is_descendent_of)?;
 
 		debug!(
 			target: "afg",
@@ -329,21 +314,21 @@ where
 	{
 		for change in &self.pending_forced_changes {
 			if change.canon_hash == pending.canon_hash {
-				return Err(Error::DuplicateAuthoritySetChange);
+				return Err(Error::DuplicateAuthoritySetChange)
 			}
 
 			if is_descendent_of(&change.canon_hash, &pending.canon_hash)? {
-				return Err(Error::MultiplePendingForcedAuthoritySetChanges);
+				return Err(Error::MultiplePendingForcedAuthoritySetChanges)
 			}
 		}
 
 		// ordered first by effective number and then by signal-block number.
 		let key = (pending.effective_number(), pending.canon_height.clone());
-		let idx = self.pending_forced_changes
-			.binary_search_by_key(&key, |change| (
-				change.effective_number(),
-				change.canon_height.clone(),
-			))
+		let idx = self
+			.pending_forced_changes
+			.binary_search_by_key(&key, |change| {
+				(change.effective_number(), change.canon_height.clone())
+			})
 			.unwrap_or_else(|i| i);
 
 		debug!(
@@ -376,24 +361,22 @@ where
 		E: std::error::Error,
 	{
 		if Self::invalid_authority_list(&pending.next_authorities) {
-			return Err(Error::InvalidAuthoritySet);
+			return Err(Error::InvalidAuthoritySet)
 		}
 
 		match pending.delay_kind {
-			DelayKind::Best { .. } => {
-				self.add_forced_change(pending, is_descendent_of)
-			},
-			DelayKind::Finalized => {
-				self.add_standard_change(pending, is_descendent_of)
-			},
+			DelayKind::Best { .. } => self.add_forced_change(pending, is_descendent_of),
+			DelayKind::Finalized => self.add_standard_change(pending, is_descendent_of),
 		}
 	}
 
 	/// Inspect pending changes. Standard pending changes are iterated first,
 	/// and the changes in the tree are traversed in pre-order, afterwards all
 	/// forced changes are iterated.
-	pub(crate) fn pending_changes(&self) -> impl Iterator<Item=&PendingChange<H, N>> {
-		self.pending_standard_changes.iter().map(|(_, _, c)| c)
+	pub(crate) fn pending_changes(&self) -> impl Iterator<Item = &PendingChange<H, N>> {
+		self.pending_standard_changes
+			.iter()
+			.map(|(_, _, c)| c)
 			.chain(self.pending_forced_changes.iter())
 	}
 
@@ -404,7 +387,8 @@ where
 	/// Only standard changes are taken into account for the current
 	/// limit, since any existing forced change should preclude the voter from voting.
 	pub(crate) fn current_limit(&self, min: N) -> Option<N> {
-		self.pending_standard_changes.roots()
+		self.pending_standard_changes
+			.roots()
 			.filter(|&(_, _, c)| c.effective_number() >= min)
 			.min_by_key(|&(_, _, c)| c.effective_number())
 			.map(|(_, _, c)| c.effective_number())
@@ -450,9 +434,7 @@ where
 			// the block that signaled the change.
 			if change.canon_hash == best_hash || is_descendent_of(&change.canon_hash, &best_hash)? {
 				let median_last_finalized = match change.delay_kind {
-					DelayKind::Best {
-						ref median_last_finalized,
-					} => median_last_finalized.clone(),
+					DelayKind::Best { ref median_last_finalized } => median_last_finalized.clone(),
 					_ => unreachable!(
 						"pending_forced_changes only contains forced changes; forced changes have delay kind Best; qed."
 					),
@@ -460,8 +442,8 @@ where
 
 				// check if there's any pending standard change that we depend on
 				for (_, _, standard_change) in self.pending_standard_changes.roots() {
-					if standard_change.effective_number() <= median_last_finalized
-						&& is_descendent_of(&standard_change.canon_hash, &change.canon_hash)?
+					if standard_change.effective_number() <= median_last_finalized &&
+						is_descendent_of(&standard_change.canon_hash, &change.canon_hash)?
 					{
 						log::info!(target: "afg",
 							"Not applying authority set change forced at block #{:?}, due to pending standard change at block #{:?}",
@@ -469,11 +451,9 @@ where
 							standard_change.effective_number(),
 						);
 
-						return Err(
-							Error::ForcedAuthoritySetChangeDependencyUnsatisfied(
-								standard_change.effective_number()
-							)
-						);
+						return Err(Error::ForcedAuthoritySetChangeDependencyUnsatisfied(
+							standard_change.effective_number(),
+						))
 					}
 				}
 
@@ -505,7 +485,7 @@ where
 					},
 				));
 
-				break;
+				break
 			}
 		}
 
@@ -536,24 +516,19 @@ where
 		F: Fn(&H, &H) -> Result<bool, E>,
 		E: std::error::Error,
 	{
-		let mut status = Status {
-			changed: false,
-			new_set_block: None,
-		};
+		let mut status = Status { changed: false, new_set_block: None };
 
 		match self.pending_standard_changes.finalize_with_descendent_if(
 			&finalized_hash,
 			finalized_number.clone(),
 			is_descendent_of,
-			|change| change.effective_number() <= finalized_number
+			|change| change.effective_number() <= finalized_number,
 		)? {
 			fork_tree::FinalizationResult::Changed(change) => {
 				status.changed = true;
 
-				let pending_forced_changes = std::mem::replace(
-					&mut self.pending_forced_changes,
-					Vec::new(),
-				);
+				let pending_forced_changes =
+					std::mem::replace(&mut self.pending_forced_changes, Vec::new());
 
 				// we will keep all forced changes for any later blocks and that are a
 				// descendent of the finalized block (i.e. they are part of this branch).
@@ -566,7 +541,8 @@ where
 				}
 
 				if let Some(change) = change {
-					afg_log!(initial_sync,
+					afg_log!(
+						initial_sync,
 						"👴 Applying authority set change scheduled at block #{:?}",
 						change.canon_height,
 					);
@@ -583,10 +559,7 @@ where
 					self.current_authorities = change.next_authorities;
 					self.set_id += 1;
 
-					status.new_set_block = Some((
-						finalized_hash,
-						finalized_number,
-					));
+					status.new_set_block = Some((finalized_hash, finalized_number));
 				}
 			},
 			fork_tree::FinalizationResult::Unchanged => {},
@@ -615,12 +588,14 @@ where
 		F: Fn(&H, &H) -> Result<bool, E>,
 		E: std::error::Error,
 	{
-		self.pending_standard_changes.finalizes_any_with_descendent_if(
-			&finalized_hash,
-			finalized_number.clone(),
-			is_descendent_of,
-			|change| change.effective_number() == finalized_number
-		).map_err(Error::ForkTree)
+		self.pending_standard_changes
+			.finalizes_any_with_descendent_if(
+				&finalized_hash,
+				finalized_number.clone(),
+				is_descendent_of,
+				|change| change.effective_number() == finalized_number,
+			)
+			.map_err(Error::ForkTree)
 	}
 }
 
@@ -654,7 +629,9 @@ pub struct PendingChange<H, N> {
 }
 
 impl<H: Decode, N: Decode> Decode for PendingChange<H, N> {
-	fn decode<I: parity_scale_codec::Input>(value: &mut I) -> Result<Self, parity_scale_codec::Error> {
+	fn decode<I: parity_scale_codec::Input>(
+		value: &mut I,
+	) -> Result<Self, parity_scale_codec::Error> {
 		let next_authorities = Decode::decode(value)?;
 		let delay = Decode::decode(value)?;
 		let canon_height = Decode::decode(value)?;
@@ -662,17 +639,11 @@ impl<H: Decode, N: Decode> Decode for PendingChange<H, N> {
 
 		let delay_kind = DelayKind::decode(value).unwrap_or(DelayKind::Finalized);
 
-		Ok(PendingChange {
-			next_authorities,
-			delay,
-			canon_height,
-			canon_hash,
-			delay_kind,
-		})
+		Ok(PendingChange { next_authorities, delay, canon_height, canon_hash, delay_kind })
 	}
 }
 
-impl<H, N: Add<Output=N> + Clone> PendingChange<H, N> {
+impl<H, N: Add<Output = N> + Clone> PendingChange<H, N> {
 	/// Returns the effective number this change will be applied at.
 	pub fn effective_number(&self) -> N {
 		self.canon_height.clone() + self.delay.clone()
@@ -715,15 +686,17 @@ impl<N: Ord + Clone> AuthoritySetChanges<N> {
 	}
 
 	pub(crate) fn get_set_id(&self, block_number: N) -> AuthoritySetChangeId<N> {
-		if self.0
+		if self
+			.0
 			.last()
 			.map(|last_auth_change| last_auth_change.1 < block_number)
 			.unwrap_or(false)
 		{
-			return AuthoritySetChangeId::Latest;
+			return AuthoritySetChangeId::Latest
 		}
 
-		let idx = self.0
+		let idx = self
+			.0
 			.binary_search_by_key(&block_number, |(_, n)| n.clone())
 			.unwrap_or_else(|b| b);
 
@@ -732,7 +705,7 @@ impl<N: Ord + Clone> AuthoritySetChanges<N> {
 
 			// if this is the first index but not the first set id then we are missing data.
 			if idx == 0 && set_id != 0 {
-				return AuthoritySetChangeId::Unknown;
+				return AuthoritySetChangeId::Unknown
 			}
 
 			AuthoritySetChangeId::Set(set_id, block_number)
@@ -745,7 +718,9 @@ impl<N: Ord + Clone> AuthoritySetChanges<N> {
 	/// number (excluded). The iterator yields a tuple representing the set id and the block number
 	/// of the last block in that set.
 	pub fn iter_from(&self, block_number: N) -> Option<impl Iterator<Item = &(u64, N)>> {
-		let idx = self.0.binary_search_by_key(&block_number, |(_, n)| n.clone())
+		let idx = self
+			.0
+			.binary_search_by_key(&block_number, |(_, n)| n.clone())
 			// if there was a change at the given block number then we should start on the next
 			// index since we want to exclude the current block number
 			.map(|n| n + 1)
@@ -756,7 +731,7 @@ impl<N: Ord + Clone> AuthoritySetChanges<N> {
 
 			// if this is the first index but not the first set id then we are missing data.
 			if idx == 0 && set_id != 0 {
-				return None;
+				return None
 			}
 		}
 
@@ -769,14 +744,13 @@ mod tests {
 	use super::*;
 	use sp_core::crypto::Public;
 
-	fn static_is_descendent_of<A>(value: bool)
-		-> impl Fn(&A, &A) -> Result<bool, std::io::Error>
-	{
+	fn static_is_descendent_of<A>(value: bool) -> impl Fn(&A, &A) -> Result<bool, std::io::Error> {
 		move |_, _| Ok(value)
 	}
 
 	fn is_descendent_of<A, F>(f: F) -> impl Fn(&A, &A) -> Result<bool, std::io::Error>
-		where F: Fn(&A, &A) -> bool
+	where
+		F: Fn(&A, &A) -> bool,
 	{
 		move |base, hash| Ok(f(base, hash))
 	}
@@ -793,14 +767,12 @@ mod tests {
 			authority_set_changes: AuthoritySetChanges::empty(),
 		};
 
-		let change = |height| {
-			PendingChange {
-				next_authorities: current_authorities.clone(),
-				delay: 0,
-				canon_height: height,
-				canon_hash: height.to_string(),
-				delay_kind: DelayKind::Finalized,
-			}
+		let change = |height| PendingChange {
+			next_authorities: current_authorities.clone(),
+			delay: 0,
+			canon_height: height,
+			canon_hash: height.to_string(),
+			delay_kind: DelayKind::Finalized,
 		};
 
 		let is_descendent_of = static_is_descendent_of(false);
@@ -808,25 +780,13 @@ mod tests {
 		authorities.add_pending_change(change(1), &is_descendent_of).unwrap();
 		authorities.add_pending_change(change(2), &is_descendent_of).unwrap();
 
-		assert_eq!(
-			authorities.current_limit(0),
-			Some(1),
-		);
+		assert_eq!(authorities.current_limit(0), Some(1),);
 
-		assert_eq!(
-			authorities.current_limit(1),
-			Some(1),
-		);
+		assert_eq!(authorities.current_limit(1), Some(1),);
 
-		assert_eq!(
-			authorities.current_limit(2),
-			Some(2),
-		);
+		assert_eq!(authorities.current_limit(2), Some(2),);
 
-		assert_eq!(
-			authorities.current_limit(3),
-			None,
-		);
+		assert_eq!(authorities.current_limit(3), None,);
 	}
 
 	#[test]
@@ -865,13 +825,22 @@ mod tests {
 			delay_kind: DelayKind::Finalized,
 		};
 
-		authorities.add_pending_change(change_a.clone(), &static_is_descendent_of(false)).unwrap();
-		authorities.add_pending_change(change_b.clone(), &static_is_descendent_of(false)).unwrap();
-		authorities.add_pending_change(change_c.clone(), &is_descendent_of(|base, hash| match (*base, *hash) {
-			("hash_a", "hash_c") => true,
-			("hash_b", "hash_c") => false,
-			_ => unreachable!(),
-		})).unwrap();
+		authorities
+			.add_pending_change(change_a.clone(), &static_is_descendent_of(false))
+			.unwrap();
+		authorities
+			.add_pending_change(change_b.clone(), &static_is_descendent_of(false))
+			.unwrap();
+		authorities
+			.add_pending_change(
+				change_c.clone(),
+				&is_descendent_of(|base, hash| match (*base, *hash) {
+					("hash_a", "hash_c") => true,
+					("hash_b", "hash_c") => false,
+					_ => unreachable!(),
+				}),
+			)
+			.unwrap();
 
 		// forced changes are iterated last
 		let change_d = PendingChange {
@@ -890,8 +859,12 @@ mod tests {
 			delay_kind: DelayKind::Best { median_last_finalized: 0 },
 		};
 
-		authorities.add_pending_change(change_d.clone(), &static_is_descendent_of(false)).unwrap();
-		authorities.add_pending_change(change_e.clone(), &static_is_descendent_of(false)).unwrap();
+		authorities
+			.add_pending_change(change_d.clone(), &static_is_descendent_of(false))
+			.unwrap();
+		authorities
+			.add_pending_change(change_e.clone(), &static_is_descendent_of(false))
+			.unwrap();
 
 		// ordered by subtree depth
 		assert_eq!(
@@ -930,46 +903,48 @@ mod tests {
 			delay_kind: DelayKind::Finalized,
 		};
 
-		authorities.add_pending_change(change_a.clone(), &static_is_descendent_of(true)).unwrap();
-		authorities.add_pending_change(change_b.clone(), &static_is_descendent_of(true)).unwrap();
+		authorities
+			.add_pending_change(change_a.clone(), &static_is_descendent_of(true))
+			.unwrap();
+		authorities
+			.add_pending_change(change_b.clone(), &static_is_descendent_of(true))
+			.unwrap();
 
-		assert_eq!(
-			authorities.pending_changes().collect::<Vec<_>>(),
-			vec![&change_a, &change_b],
-		);
+		assert_eq!(authorities.pending_changes().collect::<Vec<_>>(), vec![&change_a, &change_b],);
 
 		// finalizing "hash_c" won't enact the change signaled at "hash_a" but it will prune out "hash_b"
-		let status = authorities.apply_standard_changes(
-			"hash_c",
-			11,
-			&is_descendent_of(|base, hash| match (*base, *hash) {
-				("hash_a", "hash_c") => true,
-				("hash_b", "hash_c") => false,
-				_ => unreachable!(),
-			}),
-			false,
-			None,
-		).unwrap();
+		let status = authorities
+			.apply_standard_changes(
+				"hash_c",
+				11,
+				&is_descendent_of(|base, hash| match (*base, *hash) {
+					("hash_a", "hash_c") => true,
+					("hash_b", "hash_c") => false,
+					_ => unreachable!(),
+				}),
+				false,
+				None,
+			)
+			.unwrap();
 
 		assert!(status.changed);
 		assert_eq!(status.new_set_block, None);
-		assert_eq!(
-			authorities.pending_changes().collect::<Vec<_>>(),
-			vec![&change_a],
-		);
+		assert_eq!(authorities.pending_changes().collect::<Vec<_>>(), vec![&change_a],);
 		assert_eq!(authorities.authority_set_changes, AuthoritySetChanges::empty());
 
 		// finalizing "hash_d" will enact the change signaled at "hash_a"
-		let status = authorities.apply_standard_changes(
-			"hash_d",
-			15,
-			&is_descendent_of(|base, hash| match (*base, *hash) {
-				("hash_a", "hash_d") => true,
-				_ => unreachable!(),
-			}),
-			false,
-			None,
-		).unwrap();
+		let status = authorities
+			.apply_standard_changes(
+				"hash_d",
+				15,
+				&is_descendent_of(|base, hash| match (*base, *hash) {
+					("hash_a", "hash_d") => true,
+					_ => unreachable!(),
+				}),
+				false,
+				None,
+			)
+			.unwrap();
 
 		assert!(status.changed);
 		assert_eq!(status.new_set_block, Some(("hash_d", 15)));
@@ -1010,8 +985,12 @@ mod tests {
 			delay_kind: DelayKind::Finalized,
 		};
 
-		authorities.add_pending_change(change_a.clone(), &static_is_descendent_of(true)).unwrap();
-		authorities.add_pending_change(change_c.clone(), &static_is_descendent_of(true)).unwrap();
+		authorities
+			.add_pending_change(change_a.clone(), &static_is_descendent_of(true))
+			.unwrap();
+		authorities
+			.add_pending_change(change_c.clone(), &static_is_descendent_of(true))
+			.unwrap();
 
 		let is_descendent_of = is_descendent_of(|base, hash| match (*base, *hash) {
 			("hash_a", "hash_b") => true,
@@ -1032,13 +1011,9 @@ mod tests {
 		));
 		assert_eq!(authorities.authority_set_changes, AuthoritySetChanges::empty());
 
-		let status = authorities.apply_standard_changes(
-			"hash_b",
-			15,
-			&is_descendent_of,
-			false,
-			None,
-		).unwrap();
+		let status = authorities
+			.apply_standard_changes("hash_b", 15, &is_descendent_of, false, None)
+			.unwrap();
 
 		assert!(status.changed);
 		assert_eq!(status.new_set_block, Some(("hash_b", 15)));
@@ -1048,13 +1023,9 @@ mod tests {
 		assert_eq!(authorities.authority_set_changes, AuthoritySetChanges(vec![(0, 15)]));
 
 		// after finalizing `change_a` it should be possible to finalize `change_c`
-		let status = authorities.apply_standard_changes(
-			"hash_d",
-			40,
-			&is_descendent_of,
-			false,
-			None,
-		).unwrap();
+		let status = authorities
+			.apply_standard_changes("hash_d", 40, &is_descendent_of, false, None)
+			.unwrap();
 
 		assert!(status.changed);
 		assert_eq!(status.new_set_block, Some(("hash_d", 40)));
@@ -1092,8 +1063,12 @@ mod tests {
 			delay_kind: DelayKind::Finalized,
 		};
 
-		authorities.add_pending_change(change_a.clone(), &static_is_descendent_of(false)).unwrap();
-		authorities.add_pending_change(change_b.clone(), &static_is_descendent_of(true)).unwrap();
+		authorities
+			.add_pending_change(change_a.clone(), &static_is_descendent_of(false))
+			.unwrap();
+		authorities
+			.add_pending_change(change_b.clone(), &static_is_descendent_of(true))
+			.unwrap();
 
 		let is_descendent_of = is_descendent_of(|base, hash| match (*base, *hash) {
 			("hash_a", "hash_d") => true,
@@ -1160,8 +1135,12 @@ mod tests {
 			delay_kind: DelayKind::Best { median_last_finalized: 0 },
 		};
 
-		authorities.add_pending_change(change_a, &static_is_descendent_of(false)).unwrap();
-		authorities.add_pending_change(change_b.clone(), &static_is_descendent_of(false)).unwrap();
+		authorities
+			.add_pending_change(change_a, &static_is_descendent_of(false))
+			.unwrap();
+		authorities
+			.add_pending_change(change_b.clone(), &static_is_descendent_of(false))
+			.unwrap();
 
 		// no duplicates are allowed
 		assert!(matches!(
@@ -1172,7 +1151,9 @@ mod tests {
 		// there's an effective change triggered at block 15 but not a standard one.
 		// so this should do nothing.
 		assert_eq!(
-			authorities.enacts_standard_change("hash_c", 15, &static_is_descendent_of(true)).unwrap(),
+			authorities
+				.enacts_standard_change("hash_c", 15, &static_is_descendent_of(true))
+				.unwrap(),
 			None,
 		);
 
@@ -1194,20 +1175,16 @@ mod tests {
 
 		// let's try and apply the forced changes.
 		// too early and there's no forced changes to apply.
-		assert!(
-			authorities
-				.apply_forced_changes("hash_a10", 10, &static_is_descendent_of(true), false, None)
-				.unwrap()
-				.is_none()
-		);
+		assert!(authorities
+			.apply_forced_changes("hash_a10", 10, &static_is_descendent_of(true), false, None)
+			.unwrap()
+			.is_none());
 
 		// too late.
-		assert!(
-			authorities
-				.apply_forced_changes("hash_a16", 16, &is_descendent_of_a, false, None)
-				.unwrap()
-				.is_none()
-		);
+		assert!(authorities
+			.apply_forced_changes("hash_a16", 16, &is_descendent_of_a, false, None)
+			.unwrap()
+			.is_none());
 
 		// on time -- chooses the right change for this fork.
 		assert_eq!(
@@ -1247,9 +1224,7 @@ mod tests {
 			delay: 0,
 			canon_height: 5,
 			canon_hash: "hash_a",
-			delay_kind: DelayKind::Best {
-				median_last_finalized: 0,
-			},
+			delay_kind: DelayKind::Best { median_last_finalized: 0 },
 		};
 
 		// and import it
@@ -1258,12 +1233,10 @@ mod tests {
 			.unwrap();
 
 		// it should be enacted at the same block that signaled it
-		assert!(
-			authorities
-				.apply_forced_changes("hash_a", 5, &static_is_descendent_of(false), false, None)
-				.unwrap()
-				.is_some()
-		);
+		assert!(authorities
+			.apply_forced_changes("hash_a", 5, &static_is_descendent_of(false), false, None)
+			.unwrap()
+			.is_some());
 	}
 
 	#[test]
@@ -1306,9 +1279,15 @@ mod tests {
 		};
 
 		// add some pending standard changes all on the same fork
-		authorities.add_pending_change(change_a, &static_is_descendent_of(true)).unwrap();
-		authorities.add_pending_change(change_b, &static_is_descendent_of(true)).unwrap();
-		authorities.add_pending_change(change_c, &static_is_descendent_of(true)).unwrap();
+		authorities
+			.add_pending_change(change_a, &static_is_descendent_of(true))
+			.unwrap();
+		authorities
+			.add_pending_change(change_b, &static_is_descendent_of(true))
+			.unwrap();
+		authorities
+			.add_pending_change(change_c, &static_is_descendent_of(true))
+			.unwrap();
 
 		// effective at #45
 		let change_d = PendingChange {
@@ -1316,18 +1295,24 @@ mod tests {
 			delay: 5,
 			canon_height: 40,
 			canon_hash: "hash_d",
-			delay_kind: DelayKind::Best {
-				median_last_finalized: 31,
-			},
+			delay_kind: DelayKind::Best { median_last_finalized: 31 },
 		};
 
 		// now add a forced change on the same fork
-		authorities.add_pending_change(change_d, &static_is_descendent_of(true)).unwrap();
+		authorities
+			.add_pending_change(change_d, &static_is_descendent_of(true))
+			.unwrap();
 
 		// the forced change cannot be applied since the pending changes it depends on
 		// have not been applied yet.
 		assert!(matches!(
-			authorities.apply_forced_changes("hash_d45", 45, &static_is_descendent_of(true), false, None),
+			authorities.apply_forced_changes(
+				"hash_d45",
+				45,
+				&static_is_descendent_of(true),
+				false,
+				None
+			),
 			Err(Error::ForcedAuthoritySetChangeDependencyUnsatisfied(15))
 		));
 		assert_eq!(authorities.authority_set_changes, AuthoritySetChanges::empty());
@@ -1340,7 +1325,13 @@ mod tests {
 
 		// but the forced change still depends on the next standard change
 		assert!(matches!(
-			authorities.apply_forced_changes("hash_d", 45, &static_is_descendent_of(true), false, None),
+			authorities.apply_forced_changes(
+				"hash_d",
+				45,
+				&static_is_descendent_of(true),
+				false,
+				None
+			),
 			Err(Error::ForcedAuthoritySetChangeDependencyUnsatisfied(20))
 		));
 		assert_eq!(authorities.authority_set_changes, AuthoritySetChanges(vec![(0, 15)]));
@@ -1425,29 +1416,19 @@ mod tests {
 		});
 
 		// add the three pending changes
-		authorities
-			.add_pending_change(change_b, &is_descendent_of)
-			.unwrap();
-		authorities
-			.add_pending_change(change_a0, &is_descendent_of)
-			.unwrap();
-		authorities
-			.add_pending_change(change_a1, &is_descendent_of)
-			.unwrap();
+		authorities.add_pending_change(change_b, &is_descendent_of).unwrap();
+		authorities.add_pending_change(change_a0, &is_descendent_of).unwrap();
+		authorities.add_pending_change(change_a1, &is_descendent_of).unwrap();
 
 		// the earliest change at block `best_a` should be the change at A0 (#5)
 		assert_eq!(
-			authorities
-				.next_change(&"best_a", &is_descendent_of)
-				.unwrap(),
+			authorities.next_change(&"best_a", &is_descendent_of).unwrap(),
 			Some(("hash_a0", 5)),
 		);
 
 		// the earliest change at block `best_b` should be the change at B (#4)
 		assert_eq!(
-			authorities
-				.next_change(&"best_b", &is_descendent_of)
-				.unwrap(),
+			authorities.next_change(&"best_b", &is_descendent_of).unwrap(),
 			Some(("hash_b", 4)),
 		);
 
@@ -1458,19 +1439,12 @@ mod tests {
 
 		// the next change is now at A1 (#10)
 		assert_eq!(
-			authorities
-				.next_change(&"best_a", &is_descendent_of)
-				.unwrap(),
+			authorities.next_change(&"best_a", &is_descendent_of).unwrap(),
 			Some(("hash_a1", 10)),
 		);
 
 		// there's no longer any pending change at `best_b` fork
-		assert_eq!(
-			authorities
-				.next_change(&"best_b", &is_descendent_of)
-				.unwrap(),
-			None,
-		);
+		assert_eq!(authorities.next_change(&"best_b", &is_descendent_of).unwrap(), None,);
 
 		// we a forced change at A10 (#8)
 		let change_a10 = PendingChange {
@@ -1478,9 +1452,7 @@ mod tests {
 			delay: 0,
 			canon_height: 8,
 			canon_hash: "hash_a10",
-			delay_kind: DelayKind::Best {
-				median_last_finalized: 0,
-			},
+			delay_kind: DelayKind::Best { median_last_finalized: 0 },
 		};
 
 		authorities
@@ -1489,9 +1461,7 @@ mod tests {
 
 		// it should take precedence over the change at A1 (#10)
 		assert_eq!(
-			authorities
-				.next_change(&"best_a", &is_descendent_of)
-				.unwrap(),
+			authorities.next_change(&"best_a", &is_descendent_of).unwrap(),
 			Some(("hash_a10", 8)),
 		);
 	}
@@ -1511,16 +1481,11 @@ mod tests {
 			None,
 		);
 
-		let invalid_authorities_weight = vec![
-			(AuthorityId::from_slice(&[1; 32]), 5),
-			(AuthorityId::from_slice(&[2; 32]), 0),
-		];
+		let invalid_authorities_weight =
+			vec![(AuthorityId::from_slice(&[1; 32]), 5), (AuthorityId::from_slice(&[2; 32]), 0)];
 
 		// authority weight of zero is invalid
-		assert_eq!(
-			AuthoritySet::<(), ()>::genesis(invalid_authorities_weight.clone()),
-			None
-		);
+		assert_eq!(AuthoritySet::<(), ()>::genesis(invalid_authorities_weight.clone()), None);
 		assert_eq!(
 			AuthoritySet::<(), ()>::new(
 				invalid_authorities_weight.clone(),
@@ -1557,9 +1522,7 @@ mod tests {
 			delay: 10,
 			canon_height: 5,
 			canon_hash: (),
-			delay_kind: DelayKind::Best {
-				median_last_finalized: 0,
-			},
+			delay_kind: DelayKind::Best { median_last_finalized: 0 },
 		};
 
 		// pending change contains an an authority set
@@ -1617,17 +1580,13 @@ mod tests {
 				canon_height,
 				canon_hash,
 				delay_kind: if forced {
-					DelayKind::Best {
-						median_last_finalized: 0,
-					}
+					DelayKind::Best { median_last_finalized: 0 }
 				} else {
 					DelayKind::Finalized
 				},
 			};
 
-			authorities
-				.add_pending_change(change, &is_descendent_of)
-				.unwrap();
+			authorities.add_pending_change(change, &is_descendent_of).unwrap();
 		};
 
 		add_pending_change(5, "A", false);
@@ -1669,14 +1628,7 @@ mod tests {
 			.unwrap();
 
 		assert_eq!(authorities.pending_forced_changes.len(), 1);
-		assert_eq!(
-			authorities
-				.pending_forced_changes
-				.first()
-				.unwrap()
-				.canon_hash,
-			"D"
-		);
+		assert_eq!(authorities.pending_forced_changes.first().unwrap().canon_hash, "D");
 	}
 
 	#[test]
@@ -1714,10 +1666,7 @@ mod tests {
 		authority_set_changes.append(2, 81);
 
 		// we are missing the data for the first set, therefore we should return `None`
-		assert_eq!(
-			None,
-			authority_set_changes.iter_from(40).map(|it| it.collect::<Vec<_>>()),
-		);
+		assert_eq!(None, authority_set_changes.iter_from(40).map(|it| it.collect::<Vec<_>>()),);
 
 		// after adding the data for the first set the same query should work
 		let mut authority_set_changes = AuthoritySetChanges::empty();
@@ -1736,14 +1685,8 @@ mod tests {
 			authority_set_changes.iter_from(41).map(|it| it.cloned().collect::<Vec<_>>()),
 		);
 
-		assert_eq!(
-			0,
-			authority_set_changes.iter_from(121).unwrap().count(),
-		);
+		assert_eq!(0, authority_set_changes.iter_from(121).unwrap().count(),);
 
-		assert_eq!(
-			0,
-			authority_set_changes.iter_from(200).unwrap().count(),
-		);
+		assert_eq!(0, authority_set_changes.iter_from(200).unwrap().count(),);
 	}
 }
diff --git a/client/finality-grandpa/src/aux_schema.rs b/client/finality-grandpa/src/aux_schema.rs
index 296f7c13c524..179e8876e66d 100644
--- a/client/finality-grandpa/src/aux_schema.rs
+++ b/client/finality-grandpa/src/aux_schema.rs
@@ -30,13 +30,16 @@ use sp_blockchain::{Error as ClientError, Result as ClientResult};
 use sp_finality_grandpa::{AuthorityList, RoundNumber, SetId};
 use sp_runtime::traits::{Block as BlockT, NumberFor};
 
-use crate::authorities::{
-	AuthoritySet, AuthoritySetChanges, DelayKind, PendingChange, SharedAuthoritySet,
+use crate::{
+	authorities::{
+		AuthoritySet, AuthoritySetChanges, DelayKind, PendingChange, SharedAuthoritySet,
+	},
+	environment::{
+		CompletedRound, CompletedRounds, CurrentRounds, HasVoted, SharedVoterSetState,
+		VoterSetState,
+	},
+	GrandpaJustification, NewAuthoritySet,
 };
-use crate::environment::{
-	CompletedRound, CompletedRounds, CurrentRounds, HasVoted, SharedVoterSetState, VoterSetState,
-};
-use crate::{GrandpaJustification, NewAuthoritySet};
 
 const VERSION_KEY: &[u8] = b"grandpa_schema_version";
 const SET_STATE_KEY: &[u8] = b"grandpa_completed_round";
@@ -141,13 +144,13 @@ struct V2AuthoritySet<H, N> {
 
 pub(crate) fn load_decode<B: AuxStore, T: Decode>(
 	backend: &B,
-	key: &[u8]
+	key: &[u8],
 ) -> ClientResult<Option<T>> {
 	match backend.get_aux(key)? {
 		None => Ok(None),
 		Some(t) => T::decode(&mut &t[..])
 			.map_err(|e| ClientError::Backend(format!("GRANDPA DB is corrupted: {}", e)))
-			.map(Some)
+			.map(Some),
 	}
 }
 
@@ -160,24 +163,16 @@ pub(crate) struct PersistentData<Block: BlockT> {
 fn migrate_from_version0<Block: BlockT, B, G>(
 	backend: &B,
 	genesis_round: &G,
-) -> ClientResult<
-	Option<(
-		AuthoritySet<Block::Hash, NumberFor<Block>>,
-		VoterSetState<Block>,
-	)>,
->
+) -> ClientResult<Option<(AuthoritySet<Block::Hash, NumberFor<Block>>, VoterSetState<Block>)>>
 where
 	B: AuxStore,
 	G: Fn() -> RoundState<Block::Hash, NumberFor<Block>>,
 {
-	CURRENT_VERSION.using_encoded(|s|
-		backend.insert_aux(&[(VERSION_KEY, s)], &[])
-	)?;
+	CURRENT_VERSION.using_encoded(|s| backend.insert_aux(&[(VERSION_KEY, s)], &[]))?;
 
-	if let Some(old_set) = load_decode::<_, V0AuthoritySet<Block::Hash, NumberFor<Block>>>(
-		backend,
-		AUTHORITY_SET_KEY,
-	)? {
+	if let Some(old_set) =
+		load_decode::<_, V0AuthoritySet<Block::Hash, NumberFor<Block>>>(backend, AUTHORITY_SET_KEY)?
+	{
 		let new_set: AuthoritySet<Block::Hash, NumberFor<Block>> = old_set.into();
 		backend.insert_aux(&[(AUTHORITY_SET_KEY, new_set.encode().as_slice())], &[])?;
 
@@ -193,7 +188,7 @@ where
 		let set_id = new_set.set_id;
 
 		let base = last_round_state.prevote_ghost.expect(
-			"state is for completed round; completed rounds must have a prevote ghost; qed."
+			"state is for completed round; completed rounds must have a prevote ghost; qed.",
 		);
 
 		let mut current_rounds = CurrentRounds::new();
@@ -215,7 +210,7 @@ where
 
 		backend.insert_aux(&[(SET_STATE_KEY, set_state.encode().as_slice())], &[])?;
 
-		return Ok(Some((new_set, set_state)));
+		return Ok(Some((new_set, set_state)))
 	}
 
 	Ok(None)
@@ -224,36 +219,25 @@ where
 fn migrate_from_version1<Block: BlockT, B, G>(
 	backend: &B,
 	genesis_round: &G,
-) -> ClientResult<
-	Option<(
-		AuthoritySet<Block::Hash, NumberFor<Block>>,
-		VoterSetState<Block>,
-	)>,
->
+) -> ClientResult<Option<(AuthoritySet<Block::Hash, NumberFor<Block>>, VoterSetState<Block>)>>
 where
 	B: AuxStore,
 	G: Fn() -> RoundState<Block::Hash, NumberFor<Block>>,
 {
-	CURRENT_VERSION.using_encoded(|s|
-		backend.insert_aux(&[(VERSION_KEY, s)], &[])
-	)?;
+	CURRENT_VERSION.using_encoded(|s| backend.insert_aux(&[(VERSION_KEY, s)], &[]))?;
 
-	if let Some(set) = load_decode::<_, AuthoritySet<Block::Hash, NumberFor<Block>>>(
-		backend,
-		AUTHORITY_SET_KEY,
-	)? {
+	if let Some(set) =
+		load_decode::<_, AuthoritySet<Block::Hash, NumberFor<Block>>>(backend, AUTHORITY_SET_KEY)?
+	{
 		let set_id = set.set_id;
 
-		let completed_rounds = |number, state, base| CompletedRounds::new(
-			CompletedRound {
-				number,
-				state,
-				votes: Vec::new(),
-				base,
-			},
-			set_id,
-			&set,
-		);
+		let completed_rounds = |number, state, base| {
+			CompletedRounds::new(
+				CompletedRound { number, state, votes: Vec::new(), base },
+				set_id,
+				&set,
+			)
+		};
 
 		let set_state = match load_decode::<_, V1VoterSetState<Block::Hash, NumberFor<Block>>>(
 			backend,
@@ -284,17 +268,13 @@ where
 				let base = set_state.prevote_ghost
 					.expect("state is for completed round; completed rounds must have a prevote ghost; qed.");
 
-				VoterSetState::live(
-					set_id,
-					&set,
-					base,
-				)
+				VoterSetState::live(set_id, &set, base)
 			},
 		};
 
 		backend.insert_aux(&[(SET_STATE_KEY, set_state.encode().as_slice())], &[])?;
 
-		return Ok(Some((set, set_state)));
+		return Ok(Some((set, set_state)))
 	}
 
 	Ok(None)
@@ -303,46 +283,31 @@ where
 fn migrate_from_version2<Block: BlockT, B, G>(
 	backend: &B,
 	genesis_round: &G,
-) -> ClientResult<
-	Option<(
-		AuthoritySet<Block::Hash, NumberFor<Block>>,
-		VoterSetState<Block>,
-	)>,
->
+) -> ClientResult<Option<(AuthoritySet<Block::Hash, NumberFor<Block>>, VoterSetState<Block>)>>
 where
 	B: AuxStore,
 	G: Fn() -> RoundState<Block::Hash, NumberFor<Block>>,
 {
-	CURRENT_VERSION.using_encoded(|s|
-		backend.insert_aux(&[(VERSION_KEY, s)], &[])
-	)?;
+	CURRENT_VERSION.using_encoded(|s| backend.insert_aux(&[(VERSION_KEY, s)], &[]))?;
 
-	if let Some(old_set) = load_decode::<_, V2AuthoritySet<Block::Hash, NumberFor<Block>>>(
-		backend,
-		AUTHORITY_SET_KEY,
-	)? {
+	if let Some(old_set) =
+		load_decode::<_, V2AuthoritySet<Block::Hash, NumberFor<Block>>>(backend, AUTHORITY_SET_KEY)?
+	{
 		let new_set: AuthoritySet<Block::Hash, NumberFor<Block>> = old_set.into();
 		backend.insert_aux(&[(AUTHORITY_SET_KEY, new_set.encode().as_slice())], &[])?;
 
-		let set_state = match load_decode::<_, VoterSetState<Block>>(
-			backend,
-			SET_STATE_KEY,
-		)? {
+		let set_state = match load_decode::<_, VoterSetState<Block>>(backend, SET_STATE_KEY)? {
 			Some(state) => state,
 			None => {
 				let state = genesis_round();
 				let base = state.prevote_ghost
 					.expect("state is for completed round; completed rounds must have a prevote ghost; qed.");
 
-				VoterSetState::live(
-					new_set.set_id,
-					&new_set,
-					base,
-				)
-			}
+				VoterSetState::live(new_set.set_id, &new_set, base)
+			},
 		};
 
-		return Ok(Some((new_set, set_state)));
+		return Ok(Some((new_set, set_state)))
 	}
 
 	Ok(None)
@@ -371,7 +336,7 @@ where
 				return Ok(PersistentData {
 					authority_set: new_set.into(),
 					set_state: set_state.into(),
-				});
+				})
 			}
 		},
 		Some(1) => {
@@ -381,7 +346,7 @@ where
 				return Ok(PersistentData {
 					authority_set: new_set.into(),
 					set_state: set_state.into(),
-				});
+				})
 			}
 		},
 		Some(2) => {
@@ -391,41 +356,31 @@ where
 				return Ok(PersistentData {
 					authority_set: new_set.into(),
 					set_state: set_state.into(),
-				});
+				})
 			}
-		}
+		},
 		Some(3) => {
 			if let Some(set) = load_decode::<_, AuthoritySet<Block::Hash, NumberFor<Block>>>(
 				backend,
 				AUTHORITY_SET_KEY,
 			)? {
-				let set_state = match load_decode::<_, VoterSetState<Block>>(
-					backend,
-					SET_STATE_KEY,
-				)? {
-					Some(state) => state,
-					None => {
-						let state = make_genesis_round();
-						let base = state.prevote_ghost
+				let set_state =
+					match load_decode::<_, VoterSetState<Block>>(backend, SET_STATE_KEY)? {
+						Some(state) => state,
+						None => {
+							let state = make_genesis_round();
+							let base = state.prevote_ghost
 							.expect("state is for completed round; completed rounds must have a prevote ghost; qed.");
 
-						VoterSetState::live(
-							set.set_id,
-							&set,
-							base,
-						)
-					}
-				};
+							VoterSetState::live(set.set_id, &set, base)
+						},
+					};
 
-				return Ok(PersistentData {
-					authority_set: set.into(),
-					set_state: set_state.into(),
-				});
+				return Ok(PersistentData { authority_set: set.into(), set_state: set_state.into() })
 			}
-		}
-		Some(other) => return Err(ClientError::Backend(
-			format!("Unsupported GRANDPA DB version: {:?}", other)
-		)),
+		},
+		Some(other) =>
+			return Err(ClientError::Backend(format!("Unsupported GRANDPA DB version: {:?}", other))),
 	}
 
 	// genesis.
@@ -436,14 +391,11 @@ where
 	let genesis_set = AuthoritySet::genesis(genesis_authorities)
 		.expect("genesis authorities is non-empty; all weights are non-zero; qed.");
 	let state = make_genesis_round();
-	let base = state.prevote_ghost
+	let base = state
+		.prevote_ghost
 		.expect("state is for completed round; completed rounds must have a prevote ghost; qed.");
 
-	let genesis_state = VoterSetState::live(
-		0,
-		&genesis_set,
-		base,
-	);
+	let genesis_state = VoterSetState::live(0, &genesis_set, base);
 
 	backend.insert_aux(
 		&[
@@ -453,10 +405,7 @@ where
 		&[],
 	)?;
 
-	Ok(PersistentData {
-		authority_set: genesis_set.into(),
-		set_state: genesis_state.into(),
-	})
+	Ok(PersistentData { authority_set: genesis_set.into(), set_state: genesis_state.into() })
 }
 
 /// Update the authority set on disk after a change.
@@ -486,10 +435,7 @@ where
 		);
 		let encoded = set_state.encode();
 
-		write_aux(&[
-			(AUTHORITY_SET_KEY, &encoded_set[..]),
-			(SET_STATE_KEY, &encoded[..]),
-		])
+		write_aux(&[(AUTHORITY_SET_KEY, &encoded_set[..]), (SET_STATE_KEY, &encoded[..])])
 	} else {
 		write_aux(&[(AUTHORITY_SET_KEY, &encoded_set[..])])
 	}
@@ -527,10 +473,7 @@ pub(crate) fn write_voter_set_state<Block: BlockT, B: AuxStore>(
 	backend: &B,
 	state: &VoterSetState<Block>,
 ) -> ClientResult<()> {
-	backend.insert_aux(
-		&[(SET_STATE_KEY, state.encode().as_slice())],
-		&[]
-	)
+	backend.insert_aux(&[(SET_STATE_KEY, state.encode().as_slice())], &[])
 }
 
 /// Write concluded round.
@@ -554,10 +497,10 @@ pub(crate) fn load_authorities<B: AuxStore, H: Decode, N: Decode + Clone + Ord>(
 
 #[cfg(test)]
 mod test {
-	use sp_finality_grandpa::AuthorityId;
+	use super::*;
 	use sp_core::H256;
+	use sp_finality_grandpa::AuthorityId;
 	use substrate_test_runtime_client;
-	use super::*;
 
 	#[test]
 	fn load_decode_from_v0_migrates_data_format() {
@@ -582,19 +525,18 @@ mod test {
 
 			let voter_set_state = (round_number, round_state.clone());
 
-			client.insert_aux(
-				&[
-					(AUTHORITY_SET_KEY, authority_set.encode().as_slice()),
-					(SET_STATE_KEY, voter_set_state.encode().as_slice()),
-				],
-				&[],
-			).unwrap();
+			client
+				.insert_aux(
+					&[
+						(AUTHORITY_SET_KEY, authority_set.encode().as_slice()),
+						(SET_STATE_KEY, voter_set_state.encode().as_slice()),
+					],
+					&[],
+				)
+				.unwrap();
 		}
 
-		assert_eq!(
-			load_decode::<_, u32>(&client, VERSION_KEY).unwrap(),
-			None,
-		);
+		assert_eq!(load_decode::<_, u32>(&client, VERSION_KEY).unwrap(), None,);
 
 		// should perform the migration
 		load_persistent::<substrate_test_runtime_client::runtime::Block, _, _>(
@@ -602,23 +544,19 @@ mod test {
 			H256::random(),
 			0,
 			|| unreachable!(),
-		).unwrap();
+		)
+		.unwrap();
 
-		assert_eq!(
-			load_decode::<_, u32>(&client, VERSION_KEY).unwrap(),
-			Some(3),
-		);
+		assert_eq!(load_decode::<_, u32>(&client, VERSION_KEY).unwrap(), Some(3),);
 
-		let PersistentData {
-			authority_set,
-			set_state,
-			..
-		} = load_persistent::<substrate_test_runtime_client::runtime::Block, _, _>(
-			&client,
-			H256::random(),
-			0,
-			|| unreachable!(),
-		).unwrap();
+		let PersistentData { authority_set, set_state, .. } =
+			load_persistent::<substrate_test_runtime_client::runtime::Block, _, _>(
+				&client,
+				H256::random(),
+				0,
+				|| unreachable!(),
+			)
+			.unwrap();
 
 		assert_eq!(
 			*authority_set.inner(),
@@ -628,7 +566,8 @@ mod test {
 				ForkTree::new(),
 				Vec::new(),
 				AuthoritySetChanges::empty(),
-			).unwrap(),
+			)
+			.unwrap(),
 		);
 
 		let mut current_rounds = CurrentRounds::new();
@@ -673,24 +612,24 @@ mod test {
 				ForkTree::new(),
 				Vec::new(),
 				AuthoritySetChanges::empty(),
-			).unwrap();
+			)
+			.unwrap();
 
 			let voter_set_state = V1VoterSetState::Live(round_number, round_state.clone());
 
-			client.insert_aux(
-				&[
-					(AUTHORITY_SET_KEY, authority_set.encode().as_slice()),
-					(SET_STATE_KEY, voter_set_state.encode().as_slice()),
-					(VERSION_KEY, 1u32.encode().as_slice()),
-				],
-				&[],
-			).unwrap();
+			client
+				.insert_aux(
+					&[
+						(AUTHORITY_SET_KEY, authority_set.encode().as_slice()),
+						(SET_STATE_KEY, voter_set_state.encode().as_slice()),
+						(VERSION_KEY, 1u32.encode().as_slice()),
+					],
+					&[],
+				)
+				.unwrap();
 		}
 
-		assert_eq!(
-			load_decode::<_, u32>(&client, VERSION_KEY).unwrap(),
-			Some(1),
-		);
+		assert_eq!(load_decode::<_, u32>(&client, VERSION_KEY).unwrap(), Some(1),);
 
 		// should perform the migration
 		load_persistent::<substrate_test_runtime_client::runtime::Block, _, _>(
@@ -698,23 +637,19 @@ mod test {
 			H256::random(),
 			0,
 			|| unreachable!(),
-		).unwrap();
+		)
+		.unwrap();
 
-		assert_eq!(
-			load_decode::<_, u32>(&client, VERSION_KEY).unwrap(),
-			Some(3),
-		);
+		assert_eq!(load_decode::<_, u32>(&client, VERSION_KEY).unwrap(), Some(3),);
 
-		let PersistentData {
-			authority_set,
-			set_state,
-			..
-		} = load_persistent::<substrate_test_runtime_client::runtime::Block, _, _>(
-			&client,
-			H256::random(),
-			0,
-			|| unreachable!(),
-		).unwrap();
+		let PersistentData { authority_set, set_state, .. } =
+			load_persistent::<substrate_test_runtime_client::runtime::Block, _, _>(
+				&client,
+				H256::random(),
+				0,
+				|| unreachable!(),
+			)
+			.unwrap();
 
 		assert_eq!(
 			*authority_set.inner(),
@@ -724,7 +659,8 @@ mod test {
 				ForkTree::new(),
 				Vec::new(),
 				AuthoritySetChanges::empty(),
-			).unwrap(),
+			)
+			.unwrap(),
 		);
 
 		let mut current_rounds = CurrentRounds::new();
@@ -768,23 +704,22 @@ mod test {
 				VoterSetState::live(
 					set_id,
 					&authority_set.clone().into(), // Note the conversion!
-					genesis_state
+					genesis_state,
 				);
 
-			client.insert_aux(
-				&[
-					(AUTHORITY_SET_KEY, authority_set.encode().as_slice()),
-					(SET_STATE_KEY, voter_set_state.encode().as_slice()),
-					(VERSION_KEY, 2u32.encode().as_slice()),
-				],
-				&[],
-			).unwrap();
+			client
+				.insert_aux(
+					&[
+						(AUTHORITY_SET_KEY, authority_set.encode().as_slice()),
+						(SET_STATE_KEY, voter_set_state.encode().as_slice()),
+						(VERSION_KEY, 2u32.encode().as_slice()),
+					],
+					&[],
+				)
+				.unwrap();
 		}
 
-		assert_eq!(
-			load_decode::<_, u32>(&client, VERSION_KEY).unwrap(),
-			Some(2),
-		);
+		assert_eq!(load_decode::<_, u32>(&client, VERSION_KEY).unwrap(), Some(2),);
 
 		// should perform the migration
 		load_persistent::<substrate_test_runtime_client::runtime::Block, _, _>(
@@ -792,22 +727,17 @@ mod test {
 			H256::random(),
 			0,
 			|| unreachable!(),
-		).unwrap();
+		)
+		.unwrap();
 
-		assert_eq!(
-			load_decode::<_, u32>(&client, VERSION_KEY).unwrap(),
-			Some(3),
-		);
+		assert_eq!(load_decode::<_, u32>(&client, VERSION_KEY).unwrap(), Some(3),);
 
-		let PersistentData {
-			authority_set,
-			..
-		 } = load_persistent::<substrate_test_runtime_client::runtime::Block, _, _>(
-			&client,
-			H256::random(),
-			0,
-			|| unreachable!(),
-		).unwrap();
+		let PersistentData { authority_set, .. } = load_persistent::<
+			substrate_test_runtime_client::runtime::Block,
+			_,
+			_,
+		>(&client, H256::random(), 0, || unreachable!())
+		.unwrap();
 
 		assert_eq!(
 			*authority_set.inner(),
@@ -817,7 +747,8 @@ mod test {
 				ForkTree::new(),
 				Vec::new(),
 				AuthoritySetChanges::empty(),
-			).unwrap(),
+			)
+			.unwrap(),
 		);
 	}
 
@@ -843,7 +774,8 @@ mod test {
 		assert_eq!(
 			load_decode::<_, CompletedRound::<substrate_test_runtime_client::runtime::Block>>(
 				&client, &key
-			).unwrap(),
+			)
+			.unwrap(),
 			Some(completed_round),
 		);
 	}
diff --git a/client/finality-grandpa/src/communication/gossip.rs b/client/finality-grandpa/src/communication/gossip.rs
index 1b3b5ea7c5d2..60a9cde904d8 100644
--- a/client/finality-grandpa/src/communication/gossip.rs
+++ b/client/finality-grandpa/src/communication/gossip.rs
@@ -84,23 +84,25 @@
 //!
 //! We only send polite messages to peers,
 
-use sp_runtime::traits::{NumberFor, Block as BlockT, Zero};
-use sc_network_gossip::{MessageIntent, ValidatorContext};
+use parity_scale_codec::{Decode, Encode};
 use sc_network::{ObservedRole, PeerId, ReputationChange};
-use parity_scale_codec::{Encode, Decode};
+use sc_network_gossip::{MessageIntent, ValidatorContext};
 use sp_finality_grandpa::AuthorityId;
+use sp_runtime::traits::{Block as BlockT, NumberFor, Zero};
 
+use log::{debug, trace};
+use prometheus_endpoint::{register, CounterVec, Opts, PrometheusError, Registry, U64};
+use rand::seq::SliceRandom;
 use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_DEBUG};
-use log::{trace, debug};
 use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
-use prometheus_endpoint::{CounterVec, Opts, PrometheusError, register, Registry, U64};
-use rand::seq::SliceRandom;
 
+use super::{benefit, cost, Round, SetId};
 use crate::{environment, CatchUp, CompactCommit, SignedMessage};
-use super::{cost, benefit, Round, SetId};
 
-use std::collections::{HashMap, VecDeque, HashSet};
-use std::time::Duration;
+use std::{
+	collections::{HashMap, HashSet, VecDeque},
+	time::Duration,
+};
 use wasm_timer::Instant;
 
 const REBROADCAST_AFTER: Duration = Duration::from_secs(60 * 5);
@@ -146,18 +148,14 @@ enum Consider {
 /// A view of protocol state.
 #[derive(Debug)]
 struct View<N> {
-	round: Round, // the current round we are at.
-	set_id: SetId, // the current voter set id.
+	round: Round,           // the current round we are at.
+	set_id: SetId,          // the current voter set id.
 	last_commit: Option<N>, // commit-finalized block height, if any.
 }
 
 impl<N> Default for View<N> {
 	fn default() -> Self {
-		View {
-			round: Round(1),
-			set_id: SetId(0),
-			last_commit: None,
-		}
+		View { round: Round(1), set_id: SetId(0), last_commit: None }
 	}
 }
 
@@ -165,12 +163,20 @@ impl<N: Ord> View<N> {
 	/// Consider a round and set ID combination under a current view.
 	fn consider_vote(&self, round: Round, set_id: SetId) -> Consider {
 		// only from current set
-		if set_id < self.set_id { return Consider::RejectPast }
-		if set_id > self.set_id { return Consider::RejectFuture }
+		if set_id < self.set_id {
+			return Consider::RejectPast
+		}
+		if set_id > self.set_id {
+			return Consider::RejectFuture
+		}
 
 		// only r-1 ... r+1
-		if round.0 > self.round.0.saturating_add(1) { return Consider::RejectFuture }
-		if round.0 < self.round.0.saturating_sub(1) { return Consider::RejectPast }
+		if round.0 > self.round.0.saturating_add(1) {
+			return Consider::RejectFuture
+		}
+		if round.0 < self.round.0.saturating_sub(1) {
+			return Consider::RejectPast
+		}
 
 		Consider::Accept
 	}
@@ -179,18 +185,23 @@ impl<N: Ord> View<N> {
 	/// because we gate on finalization of a further block than a previous commit.
 	fn consider_global(&self, set_id: SetId, number: N) -> Consider {
 		// only from current set
-		if set_id < self.set_id { return Consider::RejectPast }
-		if set_id > self.set_id { return Consider::RejectFuture }
+		if set_id < self.set_id {
+			return Consider::RejectPast
+		}
+		if set_id > self.set_id {
+			return Consider::RejectFuture
+		}
 
 		// only commits which claim to prove a higher block number than
 		// the one we're aware of.
 		match self.last_commit {
 			None => Consider::Accept,
-			Some(ref num) => if num < &number {
-				Consider::Accept
-			} else {
-				Consider::RejectPast
-			}
+			Some(ref num) =>
+				if num < &number {
+					Consider::Accept
+				} else {
+					Consider::RejectPast
+				},
 		}
 	}
 }
@@ -208,22 +219,13 @@ struct LocalView<N> {
 impl<N> LocalView<N> {
 	/// Creates a new `LocalView` at the given set id and round.
 	fn new(set_id: SetId, round: Round) -> LocalView<N> {
-		LocalView {
-			set_id,
-			round,
-			last_commit: None,
-			round_start: Instant::now(),
-		}
+		LocalView { set_id, round, last_commit: None, round_start: Instant::now() }
 	}
 
 	/// Converts the local view to a `View` discarding round and set id
 	/// information about the last commit.
 	fn as_view(&self) -> View<&N> {
-		View {
-			round: self.round,
-			set_id: self.set_id,
-			last_commit: self.last_commit_height(),
-		}
+		View { round: self.round, set_id: self.set_id, last_commit: self.last_commit_height() }
 	}
 
 	/// Update the set ID. implies a reset to round 1.
@@ -231,7 +233,7 @@ impl<N> LocalView<N> {
 		if set_id != self.set_id {
 			self.set_id = set_id;
 			self.round = Round(1);
- 			self.round_start = Instant::now();
+			self.round_start = Instant::now();
 		}
 	}
 
@@ -259,7 +261,7 @@ const KEEP_RECENT_ROUNDS: usize = 3;
 struct KeepTopics<B: BlockT> {
 	current_set: SetId,
 	rounds: VecDeque<(Round, SetId)>,
-	reverse_map: HashMap<B::Hash, (Option<Round>, SetId)>
+	reverse_map: HashMap<B::Hash, (Option<Round>, SetId)>,
 }
 
 impl<B: BlockT> KeepTopics<B> {
@@ -293,10 +295,7 @@ impl<B: BlockT> KeepTopics<B> {
 		map.insert(super::global_topic::<B>(self.current_set.0), (None, self.current_set));
 
 		for &(round, set) in &self.rounds {
-			map.insert(
-				super::round_topic::<B>(round.0, set.0),
-				(Some(round), set)
-			);
+			map.insert(super::round_topic::<B>(round.0, set.0), (Some(round), set));
 		}
 
 		self.reverse_map = map;
@@ -310,10 +309,8 @@ impl<B: BlockT> KeepTopics<B> {
 // topics to send to a neighbor based on their view.
 fn neighbor_topics<B: BlockT>(view: &View<NumberFor<B>>) -> Vec<B::Hash> {
 	let s = view.set_id;
-	let mut topics = vec![
-		super::global_topic::<B>(s.0),
-		super::round_topic::<B>(view.round.0, s.0),
-	];
+	let mut topics =
+		vec![super::global_topic::<B>(s.0), super::round_topic::<B>(view.round.0, s.0)];
 
 	if view.round.0 != 0 {
 		let r = Round(view.round.0 - 1);
@@ -423,15 +420,9 @@ pub(super) enum Misbehavior {
 	// could not decode neighbor message. bytes-length of the packet.
 	UndecodablePacket(i32),
 	// Bad catch up message (invalid signatures).
-	BadCatchUpMessage {
-		signatures_checked: i32,
-	},
+	BadCatchUpMessage { signatures_checked: i32 },
 	// Bad commit message
-	BadCommitMessage {
-		signatures_checked: i32,
-		blocks_loaded: i32,
-		equivocations_caught: i32,
-	},
+	BadCommitMessage { signatures_checked: i32, blocks_loaded: i32, equivocations_caught: i32 },
 	// A message received that's from the future relative to our view.
 	// always misbehavior.
 	FutureMessage,
@@ -462,7 +453,10 @@ impl Misbehavior {
 
 				let benefit = equivocations_caught.saturating_mul(benefit::PER_EQUIVOCATION);
 
-				ReputationChange::new((benefit as i32).saturating_add(cost as i32), "Grandpa: Bad commit")
+				ReputationChange::new(
+					(benefit as i32).saturating_add(cost as i32),
+					"Grandpa: Bad commit",
+				)
 			},
 			FutureMessage => cost::FUTURE_MESSAGE,
 			OutOfScopeMessage => cost::OUT_OF_SCOPE_MESSAGE,
@@ -478,10 +472,7 @@ struct PeerInfo<N> {
 
 impl<N> PeerInfo<N> {
 	fn new(roles: ObservedRole) -> Self {
-		PeerInfo {
-			view: View::default(),
-			roles,
-		}
+		PeerInfo { view: View::default(), roles }
 	}
 }
 
@@ -515,14 +506,14 @@ impl<N: Ord> Peers<N> {
 		match role {
 			ObservedRole::Authority if self.first_stage_peers.len() < LUCKY_PEERS => {
 				self.first_stage_peers.insert(who.clone());
-			}
+			},
 			ObservedRole::Authority if self.second_stage_peers.len() < LUCKY_PEERS => {
 				self.second_stage_peers.insert(who.clone());
-			}
+			},
 			ObservedRole::Light if self.lucky_light_peers.len() < LUCKY_PEERS => {
 				self.lucky_light_peers.insert(who.clone());
-			}
-			_ => {}
+			},
+			_ => {},
 		}
 
 		self.inner.insert(who, PeerInfo::new(role));
@@ -548,12 +539,12 @@ impl<N: Ord> Peers<N> {
 			Some(p) => p,
 		};
 
-		let invalid_change = peer.view.set_id > update.set_id
-			|| peer.view.round > update.round && peer.view.set_id == update.set_id
-			|| peer.view.last_commit.as_ref() > Some(&update.commit_finalized_height);
+		let invalid_change = peer.view.set_id > update.set_id ||
+			peer.view.round > update.round && peer.view.set_id == update.set_id ||
+			peer.view.last_commit.as_ref() > Some(&update.commit_finalized_height);
 
 		if invalid_change {
-			return Err(Misbehavior::InvalidViewChange);
+			return Err(Misbehavior::InvalidViewChange)
 		}
 
 		peer.view = View {
@@ -578,7 +569,7 @@ impl<N: Ord> Peers<N> {
 		// same height, because there is still a misbehavior condition based on
 		// sending commits that are <= the best we are aware of.
 		if peer.view.last_commit.as_ref() > Some(&new_height) {
-			return Err(Misbehavior::InvalidViewChange);
+			return Err(Misbehavior::InvalidViewChange)
 		}
 
 		peer.view.last_commit = Some(new_height);
@@ -630,7 +621,7 @@ impl<N: Ord> Peers<N> {
 			} else if n_authorities_added < one_and_a_half_lucky {
 				second_stage_peers.insert(peer_id.clone());
 			} else {
-				break;
+				break
 			}
 
 			n_authorities_added += 1;
@@ -641,7 +632,7 @@ impl<N: Ord> Peers<N> {
 		let n_second_stage_peers = LUCKY_PEERS.max((shuffled_peers.len() as f32).sqrt() as usize);
 		for (peer_id, info) in &shuffled_peers {
 			if info.roles.is_light() {
-				continue;
+				continue
 			}
 
 			if first_stage_peers.len() < LUCKY_PEERS {
@@ -652,20 +643,14 @@ impl<N: Ord> Peers<N> {
 					second_stage_peers.insert(peer_id.clone());
 				}
 			} else {
-				break;
+				break
 			}
 		}
 
 		// pick `LUCKY_PEERS` random light peers
 		let lucky_light_peers = shuffled_peers
 			.into_iter()
-			.filter_map(|(peer_id, info)| {
-				if info.roles.is_light() {
-					Some(peer_id)
-				} else {
-					None
-				}
-			})
+			.filter_map(|(peer_id, info)| if info.roles.is_light() { Some(peer_id) } else { None })
 			.take(LUCKY_PEERS)
 			.collect();
 
@@ -691,15 +676,9 @@ enum PendingCatchUp {
 	/// No pending catch up requests.
 	None,
 	/// Pending catch up request which has not been answered yet.
-	Requesting {
-		who: PeerId,
-		request: CatchUpRequestMessage,
-		instant: Instant,
-	},
+	Requesting { who: PeerId, request: CatchUpRequestMessage, instant: Instant },
 	/// Pending catch up request that was answered and is being processed.
-	Processing {
-		instant: Instant,
-	},
+	Processing { instant: Instant },
 }
 
 /// Configuration for the round catch-up mechanism.
@@ -730,10 +709,7 @@ impl CatchUpConfig {
 	fn request_allowed<N>(&self, peer: &PeerInfo<N>) -> bool {
 		match self {
 			CatchUpConfig::Disabled => false,
-			CatchUpConfig::Enabled {
-				only_from_authorities,
-				..
-			} => match peer.roles {
+			CatchUpConfig::Enabled { only_from_authorities, .. } => match peer.roles {
 				ObservedRole::Authority => true,
 				ObservedRole::Light => false,
 				ObservedRole::Full => !only_from_authorities,
@@ -795,11 +771,12 @@ impl<Block: BlockT> Inner<Block> {
 		{
 			let local_view = match self.local_view {
 				None => return None,
-				Some(ref mut v) => if v.round == round {
-					return None
-				} else {
-					v
-				},
+				Some(ref mut v) =>
+					if v.round == round {
+						return None
+					} else {
+						v
+					},
 			};
 
 			let set_id = local_view.set_id;
@@ -820,27 +797,24 @@ impl<Block: BlockT> Inner<Block> {
 	fn note_set(&mut self, set_id: SetId, authorities: Vec<AuthorityId>) -> MaybeMessage<Block> {
 		{
 			let local_view = match self.local_view {
-				ref mut x @ None => x.get_or_insert(LocalView::new(
-					set_id,
-					Round(1),
-				)),
-				Some(ref mut v) => if v.set_id == set_id {
-					let diff_authorities =
-						self.authorities.iter().collect::<HashSet<_>>() !=
-						authorities.iter().collect();
-
-					if diff_authorities {
-						debug!(target: "afg",
-							"Gossip validator noted set {:?} twice with different authorities. \
-							Was the authority set hard forked?",
-							set_id,
-						);
-						self.authorities = authorities;
-					}
-					return None;
-				} else {
-					v
-				},
+				ref mut x @ None => x.get_or_insert(LocalView::new(set_id, Round(1))),
+				Some(ref mut v) =>
+					if v.set_id == set_id {
+						let diff_authorities = self.authorities.iter().collect::<HashSet<_>>() !=
+							authorities.iter().collect();
+
+						if diff_authorities {
+							debug!(target: "afg",
+								"Gossip validator noted set {:?} twice with different authorities. \
+								Was the authority set hard forked?",
+								set_id,
+							);
+							self.authorities = authorities;
+						}
+						return None
+					} else {
+						v
+					},
 			};
 
 			local_view.update_set(set_id);
@@ -860,11 +834,12 @@ impl<Block: BlockT> Inner<Block> {
 		{
 			match self.local_view {
 				None => return None,
-				Some(ref mut v) => if v.last_commit_height() < Some(&finalized) {
-					v.last_commit = Some((finalized, round, set_id));
-				} else {
-					return None
-				},
+				Some(ref mut v) =>
+					if v.last_commit_height() < Some(&finalized) {
+						v.last_commit = Some((finalized, round, set_id));
+					} else {
+						return None
+					},
 			};
 		}
 
@@ -872,30 +847,40 @@ impl<Block: BlockT> Inner<Block> {
 	}
 
 	fn consider_vote(&self, round: Round, set_id: SetId) -> Consider {
-		self.local_view.as_ref()
+		self.local_view
+			.as_ref()
 			.map(LocalView::as_view)
 			.map(|v| v.consider_vote(round, set_id))
 			.unwrap_or(Consider::RejectOutOfScope)
 	}
 
 	fn consider_global(&self, set_id: SetId, number: NumberFor<Block>) -> Consider {
-		self.local_view.as_ref()
+		self.local_view
+			.as_ref()
 			.map(LocalView::as_view)
 			.map(|v| v.consider_global(set_id, &number))
 			.unwrap_or(Consider::RejectOutOfScope)
 	}
 
-	fn cost_past_rejection(&self, _who: &PeerId, _round: Round, _set_id: SetId) -> ReputationChange {
+	fn cost_past_rejection(
+		&self,
+		_who: &PeerId,
+		_round: Round,
+		_set_id: SetId,
+	) -> ReputationChange {
 		// hardcoded for now.
 		cost::PAST_REJECTION
 	}
 
-	fn validate_round_message(&self, who: &PeerId, full: &VoteMessage<Block>)
-		-> Action<Block::Hash>
-	{
+	fn validate_round_message(
+		&self,
+		who: &PeerId,
+		full: &VoteMessage<Block>,
+	) -> Action<Block::Hash> {
 		match self.consider_vote(full.round, full.set_id) {
 			Consider::RejectFuture => return Action::Discard(Misbehavior::FutureMessage.cost()),
-			Consider::RejectOutOfScope => return Action::Discard(Misbehavior::OutOfScopeMessage.cost()),
+			Consider::RejectOutOfScope =>
+				return Action::Discard(Misbehavior::OutOfScopeMessage.cost()),
 			Consider::RejectPast =>
 				return Action::Discard(self.cost_past_rejection(who, full.round, full.set_id)),
 			Consider::Accept => {},
@@ -910,7 +895,7 @@ impl<Block: BlockT> Inner<Block> {
 				"afg.bad_msg_signature";
 				"signature" => ?full.message.id,
 			);
-			return Action::Discard(cost::UNKNOWN_VOTER);
+			return Action::Discard(cost::UNKNOWN_VOTER)
 		}
 
 		if !sp_finality_grandpa::check_message_signature(
@@ -927,30 +912,34 @@ impl<Block: BlockT> Inner<Block> {
 				"afg.bad_msg_signature";
 				"signature" => ?full.message.id,
 			);
-			return Action::Discard(cost::BAD_SIGNATURE);
+			return Action::Discard(cost::BAD_SIGNATURE)
 		}
 
 		let topic = super::round_topic::<Block>(full.round.0, full.set_id.0);
 		Action::Keep(topic, benefit::ROUND_MESSAGE)
 	}
 
-	fn validate_commit_message(&mut self, who: &PeerId, full: &FullCommitMessage<Block>)
-		-> Action<Block::Hash>
-	{
-
+	fn validate_commit_message(
+		&mut self,
+		who: &PeerId,
+		full: &FullCommitMessage<Block>,
+	) -> Action<Block::Hash> {
 		if let Err(misbehavior) = self.peers.update_commit_height(who, full.message.target_number) {
-			return Action::Discard(misbehavior.cost());
+			return Action::Discard(misbehavior.cost())
 		}
 
 		match self.consider_global(full.set_id, full.message.target_number) {
 			Consider::RejectFuture => return Action::Discard(Misbehavior::FutureMessage.cost()),
 			Consider::RejectPast =>
 				return Action::Discard(self.cost_past_rejection(who, full.round, full.set_id)),
-			Consider::RejectOutOfScope => return Action::Discard(Misbehavior::OutOfScopeMessage.cost()),
+			Consider::RejectOutOfScope =>
+				return Action::Discard(Misbehavior::OutOfScopeMessage.cost()),
 			Consider::Accept => {},
 		}
 
-		if full.message.precommits.len() != full.message.auth_data.len() || full.message.precommits.is_empty() {
+		if full.message.precommits.len() != full.message.auth_data.len() ||
+			full.message.precommits.is_empty()
+		{
 			debug!(target: "afg", "Malformed compact commit");
 			telemetry!(
 				self.config.telemetry;
@@ -960,7 +949,7 @@ impl<Block: BlockT> Inner<Block> {
 				"auth_data_len" => ?full.message.auth_data.len(),
 				"precommits_is_empty" => ?full.message.precommits.is_empty(),
 			);
-			return Action::Discard(cost::MALFORMED_COMMIT);
+			return Action::Discard(cost::MALFORMED_COMMIT)
 		}
 
 		// always discard commits initially and rebroadcast after doing full
@@ -969,33 +958,33 @@ impl<Block: BlockT> Inner<Block> {
 		Action::ProcessAndDiscard(topic, benefit::BASIC_VALIDATED_COMMIT)
 	}
 
-	fn validate_catch_up_message(&mut self, who: &PeerId, full: &FullCatchUpMessage<Block>)
-		-> Action<Block::Hash>
-	{
+	fn validate_catch_up_message(
+		&mut self,
+		who: &PeerId,
+		full: &FullCatchUpMessage<Block>,
+	) -> Action<Block::Hash> {
 		match &self.pending_catch_up {
 			PendingCatchUp::Requesting { who: peer, request, instant } => {
 				if peer != who {
-					return Action::Discard(Misbehavior::OutOfScopeMessage.cost());
+					return Action::Discard(Misbehavior::OutOfScopeMessage.cost())
 				}
 
 				if request.set_id != full.set_id {
-					return Action::Discard(cost::MALFORMED_CATCH_UP);
+					return Action::Discard(cost::MALFORMED_CATCH_UP)
 				}
 
 				if request.round.0 > full.message.round_number {
-					return Action::Discard(cost::MALFORMED_CATCH_UP);
+					return Action::Discard(cost::MALFORMED_CATCH_UP)
 				}
 
 				if full.message.prevotes.is_empty() || full.message.precommits.is_empty() {
-					return Action::Discard(cost::MALFORMED_CATCH_UP);
+					return Action::Discard(cost::MALFORMED_CATCH_UP)
 				}
 
 				// move request to pending processing state, we won't push out
 				// any catch up requests until we import this one (either with a
 				// success or failure).
-				self.pending_catch_up = PendingCatchUp::Processing {
-					instant: *instant,
-				};
+				self.pending_catch_up = PendingCatchUp::Processing { instant: *instant };
 
 				// always discard catch up messages, they're point-to-point
 				let topic = super::global_topic::<Block>(full.set_id.0);
@@ -1036,15 +1025,14 @@ impl<Block: BlockT> Inner<Block> {
 			if request.set_id.0.saturating_add(1) == local_view.set_id.0 &&
 				local_view.round.0.saturating_sub(CATCH_UP_THRESHOLD) == 0
 			{
-				return (None, Action::Discard(cost::HONEST_OUT_OF_SCOPE_CATCH_UP));
+				return (None, Action::Discard(cost::HONEST_OUT_OF_SCOPE_CATCH_UP))
 			}
 
-			return (None, Action::Discard(Misbehavior::OutOfScopeMessage.cost()));
+			return (None, Action::Discard(Misbehavior::OutOfScopeMessage.cost()))
 		}
 
 		match self.peers.peer(who) {
-			None =>
-				return (None, Action::Discard(Misbehavior::OutOfScopeMessage.cost())),
+			None => return (None, Action::Discard(Misbehavior::OutOfScopeMessage.cost())),
 			Some(peer) if peer.view.round >= request.round =>
 				return (None, Action::Discard(Misbehavior::OutOfScopeMessage.cost())),
 			_ => {},
@@ -1052,7 +1040,7 @@ impl<Block: BlockT> Inner<Block> {
 
 		let last_completed_round = set_state.read().last_completed_round();
 		if last_completed_round.number < request.round.0 {
-			return (None, Action::Discard(Misbehavior::OutOfScopeMessage.cost()));
+			return (None, Action::Discard(Misbehavior::OutOfScopeMessage.cost()))
 		}
 
 		trace!(target: "afg", "Replying to catch-up request for round {} from {} with round {}",
@@ -1123,10 +1111,8 @@ impl<Block: BlockT> Inner<Block> {
 			{
 				// send catch up request if allowed
 				let round = peer.view.round.0 - 1; // peer.view.round is > 0
-				let request = CatchUpRequestMessage {
-					set_id: peer.view.set_id,
-					round: Round(round),
-				};
+				let request =
+					CatchUpRequestMessage { set_id: peer.view.set_id, round: Round(round) };
 
 				let (catch_up_allowed, catch_up_report) = self.note_catch_up_request(who, &request);
 
@@ -1146,16 +1132,17 @@ impl<Block: BlockT> Inner<Block> {
 		(catch_up, report)
 	}
 
-	fn import_neighbor_message(&mut self, who: &PeerId, update: NeighborPacket<NumberFor<Block>>)
-		-> (Vec<Block::Hash>, Action<Block::Hash>, Option<GossipMessage<Block>>, Option<Report>)
-	{
+	fn import_neighbor_message(
+		&mut self,
+		who: &PeerId,
+		update: NeighborPacket<NumberFor<Block>>,
+	) -> (Vec<Block::Hash>, Action<Block::Hash>, Option<GossipMessage<Block>>, Option<Report>) {
 		let update_res = self.peers.update_peer_state(who, update);
 
 		let (cost_benefit, topics) = match update_res {
 			Ok(view) =>
 				(benefit::NEIGHBOR_MESSAGE, view.map(|view| neighbor_topics::<Block>(view))),
-			Err(misbehavior) =>
-				(misbehavior.cost(), None),
+			Err(misbehavior) => (misbehavior.cost(), None),
 		};
 
 		let (catch_up, report) = match update_res {
@@ -1207,14 +1194,14 @@ impl<Block: BlockT> Inner<Block> {
 		let report = match &self.pending_catch_up {
 			PendingCatchUp::Requesting { who: peer, instant, .. } =>
 				if instant.elapsed() <= CATCH_UP_REQUEST_TIMEOUT {
-					return (false, None);
+					return (false, None)
 				} else {
 					// report peer for timeout
 					Some((peer.clone(), cost::CATCH_UP_REQUEST_TIMEOUT))
 				},
 			PendingCatchUp::Processing { instant, .. } =>
 				if instant.elapsed() < CATCH_UP_PROCESS_TIMEOUT {
-					return (false, None);
+					return (false, None)
 				} else {
 					None
 				},
@@ -1246,19 +1233,16 @@ impl<Block: BlockT> Inner<Block> {
 		};
 
 		if self.config.local_role.is_light() {
-			return false;
+			return false
 		}
 
 		if round_elapsed < round_duration.mul_f32(PROPAGATION_SOME) {
 			self.peers.first_stage_peers.contains(who)
 		} else if round_elapsed < round_duration.mul_f32(PROPAGATION_ALL) {
-			self.peers.first_stage_peers.contains(who)
-				|| self.peers.second_stage_peers.contains(who)
+			self.peers.first_stage_peers.contains(who) ||
+				self.peers.second_stage_peers.contains(who)
 		} else {
-			self.peers
-				.peer(who)
-				.map(|info| !info.roles.is_light())
-				.unwrap_or(false)
+			self.peers.peer(who).map(|info| !info.roles.is_light()).unwrap_or(false)
 		}
 	}
 
@@ -1283,13 +1267,13 @@ impl<Block: BlockT> Inner<Block> {
 		};
 
 		if self.config.local_role.is_light() {
-			return false;
+			return false
 		}
 
 		if round_elapsed < round_duration.mul_f32(PROPAGATION_ALL) {
-			self.peers.first_stage_peers.contains(who)
-				|| self.peers.second_stage_peers.contains(who)
-				|| self.peers.lucky_light_peers.contains(who)
+			self.peers.first_stage_peers.contains(who) ||
+				self.peers.second_stage_peers.contains(who) ||
+				self.peers.lucky_light_peers.contains(who)
 		} else {
 			true
 		}
@@ -1302,15 +1286,17 @@ pub(crate) struct Metrics {
 }
 
 impl Metrics {
-	pub(crate) fn register(registry: &prometheus_endpoint::Registry) -> Result<Self, PrometheusError> {
+	pub(crate) fn register(
+		registry: &prometheus_endpoint::Registry,
+	) -> Result<Self, PrometheusError> {
 		Ok(Self {
 			messages_validated: register(
 				CounterVec::new(
 					Opts::new(
 						"finality_grandpa_communication_gossip_validator_messages",
-						"Number of messages validated by the finality grandpa gossip validator."
+						"Number of messages validated by the finality grandpa gossip validator.",
 					),
-					&["message", "action"]
+					&["message", "action"],
 				)?,
 				registry,
 			)?,
@@ -1336,7 +1322,7 @@ impl<Block: BlockT> GossipValidator<Block> {
 		set_state: environment::SharedVoterSetState<Block>,
 		prometheus_registry: Option<&Registry>,
 		telemetry: Option<TelemetryHandle>,
-	) -> (GossipValidator<Block>, TracingUnboundedReceiver<PeerReport>)	{
+	) -> (GossipValidator<Block>, TracingUnboundedReceiver<PeerReport>) {
 		let metrics = match prometheus_registry.map(Metrics::register) {
 			Some(Ok(metrics)) => Some(metrics),
 			Some(Err(e)) => {
@@ -1360,7 +1346,8 @@ impl<Block: BlockT> GossipValidator<Block> {
 
 	/// Note a round in the current set has started.
 	pub(super) fn note_round<F>(&self, round: Round, send_neighbor: F)
-		where F: FnOnce(Vec<PeerId>, NeighborPacket<NumberFor<Block>>)
+	where
+		F: FnOnce(Vec<PeerId>, NeighborPacket<NumberFor<Block>>),
 	{
 		let maybe_msg = self.inner.write().note_round(round);
 		if let Some((to, msg)) = maybe_msg {
@@ -1371,7 +1358,8 @@ impl<Block: BlockT> GossipValidator<Block> {
 	/// Note that a voter set with given ID has started. Updates the current set to given
 	/// value and initializes the round to 0.
 	pub(super) fn note_set<F>(&self, set_id: SetId, authorities: Vec<AuthorityId>, send_neighbor: F)
-		where F: FnOnce(Vec<PeerId>, NeighborPacket<NumberFor<Block>>)
+	where
+		F: FnOnce(Vec<PeerId>, NeighborPacket<NumberFor<Block>>),
 	{
 		let maybe_msg = self.inner.write().note_set(set_id, authorities);
 		if let Some((to, msg)) = maybe_msg {
@@ -1386,14 +1374,10 @@ impl<Block: BlockT> GossipValidator<Block> {
 		set_id: SetId,
 		finalized: NumberFor<Block>,
 		send_neighbor: F,
-	)
-		where F: FnOnce(Vec<PeerId>, NeighborPacket<NumberFor<Block>>)
+	) where
+		F: FnOnce(Vec<PeerId>, NeighborPacket<NumberFor<Block>>),
 	{
-		let maybe_msg = self.inner.write().note_commit_finalized(
-			round,
-			set_id,
-			finalized,
-		);
+		let maybe_msg = self.inner.write().note_commit_finalized(round, set_id, finalized);
 
 		if let Some((to, msg)) = maybe_msg {
 			send_neighbor(to, msg);
@@ -1401,7 +1385,7 @@ impl<Block: BlockT> GossipValidator<Block> {
 	}
 
 	/// Note that we've processed a catch up message.
-	pub(super) fn note_catch_up_message_processed(&self)	{
+	pub(super) fn note_catch_up_message_processed(&self) {
 		self.inner.write().note_catch_up_message_processed();
 	}
 
@@ -1409,9 +1393,11 @@ impl<Block: BlockT> GossipValidator<Block> {
 		let _ = self.report_sender.unbounded_send(PeerReport { who, cost_benefit });
 	}
 
-	pub(super) fn do_validate(&self, who: &PeerId, mut data: &[u8])
-		-> (Action<Block::Hash>, Vec<Block::Hash>, Option<GossipMessage<Block>>)
-	{
+	pub(super) fn do_validate(
+		&self,
+		who: &PeerId,
+		mut data: &[u8],
+	) -> (Action<Block::Hash>, Vec<Block::Hash>, Option<GossipMessage<Block>>) {
 		let mut broadcast_topics = Vec::new();
 		let mut peer_reply = None;
 
@@ -1430,10 +1416,10 @@ impl<Block: BlockT> GossipValidator<Block> {
 				},
 				Ok(GossipMessage::Neighbor(update)) => {
 					message_name = Some("neighbor");
-					let (topics, action, catch_up, report) = self.inner.write().import_neighbor_message(
-						who,
-						update.into_neighbor_packet(),
-					);
+					let (topics, action, catch_up, report) = self
+						.inner
+						.write()
+						.import_neighbor_message(who, update.into_neighbor_packet());
 
 					if let Some((peer, cost_benefit)) = report {
 						self.report(peer, cost_benefit);
@@ -1442,22 +1428,19 @@ impl<Block: BlockT> GossipValidator<Block> {
 					broadcast_topics = topics;
 					peer_reply = catch_up;
 					action
-				}
+				},
 				Ok(GossipMessage::CatchUp(ref message)) => {
 					message_name = Some("catch_up");
 					self.inner.write().validate_catch_up_message(who, message)
 				},
 				Ok(GossipMessage::CatchUpRequest(request)) => {
 					message_name = Some("catch_up_request");
-					let (reply, action) = self.inner.write().handle_catch_up_request(
-						who,
-						request,
-						&self.set_state,
-					);
+					let (reply, action) =
+						self.inner.write().handle_catch_up_request(who, request, &self.set_state);
 
 					peer_reply = reply;
 					action
-				}
+				},
 				Err(e) => {
 					message_name = None;
 					debug!(target: "afg", "Error decoding message: {}", e);
@@ -1470,7 +1453,7 @@ impl<Block: BlockT> GossipValidator<Block> {
 
 					let len = std::cmp::min(i32::MAX as usize, data.len()) as i32;
 					Action::Discard(Misbehavior::UndecodablePacket(len).cost())
-				}
+				},
 			}
 		};
 
@@ -1494,17 +1477,20 @@ impl<Block: BlockT> GossipValidator<Block> {
 }
 
 impl<Block: BlockT> sc_network_gossip::Validator<Block> for GossipValidator<Block> {
-	fn new_peer(&self, context: &mut dyn ValidatorContext<Block>, who: &PeerId, roles: ObservedRole) {
+	fn new_peer(
+		&self,
+		context: &mut dyn ValidatorContext<Block>,
+		who: &PeerId,
+		roles: ObservedRole,
+	) {
 		let packet = {
 			let mut inner = self.inner.write();
 			inner.peers.new_peer(who.clone(), roles);
 
-			inner.local_view.as_ref().map(|v| {
-				NeighborPacket {
-					round: v.round,
-					set_id: v.set_id,
-					commit_finalized_height: *v.last_commit_height().unwrap_or(&Zero::zero()),
-				}
+			inner.local_view.as_ref().map(|v| NeighborPacket {
+				round: v.round,
+				set_id: v.set_id,
+				commit_finalized_height: *v.last_commit_height().unwrap_or(&Zero::zero()),
 			})
 		};
 
@@ -1540,15 +1526,15 @@ impl<Block: BlockT> sc_network_gossip::Validator<Block> for GossipValidator<Bloc
 				self.report(who.clone(), cb);
 				context.broadcast_message(topic, data.to_vec(), false);
 				sc_network_gossip::ValidationResult::ProcessAndKeep(topic)
-			}
+			},
 			Action::ProcessAndDiscard(topic, cb) => {
 				self.report(who.clone(), cb);
 				sc_network_gossip::ValidationResult::ProcessAndDiscard(topic)
-			}
+			},
 			Action::Discard(cb) => {
 				self.report(who.clone(), cb);
 				sc_network_gossip::ValidationResult::Discard
-			}
+			},
 		}
 	}
 
@@ -1573,7 +1559,7 @@ impl<Block: BlockT> sc_network_gossip::Validator<Block> for GossipValidator<Bloc
 
 		Box::new(move |who, intent, topic, mut data| {
 			if let MessageIntent::PeriodicRebroadcast = intent {
-				return do_rebroadcast;
+				return do_rebroadcast
 			}
 
 			let peer = match inner.peers.peer(who) {
@@ -1592,12 +1578,12 @@ impl<Block: BlockT> sc_network_gossip::Validator<Block> for GossipValidator<Bloc
 				if maybe_round.is_some() {
 					if !inner.round_message_allowed(who) {
 						// early return if the vote message isn't allowed at this stage.
-						return false;
+						return false
 					}
 				} else {
 					if !inner.global_message_allowed(who) {
 						// early return if the global message isn't allowed at this stage.
-						return false;
+						return false
 					}
 				}
 			}
@@ -1620,9 +1606,10 @@ impl<Block: BlockT> sc_network_gossip::Validator<Block> for GossipValidator<Bloc
 					// set the peer is in and if the commit is better than the
 					// last received by peer, additionally we make sure to only
 					// broadcast our best commit.
-					peer.view.consider_global(set_id, full.message.target_number) == Consider::Accept &&
-						Some(&full.message.target_number) == local_view.last_commit_height()
-				}
+					peer.view.consider_global(set_id, full.message.target_number) ==
+						Consider::Accept && Some(&full.message.target_number) ==
+						local_view.last_commit_height()
+				},
 				Ok(GossipMessage::Neighbor(_)) => false,
 				Ok(GossipMessage::CatchUpRequest(_)) => false,
 				Ok(GossipMessage::CatchUp(_)) => false,
@@ -1638,7 +1625,7 @@ impl<Block: BlockT> sc_network_gossip::Validator<Block> for GossipValidator<Bloc
 			// it is expired.
 			match inner.live_topics.topic_info(&topic) {
 				None => return true,
-				Some((Some(_), _)) => return false, // round messages don't require further checking.
+				Some((Some(_), _)) => return false, /* round messages don't require further checking. */
 				Some((None, _)) => {},
 			};
 
@@ -1652,11 +1639,10 @@ impl<Block: BlockT> sc_network_gossip::Validator<Block> for GossipValidator<Bloc
 				Err(_) => true,
 				Ok(GossipMessage::Commit(full)) => match local_view.last_commit {
 					Some((number, round, set_id)) =>
-						// we expire any commit message that doesn't target the same block
-						// as our best commit or isn't from the same round and set id
+					// we expire any commit message that doesn't target the same block
+					// as our best commit or isn't from the same round and set id
 						!(full.message.target_number == number &&
-							full.round == round &&
-							full.set_id == set_id),
+							full.round == round && full.set_id == set_id),
 					None => true,
 				},
 				Ok(_) => true,
@@ -1673,8 +1659,7 @@ pub(super) struct PeerReport {
 
 #[cfg(test)]
 mod tests {
-	use super::*;
-	use super::environment::SharedVoterSetState;
+	use super::{environment::SharedVoterSetState, *};
 	use sc_network::config::Role;
 	use sc_network_gossip::Validator as GossipValidatorT;
 	use sc_network_test::Block;
@@ -1695,19 +1680,14 @@ mod tests {
 
 	// dummy voter set state
 	fn voter_set_state() -> SharedVoterSetState<Block> {
-		use crate::authorities::AuthoritySet;
-		use crate::environment::VoterSetState;
+		use crate::{authorities::AuthoritySet, environment::VoterSetState};
 
 		let base = (H256::zero(), 0);
 
 		let voters = vec![(AuthorityId::from_slice(&[1; 32]), 1)];
 		let voters = AuthoritySet::genesis(voters).unwrap();
 
-		let set_state = VoterSetState::live(
-			0,
-			&voters,
-			base,
-		);
+		let set_state = VoterSetState::live(0, &voters, base);
 
 		set_state.into()
 	}
@@ -1752,11 +1732,8 @@ mod tests {
 		let mut peers = Peers::default();
 		let id = PeerId::random();
 
-		let update = NeighborPacket {
-			round: Round(5),
-			set_id: SetId(10),
-			commit_finalized_height: 50,
-		};
+		let update =
+			NeighborPacket { round: Round(5), set_id: SetId(10), commit_finalized_height: 50 };
 
 		let res = peers.update_peer_state(&id, update.clone());
 		assert!(res.unwrap().is_none());
@@ -1771,29 +1748,17 @@ mod tests {
 
 	#[test]
 	fn update_peer_state() {
-		let update1 = NeighborPacket {
-			round: Round(5),
-			set_id: SetId(10),
-			commit_finalized_height: 50u32,
-		};
+		let update1 =
+			NeighborPacket { round: Round(5), set_id: SetId(10), commit_finalized_height: 50u32 };
 
-		let update2 = NeighborPacket {
-			round: Round(6),
-			set_id: SetId(10),
-			commit_finalized_height: 60,
-		};
+		let update2 =
+			NeighborPacket { round: Round(6), set_id: SetId(10), commit_finalized_height: 60 };
 
-		let update3 = NeighborPacket {
-			round: Round(2),
-			set_id: SetId(11),
-			commit_finalized_height: 61,
-		};
+		let update3 =
+			NeighborPacket { round: Round(2), set_id: SetId(11), commit_finalized_height: 61 };
 
-		let update4 = NeighborPacket {
-			round: Round(3),
-			set_id: SetId(11),
-			commit_finalized_height: 80,
-		};
+		let update4 =
+			NeighborPacket { round: Round(3), set_id: SetId(11), commit_finalized_height: 80 };
 
 		let mut peers = Peers::default();
 		let id = PeerId::random();
@@ -1820,11 +1785,13 @@ mod tests {
 		let id = PeerId::random();
 		peers.new_peer(id.clone(), ObservedRole::Authority);
 
-		peers.update_peer_state(&id, NeighborPacket {
-			round: Round(10),
-			set_id: SetId(10),
-			commit_finalized_height: 10,
-		}).unwrap().unwrap();
+		peers
+			.update_peer_state(
+				&id,
+				NeighborPacket { round: Round(10), set_id: SetId(10), commit_finalized_height: 10 },
+			)
+			.unwrap()
+			.unwrap();
 
 		let mut check_update = move |update: NeighborPacket<_>| {
 			let err = peers.update_peer_state(&id, update.clone()).unwrap_err();
@@ -1853,12 +1820,7 @@ mod tests {
 
 	#[test]
 	fn messages_not_expired_immediately() {
-		let (val, _) = GossipValidator::<Block>::new(
-			config(),
-			voter_set_state(),
-			None,
-			None,
-		);
+		let (val, _) = GossipValidator::<Block>::new(config(), voter_set_state(), None, None);
 
 		let set_id = 1;
 
@@ -1890,12 +1852,7 @@ mod tests {
 	fn message_from_unknown_authority_discarded() {
 		assert!(cost::UNKNOWN_VOTER != cost::BAD_SIGNATURE);
 
-		let (val, _) = GossipValidator::<Block>::new(
-			config(),
-			voter_set_state(),
-			None,
-			None,
-		);
+		let (val, _) = GossipValidator::<Block>::new(config(), voter_set_state(), None, None);
 		let set_id = 1;
 		let auth = AuthorityId::from_slice(&[1u8; 32]);
 		let peer = PeerId::random();
@@ -1904,31 +1861,37 @@ mod tests {
 		val.note_round(Round(1), |_, _| {});
 
 		let inner = val.inner.read();
-		let unknown_voter = inner.validate_round_message(&peer, &VoteMessage {
-			round: Round(1),
-			set_id: SetId(set_id),
-			message: SignedMessage::<Block> {
-				message: finality_grandpa::Message::Prevote(finality_grandpa::Prevote {
-					target_hash: Default::default(),
-					target_number: 10,
-				}),
-				signature: Default::default(),
-				id: AuthorityId::from_slice(&[2u8; 32]),
-			}
-		});
+		let unknown_voter = inner.validate_round_message(
+			&peer,
+			&VoteMessage {
+				round: Round(1),
+				set_id: SetId(set_id),
+				message: SignedMessage::<Block> {
+					message: finality_grandpa::Message::Prevote(finality_grandpa::Prevote {
+						target_hash: Default::default(),
+						target_number: 10,
+					}),
+					signature: Default::default(),
+					id: AuthorityId::from_slice(&[2u8; 32]),
+				},
+			},
+		);
 
-		let bad_sig = inner.validate_round_message(&peer, &VoteMessage {
-			round: Round(1),
-			set_id: SetId(set_id),
-			message: SignedMessage::<Block> {
-				message: finality_grandpa::Message::Prevote(finality_grandpa::Prevote {
-					target_hash: Default::default(),
-					target_number: 10,
-				}),
-				signature: Default::default(),
-				id: auth.clone(),
-			}
-		});
+		let bad_sig = inner.validate_round_message(
+			&peer,
+			&VoteMessage {
+				round: Round(1),
+				set_id: SetId(set_id),
+				message: SignedMessage::<Block> {
+					message: finality_grandpa::Message::Prevote(finality_grandpa::Prevote {
+						target_hash: Default::default(),
+						target_number: 10,
+					}),
+					signature: Default::default(),
+					id: auth.clone(),
+				},
+			},
+		);
 
 		assert_eq!(unknown_voter, Action::Discard(cost::UNKNOWN_VOTER));
 		assert_eq!(bad_sig, Action::Discard(cost::BAD_SIGNATURE));
@@ -1936,12 +1899,7 @@ mod tests {
 
 	#[test]
 	fn unsolicited_catch_up_messages_discarded() {
-		let (val, _) = GossipValidator::<Block>::new(
-			config(),
-			voter_set_state(),
-			None,
-			None,
-		);
+		let (val, _) = GossipValidator::<Block>::new(config(), voter_set_state(), None, None);
 
 		let set_id = 1;
 		let auth = AuthorityId::from_slice(&[1u8; 32]);
@@ -1952,16 +1910,19 @@ mod tests {
 
 		let validate_catch_up = || {
 			let mut inner = val.inner.write();
-			inner.validate_catch_up_message(&peer, &FullCatchUpMessage {
-				set_id: SetId(set_id),
-				message: finality_grandpa::CatchUp {
-					round_number: 10,
-					prevotes: Default::default(),
-					precommits: Default::default(),
-					base_hash: Default::default(),
-					base_number: Default::default(),
-				}
-			})
+			inner.validate_catch_up_message(
+				&peer,
+				&FullCatchUpMessage {
+					set_id: SetId(set_id),
+					message: finality_grandpa::CatchUp {
+						round_number: 10,
+						prevotes: Default::default(),
+						precommits: Default::default(),
+						base_hash: Default::default(),
+						base_number: Default::default(),
+					},
+				},
+			)
 		};
 
 		// the catch up is discarded because we have no pending request
@@ -1969,10 +1930,7 @@ mod tests {
 
 		let noted = val.inner.write().note_catch_up_request(
 			&peer,
-			&CatchUpRequestMessage {
-				set_id: SetId(set_id),
-				round: Round(10),
-			}
+			&CatchUpRequestMessage { set_id: SetId(set_id), round: Round(10) },
 		);
 
 		assert!(noted.0);
@@ -1998,20 +1956,13 @@ mod tests {
 			let mut current_rounds = environment::CurrentRounds::new();
 			current_rounds.insert(3, environment::HasVoted::No);
 
-			let set_state = environment::VoterSetState::<Block>::Live {
-				completed_rounds,
-				current_rounds,
-			};
+			let set_state =
+				environment::VoterSetState::<Block>::Live { completed_rounds, current_rounds };
 
 			set_state.into()
 		};
 
-		let (val, _) = GossipValidator::<Block>::new(
-			config(),
-			set_state.clone(),
-			None,
-			None,
-		);
+		let (val, _) = GossipValidator::<Block>::new(config(), set_state.clone(), None, None);
 
 		let set_id = 1;
 		let auth = AuthorityId::from_slice(&[1u8; 32]);
@@ -2027,10 +1978,7 @@ mod tests {
 
 		let res = inner.handle_catch_up_request(
 			&peer,
-			CatchUpRequestMessage {
-				set_id: SetId(set_id),
-				round: Round(10),
-			},
+			CatchUpRequestMessage { set_id: SetId(set_id), round: Round(10) },
 			&set_state,
 		);
 
@@ -2040,10 +1988,7 @@ mod tests {
 
 		let res = inner.handle_catch_up_request(
 			&peer,
-			CatchUpRequestMessage {
-				set_id: SetId(set_id),
-				round: Round(2),
-			},
+			CatchUpRequestMessage { set_id: SetId(set_id), round: Round(2) },
 			&set_state,
 		);
 
@@ -2062,12 +2007,7 @@ mod tests {
 	#[test]
 	fn detects_honest_out_of_scope_catch_requests() {
 		let set_state = voter_set_state();
-		let (val, _) = GossipValidator::<Block>::new(
-			config(),
-			set_state.clone(),
-			None,
-			None,
-		);
+		let (val, _) = GossipValidator::<Block>::new(config(), set_state.clone(), None, None);
 
 		// the validator starts at set id 2
 		val.note_set(SetId(2), Vec::new(), |_, _| {});
@@ -2081,10 +2021,7 @@ mod tests {
 			let mut inner = val.inner.write();
 			inner.handle_catch_up_request(
 				&peer,
-				CatchUpRequestMessage {
-					set_id: SetId(set_id),
-					round: Round(round),
-				},
+				CatchUpRequestMessage { set_id: SetId(set_id), round: Round(round) },
 				&set_state,
 			)
 		};
@@ -2104,51 +2041,28 @@ mod tests {
 		// the validator is at set id 2 and round 0. requests for set id 1
 		// should not be answered but they should be considered an honest
 		// mistake
-		assert_res(
-			send_request(1, 1),
-			true,
-		);
+		assert_res(send_request(1, 1), true);
 
-		assert_res(
-			send_request(1, 10),
-			true,
-		);
+		assert_res(send_request(1, 10), true);
 
 		// requests for set id 0 should be considered out of scope
-		assert_res(
-			send_request(0, 1),
-			false,
-		);
+		assert_res(send_request(0, 1), false);
 
-		assert_res(
-			send_request(0, 10),
-			false,
-		);
+		assert_res(send_request(0, 10), false);
 
 		// after the validator progresses further than CATCH_UP_THRESHOLD in set
 		// id 2, any request for set id 1 should no longer be considered an
 		// honest mistake.
 		val.note_round(Round(3), |_, _| {});
 
-		assert_res(
-			send_request(1, 1),
-			false,
-		);
+		assert_res(send_request(1, 1), false);
 
-		assert_res(
-			send_request(1, 2),
-			false,
-		);
+		assert_res(send_request(1, 2), false);
 	}
 
 	#[test]
 	fn issues_catch_up_request_on_neighbor_packet_import() {
-		let (val, _) = GossipValidator::<Block>::new(
-			config(),
-			voter_set_state(),
-			None,
-			None,
-		);
+		let (val, _) = GossipValidator::<Block>::new(config(), voter_set_state(), None, None);
 
 		// the validator starts at set id 1.
 		val.note_set(SetId(1), Vec::new(), |_, _| {});
@@ -2218,12 +2132,7 @@ mod tests {
 			c
 		};
 
-		let (val, _) = GossipValidator::<Block>::new(
-			config,
-			voter_set_state(),
-			None,
-			None,
-		);
+		let (val, _) = GossipValidator::<Block>::new(config, voter_set_state(), None, None);
 
 		// the validator starts at set id 1.
 		val.note_set(SetId(1), Vec::new(), |_, _| {});
@@ -2238,11 +2147,7 @@ mod tests {
 		// we should get `None`.
 		let (_, _, catch_up_request, _) = val.inner.write().import_neighbor_message(
 			&peer,
-			NeighborPacket {
-				round: Round(42),
-				set_id: SetId(1),
-				commit_finalized_height: 50,
-			},
+			NeighborPacket { round: Round(42), set_id: SetId(1), commit_finalized_height: 50 },
 		);
 
 		match catch_up_request {
@@ -2253,12 +2158,7 @@ mod tests {
 
 	#[test]
 	fn doesnt_send_catch_up_requests_to_non_authorities_when_observer_enabled() {
-		let (val, _) = GossipValidator::<Block>::new(
-			config(),
-			voter_set_state(),
-			None,
-			None,
-		);
+		let (val, _) = GossipValidator::<Block>::new(config(), voter_set_state(), None, None);
 
 		// the validator starts at set id 1.
 		val.note_set(SetId(1), Vec::new(), |_, _| {});
@@ -2268,17 +2168,16 @@ mod tests {
 		let peer_authority = PeerId::random();
 		let peer_full = PeerId::random();
 
-		val.inner.write().peers.new_peer(peer_authority.clone(), ObservedRole::Authority);
+		val.inner
+			.write()
+			.peers
+			.new_peer(peer_authority.clone(), ObservedRole::Authority);
 		val.inner.write().peers.new_peer(peer_full.clone(), ObservedRole::Full);
 
 		let import_neighbor_message = |peer| {
 			let (_, _, catch_up_request, _) = val.inner.write().import_neighbor_message(
 				&peer,
-				NeighborPacket {
-					round: Round(42),
-					set_id: SetId(1),
-					commit_finalized_height: 50,
-				},
+				NeighborPacket { round: Round(42), set_id: SetId(1), commit_finalized_height: 50 },
 			);
 
 			catch_up_request
@@ -2314,12 +2213,7 @@ mod tests {
 			c
 		};
 
-		let (val, _) = GossipValidator::<Block>::new(
-			config,
-			voter_set_state(),
-			None,
-			None,
-		);
+		let (val, _) = GossipValidator::<Block>::new(config, voter_set_state(), None, None);
 
 		// the validator starts at set id 1.
 		val.note_set(SetId(1), Vec::new(), |_, _| {});
@@ -2331,11 +2225,7 @@ mod tests {
 
 		let (_, _, catch_up_request, _) = val.inner.write().import_neighbor_message(
 			&peer_full,
-			NeighborPacket {
-				round: Round(42),
-				set_id: SetId(1),
-				commit_finalized_height: 50,
-			},
+			NeighborPacket { round: Round(42), set_id: SetId(1), commit_finalized_height: 50 },
 		);
 
 		// importing a neighbor message from a peer in the same set in a later
@@ -2354,12 +2244,7 @@ mod tests {
 	#[test]
 	fn doesnt_expire_next_round_messages() {
 		// NOTE: this is a regression test
-		let (val, _) = GossipValidator::<Block>::new(
-			config(),
-			voter_set_state(),
-			None,
-			None,
-		);
+		let (val, _) = GossipValidator::<Block>::new(config(), voter_set_state(), None, None);
 
 		// the validator starts at set id 1.
 		val.note_set(SetId(1), Vec::new(), |_, _| {});
@@ -2373,12 +2258,7 @@ mod tests {
 		// we accept messages from rounds 9, 10 and 11
 		// therefore neither of those should be considered expired
 		for round in &[9, 10, 11] {
-			assert!(
-				!is_expired(
-					crate::communication::round_topic::<Block>(*round, 1),
-					&[],
-				)
-			)
+			assert!(!is_expired(crate::communication::round_topic::<Block>(*round, 1), &[],))
 		}
 	}
 
@@ -2388,12 +2268,7 @@ mod tests {
 		config.gossip_duration = Duration::from_secs(300); // Set to high value to prevent test race
 		let round_duration = config.gossip_duration * ROUND_DURATION;
 
-		let (val, _) = GossipValidator::<Block>::new(
-			config,
-			voter_set_state(),
-			None,
-			None,
-		);
+		let (val, _) = GossipValidator::<Block>::new(config, voter_set_state(), None, None);
 
 		// the validator start at set id 0
 		val.note_set(SetId(0), Vec::new(), |_, _| {});
@@ -2411,10 +2286,7 @@ mod tests {
 				.peers
 				.new_peer(authorities[i].clone(), ObservedRole::Authority);
 
-			val.inner
-				.write()
-				.peers
-				.new_peer(full_nodes[i].clone(), ObservedRole::Full);
+			val.inner.write().peers.new_peer(full_nodes[i].clone(), ObservedRole::Full);
 		}
 
 		let test = |rounds_elapsed, peers| {
@@ -2458,11 +2330,7 @@ mod tests {
 			sum / n
 		}
 
-		let all_peers = authorities
-			.iter()
-			.chain(full_nodes.iter())
-			.cloned()
-			.collect();
+		let all_peers = authorities.iter().chain(full_nodes.iter()).cloned().collect();
 
 		// on the first attempt we will only gossip to 4 peers, either
 		// authorities or full nodes, but we'll guarantee that half of those
@@ -2497,10 +2365,7 @@ mod tests {
 		// add a new light client as peer
 		let light_peer = PeerId::random();
 
-		val.inner
-			.write()
-			.peers
-			.new_peer(light_peer.clone(), ObservedRole::Light);
+		val.inner.write().peers.new_peer(light_peer.clone(), ObservedRole::Light);
 
 		assert!(!val.message_allowed()(
 			&light_peer,
@@ -2529,11 +2394,7 @@ mod tests {
 			.peers
 			.update_peer_state(
 				&light_peer,
-				NeighborPacket {
-					round: Round(1),
-					set_id: SetId(0),
-					commit_finalized_height: 1,
-				},
+				NeighborPacket { round: Round(1), set_id: SetId(0), commit_finalized_height: 1 },
 			)
 			.unwrap();
 
@@ -2576,30 +2437,20 @@ mod tests {
 		// add a new peer at set id 1
 		let peer1 = PeerId::random();
 
-		val.inner
-			.write()
-			.peers
-			.new_peer(peer1.clone(), ObservedRole::Authority);
+		val.inner.write().peers.new_peer(peer1.clone(), ObservedRole::Authority);
 
 		val.inner
 			.write()
 			.peers
 			.update_peer_state(
 				&peer1,
-				NeighborPacket {
-					round: Round(1),
-					set_id: SetId(1),
-					commit_finalized_height: 1,
-				},
+				NeighborPacket { round: Round(1), set_id: SetId(1), commit_finalized_height: 1 },
 			)
 			.unwrap();
 
 		// peer2 will default to set id 0
 		let peer2 = PeerId::random();
-		val.inner
-			.write()
-			.peers
-			.new_peer(peer2.clone(), ObservedRole::Authority);
+		val.inner.write().peers.new_peer(peer2.clone(), ObservedRole::Authority);
 
 		// create a commit for round 1 of set id 1
 		// targeting a block at height 2
@@ -2677,22 +2528,15 @@ mod tests {
 
 		// a commit message for round 1 that finalizes the same height as we
 		// have observed previously should not be expired
-		assert!(!message_expired(
-			crate::communication::global_topic::<Block>(1),
-			&commit(1, 1, 2),
-		));
+		assert!(
+			!message_expired(crate::communication::global_topic::<Block>(1), &commit(1, 1, 2),)
+		);
 
 		// it should be expired if it is for a lower block
-		assert!(message_expired(
-			crate::communication::global_topic::<Block>(1),
-			&commit(1, 1, 1),
-		));
+		assert!(message_expired(crate::communication::global_topic::<Block>(1), &commit(1, 1, 1),));
 
 		// or the same block height but from the previous round
-		assert!(message_expired(
-			crate::communication::global_topic::<Block>(1),
-			&commit(0, 1, 2),
-		));
+		assert!(message_expired(crate::communication::global_topic::<Block>(1), &commit(0, 1, 2),));
 	}
 
 	#[test]
diff --git a/client/finality-grandpa/src/communication/mod.rs b/client/finality-grandpa/src/communication/mod.rs
index 45bc72223e4b..077dc6a3f96b 100644
--- a/client/finality-grandpa/src/communication/mod.rs
+++ b/client/finality-grandpa/src/communication/mod.rs
@@ -29,37 +29,36 @@
 //! In the future, there will be a fallback for allowing sending the same message
 //! under certain conditions that are used to un-stick the protocol.
 
-use futures::{prelude::*, channel::mpsc};
+use futures::{channel::mpsc, prelude::*};
 use log::{debug, trace};
 use parking_lot::Mutex;
 use prometheus_endpoint::Registry;
-use std::{pin::Pin, sync::Arc, task::{Context, Poll}};
+use std::{
+	pin::Pin,
+	sync::Arc,
+	task::{Context, Poll},
+};
 
-use sp_keystore::SyncCryptoStorePtr;
-use finality_grandpa::Message::{Prevote, Precommit, PrimaryPropose};
-use finality_grandpa::{voter, voter_set::VoterSet};
+use finality_grandpa::{
+	voter,
+	voter_set::VoterSet,
+	Message::{Precommit, Prevote, PrimaryPropose},
+};
+use parity_scale_codec::{Decode, Encode};
 use sc_network::{NetworkService, ReputationChange};
 use sc_network_gossip::{GossipEngine, Network as GossipNetwork};
-use parity_scale_codec::{Encode, Decode};
-use sp_runtime::traits::{Block as BlockT, Hash as HashT, Header as HeaderT, NumberFor};
 use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_DEBUG, CONSENSUS_INFO};
+use sp_keystore::SyncCryptoStorePtr;
+use sp_runtime::traits::{Block as BlockT, Hash as HashT, Header as HeaderT, NumberFor};
 
 use crate::{
-	CatchUp, Commit, CommunicationIn, CommunicationOutH,
-	CompactCommit, Error, Message, SignedMessage,
+	environment::HasVoted, CatchUp, Commit, CommunicationIn, CommunicationOutH, CompactCommit,
+	Error, Message, SignedMessage,
 };
-use crate::environment::HasVoted;
 use gossip::{
-	FullCatchUpMessage,
-	FullCommitMessage,
-	GossipMessage,
-	GossipValidator,
-	PeerReport,
-	VoteMessage,
-};
-use sp_finality_grandpa::{
-	AuthorityId, AuthoritySignature, SetId as SetIdNumber, RoundNumber,
+	FullCatchUpMessage, FullCommitMessage, GossipMessage, GossipValidator, PeerReport, VoteMessage,
 };
+use sp_finality_grandpa::{AuthorityId, AuthoritySignature, RoundNumber, SetId as SetIdNumber};
 use sp_utils::mpsc::TracingUnboundedReceiver;
 
 pub mod gossip;
@@ -89,11 +88,13 @@ mod cost {
 	pub(super) const INVALID_CATCH_UP: Rep = Rep::new(-5000, "Grandpa: Invalid catch-up");
 	pub(super) const INVALID_COMMIT: Rep = Rep::new(-5000, "Grandpa: Invalid commit");
 	pub(super) const OUT_OF_SCOPE_MESSAGE: Rep = Rep::new(-500, "Grandpa: Out-of-scope message");
-	pub(super) const CATCH_UP_REQUEST_TIMEOUT: Rep = Rep::new(-200, "Grandpa: Catch-up request timeout");
+	pub(super) const CATCH_UP_REQUEST_TIMEOUT: Rep =
+		Rep::new(-200, "Grandpa: Catch-up request timeout");
 
 	// cost of answering a catch up request
 	pub(super) const CATCH_UP_REPLY: Rep = Rep::new(-200, "Grandpa: Catch-up reply");
-	pub(super) const HONEST_OUT_OF_SCOPE_CATCH_UP: Rep = Rep::new(-200, "Grandpa: Out-of-scope catch-up");
+	pub(super) const HONEST_OUT_OF_SCOPE_CATCH_UP: Rep =
+		Rep::new(-200, "Grandpa: Out-of-scope catch-up");
 }
 
 // benefit scalars for reporting peers.
@@ -144,14 +145,25 @@ pub trait Network<Block: BlockT>: GossipNetwork<Block> + Clone + Send + 'static
 	/// If the given vector of peers is empty then the underlying implementation
 	/// should make a best effort to fetch the block from any peers it is
 	/// connected to (NOTE: this assumption will change in the future #3629).
-	fn set_sync_fork_request(&self, peers: Vec<sc_network::PeerId>, hash: Block::Hash, number: NumberFor<Block>);
+	fn set_sync_fork_request(
+		&self,
+		peers: Vec<sc_network::PeerId>,
+		hash: Block::Hash,
+		number: NumberFor<Block>,
+	);
 }
 
-impl<B, H> Network<B> for Arc<NetworkService<B, H>> where
+impl<B, H> Network<B> for Arc<NetworkService<B, H>>
+where
 	B: BlockT,
 	H: sc_network::ExHashT,
 {
-	fn set_sync_fork_request(&self, peers: Vec<sc_network::PeerId>, hash: B::Hash, number: NumberFor<B>) {
+	fn set_sync_fork_request(
+		&self,
+		peers: Vec<sc_network::PeerId>,
+		hash: B::Hash,
+		number: NumberFor<B>,
+	) {
 		NetworkService::set_sync_fork_request(self, peers, hash, number)
 	}
 }
@@ -179,14 +191,12 @@ pub(crate) struct NetworkBridge<B: BlockT, N: Network<B>> {
 	neighbor_sender: periodic::NeighborPacketSender<B>,
 
 	/// `NeighborPacketWorker` processing packets sent through the `NeighborPacketSender`.
-	//
 	// `NetworkBridge` is required to be cloneable, thus one needs to be able to clone its children,
 	// thus one has to wrap `neighbor_packet_worker` with an `Arc` `Mutex`.
 	neighbor_packet_worker: Arc<Mutex<periodic::NeighborPacketWorker<B>>>,
 
 	/// Receiver side of the peer report stream populated by the gossip validator, forwarded to the
 	/// gossip engine.
-	//
 	// `NetworkBridge` is required to be cloneable, thus one needs to be able to clone its children,
 	// thus one has to wrap gossip_validator_report_stream with an `Arc` `Mutex`. Given that it is
 	// just an `UnboundedReceiver`, one could also switch to a multi-producer-*multi*-consumer
@@ -210,12 +220,8 @@ impl<B: BlockT, N: Network<B>> NetworkBridge<B, N> {
 		prometheus_registry: Option<&Registry>,
 		telemetry: Option<TelemetryHandle>,
 	) -> Self {
-		let (validator, report_stream) = GossipValidator::new(
-			config,
-			set_state.clone(),
-			prometheus_registry,
-			telemetry.clone(),
-		);
+		let (validator, report_stream) =
+			GossipValidator::new(config, set_state.clone(), prometheus_registry, telemetry.clone());
 
 		let validator = Arc::new(validator);
 		let gossip_engine = Arc::new(Mutex::new(GossipEngine::new(
@@ -239,18 +245,13 @@ impl<B: BlockT, N: Network<B>> NetworkBridge<B, N> {
 				validator.note_round(Round(round.number), |_, _| {});
 
 				for signed in round.votes.iter() {
-					let message = gossip::GossipMessage::Vote(
-						gossip::VoteMessage::<B> {
-							message: signed.clone(),
-							round: Round(round.number),
-							set_id: SetId(set_id),
-						}
-					);
+					let message = gossip::GossipMessage::Vote(gossip::VoteMessage::<B> {
+						message: signed.clone(),
+						round: Round(round.number),
+						set_id: SetId(set_id),
+					});
 
-					gossip_engine.lock().register_gossip_message(
-						topic,
-						message.encode(),
-					);
+					gossip_engine.lock().register_gossip_message(topic, message.encode());
 				}
 
 				trace!(target: "afg",
@@ -263,7 +264,8 @@ impl<B: BlockT, N: Network<B>> NetworkBridge<B, N> {
 			}
 		}
 
-		let (neighbor_packet_worker, neighbor_packet_sender) = periodic::NeighborPacketWorker::new();
+		let (neighbor_packet_worker, neighbor_packet_sender) =
+			periodic::NeighborPacketWorker::new();
 
 		NetworkBridge {
 			service,
@@ -277,12 +279,7 @@ impl<B: BlockT, N: Network<B>> NetworkBridge<B, N> {
 	}
 
 	/// Note the beginning of a new round to the `GossipValidator`.
-	pub(crate) fn note_round(
-		&self,
-		round: Round,
-		set_id: SetId,
-		voters: &VoterSet<AuthorityId>,
-	) {
+	pub(crate) fn note_round(&self, round: Round, set_id: SetId, voters: &VoterSet<AuthorityId>) {
 		// is a no-op if currently in that set.
 		self.validator.note_set(
 			set_id,
@@ -290,10 +287,8 @@ impl<B: BlockT, N: Network<B>> NetworkBridge<B, N> {
 			|to, neighbor| self.neighbor_sender.send(to, neighbor),
 		);
 
-		self.validator.note_round(
-			round,
-			|to, neighbor| self.neighbor_sender.send(to, neighbor),
-		);
+		self.validator
+			.note_round(round, |to, neighbor| self.neighbor_sender.send(to, neighbor));
 	}
 
 	/// Get a stream of signature-checked round messages from the network as well as a sink for round messages to the
@@ -305,15 +300,8 @@ impl<B: BlockT, N: Network<B>> NetworkBridge<B, N> {
 		set_id: SetId,
 		voters: Arc<VoterSet<AuthorityId>>,
 		has_voted: HasVoted<B>,
-	) -> (
-		impl Stream<Item = SignedMessage<B>> + Unpin,
-		OutgoingMessages<B>,
-	) {
-		self.note_round(
-			round,
-			set_id,
-			&*voters,
-		);
+	) -> (impl Stream<Item = SignedMessage<B>> + Unpin, OutgoingMessages<B>) {
+		self.note_round(round, set_id, &*voters);
 
 		let keystore = keystore.and_then(|ks| {
 			let id = ks.local_id();
@@ -326,20 +314,20 @@ impl<B: BlockT, N: Network<B>> NetworkBridge<B, N> {
 
 		let topic = round_topic::<B>(round.0, set_id.0);
 		let telemetry = self.telemetry.clone();
-		let incoming = self.gossip_engine.lock().messages_for(topic)
-			.filter_map(move |notification| {
+		let incoming =
+			self.gossip_engine.lock().messages_for(topic).filter_map(move |notification| {
 				let decoded = GossipMessage::<B>::decode(&mut &notification.message[..]);
 
 				match decoded {
 					Err(ref e) => {
 						debug!(target: "afg", "Skipping malformed message {:?}: {}", notification, e);
 						future::ready(None)
-					}
+					},
 					Ok(GossipMessage::Vote(msg)) => {
 						// check signature.
 						if !voters.contains(&msg.message.id) {
 							debug!(target: "afg", "Skipping message from unknown voter {}", msg.message.id);
-							return future::ready(None);
+							return future::ready(None)
 						}
 
 						if voters.len().get() <= TELEMETRY_VOTERS_LIMIT {
@@ -378,11 +366,11 @@ impl<B: BlockT, N: Network<B>> NetworkBridge<B, N> {
 						}
 
 						future::ready(Some(msg.message))
-					}
+					},
 					_ => {
 						debug!(target: "afg", "Skipping unknown message type");
 						future::ready(None)
-					}
+					},
 				}
 			});
 
@@ -458,7 +446,7 @@ impl<B: BlockT, N: Network<B>> NetworkBridge<B, N> {
 		&self,
 		peers: Vec<sc_network::PeerId>,
 		hash: B::Hash,
-		number: NumberFor<B>
+		number: NumberFor<B>,
 	) {
 		Network::set_sync_fork_request(&self.service, peers, hash, number)
 	}
@@ -473,9 +461,10 @@ impl<B: BlockT, N: Network<B>> Future for NetworkBridge<B, N> {
 				Poll::Ready(Some((to, packet))) => {
 					self.gossip_engine.lock().send_message(to, packet.encode());
 				},
-				Poll::Ready(None) => return Poll::Ready(
-					Err(Error::Network("Neighbor packet worker stream closed.".into()))
-				),
+				Poll::Ready(None) =>
+					return Poll::Ready(Err(Error::Network(
+						"Neighbor packet worker stream closed.".into(),
+					))),
 				Poll::Pending => break,
 			}
 		}
@@ -485,17 +474,17 @@ impl<B: BlockT, N: Network<B>> Future for NetworkBridge<B, N> {
 				Poll::Ready(Some(PeerReport { who, cost_benefit })) => {
 					self.gossip_engine.lock().report(who, cost_benefit);
 				},
-				Poll::Ready(None) => return Poll::Ready(
-					Err(Error::Network("Gossip validator report stream closed.".into()))
-				),
+				Poll::Ready(None) =>
+					return Poll::Ready(Err(Error::Network(
+						"Gossip validator report stream closed.".into(),
+					))),
 				Poll::Pending => break,
 			}
 		}
 
 		match self.gossip_engine.lock().poll_unpin(cx) {
-			Poll::Ready(()) => return Poll::Ready(
-				Err(Error::Network("Gossip engine future finished.".into()))
-			),
+			Poll::Ready(()) =>
+				return Poll::Ready(Err(Error::Network("Gossip engine future finished.".into()))),
 			Poll::Pending => {},
 		}
 
@@ -513,18 +502,14 @@ fn incoming_global<B: BlockT>(
 ) -> impl Stream<Item = CommunicationIn<B>> {
 	let process_commit = {
 		let telemetry = telemetry.clone();
-		move |
-			msg: FullCommitMessage<B>,
-			mut notification: sc_network_gossip::TopicNotification,
-			gossip_engine: &Arc<Mutex<GossipEngine<B>>>,
-			gossip_validator: &Arc<GossipValidator<B>>,
-			voters: &VoterSet<AuthorityId>,
-		| {
+		move |msg: FullCommitMessage<B>,
+		      mut notification: sc_network_gossip::TopicNotification,
+		      gossip_engine: &Arc<Mutex<GossipEngine<B>>>,
+		      gossip_validator: &Arc<GossipValidator<B>>,
+		      voters: &VoterSet<AuthorityId>| {
 			if voters.len().get() <= TELEMETRY_VOTERS_LIMIT {
 				let precommits_signed_by: Vec<String> =
-					msg.message.auth_data.iter().map(move |(_, a)| {
-						format!("{}", a)
-					}).collect();
+					msg.message.auth_data.iter().map(move |(_, a)| format!("{}", a)).collect();
 
 				telemetry!(
 					telemetry;
@@ -547,7 +532,7 @@ fn incoming_global<B: BlockT>(
 					gossip_engine.lock().report(who, cost);
 				}
 
-				return None;
+				return None
 			}
 
 			let round = msg.round;
@@ -570,13 +555,13 @@ fn incoming_global<B: BlockT>(
 					);
 
 					gossip_engine.lock().gossip_message(topic, notification.message.clone(), false);
-				}
+				},
 				voter::CommitProcessingOutcome::Bad(_) => {
 					// report peer and do not gossip.
 					if let Some(who) = notification.sender.take() {
 						gossip_engine.lock().report(who, cost::INVALID_COMMIT);
 					}
-				}
+				},
 			};
 
 			let cb = voter::Callback::Work(Box::new(cb));
@@ -585,27 +570,21 @@ fn incoming_global<B: BlockT>(
 		}
 	};
 
-	let process_catch_up = move |
-		msg: FullCatchUpMessage<B>,
-		mut notification: sc_network_gossip::TopicNotification,
-		gossip_engine: &Arc<Mutex<GossipEngine<B>>>,
-		gossip_validator: &Arc<GossipValidator<B>>,
-		voters: &VoterSet<AuthorityId>,
-	| {
+	let process_catch_up = move |msg: FullCatchUpMessage<B>,
+	                             mut notification: sc_network_gossip::TopicNotification,
+	                             gossip_engine: &Arc<Mutex<GossipEngine<B>>>,
+	                             gossip_validator: &Arc<GossipValidator<B>>,
+	                             voters: &VoterSet<AuthorityId>| {
 		let gossip_validator = gossip_validator.clone();
 		let gossip_engine = gossip_engine.clone();
 
-		if let Err(cost) = check_catch_up::<B>(
-			&msg.message,
-			voters,
-			msg.set_id,
-			telemetry.clone(),
-		) {
+		if let Err(cost) = check_catch_up::<B>(&msg.message, voters, msg.set_id, telemetry.clone())
+		{
 			if let Some(who) = notification.sender {
 				gossip_engine.lock().report(who, cost);
 			}
 
-			return None;
+			return None
 		}
 
 		let cb = move |outcome| {
@@ -624,7 +603,10 @@ fn incoming_global<B: BlockT>(
 		Some(voter::CommunicationIn::CatchUp(msg.message, cb))
 	};
 
-	gossip_engine.clone().lock().messages_for(topic)
+	gossip_engine
+		.clone()
+		.lock()
+		.messages_for(topic)
 		.filter_map(|notification| {
 			// this could be optimized by decoding piecewise.
 			let decoded = GossipMessage::<B>::decode(&mut &notification.message[..]);
@@ -642,7 +624,7 @@ fn incoming_global<B: BlockT>(
 				_ => {
 					debug!(target: "afg", "Skipping unknown message type");
 					None
-				}
+				},
 			})
 		})
 }
@@ -688,15 +670,15 @@ pub(crate) struct OutgoingMessages<Block: BlockT> {
 
 impl<B: BlockT> Unpin for OutgoingMessages<B> {}
 
-impl<Block: BlockT> Sink<Message<Block>> for OutgoingMessages<Block>
-{
+impl<Block: BlockT> Sink<Message<Block>> for OutgoingMessages<Block> {
 	type Error = Error;
 
 	fn poll_ready(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Result<(), Self::Error>> {
-		Sink::poll_ready(Pin::new(&mut self.sender), cx)
-			.map(|elem| { elem.map_err(|e| {
+		Sink::poll_ready(Pin::new(&mut self.sender), cx).map(|elem| {
+			elem.map_err(|e| {
 				Error::Network(format!("Failed to poll_ready channel sender: {:?}", e))
-			})})
+			})
+		})
 	}
 
 	fn start_send(mut self: Pin<&mut Self>, mut msg: Message<Block>) -> Result<(), Self::Error> {
@@ -725,11 +707,13 @@ impl<Block: BlockT> Sink<Message<Block>> for OutgoingMessages<Block>
 				keystore.local_id().clone(),
 				self.round,
 				self.set_id,
-			).ok_or_else(
-				|| Error::Signing(format!(
-					"Failed to sign GRANDPA vote for round {} targetting {:?}", self.round, target_hash
+			)
+			.ok_or_else(|| {
+				Error::Signing(format!(
+					"Failed to sign GRANDPA vote for round {} targetting {:?}",
+					self.round, target_hash
 				))
-			)?;
+			})?;
 
 			let message = GossipMessage::Vote(VoteMessage::<Block> {
 				message: signed.clone(),
@@ -762,7 +746,7 @@ impl<Block: BlockT> Sink<Message<Block>> for OutgoingMessages<Block>
 			// forward the message to the inner sender.
 			return self.sender.start_send(signed).map_err(|e| {
 				Error::Network(format!("Failed to start_send on channel sender: {:?}", e))
-			});
+			})
 		};
 
 		Ok(())
@@ -773,10 +757,11 @@ impl<Block: BlockT> Sink<Message<Block>> for OutgoingMessages<Block>
 	}
 
 	fn poll_close(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Result<(), Self::Error>> {
-		Sink::poll_close(Pin::new(&mut self.sender), cx)
-			.map(|elem| { elem.map_err(|e| {
+		Sink::poll_close(Pin::new(&mut self.sender), cx).map(|elem| {
+			elem.map_err(|e| {
 				Error::Network(format!("Failed to poll_close channel sender: {:?}", e))
-			})})
+			})
+		})
 	}
 }
 
@@ -799,23 +784,22 @@ fn check_compact_commit<Block: BlockT>(
 		if let Some(weight) = voters.get(id).map(|info| info.weight()) {
 			total_weight += weight.get();
 			if total_weight > full_threshold {
-				return Err(cost::MALFORMED_COMMIT);
+				return Err(cost::MALFORMED_COMMIT)
 			}
 		} else {
 			debug!(target: "afg", "Skipping commit containing unknown voter {}", id);
-			return Err(cost::MALFORMED_COMMIT);
+			return Err(cost::MALFORMED_COMMIT)
 		}
 	}
 
 	if total_weight < voters.threshold().get() {
-		return Err(cost::MALFORMED_COMMIT);
+		return Err(cost::MALFORMED_COMMIT)
 	}
 
 	// check signatures on all contained precommits.
 	let mut buf = Vec::new();
-	for (i, (precommit, &(ref sig, ref id))) in msg.precommits.iter()
-		.zip(&msg.auth_data)
-		.enumerate()
+	for (i, (precommit, &(ref sig, ref id))) in
+		msg.precommits.iter().zip(&msg.auth_data).enumerate()
 	{
 		use crate::communication::gossip::Misbehavior;
 		use finality_grandpa::Message as GrandpaMessage;
@@ -839,9 +823,10 @@ fn check_compact_commit<Block: BlockT>(
 				signatures_checked: i as i32,
 				blocks_loaded: 0,
 				equivocations_caught: 0,
-			}.cost();
+			}
+			.cost();
 
-			return Err(cost);
+			return Err(cost)
 		}
 	}
 
@@ -863,7 +848,7 @@ fn check_catch_up<Block: BlockT>(
 	// check total weight is not out of range for a set of votes.
 	fn check_weight<'a>(
 		voters: &'a VoterSet<AuthorityId>,
-		votes: impl Iterator<Item=&'a AuthorityId>,
+		votes: impl Iterator<Item = &'a AuthorityId>,
 		full_threshold: u64,
 	) -> Result<(), ReputationChange> {
 		let mut total_weight = 0;
@@ -872,32 +857,24 @@ fn check_catch_up<Block: BlockT>(
 			if let Some(weight) = voters.get(&id).map(|info| info.weight()) {
 				total_weight += weight.get();
 				if total_weight > full_threshold {
-					return Err(cost::MALFORMED_CATCH_UP);
+					return Err(cost::MALFORMED_CATCH_UP)
 				}
 			} else {
 				debug!(target: "afg", "Skipping catch up message containing unknown voter {}", id);
-				return Err(cost::MALFORMED_CATCH_UP);
+				return Err(cost::MALFORMED_CATCH_UP)
 			}
 		}
 
 		if total_weight < voters.threshold().get() {
-			return Err(cost::MALFORMED_CATCH_UP);
+			return Err(cost::MALFORMED_CATCH_UP)
 		}
 
 		Ok(())
 	}
 
-	check_weight(
-		voters,
-		msg.prevotes.iter().map(|vote| &vote.id),
-		full_threshold,
-	)?;
+	check_weight(voters, msg.prevotes.iter().map(|vote| &vote.id), full_threshold)?;
 
-	check_weight(
-		voters,
-		msg.precommits.iter().map(|vote| &vote.id),
-		full_threshold,
-	)?;
+	check_weight(voters, msg.precommits.iter().map(|vote| &vote.id), full_threshold)?;
 
 	fn check_signatures<'a, B, I>(
 		messages: I,
@@ -906,9 +883,10 @@ fn check_catch_up<Block: BlockT>(
 		mut signatures_checked: usize,
 		buf: &mut Vec<u8>,
 		telemetry: Option<TelemetryHandle>,
-	) -> Result<usize, ReputationChange> where
+	) -> Result<usize, ReputationChange>
+	where
 		B: BlockT,
-		I: Iterator<Item=(Message<B>, &'a AuthorityId, &'a AuthoritySignature)>,
+		I: Iterator<Item = (Message<B>, &'a AuthorityId, &'a AuthoritySignature)>,
 	{
 		use crate::communication::gossip::Misbehavior;
 
@@ -916,12 +894,7 @@ fn check_catch_up<Block: BlockT>(
 			signatures_checked += 1;
 
 			if !sp_finality_grandpa::check_message_signature_with_buffer(
-				&msg,
-				id,
-				sig,
-				round,
-				set_id,
-				buf,
+				&msg, id, sig, round, set_id, buf,
 			) {
 				debug!(target: "afg", "Bad catch up message signature {}", id);
 				telemetry!(
@@ -933,9 +906,10 @@ fn check_catch_up<Block: BlockT>(
 
 				let cost = Misbehavior::BadCatchUpMessage {
 					signatures_checked: signatures_checked as i32,
-				}.cost();
+				}
+				.cost();
 
-				return Err(cost);
+				return Err(cost)
 			}
 		}
 
@@ -959,7 +933,11 @@ fn check_catch_up<Block: BlockT>(
 	// check signatures on all contained precommits.
 	let _ = check_signatures::<Block, _>(
 		msg.precommits.iter().map(|vote| {
-			(finality_grandpa::Message::Precommit(vote.precommit.clone()), &vote.id, &vote.signature)
+			(
+				finality_grandpa::Message::Precommit(vote.precommit.clone()),
+				&vote.id,
+				&vote.signature,
+			)
 		}),
 		msg.round_number,
 		set_id.0,
@@ -1009,9 +987,12 @@ impl<Block: BlockT> Sink<(RoundNumber, Commit<Block>)> for CommitsOut<Block> {
 		Poll::Ready(Ok(()))
 	}
 
-	fn start_send(self: Pin<&mut Self>, input: (RoundNumber, Commit<Block>)) -> Result<(), Self::Error> {
+	fn start_send(
+		self: Pin<&mut Self>,
+		input: (RoundNumber, Commit<Block>),
+	) -> Result<(), Self::Error> {
 		if !self.is_voter {
-			return Ok(());
+			return Ok(())
 		}
 
 		let (round, commit) = input;
@@ -1024,7 +1005,9 @@ impl<Block: BlockT> Sink<(RoundNumber, Commit<Block>)> for CommitsOut<Block> {
 			"target_number" => ?commit.target_number,
 			"target_hash" => ?commit.target_hash,
 		);
-		let (precommits, auth_data) = commit.precommits.into_iter()
+		let (precommits, auth_data) = commit
+			.precommits
+			.into_iter()
 			.map(|signed| (signed.precommit, (signed.signature, signed.id)))
 			.unzip();
 
@@ -1032,7 +1015,7 @@ impl<Block: BlockT> Sink<(RoundNumber, Commit<Block>)> for CommitsOut<Block> {
 			target_hash: commit.target_hash,
 			target_number: commit.target_number,
 			precommits,
-			auth_data
+			auth_data,
 		};
 
 		let message = GossipMessage::Commit(FullCommitMessage::<Block> {
diff --git a/client/finality-grandpa/src/communication/periodic.rs b/client/finality-grandpa/src/communication/periodic.rs
index 377882ed5dd2..a3c7b9380b25 100644
--- a/client/finality-grandpa/src/communication/periodic.rs
+++ b/client/finality-grandpa/src/communication/periodic.rs
@@ -18,15 +18,19 @@
 
 //! Periodic rebroadcast of neighbor packets.
 
+use futures::{future::FutureExt as _, prelude::*, ready, stream::Stream};
 use futures_timer::Delay;
-use futures::{future::{FutureExt as _}, prelude::*, ready, stream::Stream};
 use log::debug;
-use std::{pin::Pin, task::{Context, Poll}, time::Duration};
 use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
+use std::{
+	pin::Pin,
+	task::{Context, Poll},
+	time::Duration,
+};
 
+use super::gossip::{GossipMessage, NeighborPacket};
 use sc_network::PeerId;
-use sp_runtime::traits::{NumberFor, Block as BlockT};
-use super::gossip::{NeighborPacket, GossipMessage};
+use sp_runtime::traits::{Block as BlockT, NumberFor};
 
 // How often to rebroadcast, in cases where no new packets are created.
 const REBROADCAST_AFTER: Duration = Duration::from_secs(2 * 60);
@@ -34,7 +38,7 @@ const REBROADCAST_AFTER: Duration = Duration::from_secs(2 * 60);
 /// A sender used to send neighbor packets to a background job.
 #[derive(Clone)]
 pub(super) struct NeighborPacketSender<B: BlockT>(
-	TracingUnboundedSender<(Vec<PeerId>, NeighborPacket<NumberFor<B>>)>
+	TracingUnboundedSender<(Vec<PeerId>, NeighborPacket<NumberFor<B>>)>,
 );
 
 impl<B: BlockT> NeighborPacketSender<B> {
@@ -63,24 +67,20 @@ pub(super) struct NeighborPacketWorker<B: BlockT> {
 impl<B: BlockT> Unpin for NeighborPacketWorker<B> {}
 
 impl<B: BlockT> NeighborPacketWorker<B> {
-	pub(super) fn new() -> (Self, NeighborPacketSender<B>){
-		let (tx, rx) = tracing_unbounded::<(Vec<PeerId>, NeighborPacket<NumberFor<B>>)>
-			("mpsc_grandpa_neighbor_packet_worker");
+	pub(super) fn new() -> (Self, NeighborPacketSender<B>) {
+		let (tx, rx) = tracing_unbounded::<(Vec<PeerId>, NeighborPacket<NumberFor<B>>)>(
+			"mpsc_grandpa_neighbor_packet_worker",
+		);
 		let delay = Delay::new(REBROADCAST_AFTER);
 
-		(NeighborPacketWorker {
-			last: None,
-			delay,
-			rx,
-		}, NeighborPacketSender(tx))
+		(NeighborPacketWorker { last: None, delay, rx }, NeighborPacketSender(tx))
 	}
 }
 
-impl <B: BlockT> Stream for NeighborPacketWorker<B> {
+impl<B: BlockT> Stream for NeighborPacketWorker<B> {
 	type Item = (Vec<PeerId>, GossipMessage<B>);
 
-	fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Option<Self::Item>>
-	{
+	fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Option<Self::Item>> {
 		let this = &mut *self;
 		match this.rx.poll_next_unpin(cx) {
 			Poll::Ready(None) => return Poll::Ready(None),
@@ -88,8 +88,8 @@ impl <B: BlockT> Stream for NeighborPacketWorker<B> {
 				this.delay.reset(REBROADCAST_AFTER);
 				this.last = Some((to.clone(), packet.clone()));
 
-				return Poll::Ready(Some((to, GossipMessage::<B>::from(packet))));
-			}
+				return Poll::Ready(Some((to, GossipMessage::<B>::from(packet))))
+			},
 			// Don't return yet, maybe the timer fired.
 			Poll::Pending => {},
 		};
@@ -104,10 +104,10 @@ impl <B: BlockT> Stream for NeighborPacketWorker<B> {
 		//
 		// Note: In case poll_unpin is called after the resetted delay fires again, this
 		// will drop one tick. Deemed as very unlikely and also not critical.
-		while let Poll::Ready(()) = this.delay.poll_unpin(cx) {};
+		while let Poll::Ready(()) = this.delay.poll_unpin(cx) {}
 
 		if let Some((ref to, ref packet)) = this.last {
-			return Poll::Ready(Some((to.clone(), GossipMessage::<B>::from(packet.clone()))));
+			return Poll::Ready(Some((to.clone(), GossipMessage::<B>::from(packet.clone()))))
 		}
 
 		Poll::Pending
diff --git a/client/finality-grandpa/src/communication/tests.rs b/client/finality-grandpa/src/communication/tests.rs
index ec8c97dfe3e8..868186bbf0fd 100644
--- a/client/finality-grandpa/src/communication/tests.rs
+++ b/client/finality-grandpa/src/communication/tests.rs
@@ -18,21 +18,26 @@
 
 //! Tests for the communication portion of the GRANDPA crate.
 
-use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
+use super::{
+	gossip::{self, GossipValidator},
+	Round, SetId, VoterSet,
+};
+use crate::{communication::GRANDPA_PROTOCOL_NAME, environment::SharedVoterSetState};
 use futures::prelude::*;
+use parity_scale_codec::Encode;
 use sc_network::{config::Role, Event as NetworkEvent, ObservedRole, PeerId};
-use sc_network_test::{Block, Hash};
 use sc_network_gossip::Validator;
-use std::sync::Arc;
+use sc_network_test::{Block, Hash};
+use sp_finality_grandpa::AuthorityList;
 use sp_keyring::Ed25519Keyring;
-use parity_scale_codec::Encode;
 use sp_runtime::traits::NumberFor;
-use std::{borrow::Cow, pin::Pin, task::{Context, Poll}};
-use crate::communication::GRANDPA_PROTOCOL_NAME;
-use crate::environment::SharedVoterSetState;
-use sp_finality_grandpa::AuthorityList;
-use super::gossip::{self, GossipValidator};
-use super::{VoterSet, Round, SetId};
+use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
+use std::{
+	borrow::Cow,
+	pin::Pin,
+	sync::Arc,
+	task::{Context, Poll},
+};
 
 #[derive(Debug)]
 pub(crate) enum Event {
@@ -79,13 +84,14 @@ impl super::Network<Block> for TestNetwork {
 		_peers: Vec<sc_network::PeerId>,
 		_hash: Hash,
 		_number: NumberFor<Block>,
-	) {}
+	) {
+	}
 }
 
 impl sc_network_gossip::ValidatorContext<Block> for TestNetwork {
-	fn broadcast_topic(&mut self, _: Hash, _: bool) { }
+	fn broadcast_topic(&mut self, _: Hash, _: bool) {}
 
-	fn broadcast_message(&mut self, _: Hash, _: Vec<u8>, _: bool) {	}
+	fn broadcast_message(&mut self, _: Hash, _: Vec<u8>, _: bool) {}
 
 	fn send_message(&mut self, who: &sc_network::PeerId, data: Vec<u8>) {
 		<Self as sc_network_gossip::Network<Block>>::write_notification(
@@ -96,7 +102,7 @@ impl sc_network_gossip::ValidatorContext<Block> for TestNetwork {
 		);
 	}
 
-	fn send_topic(&mut self, _: &sc_network::PeerId, _: Hash, _: bool) { }
+	fn send_topic(&mut self, _: &sc_network::PeerId, _: Hash, _: bool) {}
 }
 
 pub(crate) struct Tester {
@@ -107,15 +113,17 @@ pub(crate) struct Tester {
 
 impl Tester {
 	fn filter_network_events<F>(self, mut pred: F) -> impl Future<Output = Self>
-		where F: FnMut(Event) -> bool
+	where
+		F: FnMut(Event) -> bool,
 	{
 		let mut s = Some(self);
 		futures::future::poll_fn(move |cx| loop {
 			match Stream::poll_next(Pin::new(&mut s.as_mut().unwrap().events), cx) {
 				Poll::Ready(None) => panic!("concluded early"),
-				Poll::Ready(Some(item)) => if pred(item) {
-					return Poll::Ready(s.take().unwrap())
-				},
+				Poll::Ready(Some(item)) =>
+					if pred(item) {
+						return Poll::Ready(s.take().unwrap())
+					},
 				Poll::Pending => return Poll::Pending,
 			}
 		})
@@ -145,8 +153,7 @@ fn config() -> crate::Config {
 
 // dummy voter set state
 fn voter_set_state() -> SharedVoterSetState<Block> {
-	use crate::authorities::AuthoritySet;
-	use crate::environment::VoterSetState;
+	use crate::{authorities::AuthoritySet, environment::VoterSetState};
 	use finality_grandpa::round::State as RoundState;
 	use sp_core::{crypto::Public, H256};
 	use sp_finality_grandpa::AuthorityId;
@@ -157,20 +164,13 @@ fn voter_set_state() -> SharedVoterSetState<Block> {
 	let voters = vec![(AuthorityId::from_slice(&[1; 32]), 1)];
 	let voters = AuthoritySet::genesis(voters).unwrap();
 
-	let set_state = VoterSetState::live(
-		0,
-		&voters,
-		base,
-	);
+	let set_state = VoterSetState::live(0, &voters, base);
 
 	set_state.into()
 }
 
 // needs to run in a tokio runtime.
-pub(crate) fn make_test_network() -> (
-	impl Future<Output = Tester>,
-	TestNetwork,
-) {
+pub(crate) fn make_test_network() -> (impl Future<Output = Tester>, TestNetwork) {
 	let (tx, rx) = tracing_unbounded("test");
 	let net = TestNetwork { sender: tx };
 
@@ -185,13 +185,7 @@ pub(crate) fn make_test_network() -> (
 		}
 	}
 
-	let bridge = super::NetworkBridge::new(
-		net.clone(),
-		config(),
-		voter_set_state(),
-		None,
-		None,
-	);
+	let bridge = super::NetworkBridge::new(net.clone(), config(), voter_set_state(), None, None);
 
 	(
 		futures::future::ready(Tester {
@@ -204,19 +198,16 @@ pub(crate) fn make_test_network() -> (
 }
 
 fn make_ids(keys: &[Ed25519Keyring]) -> AuthorityList {
-	keys.iter()
-		.map(|key| key.clone().public().into())
-		.map(|id| (id, 1))
-		.collect()
+	keys.iter().map(|key| key.clone().public().into()).map(|id| (id, 1)).collect()
 }
 
 struct NoopContext;
 
 impl sc_network_gossip::ValidatorContext<Block> for NoopContext {
-	fn broadcast_topic(&mut self, _: Hash, _: bool) { }
-	fn broadcast_message(&mut self, _: Hash, _: Vec<u8>, _: bool) { }
-	fn send_message(&mut self, _: &sc_network::PeerId, _: Vec<u8>) { }
-	fn send_topic(&mut self, _: &sc_network::PeerId, _: Hash, _: bool) { }
+	fn broadcast_topic(&mut self, _: Hash, _: bool) {}
+	fn broadcast_message(&mut self, _: Hash, _: Vec<u8>, _: bool) {}
+	fn send_message(&mut self, _: &sc_network::PeerId, _: Vec<u8>) {}
+	fn send_topic(&mut self, _: &sc_network::PeerId, _: Hash, _: bool) {}
 }
 
 #[test]
@@ -232,9 +223,12 @@ fn good_commit_leads_to_relay() {
 		let target_hash: Hash = [1; 32].into();
 		let target_number = 500;
 
-		let precommit = finality_grandpa::Precommit { target_hash: target_hash.clone(), target_number };
+		let precommit =
+			finality_grandpa::Precommit { target_hash: target_hash.clone(), target_number };
 		let payload = sp_finality_grandpa::localized_payload(
-			round, set_id, &finality_grandpa::Message::Precommit(precommit.clone())
+			round,
+			set_id,
+			&finality_grandpa::Message::Precommit(precommit.clone()),
 		);
 
 		let mut precommits = Vec::new();
@@ -247,24 +241,21 @@ fn good_commit_leads_to_relay() {
 			auth_data.push((signature, public[i].0.clone()))
 		}
 
-		finality_grandpa::CompactCommit {
-			target_hash,
-			target_number,
-			precommits,
-			auth_data,
-		}
+		finality_grandpa::CompactCommit { target_hash, target_number, precommits, auth_data }
 	};
 
 	let encoded_commit = gossip::GossipMessage::<Block>::Commit(gossip::FullCommitMessage {
 		round: Round(round),
 		set_id: SetId(set_id),
 		message: commit,
-	}).encode();
+	})
+	.encode();
 
 	let id = sc_network::PeerId::random();
 	let global_topic = super::global_topic::<Block>(set_id);
 
-	let test = make_test_network().0
+	let test = make_test_network()
+		.0
 		.then(move |tester| {
 			// register a peer.
 			tester.gossip_validator.new_peer(&mut NoopContext, &id, ObservedRole::Full);
@@ -272,7 +263,8 @@ fn good_commit_leads_to_relay() {
 		})
 		.then(move |(tester, id)| {
 			// start round, dispatch commit, and wait for broadcast.
-			let (commits_in, _) = tester.net_handle.global_communication(SetId(1), voter_set, false);
+			let (commits_in, _) =
+				tester.net_handle.global_communication(SetId(1), voter_set, false);
 
 			{
 				let (action, ..) = tester.gossip_validator.do_validate(&id, &encoded_commit[..]);
@@ -301,7 +293,10 @@ fn good_commit_leads_to_relay() {
 
 					let _ = sender.unbounded_send(NetworkEvent::NotificationsReceived {
 						remote: sender_id.clone(),
-						messages: vec![(GRANDPA_PROTOCOL_NAME.into(), commit_to_send.clone().into())],
+						messages: vec![(
+							GRANDPA_PROTOCOL_NAME.into(),
+							commit_to_send.clone().into(),
+						)],
 					});
 
 					// Add a random peer which will be the recipient of this message
@@ -316,13 +311,11 @@ fn good_commit_leads_to_relay() {
 					// Announce its local set has being on the current set id through a neighbor
 					// packet, otherwise it won't be eligible to receive the commit
 					let _ = {
-						let update = gossip::VersionedNeighborPacket::V1(
-							gossip::NeighborPacket {
-								round: Round(round),
-								set_id: SetId(set_id),
-								commit_finalized_height: 1,
-							}
-						);
+						let update = gossip::VersionedNeighborPacket::V1(gossip::NeighborPacket {
+							round: Round(round),
+							set_id: SetId(set_id),
+							commit_finalized_height: 1,
+						});
 
 						let msg = gossip::GossipMessage::<Block>::Neighbor(update);
 
@@ -333,31 +326,27 @@ fn good_commit_leads_to_relay() {
 					};
 
 					true
-				}
+				},
 				_ => false,
 			});
 
 			// when the commit comes in, we'll tell the callback it was good.
-			let handle_commit = commits_in.into_future()
-				.map(|(item, _)| {
-					match item.unwrap() {
-						finality_grandpa::voter::CommunicationIn::Commit(_, _, mut callback) => {
-							callback.run(finality_grandpa::voter::CommitProcessingOutcome::good());
-						},
-						_ => panic!("commit expected"),
-					}
-				});
+			let handle_commit = commits_in.into_future().map(|(item, _)| match item.unwrap() {
+				finality_grandpa::voter::CommunicationIn::Commit(_, _, mut callback) => {
+					callback.run(finality_grandpa::voter::CommitProcessingOutcome::good());
+				},
+				_ => panic!("commit expected"),
+			});
 
 			// once the message is sent and commit is "handled" we should have
 			// a repropagation event coming from the network.
-			let fut = future::join(send_message, handle_commit).then(move |(tester, ())| {
-				tester.filter_network_events(move |event| match event {
-					Event::WriteNotification(_, data) => {
-						data == encoded_commit
-					}
-					_ => false,
+			let fut = future::join(send_message, handle_commit)
+				.then(move |(tester, ())| {
+					tester.filter_network_events(move |event| match event {
+						Event::WriteNotification(_, data) => data == encoded_commit,
+						_ => false,
+					})
 				})
-			})
 				.map(|_| ());
 
 			// Poll both the future sending and handling the commit, as well as the underlying
@@ -382,9 +371,12 @@ fn bad_commit_leads_to_report() {
 		let target_hash: Hash = [1; 32].into();
 		let target_number = 500;
 
-		let precommit = finality_grandpa::Precommit { target_hash: target_hash.clone(), target_number };
+		let precommit =
+			finality_grandpa::Precommit { target_hash: target_hash.clone(), target_number };
 		let payload = sp_finality_grandpa::localized_payload(
-			round, set_id, &finality_grandpa::Message::Precommit(precommit.clone())
+			round,
+			set_id,
+			&finality_grandpa::Message::Precommit(precommit.clone()),
 		);
 
 		let mut precommits = Vec::new();
@@ -397,24 +389,21 @@ fn bad_commit_leads_to_report() {
 			auth_data.push((signature, public[i].0.clone()))
 		}
 
-		finality_grandpa::CompactCommit {
-			target_hash,
-			target_number,
-			precommits,
-			auth_data,
-		}
+		finality_grandpa::CompactCommit { target_hash, target_number, precommits, auth_data }
 	};
 
 	let encoded_commit = gossip::GossipMessage::<Block>::Commit(gossip::FullCommitMessage {
 		round: Round(round),
 		set_id: SetId(set_id),
 		message: commit,
-	}).encode();
+	})
+	.encode();
 
 	let id = sc_network::PeerId::random();
 	let global_topic = super::global_topic::<Block>(set_id);
 
-	let test = make_test_network().0
+	let test = make_test_network()
+		.0
 		.map(move |tester| {
 			// register a peer.
 			tester.gossip_validator.new_peer(&mut NoopContext, &id, ObservedRole::Full);
@@ -422,7 +411,8 @@ fn bad_commit_leads_to_report() {
 		})
 		.then(move |(tester, id)| {
 			// start round, dispatch commit, and wait for broadcast.
-			let (commits_in, _) = tester.net_handle.global_communication(SetId(1), voter_set, false);
+			let (commits_in, _) =
+				tester.net_handle.global_communication(SetId(1), voter_set, false);
 
 			{
 				let (action, ..) = tester.gossip_validator.do_validate(&id, &encoded_commit[..]);
@@ -449,35 +439,35 @@ fn bad_commit_leads_to_report() {
 					});
 					let _ = sender.unbounded_send(NetworkEvent::NotificationsReceived {
 						remote: sender_id.clone(),
-						messages: vec![(GRANDPA_PROTOCOL_NAME.into(), commit_to_send.clone().into())],
+						messages: vec![(
+							GRANDPA_PROTOCOL_NAME.into(),
+							commit_to_send.clone().into(),
+						)],
 					});
 
 					true
-				}
+				},
 				_ => false,
 			});
 
 			// when the commit comes in, we'll tell the callback it was bad.
-			let handle_commit = commits_in.into_future()
-				.map(|(item, _)| {
-					match item.unwrap() {
-						finality_grandpa::voter::CommunicationIn::Commit(_, _, mut callback) => {
-							callback.run(finality_grandpa::voter::CommitProcessingOutcome::bad());
-						},
-						_ => panic!("commit expected"),
-					}
-				});
+			let handle_commit = commits_in.into_future().map(|(item, _)| match item.unwrap() {
+				finality_grandpa::voter::CommunicationIn::Commit(_, _, mut callback) => {
+					callback.run(finality_grandpa::voter::CommitProcessingOutcome::bad());
+				},
+				_ => panic!("commit expected"),
+			});
 
 			// once the message is sent and commit is "handled" we should have
 			// a report event coming from the network.
-			let fut = future::join(send_message, handle_commit).then(move |(tester, ())| {
-				tester.filter_network_events(move |event| match event {
-					Event::Report(who, cost_benefit) => {
-						who == id && cost_benefit == super::cost::INVALID_COMMIT
-					}
-					_ => false,
+			let fut = future::join(send_message, handle_commit)
+				.then(move |(tester, ())| {
+					tester.filter_network_events(move |event| match event {
+						Event::Report(who, cost_benefit) =>
+							who == id && cost_benefit == super::cost::INVALID_COMMIT,
+						_ => false,
+					})
 				})
-			})
 				.map(|_| ());
 
 			// Poll both the future sending and handling the commit, as well as the underlying
@@ -508,7 +498,8 @@ fn peer_with_higher_view_leads_to_catch_up_request() {
 					set_id: SetId(0),
 					round: Round(10),
 					commit_finalized_height: 50,
-				}).encode(),
+				})
+				.encode(),
 			);
 
 			// neighbor packets are always discard
@@ -518,27 +509,23 @@ fn peer_with_higher_view_leads_to_catch_up_request() {
 			}
 
 			// a catch up request should be sent to the peer for round - 1
-			tester.filter_network_events(move |event| match event {
-				Event::WriteNotification(peer, message) => {
-					assert_eq!(
-						peer,
-						id,
-					);
-
-					assert_eq!(
-						message,
-						gossip::GossipMessage::<Block>::CatchUpRequest(
-							gossip::CatchUpRequestMessage {
-								set_id: SetId(0),
-								round: Round(9),
-							}
-						).encode(),
-					);
+			tester
+				.filter_network_events(move |event| match event {
+					Event::WriteNotification(peer, message) => {
+						assert_eq!(peer, id,);
+
+						assert_eq!(
+							message,
+							gossip::GossipMessage::<Block>::CatchUpRequest(
+								gossip::CatchUpRequestMessage { set_id: SetId(0), round: Round(9) }
+							)
+							.encode(),
+						);
 
-					true
-				},
-				_ => false,
-			})
+						true
+					},
+					_ => false,
+				})
 				.map(|_| ())
 		});
 
diff --git a/client/finality-grandpa/src/environment.rs b/client/finality-grandpa/src/environment.rs
index 964e199f9096..c39453b1c8be 100644
--- a/client/finality-grandpa/src/environment.rs
+++ b/client/finality-grandpa/src/environment.rs
@@ -16,12 +16,14 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use std::collections::{BTreeMap, HashMap};
-use std::iter::FromIterator;
-use std::marker::PhantomData;
-use std::pin::Pin;
-use std::sync::Arc;
-use std::time::Duration;
+use std::{
+	collections::{BTreeMap, HashMap},
+	iter::FromIterator,
+	marker::PhantomData,
+	pin::Pin,
+	sync::Arc,
+	time::Duration,
+};
 
 use finality_grandpa::{
 	round::State as RoundState, voter, voter_set::VoterSet, BlockNumberOps, Error as GrandpaError,
@@ -44,8 +46,10 @@ use sp_finality_grandpa::{
 	AuthorityId, AuthoritySignature, Equivocation, EquivocationProof, GrandpaApi, RoundNumber,
 	SetId, GRANDPA_ENGINE_ID,
 };
-use sp_runtime::generic::BlockId;
-use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor, Zero};
+use sp_runtime::{
+	generic::BlockId,
+	traits::{Block as BlockT, Header as HeaderT, NumberFor, Zero},
+};
 
 use crate::{
 	authorities::{AuthoritySet, SharedAuthoritySet},
@@ -105,13 +109,11 @@ impl<Block: BlockT> Encode for CompletedRounds<Block> {
 impl<Block: BlockT> parity_scale_codec::EncodeLike for CompletedRounds<Block> {}
 
 impl<Block: BlockT> Decode for CompletedRounds<Block> {
-	fn decode<I: parity_scale_codec::Input>(value: &mut I) -> Result<Self, parity_scale_codec::Error> {
+	fn decode<I: parity_scale_codec::Input>(
+		value: &mut I,
+	) -> Result<Self, parity_scale_codec::Error> {
 		<(Vec<CompletedRound<Block>>, SetId, Vec<AuthorityId>)>::decode(value)
-			.map(|(rounds, set_id, voters)| CompletedRounds {
-				rounds,
-				set_id,
-				voters,
-			})
+			.map(|(rounds, set_id, voters)| CompletedRounds { rounds, set_id, voters })
 	}
 }
 
@@ -121,9 +123,7 @@ impl<Block: BlockT> CompletedRounds<Block> {
 		genesis: CompletedRound<Block>,
 		set_id: SetId,
 		voters: &AuthoritySet<Block::Hash, NumberFor<Block>>,
-	)
-		-> CompletedRounds<Block>
-	{
+	) -> CompletedRounds<Block> {
 		let mut rounds = Vec::with_capacity(NUM_LAST_COMPLETED_ROUNDS);
 		rounds.push(genesis);
 
@@ -137,13 +137,14 @@ impl<Block: BlockT> CompletedRounds<Block> {
 	}
 
 	/// Iterate over all completed rounds.
-	pub fn iter(&self) -> impl Iterator<Item=&CompletedRound<Block>> {
+	pub fn iter(&self) -> impl Iterator<Item = &CompletedRound<Block>> {
 		self.rounds.iter().rev()
 	}
 
 	/// Returns the last (latest) completed round.
 	pub fn last(&self) -> &CompletedRound<Block> {
-		self.rounds.first()
+		self.rounds
+			.first()
 			.expect("inner is never empty; always contains at least genesis; qed")
 	}
 
@@ -152,10 +153,11 @@ impl<Block: BlockT> CompletedRounds<Block> {
 	pub fn push(&mut self, completed_round: CompletedRound<Block>) {
 		use std::cmp::Reverse;
 
-		match self.rounds.binary_search_by_key(
-			&Reverse(completed_round.number),
-			|completed_round| Reverse(completed_round.number),
-		) {
+		match self
+			.rounds
+			.binary_search_by_key(&Reverse(completed_round.number), |completed_round| {
+				Reverse(completed_round.number)
+			}) {
 			Ok(idx) => self.rounds[idx] = completed_round,
 			Err(idx) => self.rounds.insert(idx, completed_round),
 		};
@@ -215,37 +217,31 @@ impl<Block: BlockT> VoterSetState<Block> {
 		let mut current_rounds = CurrentRounds::new();
 		current_rounds.insert(1, HasVoted::No);
 
-		VoterSetState::Live {
-			completed_rounds,
-			current_rounds,
-		}
+		VoterSetState::Live { completed_rounds, current_rounds }
 	}
 
 	/// Returns the last completed rounds.
 	pub(crate) fn completed_rounds(&self) -> CompletedRounds<Block> {
 		match self {
-			VoterSetState::Live { completed_rounds, .. } =>
-				completed_rounds.clone(),
-			VoterSetState::Paused { completed_rounds } =>
-				completed_rounds.clone(),
+			VoterSetState::Live { completed_rounds, .. } => completed_rounds.clone(),
+			VoterSetState::Paused { completed_rounds } => completed_rounds.clone(),
 		}
 	}
 
 	/// Returns the last completed round.
 	pub(crate) fn last_completed_round(&self) -> CompletedRound<Block> {
 		match self {
-			VoterSetState::Live { completed_rounds, .. } =>
-				completed_rounds.last().clone(),
-			VoterSetState::Paused { completed_rounds } =>
-				completed_rounds.last().clone(),
+			VoterSetState::Live { completed_rounds, .. } => completed_rounds.last().clone(),
+			VoterSetState::Paused { completed_rounds } => completed_rounds.last().clone(),
 		}
 	}
 
 	/// Returns the voter set state validating that it includes the given round
 	/// in current rounds and that the voter isn't paused.
-	pub fn with_current_round(&self, round: RoundNumber)
-		-> Result<(&CompletedRounds<Block>, &CurrentRounds<Block>), Error>
-	{
+	pub fn with_current_round(
+		&self,
+		round: RoundNumber,
+	) -> Result<(&CompletedRounds<Block>, &CurrentRounds<Block>), Error> {
 		if let VoterSetState::Live { completed_rounds, current_rounds } = self {
 			if current_rounds.contains_key(&round) {
 				Ok((completed_rounds, current_rounds))
@@ -284,10 +280,9 @@ impl<Block: BlockT> HasVoted<Block> {
 	/// Returns the proposal we should vote with (if any.)
 	pub fn propose(&self) -> Option<&PrimaryPropose<Block>> {
 		match self {
-			HasVoted::Yes(_, Vote::Propose(propose)) =>
-				Some(propose),
-			HasVoted::Yes(_, Vote::Prevote(propose, _)) | HasVoted::Yes(_, Vote::Precommit(propose, _, _)) =>
-				propose.as_ref(),
+			HasVoted::Yes(_, Vote::Propose(propose)) => Some(propose),
+			HasVoted::Yes(_, Vote::Prevote(propose, _)) |
+			HasVoted::Yes(_, Vote::Precommit(propose, _, _)) => propose.as_ref(),
 			_ => None,
 		}
 	}
@@ -295,8 +290,8 @@ impl<Block: BlockT> HasVoted<Block> {
 	/// Returns the prevote we should vote with (if any.)
 	pub fn prevote(&self) -> Option<&Prevote<Block>> {
 		match self {
-			HasVoted::Yes(_, Vote::Prevote(_, prevote)) | HasVoted::Yes(_, Vote::Precommit(_, prevote, _)) =>
-				Some(prevote),
+			HasVoted::Yes(_, Vote::Prevote(_, prevote)) |
+			HasVoted::Yes(_, Vote::Precommit(_, prevote, _)) => Some(prevote),
 			_ => None,
 		}
 	}
@@ -304,8 +299,7 @@ impl<Block: BlockT> HasVoted<Block> {
 	/// Returns the precommit we should vote with (if any.)
 	pub fn precommit(&self) -> Option<&Precommit<Block>> {
 		match self {
-			HasVoted::Yes(_, Vote::Precommit(_, _, precommit)) =>
-				Some(precommit),
+			HasVoted::Yes(_, Vote::Precommit(_, _, precommit)) => Some(precommit),
 			_ => None,
 		}
 	}
@@ -376,21 +370,21 @@ impl<Block: BlockT> SharedVoterSetState<Block> {
 	/// Return vote status information for the current round.
 	pub(crate) fn has_voted(&self, round: RoundNumber) -> HasVoted<Block> {
 		match &*self.inner.read() {
-			VoterSetState::Live { current_rounds, .. } => {
-				current_rounds.get(&round).and_then(|has_voted| match has_voted {
-					HasVoted::Yes(id, vote) =>
-						Some(HasVoted::Yes(id.clone(), vote.clone())),
+			VoterSetState::Live { current_rounds, .. } => current_rounds
+				.get(&round)
+				.and_then(|has_voted| match has_voted {
+					HasVoted::Yes(id, vote) => Some(HasVoted::Yes(id.clone(), vote.clone())),
 					_ => None,
 				})
-				.unwrap_or(HasVoted::No)
-			},
+				.unwrap_or(HasVoted::No),
 			_ => HasVoted::No,
 		}
 	}
 
 	// NOTE: not exposed outside of this module intentionally.
 	fn with<F, R>(&self, f: F) -> R
-		where F: FnOnce(&mut VoterSetState<Block>) -> R
+	where
+		F: FnOnce(&mut VoterSetState<Block>) -> R,
 	{
 		f(&mut *self.inner.write())
 	}
@@ -452,8 +446,9 @@ impl<BE, Block: BlockT, C, N: NetworkT<Block>, SC, VR> Environment<BE, Block, C,
 	/// Updates the voter set state using the given closure. The write lock is
 	/// held during evaluation of the closure and the environment's voter set
 	/// state is set to its result if successful.
-	pub(crate) fn update_voter_set_state<F>(&self, f: F) -> Result<(), Error> where
-		F: FnOnce(&VoterSetState<Block>) -> Result<Option<VoterSetState<Block>>, Error>
+	pub(crate) fn update_voter_set_state<F>(&self, f: F) -> Result<(), Error>
+	where
+		F: FnOnce(&VoterSetState<Block>) -> Result<Option<VoterSetState<Block>>, Error>,
 	{
 		self.voter_set_state.with(|voter_set_state| {
 			if let Some(set_state) = f(&voter_set_state)? {
@@ -461,7 +456,9 @@ impl<BE, Block: BlockT, C, N: NetworkT<Block>, SC, VR> Environment<BE, Block, C,
 
 				if let Some(metrics) = self.metrics.as_ref() {
 					if let VoterSetState::Live { completed_rounds, .. } = voter_set_state {
-						let highest = completed_rounds.rounds.iter()
+						let highest = completed_rounds
+							.rounds
+							.iter()
 							.map(|round| round.number)
 							.max()
 							.expect("There is always one completed round (genesis); qed");
@@ -497,7 +494,7 @@ where
 			if *equivocation.offender() == local_id {
 				return Err(Error::Safety(
 					"Refraining from sending equivocation report for our own equivocation.".into(),
-				));
+				))
 			}
 		}
 
@@ -520,11 +517,8 @@ where
 
 		// find the hash of the latest block in the current set
 		let current_set_latest_hash = match next_change {
-			Some((_, n)) if n.is_zero() => {
-				return Err(Error::Safety(
-					"Authority set change signalled at genesis.".to_string(),
-				))
-			}
+			Some((_, n)) if n.is_zero() =>
+				return Err(Error::Safety("Authority set change signalled at genesis.".to_string())),
 			// the next set starts at `n` so the current one lasts until `n - 1`. if
 			// `n` is later than the best block, then the current set is still live
 			// at best block.
@@ -538,14 +532,15 @@ where
 
 				// its parent block is the last block in the current set
 				*header.parent_hash()
-			}
+			},
 			// there is no pending change, the latest block for the current set is
 			// the best block.
 			None => best_block_hash,
 		};
 
 		// generate key ownership proof at that block
-		let key_owner_proof = match self.client
+		let key_owner_proof = match self
+			.client
 			.runtime_api()
 			.generate_key_ownership_proof(
 				&BlockId::Hash(current_set_latest_hash),
@@ -557,15 +552,12 @@ where
 			Some(proof) => proof,
 			None => {
 				debug!(target: "afg", "Equivocation offender is not part of the authority set.");
-				return Ok(());
-			}
+				return Ok(())
+			},
 		};
 
 		// submit equivocation report at **best** block
-		let equivocation_proof = EquivocationProof::new(
-			authority_set.set_id,
-			equivocation,
-		);
+		let equivocation_proof = EquivocationProof::new(authority_set.set_id, equivocation);
 
 		self.client
 			.runtime_api()
@@ -608,7 +600,9 @@ pub(crate) fn ancestry<Block: BlockT, Client>(
 where
 	Client: HeaderMetadata<Block, Error = sp_blockchain::Error>,
 {
-	if base == block { return Err(GrandpaError::NotDescendent) }
+	if base == block {
+		return Err(GrandpaError::NotDescendent)
+	}
 
 	let tree_route_res = sp_blockchain::tree_route(&**client, block, base);
 
@@ -618,22 +612,17 @@ where
 			debug!(target: "afg", "Encountered error computing ancestry between block {:?} and base {:?}: {:?}",
 				   block, base, e);
 
-			return Err(GrandpaError::NotDescendent);
-		}
+			return Err(GrandpaError::NotDescendent)
+		},
 	};
 
 	if tree_route.common_block().hash != base {
-		return Err(GrandpaError::NotDescendent);
+		return Err(GrandpaError::NotDescendent)
 	}
 
 	// skip one because our ancestry is meant to start from the parent of `block`,
 	// and `tree_route` includes it.
-	Ok(tree_route
-		.retracted()
-		.iter()
-		.skip(1)
-		.map(|e| e.hash)
-		.collect())
+	Ok(tree_route.retracted().iter().skip(1).map(|e| e.hash).collect())
 }
 
 impl<B, Block, C, N, SC, VR> voter::Environment<Block::Hash, NumberFor<Block>>
@@ -699,7 +688,7 @@ where
 			//       before activating the new set. the `authority_set` is updated immediately thus
 			//       we restrict the voter based on that.
 			if set_id != authority_set.set_id() {
-				return Ok(None);
+				return Ok(None)
 			}
 
 			best_chain_containing(block, client, authority_set, select_chain, voting_rule)
@@ -718,13 +707,12 @@ where
 		let local_id = local_authority_id(&self.voters, self.config.keystore.as_ref());
 
 		let has_voted = match self.voter_set_state.has_voted(round) {
-			HasVoted::Yes(id, vote) => {
+			HasVoted::Yes(id, vote) =>
 				if local_id.as_ref().map(|k| k == &id).unwrap_or(false) {
 					HasVoted::Yes(id, vote)
 				} else {
 					HasVoted::No
-				}
-			},
+				},
 			HasVoted::No => HasVoted::No,
 		};
 
@@ -756,14 +744,17 @@ where
 
 		// schedule incoming messages from the network to be held until
 		// corresponding blocks are imported.
-		let incoming = Box::pin(UntilVoteTargetImported::new(
-			self.client.import_notification_stream(),
-			self.network.clone(),
-			self.client.clone(),
-			incoming,
-			"round",
-			None,
-		).map_err(Into::into));
+		let incoming = Box::pin(
+			UntilVoteTargetImported::new(
+				self.client.import_notification_stream(),
+				self.network.clone(),
+				self.client.clone(),
+				incoming,
+				"round",
+				None,
+			)
+			.map_err(Into::into),
+		);
 
 		// schedule network message cleanup when sink drops.
 		let outgoing = Box::pin(outgoing.sink_err_into());
@@ -789,18 +780,20 @@ where
 
 		self.update_voter_set_state(|voter_set_state| {
 			let (completed_rounds, current_rounds) = voter_set_state.with_current_round(round)?;
-			let current_round = current_rounds.get(&round)
+			let current_round = current_rounds
+				.get(&round)
 				.expect("checked in with_current_round that key exists; qed.");
 
 			if !current_round.can_propose() {
 				// we've already proposed in this round (in a previous run),
 				// ignore the given vote and don't update the voter set
 				// state
-				return Ok(None);
+				return Ok(None)
 			}
 
 			let mut current_rounds = current_rounds.clone();
-			let current_round = current_rounds.get_mut(&round)
+			let current_round = current_rounds
+				.get_mut(&round)
 				.expect("checked previously that key exists; qed.");
 
 			*current_round = HasVoted::Yes(local_id, Vote::Propose(propose));
@@ -849,7 +842,7 @@ where
 				// we've already prevoted in this round (in a previous run),
 				// ignore the given vote and don't update the voter set
 				// state
-				return Ok(None);
+				return Ok(None)
 			}
 
 			// report to telemetry and prometheus
@@ -858,7 +851,8 @@ where
 			let propose = current_round.propose();
 
 			let mut current_rounds = current_rounds.clone();
-			let current_round = current_rounds.get_mut(&round)
+			let current_round = current_rounds
+				.get_mut(&round)
 				.expect("checked previously that key exists; qed.");
 
 			*current_round = HasVoted::Yes(local_id, Vote::Prevote(propose.cloned(), prevote));
@@ -911,7 +905,7 @@ where
 				// we've already precommitted in this round (in a previous run),
 				// ignore the given vote and don't update the voter set
 				// state
-				return Ok(None);
+				return Ok(None)
 			}
 
 			// report to telemetry and prometheus
@@ -922,12 +916,13 @@ where
 				HasVoted::Yes(_, Vote::Prevote(_, prevote)) => prevote,
 				_ => {
 					let msg = "Voter precommitting before prevoting.";
-					return Err(Error::Safety(msg.to_string()));
-				}
+					return Err(Error::Safety(msg.to_string()))
+				},
 			};
 
 			let mut current_rounds = current_rounds.clone();
-			let current_round = current_rounds.get_mut(&round)
+			let current_round = current_rounds
+				.get_mut(&round)
 				.expect("checked previously that key exists; qed.");
 
 			*current_round = HasVoted::Yes(
@@ -973,7 +968,7 @@ where
 					(completed_rounds, current_rounds)
 				} else {
 					let msg = "Voter acting while in paused state.";
-					return Err(Error::Safety(msg.to_string()));
+					return Err(Error::Safety(msg.to_string()))
 				};
 
 			let mut completed_rounds = completed_rounds.clone();
@@ -998,10 +993,7 @@ where
 				current_rounds.insert(round + 1, HasVoted::No);
 			}
 
-			let set_state = VoterSetState::<Block>::Live {
-				completed_rounds,
-				current_rounds,
-			};
+			let set_state = VoterSetState::<Block>::Live { completed_rounds, current_rounds };
 
 			crate::aux_schema::write_voter_set_state(&*self.client, &set_state)?;
 
@@ -1038,21 +1030,21 @@ where
 					(completed_rounds, current_rounds)
 				} else {
 					let msg = "Voter acting while in paused state.";
-					return Err(Error::Safety(msg.to_string()));
+					return Err(Error::Safety(msg.to_string()))
 				};
 
 			let mut completed_rounds = completed_rounds.clone();
 
-			if let Some(already_completed) = completed_rounds.rounds
-				.iter_mut().find(|r| r.number == round)
+			if let Some(already_completed) =
+				completed_rounds.rounds.iter_mut().find(|r| r.number == round)
 			{
 				let n_existing_votes = already_completed.votes.len();
 
 				// the interface of Environment guarantees that the previous `historical_votes`
 				// from `completable` is a prefix of what is passed to `concluded`.
-				already_completed.votes.extend(
-					historical_votes.seen().iter().skip(n_existing_votes).cloned()
-				);
+				already_completed
+					.votes
+					.extend(historical_votes.seen().iter().skip(n_existing_votes).cloned());
 				already_completed.state = state;
 				crate::aux_schema::write_concluded_round(&*self.client, &already_completed)?;
 			}
@@ -1161,8 +1153,8 @@ where
 				block,
 			);
 
-			return Ok(None);
-		}
+			return Ok(None)
+		},
 	};
 
 	// we refuse to vote beyond the current limit number where transitions are scheduled to occur.
@@ -1195,7 +1187,7 @@ where
 					}
 
 					if *target_header.number() == target_number {
-						break;
+						break
 					}
 
 					target_header = client
@@ -1230,15 +1222,15 @@ where
 						restricted_number < target_header.number()
 				})
 				.or_else(|| Some((target_header.hash(), *target_header.number())))
-		}
+		},
 		Ok(None) => {
 			debug!(target: "afg", "Encountered error finding best chain containing {:?}: couldn't find target block", block);
 			None
-		}
+		},
 		Err(e) => {
 			debug!(target: "afg", "Encountered error finding best chain containing {:?}: {:?}", block, e);
 			None
-		}
+		},
 	};
 
 	Ok(result)
@@ -1281,20 +1273,22 @@ where
 				status.finalized_number,
 		);
 
-		return Ok(());
+		return Ok(())
 	}
 
 	// FIXME #1483: clone only when changed
 	let old_authority_set = authority_set.clone();
 
 	let update_res: Result<_, Error> = client.lock_import_and_run(|import_op| {
-		let status = authority_set.apply_standard_changes(
-			hash,
-			number,
-			&is_descendent_of::<Block, _>(&*client, None),
-			initial_sync,
-			None,
-		).map_err(|e| Error::Safety(e.to_string()))?;
+		let status = authority_set
+			.apply_standard_changes(
+				hash,
+				number,
+				&is_descendent_of::<Block, _>(&*client, None),
+				initial_sync,
+				None,
+			)
+			.map_err(|e| Error::Safety(e.to_string()))?;
 
 		// send a justification notification if a sender exists and in case of error log it.
 		fn notify_justification<Block: BlockT>(
@@ -1327,17 +1321,15 @@ where
 				if !justification_required {
 					if let Some(justification_period) = justification_period {
 						let last_finalized_number = client.info().finalized_number;
-						justification_required =
-							(!last_finalized_number.is_zero() || number - last_finalized_number == justification_period) &&
-							(last_finalized_number / justification_period != number / justification_period);
+						justification_required = (!last_finalized_number.is_zero() ||
+							number - last_finalized_number == justification_period) &&
+							(last_finalized_number / justification_period !=
+								number / justification_period);
 					}
 				}
 
-				let justification = GrandpaJustification::from_commit(
-					&client,
-					round_number,
-					commit,
-				)?;
+				let justification =
+					GrandpaJustification::from_commit(&client, round_number, commit)?;
 
 				(justification_required, justification)
 			},
@@ -1369,25 +1361,22 @@ where
 			"number" => ?number, "hash" => ?hash,
 		);
 
-		crate::aux_schema::update_best_justification(
-			&justification,
-			|insert| apply_aux(import_op, insert, &[]),
-		)?;
+		crate::aux_schema::update_best_justification(&justification, |insert| {
+			apply_aux(import_op, insert, &[])
+		})?;
 
 		let new_authorities = if let Some((canon_hash, canon_number)) = status.new_set_block {
 			// the authority set has changed.
 			let (new_id, set_ref) = authority_set.current();
 
 			if set_ref.len() > 16 {
-				afg_log!(initial_sync,
+				afg_log!(
+					initial_sync,
 					"👴 Applying GRANDPA set change to new set with {} authorities",
 					set_ref.len(),
 				);
 			} else {
-				afg_log!(initial_sync,
-					"👴 Applying GRANDPA set change to new set {:?}",
-					set_ref,
-				);
+				afg_log!(initial_sync, "👴 Applying GRANDPA set change to new set {:?}", set_ref,);
 			}
 
 			telemetry!(
@@ -1419,7 +1408,7 @@ where
 				warn!(target: "afg", "Failed to write updated authority set to disk. Bailing.");
 				warn!(target: "afg", "Node is in a potentially inconsistent state.");
 
-				return Err(e.into());
+				return Err(e.into())
 			}
 		}
 
@@ -1433,6 +1422,6 @@ where
 			*authority_set = old_authority_set;
 
 			Err(CommandOrError::Error(e))
-		}
+		},
 	}
 }
diff --git a/client/finality-grandpa/src/finality_proof.rs b/client/finality-grandpa/src/finality_proof.rs
index ec33d48774ae..56533704af80 100644
--- a/client/finality-grandpa/src/finality_proof.rs
+++ b/client/finality-grandpa/src/finality_proof.rs
@@ -39,19 +39,20 @@
 use log::{trace, warn};
 use std::sync::Arc;
 
-use parity_scale_codec::{Encode, Decode};
+use parity_scale_codec::{Decode, Encode};
+use sc_client_api::backend::Backend;
 use sp_blockchain::{Backend as BlockchainBackend, HeaderBackend};
 use sp_finality_grandpa::GRANDPA_ENGINE_ID;
 use sp_runtime::{
 	generic::BlockId,
-	traits::{NumberFor, Block as BlockT, Header as HeaderT, One},
+	traits::{Block as BlockT, Header as HeaderT, NumberFor, One},
 };
-use sc_client_api::backend::Backend;
 
 use crate::{
-	SharedAuthoritySet, best_justification,
 	authorities::{AuthoritySetChangeId, AuthoritySetChanges},
+	best_justification,
 	justification::GrandpaJustification,
+	SharedAuthoritySet,
 };
 
 const MAX_UNKNOWN_HEADERS: usize = 100_000;
@@ -76,10 +77,7 @@ where
 		backend: Arc<B>,
 		shared_authority_set: Option<SharedAuthoritySet<Block::Hash, NumberFor<Block>>>,
 	) -> Self {
-		FinalityProofProvider {
-			backend,
-			shared_authority_set,
-		}
+		FinalityProofProvider { backend, shared_authority_set }
 	}
 
 	/// Create new finality proof provider for the service using:
@@ -113,14 +111,10 @@ where
 		{
 			changes
 		} else {
-			return Ok(None);
+			return Ok(None)
 		};
 
-		prove_finality(
-			&*self.backend,
-			authority_set_changes,
-			block,
-		)
+		prove_finality(&*self.backend, authority_set_changes, block)
 	}
 }
 
@@ -166,11 +160,10 @@ where
 	if info.finalized_number < block {
 		let err = format!(
 			"Requested finality proof for descendant of #{} while we only have finalized #{}.",
-			block,
-			info.finalized_number,
+			block, info.finalized_number,
 		);
 		trace!(target: "afg", "{}", &err);
-		return Err(FinalityProofError::BlockNotYetFinalized);
+		return Err(FinalityProofError::BlockNotYetFinalized)
 	}
 
 	let (justification, just_block) = match authority_set_changes.get_set_id(block) {
@@ -185,9 +178,9 @@ where
 					"No justification found for the latest finalized block. \
 					Returning empty proof.",
 				);
-				return Ok(None);
+				return Ok(None)
 			}
-		}
+		},
 		AuthoritySetChangeId::Set(_, last_block_for_set) => {
 			let last_block_for_set_id = BlockId::Number(last_block_for_set);
 			let justification = if let Some(grandpa_justification) = backend
@@ -203,10 +196,10 @@ where
 					Returning empty proof.",
 					block,
 				);
-				return Ok(None);
+				return Ok(None)
 			};
 			(justification, last_block_for_set)
-		}
+		},
 		AuthoritySetChangeId::Unknown => {
 			warn!(
 				target: "afg",
@@ -214,8 +207,8 @@ where
 				 You need to resync to populate AuthoritySetChanges properly.",
 				block,
 			);
-			return Err(FinalityProofError::BlockNotInAuthoritySetChanges);
-		}
+			return Err(FinalityProofError::BlockNotInAuthoritySetChanges)
+		},
 	};
 
 	// Collect all headers from the requested block until the last block of the set
@@ -224,7 +217,7 @@ where
 		let mut current = block + One::one();
 		loop {
 			if current > just_block || headers.len() >= MAX_UNKNOWN_HEADERS {
-				break;
+				break
 			}
 			headers.push(backend.blockchain().expect_header(BlockId::Number(current))?);
 			current += One::one();
@@ -245,9 +238,7 @@ where
 #[cfg(test)]
 pub(crate) mod tests {
 	use super::*;
-	use crate::{
-		authorities::AuthoritySetChanges, BlockNumberOps, ClientError, SetId,
-	};
+	use crate::{authorities::AuthoritySetChanges, BlockNumberOps, ClientError, SetId};
 	use futures::executor::block_on;
 	use sc_block_builder::BlockBuilderProvider;
 	use sc_client_api::{apply_aux, LockImportRun};
@@ -276,8 +267,9 @@ pub(crate) mod tests {
 		let proof = super::FinalityProof::<Block::Header>::decode(&mut &remote_proof[..])
 			.map_err(|_| ClientError::BadJustification("failed to decode finality proof".into()))?;
 
-		let justification: GrandpaJustification<Block> = Decode::decode(&mut &proof.justification[..])
-			.map_err(|_| ClientError::JustificationDecode)?;
+		let justification: GrandpaJustification<Block> =
+			Decode::decode(&mut &proof.justification[..])
+				.map_err(|_| ClientError::JustificationDecode)?;
 		justification.verify(current_set_id, &current_authorities)?;
 
 		Ok(proof)
@@ -321,13 +313,13 @@ pub(crate) mod tests {
 	}
 
 	fn store_best_justification(client: &TestClient, just: &GrandpaJustification<Block>) {
-		client.lock_import_and_run(|import_op| {
-			crate::aux_schema::update_best_justification(
-				just,
-				|insert| apply_aux(import_op, insert, &[]),
-			)
-		})
-		.unwrap();
+		client
+			.lock_import_and_run(|import_op| {
+				crate::aux_schema::update_best_justification(just, |insert| {
+					apply_aux(import_op, insert, &[])
+				})
+			})
+			.unwrap();
 	}
 
 	#[test]
@@ -336,11 +328,7 @@ pub(crate) mod tests {
 		let authority_set_changes = AuthoritySetChanges::empty();
 
 		// The last finalized block is 4, so we cannot provide further justifications.
-		let proof_of_5 = prove_finality(
-			&*backend,
-			authority_set_changes,
-			5,
-		);
+		let proof_of_5 = prove_finality(&*backend, authority_set_changes, 5);
 		assert!(matches!(proof_of_5, Err(FinalityProofError::BlockNotYetFinalized)));
 	}
 
@@ -353,12 +341,7 @@ pub(crate) mod tests {
 
 		// Block 4 is finalized without justification
 		// => we can't prove finality of 3
-		let proof_of_3 = prove_finality(
-			&*backend,
-			authority_set_changes,
-			3,
-		)
-		.unwrap();
+		let proof_of_3 = prove_finality(&*backend, authority_set_changes, 3).unwrap();
 		assert_eq!(proof_of_3, None);
 	}
 
@@ -406,14 +389,15 @@ pub(crate) mod tests {
 			1,
 			vec![(AuthorityId::from_slice(&[3u8; 32]), 1u64)],
 			finality_proof.encode(),
-		).unwrap_err();
+		)
+		.unwrap_err();
 	}
 
 	fn create_commit<S, Id>(
 		block: Block,
 		round: u64,
 		set_id: SetId,
-		auth: &[Ed25519Keyring]
+		auth: &[Ed25519Keyring],
 	) -> finality_grandpa::Commit<H256, u64, S, Id>
 	where
 		Id: From<sp_core::ed25519::Public>,
@@ -481,11 +465,7 @@ pub(crate) mod tests {
 		let mut authority_set_changes = AuthoritySetChanges::empty();
 		authority_set_changes.append(1, 8);
 
-		let proof_of_6 = prove_finality(
-			&*backend,
-			authority_set_changes,
-			6,
-		);
+		let proof_of_6 = prove_finality(&*backend, authority_set_changes, 6);
 		assert!(matches!(proof_of_6, Err(FinalityProofError::BlockNotInAuthoritySetChanges)));
 	}
 
@@ -499,11 +479,9 @@ pub(crate) mod tests {
 		let commit = create_commit(block8.clone(), round, 1, &[Ed25519Keyring::Alice]);
 		let grandpa_just8 = GrandpaJustification::from_commit(&client, round, commit).unwrap();
 
-		client.finalize_block(
-			BlockId::Number(8),
-			Some((ID, grandpa_just8.encode().clone()))
-		)
-		.unwrap();
+		client
+			.finalize_block(BlockId::Number(8), Some((ID, grandpa_just8.encode().clone())))
+			.unwrap();
 
 		// Authority set change at block 8, so the justification stored there will be used in the
 		// FinalityProof for block 6
@@ -512,13 +490,7 @@ pub(crate) mod tests {
 		authority_set_changes.append(1, 8);
 
 		let proof_of_6: FinalityProof = Decode::decode(
-			&mut &prove_finality(
-				&*backend,
-				authority_set_changes.clone(),
-				6,
-			)
-			.unwrap()
-			.unwrap()[..],
+			&mut &prove_finality(&*backend, authority_set_changes.clone(), 6).unwrap().unwrap()[..],
 		)
 		.unwrap();
 		assert_eq!(
@@ -540,10 +512,7 @@ pub(crate) mod tests {
 		let mut authority_set_changes = AuthoritySetChanges::empty();
 		authority_set_changes.append(0, 5);
 
-		assert!(matches!(
-			prove_finality(&*backend, authority_set_changes, 6),
-			Ok(None),
-		));
+		assert!(matches!(prove_finality(&*backend, authority_set_changes, 6), Ok(None),));
 	}
 
 	#[test]
@@ -563,13 +532,7 @@ pub(crate) mod tests {
 		authority_set_changes.append(0, 5);
 
 		let proof_of_6: FinalityProof = Decode::decode(
-			&mut &prove_finality(
-				&*backend,
-				authority_set_changes,
-				6,
-			)
-			.unwrap()
-			.unwrap()[..],
+			&mut &prove_finality(&*backend, authority_set_changes, 6).unwrap().unwrap()[..],
 		)
 		.unwrap();
 		assert_eq!(
diff --git a/client/finality-grandpa/src/import.rs b/client/finality-grandpa/src/import.rs
index ebb26a28c348..18e5e2c89d06 100644
--- a/client/finality-grandpa/src/import.rs
+++ b/client/finality-grandpa/src/import.rs
@@ -31,9 +31,11 @@ use sp_consensus::{
 	ImportResult, JustificationImport, SelectChain,
 };
 use sp_finality_grandpa::{ConsensusLog, ScheduledChange, SetId, GRANDPA_ENGINE_ID};
-use sp_runtime::generic::{BlockId, OpaqueDigestItemId};
-use sp_runtime::traits::{Block as BlockT, DigestFor, Header as HeaderT, NumberFor, Zero};
-use sp_runtime::Justification;
+use sp_runtime::{
+	generic::{BlockId, OpaqueDigestItemId},
+	traits::{Block as BlockT, DigestFor, Header as HeaderT, NumberFor, Zero},
+	Justification,
+};
 use sp_utils::mpsc::TracingUnboundedSender;
 
 use crate::{
@@ -98,12 +100,8 @@ where
 		let chain_info = self.inner.info();
 
 		// request justifications for all pending changes for which change blocks have already been imported
-		let pending_changes: Vec<_> = self
-			.authority_set
-			.inner()
-			.pending_changes()
-			.cloned()
-			.collect();
+		let pending_changes: Vec<_> =
+			self.authority_set.inner().pending_changes().cloned().collect();
 
 		for pending_change in pending_changes {
 			if pending_change.delay_kind == DelayKind::Finalized &&
@@ -241,7 +239,7 @@ where
 	) -> Option<PendingChange<Block::Hash, NumberFor<Block>>> {
 		// check for forced authority set hard forks
 		if let Some(change) = self.authority_set_hard_forks.get(&hash) {
-			return Some(change.clone());
+			return Some(change.clone())
 		}
 
 		// check for forced change.
@@ -252,7 +250,7 @@ where
 				canon_height: *header.number(),
 				canon_hash: hash,
 				delay_kind: DelayKind::Best { median_last_finalized },
-			});
+			})
 		}
 
 		// check normal scheduled change.
@@ -295,10 +293,9 @@ where
 			fn consume(
 				mut self,
 			) -> Option<(AuthoritySet<H, N>, SharedDataLocked<'a, AuthoritySet<H, N>>)> {
-				self.old.take().map(|old| (
-						old,
-						self.guard.take().expect("only taken on deconstruction; qed"),
-				))
+				self.old
+					.take()
+					.map(|old| (old, self.guard.take().expect("only taken on deconstruction; qed")))
 			}
 		}
 
@@ -311,20 +308,14 @@ where
 		}
 
 		let number = *(block.header.number());
-		let maybe_change = self.check_new_change(
-			&block.header,
-			hash,
-		);
+		let maybe_change = self.check_new_change(&block.header, hash);
 
 		// returns a function for checking whether a block is a descendent of another
 		// consistent with querying client directly after importing the block.
 		let parent_hash = *block.header.parent_hash();
 		let is_descendent_of = is_descendent_of(&*self.inner, Some((hash, parent_hash)));
 
-		let mut guard = InnerGuard {
-			guard: Some(self.authority_set.inner_locked()),
-			old: None,
-		};
+		let mut guard = InnerGuard { guard: Some(self.authority_set.inner_locked()), old: None };
 
 		// whether to pause the old authority set -- happens after import
 		// of a forced change block.
@@ -339,10 +330,10 @@ where
 				do_pause = true;
 			}
 
-			guard.as_mut().add_pending_change(
-				change,
-				&is_descendent_of,
-			).map_err(|e| ConsensusError::ClientImport(e.to_string()))?;
+			guard
+				.as_mut()
+				.add_pending_change(change, &is_descendent_of)
+				.map_err(|e| ConsensusError::ClientImport(e.to_string()))?;
 		}
 
 		let applied_changes = {
@@ -389,7 +380,9 @@ where
 
 				AppliedChanges::Forced(new_authorities)
 			} else {
-				let did_standard = guard.as_mut().enacts_standard_change(hash, number, &is_descendent_of)
+				let did_standard = guard
+					.as_mut()
+					.enacts_standard_change(hash, number, &is_descendent_of)
 					.map_err(|e| ConsensusError::ClientImport(e.to_string()))
 					.map_err(ConsensusError::from)?;
 
@@ -413,19 +406,17 @@ where
 			crate::aux_schema::update_authority_set::<Block, _, _>(
 				authorities,
 				authorities_change,
-				|insert| block.auxiliary.extend(
-					insert.iter().map(|(k, v)| (k.to_vec(), Some(v.to_vec())))
-				)
+				|insert| {
+					block
+						.auxiliary
+						.extend(insert.iter().map(|(k, v)| (k.to_vec(), Some(v.to_vec()))))
+				},
 			);
 		}
 
 		let just_in_case = just_in_case.map(|(o, i)| (o, i.release_mutex()));
 
-		Ok(PendingSetChanges {
-			just_in_case,
-			applied_changes,
-			do_pause,
-		})
+		Ok(PendingSetChanges { just_in_case, applied_changes, do_pause })
 	}
 }
 
@@ -459,7 +450,7 @@ where
 				// Strip justifications when re-importing an existing block.
 				let _justifications = block.justifications.take();
 				return (&*self.inner).import_block(block, new_cache).await
-			}
+			},
 			Ok(BlockStatus::Unknown) => {},
 			Err(e) => return Err(ConsensusError::ClientImport(e.to_string())),
 		}
@@ -483,7 +474,7 @@ where
 						r,
 					);
 					pending_changes.revert();
-					return Ok(r);
+					return Ok(r)
 				},
 				Err(e) => {
 					debug!(
@@ -492,7 +483,7 @@ where
 						e,
 					);
 					pending_changes.revert();
-					return Err(ConsensusError::ClientImport(e.to_string()));
+					return Err(ConsensusError::ClientImport(e.to_string()))
 				},
 			}
 		};
@@ -501,9 +492,9 @@ where
 
 		// Send the pause signal after import but BEFORE sending a `ChangeAuthorities` message.
 		if do_pause {
-			let _ = self.send_voter_commands.unbounded_send(
-				VoterCommand::Pause("Forced change scheduled after inactivity".to_string())
-			);
+			let _ = self.send_voter_commands.unbounded_send(VoterCommand::Pause(
+				"Forced change scheduled after inactivity".to_string(),
+			));
 		}
 
 		let needs_justification = applied_changes.needs_justification();
@@ -521,7 +512,8 @@ where
 				// they should import the block and discard the justification, and they will
 				// then request a justification from sync if it's necessary (which they should
 				// then be able to successfully validate).
-				let _ = self.send_voter_commands.unbounded_send(VoterCommand::ChangeAuthorities(new));
+				let _ =
+					self.send_voter_commands.unbounded_send(VoterCommand::ChangeAuthorities(new));
 
 				// we must clear all pending justifications requests, presumably they won't be
 				// finalized hence why this forced changes was triggered
@@ -537,8 +529,8 @@ where
 			_ => {},
 		}
 
-		let grandpa_justification = justifications
-			.and_then(|just| just.into_justification(GRANDPA_ENGINE_ID));
+		let grandpa_justification =
+			justifications.and_then(|just| just.into_justification(GRANDPA_ENGINE_ID));
 
 		match grandpa_justification {
 			Some(justification) => {
@@ -559,7 +551,7 @@ where
 					}
 				});
 			},
-			None => {
+			None =>
 				if needs_justification {
 					debug!(
 						target: "afg",
@@ -568,8 +560,7 @@ where
 					);
 
 					imported_aux.needs_justification = true;
-				}
-			}
+				},
 		}
 
 		Ok(ImportResult::Imported(imported_aux))
@@ -616,14 +607,9 @@ impl<Backend, Block: BlockT, Client, SC> GrandpaBlockImport<Backend, Block, Clie
 		{
 			let mut authority_set = authority_set.inner();
 
-			authority_set.pending_standard_changes = authority_set
-				.pending_standard_changes
-				.clone()
-				.map(&mut |hash, _, original| {
-					authority_set_hard_forks
-						.get(&hash)
-						.cloned()
-						.unwrap_or(original)
+			authority_set.pending_standard_changes =
+				authority_set.pending_standard_changes.clone().map(&mut |hash, _, original| {
+					authority_set_hard_forks.get(&hash).cloned().unwrap_or(original)
 				});
 		}
 
@@ -664,7 +650,7 @@ where
 			// justification import pipeline similar to what we do for `BlockImport`. In the
 			// meantime we'll just drop the justification, since this is only used for BEEFY which
 			// is still WIP.
-			return Ok(());
+			return Ok(())
 		}
 
 		let justification = GrandpaJustification::decode_and_verify_finalizes(
@@ -693,7 +679,8 @@ where
 
 		match result {
 			Err(CommandOrError::VoterCommand(command)) => {
-				afg_log!(initial_sync,
+				afg_log!(
+					initial_sync,
 					"👴 Imported justification for block #{} that triggers \
 					command {}, signaling voter.",
 					number,
@@ -703,7 +690,7 @@ where
 				// send the command to the voter
 				let _ = self.send_voter_commands.unbounded_send(command);
 			},
-			Err(CommandOrError::Error(e)) => {
+			Err(CommandOrError::Error(e)) =>
 				return Err(match e {
 					Error::Grandpa(error) => ConsensusError::ClientImport(error.to_string()),
 					Error::Network(error) => ConsensusError::ClientImport(error),
@@ -713,10 +700,12 @@ where
 					Error::Signing(error) => ConsensusError::ClientImport(error),
 					Error::Timer(error) => ConsensusError::ClientImport(error.to_string()),
 					Error::RuntimeApi(error) => ConsensusError::ClientImport(error.to_string()),
-				});
-			},
+				}),
 			Ok(_) => {
-				assert!(!enacts_change, "returns Ok when no authority set change should be enacted; qed;");
+				assert!(
+					!enacts_change,
+					"returns Ok when no authority set change should be enacted; qed;"
+				);
 			},
 		}
 
diff --git a/client/finality-grandpa/src/justification.rs b/client/finality-grandpa/src/justification.rs
index 7805161f06c6..d051d0c44e03 100644
--- a/client/finality-grandpa/src/justification.rs
+++ b/client/finality-grandpa/src/justification.rs
@@ -16,8 +16,10 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use std::collections::{HashMap, HashSet};
-use std::sync::Arc;
+use std::{
+	collections::{HashMap, HashSet},
+	sync::Arc,
+};
 
 use finality_grandpa::{voter_set::VoterSet, Error as GrandpaError};
 use parity_scale_codec::{Decode, Encode};
@@ -52,7 +54,8 @@ impl<Block: BlockT> GrandpaJustification<Block> {
 		client: &Arc<C>,
 		round: u64,
 		commit: Commit<Block>,
-	) -> Result<GrandpaJustification<Block>, Error> where
+	) -> Result<GrandpaJustification<Block>, Error>
+	where
 		C: HeaderBackend<Block>,
 	{
 		let mut votes_ancestries_hashes = HashSet::new();
@@ -66,12 +69,14 @@ impl<Block: BlockT> GrandpaJustification<Block> {
 		for signed in commit.precommits.iter() {
 			let mut current_hash = signed.precommit.target_hash;
 			loop {
-				if current_hash == commit.target_hash { break; }
+				if current_hash == commit.target_hash {
+					break
+				}
 
 				match client.header(BlockId::Hash(current_hash))? {
 					Some(current_header) => {
 						if *current_header.number() <= commit.target_number {
-							return error();
+							return error()
 						}
 
 						let parent_hash = *current_header.parent_hash();
@@ -95,20 +100,20 @@ impl<Block: BlockT> GrandpaJustification<Block> {
 		finalized_target: (Block::Hash, NumberFor<Block>),
 		set_id: u64,
 		voters: &VoterSet<AuthorityId>,
-	) -> Result<GrandpaJustification<Block>, ClientError> where
+	) -> Result<GrandpaJustification<Block>, ClientError>
+	where
 		NumberFor<Block>: finality_grandpa::BlockNumberOps,
 	{
-
 		let justification = GrandpaJustification::<Block>::decode(&mut &*encoded)
 			.map_err(|_| ClientError::JustificationDecode)?;
 
-		if (justification.commit.target_hash, justification.commit.target_number) != finalized_target {
+		if (justification.commit.target_hash, justification.commit.target_number) !=
+			finalized_target
+		{
 			let msg = "invalid commit target in grandpa justification".to_string();
 			Err(ClientError::BadJustification(msg))
 		} else {
-			justification
-				.verify_with_voter_set(set_id, voters)
-				.map(|_| justification)
+			justification.verify_with_voter_set(set_id, voters).map(|_| justification)
 		}
 	}
 
@@ -117,9 +122,8 @@ impl<Block: BlockT> GrandpaJustification<Block> {
 	where
 		NumberFor<Block>: finality_grandpa::BlockNumberOps,
 	{
-		let voters = VoterSet::new(authorities.iter().cloned()).ok_or(ClientError::Consensus(
-			sp_consensus::Error::InvalidAuthoritiesSet,
-		))?;
+		let voters = VoterSet::new(authorities.iter().cloned())
+			.ok_or(ClientError::Consensus(sp_consensus::Error::InvalidAuthoritiesSet))?;
 
 		self.verify_with_voter_set(set_id, &voters)
 	}
@@ -137,16 +141,12 @@ impl<Block: BlockT> GrandpaJustification<Block> {
 
 		let ancestry_chain = AncestryChain::<Block>::new(&self.votes_ancestries);
 
-		match finality_grandpa::validate_commit(
-			&self.commit,
-			voters,
-			&ancestry_chain,
-		) {
+		match finality_grandpa::validate_commit(&self.commit, voters, &ancestry_chain) {
 			Ok(ref result) if result.ghost().is_some() => {},
 			_ => {
 				let msg = "invalid commit in grandpa justification".to_string();
-				return Err(ClientError::BadJustification(msg));
-			}
+				return Err(ClientError::BadJustification(msg))
+			},
 		}
 
 		let mut buf = Vec::new();
@@ -161,11 +161,12 @@ impl<Block: BlockT> GrandpaJustification<Block> {
 				&mut buf,
 			) {
 				return Err(ClientError::BadJustification(
-					"invalid signature for precommit in grandpa justification".to_string()));
+					"invalid signature for precommit in grandpa justification".to_string(),
+				))
 			}
 
 			if self.commit.target_hash == signed.precommit.target_hash {
-				continue;
+				continue
 			}
 
 			match ancestry_chain.ancestry(self.commit.target_hash, signed.precommit.target_hash) {
@@ -176,21 +177,21 @@ impl<Block: BlockT> GrandpaJustification<Block> {
 						visited_hashes.insert(hash);
 					}
 				},
-				_ => {
+				_ =>
 					return Err(ClientError::BadJustification(
-						"invalid precommit ancestry proof in grandpa justification".to_string()));
-				},
+						"invalid precommit ancestry proof in grandpa justification".to_string(),
+					)),
 			}
 		}
 
-		let ancestry_hashes = self.votes_ancestries
-			.iter()
-			.map(|h: &Block::Header| h.hash())
-			.collect();
+		let ancestry_hashes =
+			self.votes_ancestries.iter().map(|h: &Block::Header| h.hash()).collect();
 
 		if visited_hashes != ancestry_hashes {
 			return Err(ClientError::BadJustification(
-				"invalid precommit ancestries in grandpa justification with unused headers".to_string()));
+				"invalid precommit ancestries in grandpa justification with unused headers"
+					.to_string(),
+			))
 		}
 
 		Ok(())
@@ -211,24 +212,28 @@ struct AncestryChain<Block: BlockT> {
 
 impl<Block: BlockT> AncestryChain<Block> {
 	fn new(ancestry: &[Block::Header]) -> AncestryChain<Block> {
-		let ancestry: HashMap<_, _> = ancestry
-			.iter()
-			.cloned()
-			.map(|h: Block::Header| (h.hash(), h))
-			.collect();
+		let ancestry: HashMap<_, _> =
+			ancestry.iter().cloned().map(|h: Block::Header| (h.hash(), h)).collect();
 
 		AncestryChain { ancestry }
 	}
 }
 
-impl<Block: BlockT> finality_grandpa::Chain<Block::Hash, NumberFor<Block>> for AncestryChain<Block> where
-	NumberFor<Block>: finality_grandpa::BlockNumberOps
+impl<Block: BlockT> finality_grandpa::Chain<Block::Hash, NumberFor<Block>> for AncestryChain<Block>
+where
+	NumberFor<Block>: finality_grandpa::BlockNumberOps,
 {
-	fn ancestry(&self, base: Block::Hash, block: Block::Hash) -> Result<Vec<Block::Hash>, GrandpaError> {
+	fn ancestry(
+		&self,
+		base: Block::Hash,
+		block: Block::Hash,
+	) -> Result<Vec<Block::Hash>, GrandpaError> {
 		let mut route = Vec::new();
 		let mut current_hash = block;
 		loop {
-			if current_hash == base { break; }
+			if current_hash == base {
+				break
+			}
 			match self.ancestry.get(&current_hash) {
 				Some(current_header) => {
 					current_hash = *current_header.parent_hash();
diff --git a/client/finality-grandpa/src/lib.rs b/client/finality-grandpa/src/lib.rs
index 6c3f0f6af37a..58e7ba1493e8 100644
--- a/client/finality-grandpa/src/lib.rs
+++ b/client/finality-grandpa/src/lib.rs
@@ -56,41 +56,39 @@
 
 #![warn(missing_docs)]
 
-use futures::{
-	prelude::*,
-	StreamExt,
-};
+use futures::{prelude::*, StreamExt};
 use log::{debug, error, info};
+use parity_scale_codec::{Decode, Encode};
+use parking_lot::RwLock;
+use prometheus_endpoint::{PrometheusError, Registry};
 use sc_client_api::{
 	backend::{AuxStore, Backend},
-	LockImportRun, BlockchainEvents, CallExecutor,
-	ExecutionStrategy, Finalizer, TransactionFor, ExecutorProvider,
+	BlockchainEvents, CallExecutor, ExecutionStrategy, ExecutorProvider, Finalizer, LockImportRun,
+	TransactionFor,
 };
-use parity_scale_codec::{Decode, Encode};
-use prometheus_endpoint::{PrometheusError, Registry};
+use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_DEBUG, CONSENSUS_INFO};
 use sp_api::ProvideRuntimeApi;
-use sp_blockchain::{HeaderBackend, Error as ClientError, HeaderMetadata};
-use sp_runtime::generic::BlockId;
-use sp_runtime::traits::{NumberFor, Block as BlockT, DigestFor, Zero};
-use sp_consensus::{SelectChain, BlockImport};
-use sp_core::{
-	crypto::Public,
-};
-use sp_keystore::{SyncCryptoStorePtr, SyncCryptoStore};
 use sp_application_crypto::AppKey;
+use sp_blockchain::{Error as ClientError, HeaderBackend, HeaderMetadata};
+use sp_consensus::{BlockImport, SelectChain};
+use sp_core::crypto::Public;
+use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr};
+use sp_runtime::{
+	generic::BlockId,
+	traits::{Block as BlockT, DigestFor, NumberFor, Zero},
+};
 use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver};
-use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_INFO, CONSENSUS_DEBUG};
-use parking_lot::RwLock;
 
-use finality_grandpa::Error as GrandpaError;
-use finality_grandpa::{voter, voter_set::VoterSet};
 pub use finality_grandpa::BlockNumberOps;
-
-use std::{fmt, io};
-use std::sync::Arc;
-use std::time::Duration;
-use std::pin::Pin;
-use std::task::{Poll, Context};
+use finality_grandpa::{voter, voter_set::VoterSet, Error as GrandpaError};
+
+use std::{
+	fmt, io,
+	pin::Pin,
+	sync::Arc,
+	task::{Context, Poll},
+	time::Duration,
+};
 
 // utility logging macro that takes as first argument a conditional to
 // decide whether to log under debug or info level (useful to restrict
@@ -123,6 +121,7 @@ mod voting_rule;
 
 pub use authorities::{AuthoritySet, AuthoritySetChanges, SharedAuthoritySet};
 pub use aux_schema::best_justification;
+pub use finality_grandpa::voter::report;
 pub use finality_proof::{FinalityProof, FinalityProofError, FinalityProofProvider};
 pub use import::{find_forced_change, find_scheduled_change, GrandpaBlockImport};
 pub use justification::GrandpaJustification;
@@ -132,13 +131,12 @@ pub use voting_rule::{
 	BeforeBestBlockBy, ThreeQuartersOfTheUnfinalizedChain, VotingRule, VotingRuleResult,
 	VotingRulesBuilder,
 };
-pub use finality_grandpa::voter::report;
 
 use aux_schema::PersistentData;
 use communication::{Network as NetworkT, NetworkBridge};
 use environment::{Environment, VoterSetState};
-use until_imported::UntilGlobalMessageBlocksImported;
 use sp_finality_grandpa::{AuthorityList, AuthoritySignature, SetId};
+use until_imported::UntilGlobalMessageBlocksImported;
 
 // Re-export these two because it's just so damn convenient.
 pub use sp_finality_grandpa::{AuthorityId, AuthorityPair, GrandpaApi, ScheduledChange};
@@ -159,7 +157,8 @@ pub type SignedMessage<Block> = finality_grandpa::SignedMessage<
 >;
 
 /// A primary propose message for this chain's block type.
-pub type PrimaryPropose<Block> = finality_grandpa::PrimaryPropose<<Block as BlockT>::Hash, NumberFor<Block>>;
+pub type PrimaryPropose<Block> =
+	finality_grandpa::PrimaryPropose<<Block as BlockT>::Hash, NumberFor<Block>>;
 /// A prevote message for this chain's block type.
 pub type Prevote<Block> = finality_grandpa::Prevote<<Block as BlockT>::Hash, NumberFor<Block>>;
 /// A precommit message for this chain's block type.
@@ -198,22 +197,14 @@ type CommunicationIn<Block> = finality_grandpa::voter::CommunicationIn<
 /// Global communication input stream for commits and catch up messages, with
 /// the hash type not being derived from the block, useful for forcing the hash
 /// to some type (e.g. `H256`) when the compiler can't do the inference.
-type CommunicationInH<Block, H> = finality_grandpa::voter::CommunicationIn<
-	H,
-	NumberFor<Block>,
-	AuthoritySignature,
-	AuthorityId,
->;
+type CommunicationInH<Block, H> =
+	finality_grandpa::voter::CommunicationIn<H, NumberFor<Block>, AuthoritySignature, AuthorityId>;
 
 /// Global communication sink for commits with the hash type not being derived
 /// from the block, useful for forcing the hash to some type (e.g. `H256`) when
 /// the compiler can't do the inference.
-type CommunicationOutH<Block, H> = finality_grandpa::voter::CommunicationOut<
-	H,
-	NumberFor<Block>,
-	AuthoritySignature,
-	AuthorityId,
->;
+type CommunicationOutH<Block, H> =
+	finality_grandpa::voter::CommunicationOut<H, NumberFor<Block>, AuthoritySignature, AuthorityId>;
 
 /// Shared voter state for querying.
 pub struct SharedVoterState {
@@ -223,18 +214,14 @@ pub struct SharedVoterState {
 impl SharedVoterState {
 	/// Create a new empty `SharedVoterState` instance.
 	pub fn empty() -> Self {
-		Self {
-			inner: Arc::new(RwLock::new(None)),
-		}
+		Self { inner: Arc::new(RwLock::new(None)) }
 	}
 
 	fn reset(
 		&self,
 		voter_state: Box<dyn voter::VoterState<AuthorityId> + Sync + Send>,
 	) -> Option<()> {
-		let mut shared_voter_state = self
-			.inner
-			.try_write_for(Duration::from_secs(1))?;
+		let mut shared_voter_state = self.inner.try_write_for(Duration::from_secs(1))?;
 
 		*shared_voter_state = Some(voter_state);
 		Some(())
@@ -323,7 +310,8 @@ pub(crate) trait BlockStatus<Block: BlockT> {
 	fn block_number(&self, hash: Block::Hash) -> Result<Option<NumberFor<Block>>, Error>;
 }
 
-impl<Block: BlockT, Client> BlockStatus<Block> for Arc<Client> where
+impl<Block: BlockT, Client> BlockStatus<Block> for Arc<Client>
+where
 	Client: HeaderBackend<Block>,
 	NumberFor<Block>: BlockNumberOps,
 {
@@ -337,24 +325,36 @@ impl<Block: BlockT, Client> BlockStatus<Block> for Arc<Client> where
 /// Ideally this would be a trait alias, we're not there yet.
 /// tracking issue <https://github.com/rust-lang/rust/issues/41517>
 pub trait ClientForGrandpa<Block, BE>:
-	LockImportRun<Block, BE> + Finalizer<Block, BE> + AuxStore
-	+ HeaderMetadata<Block, Error = sp_blockchain::Error> + HeaderBackend<Block>
-	+ BlockchainEvents<Block> + ProvideRuntimeApi<Block> + ExecutorProvider<Block>
+	LockImportRun<Block, BE>
+	+ Finalizer<Block, BE>
+	+ AuxStore
+	+ HeaderMetadata<Block, Error = sp_blockchain::Error>
+	+ HeaderBackend<Block>
+	+ BlockchainEvents<Block>
+	+ ProvideRuntimeApi<Block>
+	+ ExecutorProvider<Block>
 	+ BlockImport<Block, Transaction = TransactionFor<BE, Block>, Error = sp_consensus::Error>
-	where
-		BE: Backend<Block>,
-		Block: BlockT,
-{}
+where
+	BE: Backend<Block>,
+	Block: BlockT,
+{
+}
 
 impl<Block, BE, T> ClientForGrandpa<Block, BE> for T
-	where
-		BE: Backend<Block>,
-		Block: BlockT,
-		T: LockImportRun<Block, BE> + Finalizer<Block, BE> + AuxStore
-			+ HeaderMetadata<Block, Error = sp_blockchain::Error> + HeaderBackend<Block>
-			+ BlockchainEvents<Block> + ProvideRuntimeApi<Block> + ExecutorProvider<Block>
-			+ BlockImport<Block, Transaction = TransactionFor<BE, Block>, Error = sp_consensus::Error>,
-{}
+where
+	BE: Backend<Block>,
+	Block: BlockT,
+	T: LockImportRun<Block, BE>
+		+ Finalizer<Block, BE>
+		+ AuxStore
+		+ HeaderMetadata<Block, Error = sp_blockchain::Error>
+		+ HeaderBackend<Block>
+		+ BlockchainEvents<Block>
+		+ ProvideRuntimeApi<Block>
+		+ ExecutorProvider<Block>
+		+ BlockImport<Block, Transaction = TransactionFor<BE, Block>, Error = sp_consensus::Error>,
+{
+}
 
 /// Something that one can ask to do a block sync request.
 pub(crate) trait BlockSyncRequester<Block: BlockT> {
@@ -364,14 +364,25 @@ pub(crate) trait BlockSyncRequester<Block: BlockT> {
 	/// If the given vector of peers is empty then the underlying implementation
 	/// should make a best effort to fetch the block from any peers it is
 	/// connected to (NOTE: this assumption will change in the future #3629).
-	fn set_sync_fork_request(&self, peers: Vec<sc_network::PeerId>, hash: Block::Hash, number: NumberFor<Block>);
+	fn set_sync_fork_request(
+		&self,
+		peers: Vec<sc_network::PeerId>,
+		hash: Block::Hash,
+		number: NumberFor<Block>,
+	);
 }
 
-impl<Block, Network> BlockSyncRequester<Block> for NetworkBridge<Block, Network> where
+impl<Block, Network> BlockSyncRequester<Block> for NetworkBridge<Block, Network>
+where
 	Block: BlockT,
 	Network: NetworkT<Block>,
 {
-	fn set_sync_fork_request(&self, peers: Vec<sc_network::PeerId>, hash: Block::Hash, number: NumberFor<Block>) {
+	fn set_sync_fork_request(
+		&self,
+		peers: Vec<sc_network::PeerId>,
+		hash: Block::Hash,
+		number: NumberFor<Block>,
+	) {
 		NetworkBridge::set_sync_fork_request(self, peers, hash, number)
 	}
 }
@@ -391,7 +402,7 @@ pub(crate) enum VoterCommand<H, N> {
 	/// Pause the voter for given reason.
 	Pause(String),
 	/// New authorities.
-	ChangeAuthorities(NewAuthoritySet<H, N>)
+	ChangeAuthorities(NewAuthoritySet<H, N>),
 }
 
 impl<H, N> fmt::Display for VoterCommand<H, N> {
@@ -436,7 +447,7 @@ impl<H, N> From<VoterCommand<H, N>> for CommandOrError<H, N> {
 	}
 }
 
-impl<H: fmt::Debug, N: fmt::Debug> ::std::error::Error for CommandOrError<H, N> { }
+impl<H: fmt::Debug, N: fmt::Debug> ::std::error::Error for CommandOrError<H, N> {}
 
 impl<H, N> fmt::Display for CommandOrError<H, N> {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
@@ -476,8 +487,10 @@ pub trait GenesisAuthoritySetProvider<Block: BlockT> {
 	fn get(&self) -> Result<AuthorityList, ClientError>;
 }
 
-impl<Block: BlockT, E> GenesisAuthoritySetProvider<Block> for Arc<dyn ExecutorProvider<Block, Executor = E>>
-	where E: CallExecutor<Block>,
+impl<Block: BlockT, E> GenesisAuthoritySetProvider<Block>
+	for Arc<dyn ExecutorProvider<Block, Executor = E>>
+where
+	E: CallExecutor<Block>,
 {
 	fn get(&self) -> Result<AuthorityList, ClientError> {
 		// This implementation uses the Grandpa runtime API instead of reading directly from the
@@ -492,10 +505,12 @@ impl<Block: BlockT, E> GenesisAuthoritySetProvider<Block> for Arc<dyn ExecutorPr
 				None,
 			)
 			.and_then(|call_result| {
-				Decode::decode(&mut &call_result[..])
-					.map_err(|err| ClientError::CallResultDecode(
-						"failed to decode GRANDPA authorities set proof", err
-					))
+				Decode::decode(&mut &call_result[..]).map_err(|err| {
+					ClientError::CallResultDecode(
+						"failed to decode GRANDPA authorities set proof",
+						err,
+					)
+				})
 			})
 	}
 }
@@ -507,13 +522,7 @@ pub fn block_import<BE, Block: BlockT, Client, SC>(
 	genesis_authorities_provider: &dyn GenesisAuthoritySetProvider<Block>,
 	select_chain: SC,
 	telemetry: Option<TelemetryHandle>,
-) -> Result<
-	(
-		GrandpaBlockImport<BE, Block, Client, SC>,
-		LinkHalf<Block, Client, SC>,
-	),
-	ClientError,
->
+) -> Result<(GrandpaBlockImport<BE, Block, Client, SC>, LinkHalf<Block, Client, SC>), ClientError>
 where
 	SC: SelectChain<Block>,
 	BE: Backend<Block> + 'static,
@@ -539,13 +548,7 @@ pub fn block_import_with_authority_set_hard_forks<BE, Block: BlockT, Client, SC>
 	select_chain: SC,
 	authority_set_hard_forks: Vec<(SetId, (Block::Hash, NumberFor<Block>), AuthorityList)>,
 	telemetry: Option<TelemetryHandle>,
-) -> Result<
-	(
-		GrandpaBlockImport<BE, Block, Client, SC>,
-		LinkHalf<Block, Client, SC>,
-	),
-	ClientError,
->
+) -> Result<(GrandpaBlockImport<BE, Block, Client, SC>, LinkHalf<Block, Client, SC>), ClientError>
 where
 	SC: SelectChain<Block>,
 	BE: Backend<Block> + 'static,
@@ -554,11 +557,8 @@ where
 	let chain_info = client.info();
 	let genesis_hash = chain_info.genesis_hash;
 
-	let persistent_data = aux_schema::load_persistent(
-		&*client,
-		genesis_hash,
-		<NumberFor<Block>>::zero(),
-		{
+	let persistent_data =
+		aux_schema::load_persistent(&*client, genesis_hash, <NumberFor<Block>>::zero(), {
 			let telemetry = telemetry.clone();
 			move || {
 				let authorities = genesis_authorities_provider.get()?;
@@ -570,13 +570,11 @@ where
 				);
 				Ok(authorities)
 			}
-		},
-	)?;
+		})?;
 
 	let (voter_commands_tx, voter_commands_rx) = tracing_unbounded("mpsc_grandpa_voter_command");
 
-	let (justification_sender, justification_stream) =
-		GrandpaJustificationStream::channel();
+	let (justification_sender, justification_stream) = GrandpaJustificationStream::channel();
 
 	// create pending change objects with 0 delay and enacted on finality
 	// (i.e. standard changes) for each authority set hard fork.
@@ -646,11 +644,8 @@ where
 	let is_voter = local_authority_id(voters, keystore).is_some();
 
 	// verification stream
-	let (global_in, global_out) = network.global_communication(
-		communication::SetId(set_id),
-		voters.clone(),
-		is_voter,
-	);
+	let (global_in, global_out) =
+		network.global_communication(communication::SetId(set_id), voters.clone(), is_voter);
 
 	// block commit and catch up messages until relevant blocks are imported.
 	let global_in = UntilGlobalMessageBlocksImported::new(
@@ -758,23 +753,18 @@ where
 	);
 
 	let conf = config.clone();
-	let telemetry_task = if let Some(telemetry_on_connect) = telemetry
-		.as_ref()
-		.map(|x| x.on_connect_stream())
-	{
-		let authorities = persistent_data.authority_set.clone();
-		let telemetry = telemetry.clone();
-		let events = telemetry_on_connect
-			.for_each(move |_| {
+	let telemetry_task =
+		if let Some(telemetry_on_connect) = telemetry.as_ref().map(|x| x.on_connect_stream()) {
+			let authorities = persistent_data.authority_set.clone();
+			let telemetry = telemetry.clone();
+			let events = telemetry_on_connect.for_each(move |_| {
 				let current_authorities = authorities.current_authorities();
 				let set_id = authorities.set_id();
 				let authority_id = local_authority_id(&current_authorities, conf.keystore.as_ref())
 					.unwrap_or_default();
 
-				let authorities = current_authorities
-					.iter()
-					.map(|(id, _)| id.to_string())
-					.collect::<Vec<_>>();
+				let authorities =
+					current_authorities.iter().map(|(id, _)| id.to_string()).collect::<Vec<_>>();
 
 				let authorities = serde_json::to_string(&authorities).expect(
 					"authorities is always at least an empty vector; \
@@ -792,10 +782,10 @@ where
 
 				future::ready(())
 			});
-		future::Either::Left(events)
-	} else {
-		future::Either::Right(future::pending())
-	};
+			future::Either::Left(events)
+		} else {
+			future::Either::Right(future::pending())
+		};
 
 	let voter_work = VoterWork::new(
 		client,
@@ -819,8 +809,7 @@ where
 	});
 
 	// Make sure that `telemetry_task` doesn't accidentally finish and kill grandpa.
-	let telemetry_task = telemetry_task
-		.then(|_| future::pending::<()>());
+	let telemetry_task = telemetry_task.then(|_| future::pending::<()>());
 
 	Ok(future::select(voter_work, telemetry_task).map(drop))
 }
@@ -842,7 +831,9 @@ impl Metrics {
 /// Future that powers the voter.
 #[must_use]
 struct VoterWork<B, Block: BlockT, C, N: NetworkT<Block>, SC, VR> {
-	voter: Pin<Box<dyn Future<Output = Result<(), CommandOrError<Block::Hash, NumberFor<Block>>>> + Send>>,
+	voter: Pin<
+		Box<dyn Future<Output = Result<(), CommandOrError<Block::Hash, NumberFor<Block>>>> + Send>,
+	>,
 	shared_voter_state: SharedVoterState,
 	env: Arc<Environment<B, Block, C, N, SC, VR>>,
 	voter_commands_rx: TracingUnboundedReceiver<VoterCommand<Block::Hash, NumberFor<Block>>>,
@@ -881,7 +872,7 @@ where
 			Some(Err(e)) => {
 				debug!(target: "afg", "Failed to register metrics: {:?}", e);
 				None
-			}
+			},
 			None => None,
 		};
 
@@ -937,12 +928,7 @@ where
 
 		let chain_info = self.env.client.info();
 
-		let authorities = self
-			.env
-			.voters
-			.iter()
-			.map(|(id, _)| id.to_string())
-			.collect::<Vec<_>>();
+		let authorities = self.env.voters.iter().map(|(id, _)| id.to_string()).collect::<Vec<_>>();
 
 		let authorities = serde_json::to_string(&authorities).expect(
 			"authorities is always at least an empty vector; elements are always of type string; qed.",
@@ -961,10 +947,7 @@ where
 
 		match &*self.env.voter_set_state.read() {
 			VoterSetState::Live { completed_rounds, .. } => {
-				let last_finalized = (
-					chain_info.finalized_hash,
-					chain_info.finalized_number,
-				);
+				let last_finalized = (chain_info.finalized_hash, chain_info.finalized_number);
 
 				let global_comms = global_communication(
 					self.env.set_id,
@@ -997,20 +980,18 @@ where
 
 				self.voter = Box::pin(voter);
 			},
-			VoterSetState::Paused { .. } =>
-				self.voter = Box::pin(future::pending()),
+			VoterSetState::Paused { .. } => self.voter = Box::pin(future::pending()),
 		};
 	}
 
 	fn handle_voter_command(
 		&mut self,
-		command: VoterCommand<Block::Hash, NumberFor<Block>>
+		command: VoterCommand<Block::Hash, NumberFor<Block>>,
 	) -> Result<(), Error> {
 		match command {
 			VoterCommand::ChangeAuthorities(new) => {
-				let voters: Vec<String> = new.authorities.iter().map(move |(a, _)| {
-					format!("{}", a)
-				}).collect();
+				let voters: Vec<String> =
+					new.authorities.iter().map(move |(a, _)| format!("{}", a)).collect();
 				telemetry!(
 					self.telemetry;
 					CONSENSUS_INFO;
@@ -1034,14 +1015,12 @@ where
 					Ok(Some(set_state))
 				})?;
 
-				let voters = Arc::new(VoterSet::new(new.authorities.into_iter())
-					.expect(
-						"new authorities come from pending change; \
+				let voters = Arc::new(VoterSet::new(new.authorities.into_iter()).expect(
+					"new authorities come from pending change; \
 						 pending change comes from `AuthoritySet`; \
 						 `AuthoritySet` validates authorities is non-empty and weights are non-zero; \
-						 qed."
-					)
-				);
+						 qed.",
+				));
 
 				self.env = Arc::new(Environment {
 					voters,
@@ -1061,7 +1040,7 @@ where
 
 				self.rebuild_voter();
 				Ok(())
-			}
+			},
 			VoterCommand::Pause(reason) => {
 				info!(target: "afg", "Pausing old validator set: {}", reason);
 
@@ -1076,7 +1055,7 @@ where
 
 				self.rebuild_voter();
 				Ok(())
-			}
+			},
 		}
 	}
 }
@@ -1096,37 +1075,35 @@ where
 
 	fn poll(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> {
 		match Future::poll(Pin::new(&mut self.voter), cx) {
-			Poll::Pending => {}
+			Poll::Pending => {},
 			Poll::Ready(Ok(())) => {
 				// voters don't conclude naturally
-				return Poll::Ready(
-					Err(Error::Safety("finality-grandpa inner voter has concluded.".into()))
-				)
-			}
+				return Poll::Ready(Err(Error::Safety(
+					"finality-grandpa inner voter has concluded.".into(),
+				)))
+			},
 			Poll::Ready(Err(CommandOrError::Error(e))) => {
 				// return inner observer error
 				return Poll::Ready(Err(e))
-			}
+			},
 			Poll::Ready(Err(CommandOrError::VoterCommand(command))) => {
 				// some command issued internally
 				self.handle_voter_command(command)?;
 				cx.waker().wake_by_ref();
-			}
+			},
 		}
 
 		match Stream::poll_next(Pin::new(&mut self.voter_commands_rx), cx) {
-			Poll::Pending => {}
+			Poll::Pending => {},
 			Poll::Ready(None) => {
 				// the `voter_commands_rx` stream should never conclude since it's never closed.
-				return Poll::Ready(
-					Err(Error::Safety("`voter_commands_rx` was closed.".into()))
-				)
-			}
+				return Poll::Ready(Err(Error::Safety("`voter_commands_rx` was closed.".into())))
+			},
 			Poll::Ready(Some(command)) => {
 				// some command issued externally
 				self.handle_voter_command(command)?;
 				cx.waker().wake_by_ref();
-			}
+			},
 		}
 
 		Future::poll(Pin::new(&mut self.network), cx)
@@ -1142,10 +1119,10 @@ fn local_authority_id(
 ) -> Option<AuthorityId> {
 	keystore.and_then(|keystore| {
 		voters
-		.iter()
-		.find(|(p, _)| {
-			SyncCryptoStore::has_keys(&**keystore, &[(p.to_raw_vec(), AuthorityId::ID)])
-		})
-		.map(|(p, _)| p.clone())
+			.iter()
+			.find(|(p, _)| {
+				SyncCryptoStore::has_keys(&**keystore, &[(p.to_raw_vec(), AuthorityId::ID)])
+			})
+			.map(|(p, _)| p.clone())
 	})
 }
diff --git a/client/finality-grandpa/src/notification.rs b/client/finality-grandpa/src/notification.rs
index b545f0d8a637..f0b0b1669dc9 100644
--- a/client/finality-grandpa/src/notification.rs
+++ b/client/finality-grandpa/src/notification.rs
@@ -16,14 +16,13 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use std::sync::Arc;
 use parking_lot::Mutex;
+use std::sync::Arc;
 
 use sp_runtime::traits::Block as BlockT;
 use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 
-use crate::justification::GrandpaJustification;
-use crate::Error;
+use crate::{justification::GrandpaJustification, Error};
 
 // Stream of justifications returned when subscribing.
 type JustificationStream<Block> = TracingUnboundedReceiver<GrandpaJustification<Block>>;
@@ -41,16 +40,14 @@ type SharedJustificationSenders<Block> = Arc<Mutex<Vec<JustificationSender<Block
 /// at the end of a Grandpa round.
 #[derive(Clone)]
 pub struct GrandpaJustificationSender<Block: BlockT> {
-	subscribers: SharedJustificationSenders<Block>
+	subscribers: SharedJustificationSenders<Block>,
 }
 
 impl<Block: BlockT> GrandpaJustificationSender<Block> {
 	/// The `subscribers` should be shared with a corresponding
 	/// `GrandpaJustificationStream`.
 	fn new(subscribers: SharedJustificationSenders<Block>) -> Self {
-		Self {
-			subscribers,
-		}
+		Self { subscribers }
 	}
 
 	/// Send out a notification to all subscribers that a new justification
@@ -83,7 +80,7 @@ impl<Block: BlockT> GrandpaJustificationSender<Block> {
 /// so it can be used to add more subscriptions.
 #[derive(Clone)]
 pub struct GrandpaJustificationStream<Block: BlockT> {
-	subscribers: SharedJustificationSenders<Block>
+	subscribers: SharedJustificationSenders<Block>,
 }
 
 impl<Block: BlockT> GrandpaJustificationStream<Block> {
@@ -100,9 +97,7 @@ impl<Block: BlockT> GrandpaJustificationStream<Block> {
 	/// The `subscribers` should be shared with a corresponding
 	/// `GrandpaJustificationSender`.
 	fn new(subscribers: SharedJustificationSenders<Block>) -> Self {
-		Self {
-			subscribers,
-		}
+		Self { subscribers }
 	}
 
 	/// Subscribe to a channel through which justifications are sent
diff --git a/client/finality-grandpa/src/observer.rs b/client/finality-grandpa/src/observer.rs
index 23c4f873a10b..cbea6c138c90 100644
--- a/client/finality-grandpa/src/observer.rs
+++ b/client/finality-grandpa/src/observer.rs
@@ -16,10 +16,12 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use std::marker::{PhantomData, Unpin};
-use std::pin::Pin;
-use std::sync::Arc;
-use std::task::{Context, Poll};
+use std::{
+	marker::{PhantomData, Unpin},
+	pin::Pin,
+	sync::Arc,
+	task::{Context, Poll},
+};
 
 use finality_grandpa::{voter, voter_set::VoterSet, BlockNumberOps, Error as GrandpaError};
 use futures::prelude::*;
@@ -95,14 +97,14 @@ where
 			},
 			voter::CommunicationIn::CatchUp(..) => {
 				// ignore catch up messages
-				return future::ok(last_finalized_number);
+				return future::ok(last_finalized_number)
 			},
 		};
 
 		// if the commit we've received targets a block lower or equal to the last
 		// finalized, ignore it and continue with the current state
 		if commit.target_number <= last_finalized_number {
-			return future::ok(last_finalized_number);
+			return future::ok(last_finalized_number)
 		}
 
 		let validation_result = match finality_grandpa::validate_commit(
@@ -201,11 +203,9 @@ where
 		telemetry.clone(),
 	);
 
-	let observer_work = observer_work
-		.map_ok(|_| ())
-		.map_err(|e| {
-			warn!("GRANDPA Observer failed: {:?}", e);
-		});
+	let observer_work = observer_work.map_ok(|_| ()).map_err(|e| {
+		warn!("GRANDPA Observer failed: {:?}", e);
+	});
 
 	Ok(observer_work.map(drop))
 }
@@ -213,7 +213,8 @@ where
 /// Future that powers the observer.
 #[must_use]
 struct ObserverWork<B: BlockT, BE, Client, N: NetworkT<B>> {
-	observer: Pin<Box<dyn Future<Output = Result<(), CommandOrError<B::Hash, NumberFor<B>>>> + Send>>,
+	observer:
+		Pin<Box<dyn Future<Output = Result<(), CommandOrError<B::Hash, NumberFor<B>>>> + Send>>,
 	client: Arc<Client>,
 	network: NetworkBridge<B, N>,
 	persistent_data: PersistentData<B>,
@@ -285,11 +286,13 @@ where
 			let network = self.network.clone();
 			let voters = voters.clone();
 
-			move |round| network.note_round(
-				crate::communication::Round(round),
-				crate::communication::SetId(set_id),
-				&*voters,
-			)
+			move |round| {
+				network.note_round(
+					crate::communication::Round(round),
+					crate::communication::SetId(set_id),
+					&*voters,
+				)
+			}
 		};
 
 		// create observer for the current set
@@ -337,7 +340,8 @@ where
 
 				set_state
 			},
-		}.into();
+		}
+		.into();
 
 		self.rebuild_observer();
 		Ok(())
@@ -356,33 +360,33 @@ where
 
 	fn poll(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> {
 		match Future::poll(Pin::new(&mut self.observer), cx) {
-			Poll::Pending => {}
+			Poll::Pending => {},
 			Poll::Ready(Ok(())) => {
 				// observer commit stream doesn't conclude naturally; this could reasonably be an error.
 				return Poll::Ready(Ok(()))
-			}
+			},
 			Poll::Ready(Err(CommandOrError::Error(e))) => {
 				// return inner observer error
 				return Poll::Ready(Err(e))
-			}
+			},
 			Poll::Ready(Err(CommandOrError::VoterCommand(command))) => {
 				// some command issued internally
 				self.handle_voter_command(command)?;
 				cx.waker().wake_by_ref();
-			}
+			},
 		}
 
 		match Stream::poll_next(Pin::new(&mut self.voter_commands_rx), cx) {
-			Poll::Pending => {}
+			Poll::Pending => {},
 			Poll::Ready(None) => {
 				// the `voter_commands_rx` stream should never conclude since it's never closed.
 				return Poll::Ready(Ok(()))
-			}
+			},
 			Poll::Ready(Some(command)) => {
 				// some command issued externally
 				self.handle_voter_command(command)?;
 				cx.waker().wake_by_ref();
-			}
+			},
 		}
 
 		Future::poll(Pin::new(&mut self.network), cx)
@@ -393,12 +397,15 @@ where
 mod tests {
 	use super::*;
 
+	use crate::{
+		aux_schema,
+		communication::tests::{make_test_network, Event},
+	};
 	use assert_matches::assert_matches;
-	use sp_utils::mpsc::tracing_unbounded;
-	use crate::{aux_schema,	communication::tests::{Event, make_test_network}};
-	use substrate_test_runtime_client::{TestClientBuilder, TestClientBuilderExt};
 	use sc_network::PeerId;
 	use sp_blockchain::HeaderBackend as _;
+	use sp_utils::mpsc::tracing_unbounded;
+	use substrate_test_runtime_client::{TestClientBuilder, TestClientBuilderExt};
 
 	use futures::executor;
 
@@ -426,12 +433,9 @@ mod tests {
 
 		let voters = vec![(sp_keyring::Ed25519Keyring::Alice.public().into(), 1)];
 
-		let persistent_data = aux_schema::load_persistent(
-			&*backend,
-			client.info().genesis_hash,
-			0,
-			|| Ok(voters),
-		).unwrap();
+		let persistent_data =
+			aux_schema::load_persistent(&*backend, client.info().genesis_hash, 0, || Ok(voters))
+				.unwrap();
 
 		let (_tx, voter_command_rx) = tracing_unbounded("");
 
diff --git a/client/finality-grandpa/src/tests.rs b/client/finality-grandpa/src/tests.rs
index 725beec6a94b..6243b1752c7c 100644
--- a/client/finality-grandpa/src/tests.rs
+++ b/client/finality-grandpa/src/tests.rs
@@ -21,31 +21,37 @@
 use super::*;
 use assert_matches::assert_matches;
 use environment::HasVoted;
+use futures::executor::block_on;
+use futures_timer::Delay;
+use parking_lot::{Mutex, RwLock};
+use sc_network::config::{ProtocolConfig, Role};
 use sc_network_test::{
-	Block, BlockImportAdapter, Hash, PassThroughVerifier, Peer, PeersClient, PeersFullClient,
-	TestClient, TestNetFactory, FullPeerConfig,
+	Block, BlockImportAdapter, FullPeerConfig, Hash, PassThroughVerifier, Peer, PeersClient,
+	PeersFullClient, TestClient, TestNetFactory,
 };
-use sc_network::config::{ProtocolConfig, Role};
-use parking_lot::{RwLock, Mutex};
-use futures_timer::Delay;
-use futures::executor::block_on;
-use tokio::runtime::{Runtime, Handle};
-use sp_keyring::Ed25519Keyring;
-use sp_blockchain::Result;
 use sp_api::{ApiRef, ProvideRuntimeApi};
-use substrate_test_runtime_client::runtime::BlockNumber;
+use sp_blockchain::Result;
 use sp_consensus::{
-	BlockOrigin, ForkChoiceStrategy, ImportedAux, BlockImportParams, ImportResult, BlockImport,
-	import_queue::BoxJustificationImport,
+	import_queue::BoxJustificationImport, BlockImport, BlockImportParams, BlockOrigin,
+	ForkChoiceStrategy, ImportResult, ImportedAux,
 };
-use std::{collections::{HashMap, HashSet}, pin::Pin};
-use sp_runtime::{Justifications, traits::{Block as BlockT, Header as HeaderT}};
-use sp_runtime::generic::{BlockId, DigestItem};
 use sp_core::H256;
-use sp_keystore::{SyncCryptoStorePtr, SyncCryptoStore};
 use sp_finality_grandpa::{
-	GRANDPA_ENGINE_ID, AuthorityList, EquivocationProof, GrandpaApi, OpaqueKeyOwnershipProof,
+	AuthorityList, EquivocationProof, GrandpaApi, OpaqueKeyOwnershipProof, GRANDPA_ENGINE_ID,
+};
+use sp_keyring::Ed25519Keyring;
+use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr};
+use sp_runtime::{
+	generic::{BlockId, DigestItem},
+	traits::{Block as BlockT, Header as HeaderT},
+	Justifications,
+};
+use std::{
+	collections::{HashMap, HashSet},
+	pin::Pin,
 };
+use substrate_test_runtime_client::runtime::BlockNumber;
+use tokio::runtime::{Handle, Runtime};
 
 use authorities::AuthoritySet;
 use sc_block_builder::BlockBuilderProvider;
@@ -61,7 +67,7 @@ type GrandpaBlockImport = crate::GrandpaBlockImport<
 	substrate_test_runtime_client::Backend,
 	Block,
 	PeersFullClient,
-	LongestChain<substrate_test_runtime_client::Backend, Block>
+	LongestChain<substrate_test_runtime_client::Backend, Block>,
 >;
 
 struct GrandpaTestNet {
@@ -71,10 +77,8 @@ struct GrandpaTestNet {
 
 impl GrandpaTestNet {
 	fn new(test_config: TestApi, n_authority: usize, n_full: usize) -> Self {
-		let mut net = GrandpaTestNet {
-			peers: Vec::with_capacity(n_authority + n_full),
-			test_config,
-		};
+		let mut net =
+			GrandpaTestNet { peers: Vec::with_capacity(n_authority + n_full), test_config };
 
 		for _ in 0..n_authority {
 			net.add_authority_peer();
@@ -105,10 +109,7 @@ impl TestNetFactory for GrandpaTestNet {
 
 	/// Create new test network with peers and given config.
 	fn from_config(_config: &ProtocolConfig) -> Self {
-		GrandpaTestNet {
-			peers: Vec::new(),
-			test_config: Default::default(),
-		}
+		GrandpaTestNet { peers: Vec::new(), test_config: Default::default() }
 	}
 
 	fn default_config() -> ProtocolConfig {
@@ -133,13 +134,10 @@ impl TestNetFactory for GrandpaTestNet {
 		PassThroughVerifier::new(false) // use non-instant finality.
 	}
 
-	fn make_block_import(&self, client: PeersClient)
-		-> (
-			BlockImportAdapter<Self::BlockImport>,
-			Option<BoxJustificationImport<Block>>,
-			PeerData,
-		)
-	{
+	fn make_block_import(
+		&self,
+		client: PeersClient,
+	) -> (BlockImportAdapter<Self::BlockImport>, Option<BoxJustificationImport<Block>>, PeerData) {
 		match client {
 			PeersClient::Full(ref client, ref backend) => {
 				let (import, link) = block_import(
@@ -147,7 +145,8 @@ impl TestNetFactory for GrandpaTestNet {
 					&self.test_config,
 					LongestChain::new(backend.clone()),
 					None,
-				).expect("Could not create block import for fresh peer.");
+				)
+				.expect("Could not create block import for fresh peer.");
 				let justification_import = Box::new(import.clone());
 				(
 					BlockImportAdapter::new(import),
@@ -181,9 +180,7 @@ pub(crate) struct TestApi {
 
 impl TestApi {
 	pub fn new(genesis_authorities: AuthorityList) -> Self {
-		TestApi {
-			genesis_authorities,
-		}
+		TestApi { genesis_authorities }
 	}
 }
 
@@ -235,21 +232,24 @@ fn make_ids(keys: &[Ed25519Keyring]) -> AuthorityList {
 
 fn create_keystore(authority: Ed25519Keyring) -> (SyncCryptoStorePtr, tempfile::TempDir) {
 	let keystore_path = tempfile::tempdir().expect("Creates keystore path");
-	let keystore = Arc::new(LocalKeystore::open(keystore_path.path(), None)
-		.expect("Creates keystore"));
+	let keystore =
+		Arc::new(LocalKeystore::open(keystore_path.path(), None).expect("Creates keystore"));
 	SyncCryptoStore::ed25519_generate_new(&*keystore, GRANDPA, Some(&authority.to_seed()))
 		.expect("Creates authority key");
 
 	(keystore, keystore_path)
 }
 
-fn block_until_complete(future: impl Future + Unpin, net: &Arc<Mutex<GrandpaTestNet>>, runtime: &mut Runtime) {
+fn block_until_complete(
+	future: impl Future + Unpin,
+	net: &Arc<Mutex<GrandpaTestNet>>,
+	runtime: &mut Runtime,
+) {
 	let drive_to_completion = futures::future::poll_fn(|cx| {
-		net.lock().poll(cx); Poll::<()>::Pending
+		net.lock().poll(cx);
+		Poll::<()>::Pending
 	});
-	runtime.block_on(
-		future::select(future, drive_to_completion)
-	);
+	runtime.block_on(future::select(future, drive_to_completion));
 }
 
 // Spawns grandpa voters. Returns a future to spawn on the runtime.
@@ -264,11 +264,9 @@ fn initialize_grandpa(
 
 		let (net_service, link) = {
 			// temporary needed for some reason
-			let link = net.peers[peer_id].data.lock().take().expect("link initialized at startup; qed");
-			(
-				net.peers[peer_id].network_service().clone(),
-				link,
-			)
+			let link =
+				net.peers[peer_id].data.lock().take().expect("link initialized at startup; qed");
+			(net.peers[peer_id].network_service().clone(), link)
 		};
 
 		let grandpa_params = GrandpaParams {
@@ -288,9 +286,10 @@ fn initialize_grandpa(
 			shared_voter_state: SharedVoterState::empty(),
 			telemetry: None,
 		};
-		let voter = run_grandpa_voter(grandpa_params).expect("all in order with client and network");
+		let voter =
+			run_grandpa_voter(grandpa_params).expect("all in order with client and network");
 
-		fn assert_send<T: Send>(_: &T) { }
+		fn assert_send<T: Send>(_: &T) {}
 		assert_send(&voter);
 
 		voters.push(voter);
@@ -307,8 +306,9 @@ fn run_to_completion_with<F>(
 	net: Arc<Mutex<GrandpaTestNet>>,
 	peers: &[Ed25519Keyring],
 	with: F,
-) -> u64 where
-	F: FnOnce(Handle) -> Option<Pin<Box<dyn Future<Output = ()>>>>
+) -> u64
+where
+	F: FnOnce(Handle) -> Option<Pin<Box<dyn Future<Output = ()>>>>,
 {
 	let mut wait_for = Vec::new();
 
@@ -322,20 +322,19 @@ fn run_to_completion_with<F>(
 		let highest_finalized = highest_finalized.clone();
 		let client = net.lock().peers[peer_id].client().clone();
 
-		wait_for.push(
-			Box::pin(
-				client.finality_notification_stream()
-					.take_while(move |n| {
-						let mut highest_finalized = highest_finalized.write();
-						if *n.header.number() > *highest_finalized {
-							*highest_finalized = *n.header.number();
-						}
-						future::ready(n.header.number() < &blocks)
-					})
-					.collect::<Vec<_>>()
-					.map(|_| ())
-			)
-		);
+		wait_for.push(Box::pin(
+			client
+				.finality_notification_stream()
+				.take_while(move |n| {
+					let mut highest_finalized = highest_finalized.write();
+					if *n.header.number() > *highest_finalized {
+						*highest_finalized = *n.header.number();
+					}
+					future::ready(n.header.number() < &blocks)
+				})
+				.collect::<Vec<_>>()
+				.map(|_| ()),
+		));
 	}
 
 	// wait for all finalized on each.
@@ -350,7 +349,7 @@ fn run_to_completion(
 	runtime: &mut Runtime,
 	blocks: u64,
 	net: Arc<Mutex<GrandpaTestNet>>,
-	peers: &[Ed25519Keyring]
+	peers: &[Ed25519Keyring],
 ) -> u64 {
 	run_to_completion_with(runtime, blocks, net, peers, |_| None)
 }
@@ -386,8 +385,7 @@ fn finalize_3_voters_no_observers() {
 	net.block_until_sync();
 
 	for i in 0..3 {
-		assert_eq!(net.peer(i).client().info().best_number, 20,
-			"Peer #{} failed to sync", i);
+		assert_eq!(net.peer(i).client().info().best_number, 20, "Peer #{} failed to sync", i);
 	}
 
 	let net = Arc::new(Mutex::new(net));
@@ -395,7 +393,12 @@ fn finalize_3_voters_no_observers() {
 
 	// normally there's no justification for finalized blocks
 	assert!(
-		net.lock().peer(0).client().justifications(&BlockId::Number(20)).unwrap().is_none(),
+		net.lock()
+			.peer(0)
+			.client()
+			.justifications(&BlockId::Number(20))
+			.unwrap()
+			.is_none(),
 		"Extra justification for block#1",
 	);
 }
@@ -425,7 +428,7 @@ fn finalize_3_voters_1_full_observer() {
 				observer_enabled: true,
 				telemetry: None,
 			},
-			link: link,
+			link,
 			network: net_service,
 			voting_rule: (),
 			prometheus_registry: None,
@@ -444,9 +447,10 @@ fn finalize_3_voters_1_full_observer() {
 	for peer_id in 0..4 {
 		let client = net.lock().peers[peer_id].client().clone();
 		finality_notifications.push(
-			client.finality_notification_stream()
+			client
+				.finality_notification_stream()
 				.take_while(|n| future::ready(n.header.number() < &20))
-				.for_each(move |_| future::ready(()))
+				.for_each(move |_| future::ready(())),
 		);
 	}
 
@@ -458,9 +462,8 @@ fn finalize_3_voters_1_full_observer() {
 	// all peers should have stored the justification for the best finalized block #20
 	for peer_id in 0..4 {
 		let client = net.lock().peers[peer_id].client().as_full().unwrap();
-		let justification = crate::aux_schema::best_justification::<_, Block>(&*client)
-			.unwrap()
-			.unwrap();
+		let justification =
+			crate::aux_schema::best_justification::<_, Block>(&*client).unwrap().unwrap();
 
 		assert_eq!(justification.commit.target_number, 20);
 	}
@@ -469,27 +472,16 @@ fn finalize_3_voters_1_full_observer() {
 #[test]
 fn transition_3_voters_twice_1_full_observer() {
 	sp_tracing::try_init_simple();
-	let peers_a = &[
-		Ed25519Keyring::Alice,
-		Ed25519Keyring::Bob,
-		Ed25519Keyring::Charlie,
-	];
+	let peers_a = &[Ed25519Keyring::Alice, Ed25519Keyring::Bob, Ed25519Keyring::Charlie];
 
-	let peers_b = &[
-		Ed25519Keyring::Dave,
-		Ed25519Keyring::Eve,
-		Ed25519Keyring::Ferdie,
-	];
+	let peers_b = &[Ed25519Keyring::Dave, Ed25519Keyring::Eve, Ed25519Keyring::Ferdie];
 
-	let peers_c = &[
-		Ed25519Keyring::Alice,
-		Ed25519Keyring::Eve,
-		Ed25519Keyring::Two,
-	];
+	let peers_c = &[Ed25519Keyring::Alice, Ed25519Keyring::Eve, Ed25519Keyring::Two];
 
 	let observer = &[Ed25519Keyring::One];
 
-	let all_peers = peers_a.iter()
+	let all_peers = peers_a
+		.iter()
 		.chain(peers_b)
 		.chain(peers_c)
 		.chain(observer)
@@ -511,11 +503,9 @@ fn transition_3_voters_twice_1_full_observer() {
 
 		let (net_service, link) = {
 			let net = net.lock();
-			let link = net.peers[peer_id].data.lock().take().expect("link initialized at startup; qed");
-			(
-				net.peers[peer_id].network_service().clone(),
-				link,
-			)
+			let link =
+				net.peers[peer_id].data.lock().take().expect("link initialized at startup; qed");
+			(net.peers[peer_id].network_service().clone(), link)
 		};
 
 		let grandpa_params = GrandpaParams {
@@ -536,7 +526,8 @@ fn transition_3_voters_twice_1_full_observer() {
 			telemetry: None,
 		};
 
-		voters.push(run_grandpa_voter(grandpa_params).expect("all in order with client and network"));
+		voters
+			.push(run_grandpa_voter(grandpa_params).expect("all in order with client and network"));
 	}
 
 	net.lock().peer(0).push_blocks(1, false);
@@ -544,10 +535,10 @@ fn transition_3_voters_twice_1_full_observer() {
 
 	for (i, peer) in net.lock().peers().iter().enumerate() {
 		let full_client = peer.client().as_full().expect("only full clients are used in test");
-		assert_eq!(full_client.chain_info().best_number, 1,
-					"Peer #{} failed to sync", i);
+		assert_eq!(full_client.chain_info().best_number, 1, "Peer #{} failed to sync", i);
 
-		let set: AuthoritySet<Hash, BlockNumber> = crate::aux_schema::load_authorities(&*full_client).unwrap();
+		let set: AuthoritySet<Hash, BlockNumber> =
+			crate::aux_schema::load_authorities(&*full_client).unwrap();
 
 		assert_eq!(set.current(), (0, make_ids(peers_a).as_slice()));
 		assert_eq!(set.pending_changes().count(), 0);
@@ -559,7 +550,8 @@ fn transition_3_voters_twice_1_full_observer() {
 		let peers_c = peers_c.clone();
 
 		// wait for blocks to be finalized before generating new ones
-		let block_production = client.finality_notification_stream()
+		let block_production = client
+			.finality_notification_stream()
 			.take_while(|n| future::ready(n.header.number() < &30))
 			.for_each(move |n| {
 				match n.header.number() {
@@ -571,10 +563,10 @@ fn transition_3_voters_twice_1_full_observer() {
 						// generate transition at block 15, applied at 20.
 						net.lock().peer(0).generate_blocks(1, BlockOrigin::File, |builder| {
 							let mut block = builder.build().unwrap().block;
-							add_scheduled_change(&mut block, ScheduledChange {
-								next_authorities: make_ids(peers_b),
-								delay: 4,
-							});
+							add_scheduled_change(
+								&mut block,
+								ScheduledChange { next_authorities: make_ids(peers_b), delay: 4 },
+							);
 
 							block
 						});
@@ -585,10 +577,10 @@ fn transition_3_voters_twice_1_full_observer() {
 						// add more until we have 30.
 						net.lock().peer(0).generate_blocks(1, BlockOrigin::File, |builder| {
 							let mut block = builder.build().unwrap().block;
-							add_scheduled_change(&mut block, ScheduledChange {
-								next_authorities: make_ids(&peers_c),
-								delay: 0,
-							});
+							add_scheduled_change(
+								&mut block,
+								ScheduledChange { next_authorities: make_ids(&peers_c), delay: 0 },
+							);
 
 							block
 						});
@@ -612,16 +604,18 @@ fn transition_3_voters_twice_1_full_observer() {
 	for (peer_id, _) in all_peers.into_iter().enumerate() {
 		let client = net.lock().peers[peer_id].client().clone();
 		finality_notifications.push(
-			client.finality_notification_stream()
+			client
+				.finality_notification_stream()
 				.take_while(|n| future::ready(n.header.number() < &30))
 				.for_each(move |_| future::ready(()))
 				.map(move |()| {
 					let full_client = client.as_full().expect("only full clients are used in test");
-					let set: AuthoritySet<Hash, BlockNumber> = crate::aux_schema::load_authorities(&*full_client).unwrap();
+					let set: AuthoritySet<Hash, BlockNumber> =
+						crate::aux_schema::load_authorities(&*full_client).unwrap();
 
 					assert_eq!(set.current(), (2, make_ids(peers_c).as_slice()));
 					assert_eq!(set.pending_changes().count(), 0);
-				})
+				}),
 		);
 	}
 
@@ -648,7 +642,13 @@ fn justification_is_generated_periodically() {
 	// when block#32 (justification_period) is finalized, justification
 	// is required => generated
 	for i in 0..3 {
-		assert!(net.lock().peer(i).client().justifications(&BlockId::Number(32)).unwrap().is_some());
+		assert!(net
+			.lock()
+			.peer(i)
+			.client()
+			.justifications(&BlockId::Number(32))
+			.unwrap()
+			.is_some());
 	}
 }
 
@@ -670,10 +670,10 @@ fn sync_justifications_on_change_blocks() {
 	// at block 21 we do add a transition which is instant
 	net.peer(0).generate_blocks(1, BlockOrigin::File, |builder| {
 		let mut block = builder.build().unwrap().block;
-		add_scheduled_change(&mut block, ScheduledChange {
-			next_authorities: make_ids(peers_b),
-			delay: 0,
-		});
+		add_scheduled_change(
+			&mut block,
+			ScheduledChange { next_authorities: make_ids(peers_b), delay: 0 },
+		);
 		block
 	});
 
@@ -682,8 +682,7 @@ fn sync_justifications_on_change_blocks() {
 	net.block_until_sync();
 
 	for i in 0..4 {
-		assert_eq!(net.peer(i).client().info().best_number, 25,
-			"Peer #{} failed to sync", i);
+		assert_eq!(net.peer(i).client().info().best_number, 25, "Peer #{} failed to sync", i);
 	}
 
 	let net = Arc::new(Mutex::new(net));
@@ -693,12 +692,25 @@ fn sync_justifications_on_change_blocks() {
 	// the first 3 peers are grandpa voters and therefore have already finalized
 	// block 21 and stored a justification
 	for i in 0..3 {
-		assert!(net.lock().peer(i).client().justifications(&BlockId::Number(21)).unwrap().is_some());
+		assert!(net
+			.lock()
+			.peer(i)
+			.client()
+			.justifications(&BlockId::Number(21))
+			.unwrap()
+			.is_some());
 	}
 
 	// the last peer should get the justification by syncing from other peers
 	futures::executor::block_on(futures::future::poll_fn(move |cx| {
-		if net.lock().peer(3).client().justifications(&BlockId::Number(21)).unwrap().is_none() {
+		if net
+			.lock()
+			.peer(3)
+			.client()
+			.justifications(&BlockId::Number(21))
+			.unwrap()
+			.is_none()
+		{
 			net.lock().poll(cx);
 			Poll::Pending
 		} else {
@@ -717,8 +729,12 @@ fn finalizes_multiple_pending_changes_in_order() {
 	let peers_c = &[Ed25519Keyring::Dave, Ed25519Keyring::Alice, Ed25519Keyring::Bob];
 
 	let all_peers = &[
-		Ed25519Keyring::Alice, Ed25519Keyring::Bob, Ed25519Keyring::Charlie,
-		Ed25519Keyring::Dave, Ed25519Keyring::Eve, Ed25519Keyring::Ferdie,
+		Ed25519Keyring::Alice,
+		Ed25519Keyring::Bob,
+		Ed25519Keyring::Charlie,
+		Ed25519Keyring::Dave,
+		Ed25519Keyring::Eve,
+		Ed25519Keyring::Ferdie,
 	];
 	let genesis_voters = make_ids(peers_a);
 
@@ -735,10 +751,10 @@ fn finalizes_multiple_pending_changes_in_order() {
 	// at block 21 we do add a transition which is instant
 	net.peer(0).generate_blocks(1, BlockOrigin::File, |builder| {
 		let mut block = builder.build().unwrap().block;
-		add_scheduled_change(&mut block, ScheduledChange {
-			next_authorities: make_ids(peers_b),
-			delay: 0,
-		});
+		add_scheduled_change(
+			&mut block,
+			ScheduledChange { next_authorities: make_ids(peers_b), delay: 0 },
+		);
 		block
 	});
 
@@ -748,10 +764,10 @@ fn finalizes_multiple_pending_changes_in_order() {
 	// at block 26 we add another which is enacted at block 30
 	net.peer(0).generate_blocks(1, BlockOrigin::File, |builder| {
 		let mut block = builder.build().unwrap().block;
-		add_scheduled_change(&mut block, ScheduledChange {
-			next_authorities: make_ids(peers_c),
-			delay: 4,
-		});
+		add_scheduled_change(
+			&mut block,
+			ScheduledChange { next_authorities: make_ids(peers_c), delay: 4 },
+		);
 		block
 	});
 
@@ -762,8 +778,7 @@ fn finalizes_multiple_pending_changes_in_order() {
 
 	// all peers imported both change blocks
 	for i in 0..6 {
-		assert_eq!(net.peer(i).client().info().best_number, 30,
-			"Peer #{} failed to sync", i);
+		assert_eq!(net.peer(i).client().info().best_number, 30, "Peer #{} failed to sync", i);
 	}
 
 	let net = Arc::new(Mutex::new(net));
@@ -794,16 +809,17 @@ fn force_change_to_new_set() {
 		let mut block = builder.build().unwrap().block;
 
 		// add a forced transition at block 12.
-		add_forced_change(&mut block, 0, ScheduledChange {
-			next_authorities: voters.clone(),
-			delay: 10,
-		});
+		add_forced_change(
+			&mut block,
+			0,
+			ScheduledChange { next_authorities: voters.clone(), delay: 10 },
+		);
 
 		// add a normal transition too to ensure that forced changes take priority.
-		add_scheduled_change(&mut block, ScheduledChange {
-			next_authorities: make_ids(genesis_authorities),
-			delay: 5,
-		});
+		add_scheduled_change(
+			&mut block,
+			ScheduledChange { next_authorities: make_ids(genesis_authorities), delay: 5 },
+		);
 
 		block
 	});
@@ -812,11 +828,11 @@ fn force_change_to_new_set() {
 	net.lock().block_until_sync();
 
 	for (i, peer) in net.lock().peers().iter().enumerate() {
-		assert_eq!(peer.client().info().best_number, 26,
-				"Peer #{} failed to sync", i);
+		assert_eq!(peer.client().info().best_number, 26, "Peer #{} failed to sync", i);
 
 		let full_client = peer.client().as_full().expect("only full clients are used in test");
-		let set: AuthoritySet<Hash, BlockNumber> = crate::aux_schema::load_authorities(&*full_client).unwrap();
+		let set: AuthoritySet<Hash, BlockNumber> =
+			crate::aux_schema::load_authorities(&*full_client).unwrap();
 
 		assert_eq!(set.current(), (1, voters.as_slice()));
 		assert_eq!(set.pending_changes().count(), 0);
@@ -841,12 +857,14 @@ fn allows_reimporting_change_blocks() {
 	let (mut block_import, ..) = net.make_block_import(client.clone());
 
 	let full_client = client.as_full().unwrap();
-	let builder = full_client.new_block_at(&BlockId::Number(0), Default::default(), false).unwrap();
+	let builder = full_client
+		.new_block_at(&BlockId::Number(0), Default::default(), false)
+		.unwrap();
 	let mut block = builder.build().unwrap().block;
-	add_scheduled_change(&mut block, ScheduledChange {
-		next_authorities: make_ids(peers_b),
-		delay: 0,
-	});
+	add_scheduled_change(
+		&mut block,
+		ScheduledChange { next_authorities: make_ids(peers_b), delay: 0 },
+	);
 
 	let block = || {
 		let block = block.clone();
@@ -886,13 +904,15 @@ fn test_bad_justification() {
 	let (mut block_import, ..) = net.make_block_import(client.clone());
 
 	let full_client = client.as_full().expect("only full clients are used in test");
-	let builder = full_client.new_block_at(&BlockId::Number(0), Default::default(), false).unwrap();
+	let builder = full_client
+		.new_block_at(&BlockId::Number(0), Default::default(), false)
+		.unwrap();
 	let mut block = builder.build().unwrap().block;
 
-	add_scheduled_change(&mut block, ScheduledChange {
-		next_authorities: make_ids(peers_b),
-		delay: 0,
-	});
+	add_scheduled_change(
+		&mut block,
+		ScheduledChange { next_authorities: make_ids(peers_b), delay: 0 },
+	);
 
 	let block = || {
 		let block = block.clone();
@@ -923,8 +943,8 @@ fn test_bad_justification() {
 
 #[test]
 fn voter_persists_its_votes() {
-	use std::sync::atomic::{AtomicUsize, Ordering};
 	use futures::future;
+	use std::sync::atomic::{AtomicUsize, Ordering};
 
 	sp_tracing::try_init_simple();
 	let mut runtime = Runtime::new().unwrap();
@@ -959,8 +979,7 @@ fn voter_persists_its_votes() {
 
 		let set_state = {
 			let bob_client = net.peer(1).client().clone();
-			let (_, _, link) = net
-				.make_block_import(bob_client);
+			let (_, _, link) = net.make_block_import(bob_client);
 			let LinkHalf { persistent_data, .. } = link.lock().take().unwrap();
 			let PersistentData { set_state, .. } = persistent_data;
 			set_state
@@ -983,10 +1002,7 @@ fn voter_persists_its_votes() {
 		let (net_service, link) = {
 			// temporary needed for some reason
 			let link = net.peers[0].data.lock().take().expect("link initialized at startup; qed");
-			(
-				net.peers[0].network_service().clone(),
-				link,
-			)
+			(net.peers[0].network_service().clone(), link)
 		};
 
 		let grandpa_params = GrandpaParams {
@@ -1026,8 +1042,7 @@ fn voter_persists_its_votes() {
 		// read the persisted state after aborting alice_voter1.
 		let alice_client = net.peer(0).client().clone();
 
-		let (_block_import, _, link) = net
-			.make_block_import(alice_client);
+		let (_block_import, _, link) = net.make_block_import(alice_client);
 		let link = link.lock().take().unwrap();
 
 		let grandpa_params = GrandpaParams {
@@ -1064,8 +1079,7 @@ fn voter_persists_its_votes() {
 	net.peer(0).push_blocks(20, false);
 	net.block_until_sync();
 
-	assert_eq!(net.peer(0).client().info().best_number, 20,
-			   "Peer #{} failed to sync", 0);
+	assert_eq!(net.peer(0).client().info().best_number, 20, "Peer #{} failed to sync", 0);
 
 	let net = Arc::new(Mutex::new(net));
 
@@ -1113,12 +1127,13 @@ fn voter_persists_its_votes() {
 					// we push 20 more blocks to alice's chain
 					net.lock().peer(0).push_blocks(20, false);
 
-					let interval = futures::stream::unfold(Delay::new(Duration::from_millis(200)), |delay|
-						Box::pin(async move {
-							delay.await;
-							Some(((), Delay::new(Duration::from_millis(200))))
-						})
-					);
+					let interval =
+						futures::stream::unfold(Delay::new(Duration::from_millis(200)), |delay| {
+							Box::pin(async move {
+								delay.await;
+								Some(((), Delay::new(Duration::from_millis(200))))
+							})
+						});
 
 					interval
 						.take_while(move |_| {
@@ -1135,17 +1150,19 @@ fn voter_persists_its_votes() {
 					runtime_handle.spawn(alice_voter2(peers, net.clone()));
 
 					// and we push our own prevote for block 30
-					let prevote = finality_grandpa::Prevote {
-						target_number: 30,
-						target_hash: block_30_hash,
-					};
+					let prevote =
+						finality_grandpa::Prevote { target_number: 30, target_hash: block_30_hash };
 
 					// One should either be calling `Sink::send` or `Sink::start_send` followed
 					// by `Sink::poll_complete` to make sure items are being flushed. Given that
 					// we send in a loop including a delay until items are received, this can be
 					// ignored for the sake of reduced complexity.
-					Pin::new(&mut *round_tx.lock()).start_send(finality_grandpa::Message::Prevote(prevote)).unwrap();
-				} else if state.compare_exchange(1, 2, Ordering::SeqCst, Ordering::SeqCst).unwrap() == 1 {
+					Pin::new(&mut *round_tx.lock())
+						.start_send(finality_grandpa::Message::Prevote(prevote))
+						.unwrap();
+				} else if state.compare_exchange(1, 2, Ordering::SeqCst, Ordering::SeqCst).unwrap() ==
+					1
+				{
 					// the next message we receive should be our own prevote
 					let prevote = match signed.message {
 						finality_grandpa::Message::Prevote(prevote) => prevote,
@@ -1155,11 +1172,12 @@ fn voter_persists_its_votes() {
 					// targeting block 30
 					assert!(prevote.target_number == 30);
 
-					// after alice restarts it should send its previous prevote
-					// therefore we won't ever receive it again since it will be a
-					// known message on the gossip layer
-
-				} else if state.compare_exchange(2, 3, Ordering::SeqCst, Ordering::SeqCst).unwrap() == 2 {
+				// after alice restarts it should send its previous prevote
+				// therefore we won't ever receive it again since it will be a
+				// known message on the gossip layer
+				} else if state.compare_exchange(2, 3, Ordering::SeqCst, Ordering::SeqCst).unwrap() ==
+					2
+				{
 					// we then receive a precommit from alice for block 15
 					// even though we casted a prevote for block 30
 					let precommit = match signed.message {
@@ -1202,13 +1220,13 @@ fn finalize_3_voters_1_light_observer() {
 		},
 		net.peers[3].data.lock().take().expect("link initialized at startup; qed"),
 		net.peers[3].network_service().clone(),
-	).unwrap();
+	)
+	.unwrap();
 	net.peer(0).push_blocks(20, false);
 	net.block_until_sync();
 
 	for i in 0..4 {
-		assert_eq!(net.peer(i).client().info().best_number, 20,
-			"Peer #{} failed to sync", i);
+		assert_eq!(net.peer(i).client().info().best_number, 20, "Peer #{} failed to sync", i);
 	}
 
 	let net = Arc::new(Mutex::new(net));
@@ -1231,7 +1249,11 @@ fn voter_catches_up_to_latest_round_when_behind() {
 	let net = Arc::new(Mutex::new(net));
 	let mut finality_notifications = Vec::new();
 
-	let voter = |keystore, peer_id, link, net: Arc<Mutex<GrandpaTestNet>>| -> Pin<Box<dyn Future<Output = ()> + Send>> {
+	let voter = |keystore,
+	             peer_id,
+	             link,
+	             net: Arc<Mutex<GrandpaTestNet>>|
+	 -> Pin<Box<dyn Future<Output = ()> + Send>> {
 		let grandpa_params = GrandpaParams {
 			config: Config {
 				gossip_duration: TEST_GOSSIP_DURATION,
@@ -1259,17 +1281,16 @@ fn voter_catches_up_to_latest_round_when_behind() {
 	for (peer_id, key) in peers.iter().enumerate() {
 		let (client, link) = {
 			let net = net.lock();
-			let link = net.peers[peer_id].data.lock().take().expect("link initialized at startup; qed");
-			(
-				net.peers[peer_id].client().clone(),
-				link,
-			)
+			let link =
+				net.peers[peer_id].data.lock().take().expect("link initialized at startup; qed");
+			(net.peers[peer_id].client().clone(), link)
 		};
 
 		finality_notifications.push(
-			client.finality_notification_stream()
+			client
+				.finality_notification_stream()
 				.take_while(|n| future::ready(n.header.number() < &50))
-				.for_each(move |_| future::ready(()))
+				.for_each(move |_| future::ready(())),
 		);
 
 		let (keystore, keystore_path) = create_keystore(*key);
@@ -1324,11 +1345,10 @@ fn voter_catches_up_to_latest_round_when_behind() {
 	};
 
 	let drive_to_completion = futures::future::poll_fn(|cx| {
-		net.lock().poll(cx); Poll::<()>::Pending
+		net.lock().poll(cx);
+		Poll::<()>::Pending
 	});
-	runtime.block_on(
-		future::select(test, drive_to_completion)
-	);
+	runtime.block_on(future::select(test, drive_to_completion));
 }
 
 type TestEnvironment<N, VR> = Environment<
@@ -1350,11 +1370,7 @@ where
 	N: NetworkT<Block>,
 	VR: VotingRule<Block, TestClient>,
 {
-	let PersistentData {
-		ref authority_set,
-		ref set_state,
-		..
-	} = link.persistent_data;
+	let PersistentData { ref authority_set, ref set_state, .. } = link.persistent_data;
 
 	let config = Config {
 		gossip_duration: TEST_GOSSIP_DURATION,
@@ -1366,13 +1382,8 @@ where
 		telemetry: None,
 	};
 
-	let network = NetworkBridge::new(
-		network_service.clone(),
-		config.clone(),
-		set_state.clone(),
-		None,
-		None,
-	);
+	let network =
+		NetworkBridge::new(network_service.clone(), config.clone(), set_state.clone(), None, None);
 
 	Environment {
 		authority_set: authority_set.clone(),
@@ -1428,25 +1439,28 @@ fn grandpa_environment_respects_voting_rules() {
 
 	// the unrestricted environment should just return the best block
 	assert_eq!(
-		block_on(unrestricted_env.best_chain_containing(
-			peer.client().info().finalized_hash
-		)).unwrap().unwrap().1,
+		block_on(unrestricted_env.best_chain_containing(peer.client().info().finalized_hash))
+			.unwrap()
+			.unwrap()
+			.1,
 		21,
 	);
 
 	// both the other environments should return block 16, which is 3/4 of the
 	// way in the unfinalized chain
 	assert_eq!(
-		block_on(three_quarters_env.best_chain_containing(
-			peer.client().info().finalized_hash
-		)).unwrap().unwrap().1,
+		block_on(three_quarters_env.best_chain_containing(peer.client().info().finalized_hash))
+			.unwrap()
+			.unwrap()
+			.1,
 		16,
 	);
 
 	assert_eq!(
-		block_on(default_env.best_chain_containing(
-			peer.client().info().finalized_hash
-		)).unwrap().unwrap().1,
+		block_on(default_env.best_chain_containing(peer.client().info().finalized_hash))
+			.unwrap()
+			.unwrap()
+			.1,
 		16,
 	);
 
@@ -1455,18 +1469,20 @@ fn grandpa_environment_respects_voting_rules() {
 
 	// the 3/4 environment should propose block 21 for voting
 	assert_eq!(
-		block_on(three_quarters_env.best_chain_containing(
-			peer.client().info().finalized_hash
-		)).unwrap().unwrap().1,
+		block_on(three_quarters_env.best_chain_containing(peer.client().info().finalized_hash))
+			.unwrap()
+			.unwrap()
+			.1,
 		21,
 	);
 
 	// while the default environment will always still make sure we don't vote
 	// on the best block (2 behind)
 	assert_eq!(
-		block_on(default_env.best_chain_containing(
-			peer.client().info().finalized_hash
-		)).unwrap().unwrap().1,
+		block_on(default_env.best_chain_containing(peer.client().info().finalized_hash))
+			.unwrap()
+			.unwrap()
+			.1,
 		19,
 	);
 
@@ -1477,9 +1493,10 @@ fn grandpa_environment_respects_voting_rules() {
 	// best block, there's a hard rule that we can't cast any votes lower than
 	// the given base (#21).
 	assert_eq!(
-		block_on(default_env.best_chain_containing(
-			peer.client().info().finalized_hash
-		)).unwrap().unwrap().1,
+		block_on(default_env.best_chain_containing(peer.client().info().finalized_hash))
+			.unwrap()
+			.unwrap()
+			.1,
 		21,
 	);
 }
@@ -1518,9 +1535,7 @@ fn grandpa_environment_never_overwrites_round_voter_state() {
 	assert_eq!(get_current_round(2), None);
 
 	// after completing round 1 we should start tracking round 2
-	environment
-		.completed(1, round_state(), base(), &historical_votes())
-		.unwrap();
+	environment.completed(1, round_state(), base(), &historical_votes()).unwrap();
 
 	assert_eq!(get_current_round(2).unwrap(), HasVoted::No);
 
@@ -1530,10 +1545,8 @@ fn grandpa_environment_never_overwrites_round_voter_state() {
 
 	let info = peer.client().info();
 
-	let prevote = finality_grandpa::Prevote {
-		target_hash: info.best_hash,
-		target_number: info.best_number,
-	};
+	let prevote =
+		finality_grandpa::Prevote { target_hash: info.best_hash, target_number: info.best_number };
 
 	// we prevote for round 2 which should lead to us updating the voter state
 	environment.prevoted(2, prevote.clone()).unwrap();
@@ -1545,9 +1558,7 @@ fn grandpa_environment_never_overwrites_round_voter_state() {
 
 	// if we report round 1 as completed again we should not overwrite the
 	// voter state for round 2
-	environment
-		.completed(1, round_state(), base(), &historical_votes())
-		.unwrap();
+	environment.completed(1, round_state(), base(), &historical_votes()).unwrap();
 
 	assert_matches!(get_current_round(2).unwrap(), HasVoted::Yes(_, _));
 }
@@ -1566,7 +1577,9 @@ fn imports_justification_for_regular_blocks_on_import() {
 	let (mut block_import, ..) = net.make_block_import(client.clone());
 
 	let full_client = client.as_full().expect("only full clients are used in test");
-	let builder = full_client.new_block_at(&BlockId::Number(0), Default::default(), false).unwrap();
+	let builder = full_client
+		.new_block_at(&BlockId::Number(0), Default::default(), false)
+		.unwrap();
 	let block = builder.build().unwrap().block;
 
 	let block_hash = block.hash();
@@ -1597,11 +1610,7 @@ fn imports_justification_for_regular_blocks_on_import() {
 			precommits: vec![precommit],
 		};
 
-		GrandpaJustification::from_commit(
-			&full_client,
-			round,
-			commit,
-		).unwrap()
+		GrandpaJustification::from_commit(&full_client, round, commit).unwrap()
 	};
 
 	// we import the block with justification attached
@@ -1622,9 +1631,7 @@ fn imports_justification_for_regular_blocks_on_import() {
 	);
 
 	// the justification should be imported and available from the client
-	assert!(
-		client.justifications(&BlockId::Hash(block_hash)).unwrap().is_some(),
-	);
+	assert!(client.justifications(&BlockId::Hash(block_hash)).unwrap().is_some(),);
 }
 
 #[test]
@@ -1644,10 +1651,7 @@ fn grandpa_environment_doesnt_send_equivocation_reports_for_itself() {
 	};
 
 	let signed_prevote = {
-		let prevote = finality_grandpa::Prevote {
-			target_hash: H256::random(),
-			target_number: 1,
-		};
+		let prevote = finality_grandpa::Prevote { target_hash: H256::random(), target_number: 1 };
 
 		let signed = alice.sign(&[]).into();
 		(prevote, signed)
@@ -1667,10 +1671,7 @@ fn grandpa_environment_doesnt_send_equivocation_reports_for_itself() {
 	// reporting the equivocation should fail since the offender is a local
 	// authority (i.e. we have keys in our keystore for the given id)
 	let equivocation_proof = sp_finality_grandpa::Equivocation::Prevote(equivocation.clone());
-	assert!(matches!(
-		environment.report_equivocation(equivocation_proof),
-		Err(Error::Safety(_))
-	));
+	assert!(matches!(environment.report_equivocation(equivocation_proof), Err(Error::Safety(_))));
 
 	// if we set the equivocation offender to another id for which we don't have
 	// keys it should work
diff --git a/client/finality-grandpa/src/until_imported.rs b/client/finality-grandpa/src/until_imported.rs
index 7cfd9e6074c4..ccab843316d2 100644
--- a/client/finality-grandpa/src/until_imported.rs
+++ b/client/finality-grandpa/src/until_imported.rs
@@ -23,32 +23,31 @@
 //! This is used for votes and commit messages currently.
 
 use super::{
-	BlockStatus as BlockStatusT,
-	BlockSyncRequester as BlockSyncRequesterT,
-	CommunicationIn,
-	Error,
+	BlockStatus as BlockStatusT, BlockSyncRequester as BlockSyncRequesterT, CommunicationIn, Error,
 	SignedMessage,
 };
 
-use log::{debug, warn};
-use sp_utils::mpsc::TracingUnboundedReceiver;
-use futures::prelude::*;
-use futures::stream::{Fuse, StreamExt};
-use futures_timer::Delay;
 use finality_grandpa::voter;
-use parking_lot::Mutex;
-use prometheus_endpoint::{
-	Gauge, U64, PrometheusError, register, Registry,
+use futures::{
+	prelude::*,
+	stream::{Fuse, StreamExt},
 };
+use futures_timer::Delay;
+use log::{debug, warn};
+use parking_lot::Mutex;
+use prometheus_endpoint::{register, Gauge, PrometheusError, Registry, U64};
 use sc_client_api::{BlockImportNotification, ImportNotifications};
 use sp_finality_grandpa::AuthorityId;
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor};
+use sp_utils::mpsc::TracingUnboundedReceiver;
 
-use std::collections::{HashMap, VecDeque};
-use std::pin::Pin;
-use std::sync::Arc;
-use std::task::{Context, Poll};
-use std::time::Duration;
+use std::{
+	collections::{HashMap, VecDeque},
+	pin::Pin,
+	sync::Arc,
+	task::{Context, Poll},
+	time::Duration,
+};
 use wasm_timer::Instant;
 
 const LOG_PENDING_INTERVAL: Duration = Duration::from_secs(15);
@@ -84,7 +83,6 @@ pub(crate) enum DiscardWaitOrReady<Block: BlockT, W, R> {
 }
 
 /// Prometheus metrics for the `UntilImported` queue.
-//
 // At a given point in time there can be more than one `UntilImported` queue. One can not register a
 // metric twice, thus queues need to share the same Prometheus metrics instead of instantiating
 // their own ones.
@@ -101,10 +99,13 @@ pub(crate) struct Metrics {
 impl Metrics {
 	pub(crate) fn register(registry: &Registry) -> Result<Self, PrometheusError> {
 		Ok(Self {
-			global_waiting_messages: register(Gauge::new(
-				"finality_grandpa_until_imported_waiting_messages_number",
-				"Number of finality grandpa messages waiting within the until imported queue.",
-			)?, registry)?,
+			global_waiting_messages: register(
+				Gauge::new(
+					"finality_grandpa_until_imported_waiting_messages_number",
+					"Number of finality grandpa messages waiting within the until imported queue.",
+				)?,
+				registry,
+			)?,
 			local_waiting_messages: 0,
 		})
 	}
@@ -120,7 +121,6 @@ impl Metrics {
 	}
 }
 
-
 impl Clone for Metrics {
 	fn clone(&self) -> Self {
 		Metrics {
@@ -136,8 +136,7 @@ impl Drop for Metrics {
 	fn drop(&mut self) {
 		// Reduce the global counter by the amount of messages that were still left in the dropped
 		// queue.
-		self.global_waiting_messages
-			.sub(self.local_waiting_messages)
+		self.global_waiting_messages.sub(self.local_waiting_messages)
 	}
 }
 
@@ -200,11 +199,12 @@ where
 		// used in the event of missed import notifications
 		const CHECK_PENDING_INTERVAL: Duration = Duration::from_secs(5);
 
-		let check_pending = futures::stream::unfold(Delay::new(CHECK_PENDING_INTERVAL), |delay|
+		let check_pending = futures::stream::unfold(Delay::new(CHECK_PENDING_INTERVAL), |delay| {
 			Box::pin(async move {
 				delay.await;
 				Some((Ok(()), Delay::new(CHECK_PENDING_INTERVAL)))
-			}));
+			})
+		});
 
 		UntilImported {
 			import_notifications: import_notifications.fuse(),
@@ -220,7 +220,9 @@ where
 	}
 }
 
-impl<Block, BStatus, BSyncRequester, I, M> Stream for UntilImported<Block, BStatus, BSyncRequester, I, M> where
+impl<Block, BStatus, BSyncRequester, I, M> Stream
+	for UntilImported<Block, BStatus, BSyncRequester, I, M>
+where
 	Block: BlockT,
 	BStatus: BlockStatusT<Block>,
 	BSyncRequester: BlockSyncRequesterT<Block>,
@@ -257,7 +259,7 @@ impl<Block, BStatus, BSyncRequester, I, M> Stream for UntilImported<Block, BStat
 					if let Some(metrics) = &mut this.metrics {
 						metrics.waiting_messages_inc();
 					}
-				}
+				},
 				Poll::Pending => break,
 			}
 		}
@@ -269,12 +271,12 @@ impl<Block, BStatus, BSyncRequester, I, M> Stream for UntilImported<Block, BStat
 					// new block imported. queue up all messages tied to that hash.
 					if let Some((_, _, messages)) = this.pending.remove(&notification.hash) {
 						let canon_number = *notification.header.number();
-						let ready_messages = messages.into_iter()
-							.filter_map(|m| m.wait_completed(canon_number));
+						let ready_messages =
+							messages.into_iter().filter_map(|m| m.wait_completed(canon_number));
 
 						this.ready.extend(ready_messages);
-				 	}
-				}
+					}
+				},
 				Poll::Pending => break,
 			}
 		}
@@ -286,7 +288,9 @@ impl<Block, BStatus, BSyncRequester, I, M> Stream for UntilImported<Block, BStat
 
 		if update_interval {
 			let mut known_keys = Vec::new();
-			for (&block_hash, &mut (block_number, ref mut last_log, ref v)) in this.pending.iter_mut() {
+			for (&block_hash, &mut (block_number, ref mut last_log, ref v)) in
+				this.pending.iter_mut()
+			{
 				if let Some(number) = this.status_check.block_number(block_hash)? {
 					known_keys.push((block_hash, number));
 				} else {
@@ -318,8 +322,8 @@ impl<Block, BStatus, BSyncRequester, I, M> Stream for UntilImported<Block, BStat
 
 			for (known_hash, canon_number) in known_keys {
 				if let Some((_, _, pending_messages)) = this.pending.remove(&known_hash) {
-					let ready_messages = pending_messages.into_iter()
-						.filter_map(|m| m.wait_completed(canon_number));
+					let ready_messages =
+						pending_messages.into_iter().filter_map(|m| m.wait_completed(canon_number));
 
 					this.ready.extend(ready_messages);
 				}
@@ -363,9 +367,9 @@ impl<Block: BlockT> BlockUntilImported<Block> for SignedMessage<Block> {
 		if let Some(number) = status_check.block_number(target_hash)? {
 			if number != target_number {
 				warn_authority_wrong_target(target_hash, msg.id);
-				return Ok(DiscardWaitOrReady::Discard);
+				return Ok(DiscardWaitOrReady::Discard)
 			} else {
-				return Ok(DiscardWaitOrReady::Ready(msg));
+				return Ok(DiscardWaitOrReady::Ready(msg))
 			}
 		}
 
@@ -386,13 +390,8 @@ impl<Block: BlockT> BlockUntilImported<Block> for SignedMessage<Block> {
 
 /// Helper type definition for the stream which waits until vote targets for
 /// signed messages are imported.
-pub(crate) type UntilVoteTargetImported<Block, BlockStatus, BlockSyncRequester, I> = UntilImported<
-	Block,
-	BlockStatus,
-	BlockSyncRequester,
-	I,
-	SignedMessage<Block>,
->;
+pub(crate) type UntilVoteTargetImported<Block, BlockStatus, BlockSyncRequester, I> =
+	UntilImported<Block, BlockStatus, BlockSyncRequester, I, SignedMessage<Block>>;
 
 /// This blocks a global message import, i.e. a commit or catch up messages,
 /// until all blocks referenced in its votes are known.
@@ -445,19 +444,18 @@ impl<Block: BlockT> BlockUntilImported<Block> for BlockGlobalMessage<Block> {
 						if let Some(number) = status_check.block_number(target_hash)? {
 							entry.insert(KnownOrUnknown::Known(number));
 							number
-
 						} else {
 							entry.insert(KnownOrUnknown::Unknown(perceived_number));
 							perceived_number
 						}
-					}
+					},
 				};
 
 				if canon_number != perceived_number {
 					// invalid global message: messages targeting wrong number
 					// or at least different from other vote in same global
 					// message.
-					return Ok(false);
+					return Ok(false)
 				}
 
 				Ok(true)
@@ -466,23 +464,24 @@ impl<Block: BlockT> BlockUntilImported<Block> for BlockGlobalMessage<Block> {
 			match input {
 				voter::CommunicationIn::Commit(_, ref commit, ..) => {
 					// add known hashes from all precommits.
-					let precommit_targets = commit.precommits
-						.iter()
-						.map(|c| (c.target_number, c.target_hash));
+					let precommit_targets =
+						commit.precommits.iter().map(|c| (c.target_number, c.target_hash));
 
 					for (target_number, target_hash) in precommit_targets {
 						if !query_known(target_hash, target_number)? {
-							return Ok(DiscardWaitOrReady::Discard);
+							return Ok(DiscardWaitOrReady::Discard)
 						}
 					}
 				},
 				voter::CommunicationIn::CatchUp(ref catch_up, ..) => {
 					// add known hashes from all prevotes and precommits.
-					let prevote_targets = catch_up.prevotes
+					let prevote_targets = catch_up
+						.prevotes
 						.iter()
 						.map(|s| (s.prevote.target_number, s.prevote.target_hash));
 
-					let precommit_targets = catch_up.precommits
+					let precommit_targets = catch_up
+						.precommits
 						.iter()
 						.map(|s| (s.precommit.target_number, s.precommit.target_hash));
 
@@ -490,29 +489,39 @@ impl<Block: BlockT> BlockUntilImported<Block> for BlockGlobalMessage<Block> {
 
 					for (target_number, target_hash) in targets {
 						if !query_known(target_hash, target_number)? {
-							return Ok(DiscardWaitOrReady::Discard);
+							return Ok(DiscardWaitOrReady::Discard)
 						}
 					}
 				},
 			};
 		}
 
-		let unknown_hashes = checked_hashes.into_iter().filter_map(|(hash, num)| match num {
-			KnownOrUnknown::Unknown(number) => Some((hash, number)),
-			KnownOrUnknown::Known(_) => None,
-		}).collect::<Vec<_>>();
+		let unknown_hashes = checked_hashes
+			.into_iter()
+			.filter_map(|(hash, num)| match num {
+				KnownOrUnknown::Unknown(number) => Some((hash, number)),
+				KnownOrUnknown::Known(_) => None,
+			})
+			.collect::<Vec<_>>();
 
 		if unknown_hashes.is_empty() {
 			// none of the hashes in the global message were unknown.
 			// we can just return the message directly.
-			return Ok(DiscardWaitOrReady::Ready(input));
+			return Ok(DiscardWaitOrReady::Ready(input))
 		}
 
 		let locked_global = Arc::new(Mutex::new(Some(input)));
 
-		let items_to_await = unknown_hashes.into_iter().map(|(hash, target_number)| {
-			(hash, target_number, BlockGlobalMessage { inner: locked_global.clone(), target_number })
-		}).collect();
+		let items_to_await = unknown_hashes
+			.into_iter()
+			.map(|(hash, target_number)| {
+				(
+					hash,
+					target_number,
+					BlockGlobalMessage { inner: locked_global.clone(), target_number },
+				)
+			})
+			.collect();
 
 		// schedule waits for all unknown messages.
 		// when the last one of these has `wait_completed` called on it,
@@ -525,7 +534,7 @@ impl<Block: BlockT> BlockUntilImported<Block> for BlockGlobalMessage<Block> {
 			// Delete the inner message so it won't ever be forwarded. Future calls to
 			// `wait_completed` on the same `inner` will ignore it.
 			*self.inner.lock() = None;
-			return None;
+			return None
 		}
 
 		match Arc::try_unwrap(self.inner) {
@@ -542,25 +551,20 @@ impl<Block: BlockT> BlockUntilImported<Block> for BlockGlobalMessage<Block> {
 
 /// A stream which gates off incoming global messages, i.e. commit and catch up
 /// messages, until all referenced block hashes have been imported.
-pub(crate) type UntilGlobalMessageBlocksImported<Block, BlockStatus, BlockSyncRequester, I> = UntilImported<
-	Block,
-	BlockStatus,
-	BlockSyncRequester,
-	I,
-	BlockGlobalMessage<Block>,
->;
+pub(crate) type UntilGlobalMessageBlocksImported<Block, BlockStatus, BlockSyncRequester, I> =
+	UntilImported<Block, BlockStatus, BlockSyncRequester, I, BlockGlobalMessage<Block>>;
 
 #[cfg(test)]
 mod tests {
 	use super::*;
 	use crate::{CatchUp, CompactCommit};
-	use substrate_test_runtime_client::runtime::{Block, Hash, Header};
-	use sp_consensus::BlockOrigin;
-	use sc_client_api::BlockImportNotification;
+	use finality_grandpa::Precommit;
 	use futures::future::Either;
 	use futures_timer::Delay;
+	use sc_client_api::BlockImportNotification;
+	use sp_consensus::BlockOrigin;
 	use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedSender};
-	use finality_grandpa::Precommit;
+	use substrate_test_runtime_client::runtime::{Block, Hash, Header};
 
 	#[derive(Clone)]
 	struct TestChainState {
@@ -571,10 +575,8 @@ mod tests {
 	impl TestChainState {
 		fn new() -> (Self, ImportNotifications<Block>) {
 			let (tx, rx) = tracing_unbounded("test");
-			let state = TestChainState {
-				sender: tx,
-				known_blocks: Arc::new(Mutex::new(HashMap::new())),
-			};
+			let state =
+				TestChainState { sender: tx, known_blocks: Arc::new(Mutex::new(HashMap::new())) };
 
 			(state, rx)
 		}
@@ -588,13 +590,15 @@ mod tests {
 			let number = header.number().clone();
 
 			self.known_blocks.lock().insert(hash, number);
-			self.sender.unbounded_send(BlockImportNotification {
-				hash,
-				origin: BlockOrigin::File,
-				header,
-				is_new_best: false,
-				tree_route: None,
-			}).unwrap();
+			self.sender
+				.unbounded_send(BlockImportNotification {
+					hash,
+					origin: BlockOrigin::File,
+					header,
+					is_new_best: false,
+					tree_route: None,
+				})
+				.unwrap();
 		}
 	}
 
@@ -615,14 +619,17 @@ mod tests {
 
 	impl Default for TestBlockSyncRequester {
 		fn default() -> Self {
-			TestBlockSyncRequester {
-				requests: Arc::new(Mutex::new(Vec::new())),
-			}
+			TestBlockSyncRequester { requests: Arc::new(Mutex::new(Vec::new())) }
 		}
 	}
 
 	impl BlockSyncRequesterT<Block> for TestBlockSyncRequester {
-		fn set_sync_fork_request(&self, _peers: Vec<sc_network::PeerId>, hash: Hash, number: NumberFor<Block>) {
+		fn set_sync_fork_request(
+			&self,
+			_peers: Vec<sc_network::PeerId>,
+			hash: Hash,
+			number: NumberFor<Block>,
+		) {
 			self.requests.lock().push((hash, number));
 		}
 	}
@@ -639,7 +646,7 @@ mod tests {
 
 	// unwrap the commit from `CommunicationIn` returning its fields in a tuple,
 	// panics if the given message isn't a commit
-	fn unapply_commit(msg: CommunicationIn<Block>) -> (u64, CompactCommit::<Block>) {
+	fn unapply_commit(msg: CommunicationIn<Block>) -> (u64, CompactCommit<Block>) {
 		match msg {
 			voter::CommunicationIn::Commit(round, commit, ..) => (round, commit),
 			_ => panic!("expected commit"),
@@ -658,7 +665,8 @@ mod tests {
 	fn message_all_dependencies_satisfied<F>(
 		msg: CommunicationIn<Block>,
 		enact_dependencies: F,
-	) -> CommunicationIn<Block> where
+	) -> CommunicationIn<Block>
+	where
 		F: FnOnce(&TestChainState),
 	{
 		let (chain_state, import_notifications) = TestChainState::new();
@@ -688,7 +696,8 @@ mod tests {
 	fn blocking_message_on_dependencies<F>(
 		msg: CommunicationIn<Block>,
 		enact_dependencies: F,
-	) -> CommunicationIn<Block> where
+	) -> CommunicationIn<Block>
+	where
 		F: FnOnce(&TestChainState),
 	{
 		let (chain_state, import_notifications) = TestChainState::new();
@@ -710,16 +719,17 @@ mod tests {
 		// NOTE: needs to be cloned otherwise it is moved to the stream and
 		// dropped too early.
 		let inner_chain_state = chain_state.clone();
-		let work = future::select(until_imported.into_future(), Delay::new(Duration::from_millis(100)))
-			.then(move |res| match res {
-				Either::Left(_) => panic!("timeout should have fired first"),
-				Either::Right((_, until_imported)) => {
-					// timeout fired. push in the headers.
-					enact_dependencies(&inner_chain_state);
-
-					until_imported
-				}
-			});
+		let work =
+			future::select(until_imported.into_future(), Delay::new(Duration::from_millis(100)))
+				.then(move |res| match res {
+					Either::Left(_) => panic!("timeout should have fired first"),
+					Either::Right((_, until_imported)) => {
+						// timeout fired. push in the headers.
+						enact_dependencies(&inner_chain_state);
+
+						until_imported
+					},
+				});
 
 		futures::executor::block_on(work).0.unwrap().unwrap()
 	}
@@ -734,37 +744,22 @@ mod tests {
 			target_hash: h1.hash(),
 			target_number: 5,
 			precommits: vec![
-				Precommit {
-					target_hash: h2.hash(),
-					target_number: 6,
-				},
-				Precommit {
-					target_hash: h3.hash(),
-					target_number: 7,
-				},
+				Precommit { target_hash: h2.hash(), target_number: 6 },
+				Precommit { target_hash: h3.hash(), target_number: 7 },
 			],
 			auth_data: Vec::new(), // not used
 		};
 
-		let unknown_commit = || voter::CommunicationIn::Commit(
-			0,
-			unknown_commit.clone(),
-			voter::Callback::Blank,
-		);
+		let unknown_commit =
+			|| voter::CommunicationIn::Commit(0, unknown_commit.clone(), voter::Callback::Blank);
 
-		let res = blocking_message_on_dependencies(
-			unknown_commit(),
-			|chain_state| {
-				chain_state.import_header(h1);
-				chain_state.import_header(h2);
-				chain_state.import_header(h3);
-			},
-		);
+		let res = blocking_message_on_dependencies(unknown_commit(), |chain_state| {
+			chain_state.import_header(h1);
+			chain_state.import_header(h2);
+			chain_state.import_header(h3);
+		});
 
-		assert_eq!(
-			unapply_commit(res),
-			unapply_commit(unknown_commit()),
-		);
+		assert_eq!(unapply_commit(res), unapply_commit(unknown_commit()),);
 	}
 
 	#[test]
@@ -777,37 +772,22 @@ mod tests {
 			target_hash: h1.hash(),
 			target_number: 5,
 			precommits: vec![
-				Precommit {
-					target_hash: h2.hash(),
-					target_number: 6,
-				},
-				Precommit {
-					target_hash: h3.hash(),
-					target_number: 7,
-				},
+				Precommit { target_hash: h2.hash(), target_number: 6 },
+				Precommit { target_hash: h3.hash(), target_number: 7 },
 			],
 			auth_data: Vec::new(), // not used
 		};
 
-		let known_commit = || voter::CommunicationIn::Commit(
-			0,
-			known_commit.clone(),
-			voter::Callback::Blank,
-		);
+		let known_commit =
+			|| voter::CommunicationIn::Commit(0, known_commit.clone(), voter::Callback::Blank);
 
-		let res = message_all_dependencies_satisfied(
-			known_commit(),
-			|chain_state| {
-				chain_state.import_header(h1);
-				chain_state.import_header(h2);
-				chain_state.import_header(h3);
-			},
-		);
+		let res = message_all_dependencies_satisfied(known_commit(), |chain_state| {
+			chain_state.import_header(h1);
+			chain_state.import_header(h2);
+			chain_state.import_header(h3);
+		});
 
-		assert_eq!(
-			unapply_commit(res),
-			unapply_commit(known_commit()),
-		);
+		assert_eq!(unapply_commit(res), unapply_commit(known_commit()),);
 	}
 
 	#[test]
@@ -816,37 +796,27 @@ mod tests {
 		let h2 = make_header(6);
 		let h3 = make_header(7);
 
-		let signed_prevote = |header: &Header| {
-			finality_grandpa::SignedPrevote {
-				id: Default::default(),
-				signature: Default::default(),
-				prevote: finality_grandpa::Prevote {
-					target_hash: header.hash(),
-					target_number: *header.number(),
-				},
-			}
+		let signed_prevote = |header: &Header| finality_grandpa::SignedPrevote {
+			id: Default::default(),
+			signature: Default::default(),
+			prevote: finality_grandpa::Prevote {
+				target_hash: header.hash(),
+				target_number: *header.number(),
+			},
 		};
 
-		let signed_precommit = |header: &Header| {
-			finality_grandpa::SignedPrecommit {
-				id: Default::default(),
-				signature: Default::default(),
-				precommit: finality_grandpa::Precommit {
-					target_hash: header.hash(),
-					target_number: *header.number(),
-				},
-			}
+		let signed_precommit = |header: &Header| finality_grandpa::SignedPrecommit {
+			id: Default::default(),
+			signature: Default::default(),
+			precommit: finality_grandpa::Precommit {
+				target_hash: header.hash(),
+				target_number: *header.number(),
+			},
 		};
 
-		let prevotes = vec![
-			signed_prevote(&h1),
-			signed_prevote(&h3),
-		];
+		let prevotes = vec![signed_prevote(&h1), signed_prevote(&h3)];
 
-		let precommits = vec![
-			signed_precommit(&h1),
-			signed_precommit(&h2),
-		];
+		let precommits = vec![signed_precommit(&h1), signed_precommit(&h2)];
 
 		let unknown_catch_up = finality_grandpa::CatchUp {
 			round_number: 1,
@@ -856,24 +826,16 @@ mod tests {
 			base_number: *h1.number(),
 		};
 
-		let unknown_catch_up = || voter::CommunicationIn::CatchUp(
-			unknown_catch_up.clone(),
-			voter::Callback::Blank,
-		);
+		let unknown_catch_up =
+			|| voter::CommunicationIn::CatchUp(unknown_catch_up.clone(), voter::Callback::Blank);
 
-		let res = blocking_message_on_dependencies(
-			unknown_catch_up(),
-			|chain_state| {
-				chain_state.import_header(h1);
-				chain_state.import_header(h2);
-				chain_state.import_header(h3);
-			},
-		);
+		let res = blocking_message_on_dependencies(unknown_catch_up(), |chain_state| {
+			chain_state.import_header(h1);
+			chain_state.import_header(h2);
+			chain_state.import_header(h3);
+		});
 
-		assert_eq!(
-			unapply_catch_up(res),
-			unapply_catch_up(unknown_catch_up()),
-		);
+		assert_eq!(unapply_catch_up(res), unapply_catch_up(unknown_catch_up()),);
 	}
 
 	#[test]
@@ -882,37 +844,27 @@ mod tests {
 		let h2 = make_header(6);
 		let h3 = make_header(7);
 
-		let signed_prevote = |header: &Header| {
-			finality_grandpa::SignedPrevote {
-				id: Default::default(),
-				signature: Default::default(),
-				prevote: finality_grandpa::Prevote {
-					target_hash: header.hash(),
-					target_number: *header.number(),
-				},
-			}
+		let signed_prevote = |header: &Header| finality_grandpa::SignedPrevote {
+			id: Default::default(),
+			signature: Default::default(),
+			prevote: finality_grandpa::Prevote {
+				target_hash: header.hash(),
+				target_number: *header.number(),
+			},
 		};
 
-		let signed_precommit = |header: &Header| {
-			finality_grandpa::SignedPrecommit {
-				id: Default::default(),
-				signature: Default::default(),
-				precommit: finality_grandpa::Precommit {
-					target_hash: header.hash(),
-					target_number: *header.number(),
-				},
-			}
+		let signed_precommit = |header: &Header| finality_grandpa::SignedPrecommit {
+			id: Default::default(),
+			signature: Default::default(),
+			precommit: finality_grandpa::Precommit {
+				target_hash: header.hash(),
+				target_number: *header.number(),
+			},
 		};
 
-		let prevotes = vec![
-			signed_prevote(&h1),
-			signed_prevote(&h3),
-		];
+		let prevotes = vec![signed_prevote(&h1), signed_prevote(&h3)];
 
-		let precommits = vec![
-			signed_precommit(&h1),
-			signed_precommit(&h2),
-		];
+		let precommits = vec![signed_precommit(&h1), signed_precommit(&h2)];
 
 		let unknown_catch_up = finality_grandpa::CatchUp {
 			round_number: 1,
@@ -922,24 +874,16 @@ mod tests {
 			base_number: *h1.number(),
 		};
 
-		let unknown_catch_up = || voter::CommunicationIn::CatchUp(
-			unknown_catch_up.clone(),
-			voter::Callback::Blank,
-		);
+		let unknown_catch_up =
+			|| voter::CommunicationIn::CatchUp(unknown_catch_up.clone(), voter::Callback::Blank);
 
-		let res = message_all_dependencies_satisfied(
-			unknown_catch_up(),
-			|chain_state| {
-				chain_state.import_header(h1);
-				chain_state.import_header(h2);
-				chain_state.import_header(h3);
-			},
-		);
+		let res = message_all_dependencies_satisfied(unknown_catch_up(), |chain_state| {
+			chain_state.import_header(h1);
+			chain_state.import_header(h2);
+			chain_state.import_header(h3);
+		});
 
-		assert_eq!(
-			unapply_catch_up(res),
-			unapply_catch_up(unknown_catch_up()),
-		);
+		assert_eq!(unapply_catch_up(res), unapply_catch_up(unknown_catch_up()),);
 	}
 
 	#[test]
@@ -970,23 +914,14 @@ mod tests {
 			target_hash: h1.hash(),
 			target_number: 5,
 			precommits: vec![
-				Precommit {
-					target_hash: h2.hash(),
-					target_number: 6,
-				},
-				Precommit {
-					target_hash: h3.hash(),
-					target_number: 7,
-				},
+				Precommit { target_hash: h2.hash(), target_number: 6 },
+				Precommit { target_hash: h3.hash(), target_number: 7 },
 			],
 			auth_data: Vec::new(), // not used
 		};
 
-		let unknown_commit = || voter::CommunicationIn::Commit(
-			0,
-			unknown_commit.clone(),
-			voter::Callback::Blank,
-		);
+		let unknown_commit =
+			|| voter::CommunicationIn::Commit(0, unknown_commit.clone(), voter::Callback::Blank);
 
 		// we send the commit message and spawn the until_imported stream
 		global_tx.unbounded_send(unknown_commit()).unwrap();
@@ -1002,7 +937,7 @@ mod tests {
 			if block_sync_requests.contains(&(h2.hash(), *h2.number())) &&
 				block_sync_requests.contains(&(h3.hash(), *h3.number()))
 			{
-				return Poll::Ready(());
+				return Poll::Ready(())
 			}
 
 			// NOTE: nothing in this function is future-aware (i.e nothing gets registered to wake
@@ -1016,10 +951,12 @@ mod tests {
 		// the `until_imported` stream doesn't request the blocks immediately,
 		// but it should request them after a small timeout
 		let timeout = Delay::new(Duration::from_secs(60));
-		let test = future::select(assert, timeout).map(|res| match res {
-			Either::Left(_) => {},
-			Either::Right(_) => panic!("timed out waiting for block sync request"),
-		}).map(drop);
+		let test = future::select(assert, timeout)
+			.map(|res| match res {
+				Either::Left(_) => {},
+				Either::Right(_) => panic!("timed out waiting for block sync request"),
+			})
+			.map(drop);
 
 		futures::executor::block_on(test);
 	}
@@ -1035,10 +972,8 @@ mod tests {
 			base_number: *header.number(),
 		};
 
-		let catch_up = voter::CommunicationIn::CatchUp(
-			unknown_catch_up.clone(),
-			voter::Callback::Blank,
-		);
+		let catch_up =
+			voter::CommunicationIn::CatchUp(unknown_catch_up.clone(), voter::Callback::Blank);
 
 		Arc::new(Mutex::new(Some(catch_up)))
 	}
@@ -1047,15 +982,10 @@ mod tests {
 	fn block_global_message_wait_completed_return_when_all_awaited() {
 		let msg_inner = test_catch_up();
 
-		let waiting_block_1 = BlockGlobalMessage::<Block> {
-			inner: msg_inner.clone(),
-			target_number: 1,
-		};
+		let waiting_block_1 =
+			BlockGlobalMessage::<Block> { inner: msg_inner.clone(), target_number: 1 };
 
-		let waiting_block_2 = BlockGlobalMessage::<Block> {
-			inner: msg_inner,
-			target_number: 2,
-		};
+		let waiting_block_2 = BlockGlobalMessage::<Block> { inner: msg_inner, target_number: 2 };
 
 		// waiting_block_2 is still waiting for block 2, thus this should return `None`.
 		assert!(waiting_block_1.wait_completed(1).is_none());
@@ -1069,15 +999,10 @@ mod tests {
 	fn block_global_message_wait_completed_return_none_on_block_number_missmatch() {
 		let msg_inner = test_catch_up();
 
-		let waiting_block_1 = BlockGlobalMessage::<Block> {
-			inner: msg_inner.clone(),
-			target_number: 1,
-		};
+		let waiting_block_1 =
+			BlockGlobalMessage::<Block> { inner: msg_inner.clone(), target_number: 1 };
 
-		let waiting_block_2 = BlockGlobalMessage::<Block> {
-			inner: msg_inner,
-			target_number: 2,
-		};
+		let waiting_block_2 = BlockGlobalMessage::<Block> { inner: msg_inner, target_number: 2 };
 
 		// Calling wait_completed with wrong block number should yield None.
 		assert!(waiting_block_1.wait_completed(1234).is_none());
diff --git a/client/finality-grandpa/src/voting_rule.rs b/client/finality-grandpa/src/voting_rule.rs
index a5515c1be23e..b974afe0d352 100644
--- a/client/finality-grandpa/src/voting_rule.rs
+++ b/client/finality-grandpa/src/voting_rule.rs
@@ -22,15 +22,15 @@
 //! restrictions that are taken into account by the GRANDPA environment when
 //! selecting a finality target to vote on.
 
-use std::future::Future;
-use std::sync::Arc;
-use std::pin::Pin;
+use std::{future::Future, pin::Pin, sync::Arc};
 
 use dyn_clone::DynClone;
 
 use sc_client_api::blockchain::HeaderBackend;
-use sp_runtime::generic::BlockId;
-use sp_runtime::traits::{Block as BlockT, Header, NumberFor, One, Zero};
+use sp_runtime::{
+	generic::BlockId,
+	traits::{Block as BlockT, Header, NumberFor, One, Zero},
+};
 
 /// A future returned by a `VotingRule` to restrict a given vote, if any restriction is necessary.
 pub type VotingRuleResult<Block> =
@@ -63,7 +63,8 @@ where
 	) -> VotingRuleResult<Block>;
 }
 
-impl<Block, B> VotingRule<Block, B> for () where
+impl<Block, B> VotingRule<Block, B> for ()
+where
 	Block: BlockT,
 	B: HeaderBackend<Block>,
 {
@@ -83,7 +84,8 @@ impl<Block, B> VotingRule<Block, B> for () where
 /// behind the best block.
 #[derive(Clone)]
 pub struct BeforeBestBlockBy<N>(N);
-impl<Block, B> VotingRule<Block, B> for BeforeBestBlockBy<NumberFor<Block>> where
+impl<Block, B> VotingRule<Block, B> for BeforeBestBlockBy<NumberFor<Block>>
+where
 	Block: BlockT,
 	B: HeaderBackend<Block>,
 {
@@ -97,7 +99,7 @@ impl<Block, B> VotingRule<Block, B> for BeforeBestBlockBy<NumberFor<Block>> wher
 		use sp_arithmetic::traits::Saturating;
 
 		if current_target.number().is_zero() {
-			return Box::pin(async { None });
+			return Box::pin(async { None })
 		}
 
 		// find the target number restricted by this rule
@@ -105,17 +107,13 @@ impl<Block, B> VotingRule<Block, B> for BeforeBestBlockBy<NumberFor<Block>> wher
 
 		// our current target is already lower than this rule would restrict
 		if target_number >= *current_target.number() {
-			return Box::pin(async { None });
+			return Box::pin(async { None })
 		}
 
 		let current_target = current_target.clone();
 
 		// find the block at the given target height
-		Box::pin(std::future::ready(find_target(
-			&*backend,
-			target_number.clone(),
-			&current_target,
-		)))
+		Box::pin(std::future::ready(find_target(&*backend, target_number.clone(), &current_target)))
 	}
 }
 
@@ -125,7 +123,8 @@ impl<Block, B> VotingRule<Block, B> for BeforeBestBlockBy<NumberFor<Block>> wher
 #[derive(Clone)]
 pub struct ThreeQuartersOfTheUnfinalizedChain;
 
-impl<Block, B> VotingRule<Block, B> for ThreeQuartersOfTheUnfinalizedChain where
+impl<Block, B> VotingRule<Block, B> for ThreeQuartersOfTheUnfinalizedChain
+where
 	Block: BlockT,
 	B: HeaderBackend<Block>,
 {
@@ -150,15 +149,11 @@ impl<Block, B> VotingRule<Block, B> for ThreeQuartersOfTheUnfinalizedChain where
 
 		// our current target is already lower than this rule would restrict
 		if target_number >= *current_target.number() {
-			return Box::pin(async { None });
+			return Box::pin(async { None })
 		}
 
 		// find the block at the given target height
-		Box::pin(std::future::ready(find_target(
-			&*backend,
-			target_number,
-			current_target,
-		)))
+		Box::pin(std::future::ready(find_target(&*backend, target_number, current_target)))
 	}
 }
 
@@ -167,7 +162,8 @@ fn find_target<Block, B>(
 	backend: &B,
 	target_number: NumberFor<Block>,
 	current_header: &Block::Header,
-) -> Option<(Block::Hash, NumberFor<Block>)> where
+) -> Option<(Block::Hash, NumberFor<Block>)>
+where
 	Block: BlockT,
 	B: HeaderBackend<Block>,
 {
@@ -184,11 +180,13 @@ fn find_target<Block, B>(
 		}
 
 		if *target_header.number() == target_number {
-			return Some((target_hash, target_number));
+			return Some((target_hash, target_number))
 		}
 
 		target_hash = *target_header.parent_hash();
-		target_header = backend.header(BlockId::Hash(target_hash)).ok()?
+		target_header = backend
+			.header(BlockId::Hash(target_hash))
+			.ok()?
 			.expect("Header known to exist due to the existence of one of its descendents; qed");
 	}
 }
@@ -199,13 +197,12 @@ struct VotingRules<Block, B> {
 
 impl<B, Block> Clone for VotingRules<B, Block> {
 	fn clone(&self) -> Self {
-		VotingRules {
-			rules: self.rules.clone(),
-		}
+		VotingRules { rules: self.rules.clone() }
 	}
 }
 
-impl<Block, B> VotingRule<Block, B> for VotingRules<Block, B> where
+impl<Block, B> VotingRule<Block, B> for VotingRules<Block, B>
+where
 	Block: BlockT,
 	B: HeaderBackend<Block> + 'static,
 {
@@ -230,8 +227,8 @@ impl<Block, B> VotingRule<Block, B> for VotingRules<Block, B> where
 					.await
 					.filter(|(_, restricted_number)| {
 						// NOTE: we can only restrict votes within the interval [base, target)
-						restricted_number >= base.number()
-							&& restricted_number < restricted_target.number()
+						restricted_number >= base.number() &&
+							restricted_number < restricted_target.number()
 					})
 					.and_then(|(hash, _)| backend.header(BlockId::Hash(hash)).ok())
 					.and_then(std::convert::identity)
@@ -257,7 +254,8 @@ pub struct VotingRulesBuilder<Block, B> {
 	rules: Vec<Box<dyn VotingRule<Block, B>>>,
 }
 
-impl<Block, B> Default for VotingRulesBuilder<Block, B> where
+impl<Block, B> Default for VotingRulesBuilder<Block, B>
+where
 	Block: BlockT,
 	B: HeaderBackend<Block> + 'static,
 {
@@ -268,19 +266,19 @@ impl<Block, B> Default for VotingRulesBuilder<Block, B> where
 	}
 }
 
-impl<Block, B> VotingRulesBuilder<Block, B> where
+impl<Block, B> VotingRulesBuilder<Block, B>
+where
 	Block: BlockT,
 	B: HeaderBackend<Block> + 'static,
 {
 	/// Return a new voting rule builder using the given backend.
 	pub fn new() -> Self {
-		VotingRulesBuilder {
-			rules: Vec::new(),
-		}
+		VotingRulesBuilder { rules: Vec::new() }
 	}
 
 	/// Add a new voting rule to the builder.
-	pub fn add<R>(mut self, rule: R) -> Self where
+	pub fn add<R>(mut self, rule: R) -> Self
+	where
 		R: VotingRule<Block, B> + 'static,
 	{
 		self.rules.push(Box::new(rule));
@@ -288,8 +286,9 @@ impl<Block, B> VotingRulesBuilder<Block, B> where
 	}
 
 	/// Add all given voting rules to the builder.
-	pub fn add_all<I>(mut self, rules: I) -> Self where
-		I: IntoIterator<Item=Box<dyn VotingRule<Block, B>>>,
+	pub fn add_all<I>(mut self, rules: I) -> Self
+	where
+		I: IntoIterator<Item = Box<dyn VotingRule<Block, B>>>,
 	{
 		self.rules.extend(rules);
 		self
@@ -298,13 +297,12 @@ impl<Block, B> VotingRulesBuilder<Block, B> where
 	/// Return a new `VotingRule` that applies all of the previously added
 	/// voting rules in-order.
 	pub fn build(self) -> impl VotingRule<Block, B> + Clone {
-		VotingRules {
-			rules: Arc::new(self.rules),
-		}
+		VotingRules { rules: Arc::new(self.rules) }
 	}
 }
 
-impl<Block, B> VotingRule<Block, B> for Box<dyn VotingRule<Block, B>> where
+impl<Block, B> VotingRule<Block, B> for Box<dyn VotingRule<Block, B>>
+where
 	Block: BlockT,
 	B: HeaderBackend<Block>,
 	Self: Clone,
@@ -358,33 +356,19 @@ mod tests {
 	fn multiple_voting_rules_cannot_restrict_past_base() {
 		// setup an aggregate voting rule composed of two voting rules
 		// where each subtracts 50 blocks from the current target
-		let rule = VotingRulesBuilder::new()
-			.add(Subtract(50))
-			.add(Subtract(50))
-			.build();
+		let rule = VotingRulesBuilder::new().add(Subtract(50)).add(Subtract(50)).build();
 
 		let mut client = Arc::new(TestClientBuilder::new().build());
 
 		for _ in 0..200 {
-			let block = client
-				.new_block(Default::default())
-				.unwrap()
-				.build()
-				.unwrap()
-				.block;
+			let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
 
 			futures::executor::block_on(client.import(BlockOrigin::Own, block)).unwrap();
 		}
 
-		let genesis = client
-			.header(&BlockId::Number(0u32.into()))
-			.unwrap()
-			.unwrap();
+		let genesis = client.header(&BlockId::Number(0u32.into())).unwrap().unwrap();
 
-		let best = client
-			.header(&BlockId::Hash(client.info().best_hash))
-			.unwrap()
-			.unwrap();
+		let best = client.header(&BlockId::Hash(client.info().best_hash)).unwrap().unwrap();
 
 		let (_, number) =
 			futures::executor::block_on(rule.restrict_vote(client.clone(), &genesis, &best, &best))
@@ -394,10 +378,7 @@ mod tests {
 		// which means that we should be voting for block #100
 		assert_eq!(number, 100);
 
-		let block110 = client
-			.header(&BlockId::Number(110u32.into()))
-			.unwrap()
-			.unwrap();
+		let block110 = client.header(&BlockId::Number(110u32.into())).unwrap().unwrap();
 
 		let (_, number) = futures::executor::block_on(rule.restrict_vote(
 			client.clone(),
diff --git a/client/informant/src/display.rs b/client/informant/src/display.rs
index 0b7f8bcfaf16..4e91c22f9efd 100644
--- a/client/informant/src/display.rs
+++ b/client/informant/src/display.rs
@@ -40,7 +40,6 @@ use wasm_timer::Instant;
 ///
 /// Call `InformantDisplay::new` to initialize the state, then regularly call `display` with the
 /// information to display.
-///
 pub struct InformantDisplay<B: BlockT> {
 	/// Head of chain block number from the last time `display` has been called.
 	/// `None` if `display` has never been called.
@@ -84,34 +83,32 @@ impl<B: BlockT> InformantDisplay<B> {
 
 		let diff_bytes_inbound = total_bytes_inbound - self.last_total_bytes_inbound;
 		let diff_bytes_outbound = total_bytes_outbound - self.last_total_bytes_outbound;
-		let (avg_bytes_per_sec_inbound, avg_bytes_per_sec_outbound) =
-			if elapsed > 0 {
-				self.last_total_bytes_inbound = total_bytes_inbound;
-				self.last_total_bytes_outbound = total_bytes_outbound;
-				(diff_bytes_inbound / elapsed, diff_bytes_outbound / elapsed)
-			} else {
-				(diff_bytes_inbound, diff_bytes_outbound)
-			};
-
-		let (level, status, target) = match (
-			net_status.sync_state,
-			net_status.best_seen_block,
-			net_status.state_sync
-		) {
-			(_, _, Some(state)) => (
-				"⚙️ ",
-				"Downloading state".into(),
-				format!(", {}%, ({:.2}) Mib", state.percentage, (state.size as f32) / (1024f32 * 1024f32)),
-			),
-			(SyncState::Idle, _, _) => ("💤", "Idle".into(), "".into()),
-			(SyncState::Downloading, None, _) => ("⚙️ ", format!("Preparing{}", speed), "".into()),
-			(SyncState::Downloading, Some(n), None) => (
-				"⚙️ ",
-				format!("Syncing{}", speed),
-				format!(", target=#{}", n),
-			),
+		let (avg_bytes_per_sec_inbound, avg_bytes_per_sec_outbound) = if elapsed > 0 {
+			self.last_total_bytes_inbound = total_bytes_inbound;
+			self.last_total_bytes_outbound = total_bytes_outbound;
+			(diff_bytes_inbound / elapsed, diff_bytes_outbound / elapsed)
+		} else {
+			(diff_bytes_inbound, diff_bytes_outbound)
 		};
 
+		let (level, status, target) =
+			match (net_status.sync_state, net_status.best_seen_block, net_status.state_sync) {
+				(_, _, Some(state)) => (
+					"⚙️ ",
+					"Downloading state".into(),
+					format!(
+						", {}%, ({:.2}) Mib",
+						state.percentage,
+						(state.size as f32) / (1024f32 * 1024f32)
+					),
+				),
+				(SyncState::Idle, _, _) => ("💤", "Idle".into(), "".into()),
+				(SyncState::Downloading, None, _) =>
+					("⚙️ ", format!("Preparing{}", speed), "".into()),
+				(SyncState::Downloading, Some(n), None) =>
+					("⚙️ ", format!("Syncing{}", speed), format!(", target=#{}", n)),
+			};
+
 		if self.format.enable_color {
 			info!(
 				target: "substrate",
@@ -151,7 +148,7 @@ impl<B: BlockT> InformantDisplay<B> {
 fn speed<B: BlockT>(
 	best_number: NumberFor<B>,
 	last_number: Option<NumberFor<B>>,
-	last_update: Instant
+	last_update: Instant,
 ) -> String {
 	// Number of milliseconds elapsed since last time.
 	let elapsed_ms = {
@@ -164,25 +161,28 @@ fn speed<B: BlockT>(
 	// Number of blocks that have been imported since last time.
 	let diff = match last_number {
 		None => return String::new(),
-		Some(n) => best_number.saturating_sub(n)
+		Some(n) => best_number.saturating_sub(n),
 	};
 
 	if let Ok(diff) = TryInto::<u128>::try_into(diff) {
 		// If the number of blocks can be converted to a regular integer, then it's easy: just
 		// do the math and turn it into a `f64`.
-		let speed = diff.saturating_mul(10_000).checked_div(u128::from(elapsed_ms))
-			.map_or(0.0, |s| s as f64) / 10.0;
+		let speed = diff
+			.saturating_mul(10_000)
+			.checked_div(u128::from(elapsed_ms))
+			.map_or(0.0, |s| s as f64) /
+			10.0;
 		format!(" {:4.1} bps", speed)
-
 	} else {
 		// If the number of blocks can't be converted to a regular integer, then we need a more
 		// algebraic approach and we stay within the realm of integers.
 		let one_thousand = NumberFor::<B>::from(1_000u32);
-		let elapsed = NumberFor::<B>::from(
-			<u32 as TryFrom<_>>::try_from(elapsed_ms).unwrap_or(u32::MAX)
-		);
+		let elapsed =
+			NumberFor::<B>::from(<u32 as TryFrom<_>>::try_from(elapsed_ms).unwrap_or(u32::MAX));
 
-		let speed = diff.saturating_mul(one_thousand).checked_div(&elapsed)
+		let speed = diff
+			.saturating_mul(one_thousand)
+			.checked_div(&elapsed)
 			.unwrap_or_else(Zero::zero);
 		format!(" {} bps", speed)
 	}
diff --git a/client/informant/src/lib.rs b/client/informant/src/lib.rs
index a05ab368e3ed..6a91f583cd3d 100644
--- a/client/informant/src/lib.rs
+++ b/client/informant/src/lib.rs
@@ -25,10 +25,10 @@ use log::{info, trace, warn};
 use parity_util_mem::MallocSizeOf;
 use sc_client_api::{BlockchainEvents, UsageProvider};
 use sc_network::NetworkService;
+use sc_transaction_pool_api::TransactionPool;
 use sp_blockchain::HeaderMetadata;
 use sp_runtime::traits::{Block as BlockT, Header};
-use sc_transaction_pool_api::TransactionPool;
-use std::{fmt::Display, sync::Arc, time::Duration, collections::VecDeque};
+use std::{collections::VecDeque, fmt::Display, sync::Arc, time::Duration};
 
 mod display;
 
@@ -48,9 +48,7 @@ pub struct OutputFormat {
 
 impl Default for OutputFormat {
 	fn default() -> Self {
-		Self {
-			enable_color: true,
-		}
+		Self { enable_color: true }
 	}
 }
 
@@ -74,8 +72,7 @@ pub async fn build<B: BlockT, C>(
 	network: Arc<NetworkService<B, <B as BlockT>::Hash>>,
 	pool: Arc<impl TransactionPoolAndMaybeMallogSizeOf>,
 	format: OutputFormat,
-)
-where
+) where
 	C: UsageProvider<B> + HeaderMetadata<B> + BlockchainEvents<B>,
 	<C as HeaderMetadata<B>>::Error: Display,
 {
@@ -131,19 +128,19 @@ where
 	client.import_notification_stream().for_each(move |n| {
 		// detect and log reorganizations.
 		if let Some((ref last_num, ref last_hash)) = last_best {
-			if n.header.parent_hash() != last_hash && n.is_new_best  {
-				let maybe_ancestor = sp_blockchain::lowest_common_ancestor(
-					&*client,
-					last_hash.clone(),
-					n.hash,
-				);
+			if n.header.parent_hash() != last_hash && n.is_new_best {
+				let maybe_ancestor =
+					sp_blockchain::lowest_common_ancestor(&*client, last_hash.clone(), n.hash);
 
 				match maybe_ancestor {
 					Ok(ref ancestor) if ancestor.hash != *last_hash => info!(
 						"♻️  Reorg on #{},{} to #{},{}, common ancestor #{},{}",
-						Colour::Red.bold().paint(format!("{}", last_num)), last_hash,
-						Colour::Green.bold().paint(format!("{}", n.header.number())), n.hash,
-						Colour::White.bold().paint(format!("{}", ancestor.number)), ancestor.hash,
+						Colour::Red.bold().paint(format!("{}", last_num)),
+						last_hash,
+						Colour::Green.bold().paint(format!("{}", n.header.number())),
+						n.hash,
+						Colour::White.bold().paint(format!("{}", ancestor.number)),
+						ancestor.hash,
 					),
 					Ok(_) => {},
 					Err(e) => warn!("Error computing tree route: {}", e),
@@ -155,7 +152,6 @@ where
 			last_best = Some((n.header.number().clone(), n.hash.clone()));
 		}
 
-
 		// If we already printed a message for a given block recently,
 		// we should not print it again.
 		if !last_blocks.contains(&n.hash) {
diff --git a/client/keystore/src/lib.rs b/client/keystore/src/lib.rs
index 38ab640d2e30..5e29f691997e 100644
--- a/client/keystore/src/lib.rs
+++ b/client/keystore/src/lib.rs
@@ -19,9 +19,9 @@
 //! Keystore (and session key management) for ed25519 based chains like Polkadot.
 
 #![warn(missing_docs)]
-use std::io;
 use sp_core::crypto::KeyTypeId;
 use sp_keystore::Error as TraitError;
+use std::io;
 
 /// Local keystore implementation
 mod local;
@@ -35,19 +35,19 @@ pub enum Error {
 	/// JSON error.
 	Json(serde_json::Error),
 	/// Invalid password.
-	#[display(fmt="Invalid password")]
+	#[display(fmt = "Invalid password")]
 	InvalidPassword,
 	/// Invalid BIP39 phrase
-	#[display(fmt="Invalid recovery phrase (BIP39) data")]
+	#[display(fmt = "Invalid recovery phrase (BIP39) data")]
 	InvalidPhrase,
 	/// Invalid seed
-	#[display(fmt="Invalid seed")]
+	#[display(fmt = "Invalid seed")]
 	InvalidSeed,
 	/// Public key type is not supported
-	#[display(fmt="Key crypto type is not supported")]
+	#[display(fmt = "Key crypto type is not supported")]
 	KeyNotSupported(KeyTypeId),
 	/// Keystore unavailable
-	#[display(fmt="Keystore unavailable")]
+	#[display(fmt = "Keystore unavailable")]
 	Unavailable,
 }
 
@@ -58,9 +58,8 @@ impl From<Error> for TraitError {
 	fn from(error: Error) -> Self {
 		match error {
 			Error::KeyNotSupported(id) => TraitError::KeyNotSupported(id),
-			Error::InvalidSeed | Error::InvalidPhrase | Error::InvalidPassword => {
-				TraitError::ValidationError(error.to_string())
-			},
+			Error::InvalidSeed | Error::InvalidPhrase | Error::InvalidPassword =>
+				TraitError::ValidationError(error.to_string()),
 			Error::Unavailable => TraitError::Unavailable,
 			Error::Io(e) => TraitError::Other(e.to_string()),
 			Error::Json(e) => TraitError::Other(e.to_string()),
@@ -77,4 +76,3 @@ impl std::error::Error for Error {
 		}
 	}
 }
-
diff --git a/client/keystore/src/local.rs b/client/keystore/src/local.rs
index 2377ea127756..53f4785fb691 100644
--- a/client/keystore/src/local.rs
+++ b/client/keystore/src/local.rs
@@ -17,30 +17,27 @@
 //
 //! Local keystore implementation
 
-use std::{
-	collections::{HashMap, HashSet},
-	fs::{self, File},
-	io::Write,
-	path::PathBuf,
-	sync::Arc,
-};
 use async_trait::async_trait;
 use parking_lot::RwLock;
+use sp_application_crypto::{ecdsa, ed25519, sr25519, AppKey, AppPair, IsWrappedBy};
 use sp_core::{
-	crypto::{CryptoTypePublicPair, KeyTypeId, Pair as PairT, ExposeSecret, SecretString, Public},
-	sr25519::{Public as Sr25519Public, Pair as Sr25519Pair},
+	crypto::{CryptoTypePublicPair, ExposeSecret, KeyTypeId, Pair as PairT, Public, SecretString},
+	sr25519::{Pair as Sr25519Pair, Public as Sr25519Public},
 	Encode,
 };
 use sp_keystore::{
-	CryptoStore,
-	SyncCryptoStorePtr,
-	Error as TraitError,
-	SyncCryptoStore,
-	vrf::{VRFTranscriptData, VRFSignature, make_transcript},
+	vrf::{make_transcript, VRFSignature, VRFTranscriptData},
+	CryptoStore, Error as TraitError, SyncCryptoStore, SyncCryptoStorePtr,
+};
+use std::{
+	collections::{HashMap, HashSet},
+	fs::{self, File},
+	io::Write,
+	path::PathBuf,
+	sync::Arc,
 };
-use sp_application_crypto::{ed25519, sr25519, ecdsa, AppPair, AppKey, IsWrappedBy};
 
-use crate::{Result, Error};
+use crate::{Error, Result};
 
 /// A local based keystore that is either memory-based or filesystem-based.
 pub struct LocalKeystore(RwLock<KeystoreInner>);
@@ -62,14 +59,20 @@ impl LocalKeystore {
 	///
 	/// Returns `Ok(None)` if the key doesn't exist, `Ok(Some(_))` if the key exists and
 	/// `Err(_)` when something failed.
-	pub fn key_pair<Pair: AppPair>(&self, public: &<Pair as AppKey>::Public) -> Result<Option<Pair>> {
+	pub fn key_pair<Pair: AppPair>(
+		&self,
+		public: &<Pair as AppKey>::Public,
+	) -> Result<Option<Pair>> {
 		self.0.read().key_pair::<Pair>(public)
 	}
 }
 
 #[async_trait]
 impl CryptoStore for LocalKeystore {
-	async fn keys(&self, id: KeyTypeId) -> std::result::Result<Vec<CryptoTypePublicPair>, TraitError> {
+	async fn keys(
+		&self,
+		id: KeyTypeId,
+	) -> std::result::Result<Vec<CryptoTypePublicPair>, TraitError> {
 		SyncCryptoStore::keys(self, id)
 	}
 
@@ -109,7 +112,12 @@ impl CryptoStore for LocalKeystore {
 		SyncCryptoStore::ecdsa_generate_new(self, id, seed)
 	}
 
-	async fn insert_unknown(&self, id: KeyTypeId, suri: &str, public: &[u8]) -> std::result::Result<(), ()> {
+	async fn insert_unknown(
+		&self,
+		id: KeyTypeId,
+		suri: &str,
+		public: &[u8],
+	) -> std::result::Result<(), ()> {
 		SyncCryptoStore::insert_unknown(self, id, suri, public)
 	}
 
@@ -154,28 +162,22 @@ impl CryptoStore for LocalKeystore {
 }
 
 impl SyncCryptoStore for LocalKeystore {
-	fn keys(
-		&self,
-		id: KeyTypeId
-	) -> std::result::Result<Vec<CryptoTypePublicPair>, TraitError> {
+	fn keys(&self, id: KeyTypeId) -> std::result::Result<Vec<CryptoTypePublicPair>, TraitError> {
 		let raw_keys = self.0.read().raw_public_keys(id)?;
-		Ok(raw_keys.into_iter()
-			.fold(Vec::new(), |mut v, k| {
-				v.push(CryptoTypePublicPair(sr25519::CRYPTO_ID, k.clone()));
-				v.push(CryptoTypePublicPair(ed25519::CRYPTO_ID, k.clone()));
-				v.push(CryptoTypePublicPair(ecdsa::CRYPTO_ID, k));
-				v
-			}))
+		Ok(raw_keys.into_iter().fold(Vec::new(), |mut v, k| {
+			v.push(CryptoTypePublicPair(sr25519::CRYPTO_ID, k.clone()));
+			v.push(CryptoTypePublicPair(ed25519::CRYPTO_ID, k.clone()));
+			v.push(CryptoTypePublicPair(ecdsa::CRYPTO_ID, k));
+			v
+		}))
 	}
 
 	fn supported_keys(
 		&self,
 		id: KeyTypeId,
-		keys: Vec<CryptoTypePublicPair>
+		keys: Vec<CryptoTypePublicPair>,
 	) -> std::result::Result<Vec<CryptoTypePublicPair>, TraitError> {
-		let all_keys = SyncCryptoStore::keys(self, id)?
-			.into_iter()
-			.collect::<HashSet<_>>();
+		let all_keys = SyncCryptoStore::keys(self, id)?.into_iter().collect::<HashSet<_>>();
 		Ok(keys.into_iter().filter(|key| all_keys.contains(key)).collect::<Vec<_>>())
 	}
 
@@ -188,36 +190,40 @@ impl SyncCryptoStore for LocalKeystore {
 		match key.0 {
 			ed25519::CRYPTO_ID => {
 				let pub_key = ed25519::Public::from_slice(key.1.as_slice());
-				let key_pair = self.0.read()
+				let key_pair = self
+					.0
+					.read()
 					.key_pair_by_type::<ed25519::Pair>(&pub_key, id)
 					.map_err(|e| TraitError::from(e))?;
 				key_pair.map(|k| k.sign(msg).encode()).map(Ok).transpose()
-			}
+			},
 			sr25519::CRYPTO_ID => {
 				let pub_key = sr25519::Public::from_slice(key.1.as_slice());
-				let key_pair = self.0.read()
+				let key_pair = self
+					.0
+					.read()
 					.key_pair_by_type::<sr25519::Pair>(&pub_key, id)
 					.map_err(|e| TraitError::from(e))?;
 				key_pair.map(|k| k.sign(msg).encode()).map(Ok).transpose()
 			},
 			ecdsa::CRYPTO_ID => {
 				let pub_key = ecdsa::Public::from_slice(key.1.as_slice());
-				let key_pair = self.0.read()
+				let key_pair = self
+					.0
+					.read()
 					.key_pair_by_type::<ecdsa::Pair>(&pub_key, id)
 					.map_err(|e| TraitError::from(e))?;
 				key_pair.map(|k| k.sign(msg).encode()).map(Ok).transpose()
-			}
-			_ => Err(TraitError::KeyNotSupported(id))
+			},
+			_ => Err(TraitError::KeyNotSupported(id)),
 		}
 	}
 
 	fn sr25519_public_keys(&self, key_type: KeyTypeId) -> Vec<sr25519::Public> {
-		self.0.read().raw_public_keys(key_type)
-			.map(|v| {
-				v.into_iter()
-				 .map(|k| sr25519::Public::from_slice(k.as_slice()))
-				 .collect()
-			})
+		self.0
+			.read()
+			.raw_public_keys(key_type)
+			.map(|v| v.into_iter().map(|k| sr25519::Public::from_slice(k.as_slice())).collect())
 			.unwrap_or_default()
 	}
 
@@ -227,20 +233,20 @@ impl SyncCryptoStore for LocalKeystore {
 		seed: Option<&str>,
 	) -> std::result::Result<sr25519::Public, TraitError> {
 		let pair = match seed {
-			Some(seed) => self.0.write().insert_ephemeral_from_seed_by_type::<sr25519::Pair>(seed, id),
+			Some(seed) =>
+				self.0.write().insert_ephemeral_from_seed_by_type::<sr25519::Pair>(seed, id),
 			None => self.0.write().generate_by_type::<sr25519::Pair>(id),
-		}.map_err(|e| -> TraitError { e.into() })?;
+		}
+		.map_err(|e| -> TraitError { e.into() })?;
 
 		Ok(pair.public())
 	}
 
 	fn ed25519_public_keys(&self, key_type: KeyTypeId) -> Vec<ed25519::Public> {
-		self.0.read().raw_public_keys(key_type)
-			.map(|v| {
-				v.into_iter()
-				 .map(|k| ed25519::Public::from_slice(k.as_slice()))
-				 .collect()
-			})
+		self.0
+			.read()
+			.raw_public_keys(key_type)
+			.map(|v| v.into_iter().map(|k| ed25519::Public::from_slice(k.as_slice())).collect())
 			.unwrap_or_default()
 	}
 
@@ -250,20 +256,20 @@ impl SyncCryptoStore for LocalKeystore {
 		seed: Option<&str>,
 	) -> std::result::Result<ed25519::Public, TraitError> {
 		let pair = match seed {
-			Some(seed) => self.0.write().insert_ephemeral_from_seed_by_type::<ed25519::Pair>(seed, id),
+			Some(seed) =>
+				self.0.write().insert_ephemeral_from_seed_by_type::<ed25519::Pair>(seed, id),
 			None => self.0.write().generate_by_type::<ed25519::Pair>(id),
-		}.map_err(|e| -> TraitError { e.into() })?;
+		}
+		.map_err(|e| -> TraitError { e.into() })?;
 
 		Ok(pair.public())
 	}
 
 	fn ecdsa_public_keys(&self, key_type: KeyTypeId) -> Vec<ecdsa::Public> {
-		self.0.read().raw_public_keys(key_type)
-			.map(|v| {
-				v.into_iter()
-					.map(|k| ecdsa::Public::from_slice(k.as_slice()))
-					.collect()
-			})
+		self.0
+			.read()
+			.raw_public_keys(key_type)
+			.map(|v| v.into_iter().map(|k| ecdsa::Public::from_slice(k.as_slice())).collect())
 			.unwrap_or_default()
 	}
 
@@ -273,21 +279,27 @@ impl SyncCryptoStore for LocalKeystore {
 		seed: Option<&str>,
 	) -> std::result::Result<ecdsa::Public, TraitError> {
 		let pair = match seed {
-			Some(seed) => self.0.write().insert_ephemeral_from_seed_by_type::<ecdsa::Pair>(seed, id),
+			Some(seed) =>
+				self.0.write().insert_ephemeral_from_seed_by_type::<ecdsa::Pair>(seed, id),
 			None => self.0.write().generate_by_type::<ecdsa::Pair>(id),
-		}.map_err(|e| -> TraitError { e.into() })?;
+		}
+		.map_err(|e| -> TraitError { e.into() })?;
 
 		Ok(pair.public())
 	}
 
-	fn insert_unknown(&self, key_type: KeyTypeId, suri: &str, public: &[u8])
-		-> std::result::Result<(), ()>
-	{
+	fn insert_unknown(
+		&self,
+		key_type: KeyTypeId,
+		suri: &str,
+		public: &[u8],
+	) -> std::result::Result<(), ()> {
 		self.0.write().insert_unknown(key_type, suri, public).map_err(|_| ())
 	}
 
 	fn has_keys(&self, public_keys: &[(Vec<u8>, KeyTypeId)]) -> bool {
-		public_keys.iter()
+		public_keys
+			.iter()
 			.all(|(p, t)| self.0.read().key_phrase_by_type(&p, *t).ok().flatten().is_some())
 	}
 
@@ -302,10 +314,7 @@ impl SyncCryptoStore for LocalKeystore {
 
 		if let Some(pair) = pair {
 			let (inout, proof, _) = pair.as_ref().vrf_sign(transcript);
-			Ok(Some(VRFSignature {
-				output: inout.to_output(),
-				proof,
-			}))
+			Ok(Some(VRFSignature { output: inout.to_output(), proof }))
 		} else {
 			Ok(None)
 		}
@@ -317,9 +326,8 @@ impl SyncCryptoStore for LocalKeystore {
 		public: &ecdsa::Public,
 		msg: &[u8; 32],
 	) -> std::result::Result<Option<ecdsa::Signature>, TraitError> {
-		let pair = self.0.read()
-			.key_pair_by_type::<ecdsa::Pair>(public, id)?;
-		
+		let pair = self.0.read().key_pair_by_type::<ecdsa::Pair>(public, id)?;
+
 		pair.map(|k| k.sign_prehashed(msg)).map(Ok).transpose()
 	}
 }
@@ -362,26 +370,16 @@ impl KeystoreInner {
 
 	/// Get the password for this store.
 	fn password(&self) -> Option<&str> {
-		self.password.as_ref()
-			.map(|p| p.expose_secret())
-			.map(|p| p.as_str())
+		self.password.as_ref().map(|p| p.expose_secret()).map(|p| p.as_str())
 	}
 
 	/// Create a new in-memory store.
 	fn new_in_memory() -> Self {
-		Self {
-			path: None,
-			additional: HashMap::new(),
-			password: None
-		}
+		Self { path: None, additional: HashMap::new(), password: None }
 	}
 
 	/// Get the key phrase for the given public key and key type from the in-memory store.
-	fn get_additional_pair(
-		&self,
-		public: &[u8],
-		key_type: KeyTypeId,
-	) -> Option<&String> {
+	fn get_additional_pair(&self, public: &[u8], key_type: KeyTypeId) -> Option<&String> {
 		let key = (key_type, public.to_vec());
 		self.additional.get(&key)
 	}
@@ -444,7 +442,7 @@ impl KeystoreInner {
 		let path = if let Some(path) = self.key_file_path(public, key_type) {
 			path
 		} else {
-			return Ok(None);
+			return Ok(None)
 		};
 
 		if path.exists() {
@@ -468,10 +466,7 @@ impl KeystoreInner {
 			return Ok(None)
 		};
 
-		let pair = Pair::from_string(
-			&phrase,
-			self.password(),
-		).map_err(|_| Error::InvalidPhrase)?;
+		let pair = Pair::from_string(&phrase, self.password()).map_err(|_| Error::InvalidPhrase)?;
 
 		if &pair.public() == public {
 			Ok(Some(pair))
@@ -493,7 +488,9 @@ impl KeystoreInner {
 
 	/// Returns a list of raw public keys filtered by `KeyTypeId`
 	fn raw_public_keys(&self, id: KeyTypeId) -> Result<Vec<Vec<u8>>> {
-		let mut public_keys: Vec<Vec<u8>> = self.additional.keys()
+		let mut public_keys: Vec<Vec<u8>> = self
+			.additional
+			.keys()
 			.into_iter()
 			.filter_map(|k| if k.0 == id { Some(k.1.clone()) } else { None })
 			.collect();
@@ -508,11 +505,11 @@ impl KeystoreInner {
 					match hex::decode(name) {
 						Ok(ref hex) if hex.len() > 4 => {
 							if &hex[0..4] != &id.0 {
-								continue;
+								continue
 							}
 							let public = hex[4..].to_vec();
 							public_keys.push(public);
-						}
+						},
 						_ => continue,
 					}
 				}
@@ -526,42 +523,34 @@ impl KeystoreInner {
 	///
 	/// Returns `Ok(None)` if the key doesn't exist, `Ok(Some(_))` if the key exists or `Err(_)` when
 	/// something failed.
-	pub fn key_pair<Pair: AppPair>(&self, public: &<Pair as AppKey>::Public) -> Result<Option<Pair>> {
+	pub fn key_pair<Pair: AppPair>(
+		&self,
+		public: &<Pair as AppKey>::Public,
+	) -> Result<Option<Pair>> {
 		self.key_pair_by_type::<Pair::Generic>(IsWrappedBy::from_ref(public), Pair::ID)
 			.map(|v| v.map(Into::into))
 	}
 }
 
-
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use tempfile::TempDir;
-	use sp_core::{
-		Pair,
-		crypto::Ss58Codec,
-		testing::SR25519,
-	};
 	use sp_application_crypto::{ed25519, sr25519, AppPublic};
-	use std::{
-		fs,
-		str::FromStr,
-	};
+	use sp_core::{crypto::Ss58Codec, testing::SR25519, Pair};
+	use std::{fs, str::FromStr};
+	use tempfile::TempDir;
 
 	const TEST_KEY_TYPE: KeyTypeId = KeyTypeId(*b"test");
 
 	impl KeystoreInner {
 		fn insert_ephemeral_from_seed<Pair: AppPair>(&mut self, seed: &str) -> Result<Pair> {
-			self.insert_ephemeral_from_seed_by_type::<Pair::Generic>(seed, Pair::ID).map(Into::into)
+			self.insert_ephemeral_from_seed_by_type::<Pair::Generic>(seed, Pair::ID)
+				.map(Into::into)
 		}
 
 		fn public_keys<Public: AppPublic>(&self) -> Result<Vec<Public>> {
 			self.raw_public_keys(Public::ID)
-				.map(|v| {
-					v.into_iter()
-						.map(|k| Public::from_slice(k.as_slice()))
-						.collect()
-				})
+				.map(|v| v.into_iter().map(|k| Public::from_slice(k.as_slice())).collect())
 		}
 
 		fn generate<Pair: AppPair>(&mut self) -> Result<Pair> {
@@ -592,23 +581,23 @@ mod tests {
 		let key: ed25519::AppPair = store.0.write().generate().unwrap();
 		let key2 = ed25519::Pair::generate().0;
 
-		assert!(
-			!SyncCryptoStore::has_keys(&store, &[(key2.public().to_vec(), ed25519::AppPublic::ID)])
-		);
+		assert!(!SyncCryptoStore::has_keys(
+			&store,
+			&[(key2.public().to_vec(), ed25519::AppPublic::ID)]
+		));
 
-		assert!(
-			!SyncCryptoStore::has_keys(
-				&store,
-				&[
-					(key2.public().to_vec(), ed25519::AppPublic::ID),
-					(key.public().to_raw_vec(), ed25519::AppPublic::ID),
-				],
-			)
-		);
+		assert!(!SyncCryptoStore::has_keys(
+			&store,
+			&[
+				(key2.public().to_vec(), ed25519::AppPublic::ID),
+				(key.public().to_raw_vec(), ed25519::AppPublic::ID),
+			],
+		));
 
-		assert!(
-			SyncCryptoStore::has_keys(&store, &[(key.public().to_raw_vec(), ed25519::AppPublic::ID)])
-		);
+		assert!(SyncCryptoStore::has_keys(
+			&store,
+			&[(key.public().to_raw_vec(), ed25519::AppPublic::ID)]
+		));
 	}
 
 	#[test]
@@ -616,9 +605,11 @@ mod tests {
 		let temp_dir = TempDir::new().unwrap();
 		let mut store = KeystoreInner::open(temp_dir.path(), None).unwrap();
 
-		let pair: ed25519::AppPair = store.insert_ephemeral_from_seed(
-			"0x3d97c819d68f9bafa7d6e79cb991eebcd77d966c5334c0b94d9e1fa7ad0869dc"
-		).unwrap();
+		let pair: ed25519::AppPair = store
+			.insert_ephemeral_from_seed(
+				"0x3d97c819d68f9bafa7d6e79cb991eebcd77d966c5334c0b94d9e1fa7ad0869dc",
+			)
+			.unwrap();
 		assert_eq!(
 			"5DKUrgFqCPV8iAXx9sjy1nyBygQCeiUYRFWurZGhnrn3HJCA",
 			pair.public().to_ss58check()
@@ -637,7 +628,8 @@ mod tests {
 		let mut store = KeystoreInner::open(
 			temp_dir.path(),
 			Some(FromStr::from_str(password.as_str()).unwrap()),
-		).unwrap();
+		)
+		.unwrap();
 
 		let pair: ed25519::AppPair = store.generate().unwrap();
 		assert_eq!(
@@ -652,7 +644,8 @@ mod tests {
 		let store = KeystoreInner::open(
 			temp_dir.path(),
 			Some(FromStr::from_str(password.as_str()).unwrap()),
-		).unwrap();
+		)
+		.unwrap();
 		assert_eq!(
 			pair.public(),
 			store.key_pair::<ed25519::AppPair>(&pair.public()).unwrap().unwrap().public(),
@@ -667,9 +660,15 @@ mod tests {
 		let mut keys = Vec::new();
 		for i in 0..10 {
 			keys.push(store.generate::<ed25519::AppPair>().unwrap().public());
-			keys.push(store.insert_ephemeral_from_seed::<ed25519::AppPair>(
-				&format!("0x3d97c819d68f9bafa7d6e79cb991eebcd7{}d966c5334c0b94d9e1fa7ad0869dc", i),
-			).unwrap().public());
+			keys.push(
+				store
+					.insert_ephemeral_from_seed::<ed25519::AppPair>(&format!(
+						"0x3d97c819d68f9bafa7d6e79cb991eebcd7{}d966c5334c0b94d9e1fa7ad0869dc",
+						i
+					))
+					.unwrap()
+					.public(),
+			);
 		}
 
 		// Generate a key of a different type
@@ -690,16 +689,14 @@ mod tests {
 		let secret_uri = "//Alice";
 		let key_pair = sr25519::AppPair::from_string(secret_uri, None).expect("Generates key pair");
 
-		store.insert_unknown(
-			SR25519,
-			secret_uri,
-			key_pair.public().as_ref(),
-		).expect("Inserts unknown key");
+		store
+			.insert_unknown(SR25519, secret_uri, key_pair.public().as_ref())
+			.expect("Inserts unknown key");
 
-		let store_key_pair = store.key_pair_by_type::<sr25519::AppPair>(
-			&key_pair.public(),
-			SR25519,
-		).expect("Gets key pair from keystore").unwrap();
+		let store_key_pair = store
+			.key_pair_by_type::<sr25519::AppPair>(&key_pair.public(), SR25519)
+			.expect("Gets key pair from keystore")
+			.unwrap();
 
 		assert_eq!(key_pair.public(), store_key_pair.public());
 	}
@@ -712,16 +709,15 @@ mod tests {
 		let file_name = temp_dir.path().join(hex::encode(&SR25519.0[..2]));
 		fs::write(file_name, "test").expect("Invalid file is written");
 
-		assert!(
-			SyncCryptoStore::sr25519_public_keys(&store, SR25519).is_empty(),
-		);
+		assert!(SyncCryptoStore::sr25519_public_keys(&store, SR25519).is_empty(),);
 	}
 
 	#[test]
 	fn generate_with_seed_is_not_stored() {
 		let temp_dir = TempDir::new().unwrap();
 		let store = LocalKeystore::open(temp_dir.path(), None).unwrap();
-		let _alice_tmp_key = SyncCryptoStore::sr25519_generate_new(&store, TEST_KEY_TYPE, Some("//Alice")).unwrap();
+		let _alice_tmp_key =
+			SyncCryptoStore::sr25519_generate_new(&store, TEST_KEY_TYPE, Some("//Alice")).unwrap();
 
 		assert_eq!(SyncCryptoStore::sr25519_public_keys(&store, TEST_KEY_TYPE).len(), 1);
 
diff --git a/client/light/src/backend.rs b/client/light/src/backend.rs
index 425720c1d777..87d7dba3ddfb 100644
--- a/client/light/src/backend.rs
+++ b/client/light/src/backend.rs
@@ -19,38 +19,44 @@
 //! Light client backend. Only stores headers and justifications of blocks.
 //! Everything else is requested from full nodes on demand.
 
-use std::collections::{HashMap, HashSet};
-use std::sync::Arc;
 use parking_lot::RwLock;
+use std::{
+	collections::{HashMap, HashSet},
+	sync::Arc,
+};
 
 use codec::{Decode, Encode};
 
-use sp_core::ChangesTrieConfiguration;
-use sp_core::storage::{well_known_keys, ChildInfo};
-use sp_core::offchain::storage::InMemOffchainStorage;
-use sp_state_machine::{
-	Backend as StateBackend, TrieBackend, InMemoryBackend, ChangesTrieTransaction,
-	StorageCollection, ChildStorageCollection, IndexOperation,
-};
-use sp_runtime::{generic::BlockId, Justification, Justifications, Storage};
-use sp_runtime::traits::{Block as BlockT, NumberFor, Zero, Header, HashFor};
-use sp_blockchain::{Error as ClientError, Result as ClientResult};
+use super::blockchain::Blockchain;
+use hash_db::Hasher;
 use sc_client_api::{
 	backend::{
-		AuxStore, Backend as ClientBackend, BlockImportOperation, RemoteBackend, NewBlockState,
-		PrunableStateChangesTrieStorage,
-	},
-	blockchain::{
-		HeaderBackend as BlockchainHeaderBackend, well_known_cache_keys,
+		AuxStore, Backend as ClientBackend, BlockImportOperation, NewBlockState,
+		PrunableStateChangesTrieStorage, RemoteBackend,
 	},
-	light::Storage as BlockchainStorage,
+	blockchain::{well_known_cache_keys, HeaderBackend as BlockchainHeaderBackend},
 	in_mem::check_genesis_storage,
+	light::Storage as BlockchainStorage,
 	UsageInfo,
 };
-use super::blockchain::Blockchain;
-use hash_db::Hasher;
+use sp_blockchain::{Error as ClientError, Result as ClientResult};
+use sp_core::{
+	offchain::storage::InMemOffchainStorage,
+	storage::{well_known_keys, ChildInfo},
+	ChangesTrieConfiguration,
+};
+use sp_runtime::{
+	generic::BlockId,
+	traits::{Block as BlockT, HashFor, Header, NumberFor, Zero},
+	Justification, Justifications, Storage,
+};
+use sp_state_machine::{
+	Backend as StateBackend, ChangesTrieTransaction, ChildStorageCollection, InMemoryBackend,
+	IndexOperation, StorageCollection, TrieBackend,
+};
 
-const IN_MEMORY_EXPECT_PROOF: &str = "InMemory state backend has Void error type and always succeeds; qed";
+const IN_MEMORY_EXPECT_PROOF: &str =
+	"InMemory state backend has Void error type and always succeeds; qed";
 
 /// Light client backend.
 pub struct Backend<S, H: Hasher> {
@@ -84,11 +90,7 @@ pub enum GenesisOrUnavailableState<H: Hasher> {
 impl<S, H: Hasher> Backend<S, H> {
 	/// Create new light backend.
 	pub fn new(blockchain: Arc<Blockchain<S>>) -> Self {
-		Self {
-			blockchain,
-			genesis_state: RwLock::new(None),
-			import_lock: Default::default(),
-		}
+		Self { blockchain, genesis_state: RwLock::new(None), import_lock: Default::default() }
 	}
 
 	/// Get shared blockchain reference.
@@ -102,9 +104,13 @@ impl<S: AuxStore, H: Hasher> AuxStore for Backend<S, H> {
 		'a,
 		'b: 'a,
 		'c: 'a,
-		I: IntoIterator<Item=&'a(&'c [u8], &'c [u8])>,
-		D: IntoIterator<Item=&'a &'b [u8]>,
-	>(&self, insert: I, delete: D) -> ClientResult<()> {
+		I: IntoIterator<Item = &'a (&'c [u8], &'c [u8])>,
+		D: IntoIterator<Item = &'a &'b [u8]>,
+	>(
+		&self,
+		insert: I,
+		delete: D,
+	) -> ClientResult<()> {
 		self.blockchain.storage().insert_aux(insert, delete)
 	}
 
@@ -114,10 +120,10 @@ impl<S: AuxStore, H: Hasher> AuxStore for Backend<S, H> {
 }
 
 impl<S, Block> ClientBackend<Block> for Backend<S, HashFor<Block>>
-	where
-		Block: BlockT,
-		S: BlockchainStorage<Block>,
-		Block::Hash: Ord,
+where
+	Block: BlockT,
+	S: BlockchainStorage<Block>,
+	Block::Hash: Ord,
 {
 	type BlockImportOperation = ImportOperation<Block, S>;
 	type Blockchain = Blockchain<S>;
@@ -141,15 +147,12 @@ impl<S, Block> ClientBackend<Block> for Backend<S, HashFor<Block>>
 	fn begin_state_operation(
 		&self,
 		_operation: &mut Self::BlockImportOperation,
-		_block: BlockId<Block>
+		_block: BlockId<Block>,
 	) -> ClientResult<()> {
 		Ok(())
 	}
 
-	fn commit_operation(
-		&self,
-		mut operation: Self::BlockImportOperation,
-	) -> ClientResult<()> {
+	fn commit_operation(&self, mut operation: Self::BlockImportOperation) -> ClientResult<()> {
 		if !operation.finalized_blocks.is_empty() {
 			for block in operation.finalized_blocks {
 				self.blockchain.storage().finalize_header(block)?;
@@ -159,7 +162,9 @@ impl<S, Block> ClientBackend<Block> for Backend<S, HashFor<Block>>
 		if let Some(header) = operation.header {
 			let is_genesis_import = header.number().is_zero();
 			if let Some(new_config) = operation.changes_trie_config_update {
-				operation.cache.insert(well_known_cache_keys::CHANGES_TRIE_CONFIG, new_config.encode());
+				operation
+					.cache
+					.insert(well_known_cache_keys::CHANGES_TRIE_CONFIG, new_config.encode());
 			}
 			self.blockchain.storage().import_header(
 				header,
@@ -175,11 +180,12 @@ impl<S, Block> ClientBackend<Block> for Backend<S, HashFor<Block>>
 		} else {
 			for (key, maybe_val) in operation.aux_ops {
 				match maybe_val {
-					Some(val) => self.blockchain.storage().insert_aux(
-						&[(&key[..], &val[..])],
-						std::iter::empty(),
-					)?,
-					None => self.blockchain.storage().insert_aux(std::iter::empty(), &[&key[..]])?,
+					Some(val) => self
+						.blockchain
+						.storage()
+						.insert_aux(&[(&key[..], &val[..])], std::iter::empty())?,
+					None =>
+						self.blockchain.storage().insert_aux(std::iter::empty(), &[&key[..]])?,
 				}
 			}
 		}
@@ -229,7 +235,7 @@ impl<S, Block> ClientBackend<Block> for Backend<S, HashFor<Block>>
 		// special case for genesis block
 		if block_number.is_zero() {
 			if let Some(genesis_state) = self.genesis_state.read().clone() {
-				return Ok(GenesisOrUnavailableState::Genesis(genesis_state));
+				return Ok(GenesisOrUnavailableState::Genesis(genesis_state))
 			}
 		}
 
@@ -246,10 +252,7 @@ impl<S, Block> ClientBackend<Block> for Backend<S, HashFor<Block>>
 		Err(ClientError::NotAvailableOnLightClient)
 	}
 
-	fn remove_leaf_block(
-		&self,
-		_hash: &Block::Hash,
-	) -> ClientResult<()> {
+	fn remove_leaf_block(&self, _hash: &Block::Hash) -> ClientResult<()> {
 		Err(ClientError::NotAvailableOnLightClient)
 	}
 
@@ -265,8 +268,9 @@ where
 	Block::Hash: Ord,
 {
 	fn is_local_state_available(&self, block: &BlockId<Block>) -> bool {
-		self.genesis_state.read().is_some()
-			&& self.blockchain.expect_block_number_from_id(block)
+		self.genesis_state.read().is_some() &&
+			self.blockchain
+				.expect_block_number_from_id(block)
 				.map(|num| num.is_zero())
 				.unwrap_or(false)
 	}
@@ -277,10 +281,10 @@ where
 }
 
 impl<S, Block> BlockImportOperation<Block> for ImportOperation<Block, S>
-	where
-		Block: BlockT,
-		S: BlockchainStorage<Block>,
-		Block::Hash: Ord,
+where
+	Block: BlockT,
+	S: BlockchainStorage<Block>,
+	Block::Hash: Ord,
 {
 	type State = GenesisOrUnavailableState<HashFor<Block>>;
 
@@ -326,10 +330,14 @@ impl<S, Block> BlockImportOperation<Block> for ImportOperation<Block, S>
 		check_genesis_storage(&input)?;
 
 		// changes trie configuration
-		let changes_trie_config = input.top.iter()
+		let changes_trie_config = input
+			.top
+			.iter()
 			.find(|(k, _)| &k[..] == well_known_keys::CHANGES_TRIE_CONFIG)
-			.map(|(_, v)| Decode::decode(&mut &v[..])
-				.expect("changes trie configuration is encoded properly at genesis"));
+			.map(|(_, v)| {
+				Decode::decode(&mut &v[..])
+					.expect("changes trie configuration is encoded properly at genesis")
+			});
 		self.changes_trie_config_update = Some(changes_trie_config);
 
 		// this is only called when genesis block is imported => shouldn't be performance bottleneck
@@ -337,7 +345,8 @@ impl<S, Block> BlockImportOperation<Block> for ImportOperation<Block, S>
 		storage.insert(None, input.top);
 
 		// create a list of children keys to re-compute roots for
-		let child_delta = input.children_default
+		let child_delta = input
+			.children_default
 			.iter()
 			.map(|(_storage_key, storage_child)| (&storage_child.child_info, std::iter::empty()));
 
@@ -360,7 +369,8 @@ impl<S, Block> BlockImportOperation<Block> for ImportOperation<Block, S>
 	}
 
 	fn insert_aux<I>(&mut self, ops: I) -> ClientResult<()>
-		where I: IntoIterator<Item=(Vec<u8>, Option<Vec<u8>>)>
+	where
+		I: IntoIterator<Item = (Vec<u8>, Option<Vec<u8>>)>,
 	{
 		self.aux_ops.append(&mut ops.into_iter().collect());
 		Ok(())
@@ -389,7 +399,10 @@ impl<S, Block> BlockImportOperation<Block> for ImportOperation<Block, S>
 		Ok(())
 	}
 
-	fn update_transaction_index(&mut self, _index: Vec<IndexOperation>) -> sp_blockchain::Result<()> {
+	fn update_transaction_index(
+		&mut self,
+		_index: Vec<IndexOperation>,
+	) -> sp_blockchain::Result<()> {
 		// noop for the light client
 		Ok(())
 	}
@@ -405,8 +418,8 @@ impl<H: Hasher> std::fmt::Debug for GenesisOrUnavailableState<H> {
 }
 
 impl<H: Hasher> StateBackend<H> for GenesisOrUnavailableState<H>
-	where
-		H::Out: Ord + codec::Codec,
+where
+	H::Out: Ord + codec::Codec,
 {
 	type Error = ClientError;
 	type Transaction = <InMemoryBackend<H> as StateBackend<H>>::Transaction;
@@ -420,11 +433,7 @@ impl<H: Hasher> StateBackend<H> for GenesisOrUnavailableState<H>
 		}
 	}
 
-	fn child_storage(
-		&self,
-		child_info: &ChildInfo,
-		key: &[u8],
-	) -> ClientResult<Option<Vec<u8>>> {
+	fn child_storage(&self, child_info: &ChildInfo, key: &[u8]) -> ClientResult<Option<Vec<u8>>> {
 		match *self {
 			GenesisOrUnavailableState::Genesis(ref state) =>
 				Ok(state.child_storage(child_info, key).expect(IN_MEMORY_EXPECT_PROOF)),
@@ -446,24 +455,24 @@ impl<H: Hasher> StateBackend<H> for GenesisOrUnavailableState<H>
 		key: &[u8],
 	) -> Result<Option<Vec<u8>>, Self::Error> {
 		match *self {
-			GenesisOrUnavailableState::Genesis(ref state) => Ok(
-				state.next_child_storage_key(child_info, key)
-					.expect(IN_MEMORY_EXPECT_PROOF)
-			),
+			GenesisOrUnavailableState::Genesis(ref state) =>
+				Ok(state.next_child_storage_key(child_info, key).expect(IN_MEMORY_EXPECT_PROOF)),
 			GenesisOrUnavailableState::Unavailable => Err(ClientError::NotAvailableOnLightClient),
 		}
 	}
 
 	fn for_keys_with_prefix<A: FnMut(&[u8])>(&self, prefix: &[u8], action: A) {
 		match *self {
-			GenesisOrUnavailableState::Genesis(ref state) => state.for_keys_with_prefix(prefix, action),
+			GenesisOrUnavailableState::Genesis(ref state) =>
+				state.for_keys_with_prefix(prefix, action),
 			GenesisOrUnavailableState::Unavailable => (),
 		}
 	}
 
 	fn for_key_values_with_prefix<A: FnMut(&[u8], &[u8])>(&self, prefix: &[u8], action: A) {
 		match *self {
-			GenesisOrUnavailableState::Genesis(ref state) => state.for_key_values_with_prefix(prefix, action),
+			GenesisOrUnavailableState::Genesis(ref state) =>
+				state.for_key_values_with_prefix(prefix, action),
 			GenesisOrUnavailableState::Unavailable => (),
 		}
 	}
@@ -477,9 +486,9 @@ impl<H: Hasher> StateBackend<H> for GenesisOrUnavailableState<H>
 		allow_missing: bool,
 	) -> ClientResult<bool> {
 		match *self {
-			GenesisOrUnavailableState::Genesis(ref state) =>
-				Ok(state.apply_to_key_values_while(child_info, prefix, start_at, action, allow_missing)
-					.expect(IN_MEMORY_EXPECT_PROOF)),
+			GenesisOrUnavailableState::Genesis(ref state) => Ok(state
+				.apply_to_key_values_while(child_info, prefix, start_at, action, allow_missing)
+				.expect(IN_MEMORY_EXPECT_PROOF)),
 			GenesisOrUnavailableState::Unavailable => Err(ClientError::NotAvailableOnLightClient),
 		}
 	}
@@ -512,11 +521,13 @@ impl<H: Hasher> StateBackend<H> for GenesisOrUnavailableState<H>
 
 	fn storage_root<'a>(
 		&self,
-		delta: impl Iterator<Item=(&'a [u8], Option<&'a [u8]>)>,
-	) -> (H::Out, Self::Transaction) where H::Out: Ord {
+		delta: impl Iterator<Item = (&'a [u8], Option<&'a [u8]>)>,
+	) -> (H::Out, Self::Transaction)
+	where
+		H::Out: Ord,
+	{
 		match *self {
-			GenesisOrUnavailableState::Genesis(ref state) =>
-				state.storage_root(delta),
+			GenesisOrUnavailableState::Genesis(ref state) => state.storage_root(delta),
 			GenesisOrUnavailableState::Unavailable => Default::default(),
 		}
 	}
@@ -524,15 +535,17 @@ impl<H: Hasher> StateBackend<H> for GenesisOrUnavailableState<H>
 	fn child_storage_root<'a>(
 		&self,
 		child_info: &ChildInfo,
-		delta: impl Iterator<Item=(&'a [u8], Option<&'a [u8]>)>,
-	) -> (H::Out, bool, Self::Transaction) where H::Out: Ord {
+		delta: impl Iterator<Item = (&'a [u8], Option<&'a [u8]>)>,
+	) -> (H::Out, bool, Self::Transaction)
+	where
+		H::Out: Ord,
+	{
 		match *self {
 			GenesisOrUnavailableState::Genesis(ref state) => {
 				let (root, is_equal, _) = state.child_storage_root(child_info, delta);
 				(root, is_equal, Default::default())
 			},
-			GenesisOrUnavailableState::Unavailable =>
-				(H::Out::default(), true, Default::default()),
+			GenesisOrUnavailableState::Unavailable => (H::Out::default(), true, Default::default()),
 		}
 	}
 
@@ -550,7 +563,7 @@ impl<H: Hasher> StateBackend<H> for GenesisOrUnavailableState<H>
 		}
 	}
 
-	fn register_overlay_stats(&self, _stats: &sp_state_machine::StateMachineStats) { }
+	fn register_overlay_stats(&self, _stats: &sp_state_machine::StateMachineStats) {}
 
 	fn usage_info(&self) -> sp_state_machine::UsageInfo {
 		sp_state_machine::UsageInfo::empty()
diff --git a/client/light/src/blockchain.rs b/client/light/src/blockchain.rs
index 242839833a54..e88c72419369 100644
--- a/client/light/src/blockchain.rs
+++ b/client/light/src/blockchain.rs
@@ -21,27 +21,25 @@
 
 use std::sync::Arc;
 
-use sp_runtime::{Justifications, generic::BlockId};
-use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor, Zero};
-
-use sp_blockchain::{
-	HeaderMetadata, CachedHeaderMetadata, Error as ClientError, Result as ClientResult,
+use sp_runtime::{
+	generic::BlockId,
+	traits::{Block as BlockT, Header as HeaderT, NumberFor, Zero},
+	Justifications,
 };
+
+use crate::fetcher::RemoteHeaderRequest;
 pub use sc_client_api::{
-	backend::{
-		AuxStore, NewBlockState, ProvideChtRoots,
-	},
+	backend::{AuxStore, NewBlockState, ProvideChtRoots},
 	blockchain::{
-		Backend as BlockchainBackend, BlockStatus, Cache as BlockchainCache,
+		well_known_cache_keys, Backend as BlockchainBackend, BlockStatus, Cache as BlockchainCache,
 		HeaderBackend as BlockchainHeaderBackend, Info as BlockchainInfo, ProvideCache,
-		well_known_cache_keys,
-	},
-	light::{
-		RemoteBlockchain, LocalOrRemote, Storage
 	},
 	cht,
+	light::{LocalOrRemote, RemoteBlockchain, Storage},
+};
+use sp_blockchain::{
+	CachedHeaderMetadata, Error as ClientError, HeaderMetadata, Result as ClientResult,
 };
-use crate::fetcher::RemoteHeaderRequest;
 
 /// Light client blockchain.
 pub struct Blockchain<S> {
@@ -51,9 +49,7 @@ pub struct Blockchain<S> {
 impl<S> Blockchain<S> {
 	/// Create new light blockchain backed with given storage.
 	pub fn new(storage: S) -> Self {
-		Self {
-			storage,
-		}
+		Self { storage }
 	}
 
 	/// Get storage reference.
@@ -62,7 +58,11 @@ impl<S> Blockchain<S> {
 	}
 }
 
-impl<S, Block> BlockchainHeaderBackend<Block> for Blockchain<S> where Block: BlockT, S: Storage<Block> {
+impl<S, Block> BlockchainHeaderBackend<Block> for Blockchain<S>
+where
+	Block: BlockT,
+	S: Storage<Block>,
+{
 	fn header(&self, id: BlockId<Block>) -> ClientResult<Option<Block::Header>> {
 		match RemoteBlockchain::header(self, id)? {
 			LocalOrRemote::Local(header) => Ok(Some(header)),
@@ -83,15 +83,25 @@ impl<S, Block> BlockchainHeaderBackend<Block> for Blockchain<S> where Block: Blo
 		self.storage.number(hash)
 	}
 
-	fn hash(&self, number: <<Block as BlockT>::Header as HeaderT>::Number) -> ClientResult<Option<Block::Hash>> {
+	fn hash(
+		&self,
+		number: <<Block as BlockT>::Header as HeaderT>::Number,
+	) -> ClientResult<Option<Block::Hash>> {
 		self.storage.hash(number)
 	}
 }
 
-impl<S, Block> HeaderMetadata<Block> for Blockchain<S> where Block: BlockT, S: Storage<Block> {
+impl<S, Block> HeaderMetadata<Block> for Blockchain<S>
+where
+	Block: BlockT,
+	S: Storage<Block>,
+{
 	type Error = ClientError;
 
-	fn header_metadata(&self, hash: Block::Hash) -> Result<CachedHeaderMetadata<Block>, Self::Error> {
+	fn header_metadata(
+		&self,
+		hash: Block::Hash,
+	) -> Result<CachedHeaderMetadata<Block>, Self::Error> {
 		self.storage.header_metadata(hash)
 	}
 
@@ -104,7 +114,11 @@ impl<S, Block> HeaderMetadata<Block> for Blockchain<S> where Block: BlockT, S: S
 	}
 }
 
-impl<S, Block> BlockchainBackend<Block> for Blockchain<S> where Block: BlockT, S: Storage<Block> {
+impl<S, Block> BlockchainBackend<Block> for Blockchain<S>
+where
+	Block: BlockT,
+	S: Storage<Block>,
+{
 	fn body(&self, _id: BlockId<Block>) -> ClientResult<Option<Vec<Block::Extrinsic>>> {
 		Err(ClientError::NotAvailableOnLightClient)
 	}
@@ -129,16 +143,13 @@ impl<S, Block> BlockchainBackend<Block> for Blockchain<S> where Block: BlockT, S
 		Err(ClientError::NotAvailableOnLightClient)
 	}
 
-	fn indexed_transaction(
-		&self,
-		_hash: &Block::Hash,
-	) -> ClientResult<Option<Vec<u8>>> {
+	fn indexed_transaction(&self, _hash: &Block::Hash) -> ClientResult<Option<Vec<u8>>> {
 		Err(ClientError::NotAvailableOnLightClient)
 	}
 
 	fn block_indexed_body(
 		&self,
-		_id: BlockId<Block>
+		_id: BlockId<Block>,
 	) -> sp_blockchain::Result<Option<Vec<Vec<u8>>>> {
 		Err(ClientError::NotAvailableOnLightClient)
 	}
@@ -151,16 +162,16 @@ impl<S: Storage<Block>, Block: BlockT> ProvideCache<Block> for Blockchain<S> {
 }
 
 impl<S, Block: BlockT> RemoteBlockchain<Block> for Blockchain<S>
-	where
-		S: Storage<Block>,
+where
+	S: Storage<Block>,
 {
-	fn header(&self, id: BlockId<Block>) -> ClientResult<LocalOrRemote<
-		Block::Header,
-		RemoteHeaderRequest<Block::Header>,
-	>> {
+	fn header(
+		&self,
+		id: BlockId<Block>,
+	) -> ClientResult<LocalOrRemote<Block::Header, RemoteHeaderRequest<Block::Header>>> {
 		// first, try to read header from local storage
 		if let Some(local_header) = self.storage.header(id)? {
-			return Ok(LocalOrRemote::Local(local_header));
+			return Ok(LocalOrRemote::Local(local_header))
 		}
 
 		// we need to know block number to check if it's a part of CHT
@@ -173,8 +184,9 @@ impl<S, Block: BlockT> RemoteBlockchain<Block> for Blockchain<S>
 		};
 
 		// if the header is genesis (never pruned), non-canonical, or from future => return
-		if number.is_zero() || self.storage.status(BlockId::Number(number))? == BlockStatus::Unknown {
-			return Ok(LocalOrRemote::Unknown);
+		if number.is_zero() || self.storage.status(BlockId::Number(number))? == BlockStatus::Unknown
+		{
+			return Ok(LocalOrRemote::Unknown)
 		}
 
 		Ok(LocalOrRemote::Remote(RemoteHeaderRequest {
diff --git a/client/light/src/call_executor.rs b/client/light/src/call_executor.rs
index c9ca3bab37be..f666d8363127 100644
--- a/client/light/src/call_executor.rs
+++ b/client/light/src/call_executor.rs
@@ -18,34 +18,33 @@
 
 //! Methods that light client could use to execute runtime calls.
 
-use std::{
-	sync::Arc, panic::UnwindSafe, result, cell::RefCell,
-};
+use std::{cell::RefCell, panic::UnwindSafe, result, sync::Arc};
 
-use codec::{Encode, Decode};
+use codec::{Decode, Encode};
+use hash_db::Hasher;
 use sp_core::{
-	convert_hash, NativeOrEncoded, traits::{CodeExecutor, SpawnNamed},
+	convert_hash,
+	traits::{CodeExecutor, SpawnNamed},
+	NativeOrEncoded,
 };
+use sp_externalities::Extensions;
 use sp_runtime::{
-	generic::BlockId, traits::{Block as BlockT, Header as HeaderT, HashFor},
+	generic::BlockId,
+	traits::{Block as BlockT, HashFor, Header as HeaderT},
 };
-use sp_externalities::Extensions;
 use sp_state_machine::{
-	self, Backend as StateBackend, OverlayedChanges, ExecutionStrategy, create_proof_check_backend,
-	execution_proof_check_on_trie_backend, ExecutionManager, StorageProof,
+	self, create_proof_check_backend, execution_proof_check_on_trie_backend,
+	Backend as StateBackend, ExecutionManager, ExecutionStrategy, OverlayedChanges, StorageProof,
 };
-use hash_db::Hasher;
 
 use sp_api::{ProofRecorder, StorageTransactionCache};
 
 use sp_blockchain::{Error as ClientError, Result as ClientResult};
 
 use sc_client_api::{
-	backend::RemoteBackend,
-	light::RemoteCallRequest,
-	call_executor::CallExecutor,
+	backend::RemoteBackend, call_executor::CallExecutor, light::RemoteCallRequest,
 };
-use sc_executor::{RuntimeVersion, NativeVersion};
+use sc_executor::{NativeVersion, RuntimeVersion};
 
 /// Call executor that is able to execute calls only on genesis state.
 ///
@@ -64,19 +63,15 @@ impl<B, L> GenesisCallExecutor<B, L> {
 
 impl<B, L: Clone> Clone for GenesisCallExecutor<B, L> {
 	fn clone(&self) -> Self {
-		GenesisCallExecutor {
-			backend: self.backend.clone(),
-			local: self.local.clone(),
-		}
+		GenesisCallExecutor { backend: self.backend.clone(), local: self.local.clone() }
 	}
 }
 
-impl<Block, B, Local> CallExecutor<Block> for
-	GenesisCallExecutor<B, Local>
-	where
-		Block: BlockT,
-		B: RemoteBackend<Block>,
-		Local: CallExecutor<Block>,
+impl<Block, B, Local> CallExecutor<Block> for GenesisCallExecutor<B, Local>
+where
+	Block: BlockT,
+	B: RemoteBackend<Block>,
+	Local: CallExecutor<Block>,
 {
 	type Error = ClientError;
 
@@ -99,7 +94,7 @@ impl<Block, B, Local> CallExecutor<Block> for
 	fn contextual_call<
 		EM: Fn(
 			Result<NativeOrEncoded<R>, Self::Error>,
-			Result<NativeOrEncoded<R>, Self::Error>
+			Result<NativeOrEncoded<R>, Self::Error>,
 		) -> Result<NativeOrEncoded<R>, Self::Error>,
 		R: Encode + Decode + PartialEq,
 		NC: FnOnce() -> result::Result<R, sp_api::ApiError> + UnwindSafe,
@@ -114,7 +109,10 @@ impl<Block, B, Local> CallExecutor<Block> for
 		native_call: Option<NC>,
 		recorder: &Option<ProofRecorder<Block>>,
 		extensions: Option<Extensions>,
-	) -> ClientResult<NativeOrEncoded<R>> where ExecutionManager<EM>: Clone {
+	) -> ClientResult<NativeOrEncoded<R>>
+	where
+		ExecutionManager<EM>: Clone,
+	{
 		// there's no actual way/need to specify native/wasm execution strategy on light node
 		// => we can safely ignore passed values
 
@@ -125,7 +123,7 @@ impl<Block, B, Local> CallExecutor<Block> for
 					Result<NativeOrEncoded<R>, Local::Error>,
 				) -> Result<NativeOrEncoded<R>, Local::Error>,
 				_,
-				NC
+				NC,
 			>(
 				&self.local,
 				at,
@@ -137,7 +135,8 @@ impl<Block, B, Local> CallExecutor<Block> for
 				native_call,
 				recorder,
 				extensions,
-			).map_err(|e| ClientError::Execution(Box::new(e.to_string()))),
+			)
+			.map_err(|e| ClientError::Execution(Box::new(e.to_string()))),
 			false => Err(ClientError::NotAvailableOnLightClient),
 		}
 	}
@@ -174,24 +173,19 @@ pub fn prove_execution<Block, S, E>(
 	method: &str,
 	call_data: &[u8],
 ) -> ClientResult<(Vec<u8>, StorageProof)>
-	where
-		Block: BlockT,
-		S: StateBackend<HashFor<Block>>,
-		E: CallExecutor<Block>,
+where
+	Block: BlockT,
+	S: StateBackend<HashFor<Block>>,
+	E: CallExecutor<Block>,
 {
-	let trie_state = state.as_trie_backend()
-		.ok_or_else(||
-			Box::new(sp_state_machine::ExecutionError::UnableToGenerateProof) as
-				Box<dyn sp_state_machine::Error>
-		)?;
+	let trie_state = state.as_trie_backend().ok_or_else(|| {
+		Box::new(sp_state_machine::ExecutionError::UnableToGenerateProof)
+			as Box<dyn sp_state_machine::Error>
+	})?;
 
 	// execute method + record execution proof
-	let (result, exec_proof) = executor.prove_at_trie_state(
-		&trie_state,
-		&mut Default::default(),
-		method,
-		call_data,
-	)?;
+	let (result, exec_proof) =
+		executor.prove_at_trie_state(&trie_state, &mut Default::default(), method, call_data)?;
 
 	Ok((result, exec_proof))
 }
@@ -205,11 +199,11 @@ pub fn check_execution_proof<Header, E, H>(
 	request: &RemoteCallRequest<Header>,
 	remote_proof: StorageProof,
 ) -> ClientResult<Vec<u8>>
-	where
-		Header: HeaderT,
-		E: CodeExecutor + Clone + 'static,
-		H: Hasher,
-		H::Out: Ord + codec::Codec + 'static,
+where
+	Header: HeaderT,
+	E: CodeExecutor + Clone + 'static,
+	H: Hasher,
+	H::Out: Ord + codec::Codec + 'static,
 {
 	let local_state_root = request.header.state_root();
 	let root: H::Out = convert_hash(&local_state_root);
@@ -220,7 +214,8 @@ pub fn check_execution_proof<Header, E, H>(
 
 	// TODO: Remove when solved: https://github.com/paritytech/substrate/issues/5047
 	let backend_runtime_code = sp_state_machine::backend::BackendRuntimeCode::new(&trie_backend);
-	let runtime_code = backend_runtime_code.runtime_code()
+	let runtime_code = backend_runtime_code
+		.runtime_code()
 		.map_err(|_e| ClientError::RuntimeCodeMissing)?;
 
 	// execute method
diff --git a/client/light/src/fetcher.rs b/client/light/src/fetcher.rs
index e39cfe07fbf5..fcdc7ad7ba59 100644
--- a/client/light/src/fetcher.rs
+++ b/client/light/src/fetcher.rs
@@ -18,34 +18,39 @@
 
 //! Light client data fetcher. Fetches requested data from remote full nodes.
 
-use std::sync::Arc;
-use std::collections::{BTreeMap, HashMap};
-use std::marker::PhantomData;
+use std::{
+	collections::{BTreeMap, HashMap},
+	marker::PhantomData,
+	sync::Arc,
+};
 
-use hash_db::{HashDB, Hasher, EMPTY_PREFIX};
 use codec::{Decode, Encode};
-use sp_core::{convert_hash, traits::{CodeExecutor, SpawnNamed}, storage::{ChildInfo, ChildType}};
+use hash_db::{HashDB, Hasher, EMPTY_PREFIX};
+use sp_blockchain::{Error as ClientError, Result as ClientResult};
+use sp_core::{
+	convert_hash,
+	storage::{ChildInfo, ChildType},
+	traits::{CodeExecutor, SpawnNamed},
+};
 use sp_runtime::traits::{
-	Block as BlockT, Header as HeaderT, Hash, HashFor, NumberFor,
-	AtLeast32Bit, CheckedConversion,
+	AtLeast32Bit, Block as BlockT, CheckedConversion, Hash, HashFor, Header as HeaderT, NumberFor,
 };
+pub use sp_state_machine::StorageProof;
 use sp_state_machine::{
-	ChangesTrieRootsStorage, ChangesTrieAnchorBlockId, ChangesTrieConfigurationRange,
-	InMemoryChangesTrieStorage, TrieBackend, read_proof_check, key_changes_proof_check_with_db,
-	read_child_proof_check,
+	key_changes_proof_check_with_db, read_child_proof_check, read_proof_check,
+	ChangesTrieAnchorBlockId, ChangesTrieConfigurationRange, ChangesTrieRootsStorage,
+	InMemoryChangesTrieStorage, TrieBackend,
 };
-pub use sp_state_machine::StorageProof;
-use sp_blockchain::{Error as ClientError, Result as ClientResult};
 
+use crate::{blockchain::Blockchain, call_executor::check_execution_proof};
 pub use sc_client_api::{
+	cht,
 	light::{
-		RemoteCallRequest, RemoteHeaderRequest, RemoteReadRequest, RemoteReadChildRequest,
-		RemoteChangesRequest, ChangesProof, RemoteBodyRequest, Fetcher, FetchChecker,
+		ChangesProof, FetchChecker, Fetcher, RemoteBodyRequest, RemoteCallRequest,
+		RemoteChangesRequest, RemoteHeaderRequest, RemoteReadChildRequest, RemoteReadRequest,
 		Storage as BlockchainStorage,
 	},
-	cht,
 };
-use crate::{blockchain::Blockchain, call_executor::check_execution_proof};
 
 /// Remote data checker.
 pub struct LightDataChecker<E, H, B: BlockT, S: BlockchainStorage<B>> {
@@ -62,9 +67,7 @@ impl<E, H, B: BlockT, S: BlockchainStorage<B>> LightDataChecker<E, H, B, S> {
 		executor: E,
 		spawn_handle: Box<dyn SpawnNamed>,
 	) -> Self {
-		Self {
-			blockchain, executor, spawn_handle, _hasher: PhantomData
-		}
+		Self { blockchain, executor, spawn_handle, _hasher: PhantomData }
 	}
 
 	/// Check remote changes query proof assuming that CHT-s are of given size.
@@ -74,26 +77,39 @@ impl<E, H, B: BlockT, S: BlockchainStorage<B>> LightDataChecker<E, H, B, S> {
 		remote_proof: ChangesProof<B::Header>,
 		cht_size: NumberFor<B>,
 	) -> ClientResult<Vec<(NumberFor<B>, u32)>>
-		where
-			H: Hasher,
-			H::Out: Ord + codec::Codec,
+	where
+		H: Hasher,
+		H::Out: Ord + codec::Codec,
 	{
 		// since we need roots of all changes tries for the range begin..max
 		// => remote node can't use max block greater that one that we have passed
-		if remote_proof.max_block > request.max_block.0 || remote_proof.max_block < request.last_block.0 {
+		if remote_proof.max_block > request.max_block.0 ||
+			remote_proof.max_block < request.last_block.0
+		{
 			return Err(ClientError::ChangesTrieAccessFailed(format!(
 				"Invalid max_block used by the remote node: {}. Local: {}..{}..{}",
-				remote_proof.max_block, request.first_block.0, request.last_block.0, request.max_block.0,
-			)).into());
+				remote_proof.max_block,
+				request.first_block.0,
+				request.last_block.0,
+				request.max_block.0,
+			))
+			.into())
 		}
 
 		// check if remote node has responded with extra changes trie roots proofs
 		// all changes tries roots must be in range [request.first_block.0; request.tries_roots.0)
-		let is_extra_first_root = remote_proof.roots.keys().next()
-			.map(|first_root| *first_root < request.first_block.0
-				|| *first_root >= request.tries_roots.0)
+		let is_extra_first_root = remote_proof
+			.roots
+			.keys()
+			.next()
+			.map(|first_root| {
+				*first_root < request.first_block.0 || *first_root >= request.tries_roots.0
+			})
 			.unwrap_or(false);
-		let is_extra_last_root = remote_proof.roots.keys().next_back()
+		let is_extra_last_root = remote_proof
+			.roots
+			.keys()
+			.next_back()
 			.map(|last_root| *last_root >= request.tries_roots.0)
 			.unwrap_or(false);
 		if is_extra_first_root || is_extra_last_root {
@@ -112,11 +128,7 @@ impl<E, H, B: BlockT, S: BlockchainStorage<B>> LightDataChecker<E, H, B, S> {
 		let remote_roots_proof = remote_proof.roots_proof;
 		let remote_proof = remote_proof.proof;
 		if !remote_roots.is_empty() {
-			self.check_changes_tries_proof(
-				cht_size,
-				&remote_roots,
-				remote_roots_proof,
-			)?;
+			self.check_changes_tries_proof(cht_size, &remote_roots, remote_roots_proof)?;
 		}
 
 		// and now check the key changes proof + get the changes
@@ -125,7 +137,10 @@ impl<E, H, B: BlockT, S: BlockchainStorage<B>> LightDataChecker<E, H, B, S> {
 		for config_range in &request.changes_trie_configs {
 			let result_range = key_changes_proof_check_with_db::<H, _>(
 				ChangesTrieConfigurationRange {
-					config: config_range.config.as_ref().ok_or(ClientError::ChangesTriesNotSupported)?,
+					config: config_range
+						.config
+						.as_ref()
+						.ok_or(ClientError::ChangesTriesNotSupported)?,
 					zero: config_range.zero.0,
 					end: config_range.end.map(|(n, _)| n),
 				},
@@ -141,7 +156,8 @@ impl<E, H, B: BlockT, S: BlockchainStorage<B>> LightDataChecker<E, H, B, S> {
 				},
 				remote_max_block,
 				request.storage_key.as_ref(),
-				&request.key)
+				&request.key,
+			)
 			.map_err(|err| ClientError::ChangesTrieAccessFailed(err))?;
 			result.extend(result_range);
 		}
@@ -156,9 +172,9 @@ impl<E, H, B: BlockT, S: BlockchainStorage<B>> LightDataChecker<E, H, B, S> {
 		remote_roots: &BTreeMap<NumberFor<B>, B::Hash>,
 		remote_roots_proof: StorageProof,
 	) -> ClientResult<()>
-		where
-			H: Hasher,
-			H::Out: Ord + codec::Codec,
+	where
+		H: Hasher,
+		H::Out: Ord + codec::Codec,
 	{
 		// all the checks are sharing the same storage
 		let storage = remote_roots_proof.into_memory_db();
@@ -166,52 +182,62 @@ impl<E, H, B: BlockT, S: BlockchainStorage<B>> LightDataChecker<E, H, B, S> {
 		// remote_roots.keys() are sorted => we can use this to group changes tries roots
 		// that are belongs to the same CHT
 		let blocks = remote_roots.keys().cloned();
-		cht::for_each_cht_group::<B::Header, _, _, _>(cht_size, blocks, |mut storage, _, cht_blocks| {
-			// get local changes trie CHT root for given CHT
-			// it should be there, because it is never pruned AND request has been composed
-			// when required header has been pruned (=> replaced with CHT)
-			let first_block = cht_blocks.first().cloned()
-				.expect("for_each_cht_group never calls callback with empty groups");
-			let local_cht_root = self.blockchain.storage().changes_trie_cht_root(cht_size, first_block)?
-				.ok_or(ClientError::InvalidCHTProof)?;
-
-			// check changes trie root for every block within CHT range
-			for block in cht_blocks {
-				// check if the proofs storage contains the root
-				// normally this happens in when the proving backend is created, but since
-				// we share the storage for multiple checks, do it here
-				let mut cht_root = H::Out::default();
-				cht_root.as_mut().copy_from_slice(local_cht_root.as_ref());
-				if !storage.contains(&cht_root, EMPTY_PREFIX) {
-					return Err(ClientError::InvalidCHTProof.into());
+		cht::for_each_cht_group::<B::Header, _, _, _>(
+			cht_size,
+			blocks,
+			|mut storage, _, cht_blocks| {
+				// get local changes trie CHT root for given CHT
+				// it should be there, because it is never pruned AND request has been composed
+				// when required header has been pruned (=> replaced with CHT)
+				let first_block = cht_blocks
+					.first()
+					.cloned()
+					.expect("for_each_cht_group never calls callback with empty groups");
+				let local_cht_root = self
+					.blockchain
+					.storage()
+					.changes_trie_cht_root(cht_size, first_block)?
+					.ok_or(ClientError::InvalidCHTProof)?;
+
+				// check changes trie root for every block within CHT range
+				for block in cht_blocks {
+					// check if the proofs storage contains the root
+					// normally this happens in when the proving backend is created, but since
+					// we share the storage for multiple checks, do it here
+					let mut cht_root = H::Out::default();
+					cht_root.as_mut().copy_from_slice(local_cht_root.as_ref());
+					if !storage.contains(&cht_root, EMPTY_PREFIX) {
+						return Err(ClientError::InvalidCHTProof.into())
+					}
+
+					// check proof for single changes trie root
+					let proving_backend = TrieBackend::new(storage, cht_root);
+					let remote_changes_trie_root = remote_roots[&block];
+					cht::check_proof_on_proving_backend::<B::Header, H>(
+						local_cht_root,
+						block,
+						remote_changes_trie_root,
+						&proving_backend,
+					)?;
+
+					// and return the storage to use in following checks
+					storage = proving_backend.into_storage();
 				}
 
-				// check proof for single changes trie root
-				let proving_backend = TrieBackend::new(storage, cht_root);
-				let remote_changes_trie_root = remote_roots[&block];
-				cht::check_proof_on_proving_backend::<B::Header, H>(
-					local_cht_root,
-					block,
-					remote_changes_trie_root,
-					&proving_backend,
-				)?;
-
-				// and return the storage to use in following checks
-				storage = proving_backend.into_storage();
-			}
-
-			Ok(storage)
-		}, storage)
+				Ok(storage)
+			},
+			storage,
+		)
 	}
 }
 
 impl<E, Block, H, S> FetchChecker<Block> for LightDataChecker<E, H, Block, S>
-	where
-		Block: BlockT,
-		E: CodeExecutor + Clone + 'static,
-		H: Hasher,
-		H::Out: Ord + codec::Codec + 'static,
-		S: BlockchainStorage<Block>,
+where
+	Block: BlockT,
+	E: CodeExecutor + Clone + 'static,
+	H: Hasher,
+	H::Out: Ord + codec::Codec + 'static,
+	S: BlockchainStorage<Block>,
 {
 	fn check_header_proof(
 		&self,
@@ -219,15 +245,16 @@ impl<E, Block, H, S> FetchChecker<Block> for LightDataChecker<E, H, Block, S>
 		remote_header: Option<Block::Header>,
 		remote_proof: StorageProof,
 	) -> ClientResult<Block::Header> {
-		let remote_header = remote_header.ok_or_else(||
-			ClientError::from(ClientError::InvalidCHTProof))?;
+		let remote_header =
+			remote_header.ok_or_else(|| ClientError::from(ClientError::InvalidCHTProof))?;
 		let remote_header_hash = remote_header.hash();
 		cht::check_proof::<Block::Header, H>(
 			request.cht_root,
 			request.block,
 			remote_header_hash,
 			remote_proof,
-		).map(|_| remote_header)
+		)
+		.map(|_| remote_header)
 	}
 
 	fn check_read_proof(
@@ -239,7 +266,8 @@ impl<E, Block, H, S> FetchChecker<Block> for LightDataChecker<E, H, Block, S>
 			convert_hash(request.header.state_root()),
 			remote_proof,
 			request.keys.iter(),
-		).map_err(|e| ClientError::from(e))
+		)
+		.map_err(|e| ClientError::from(e))
 	}
 
 	fn check_read_child_proof(
@@ -256,7 +284,8 @@ impl<E, Block, H, S> FetchChecker<Block> for LightDataChecker<E, H, Block, S>
 			remote_proof,
 			&child_info,
 			request.keys.iter(),
-		).map_err(|e| ClientError::from(e))
+		)
+		.map_err(|e| ClientError::from(e))
 	}
 
 	fn check_execution_proof(
@@ -275,7 +304,7 @@ impl<E, Block, H, S> FetchChecker<Block> for LightDataChecker<E, H, Block, S>
 	fn check_changes_proof(
 		&self,
 		request: &RemoteChangesRequest<Block::Header>,
-		remote_proof: ChangesProof<Block::Header>
+		remote_proof: ChangesProof<Block::Header>,
 	) -> ClientResult<Vec<(NumberFor<Block>, u32)>> {
 		self.check_changes_proof_with_cht_size(request, remote_proof, cht::size())
 	}
@@ -283,12 +312,11 @@ impl<E, Block, H, S> FetchChecker<Block> for LightDataChecker<E, H, Block, S>
 	fn check_body_proof(
 		&self,
 		request: &RemoteBodyRequest<Block::Header>,
-		body: Vec<Block::Extrinsic>
+		body: Vec<Block::Extrinsic>,
 	) -> ClientResult<Vec<Block::Extrinsic>> {
 		// TODO: #2621
-		let extrinsics_root = HashFor::<Block>::ordered_trie_root(
-			body.iter().map(Encode::encode).collect(),
-		);
+		let extrinsics_root =
+			HashFor::<Block>::ordered_trie_root(body.iter().map(Encode::encode).collect());
 		if *request.header.extrinsics_root() == extrinsics_root {
 			Ok(body)
 		} else {
@@ -297,7 +325,6 @@ impl<E, Block, H, S> FetchChecker<Block> for LightDataChecker<E, H, Block, S>
 				expected: extrinsics_root.to_string(),
 			})
 		}
-
 	}
 }
 
@@ -308,10 +335,18 @@ struct RootsStorage<'a, Number: AtLeast32Bit, Hash: 'a> {
 }
 
 impl<'a, H, Number, Hash> ChangesTrieRootsStorage<H, Number> for RootsStorage<'a, Number, Hash>
-	where
-		H: Hasher,
-		Number: std::fmt::Display + std::hash::Hash + Clone + AtLeast32Bit + Encode + Decode + Send + Sync + 'static,
-		Hash: 'a + Send + Sync + Clone + AsRef<[u8]>,
+where
+	H: Hasher,
+	Number: std::fmt::Display
+		+ std::hash::Hash
+		+ Clone
+		+ AtLeast32Bit
+		+ Encode
+		+ Decode
+		+ Send
+		+ Sync
+		+ 'static,
+	Hash: 'a + Send + Sync + Clone + AsRef<[u8]>,
 {
 	fn build_anchor(
 		&self,
@@ -329,7 +364,8 @@ impl<'a, H, Number, Hash> ChangesTrieRootsStorage<H, Number> for RootsStorage<'a
 		let root = if block < self.roots.0 {
 			self.prev_roots.get(&Number::unique_saturated_from(block)).cloned()
 		} else {
-			let index: Option<usize> = block.checked_sub(&self.roots.0).and_then(|index| index.checked_into());
+			let index: Option<usize> =
+				block.checked_sub(&self.roots.0).and_then(|index| index.checked_into());
 			index.and_then(|index| self.roots.1.get(index as usize).cloned())
 		};
 
diff --git a/client/light/src/lib.rs b/client/light/src/lib.rs
index e647b8743cc0..ed48c05258d0 100644
--- a/client/light/src/lib.rs
+++ b/client/light/src/lib.rs
@@ -18,16 +18,19 @@
 
 //! Light client components.
 
+use sp_core::traits::{CodeExecutor, SpawnNamed};
 use sp_runtime::traits::{Block as BlockT, HashFor};
 use std::sync::Arc;
-use sp_core::traits::{CodeExecutor, SpawnNamed};
 
 pub mod backend;
 pub mod blockchain;
 pub mod call_executor;
 pub mod fetcher;
 
-pub use {backend::*, blockchain::*, call_executor::*, fetcher::*};
+pub use backend::*;
+pub use blockchain::*;
+pub use call_executor::*;
+pub use fetcher::*;
 
 /// Create an instance of fetch data checker.
 pub fn new_fetch_checker<E, B: BlockT, S: BlockchainStorage<B>>(
@@ -35,8 +38,8 @@ pub fn new_fetch_checker<E, B: BlockT, S: BlockchainStorage<B>>(
 	executor: E,
 	spawn_handle: Box<dyn SpawnNamed>,
 ) -> LightDataChecker<E, HashFor<B>, B, S>
-	where
-		E: CodeExecutor,
+where
+	E: CodeExecutor,
 {
 	LightDataChecker::new(blockchain, executor, spawn_handle)
 }
@@ -48,9 +51,9 @@ pub fn new_light_blockchain<B: BlockT, S: BlockchainStorage<B>>(storage: S) -> A
 
 /// Create an instance of light client backend.
 pub fn new_light_backend<B, S>(blockchain: Arc<Blockchain<S>>) -> Arc<Backend<S, HashFor<B>>>
-	where
-		B: BlockT,
-		S: BlockchainStorage<B>,
+where
+	B: BlockT,
+	S: BlockchainStorage<B>,
 {
 	Arc::new(Backend::new(blockchain))
 }
diff --git a/client/network-gossip/src/bridge.rs b/client/network-gossip/src/bridge.rs
index fd9aac96c010..9871b7efb39a 100644
--- a/client/network-gossip/src/bridge.rs
+++ b/client/network-gossip/src/bridge.rs
@@ -16,13 +16,17 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::{Network, Validator};
-use crate::state_machine::{ConsensusGossip, TopicNotification, PERIODIC_MAINTENANCE_INTERVAL};
+use crate::{
+	state_machine::{ConsensusGossip, TopicNotification, PERIODIC_MAINTENANCE_INTERVAL},
+	Network, Validator,
+};
 
 use sc_network::{Event, ReputationChange};
 
-use futures::prelude::*;
-use futures::channel::mpsc::{channel, Sender, Receiver};
+use futures::{
+	channel::mpsc::{channel, Receiver, Sender},
+	prelude::*,
+};
 use libp2p::PeerId;
 use log::trace;
 use prometheus_endpoint::Registry;
@@ -74,7 +78,10 @@ impl<B: BlockT> GossipEngine<B> {
 		protocol: impl Into<Cow<'static, str>>,
 		validator: Arc<dyn Validator<B>>,
 		metrics_registry: Option<&Registry>,
-	) -> Self where B: 'static {
+	) -> Self
+	where
+		B: 'static,
+	{
 		let protocol = protocol.into();
 		let network_event_stream = network.event_stream();
 
@@ -99,11 +106,7 @@ impl<B: BlockT> GossipEngine<B> {
 	/// the message's topic. No validation is performed on the message, if the
 	/// message is already expired it should be dropped on the next garbage
 	/// collection.
-	pub fn register_gossip_message(
-		&mut self,
-		topic: B::Hash,
-		message: Vec<u8>,
-	) {
+	pub fn register_gossip_message(&mut self, topic: B::Hash, message: Vec<u8>) {
 		self.state_machine.register_message(topic, message);
 	}
 
@@ -113,9 +116,7 @@ impl<B: BlockT> GossipEngine<B> {
 	}
 
 	/// Get data of valid, incoming messages for a topic (but might have expired meanwhile).
-	pub fn messages_for(&mut self, topic: B::Hash)
-		-> Receiver<TopicNotification>
-	{
+	pub fn messages_for(&mut self, topic: B::Hash) -> Receiver<TopicNotification> {
 		let past_messages = self.state_machine.messages_for(topic).collect::<Vec<_>>();
 		// The channel length is not critical for correctness. By the implementation of `channel`
 		// each sender is guaranteed a single buffer slot, making it a non-rendezvous channel and
@@ -124,7 +125,7 @@ impl<B: BlockT> GossipEngine<B> {
 		// contains a single message.
 		let (mut tx, rx) = channel(usize::max(past_messages.len(), 10));
 
-		for notification in past_messages{
+		for notification in past_messages {
 			tx.try_send(notification)
 				.expect("receiver known to be live, and buffer size known to suffice; qed");
 		}
@@ -135,22 +136,12 @@ impl<B: BlockT> GossipEngine<B> {
 	}
 
 	/// Send all messages with given topic to a peer.
-	pub fn send_topic(
-		&mut self,
-		who: &PeerId,
-		topic: B::Hash,
-		force: bool
-	) {
+	pub fn send_topic(&mut self, who: &PeerId, topic: B::Hash, force: bool) {
 		self.state_machine.send_topic(&mut *self.network, who, topic, force)
 	}
 
 	/// Multicast a message to all peers.
-	pub fn gossip_message(
-		&mut self,
-		topic: B::Hash,
-		message: Vec<u8>,
-		force: bool,
-	) {
+	pub fn gossip_message(&mut self, topic: B::Hash, message: Vec<u8>, force: bool) {
 		self.state_machine.multicast(&mut *self.network, topic, message, force)
 	}
 
@@ -184,30 +175,33 @@ impl<B: BlockT> Future for GossipEngine<B> {
 						Poll::Ready(Some(event)) => match event {
 							Event::SyncConnected { remote } => {
 								this.network.add_set_reserved(remote, this.protocol.clone());
-							}
+							},
 							Event::SyncDisconnected { remote } => {
 								this.network.remove_set_reserved(remote, this.protocol.clone());
-							}
+							},
 							Event::NotificationStreamOpened { remote, protocol, role, .. } => {
 								if protocol != this.protocol {
-									continue;
+									continue
 								}
 								this.state_machine.new_peer(&mut *this.network, remote, role);
-							}
+							},
 							Event::NotificationStreamClosed { remote, protocol } => {
 								if protocol != this.protocol {
-									continue;
+									continue
 								}
 								this.state_machine.peer_disconnected(&mut *this.network, remote);
 							},
 							Event::NotificationsReceived { remote, messages } => {
-								let messages = messages.into_iter().filter_map(|(engine, data)| {
-									if engine == this.protocol {
-										Some(data.to_vec())
-									} else {
-										None
-									}
-								}).collect();
+								let messages = messages
+									.into_iter()
+									.filter_map(|(engine, data)| {
+										if engine == this.protocol {
+											Some(data.to_vec())
+										} else {
+											None
+										}
+									})
+									.collect();
 
 								let to_forward = this.state_machine.on_incoming(
 									&mut *this.network,
@@ -217,27 +211,25 @@ impl<B: BlockT> Future for GossipEngine<B> {
 
 								this.forwarding_state = ForwardingState::Busy(to_forward.into());
 							},
-							Event::Dht(_) => {}
-						}
+							Event::Dht(_) => {},
+						},
 						// The network event stream closed. Do the same for [`GossipValidator`].
 						Poll::Ready(None) => return Poll::Ready(()),
 						Poll::Pending => break,
 					}
-				}
+				},
 				ForwardingState::Busy(to_forward) => {
 					let (topic, notification) = match to_forward.pop_front() {
 						Some(n) => n,
 						None => {
 							this.forwarding_state = ForwardingState::Idle;
-							continue;
-						}
+							continue
+						},
 					};
 
 					let sinks = match this.message_sinks.get_mut(&topic) {
 						Some(sinks) => sinks,
-						None => {
-							continue;
-						},
+						None => continue,
 					};
 
 					// Make sure all sinks for the given topic are ready.
@@ -249,8 +241,8 @@ impl<B: BlockT> Future for GossipEngine<B> {
 							Poll::Pending => {
 								// Push back onto queue for later.
 								to_forward.push_front((topic, notification));
-								break 'outer;
-							}
+								break 'outer
+							},
 						}
 					}
 
@@ -259,7 +251,7 @@ impl<B: BlockT> Future for GossipEngine<B> {
 
 					if sinks.is_empty() {
 						this.message_sinks.remove(&topic);
-						continue;
+						continue
 					}
 
 					trace!(
@@ -271,18 +263,16 @@ impl<B: BlockT> Future for GossipEngine<B> {
 					for sink in sinks {
 						match sink.start_send(notification.clone()) {
 							Ok(()) => {},
-							Err(e) if e.is_full() => unreachable!(
-								"Previously ensured that all sinks are ready; qed.",
-							),
+							Err(e) if e.is_full() =>
+								unreachable!("Previously ensured that all sinks are ready; qed.",),
 							// Receiver got dropped. Will be removed in next iteration (See (1)).
 							Err(_) => {},
 						}
 					}
-				}
+				},
 			}
 		}
 
-
 		while let Poll::Ready(()) = this.periodic_maintenance_interval.poll_unpin(cx) {
 			this.periodic_maintenance_interval.reset(PERIODIC_MAINTENANCE_INTERVAL);
 			this.state_machine.tick(&mut *this.network);
@@ -299,17 +289,23 @@ impl<B: BlockT> Future for GossipEngine<B> {
 
 #[cfg(test)]
 mod tests {
-	use async_std::task::spawn;
+	use super::*;
 	use crate::{ValidationResult, ValidatorContext};
-	use futures::{channel::mpsc::{unbounded, UnboundedSender}, executor::{block_on, block_on_stream}, future::poll_fn};
+	use async_std::task::spawn;
+	use futures::{
+		channel::mpsc::{unbounded, UnboundedSender},
+		executor::{block_on, block_on_stream},
+		future::poll_fn,
+	};
 	use quickcheck::{Arbitrary, Gen, QuickCheck};
 	use sc_network::ObservedRole;
-	use sp_runtime::{testing::H256, traits::{Block as BlockT}};
-	use std::borrow::Cow;
-	use std::convert::TryInto;
-	use std::sync::{Arc, Mutex};
+	use sp_runtime::{testing::H256, traits::Block as BlockT};
+	use std::{
+		borrow::Cow,
+		convert::TryInto,
+		sync::{Arc, Mutex},
+	};
 	use substrate_test_runtime_client::runtime::Block;
-	use super::*;
 
 	#[derive(Clone, Default)]
 	struct TestNetwork {
@@ -329,18 +325,15 @@ mod tests {
 			Box::pin(rx)
 		}
 
-		fn report_peer(&self, _: PeerId, _: ReputationChange) {
-		}
+		fn report_peer(&self, _: PeerId, _: ReputationChange) {}
 
 		fn disconnect_peer(&self, _: PeerId, _: Cow<'static, str>) {
 			unimplemented!();
 		}
 
-		fn add_set_reserved(&self, _: PeerId, _: Cow<'static, str>) {
-		}
+		fn add_set_reserved(&self, _: PeerId, _: Cow<'static, str>) {}
 
-		fn remove_set_reserved(&self, _: PeerId, _: Cow<'static, str>) {
-		}
+		fn remove_set_reserved(&self, _: PeerId, _: Cow<'static, str>) {}
 
 		fn write_notification(&self, _: PeerId, _: Cow<'static, str>, _: Vec<u8>) {
 			unimplemented!();
@@ -405,32 +398,32 @@ mod tests {
 			None,
 		);
 
-		let mut event_sender = network.inner.lock()
-			.unwrap()
-			.event_senders
-			.pop()
-			.unwrap();
+		let mut event_sender = network.inner.lock().unwrap().event_senders.pop().unwrap();
 
 		// Register the remote peer.
-		event_sender.start_send(
-			Event::NotificationStreamOpened {
+		event_sender
+			.start_send(Event::NotificationStreamOpened {
 				remote: remote_peer.clone(),
 				protocol: protocol.clone(),
 				negotiated_fallback: None,
 				role: ObservedRole::Authority,
-			}
-		).expect("Event stream is unbounded; qed.");
+			})
+			.expect("Event stream is unbounded; qed.");
 
 		let messages = vec![vec![1], vec![2]];
-		let events = messages.iter().cloned().map(|m| {
-			Event::NotificationsReceived {
+		let events = messages
+			.iter()
+			.cloned()
+			.map(|m| Event::NotificationsReceived {
 				remote: remote_peer.clone(),
-				messages: vec![(protocol.clone(), m.into())]
-			}
-		}).collect::<Vec<_>>();
+				messages: vec![(protocol.clone(), m.into())],
+			})
+			.collect::<Vec<_>>();
 
 		// Send first event before subscribing.
-		event_sender.start_send(events[0].clone()).expect("Event stream is unbounded; qed.");
+		event_sender
+			.start_send(events[0].clone())
+			.expect("Event stream is unbounded; qed.");
 
 		let mut subscribers = vec![];
 		for _ in 0..2 {
@@ -438,13 +431,14 @@ mod tests {
 		}
 
 		// Send second event after subscribing.
-		event_sender.start_send(events[1].clone()).expect("Event stream is unbounded; qed.");
+		event_sender
+			.start_send(events[1].clone())
+			.expect("Event stream is unbounded; qed.");
 
 		spawn(gossip_engine);
 
-		let mut subscribers = subscribers.into_iter()
-			.map(|s| block_on_stream(s))
-			.collect::<Vec<_>>();
+		let mut subscribers =
+			subscribers.into_iter().map(|s| block_on_stream(s)).collect::<Vec<_>>();
 
 		// Expect each subscriber to receive both events.
 		for message in messages {
@@ -463,7 +457,7 @@ mod tests {
 	#[test]
 	fn forwarding_to_different_size_and_topic_channels() {
 		#[derive(Clone, Debug)]
-		struct ChannelLengthAndTopic{
+		struct ChannelLengthAndTopic {
 			length: usize,
 			topic: H256,
 		}
@@ -486,7 +480,7 @@ mod tests {
 			topic: H256,
 		}
 
-		impl Arbitrary for Message{
+		impl Arbitrary for Message {
 			fn arbitrary(g: &mut Gen) -> Self {
 				let possible_topics = (0..10).collect::<Vec<u64>>();
 				Self {
@@ -517,13 +511,16 @@ mod tests {
 			let remote_peer = PeerId::random();
 			let network = TestNetwork::default();
 
-			let num_channels_per_topic = channels.iter()
-				.fold(HashMap::new(), |mut acc, ChannelLengthAndTopic { topic, .. }| {
+			let num_channels_per_topic = channels.iter().fold(
+				HashMap::new(),
+				|mut acc, ChannelLengthAndTopic { topic, .. }| {
 					acc.entry(topic).and_modify(|e| *e += 1).or_insert(1);
 					acc
-				});
+				},
+			);
 
-			let expected_msgs_per_topic_all_chan = notifications.iter()
+			let expected_msgs_per_topic_all_chan = notifications
+				.iter()
 				.fold(HashMap::new(), |mut acc, messages| {
 					for message in messages {
 						acc.entry(message.topic).and_modify(|e| *e += 1).or_insert(1);
@@ -545,12 +542,12 @@ mod tests {
 			);
 
 			// Create channels.
-			let (txs, mut rxs) = channels.iter()
-				.map(|ChannelLengthAndTopic { length, topic }| {
-					(topic.clone(), channel(*length))
-				})
+			let (txs, mut rxs) = channels
+				.iter()
+				.map(|ChannelLengthAndTopic { length, topic }| (topic.clone(), channel(*length)))
 				.fold((vec![], vec![]), |mut acc, (topic, (tx, rx))| {
-					acc.0.push((topic, tx)); acc.1.push((topic, rx));
+					acc.0.push((topic, tx));
+					acc.1.push((topic, rx));
 					acc
 				});
 
@@ -560,30 +557,27 @@ mod tests {
 					Some(entry) => entry.push(tx),
 					None => {
 						gossip_engine.message_sinks.insert(topic, vec![tx]);
-					}
+					},
 				}
 			}
 
-
-			let mut event_sender = network.inner.lock()
-				.unwrap()
-				.event_senders
-				.pop()
-				.unwrap();
+			let mut event_sender = network.inner.lock().unwrap().event_senders.pop().unwrap();
 
 			// Register the remote peer.
-			event_sender.start_send(
-				Event::NotificationStreamOpened {
+			event_sender
+				.start_send(Event::NotificationStreamOpened {
 					remote: remote_peer.clone(),
 					protocol: protocol.clone(),
 					negotiated_fallback: None,
 					role: ObservedRole::Authority,
-				}
-			).expect("Event stream is unbounded; qed.");
+				})
+				.expect("Event stream is unbounded; qed.");
 
 			// Send messages into the network event stream.
 			for (i_notification, messages) in notifications.iter().enumerate() {
-				let messages = messages.into_iter().enumerate()
+				let messages = messages
+					.into_iter()
+					.enumerate()
 					.map(|(i_message, Message { topic })| {
 						// Embed the topic in the first 256 bytes of the message to be extracted by
 						// the [`TestValidator`] later on.
@@ -595,12 +589,15 @@ mod tests {
 						message.push(i_message.try_into().unwrap());
 
 						(protocol.clone(), message.into())
-					}).collect();
-
-				event_sender.start_send(Event::NotificationsReceived {
-					remote: remote_peer.clone(),
-					messages,
-				}).expect("Event stream is unbounded; qed.");
+					})
+					.collect();
+
+				event_sender
+					.start_send(Event::NotificationsReceived {
+						remote: remote_peer.clone(),
+						messages,
+					})
+					.expect("Event stream is unbounded; qed.");
 			}
 
 			let mut received_msgs_per_topic_all_chan = HashMap::<H256, _>::new();
@@ -621,19 +618,19 @@ mod tests {
 						match rx.poll_next_unpin(cx) {
 							Poll::Ready(Some(_)) => {
 								progress = true;
-								received_msgs_per_topic_all_chan.entry(*topic)
+								received_msgs_per_topic_all_chan
+									.entry(*topic)
 									.and_modify(|e| *e += 1)
 									.or_insert(1);
 							},
-							Poll::Ready(None) => unreachable!(
-								"Sender side of channel is never dropped",
-							),
+							Poll::Ready(None) =>
+								unreachable!("Sender side of channel is never dropped",),
 							Poll::Pending => {},
 						}
 					}
 
 					if !progress {
-						break;
+						break
 					}
 				}
 				Poll::Ready(())
@@ -655,10 +652,10 @@ mod tests {
 		}
 
 		// Past regressions.
-		prop(vec![], vec![vec![Message{ topic: H256::default()}]]);
+		prop(vec![], vec![vec![Message { topic: H256::default() }]]);
 		prop(
-			vec![ChannelLengthAndTopic {length: 71, topic: H256::default()}],
-			vec![vec![Message{ topic: H256::default()}]],
+			vec![ChannelLengthAndTopic { length: 71, topic: H256::default() }],
+			vec![vec![Message { topic: H256::default() }]],
 		);
 
 		QuickCheck::new().quickcheck(prop as fn(_, _))
diff --git a/client/network-gossip/src/lib.rs b/client/network-gossip/src/lib.rs
index f8b6e8f0c2fd..45fc19d6ef8a 100644
--- a/client/network-gossip/src/lib.rs
+++ b/client/network-gossip/src/lib.rs
@@ -61,13 +61,15 @@
 //! These status packets will typically contain light pieces of information
 //! used to inform peers of a current view of protocol state.
 
-pub use self::bridge::GossipEngine;
-pub use self::state_machine::TopicNotification;
-pub use self::validator::{DiscardAll, MessageIntent, Validator, ValidatorContext, ValidationResult};
+pub use self::{
+	bridge::GossipEngine,
+	state_machine::TopicNotification,
+	validator::{DiscardAll, MessageIntent, ValidationResult, Validator, ValidatorContext},
+};
 
 use futures::prelude::*;
 use sc_network::{multiaddr, Event, ExHashT, NetworkService, PeerId, ReputationChange};
-use sp_runtime::{traits::Block as BlockT};
+use sp_runtime::traits::Block as BlockT;
 use std::{borrow::Cow, iter, pin::Pin, sync::Arc};
 
 mod bridge;
@@ -111,18 +113,23 @@ impl<B: BlockT, H: ExHashT> Network<B> for Arc<NetworkService<B, H>> {
 	}
 
 	fn add_set_reserved(&self, who: PeerId, protocol: Cow<'static, str>) {
-		let addr = iter::once(multiaddr::Protocol::P2p(who.into()))
-			.collect::<multiaddr::Multiaddr>();
-		let result = NetworkService::add_peers_to_reserved_set(self, protocol, iter::once(addr).collect());
+		let addr =
+			iter::once(multiaddr::Protocol::P2p(who.into())).collect::<multiaddr::Multiaddr>();
+		let result =
+			NetworkService::add_peers_to_reserved_set(self, protocol, iter::once(addr).collect());
 		if let Err(err) = result {
 			log::error!(target: "gossip", "add_set_reserved failed: {}", err);
 		}
 	}
 
 	fn remove_set_reserved(&self, who: PeerId, protocol: Cow<'static, str>) {
-		let addr = iter::once(multiaddr::Protocol::P2p(who.into()))
-			.collect::<multiaddr::Multiaddr>();
-		let result = NetworkService::remove_peers_from_reserved_set(self, protocol, iter::once(addr).collect());
+		let addr =
+			iter::once(multiaddr::Protocol::P2p(who.into())).collect::<multiaddr::Multiaddr>();
+		let result = NetworkService::remove_peers_from_reserved_set(
+			self,
+			protocol,
+			iter::once(addr).collect(),
+		);
 		if let Err(err) = result {
 			log::error!(target: "gossip", "remove_set_reserved failed: {}", err);
 		}
diff --git a/client/network-gossip/src/state_machine.rs b/client/network-gossip/src/state_machine.rs
index ea1a33658598..5cda52b9db49 100644
--- a/client/network-gossip/src/state_machine.rs
+++ b/client/network-gossip/src/state_machine.rs
@@ -16,18 +16,20 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::{Network, MessageIntent, Validator, ValidatorContext, ValidationResult};
+use crate::{MessageIntent, Network, ValidationResult, Validator, ValidatorContext};
 
-use std::borrow::Cow;
-use std::collections::{HashMap, HashSet};
-use std::sync::Arc;
-use std::iter;
-use std::time;
-use lru::LruCache;
 use libp2p::PeerId;
+use lru::LruCache;
 use prometheus_endpoint::{register, Counter, PrometheusError, Registry, U64};
-use sp_runtime::traits::{Block as BlockT, Hash, HashFor};
 use sc_network::ObservedRole;
+use sp_runtime::traits::{Block as BlockT, Hash, HashFor};
+use std::{
+	borrow::Cow,
+	collections::{HashMap, HashSet},
+	iter,
+	sync::Arc,
+	time,
+};
 use wasm_timer::Instant;
 
 // FIXME: Add additional spam/DoS attack protection: https://github.com/paritytech/substrate/issues/1115
@@ -87,17 +89,13 @@ impl<'g, 'p, B: BlockT> ValidatorContext<B> for NetworkContext<'g, 'p, B> {
 
 	/// Broadcast a message to all peers that have not received it previously.
 	fn broadcast_message(&mut self, topic: B::Hash, message: Vec<u8>, force: bool) {
-		self.gossip.multicast(
-			self.network,
-			topic,
-			message,
-			force,
-		);
+		self.gossip.multicast(self.network, topic, message, force);
 	}
 
 	/// Send addressed message to a peer.
 	fn send_message(&mut self, who: &PeerId, message: Vec<u8>) {
-		self.network.write_notification(who.clone(), self.gossip.protocol.clone(), message);
+		self.network
+			.write_notification(who.clone(), self.gossip.protocol.clone(), message);
 	}
 
 	/// Send all messages with given topic to a peer.
@@ -114,8 +112,9 @@ fn propagate<'a, B: BlockT, I>(
 	peers: &mut HashMap<PeerId, PeerConsensus<B::Hash>>,
 	validator: &Arc<dyn Validator<B>>,
 )
-	// (msg_hash, topic, message)
-	where I: Clone + IntoIterator<Item=(&'a B::Hash, &'a B::Hash, &'a Vec<u8>)>,
+// (msg_hash, topic, message)
+where
+	I: Clone + IntoIterator<Item = (&'a B::Hash, &'a B::Hash, &'a Vec<u8>)>,
 {
 	let mut message_allowed = validator.message_allowed();
 
@@ -124,7 +123,7 @@ fn propagate<'a, B: BlockT, I>(
 			let intent = match intent {
 				MessageIntent::Broadcast { .. } =>
 					if peer.known_messages.contains(&message_hash) {
-						continue;
+						continue
 					} else {
 						MessageIntent::Broadcast
 					},
@@ -140,7 +139,7 @@ fn propagate<'a, B: BlockT, I>(
 			};
 
 			if !message_allowed(id, intent, &topic, &message) {
-				continue;
+				continue
 			}
 
 			peer.known_messages.insert(message_hash.clone());
@@ -180,7 +179,7 @@ impl<B: BlockT> ConsensusGossip<B> {
 			Some(Err(e)) => {
 				tracing::debug!(target: "gossip", "Failed to register metrics: {:?}", e);
 				None
-			}
+			},
 			None => None,
 		};
 
@@ -204,9 +203,7 @@ impl<B: BlockT> ConsensusGossip<B> {
 			?role,
 			"Registering peer",
 		);
-		self.peers.insert(who.clone(), PeerConsensus {
-			known_messages: HashSet::new(),
-		});
+		self.peers.insert(who.clone(), PeerConsensus { known_messages: HashSet::new() });
 
 		let validator = self.validator.clone();
 		let mut context = NetworkContext { gossip: self, network };
@@ -221,12 +218,7 @@ impl<B: BlockT> ConsensusGossip<B> {
 		sender: Option<PeerId>,
 	) {
 		if self.known_messages.put(message_hash.clone(), ()).is_none() {
-			self.messages.push(MessageEntry {
-				message_hash,
-				topic,
-				message,
-				sender,
-			});
+			self.messages.push(MessageEntry { message_hash, topic, message, sender });
 
 			if let Some(ref metrics) = self.metrics {
 				metrics.registered_messages.inc();
@@ -239,11 +231,7 @@ impl<B: BlockT> ConsensusGossip<B> {
 	/// the message's topic. No validation is performed on the message, if the
 	/// message is already expired it should be dropped on the next garbage
 	/// collection.
-	pub fn register_message(
-		&mut self,
-		topic: B::Hash,
-		message: Vec<u8>,
-	) {
+	pub fn register_message(&mut self, topic: B::Hash, message: Vec<u8>) {
 		let message_hash = HashFor::<B>::hash(&message[..]);
 		self.register_message_hashed(message_hash, topic, message, None);
 	}
@@ -267,7 +255,9 @@ impl<B: BlockT> ConsensusGossip<B> {
 
 	/// Rebroadcast all messages to all peers.
 	fn rebroadcast(&mut self, network: &mut dyn Network<B>) {
-		let messages = self.messages.iter()
+		let messages = self
+			.messages
+			.iter()
 			.map(|entry| (&entry.message_hash, &entry.topic, &entry.message));
 		propagate(
 			network,
@@ -275,20 +265,28 @@ impl<B: BlockT> ConsensusGossip<B> {
 			messages,
 			MessageIntent::PeriodicRebroadcast,
 			&mut self.peers,
-			&self.validator
+			&self.validator,
 		);
 	}
 
 	/// Broadcast all messages with given topic.
 	pub fn broadcast_topic(&mut self, network: &mut dyn Network<B>, topic: B::Hash, force: bool) {
-		let messages = self.messages.iter()
-			.filter_map(|entry|
-				if entry.topic == topic {
-					Some((&entry.message_hash, &entry.topic, &entry.message))
-				} else { None }
-			);
+		let messages = self.messages.iter().filter_map(|entry| {
+			if entry.topic == topic {
+				Some((&entry.message_hash, &entry.topic, &entry.message))
+			} else {
+				None
+			}
+		});
 		let intent = if force { MessageIntent::ForcedBroadcast } else { MessageIntent::Broadcast };
-		propagate(network, self.protocol.clone(), messages, intent, &mut self.peers, &self.validator);
+		propagate(
+			network,
+			self.protocol.clone(),
+			messages,
+			intent,
+			&mut self.peers,
+			&self.validator,
+		);
 	}
 
 	/// Prune old or no longer relevant consensus messages. Provide a predicate
@@ -298,8 +296,7 @@ impl<B: BlockT> ConsensusGossip<B> {
 		let before = self.messages.len();
 
 		let mut message_expired = self.validator.message_expired();
-		self.messages
-			.retain(|entry| !message_expired(entry.topic, &entry.message));
+		self.messages.retain(|entry| !message_expired(entry.topic, &entry.message));
 
 		let expired_messages = before - self.messages.len();
 
@@ -323,10 +320,13 @@ impl<B: BlockT> ConsensusGossip<B> {
 
 	/// Get valid messages received in the past for a topic (might have expired meanwhile).
 	pub fn messages_for(&mut self, topic: B::Hash) -> impl Iterator<Item = TopicNotification> + '_ {
-		self.messages.iter().filter(move |e| e.topic == topic).map(|entry| TopicNotification {
-			message: entry.message.clone(),
-			sender: entry.sender.clone(),
-		})
+		self.messages
+			.iter()
+			.filter(move |e| e.topic == topic)
+			.map(|entry| TopicNotification {
+				message: entry.message.clone(),
+				sender: entry.sender.clone(),
+			})
 	}
 
 	/// Register incoming messages and return the ones that are new and valid (according to a gossip
@@ -360,7 +360,7 @@ impl<B: BlockT> ConsensusGossip<B> {
 					"Ignored already known message",
 				);
 				network.report_peer(who.clone(), rep::DUPLICATE_GOSSIP);
-				continue;
+				continue
 			}
 
 			// validate the message
@@ -380,7 +380,7 @@ impl<B: BlockT> ConsensusGossip<B> {
 						protocol = %self.protocol,
 						"Discard message from peer",
 					);
-					continue;
+					continue
 				},
 			};
 
@@ -393,24 +393,19 @@ impl<B: BlockT> ConsensusGossip<B> {
 						protocol = %self.protocol,
 						"Got message from unregistered peer",
 					);
-					continue;
-				}
+					continue
+				},
 			};
 
 			network.report_peer(who.clone(), rep::GOSSIP_SUCCESS);
 			peer.known_messages.insert(message_hash);
-			to_forward.push((topic, TopicNotification {
-				message: message.clone(),
-				sender: Some(who.clone())
-			}));
+			to_forward.push((
+				topic,
+				TopicNotification { message: message.clone(), sender: Some(who.clone()) },
+			));
 
 			if keep {
-				self.register_message_hashed(
-					message_hash,
-					topic,
-					message,
-					Some(who.clone()),
-				);
+				self.register_message_hashed(message_hash, topic, message, Some(who.clone()));
 			}
 		}
 
@@ -423,24 +418,21 @@ impl<B: BlockT> ConsensusGossip<B> {
 		network: &mut dyn Network<B>,
 		who: &PeerId,
 		topic: B::Hash,
-		force: bool
+		force: bool,
 	) {
 		let mut message_allowed = self.validator.message_allowed();
 
 		if let Some(ref mut peer) = self.peers.get_mut(who) {
 			for entry in self.messages.iter().filter(|m| m.topic == topic) {
-				let intent = if force {
-					MessageIntent::ForcedBroadcast
-				} else {
-					MessageIntent::Broadcast
-				};
+				let intent =
+					if force { MessageIntent::ForcedBroadcast } else { MessageIntent::Broadcast };
 
 				if !force && peer.known_messages.contains(&entry.message_hash) {
-					continue;
+					continue
 				}
 
 				if !message_allowed(who, intent, &entry.topic, &entry.message) {
-					continue;
+					continue
 				}
 
 				peer.known_messages.insert(entry.message_hash.clone());
@@ -452,7 +444,11 @@ impl<B: BlockT> ConsensusGossip<B> {
 					?entry.message,
 					"Sending topic message",
 				);
-				network.write_notification(who.clone(), self.protocol.clone(), entry.message.clone());
+				network.write_notification(
+					who.clone(),
+					self.protocol.clone(),
+					entry.message.clone(),
+				);
 			}
 		}
 	}
@@ -474,18 +470,13 @@ impl<B: BlockT> ConsensusGossip<B> {
 			iter::once((&message_hash, &topic, &message)),
 			intent,
 			&mut self.peers,
-			&self.validator
+			&self.validator,
 		);
 	}
 
 	/// Send addressed message to a peer. The message is not kept or multicast
 	/// later on.
-	pub fn send_message(
-		&mut self,
-		network: &mut dyn Network<B>,
-		who: &PeerId,
-		message: Vec<u8>,
-	) {
+	pub fn send_message(&mut self, network: &mut dyn Network<B>, who: &PeerId, message: Vec<u8>) {
 		let peer = match self.peers.get_mut(who) {
 			None => return,
 			Some(peer) => peer,
@@ -534,11 +525,15 @@ impl Metrics {
 
 #[cfg(test)]
 mod tests {
+	use super::*;
 	use futures::prelude::*;
 	use sc_network::{Event, ReputationChange};
-	use sp_runtime::testing::{H256, Block as RawBlock, ExtrinsicWrapper};
-	use std::{borrow::Cow, pin::Pin, sync::{Arc, Mutex}};
-	use super::*;
+	use sp_runtime::testing::{Block as RawBlock, ExtrinsicWrapper, H256};
+	use std::{
+		borrow::Cow,
+		pin::Pin,
+		sync::{Arc, Mutex},
+	};
 
 	type Block = RawBlock<ExtrinsicWrapper<u64>>;
 
@@ -552,7 +547,7 @@ mod tests {
 					sender: None,
 				});
 			}
-		}
+		};
 	}
 
 	struct AllowAll;
@@ -568,7 +563,7 @@ mod tests {
 	}
 
 	struct DiscardAll;
-	impl Validator<Block> for DiscardAll{
+	impl Validator<Block> for DiscardAll {
 		fn validate(
 			&self,
 			_context: &mut dyn ValidatorContext<Block>,
@@ -602,11 +597,9 @@ mod tests {
 			unimplemented!();
 		}
 
-		fn add_set_reserved(&self, _: PeerId, _: Cow<'static, str>) {
-		}
+		fn add_set_reserved(&self, _: PeerId, _: Cow<'static, str>) {}
 
-		fn remove_set_reserved(&self, _: PeerId, _: Cow<'static, str>) {
-		}
+		fn remove_set_reserved(&self, _: PeerId, _: Cow<'static, str>) {}
 
 		fn write_notification(&self, _: PeerId, _: Cow<'static, str>, _: Vec<u8>) {
 			unimplemented!();
@@ -677,7 +670,7 @@ mod tests {
 
 		assert_eq!(
 			consensus.messages_for(topic).next(),
-			Some(TopicNotification { message: message, sender: None }),
+			Some(TopicNotification { message, sender: None }),
 		);
 	}
 
@@ -712,15 +705,12 @@ mod tests {
 	#[test]
 	fn on_incoming_ignores_discarded_messages() {
 		let to_forward = ConsensusGossip::<Block>::new(Arc::new(DiscardAll), "/foo".into(), None)
-			.on_incoming(
-				&mut NoOpNetwork::default(),
-				PeerId::random(),
-				vec![vec![1, 2, 3]],
-			);
+			.on_incoming(&mut NoOpNetwork::default(), PeerId::random(), vec![vec![1, 2, 3]]);
 
 		assert!(
 			to_forward.is_empty(),
-			"Expected `on_incoming` to ignore discarded message but got {:?}", to_forward,
+			"Expected `on_incoming` to ignore discarded message but got {:?}",
+			to_forward,
 		);
 	}
 
diff --git a/client/network-gossip/src/validator.rs b/client/network-gossip/src/validator.rs
index 4b5440c1a06f..9a2652d03f64 100644
--- a/client/network-gossip/src/validator.rs
+++ b/client/network-gossip/src/validator.rs
@@ -26,15 +26,14 @@ pub trait Validator<B: BlockT>: Send + Sync {
 	}
 
 	/// New connection is dropped.
-	fn peer_disconnected(&self, _context: &mut dyn ValidatorContext<B>, _who: &PeerId) {
-	}
+	fn peer_disconnected(&self, _context: &mut dyn ValidatorContext<B>, _who: &PeerId) {}
 
 	/// Validate consensus message.
 	fn validate(
 		&self,
 		context: &mut dyn ValidatorContext<B>,
 		sender: &PeerId,
-		data: &[u8]
+		data: &[u8],
 	) -> ValidationResult<B::Hash>;
 
 	/// Produce a closure for validating messages on a given topic.
@@ -43,7 +42,9 @@ pub trait Validator<B: BlockT>: Send + Sync {
 	}
 
 	/// Produce a closure for filtering egress messages.
-	fn message_allowed<'a>(&'a self) -> Box<dyn FnMut(&PeerId, MessageIntent, &B::Hash, &[u8]) -> bool + 'a> {
+	fn message_allowed<'a>(
+		&'a self,
+	) -> Box<dyn FnMut(&PeerId, MessageIntent, &B::Hash, &[u8]) -> bool + 'a> {
 		Box::new(move |_who, _intent, _topic, _data| true)
 	}
 }
@@ -99,7 +100,9 @@ impl<B: BlockT> Validator<B> for DiscardAll {
 		Box::new(move |_topic, _data| true)
 	}
 
-	fn message_allowed<'a>(&'a self) -> Box<dyn FnMut(&PeerId, MessageIntent, &B::Hash, &[u8]) -> bool + 'a> {
+	fn message_allowed<'a>(
+		&'a self,
+	) -> Box<dyn FnMut(&PeerId, MessageIntent, &B::Hash, &[u8]) -> bool + 'a> {
 		Box::new(move |_who, _intent, _topic, _data| false)
 	}
 }
diff --git a/client/network/build.rs b/client/network/build.rs
index 0eea622e8757..6e5b83d4e58a 100644
--- a/client/network/build.rs
+++ b/client/network/build.rs
@@ -1,8 +1,5 @@
-const PROTOS: &[&str] = &[
-	"src/schema/api.v1.proto",
-	"src/schema/light.v1.proto",
-	"src/schema/bitswap.v1.2.0.proto",
-];
+const PROTOS: &[&str] =
+	&["src/schema/api.v1.proto", "src/schema/light.v1.proto", "src/schema/bitswap.v1.2.0.proto"];
 
 fn main() {
 	prost_build::compile_protos(PROTOS, &["src/schema"]).unwrap();
diff --git a/client/network/src/behaviour.rs b/client/network/src/behaviour.rs
index 576c49d1da36..37dfc0cf99c2 100644
--- a/client/network/src/behaviour.rs
+++ b/client/network/src/behaviour.rs
@@ -17,27 +17,33 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{
-	config::ProtocolId,
 	bitswap::Bitswap,
+	config::ProtocolId,
 	discovery::{DiscoveryBehaviour, DiscoveryConfig, DiscoveryOut},
+	light_client_requests, peer_info,
 	protocol::{message::Roles, CustomMessageOutcome, NotificationsSink, Protocol},
-	peer_info, request_responses, light_client_requests,
-	ObservedRole, DhtEvent,
+	request_responses, DhtEvent, ObservedRole,
 };
 
 use bytes::Bytes;
 use futures::{channel::oneshot, stream::StreamExt};
-use libp2p::NetworkBehaviour;
-use libp2p::core::{Multiaddr, PeerId, PublicKey};
-use libp2p::identify::IdentifyInfo;
-use libp2p::kad::record;
-use libp2p::swarm::{
-	NetworkBehaviourAction, NetworkBehaviourEventProcess, PollParameters, toggle::Toggle
+use libp2p::{
+	core::{Multiaddr, PeerId, PublicKey},
+	identify::IdentifyInfo,
+	kad::record,
+	swarm::{toggle::Toggle, NetworkBehaviourAction, NetworkBehaviourEventProcess, PollParameters},
+	NetworkBehaviour,
 };
 use log::debug;
 use prost::Message;
-use sp_consensus::{BlockOrigin, import_queue::{IncomingBlock, Origin}};
-use sp_runtime::{traits::{Block as BlockT, NumberFor}, Justifications};
+use sp_consensus::{
+	import_queue::{IncomingBlock, Origin},
+	BlockOrigin,
+};
+use sp_runtime::{
+	traits::{Block as BlockT, NumberFor},
+	Justifications,
+};
 use std::{
 	borrow::Cow,
 	collections::{HashSet, VecDeque},
@@ -47,8 +53,7 @@ use std::{
 };
 
 pub use crate::request_responses::{
-	ResponseFailure, InboundFailure, RequestFailure, OutboundFailure, RequestId,
-	IfDisconnected
+	IfDisconnected, InboundFailure, OutboundFailure, RequestFailure, RequestId, ResponseFailure,
 };
 
 /// General behaviour of the network. Combines all protocols together.
@@ -210,8 +215,9 @@ impl<B: BlockT> Behaviour<B> {
 			peer_info: peer_info::PeerInfoBehaviour::new(user_agent, local_public_key),
 			discovery: disco_config.finish(),
 			bitswap: bitswap.into(),
-			request_responses:
-				request_responses::RequestResponsesBehaviour::new(request_response_protocols.into_iter())?,
+			request_responses: request_responses::RequestResponsesBehaviour::new(
+				request_response_protocols.into_iter(),
+			)?,
 			light_client_request_sender,
 			events: VecDeque::new(),
 			block_request_protocol_name,
@@ -233,7 +239,9 @@ impl<B: BlockT> Behaviour<B> {
 	///
 	/// Identifies Kademlia instances by their [`ProtocolId`] and kbuckets by the base 2 logarithm
 	/// of their lower bound.
-	pub fn num_entries_per_kbucket(&mut self) -> impl ExactSizeIterator<Item = (&ProtocolId, Vec<(u32, usize)>)> {
+	pub fn num_entries_per_kbucket(
+		&mut self,
+	) -> impl ExactSizeIterator<Item = (&ProtocolId, Vec<(u32, usize)>)> {
 		self.discovery.num_entries_per_kbucket()
 	}
 
@@ -243,7 +251,9 @@ impl<B: BlockT> Behaviour<B> {
 	}
 
 	/// Returns the total size in bytes of all the records in the Kademlia record stores.
-	pub fn kademlia_records_total_size(&mut self) -> impl ExactSizeIterator<Item = (&ProtocolId, usize)> {
+	pub fn kademlia_records_total_size(
+		&mut self,
+	) -> impl ExactSizeIterator<Item = (&ProtocolId, usize)> {
 		self.discovery.kademlia_records_total_size()
 	}
 
@@ -265,7 +275,8 @@ impl<B: BlockT> Behaviour<B> {
 		pending_response: oneshot::Sender<Result<Vec<u8>, RequestFailure>>,
 		connect: IfDisconnected,
 	) {
-		self.request_responses.send_request(target, protocol, request, pending_response, connect)
+		self.request_responses
+			.send_request(target, protocol, request, pending_response, connect)
 	}
 
 	/// Returns a shared reference to the user protocol.
@@ -307,21 +318,20 @@ fn reported_roles_to_observed_role(roles: Roles) -> ObservedRole {
 	}
 }
 
-impl<B: BlockT> NetworkBehaviourEventProcess<void::Void> for
-Behaviour<B> {
+impl<B: BlockT> NetworkBehaviourEventProcess<void::Void> for Behaviour<B> {
 	fn inject_event(&mut self, event: void::Void) {
 		void::unreachable(event)
 	}
 }
 
-impl<B: BlockT> NetworkBehaviourEventProcess<CustomMessageOutcome<B>> for
-Behaviour<B> {
+impl<B: BlockT> NetworkBehaviourEventProcess<CustomMessageOutcome<B>> for Behaviour<B> {
 	fn inject_event(&mut self, event: CustomMessageOutcome<B>) {
 		match event {
 			CustomMessageOutcome::BlockImport(origin, blocks) =>
 				self.events.push_back(BehaviourOut::BlockImport(origin, blocks)),
-			CustomMessageOutcome::JustificationImport(origin, hash, nb, justification) =>
-				self.events.push_back(BehaviourOut::JustificationImport(origin, hash, nb, justification)),
+			CustomMessageOutcome::JustificationImport(origin, hash, nb, justification) => self
+				.events
+				.push_back(BehaviourOut::JustificationImport(origin, hash, nb, justification)),
 			CustomMessageOutcome::BlockRequest { target, request, pending_response } => {
 				let mut buf = Vec::with_capacity(request.encoded_len());
 				if let Err(err) = request.encode(&mut buf) {
@@ -334,7 +344,11 @@ Behaviour<B> {
 				}
 
 				self.request_responses.send_request(
-					&target, &self.block_request_protocol_name, buf, pending_response, IfDisconnected::ImmediateError,
+					&target,
+					&self.block_request_protocol_name,
+					buf,
+					pending_response,
+					IfDisconnected::ImmediateError,
 				);
 			},
 			CustomMessageOutcome::StateRequest { target, request, pending_response } => {
@@ -349,11 +363,19 @@ Behaviour<B> {
 				}
 
 				self.request_responses.send_request(
-					&target, &self.state_request_protocol_name, buf, pending_response, IfDisconnected::ImmediateError,
+					&target,
+					&self.state_request_protocol_name,
+					buf,
+					pending_response,
+					IfDisconnected::ImmediateError,
 				);
 			},
 			CustomMessageOutcome::NotificationStreamOpened {
-				remote, protocol, negotiated_fallback, roles, notifications_sink
+				remote,
+				protocol,
+				negotiated_fallback,
+				roles,
+				notifications_sink,
 			} => {
 				self.events.push_back(BehaviourOut::NotificationStreamOpened {
 					remote,
@@ -363,32 +385,33 @@ Behaviour<B> {
 					notifications_sink: notifications_sink.clone(),
 				});
 			},
-			CustomMessageOutcome::NotificationStreamReplaced { remote, protocol, notifications_sink } =>
-				self.events.push_back(BehaviourOut::NotificationStreamReplaced {
-					remote,
-					protocol,
-					notifications_sink,
-				}),
-			CustomMessageOutcome::NotificationStreamClosed { remote, protocol } =>
-				self.events.push_back(BehaviourOut::NotificationStreamClosed {
-					remote,
-					protocol,
-				}),
+			CustomMessageOutcome::NotificationStreamReplaced {
+				remote,
+				protocol,
+				notifications_sink,
+			} => self.events.push_back(BehaviourOut::NotificationStreamReplaced {
+				remote,
+				protocol,
+				notifications_sink,
+			}),
+			CustomMessageOutcome::NotificationStreamClosed { remote, protocol } => self
+				.events
+				.push_back(BehaviourOut::NotificationStreamClosed { remote, protocol }),
 			CustomMessageOutcome::NotificationsReceived { remote, messages } => {
 				self.events.push_back(BehaviourOut::NotificationsReceived { remote, messages });
 			},
 			CustomMessageOutcome::PeerNewBest(peer_id, number) => {
 				self.light_client_request_sender.update_best_block(&peer_id, number);
-			}
+			},
 			CustomMessageOutcome::SyncConnected(peer_id) => {
 				self.light_client_request_sender.inject_connected(peer_id);
 				self.events.push_back(BehaviourOut::SyncConnected(peer_id))
-			}
+			},
 			CustomMessageOutcome::SyncDisconnected(peer_id) => {
 				self.light_client_request_sender.inject_disconnected(peer_id);
 				self.events.push_back(BehaviourOut::SyncDisconnected(peer_id))
-			}
-			CustomMessageOutcome::None => {}
+			},
+			CustomMessageOutcome::None => {},
 		}
 	}
 }
@@ -397,38 +420,29 @@ impl<B: BlockT> NetworkBehaviourEventProcess<request_responses::Event> for Behav
 	fn inject_event(&mut self, event: request_responses::Event) {
 		match event {
 			request_responses::Event::InboundRequest { peer, protocol, result } => {
-				self.events.push_back(BehaviourOut::InboundRequest {
+				self.events.push_back(BehaviourOut::InboundRequest { peer, protocol, result });
+			},
+			request_responses::Event::RequestFinished { peer, protocol, duration, result } => {
+				self.events.push_back(BehaviourOut::RequestFinished {
 					peer,
 					protocol,
+					duration,
 					result,
 				});
-			}
-			request_responses::Event::RequestFinished { peer, protocol, duration, result } => {
-				self.events.push_back(BehaviourOut::RequestFinished {
-					peer, protocol, duration, result,
-				});
 			},
-			request_responses::Event::ReputationChanges { peer, changes } => {
+			request_responses::Event::ReputationChanges { peer, changes } =>
 				for change in changes {
 					self.substrate.report_peer(peer, change);
-				}
-			}
+				},
 		}
 	}
 }
 
-impl<B: BlockT> NetworkBehaviourEventProcess<peer_info::PeerInfoEvent>
-	for Behaviour<B> {
+impl<B: BlockT> NetworkBehaviourEventProcess<peer_info::PeerInfoEvent> for Behaviour<B> {
 	fn inject_event(&mut self, event: peer_info::PeerInfoEvent) {
 		let peer_info::PeerInfoEvent::Identified {
 			peer_id,
-			info: IdentifyInfo {
-				protocol_version,
-				agent_version,
-				mut listen_addrs,
-				protocols,
-				..
-			},
+			info: IdentifyInfo { protocol_version, agent_version, mut listen_addrs, protocols, .. },
 		} = event;
 
 		if listen_addrs.len() > 30 {
@@ -447,8 +461,7 @@ impl<B: BlockT> NetworkBehaviourEventProcess<peer_info::PeerInfoEvent>
 	}
 }
 
-impl<B: BlockT> NetworkBehaviourEventProcess<DiscoveryOut>
-	for Behaviour<B> {
+impl<B: BlockT> NetworkBehaviourEventProcess<DiscoveryOut> for Behaviour<B> {
 	fn inject_event(&mut self, out: DiscoveryOut) {
 		match out {
 			DiscoveryOut::UnroutablePeer(_peer_id) => {
@@ -456,27 +469,28 @@ impl<B: BlockT> NetworkBehaviourEventProcess<DiscoveryOut>
 				// to Kademlia is handled by the `Identify` protocol, part of the
 				// `PeerInfoBehaviour`. See the `NetworkBehaviourEventProcess`
 				// implementation for `PeerInfoEvent`.
-			}
+			},
 			DiscoveryOut::Discovered(peer_id) => {
 				self.substrate.add_default_set_discovered_nodes(iter::once(peer_id));
-			}
+			},
 			DiscoveryOut::ValueFound(results, duration) => {
-				self.events.push_back(BehaviourOut::Dht(DhtEvent::ValueFound(results), duration));
-			}
+				self.events
+					.push_back(BehaviourOut::Dht(DhtEvent::ValueFound(results), duration));
+			},
 			DiscoveryOut::ValueNotFound(key, duration) => {
 				self.events.push_back(BehaviourOut::Dht(DhtEvent::ValueNotFound(key), duration));
-			}
+			},
 			DiscoveryOut::ValuePut(key, duration) => {
 				self.events.push_back(BehaviourOut::Dht(DhtEvent::ValuePut(key), duration));
-			}
+			},
 			DiscoveryOut::ValuePutFailed(key, duration) => {
-				self.events.push_back(BehaviourOut::Dht(DhtEvent::ValuePutFailed(key), duration));
-			}
-			DiscoveryOut::RandomKademliaStarted(protocols) => {
+				self.events
+					.push_back(BehaviourOut::Dht(DhtEvent::ValuePutFailed(key), duration));
+			},
+			DiscoveryOut::RandomKademliaStarted(protocols) =>
 				for protocol in protocols {
 					self.events.push_back(BehaviourOut::RandomKademliaStarted(protocol));
-				}
-			}
+				},
 		}
 	}
 }
@@ -488,22 +502,16 @@ impl<B: BlockT> Behaviour<B> {
 		_: &mut impl PollParameters,
 	) -> Poll<NetworkBehaviourAction<TEv, BehaviourOut<B>>> {
 		use light_client_requests::sender::OutEvent;
-		while let Poll::Ready(Some(event)) =
-			self.light_client_request_sender.poll_next_unpin(cx)
-		{
+		while let Poll::Ready(Some(event)) = self.light_client_request_sender.poll_next_unpin(cx) {
 			match event {
-				OutEvent::SendRequest {
-					target,
-					request,
-					pending_response,
-					protocol_name,
-				} => self.request_responses.send_request(
-					&target,
-					&protocol_name,
-					request,
-					pending_response,
-					IfDisconnected::ImmediateError,
-				),
+				OutEvent::SendRequest { target, request, pending_response, protocol_name } =>
+					self.request_responses.send_request(
+						&target,
+						&protocol_name,
+						request,
+						pending_response,
+						IfDisconnected::ImmediateError,
+					),
 			}
 		}
 
diff --git a/client/network/src/bitswap.rs b/client/network/src/bitswap.rs
index aea2b8420cb2..3a10367c64a4 100644
--- a/client/network/src/bitswap.rs
+++ b/client/network/src/bitswap.rs
@@ -20,31 +20,39 @@
 //! Only supports bitswap 1.2.0.
 //! CID is expected to reference 256-bit Blake2b transaction hash.
 
-use std::collections::VecDeque;
-use std::io;
-use std::sync::Arc;
-use std::task::{Context, Poll};
+use crate::{
+	chain::Client,
+	schema::bitswap::{
+		message::{wantlist::WantType, Block as MessageBlock, BlockPresence, BlockPresenceType},
+		Message as BitswapMessage,
+	},
+};
 use cid::Version;
 use core::pin::Pin;
-use futures::Future;
-use futures::io::{AsyncRead, AsyncWrite};
-use libp2p::core::{
-	connection::ConnectionId, Multiaddr, PeerId,
-	upgrade, InboundUpgrade, OutboundUpgrade, UpgradeInfo,
+use futures::{
+	io::{AsyncRead, AsyncWrite},
+	Future,
 };
-use libp2p::swarm::{
-	NetworkBehaviour, NetworkBehaviourAction, NotifyHandler, PollParameters,
-	ProtocolsHandler, IntoProtocolsHandler, OneShotHandler,
+use libp2p::{
+	core::{
+		connection::ConnectionId, upgrade, InboundUpgrade, Multiaddr, OutboundUpgrade, PeerId,
+		UpgradeInfo,
+	},
+	swarm::{
+		IntoProtocolsHandler, NetworkBehaviour, NetworkBehaviourAction, NotifyHandler,
+		OneShotHandler, PollParameters, ProtocolsHandler,
+	},
 };
-use log::{error, debug, trace};
+use log::{debug, error, trace};
 use prost::Message;
-use sp_runtime::traits::{Block as BlockT};
-use unsigned_varint::{encode as varint_encode};
-use crate::chain::Client;
-use crate::schema::bitswap::{
-	Message as BitswapMessage,
-	message::{wantlist::WantType, Block as MessageBlock, BlockPresenceType, BlockPresence},
+use sp_runtime::traits::Block as BlockT;
+use std::{
+	collections::VecDeque,
+	io,
+	sync::Arc,
+	task::{Context, Poll},
 };
+use unsigned_varint::encode as varint_encode;
 
 const LOG_TARGET: &str = "bitswap";
 
@@ -182,10 +190,7 @@ pub struct Bitswap<B> {
 impl<B: BlockT> Bitswap<B> {
 	/// Create a new instance of the bitswap protocol handler.
 	pub fn new(client: Arc<dyn Client<B>>) -> Self {
-		Bitswap {
-			client,
-			ready_blocks: Default::default(),
-		}
+		Bitswap { client, ready_blocks: Default::default() }
 	}
 }
 
@@ -201,11 +206,9 @@ impl<B: BlockT> NetworkBehaviour for Bitswap<B> {
 		Vec::new()
 	}
 
-	fn inject_connected(&mut self, _peer: &PeerId) {
-	}
+	fn inject_connected(&mut self, _peer: &PeerId) {}
 
-	fn inject_disconnected(&mut self, _peer: &PeerId) {
-	}
+	fn inject_disconnected(&mut self, _peer: &PeerId) {}
 
 	fn inject_event(&mut self, peer: PeerId, _connection: ConnectionId, message: HandlerEvent) {
 		let request = match message {
@@ -215,7 +218,7 @@ impl<B: BlockT> NetworkBehaviour for Bitswap<B> {
 		trace!(target: LOG_TARGET, "Received request: {:?} from {}", request, peer);
 		if self.ready_blocks.len() > MAX_RESPONSE_QUEUE {
 			debug!(target: LOG_TARGET, "Ignored request: queue is full");
-			return;
+			return
 		}
 		let mut response = BitswapMessage {
 			wantlist: None,
@@ -227,29 +230,25 @@ impl<B: BlockT> NetworkBehaviour for Bitswap<B> {
 		let wantlist = match request.wantlist {
 			Some(wantlist) => wantlist,
 			None => {
-				debug!(
-					target: LOG_TARGET,
-					"Unexpected bitswap message from {}",
-					peer,
-				);
-				return;
-			}
+				debug!(target: LOG_TARGET, "Unexpected bitswap message from {}", peer,);
+				return
+			},
 		};
 		if wantlist.entries.len() > MAX_WANTED_BLOCKS {
 			trace!(target: LOG_TARGET, "Ignored request: too many entries");
-			return;
+			return
 		}
 		for entry in wantlist.entries {
 			let cid = match cid::Cid::read_bytes(entry.block.as_slice()) {
 				Ok(cid) => cid,
 				Err(e) => {
 					trace!(target: LOG_TARGET, "Bad CID {:?}: {:?}", entry.block, e);
-					continue;
-				}
+					continue
+				},
 			};
-			if cid.version() != cid::Version::V1
-				|| cid.hash().code() != u64::from(cid::multihash::Code::Blake2b256)
-				|| cid.hash().size() != 32
+			if cid.version() != cid::Version::V1 ||
+				cid.hash().code() != u64::from(cid::multihash::Code::Blake2b256) ||
+				cid.hash().size() != 32
 			{
 				debug!(target: LOG_TARGET, "Ignoring unsupported CID {}: {}", peer, cid);
 				continue
@@ -261,7 +260,7 @@ impl<B: BlockT> NetworkBehaviour for Bitswap<B> {
 				Err(e) => {
 					error!(target: LOG_TARGET, "Error retrieving transaction {}: {}", hash, e);
 					None
-				}
+				},
 			};
 			match transaction {
 				Some(transaction) => {
@@ -273,10 +272,9 @@ impl<B: BlockT> NetworkBehaviour for Bitswap<B> {
 							mh_type: cid.hash().code(),
 							mh_len: cid.hash().size(),
 						};
-						response.payload.push(MessageBlock {
-							prefix: prefix.to_bytes(),
-							data: transaction,
-						});
+						response
+							.payload
+							.push(MessageBlock { prefix: prefix.to_bytes(), data: transaction });
 					} else {
 						response.block_presences.push(BlockPresence {
 							r#type: BlockPresenceType::Have as i32,
@@ -292,7 +290,7 @@ impl<B: BlockT> NetworkBehaviour for Bitswap<B> {
 							cid: cid.to_bytes(),
 						});
 					}
-				}
+				},
 			}
 		}
 		trace!(target: LOG_TARGET, "Response: {:?}", response);
@@ -304,7 +302,7 @@ impl<B: BlockT> NetworkBehaviour for Bitswap<B> {
 			<<Self::ProtocolsHandler as IntoProtocolsHandler>::Handler as ProtocolsHandler>::InEvent,
 			Self::OutEvent,
 		>,
-	> {
+	>{
 		if let Some((peer_id, message)) = self.ready_blocks.pop_front() {
 			return Poll::Ready(NetworkBehaviourAction::NotifyHandler {
 				peer_id: peer_id.clone(),
diff --git a/client/network/src/block_request_handler.rs b/client/network/src/block_request_handler.rs
index ce65e5eca345..66ae0d43bb22 100644
--- a/client/network/src/block_request_handler.rs
+++ b/client/network/src/block_request_handler.rs
@@ -17,25 +17,32 @@
 //! Helper for handling (i.e. answering) block requests from a remote peer via the
 //! [`crate::request_responses::RequestResponsesBehaviour`].
 
-use codec::{Encode, Decode};
-use crate::chain::Client;
-use crate::config::ProtocolId;
-use crate::protocol::{message::BlockAttributes};
-use crate::request_responses::{IncomingRequest, OutgoingResponse, ProtocolConfig};
-use crate::schema::v1::block_request::FromBlock;
-use crate::schema::v1::{BlockResponse, Direction};
-use crate::{PeerId, ReputationChange};
-use futures::channel::{mpsc, oneshot};
-use futures::stream::StreamExt;
+use crate::{
+	chain::Client,
+	config::ProtocolId,
+	protocol::message::BlockAttributes,
+	request_responses::{IncomingRequest, OutgoingResponse, ProtocolConfig},
+	schema::v1::{block_request::FromBlock, BlockResponse, Direction},
+	PeerId, ReputationChange,
+};
+use codec::{Decode, Encode};
+use futures::{
+	channel::{mpsc, oneshot},
+	stream::StreamExt,
+};
 use log::debug;
 use lru::LruCache;
 use prost::Message;
-use sp_runtime::generic::BlockId;
-use sp_runtime::traits::{Block as BlockT, Header, One, Zero};
-use std::cmp::min;
-use std::sync::Arc;
-use std::time::Duration;
-use std::hash::{Hasher, Hash};
+use sp_runtime::{
+	generic::BlockId,
+	traits::{Block as BlockT, Header, One, Zero},
+};
+use std::{
+	cmp::min,
+	hash::{Hash, Hasher},
+	sync::Arc,
+	time::Duration,
+};
 
 const LOG_TARGET: &str = "sync";
 const MAX_BLOCKS_IN_RESPONSE: usize = 128;
@@ -61,7 +68,6 @@ pub fn generate_protocol_config(protocol_id: &ProtocolId) -> ProtocolConfig {
 }
 
 /// Generate the block protocol name from chain specific protocol identifier.
-//
 // Visibility `pub(crate)` to allow `crate::light_client_requests::sender` to generate block request
 // protocol name and send block requests.
 pub(crate) fn generate_protocol_name(protocol_id: &ProtocolId) -> String {
@@ -139,9 +145,7 @@ impl<B: BlockT> BlockRequestHandler<B> {
 				Ok(()) => debug!(target: LOG_TARGET, "Handled block request from {}.", peer),
 				Err(e) => debug!(
 					target: LOG_TARGET,
-					"Failed to handle block request from {}: {}",
-					peer,
-					e,
+					"Failed to handle block request from {}: {}", peer, e,
 				),
 			}
 		}
@@ -159,11 +163,11 @@ impl<B: BlockT> BlockRequestHandler<B> {
 			FromBlock::Hash(ref h) => {
 				let h = Decode::decode(&mut h.as_ref())?;
 				BlockId::<B>::Hash(h)
-			}
+			},
 			FromBlock::Number(ref n) => {
 				let n = Decode::decode(&mut n.as_ref())?;
 				BlockId::<B>::Number(n)
-			}
+			},
 		};
 
 		let max_blocks = if request.max_blocks == 0 {
@@ -172,8 +176,8 @@ impl<B: BlockT> BlockRequestHandler<B> {
 			min(request.max_blocks as usize, MAX_BLOCKS_IN_RESPONSE)
 		};
 
-		let direction = Direction::from_i32(request.direction)
-			.ok_or(HandleRequestError::ParseDirection)?;
+		let direction =
+			Direction::from_i32(request.direction).ok_or(HandleRequestError::ParseDirection)?;
 
 		let attributes = BlockAttributes::from_be_u32(request.fields)?;
 
@@ -201,7 +205,7 @@ impl<B: BlockT> BlockRequestHandler<B> {
 			},
 			None => {
 				self.seen_requests.put(key.clone(), SeenRequestsValue::First);
-			}
+			},
 		}
 
 		debug!(
@@ -247,11 +251,13 @@ impl<B: BlockT> BlockRequestHandler<B> {
 			Err(())
 		};
 
-		pending_response.send(OutgoingResponse {
-			result,
-			reputation_changes: reputation_change.into_iter().collect(),
-			sent_feedback: None,
-		}).map_err(|_| HandleRequestError::SendResponse)
+		pending_response
+			.send(OutgoingResponse {
+				result,
+				reputation_changes: reputation_change.into_iter().collect(),
+				sent_feedback: None,
+			})
+			.map_err(|_| HandleRequestError::SendResponse)
 	}
 
 	fn get_block_response(
@@ -298,10 +304,8 @@ impl<B: BlockT> BlockRequestHandler<B> {
 					let justification =
 						justifications.and_then(|just| just.into_justification(*b"FRNK"));
 
-					let is_empty_justification = justification
-						.as_ref()
-						.map(|j| j.is_empty())
-						.unwrap_or(false);
+					let is_empty_justification =
+						justification.as_ref().map(|j| j.is_empty()).unwrap_or(false);
 
 					let justification = justification.unwrap_or_default();
 
@@ -310,25 +314,27 @@ impl<B: BlockT> BlockRequestHandler<B> {
 
 			let body = if get_body {
 				match self.client.block_body(&BlockId::Hash(hash))? {
-					Some(mut extrinsics) => extrinsics.iter_mut()
-						.map(|extrinsic| extrinsic.encode())
-						.collect(),
+					Some(mut extrinsics) =>
+						extrinsics.iter_mut().map(|extrinsic| extrinsic.encode()).collect(),
 					None => {
 						log::trace!(target: LOG_TARGET, "Missing data for block request.");
-						break;
-					}
+						break
+					},
 				}
 			} else {
 				Vec::new()
 			};
 
-			let indexed_body =  if get_indexed_body {
+			let indexed_body = if get_indexed_body {
 				match self.client.block_indexed_body(&BlockId::Hash(hash))? {
 					Some(transactions) => transactions,
 					None => {
-						log::trace!(target: LOG_TARGET, "Missing indexed block data for block request.");
-						break;
-					}
+						log::trace!(
+							target: LOG_TARGET,
+							"Missing indexed block data for block request."
+						);
+						break
+					},
 				}
 			} else {
 				Vec::new()
@@ -336,11 +342,7 @@ impl<B: BlockT> BlockRequestHandler<B> {
 
 			let block_data = crate::schema::v1::BlockData {
 				hash: hash.encode(),
-				header: if get_header {
-					header.encode()
-				} else {
-					Vec::new()
-				},
+				header: if get_header { header.encode() } else { Vec::new() },
 				body,
 				receipt: Vec::new(),
 				message_queue: Vec::new(),
@@ -358,15 +360,13 @@ impl<B: BlockT> BlockRequestHandler<B> {
 			}
 
 			match direction {
-				Direction::Ascending => {
-					block_id = BlockId::Number(number + One::one())
-				}
+				Direction::Ascending => block_id = BlockId::Number(number + One::one()),
 				Direction::Descending => {
 					if number.is_zero() {
 						break
 					}
 					block_id = BlockId::Hash(parent_hash)
-				}
+				},
 			}
 		}
 
diff --git a/client/network/src/chain.rs b/client/network/src/chain.rs
index 32d4cc9ff024..599e9d796c11 100644
--- a/client/network/src/chain.rs
+++ b/client/network/src/chain.rs
@@ -18,18 +18,30 @@
 
 //! Blockchain access trait
 
-use sp_blockchain::{Error, HeaderBackend, HeaderMetadata};
 use sc_client_api::{BlockBackend, ProofProvider};
+pub use sc_client_api::{ImportedState, StorageData, StorageKey};
+use sp_blockchain::{Error, HeaderBackend, HeaderMetadata};
 use sp_runtime::traits::{Block as BlockT, BlockIdTo};
-pub use sc_client_api::{StorageKey, StorageData, ImportedState};
 
 /// Local client abstraction for the network.
-pub trait Client<Block: BlockT>: HeaderBackend<Block> + ProofProvider<Block> + BlockIdTo<Block, Error = Error>
-	+ BlockBackend<Block> + HeaderMetadata<Block, Error = Error> + Send + Sync
-{}
-
-impl<Block: BlockT, T> Client<Block> for T
-	where
-		T: HeaderBackend<Block> + ProofProvider<Block> + BlockIdTo<Block, Error = Error>
-			+ BlockBackend<Block> + HeaderMetadata<Block, Error = Error> + Send + Sync
-{}
+pub trait Client<Block: BlockT>:
+	HeaderBackend<Block>
+	+ ProofProvider<Block>
+	+ BlockIdTo<Block, Error = Error>
+	+ BlockBackend<Block>
+	+ HeaderMetadata<Block, Error = Error>
+	+ Send
+	+ Sync
+{
+}
+
+impl<Block: BlockT, T> Client<Block> for T where
+	T: HeaderBackend<Block>
+		+ ProofProvider<Block>
+		+ BlockIdTo<Block, Error = Error>
+		+ BlockBackend<Block>
+		+ HeaderMetadata<Block, Error = Error>
+		+ Send
+		+ Sync
+{
+}
diff --git a/client/network/src/config.rs b/client/network/src/config.rs
index 8cc467a7fb9f..cddc52352485 100644
--- a/client/network/src/config.rs
+++ b/client/network/src/config.rs
@@ -21,14 +21,14 @@
 //! The [`Params`] struct is the struct that must be passed in order to initialize the networking.
 //! See the documentation of [`Params`].
 
-pub use crate::chain::Client;
-pub use crate::on_demand_layer::{AlwaysBadChecker, OnDemand};
-pub use crate::request_responses::{
-	IncomingRequest,
-	OutgoingResponse,
-	ProtocolConfig as RequestResponseConfig,
+pub use crate::{
+	chain::Client,
+	on_demand_layer::{AlwaysBadChecker, OnDemand},
+	request_responses::{
+		IncomingRequest, OutgoingResponse, ProtocolConfig as RequestResponseConfig,
+	},
 };
-pub use libp2p::{identity, core::PublicKey, wasm_ext::ExtTransport, build_multiaddr};
+pub use libp2p::{build_multiaddr, core::PublicKey, identity, wasm_ext::ExtTransport};
 
 // Note: this re-export shouldn't be part of the public API of the crate and will be removed in
 // the future.
@@ -46,15 +46,19 @@ use libp2p::{
 use prometheus_endpoint::Registry;
 use sp_consensus::{block_validation::BlockAnnounceValidator, import_queue::ImportQueue};
 use sp_runtime::traits::Block as BlockT;
-use std::{borrow::Cow, convert::TryFrom, future::Future, pin::Pin, str::FromStr};
 use std::{
+	borrow::Cow,
 	collections::HashMap,
+	convert::TryFrom,
 	error::Error,
 	fs,
+	future::Future,
 	io::{self, Write},
 	net::Ipv4Addr,
 	path::{Path, PathBuf},
+	pin::Pin,
 	str,
+	str::FromStr,
 	sync::Arc,
 };
 use zeroize::Zeroize;
@@ -181,7 +185,7 @@ pub enum TransactionImport {
 }
 
 /// Future resolving to transaction import result.
-pub type TransactionImportFuture = Pin<Box<dyn Future<Output=TransactionImport> + Send>>;
+pub type TransactionImportFuture = Pin<Box<dyn Future<Output = TransactionImport> + Send>>;
 
 /// Transaction pool interface
 pub trait TransactionPool<H: ExHashT, B: BlockT>: Send + Sync {
@@ -192,10 +196,7 @@ pub trait TransactionPool<H: ExHashT, B: BlockT>: Send + Sync {
 	/// Import a transaction into the pool.
 	///
 	/// This will return future.
-	fn import(
-		&self,
-		transaction: B::Extrinsic,
-	) -> TransactionImportFuture;
+	fn import(&self, transaction: B::Extrinsic) -> TransactionImportFuture;
 	/// Notify the pool about transactions broadcast.
 	fn on_broadcasted(&self, propagations: HashMap<H, Vec<String>>);
 	/// Get transaction by hash.
@@ -219,16 +220,15 @@ impl<H: ExHashT + Default, B: BlockT> TransactionPool<H, B> for EmptyTransaction
 		Default::default()
 	}
 
-	fn import(
-		&self,
-		_transaction: B::Extrinsic
-	) -> TransactionImportFuture {
+	fn import(&self, _transaction: B::Extrinsic) -> TransactionImportFuture {
 		Box::pin(future::ready(TransactionImport::KnownGood))
 	}
 
 	fn on_broadcasted(&self, _: HashMap<H, Vec<String>>) {}
 
-	fn transaction(&self, _h: &H) -> Option<B::Extrinsic> { None }
+	fn transaction(&self, _h: &H) -> Option<B::Extrinsic> {
+		None
+	}
 }
 
 /// Name of a protocol, transmitted on the wire. Should be unique for each chain. Always UTF-8.
@@ -267,17 +267,16 @@ impl fmt::Debug for ProtocolId {
 /// assert_eq!(peer_id, "QmSk5HQbn6LhUwDiNMseVUjuRYhEtYj4aUZ6WfWoGURpdV".parse::<PeerId>().unwrap());
 /// assert_eq!(addr, "/ip4/198.51.100.19/tcp/30333".parse::<Multiaddr>().unwrap());
 /// ```
-///
 pub fn parse_str_addr(addr_str: &str) -> Result<(PeerId, Multiaddr), ParseErr> {
 	let addr: Multiaddr = addr_str.parse()?;
 	parse_addr(addr)
 }
 
 /// Splits a Multiaddress into a Multiaddress and PeerId.
-pub fn parse_addr(mut addr: Multiaddr)-> Result<(PeerId, Multiaddr), ParseErr> {
+pub fn parse_addr(mut addr: Multiaddr) -> Result<(PeerId, Multiaddr), ParseErr> {
 	let who = match addr.pop() {
-		Some(multiaddr::Protocol::P2p(key)) => PeerId::from_multihash(key)
-			.map_err(|_| ParseErr::InvalidPeerId)?,
+		Some(multiaddr::Protocol::P2p(key)) =>
+			PeerId::from_multihash(key).map_err(|_| ParseErr::InvalidPeerId)?,
 		_ => return Err(ParseErr::PeerIdMissing),
 	};
 
@@ -325,10 +324,7 @@ impl FromStr for MultiaddrWithPeerId {
 
 	fn from_str(s: &str) -> Result<Self, Self::Err> {
 		let (peer_id, multiaddr) = parse_str_addr(s)?;
-		Ok(MultiaddrWithPeerId {
-			peer_id,
-			multiaddr,
-		})
+		Ok(MultiaddrWithPeerId { peer_id, multiaddr })
 	}
 }
 
@@ -504,18 +500,13 @@ impl NetworkConfiguration {
 
 	/// Create new default configuration for localhost-only connection with random port (useful for testing)
 	pub fn new_local() -> NetworkConfiguration {
-		let mut config = NetworkConfiguration::new(
-			"test-node",
-			"test-client",
-			Default::default(),
-			None,
-		);
-
-		config.listen_addresses = vec![
-			iter::once(multiaddr::Protocol::Ip4(Ipv4Addr::new(127, 0, 0, 1)))
+		let mut config =
+			NetworkConfiguration::new("test-node", "test-client", Default::default(), None);
+
+		config.listen_addresses =
+			vec![iter::once(multiaddr::Protocol::Ip4(Ipv4Addr::new(127, 0, 0, 1)))
 				.chain(iter::once(multiaddr::Protocol::Tcp(0)))
-				.collect()
-		];
+				.collect()];
 
 		config.allow_non_globals_in_dht = true;
 		config
@@ -523,18 +514,13 @@ impl NetworkConfiguration {
 
 	/// Create new default configuration for localhost-only connection with random port (useful for testing)
 	pub fn new_memory() -> NetworkConfiguration {
-		let mut config = NetworkConfiguration::new(
-			"test-node",
-			"test-client",
-			Default::default(),
-			None,
-		);
-
-		config.listen_addresses = vec![
-			iter::once(multiaddr::Protocol::Ip4(Ipv4Addr::new(127, 0, 0, 1)))
+		let mut config =
+			NetworkConfiguration::new("test-node", "test-client", Default::default(), None);
+
+		config.listen_addresses =
+			vec![iter::once(multiaddr::Protocol::Ip4(Ipv4Addr::new(127, 0, 0, 1)))
 				.chain(iter::once(multiaddr::Protocol::Tcp(0)))
-				.collect()
-		];
+				.collect()];
 
 		config.allow_non_globals_in_dht = true;
 		config
@@ -674,7 +660,7 @@ impl NonReservedPeerMode {
 #[derive(Clone, Debug)]
 pub enum NodeKeyConfig {
 	/// A Ed25519 secret key configuration.
-	Ed25519(Secret<ed25519::SecretKey>)
+	Ed25519(Secret<ed25519::SecretKey>),
 }
 
 impl Default for NodeKeyConfig {
@@ -698,7 +684,7 @@ pub enum Secret<K> {
 	///   * `ed25519::SecretKey`: An unencoded 32 bytes Ed25519 secret key.
 	File(PathBuf),
 	/// Always generate a new secret key `K`.
-	New
+	New,
 }
 
 impl<K> fmt::Debug for Secret<K> {
@@ -725,35 +711,27 @@ impl NodeKeyConfig {
 	pub fn into_keypair(self) -> io::Result<Keypair> {
 		use NodeKeyConfig::*;
 		match self {
-			Ed25519(Secret::New) =>
-				Ok(Keypair::generate_ed25519()),
-
-			Ed25519(Secret::Input(k)) =>
-				Ok(Keypair::Ed25519(k.into())),
-
-			Ed25519(Secret::File(f)) =>
-				get_secret(
-					f,
-					|mut b| {
-						match String::from_utf8(b.to_vec())
-							.ok()
-							.and_then(|s|{
-								if s.len() == 64 {
-									hex::decode(&s).ok()
-								} else {
-									None
-								}}
-							)
-						{
-							Some(s) => ed25519::SecretKey::from_bytes(s),
-							_ => ed25519::SecretKey::from_bytes(&mut b),
-						}
-					},
-					ed25519::SecretKey::generate,
-					|b| b.as_ref().to_vec()
-				)
-				.map(ed25519::Keypair::from)
-				.map(Keypair::Ed25519),
+			Ed25519(Secret::New) => Ok(Keypair::generate_ed25519()),
+
+			Ed25519(Secret::Input(k)) => Ok(Keypair::Ed25519(k.into())),
+
+			Ed25519(Secret::File(f)) => get_secret(
+				f,
+				|mut b| match String::from_utf8(b.to_vec()).ok().and_then(|s| {
+					if s.len() == 64 {
+						hex::decode(&s).ok()
+					} else {
+						None
+					}
+				}) {
+					Some(s) => ed25519::SecretKey::from_bytes(s),
+					_ => ed25519::SecretKey::from_bytes(&mut b),
+				},
+				ed25519::SecretKey::generate,
+				|b| b.as_ref().to_vec(),
+			)
+			.map(ed25519::Keypair::from)
+			.map(Keypair::Ed25519),
 		}
 	}
 }
@@ -770,9 +748,9 @@ where
 	W: Fn(&K) -> Vec<u8>,
 {
 	std::fs::read(&file)
-		.and_then(|mut sk_bytes|
-			parse(&mut sk_bytes)
-				.map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e)))
+		.and_then(|mut sk_bytes| {
+			parse(&mut sk_bytes).map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))
+		})
 		.or_else(|e| {
 			if e.kind() == io::ErrorKind::NotFound {
 				file.as_ref().parent().map_or(Ok(()), fs::create_dir_all)?;
@@ -790,7 +768,7 @@ where
 /// Write secret bytes to a file.
 fn write_secret_file<P>(path: P, sk_bytes: &[u8]) -> io::Result<()>
 where
-	P: AsRef<Path>
+	P: AsRef<Path>,
 {
 	let mut file = open_secret_file(&path)?;
 	file.write_all(sk_bytes)
@@ -800,26 +778,19 @@ where
 #[cfg(unix)]
 fn open_secret_file<P>(path: P) -> io::Result<fs::File>
 where
-	P: AsRef<Path>
+	P: AsRef<Path>,
 {
 	use std::os::unix::fs::OpenOptionsExt;
-	fs::OpenOptions::new()
-		.write(true)
-		.create_new(true)
-		.mode(0o600)
-		.open(path)
+	fs::OpenOptions::new().write(true).create_new(true).mode(0o600).open(path)
 }
 
 /// Opens a file containing a secret key in write mode.
 #[cfg(not(unix))]
 fn open_secret_file<P>(path: P) -> Result<fs::File, io::Error>
 where
-	P: AsRef<Path>
+	P: AsRef<Path>,
 {
-	fs::OpenOptions::new()
-		.write(true)
-		.create_new(true)
-		.open(path)
+	fs::OpenOptions::new().write(true).create_new(true).open(path)
 }
 
 #[cfg(test)]
@@ -835,7 +806,7 @@ mod tests {
 		match kp {
 			Keypair::Ed25519(p) => p.secret().as_ref().iter().cloned().collect(),
 			Keypair::Secp256k1(p) => p.secret().to_bytes().to_vec(),
-			_ => panic!("Unexpected keypair.")
+			_ => panic!("Unexpected keypair."),
 		}
 	}
 
diff --git a/client/network/src/discovery.rs b/client/network/src/discovery.rs
index 0f2a501bcdef..da50ded077d5 100644
--- a/client/network/src/discovery.rs
+++ b/client/network/src/discovery.rs
@@ -45,28 +45,43 @@
 //! **Important**: In order for the discovery mechanism to work properly, there needs to be an
 //! active mechanism that asks nodes for the addresses they are listening on. Whenever we learn
 //! of a node's address, you must call `add_self_reported_address`.
-//!
 
-use crate::config::ProtocolId;
-use crate::utils::LruHashSet;
+use crate::{config::ProtocolId, utils::LruHashSet};
 use futures::prelude::*;
 use futures_timer::Delay;
 use ip_network::IpNetwork;
-use libp2p::core::{connection::{ConnectionId, ListenerId}, ConnectedPoint, Multiaddr, PeerId, PublicKey};
-use libp2p::swarm::{NetworkBehaviour, NetworkBehaviourAction, PollParameters, ProtocolsHandler, IntoProtocolsHandler};
-use libp2p::swarm::protocols_handler::multi::IntoMultiHandler;
-use libp2p::kad::{Kademlia, KademliaBucketInserts, KademliaConfig, KademliaEvent, QueryResult, Quorum, Record};
-use libp2p::kad::GetClosestPeersError;
-use libp2p::kad::handler::KademliaHandlerProto;
-use libp2p::kad::QueryId;
-use libp2p::kad::record::{self, store::{MemoryStore, RecordStore}};
 #[cfg(not(target_os = "unknown"))]
 use libp2p::mdns::{Mdns, MdnsConfig, MdnsEvent};
-use libp2p::multiaddr::Protocol;
+use libp2p::{
+	core::{
+		connection::{ConnectionId, ListenerId},
+		ConnectedPoint, Multiaddr, PeerId, PublicKey,
+	},
+	kad::{
+		handler::KademliaHandlerProto,
+		record::{
+			self,
+			store::{MemoryStore, RecordStore},
+		},
+		GetClosestPeersError, Kademlia, KademliaBucketInserts, KademliaConfig, KademliaEvent,
+		QueryId, QueryResult, Quorum, Record,
+	},
+	multiaddr::Protocol,
+	swarm::{
+		protocols_handler::multi::IntoMultiHandler, IntoProtocolsHandler, NetworkBehaviour,
+		NetworkBehaviourAction, PollParameters, ProtocolsHandler,
+	},
+};
 use log::{debug, info, trace, warn};
-use std::{cmp, collections::{HashMap, HashSet, VecDeque}, io, num::NonZeroUsize, time::Duration};
-use std::task::{Context, Poll};
 use sp_core::hexdisplay::HexDisplay;
+use std::{
+	cmp,
+	collections::{HashMap, HashSet, VecDeque},
+	io,
+	num::NonZeroUsize,
+	task::{Context, Poll},
+	time::Duration,
+};
 
 /// Maximum number of known external addresses that we will cache.
 /// This only affects whether we will log whenever we (re-)discover
@@ -101,7 +116,7 @@ impl DiscoveryConfig {
 			discovery_only_if_under_num: std::u64::MAX,
 			enable_mdns: false,
 			kademlia_disjoint_query_paths: false,
-			protocol_ids: HashSet::new()
+			protocol_ids: HashSet::new(),
 		}
 	}
 
@@ -114,7 +129,7 @@ impl DiscoveryConfig {
 	/// Set custom nodes which never expire, e.g. bootstrap or reserved nodes.
 	pub fn with_user_defined<I>(&mut self, user_defined: I) -> &mut Self
 	where
-		I: IntoIterator<Item = (PeerId, Multiaddr)>
+		I: IntoIterator<Item = (PeerId, Multiaddr)>,
 	{
 		self.user_defined.extend(user_defined);
 		self
@@ -152,7 +167,7 @@ impl DiscoveryConfig {
 	pub fn add_protocol(&mut self, id: ProtocolId) -> &mut Self {
 		if self.protocol_ids.contains(&id) {
 			warn!(target: "sub-libp2p", "Discovery already registered for protocol {:?}", id);
-			return self;
+			return self
 		}
 
 		self.protocol_ids.insert(id);
@@ -181,7 +196,8 @@ impl DiscoveryConfig {
 			protocol_ids,
 		} = self;
 
-		let kademlias = protocol_ids.into_iter()
+		let kademlias = protocol_ids
+			.into_iter()
 			.map(|protocol_id| {
 				let proto_name = protocol_name_from_protocol_id(&protocol_id);
 
@@ -227,7 +243,7 @@ impl DiscoveryConfig {
 			allow_non_globals_in_dht,
 			known_external_addresses: LruHashSet::new(
 				NonZeroUsize::new(MAX_KNOWN_EXTERNAL_ADDRESSES)
-					.expect("value is a constant; constant is non-zero; qed.")
+					.expect("value is a constant; constant is non-zero; qed."),
 			),
 		}
 	}
@@ -305,7 +321,7 @@ impl DiscoveryBehaviour {
 		&mut self,
 		peer_id: &PeerId,
 		supported_protocols: impl Iterator<Item = impl AsRef<[u8]>>,
-		addr: Multiaddr
+		addr: Multiaddr,
 	) {
 		if !self.allow_non_globals_in_dht && !self.can_add_to_dht(&addr) {
 			log::trace!(target: "sub-libp2p", "Ignoring self-reported non-global address {} from {}.", addr, peer_id);
@@ -353,7 +369,8 @@ impl DiscoveryBehaviour {
 		for k in self.kademlias.values_mut() {
 			if let Err(e) = k.put_record(Record::new(key.clone(), value.clone()), Quorum::All) {
 				warn!(target: "sub-libp2p", "Libp2p => Failed to put record: {:?}", e);
-				self.pending_events.push_back(DiscoveryOut::ValuePutFailed(key.clone(), Duration::from_secs(0)));
+				self.pending_events
+					.push_back(DiscoveryOut::ValuePutFailed(key.clone(), Duration::from_secs(0)));
 			}
 		}
 	}
@@ -362,14 +379,16 @@ impl DiscoveryBehaviour {
 	///
 	/// Identifies Kademlia instances by their [`ProtocolId`] and kbuckets by the base 2 logarithm
 	/// of their lower bound.
-	pub fn num_entries_per_kbucket(&mut self) -> impl ExactSizeIterator<Item = (&ProtocolId, Vec<(u32, usize)>)> {
-		self.kademlias.iter_mut()
-			.map(|(id, kad)| {
-				let buckets = kad.kbuckets()
-					.map(|bucket| (bucket.range().0.ilog2().unwrap_or(0), bucket.iter().count()))
-					.collect();
-				(id, buckets)
-			})
+	pub fn num_entries_per_kbucket(
+		&mut self,
+	) -> impl ExactSizeIterator<Item = (&ProtocolId, Vec<(u32, usize)>)> {
+		self.kademlias.iter_mut().map(|(id, kad)| {
+			let buckets = kad
+				.kbuckets()
+				.map(|bucket| (bucket.range().0.ilog2().unwrap_or(0), bucket.iter().count()))
+				.collect();
+			(id, buckets)
+		})
 	}
 
 	/// Returns the number of records in the Kademlia record stores.
@@ -382,7 +401,9 @@ impl DiscoveryBehaviour {
 	}
 
 	/// Returns the total size in bytes of all the records in the Kademlia record stores.
-	pub fn kademlia_records_total_size(&mut self) -> impl ExactSizeIterator<Item = (&ProtocolId, usize)> {
+	pub fn kademlia_records_total_size(
+		&mut self,
+	) -> impl ExactSizeIterator<Item = (&ProtocolId, usize)> {
 		// Note that this code is ok only because we use a `MemoryStore`. If the records were
 		// for example stored on disk, this would load every single one of them every single time.
 		self.kademlias.iter_mut().map(|(id, kad)| {
@@ -394,7 +415,6 @@ impl DiscoveryBehaviour {
 	/// Can the given `Multiaddr` be put into the DHT?
 	///
 	/// This test is successful only for global IP addresses and DNS names.
-	//
 	// NB: Currently all DNS names are allowed and no check for TLD suffixes is done
 	// because the set of valid domains is highly dynamic and would require frequent
 	// updates, for example by utilising publicsuffix.org or IANA.
@@ -402,9 +422,9 @@ impl DiscoveryBehaviour {
 		let ip = match addr.iter().next() {
 			Some(Protocol::Ip4(ip)) => IpNetwork::from(ip),
 			Some(Protocol::Ip6(ip)) => IpNetwork::from(ip),
-			Some(Protocol::Dns(_)) | Some(Protocol::Dns4(_)) | Some(Protocol::Dns6(_))
-				=> return true,
-			_ => return false
+			Some(Protocol::Dns(_)) | Some(Protocol::Dns4(_)) | Some(Protocol::Dns6(_)) =>
+				return true,
+			_ => return false,
 		};
 		ip.is_global()
 	}
@@ -459,19 +479,24 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 	type OutEvent = DiscoveryOut;
 
 	fn new_handler(&mut self) -> Self::ProtocolsHandler {
-		let iter = self.kademlias.iter_mut()
+		let iter = self
+			.kademlias
+			.iter_mut()
 			.map(|(p, k)| (p.clone(), NetworkBehaviour::new_handler(k)));
 
-		IntoMultiHandler::try_from_iter(iter)
-			.expect("There can be at most one handler per `ProtocolId` and \
+		IntoMultiHandler::try_from_iter(iter).expect(
+			"There can be at most one handler per `ProtocolId` and \
 				protocol names contain the `ProtocolId` so no two protocol \
 				names in `self.kademlias` can be equal which is the only error \
 				`try_from_iter` can return, therefore this call is guaranteed \
-				to succeed; qed")
+				to succeed; qed",
+		)
 	}
 
 	fn addresses_of_peer(&mut self, peer_id: &PeerId) -> Vec<Multiaddr> {
-		let mut list = self.user_defined.iter()
+		let mut list = self
+			.user_defined
+			.iter()
 			.filter_map(|(p, a)| if p == peer_id { Some(a.clone()) } else { None })
 			.collect::<Vec<_>>();
 
@@ -488,7 +513,7 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 				list_to_filter.retain(|addr| {
 					if let Some(Protocol::Ip4(addr)) = addr.iter().next() {
 						if addr.is_private() {
-							return false;
+							return false
 						}
 					}
 
@@ -504,7 +529,12 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 		list
 	}
 
-	fn inject_connection_established(&mut self, peer_id: &PeerId, conn: &ConnectionId, endpoint: &ConnectedPoint) {
+	fn inject_connection_established(
+		&mut self,
+		peer_id: &PeerId,
+		conn: &ConnectionId,
+		endpoint: &ConnectedPoint,
+	) {
 		self.num_connections += 1;
 		for k in self.kademlias.values_mut() {
 			NetworkBehaviour::inject_connection_established(k, peer_id, conn, endpoint)
@@ -517,7 +547,12 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 		}
 	}
 
-	fn inject_connection_closed(&mut self, peer_id: &PeerId, conn: &ConnectionId, endpoint: &ConnectedPoint) {
+	fn inject_connection_closed(
+		&mut self,
+		peer_id: &PeerId,
+		conn: &ConnectionId,
+		endpoint: &ConnectedPoint,
+	) {
 		self.num_connections -= 1;
 		for k in self.kademlias.values_mut() {
 			NetworkBehaviour::inject_connection_closed(k, peer_id, conn, endpoint)
@@ -534,7 +569,7 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 		&mut self,
 		peer_id: Option<&PeerId>,
 		addr: &Multiaddr,
-		error: &dyn std::error::Error
+		error: &dyn std::error::Error,
 	) {
 		for k in self.kademlias.values_mut() {
 			NetworkBehaviour::inject_addr_reach_failure(k, peer_id, addr, error)
@@ -556,8 +591,7 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 	}
 
 	fn inject_new_external_addr(&mut self, addr: &Multiaddr) {
-		let new_addr = addr.clone()
-			.with(Protocol::P2p(self.local_peer_id.clone().into()));
+		let new_addr = addr.clone().with(Protocol::P2p(self.local_peer_id.clone().into()));
 
 		// NOTE: we might re-discover the same address multiple times
 		// in which case we just want to refrain from logging.
@@ -627,10 +661,10 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 			<<Self::ProtocolsHandler as IntoProtocolsHandler>::Handler as ProtocolsHandler>::InEvent,
 			Self::OutEvent,
 		>,
-	> {
+	>{
 		// Immediately process the content of `discovered`.
 		if let Some(ev) = self.pending_events.pop_front() {
-			return Poll::Ready(NetworkBehaviourAction::GenerateEvent(ev));
+			return Poll::Ready(NetworkBehaviourAction::GenerateEvent(ev))
 		}
 
 		// Poll the stream that fires when we need to start a random Kademlia query.
@@ -657,12 +691,14 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 				// Schedule the next random query with exponentially increasing delay,
 				// capped at 60 seconds.
 				*next_kad_random_query = Delay::new(self.duration_to_next_kad);
-				self.duration_to_next_kad = cmp::min(self.duration_to_next_kad * 2,
-					Duration::from_secs(60));
+				self.duration_to_next_kad =
+					cmp::min(self.duration_to_next_kad * 2, Duration::from_secs(60));
 
 				if actually_started {
-					let ev = DiscoveryOut::RandomKademliaStarted(self.kademlias.keys().cloned().collect());
-					return Poll::Ready(NetworkBehaviourAction::GenerateEvent(ev));
+					let ev = DiscoveryOut::RandomKademliaStarted(
+						self.kademlias.keys().cloned().collect(),
+					);
+					return Poll::Ready(NetworkBehaviourAction::GenerateEvent(ev))
 				}
 			}
 		}
@@ -674,86 +710,112 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 					NetworkBehaviourAction::GenerateEvent(ev) => match ev {
 						KademliaEvent::RoutingUpdated { peer, .. } => {
 							let ev = DiscoveryOut::Discovered(peer);
-							return Poll::Ready(NetworkBehaviourAction::GenerateEvent(ev));
-						}
+							return Poll::Ready(NetworkBehaviourAction::GenerateEvent(ev))
+						},
 						KademliaEvent::UnroutablePeer { peer, .. } => {
 							let ev = DiscoveryOut::UnroutablePeer(peer);
-							return Poll::Ready(NetworkBehaviourAction::GenerateEvent(ev));
-						}
+							return Poll::Ready(NetworkBehaviourAction::GenerateEvent(ev))
+						},
 						KademliaEvent::RoutablePeer { peer, .. } => {
 							let ev = DiscoveryOut::Discovered(peer);
-							return Poll::Ready(NetworkBehaviourAction::GenerateEvent(ev));
-						}
+							return Poll::Ready(NetworkBehaviourAction::GenerateEvent(ev))
+						},
 						KademliaEvent::PendingRoutablePeer { .. } => {
 							// We are not interested in this event at the moment.
-						}
-						KademliaEvent::QueryResult { result: QueryResult::GetClosestPeers(res), .. } => {
-							match res {
-								Err(GetClosestPeersError::Timeout { key, peers }) => {
-									debug!(target: "sub-libp2p",
+						},
+						KademliaEvent::QueryResult {
+							result: QueryResult::GetClosestPeers(res),
+							..
+						} => match res {
+							Err(GetClosestPeersError::Timeout { key, peers }) => {
+								debug!(target: "sub-libp2p",
 										"Libp2p => Query for {:?} timed out with {} results",
 										HexDisplay::from(&key), peers.len());
-								},
-								Ok(ok) => {
-									trace!(target: "sub-libp2p",
+							},
+							Ok(ok) => {
+								trace!(target: "sub-libp2p",
 										"Libp2p => Query for {:?} yielded {:?} results",
 										HexDisplay::from(&ok.key), ok.peers.len());
-									if ok.peers.is_empty() && self.num_connections != 0 {
-										debug!(target: "sub-libp2p", "Libp2p => Random Kademlia query has yielded empty \
+								if ok.peers.is_empty() && self.num_connections != 0 {
+									debug!(target: "sub-libp2p", "Libp2p => Random Kademlia query has yielded empty \
 											results");
-									}
 								}
-							}
-						}
-						KademliaEvent::QueryResult { result: QueryResult::GetRecord(res), stats, .. } => {
+							},
+						},
+						KademliaEvent::QueryResult {
+							result: QueryResult::GetRecord(res),
+							stats,
+							..
+						} => {
 							let ev = match res {
 								Ok(ok) => {
-									let results = ok.records
+									let results = ok
+										.records
 										.into_iter()
 										.map(|r| (r.record.key, r.record.value))
 										.collect();
 
-									DiscoveryOut::ValueFound(results, stats.duration().unwrap_or_else(Default::default))
-								}
+									DiscoveryOut::ValueFound(
+										results,
+										stats.duration().unwrap_or_else(Default::default),
+									)
+								},
 								Err(e @ libp2p::kad::GetRecordError::NotFound { .. }) => {
 									trace!(target: "sub-libp2p",
 										"Libp2p => Failed to get record: {:?}", e);
-									DiscoveryOut::ValueNotFound(e.into_key(), stats.duration().unwrap_or_else(Default::default))
-								}
+									DiscoveryOut::ValueNotFound(
+										e.into_key(),
+										stats.duration().unwrap_or_else(Default::default),
+									)
+								},
 								Err(e) => {
 									debug!(target: "sub-libp2p",
 										"Libp2p => Failed to get record: {:?}", e);
-									DiscoveryOut::ValueNotFound(e.into_key(), stats.duration().unwrap_or_else(Default::default))
-								}
+									DiscoveryOut::ValueNotFound(
+										e.into_key(),
+										stats.duration().unwrap_or_else(Default::default),
+									)
+								},
 							};
-							return Poll::Ready(NetworkBehaviourAction::GenerateEvent(ev));
-						}
-						KademliaEvent::QueryResult { result: QueryResult::PutRecord(res), stats, .. } => {
+							return Poll::Ready(NetworkBehaviourAction::GenerateEvent(ev))
+						},
+						KademliaEvent::QueryResult {
+							result: QueryResult::PutRecord(res),
+							stats,
+							..
+						} => {
 							let ev = match res {
-								Ok(ok) => DiscoveryOut::ValuePut(ok.key, stats.duration().unwrap_or_else(Default::default)),
+								Ok(ok) => DiscoveryOut::ValuePut(
+									ok.key,
+									stats.duration().unwrap_or_else(Default::default),
+								),
 								Err(e) => {
 									debug!(target: "sub-libp2p",
 										"Libp2p => Failed to put record: {:?}", e);
-									DiscoveryOut::ValuePutFailed(e.into_key(), stats.duration().unwrap_or_else(Default::default))
-								}
+									DiscoveryOut::ValuePutFailed(
+										e.into_key(),
+										stats.duration().unwrap_or_else(Default::default),
+									)
+								},
 							};
-							return Poll::Ready(NetworkBehaviourAction::GenerateEvent(ev));
-						}
-						KademliaEvent::QueryResult { result: QueryResult::RepublishRecord(res), .. } => {
-							match res {
-								Ok(ok) => debug!(target: "sub-libp2p",
+							return Poll::Ready(NetworkBehaviourAction::GenerateEvent(ev))
+						},
+						KademliaEvent::QueryResult {
+							result: QueryResult::RepublishRecord(res),
+							..
+						} => match res {
+							Ok(ok) => debug!(target: "sub-libp2p",
 									"Libp2p => Record republished: {:?}",
 									ok.key),
-								Err(e) => debug!(target: "sub-libp2p",
+							Err(e) => debug!(target: "sub-libp2p",
 									"Libp2p => Republishing of record {:?} failed with: {:?}",
-									e.key(), e)
-							}
-						}
+									e.key(), e),
+						},
 						// We never start any other type of query.
 						e => {
 							warn!(target: "sub-libp2p", "Libp2p => Unhandled Kademlia event: {:?}", e)
-						}
-					}
+						},
+					},
 					NetworkBehaviourAction::DialAddress { address } =>
 						return Poll::Ready(NetworkBehaviourAction::DialAddress { address }),
 					NetworkBehaviourAction::DialPeer { peer_id, condition } =>
@@ -762,10 +824,13 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 						return Poll::Ready(NetworkBehaviourAction::NotifyHandler {
 							peer_id,
 							handler,
-							event: (pid.clone(), event)
+							event: (pid.clone(), event),
 						}),
 					NetworkBehaviourAction::ReportObservedAddr { address, score } =>
-						return Poll::Ready(NetworkBehaviourAction::ReportObservedAddr { address, score }),
+						return Poll::Ready(NetworkBehaviourAction::ReportObservedAddr {
+							address,
+							score,
+						}),
 				}
 			}
 		}
@@ -774,29 +839,30 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 		#[cfg(not(target_os = "unknown"))]
 		while let Poll::Ready(ev) = self.mdns.poll(cx, params) {
 			match ev {
-				NetworkBehaviourAction::GenerateEvent(event) => {
-					match event {
-						MdnsEvent::Discovered(list) => {
-							if self.num_connections >= self.discovery_only_if_under_num {
-								continue;
-							}
+				NetworkBehaviourAction::GenerateEvent(event) => match event {
+					MdnsEvent::Discovered(list) => {
+						if self.num_connections >= self.discovery_only_if_under_num {
+							continue
+						}
 
-							self.pending_events.extend(list.map(|(peer_id, _)| DiscoveryOut::Discovered(peer_id)));
-							if let Some(ev) = self.pending_events.pop_front() {
-								return Poll::Ready(NetworkBehaviourAction::GenerateEvent(ev));
-							}
-						},
-						MdnsEvent::Expired(_) => {}
-					}
+						self.pending_events
+							.extend(list.map(|(peer_id, _)| DiscoveryOut::Discovered(peer_id)));
+						if let Some(ev) = self.pending_events.pop_front() {
+							return Poll::Ready(NetworkBehaviourAction::GenerateEvent(ev))
+						}
+					},
+					MdnsEvent::Expired(_) => {},
 				},
 				NetworkBehaviourAction::DialAddress { address } =>
 					return Poll::Ready(NetworkBehaviourAction::DialAddress { address }),
 				NetworkBehaviourAction::DialPeer { peer_id, condition } =>
 					return Poll::Ready(NetworkBehaviourAction::DialPeer { peer_id, condition }),
-				NetworkBehaviourAction::NotifyHandler { event, .. } =>
-					match event {},		// `event` is an enum with no variant
+				NetworkBehaviourAction::NotifyHandler { event, .. } => match event {}, /* `event` is an enum with no variant */
 				NetworkBehaviourAction::ReportObservedAddr { address, score } =>
-					return Poll::Ready(NetworkBehaviourAction::ReportObservedAddr { address, score }),
+					return Poll::Ready(NetworkBehaviourAction::ReportObservedAddr {
+						address,
+						score,
+					}),
 			}
 		}
 
@@ -839,15 +905,14 @@ impl MdnsWrapper {
 	) -> Poll<NetworkBehaviourAction<void::Void, MdnsEvent>> {
 		loop {
 			match self {
-				MdnsWrapper::Instantiating(fut) => {
+				MdnsWrapper::Instantiating(fut) =>
 					*self = match futures::ready!(fut.as_mut().poll(cx)) {
 						Ok(mdns) => MdnsWrapper::Ready(mdns),
 						Err(err) => {
 							warn!(target: "sub-libp2p", "Failed to initialize mDNS: {:?}", err);
 							MdnsWrapper::Disabled
 						},
-					}
-				}
+					},
 				MdnsWrapper::Ready(mdns) => return mdns.poll(cx, params),
 				MdnsWrapper::Disabled => return Poll::Pending,
 			}
@@ -857,17 +922,20 @@ impl MdnsWrapper {
 
 #[cfg(test)]
 mod tests {
+	use super::{protocol_name_from_protocol_id, DiscoveryConfig, DiscoveryOut};
 	use crate::config::ProtocolId;
 	use futures::prelude::*;
-	use libp2p::identity::Keypair;
-	use libp2p::{Multiaddr, PeerId};
-	use libp2p::core::upgrade;
-	use libp2p::core::transport::{Transport, MemoryTransport};
-	use libp2p::noise;
-	use libp2p::swarm::Swarm;
-	use libp2p::yamux;
+	use libp2p::{
+		core::{
+			transport::{MemoryTransport, Transport},
+			upgrade,
+		},
+		identity::Keypair,
+		noise,
+		swarm::Swarm,
+		yamux, Multiaddr, PeerId,
+	};
 	use std::{collections::HashSet, task::Poll};
-	use super::{DiscoveryConfig, DiscoveryOut, protocol_name_from_protocol_id};
 
 	#[test]
 	fn discovery_working() {
@@ -876,50 +944,56 @@ mod tests {
 
 		// Build swarms whose behaviour is `DiscoveryBehaviour`, each aware of
 		// the first swarm via `with_user_defined`.
-		let mut swarms = (0..25).map(|i| {
-			let keypair = Keypair::generate_ed25519();
-
-			let noise_keys = noise::Keypair::<noise::X25519Spec>::new()
-				.into_authentic(&keypair)
-				.unwrap();
-
-			let transport = MemoryTransport
-				.upgrade(upgrade::Version::V1)
-				.authenticate(noise::NoiseConfig::xx(noise_keys).into_authenticated())
-				.multiplex(yamux::YamuxConfig::default())
-				.boxed();
-
-			let behaviour = {
-				let mut config = DiscoveryConfig::new(keypair.public());
-				config.with_user_defined(first_swarm_peer_id_and_addr.clone())
-					.allow_private_ipv4(true)
-					.allow_non_globals_in_dht(true)
-					.discovery_limit(50)
-					.add_protocol(protocol_id.clone());
-
-				config.finish()
-			};
+		let mut swarms = (0..25)
+			.map(|i| {
+				let keypair = Keypair::generate_ed25519();
+
+				let noise_keys =
+					noise::Keypair::<noise::X25519Spec>::new().into_authentic(&keypair).unwrap();
+
+				let transport = MemoryTransport
+					.upgrade(upgrade::Version::V1)
+					.authenticate(noise::NoiseConfig::xx(noise_keys).into_authenticated())
+					.multiplex(yamux::YamuxConfig::default())
+					.boxed();
+
+				let behaviour = {
+					let mut config = DiscoveryConfig::new(keypair.public());
+					config
+						.with_user_defined(first_swarm_peer_id_and_addr.clone())
+						.allow_private_ipv4(true)
+						.allow_non_globals_in_dht(true)
+						.discovery_limit(50)
+						.add_protocol(protocol_id.clone());
+
+					config.finish()
+				};
 
-			let mut swarm = Swarm::new(transport, behaviour, keypair.public().into_peer_id());
-			let listen_addr: Multiaddr = format!("/memory/{}", rand::random::<u64>()).parse().unwrap();
+				let mut swarm = Swarm::new(transport, behaviour, keypair.public().into_peer_id());
+				let listen_addr: Multiaddr =
+					format!("/memory/{}", rand::random::<u64>()).parse().unwrap();
 
-			if i == 0 {
-				first_swarm_peer_id_and_addr = Some((keypair.public().into_peer_id(), listen_addr.clone()))
-			}
+				if i == 0 {
+					first_swarm_peer_id_and_addr =
+						Some((keypair.public().into_peer_id(), listen_addr.clone()))
+				}
 
-			swarm.listen_on(listen_addr.clone()).unwrap();
-			(swarm, listen_addr)
-		}).collect::<Vec<_>>();
+				swarm.listen_on(listen_addr.clone()).unwrap();
+				(swarm, listen_addr)
+			})
+			.collect::<Vec<_>>();
 
 		// Build a `Vec<HashSet<PeerId>>` with the list of nodes remaining to be discovered.
-		let mut to_discover = (0..swarms.len()).map(|n| {
-			(0..swarms.len())
-				// Skip the first swarm as all other swarms already know it.
-				.skip(1)
-				.filter(|p| *p != n)
-				.map(|p| Swarm::local_peer_id(&swarms[p].0).clone())
-				.collect::<HashSet<_>>()
-		}).collect::<Vec<_>>();
+		let mut to_discover = (0..swarms.len())
+			.map(|n| {
+				(0..swarms.len())
+					// Skip the first swarm as all other swarms already know it.
+					.skip(1)
+					.filter(|p| *p != n)
+					.map(|p| Swarm::local_peer_id(&swarms[p].0).clone())
+					.collect::<HashSet<_>>()
+			})
+			.collect::<Vec<_>>();
 
 		let fut = futures::future::poll_fn(move |cx| {
 			'polling: loop {
@@ -927,13 +1001,17 @@ mod tests {
 					match swarms[swarm_n].0.poll_next_unpin(cx) {
 						Poll::Ready(Some(e)) => {
 							match e {
-								DiscoveryOut::UnroutablePeer(other) | DiscoveryOut::Discovered(other) => {
+								DiscoveryOut::UnroutablePeer(other) |
+								DiscoveryOut::Discovered(other) => {
 									// Call `add_self_reported_address` to simulate identify happening.
-									let addr = swarms.iter().find_map(|(s, a)|
-										if s.behaviour().local_peer_id == other {
-											Some(a.clone())
-										} else {
-											None
+									let addr = swarms
+										.iter()
+										.find_map(|(s, a)| {
+											if s.behaviour().local_peer_id == other {
+												Some(a.clone())
+											} else {
+												None
+											}
 										})
 										.unwrap();
 									swarms[swarm_n].0.behaviour_mut().add_self_reported_address(
@@ -945,11 +1023,13 @@ mod tests {
 									to_discover[swarm_n].remove(&other);
 								},
 								DiscoveryOut::RandomKademliaStarted(_) => {},
-								e => {panic!("Unexpected event: {:?}", e)},
+								e => {
+									panic!("Unexpected event: {:?}", e)
+								},
 							}
 							continue 'polling
-						}
-						_ => {}
+						},
+						_ => {},
 					}
 				}
 				break
@@ -973,7 +1053,8 @@ mod tests {
 		let mut discovery = {
 			let keypair = Keypair::generate_ed25519();
 			let mut config = DiscoveryConfig::new(keypair.public());
-			config.allow_private_ipv4(true)
+			config
+				.allow_private_ipv4(true)
 				.allow_non_globals_in_dht(true)
 				.discovery_limit(50)
 				.add_protocol(supported_protocol_id.clone());
@@ -992,7 +1073,8 @@ mod tests {
 
 		for kademlia in discovery.kademlias.values_mut() {
 			assert!(
-				kademlia.kbucket(remote_peer_id.clone())
+				kademlia
+					.kbucket(remote_peer_id.clone())
 					.expect("Remote peer id not to be equal to local peer id.")
 					.is_empty(),
 				"Expect peer with unsupported protocol not to be added."
@@ -1009,7 +1091,8 @@ mod tests {
 		for kademlia in discovery.kademlias.values_mut() {
 			assert_eq!(
 				1,
-				kademlia.kbucket(remote_peer_id.clone())
+				kademlia
+					.kbucket(remote_peer_id.clone())
 					.expect("Remote peer id not to be equal to local peer id.")
 					.num_entries(),
 				"Expect peer with supported protocol to be added."
@@ -1025,7 +1108,8 @@ mod tests {
 		let mut discovery = {
 			let keypair = Keypair::generate_ed25519();
 			let mut config = DiscoveryConfig::new(keypair.public());
-			config.allow_private_ipv4(true)
+			config
+				.allow_private_ipv4(true)
 				.allow_non_globals_in_dht(true)
 				.discovery_limit(50)
 				.add_protocol(protocol_a.clone())
@@ -1045,17 +1129,20 @@ mod tests {
 
 		assert_eq!(
 			1,
-			discovery.kademlias.get_mut(&protocol_a)
+			discovery
+				.kademlias
+				.get_mut(&protocol_a)
 				.expect("Kademlia instance to exist.")
 				.kbucket(remote_peer_id.clone())
 				.expect("Remote peer id not to be equal to local peer id.")
 				.num_entries(),
 			"Expected remote peer to be added to `protocol_a` Kademlia instance.",
-
 		);
 
 		assert!(
-			discovery.kademlias.get_mut(&protocol_b)
+			discovery
+				.kademlias
+				.get_mut(&protocol_b)
 				.expect("Kademlia instance to exist.")
 				.kbucket(remote_peer_id.clone())
 				.expect("Remote peer id not to be equal to local peer id.")
diff --git a/client/network/src/error.rs b/client/network/src/error.rs
index 2a226b58b46a..32fc6f9e1e31 100644
--- a/client/network/src/error.rs
+++ b/client/network/src/error.rs
@@ -19,7 +19,7 @@
 //! Substrate network possible errors.
 
 use crate::config::TransportConfig;
-use libp2p::{PeerId, Multiaddr};
+use libp2p::{Multiaddr, PeerId};
 
 use std::{borrow::Cow, fmt};
 
@@ -38,7 +38,7 @@ pub enum Error {
 		fmt = "The same bootnode (`{}`) is registered with two different peer ids: `{}` and `{}`",
 		address,
 		first_id,
-		second_id,
+		second_id
 	)]
 	DuplicateBootnode {
 		/// The address of the bootnode.
@@ -53,7 +53,7 @@ pub enum Error {
 	/// The network addresses are invalid because they don't match the transport.
 	#[display(
 		fmt = "The following addresses are invalid because they don't match the transport: {:?}",
-		addresses,
+		addresses
 	)]
 	AddressesForAnotherTransport {
 		/// Transport used.
diff --git a/client/network/src/lib.rs b/client/network/src/lib.rs
index b43836cacaa5..c812390ec6a6 100644
--- a/client/network/src/lib.rs
+++ b/client/network/src/lib.rs
@@ -243,13 +243,12 @@
 //! - Calling `trigger_repropagate` when a transaction is added to the pool.
 //!
 //! More precise usage details are still being worked on and will likely change in the future.
-//!
 
 mod behaviour;
 mod chain;
-mod peer_info;
 mod discovery;
 mod on_demand_layer;
+mod peer_info;
 mod protocol;
 mod request_responses;
 mod schema;
@@ -257,22 +256,25 @@ mod service;
 mod transport;
 mod utils;
 
-pub mod block_request_handler;
 pub mod bitswap;
-pub mod light_client_requests;
-pub mod state_request_handler;
+pub mod block_request_handler;
 pub mod config;
 pub mod error;
+pub mod light_client_requests;
 pub mod network_state;
+pub mod state_request_handler;
 pub mod transactions;
 
 #[doc(inline)]
 pub use libp2p::{multiaddr, Multiaddr, PeerId};
-pub use protocol::{event::{DhtEvent, Event, ObservedRole}, PeerInfo};
-pub use protocol::sync::{SyncState, StateDownloadProgress};
+pub use protocol::{
+	event::{DhtEvent, Event, ObservedRole},
+	sync::{StateDownloadProgress, SyncState},
+	PeerInfo,
+};
 pub use service::{
-	NetworkService, NetworkWorker, RequestFailure, OutboundFailure, NotificationSender,
-	NotificationSenderReady, IfDisconnected,
+	IfDisconnected, NetworkService, NetworkWorker, NotificationSender, NotificationSenderReady,
+	OutboundFailure, RequestFailure,
 };
 
 pub use sc_peerset::ReputationChange;
diff --git a/client/network/src/light_client_requests.rs b/client/network/src/light_client_requests.rs
index f859a35f45b2..8489585e2883 100644
--- a/client/network/src/light_client_requests.rs
+++ b/client/network/src/light_client_requests.rs
@@ -18,13 +18,12 @@
 
 //! Helpers for outgoing and incoming light client requests.
 
-/// For outgoing light client requests.
-pub mod sender;
 /// For incoming light client requests.
 pub mod handler;
+/// For outgoing light client requests.
+pub mod sender;
 
-use crate::config::ProtocolId;
-use crate::request_responses::ProtocolConfig;
+use crate::{config::ProtocolId, request_responses::ProtocolConfig};
 
 use std::time::Duration;
 
@@ -51,24 +50,30 @@ pub fn generate_protocol_config(protocol_id: &ProtocolId) -> ProtocolConfig {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use crate::request_responses::IncomingRequest;
-	use crate::config::ProtocolId;
+	use crate::{config::ProtocolId, request_responses::IncomingRequest};
 
 	use assert_matches::assert_matches;
-	use futures::executor::{block_on, LocalPool};
-	use futures::task::Spawn;
-	use futures::{channel::oneshot, prelude::*};
+	use futures::{
+		channel::oneshot,
+		executor::{block_on, LocalPool},
+		prelude::*,
+		task::Spawn,
+	};
 	use libp2p::PeerId;
-	use sc_client_api::StorageProof;
-	use sc_client_api::light::{RemoteCallRequest, RemoteChangesRequest, RemoteHeaderRequest};
-	use sc_client_api::light::{self, RemoteReadRequest, RemoteBodyRequest, ChangesProof};
-	use sc_client_api::{FetchChecker, RemoteReadChildRequest};
+	use sc_client_api::{
+		light::{
+			self, ChangesProof, RemoteBodyRequest, RemoteCallRequest, RemoteChangesRequest,
+			RemoteHeaderRequest, RemoteReadRequest,
+		},
+		FetchChecker, RemoteReadChildRequest, StorageProof,
+	};
 	use sp_blockchain::Error as ClientError;
 	use sp_core::storage::ChildInfo;
-	use sp_runtime::generic::Header;
-	use sp_runtime::traits::{BlakeTwo256, Block as BlockT, NumberFor};
-	use std::collections::HashMap;
-	use std::sync::Arc;
+	use sp_runtime::{
+		generic::Header,
+		traits::{BlakeTwo256, Block as BlockT, NumberFor},
+	};
+	use std::{collections::HashMap, sync::Arc};
 
 	pub struct DummyFetchChecker<B> {
 		pub ok: bool,
@@ -94,12 +99,7 @@ mod tests {
 			_: StorageProof,
 		) -> Result<HashMap<Vec<u8>, Option<Vec<u8>>>, ClientError> {
 			match self.ok {
-				true => Ok(request
-					.keys
-					.iter()
-					.cloned()
-					.map(|k| (k, Some(vec![42])))
-					.collect()),
+				true => Ok(request.keys.iter().cloned().map(|k| (k, Some(vec![42]))).collect()),
 				false => Err(ClientError::Backend("Test error".into())),
 			}
 		}
@@ -110,12 +110,7 @@ mod tests {
 			_: StorageProof,
 		) -> Result<HashMap<Vec<u8>, Option<Vec<u8>>>, ClientError> {
 			match self.ok {
-				true => Ok(request
-					.keys
-					.iter()
-					.cloned()
-					.map(|k| (k, Some(vec![42])))
-					.collect()),
+				true => Ok(request.keys.iter().cloned().map(|k| (k, Some(vec![42]))).collect()),
 				false => Err(ClientError::Backend("Test error".into())),
 			}
 		}
@@ -184,7 +179,8 @@ mod tests {
 
 	fn send_receive(request: sender::Request<Block>, pool: &LocalPool) {
 		let client = Arc::new(substrate_test_runtime_client::new());
-		let (handler, protocol_config) = handler::LightClientRequestHandler::new(&protocol_id(), client);
+		let (handler, protocol_config) =
+			handler::LightClientRequestHandler::new(&protocol_id(), client);
 		pool.spawner().spawn_obj(handler.run().boxed().into()).unwrap();
 
 		let (_peer_set, peer_set_handle) = peerset();
@@ -199,18 +195,28 @@ mod tests {
 		sender.inject_connected(PeerId::random());
 
 		sender.request(request).unwrap();
-		let sender::OutEvent::SendRequest { pending_response, request, .. } = block_on(sender.next()).unwrap();
+		let sender::OutEvent::SendRequest { pending_response, request, .. } =
+			block_on(sender.next()).unwrap();
 		let (tx, rx) = oneshot::channel();
 		block_on(protocol_config.inbound_queue.unwrap().send(IncomingRequest {
 			peer: PeerId::random(),
 			payload: request,
 			pending_response: tx,
-		})).unwrap();
-		pool.spawner().spawn_obj(async move {
-			pending_response.send(Ok(rx.await.unwrap().result.unwrap())).unwrap();
-		}.boxed().into()).unwrap();
-
-		pool.spawner().spawn_obj(sender.for_each(|_| future::ready(())).boxed().into()).unwrap();
+		}))
+		.unwrap();
+		pool.spawner()
+			.spawn_obj(
+				async move {
+					pending_response.send(Ok(rx.await.unwrap().result.unwrap())).unwrap();
+				}
+				.boxed()
+				.into(),
+			)
+			.unwrap();
+
+		pool.spawner()
+			.spawn_obj(sender.for_each(|_| future::ready(())).boxed().into())
+			.unwrap();
 	}
 
 	#[test]
@@ -225,10 +231,7 @@ mod tests {
 		};
 
 		let mut pool = LocalPool::new();
-		send_receive(sender::Request::Call {
-			request,
-			sender: chan.0,
-		}, &pool);
+		send_receive(sender::Request::Call { request, sender: chan.0 }, &pool);
 		assert_eq!(vec![42], pool.run_until(chan.1).unwrap().unwrap());
 		//              ^--- from `DummyFetchChecker::check_execution_proof`
 	}
@@ -243,17 +246,10 @@ mod tests {
 			retry_count: None,
 		};
 		let mut pool = LocalPool::new();
-		send_receive(sender::Request::Read {
-			request,
-			sender: chan.0,
-		}, &pool);
+		send_receive(sender::Request::Read { request, sender: chan.0 }, &pool);
 		assert_eq!(
 			Some(vec![42]),
-			pool.run_until(chan.1)
-				.unwrap()
-				.unwrap()
-				.remove(&b":key"[..])
-				.unwrap()
+			pool.run_until(chan.1).unwrap().unwrap().remove(&b":key"[..]).unwrap()
 		);
 		//                   ^--- from `DummyFetchChecker::check_read_proof`
 	}
@@ -270,17 +266,10 @@ mod tests {
 			retry_count: None,
 		};
 		let mut pool = LocalPool::new();
-		send_receive(sender::Request::ReadChild {
-			request,
-			sender: chan.0,
-		}, &pool);
+		send_receive(sender::Request::ReadChild { request, sender: chan.0 }, &pool);
 		assert_eq!(
 			Some(vec![42]),
-			pool.run_until(chan.1)
-				.unwrap()
-				.unwrap()
-				.remove(&b":key"[..])
-				.unwrap()
+			pool.run_until(chan.1).unwrap().unwrap().remove(&b":key"[..]).unwrap()
 		);
 		//                   ^--- from `DummyFetchChecker::check_read_child_proof`
 	}
@@ -295,15 +284,9 @@ mod tests {
 			retry_count: None,
 		};
 		let mut pool = LocalPool::new();
-		send_receive(sender::Request::Header {
-			request,
-			sender: chan.0,
-		}, &pool);
+		send_receive(sender::Request::Header { request, sender: chan.0 }, &pool);
 		// The remote does not know block 1:
-		assert_matches!(
-			pool.run_until(chan.1).unwrap(),
-			Err(ClientError::RemoteFetchFailed)
-		);
+		assert_matches!(pool.run_until(chan.1).unwrap(), Err(ClientError::RemoteFetchFailed));
 	}
 
 	#[test]
@@ -324,10 +307,7 @@ mod tests {
 			retry_count: None,
 		};
 		let mut pool = LocalPool::new();
-		send_receive(sender::Request::Changes {
-			request,
-			sender: chan.0,
-		}, &pool);
+		send_receive(sender::Request::Changes { request, sender: chan.0 }, &pool);
 		assert_eq!(vec![(100, 2)], pool.run_until(chan.1).unwrap().unwrap());
 		//              ^--- from `DummyFetchChecker::check_changes_proof`
 	}
diff --git a/client/network/src/light_client_requests/handler.rs b/client/network/src/light_client_requests/handler.rs
index 1cfae0a3cb1d..609ed35f4a9d 100644
--- a/client/network/src/light_client_requests/handler.rs
+++ b/client/network/src/light_client_requests/handler.rs
@@ -22,34 +22,27 @@
 //! [`crate::request_responses::RequestResponsesBehaviour`] with
 //! [`LightClientRequestHandler`](handler::LightClientRequestHandler).
 
-use codec::{self, Encode, Decode};
 use crate::{
 	chain::Client,
 	config::ProtocolId,
-	schema,
-	PeerId,
+	request_responses::{IncomingRequest, OutgoingResponse, ProtocolConfig},
+	schema, PeerId,
 };
-use crate::request_responses::{IncomingRequest, OutgoingResponse, ProtocolConfig};
-use futures::{channel::mpsc,  prelude::*};
+use codec::{self, Decode, Encode};
+use futures::{channel::mpsc, prelude::*};
+use log::{debug, trace};
 use prost::Message;
-use sc_client_api::{
-	StorageProof,
-	light
-};
+use sc_client_api::{light, StorageProof};
 use sc_peerset::ReputationChange;
 use sp_core::{
-	storage::{ChildInfo, ChildType,StorageKey, PrefixedStorageKey},
 	hexdisplay::HexDisplay,
+	storage::{ChildInfo, ChildType, PrefixedStorageKey, StorageKey},
 };
 use sp_runtime::{
-	traits::{Block, Zero},
 	generic::BlockId,
+	traits::{Block, Zero},
 };
-use std::{
-	collections::{BTreeMap},
-	sync::Arc,
-};
-use log::{trace, debug};
+use std::{collections::BTreeMap, sync::Arc};
 
 const LOG_TARGET: &str = "light-client-request-handler";
 
@@ -62,10 +55,7 @@ pub struct LightClientRequestHandler<B: Block> {
 
 impl<B: Block> LightClientRequestHandler<B> {
 	/// Create a new [`crate::block_request_handler::BlockRequestHandler`].
-	pub fn new(
-		protocol_id: &ProtocolId,
-		client: Arc<dyn Client<B>>,
-	) -> (Self, ProtocolConfig) {
+	pub fn new(protocol_id: &ProtocolId, client: Arc<dyn Client<B>>) -> (Self, ProtocolConfig) {
 		// For now due to lack of data on light client request handling in production systems, this
 		// value is chosen to match the block request limit.
 		let (tx, request_receiver) = mpsc::channel(20);
@@ -86,7 +76,7 @@ impl<B: Block> LightClientRequestHandler<B> {
 					let response = OutgoingResponse {
 						result: Ok(response_data),
 						reputation_changes: Vec::new(),
-						sent_feedback: None
+						sent_feedback: None,
 					};
 
 					match pending_response.send(response) {
@@ -98,35 +88,36 @@ impl<B: Block> LightClientRequestHandler<B> {
 						Err(_) => debug!(
 							target: LOG_TARGET,
 							"Failed to handle light client request from {}: {}",
-							peer, HandleRequestError::SendResponse,
+							peer,
+							HandleRequestError::SendResponse,
 						),
 					};
-				} ,
+				},
 				Err(e) => {
 					debug!(
 						target: LOG_TARGET,
-						"Failed to handle light client request from {}: {}",
-						peer, e,
+						"Failed to handle light client request from {}: {}", peer, e,
 					);
 
 					let reputation_changes = match e {
 						HandleRequestError::BadRequest(_) => {
 							vec![ReputationChange::new(-(1 << 12), "bad request")]
-						}
+						},
 						_ => Vec::new(),
 					};
 
 					let response = OutgoingResponse {
 						result: Err(()),
 						reputation_changes,
-						sent_feedback: None
+						sent_feedback: None,
 					};
 
 					if pending_response.send(response).is_err() {
 						debug!(
 							target: LOG_TARGET,
 							"Failed to handle light client request from {}: {}",
-							peer, HandleRequestError::SendResponse,
+							peer,
+							HandleRequestError::SendResponse,
 						);
 					};
 				},
@@ -134,7 +125,6 @@ impl<B: Block> LightClientRequestHandler<B> {
 		}
 	}
 
-
 	fn handle_request(
 		&mut self,
 		peer: PeerId,
@@ -153,9 +143,8 @@ impl<B: Block> LightClientRequestHandler<B> {
 				self.on_remote_read_child_request(&peer, r)?,
 			Some(schema::v1::light::request::Request::RemoteChangesRequest(r)) =>
 				self.on_remote_changes_request(&peer, r)?,
-			None => {
-				return Err(HandleRequestError::BadRequest("Remote request without request data."));
-			}
+			None =>
+				return Err(HandleRequestError::BadRequest("Remote request without request data.")),
 		};
 
 		let mut data = Vec::new();
@@ -171,24 +160,30 @@ impl<B: Block> LightClientRequestHandler<B> {
 	) -> Result<schema::v1::light::Response, HandleRequestError> {
 		log::trace!(
 			"Remote call request from {} ({} at {:?}).",
-			peer, request.method, request.block,
+			peer,
+			request.method,
+			request.block,
 		);
 
 		let block = Decode::decode(&mut request.block.as_ref())?;
 
-		let proof = match self.client.execution_proof(
-			&BlockId::Hash(block),
-			&request.method, &request.data,
-		) {
-			Ok((_, proof)) => proof,
-			Err(e) => {
-				log::trace!(
-					"remote call request from {} ({} at {:?}) failed with: {}",
-					peer, request.method, request.block, e,
-				);
-				StorageProof::empty()
-			}
-		};
+		let proof =
+			match self
+				.client
+				.execution_proof(&BlockId::Hash(block), &request.method, &request.data)
+			{
+				Ok((_, proof)) => proof,
+				Err(e) => {
+					log::trace!(
+						"remote call request from {} ({} at {:?}) failed with: {}",
+						peer,
+						request.method,
+						request.block,
+						e,
+					);
+					StorageProof::empty()
+				},
+			};
 
 		let response = {
 			let r = schema::v1::light::RemoteCallResponse { proof: proof.encode() };
@@ -210,23 +205,28 @@ impl<B: Block> LightClientRequestHandler<B> {
 
 		log::trace!(
 			"Remote read request from {} ({} at {:?}).",
-			peer, fmt_keys(request.keys.first(), request.keys.last()), request.block,
+			peer,
+			fmt_keys(request.keys.first(), request.keys.last()),
+			request.block,
 		);
 
 		let block = Decode::decode(&mut request.block.as_ref())?;
 
-		let proof = match self.client.read_proof(
-			&BlockId::Hash(block),
-			&mut request.keys.iter().map(AsRef::as_ref),
-		) {
+		let proof = match self
+			.client
+			.read_proof(&BlockId::Hash(block), &mut request.keys.iter().map(AsRef::as_ref))
+		{
 			Ok(proof) => proof,
 			Err(error) => {
 				log::trace!(
 					"remote read request from {} ({} at {:?}) failed with: {}",
-					peer, fmt_keys(request.keys.first(), request.keys.last()), request.block, error,
+					peer,
+					fmt_keys(request.keys.first(), request.keys.last()),
+					request.block,
+					error,
 				);
 				StorageProof::empty()
-			}
+			},
 		};
 
 		let response = {
@@ -262,11 +262,13 @@ impl<B: Block> LightClientRequestHandler<B> {
 			Some((ChildType::ParentKeyId, storage_key)) => Ok(ChildInfo::new_default(storage_key)),
 			None => Err(sp_blockchain::Error::InvalidChildStorageKey),
 		};
-		let proof = match child_info.and_then(|child_info| self.client.read_child_proof(
-			&BlockId::Hash(block),
-			&child_info,
-			&mut request.keys.iter().map(AsRef::as_ref)
-		)) {
+		let proof = match child_info.and_then(|child_info| {
+			self.client.read_child_proof(
+				&BlockId::Hash(block),
+				&child_info,
+				&mut request.keys.iter().map(AsRef::as_ref),
+			)
+		}) {
 			Ok(proof) => proof,
 			Err(error) => {
 				log::trace!(
@@ -278,7 +280,7 @@ impl<B: Block> LightClientRequestHandler<B> {
 					error,
 				);
 				StorageProof::empty()
-			}
+			},
 		};
 
 		let response = {
@@ -302,10 +304,12 @@ impl<B: Block> LightClientRequestHandler<B> {
 			Err(error) => {
 				log::trace!(
 					"Remote header proof request from {} ({:?}) failed with: {}.",
-					peer, request.block, error
+					peer,
+					request.block,
+					error
 				);
 				(Default::default(), StorageProof::empty())
-			}
+			},
 		};
 
 		let response = {
@@ -325,7 +329,11 @@ impl<B: Block> LightClientRequestHandler<B> {
 			"Remote changes proof request from {} for key {} ({:?}..{:?}).",
 			peer,
 			if !request.storage_key.is_empty() {
-				format!("{} : {}", HexDisplay::from(&request.storage_key), HexDisplay::from(&request.key))
+				format!(
+					"{} : {}",
+					HexDisplay::from(&request.storage_key),
+					HexDisplay::from(&request.key)
+				)
 			} else {
 				HexDisplay::from(&request.key).to_string()
 			},
@@ -344,10 +352,11 @@ impl<B: Block> LightClientRequestHandler<B> {
 			Some(PrefixedStorageKey::new_ref(&request.storage_key))
 		};
 
-		let proof = match self.client.key_changes_proof(first, last, min, max, storage_key, &key) {
-			Ok(proof) => proof,
-			Err(error) => {
-				log::trace!(
+		let proof =
+			match self.client.key_changes_proof(first, last, min, max, storage_key, &key) {
+				Ok(proof) => proof,
+				Err(error) => {
+					log::trace!(
 					"Remote changes proof request from {} for key {} ({:?}..{:?}) failed with: {}.",
 					peer,
 					format!("{} : {}", HexDisplay::from(&request.storage_key), HexDisplay::from(&key.0)),
@@ -356,20 +365,22 @@ impl<B: Block> LightClientRequestHandler<B> {
 					error,
 				);
 
-				light::ChangesProof::<B::Header> {
-					max_block: Zero::zero(),
-					proof: Vec::new(),
-					roots: BTreeMap::new(),
-					roots_proof: StorageProof::empty(),
-				}
-			}
-		};
+					light::ChangesProof::<B::Header> {
+						max_block: Zero::zero(),
+						proof: Vec::new(),
+						roots: BTreeMap::new(),
+						roots_proof: StorageProof::empty(),
+					}
+				},
+			};
 
 		let response = {
 			let r = schema::v1::light::RemoteChangesResponse {
 				max: proof.max_block.encode(),
 				proof: proof.proof,
-				roots: proof.roots.into_iter()
+				roots: proof
+					.roots
+					.into_iter()
 					.map(|(k, v)| schema::v1::light::Pair { fst: k.encode(), snd: v.encode() })
 					.collect(),
 				roots_proof: proof.roots_proof.encode(),
diff --git a/client/network/src/light_client_requests/sender.rs b/client/network/src/light_client_requests/sender.rs
index 77efa1b982e7..2320d3bcb678 100644
--- a/client/network/src/light_client_requests/sender.rs
+++ b/client/network/src/light_client_requests/sender.rs
@@ -29,28 +29,21 @@
 //! 3. Wait for the response and forward the response via the [`futures::channel::oneshot::Sender`] provided earlier
 //! with [`LightClientRequestSender::request`](sender::LightClientRequestSender::request).
 
-use codec::{self, Encode, Decode};
 use crate::{
 	config::ProtocolId,
-	protocol::message::{BlockAttributes},
-	schema,
-	PeerId,
+	protocol::message::BlockAttributes,
+	request_responses::{OutboundFailure, RequestFailure},
+	schema, PeerId,
 };
-use crate::request_responses::{RequestFailure, OutboundFailure};
-use futures::{channel::{oneshot}, future::BoxFuture, prelude::*, stream::FuturesUnordered};
+use codec::{self, Decode, Encode};
+use futures::{channel::oneshot, future::BoxFuture, prelude::*, stream::FuturesUnordered};
 use prost::Message;
-use sc_client_api::{
-	light::{
-		self, RemoteBodyRequest,
-	}
-};
+use sc_client_api::light::{self, RemoteBodyRequest};
 use sc_peerset::ReputationChange;
-use sp_blockchain::{Error as ClientError};
-use sp_runtime::{
-	traits::{Block, Header, NumberFor},
-};
+use sp_blockchain::Error as ClientError;
+use sp_runtime::traits::{Block, Header, NumberFor};
 use std::{
-	collections::{BTreeMap, VecDeque, HashMap},
+	collections::{BTreeMap, HashMap, VecDeque},
 	pin::Pin,
 	sync::Arc,
 	task::{Context, Poll},
@@ -60,9 +53,11 @@ mod rep {
 	use super::*;
 
 	/// Reputation change for a peer when a request timed out.
-	pub const TIMEOUT: ReputationChange = ReputationChange::new(-(1 << 8), "light client request timeout");
+	pub const TIMEOUT: ReputationChange =
+		ReputationChange::new(-(1 << 8), "light client request timeout");
 	/// Reputation change for a peer when a request is refused.
-	pub const REFUSED: ReputationChange = ReputationChange::new(-(1 << 8), "light client request refused");
+	pub const REFUSED: ReputationChange =
+		ReputationChange::new(-(1 << 8), "light client request refused");
 }
 
 /// Configuration options for [`LightClientRequestSender`].
@@ -95,9 +90,12 @@ pub struct LightClientRequestSender<B: Block> {
 	/// Pending (local) requests.
 	pending_requests: VecDeque<PendingRequest<B>>,
 	/// Requests on their way to remote peers.
-	sent_requests: FuturesUnordered<BoxFuture<
-			'static, (SentRequest<B>, Result<Result<Vec<u8>, RequestFailure>, oneshot::Canceled>),
-		>>,
+	sent_requests: FuturesUnordered<
+		BoxFuture<
+			'static,
+			(SentRequest<B>, Result<Result<Vec<u8>, RequestFailure>, oneshot::Canceled>),
+		>,
+	>,
 	/// Handle to use for reporting misbehaviour of peers.
 	peerset: sc_peerset::PeersetHandle,
 }
@@ -121,11 +119,7 @@ impl<B: Block> PendingRequest<B> {
 	}
 
 	fn into_sent(self, peer_id: PeerId) -> SentRequest<B> {
-		SentRequest {
-			attempts_left: self.attempts_left,
-			request: self.request,
-			peer: peer_id,
-		}
+		SentRequest { attempts_left: self.attempts_left, request: self.request, peer: peer_id }
 	}
 }
 
@@ -142,10 +136,7 @@ struct SentRequest<B: Block> {
 
 impl<B: Block> SentRequest<B> {
 	fn into_pending(self) -> PendingRequest<B> {
-		PendingRequest {
-			attempts_left: self.attempts_left,
-			request: self.request,
-		}
+		PendingRequest { attempts_left: self.attempts_left, request: self.request }
 	}
 }
 
@@ -206,7 +197,7 @@ where
 		peer: PeerId,
 		request: &Request<B>,
 		response: Response,
-	) -> Result<Reply<B>, Error>	{
+	) -> Result<Reply<B>, Error> {
 		log::trace!("response from {}", peer);
 		match response {
 			Response::Light(r) => self.on_response_light(request, r),
@@ -222,27 +213,26 @@ where
 		use schema::v1::light::response::Response;
 		match response.response {
 			Some(Response::RemoteCallResponse(response)) =>
-				if let Request::Call { request , .. } = request {
+				if let Request::Call { request, .. } = request {
 					let proof = Decode::decode(&mut response.proof.as_ref())?;
 					let reply = self.checker.check_execution_proof(request, proof)?;
 					Ok(Reply::VecU8(reply))
 				} else {
 					Err(Error::UnexpectedResponse)
-				}
-			Some(Response::RemoteReadResponse(response)) =>
-				match request {
-					Request::Read { request, .. } => {
-						let proof = Decode::decode(&mut response.proof.as_ref())?;
-						let reply = self.checker.check_read_proof(&request, proof)?;
-						Ok(Reply::MapVecU8OptVecU8(reply))
-					}
-					Request::ReadChild { request, .. } => {
-						let proof = Decode::decode(&mut response.proof.as_ref())?;
-						let reply = self.checker.check_read_child_proof(&request, proof)?;
-						Ok(Reply::MapVecU8OptVecU8(reply))
-					}
-					_ => Err(Error::UnexpectedResponse)
-				}
+				},
+			Some(Response::RemoteReadResponse(response)) => match request {
+				Request::Read { request, .. } => {
+					let proof = Decode::decode(&mut response.proof.as_ref())?;
+					let reply = self.checker.check_read_proof(&request, proof)?;
+					Ok(Reply::MapVecU8OptVecU8(reply))
+				},
+				Request::ReadChild { request, .. } => {
+					let proof = Decode::decode(&mut response.proof.as_ref())?;
+					let reply = self.checker.check_read_child_proof(&request, proof)?;
+					Ok(Reply::MapVecU8OptVecU8(reply))
+				},
+				_ => Err(Error::UnexpectedResponse),
+			},
 			Some(Response::RemoteChangesResponse(response)) =>
 				if let Request::Changes { request, .. } = request {
 					let max_block = Decode::decode(&mut response.max.as_ref())?;
@@ -256,31 +246,33 @@ where
 						}
 						r
 					};
-					let reply = self.checker.check_changes_proof(&request, light::ChangesProof {
-						max_block,
-						proof: response.proof,
-						roots,
-						roots_proof,
-					})?;
+					let reply = self.checker.check_changes_proof(
+						&request,
+						light::ChangesProof {
+							max_block,
+							proof: response.proof,
+							roots,
+							roots_proof,
+						},
+					)?;
 					Ok(Reply::VecNumberU32(reply))
 				} else {
 					Err(Error::UnexpectedResponse)
-				}
+				},
 			Some(Response::RemoteHeaderResponse(response)) =>
 				if let Request::Header { request, .. } = request {
-					let header =
-						if response.header.is_empty() {
-							None
-						} else {
-							Some(Decode::decode(&mut response.header.as_ref())?)
-						};
+					let header = if response.header.is_empty() {
+						None
+					} else {
+						Some(Decode::decode(&mut response.header.as_ref())?)
+					};
 					let proof = Decode::decode(&mut response.proof.as_ref())?;
 					let reply = self.checker.check_header_proof(&request, header, proof)?;
 					Ok(Reply::Header(reply))
 				} else {
 					Err(Error::UnexpectedResponse)
-				}
-			None => Err(Error::UnexpectedResponse)
+				},
+			None => Err(Error::UnexpectedResponse),
 		}
 	}
 
@@ -289,10 +281,10 @@ where
 		request: &Request<B>,
 		response: schema::v1::BlockResponse,
 	) -> Result<Reply<B>, Error> {
-		let request = if let Request::Body { request , .. } = &request {
+		let request = if let Request::Body { request, .. } = &request {
 			request
 		} else {
-			return Err(Error::UnexpectedResponse);
+			return Err(Error::UnexpectedResponse)
 		};
 
 		let body: Vec<_> = match response.blocks.into_iter().next() {
@@ -300,7 +292,8 @@ where
 			None => return Err(Error::UnexpectedResponse),
 		};
 
-		let body = body.into_iter()
+		let body = body
+			.into_iter()
 			.map(|extrinsic| B::Extrinsic::decode(&mut &extrinsic[..]))
 			.collect::<Result<_, _>>()?;
 
@@ -323,13 +316,14 @@ where
 	}
 }
 
-
 impl<B: Block> Stream for LightClientRequestSender<B> {
 	type Item = OutEvent;
 
 	fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Option<Self::Item>> {
 		// If we have received responses to previously sent requests, check them and pass them on.
-		while let Poll::Ready(Some((sent_request, request_result))) = self.sent_requests.poll_next_unpin(cx) {
+		while let Poll::Ready(Some((sent_request, request_result))) =
+			self.sent_requests.poll_next_unpin(cx)
+		{
 			if let Some(info) = self.peers.get_mut(&sent_request.peer) {
 				if info.status != PeerStatus::Busy {
 					// If we get here, something is wrong with our internal handling of peer status
@@ -347,30 +341,38 @@ impl<B: Block> Stream for LightClientRequestSender<B> {
 				Err(oneshot::Canceled) => {
 					log::debug!("Oneshot for request to peer {} was canceled.", sent_request.peer);
 					self.remove_peer(sent_request.peer);
-					self.peerset.report_peer(sent_request.peer, ReputationChange::new_fatal("no response from peer"));
+					self.peerset.report_peer(
+						sent_request.peer,
+						ReputationChange::new_fatal("no response from peer"),
+					);
 					self.pending_requests.push_back(sent_request.into_pending());
-					continue;
-				}
+					continue
+				},
 			};
 
 			let decoded_request_result = request_result.map(|response| {
 				if sent_request.request.is_block_request() {
-					schema::v1::BlockResponse::decode(&response[..])
-						.map(|r| Response::Block(r))
+					schema::v1::BlockResponse::decode(&response[..]).map(|r| Response::Block(r))
 				} else {
-					schema::v1::light::Response::decode(&response[..])
-						.map(|r| Response::Light(r))
+					schema::v1::light::Response::decode(&response[..]).map(|r| Response::Light(r))
 				}
 			});
 
 			let response = match decoded_request_result {
 				Ok(Ok(response)) => response,
 				Ok(Err(e)) => {
-					log::debug!("Failed to decode response from peer {}: {:?}.", sent_request.peer, e);
+					log::debug!(
+						"Failed to decode response from peer {}: {:?}.",
+						sent_request.peer,
+						e
+					);
 					self.remove_peer(sent_request.peer);
-					self.peerset.report_peer(sent_request.peer, ReputationChange::new_fatal("invalid response from peer"));
+					self.peerset.report_peer(
+						sent_request.peer,
+						ReputationChange::new_fatal("invalid response from peer"),
+					);
 					self.pending_requests.push_back(sent_request.into_pending());
-					continue;
+					continue
 				},
 				Err(e) => {
 					log::debug!("Request to peer {} failed with {:?}.", sent_request.peer, e);
@@ -379,22 +381,19 @@ impl<B: Block> Stream for LightClientRequestSender<B> {
 						RequestFailure::NotConnected => {
 							self.remove_peer(sent_request.peer);
 							self.pending_requests.push_back(sent_request.into_pending());
-						}
+						},
 						RequestFailure::UnknownProtocol => {
 							debug_assert!(
 								false,
 								"Light client and block request protocol should be known when \
 								 sending requests.",
 							);
-						}
+						},
 						RequestFailure::Refused => {
 							self.remove_peer(sent_request.peer);
-							self.peerset.report_peer(
-								sent_request.peer,
-								rep::REFUSED,
-							);
+							self.peerset.report_peer(sent_request.peer, rep::REFUSED);
 							self.pending_requests.push_back(sent_request.into_pending());
-						}
+						},
 						RequestFailure::Obsolete => {
 							debug_assert!(
 								false,
@@ -402,13 +401,10 @@ impl<B: Block> Stream for LightClientRequestSender<B> {
 								 response receiver.",
 							);
 							self.pending_requests.push_back(sent_request.into_pending());
-						}
+						},
 						RequestFailure::Network(OutboundFailure::Timeout) => {
 							self.remove_peer(sent_request.peer);
-							self.peerset.report_peer(
-								sent_request.peer,
-								rep::TIMEOUT,
-							);
+							self.peerset.report_peer(sent_request.peer, rep::TIMEOUT);
 							self.pending_requests.push_back(sent_request.into_pending());
 						},
 						RequestFailure::Network(OutboundFailure::UnsupportedProtocols) => {
@@ -420,31 +416,27 @@ impl<B: Block> Stream for LightClientRequestSender<B> {
 								),
 							);
 							self.pending_requests.push_back(sent_request.into_pending());
-						}
+						},
 						RequestFailure::Network(OutboundFailure::DialFailure) => {
 							self.remove_peer(sent_request.peer);
 							self.peerset.report_peer(
 								sent_request.peer,
-								ReputationChange::new_fatal(
-									"failed to dial peer",
-								),
+								ReputationChange::new_fatal("failed to dial peer"),
 							);
 							self.pending_requests.push_back(sent_request.into_pending());
-						}
+						},
 						RequestFailure::Network(OutboundFailure::ConnectionClosed) => {
 							self.remove_peer(sent_request.peer);
 							self.peerset.report_peer(
 								sent_request.peer,
-								ReputationChange::new_fatal(
-									"connection to peer closed",
-								),
+								ReputationChange::new_fatal("connection to peer closed"),
 							);
 							self.pending_requests.push_back(sent_request.into_pending());
-						}
+						},
 					}
 
-					continue;
-				}
+					continue
+				},
 			};
 
 			match self.on_response(sent_request.peer, &sent_request.request, response) {
@@ -454,23 +446,23 @@ impl<B: Block> Stream for LightClientRequestSender<B> {
 					self.remove_peer(sent_request.peer);
 					self.peerset.report_peer(
 						sent_request.peer,
-						ReputationChange::new_fatal(
-							"unexpected response from peer",
-						),
+						ReputationChange::new_fatal("unexpected response from peer"),
 					);
 					self.pending_requests.push_back(sent_request.into_pending());
-				}
+				},
 				Err(other) => {
-					log::debug!("error handling response from peer {}: {}", sent_request.peer, other);
+					log::debug!(
+						"error handling response from peer {}: {}",
+						sent_request.peer,
+						other
+					);
 					self.remove_peer(sent_request.peer);
 					self.peerset.report_peer(
 						sent_request.peer,
-						ReputationChange::new_fatal(
-							"invalid response from peer",
-						),
+						ReputationChange::new_fatal("invalid response from peer"),
 					);
 					self.pending_requests.push_back(sent_request.into_pending())
-				}
+				},
 			}
 		}
 
@@ -497,7 +489,7 @@ impl<B: Block> Stream for LightClientRequestSender<B> {
 							peer = Some((*peer_id, peer_info));
 							break
 						},
-						_ => peer = Some((*peer_id, peer_info))
+						_ => peer = Some((*peer_id, peer_info)),
 					}
 				}
 			}
@@ -509,8 +501,8 @@ impl<B: Block> Stream for LightClientRequestSender<B> {
 					self.pending_requests.push_front(pending_request);
 					log::debug!("No peer available to send request to.");
 
-					break;
-				}
+					break
+				},
 			};
 
 			let request_bytes = match pending_request.request.serialize_request() {
@@ -519,7 +511,7 @@ impl<B: Block> Stream for LightClientRequestSender<B> {
 					log::debug!("failed to serialize request: {}", error);
 					pending_request.request.return_reply(Err(ClientError::RemoteFetchFailed));
 					continue
-				}
+				},
 			};
 
 			let (tx, rx) = oneshot::channel();
@@ -528,16 +520,15 @@ impl<B: Block> Stream for LightClientRequestSender<B> {
 
 			pending_request.attempts_left -= 1;
 
-			self.sent_requests.push(async move {
-				(pending_request.into_sent(peer_id), rx.await)
-			}.boxed());
+			self.sent_requests
+				.push(async move { (pending_request.into_sent(peer_id), rx.await) }.boxed());
 
 			return Poll::Ready(Some(OutEvent::SendRequest {
 				target: peer_id,
 				request: request_bytes,
 				pending_response: tx,
 				protocol_name: protocol,
-			}));
+			}))
 		}
 
 		Poll::Pending
@@ -557,7 +548,7 @@ pub enum OutEvent {
 		pending_response: oneshot::Sender<Result<Vec<u8>, RequestFailure>>,
 		/// The name of the protocol to use to send the request.
 		protocol_name: String,
-	}
+	},
 }
 
 /// Incoming response from remote.
@@ -592,7 +583,6 @@ enum Error {
 }
 
 /// The data to send back to the light client over the oneshot channel.
-//
 // It is unified here in order to be able to return it as a function
 // result instead of delivering it to the client as a side effect of
 // response processing.
@@ -605,7 +595,6 @@ enum Reply<B: Block> {
 	Extrinsics(Vec<B::Extrinsic>),
 }
 
-
 /// Information we have about some peer.
 #[derive(Debug)]
 struct PeerInfo<B: Block> {
@@ -615,10 +604,7 @@ struct PeerInfo<B: Block> {
 
 impl<B: Block> Default for PeerInfo<B> {
 	fn default() -> Self {
-		PeerInfo {
-			best_block: None,
-			status: PeerStatus::Idle,
-		}
+		PeerInfo { best_block: None, status: PeerStatus::Idle }
 	}
 }
 
@@ -635,7 +621,6 @@ enum PeerStatus {
 ///
 /// The associated `oneshot::Sender` will be used to convey the result of
 /// their request back to them (cf. `Reply`).
-//
 // This is modeled after light_dispatch.rs's `RequestData` which is not
 // used because we currently only support a subset of those.
 #[derive(Debug)]
@@ -645,43 +630,43 @@ pub enum Request<B: Block> {
 		/// Request.
 		request: RemoteBodyRequest<B::Header>,
 		/// [`oneshot::Sender`] to return response.
-		sender: oneshot::Sender<Result<Vec<B::Extrinsic>, ClientError>>
+		sender: oneshot::Sender<Result<Vec<B::Extrinsic>, ClientError>>,
 	},
 	/// Remote header request.
 	Header {
 		/// Request.
 		request: light::RemoteHeaderRequest<B::Header>,
 		/// [`oneshot::Sender`] to return response.
-		sender: oneshot::Sender<Result<B::Header, ClientError>>
+		sender: oneshot::Sender<Result<B::Header, ClientError>>,
 	},
 	/// Remote read request.
 	Read {
 		/// Request.
 		request: light::RemoteReadRequest<B::Header>,
 		/// [`oneshot::Sender`] to return response.
-		sender: oneshot::Sender<Result<HashMap<Vec<u8>, Option<Vec<u8>>>, ClientError>>
+		sender: oneshot::Sender<Result<HashMap<Vec<u8>, Option<Vec<u8>>>, ClientError>>,
 	},
 	/// Remote read child request.
 	ReadChild {
 		/// Request.
 		request: light::RemoteReadChildRequest<B::Header>,
 		/// [`oneshot::Sender`] to return response.
-		sender: oneshot::Sender<Result<HashMap<Vec<u8>, Option<Vec<u8>>>, ClientError>>
+		sender: oneshot::Sender<Result<HashMap<Vec<u8>, Option<Vec<u8>>>, ClientError>>,
 	},
 	/// Remote call request.
 	Call {
 		/// Request.
 		request: light::RemoteCallRequest<B::Header>,
 		/// [`oneshot::Sender`] to return response.
-		sender: oneshot::Sender<Result<Vec<u8>, ClientError>>
+		sender: oneshot::Sender<Result<Vec<u8>, ClientError>>,
 	},
 	/// Remote changes request.
 	Changes {
 		/// Request.
 		request: light::RemoteChangesRequest<B::Header>,
 		/// [`oneshot::Sender`] to return response.
-		sender: oneshot::Sender<Result<Vec<(NumberFor<B>, u32)>, ClientError>>
-	}
+		sender: oneshot::Sender<Result<Vec<(NumberFor<B>, u32)>, ClientError>>,
+	},
 }
 
 impl<B: Block> Request<B> {
@@ -728,19 +713,19 @@ impl<B: Block> Request<B> {
 
 				let mut buf = Vec::with_capacity(rq.encoded_len());
 				rq.encode(&mut buf)?;
-				return Ok(buf);
-			}
+				return Ok(buf)
+			},
 			Request::Header { request, .. } => {
 				let r = schema::v1::light::RemoteHeaderRequest { block: request.block.encode() };
 				schema::v1::light::request::Request::RemoteHeaderRequest(r)
-			}
+			},
 			Request::Read { request, .. } => {
 				let r = schema::v1::light::RemoteReadRequest {
 					block: request.block.encode(),
 					keys: request.keys.clone(),
 				};
 				schema::v1::light::request::Request::RemoteReadRequest(r)
-			}
+			},
 			Request::ReadChild { request, .. } => {
 				let r = schema::v1::light::RemoteReadChildRequest {
 					block: request.block.encode(),
@@ -748,7 +733,7 @@ impl<B: Block> Request<B> {
 					keys: request.keys.clone(),
 				};
 				schema::v1::light::request::Request::RemoteReadChildRequest(r)
-			}
+			},
 			Request::Call { request, .. } => {
 				let r = schema::v1::light::RemoteCallRequest {
 					block: request.block.encode(),
@@ -756,19 +741,22 @@ impl<B: Block> Request<B> {
 					data: request.call_data.clone(),
 				};
 				schema::v1::light::request::Request::RemoteCallRequest(r)
-			}
+			},
 			Request::Changes { request, .. } => {
 				let r = schema::v1::light::RemoteChangesRequest {
 					first: request.first_block.1.encode(),
 					last: request.last_block.1.encode(),
 					min: request.tries_roots.1.encode(),
 					max: request.max_block.1.encode(),
-					storage_key: request.storage_key.clone().map(|s| s.into_inner())
+					storage_key: request
+						.storage_key
+						.clone()
+						.map(|s| s.into_inner())
 						.unwrap_or_default(),
 					key: request.key.clone(),
 				};
 				schema::v1::light::request::Request::RemoteChangesRequest(r)
-			}
+			},
 		};
 
 		let rq = schema::v1::light::Request { request: Some(request) };
@@ -786,32 +774,35 @@ impl<B: Block> Request<B> {
 				Err(e) => send(Err(e), sender),
 				Ok(Reply::Extrinsics(x)) => send(Ok(x), sender),
 				reply => log::error!("invalid reply for body request: {:?}, {:?}", reply, request),
-			}
+			},
 			Request::Header { request, sender } => match result {
 				Err(e) => send(Err(e), sender),
 				Ok(Reply::Header(x)) => send(Ok(x), sender),
-				reply => log::error!("invalid reply for header request: {:?}, {:?}", reply, request),
-			}
+				reply =>
+					log::error!("invalid reply for header request: {:?}, {:?}", reply, request),
+			},
 			Request::Read { request, sender } => match result {
 				Err(e) => send(Err(e), sender),
 				Ok(Reply::MapVecU8OptVecU8(x)) => send(Ok(x), sender),
 				reply => log::error!("invalid reply for read request: {:?}, {:?}", reply, request),
-			}
+			},
 			Request::ReadChild { request, sender } => match result {
 				Err(e) => send(Err(e), sender),
 				Ok(Reply::MapVecU8OptVecU8(x)) => send(Ok(x), sender),
-				reply => log::error!("invalid reply for read child request: {:?}, {:?}", reply, request),
-			}
+				reply =>
+					log::error!("invalid reply for read child request: {:?}, {:?}", reply, request),
+			},
 			Request::Call { request, sender } => match result {
 				Err(e) => send(Err(e), sender),
 				Ok(Reply::VecU8(x)) => send(Ok(x), sender),
 				reply => log::error!("invalid reply for call request: {:?}, {:?}", reply, request),
-			}
+			},
 			Request::Changes { request, sender } => match result {
 				Err(e) => send(Err(e), sender),
 				Ok(Reply::VecNumberU32(x)) => send(Ok(x), sender),
-				reply => log::error!("invalid reply for changes request: {:?}, {:?}", reply, request),
-			}
+				reply =>
+					log::error!("invalid reply for changes request: {:?}, {:?}", reply, request),
+			},
 		}
 	}
 }
@@ -819,19 +810,17 @@ impl<B: Block> Request<B> {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use crate::light_client_requests::tests::{DummyFetchChecker, protocol_id, peerset, dummy_header};
-	use crate::request_responses::OutboundFailure;
+	use crate::{
+		light_client_requests::tests::{dummy_header, peerset, protocol_id, DummyFetchChecker},
+		request_responses::OutboundFailure,
+	};
 
 	use assert_matches::assert_matches;
-	use futures::channel::oneshot;
-	use futures::executor::block_on;
-	use futures::poll;
+	use futures::{channel::oneshot, executor::block_on, poll};
 	use sc_client_api::StorageProof;
 	use sp_core::storage::ChildInfo;
-	use sp_runtime::generic::Header;
-	use sp_runtime::traits::BlakeTwo256;
-	use std::collections::HashSet;
-	use std::iter::FromIterator;
+	use sp_runtime::{generic::Header, traits::BlakeTwo256};
+	use std::{collections::HashSet, iter::FromIterator};
 
 	fn empty_proof() -> Vec<u8> {
 		StorageProof::empty().encode()
@@ -843,10 +832,7 @@ mod tests {
 		let (_peer_set, peer_set_handle) = peerset();
 		let mut sender = LightClientRequestSender::<Block>::new(
 			&protocol_id(),
-			Arc::new(DummyFetchChecker {
-				ok: true,
-				_mark: std::marker::PhantomData,
-			}),
+			Arc::new(DummyFetchChecker { ok: true, _mark: std::marker::PhantomData }),
 			peer_set_handle,
 		);
 
@@ -864,17 +850,15 @@ mod tests {
 	fn body_request_fields_encoded_properly() {
 		let (sender, _receiver) = oneshot::channel();
 		let request = Request::<Block>::Body {
-			request: RemoteBodyRequest {
-				header: dummy_header(),
-				retry_count: None,
-			},
+			request: RemoteBodyRequest { header: dummy_header(), retry_count: None },
 			sender,
 		};
 		let serialized_request = request.serialize_request().unwrap();
-		let deserialized_request = schema::v1::BlockRequest::decode(&serialized_request[..]).unwrap();
+		let deserialized_request =
+			schema::v1::BlockRequest::decode(&serialized_request[..]).unwrap();
 		assert!(BlockAttributes::from_be_u32(deserialized_request.fields)
-				.unwrap()
-				.contains(BlockAttributes::BODY));
+			.unwrap()
+			.contains(BlockAttributes::BODY));
 	}
 
 	#[test]
@@ -916,29 +900,26 @@ mod tests {
 		sender.request(Request::Call { request, sender: chan.0 }).unwrap();
 		assert_eq!(1, sender.pending_requests.len(), "Expect one pending request.");
 
-		let OutEvent::SendRequest { target, pending_response, .. } = block_on(sender.next()).unwrap();
-		assert!(
-			target == peer0 || target == peer1,
-			"Expect request to originate from known peer.",
-		);
+		let OutEvent::SendRequest { target, pending_response, .. } =
+			block_on(sender.next()).unwrap();
+		assert!(target == peer0 || target == peer1, "Expect request to originate from known peer.",);
 
 		// And we should have one busy peer.
 		assert!({
-			let (idle, busy): (Vec<_>, Vec<_>) = sender
-				.peers
-				.iter()
-				.partition(|(_, info)| info.status == PeerStatus::Idle);
-			idle.len() == 1
-				&& busy.len() == 1
-				&& (idle[0].0 == &peer0 || busy[0].0 == &peer0)
-				&& (idle[0].0 == &peer1 || busy[0].0 == &peer1)
+			let (idle, busy): (Vec<_>, Vec<_>) =
+				sender.peers.iter().partition(|(_, info)| info.status == PeerStatus::Idle);
+			idle.len() == 1 &&
+				busy.len() == 1 && (idle[0].0 == &peer0 || busy[0].0 == &peer0) &&
+				(idle[0].0 == &peer1 || busy[0].0 == &peer1)
 		});
 
 		assert_eq!(0, sender.pending_requests.len(), "Expect no pending request.");
 		assert_eq!(1, sender.sent_requests.len(), "Expect one request to be sent.");
 
 		// Report first attempt as timed out.
-		pending_response.send(Err(RequestFailure::Network(OutboundFailure::Timeout))).unwrap();
+		pending_response
+			.send(Err(RequestFailure::Network(OutboundFailure::Timeout)))
+			.unwrap();
 
 		// Expect a new request to be issued.
 		let OutEvent::SendRequest { pending_response, .. } = block_on(sender.next()).unwrap();
@@ -948,13 +929,17 @@ mod tests {
 		assert_eq!(1, sender.sent_requests.len(), "Expect new request to be issued.");
 
 		// Report second attempt as timed out.
-		pending_response.send(Err(RequestFailure::Network(OutboundFailure::Timeout))).unwrap();
+		pending_response
+			.send(Err(RequestFailure::Network(OutboundFailure::Timeout)))
+			.unwrap();
 		assert_matches!(
-			block_on(async { poll!(sender.next()) }), Poll::Pending,
+			block_on(async { poll!(sender.next()) }),
+			Poll::Pending,
 			"Expect sender to not issue another attempt.",
 		);
 		assert_matches!(
-			block_on(chan.1).unwrap(), Err(ClientError::RemoteFetchFailed),
+			block_on(chan.1).unwrap(),
+			Err(ClientError::RemoteFetchFailed),
 			"Expect request failure to be reported.",
 		);
 		assert_eq!(0, sender.peers.len(), "Expect no peer to be left");
@@ -988,12 +973,7 @@ mod tests {
 			call_data: vec![],
 			retry_count: Some(1),
 		};
-		sender
-			.request(Request::Call {
-				request,
-				sender: chan.0,
-			})
-			.unwrap();
+		sender.request(Request::Call { request, sender: chan.0 }).unwrap();
 
 		assert_eq!(1, sender.pending_requests.len(), "Expect one pending request.");
 		assert_eq!(0, sender.sent_requests.len(), "Expect zero sent requests.");
@@ -1003,9 +983,7 @@ mod tests {
 		assert_eq!(1, sender.sent_requests.len(), "Expect one sent request.");
 
 		let response = {
-			let r = schema::v1::light::RemoteCallResponse {
-				proof: empty_proof(),
-			};
+			let r = schema::v1::light::RemoteCallResponse { proof: empty_proof() };
 			let response = schema::v1::light::Response {
 				response: Some(schema::v1::light::response::Response::RemoteCallResponse(r)),
 			};
@@ -1017,7 +995,8 @@ mod tests {
 		pending_response.send(Ok(response)).unwrap();
 
 		assert_matches!(
-			block_on(async { poll!(sender.next()) }), Poll::Pending,
+			block_on(async { poll!(sender.next()) }),
+			Poll::Pending,
 			"Expect sender to not issue another attempt, given that there is no peer left.",
 		);
 
@@ -1050,12 +1029,7 @@ mod tests {
 			call_data: vec![],
 			retry_count: Some(1),
 		};
-		sender
-			.request(Request::Call {
-				request,
-				sender: chan.0,
-			})
-			.unwrap();
+		sender.request(Request::Call { request, sender: chan.0 }).unwrap();
 
 		assert_eq!(1, sender.pending_requests.len());
 		assert_eq!(0, sender.sent_requests.len());
@@ -1064,9 +1038,7 @@ mod tests {
 		assert_eq!(1, sender.sent_requests.len(), "Expect one sent request.");
 
 		let response = {
-			let r = schema::v1::light::RemoteReadResponse {
-				proof: empty_proof(),
-			}; // Not a RemoteCallResponse!
+			let r = schema::v1::light::RemoteReadResponse { proof: empty_proof() }; // Not a RemoteCallResponse!
 			let response = schema::v1::light::Response {
 				response: Some(schema::v1::light::response::Response::RemoteReadResponse(r)),
 			};
@@ -1077,7 +1049,8 @@ mod tests {
 
 		pending_response.send(Ok(response)).unwrap();
 		assert_matches!(
-			block_on(async { poll!(sender.next()) }), Poll::Pending,
+			block_on(async { poll!(sender.next()) }),
+			Poll::Pending,
 			"Expect sender to not issue another attempt, given that there is no peer left.",
 		);
 
@@ -1114,12 +1087,7 @@ mod tests {
 			call_data: vec![],
 			retry_count: Some(3), // Attempt up to three retries.
 		};
-		sender
-			.request(Request::Call {
-				request,
-				sender: chan.0,
-			})
-			.unwrap();
+		sender.request(Request::Call { request, sender: chan.0 }).unwrap();
 
 		assert_eq!(1, sender.pending_requests.len());
 		assert_eq!(0, sender.sent_requests.len());
@@ -1132,9 +1100,7 @@ mod tests {
 		for (i, _peer) in peers.iter().enumerate() {
 			// Construct an invalid response
 			let response = {
-				let r = schema::v1::light::RemoteCallResponse {
-					proof: empty_proof(),
-				};
+				let r = schema::v1::light::RemoteCallResponse { proof: empty_proof() };
 				let response = schema::v1::light::Response {
 					response: Some(schema::v1::light::response::Response::RemoteCallResponse(r)),
 				};
@@ -1152,13 +1118,11 @@ mod tests {
 			} else {
 				// Last peer and last attempt.
 				assert_matches!(
-					block_on(async { poll!(sender.next()) }), Poll::Pending,
+					block_on(async { poll!(sender.next()) }),
+					Poll::Pending,
 					"Expect sender to not issue another attempt, given that there is no peer left.",
 				);
-				assert_matches!(
-					chan.1.try_recv(),
-					Ok(Some(Err(ClientError::RemoteFetchFailed)))
-				)
+				assert_matches!(chan.1.try_recv(), Ok(Some(Err(ClientError::RemoteFetchFailed))))
 			}
 		}
 	}
@@ -1187,35 +1151,27 @@ mod tests {
 					proof: empty_proof(),
 				};
 				schema::v1::light::Response {
-					response: Some(schema::v1::light::response::Response::RemoteHeaderResponse(
-						r,
-					)),
+					response: Some(schema::v1::light::response::Response::RemoteHeaderResponse(r)),
 				}
-			}
+			},
 			Request::Read { .. } => {
-				let r = schema::v1::light::RemoteReadResponse {
-					proof: empty_proof(),
-				};
+				let r = schema::v1::light::RemoteReadResponse { proof: empty_proof() };
 				schema::v1::light::Response {
 					response: Some(schema::v1::light::response::Response::RemoteReadResponse(r)),
 				}
-			}
+			},
 			Request::ReadChild { .. } => {
-				let r = schema::v1::light::RemoteReadResponse {
-					proof: empty_proof(),
-				};
+				let r = schema::v1::light::RemoteReadResponse { proof: empty_proof() };
 				schema::v1::light::Response {
 					response: Some(schema::v1::light::response::Response::RemoteReadResponse(r)),
 				}
-			}
+			},
 			Request::Call { .. } => {
-				let r = schema::v1::light::RemoteCallResponse {
-					proof: empty_proof(),
-				};
+				let r = schema::v1::light::RemoteCallResponse { proof: empty_proof() };
 				schema::v1::light::Response {
 					response: Some(schema::v1::light::response::Response::RemoteCallResponse(r)),
 				}
-			}
+			},
 			Request::Changes { .. } => {
 				let r = schema::v1::light::RemoteChangesResponse {
 					max: std::iter::repeat(1).take(32).collect(),
@@ -1226,7 +1182,7 @@ mod tests {
 				schema::v1::light::Response {
 					response: Some(schema::v1::light::response::Response::RemoteChangesResponse(r)),
 				}
-			}
+			},
 		};
 
 		let response = {
@@ -1245,7 +1201,8 @@ mod tests {
 
 		pending_response.send(Ok(response)).unwrap();
 		assert_matches!(
-			block_on(async { poll!(sender.next()) }), Poll::Pending,
+			block_on(async { poll!(sender.next()) }),
+			Poll::Pending,
 			"Expect sender to not issue another attempt, given that there is no peer left.",
 		);
 
@@ -1263,10 +1220,7 @@ mod tests {
 			call_data: vec![],
 			retry_count: None,
 		};
-		issue_request(Request::Call {
-			request,
-			sender: chan.0,
-		});
+		issue_request(Request::Call { request, sender: chan.0 });
 		assert_matches!(chan.1.try_recv(), Ok(Some(Ok(_))))
 	}
 
@@ -1279,10 +1233,7 @@ mod tests {
 			keys: vec![b":key".to_vec()],
 			retry_count: None,
 		};
-		issue_request(Request::Read {
-			request,
-			sender: chan.0,
-		});
+		issue_request(Request::Read { request, sender: chan.0 });
 		assert_matches!(chan.1.try_recv(), Ok(Some(Ok(_))))
 	}
 
@@ -1297,10 +1248,7 @@ mod tests {
 			keys: vec![b":key".to_vec()],
 			retry_count: None,
 		};
-		issue_request(Request::ReadChild {
-			request,
-			sender: chan.0,
-		});
+		issue_request(Request::ReadChild { request, sender: chan.0 });
 		assert_matches!(chan.1.try_recv(), Ok(Some(Ok(_))))
 	}
 
@@ -1312,10 +1260,7 @@ mod tests {
 			block: 1,
 			retry_count: None,
 		};
-		issue_request(Request::Header {
-			request,
-			sender: chan.0,
-		});
+		issue_request(Request::Header { request, sender: chan.0 });
 		assert_matches!(chan.1.try_recv(), Ok(Some(Ok(_))))
 	}
 
@@ -1336,10 +1281,7 @@ mod tests {
 			storage_key: None,
 			retry_count: None,
 		};
-		issue_request(Request::Changes {
-			request,
-			sender: chan.0,
-		});
+		issue_request(Request::Changes { request, sender: chan.0 });
 		assert_matches!(chan.1.try_recv(), Ok(Some(Ok(_))))
 	}
 }
diff --git a/client/network/src/network_state.rs b/client/network/src/network_state.rs
index 4ddfadda172e..3f3d0596f16a 100644
--- a/client/network/src/network_state.rs
+++ b/client/network/src/network_state.rs
@@ -22,7 +22,10 @@
 
 use libp2p::{core::ConnectedPoint, Multiaddr};
 use serde::{Deserialize, Serialize};
-use std::{collections::{HashMap, HashSet}, time::Duration};
+use std::{
+	collections::{HashMap, HashSet},
+	time::Duration,
+};
 
 /// Returns general information about the networking.
 ///
@@ -90,13 +93,9 @@ pub enum PeerEndpoint {
 impl From<ConnectedPoint> for PeerEndpoint {
 	fn from(endpoint: ConnectedPoint) -> Self {
 		match endpoint {
-			ConnectedPoint::Dialer { address } =>
-				PeerEndpoint::Dialing(address),
+			ConnectedPoint::Dialer { address } => PeerEndpoint::Dialing(address),
 			ConnectedPoint::Listener { local_addr, send_back_addr } =>
-				PeerEndpoint::Listening {
-					local_addr,
-					send_back_addr
-				}
+				PeerEndpoint::Listening { local_addr, send_back_addr },
 		}
 	}
 }
diff --git a/client/network/src/on_demand_layer.rs b/client/network/src/on_demand_layer.rs
index ef8076e8cbed..ebcf012c0fae 100644
--- a/client/network/src/on_demand_layer.rs
+++ b/client/network/src/on_demand_layer.rs
@@ -23,13 +23,19 @@ use crate::light_client_requests;
 use futures::{channel::oneshot, prelude::*};
 use parking_lot::Mutex;
 use sc_client_api::{
-	FetchChecker, Fetcher, RemoteBodyRequest, RemoteCallRequest, RemoteChangesRequest,
-	RemoteHeaderRequest, RemoteReadChildRequest, RemoteReadRequest, StorageProof, ChangesProof,
+	ChangesProof, FetchChecker, Fetcher, RemoteBodyRequest, RemoteCallRequest,
+	RemoteChangesRequest, RemoteHeaderRequest, RemoteReadChildRequest, RemoteReadRequest,
+	StorageProof,
 };
-use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use sp_blockchain::Error as ClientError;
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor};
-use std::{collections::HashMap, pin::Pin, sync::Arc, task::Context, task::Poll};
+use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
+use std::{
+	collections::HashMap,
+	pin::Pin,
+	sync::Arc,
+	task::{Context, Poll},
+};
 
 /// Implements the `Fetcher` trait of the client. Makes it possible for the light client to perform
 /// network requests for some state.
@@ -45,13 +51,13 @@ pub struct OnDemand<B: BlockT> {
 	/// Note that a better alternative would be to use a MPMC queue here, and add a `poll` method
 	/// from the `OnDemand`. However there exists no popular implementation of MPMC channels in
 	/// asynchronous Rust at the moment
-	requests_queue: Mutex<Option<TracingUnboundedReceiver<light_client_requests::sender::Request<B>>>>,
+	requests_queue:
+		Mutex<Option<TracingUnboundedReceiver<light_client_requests::sender::Request<B>>>>,
 
 	/// Sending side of `requests_queue`.
 	requests_send: TracingUnboundedSender<light_client_requests::sender::Request<B>>,
 }
 
-
 #[derive(Debug, thiserror::Error)]
 #[error("AlwaysBadChecker")]
 struct ErrorAlwaysBadChecker;
@@ -83,7 +89,7 @@ impl<Block: BlockT> FetchChecker<Block> for AlwaysBadChecker {
 		&self,
 		_request: &RemoteReadRequest<Block::Header>,
 		_remote_proof: StorageProof,
-	) -> Result<HashMap<Vec<u8>,Option<Vec<u8>>>, ClientError> {
+	) -> Result<HashMap<Vec<u8>, Option<Vec<u8>>>, ClientError> {
 		Err(ErrorAlwaysBadChecker.into())
 	}
 
@@ -106,7 +112,7 @@ impl<Block: BlockT> FetchChecker<Block> for AlwaysBadChecker {
 	fn check_changes_proof(
 		&self,
 		_request: &RemoteChangesRequest<Block::Header>,
-		_remote_proof: ChangesProof<Block::Header>
+		_remote_proof: ChangesProof<Block::Header>,
 	) -> Result<Vec<(NumberFor<Block>, u32)>, ClientError> {
 		Err(ErrorAlwaysBadChecker.into())
 	}
@@ -114,7 +120,7 @@ impl<Block: BlockT> FetchChecker<Block> for AlwaysBadChecker {
 	fn check_body_proof(
 		&self,
 		_request: &RemoteBodyRequest<Block::Header>,
-		_body: Vec<Block::Extrinsic>
+		_body: Vec<Block::Extrinsic>,
 	) -> Result<Vec<Block::Extrinsic>, ClientError> {
 		Err(ErrorAlwaysBadChecker.into())
 	}
@@ -129,11 +135,7 @@ where
 		let (requests_send, requests_queue) = tracing_unbounded("mpsc_ondemand");
 		let requests_queue = Mutex::new(Some(requests_queue));
 
-		OnDemand {
-			checker,
-			requests_queue,
-			requests_send,
-		}
+		OnDemand { checker, requests_queue, requests_send }
 	}
 
 	/// Get checker reference.
@@ -148,9 +150,9 @@ where
 	///
 	/// If this function returns `None`, that means that the receiver has already been extracted in
 	/// the past, and therefore that something already handles the requests.
-	pub(crate) fn extract_receiver(&self)
-		-> Option<TracingUnboundedReceiver<light_client_requests::sender::Request<B>>>
-	{
+	pub(crate) fn extract_receiver(
+		&self,
+	) -> Option<TracingUnboundedReceiver<light_client_requests::sender::Request<B>>> {
 		self.requests_queue.lock().take()
 	}
 }
diff --git a/client/network/src/peer_info.rs b/client/network/src/peer_info.rs
index 39bbd1d87046..a123482be072 100644
--- a/client/network/src/peer_info.rs
+++ b/client/network/src/peer_info.rs
@@ -16,24 +16,33 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+use crate::utils::interval;
 use fnv::FnvHashMap;
 use futures::prelude::*;
-use libp2p::Multiaddr;
-use libp2p::core::connection::{ConnectionId, ListenerId};
-use libp2p::core::{ConnectedPoint, either::EitherOutput, PeerId, PublicKey};
-use libp2p::swarm::{IntoProtocolsHandler, IntoProtocolsHandlerSelect, ProtocolsHandler};
-use libp2p::swarm::{NetworkBehaviour, NetworkBehaviourAction, PollParameters};
-use libp2p::identify::{Identify, IdentifyConfig, IdentifyEvent, IdentifyInfo};
-use libp2p::ping::{Ping, PingConfig, PingEvent, PingSuccess};
-use log::{debug, trace, error};
+use libp2p::{
+	core::{
+		connection::{ConnectionId, ListenerId},
+		either::EitherOutput,
+		ConnectedPoint, PeerId, PublicKey,
+	},
+	identify::{Identify, IdentifyConfig, IdentifyEvent, IdentifyInfo},
+	ping::{Ping, PingConfig, PingEvent, PingSuccess},
+	swarm::{
+		IntoProtocolsHandler, IntoProtocolsHandlerSelect, NetworkBehaviour, NetworkBehaviourAction,
+		PollParameters, ProtocolsHandler,
+	},
+	Multiaddr,
+};
+use log::{debug, error, trace};
 use smallvec::SmallVec;
-use std::{error, io};
-use std::collections::hash_map::Entry;
-use std::pin::Pin;
-use std::task::{Context, Poll};
-use std::time::Duration;
+use std::{
+	collections::hash_map::Entry,
+	error, io,
+	pin::Pin,
+	task::{Context, Poll},
+	time::Duration,
+};
 use wasm_timer::Instant;
-use crate::utils::interval;
 
 /// Time after we disconnect from a node before we purge its information from the cache.
 const CACHE_EXPIRE: Duration = Duration::from_secs(10 * 60);
@@ -70,21 +79,13 @@ impl NodeInfo {
 	fn new(endpoint: ConnectedPoint) -> Self {
 		let mut endpoints = SmallVec::new();
 		endpoints.push(endpoint);
-		NodeInfo {
-			info_expire: None,
-			endpoints,
-			client_version: None,
-			latest_ping: None,
-		}
+		NodeInfo { info_expire: None, endpoints, client_version: None, latest_ping: None }
 	}
 }
 
 impl PeerInfoBehaviour {
 	/// Builds a new `PeerInfoBehaviour`.
-	pub fn new(
-		user_agent: String,
-		local_public_key: PublicKey,
-	) -> Self {
+	pub fn new(user_agent: String, local_public_key: PublicKey) -> Self {
 		let identify = {
 			let cfg = IdentifyConfig::new("/substrate/1.0".to_string(), local_public_key)
 				.with_agent_version(user_agent);
@@ -172,7 +173,7 @@ pub enum PeerInfoEvent {
 impl NetworkBehaviour for PeerInfoBehaviour {
 	type ProtocolsHandler = IntoProtocolsHandlerSelect<
 		<Ping as NetworkBehaviour>::ProtocolsHandler,
-		<Identify as NetworkBehaviour>::ProtocolsHandler
+		<Identify as NetworkBehaviour>::ProtocolsHandler,
 	>;
 	type OutEvent = PeerInfoEvent;
 
@@ -191,13 +192,18 @@ impl NetworkBehaviour for PeerInfoBehaviour {
 		self.identify.inject_connected(peer_id);
 	}
 
-	fn inject_connection_established(&mut self, peer_id: &PeerId, conn: &ConnectionId, endpoint: &ConnectedPoint) {
+	fn inject_connection_established(
+		&mut self,
+		peer_id: &PeerId,
+		conn: &ConnectionId,
+		endpoint: &ConnectedPoint,
+	) {
 		self.ping.inject_connection_established(peer_id, conn, endpoint);
 		self.identify.inject_connection_established(peer_id, conn, endpoint);
 		match self.nodes_info.entry(peer_id.clone()) {
 			Entry::Vacant(e) => {
 				e.insert(NodeInfo::new(endpoint.clone()));
-			}
+			},
 			Entry::Occupied(e) => {
 				let e = e.into_mut();
 				if e.info_expire.as_ref().map(|exp| *exp < Instant::now()).unwrap_or(false) {
@@ -206,11 +212,16 @@ impl NetworkBehaviour for PeerInfoBehaviour {
 				}
 				e.info_expire = None;
 				e.endpoints.push(endpoint.clone());
-			}
+			},
 		}
 	}
 
-	fn inject_connection_closed(&mut self, peer_id: &PeerId, conn: &ConnectionId, endpoint: &ConnectedPoint) {
+	fn inject_connection_closed(
+		&mut self,
+		peer_id: &PeerId,
+		conn: &ConnectionId,
+		endpoint: &ConnectedPoint,
+	) {
 		self.ping.inject_connection_closed(peer_id, conn, endpoint);
 		self.identify.inject_connection_closed(peer_id, conn, endpoint);
 
@@ -238,7 +249,7 @@ impl NetworkBehaviour for PeerInfoBehaviour {
 		&mut self,
 		peer_id: PeerId,
 		connection: ConnectionId,
-		event: <<Self::ProtocolsHandler as IntoProtocolsHandler>::Handler as ProtocolsHandler>::OutEvent
+		event: <<Self::ProtocolsHandler as IntoProtocolsHandler>::Handler as ProtocolsHandler>::OutEvent,
 	) {
 		match event {
 			EitherOutput::First(event) => self.ping.inject_event(peer_id, connection, event),
@@ -246,7 +257,12 @@ impl NetworkBehaviour for PeerInfoBehaviour {
 		}
 	}
 
-	fn inject_addr_reach_failure(&mut self, peer_id: Option<&PeerId>, addr: &Multiaddr, error: &dyn std::error::Error) {
+	fn inject_addr_reach_failure(
+		&mut self,
+		peer_id: Option<&PeerId>,
+		addr: &Multiaddr,
+		error: &dyn std::error::Error,
+	) {
 		self.ping.inject_addr_reach_failure(peer_id, addr, error);
 		self.identify.inject_addr_reach_failure(peer_id, addr, error);
 	}
@@ -300,7 +316,7 @@ impl NetworkBehaviour for PeerInfoBehaviour {
 			<<Self::ProtocolsHandler as IntoProtocolsHandler>::Handler as ProtocolsHandler>::InEvent,
 			Self::OutEvent
 		>
-	> {
+	>{
 		loop {
 			match self.ping.poll(cx, params) {
 				Poll::Pending => break,
@@ -317,28 +333,29 @@ impl NetworkBehaviour for PeerInfoBehaviour {
 					return Poll::Ready(NetworkBehaviourAction::NotifyHandler {
 						peer_id,
 						handler,
-						event: EitherOutput::First(event)
+						event: EitherOutput::First(event),
 					}),
 				Poll::Ready(NetworkBehaviourAction::ReportObservedAddr { address, score }) =>
-					return Poll::Ready(NetworkBehaviourAction::ReportObservedAddr { address, score }),
+					return Poll::Ready(NetworkBehaviourAction::ReportObservedAddr {
+						address,
+						score,
+					}),
 			}
 		}
 
 		loop {
 			match self.identify.poll(cx, params) {
 				Poll::Pending => break,
-				Poll::Ready(NetworkBehaviourAction::GenerateEvent(event)) => {
-					match event {
-						IdentifyEvent::Received { peer_id, info, .. } => {
-							self.handle_identify_report(&peer_id, &info);
-							let event = PeerInfoEvent::Identified { peer_id, info };
-							return Poll::Ready(NetworkBehaviourAction::GenerateEvent(event));
-						}
-						IdentifyEvent::Error { peer_id, error } =>
-							debug!(target: "sub-libp2p", "Identification with peer {:?} failed => {}", peer_id, error),
-						IdentifyEvent::Pushed { .. } => {}
-						IdentifyEvent::Sent { .. } => {}
-					}
+				Poll::Ready(NetworkBehaviourAction::GenerateEvent(event)) => match event {
+					IdentifyEvent::Received { peer_id, info, .. } => {
+						self.handle_identify_report(&peer_id, &info);
+						let event = PeerInfoEvent::Identified { peer_id, info };
+						return Poll::Ready(NetworkBehaviourAction::GenerateEvent(event))
+					},
+					IdentifyEvent::Error { peer_id, error } =>
+						debug!(target: "sub-libp2p", "Identification with peer {:?} failed => {}", peer_id, error),
+					IdentifyEvent::Pushed { .. } => {},
+					IdentifyEvent::Sent { .. } => {},
 				},
 				Poll::Ready(NetworkBehaviourAction::DialAddress { address }) =>
 					return Poll::Ready(NetworkBehaviourAction::DialAddress { address }),
@@ -348,10 +365,13 @@ impl NetworkBehaviour for PeerInfoBehaviour {
 					return Poll::Ready(NetworkBehaviourAction::NotifyHandler {
 						peer_id,
 						handler,
-						event: EitherOutput::Second(event)
+						event: EitherOutput::Second(event),
 					}),
 				Poll::Ready(NetworkBehaviourAction::ReportObservedAddr { address, score }) =>
-					return Poll::Ready(NetworkBehaviourAction::ReportObservedAddr { address, score }),
+					return Poll::Ready(NetworkBehaviourAction::ReportObservedAddr {
+						address,
+						score,
+					}),
 			}
 		}
 
diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index eaed7ffcccac..0838657fae53 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -21,49 +21,64 @@ use crate::{
 	config::{self, ProtocolId},
 	error,
 	request_responses::RequestFailure,
-	utils::{interval, LruHashSet},
 	schema::v1::StateResponse,
+	utils::{interval, LruHashSet},
 };
 
 use bytes::Bytes;
 use codec::{Decode, DecodeAll, Encode};
 use futures::{channel::oneshot, prelude::*};
+use libp2p::{
+	core::{
+		connection::{ConnectionId, ListenerId},
+		ConnectedPoint,
+	},
+	request_response::OutboundFailure,
+	swarm::{
+		IntoProtocolsHandler, NetworkBehaviour, NetworkBehaviourAction, PollParameters,
+		ProtocolsHandler,
+	},
+	Multiaddr, PeerId,
+};
+use log::{debug, error, log, trace, warn, Level};
+use message::{
+	generic::{Message as GenericMessage, Roles},
+	BlockAnnounce, Message,
+};
 use notifications::{Notifications, NotificationsOut};
-use libp2p::core::{ConnectedPoint, connection::{ConnectionId, ListenerId}};
-use libp2p::request_response::OutboundFailure;
-use libp2p::swarm::{NetworkBehaviour, NetworkBehaviourAction, PollParameters};
-use libp2p::swarm::{ProtocolsHandler, IntoProtocolsHandler};
-use libp2p::{Multiaddr, PeerId};
-use log::{log, Level, trace, debug, warn, error};
-use message::{BlockAnnounce, Message};
-use message::generic::{Message as GenericMessage, Roles};
-use prometheus_endpoint::{Registry, Gauge, GaugeVec, PrometheusError, Opts, register, U64};
+use prometheus_endpoint::{register, Gauge, GaugeVec, Opts, PrometheusError, Registry, U64};
 use prost::Message as _;
+use sp_arithmetic::traits::SaturatedConversion;
 use sp_consensus::{
-	BlockOrigin,
 	block_validation::BlockAnnounceValidator,
-	import_queue::{BlockImportResult, BlockImportError, IncomingBlock, Origin}
+	import_queue::{BlockImportError, BlockImportResult, IncomingBlock, Origin},
+	BlockOrigin,
 };
 use sp_runtime::{
-	Justifications,
 	generic::BlockId,
-	traits::{Block as BlockT, Header as HeaderT, NumberFor, Zero, CheckedSub},
+	traits::{Block as BlockT, CheckedSub, Header as HeaderT, NumberFor, Zero},
+	Justifications,
+};
+use std::{
+	borrow::Cow,
+	collections::{HashMap, HashSet, VecDeque},
+	convert::TryFrom as _,
+	io, iter,
+	num::NonZeroUsize,
+	pin::Pin,
+	sync::Arc,
+	task::Poll,
+	time,
 };
-use sp_arithmetic::traits::SaturatedConversion;
 use sync::{ChainSync, Status as SyncStatus};
-use std::borrow::Cow;
-use std::convert::TryFrom as _;
-use std::collections::{HashMap, HashSet, VecDeque};
-use std::sync::Arc;
-use std::{io, iter, num::NonZeroUsize, pin::Pin, task::Poll, time};
 
 mod notifications;
 
-pub mod message;
 pub mod event;
+pub mod message;
 pub mod sync;
 
-pub use notifications::{NotificationsSink, Ready, NotifsHandlerError};
+pub use notifications::{NotificationsSink, NotifsHandlerError, Ready};
 
 /// Interval at which we perform time based maintenance
 const TICK_TIMEOUT: time::Duration = time::Duration::from_millis(1100);
@@ -134,7 +149,7 @@ impl Metrics {
 				let g = GaugeVec::new(
 					Opts::new(
 						"sync_extra_justifications",
-						"Number of extra justifications requests"
+						"Number of extra justifications requests",
 					),
 					&["status"],
 				)?;
@@ -191,10 +206,7 @@ enum PeerRequest<B: BlockT> {
 struct Peer<B: BlockT> {
 	info: PeerInfo<B>,
 	/// Current request, if any. Started by emitting [`CustomMessageOutcome::BlockRequest`].
-	request: Option<(
-		PeerRequest<B>,
-		oneshot::Receiver<Result<Vec<u8>, RequestFailure>>,
-	)>,
+	request: Option<(PeerRequest<B>, oneshot::Receiver<Result<Vec<u8>, RequestFailure>>)>,
 	/// Holds a set of blocks known to this peer.
 	known_blocks: LruHashSet<B::Hash>,
 }
@@ -228,13 +240,8 @@ impl ProtocolConfig {
 		} else {
 			match self.sync_mode {
 				config::SyncMode::Full => sync::SyncMode::Full,
-				config::SyncMode::Fast {
-					skip_proofs,
-					storage_chain_mode,
-				} => sync::SyncMode::LightState {
-					skip_proofs,
-					storage_chain_mode
-				},
+				config::SyncMode::Fast { skip_proofs, storage_chain_mode } =>
+					sync::SyncMode::LightState { skip_proofs, storage_chain_mode },
 			}
 		}
 	}
@@ -296,7 +303,8 @@ impl<B: BlockT> Protocol<B> {
 			chain.clone(),
 			block_announce_validator,
 			config.max_parallel_downloads,
-		).map_err(Box::new)?;
+		)
+		.map_err(Box::new)?;
 
 		let boot_node_ids = {
 			let mut list = HashSet::new();
@@ -312,7 +320,11 @@ impl<B: BlockT> Protocol<B> {
 			for reserved in &network_config.default_peers_set.reserved_nodes {
 				imp_p.insert(reserved.peer_id.clone());
 			}
-			for reserved in network_config.extra_sets.iter().flat_map(|s| s.set_config.reserved_nodes.iter()) {
+			for reserved in network_config
+				.extra_sets
+				.iter()
+				.flat_map(|s| s.set_config.reserved_nodes.iter())
+			{
 				imp_p.insert(reserved.peer_id.clone());
 			}
 			imp_p.shrink_to_fit();
@@ -322,7 +334,8 @@ impl<B: BlockT> Protocol<B> {
 		let mut known_addresses = Vec::new();
 
 		let (peerset, peerset_handle) = {
-			let mut sets = Vec::with_capacity(NUM_HARDCODED_PEERSETS + network_config.extra_sets.len());
+			let mut sets =
+				Vec::with_capacity(NUM_HARDCODED_PEERSETS + network_config.extra_sets.len());
 
 			let mut default_sets_reserved = HashSet::new();
 			for reserved in network_config.default_peers_set.reserved_nodes.iter() {
@@ -342,8 +355,8 @@ impl<B: BlockT> Protocol<B> {
 				out_peers: network_config.default_peers_set.out_peers,
 				bootnodes,
 				reserved_nodes: default_sets_reserved.clone(),
-				reserved_only: network_config.default_peers_set.non_reserved_mode
-					== config::NonReservedPeerMode::Deny,
+				reserved_only: network_config.default_peers_set.non_reserved_mode ==
+					config::NonReservedPeerMode::Deny,
 			});
 
 			for set_cfg in &network_config.extra_sets {
@@ -365,9 +378,7 @@ impl<B: BlockT> Protocol<B> {
 				});
 			}
 
-			sc_peerset::Peerset::from_config(sc_peerset::PeersetConfig {
-				sets,
-			})
+			sc_peerset::Peerset::from_config(sc_peerset::PeersetConfig { sets })
 		};
 
 		let block_announces_protocol: Cow<'static, str> = Cow::from({
@@ -383,12 +394,9 @@ impl<B: BlockT> Protocol<B> {
 			let best_hash = info.best_hash;
 			let genesis_hash = info.genesis_hash;
 
-			let block_announces_handshake = BlockAnnouncesHandshake::<B>::build(
-				&config,
-				best_number,
-				best_hash,
-				genesis_hash,
-			).encode();
+			let block_announces_handshake =
+				BlockAnnouncesHandshake::<B>::build(&config, best_number, best_hash, genesis_hash)
+					.encode();
 
 			let sync_protocol_config = notifications::ProtocolConfig {
 				name: block_announces_protocol,
@@ -399,22 +407,22 @@ impl<B: BlockT> Protocol<B> {
 
 			Notifications::new(
 				peerset,
-				iter::once(sync_protocol_config)
-					.chain(network_config.extra_sets.iter()
-						.zip(notifications_protocols_handshakes)
-						.map(|(s, hs)| notifications::ProtocolConfig {
+				iter::once(sync_protocol_config).chain(
+					network_config.extra_sets.iter().zip(notifications_protocols_handshakes).map(
+						|(s, hs)| notifications::ProtocolConfig {
 							name: s.notifications_protocol.clone(),
 							fallback_names: s.fallback_names.clone(),
 							handshake: hs,
 							max_notification_size: s.max_notification_size,
-						})
+						},
 					),
+				),
 			)
 		};
 
 		let block_announce_data_cache = lru::LruCache::new(
-			network_config.default_peers_set.in_peers as usize
-				+ network_config.default_peers_set.out_peers as usize,
+			network_config.default_peers_set.in_peers as usize +
+				network_config.default_peers_set.out_peers as usize,
 		);
 
 		let protocol = Protocol {
@@ -428,8 +436,11 @@ impl<B: BlockT> Protocol<B> {
 			important_peers,
 			peerset_handle: peerset_handle.clone(),
 			behaviour,
-			notification_protocols:
-				network_config.extra_sets.iter().map(|s| s.notifications_protocol.clone()).collect(),
+			notification_protocols: network_config
+				.extra_sets
+				.iter()
+				.map(|s| s.notifications_protocol.clone())
+				.collect(),
 			bad_handshake_substreams: Default::default(),
 			metrics: if let Some(r) = metrics_registry {
 				Some(Metrics::register(r)?)
@@ -461,8 +472,12 @@ impl<B: BlockT> Protocol<B> {
 
 	/// Disconnects the given peer if we are connected to it.
 	pub fn disconnect_peer(&mut self, peer_id: &PeerId, protocol_name: &str) {
-		if let Some(position) = self.notification_protocols.iter().position(|p| *p == protocol_name) {
-			self.behaviour.disconnect_peer(peer_id, sc_peerset::SetId::from(position + NUM_HARDCODED_PEERSETS));
+		if let Some(position) = self.notification_protocols.iter().position(|p| *p == protocol_name)
+		{
+			self.behaviour.disconnect_peer(
+				peer_id,
+				sc_peerset::SetId::from(position + NUM_HARDCODED_PEERSETS),
+			);
 		} else {
 			log::warn!(target: "sub-libp2p", "disconnect_peer() with invalid protocol name")
 		}
@@ -480,10 +495,7 @@ impl<B: BlockT> Protocol<B> {
 
 	/// Returns the number of peers we're connected to and that are being queried.
 	pub fn num_active_peers(&self) -> usize {
-		self.peers
-			.values()
-			.filter(|p| p.request.is_some())
-			.count()
+		self.peers.values().filter(|p| p.request.is_some()).count()
 	}
 
 	/// Current global sync state.
@@ -524,12 +536,8 @@ impl<B: BlockT> Protocol<B> {
 
 		self.behaviour.set_notif_protocol_handshake(
 			HARDCODED_PEERSETS_SYNC,
-			BlockAnnouncesHandshake::<B>::build(
-				&self.config,
-				number,
-				hash,
-				self.genesis_hash,
-			).encode()
+			BlockAnnouncesHandshake::<B>::build(&self.config, number, hash, self.genesis_hash)
+				.encode(),
 		);
 	}
 
@@ -566,8 +574,11 @@ impl<B: BlockT> Protocol<B> {
 		}
 
 		if let Some(_peer_data) = self.peers.remove(&peer) {
-			if let Some(sync::OnBlockData::Import(origin, blocks)) = self.sync.peer_disconnected(&peer) {
-				self.pending_messages.push_back(CustomMessageOutcome::BlockImport(origin, blocks));
+			if let Some(sync::OnBlockData::Import(origin, blocks)) =
+				self.sync.peer_disconnected(&peer)
+			{
+				self.pending_messages
+					.push_back(CustomMessageOutcome::BlockImport(origin, blocks));
 			}
 			Ok(())
 		} else {
@@ -588,67 +599,76 @@ impl<B: BlockT> Protocol<B> {
 		request: message::BlockRequest<B>,
 		response: crate::schema::v1::BlockResponse,
 	) -> CustomMessageOutcome<B> {
-		let blocks = response.blocks.into_iter().map(|block_data| {
-			Ok(message::BlockData::<B> {
-				hash: Decode::decode(&mut block_data.hash.as_ref())?,
-				header: if !block_data.header.is_empty() {
-					Some(Decode::decode(&mut block_data.header.as_ref())?)
-				} else {
-					None
-				},
-				body: if request.fields.contains(message::BlockAttributes::BODY) {
-					Some(block_data.body.iter().map(|body| {
-						Decode::decode(&mut body.as_ref())
-					}).collect::<Result<Vec<_>, _>>()?)
-				} else {
-					None
-				},
-				indexed_body: if request.fields.contains(message::BlockAttributes::INDEXED_BODY) {
-					Some(block_data.indexed_body)
-				} else {
-					None
-				},
-				receipt: if !block_data.message_queue.is_empty() {
-					Some(block_data.receipt)
-				} else {
-					None
-				},
-				message_queue: if !block_data.message_queue.is_empty() {
-					Some(block_data.message_queue)
-				} else {
-					None
-				},
-				justification: if !block_data.justification.is_empty() {
-					Some(block_data.justification)
-				} else if block_data.is_empty_justification {
-					Some(Vec::new())
-				} else {
-					None
-				},
-				justifications: if !block_data.justifications.is_empty() {
-					Some(DecodeAll::decode_all(&mut block_data.justifications.as_ref())?)
-				} else {
-					None
-				},
+		let blocks = response
+			.blocks
+			.into_iter()
+			.map(|block_data| {
+				Ok(message::BlockData::<B> {
+					hash: Decode::decode(&mut block_data.hash.as_ref())?,
+					header: if !block_data.header.is_empty() {
+						Some(Decode::decode(&mut block_data.header.as_ref())?)
+					} else {
+						None
+					},
+					body: if request.fields.contains(message::BlockAttributes::BODY) {
+						Some(
+							block_data
+								.body
+								.iter()
+								.map(|body| Decode::decode(&mut body.as_ref()))
+								.collect::<Result<Vec<_>, _>>()?,
+						)
+					} else {
+						None
+					},
+					indexed_body: if request.fields.contains(message::BlockAttributes::INDEXED_BODY)
+					{
+						Some(block_data.indexed_body)
+					} else {
+						None
+					},
+					receipt: if !block_data.message_queue.is_empty() {
+						Some(block_data.receipt)
+					} else {
+						None
+					},
+					message_queue: if !block_data.message_queue.is_empty() {
+						Some(block_data.message_queue)
+					} else {
+						None
+					},
+					justification: if !block_data.justification.is_empty() {
+						Some(block_data.justification)
+					} else if block_data.is_empty_justification {
+						Some(Vec::new())
+					} else {
+						None
+					},
+					justifications: if !block_data.justifications.is_empty() {
+						Some(DecodeAll::decode_all(&mut block_data.justifications.as_ref())?)
+					} else {
+						None
+					},
+				})
 			})
-		}).collect::<Result<Vec<_>, codec::Error>>();
+			.collect::<Result<Vec<_>, codec::Error>>();
 
 		let blocks = match blocks {
 			Ok(blocks) => blocks,
 			Err(err) => {
 				debug!(target: "sync", "Failed to decode block response from {}: {}", peer_id, err);
 				self.peerset_handle.report_peer(peer_id, rep::BAD_MESSAGE);
-				return CustomMessageOutcome::None;
-			}
+				return CustomMessageOutcome::None
+			},
 		};
 
-		let block_response = message::BlockResponse::<B> {
-			id: request.id,
-			blocks,
-		};
+		let block_response = message::BlockResponse::<B> { id: request.id, blocks };
 
 		let blocks_range = || match (
-			block_response.blocks.first().and_then(|b| b.header.as_ref().map(|h| h.number())),
+			block_response
+				.blocks
+				.first()
+				.and_then(|b| b.header.as_ref().map(|h| h.number())),
 			block_response.blocks.last().and_then(|b| b.header.as_ref().map(|h| h.number())),
 		) {
 			(Some(first), Some(last)) if first != last => format!(" ({}..{})", first, last),
@@ -671,20 +691,18 @@ impl<B: BlockT> Protocol<B> {
 					self.behaviour.disconnect_peer(&id, HARDCODED_PEERSETS_SYNC);
 					self.peerset_handle.report_peer(id, repu);
 					CustomMessageOutcome::None
-				}
+				},
 			}
 		} else {
 			match self.sync.on_block_data(&peer_id, Some(request), block_response) {
 				Ok(sync::OnBlockData::Import(origin, blocks)) =>
 					CustomMessageOutcome::BlockImport(origin, blocks),
-				Ok(sync::OnBlockData::Request(peer, req)) => {
-					self.prepare_block_request(peer, req)
-				}
+				Ok(sync::OnBlockData::Request(peer, req)) => self.prepare_block_request(peer, req),
 				Err(sync::BadPeer(id, repu)) => {
 					self.behaviour.disconnect_peer(&id, HARDCODED_PEERSETS_SYNC);
 					self.peerset_handle.report_peer(id, repu);
 					CustomMessageOutcome::None
-				}
+				},
 			}
 		}
 	}
@@ -699,14 +717,13 @@ impl<B: BlockT> Protocol<B> {
 		match self.sync.on_state_data(&peer_id, response) {
 			Ok(sync::OnStateData::Import(origin, block)) =>
 				CustomMessageOutcome::BlockImport(origin, vec![block]),
-			Ok(sync::OnStateData::Request(peer, req)) => {
-				prepare_state_request::<B>(&mut self.peers, peer, req)
-			}
+			Ok(sync::OnStateData::Request(peer, req)) =>
+				prepare_state_request::<B>(&mut self.peers, peer, req),
 			Err(sync::BadPeer(id, repu)) => {
 				self.behaviour.disconnect_peer(&id, HARDCODED_PEERSETS_SYNC);
 				self.peerset_handle.report_peer(id, repu);
 				CustomMessageOutcome::None
-			}
+			},
 		}
 	}
 
@@ -732,7 +749,7 @@ impl<B: BlockT> Protocol<B> {
 		if self.peers.contains_key(&who) {
 			log::error!(target: "sync", "Called on_sync_peer_connected with already connected peer {}", who);
 			debug_assert!(false);
-			return Err(());
+			return Err(())
 		}
 
 		if status.genesis_hash != self.genesis_hash {
@@ -755,7 +772,7 @@ impl<B: BlockT> Protocol<B> {
 				);
 			}
 
-			return Err(());
+			return Err(())
 		}
 
 		if self.config.roles.is_light() {
@@ -764,14 +781,11 @@ impl<B: BlockT> Protocol<B> {
 				debug!(target: "sync", "Peer {} is unable to serve light requests", who);
 				self.peerset_handle.report_peer(who.clone(), rep::BAD_ROLE);
 				self.behaviour.disconnect_peer(&who, HARDCODED_PEERSETS_SYNC);
-				return Err(());
+				return Err(())
 			}
 
 			// we don't interested in peers that are far behind us
-			let self_best_block = self
-				.chain
-				.info()
-				.best_number;
+			let self_best_block = self.chain.info().best_number;
 			let blocks_difference = self_best_block
 				.checked_sub(&status.best_number)
 				.unwrap_or_else(Zero::zero)
@@ -780,7 +794,7 @@ impl<B: BlockT> Protocol<B> {
 				debug!(target: "sync", "Peer {} is far behind us and will unable to serve light requests", who);
 				self.peerset_handle.report_peer(who.clone(), rep::PEER_BEHIND_US_LIGHT);
 				self.behaviour.disconnect_peer(&who, HARDCODED_PEERSETS_SYNC);
-				return Err(());
+				return Err(())
 			}
 		}
 
@@ -788,11 +802,12 @@ impl<B: BlockT> Protocol<B> {
 			info: PeerInfo {
 				roles: status.roles,
 				best_hash: status.best_hash,
-				best_number: status.best_number
+				best_number: status.best_number,
 			},
 			request: None,
-			known_blocks: LruHashSet::new(NonZeroUsize::new(MAX_KNOWN_BLOCKS)
-				.expect("Constant is nonzero")),
+			known_blocks: LruHashSet::new(
+				NonZeroUsize::new(MAX_KNOWN_BLOCKS).expect("Constant is nonzero"),
+			),
 		};
 
 		let req = if peer.info.roles.is_full() {
@@ -802,7 +817,7 @@ impl<B: BlockT> Protocol<B> {
 					self.behaviour.disconnect_peer(&id, HARDCODED_PEERSETS_SYNC);
 					self.peerset_handle.report_peer(id, repu);
 					return Err(())
-				}
+				},
 			}
 		} else {
 			None
@@ -811,7 +826,8 @@ impl<B: BlockT> Protocol<B> {
 		debug!(target: "sync", "Connected {}", who);
 
 		self.peers.insert(who.clone(), peer);
-		self.pending_messages.push_back(CustomMessageOutcome::PeerNewBest(who.clone(), status.best_number));
+		self.pending_messages
+			.push_back(CustomMessageOutcome::PeerNewBest(who.clone(), status.best_number));
 
 		if let Some(req) = req {
 			let event = self.prepare_block_request(who.clone(), req);
@@ -830,23 +846,25 @@ impl<B: BlockT> Protocol<B> {
 			Ok(Some(header)) => header,
 			Ok(None) => {
 				warn!("Trying to announce unknown block: {}", hash);
-				return;
-			}
+				return
+			},
 			Err(e) => {
 				warn!("Error reading block header {}: {:?}", hash, e);
-				return;
-			}
+				return
+			},
 		};
 
 		// don't announce genesis block since it will be ignored
 		if header.number().is_zero() {
-			return;
+			return
 		}
 
 		let is_best = self.chain.info().best_hash == hash;
 		debug!(target: "sync", "Reannouncing block {:?} is_best: {}", hash, is_best);
 
-		let data = data.or_else(|| self.block_announce_data_cache.get(&hash).cloned()).unwrap_or_default();
+		let data = data
+			.or_else(|| self.block_announce_data_cache.get(&hash).cloned())
+			.unwrap_or_default();
 
 		for (who, ref mut peer) in self.peers.iter_mut() {
 			let inserted = peer.known_blocks.insert(hash);
@@ -862,11 +880,8 @@ impl<B: BlockT> Protocol<B> {
 					data: Some(data.clone()),
 				};
 
-				self.behaviour.write_notification(
-					who,
-					HARDCODED_PEERSETS_SYNC,
-					message.encode()
-				);
+				self.behaviour
+					.write_notification(who, HARDCODED_PEERSETS_SYNC, message.encode());
 			}
 		}
 	}
@@ -884,11 +899,7 @@ impl<B: BlockT> Protocol<B> {
 	/// in the task before being polled once. So, it is required to call
 	/// [`ChainSync::poll_block_announce_validation`] to ensure that the future is
 	/// registered properly and will wake up the task when being ready.
-	fn push_block_announce_validation(
-		&mut self,
-		who: PeerId,
-		announce: BlockAnnounce<B::Header>,
-	) {
+	fn push_block_announce_validation(&mut self, who: PeerId, announce: BlockAnnounce<B::Header>) {
 		let hash = announce.header.hash();
 
 		let peer = match self.peers.get_mut(&who) {
@@ -896,8 +907,8 @@ impl<B: BlockT> Protocol<B> {
 			None => {
 				log::error!(target: "sync", "Received block announce from disconnected peer {}", who);
 				debug_assert!(false);
-				return;
-			}
+				return
+			},
 		};
 
 		peer.known_blocks.insert(hash.clone());
@@ -918,8 +929,7 @@ impl<B: BlockT> Protocol<B> {
 		validation_result: sync::PollBlockAnnounceValidation<B::Header>,
 	) -> CustomMessageOutcome<B> {
 		let (header, is_best, who) = match validation_result {
-			sync::PollBlockAnnounceValidation::Skip =>
-				return CustomMessageOutcome::None,
+			sync::PollBlockAnnounceValidation::Skip => return CustomMessageOutcome::None,
 			sync::PollBlockAnnounceValidation::Nothing { is_best, who, announce } => {
 				self.update_peer_info(&who);
 
@@ -940,7 +950,7 @@ impl<B: BlockT> Protocol<B> {
 				} else {
 					return CustomMessageOutcome::None
 				}
-			}
+			},
 			sync::PollBlockAnnounceValidation::ImportHeader { announce, is_best, who } => {
 				self.update_peer_info(&who);
 
@@ -951,7 +961,7 @@ impl<B: BlockT> Protocol<B> {
 				}
 
 				(announce.header, is_best, who)
-			}
+			},
 			sync::PollBlockAnnounceValidation::Failure { who, disconnect } => {
 				if disconnect {
 					self.behaviour.disconnect_peer(&who, HARDCODED_PEERSETS_SYNC);
@@ -959,7 +969,7 @@ impl<B: BlockT> Protocol<B> {
 
 				self.report_peer(who, rep::BAD_BLOCK_ANNOUNCEMENT);
 				return CustomMessageOutcome::None
-			}
+			},
 		};
 
 		let number = *header.number();
@@ -971,39 +981,32 @@ impl<B: BlockT> Protocol<B> {
 			None,
 			message::generic::BlockResponse {
 				id: 0,
-				blocks: vec![
-					message::generic::BlockData {
-						hash: header.hash(),
-						header: Some(header),
-						body: None,
-						indexed_body: None,
-						receipt: None,
-						message_queue: None,
-						justification: None,
-						justifications: None,
-					},
-				],
+				blocks: vec![message::generic::BlockData {
+					hash: header.hash(),
+					header: Some(header),
+					body: None,
+					indexed_body: None,
+					receipt: None,
+					message_queue: None,
+					justification: None,
+					justifications: None,
+				}],
 			},
 		);
 
 		if is_best {
-			self.pending_messages.push_back(
-				CustomMessageOutcome::PeerNewBest(who, number),
-			);
+			self.pending_messages.push_back(CustomMessageOutcome::PeerNewBest(who, number));
 		}
 
 		match blocks_to_import {
-			Ok(sync::OnBlockData::Import(origin, blocks)) => {
-				CustomMessageOutcome::BlockImport(origin, blocks)
-			},
-			Ok(sync::OnBlockData::Request(peer, req)) => {
-				self.prepare_block_request(peer, req)
-			}
+			Ok(sync::OnBlockData::Import(origin, blocks)) =>
+				CustomMessageOutcome::BlockImport(origin, blocks),
+			Ok(sync::OnBlockData::Request(peer, req)) => self.prepare_block_request(peer, req),
 			Err(sync::BadPeer(id, repu)) => {
 				self.behaviour.disconnect_peer(&id, HARDCODED_PEERSETS_SYNC);
 				self.peerset_handle.report_peer(id, repu);
 				CustomMessageOutcome::None
-			}
+			},
 		}
 	}
 
@@ -1029,7 +1032,12 @@ impl<B: BlockT> Protocol<B> {
 	/// Request syncing for the given block from given set of peers.
 	/// Uses `protocol` to queue a new block download request and tries to dispatch all pending
 	/// requests.
-	pub fn set_sync_fork_request(&mut self, peers: Vec<PeerId>, hash: &B::Hash, number: NumberFor<B>) {
+	pub fn set_sync_fork_request(
+		&mut self,
+		peers: Vec<PeerId>,
+		hash: &B::Hash,
+		number: NumberFor<B>,
+	) {
 		self.sync.set_sync_fork_request(peers, hash, number)
 	}
 
@@ -1040,39 +1048,41 @@ impl<B: BlockT> Protocol<B> {
 		&mut self,
 		imported: usize,
 		count: usize,
-		results: Vec<(Result<BlockImportResult<NumberFor<B>>, BlockImportError>, B::Hash)>
+		results: Vec<(Result<BlockImportResult<NumberFor<B>>, BlockImportError>, B::Hash)>,
 	) {
-		let results = self.sync.on_blocks_processed(
-			imported,
-			count,
-			results,
-		);
+		let results = self.sync.on_blocks_processed(imported, count, results);
 		for result in results {
 			match result {
 				Ok((id, req)) => {
-					self.pending_messages.push_back(
-						prepare_block_request(&mut self.peers, id, req)
-					);
-				}
+					self.pending_messages.push_back(prepare_block_request(
+						&mut self.peers,
+						id,
+						req,
+					));
+				},
 				Err(sync::BadPeer(id, repu)) => {
 					self.behaviour.disconnect_peer(&id, HARDCODED_PEERSETS_SYNC);
 					self.peerset_handle.report_peer(id, repu)
-				}
+				},
 			}
 		}
 	}
 
 	/// Call this when a justification has been processed by the import queue, with or without
 	/// errors.
-	pub fn justification_import_result(&mut self, who: PeerId, hash: B::Hash, number: NumberFor<B>, success: bool) {
+	pub fn justification_import_result(
+		&mut self,
+		who: PeerId,
+		hash: B::Hash,
+		number: NumberFor<B>,
+		success: bool,
+	) {
 		self.sync.on_justification_import(hash, number, success);
 		if !success {
 			log::info!("💔 Invalid justification provided by {} for #{}", who, hash);
 			self.behaviour.disconnect_peer(&who, HARDCODED_PEERSETS_SYNC);
-			self.peerset_handle.report_peer(
-				who,
-				sc_peerset::ReputationChange::new_fatal("Invalid justification")
-			);
+			self.peerset_handle
+				.report_peer(who, sc_peerset::ReputationChange::new_fatal("Invalid justification"));
 		}
 	}
 
@@ -1104,7 +1114,10 @@ impl<B: BlockT> Protocol<B> {
 	/// Removes a `PeerId` from the list of reserved peers.
 	pub fn remove_set_reserved_peer(&self, protocol: Cow<'static, str>, peer: PeerId) {
 		if let Some(index) = self.notification_protocols.iter().position(|p| *p == protocol) {
-			self.peerset_handle.remove_reserved_peer(sc_peerset::SetId::from(index + NUM_HARDCODED_PEERSETS), peer);
+			self.peerset_handle.remove_reserved_peer(
+				sc_peerset::SetId::from(index + NUM_HARDCODED_PEERSETS),
+				peer,
+			);
 		} else {
 			log::error!(
 				target: "sub-libp2p",
@@ -1117,7 +1130,8 @@ impl<B: BlockT> Protocol<B> {
 	/// Adds a `PeerId` to the list of reserved peers.
 	pub fn add_set_reserved_peer(&self, protocol: Cow<'static, str>, peer: PeerId) {
 		if let Some(index) = self.notification_protocols.iter().position(|p| *p == protocol) {
-			self.peerset_handle.add_reserved_peer(sc_peerset::SetId::from(index + NUM_HARDCODED_PEERSETS), peer);
+			self.peerset_handle
+				.add_reserved_peer(sc_peerset::SetId::from(index + NUM_HARDCODED_PEERSETS), peer);
 		} else {
 			log::error!(
 				target: "sub-libp2p",
@@ -1139,7 +1153,8 @@ impl<B: BlockT> Protocol<B> {
 	/// Add a peer to a peers set.
 	pub fn add_to_peers_set(&self, protocol: Cow<'static, str>, peer: PeerId) {
 		if let Some(index) = self.notification_protocols.iter().position(|p| *p == protocol) {
-			self.peerset_handle.add_to_peers_set(sc_peerset::SetId::from(index + NUM_HARDCODED_PEERSETS), peer);
+			self.peerset_handle
+				.add_to_peers_set(sc_peerset::SetId::from(index + NUM_HARDCODED_PEERSETS), peer);
 		} else {
 			log::error!(
 				target: "sub-libp2p",
@@ -1152,7 +1167,10 @@ impl<B: BlockT> Protocol<B> {
 	/// Remove a peer from a peers set.
 	pub fn remove_from_peers_set(&self, protocol: Cow<'static, str>, peer: PeerId) {
 		if let Some(index) = self.notification_protocols.iter().position(|p| *p == protocol) {
-			self.peerset_handle.remove_from_peers_set(sc_peerset::SetId::from(index + NUM_HARDCODED_PEERSETS), peer);
+			self.peerset_handle.remove_from_peers_set(
+				sc_peerset::SetId::from(index + NUM_HARDCODED_PEERSETS),
+				peer,
+			);
 		} else {
 			log::error!(
 				target: "sub-libp2p",
@@ -1172,13 +1190,21 @@ impl<B: BlockT> Protocol<B> {
 			metrics.fork_targets.set(m.fork_targets.into());
 			metrics.queued_blocks.set(m.queued_blocks.into());
 
-			metrics.justifications.with_label_values(&["pending"])
+			metrics
+				.justifications
+				.with_label_values(&["pending"])
 				.set(m.justifications.pending_requests.into());
-			metrics.justifications.with_label_values(&["active"])
+			metrics
+				.justifications
+				.with_label_values(&["active"])
 				.set(m.justifications.active_requests.into());
-			metrics.justifications.with_label_values(&["failed"])
+			metrics
+				.justifications
+				.with_label_values(&["failed"])
 				.set(m.justifications.failed_requests.into());
-			metrics.justifications.with_label_values(&["importing"])
+			metrics
+				.justifications
+				.with_label_values(&["importing"])
 				.set(m.justifications.importing_requests.into());
 		}
 	}
@@ -1209,11 +1235,7 @@ fn prepare_block_request<B: BlockT>(
 		support_multiple_justifications: true,
 	};
 
-	CustomMessageOutcome::BlockRequest {
-		target: who,
-		request: request,
-		pending_response: tx,
-	}
+	CustomMessageOutcome::BlockRequest { target: who, request, pending_response: tx }
 }
 
 fn prepare_state_request<B: BlockT>(
@@ -1226,11 +1248,7 @@ fn prepare_state_request<B: BlockT>(
 	if let Some(ref mut peer) = peers.get_mut(&who) {
 		peer.request = Some((PeerRequest::State, rx));
 	}
-	CustomMessageOutcome::StateRequest {
-		target: who,
-		request: request,
-		pending_response: tx,
-	}
+	CustomMessageOutcome::StateRequest { target: who, request, pending_response: tx }
 }
 
 /// Outcome of an incoming custom message.
@@ -1246,7 +1264,7 @@ pub enum CustomMessageOutcome<B: BlockT> {
 		/// See [`crate::Event::NotificationStreamOpened::negotiated_fallback`].
 		negotiated_fallback: Option<Cow<'static, str>>,
 		roles: Roles,
-		notifications_sink: NotificationsSink
+		notifications_sink: NotificationsSink,
 	},
 	/// The [`NotificationsSink`] of some notification protocols need an update.
 	NotificationStreamReplaced {
@@ -1255,9 +1273,15 @@ pub enum CustomMessageOutcome<B: BlockT> {
 		notifications_sink: NotificationsSink,
 	},
 	/// Notification protocols have been closed with a remote.
-	NotificationStreamClosed { remote: PeerId, protocol: Cow<'static, str> },
+	NotificationStreamClosed {
+		remote: PeerId,
+		protocol: Cow<'static, str>,
+	},
 	/// Messages have been received on one or more notifications protocols.
-	NotificationsReceived { remote: PeerId, messages: Vec<(Cow<'static, str>, Bytes)> },
+	NotificationsReceived {
+		remote: PeerId,
+		messages: Vec<(Cow<'static, str>, Bytes)>,
+	},
 	/// A new block request must be emitted.
 	BlockRequest {
 		target: PeerId,
@@ -1291,11 +1315,21 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 		self.behaviour.addresses_of_peer(peer_id)
 	}
 
-	fn inject_connection_established(&mut self, peer_id: &PeerId, conn: &ConnectionId, endpoint: &ConnectedPoint) {
+	fn inject_connection_established(
+		&mut self,
+		peer_id: &PeerId,
+		conn: &ConnectionId,
+		endpoint: &ConnectedPoint,
+	) {
 		self.behaviour.inject_connection_established(peer_id, conn, endpoint)
 	}
 
-	fn inject_connection_closed(&mut self, peer_id: &PeerId, conn: &ConnectionId, endpoint: &ConnectedPoint) {
+	fn inject_connection_closed(
+		&mut self,
+		peer_id: &PeerId,
+		conn: &ConnectionId,
+		endpoint: &ConnectedPoint,
+	) {
 		self.behaviour.inject_connection_closed(peer_id, conn, endpoint)
 	}
 
@@ -1325,9 +1359,9 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 			<<Self::ProtocolsHandler as IntoProtocolsHandler>::Handler as ProtocolsHandler>::InEvent,
 			Self::OutEvent
 		>
-	> {
+	>{
 		if let Some(message) = self.pending_messages.pop_front() {
-			return Poll::Ready(NetworkBehaviourAction::GenerateEvent(message));
+			return Poll::Ready(NetworkBehaviourAction::GenerateEvent(message))
 		}
 
 		// Check for finished outgoing requests.
@@ -1340,38 +1374,44 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 						let (req, _) = peer.request.take().unwrap();
 						match req {
 							PeerRequest::Block(req) => {
-								let protobuf_response = match crate::schema::v1::BlockResponse::decode(&resp[..]) {
-									Ok(proto) => proto,
-									Err(e) => {
-										debug!(
-											target: "sync",
-											"Failed to decode block response from peer {:?}: {:?}.",
-											id,
-											e
-										);
-										self.peerset_handle.report_peer(id.clone(), rep::BAD_MESSAGE);
-										self.behaviour.disconnect_peer(id, HARDCODED_PEERSETS_SYNC);
-										continue;
-									}
-								};
+								let protobuf_response =
+									match crate::schema::v1::BlockResponse::decode(&resp[..]) {
+										Ok(proto) => proto,
+										Err(e) => {
+											debug!(
+												target: "sync",
+												"Failed to decode block response from peer {:?}: {:?}.",
+												id,
+												e
+											);
+											self.peerset_handle
+												.report_peer(id.clone(), rep::BAD_MESSAGE);
+											self.behaviour
+												.disconnect_peer(id, HARDCODED_PEERSETS_SYNC);
+											continue
+										},
+									};
 
 								finished_block_requests.push((id.clone(), req, protobuf_response));
 							},
 							PeerRequest::State => {
-								let protobuf_response = match crate::schema::v1::StateResponse::decode(&resp[..]) {
-									Ok(proto) => proto,
-									Err(e) => {
-										debug!(
-											target: "sync",
-											"Failed to decode state response from peer {:?}: {:?}.",
-											id,
-											e
-										);
-										self.peerset_handle.report_peer(id.clone(), rep::BAD_MESSAGE);
-										self.behaviour.disconnect_peer(id, HARDCODED_PEERSETS_SYNC);
-										continue;
-									}
-								};
+								let protobuf_response =
+									match crate::schema::v1::StateResponse::decode(&resp[..]) {
+										Ok(proto) => proto,
+										Err(e) => {
+											debug!(
+												target: "sync",
+												"Failed to decode state response from peer {:?}: {:?}.",
+												id,
+												e
+											);
+											self.peerset_handle
+												.report_peer(id.clone(), rep::BAD_MESSAGE);
+											self.behaviour
+												.disconnect_peer(id, HARDCODED_PEERSETS_SYNC);
+											continue
+										},
+									};
 
 								finished_state_requests.push((id.clone(), protobuf_response));
 							},
@@ -1385,32 +1425,35 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 							RequestFailure::Network(OutboundFailure::Timeout) => {
 								self.peerset_handle.report_peer(id.clone(), rep::TIMEOUT);
 								self.behaviour.disconnect_peer(id, HARDCODED_PEERSETS_SYNC);
-							}
+							},
 							RequestFailure::Network(OutboundFailure::UnsupportedProtocols) => {
 								self.peerset_handle.report_peer(id.clone(), rep::BAD_PROTOCOL);
 								self.behaviour.disconnect_peer(id, HARDCODED_PEERSETS_SYNC);
-							}
+							},
 							RequestFailure::Network(OutboundFailure::DialFailure) => {
 								self.behaviour.disconnect_peer(id, HARDCODED_PEERSETS_SYNC);
-							}
+							},
 							RequestFailure::Refused => {
 								self.peerset_handle.report_peer(id.clone(), rep::REFUSED);
 								self.behaviour.disconnect_peer(id, HARDCODED_PEERSETS_SYNC);
-							}
-							RequestFailure::Network(OutboundFailure::ConnectionClosed)
-							| RequestFailure::NotConnected => {
+							},
+							RequestFailure::Network(OutboundFailure::ConnectionClosed) |
+							RequestFailure::NotConnected => {
 								self.behaviour.disconnect_peer(id, HARDCODED_PEERSETS_SYNC);
 							},
 							RequestFailure::UnknownProtocol => {
-								debug_assert!(false, "Block request protocol should always be known.");
-							}
+								debug_assert!(
+									false,
+									"Block request protocol should always be known."
+								);
+							},
 							RequestFailure::Obsolete => {
 								debug_assert!(
 									false,
 									"Can not receive `RequestFailure::Obsolete` after dropping the \
 									 response receiver.",
 								);
-							}
+							},
 						}
 					},
 					Poll::Ready(Err(oneshot::Canceled)) => {
@@ -1461,7 +1504,7 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 		}
 
 		if let Some(message) = self.pending_messages.pop_front() {
-			return Poll::Ready(NetworkBehaviourAction::GenerateEvent(message));
+			return Poll::Ready(NetworkBehaviourAction::GenerateEvent(message))
 		}
 
 		let event = match self.behaviour.poll(cx, params) {
@@ -1472,14 +1515,22 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 			Poll::Ready(NetworkBehaviourAction::DialPeer { peer_id, condition }) =>
 				return Poll::Ready(NetworkBehaviourAction::DialPeer { peer_id, condition }),
 			Poll::Ready(NetworkBehaviourAction::NotifyHandler { peer_id, handler, event }) =>
-				return Poll::Ready(NetworkBehaviourAction::NotifyHandler { peer_id, handler, event }),
+				return Poll::Ready(NetworkBehaviourAction::NotifyHandler {
+					peer_id,
+					handler,
+					event,
+				}),
 			Poll::Ready(NetworkBehaviourAction::ReportObservedAddr { address, score }) =>
 				return Poll::Ready(NetworkBehaviourAction::ReportObservedAddr { address, score }),
 		};
 
 		let outcome = match event {
 			NotificationsOut::CustomProtocolOpen {
-				peer_id, set_id, received_handshake, notifications_sink, negotiated_fallback
+				peer_id,
+				set_id,
+				received_handshake,
+				notifications_sink,
+				negotiated_fallback,
 			} => {
 				// Set number 0 is hardcoded the default set of peers we sync from.
 				if set_id == HARDCODED_PEERSETS_SYNC {
@@ -1512,16 +1563,21 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 							);
 							self.peerset_handle.report_peer(peer_id, rep::BAD_MESSAGE);
 							CustomMessageOutcome::None
-						}
+						},
 						Err(err) => {
-							match <BlockAnnouncesHandshake<B> as DecodeAll>::decode_all(&mut &received_handshake[..]) {
+							match <BlockAnnouncesHandshake<B> as DecodeAll>::decode_all(
+								&mut &received_handshake[..],
+							) {
 								Ok(handshake) => {
-									if self.on_sync_peer_connected(peer_id.clone(), handshake).is_ok() {
+									if self
+										.on_sync_peer_connected(peer_id.clone(), handshake)
+										.is_ok()
+									{
 										CustomMessageOutcome::SyncConnected(peer_id)
 									} else {
 										CustomMessageOutcome::None
 									}
-								}
+								},
 								Err(err2) => {
 									debug!(
 										target: "sync",
@@ -1533,21 +1589,24 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 									);
 									self.peerset_handle.report_peer(peer_id, rep::BAD_MESSAGE);
 									CustomMessageOutcome::None
-								}
+								},
 							}
-						}
+						},
 					}
-
 				} else {
-					match (message::Roles::decode_all(&received_handshake[..]), self.peers.get(&peer_id)) {
-						(Ok(roles), _) =>
-							CustomMessageOutcome::NotificationStreamOpened {
-								remote: peer_id,
-								protocol: self.notification_protocols[usize::from(set_id) - NUM_HARDCODED_PEERSETS].clone(),
-								negotiated_fallback,
-								roles,
-								notifications_sink,
-							},
+					match (
+						message::Roles::decode_all(&received_handshake[..]),
+						self.peers.get(&peer_id),
+					) {
+						(Ok(roles), _) => CustomMessageOutcome::NotificationStreamOpened {
+							remote: peer_id,
+							protocol: self.notification_protocols
+								[usize::from(set_id) - NUM_HARDCODED_PEERSETS]
+								.clone(),
+							negotiated_fallback,
+							roles,
+							notifications_sink,
+						},
 						(Err(_), Some(peer)) if received_handshake.is_empty() => {
 							// As a convenience, we allow opening substreams for "external"
 							// notification protocols with an empty handshake. This fetches the
@@ -1555,7 +1614,9 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 							// TODO: remove this after https://github.com/paritytech/substrate/issues/5685
 							CustomMessageOutcome::NotificationStreamOpened {
 								remote: peer_id,
-								protocol: self.notification_protocols[usize::from(set_id) - NUM_HARDCODED_PEERSETS].clone(),
+								protocol: self.notification_protocols
+									[usize::from(set_id) - NUM_HARDCODED_PEERSETS]
+									.clone(),
 								negotiated_fallback,
 								roles: peer.info.roles,
 								notifications_sink,
@@ -1567,11 +1628,11 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 							self.behaviour.disconnect_peer(&peer_id, set_id);
 							self.peerset_handle.report_peer(peer_id, rep::BAD_MESSAGE);
 							CustomMessageOutcome::None
-						}
+						},
 					}
 				}
-			}
-			NotificationsOut::CustomProtocolReplaced { peer_id, notifications_sink, set_id } => {
+			},
+			NotificationsOut::CustomProtocolReplaced { peer_id, notifications_sink, set_id } =>
 				if set_id == HARDCODED_PEERSETS_SYNC {
 					CustomMessageOutcome::None
 				} else if self.bad_handshake_substreams.contains(&(peer_id.clone(), set_id)) {
@@ -1579,11 +1640,12 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 				} else {
 					CustomMessageOutcome::NotificationStreamReplaced {
 						remote: peer_id,
-						protocol: self.notification_protocols[usize::from(set_id) - NUM_HARDCODED_PEERSETS].clone(),
+						protocol: self.notification_protocols
+							[usize::from(set_id) - NUM_HARDCODED_PEERSETS]
+							.clone(),
 						notifications_sink,
 					}
-				}
-			},
+				},
 			NotificationsOut::CustomProtocolClosed { peer_id, set_id } => {
 				// Set number 0 is hardcoded the default set of peers we sync from.
 				if set_id == HARDCODED_PEERSETS_SYNC {
@@ -1605,55 +1667,57 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 				} else {
 					CustomMessageOutcome::NotificationStreamClosed {
 						remote: peer_id,
-						protocol: self.notification_protocols[usize::from(set_id) - NUM_HARDCODED_PEERSETS].clone(),
+						protocol: self.notification_protocols
+							[usize::from(set_id) - NUM_HARDCODED_PEERSETS]
+							.clone(),
 					}
 				}
 			},
-			NotificationsOut::Notification { peer_id, set_id, message } =>
-				match set_id {
-					HARDCODED_PEERSETS_SYNC if self.peers.contains_key(&peer_id) => {
-						if let Ok(announce) = message::BlockAnnounce::decode(&mut message.as_ref()) {
-							self.push_block_announce_validation(peer_id, announce);
-
-							// Make sure that the newly added block announce validation future was
-							// polled once to be registered in the task.
-							if let Poll::Ready(res) = self.sync.poll_block_announce_validation(cx) {
-								self.process_block_announce_validation_result(res)
-							} else {
-								CustomMessageOutcome::None
-							}
+			NotificationsOut::Notification { peer_id, set_id, message } => match set_id {
+				HARDCODED_PEERSETS_SYNC if self.peers.contains_key(&peer_id) => {
+					if let Ok(announce) = message::BlockAnnounce::decode(&mut message.as_ref()) {
+						self.push_block_announce_validation(peer_id, announce);
+
+						// Make sure that the newly added block announce validation future was
+						// polled once to be registered in the task.
+						if let Poll::Ready(res) = self.sync.poll_block_announce_validation(cx) {
+							self.process_block_announce_validation_result(res)
 						} else {
-							warn!(target: "sub-libp2p", "Failed to decode block announce");
 							CustomMessageOutcome::None
 						}
-					}
-					HARDCODED_PEERSETS_SYNC => {
-						trace!(
-							target: "sync",
-							"Received sync for peer earlier refused by sync layer: {}",
-							peer_id
-						);
-						CustomMessageOutcome::None
-					}
-					_ if self.bad_handshake_substreams.contains(&(peer_id.clone(), set_id)) => {
+					} else {
+						warn!(target: "sub-libp2p", "Failed to decode block announce");
 						CustomMessageOutcome::None
 					}
-					_ => {
-						let protocol_name = self.notification_protocols[usize::from(set_id) - NUM_HARDCODED_PEERSETS].clone();
-						CustomMessageOutcome::NotificationsReceived {
-							remote: peer_id,
-							messages: vec![(protocol_name, message.freeze())],
-						}
+				},
+				HARDCODED_PEERSETS_SYNC => {
+					trace!(
+						target: "sync",
+						"Received sync for peer earlier refused by sync layer: {}",
+						peer_id
+					);
+					CustomMessageOutcome::None
+				},
+				_ if self.bad_handshake_substreams.contains(&(peer_id.clone(), set_id)) =>
+					CustomMessageOutcome::None,
+				_ => {
+					let protocol_name = self.notification_protocols
+						[usize::from(set_id) - NUM_HARDCODED_PEERSETS]
+						.clone();
+					CustomMessageOutcome::NotificationsReceived {
+						remote: peer_id,
+						messages: vec![(protocol_name, message.freeze())],
 					}
-				}
+				},
+			},
 		};
 
 		if !matches!(outcome, CustomMessageOutcome::<B>::None) {
-			return Poll::Ready(NetworkBehaviourAction::GenerateEvent(outcome));
+			return Poll::Ready(NetworkBehaviourAction::GenerateEvent(outcome))
 		}
 
 		if let Some(message) = self.pending_messages.pop_front() {
-			return Poll::Ready(NetworkBehaviourAction::GenerateEvent(message));
+			return Poll::Ready(NetworkBehaviourAction::GenerateEvent(message))
 		}
 
 		// This block can only be reached if an event was pulled from the behaviour and that
@@ -1667,7 +1731,7 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 		&mut self,
 		peer_id: Option<&PeerId>,
 		addr: &Multiaddr,
-		error: &dyn std::error::Error
+		error: &dyn std::error::Error,
 	) {
 		self.behaviour.inject_addr_reach_failure(peer_id, addr, error)
 	}
diff --git a/client/network/src/protocol/event.rs b/client/network/src/protocol/event.rs
index c13980b3f430..df56f426ad1f 100644
--- a/client/network/src/protocol/event.rs
+++ b/client/network/src/protocol/event.rs
@@ -20,8 +20,7 @@
 //! events that happen on the network like DHT get/put results received.
 
 use bytes::Bytes;
-use libp2p::core::PeerId;
-use libp2p::kad::record::Key;
+use libp2p::{core::PeerId, kad::record::Key};
 use std::borrow::Cow;
 
 /// Events generated by DHT as a response to get_value and put_value requests.
diff --git a/client/network/src/protocol/message.rs b/client/network/src/protocol/message.rs
index 50d0fd796902..95f5ffa3a545 100644
--- a/client/network/src/protocol/message.rs
+++ b/client/network/src/protocol/message.rs
@@ -18,16 +18,17 @@
 
 //! Network packet message types. These get serialized and put into the lower level protocol payload.
 
-use bitflags::bitflags;
-use sp_runtime::{ConsensusEngineId, traits::{Block as BlockT, Header as HeaderT}};
-use codec::{Encode, Decode, Input, Output, Error};
 pub use self::generic::{
-	BlockAnnounce, RemoteCallRequest, RemoteReadRequest,
-	RemoteHeaderRequest, RemoteHeaderResponse,
-	RemoteChangesRequest, RemoteChangesResponse,
-	FromBlock, RemoteReadChildRequest, Roles,
+	BlockAnnounce, FromBlock, RemoteCallRequest, RemoteChangesRequest, RemoteChangesResponse,
+	RemoteHeaderRequest, RemoteHeaderResponse, RemoteReadChildRequest, RemoteReadRequest, Roles,
 };
+use bitflags::bitflags;
+use codec::{Decode, Encode, Error, Input, Output};
 use sc_client_api::StorageProof;
+use sp_runtime::{
+	traits::{Block as BlockT, Header as HeaderT},
+	ConsensusEngineId,
+};
 
 /// A unique ID of a request.
 pub type RequestId = u64;
@@ -41,24 +42,16 @@ pub type Message<B> = generic::Message<
 >;
 
 /// Type alias for using the block request type using block type parameters.
-pub type BlockRequest<B> = generic::BlockRequest<
-	<B as BlockT>::Hash,
-	<<B as BlockT>::Header as HeaderT>::Number,
->;
+pub type BlockRequest<B> =
+	generic::BlockRequest<<B as BlockT>::Hash, <<B as BlockT>::Header as HeaderT>::Number>;
 
 /// Type alias for using the BlockData type using block type parameters.
-pub type BlockData<B> = generic::BlockData<
-	<B as BlockT>::Header,
-	<B as BlockT>::Hash,
-	<B as BlockT>::Extrinsic,
->;
+pub type BlockData<B> =
+	generic::BlockData<<B as BlockT>::Header, <B as BlockT>::Hash, <B as BlockT>::Extrinsic>;
 
 /// Type alias for using the BlockResponse type using block type parameters.
-pub type BlockResponse<B> = generic::BlockResponse<
-	<B as BlockT>::Header,
-	<B as BlockT>::Hash,
-	<B as BlockT>::Extrinsic,
->;
+pub type BlockResponse<B> =
+	generic::BlockResponse<<B as BlockT>::Header, <B as BlockT>::Hash, <B as BlockT>::Extrinsic>;
 
 /// A set of transactions.
 pub type Transactions<E> = Vec<E>;
@@ -168,14 +161,13 @@ impl<H: HeaderT> generic::BlockAnnounce<H> {
 
 /// Generic types.
 pub mod generic {
-	use bitflags::bitflags;
-	use codec::{Encode, Decode, Input, Output};
-	use sp_runtime::{EncodedJustification, Justifications};
 	use super::{
-		RemoteReadResponse, Transactions, Direction,
-		RequestId, BlockAttributes, RemoteCallResponse, ConsensusEngineId,
-		BlockState, StorageProof,
+		BlockAttributes, BlockState, ConsensusEngineId, Direction, RemoteCallResponse,
+		RemoteReadResponse, RequestId, StorageProof, Transactions,
 	};
+	use bitflags::bitflags;
+	use codec::{Decode, Encode, Input, Output};
+	use sp_runtime::{EncodedJustification, Justifications};
 
 	bitflags! {
 		/// Bitmask of the roles that a node fulfills.
@@ -358,11 +350,12 @@ pub mod generic {
 			let compact = CompactStatus::decode(value)?;
 			let chain_status = match <Vec<u8>>::decode(value) {
 				Ok(v) => v,
-				Err(e) => if compact.version <= LAST_CHAIN_STATUS_VERSION {
-					return Err(e)
-				} else {
-					Vec::new()
-				}
+				Err(e) =>
+					if compact.version <= LAST_CHAIN_STATUS_VERSION {
+						return Err(e)
+					} else {
+						Vec::new()
+					},
 			};
 
 			let CompactStatus {
@@ -443,11 +436,7 @@ pub mod generic {
 			let header = H::decode(input)?;
 			let state = BlockState::decode(input).ok();
 			let data = Vec::decode(input).ok();
-			Ok(BlockAnnounce {
-				header,
-				state,
-				data,
-			})
+			Ok(BlockAnnounce { header, state, data })
 		}
 	}
 
diff --git a/client/network/src/protocol/notifications.rs b/client/network/src/protocol/notifications.rs
index 8739eb4948b7..e489970e987c 100644
--- a/client/network/src/protocol/notifications.rs
+++ b/client/network/src/protocol/notifications.rs
@@ -19,10 +19,12 @@
 //! Implementation of libp2p's `NetworkBehaviour` trait that establishes communications and opens
 //! notifications substreams.
 
-pub use self::behaviour::{Notifications, NotificationsOut, ProtocolConfig};
-pub use self::handler::{NotifsHandlerError, NotificationsSink, Ready};
+pub use self::{
+	behaviour::{Notifications, NotificationsOut, ProtocolConfig},
+	handler::{NotificationsSink, NotifsHandlerError, Ready},
+};
 
 mod behaviour;
 mod handler;
-mod upgrade;
 mod tests;
+mod upgrade;
diff --git a/client/network/src/protocol/notifications/behaviour.rs b/client/network/src/protocol/notifications/behaviour.rs
index f95f6870e5fa..1466e9d4264d 100644
--- a/client/network/src/protocol/notifications/behaviour.rs
+++ b/client/network/src/protocol/notifications/behaviour.rs
@@ -16,28 +16,34 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::protocol::notifications::{
-	handler::{self, NotificationsSink, NotifsHandlerProto, NotifsHandlerOut, NotifsHandlerIn}
+use crate::protocol::notifications::handler::{
+	self, NotificationsSink, NotifsHandlerIn, NotifsHandlerOut, NotifsHandlerProto,
 };
 
 use bytes::BytesMut;
 use fnv::FnvHashMap;
 use futures::prelude::*;
-use libp2p::core::{ConnectedPoint, Multiaddr, PeerId, connection::ConnectionId};
-use libp2p::swarm::{
-	DialPeerCondition,
-	NetworkBehaviour,
-	NetworkBehaviourAction,
-	NotifyHandler,
-	PollParameters
+use libp2p::{
+	core::{connection::ConnectionId, ConnectedPoint, Multiaddr, PeerId},
+	swarm::{
+		DialPeerCondition, NetworkBehaviour, NetworkBehaviourAction, NotifyHandler, PollParameters,
+	},
 };
 use log::{error, trace, warn};
 use parking_lot::RwLock;
 use rand::distributions::{Distribution as _, Uniform};
 use smallvec::SmallVec;
-use std::task::{Context, Poll};
-use std::{borrow::Cow, cmp, collections::{hash_map::Entry, VecDeque}};
-use std::{error, mem, pin::Pin, str, sync::Arc, time::Duration};
+use std::{
+	borrow::Cow,
+	cmp,
+	collections::{hash_map::Entry, VecDeque},
+	error, mem,
+	pin::Pin,
+	str,
+	sync::Arc,
+	task::{Context, Poll},
+	time::Duration,
+};
 use wasm_timer::Instant;
 
 /// Network behaviour that handles opening substreams for custom protocols with other peers.
@@ -93,7 +99,6 @@ use wasm_timer::Instant;
 /// the time of this writing, there may be at most two connections to a peer
 /// and only as a result of simultaneous dialing. However, the implementation
 /// accommodates for any number of connections.
-///
 pub struct Notifications {
 	/// Notification protocols. Entries never change after initialization.
 	notif_protocols: Vec<handler::ProtocolConfig>,
@@ -111,7 +116,9 @@ pub struct Notifications {
 	///
 	/// By design, we never remove elements from this list. Elements are removed only when the
 	/// `Delay` triggers. As such, this stream may produce obsolete elements.
-	delays: stream::FuturesUnordered<Pin<Box<dyn Future<Output = (DelayId, PeerId, sc_peerset::SetId)> + Send>>>,
+	delays: stream::FuturesUnordered<
+		Pin<Box<dyn Future<Output = (DelayId, PeerId, sc_peerset::SetId)> + Send>>,
+	>,
 
 	/// [`DelayId`] to assign to the next delay.
 	next_delay_id: DelayId,
@@ -401,7 +408,7 @@ impl Notifications {
 	pub fn set_notif_protocol_handshake(
 		&mut self,
 		set_id: sc_peerset::SetId,
-		handshake_message: impl Into<Vec<u8>>
+		handshake_message: impl Into<Vec<u8>>,
 	) {
 		if let Some(p) = self.notif_protocols.get_mut(usize::from(set_id)) {
 			*p.handshake.write() = handshake_message.into();
@@ -438,9 +445,10 @@ impl Notifications {
 		&mut self,
 		peer_id: &PeerId,
 		set_id: sc_peerset::SetId,
-		ban: Option<Duration>
+		ban: Option<Duration>,
 	) {
-		let mut entry = if let Entry::Occupied(entry) = self.peers.entry((peer_id.clone(), set_id)) {
+		let mut entry = if let Entry::Occupied(entry) = self.peers.entry((peer_id.clone(), set_id))
+		{
 			entry
 		} else {
 			return
@@ -454,11 +462,7 @@ impl Notifications {
 			st @ PeerState::Backoff { .. } => *entry.into_mut() = st,
 
 			// DisabledPendingEnable => Disabled.
-			PeerState::DisabledPendingEnable {
-				connections,
-				timer_deadline,
-				timer: _
-			} => {
+			PeerState::DisabledPendingEnable { connections, timer_deadline, timer: _ } => {
 				trace!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
 				self.peerset.dropped(set_id, peer_id.clone(), sc_peerset::DropReason::Unknown);
 				let backoff_until = Some(if let Some(ban) = ban {
@@ -466,10 +470,7 @@ impl Notifications {
 				} else {
 					timer_deadline
 				});
-				*entry.into_mut() = PeerState::Disabled {
-					connections,
-					backoff_until
-				}
+				*entry.into_mut() = PeerState::Disabled { connections, backoff_until }
 			},
 
 			// Enabled => Disabled.
@@ -481,15 +482,13 @@ impl Notifications {
 
 				if connections.iter().any(|(_, s)| matches!(s, ConnectionState::Open(_))) {
 					trace!(target: "sub-libp2p", "External API <= Closed({}, {:?})", peer_id, set_id);
-					let event = NotificationsOut::CustomProtocolClosed {
-						peer_id: peer_id.clone(),
-						set_id,
-					};
+					let event =
+						NotificationsOut::CustomProtocolClosed { peer_id: peer_id.clone(), set_id };
 					self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
 				}
 
-				for (connec_id, connec_state) in connections.iter_mut()
-					.filter(|(_, s)| matches!(s, ConnectionState::Open(_)))
+				for (connec_id, connec_state) in
+					connections.iter_mut().filter(|(_, s)| matches!(s, ConnectionState::Open(_)))
 				{
 					trace!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close({:?})", peer_id, *connec_id, set_id);
 					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
@@ -500,8 +499,8 @@ impl Notifications {
 					*connec_state = ConnectionState::Closing;
 				}
 
-				for (connec_id, connec_state) in connections.iter_mut()
-					.filter(|(_, s)| matches!(s, ConnectionState::Opening))
+				for (connec_id, connec_state) in
+					connections.iter_mut().filter(|(_, s)| matches!(s, ConnectionState::Opening))
 				{
 					trace!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close({:?})", peer_id, *connec_id, set_id);
 					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
@@ -512,21 +511,25 @@ impl Notifications {
 					*connec_state = ConnectionState::OpeningThenClosing;
 				}
 
-				debug_assert!(!connections.iter().any(|(_, s)| matches!(s, ConnectionState::Open(_))));
-				debug_assert!(!connections.iter().any(|(_, s)| matches!(s, ConnectionState::Opening)));
+				debug_assert!(!connections
+					.iter()
+					.any(|(_, s)| matches!(s, ConnectionState::Open(_))));
+				debug_assert!(!connections
+					.iter()
+					.any(|(_, s)| matches!(s, ConnectionState::Opening)));
 
 				let backoff_until = ban.map(|dur| Instant::now() + dur);
-				*entry.into_mut() = PeerState::Disabled {
-					connections,
-					backoff_until
-				}
+				*entry.into_mut() = PeerState::Disabled { connections, backoff_until }
 			},
 
 			// Incoming => Disabled.
 			// Ongoing opening requests from the remote are rejected.
 			PeerState::Incoming { mut connections, backoff_until } => {
-				let inc = if let Some(inc) = self.incoming.iter_mut()
-					.find(|i| i.peer_id == entry.key().0 && i.set_id == set_id && i.alive) {
+				let inc = if let Some(inc) = self
+					.incoming
+					.iter_mut()
+					.find(|i| i.peer_id == entry.key().0 && i.set_id == set_id && i.alive)
+				{
 					inc
 				} else {
 					error!(target: "sub-libp2p", "State mismatch in libp2p: no entry in \
@@ -536,7 +539,8 @@ impl Notifications {
 
 				inc.alive = false;
 
-				for (connec_id, connec_state) in connections.iter_mut()
+				for (connec_id, connec_state) in connections
+					.iter_mut()
 					.filter(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote))
 				{
 					trace!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close({:?})", peer_id, *connec_id, set_id);
@@ -555,11 +559,10 @@ impl Notifications {
 					(None, None) => None,
 				};
 
-				debug_assert!(!connections.iter().any(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote)));
-				*entry.into_mut() = PeerState::Disabled {
-					connections,
-					backoff_until
-				}
+				debug_assert!(!connections
+					.iter()
+					.any(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote)));
+				*entry.into_mut() = PeerState::Disabled { connections, backoff_until }
 			},
 
 			PeerState::Poisoned =>
@@ -568,14 +571,21 @@ impl Notifications {
 	}
 
 	/// Returns the list of all the peers that the peerset currently requests us to be connected to.
-	pub fn requested_peers<'a>(&'a self, set_id: sc_peerset::SetId) -> impl Iterator<Item = &'a PeerId> + 'a {
-		self.peers.iter()
+	pub fn requested_peers<'a>(
+		&'a self,
+		set_id: sc_peerset::SetId,
+	) -> impl Iterator<Item = &'a PeerId> + 'a {
+		self.peers
+			.iter()
 			.filter(move |((_, set), state)| *set == set_id && state.is_requested())
 			.map(|((id, _), _)| id)
 	}
 
 	/// Returns the list of reserved peers.
-	pub fn reserved_peers<'a>(&'a self, set_id: sc_peerset::SetId) -> impl Iterator<Item = &'a PeerId> + 'a {
+	pub fn reserved_peers<'a>(
+		&'a self,
+		set_id: sc_peerset::SetId,
+	) -> impl Iterator<Item = &'a PeerId> + 'a {
 		self.peerset.reserved_peers(set_id)
 	}
 
@@ -595,14 +605,15 @@ impl Notifications {
 		set_id: sc_peerset::SetId,
 		message: impl Into<Vec<u8>>,
 	) {
-		let notifs_sink = match self.peers.get(&(target.clone(), set_id)).and_then(|p| p.get_open()) {
+		let notifs_sink = match self.peers.get(&(target.clone(), set_id)).and_then(|p| p.get_open())
+		{
 			None => {
 				trace!(target: "sub-libp2p",
 					"Tried to sent notification to {:?} without an open channel.",
 					target);
 				return
 			},
-			Some(sink) => sink
+			Some(sink) => sink,
 		};
 
 		let message = message.into();
@@ -637,11 +648,11 @@ impl Notifications {
 				// The `DialPeerCondition` ensures that dial attempts are de-duplicated
 				self.events.push_back(NetworkBehaviourAction::DialPeer {
 					peer_id: entry.key().0.clone(),
-					condition: DialPeerCondition::Disconnected
+					condition: DialPeerCondition::Disconnected,
 				});
 				entry.insert(PeerState::Requested);
-				return;
-			}
+				return
+			},
 		};
 
 		let now = Instant::now();
@@ -652,10 +663,8 @@ impl Notifications {
 				let peer_id = occ_entry.key().0.clone();
 				trace!(target: "sub-libp2p", "PSM => Connect({}, {:?}): Will start to connect at \
 					until {:?}", peer_id, set_id, timer_deadline);
-				*occ_entry.into_mut() = PeerState::PendingRequest {
-					timer: *timer,
-					timer_deadline: *timer_deadline,
-				};
+				*occ_entry.into_mut() =
+					PeerState::PendingRequest { timer: *timer, timer_deadline: *timer_deadline };
 			},
 
 			// Backoff (expired) => Requested
@@ -666,16 +675,15 @@ impl Notifications {
 				// The `DialPeerCondition` ensures that dial attempts are de-duplicated
 				self.events.push_back(NetworkBehaviourAction::DialPeer {
 					peer_id: occ_entry.key().0.clone(),
-					condition: DialPeerCondition::Disconnected
+					condition: DialPeerCondition::Disconnected,
 				});
 				*occ_entry.into_mut() = PeerState::Requested;
 			},
 
 			// Disabled (with non-expired ban) => DisabledPendingEnable
-			PeerState::Disabled {
-				connections,
-				backoff_until: Some(ref backoff)
-			} if *backoff > now => {
+			PeerState::Disabled { connections, backoff_until: Some(ref backoff) }
+				if *backoff > now =>
+			{
 				let peer_id = occ_entry.key().0.clone();
 				trace!(target: "sub-libp2p", "PSM => Connect({}, {:?}): But peer is backed-off until {:?}",
 					peer_id, set_id, backoff);
@@ -683,27 +691,30 @@ impl Notifications {
 				let delay_id = self.next_delay_id;
 				self.next_delay_id.0 += 1;
 				let delay = futures_timer::Delay::new(*backoff - now);
-				self.delays.push(async move {
-					delay.await;
-					(delay_id, peer_id, set_id)
-				}.boxed());
+				self.delays.push(
+					async move {
+						delay.await;
+						(delay_id, peer_id, set_id)
+					}
+					.boxed(),
+				);
 
 				*occ_entry.into_mut() = PeerState::DisabledPendingEnable {
 					connections,
 					timer: delay_id,
 					timer_deadline: *backoff,
 				};
-			},
+			}
 
 			// Disabled => Enabled
 			PeerState::Disabled { mut connections, backoff_until } => {
-				debug_assert!(!connections.iter().any(|(_, s)| {
-					matches!(s, ConnectionState::Open(_))
-				}));
+				debug_assert!(!connections
+					.iter()
+					.any(|(_, s)| { matches!(s, ConnectionState::Open(_)) }));
 
 				// The first element of `closed` is chosen to open the notifications substream.
-				if let Some((connec_id, connec_state)) = connections.iter_mut()
-					.find(|(_, s)| matches!(s, ConnectionState::Closed))
+				if let Some((connec_id, connec_state)) =
+					connections.iter_mut().find(|(_, s)| matches!(s, ConnectionState::Closed))
 				{
 					trace!(target: "sub-libp2p", "PSM => Connect({}, {:?}): Enabling connections.",
 						occ_entry.key().0, set_id);
@@ -740,10 +751,13 @@ impl Notifications {
 					self.next_delay_id.0 += 1;
 					debug_assert!(timer_deadline > now);
 					let delay = futures_timer::Delay::new(timer_deadline - now);
-					self.delays.push(async move {
-						delay.await;
-						(delay_id, peer_id, set_id)
-					}.boxed());
+					self.delays.push(
+						async move {
+							delay.await;
+							(delay_id, peer_id, set_id)
+						}
+						.boxed(),
+					);
 
 					*occ_entry.into_mut() = PeerState::DisabledPendingEnable {
 						connections,
@@ -757,16 +771,22 @@ impl Notifications {
 			PeerState::Incoming { mut connections, .. } => {
 				trace!(target: "sub-libp2p", "PSM => Connect({}, {:?}): Enabling connections.",
 					occ_entry.key().0, set_id);
-				if let Some(inc) = self.incoming.iter_mut()
-					.find(|i| i.peer_id == occ_entry.key().0 && i.set_id == set_id && i.alive) {
+				if let Some(inc) = self
+					.incoming
+					.iter_mut()
+					.find(|i| i.peer_id == occ_entry.key().0 && i.set_id == set_id && i.alive)
+				{
 					inc.alive = false;
 				} else {
 					error!(target: "sub-libp2p", "State mismatch in libp2p: no entry in \
 						incoming for incoming peer")
 				}
 
-				debug_assert!(connections.iter().any(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote)));
-				for (connec_id, connec_state) in connections.iter_mut()
+				debug_assert!(connections
+					.iter()
+					.any(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote)));
+				for (connec_id, connec_state) in connections
+					.iter_mut()
 					.filter(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote))
 				{
 					trace!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open({:?})",
@@ -820,7 +840,7 @@ impl Notifications {
 				trace!(target: "sub-libp2p", "PSM => Drop({}, {:?}): Already disabled.",
 					entry.key().0, set_id);
 				return
-			}
+			},
 		};
 
 		match mem::replace(entry.get_mut(), PeerState::Poisoned) {
@@ -836,10 +856,8 @@ impl Notifications {
 				trace!(target: "sub-libp2p",
 					"PSM => Drop({}, {:?}): Interrupting pending enabling.",
 					entry.key().0, set_id);
-				*entry.into_mut() = PeerState::Disabled {
-					connections,
-					backoff_until: Some(timer_deadline),
-				};
+				*entry.into_mut() =
+					PeerState::Disabled { connections, backoff_until: Some(timer_deadline) };
 			},
 
 			// Enabled => Disabled
@@ -847,8 +865,10 @@ impl Notifications {
 				trace!(target: "sub-libp2p", "PSM => Drop({}, {:?}): Disabling connections.",
 					entry.key().0, set_id);
 
-				debug_assert!(connections.iter().any(|(_, s)|
-					matches!(s, ConnectionState::Opening | ConnectionState::Open(_))));
+				debug_assert!(connections.iter().any(|(_, s)| matches!(
+					s,
+					ConnectionState::Opening | ConnectionState::Open(_)
+				)));
 
 				if connections.iter().any(|(_, s)| matches!(s, ConnectionState::Open(_))) {
 					trace!(target: "sub-libp2p", "External API <= Closed({}, {:?})", entry.key().0, set_id);
@@ -859,8 +879,8 @@ impl Notifications {
 					self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
 				}
 
-				for (connec_id, connec_state) in connections.iter_mut()
-					.filter(|(_, s)| matches!(s, ConnectionState::Opening))
+				for (connec_id, connec_state) in
+					connections.iter_mut().filter(|(_, s)| matches!(s, ConnectionState::Opening))
 				{
 					trace!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close({:?})",
 						entry.key(), *connec_id, set_id);
@@ -872,8 +892,8 @@ impl Notifications {
 					*connec_state = ConnectionState::OpeningThenClosing;
 				}
 
-				for (connec_id, connec_state) in connections.iter_mut()
-					.filter(|(_, s)| matches!(s, ConnectionState::Open(_)))
+				for (connec_id, connec_state) in
+					connections.iter_mut().filter(|(_, s)| matches!(s, ConnectionState::Open(_)))
 				{
 					trace!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close({:?})",
 						entry.key(), *connec_id, set_id);
@@ -922,7 +942,8 @@ impl Notifications {
 	/// Function that is called when the peerset wants us to accept a connection
 	/// request from a peer.
 	fn peerset_report_accept(&mut self, index: sc_peerset::IncomingIndex) {
-		let incoming = if let Some(pos) = self.incoming.iter().position(|i| i.incoming_id == index) {
+		let incoming = if let Some(pos) = self.incoming.iter().position(|i| i.incoming_id == index)
+		{
 			self.incoming.remove(pos)
 		} else {
 			error!(target: "sub-libp2p", "PSM => Accept({:?}): Invalid index", index);
@@ -933,12 +954,16 @@ impl Notifications {
 			trace!(target: "sub-libp2p", "PSM => Accept({:?}, {}, {:?}): Obsolete incoming",
 				index, incoming.peer_id, incoming.set_id);
 			match self.peers.get_mut(&(incoming.peer_id.clone(), incoming.set_id)) {
-				Some(PeerState::DisabledPendingEnable { .. }) |
-				Some(PeerState::Enabled { .. }) => {}
+				Some(PeerState::DisabledPendingEnable { .. }) | Some(PeerState::Enabled { .. }) => {
+				},
 				_ => {
 					trace!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})",
 						incoming.peer_id, incoming.set_id);
-					self.peerset.dropped(incoming.set_id, incoming.peer_id, sc_peerset::DropReason::Unknown);
+					self.peerset.dropped(
+						incoming.set_id,
+						incoming.peer_id,
+						sc_peerset::DropReason::Unknown,
+					);
 				},
 			}
 			return
@@ -948,8 +973,8 @@ impl Notifications {
 			Some(s) => s,
 			None => {
 				debug_assert!(false);
-				return;
-			}
+				return
+			},
 		};
 
 		match mem::replace(state, PeerState::Poisoned) {
@@ -958,8 +983,11 @@ impl Notifications {
 				trace!(target: "sub-libp2p", "PSM => Accept({:?}, {}, {:?}): Enabling connections.",
 					index, incoming.peer_id, incoming.set_id);
 
-				debug_assert!(connections.iter().any(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote)));
-				for (connec_id, connec_state) in connections.iter_mut()
+				debug_assert!(connections
+					.iter()
+					.any(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote)));
+				for (connec_id, connec_state) in connections
+					.iter_mut()
 					.filter(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote))
 				{
 					trace!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open({:?})",
@@ -973,7 +1001,7 @@ impl Notifications {
 				}
 
 				*state = PeerState::Enabled { connections };
-			}
+			},
 
 			// Any state other than `Incoming` is invalid.
 			peer => {
@@ -981,13 +1009,14 @@ impl Notifications {
 					"State mismatch in libp2p: Expected alive incoming. Got {:?}.",
 					peer);
 				debug_assert!(false);
-			}
+			},
 		}
 	}
 
 	/// Function that is called when the peerset wants us to reject an incoming peer.
 	fn peerset_report_reject(&mut self, index: sc_peerset::IncomingIndex) {
-		let incoming = if let Some(pos) = self.incoming.iter().position(|i| i.incoming_id == index) {
+		let incoming = if let Some(pos) = self.incoming.iter().position(|i| i.incoming_id == index)
+		{
 			self.incoming.remove(pos)
 		} else {
 			error!(target: "sub-libp2p", "PSM => Reject({:?}): Invalid index", index);
@@ -1004,8 +1033,8 @@ impl Notifications {
 			Some(s) => s,
 			None => {
 				debug_assert!(false);
-				return;
-			}
+				return
+			},
 		};
 
 		match mem::replace(state, PeerState::Poisoned) {
@@ -1014,8 +1043,11 @@ impl Notifications {
 				trace!(target: "sub-libp2p", "PSM => Reject({:?}, {}, {:?}): Rejecting connections.",
 					index, incoming.peer_id, incoming.set_id);
 
-				debug_assert!(connections.iter().any(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote)));
-				for (connec_id, connec_state) in connections.iter_mut()
+				debug_assert!(connections
+					.iter()
+					.any(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote)));
+				for (connec_id, connec_state) in connections
+					.iter_mut()
 					.filter(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote))
 				{
 					trace!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close({:?})",
@@ -1029,10 +1061,10 @@ impl Notifications {
 				}
 
 				*state = PeerState::Disabled { connections, backoff_until };
-			}
+			},
 			peer => error!(target: "sub-libp2p",
 				"State mismatch in libp2p: Expected alive incoming. Got {:?}.",
-				peer)
+				peer),
 		}
 	}
 }
@@ -1049,15 +1081,18 @@ impl NetworkBehaviour for Notifications {
 		Vec::new()
 	}
 
-	fn inject_connected(&mut self, _: &PeerId) {
-	}
+	fn inject_connected(&mut self, _: &PeerId) {}
 
-	fn inject_connection_established(&mut self, peer_id: &PeerId, conn: &ConnectionId, endpoint: &ConnectedPoint) {
+	fn inject_connection_established(
+		&mut self,
+		peer_id: &PeerId,
+		conn: &ConnectionId,
+		endpoint: &ConnectedPoint,
+	) {
 		for set_id in (0..self.notif_protocols.len()).map(sc_peerset::SetId::from) {
 			match self.peers.entry((peer_id.clone(), set_id)).or_insert(PeerState::Poisoned) {
 				// Requested | PendingRequest => Enabled
-				st @ &mut PeerState::Requested |
-				st @ &mut PeerState::PendingRequest { .. } => {
+				st @ &mut PeerState::Requested | st @ &mut PeerState::PendingRequest { .. } => {
 					trace!(target: "sub-libp2p",
 						"Libp2p => Connected({}, {:?}, {:?}): Connection was requested by PSM.",
 						peer_id, set_id, endpoint
@@ -1072,12 +1107,11 @@ impl NetworkBehaviour for Notifications {
 					let mut connections = SmallVec::new();
 					connections.push((*conn, ConnectionState::Opening));
 					*st = PeerState::Enabled { connections };
-				}
+				},
 
 				// Poisoned gets inserted above if the entry was missing.
 				// Ø | Backoff => Disabled
-				st @ &mut PeerState::Poisoned |
-				st @ &mut PeerState::Backoff { .. } => {
+				st @ &mut PeerState::Poisoned | st @ &mut PeerState::Backoff { .. } => {
 					let backoff_until = if let PeerState::Backoff { timer_deadline, .. } = st {
 						Some(*timer_deadline)
 					} else {
@@ -1090,7 +1124,7 @@ impl NetworkBehaviour for Notifications {
 					let mut connections = SmallVec::new();
 					connections.push((*conn, ConnectionState::Closed));
 					*st = PeerState::Disabled { connections, backoff_until };
-				}
+				},
 
 				// In all other states, add this new connection to the list of closed inactive
 				// connections.
@@ -1102,14 +1136,21 @@ impl NetworkBehaviour for Notifications {
 						"Libp2p => Connected({}, {:?}, {:?}, {:?}): Secondary connection. Leaving closed.",
 						peer_id, set_id, endpoint, *conn);
 					connections.push((*conn, ConnectionState::Closed));
-				}
+				},
 			}
 		}
 	}
 
-	fn inject_connection_closed(&mut self, peer_id: &PeerId, conn: &ConnectionId, _endpoint: &ConnectedPoint) {
+	fn inject_connection_closed(
+		&mut self,
+		peer_id: &PeerId,
+		conn: &ConnectionId,
+		_endpoint: &ConnectedPoint,
+	) {
 		for set_id in (0..self.notif_protocols.len()).map(sc_peerset::SetId::from) {
-			let mut entry = if let Entry::Occupied(entry) = self.peers.entry((peer_id.clone(), set_id)) {
+			let mut entry = if let Entry::Occupied(entry) =
+				self.peers.entry((peer_id.clone(), set_id))
+			{
 				entry
 			} else {
 				error!(target: "sub-libp2p", "inject_connection_closed: State mismatch in the custom protos handler");
@@ -1139,15 +1180,16 @@ impl NetworkBehaviour for Notifications {
 								self.next_delay_id.0 += 1;
 								let delay = futures_timer::Delay::new(until - now);
 								let peer_id = peer_id.clone();
-								self.delays.push(async move {
-									delay.await;
-									(delay_id, peer_id, set_id)
-								}.boxed());
-
-								*entry.get_mut() = PeerState::Backoff {
-									timer: delay_id,
-									timer_deadline: until,
-								};
+								self.delays.push(
+									async move {
+										delay.await;
+										(delay_id, peer_id, set_id)
+									}
+									.boxed(),
+								);
+
+								*entry.get_mut() =
+									PeerState::Backoff { timer: delay_id, timer_deadline: until };
 							} else {
 								entry.remove();
 							}
@@ -1177,13 +1219,15 @@ impl NetworkBehaviour for Notifications {
 
 					if connections.is_empty() {
 						trace!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
-						self.peerset.dropped(set_id, peer_id.clone(), sc_peerset::DropReason::Unknown);
+						self.peerset.dropped(
+							set_id,
+							peer_id.clone(),
+							sc_peerset::DropReason::Unknown,
+						);
 						*entry.get_mut() = PeerState::Backoff { timer, timer_deadline };
-
 					} else {
-						*entry.get_mut() = PeerState::DisabledPendingEnable {
-							connections, timer_deadline, timer
-						};
+						*entry.get_mut() =
+							PeerState::DisabledPendingEnable { connections, timer_deadline, timer };
 					}
 				},
 
@@ -1195,7 +1239,9 @@ impl NetworkBehaviour for Notifications {
 						peer_id, set_id, *conn
 					);
 
-					debug_assert!(connections.iter().any(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote)));
+					debug_assert!(connections
+						.iter()
+						.any(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote)));
 
 					if let Some(pos) = connections.iter().position(|(c, _)| *c == *conn) {
 						connections.remove(pos);
@@ -1205,16 +1251,18 @@ impl NetworkBehaviour for Notifications {
 							"inject_connection_closed: State mismatch in the custom protos handler");
 					}
 
-					let no_desired_left = !connections.iter().any(|(_, s)| {
-						matches!(s, ConnectionState::OpenDesiredByRemote)
-					});
+					let no_desired_left = !connections
+						.iter()
+						.any(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote));
 
 					// If no connection is `OpenDesiredByRemote` anymore, clean up the peerset incoming
 					// request.
 					if no_desired_left {
 						// In the incoming state, we don't report "Dropped". Instead we will just
 						// ignore the corresponding Accept/Reject.
-						if let Some(state) = self.incoming.iter_mut()
+						if let Some(state) = self
+							.incoming
+							.iter_mut()
 							.find(|i| i.alive && i.set_id == set_id && i.peer_id == *peer_id)
 						{
 							state.alive = false;
@@ -1233,29 +1281,29 @@ impl NetworkBehaviour for Notifications {
 								self.next_delay_id.0 += 1;
 								let delay = futures_timer::Delay::new(until - now);
 								let peer_id = peer_id.clone();
-								self.delays.push(async move {
-									delay.await;
-									(delay_id, peer_id, set_id)
-								}.boxed());
-
-								*entry.get_mut() = PeerState::Backoff {
-									timer: delay_id,
-									timer_deadline: until,
-								};
+								self.delays.push(
+									async move {
+										delay.await;
+										(delay_id, peer_id, set_id)
+									}
+									.boxed(),
+								);
+
+								*entry.get_mut() =
+									PeerState::Backoff { timer: delay_id, timer_deadline: until };
 							} else {
 								entry.remove();
 							}
 						} else {
 							entry.remove();
 						}
-
 					} else if no_desired_left {
 						// If no connection is `OpenDesiredByRemote` anymore, switch to `Disabled`.
 						*entry.get_mut() = PeerState::Disabled { connections, backoff_until };
 					} else {
 						*entry.get_mut() = PeerState::Incoming { connections, backoff_until };
 					}
-				}
+				},
 
 				// Enabled => Enabled | Backoff
 				// Peers are always backed-off when disconnecting while Enabled.
@@ -1266,8 +1314,10 @@ impl NetworkBehaviour for Notifications {
 						peer_id, set_id, *conn
 					);
 
-					debug_assert!(connections.iter().any(|(_, s)|
-						matches!(s, ConnectionState::Opening | ConnectionState::Open(_))));
+					debug_assert!(connections.iter().any(|(_, s)| matches!(
+						s,
+						ConnectionState::Opening | ConnectionState::Open(_)
+					)));
 
 					if let Some(pos) = connections.iter().position(|(c, _)| *c == *conn) {
 						let (_, state) = connections.remove(pos);
@@ -1275,11 +1325,9 @@ impl NetworkBehaviour for Notifications {
 							if let Some((replacement_pos, replacement_sink)) = connections
 								.iter()
 								.enumerate()
-								.filter_map(|(num, (_, s))| {
-									match s {
-										ConnectionState::Open(s) => Some((num, s.clone())),
-										_ => None
-									}
+								.filter_map(|(num, (_, s))| match s {
+									ConnectionState::Open(s) => Some((num, s.clone())),
+									_ => None,
 								})
 								.next()
 							{
@@ -1294,7 +1342,8 @@ impl NetworkBehaviour for Notifications {
 										set_id,
 										notifications_sink: replacement_sink,
 									};
-									self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
+									self.events
+										.push_back(NetworkBehaviourAction::GenerateEvent(event));
 								}
 							} else {
 								trace!(
@@ -1308,7 +1357,6 @@ impl NetworkBehaviour for Notifications {
 								self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
 							}
 						}
-
 					} else {
 						error!(target: "sub-libp2p",
 							"inject_connection_closed: State mismatch in the custom protos handler");
@@ -1317,38 +1365,44 @@ impl NetworkBehaviour for Notifications {
 
 					if connections.is_empty() {
 						trace!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
-						self.peerset.dropped(set_id, peer_id.clone(), sc_peerset::DropReason::Unknown);
+						self.peerset.dropped(
+							set_id,
+							peer_id.clone(),
+							sc_peerset::DropReason::Unknown,
+						);
 						let ban_dur = Uniform::new(5, 10).sample(&mut rand::thread_rng());
 
 						let delay_id = self.next_delay_id;
 						self.next_delay_id.0 += 1;
 						let delay = futures_timer::Delay::new(Duration::from_secs(ban_dur));
 						let peer_id = peer_id.clone();
-						self.delays.push(async move {
-							delay.await;
-							(delay_id, peer_id, set_id)
-						}.boxed());
+						self.delays.push(
+							async move {
+								delay.await;
+								(delay_id, peer_id, set_id)
+							}
+							.boxed(),
+						);
 
 						*entry.get_mut() = PeerState::Backoff {
 							timer: delay_id,
 							timer_deadline: Instant::now() + Duration::from_secs(ban_dur),
 						};
-
-					} else if !connections.iter().any(|(_, s)|
-						matches!(s, ConnectionState::Opening | ConnectionState::Open(_)))
-					{
+					} else if !connections.iter().any(|(_, s)| {
+						matches!(s, ConnectionState::Opening | ConnectionState::Open(_))
+					}) {
 						trace!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
-						self.peerset.dropped(set_id, peer_id.clone(), sc_peerset::DropReason::Unknown);
-
-						*entry.get_mut() = PeerState::Disabled {
-							connections,
-							backoff_until: None
-						};
+						self.peerset.dropped(
+							set_id,
+							peer_id.clone(),
+							sc_peerset::DropReason::Unknown,
+						);
 
+						*entry.get_mut() = PeerState::Disabled { connections, backoff_until: None };
 					} else {
 						*entry.get_mut() = PeerState::Enabled { connections };
 					}
-				}
+				},
 
 				PeerState::Requested |
 				PeerState::PendingRequest { .. } |
@@ -1367,10 +1421,14 @@ impl NetworkBehaviour for Notifications {
 		}
 	}
 
-	fn inject_disconnected(&mut self, _peer_id: &PeerId) {
-	}
+	fn inject_disconnected(&mut self, _peer_id: &PeerId) {}
 
-	fn inject_addr_reach_failure(&mut self, peer_id: Option<&PeerId>, addr: &Multiaddr, error: &dyn error::Error) {
+	fn inject_addr_reach_failure(
+		&mut self,
+		peer_id: Option<&PeerId>,
+		addr: &Multiaddr,
+		error: &dyn error::Error,
+	) {
 		trace!(target: "sub-libp2p", "Libp2p => Reach failure for {:?} through {:?}: {:?}", peer_id, addr, error);
 	}
 
@@ -1386,26 +1444,33 @@ impl NetworkBehaviour for Notifications {
 					},
 
 					// "Basic" situation: we failed to reach a peer that the peerset requested.
-					st @ PeerState::Requested |
-					st @ PeerState::PendingRequest { .. } => {
+					st @ PeerState::Requested | st @ PeerState::PendingRequest { .. } => {
 						trace!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
-						self.peerset.dropped(set_id, peer_id.clone(), sc_peerset::DropReason::Unknown);
+						self.peerset.dropped(
+							set_id,
+							peer_id.clone(),
+							sc_peerset::DropReason::Unknown,
+						);
 
 						let now = Instant::now();
 						let ban_duration = match st {
-							PeerState::PendingRequest { timer_deadline, .. } if timer_deadline > now =>
+							PeerState::PendingRequest { timer_deadline, .. }
+								if timer_deadline > now =>
 								cmp::max(timer_deadline - now, Duration::from_secs(5)),
-							_ => Duration::from_secs(5)
+							_ => Duration::from_secs(5),
 						};
 
 						let delay_id = self.next_delay_id;
 						self.next_delay_id.0 += 1;
 						let delay = futures_timer::Delay::new(ban_duration);
 						let peer_id = peer_id.clone();
-						self.delays.push(async move {
-							delay.await;
-							(delay_id, peer_id, set_id)
-						}.boxed());
+						self.delays.push(
+							async move {
+								delay.await;
+								(delay_id, peer_id, set_id)
+							}
+							.boxed(),
+						);
 
 						*entry.into_mut() = PeerState::Backoff {
 							timer: delay_id,
@@ -1415,8 +1480,10 @@ impl NetworkBehaviour for Notifications {
 
 					// We can still get dial failures even if we are already connected to the peer,
 					// as an extra diagnostic for an earlier attempt.
-					st @ PeerState::Disabled { .. } | st @ PeerState::Enabled { .. } |
-						st @ PeerState::DisabledPendingEnable { .. } | st @ PeerState::Incoming { .. } => {
+					st @ PeerState::Disabled { .. } |
+					st @ PeerState::Enabled { .. } |
+					st @ PeerState::DisabledPendingEnable { .. } |
+					st @ PeerState::Incoming { .. } => {
 						*entry.into_mut() = st;
 					},
 
@@ -1429,12 +1496,7 @@ impl NetworkBehaviour for Notifications {
 		}
 	}
 
-	fn inject_event(
-		&mut self,
-		source: PeerId,
-		connection: ConnectionId,
-		event: NotifsHandlerOut,
-	) {
+	fn inject_event(&mut self, source: PeerId, connection: ConnectionId, event: NotifsHandlerOut) {
 		match event {
 			NotifsHandlerOut::OpenDesiredByRemote { protocol_index } => {
 				let set_id = sc_peerset::SetId::from(protocol_index);
@@ -1443,20 +1505,24 @@ impl NetworkBehaviour for Notifications {
 					"Handler({:?}, {:?}]) => OpenDesiredByRemote({:?})",
 					source, connection, set_id);
 
-				let mut entry = if let Entry::Occupied(entry) = self.peers.entry((source.clone(), set_id)) {
-					entry
-				} else {
-					error!(target: "sub-libp2p", "OpenDesiredByRemote: State mismatch in the custom protos handler");
-					debug_assert!(false);
-					return
-				};
+				let mut entry =
+					if let Entry::Occupied(entry) = self.peers.entry((source.clone(), set_id)) {
+						entry
+					} else {
+						error!(target: "sub-libp2p", "OpenDesiredByRemote: State mismatch in the custom protos handler");
+						debug_assert!(false);
+						return
+					};
 
 				match mem::replace(entry.get_mut(), PeerState::Poisoned) {
 					// Incoming => Incoming
 					PeerState::Incoming { mut connections, backoff_until } => {
-						debug_assert!(connections.iter().any(|(_, s)|
-							matches!(s, ConnectionState::OpenDesiredByRemote)));
-						if let Some((_, connec_state)) = connections.iter_mut().find(|(c, _)| *c == connection) {
+						debug_assert!(connections
+							.iter()
+							.any(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote)));
+						if let Some((_, connec_state)) =
+							connections.iter_mut().find(|(c, _)| *c == connection)
+						{
 							if let ConnectionState::Closed = *connec_state {
 								*connec_state = ConnectionState::OpenDesiredByRemote;
 							} else {
@@ -1482,10 +1548,14 @@ impl NetworkBehaviour for Notifications {
 					},
 
 					PeerState::Enabled { mut connections } => {
-						debug_assert!(connections.iter().any(|(_, s)|
-							matches!(s, ConnectionState::Opening | ConnectionState::Open(_))));
+						debug_assert!(connections.iter().any(|(_, s)| matches!(
+							s,
+							ConnectionState::Opening | ConnectionState::Open(_)
+						)));
 
-						if let Some((_, connec_state)) = connections.iter_mut().find(|(c, _)| *c == connection) {
+						if let Some((_, connec_state)) =
+							connections.iter_mut().find(|(c, _)| *c == connection)
+						{
 							if let ConnectionState::Closed = *connec_state {
 								trace!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open({:?})",
 									source, connection, set_id);
@@ -1504,7 +1574,7 @@ impl NetworkBehaviour for Notifications {
 								debug_assert!(matches!(
 									connec_state,
 									ConnectionState::OpenDesiredByRemote |
-									ConnectionState::Closing | ConnectionState::Opening
+										ConnectionState::Closing | ConnectionState::Opening
 								));
 							}
 						} else {
@@ -1520,7 +1590,9 @@ impl NetworkBehaviour for Notifications {
 
 					// Disabled => Disabled | Incoming
 					PeerState::Disabled { mut connections, backoff_until } => {
-						if let Some((_, connec_state)) = connections.iter_mut().find(|(c, _)| *c == connection) {
+						if let Some((_, connec_state)) =
+							connections.iter_mut().find(|(c, _)| *c == connection)
+						{
 							if let ConnectionState::Closed = *connec_state {
 								*connec_state = ConnectionState::OpenDesiredByRemote;
 
@@ -1537,8 +1609,8 @@ impl NetworkBehaviour for Notifications {
 									incoming_id,
 								});
 
-								*entry.into_mut() = PeerState::Incoming { connections, backoff_until };
-
+								*entry.into_mut() =
+									PeerState::Incoming { connections, backoff_until };
 							} else {
 								// Connections in `OpeningThenClosing` and `Closing` state can be
 								// in a Closed phase, and as such can emit `OpenDesiredByRemote`
@@ -1548,7 +1620,8 @@ impl NetworkBehaviour for Notifications {
 									connec_state,
 									ConnectionState::OpeningThenClosing | ConnectionState::Closing
 								));
-								*entry.into_mut() = PeerState::Disabled { connections, backoff_until };
+								*entry.into_mut() =
+									PeerState::Disabled { connections, backoff_until };
 							}
 						} else {
 							error!(
@@ -1557,11 +1630,13 @@ impl NetworkBehaviour for Notifications {
 							);
 							debug_assert!(false);
 						}
-					}
+					},
 
 					// DisabledPendingEnable => Enabled | DisabledPendingEnable
 					PeerState::DisabledPendingEnable { mut connections, timer, timer_deadline } => {
-						if let Some((_, connec_state)) = connections.iter_mut().find(|(c, _)| *c == connection) {
+						if let Some((_, connec_state)) =
+							connections.iter_mut().find(|(c, _)| *c == connection)
+						{
 							if let ConnectionState::Closed = *connec_state {
 								trace!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open({:?})",
 									source, connection, set_id);
@@ -1573,7 +1648,6 @@ impl NetworkBehaviour for Notifications {
 								*connec_state = ConnectionState::Opening;
 
 								*entry.into_mut() = PeerState::Enabled { connections };
-
 							} else {
 								// Connections in `OpeningThenClosing` and `Closing` state can be
 								// in a Closed phase, and as such can emit `OpenDesiredByRemote`
@@ -1596,7 +1670,7 @@ impl NetworkBehaviour for Notifications {
 							);
 							debug_assert!(false);
 						}
-					}
+					},
 
 					state => {
 						error!(target: "sub-libp2p",
@@ -1604,9 +1678,9 @@ impl NetworkBehaviour for Notifications {
 							   state);
 						debug_assert!(false);
 						return
-					}
+					},
 				};
-			}
+			},
 
 			NotifsHandlerOut::CloseDesired { protocol_index } => {
 				let set_id = sc_peerset::SetId::from(protocol_index);
@@ -1615,32 +1689,37 @@ impl NetworkBehaviour for Notifications {
 					"Handler({}, {:?}) => CloseDesired({:?})",
 					source, connection, set_id);
 
-				let mut entry = if let Entry::Occupied(entry) = self.peers.entry((source.clone(), set_id)) {
-					entry
-				} else {
-					error!(target: "sub-libp2p", "CloseDesired: State mismatch in the custom protos handler");
-					debug_assert!(false);
-					return
-				};
+				let mut entry =
+					if let Entry::Occupied(entry) = self.peers.entry((source.clone(), set_id)) {
+						entry
+					} else {
+						error!(target: "sub-libp2p", "CloseDesired: State mismatch in the custom protos handler");
+						debug_assert!(false);
+						return
+					};
 
 				match mem::replace(entry.get_mut(), PeerState::Poisoned) {
 					// Enabled => Enabled | Disabled
 					PeerState::Enabled { mut connections } => {
-						debug_assert!(connections.iter().any(|(_, s)|
-							matches!(s, ConnectionState::Opening | ConnectionState::Open(_))));
+						debug_assert!(connections.iter().any(|(_, s)| matches!(
+							s,
+							ConnectionState::Opening | ConnectionState::Open(_)
+						)));
 
-						let pos = if let Some(pos) = connections.iter().position(|(c, _)| *c == connection) {
+						let pos = if let Some(pos) =
+							connections.iter().position(|(c, _)| *c == connection)
+						{
 							pos
 						} else {
 							error!(target: "sub-libp2p",
 								"CloseDesired: State mismatch in the custom protos handler");
 							debug_assert!(false);
-							return;
+							return
 						};
 
 						if matches!(connections[pos].1, ConnectionState::Closing) {
 							*entry.into_mut() = PeerState::Enabled { connections };
-							return;
+							return
 						}
 
 						debug_assert!(matches!(connections[pos].1, ConnectionState::Open(_)));
@@ -1656,11 +1735,9 @@ impl NetworkBehaviour for Notifications {
 						if let Some((replacement_pos, replacement_sink)) = connections
 							.iter()
 							.enumerate()
-							.filter_map(|(num, (_, s))| {
-								match s {
-									ConnectionState::Open(s) => Some((num, s.clone())),
-									_ => None
-								}
+							.filter_map(|(num, (_, s))| match s {
+								ConnectionState::Open(s) => Some((num, s.clone())),
+								_ => None,
 							})
 							.next()
 						{
@@ -1675,24 +1752,27 @@ impl NetworkBehaviour for Notifications {
 							}
 
 							*entry.into_mut() = PeerState::Enabled { connections };
-
 						} else {
 							// List of open connections wasn't empty before but now it is.
-							if !connections.iter().any(|(_, s)| matches!(s, ConnectionState::Opening)) {
+							if !connections
+								.iter()
+								.any(|(_, s)| matches!(s, ConnectionState::Opening))
+							{
 								trace!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", source, set_id);
-								self.peerset.dropped(set_id, source.clone(), sc_peerset::DropReason::Refused);
-								*entry.into_mut() = PeerState::Disabled {
-									connections, backoff_until: None
-								};
+								self.peerset.dropped(
+									set_id,
+									source.clone(),
+									sc_peerset::DropReason::Refused,
+								);
+								*entry.into_mut() =
+									PeerState::Disabled { connections, backoff_until: None };
 							} else {
 								*entry.into_mut() = PeerState::Enabled { connections };
 							}
 
 							trace!(target: "sub-libp2p", "External API <= Closed({}, {:?})", source, set_id);
-							let event = NotificationsOut::CustomProtocolClosed {
-								peer_id: source,
-								set_id,
-							};
+							let event =
+								NotificationsOut::CustomProtocolClosed { peer_id: source, set_id };
 							self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
 						}
 					},
@@ -1702,16 +1782,16 @@ impl NetworkBehaviour for Notifications {
 					state @ PeerState::Disabled { .. } |
 					state @ PeerState::DisabledPendingEnable { .. } => {
 						*entry.into_mut() = state;
-						return;
+						return
 					},
 					state => {
 						error!(target: "sub-libp2p",
 							"Unexpected state in the custom protos handler: {:?}",
 							state);
 						return
-					}
+					},
 				}
-			}
+			},
 
 			NotifsHandlerOut::CloseResult { protocol_index } => {
 				let set_id = sc_peerset::SetId::from(protocol_index);
@@ -1726,10 +1806,9 @@ impl NetworkBehaviour for Notifications {
 					Some(PeerState::DisabledPendingEnable { connections, .. }) |
 					Some(PeerState::Disabled { connections, .. }) |
 					Some(PeerState::Enabled { connections, .. }) => {
-						if let Some((_, connec_state)) = connections
-							.iter_mut()
-							.find(|(c, s)| *c == connection && matches!(s, ConnectionState::Closing))
-						{
+						if let Some((_, connec_state)) = connections.iter_mut().find(|(c, s)| {
+							*c == connection && matches!(s, ConnectionState::Closing)
+						}) {
 							*connec_state = ConnectionState::Closed;
 						} else {
 							error!(target: "sub-libp2p",
@@ -1743,12 +1822,16 @@ impl NetworkBehaviour for Notifications {
 							   "CloseResult: Unexpected state in the custom protos handler: {:?}",
 							   state);
 						debug_assert!(false);
-					}
+					},
 				}
-			}
+			},
 
 			NotifsHandlerOut::OpenResultOk {
-				protocol_index, negotiated_fallback, received_handshake, notifications_sink, ..
+				protocol_index,
+				negotiated_fallback,
+				received_handshake,
+				notifications_sink,
+				..
 			} => {
 				let set_id = sc_peerset::SetId::from(protocol_index);
 				trace!(target: "sub-libp2p",
@@ -1757,13 +1840,16 @@ impl NetworkBehaviour for Notifications {
 
 				match self.peers.get_mut(&(source.clone(), set_id)) {
 					Some(PeerState::Enabled { connections, .. }) => {
-						debug_assert!(connections.iter().any(|(_, s)|
-							matches!(s, ConnectionState::Opening | ConnectionState::Open(_))));
-						let any_open = connections.iter().any(|(_, s)| matches!(s, ConnectionState::Open(_)));
-
-						if let Some((_, connec_state)) = connections.iter_mut().find(|(c, s)|
-							*c == connection && matches!(s, ConnectionState::Opening))
-						{
+						debug_assert!(connections.iter().any(|(_, s)| matches!(
+							s,
+							ConnectionState::Opening | ConnectionState::Open(_)
+						)));
+						let any_open =
+							connections.iter().any(|(_, s)| matches!(s, ConnectionState::Open(_)));
+
+						if let Some((_, connec_state)) = connections.iter_mut().find(|(c, s)| {
+							*c == connection && matches!(s, ConnectionState::Opening)
+						}) {
 							if !any_open {
 								trace!(target: "sub-libp2p", "External API <= Open({}, {:?})", source, set_id);
 								let event = NotificationsOut::CustomProtocolOpen {
@@ -1776,9 +1862,10 @@ impl NetworkBehaviour for Notifications {
 								self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
 							}
 							*connec_state = ConnectionState::Open(notifications_sink);
-						} else if let Some((_, connec_state)) = connections.iter_mut().find(|(c, s)|
-							*c == connection && matches!(s, ConnectionState::OpeningThenClosing))
-						{
+						} else if let Some((_, connec_state)) =
+							connections.iter_mut().find(|(c, s)| {
+								*c == connection && matches!(s, ConnectionState::OpeningThenClosing)
+							}) {
 							*connec_state = ConnectionState::Closing;
 						} else {
 							debug_assert!(false);
@@ -1790,16 +1877,16 @@ impl NetworkBehaviour for Notifications {
 					Some(PeerState::Incoming { connections, .. }) |
 					Some(PeerState::DisabledPendingEnable { connections, .. }) |
 					Some(PeerState::Disabled { connections, .. }) => {
-						if let Some((_, connec_state)) = connections.iter_mut().find(|(c, s)|
-							*c == connection && matches!(s, ConnectionState::OpeningThenClosing))
-						{
+						if let Some((_, connec_state)) = connections.iter_mut().find(|(c, s)| {
+							*c == connection && matches!(s, ConnectionState::OpeningThenClosing)
+						}) {
 							*connec_state = ConnectionState::Closing;
 						} else {
 							error!(target: "sub-libp2p",
 								"OpenResultOk State mismatch in the custom protos handler");
 							debug_assert!(false);
 						}
-					}
+					},
 
 					state => {
 						error!(target: "sub-libp2p",
@@ -1807,9 +1894,9 @@ impl NetworkBehaviour for Notifications {
 							   state);
 						debug_assert!(false);
 						return
-					}
+					},
 				}
-			}
+			},
 
 			NotifsHandlerOut::OpenResultErr { protocol_index } => {
 				let set_id = sc_peerset::SetId::from(protocol_index);
@@ -1817,27 +1904,31 @@ impl NetworkBehaviour for Notifications {
 					"Handler({:?}, {:?}) => OpenResultErr({:?})",
 					source, connection, set_id);
 
-				let mut entry = if let Entry::Occupied(entry) = self.peers.entry((source.clone(), set_id)) {
-					entry
-				} else {
-					error!(target: "sub-libp2p", "OpenResultErr: State mismatch in the custom protos handler");
-					debug_assert!(false);
-					debug_assert!(false);
-					return
-				};
+				let mut entry =
+					if let Entry::Occupied(entry) = self.peers.entry((source.clone(), set_id)) {
+						entry
+					} else {
+						error!(target: "sub-libp2p", "OpenResultErr: State mismatch in the custom protos handler");
+						debug_assert!(false);
+						debug_assert!(false);
+						return
+					};
 
 				match mem::replace(entry.get_mut(), PeerState::Poisoned) {
 					PeerState::Enabled { mut connections } => {
-						debug_assert!(connections.iter().any(|(_, s)|
-							matches!(s, ConnectionState::Opening | ConnectionState::Open(_))));
-
-						if let Some((_, connec_state)) = connections.iter_mut().find(|(c, s)|
-							*c == connection && matches!(s, ConnectionState::Opening))
-						{
+						debug_assert!(connections.iter().any(|(_, s)| matches!(
+							s,
+							ConnectionState::Opening | ConnectionState::Open(_)
+						)));
+
+						if let Some((_, connec_state)) = connections.iter_mut().find(|(c, s)| {
+							*c == connection && matches!(s, ConnectionState::Opening)
+						}) {
 							*connec_state = ConnectionState::Closed;
-						} else if let Some((_, connec_state)) = connections.iter_mut().find(|(c, s)|
-							*c == connection && matches!(s, ConnectionState::OpeningThenClosing))
-						{
+						} else if let Some((_, connec_state)) =
+							connections.iter_mut().find(|(c, s)| {
+								*c == connection && matches!(s, ConnectionState::OpeningThenClosing)
+							}) {
 							*connec_state = ConnectionState::Closing;
 						} else {
 							error!(target: "sub-libp2p",
@@ -1845,16 +1936,20 @@ impl NetworkBehaviour for Notifications {
 							debug_assert!(false);
 						}
 
-						if !connections.iter().any(|(_, s)|
-							matches!(s, ConnectionState::Opening | ConnectionState::Open(_)))
-						{
+						if !connections.iter().any(|(_, s)| {
+							matches!(s, ConnectionState::Opening | ConnectionState::Open(_))
+						}) {
 							trace!(target: "sub-libp2p", "PSM <= Dropped({:?})", source);
-							self.peerset.dropped(set_id, source.clone(), sc_peerset::DropReason::Refused);
+							self.peerset.dropped(
+								set_id,
+								source.clone(),
+								sc_peerset::DropReason::Refused,
+							);
 
 							let ban_dur = Uniform::new(5, 10).sample(&mut rand::thread_rng());
 							*entry.into_mut() = PeerState::Disabled {
 								connections,
-								backoff_until: Some(Instant::now() + Duration::from_secs(ban_dur))
+								backoff_until: Some(Instant::now() + Duration::from_secs(ban_dur)),
 							};
 						} else {
 							*entry.into_mut() = PeerState::Enabled { connections };
@@ -1867,9 +1962,11 @@ impl NetworkBehaviour for Notifications {
 							PeerState::Incoming { connections, .. } |
 							PeerState::Disabled { connections, .. } |
 							PeerState::DisabledPendingEnable { connections, .. } => {
-								if let Some((_, connec_state)) = connections.iter_mut().find(|(c, s)|
-									*c == connection && matches!(s, ConnectionState::OpeningThenClosing))
-								{
+								if let Some((_, connec_state)) =
+									connections.iter_mut().find(|(c, s)| {
+										*c == connection &&
+											matches!(s, ConnectionState::OpeningThenClosing)
+									}) {
 									*connec_state = ConnectionState::Closing;
 								} else {
 									error!(target: "sub-libp2p",
@@ -1877,20 +1974,22 @@ impl NetworkBehaviour for Notifications {
 									debug_assert!(false);
 								}
 							},
-							_ => unreachable!("Match branches are the same as the one on which we
-							enter this block; qed"),
+							_ => unreachable!(
+								"Match branches are the same as the one on which we
+							enter this block; qed"
+							),
 						};
 
 						*entry.into_mut() = state;
-					}
+					},
 					state => {
 						error!(target: "sub-libp2p",
 							"Unexpected state in the custom protos handler: {:?}",
 							state);
 						debug_assert!(false);
-					}
+					},
 				};
-			}
+			},
 
 			NotifsHandlerOut::Notification { protocol_index, message } => {
 				let set_id = sc_peerset::SetId::from(protocol_index);
@@ -1905,11 +2004,7 @@ impl NetworkBehaviour for Notifications {
 					);
 					trace!(target: "sub-libp2p", "External API <= Message({}, {:?})",
 						source, set_id);
-					let event = NotificationsOut::Notification {
-						peer_id: source,
-						set_id,
-						message,
-					};
+					let event = NotificationsOut::Notification { peer_id: source, set_id, message };
 
 					self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
 				} else {
@@ -1922,7 +2017,7 @@ impl NetworkBehaviour for Notifications {
 						message.len()
 					);
 				}
-			}
+			},
 		}
 	}
 
@@ -1930,14 +2025,9 @@ impl NetworkBehaviour for Notifications {
 		&mut self,
 		cx: &mut Context,
 		_params: &mut impl PollParameters,
-	) -> Poll<
-		NetworkBehaviourAction<
-			NotifsHandlerIn,
-			Self::OutEvent,
-		>,
-	> {
+	) -> Poll<NetworkBehaviourAction<NotifsHandlerIn, Self::OutEvent>> {
 		if let Some(event) = self.events.pop_front() {
-			return Poll::Ready(event);
+			return Poll::Ready(event)
 		}
 
 		// Poll for instructions from the peerset.
@@ -1946,26 +2036,27 @@ impl NetworkBehaviour for Notifications {
 			match futures::Stream::poll_next(Pin::new(&mut self.peerset), cx) {
 				Poll::Ready(Some(sc_peerset::Message::Accept(index))) => {
 					self.peerset_report_accept(index);
-				}
+				},
 				Poll::Ready(Some(sc_peerset::Message::Reject(index))) => {
 					self.peerset_report_reject(index);
-				}
+				},
 				Poll::Ready(Some(sc_peerset::Message::Connect { peer_id, set_id, .. })) => {
 					self.peerset_report_connect(peer_id, set_id);
-				}
+				},
 				Poll::Ready(Some(sc_peerset::Message::Drop { peer_id, set_id, .. })) => {
 					self.peerset_report_disconnect(peer_id, set_id);
-				}
+				},
 				Poll::Ready(None) => {
 					error!(target: "sub-libp2p", "Peerset receiver stream has returned None");
-					break;
-				}
+					break
+				},
 				Poll::Pending => break,
 			}
 		}
 
 		while let Poll::Ready(Some((delay_id, peer_id, set_id))) =
-			Pin::new(&mut self.delays).poll_next(cx) {
+			Pin::new(&mut self.delays).poll_next(cx)
+		{
 			let peer_state = match self.peers.get_mut(&(peer_id.clone(), set_id)) {
 				Some(s) => s,
 				// We intentionally never remove elements from `delays`, and it may
@@ -1977,24 +2068,24 @@ impl NetworkBehaviour for Notifications {
 				PeerState::Backoff { timer, .. } if *timer == delay_id => {
 					trace!(target: "sub-libp2p", "Libp2p <= Clean up ban of {:?} from the state", peer_id);
 					self.peers.remove(&(peer_id, set_id));
-				}
+				},
 
 				PeerState::PendingRequest { timer, .. } if *timer == delay_id => {
 					trace!(target: "sub-libp2p", "Libp2p <= Dial {:?} now that ban has expired", peer_id);
 					// The `DialPeerCondition` ensures that dial attempts are de-duplicated
 					self.events.push_back(NetworkBehaviourAction::DialPeer {
 						peer_id,
-						condition: DialPeerCondition::Disconnected
+						condition: DialPeerCondition::Disconnected,
 					});
 					*peer_state = PeerState::Requested;
-				}
+				},
 
 				PeerState::DisabledPendingEnable { connections, timer, timer_deadline }
 					if *timer == delay_id =>
 				{
 					// The first element of `closed` is chosen to open the notifications substream.
-					if let Some((connec_id, connec_state)) = connections.iter_mut()
-						.find(|(_, s)| matches!(s, ConnectionState::Closed))
+					if let Some((connec_id, connec_state)) =
+						connections.iter_mut().find(|(_, s)| matches!(s, ConnectionState::Closed))
 					{
 						trace!(target: "sub-libp2p", "Handler({}, {:?}) <= Open({:?}) (ban expired)",
 							peer_id, *connec_id, set_id);
@@ -2011,10 +2102,13 @@ impl NetworkBehaviour for Notifications {
 						*timer_deadline = Instant::now() + Duration::from_secs(5);
 						let delay = futures_timer::Delay::new(Duration::from_secs(5));
 						let timer = *timer;
-						self.delays.push(async move {
-							delay.await;
-							(timer, peer_id, set_id)
-						}.boxed());
+						self.delays.push(
+							async move {
+								delay.await;
+								(timer, peer_id, set_id)
+							}
+							.boxed(),
+						);
 					}
 				}
 
@@ -2025,7 +2119,7 @@ impl NetworkBehaviour for Notifications {
 		}
 
 		if let Some(event) = self.events.pop_front() {
-			return Poll::Ready(event);
+			return Poll::Ready(event)
 		}
 
 		Poll::Pending
diff --git a/client/network/src/protocol/notifications/handler.rs b/client/network/src/protocol/notifications/handler.rs
index 3d38182c3c9d..0a59b2fcf034 100644
--- a/client/network/src/protocol/notifications/handler.rs
+++ b/client/network/src/protocol/notifications/handler.rs
@@ -57,31 +57,39 @@
 //! It is illegal to send a [`NotifsHandlerIn::Open`] before a previously-emitted
 //! [`NotifsHandlerIn::Open`] has gotten an answer.
 
-use crate::protocol::notifications::{
-	upgrade::{
-		NotificationsIn, NotificationsOut, NotificationsInSubstream, NotificationsOutSubstream,
-		NotificationsHandshakeError, UpgradeCollec
-	},
+use crate::protocol::notifications::upgrade::{
+	NotificationsHandshakeError, NotificationsIn, NotificationsInSubstream, NotificationsOut,
+	NotificationsOutSubstream, UpgradeCollec,
 };
 
 use bytes::BytesMut;
-use libp2p::core::{ConnectedPoint, PeerId, upgrade::{InboundUpgrade, OutboundUpgrade}};
-use libp2p::swarm::{
-	ProtocolsHandler, ProtocolsHandlerEvent,
-	IntoProtocolsHandler,
-	KeepAlive,
-	ProtocolsHandlerUpgrErr,
-	SubstreamProtocol,
-	NegotiatedSubstream,
-};
 use futures::{
 	channel::mpsc,
 	lock::{Mutex as FuturesMutex, MutexGuard as FuturesMutexGuard},
-	prelude::*
+	prelude::*,
+};
+use libp2p::{
+	core::{
+		upgrade::{InboundUpgrade, OutboundUpgrade},
+		ConnectedPoint, PeerId,
+	},
+	swarm::{
+		IntoProtocolsHandler, KeepAlive, NegotiatedSubstream, ProtocolsHandler,
+		ProtocolsHandlerEvent, ProtocolsHandlerUpgrErr, SubstreamProtocol,
+	},
 };
 use log::error;
 use parking_lot::{Mutex, RwLock};
-use std::{borrow::Cow, collections::VecDeque, mem, pin::Pin, str, sync::Arc, task::{Context, Poll}, time::Duration};
+use std::{
+	borrow::Cow,
+	collections::VecDeque,
+	mem,
+	pin::Pin,
+	str,
+	sync::Arc,
+	task::{Context, Poll},
+	time::Duration,
+};
 use wasm_timer::Instant;
 
 /// Number of pending notifications in asynchronous contexts.
@@ -131,7 +139,7 @@ pub struct NotifsHandler {
 
 	/// Events to return in priority from `poll`.
 	events_queue: VecDeque<
-		ProtocolsHandlerEvent<NotificationsOut, usize, NotifsHandlerOut, NotifsHandlerError>
+		ProtocolsHandlerEvent<NotificationsOut, usize, NotifsHandlerOut, NotifsHandlerError>,
 	>,
 }
 
@@ -195,10 +203,12 @@ enum State {
 		/// We use two different channels in order to have two different channel sizes, but from
 		/// the receiving point of view, the two channels are the same.
 		/// The receivers are fused in case the user drops the [`NotificationsSink`] entirely.
-		notifications_sink_rx: stream::Peekable<stream::Select<
-			stream::Fuse<mpsc::Receiver<NotificationsSinkMessage>>,
-			stream::Fuse<mpsc::Receiver<NotificationsSinkMessage>>
-		>>,
+		notifications_sink_rx: stream::Peekable<
+			stream::Select<
+				stream::Fuse<mpsc::Receiver<NotificationsSinkMessage>>,
+				stream::Fuse<mpsc::Receiver<NotificationsSinkMessage>>,
+			>,
+		>,
 
 		/// Outbound substream that has been accepted by the remote.
 		///
@@ -220,28 +230,33 @@ impl IntoProtocolsHandler for NotifsHandlerProto {
 	type Handler = NotifsHandler;
 
 	fn inbound_protocol(&self) -> UpgradeCollec<NotificationsIn> {
-		self.protocols.iter()
-			.map(|cfg| NotificationsIn::new(cfg.name.clone(), cfg.fallback_names.clone(), cfg.max_notification_size))
+		self.protocols
+			.iter()
+			.map(|cfg| {
+				NotificationsIn::new(
+					cfg.name.clone(),
+					cfg.fallback_names.clone(),
+					cfg.max_notification_size,
+				)
+			})
 			.collect::<UpgradeCollec<_>>()
 	}
 
 	fn into_handler(self, peer_id: &PeerId, connected_point: &ConnectedPoint) -> Self::Handler {
 		NotifsHandler {
-			protocols: self.protocols.into_iter().map(|config| {
-				let in_upgrade = NotificationsIn::new(
-					config.name.clone(),
-					config.fallback_names.clone(),
-					config.max_notification_size
-				);
-
-				Protocol {
-					config,
-					in_upgrade,
-					state: State::Closed {
-						pending_opening: false,
-					},
-				}
-			}).collect(),
+			protocols: self
+				.protocols
+				.into_iter()
+				.map(|config| {
+					let in_upgrade = NotificationsIn::new(
+						config.name.clone(),
+						config.fallback_names.clone(),
+						config.max_notification_size,
+					);
+
+					Protocol { config, in_upgrade, state: State::Closed { pending_opening: false } }
+				})
+				.collect(),
 			peer_id: peer_id.clone(),
 			endpoint: connected_point.clone(),
 			when_connection_open: Instant::now(),
@@ -363,9 +378,7 @@ struct NotificationsSinkInner {
 enum NotificationsSinkMessage {
 	/// Message emitted by [`NotificationsSink::reserve_notification`] and
 	/// [`NotificationsSink::write_notification_now`].
-	Notification {
-		message: Vec<u8>,
-	},
+	Notification { message: Vec<u8> },
 
 	/// Must close the connection.
 	ForceClose,
@@ -386,14 +399,10 @@ impl NotificationsSink {
 	/// error to send a notification using an unknown protocol.
 	///
 	/// This method will be removed in a future version.
-	pub fn send_sync_notification<'a>(
-		&'a self,
-		message: impl Into<Vec<u8>>
-	) {
+	pub fn send_sync_notification<'a>(&'a self, message: impl Into<Vec<u8>>) {
 		let mut lock = self.inner.sync_channel.lock();
-		let result = lock.try_send(NotificationsSinkMessage::Notification {
-			message: message.into()
-		});
+		let result =
+			lock.try_send(NotificationsSinkMessage::Notification { message: message.into() });
 
 		if result.is_err() {
 			// Cloning the `mpsc::Sender` guarantees the allocation of an extra spot in the
@@ -433,13 +442,10 @@ impl<'a> Ready<'a> {
 	/// Consumes this slots reservation and actually queues the notification.
 	///
 	/// Returns an error if the substream has been closed.
-	pub fn send(
-		mut self,
-		notification: impl Into<Vec<u8>>
-	) -> Result<(), ()> {
-		self.lock.start_send(NotificationsSinkMessage::Notification {
-			message: notification.into(),
-		}).map_err(|_| ())
+	pub fn send(mut self, notification: impl Into<Vec<u8>>) -> Result<(), ()> {
+		self.lock
+			.start_send(NotificationsSinkMessage::Notification { message: notification.into() })
+			.map_err(|_| ())
 	}
 }
 
@@ -457,12 +463,8 @@ impl NotifsHandlerProto {
 	/// handshake, and the maximum allowed size of a notification. At the moment, the message
 	/// is always the same whether we open a substream ourselves or respond to handshake from
 	/// the remote.
-	pub fn new(
-		list: impl Into<Vec<ProtocolConfig>>,
-	) -> Self {
-		NotifsHandlerProto {
-			protocols: list.into(),
-		}
+	pub fn new(list: impl Into<Vec<ProtocolConfig>>) -> Self {
+		NotifsHandlerProto { protocols: list.into() }
 	}
 }
 
@@ -477,7 +479,9 @@ impl ProtocolsHandler for NotifsHandler {
 	type InboundOpenInfo = ();
 
 	fn listen_protocol(&self) -> SubstreamProtocol<Self::InboundProtocol, ()> {
-		let protocols = self.protocols.iter()
+		let protocols = self
+			.protocols
+			.iter()
 			.map(|p| p.in_upgrade.clone())
 			.collect::<UpgradeCollec<_>>();
 
@@ -486,17 +490,16 @@ impl ProtocolsHandler for NotifsHandler {
 
 	fn inject_fully_negotiated_inbound(
 		&mut self,
-		(mut in_substream_open, protocol_index):
-			<Self::InboundProtocol as InboundUpgrade<NegotiatedSubstream>>::Output,
-		(): ()
+		(mut in_substream_open, protocol_index): <Self::InboundProtocol as InboundUpgrade<
+			NegotiatedSubstream,
+		>>::Output,
+		(): (),
 	) {
 		let mut protocol_info = &mut self.protocols[protocol_index];
 		match protocol_info.state {
 			State::Closed { pending_opening } => {
 				self.events_queue.push_back(ProtocolsHandlerEvent::Custom(
-					NotifsHandlerOut::OpenDesiredByRemote {
-						protocol_index,
-					}
+					NotifsHandlerOut::OpenDesiredByRemote { protocol_index },
 				));
 
 				protocol_info.state = State::OpenDesiredByRemote {
@@ -512,13 +515,13 @@ impl ProtocolsHandler for NotifsHandler {
 				// in mind that it is invalid for the remote to open multiple such
 				// substreams, and therefore sending a "RST" is the most correct thing
 				// to do.
-				return;
+				return
 			},
 			State::Opening { ref mut in_substream, .. } |
 			State::Open { ref mut in_substream, .. } => {
 				if in_substream.is_some() {
 					// Same remark as above.
-					return;
+					return
 				}
 
 				// Create `handshake_message` on a separate line to be sure that the
@@ -533,18 +536,18 @@ impl ProtocolsHandler for NotifsHandler {
 	fn inject_fully_negotiated_outbound(
 		&mut self,
 		new_open: <Self::OutboundProtocol as OutboundUpgrade<NegotiatedSubstream>>::Output,
-		protocol_index: Self::OutboundOpenInfo
+		protocol_index: Self::OutboundOpenInfo,
 	) {
 		match self.protocols[protocol_index].state {
 			State::Closed { ref mut pending_opening } |
 			State::OpenDesiredByRemote { ref mut pending_opening, .. } => {
 				debug_assert!(*pending_opening);
 				*pending_opening = false;
-			}
+			},
 			State::Open { .. } => {
 				error!(target: "sub-libp2p", "☎️ State mismatch in notifications handler");
 				debug_assert!(false);
-			}
+			},
 			State::Opening { ref mut in_substream } => {
 				let (async_tx, async_rx) = mpsc::channel(ASYNC_NOTIFICATIONS_BUFFER_SIZE);
 				let (sync_tx, sync_rx) = mpsc::channel(SYNC_NOTIFICATIONS_BUFFER_SIZE);
@@ -557,7 +560,8 @@ impl ProtocolsHandler for NotifsHandler {
 				};
 
 				self.protocols[protocol_index].state = State::Open {
-					notifications_sink_rx: stream::select(async_rx.fuse(), sync_rx.fuse()).peekable(),
+					notifications_sink_rx: stream::select(async_rx.fuse(), sync_rx.fuse())
+						.peekable(),
 					out_substream: Some(new_open.substream),
 					in_substream: in_substream.take(),
 				};
@@ -568,10 +572,10 @@ impl ProtocolsHandler for NotifsHandler {
 						negotiated_fallback: new_open.negotiated_fallback,
 						endpoint: self.endpoint.clone(),
 						received_handshake: new_open.handshake,
-						notifications_sink
-					}
+						notifications_sink,
+					},
 				));
-			}
+			},
 		}
 	}
 
@@ -586,18 +590,18 @@ impl ProtocolsHandler for NotifsHandler {
 								protocol_info.config.name.clone(),
 								protocol_info.config.fallback_names.clone(),
 								protocol_info.config.handshake.read().clone(),
-								protocol_info.config.max_notification_size
+								protocol_info.config.max_notification_size,
 							);
 
-							self.events_queue.push_back(ProtocolsHandlerEvent::OutboundSubstreamRequest {
-								protocol: SubstreamProtocol::new(proto, protocol_index)
-									.with_timeout(OPEN_TIMEOUT),
-							});
+							self.events_queue.push_back(
+								ProtocolsHandlerEvent::OutboundSubstreamRequest {
+									protocol: SubstreamProtocol::new(proto, protocol_index)
+										.with_timeout(OPEN_TIMEOUT),
+								},
+							);
 						}
 
-						protocol_info.state = State::Opening {
-							in_substream: None,
-						};
+						protocol_info.state = State::Opening { in_substream: None };
 					},
 					State::OpenDesiredByRemote { pending_opening, in_substream } => {
 						let handshake_message = protocol_info.config.handshake.read().clone();
@@ -610,27 +614,27 @@ impl ProtocolsHandler for NotifsHandler {
 								protocol_info.config.max_notification_size,
 							);
 
-							self.events_queue.push_back(ProtocolsHandlerEvent::OutboundSubstreamRequest {
-								protocol: SubstreamProtocol::new(proto, protocol_index)
-									.with_timeout(OPEN_TIMEOUT),
-							});
+							self.events_queue.push_back(
+								ProtocolsHandlerEvent::OutboundSubstreamRequest {
+									protocol: SubstreamProtocol::new(proto, protocol_index)
+										.with_timeout(OPEN_TIMEOUT),
+								},
+							);
 						}
 
 						in_substream.send_handshake(handshake_message);
 
 						// The state change is done in two steps because of borrowing issues.
-						let in_substream = match
-							mem::replace(&mut protocol_info.state, State::Opening { in_substream: None })
-						{
+						let in_substream = match mem::replace(
+							&mut protocol_info.state,
+							State::Opening { in_substream: None },
+						) {
 							State::OpenDesiredByRemote { in_substream, .. } => in_substream,
-							_ => unreachable!()
-						};
-						protocol_info.state = State::Opening {
-							in_substream: Some(in_substream),
+							_ => unreachable!(),
 						};
+						protocol_info.state = State::Opening { in_substream: Some(in_substream) };
 					},
-					State::Opening { .. } |
-					State::Open { .. } => {
+					State::Opening { .. } | State::Open { .. } => {
 						// As documented, it is forbidden to send an `Open` while there is already
 						// one in the fly.
 						error!(target: "sub-libp2p", "opening already-opened handler");
@@ -642,34 +646,26 @@ impl ProtocolsHandler for NotifsHandler {
 			NotifsHandlerIn::Close { protocol_index } => {
 				match self.protocols[protocol_index].state {
 					State::Open { .. } => {
-						self.protocols[protocol_index].state = State::Closed {
-							pending_opening: false,
-						};
+						self.protocols[protocol_index].state =
+							State::Closed { pending_opening: false };
 					},
 					State::Opening { .. } => {
-						self.protocols[protocol_index].state = State::Closed {
-							pending_opening: true,
-						};
+						self.protocols[protocol_index].state =
+							State::Closed { pending_opening: true };
 
 						self.events_queue.push_back(ProtocolsHandlerEvent::Custom(
-							NotifsHandlerOut::OpenResultErr {
-								protocol_index,
-							}
+							NotifsHandlerOut::OpenResultErr { protocol_index },
 						));
 					},
 					State::OpenDesiredByRemote { pending_opening, .. } => {
-						self.protocols[protocol_index].state = State::Closed {
-							pending_opening,
-						};
-					}
+						self.protocols[protocol_index].state = State::Closed { pending_opening };
+					},
 					State::Closed { .. } => {},
 				}
 
-				self.events_queue.push_back(
-					ProtocolsHandlerEvent::Custom(NotifsHandlerOut::CloseResult {
-						protocol_index,
-					})
-				);
+				self.events_queue.push_back(ProtocolsHandlerEvent::Custom(
+					NotifsHandlerOut::CloseResult { protocol_index },
+				));
 			},
 		}
 	}
@@ -677,26 +673,22 @@ impl ProtocolsHandler for NotifsHandler {
 	fn inject_dial_upgrade_error(
 		&mut self,
 		num: usize,
-		_: ProtocolsHandlerUpgrErr<NotificationsHandshakeError>
+		_: ProtocolsHandlerUpgrErr<NotificationsHandshakeError>,
 	) {
 		match self.protocols[num].state {
 			State::Closed { ref mut pending_opening } |
 			State::OpenDesiredByRemote { ref mut pending_opening, .. } => {
 				debug_assert!(*pending_opening);
 				*pending_opening = false;
-			}
+			},
 
 			State::Opening { .. } => {
-				self.protocols[num].state = State::Closed {
-					pending_opening: false,
-				};
+				self.protocols[num].state = State::Closed { pending_opening: false };
 
 				self.events_queue.push_back(ProtocolsHandlerEvent::Custom(
-					NotifsHandlerOut::OpenResultErr {
-						protocol_index: num,
-					}
+					NotifsHandlerOut::OpenResultErr { protocol_index: num },
 				));
-			}
+			},
 
 			// No substream is being open when already `Open`.
 			State::Open { .. } => debug_assert!(false),
@@ -706,7 +698,7 @@ impl ProtocolsHandler for NotifsHandler {
 	fn connection_keep_alive(&self) -> KeepAlive {
 		// `Yes` if any protocol has some activity.
 		if self.protocols.iter().any(|p| !matches!(p.state, State::Closed { .. })) {
-			return KeepAlive::Yes;
+			return KeepAlive::Yes
 		}
 
 		// A grace period of `INITIAL_KEEPALIVE_TIME` must be given to leave time for the remote
@@ -718,28 +710,33 @@ impl ProtocolsHandler for NotifsHandler {
 		&mut self,
 		cx: &mut Context,
 	) -> Poll<
-		ProtocolsHandlerEvent<Self::OutboundProtocol, Self::OutboundOpenInfo, Self::OutEvent, Self::Error>
+		ProtocolsHandlerEvent<
+			Self::OutboundProtocol,
+			Self::OutboundOpenInfo,
+			Self::OutEvent,
+			Self::Error,
+		>,
 	> {
 		if let Some(ev) = self.events_queue.pop_front() {
-			return Poll::Ready(ev);
+			return Poll::Ready(ev)
 		}
 
 		// For each open substream, try send messages from `notifications_sink_rx` to the
 		// substream.
 		for protocol_index in 0..self.protocols.len() {
-			if let State::Open { notifications_sink_rx, out_substream: Some(out_substream), .. }
-				= &mut self.protocols[protocol_index].state
+			if let State::Open {
+				notifications_sink_rx, out_substream: Some(out_substream), ..
+			} = &mut self.protocols[protocol_index].state
 			{
 				loop {
 					// Only proceed with `out_substream.poll_ready_unpin` if there is an element
 					// available in `notifications_sink_rx`. This avoids waking up the task when
 					// a substream is ready to send if there isn't actually something to send.
 					match Pin::new(&mut *notifications_sink_rx).as_mut().poll_peek(cx) {
-						Poll::Ready(Some(&NotificationsSinkMessage::ForceClose)) => {
-							return Poll::Ready(
-								ProtocolsHandlerEvent::Close(NotifsHandlerError::SyncNotificationsClogged)
-							);
-						},
+						Poll::Ready(Some(&NotificationsSinkMessage::ForceClose)) =>
+							return Poll::Ready(ProtocolsHandlerEvent::Close(
+								NotifsHandlerError::SyncNotificationsClogged,
+							)),
 						Poll::Ready(Some(&NotificationsSinkMessage::Notification { .. })) => {},
 						Poll::Ready(None) | Poll::Pending => break,
 					}
@@ -748,19 +745,20 @@ impl ProtocolsHandler for NotifsHandler {
 					// substream is ready to accept a message.
 					match out_substream.poll_ready_unpin(cx) {
 						Poll::Ready(_) => {},
-						Poll::Pending => break
+						Poll::Pending => break,
 					}
 
 					// Now that the substream is ready for a message, grab what to send.
 					let message = match notifications_sink_rx.poll_next_unpin(cx) {
-						Poll::Ready(Some(NotificationsSinkMessage::Notification { message })) => message,
-						Poll::Ready(Some(NotificationsSinkMessage::ForceClose))
-						| Poll::Ready(None)
-						| Poll::Pending => {
+						Poll::Ready(Some(NotificationsSinkMessage::Notification { message })) =>
+							message,
+						Poll::Ready(Some(NotificationsSinkMessage::ForceClose)) |
+						Poll::Ready(None) |
+						Poll::Pending => {
 							// Should never be reached, as per `poll_peek` above.
 							debug_assert!(false);
-							break;
-						}
+							break
+						},
 					};
 
 					let _ = out_substream.start_send_unpin(message);
@@ -784,15 +782,15 @@ impl ProtocolsHandler for NotifsHandler {
 						Poll::Ready(Err(_)) => {
 							*out_substream = None;
 							let event = NotifsHandlerOut::CloseDesired { protocol_index };
-							return Poll::Ready(ProtocolsHandlerEvent::Custom(event));
-						}
+							return Poll::Ready(ProtocolsHandlerEvent::Custom(event))
+						},
 					};
-				}
+				},
 
 				State::Closed { .. } |
 				State::Opening { .. } |
 				State::Open { out_substream: None, .. } |
-				State::OpenDesiredByRemote { .. } => {}
+				State::OpenDesiredByRemote { .. } => {},
 			}
 		}
 
@@ -803,45 +801,40 @@ impl ProtocolsHandler for NotifsHandler {
 			match &mut self.protocols[protocol_index].state {
 				State::Closed { .. } |
 				State::Open { in_substream: None, .. } |
-				State::Opening { in_substream: None } => {}
+				State::Opening { in_substream: None } => {},
 
-				State::Open { in_substream: in_substream @ Some(_), .. } => {
+				State::Open { in_substream: in_substream @ Some(_), .. } =>
 					match Stream::poll_next(Pin::new(in_substream.as_mut().unwrap()), cx) {
 						Poll::Pending => {},
 						Poll::Ready(Some(Ok(message))) => {
-							let event = NotifsHandlerOut::Notification {
-								protocol_index,
-								message,
-							};
+							let event = NotifsHandlerOut::Notification { protocol_index, message };
 							return Poll::Ready(ProtocolsHandlerEvent::Custom(event))
 						},
-						Poll::Ready(None) | Poll::Ready(Some(Err(_))) =>
-							*in_substream = None,
-					}
-				}
+						Poll::Ready(None) | Poll::Ready(Some(Err(_))) => *in_substream = None,
+					},
 
-				State::OpenDesiredByRemote { in_substream, pending_opening } => {
+				State::OpenDesiredByRemote { in_substream, pending_opening } =>
 					match NotificationsInSubstream::poll_process(Pin::new(in_substream), cx) {
 						Poll::Pending => {},
 						Poll::Ready(Ok(void)) => match void {},
 						Poll::Ready(Err(_)) => {
-							self.protocols[protocol_index].state = State::Closed {
-								pending_opening: *pending_opening,
-							};
+							self.protocols[protocol_index].state =
+								State::Closed { pending_opening: *pending_opening };
 							return Poll::Ready(ProtocolsHandlerEvent::Custom(
-								NotifsHandlerOut::CloseDesired { protocol_index }
+								NotifsHandlerOut::CloseDesired { protocol_index },
 							))
 						},
-					}
-				}
+					},
 
-				State::Opening { in_substream: in_substream @ Some(_), .. } => {
-					match NotificationsInSubstream::poll_process(Pin::new(in_substream.as_mut().unwrap()), cx) {
+				State::Opening { in_substream: in_substream @ Some(_), .. } =>
+					match NotificationsInSubstream::poll_process(
+						Pin::new(in_substream.as_mut().unwrap()),
+						cx,
+					) {
 						Poll::Pending => {},
 						Poll::Ready(Ok(void)) => match void {},
 						Poll::Ready(Err(_)) => *in_substream = None,
-					}
-				}
+					},
 			}
 		}
 
diff --git a/client/network/src/protocol/notifications/tests.rs b/client/network/src/protocol/notifications/tests.rs
index 4c7461c94b20..a80315050830 100644
--- a/client/network/src/protocol/notifications/tests.rs
+++ b/client/network/src/protocol/notifications/tests.rs
@@ -21,19 +21,24 @@
 use crate::protocol::notifications::{Notifications, NotificationsOut, ProtocolConfig};
 
 use futures::prelude::*;
-use libp2p::{PeerId, Multiaddr, Transport};
-use libp2p::core::{
-	connection::{ConnectionId, ListenerId},
-	ConnectedPoint,
-	transport::MemoryTransport,
-	upgrade
+use libp2p::{
+	core::{
+		connection::{ConnectionId, ListenerId},
+		transport::MemoryTransport,
+		upgrade, ConnectedPoint,
+	},
+	identity, noise,
+	swarm::{
+		IntoProtocolsHandler, NetworkBehaviour, NetworkBehaviourAction, PollParameters,
+		ProtocolsHandler, Swarm,
+	},
+	yamux, Multiaddr, PeerId, Transport,
 };
-use libp2p::{identity, noise, yamux};
-use libp2p::swarm::{
-	Swarm, ProtocolsHandler, IntoProtocolsHandler, PollParameters,
-	NetworkBehaviour, NetworkBehaviourAction
+use std::{
+	error, io, iter,
+	task::{Context, Poll},
+	time::Duration,
 };
-use std::{error, io, iter, task::{Context, Poll}, time::Duration};
 
 /// Builds two nodes that have each other as bootstrap nodes.
 /// This is to be used only for testing, and a panic will happen if something goes wrong.
@@ -45,12 +50,11 @@ fn build_nodes() -> (Swarm<CustomProtoWithAddr>, Swarm<CustomProtoWithAddr>) {
 		.map(|_| format!("/memory/{}", rand::random::<u64>()).parse().unwrap())
 		.collect();
 
-	for index in 0 .. 2 {
+	for index in 0..2 {
 		let keypair = keypairs[index].clone();
 
-		let noise_keys = noise::Keypair::<noise::X25519Spec>::new()
-			.into_authentic(&keypair)
-			.unwrap();
+		let noise_keys =
+			noise::Keypair::<noise::X25519Spec>::new().into_authentic(&keypair).unwrap();
 
 		let transport = MemoryTransport
 			.upgrade(upgrade::Version::V1)
@@ -60,48 +64,43 @@ fn build_nodes() -> (Swarm<CustomProtoWithAddr>, Swarm<CustomProtoWithAddr>) {
 			.boxed();
 
 		let (peerset, _) = sc_peerset::Peerset::from_config(sc_peerset::PeersetConfig {
-			sets: vec![
-				sc_peerset::SetConfig {
-					in_peers: 25,
-					out_peers: 25,
-					bootnodes: if index == 0 {
-						keypairs
-							.iter()
-							.skip(1)
-							.map(|keypair| keypair.public().into_peer_id())
-							.collect()
-					} else {
-						vec![]
-					},
-					reserved_nodes: Default::default(),
-					reserved_only: false,
-				}
-			],
+			sets: vec![sc_peerset::SetConfig {
+				in_peers: 25,
+				out_peers: 25,
+				bootnodes: if index == 0 {
+					keypairs.iter().skip(1).map(|keypair| keypair.public().into_peer_id()).collect()
+				} else {
+					vec![]
+				},
+				reserved_nodes: Default::default(),
+				reserved_only: false,
+			}],
 		});
 
 		let behaviour = CustomProtoWithAddr {
-			inner: Notifications::new(peerset, iter::once(ProtocolConfig {
-				name: "/foo".into(),
-				fallback_names: Vec::new(),
-				handshake: Vec::new(),
-				max_notification_size: 1024 * 1024
-			})),
+			inner: Notifications::new(
+				peerset,
+				iter::once(ProtocolConfig {
+					name: "/foo".into(),
+					fallback_names: Vec::new(),
+					handshake: Vec::new(),
+					max_notification_size: 1024 * 1024,
+				}),
+			),
 			addrs: addrs
 				.iter()
 				.enumerate()
-				.filter_map(|(n, a)| if n != index {
-					Some((keypairs[n].public().into_peer_id(), a.clone()))
-				} else {
-					None
+				.filter_map(|(n, a)| {
+					if n != index {
+						Some((keypairs[n].public().into_peer_id(), a.clone()))
+					} else {
+						None
+					}
 				})
 				.collect(),
 		};
 
-		let mut swarm = Swarm::new(
-			transport,
-			behaviour,
-			keypairs[index].public().into_peer_id()
-		);
+		let mut swarm = Swarm::new(transport, behaviour, keypairs[index].public().into_peer_id());
 		swarm.listen_on(addrs[index].clone()).unwrap();
 		out.push(swarm);
 	}
@@ -159,11 +158,21 @@ impl NetworkBehaviour for CustomProtoWithAddr {
 		self.inner.inject_disconnected(peer_id)
 	}
 
-	fn inject_connection_established(&mut self, peer_id: &PeerId, conn: &ConnectionId, endpoint: &ConnectedPoint) {
+	fn inject_connection_established(
+		&mut self,
+		peer_id: &PeerId,
+		conn: &ConnectionId,
+		endpoint: &ConnectedPoint,
+	) {
 		self.inner.inject_connection_established(peer_id, conn, endpoint)
 	}
 
-	fn inject_connection_closed(&mut self, peer_id: &PeerId, conn: &ConnectionId, endpoint: &ConnectedPoint) {
+	fn inject_connection_closed(
+		&mut self,
+		peer_id: &PeerId,
+		conn: &ConnectionId,
+		endpoint: &ConnectedPoint,
+	) {
 		self.inner.inject_connection_closed(peer_id, conn, endpoint)
 	}
 
@@ -171,7 +180,7 @@ impl NetworkBehaviour for CustomProtoWithAddr {
 		&mut self,
 		peer_id: PeerId,
 		connection: ConnectionId,
-		event: <<Self::ProtocolsHandler as IntoProtocolsHandler>::Handler as ProtocolsHandler>::OutEvent
+		event: <<Self::ProtocolsHandler as IntoProtocolsHandler>::Handler as ProtocolsHandler>::OutEvent,
 	) {
 		self.inner.inject_event(peer_id, connection, event)
 	}
@@ -185,11 +194,16 @@ impl NetworkBehaviour for CustomProtoWithAddr {
 			<<Self::ProtocolsHandler as IntoProtocolsHandler>::Handler as ProtocolsHandler>::InEvent,
 			Self::OutEvent
 		>
-	> {
+	>{
 		self.inner.poll(cx, params)
 	}
 
-	fn inject_addr_reach_failure(&mut self, peer_id: Option<&PeerId>, addr: &Multiaddr, error: &dyn std::error::Error) {
+	fn inject_addr_reach_failure(
+		&mut self,
+		peer_id: Option<&PeerId>,
+		addr: &Multiaddr,
+		error: &dyn std::error::Error,
+	) {
 		self.inner.inject_addr_reach_failure(peer_id, addr, error)
 	}
 
@@ -235,7 +249,12 @@ fn reconnect_after_disconnect() {
 
 	// For this test, the services can be in the following states.
 	#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-	enum ServiceState { NotConnected, FirstConnec, Disconnected, ConnectedAgain }
+	enum ServiceState {
+		NotConnected,
+		FirstConnec,
+		Disconnected,
+		ConnectedAgain,
+	}
 	let mut service1_state = ServiceState::NotConnected;
 	let mut service2_state = ServiceState::NotConnected;
 
@@ -253,55 +272,55 @@ fn reconnect_after_disconnect() {
 			};
 
 			match event {
-				future::Either::Left(NotificationsOut::CustomProtocolOpen { .. }) => {
+				future::Either::Left(NotificationsOut::CustomProtocolOpen { .. }) =>
 					match service1_state {
 						ServiceState::NotConnected => {
 							service1_state = ServiceState::FirstConnec;
 							if service2_state == ServiceState::FirstConnec {
 								service1.behaviour_mut().disconnect_peer(
 									Swarm::local_peer_id(&service2),
-									sc_peerset::SetId::from(0)
+									sc_peerset::SetId::from(0),
 								);
 							}
 						},
 						ServiceState::Disconnected => service1_state = ServiceState::ConnectedAgain,
 						ServiceState::FirstConnec | ServiceState::ConnectedAgain => panic!(),
-					}
-				},
-				future::Either::Left(NotificationsOut::CustomProtocolClosed { .. }) => {
+					},
+				future::Either::Left(NotificationsOut::CustomProtocolClosed { .. }) =>
 					match service1_state {
 						ServiceState::FirstConnec => service1_state = ServiceState::Disconnected,
-						ServiceState::ConnectedAgain| ServiceState::NotConnected |
+						ServiceState::ConnectedAgain |
+						ServiceState::NotConnected |
 						ServiceState::Disconnected => panic!(),
-					}
-				},
-				future::Either::Right(NotificationsOut::CustomProtocolOpen { .. }) => {
+					},
+				future::Either::Right(NotificationsOut::CustomProtocolOpen { .. }) =>
 					match service2_state {
 						ServiceState::NotConnected => {
 							service2_state = ServiceState::FirstConnec;
 							if service1_state == ServiceState::FirstConnec {
 								service1.behaviour_mut().disconnect_peer(
 									Swarm::local_peer_id(&service2),
-									sc_peerset::SetId::from(0)
+									sc_peerset::SetId::from(0),
 								);
 							}
 						},
 						ServiceState::Disconnected => service2_state = ServiceState::ConnectedAgain,
 						ServiceState::FirstConnec | ServiceState::ConnectedAgain => panic!(),
-					}
-				},
-				future::Either::Right(NotificationsOut::CustomProtocolClosed { .. }) => {
+					},
+				future::Either::Right(NotificationsOut::CustomProtocolClosed { .. }) =>
 					match service2_state {
 						ServiceState::FirstConnec => service2_state = ServiceState::Disconnected,
-						ServiceState::ConnectedAgain| ServiceState::NotConnected |
+						ServiceState::ConnectedAgain |
+						ServiceState::NotConnected |
 						ServiceState::Disconnected => panic!(),
-					}
-				},
-				_ => {}
+					},
+				_ => {},
 			}
 
-			if service1_state == ServiceState::ConnectedAgain && service2_state == ServiceState::ConnectedAgain {
-				break;
+			if service1_state == ServiceState::ConnectedAgain &&
+				service2_state == ServiceState::ConnectedAgain
+			{
+				break
 			}
 		}
 
@@ -316,7 +335,7 @@ fn reconnect_after_disconnect() {
 				let s2 = service2.next();
 				futures::pin_mut!(s1, s2);
 				match future::select(future::select(s1, s2), &mut delay).await {
-					future::Either::Right(_) => break,	// success
+					future::Either::Right(_) => break, // success
 					future::Either::Left((future::Either::Left((ev, _)), _)) => ev,
 					future::Either::Left((future::Either::Right((ev, _)), _)) => ev,
 				}
@@ -325,7 +344,7 @@ fn reconnect_after_disconnect() {
 			match event {
 				NotificationsOut::CustomProtocolOpen { .. } |
 				NotificationsOut::CustomProtocolClosed { .. } => panic!(),
-				_ => {}
+				_ => {},
 			}
 		}
 	});
diff --git a/client/network/src/protocol/notifications/upgrade.rs b/client/network/src/protocol/notifications/upgrade.rs
index 35ae6917272a..196b4f44f81f 100644
--- a/client/network/src/protocol/notifications/upgrade.rs
+++ b/client/network/src/protocol/notifications/upgrade.rs
@@ -16,16 +16,13 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-pub use self::collec::UpgradeCollec;
-pub use self::notifications::{
-	NotificationsIn,
-	NotificationsInOpen,
-	NotificationsInSubstream,
-	NotificationsOut,
-	NotificationsOutOpen,
-	NotificationsOutSubstream,
-	NotificationsHandshakeError,
-	NotificationsOutError,
+pub use self::{
+	collec::UpgradeCollec,
+	notifications::{
+		NotificationsHandshakeError, NotificationsIn, NotificationsInOpen,
+		NotificationsInSubstream, NotificationsOut, NotificationsOutError, NotificationsOutOpen,
+		NotificationsOutSubstream,
+	},
 };
 
 mod collec;
diff --git a/client/network/src/protocol/notifications/upgrade/collec.rs b/client/network/src/protocol/notifications/upgrade/collec.rs
index 8531fb8bdfdb..8a2a7f794202 100644
--- a/client/network/src/protocol/notifications/upgrade/collec.rs
+++ b/client/network/src/protocol/notifications/upgrade/collec.rs
@@ -18,7 +18,12 @@
 
 use futures::prelude::*;
 use libp2p::core::upgrade::{InboundUpgrade, ProtocolName, UpgradeInfo};
-use std::{iter::FromIterator, pin::Pin, task::{Context, Poll}, vec};
+use std::{
+	iter::FromIterator,
+	pin::Pin,
+	task::{Context, Poll},
+	vec,
+};
 
 // TODO: move this to libp2p => https://github.com/libp2p/rust-libp2p/issues/1445
 
@@ -44,9 +49,10 @@ impl<T: UpgradeInfo> UpgradeInfo for UpgradeCollec<T> {
 	type InfoIter = vec::IntoIter<Self::Info>;
 
 	fn protocol_info(&self) -> Self::InfoIter {
-		self.0.iter().enumerate()
-			.flat_map(|(n, p)|
-				p.protocol_info().into_iter().map(move |i| ProtoNameWithUsize(i, n)))
+		self.0
+			.iter()
+			.enumerate()
+			.flat_map(|(n, p)| p.protocol_info().into_iter().map(move |i| ProtoNameWithUsize(i, n)))
 			.collect::<Vec<_>>()
 			.into_iter()
 	}
diff --git a/client/network/src/protocol/notifications/upgrade/notifications.rs b/client/network/src/protocol/notifications/upgrade/notifications.rs
index 26bb92d77656..d01b1b5054f6 100644
--- a/client/network/src/protocol/notifications/upgrade/notifications.rs
+++ b/client/network/src/protocol/notifications/upgrade/notifications.rs
@@ -16,6 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+use asynchronous_codec::Framed;
 /// Notifications protocol.
 ///
 /// The Substrate notifications protocol consists in the following:
@@ -34,14 +35,18 @@
 ///
 /// Notification substreams are unidirectional. If A opens a substream with B, then B is
 /// encouraged but not required to open a substream to A as well.
-///
-
 use bytes::BytesMut;
 use futures::prelude::*;
-use asynchronous_codec::Framed;
-use libp2p::core::{UpgradeInfo, InboundUpgrade, OutboundUpgrade, upgrade};
+use libp2p::core::{upgrade, InboundUpgrade, OutboundUpgrade, UpgradeInfo};
 use log::error;
-use std::{borrow::Cow, convert::{Infallible, TryFrom as _}, io, mem, pin::Pin, task::{Context, Poll}, vec};
+use std::{
+	borrow::Cow,
+	convert::{Infallible, TryFrom as _},
+	io, mem,
+	pin::Pin,
+	task::{Context, Poll},
+	vec,
+};
 use unsigned_varint::codec::UviBytes;
 
 /// Maximum allowed size of the two handshake messages, in bytes.
@@ -111,15 +116,12 @@ impl NotificationsIn {
 	pub fn new(
 		main_protocol_name: impl Into<Cow<'static, str>>,
 		fallback_names: Vec<Cow<'static, str>>,
-		max_notification_size: u64
+		max_notification_size: u64,
 	) -> Self {
 		let mut protocol_names = fallback_names;
 		protocol_names.insert(0, main_protocol_name.into());
 
-		NotificationsIn {
-			protocol_names,
-			max_notification_size,
-		}
+		NotificationsIn { protocol_names, max_notification_size }
 	}
 }
 
@@ -128,29 +130,31 @@ impl UpgradeInfo for NotificationsIn {
 	type InfoIter = vec::IntoIter<Self::Info>;
 
 	fn protocol_info(&self) -> Self::InfoIter {
-		self.protocol_names.iter().cloned().map(StringProtocolName).collect::<Vec<_>>().into_iter()
+		self.protocol_names
+			.iter()
+			.cloned()
+			.map(StringProtocolName)
+			.collect::<Vec<_>>()
+			.into_iter()
 	}
 }
 
 impl<TSubstream> InboundUpgrade<TSubstream> for NotificationsIn
-where TSubstream: AsyncRead + AsyncWrite + Unpin + Send + 'static,
+where
+	TSubstream: AsyncRead + AsyncWrite + Unpin + Send + 'static,
 {
 	type Output = NotificationsInOpen<TSubstream>;
 	type Future = Pin<Box<dyn Future<Output = Result<Self::Output, Self::Error>> + Send>>;
 	type Error = NotificationsHandshakeError;
 
-	fn upgrade_inbound(
-		self,
-		mut socket: TSubstream,
-		negotiated_name: Self::Info,
-	) -> Self::Future {
+	fn upgrade_inbound(self, mut socket: TSubstream, negotiated_name: Self::Info) -> Self::Future {
 		Box::pin(async move {
 			let handshake_len = unsigned_varint::aio::read_usize(&mut socket).await?;
 			if handshake_len > MAX_HANDSHAKE_SIZE {
 				return Err(NotificationsHandshakeError::TooLarge {
 					requested: handshake_len,
 					max: MAX_HANDSHAKE_SIZE,
-				});
+				})
 			}
 
 			let mut handshake = vec![0u8; handshake_len];
@@ -191,13 +195,14 @@ pub struct NotificationsInOpen<TSubstream> {
 }
 
 impl<TSubstream> NotificationsInSubstream<TSubstream>
-where TSubstream: AsyncRead + AsyncWrite + Unpin,
+where
+	TSubstream: AsyncRead + AsyncWrite + Unpin,
 {
 	/// Sends the handshake in order to inform the remote that we accept the substream.
 	pub fn send_handshake(&mut self, message: impl Into<Vec<u8>>) {
 		if !matches!(self.handshake, NotificationsInSubstreamHandshake::NotSent) {
 			error!(target: "sub-libp2p", "Tried to send handshake twice");
-			return;
+			return
 		}
 
 		self.handshake = NotificationsInSubstreamHandshake::PendingSend(message.into());
@@ -205,7 +210,10 @@ where TSubstream: AsyncRead + AsyncWrite + Unpin,
 
 	/// Equivalent to `Stream::poll_next`, except that it only drives the handshake and is
 	/// guaranteed to not generate any notification.
-	pub fn poll_process(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Result<Infallible, io::Error>> {
+	pub fn poll_process(
+		self: Pin<&mut Self>,
+		cx: &mut Context,
+	) -> Poll<Result<Infallible, io::Error>> {
 		let mut this = self.project();
 
 		loop {
@@ -222,7 +230,7 @@ where TSubstream: AsyncRead + AsyncWrite + Unpin,
 						Poll::Pending => {
 							*this.handshake = NotificationsInSubstreamHandshake::PendingSend(msg);
 							return Poll::Pending
-						}
+						},
 					},
 				NotificationsInSubstreamHandshake::Flush =>
 					match Sink::poll_flush(this.socket.as_mut(), cx)? {
@@ -231,7 +239,7 @@ where TSubstream: AsyncRead + AsyncWrite + Unpin,
 						Poll::Pending => {
 							*this.handshake = NotificationsInSubstreamHandshake::Flush;
 							return Poll::Pending
-						}
+						},
 					},
 
 				st @ NotificationsInSubstreamHandshake::NotSent |
@@ -239,15 +247,16 @@ where TSubstream: AsyncRead + AsyncWrite + Unpin,
 				st @ NotificationsInSubstreamHandshake::ClosingInResponseToRemote |
 				st @ NotificationsInSubstreamHandshake::BothSidesClosed => {
 					*this.handshake = st;
-					return Poll::Pending;
-				}
+					return Poll::Pending
+				},
 			}
 		}
 	}
 }
 
 impl<TSubstream> Stream for NotificationsInSubstream<TSubstream>
-where TSubstream: AsyncRead + AsyncWrite + Unpin,
+where
+	TSubstream: AsyncRead + AsyncWrite + Unpin,
 {
 	type Item = Result<BytesMut, io::Error>;
 
@@ -273,7 +282,7 @@ where TSubstream: AsyncRead + AsyncWrite + Unpin,
 						Poll::Pending => {
 							*this.handshake = NotificationsInSubstreamHandshake::PendingSend(msg);
 							return Poll::Pending
-						}
+						},
 					},
 				NotificationsInSubstreamHandshake::Flush =>
 					match Sink::poll_flush(this.socket.as_mut(), cx)? {
@@ -282,13 +291,14 @@ where TSubstream: AsyncRead + AsyncWrite + Unpin,
 						Poll::Pending => {
 							*this.handshake = NotificationsInSubstreamHandshake::Flush;
 							return Poll::Pending
-						}
+						},
 					},
 
 				NotificationsInSubstreamHandshake::Sent => {
 					match Stream::poll_next(this.socket.as_mut(), cx) {
-						Poll::Ready(None) => *this.handshake =
-							NotificationsInSubstreamHandshake::ClosingInResponseToRemote,
+						Poll::Ready(None) =>
+							*this.handshake =
+								NotificationsInSubstreamHandshake::ClosingInResponseToRemote,
 						Poll::Ready(Some(msg)) => {
 							*this.handshake = NotificationsInSubstreamHandshake::Sent;
 							return Poll::Ready(Some(msg))
@@ -305,13 +315,13 @@ where TSubstream: AsyncRead + AsyncWrite + Unpin,
 						Poll::Ready(()) =>
 							*this.handshake = NotificationsInSubstreamHandshake::BothSidesClosed,
 						Poll::Pending => {
-							*this.handshake = NotificationsInSubstreamHandshake::ClosingInResponseToRemote;
+							*this.handshake =
+								NotificationsInSubstreamHandshake::ClosingInResponseToRemote;
 							return Poll::Pending
-						}
+						},
 					},
 
-				NotificationsInSubstreamHandshake::BothSidesClosed =>
-					return Poll::Ready(None),
+				NotificationsInSubstreamHandshake::BothSidesClosed => return Poll::Ready(None),
 			}
 		}
 	}
@@ -333,11 +343,7 @@ impl NotificationsOut {
 		let mut protocol_names = fallback_names;
 		protocol_names.insert(0, main_protocol_name.into());
 
-		NotificationsOut {
-			protocol_names,
-			initial_message,
-			max_notification_size,
-		}
+		NotificationsOut { protocol_names, initial_message, max_notification_size }
 	}
 }
 
@@ -356,22 +362,24 @@ impl UpgradeInfo for NotificationsOut {
 	type InfoIter = vec::IntoIter<Self::Info>;
 
 	fn protocol_info(&self) -> Self::InfoIter {
-		self.protocol_names.iter().cloned().map(StringProtocolName).collect::<Vec<_>>().into_iter()
+		self.protocol_names
+			.iter()
+			.cloned()
+			.map(StringProtocolName)
+			.collect::<Vec<_>>()
+			.into_iter()
 	}
 }
 
 impl<TSubstream> OutboundUpgrade<TSubstream> for NotificationsOut
-where TSubstream: AsyncRead + AsyncWrite + Unpin + Send + 'static,
+where
+	TSubstream: AsyncRead + AsyncWrite + Unpin + Send + 'static,
 {
 	type Output = NotificationsOutOpen<TSubstream>;
 	type Future = Pin<Box<dyn Future<Output = Result<Self::Output, Self::Error>> + Send>>;
 	type Error = NotificationsHandshakeError;
 
-	fn upgrade_outbound(
-		self,
-		mut socket: TSubstream,
-		negotiated_name: Self::Info,
-	) -> Self::Future {
+	fn upgrade_outbound(self, mut socket: TSubstream, negotiated_name: Self::Info) -> Self::Future {
 		Box::pin(async move {
 			upgrade::write_with_len_prefix(&mut socket, &self.initial_message).await?;
 
@@ -381,7 +389,7 @@ where TSubstream: AsyncRead + AsyncWrite + Unpin + Send + 'static,
 				return Err(NotificationsHandshakeError::TooLarge {
 					requested: handshake_len,
 					max: MAX_HANDSHAKE_SIZE,
-				});
+				})
 			}
 
 			let mut handshake = vec![0u8; handshake_len];
@@ -399,9 +407,7 @@ where TSubstream: AsyncRead + AsyncWrite + Unpin + Send + 'static,
 				} else {
 					Some(negotiated_name.0)
 				},
-				substream: NotificationsOutSubstream {
-					socket: Framed::new(socket, codec),
-				}
+				substream: NotificationsOutSubstream { socket: Framed::new(socket, codec) },
 			})
 		})
 	}
@@ -419,14 +425,14 @@ pub struct NotificationsOutOpen<TSubstream> {
 }
 
 impl<TSubstream> Sink<Vec<u8>> for NotificationsOutSubstream<TSubstream>
-	where TSubstream: AsyncRead + AsyncWrite + Unpin,
+where
+	TSubstream: AsyncRead + AsyncWrite + Unpin,
 {
 	type Error = NotificationsOutError;
 
 	fn poll_ready(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Result<(), Self::Error>> {
 		let mut this = self.project();
-		Sink::poll_ready(this.socket.as_mut(), cx)
-			.map_err(NotificationsOutError::Io)
+		Sink::poll_ready(this.socket.as_mut(), cx).map_err(NotificationsOutError::Io)
 	}
 
 	fn start_send(self: Pin<&mut Self>, item: Vec<u8>) -> Result<(), Self::Error> {
@@ -437,14 +443,12 @@ impl<TSubstream> Sink<Vec<u8>> for NotificationsOutSubstream<TSubstream>
 
 	fn poll_flush(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Result<(), Self::Error>> {
 		let mut this = self.project();
-		Sink::poll_flush(this.socket.as_mut(), cx)
-			.map_err(NotificationsOutError::Io)
+		Sink::poll_flush(this.socket.as_mut(), cx).map_err(NotificationsOutError::Io)
 	}
 
 	fn poll_close(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Result<(), Self::Error>> {
 		let mut this = self.project();
-		Sink::poll_close(this.socket.as_mut(), cx)
-			.map_err(NotificationsOutError::Io)
+		Sink::poll_close(this.socket.as_mut(), cx).map_err(NotificationsOutError::Io)
 	}
 }
 
@@ -471,11 +475,12 @@ impl From<unsigned_varint::io::ReadError> for NotificationsHandshakeError {
 	fn from(err: unsigned_varint::io::ReadError) -> Self {
 		match err {
 			unsigned_varint::io::ReadError::Io(err) => NotificationsHandshakeError::Io(err),
-			unsigned_varint::io::ReadError::Decode(err) => NotificationsHandshakeError::VarintDecode(err),
+			unsigned_varint::io::ReadError::Decode(err) =>
+				NotificationsHandshakeError::VarintDecode(err),
 			_ => {
 				log::warn!("Unrecognized varint decoding error");
 				NotificationsHandshakeError::Io(From::from(io::ErrorKind::InvalidData))
-			}
+			},
 		}
 	}
 }
@@ -492,7 +497,7 @@ mod tests {
 	use super::{NotificationsIn, NotificationsInOpen, NotificationsOut, NotificationsOutOpen};
 
 	use async_std::net::{TcpListener, TcpStream};
-	use futures::{prelude::*, channel::oneshot};
+	use futures::{channel::oneshot, prelude::*};
 	use libp2p::core::upgrade;
 	use std::borrow::Cow;
 
@@ -506,8 +511,10 @@ mod tests {
 			let NotificationsOutOpen { handshake, mut substream, .. } = upgrade::apply_outbound(
 				socket,
 				NotificationsOut::new(PROTO_NAME, Vec::new(), &b"initial message"[..], 1024 * 1024),
-				upgrade::Version::V1
-			).await.unwrap();
+				upgrade::Version::V1,
+			)
+			.await
+			.unwrap();
 
 			assert_eq!(handshake, b"hello world");
 			substream.send(b"test message".to_vec()).await.unwrap();
@@ -520,8 +527,10 @@ mod tests {
 			let (socket, _) = listener.accept().await.unwrap();
 			let NotificationsInOpen { handshake, mut substream, .. } = upgrade::apply_inbound(
 				socket,
-				NotificationsIn::new(PROTO_NAME, Vec::new(), 1024 * 1024)
-			).await.unwrap();
+				NotificationsIn::new(PROTO_NAME, Vec::new(), 1024 * 1024),
+			)
+			.await
+			.unwrap();
 
 			assert_eq!(handshake, b"initial message");
 			substream.send_handshake(&b"hello world"[..]);
@@ -545,8 +554,10 @@ mod tests {
 			let NotificationsOutOpen { handshake, mut substream, .. } = upgrade::apply_outbound(
 				socket,
 				NotificationsOut::new(PROTO_NAME, Vec::new(), vec![], 1024 * 1024),
-				upgrade::Version::V1
-			).await.unwrap();
+				upgrade::Version::V1,
+			)
+			.await
+			.unwrap();
 
 			assert!(handshake.is_empty());
 			substream.send(Default::default()).await.unwrap();
@@ -559,8 +570,10 @@ mod tests {
 			let (socket, _) = listener.accept().await.unwrap();
 			let NotificationsInOpen { handshake, mut substream, .. } = upgrade::apply_inbound(
 				socket,
-				NotificationsIn::new(PROTO_NAME, Vec::new(), 1024 * 1024)
-			).await.unwrap();
+				NotificationsIn::new(PROTO_NAME, Vec::new(), 1024 * 1024),
+			)
+			.await
+			.unwrap();
 
 			assert!(handshake.is_empty());
 			substream.send_handshake(vec![]);
@@ -582,8 +595,9 @@ mod tests {
 			let outcome = upgrade::apply_outbound(
 				socket,
 				NotificationsOut::new(PROTO_NAME, Vec::new(), &b"hello"[..], 1024 * 1024),
-				upgrade::Version::V1
-			).await;
+				upgrade::Version::V1,
+			)
+			.await;
 
 			// Despite the protocol negotiation being successfully conducted on the listener
 			// side, we have to receive an error here because the listener didn't send the
@@ -598,8 +612,10 @@ mod tests {
 			let (socket, _) = listener.accept().await.unwrap();
 			let NotificationsInOpen { handshake, substream, .. } = upgrade::apply_inbound(
 				socket,
-				NotificationsIn::new(PROTO_NAME, Vec::new(), 1024 * 1024)
-			).await.unwrap();
+				NotificationsIn::new(PROTO_NAME, Vec::new(), 1024 * 1024),
+			)
+			.await
+			.unwrap();
 
 			assert_eq!(handshake, b"hello");
 
@@ -620,9 +636,15 @@ mod tests {
 			let ret = upgrade::apply_outbound(
 				socket,
 				// We check that an initial message that is too large gets refused.
-				NotificationsOut::new(PROTO_NAME, Vec::new(), (0..32768).map(|_| 0).collect::<Vec<_>>(), 1024 * 1024),
-				upgrade::Version::V1
-			).await;
+				NotificationsOut::new(
+					PROTO_NAME,
+					Vec::new(),
+					(0..32768).map(|_| 0).collect::<Vec<_>>(),
+					1024 * 1024,
+				),
+				upgrade::Version::V1,
+			)
+			.await;
 			assert!(ret.is_err());
 		});
 
@@ -633,8 +655,9 @@ mod tests {
 			let (socket, _) = listener.accept().await.unwrap();
 			let ret = upgrade::apply_inbound(
 				socket,
-				NotificationsIn::new(PROTO_NAME, Vec::new(), 1024 * 1024)
-			).await;
+				NotificationsIn::new(PROTO_NAME, Vec::new(), 1024 * 1024),
+			)
+			.await;
 			assert!(ret.is_err());
 		});
 
@@ -651,8 +674,9 @@ mod tests {
 			let ret = upgrade::apply_outbound(
 				socket,
 				NotificationsOut::new(PROTO_NAME, Vec::new(), &b"initial message"[..], 1024 * 1024),
-				upgrade::Version::V1
-			).await;
+				upgrade::Version::V1,
+			)
+			.await;
 			assert!(ret.is_err());
 		});
 
@@ -663,8 +687,10 @@ mod tests {
 			let (socket, _) = listener.accept().await.unwrap();
 			let NotificationsInOpen { handshake, mut substream, .. } = upgrade::apply_inbound(
 				socket,
-				NotificationsIn::new(PROTO_NAME, Vec::new(), 1024 * 1024)
-			).await.unwrap();
+				NotificationsIn::new(PROTO_NAME, Vec::new(), 1024 * 1024),
+			)
+			.await
+			.unwrap();
 			assert_eq!(handshake, b"initial message");
 
 			// We check that a handshake that is too large gets refused.
diff --git a/client/network/src/protocol/sync.rs b/client/network/src/protocol/sync.rs
index 55b64c157c65..0ed1bb13256a 100644
--- a/client/network/src/protocol/sync.rs
+++ b/client/network/src/protocol/sync.rs
@@ -27,37 +27,41 @@
 //! The `ChainSync` struct maintains the state of the block requests. Whenever something happens on
 //! the network, or whenever a block has been successfully verified, call the appropriate method in
 //! order to update it.
-//!
 
-use codec::Encode;
-use blocks::BlockCollection;
-use state::StateSync;
-use sp_blockchain::{Error as ClientError, HeaderMetadata};
-use sp_consensus::{BlockOrigin, BlockStatus,
-	block_validation::{BlockAnnounceValidator, Validation},
-	import_queue::{IncomingBlock, BlockImportResult, BlockImportError}
-};
-use crate::protocol::message::{
-	self, BlockAnnounce, BlockAttributes, BlockRequest, BlockResponse,
+use crate::{
+	protocol::message::{self, BlockAnnounce, BlockAttributes, BlockRequest, BlockResponse},
+	schema::v1::{StateRequest, StateResponse},
 };
-use crate::schema::v1::{StateResponse, StateRequest};
+use blocks::BlockCollection;
+use codec::Encode;
 use either::Either;
 use extra_requests::ExtraRequests;
+use futures::{stream::FuturesUnordered, task::Poll, Future, FutureExt, StreamExt};
 use libp2p::PeerId;
-use log::{debug, trace, warn, info, error};
+use log::{debug, error, info, trace, warn};
+use sp_arithmetic::traits::Saturating;
+use sp_blockchain::{Error as ClientError, HeaderMetadata};
+use sp_consensus::{
+	block_validation::{BlockAnnounceValidator, Validation},
+	import_queue::{BlockImportError, BlockImportResult, IncomingBlock},
+	BlockOrigin, BlockStatus,
+};
 use sp_runtime::{
-	EncodedJustification, Justifications,
 	generic::BlockId,
 	traits::{
-		Block as BlockT, Header as HeaderT, NumberFor, Zero, One, CheckedSub, SaturatedConversion,
-		Hash, HashFor,
+		Block as BlockT, CheckedSub, Hash, HashFor, Header as HeaderT, NumberFor, One,
+		SaturatedConversion, Zero,
 	},
+	EncodedJustification, Justifications,
 };
-use sp_arithmetic::traits::Saturating;
+use state::StateSync;
 use std::{
-	fmt, ops::Range, collections::{HashMap, hash_map::Entry, HashSet}, sync::Arc, pin::Pin,
+	collections::{hash_map::Entry, HashMap, HashSet},
+	fmt,
+	ops::Range,
+	pin::Pin,
+	sync::Arc,
 };
-use futures::{task::Poll, Future, stream::FuturesUnordered, FutureExt, StreamExt};
 
 mod blocks;
 mod extra_requests;
@@ -126,7 +130,7 @@ mod rep {
 	pub const BAD_JUSTIFICATION: Rep = Rep::new(-(1 << 16), "Bad justification");
 
 	/// Reputation change when a peer sent us invlid ancestry result.
-	pub const UNKNOWN_ANCESTOR:Rep = Rep::new(-(1 << 16), "DB Error");
+	pub const UNKNOWN_ANCESTOR: Rep = Rep::new(-(1 << 16), "DB Error");
 
 	/// Peer response data does not have requested bits.
 	pub const BAD_RESPONSE: Rep = Rep::new(-(1 << 12), "Incomplete response");
@@ -142,7 +146,7 @@ impl PendingRequests {
 		match self {
 			PendingRequests::Some(set) => {
 				set.insert(id.clone());
-			}
+			},
 			PendingRequests::All => {},
 		}
 	}
@@ -207,9 +211,8 @@ pub struct ChainSync<B: BlockT> {
 	/// Total number of downloaded blocks.
 	downloaded_blocks: usize,
 	/// All block announcement that are currently being validated.
-	block_announce_validation: FuturesUnordered<
-		Pin<Box<dyn Future<Output = PreValidateBlockAnnounce<B::Header>> + Send>>
-	>,
+	block_announce_validation:
+		FuturesUnordered<Pin<Box<dyn Future<Output = PreValidateBlockAnnounce<B::Header>> + Send>>>,
 	/// Stats per peer about the number of concurrent block announce validations.
 	block_announce_validation_per_peer_stats: HashMap<PeerId, usize>,
 	/// State sync in progress, if any.
@@ -258,7 +261,7 @@ pub struct PeerInfo<B: BlockT> {
 	/// Their best block hash.
 	pub best_hash: B::Hash,
 	/// Their best block number.
-	pub best_number: NumberFor<B>
+	pub best_number: NumberFor<B>,
 }
 
 struct ForkTarget<B: BlockT> {
@@ -276,11 +279,7 @@ pub enum PeerSyncState<B: BlockT> {
 	/// Available for sync requests.
 	Available,
 	/// Searching for ancestors the Peer has in common with us.
-	AncestorSearch {
-		start: NumberFor<B>,
-		current: NumberFor<B>,
-		state: AncestorSearchState<B>,
-	},
+	AncestorSearch { start: NumberFor<B>, current: NumberFor<B>, state: AncestorSearchState<B> },
 	/// Actively downloading new blocks, starting from the given Number.
 	DownloadingNew(NumberFor<B>),
 	/// Downloading a stale block with given Hash. Stale means that it is a
@@ -305,7 +304,7 @@ pub enum SyncState {
 	/// Initial sync is complete, keep-up sync is active.
 	Idle,
 	/// Actively catching up with the chain.
-	Downloading
+	Downloading,
 }
 
 /// Reported state download progress.
@@ -350,7 +349,7 @@ pub enum OnBlockData<B: BlockT> {
 	/// The block should be imported.
 	Import(BlockOrigin, Vec<IncomingBlock<B>>),
 	/// A new block request needs to be made to the given peer.
-	Request(PeerId, BlockRequest<B>)
+	Request(PeerId, BlockRequest<B>),
 }
 
 impl<B: BlockT> OnBlockData<B> {
@@ -371,7 +370,7 @@ pub enum OnStateData<B: BlockT> {
 	/// The block and state that should be imported.
 	Import(BlockOrigin, IncomingBlock<B>),
 	/// A new state request needs to be made to the given peer.
-	Request(PeerId, StateRequest)
+	Request(PeerId, StateRequest),
 }
 
 /// Result of [`ChainSync::poll_block_announce_validation`].
@@ -435,9 +434,7 @@ enum PreValidateBlockAnnounce<H> {
 	/// An error means that *this* node failed to validate it because some internal error happened.
 	/// If the block announcement was invalid, [`Self::Failure`] is the correct variant to express
 	/// this.
-	Error {
-		who: PeerId,
-	},
+	Error { who: PeerId },
 	/// The block announcement should be skipped.
 	///
 	/// This should *only* be returned when there wasn't a slot registered
@@ -451,15 +448,9 @@ pub enum OnBlockJustification<B: BlockT> {
 	/// The justification needs no further handling.
 	Nothing,
 	/// The justification should be imported.
-	Import {
-		peer: PeerId,
-		hash: B::Hash,
-		number: NumberFor<B>,
-		justifications: Justifications
-	}
+	Import { peer: PeerId, hash: B::Hash, number: NumberFor<B>, justifications: Justifications },
 }
 
-
 /// Operation mode.
 #[derive(Debug, PartialEq, Eq)]
 pub enum SyncMode {
@@ -468,10 +459,7 @@ pub enum SyncMode {
 	// Sync headers and block bodies
 	Full,
 	// Sync headers and the last finalied state
-	LightState {
-		storage_chain_mode: bool,
-		skip_proofs: bool,
-	},
+	LightState { storage_chain_mode: bool, skip_proofs: bool },
 }
 
 /// Result of [`ChainSync::has_slot_for_block_announce_validation`].
@@ -517,12 +505,15 @@ impl<B: BlockT> ChainSync<B> {
 
 	fn required_block_attributes(&self) -> BlockAttributes {
 		match self.mode {
-			SyncMode::Full => BlockAttributes::HEADER | BlockAttributes::JUSTIFICATION | BlockAttributes::BODY,
+			SyncMode::Full =>
+				BlockAttributes::HEADER | BlockAttributes::JUSTIFICATION | BlockAttributes::BODY,
 			SyncMode::Light => BlockAttributes::HEADER | BlockAttributes::JUSTIFICATION,
 			SyncMode::LightState { storage_chain_mode: false, .. } =>
 				BlockAttributes::HEADER | BlockAttributes::JUSTIFICATION | BlockAttributes::BODY,
 			SyncMode::LightState { storage_chain_mode: true, .. } =>
-				BlockAttributes::HEADER | BlockAttributes::JUSTIFICATION | BlockAttributes::INDEXED_BODY,
+				BlockAttributes::HEADER |
+					BlockAttributes::JUSTIFICATION |
+					BlockAttributes::INDEXED_BODY,
 		}
 	}
 
@@ -538,24 +529,26 @@ impl<B: BlockT> ChainSync<B> {
 	///
 	/// Returns `None` if the peer is unknown.
 	pub fn peer_info(&self, who: &PeerId) -> Option<PeerInfo<B>> {
-		self.peers.get(who).map(|p| PeerInfo { best_hash: p.best_hash, best_number: p.best_number })
+		self.peers
+			.get(who)
+			.map(|p| PeerInfo { best_hash: p.best_hash, best_number: p.best_number })
 	}
 
 	/// Returns the current sync status.
 	pub fn status(&self) -> Status<B> {
 		let best_seen = self.peers.values().map(|p| p.best_number).max();
-		let sync_state =
-			if let Some(n) = best_seen {
-				// A chain is classified as downloading if the provided best block is
-				// more than `MAJOR_SYNC_BLOCKS` behind the best queued block.
-				if n > self.best_queued_number && n - self.best_queued_number > MAJOR_SYNC_BLOCKS.into() {
-					SyncState::Downloading
-				} else {
-					SyncState::Idle
-				}
+		let sync_state = if let Some(n) = best_seen {
+			// A chain is classified as downloading if the provided best block is
+			// more than `MAJOR_SYNC_BLOCKS` behind the best queued block.
+			if n > self.best_queued_number && n - self.best_queued_number > MAJOR_SYNC_BLOCKS.into()
+			{
+				SyncState::Downloading
 			} else {
 				SyncState::Idle
-			};
+			}
+		} else {
+			SyncState::Idle
+		};
 
 		Status {
 			state: sync_state,
@@ -569,7 +562,10 @@ impl<B: BlockT> ChainSync<B> {
 	/// Number of active forks requests. This includes
 	/// requests that are pending or could be issued right away.
 	pub fn num_sync_requests(&self) -> usize {
-		self.fork_targets.values().filter(|f| f.number <= self.best_queued_number).count()
+		self.fork_targets
+			.values()
+			.filter(|f| f.number <= self.best_queued_number)
+			.count()
 	}
 
 	/// Number of downloaded blocks.
@@ -580,23 +576,26 @@ impl<B: BlockT> ChainSync<B> {
 	/// Handle a new connected peer.
 	///
 	/// Call this method whenever we connect to a new peer.
-	pub fn new_peer(&mut self, who: PeerId, best_hash: B::Hash, best_number: NumberFor<B>)
-		-> Result<Option<BlockRequest<B>>, BadPeer>
-	{
+	pub fn new_peer(
+		&mut self,
+		who: PeerId,
+		best_hash: B::Hash,
+		best_number: NumberFor<B>,
+	) -> Result<Option<BlockRequest<B>>, BadPeer> {
 		// There is nothing sync can get from the node that has no blockchain data.
 		match self.block_status(&best_hash) {
 			Err(e) => {
 				debug!(target:"sync", "Error reading blockchain: {:?}", e);
 				Err(BadPeer(who, rep::BLOCKCHAIN_READ_ERROR))
-			}
+			},
 			Ok(BlockStatus::KnownBad) => {
 				info!("💔 New peer with known bad best block {} ({}).", best_hash, best_number);
 				Err(BadPeer(who, rep::BAD_BLOCK))
-			}
+			},
 			Ok(BlockStatus::Unknown) => {
 				if best_number.is_zero() {
 					info!("💔 New peer with unknown genesis hash {} ({}).", best_hash, best_number);
-					return Err(BadPeer(who, rep::GENESIS_MISMATCH));
+					return Err(BadPeer(who, rep::GENESIS_MISMATCH))
 				}
 				// If there are more than `MAJOR_SYNC_BLOCKS` in the import queue then we have
 				// enough to do in the import queue that it's not worth kicking off
@@ -608,13 +607,16 @@ impl<B: BlockT> ChainSync<B> {
 						self.best_queued_hash,
 						self.best_queued_number
 					);
-					self.peers.insert(who.clone(), PeerSync {
-						peer_id: who,
-						common_number: self.best_queued_number,
-						best_hash,
-						best_number,
-						state: PeerSyncState::Available,
-					});
+					self.peers.insert(
+						who.clone(),
+						PeerSync {
+							peer_id: who,
+							common_number: self.best_queued_number,
+							best_hash,
+							best_number,
+							state: PeerSyncState::Available,
+						},
+					);
 					return Ok(None)
 				}
 
@@ -644,38 +646,46 @@ impl<B: BlockT> ChainSync<B> {
 							start: self.best_queued_number,
 							state: AncestorSearchState::ExponentialBackoff(One::one()),
 						},
-						Some(ancestry_request::<B>(common_best))
+						Some(ancestry_request::<B>(common_best)),
 					)
 				};
 
 				self.pending_requests.add(&who);
-				self.peers.insert(who.clone(), PeerSync {
-					peer_id: who,
-					common_number: Zero::zero(),
-					best_hash,
-					best_number,
-					state,
-				});
+				self.peers.insert(
+					who.clone(),
+					PeerSync {
+						peer_id: who,
+						common_number: Zero::zero(),
+						best_hash,
+						best_number,
+						state,
+					},
+				);
 
 				Ok(req)
-			}
-			Ok(BlockStatus::Queued) | Ok(BlockStatus::InChainWithState) | Ok(BlockStatus::InChainPruned) => {
+			},
+			Ok(BlockStatus::Queued) |
+			Ok(BlockStatus::InChainWithState) |
+			Ok(BlockStatus::InChainPruned) => {
 				debug!(
 					target: "sync",
 					"New peer with known best hash {} ({}).",
 					best_hash,
 					best_number,
 				);
-				self.peers.insert(who.clone(), PeerSync {
-					peer_id: who.clone(),
-					common_number: std::cmp::min(self.best_queued_number, best_number),
-					best_hash,
-					best_number,
-					state: PeerSyncState::Available,
-				});
+				self.peers.insert(
+					who.clone(),
+					PeerSync {
+						peer_id: who.clone(),
+						common_number: std::cmp::min(self.best_queued_number, best_number),
+						best_hash,
+						best_number,
+						state: PeerSyncState::Available,
+					},
+				);
 				self.pending_requests.add(&who);
 				Ok(None)
-			}
+			},
 		}
 	}
 
@@ -688,9 +698,8 @@ impl<B: BlockT> ChainSync<B> {
 	/// Schedule a justification request for the given block.
 	pub fn request_justification(&mut self, hash: &B::Hash, number: NumberFor<B>) {
 		let client = &self.client;
-		self.extra_justifications.schedule((*hash, number), |base, block| {
-			is_descendent_of(&**client, base, block)
-		})
+		self.extra_justifications
+			.schedule((*hash, number), |base, block| is_descendent_of(&**client, base, block))
 	}
 
 	/// Clear all pending justification requests.
@@ -707,7 +716,9 @@ impl<B: BlockT> ChainSync<B> {
 		number: NumberFor<B>,
 	) {
 		if peers.is_empty() {
-			peers = self.peers.iter()
+			peers = self
+				.peers
+				.iter()
 				// Only request blocks from peers who are ahead or on a par.
 				.filter(|(_, peer)| peer.best_number >= number)
 				.map(|(id, _)| id.clone())
@@ -725,14 +736,14 @@ impl<B: BlockT> ChainSync<B> {
 
 		if self.is_known(&hash) {
 			debug!(target: "sync", "Refusing to sync known hash {:?}", hash);
-			return;
+			return
 		}
 
 		trace!(target: "sync", "Downloading requested old fork {:?}", hash);
 		for peer_id in &peers {
 			if let Some(peer) = self.peers.get_mut(peer_id) {
-				if let PeerSyncState::AncestorSearch {..} = peer.state {
-					continue;
+				if let PeerSyncState::AncestorSearch { .. } = peer.state {
+					continue
 				}
 
 				if number > peer.best_number {
@@ -745,22 +756,24 @@ impl<B: BlockT> ChainSync<B> {
 
 		self.fork_targets
 			.entry(hash.clone())
-			.or_insert_with(|| ForkTarget {
-				number,
-				peers: Default::default(),
-				parent_hash: None,
-			})
-			.peers.extend(peers);
+			.or_insert_with(|| ForkTarget { number, peers: Default::default(), parent_hash: None })
+			.peers
+			.extend(peers);
 	}
 
 	/// Get an iterator over all scheduled justification requests.
-	pub fn justification_requests(&mut self) -> impl Iterator<Item = (PeerId, BlockRequest<B>)> + '_ {
+	pub fn justification_requests(
+		&mut self,
+	) -> impl Iterator<Item = (PeerId, BlockRequest<B>)> + '_ {
 		let peers = &mut self.peers;
 		let mut matcher = self.extra_justifications.matcher();
 		std::iter::from_fn(move || {
 			if let Some((peer, request)) = matcher.next(&peers) {
-				peers.get_mut(&peer)
-					.expect("`Matcher::next` guarantees the `PeerId` comes from the given peers; qed")
+				peers
+					.get_mut(&peer)
+					.expect(
+						"`Matcher::next` guarantees the `PeerId` comes from the given peers; qed",
+					)
 					.state = PeerSyncState::DownloadingJustification(request.0);
 				let req = message::generic::BlockRequest {
 					id: 0,
@@ -768,7 +781,7 @@ impl<B: BlockT> ChainSync<B> {
 					from: message::FromBlock::Hash(request.0),
 					to: None,
 					direction: message::Direction::Ascending,
-					max: Some(1)
+					max: Some(1),
 				};
 				Some((peer, req))
 			} else {
@@ -790,7 +803,8 @@ impl<B: BlockT> ChainSync<B> {
 		let attrs = self.required_block_attributes();
 		let blocks = &mut self.blocks;
 		let fork_targets = &mut self.fork_targets;
-		let last_finalized = std::cmp::min(self.best_queued_number, self.client.info().finalized_number);
+		let last_finalized =
+			std::cmp::min(self.best_queued_number, self.client.info().finalized_number);
 		let best_queued = self.best_queued_number;
 		let client = &self.client;
 		let queue = &self.queue_blocks;
@@ -806,9 +820,10 @@ impl<B: BlockT> ChainSync<B> {
 			// number is smaller than the last finalized block number, we should do an ancestor
 			// search to find a better common block. If the queue is full we wait till all blocks are
 			// imported though.
-			if best_queued.saturating_sub(peer.common_number) > MAX_BLOCKS_TO_LOOK_BACKWARDS.into()
-				&& best_queued < peer.best_number && peer.common_number < last_finalized
-				&& queue.len() <= MAJOR_SYNC_BLOCKS.into()
+			if best_queued.saturating_sub(peer.common_number) > MAX_BLOCKS_TO_LOOK_BACKWARDS.into() &&
+				best_queued < peer.best_number &&
+				peer.common_number < last_finalized &&
+				queue.len() <= MAJOR_SYNC_BLOCKS.into()
 			{
 				trace!(
 					target: "sync",
@@ -843,18 +858,14 @@ impl<B: BlockT> ChainSync<B> {
 					req,
 				);
 				Some((id, req))
-			} else if let Some((hash, req)) = fork_sync_request(
-				id,
-				fork_targets,
-				best_queued,
-				last_finalized,
-				attrs,
-				|hash| if queue.contains(hash) {
-					BlockStatus::Queued
-				} else {
-					client.block_status(&BlockId::Hash(*hash)).unwrap_or(BlockStatus::Unknown)
-				},
-			) {
+			} else if let Some((hash, req)) =
+				fork_sync_request(id, fork_targets, best_queued, last_finalized, attrs, |hash| {
+					if queue.contains(hash) {
+						BlockStatus::Queued
+					} else {
+						client.block_status(&BlockId::Hash(*hash)).unwrap_or(BlockStatus::Unknown)
+					}
+				}) {
 				trace!(target: "sync", "Downloading fork {:?} from {}", hash, id);
 				peer.state = PeerSyncState::DownloadingStale(hash);
 				Some((id, req))
@@ -869,11 +880,11 @@ impl<B: BlockT> ChainSync<B> {
 	pub fn state_request(&mut self) -> Option<(PeerId, StateRequest)> {
 		if let Some(sync) = &self.state_sync {
 			if sync.is_complete() {
-				return None;
+				return None
 			}
 			if self.peers.iter().any(|(_, peer)| peer.state == PeerSyncState::DownloadingState) {
 				// Only one pending state request is allowed.
-				return None;
+				return None
 			}
 			for (id, peer) in self.peers.iter_mut() {
 				if peer.state.is_available() && peer.common_number >= sync.target_block_num() {
@@ -898,38 +909,42 @@ impl<B: BlockT> ChainSync<B> {
 		&mut self,
 		who: &PeerId,
 		request: Option<BlockRequest<B>>,
-		response: BlockResponse<B>
+		response: BlockResponse<B>,
 	) -> Result<OnBlockData<B>, BadPeer> {
 		self.downloaded_blocks += response.blocks.len();
-		let new_blocks: Vec<IncomingBlock<B>> =
-			if let Some(peer) = self.peers.get_mut(who) {
-				let mut blocks = response.blocks;
-				if request.as_ref().map_or(false, |r| r.direction == message::Direction::Descending) {
-					trace!(target: "sync", "Reversing incoming block list");
-					blocks.reverse()
-				}
-				self.pending_requests.add(who);
-				if let Some(request) = request {
-					match &mut peer.state {
-						PeerSyncState::DownloadingNew(start_block) => {
-							self.blocks.clear_peer_download(who);
-							let start_block = *start_block;
-							peer.state = PeerSyncState::Available;
-							validate_blocks::<B>(&blocks, who, Some(request))?;
-							self.blocks.insert(start_block, blocks, who.clone());
-							self.drain_blocks()
+		let new_blocks: Vec<IncomingBlock<B>> = if let Some(peer) = self.peers.get_mut(who) {
+			let mut blocks = response.blocks;
+			if request
+				.as_ref()
+				.map_or(false, |r| r.direction == message::Direction::Descending)
+			{
+				trace!(target: "sync", "Reversing incoming block list");
+				blocks.reverse()
+			}
+			self.pending_requests.add(who);
+			if let Some(request) = request {
+				match &mut peer.state {
+					PeerSyncState::DownloadingNew(start_block) => {
+						self.blocks.clear_peer_download(who);
+						let start_block = *start_block;
+						peer.state = PeerSyncState::Available;
+						validate_blocks::<B>(&blocks, who, Some(request))?;
+						self.blocks.insert(start_block, blocks, who.clone());
+						self.drain_blocks()
+					},
+					PeerSyncState::DownloadingStale(_) => {
+						peer.state = PeerSyncState::Available;
+						if blocks.is_empty() {
+							debug!(target: "sync", "Empty block response from {}", who);
+							return Err(BadPeer(who.clone(), rep::NO_BLOCK))
 						}
-						PeerSyncState::DownloadingStale(_) => {
-							peer.state = PeerSyncState::Available;
-							if blocks.is_empty() {
-								debug!(target: "sync", "Empty block response from {}", who);
-								return Err(BadPeer(who.clone(), rep::NO_BLOCK));
-							}
-							validate_blocks::<B>(&blocks, who, Some(request))?;
-							blocks.into_iter().map(|b| {
-								let justifications = b.justifications.or(
-									legacy_justification_mapping(b.justification)
-								);
+						validate_blocks::<B>(&blocks, who, Some(request))?;
+						blocks
+							.into_iter()
+							.map(|b| {
+								let justifications = b
+									.justifications
+									.or(legacy_justification_mapping(b.justification));
 								IncomingBlock {
 									hash: b.hash,
 									header: b.header,
@@ -942,110 +957,114 @@ impl<B: BlockT> ChainSync<B> {
 									skip_execution: self.skip_execution(),
 									state: None,
 								}
-							}).collect()
+							})
+							.collect()
+					},
+					PeerSyncState::AncestorSearch { current, start, state } => {
+						let matching_hash = match (blocks.get(0), self.client.hash(*current)) {
+							(Some(block), Ok(maybe_our_block_hash)) => {
+								trace!(
+									target: "sync",
+									"Got ancestry block #{} ({}) from peer {}",
+									current,
+									block.hash,
+									who,
+								);
+								maybe_our_block_hash.filter(|x| x == &block.hash)
+							},
+							(None, _) => {
+								debug!(
+									target: "sync",
+									"Invalid response when searching for ancestor from {}",
+									who,
+								);
+								return Err(BadPeer(who.clone(), rep::UNKNOWN_ANCESTOR))
+							},
+							(_, Err(e)) => {
+								info!(
+									target: "sync",
+									"❌ Error answering legitimate blockchain query: {:?}",
+									e,
+								);
+								return Err(BadPeer(who.clone(), rep::BLOCKCHAIN_READ_ERROR))
+							},
+						};
+						if matching_hash.is_some() {
+							if *start < self.best_queued_number &&
+								self.best_queued_number <= peer.best_number
+							{
+								// We've made progress on this chain since the search was started.
+								// Opportunistically set common number to updated number
+								// instead of the one that started the search.
+								peer.common_number = self.best_queued_number;
+							} else if peer.common_number < *current {
+								peer.common_number = *current;
+							}
 						}
-						PeerSyncState::AncestorSearch { current, start, state } => {
-							let matching_hash = match (blocks.get(0), self.client.hash(*current)) {
-								(Some(block), Ok(maybe_our_block_hash)) => {
-									trace!(
-										target: "sync",
-										"Got ancestry block #{} ({}) from peer {}",
-										current,
-										block.hash,
-										who,
-									);
-									maybe_our_block_hash.filter(|x| x == &block.hash)
-								},
-								(None, _) => {
-									debug!(
-										target: "sync",
-										"Invalid response when searching for ancestor from {}",
-										who,
-									);
-									return Err(BadPeer(who.clone(), rep::UNKNOWN_ANCESTOR))
-								},
-								(_, Err(e)) => {
-									info!(
-										target: "sync",
-										"❌ Error answering legitimate blockchain query: {:?}",
-										e,
-									);
-									return Err(BadPeer(who.clone(), rep::BLOCKCHAIN_READ_ERROR))
-								}
+						if matching_hash.is_none() && current.is_zero() {
+							trace!(target:"sync", "Ancestry search: genesis mismatch for peer {}", who);
+							return Err(BadPeer(who.clone(), rep::GENESIS_MISMATCH))
+						}
+						if let Some((next_state, next_num)) =
+							handle_ancestor_search_state(state, *current, matching_hash.is_some())
+						{
+							peer.state = PeerSyncState::AncestorSearch {
+								current: next_num,
+								start: *start,
+								state: next_state,
 							};
-							if matching_hash.is_some() {
-								if *start < self.best_queued_number && self.best_queued_number <= peer.best_number {
-									// We've made progress on this chain since the search was started.
-									// Opportunistically set common number to updated number
-									// instead of the one that started the search.
-									peer.common_number = self.best_queued_number;
-								}
-								else if peer.common_number < *current {
-									peer.common_number = *current;
-								}
-							}
-							if matching_hash.is_none() && current.is_zero() {
-								trace!(target:"sync", "Ancestry search: genesis mismatch for peer {}", who);
-								return Err(BadPeer(who.clone(), rep::GENESIS_MISMATCH))
-							}
-							if let Some((next_state, next_num)) =
-								handle_ancestor_search_state(state, *current, matching_hash.is_some())
+							return Ok(OnBlockData::Request(
+								who.clone(),
+								ancestry_request::<B>(next_num),
+							))
+						} else {
+							// Ancestry search is complete. Check if peer is on a stale fork unknown to us and
+							// add it to sync targets if necessary.
+							trace!(
+								target: "sync",
+								"Ancestry search complete. Ours={} ({}), Theirs={} ({}), Common={:?} ({})",
+								self.best_queued_hash,
+								self.best_queued_number,
+								peer.best_hash,
+								peer.best_number,
+								matching_hash,
+								peer.common_number,
+							);
+							if peer.common_number < peer.best_number &&
+								peer.best_number < self.best_queued_number
 							{
-								peer.state = PeerSyncState::AncestorSearch {
-									current: next_num,
-									start: *start,
-									state: next_state,
-								};
-								return Ok(
-									OnBlockData::Request(who.clone(), ancestry_request::<B>(next_num))
-								)
-							} else {
-								// Ancestry search is complete. Check if peer is on a stale fork unknown to us and
-								// add it to sync targets if necessary.
 								trace!(
 									target: "sync",
-									"Ancestry search complete. Ours={} ({}), Theirs={} ({}), Common={:?} ({})",
-									self.best_queued_hash,
-									self.best_queued_number,
+									"Added fork target {} for {}",
 									peer.best_hash,
-									peer.best_number,
-									matching_hash,
-									peer.common_number,
+									who,
 								);
-								if peer.common_number < peer.best_number
-									&& peer.best_number < self.best_queued_number
-								{
-									trace!(
-										target: "sync",
-										"Added fork target {} for {}",
-										peer.best_hash,
-										who,
-									);
-									self.fork_targets
-										.entry(peer.best_hash.clone())
-										.or_insert_with(|| ForkTarget {
-											number: peer.best_number,
-											parent_hash: None,
-											peers: Default::default(),
-										})
-									.peers.insert(who.clone());
-								}
-								peer.state = PeerSyncState::Available;
-								Vec::new()
+								self.fork_targets
+									.entry(peer.best_hash.clone())
+									.or_insert_with(|| ForkTarget {
+										number: peer.best_number,
+										parent_hash: None,
+										peers: Default::default(),
+									})
+									.peers
+									.insert(who.clone());
 							}
-						},
-						PeerSyncState::Available
-						| PeerSyncState::DownloadingJustification(..)
-						| PeerSyncState::DownloadingState
-							=> Vec::new()
-					}
-				} else {
-					// When request.is_none() this is a block announcement. Just accept blocks.
-					validate_blocks::<B>(&blocks, who, None)?;
-					blocks.into_iter().map(|b| {
-						let justifications = b.justifications.or(
-							legacy_justification_mapping(b.justification)
-						);
+							peer.state = PeerSyncState::Available;
+							Vec::new()
+						}
+					},
+					PeerSyncState::Available |
+					PeerSyncState::DownloadingJustification(..) |
+					PeerSyncState::DownloadingState => Vec::new(),
+				}
+			} else {
+				// When request.is_none() this is a block announcement. Just accept blocks.
+				validate_blocks::<B>(&blocks, who, None)?;
+				blocks
+					.into_iter()
+					.map(|b| {
+						let justifications =
+							b.justifications.or(legacy_justification_mapping(b.justification));
 						IncomingBlock {
 							hash: b.hash,
 							header: b.header,
@@ -1058,12 +1077,13 @@ impl<B: BlockT> ChainSync<B> {
 							skip_execution: true,
 							state: None,
 						}
-					}).collect()
-				}
-			} else {
-				// We don't know of this peer, so we also did not request anything from it.
-				return Err(BadPeer(who.clone(), rep::NOT_REQUESTED));
-			};
+					})
+					.collect()
+			}
+		} else {
+			// We don't know of this peer, so we also did not request anything from it.
+			return Err(BadPeer(who.clone(), rep::NOT_REQUESTED))
+		};
 
 		Ok(self.validate_and_queue_blocks(new_blocks))
 	}
@@ -1087,7 +1107,7 @@ impl<B: BlockT> ChainSync<B> {
 			sync.import(response)
 		} else {
 			debug!(target: "sync", "Ignored obsolete state response from {}", who);
-			return Err(BadPeer(who.clone(), rep::NOT_REQUESTED));
+			return Err(BadPeer(who.clone(), rep::NOT_REQUESTED))
 		};
 
 		match import_result {
@@ -1112,14 +1132,13 @@ impl<B: BlockT> ChainSync<B> {
 				};
 				debug!(target: "sync", "State sync is complete. Import is queued");
 				Ok(OnStateData::Import(origin, block))
-			}
-			state::ImportResult::Continue(request) => {
-				Ok(OnStateData::Request(who.clone(), request))
-			}
+			},
+			state::ImportResult::Continue(request) =>
+				Ok(OnStateData::Request(who.clone(), request)),
 			state::ImportResult::BadResponse => {
 				debug!(target: "sync", "Bad state data received from {}", who);
 				Err(BadPeer(who.clone(), rep::BAD_BLOCK))
-			}
+			},
 		}
 	}
 
@@ -1139,7 +1158,10 @@ impl<B: BlockT> ChainSync<B> {
 			BlockOrigin::NetworkInitialSync
 		};
 
-		if let Some((h, n)) = new_blocks.last().and_then(|b| b.header.as_ref().map(|h| (&b.hash, *h.number()))) {
+		if let Some((h, n)) = new_blocks
+			.last()
+			.and_then(|b| b.header.as_ref().map(|h| (&b.hash, *h.number())))
+		{
 			trace!(
 				target:"sync",
 				"Accepted {} blocks ({:?}) with origin {:?}",
@@ -1159,16 +1181,17 @@ impl<B: BlockT> ChainSync<B> {
 	///
 	/// Returns `Some` if this produces a justification that must be imported
 	/// into the import queue.
-	pub fn on_block_justification
-		(&mut self, who: PeerId, response: BlockResponse<B>) -> Result<OnBlockJustification<B>, BadPeer>
-	{
-		let peer =
-			if let Some(peer) = self.peers.get_mut(&who) {
-				peer
-			} else {
-				error!(target: "sync", "💔 Called on_block_justification with a bad peer ID");
-				return Ok(OnBlockJustification::Nothing)
-			};
+	pub fn on_block_justification(
+		&mut self,
+		who: PeerId,
+		response: BlockResponse<B>,
+	) -> Result<OnBlockJustification<B>, BadPeer> {
+		let peer = if let Some(peer) = self.peers.get_mut(&who) {
+			peer
+		} else {
+			error!(target: "sync", "💔 Called on_block_justification with a bad peer ID");
+			return Ok(OnBlockJustification::Nothing)
+		};
 
 		self.pending_requests.add(&who);
 		if let PeerSyncState::DownloadingJustification(hash) = peer.state {
@@ -1181,7 +1204,7 @@ impl<B: BlockT> ChainSync<B> {
 						target: "sync",
 						"💔 Invalid block justification provided by {}: requested: {:?} got: {:?}", who, hash, block.hash
 					);
-					return Err(BadPeer(who, rep::BAD_JUSTIFICATION));
+					return Err(BadPeer(who, rep::BAD_JUSTIFICATION))
 				}
 
 				block.justifications.or(legacy_justification_mapping(block.justification))
@@ -1197,9 +1220,8 @@ impl<B: BlockT> ChainSync<B> {
 				None
 			};
 
-			if let Some((peer, hash, number, j)) = self
-				.extra_justifications
-				.on_response(who, justification)
+			if let Some((peer, hash, number, j)) =
+				self.extra_justifications.on_response(who, justification)
 			{
 				return Ok(OnBlockJustification::Import { peer, hash, number, justifications: j })
 			}
@@ -1230,7 +1252,7 @@ impl<B: BlockT> ChainSync<B> {
 		}
 		for (result, hash) in results {
 			if has_error {
-				continue;
+				continue
 			}
 
 			if result.is_err() {
@@ -1242,7 +1264,7 @@ impl<B: BlockT> ChainSync<B> {
 					if let Some(peer) = who.and_then(|p| self.peers.get_mut(&p)) {
 						peer.update_common_number(number);
 					}
-				}
+				},
 				Ok(BlockImportResult::ImportedUnknown(number, aux, who)) => {
 					if aux.clear_justification_requests {
 						trace!(
@@ -1274,7 +1296,8 @@ impl<B: BlockT> ChainSync<B> {
 					if let Some(peer) = who.and_then(|p| self.peers.get_mut(&p)) {
 						peer.update_common_number(number);
 					}
-					let state_sync_complete = self.state_sync.as_ref().map_or(false, |s| s.target() == hash);
+					let state_sync_complete =
+						self.state_sync.as_ref().map_or(false, |s| s.target() == hash);
 					if state_sync_complete {
 						info!(
 							target: "sync",
@@ -1286,7 +1309,7 @@ impl<B: BlockT> ChainSync<B> {
 						output.extend(self.restart());
 					}
 				},
-				Err(BlockImportError::IncompleteHeader(who)) => {
+				Err(BlockImportError::IncompleteHeader(who)) =>
 					if let Some(peer) = who {
 						warn!(
 							target: "sync",
@@ -1294,9 +1317,8 @@ impl<B: BlockT> ChainSync<B> {
 						);
 						output.push(Err(BadPeer(peer, rep::INCOMPLETE_HEADER)));
 						output.extend(self.restart());
-					}
-				},
-				Err(BlockImportError::VerificationFailed(who, e)) => {
+					},
+				Err(BlockImportError::VerificationFailed(who, e)) =>
 					if let Some(peer) = who {
 						warn!(
 							target: "sync",
@@ -1307,9 +1329,8 @@ impl<B: BlockT> ChainSync<B> {
 						);
 						output.push(Err(BadPeer(peer, rep::VERIFICATION_FAIL)));
 						output.extend(self.restart());
-					}
-				},
-				Err(BlockImportError::BadBlock(who)) => {
+					},
+				Err(BlockImportError::BadBlock(who)) =>
 					if let Some(peer) = who {
 						warn!(
 							target: "sync",
@@ -1318,21 +1339,19 @@ impl<B: BlockT> ChainSync<B> {
 							peer,
 						);
 						output.push(Err(BadPeer(peer, rep::BAD_BLOCK)));
-					}
-				},
+					},
 				Err(BlockImportError::MissingState) => {
 					// This may happen if the chain we were requesting upon has been discarded
 					// in the meantime because other chain has been finalized.
 					// Don't mark it as bad as it still may be synced if explicitly requested.
 					trace!(target: "sync", "Obsolete block {:?}", hash);
 				},
-				e @ Err(BlockImportError::UnknownParent) |
-				e @ Err(BlockImportError::Other(_)) => {
+				e @ Err(BlockImportError::UnknownParent) | e @ Err(BlockImportError::Other(_)) => {
 					warn!(target: "sync", "💔 Error importing block {:?}: {:?}", hash, e);
 					self.state_sync = None;
 					output.extend(self.restart());
 				},
-				Err(BlockImportError::Cancelled) => {}
+				Err(BlockImportError::Cancelled) => {},
 			};
 		}
 
@@ -1344,7 +1363,8 @@ impl<B: BlockT> ChainSync<B> {
 	/// with or without errors.
 	pub fn on_justification_import(&mut self, hash: B::Hash, number: NumberFor<B>, success: bool) {
 		let finalization_result = if success { Ok((hash, number)) } else { Err(()) };
-		self.extra_justifications.try_finalize_root((hash, number), finalization_result, true);
+		self.extra_justifications
+			.try_finalize_root((hash, number), finalization_result, true);
 		self.pending_requests.set_all();
 	}
 
@@ -1356,12 +1376,10 @@ impl<B: BlockT> ChainSync<B> {
 		});
 
 		if let SyncMode::LightState { skip_proofs, .. } = &self.mode {
-			if self.state_sync.is_none()
-				&& !self.peers.is_empty()
-				&& self.queue_blocks.is_empty()
-			{
+			if self.state_sync.is_none() && !self.peers.is_empty() && self.queue_blocks.is_empty() {
 				// Finalized a recent block.
-				let mut heads: Vec<_> = self.peers.iter().map(|(_, peer)| peer.best_number).collect();
+				let mut heads: Vec<_> =
+					self.peers.iter().map(|(_, peer)| peer.best_number).collect();
 				heads.sort();
 				let median = heads[heads.len() / 2];
 				if number + STATE_SYNC_FINALITY_THRESHOLD.saturated_into() >= median {
@@ -1372,7 +1390,8 @@ impl<B: BlockT> ChainSync<B> {
 							number,
 							hash,
 						);
-						self.state_sync = Some(StateSync::new(self.client.clone(), header, *skip_proofs));
+						self.state_sync =
+							Some(StateSync::new(self.client.clone(), header, *skip_proofs));
 					}
 				}
 			}
@@ -1400,15 +1419,12 @@ impl<B: BlockT> ChainSync<B> {
 			self.best_queued_hash = *hash;
 			// Update common blocks
 			for (n, peer) in self.peers.iter_mut() {
-				if let PeerSyncState::AncestorSearch {..} = peer.state {
+				if let PeerSyncState::AncestorSearch { .. } = peer.state {
 					// Wait for ancestry search to complete first.
-					continue;
+					continue
 				}
-				let new_common_number = if peer.best_number >= number {
-					number
-				} else {
-					peer.best_number
-				};
+				let new_common_number =
+					if peer.best_number >= number { number } else { peer.best_number };
 				trace!(
 					target: "sync",
 					"Updating peer {} info, ours={}, common={}->{}, their best={}",
@@ -1435,7 +1451,10 @@ impl<B: BlockT> ChainSync<B> {
 	///
 	/// It is *required* to call [`Self::peer_block_announce_validation_finished`] when the
 	/// validation is finished to clear the slot.
-	fn has_slot_for_block_announce_validation(&mut self, peer: &PeerId) -> HasSlotForBlockAnnounceValidation {
+	fn has_slot_for_block_announce_validation(
+		&mut self,
+		peer: &PeerId,
+	) -> HasSlotForBlockAnnounceValidation {
 		if self.block_announce_validation.len() >= MAX_CONCURRENT_BLOCK_ANNOUNCE_VALIDATIONS {
 			return HasSlotForBlockAnnounceValidation::TotalMaximumSlotsReached
 		}
@@ -1478,15 +1497,18 @@ impl<B: BlockT> ChainSync<B> {
 		);
 
 		if number.is_zero() {
-			self.block_announce_validation.push(async move {
-				warn!(
-					target: "sync",
-					"💔 Ignored genesis block (#0) announcement from {}: {}",
-					who,
-					hash,
-				);
-				PreValidateBlockAnnounce::Skip
-			}.boxed());
+			self.block_announce_validation.push(
+				async move {
+					warn!(
+						target: "sync",
+						"💔 Ignored genesis block (#0) announcement from {}: {}",
+						who,
+						hash,
+					);
+					PreValidateBlockAnnounce::Skip
+				}
+				.boxed(),
+			);
 			return
 		}
 
@@ -1494,18 +1516,21 @@ impl<B: BlockT> ChainSync<B> {
 		match self.has_slot_for_block_announce_validation(&who) {
 			HasSlotForBlockAnnounceValidation::Yes => {},
 			HasSlotForBlockAnnounceValidation::TotalMaximumSlotsReached => {
-				self.block_announce_validation.push(async move {
-					warn!(
-						target: "sync",
-						"💔 Ignored block (#{} -- {}) announcement from {} because all validation slots are occupied.",
-						number,
-						hash,
-						who,
-					);
-					PreValidateBlockAnnounce::Skip
-				}.boxed());
+				self.block_announce_validation.push(
+					async move {
+						warn!(
+							target: "sync",
+							"💔 Ignored block (#{} -- {}) announcement from {} because all validation slots are occupied.",
+							number,
+							hash,
+							who,
+						);
+						PreValidateBlockAnnounce::Skip
+					}
+					.boxed(),
+				);
 				return
-			}
+			},
 			HasSlotForBlockAnnounceValidation::MaximumPeerSlotsReached => {
 				self.block_announce_validation.push(async move {
 					warn!(
@@ -1518,7 +1543,7 @@ impl<B: BlockT> ChainSync<B> {
 					PreValidateBlockAnnounce::Skip
 				}.boxed());
 				return
-			}
+			},
 		}
 
 		// Let external validator check the block announcement.
@@ -1526,33 +1551,36 @@ impl<B: BlockT> ChainSync<B> {
 		let future = self.block_announce_validator.validate(&header, assoc_data);
 		let hash = hash.clone();
 
-		self.block_announce_validation.push(async move {
-			match future.await {
-				Ok(Validation::Success { is_new_best }) => PreValidateBlockAnnounce::Process {
-					is_new_best: is_new_best || is_best,
-					announce,
-					who,
-				},
-				Ok(Validation::Failure { disconnect }) => {
-					debug!(
-						target: "sync",
-						"Block announcement validation of block {:?} from {} failed",
-						hash,
+		self.block_announce_validation.push(
+			async move {
+				match future.await {
+					Ok(Validation::Success { is_new_best }) => PreValidateBlockAnnounce::Process {
+						is_new_best: is_new_best || is_best,
+						announce,
 						who,
-					);
-					PreValidateBlockAnnounce::Failure { who, disconnect }
-				}
-				Err(e) => {
-					debug!(
-						target: "sync",
-						"💔 Block announcement validation of block {:?} errored: {}",
-						hash,
-						e,
-					);
-					PreValidateBlockAnnounce::Error { who }
+					},
+					Ok(Validation::Failure { disconnect }) => {
+						debug!(
+							target: "sync",
+							"Block announcement validation of block {:?} from {} failed",
+							hash,
+							who,
+						);
+						PreValidateBlockAnnounce::Failure { who, disconnect }
+					},
+					Err(e) => {
+						debug!(
+							target: "sync",
+							"💔 Block announcement validation of block {:?} errored: {}",
+							hash,
+							e,
+						);
+						PreValidateBlockAnnounce::Error { who }
+					},
 				}
 			}
-		}.boxed());
+			.boxed(),
+		);
 	}
 
 	/// Poll block announce validation.
@@ -1603,7 +1631,7 @@ impl<B: BlockT> ChainSync<B> {
 				if *entry.get() == 0 {
 					entry.remove();
 				}
-			}
+			},
 		}
 	}
 
@@ -1622,9 +1650,8 @@ impl<B: BlockT> ChainSync<B> {
 				);
 				return PollBlockAnnounceValidation::Failure { who, disconnect }
 			},
-			PreValidateBlockAnnounce::Process { announce, is_new_best, who } => {
-				(announce, is_new_best, who)
-			},
+			PreValidateBlockAnnounce::Process { announce, is_new_best, who } =>
+				(announce, is_new_best, who),
 			PreValidateBlockAnnounce::Error { .. } | PreValidateBlockAnnounce::Skip => {
 				debug!(
 					target: "sync",
@@ -1644,7 +1671,8 @@ impl<B: BlockT> ChainSync<B> {
 
 		let number = *announce.header.number();
 		let hash = announce.header.hash();
-		let parent_status = self.block_status(announce.header.parent_hash()).unwrap_or(BlockStatus::Unknown);
+		let parent_status =
+			self.block_status(announce.header.parent_hash()).unwrap_or(BlockStatus::Unknown);
 		let known_parent = parent_status != BlockStatus::Unknown;
 		let ancient_parent = parent_status == BlockStatus::InChainPruned;
 
@@ -1662,7 +1690,7 @@ impl<B: BlockT> ChainSync<B> {
 			peer.best_hash = hash;
 		}
 
-		if let PeerSyncState::AncestorSearch {..} = peer.state {
+		if let PeerSyncState::AncestorSearch { .. } = peer.state {
 			trace!(target: "sync", "Peer state is ancestor search.");
 			return PollBlockAnnounceValidation::Nothing { is_best, who, announce }
 		}
@@ -1672,8 +1700,8 @@ impl<B: BlockT> ChainSync<B> {
 		if is_best {
 			if known && self.best_queued_number >= number {
 				peer.update_common_number(number);
-			} else if announce.header.parent_hash() == &self.best_queued_hash
-				|| known_parent && self.best_queued_number >= number
+			} else if announce.header.parent_hash() == &self.best_queued_hash ||
+				known_parent && self.best_queued_number >= number
 			{
 				peer.update_common_number(number - One::one());
 			}
@@ -1727,7 +1755,8 @@ impl<B: BlockT> ChainSync<B> {
 					parent_hash: Some(*announce.header.parent_hash()),
 					peers: Default::default(),
 				})
-				.peers.insert(who.clone());
+				.peers
+				.insert(who.clone());
 		}
 
 		PollBlockAnnounceValidation::Nothing { is_best, who, announce }
@@ -1775,9 +1804,9 @@ impl<B: BlockT> ChainSync<B> {
 					// We make sure our commmon number is at least something we have.
 					p.common_number = self.best_queued_number;
 					self.peers.insert(id, p);
-					return None;
-				}
-				_ => {}
+					return None
+				},
+				_ => {},
 			}
 
 			// handle peers that were in other states.
@@ -1792,7 +1821,7 @@ impl<B: BlockT> ChainSync<B> {
 	/// Find a block to start sync from. If we sync with state, that's the latest block we have state for.
 	fn reset_sync_start_point(&mut self) -> Result<(), ClientError> {
 		let info = self.client.info();
-		if matches!(self.mode, SyncMode::LightState {..}) && info.finalized_state.is_some() {
+		if matches!(self.mode, SyncMode::LightState { .. }) && info.finalized_state.is_some() {
 			log::warn!(
 				target: "sync",
 				"Can't use fast sync mode with a partially synced database. Reverting to full sync mode."
@@ -1803,7 +1832,9 @@ impl<B: BlockT> ChainSync<B> {
 		self.best_queued_hash = info.best_hash;
 		self.best_queued_number = info.best_number;
 		if self.mode == SyncMode::Full {
-			if self.client.block_status(&BlockId::hash(info.best_hash))? != BlockStatus::InChainWithState {
+			if self.client.block_status(&BlockId::hash(info.best_hash))? !=
+				BlockStatus::InChainWithState
+			{
 				self.import_existing = true;
 				// Latest state is missing, start with the last finalized state or genesis instead.
 				if let Some((hash, number)) = info.finalized_state {
@@ -1836,7 +1867,9 @@ impl<B: BlockT> ChainSync<B> {
 
 	/// Is any peer downloading the given hash?
 	fn is_already_downloading(&self, hash: &B::Hash) -> bool {
-		self.peers.iter().any(|(_, p)| p.state == PeerSyncState::DownloadingStale(*hash))
+		self.peers
+			.iter()
+			.any(|(_, p)| p.state == PeerSyncState::DownloadingStale(*hash))
 	}
 
 	/// Return some key metrics.
@@ -1846,7 +1879,7 @@ impl<B: BlockT> ChainSync<B> {
 			queued_blocks: self.queue_blocks.len().try_into().unwrap_or(std::u32::MAX),
 			fork_targets: self.fork_targets.len().try_into().unwrap_or(std::u32::MAX),
 			justifications: self.extra_justifications.metrics(),
-			_priv: ()
+			_priv: (),
 		}
 	}
 
@@ -1856,9 +1889,10 @@ impl<B: BlockT> ChainSync<B> {
 			.drain(self.best_queued_number + One::one())
 			.into_iter()
 			.map(|block_data| {
-				let justifications = block_data.block.justifications.or(
-					legacy_justification_mapping(block_data.block.justification)
-				);
+				let justifications = block_data
+					.block
+					.justifications
+					.or(legacy_justification_mapping(block_data.block.justification));
 				IncomingBlock {
 					hash: block_data.block.hash,
 					header: block_data.block.header,
@@ -1871,16 +1905,18 @@ impl<B: BlockT> ChainSync<B> {
 					skip_execution: self.skip_execution(),
 					state: None,
 				}
-			}).collect()
+			})
+			.collect()
 	}
-
 }
 
 // This is purely during a backwards compatible transitionary period and should be removed
 // once we can assume all nodes can send and receive multiple Justifications
 // The ID tag is hardcoded here to avoid depending on the GRANDPA crate.
 // See: https://github.com/paritytech/substrate/issues/8172
-fn legacy_justification_mapping(justification: Option<EncodedJustification>) -> Option<Justifications> {
+fn legacy_justification_mapping(
+	justification: Option<EncodedJustification>,
+) -> Option<Justifications> {
 	justification.map(|just| (*b"FRNK", just).into())
 }
 
@@ -1889,7 +1925,7 @@ pub(crate) struct Metrics {
 	pub(crate) queued_blocks: u32,
 	pub(crate) fork_targets: u32,
 	pub(crate) justifications: extra_requests::Metrics,
-	_priv: ()
+	_priv: (),
 }
 
 /// Request the ancestry for a block. Sends a request for header and justification for the given
@@ -1901,7 +1937,7 @@ fn ancestry_request<B: BlockT>(block: NumberFor<B>) -> BlockRequest<B> {
 		from: message::FromBlock::Number(block),
 		to: None,
 		direction: message::Direction::Ascending,
-		max: Some(1)
+		max: Some(1),
 	}
 }
 
@@ -1935,7 +1971,7 @@ fn handle_ancestor_search_state<B: BlockT>(
 			let next_distance_to_tip = *next_distance_to_tip;
 			if block_hash_match && next_distance_to_tip == One::one() {
 				// We found the ancestor in the first step so there is no need to execute binary search.
-				return None;
+				return None
 			}
 			if block_hash_match {
 				let left = curr_block_num;
@@ -1943,15 +1979,18 @@ fn handle_ancestor_search_state<B: BlockT>(
 				let middle = left + (right - left) / two;
 				Some((AncestorSearchState::BinarySearch(left, right), middle))
 			} else {
-				let next_block_num = curr_block_num.checked_sub(&next_distance_to_tip)
-					.unwrap_or_else(Zero::zero);
+				let next_block_num =
+					curr_block_num.checked_sub(&next_distance_to_tip).unwrap_or_else(Zero::zero);
 				let next_distance_to_tip = next_distance_to_tip * two;
-				Some((AncestorSearchState::ExponentialBackoff(next_distance_to_tip), next_block_num))
+				Some((
+					AncestorSearchState::ExponentialBackoff(next_distance_to_tip),
+					next_block_num,
+				))
 			}
-		}
+		},
 		AncestorSearchState::BinarySearch(mut left, mut right) => {
 			if left >= curr_block_num {
-				return None;
+				return None
 			}
 			if block_hash_match {
 				left = curr_block_num;
@@ -1961,7 +2000,7 @@ fn handle_ancestor_search_state<B: BlockT>(
 			assert!(right >= left);
 			let middle = left + (right - left) / two;
 			Some((AncestorSearchState::BinarySearch(left, right), middle))
-		}
+		},
 	}
 }
 
@@ -1977,7 +2016,7 @@ fn peer_block_request<B: BlockT>(
 ) -> Option<(Range<NumberFor<B>>, BlockRequest<B>)> {
 	if best_num >= peer.best_number {
 		// Will be downloaded as alternative fork instead.
-		return None;
+		return None
 	} else if peer.common_number < finalized {
 		trace!(
 			target: "sync",
@@ -2009,7 +2048,7 @@ fn peer_block_request<B: BlockT>(
 		from,
 		to: None,
 		direction: message::Direction::Descending,
-		max: Some((range.end - range.start).saturated_into::<u32>())
+		max: Some((range.end - range.start).saturated_into::<u32>()),
 	};
 
 	Some((range, request))
@@ -2027,11 +2066,11 @@ fn fork_sync_request<B: BlockT>(
 	targets.retain(|hash, r| {
 		if r.number <= finalized {
 			trace!(target: "sync", "Removed expired fork sync request {:?} (#{})", hash, r.number);
-			return false;
+			return false
 		}
 		if check_block(hash) != BlockStatus::Unknown {
 			trace!(target: "sync", "Removed obsolete fork sync request {:?} (#{})", hash, r.number);
-			return false;
+			return false
 		}
 		true
 	});
@@ -2048,27 +2087,34 @@ fn fork_sync_request<B: BlockT>(
 				1
 			};
 			trace!(target: "sync", "Downloading requested fork {:?} from {}, {} blocks", hash, id, count);
-			return Some((hash.clone(), message::generic::BlockRequest {
-				id: 0,
-				fields: attributes.clone(),
-				from: message::FromBlock::Hash(hash.clone()),
-				to: None,
-				direction: message::Direction::Descending,
-				max: Some(count),
-			}))
+			return Some((
+				hash.clone(),
+				message::generic::BlockRequest {
+					id: 0,
+					fields: attributes.clone(),
+					from: message::FromBlock::Hash(hash.clone()),
+					to: None,
+					direction: message::Direction::Descending,
+					max: Some(count),
+				},
+			))
 		}
 	}
 	None
 }
 
 /// Returns `true` if the given `block` is a descendent of `base`.
-fn is_descendent_of<Block, T>(client: &T, base: &Block::Hash, block: &Block::Hash) -> sp_blockchain::Result<bool>
-	where
-		Block: BlockT,
-		T: HeaderMetadata<Block, Error = sp_blockchain::Error> + ?Sized,
+fn is_descendent_of<Block, T>(
+	client: &T,
+	base: &Block::Hash,
+	block: &Block::Hash,
+) -> sp_blockchain::Result<bool>
+where
+	Block: BlockT,
+	T: HeaderMetadata<Block, Error = sp_blockchain::Error> + ?Sized,
 {
 	if base == block {
-		return Ok(false);
+		return Ok(false)
 	}
 
 	let ancestor = sp_blockchain::lowest_common_ancestor(client, *block, *base)?;
@@ -2101,13 +2147,13 @@ fn validate_blocks<Block: BlockT>(
 			blocks.last()
 		} else {
 			blocks.first()
-		}.and_then(|b| b.header.as_ref());
+		}
+		.and_then(|b| b.header.as_ref());
 
-		let expected_block = block_header.as_ref()
-			.map_or(false, |h| match request.from {
-				message::FromBlock::Hash(hash) => h.hash() == hash,
-				message::FromBlock::Number(n) => h.number() == &n,
-			});
+		let expected_block = block_header.as_ref().map_or(false, |h| match request.from {
+			message::FromBlock::Hash(hash) => h.hash() == hash,
+			message::FromBlock::Number(n) => h.number() == &n,
+		});
 
 		if !expected_block {
 			debug!(
@@ -2120,8 +2166,8 @@ fn validate_blocks<Block: BlockT>(
 			return Err(BadPeer(who.clone(), rep::NOT_REQUESTED))
 		}
 
-		if request.fields.contains(message::BlockAttributes::HEADER)
-			&& blocks.iter().any(|b| b.header.is_none())
+		if request.fields.contains(message::BlockAttributes::HEADER) &&
+			blocks.iter().any(|b| b.header.is_none())
 		{
 			trace!(
 				target: "sync",
@@ -2132,8 +2178,8 @@ fn validate_blocks<Block: BlockT>(
 			return Err(BadPeer(who.clone(), rep::BAD_RESPONSE))
 		}
 
-		if request.fields.contains(message::BlockAttributes::BODY)
-			&& blocks.iter().any(|b| b.body.is_none())
+		if request.fields.contains(message::BlockAttributes::BODY) &&
+			blocks.iter().any(|b| b.body.is_none())
 		{
 			trace!(
 				target: "sync",
@@ -2161,7 +2207,8 @@ fn validate_blocks<Block: BlockT>(
 		}
 		if let (Some(header), Some(body)) = (&b.header, &b.body) {
 			let expected = *header.extrinsics_root();
-			let got = HashFor::<Block>::ordered_trie_root(body.iter().map(Encode::encode).collect());
+			let got =
+				HashFor::<Block>::ordered_trie_root(body.iter().map(Encode::encode).collect());
 			if expected != got {
 				debug!(
 					target:"sync",
@@ -2181,17 +2228,19 @@ fn validate_blocks<Block: BlockT>(
 
 #[cfg(test)]
 mod test {
-	use super::message::{FromBlock, BlockState, BlockData};
-	use super::*;
+	use super::{
+		message::{BlockData, BlockState, FromBlock},
+		*,
+	};
+	use futures::{executor::block_on, future::poll_fn};
 	use sc_block_builder::BlockBuilderProvider;
 	use sp_blockchain::HeaderBackend;
 	use sp_consensus::block_validation::DefaultBlockAnnounceValidator;
 	use substrate_test_runtime_client::{
 		runtime::{Block, Hash, Header},
-		ClientBlockImportExt, DefaultTestClientBuilderExt, TestClientBuilder, TestClientBuilderExt,
-		BlockBuilderExt, TestClient, ClientExt,
+		BlockBuilderExt, ClientBlockImportExt, ClientExt, DefaultTestClientBuilderExt, TestClient,
+		TestClientBuilder, TestClientBuilderExt,
 	};
-	use futures::{future::poll_fn, executor::block_on};
 
 	#[test]
 	fn processes_empty_response_on_justification_request_for_unknown_block() {
@@ -2203,12 +2252,8 @@ mod test {
 		let block_announce_validator = Box::new(DefaultBlockAnnounceValidator);
 		let peer_id = PeerId::random();
 
-		let mut sync = ChainSync::new(
-			SyncMode::Full,
-			client.clone(),
-			block_announce_validator,
-			1,
-		).unwrap();
+		let mut sync =
+			ChainSync::new(SyncMode::Full, client.clone(), block_announce_validator, 1).unwrap();
 
 		let (a1_hash, a1_number) = {
 			let a1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
@@ -2222,50 +2267,36 @@ mod test {
 		sync.request_justification(&a1_hash, a1_number);
 
 		// the justification request should be scheduled to that peer
-		assert!(
-			sync.justification_requests().any(|(who, request)| {
-				who == peer_id && request.from == FromBlock::Hash(a1_hash)
-			})
-		);
+		assert!(sync
+			.justification_requests()
+			.any(|(who, request)| { who == peer_id && request.from == FromBlock::Hash(a1_hash) }));
 
 		// there are no extra pending requests
-		assert_eq!(
-			sync.extra_justifications.pending_requests().count(),
-			0,
-		);
+		assert_eq!(sync.extra_justifications.pending_requests().count(), 0,);
 
 		// there's one in-flight extra request to the expected peer
-		assert!(
-			sync.extra_justifications.active_requests().any(|(who, (hash, number))| {
-				*who == peer_id && *hash == a1_hash && *number == a1_number
-			})
-		);
+		assert!(sync.extra_justifications.active_requests().any(|(who, (hash, number))| {
+			*who == peer_id && *hash == a1_hash && *number == a1_number
+		}));
 
 		// if the peer replies with an empty response (i.e. it doesn't know the block),
 		// the active request should be cleared.
 		assert_eq!(
 			sync.on_block_justification(
 				peer_id.clone(),
-				BlockResponse::<Block> {
-					id: 0,
-					blocks: vec![],
-				}
+				BlockResponse::<Block> { id: 0, blocks: vec![] }
 			),
 			Ok(OnBlockJustification::Nothing),
 		);
 
 		// there should be no in-flight requests
-		assert_eq!(
-			sync.extra_justifications.active_requests().count(),
-			0,
-		);
+		assert_eq!(sync.extra_justifications.active_requests().count(), 0,);
 
 		// and the request should now be pending again, waiting for reschedule
-		assert!(
-			sync.extra_justifications.pending_requests().any(|(hash, number)| {
-				*hash == a1_hash && *number == a1_number
-			})
-		);
+		assert!(sync
+			.extra_justifications
+			.pending_requests()
+			.any(|(hash, number)| { *hash == a1_hash && *number == a1_number }));
 	}
 
 	#[test]
@@ -2276,7 +2307,8 @@ mod test {
 			client.clone(),
 			Box::new(DefaultBlockAnnounceValidator),
 			1,
-		).unwrap();
+		)
+		.unwrap();
 
 		let peer_id1 = PeerId::random();
 		let peer_id2 = PeerId::random();
@@ -2311,10 +2343,10 @@ mod test {
 		// the justification request should be scheduled to the
 		// new peer which is at the given block
 		assert!(sync.justification_requests().any(|(p, r)| {
-			p == peer_id3
-				&& r.fields == BlockAttributes::JUSTIFICATION
-				&& r.from == message::FromBlock::Hash(b1_hash)
-				&& r.to == None
+			p == peer_id3 &&
+				r.fields == BlockAttributes::JUSTIFICATION &&
+				r.from == message::FromBlock::Hash(b1_hash) &&
+				r.to == None
 		}));
 
 		assert_eq!(
@@ -2326,7 +2358,9 @@ mod test {
 		let block_requests = sync.restart();
 
 		// which should make us send out block requests to the first two peers
-		assert!(block_requests.map(|r| r.unwrap()).all(|(p, _)| { p == peer_id1 || p == peer_id2 }));
+		assert!(block_requests
+			.map(|r| r.unwrap())
+			.all(|(p, _)| { p == peer_id1 || p == peer_id2 }));
 
 		// peer 3 should be unaffected it was downloading finality data
 		assert_eq!(
@@ -2337,30 +2371,18 @@ mod test {
 		// Set common block to something that we don't have (e.g. failed import)
 		sync.peers.get_mut(&peer_id3).unwrap().common_number = 100;
 		let _ = sync.restart().count();
-		assert_eq!(
-			sync.peers.get(&peer_id3).unwrap().common_number,
-			50
-		);
+		assert_eq!(sync.peers.get(&peer_id3).unwrap().common_number, 50);
 	}
 
 	/// Send a block annoucnement for the given `header`.
-	fn send_block_announce(
-		header: Header,
-		peer_id: &PeerId,
-		sync: &mut ChainSync<Block>,
-	) {
+	fn send_block_announce(header: Header, peer_id: &PeerId, sync: &mut ChainSync<Block>) {
 		let block_annnounce = BlockAnnounce {
 			header: header.clone(),
 			state: Some(BlockState::Best),
 			data: Some(Vec::new()),
 		};
 
-		sync.push_block_announce_validation(
-			peer_id.clone(),
-			header.hash(),
-			block_annnounce,
-			true,
-		);
+		sync.push_block_announce_validation(peer_id.clone(), header.hash(), block_annnounce, true);
 
 		// Poll until we have procssed the block announcement
 		block_on(poll_fn(|cx| loop {
@@ -2374,8 +2396,9 @@ mod test {
 	fn create_block_response(blocks: Vec<Block>) -> BlockResponse<Block> {
 		BlockResponse::<Block> {
 			id: 0,
-			blocks: blocks.into_iter().map(|b|
-				BlockData::<Block> {
+			blocks: blocks
+				.into_iter()
+				.map(|b| BlockData::<Block> {
 					hash: b.hash(),
 					header: Some(b.header().clone()),
 					body: Some(b.deconstruct().1),
@@ -2384,8 +2407,8 @@ mod test {
 					message_queue: None,
 					justification: None,
 					justifications: None,
-				}
-			).collect(),
+				})
+				.collect(),
 		}
 	}
 
@@ -2414,11 +2437,8 @@ mod test {
 	fn build_block(client: &mut Arc<TestClient>, at: Option<Hash>, fork: bool) -> Block {
 		let at = at.unwrap_or_else(|| client.info().best_hash);
 
-		let mut block_builder = client.new_block_at(
-			&BlockId::Hash(at),
-			Default::default(),
-			false,
-		).unwrap();
+		let mut block_builder =
+			client.new_block_at(&BlockId::Hash(at), Default::default(), false).unwrap();
 
 		if fork {
 			block_builder.push_storage_change(vec![1, 2, 3], Some(vec![4, 5, 6])).unwrap();
@@ -2450,15 +2470,16 @@ mod test {
 			client.clone(),
 			Box::new(DefaultBlockAnnounceValidator),
 			5,
-		).unwrap();
+		)
+		.unwrap();
 
 		let peer_id1 = PeerId::random();
 		let peer_id2 = PeerId::random();
 
 		let mut client2 = client.clone();
 		let mut build_block_at = |at, import| {
-			let mut block_builder = client2.new_block_at(&BlockId::Hash(at), Default::default(), false)
-				.unwrap();
+			let mut block_builder =
+				client2.new_block_at(&BlockId::Hash(at), Default::default(), false).unwrap();
 			// Make sure we generate a different block as fork
 			block_builder.push_storage_change(vec![1, 2, 3], Some(vec![4, 5, 6])).unwrap();
 
@@ -2517,13 +2538,11 @@ mod test {
 
 		let response = create_block_response(vec![block2.clone()]);
 		let res = sync.on_block_data(&peer_id1, Some(request2), response).unwrap();
-		assert!(
-			matches!(
-				res,
-				OnBlockData::Import(_, blocks)
-					if blocks.iter().all(|b| [2, 3, 4].contains(b.header.as_ref().unwrap().number()))
-			)
-		);
+		assert!(matches!(
+			res,
+			OnBlockData::Import(_, blocks)
+				if blocks.iter().all(|b| [2, 3, 4].contains(b.header.as_ref().unwrap().number()))
+		));
 
 		let response = create_block_response(vec![block2.clone()]);
 		let res = sync.on_block_data(&peer_id2, Some(request3), response).unwrap();
@@ -2552,7 +2571,9 @@ mod test {
 
 		let blocks = {
 			let mut client = Arc::new(TestClientBuilder::new().build());
-			(0..MAX_DOWNLOAD_AHEAD * 2).map(|_| build_block(&mut client, None, false)).collect::<Vec<_>>()
+			(0..MAX_DOWNLOAD_AHEAD * 2)
+				.map(|_| build_block(&mut client, None, false))
+				.collect::<Vec<_>>()
 		};
 
 		let mut client = Arc::new(TestClientBuilder::new().build());
@@ -2563,14 +2584,16 @@ mod test {
 			client.clone(),
 			Box::new(DefaultBlockAnnounceValidator),
 			5,
-		).unwrap();
+		)
+		.unwrap();
 
 		let peer_id1 = PeerId::random();
 		let peer_id2 = PeerId::random();
 
 		let best_block = blocks.last().unwrap().clone();
 		// Connect the node we will sync from
-		sync.new_peer(peer_id1.clone(), best_block.hash(), *best_block.header().number()).unwrap();
+		sync.new_peer(peer_id1.clone(), best_block.hash(), *best_block.header().number())
+			.unwrap();
 		sync.new_peer(peer_id2.clone(), info.best_hash, 0).unwrap();
 
 		let mut best_block_num = 0;
@@ -2590,18 +2613,17 @@ mod test {
 			let response = create_block_response(resp_blocks.clone());
 
 			let res = sync.on_block_data(&peer_id1, Some(request), response).unwrap();
-			assert!(
-				matches!(
-					res,
-					OnBlockData::Import(_, blocks) if blocks.len() == MAX_BLOCKS_TO_REQUEST
-				),
-			);
+			assert!(matches!(
+				res,
+				OnBlockData::Import(_, blocks) if blocks.len() == MAX_BLOCKS_TO_REQUEST
+			),);
 
 			best_block_num += MAX_BLOCKS_TO_REQUEST as u32;
 
-			resp_blocks.into_iter()
-					.rev()
-					.for_each(|b| block_on(client.import_as_final(BlockOrigin::Own, b)).unwrap());
+			resp_blocks
+				.into_iter()
+				.rev()
+				.for_each(|b| block_on(client.import_as_final(BlockOrigin::Own, b)).unwrap());
 		}
 
 		// "Wait" for the queue to clear
@@ -2627,12 +2649,10 @@ mod test {
 
 		let response = create_block_response(vec![blocks[(best_block_num - 1) as usize].clone()]);
 		let res = sync.on_block_data(&peer_id2, Some(peer2_req), response).unwrap();
-		assert!(
-			matches!(
-				res,
-				OnBlockData::Import(_, blocks) if blocks.is_empty()
-			),
-		);
+		assert!(matches!(
+			res,
+			OnBlockData::Import(_, blocks) if blocks.is_empty()
+		),);
 
 		let peer1_from = unwrap_from_block_number(peer1_req.unwrap().from);
 
@@ -2671,10 +2691,13 @@ mod test {
 				.cloned()
 				.collect::<Vec<_>>();
 
-				fork_blocks.into_iter().chain(
+			fork_blocks
+				.into_iter()
+				.chain(
 					(0..MAX_BLOCKS_TO_LOOK_BACKWARDS * 2 + 1)
-						.map(|_| build_block(&mut client, None, true))
-				).collect::<Vec<_>>()
+						.map(|_| build_block(&mut client, None, true)),
+				)
+				.collect::<Vec<_>>()
 		};
 
 		let info = client.info();
@@ -2684,27 +2707,27 @@ mod test {
 			client.clone(),
 			Box::new(DefaultBlockAnnounceValidator),
 			5,
-		).unwrap();
+		)
+		.unwrap();
 
 		let finalized_block = blocks[MAX_BLOCKS_TO_LOOK_BACKWARDS as usize * 2 - 1].clone();
 		let just = (*b"TEST", Vec::new());
-		client.finalize_block(BlockId::Hash(finalized_block.hash()), Some(just)).unwrap();
+		client
+			.finalize_block(BlockId::Hash(finalized_block.hash()), Some(just))
+			.unwrap();
 		sync.update_chain_info(&info.best_hash, info.best_number);
 
 		let peer_id1 = PeerId::random();
 
 		let common_block = blocks[MAX_BLOCKS_TO_LOOK_BACKWARDS as usize / 2].clone();
 		// Connect the node we will sync from
-		sync.new_peer(peer_id1.clone(), common_block.hash(), *common_block.header().number()).unwrap();
+		sync.new_peer(peer_id1.clone(), common_block.hash(), *common_block.header().number())
+			.unwrap();
 
 		send_block_announce(fork_blocks.last().unwrap().header().clone(), &peer_id1, &mut sync);
 
-		let mut request = get_block_request(
-			&mut sync,
-			FromBlock::Number(info.best_number),
-			1,
-			&peer_id1,
-		);
+		let mut request =
+			get_block_request(&mut sync, FromBlock::Number(info.best_number), 1, &peer_id1);
 
 		// Do the ancestor search
 		loop {
@@ -2739,36 +2762,34 @@ mod test {
 			let response = create_block_response(resp_blocks.clone());
 
 			let res = sync.on_block_data(&peer_id1, Some(request), response).unwrap();
-			assert!(
-				matches!(
-					res,
-					OnBlockData::Import(_, blocks) if blocks.len() == MAX_BLOCKS_TO_REQUEST
-				),
-			);
+			assert!(matches!(
+				res,
+				OnBlockData::Import(_, blocks) if blocks.len() == MAX_BLOCKS_TO_REQUEST
+			),);
 
 			best_block_num += MAX_BLOCKS_TO_REQUEST as u32;
 
 			let _ = sync.on_blocks_processed(
 				MAX_BLOCKS_TO_REQUEST as usize,
 				MAX_BLOCKS_TO_REQUEST as usize,
-				resp_blocks.iter()
+				resp_blocks
+					.iter()
 					.rev()
-					.map(|b|
+					.map(|b| {
 						(
-							Ok(
-								BlockImportResult::ImportedUnknown(
-									b.header().number().clone(),
-									Default::default(),
-									Some(peer_id1.clone()),
-								)
-							),
+							Ok(BlockImportResult::ImportedUnknown(
+								b.header().number().clone(),
+								Default::default(),
+								Some(peer_id1.clone()),
+							)),
 							b.hash(),
 						)
-					)
-					.collect()
+					})
+					.collect(),
 			);
 
-			resp_blocks.into_iter()
+			resp_blocks
+				.into_iter()
 				.rev()
 				.for_each(|b| block_on(client.import(BlockOrigin::Own, b)).unwrap());
 		}
@@ -2786,21 +2807,21 @@ mod test {
 	fn removes_target_fork_on_disconnect() {
 		sp_tracing::try_init_simple();
 		let mut client = Arc::new(TestClientBuilder::new().build());
-		let blocks = (0..3)
-			.map(|_| build_block(&mut client, None, false))
-			.collect::<Vec<_>>();
+		let blocks = (0..3).map(|_| build_block(&mut client, None, false)).collect::<Vec<_>>();
 
 		let mut sync = ChainSync::new(
 			SyncMode::Full,
 			client.clone(),
 			Box::new(DefaultBlockAnnounceValidator),
 			1,
-		).unwrap();
+		)
+		.unwrap();
 
 		let peer_id1 = PeerId::random();
 		let common_block = blocks[1].clone();
 		// Connect the node we will sync from
-		sync.new_peer(peer_id1.clone(), common_block.hash(), *common_block.header().number()).unwrap();
+		sync.new_peer(peer_id1.clone(), common_block.hash(), *common_block.header().number())
+			.unwrap();
 
 		// Create a "new" header and announce it
 		let mut header = blocks[0].header().clone();
diff --git a/client/network/src/protocol/sync/blocks.rs b/client/network/src/protocol/sync/blocks.rs
index 01b5f6016f8a..e93d0174b828 100644
--- a/client/network/src/protocol/sync/blocks.rs
+++ b/client/network/src/protocol/sync/blocks.rs
@@ -16,13 +16,15 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use std::cmp;
-use std::ops::Range;
-use std::collections::{HashMap, BTreeMap};
-use log::trace;
+use crate::protocol::message;
 use libp2p::PeerId;
+use log::trace;
 use sp_runtime::traits::{Block as BlockT, NumberFor, One};
-use crate::protocol::message;
+use std::{
+	cmp,
+	collections::{BTreeMap, HashMap},
+	ops::Range,
+};
 
 /// Block data with origin.
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -35,10 +37,7 @@ pub struct BlockData<B: BlockT> {
 
 #[derive(Debug)]
 enum BlockRangeState<B: BlockT> {
-	Downloading {
-		len: NumberFor<B>,
-		downloading: u32,
-	},
+	Downloading { len: NumberFor<B>, downloading: u32 },
 	Complete(Vec<BlockData<B>>),
 }
 
@@ -62,10 +61,7 @@ pub struct BlockCollection<B: BlockT> {
 impl<B: BlockT> BlockCollection<B> {
 	/// Create a new instance.
 	pub fn new() -> Self {
-		BlockCollection {
-			blocks: BTreeMap::new(),
-			peer_requests: HashMap::new(),
-		}
+		BlockCollection { blocks: BTreeMap::new(), peer_requests: HashMap::new() }
 	}
 
 	/// Clear everything.
@@ -77,7 +73,7 @@ impl<B: BlockT> BlockCollection<B> {
 	/// Insert a set of blocks into collection.
 	pub fn insert(&mut self, start: NumberFor<B>, blocks: Vec<message::BlockData<B>>, who: PeerId) {
 		if blocks.is_empty() {
-			return;
+			return
 		}
 
 		match self.blocks.get(&start) {
@@ -86,13 +82,20 @@ impl<B: BlockT> BlockCollection<B> {
 			},
 			Some(&BlockRangeState::Complete(ref existing)) if existing.len() >= blocks.len() => {
 				trace!(target: "sync", "Ignored block data already downloaded: {}", start);
-				return;
+				return
 			},
 			_ => (),
 		}
 
-		self.blocks.insert(start, BlockRangeState::Complete(blocks.into_iter()
-			.map(|b| BlockData { origin: Some(who.clone()), block: b }).collect()));
+		self.blocks.insert(
+			start,
+			BlockRangeState::Complete(
+				blocks
+					.into_iter()
+					.map(|b| BlockData { origin: Some(who.clone()), block: b })
+					.collect(),
+			),
+		);
 	}
 
 	/// Returns a set of block hashes that require a header download. The returned set is marked as being downloaded.
@@ -107,7 +110,7 @@ impl<B: BlockT> BlockCollection<B> {
 	) -> Option<Range<NumberFor<B>>> {
 		if peer_best <= common {
 			// Bail out early
-			return None;
+			return None
 		}
 		// First block number that we need to download
 		let first_different = common + <NumberFor<B>>::one();
@@ -120,15 +123,13 @@ impl<B: BlockT> BlockCollection<B> {
 				break match (prev, next) {
 					(Some((start, &BlockRangeState::Downloading { ref len, downloading })), _)
 						if downloading < max_parallel =>
-						(*start .. *start + *len, downloading),
+						(*start..*start + *len, downloading),
 					(Some((start, r)), Some((next_start, _))) if *start + r.len() < *next_start =>
-						(*start + r.len() .. cmp::min(*next_start, *start + r.len() + count), 0), // gap
-					(Some((start, r)), None) =>
-						(*start + r.len() .. *start + r.len() + count, 0), // last range
-					(None, None) =>
-						(first_different .. first_different + count, 0), // empty
+						(*start + r.len()..cmp::min(*next_start, *start + r.len() + count), 0), // gap
+					(Some((start, r)), None) => (*start + r.len()..*start + r.len() + count, 0), /* last range */
+					(None, None) => (first_different..first_different + count, 0),               /* empty */
 					(None, Some((start, _))) if *start > first_different =>
-						(first_different .. cmp::min(first_different + count, *start), 0), // gap at the start
+						(first_different..cmp::min(first_different + count, *start), 0), /* gap at the start */
 					_ => {
 						prev = next;
 						continue
@@ -139,23 +140,33 @@ impl<B: BlockT> BlockCollection<B> {
 		// crop to peers best
 		if range.start > peer_best {
 			trace!(target: "sync", "Out of range for peer {} ({} vs {})", who, range.start, peer_best);
-			return None;
+			return None
 		}
 		range.end = cmp::min(peer_best + One::one(), range.end);
 
-		if self.blocks.iter().next().map_or(false, |(n, _)| range.start > *n + max_ahead.into()) {
+		if self
+			.blocks
+			.iter()
+			.next()
+			.map_or(false, |(n, _)| range.start > *n + max_ahead.into())
+		{
 			trace!(target: "sync", "Too far ahead for peer {} ({})", who, range.start);
-			return None;
+			return None
 		}
 
 		self.peer_requests.insert(who, range.start);
-		self.blocks.insert(range.start, BlockRangeState::Downloading {
-			len: range.end - range.start,
-			downloading: downloading + 1
-		});
+		self.blocks.insert(
+			range.start,
+			BlockRangeState::Downloading {
+				len: range.end - range.start,
+				downloading: downloading + 1,
+			},
+		);
 		if range.end <= range.start {
-			panic!("Empty range {:?}, count={}, peer_best={}, common={}, blocks={:?}",
-				range, count, peer_best, common, self.blocks);
+			panic!(
+				"Empty range {:?}, count={}, peer_best={}, common={}, blocks={:?}",
+				range, count, peer_best, common, self.blocks
+			);
 		}
 		Some(range)
 	}
@@ -188,16 +199,14 @@ impl<B: BlockT> BlockCollection<B> {
 	pub fn clear_peer_download(&mut self, who: &PeerId) {
 		if let Some(start) = self.peer_requests.remove(who) {
 			let remove = match self.blocks.get_mut(&start) {
-				Some(&mut BlockRangeState::Downloading { ref mut downloading, .. }) if *downloading > 1 => {
+				Some(&mut BlockRangeState::Downloading { ref mut downloading, .. })
+					if *downloading > 1 =>
+				{
 					*downloading -= 1;
 					false
-				},
-				Some(&mut BlockRangeState::Downloading { .. }) => {
-					true
-				},
-				_ => {
-					false
 				}
+				Some(&mut BlockRangeState::Downloading { .. }) => true,
+				_ => false,
 			};
 			if remove {
 				self.blocks.remove(&start);
@@ -210,27 +219,28 @@ impl<B: BlockT> BlockCollection<B> {
 mod test {
 	use super::{BlockCollection, BlockData, BlockRangeState};
 	use crate::{protocol::message, PeerId};
-	use sp_runtime::testing::{Block as RawBlock, ExtrinsicWrapper};
 	use sp_core::H256;
+	use sp_runtime::testing::{Block as RawBlock, ExtrinsicWrapper};
 
 	type Block = RawBlock<ExtrinsicWrapper<u64>>;
 
 	fn is_empty(bc: &BlockCollection<Block>) -> bool {
-		bc.blocks.is_empty() &&
-		bc.peer_requests.is_empty()
+		bc.blocks.is_empty() && bc.peer_requests.is_empty()
 	}
 
 	fn generate_blocks(n: usize) -> Vec<message::BlockData<Block>> {
-		(0 .. n).map(|_| message::generic::BlockData {
-			hash: H256::random(),
-			header: None,
-			body: None,
-			indexed_body: None,
-			message_queue: None,
-			receipt: None,
-			justification: None,
-			justifications: None,
-		}).collect()
+		(0..n)
+			.map(|_| message::generic::BlockData {
+				hash: H256::random(),
+				header: None,
+				body: None,
+				indexed_body: None,
+				message_queue: None,
+				receipt: None,
+				justification: None,
+				justifications: None,
+			})
+			.collect()
 	}
 
 	#[test]
@@ -252,32 +262,47 @@ mod test {
 		let peer2 = PeerId::random();
 
 		let blocks = generate_blocks(150);
-		assert_eq!(bc.needed_blocks(peer0.clone(), 40, 150, 0, 1, 200), Some(1 .. 41));
-		assert_eq!(bc.needed_blocks(peer1.clone(), 40, 150, 0, 1, 200), Some(41 .. 81));
-		assert_eq!(bc.needed_blocks(peer2.clone(), 40, 150, 0, 1, 200), Some(81 .. 121));
+		assert_eq!(bc.needed_blocks(peer0.clone(), 40, 150, 0, 1, 200), Some(1..41));
+		assert_eq!(bc.needed_blocks(peer1.clone(), 40, 150, 0, 1, 200), Some(41..81));
+		assert_eq!(bc.needed_blocks(peer2.clone(), 40, 150, 0, 1, 200), Some(81..121));
 
 		bc.clear_peer_download(&peer1);
 		bc.insert(41, blocks[41..81].to_vec(), peer1.clone());
 		assert_eq!(bc.drain(1), vec![]);
-		assert_eq!(bc.needed_blocks(peer1.clone(), 40, 150, 0, 1, 200), Some(121 .. 151));
+		assert_eq!(bc.needed_blocks(peer1.clone(), 40, 150, 0, 1, 200), Some(121..151));
 		bc.clear_peer_download(&peer0);
 		bc.insert(1, blocks[1..11].to_vec(), peer0.clone());
 
-		assert_eq!(bc.needed_blocks(peer0.clone(), 40, 150, 0, 1, 200), Some(11 .. 41));
-		assert_eq!(bc.drain(1), blocks[1..11].iter()
-			.map(|b| BlockData { block: b.clone(), origin: Some(peer0.clone()) }).collect::<Vec<_>>());
+		assert_eq!(bc.needed_blocks(peer0.clone(), 40, 150, 0, 1, 200), Some(11..41));
+		assert_eq!(
+			bc.drain(1),
+			blocks[1..11]
+				.iter()
+				.map(|b| BlockData { block: b.clone(), origin: Some(peer0.clone()) })
+				.collect::<Vec<_>>()
+		);
 
 		bc.clear_peer_download(&peer0);
 		bc.insert(11, blocks[11..41].to_vec(), peer0.clone());
 
 		let drained = bc.drain(12);
-		assert_eq!(drained[..30], blocks[11..41].iter()
-			.map(|b| BlockData { block: b.clone(), origin: Some(peer0.clone()) }).collect::<Vec<_>>()[..]);
-		assert_eq!(drained[30..], blocks[41..81].iter()
-			.map(|b| BlockData { block: b.clone(), origin: Some(peer1.clone()) }).collect::<Vec<_>>()[..]);
+		assert_eq!(
+			drained[..30],
+			blocks[11..41]
+				.iter()
+				.map(|b| BlockData { block: b.clone(), origin: Some(peer0.clone()) })
+				.collect::<Vec<_>>()[..]
+		);
+		assert_eq!(
+			drained[30..],
+			blocks[41..81]
+				.iter()
+				.map(|b| BlockData { block: b.clone(), origin: Some(peer1.clone()) })
+				.collect::<Vec<_>>()[..]
+		);
 
 		bc.clear_peer_download(&peer2);
-		assert_eq!(bc.needed_blocks(peer2.clone(), 40, 150, 80, 1, 200), Some(81 .. 121));
+		assert_eq!(bc.needed_blocks(peer2.clone(), 40, 150, 80, 1, 200), Some(81..121));
 		bc.clear_peer_download(&peer2);
 		bc.insert(81, blocks[81..121].to_vec(), peer2.clone());
 		bc.clear_peer_download(&peer1);
@@ -285,25 +310,38 @@ mod test {
 
 		assert_eq!(bc.drain(80), vec![]);
 		let drained = bc.drain(81);
-		assert_eq!(drained[..40], blocks[81..121].iter()
-			.map(|b| BlockData { block: b.clone(), origin: Some(peer2.clone()) }).collect::<Vec<_>>()[..]);
-		assert_eq!(drained[40..], blocks[121..150].iter()
-			.map(|b| BlockData { block: b.clone(), origin: Some(peer1.clone()) }).collect::<Vec<_>>()[..]);
+		assert_eq!(
+			drained[..40],
+			blocks[81..121]
+				.iter()
+				.map(|b| BlockData { block: b.clone(), origin: Some(peer2.clone()) })
+				.collect::<Vec<_>>()[..]
+		);
+		assert_eq!(
+			drained[40..],
+			blocks[121..150]
+				.iter()
+				.map(|b| BlockData { block: b.clone(), origin: Some(peer1.clone()) })
+				.collect::<Vec<_>>()[..]
+		);
 	}
 
 	#[test]
 	fn large_gap() {
 		let mut bc: BlockCollection<Block> = BlockCollection::new();
-		bc.blocks.insert(100, BlockRangeState::Downloading {
-			len: 128,
-			downloading: 1,
-		});
-		let blocks = generate_blocks(10).into_iter().map(|b| BlockData { block: b, origin: None }).collect();
+		bc.blocks.insert(100, BlockRangeState::Downloading { len: 128, downloading: 1 });
+		let blocks = generate_blocks(10)
+			.into_iter()
+			.map(|b| BlockData { block: b, origin: None })
+			.collect();
 		bc.blocks.insert(114305, BlockRangeState::Complete(blocks));
 
 		let peer0 = PeerId::random();
-		assert_eq!(bc.needed_blocks(peer0.clone(), 128, 10000, 000, 1, 200), Some(1 .. 100));
+		assert_eq!(bc.needed_blocks(peer0.clone(), 128, 10000, 000, 1, 200), Some(1..100));
 		assert_eq!(bc.needed_blocks(peer0.clone(), 128, 10000, 600, 1, 200), None); // too far ahead
-		assert_eq!(bc.needed_blocks(peer0.clone(), 128, 10000, 600, 1, 200000), Some(100 + 128 .. 100 + 128 + 128));
+		assert_eq!(
+			bc.needed_blocks(peer0.clone(), 128, 10000, 600, 1, 200000),
+			Some(100 + 128..100 + 128 + 128)
+		);
 	}
 }
diff --git a/client/network/src/protocol/sync/extra_requests.rs b/client/network/src/protocol/sync/extra_requests.rs
index 3de79b3f4873..52419b5d7702 100644
--- a/client/network/src/protocol/sync/extra_requests.rs
+++ b/client/network/src/protocol/sync/extra_requests.rs
@@ -16,14 +16,16 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use sp_blockchain::Error as ClientError;
 use crate::protocol::sync::{PeerSync, PeerSyncState};
 use fork_tree::ForkTree;
 use libp2p::PeerId;
 use log::{debug, trace, warn};
+use sp_blockchain::Error as ClientError;
 use sp_runtime::traits::{Block as BlockT, NumberFor, Zero};
-use std::collections::{HashMap, HashSet, VecDeque};
-use std::time::Duration;
+use std::{
+	collections::{HashMap, HashSet, VecDeque},
+	time::Duration,
+};
 use wasm_timer::Instant;
 
 // Time to wait before trying to get the same extra data from the same peer.
@@ -61,7 +63,7 @@ pub(crate) struct Metrics {
 	pub(crate) active_requests: u32,
 	pub(crate) importing_requests: u32,
 	pub(crate) failed_requests: u32,
-	_priv: ()
+	_priv: (),
 }
 
 impl<B: BlockT> ExtraRequests<B> {
@@ -93,13 +95,14 @@ impl<B: BlockT> ExtraRequests<B> {
 
 	/// Queue an extra data request to be considered by the `Matcher`.
 	pub(crate) fn schedule<F>(&mut self, request: ExtraRequest<B>, is_descendent_of: F)
-		where F: Fn(&B::Hash, &B::Hash) -> Result<bool, ClientError>
+	where
+		F: Fn(&B::Hash, &B::Hash) -> Result<bool, ClientError>,
 	{
 		match self.tree.import(request.0, request.1, (), &is_descendent_of) {
 			Ok(true) => {
 				// this is a new root so we add it to the current `pending_requests`
 				self.pending_requests.push_back((request.0, request.1));
-			}
+			},
 			Err(fork_tree::Error::Revert) => {
 				// we have finalized further than the given request, presumably
 				// by some other part of the system (not sync). we can safely
@@ -107,8 +110,8 @@ impl<B: BlockT> ExtraRequests<B> {
 			},
 			Err(err) => {
 				debug!(target: "sync", "Failed to insert request {:?} into tree: {:?}", request, err);
-			}
-			_ => ()
+			},
+			_ => (),
 		}
 	}
 
@@ -120,7 +123,11 @@ impl<B: BlockT> ExtraRequests<B> {
 	}
 
 	/// Processes the response for the request previously sent to the given peer.
-	pub(crate) fn on_response<R>(&mut self, who: PeerId, resp: Option<R>) -> Option<(PeerId, B::Hash, NumberFor<B>, R)> {
+	pub(crate) fn on_response<R>(
+		&mut self,
+		who: PeerId,
+		resp: Option<R>,
+	) -> Option<(PeerId, B::Hash, NumberFor<B>, R)> {
 		// we assume that the request maps to the given response, this is
 		// currently enforced by the outer network protocol before passing on
 		// messages to chain sync.
@@ -157,9 +164,10 @@ impl<B: BlockT> ExtraRequests<B> {
 		&mut self,
 		best_finalized_hash: &B::Hash,
 		best_finalized_number: NumberFor<B>,
-		is_descendent_of: F
+		is_descendent_of: F,
 	) -> Result<(), fork_tree::Error<ClientError>>
-		where F: Fn(&B::Hash, &B::Hash) -> Result<bool, ClientError>
+	where
+		F: Fn(&B::Hash, &B::Hash) -> Result<bool, ClientError>,
 	{
 		let request = (*best_finalized_hash, best_finalized_number);
 
@@ -203,9 +211,8 @@ impl<B: BlockT> ExtraRequests<B> {
 		&mut self,
 		request: ExtraRequest<B>,
 		result: Result<ExtraRequest<B>, E>,
-		reschedule_on_failure: bool
-	) -> bool
-	{
+		reschedule_on_failure: bool,
+	) -> bool {
 		if !self.importing_requests.remove(&request) {
 			return false
 		}
@@ -217,7 +224,7 @@ impl<B: BlockT> ExtraRequests<B> {
 					self.pending_requests.push_front(request);
 				}
 				return true
-			}
+			},
 		};
 
 		if self.tree.finalize_root(&finalized_hash).is_none() {
@@ -258,7 +265,7 @@ impl<B: BlockT> ExtraRequests<B> {
 			active_requests: self.active_requests.len().try_into().unwrap_or(std::u32::MAX),
 			failed_requests: self.failed_requests.len().try_into().unwrap_or(std::u32::MAX),
 			importing_requests: self.importing_requests.len().try_into().unwrap_or(std::u32::MAX),
-			_priv: ()
+			_priv: (),
 		}
 	}
 }
@@ -269,15 +276,12 @@ pub(crate) struct Matcher<'a, B: BlockT> {
 	/// Length of pending requests collection.
 	/// Used to ensure we do not loop more than once over all pending requests.
 	remaining: usize,
-	extras: &'a mut ExtraRequests<B>
+	extras: &'a mut ExtraRequests<B>,
 }
 
 impl<'a, B: BlockT> Matcher<'a, B> {
 	fn new(extras: &'a mut ExtraRequests<B>) -> Self {
-		Matcher {
-			remaining: extras.pending_requests.len(),
-			extras
-		}
+		Matcher { remaining: extras.pending_requests.len(), extras }
 	}
 
 	/// Finds a peer to which a pending request can be sent.
@@ -294,7 +298,10 @@ impl<'a, B: BlockT> Matcher<'a, B> {
 	///
 	/// The returned `PeerId` (if any) is guaranteed to come from the given `peers`
 	/// argument.
-	pub(crate) fn next(&mut self, peers: &HashMap<PeerId, PeerSync<B>>) -> Option<(PeerId, ExtraRequest<B>)> {
+	pub(crate) fn next(
+		&mut self,
+		peers: &HashMap<PeerId, PeerSync<B>>,
+	) -> Option<(PeerId, ExtraRequest<B>)> {
 		if self.remaining == 0 {
 			return None
 		}
@@ -305,7 +312,9 @@ impl<'a, B: BlockT> Matcher<'a, B> {
 		}
 
 		while let Some(request) = self.extras.pending_requests.pop_front() {
-			for (peer, sync) in peers.iter().filter(|(_, sync)| sync.state == PeerSyncState::Available) {
+			for (peer, sync) in
+				peers.iter().filter(|(_, sync)| sync.state == PeerSyncState::Available)
+			{
 				// only ask peers that have synced at least up to the block number that we're asking the extra for
 				if sync.best_number < request.1 {
 					continue
@@ -315,7 +324,13 @@ impl<'a, B: BlockT> Matcher<'a, B> {
 					continue
 				}
 				// only ask if the same request has not failed for this peer before
-				if self.extras.failed_requests.get(&request).map(|rr| rr.iter().any(|i| &i.0 == peer)).unwrap_or(false) {
+				if self
+					.extras
+					.failed_requests
+					.get(&request)
+					.map(|rr| rr.iter().any(|i| &i.0 == peer))
+					.unwrap_or(false)
+				{
 					continue
 				}
 				self.extras.active_requests.insert(peer.clone(), request);
@@ -343,22 +358,22 @@ impl<'a, B: BlockT> Matcher<'a, B> {
 
 #[cfg(test)]
 mod tests {
+	use super::*;
 	use crate::protocol::sync::PeerSync;
-	use sp_blockchain::Error as ClientError;
 	use quickcheck::{Arbitrary, Gen, QuickCheck};
-	use std::collections::{HashMap, HashSet};
-	use super::*;
+	use sp_blockchain::Error as ClientError;
 	use sp_test_primitives::{Block, BlockNumber, Hash};
+	use std::collections::{HashMap, HashSet};
 
 	#[test]
 	fn requests_are_processed_in_order() {
 		fn property(mut peers: ArbitraryPeers) {
 			let mut requests = ExtraRequests::<Block>::new("test");
 
-			let num_peers_available = peers.0.values()
-				.filter(|s| s.state == PeerSyncState::Available).count();
+			let num_peers_available =
+				peers.0.values().filter(|s| s.state == PeerSyncState::Available).count();
 
-			for i in 0 .. num_peers_available {
+			for i in 0..num_peers_available {
 				requests.schedule((Hash::random(), i as u64), |a, b| Ok(a[0] >= b[0]))
 			}
 
@@ -368,12 +383,12 @@ mod tests {
 			for p in &pending {
 				let (peer, r) = m.next(&peers.0).unwrap();
 				assert_eq!(p, &r);
-				peers.0.get_mut(&peer).unwrap().state = PeerSyncState::DownloadingJustification(r.0);
+				peers.0.get_mut(&peer).unwrap().state =
+					PeerSyncState::DownloadingJustification(r.0);
 			}
 		}
 
-		QuickCheck::new()
-			.quickcheck(property as fn(ArbitraryPeers))
+		QuickCheck::new().quickcheck(property as fn(ArbitraryPeers))
 	}
 
 	#[test]
@@ -398,22 +413,24 @@ mod tests {
 		fn property(mut peers: ArbitraryPeers) -> bool {
 			let mut requests = ExtraRequests::<Block>::new("test");
 
-			let num_peers_available = peers.0.values()
-				.filter(|s| s.state == PeerSyncState::Available).count();
+			let num_peers_available =
+				peers.0.values().filter(|s| s.state == PeerSyncState::Available).count();
 
-			for i in 0 .. num_peers_available {
+			for i in 0..num_peers_available {
 				requests.schedule((Hash::random(), i as u64), |a, b| Ok(a[0] >= b[0]))
 			}
 
 			let mut m = requests.matcher();
 			while let Some((peer, r)) = m.next(&peers.0) {
-				peers.0.get_mut(&peer).unwrap().state = PeerSyncState::DownloadingJustification(r.0);
+				peers.0.get_mut(&peer).unwrap().state =
+					PeerSyncState::DownloadingJustification(r.0);
 			}
 
 			assert!(requests.pending_requests.is_empty());
 
 			let active_peers = requests.active_requests.keys().cloned().collect::<Vec<_>>();
-			let previously_active = requests.active_requests.values().cloned().collect::<HashSet<_>>();
+			let previously_active =
+				requests.active_requests.values().cloned().collect::<HashSet<_>>();
 
 			for peer in &active_peers {
 				requests.peer_disconnected(peer)
@@ -424,8 +441,7 @@ mod tests {
 			previously_active == requests.pending_requests.iter().cloned().collect::<HashSet<_>>()
 		}
 
-		QuickCheck::new()
-			.quickcheck(property as fn(ArbitraryPeers) -> bool)
+		QuickCheck::new().quickcheck(property as fn(ArbitraryPeers) -> bool)
 	}
 
 	#[test]
@@ -433,31 +449,44 @@ mod tests {
 		fn property(mut peers: ArbitraryPeers) {
 			let mut requests = ExtraRequests::<Block>::new("test");
 
-			let num_peers_available = peers.0.values()
-				.filter(|s| s.state == PeerSyncState::Available).count();
+			let num_peers_available =
+				peers.0.values().filter(|s| s.state == PeerSyncState::Available).count();
 
-			for i in 0 .. num_peers_available {
+			for i in 0..num_peers_available {
 				requests.schedule((Hash::random(), i as u64), |a, b| Ok(a[0] >= b[0]))
 			}
 
 			let mut m = requests.matcher();
 			while let Some((peer, r)) = m.next(&peers.0) {
-				peers.0.get_mut(&peer).unwrap().state = PeerSyncState::DownloadingJustification(r.0);
+				peers.0.get_mut(&peer).unwrap().state =
+					PeerSyncState::DownloadingJustification(r.0);
 			}
 
-			let active = requests.active_requests.iter().map(|(p, &r)| (p.clone(), r)).collect::<Vec<_>>();
+			let active = requests
+				.active_requests
+				.iter()
+				.map(|(p, &r)| (p.clone(), r))
+				.collect::<Vec<_>>();
 
 			for (peer, req) in &active {
 				assert!(requests.failed_requests.get(req).is_none());
 				assert!(!requests.pending_requests.contains(req));
 				assert!(requests.on_response::<()>(peer.clone(), None).is_none());
 				assert!(requests.pending_requests.contains(req));
-				assert_eq!(1, requests.failed_requests.get(req).unwrap().iter().filter(|(p, _)| p == peer).count())
+				assert_eq!(
+					1,
+					requests
+						.failed_requests
+						.get(req)
+						.unwrap()
+						.iter()
+						.filter(|(p, _)| p == peer)
+						.count()
+				)
 			}
 		}
 
-		QuickCheck::new()
-			.quickcheck(property as fn(ArbitraryPeers))
+		QuickCheck::new().quickcheck(property as fn(ArbitraryPeers))
 	}
 
 	#[test]
@@ -497,7 +526,10 @@ mod tests {
 		finality_proofs.try_finalize_root::<()>((hash6, 6), Ok((hash7, 7)), true);
 
 		// ensure that there's no request for #6
-		assert_eq!(finality_proofs.pending_requests.iter().collect::<Vec<_>>(), Vec::<&(Hash, u64)>::new());
+		assert_eq!(
+			finality_proofs.pending_requests.iter().collect::<Vec<_>>(),
+			Vec::<&(Hash, u64)>::new()
+		);
 	}
 
 	#[test]
@@ -560,7 +592,7 @@ mod tests {
 	impl Arbitrary for ArbitraryPeers {
 		fn arbitrary(g: &mut Gen) -> Self {
 			let mut peers = HashMap::with_capacity(g.size());
-			for _ in 0 .. g.size() {
+			for _ in 0..g.size() {
 				let ps = ArbitraryPeerSync::arbitrary(g).0;
 				peers.insert(ps.peer_id.clone(), ps);
 			}
diff --git a/client/network/src/protocol/sync/state.rs b/client/network/src/protocol/sync/state.rs
index fc9dfdbb8c37..73e4eac1f5bc 100644
--- a/client/network/src/protocol/sync/state.rs
+++ b/client/network/src/protocol/sync/state.rs
@@ -16,13 +16,15 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use std::sync::Arc;
-use codec::{Encode, Decode};
-use sp_runtime::traits::{Block as BlockT, Header, NumberFor};
-use sc_client_api::StorageProof;
-use crate::schema::v1::{StateRequest, StateResponse, StateEntry};
-use crate::chain::{Client, ImportedState};
 use super::StateDownloadProgress;
+use crate::{
+	chain::{Client, ImportedState},
+	schema::v1::{StateEntry, StateRequest, StateResponse},
+};
+use codec::{Decode, Encode};
+use sc_client_api::StorageProof;
+use sp_runtime::traits::{Block as BlockT, Header, NumberFor};
+use std::sync::Arc;
 
 /// State sync support.
 
@@ -73,14 +75,14 @@ impl<B: BlockT> StateSync<B> {
 				target: "sync",
 				"Bad state response",
 			);
-			return ImportResult::BadResponse;
+			return ImportResult::BadResponse
 		}
 		if !self.skip_proof && response.proof.is_empty() {
 			log::debug!(
 				target: "sync",
 				"Missing proof",
 			);
-			return ImportResult::BadResponse;
+			return ImportResult::BadResponse
 		}
 		let complete = if !self.skip_proof {
 			log::debug!(
@@ -93,24 +95,21 @@ impl<B: BlockT> StateSync<B> {
 				Ok(proof) => proof,
 				Err(e) => {
 					log::debug!(target: "sync", "Error decoding proof: {:?}", e);
-					return ImportResult::BadResponse;
-				}
-			};
-			let (values, complete) = match self.client.verify_range_proof(
-				self.target_root,
-				proof,
-				&self.last_key
-			) {
-				Err(e) => {
-					log::debug!(
-						target: "sync",
-						"StateResponse failed proof verification: {:?}",
-						e,
-					);
-					return ImportResult::BadResponse;
+					return ImportResult::BadResponse
 				},
-				Ok(values) => values,
 			};
+			let (values, complete) =
+				match self.client.verify_range_proof(self.target_root, proof, &self.last_key) {
+					Err(e) => {
+						log::debug!(
+							target: "sync",
+							"StateResponse failed proof verification: {:?}",
+							e,
+						);
+						return ImportResult::BadResponse
+					},
+					Ok(values) => values,
+				};
 			log::debug!(target: "sync", "Imported with {} keys", values.len());
 
 			if let Some(last) = values.last().map(|(k, _)| k) {
@@ -120,7 +119,7 @@ impl<B: BlockT> StateSync<B> {
 			for (key, value) in values {
 				self.imported_bytes += key.len() as u64;
 				self.state.push((key, value))
-			};
+			}
 			self.imported_bytes += proof_size;
 			complete
 		} else {
@@ -142,10 +141,14 @@ impl<B: BlockT> StateSync<B> {
 		};
 		if complete {
 			self.complete = true;
-			ImportResult::Import(self.target_block.clone(), self.target_header.clone(), ImportedState {
-				block: self.target_block.clone(),
-				state: std::mem::take(&mut self.state)
-			})
+			ImportResult::Import(
+				self.target_block.clone(),
+				self.target_header.clone(),
+				ImportedState {
+					block: self.target_block.clone(),
+					state: std::mem::take(&mut self.state),
+				},
+			)
 		} else {
 			ImportResult::Continue(self.next_request())
 		}
@@ -178,10 +181,6 @@ impl<B: BlockT> StateSync<B> {
 	/// Returns state sync estimated progress.
 	pub fn progress(&self) -> StateDownloadProgress {
 		let percent_done = (*self.last_key.get(0).unwrap_or(&0u8) as u32) * 100 / 256;
-		StateDownloadProgress {
-			percentage: percent_done,
-			size: self.imported_bytes,
-		}
+		StateDownloadProgress { percentage: percent_done, size: self.imported_bytes }
 	}
 }
-
diff --git a/client/network/src/request_responses.rs b/client/network/src/request_responses.rs
index 20469e143d41..226e1c546d6c 100644
--- a/client/network/src/request_responses.rs
+++ b/client/network/src/request_responses.rs
@@ -33,17 +33,20 @@
 //!
 //! - If provided, a ["requests processing"](ProtocolConfig::inbound_queue) channel
 //! is used to handle incoming requests.
-//!
 
-use futures::{channel::{mpsc, oneshot}, prelude::*};
+use crate::ReputationChange;
+use futures::{
+	channel::{mpsc, oneshot},
+	prelude::*,
+};
 use libp2p::{
 	core::{
 		connection::{ConnectionId, ListenerId},
 		ConnectedPoint, Multiaddr, PeerId,
 	},
 	request_response::{
-		RequestResponse, RequestResponseCodec, RequestResponseConfig, RequestResponseEvent,
-		RequestResponseMessage, ResponseChannel, ProtocolSupport
+		ProtocolSupport, RequestResponse, RequestResponseCodec, RequestResponseConfig,
+		RequestResponseEvent, RequestResponseMessage, ResponseChannel,
 	},
 	swarm::{
 		protocols_handler::multi::MultiHandler, NetworkBehaviour, NetworkBehaviourAction,
@@ -51,58 +54,62 @@ use libp2p::{
 	},
 };
 use std::{
-	borrow::Cow, collections::{hash_map::Entry, HashMap}, convert::TryFrom as _, io, iter,
-	pin::Pin, task::{Context, Poll}, time::Duration,
+	borrow::Cow,
+	collections::{hash_map::Entry, HashMap},
+	convert::TryFrom as _,
+	io, iter,
+	pin::Pin,
+	task::{Context, Poll},
+	time::Duration,
 };
 use wasm_timer::Instant;
-use crate::ReputationChange;
 
 pub use libp2p::request_response::{InboundFailure, OutboundFailure, RequestId};
 
 /// Configuration for a single request-response protocol.
 #[derive(Debug, Clone)]
 pub struct ProtocolConfig {
-    /// Name of the protocol on the wire. Should be something like `/foo/bar`.
-    pub name: Cow<'static, str>,
-
-    /// Maximum allowed size, in bytes, of a request.
-    ///
-    /// Any request larger than this value will be declined as a way to avoid allocating too
-    /// much memory for it.
-    pub max_request_size: u64,
-
-    /// Maximum allowed size, in bytes, of a response.
-    ///
-    /// Any response larger than this value will be declined as a way to avoid allocating too
-    /// much memory for it.
-    pub max_response_size: u64,
-
-    /// Duration after which emitted requests are considered timed out.
-    ///
-    /// If you expect the response to come back quickly, you should set this to a smaller duration.
-    pub request_timeout: Duration,
-
-    /// Channel on which the networking service will send incoming requests.
-    ///
-    /// Every time a peer sends a request to the local node using this protocol, the networking
-    /// service will push an element on this channel. The receiving side of this channel then has
-    /// to pull this element, process the request, and send back the response to send back to the
-    /// peer.
-    ///
-    /// The size of the channel has to be carefully chosen. If the channel is full, the networking
-    /// service will discard the incoming request send back an error to the peer. Consequently,
-    /// the channel being full is an indicator that the node is overloaded.
-    ///
-    /// You can typically set the size of the channel to `T / d`, where `T` is the
-    /// `request_timeout` and `d` is the expected average duration of CPU and I/O it takes to
-    /// build a response.
-    ///
-    /// Can be `None` if the local node does not support answering incoming requests.
-    /// If this is `None`, then the local node will not advertise support for this protocol towards
-    /// other peers. If this is `Some` but the channel is closed, then the local node will
-    /// advertise support for this protocol, but any incoming request will lead to an error being
-    /// sent back.
-    pub inbound_queue: Option<mpsc::Sender<IncomingRequest>>,
+	/// Name of the protocol on the wire. Should be something like `/foo/bar`.
+	pub name: Cow<'static, str>,
+
+	/// Maximum allowed size, in bytes, of a request.
+	///
+	/// Any request larger than this value will be declined as a way to avoid allocating too
+	/// much memory for it.
+	pub max_request_size: u64,
+
+	/// Maximum allowed size, in bytes, of a response.
+	///
+	/// Any response larger than this value will be declined as a way to avoid allocating too
+	/// much memory for it.
+	pub max_response_size: u64,
+
+	/// Duration after which emitted requests are considered timed out.
+	///
+	/// If you expect the response to come back quickly, you should set this to a smaller duration.
+	pub request_timeout: Duration,
+
+	/// Channel on which the networking service will send incoming requests.
+	///
+	/// Every time a peer sends a request to the local node using this protocol, the networking
+	/// service will push an element on this channel. The receiving side of this channel then has
+	/// to pull this element, process the request, and send back the response to send back to the
+	/// peer.
+	///
+	/// The size of the channel has to be carefully chosen. If the channel is full, the networking
+	/// service will discard the incoming request send back an error to the peer. Consequently,
+	/// the channel being full is an indicator that the node is overloaded.
+	///
+	/// You can typically set the size of the channel to `T / d`, where `T` is the
+	/// `request_timeout` and `d` is the expected average duration of CPU and I/O it takes to
+	/// build a response.
+	///
+	/// Can be `None` if the local node does not support answering incoming requests.
+	/// If this is `None`, then the local node will not advertise support for this protocol towards
+	/// other peers. If this is `Some` but the channel is closed, then the local node will
+	/// advertise support for this protocol, but any incoming request will lead to an error being
+	/// sent back.
+	pub inbound_queue: Option<mpsc::Sender<IncomingRequest>>,
 }
 
 /// A single request received by a peer on a request-response protocol.
@@ -179,14 +186,11 @@ pub enum Event {
 		/// Duration the request took.
 		duration: Duration,
 		/// Result of the request.
-		result: Result<(), RequestFailure>
+		result: Result<(), RequestFailure>,
 	},
 
 	/// A request protocol handler issued reputation changes for the given peer.
-	ReputationChanges {
-		peer: PeerId,
-		changes: Vec<ReputationChange>,
-	}
+	ReputationChanges { peer: PeerId, changes: Vec<ReputationChange> },
 }
 
 /// Combination of a protocol name and a request id.
@@ -234,19 +238,17 @@ pub struct RequestResponsesBehaviour {
 	/// "response builder" used to build responses for incoming requests.
 	protocols: HashMap<
 		Cow<'static, str>,
-		(RequestResponse<GenericCodec>, Option<mpsc::Sender<IncomingRequest>>)
+		(RequestResponse<GenericCodec>, Option<mpsc::Sender<IncomingRequest>>),
 	>,
 
 	/// Pending requests, passed down to a [`RequestResponse`] behaviour, awaiting a reply.
-	pending_requests: HashMap<
-			ProtocolRequestId,
-			(Instant, oneshot::Sender<Result<Vec<u8>, RequestFailure>>),
-		>,
+	pending_requests:
+		HashMap<ProtocolRequestId, (Instant, oneshot::Sender<Result<Vec<u8>, RequestFailure>>)>,
 
 	/// Whenever an incoming request arrives, a `Future` is added to this list and will yield the
 	/// start time and the response to send back to the remote.
 	pending_responses: stream::FuturesUnordered<
-		Pin<Box<dyn Future<Output = Option<RequestProcessingOutcome>> + Send>>
+		Pin<Box<dyn Future<Output = Option<RequestProcessingOutcome>> + Send>>,
 	>,
 
 	/// Whenever an incoming request arrives, the arrival [`Instant`] is recorded here.
@@ -282,15 +284,18 @@ impl RequestResponsesBehaviour {
 				ProtocolSupport::Outbound
 			};
 
-			let rq_rp = RequestResponse::new(GenericCodec {
-				max_request_size: protocol.max_request_size,
-				max_response_size: protocol.max_response_size,
-			}, iter::once((protocol.name.as_bytes().to_vec(), protocol_support)), cfg);
+			let rq_rp = RequestResponse::new(
+				GenericCodec {
+					max_request_size: protocol.max_request_size,
+					max_response_size: protocol.max_response_size,
+				},
+				iter::once((protocol.name.as_bytes().to_vec(), protocol_support)),
+				cfg,
+			);
 
 			match protocols.entry(protocol.name) {
 				Entry::Vacant(e) => e.insert((rq_rp, protocol.inbound_queue)),
-				Entry::Occupied(e) =>
-					return Err(RegisterError::DuplicateProtocol(e.key().clone())),
+				Entry::Occupied(e) => return Err(RegisterError::DuplicateProtocol(e.key().clone())),
 			};
 		}
 
@@ -348,19 +353,20 @@ impl RequestResponsesBehaviour {
 }
 
 impl NetworkBehaviour for RequestResponsesBehaviour {
-	type ProtocolsHandler = MultiHandler<
-		String,
-		<RequestResponse<GenericCodec> as NetworkBehaviour>::ProtocolsHandler,
-	>;
+	type ProtocolsHandler =
+		MultiHandler<String, <RequestResponse<GenericCodec> as NetworkBehaviour>::ProtocolsHandler>;
 	type OutEvent = Event;
 
 	fn new_handler(&mut self) -> Self::ProtocolsHandler {
-		let iter = self.protocols.iter_mut()
+		let iter = self
+			.protocols
+			.iter_mut()
 			.map(|(p, (r, _))| (p.to_string(), NetworkBehaviour::new_handler(r)));
 
-		MultiHandler::try_from_iter(iter)
-			.expect("Protocols are in a HashMap and there can be at most one handler per \
-						  protocol name, which is the only possible error; qed")
+		MultiHandler::try_from_iter(iter).expect(
+			"Protocols are in a HashMap and there can be at most one handler per \
+						  protocol name, which is the only possible error; qed",
+		)
 	}
 
 	fn addresses_of_peer(&mut self, _: &PeerId) -> Vec<Multiaddr> {
@@ -384,7 +390,12 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 		}
 	}
 
-	fn inject_connection_closed(&mut self, peer_id: &PeerId, conn: &ConnectionId, endpoint: &ConnectedPoint) {
+	fn inject_connection_closed(
+		&mut self,
+		peer_id: &PeerId,
+		conn: &ConnectionId,
+		endpoint: &ConnectedPoint,
+	) {
 		for (p, _) in self.protocols.values_mut() {
 			NetworkBehaviour::inject_connection_closed(p, peer_id, conn, endpoint)
 		}
@@ -400,7 +411,7 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 		&mut self,
 		peer_id: Option<&PeerId>,
 		addr: &Multiaddr,
-		error: &dyn std::error::Error
+		error: &dyn std::error::Error,
 	) {
 		for (p, _) in self.protocols.values_mut() {
 			NetworkBehaviour::inject_addr_reach_failure(p, peer_id, addr, error)
@@ -488,11 +499,7 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 					request_id,
 					protocol: protocol_name,
 					inner_channel,
-					response: OutgoingResponse {
-						result,
-						reputation_changes,
-						sent_feedback,
-					},
+					response: OutgoingResponse { result, reputation_changes, sent_feedback },
 				} = match outcome {
 					Some(outcome) => outcome,
 					// The response builder was too busy or handling the request failed. This is
@@ -514,10 +521,8 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 							);
 						} else {
 							if let Some(sent_feedback) = sent_feedback {
-								self.send_feedback.insert(
-									(protocol_name, request_id).into(),
-									sent_feedback
-								);
+								self.send_feedback
+									.insert((protocol_name, request_id).into(), sent_feedback);
 							}
 						}
 					}
@@ -525,11 +530,8 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 
 				if !reputation_changes.is_empty() {
 					return Poll::Ready(NetworkBehaviourAction::GenerateEvent(
-						Event::ReputationChanges{
-							peer,
-							changes: reputation_changes,
-						},
-					));
+						Event::ReputationChanges { peer, changes: reputation_changes },
+					))
 				}
 			}
 
@@ -543,38 +545,35 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 						// Other events generated by the underlying behaviour are transparently
 						// passed through.
 						NetworkBehaviourAction::DialAddress { address } => {
-							log::error!("The request-response isn't supposed to start dialing peers");
+							log::error!(
+								"The request-response isn't supposed to start dialing peers"
+							);
 							return Poll::Ready(NetworkBehaviourAction::DialAddress { address })
-						}
-						NetworkBehaviourAction::DialPeer { peer_id, condition } => {
+						},
+						NetworkBehaviourAction::DialPeer { peer_id, condition } =>
 							return Poll::Ready(NetworkBehaviourAction::DialPeer {
 								peer_id,
 								condition,
-							})
-						}
-						NetworkBehaviourAction::NotifyHandler {
-							peer_id,
-							handler,
-							event,
-						} => {
+							}),
+						NetworkBehaviourAction::NotifyHandler { peer_id, handler, event } =>
 							return Poll::Ready(NetworkBehaviourAction::NotifyHandler {
 								peer_id,
 								handler,
 								event: ((*protocol).to_string(), event),
-							})
-						}
-						NetworkBehaviourAction::ReportObservedAddr { address, score } => {
+							}),
+						NetworkBehaviourAction::ReportObservedAddr { address, score } =>
 							return Poll::Ready(NetworkBehaviourAction::ReportObservedAddr {
-								address, score,
-							})
-						}
+								address,
+								score,
+							}),
 					};
 
 					match ev {
 						// Received a request from a remote.
 						RequestResponseEvent::Message {
 							peer,
-							message: RequestResponseMessage::Request { request_id, request, channel, .. },
+							message:
+								RequestResponseMessage::Request { request_id, request, channel, .. },
 						} => {
 							self.pending_responses_arrival_time.insert(
 								(protocol.clone(), request_id.clone()).into(),
@@ -605,7 +604,11 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 								// `InboundFailure::Omission` event.
 								if let Ok(response) = rx.await {
 									Some(RequestProcessingOutcome {
-										peer, request_id, protocol, inner_channel: channel, response
+										peer,
+										request_id,
+										protocol,
+										inner_channel: channel,
+										response,
 									})
 								} else {
 									None
@@ -614,27 +617,25 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 
 							// This `continue` makes sure that `pending_responses` gets polled
 							// after we have added the new element.
-							continue 'poll_all;
-						}
+							continue 'poll_all
+						},
 
 						// Received a response from a remote to one of our requests.
 						RequestResponseEvent::Message {
 							peer,
-							message: RequestResponseMessage::Response {
-								request_id,
-								response,
-							},
+							message: RequestResponseMessage::Response { request_id, response },
 							..
 						} => {
-							let (started, delivered) = match self.pending_requests.remove(
-								&(protocol.clone(), request_id).into(),
-							) {
+							let (started, delivered) = match self
+								.pending_requests
+								.remove(&(protocol.clone(), request_id).into())
+							{
 								Some((started, pending_response)) => {
-									let delivered = pending_response.send(
-										response.map_err(|()| RequestFailure::Refused),
-									).map_err(|_| RequestFailure::Obsolete);
+									let delivered = pending_response
+										.send(response.map_err(|()| RequestFailure::Refused))
+										.map_err(|_| RequestFailure::Obsolete);
 									(started, delivered)
-								}
+								},
 								None => {
 									log::warn!(
 										target: "sub-libp2p",
@@ -642,8 +643,8 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 										request_id,
 									);
 									debug_assert!(false);
-									continue;
-								}
+									continue
+								},
 							};
 
 							let out = Event::RequestFinished {
@@ -653,21 +654,22 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 								result: delivered,
 							};
 
-							return Poll::Ready(NetworkBehaviourAction::GenerateEvent(out));
-						}
+							return Poll::Ready(NetworkBehaviourAction::GenerateEvent(out))
+						},
 
 						// One of our requests has failed.
 						RequestResponseEvent::OutboundFailure {
-							peer,
-							request_id,
-							error,
-							..
+							peer, request_id, error, ..
 						} => {
-							let started = match self.pending_requests.remove(&(protocol.clone(), request_id).into()) {
+							let started = match self
+								.pending_requests
+								.remove(&(protocol.clone(), request_id).into())
+							{
 								Some((started, pending_response)) => {
-									if pending_response.send(
-										Err(RequestFailure::Network(error.clone())),
-									).is_err() {
+									if pending_response
+										.send(Err(RequestFailure::Network(error.clone())))
+										.is_err()
+									{
 										log::debug!(
 											target: "sub-libp2p",
 											"Request with id {:?} failed. At the same time local \
@@ -676,7 +678,7 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 										);
 									}
 									started
-								}
+								},
 								None => {
 									log::warn!(
 										target: "sub-libp2p",
@@ -684,8 +686,8 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 										request_id,
 									);
 									debug_assert!(false);
-									continue;
-								}
+									continue
+								},
 							};
 
 							let out = Event::RequestFinished {
@@ -695,29 +697,30 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 								result: Err(RequestFailure::Network(error)),
 							};
 
-							return Poll::Ready(NetworkBehaviourAction::GenerateEvent(out));
-						}
+							return Poll::Ready(NetworkBehaviourAction::GenerateEvent(out))
+						},
 
 						// An inbound request failed, either while reading the request or due to failing
 						// to send a response.
-						RequestResponseEvent::InboundFailure { request_id, peer, error, .. } => {
-							self.pending_responses_arrival_time.remove(
-								&(protocol.clone(), request_id).into(),
-							);
+						RequestResponseEvent::InboundFailure {
+							request_id, peer, error, ..
+						} => {
+							self.pending_responses_arrival_time
+								.remove(&(protocol.clone(), request_id).into());
 							self.send_feedback.remove(&(protocol.clone(), request_id).into());
 							let out = Event::InboundRequest {
 								peer,
 								protocol: protocol.clone(),
 								result: Err(ResponseFailure::Network(error)),
 							};
-							return Poll::Ready(NetworkBehaviourAction::GenerateEvent(out));
-						}
+							return Poll::Ready(NetworkBehaviourAction::GenerateEvent(out))
+						},
 
 						// A response to an inbound request has been sent.
 						RequestResponseEvent::ResponseSent { request_id, peer } => {
-							let arrival_time = self.pending_responses_arrival_time.remove(
-								&(protocol.clone(), request_id).into(),
-							)
+							let arrival_time = self
+								.pending_responses_arrival_time
+								.remove(&(protocol.clone(), request_id).into())
 								.map(|t| t.elapsed())
 								.expect(
 									"Time is added for each inbound request on arrival and only \
@@ -727,9 +730,9 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 									 failed; qed.",
 								);
 
-							if let Some(send_feedback) = self.send_feedback.remove(
-								&(protocol.clone(), request_id).into()
-							) {
+							if let Some(send_feedback) =
+								self.send_feedback.remove(&(protocol.clone(), request_id).into())
+							{
 								let _ = send_feedback.send(());
 							}
 
@@ -739,14 +742,13 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 								result: Ok(arrival_time),
 							};
 
-							return Poll::Ready(NetworkBehaviourAction::GenerateEvent(out));
-
-						}
+							return Poll::Ready(NetworkBehaviourAction::GenerateEvent(out))
+						},
 					};
 				}
 			}
 
-			break Poll::Pending;
+			break Poll::Pending
 		}
 	}
 }
@@ -786,7 +788,7 @@ pub enum ResponseFailure {
 /// Implements the libp2p [`RequestResponseCodec`] trait. Defines how streams of bytes are turned
 /// into requests and responses and vice-versa.
 #[derive(Debug, Clone)]
-#[doc(hidden)]  // Needs to be public in order to satisfy the Rust compiler.
+#[doc(hidden)] // Needs to be public in order to satisfy the Rust compiler.
 pub struct GenericCodec {
 	max_request_size: u64,
 	max_response_size: u64,
@@ -807,13 +809,14 @@ impl RequestResponseCodec for GenericCodec {
 		T: AsyncRead + Unpin + Send,
 	{
 		// Read the length.
-		let length = unsigned_varint::aio::read_usize(&mut io).await
+		let length = unsigned_varint::aio::read_usize(&mut io)
+			.await
 			.map_err(|err| io::Error::new(io::ErrorKind::InvalidInput, err))?;
 		if length > usize::try_from(self.max_request_size).unwrap_or(usize::MAX) {
 			return Err(io::Error::new(
 				io::ErrorKind::InvalidInput,
-				format!("Request size exceeds limit: {} > {}", length, self.max_request_size)
-			));
+				format!("Request size exceeds limit: {} > {}", length, self.max_request_size),
+			))
 		}
 
 		// Read the payload.
@@ -840,17 +843,15 @@ impl RequestResponseCodec for GenericCodec {
 			Ok(l) => l,
 			Err(unsigned_varint::io::ReadError::Io(err))
 				if matches!(err.kind(), io::ErrorKind::UnexpectedEof) =>
-			{
-				return Ok(Err(()));
-			}
+				return Ok(Err(())),
 			Err(err) => return Err(io::Error::new(io::ErrorKind::InvalidInput, err)),
 		};
 
 		if length > usize::try_from(self.max_response_size).unwrap_or(usize::MAX) {
 			return Err(io::Error::new(
 				io::ErrorKind::InvalidInput,
-				format!("Response size exceeds limit: {} > {}", length, self.max_response_size)
-			));
+				format!("Response size exceeds limit: {} > {}", length, self.max_response_size),
+			))
 		}
 
 		// Read the payload.
@@ -913,23 +914,30 @@ impl RequestResponseCodec for GenericCodec {
 mod tests {
 	use super::*;
 
-	use futures::channel::{mpsc, oneshot};
-	use futures::executor::LocalPool;
-	use futures::task::Spawn;
-	use libp2p::identity::Keypair;
-	use libp2p::Multiaddr;
-	use libp2p::core::upgrade;
-	use libp2p::core::transport::{Transport, MemoryTransport};
-	use libp2p::noise;
-	use libp2p::swarm::{Swarm, SwarmEvent};
+	use futures::{
+		channel::{mpsc, oneshot},
+		executor::LocalPool,
+		task::Spawn,
+	};
+	use libp2p::{
+		core::{
+			transport::{MemoryTransport, Transport},
+			upgrade,
+		},
+		identity::Keypair,
+		noise,
+		swarm::{Swarm, SwarmEvent},
+		Multiaddr,
+	};
 	use std::{iter, time::Duration};
 
-	fn build_swarm(list: impl Iterator<Item = ProtocolConfig>) -> (Swarm<RequestResponsesBehaviour>, Multiaddr) {
+	fn build_swarm(
+		list: impl Iterator<Item = ProtocolConfig>,
+	) -> (Swarm<RequestResponsesBehaviour>, Multiaddr) {
 		let keypair = Keypair::generate_ed25519();
 
-		let noise_keys = noise::Keypair::<noise::X25519Spec>::new()
-			.into_authentic(&keypair)
-			.unwrap();
+		let noise_keys =
+			noise::Keypair::<noise::X25519Spec>::new().into_authentic(&keypair).unwrap();
 
 		let transport = MemoryTransport
 			.upgrade(upgrade::Version::V1)
@@ -956,18 +964,24 @@ mod tests {
 			.map(|_| {
 				let (tx, mut rx) = mpsc::channel::<IncomingRequest>(64);
 
-				pool.spawner().spawn_obj(async move {
-					while let Some(rq) = rx.next().await {
-						let (fb_tx, fb_rx) = oneshot::channel();
-						assert_eq!(rq.payload, b"this is a request");
-						let _ = rq.pending_response.send(super::OutgoingResponse {
-							result: Ok(b"this is a response".to_vec()),
-							reputation_changes: Vec::new(),
-							sent_feedback: Some(fb_tx),
-						});
-						fb_rx.await.unwrap();
-					}
-				}.boxed().into()).unwrap();
+				pool.spawner()
+					.spawn_obj(
+						async move {
+							while let Some(rq) = rx.next().await {
+								let (fb_tx, fb_rx) = oneshot::channel();
+								assert_eq!(rq.payload, b"this is a request");
+								let _ = rq.pending_response.send(super::OutgoingResponse {
+									result: Ok(b"this is a response".to_vec()),
+									reputation_changes: Vec::new(),
+									sent_feedback: Some(fb_tx),
+								});
+								fb_rx.await.unwrap();
+							}
+						}
+						.boxed()
+						.into(),
+					)
+					.unwrap();
 
 				let protocol_config = ProtocolConfig {
 					name: From::from(protocol_name),
@@ -989,19 +1003,23 @@ mod tests {
 		}
 
 		// Running `swarm[0]` in the background.
-		pool.spawner().spawn_obj({
-			let (mut swarm, _) = swarms.remove(0);
-			async move {
-				loop {
-					match swarm.next_event().await {
-						SwarmEvent::Behaviour(Event::InboundRequest { result, .. }) => {
-							result.unwrap();
-						},
-						_ => {}
+		pool.spawner()
+			.spawn_obj({
+				let (mut swarm, _) = swarms.remove(0);
+				async move {
+					loop {
+						match swarm.next_event().await {
+							SwarmEvent::Behaviour(Event::InboundRequest { result, .. }) => {
+								result.unwrap();
+							},
+							_ => {},
+						}
 					}
 				}
-			}.boxed().into()
-		}).unwrap();
+				.boxed()
+				.into()
+			})
+			.unwrap();
 
 		// Remove and run the remaining swarm.
 		let (mut swarm, _) = swarms.remove(0);
@@ -1021,14 +1039,12 @@ mod tests {
 						);
 						assert!(response_receiver.is_none());
 						response_receiver = Some(receiver);
-					}
-					SwarmEvent::Behaviour(Event::RequestFinished {
-						result, ..
-					}) => {
+					},
+					SwarmEvent::Behaviour(Event::RequestFinished { result, .. }) => {
 						result.unwrap();
-						break;
-					}
-					_ => {}
+						break
+					},
+					_ => {},
 				}
 			}
 
@@ -1046,21 +1062,27 @@ mod tests {
 			.map(|_| {
 				let (tx, mut rx) = mpsc::channel::<IncomingRequest>(64);
 
-				pool.spawner().spawn_obj(async move {
-					while let Some(rq) = rx.next().await {
-						assert_eq!(rq.payload, b"this is a request");
-						let _ = rq.pending_response.send(super::OutgoingResponse {
-							result: Ok(b"this response exceeds the limit".to_vec()),
-							reputation_changes: Vec::new(),
-							sent_feedback: None,
-						});
-					}
-				}.boxed().into()).unwrap();
+				pool.spawner()
+					.spawn_obj(
+						async move {
+							while let Some(rq) = rx.next().await {
+								assert_eq!(rq.payload, b"this is a request");
+								let _ = rq.pending_response.send(super::OutgoingResponse {
+									result: Ok(b"this response exceeds the limit".to_vec()),
+									reputation_changes: Vec::new(),
+									sent_feedback: None,
+								});
+							}
+						}
+						.boxed()
+						.into(),
+					)
+					.unwrap();
 
 				let protocol_config = ProtocolConfig {
 					name: From::from(protocol_name),
 					max_request_size: 1024,
-					max_response_size: 8,  // <-- important for the test
+					max_response_size: 8, // <-- important for the test
 					request_timeout: Duration::from_secs(30),
 					inbound_queue: Some(tx),
 				};
@@ -1078,20 +1100,24 @@ mod tests {
 
 		// Running `swarm[0]` in the background until a `InboundRequest` event happens,
 		// which is a hint about the test having ended.
-		pool.spawner().spawn_obj({
-			let (mut swarm, _) = swarms.remove(0);
-			async move {
-				loop {
-					match swarm.next_event().await {
-						SwarmEvent::Behaviour(Event::InboundRequest { result, .. }) => {
-							assert!(result.is_ok());
-							break
-						},
-						_ => {}
+		pool.spawner()
+			.spawn_obj({
+				let (mut swarm, _) = swarms.remove(0);
+				async move {
+					loop {
+						match swarm.next_event().await {
+							SwarmEvent::Behaviour(Event::InboundRequest { result, .. }) => {
+								assert!(result.is_ok());
+								break
+							},
+							_ => {},
+						}
 					}
 				}
-			}.boxed().into()
-		}).unwrap();
+				.boxed()
+				.into()
+			})
+			.unwrap();
 
 		// Remove and run the remaining swarm.
 		let (mut swarm, _) = swarms.remove(0);
@@ -1111,20 +1137,18 @@ mod tests {
 						);
 						assert!(response_receiver.is_none());
 						response_receiver = Some(receiver);
-					}
-					SwarmEvent::Behaviour(Event::RequestFinished {
-						result, ..
-					}) => {
+					},
+					SwarmEvent::Behaviour(Event::RequestFinished { result, .. }) => {
 						assert!(result.is_err());
-						break;
-					}
-					_ => {}
+						break
+					},
+					_ => {},
 				}
 			}
 
 			match response_receiver.unwrap().await.unwrap().unwrap_err() {
 				RequestFailure::Network(OutboundFailure::ConnectionClosed) => {},
-				_ => panic!()
+				_ => panic!(),
 			}
 		});
 	}
@@ -1197,89 +1221,97 @@ mod tests {
 		swarm_1.dial_addr(listen_add_2).unwrap();
 
 		// Run swarm 2 in the background, receiving two requests.
-		pool.spawner().spawn_obj(
-			async move {
-				loop {
-					match swarm_2.next_event().await {
-						SwarmEvent::Behaviour(Event::InboundRequest { result, .. }) => {
-							result.unwrap();
-						},
-						_ => {}
+		pool.spawner()
+			.spawn_obj(
+				async move {
+					loop {
+						match swarm_2.next_event().await {
+							SwarmEvent::Behaviour(Event::InboundRequest { result, .. }) => {
+								result.unwrap();
+							},
+							_ => {},
+						}
 					}
 				}
-			}.boxed().into()
-		).unwrap();
+				.boxed()
+				.into(),
+			)
+			.unwrap();
 
 		// Handle both requests sent by swarm 1 to swarm 2 in the background.
 		//
 		// Make sure both requests overlap, by answering the first only after receiving the
 		// second.
-		pool.spawner().spawn_obj(async move {
-			let protocol_1_request = swarm_2_handler_1.next().await;
-			let protocol_2_request = swarm_2_handler_2.next().await;
-
-			protocol_1_request.unwrap()
-				.pending_response
-				.send(OutgoingResponse {
-					result: Ok(b"this is a response".to_vec()),
-					reputation_changes: Vec::new(),
-					sent_feedback: None,
-				})
-				.unwrap();
-			protocol_2_request.unwrap()
-				.pending_response
-				.send(OutgoingResponse {
-					result: Ok(b"this is a response".to_vec()),
-					reputation_changes: Vec::new(),
-					sent_feedback: None,
-				})
-				.unwrap();
-		}.boxed().into()).unwrap();
+		pool.spawner()
+			.spawn_obj(
+				async move {
+					let protocol_1_request = swarm_2_handler_1.next().await;
+					let protocol_2_request = swarm_2_handler_2.next().await;
+
+					protocol_1_request
+						.unwrap()
+						.pending_response
+						.send(OutgoingResponse {
+							result: Ok(b"this is a response".to_vec()),
+							reputation_changes: Vec::new(),
+							sent_feedback: None,
+						})
+						.unwrap();
+					protocol_2_request
+						.unwrap()
+						.pending_response
+						.send(OutgoingResponse {
+							result: Ok(b"this is a response".to_vec()),
+							reputation_changes: Vec::new(),
+							sent_feedback: None,
+						})
+						.unwrap();
+				}
+				.boxed()
+				.into(),
+			)
+			.unwrap();
 
 		// Have swarm 1 send two requests to swarm 2 and await responses.
-		pool.run_until(
-			async move {
-				let mut response_receivers = None;
-				let mut num_responses = 0;
-
-				loop {
-					match swarm_1.next_event().await {
-						SwarmEvent::ConnectionEstablished { peer_id, .. } => {
-							let (sender_1, receiver_1) = oneshot::channel();
-							let (sender_2, receiver_2) = oneshot::channel();
-							swarm_1.behaviour_mut().send_request(
-								&peer_id,
-								protocol_name_1,
-								b"this is a request".to_vec(),
-								sender_1,
-								IfDisconnected::ImmediateError,
-							);
-							swarm_1.behaviour_mut().send_request(
-								&peer_id,
-								protocol_name_2,
-								b"this is a request".to_vec(),
-								sender_2,
-								IfDisconnected::ImmediateError,
-							);
-							assert!(response_receivers.is_none());
-							response_receivers = Some((receiver_1, receiver_2));
-						}
-						SwarmEvent::Behaviour(Event::RequestFinished {
-							result, ..
-						}) => {
-							num_responses += 1;
-							result.unwrap();
-							if num_responses == 2 {
-								break;
-							}
+		pool.run_until(async move {
+			let mut response_receivers = None;
+			let mut num_responses = 0;
+
+			loop {
+				match swarm_1.next_event().await {
+					SwarmEvent::ConnectionEstablished { peer_id, .. } => {
+						let (sender_1, receiver_1) = oneshot::channel();
+						let (sender_2, receiver_2) = oneshot::channel();
+						swarm_1.behaviour_mut().send_request(
+							&peer_id,
+							protocol_name_1,
+							b"this is a request".to_vec(),
+							sender_1,
+							IfDisconnected::ImmediateError,
+						);
+						swarm_1.behaviour_mut().send_request(
+							&peer_id,
+							protocol_name_2,
+							b"this is a request".to_vec(),
+							sender_2,
+							IfDisconnected::ImmediateError,
+						);
+						assert!(response_receivers.is_none());
+						response_receivers = Some((receiver_1, receiver_2));
+					},
+					SwarmEvent::Behaviour(Event::RequestFinished { result, .. }) => {
+						num_responses += 1;
+						result.unwrap();
+						if num_responses == 2 {
+							break
 						}
-						_ => {}
-					}
+					},
+					_ => {},
 				}
-				let (response_receiver_1, response_receiver_2) = response_receivers.unwrap();
-				assert_eq!(response_receiver_1.await.unwrap().unwrap(), b"this is a response");
-				assert_eq!(response_receiver_2.await.unwrap().unwrap(), b"this is a response");
 			}
-		);
+			let (response_receiver_1, response_receiver_2) = response_receivers.unwrap();
+			assert_eq!(response_receiver_1.await.unwrap().unwrap(), b"this is a response");
+			assert_eq!(response_receiver_2.await.unwrap().unwrap(), b"this is a response");
+		});
 	}
 }
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index fb303312093c..89685849f5bf 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -28,59 +28,45 @@
 //! which is then processed by [`NetworkWorker::poll`].
 
 use crate::{
-	ExHashT, NetworkStateInfo, NetworkStatus,
 	behaviour::{self, Behaviour, BehaviourOut},
+	bitswap::Bitswap,
 	config::{parse_str_addr, Params, TransportConfig},
-	DhtEvent,
 	discovery::DiscoveryConfig,
 	error::Error,
+	light_client_requests,
 	network_state::{
 		NetworkState, NotConnectedPeer as NetworkStateNotConnectedPeer, Peer as NetworkStatePeer,
 	},
 	on_demand_layer::AlwaysBadChecker,
-	light_client_requests,
 	protocol::{
 		self,
-		message::generic::Roles,
-		NotifsHandlerError,
-		NotificationsSink,
-		PeerInfo,
-		Protocol,
-		Ready,
 		event::Event,
-		sync::{SyncState, Status as SyncStatus},
+		message::generic::Roles,
+		sync::{Status as SyncStatus, SyncState},
+		NotificationsSink, NotifsHandlerError, PeerInfo, Protocol, Ready,
 	},
-	transactions,
-	transport, ReputationChange,
-
-	bitswap::Bitswap,
+	transactions, transport, DhtEvent, ExHashT, NetworkStateInfo, NetworkStatus, ReputationChange,
 };
 
 use codec::Encode as _;
 use futures::{channel::oneshot, prelude::*};
-use libp2p::{PeerId, multiaddr, Multiaddr};
-use libp2p::core::{
-	ConnectedPoint,
-	Executor,
-	connection::{
-		ConnectionLimits,
-		ConnectionError,
-		PendingConnectionError
+use libp2p::{
+	core::{
+		connection::{ConnectionError, ConnectionLimits, PendingConnectionError},
+		either::EitherError,
+		upgrade, ConnectedPoint, Executor,
 	},
-	either::EitherError,
-	upgrade
-};
-use libp2p::kad::record;
-use libp2p::ping::handler::PingFailure;
-use libp2p::swarm::{
-	AddressScore,
-	NetworkBehaviour,
-	SwarmBuilder,
-	SwarmEvent,
-	protocols_handler::NodeHandlerWrapperError
+	kad::record,
+	multiaddr,
+	ping::handler::PingFailure,
+	swarm::{
+		protocols_handler::NodeHandlerWrapperError, AddressScore, NetworkBehaviour, SwarmBuilder,
+		SwarmEvent,
+	},
+	Multiaddr, PeerId,
 };
-use log::{error, info, trace, debug, warn};
-use metrics::{Metrics, MetricSources, Histogram, HistogramVec};
+use log::{debug, error, info, trace, warn};
+use metrics::{Histogram, HistogramVec, MetricSources, Metrics};
 use parking_lot::Mutex;
 use sc_peerset::PeersetHandle;
 use sp_consensus::import_queue::{BlockImportError, BlockImportResult, ImportQueue, Link};
@@ -91,10 +77,9 @@ use std::{
 	cmp,
 	collections::{HashMap, HashSet},
 	convert::TryFrom as _,
-	fs,
-	iter,
+	fs, iter,
 	marker::PhantomData,
-	num:: NonZeroUsize,
+	num::NonZeroUsize,
 	pin::Pin,
 	str,
 	sync::{
@@ -104,7 +89,9 @@ use std::{
 	task::Poll,
 };
 
-pub use behaviour::{ResponseFailure, InboundFailure, RequestFailure, OutboundFailure, IfDisconnected};
+pub use behaviour::{
+	IfDisconnected, InboundFailure, OutboundFailure, RequestFailure, ResponseFailure,
+};
 
 mod metrics;
 mod out_events;
@@ -156,7 +143,12 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 			&params.network_config.transport,
 		)?;
 		ensure_addresses_consistent_with_transport(
-			params.network_config.default_peers_set.reserved_nodes.iter().map(|x| &x.multiaddr),
+			params
+				.network_config
+				.default_peers_set
+				.reserved_nodes
+				.iter()
+				.map(|x| &x.multiaddr),
 			&params.network_config.transport,
 		)?;
 		for extra_set in &params.network_config.extra_sets {
@@ -176,10 +168,12 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 			fs::create_dir_all(path)?;
 		}
 
-		let transactions_handler_proto = transactions::TransactionsHandlerPrototype::new(
-			params.protocol_id.clone()
-		);
-		params.network_config.extra_sets.insert(0, transactions_handler_proto.set_config());
+		let transactions_handler_proto =
+			transactions::TransactionsHandlerPrototype::new(params.protocol_id.clone());
+		params
+			.network_config
+			.extra_sets
+			.insert(0, transactions_handler_proto.set_config());
 
 		// Private and public keys configuration.
 		let local_identity = params.network_config.node_key.clone().into_keypair()?;
@@ -201,8 +195,12 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 			params.chain.clone(),
 			params.protocol_id.clone(),
 			&params.network_config,
-			iter::once(Vec::new()).chain((0..params.network_config.extra_sets.len() - 1)
-				.map(|_| default_notif_handshake_message.clone())).collect(),
+			iter::once(Vec::new())
+				.chain(
+					(0..params.network_config.extra_sets.len() - 1)
+						.map(|_| default_notif_handshake_message.clone()),
+				)
+				.collect(),
 			params.block_announce_validator,
 			params.metrics_registry.as_ref(),
 		)?;
@@ -221,23 +219,21 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 		let boot_node_ids = Arc::new(boot_node_ids);
 
 		// Check for duplicate bootnodes.
-		known_addresses.iter()
-			.try_for_each(|(peer_id, addr)|
-				if let Some(other) = known_addresses
-					.iter()
-					.find(|o| o.1 == *addr && o.0 != *peer_id)
-				{
-					Err(Error::DuplicateBootnode {
-						address: addr.clone(),
-						first_id: peer_id.clone(),
-						second_id: other.0.clone(),
-					})
-				} else {
-					Ok(())
-				}
-			)?;
+		known_addresses.iter().try_for_each(|(peer_id, addr)| {
+			if let Some(other) = known_addresses.iter().find(|o| o.1 == *addr && o.0 != *peer_id) {
+				Err(Error::DuplicateBootnode {
+					address: addr.clone(),
+					first_id: peer_id.clone(),
+					second_id: other.0.clone(),
+				})
+			} else {
+				Ok(())
+			}
+		})?;
 
-		let checker = params.on_demand.as_ref()
+		let checker = params
+			.on_demand
+			.as_ref()
 			.map(|od| od.checker().clone())
 			.unwrap_or_else(|| Arc::new(AlwaysBadChecker));
 
@@ -249,8 +245,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 		let (mut swarm, bandwidth): (Swarm<B>, _) = {
 			let user_agent = format!(
 				"{} ({})",
-				params.network_config.client_version,
-				params.network_config.node_name
+				params.network_config.client_version, params.network_config.node_name
 			);
 
 			let light_client_request_sender = {
@@ -264,21 +259,25 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 			let discovery_config = {
 				let mut config = DiscoveryConfig::new(local_public.clone());
 				config.with_user_defined(known_addresses);
-				config.discovery_limit(u64::from(params.network_config.default_peers_set.out_peers) + 15);
+				config.discovery_limit(
+					u64::from(params.network_config.default_peers_set.out_peers) + 15,
+				);
 				config.add_protocol(params.protocol_id.clone());
 				config.with_dht_random_walk(params.network_config.enable_dht_random_walk);
 				config.allow_non_globals_in_dht(params.network_config.allow_non_globals_in_dht);
-				config.use_kademlia_disjoint_query_paths(params.network_config.kademlia_disjoint_query_paths);
+				config.use_kademlia_disjoint_query_paths(
+					params.network_config.kademlia_disjoint_query_paths,
+				);
 
 				match params.network_config.transport {
 					TransportConfig::MemoryOnly => {
 						config.with_mdns(false);
 						config.allow_private_ipv4(false);
-					}
+					},
 					TransportConfig::Normal { enable_mdns, allow_private_ipv4, .. } => {
 						config.with_mdns(enable_mdns);
 						config.allow_private_ipv4(allow_private_ipv4);
-					}
+					},
 				}
 
 				config
@@ -288,7 +287,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 				let (config_mem, config_wasm) = match params.network_config.transport {
 					TransportConfig::MemoryOnly => (true, None),
 					TransportConfig::Normal { wasm_external_transport, .. } =>
-						(false, wasm_external_transport)
+						(false, wasm_external_transport),
 				};
 
 				// The yamux buffer size limit is configured to be equal to the maximum frame size
@@ -298,27 +297,33 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 				// a variable-length-encoding 64bits number. In other words, we make the
 				// assumption that no notification larger than 2^64 will ever be sent.
 				let yamux_maximum_buffer_size = {
-					let requests_max = params.network_config
-						.request_response_protocols.iter()
+					let requests_max = params
+						.network_config
+						.request_response_protocols
+						.iter()
 						.map(|cfg| usize::try_from(cfg.max_request_size).unwrap_or(usize::MAX));
-					let responses_max = params.network_config
-						.request_response_protocols.iter()
-						.map(|cfg| usize::try_from(cfg.max_response_size).unwrap_or(usize::MAX));
-					let notifs_max = params.network_config
-						.extra_sets.iter()
-						.map(|cfg| usize::try_from(cfg.max_notification_size).unwrap_or(usize::MAX));
+					let responses_max =
+						params.network_config.request_response_protocols.iter().map(|cfg| {
+							usize::try_from(cfg.max_response_size).unwrap_or(usize::MAX)
+						});
+					let notifs_max = params.network_config.extra_sets.iter().map(|cfg| {
+						usize::try_from(cfg.max_notification_size).unwrap_or(usize::MAX)
+					});
 
 					// A "default" max is added to cover all the other protocols: ping, identify,
 					// kademlia, block announces, and transactions.
 					let default_max = cmp::max(
 						1024 * 1024,
 						usize::try_from(protocol::BLOCK_ANNOUNCES_TRANSACTIONS_SUBSTREAM_SIZE)
-							.unwrap_or(usize::MAX)
+							.unwrap_or(usize::MAX),
 					);
 
 					iter::once(default_max)
-						.chain(requests_max).chain(responses_max).chain(notifs_max)
-						.max().expect("iterator known to always yield at least one element; qed")
+						.chain(requests_max)
+						.chain(responses_max)
+						.chain(notifs_max)
+						.max()
+						.expect("iterator known to always yield at least one element; qed")
 						.saturating_add(10)
 				};
 
@@ -327,7 +332,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 					config_mem,
 					config_wasm,
 					params.network_config.yamux_window_size,
-					yamux_maximum_buffer_size
+					yamux_maximum_buffer_size,
 				)
 			};
 
@@ -348,18 +353,18 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 
 				match result {
 					Ok(b) => b,
-					Err(crate::request_responses::RegisterError::DuplicateProtocol(proto)) => {
-						return Err(Error::DuplicateRequestResponseProtocol {
-							protocol: proto,
-						})
-					},
+					Err(crate::request_responses::RegisterError::DuplicateProtocol(proto)) =>
+						return Err(Error::DuplicateRequestResponseProtocol { protocol: proto }),
 				}
 			};
 
 			let mut builder = SwarmBuilder::new(transport, behaviour, local_peer_id.clone())
-				.connection_limits(ConnectionLimits::default()
-					.with_max_established_per_peer(Some(crate::MAX_CONNECTIONS_PER_PEER as u32))
-					.with_max_established_incoming(Some(crate::MAX_CONNECTIONS_ESTABLISHED_INCOMING))
+				.connection_limits(
+					ConnectionLimits::default()
+						.with_max_established_per_peer(Some(crate::MAX_CONNECTIONS_PER_PEER as u32))
+						.with_max_established_incoming(Some(
+							crate::MAX_CONNECTIONS_ESTABLISHED_INCOMING,
+						)),
 				)
 				.substream_upgrade_protocol_override(upgrade::Version::V1Lazy)
 				.notify_handler_buffer_size(NonZeroUsize::new(32).expect("32 != 0; qed"))
@@ -378,14 +383,15 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 
 		// Initialize the metrics.
 		let metrics = match &params.metrics_registry {
-			Some(registry) => {
-				Some(metrics::register(registry, MetricSources {
+			Some(registry) => Some(metrics::register(
+				registry,
+				MetricSources {
 					bandwidth: bandwidth.clone(),
 					major_syncing: is_major_syncing.clone(),
 					connected_peers: num_connected.clone(),
-				})?)
-			}
-			None => None
+				},
+			)?),
+			None => None,
 		};
 
 		// Listen on multiaddresses.
@@ -412,8 +418,9 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 			local_peer_id,
 			to_worker,
 			peers_notifications_sinks: peers_notifications_sinks.clone(),
-			notifications_sizes_metric:
-				metrics.as_ref().map(|metrics| metrics.notifications_sizes.clone()),
+			notifications_sizes_metric: metrics
+				.as_ref()
+				.map(|metrics| metrics.notifications_sizes.clone()),
 			_marker: PhantomData,
 		});
 
@@ -421,7 +428,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 			service.clone(),
 			params.role,
 			params.transaction_pool,
-			params.metrics_registry.as_ref()
+			params.metrics_registry.as_ref(),
 		)?;
 		(params.transactions_handler_executor)(tx_handler.run().boxed());
 
@@ -520,12 +527,18 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 
 	/// You must call this when a new block is finalized by the client.
 	pub fn on_block_finalized(&mut self, hash: B::Hash, header: B::Header) {
-		self.network_service.behaviour_mut().user_protocol_mut().on_block_finalized(hash, &header);
+		self.network_service
+			.behaviour_mut()
+			.user_protocol_mut()
+			.on_block_finalized(hash, &header);
 	}
 
 	/// Inform the network service about new best imported block.
 	pub fn new_best_block_imported(&mut self, hash: B::Hash, number: NumberFor<B>) {
-		self.network_service.behaviour_mut().user_protocol_mut().new_best_block_imported(hash, number);
+		self.network_service
+			.behaviour_mut()
+			.user_protocol_mut()
+			.new_best_block_imported(hash, number);
 	}
 
 	/// Returns the local `PeerId`.
@@ -550,50 +563,76 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 
 		let connected_peers = {
 			let swarm = &mut *swarm;
-			open.iter().filter_map(move |peer_id| {
-				let known_addresses = NetworkBehaviour::addresses_of_peer(swarm.behaviour_mut(), peer_id)
-					.into_iter().collect();
-
-				let endpoint = if let Some(e) = swarm.behaviour_mut().node(peer_id).map(|i| i.endpoint()).flatten() {
-					e.clone().into()
-				} else {
-					error!(target: "sub-libp2p", "Found state inconsistency between custom protocol \
+			open.iter()
+				.filter_map(move |peer_id| {
+					let known_addresses =
+						NetworkBehaviour::addresses_of_peer(swarm.behaviour_mut(), peer_id)
+							.into_iter()
+							.collect();
+
+					let endpoint = if let Some(e) =
+						swarm.behaviour_mut().node(peer_id).map(|i| i.endpoint()).flatten()
+					{
+						e.clone().into()
+					} else {
+						error!(target: "sub-libp2p", "Found state inconsistency between custom protocol \
 						and debug information about {:?}", peer_id);
-					return None
-				};
-
-				Some((peer_id.to_base58(), NetworkStatePeer {
-					endpoint,
-					version_string: swarm.behaviour_mut().node(peer_id)
-						.and_then(|i| i.client_version().map(|s| s.to_owned())),
-					latest_ping_time: swarm.behaviour_mut().node(peer_id).and_then(|i| i.latest_ping()),
-					known_addresses,
-				}))
-			}).collect()
+						return None
+					};
+
+					Some((
+						peer_id.to_base58(),
+						NetworkStatePeer {
+							endpoint,
+							version_string: swarm
+								.behaviour_mut()
+								.node(peer_id)
+								.and_then(|i| i.client_version().map(|s| s.to_owned())),
+							latest_ping_time: swarm
+								.behaviour_mut()
+								.node(peer_id)
+								.and_then(|i| i.latest_ping()),
+							known_addresses,
+						},
+					))
+				})
+				.collect()
 		};
 
 		let not_connected_peers = {
 			let swarm = &mut *swarm;
-			swarm.behaviour_mut().known_peers().into_iter()
+			swarm
+				.behaviour_mut()
+				.known_peers()
+				.into_iter()
 				.filter(|p| open.iter().all(|n| n != p))
 				.map(move |peer_id| {
-					(peer_id.to_base58(), NetworkStateNotConnectedPeer {
-						version_string: swarm.behaviour_mut().node(&peer_id)
-							.and_then(|i| i.client_version().map(|s| s.to_owned())),
-						latest_ping_time: swarm.behaviour_mut().node(&peer_id).and_then(|i| i.latest_ping()),
-						known_addresses: NetworkBehaviour::addresses_of_peer(swarm.behaviour_mut(), &peer_id)
-							.into_iter().collect(),
-					})
+					(
+						peer_id.to_base58(),
+						NetworkStateNotConnectedPeer {
+							version_string: swarm
+								.behaviour_mut()
+								.node(&peer_id)
+								.and_then(|i| i.client_version().map(|s| s.to_owned())),
+							latest_ping_time: swarm
+								.behaviour_mut()
+								.node(&peer_id)
+								.and_then(|i| i.latest_ping()),
+							known_addresses: NetworkBehaviour::addresses_of_peer(
+								swarm.behaviour_mut(),
+								&peer_id,
+							)
+							.into_iter()
+							.collect(),
+						},
+					)
 				})
 				.collect()
 		};
 
 		let peer_id = Swarm::<B>::local_peer_id(&swarm).to_base58();
 		let listened_addresses = swarm.listeners().cloned().collect();
-		let external_addresses = swarm.external_addresses()
-			.map(|r| &r.addr)
-			.cloned()
-			.collect();
+		let external_addresses = swarm.external_addresses().map(|r| &r.addr).cloned().collect();
 
 		NetworkState {
 			peer_id,
@@ -607,7 +646,9 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 
 	/// Get currently connected peers.
 	pub fn peers_debug_info(&mut self) -> Vec<(PeerId, PeerInfo<B>)> {
-		self.network_service.behaviour_mut().user_protocol_mut()
+		self.network_service
+			.behaviour_mut()
+			.user_protocol_mut()
 			.peers_info()
 			.map(|(id, info)| (id.clone(), info.clone()))
 			.collect()
@@ -641,9 +682,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	/// Need a better solution to manage authorized peers, but now just use reserved peers for
 	/// prototyping.
 	pub fn set_authorized_peers(&self, peers: HashSet<PeerId>) {
-		let _ = self
-			.to_worker
-			.unbounded_send(ServiceToWorkerMsg::SetReserved(peers));
+		let _ = self.to_worker.unbounded_send(ServiceToWorkerMsg::SetReserved(peers));
 	}
 
 	/// Set authorized_only flag.
@@ -682,8 +721,12 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	///
 	/// The protocol must have been registered with
 	/// [`NetworkConfiguration::notifications_protocols`](crate::config::NetworkConfiguration::notifications_protocols).
-	///
-	pub fn write_notification(&self, target: PeerId, protocol: Cow<'static, str>, message: Vec<u8>) {
+	pub fn write_notification(
+		&self,
+		target: PeerId,
+		protocol: Cow<'static, str>,
+		message: Vec<u8>,
+	) {
 		// We clone the `NotificationsSink` in order to be able to unlock the network-wide
 		// `peers_notifications_sinks` mutex as soon as possible.
 		let sink = {
@@ -697,7 +740,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 					"Attempted to send notification on missing or closed substream: {}, {:?}",
 					target, protocol,
 				);
-				return;
+				return
 			}
 		};
 
@@ -756,9 +799,9 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	/// // Do NOT do this
 	/// for peer in peers {
 	/// 	if let Ok(n) = network.notification_sender(peer, ...) {
-	///			if let Ok(s) = n.ready().await {
-	///				let _ = s.send(...);
-	///			}
+	/// 			if let Ok(s) = n.ready().await {
+	/// 				let _ = s.send(...);
+	/// 			}
 	/// 	}
 	/// }
 	/// ```
@@ -785,7 +828,6 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	///
 	/// See also the [`gossip`](crate::gossip) module for a higher-level way to send
 	/// notifications.
-	///
 	pub fn notification_sender(
 		&self,
 		target: PeerId,
@@ -798,19 +840,16 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 			if let Some(sink) = peers_notifications_sinks.get(&(target, protocol.clone())) {
 				sink.clone()
 			} else {
-				return Err(NotificationSenderError::Closed);
+				return Err(NotificationSenderError::Closed)
 			}
 		};
 
-		let notification_size_metric = self.notifications_sizes_metric.as_ref().map(|histogram| {
-			histogram.with_label_values(&["out", &protocol])
-		});
+		let notification_size_metric = self
+			.notifications_sizes_metric
+			.as_ref()
+			.map(|histogram| histogram.with_label_values(&["out", &protocol]));
 
-		Ok(NotificationSender {
-			sink,
-			protocol_name: protocol,
-			notification_size_metric,
-		})
+		Ok(NotificationSender { sink, protocol_name: protocol, notification_size_metric })
 	}
 
 	/// Returns a stream containing the events that happen on the network.
@@ -898,9 +937,9 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	pub async fn status(&self) -> Result<NetworkStatus<B>, ()> {
 		let (tx, rx) = oneshot::channel();
 
-		let _ = self.to_worker.unbounded_send(ServiceToWorkerMsg::NetworkStatus {
-			pending_response: tx,
-		});
+		let _ = self
+			.to_worker
+			.unbounded_send(ServiceToWorkerMsg::NetworkStatus { pending_response: tx });
 
 		match rx.await {
 			Ok(v) => v.map_err(|_| ()),
@@ -918,9 +957,9 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	pub async fn network_state(&self) -> Result<NetworkState, ()> {
 		let (tx, rx) = oneshot::channel();
 
-		let _ = self.to_worker.unbounded_send(ServiceToWorkerMsg::NetworkState {
-			pending_response: tx,
-		});
+		let _ = self
+			.to_worker
+			.unbounded_send(ServiceToWorkerMsg::NetworkState { pending_response: tx });
 
 		match rx.await {
 			Ok(v) => v.map_err(|_| ()),
@@ -967,7 +1006,9 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	/// prevents the local node from re-establishing an outgoing substream to this peer until it
 	/// is added again.
 	pub fn disconnect_peer(&self, who: PeerId, protocol: impl Into<Cow<'static, str>>) {
-		let _ = self.to_worker.unbounded_send(ServiceToWorkerMsg::DisconnectPeer(who, protocol.into()));
+		let _ = self
+			.to_worker
+			.unbounded_send(ServiceToWorkerMsg::DisconnectPeer(who, protocol.into()));
 	}
 
 	/// Request a justification for the given block from the network.
@@ -982,9 +1023,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 
 	/// Clear all pending justification requests.
 	pub fn clear_justification_requests(&self) {
-		let _ = self
-			.to_worker
-			.unbounded_send(ServiceToWorkerMsg::ClearJustificationRequests);
+		let _ = self.to_worker.unbounded_send(ServiceToWorkerMsg::ClearJustificationRequests);
 	}
 
 	/// Are we in the process of downloading the chain?
@@ -997,9 +1036,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	/// This will generate either a `ValueFound` or a `ValueNotFound` event and pass it as an
 	/// item on the [`NetworkWorker`] stream.
 	pub fn get_value(&self, key: &record::Key) {
-		let _ = self
-			.to_worker
-			.unbounded_send(ServiceToWorkerMsg::GetValue(key.clone()));
+		let _ = self.to_worker.unbounded_send(ServiceToWorkerMsg::GetValue(key.clone()));
 	}
 
 	/// Start putting a value in the DHT.
@@ -1007,24 +1044,18 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	/// This will generate either a `ValuePut` or a `ValuePutFailed` event and pass it as an
 	/// item on the [`NetworkWorker`] stream.
 	pub fn put_value(&self, key: record::Key, value: Vec<u8>) {
-		let _ = self
-			.to_worker
-			.unbounded_send(ServiceToWorkerMsg::PutValue(key, value));
+		let _ = self.to_worker.unbounded_send(ServiceToWorkerMsg::PutValue(key, value));
 	}
 
 	/// Connect to unreserved peers and allow unreserved peers to connect for syncing purposes.
 	pub fn accept_unreserved_peers(&self) {
-		let _ = self
-			.to_worker
-			.unbounded_send(ServiceToWorkerMsg::SetReservedOnly(false));
+		let _ = self.to_worker.unbounded_send(ServiceToWorkerMsg::SetReservedOnly(false));
 	}
 
 	/// Disconnect from unreserved peers and deny new unreserved peers to connect for syncing
 	/// purposes.
 	pub fn deny_unreserved_peers(&self) {
-		let _ = self
-			.to_worker
-			.unbounded_send(ServiceToWorkerMsg::SetReservedOnly(true));
+		let _ = self.to_worker.unbounded_send(ServiceToWorkerMsg::SetReservedOnly(true));
 	}
 
 	/// Adds a `PeerId` and its address as reserved. The string should encode the address
@@ -1042,17 +1073,13 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 		let _ = self
 			.to_worker
 			.unbounded_send(ServiceToWorkerMsg::AddKnownAddress(peer_id.clone(), addr));
-		let _ = self
-			.to_worker
-			.unbounded_send(ServiceToWorkerMsg::AddReserved(peer_id));
+		let _ = self.to_worker.unbounded_send(ServiceToWorkerMsg::AddReserved(peer_id));
 		Ok(())
 	}
 
 	/// Removes a `PeerId` from the list of reserved peers.
 	pub fn remove_reserved_peer(&self, peer_id: PeerId) {
-		let _ = self
-			.to_worker
-			.unbounded_send(ServiceToWorkerMsg::RemoveReserved(peer_id));
+		let _ = self.to_worker.unbounded_send(ServiceToWorkerMsg::RemoveReserved(peer_id));
 	}
 
 	/// Add peers to a peer set.
@@ -1062,7 +1089,11 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	///
 	/// Returns an `Err` if one of the given addresses is invalid or contains an
 	/// invalid peer ID (which includes the local peer ID).
-	pub fn add_peers_to_reserved_set(&self, protocol: Cow<'static, str>, peers: HashSet<Multiaddr>) -> Result<(), String> {
+	pub fn add_peers_to_reserved_set(
+		&self,
+		protocol: Cow<'static, str>,
+		peers: HashSet<Multiaddr>,
+	) -> Result<(), String> {
 		let peers = self.split_multiaddr_and_peer_id(peers)?;
 
 		for (peer_id, addr) in peers.into_iter() {
@@ -1090,12 +1121,11 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	///
 	/// Returns an `Err` if one of the given addresses is invalid or contains an
 	/// invalid peer ID (which includes the local peer ID).
-	//
 	// NOTE: technically, this function only needs `Vec<PeerId>`, but we use `Multiaddr` here for convenience.
 	pub fn remove_peers_from_reserved_set(
 		&self,
 		protocol: Cow<'static, str>,
-		peers: HashSet<Multiaddr>
+		peers: HashSet<Multiaddr>,
 	) -> Result<(), String> {
 		let peers = self.split_multiaddr_and_peer_id(peers)?;
 		for (peer_id, _) in peers.into_iter() {
@@ -1113,9 +1143,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	/// a stale fork missing.
 	/// Passing empty `peers` set effectively removes the sync request.
 	pub fn set_sync_fork_request(&self, peers: Vec<PeerId>, hash: B::Hash, number: NumberFor<B>) {
-		let _ = self
-			.to_worker
-			.unbounded_send(ServiceToWorkerMsg::SyncFork(peers, hash, number));
+		let _ = self.to_worker.unbounded_send(ServiceToWorkerMsg::SyncFork(peers, hash, number));
 	}
 
 	/// Add a peer to a set of peers.
@@ -1127,7 +1155,11 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	///
 	/// Returns an `Err` if one of the given addresses is invalid or contains an
 	/// invalid peer ID (which includes the local peer ID).
-	pub fn add_to_peers_set(&self, protocol: Cow<'static, str>, peers: HashSet<Multiaddr>) -> Result<(), String> {
+	pub fn add_to_peers_set(
+		&self,
+		protocol: Cow<'static, str>,
+		peers: HashSet<Multiaddr>,
+	) -> Result<(), String> {
 		let peers = self.split_multiaddr_and_peer_id(peers)?;
 
 		for (peer_id, addr) in peers.into_iter() {
@@ -1157,9 +1189,12 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	///
 	/// Returns an `Err` if one of the given addresses is invalid or contains an
 	/// invalid peer ID (which includes the local peer ID).
-	//
 	// NOTE: technically, this function only needs `Vec<PeerId>`, but we use `Multiaddr` here for convenience.
-	pub fn remove_from_peers_set(&self, protocol: Cow<'static, str>, peers: HashSet<Multiaddr>) -> Result<(), String> {
+	pub fn remove_from_peers_set(
+		&self,
+		protocol: Cow<'static, str>,
+		peers: HashSet<Multiaddr>,
+	) -> Result<(), String> {
 		let peers = self.split_multiaddr_and_peer_id(peers)?;
 		for (peer_id, _) in peers.into_iter() {
 			let _ = self
@@ -1185,8 +1220,12 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	///
 	/// Returns an `Err` if one of the given addresses is invalid or contains an
 	/// invalid peer ID (which includes the local peer ID).
-	fn split_multiaddr_and_peer_id(&self, peers: HashSet<Multiaddr>) -> Result<Vec<(PeerId, Multiaddr)>, String> {
-		peers.into_iter()
+	fn split_multiaddr_and_peer_id(
+		&self,
+		peers: HashSet<Multiaddr>,
+	) -> Result<Vec<(PeerId, Multiaddr)>, String> {
+		peers
+			.into_iter()
 			.map(|mut addr| {
 				let peer = match addr.pop() {
 					Some(multiaddr::Protocol::P2p(key)) => PeerId::from_multihash(key)
@@ -1206,9 +1245,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	}
 }
 
-impl<B: BlockT + 'static, H: ExHashT> sp_consensus::SyncOracle
-	for NetworkService<B, H>
-{
+impl<B: BlockT + 'static, H: ExHashT> sp_consensus::SyncOracle for NetworkService<B, H> {
 	fn is_major_syncing(&mut self) -> bool {
 		NetworkService::is_major_syncing(self)
 	}
@@ -1218,9 +1255,7 @@ impl<B: BlockT + 'static, H: ExHashT> sp_consensus::SyncOracle
 	}
 }
 
-impl<'a, B: BlockT + 'static, H: ExHashT> sp_consensus::SyncOracle
-	for &'a NetworkService<B, H>
-{
+impl<'a, B: BlockT + 'static, H: ExHashT> sp_consensus::SyncOracle for &'a NetworkService<B, H> {
 	fn is_major_syncing(&mut self) -> bool {
 		NetworkService::is_major_syncing(self)
 	}
@@ -1241,9 +1276,9 @@ impl<B: BlockT, H: ExHashT> sp_consensus::JustificationSyncLink<B> for NetworkSe
 }
 
 impl<B, H> NetworkStateInfo for NetworkService<B, H>
-	where
-		B: sp_runtime::traits::Block,
-		H: ExHashT,
+where
+	B: sp_runtime::traits::Block,
+	H: ExHashT,
 {
 	/// Returns the local external addresses.
 	fn external_addresses(&self) -> Vec<Multiaddr> {
@@ -1271,7 +1306,9 @@ pub struct NotificationSender {
 
 impl NotificationSender {
 	/// Returns a future that resolves when the `NotificationSender` is ready to send a notification.
-	pub async fn ready<'a>(&'a self) -> Result<NotificationSenderReady<'a>, NotificationSenderError> {
+	pub async fn ready<'a>(
+		&'a self,
+	) -> Result<NotificationSenderReady<'a>, NotificationSenderError> {
 		Ok(NotificationSenderReady {
 			ready: match self.sink.reserve_notification().await {
 				Ok(r) => r,
@@ -1318,9 +1355,7 @@ impl<'a> NotificationSenderReady<'a> {
 		);
 		trace!(target: "sub-libp2p", "Handler({:?}) <= Async notification", self.peer_id);
 
-		self.ready
-			.send(notification)
-			.map_err(|()| NotificationSenderError::Closed)
+		self.ready.send(notification).map_err(|()| NotificationSenderError::Closed)
 	}
 }
 
@@ -1417,9 +1452,8 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 		let this = &mut *self;
 
 		// Poll the import queue for actions to perform.
-		this.import_queue.poll_actions(cx, &mut NetworkLink {
-			protocol: &mut this.network_service,
-		});
+		this.import_queue
+			.poll_actions(cx, &mut NetworkLink { protocol: &mut this.network_service });
 
 		// Check for new incoming light client requests.
 		if let Some(light_client_rqs) = this.light_client_rqs.as_mut() {
@@ -1428,8 +1462,10 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 				match result {
 					Ok(()) => {},
 					Err(light_client_requests::sender::SendRequestError::TooManyRequests) => {
-						log::warn!("Couldn't start light client request: too many pending requests");
-					}
+						log::warn!(
+							"Couldn't start light client request: too many pending requests"
+						);
+					},
 				}
 
 				if let Some(metrics) = this.metrics.as_ref() {
@@ -1451,7 +1487,7 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 			num_iterations += 1;
 			if num_iterations >= 100 {
 				cx.waker().wake_by_ref();
-				break;
+				break
 			}
 
 			// Process the next message coming from the `NetworkService`.
@@ -1462,12 +1498,21 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 			};
 
 			match msg {
-				ServiceToWorkerMsg::AnnounceBlock(hash, data) =>
-					this.network_service.behaviour_mut().user_protocol_mut().announce_block(hash, data),
-				ServiceToWorkerMsg::RequestJustification(hash, number) =>
-					this.network_service.behaviour_mut().user_protocol_mut().request_justification(&hash, number),
-				ServiceToWorkerMsg::ClearJustificationRequests =>
-					this.network_service.behaviour_mut().user_protocol_mut().clear_justification_requests(),
+				ServiceToWorkerMsg::AnnounceBlock(hash, data) => this
+					.network_service
+					.behaviour_mut()
+					.user_protocol_mut()
+					.announce_block(hash, data),
+				ServiceToWorkerMsg::RequestJustification(hash, number) => this
+					.network_service
+					.behaviour_mut()
+					.user_protocol_mut()
+					.request_justification(&hash, number),
+				ServiceToWorkerMsg::ClearJustificationRequests => this
+					.network_service
+					.behaviour_mut()
+					.user_protocol_mut()
+					.clear_justification_requests(),
 				ServiceToWorkerMsg::PropagateTransaction(hash) =>
 					this.tx_handler_controller.propagate_transaction(hash),
 				ServiceToWorkerMsg::PropagateTransactions =>
@@ -1476,30 +1521,68 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 					this.network_service.behaviour_mut().get_value(&key),
 				ServiceToWorkerMsg::PutValue(key, value) =>
 					this.network_service.behaviour_mut().put_value(key, value),
-				ServiceToWorkerMsg::SetReservedOnly(reserved_only) =>
-					this.network_service.behaviour_mut().user_protocol_mut().set_reserved_only(reserved_only),
-				ServiceToWorkerMsg::SetReserved(peers) =>
-					this.network_service.behaviour_mut().user_protocol_mut().set_reserved_peers(peers),
-				ServiceToWorkerMsg::AddReserved(peer_id) =>
-					this.network_service.behaviour_mut().user_protocol_mut().add_reserved_peer(peer_id),
-				ServiceToWorkerMsg::RemoveReserved(peer_id) =>
-					this.network_service.behaviour_mut().user_protocol_mut().remove_reserved_peer(peer_id),
-				ServiceToWorkerMsg::AddSetReserved(protocol, peer_id) =>
-					this.network_service.behaviour_mut().user_protocol_mut().add_set_reserved_peer(protocol, peer_id),
-				ServiceToWorkerMsg::RemoveSetReserved(protocol, peer_id) =>
-					this.network_service.behaviour_mut().user_protocol_mut().remove_set_reserved_peer(protocol, peer_id),
+				ServiceToWorkerMsg::SetReservedOnly(reserved_only) => this
+					.network_service
+					.behaviour_mut()
+					.user_protocol_mut()
+					.set_reserved_only(reserved_only),
+				ServiceToWorkerMsg::SetReserved(peers) => this
+					.network_service
+					.behaviour_mut()
+					.user_protocol_mut()
+					.set_reserved_peers(peers),
+				ServiceToWorkerMsg::AddReserved(peer_id) => this
+					.network_service
+					.behaviour_mut()
+					.user_protocol_mut()
+					.add_reserved_peer(peer_id),
+				ServiceToWorkerMsg::RemoveReserved(peer_id) => this
+					.network_service
+					.behaviour_mut()
+					.user_protocol_mut()
+					.remove_reserved_peer(peer_id),
+				ServiceToWorkerMsg::AddSetReserved(protocol, peer_id) => this
+					.network_service
+					.behaviour_mut()
+					.user_protocol_mut()
+					.add_set_reserved_peer(protocol, peer_id),
+				ServiceToWorkerMsg::RemoveSetReserved(protocol, peer_id) => this
+					.network_service
+					.behaviour_mut()
+					.user_protocol_mut()
+					.remove_set_reserved_peer(protocol, peer_id),
 				ServiceToWorkerMsg::AddKnownAddress(peer_id, addr) =>
 					this.network_service.behaviour_mut().add_known_address(peer_id, addr),
-				ServiceToWorkerMsg::AddToPeersSet(protocol, peer_id) =>
-					this.network_service.behaviour_mut().user_protocol_mut().add_to_peers_set(protocol, peer_id),
-				ServiceToWorkerMsg::RemoveFromPeersSet(protocol, peer_id) =>
-					this.network_service.behaviour_mut().user_protocol_mut().remove_from_peers_set(protocol, peer_id),
-				ServiceToWorkerMsg::SyncFork(peer_ids, hash, number) =>
-					this.network_service.behaviour_mut().user_protocol_mut().set_sync_fork_request(peer_ids, &hash, number),
-				ServiceToWorkerMsg::EventStream(sender) =>
-					this.event_streams.push(sender),
-				ServiceToWorkerMsg::Request { target, protocol, request, pending_response, connect } => {
-					this.network_service.behaviour_mut().send_request(&target, &protocol, request, pending_response, connect);
+				ServiceToWorkerMsg::AddToPeersSet(protocol, peer_id) => this
+					.network_service
+					.behaviour_mut()
+					.user_protocol_mut()
+					.add_to_peers_set(protocol, peer_id),
+				ServiceToWorkerMsg::RemoveFromPeersSet(protocol, peer_id) => this
+					.network_service
+					.behaviour_mut()
+					.user_protocol_mut()
+					.remove_from_peers_set(protocol, peer_id),
+				ServiceToWorkerMsg::SyncFork(peer_ids, hash, number) => this
+					.network_service
+					.behaviour_mut()
+					.user_protocol_mut()
+					.set_sync_fork_request(peer_ids, &hash, number),
+				ServiceToWorkerMsg::EventStream(sender) => this.event_streams.push(sender),
+				ServiceToWorkerMsg::Request {
+					target,
+					protocol,
+					request,
+					pending_response,
+					connect,
+				} => {
+					this.network_service.behaviour_mut().send_request(
+						&target,
+						&protocol,
+						request,
+						pending_response,
+						connect,
+					);
 				},
 				ServiceToWorkerMsg::NetworkStatus { pending_response } => {
 					let _ = pending_response.send(Ok(this.status()));
@@ -1507,10 +1590,16 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 				ServiceToWorkerMsg::NetworkState { pending_response } => {
 					let _ = pending_response.send(Ok(this.network_state()));
 				},
-				ServiceToWorkerMsg::DisconnectPeer(who, protocol_name) =>
-					this.network_service.behaviour_mut().user_protocol_mut().disconnect_peer(&who, &protocol_name),
-				ServiceToWorkerMsg::NewBestBlockImported(hash, number) =>
-					this.network_service.behaviour_mut().user_protocol_mut().new_best_block_imported(hash, number),
+				ServiceToWorkerMsg::DisconnectPeer(who, protocol_name) => this
+					.network_service
+					.behaviour_mut()
+					.user_protocol_mut()
+					.disconnect_peer(&who, &protocol_name),
+				ServiceToWorkerMsg::NewBestBlockImported(hash, number) => this
+					.network_service
+					.behaviour_mut()
+					.user_protocol_mut()
+					.new_best_block_imported(hash, number),
 			}
 		}
 
@@ -1521,7 +1610,7 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 			num_iterations += 1;
 			if num_iterations >= 1000 {
 				cx.waker().wake_by_ref();
-				break;
+				break
 			}
 
 			// Process the next action coming from the network.
@@ -1537,28 +1626,40 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 					}
 					this.import_queue.import_blocks(origin, blocks);
 				},
-				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::JustificationImport(origin, hash, nb, justifications))) => {
+				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::JustificationImport(
+					origin,
+					hash,
+					nb,
+					justifications,
+				))) => {
 					if let Some(metrics) = this.metrics.as_ref() {
 						metrics.import_queue_justifications_submitted.inc();
 					}
 					this.import_queue.import_justifications(origin, hash, nb, justifications);
 				},
-				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::InboundRequest { protocol, result, .. })) => {
+				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::InboundRequest {
+					protocol,
+					result,
+					..
+				})) => {
 					if let Some(metrics) = this.metrics.as_ref() {
 						match result {
 							Ok(serve_time) => {
-								metrics.requests_in_success_total
+								metrics
+									.requests_in_success_total
 									.with_label_values(&[&protocol])
 									.observe(serve_time.as_secs_f64());
-							}
+							},
 							Err(err) => {
 								let reason = match err {
 									ResponseFailure::Network(InboundFailure::Timeout) => "timeout",
-									ResponseFailure::Network(InboundFailure::UnsupportedProtocols) =>
-										// `UnsupportedProtocols` is reported for every single
-										// inbound request whenever a request with an unsupported
-										// protocol is received. This is not reported in order to
-										// avoid confusions.
+									ResponseFailure::Network(
+										InboundFailure::UnsupportedProtocols,
+									) =>
+									// `UnsupportedProtocols` is reported for every single
+									// inbound request whenever a request with an unsupported
+									// protocol is received. This is not reported in order to
+									// avoid confusions.
 										continue,
 									ResponseFailure::Network(InboundFailure::ResponseOmission) =>
 										"busy-omitted",
@@ -1566,23 +1667,28 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 										"connection-closed",
 								};
 
-								metrics.requests_in_failure_total
+								metrics
+									.requests_in_failure_total
 									.with_label_values(&[&protocol, reason])
 									.inc();
-							}
+							},
 						}
 					}
 				},
 				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::RequestFinished {
-					protocol, duration, result, ..
-				})) => {
+					protocol,
+					duration,
+					result,
+					..
+				})) =>
 					if let Some(metrics) = this.metrics.as_ref() {
 						match result {
 							Ok(_) => {
-								metrics.requests_out_success_total
+								metrics
+									.requests_out_success_total
 									.with_label_values(&[&protocol])
 									.observe(duration.as_secs_f64());
-							}
+							},
 							Err(err) => {
 								let reason = match err {
 									RequestFailure::NotConnected => "not-connected",
@@ -1591,34 +1697,42 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 									RequestFailure::Obsolete => "obsolete",
 									RequestFailure::Network(OutboundFailure::DialFailure) =>
 										"dial-failure",
-									RequestFailure::Network(OutboundFailure::Timeout) =>
-										"timeout",
+									RequestFailure::Network(OutboundFailure::Timeout) => "timeout",
 									RequestFailure::Network(OutboundFailure::ConnectionClosed) =>
 										"connection-closed",
-									RequestFailure::Network(OutboundFailure::UnsupportedProtocols) =>
-										"unsupported",
+									RequestFailure::Network(
+										OutboundFailure::UnsupportedProtocols,
+									) => "unsupported",
 								};
 
-								metrics.requests_out_failure_total
+								metrics
+									.requests_out_failure_total
 									.with_label_values(&[&protocol, reason])
 									.inc();
-							}
+							},
 						}
-					}
-				},
-				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::RandomKademliaStarted(protocol))) => {
+					},
+				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::RandomKademliaStarted(
+					protocol,
+				))) =>
 					if let Some(metrics) = this.metrics.as_ref() {
-						metrics.kademlia_random_queries_total
+						metrics
+							.kademlia_random_queries_total
 							.with_label_values(&[&protocol.as_ref()])
 							.inc();
-					}
-				},
+					},
 				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::NotificationStreamOpened {
-					remote, protocol, negotiated_fallback, notifications_sink, role
+					remote,
+					protocol,
+					negotiated_fallback,
+					notifications_sink,
+					role,
 				})) => {
 					if let Some(metrics) = this.metrics.as_ref() {
-						metrics.notifications_streams_opened_total
-							.with_label_values(&[&protocol]).inc();
+						metrics
+							.notifications_streams_opened_total
+							.with_label_values(&[&protocol])
+							.inc();
 					}
 					{
 						let mut peers_notifications_sinks = this.peers_notifications_sinks.lock();
@@ -1634,7 +1748,9 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 					});
 				},
 				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::NotificationStreamReplaced {
-					remote, protocol, notifications_sink
+					remote,
+					protocol,
+					notifications_sink,
 				})) => {
 					let mut peers_notifications_sinks = this.peers_notifications_sinks.lock();
 					if let Some(s) = peers_notifications_sinks.get_mut(&(remote, protocol)) {
@@ -1658,20 +1774,25 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 					// acceptable, this bug is at the moment intentionally left there and is
 					// intended to be fixed at the same time as
 					// https://github.com/paritytech/substrate/issues/6403.
-					/*this.event_streams.send(Event::NotificationStreamClosed {
-						remote,
-						protocol,
-					});
-					this.event_streams.send(Event::NotificationStreamOpened {
-						remote,
-						protocol,
-						role,
-					});*/
+					// this.event_streams.send(Event::NotificationStreamClosed {
+					// remote,
+					// protocol,
+					// });
+					// this.event_streams.send(Event::NotificationStreamOpened {
+					// remote,
+					// protocol,
+					// role,
+					// });
 				},
-				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::NotificationStreamClosed { remote, protocol })) => {
+				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::NotificationStreamClosed {
+					remote,
+					protocol,
+				})) => {
 					if let Some(metrics) = this.metrics.as_ref() {
-						metrics.notifications_streams_closed_total
-							.with_label_values(&[&protocol[..]]).inc();
+						metrics
+							.notifications_streams_closed_total
+							.with_label_values(&[&protocol[..]])
+							.inc();
 					}
 					this.event_streams.send(Event::NotificationStreamClosed {
 						remote: remote.clone(),
@@ -1679,23 +1800,24 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 					});
 					{
 						let mut peers_notifications_sinks = this.peers_notifications_sinks.lock();
-						let _previous_value = peers_notifications_sinks
-							.remove(&(remote.clone(), protocol));
+						let _previous_value =
+							peers_notifications_sinks.remove(&(remote.clone(), protocol));
 						debug_assert!(_previous_value.is_some());
 					}
 				},
-				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::NotificationsReceived { remote, messages })) => {
+				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::NotificationsReceived {
+					remote,
+					messages,
+				})) => {
 					if let Some(metrics) = this.metrics.as_ref() {
 						for (protocol, message) in &messages {
-							metrics.notifications_sizes
+							metrics
+								.notifications_sizes
 								.with_label_values(&["in", protocol])
 								.observe(message.len() as f64);
 						}
 					}
-					this.event_streams.send(Event::NotificationsReceived {
-						remote,
-						messages,
-					});
+					this.event_streams.send(Event::NotificationsReceived { remote, messages });
 				},
 				Poll::Ready(SwarmEvent::Behaviour(BehaviourOut::SyncConnected(remote))) => {
 					this.event_streams.send(Event::SyncConnected { remote });
@@ -1711,13 +1833,19 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 							DhtEvent::ValuePut(_) => "value-put",
 							DhtEvent::ValuePutFailed(_) => "value-put-failed",
 						};
-						metrics.kademlia_query_duration.with_label_values(&[query_type])
+						metrics
+							.kademlia_query_duration
+							.with_label_values(&[query_type])
 							.observe(duration.as_secs_f64());
 					}
 
 					this.event_streams.send(Event::Dht(event));
 				},
-				Poll::Ready(SwarmEvent::ConnectionEstablished { peer_id, endpoint, num_established }) => {
+				Poll::Ready(SwarmEvent::ConnectionEstablished {
+					peer_id,
+					endpoint,
+					num_established,
+				}) => {
 					debug!(target: "sub-libp2p", "Libp2p => Connected({:?})", peer_id);
 
 					if let Some(metrics) = this.metrics.as_ref() {
@@ -1732,7 +1860,12 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 						}
 					}
 				},
-				Poll::Ready(SwarmEvent::ConnectionClosed { peer_id, cause, endpoint, num_established }) => {
+				Poll::Ready(SwarmEvent::ConnectionClosed {
+					peer_id,
+					cause,
+					endpoint,
+					num_established,
+				}) => {
 					debug!(target: "sub-libp2p", "Libp2p => Disconnected({:?}, {:?})", peer_id, cause);
 					if let Some(metrics) = this.metrics.as_ref() {
 						let direction = match endpoint {
@@ -1741,17 +1874,27 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 						};
 						let reason = match cause {
 							Some(ConnectionError::IO(_)) => "transport-error",
-							Some(ConnectionError::Handler(NodeHandlerWrapperError::Handler(EitherError::A(EitherError::A(
-								EitherError::A(EitherError::B(EitherError::A(
-								PingFailure::Timeout)))))))) => "ping-timeout",
-							Some(ConnectionError::Handler(NodeHandlerWrapperError::Handler(EitherError::A(EitherError::A(
-								EitherError::A(EitherError::A(
-								NotifsHandlerError::SyncNotificationsClogged))))))) => "sync-notifications-clogged",
-							Some(ConnectionError::Handler(NodeHandlerWrapperError::Handler(_))) => "protocol-error",
-							Some(ConnectionError::Handler(NodeHandlerWrapperError::KeepAliveTimeout)) => "keep-alive-timeout",
+							Some(ConnectionError::Handler(NodeHandlerWrapperError::Handler(
+								EitherError::A(EitherError::A(EitherError::A(EitherError::B(
+									EitherError::A(PingFailure::Timeout),
+								)))),
+							))) => "ping-timeout",
+							Some(ConnectionError::Handler(NodeHandlerWrapperError::Handler(
+								EitherError::A(EitherError::A(EitherError::A(EitherError::A(
+									NotifsHandlerError::SyncNotificationsClogged,
+								)))),
+							))) => "sync-notifications-clogged",
+							Some(ConnectionError::Handler(NodeHandlerWrapperError::Handler(_))) =>
+								"protocol-error",
+							Some(ConnectionError::Handler(
+								NodeHandlerWrapperError::KeepAliveTimeout,
+							)) => "keep-alive-timeout",
 							None => "actively-closed",
 						};
-						metrics.connections_closed_total.with_label_values(&[direction, reason]).inc();
+						metrics
+							.connections_closed_total
+							.with_label_values(&[direction, reason])
+							.inc();
 
 						// `num_established` represents the number of *remaining* connections.
 						if num_established == 0 {
@@ -1791,15 +1934,22 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 
 					if let Some(metrics) = this.metrics.as_ref() {
 						match error {
-							PendingConnectionError::ConnectionLimit(_) =>
-								metrics.pending_connections_errors_total.with_label_values(&["limit-reached"]).inc(),
-							PendingConnectionError::InvalidPeerId =>
-								metrics.pending_connections_errors_total.with_label_values(&["invalid-peer-id"]).inc(),
-							PendingConnectionError::Transport(_) | PendingConnectionError::IO(_) =>
-								metrics.pending_connections_errors_total.with_label_values(&["transport-error"]).inc(),
+							PendingConnectionError::ConnectionLimit(_) => metrics
+								.pending_connections_errors_total
+								.with_label_values(&["limit-reached"])
+								.inc(),
+							PendingConnectionError::InvalidPeerId => metrics
+								.pending_connections_errors_total
+								.with_label_values(&["invalid-peer-id"])
+								.inc(),
+							PendingConnectionError::Transport(_) |
+							PendingConnectionError::IO(_) => metrics
+								.pending_connections_errors_total
+								.with_label_values(&["transport-error"])
+								.inc(),
 						}
 					}
-				}
+				},
 				Poll::Ready(SwarmEvent::Dialing(peer_id)) =>
 					trace!(target: "sub-libp2p", "Libp2p => Dialing({:?})", peer_id),
 				Poll::Ready(SwarmEvent::IncomingConnection { local_addr, send_back_addr }) => {
@@ -1809,7 +1959,11 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 						metrics.incoming_connections_total.inc();
 					}
 				},
-				Poll::Ready(SwarmEvent::IncomingConnectionError { local_addr, send_back_addr, error }) => {
+				Poll::Ready(SwarmEvent::IncomingConnectionError {
+					local_addr,
+					send_back_addr,
+					error,
+				}) => {
 					debug!(target: "sub-libp2p", "Libp2p => IncomingConnectionError({},{}): {}",
 						local_addr, send_back_addr, error);
 					if let Some(metrics) = this.metrics.as_ref() {
@@ -1820,14 +1974,20 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 							PendingConnectionError::IO(_) => "transport-error",
 						};
 
-						metrics.incoming_connections_errors_total.with_label_values(&[reason]).inc();
+						metrics
+							.incoming_connections_errors_total
+							.with_label_values(&[reason])
+							.inc();
 					}
 				},
 				Poll::Ready(SwarmEvent::BannedPeer { peer_id, endpoint }) => {
 					debug!(target: "sub-libp2p", "Libp2p => BannedPeer({}). Connected via {:?}.",
 						peer_id, endpoint);
 					if let Some(metrics) = this.metrics.as_ref() {
-						metrics.incoming_connections_errors_total.with_label_values(&["banned"]).inc();
+						metrics
+							.incoming_connections_errors_total
+							.with_label_values(&["banned"])
+							.inc();
 					}
 				},
 				Poll::Ready(SwarmEvent::UnknownPeerUnreachableAddr { address, error }) =>
@@ -1837,8 +1997,8 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 					if let Some(metrics) = this.metrics.as_ref() {
 						metrics.listeners_local_addresses.sub(addresses.len() as u64);
 					}
-					let addrs = addresses.into_iter().map(|a| a.to_string())
-						.collect::<Vec<_>>().join(", ");
+					let addrs =
+						addresses.into_iter().map(|a| a.to_string()).collect::<Vec<_>>().join(", ");
 					match reason {
 						Ok(()) => error!(
 							target: "sub-libp2p",
@@ -1861,7 +2021,8 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 			};
 		}
 
-		let num_connected_peers = this.network_service.behaviour_mut().user_protocol_mut().num_connected_peers();
+		let num_connected_peers =
+			this.network_service.behaviour_mut().user_protocol_mut().num_connected_peers();
 
 		// Update the variables shared with the `NetworkService`.
 		this.num_connected.store(num_connected_peers, Ordering::Relaxed);
@@ -1873,10 +2034,11 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 			*this.external_addresses.lock() = external_addresses;
 		}
 
-		let is_major_syncing = match this.network_service.behaviour_mut().user_protocol_mut().sync_state().state {
-			SyncState::Idle => false,
-			SyncState::Downloading => true,
-		};
+		let is_major_syncing =
+			match this.network_service.behaviour_mut().user_protocol_mut().sync_state().state {
+				SyncState::Idle => false,
+				SyncState::Downloading => true,
+			};
 
 		this.tx_handler_controller.set_gossip_enabled(!is_major_syncing);
 
@@ -1885,25 +2047,41 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 		if let Some(metrics) = this.metrics.as_ref() {
 			for (proto, buckets) in this.network_service.behaviour_mut().num_entries_per_kbucket() {
 				for (lower_ilog2_bucket_bound, num_entries) in buckets {
-					metrics.kbuckets_num_nodes
-						.with_label_values(&[&proto.as_ref(), &lower_ilog2_bucket_bound.to_string()])
+					metrics
+						.kbuckets_num_nodes
+						.with_label_values(&[
+							&proto.as_ref(),
+							&lower_ilog2_bucket_bound.to_string(),
+						])
 						.set(num_entries as u64);
 				}
 			}
-			for (proto, num_entries) in this.network_service.behaviour_mut().num_kademlia_records() {
-				metrics.kademlia_records_count.with_label_values(&[&proto.as_ref()]).set(num_entries as u64);
+			for (proto, num_entries) in this.network_service.behaviour_mut().num_kademlia_records()
+			{
+				metrics
+					.kademlia_records_count
+					.with_label_values(&[&proto.as_ref()])
+					.set(num_entries as u64);
 			}
-			for (proto, num_entries) in this.network_service.behaviour_mut().kademlia_records_total_size() {
-				metrics.kademlia_records_sizes_total.with_label_values(&[&proto.as_ref()]).set(num_entries as u64);
+			for (proto, num_entries) in
+				this.network_service.behaviour_mut().kademlia_records_total_size()
+			{
+				metrics
+					.kademlia_records_sizes_total
+					.with_label_values(&[&proto.as_ref()])
+					.set(num_entries as u64);
 			}
-			metrics.peerset_num_discovered.set(
-				this.network_service.behaviour_mut().user_protocol().num_discovered_peers() as u64
-			);
+			metrics
+				.peerset_num_discovered
+				.set(this.network_service.behaviour_mut().user_protocol().num_discovered_peers()
+					as u64);
 			metrics.peerset_num_requested.set(
-				this.network_service.behaviour_mut().user_protocol().requested_peers().count() as u64
+				this.network_service.behaviour_mut().user_protocol().requested_peers().count()
+					as u64,
 			);
 			metrics.pending_connections.set(
-				Swarm::network_info(&this.network_service).connection_counters().num_pending() as u64
+				Swarm::network_info(&this.network_service).connection_counters().num_pending()
+					as u64,
 			);
 		}
 
@@ -1911,8 +2089,7 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 	}
 }
 
-impl<B: BlockT + 'static, H: ExHashT> Unpin for NetworkWorker<B, H> {
-}
+impl<B: BlockT + 'static, H: ExHashT> Unpin for NetworkWorker<B, H> {}
 
 /// The libp2p swarm, customized for our needs.
 type Swarm<B> = libp2p::swarm::Swarm<Behaviour<B>>;
@@ -1927,15 +2104,32 @@ impl<'a, B: BlockT> Link<B> for NetworkLink<'a, B> {
 		&mut self,
 		imported: usize,
 		count: usize,
-		results: Vec<(Result<BlockImportResult<NumberFor<B>>, BlockImportError>, B::Hash)>
+		results: Vec<(Result<BlockImportResult<NumberFor<B>>, BlockImportError>, B::Hash)>,
 	) {
-		self.protocol.behaviour_mut().user_protocol_mut().on_blocks_processed(imported, count, results)
+		self.protocol
+			.behaviour_mut()
+			.user_protocol_mut()
+			.on_blocks_processed(imported, count, results)
 	}
-	fn justification_imported(&mut self, who: PeerId, hash: &B::Hash, number: NumberFor<B>, success: bool) {
-		self.protocol.behaviour_mut().user_protocol_mut().justification_import_result(who, hash.clone(), number, success);
+	fn justification_imported(
+		&mut self,
+		who: PeerId,
+		hash: &B::Hash,
+		number: NumberFor<B>,
+		success: bool,
+	) {
+		self.protocol.behaviour_mut().user_protocol_mut().justification_import_result(
+			who,
+			hash.clone(),
+			number,
+			success,
+		);
 	}
 	fn request_justification(&mut self, hash: &B::Hash, number: NumberFor<B>) {
-		self.protocol.behaviour_mut().user_protocol_mut().request_justification(hash, number)
+		self.protocol
+			.behaviour_mut()
+			.user_protocol_mut()
+			.request_justification(hash, number)
 	}
 }
 
@@ -1945,9 +2139,9 @@ fn ensure_addresses_consistent_with_transport<'a>(
 ) -> Result<(), Error> {
 	if matches!(transport, TransportConfig::MemoryOnly) {
 		let addresses: Vec<_> = addresses
-			.filter(|x| x.iter()
-				.any(|y| !matches!(y, libp2p::core::multiaddr::Protocol::Memory(_)))
-			)
+			.filter(|x| {
+				x.iter().any(|y| !matches!(y, libp2p::core::multiaddr::Protocol::Memory(_)))
+			})
 			.cloned()
 			.collect();
 
@@ -1955,13 +2149,11 @@ fn ensure_addresses_consistent_with_transport<'a>(
 			return Err(Error::AddressesForAnotherTransport {
 				transport: transport.clone(),
 				addresses,
-			});
+			})
 		}
 	} else {
 		let addresses: Vec<_> = addresses
-			.filter(|x| x.iter()
-				.any(|y| matches!(y, libp2p::core::multiaddr::Protocol::Memory(_)))
-			)
+			.filter(|x| x.iter().any(|y| matches!(y, libp2p::core::multiaddr::Protocol::Memory(_))))
 			.cloned()
 			.collect();
 
@@ -1969,7 +2161,7 @@ fn ensure_addresses_consistent_with_transport<'a>(
 			return Err(Error::AddressesForAnotherTransport {
 				transport: transport.clone(),
 				addresses,
-			});
+			})
 		}
 	}
 
diff --git a/client/network/src/service/metrics.rs b/client/network/src/service/metrics.rs
index 40d65ea45f11..e33cd4b194d6 100644
--- a/client/network/src/service/metrics.rs
+++ b/client/network/src/service/metrics.rs
@@ -18,10 +18,8 @@
 
 use crate::transport::BandwidthSinks;
 use prometheus_endpoint::{
-	self as prometheus,
-	Counter, CounterVec, Gauge, GaugeVec, HistogramOpts,
-	PrometheusError, Registry, U64, Opts,
-	SourcedCounter, SourcedGauge, MetricSource,
+	self as prometheus, Counter, CounterVec, Gauge, GaugeVec, HistogramOpts, MetricSource, Opts,
+	PrometheusError, Registry, SourcedCounter, SourcedGauge, U64,
 };
 use std::{
 	str,
@@ -267,13 +265,14 @@ impl BandwidthCounters {
 	/// Registers the `BandwidthCounters` metric whose values are
 	/// obtained from the given sinks.
 	fn register(registry: &Registry, sinks: Arc<BandwidthSinks>) -> Result<(), PrometheusError> {
-		prometheus::register(SourcedCounter::new(
-			&Opts::new(
-				"sub_libp2p_network_bytes_total",
-				"Total bandwidth usage"
-			).variable_label("direction"),
-			BandwidthCounters(sinks),
-		)?, registry)?;
+		prometheus::register(
+			SourcedCounter::new(
+				&Opts::new("sub_libp2p_network_bytes_total", "Total bandwidth usage")
+					.variable_label("direction"),
+				BandwidthCounters(sinks),
+			)?,
+			registry,
+		)?;
 
 		Ok(())
 	}
@@ -296,13 +295,16 @@ impl MajorSyncingGauge {
 	/// Registers the `MajorSyncGauge` metric whose value is
 	/// obtained from the given `AtomicBool`.
 	fn register(registry: &Registry, value: Arc<AtomicBool>) -> Result<(), PrometheusError> {
-		prometheus::register(SourcedGauge::new(
-			&Opts::new(
-				"sub_libp2p_is_major_syncing",
-				"Whether the node is performing a major sync or not.",
-			),
-			MajorSyncingGauge(value),
-		)?, registry)?;
+		prometheus::register(
+			SourcedGauge::new(
+				&Opts::new(
+					"sub_libp2p_is_major_syncing",
+					"Whether the node is performing a major sync or not.",
+				),
+				MajorSyncingGauge(value),
+			)?,
+			registry,
+		)?;
 
 		Ok(())
 	}
@@ -324,13 +326,13 @@ impl NumConnectedGauge {
 	/// Registers the `MajorSyncingGauge` metric whose value is
 	/// obtained from the given `AtomicUsize`.
 	fn register(registry: &Registry, value: Arc<AtomicUsize>) -> Result<(), PrometheusError> {
-		prometheus::register(SourcedGauge::new(
-			&Opts::new(
-				"sub_libp2p_peers_count",
-				"Number of connected peers",
-			),
-			NumConnectedGauge(value),
-		)?, registry)?;
+		prometheus::register(
+			SourcedGauge::new(
+				&Opts::new("sub_libp2p_peers_count", "Number of connected peers"),
+				NumConnectedGauge(value),
+			)?,
+			registry,
+		)?;
 
 		Ok(())
 	}
diff --git a/client/network/src/service/out_events.rs b/client/network/src/service/out_events.rs
index 7ec6c608a8fc..fad61491fb22 100644
--- a/client/network/src/service/out_events.rs
+++ b/client/network/src/service/out_events.rs
@@ -30,17 +30,18 @@
 //! [`OutChannels::push`] to put the sender within a [`OutChannels`].
 //! - Send events by calling [`OutChannels::send`]. Events are cloned for each sender in the
 //! collection.
-//!
 
 use crate::Event;
 
-use futures::{prelude::*, channel::mpsc, ready, stream::FusedStream};
+use futures::{channel::mpsc, prelude::*, ready, stream::FusedStream};
 use parking_lot::Mutex;
 use prometheus_endpoint::{register, CounterVec, GaugeVec, Opts, PrometheusError, Registry, U64};
 use std::{
 	convert::TryFrom as _,
-	fmt, pin::Pin, sync::Arc,
-	task::{Context, Poll}
+	fmt,
+	pin::Pin,
+	sync::Arc,
+	task::{Context, Poll},
 };
 
 /// Creates a new channel that can be associated to a [`OutChannels`].
@@ -100,8 +101,10 @@ impl Stream for Receiver {
 			let metrics = self.metrics.lock().clone();
 			match metrics.as_ref().map(|m| m.as_ref()) {
 				Some(Some(metrics)) => metrics.event_out(&ev, self.name),
-				Some(None) => (),	// no registry
-				None => log::warn!("Inconsistency in out_events: event happened before sender associated"),
+				Some(None) => (), // no registry
+				None => log::warn!(
+					"Inconsistency in out_events: event happened before sender associated"
+				),
 			}
 			Poll::Ready(Some(ev))
 		} else {
@@ -136,16 +139,10 @@ pub struct OutChannels {
 impl OutChannels {
 	/// Creates a new empty collection of senders.
 	pub fn new(registry: Option<&Registry>) -> Result<Self, PrometheusError> {
-		let metrics = if let Some(registry) = registry {
-			Some(Metrics::register(registry)?)
-		} else {
-			None
-		};
+		let metrics =
+			if let Some(registry) = registry { Some(Metrics::register(registry)?) } else { None };
 
-		Ok(OutChannels {
-			event_streams: Vec::new(),
-			metrics: Arc::new(metrics),
-		})
+		Ok(OutChannels { event_streams: Vec::new(), metrics: Arc::new(metrics) })
 	}
 
 	/// Adds a new [`Sender`] to the collection.
@@ -164,9 +161,8 @@ impl OutChannels {
 
 	/// Sends an event.
 	pub fn send(&mut self, event: Event) {
-		self.event_streams.retain(|sender| {
-			sender.inner.unbounded_send(event.clone()).is_ok()
-		});
+		self.event_streams
+			.retain(|sender| sender.inner.unbounded_send(event.clone()).is_ok());
 
 		if let Some(metrics) = &*self.metrics {
 			for ev in &self.event_streams {
@@ -223,20 +219,18 @@ impl Metrics {
 	fn event_in(&self, event: &Event, num: u64, name: &str) {
 		match event {
 			Event::Dht(_) => {
-				self.events_total
-					.with_label_values(&["dht", "sent", name])
-					.inc_by(num);
-			}
+				self.events_total.with_label_values(&["dht", "sent", name]).inc_by(num);
+			},
 			Event::SyncConnected { .. } => {
 				self.events_total
 					.with_label_values(&["sync-connected", "sent", name])
 					.inc_by(num);
-			}
+			},
 			Event::SyncDisconnected { .. } => {
 				self.events_total
 					.with_label_values(&["sync-disconnected", "sent", name])
 					.inc_by(num);
-			}
+			},
 			Event::NotificationStreamOpened { protocol, .. } => {
 				self.events_total
 					.with_label_values(&[&format!("notif-open-{:?}", protocol), "sent", name])
@@ -247,36 +241,31 @@ impl Metrics {
 					.with_label_values(&[&format!("notif-closed-{:?}", protocol), "sent", name])
 					.inc_by(num);
 			},
-			Event::NotificationsReceived { messages, .. } => {
+			Event::NotificationsReceived { messages, .. } =>
 				for (protocol, message) in messages {
 					self.events_total
 						.with_label_values(&[&format!("notif-{:?}", protocol), "sent", name])
 						.inc_by(num);
-					self.notifications_sizes
-						.with_label_values(&[protocol, "sent", name])
-						.inc_by(num.saturating_mul(u64::try_from(message.len()).unwrap_or(u64::MAX)));
-				}
-			},
+					self.notifications_sizes.with_label_values(&[protocol, "sent", name]).inc_by(
+						num.saturating_mul(u64::try_from(message.len()).unwrap_or(u64::MAX)),
+					);
+				},
 		}
 	}
 
 	fn event_out(&self, event: &Event, name: &str) {
 		match event {
 			Event::Dht(_) => {
-				self.events_total
-					.with_label_values(&["dht", "received", name])
-					.inc();
-			}
+				self.events_total.with_label_values(&["dht", "received", name]).inc();
+			},
 			Event::SyncConnected { .. } => {
-				self.events_total
-					.with_label_values(&["sync-connected", "received", name])
-					.inc();
-			}
+				self.events_total.with_label_values(&["sync-connected", "received", name]).inc();
+			},
 			Event::SyncDisconnected { .. } => {
 				self.events_total
 					.with_label_values(&["sync-disconnected", "received", name])
 					.inc();
-			}
+			},
 			Event::NotificationStreamOpened { protocol, .. } => {
 				self.events_total
 					.with_label_values(&[&format!("notif-open-{:?}", protocol), "received", name])
@@ -287,7 +276,7 @@ impl Metrics {
 					.with_label_values(&[&format!("notif-closed-{:?}", protocol), "received", name])
 					.inc();
 			},
-			Event::NotificationsReceived { messages, .. } => {
+			Event::NotificationsReceived { messages, .. } =>
 				for (protocol, message) in messages {
 					self.events_total
 						.with_label_values(&[&format!("notif-{:?}", protocol), "received", name])
@@ -295,8 +284,7 @@ impl Metrics {
 					self.notifications_sizes
 						.with_label_values(&[&protocol, "received", name])
 						.inc_by(u64::try_from(message.len()).unwrap_or(u64::MAX));
-				}
-			},
+				},
 		}
 	}
 }
diff --git a/client/network/src/service/tests.rs b/client/network/src/service/tests.rs
index 4a739e50628a..7acfeadcae13 100644
--- a/client/network/src/service/tests.rs
+++ b/client/network/src/service/tests.rs
@@ -16,13 +16,14 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::{config, Event, NetworkService, NetworkWorker};
-use crate::block_request_handler::BlockRequestHandler;
-use crate::state_request_handler::StateRequestHandler;
-use crate::light_client_requests::handler::LightClientRequestHandler;
+use crate::{
+	block_request_handler::BlockRequestHandler, config,
+	light_client_requests::handler::LightClientRequestHandler,
+	state_request_handler::StateRequestHandler, Event, NetworkService, NetworkWorker,
+};
 
-use libp2p::PeerId;
 use futures::prelude::*;
+use libp2p::PeerId;
 use sp_runtime::traits::{Block as BlockT, Header as _};
 use std::{borrow::Cow, sync::Arc, time::Duration};
 use substrate_test_runtime_client::{TestClientBuilder, TestClientBuilderExt as _};
@@ -37,14 +38,10 @@ type TestNetworkService = NetworkService<
 ///
 /// > **Note**: We return the events stream in order to not possibly lose events between the
 /// >			construction of the service and the moment the events stream is grabbed.
-fn build_test_full_node(config: config::NetworkConfiguration)
-	-> (Arc<TestNetworkService>, impl Stream<Item = Event>)
-{
-	let client = Arc::new(
-		TestClientBuilder::with_default_backend()
-			.build_with_longest_chain()
-			.0,
-	);
+fn build_test_full_node(
+	config: config::NetworkConfiguration,
+) -> (Arc<TestNetworkService>, impl Stream<Item = Event>) {
+	let client = Arc::new(TestClientBuilder::with_default_backend().build_with_longest_chain().0);
 
 	#[derive(Clone)]
 	struct PassThroughVerifier(bool);
@@ -69,14 +66,13 @@ fn build_test_full_node(config: config::NetworkConfiguration)
 				.log(|l| {
 					l.try_as_raw(sp_runtime::generic::OpaqueDigestItemId::Consensus(b"aura"))
 						.or_else(|| {
-							l.try_as_raw(sp_runtime::generic::OpaqueDigestItemId::Consensus(b"babe"))
+							l.try_as_raw(sp_runtime::generic::OpaqueDigestItemId::Consensus(
+								b"babe",
+							))
 						})
 				})
 				.map(|blob| {
-					vec![(
-						sp_blockchain::well_known_cache_keys::AUTHORITIES,
-						blob.to_vec(),
-					)]
+					vec![(sp_blockchain::well_known_cache_keys::AUTHORITIES, blob.to_vec())]
 				});
 
 			let mut import = sp_consensus::BlockImportParams::new(origin, header);
@@ -99,30 +95,20 @@ fn build_test_full_node(config: config::NetworkConfiguration)
 	let protocol_id = config::ProtocolId::from("/test-protocol-name");
 
 	let block_request_protocol_config = {
-		let (handler, protocol_config) = BlockRequestHandler::new(
-			&protocol_id,
-			client.clone(),
-			50,
-		);
+		let (handler, protocol_config) = BlockRequestHandler::new(&protocol_id, client.clone(), 50);
 		async_std::task::spawn(handler.run().boxed());
 		protocol_config
 	};
 
 	let state_request_protocol_config = {
-		let (handler, protocol_config) = StateRequestHandler::new(
-			&protocol_id,
-			client.clone(),
-			50,
-		);
+		let (handler, protocol_config) = StateRequestHandler::new(&protocol_id, client.clone(), 50);
 		async_std::task::spawn(handler.run().boxed());
 		protocol_config
 	};
 
 	let light_client_request_protocol_config = {
-		let (handler, protocol_config) = LightClientRequestHandler::new(
-			&protocol_id,
-			client.clone(),
-		);
+		let (handler, protocol_config) =
+			LightClientRequestHandler::new(&protocol_id, client.clone());
 		async_std::task::spawn(handler.run().boxed());
 		protocol_config
 	};
@@ -130,7 +116,9 @@ fn build_test_full_node(config: config::NetworkConfiguration)
 	let worker = NetworkWorker::new(config::Params {
 		role: config::Role::Full,
 		executor: None,
-		transactions_handler_executor: Box::new(|task| { async_std::task::spawn(task); }),
+		transactions_handler_executor: Box::new(|task| {
+			async_std::task::spawn(task);
+		}),
 		network_config: config,
 		chain: client.clone(),
 		on_demand: None,
@@ -162,43 +150,42 @@ const PROTOCOL_NAME: Cow<'static, str> = Cow::Borrowed("/foo");
 
 /// Builds two nodes and their associated events stream.
 /// The nodes are connected together and have the `PROTOCOL_NAME` protocol registered.
-fn build_nodes_one_proto()
-	-> (Arc<TestNetworkService>, impl Stream<Item = Event>, Arc<TestNetworkService>, impl Stream<Item = Event>)
-{
+fn build_nodes_one_proto() -> (
+	Arc<TestNetworkService>,
+	impl Stream<Item = Event>,
+	Arc<TestNetworkService>,
+	impl Stream<Item = Event>,
+) {
 	let listen_addr = config::build_multiaddr![Memory(rand::random::<u64>())];
 
 	let (node1, events_stream1) = build_test_full_node(config::NetworkConfiguration {
-		extra_sets: vec![
-			config::NonDefaultSetConfig {
-				notifications_protocol: PROTOCOL_NAME,
-				fallback_names: Vec::new(),
-				max_notification_size: 1024 * 1024,
-				set_config: Default::default()
-			}
-		],
+		extra_sets: vec![config::NonDefaultSetConfig {
+			notifications_protocol: PROTOCOL_NAME,
+			fallback_names: Vec::new(),
+			max_notification_size: 1024 * 1024,
+			set_config: Default::default(),
+		}],
 		listen_addresses: vec![listen_addr.clone()],
 		transport: config::TransportConfig::MemoryOnly,
-		.. config::NetworkConfiguration::new_local()
+		..config::NetworkConfiguration::new_local()
 	});
 
 	let (node2, events_stream2) = build_test_full_node(config::NetworkConfiguration {
-		extra_sets: vec![
-			config::NonDefaultSetConfig {
-				notifications_protocol: PROTOCOL_NAME,
-				fallback_names: Vec::new(),
-				max_notification_size: 1024 * 1024,
-				set_config: config::SetConfig {
-					reserved_nodes: vec![config::MultiaddrWithPeerId {
-						multiaddr: listen_addr,
-						peer_id: node1.local_peer_id().clone(),
-					}],
-					.. Default::default()
-				}
-			}
-		],
+		extra_sets: vec![config::NonDefaultSetConfig {
+			notifications_protocol: PROTOCOL_NAME,
+			fallback_names: Vec::new(),
+			max_notification_size: 1024 * 1024,
+			set_config: config::SetConfig {
+				reserved_nodes: vec![config::MultiaddrWithPeerId {
+					multiaddr: listen_addr,
+					peer_id: node1.local_peer_id().clone(),
+				}],
+				..Default::default()
+			},
+		}],
 		listen_addresses: vec![],
 		transport: config::TransportConfig::MemoryOnly,
-		.. config::NetworkConfiguration::new_local()
+		..config::NetworkConfiguration::new_local()
 	});
 
 	(node1, events_stream1, node2, events_stream2)
@@ -214,10 +201,18 @@ fn notifications_state_consistent() {
 
 	// Write some initial notifications that shouldn't get through.
 	for _ in 0..(rand::random::<u8>() % 5) {
-		node1.write_notification(node2.local_peer_id().clone(), PROTOCOL_NAME, b"hello world".to_vec());
+		node1.write_notification(
+			node2.local_peer_id().clone(),
+			PROTOCOL_NAME,
+			b"hello world".to_vec(),
+		);
 	}
 	for _ in 0..(rand::random::<u8>() % 5) {
-		node2.write_notification(node1.local_peer_id().clone(), PROTOCOL_NAME, b"hello world".to_vec());
+		node2.write_notification(
+			node1.local_peer_id().clone(),
+			PROTOCOL_NAME,
+			b"hello world".to_vec(),
+		);
 	}
 
 	async_std::task::block_on(async move {
@@ -234,16 +229,24 @@ fn notifications_state_consistent() {
 			iterations += 1;
 			if iterations >= 1_000 {
 				assert!(something_happened);
-				break;
+				break
 			}
 
 			// Start by sending a notification from node1 to node2 and vice-versa. Part of the
 			// test consists in ensuring that notifications get ignored if the stream isn't open.
 			if rand::random::<u8>() % 5 >= 3 {
-				node1.write_notification(node2.local_peer_id().clone(), PROTOCOL_NAME, b"hello world".to_vec());
+				node1.write_notification(
+					node2.local_peer_id().clone(),
+					PROTOCOL_NAME,
+					b"hello world".to_vec(),
+				);
 			}
 			if rand::random::<u8>() % 5 >= 3 {
-				node2.write_notification(node1.local_peer_id().clone(), PROTOCOL_NAME, b"hello world".to_vec());
+				node2.write_notification(
+					node1.local_peer_id().clone(),
+					PROTOCOL_NAME,
+					b"hello world".to_vec(),
+				);
 			}
 
 			// Also randomly disconnect the two nodes from time to time.
@@ -272,32 +275,40 @@ fn notifications_state_consistent() {
 			};
 
 			match next_event {
-				future::Either::Left(Event::NotificationStreamOpened { remote, protocol, .. }) => {
+				future::Either::Left(Event::NotificationStreamOpened {
+					remote, protocol, ..
+				}) => {
 					something_happened = true;
 					assert!(!node1_to_node2_open);
 					node1_to_node2_open = true;
 					assert_eq!(remote, *node2.local_peer_id());
 					assert_eq!(protocol, PROTOCOL_NAME);
-				}
-				future::Either::Right(Event::NotificationStreamOpened { remote, protocol, .. }) => {
+				},
+				future::Either::Right(Event::NotificationStreamOpened {
+					remote, protocol, ..
+				}) => {
 					something_happened = true;
 					assert!(!node2_to_node1_open);
 					node2_to_node1_open = true;
 					assert_eq!(remote, *node1.local_peer_id());
 					assert_eq!(protocol, PROTOCOL_NAME);
-				}
-				future::Either::Left(Event::NotificationStreamClosed { remote, protocol, .. }) => {
+				},
+				future::Either::Left(Event::NotificationStreamClosed {
+					remote, protocol, ..
+				}) => {
 					assert!(node1_to_node2_open);
 					node1_to_node2_open = false;
 					assert_eq!(remote, *node2.local_peer_id());
 					assert_eq!(protocol, PROTOCOL_NAME);
-				}
-				future::Either::Right(Event::NotificationStreamClosed { remote, protocol, .. }) => {
+				},
+				future::Either::Right(Event::NotificationStreamClosed {
+					remote, protocol, ..
+				}) => {
 					assert!(node2_to_node1_open);
 					node2_to_node1_open = false;
 					assert_eq!(remote, *node1.local_peer_id());
 					assert_eq!(protocol, PROTOCOL_NAME);
-				}
+				},
 				future::Either::Left(Event::NotificationsReceived { remote, .. }) => {
 					assert!(node1_to_node2_open);
 					assert_eq!(remote, *node2.local_peer_id());
@@ -305,10 +316,10 @@ fn notifications_state_consistent() {
 						node1.write_notification(
 							node2.local_peer_id().clone(),
 							PROTOCOL_NAME,
-							b"hello world".to_vec()
+							b"hello world".to_vec(),
 						);
 					}
-				}
+				},
 				future::Either::Right(Event::NotificationsReceived { remote, .. }) => {
 					assert!(node2_to_node1_open);
 					assert_eq!(remote, *node1.local_peer_id());
@@ -316,18 +327,18 @@ fn notifications_state_consistent() {
 						node2.write_notification(
 							node1.local_peer_id().clone(),
 							PROTOCOL_NAME,
-							b"hello world".to_vec()
+							b"hello world".to_vec(),
 						);
 					}
-				}
+				},
 
 				// Add new events here.
-				future::Either::Left(Event::SyncConnected { .. }) => {}
-				future::Either::Right(Event::SyncConnected { .. }) => {}
-				future::Either::Left(Event::SyncDisconnected { .. }) => {}
-				future::Either::Right(Event::SyncDisconnected { .. }) => {}
-				future::Either::Left(Event::Dht(_)) => {}
-				future::Either::Right(Event::Dht(_)) => {}
+				future::Either::Left(Event::SyncConnected { .. }) => {},
+				future::Either::Right(Event::SyncConnected { .. }) => {},
+				future::Either::Left(Event::SyncDisconnected { .. }) => {},
+				future::Either::Right(Event::SyncDisconnected { .. }) => {},
+				future::Either::Left(Event::Dht(_)) => {},
+				future::Either::Right(Event::Dht(_)) => {},
 			};
 		}
 	});
@@ -339,19 +350,14 @@ fn lots_of_incoming_peers_works() {
 
 	let (main_node, _) = build_test_full_node(config::NetworkConfiguration {
 		listen_addresses: vec![listen_addr.clone()],
-		extra_sets: vec![
-			config::NonDefaultSetConfig {
-				notifications_protocol: PROTOCOL_NAME,
-				fallback_names: Vec::new(),
-				max_notification_size: 1024 * 1024,
-				set_config: config::SetConfig {
-					in_peers: u32::MAX,
-					.. Default::default()
-				},
-			}
-		],
+		extra_sets: vec![config::NonDefaultSetConfig {
+			notifications_protocol: PROTOCOL_NAME,
+			fallback_names: Vec::new(),
+			max_notification_size: 1024 * 1024,
+			set_config: config::SetConfig { in_peers: u32::MAX, ..Default::default() },
+		}],
 		transport: config::TransportConfig::MemoryOnly,
-		.. config::NetworkConfiguration::new_local()
+		..config::NetworkConfiguration::new_local()
 	});
 
 	let main_node_peer_id = main_node.local_peer_id().clone();
@@ -365,22 +371,20 @@ fn lots_of_incoming_peers_works() {
 
 		let (_dialing_node, event_stream) = build_test_full_node(config::NetworkConfiguration {
 			listen_addresses: vec![],
-			extra_sets: vec![
-				config::NonDefaultSetConfig {
-					notifications_protocol: PROTOCOL_NAME,
-					fallback_names: Vec::new(),
-					max_notification_size: 1024 * 1024,
-					set_config: config::SetConfig {
-						reserved_nodes: vec![config::MultiaddrWithPeerId {
-							multiaddr: listen_addr.clone(),
-							peer_id: main_node_peer_id.clone(),
-						}],
-						.. Default::default()
-					},
-				}
-			],
+			extra_sets: vec![config::NonDefaultSetConfig {
+				notifications_protocol: PROTOCOL_NAME,
+				fallback_names: Vec::new(),
+				max_notification_size: 1024 * 1024,
+				set_config: config::SetConfig {
+					reserved_nodes: vec![config::MultiaddrWithPeerId {
+						multiaddr: listen_addr.clone(),
+						peer_id: main_node_peer_id.clone(),
+					}],
+					..Default::default()
+				},
+			}],
 			transport: config::TransportConfig::MemoryOnly,
-			.. config::NetworkConfiguration::new_local()
+			..config::NetworkConfiguration::new_local()
 		});
 
 		background_tasks_to_wait.push(async_std::task::spawn(async move {
@@ -416,9 +420,7 @@ fn lots_of_incoming_peers_works() {
 		}));
 	}
 
-	futures::executor::block_on(async move {
-		future::join_all(background_tasks_to_wait).await
-	});
+	futures::executor::block_on(async move { future::join_all(background_tasks_to_wait).await });
 }
 
 #[test]
@@ -437,14 +439,13 @@ fn notifications_back_pressure() {
 		while received_notifications < TOTAL_NOTIFS {
 			match events_stream2.next().await.unwrap() {
 				Event::NotificationStreamClosed { .. } => panic!(),
-				Event::NotificationsReceived { messages, .. } => {
+				Event::NotificationsReceived { messages, .. } =>
 					for message in messages {
 						assert_eq!(message.0, PROTOCOL_NAME);
 						assert_eq!(message.1, format!("hello #{}", received_notifications));
 						received_notifications += 1;
-					}
-				}
-				_ => {}
+					},
+				_ => {},
 			};
 
 			if rand::random::<u8>() < 2 {
@@ -458,7 +459,7 @@ fn notifications_back_pressure() {
 		loop {
 			match events_stream1.next().await.unwrap() {
 				Event::NotificationStreamOpened { .. } => break,
-				_ => {}
+				_ => {},
 			};
 		}
 
@@ -483,37 +484,33 @@ fn fallback_name_working() {
 	let listen_addr = config::build_multiaddr![Memory(rand::random::<u64>())];
 
 	let (node1, mut events_stream1) = build_test_full_node(config::NetworkConfiguration {
-		extra_sets: vec![
-			config::NonDefaultSetConfig {
-				notifications_protocol: NEW_PROTOCOL_NAME.clone(),
-				fallback_names: vec![PROTOCOL_NAME],
-				max_notification_size: 1024 * 1024,
-				set_config: Default::default()
-			}
-		],
+		extra_sets: vec![config::NonDefaultSetConfig {
+			notifications_protocol: NEW_PROTOCOL_NAME.clone(),
+			fallback_names: vec![PROTOCOL_NAME],
+			max_notification_size: 1024 * 1024,
+			set_config: Default::default(),
+		}],
 		listen_addresses: vec![listen_addr.clone()],
 		transport: config::TransportConfig::MemoryOnly,
-		.. config::NetworkConfiguration::new_local()
+		..config::NetworkConfiguration::new_local()
 	});
 
 	let (_, mut events_stream2) = build_test_full_node(config::NetworkConfiguration {
-		extra_sets: vec![
-			config::NonDefaultSetConfig {
-				notifications_protocol: PROTOCOL_NAME,
-				fallback_names: Vec::new(),
-				max_notification_size: 1024 * 1024,
-				set_config: config::SetConfig {
-					reserved_nodes: vec![config::MultiaddrWithPeerId {
-						multiaddr: listen_addr,
-						peer_id: node1.local_peer_id().clone(),
-					}],
-					.. Default::default()
-				}
-			}
-		],
+		extra_sets: vec![config::NonDefaultSetConfig {
+			notifications_protocol: PROTOCOL_NAME,
+			fallback_names: Vec::new(),
+			max_notification_size: 1024 * 1024,
+			set_config: config::SetConfig {
+				reserved_nodes: vec![config::MultiaddrWithPeerId {
+					multiaddr: listen_addr,
+					peer_id: node1.local_peer_id().clone(),
+				}],
+				..Default::default()
+			},
+		}],
 		listen_addresses: vec![],
 		transport: config::TransportConfig::MemoryOnly,
-		.. config::NetworkConfiguration::new_local()
+		..config::NetworkConfiguration::new_local()
 	});
 
 	let receiver = async_std::task::spawn(async move {
@@ -525,7 +522,7 @@ fn fallback_name_working() {
 					assert_eq!(negotiated_fallback, None);
 					break
 				},
-				_ => {}
+				_ => {},
 			};
 		}
 	});
@@ -539,7 +536,7 @@ fn fallback_name_working() {
 					assert_eq!(negotiated_fallback, Some(PROTOCOL_NAME));
 					break
 				},
-				_ => {}
+				_ => {},
 			};
 		}
 
@@ -555,7 +552,7 @@ fn ensure_listen_addresses_consistent_with_transport_memory() {
 	let _ = build_test_full_node(config::NetworkConfiguration {
 		listen_addresses: vec![listen_addr.clone()],
 		transport: config::TransportConfig::MemoryOnly,
-		.. config::NetworkConfiguration::new("test-node", "test-client", Default::default(), None)
+		..config::NetworkConfiguration::new("test-node", "test-client", Default::default(), None)
 	});
 }
 
@@ -566,7 +563,7 @@ fn ensure_listen_addresses_consistent_with_transport_not_memory() {
 
 	let _ = build_test_full_node(config::NetworkConfiguration {
 		listen_addresses: vec![listen_addr.clone()],
-		.. config::NetworkConfiguration::new("test-node", "test-client", Default::default(), None)
+		..config::NetworkConfiguration::new("test-node", "test-client", Default::default(), None)
 	});
 }
 
@@ -583,7 +580,7 @@ fn ensure_boot_node_addresses_consistent_with_transport_memory() {
 		listen_addresses: vec![listen_addr.clone()],
 		transport: config::TransportConfig::MemoryOnly,
 		boot_nodes: vec![boot_node],
-		.. config::NetworkConfiguration::new("test-node", "test-client", Default::default(), None)
+		..config::NetworkConfiguration::new("test-node", "test-client", Default::default(), None)
 	});
 }
 
@@ -599,7 +596,7 @@ fn ensure_boot_node_addresses_consistent_with_transport_not_memory() {
 	let _ = build_test_full_node(config::NetworkConfiguration {
 		listen_addresses: vec![listen_addr.clone()],
 		boot_nodes: vec![boot_node],
-		.. config::NetworkConfiguration::new("test-node", "test-client", Default::default(), None)
+		..config::NetworkConfiguration::new("test-node", "test-client", Default::default(), None)
 	});
 }
 
@@ -617,9 +614,9 @@ fn ensure_reserved_node_addresses_consistent_with_transport_memory() {
 		transport: config::TransportConfig::MemoryOnly,
 		default_peers_set: config::SetConfig {
 			reserved_nodes: vec![reserved_node],
-			.. Default::default()
+			..Default::default()
 		},
-		.. config::NetworkConfiguration::new("test-node", "test-client", Default::default(), None)
+		..config::NetworkConfiguration::new("test-node", "test-client", Default::default(), None)
 	});
 }
 
@@ -636,9 +633,9 @@ fn ensure_reserved_node_addresses_consistent_with_transport_not_memory() {
 		listen_addresses: vec![listen_addr.clone()],
 		default_peers_set: config::SetConfig {
 			reserved_nodes: vec![reserved_node],
-			.. Default::default()
+			..Default::default()
 		},
-		.. config::NetworkConfiguration::new("test-node", "test-client", Default::default(), None)
+		..config::NetworkConfiguration::new("test-node", "test-client", Default::default(), None)
 	});
 }
 
@@ -652,7 +649,7 @@ fn ensure_public_addresses_consistent_with_transport_memory() {
 		listen_addresses: vec![listen_addr.clone()],
 		transport: config::TransportConfig::MemoryOnly,
 		public_addresses: vec![public_address],
-		.. config::NetworkConfiguration::new("test-node", "test-client", Default::default(), None)
+		..config::NetworkConfiguration::new("test-node", "test-client", Default::default(), None)
 	});
 }
 
@@ -665,6 +662,6 @@ fn ensure_public_addresses_consistent_with_transport_not_memory() {
 	let _ = build_test_full_node(config::NetworkConfiguration {
 		listen_addresses: vec![listen_addr.clone()],
 		public_addresses: vec![public_address],
-		.. config::NetworkConfiguration::new("test-node", "test-client", Default::default(), None)
+		..config::NetworkConfiguration::new("test-node", "test-client", Default::default(), None)
 	});
 }
diff --git a/client/network/src/state_request_handler.rs b/client/network/src/state_request_handler.rs
index d340ff21bd44..a15ee246a2ef 100644
--- a/client/network/src/state_request_handler.rs
+++ b/client/network/src/state_request_handler.rs
@@ -17,22 +17,27 @@
 //! Helper for handling (i.e. answering) state requests from a remote peer via the
 //! [`crate::request_responses::RequestResponsesBehaviour`].
 
-use codec::{Encode, Decode};
-use crate::chain::Client;
-use crate::config::ProtocolId;
-use crate::request_responses::{IncomingRequest, OutgoingResponse, ProtocolConfig};
-use crate::schema::v1::{StateResponse, StateRequest, StateEntry};
-use crate::{PeerId, ReputationChange};
-use futures::channel::{mpsc, oneshot};
-use futures::stream::StreamExt;
+use crate::{
+	chain::Client,
+	config::ProtocolId,
+	request_responses::{IncomingRequest, OutgoingResponse, ProtocolConfig},
+	schema::v1::{StateEntry, StateRequest, StateResponse},
+	PeerId, ReputationChange,
+};
+use codec::{Decode, Encode};
+use futures::{
+	channel::{mpsc, oneshot},
+	stream::StreamExt,
+};
 use log::debug;
 use lru::LruCache;
 use prost::Message;
-use sp_runtime::generic::BlockId;
-use sp_runtime::traits::Block as BlockT;
-use std::sync::Arc;
-use std::time::Duration;
-use std::hash::{Hasher, Hash};
+use sp_runtime::{generic::BlockId, traits::Block as BlockT};
+use std::{
+	hash::{Hash, Hasher},
+	sync::Arc,
+	time::Duration,
+};
 
 const LOG_TARGET: &str = "sync";
 const MAX_RESPONSE_BYTES: usize = 2 * 1024 * 1024; // Actual reponse may be bigger.
@@ -127,9 +132,7 @@ impl<B: BlockT> StateRequestHandler<B> {
 				Ok(()) => debug!(target: LOG_TARGET, "Handled block request from {}.", peer),
 				Err(e) => debug!(
 					target: LOG_TARGET,
-					"Failed to handle state request from {}: {}",
-					peer,
-					e,
+					"Failed to handle state request from {}: {}", peer, e,
 				),
 			}
 		}
@@ -144,11 +147,8 @@ impl<B: BlockT> StateRequestHandler<B> {
 		let request = StateRequest::decode(&payload[..])?;
 		let block: B::Hash = Decode::decode(&mut request.block.as_ref())?;
 
-		let key = SeenRequestsKey {
-			peer: *peer,
-			block: block.clone(),
-			start: request.start.clone(),
-		};
+		let key =
+			SeenRequestsKey { peer: *peer, block: block.clone(), start: request.start.clone() };
 
 		let mut reputation_changes = Vec::new();
 
@@ -163,7 +163,7 @@ impl<B: BlockT> StateRequestHandler<B> {
 			},
 			None => {
 				self.seen_requests.put(key.clone(), SeenRequestsValue::First);
-			}
+			},
 		}
 
 		log::trace!(
@@ -194,7 +194,8 @@ impl<B: BlockT> StateRequestHandler<B> {
 					&request.start,
 					MAX_RESPONSE_BYTES,
 				)?;
-				response.entries = entries.into_iter().map(|(key, value)| StateEntry { key, value }).collect();
+				response.entries =
+					entries.into_iter().map(|(key, value)| StateEntry { key, value }).collect();
 				if response.entries.is_empty() {
 					response.complete = true;
 				}
@@ -224,11 +225,9 @@ impl<B: BlockT> StateRequestHandler<B> {
 			Err(())
 		};
 
-		pending_response.send(OutgoingResponse {
-			result,
-			reputation_changes,
-			sent_feedback: None,
-		}).map_err(|_| HandleRequestError::SendResponse)
+		pending_response
+			.send(OutgoingResponse { result, reputation_changes, sent_feedback: None })
+			.map_err(|_| HandleRequestError::SendResponse)
 	}
 }
 
diff --git a/client/network/src/transactions.rs b/client/network/src/transactions.rs
index 8a7dd78c834c..82e7e8fe1714 100644
--- a/client/network/src/transactions.rs
+++ b/client/network/src/transactions.rs
@@ -25,26 +25,35 @@
 //! configuration as an extra peers set.
 //! - Use [`TransactionsHandlerPrototype::build`] then [`TransactionsHandler::run`] to obtain a
 //! `Future` that processes transactions.
-//!
 
 use crate::{
-	ExHashT, Event, ObservedRole,
-	config::{self, ProtocolId, TransactionPool, TransactionImportFuture, TransactionImport},
-	error, protocol::message, service::NetworkService, utils::{interval, LruHashSet},
+	config::{self, ProtocolId, TransactionImport, TransactionImportFuture, TransactionPool},
+	error,
+	protocol::message,
+	service::NetworkService,
+	utils::{interval, LruHashSet},
+	Event, ExHashT, ObservedRole,
 };
 
 use codec::{Decode, Encode};
 use futures::{channel::mpsc, prelude::*, stream::FuturesUnordered};
 use libp2p::{multiaddr, PeerId};
-use log::{trace, debug, warn};
-use prometheus_endpoint::{
-	Registry, Counter, PrometheusError, register, U64
-};
+use log::{debug, trace, warn};
+use prometheus_endpoint::{register, Counter, PrometheusError, Registry, U64};
 use sp_runtime::traits::Block as BlockT;
-use std::borrow::Cow;
-use std::collections::{HashMap, hash_map::Entry};
-use std::sync::{atomic::{AtomicBool, Ordering}, Arc};
-use std::{iter, num::NonZeroUsize, pin::Pin, task::Poll, time};
+use std::{
+	borrow::Cow,
+	collections::{hash_map::Entry, HashMap},
+	iter,
+	num::NonZeroUsize,
+	pin::Pin,
+	sync::{
+		atomic::{AtomicBool, Ordering},
+		Arc,
+	},
+	task::Poll,
+	time,
+};
 
 /// Interval at which we propagate transactions;
 const PROPAGATE_TIMEOUT: time::Duration = time::Duration::from_millis(2900);
@@ -84,10 +93,13 @@ struct Metrics {
 impl Metrics {
 	fn register(r: &Registry) -> Result<Self, PrometheusError> {
 		Ok(Metrics {
-			propagated_transactions: register(Counter::new(
-				"sync_propagated_transactions",
-				"Number of transactions propagated to at least one peer",
-			)?, r)?,
+			propagated_transactions: register(
+				Counter::new(
+					"sync_propagated_transactions",
+					"Number of transactions propagated to at least one peer",
+				)?,
+				r,
+			)?,
 		})
 	}
 }
@@ -106,7 +118,7 @@ impl<H: ExHashT> Future for PendingTransaction<H> {
 		let mut this = self.project();
 
 		if let Poll::Ready(import_result) = Pin::new(&mut this.validation).poll_unpin(cx) {
-			return Poll::Ready((this.tx_hash.clone(), import_result));
+			return Poll::Ready((this.tx_hash.clone(), import_result))
 		}
 
 		Poll::Pending
@@ -128,7 +140,7 @@ impl TransactionsHandlerPrototype {
 				proto.push_str(protocol_id.as_ref());
 				proto.push_str("/transactions/1");
 				proto
-			})
+			}),
 		}
 	}
 
@@ -143,7 +155,7 @@ impl TransactionsHandlerPrototype {
 				out_peers: 0,
 				reserved_nodes: Vec::new(),
 				non_reserved_mode: config::NonReservedPeerMode::Deny,
-			}
+			},
 		}
 	}
 
@@ -182,10 +194,7 @@ impl TransactionsHandlerPrototype {
 			},
 		};
 
-		let controller = TransactionsHandlerController {
-			to_handler,
-			gossip_enabled,
-		};
+		let controller = TransactionsHandlerController { to_handler, gossip_enabled };
 
 		Ok((handler, controller))
 	}
@@ -264,7 +273,7 @@ impl<B: BlockT + 'static, H: ExHashT> TransactionsHandler<B, H> {
 	/// interrupted.
 	pub async fn run(mut self) {
 		loop {
-			futures::select!{
+			futures::select! {
 				_ = self.propagate_timeout.next().fuse() => {
 					self.propagate_transactions();
 				},
@@ -301,7 +310,7 @@ impl<B: BlockT + 'static, H: ExHashT> TransactionsHandler<B, H> {
 					.collect::<multiaddr::Multiaddr>();
 				let result = self.service.add_peers_to_reserved_set(
 					self.protocol_name.clone(),
-					iter::once(addr).collect()
+					iter::once(addr).collect(),
 				);
 				if let Err(err) = result {
 					log::error!(target: "sync", "Add reserved peer failed: {}", err);
@@ -312,22 +321,30 @@ impl<B: BlockT + 'static, H: ExHashT> TransactionsHandler<B, H> {
 					.collect::<multiaddr::Multiaddr>();
 				let result = self.service.remove_peers_from_reserved_set(
 					self.protocol_name.clone(),
-					iter::once(addr).collect()
+					iter::once(addr).collect(),
 				);
 				if let Err(err) = result {
 					log::error!(target: "sync", "Removing reserved peer failed: {}", err);
 				}
 			},
 
-			Event::NotificationStreamOpened { remote, protocol, role, .. } if protocol == self.protocol_name => {
-				let _was_in = self.peers.insert(remote, Peer {
-					known_transactions: LruHashSet::new(NonZeroUsize::new(MAX_KNOWN_TRANSACTIONS)
-						.expect("Constant is nonzero")),
-					role,
-				});
+			Event::NotificationStreamOpened { remote, protocol, role, .. }
+				if protocol == self.protocol_name =>
+			{
+				let _was_in = self.peers.insert(
+					remote,
+					Peer {
+						known_transactions: LruHashSet::new(
+							NonZeroUsize::new(MAX_KNOWN_TRANSACTIONS).expect("Constant is nonzero"),
+						),
+						role,
+					},
+				);
 				debug_assert!(_was_in.is_none());
 			}
-			Event::NotificationStreamClosed { remote, protocol } if protocol == self.protocol_name => {
+			Event::NotificationStreamClosed { remote, protocol }
+				if protocol == self.protocol_name =>
+			{
 				let _peer = self.peers.remove(&remote);
 				debug_assert!(_peer.is_some());
 			}
@@ -335,7 +352,7 @@ impl<B: BlockT + 'static, H: ExHashT> TransactionsHandler<B, H> {
 			Event::NotificationsReceived { remote, messages } => {
 				for (protocol, message) in messages {
 					if protocol != self.protocol_name {
-						continue;
+						continue
 					}
 
 					if let Ok(m) = <message::Transactions<B::Extrinsic> as Decode>::decode(
@@ -349,28 +366,24 @@ impl<B: BlockT + 'static, H: ExHashT> TransactionsHandler<B, H> {
 			},
 
 			// Not our concern.
-			Event::NotificationStreamOpened { .. } | Event::NotificationStreamClosed { .. } => {}
+			Event::NotificationStreamOpened { .. } | Event::NotificationStreamClosed { .. } => {},
 		}
 	}
 
 	/// Called when peer sends us new transactions
-	fn on_transactions(
-		&mut self,
-		who: PeerId,
-		transactions: message::Transactions<B::Extrinsic>,
-	) {
+	fn on_transactions(&mut self, who: PeerId, transactions: message::Transactions<B::Extrinsic>) {
 		// sending transaction to light node is considered a bad behavior
 		if matches!(self.local_role, config::Role::Light) {
 			debug!(target: "sync", "Peer {} is trying to send transactions to the light node", who);
 			self.service.disconnect_peer(who, self.protocol_name.clone());
 			self.service.report_peer(who, rep::UNEXPECTED_TRANSACTIONS);
-			return;
+			return
 		}
 
 		// Accept transactions only when enabled
 		if !self.gossip_enabled.load(Ordering::Relaxed) {
 			trace!(target: "sync", "{} Ignoring transactions while disabled", who);
-			return;
+			return
 		}
 
 		trace!(target: "sync", "Received {} transactions from {}", transactions.len(), who);
@@ -382,7 +395,7 @@ impl<B: BlockT + 'static, H: ExHashT> TransactionsHandler<B, H> {
 						"Ignoring any further transactions that exceed `MAX_PENDING_TRANSACTIONS`({}) limit",
 						MAX_PENDING_TRANSACTIONS,
 					);
-					break;
+					break
 				}
 
 				let hash = self.transaction_pool.hash_of(&t);
@@ -400,7 +413,7 @@ impl<B: BlockT + 'static, H: ExHashT> TransactionsHandler<B, H> {
 					},
 					Entry::Occupied(mut entry) => {
 						entry.get_mut().push(who.clone());
-					}
+					},
 				}
 			}
 		}
@@ -408,7 +421,8 @@ impl<B: BlockT + 'static, H: ExHashT> TransactionsHandler<B, H> {
 
 	fn on_handle_transaction_import(&mut self, who: PeerId, import: TransactionImport) {
 		match import {
-			TransactionImport::KnownGood => self.service.report_peer(who, rep::ANY_TRANSACTION_REFUND),
+			TransactionImport::KnownGood =>
+				self.service.report_peer(who, rep::ANY_TRANSACTION_REFUND),
 			TransactionImport::NewGood => self.service.report_peer(who, rep::GOOD_TRANSACTION),
 			TransactionImport::Bad => self.service.report_peer(who, rep::BAD_TRANSACTION),
 			TransactionImport::None => {},
@@ -416,14 +430,11 @@ impl<B: BlockT + 'static, H: ExHashT> TransactionsHandler<B, H> {
 	}
 
 	/// Propagate one transaction.
-	pub fn propagate_transaction(
-		&mut self,
-		hash: &H,
-	) {
+	pub fn propagate_transaction(&mut self, hash: &H) {
 		debug!(target: "sync", "Propagating transaction [{:?}]", hash);
 		// Accept transactions only when enabled
 		if !self.gossip_enabled.load(Ordering::Relaxed) {
-			return;
+			return
 		}
 		if let Some(transaction) = self.transaction_pool.transaction(hash) {
 			let propagated_to = self.do_propagate_transactions(&[(hash.clone(), transaction)]);
@@ -441,7 +452,7 @@ impl<B: BlockT + 'static, H: ExHashT> TransactionsHandler<B, H> {
 		for (who, peer) in self.peers.iter_mut() {
 			// never send transactions to the light node
 			if matches!(peer.role, ObservedRole::Light) {
-				continue;
+				continue
 			}
 
 			let (hashes, to_send): (Vec<_>, Vec<_>) = transactions
@@ -454,16 +465,13 @@ impl<B: BlockT + 'static, H: ExHashT> TransactionsHandler<B, H> {
 
 			if !to_send.is_empty() {
 				for hash in hashes {
-					propagated_to
-						.entry(hash)
-						.or_default()
-						.push(who.to_base58());
+					propagated_to.entry(hash).or_default().push(who.to_base58());
 				}
 				trace!(target: "sync", "Sending {} transactions to {}", to_send.len(), who);
 				self.service.write_notification(
 					who.clone(),
 					self.protocol_name.clone(),
-					to_send.encode()
+					to_send.encode(),
 				);
 			}
 		}
@@ -479,7 +487,7 @@ impl<B: BlockT + 'static, H: ExHashT> TransactionsHandler<B, H> {
 	fn propagate_transactions(&mut self) {
 		// Accept transactions only when enabled
 		if !self.gossip_enabled.load(Ordering::Relaxed) {
-			return;
+			return
 		}
 		debug!(target: "sync", "Propagating transactions");
 		let transactions = self.transaction_pool.transactions();
diff --git a/client/network/src/transport.rs b/client/network/src/transport.rs
index ab587e01a875..710d4775993b 100644
--- a/client/network/src/transport.rs
+++ b/client/network/src/transport.rs
@@ -17,15 +17,18 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use libp2p::{
-	PeerId, Transport,
+	bandwidth,
 	core::{
-		self, either::EitherTransport, muxing::StreamMuxerBox,
-		transport::{Boxed, OptionalTransport}, upgrade
+		self,
+		either::EitherTransport,
+		muxing::StreamMuxerBox,
+		transport::{Boxed, OptionalTransport},
+		upgrade,
 	},
-	mplex, identity, bandwidth, wasm_ext, noise
+	identity, mplex, noise, wasm_ext, PeerId, Transport,
 };
 #[cfg(not(target_os = "unknown"))]
-use libp2p::{tcp, dns, websocket};
+use libp2p::{dns, tcp, websocket};
 use std::{sync::Arc, time::Duration};
 
 pub use self::bandwidth::BandwidthSinks;
@@ -61,8 +64,8 @@ pub fn build_transport(
 	#[cfg(not(target_os = "unknown"))]
 	let transport = transport.or_transport(if !memory_only {
 		let desktop_trans = tcp::TcpConfig::new().nodelay(true);
-		let desktop_trans = websocket::WsConfig::new(desktop_trans.clone())
-			.or_transport(desktop_trans);
+		let desktop_trans =
+			websocket::WsConfig::new(desktop_trans.clone()).or_transport(desktop_trans);
 		let dns_init = futures::executor::block_on(dns::DnsConfig::system(desktop_trans.clone()));
 		OptionalTransport::some(if let Ok(dns) = dns_init {
 			EitherTransport::Left(dns)
@@ -81,23 +84,24 @@ pub fn build_transport(
 
 	let (transport, bandwidth) = bandwidth::BandwidthLogging::new(transport);
 
-	let authentication_config = {
-		// For more information about these two panics, see in "On the Importance of
-		// Checking Cryptographic Protocols for Faults" by Dan Boneh, Richard A. DeMillo,
-		// and Richard J. Lipton.
-		let noise_keypair = noise::Keypair::<noise::X25519Spec>::new().into_authentic(&keypair)
+	let authentication_config =
+		{
+			// For more information about these two panics, see in "On the Importance of
+			// Checking Cryptographic Protocols for Faults" by Dan Boneh, Richard A. DeMillo,
+			// and Richard J. Lipton.
+			let noise_keypair = noise::Keypair::<noise::X25519Spec>::new().into_authentic(&keypair)
 			.expect("can only fail in case of a hardware bug; since this signing is performed only \
 				once and at initialization, we're taking the bet that the inconvenience of a very \
 				rare panic here is basically zero");
 
-		// Legacy noise configurations for backward compatibility.
-		let mut noise_legacy = noise::LegacyConfig::default();
-		noise_legacy.recv_legacy_handshake = true;
+			// Legacy noise configurations for backward compatibility.
+			let mut noise_legacy = noise::LegacyConfig::default();
+			noise_legacy.recv_legacy_handshake = true;
 
-		let mut xx_config = noise::NoiseConfig::xx(noise_keypair);
-		xx_config.set_legacy_config(noise_legacy.clone());
-		xx_config.into_authenticated()
-	};
+			let mut xx_config = noise::NoiseConfig::xx(noise_keypair);
+			xx_config.set_legacy_config(noise_legacy.clone());
+			xx_config.into_authenticated()
+		};
 
 	let multiplexing_config = {
 		let mut mplex_config = mplex::MplexConfig::new();
@@ -117,7 +121,8 @@ pub fn build_transport(
 		core::upgrade::SelectUpgrade::new(yamux_config, mplex_config)
 	};
 
-	let transport = transport.upgrade(upgrade::Version::V1Lazy)
+	let transport = transport
+		.upgrade(upgrade::Version::V1Lazy)
 		.authenticate(authentication_config)
 		.multiplex(multiplexing_config)
 		.timeout(Duration::from_secs(20))
diff --git a/client/network/src/utils.rs b/client/network/src/utils.rs
index 02673ef49fb4..b23b7e0c101e 100644
--- a/client/network/src/utils.rs
+++ b/client/network/src/utils.rs
@@ -19,8 +19,7 @@
 use futures::{stream::unfold, FutureExt, Stream, StreamExt};
 use futures_timer::Delay;
 use linked_hash_set::LinkedHashSet;
-use std::time::Duration;
-use std::{hash::Hash, num::NonZeroUsize};
+use std::{hash::Hash, num::NonZeroUsize, time::Duration};
 
 /// Creates a stream that returns a new value every `duration`.
 pub fn interval(duration: Duration) -> impl Stream<Item = ()> + Unpin {
@@ -39,10 +38,7 @@ pub struct LruHashSet<T: Hash + Eq> {
 impl<T: Hash + Eq> LruHashSet<T> {
 	/// Create a new `LruHashSet` with the given (exclusive) limit.
 	pub fn new(limit: NonZeroUsize) -> Self {
-		Self {
-			set: LinkedHashSet::new(),
-			limit,
-		}
+		Self { set: LinkedHashSet::new(), limit }
 	}
 
 	/// Insert element into the set.
@@ -55,7 +51,7 @@ impl<T: Hash + Eq> LruHashSet<T> {
 			if self.set.len() == usize::from(self.limit) {
 				self.set.pop_front(); // remove oldest entry
 			}
-			return true;
+			return true
 		}
 		false
 	}
diff --git a/client/network/test/src/block_import.rs b/client/network/test/src/block_import.rs
index 6d3ceb4a933d..4593e06250d3 100644
--- a/client/network/test/src/block_import.rs
+++ b/client/network/test/src/block_import.rs
@@ -18,16 +18,21 @@
 
 //! Testing block import logic.
 
-use sp_consensus::ImportedAux;
-use sp_consensus::import_queue::{
-	import_single_block, BasicQueue, BlockImportError, BlockImportResult, IncomingBlock,
+use super::*;
+use futures::executor::block_on;
+use sc_block_builder::BlockBuilderProvider;
+use sp_consensus::{
+	import_queue::{
+		import_single_block, BasicQueue, BlockImportError, BlockImportResult, IncomingBlock,
+	},
+	ImportedAux,
 };
-use substrate_test_runtime_client::{self, prelude::*};
-use substrate_test_runtime_client::runtime::{Block, Hash};
 use sp_runtime::generic::BlockId;
-use sc_block_builder::BlockBuilderProvider;
-use futures::executor::block_on;
-use super::*;
+use substrate_test_runtime_client::{
+	self,
+	prelude::*,
+	runtime::{Block, Hash},
+};
 
 fn prepare_good_block() -> (TestClient, Hash, u64, PeerId, IncomingBlock<Block>) {
 	let mut client = substrate_test_runtime_client::new();
@@ -38,18 +43,24 @@ fn prepare_good_block() -> (TestClient, Hash, u64, PeerId, IncomingBlock<Block>)
 	let header = client.header(&BlockId::Number(1)).unwrap();
 	let justifications = client.justifications(&BlockId::Number(1)).unwrap();
 	let peer_id = PeerId::random();
-	(client, hash, number, peer_id.clone(), IncomingBlock {
+	(
+		client,
 		hash,
-		header,
-		body: Some(Vec::new()),
-		indexed_body: None,
-		justifications,
-		origin: Some(peer_id.clone()),
-		allow_missing_state: false,
-		import_existing: false,
-		state: None,
-		skip_execution: false,
-	})
+		number,
+		peer_id.clone(),
+		IncomingBlock {
+			hash,
+			header,
+			body: Some(Vec::new()),
+			indexed_body: None,
+			justifications,
+			origin: Some(peer_id.clone()),
+			allow_missing_state: false,
+			import_existing: false,
+			state: None,
+			skip_execution: false,
+		},
+	)
 }
 
 #[test]
@@ -63,11 +74,11 @@ fn import_single_good_block_works() {
 		&mut substrate_test_runtime_client::new(),
 		BlockOrigin::File,
 		block,
-		&mut PassThroughVerifier::new(true)
+		&mut PassThroughVerifier::new(true),
 	)) {
 		Ok(BlockImportResult::ImportedUnknown(ref num, ref aux, ref org))
-			if *num == number && *aux == expected_aux && *org == Some(peer_id) => {}
-		r @ _ => panic!("{:?}", r)
+			if *num == number && *aux == expected_aux && *org == Some(peer_id) => {},
+		r @ _ => panic!("{:?}", r),
 	}
 }
 
@@ -78,10 +89,10 @@ fn import_single_good_known_block_is_ignored() {
 		&mut client,
 		BlockOrigin::File,
 		block,
-		&mut PassThroughVerifier::new(true)
+		&mut PassThroughVerifier::new(true),
 	)) {
-		Ok(BlockImportResult::ImportedKnown(ref n, _)) if *n == number => {}
-		_ => panic!()
+		Ok(BlockImportResult::ImportedKnown(ref n, _)) if *n == number => {},
+		_ => panic!(),
 	}
 }
 
@@ -93,10 +104,10 @@ fn import_single_good_block_without_header_fails() {
 		&mut substrate_test_runtime_client::new(),
 		BlockOrigin::File,
 		block,
-		&mut PassThroughVerifier::new(true)
+		&mut PassThroughVerifier::new(true),
 	)) {
-		Err(BlockImportError::IncompleteHeader(ref org)) if *org == Some(peer_id) => {}
-		_ => panic!()
+		Err(BlockImportError::IncompleteHeader(ref org)) if *org == Some(peer_id) => {},
+		_ => panic!(),
 	}
 }
 
diff --git a/client/network/test/src/lib.rs b/client/network/test/src/lib.rs
index 900e05e26a78..0bdaa0d14e4f 100644
--- a/client/network/test/src/lib.rs
+++ b/client/network/test/src/lib.rs
@@ -23,52 +23,58 @@ mod block_import;
 mod sync;
 
 use std::{
-	borrow::Cow, collections::HashMap, pin::Pin, sync::Arc, task::{Poll, Context as FutureContext}
+	borrow::Cow,
+	collections::HashMap,
+	pin::Pin,
+	sync::Arc,
+	task::{Context as FutureContext, Poll},
 };
 
-use libp2p::build_multiaddr;
+use futures::{future::BoxFuture, prelude::*};
+use libp2p::{build_multiaddr, PeerId};
 use log::trace;
-use sc_network::block_request_handler::{self, BlockRequestHandler};
-use sc_network::state_request_handler::{self, StateRequestHandler};
-use sc_network::light_client_requests::{self, handler::LightClientRequestHandler};
-use sp_blockchain::{
-	HeaderBackend, Result as ClientResult,
-	well_known_cache_keys::{self, Id as CacheKeyId},
-	Info as BlockchainInfo,
-};
+use parking_lot::Mutex;
+use sc_block_builder::{BlockBuilder, BlockBuilderProvider};
 use sc_client_api::{
-	BlockchainEvents, BlockImportNotification, FinalityNotifications, ImportNotifications, FinalityNotification,
-	backend::{TransactionFor, AuxStore, Backend, Finalizer}, BlockBackend,
+	backend::{AuxStore, Backend, Finalizer, TransactionFor},
+	BlockBackend, BlockImportNotification, BlockchainEvents, FinalityNotification,
+	FinalityNotifications, ImportNotifications,
 };
 use sc_consensus::LongestChain;
-use sc_block_builder::{BlockBuilder, BlockBuilderProvider};
-use sc_network::config::Role;
-use sp_consensus::block_validation::{DefaultBlockAnnounceValidator, BlockAnnounceValidator};
-use sp_consensus::import_queue::{
-	BasicQueue, BoxJustificationImport, Verifier,
-};
-use sp_consensus::block_import::{BlockImport, ImportResult};
-use sp_consensus::Error as ConsensusError;
-use sp_consensus::{BlockOrigin, ForkChoiceStrategy, BlockImportParams, BlockCheckParams, JustificationImport};
-use futures::prelude::*;
-use futures::future::BoxFuture;
+pub use sc_network::config::EmptyTransactionPool;
 use sc_network::{
-	NetworkWorker, NetworkService, config::{ProtocolId, MultiaddrWithPeerId, NonReservedPeerMode},
-	Multiaddr,
+	block_request_handler::{self, BlockRequestHandler},
+	config::{
+		MultiaddrWithPeerId, NetworkConfiguration, NonDefaultSetConfig, NonReservedPeerMode,
+		ProtocolConfig, ProtocolId, Role, SyncMode, TransportConfig,
+	},
+	light_client_requests::{self, handler::LightClientRequestHandler},
+	state_request_handler::{self, StateRequestHandler},
+	Multiaddr, NetworkService, NetworkWorker,
+};
+use sc_service::client::Client;
+use sp_blockchain::{
+	well_known_cache_keys::{self, Id as CacheKeyId},
+	HeaderBackend, Info as BlockchainInfo, Result as ClientResult,
+};
+use sp_consensus::{
+	block_import::{BlockImport, ImportResult},
+	block_validation::{BlockAnnounceValidator, DefaultBlockAnnounceValidator},
+	import_queue::{BasicQueue, BoxJustificationImport, Verifier},
+	BlockCheckParams, BlockImportParams, BlockOrigin, Error as ConsensusError, ForkChoiceStrategy,
+	JustificationImport,
 };
-use sc_network::config::{NetworkConfiguration, NonDefaultSetConfig, TransportConfig, SyncMode};
-use libp2p::PeerId;
-use parking_lot::Mutex;
 use sp_core::H256;
-use sc_network::config::ProtocolConfig;
-use sp_runtime::generic::{BlockId, OpaqueDigestItemId};
-use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor};
-use sp_runtime::{Justification, Justifications};
+use sp_runtime::{
+	generic::{BlockId, OpaqueDigestItemId},
+	traits::{Block as BlockT, Header as HeaderT, NumberFor},
+	Justification, Justifications,
+};
 use substrate_test_runtime_client::AccountKeyring;
-use sc_service::client::Client;
-pub use sc_network::config::EmptyTransactionPool;
-pub use substrate_test_runtime_client::runtime::{Block, Extrinsic, Hash, Transfer};
-pub use substrate_test_runtime_client::{TestClient, TestClientBuilder, TestClientBuilderExt};
+pub use substrate_test_runtime_client::{
+	runtime::{Block, Extrinsic, Hash, Transfer},
+	TestClient, TestClientBuilder, TestClientBuilderExt,
+};
 
 type AuthorityId = sp_consensus_babe::AuthorityId;
 
@@ -85,10 +91,7 @@ impl PassThroughVerifier {
 	///
 	/// Every verified block will use `finalized` for the `BlockImportParams`.
 	pub fn new(finalized: bool) -> Self {
-		Self {
-			finalized,
-			fork_choice: ForkChoiceStrategy::LongestChain,
-		}
+		Self { finalized, fork_choice: ForkChoiceStrategy::LongestChain }
 	}
 
 	/// Create a new instance.
@@ -96,10 +99,7 @@ impl PassThroughVerifier {
 	/// Every verified block will use `finalized` for the `BlockImportParams` and
 	/// the given [`ForkChoiceStrategy`].
 	pub fn new_with_fork_choice(finalized: bool, fork_choice: ForkChoiceStrategy) -> Self {
-		Self {
-			finalized,
-			fork_choice,
-		}
+		Self { finalized, fork_choice }
 	}
 }
 
@@ -111,12 +111,14 @@ impl<B: BlockT> Verifier<B> for PassThroughVerifier {
 		origin: BlockOrigin,
 		header: B::Header,
 		justifications: Option<Justifications>,
-		body: Option<Vec<B::Extrinsic>>
+		body: Option<Vec<B::Extrinsic>>,
 	) -> Result<(BlockImportParams<B, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String> {
-		let maybe_keys = header.digest()
-			.log(|l| l.try_as_raw(OpaqueDigestItemId::Consensus(b"aura"))
-				.or_else(|| l.try_as_raw(OpaqueDigestItemId::Consensus(b"babe")))
-			)
+		let maybe_keys = header
+			.digest()
+			.log(|l| {
+				l.try_as_raw(OpaqueDigestItemId::Consensus(b"aura"))
+					.or_else(|| l.try_as_raw(OpaqueDigestItemId::Consensus(b"babe")))
+			})
 			.map(|blob| vec![(well_known_cache_keys::AUTHORITIES, blob.to_vec())]);
 		let mut import = BlockImportParams::new(origin, header);
 		import.body = body;
@@ -132,13 +134,13 @@ pub type PeersFullClient = Client<
 	substrate_test_runtime_client::Backend,
 	substrate_test_runtime_client::Executor,
 	Block,
-	substrate_test_runtime_client::runtime::RuntimeApi
+	substrate_test_runtime_client::runtime::RuntimeApi,
 >;
 pub type PeersLightClient = Client<
 	substrate_test_runtime_client::LightBackend,
 	substrate_test_runtime_client::LightExecutor,
 	Block,
-	substrate_test_runtime_client::runtime::RuntimeApi
+	substrate_test_runtime_client::runtime::RuntimeApi,
 >;
 
 #[derive(Clone)]
@@ -173,7 +175,10 @@ impl PeersClient {
 		}
 	}
 
-	pub fn header(&self, block: &BlockId<Block>) -> ClientResult<Option<<Block as BlockT>::Header>> {
+	pub fn header(
+		&self,
+		block: &BlockId<Block>,
+	) -> ClientResult<Option<<Block as BlockT>::Header>> {
 		match *self {
 			PeersClient::Full(ref client, ref _backend) => client.header(block),
 			PeersClient::Light(ref client, ref _backend) => client.header(block),
@@ -207,7 +212,7 @@ impl PeersClient {
 		}
 	}
 
-	pub fn import_notification_stream(&self) -> ImportNotifications<Block>{
+	pub fn import_notification_stream(&self) -> ImportNotifications<Block> {
 		match *self {
 			PeersClient::Full(ref client, ref _backend) => client.import_notification_stream(),
 			PeersClient::Light(ref client, ref _backend) => client.import_notification_stream(),
@@ -218,11 +223,13 @@ impl PeersClient {
 		&self,
 		id: BlockId<Block>,
 		justification: Option<Justification>,
-		notify: bool
+		notify: bool,
 	) -> ClientResult<()> {
 		match *self {
-			PeersClient::Full(ref client, ref _backend) => client.finalize_block(id, justification, notify),
-			PeersClient::Light(ref client, ref _backend) => client.finalize_block(id, justification, notify),
+			PeersClient::Full(ref client, ref _backend) =>
+				client.finalize_block(id, justification, notify),
+			PeersClient::Light(ref client, ref _backend) =>
+				client.finalize_block(id, justification, notify),
 		}
 	}
 }
@@ -273,7 +280,8 @@ pub struct Peer<D, BlockImport> {
 	listen_addr: Multiaddr,
 }
 
-impl<D, B> Peer<D, B> where
+impl<D, B> Peer<D, B>
+where
 	B: BlockImport<Block, Error = ConsensusError> + Send + Sync,
 	B::Transaction: Send,
 {
@@ -288,7 +296,9 @@ impl<D, B> Peer<D, B> where
 	}
 
 	// Returns a clone of the local SelectChain, only available on full nodes
-	pub fn select_chain(&self) -> Option<LongestChain<substrate_test_runtime_client::Backend, Block>> {
+	pub fn select_chain(
+		&self,
+	) -> Option<LongestChain<substrate_test_runtime_client::Backend, Block>> {
 		self.select_chain.clone()
 	}
 
@@ -328,17 +338,22 @@ impl<D, B> Peer<D, B> where
 	}
 
 	/// Add blocks to the peer -- edit the block before adding
-	pub fn generate_blocks<F>(
-		&mut self,
-		count: usize,
-		origin: BlockOrigin,
-		edit_block: F,
-	) -> H256
-		where
-			F: FnMut(BlockBuilder<Block, PeersFullClient, substrate_test_runtime_client::Backend>) -> Block
+	pub fn generate_blocks<F>(&mut self, count: usize, origin: BlockOrigin, edit_block: F) -> H256
+	where
+		F: FnMut(
+			BlockBuilder<Block, PeersFullClient, substrate_test_runtime_client::Backend>,
+		) -> Block,
 	{
 		let best_hash = self.client.info().best_hash;
-		self.generate_blocks_at(BlockId::Hash(best_hash), count, origin, edit_block, false, true, true)
+		self.generate_blocks_at(
+			BlockId::Hash(best_hash),
+			count,
+			origin,
+			edit_block,
+			false,
+			true,
+			true,
+		)
 	}
 
 	/// Add blocks to the peer -- edit the block before adding. The chain will
@@ -352,16 +367,18 @@ impl<D, B> Peer<D, B> where
 		headers_only: bool,
 		inform_sync_about_new_best_block: bool,
 		announce_block: bool,
-	) -> H256 where F: FnMut(BlockBuilder<Block, PeersFullClient, substrate_test_runtime_client::Backend>) -> Block {
-		let full_client = self.client.as_full()
-			.expect("blocks could only be generated by full clients");
+	) -> H256
+	where
+		F: FnMut(
+			BlockBuilder<Block, PeersFullClient, substrate_test_runtime_client::Backend>,
+		) -> Block,
+	{
+		let full_client =
+			self.client.as_full().expect("blocks could only be generated by full clients");
 		let mut at = full_client.header(&at).unwrap().unwrap().hash();
-		for _  in 0..count {
-			let builder = full_client.new_block_at(
-				&BlockId::Hash(at),
-				Default::default(),
-				false,
-			).unwrap();
+		for _ in 0..count {
+			let builder =
+				full_client.new_block_at(&BlockId::Hash(at), Default::default(), false).unwrap();
 			let block = edit_block(builder);
 			let hash = block.header.hash();
 			trace!(
@@ -377,16 +394,16 @@ impl<D, B> Peer<D, B> where
 				header.clone(),
 				None,
 				if headers_only { None } else { Some(block.extrinsics) },
-			)).unwrap();
+			))
+			.unwrap();
 			let cache = if let Some(cache) = cache {
 				cache.into_iter().collect()
 			} else {
 				Default::default()
 			};
 
-			futures::executor::block_on(
-				self.block_import.import_block(import_block, cache)
-			).expect("block_import failed");
+			futures::executor::block_on(self.block_import.import_block(import_block, cache))
+				.expect("block_import failed");
 			if announce_block {
 				self.network.service().announce_block(hash, None);
 			}
@@ -458,7 +475,8 @@ impl<D, B> Peer<D, B> where
 			self.generate_blocks_at(
 				at,
 				count,
-				BlockOrigin::File, |mut builder| {
+				BlockOrigin::File,
+				|mut builder| {
 					let transfer = Transfer {
 						from: AccountKeyring::Alice.into(),
 						to: AccountKeyring::Alice.into(),
@@ -520,9 +538,10 @@ impl<D, B> Peer<D, B> where
 
 	/// Count the total number of imported blocks.
 	pub fn blocks_count(&self) -> u64 {
-		self.backend.as_ref().map(
-			|backend| backend.blockchain().info().best_number
-		).unwrap_or(0)
+		self.backend
+			.as_ref()
+			.map(|backend| backend.blockchain().info().best_number)
+			.unwrap_or(0)
 	}
 
 	/// Return a collection of block hashes that failed verification
@@ -531,9 +550,10 @@ impl<D, B> Peer<D, B> where
 	}
 
 	pub fn has_block(&self, hash: &H256) -> bool {
-		self.backend.as_ref().map(
-			|backend| backend.blockchain().header(BlockId::hash(*hash)).unwrap().is_some()
-		).unwrap_or(false)
+		self.backend
+			.as_ref()
+			.map(|backend| backend.blockchain().header(BlockId::hash(*hash)).unwrap().is_some())
+			.unwrap_or(false)
 	}
 }
 
@@ -542,22 +562,22 @@ pub trait BlockImportAdapterFull:
 		Block,
 		Transaction = TransactionFor<substrate_test_runtime_client::Backend, Block>,
 		Error = ConsensusError,
-	> +
-	Send +
-	Sync +
-	Clone
-{}
+	> + Send
+	+ Sync
+	+ Clone
+{
+}
 
 impl<T> BlockImportAdapterFull for T where
 	T: BlockImport<
-		Block,
-		Transaction = TransactionFor<substrate_test_runtime_client::Backend, Block>,
-		Error = ConsensusError,
-	> +
-	Send +
-	Sync +
-	Clone
-{}
+			Block,
+			Transaction = TransactionFor<substrate_test_runtime_client::Backend, Block>,
+			Error = ConsensusError,
+		> + Send
+		+ Sync
+		+ Clone
+{
+}
 
 /// Implements `BlockImport` for any `Transaction`. Internally the transaction is
 /// "converted", aka the field is set to `None`.
@@ -572,14 +592,13 @@ pub struct BlockImportAdapter<I> {
 impl<I> BlockImportAdapter<I> {
 	/// Create a new instance of `Self::Full`.
 	pub fn new(inner: I) -> Self {
-		Self {
-			inner,
-		}
+		Self { inner }
 	}
 }
 
 #[async_trait::async_trait]
-impl<I> BlockImport<Block> for BlockImportAdapter<I> where
+impl<I> BlockImport<Block> for BlockImportAdapter<I>
+where
 	I: BlockImport<Block, Error = ConsensusError> + Send + Sync,
 	I::Transaction: Send,
 {
@@ -615,13 +634,18 @@ impl<B: BlockT> Verifier<B> for VerifierAdapter<B> {
 		origin: BlockOrigin,
 		header: B::Header,
 		justifications: Option<Justifications>,
-		body: Option<Vec<B::Extrinsic>>
+		body: Option<Vec<B::Extrinsic>>,
 	) -> Result<(BlockImportParams<B, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String> {
 		let hash = header.hash();
-		self.verifier.lock().await.verify(origin, header, justifications, body).await.map_err(|e| {
-			self.failed_verifications.lock().insert(hash, e.clone());
-			e
-		})
+		self.verifier
+			.lock()
+			.await
+			.verify(origin, header, justifications, body)
+			.await
+			.map_err(|e| {
+				self.failed_verifications.lock().insert(hash, e.clone());
+				e
+			})
 	}
 }
 
@@ -664,7 +688,10 @@ pub struct FullPeerConfig {
 	pub storage_chain: bool,
 }
 
-pub trait TestNetFactory: Sized where <Self::BlockImport as BlockImport<Block>>::Transaction: Send {
+pub trait TestNetFactory: Sized
+where
+	<Self::BlockImport as BlockImport<Block>>::Transaction: Send,
+{
 	type Verifier: 'static + Verifier<Block>;
 	type BlockImport: BlockImport<Block, Error = ConsensusError> + Clone + Send + Sync + 'static;
 	type PeerData: Default;
@@ -687,12 +714,14 @@ pub trait TestNetFactory: Sized where <Self::BlockImport as BlockImport<Block>>:
 	);
 
 	/// Get custom block import handle for fresh client, along with peer data.
-	fn make_block_import(&self, client: PeersClient)
-		-> (
-			BlockImportAdapter<Self::BlockImport>,
-			Option<BoxJustificationImport<Block>>,
-			Self::PeerData,
-		);
+	fn make_block_import(
+		&self,
+		client: PeersClient,
+	) -> (
+		BlockImportAdapter<Self::BlockImport>,
+		Option<BoxJustificationImport<Block>>,
+		Self::PeerData,
+	);
 
 	fn default_config() -> ProtocolConfig {
 		ProtocolConfig::default()
@@ -723,18 +752,15 @@ pub trait TestNetFactory: Sized where <Self::BlockImport as BlockImport<Block>>:
 			(Some(keep_blocks), false) => TestClientBuilder::with_pruning_window(keep_blocks),
 			(None, false) => TestClientBuilder::with_default_backend(),
 		};
-		if matches!(config.sync_mode, SyncMode::Fast{..}) {
+		if matches!(config.sync_mode, SyncMode::Fast { .. }) {
 			test_client_builder = test_client_builder.set_no_genesis();
 		}
 		let backend = test_client_builder.backend();
 		let (c, longest_chain) = test_client_builder.build_with_longest_chain();
 		let client = Arc::new(c);
 
-		let (
-			block_import,
-			justification_import,
-			data,
-		) = self.make_block_import(PeersClient::Full(client.clone(), backend.clone()));
+		let (block_import, justification_import, data) =
+			self.make_block_import(PeersClient::Full(client.clone(), backend.clone()));
 
 		let verifier = self.make_verifier(
 			PeersClient::Full(client.clone(), backend.clone()),
@@ -753,30 +779,31 @@ pub trait TestNetFactory: Sized where <Self::BlockImport as BlockImport<Block>>:
 
 		let listen_addr = build_multiaddr![Memory(rand::random::<u64>())];
 
-		let mut network_config = NetworkConfiguration::new(
-			"test-node",
-			"test-client",
-			Default::default(),
-			None,
-		);
+		let mut network_config =
+			NetworkConfiguration::new("test-node", "test-client", Default::default(), None);
 		network_config.sync_mode = config.sync_mode;
 		network_config.transport = TransportConfig::MemoryOnly;
 		network_config.listen_addresses = vec![listen_addr.clone()];
 		network_config.allow_non_globals_in_dht = true;
-		network_config.extra_sets = config.notifications_protocols.into_iter().map(|p| {
-			NonDefaultSetConfig {
+		network_config.extra_sets = config
+			.notifications_protocols
+			.into_iter()
+			.map(|p| NonDefaultSetConfig {
 				notifications_protocol: p,
 				fallback_names: Vec::new(),
 				max_notification_size: 1024 * 1024,
-				set_config: Default::default()
-			}
-		}).collect();
+				set_config: Default::default(),
+			})
+			.collect();
 		if let Some(connect_to) = config.connect_to_peers {
-			let addrs = connect_to.iter().map(|v| {
-				let peer_id = self.peer(*v).network_service().local_peer_id().clone();
-				let multiaddr = self.peer(*v).listen_addr.clone();
-				MultiaddrWithPeerId { peer_id, multiaddr }
-			}).collect();
+			let addrs = connect_to
+				.iter()
+				.map(|v| {
+					let peer_id = self.peer(*v).network_service().local_peer_id().clone();
+					let multiaddr = self.peer(*v).listen_addr.clone();
+					MultiaddrWithPeerId { peer_id, multiaddr }
+				})
+				.collect();
 			network_config.default_peers_set.reserved_nodes = addrs;
 			network_config.default_peers_set.non_reserved_mode = NonReservedPeerMode::Deny;
 		}
@@ -784,27 +811,22 @@ pub trait TestNetFactory: Sized where <Self::BlockImport as BlockImport<Block>>:
 		let protocol_id = ProtocolId::from("test-protocol-name");
 
 		let block_request_protocol_config = {
-			let (handler, protocol_config) = BlockRequestHandler::new(
-				&protocol_id,
-				client.clone(),
-				50,
-			);
+			let (handler, protocol_config) =
+				BlockRequestHandler::new(&protocol_id, client.clone(), 50);
 			self.spawn_task(handler.run().boxed());
 			protocol_config
 		};
 
 		let state_request_protocol_config = {
-			let (handler, protocol_config) = StateRequestHandler::new(
-				&protocol_id,
-				client.clone(),
-				50,
-			);
+			let (handler, protocol_config) =
+				StateRequestHandler::new(&protocol_id, client.clone(), 50);
 			self.spawn_task(handler.run().boxed());
 			protocol_config
 		};
 
 		let light_client_request_protocol_config = {
-			let (handler, protocol_config) = LightClientRequestHandler::new(&protocol_id, client.clone());
+			let (handler, protocol_config) =
+				LightClientRequestHandler::new(&protocol_id, client.clone());
 			self.spawn_task(handler.run().boxed());
 			protocol_config
 		};
@@ -812,20 +834,24 @@ pub trait TestNetFactory: Sized where <Self::BlockImport as BlockImport<Block>>:
 		let network = NetworkWorker::new(sc_network::config::Params {
 			role: if config.is_authority { Role::Authority } else { Role::Full },
 			executor: None,
-			transactions_handler_executor: Box::new(|task| { async_std::task::spawn(task); }),
+			transactions_handler_executor: Box::new(|task| {
+				async_std::task::spawn(task);
+			}),
 			network_config,
 			chain: client.clone(),
 			on_demand: None,
 			transaction_pool: Arc::new(EmptyTransactionPool),
 			protocol_id,
 			import_queue,
-			block_announce_validator: config.block_announce_validator
+			block_announce_validator: config
+				.block_announce_validator
 				.unwrap_or_else(|| Box::new(DefaultBlockAnnounceValidator)),
 			metrics_registry: None,
 			block_request_protocol_config,
 			state_request_protocol_config,
 			light_client_request_protocol_config,
-		}).unwrap();
+		})
+		.unwrap();
 
 		trace!(target: "test_network", "Peer identifier: {}", network.service().local_peer_id());
 
@@ -838,7 +864,8 @@ pub trait TestNetFactory: Sized where <Self::BlockImport as BlockImport<Block>>:
 			}
 
 			let imported_blocks_stream = Box::pin(client.import_notification_stream().fuse());
-			let finality_notification_stream = Box::pin(client.finality_notification_stream().fuse());
+			let finality_notification_stream =
+				Box::pin(client.finality_notification_stream().fuse());
 
 			peers.push(Peer {
 				data,
@@ -859,11 +886,8 @@ pub trait TestNetFactory: Sized where <Self::BlockImport as BlockImport<Block>>:
 	fn add_light_peer(&mut self) {
 		let (c, backend) = substrate_test_runtime_client::new_light();
 		let client = Arc::new(c);
-		let (
-			block_import,
-			justification_import,
-			data,
-		) = self.make_block_import(PeersClient::Light(client.clone(), backend.clone()));
+		let (block_import, justification_import, data) =
+			self.make_block_import(PeersClient::Light(client.clone(), backend.clone()));
 
 		let verifier = self.make_verifier(
 			PeersClient::Light(client.clone(), backend.clone()),
@@ -882,24 +906,18 @@ pub trait TestNetFactory: Sized where <Self::BlockImport as BlockImport<Block>>:
 
 		let listen_addr = build_multiaddr![Memory(rand::random::<u64>())];
 
-		let mut network_config = NetworkConfiguration::new(
-			"test-node",
-			"test-client",
-			Default::default(),
-			None,
-		);
+		let mut network_config =
+			NetworkConfiguration::new("test-node", "test-client", Default::default(), None);
 		network_config.transport = TransportConfig::MemoryOnly;
 		network_config.listen_addresses = vec![listen_addr.clone()];
 		network_config.allow_non_globals_in_dht = true;
 
 		let protocol_id = ProtocolId::from("test-protocol-name");
 
-		let block_request_protocol_config = block_request_handler::generate_protocol_config(
-			&protocol_id,
-		);
-		let state_request_protocol_config = state_request_handler::generate_protocol_config(
-			&protocol_id,
-		);
+		let block_request_protocol_config =
+			block_request_handler::generate_protocol_config(&protocol_id);
+		let state_request_protocol_config =
+			state_request_handler::generate_protocol_config(&protocol_id);
 
 		let light_client_request_protocol_config =
 			light_client_requests::generate_protocol_config(&protocol_id);
@@ -907,7 +925,9 @@ pub trait TestNetFactory: Sized where <Self::BlockImport as BlockImport<Block>>:
 		let network = NetworkWorker::new(sc_network::config::Params {
 			role: Role::Light,
 			executor: None,
-			transactions_handler_executor: Box::new(|task| { async_std::task::spawn(task); }),
+			transactions_handler_executor: Box::new(|task| {
+				async_std::task::spawn(task);
+			}),
 			network_config,
 			chain: client.clone(),
 			on_demand: None,
@@ -919,15 +939,20 @@ pub trait TestNetFactory: Sized where <Self::BlockImport as BlockImport<Block>>:
 			block_request_protocol_config,
 			state_request_protocol_config,
 			light_client_request_protocol_config,
-		}).unwrap();
+		})
+		.unwrap();
 
 		self.mut_peers(|peers| {
 			for peer in peers.iter_mut() {
-				peer.network.add_known_address(network.service().local_peer_id().clone(), listen_addr.clone());
+				peer.network.add_known_address(
+					network.service().local_peer_id().clone(),
+					listen_addr.clone(),
+				);
 			}
 
 			let imported_blocks_stream = Box::pin(client.import_notification_stream().fuse());
-			let finality_notification_stream = Box::pin(client.finality_notification_stream().fuse());
+			let finality_notification_stream =
+				Box::pin(client.finality_notification_stream().fuse());
 
 			peers.push(Peer {
 				data,
@@ -967,7 +992,7 @@ pub trait TestNetFactory: Sized where <Self::BlockImport as BlockImport<Block>>:
 			match (highest, peer.client.info().best_hash) {
 				(None, b) => highest = Some(b),
 				(Some(ref a), ref b) if a == b => {},
-				(Some(_), _) => return Poll::Pending
+				(Some(_), _) => return Poll::Pending,
 			}
 		}
 		Poll::Ready(())
@@ -1008,23 +1033,27 @@ pub trait TestNetFactory: Sized where <Self::BlockImport as BlockImport<Block>>:
 	///
 	/// Calls `poll_until_sync` repeatedly.
 	fn block_until_sync(&mut self) {
-		futures::executor::block_on(futures::future::poll_fn::<(), _>(|cx| self.poll_until_sync(cx)));
+		futures::executor::block_on(futures::future::poll_fn::<(), _>(|cx| {
+			self.poll_until_sync(cx)
+		}));
 	}
 
 	/// Blocks the current thread until there are no pending packets.
 	///
 	/// Calls `poll_until_idle` repeatedly with the runtime passed as parameter.
 	fn block_until_idle(&mut self) {
-		futures::executor::block_on(futures::future::poll_fn::<(), _>(|cx| self.poll_until_idle(cx)));
+		futures::executor::block_on(futures::future::poll_fn::<(), _>(|cx| {
+			self.poll_until_idle(cx)
+		}));
 	}
 
 	/// Blocks the current thread until all peers are connected to each other.
 	///
 	/// Calls `poll_until_connected` repeatedly with the runtime passed as parameter.
 	fn block_until_connected(&mut self) {
-		futures::executor::block_on(
-			futures::future::poll_fn::<(), _>(|cx| self.poll_until_connected(cx)),
-		);
+		futures::executor::block_on(futures::future::poll_fn::<(), _>(|cx| {
+			self.poll_until_connected(cx)
+		}));
 	}
 
 	/// Polls the testnet. Processes all the pending actions.
@@ -1038,13 +1067,17 @@ pub trait TestNetFactory: Sized where <Self::BlockImport as BlockImport<Block>>:
 				trace!(target: "sync", "-- Polling complete {}: {}", i, peer.id());
 
 				// We poll `imported_blocks_stream`.
-				while let Poll::Ready(Some(notification)) = peer.imported_blocks_stream.as_mut().poll_next(cx) {
+				while let Poll::Ready(Some(notification)) =
+					peer.imported_blocks_stream.as_mut().poll_next(cx)
+				{
 					peer.network.service().announce_block(notification.hash, None);
 				}
 
 				// We poll `finality_notification_stream`, but we only take the last event.
 				let mut last = None;
-				while let Poll::Ready(Some(item)) = peer.finality_notification_stream.as_mut().poll_next(cx) {
+				while let Poll::Ready(Some(item)) =
+					peer.finality_notification_stream.as_mut().poll_next(cx)
+				{
 					last = Some(item);
 				}
 				if let Some(notification) = last {
@@ -1063,10 +1096,7 @@ pub struct TestNet {
 impl TestNet {
 	/// Create a `TestNet` that used the given fork choice rule.
 	pub fn with_fork_choice(fork_choice: ForkChoiceStrategy) -> Self {
-		Self {
-			peers: Vec::new(),
-			fork_choice,
-		}
+		Self { peers: Vec::new(), fork_choice }
 	}
 }
 
@@ -1077,25 +1107,26 @@ impl TestNetFactory for TestNet {
 
 	/// Create new test network with peers and given config.
 	fn from_config(_config: &ProtocolConfig) -> Self {
-		TestNet {
-			peers: Vec::new(),
-			fork_choice: ForkChoiceStrategy::LongestChain,
-		}
+		TestNet { peers: Vec::new(), fork_choice: ForkChoiceStrategy::LongestChain }
 	}
 
-	fn make_verifier(&self, _client: PeersClient, _config: &ProtocolConfig, _peer_data: &())
-		-> Self::Verifier
-	{
+	fn make_verifier(
+		&self,
+		_client: PeersClient,
+		_config: &ProtocolConfig,
+		_peer_data: &(),
+	) -> Self::Verifier {
 		PassThroughVerifier::new_with_fork_choice(false, self.fork_choice.clone())
 	}
 
-	fn make_block_import(&self, client: PeersClient)
-		-> (
-			BlockImportAdapter<Self::BlockImport>,
-			Option<BoxJustificationImport<Block>>,
-			Self::PeerData,
-		)
-	{
+	fn make_block_import(
+		&self,
+		client: PeersClient,
+	) -> (
+		BlockImportAdapter<Self::BlockImport>,
+		Option<BoxJustificationImport<Block>>,
+		Self::PeerData,
+	) {
 		(client.as_block_import(), None, ())
 	}
 
@@ -1128,7 +1159,8 @@ impl JustificationImport<Block> for ForceFinalized {
 		_number: NumberFor<Block>,
 		justification: Justification,
 	) -> Result<(), Self::Error> {
-		self.0.finalize_block(BlockId::Hash(hash), Some(justification), true)
+		self.0
+			.finalize_block(BlockId::Hash(hash), Some(justification), true)
 			.map_err(|_| ConsensusError::InvalidJustification.into())
 	}
 }
@@ -1144,7 +1176,12 @@ impl TestNetFactory for JustificationTestNet {
 		JustificationTestNet(TestNet::from_config(config))
 	}
 
-	fn make_verifier(&self, client: PeersClient, config: &ProtocolConfig, peer_data: &()) -> Self::Verifier {
+	fn make_verifier(
+		&self,
+		client: PeersClient,
+		config: &ProtocolConfig,
+		peer_data: &(),
+	) -> Self::Verifier {
 		self.0.make_verifier(client, config, peer_data)
 	}
 
@@ -1156,23 +1193,21 @@ impl TestNetFactory for JustificationTestNet {
 		self.0.peers()
 	}
 
-	fn mut_peers<F: FnOnce(
-		&mut Vec<Peer<Self::PeerData, Self::BlockImport>>,
-	)>(&mut self, closure: F) {
+	fn mut_peers<F: FnOnce(&mut Vec<Peer<Self::PeerData, Self::BlockImport>>)>(
+		&mut self,
+		closure: F,
+	) {
 		self.0.mut_peers(closure)
 	}
 
-	fn make_block_import(&self, client: PeersClient)
-		-> (
-			BlockImportAdapter<Self::BlockImport>,
-			Option<BoxJustificationImport<Block>>,
-			Self::PeerData,
-		)
-	{
-		(
-			client.as_block_import(),
-			Some(Box::new(ForceFinalized(client))),
-			Default::default(),
-		)
+	fn make_block_import(
+		&self,
+		client: PeersClient,
+	) -> (
+		BlockImportAdapter<Self::BlockImport>,
+		Option<BoxJustificationImport<Block>>,
+		Self::PeerData,
+	) {
+		(client.as_block_import(), Some(Box::new(ForceFinalized(client))), Default::default())
 	}
 }
diff --git a/client/network/test/src/sync.rs b/client/network/test/src/sync.rs
index f998c9ebde75..153a0f905bff 100644
--- a/client/network/test/src/sync.rs
+++ b/client/network/test/src/sync.rs
@@ -16,13 +16,12 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use sp_consensus::BlockOrigin;
-use std::time::Duration;
-use futures::{Future, executor::block_on};
 use super::*;
-use sp_consensus::block_validation::Validation;
-use substrate_test_runtime::Header;
+use futures::{executor::block_on, Future};
+use sp_consensus::{block_validation::Validation, BlockOrigin};
 use sp_runtime::Justifications;
+use std::time::Duration;
+use substrate_test_runtime::Header;
 
 fn test_ancestor_search_when_common_is(n: usize) {
 	sp_tracing::try_init_simple();
@@ -254,9 +253,18 @@ fn sync_justifications() {
 
 	// we finalize block #10, #15 and #20 for peer 0 with a justification
 	let just = (*b"FRNK", Vec::new());
-	net.peer(0).client().finalize_block(BlockId::Number(10), Some(just.clone()), true).unwrap();
-	net.peer(0).client().finalize_block(BlockId::Number(15), Some(just.clone()), true).unwrap();
-	net.peer(0).client().finalize_block(BlockId::Number(20), Some(just.clone()), true).unwrap();
+	net.peer(0)
+		.client()
+		.finalize_block(BlockId::Number(10), Some(just.clone()), true)
+		.unwrap();
+	net.peer(0)
+		.client()
+		.finalize_block(BlockId::Number(15), Some(just.clone()), true)
+		.unwrap();
+	net.peer(0)
+		.client()
+		.finalize_block(BlockId::Number(20), Some(just.clone()), true)
+		.unwrap();
 
 	let h1 = net.peer(1).client().header(&BlockId::Number(10)).unwrap().unwrap();
 	let h2 = net.peer(1).client().header(&BlockId::Number(15)).unwrap().unwrap();
@@ -271,21 +279,15 @@ fn sync_justifications() {
 		net.poll(cx);
 
 		for height in (10..21).step_by(5) {
-			if net
-				.peer(0)
-				.client()
-				.justifications(&BlockId::Number(height))
-				.unwrap() != Some(Justifications::from((*b"FRNK", Vec::new())))
+			if net.peer(0).client().justifications(&BlockId::Number(height)).unwrap() !=
+				Some(Justifications::from((*b"FRNK", Vec::new())))
 			{
-				return Poll::Pending;
+				return Poll::Pending
 			}
-			if net
-				.peer(1)
-				.client()
-				.justifications(&BlockId::Number(height))
-				.unwrap() != Some(Justifications::from((*b"FRNK", Vec::new())))
+			if net.peer(1).client().justifications(&BlockId::Number(height)).unwrap() !=
+				Some(Justifications::from((*b"FRNK", Vec::new())))
 			{
-				return Poll::Pending;
+				return Poll::Pending
 			}
 		}
 
@@ -308,7 +310,10 @@ fn sync_justifications_across_forks() {
 	net.block_until_sync();
 
 	let just = (*b"FRNK", Vec::new());
-	net.peer(0).client().finalize_block(BlockId::Hash(f1_best), Some(just), true).unwrap();
+	net.peer(0)
+		.client()
+		.finalize_block(BlockId::Hash(f1_best), Some(just), true)
+		.unwrap();
 
 	net.peer(1).request_justification(&f1_best, 10);
 	net.peer(1).request_justification(&f2_best, 11);
@@ -316,16 +321,10 @@ fn sync_justifications_across_forks() {
 	block_on(futures::future::poll_fn::<(), _>(|cx| {
 		net.poll(cx);
 
-		if net
-			.peer(0)
-			.client()
-			.justifications(&BlockId::Number(10))
-			.unwrap() == Some(Justifications::from((*b"FRNK", Vec::new())))
-			&& net
-				.peer(1)
-				.client()
-				.justifications(&BlockId::Number(10))
-				.unwrap() == Some(Justifications::from((*b"FRNK", Vec::new())))
+		if net.peer(0).client().justifications(&BlockId::Number(10)).unwrap() ==
+			Some(Justifications::from((*b"FRNK", Vec::new()))) &&
+			net.peer(1).client().justifications(&BlockId::Number(10)).unwrap() ==
+				Some(Justifications::from((*b"FRNK", Vec::new())))
 		{
 			Poll::Ready(())
 		} else {
@@ -380,7 +379,8 @@ fn own_blocks_are_announced() {
 	sp_tracing::try_init_simple();
 	let mut net = TestNet::new(3);
 	net.block_until_sync(); // connect'em
-	net.peer(0).generate_blocks(1, BlockOrigin::Own, |builder| builder.build().unwrap().block);
+	net.peer(0)
+		.generate_blocks(1, BlockOrigin::Own, |builder| builder.build().unwrap().block);
 
 	net.block_until_sync();
 
@@ -573,7 +573,7 @@ fn can_sync_explicit_forks() {
 	// poll until the two nodes connect, otherwise announcing the block will not work
 	block_on(futures::future::poll_fn::<(), _>(|cx| {
 		net.poll(cx);
-		if net.peer(0).num_peers() == 0  || net.peer(1).num_peers() == 0 {
+		if net.peer(0).num_peers() == 0 || net.peer(1).num_peers() == 0 {
 			Poll::Pending
 		} else {
 			Poll::Ready(())
@@ -658,7 +658,7 @@ fn full_sync_requires_block_body() {
 	// Wait for nodes to connect
 	block_on(futures::future::poll_fn::<(), _>(|cx| {
 		net.poll(cx);
-		if net.peer(0).num_peers() == 0  || net.peer(1).num_peers() == 0 {
+		if net.peer(0).num_peers() == 0 || net.peer(1).num_peers() == 0 {
 			Poll::Pending
 		} else {
 			Poll::Ready(())
@@ -718,8 +718,14 @@ fn can_sync_to_peers_with_wrong_common_block() {
 
 	// both peers re-org to the same fork without notifying each other
 	let just = Some((*b"FRNK", Vec::new()));
-	net.peer(0).client().finalize_block(BlockId::Hash(fork_hash), just.clone(), true).unwrap();
-	net.peer(1).client().finalize_block(BlockId::Hash(fork_hash), just, true).unwrap();
+	net.peer(0)
+		.client()
+		.finalize_block(BlockId::Hash(fork_hash), just.clone(), true)
+		.unwrap();
+	net.peer(1)
+		.client()
+		.finalize_block(BlockId::Hash(fork_hash), just, true)
+		.unwrap();
 	let final_hash = net.peer(0).push_blocks(1, false);
 
 	net.block_until_sync();
@@ -735,7 +741,8 @@ impl BlockAnnounceValidator<Block> for NewBestBlockAnnounceValidator {
 		&mut self,
 		_: &Header,
 		_: &[u8],
-	) -> Pin<Box<dyn Future<Output = Result<Validation, Box<dyn std::error::Error + Send>>> + Send>> {
+	) -> Pin<Box<dyn Future<Output = Result<Validation, Box<dyn std::error::Error + Send>>> + Send>>
+	{
 		async { Ok(Validation::Success { is_new_best: true }) }.boxed()
 	}
 }
@@ -748,16 +755,18 @@ impl BlockAnnounceValidator<Block> for FailingBlockAnnounceValidator {
 		&mut self,
 		header: &Header,
 		_: &[u8],
-	) -> Pin<Box<dyn Future<Output = Result<Validation, Box<dyn std::error::Error + Send>>> + Send>> {
+	) -> Pin<Box<dyn Future<Output = Result<Validation, Box<dyn std::error::Error + Send>>> + Send>>
+	{
 		let number = *header.number();
 		let target_number = self.0;
-		async move { Ok(
-			if number == target_number {
+		async move {
+			Ok(if number == target_number {
 				Validation::Failure { disconnect: false }
 			} else {
 				Validation::Success { is_new_best: true }
-			}
-		) }.boxed()
+			})
+		}
+		.boxed()
 	}
 }
 
@@ -794,11 +803,13 @@ impl BlockAnnounceValidator<Block> for DeferredBlockAnnounceValidator {
 		&mut self,
 		_: &Header,
 		_: &[u8],
-	) -> Pin<Box<dyn Future<Output = Result<Validation, Box<dyn std::error::Error + Send>>> + Send>> {
+	) -> Pin<Box<dyn Future<Output = Result<Validation, Box<dyn std::error::Error + Send>>> + Send>>
+	{
 		async {
 			futures_timer::Delay::new(std::time::Duration::from_millis(500)).await;
 			Ok(Validation::Success { is_new_best: false })
-		}.boxed()
+		}
+		.boxed()
 	}
 }
 
@@ -863,17 +874,12 @@ fn sync_to_tip_when_we_sync_together_with_multiple_peers() {
 
 	let mut net = TestNet::new(3);
 
-	let block_hash = net.peer(0).push_blocks_at_without_informing_sync(
-		BlockId::Number(0),
-		10_000,
-		false,
-	);
+	let block_hash =
+		net.peer(0)
+			.push_blocks_at_without_informing_sync(BlockId::Number(0), 10_000, false);
 
-	net.peer(1).push_blocks_at_without_informing_sync(
-		BlockId::Number(0),
-		5_000,
-		false,
-	);
+	net.peer(1)
+		.push_blocks_at_without_informing_sync(BlockId::Number(0), 5_000, false);
 
 	net.block_until_connected();
 	net.block_until_idle();
@@ -897,7 +903,9 @@ fn block_announce_data_is_propagated() {
 			&mut self,
 			_: &Header,
 			data: &[u8],
-		) -> Pin<Box<dyn Future<Output = Result<Validation, Box<dyn std::error::Error + Send>>> + Send>> {
+		) -> Pin<
+			Box<dyn Future<Output = Result<Validation, Box<dyn std::error::Error + Send>>> + Send>,
+		> {
 			let correct = data.get(0) == Some(&137);
 			async move {
 				if correct {
@@ -905,7 +913,8 @@ fn block_announce_data_is_propagated() {
 				} else {
 					Ok(Validation::Failure { disconnect: false })
 				}
-			}.boxed()
+			}
+			.boxed()
 		}
 	}
 
@@ -950,15 +959,19 @@ fn continue_to_sync_after_some_block_announcement_verifications_failed() {
 			&mut self,
 			header: &Header,
 			_: &[u8],
-		) -> Pin<Box<dyn Future<Output = Result<Validation, Box<dyn std::error::Error + Send>>> + Send>> {
+		) -> Pin<
+			Box<dyn Future<Output = Result<Validation, Box<dyn std::error::Error + Send>>> + Send>,
+		> {
 			let number = *header.number();
 			async move {
 				if number < 100 {
-					Err(Box::<dyn std::error::Error + Send + Sync>::from(String::from("error")) as Box<_>)
+					Err(Box::<dyn std::error::Error + Send + Sync>::from(String::from("error"))
+						as Box<_>)
 				} else {
 					Ok(Validation::Success { is_new_best: false })
 				}
-			}.boxed()
+			}
+			.boxed()
 		}
 	}
 
@@ -1010,22 +1023,18 @@ fn multiple_requests_are_accepted_as_long_as_they_are_not_fulfilled() {
 	}
 
 	// Finalize the block and make the justification available.
-	net.peer(0).client().finalize_block(
-		BlockId::Number(10),
-		Some((*b"FRNK", Vec::new())),
-		true,
-	).unwrap();
+	net.peer(0)
+		.client()
+		.finalize_block(BlockId::Number(10), Some((*b"FRNK", Vec::new())), true)
+		.unwrap();
 
 	block_on(futures::future::poll_fn::<(), _>(|cx| {
 		net.poll(cx);
 
-		if net
-			.peer(1)
-			.client()
-			.justifications(&BlockId::Number(10))
-			.unwrap() != Some(Justifications::from((*b"FRNK", Vec::new())))
+		if net.peer(1).client().justifications(&BlockId::Number(10)).unwrap() !=
+			Some(Justifications::from((*b"FRNK", Vec::new())))
 		{
-			return Poll::Pending;
+			return Poll::Pending
 		}
 
 		Poll::Ready(())
@@ -1091,7 +1100,7 @@ fn syncs_after_missing_announcement() {
 #[test]
 fn syncs_state() {
 	sp_tracing::try_init_simple();
-	for skip_proofs in &[ false, true ] {
+	for skip_proofs in &[false, true] {
 		let mut net = TestNet::new(0);
 		net.add_full_peer_with_config(Default::default());
 		net.add_full_peer_with_config(FullPeerConfig {
@@ -1104,7 +1113,10 @@ fn syncs_state() {
 		assert!(!net.peer(1).client().has_state_at(&BlockId::Number(64)));
 
 		let just = (*b"FRNK", Vec::new());
-		net.peer(1).client().finalize_block(BlockId::Number(60), Some(just), true).unwrap();
+		net.peer(1)
+			.client()
+			.finalize_block(BlockId::Number(60), Some(just), true)
+			.unwrap();
 		// Wait for state sync.
 		block_on(futures::future::poll_fn::<(), _>(|cx| {
 			net.poll(cx);
@@ -1133,10 +1145,7 @@ fn syncs_indexed_blocks() {
 	sp_tracing::try_init_simple();
 	let mut net = TestNet::new(0);
 	let mut n: u64 = 0;
-	net.add_full_peer_with_config(FullPeerConfig {
-		storage_chain: true,
-		..Default::default()
-	});
+	net.add_full_peer_with_config(FullPeerConfig { storage_chain: true, ..Default::default() });
 	net.add_full_peer_with_config(FullPeerConfig {
 		storage_chain: true,
 		sync_mode: SyncMode::Fast { skip_proofs: false, storage_chain_mode: true },
@@ -1145,7 +1154,8 @@ fn syncs_indexed_blocks() {
 	net.peer(0).generate_blocks_at(
 		BlockId::number(0),
 		64,
-		BlockOrigin::Own, |mut builder| {
+		BlockOrigin::Own,
+		|mut builder| {
 			let ex = Extrinsic::Store(n.to_le_bytes().to_vec());
 			n += 1;
 			builder.push(ex).unwrap();
@@ -1156,10 +1166,30 @@ fn syncs_indexed_blocks() {
 		true,
 	);
 	let indexed_key = sp_runtime::traits::BlakeTwo256::hash(&42u64.to_le_bytes());
-	assert!(net.peer(0).client().as_full().unwrap().indexed_transaction(&indexed_key).unwrap().is_some());
-	assert!(net.peer(1).client().as_full().unwrap().indexed_transaction(&indexed_key).unwrap().is_none());
+	assert!(net
+		.peer(0)
+		.client()
+		.as_full()
+		.unwrap()
+		.indexed_transaction(&indexed_key)
+		.unwrap()
+		.is_some());
+	assert!(net
+		.peer(1)
+		.client()
+		.as_full()
+		.unwrap()
+		.indexed_transaction(&indexed_key)
+		.unwrap()
+		.is_none());
 
 	net.block_until_sync();
-	assert!(net.peer(1).client().as_full().unwrap().indexed_transaction(&indexed_key).unwrap().is_some());
+	assert!(net
+		.peer(1)
+		.client()
+		.as_full()
+		.unwrap()
+		.indexed_transaction(&indexed_key)
+		.unwrap()
+		.is_some());
 }
-
diff --git a/client/offchain/src/api.rs b/client/offchain/src/api.rs
index 9b5ff69b726a..46ba1a0f3cbc 100644
--- a/client/offchain/src/api.rs
+++ b/client/offchain/src/api.rs
@@ -16,25 +16,21 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use std::{
-	str::FromStr,
-	sync::Arc,
-	convert::TryFrom,
-	thread::sleep,
-	collections::HashSet,
-};
+use std::{collections::HashSet, convert::TryFrom, str::FromStr, sync::Arc, thread::sleep};
 
 use crate::NetworkProvider;
+use codec::{Decode, Encode};
 use futures::Future;
-use sc_network::{PeerId, Multiaddr};
-use codec::{Encode, Decode};
-use sp_core::OpaquePeerId;
-use sp_core::offchain::{
-	self, HttpRequestId, Timestamp, HttpRequestStatus, HttpError,
-	OffchainStorage, OpaqueNetworkState, OpaqueMultiaddr, StorageKind,
+pub use http::SharedClient;
+use sc_network::{Multiaddr, PeerId};
+use sp_core::{
+	offchain::{
+		self, HttpError, HttpRequestId, HttpRequestStatus, OffchainStorage, OpaqueMultiaddr,
+		OpaqueNetworkState, StorageKind, Timestamp,
+	},
+	OpaquePeerId,
 };
 pub use sp_offchain::STORAGE_PREFIX;
-pub use http::SharedClient;
 
 #[cfg(not(target_os = "unknown"))]
 mod http;
@@ -71,16 +67,15 @@ impl<Storage: OffchainStorage> Db<Storage> {
 	}
 
 	/// Create new instance of Offchain DB, backed by given backend.
-	pub fn factory_from_backend<Backend, Block>(backend: &Backend) -> Option<
-		Box<dyn sc_client_api::execution_extensions::DbExternalitiesFactory>
-	> where
+	pub fn factory_from_backend<Backend, Block>(
+		backend: &Backend,
+	) -> Option<Box<dyn sc_client_api::execution_extensions::DbExternalitiesFactory>>
+	where
 		Backend: sc_client_api::Backend<Block, OffchainStorage = Storage>,
 		Block: sp_runtime::traits::Block,
 		Storage: 'static,
 	{
-		sc_client_api::Backend::offchain_storage(backend).map(|db|
-			Box::new(Self::new(db)) as _
-		)
+		sc_client_api::Backend::offchain_storage(backend).map(|db| Box::new(Self::new(db)) as _)
 	}
 }
 
@@ -123,9 +118,8 @@ impl<Storage: OffchainStorage> offchain::DbExternalities for Db<Storage> {
 			old_value.as_ref().map(hex::encode),
 		);
 		match kind {
-			StorageKind::PERSISTENT => {
-				self.persistent.compare_and_set(STORAGE_PREFIX, key, old_value, new_value)
-			},
+			StorageKind::PERSISTENT =>
+				self.persistent.compare_and_set(STORAGE_PREFIX, key, old_value, new_value),
 			StorageKind::LOCAL => unavailable_yet(LOCAL_DB),
 		}
 	}
@@ -167,10 +161,7 @@ impl offchain::Externalities for Api {
 	fn network_state(&self) -> Result<OpaqueNetworkState, ()> {
 		let external_addresses = self.network_provider.external_addresses();
 
-		let state = NetworkState::new(
-			self.network_provider.local_peer_id(),
-			external_addresses,
-		);
+		let state = NetworkState::new(self.network_provider.local_peer_id(), external_addresses);
 		Ok(OpaqueNetworkState::from(state))
 	}
 
@@ -190,7 +181,7 @@ impl offchain::Externalities for Api {
 		&mut self,
 		method: &str,
 		uri: &str,
-		_meta: &[u8]
+		_meta: &[u8],
 	) -> Result<HttpRequestId, ()> {
 		self.http.request_start(method, uri)
 	}
@@ -199,7 +190,7 @@ impl offchain::Externalities for Api {
 		&mut self,
 		request_id: HttpRequestId,
 		name: &str,
-		value: &str
+		value: &str,
 	) -> Result<(), ()> {
 		self.http.request_add_header(request_id, name, value)
 	}
@@ -208,7 +199,7 @@ impl offchain::Externalities for Api {
 		&mut self,
 		request_id: HttpRequestId,
 		chunk: &[u8],
-		deadline: Option<Timestamp>
+		deadline: Option<Timestamp>,
 	) -> Result<(), HttpError> {
 		self.http.request_write_body(request_id, chunk, deadline)
 	}
@@ -216,15 +207,12 @@ impl offchain::Externalities for Api {
 	fn http_response_wait(
 		&mut self,
 		ids: &[HttpRequestId],
-		deadline: Option<Timestamp>
+		deadline: Option<Timestamp>,
 	) -> Vec<HttpRequestStatus> {
 		self.http.response_wait(ids, deadline)
 	}
 
-	fn http_response_headers(
-		&mut self,
-		request_id: HttpRequestId
-	) -> Vec<(Vec<u8>, Vec<u8>)> {
+	fn http_response_headers(&mut self, request_id: HttpRequestId) -> Vec<(Vec<u8>, Vec<u8>)> {
 		self.http.response_headers(request_id)
 	}
 
@@ -232,15 +220,14 @@ impl offchain::Externalities for Api {
 		&mut self,
 		request_id: HttpRequestId,
 		buffer: &mut [u8],
-		deadline: Option<Timestamp>
+		deadline: Option<Timestamp>,
 	) -> Result<usize, HttpError> {
 		self.http.response_read_body(request_id, buffer, deadline)
 	}
 
 	fn set_authorized_nodes(&mut self, nodes: Vec<OpaquePeerId>, authorized_only: bool) {
-		let peer_ids: HashSet<PeerId> = nodes.into_iter()
-			.filter_map(|node| PeerId::from_bytes(&node.0).ok())
-			.collect();
+		let peer_ids: HashSet<PeerId> =
+			nodes.into_iter().filter_map(|node| PeerId::from_bytes(&node.0).ok()).collect();
 
 		self.network_provider.set_authorized_peers(peer_ids);
 		self.network_provider.set_authorized_only(authorized_only);
@@ -256,10 +243,7 @@ pub struct NetworkState {
 
 impl NetworkState {
 	fn new(peer_id: PeerId, external_addresses: Vec<Multiaddr>) -> Self {
-		NetworkState {
-			peer_id,
-			external_addresses,
-		}
+		NetworkState { peer_id, external_addresses }
 	}
 }
 
@@ -277,10 +261,7 @@ impl From<NetworkState> for OpaqueNetworkState {
 			})
 			.collect();
 
-		OpaqueNetworkState {
-			peer_id,
-			external_addresses,
-		}
+		OpaqueNetworkState { peer_id, external_addresses }
 	}
 }
 
@@ -293,7 +274,8 @@ impl TryFrom<OpaqueNetworkState> for NetworkState {
 		let bytes: Vec<u8> = Decode::decode(&mut &inner_vec[..]).map_err(|_| ())?;
 		let peer_id = PeerId::from_bytes(&bytes).map_err(|_| ())?;
 
-		let external_addresses: Result<Vec<Multiaddr>, Self::Error> = state.external_addresses
+		let external_addresses: Result<Vec<Multiaddr>, Self::Error> = state
+			.external_addresses
 			.iter()
 			.map(|enc_multiaddr| -> Result<Multiaddr, Self::Error> {
 				let inner_vec = &enc_multiaddr.0;
@@ -305,10 +287,7 @@ impl TryFrom<OpaqueNetworkState> for NetworkState {
 			.collect();
 		let external_addresses = external_addresses?;
 
-		Ok(NetworkState {
-			peer_id,
-			external_addresses,
-		})
+		Ok(NetworkState { peer_id, external_addresses })
 	}
 }
 
@@ -329,15 +308,9 @@ impl AsyncApi {
 	) -> (Api, Self) {
 		let (http_api, http_worker) = http::http(shared_client);
 
-		let api = Api {
-			network_provider,
-			is_validator,
-			http: http_api,
-		};
+		let api = Api { network_provider, is_validator, http: http_api };
 
-		let async_api = Self {
-			http: Some(http_worker),
-		};
+		let async_api = Self { http: Some(http_worker) };
 
 		(api, async_api)
 	}
@@ -355,8 +328,11 @@ mod tests {
 	use super::*;
 	use sc_client_db::offchain::LocalStorage;
 	use sc_network::{NetworkStateInfo, PeerId};
-	use sp_core::offchain::{Externalities, DbExternalities};
-	use std::{convert::{TryFrom, TryInto}, time::SystemTime};
+	use sp_core::offchain::{DbExternalities, Externalities};
+	use std::{
+		convert::{TryFrom, TryInto},
+		time::SystemTime,
+	};
 
 	struct TestNetwork();
 
@@ -385,11 +361,7 @@ mod tests {
 		let mock = Arc::new(TestNetwork());
 		let shared_client = SharedClient::new();
 
-		AsyncApi::new(
-			mock,
-			false,
-			shared_client,
-		)
+		AsyncApi::new(mock, false, shared_client)
 	}
 
 	fn offchain_db() -> Db<LocalStorage> {
@@ -402,7 +374,12 @@ mod tests {
 
 		// Get timestamp from std.
 		let now = SystemTime::now();
-		let d: u64 = now.duration_since(SystemTime::UNIX_EPOCH).unwrap().as_millis().try_into().unwrap();
+		let d: u64 = now
+			.duration_since(SystemTime::UNIX_EPOCH)
+			.unwrap()
+			.as_millis()
+			.try_into()
+			.unwrap();
 
 		// Get timestamp from offchain api.
 		let timestamp = api.timestamp();
diff --git a/client/offchain/src/api/http.rs b/client/offchain/src/api/http.rs
index f03f7a93b856..75a27f0c7cfb 100644
--- a/client/offchain/src/api/http.rs
+++ b/client/offchain/src/api/http.rs
@@ -28,16 +28,22 @@
 //! actively calling any function.
 
 use crate::api::timestamp;
-use bytes::buf::ext::{Reader, BufExt};
+use bytes::buf::ext::{BufExt, Reader};
 use fnv::FnvHashMap;
-use futures::{prelude::*, future, channel::mpsc};
-use log::error;
-use sp_core::offchain::{HttpRequestId, Timestamp, HttpRequestStatus, HttpError};
-use std::{convert::TryFrom, fmt, io::Read as _, pin::Pin, task::{Context, Poll}};
-use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedSender, TracingUnboundedReceiver};
-use std::sync::Arc;
-use hyper::{Client as HyperClient, Body, client};
+use futures::{channel::mpsc, future, prelude::*};
+use hyper::{client, Body, Client as HyperClient};
 use hyper_rustls::HttpsConnector;
+use log::error;
+use sp_core::offchain::{HttpError, HttpRequestId, HttpRequestStatus, Timestamp};
+use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
+use std::{
+	convert::TryFrom,
+	fmt,
+	io::Read as _,
+	pin::Pin,
+	sync::Arc,
+	task::{Context, Poll},
+};
 
 /// Wrapper struct used for keeping the hyper_rustls client running.
 #[derive(Clone)]
@@ -63,12 +69,8 @@ pub fn http(shared_client: SharedClient) -> (HttpApi, HttpWorker) {
 		requests: FnvHashMap::default(),
 	};
 
-	let engine = HttpWorker {
-		to_api,
-		from_api,
-		http_client: shared_client.0,
-		requests: Vec::new(),
-	};
+	let engine =
+		HttpWorker { to_api, from_api, http_client: shared_client.0, requests: Vec::new() };
 
 	(api, engine)
 }
@@ -127,11 +129,7 @@ struct HttpApiRequestRp {
 
 impl HttpApi {
 	/// Mimics the corresponding method in the offchain API.
-	pub fn request_start(
-		&mut self,
-		method: &str,
-		uri: &str
-	) -> Result<HttpRequestId, ()> {
+	pub fn request_start(&mut self, method: &str, uri: &str) -> Result<HttpRequestId, ()> {
 		// Start by building the prototype of the request.
 		// We do this first so that we don't touch anything in `self` if building the prototype
 		// fails.
@@ -146,10 +144,11 @@ impl HttpApi {
 			Some(new_id) => self.next_id.0 = new_id,
 			None => {
 				error!("Overflow in offchain worker HTTP request ID assignment");
-				return Err(());
-			}
+				return Err(())
+			},
 		};
-		self.requests.insert(new_id, HttpApiRequest::NotDispatched(request, body_sender));
+		self.requests
+			.insert(new_id, HttpApiRequest::NotDispatched(request, body_sender));
 
 		Ok(new_id)
 	}
@@ -159,11 +158,11 @@ impl HttpApi {
 		&mut self,
 		request_id: HttpRequestId,
 		name: &str,
-		value: &str
+		value: &str,
 	) -> Result<(), ()> {
 		let request = match self.requests.get_mut(&request_id) {
 			Some(&mut HttpApiRequest::NotDispatched(ref mut rq, _)) => rq,
-			_ => return Err(())
+			_ => return Err(()),
 		};
 
 		let name = hyper::header::HeaderName::try_from(name).map_err(drop)?;
@@ -179,7 +178,7 @@ impl HttpApi {
 		&mut self,
 		request_id: HttpRequestId,
 		chunk: &[u8],
-		deadline: Option<Timestamp>
+		deadline: Option<Timestamp>,
 	) -> Result<(), HttpError> {
 		// Extract the request from the list.
 		// Don't forget to add it back if necessary when returning.
@@ -193,76 +192,83 @@ impl HttpApi {
 			let mut when_ready = future::maybe_done(future::poll_fn(|cx| sender.poll_ready(cx)));
 			futures::executor::block_on(future::select(&mut when_ready, &mut deadline));
 			match when_ready {
-				future::MaybeDone::Done(Ok(())) => {}
+				future::MaybeDone::Done(Ok(())) => {},
 				future::MaybeDone::Done(Err(_)) => return Err(HttpError::IoError),
-				future::MaybeDone::Future(_) |
-				future::MaybeDone::Gone => {
+				future::MaybeDone::Future(_) | future::MaybeDone::Gone => {
 					debug_assert!(matches!(deadline, future::MaybeDone::Done(..)));
 					return Err(HttpError::DeadlineReached)
-				}
+				},
 			};
 
-			futures::executor::block_on(sender.send_data(hyper::body::Bytes::from(chunk.to_owned())))
-				.map_err(|_| {
-					error!("HTTP sender refused data despite being ready");
-					HttpError::IoError
-				})
+			futures::executor::block_on(
+				sender.send_data(hyper::body::Bytes::from(chunk.to_owned())),
+			)
+			.map_err(|_| {
+				error!("HTTP sender refused data despite being ready");
+				HttpError::IoError
+			})
 		};
 
 		loop {
 			request = match request {
 				HttpApiRequest::NotDispatched(request, sender) => {
 					// If the request is not dispatched yet, dispatch it and loop again.
-					let _ = self.to_worker.unbounded_send(ApiToWorker::Dispatch {
-						id: request_id,
-						request
-					});
+					let _ = self
+						.to_worker
+						.unbounded_send(ApiToWorker::Dispatch { id: request_id, request });
 					HttpApiRequest::Dispatched(Some(sender))
-				}
+				},
 
 				HttpApiRequest::Dispatched(Some(mut sender)) =>
 					if !chunk.is_empty() {
 						match poll_sender(&mut sender) {
 							Err(HttpError::IoError) => return Err(HttpError::IoError),
 							other => {
-								self.requests.insert(
-									request_id,
-									HttpApiRequest::Dispatched(Some(sender))
-								);
+								self.requests
+									.insert(request_id, HttpApiRequest::Dispatched(Some(sender)));
 								return other
-							}
+							},
 						}
 					} else {
 						// Writing an empty body is a hint that we should stop writing. Dropping
 						// the sender.
 						self.requests.insert(request_id, HttpApiRequest::Dispatched(None));
 						return Ok(())
-					}
+					},
 
-				HttpApiRequest::Response(mut response @ HttpApiRequestRp { sending_body: Some(_), .. }) =>
+				HttpApiRequest::Response(
+					mut response @ HttpApiRequestRp { sending_body: Some(_), .. },
+				) =>
 					if !chunk.is_empty() {
-						match poll_sender(response.sending_body.as_mut()
-							.expect("Can only enter this match branch if Some; qed")) {
+						match poll_sender(
+							response
+								.sending_body
+								.as_mut()
+								.expect("Can only enter this match branch if Some; qed"),
+						) {
 							Err(HttpError::IoError) => return Err(HttpError::IoError),
 							other => {
-								self.requests.insert(request_id, HttpApiRequest::Response(response));
+								self.requests
+									.insert(request_id, HttpApiRequest::Response(response));
 								return other
-							}
+							},
 						}
-
 					} else {
 						// Writing an empty body is a hint that we should stop writing. Dropping
 						// the sender.
-						self.requests.insert(request_id, HttpApiRequest::Response(HttpApiRequestRp {
-							sending_body: None,
-							..response
-						}));
+						self.requests.insert(
+							request_id,
+							HttpApiRequest::Response(HttpApiRequestRp {
+								sending_body: None,
+								..response
+							}),
+						);
 						return Ok(())
-					}
+					},
 
 				HttpApiRequest::Fail(_) =>
-					// If the request has already failed, return without putting back the request
-					// in the list.
+				// If the request has already failed, return without putting back the request
+				// in the list.
 					return Err(HttpError::IoError),
 
 				v @ HttpApiRequest::Dispatched(None) |
@@ -270,7 +276,7 @@ impl HttpApi {
 					// We have already finished sending this body.
 					self.requests.insert(request_id, v);
 					return Err(HttpError::Invalid)
-				}
+				},
 			}
 		}
 	}
@@ -279,30 +285,27 @@ impl HttpApi {
 	pub fn response_wait(
 		&mut self,
 		ids: &[HttpRequestId],
-		deadline: Option<Timestamp>
+		deadline: Option<Timestamp>,
 	) -> Vec<HttpRequestStatus> {
 		// First of all, dispatch all the non-dispatched requests and drop all senders so that the
 		// user can't write anymore data.
 		for id in ids {
 			match self.requests.get_mut(id) {
-				Some(HttpApiRequest::NotDispatched(_, _)) => {}
+				Some(HttpApiRequest::NotDispatched(_, _)) => {},
 				Some(HttpApiRequest::Dispatched(sending_body)) |
 				Some(HttpApiRequest::Response(HttpApiRequestRp { sending_body, .. })) => {
 					let _ = sending_body.take();
 					continue
-				}
-				_ => continue
+				},
+				_ => continue,
 			};
 
 			let (request, _sender) = match self.requests.remove(id) {
 				Some(HttpApiRequest::NotDispatched(rq, s)) => (rq, s),
-				_ => unreachable!("we checked for NotDispatched above; qed")
+				_ => unreachable!("we checked for NotDispatched above; qed"),
 			};
 
-			let _ = self.to_worker.unbounded_send(ApiToWorker::Dispatch {
-				id: *id,
-				request
-			});
+			let _ = self.to_worker.unbounded_send(ApiToWorker::Dispatch { id: *id, request });
 
 			// We also destroy the sender in order to forbid writing more data.
 			self.requests.insert(*id, HttpApiRequest::Dispatched(None));
@@ -319,25 +322,24 @@ impl HttpApi {
 				for id in ids {
 					output.push(match self.requests.get(id) {
 						None => HttpRequestStatus::Invalid,
-						Some(HttpApiRequest::NotDispatched(_, _)) =>
-							unreachable!("we replaced all the NotDispatched with Dispatched earlier; qed"),
+						Some(HttpApiRequest::NotDispatched(_, _)) => unreachable!(
+							"we replaced all the NotDispatched with Dispatched earlier; qed"
+						),
 						Some(HttpApiRequest::Dispatched(_)) => {
 							must_wait_more = true;
 							HttpRequestStatus::DeadlineReached
 						},
 						Some(HttpApiRequest::Fail(_)) => HttpRequestStatus::IoError,
-						Some(HttpApiRequest::Response(HttpApiRequestRp { status_code, .. })) =>
-							HttpRequestStatus::Finished(status_code.as_u16()),
+						Some(HttpApiRequest::Response(HttpApiRequestRp {
+							status_code, ..
+						})) => HttpRequestStatus::Finished(status_code.as_u16()),
 					});
 				}
 				debug_assert_eq!(output.len(), ids.len());
 
 				// Are we ready to call `return`?
-				let is_done = if let future::MaybeDone::Done(_) = deadline {
-					true
-				} else {
-					!must_wait_more
-				};
+				let is_done =
+					if let future::MaybeDone::Done(_) = deadline { true } else { !must_wait_more };
 
 				if is_done {
 					// Requests in "fail" mode are purged before returning.
@@ -369,47 +371,45 @@ impl HttpApi {
 				Some(WorkerToApi::Response { id, status_code, headers, body }) =>
 					match self.requests.remove(&id) {
 						Some(HttpApiRequest::Dispatched(sending_body)) => {
-							self.requests.insert(id, HttpApiRequest::Response(HttpApiRequestRp {
-								sending_body,
-								status_code,
-								headers,
-								body: body.fuse(),
-								current_read_chunk: None,
-							}));
-						}
-						None => {}	// can happen if we detected an IO error when sending the body
+							self.requests.insert(
+								id,
+								HttpApiRequest::Response(HttpApiRequestRp {
+									sending_body,
+									status_code,
+									headers,
+									body: body.fuse(),
+									current_read_chunk: None,
+								}),
+							);
+						},
+						None => {}, // can happen if we detected an IO error when sending the body
 						_ => error!("State mismatch between the API and worker"),
-					}
+					},
 
-				Some(WorkerToApi::Fail { id, error }) =>
-					match self.requests.remove(&id) {
-						Some(HttpApiRequest::Dispatched(_)) => {
-							self.requests.insert(id, HttpApiRequest::Fail(error));
-						}
-						None => {}	// can happen if we detected an IO error when sending the body
-						_ => error!("State mismatch between the API and worker"),
-					}
+				Some(WorkerToApi::Fail { id, error }) => match self.requests.remove(&id) {
+					Some(HttpApiRequest::Dispatched(_)) => {
+						self.requests.insert(id, HttpApiRequest::Fail(error));
+					},
+					None => {}, // can happen if we detected an IO error when sending the body
+					_ => error!("State mismatch between the API and worker"),
+				},
 
 				None => {
 					error!("Worker has crashed");
 					return ids.iter().map(|_| HttpRequestStatus::IoError).collect()
-				}
+				},
 			}
-
 		}
 	}
 
 	/// Mimics the corresponding method in the offchain API.
-	pub fn response_headers(
-		&mut self,
-		request_id: HttpRequestId
-	) -> Vec<(Vec<u8>, Vec<u8>)> {
+	pub fn response_headers(&mut self, request_id: HttpRequestId) -> Vec<(Vec<u8>, Vec<u8>)> {
 		// Do an implicit non-blocking wait on the request.
 		let _ = self.response_wait(&[request_id], Some(timestamp::now()));
 
 		let headers = match self.requests.get(&request_id) {
 			Some(HttpApiRequest::Response(HttpApiRequestRp { headers, .. })) => headers,
-			_ => return Vec::new()
+			_ => return Vec::new(),
 		};
 
 		headers
@@ -423,7 +423,7 @@ impl HttpApi {
 		&mut self,
 		request_id: HttpRequestId,
 		buffer: &mut [u8],
-		deadline: Option<Timestamp>
+		deadline: Option<Timestamp>,
 	) -> Result<usize, HttpError> {
 		// Do an implicit wait on the request.
 		let _ = self.response_wait(&[request_id], deadline);
@@ -439,14 +439,13 @@ impl HttpApi {
 				return Err(HttpError::DeadlineReached)
 			},
 			// The request has failed.
-			Some(HttpApiRequest::Fail { .. }) =>
-				return Err(HttpError::IoError),
+			Some(HttpApiRequest::Fail { .. }) => return Err(HttpError::IoError),
 			// Request hasn't been dispatched yet; reading the body is invalid.
 			Some(rq @ HttpApiRequest::NotDispatched(_, _)) => {
 				self.requests.insert(request_id, rq);
 				return Err(HttpError::Invalid)
-			}
-			None => return Err(HttpError::Invalid)
+			},
+			None => return Err(HttpError::Invalid),
 		};
 
 		// Convert the deadline into a `Future` that resolves when the deadline is reached.
@@ -456,19 +455,22 @@ impl HttpApi {
 			// First read from `current_read_chunk`.
 			if let Some(mut current_read_chunk) = response.current_read_chunk.take() {
 				match current_read_chunk.read(buffer) {
-					Ok(0) => {}
+					Ok(0) => {},
 					Ok(n) => {
-						self.requests.insert(request_id, HttpApiRequest::Response(HttpApiRequestRp {
-							current_read_chunk: Some(current_read_chunk),
-							.. response
-						}));
+						self.requests.insert(
+							request_id,
+							HttpApiRequest::Response(HttpApiRequestRp {
+								current_read_chunk: Some(current_read_chunk),
+								..response
+							}),
+						);
 						return Ok(n)
 					},
 					Err(err) => {
 						// This code should never be reached unless there's a logic error somewhere.
 						error!("Failed to read from current read chunk: {:?}", err);
 						return Err(HttpError::IoError)
-					}
+					},
 				}
 			}
 
@@ -482,7 +484,7 @@ impl HttpApi {
 				match next_body {
 					Some(Ok(chunk)) => response.current_read_chunk = Some(chunk.reader()),
 					Some(Err(_)) => return Err(HttpError::IoError),
-					None => return Ok(0),  // eof
+					None => return Ok(0), // eof
 				}
 			}
 
@@ -496,9 +498,7 @@ impl HttpApi {
 
 impl fmt::Debug for HttpApi {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		f.debug_list()
-			.entries(self.requests.iter())
-			.finish()
+		f.debug_list().entries(self.requests.iter()).finish()
 	}
 }
 
@@ -507,12 +507,13 @@ impl fmt::Debug for HttpApiRequest {
 		match self {
 			HttpApiRequest::NotDispatched(_, _) =>
 				f.debug_tuple("HttpApiRequest::NotDispatched").finish(),
-			HttpApiRequest::Dispatched(_) =>
-				f.debug_tuple("HttpApiRequest::Dispatched").finish(),
-			HttpApiRequest::Response(HttpApiRequestRp { status_code, headers, .. }) =>
-				f.debug_tuple("HttpApiRequest::Response").field(status_code).field(headers).finish(),
-			HttpApiRequest::Fail(err) =>
-				f.debug_tuple("HttpApiRequest::Fail").field(err).finish(),
+			HttpApiRequest::Dispatched(_) => f.debug_tuple("HttpApiRequest::Dispatched").finish(),
+			HttpApiRequest::Response(HttpApiRequestRp { status_code, headers, .. }) => f
+				.debug_tuple("HttpApiRequest::Response")
+				.field(status_code)
+				.field(headers)
+				.finish(),
+			HttpApiRequest::Fail(err) => f.debug_tuple("HttpApiRequest::Fail").field(err).finish(),
 		}
 	}
 }
@@ -525,7 +526,7 @@ enum ApiToWorker {
 		id: HttpRequestId,
 		/// Request to start executing.
 		request: hyper::Request<hyper::Body>,
-	}
+	},
 }
 
 /// Message send from the API to the worker.
@@ -605,8 +606,8 @@ impl Future for HttpWorker {
 						Poll::Ready(Ok(response)) => response,
 						Poll::Ready(Err(error)) => {
 							let _ = me.to_api.unbounded_send(WorkerToApi::Fail { id, error });
-							continue;		// don't insert the request back
-						}
+							continue // don't insert the request back
+						},
 					};
 
 					// We received a response! Decompose it into its parts.
@@ -622,20 +623,20 @@ impl Future for HttpWorker {
 					});
 
 					me.requests.push((id, HttpWorkerRequest::ReadBody { body, tx: body_tx }));
-					cx.waker().wake_by_ref();	// reschedule in order to poll the new future
+					cx.waker().wake_by_ref(); // reschedule in order to poll the new future
 					continue
-				}
+				},
 
 				HttpWorkerRequest::ReadBody { mut body, mut tx } => {
 					// Before reading from the HTTP response, check that `tx` is ready to accept
 					// a new chunk.
 					match tx.poll_ready(cx) {
-						Poll::Ready(Ok(())) => {}
-						Poll::Ready(Err(_)) => continue,  // don't insert the request back
+						Poll::Ready(Ok(())) => {},
+						Poll::Ready(Err(_)) => continue, // don't insert the request back
 						Poll::Pending => {
 							me.requests.push((id, HttpWorkerRequest::ReadBody { body, tx }));
 							continue
-						}
+						},
 					}
 
 					// `tx` is ready. Read a chunk from the socket and send it to the channel.
@@ -643,31 +644,31 @@ impl Future for HttpWorker {
 						Poll::Ready(Some(Ok(chunk))) => {
 							let _ = tx.start_send(Ok(chunk));
 							me.requests.push((id, HttpWorkerRequest::ReadBody { body, tx }));
-							cx.waker().wake_by_ref();	// reschedule in order to continue reading
-						}
+							cx.waker().wake_by_ref(); // reschedule in order to continue reading
+						},
 						Poll::Ready(Some(Err(err))) => {
 							let _ = tx.start_send(Err(err));
 							// don't insert the request back
 						},
-						Poll::Ready(None) => {}		// EOF; don't insert the request back
+						Poll::Ready(None) => {}, // EOF; don't insert the request back
 						Poll::Pending => {
 							me.requests.push((id, HttpWorkerRequest::ReadBody { body, tx }));
 						},
 					}
-				}
+				},
 			}
 		}
 
 		// Check for messages coming from the [`HttpApi`].
 		match Stream::poll_next(Pin::new(&mut me.from_api), cx) {
 			Poll::Pending => {},
-			Poll::Ready(None) => return Poll::Ready(()),	// stops the worker
+			Poll::Ready(None) => return Poll::Ready(()), // stops the worker
 			Poll::Ready(Some(ApiToWorker::Dispatch { id, request })) => {
 				let future = me.http_client.request(request);
 				debug_assert!(me.requests.iter().all(|(i, _)| *i != id));
 				me.requests.push((id, HttpWorkerRequest::Dispatched(future)));
-				cx.waker().wake_by_ref();	// reschedule the task to poll the request
-			}
+				cx.waker().wake_by_ref(); // reschedule the task to poll the request
+			},
 		}
 
 		Poll::Pending
@@ -676,9 +677,7 @@ impl Future for HttpWorker {
 
 impl fmt::Debug for HttpWorker {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		f.debug_list()
-			.entries(self.requests.iter())
-			.finish()
+		f.debug_list().entries(self.requests.iter()).finish()
 	}
 }
 
@@ -695,13 +694,13 @@ impl fmt::Debug for HttpWorkerRequest {
 
 #[cfg(test)]
 mod tests {
-	use core::convert::Infallible;
-	use crate::api::timestamp;
 	use super::{http, SharedClient};
-	use sp_core::offchain::{HttpError, HttpRequestId, HttpRequestStatus, Duration};
+	use crate::api::timestamp;
+	use core::convert::Infallible;
 	use futures::future;
 	use lazy_static::lazy_static;
-	
+	use sp_core::offchain::{Duration, HttpError, HttpRequestId, HttpRequestStatus};
+
 	// Using lazy_static to avoid spawning lots of different SharedClients,
 	// as spawning a SharedClient is CPU-intensive and opens lots of fds.
 	lazy_static! {
@@ -720,14 +719,17 @@ mod tests {
 				let mut rt = tokio::runtime::Runtime::new().unwrap();
 				let worker = rt.spawn(worker);
 				let server = rt.spawn(async move {
-					let server = hyper::Server::bind(&"127.0.0.1:0".parse().unwrap())
-						.serve(hyper::service::make_service_fn(|_| { async move {
-							Ok::<_, Infallible>(hyper::service::service_fn(move |_req| async move {
-								Ok::<_, Infallible>(
-									hyper::Response::new(hyper::Body::from("Hello World!"))
-								)
-							}))
-						}}));
+					let server = hyper::Server::bind(&"127.0.0.1:0".parse().unwrap()).serve(
+						hyper::service::make_service_fn(|_| async move {
+							Ok::<_, Infallible>(hyper::service::service_fn(
+								move |_req| async move {
+									Ok::<_, Infallible>(hyper::Response::new(hyper::Body::from(
+										"Hello World!",
+									)))
+								},
+							))
+						}),
+					);
 					let _ = addr_tx.send(server.local_addr());
 					server.await.map_err(drop)
 				});
@@ -750,7 +752,7 @@ mod tests {
 
 		match api.response_wait(&[id], Some(deadline))[0] {
 			HttpRequestStatus::Finished(200) => {},
-			v => panic!("Connecting to localhost failed: {:?}", v)
+			v => panic!("Connecting to localhost failed: {:?}", v),
 		}
 
 		let headers = api.response_headers(id);
@@ -766,13 +768,13 @@ mod tests {
 		let (mut api, addr) = build_api_server!();
 
 		match api.request_start("\0", &format!("http://{}", addr)) {
-			Err(()) => {}
-			Ok(_) => panic!()
+			Err(()) => {},
+			Ok(_) => panic!(),
 		};
 
 		match api.request_start("GET", "http://\0localhost") {
-			Err(()) => {}
-			Ok(_) => panic!()
+			Err(()) => {},
+			Ok(_) => panic!(),
 		};
 	}
 
@@ -781,42 +783,42 @@ mod tests {
 		let (mut api, addr) = build_api_server!();
 
 		match api.request_add_header(HttpRequestId(0xdead), "Foo", "bar") {
-			Err(()) => {}
-			Ok(_) => panic!()
+			Err(()) => {},
+			Ok(_) => panic!(),
 		};
 
 		let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
 		match api.request_add_header(id, "\0", "bar") {
-			Err(()) => {}
-			Ok(_) => panic!()
+			Err(()) => {},
+			Ok(_) => panic!(),
 		};
 
 		let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
 		match api.request_add_header(id, "Foo", "\0") {
-			Err(()) => {}
-			Ok(_) => panic!()
+			Err(()) => {},
+			Ok(_) => panic!(),
 		};
 
 		let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
 		api.request_add_header(id, "Foo", "Bar").unwrap();
 		api.request_write_body(id, &[1, 2, 3, 4], None).unwrap();
 		match api.request_add_header(id, "Foo2", "Bar") {
-			Err(()) => {}
-			Ok(_) => panic!()
+			Err(()) => {},
+			Ok(_) => panic!(),
 		};
 
 		let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
 		api.response_headers(id);
 		match api.request_add_header(id, "Foo2", "Bar") {
-			Err(()) => {}
-			Ok(_) => panic!()
+			Err(()) => {},
+			Ok(_) => panic!(),
 		};
 
 		let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
 		api.response_read_body(id, &mut [], None).unwrap();
 		match api.request_add_header(id, "Foo2", "Bar") {
-			Err(()) => {}
-			Ok(_) => panic!()
+			Err(()) => {},
+			Ok(_) => panic!(),
 		};
 	}
 
@@ -825,13 +827,13 @@ mod tests {
 		let (mut api, addr) = build_api_server!();
 
 		match api.request_write_body(HttpRequestId(0xdead), &[1, 2, 3], None) {
-			Err(HttpError::Invalid) => {}
-			_ => panic!()
+			Err(HttpError::Invalid) => {},
+			_ => panic!(),
 		};
 
 		match api.request_write_body(HttpRequestId(0xdead), &[], None) {
-			Err(HttpError::Invalid) => {}
-			_ => panic!()
+			Err(HttpError::Invalid) => {},
+			_ => panic!(),
 		};
 
 		let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
@@ -839,8 +841,8 @@ mod tests {
 		api.request_write_body(id, &[1, 2, 3, 4], None).unwrap();
 		api.request_write_body(id, &[], None).unwrap();
 		match api.request_write_body(id, &[], None) {
-			Err(HttpError::Invalid) => {}
-			_ => panic!()
+			Err(HttpError::Invalid) => {},
+			_ => panic!(),
 		};
 
 		let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
@@ -848,52 +850,52 @@ mod tests {
 		api.request_write_body(id, &[1, 2, 3, 4], None).unwrap();
 		api.request_write_body(id, &[], None).unwrap();
 		match api.request_write_body(id, &[1, 2, 3, 4], None) {
-			Err(HttpError::Invalid) => {}
-			_ => panic!()
+			Err(HttpError::Invalid) => {},
+			_ => panic!(),
 		};
 
 		let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
 		api.request_write_body(id, &[1, 2, 3, 4], None).unwrap();
 		api.response_wait(&[id], None);
 		match api.request_write_body(id, &[], None) {
-			Err(HttpError::Invalid) => {}
-			_ => panic!()
+			Err(HttpError::Invalid) => {},
+			_ => panic!(),
 		};
 
 		let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
 		api.request_write_body(id, &[1, 2, 3, 4], None).unwrap();
 		api.response_wait(&[id], None);
 		match api.request_write_body(id, &[1, 2, 3, 4], None) {
-			Err(HttpError::Invalid) => {}
-			_ => panic!()
+			Err(HttpError::Invalid) => {},
+			_ => panic!(),
 		};
 
 		let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
 		api.response_headers(id);
 		match api.request_write_body(id, &[1, 2, 3, 4], None) {
-			Err(HttpError::Invalid) => {}
-			_ => panic!()
+			Err(HttpError::Invalid) => {},
+			_ => panic!(),
 		};
 
 		let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
 		api.response_headers(id);
 		match api.request_write_body(id, &[], None) {
-			Err(HttpError::Invalid) => {}
-			_ => panic!()
+			Err(HttpError::Invalid) => {},
+			_ => panic!(),
 		};
 
 		let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
 		api.response_read_body(id, &mut [], None).unwrap();
 		match api.request_write_body(id, &[1, 2, 3, 4], None) {
-			Err(HttpError::Invalid) => {}
-			_ => panic!()
+			Err(HttpError::Invalid) => {},
+			_ => panic!(),
 		};
 
 		let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
 		api.response_read_body(id, &mut [], None).unwrap();
 		match api.request_write_body(id, &[], None) {
-			Err(HttpError::Invalid) => {}
-			_ => panic!()
+			Err(HttpError::Invalid) => {},
+			_ => panic!(),
 		};
 	}
 
@@ -948,15 +950,15 @@ mod tests {
 		let mut buf = [0; 512];
 
 		match api.response_read_body(HttpRequestId(0xdead), &mut buf, None) {
-			Err(HttpError::Invalid) => {}
-			_ => panic!()
+			Err(HttpError::Invalid) => {},
+			_ => panic!(),
 		}
 
 		let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
 		while api.response_read_body(id, &mut buf, None).unwrap() != 0 {}
 		match api.response_read_body(id, &mut buf, None) {
-			Err(HttpError::Invalid) => {}
-			_ => panic!()
+			Err(HttpError::Invalid) => {},
+			_ => panic!(),
 		}
 	}
 
@@ -973,16 +975,26 @@ mod tests {
 
 			for _ in 0..250 {
 				match rand::random::<u8>() % 6 {
-					0 => { let _ = api.request_add_header(id, "Foo", "Bar"); }
-					1 => { let _ = api.request_write_body(id, &[1, 2, 3, 4], None); }
-					2 => { let _ = api.request_write_body(id, &[], None); }
-					3 => { let _ = api.response_wait(&[id], None); }
-					4 => { let _ = api.response_headers(id); }
+					0 => {
+						let _ = api.request_add_header(id, "Foo", "Bar");
+					},
+					1 => {
+						let _ = api.request_write_body(id, &[1, 2, 3, 4], None);
+					},
+					2 => {
+						let _ = api.request_write_body(id, &[], None);
+					},
+					3 => {
+						let _ = api.response_wait(&[id], None);
+					},
+					4 => {
+						let _ = api.response_headers(id);
+					},
 					5 => {
 						let mut buf = [0; 512];
 						let _ = api.response_read_body(id, &mut buf, None);
-					}
-					6 ..= 255 => unreachable!()
+					},
+					6..=255 => unreachable!(),
 				}
 			}
 		}
diff --git a/client/offchain/src/api/http_dummy.rs b/client/offchain/src/api/http_dummy.rs
index ff9c2fb2aa02..386fc445d4e9 100644
--- a/client/offchain/src/api/http_dummy.rs
+++ b/client/offchain/src/api/http_dummy.rs
@@ -18,8 +18,12 @@
 
 //! Contains the same API as the `http` module, except that everything returns an error.
 
-use sp_core::offchain::{HttpRequestId, Timestamp, HttpRequestStatus, HttpError};
-use std::{future::Future, pin::Pin, task::Context, task::Poll};
+use sp_core::offchain::{HttpError, HttpRequestId, HttpRequestStatus, Timestamp};
+use std::{
+	future::Future,
+	pin::Pin,
+	task::{Context, Poll},
+};
 
 /// Wrapper struct (wrapping nothing in case of http_dummy) used for keeping the hyper_rustls client running.
 #[derive(Clone)]
@@ -46,24 +50,17 @@ pub struct HttpWorker;
 
 impl HttpApi {
 	/// Mimics the corresponding method in the offchain API.
-	pub fn request_start(
-		&mut self,
-		_: &str,
-		_: &str
-	) -> Result<HttpRequestId, ()> {
+	pub fn request_start(&mut self, _: &str, _: &str) -> Result<HttpRequestId, ()> {
 		/// Because this always returns an error, none of the other methods should ever be called.
 		Err(())
 	}
 
 	/// Mimics the corresponding method in the offchain API.
-	pub fn request_add_header(
-		&mut self,
-		_: HttpRequestId,
-		_: &str,
-		_: &str
-	) -> Result<(), ()> {
-		unreachable!("Creating a request always fails, thus this function will \
-			never be called; qed")
+	pub fn request_add_header(&mut self, _: HttpRequestId, _: &str, _: &str) -> Result<(), ()> {
+		unreachable!(
+			"Creating a request always fails, thus this function will \
+			never be called; qed"
+		)
 	}
 
 	/// Mimics the corresponding method in the offchain API.
@@ -71,33 +68,36 @@ impl HttpApi {
 		&mut self,
 		_: HttpRequestId,
 		_: &[u8],
-		_: Option<Timestamp>
+		_: Option<Timestamp>,
 	) -> Result<(), HttpError> {
-		unreachable!("Creating a request always fails, thus this function will \
-			never be called; qed")
+		unreachable!(
+			"Creating a request always fails, thus this function will \
+			never be called; qed"
+		)
 	}
 
 	/// Mimics the corresponding method in the offchain API.
 	pub fn response_wait(
 		&mut self,
 		requests: &[HttpRequestId],
-		_: Option<Timestamp>
+		_: Option<Timestamp>,
 	) -> Vec<HttpRequestStatus> {
 		if requests.is_empty() {
 			Vec::new()
 		} else {
-			unreachable!("Creating a request always fails, thus the list of requests should \
-				always be empty; qed")
+			unreachable!(
+				"Creating a request always fails, thus the list of requests should \
+				always be empty; qed"
+			)
 		}
 	}
 
 	/// Mimics the corresponding method in the offchain API.
-	pub fn response_headers(
-		&mut self,
-		_: HttpRequestId
-	) -> Vec<(Vec<u8>, Vec<u8>)> {
-		unreachable!("Creating a request always fails, thus this function will \
-			never be called; qed")
+	pub fn response_headers(&mut self, _: HttpRequestId) -> Vec<(Vec<u8>, Vec<u8>)> {
+		unreachable!(
+			"Creating a request always fails, thus this function will \
+			never be called; qed"
+		)
 	}
 
 	/// Mimics the corresponding method in the offchain API.
@@ -105,10 +105,12 @@ impl HttpApi {
 		&mut self,
 		_: HttpRequestId,
 		_: &mut [u8],
-		_: Option<Timestamp>
+		_: Option<Timestamp>,
 	) -> Result<usize, HttpError> {
-		unreachable!("Creating a request always fails, thus this function will \
-			never be called; qed")
+		unreachable!(
+			"Creating a request always fails, thus this function will \
+			never be called; qed"
+		)
 	}
 }
 
diff --git a/client/offchain/src/api/timestamp.rs b/client/offchain/src/api/timestamp.rs
index 6ea0f000f8d1..f1c8c004a019 100644
--- a/client/offchain/src/api/timestamp.rs
+++ b/client/offchain/src/api/timestamp.rs
@@ -19,8 +19,10 @@
 //! Helper methods dedicated to timestamps.
 
 use sp_core::offchain::Timestamp;
-use std::convert::TryInto;
-use std::time::{SystemTime, Duration};
+use std::{
+	convert::TryInto,
+	time::{Duration, SystemTime},
+};
 
 /// Returns the current time as a `Timestamp`.
 pub fn now() -> Timestamp {
@@ -34,9 +36,12 @@ pub fn now() -> Timestamp {
 		Ok(d) => {
 			let duration = d.as_millis();
 			// Assuming overflow won't happen for a few hundred years.
-			Timestamp::from_unix_millis(duration.try_into()
-				.expect("epoch milliseconds won't overflow u64 for hundreds of years; qed"))
-		}
+			Timestamp::from_unix_millis(
+				duration
+					.try_into()
+					.expect("epoch milliseconds won't overflow u64 for hundreds of years; qed"),
+			)
+		},
 	}
 }
 
@@ -60,7 +65,6 @@ pub fn deadline_to_future(
 		// Only apply delay if we need to wait a non-zero duration
 		Some(duration) if duration <= Duration::from_secs(0) =>
 			Either::Right(Either::Left(future::ready(()))),
-		Some(duration) =>
-			Either::Right(Either::Right(futures_timer::Delay::new(duration))),
+		Some(duration) => Either::Right(Either::Right(futures_timer::Delay::new(duration))),
 	})
 }
diff --git a/client/offchain/src/lib.rs b/client/offchain/src/lib.rs
index 21b1b7b7d21c..be6e4238ca5f 100644
--- a/client/offchain/src/lib.rs
+++ b/client/offchain/src/lib.rs
@@ -35,20 +35,22 @@
 
 #![warn(missing_docs)]
 
-use std::{
-	fmt, marker::PhantomData, sync::Arc,
-	collections::HashSet,
-};
+use std::{collections::HashSet, fmt, marker::PhantomData, sync::Arc};
 
-use parking_lot::Mutex;
-use threadpool::ThreadPool;
-use sp_api::{ApiExt, ProvideRuntimeApi};
-use futures::future::Future;
+use futures::{
+	future::{ready, Future},
+	prelude::*,
+};
 use log::{debug, warn};
+use parking_lot::Mutex;
 use sc_network::{ExHashT, NetworkService, NetworkStateInfo, PeerId};
-use sp_core::{offchain, ExecutionContext, traits::SpawnNamed};
-use sp_runtime::{generic::BlockId, traits::{self, Header}};
-use futures::{prelude::*, future::ready};
+use sp_api::{ApiExt, ProvideRuntimeApi};
+use sp_core::{offchain, traits::SpawnNamed, ExecutionContext};
+use sp_runtime::{
+	generic::BlockId,
+	traits::{self, Header},
+};
+use threadpool::ThreadPool;
 
 mod api;
 
@@ -94,25 +96,23 @@ impl<Client, Block: traits::Block> OffchainWorkers<Client, Block> {
 		Self {
 			client,
 			_block: PhantomData,
-			thread_pool: Mutex::new(ThreadPool::with_name("offchain-worker".into(), num_cpus::get())),
+			thread_pool: Mutex::new(ThreadPool::with_name(
+				"offchain-worker".into(),
+				num_cpus::get(),
+			)),
 			shared_client,
 		}
 	}
 }
 
-impl<Client, Block: traits::Block> fmt::Debug for OffchainWorkers<
-	Client,
-	Block,
-> {
+impl<Client, Block: traits::Block> fmt::Debug for OffchainWorkers<Client, Block> {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		f.debug_tuple("OffchainWorkers").finish()
 	}
 }
 
-impl<Client, Block> OffchainWorkers<
-	Client,
-	Block,
-> where
+impl<Client, Block> OffchainWorkers<Client, Block>
+where
 	Block: traits::Block,
 	Client: ProvideRuntimeApi<Block> + Send + Sync + 'static,
 	Client::Api: OffchainWorkerApi<Block>,
@@ -127,28 +127,22 @@ impl<Client, Block> OffchainWorkers<
 	) -> impl Future<Output = ()> {
 		let runtime = self.client.runtime_api();
 		let at = BlockId::hash(header.hash());
-		let has_api_v1 = runtime.has_api_with::<dyn OffchainWorkerApi<Block>, _>(
-			&at, |v| v == 1
-		);
-		let has_api_v2 = runtime.has_api_with::<dyn OffchainWorkerApi<Block>, _>(
-			&at, |v| v == 2
-		);
+		let has_api_v1 = runtime.has_api_with::<dyn OffchainWorkerApi<Block>, _>(&at, |v| v == 1);
+		let has_api_v2 = runtime.has_api_with::<dyn OffchainWorkerApi<Block>, _>(&at, |v| v == 2);
 		let version = match (has_api_v1, has_api_v2) {
 			(_, Ok(true)) => 2,
 			(Ok(true), _) => 1,
 			err => {
-				let help = "Consider turning off offchain workers if they are not part of your runtime.";
+				let help =
+					"Consider turning off offchain workers if they are not part of your runtime.";
 				log::error!("Unsupported Offchain Worker API version: {:?}. {}.", err, help);
 				0
-			}
+			},
 		};
 		debug!("Checking offchain workers at {:?}: version:{}", at, version);
 		if version > 0 {
-			let (api, runner) = api::AsyncApi::new(
-				network_provider,
-				is_validator,
-				self.shared_client.clone(),
-			);
+			let (api, runner) =
+				api::AsyncApi::new(network_provider, is_validator, self.shared_client.clone());
 			debug!("Spawning offchain workers at {:?}", at);
 			let header = header.clone();
 			let client = self.client.clone();
@@ -156,18 +150,19 @@ impl<Client, Block> OffchainWorkers<
 				let runtime = client.runtime_api();
 				let api = Box::new(api);
 				debug!("Running offchain workers at {:?}", at);
-				let context = ExecutionContext::OffchainCall(Some(
-					(api, offchain::Capabilities::all())
-				));
+				let context =
+					ExecutionContext::OffchainCall(Some((api, offchain::Capabilities::all())));
 				let run = if version == 2 {
 					runtime.offchain_worker_with_context(&at, context, &header)
 				} else {
 					#[allow(deprecated)]
 					runtime.offchain_worker_before_version_2_with_context(
-						&at, context, *header.number()
+						&at,
+						context,
+						*header.number(),
 					)
 				};
-				if let Err(e) =	run {
+				if let Err(e) = run {
 					log::error!("Error running offchain workers at {:?}: {:?}", at, e);
 				}
 			});
@@ -197,50 +192,51 @@ pub async fn notification_future<Client, Block, Spawner>(
 	offchain: Arc<OffchainWorkers<Client, Block>>,
 	spawner: Spawner,
 	network_provider: Arc<dyn NetworkProvider + Send + Sync>,
-)
-	where
-		Block: traits::Block,
-		Client: ProvideRuntimeApi<Block> + sc_client_api::BlockchainEvents<Block> + Send + Sync + 'static,
-		Client::Api: OffchainWorkerApi<Block>,
-		Spawner: SpawnNamed
+) where
+	Block: traits::Block,
+	Client:
+		ProvideRuntimeApi<Block> + sc_client_api::BlockchainEvents<Block> + Send + Sync + 'static,
+	Client::Api: OffchainWorkerApi<Block>,
+	Spawner: SpawnNamed,
 {
-	client.import_notification_stream().for_each(move |n| {
-		if n.is_new_best {
-			spawner.spawn(
-				"offchain-on-block",
-				offchain.on_block_imported(
-					&n.header,
-					network_provider.clone(),
-					is_validator,
-				).boxed(),
-			);
-		} else {
-			log::debug!(
-				target: "sc_offchain",
-				"Skipping offchain workers for non-canon block: {:?}",
-				n.header,
-			)
-		}
+	client
+		.import_notification_stream()
+		.for_each(move |n| {
+			if n.is_new_best {
+				spawner.spawn(
+					"offchain-on-block",
+					offchain
+						.on_block_imported(&n.header, network_provider.clone(), is_validator)
+						.boxed(),
+				);
+			} else {
+				log::debug!(
+					target: "sc_offchain",
+					"Skipping offchain workers for non-canon block: {:?}",
+					n.header,
+				)
+			}
 
-		ready(())
-	}).await;
+			ready(())
+		})
+		.await;
 }
 
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use std::sync::Arc;
+	use futures::executor::block_on;
+	use sc_block_builder::BlockBuilderProvider as _;
+	use sc_client_api::Backend as _;
 	use sc_network::{Multiaddr, PeerId};
-	use substrate_test_runtime_client::{
-		TestClient, runtime::Block, TestClientBuilderExt,
-		DefaultTestClientBuilderExt, ClientBlockImportExt,
-	};
 	use sc_transaction_pool::{BasicPool, FullChainApi};
-	use sc_transaction_pool_api::{TransactionPool, InPoolTransaction};
+	use sc_transaction_pool_api::{InPoolTransaction, TransactionPool};
 	use sp_consensus::BlockOrigin;
-	use sc_client_api::Backend as _;
-	use sc_block_builder::BlockBuilderProvider as _;
-	use futures::executor::block_on;
+	use std::sync::Arc;
+	use substrate_test_runtime_client::{
+		runtime::Block, ClientBlockImportExt, DefaultTestClientBuilderExt, TestClient,
+		TestClientBuilderExt,
+	};
 
 	struct TestNetwork();
 
@@ -264,9 +260,7 @@ mod tests {
 		}
 	}
 
-	struct TestPool(
-		Arc<BasicPool<FullChainApi<TestClient, Block>, Block>>
-	);
+	struct TestPool(Arc<BasicPool<FullChainApi<TestClient, Block>, Block>>);
 
 	impl sc_transaction_pool_api::OffchainSubmitTransaction<Block> for TestPool {
 		fn submit_at(
@@ -299,9 +293,7 @@ mod tests {
 
 		// when
 		let offchain = OffchainWorkers::new(client);
-		futures::executor::block_on(
-			offchain.on_block_imported(&header, network, false)
-		);
+		futures::executor::block_on(offchain.on_block_imported(&header, network, false));
 
 		// then
 		assert_eq!(pool.0.status().ready, 1);
@@ -314,22 +306,21 @@ mod tests {
 
 		sp_tracing::try_init_simple();
 
-		let (client, backend) =
-			substrate_test_runtime_client::TestClientBuilder::new()
-				.enable_offchain_indexing_api()
-				.build_with_backend();
+		let (client, backend) = substrate_test_runtime_client::TestClientBuilder::new()
+			.enable_offchain_indexing_api()
+			.build_with_backend();
 		let mut client = Arc::new(client);
 		let offchain_db = backend.offchain_storage().unwrap();
 
 		let key = &b"hello"[..];
 		let value = &b"world"[..];
 		let mut block_builder = client.new_block(Default::default()).unwrap();
-		block_builder.push(
-			substrate_test_runtime_client::runtime::Extrinsic::OffchainIndexSet(
+		block_builder
+			.push(substrate_test_runtime_client::runtime::Extrinsic::OffchainIndexSet(
 				key.to_vec(),
 				value.to_vec(),
-			),
-		).unwrap();
+			))
+			.unwrap();
 
 		let block = block_builder.build().unwrap().block;
 		block_on(client.import(BlockOrigin::Own, block)).unwrap();
@@ -337,9 +328,11 @@ mod tests {
 		assert_eq!(value, &offchain_db.get(sp_offchain::STORAGE_PREFIX, &key).unwrap());
 
 		let mut block_builder = client.new_block(Default::default()).unwrap();
-		block_builder.push(
-			substrate_test_runtime_client::runtime::Extrinsic::OffchainIndexClear(key.to_vec()),
-		).unwrap();
+		block_builder
+			.push(substrate_test_runtime_client::runtime::Extrinsic::OffchainIndexClear(
+				key.to_vec(),
+			))
+			.unwrap();
 
 		let block = block_builder.build().unwrap().block;
 		block_on(client.import(BlockOrigin::Own, block)).unwrap();
diff --git a/client/peerset/src/lib.rs b/client/peerset/src/lib.rs
index 1efb21dd5389..398d31c78b21 100644
--- a/client/peerset/src/lib.rs
+++ b/client/peerset/src/lib.rs
@@ -34,13 +34,17 @@
 
 mod peersstate;
 
-use std::{collections::HashSet, collections::VecDeque};
 use futures::prelude::*;
 use log::{debug, error, trace};
 use serde_json::json;
-use std::{collections::HashMap, pin::Pin, task::{Context, Poll}, time::Duration};
+use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
+use std::{
+	collections::{HashMap, HashSet, VecDeque},
+	pin::Pin,
+	task::{Context, Poll},
+	time::Duration,
+};
 use wasm_timer::{Delay, Instant};
-use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedSender, TracingUnboundedReceiver};
 
 pub use libp2p::PeerId;
 
@@ -262,23 +266,22 @@ impl Peerset {
 	pub fn from_config(config: PeersetConfig) -> (Peerset, PeersetHandle) {
 		let (tx, rx) = tracing_unbounded("mpsc_peerset_messages");
 
-		let handle = PeersetHandle {
-			tx: tx.clone(),
-		};
+		let handle = PeersetHandle { tx: tx.clone() };
 
 		let mut peerset = {
 			let now = Instant::now();
 
 			Peerset {
-				data: peersstate::PeersState::new(config.sets.iter().map(|set| peersstate::SetConfig {
-					in_peers: set.in_peers,
-					out_peers: set.out_peers,
+				data: peersstate::PeersState::new(config.sets.iter().map(|set| {
+					peersstate::SetConfig { in_peers: set.in_peers, out_peers: set.out_peers }
 				})),
 				tx,
 				rx,
-				reserved_nodes: config.sets.iter().map(|set| {
-					(set.reserved_nodes.clone(), set.reserved_only)
-				}).collect(),
+				reserved_nodes: config
+					.sets
+					.iter()
+					.map(|set| (set.reserved_nodes.clone(), set.reserved_only))
+					.collect(),
 				message_queue: VecDeque::new(),
 				created: now,
 				latest_time_update: now,
@@ -310,7 +313,7 @@ impl Peerset {
 	fn on_add_reserved_peer(&mut self, set_id: SetId, peer_id: PeerId) {
 		let newly_inserted = self.reserved_nodes[set_id.0].0.insert(peer_id.clone());
 		if !newly_inserted {
-			return;
+			return
 		}
 
 		self.data.add_no_slot_node(set_id.0, peer_id);
@@ -319,34 +322,36 @@ impl Peerset {
 
 	fn on_remove_reserved_peer(&mut self, set_id: SetId, peer_id: PeerId) {
 		if !self.reserved_nodes[set_id.0].0.remove(&peer_id) {
-			return;
+			return
 		}
 
 		self.data.remove_no_slot_node(set_id.0, &peer_id);
 
 		// Nothing more to do if not in reserved-only mode.
 		if !self.reserved_nodes[set_id.0].1 {
-			return;
+			return
 		}
 
 		// If, however, the peerset is in reserved-only mode, then the removed node needs to be
 		// disconnected.
 		if let peersstate::Peer::Connected(peer) = self.data.peer(set_id.0, &peer_id) {
 			peer.disconnect();
-			self.message_queue.push_back(Message::Drop {
-				set_id,
-				peer_id,
-			});
+			self.message_queue.push_back(Message::Drop { set_id, peer_id });
 		}
 	}
 
 	fn on_set_reserved_peers(&mut self, set_id: SetId, peer_ids: HashSet<PeerId>) {
 		// Determine the difference between the current group and the new list.
 		let (to_insert, to_remove) = {
-			let to_insert = peer_ids.difference(&self.reserved_nodes[set_id.0].0)
-				.cloned().collect::<Vec<_>>();
-			let to_remove = self.reserved_nodes[set_id.0].0.difference(&peer_ids)
-				.cloned().collect::<Vec<_>>();
+			let to_insert = peer_ids
+				.difference(&self.reserved_nodes[set_id.0].0)
+				.cloned()
+				.collect::<Vec<_>>();
+			let to_remove = self.reserved_nodes[set_id.0]
+				.0
+				.difference(&peer_ids)
+				.cloned()
+				.collect::<Vec<_>>();
 			(to_insert, to_remove)
 		};
 
@@ -364,20 +369,19 @@ impl Peerset {
 
 		if reserved_only {
 			// Disconnect all the nodes that aren't reserved.
-			for peer_id in self.data.connected_peers(set_id.0).cloned().collect::<Vec<_>>().into_iter() {
+			for peer_id in
+				self.data.connected_peers(set_id.0).cloned().collect::<Vec<_>>().into_iter()
+			{
 				if self.reserved_nodes[set_id.0].0.contains(&peer_id) {
-					continue;
+					continue
 				}
 
-				let peer = self.data.peer(set_id.0, &peer_id).into_connected()
-					.expect("We are enumerating connected peers, therefore the peer is connected; qed");
+				let peer = self.data.peer(set_id.0, &peer_id).into_connected().expect(
+					"We are enumerating connected peers, therefore the peer is connected; qed",
+				);
 				peer.disconnect();
-				self.message_queue.push_back(Message::Drop {
-					set_id,
-					peer_id
-				});
+				self.message_queue.push_back(Message::Drop { set_id, peer_id });
 			}
-
 		} else {
 			self.alloc_slots(set_id);
 		}
@@ -402,19 +406,19 @@ impl Peerset {
 	fn on_remove_from_peers_set(&mut self, set_id: SetId, peer_id: PeerId) {
 		// Don't do anything if node is reserved.
 		if self.reserved_nodes[set_id.0].0.contains(&peer_id) {
-			return;
+			return
 		}
 
 		match self.data.peer(set_id.0, &peer_id) {
 			peersstate::Peer::Connected(peer) => {
-				self.message_queue.push_back(Message::Drop {
-					set_id,
-					peer_id: peer.peer_id().clone(),
-				});
+				self.message_queue
+					.push_back(Message::Drop { set_id, peer_id: peer.peer_id().clone() });
 				peer.disconnect().forget_peer();
-			}
-			peersstate::Peer::NotConnected(peer) => { peer.forget_peer(); }
-			peersstate::Peer::Unknown(_) => {}
+			},
+			peersstate::Peer::NotConnected(peer) => {
+				peer.forget_peer();
+			},
+			peersstate::Peer::Unknown(_) => {},
 		}
 	}
 
@@ -428,7 +432,7 @@ impl Peerset {
 			trace!(target: "peerset", "Report {}: {:+} to {}. Reason: {}",
 				peer_id, change.value, reputation.reputation(), change.reason
 			);
-			return;
+			return
 		}
 
 		debug!(target: "peerset", "Report {}: {:+} to {}. Reason: {}, Disconnecting",
@@ -490,7 +494,7 @@ impl Peerset {
 				peer_reputation.set_reputation(after);
 
 				if after != 0 {
-					continue;
+					continue
 				}
 
 				drop(peer_reputation);
@@ -499,15 +503,15 @@ impl Peerset {
 				// forget it.
 				for set_index in 0..self.data.num_sets() {
 					match self.data.peer(set_index, &peer_id) {
-						peersstate::Peer::Connected(_) => {}
+						peersstate::Peer::Connected(_) => {},
 						peersstate::Peer::NotConnected(peer) => {
 							if peer.last_connected_or_discovered() + FORGET_AFTER < now {
 								peer.forget_peer();
 							}
-						}
+						},
 						peersstate::Peer::Unknown(_) => {
 							// Happens if this peer does not belong to this set.
-						}
+						},
 					}
 				}
 			}
@@ -531,14 +535,13 @@ impl Peerset {
 			// remove that check. If necessary, the peerset should be refactored to give more
 			// control over what happens in that situation.
 			if entry.reputation() < BANNED_THRESHOLD {
-				break;
+				break
 			}
 
 			match entry.try_outgoing() {
-				Ok(conn) => self.message_queue.push_back(Message::Connect {
-					set_id,
-					peer_id: conn.into_peer_id()
-				}),
+				Ok(conn) => self
+					.message_queue
+					.push_back(Message::Connect { set_id, peer_id: conn.into_peer_id() }),
 				Err(_) => {
 					// An error is returned only if no slot is available. Reserved nodes are
 					// marked in the state machine with a flag saying "doesn't occupy a slot",
@@ -548,7 +551,7 @@ impl Peerset {
 						target: "peerset",
 						"Not enough slots to connect to reserved node"
 					);
-				}
+				},
 			}
 		}
 
@@ -556,7 +559,7 @@ impl Peerset {
 
 		// Nothing more to do if we're in reserved mode.
 		if self.reserved_nodes[set_id.0].1 {
-			return;
+			return
 		}
 
 		// Try to grab the next node to attempt to connect to.
@@ -565,25 +568,24 @@ impl Peerset {
 		while self.data.has_free_outgoing_slot(set_id.0) {
 			let next = match self.data.highest_not_connected_peer(set_id.0) {
 				Some(n) => n,
-				None => break
+				None => break,
 			};
 
 			// Don't connect to nodes with an abysmal reputation.
 			if next.reputation() < BANNED_THRESHOLD {
-				break;
+				break
 			}
 
 			match next.try_outgoing() {
-				Ok(conn) => self.message_queue.push_back(Message::Connect {
-					set_id,
-					peer_id: conn.into_peer_id()
-				}),
+				Ok(conn) => self
+					.message_queue
+					.push_back(Message::Connect { set_id, peer_id: conn.into_peer_id() }),
 				Err(_) => {
 					// This branch can only be entered if there is no free slot, which is
 					// checked above.
 					debug_assert!(false);
-					break;
-				}
+					break
+				},
 			}
 		}
 	}
@@ -594,7 +596,6 @@ impl Peerset {
 	/// Note that this mechanism is orthogonal to `Connect`/`Drop`. Accepting an incoming
 	/// connection implicitly means `Connect`, but incoming connections aren't cancelled by
 	/// `dropped`.
-	///
 	// Implementation note: because of concurrency issues, it is possible that we push a `Connect`
 	// message to the output channel with a `PeerId`, and that `incoming` gets called with the same
 	// `PeerId` before that message has been read by the user. In this situation we must not answer.
@@ -606,7 +607,7 @@ impl Peerset {
 		if self.reserved_nodes[set_id.0].1 {
 			if !self.reserved_nodes[set_id.0].0.contains(&peer_id) {
 				self.message_queue.push_back(Message::Reject(index));
-				return;
+				return
 			}
 		}
 
@@ -646,7 +647,7 @@ impl Peerset {
 				trace!(target: "peerset", "Dropping {}: {:+} to {}",
 					peer_id, DISCONNECT_REPUTATION_CHANGE, entry.reputation());
 				entry.disconnect();
-			}
+			},
 			peersstate::Peer::NotConnected(_) | peersstate::Peer::Unknown(_) =>
 				error!(target: "peerset", "Received dropped() for non-connected node"),
 		}
@@ -710,10 +711,11 @@ impl Stream for Peerset {
 	fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Option<Self::Item>> {
 		loop {
 			if let Some(message) = self.message_queue.pop_front() {
-				return Poll::Ready(Some(message));
+				return Poll::Ready(Some(message))
 			}
 
-			if let Poll::Ready(_) = Future::poll(Pin::new(&mut self.next_periodic_alloc_slots), cx) {
+			if let Poll::Ready(_) = Future::poll(Pin::new(&mut self.next_periodic_alloc_slots), cx)
+			{
 				self.next_periodic_alloc_slots = Delay::new(Duration::new(1, 0));
 
 				for set_index in 0..self.data.num_sets() {
@@ -736,8 +738,7 @@ impl Stream for Peerset {
 					self.on_set_reserved_peers(set_id, peer_ids),
 				Action::SetReservedOnly(set_id, reserved) =>
 					self.on_set_reserved_only(set_id, reserved),
-				Action::ReportPeer(peer_id, score_diff) =>
-					self.on_report_peer(peer_id, score_diff),
+				Action::ReportPeer(peer_id, score_diff) => self.on_report_peer(peer_id, score_diff),
 				Action::AddToPeersSet(sets_name, peer_id) =>
 					self.add_to_peers_set(sets_name, peer_id),
 				Action::RemoveFromPeersSet(sets_name, peer_id) =>
@@ -760,9 +761,12 @@ pub enum DropReason {
 
 #[cfg(test)]
 mod tests {
-	use libp2p::PeerId;
+	use super::{
+		IncomingIndex, Message, Peerset, PeersetConfig, ReputationChange, SetConfig, SetId,
+		BANNED_THRESHOLD,
+	};
 	use futures::prelude::*;
-	use super::{PeersetConfig, Peerset, Message, IncomingIndex, ReputationChange, SetConfig, SetId, BANNED_THRESHOLD};
+	use libp2p::PeerId;
 	use std::{pin::Pin, task::Poll, thread, time::Duration};
 
 	fn assert_messages(mut peerset: Peerset, messages: Vec<Message>) -> Peerset {
@@ -799,10 +803,13 @@ mod tests {
 		handle.add_reserved_peer(SetId::from(0), reserved_peer.clone());
 		handle.add_reserved_peer(SetId::from(0), reserved_peer2.clone());
 
-		assert_messages(peerset, vec![
-			Message::Connect { set_id: SetId::from(0), peer_id: reserved_peer },
-			Message::Connect { set_id: SetId::from(0), peer_id: reserved_peer2 }
-		]);
+		assert_messages(
+			peerset,
+			vec![
+				Message::Connect { set_id: SetId::from(0), peer_id: reserved_peer },
+				Message::Connect { set_id: SetId::from(0), peer_id: reserved_peer2 },
+			],
+		);
 	}
 
 	#[test]
@@ -831,12 +838,15 @@ mod tests {
 		peerset.incoming(SetId::from(0), incoming2.clone(), ii2);
 		peerset.incoming(SetId::from(0), incoming3.clone(), ii3);
 
-		assert_messages(peerset, vec![
-			Message::Connect { set_id: SetId::from(0), peer_id: bootnode.clone() },
-			Message::Accept(ii),
-			Message::Accept(ii2),
-			Message::Reject(ii3),
-		]);
+		assert_messages(
+			peerset,
+			vec![
+				Message::Connect { set_id: SetId::from(0), peer_id: bootnode.clone() },
+				Message::Accept(ii),
+				Message::Accept(ii2),
+				Message::Reject(ii3),
+			],
+		);
 	}
 
 	#[test]
@@ -856,9 +866,7 @@ mod tests {
 		let (mut peerset, _) = Peerset::from_config(config);
 		peerset.incoming(SetId::from(0), incoming.clone(), ii);
 
-		assert_messages(peerset, vec![
-			Message::Reject(ii),
-		]);
+		assert_messages(peerset, vec![Message::Reject(ii)]);
 	}
 
 	#[test]
@@ -881,10 +889,13 @@ mod tests {
 		peerset.add_to_peers_set(SetId::from(0), discovered.clone());
 		peerset.add_to_peers_set(SetId::from(0), discovered2);
 
-		assert_messages(peerset, vec![
-			Message::Connect { set_id: SetId::from(0), peer_id: bootnode },
-			Message::Connect { set_id: SetId::from(0), peer_id: discovered },
-		]);
+		assert_messages(
+			peerset,
+			vec![
+				Message::Connect { set_id: SetId::from(0), peer_id: bootnode },
+				Message::Connect { set_id: SetId::from(0), peer_id: discovered },
+			],
+		);
 	}
 
 	#[test]
diff --git a/client/peerset/src/peersstate.rs b/client/peerset/src/peersstate.rs
index 9f54a7714fd0..e4062bf938b3 100644
--- a/client/peerset/src/peersstate.rs
+++ b/client/peerset/src/peersstate.rs
@@ -32,7 +32,10 @@ use libp2p::PeerId;
 use log::error;
 use std::{
 	borrow::Cow,
-	collections::{HashMap, HashSet, hash_map::{Entry, OccupiedEntry}},
+	collections::{
+		hash_map::{Entry, OccupiedEntry},
+		HashMap, HashSet,
+	},
 };
 use wasm_timer::Instant;
 
@@ -42,7 +45,6 @@ use wasm_timer::Instant;
 ///
 /// This struct is nothing more but a data structure containing a list of nodes, where each node
 /// has a reputation and is either connected to us or not.
-///
 #[derive(Debug, Clone)]
 pub struct PeersState {
 	/// List of nodes that we know about.
@@ -104,10 +106,7 @@ struct Node {
 
 impl Node {
 	fn new(num_sets: usize) -> Node {
-		Node {
-			sets: (0..num_sets).map(|_| MembershipState::NotMember).collect(),
-			reputation: 0,
-		}
+		Node { sets: (0..num_sets).map(|_| MembershipState::NotMember).collect(), reputation: 0 }
 	}
 }
 
@@ -185,25 +184,16 @@ impl PeersState {
 	/// # Panic
 	///
 	/// `set` must be within range of the sets passed to [`PeersState::new`].
-	///
 	pub fn peer<'a>(&'a mut self, set: usize, peer_id: &'a PeerId) -> Peer<'a> {
 		// The code below will panic anyway if this happens to be false, but this earlier assert
 		// makes it explicit what is wrong.
 		assert!(set < self.sets.len());
 
 		match self.nodes.get_mut(peer_id).map(|p| &p.sets[set]) {
-			None | Some(MembershipState::NotMember) => Peer::Unknown(UnknownPeer {
-				parent: self,
-				set,
-				peer_id: Cow::Borrowed(peer_id),
-			}),
-			Some(MembershipState::In) | Some(MembershipState::Out) => {
-				Peer::Connected(ConnectedPeer {
-					state: self,
-					set,
-					peer_id: Cow::Borrowed(peer_id),
-				})
-			}
+			None | Some(MembershipState::NotMember) =>
+				Peer::Unknown(UnknownPeer { parent: self, set, peer_id: Cow::Borrowed(peer_id) }),
+			Some(MembershipState::In) | Some(MembershipState::Out) =>
+				Peer::Connected(ConnectedPeer { state: self, set, peer_id: Cow::Borrowed(peer_id) }),
 			Some(MembershipState::NotConnected { .. }) => Peer::NotConnected(NotConnectedPeer {
 				state: self,
 				set,
@@ -224,7 +214,6 @@ impl PeersState {
 	/// # Panic
 	///
 	/// `set` must be within range of the sets passed to [`PeersState::new`].
-	///
 	// Note: this method could theoretically return a `ConnectedPeer`, but implementing that
 	// isn't simple.
 	pub fn connected_peers(&self, set: usize) -> impl Iterator<Item = &PeerId> {
@@ -245,7 +234,6 @@ impl PeersState {
 	/// # Panic
 	///
 	/// `set` must be within range of the sets passed to [`PeersState::new`].
-	///
 	pub fn highest_not_connected_peer(&mut self, set: usize) -> Option<NotConnectedPeer> {
 		// The code below will panic anyway if this happens to be false, but this earlier assert
 		// makes it explicit what is wrong.
@@ -254,18 +242,16 @@ impl PeersState {
 		let outcome = self
 			.nodes
 			.iter_mut()
-			.filter(|(_, Node { sets, .. })| {
-				match sets[set] {
-					MembershipState::NotMember => false,
-					MembershipState::In => false,
-					MembershipState::Out => false,
-					MembershipState::NotConnected { .. } => true,
-				}
+			.filter(|(_, Node { sets, .. })| match sets[set] {
+				MembershipState::NotMember => false,
+				MembershipState::In => false,
+				MembershipState::Out => false,
+				MembershipState::NotConnected { .. } => true,
 			})
 			.fold(None::<(&PeerId, &mut Node)>, |mut cur_node, to_try| {
 				if let Some(cur_node) = cur_node.take() {
 					if cur_node.1.reputation >= to_try.1.reputation {
-						return Some(cur_node);
+						return Some(cur_node)
 					}
 				}
 				Some(to_try)
@@ -273,10 +259,10 @@ impl PeersState {
 			.map(|(peer_id, _)| peer_id.clone());
 
 		outcome.map(move |peer_id| NotConnectedPeer {
-				state: self,
-				set,
-				peer_id: Cow::Owned(peer_id),
-			})
+			state: self,
+			set,
+			peer_id: Cow::Owned(peer_id),
+		})
 	}
 
 	/// Returns `true` if there is a free outgoing slot available related to this set.
@@ -290,14 +276,14 @@ impl PeersState {
 	pub fn add_no_slot_node(&mut self, set: usize, peer_id: PeerId) {
 		// Reminder: `HashSet::insert` returns false if the node was already in the set
 		if !self.sets[set].no_slot_nodes.insert(peer_id.clone()) {
-			return;
+			return
 		}
 
 		if let Some(peer) = self.nodes.get_mut(&peer_id) {
 			match peer.sets[set] {
 				MembershipState::In => self.sets[set].num_in -= 1,
 				MembershipState::Out => self.sets[set].num_out -= 1,
-				MembershipState::NotConnected { .. } | MembershipState::NotMember => {}
+				MembershipState::NotConnected { .. } | MembershipState::NotMember => {},
 			}
 		}
 	}
@@ -308,14 +294,14 @@ impl PeersState {
 	pub fn remove_no_slot_node(&mut self, set: usize, peer_id: &PeerId) {
 		// Reminder: `HashSet::remove` returns false if the node was already not in the set
 		if !self.sets[set].no_slot_nodes.remove(peer_id) {
-			return;
+			return
 		}
 
 		if let Some(peer) = self.nodes.get_mut(peer_id) {
 			match peer.sets[set] {
 				MembershipState::In => self.sets[set].num_in += 1,
 				MembershipState::Out => self.sets[set].num_out += 1,
-				MembershipState::NotConnected { .. } | MembershipState::NotMember => {}
+				MembershipState::NotConnected { .. } | MembershipState::NotMember => {},
 			}
 		}
 	}
@@ -396,24 +382,15 @@ impl<'a> ConnectedPeer<'a> {
 							false,
 							"State inconsistency: disconnecting a disconnected node"
 						)
-					}
+					},
 				}
 			}
-			node.sets[self.set] = MembershipState::NotConnected {
-				last_connected: Instant::now(),
-			};
+			node.sets[self.set] = MembershipState::NotConnected { last_connected: Instant::now() };
 		} else {
-			debug_assert!(
-				false,
-				"State inconsistency: disconnecting a disconnected node"
-			);
+			debug_assert!(false, "State inconsistency: disconnecting a disconnected node");
 		}
 
-		NotConnectedPeer {
-			state: self.state,
-			set: self.set,
-			peer_id: self.peer_id,
-		}
+		NotConnectedPeer { state: self.state, set: self.set, peer_id: self.peer_id }
 	}
 
 	/// Performs an arithmetic addition on the reputation score of that peer.
@@ -425,10 +402,7 @@ impl<'a> ConnectedPeer<'a> {
 		if let Some(node) = self.state.nodes.get_mut(&*self.peer_id) {
 			node.reputation = node.reputation.saturating_add(modifier);
 		} else {
-			debug_assert!(
-				false,
-				"State inconsistency: add_reputation on an unknown node"
-			);
+			debug_assert!(false, "State inconsistency: add_reputation on an unknown node");
 		}
 	}
 
@@ -436,10 +410,7 @@ impl<'a> ConnectedPeer<'a> {
 	///
 	/// > **Note**: Reputation values aren't specific to a set but are global per peer.
 	pub fn reputation(&self) -> i32 {
-		self.state
-			.nodes
-			.get(&*self.peer_id)
-			.map_or(0, |p| p.reputation)
+		self.state.nodes.get(&*self.peer_id).map_or(0, |p| p.reputation)
 	}
 }
 
@@ -483,8 +454,8 @@ impl<'a> NotConnectedPeer<'a> {
 					"State inconsistency with {}; not connected after borrow",
 					self.peer_id
 				);
-				return Instant::now();
-			}
+				return Instant::now()
+			},
 		};
 
 		match state.sets[self.set] {
@@ -492,7 +463,7 @@ impl<'a> NotConnectedPeer<'a> {
 			_ => {
 				error!(target: "peerset", "State inconsistency with {}", self.peer_id);
 				Instant::now()
-			}
+			},
 		}
 	}
 
@@ -508,7 +479,7 @@ impl<'a> NotConnectedPeer<'a> {
 		// Note that it is possible for num_out to be strictly superior to the max, in case we were
 		// connected to reserved node then marked them as not reserved.
 		if !self.state.has_free_outgoing_slot(self.set) && !is_no_slot_occupy {
-			return Err(self);
+			return Err(self)
 		}
 
 		if let Some(peer) = self.state.nodes.get_mut(&*self.peer_id) {
@@ -517,17 +488,10 @@ impl<'a> NotConnectedPeer<'a> {
 				self.state.sets[self.set].num_out += 1;
 			}
 		} else {
-			debug_assert!(
-				false,
-				"State inconsistency: try_outgoing on an unknown node"
-			);
+			debug_assert!(false, "State inconsistency: try_outgoing on an unknown node");
 		}
 
-		Ok(ConnectedPeer {
-			state: self.state,
-			set: self.set,
-			peer_id: self.peer_id,
-		})
+		Ok(ConnectedPeer { state: self.state, set: self.set, peer_id: self.peer_id })
 	}
 
 	/// Tries to accept the peer as an incoming connection.
@@ -541,10 +505,10 @@ impl<'a> NotConnectedPeer<'a> {
 
 		// Note that it is possible for num_in to be strictly superior to the max, in case we were
 		// connected to reserved node then marked them as not reserved.
-		if self.state.sets[self.set].num_in >= self.state.sets[self.set].max_in
-			&& !is_no_slot_occupy
+		if self.state.sets[self.set].num_in >= self.state.sets[self.set].max_in &&
+			!is_no_slot_occupy
 		{
-			return Err(self);
+			return Err(self)
 		}
 
 		if let Some(peer) = self.state.nodes.get_mut(&*self.peer_id) {
@@ -553,27 +517,17 @@ impl<'a> NotConnectedPeer<'a> {
 				self.state.sets[self.set].num_in += 1;
 			}
 		} else {
-			debug_assert!(
-				false,
-				"State inconsistency: try_accept_incoming on an unknown node"
-			);
+			debug_assert!(false, "State inconsistency: try_accept_incoming on an unknown node");
 		}
 
-		Ok(ConnectedPeer {
-			state: self.state,
-			set: self.set,
-			peer_id: self.peer_id,
-		})
+		Ok(ConnectedPeer { state: self.state, set: self.set, peer_id: self.peer_id })
 	}
 
 	/// Returns the reputation value of the node.
 	///
 	/// > **Note**: Reputation values aren't specific to a set but are global per peer.
 	pub fn reputation(&self) -> i32 {
-		self.state
-			.nodes
-			.get(&*self.peer_id)
-			.map_or(0, |p| p.reputation)
+		self.state.nodes.get(&*self.peer_id).map_or(0, |p| p.reputation)
 	}
 
 	/// Sets the reputation of the peer.
@@ -584,10 +538,7 @@ impl<'a> NotConnectedPeer<'a> {
 		if let Some(node) = self.state.nodes.get_mut(&*self.peer_id) {
 			node.reputation = value;
 		} else {
-			debug_assert!(
-				false,
-				"State inconsistency: set_reputation on an unknown node"
-			);
+			debug_assert!(false, "State inconsistency: set_reputation on an unknown node");
 		}
 	}
 
@@ -598,10 +549,8 @@ impl<'a> NotConnectedPeer<'a> {
 			peer.sets[self.set] = MembershipState::NotMember;
 
 			// Remove the peer from `self.state.nodes` entirely if it isn't a member of any set.
-			if peer.reputation == 0 && peer
-				.sets
-				.iter()
-				.all(|set| matches!(set, MembershipState::NotMember))
+			if peer.reputation == 0 &&
+				peer.sets.iter().all(|set| matches!(set, MembershipState::NotMember))
 			{
 				self.state.nodes.remove(&*self.peer_id);
 			}
@@ -614,11 +563,7 @@ impl<'a> NotConnectedPeer<'a> {
 			);
 		};
 
-		UnknownPeer {
-			parent: self.state,
-			set: self.set,
-			peer_id: self.peer_id,
-		}
+		UnknownPeer { parent: self.state, set: self.set, peer_id: self.peer_id }
 	}
 }
 
@@ -641,15 +586,9 @@ impl<'a> UnknownPeer<'a> {
 			.nodes
 			.entry(self.peer_id.clone().into_owned())
 			.or_insert_with(|| Node::new(num_sets))
-			.sets[self.set] = MembershipState::NotConnected {
-			last_connected: Instant::now(),
-		};
+			.sets[self.set] = MembershipState::NotConnected { last_connected: Instant::now() };
 
-		NotConnectedPeer {
-			state: self.parent,
-			set: self.set,
-			peer_id: self.peer_id,
-		}
+		NotConnectedPeer { state: self.parent, set: self.set, peer_id: self.peer_id }
 	}
 }
 
@@ -699,10 +638,7 @@ mod tests {
 
 	#[test]
 	fn full_slots_in() {
-		let mut peers_state = PeersState::new(iter::once(SetConfig {
-			in_peers: 1,
-			out_peers: 1,
-		}));
+		let mut peers_state = PeersState::new(iter::once(SetConfig { in_peers: 1, out_peers: 1 }));
 		let id1 = PeerId::random();
 		let id2 = PeerId::random();
 
@@ -717,10 +653,7 @@ mod tests {
 
 	#[test]
 	fn no_slot_node_doesnt_use_slot() {
-		let mut peers_state = PeersState::new(iter::once(SetConfig {
-			in_peers: 1,
-			out_peers: 1,
-		}));
+		let mut peers_state = PeersState::new(iter::once(SetConfig { in_peers: 1, out_peers: 1 }));
 		let id1 = PeerId::random();
 		let id2 = PeerId::random();
 
@@ -740,10 +673,7 @@ mod tests {
 
 	#[test]
 	fn disconnecting_frees_slot() {
-		let mut peers_state = PeersState::new(iter::once(SetConfig {
-			in_peers: 1,
-			out_peers: 1,
-		}));
+		let mut peers_state = PeersState::new(iter::once(SetConfig { in_peers: 1, out_peers: 1 }));
 		let id1 = PeerId::random();
 		let id2 = PeerId::random();
 
@@ -761,11 +691,7 @@ mod tests {
 			.discover()
 			.try_accept_incoming()
 			.is_err());
-		peers_state
-			.peer(0, &id1)
-			.into_connected()
-			.unwrap()
-			.disconnect();
+		peers_state.peer(0, &id1).into_connected().unwrap().disconnect();
 		assert!(peers_state
 			.peer(0, &id2)
 			.into_not_connected()
@@ -776,41 +702,21 @@ mod tests {
 
 	#[test]
 	fn highest_not_connected_peer() {
-		let mut peers_state = PeersState::new(iter::once(SetConfig {
-			in_peers: 25,
-			out_peers: 25,
-		}));
+		let mut peers_state =
+			PeersState::new(iter::once(SetConfig { in_peers: 25, out_peers: 25 }));
 		let id1 = PeerId::random();
 		let id2 = PeerId::random();
 
 		assert!(peers_state.highest_not_connected_peer(0).is_none());
-		peers_state
-			.peer(0, &id1)
-			.into_unknown()
-			.unwrap()
-			.discover()
-			.set_reputation(50);
-		peers_state
-			.peer(0, &id2)
-			.into_unknown()
-			.unwrap()
-			.discover()
-			.set_reputation(25);
+		peers_state.peer(0, &id1).into_unknown().unwrap().discover().set_reputation(50);
+		peers_state.peer(0, &id2).into_unknown().unwrap().discover().set_reputation(25);
 		assert_eq!(
-			peers_state
-				.highest_not_connected_peer(0)
-				.map(|p| p.into_peer_id()),
+			peers_state.highest_not_connected_peer(0).map(|p| p.into_peer_id()),
 			Some(id1.clone())
 		);
-		peers_state
-			.peer(0, &id2)
-			.into_not_connected()
-			.unwrap()
-			.set_reputation(75);
+		peers_state.peer(0, &id2).into_not_connected().unwrap().set_reputation(75);
 		assert_eq!(
-			peers_state
-				.highest_not_connected_peer(0)
-				.map(|p| p.into_peer_id()),
+			peers_state.highest_not_connected_peer(0).map(|p| p.into_peer_id()),
 			Some(id2.clone())
 		);
 		peers_state
@@ -820,46 +726,25 @@ mod tests {
 			.try_accept_incoming()
 			.unwrap();
 		assert_eq!(
-			peers_state
-				.highest_not_connected_peer(0)
-				.map(|p| p.into_peer_id()),
+			peers_state.highest_not_connected_peer(0).map(|p| p.into_peer_id()),
 			Some(id1.clone())
 		);
-		peers_state
-			.peer(0, &id1)
-			.into_not_connected()
-			.unwrap()
-			.set_reputation(100);
-		peers_state
-			.peer(0, &id2)
-			.into_connected()
-			.unwrap()
-			.disconnect();
+		peers_state.peer(0, &id1).into_not_connected().unwrap().set_reputation(100);
+		peers_state.peer(0, &id2).into_connected().unwrap().disconnect();
 		assert_eq!(
-			peers_state
-				.highest_not_connected_peer(0)
-				.map(|p| p.into_peer_id()),
+			peers_state.highest_not_connected_peer(0).map(|p| p.into_peer_id()),
 			Some(id1.clone())
 		);
-		peers_state
-			.peer(0, &id1)
-			.into_not_connected()
-			.unwrap()
-			.set_reputation(-100);
+		peers_state.peer(0, &id1).into_not_connected().unwrap().set_reputation(-100);
 		assert_eq!(
-			peers_state
-				.highest_not_connected_peer(0)
-				.map(|p| p.into_peer_id()),
+			peers_state.highest_not_connected_peer(0).map(|p| p.into_peer_id()),
 			Some(id2.clone())
 		);
 	}
 
 	#[test]
 	fn disconnect_no_slot_doesnt_panic() {
-		let mut peers_state = PeersState::new(iter::once(SetConfig {
-			in_peers: 1,
-			out_peers: 1,
-		}));
+		let mut peers_state = PeersState::new(iter::once(SetConfig { in_peers: 1, out_peers: 1 }));
 		let id = PeerId::random();
 		peers_state.add_no_slot_node(0, id.clone());
 		let peer = peers_state
diff --git a/client/peerset/tests/fuzz.rs b/client/peerset/tests/fuzz.rs
index 96d1a48683f1..3a9ba686ee95 100644
--- a/client/peerset/tests/fuzz.rs
+++ b/client/peerset/tests/fuzz.rs
@@ -18,10 +18,18 @@
 
 use futures::prelude::*;
 use libp2p::PeerId;
-use rand::distributions::{Distribution, Uniform, WeightedIndex};
-use rand::seq::IteratorRandom;
-use sc_peerset::{DropReason, IncomingIndex, Message, Peerset, PeersetConfig, ReputationChange, SetConfig, SetId};
-use std::{collections::HashMap, collections::HashSet, pin::Pin, task::Poll};
+use rand::{
+	distributions::{Distribution, Uniform, WeightedIndex},
+	seq::IteratorRandom,
+};
+use sc_peerset::{
+	DropReason, IncomingIndex, Message, Peerset, PeersetConfig, ReputationChange, SetConfig, SetId,
+};
+use std::{
+	collections::{HashMap, HashSet},
+	pin::Pin,
+	task::Poll,
+};
 
 #[test]
 fn run() {
@@ -40,30 +48,28 @@ fn test_once() {
 	let mut reserved_nodes = HashSet::<PeerId>::new();
 
 	let (mut peerset, peerset_handle) = Peerset::from_config(PeersetConfig {
-		sets: vec![
-			SetConfig {
-				bootnodes: (0..Uniform::new_inclusive(0, 4).sample(&mut rng))
+		sets: vec![SetConfig {
+			bootnodes: (0..Uniform::new_inclusive(0, 4).sample(&mut rng))
+				.map(|_| {
+					let id = PeerId::random();
+					known_nodes.insert(id.clone());
+					id
+				})
+				.collect(),
+			reserved_nodes: {
+				(0..Uniform::new_inclusive(0, 2).sample(&mut rng))
 					.map(|_| {
 						let id = PeerId::random();
 						known_nodes.insert(id.clone());
+						reserved_nodes.insert(id.clone());
 						id
 					})
-					.collect(),
-				reserved_nodes: {
-					(0..Uniform::new_inclusive(0, 2).sample(&mut rng))
-						.map(|_| {
-							let id = PeerId::random();
-							known_nodes.insert(id.clone());
-							reserved_nodes.insert(id.clone());
-							id
-						})
-						.collect()
-				},
-				in_peers: Uniform::new_inclusive(0, 25).sample(&mut rng),
-				out_peers: Uniform::new_inclusive(0, 25).sample(&mut rng),
-				reserved_only: Uniform::new_inclusive(0, 10).sample(&mut rng) == 0,
+					.collect()
 			},
-		],
+			in_peers: Uniform::new_inclusive(0, 25).sample(&mut rng),
+			out_peers: Uniform::new_inclusive(0, 25).sample(&mut rng),
+			reserved_only: Uniform::new_inclusive(0, 10).sample(&mut rng) == 0,
+		}],
 	});
 
 	futures::executor::block_on(futures::future::poll_fn(move |cx| {
@@ -81,33 +87,28 @@ fn test_once() {
 		for _ in 0..2500 {
 			// Each of these weights corresponds to an action that we may perform.
 			let action_weights = [150, 90, 90, 30, 30, 1, 1, 4, 4];
-			match WeightedIndex::new(&action_weights)
-				.unwrap()
-				.sample(&mut rng)
-			{
+			match WeightedIndex::new(&action_weights).unwrap().sample(&mut rng) {
 				// If we generate 0, poll the peerset.
 				0 => match Stream::poll_next(Pin::new(&mut peerset), cx) {
 					Poll::Ready(Some(Message::Connect { peer_id, .. })) => {
-						if let Some(id) = incoming_nodes
-							.iter()
-							.find(|(_, v)| **v == peer_id)
-							.map(|(&id, _)| id)
+						if let Some(id) =
+							incoming_nodes.iter().find(|(_, v)| **v == peer_id).map(|(&id, _)| id)
 						{
 							incoming_nodes.remove(&id);
 						}
 						assert!(connected_nodes.insert(peer_id));
-					}
+					},
 					Poll::Ready(Some(Message::Drop { peer_id, .. })) => {
 						connected_nodes.remove(&peer_id);
-					}
+					},
 					Poll::Ready(Some(Message::Accept(n))) => {
 						assert!(connected_nodes.insert(incoming_nodes.remove(&n).unwrap()))
-					}
+					},
 					Poll::Ready(Some(Message::Reject(n))) => {
 						assert!(!connected_nodes.contains(&incoming_nodes.remove(&n).unwrap()))
-					}
+					},
 					Poll::Ready(None) => panic!(),
-					Poll::Pending => {}
+					Poll::Pending => {},
 				},
 
 				// If we generate 1, discover a new node.
@@ -115,32 +116,29 @@ fn test_once() {
 					let new_id = PeerId::random();
 					known_nodes.insert(new_id.clone());
 					peerset.add_to_peers_set(SetId::from(0), new_id);
-				}
+				},
 
 				// If we generate 2, adjust a random reputation.
-				2 => {
+				2 =>
 					if let Some(id) = known_nodes.iter().choose(&mut rng) {
-						let val = Uniform::new_inclusive(i32::MIN, i32::MAX)
-							.sample(&mut rng);
+						let val = Uniform::new_inclusive(i32::MIN, i32::MAX).sample(&mut rng);
 						peerset_handle.report_peer(id.clone(), ReputationChange::new(val, ""));
-					}
-				}
+					},
 
 				// If we generate 3, disconnect from a random node.
-				3 => {
+				3 =>
 					if let Some(id) = connected_nodes.iter().choose(&mut rng).cloned() {
 						connected_nodes.remove(&id);
 						peerset.dropped(SetId::from(0), id, DropReason::Unknown);
-					}
-				}
+					},
 
 				// If we generate 4, connect to a random node.
 				4 => {
 					if let Some(id) = known_nodes
 						.iter()
 						.filter(|n| {
-							incoming_nodes.values().all(|m| m != *n)
-								&& !connected_nodes.contains(*n)
+							incoming_nodes.values().all(|m| m != *n) &&
+								!connected_nodes.contains(*n)
 						})
 						.choose(&mut rng)
 					{
@@ -148,7 +146,7 @@ fn test_once() {
 						incoming_nodes.insert(next_incoming_id.clone(), id.clone());
 						next_incoming_id.0 += 1;
 					}
-				}
+				},
 
 				// 5 and 6 are the reserved-only mode.
 				5 => peerset_handle.set_reserved_only(SetId::from(0), true),
@@ -156,21 +154,18 @@ fn test_once() {
 
 				// 7 and 8 are about switching a random node in or out of reserved mode.
 				7 => {
-					if let Some(id) = known_nodes
-						.iter()
-						.filter(|n| !reserved_nodes.contains(*n))
-						.choose(&mut rng)
+					if let Some(id) =
+						known_nodes.iter().filter(|n| !reserved_nodes.contains(*n)).choose(&mut rng)
 					{
 						peerset_handle.add_reserved_peer(SetId::from(0), id.clone());
 						reserved_nodes.insert(id.clone());
 					}
-				}
-				8 => {
+				},
+				8 =>
 					if let Some(id) = reserved_nodes.iter().choose(&mut rng).cloned() {
 						reserved_nodes.remove(&id);
 						peerset_handle.remove_reserved_peer(SetId::from(0), id);
-					}
-				}
+					},
 
 				_ => unreachable!(),
 			}
diff --git a/client/proposer-metrics/src/lib.rs b/client/proposer-metrics/src/lib.rs
index 8fec9779de47..da29fb295199 100644
--- a/client/proposer-metrics/src/lib.rs
+++ b/client/proposer-metrics/src/lib.rs
@@ -18,7 +18,9 @@
 
 //! Prometheus basic proposer metrics.
 
-use prometheus_endpoint::{register, PrometheusError, Registry, Histogram, HistogramOpts, Gauge, U64};
+use prometheus_endpoint::{
+	register, Gauge, Histogram, HistogramOpts, PrometheusError, Registry, U64,
+};
 
 /// Optional shareable link to basic authorship metrics.
 #[derive(Clone, Default)]
@@ -26,13 +28,13 @@ pub struct MetricsLink(Option<Metrics>);
 
 impl MetricsLink {
 	pub fn new(registry: Option<&Registry>) -> Self {
-		Self(
-			registry.and_then(|registry|
-				Metrics::register(registry)
-					.map_err(|err| log::warn!("Failed to register proposer prometheus metrics: {}", err))
-					.ok()
-			)
-		)
+		Self(registry.and_then(|registry| {
+			Metrics::register(registry)
+				.map_err(|err| {
+					log::warn!("Failed to register proposer prometheus metrics: {}", err)
+				})
+				.ok()
+		}))
 	}
 
 	pub fn report<O>(&self, do_this: impl FnOnce(&Metrics) -> O) -> Option<O> {
diff --git a/client/rpc-api/src/author/error.rs b/client/rpc-api/src/author/error.rs
index 009a0a290d6b..0c963d4e4c25 100644
--- a/client/rpc-api/src/author/error.rs
+++ b/client/rpc-api/src/author/error.rs
@@ -32,33 +32,33 @@ pub type FutureResult<T> = Box<dyn rpc::futures::Future<Item = T, Error = Error>
 #[derive(Debug, derive_more::Display, derive_more::From)]
 pub enum Error {
 	/// Client error.
-	#[display(fmt="Client error: {}", _0)]
+	#[display(fmt = "Client error: {}", _0)]
 	#[from(ignore)]
 	Client(Box<dyn std::error::Error + Send>),
 	/// Transaction pool error,
-	#[display(fmt="Transaction pool error: {}", _0)]
+	#[display(fmt = "Transaction pool error: {}", _0)]
 	Pool(sc_transaction_pool_api::error::Error),
 	/// Verification error
-	#[display(fmt="Extrinsic verification error: {}", _0)]
+	#[display(fmt = "Extrinsic verification error: {}", _0)]
 	#[from(ignore)]
 	Verification(Box<dyn std::error::Error + Send>),
 	/// Incorrect extrinsic format.
-	#[display(fmt="Invalid extrinsic format: {}", _0)]
+	#[display(fmt = "Invalid extrinsic format: {}", _0)]
 	BadFormat(codec::Error),
 	/// Incorrect seed phrase.
-	#[display(fmt="Invalid seed phrase/SURI")]
+	#[display(fmt = "Invalid seed phrase/SURI")]
 	BadSeedPhrase,
 	/// Key type ID has an unknown format.
-	#[display(fmt="Invalid key type ID format (should be of length four)")]
+	#[display(fmt = "Invalid key type ID format (should be of length four)")]
 	BadKeyType,
 	/// Key type ID has some unsupported crypto.
-	#[display(fmt="The crypto of key type ID is unknown")]
+	#[display(fmt = "The crypto of key type ID is unknown")]
 	UnsupportedKeyType,
 	/// Some random issue with the key store. Shouldn't happen.
-	#[display(fmt="The key store is unavailable")]
+	#[display(fmt = "The key store is unavailable")]
 	KeyStoreUnavailable,
 	/// Invalid session keys encoding.
-	#[display(fmt="Session keys are not encoded correctly")]
+	#[display(fmt = "Session keys are not encoded correctly")]
 	InvalidSessionKeys,
 	/// Call to an unsafe RPC was denied.
 	UnsafeRpcCalled(crate::policy::UnsafeRpcError),
@@ -105,7 +105,7 @@ const POOL_UNACTIONABLE: i64 = POOL_INVALID_TX + 8;
 
 impl From<Error> for rpc::Error {
 	fn from(e: Error) -> Self {
-		use sc_transaction_pool_api::error::{Error as PoolError};
+		use sc_transaction_pool_api::error::Error as PoolError;
 
 		match e {
 			Error::BadFormat(e) => rpc::Error {
diff --git a/client/rpc-api/src/author/hash.rs b/client/rpc-api/src/author/hash.rs
index 618159a8ad4d..c4acfb819ddb 100644
--- a/client/rpc-api/src/author/hash.rs
+++ b/client/rpc-api/src/author/hash.rs
@@ -18,8 +18,8 @@
 
 //! Extrinsic helpers for author RPC module.
 
+use serde::{Deserialize, Serialize};
 use sp_core::Bytes;
-use serde::{Serialize, Deserialize};
 
 /// RPC Extrinsic or hash
 ///
diff --git a/client/rpc-api/src/author/mod.rs b/client/rpc-api/src/author/mod.rs
index 70da73ee8a00..dbf729ea18ad 100644
--- a/client/rpc-api/src/author/mod.rs
+++ b/client/rpc-api/src/author/mod.rs
@@ -21,11 +21,11 @@
 pub mod error;
 pub mod hash;
 
+use self::error::{FutureResult, Result};
 use jsonrpc_derive::rpc;
 use jsonrpc_pubsub::{typed::Subscriber, SubscriptionId};
-use sp_core::Bytes;
 use sc_transaction_pool_api::TransactionStatus;
-use self::error::{FutureResult, Result};
+use sp_core::Bytes;
 
 pub use self::gen_client::Client as AuthorClient;
 
@@ -41,12 +41,7 @@ pub trait AuthorApi<Hash, BlockHash> {
 
 	/// Insert a key into the keystore.
 	#[rpc(name = "author_insertKey")]
-	fn insert_key(
-		&self,
-		key_type: String,
-		suri: String,
-		public: Bytes,
-	) -> Result<()>;
+	fn insert_key(&self, key_type: String, suri: String, public: Bytes) -> Result<()>;
 
 	/// Generate new session keys and returns the corresponding public keys.
 	#[rpc(name = "author_rotateKeys")]
@@ -72,8 +67,9 @@ pub trait AuthorApi<Hash, BlockHash> {
 
 	/// Remove given extrinsic from the pool and temporarily ban it to prevent reimporting.
 	#[rpc(name = "author_removeExtrinsic")]
-	fn remove_extrinsic(&self,
-		bytes_or_hash: Vec<hash::ExtrinsicOrHash<Hash>>
+	fn remove_extrinsic(
+		&self,
+		bytes_or_hash: Vec<hash::ExtrinsicOrHash<Hash>>,
 	) -> Result<Vec<Hash>>;
 
 	/// Submit an extrinsic to watch.
@@ -85,10 +81,11 @@ pub trait AuthorApi<Hash, BlockHash> {
 		subscribe,
 		name = "author_submitAndWatchExtrinsic"
 	)]
-	fn watch_extrinsic(&self,
+	fn watch_extrinsic(
+		&self,
 		metadata: Self::Metadata,
 		subscriber: Subscriber<TransactionStatus<Hash, BlockHash>>,
-		bytes: Bytes
+		bytes: Bytes,
 	);
 
 	/// Unsubscribe from extrinsic watching.
@@ -97,8 +94,9 @@ pub trait AuthorApi<Hash, BlockHash> {
 		unsubscribe,
 		name = "author_unwatchExtrinsic"
 	)]
-	fn unwatch_extrinsic(&self,
+	fn unwatch_extrinsic(
+		&self,
 		metadata: Option<Self::Metadata>,
-		id: SubscriptionId
+		id: SubscriptionId,
 	) -> Result<bool>;
 }
diff --git a/client/rpc-api/src/chain/error.rs b/client/rpc-api/src/chain/error.rs
index 59a0c0a2f840..9bedd328d001 100644
--- a/client/rpc-api/src/chain/error.rs
+++ b/client/rpc-api/src/chain/error.rs
@@ -31,7 +31,7 @@ pub type FutureResult<T> = Box<dyn rpc::futures::Future<Item = T, Error = Error>
 #[derive(Debug, derive_more::Display, derive_more::From)]
 pub enum Error {
 	/// Client error.
-	#[display(fmt="Client error: {}", _0)]
+	#[display(fmt = "Client error: {}", _0)]
 	Client(Box<dyn std::error::Error + Send>),
 	/// Other error type.
 	Other(String),
diff --git a/client/rpc-api/src/chain/mod.rs b/client/rpc-api/src/chain/mod.rs
index 5e2d48441304..79ae80d0c4d1 100644
--- a/client/rpc-api/src/chain/mod.rs
+++ b/client/rpc-api/src/chain/mod.rs
@@ -20,11 +20,11 @@
 
 pub mod error;
 
+use self::error::{FutureResult, Result};
 use jsonrpc_core::Result as RpcResult;
 use jsonrpc_derive::rpc;
 use jsonrpc_pubsub::{typed::Subscriber, SubscriptionId};
-use sp_rpc::{number::NumberOrHex, list::ListOrValue};
-use self::error::{FutureResult, Result};
+use sp_rpc::{list::ListOrValue, number::NumberOrHex};
 
 pub use self::gen_client::Client as ChainClient;
 
diff --git a/client/rpc-api/src/child_state/mod.rs b/client/rpc-api/src/child_state/mod.rs
index 99990017fd82..7abda0a63134 100644
--- a/client/rpc-api/src/child_state/mod.rs
+++ b/client/rpc-api/src/child_state/mod.rs
@@ -18,9 +18,9 @@
 
 //! Substrate state API.
 
-use jsonrpc_derive::rpc;
-use sp_core::storage::{StorageKey, PrefixedStorageKey, StorageData};
 use crate::state::error::FutureResult;
+use jsonrpc_derive::rpc;
+use sp_core::storage::{PrefixedStorageKey, StorageData, StorageKey};
 
 pub use self::gen_client::Client as ChildStateClient;
 use crate::state::ReadProof;
@@ -41,7 +41,7 @@ pub trait ChildStateApi<Hash> {
 		&self,
 		child_storage_key: PrefixedStorageKey,
 		prefix: StorageKey,
-		hash: Option<Hash>
+		hash: Option<Hash>,
 	) -> FutureResult<Vec<StorageKey>>;
 
 	/// Returns the keys with prefix from a child storage with pagination support.
@@ -63,7 +63,7 @@ pub trait ChildStateApi<Hash> {
 		&self,
 		child_storage_key: PrefixedStorageKey,
 		key: StorageKey,
-		hash: Option<Hash>
+		hash: Option<Hash>,
 	) -> FutureResult<Option<StorageData>>;
 
 	/// Returns the hash of a child storage entry at a block's state.
@@ -72,7 +72,7 @@ pub trait ChildStateApi<Hash> {
 		&self,
 		child_storage_key: PrefixedStorageKey,
 		key: StorageKey,
-		hash: Option<Hash>
+		hash: Option<Hash>,
 	) -> FutureResult<Option<Hash>>;
 
 	/// Returns the size of a child storage entry at a block's state.
@@ -81,7 +81,7 @@ pub trait ChildStateApi<Hash> {
 		&self,
 		child_storage_key: PrefixedStorageKey,
 		key: StorageKey,
-		hash: Option<Hash>
+		hash: Option<Hash>,
 	) -> FutureResult<Option<u64>>;
 
 	/// Returns proof of storage for child key entries at a specific block's state.
diff --git a/client/rpc-api/src/helpers.rs b/client/rpc-api/src/helpers.rs
index e85c26062b50..bb37cfbbb780 100644
--- a/client/rpc-api/src/helpers.rs
+++ b/client/rpc-api/src/helpers.rs
@@ -16,8 +16,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use jsonrpc_core::futures::prelude::*;
 use futures::{channel::oneshot, compat::Compat};
+use jsonrpc_core::futures::prelude::*;
 
 /// Wraps around `oneshot::Receiver` and adjusts the error type to produce an internal error if the
 /// sender gets dropped.
diff --git a/client/rpc-api/src/lib.rs b/client/rpc-api/src/lib.rs
index 814319add2a3..488ae429c1f4 100644
--- a/client/rpc-api/src/lib.rs
+++ b/client/rpc-api/src/lib.rs
@@ -34,7 +34,7 @@ pub use policy::DenyUnsafe;
 
 pub mod author;
 pub mod chain;
+pub mod child_state;
 pub mod offchain;
 pub mod state;
-pub mod child_state;
 pub mod system;
diff --git a/client/rpc-api/src/metadata.rs b/client/rpc-api/src/metadata.rs
index efe090acc621..bda7b8f7ba36 100644
--- a/client/rpc-api/src/metadata.rs
+++ b/client/rpc-api/src/metadata.rs
@@ -20,7 +20,7 @@
 use std::sync::Arc;
 
 use jsonrpc_core::futures::sync::mpsc;
-use jsonrpc_pubsub::{Session, PubSubMetadata};
+use jsonrpc_pubsub::{PubSubMetadata, Session};
 
 /// RPC Metadata.
 ///
@@ -42,9 +42,7 @@ impl PubSubMetadata for Metadata {
 impl Metadata {
 	/// Create new `Metadata` with session (Pub/Sub) support.
 	pub fn new(transport: mpsc::Sender<String>) -> Self {
-		Metadata {
-			session: Some(Arc::new(Session::new(transport))),
-		}
+		Metadata { session: Some(Arc::new(Session::new(transport))) }
 	}
 
 	/// Create new `Metadata` for tests.
diff --git a/client/rpc-api/src/offchain/error.rs b/client/rpc-api/src/offchain/error.rs
index f74d419e5442..f2567707bc5f 100644
--- a/client/rpc-api/src/offchain/error.rs
+++ b/client/rpc-api/src/offchain/error.rs
@@ -27,7 +27,7 @@ pub type Result<T> = std::result::Result<T, Error>;
 #[derive(Debug, derive_more::Display, derive_more::From)]
 pub enum Error {
 	/// Unavailable storage kind error.
-	#[display(fmt="This storage kind is not available yet.")]
+	#[display(fmt = "This storage kind is not available yet.")]
 	UnavailableStorageKind,
 	/// Call to an unsafe RPC was denied.
 	UnsafeRpcCalled(crate::policy::UnsafeRpcError),
@@ -50,7 +50,7 @@ impl From<Error> for rpc::Error {
 		match e {
 			Error::UnavailableStorageKind => rpc::Error {
 				code: rpc::ErrorCode::ServerError(BASE_ERROR + 1),
-				message: "This storage kind is not available yet" .into(),
+				message: "This storage kind is not available yet".into(),
 				data: None,
 			},
 			Error::UnsafeRpcCalled(e) => e.into(),
diff --git a/client/rpc-api/src/offchain/mod.rs b/client/rpc-api/src/offchain/mod.rs
index 7a1f6db9e80b..333892fc19c4 100644
--- a/client/rpc-api/src/offchain/mod.rs
+++ b/client/rpc-api/src/offchain/mod.rs
@@ -20,9 +20,9 @@
 
 pub mod error;
 
-use jsonrpc_derive::rpc;
 use self::error::Result;
-use sp_core::{Bytes, offchain::StorageKind};
+use jsonrpc_derive::rpc;
+use sp_core::{offchain::StorageKind, Bytes};
 
 pub use self::gen_client::Client as OffchainClient;
 
diff --git a/client/rpc-api/src/state/error.rs b/client/rpc-api/src/state/error.rs
index 4f2a2c854ae0..30437246e6ea 100644
--- a/client/rpc-api/src/state/error.rs
+++ b/client/rpc-api/src/state/error.rs
@@ -31,7 +31,7 @@ pub type FutureResult<T> = Box<dyn rpc::futures::Future<Item = T, Error = Error>
 #[derive(Debug, derive_more::Display, derive_more::From)]
 pub enum Error {
 	/// Client error.
-	#[display(fmt="Client error: {}", _0)]
+	#[display(fmt = "Client error: {}", _0)]
 	Client(Box<dyn std::error::Error + Send>),
 	/// Provided block range couldn't be resolved to a list of blocks.
 	#[display(fmt = "Cannot resolve a block range ['{:?}' ... '{:?}]. {}", from, to, details)]
diff --git a/client/rpc-api/src/state/helpers.rs b/client/rpc-api/src/state/helpers.rs
index cb7bd380afa5..718ad69ac232 100644
--- a/client/rpc-api/src/state/helpers.rs
+++ b/client/rpc-api/src/state/helpers.rs
@@ -18,8 +18,8 @@
 
 //! Substrate state API helpers.
 
+use serde::{Deserialize, Serialize};
 use sp_core::Bytes;
-use serde::{Serialize, Deserialize};
 
 /// ReadProof struct returned by the RPC
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
diff --git a/client/rpc-api/src/state/mod.rs b/client/rpc-api/src/state/mod.rs
index 0ebc553b4117..b3048d7bb5ff 100644
--- a/client/rpc-api/src/state/mod.rs
+++ b/client/rpc-api/src/state/mod.rs
@@ -21,16 +21,17 @@
 pub mod error;
 pub mod helpers;
 
+use self::error::FutureResult;
 use jsonrpc_core::Result as RpcResult;
 use jsonrpc_derive::rpc;
 use jsonrpc_pubsub::{typed::Subscriber, SubscriptionId};
-use sp_core::Bytes;
-use sp_core::storage::{StorageKey, StorageData, StorageChangeSet};
+use sp_core::{
+	storage::{StorageChangeSet, StorageData, StorageKey},
+	Bytes,
+};
 use sp_version::RuntimeVersion;
-use self::error::FutureResult;
 
-pub use self::gen_client::Client as StateClient;
-pub use self::helpers::ReadProof;
+pub use self::{gen_client::Client as StateClient, helpers::ReadProof};
 
 /// Substrate state API
 #[rpc]
@@ -45,11 +46,16 @@ pub trait StateApi<Hash> {
 	/// DEPRECATED: Please use `state_getKeysPaged` with proper paging support.
 	/// Returns the keys with prefix, leave empty to get all the keys.
 	#[rpc(name = "state_getKeys")]
-	fn storage_keys(&self, prefix: StorageKey, hash: Option<Hash>) -> FutureResult<Vec<StorageKey>>;
+	fn storage_keys(&self, prefix: StorageKey, hash: Option<Hash>)
+		-> FutureResult<Vec<StorageKey>>;
 
 	/// Returns the keys with prefix, leave empty to get all the keys
 	#[rpc(name = "state_getPairs")]
-	fn storage_pairs(&self, prefix: StorageKey, hash: Option<Hash>) -> FutureResult<Vec<(StorageKey, StorageData)>>;
+	fn storage_pairs(
+		&self,
+		prefix: StorageKey,
+		hash: Option<Hash>,
+	) -> FutureResult<Vec<(StorageKey, StorageData)>>;
 
 	/// Returns the keys with prefix with pagination support.
 	/// Up to `count` keys will be returned.
@@ -92,7 +98,7 @@ pub trait StateApi<Hash> {
 		&self,
 		keys: Vec<StorageKey>,
 		block: Hash,
-		hash: Option<Hash>
+		hash: Option<Hash>,
 	) -> FutureResult<Vec<StorageChangeSet<Hash>>>;
 
 	/// Query storage entries (by key) starting at block hash given as the second parameter.
@@ -105,7 +111,11 @@ pub trait StateApi<Hash> {
 
 	/// Returns proof of storage entries at a specific block's state.
 	#[rpc(name = "state_getReadProof")]
-	fn read_proof(&self, keys: Vec<StorageKey>, hash: Option<Hash>) -> FutureResult<ReadProof<Hash>>;
+	fn read_proof(
+		&self,
+		keys: Vec<StorageKey>,
+		hash: Option<Hash>,
+	) -> FutureResult<ReadProof<Hash>>;
 
 	/// New runtime version subscription
 	#[pubsub(
@@ -114,7 +124,11 @@ pub trait StateApi<Hash> {
 		name = "state_subscribeRuntimeVersion",
 		alias("chain_subscribeRuntimeVersion")
 	)]
-	fn subscribe_runtime_version(&self, metadata: Self::Metadata, subscriber: Subscriber<RuntimeVersion>);
+	fn subscribe_runtime_version(
+		&self,
+		metadata: Self::Metadata,
+		subscriber: Subscriber<RuntimeVersion>,
+	);
 
 	/// Unsubscribe from runtime version subscription
 	#[pubsub(
@@ -123,18 +137,27 @@ pub trait StateApi<Hash> {
 		name = "state_unsubscribeRuntimeVersion",
 		alias("chain_unsubscribeRuntimeVersion")
 	)]
-	fn unsubscribe_runtime_version(&self, metadata: Option<Self::Metadata>, id: SubscriptionId) -> RpcResult<bool>;
+	fn unsubscribe_runtime_version(
+		&self,
+		metadata: Option<Self::Metadata>,
+		id: SubscriptionId,
+	) -> RpcResult<bool>;
 
 	/// New storage subscription
 	#[pubsub(subscription = "state_storage", subscribe, name = "state_subscribeStorage")]
 	fn subscribe_storage(
-		&self, metadata: Self::Metadata, subscriber: Subscriber<StorageChangeSet<Hash>>, keys: Option<Vec<StorageKey>>
+		&self,
+		metadata: Self::Metadata,
+		subscriber: Subscriber<StorageChangeSet<Hash>>,
+		keys: Option<Vec<StorageKey>>,
 	);
 
 	/// Unsubscribe from storage subscription
 	#[pubsub(subscription = "state_storage", unsubscribe, name = "state_unsubscribeStorage")]
 	fn unsubscribe_storage(
-		&self, metadata: Option<Self::Metadata>, id: SubscriptionId
+		&self,
+		metadata: Option<Self::Metadata>,
+		id: SubscriptionId,
 	) -> RpcResult<bool>;
 
 	/// The `state_traceBlock` RPC provides a way to trace the re-execution of a single
@@ -174,7 +197,7 @@ pub trait StateApi<Hash> {
 	/// renamed/modified however you like, as long as it retains the `.wasm` extension.
 	/// - Run the node with the wasm blob overrides by placing them in a folder with all your runtimes,
 	/// and passing the path of this folder to your chain, e.g.:
-	/// 	- `./target/release/polkadot --wasm-runtime-overrides /home/user/my-custom-wasm-runtimes`
+	/// - `./target/release/polkadot --wasm-runtime-overrides /home/user/my-custom-wasm-runtimes`
 	///
 	/// You can also find some pre-built tracing enabled wasm runtimes in [substrate-archive][2]
 	///
@@ -199,7 +222,7 @@ pub trait StateApi<Hash> {
 	/// curl \
 	/// 	-H "Content-Type: application/json" \
 	/// 	-d '{"id":1, "jsonrpc":"2.0", "method": "state_traceBlock", \
-	///		"params": ["0xb246acf1adea1f801ce15c77a5fa7d8f2eb8fed466978bcee172cc02cf64e264"]}' \
+	/// 		"params": ["0xb246acf1adea1f801ce15c77a5fa7d8f2eb8fed466978bcee172cc02cf64e264"]}' \
 	/// 	http://localhost:9933/
 	/// ```
 	///
@@ -207,33 +230,34 @@ pub trait StateApi<Hash> {
 	///
 	/// - `block_hash` (param index 0): Hash of the block to trace.
 	/// - `targets` (param index 1): String of comma separated (no spaces) targets. Specified
-	/// 	targets match with trace targets by prefix (i.e if a target is in the beginning
-	/// 	of a trace target it is considered a match). If an empty string is specified no
-	/// 	targets will be filtered out. The majority of targets correspond to Rust module names,
-	/// 	and the ones that do not are typically "hardcoded" into span or event location
-	/// 	somewhere in the Substrate source code. ("Non-hardcoded" targets typically come from frame
-	/// 	support macros.)
+	/// targets match with trace targets by prefix (i.e if a target is in the beginning
+	/// of a trace target it is considered a match). If an empty string is specified no
+	/// targets will be filtered out. The majority of targets correspond to Rust module names,
+	/// and the ones that do not are typically "hardcoded" into span or event location
+	/// somewhere in the Substrate source code. ("Non-hardcoded" targets typically come from frame
+	/// support macros.)
 	/// - `storage_keys` (param index 2): String of comma separated (no spaces) hex encoded
-	/// 	(no `0x` prefix) storage keys. If an empty string is specified no events will
-	/// 	be filtered out. If anything other than an empty string is specified, events
-	/// 	will be filtered by storage key (so non-storage events will **not** show up).
-	/// 	You can specify any length of a storage key prefix (i.e. if a specified storage
-	/// 	key is in the beginning of an events storage key it is considered a match).
-	/// 	Example: for balance tracking on Polkadot & Kusama you would likely want
-	///		to track changes to account balances with the frame_system::Account storage item,
-	///		which is a map from `AccountId` to `AccountInfo`. The key filter for this would be
-	///		the storage prefix for the map:
-	///		`26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da9`
-	/// 	Additionally you would want to track the extrinsic index, which is under the
-	///		`:extrinsic_index` key. The key for this would be the aforementioned string as bytes
-	///		in hex: `3a65787472696e7369635f696e646578`.
-	///		The following are some resources to learn more about storage keys in substrate:
-	///		[substrate storage][1], [transparent keys in substrate][2],
-	///		[querying substrate storage via rpc][3].
-	///
-	///		[1]: https://substrate.dev/docs/en/knowledgebase/advanced/storage#storage-map-key
-	///		[2]: https://www.shawntabrizi.com/substrate/transparent-keys-in-substrate/
-	///		[3]: https://www.shawntabrizi.com/substrate/querying-substrate-storage-via-rpc/
+	/// (no `0x` prefix) storage keys. If an empty string is specified no events will
+	/// be filtered out. If anything other than an empty string is specified, events
+	/// will be filtered by storage key (so non-storage events will **not** show up).
+	/// You can specify any length of a storage key prefix (i.e. if a specified storage
+	/// key is in the beginning of an events storage key it is considered a match).
+	/// Example: for balance tracking on Polkadot & Kusama you would likely want
+	/// to track changes to account balances with the frame_system::Account storage item,
+	/// which is a map from `AccountId` to `AccountInfo`. The key filter for this would be
+	/// the storage prefix for the map:
+	/// `26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da9`
+	///
+	/// Additionally you would want to track the extrinsic index, which is under the
+	/// `:extrinsic_index` key. The key for this would be the aforementioned string as bytes
+	/// in hex: `3a65787472696e7369635f696e646578`.
+	/// The following are some resources to learn more about storage keys in substrate:
+	/// [substrate storage][1], [transparent keys in substrate][2],
+	/// [querying substrate storage via rpc][3].
+	///
+	/// [1]: https://substrate.dev/docs/en/knowledgebase/advanced/storage#storage-map-key
+	/// [2]: https://www.shawntabrizi.com/substrate/transparent-keys-in-substrate/
+	/// [3]: https://www.shawntabrizi.com/substrate/querying-substrate-storage-via-rpc/
 	///
 	/// ### Maximum payload size
 	///
diff --git a/client/rpc-api/src/system/error.rs b/client/rpc-api/src/system/error.rs
index a0dfd863ce3a..b16a7abb6ea5 100644
--- a/client/rpc-api/src/system/error.rs
+++ b/client/rpc-api/src/system/error.rs
@@ -48,10 +48,10 @@ impl From<Error> for rpc::Error {
 				data: serde_json::to_value(h).ok(),
 			},
 			Error::MalformattedPeerArg(ref e) => rpc::Error {
-				code :rpc::ErrorCode::ServerError(BASE_ERROR + 2),
+				code: rpc::ErrorCode::ServerError(BASE_ERROR + 2),
 				message: e.clone(),
 				data: None,
-			}
+			},
 		}
 	}
 }
diff --git a/client/rpc-api/src/system/helpers.rs b/client/rpc-api/src/system/helpers.rs
index c8124d9c6752..96e8aeb1ae3d 100644
--- a/client/rpc-api/src/system/helpers.rs
+++ b/client/rpc-api/src/system/helpers.rs
@@ -18,9 +18,9 @@
 
 //! Substrate system API helpers.
 
+use sc_chain_spec::{ChainType, Properties};
+use serde::{Deserialize, Serialize};
 use std::fmt;
-use serde::{Serialize, Deserialize};
-use sc_chain_spec::{Properties, ChainType};
 
 /// Running node's static details.
 #[derive(Clone, Debug)]
@@ -53,9 +53,7 @@ pub struct Health {
 
 impl fmt::Display for Health {
 	fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-		write!(fmt, "{} peers ({})", self.peers, if self.is_syncing {
-			"syncing"
-		} else { "idle" })
+		write!(fmt, "{} peers ({})", self.peers, if self.is_syncing { "syncing" } else { "idle" })
 	}
 }
 
@@ -107,7 +105,8 @@ mod tests {
 				peers: 1,
 				is_syncing: false,
 				should_have_peers: true,
-			}).unwrap(),
+			})
+			.unwrap(),
 			r#"{"peers":1,"isSyncing":false,"shouldHavePeers":true}"#,
 		);
 	}
@@ -120,7 +119,8 @@ mod tests {
 				roles: "a".into(),
 				best_hash: 5u32,
 				best_number: 6u32,
-			}).unwrap(),
+			})
+			.unwrap(),
 			r#"{"peerId":"2","roles":"a","bestHash":5,"bestNumber":6}"#,
 		);
 	}
@@ -132,7 +132,8 @@ mod tests {
 				starting_block: 12u32,
 				current_block: 50u32,
 				highest_block: Some(128u32),
-			}).unwrap(),
+			})
+			.unwrap(),
 			r#"{"startingBlock":12,"currentBlock":50,"highestBlock":128}"#,
 		);
 
@@ -141,7 +142,8 @@ mod tests {
 				starting_block: 12u32,
 				current_block: 50u32,
 				highest_block: None,
-			}).unwrap(),
+			})
+			.unwrap(),
 			r#"{"startingBlock":12,"currentBlock":50}"#,
 		);
 	}
diff --git a/client/rpc-api/src/system/mod.rs b/client/rpc-api/src/system/mod.rs
index e820fb2e702e..2f9ed45cd2e2 100644
--- a/client/rpc-api/src/system/mod.rs
+++ b/client/rpc-api/src/system/mod.rs
@@ -22,13 +22,15 @@ pub mod error;
 pub mod helpers;
 
 use crate::helpers::Receiver;
+use futures::{compat::Compat, future::BoxFuture};
 use jsonrpc_derive::rpc;
-use futures::{future::BoxFuture, compat::Compat};
 
 use self::error::Result as SystemResult;
 
-pub use self::helpers::{SystemInfo, Health, PeerInfo, NodeRole, SyncState};
-pub use self::gen_client::Client as SystemClient;
+pub use self::{
+	gen_client::Client as SystemClient,
+	helpers::{Health, NodeRole, PeerInfo, SyncState, SystemInfo},
+};
 
 /// Substrate system RPC API
 #[rpc]
@@ -74,8 +76,9 @@ pub trait SystemApi<Hash, Number> {
 
 	/// Returns currently connected peers
 	#[rpc(name = "system_peers", returns = "Vec<PeerInfo<Hash, Number>>")]
-	fn system_peers(&self)
-		-> Compat<BoxFuture<'static, jsonrpc_core::Result<Vec<PeerInfo<Hash, Number>>>>>;
+	fn system_peers(
+		&self,
+	) -> Compat<BoxFuture<'static, jsonrpc_core::Result<Vec<PeerInfo<Hash, Number>>>>>;
 
 	/// Returns current state of the network.
 	///
@@ -84,8 +87,9 @@ pub trait SystemApi<Hash, Number> {
 	// TODO: the future of this call is uncertain: https://github.com/paritytech/substrate/issues/1890
 	// https://github.com/paritytech/substrate/issues/5541
 	#[rpc(name = "system_unstable_networkState", returns = "jsonrpc_core::Value")]
-	fn system_network_state(&self)
-		-> Compat<BoxFuture<'static, jsonrpc_core::Result<jsonrpc_core::Value>>>;
+	fn system_network_state(
+		&self,
+	) -> Compat<BoxFuture<'static, jsonrpc_core::Result<jsonrpc_core::Value>>>;
 
 	/// Adds a reserved peer. Returns the empty string or an error. The string
 	/// parameter should encode a `p2p` multiaddr.
@@ -93,14 +97,18 @@ pub trait SystemApi<Hash, Number> {
 	/// `/ip4/198.51.100.19/tcp/30333/p2p/QmSk5HQbn6LhUwDiNMseVUjuRYhEtYj4aUZ6WfWoGURpdV`
 	/// is an example of a valid, passing multiaddr with PeerId attached.
 	#[rpc(name = "system_addReservedPeer", returns = "()")]
-	fn system_add_reserved_peer(&self, peer: String)
-		-> Compat<BoxFuture<'static, Result<(), jsonrpc_core::Error>>>;
+	fn system_add_reserved_peer(
+		&self,
+		peer: String,
+	) -> Compat<BoxFuture<'static, Result<(), jsonrpc_core::Error>>>;
 
 	/// Remove a reserved peer. Returns the empty string or an error. The string
 	/// should encode only the PeerId e.g. `QmSk5HQbn6LhUwDiNMseVUjuRYhEtYj4aUZ6WfWoGURpdV`.
 	#[rpc(name = "system_removeReservedPeer", returns = "()")]
-	fn system_remove_reserved_peer(&self, peer_id: String)
-		-> Compat<BoxFuture<'static, Result<(), jsonrpc_core::Error>>>;
+	fn system_remove_reserved_peer(
+		&self,
+		peer_id: String,
+	) -> Compat<BoxFuture<'static, Result<(), jsonrpc_core::Error>>>;
 
 	/// Returns the list of reserved peers
 	#[rpc(name = "system_reservedPeers", returns = "Vec<String>")]
@@ -121,11 +129,9 @@ pub trait SystemApi<Hash, Number> {
 	///
 	/// `sync=debug,state=trace`
 	#[rpc(name = "system_addLogFilter", returns = "()")]
-	fn system_add_log_filter(&self, directives: String)
-		-> Result<(), jsonrpc_core::Error>;
+	fn system_add_log_filter(&self, directives: String) -> Result<(), jsonrpc_core::Error>;
 
 	/// Resets the log filter to Substrate defaults
 	#[rpc(name = "system_resetLogFilter", returns = "()")]
-	fn system_reset_log_filter(&self)
-		-> Result<(), jsonrpc_core::Error>;
+	fn system_reset_log_filter(&self) -> Result<(), jsonrpc_core::Error>;
 }
diff --git a/client/rpc-servers/src/lib.rs b/client/rpc-servers/src/lib.rs
index c93451e5cc67..7f14cee39f20 100644
--- a/client/rpc-servers/src/lib.rs
+++ b/client/rpc-servers/src/lib.rs
@@ -22,10 +22,10 @@
 
 mod middleware;
 
-use std::io;
 use jsonrpc_core::{IoHandlerExtension, MetaIoHandler};
 use log::error;
 use pubsub::PubSubMetadata;
+use std::io;
 
 const MEGABYTE: usize = 1024 * 1024;
 
@@ -42,7 +42,7 @@ const HTTP_THREADS: usize = 4;
 pub type RpcHandler<T> = pubsub::PubSubHandler<T, RpcMiddleware>;
 
 pub use self::inner::*;
-pub use middleware::{RpcMiddleware, RpcMetrics};
+pub use middleware::{RpcMetrics, RpcMiddleware};
 
 /// Construct rpc `IoHandler`
 pub fn rpc_handler<M: PubSubMetadata>(
@@ -60,10 +60,12 @@ pub fn rpc_handler<M: PubSubMetadata>(
 		let methods = serde_json::to_value(&methods)
 			.expect("Serialization of Vec<String> is infallible; qed");
 
-		move |_| Ok(serde_json::json!({
-			"version": 1,
-			"methods": methods.clone(),
-		}))
+		move |_| {
+			Ok(serde_json::json!({
+				"version": 1,
+				"methods": methods.clone(),
+			}))
+		}
 	});
 	io
 }
@@ -89,17 +91,14 @@ mod inner {
 		io: RpcHandler<M>,
 		maybe_max_payload_mb: Option<usize>,
 	) -> io::Result<http::Server> {
-		let max_request_body_size = maybe_max_payload_mb.map(|mb| mb.saturating_mul(MEGABYTE))
+		let max_request_body_size = maybe_max_payload_mb
+			.map(|mb| mb.saturating_mul(MEGABYTE))
 			.unwrap_or(RPC_MAX_PAYLOAD_DEFAULT);
 		http::ServerBuilder::new(io)
 			.threads(thread_pool_size.unwrap_or(HTTP_THREADS))
 			.health_api(("/health", "system_health"))
 			.allowed_hosts(hosts_filtering(cors.is_some()))
-			.rest_api(if cors.is_some() {
-				http::RestApi::Secure
-			} else {
-				http::RestApi::Unsecure
-			})
+			.rest_api(if cors.is_some() { http::RestApi::Secure } else { http::RestApi::Unsecure })
 			.cors(map_cors::<http::AccessControlAllowOrigin>(cors))
 			.max_request_body_size(max_request_body_size)
 			.start_http(addr)
@@ -134,28 +133,32 @@ mod inner {
 		io: RpcHandler<M>,
 		maybe_max_payload_mb: Option<usize>,
 	) -> io::Result<ws::Server> {
-		let rpc_max_payload = maybe_max_payload_mb.map(|mb| mb.saturating_mul(MEGABYTE))
+		let rpc_max_payload = maybe_max_payload_mb
+			.map(|mb| mb.saturating_mul(MEGABYTE))
 			.unwrap_or(RPC_MAX_PAYLOAD_DEFAULT);
-		ws::ServerBuilder::with_meta_extractor(io, |context: &ws::RequestContext| context.sender().into())
-			.max_payload(rpc_max_payload)
-			.max_connections(max_connections.unwrap_or(WS_MAX_CONNECTIONS))
-			.allowed_origins(map_cors(cors))
-			.allowed_hosts(hosts_filtering(cors.is_some()))
-			.start(addr)
-			.map_err(|err| match err {
-				ws::Error::Io(io) => io,
-				ws::Error::ConnectionClosed => io::ErrorKind::BrokenPipe.into(),
-				e => {
-					error!("{}", e);
-					io::ErrorKind::Other.into()
-				}
-			})
+		ws::ServerBuilder::with_meta_extractor(io, |context: &ws::RequestContext| {
+			context.sender().into()
+		})
+		.max_payload(rpc_max_payload)
+		.max_connections(max_connections.unwrap_or(WS_MAX_CONNECTIONS))
+		.allowed_origins(map_cors(cors))
+		.allowed_hosts(hosts_filtering(cors.is_some()))
+		.start(addr)
+		.map_err(|err| match err {
+			ws::Error::Io(io) => io,
+			ws::Error::ConnectionClosed => io::ErrorKind::BrokenPipe.into(),
+			e => {
+				error!("{}", e);
+				io::ErrorKind::Other.into()
+			},
+		})
 	}
 
 	fn map_cors<T: for<'a> From<&'a str>>(
-		cors: Option<&Vec<String>>
+		cors: Option<&Vec<String>>,
 	) -> http::DomainsValidation<T> {
-		cors.map(|x| x.iter().map(AsRef::as_ref).map(Into::into).collect::<Vec<_>>()).into()
+		cors.map(|x| x.iter().map(AsRef::as_ref).map(Into::into).collect::<Vec<_>>())
+			.into()
 	}
 
 	fn hosts_filtering(enable: bool) -> http::DomainsValidation<http::Host> {
@@ -171,5 +174,4 @@ mod inner {
 }
 
 #[cfg(target_os = "unknown")]
-mod inner {
-}
+mod inner {}
diff --git a/client/rpc-servers/src/middleware.rs b/client/rpc-servers/src/middleware.rs
index 2cbc61716c31..d87c653e2b25 100644
--- a/client/rpc-servers/src/middleware.rs
+++ b/client/rpc-servers/src/middleware.rs
@@ -19,13 +19,9 @@
 //! Middleware for RPC requests.
 
 use jsonrpc_core::{
-	Middleware as RequestMiddleware, Metadata,
-	Request, Response, FutureResponse, FutureOutput
-};
-use prometheus_endpoint::{
-	Registry, CounterVec, PrometheusError,
-	Opts, register, U64
+	FutureOutput, FutureResponse, Metadata, Middleware as RequestMiddleware, Request, Response,
 };
+use prometheus_endpoint::{register, CounterVec, Opts, PrometheusError, Registry, U64};
 
 use futures::{future::Either, Future};
 
@@ -39,18 +35,17 @@ impl RpcMetrics {
 	/// Create an instance of metrics
 	pub fn new(metrics_registry: Option<&Registry>) -> Result<Self, PrometheusError> {
 		Ok(Self {
-			rpc_calls: metrics_registry.map(|r|
-				register(
-					CounterVec::new(
-						Opts::new(
-							"rpc_calls_total",
-							"Number of rpc calls received",
-						),
-						&["protocol"]
-					)?,
-					r,
-				)
-			).transpose()?,
+			rpc_calls: metrics_registry
+				.map(|r| {
+					register(
+						CounterVec::new(
+							Opts::new("rpc_calls_total", "Number of rpc calls received"),
+							&["protocol"],
+						)?,
+						r,
+					)
+				})
+				.transpose()?,
 		})
 	}
 }
@@ -67,10 +62,7 @@ impl RpcMiddleware {
 	/// - `metrics`: Will be used to report statistics.
 	/// - `transport_label`: The label that is used when reporting the statistics.
 	pub fn new(metrics: RpcMetrics, transport_label: &str) -> Self {
-		RpcMiddleware {
-			metrics,
-			transport_label: String::from(transport_label),
-		}
+		RpcMiddleware { metrics, transport_label: String::from(transport_label) }
 	}
 }
 
diff --git a/client/rpc/src/author/mod.rs b/client/rpc/src/author/mod.rs
index ed7899d52480..966959050c17 100644
--- a/client/rpc/src/author/mod.rs
+++ b/client/rpc/src/author/mod.rs
@@ -21,30 +21,33 @@
 #[cfg(test)]
 mod tests;
 
-use std::{sync::Arc, convert::TryInto};
 use log::warn;
+use std::{convert::TryInto, sync::Arc};
 
 use sp_blockchain::HeaderBackend;
 
-use rpc::futures::{Sink, Future, future::result};
-use futures::{StreamExt as _, compat::Compat};
-use futures::future::{ready, FutureExt, TryFutureExt};
+use codec::{Decode, Encode};
+use futures::{
+	compat::Compat,
+	future::{ready, FutureExt, TryFutureExt},
+	StreamExt as _,
+};
+use jsonrpc_pubsub::{manager::SubscriptionManager, typed::Subscriber, SubscriptionId};
+use rpc::futures::{future::result, Future, Sink};
 use sc_rpc_api::DenyUnsafe;
-use jsonrpc_pubsub::{typed::Subscriber, SubscriptionId, manager::SubscriptionManager};
-use codec::{Encode, Decode};
-use sp_core::Bytes;
-use sp_keystore::{SyncCryptoStorePtr, SyncCryptoStore};
-use sp_api::ProvideRuntimeApi;
-use sp_runtime::generic;
 use sc_transaction_pool_api::{
-	TransactionPool, InPoolTransaction, TransactionStatus, TransactionSource,
-	BlockHash, TxHash, TransactionFor, error::IntoPoolError,
+	error::IntoPoolError, BlockHash, InPoolTransaction, TransactionFor, TransactionPool,
+	TransactionSource, TransactionStatus, TxHash,
 };
+use sp_api::ProvideRuntimeApi;
+use sp_core::Bytes;
+use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr};
+use sp_runtime::generic;
 use sp_session::SessionKeys;
 
+use self::error::{Error, FutureResult, Result};
 /// Re-export the API for backward compatibility.
 pub use sc_rpc_api::author::*;
-use self::error::{Error, FutureResult, Result};
 
 /// Authoring API
 pub struct Author<P, Client> {
@@ -69,13 +72,7 @@ impl<P, Client> Author<P, Client> {
 		keystore: SyncCryptoStorePtr,
 		deny_unsafe: DenyUnsafe,
 	) -> Self {
-		Author {
-			client,
-			pool,
-			subscriptions,
-			keystore,
-			deny_unsafe,
-		}
+		Author { client, pool, subscriptions, keystore, deny_unsafe }
 	}
 }
 
@@ -87,19 +84,14 @@ impl<P, Client> Author<P, Client> {
 const TX_SOURCE: TransactionSource = TransactionSource::External;
 
 impl<P, Client> AuthorApi<TxHash<P>, BlockHash<P>> for Author<P, Client>
-	where
-		P: TransactionPool + Sync + Send + 'static,
-		Client: HeaderBackend<P::Block> + ProvideRuntimeApi<P::Block> + Send + Sync + 'static,
-		Client::Api: SessionKeys<P::Block>,
+where
+	P: TransactionPool + Sync + Send + 'static,
+	Client: HeaderBackend<P::Block> + ProvideRuntimeApi<P::Block> + Send + Sync + 'static,
+	Client::Api: SessionKeys<P::Block>,
 {
 	type Metadata = crate::Metadata;
 
-	fn insert_key(
-		&self,
-		key_type: String,
-		suri: String,
-		public: Bytes,
-	) -> Result<()> {
+	fn insert_key(&self, key_type: String, suri: String, public: Bytes) -> Result<()> {
 		self.deny_unsafe.check_if_safe()?;
 
 		let key_type = key_type.as_str().try_into().map_err(|_| Error::BadKeyType)?;
@@ -112,20 +104,22 @@ impl<P, Client> AuthorApi<TxHash<P>, BlockHash<P>> for Author<P, Client>
 		self.deny_unsafe.check_if_safe()?;
 
 		let best_block_hash = self.client.info().best_hash;
-		self.client.runtime_api().generate_session_keys(
-			&generic::BlockId::Hash(best_block_hash),
-			None,
-		).map(Into::into).map_err(|e| Error::Client(Box::new(e)))
+		self.client
+			.runtime_api()
+			.generate_session_keys(&generic::BlockId::Hash(best_block_hash), None)
+			.map(Into::into)
+			.map_err(|e| Error::Client(Box::new(e)))
 	}
 
 	fn has_session_keys(&self, session_keys: Bytes) -> Result<bool> {
 		self.deny_unsafe.check_if_safe()?;
 
 		let best_block_hash = self.client.info().best_hash;
-		let keys = self.client.runtime_api().decode_session_keys(
-			&generic::BlockId::Hash(best_block_hash),
-			session_keys.to_vec(),
-		).map_err(|e| Error::Client(Box::new(e)))?
+		let keys = self
+			.client
+			.runtime_api()
+			.decode_session_keys(&generic::BlockId::Hash(best_block_hash), session_keys.to_vec())
+			.map_err(|e| Error::Client(Box::new(e)))?
 			.ok_or_else(|| Error::InvalidSessionKeys)?;
 
 		Ok(SyncCryptoStore::has_keys(&*self.keystore, &keys))
@@ -144,12 +138,15 @@ impl<P, Client> AuthorApi<TxHash<P>, BlockHash<P>> for Author<P, Client>
 			Err(err) => return Box::new(result(Err(err.into()))),
 		};
 		let best_block_hash = self.client.info().best_hash;
-		Box::new(self.pool
-			.submit_one(&generic::BlockId::hash(best_block_hash), TX_SOURCE, xt)
-			.compat()
-			.map_err(|e| e.into_pool_error()
-				.map(Into::into)
-				.unwrap_or_else(|e| error::Error::Verification(Box::new(e)).into()))
+		Box::new(
+			self.pool
+				.submit_one(&generic::BlockId::hash(best_block_hash), TX_SOURCE, xt)
+				.compat()
+				.map_err(|e| {
+					e.into_pool_error()
+						.map(Into::into)
+						.unwrap_or_else(|e| error::Error::Verification(Box::new(e)).into())
+				}),
 		)
 	}
 
@@ -163,7 +160,8 @@ impl<P, Client> AuthorApi<TxHash<P>, BlockHash<P>> for Author<P, Client>
 	) -> Result<Vec<TxHash<P>>> {
 		self.deny_unsafe.check_if_safe()?;
 
-		let hashes = bytes_or_hash.into_iter()
+		let hashes = bytes_or_hash
+			.into_iter()
 			.map(|x| match x {
 				hash::ExtrinsicOrHash::Hash(h) => Ok(h),
 				hash::ExtrinsicOrHash::Extrinsic(bytes) => {
@@ -173,32 +171,31 @@ impl<P, Client> AuthorApi<TxHash<P>, BlockHash<P>> for Author<P, Client>
 			})
 			.collect::<Result<Vec<_>>>()?;
 
-		Ok(
-			self.pool
-				.remove_invalid(&hashes)
-				.into_iter()
-				.map(|tx| tx.hash().clone())
-				.collect()
-		)
+		Ok(self
+			.pool
+			.remove_invalid(&hashes)
+			.into_iter()
+			.map(|tx| tx.hash().clone())
+			.collect())
 	}
 
-	fn watch_extrinsic(&self,
+	fn watch_extrinsic(
+		&self,
 		_metadata: Self::Metadata,
 		subscriber: Subscriber<TransactionStatus<TxHash<P>, BlockHash<P>>>,
 		xt: Bytes,
 	) {
 		let submit = || -> Result<_> {
 			let best_block_hash = self.client.info().best_hash;
-			let dxt = TransactionFor::<P>::decode(&mut &xt[..])
-				.map_err(error::Error::from)?;
-			Ok(
-				self.pool
-					.submit_and_watch(&generic::BlockId::hash(best_block_hash), TX_SOURCE, dxt)
-					.map_err(|e| e.into_pool_error()
+			let dxt = TransactionFor::<P>::decode(&mut &xt[..]).map_err(error::Error::from)?;
+			Ok(self
+				.pool
+				.submit_and_watch(&generic::BlockId::hash(best_block_hash), TX_SOURCE, dxt)
+				.map_err(|e| {
+					e.into_pool_error()
 						.map(error::Error::from)
 						.unwrap_or_else(|e| error::Error::Verification(Box::new(e)).into())
-					)
-			)
+				}))
 		};
 
 		let subscriptions = self.subscriptions.clone();
@@ -211,8 +208,7 @@ impl<P, Client> AuthorApi<TxHash<P>, BlockHash<P>> for Author<P, Client>
 			.map(move |result| match result {
 				Ok(watcher) => {
 					subscriptions.add(subscriber, move |sink| {
-						sink
-							.sink_map_err(|e| log::debug!("Subscription sink failed: {:?}", e))
+						sink.sink_map_err(|e| log::debug!("Subscription sink failed: {:?}", e))
 							.send_all(Compat::new(watcher))
 							.map(|_| ())
 					});
@@ -224,14 +220,20 @@ impl<P, Client> AuthorApi<TxHash<P>, BlockHash<P>> for Author<P, Client>
 				},
 			});
 
-		let res = self.subscriptions.executor()
+		let res = self
+			.subscriptions
+			.executor()
 			.execute(Box::new(Compat::new(future.map(|_| Ok(())))));
 		if res.is_err() {
 			warn!("Error spawning subscription RPC task.");
 		}
 	}
 
-	fn unwatch_extrinsic(&self, _metadata: Option<Self::Metadata>, id: SubscriptionId) -> Result<bool> {
+	fn unwatch_extrinsic(
+		&self,
+		_metadata: Option<Self::Metadata>,
+		id: SubscriptionId,
+	) -> Result<bool> {
 		Ok(self.subscriptions.cancel(id))
 	}
 }
diff --git a/client/rpc/src/author/tests.rs b/client/rpc/src/author/tests.rs
index 0e7cb5539501..9da6ff8d13f6 100644
--- a/client/rpc/src/author/tests.rs
+++ b/client/rpc/src/author/tests.rs
@@ -18,37 +18,35 @@
 
 use super::*;
 
-use std::{mem, sync::Arc};
 use assert_matches::assert_matches;
 use codec::Encode;
+use futures::{compat::Future01CompatExt, executor};
+use rpc::futures::Stream as _;
+use sc_transaction_pool::{BasicPool, FullChainApi};
 use sp_core::{
-	ed25519, sr25519,
-	H256, blake2_256, hexdisplay::HexDisplay, testing::{ED25519, SR25519},
+	blake2_256,
 	crypto::{CryptoTypePublicPair, Pair, Public},
+	ed25519,
+	hexdisplay::HexDisplay,
+	sr25519,
+	testing::{ED25519, SR25519},
+	H256,
 };
 use sp_keystore::testing::KeyStore;
-use rpc::futures::Stream as _;
+use std::{mem, sync::Arc};
 use substrate_test_runtime_client::{
-	self, AccountKeyring, runtime::{Extrinsic, Transfer, SessionKeys, Block},
-	DefaultTestClientBuilderExt, TestClientBuilderExt, Backend, Client,
+	self,
+	runtime::{Block, Extrinsic, SessionKeys, Transfer},
+	AccountKeyring, Backend, Client, DefaultTestClientBuilderExt, TestClientBuilderExt,
 };
-use sc_transaction_pool::{BasicPool, FullChainApi};
-use futures::{executor, compat::Future01CompatExt};
 
 fn uxt(sender: AccountKeyring, nonce: u64) -> Extrinsic {
-	let tx = Transfer {
-		amount: Default::default(),
-		nonce,
-		from: sender.into(),
-		to: Default::default(),
-	};
+	let tx =
+		Transfer { amount: Default::default(), nonce, from: sender.into(), to: Default::default() };
 	tx.into_signed_tx()
 }
 
-type FullTransactionPool = BasicPool<
-	FullChainApi<Client<Backend>, Block>,
-	Block,
->;
+type FullTransactionPool = BasicPool<FullChainApi<Client<Backend>, Block>, Block>;
 
 struct TestSetup {
 	pub client: Arc<Client<Backend>>,
@@ -63,18 +61,9 @@ impl Default for TestSetup {
 		let client = Arc::new(client_builder.set_keystore(keystore.clone()).build());
 
 		let spawner = sp_core::testing::TaskExecutor::new();
-		let pool = BasicPool::new_full(
-			Default::default(),
-			true.into(),
-			None,
-			spawner,
-			client.clone(),
-		);
-		TestSetup {
-			client,
-			keystore,
-			pool,
-		}
+		let pool =
+			BasicPool::new_full(Default::default(), true.into(), None, spawner, client.clone());
+		TestSetup { client, keystore, pool }
 	}
 }
 
@@ -100,9 +89,7 @@ fn submit_transaction_should_not_cause_error() {
 		AuthorApi::submit_extrinsic(&p, xt.clone().into()).wait(),
 		Ok(h2) if h == h2
 	);
-	assert!(
-		AuthorApi::submit_extrinsic(&p, xt.into()).wait().is_err()
-	);
+	assert!(AuthorApi::submit_extrinsic(&p, xt.into()).wait().is_err());
 }
 
 #[test]
@@ -115,14 +102,12 @@ fn submit_rich_transaction_should_not_cause_error() {
 		AuthorApi::submit_extrinsic(&p, xt.clone().into()).wait(),
 		Ok(h2) if h == h2
 	);
-	assert!(
-		AuthorApi::submit_extrinsic(&p, xt.into()).wait().is_err()
-	);
+	assert!(AuthorApi::submit_extrinsic(&p, xt.into()).wait().is_err());
 }
 
 #[test]
 fn should_watch_extrinsic() {
-	//given
+	// given
 	let setup = TestSetup::default();
 	let p = setup.author();
 
@@ -175,14 +160,18 @@ fn should_watch_extrinsic() {
 
 #[test]
 fn should_return_watch_validation_error() {
-	//given
+	// given
 	let setup = TestSetup::default();
 	let p = setup.author();
 
 	let (subscriber, id_rx, _data) = jsonrpc_pubsub::typed::Subscriber::new_test("test");
 
 	// when
-	p.watch_extrinsic(Default::default(), subscriber, uxt(AccountKeyring::Alice, 179).encode().into());
+	p.watch_extrinsic(
+		Default::default(),
+		subscriber,
+		uxt(AccountKeyring::Alice, 179).encode().into(),
+	);
 
 	// then
 	let res = executor::block_on(id_rx.compat()).unwrap();
@@ -215,11 +204,13 @@ fn should_remove_extrinsics() {
 	assert_eq!(setup.pool.status().ready, 3);
 
 	// now remove all 3
-	let removed = p.remove_extrinsic(vec![
-		hash::ExtrinsicOrHash::Hash(hash3),
-		// Removing this one will also remove ex2
-		hash::ExtrinsicOrHash::Extrinsic(ex1.encode().into()),
-	]).unwrap();
+	let removed = p
+		.remove_extrinsic(vec![
+			hash::ExtrinsicOrHash::Hash(hash3),
+			// Removing this one will also remove ex2
+			hash::ExtrinsicOrHash::Extrinsic(ex1.encode().into()),
+		])
+		.unwrap();
 
 	assert_eq!(removed.len(), 3);
 }
@@ -235,11 +226,13 @@ fn should_insert_key() {
 		String::from_utf8(ED25519.0.to_vec()).expect("Keytype is a valid string"),
 		suri.to_string(),
 		key_pair.public().0.to_vec().into(),
-	).expect("Insert key");
+	)
+	.expect("Insert key");
 
 	let public_keys = SyncCryptoStore::keys(&*setup.keystore, ED25519).unwrap();
 
-	assert!(public_keys.contains(&CryptoTypePublicPair(ed25519::CRYPTO_ID, key_pair.public().to_raw_vec())));
+	assert!(public_keys
+		.contains(&CryptoTypePublicPair(ed25519::CRYPTO_ID, key_pair.public().to_raw_vec())));
 }
 
 #[test]
@@ -249,14 +242,16 @@ fn should_rotate_keys() {
 
 	let new_public_keys = p.rotate_keys().expect("Rotates the keys");
 
-	let session_keys = SessionKeys::decode(&mut &new_public_keys[..])
-		.expect("SessionKeys decode successfully");
+	let session_keys =
+		SessionKeys::decode(&mut &new_public_keys[..]).expect("SessionKeys decode successfully");
 
 	let ed25519_public_keys = SyncCryptoStore::keys(&*setup.keystore, ED25519).unwrap();
 	let sr25519_public_keys = SyncCryptoStore::keys(&*setup.keystore, SR25519).unwrap();
 
-	assert!(ed25519_public_keys.contains(&CryptoTypePublicPair(ed25519::CRYPTO_ID, session_keys.ed25519.to_raw_vec())));
-	assert!(sr25519_public_keys.contains(&CryptoTypePublicPair(sr25519::CRYPTO_ID, session_keys.sr25519.to_raw_vec())));
+	assert!(ed25519_public_keys
+		.contains(&CryptoTypePublicPair(ed25519::CRYPTO_ID, session_keys.ed25519.to_raw_vec())));
+	assert!(sr25519_public_keys
+		.contains(&CryptoTypePublicPair(sr25519::CRYPTO_ID, session_keys.sr25519.to_raw_vec())));
 }
 
 #[test]
@@ -264,10 +259,8 @@ fn test_has_session_keys() {
 	let setup = TestSetup::default();
 	let p = setup.author();
 
-	let non_existent_public_keys = TestSetup::default()
-		.author()
-		.rotate_keys()
-		.expect("Rotates the keys");
+	let non_existent_public_keys =
+		TestSetup::default().author().rotate_keys().expect("Rotates the keys");
 
 	let public_keys = p.rotate_keys().expect("Rotates the keys");
 	let test_vectors = vec![
@@ -295,7 +288,8 @@ fn test_has_key() {
 		String::from_utf8(ED25519.0.to_vec()).expect("Keytype is a valid string"),
 		suri.to_string(),
 		alice_key_pair.public().0.to_vec().into(),
-	).expect("Insert key");
+	)
+	.expect("Insert key");
 	let bob_key_pair = ed25519::Pair::from_string("//Bob", None).expect("Generates keypair");
 
 	let test_vectors = vec![
@@ -310,7 +304,8 @@ fn test_has_key() {
 			p.has_key(
 				key,
 				String::from_utf8(key_type.0.to_vec()).expect("Keytype is a valid string"),
-			).map_err(|e| mem::discriminant(&e)),
+			)
+			.map_err(|e| mem::discriminant(&e)),
 		);
 	}
 }
diff --git a/client/rpc/src/chain/chain_full.rs b/client/rpc/src/chain/chain_full.rs
index 9687b13d50fc..8d0f622d1e7a 100644
--- a/client/rpc/src/chain/chain_full.rs
+++ b/client/rpc/src/chain/chain_full.rs
@@ -18,16 +18,19 @@
 
 //! Blockchain API backend for full nodes.
 
-use std::sync::Arc;
-use rpc::futures::future::result;
 use jsonrpc_pubsub::manager::SubscriptionManager;
+use rpc::futures::future::result;
+use std::sync::Arc;
 
-use sc_client_api::{BlockchainEvents, BlockBackend};
-use sp_runtime::{generic::{BlockId, SignedBlock}, traits::{Block as BlockT}};
+use sc_client_api::{BlockBackend, BlockchainEvents};
+use sp_runtime::{
+	generic::{BlockId, SignedBlock},
+	traits::Block as BlockT,
+};
 
-use super::{ChainBackend, client_err, error::FutureResult};
-use std::marker::PhantomData;
+use super::{client_err, error::FutureResult, ChainBackend};
 use sp_blockchain::HeaderBackend;
+use std::marker::PhantomData;
 
 /// Blockchain API backend for full nodes. Reads all the data from local database.
 pub struct FullChain<Block: BlockT, Client> {
@@ -42,15 +45,12 @@ pub struct FullChain<Block: BlockT, Client> {
 impl<Block: BlockT, Client> FullChain<Block, Client> {
 	/// Create new Chain API RPC handler.
 	pub fn new(client: Arc<Client>, subscriptions: SubscriptionManager) -> Self {
-		Self {
-			client,
-			subscriptions,
-			_phantom: PhantomData,
-		}
+		Self { client, subscriptions, _phantom: PhantomData }
 	}
 }
 
-impl<Block, Client> ChainBackend<Client, Block> for FullChain<Block, Client> where
+impl<Block, Client> ChainBackend<Client, Block> for FullChain<Block, Client>
+where
 	Block: BlockT + 'static,
 	Client: BlockBackend<Block> + HeaderBackend<Block> + BlockchainEvents<Block> + 'static,
 {
@@ -63,18 +63,14 @@ impl<Block, Client> ChainBackend<Client, Block> for FullChain<Block, Client> whe
 	}
 
 	fn header(&self, hash: Option<Block::Hash>) -> FutureResult<Option<Block::Header>> {
-		Box::new(result(self.client
-			.header(BlockId::Hash(self.unwrap_or_best(hash)))
-			.map_err(client_err)
+		Box::new(result(
+			self.client.header(BlockId::Hash(self.unwrap_or_best(hash))).map_err(client_err),
 		))
 	}
 
-	fn block(&self, hash: Option<Block::Hash>)
-		-> FutureResult<Option<SignedBlock<Block>>>
-	{
-		Box::new(result(self.client
-			.block(&BlockId::Hash(self.unwrap_or_best(hash)))
-			.map_err(client_err)
+	fn block(&self, hash: Option<Block::Hash>) -> FutureResult<Option<SignedBlock<Block>>> {
+		Box::new(result(
+			self.client.block(&BlockId::Hash(self.unwrap_or_best(hash))).map_err(client_err),
 		))
 	}
 }
diff --git a/client/rpc/src/chain/chain_light.rs b/client/rpc/src/chain/chain_light.rs
index a3f3db9b7116..ebca664c0f23 100644
--- a/client/rpc/src/chain/chain_light.rs
+++ b/client/rpc/src/chain/chain_light.rs
@@ -18,20 +18,20 @@
 
 //! Blockchain API backend for light nodes.
 
-use std::sync::Arc;
 use futures::{future::ready, FutureExt, TryFutureExt};
-use rpc::futures::future::{result, Future, Either};
 use jsonrpc_pubsub::manager::SubscriptionManager;
+use rpc::futures::future::{result, Either, Future};
+use std::sync::Arc;
 
-use sc_client_api::light::{Fetcher, RemoteBodyRequest, RemoteBlockchain};
+use sc_client_api::light::{Fetcher, RemoteBlockchain, RemoteBodyRequest};
 use sp_runtime::{
 	generic::{BlockId, SignedBlock},
-	traits::{Block as BlockT},
+	traits::Block as BlockT,
 };
 
-use super::{ChainBackend, client_err, error::FutureResult};
-use sp_blockchain::HeaderBackend;
+use super::{client_err, error::FutureResult, ChainBackend};
 use sc_client_api::BlockchainEvents;
+use sp_blockchain::HeaderBackend;
 
 /// Blockchain API backend for light nodes. Reads all the data from local
 /// database, if available, or fetches it from remote node otherwise.
@@ -54,16 +54,12 @@ impl<Block: BlockT, Client, F: Fetcher<Block>> LightChain<Block, Client, F> {
 		remote_blockchain: Arc<dyn RemoteBlockchain<Block>>,
 		fetcher: Arc<F>,
 	) -> Self {
-		Self {
-			client,
-			subscriptions,
-			remote_blockchain,
-			fetcher,
-		}
+		Self { client, subscriptions, remote_blockchain, fetcher }
 	}
 }
 
-impl<Block, Client, F> ChainBackend<Client, Block> for LightChain<Block, Client, F> where
+impl<Block, Client, F> ChainBackend<Client, Block> for LightChain<Block, Client, F>
+where
 	Block: BlockT + 'static,
 	Client: BlockchainEvents<Block> + HeaderBackend<Block> + Send + Sync + 'static,
 	F: Fetcher<Block> + Send + Sync + 'static,
@@ -86,32 +82,32 @@ impl<Block, Client, F> ChainBackend<Client, Block> for LightChain<Block, Client,
 			BlockId::Hash(hash),
 		);
 
-		Box::new(maybe_header.then(move |result|
-			ready(result.map_err(client_err)),
-		).boxed().compat())
+		Box::new(
+			maybe_header
+				.then(move |result| ready(result.map_err(client_err)))
+				.boxed()
+				.compat(),
+		)
 	}
 
-	fn block(&self, hash: Option<Block::Hash>)
-		-> FutureResult<Option<SignedBlock<Block>>>
-	{
+	fn block(&self, hash: Option<Block::Hash>) -> FutureResult<Option<SignedBlock<Block>>> {
 		let fetcher = self.fetcher.clone();
-		let block = self.header(hash)
-			.and_then(move |header| match header {
-				Some(header) => Either::A(fetcher
+		let block = self.header(hash).and_then(move |header| match header {
+			Some(header) => Either::A(
+				fetcher
 					.remote_body(RemoteBodyRequest {
 						header: header.clone(),
 						retry_count: Default::default(),
 					})
 					.boxed()
 					.compat()
-					.map(move |body| Some(SignedBlock {
-						block: Block::new(header, body),
-						justifications: None,
-					}))
-					.map_err(client_err)
-				),
-				None => Either::B(result(Ok(None))),
-			});
+					.map(move |body| {
+						Some(SignedBlock { block: Block::new(header, body), justifications: None })
+					})
+					.map_err(client_err),
+			),
+			None => Either::B(result(Ok(None))),
+		});
 
 		Box::new(block)
 	}
diff --git a/client/rpc/src/chain/mod.rs b/client/rpc/src/chain/mod.rs
index 1380927bca2f..f78188249f6f 100644
--- a/client/rpc/src/chain/mod.rs
+++ b/client/rpc/src/chain/mod.rs
@@ -24,33 +24,36 @@ mod chain_light;
 #[cfg(test)]
 mod tests;
 
-use std::sync::Arc;
 use futures::{future, StreamExt, TryStreamExt};
 use log::warn;
 use rpc::{
-	Result as RpcResult,
 	futures::{stream, Future, Sink, Stream},
+	Result as RpcResult,
 };
+use std::sync::Arc;
 
-use sc_client_api::{BlockchainEvents, light::{Fetcher, RemoteBlockchain}};
-use jsonrpc_pubsub::{typed::Subscriber, SubscriptionId, manager::SubscriptionManager};
-use sp_rpc::{number::NumberOrHex, list::ListOrValue};
+use jsonrpc_pubsub::{manager::SubscriptionManager, typed::Subscriber, SubscriptionId};
+use sc_client_api::{
+	light::{Fetcher, RemoteBlockchain},
+	BlockchainEvents,
+};
+use sp_rpc::{list::ListOrValue, number::NumberOrHex};
 use sp_runtime::{
 	generic::{BlockId, SignedBlock},
 	traits::{Block as BlockT, Header, NumberFor},
 };
 
-use self::error::{Result, Error, FutureResult};
+use self::error::{Error, FutureResult, Result};
 
+use sc_client_api::BlockBackend;
 pub use sc_rpc_api::chain::*;
 use sp_blockchain::HeaderBackend;
-use sc_client_api::BlockBackend;
 
 /// Blockchain backend API
 trait ChainBackend<Client, Block: BlockT>: Send + Sync + 'static
-	where
-		Block: BlockT + 'static,
-		Client: HeaderBackend<Block> + BlockchainEvents<Block> + 'static,
+where
+	Block: BlockT + 'static,
+	Client: HeaderBackend<Block> + BlockchainEvents<Block> + 'static,
 {
 	/// Get client reference.
 	fn client(&self) -> &Arc<Client>;
@@ -94,7 +97,7 @@ trait ChainBackend<Client, Block: BlockT>: Send + Sync + 'static
 					.header(BlockId::number(block_num))
 					.map_err(client_err)?
 					.map(|h| h.hash()))
-			}
+			},
 		}
 	}
 
@@ -114,9 +117,12 @@ trait ChainBackend<Client, Block: BlockT>: Send + Sync + 'static
 			self.subscriptions(),
 			subscriber,
 			|| self.client().info().best_hash,
-			|| self.client().import_notification_stream()
-				.map(|notification| Ok::<_, ()>(notification.header))
-				.compat(),
+			|| {
+				self.client()
+					.import_notification_stream()
+					.map(|notification| Ok::<_, ()>(notification.header))
+					.compat()
+			},
 		)
 	}
 
@@ -140,10 +146,13 @@ trait ChainBackend<Client, Block: BlockT>: Send + Sync + 'static
 			self.subscriptions(),
 			subscriber,
 			|| self.client().info().best_hash,
-			|| self.client().import_notification_stream()
-				.filter(|notification| future::ready(notification.is_new_best))
-				.map(|notification| Ok::<_, ()>(notification.header))
-				.compat(),
+			|| {
+				self.client()
+					.import_notification_stream()
+					.filter(|notification| future::ready(notification.is_new_best))
+					.map(|notification| Ok::<_, ()>(notification.header))
+					.compat()
+			},
 		)
 	}
 
@@ -167,9 +176,12 @@ trait ChainBackend<Client, Block: BlockT>: Send + Sync + 'static
 			self.subscriptions(),
 			subscriber,
 			|| self.client().info().finalized_hash,
-			|| self.client().finality_notification_stream()
-				.map(|notification| Ok::<_, ()>(notification.header))
-				.compat(),
+			|| {
+				self.client()
+					.finality_notification_stream()
+					.map(|notification| Ok::<_, ()>(notification.header))
+					.compat()
+			},
 		)
 	}
 
@@ -188,13 +200,11 @@ pub fn new_full<Block: BlockT, Client>(
 	client: Arc<Client>,
 	subscriptions: SubscriptionManager,
 ) -> Chain<Block, Client>
-	where
-		Block: BlockT + 'static,
-		Client: BlockBackend<Block> + HeaderBackend<Block> + BlockchainEvents<Block> + 'static,
+where
+	Block: BlockT + 'static,
+	Client: BlockBackend<Block> + HeaderBackend<Block> + BlockchainEvents<Block> + 'static,
 {
-	Chain {
-		backend: Box::new(self::chain_full::FullChain::new(client, subscriptions)),
-	}
+	Chain { backend: Box::new(self::chain_full::FullChain::new(client, subscriptions)) }
 }
 
 /// Create new state API that works on light node.
@@ -204,10 +214,10 @@ pub fn new_light<Block: BlockT, Client, F: Fetcher<Block>>(
 	remote_blockchain: Arc<dyn RemoteBlockchain<Block>>,
 	fetcher: Arc<F>,
 ) -> Chain<Block, Client>
-	where
-		Block: BlockT + 'static,
-		Client: BlockBackend<Block> + HeaderBackend<Block> + BlockchainEvents<Block> + 'static,
-		F: Send + Sync + 'static,
+where
+	Block: BlockT + 'static,
+	Client: BlockBackend<Block> + HeaderBackend<Block> + BlockchainEvents<Block> + 'static,
+	F: Send + Sync + 'static,
 {
 	Chain {
 		backend: Box::new(self::chain_light::LightChain::new(
@@ -224,11 +234,11 @@ pub struct Chain<Block: BlockT, Client> {
 	backend: Box<dyn ChainBackend<Client, Block>>,
 }
 
-impl<Block, Client> ChainApi<NumberFor<Block>, Block::Hash, Block::Header, SignedBlock<Block>> for
-	Chain<Block, Client>
-		where
-			Block: BlockT + 'static,
-			Client: HeaderBackend<Block> + BlockchainEvents<Block> + 'static,
+impl<Block, Client> ChainApi<NumberFor<Block>, Block::Hash, Block::Header, SignedBlock<Block>>
+	for Chain<Block, Client>
+where
+	Block: BlockT + 'static,
+	Client: HeaderBackend<Block> + BlockchainEvents<Block> + 'static,
 {
 	type Metadata = crate::Metadata;
 
@@ -236,8 +246,7 @@ impl<Block, Client> ChainApi<NumberFor<Block>, Block::Hash, Block::Header, Signe
 		self.backend.header(hash)
 	}
 
-	fn block(&self, hash: Option<Block::Hash>) -> FutureResult<Option<SignedBlock<Block>>>
-	{
+	fn block(&self, hash: Option<Block::Hash>) -> FutureResult<Option<SignedBlock<Block>>> {
 		self.backend.block(hash)
 	}
 
@@ -247,12 +256,13 @@ impl<Block, Client> ChainApi<NumberFor<Block>, Block::Hash, Block::Header, Signe
 	) -> Result<ListOrValue<Option<Block::Hash>>> {
 		match number {
 			None => self.backend.block_hash(None).map(ListOrValue::Value),
-			Some(ListOrValue::Value(number)) => self.backend.block_hash(Some(number)).map(ListOrValue::Value),
-			Some(ListOrValue::List(list)) => Ok(ListOrValue::List(list
-				.into_iter()
-				.map(|number| self.backend.block_hash(Some(number)))
-				.collect::<Result<_>>()?
-			))
+			Some(ListOrValue::Value(number)) =>
+				self.backend.block_hash(Some(number)).map(ListOrValue::Value),
+			Some(ListOrValue::List(list)) => Ok(ListOrValue::List(
+				list.into_iter()
+					.map(|number| self.backend.block_hash(Some(number)))
+					.collect::<Result<_>>()?,
+			)),
 		}
 	}
 
@@ -264,7 +274,11 @@ impl<Block, Client> ChainApi<NumberFor<Block>, Block::Hash, Block::Header, Signe
 		self.backend.subscribe_all_heads(metadata, subscriber)
 	}
 
-	fn unsubscribe_all_heads(&self, metadata: Option<Self::Metadata>, id: SubscriptionId) -> RpcResult<bool> {
+	fn unsubscribe_all_heads(
+		&self,
+		metadata: Option<Self::Metadata>,
+		id: SubscriptionId,
+	) -> RpcResult<bool> {
 		self.backend.unsubscribe_all_heads(metadata, id)
 	}
 
@@ -272,15 +286,27 @@ impl<Block, Client> ChainApi<NumberFor<Block>, Block::Hash, Block::Header, Signe
 		self.backend.subscribe_new_heads(metadata, subscriber)
 	}
 
-	fn unsubscribe_new_heads(&self, metadata: Option<Self::Metadata>, id: SubscriptionId) -> RpcResult<bool> {
+	fn unsubscribe_new_heads(
+		&self,
+		metadata: Option<Self::Metadata>,
+		id: SubscriptionId,
+	) -> RpcResult<bool> {
 		self.backend.unsubscribe_new_heads(metadata, id)
 	}
 
-	fn subscribe_finalized_heads(&self, metadata: Self::Metadata, subscriber: Subscriber<Block::Header>) {
+	fn subscribe_finalized_heads(
+		&self,
+		metadata: Self::Metadata,
+		subscriber: Subscriber<Block::Header>,
+	) {
 		self.backend.subscribe_finalized_heads(metadata, subscriber)
 	}
 
-	fn unsubscribe_finalized_heads(&self, metadata: Option<Self::Metadata>, id: SubscriptionId) -> RpcResult<bool> {
+	fn unsubscribe_finalized_heads(
+		&self,
+		metadata: Option<Self::Metadata>,
+		id: SubscriptionId,
+	) -> RpcResult<bool> {
 		self.backend.unsubscribe_finalized_heads(metadata, id)
 	}
 }
@@ -298,15 +324,14 @@ fn subscribe_headers<Block, Client, F, G, S, ERR>(
 	F: FnOnce() -> S,
 	G: FnOnce() -> Block::Hash,
 	ERR: ::std::fmt::Debug,
-	S: Stream<Item=Block::Header, Error=ERR> + Send + 'static,
+	S: Stream<Item = Block::Header, Error = ERR> + Send + 'static,
 {
 	subscriptions.add(subscriber, |sink| {
 		// send current head right at the start.
-		let header = client.header(BlockId::Hash(best_block_hash()))
+		let header = client
+			.header(BlockId::Hash(best_block_hash()))
 			.map_err(client_err)
-			.and_then(|header| {
-				header.ok_or_else(|| "Best header missing.".to_owned().into())
-			})
+			.and_then(|header| header.ok_or_else(|| "Best header missing.".to_owned().into()))
 			.map_err(Into::into);
 
 		// send further subscriptions
@@ -314,12 +339,8 @@ fn subscribe_headers<Block, Client, F, G, S, ERR>(
 			.map(|res| Ok(res))
 			.map_err(|e| warn!("Block notification stream error: {:?}", e));
 
-		sink
-			.sink_map_err(|e| warn!("Error sending notifications: {:?}", e))
-			.send_all(
-				stream::iter_result(vec![Ok(header)])
-					.chain(stream)
-			)
+		sink.sink_map_err(|e| warn!("Error sending notifications: {:?}", e))
+			.send_all(stream::iter_result(vec![Ok(header)]).chain(stream))
 			// we ignore the resulting Stream (if the first stream is over we are unsubscribed)
 			.map(|_| ())
 	});
diff --git a/client/rpc/src/chain/tests.rs b/client/rpc/src/chain/tests.rs
index bb673d65ea0f..9bd08a1796ad 100644
--- a/client/rpc/src/chain/tests.rs
+++ b/client/rpc/src/chain/tests.rs
@@ -17,16 +17,19 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use super::*;
+use crate::testing::TaskExecutor;
 use assert_matches::assert_matches;
+use futures::{
+	compat::{Future01CompatExt, Stream01CompatExt},
+	executor,
+};
+use sc_block_builder::BlockBuilderProvider;
+use sp_rpc::list::ListOrValue;
 use substrate_test_runtime_client::{
 	prelude::*,
+	runtime::{Block, Header, H256},
 	sp_consensus::BlockOrigin,
-	runtime::{H256, Block, Header},
 };
-use sp_rpc::list::ListOrValue;
-use sc_block_builder::BlockBuilderProvider;
-use futures::{executor, compat::{Future01CompatExt, Stream01CompatExt}};
-use crate::testing::TaskExecutor;
 
 #[test]
 fn should_return_header() {
@@ -105,10 +108,7 @@ fn should_return_a_block() {
 		}
 	);
 
-	assert_matches!(
-		api.block(Some(H256::from_low_u64_be(5)).into()).wait(),
-		Ok(None)
-	);
+	assert_matches!(api.block(Some(H256::from_low_u64_be(5)).into()).wait(), Ok(None));
 }
 
 #[test]
@@ -121,7 +121,6 @@ fn should_return_block_hash() {
 		Ok(ListOrValue::Value(Some(ref x))) if x == &client.genesis_hash()
 	);
 
-
 	assert_matches!(
 		api.block_hash(Some(ListOrValue::Value(0u64.into())).into()),
 		Ok(ListOrValue::Value(Some(ref x))) if x == &client.genesis_hash()
@@ -154,7 +153,6 @@ fn should_return_block_hash() {
 	);
 }
 
-
 #[test]
 fn should_return_finalized_hash() {
 	let mut client = Arc::new(substrate_test_runtime_client::new());
@@ -193,10 +191,7 @@ fn should_notify_about_latest_block() {
 		api.subscribe_all_heads(Default::default(), subscriber);
 
 		// assert id assigned
-		assert!(matches!(
-			executor::block_on(id.compat()),
-			Ok(Ok(SubscriptionId::String(_)))
-		));
+		assert!(matches!(executor::block_on(id.compat()), Ok(Ok(SubscriptionId::String(_)))));
 
 		let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
 		executor::block_on(client.import(BlockOrigin::Own, block)).unwrap();
@@ -223,10 +218,7 @@ fn should_notify_about_best_block() {
 		api.subscribe_new_heads(Default::default(), subscriber);
 
 		// assert id assigned
-		assert!(matches!(
-			executor::block_on(id.compat()),
-			Ok(Ok(SubscriptionId::String(_)))
-		));
+		assert!(matches!(executor::block_on(id.compat()), Ok(Ok(SubscriptionId::String(_)))));
 
 		let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
 		executor::block_on(client.import(BlockOrigin::Own, block)).unwrap();
@@ -253,10 +245,7 @@ fn should_notify_about_finalized_block() {
 		api.subscribe_finalized_heads(Default::default(), subscriber);
 
 		// assert id assigned
-		assert!(matches!(
-			executor::block_on(id.compat()),
-			Ok(Ok(SubscriptionId::String(_)))
-		));
+		assert!(matches!(executor::block_on(id.compat()), Ok(Ok(SubscriptionId::String(_)))));
 
 		let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
 		executor::block_on(client.import(BlockOrigin::Own, block)).unwrap();
diff --git a/client/rpc/src/lib.rs b/client/rpc/src/lib.rs
index 7b3af8cb2f32..ebdec6647f43 100644
--- a/client/rpc/src/lib.rs
+++ b/client/rpc/src/lib.rs
@@ -23,12 +23,12 @@
 #![warn(missing_docs)]
 
 use futures::{compat::Future01CompatExt, FutureExt};
-use rpc::futures::future::{Executor, ExecuteError, Future};
+use rpc::futures::future::{ExecuteError, Executor, Future};
 use sp_core::traits::SpawnNamed;
 use std::sync::Arc;
 
-pub use sc_rpc_api::{DenyUnsafe, Metadata};
 pub use rpc::IoHandlerExtension as RpcExtension;
+pub use sc_rpc_api::{DenyUnsafe, Metadata};
 
 pub mod author;
 pub mod chain;
diff --git a/client/rpc/src/offchain/mod.rs b/client/rpc/src/offchain/mod.rs
index dbb48a9e5193..9d1cc702b51e 100644
--- a/client/rpc/src/offchain/mod.rs
+++ b/client/rpc/src/offchain/mod.rs
@@ -21,15 +21,15 @@
 #[cfg(test)]
 mod tests;
 
+use self::error::{Error, Result};
+use parking_lot::RwLock;
 /// Re-export the API for backward compatibility.
 pub use sc_rpc_api::offchain::*;
 use sc_rpc_api::DenyUnsafe;
-use self::error::{Error, Result};
 use sp_core::{
-	Bytes,
 	offchain::{OffchainStorage, StorageKind},
+	Bytes,
 };
-use parking_lot::RwLock;
 use std::sync::Arc;
 
 /// Offchain API
@@ -43,10 +43,7 @@ pub struct Offchain<T: OffchainStorage> {
 impl<T: OffchainStorage> Offchain<T> {
 	/// Create new instance of Offchain API.
 	pub fn new(storage: T, deny_unsafe: DenyUnsafe) -> Self {
-		Offchain {
-			storage: Arc::new(RwLock::new(storage)),
-			deny_unsafe,
-		}
+		Offchain { storage: Arc::new(RwLock::new(storage)), deny_unsafe }
 	}
 }
 
diff --git a/client/rpc/src/offchain/tests.rs b/client/rpc/src/offchain/tests.rs
index b8054d816325..f9629e70198a 100644
--- a/client/rpc/src/offchain/tests.rs
+++ b/client/rpc/src/offchain/tests.rs
@@ -18,7 +18,7 @@
 
 use super::*;
 use assert_matches::assert_matches;
-use sp_core::{Bytes, offchain::storage::InMemOffchainStorage};
+use sp_core::{offchain::storage::InMemOffchainStorage, Bytes};
 
 #[test]
 fn local_storage_should_work() {
diff --git a/client/rpc/src/state/mod.rs b/client/rpc/src/state/mod.rs
index 35680b0fa41d..9137404df3ee 100644
--- a/client/rpc/src/state/mod.rs
+++ b/client/rpc/src/state/mod.rs
@@ -24,34 +24,39 @@ mod state_light;
 #[cfg(test)]
 mod tests;
 
+use jsonrpc_pubsub::{manager::SubscriptionManager, typed::Subscriber, SubscriptionId};
+use rpc::{
+	futures::{future::result, Future},
+	Result as RpcResult,
+};
 use std::sync::Arc;
-use jsonrpc_pubsub::{typed::Subscriber, SubscriptionId, manager::SubscriptionManager};
-use rpc::{Result as RpcResult, futures::{Future, future::result}};
 
-use sc_rpc_api::{DenyUnsafe, state::ReadProof};
-use sc_client_api::light::{RemoteBlockchain, Fetcher};
-use sp_core::{Bytes, storage::{StorageKey, PrefixedStorageKey, StorageData, StorageChangeSet}};
-use sp_version::RuntimeVersion;
+use sc_client_api::light::{Fetcher, RemoteBlockchain};
+use sc_rpc_api::{state::ReadProof, DenyUnsafe};
+use sp_core::{
+	storage::{PrefixedStorageKey, StorageChangeSet, StorageData, StorageKey},
+	Bytes,
+};
 use sp_runtime::traits::Block as BlockT;
+use sp_version::RuntimeVersion;
 
-use sp_api::{Metadata, ProvideRuntimeApi, CallApiAt};
+use sp_api::{CallApiAt, Metadata, ProvideRuntimeApi};
 
 use self::error::{Error, FutureResult};
 
-pub use sc_rpc_api::state::*;
-pub use sc_rpc_api::child_state::*;
 use sc_client_api::{
-	ExecutorProvider, StorageProvider, BlockchainEvents, Backend, BlockBackend, ProofProvider
+	Backend, BlockBackend, BlockchainEvents, ExecutorProvider, ProofProvider, StorageProvider,
 };
-use sp_blockchain::{HeaderMetadata, HeaderBackend};
+pub use sc_rpc_api::{child_state::*, state::*};
+use sp_blockchain::{HeaderBackend, HeaderMetadata};
 
 const STORAGE_KEYS_PAGED_MAX_COUNT: u32 = 1000;
 
 /// State backend API.
 pub trait StateBackend<Block: BlockT, Client>: Send + Sync + 'static
-	where
-		Block: BlockT + 'static,
-		Client: Send + Sync + 'static,
+where
+	Block: BlockT + 'static,
+	Client: Send + Sync + 'static,
 {
 	/// Call runtime method at given block.
 	fn call(
@@ -129,7 +134,7 @@ pub trait StateBackend<Block: BlockT, Client>: Send + Sync + 'static
 	fn query_storage_at(
 		&self,
 		keys: Vec<StorageKey>,
-		at: Option<Block::Hash>
+		at: Option<Block::Hash>,
 	) -> FutureResult<Vec<StorageChangeSet<Block::Hash>>>;
 
 	/// Returns proof of storage entries at a specific block's state.
@@ -184,21 +189,30 @@ pub fn new_full<BE, Block: BlockT, Client>(
 	deny_unsafe: DenyUnsafe,
 	rpc_max_payload: Option<usize>,
 ) -> (State<Block, Client>, ChildState<Block, Client>)
-	where
-		Block: BlockT + 'static,
-		BE: Backend<Block> + 'static,
-		Client: ExecutorProvider<Block> + StorageProvider<Block, BE> + ProofProvider<Block>
-			+ HeaderMetadata<Block, Error = sp_blockchain::Error> + BlockchainEvents<Block>
-			+ CallApiAt<Block> + HeaderBackend<Block>
-			+ BlockBackend<Block> + ProvideRuntimeApi<Block> + Send + Sync + 'static,
-		Client::Api: Metadata<Block>,
+where
+	Block: BlockT + 'static,
+	BE: Backend<Block> + 'static,
+	Client: ExecutorProvider<Block>
+		+ StorageProvider<Block, BE>
+		+ ProofProvider<Block>
+		+ HeaderMetadata<Block, Error = sp_blockchain::Error>
+		+ BlockchainEvents<Block>
+		+ CallApiAt<Block>
+		+ HeaderBackend<Block>
+		+ BlockBackend<Block>
+		+ ProvideRuntimeApi<Block>
+		+ Send
+		+ Sync
+		+ 'static,
+	Client::Api: Metadata<Block>,
 {
-	let child_backend = Box::new(
-		self::state_full::FullState::new(
-			client.clone(), subscriptions.clone(), rpc_max_payload
-		)
-	);
-	let backend = Box::new(self::state_full::FullState::new(client, subscriptions, rpc_max_payload));
+	let child_backend = Box::new(self::state_full::FullState::new(
+		client.clone(),
+		subscriptions.clone(),
+		rpc_max_payload,
+	));
+	let backend =
+		Box::new(self::state_full::FullState::new(client, subscriptions, rpc_max_payload));
 	(State { backend, deny_unsafe }, ChildState { backend: child_backend })
 }
 
@@ -210,27 +224,32 @@ pub fn new_light<BE, Block: BlockT, Client, F: Fetcher<Block>>(
 	fetcher: Arc<F>,
 	deny_unsafe: DenyUnsafe,
 ) -> (State<Block, Client>, ChildState<Block, Client>)
-	where
-		Block: BlockT + 'static,
-		BE: Backend<Block> + 'static,
-		Client: ExecutorProvider<Block> + StorageProvider<Block, BE>
-			+ HeaderMetadata<Block, Error = sp_blockchain::Error>
-			+ ProvideRuntimeApi<Block> + HeaderBackend<Block> + BlockchainEvents<Block>
-			+ Send + Sync + 'static,
-		F: Send + Sync + 'static,
+where
+	Block: BlockT + 'static,
+	BE: Backend<Block> + 'static,
+	Client: ExecutorProvider<Block>
+		+ StorageProvider<Block, BE>
+		+ HeaderMetadata<Block, Error = sp_blockchain::Error>
+		+ ProvideRuntimeApi<Block>
+		+ HeaderBackend<Block>
+		+ BlockchainEvents<Block>
+		+ Send
+		+ Sync
+		+ 'static,
+	F: Send + Sync + 'static,
 {
 	let child_backend = Box::new(self::state_light::LightState::new(
-			client.clone(),
-			subscriptions.clone(),
-			remote_blockchain.clone(),
-			fetcher.clone(),
+		client.clone(),
+		subscriptions.clone(),
+		remote_blockchain.clone(),
+		fetcher.clone(),
 	));
 
 	let backend = Box::new(self::state_light::LightState::new(
-			client,
-			subscriptions,
-			remote_blockchain,
-			fetcher,
+		client,
+		subscriptions,
+		remote_blockchain,
+		fetcher,
 	));
 	(State { backend, deny_unsafe }, ChildState { backend: child_backend })
 }
@@ -243,9 +262,9 @@ pub struct State<Block, Client> {
 }
 
 impl<Block, Client> StateApi<Block::Hash> for State<Block, Client>
-	where
-		Block: BlockT + 'static,
-		Client: Send + Sync + 'static,
+where
+	Block: BlockT + 'static,
+	Client: Send + Sync + 'static,
 {
 	type Metadata = crate::Metadata;
 
@@ -281,25 +300,35 @@ impl<Block, Client> StateApi<Block::Hash> for State<Block, Client>
 		block: Option<Block::Hash>,
 	) -> FutureResult<Vec<StorageKey>> {
 		if count > STORAGE_KEYS_PAGED_MAX_COUNT {
-			return Box::new(result(Err(
-				Error::InvalidCount {
-					value: count,
-					max: STORAGE_KEYS_PAGED_MAX_COUNT,
-				}
-			)));
+			return Box::new(result(Err(Error::InvalidCount {
+				value: count,
+				max: STORAGE_KEYS_PAGED_MAX_COUNT,
+			})))
 		}
 		self.backend.storage_keys_paged(block, prefix, count, start_key)
 	}
 
-	fn storage(&self, key: StorageKey, block: Option<Block::Hash>) -> FutureResult<Option<StorageData>> {
+	fn storage(
+		&self,
+		key: StorageKey,
+		block: Option<Block::Hash>,
+	) -> FutureResult<Option<StorageData>> {
 		self.backend.storage(block, key)
 	}
 
-	fn storage_hash(&self, key: StorageKey, block: Option<Block::Hash>) -> FutureResult<Option<Block::Hash>> {
+	fn storage_hash(
+		&self,
+		key: StorageKey,
+		block: Option<Block::Hash>,
+	) -> FutureResult<Option<Block::Hash>> {
 		self.backend.storage_hash(block, key)
 	}
 
-	fn storage_size(&self, key: StorageKey, block: Option<Block::Hash>) -> FutureResult<Option<u64>> {
+	fn storage_size(
+		&self,
+		key: StorageKey,
+		block: Option<Block::Hash>,
+	) -> FutureResult<Option<u64>> {
 		self.backend.storage_size(block, key)
 	}
 
@@ -311,7 +340,7 @@ impl<Block, Client> StateApi<Block::Hash> for State<Block, Client>
 		&self,
 		keys: Vec<StorageKey>,
 		from: Block::Hash,
-		to: Option<Block::Hash>
+		to: Option<Block::Hash>,
 	) -> FutureResult<Vec<StorageChangeSet<Block::Hash>>> {
 		if let Err(err) = self.deny_unsafe.check_if_safe() {
 			return Box::new(result(Err(err.into())))
@@ -323,12 +352,16 @@ impl<Block, Client> StateApi<Block::Hash> for State<Block, Client>
 	fn query_storage_at(
 		&self,
 		keys: Vec<StorageKey>,
-		at: Option<Block::Hash>
+		at: Option<Block::Hash>,
 	) -> FutureResult<Vec<StorageChangeSet<Block::Hash>>> {
 		self.backend.query_storage_at(keys, at)
 	}
 
-	fn read_proof(&self, keys: Vec<StorageKey>, block: Option<Block::Hash>) -> FutureResult<ReadProof<Block::Hash>> {
+	fn read_proof(
+		&self,
+		keys: Vec<StorageKey>,
+		block: Option<Block::Hash>,
+	) -> FutureResult<ReadProof<Block::Hash>> {
 		self.backend.read_proof(block, keys)
 	}
 
@@ -336,12 +369,16 @@ impl<Block, Client> StateApi<Block::Hash> for State<Block, Client>
 		&self,
 		meta: Self::Metadata,
 		subscriber: Subscriber<StorageChangeSet<Block::Hash>>,
-		keys: Option<Vec<StorageKey>>
+		keys: Option<Vec<StorageKey>>,
 	) {
 		self.backend.subscribe_storage(meta, subscriber, keys);
 	}
 
-	fn unsubscribe_storage(&self, meta: Option<Self::Metadata>, id: SubscriptionId) -> RpcResult<bool> {
+	fn unsubscribe_storage(
+		&self,
+		meta: Option<Self::Metadata>,
+		id: SubscriptionId,
+	) -> RpcResult<bool> {
 		self.backend.unsubscribe_storage(meta, id)
 	}
 
@@ -349,7 +386,11 @@ impl<Block, Client> StateApi<Block::Hash> for State<Block, Client>
 		self.backend.runtime_version(at)
 	}
 
-	fn subscribe_runtime_version(&self, meta: Self::Metadata, subscriber: Subscriber<RuntimeVersion>) {
+	fn subscribe_runtime_version(
+		&self,
+		meta: Self::Metadata,
+		subscriber: Subscriber<RuntimeVersion>,
+	) {
 		self.backend.subscribe_runtime_version(meta, subscriber);
 	}
 
@@ -367,9 +408,10 @@ impl<Block, Client> StateApi<Block::Hash> for State<Block, Client>
 	/// Note: requires the node to run with `--rpc-methods=Unsafe`.
 	/// Note: requires runtimes compiled with wasm tracing support, `--features with-tracing`.
 	fn trace_block(
-		&self, block: Block::Hash,
+		&self,
+		block: Block::Hash,
 		targets: Option<String>,
-		storage_keys: Option<String>
+		storage_keys: Option<String>,
 	) -> FutureResult<sp_rpc::tracing::TraceBlockResponse> {
 		if let Err(err) = self.deny_unsafe.check_if_safe() {
 			return Box::new(result(Err(err.into())))
@@ -381,9 +423,9 @@ impl<Block, Client> StateApi<Block::Hash> for State<Block, Client>
 
 /// Child state backend API.
 pub trait ChildStateBackend<Block: BlockT, Client>: Send + Sync + 'static
-	where
-		Block: BlockT + 'static,
-		Client: Send + Sync + 'static,
+where
+	Block: BlockT + 'static,
+	Client: Send + Sync + 'static,
 {
 	/// Returns proof of storage for a child key entries at a specific block's state.
 	fn read_child_proof(
@@ -435,8 +477,7 @@ pub trait ChildStateBackend<Block: BlockT, Client>: Send + Sync + 'static
 		storage_key: PrefixedStorageKey,
 		key: StorageKey,
 	) -> FutureResult<Option<u64>> {
-		Box::new(self.storage(block, storage_key, key)
-			.map(|x| x.map(|x| x.0.len() as u64)))
+		Box::new(self.storage(block, storage_key, key).map(|x| x.map(|x| x.0.len() as u64)))
 	}
 }
 
@@ -446,9 +487,9 @@ pub struct ChildState<Block, Client> {
 }
 
 impl<Block, Client> ChildStateApi<Block::Hash> for ChildState<Block, Client>
-	where
-		Block: BlockT + 'static,
-		Client: Send + Sync + 'static,
+where
+	Block: BlockT + 'static,
+	Client: Send + Sync + 'static,
 {
 	type Metadata = crate::Metadata;
 
@@ -465,7 +506,7 @@ impl<Block, Client> ChildStateApi<Block::Hash> for ChildState<Block, Client>
 		&self,
 		storage_key: PrefixedStorageKey,
 		key: StorageKey,
-		block: Option<Block::Hash>
+		block: Option<Block::Hash>,
 	) -> FutureResult<Option<StorageData>> {
 		self.backend.storage(block, storage_key, key)
 	}
@@ -474,7 +515,7 @@ impl<Block, Client> ChildStateApi<Block::Hash> for ChildState<Block, Client>
 		&self,
 		storage_key: PrefixedStorageKey,
 		key_prefix: StorageKey,
-		block: Option<Block::Hash>
+		block: Option<Block::Hash>,
 	) -> FutureResult<Vec<StorageKey>> {
 		self.backend.storage_keys(block, storage_key, key_prefix)
 	}
@@ -494,7 +535,7 @@ impl<Block, Client> ChildStateApi<Block::Hash> for ChildState<Block, Client>
 		&self,
 		storage_key: PrefixedStorageKey,
 		key: StorageKey,
-		block: Option<Block::Hash>
+		block: Option<Block::Hash>,
 	) -> FutureResult<Option<Block::Hash>> {
 		self.backend.storage_hash(block, storage_key, key)
 	}
@@ -503,11 +544,10 @@ impl<Block, Client> ChildStateApi<Block::Hash> for ChildState<Block, Client>
 		&self,
 		storage_key: PrefixedStorageKey,
 		key: StorageKey,
-		block: Option<Block::Hash>
+		block: Option<Block::Hash>,
 	) -> FutureResult<Option<u64>> {
 		self.backend.storage_size(block, storage_key, key)
 	}
-
 }
 
 fn client_err(err: sp_blockchain::Error) -> Error {
diff --git a/client/rpc/src/state/state_full.rs b/client/rpc/src/state/state_full.rs
index 58209e452e81..313e89bdf80b 100644
--- a/client/rpc/src/state/state_full.rs
+++ b/client/rpc/src/state/state_full.rs
@@ -18,36 +18,49 @@
 
 //! State API backend for full nodes.
 
-use std::collections::{BTreeMap, HashMap};
-use std::sync::Arc;
-use std::ops::Range;
 use futures::{future, StreamExt as _, TryStreamExt as _};
+use jsonrpc_pubsub::{manager::SubscriptionManager, typed::Subscriber, SubscriptionId};
 use log::warn;
-use jsonrpc_pubsub::{typed::Subscriber, SubscriptionId, manager::SubscriptionManager};
-use rpc::{Result as RpcResult, futures::{stream, Future, Sink, Stream, future::result}};
+use rpc::{
+	futures::{future::result, stream, Future, Sink, Stream},
+	Result as RpcResult,
+};
+use std::{
+	collections::{BTreeMap, HashMap},
+	ops::Range,
+	sync::Arc,
+};
 
 use sc_rpc_api::state::ReadProof;
 use sp_blockchain::{
-	Result as ClientResult, Error as ClientError, HeaderMetadata, CachedHeaderMetadata,
-	HeaderBackend
+	CachedHeaderMetadata, Error as ClientError, HeaderBackend, HeaderMetadata,
+	Result as ClientResult,
 };
 use sp_core::{
-	Bytes, storage::{well_known_keys, StorageKey, StorageData, StorageChangeSet,
-	ChildInfo, ChildType, PrefixedStorageKey},
+	storage::{
+		well_known_keys, ChildInfo, ChildType, PrefixedStorageKey, StorageChangeSet, StorageData,
+		StorageKey,
+	},
+	Bytes,
 };
-use sp_version::RuntimeVersion;
 use sp_runtime::{
-	generic::BlockId, traits::{Block as BlockT, NumberFor, SaturatedConversion, CheckedSub},
+	generic::BlockId,
+	traits::{Block as BlockT, CheckedSub, NumberFor, SaturatedConversion},
 };
+use sp_version::RuntimeVersion;
 
-use sp_api::{Metadata, ProvideRuntimeApi, CallApiAt};
+use sp_api::{CallApiAt, Metadata, ProvideRuntimeApi};
 
-use super::{StateBackend, ChildStateBackend, error::{FutureResult, Error, Result}, client_err};
-use std::marker::PhantomData;
+use super::{
+	client_err,
+	error::{Error, FutureResult, Result},
+	ChildStateBackend, StateBackend,
+};
 use sc_client_api::{
-	Backend, BlockBackend, BlockchainEvents, CallExecutor, StorageProvider, ExecutorProvider,
-	ProofProvider
+	Backend, BlockBackend, BlockchainEvents, CallExecutor, ExecutorProvider, ProofProvider,
+	StorageProvider,
 };
+use std::marker::PhantomData;
 
 /// Ranges to query in state_queryStorage.
 struct QueryStorageRange<Block: BlockT> {
@@ -72,11 +85,13 @@ pub struct FullState<BE, Block: BlockT, Client> {
 }
 
 impl<BE, Block: BlockT, Client> FullState<BE, Block, Client>
-	where
-		BE: Backend<Block>,
-		Client: StorageProvider<Block, BE> + HeaderBackend<Block> + BlockBackend<Block>
-			+ HeaderMetadata<Block, Error = sp_blockchain::Error>,
-		Block: BlockT + 'static,
+where
+	BE: Backend<Block>,
+	Client: StorageProvider<Block, BE>
+		+ HeaderBackend<Block>
+		+ BlockBackend<Block>
+		+ HeaderMetadata<Block, Error = sp_blockchain::Error>,
+	Block: BlockT + 'static,
 {
 	/// Create new state API backend for full nodes.
 	pub fn new(
@@ -98,16 +113,23 @@ impl<BE, Block: BlockT, Client> FullState<BE, Block, Client>
 	fn split_query_storage_range(
 		&self,
 		from: Block::Hash,
-		to: Option<Block::Hash>
+		to: Option<Block::Hash>,
 	) -> Result<QueryStorageRange<Block>> {
-		let to = self.block_or_best(to).map_err(|e| invalid_block::<Block>(from, to, e.to_string()))?;
+		let to = self
+			.block_or_best(to)
+			.map_err(|e| invalid_block::<Block>(from, to, e.to_string()))?;
 
-		let invalid_block_err = |e: ClientError| invalid_block::<Block>(from, Some(to), e.to_string());
+		let invalid_block_err =
+			|e: ClientError| invalid_block::<Block>(from, Some(to), e.to_string());
 		let from_meta = self.client.header_metadata(from).map_err(invalid_block_err)?;
 		let to_meta = self.client.header_metadata(to).map_err(invalid_block_err)?;
 
 		if from_meta.number > to_meta.number {
-			return Err(invalid_block_range(&from_meta, &to_meta, "from number > to number".to_owned()))
+			return Err(invalid_block_range(
+				&from_meta,
+				&to_meta,
+				"from number > to number".to_owned(),
+			))
 		}
 
 		// check if we can get from `to` to `from` by going through parent_hashes.
@@ -116,28 +138,33 @@ impl<BE, Block: BlockT, Client> FullState<BE, Block, Client>
 			let mut hashes = vec![to_meta.hash];
 			let mut last = to_meta.clone();
 			while last.number > from_number {
-				let header_metadata = self.client
+				let header_metadata = self
+					.client
 					.header_metadata(last.parent)
 					.map_err(|e| invalid_block_range::<Block>(&last, &to_meta, e.to_string()))?;
 				hashes.push(header_metadata.hash);
 				last = header_metadata;
 			}
 			if last.hash != from_meta.hash {
-				return Err(invalid_block_range(&from_meta, &to_meta, "from and to are on different forks".to_owned()))
+				return Err(invalid_block_range(
+					&from_meta,
+					&to_meta,
+					"from and to are on different forks".to_owned(),
+				))
 			}
 			hashes.reverse();
 			hashes
 		};
 
 		// check if we can filter blocks-with-changes from some (sub)range using changes tries
-		let changes_trie_range = self.client
+		let changes_trie_range = self
+			.client
 			.max_key_changes_range(from_number, BlockId::Hash(to_meta.hash))
 			.map_err(client_err)?;
-		let filtered_range_begin = changes_trie_range
-			.and_then(|(begin, _)| {
-				// avoids a corner case where begin < from_number (happens when querying genesis)
-				begin.checked_sub(&from_number).map(|x| x.saturated_into::<usize>())
-			});
+		let filtered_range_begin = changes_trie_range.and_then(|(begin, _)| {
+			// avoids a corner case where begin < from_number (happens when querying genesis)
+			begin.checked_sub(&from_number).map(|x| x.saturated_into::<usize>())
+		});
 		let (unfiltered_range, filtered_range) = split_range(hashes.len(), filtered_range_begin);
 
 		Ok(QueryStorageRange {
@@ -158,7 +185,8 @@ impl<BE, Block: BlockT, Client> FullState<BE, Block, Client>
 	) -> Result<()> {
 		for block in range.unfiltered_range.start..range.unfiltered_range.end {
 			let block_hash = range.hashes[block].clone();
-			let mut block_changes = StorageChangeSet { block: block_hash.clone(), changes: Vec::new() };
+			let mut block_changes =
+				StorageChangeSet { block: block_hash.clone(), changes: Vec::new() };
 			let id = BlockId::hash(block_hash);
 			for key in keys {
 				let (has_changed, data) = {
@@ -191,30 +219,34 @@ impl<BE, Block: BlockT, Client> FullState<BE, Block, Client>
 		let (begin, end) = match range.filtered_range {
 			Some(ref filtered_range) => (
 				range.first_number + filtered_range.start.saturated_into(),
-				BlockId::Hash(range.hashes[filtered_range.end - 1].clone())
+				BlockId::Hash(range.hashes[filtered_range.end - 1].clone()),
 			),
 			None => return Ok(()),
 		};
-		let mut changes_map: BTreeMap<NumberFor<Block>, StorageChangeSet<Block::Hash>> = BTreeMap::new();
+		let mut changes_map: BTreeMap<NumberFor<Block>, StorageChangeSet<Block::Hash>> =
+			BTreeMap::new();
 		for key in keys {
 			let mut last_block = None;
 			let mut last_value = last_values.get(key).cloned().unwrap_or_default();
 			let key_changes = self.client.key_changes(begin, end, None, key).map_err(client_err)?;
 			for (block, _) in key_changes.into_iter().rev() {
 				if last_block == Some(block) {
-					continue;
+					continue
 				}
 
-				let block_hash = range.hashes[(block - range.first_number).saturated_into::<usize>()].clone();
+				let block_hash =
+					range.hashes[(block - range.first_number).saturated_into::<usize>()].clone();
 				let id = BlockId::Hash(block_hash);
 				let value_at_block = self.client.storage(&id, key).map_err(client_err)?;
 				if last_value == value_at_block {
-					continue;
+					continue
 				}
 
-				changes_map.entry(block)
+				changes_map
+					.entry(block)
 					.or_insert_with(|| StorageChangeSet { block: block_hash, changes: Vec::new() })
-					.changes.push((key.clone(), value_at_block.clone()));
+					.changes
+					.push((key.clone(), value_at_block.clone()));
 				last_block = Some(block);
 				last_value = value_at_block;
 			}
@@ -227,15 +259,22 @@ impl<BE, Block: BlockT, Client> FullState<BE, Block, Client>
 	}
 }
 
-impl<BE, Block, Client> StateBackend<Block, Client> for FullState<BE, Block, Client> where
+impl<BE, Block, Client> StateBackend<Block, Client> for FullState<BE, Block, Client>
+where
 	Block: BlockT + 'static,
 	BE: Backend<Block> + 'static,
-	Client: ExecutorProvider<Block> + StorageProvider<Block, BE>
-		+ ProofProvider<Block> + HeaderBackend<Block>
-		+ HeaderMetadata<Block, Error = sp_blockchain::Error> + BlockchainEvents<Block>
-		+ CallApiAt<Block> + ProvideRuntimeApi<Block>
+	Client: ExecutorProvider<Block>
+		+ StorageProvider<Block, BE>
+		+ ProofProvider<Block>
+		+ HeaderBackend<Block>
+		+ HeaderMetadata<Block, Error = sp_blockchain::Error>
+		+ BlockchainEvents<Block>
+		+ CallApiAt<Block>
+		+ ProvideRuntimeApi<Block>
 		+ BlockBackend<Block>
-		+ Send + Sync + 'static,
+		+ Send
+		+ Sync
+		+ 'static,
 	Client::Api: Metadata<Block>,
 {
 	fn call(
@@ -244,19 +283,21 @@ impl<BE, Block, Client> StateBackend<Block, Client> for FullState<BE, Block, Cli
 		method: String,
 		call_data: Bytes,
 	) -> FutureResult<Bytes> {
-		let r = self.block_or_best(block)
-			.and_then(|block| self
-				.client
-				.executor()
-				.call(
-					&BlockId::Hash(block),
-					&method,
-					&*call_data,
-					self.client.execution_extensions().strategies().other,
-					None,
-				)
-				.map(Into::into)
-			).map_err(client_err);
+		let r = self
+			.block_or_best(block)
+			.and_then(|block| {
+				self.client
+					.executor()
+					.call(
+						&BlockId::Hash(block),
+						&method,
+						&*call_data,
+						self.client.execution_extensions().strategies().other,
+						None,
+					)
+					.map(Into::into)
+			})
+			.map_err(client_err);
 		Box::new(result(r))
 	}
 
@@ -268,7 +309,8 @@ impl<BE, Block, Client> StateBackend<Block, Client> for FullState<BE, Block, Cli
 		Box::new(result(
 			self.block_or_best(block)
 				.and_then(|block| self.client.storage_keys(&BlockId::Hash(block), &prefix))
-				.map_err(client_err)))
+				.map_err(client_err),
+		))
 	}
 
 	fn storage_pairs(
@@ -279,7 +321,8 @@ impl<BE, Block, Client> StateBackend<Block, Client> for FullState<BE, Block, Cli
 		Box::new(result(
 			self.block_or_best(block)
 				.and_then(|block| self.client.storage_pairs(&BlockId::Hash(block), &prefix))
-				.map_err(client_err)))
+				.map_err(client_err),
+		))
 	}
 
 	fn storage_keys_paged(
@@ -291,13 +334,16 @@ impl<BE, Block, Client> StateBackend<Block, Client> for FullState<BE, Block, Cli
 	) -> FutureResult<Vec<StorageKey>> {
 		Box::new(result(
 			self.block_or_best(block)
-				.and_then(|block|
+				.and_then(|block| {
 					self.client.storage_keys_iter(
-						&BlockId::Hash(block), prefix.as_ref(), start_key.as_ref()
+						&BlockId::Hash(block),
+						prefix.as_ref(),
+						start_key.as_ref(),
 					)
-				)
+				})
 				.map(|iter| iter.take(count as usize).collect())
-				.map_err(client_err)))
+				.map_err(client_err),
+		))
 	}
 
 	fn storage(
@@ -308,7 +354,8 @@ impl<BE, Block, Client> StateBackend<Block, Client> for FullState<BE, Block, Cli
 		Box::new(result(
 			self.block_or_best(block)
 				.and_then(|block| self.client.storage(&BlockId::Hash(block), &key))
-				.map_err(client_err)))
+				.map_err(client_err),
+		))
 	}
 
 	fn storage_size(
@@ -328,7 +375,8 @@ impl<BE, Block, Client> StateBackend<Block, Client> for FullState<BE, Block, Cli
 		}
 
 		Box::new(result(
-			self.client.storage_pairs(&BlockId::Hash(block), &key)
+			self.client
+				.storage_pairs(&BlockId::Hash(block), &key)
 				.map(|kv| {
 					let item_sum = kv.iter().map(|(_, v)| v.0.len() as u64).sum::<u64>();
 					if item_sum > 0 {
@@ -337,7 +385,7 @@ impl<BE, Block, Client> StateBackend<Block, Client> for FullState<BE, Block, Cli
 						None
 					}
 				})
-				.map_err(client_err)
+				.map_err(client_err),
 		))
 	}
 
@@ -349,29 +397,26 @@ impl<BE, Block, Client> StateBackend<Block, Client> for FullState<BE, Block, Cli
 		Box::new(result(
 			self.block_or_best(block)
 				.and_then(|block| self.client.storage_hash(&BlockId::Hash(block), &key))
-				.map_err(client_err)))
+				.map_err(client_err),
+		))
 	}
 
 	fn metadata(&self, block: Option<Block::Hash>) -> FutureResult<Bytes> {
-		Box::new(result(
-			self.block_or_best(block)
-				.map_err(client_err)
-				.and_then(|block|
-					self.client.runtime_api().metadata(&BlockId::Hash(block))
-						.map(Into::into)
-						.map_err(|e| Error::Client(Box::new(e))))
-		))
+		Box::new(result(self.block_or_best(block).map_err(client_err).and_then(|block| {
+			self.client
+				.runtime_api()
+				.metadata(&BlockId::Hash(block))
+				.map(Into::into)
+				.map_err(|e| Error::Client(Box::new(e)))
+		})))
 	}
 
 	fn runtime_version(&self, block: Option<Block::Hash>) -> FutureResult<RuntimeVersion> {
-		Box::new(result(
-			self.block_or_best(block)
-				.map_err(client_err)
-				.and_then(|block|
-					self.client.runtime_version_at(&BlockId::Hash(block))
-						.map_err(|e| Error::Client(Box::new(e)))
-				)
-		))
+		Box::new(result(self.block_or_best(block).map_err(client_err).and_then(|block| {
+			self.client
+				.runtime_version_at(&BlockId::Hash(block))
+				.map_err(|e| Error::Client(Box::new(e)))
+		})))
 	}
 
 	fn query_storage(
@@ -394,7 +439,7 @@ impl<BE, Block, Client> StateBackend<Block, Client> for FullState<BE, Block, Cli
 	fn query_storage_at(
 		&self,
 		keys: Vec<StorageKey>,
-		at: Option<Block::Hash>
+		at: Option<Block::Hash>,
 	) -> FutureResult<Vec<StorageChangeSet<Block::Hash>>> {
 		let at = at.unwrap_or_else(|| self.client.info().best_hash);
 		self.query_storage(at, Some(at), keys)
@@ -432,14 +477,12 @@ impl<BE, Block, Client> StateBackend<Block, Client> for FullState<BE, Block, Cli
 			Ok(stream) => stream,
 			Err(err) => {
 				let _ = subscriber.reject(Error::from(client_err(err)).into());
-				return;
-			}
+				return
+			},
 		};
 
 		self.subscriptions.add(subscriber, |sink| {
-			let version = self.runtime_version(None.into())
-				.map_err(Into::into)
-				.wait();
+			let version = self.runtime_version(None.into()).map_err(Into::into).wait();
 
 			let client = self.client.clone();
 			let mut previous_version = version.clone();
@@ -460,12 +503,8 @@ impl<BE, Block, Client> StateBackend<Block, Client> for FullState<BE, Block, Cli
 				})
 				.compat();
 
-			sink
-				.sink_map_err(|e| warn!("Error sending notifications: {:?}", e))
-				.send_all(
-					stream::iter_result(vec![Ok(version)])
-					.chain(stream)
-				)
+			sink.sink_map_err(|e| warn!("Error sending notifications: {:?}", e))
+				.send_all(stream::iter_result(vec![Ok(version)]).chain(stream))
 				// we ignore the resulting Stream (if the first stream is over we are unsubscribed)
 				.map(|_| ())
 		});
@@ -486,45 +525,55 @@ impl<BE, Block, Client> StateBackend<Block, Client> for FullState<BE, Block, Cli
 		keys: Option<Vec<StorageKey>>,
 	) {
 		let keys = Into::<Option<Vec<_>>>::into(keys);
-		let stream = match self.client.storage_changes_notification_stream(
-			keys.as_ref().map(|x| &**x),
-			None
-		) {
+		let stream = match self
+			.client
+			.storage_changes_notification_stream(keys.as_ref().map(|x| &**x), None)
+		{
 			Ok(stream) => stream,
 			Err(err) => {
 				let _ = subscriber.reject(client_err(err).into());
-				return;
+				return
 			},
 		};
 
 		// initial values
-		let initial = stream::iter_result(keys
-			.map(|keys| {
+		let initial = stream::iter_result(
+			keys.map(|keys| {
 				let block = self.client.info().best_hash;
 				let changes = keys
 					.into_iter()
-					.map(|key| StateBackend::storage(self, Some(block.clone()).into(), key.clone())
-						.map(|val| (key.clone(), val))
-						.wait()
-						.unwrap_or_else(|_| (key, None))
-					)
+					.map(|key| {
+						StateBackend::storage(self, Some(block.clone()).into(), key.clone())
+							.map(|val| (key.clone(), val))
+							.wait()
+							.unwrap_or_else(|_| (key, None))
+					})
 					.collect();
 				vec![Ok(Ok(StorageChangeSet { block, changes }))]
-			}).unwrap_or_default());
+			})
+			.unwrap_or_default(),
+		);
 
 		self.subscriptions.add(subscriber, |sink| {
 			let stream = stream
-				.map(|(block, changes)| Ok::<_, ()>(Ok(StorageChangeSet {
-					block,
-					changes: changes.iter()
-						.filter_map(|(o_sk, k, v)| if o_sk.is_none() {
-							Some((k.clone(),v.cloned()))
-						} else { None }).collect(),
-				})))
+				.map(|(block, changes)| {
+					Ok::<_, ()>(Ok(StorageChangeSet {
+						block,
+						changes: changes
+							.iter()
+							.filter_map(|(o_sk, k, v)| {
+								if o_sk.is_none() {
+									Some((k.clone(), v.cloned()))
+								} else {
+									None
+								}
+							})
+							.collect(),
+					}))
+				})
 				.compat();
 
-			sink
-				.sink_map_err(|e| warn!("Error sending notifications: {:?}", e))
+			sink.sink_map_err(|e| warn!("Error sending notifications: {:?}", e))
 				.send_all(initial.chain(stream))
 				// we ignore the resulting Stream (if the first stream is over we are unsubscribed)
 				.map(|_| ())
@@ -553,21 +602,29 @@ impl<BE, Block, Client> StateBackend<Block, Client> for FullState<BE, Block, Cli
 			self.rpc_max_payload,
 		);
 		Box::new(result(
-			block_executor.trace_block()
-				.map_err(|e| invalid_block::<Block>(block, None, e.to_string()))
+			block_executor
+				.trace_block()
+				.map_err(|e| invalid_block::<Block>(block, None, e.to_string())),
 		))
 	}
 }
 
-impl<BE, Block, Client> ChildStateBackend<Block, Client> for FullState<BE, Block, Client> where
+impl<BE, Block, Client> ChildStateBackend<Block, Client> for FullState<BE, Block, Client>
+where
 	Block: BlockT + 'static,
 	BE: Backend<Block> + 'static,
-	Client: ExecutorProvider<Block> + StorageProvider<Block, BE>
+	Client: ExecutorProvider<Block>
+		+ StorageProvider<Block, BE>
 		+ ProofProvider<Block>
-		+ HeaderBackend<Block> + BlockBackend<Block>
-		+ HeaderMetadata<Block, Error = sp_blockchain::Error> + BlockchainEvents<Block>
-		+ CallApiAt<Block> + ProvideRuntimeApi<Block>
-		+ Send + Sync + 'static,
+		+ HeaderBackend<Block>
+		+ BlockBackend<Block>
+		+ HeaderMetadata<Block, Error = sp_blockchain::Error>
+		+ BlockchainEvents<Block>
+		+ CallApiAt<Block>
+		+ ProvideRuntimeApi<Block>
+		+ Send
+		+ Sync
+		+ 'static,
 	Client::Api: Metadata<Block>,
 {
 	fn read_child_proof(
@@ -580,7 +637,8 @@ impl<BE, Block, Client> ChildStateBackend<Block, Client> for FullState<BE, Block
 			self.block_or_best(block)
 				.and_then(|block| {
 					let child_info = match ChildType::from_prefixed_key(&storage_key) {
-						Some((ChildType::ParentKeyId, storage_key)) => ChildInfo::new_default(storage_key),
+						Some((ChildType::ParentKeyId, storage_key)) =>
+							ChildInfo::new_default(storage_key),
 						None => return Err(sp_blockchain::Error::InvalidChildStorageKey),
 					};
 					self.client
@@ -606,16 +664,14 @@ impl<BE, Block, Client> ChildStateBackend<Block, Client> for FullState<BE, Block
 			self.block_or_best(block)
 				.and_then(|block| {
 					let child_info = match ChildType::from_prefixed_key(&storage_key) {
-						Some((ChildType::ParentKeyId, storage_key)) => ChildInfo::new_default(storage_key),
+						Some((ChildType::ParentKeyId, storage_key)) =>
+							ChildInfo::new_default(storage_key),
 						None => return Err(sp_blockchain::Error::InvalidChildStorageKey),
 					};
-					self.client.child_storage_keys(
-						&BlockId::Hash(block),
-						&child_info,
-						&prefix,
-					)
+					self.client.child_storage_keys(&BlockId::Hash(block), &child_info, &prefix)
 				})
-				.map_err(client_err)))
+				.map_err(client_err),
+		))
 	}
 
 	fn storage_keys_paged(
@@ -630,15 +686,20 @@ impl<BE, Block, Client> ChildStateBackend<Block, Client> for FullState<BE, Block
 			self.block_or_best(block)
 				.and_then(|block| {
 					let child_info = match ChildType::from_prefixed_key(&storage_key) {
-						Some((ChildType::ParentKeyId, storage_key)) => ChildInfo::new_default(storage_key),
+						Some((ChildType::ParentKeyId, storage_key)) =>
+							ChildInfo::new_default(storage_key),
 						None => return Err(sp_blockchain::Error::InvalidChildStorageKey),
 					};
 					self.client.child_storage_keys_iter(
-						&BlockId::Hash(block), child_info, prefix.as_ref(), start_key.as_ref(),
+						&BlockId::Hash(block),
+						child_info,
+						prefix.as_ref(),
+						start_key.as_ref(),
 					)
 				})
 				.map(|iter| iter.take(count as usize).collect())
-				.map_err(client_err)))
+				.map_err(client_err),
+		))
 	}
 
 	fn storage(
@@ -651,16 +712,14 @@ impl<BE, Block, Client> ChildStateBackend<Block, Client> for FullState<BE, Block
 			self.block_or_best(block)
 				.and_then(|block| {
 					let child_info = match ChildType::from_prefixed_key(&storage_key) {
-						Some((ChildType::ParentKeyId, storage_key)) => ChildInfo::new_default(storage_key),
+						Some((ChildType::ParentKeyId, storage_key)) =>
+							ChildInfo::new_default(storage_key),
 						None => return Err(sp_blockchain::Error::InvalidChildStorageKey),
 					};
-					self.client.child_storage(
-						&BlockId::Hash(block),
-						&child_info,
-						&key,
-					)
+					self.client.child_storage(&BlockId::Hash(block), &child_info, &key)
 				})
-				.map_err(client_err)))
+				.map_err(client_err),
+		))
 	}
 
 	fn storage_hash(
@@ -673,23 +732,24 @@ impl<BE, Block, Client> ChildStateBackend<Block, Client> for FullState<BE, Block
 			self.block_or_best(block)
 				.and_then(|block| {
 					let child_info = match ChildType::from_prefixed_key(&storage_key) {
-						Some((ChildType::ParentKeyId, storage_key)) => ChildInfo::new_default(storage_key),
+						Some((ChildType::ParentKeyId, storage_key)) =>
+							ChildInfo::new_default(storage_key),
 						None => return Err(sp_blockchain::Error::InvalidChildStorageKey),
 					};
-					self.client.child_storage_hash(
-						&BlockId::Hash(block),
-						&child_info,
-						&key,
-					)
+					self.client.child_storage_hash(&BlockId::Hash(block), &child_info, &key)
 				})
-				.map_err(client_err)))
+				.map_err(client_err),
+		))
 	}
 }
 
 /// Splits passed range into two subranges where:
 /// - first range has at least one element in it;
 /// - second range (optionally) starts at given `middle` element.
-pub(crate) fn split_range(size: usize, middle: Option<usize>) -> (Range<usize>, Option<Range<usize>>) {
+pub(crate) fn split_range(
+	size: usize,
+	middle: Option<usize>,
+) -> (Range<usize>, Option<Range<usize>>) {
 	// check if we can filter blocks-with-changes from some (sub)range using changes tries
 	let range2_begin = match middle {
 		// some of required changes tries are pruned => use available tries
@@ -714,21 +774,9 @@ fn invalid_block_range<B: BlockT>(
 ) -> Error {
 	let to_string = |h: &CachedHeaderMetadata<B>| format!("{} ({:?})", h.number, h.hash);
 
-	Error::InvalidBlockRange {
-		from: to_string(from),
-		to: to_string(to),
-		details,
-	}
+	Error::InvalidBlockRange { from: to_string(from), to: to_string(to), details }
 }
 
-fn invalid_block<B: BlockT>(
-	from: B::Hash,
-	to: Option<B::Hash>,
-	details: String,
-) -> Error {
-	Error::InvalidBlockRange {
-		from: format!("{:?}", from),
-		to: format!("{:?}", to),
-		details,
-	}
+fn invalid_block<B: BlockT>(from: B::Hash, to: Option<B::Hash>, details: String) -> Error {
+	Error::InvalidBlockRange { from: format!("{:?}", from), to: format!("{:?}", to), details }
 }
diff --git a/client/rpc/src/state/state_light.rs b/client/rpc/src/state/state_light.rs
index a2f69df9d027..274eabe376d9 100644
--- a/client/rpc/src/state/state_light.rs
+++ b/client/rpc/src/state/state_light.rs
@@ -18,45 +18,53 @@
 
 //! State API backend for light nodes.
 
-use std::{
-	sync::Arc,
-	collections::{HashSet, HashMap, hash_map::Entry},
-};
 use codec::Decode;
 use futures::{
-	future::{ready, Either},
 	channel::oneshot::{channel, Sender},
-	FutureExt, TryFutureExt,
-	StreamExt as _, TryStreamExt as _,
+	future::{ready, Either},
+	FutureExt, StreamExt as _, TryFutureExt, TryStreamExt as _,
 };
 use hash_db::Hasher;
-use jsonrpc_pubsub::{typed::Subscriber, SubscriptionId, manager::SubscriptionManager};
+use jsonrpc_pubsub::{manager::SubscriptionManager, typed::Subscriber, SubscriptionId};
 use log::warn;
 use parking_lot::Mutex;
 use rpc::{
+	futures::{
+		future::{result, Future},
+		stream::Stream,
+		Sink,
+	},
 	Result as RpcResult,
-	futures::Sink,
-	futures::future::{result, Future},
-	futures::stream::Stream,
+};
+use std::{
+	collections::{hash_map::Entry, HashMap, HashSet},
+	sync::Arc,
 };
 
-use sc_rpc_api::state::ReadProof;
-use sp_blockchain::{Error as ClientError, HeaderBackend};
 use sc_client_api::{
-	BlockchainEvents,
 	light::{
-		RemoteCallRequest, RemoteReadRequest, RemoteReadChildRequest,
-		RemoteBlockchain, Fetcher, future_header,
+		future_header, Fetcher, RemoteBlockchain, RemoteCallRequest, RemoteReadChildRequest,
+		RemoteReadRequest,
 	},
+	BlockchainEvents,
 };
+use sc_rpc_api::state::ReadProof;
+use sp_blockchain::{Error as ClientError, HeaderBackend};
 use sp_core::{
+	storage::{PrefixedStorageKey, StorageChangeSet, StorageData, StorageKey},
 	Bytes, OpaqueMetadata,
-	storage::{StorageKey, PrefixedStorageKey, StorageData, StorageChangeSet},
+};
+use sp_runtime::{
+	generic::BlockId,
+	traits::{Block as BlockT, HashFor},
 };
 use sp_version::RuntimeVersion;
-use sp_runtime::{generic::BlockId, traits::{Block as BlockT, HashFor}};
 
-use super::{StateBackend, ChildStateBackend, error::{FutureResult, Error}, client_err};
+use super::{
+	client_err,
+	error::{Error, FutureResult},
+	ChildStateBackend, StateBackend,
+};
 
 /// Storage data map of storage keys => (optional) storage value.
 type StorageMap = HashMap<StorageKey, Option<StorageData>>;
@@ -77,11 +85,7 @@ trait SharedRequests<Hash, V>: Clone + Send + Sync {
 	/// Tries to listen for already issued request, or issues request.
 	///
 	/// Returns true if requests has been issued.
-	fn listen_request(
-		&self,
-		block: Hash,
-		sender: Sender<Result<V, ()>>,
-	) -> bool;
+	fn listen_request(&self, block: Hash, sender: Sender<Result<V, ()>>) -> bool;
 
 	/// Returns (and forgets) all listeners for given request.
 	fn on_response_received(&self, block: Hash) -> Vec<Sender<Result<V, ()>>>;
@@ -97,12 +101,10 @@ struct StorageSubscriptions<Block: BlockT> {
 	subscriptions_by_key: HashMap<StorageKey, HashSet<SubscriptionId>>,
 }
 
-impl<Block: BlockT> SharedRequests<Block::Hash, StorageMap> for Arc<Mutex<StorageSubscriptions<Block>>> {
-	fn listen_request(
-		&self,
-		block: Block::Hash,
-		sender: Sender<Result<StorageMap, ()>>,
-	) -> bool {
+impl<Block: BlockT> SharedRequests<Block::Hash, StorageMap>
+	for Arc<Mutex<StorageSubscriptions<Block>>>
+{
+	fn listen_request(&self, block: Block::Hash, sender: Sender<Result<StorageMap, ()>>) -> bool {
 		let mut subscriptions = self.lock();
 		let active_requests_at = subscriptions.active_requests.entry(block).or_default();
 		active_requests_at.push(sender);
@@ -117,15 +119,12 @@ impl<Block: BlockT> SharedRequests<Block::Hash, StorageMap> for Arc<Mutex<Storag
 /// Simple, maybe shared, subscription data that shares per block requests.
 type SimpleSubscriptions<Hash, V> = Arc<Mutex<HashMap<Hash, Vec<Sender<Result<V, ()>>>>>>;
 
-impl<Hash, V> SharedRequests<Hash, V> for SimpleSubscriptions<Hash, V> where
+impl<Hash, V> SharedRequests<Hash, V> for SimpleSubscriptions<Hash, V>
+where
 	Hash: Send + Eq + std::hash::Hash,
 	V: Send,
 {
-	fn listen_request(
-		&self,
-		block: Hash,
-		sender: Sender<Result<V, ()>>,
-	) -> bool {
+	fn listen_request(&self, block: Hash, sender: Sender<Result<V, ()>>) -> bool {
 		let mut subscriptions = self.lock();
 		let active_requests_at = subscriptions.entry(block).or_default();
 		active_requests_at.push(sender);
@@ -138,9 +137,9 @@ impl<Hash, V> SharedRequests<Hash, V> for SimpleSubscriptions<Hash, V> where
 }
 
 impl<Block: BlockT, F: Fetcher<Block> + 'static, Client> LightState<Block, F, Client>
-	where
-		Block: BlockT,
-		Client: HeaderBackend<Block> + Send + Sync + 'static,
+where
+	Block: BlockT,
+	Client: HeaderBackend<Block> + Send + Sync + 'static,
 {
 	/// Create new state API backend for light nodes.
 	pub fn new(
@@ -170,10 +169,10 @@ impl<Block: BlockT, F: Fetcher<Block> + 'static, Client> LightState<Block, F, Cl
 }
 
 impl<Block, F, Client> StateBackend<Block, Client> for LightState<Block, F, Client>
-	where
-		Block: BlockT,
-		Client: BlockchainEvents<Block> + HeaderBackend<Block> + Send + Sync + 'static,
-		F: Fetcher<Block> + 'static
+where
+	Block: BlockT,
+	Client: BlockchainEvents<Block> + HeaderBackend<Block> + Send + Sync + 'static,
+	F: Fetcher<Block> + 'static,
 {
 	fn call(
 		&self,
@@ -181,13 +180,17 @@ impl<Block, F, Client> StateBackend<Block, Client> for LightState<Block, F, Clie
 		method: String,
 		call_data: Bytes,
 	) -> FutureResult<Bytes> {
-		Box::new(call(
-			&*self.remote_blockchain,
-			self.fetcher.clone(),
-			self.block_or_best(block),
-			method,
-			call_data,
-		).boxed().compat())
+		Box::new(
+			call(
+				&*self.remote_blockchain,
+				self.fetcher.clone(),
+				self.block_or_best(block),
+				method,
+				call_data,
+			)
+			.boxed()
+			.compat(),
+		)
 	}
 
 	fn storage_keys(
@@ -216,11 +219,7 @@ impl<Block, F, Client> StateBackend<Block, Client> for LightState<Block, F, Clie
 		Box::new(result(Err(client_err(ClientError::NotAvailableOnLightClient))))
 	}
 
-	fn storage_size(
-		&self,
-		_: Option<Block::Hash>,
-		_: StorageKey,
-	) -> FutureResult<Option<u64>> {
+	fn storage_size(&self, _: Option<Block::Hash>, _: StorageKey) -> FutureResult<Option<u64>> {
 		Box::new(result(Err(client_err(ClientError::NotAvailableOnLightClient))))
 	}
 
@@ -229,15 +228,21 @@ impl<Block, F, Client> StateBackend<Block, Client> for LightState<Block, F, Clie
 		block: Option<Block::Hash>,
 		key: StorageKey,
 	) -> FutureResult<Option<StorageData>> {
-		Box::new(storage(
-			&*self.remote_blockchain,
-			self.fetcher.clone(),
-			self.block_or_best(block),
-			vec![key.0.clone()],
-		).boxed().compat().map(move |mut values| values
-			.remove(&key)
-			.expect("successful request has entries for all requested keys; qed")
-		))
+		Box::new(
+			storage(
+				&*self.remote_blockchain,
+				self.fetcher.clone(),
+				self.block_or_best(block),
+				vec![key.0.clone()],
+			)
+			.boxed()
+			.compat()
+			.map(move |mut values| {
+				values
+					.remove(&key)
+					.expect("successful request has entries for all requested keys; qed")
+			}),
+		)
 	}
 
 	fn storage_hash(
@@ -245,31 +250,38 @@ impl<Block, F, Client> StateBackend<Block, Client> for LightState<Block, F, Clie
 		block: Option<Block::Hash>,
 		key: StorageKey,
 	) -> FutureResult<Option<Block::Hash>> {
-		Box::new(StateBackend::storage(self, block, key)
-			.and_then(|maybe_storage|
-				result(Ok(maybe_storage.map(|storage| HashFor::<Block>::hash(&storage.0))))
-			)
-		)
+		Box::new(StateBackend::storage(self, block, key).and_then(|maybe_storage| {
+			result(Ok(maybe_storage.map(|storage| HashFor::<Block>::hash(&storage.0))))
+		}))
 	}
 
 	fn metadata(&self, block: Option<Block::Hash>) -> FutureResult<Bytes> {
-		let metadata = self.call(block, "Metadata_metadata".into(), Bytes(Vec::new()))
-			.and_then(|metadata| OpaqueMetadata::decode(&mut &metadata.0[..])
-				.map(Into::into)
-				.map_err(|decode_err| client_err(ClientError::CallResultDecode(
-					"Unable to decode metadata",
-					decode_err,
-				))));
+		let metadata =
+			self.call(block, "Metadata_metadata".into(), Bytes(Vec::new()))
+				.and_then(|metadata| {
+					OpaqueMetadata::decode(&mut &metadata.0[..]).map(Into::into).map_err(
+						|decode_err| {
+							client_err(ClientError::CallResultDecode(
+								"Unable to decode metadata",
+								decode_err,
+							))
+						},
+					)
+				});
 
 		Box::new(metadata)
 	}
 
 	fn runtime_version(&self, block: Option<Block::Hash>) -> FutureResult<RuntimeVersion> {
-		Box::new(runtime_version(
-			&*self.remote_blockchain,
-			self.fetcher.clone(),
-			self.block_or_best(block),
-		).boxed().compat())
+		Box::new(
+			runtime_version(
+				&*self.remote_blockchain,
+				self.fetcher.clone(),
+				self.block_or_best(block),
+			)
+			.boxed()
+			.compat(),
+		)
 	}
 
 	fn query_storage(
@@ -284,7 +296,7 @@ impl<Block, F, Client> StateBackend<Block, Client> for LightState<Block, F, Clie
 	fn query_storage_at(
 		&self,
 		_keys: Vec<StorageKey>,
-		_at: Option<Block::Hash>
+		_at: Option<Block::Hash>,
 	) -> FutureResult<Vec<StorageChangeSet<Block::Hash>>> {
 		Box::new(result(Err(client_err(ClientError::NotAvailableOnLightClient))))
 	}
@@ -301,14 +313,14 @@ impl<Block, F, Client> StateBackend<Block, Client> for LightState<Block, F, Clie
 		&self,
 		_meta: crate::Metadata,
 		subscriber: Subscriber<StorageChangeSet<Block::Hash>>,
-		keys: Option<Vec<StorageKey>>
+		keys: Option<Vec<StorageKey>>,
 	) {
 		let keys = match keys {
 			Some(keys) if !keys.is_empty() => keys,
 			_ => {
 				warn!("Cannot subscribe to all keys on light client. Subscription rejected.");
-				return;
-			}
+				return
+			},
 		};
 
 		let keys = keys.iter().cloned().collect::<HashSet<_>>();
@@ -326,12 +338,10 @@ impl<Block, F, Client> StateBackend<Block, Client> for LightState<Block, F, Clie
 					.import_notification_stream()
 					.map(|notification| Ok::<_, ()>(notification.hash))
 					.compat(),
-				display_error(storage(
-					&*remote_blockchain,
-					fetcher.clone(),
-					initial_block,
-					initial_keys,
-				).map(move |r| r.map(|r| (initial_block, r)))),
+				display_error(
+					storage(&*remote_blockchain, fetcher.clone(), initial_block, initial_keys)
+						.map(move |r| r.map(|r| (initial_block, r))),
+				),
 				move |block| {
 					// there'll be single request per block for all active subscriptions
 					// with all subscribed keys
@@ -342,12 +352,7 @@ impl<Block, F, Client> StateBackend<Block, Client> for LightState<Block, F, Clie
 						.map(|k| k.0.clone())
 						.collect();
 
-					storage(
-						&*remote_blockchain,
-						fetcher.clone(),
-						block,
-						keys,
-					)
+					storage(&*remote_blockchain, fetcher.clone(), block, keys)
 				},
 				move |block, old_value, new_value| {
 					// let's only select keys which are valid for this subscription
@@ -370,11 +375,10 @@ impl<Block, F, Client> StateBackend<Block, Client> for LightState<Block, F, Clie
 						}),
 						false => None,
 					}
-				}
+				},
 			);
 
-			sink
-				.sink_map_err(|e| warn!("Error sending notifications: {:?}", e))
+			sink.sink_map_err(|e| warn!("Error sending notifications: {:?}", e))
 				.send_all(changes_stream.map(|changes| Ok(changes)))
 				// we ignore the resulting Stream (if the first stream is over we are unsubscribed)
 				.map(|_| ())
@@ -382,7 +386,9 @@ impl<Block, F, Client> StateBackend<Block, Client> for LightState<Block, F, Clie
 
 		// remember keys associated with this subscription
 		let mut storage_subscriptions = self.storage_subscriptions.lock();
-		storage_subscriptions.keys_by_subscription.insert(subscription_id.clone(), keys.clone());
+		storage_subscriptions
+			.keys_by_subscription
+			.insert(subscription_id.clone(), keys.clone());
 		for key in keys {
 			storage_subscriptions
 				.subscriptions_by_key
@@ -398,7 +404,7 @@ impl<Block, F, Client> StateBackend<Block, Client> for LightState<Block, F, Clie
 		id: SubscriptionId,
 	) -> RpcResult<bool> {
 		if !self.subscriptions.cancel(id.clone()) {
-			return Ok(false);
+			return Ok(false)
 		}
 
 		// forget subscription keys
@@ -406,14 +412,16 @@ impl<Block, F, Client> StateBackend<Block, Client> for LightState<Block, F, Clie
 		let keys = storage_subscriptions.keys_by_subscription.remove(&id);
 		for key in keys.into_iter().flat_map(|keys| keys.into_iter()) {
 			match storage_subscriptions.subscriptions_by_key.entry(key) {
-				Entry::Vacant(_) => unreachable!("every key from keys_by_subscription has\
-					corresponding entry in subscriptions_by_key; qed"),
+				Entry::Vacant(_) => unreachable!(
+					"every key from keys_by_subscription has\
+					corresponding entry in subscriptions_by_key; qed"
+				),
 				Entry::Occupied(mut entry) => {
 					entry.get_mut().remove(&id);
 					if entry.get().is_empty() {
 						entry.remove();
 					}
-				}
+				},
 			}
 		}
 
@@ -437,16 +445,11 @@ impl<Block, F, Client> StateBackend<Block, Client> for LightState<Block, F, Clie
 					.import_notification_stream()
 					.map(|notification| Ok::<_, ()>(notification.hash))
 					.compat(),
-				display_error(runtime_version(
-					&*remote_blockchain,
-					fetcher.clone(),
-					initial_block,
-				).map(move |r| r.map(|r| (initial_block, r)))),
-				move |block| runtime_version(
-					&*remote_blockchain,
-					fetcher.clone(),
-					block,
+				display_error(
+					runtime_version(&*remote_blockchain, fetcher.clone(), initial_block)
+						.map(move |r| r.map(|r| (initial_block, r))),
 				),
+				move |block| runtime_version(&*remote_blockchain, fetcher.clone(), block),
 				|_, old_version, new_version| {
 					let version_differs = old_version
 						.as_ref()
@@ -456,11 +459,10 @@ impl<Block, F, Client> StateBackend<Block, Client> for LightState<Block, F, Clie
 						true => Some(new_version.clone()),
 						false => None,
 					}
-				}
+				},
 			);
 
-			sink
-				.sink_map_err(|e| warn!("Error sending notifications: {:?}", e))
+			sink.sink_map_err(|e| warn!("Error sending notifications: {:?}", e))
 				.send_all(versions_stream.map(|version| Ok(version)))
 				// we ignore the resulting Stream (if the first stream is over we are unsubscribed)
 				.map(|_| ())
@@ -486,10 +488,10 @@ impl<Block, F, Client> StateBackend<Block, Client> for LightState<Block, F, Clie
 }
 
 impl<Block, F, Client> ChildStateBackend<Block, Client> for LightState<Block, F, Client>
-	where
-		Block: BlockT,
-		Client: BlockchainEvents<Block> + HeaderBackend<Block> + Send + Sync + 'static,
-		F: Fetcher<Block> + 'static
+where
+	Block: BlockT,
+	Client: BlockchainEvents<Block> + HeaderBackend<Block> + Send + Sync + 'static,
+	F: Fetcher<Block> + 'static,
 {
 	fn read_child_proof(
 		&self,
@@ -528,23 +530,34 @@ impl<Block, F, Client> ChildStateBackend<Block, Client> for LightState<Block, F,
 	) -> FutureResult<Option<StorageData>> {
 		let block = self.block_or_best(block);
 		let fetcher = self.fetcher.clone();
-		let child_storage = resolve_header(&*self.remote_blockchain, &*self.fetcher, block)
-			.then(move |result| match result {
-				Ok(header) => Either::Left(fetcher.remote_read_child(RemoteReadChildRequest {
-					block,
-					header,
-					storage_key,
-					keys: vec![key.0.clone()],
-					retry_count: Default::default(),
-				}).then(move |result| ready(result
-					.map(|mut data| data
-						.remove(&key.0)
-						.expect("successful result has entry for all keys; qed")
-						.map(StorageData)
-					)
-					.map_err(client_err)
-				))),
-				Err(error) => Either::Right(ready(Err(error))),
+		let child_storage =
+			resolve_header(&*self.remote_blockchain, &*self.fetcher, block).then(move |result| {
+				match result {
+					Ok(header) => Either::Left(
+						fetcher
+							.remote_read_child(RemoteReadChildRequest {
+								block,
+								header,
+								storage_key,
+								keys: vec![key.0.clone()],
+								retry_count: Default::default(),
+							})
+							.then(move |result| {
+								ready(
+									result
+										.map(|mut data| {
+											data.remove(&key.0)
+												.expect(
+													"successful result has entry for all keys; qed",
+												)
+												.map(StorageData)
+										})
+										.map_err(client_err),
+								)
+							}),
+					),
+					Err(error) => Either::Right(ready(Err(error))),
+				}
 			});
 
 		Box::new(child_storage.boxed().compat())
@@ -556,11 +569,11 @@ impl<Block, F, Client> ChildStateBackend<Block, Client> for LightState<Block, F,
 		storage_key: PrefixedStorageKey,
 		key: StorageKey,
 	) -> FutureResult<Option<Block::Hash>> {
-		Box::new(ChildStateBackend::storage(self, block, storage_key, key)
-			.and_then(|maybe_storage|
+		Box::new(ChildStateBackend::storage(self, block, storage_key, key).and_then(
+			|maybe_storage| {
 				result(Ok(maybe_storage.map(|storage| HashFor::<Block>::hash(&storage.0))))
-			)
-		)
+			},
+		))
 	}
 }
 
@@ -570,17 +583,17 @@ fn resolve_header<Block: BlockT, F: Fetcher<Block>>(
 	fetcher: &F,
 	block: Block::Hash,
 ) -> impl std::future::Future<Output = Result<Block::Header, Error>> {
-	let maybe_header = future_header(
-		remote_blockchain,
-		fetcher,
-		BlockId::Hash(block),
-	);
-
-	maybe_header.then(move |result|
-		ready(result.and_then(|maybe_header|
-			maybe_header.ok_or_else(|| ClientError::UnknownBlock(format!("{}", block)))
-		).map_err(client_err)),
-	)
+	let maybe_header = future_header(remote_blockchain, fetcher, BlockId::Hash(block));
+
+	maybe_header.then(move |result| {
+		ready(
+			result
+				.and_then(|maybe_header| {
+					maybe_header.ok_or_else(|| ClientError::UnknownBlock(format!("{}", block)))
+				})
+				.map_err(client_err),
+		)
+	})
 }
 
 /// Call runtime method at given block
@@ -591,17 +604,20 @@ fn call<Block: BlockT, F: Fetcher<Block>>(
 	method: String,
 	call_data: Bytes,
 ) -> impl std::future::Future<Output = Result<Bytes, Error>> {
-	resolve_header(remote_blockchain, &*fetcher, block)
-		.then(move |result| match result {
-			Ok(header) => Either::Left(fetcher.remote_call(RemoteCallRequest {
-				block,
-				header,
-				method,
-				call_data: call_data.0,
-				retry_count: Default::default(),
-			}).then(|result| ready(result.map(Bytes).map_err(client_err)))),
-			Err(error) => Either::Right(ready(Err(error))),
-		})
+	resolve_header(remote_blockchain, &*fetcher, block).then(move |result| match result {
+		Ok(header) => Either::Left(
+			fetcher
+				.remote_call(RemoteCallRequest {
+					block,
+					header,
+					method,
+					call_data: call_data.0,
+					retry_count: Default::default(),
+				})
+				.then(|result| ready(result.map(Bytes).map_err(client_err))),
+		),
+		Err(error) => Either::Right(ready(Err(error))),
+	})
 }
 
 /// Get runtime version at given block.
@@ -610,17 +626,14 @@ fn runtime_version<Block: BlockT, F: Fetcher<Block>>(
 	fetcher: Arc<F>,
 	block: Block::Hash,
 ) -> impl std::future::Future<Output = Result<RuntimeVersion, Error>> {
-	call(
-		remote_blockchain,
-		fetcher,
-		block,
-		"Core_version".into(),
-		Bytes(Vec::new()),
+	call(remote_blockchain, fetcher, block, "Core_version".into(), Bytes(Vec::new())).then(
+		|version| {
+			ready(version.and_then(|version| {
+				Decode::decode(&mut &version.0[..])
+					.map_err(|e| client_err(ClientError::VersionInvalid(e.to_string())))
+			}))
+		},
 	)
-	.then(|version| ready(version.and_then(|version|
-		Decode::decode(&mut &version.0[..])
-			.map_err(|e| client_err(ClientError::VersionInvalid(e.to_string())))
-	)))
 }
 
 /// Get storage value at given key at given block.
@@ -630,22 +643,30 @@ fn storage<Block: BlockT, F: Fetcher<Block>>(
 	block: Block::Hash,
 	keys: Vec<Vec<u8>>,
 ) -> impl std::future::Future<Output = Result<HashMap<StorageKey, Option<StorageData>>, Error>> {
-	resolve_header(remote_blockchain, &*fetcher, block)
-		.then(move |result| match result {
-			Ok(header) => Either::Left(fetcher.remote_read(RemoteReadRequest {
-				block,
-				header,
-				keys,
-				retry_count: Default::default(),
-			}).then(|result| ready(result
-				.map(|result| result
-					.into_iter()
-					.map(|(key, value)| (StorageKey(key), value.map(StorageData)))
-					.collect()
-				).map_err(client_err)
-			))),
-			Err(error) => Either::Right(ready(Err(error))),
-		})
+	resolve_header(remote_blockchain, &*fetcher, block).then(move |result| match result {
+		Ok(header) => Either::Left(
+			fetcher
+				.remote_read(RemoteReadRequest {
+					block,
+					header,
+					keys,
+					retry_count: Default::default(),
+				})
+				.then(|result| {
+					ready(
+						result
+							.map(|result| {
+								result
+									.into_iter()
+									.map(|(key, value)| (StorageKey(key), value.map(StorageData)))
+									.collect()
+							})
+							.map_err(client_err),
+					)
+				}),
+		),
+		Err(error) => Either::Right(ready(Err(error))),
+	})
 }
 
 /// Returns subscription stream that issues request on every imported block and
@@ -654,9 +675,11 @@ fn subscription_stream<
 	Block,
 	Requests,
 	FutureBlocksStream,
-	V, N,
+	V,
+	N,
 	InitialRequestFuture,
-	IssueRequest, IssueRequestFuture,
+	IssueRequest,
+	IssueRequestFuture,
 	CompareValues,
 >(
 	shared_requests: Requests,
@@ -664,12 +687,14 @@ fn subscription_stream<
 	initial_request: InitialRequestFuture,
 	issue_request: IssueRequest,
 	compare_values: CompareValues,
-) -> impl Stream<Item=N, Error=()> where
+) -> impl Stream<Item = N, Error = ()>
+where
 	Block: BlockT,
 	Requests: 'static + SharedRequests<Block::Hash, V>,
-	FutureBlocksStream: Stream<Item=Block::Hash, Error=()>,
+	FutureBlocksStream: Stream<Item = Block::Hash, Error = ()>,
 	V: Send + 'static + Clone,
-	InitialRequestFuture: std::future::Future<Output = Result<(Block::Hash, V), ()>> + Send + 'static,
+	InitialRequestFuture:
+		std::future::Future<Output = Result<(Block::Hash, V), ()>> + Send + 'static,
 	IssueRequest: 'static + Fn(Block::Hash) -> IssueRequestFuture,
 	IssueRequestFuture: std::future::Future<Output = Result<V, Error>> + Send + 'static,
 	CompareValues: Fn(Block::Hash, Option<&V>, &V) -> Option<N>,
@@ -678,33 +703,39 @@ fn subscription_stream<
 	let previous_value = Arc::new(Mutex::new(None));
 
 	// prepare 'stream' of initial values
-	let initial_value_stream = ignore_error(initial_request)
-		.boxed()
-		.compat()
-		.into_stream();
+	let initial_value_stream = ignore_error(initial_request).boxed().compat().into_stream();
 
 	// prepare stream of future values
 	//
 	// we do not want to stop stream if single request fails
 	// (the warning should have been already issued by the request issuer)
-	let future_values_stream = future_blocks_stream
-		.and_then(move |block| ignore_error(maybe_share_remote_request::<Block, _, _, _, _>(
-			shared_requests.clone(),
-			block,
-			&issue_request,
-		).map(move |r| r.map(|v| (block, v)))).boxed().compat());
+	let future_values_stream = future_blocks_stream.and_then(move |block| {
+		ignore_error(
+			maybe_share_remote_request::<Block, _, _, _, _>(
+				shared_requests.clone(),
+				block,
+				&issue_request,
+			)
+			.map(move |r| r.map(|v| (block, v))),
+		)
+		.boxed()
+		.compat()
+	});
 
 	// now let's return changed values for selected blocks
 	initial_value_stream
 		.chain(future_values_stream)
-		.filter_map(move |block_and_new_value| block_and_new_value.and_then(|(block, new_value)| {
-			let mut previous_value = previous_value.lock();
-			compare_values(block, previous_value.as_ref(), &new_value)
-				.map(|notification_value| {
-					*previous_value = Some(new_value);
-					notification_value
-				})
-		}))
+		.filter_map(move |block_and_new_value| {
+			block_and_new_value.and_then(|(block, new_value)| {
+				let mut previous_value = previous_value.lock();
+				compare_values(block, previous_value.as_ref(), &new_value).map(
+					|notification_value| {
+						*previous_value = Some(new_value);
+						notification_value
+					},
+				)
+			})
+		})
 		.map_err(|_| ())
 }
 
@@ -714,7 +745,8 @@ fn maybe_share_remote_request<Block: BlockT, Requests, V, IssueRequest, IssueReq
 	shared_requests: Requests,
 	block: Block::Hash,
 	issue_request: &IssueRequest,
-) -> impl std::future::Future<Output = Result<V, ()>> where
+) -> impl std::future::Future<Output = Result<V, ()>>
+where
 	V: Clone,
 	Requests: SharedRequests<Block::Hash, V>,
 	IssueRequest: Fn(Block::Hash) -> IssueRequestFuture,
@@ -725,55 +757,58 @@ fn maybe_share_remote_request<Block: BlockT, Requests, V, IssueRequest, IssueReq
 
 	// if that isn't the first request - just listen for existing request' response
 	if !need_issue_request {
-		return Either::Right(receiver.then(|r| ready(r.unwrap_or(Err(())))));
+		return Either::Right(receiver.then(|r| ready(r.unwrap_or(Err(())))))
 	}
 
 	// that is the first request - issue remote request + notify all listeners on
 	// completion
-	Either::Left(
-		display_error(issue_request(block))
-			.then(move |remote_result| {
-				let listeners = shared_requests.on_response_received(block);
-				// skip first element, because this future is the first element
-				for receiver in listeners.into_iter().skip(1) {
-					if let Err(_) = receiver.send(remote_result.clone()) {
-						// we don't care if receiver has been dropped already
-					}
-				}
+	Either::Left(display_error(issue_request(block)).then(move |remote_result| {
+		let listeners = shared_requests.on_response_received(block);
+		// skip first element, because this future is the first element
+		for receiver in listeners.into_iter().skip(1) {
+			if let Err(_) = receiver.send(remote_result.clone()) {
+				// we don't care if receiver has been dropped already
+			}
+		}
 
-				ready(remote_result)
-			})
-	)
+		ready(remote_result)
+	}))
 }
 
 /// Convert successful future result into Ok(result) and error into Err(()),
 /// displaying warning.
-fn display_error<F, T>(future: F) -> impl std::future::Future<Output=Result<T, ()>> where
-	F: std::future::Future<Output=Result<T, Error>>
+fn display_error<F, T>(future: F) -> impl std::future::Future<Output = Result<T, ()>>
+where
+	F: std::future::Future<Output = Result<T, Error>>,
 {
-	future.then(|result| ready(result.or_else(|err| {
+	future.then(|result| {
+		ready(result.or_else(|err| {
 			warn!("Remote request for subscription data has failed with: {:?}", err);
 			Err(())
-		})))
+		}))
+	})
 }
 
 /// Convert successful future result into Ok(Some(result)) and error into Ok(None),
 /// displaying warning.
-fn ignore_error<F, T>(future: F) -> impl std::future::Future<Output=Result<Option<T>, ()>> where
-	F: std::future::Future<Output=Result<T, ()>>
+fn ignore_error<F, T>(future: F) -> impl std::future::Future<Output = Result<Option<T>, ()>>
+where
+	F: std::future::Future<Output = Result<T, ()>>,
 {
-	future.then(|result| ready(match result {
-		Ok(result) => Ok(Some(result)),
-		Err(()) => Ok(None),
-	}))
+	future.then(|result| {
+		ready(match result {
+			Ok(result) => Ok(Some(result)),
+			Err(()) => Ok(None),
+		})
+	})
 }
 
 #[cfg(test)]
 mod tests {
+	use super::*;
 	use rpc::futures::stream::futures_ordered;
-	use substrate_test_runtime_client::runtime::Block;
 	use sp_core::H256;
-	use super::*;
+	use substrate_test_runtime_client::runtime::Block;
 
 	#[test]
 	fn subscription_stream_works() {
@@ -789,13 +824,10 @@ mod tests {
 			|_, old_value, new_value| match old_value == Some(new_value) {
 				true => None,
 				false => Some(new_value.clone()),
-			}
+			},
 		);
 
-		assert_eq!(
-			stream.collect().wait(),
-			Ok(vec![100, 200])
-		);
+		assert_eq!(stream.collect().wait(), Ok(vec![100, 200]));
 	}
 
 	#[test]
@@ -812,13 +844,10 @@ mod tests {
 			|_, old_value, new_value| match old_value == Some(new_value) {
 				true => None,
 				false => Some(new_value.clone()),
-			}
+			},
 		);
 
-		assert_eq!(
-			stream.collect().wait(),
-			Ok(vec![100, 200])
-		);
+		assert_eq!(stream.collect().wait(), Ok(vec![100, 200]));
 	}
 
 	#[test]
@@ -828,10 +857,7 @@ mod tests {
 		let shared_requests = SimpleSubscriptions::default();
 
 		// let's 'issue' requests for B1
-		shared_requests.lock().insert(
-			H256::from([1; 32]),
-			vec![channel().0],
-		);
+		shared_requests.lock().insert(H256::from([1; 32]), vec![channel().0]);
 
 		// make sure that no additional requests are issued when we're asking for B1
 		let _ = maybe_share_remote_request::<Block, _, _, _, UnreachableFuture>(
diff --git a/client/rpc/src/state/tests.rs b/client/rpc/src/state/tests.rs
index c9cb0bde89c1..2a73ae31f357 100644
--- a/client/rpc/src/state/tests.rs
+++ b/client/rpc/src/state/tests.rs
@@ -16,26 +16,20 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use super::*;
-use super::state_full::split_range;
 use self::error::Error;
+use super::{state_full::split_range, *};
 
-use std::sync::Arc;
+use crate::testing::TaskExecutor;
 use assert_matches::assert_matches;
+use futures::{compat::Future01CompatExt, executor};
 use futures01::stream::Stream;
-use sp_core::{storage::ChildInfo, ChangesTrieConfiguration};
-use sp_core::hash::H256;
 use sc_block_builder::BlockBuilderProvider;
-use sp_io::hashing::blake2_256;
-use substrate_test_runtime_client::{
-	prelude::*,
-	sp_consensus::BlockOrigin,
-	runtime,
-};
 use sc_rpc_api::DenyUnsafe;
+use sp_core::{hash::H256, storage::ChildInfo, ChangesTrieConfiguration};
+use sp_io::hashing::blake2_256;
 use sp_runtime::generic::BlockId;
-use crate::testing::TaskExecutor;
-use futures::{executor, compat::Future01CompatExt};
+use std::sync::Arc;
+use substrate_test_runtime_client::{prelude::*, runtime, sp_consensus::BlockOrigin};
 
 const STORAGE_KEY: &[u8] = b"child";
 
@@ -68,12 +62,18 @@ fn should_return_storage() {
 	let key = StorageKey(KEY.to_vec());
 
 	assert_eq!(
-		client.storage(key.clone(), Some(genesis_hash).into()).wait()
-			.map(|x| x.map(|x| x.0.len())).unwrap().unwrap() as usize,
+		client
+			.storage(key.clone(), Some(genesis_hash).into())
+			.wait()
+			.map(|x| x.map(|x| x.0.len()))
+			.unwrap()
+			.unwrap() as usize,
 		VALUE.len(),
 	);
 	assert_matches!(
-		client.storage_hash(key.clone(), Some(genesis_hash).into()).wait()
+		client
+			.storage_hash(key.clone(), Some(genesis_hash).into())
+			.wait()
 			.map(|x| x.is_some()),
 		Ok(true)
 	);
@@ -87,10 +87,13 @@ fn should_return_storage() {
 	);
 	assert_eq!(
 		executor::block_on(
-			child.storage(prefixed_storage_key(), key, Some(genesis_hash).into())
+			child
+				.storage(prefixed_storage_key(), key, Some(genesis_hash).into())
 				.map(|x| x.map(|x| x.0.len()))
 				.compat(),
-		).unwrap().unwrap() as usize,
+		)
+		.unwrap()
+		.unwrap() as usize,
 		CHILD_VALUE.len(),
 	);
 }
@@ -98,20 +101,17 @@ fn should_return_storage() {
 #[test]
 fn should_return_child_storage() {
 	let child_info = ChildInfo::new_default(STORAGE_KEY);
-	let client = Arc::new(substrate_test_runtime_client::TestClientBuilder::new()
-		.add_child_storage(&child_info, "key", vec![42_u8])
-		.build());
-	let genesis_hash = client.genesis_hash();
-	let (_client, child) = new_full(
-		client,
-		SubscriptionManager::new(Arc::new(TaskExecutor)),
-		DenyUnsafe::No,
-		None,
+	let client = Arc::new(
+		substrate_test_runtime_client::TestClientBuilder::new()
+			.add_child_storage(&child_info, "key", vec![42_u8])
+			.build(),
 	);
+	let genesis_hash = client.genesis_hash();
+	let (_client, child) =
+		new_full(client, SubscriptionManager::new(Arc::new(TaskExecutor)), DenyUnsafe::No, None);
 	let child_key = prefixed_storage_key();
 	let key = StorageKey(b"key".to_vec());
 
-
 	assert_matches!(
 		child.storage(
 			child_key.clone(),
@@ -121,36 +121,26 @@ fn should_return_child_storage() {
 		Ok(Some(StorageData(ref d))) if d[0] == 42 && d.len() == 1
 	);
 	assert_matches!(
-		child.storage_hash(
-			child_key.clone(),
-			key.clone(),
-			Some(genesis_hash).into(),
-		).wait().map(|x| x.is_some()),
+		child
+			.storage_hash(child_key.clone(), key.clone(), Some(genesis_hash).into(),)
+			.wait()
+			.map(|x| x.is_some()),
 		Ok(true)
 	);
-	assert_matches!(
-		child.storage_size(
-			child_key.clone(),
-			key.clone(),
-			None,
-		).wait(),
-		Ok(Some(1))
-	);
+	assert_matches!(child.storage_size(child_key.clone(), key.clone(), None,).wait(), Ok(Some(1)));
 }
 
 #[test]
 fn should_call_contract() {
 	let client = Arc::new(substrate_test_runtime_client::new());
 	let genesis_hash = client.genesis_hash();
-	let (client, _child) = new_full(
-		client,
-		SubscriptionManager::new(Arc::new(TaskExecutor)),
-		DenyUnsafe::No,
-		None,
-	);
+	let (client, _child) =
+		new_full(client, SubscriptionManager::new(Arc::new(TaskExecutor)), DenyUnsafe::No, None);
 
 	assert_matches!(
-		client.call("balanceOf".into(), Bytes(vec![1,2,3]), Some(genesis_hash).into()).wait(),
+		client
+			.call("balanceOf".into(), Bytes(vec![1, 2, 3]), Some(genesis_hash).into())
+			.wait(),
 		Err(Error::Client(_))
 	)
 }
@@ -171,18 +161,17 @@ fn should_notify_about_storage_changes() {
 		api.subscribe_storage(Default::default(), subscriber, None.into());
 
 		// assert id assigned
-		assert!(matches!(
-			executor::block_on(id.compat()),
-			Ok(Ok(SubscriptionId::String(_)))
-		));
+		assert!(matches!(executor::block_on(id.compat()), Ok(Ok(SubscriptionId::String(_)))));
 
 		let mut builder = client.new_block(Default::default()).unwrap();
-		builder.push_transfer(runtime::Transfer {
-			from: AccountKeyring::Alice.into(),
-			to: AccountKeyring::Ferdie.into(),
-			amount: 42,
-			nonce: 0,
-		}).unwrap();
+		builder
+			.push_transfer(runtime::Transfer {
+				from: AccountKeyring::Alice.into(),
+				to: AccountKeyring::Ferdie.into(),
+				amount: 42,
+				nonce: 0,
+			})
+			.unwrap();
 		let block = builder.build().unwrap().block;
 		executor::block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	}
@@ -207,25 +196,27 @@ fn should_send_initial_storage_changes_and_notifications() {
 			None,
 		);
 
-		let alice_balance_key = blake2_256(&runtime::system::balance_of_key(AccountKeyring::Alice.into()));
+		let alice_balance_key =
+			blake2_256(&runtime::system::balance_of_key(AccountKeyring::Alice.into()));
 
-		api.subscribe_storage(Default::default(), subscriber, Some(vec![
-			StorageKey(alice_balance_key.to_vec()),
-		]).into());
+		api.subscribe_storage(
+			Default::default(),
+			subscriber,
+			Some(vec![StorageKey(alice_balance_key.to_vec())]).into(),
+		);
 
 		// assert id assigned
-		assert!(matches!(
-			executor::block_on(id.compat()),
-			Ok(Ok(SubscriptionId::String(_)))
-		));
+		assert!(matches!(executor::block_on(id.compat()), Ok(Ok(SubscriptionId::String(_)))));
 
 		let mut builder = client.new_block(Default::default()).unwrap();
-		builder.push_transfer(runtime::Transfer {
-			from: AccountKeyring::Alice.into(),
-			to: AccountKeyring::Ferdie.into(),
-			amount: 42,
-			nonce: 0,
-		}).unwrap();
+		builder
+			.push_transfer(runtime::Transfer {
+				from: AccountKeyring::Alice.into(),
+				to: AccountKeyring::Ferdie.into(),
+				amount: 42,
+				nonce: 0,
+			})
+			.unwrap();
 		let block = builder.build().unwrap().block;
 		executor::block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	}
@@ -257,9 +248,13 @@ fn should_query_storage() {
 			// fake change: None -> Some(value) -> Some(value)
 			builder.push_storage_change(vec![2], Some(vec![2])).unwrap();
 			// actual change: None -> Some(value) -> None
-			builder.push_storage_change(vec![3], if nonce == 0 { Some(vec![3]) } else { None }).unwrap();
+			builder
+				.push_storage_change(vec![3], if nonce == 0 { Some(vec![3]) } else { None })
+				.unwrap();
 			// actual change: None -> Some(value)
-			builder.push_storage_change(vec![4], if nonce == 0 { None } else { Some(vec![4]) }).unwrap();
+			builder
+				.push_storage_change(vec![4], if nonce == 0 { None } else { Some(vec![4]) })
+				.unwrap();
 			// actual change: Some(value1) -> Some(value2)
 			builder.push_storage_change(vec![5], Some(vec![nonce as u8])).unwrap();
 			let block = builder.build().unwrap().block;
@@ -301,20 +296,12 @@ fn should_query_storage() {
 
 		// Query changes only up to block1
 		let keys = (1..6).map(|k| StorageKey(vec![k])).collect::<Vec<_>>();
-		let result = api.query_storage(
-			keys.clone(),
-			genesis_hash,
-			Some(block1_hash).into(),
-		);
+		let result = api.query_storage(keys.clone(), genesis_hash, Some(block1_hash).into());
 
 		assert_eq!(result.wait().unwrap(), expected);
 
 		// Query all changes
-		let result = api.query_storage(
-			keys.clone(),
-			genesis_hash,
-			None.into(),
-		);
+		let result = api.query_storage(keys.clone(), genesis_hash, None.into());
 
 		expected.push(StorageChangeSet {
 			block: block2_hash,
@@ -327,20 +314,12 @@ fn should_query_storage() {
 		assert_eq!(result.wait().unwrap(), expected);
 
 		// Query changes up to block2.
-		let result = api.query_storage(
-			keys.clone(),
-			genesis_hash,
-			Some(block2_hash),
-		);
+		let result = api.query_storage(keys.clone(), genesis_hash, Some(block2_hash));
 
 		assert_eq!(result.wait().unwrap(), expected);
 
 		// Inverted range.
-		let result = api.query_storage(
-			keys.clone(),
-			block1_hash,
-			Some(genesis_hash),
-		);
+		let result = api.query_storage(keys.clone(), block1_hash, Some(genesis_hash));
 
 		assert_eq!(
 			result.wait().map_err(|e| e.to_string()),
@@ -348,18 +327,15 @@ fn should_query_storage() {
 				from: format!("1 ({:?})", block1_hash),
 				to: format!("0 ({:?})", genesis_hash),
 				details: "from number > to number".to_owned(),
-			}).map_err(|e| e.to_string())
+			})
+			.map_err(|e| e.to_string())
 		);
 
 		let random_hash1 = H256::random();
 		let random_hash2 = H256::random();
 
 		// Invalid second hash.
-		let result = api.query_storage(
-			keys.clone(),
-			genesis_hash,
-			Some(random_hash1),
-		);
+		let result = api.query_storage(keys.clone(), genesis_hash, Some(random_hash1));
 
 		assert_eq!(
 			result.wait().map_err(|e| e.to_string()),
@@ -367,15 +343,12 @@ fn should_query_storage() {
 				from: format!("{:?}", genesis_hash),
 				to: format!("{:?}", Some(random_hash1)),
 				details: format!("UnknownBlock: header not found in db: {}", random_hash1),
-			}).map_err(|e| e.to_string())
+			})
+			.map_err(|e| e.to_string())
 		);
 
 		// Invalid first hash with Some other hash.
-		let result = api.query_storage(
-			keys.clone(),
-			random_hash1,
-			Some(genesis_hash),
-		);
+		let result = api.query_storage(keys.clone(), random_hash1, Some(genesis_hash));
 
 		assert_eq!(
 			result.wait().map_err(|e| e.to_string()),
@@ -383,15 +356,12 @@ fn should_query_storage() {
 				from: format!("{:?}", random_hash1),
 				to: format!("{:?}", Some(genesis_hash)),
 				details: format!("UnknownBlock: header not found in db: {}", random_hash1),
-			}).map_err(|e| e.to_string()),
+			})
+			.map_err(|e| e.to_string()),
 		);
 
 		// Invalid first hash with None.
-		let result = api.query_storage(
-			keys.clone(),
-			random_hash1,
-			None,
-		);
+		let result = api.query_storage(keys.clone(), random_hash1, None);
 
 		assert_eq!(
 			result.wait().map_err(|e| e.to_string()),
@@ -399,15 +369,12 @@ fn should_query_storage() {
 				from: format!("{:?}", random_hash1),
 				to: format!("{:?}", Some(block2_hash)), // Best block hash.
 				details: format!("UnknownBlock: header not found in db: {}", random_hash1),
-			}).map_err(|e| e.to_string()),
+			})
+			.map_err(|e| e.to_string()),
 		);
 
 		// Both hashes invalid.
-		let result = api.query_storage(
-			keys.clone(),
-			random_hash1,
-			Some(random_hash2),
-		);
+		let result = api.query_storage(keys.clone(), random_hash1, Some(random_hash2));
 
 		assert_eq!(
 			result.wait().map_err(|e| e.to_string()),
@@ -415,29 +382,25 @@ fn should_query_storage() {
 				from: format!("{:?}", random_hash1), // First hash not found.
 				to: format!("{:?}", Some(random_hash2)),
 				details: format!("UnknownBlock: header not found in db: {}", random_hash1),
-			}).map_err(|e| e.to_string()),
+			})
+			.map_err(|e| e.to_string()),
 		);
 
 		// single block range
-		let result = api.query_storage_at(
-			keys.clone(),
-			Some(block1_hash),
-		);
+		let result = api.query_storage_at(keys.clone(), Some(block1_hash));
 
 		assert_eq!(
 			result.wait().unwrap(),
-			vec![
-				StorageChangeSet {
-					block: block1_hash,
-					changes: vec![
-						(StorageKey(vec![1_u8]), None),
-						(StorageKey(vec![2_u8]), Some(StorageData(vec![2_u8]))),
-						(StorageKey(vec![3_u8]), Some(StorageData(vec![3_u8]))),
-						(StorageKey(vec![4_u8]), None),
-						(StorageKey(vec![5_u8]), Some(StorageData(vec![0_u8]))),
-					]
-				}
-			]
+			vec![StorageChangeSet {
+				block: block1_hash,
+				changes: vec![
+					(StorageKey(vec![1_u8]), None),
+					(StorageKey(vec![2_u8]), Some(StorageData(vec![2_u8]))),
+					(StorageKey(vec![3_u8]), Some(StorageData(vec![3_u8]))),
+					(StorageKey(vec![4_u8]), None),
+					(StorageKey(vec![5_u8]), Some(StorageData(vec![0_u8]))),
+				]
+			}]
 		);
 	}
 
@@ -461,7 +424,6 @@ fn should_split_ranges() {
 	assert_eq!(split_range(100, Some(99)), (0..99, Some(99..100)));
 }
 
-
 #[test]
 fn should_return_runtime_version() {
 	let client = Arc::new(substrate_test_runtime_client::new());
@@ -503,17 +465,13 @@ fn should_notify_on_runtime_version_initially() {
 		api.subscribe_runtime_version(Default::default(), subscriber);
 
 		// assert id assigned
-		assert!(matches!(
-			executor::block_on(id.compat()),
-			Ok(Ok(SubscriptionId::String(_)))
-		));
-
+		assert!(matches!(executor::block_on(id.compat()), Ok(Ok(SubscriptionId::String(_)))));
 	}
 
 	// assert initial version sent.
 	let (notification, next) = executor::block_on(transport.into_future().compat()).unwrap();
 	assert!(notification.is_some());
-		// no more notifications on this channel
+	// no more notifications on this channel
 	assert_eq!(executor::block_on(next.into_future().compat()).unwrap().0, None);
 }
 
diff --git a/client/rpc/src/system/mod.rs b/client/rpc/src/system/mod.rs
index d405755731cc..08258640ad7a 100644
--- a/client/rpc/src/system/mod.rs
+++ b/client/rpc/src/system/mod.rs
@@ -21,24 +21,25 @@
 #[cfg(test)]
 mod tests;
 
-use futures::{future::BoxFuture, FutureExt, TryFutureExt};
-use futures::{channel::oneshot, compat::Compat};
+use futures::{channel::oneshot, compat::Compat, future::BoxFuture, FutureExt, TryFutureExt};
 use sc_rpc_api::{DenyUnsafe, Receiver};
 use sc_tracing::logging;
-use sp_utils::mpsc::TracingUnboundedSender;
 use sp_runtime::traits::{self, Header as HeaderT};
+use sp_utils::mpsc::TracingUnboundedSender;
 
 use self::error::Result;
 
+pub use self::{
+	gen_client::Client as SystemClient,
+	helpers::{Health, NodeRole, PeerInfo, SyncState, SystemInfo},
+};
 pub use sc_rpc_api::system::*;
-pub use self::helpers::{SystemInfo, Health, PeerInfo, NodeRole, SyncState};
-pub use self::gen_client::Client as SystemClient;
 
 /// Early exit for RPCs that require `--rpc-methods=Unsafe` to be enabled
 macro_rules! bail_if_unsafe {
 	($value: expr) => {
 		if let Err(err) = $value.check_if_safe() {
-			return async move { Err(err.into()) }.boxed().compat();
+			return async move { Err(err.into()) }.boxed().compat()
 		}
 	};
 }
@@ -85,11 +86,7 @@ impl<B: traits::Block> System<B> {
 		send_back: TracingUnboundedSender<Request<B>>,
 		deny_unsafe: DenyUnsafe,
 	) -> Self {
-		System {
-			info,
-			send_back,
-			deny_unsafe,
-		}
+		System { info, send_back, deny_unsafe }
 	}
 }
 
@@ -132,35 +129,36 @@ impl<B: traits::Block> SystemApi<B::Hash, <B::Header as HeaderT>::Number> for Sy
 		Receiver(Compat::new(rx))
 	}
 
-	fn system_peers(&self)
-		-> Compat<BoxFuture<'static, rpc::Result<Vec<PeerInfo<B::Hash, <B::Header as HeaderT>::Number>>>>>
-	{
+	fn system_peers(
+		&self,
+	) -> Compat<
+		BoxFuture<'static, rpc::Result<Vec<PeerInfo<B::Hash, <B::Header as HeaderT>::Number>>>>,
+	> {
 		bail_if_unsafe!(self.deny_unsafe);
 
 		let (tx, rx) = oneshot::channel();
 		let _ = self.send_back.unbounded_send(Request::Peers(tx));
 
-		async move {
-			rx.await.map_err(|_| rpc::Error::internal_error())
-		}.boxed().compat()
+		async move { rx.await.map_err(|_| rpc::Error::internal_error()) }
+			.boxed()
+			.compat()
 	}
 
-	fn system_network_state(&self)
-		-> Compat<BoxFuture<'static, rpc::Result<rpc::Value>>>
-	{
+	fn system_network_state(&self) -> Compat<BoxFuture<'static, rpc::Result<rpc::Value>>> {
 		bail_if_unsafe!(self.deny_unsafe);
 
 		let (tx, rx) = oneshot::channel();
 		let _ = self.send_back.unbounded_send(Request::NetworkState(tx));
 
-		async move {
-			rx.await.map_err(|_| rpc::Error::internal_error())
-		}.boxed().compat()
+		async move { rx.await.map_err(|_| rpc::Error::internal_error()) }
+			.boxed()
+			.compat()
 	}
 
-	fn system_add_reserved_peer(&self, peer: String)
-		-> Compat<BoxFuture<'static, std::result::Result<(), rpc::Error>>>
-	{
+	fn system_add_reserved_peer(
+		&self,
+		peer: String,
+	) -> Compat<BoxFuture<'static, std::result::Result<(), rpc::Error>>> {
 		bail_if_unsafe!(self.deny_unsafe);
 
 		let (tx, rx) = oneshot::channel();
@@ -171,12 +169,15 @@ impl<B: traits::Block> SystemApi<B::Hash, <B::Header as HeaderT>::Number> for Sy
 				Ok(Err(e)) => Err(rpc::Error::from(e)),
 				Err(_) => Err(rpc::Error::internal_error()),
 			}
-		}.boxed().compat()
+		}
+		.boxed()
+		.compat()
 	}
 
-	fn system_remove_reserved_peer(&self, peer: String)
-		-> Compat<BoxFuture<'static, std::result::Result<(), rpc::Error>>>
-	{
+	fn system_remove_reserved_peer(
+		&self,
+		peer: String,
+	) -> Compat<BoxFuture<'static, std::result::Result<(), rpc::Error>>> {
 		bail_if_unsafe!(self.deny_unsafe);
 
 		let (tx, rx) = oneshot::channel();
@@ -187,7 +188,9 @@ impl<B: traits::Block> SystemApi<B::Hash, <B::Header as HeaderT>::Number> for Sy
 				Ok(Err(e)) => Err(rpc::Error::from(e)),
 				Err(_) => Err(rpc::Error::internal_error()),
 			}
-		}.boxed().compat()
+		}
+		.boxed()
+		.compat()
 	}
 
 	fn system_reserved_peers(&self) -> Receiver<Vec<String>> {
@@ -214,7 +217,7 @@ impl<B: traits::Block> SystemApi<B::Hash, <B::Header as HeaderT>::Number> for Sy
 		logging::reload_filter().map_err(|_e| rpc::Error::internal_error())
 	}
 
-	fn system_reset_log_filter(&self)-> std::result::Result<(), rpc::Error> {
+	fn system_reset_log_filter(&self) -> std::result::Result<(), rpc::Error> {
 		self.deny_unsafe.check_if_safe()?;
 		logging::reset_log_filter().map_err(|_e| rpc::Error::internal_error())
 	}
diff --git a/client/rpc/src/system/tests.rs b/client/rpc/src/system/tests.rs
index 6e22004cd65f..906bd60229d1 100644
--- a/client/rpc/src/system/tests.rs
+++ b/client/rpc/src/system/tests.rs
@@ -18,13 +18,17 @@
 
 use super::*;
 
-use sc_network::{self, PeerId};
-use sc_network::config::Role;
-use substrate_test_runtime_client::runtime::Block;
 use assert_matches::assert_matches;
 use futures::prelude::*;
+use sc_network::{self, config::Role, PeerId};
 use sp_utils::mpsc::tracing_unbounded;
-use std::{process::{Stdio, Command}, env, io::{BufReader, BufRead, Write}, thread};
+use std::{
+	env,
+	io::{BufRead, BufReader, Write},
+	process::{Command, Stdio},
+	thread,
+};
+use substrate_test_runtime_client::runtime::Block;
 
 struct Status {
 	pub peers: usize,
@@ -35,12 +39,7 @@ struct Status {
 
 impl Default for Status {
 	fn default() -> Status {
-		Status {
-			peer_id: PeerId::random(),
-			peers: 0,
-			is_syncing: false,
-			is_dev: false,
-		}
+		Status { peer_id: PeerId::random(), peers: 0, is_syncing: false, is_dev: false }
 	}
 }
 
@@ -59,7 +58,8 @@ fn api<T: Into<Option<Status>>>(sync: T) -> System<Block> {
 					});
 				},
 				Request::LocalPeerId(sender) => {
-					let _ = sender.send("QmSk5HQbn6LhUwDiNMseVUjuRYhEtYj4aUZ6WfWoGURpdV".to_string());
+					let _ =
+						sender.send("QmSk5HQbn6LhUwDiNMseVUjuRYhEtYj4aUZ6WfWoGURpdV".to_string());
 				},
 				Request::LocalListenAddresses(sender) => {
 					let _ = sender.send(vec![
@@ -78,42 +78,48 @@ fn api<T: Into<Option<Status>>>(sync: T) -> System<Block> {
 						});
 					}
 					let _ = sender.send(peers);
-				}
+				},
 				Request::NetworkState(sender) => {
-					let _ = sender.send(serde_json::to_value(&sc_network::network_state::NetworkState {
-						peer_id: String::new(),
-						listened_addresses: Default::default(),
-						external_addresses: Default::default(),
-						connected_peers: Default::default(),
-						not_connected_peers: Default::default(),
-						peerset: serde_json::Value::Null,
-					}).unwrap());
+					let _ = sender.send(
+						serde_json::to_value(&sc_network::network_state::NetworkState {
+							peer_id: String::new(),
+							listened_addresses: Default::default(),
+							external_addresses: Default::default(),
+							connected_peers: Default::default(),
+							not_connected_peers: Default::default(),
+							peerset: serde_json::Value::Null,
+						})
+						.unwrap(),
+					);
 				},
 				Request::NetworkAddReservedPeer(peer, sender) => {
 					let _ = match sc_network::config::parse_str_addr(&peer) {
 						Ok(_) => sender.send(Ok(())),
-						Err(s) => sender.send(Err(error::Error::MalformattedPeerArg(s.to_string()))),
+						Err(s) =>
+							sender.send(Err(error::Error::MalformattedPeerArg(s.to_string()))),
 					};
 				},
 				Request::NetworkRemoveReservedPeer(peer, sender) => {
 					let _ = match peer.parse::<PeerId>() {
 						Ok(_) => sender.send(Ok(())),
-						Err(s) => sender.send(Err(error::Error::MalformattedPeerArg(s.to_string()))),
+						Err(s) =>
+							sender.send(Err(error::Error::MalformattedPeerArg(s.to_string()))),
 					};
-				}
+				},
 				Request::NetworkReservedPeers(sender) => {
-					let _ = sender.send(vec!["QmSk5HQbn6LhUwDiNMseVUjuRYhEtYj4aUZ6WfWoGURpdV".to_string()]);
-				}
+					let _ = sender
+						.send(vec!["QmSk5HQbn6LhUwDiNMseVUjuRYhEtYj4aUZ6WfWoGURpdV".to_string()]);
+				},
 				Request::NodeRoles(sender) => {
 					let _ = sender.send(vec![NodeRole::Authority]);
-				}
+				},
 				Request::SyncState(sender) => {
 					let _ = sender.send(SyncState {
 						starting_block: 1,
 						current_block: 2,
 						highest_block: Some(3),
 					});
-				}
+				},
 			};
 
 			future::ready(())
@@ -128,7 +134,7 @@ fn api<T: Into<Option<Status>>>(sync: T) -> System<Block> {
 			chain_type: Default::default(),
 		},
 		tx,
-		sc_rpc_api::DenyUnsafe::No
+		sc_rpc_api::DenyUnsafe::No,
 	)
 }
 
@@ -139,95 +145,58 @@ fn wait_receiver<T>(rx: Receiver<T>) -> T {
 
 #[test]
 fn system_name_works() {
-	assert_eq!(
-		api(None).system_name().unwrap(),
-		"testclient".to_owned(),
-	);
+	assert_eq!(api(None).system_name().unwrap(), "testclient".to_owned(),);
 }
 
 #[test]
 fn system_version_works() {
-	assert_eq!(
-		api(None).system_version().unwrap(),
-		"0.2.0".to_owned(),
-	);
+	assert_eq!(api(None).system_version().unwrap(), "0.2.0".to_owned(),);
 }
 
 #[test]
 fn system_chain_works() {
-	assert_eq!(
-		api(None).system_chain().unwrap(),
-		"testchain".to_owned(),
-	);
+	assert_eq!(api(None).system_chain().unwrap(), "testchain".to_owned(),);
 }
 
 #[test]
 fn system_properties_works() {
-	assert_eq!(
-		api(None).system_properties().unwrap(),
-		serde_json::map::Map::new(),
-	);
+	assert_eq!(api(None).system_properties().unwrap(), serde_json::map::Map::new(),);
 }
 
 #[test]
 fn system_type_works() {
-	assert_eq!(
-		api(None).system_type().unwrap(),
-		Default::default(),
-	);
+	assert_eq!(api(None).system_type().unwrap(), Default::default(),);
 }
 
 #[test]
 fn system_health() {
 	assert_matches!(
 		wait_receiver(api(None).system_health()),
-		Health {
-			peers: 0,
-			is_syncing: false,
-			should_have_peers: true,
-		}
+		Health { peers: 0, is_syncing: false, should_have_peers: true }
 	);
 
 	assert_matches!(
-		wait_receiver(api(Status {
-			peer_id: PeerId::random(),
-			peers: 5,
-			is_syncing: true,
-			is_dev: true,
-		}).system_health()),
-		Health {
-			peers: 5,
-			is_syncing: true,
-			should_have_peers: false,
-		}
+		wait_receiver(
+			api(Status { peer_id: PeerId::random(), peers: 5, is_syncing: true, is_dev: true })
+				.system_health()
+		),
+		Health { peers: 5, is_syncing: true, should_have_peers: false }
 	);
 
 	assert_eq!(
-		wait_receiver(api(Status {
-			peer_id: PeerId::random(),
-			peers: 5,
-			is_syncing: false,
-			is_dev: false,
-		}).system_health()),
-		Health {
-			peers: 5,
-			is_syncing: false,
-			should_have_peers: true,
-		}
+		wait_receiver(
+			api(Status { peer_id: PeerId::random(), peers: 5, is_syncing: false, is_dev: false })
+				.system_health()
+		),
+		Health { peers: 5, is_syncing: false, should_have_peers: true }
 	);
 
 	assert_eq!(
-		wait_receiver(api(Status {
-			peer_id: PeerId::random(),
-			peers: 0,
-			is_syncing: false,
-			is_dev: true,
-		}).system_health()),
-		Health {
-			peers: 0,
-			is_syncing: false,
-			should_have_peers: false,
-		}
+		wait_receiver(
+			api(Status { peer_id: PeerId::random(), peers: 0, is_syncing: false, is_dev: true })
+				.system_health()
+		),
+		Health { peers: 0, is_syncing: false, should_have_peers: false }
 	);
 }
 
@@ -244,8 +213,10 @@ fn system_local_listen_addresses_works() {
 	assert_eq!(
 		wait_receiver(api(None).system_local_listen_addresses()),
 		vec![
-			"/ip4/198.51.100.19/tcp/30333/p2p/QmSk5HQbn6LhUwDiNMseVUjuRYhEtYj4aUZ6WfWoGURpdV".to_string(),
-			"/ip4/127.0.0.1/tcp/30334/ws/p2p/QmSk5HQbn6LhUwDiNMseVUjuRYhEtYj4aUZ6WfWoGURpdV".to_string(),
+			"/ip4/198.51.100.19/tcp/30333/p2p/QmSk5HQbn6LhUwDiNMseVUjuRYhEtYj4aUZ6WfWoGURpdV"
+				.to_string(),
+			"/ip4/127.0.0.1/tcp/30334/ws/p2p/QmSk5HQbn6LhUwDiNMseVUjuRYhEtYj4aUZ6WfWoGURpdV"
+				.to_string(),
 		]
 	);
 }
@@ -255,12 +226,8 @@ fn system_peers() {
 	let mut runtime = tokio::runtime::current_thread::Runtime::new().unwrap();
 
 	let peer_id = PeerId::random();
-	let req = api(Status {
-		peer_id: peer_id.clone(),
-		peers: 1,
-		is_syncing: false,
-		is_dev: true,
-	}).system_peers();
+	let req = api(Status { peer_id: peer_id.clone(), peers: 1, is_syncing: false, is_dev: true })
+		.system_peers();
 	let res = runtime.block_on(req).unwrap();
 
 	assert_eq!(
@@ -295,27 +262,21 @@ fn system_network_state() {
 
 #[test]
 fn system_node_roles() {
-	assert_eq!(
-		wait_receiver(api(None).system_node_roles()),
-		vec![NodeRole::Authority]
-	);
+	assert_eq!(wait_receiver(api(None).system_node_roles()), vec![NodeRole::Authority]);
 }
 
 #[test]
 fn system_sync_state() {
 	assert_eq!(
 		wait_receiver(api(None).system_sync_state()),
-		SyncState {
-			starting_block: 1,
-			current_block: 2,
-			highest_block: Some(3),
-		}
+		SyncState { starting_block: 1, current_block: 2, highest_block: Some(3) }
 	);
 }
 
 #[test]
 fn system_network_add_reserved() {
-	let good_peer_id = "/ip4/198.51.100.19/tcp/30333/p2p/QmSk5HQbn6LhUwDiNMseVUjuRYhEtYj4aUZ6WfWoGURpdV";
+	let good_peer_id =
+		"/ip4/198.51.100.19/tcp/30333/p2p/QmSk5HQbn6LhUwDiNMseVUjuRYhEtYj4aUZ6WfWoGURpdV";
 	let bad_peer_id = "/ip4/198.51.100.19/tcp/30333";
 	let mut runtime = tokio::runtime::current_thread::Runtime::new().unwrap();
 
@@ -328,7 +289,8 @@ fn system_network_add_reserved() {
 #[test]
 fn system_network_remove_reserved() {
 	let good_peer_id = "QmSk5HQbn6LhUwDiNMseVUjuRYhEtYj4aUZ6WfWoGURpdV";
-	let bad_peer_id = "/ip4/198.51.100.19/tcp/30333/p2p/QmSk5HQbn6LhUwDiNMseVUjuRYhEtYj4aUZ6WfWoGURpdV";
+	let bad_peer_id =
+		"/ip4/198.51.100.19/tcp/30333/p2p/QmSk5HQbn6LhUwDiNMseVUjuRYhEtYj4aUZ6WfWoGURpdV";
 	let mut runtime = tokio::runtime::current_thread::Runtime::new().unwrap();
 
 	let good_fut = api(None).system_remove_reserved_peer(good_peer_id.into());
@@ -357,15 +319,17 @@ fn test_add_reset_log_filter() {
 		for line in std::io::stdin().lock().lines() {
 			let line = line.expect("Failed to read bytes");
 			if line.contains("add_reload") {
-				api(None).system_add_log_filter("test_after_add".into())
+				api(None)
+					.system_add_log_filter("test_after_add".into())
 					.expect("`system_add_log_filter` failed");
 			} else if line.contains("add_trace") {
-				api(None).system_add_log_filter("test_before_add=trace".into())
+				api(None)
+					.system_add_log_filter("test_before_add=trace".into())
 					.expect("`system_add_log_filter` failed");
 			} else if line.contains("reset") {
 				api(None).system_reset_log_filter().expect("`system_reset_log_filter` failed");
 			} else if line.contains("exit") {
-				return;
+				return
 			}
 			log::trace!(target: "test_before_add", "{}", EXPECTED_WITH_TRACE);
 			log::debug!(target: "test_before_add", "{}", EXPECTED_BEFORE_ADD);
diff --git a/client/rpc/src/testing.rs b/client/rpc/src/testing.rs
index b69cc7d4b194..e6b30ecdb42b 100644
--- a/client/rpc/src/testing.rs
+++ b/client/rpc/src/testing.rs
@@ -18,8 +18,8 @@
 
 //! Testing utils used by the RPC tests.
 
+use futures::{compat::Future01CompatExt, executor, FutureExt};
 use rpc::futures::future as future01;
-use futures::{executor, compat::Future01CompatExt, FutureExt};
 
 // Executor shared by all tests.
 //
@@ -38,7 +38,7 @@ impl future01::Executor<Boxed01Future01> for TaskExecutor {
 	fn execute(
 		&self,
 		future: Boxed01Future01,
-	) -> std::result::Result<(), future01::ExecuteError<Boxed01Future01>>{
+	) -> std::result::Result<(), future01::ExecuteError<Boxed01Future01>> {
 		EXECUTOR.spawn_ok(future.compat().map(drop));
 		Ok(())
 	}
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index 46590ce8e8c6..2885fb6deb54 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -17,65 +17,52 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{
-	error::Error, MallocSizeOfWasm, RpcHandlers,
-	start_rpc_servers, build_network_future, TransactionPoolAdapter, TaskManager, SpawnTaskHandle,
-	metrics::MetricsService,
+	build_network_future,
 	client::{light, Client, ClientConfig},
 	config::{Configuration, KeystoreConfig, PrometheusConfig, TransactionStorageMode},
+	error::Error,
+	metrics::MetricsService,
+	start_rpc_servers, MallocSizeOfWasm, RpcHandlers, SpawnTaskHandle, TaskManager,
+	TransactionPoolAdapter,
 };
-use sc_client_api::{
-	light::RemoteBlockchain, ForkBlocks, BadBlocks, UsageProvider, ExecutorProvider,
-};
-use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedSender};
-use sc_chain_spec::get_extension;
-use sp_consensus::{
-	block_validation::{BlockAnnounceValidator, DefaultBlockAnnounceValidator, Chain},
-	import_queue::ImportQueue,
-};
+use futures::{channel::oneshot, future::ready, FutureExt, StreamExt};
 use jsonrpc_pubsub::manager::SubscriptionManager;
-use futures::{
-	FutureExt, StreamExt,
-	future::ready,
-	channel::oneshot,
-};
-use sc_keystore::LocalKeystore;
 use log::info;
-use sc_network::config::{Role, OnDemand, SyncMode};
-use sc_network::NetworkService;
-use sc_network::block_request_handler::{self, BlockRequestHandler};
-use sc_network::state_request_handler::{self, StateRequestHandler};
-use sc_network::light_client_requests::{self, handler::LightClientRequestHandler};
-use sp_runtime::generic::BlockId;
-use sp_runtime::traits::{
-	Block as BlockT, HashFor, Zero, BlockIdTo,
+use prometheus_endpoint::Registry;
+use sc_chain_spec::get_extension;
+use sc_client_api::{
+	execution_extensions::ExecutionExtensions, light::RemoteBlockchain,
+	proof_provider::ProofProvider, BadBlocks, BlockBackend, BlockchainEvents, ExecutorProvider,
+	ForkBlocks, StorageProvider, UsageProvider,
 };
-use sp_api::{ProvideRuntimeApi, CallApiAt};
-use sc_executor::{NativeExecutor, NativeExecutionDispatch, RuntimeInfo};
-use std::{sync::Arc, str::FromStr};
-use wasm_timer::SystemTime;
-use sc_telemetry::{
-	telemetry,
-	ConnectionMessage,
-	Telemetry,
-	TelemetryHandle,
-	SUBSTRATE_INFO,
+use sc_client_db::{Backend, DatabaseSettings};
+use sc_executor::{NativeExecutionDispatch, NativeExecutor, RuntimeInfo};
+use sc_keystore::LocalKeystore;
+use sc_network::{
+	block_request_handler::{self, BlockRequestHandler},
+	config::{OnDemand, Role, SyncMode},
+	light_client_requests::{self, handler::LightClientRequestHandler},
+	state_request_handler::{self, StateRequestHandler},
+	NetworkService,
 };
+use sc_telemetry::{telemetry, ConnectionMessage, Telemetry, TelemetryHandle, SUBSTRATE_INFO};
 use sc_transaction_pool_api::MaintainedTransactionPool;
-use prometheus_endpoint::Registry;
-use sc_client_db::{Backend, DatabaseSettings};
-use sp_core::traits::{
-	CodeExecutor,
-	SpawnNamed,
+use sp_api::{CallApiAt, ProvideRuntimeApi};
+use sp_blockchain::{HeaderBackend, HeaderMetadata};
+use sp_consensus::{
+	block_validation::{BlockAnnounceValidator, Chain, DefaultBlockAnnounceValidator},
+	import_queue::ImportQueue,
 };
+use sp_core::traits::{CodeExecutor, SpawnNamed};
 use sp_keystore::{CryptoStore, SyncCryptoStore, SyncCryptoStorePtr};
-use sp_runtime::BuildStorage;
-use sc_client_api::{
-	BlockBackend, BlockchainEvents,
-	StorageProvider,
-	proof_provider::ProofProvider,
-	execution_extensions::ExecutionExtensions
+use sp_runtime::{
+	generic::BlockId,
+	traits::{Block as BlockT, BlockIdTo, HashFor, Zero},
+	BuildStorage,
 };
-use sp_blockchain::{HeaderMetadata, HeaderBackend};
+use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedSender};
+use std::{str::FromStr, sync::Arc};
+use wasm_timer::SystemTime;
 
 /// A utility trait for building an RPC extension given a `DenyUnsafe` instance.
 /// This is useful since at service definition time we don't know whether the
@@ -95,7 +82,8 @@ pub trait RpcExtensionBuilder {
 	) -> Self::Output;
 }
 
-impl<F, R> RpcExtensionBuilder for F where
+impl<F, R> RpcExtensionBuilder for F
+where
 	F: Fn(sc_rpc::DenyUnsafe, sc_rpc::SubscriptionTaskExecutor) -> R,
 	R: sc_rpc::RpcExtension<sc_rpc::Metadata>,
 {
@@ -115,7 +103,8 @@ impl<F, R> RpcExtensionBuilder for F where
 /// `DenyUnsafe` instance and return a static `RpcExtension` instance.
 pub struct NoopRpcExtensionBuilder<R>(pub R);
 
-impl<R> RpcExtensionBuilder for NoopRpcExtensionBuilder<R> where
+impl<R> RpcExtensionBuilder for NoopRpcExtensionBuilder<R>
+where
 	R: Clone + sc_rpc::RpcExtension<sc_rpc::Metadata>,
 {
 	type Output = R;
@@ -129,7 +118,8 @@ impl<R> RpcExtensionBuilder for NoopRpcExtensionBuilder<R> where
 	}
 }
 
-impl<R> From<R> for NoopRpcExtensionBuilder<R> where
+impl<R> From<R> for NoopRpcExtensionBuilder<R>
+where
 	R: sc_rpc::RpcExtension<sc_rpc::Metadata>,
 {
 	fn from(e: R) -> NoopRpcExtensionBuilder<R> {
@@ -137,58 +127,37 @@ impl<R> From<R> for NoopRpcExtensionBuilder<R> where
 	}
 }
 
-
 /// Full client type.
-pub type TFullClient<TBl, TRtApi, TExecDisp> = Client<
-	TFullBackend<TBl>,
-	TFullCallExecutor<TBl, TExecDisp>,
-	TBl,
-	TRtApi,
->;
+pub type TFullClient<TBl, TRtApi, TExecDisp> =
+	Client<TFullBackend<TBl>, TFullCallExecutor<TBl, TExecDisp>, TBl, TRtApi>;
 
 /// Full client backend type.
 pub type TFullBackend<TBl> = sc_client_db::Backend<TBl>;
 
 /// Full client call executor type.
-pub type TFullCallExecutor<TBl, TExecDisp> = crate::client::LocalCallExecutor<
-	TBl,
-	sc_client_db::Backend<TBl>,
-	NativeExecutor<TExecDisp>,
->;
+pub type TFullCallExecutor<TBl, TExecDisp> =
+	crate::client::LocalCallExecutor<TBl, sc_client_db::Backend<TBl>, NativeExecutor<TExecDisp>>;
 
 /// Light client type.
-pub type TLightClient<TBl, TRtApi, TExecDisp> = TLightClientWithBackend<
-	TBl, TRtApi, TExecDisp, TLightBackend<TBl>
->;
+pub type TLightClient<TBl, TRtApi, TExecDisp> =
+	TLightClientWithBackend<TBl, TRtApi, TExecDisp, TLightBackend<TBl>>;
 
 /// Light client backend type.
-pub type TLightBackend<TBl> = sc_light::Backend<
-	sc_client_db::light::LightStorage<TBl>,
-	HashFor<TBl>,
->;
+pub type TLightBackend<TBl> =
+	sc_light::Backend<sc_client_db::light::LightStorage<TBl>, HashFor<TBl>>;
 
 /// Light call executor type.
 pub type TLightCallExecutor<TBl, TExecDisp> = sc_light::GenesisCallExecutor<
-	sc_light::Backend<
-		sc_client_db::light::LightStorage<TBl>,
-		HashFor<TBl>
-	>,
+	sc_light::Backend<sc_client_db::light::LightStorage<TBl>, HashFor<TBl>>,
 	crate::client::LocalCallExecutor<
 		TBl,
-		sc_light::Backend<
-			sc_client_db::light::LightStorage<TBl>,
-			HashFor<TBl>
-		>,
-		NativeExecutor<TExecDisp>
+		sc_light::Backend<sc_client_db::light::LightStorage<TBl>, HashFor<TBl>>,
+		NativeExecutor<TExecDisp>,
 	>,
 >;
 
-type TFullParts<TBl, TRtApi, TExecDisp> = (
-	TFullClient<TBl, TRtApi, TExecDisp>,
-	Arc<TFullBackend<TBl>>,
-	KeystoreContainer,
-	TaskManager,
-);
+type TFullParts<TBl, TRtApi, TExecDisp> =
+	(TFullClient<TBl, TRtApi, TExecDisp>, Arc<TFullBackend<TBl>>, KeystoreContainer, TaskManager);
 
 type TLightParts<TBl, TRtApi, TExecDisp> = (
 	Arc<TLightClient<TBl, TRtApi, TExecDisp>>,
@@ -199,10 +168,8 @@ type TLightParts<TBl, TRtApi, TExecDisp> = (
 );
 
 /// Light client backend type with a specific hash type.
-pub type TLightBackendWithHash<TBl, THash> = sc_light::Backend<
-	sc_client_db::light::LightStorage<TBl>,
-	THash,
->;
+pub type TLightBackendWithHash<TBl, THash> =
+	sc_light::Backend<sc_client_db::light::LightStorage<TBl>, THash>;
 
 /// Light client type with a specific backend.
 pub type TLightClientWithBackend<TBl, TRtApi, TExecDisp, TBackend> = Client<
@@ -220,7 +187,10 @@ trait AsCryptoStoreRef {
 	fn sync_keystore_ref(&self) -> Arc<dyn SyncCryptoStore>;
 }
 
-impl<T> AsCryptoStoreRef for Arc<T> where T: CryptoStore + SyncCryptoStore + 'static {
+impl<T> AsCryptoStoreRef for Arc<T>
+where
+	T: CryptoStore + SyncCryptoStore + 'static,
+{
 	fn keystore_ref(&self) -> Arc<dyn CryptoStore> {
 		self.clone()
 	}
@@ -239,14 +209,12 @@ impl KeystoreContainer {
 	/// Construct KeystoreContainer
 	pub fn new(config: &KeystoreConfig) -> Result<Self, Error> {
 		let keystore = Arc::new(match config {
-			KeystoreConfig::Path { path, password } => LocalKeystore::open(
-				path.clone(),
-				password.clone(),
-			)?,
+			KeystoreConfig::Path { path, password } =>
+				LocalKeystore::open(path.clone(), password.clone())?,
 			KeystoreConfig::InMemory => LocalKeystore::in_memory(),
 		});
 
-		Ok(Self{remote: Default::default(), local: keystore})
+		Ok(Self { remote: Default::default(), local: keystore })
 	}
 
 	/// Set the remote keystore.
@@ -255,7 +223,8 @@ impl KeystoreContainer {
 	/// does not reset any references previously handed out - they will
 	/// stick around.
 	pub fn set_remote_keystore<T>(&mut self, remote: Arc<T>)
-		where T: CryptoStore + SyncCryptoStore + 'static
+	where
+		T: CryptoStore + SyncCryptoStore + 'static,
 	{
 		self.remote = Some(Box::new(remote))
 	}
@@ -295,7 +264,8 @@ impl KeystoreContainer {
 pub fn new_full_client<TBl, TRtApi, TExecDisp>(
 	config: &Configuration,
 	telemetry: Option<TelemetryHandle>,
-) -> Result<TFullClient<TBl, TRtApi, TExecDisp>, Error> where
+) -> Result<TFullClient<TBl, TRtApi, TExecDisp>, Error>
+where
 	TBl: BlockT,
 	TExecDisp: NativeExecutionDispatch + 'static,
 	TBl::Hash: FromStr,
@@ -307,7 +277,8 @@ pub fn new_full_client<TBl, TRtApi, TExecDisp>(
 pub fn new_full_parts<TBl, TRtApi, TExecDisp>(
 	config: &Configuration,
 	telemetry: Option<TelemetryHandle>,
-) -> Result<TFullParts<TBl, TRtApi, TExecDisp>, Error> where
+) -> Result<TFullParts<TBl, TRtApi, TExecDisp>, Error>
+where
 	TBl: BlockT,
 	TExecDisp: NativeExecutionDispatch + 'static,
 	TBl::Hash: FromStr,
@@ -337,15 +308,13 @@ pub fn new_full_parts<TBl, TRtApi, TExecDisp>(
 	let (client, backend) = {
 		let db_config = sc_client_db::DatabaseSettings {
 			state_cache_size: config.state_cache_size,
-			state_cache_child_ratio:
-			config.state_cache_child_ratio.map(|v| (v, 100)),
+			state_cache_child_ratio: config.state_cache_child_ratio.map(|v| (v, 100)),
 			state_pruning: config.state_pruning.clone(),
 			source: config.database.clone(),
 			keep_blocks: config.keep_blocks.clone(),
 			transaction_storage: config.transaction_storage.clone(),
 		};
 
-
 		let backend = new_db_backend(db_config)?;
 
 		let extensions = sc_client_api::execution_extensions::ExecutionExtensions::new(
@@ -354,15 +323,20 @@ pub fn new_full_parts<TBl, TRtApi, TExecDisp>(
 			sc_offchain::OffchainDb::factory_from_backend(&*backend),
 		);
 
-		let wasm_runtime_substitutes = config.chain_spec.code_substitutes().into_iter().map(|(h, c)| {
-			let hash = TBl::Hash::from_str(&h)
-				.map_err(|_|
-					 Error::Application(Box::from(
-						format!("Failed to parse `{}` as block hash for code substitutes.", h)
-					))
-				)?;
-			Ok((hash, c))
-		}).collect::<Result<std::collections::HashMap<_, _>, Error>>()?;
+		let wasm_runtime_substitutes = config
+			.chain_spec
+			.code_substitutes()
+			.into_iter()
+			.map(|(h, c)| {
+				let hash = TBl::Hash::from_str(&h).map_err(|_| {
+					Error::Application(Box::from(format!(
+						"Failed to parse `{}` as block hash for code substitutes.",
+						h
+					)))
+				})?;
+				Ok((hash, c))
+			})
+			.collect::<Result<std::collections::HashMap<_, _>, Error>>()?;
 
 		let client = new_client(
 			backend.clone(),
@@ -375,10 +349,13 @@ pub fn new_full_parts<TBl, TRtApi, TExecDisp>(
 			config.prometheus_config.as_ref().map(|config| config.registry.clone()),
 			telemetry,
 			ClientConfig {
-				offchain_worker_enabled : config.offchain_worker.enabled,
+				offchain_worker_enabled: config.offchain_worker.enabled,
 				offchain_indexing_api: config.offchain_worker.indexing_enabled,
 				wasm_runtime_overrides: config.wasm_runtime_overrides.clone(),
-				no_genesis: matches!(config.network.sync_mode, sc_network::config::SyncMode::Fast {..}),
+				no_genesis: matches!(
+					config.network.sync_mode,
+					sc_network::config::SyncMode::Fast { .. }
+				),
 				wasm_runtime_substitutes,
 			},
 		)?;
@@ -386,19 +363,15 @@ pub fn new_full_parts<TBl, TRtApi, TExecDisp>(
 		(client, backend)
 	};
 
-	Ok((
-		client,
-		backend,
-		keystore_container,
-		task_manager,
-	))
+	Ok((client, backend, keystore_container, task_manager))
 }
 
 /// Create the initial parts of a light node.
 pub fn new_light_parts<TBl, TRtApi, TExecDisp>(
 	config: &Configuration,
 	telemetry: Option<TelemetryHandle>,
-) -> Result<TLightParts<TBl, TRtApi, TExecDisp>, Error> where
+) -> Result<TLightParts<TBl, TRtApi, TExecDisp>, Error>
+where
 	TBl: BlockT,
 	TExecDisp: NativeExecutionDispatch + 'static,
 {
@@ -417,8 +390,7 @@ pub fn new_light_parts<TBl, TRtApi, TExecDisp>(
 	let db_storage = {
 		let db_settings = sc_client_db::DatabaseSettings {
 			state_cache_size: config.state_cache_size,
-			state_cache_child_ratio:
-				config.state_cache_child_ratio.map(|v| (v, 100)),
+			state_cache_child_ratio: config.state_cache_child_ratio.map(|v| (v, 100)),
 			state_pruning: config.state_pruning.clone(),
 			source: config.database.clone(),
 			keep_blocks: config.keep_blocks.clone(),
@@ -427,13 +399,11 @@ pub fn new_light_parts<TBl, TRtApi, TExecDisp>(
 		sc_client_db::light::LightStorage::new(db_settings)?
 	};
 	let light_blockchain = sc_light::new_light_blockchain(db_storage);
-	let fetch_checker = Arc::new(
-		sc_light::new_fetch_checker::<_, TBl, _>(
-			light_blockchain.clone(),
-			executor.clone(),
-			Box::new(task_manager.spawn_handle()),
-		),
-	);
+	let fetch_checker = Arc::new(sc_light::new_fetch_checker::<_, TBl, _>(
+		light_blockchain.clone(),
+		executor.clone(),
+		Box::new(task_manager.spawn_handle()),
+	));
 	let on_demand = Arc::new(sc_network::config::OnDemand::new(fetch_checker));
 	let backend = sc_light::new_light_backend(light_blockchain);
 	let client = Arc::new(light::new_light(
@@ -451,7 +421,8 @@ pub fn new_light_parts<TBl, TRtApi, TExecDisp>(
 /// Create an instance of default DB-backend backend.
 pub fn new_db_backend<Block>(
 	settings: DatabaseSettings,
-) -> Result<Arc<Backend<Block>>, sp_blockchain::Error> where
+) -> Result<Arc<Backend<Block>>, sp_blockchain::Error>
+where
 	Block: BlockT,
 {
 	const CANONICALIZATION_DELAY: u64 = 4096;
@@ -480,11 +451,16 @@ pub fn new_client<E, Block, RA>(
 	>,
 	sp_blockchain::Error,
 >
-	where
-		Block: BlockT,
-		E: CodeExecutor + RuntimeInfo,
+where
+	Block: BlockT,
+	E: CodeExecutor + RuntimeInfo,
 {
-	let executor = crate::client::LocalCallExecutor::new(backend.clone(), executor, spawn_handle, config.clone())?;
+	let executor = crate::client::LocalCallExecutor::new(
+		backend.clone(),
+		executor,
+		spawn_handle,
+		config.clone(),
+	)?;
 	Ok(crate::client::Client::new(
 		backend,
 		executor,
@@ -534,10 +510,10 @@ pub fn build_offchain_workers<TBl, TCl>(
 	client: Arc<TCl>,
 	network: Arc<NetworkService<TBl, <TBl as BlockT>::Hash>>,
 ) -> Option<Arc<sc_offchain::OffchainWorkers<TCl, TBl>>>
-	where
-		TBl: BlockT,
-		TCl: Send + Sync + ProvideRuntimeApi<TBl> + BlockchainEvents<TBl> + 'static,
-		<TCl as ProvideRuntimeApi<TBl>>::Api: sc_offchain::OffchainWorkerApi<TBl>,
+where
+	TBl: BlockT,
+	TCl: Send + Sync + ProvideRuntimeApi<TBl> + BlockchainEvents<TBl> + 'static,
+	<TCl as ProvideRuntimeApi<TBl>>::Api: sc_offchain::OffchainWorkerApi<TBl>,
 {
 	let offchain_workers = Some(Arc::new(sc_offchain::OffchainWorkers::new(client.clone())));
 
@@ -551,7 +527,7 @@ pub fn build_offchain_workers<TBl, TCl>(
 				offchain,
 				Clone::clone(&spawn_handle),
 				network.clone(),
-			)
+			),
 		);
 	}
 
@@ -562,22 +538,32 @@ pub fn build_offchain_workers<TBl, TCl>(
 pub fn spawn_tasks<TBl, TBackend, TExPool, TRpc, TCl>(
 	params: SpawnTasksParams<TBl, TCl, TExPool, TRpc, TBackend>,
 ) -> Result<RpcHandlers, Error>
-	where
-		TCl: ProvideRuntimeApi<TBl> + HeaderMetadata<TBl, Error=sp_blockchain::Error> + Chain<TBl> +
-		BlockBackend<TBl> + BlockIdTo<TBl, Error=sp_blockchain::Error> + ProofProvider<TBl> +
-		HeaderBackend<TBl> + BlockchainEvents<TBl> + ExecutorProvider<TBl> + UsageProvider<TBl> +
-		StorageProvider<TBl, TBackend> + CallApiAt<TBl> + Send + 'static,
-		<TCl as ProvideRuntimeApi<TBl>>::Api:
-			sp_api::Metadata<TBl> +
-			sc_offchain::OffchainWorkerApi<TBl> +
-			sp_transaction_pool::runtime_api::TaggedTransactionQueue<TBl> +
-			sp_session::SessionKeys<TBl> +
-			sp_api::ApiExt<TBl, StateBackend = TBackend::State>,
-		TBl: BlockT,
-		TBackend: 'static + sc_client_api::backend::Backend<TBl> + Send,
-		TExPool: MaintainedTransactionPool<Block=TBl, Hash = <TBl as BlockT>::Hash> +
-			MallocSizeOfWasm + 'static,
-		TRpc: sc_rpc::RpcExtension<sc_rpc::Metadata>
+where
+	TCl: ProvideRuntimeApi<TBl>
+		+ HeaderMetadata<TBl, Error = sp_blockchain::Error>
+		+ Chain<TBl>
+		+ BlockBackend<TBl>
+		+ BlockIdTo<TBl, Error = sp_blockchain::Error>
+		+ ProofProvider<TBl>
+		+ HeaderBackend<TBl>
+		+ BlockchainEvents<TBl>
+		+ ExecutorProvider<TBl>
+		+ UsageProvider<TBl>
+		+ StorageProvider<TBl, TBackend>
+		+ CallApiAt<TBl>
+		+ Send
+		+ 'static,
+	<TCl as ProvideRuntimeApi<TBl>>::Api: sp_api::Metadata<TBl>
+		+ sc_offchain::OffchainWorkerApi<TBl>
+		+ sp_transaction_pool::runtime_api::TaggedTransactionQueue<TBl>
+		+ sp_session::SessionKeys<TBl>
+		+ sp_api::ApiExt<TBl, StateBackend = TBackend::State>,
+	TBl: BlockT,
+	TBackend: 'static + sc_client_api::backend::Backend<TBl> + Send,
+	TExPool: MaintainedTransactionPool<Block = TBl, Hash = <TBl as BlockT>::Hash>
+		+ MallocSizeOfWasm
+		+ 'static,
+	TRpc: sc_rpc::RpcExtension<sc_rpc::Metadata>,
 {
 	let SpawnTasksParams {
 		mut config,
@@ -600,17 +586,11 @@ pub fn spawn_tasks<TBl, TBackend, TExPool, TRpc, TCl>(
 		client.clone(),
 		&BlockId::Hash(chain_info.best_hash),
 		config.dev_key_seed.clone().map(|s| vec![s]).unwrap_or_default(),
-	).map_err(|e| Error::Application(Box::new(e)))?;
+	)
+	.map_err(|e| Error::Application(Box::new(e)))?;
 
 	let telemetry = telemetry
-		.map(|telemetry| {
-			init_telemetry(
-				&mut config,
-				network.clone(),
-				client.clone(),
-				telemetry,
-			)
-		})
+		.map(|telemetry| init_telemetry(&mut config, network.clone(), client.clone(), telemetry))
 		.transpose()?;
 
 	info!("📦 Highest known block at #{}", chain_info.best_number);
@@ -625,63 +605,69 @@ pub fn spawn_tasks<TBl, TBackend, TExPool, TRpc, TCl>(
 
 	spawn_handle.spawn(
 		"on-transaction-imported",
-		transaction_notifications(
-			transaction_pool.clone(),
-			network.clone(),
-			telemetry.clone(),
-		),
+		transaction_notifications(transaction_pool.clone(), network.clone(), telemetry.clone()),
 	);
 
 	// Prometheus metrics.
-	let metrics_service = if let Some(PrometheusConfig { port, registry }) =
-		config.prometheus_config.clone()
-	{
-		// Set static metrics.
-		let metrics = MetricsService::with_prometheus(telemetry.clone(), &registry, &config)?;
-		spawn_handle.spawn(
-			"prometheus-endpoint",
-			prometheus_endpoint::init_prometheus(port, registry).map(drop)
-		);
+	let metrics_service =
+		if let Some(PrometheusConfig { port, registry }) = config.prometheus_config.clone() {
+			// Set static metrics.
+			let metrics = MetricsService::with_prometheus(telemetry.clone(), &registry, &config)?;
+			spawn_handle.spawn(
+				"prometheus-endpoint",
+				prometheus_endpoint::init_prometheus(port, registry).map(drop),
+			);
 
-		metrics
-	} else {
-		MetricsService::new(telemetry.clone())
-	};
+			metrics
+		} else {
+			MetricsService::new(telemetry.clone())
+		};
 
 	// Periodically updated metrics and telemetry updates.
-	spawn_handle.spawn("telemetry-periodic-send",
-		metrics_service.run(
-			client.clone(),
-			transaction_pool.clone(),
-			network.clone(),
-		)
+	spawn_handle.spawn(
+		"telemetry-periodic-send",
+		metrics_service.run(client.clone(), transaction_pool.clone(), network.clone()),
 	);
 
 	// RPC
-	let gen_handler = |
-		deny_unsafe: sc_rpc::DenyUnsafe,
-		rpc_middleware: sc_rpc_server::RpcMiddleware
-	| gen_handler(
-		deny_unsafe, rpc_middleware, &config, task_manager.spawn_handle(),
-		client.clone(), transaction_pool.clone(), keystore.clone(),
-		on_demand.clone(), remote_blockchain.clone(), &*rpc_extensions_builder,
-		backend.offchain_storage(), system_rpc_tx.clone()
-	);
+	let gen_handler = |deny_unsafe: sc_rpc::DenyUnsafe,
+	                   rpc_middleware: sc_rpc_server::RpcMiddleware| {
+		gen_handler(
+			deny_unsafe,
+			rpc_middleware,
+			&config,
+			task_manager.spawn_handle(),
+			client.clone(),
+			transaction_pool.clone(),
+			keystore.clone(),
+			on_demand.clone(),
+			remote_blockchain.clone(),
+			&*rpc_extensions_builder,
+			backend.offchain_storage(),
+			system_rpc_tx.clone(),
+		)
+	};
 	let rpc_metrics = sc_rpc_server::RpcMetrics::new(config.prometheus_registry())?;
 	let rpc = start_rpc_servers(&config, gen_handler, rpc_metrics.clone())?;
 	// This is used internally, so don't restrict access to unsafe RPC
-	let rpc_handlers = RpcHandlers(Arc::new(gen_handler(
-		sc_rpc::DenyUnsafe::No,
-		sc_rpc_server::RpcMiddleware::new(rpc_metrics, "inbrowser")
-	).into()));
+	let rpc_handlers = RpcHandlers(Arc::new(
+		gen_handler(
+			sc_rpc::DenyUnsafe::No,
+			sc_rpc_server::RpcMiddleware::new(rpc_metrics, "inbrowser"),
+		)
+		.into(),
+	));
 
 	// Spawn informant task
-	spawn_handle.spawn("informant", sc_informant::build(
-		client.clone(),
-		network.clone(),
-		transaction_pool.clone(),
-		config.informant_output_format,
-	));
+	spawn_handle.spawn(
+		"informant",
+		sc_informant::build(
+			client.clone(),
+			network.clone(),
+			transaction_pool.clone(),
+			config.informant_output_format,
+		),
+	);
 
 	task_manager.keep_alive((config.base_path, rpc, rpc_handlers.clone()));
 
@@ -692,10 +678,9 @@ async fn transaction_notifications<TBl, TExPool>(
 	transaction_pool: Arc<TExPool>,
 	network: Arc<NetworkService<TBl, <TBl as BlockT>::Hash>>,
 	telemetry: Option<TelemetryHandle>,
-)
-	where
-		TBl: BlockT,
-		TExPool: MaintainedTransactionPool<Block=TBl, Hash = <TBl as BlockT>::Hash>,
+) where
+	TBl: BlockT,
+	TExPool: MaintainedTransactionPool<Block = TBl, Hash = <TBl as BlockT>::Hash>,
 {
 	// transaction notifications
 	transaction_pool
@@ -730,9 +715,11 @@ fn init_telemetry<TBl: BlockT, TCl: BlockBackend<TBl>>(
 		chain: config.chain_spec.name().to_owned(),
 		genesis_hash: format!("{:?}", genesis_hash),
 		authority: config.role.is_authority(),
-		startup_time: SystemTime::UNIX_EPOCH.elapsed()
+		startup_time: SystemTime::UNIX_EPOCH
+			.elapsed()
 			.map(|dur| dur.as_millis())
-			.unwrap_or(0).to_string(),
+			.unwrap_or(0)
+			.to_string(),
 		network_id: network.local_peer_id().to_base58(),
 	};
 
@@ -753,22 +740,28 @@ fn gen_handler<TBl, TBackend, TExPool, TRpc, TCl>(
 	remote_blockchain: Option<Arc<dyn RemoteBlockchain<TBl>>>,
 	rpc_extensions_builder: &(dyn RpcExtensionBuilder<Output = TRpc> + Send),
 	offchain_storage: Option<<TBackend as sc_client_api::backend::Backend<TBl>>::OffchainStorage>,
-	system_rpc_tx: TracingUnboundedSender<sc_rpc::system::Request<TBl>>
+	system_rpc_tx: TracingUnboundedSender<sc_rpc::system::Request<TBl>>,
 ) -> sc_rpc_server::RpcHandler<sc_rpc::Metadata>
-	where
-		TBl: BlockT,
-		TCl: ProvideRuntimeApi<TBl> + BlockchainEvents<TBl> + HeaderBackend<TBl> +
-		HeaderMetadata<TBl, Error=sp_blockchain::Error> + ExecutorProvider<TBl> +
-		CallApiAt<TBl> + ProofProvider<TBl> +
-		StorageProvider<TBl, TBackend> + BlockBackend<TBl> + Send + Sync + 'static,
-		TExPool: MaintainedTransactionPool<Block=TBl, Hash = <TBl as BlockT>::Hash> + 'static,
-		TBackend: sc_client_api::backend::Backend<TBl> + 'static,
-		TRpc: sc_rpc::RpcExtension<sc_rpc::Metadata>,
-		<TCl as ProvideRuntimeApi<TBl>>::Api:
-			sp_session::SessionKeys<TBl> +
-			sp_api::Metadata<TBl>,
+where
+	TBl: BlockT,
+	TCl: ProvideRuntimeApi<TBl>
+		+ BlockchainEvents<TBl>
+		+ HeaderBackend<TBl>
+		+ HeaderMetadata<TBl, Error = sp_blockchain::Error>
+		+ ExecutorProvider<TBl>
+		+ CallApiAt<TBl>
+		+ ProofProvider<TBl>
+		+ StorageProvider<TBl, TBackend>
+		+ BlockBackend<TBl>
+		+ Send
+		+ Sync
+		+ 'static,
+	TExPool: MaintainedTransactionPool<Block = TBl, Hash = <TBl as BlockT>::Hash> + 'static,
+	TBackend: sc_client_api::backend::Backend<TBl> + 'static,
+	TRpc: sc_rpc::RpcExtension<sc_rpc::Metadata>,
+	<TCl as ProvideRuntimeApi<TBl>>::Api: sp_session::SessionKeys<TBl> + sp_api::Metadata<TBl>,
 {
-	use sc_rpc::{chain, state, author, system, offchain};
+	use sc_rpc::{author, chain, offchain, state, system};
 
 	let system_info = sc_rpc::system::SystemInfo {
 		chain_name: config.chain_spec.name().into(),
@@ -781,43 +774,37 @@ fn gen_handler<TBl, TBackend, TExPool, TRpc, TCl>(
 	let task_executor = sc_rpc::SubscriptionTaskExecutor::new(spawn_handle);
 	let subscriptions = SubscriptionManager::new(Arc::new(task_executor.clone()));
 
-	let (chain, state, child_state) = if let (Some(remote_blockchain), Some(on_demand)) =
-		(remote_blockchain, on_demand) {
-		// Light clients
-		let chain = sc_rpc::chain::new_light(
-			client.clone(),
-			subscriptions.clone(),
-			remote_blockchain.clone(),
-			on_demand.clone(),
-		);
-		let (state, child_state) = sc_rpc::state::new_light(
-			client.clone(),
-			subscriptions.clone(),
-			remote_blockchain.clone(),
-			on_demand,
-			deny_unsafe,
-		);
-		(chain, state, child_state)
-
-	} else {
-		// Full nodes
-		let chain = sc_rpc::chain::new_full(client.clone(), subscriptions.clone());
-		let (state, child_state) = sc_rpc::state::new_full(
-			client.clone(),
-			subscriptions.clone(),
-			deny_unsafe,
-			config.rpc_max_payload,
-		);
-		(chain, state, child_state)
-	};
+	let (chain, state, child_state) =
+		if let (Some(remote_blockchain), Some(on_demand)) = (remote_blockchain, on_demand) {
+			// Light clients
+			let chain = sc_rpc::chain::new_light(
+				client.clone(),
+				subscriptions.clone(),
+				remote_blockchain.clone(),
+				on_demand.clone(),
+			);
+			let (state, child_state) = sc_rpc::state::new_light(
+				client.clone(),
+				subscriptions.clone(),
+				remote_blockchain.clone(),
+				on_demand,
+				deny_unsafe,
+			);
+			(chain, state, child_state)
+		} else {
+			// Full nodes
+			let chain = sc_rpc::chain::new_full(client.clone(), subscriptions.clone());
+			let (state, child_state) = sc_rpc::state::new_full(
+				client.clone(),
+				subscriptions.clone(),
+				deny_unsafe,
+				config.rpc_max_payload,
+			);
+			(chain, state, child_state)
+		};
 
-	let author = sc_rpc::author::Author::new(
-		client,
-		transaction_pool,
-		subscriptions,
-		keystore,
-		deny_unsafe,
-	);
+	let author =
+		sc_rpc::author::Author::new(client, transaction_pool, subscriptions, keystore, deny_unsafe);
 	let system = system::System::new(system_info, system_rpc_tx, deny_unsafe);
 
 	let maybe_offchain_rpc = offchain_storage.map(|storage| {
@@ -835,7 +822,7 @@ fn gen_handler<TBl, TBackend, TExPool, TRpc, TCl>(
 			system::SystemApi::to_delegate(system),
 			rpc_extensions_builder.build(deny_unsafe, task_executor),
 		),
-		rpc_middleware
+		rpc_middleware,
 	)
 }
 
@@ -854,32 +841,42 @@ pub struct BuildNetworkParams<'a, TBl: BlockT, TExPool, TImpQu, TCl> {
 	/// An optional, shared data fetcher for light clients.
 	pub on_demand: Option<Arc<OnDemand<TBl>>>,
 	/// A block announce validator builder.
-	pub block_announce_validator_builder: Option<Box<
-		dyn FnOnce(Arc<TCl>) -> Box<dyn BlockAnnounceValidator<TBl> + Send> + Send
-	>>,
+	pub block_announce_validator_builder:
+		Option<Box<dyn FnOnce(Arc<TCl>) -> Box<dyn BlockAnnounceValidator<TBl> + Send> + Send>>,
 }
 
 /// Build the network service, the network status sinks and an RPC sender.
 pub fn build_network<TBl, TExPool, TImpQu, TCl>(
-	params: BuildNetworkParams<TBl, TExPool, TImpQu, TCl>
+	params: BuildNetworkParams<TBl, TExPool, TImpQu, TCl>,
 ) -> Result<
 	(
 		Arc<NetworkService<TBl, <TBl as BlockT>::Hash>>,
 		TracingUnboundedSender<sc_rpc::system::Request<TBl>>,
 		NetworkStarter,
 	),
-	Error
+	Error,
 >
-	where
-		TBl: BlockT,
-		TCl: ProvideRuntimeApi<TBl> + HeaderMetadata<TBl, Error=sp_blockchain::Error> + Chain<TBl> +
-		BlockBackend<TBl> + BlockIdTo<TBl, Error=sp_blockchain::Error> + ProofProvider<TBl> +
-		HeaderBackend<TBl> + BlockchainEvents<TBl> + 'static,
-		TExPool: MaintainedTransactionPool<Block=TBl, Hash = <TBl as BlockT>::Hash> + 'static,
-		TImpQu: ImportQueue<TBl> + 'static,
+where
+	TBl: BlockT,
+	TCl: ProvideRuntimeApi<TBl>
+		+ HeaderMetadata<TBl, Error = sp_blockchain::Error>
+		+ Chain<TBl>
+		+ BlockBackend<TBl>
+		+ BlockIdTo<TBl, Error = sp_blockchain::Error>
+		+ ProofProvider<TBl>
+		+ HeaderBackend<TBl>
+		+ BlockchainEvents<TBl>
+		+ 'static,
+	TExPool: MaintainedTransactionPool<Block = TBl, Hash = <TBl as BlockT>::Hash> + 'static,
+	TImpQu: ImportQueue<TBl> + 'static,
 {
 	let BuildNetworkParams {
-		config, client, transaction_pool, spawn_handle, import_queue, on_demand,
+		config,
+		client,
+		transaction_pool,
+		spawn_handle,
+		import_queue,
+		on_demand,
 		block_announce_validator_builder,
 	} = params;
 
@@ -906,8 +903,8 @@ pub fn build_network<TBl, TExPool, TImpQu, TCl>(
 			let (handler, protocol_config) = BlockRequestHandler::new(
 				&protocol_id,
 				client.clone(),
-				config.network.default_peers_set.in_peers as usize
-					+ config.network.default_peers_set.out_peers as usize,
+				config.network.default_peers_set.in_peers as usize +
+					config.network.default_peers_set.out_peers as usize,
 			);
 			spawn_handle.spawn("block_request_handler", handler.run());
 			protocol_config
@@ -923,8 +920,8 @@ pub fn build_network<TBl, TExPool, TImpQu, TCl>(
 			let (handler, protocol_config) = StateRequestHandler::new(
 				&protocol_id,
 				client.clone(),
-				config.network.default_peers_set.in_peers as usize
-				+ config.network.default_peers_set.out_peers as usize,
+				config.network.default_peers_set.in_peers as usize +
+					config.network.default_peers_set.out_peers as usize,
 			);
 			spawn_handle.spawn("state_request_handler", handler.run());
 			protocol_config
@@ -937,10 +934,8 @@ pub fn build_network<TBl, TExPool, TImpQu, TCl>(
 			light_client_requests::generate_protocol_config(&protocol_id)
 		} else {
 			// Allow both outgoing and incoming requests.
-			let (handler, protocol_config) = LightClientRequestHandler::new(
-				&protocol_id,
-				client.clone(),
-			);
+			let (handler, protocol_config) =
+				LightClientRequestHandler::new(&protocol_id, client.clone());
 			spawn_handle.spawn("light_client_request_handler", handler.run());
 			protocol_config
 		}
@@ -962,7 +957,7 @@ pub fn build_network<TBl, TExPool, TImpQu, TCl>(
 		},
 		network_config: config.network.clone(),
 		chain: client.clone(),
-		on_demand: on_demand,
+		on_demand,
 		transaction_pool: transaction_pool_adapter as _,
 		import_queue: Box::new(import_queue),
 		protocol_id,
@@ -976,10 +971,8 @@ pub fn build_network<TBl, TExPool, TImpQu, TCl>(
 	// Storage chains don't keep full block history and can't be synced in full mode.
 	// Force fast sync when storage chain mode is enabled.
 	if matches!(config.transaction_storage, TransactionStorageMode::StorageChain) {
-		network_params.network_config.sync_mode = SyncMode::Fast {
-			storage_chain_mode: true,
-			skip_proofs: false,
-		};
+		network_params.network_config.sync_mode =
+			SyncMode::Fast { storage_chain_mode: true, skip_proofs: false };
 	}
 
 	let has_bootnodes = !network_params.network_config.boot_nodes.is_empty();
@@ -1028,7 +1021,7 @@ pub fn build_network<TBl, TExPool, TImpQu, TCl>(
 			);
 			// This `return` might seem unnecessary, but we don't want to make it look like
 			// everything is working as normal even though the user is clearly misusing the API.
-			return;
+			return
 		}
 
 		future.await
diff --git a/client/service/src/chain_ops/check_block.rs b/client/service/src/chain_ops/check_block.rs
index 94f6d25c9eb8..ab924a3f7d9d 100644
--- a/client/service/src/chain_ops/check_block.rs
+++ b/client/service/src/chain_ops/check_block.rs
@@ -17,22 +17,20 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::error::Error;
-use futures::{future, prelude::*};
-use sp_runtime::traits::Block as BlockT;
-use sp_runtime::generic::BlockId;
 use codec::Encode;
-use sp_consensus::import_queue::ImportQueue;
+use futures::{future, prelude::*};
 use sc_client_api::{BlockBackend, UsageProvider};
+use sp_consensus::import_queue::ImportQueue;
+use sp_runtime::{generic::BlockId, traits::Block as BlockT};
 
-use std::pin::Pin;
-use std::sync::Arc;
 use crate::chain_ops::import_blocks;
+use std::{pin::Pin, sync::Arc};
 
 /// Re-validate known block.
 pub fn check_block<B, IQ, C>(
 	client: Arc<C>,
 	import_queue: IQ,
-	block_id: BlockId<B>
+	block_id: BlockId<B>,
 ) -> Pin<Box<dyn Future<Output = Result<(), Error>> + Send>>
 where
 	C: BlockBackend<B> + UsageProvider<B> + Send + Sync + 'static,
@@ -46,7 +44,7 @@ where
 			block.encode_to(&mut buf);
 			let reader = std::io::Cursor::new(buf);
 			import_blocks(client, import_queue, reader, true, true)
-		}
+		},
 		Ok(None) => Box::pin(future::err("Unknown block".into())),
 		Err(e) => Box::pin(future::err(format!("Error reading block: {:?}", e).into())),
 	}
diff --git a/client/service/src/chain_ops/export_blocks.rs b/client/service/src/chain_ops/export_blocks.rs
index 1d9325d1d745..888718010318 100644
--- a/client/service/src/chain_ops/export_blocks.rs
+++ b/client/service/src/chain_ops/export_blocks.rs
@@ -17,18 +17,16 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::error::Error;
-use log::info;
+use codec::Encode;
 use futures::{future, prelude::*};
-use sp_runtime::traits::{
-	Block as BlockT, NumberFor, One, Zero, SaturatedConversion
+use log::info;
+use sp_runtime::{
+	generic::BlockId,
+	traits::{Block as BlockT, NumberFor, One, SaturatedConversion, Zero},
 };
-use sp_runtime::generic::BlockId;
-use codec::Encode;
 
-use std::{io::Write, pin::Pin};
 use sc_client_api::{BlockBackend, UsageProvider};
-use std::sync::Arc;
-use std::task::Poll;
+use std::{io::Write, pin::Pin, sync::Arc, task::Poll};
 
 /// Performs the blocks export.
 pub fn export_blocks<B, C>(
@@ -36,7 +34,7 @@ pub fn export_blocks<B, C>(
 	mut output: impl Write + 'static,
 	from: NumberFor<B>,
 	to: Option<NumberFor<B>>,
-	binary: bool
+	binary: bool,
 ) -> Pin<Box<dyn Future<Output = Result<(), Error>>>>
 where
 	C: BlockBackend<B> + UsageProvider<B> + 'static,
@@ -63,7 +61,7 @@ where
 		let client = &client;
 
 		if last < block {
-			return Poll::Ready(Err("Invalid block range specified".into()));
+			return Poll::Ready(Err("Invalid block range specified".into()))
 		}
 
 		if !wrote_header {
@@ -78,14 +76,13 @@ where
 		}
 
 		match client.block(&BlockId::number(block))? {
-			Some(block) => {
+			Some(block) =>
 				if binary {
 					output.write_all(&block.encode())?;
 				} else {
 					serde_json::to_writer(&mut output, &block)
 						.map_err(|e| format!("Error writing JSON: {}", e))?;
-				}
-		},
+				},
 			// Reached end of the chain.
 			None => return Poll::Ready(Ok(())),
 		}
@@ -93,7 +90,7 @@ where
 			info!("#{}", block);
 		}
 		if block == last {
-			return Poll::Ready(Ok(()));
+			return Poll::Ready(Ok(()))
 		}
 		block += One::one();
 
diff --git a/client/service/src/chain_ops/export_raw_state.rs b/client/service/src/chain_ops/export_raw_state.rs
index 71822cf6275f..975149c61cfa 100644
--- a/client/service/src/chain_ops/export_raw_state.rs
+++ b/client/service/src/chain_ops/export_raw_state.rs
@@ -17,10 +17,9 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::error::Error;
-use sp_runtime::traits::Block as BlockT;
-use sp_runtime::generic::BlockId;
-use sp_core::storage::{StorageKey, well_known_keys, ChildInfo, Storage, StorageChild, StorageMap};
 use sc_client_api::{StorageProvider, UsageProvider};
+use sp_core::storage::{well_known_keys, ChildInfo, Storage, StorageChild, StorageKey, StorageMap};
+use sp_runtime::{generic::BlockId, traits::Block as BlockT};
 
 use std::{collections::HashMap, sync::Arc};
 
@@ -35,9 +34,7 @@ where
 	B: BlockT,
 	BA: sc_client_api::backend::Backend<B>,
 {
-	let block = block.unwrap_or_else(
-		|| BlockId::Hash(client.usage_info().chain.best_hash)
-	);
+	let block = block.unwrap_or_else(|| BlockId::Hash(client.usage_info().chain.best_hash));
 
 	let empty_key = StorageKey(Vec::new());
 	let mut top_storage = client.storage_pairs(&block, &empty_key)?;
@@ -47,12 +44,12 @@ where
 	// pairs.
 	while let Some(pos) = top_storage
 		.iter()
-		.position(|(k, _)| k.0.starts_with(well_known_keys::DEFAULT_CHILD_STORAGE_KEY_PREFIX)) {
+		.position(|(k, _)| k.0.starts_with(well_known_keys::DEFAULT_CHILD_STORAGE_KEY_PREFIX))
+	{
 		let (key, _) = top_storage.swap_remove(pos);
 
-		let key = StorageKey(
-			key.0[well_known_keys::DEFAULT_CHILD_STORAGE_KEY_PREFIX.len()..].to_vec(),
-		);
+		let key =
+			StorageKey(key.0[well_known_keys::DEFAULT_CHILD_STORAGE_KEY_PREFIX.len()..].to_vec());
 		let child_info = ChildInfo::new_default(&key.0);
 
 		let keys = client.child_storage_keys(&block, &child_info, &empty_key)?;
diff --git a/client/service/src/chain_ops/import_blocks.rs b/client/service/src/chain_ops/import_blocks.rs
index 75ea6670f352..ecf028ffeb3f 100644
--- a/client/service/src/chain_ops/import_blocks.rs
+++ b/client/service/src/chain_ops/import_blocks.rs
@@ -16,29 +16,31 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::error;
-use crate::error::Error;
-use sc_chain_spec::ChainSpec;
-use log::{warn, info};
-use futures::{future, prelude::*};
-use sp_runtime::traits::{
-	Block as BlockT, NumberFor, Zero, Header, MaybeSerializeDeserialize,
-};
-use sp_runtime::generic::SignedBlock;
+use crate::{error, error::Error};
 use codec::{Decode, IoReader as CodecIoReader};
+use futures::{future, prelude::*};
+use log::{info, warn};
+use sc_chain_spec::ChainSpec;
 use sp_consensus::{
+	import_queue::{BlockImportError, BlockImportResult, ImportQueue, IncomingBlock, Link},
 	BlockOrigin,
-	import_queue::{IncomingBlock, Link, BlockImportError, BlockImportResult, ImportQueue},
+};
+use sp_runtime::{
+	generic::SignedBlock,
+	traits::{Block as BlockT, Header, MaybeSerializeDeserialize, NumberFor, Zero},
 };
 
-use std::{io::{Read, Seek}, pin::Pin};
-use std::time::{Duration, Instant};
 use futures_timer::Delay;
-use std::task::Poll;
+use sc_client_api::UsageProvider;
 use serde_json::{de::IoRead as JsonIoRead, Deserializer, StreamDeserializer};
-use std::convert::{TryFrom, TryInto};
 use sp_runtime::traits::{CheckedDiv, Saturating};
-use sc_client_api::UsageProvider;
+use std::{
+	convert::{TryFrom, TryInto},
+	io::{Read, Seek},
+	pin::Pin,
+	task::Poll,
+	time::{Duration, Instant},
+};
 
 /// Number of blocks we will add to the queue before waiting for the queue to catch up.
 const MAX_PENDING_BLOCKS: u64 = 1_024;
@@ -56,11 +58,11 @@ pub fn build_spec(spec: &dyn ChainSpec, raw: bool) -> error::Result<String> {
 	spec.as_json(raw).map_err(Into::into)
 }
 
-
 /// Helper enum that wraps either a binary decoder (from parity-scale-codec), or a JSON decoder
 /// (from serde_json). Implements the Iterator Trait, calling `next()` will decode the next
 /// SignedBlock and return it.
-enum BlockIter<R, B> where
+enum BlockIter<R, B>
+where
 	R: std::io::Read + std::io::Seek,
 {
 	Binary {
@@ -79,7 +81,8 @@ enum BlockIter<R, B> where
 	},
 }
 
-impl<R, B> BlockIter<R, B> where
+impl<R, B> BlockIter<R, B>
+where
 	R: Read + Seek + 'static,
 	B: BlockT + MaybeSerializeDeserialize,
 {
@@ -90,40 +93,32 @@ impl<R, B> BlockIter<R, B> where
 			// of blocks that are going to be decoded. We read it and add it to our enum struct.
 			let num_expected_blocks: u64 = Decode::decode(&mut reader)
 				.map_err(|e| format!("Failed to decode the number of blocks: {:?}", e))?;
-			Ok(BlockIter::Binary {
-				num_expected_blocks,
-				read_block_count: 0,
-				reader,
-			})
+			Ok(BlockIter::Binary { num_expected_blocks, read_block_count: 0, reader })
 		} else {
-			let stream_deser = Deserializer::from_reader(input)
-				.into_iter::<SignedBlock<B>>();
-			Ok(BlockIter::Json {
-				reader: stream_deser,
-				read_block_count: 0,
-			})
+			let stream_deser = Deserializer::from_reader(input).into_iter::<SignedBlock<B>>();
+			Ok(BlockIter::Json { reader: stream_deser, read_block_count: 0 })
 		}
 	}
 
 	/// Returns the number of blocks read thus far.
 	fn read_block_count(&self) -> u64 {
 		match self {
-			BlockIter::Binary { read_block_count, .. }
-			| BlockIter::Json { read_block_count, .. }
-			=> *read_block_count,
+			BlockIter::Binary { read_block_count, .. } |
+			BlockIter::Json { read_block_count, .. } => *read_block_count,
 		}
 	}
 
 	/// Returns the total number of blocks to be imported, if possible.
 	fn num_expected_blocks(&self) -> Option<u64> {
 		match self {
-			BlockIter::Binary { num_expected_blocks, ..} => Some(*num_expected_blocks),
-			BlockIter::Json {..} => None
+			BlockIter::Binary { num_expected_blocks, .. } => Some(*num_expected_blocks),
+			BlockIter::Json { .. } => None,
 		}
 	}
 }
 
-impl<R, B> Iterator for BlockIter<R, B> where
+impl<R, B> Iterator for BlockIter<R, B>
+where
 	R: Read + Seek + 'static,
 	B: BlockT + MaybeSerializeDeserialize,
 {
@@ -133,20 +128,20 @@ impl<R, B> Iterator for BlockIter<R, B> where
 		match self {
 			BlockIter::Binary { num_expected_blocks, read_block_count, reader } => {
 				if read_block_count < num_expected_blocks {
-					let block_result: Result<SignedBlock::<B>, _> = SignedBlock::<B>::decode(reader)
-						.map_err(|e| e.to_string());
+					let block_result: Result<SignedBlock<B>, _> =
+						SignedBlock::<B>::decode(reader).map_err(|e| e.to_string());
 					*read_block_count += 1;
 					Some(block_result)
 				} else {
 					// `read_block_count` == `num_expected_blocks` so we've read enough blocks.
 					None
 				}
-			}
+			},
 			BlockIter::Json { reader, read_block_count } => {
 				let res = Some(reader.next()?.map_err(|e| e.to_string()));
 				*read_block_count += 1;
 				res
-			}
+			},
 		}
 	}
 }
@@ -155,7 +150,7 @@ impl<R, B> Iterator for BlockIter<R, B> where
 fn import_block_to_queue<TBl, TImpQu>(
 	signed_block: SignedBlock<TBl>,
 	queue: &mut TImpQu,
-	force: bool
+	force: bool,
 ) where
 	TBl: BlockT + MaybeSerializeDeserialize,
 	TImpQu: 'static + ImportQueue<TBl>,
@@ -163,8 +158,9 @@ fn import_block_to_queue<TBl, TImpQu>(
 	let (header, extrinsics) = signed_block.block.deconstruct();
 	let hash = header.hash();
 	// import queue handles verification and importing it into the client.
-	queue.import_blocks(BlockOrigin::File, vec![
-		IncomingBlock::<TBl> {
+	queue.import_blocks(
+		BlockOrigin::File,
+		vec![IncomingBlock::<TBl> {
 			hash,
 			header: Some(header),
 			body: Some(extrinsics),
@@ -175,15 +171,15 @@ fn import_block_to_queue<TBl, TImpQu>(
 			import_existing: force,
 			state: None,
 			skip_execution: false,
-		}
-	]);
+		}],
+	);
 }
 
 /// Returns true if we have imported every block we were supposed to import, else returns false.
 fn importing_is_done(
 	num_expected_blocks: Option<u64>,
 	read_block_count: u64,
-	imported_blocks: u64
+	imported_blocks: u64,
 ) -> bool {
 	if let Some(num_expected_blocks) = num_expected_blocks {
 		imported_blocks >= num_expected_blocks
@@ -209,7 +205,7 @@ impl<B: BlockT> Speedometer<B> {
 		}
 	}
 
-	/// Calculates `(best_number - last_number) / (now - last_update)` and 
+	/// Calculates `(best_number - last_number) / (now - last_update)` and
 	/// logs the speed of import.
 	fn display_speed(&self) {
 		// Number of milliseconds elapsed since last time.
@@ -223,24 +219,28 @@ impl<B: BlockT> Speedometer<B> {
 		// Number of blocks that have been imported since last time.
 		let diff = match self.last_number {
 			None => return,
-			Some(n) => self.best_number.saturating_sub(n)
+			Some(n) => self.best_number.saturating_sub(n),
 		};
 
 		if let Ok(diff) = TryInto::<u128>::try_into(diff) {
 			// If the number of blocks can be converted to a regular integer, then it's easy: just
 			// do the math and turn it into a `f64`.
-			let speed = diff.saturating_mul(10_000).checked_div(u128::from(elapsed_ms))
-				.map_or(0.0, |s| s as f64) / 10.0;
+			let speed = diff
+				.saturating_mul(10_000)
+				.checked_div(u128::from(elapsed_ms))
+				.map_or(0.0, |s| s as f64) /
+				10.0;
 			info!("📦 Current best block: {} ({:4.1} bps)", self.best_number, speed);
 		} else {
 			// If the number of blocks can't be converted to a regular integer, then we need a more
 			// algebraic approach and we stay within the realm of integers.
 			let one_thousand = NumberFor::<B>::from(1_000u32);
-			let elapsed = NumberFor::<B>::from(
-				<u32 as TryFrom<_>>::try_from(elapsed_ms).unwrap_or(u32::MAX)
-			);
+			let elapsed =
+				NumberFor::<B>::from(<u32 as TryFrom<_>>::try_from(elapsed_ms).unwrap_or(u32::MAX));
 
-			let speed = diff.saturating_mul(one_thousand).checked_div(&elapsed)
+			let speed = diff
+				.saturating_mul(one_thousand)
+				.checked_div(&elapsed)
 				.unwrap_or_else(Zero::zero);
 			info!("📦 Current best block: {} ({} bps)", self.best_number, speed)
 		}
@@ -265,22 +265,23 @@ impl<B: BlockT> Speedometer<B> {
 }
 
 /// Different State that the `import_blocks` future could be in.
-enum ImportState<R, B> where 
+enum ImportState<R, B>
+where
 	R: Read + Seek + 'static,
 	B: BlockT + MaybeSerializeDeserialize,
 {
 	/// We are reading from the BlockIter structure, adding those blocks to the queue if possible.
-	Reading{block_iter: BlockIter<R, B>},
+	Reading { block_iter: BlockIter<R, B> },
 	/// The queue is full (contains at least MAX_PENDING_BLOCKS blocks) and we are waiting for it to
 	/// catch up.
-	WaitingForImportQueueToCatchUp{
+	WaitingForImportQueueToCatchUp {
 		block_iter: BlockIter<R, B>,
 		delay: Delay,
-		block: SignedBlock<B>
+		block: SignedBlock<B>,
 	},
 	// We have added all the blocks to the queue but they are still being processed.
-	WaitingForImportQueueToFinish{
-		num_expected_blocks: Option<u64>, 
+	WaitingForImportQueueToFinish {
+		num_expected_blocks: Option<u64>,
 		read_block_count: u64,
 		delay: Delay,
 	},
@@ -306,10 +307,7 @@ where
 
 	impl WaitLink {
 		fn new() -> WaitLink {
-			WaitLink {
-				imported_blocks: 0,
-				has_error: false,
-			}
+			WaitLink { imported_blocks: 0, has_error: false }
 		}
 	}
 
@@ -318,7 +316,7 @@ where
 			&mut self,
 			imported: usize,
 			_num_expected_blocks: usize,
-			results: Vec<(Result<BlockImportResult<NumberFor<B>>, BlockImportError>, B::Hash)>
+			results: Vec<(Result<BlockImportResult<NumberFor<B>>, BlockImportError>, B::Hash)>,
 		) {
 			self.imported_blocks += imported as u64;
 
@@ -326,7 +324,7 @@ where
 				if let (Err(err), hash) = result {
 					warn!("There was an error importing block with hash {:?}: {:?}", hash, err);
 					self.has_error = true;
-					break;
+					break
 				}
 			}
 		}
@@ -338,13 +336,13 @@ where
 	let block_iter = match block_iter_res {
 		Ok(block_iter) => block_iter,
 		Err(e) => {
-			// We've encountered an error while creating the block iterator 
+			// We've encountered an error while creating the block iterator
 			// so we can just return a future that returns an error.
 			return future::ready(Err(Error::Other(e))).boxed()
-		}
+		},
 	};
 
-	let mut state = Some(ImportState::Reading{block_iter});
+	let mut state = Some(ImportState::Reading { block_iter });
 	let mut speedometer = Speedometer::<B>::new();
 
 	// Importing blocks is implemented as a future, because we want the operation to be
@@ -358,7 +356,7 @@ where
 		let client = &client;
 		let queue = &mut import_queue;
 		match state.take().expect("state should never be None; qed") {
-			ImportState::Reading{mut block_iter} => {
+			ImportState::Reading { mut block_iter } => {
 				match block_iter.next() {
 					None => {
 						// The iterator is over: we now need to wait for the import queue to finish.
@@ -366,7 +364,9 @@ where
 						let read_block_count = block_iter.read_block_count();
 						let delay = Delay::new(Duration::from_millis(DELAY_TIME));
 						state = Some(ImportState::WaitingForImportQueueToFinish {
-							num_expected_blocks, read_block_count, delay
+							num_expected_blocks,
+							read_block_count,
+							delay,
 						});
 					},
 					Some(block_result) => {
@@ -378,32 +378,35 @@ where
 									// until the queue has made some progress.
 									let delay = Delay::new(Duration::from_millis(DELAY_TIME));
 									state = Some(ImportState::WaitingForImportQueueToCatchUp {
-										block_iter, delay, block
+										block_iter,
+										delay,
+										block,
 									});
 								} else {
 									// Queue is not full, we can keep on adding blocks to the queue.
 									import_block_to_queue(block, queue, force);
-									state = Some(ImportState::Reading{block_iter});
+									state = Some(ImportState::Reading { block_iter });
 								}
-							}
-							Err(e) => {
-								return Poll::Ready(
-									Err(Error::Other(
-										format!("Error reading block #{}: {}", read_block_count, e)
-									)))
-							}
+							},
+							Err(e) =>
+								return Poll::Ready(Err(Error::Other(format!(
+									"Error reading block #{}: {}",
+									read_block_count, e
+								)))),
 						}
-					}
+					},
 				}
 			},
-			ImportState::WaitingForImportQueueToCatchUp{block_iter, mut delay, block} => {
+			ImportState::WaitingForImportQueueToCatchUp { block_iter, mut delay, block } => {
 				let read_block_count = block_iter.read_block_count();
 				if read_block_count - link.imported_blocks >= MAX_PENDING_BLOCKS {
 					// Queue is still full, so wait until there is room to insert our block.
 					match Pin::new(&mut delay).poll(cx) {
 						Poll::Pending => {
 							state = Some(ImportState::WaitingForImportQueueToCatchUp {
-								block_iter, delay, block
+								block_iter,
+								delay,
+								block,
 							});
 							return Poll::Pending
 						},
@@ -412,25 +415,30 @@ where
 						},
 					}
 					state = Some(ImportState::WaitingForImportQueueToCatchUp {
-						block_iter, delay, block
+						block_iter,
+						delay,
+						block,
 					});
 				} else {
 					// Queue is no longer full, so we can add our block to the queue.
 					import_block_to_queue(block, queue, force);
 					// Switch back to Reading state.
-					state = Some(ImportState::Reading{block_iter});
+					state = Some(ImportState::Reading { block_iter });
 				}
 			},
 			ImportState::WaitingForImportQueueToFinish {
-				num_expected_blocks, read_block_count, mut delay
+				num_expected_blocks,
+				read_block_count,
+				mut delay,
 			} => {
-				// All the blocks have been added to the queue, which doesn't mean they 
+				// All the blocks have been added to the queue, which doesn't mean they
 				// have all been properly imported.
 				if importing_is_done(num_expected_blocks, read_block_count, link.imported_blocks) {
 					// Importing is done, we can log the result and return.
 					info!(
 						"🎉 Imported {} blocks. Best: #{}",
-						read_block_count, client.usage_info().chain.best_number
+						read_block_count,
+						client.usage_info().chain.best_number
 					);
 					return Poll::Ready(Ok(()))
 				} else {
@@ -439,7 +447,9 @@ where
 					match Pin::new(&mut delay).poll(cx) {
 						Poll::Pending => {
 							state = Some(ImportState::WaitingForImportQueueToFinish {
-								num_expected_blocks, read_block_count, delay
+								num_expected_blocks,
+								read_block_count,
+								delay,
 							});
 							return Poll::Pending
 						},
@@ -449,10 +459,12 @@ where
 					}
 
 					state = Some(ImportState::WaitingForImportQueueToFinish {
-						num_expected_blocks, read_block_count, delay
+						num_expected_blocks,
+						read_block_count,
+						delay,
 					});
 				}
-			}
+			},
 		}
 
 		queue.poll_actions(cx, &mut link);
@@ -461,11 +473,10 @@ where
 		speedometer.notify_user(best_number);
 
 		if link.has_error {
-			return Poll::Ready(Err(
-				Error::Other(
-					format!("Stopping after #{} blocks because of an error", link.imported_blocks)
-				)
-			))
+			return Poll::Ready(Err(Error::Other(format!(
+				"Stopping after #{} blocks because of an error",
+				link.imported_blocks
+			))))
 		}
 
 		cx.waker().wake_by_ref();
diff --git a/client/service/src/chain_ops/revert_chain.rs b/client/service/src/chain_ops/revert_chain.rs
index e3301eb2627e..63f1cbd15dd6 100644
--- a/client/service/src/chain_ops/revert_chain.rs
+++ b/client/service/src/chain_ops/revert_chain.rs
@@ -18,15 +18,15 @@
 
 use crate::error::Error;
 use log::info;
-use sp_runtime::traits::{Block as BlockT, NumberFor, Zero};
 use sc_client_api::{Backend, UsageProvider};
+use sp_runtime::traits::{Block as BlockT, NumberFor, Zero};
 use std::sync::Arc;
 
 /// Performs a revert of `blocks` blocks.
 pub fn revert_chain<B, BA, C>(
 	client: Arc<C>,
 	backend: Arc<BA>,
-	blocks: NumberFor<B>
+	blocks: NumberFor<B>,
 ) -> Result<(), Error>
 where
 	B: BlockT,
diff --git a/client/service/src/client/block_rules.rs b/client/service/src/client/block_rules.rs
index 1af06666339c..4bdf33836296 100644
--- a/client/service/src/client/block_rules.rs
+++ b/client/service/src/client/block_rules.rs
@@ -20,11 +20,9 @@
 
 use std::collections::{HashMap, HashSet};
 
-use sp_runtime::{
-	traits::{Block as BlockT, NumberFor},
-};
+use sp_runtime::traits::{Block as BlockT, NumberFor};
 
-use sc_client_api::{ForkBlocks, BadBlocks};
+use sc_client_api::{BadBlocks, ForkBlocks};
 
 /// Chain specification rules lookup result.
 pub enum LookupResult<B: BlockT> {
@@ -33,7 +31,7 @@ pub enum LookupResult<B: BlockT> {
 	/// The block is known to be bad and should not be imported
 	KnownBad,
 	/// There is a specified canonical block hash for the given height
-	Expected(B::Hash)
+	Expected(B::Hash),
 }
 
 /// Chain-specific block filtering rules.
@@ -47,10 +45,7 @@ pub struct BlockRules<B: BlockT> {
 
 impl<B: BlockT> BlockRules<B> {
 	/// New block rules with provided black and white lists.
-	pub fn new(
-		fork_blocks: ForkBlocks<B>,
-		bad_blocks: BadBlocks<B>,
-	) -> Self {
+	pub fn new(fork_blocks: ForkBlocks<B>, bad_blocks: BadBlocks<B>) -> Self {
 		Self {
 			bad: bad_blocks.unwrap_or_else(|| HashSet::new()),
 			forks: fork_blocks.unwrap_or_else(|| vec![]).into_iter().collect(),
@@ -66,7 +61,7 @@ impl<B: BlockT> BlockRules<B> {
 	pub fn lookup(&self, number: NumberFor<B>, hash: &B::Hash) -> LookupResult<B> {
 		if let Some(hash_for_height) = self.forks.get(&number) {
 			if hash_for_height != hash {
-				return LookupResult::Expected(hash_for_height.clone());
+				return LookupResult::Expected(hash_for_height.clone())
 			}
 		}
 
diff --git a/client/service/src/client/call_executor.rs b/client/service/src/client/call_executor.rs
index a44481994760..6d4fe3c36013 100644
--- a/client/service/src/client/call_executor.rs
+++ b/client/service/src/client/call_executor.rs
@@ -16,23 +16,25 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use std::{sync::Arc, panic::UnwindSafe, result, cell::RefCell};
-use codec::{Encode, Decode};
+use super::{client::ClientConfig, wasm_override::WasmOverride, wasm_substitutes::WasmSubstitutes};
+use codec::{Decode, Encode};
+use sc_client_api::{backend, call_executor::CallExecutor};
+use sc_executor::{NativeVersion, RuntimeInfo, RuntimeVersion};
+use sp_api::{ProofRecorder, StorageTransactionCache};
+use sp_core::{
+	traits::{CodeExecutor, RuntimeCode, SpawnNamed},
+	NativeOrEncoded, NeverNativeValue,
+};
+use sp_externalities::Extensions;
 use sp_runtime::{
-	generic::BlockId, traits::{Block as BlockT, HashFor, NumberFor},
+	generic::BlockId,
+	traits::{Block as BlockT, HashFor, NumberFor},
 };
 use sp_state_machine::{
-	self, OverlayedChanges, Ext, ExecutionManager, StateMachine, ExecutionStrategy,
-	backend::Backend as _, StorageProof,
+	self, backend::Backend as _, ExecutionManager, ExecutionStrategy, Ext, OverlayedChanges,
+	StateMachine, StorageProof,
 };
-use sc_executor::{RuntimeVersion, RuntimeInfo, NativeVersion};
-use sp_externalities::Extensions;
-use sp_core::{
-	NativeOrEncoded, NeverNativeValue, traits::{CodeExecutor, SpawnNamed, RuntimeCode},
-};
-use sp_api::{ProofRecorder, StorageTransactionCache};
-use sc_client_api::{backend, call_executor::CallExecutor};
-use super::{client::ClientConfig, wasm_override::WasmOverride, wasm_substitutes::WasmSubstitutes};
+use std::{cell::RefCell, panic::UnwindSafe, result, sync::Arc};
 
 /// Call executor that executes methods locally, querying all required
 /// data from local backend.
@@ -57,7 +59,8 @@ where
 		spawn_handle: Box<dyn SpawnNamed>,
 		client_config: ClientConfig<Block>,
 	) -> sp_blockchain::Result<Self> {
-		let wasm_override = client_config.wasm_runtime_overrides
+		let wasm_override = client_config
+			.wasm_runtime_overrides
 			.as_ref()
 			.map(|p| WasmOverride::new(p.clone(), executor.clone()))
 			.transpose()?;
@@ -91,10 +94,12 @@ where
 		B: backend::Backend<Block>,
 	{
 		let spec = self.runtime_version(id)?.spec_version;
-		let code = if let Some(d) = self.wasm_override
+		let code = if let Some(d) = self
+			.wasm_override
 			.as_ref()
 			.map(|o| o.get(&spec, onchain_code.heap_pages))
-			.flatten() {
+			.flatten()
+		{
 			log::debug!(target: "wasm_overrides", "using WASM override for block {}", id);
 			d
 		} else if let Some(s) = self.wasm_substitutes.get(spec, onchain_code.heap_pages, id) {
@@ -113,7 +118,10 @@ where
 	}
 }
 
-impl<Block: BlockT, B, E> Clone for LocalCallExecutor<Block, B, E> where E: Clone {
+impl<Block: BlockT, B, E> Clone for LocalCallExecutor<Block, B, E>
+where
+	E: Clone,
+{
 	fn clone(&self) -> Self {
 		LocalCallExecutor {
 			backend: self.backend.clone(),
@@ -145,13 +153,12 @@ where
 		extensions: Option<Extensions>,
 	) -> sp_blockchain::Result<Vec<u8>> {
 		let mut changes = OverlayedChanges::default();
-		let changes_trie = backend::changes_tries_state_at_block(
-			id, self.backend.changes_trie_storage()
-		)?;
+		let changes_trie =
+			backend::changes_tries_state_at_block(id, self.backend.changes_trie_storage())?;
 		let state = self.backend.state_at(*id)?;
 		let state_runtime_code = sp_state_machine::backend::BackendRuntimeCode::new(&state);
-		let runtime_code = state_runtime_code.runtime_code()
-			.map_err(sp_blockchain::Error::RuntimeCode)?;
+		let runtime_code =
+			state_runtime_code.runtime_code().map_err(sp_blockchain::Error::RuntimeCode)?;
 		let runtime_code = self.check_override(runtime_code, id)?;
 
 		let return_data = StateMachine::new(
@@ -164,7 +171,8 @@ where
 			extensions.unwrap_or_default(),
 			&runtime_code,
 			self.spawn_handle.clone(),
-		).execute_using_consensus_failure_handler::<_, NeverNativeValue, fn() -> _>(
+		)
+		.execute_using_consensus_failure_handler::<_, NeverNativeValue, fn() -> _>(
 			strategy.get_manager(),
 			None,
 		)?;
@@ -175,7 +183,7 @@ where
 	fn contextual_call<
 		EM: Fn(
 			Result<NativeOrEncoded<R>, Self::Error>,
-			Result<NativeOrEncoded<R>, Self::Error>
+			Result<NativeOrEncoded<R>, Self::Error>,
 		) -> Result<NativeOrEncoded<R>, Self::Error>,
 		R: Encode + Decode + PartialEq,
 		NC: FnOnce() -> result::Result<R, sp_api::ApiError> + UnwindSafe,
@@ -185,15 +193,17 @@ where
 		method: &str,
 		call_data: &[u8],
 		changes: &RefCell<OverlayedChanges>,
-		storage_transaction_cache: Option<&RefCell<
-			StorageTransactionCache<Block, B::State>
-		>>,
+		storage_transaction_cache: Option<&RefCell<StorageTransactionCache<Block, B::State>>>,
 		execution_manager: ExecutionManager<EM>,
 		native_call: Option<NC>,
 		recorder: &Option<ProofRecorder<Block>>,
 		extensions: Option<Extensions>,
-	) -> Result<NativeOrEncoded<R>, sp_blockchain::Error> where ExecutionManager<EM>: Clone {
-		let changes_trie_state = backend::changes_tries_state_at_block(at, self.backend.changes_trie_storage())?;
+	) -> Result<NativeOrEncoded<R>, sp_blockchain::Error>
+	where
+		ExecutionManager<EM>: Clone,
+	{
+		let changes_trie_state =
+			backend::changes_tries_state_at_block(at, self.backend.changes_trie_storage())?;
 		let mut storage_transaction_cache = storage_transaction_cache.map(|c| c.borrow_mut());
 
 		let mut state = self.backend.state_at(*at)?;
@@ -202,16 +212,17 @@ where
 
 		match recorder {
 			Some(recorder) => {
-				let trie_state = state.as_trie_backend()
-					.ok_or_else(||
-						Box::new(sp_state_machine::ExecutionError::UnableToGenerateProof) as Box<dyn sp_state_machine::Error>
-					)?;
+				let trie_state = state.as_trie_backend().ok_or_else(|| {
+					Box::new(sp_state_machine::ExecutionError::UnableToGenerateProof)
+						as Box<dyn sp_state_machine::Error>
+				})?;
 
-				let state_runtime_code = sp_state_machine::backend::BackendRuntimeCode::new(trie_state);
+				let state_runtime_code =
+					sp_state_machine::backend::BackendRuntimeCode::new(trie_state);
 				// It is important to extract the runtime code here before we create the proof
 				// recorder.
-				let runtime_code = state_runtime_code.runtime_code()
-					.map_err(sp_blockchain::Error::RuntimeCode)?;
+				let runtime_code =
+					state_runtime_code.runtime_code().map_err(sp_blockchain::Error::RuntimeCode)?;
 				let runtime_code = self.check_override(runtime_code, at)?;
 
 				let backend = sp_state_machine::ProvingBackend::new_with_recorder(
@@ -239,8 +250,8 @@ where
 			},
 			None => {
 				let state_runtime_code = sp_state_machine::backend::BackendRuntimeCode::new(&state);
-				let runtime_code = state_runtime_code.runtime_code()
-					.map_err(sp_blockchain::Error::RuntimeCode)?;
+				let runtime_code =
+					state_runtime_code.runtime_code().map_err(sp_blockchain::Error::RuntimeCode)?;
 				let runtime_code = self.check_override(runtime_code, at)?;
 
 				let mut state_machine = StateMachine::new(
@@ -253,34 +264,31 @@ where
 					extensions.unwrap_or_default(),
 					&runtime_code,
 					self.spawn_handle.clone(),
-				).with_storage_transaction_cache(storage_transaction_cache.as_mut().map(|c| &mut **c));
+				)
+				.with_storage_transaction_cache(
+					storage_transaction_cache.as_mut().map(|c| &mut **c),
+				);
 				state_machine.execute_using_consensus_failure_handler(
 					execution_manager,
 					native_call.map(|n| || (n)().map_err(|e| Box::new(e) as Box<_>)),
 				)
-			}
-		}.map_err(Into::into)
+			},
+		}
+		.map_err(Into::into)
 	}
 
 	fn runtime_version(&self, id: &BlockId<Block>) -> sp_blockchain::Result<RuntimeVersion> {
 		let mut overlay = OverlayedChanges::default();
-		let changes_trie_state = backend::changes_tries_state_at_block(
-			id,
-			self.backend.changes_trie_storage(),
-		)?;
+		let changes_trie_state =
+			backend::changes_tries_state_at_block(id, self.backend.changes_trie_storage())?;
 		let state = self.backend.state_at(*id)?;
 		let mut cache = StorageTransactionCache::<Block, B::State>::default();
-		let mut ext = Ext::new(
-			&mut overlay,
-			&mut cache,
-			&state,
-			changes_trie_state,
-			None,
-		);
+		let mut ext = Ext::new(&mut overlay, &mut cache, &state, changes_trie_state, None);
 		let state_runtime_code = sp_state_machine::backend::BackendRuntimeCode::new(&state);
-		let runtime_code = state_runtime_code.runtime_code()
-			.map_err(sp_blockchain::Error::RuntimeCode)?;
-		self.executor.runtime_version(&mut ext, &runtime_code)
+		let runtime_code =
+			state_runtime_code.runtime_code().map_err(sp_blockchain::Error::RuntimeCode)?;
+		self.executor
+			.runtime_version(&mut ext, &runtime_code)
 			.map_err(|e| sp_blockchain::Error::VersionInvalid(format!("{:?}", e)).into())
 	}
 
@@ -289,11 +297,11 @@ where
 		trie_state: &sp_state_machine::TrieBackend<S, HashFor<Block>>,
 		overlay: &mut OverlayedChanges,
 		method: &str,
-		call_data: &[u8]
+		call_data: &[u8],
 	) -> Result<(Vec<u8>, StorageProof), sp_blockchain::Error> {
 		let state_runtime_code = sp_state_machine::backend::BackendRuntimeCode::new(trie_state);
-		let runtime_code = state_runtime_code.runtime_code()
-			.map_err(sp_blockchain::Error::RuntimeCode)?;
+		let runtime_code =
+			state_runtime_code.runtime_code().map_err(sp_blockchain::Error::RuntimeCode)?;
 		sp_state_machine::prove_execution_on_trie_backend::<_, _, NumberFor<Block>, _, _>(
 			trie_state,
 			overlay,
@@ -312,19 +320,16 @@ where
 }
 
 impl<Block, B, E> sp_version::GetRuntimeVersion<Block> for LocalCallExecutor<Block, B, E>
-	where
-		B: backend::Backend<Block>,
-		E: CodeExecutor + RuntimeInfo + Clone + 'static,
-		Block: BlockT,
+where
+	B: backend::Backend<Block>,
+	E: CodeExecutor + RuntimeInfo + Clone + 'static,
+	Block: BlockT,
 {
 	fn native_version(&self) -> &sp_version::NativeVersion {
 		self.executor.native_version()
 	}
 
-	fn runtime_version(
-		&self,
-		at: &BlockId<Block>,
-	) -> Result<sp_version::RuntimeVersion, String> {
+	fn runtime_version(&self, at: &BlockId<Block>) -> Result<sp_version::RuntimeVersion, String> {
 		CallExecutor::runtime_version(self, at).map_err(|e| format!("{:?}", e))
 	}
 }
@@ -332,10 +337,13 @@ impl<Block, B, E> sp_version::GetRuntimeVersion<Block> for LocalCallExecutor<Blo
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use substrate_test_runtime_client::{LocalExecutor, GenesisInit, runtime};
-	use sc_executor::{NativeExecutor, WasmExecutionMethod};
-	use sp_core::{traits::{WrappedRuntimeCode, FetchRuntimeCode}, testing::TaskExecutor};
 	use sc_client_api::in_mem;
+	use sc_executor::{NativeExecutor, WasmExecutionMethod};
+	use sp_core::{
+		testing::TaskExecutor,
+		traits::{FetchRuntimeCode, WrappedRuntimeCode},
+	};
+	use substrate_test_runtime_client::{runtime, GenesisInit, LocalExecutor};
 
 	#[test]
 	fn should_get_override_if_exists() {
@@ -372,7 +380,8 @@ mod tests {
 			None,
 			None,
 			Default::default(),
-		).expect("Creates a client");
+		)
+		.expect("Creates a client");
 
 		let call_executor = LocalCallExecutor {
 			backend: backend.clone(),
@@ -384,10 +393,12 @@ mod tests {
 				Default::default(),
 				executor.clone(),
 				backend.clone(),
-			).unwrap(),
+			)
+			.unwrap(),
 		};
 
-		let check = call_executor.check_override(onchain_code, &BlockId::Number(Default::default()))
+		let check = call_executor
+			.check_override(onchain_code, &BlockId::Number(Default::default()))
 			.expect("RuntimeCode override");
 
 		assert_eq!(Some(vec![2, 2, 2, 2, 2, 2, 2, 2]), check.fetch_runtime_code().map(Into::into));
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index 8e808a3d824b..e21536c0a09d 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -18,98 +18,94 @@
 
 //! Substrate Client
 
-use std::{
-	marker::PhantomData,
-	collections::{HashSet, BTreeMap, HashMap},
-	sync::Arc, panic::UnwindSafe, result,
-	path::PathBuf
+use super::{
+	block_rules::{BlockRules, LookupResult as BlockLookupResult},
+	genesis,
 };
+use codec::{Decode, Encode};
+use hash_db::Prefix;
 use log::{info, trace, warn};
 use parking_lot::{Mutex, RwLock};
-use codec::{Encode, Decode};
-use hash_db::Prefix;
+use prometheus_endpoint::Registry;
+use rand::Rng;
+use sc_block_builder::{BlockBuilderApi, BlockBuilderProvider, RecordProof};
+use sc_client_api::{
+	backend::{
+		self, apply_aux, changes_tries_state_at_block, BlockImportOperation, ClientImportOperation,
+		Finalizer, ImportSummary, LockImportRun, NewBlockState, PrunableStateChangesTrieStorage,
+		StorageProvider,
+	},
+	cht,
+	client::{
+		BadBlocks, BlockBackend, BlockImportNotification, BlockOf, BlockchainEvents, ClientInfo,
+		FinalityNotification, FinalityNotifications, ForkBlocks, ImportNotifications,
+		ProvideUncles,
+	},
+	execution_extensions::ExecutionExtensions,
+	notifications::{StorageEventStream, StorageNotifications},
+	CallExecutor, ExecutorProvider, KeyIterator, ProofProvider, UsageProvider,
+};
+use sc_executor::RuntimeVersion;
+use sc_light::{call_executor::prove_execution, fetcher::ChangesProof};
+use sc_telemetry::{telemetry, TelemetryHandle, SUBSTRATE_INFO};
+use sp_api::{
+	ApiExt, ApiRef, CallApiAt, CallApiAtParams, ConstructRuntimeApi, Core as CoreApi,
+	ProvideRuntimeApi,
+};
+use sp_blockchain::{
+	self as blockchain, well_known_cache_keys::Id as CacheKeyId, Backend as ChainBackend, Cache,
+	CachedHeaderMetadata, Error, HeaderBackend as ChainHeaderBackend, HeaderMetadata, ProvideCache,
+};
+use sp_consensus::{
+	BlockCheckParams, BlockImportParams, BlockOrigin, BlockStatus, Error as ConsensusError,
+	ForkChoiceStrategy, ImportResult, StateAction,
+};
 use sp_core::{
 	convert_hash,
 	storage::{well_known_keys, ChildInfo, PrefixedStorageKey, StorageData, StorageKey},
 	ChangesTrieConfiguration, ExecutionContext, NativeOrEncoded,
 };
-#[cfg(feature="test-helpers")]
+#[cfg(feature = "test-helpers")]
 use sp_keystore::SyncCryptoStorePtr;
-use sc_telemetry::{
-	telemetry,
-	TelemetryHandle,
-	SUBSTRATE_INFO,
-};
 use sp_runtime::{
-	Justification, Justifications, BuildStorage,
-	generic::{BlockId, SignedBlock, DigestItem},
+	generic::{BlockId, DigestItem, SignedBlock},
 	traits::{
-		Block as BlockT, Header as HeaderT, Zero, NumberFor, HashFor, SaturatedConversion, One,
-		DigestFor,
+		Block as BlockT, DigestFor, HashFor, Header as HeaderT, NumberFor, One,
+		SaturatedConversion, Zero,
 	},
+	BuildStorage, Justification, Justifications,
 };
 use sp_state_machine::{
-	DBValue, Backend as StateBackend, ChangesTrieAnchorBlockId,
-	prove_read, prove_child_read, ChangesTrieRootsStorage, ChangesTrieStorage,
-	ChangesTrieConfigurationRange, key_changes, key_changes_proof,
-	prove_range_read_with_size, read_range_proof_check,
-};
-use sc_executor::RuntimeVersion;
-use sp_consensus::{
-	Error as ConsensusError, BlockStatus, BlockImportParams, BlockCheckParams,
-	ImportResult, BlockOrigin, ForkChoiceStrategy, StateAction,
-};
-use sp_blockchain::{
-	self as blockchain,
-	Backend as ChainBackend,
-	HeaderBackend as ChainHeaderBackend, ProvideCache, Cache,
-	well_known_cache_keys::Id as CacheKeyId,
-	HeaderMetadata, CachedHeaderMetadata,
+	key_changes, key_changes_proof, prove_child_read, prove_range_read_with_size, prove_read,
+	read_range_proof_check, Backend as StateBackend, ChangesTrieAnchorBlockId,
+	ChangesTrieConfigurationRange, ChangesTrieRootsStorage, ChangesTrieStorage, DBValue,
 };
 use sp_trie::StorageProof;
-use sp_api::{
-	CallApiAt, ConstructRuntimeApi, Core as CoreApi, ApiExt, ApiRef, ProvideRuntimeApi,
-	CallApiAtParams,
-};
-use sc_block_builder::{BlockBuilderApi, BlockBuilderProvider, RecordProof};
-use sc_client_api::{
-	backend::{
-		self, BlockImportOperation, PrunableStateChangesTrieStorage,
-		ClientImportOperation, Finalizer, ImportSummary, NewBlockState,
-		changes_tries_state_at_block, StorageProvider,
-		LockImportRun, apply_aux,
-	},
-	client::{
-		ImportNotifications, FinalityNotification, FinalityNotifications, BlockImportNotification,
-		ClientInfo, BlockchainEvents, BlockBackend, ProvideUncles, BadBlocks, ForkBlocks,
-		BlockOf,
-	},
-	execution_extensions::ExecutionExtensions,
-	notifications::{StorageNotifications, StorageEventStream},
-	KeyIterator, CallExecutor, ExecutorProvider, ProofProvider,
-	cht, UsageProvider,
-};
-use sp_utils::mpsc::{TracingUnboundedSender, tracing_unbounded};
-use sp_blockchain::Error;
-use prometheus_endpoint::Registry;
-use super::{
-	genesis, block_rules::{BlockRules, LookupResult as BlockLookupResult},
+use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedSender};
+use std::{
+	collections::{BTreeMap, HashMap, HashSet},
+	marker::PhantomData,
+	panic::UnwindSafe,
+	path::PathBuf,
+	result,
+	sync::Arc,
 };
-use sc_light::{call_executor::prove_execution, fetcher::ChangesProof};
-use rand::Rng;
 
-#[cfg(feature="test-helpers")]
+#[cfg(feature = "test-helpers")]
 use {
-	sp_core::traits::{CodeExecutor, SpawnNamed},
+	super::call_executor::LocalCallExecutor,
 	sc_client_api::in_mem,
 	sc_executor::RuntimeInfo,
-	super::call_executor::LocalCallExecutor,
+	sp_core::traits::{CodeExecutor, SpawnNamed},
 };
 
 type NotificationSinks<T> = Mutex<Vec<TracingUnboundedSender<T>>>;
 
 /// Substrate Client
-pub struct Client<B, E, Block, RA> where Block: BlockT {
+pub struct Client<B, E, Block, RA>
+where
+	Block: BlockT,
+{
 	backend: Arc<B>,
 	executor: E,
 	storage_notifications: Mutex<StorageNotifications<Block>>,
@@ -157,7 +153,7 @@ enum PrepareStorageChangesResult<B: backend::Backend<Block>, Block: BlockT> {
 }
 
 /// Create an instance of in-memory client.
-#[cfg(feature="test-helpers")]
+#[cfg(feature = "test-helpers")]
 pub fn new_in_mem<E, Block, S, RA>(
 	executor: E,
 	genesis_storage: &S,
@@ -166,12 +162,10 @@ pub fn new_in_mem<E, Block, S, RA>(
 	telemetry: Option<TelemetryHandle>,
 	spawn_handle: Box<dyn SpawnNamed>,
 	config: ClientConfig<Block>,
-) -> sp_blockchain::Result<Client<
-	in_mem::Backend<Block>,
-	LocalCallExecutor<Block, in_mem::Backend<Block>, E>,
-	Block,
-	RA
->> where
+) -> sp_blockchain::Result<
+	Client<in_mem::Backend<Block>, LocalCallExecutor<Block, in_mem::Backend<Block>, E>, Block, RA>,
+>
+where
 	E: CodeExecutor + RuntimeInfo,
 	S: BuildStorage,
 	Block: BlockT,
@@ -218,7 +212,7 @@ impl<Block: BlockT> Default for ClientConfig<Block> {
 
 /// Create a client with the explicitly provided backend.
 /// This is useful for testing backend implementations.
-#[cfg(feature="test-helpers")]
+#[cfg(feature = "test-helpers")]
 pub fn new_with_backend<B, E, Block, S, RA>(
 	backend: Arc<B>,
 	executor: E,
@@ -229,13 +223,14 @@ pub fn new_with_backend<B, E, Block, S, RA>(
 	telemetry: Option<TelemetryHandle>,
 	config: ClientConfig<Block>,
 ) -> sp_blockchain::Result<Client<B, LocalCallExecutor<Block, B, E>, Block, RA>>
-	where
-		E: CodeExecutor + RuntimeInfo,
-		S: BuildStorage,
-		Block: BlockT,
-		B: backend::LocalBackend<Block> + 'static,
+where
+	E: CodeExecutor + RuntimeInfo,
+	S: BuildStorage,
+	Block: BlockT,
+	B: backend::LocalBackend<Block> + 'static,
 {
-	let call_executor = LocalCallExecutor::new(backend.clone(), executor, spawn_handle, config.clone())?;
+	let call_executor =
+		LocalCallExecutor::new(backend.clone(), executor, spawn_handle, config.clone())?;
 	let extensions = ExecutionExtensions::new(
 		Default::default(),
 		keystore,
@@ -254,7 +249,8 @@ pub fn new_with_backend<B, E, Block, S, RA>(
 	)
 }
 
-impl<B, E, Block, RA> BlockOf for Client<B, E, Block, RA> where
+impl<B, E, Block, RA> BlockOf for Client<B, E, Block, RA>
+where
 	B: backend::Backend<Block>,
 	E: CallExecutor<Block>,
 	Block: BlockT,
@@ -263,15 +259,15 @@ impl<B, E, Block, RA> BlockOf for Client<B, E, Block, RA> where
 }
 
 impl<B, E, Block, RA> LockImportRun<Block, B> for Client<B, E, Block, RA>
-	where
-		B: backend::Backend<Block>,
-		E: CallExecutor<Block>,
-		Block: BlockT,
+where
+	B: backend::Backend<Block>,
+	E: CallExecutor<Block>,
+	Block: BlockT,
 {
 	fn lock_import_and_run<R, Err, F>(&self, f: F) -> Result<R, Err>
-		where
-			F: FnOnce(&mut ClientImportOperation<Block, B>) -> Result<R, Err>,
-			Err: From<sp_blockchain::Error>,
+	where
+		F: FnOnce(&mut ClientImportOperation<Block, B>) -> Result<R, Err>,
+		Err: From<sp_blockchain::Error>,
 	{
 		let inner = || {
 			let _import_lock = self.backend.get_import_lock().write();
@@ -301,21 +297,22 @@ impl<B, E, Block, RA> LockImportRun<Block, B> for Client<B, E, Block, RA>
 }
 
 impl<B, E, Block, RA> LockImportRun<Block, B> for &Client<B, E, Block, RA>
-	where
-		Block: BlockT,
-		B: backend::Backend<Block>,
-		E: CallExecutor<Block>,
+where
+	Block: BlockT,
+	B: backend::Backend<Block>,
+	E: CallExecutor<Block>,
 {
 	fn lock_import_and_run<R, Err, F>(&self, f: F) -> Result<R, Err>
-		where
-			F: FnOnce(&mut ClientImportOperation<Block, B>) -> Result<R, Err>,
-			Err: From<sp_blockchain::Error>,
+	where
+		F: FnOnce(&mut ClientImportOperation<Block, B>) -> Result<R, Err>,
+		Err: From<sp_blockchain::Error>,
 	{
 		(**self).lock_import_and_run(f)
 	}
 }
 
-impl<B, E, Block, RA> Client<B, E, Block, RA> where
+impl<B, E, Block, RA> Client<B, E, Block, RA>
+where
 	B: backend::Backend<Block>,
 	E: CallExecutor<Block>,
 	Block: BlockT,
@@ -335,12 +332,13 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 	) -> sp_blockchain::Result<Self> {
 		let info = backend.blockchain().info();
 		if info.finalized_state.is_none() {
-			let genesis_storage = build_genesis_storage.build_storage()
-				.map_err(sp_blockchain::Error::Storage)?;
+			let genesis_storage =
+				build_genesis_storage.build_storage().map_err(sp_blockchain::Error::Storage)?;
 			let mut op = backend.begin_operation()?;
 			let state_root = op.set_genesis_state(genesis_storage, !config.no_genesis)?;
 			let genesis_block = genesis::construct_genesis_block::<Block>(state_root.into());
-			info!("🔨 Initializing Genesis block/state (state: {}, header-hash: {})",
+			info!(
+				"🔨 Initializing Genesis block/state (state: {}, header-hash: {})",
 				genesis_block.header().state_root(),
 				genesis_block.header().hash()
 			);
@@ -396,8 +394,11 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 	/// Get the code at a given block.
 	pub fn code_at(&self, id: &BlockId<Block>) -> sp_blockchain::Result<Vec<u8>> {
 		Ok(StorageProvider::storage(self, id, &StorageKey(well_known_keys::CODE.to_vec()))?
-			.expect("None is returned if there's no value stored for the given key;\
-				':code' key is always defined; qed").0)
+			.expect(
+				"None is returned if there's no value stored for the given key;\
+				':code' key is always defined; qed",
+			)
+			.0)
 	}
 
 	/// Get the RuntimeVersion at a given block.
@@ -411,7 +412,9 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		id: &BlockId<Block>,
 		cht_size: NumberFor<Block>,
 	) -> sp_blockchain::Result<(Block::Header, StorageProof)> {
-		let proof_error = || sp_blockchain::Error::Backend(format!("Failed to generate header proof for {:?}", id));
+		let proof_error = || {
+			sp_blockchain::Error::Backend(format!("Failed to generate header proof for {:?}", id))
+		};
 		let header = self.backend.blockchain().expect_header(*id)?;
 		let block_num = *header.number();
 		let cht_num = cht::block_to_cht_number(cht_size, block_num).ok_or_else(proof_error)?;
@@ -449,12 +452,13 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 			required_roots_proofs: Mutex<BTreeMap<NumberFor<Block>, Block::Hash>>,
 		}
 
-		impl<'a, Block: BlockT> ChangesTrieRootsStorage<HashFor<Block>, NumberFor<Block>> for
-			AccessedRootsRecorder<'a, Block>
+		impl<'a, Block: BlockT> ChangesTrieRootsStorage<HashFor<Block>, NumberFor<Block>>
+			for AccessedRootsRecorder<'a, Block>
 		{
-			fn build_anchor(&self, hash: Block::Hash)
-				-> Result<ChangesTrieAnchorBlockId<Block::Hash, NumberFor<Block>>, String>
-			{
+			fn build_anchor(
+				&self,
+				hash: Block::Hash,
+			) -> Result<ChangesTrieAnchorBlockId<Block::Hash, NumberFor<Block>>, String> {
 				self.storage.build_anchor(hash)
 			}
 
@@ -466,22 +470,19 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 				let root = self.storage.root(anchor, block)?;
 				if block < self.min {
 					if let Some(ref root) = root {
-						self.required_roots_proofs.lock().insert(
-							block,
-							root.clone()
-						);
+						self.required_roots_proofs.lock().insert(block, root.clone());
 					}
 				}
 				Ok(root)
 			}
 		}
 
-		impl<'a, Block: BlockT> ChangesTrieStorage<HashFor<Block>, NumberFor<Block>> for
-			AccessedRootsRecorder<'a, Block>
+		impl<'a, Block: BlockT> ChangesTrieStorage<HashFor<Block>, NumberFor<Block>>
+			for AccessedRootsRecorder<'a, Block>
 		{
-			fn as_roots_storage(&self)
-				-> &dyn sp_state_machine::ChangesTrieRootsStorage<HashFor<Block>, NumberFor<Block>>
-			{
+			fn as_roots_storage(
+				&self,
+			) -> &dyn sp_state_machine::ChangesTrieRootsStorage<HashFor<Block>, NumberFor<Block>> {
 				self
 			}
 
@@ -498,10 +499,11 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 			}
 		}
 
-		let first_number = self.backend.blockchain()
-			.expect_block_number_from_id(&BlockId::Hash(first))?;
+		let first_number =
+			self.backend.blockchain().expect_block_number_from_id(&BlockId::Hash(first))?;
 		let (storage, configs) = self.require_changes_trie(first_number, last, true)?;
-		let min_number = self.backend.blockchain().expect_block_number_from_id(&BlockId::Hash(min))?;
+		let min_number =
+			self.backend.blockchain().expect_block_number_from_id(&BlockId::Hash(min))?;
 
 		let recording_storage = AccessedRootsRecorder::<Block> {
 			storage: storage.storage(),
@@ -517,8 +519,8 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		// fetch key changes proof
 		let mut proof = Vec::new();
 		for (config_zero, config_end, config) in configs {
-			let last_number = self.backend.blockchain()
-				.expect_block_number_from_id(&BlockId::Hash(last))?;
+			let last_number =
+				self.backend.blockchain().expect_block_number_from_id(&BlockId::Hash(last))?;
 			let config_range = ChangesTrieConfigurationRange {
 				config: &config,
 				zero: config_zero,
@@ -528,10 +530,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 				config_range,
 				&recording_storage,
 				first_number,
-				&ChangesTrieAnchorBlockId {
-					hash: convert_hash(&last),
-					number: last_number,
-				},
+				&ChangesTrieAnchorBlockId { hash: convert_hash(&last), number: last_number },
 				max_number,
 				storage_key,
 				&key.0,
@@ -554,20 +553,26 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 	}
 
 	/// Generate CHT-based proof for roots of changes tries at given blocks.
-	fn changes_trie_roots_proof<I: IntoIterator<Item=NumberFor<Block>>>(
+	fn changes_trie_roots_proof<I: IntoIterator<Item = NumberFor<Block>>>(
 		&self,
 		cht_size: NumberFor<Block>,
-		blocks: I
+		blocks: I,
 	) -> sp_blockchain::Result<StorageProof> {
 		// most probably we have touched several changes tries that are parts of the single CHT
 		// => GroupBy changes tries by CHT number and then gather proof for the whole group at once
 		let mut proofs = Vec::new();
 
-		cht::for_each_cht_group::<Block::Header, _, _, _>(cht_size, blocks, |_, cht_num, cht_blocks| {
-			let cht_proof = self.changes_trie_roots_proof_at_cht(cht_size, cht_num, cht_blocks)?;
-			proofs.push(cht_proof);
-			Ok(())
-		}, ())?;
+		cht::for_each_cht_group::<Block::Header, _, _, _>(
+			cht_size,
+			blocks,
+			|_, cht_num, cht_blocks| {
+				let cht_proof =
+					self.changes_trie_roots_proof_at_cht(cht_size, cht_num, cht_blocks)?;
+				proofs.push(cht_proof);
+				Ok(())
+			},
+			(),
+		)?;
 
 		Ok(StorageProof::merge(proofs))
 	}
@@ -577,7 +582,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		&self,
 		cht_size: NumberFor<Block>,
 		cht_num: NumberFor<Block>,
-		blocks: Vec<NumberFor<Block>>
+		blocks: Vec<NumberFor<Block>>,
 	) -> sp_blockchain::Result<StorageProof> {
 		let cht_start = cht::start_number(cht_size, cht_num);
 		let mut current_num = cht_start;
@@ -586,16 +591,14 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 			current_num = current_num + One::one();
 			Some(old_current_num)
 		});
-		let roots = cht_range
-			.map(|num| self.header(&BlockId::Number(num))
-			.map(|block|
-				block.and_then(|block| block.digest().log(DigestItem::as_changes_trie_root).cloned()))
-			);
+		let roots = cht_range.map(|num| {
+			self.header(&BlockId::Number(num)).map(|block| {
+				block
+					.and_then(|block| block.digest().log(DigestItem::as_changes_trie_root).cloned())
+			})
+		});
 		let proof = cht::build_proof::<Block::Header, HashFor<Block>, _, _>(
-			cht_size,
-			cht_num,
-			blocks,
-			roots,
+			cht_size, cht_num, blocks, roots,
 		)?;
 		Ok(proof)
 	}
@@ -616,7 +619,9 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		&dyn PrunableStateChangesTrieStorage<Block>,
 		Vec<(NumberFor<Block>, Option<(NumberFor<Block>, Block::Hash)>, ChangesTrieConfiguration)>,
 	)> {
-		let storage = self.backend.changes_trie_storage()
+		let storage = self
+			.backend
+			.changes_trie_storage()
 			.ok_or_else(|| sp_blockchain::Error::ChangesTriesNotSupported)?;
 
 		let mut configs = Vec::with_capacity(1);
@@ -630,10 +635,14 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 			}
 
 			if config_range.zero.0 < first {
-				break;
+				break
 			}
 
-			current = *self.backend.blockchain().expect_header(BlockId::Hash(config_range.zero.1))?.parent_hash();
+			current = *self
+				.backend
+				.blockchain()
+				.expect_header(BlockId::Hash(config_range.zero.1))?
+				.parent_hash();
 		}
 
 		Ok((storage, configs))
@@ -646,11 +655,14 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		operation: &mut ClientImportOperation<Block, B>,
 		import_block: BlockImportParams<Block, backend::TransactionFor<B, Block>>,
 		new_cache: HashMap<CacheKeyId, Vec<u8>>,
-		storage_changes: Option<sp_consensus::StorageChanges<Block, backend::TransactionFor<B, Block>>>,
-	) -> sp_blockchain::Result<ImportResult> where
+		storage_changes: Option<
+			sp_consensus::StorageChanges<Block, backend::TransactionFor<B, Block>>,
+		>,
+	) -> sp_blockchain::Result<ImportResult>
+	where
 		Self: ProvideRuntimeApi<Block>,
-		<Self as ProvideRuntimeApi<Block>>::Api: CoreApi<Block> +
-			ApiExt<Block, StateBackend = B::State>,
+		<Self as ProvideRuntimeApi<Block>>::Api:
+			CoreApi<Block> + ApiExt<Block, StateBackend = B::State>,
 	{
 		let BlockImportParams {
 			origin,
@@ -711,9 +723,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 				// don't send telemetry block import events during initial sync for every
 				// block to avoid spamming the telemetry server, these events will be randomly
 				// sent at a rate of 1/10.
-				if origin != BlockOrigin::NetworkInitialSync ||
-					rand::thread_rng().gen_bool(0.1)
-				{
+				if origin != BlockOrigin::NetworkInitialSync || rand::thread_rng().gen_bool(0.1) {
 					telemetry!(
 						self.telemetry;
 						SUBSTRATE_INFO;
@@ -738,23 +748,26 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		justifications: Option<Justifications>,
 		body: Option<Vec<Block::Extrinsic>>,
 		indexed_body: Option<Vec<Vec<u8>>>,
-		storage_changes: Option<sp_consensus::StorageChanges<Block, backend::TransactionFor<B, Block>>>,
+		storage_changes: Option<
+			sp_consensus::StorageChanges<Block, backend::TransactionFor<B, Block>>,
+		>,
 		new_cache: HashMap<CacheKeyId, Vec<u8>>,
 		finalized: bool,
 		aux: Vec<(Vec<u8>, Option<Vec<u8>>)>,
 		fork_choice: ForkChoiceStrategy,
 		import_existing: bool,
-	) -> sp_blockchain::Result<ImportResult> where
+	) -> sp_blockchain::Result<ImportResult>
+	where
 		Self: ProvideRuntimeApi<Block>,
-		<Self as ProvideRuntimeApi<Block>>::Api: CoreApi<Block> +
-				ApiExt<Block, StateBackend = B::State>,
+		<Self as ProvideRuntimeApi<Block>>::Api:
+			CoreApi<Block> + ApiExt<Block, StateBackend = B::State>,
 	{
 		let parent_hash = import_headers.post().parent_hash().clone();
 		let status = self.backend.blockchain().status(BlockId::Hash(hash))?;
 		match (import_existing, status) {
 			(false, blockchain::BlockStatus::InChain) => return Ok(ImportResult::AlreadyInChain),
 			(false, blockchain::BlockStatus::Unknown) => {},
-			(true, blockchain::BlockStatus::InChain) =>  {},
+			(true, blockchain::BlockStatus::InChain) => {},
 			(true, blockchain::BlockStatus::Unknown) => {},
 		}
 
@@ -762,17 +775,18 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 
 		// the block is lower than our last finalized block so it must revert
 		// finality, refusing import.
-		if status == blockchain::BlockStatus::Unknown
-			&& *import_headers.post().number() <= info.finalized_number
+		if status == blockchain::BlockStatus::Unknown &&
+			*import_headers.post().number() <= info.finalized_number
 		{
-			return Err(sp_blockchain::Error::NotInFinalizedChain);
+			return Err(sp_blockchain::Error::NotInFinalizedChain)
 		}
 
 		// this is a fairly arbitrary choice of where to draw the line on making notifications,
 		// but the general goal is to only make notifications when we are already fully synced
 		// and get a new chain head.
 		let make_notifications = match origin {
-			BlockOrigin::NetworkBroadcast | BlockOrigin::Own | BlockOrigin::ConsensusBroadcast => true,
+			BlockOrigin::NetworkBroadcast | BlockOrigin::Own | BlockOrigin::ConsensusBroadcast =>
+				true,
 			BlockOrigin::Genesis | BlockOrigin::NetworkInitialSync | BlockOrigin::File => false,
 		};
 
@@ -780,15 +794,10 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 			Some(storage_changes) => {
 				let storage_changes = match storage_changes {
 					sp_consensus::StorageChanges::Changes(storage_changes) => {
-						self.backend.begin_state_operation(&mut operation.op, BlockId::Hash(parent_hash))?;
-						let (
-							main_sc,
-							child_sc,
-							offchain_sc,
-							tx, _,
-							changes_trie_tx,
-							tx_index,
-						) = storage_changes.into_inner();
+						self.backend
+							.begin_state_operation(&mut operation.op, BlockId::Hash(parent_hash))?;
+						let (main_sc, child_sc, offchain_sc, tx, _, changes_trie_tx, tx_index) =
+							storage_changes.into_inner();
 
 						if self.config.offchain_indexing_api {
 							operation.op.update_offchain_storage(offchain_sc)?;
@@ -803,7 +812,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 						}
 
 						Some((main_sc, child_sc))
-					}
+					},
 					sp_consensus::StorageChanges::Import(changes) => {
 						let storage = sp_storage::Storage {
 							top: changes.state.into_iter().collect(),
@@ -815,10 +824,10 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 							// State root mismatch when importing state. This should not happen in safe fast sync mode,
 							// but may happen in unsafe mode.
 							warn!("Error imporing state: State root mismatch.");
-							return Err(Error::InvalidStateRoot);
+							return Err(Error::InvalidStateRoot)
 						}
 						None
-					}
+					},
 				};
 
 				// ensure parent block is finalized to maintain invariant that
@@ -835,15 +844,16 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 
 				operation.op.update_cache(new_cache);
 				storage_changes
-
 			},
 			None => None,
 		};
 
-		let is_new_best = finalized || match fork_choice {
-			ForkChoiceStrategy::LongestChain => import_headers.post().number() > &info.best_number,
-			ForkChoiceStrategy::Custom(v) => v,
-		};
+		let is_new_best = finalized ||
+			match fork_choice {
+				ForkChoiceStrategy::LongestChain =>
+					import_headers.post().number() > &info.best_number,
+				ForkChoiceStrategy::Custom(v) => v,
+			};
 
 		let leaf_state = if finalized {
 			NewBlockState::Final
@@ -854,11 +864,8 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		};
 
 		let tree_route = if is_new_best && info.best_hash != parent_hash {
-			let route_from_best = sp_blockchain::tree_route(
-				self.backend.blockchain(),
-				info.best_hash,
-				parent_hash,
-			)?;
+			let route_from_best =
+				sp_blockchain::tree_route(self.backend.blockchain(), info.best_hash, parent_hash)?;
 			Some(route_from_best)
 		} else {
 			None
@@ -910,20 +917,24 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		&self,
 		import_block: &mut BlockImportParams<Block, backend::TransactionFor<B, Block>>,
 	) -> sp_blockchain::Result<PrepareStorageChangesResult<B, Block>>
-		where
-			Self: ProvideRuntimeApi<Block>,
-			<Self as ProvideRuntimeApi<Block>>::Api: CoreApi<Block> +
-				ApiExt<Block, StateBackend = B::State>,
+	where
+		Self: ProvideRuntimeApi<Block>,
+		<Self as ProvideRuntimeApi<Block>>::Api:
+			CoreApi<Block> + ApiExt<Block, StateBackend = B::State>,
 	{
 		let parent_hash = import_block.header.parent_hash();
 		let at = BlockId::Hash(*parent_hash);
 		let state_action = std::mem::replace(&mut import_block.state_action, StateAction::Skip);
 		let (enact_state, storage_changes) = match (self.block_status(&at)?, state_action) {
-			(BlockStatus::Unknown, _) => return Ok(PrepareStorageChangesResult::Discard(ImportResult::UnknownParent)),
-			(BlockStatus::KnownBad, _) => return Ok(PrepareStorageChangesResult::Discard(ImportResult::KnownBad)),
+			(BlockStatus::Unknown, _) =>
+				return Ok(PrepareStorageChangesResult::Discard(ImportResult::UnknownParent)),
+			(BlockStatus::KnownBad, _) =>
+				return Ok(PrepareStorageChangesResult::Discard(ImportResult::KnownBad)),
 			(_, StateAction::Skip) => (false, None),
-			(BlockStatus::InChainPruned, StateAction::ApplyChanges(sp_consensus::StorageChanges::Changes(_))) =>
-			 	return Ok(PrepareStorageChangesResult::Discard(ImportResult::MissingState)),
+			(
+				BlockStatus::InChainPruned,
+				StateAction::ApplyChanges(sp_consensus::StorageChanges::Changes(_)),
+			) => return Ok(PrepareStorageChangesResult::Discard(ImportResult::MissingState)),
 			(BlockStatus::InChainPruned, StateAction::Execute) =>
 				return Ok(PrepareStorageChangesResult::Discard(ImportResult::MissingState)),
 			(BlockStatus::InChainPruned, StateAction::ExecuteIfPossible) => (false, None),
@@ -953,19 +964,14 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 				)?;
 
 				let state = self.backend.state_at(at)?;
-				let changes_trie_state = changes_tries_state_at_block(
-					&at,
-					self.backend.changes_trie_storage(),
-				)?;
+				let changes_trie_state =
+					changes_tries_state_at_block(&at, self.backend.changes_trie_storage())?;
 
-				let gen_storage_changes = runtime_api.into_storage_changes(
-					&state,
-					changes_trie_state.as_ref(),
-					*parent_hash,
-				).map_err(sp_blockchain::Error::Storage)?;
+				let gen_storage_changes = runtime_api
+					.into_storage_changes(&state, changes_trie_state.as_ref(), *parent_hash)
+					.map_err(sp_blockchain::Error::Storage)?;
 
-				if import_block.header.state_root()
-					!= &gen_storage_changes.transaction_storage_root
+				if import_block.header.state_root() != &gen_storage_changes.transaction_storage_root
 				{
 					return Err(Error::InvalidStateRoot)
 				}
@@ -992,20 +998,28 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		let last_finalized = self.backend.blockchain().last_finalized()?;
 
 		if block == last_finalized {
-			warn!("Possible safety violation: attempted to re-finalize last finalized block {:?} ", last_finalized);
-			return Ok(());
+			warn!(
+				"Possible safety violation: attempted to re-finalize last finalized block {:?} ",
+				last_finalized
+			);
+			return Ok(())
 		}
 
-		let route_from_finalized = sp_blockchain::tree_route(self.backend.blockchain(), last_finalized, block)?;
+		let route_from_finalized =
+			sp_blockchain::tree_route(self.backend.blockchain(), last_finalized, block)?;
 
 		if let Some(retracted) = route_from_finalized.retracted().get(0) {
-			warn!("Safety violation: attempted to revert finalized block {:?} which is not in the \
-				same chain as last finalized {:?}", retracted, last_finalized);
+			warn!(
+				"Safety violation: attempted to revert finalized block {:?} which is not in the \
+				same chain as last finalized {:?}",
+				retracted, last_finalized
+			);
 
-			return Err(sp_blockchain::Error::NotInFinalizedChain);
+			return Err(sp_blockchain::Error::NotInFinalizedChain)
 		}
 
-		let route_from_best = sp_blockchain::tree_route(self.backend.blockchain(), best_block, block)?;
+		let route_from_best =
+			sp_blockchain::tree_route(self.backend.blockchain(), best_block, block)?;
 
 		// if the block is not a direct ancestor of the current best chain,
 		// then some other block is the common ancestor.
@@ -1042,10 +1056,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		Ok(())
 	}
 
-	fn notify_finalized(
-		&self,
-		notify_finalized: Vec<Block::Hash>,
-	) -> sp_blockchain::Result<()> {
+	fn notify_finalized(&self, notify_finalized: Vec<Block::Hash>) -> sp_blockchain::Result<()> {
 		let mut sinks = self.finality_notification_sinks.lock();
 
 		if notify_finalized.is_empty() {
@@ -1054,17 +1065,16 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 			// would also remove any closed sinks.
 			sinks.retain(|sink| !sink.is_closed());
 
-			return Ok(());
+			return Ok(())
 		}
 
 		// We assume the list is sorted and only want to inform the
 		// telemetry once about the finalized block.
 		if let Some(last) = notify_finalized.last() {
-			let header = self.header(&BlockId::Hash(*last))?
-				.expect(
-					"Header already known to exist in DB because it is \
-					indicated in the tree route; qed"
-				);
+			let header = self.header(&BlockId::Hash(*last))?.expect(
+				"Header already known to exist in DB because it is \
+					indicated in the tree route; qed",
+			);
 
 			telemetry!(
 				self.telemetry;
@@ -1076,16 +1086,12 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		}
 
 		for finalized_hash in notify_finalized {
-			let header = self.header(&BlockId::Hash(finalized_hash))?
-				.expect(
-					"Header already known to exist in DB because it is \
-					indicated in the tree route; qed"
-				);
+			let header = self.header(&BlockId::Hash(finalized_hash))?.expect(
+				"Header already known to exist in DB because it is \
+					indicated in the tree route; qed",
+			);
 
-			let notification = FinalityNotification {
-				header,
-				hash: finalized_hash,
-			};
+			let notification = FinalityNotification { header, hash: finalized_hash };
 
 			sinks.retain(|sink| sink.unbounded_send(notification.clone()).is_ok());
 		}
@@ -1106,22 +1112,19 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 				// won't send any import notifications which could lead to a
 				// temporary leak of closed/discarded notification sinks (e.g.
 				// from consensus code).
-				self.import_notification_sinks
-					.lock()
-					.retain(|sink| !sink.is_closed());
+				self.import_notification_sinks.lock().retain(|sink| !sink.is_closed());
 
-				return Ok(());
-			}
+				return Ok(())
+			},
 		};
 
 		if let Some(storage_changes) = notify_import.storage_changes {
 			// TODO [ToDr] How to handle re-orgs? Should we re-emit all storage changes?
-			self.storage_notifications.lock()
-				.trigger(
-					&notify_import.hash,
-					storage_changes.0.into_iter(),
-					storage_changes.1.into_iter().map(|(sk, v)| (sk, v.into_iter())),
-				);
+			self.storage_notifications.lock().trigger(
+				&notify_import.hash,
+				storage_changes.0.into_iter(),
+				storage_changes.1.into_iter().map(|(sk, v)| (sk, v.into_iter())),
+			);
 		}
 
 		let notification = BlockImportNotification::<Block> {
@@ -1132,7 +1135,8 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 			tree_route: notify_import.tree_route.map(Arc::new),
 		};
 
-		self.import_notification_sinks.lock()
+		self.import_notification_sinks
+			.lock()
 			.retain(|sink| sink.unbounded_send(notification.clone()).is_ok());
 
 		Ok(())
@@ -1179,7 +1183,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		// this can probably be implemented more efficiently
 		if let BlockId::Hash(ref h) = id {
 			if self.importing_block.read().as_ref().map_or(false, |importing| h == importing) {
-				return Ok(BlockStatus::Queued);
+				return Ok(BlockStatus::Queued)
 			}
 		}
 		let hash_and_number = match id.clone() {
@@ -1187,24 +1191,29 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 			BlockId::Number(n) => self.backend.blockchain().hash(n)?.map(|hash| (hash, n)),
 		};
 		match hash_and_number {
-			Some((hash, number)) => {
+			Some((hash, number)) =>
 				if self.backend.have_state_at(&hash, number) {
 					Ok(BlockStatus::InChainWithState)
 				} else {
 					Ok(BlockStatus::InChainPruned)
-				}
-			}
+				},
 			None => Ok(BlockStatus::Unknown),
 		}
 	}
 
 	/// Get block header by id.
-	pub fn header(&self, id: &BlockId<Block>) -> sp_blockchain::Result<Option<<Block as BlockT>::Header>> {
+	pub fn header(
+		&self,
+		id: &BlockId<Block>,
+	) -> sp_blockchain::Result<Option<<Block as BlockT>::Header>> {
 		self.backend.blockchain().header(*id)
 	}
 
 	/// Get block body by id.
-	pub fn body(&self, id: &BlockId<Block>) -> sp_blockchain::Result<Option<Vec<<Block as BlockT>::Extrinsic>>> {
+	pub fn body(
+		&self,
+		id: &BlockId<Block>,
+	) -> sp_blockchain::Result<Option<Vec<<Block as BlockT>::Extrinsic>>> {
 		self.backend.blockchain().body(*id)
 	}
 
@@ -1215,13 +1224,15 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		max_generation: NumberFor<Block>,
 	) -> sp_blockchain::Result<Vec<Block::Hash>> {
 		let load_header = |id: Block::Hash| -> sp_blockchain::Result<Block::Header> {
-			self.backend.blockchain().header(BlockId::Hash(id))?
+			self.backend
+				.blockchain()
+				.header(BlockId::Hash(id))?
 				.ok_or_else(|| Error::UnknownBlock(format!("{:?}", id)))
 		};
 
 		let genesis_hash = self.backend.blockchain().info().genesis_hash;
 		if genesis_hash == target_hash {
-			return Ok(Vec::new());
+			return Ok(Vec::new())
 		}
 
 		let mut current_hash = target_hash;
@@ -1237,7 +1248,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 			current_hash = ancestor_hash;
 
 			if genesis_hash == current_hash {
-				break;
+				break
 			}
 
 			current = ancestor;
@@ -1250,21 +1261,20 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 	}
 }
 
-impl<B, E, Block, RA> UsageProvider<Block> for Client<B, E, Block, RA> where
+impl<B, E, Block, RA> UsageProvider<Block> for Client<B, E, Block, RA>
+where
 	B: backend::Backend<Block>,
 	E: CallExecutor<Block>,
 	Block: BlockT,
 {
 	/// Get usage info about current client.
 	fn usage_info(&self) -> ClientInfo<Block> {
-		ClientInfo {
-			chain: self.chain_info(),
-			usage: self.backend.usage_info(),
-		}
+		ClientInfo { chain: self.chain_info(), usage: self.backend.usage_info() }
 	}
 }
 
-impl<B, E, Block, RA> ProofProvider<Block> for Client<B, E, Block, RA> where
+impl<B, E, Block, RA> ProofProvider<Block> for Client<B, E, Block, RA>
+where
 	B: backend::Backend<Block>,
 	E: CallExecutor<Block>,
 	Block: BlockT,
@@ -1272,29 +1282,26 @@ impl<B, E, Block, RA> ProofProvider<Block> for Client<B, E, Block, RA> where
 	fn read_proof(
 		&self,
 		id: &BlockId<Block>,
-		keys: &mut dyn Iterator<Item=&[u8]>,
+		keys: &mut dyn Iterator<Item = &[u8]>,
 	) -> sp_blockchain::Result<StorageProof> {
-		self.state_at(id)
-			.and_then(|state| prove_read(state, keys)
-				.map_err(Into::into))
+		self.state_at(id).and_then(|state| prove_read(state, keys).map_err(Into::into))
 	}
 
 	fn read_child_proof(
 		&self,
 		id: &BlockId<Block>,
 		child_info: &ChildInfo,
-		keys: &mut dyn Iterator<Item=&[u8]>,
+		keys: &mut dyn Iterator<Item = &[u8]>,
 	) -> sp_blockchain::Result<StorageProof> {
 		self.state_at(id)
-			.and_then(|state| prove_child_read(state, child_info, keys)
-				.map_err(Into::into))
+			.and_then(|state| prove_child_read(state, child_info, keys).map_err(Into::into))
 	}
 
 	fn execution_proof(
 		&self,
 		id: &BlockId<Block>,
 		method: &str,
-		call_data: &[u8]
+		call_data: &[u8],
 	) -> sp_blockchain::Result<(Vec<u8>, StorageProof)> {
 		// Make sure we include the `:code` and `:heap_pages` in the execution proof to be
 		// backwards compatible.
@@ -1306,17 +1313,14 @@ impl<B, E, Block, RA> ProofProvider<Block> for Client<B, E, Block, RA> where
 		)?;
 
 		let state = self.state_at(id)?;
-		prove_execution(
-			state,
-			&self.executor,
-			method,
-			call_data,
-		).map(|(r, p)| {
-			(r, StorageProof::merge(vec![p, code_proof]))
-		})
+		prove_execution(state, &self.executor, method, call_data)
+			.map(|(r, p)| (r, StorageProof::merge(vec![p, code_proof])))
 	}
 
-	fn header_proof(&self, id: &BlockId<Block>) -> sp_blockchain::Result<(Block::Header, StorageProof)> {
+	fn header_proof(
+		&self,
+		id: &BlockId<Block>,
+	) -> sp_blockchain::Result<(Block::Header, StorageProof)> {
 		self.header_proof_with_cht_size(id, cht::size())
 	}
 
@@ -1329,15 +1333,7 @@ impl<B, E, Block, RA> ProofProvider<Block> for Client<B, E, Block, RA> where
 		storage_key: Option<&PrefixedStorageKey>,
 		key: &StorageKey,
 	) -> sp_blockchain::Result<ChangesProof<Block::Header>> {
-		self.key_changes_proof_with_cht_size(
-			first,
-			last,
-			min,
-			max,
-			storage_key,
-			key,
-			cht::size(),
-		)
+		self.key_changes_proof_with_cht_size(first, last, min, max, storage_key, key, cht::size())
 	}
 
 	fn read_proof_collection(
@@ -1348,11 +1344,11 @@ impl<B, E, Block, RA> ProofProvider<Block> for Client<B, E, Block, RA> where
 	) -> sp_blockchain::Result<(StorageProof, u32)> {
 		let state = self.state_at(id)?;
 		Ok(prove_range_read_with_size::<_, HashFor<Block>>(
-				state,
-				None,
-				None,
-				size_limit,
-				Some(start_key)
+			state,
+			None,
+			None,
+			size_limit,
+			Some(start_key),
 		)?)
 	}
 
@@ -1376,14 +1372,13 @@ impl<B, E, Block, RA> ProofProvider<Block> for Client<B, E, Block, RA> where
 				.unwrap_or_default();
 			let size = value.len() + next_key.len();
 			if total_size + size > size_limit && !entries.is_empty() {
-				break;
+				break
 			}
 			total_size += size;
 			entries.push((next_key.clone(), value));
 			current_key = next_key;
 		}
 		Ok(entries)
-
 	}
 
 	fn verify_range_proof(
@@ -1393,25 +1388,24 @@ impl<B, E, Block, RA> ProofProvider<Block> for Client<B, E, Block, RA> where
 		start_key: &[u8],
 	) -> sp_blockchain::Result<(Vec<(Vec<u8>, Vec<u8>)>, bool)> {
 		Ok(read_range_proof_check::<HashFor<Block>>(
-				root,
-				proof,
-				None,
-				None,
-				None,
-				Some(start_key),
+			root,
+			proof,
+			None,
+			None,
+			None,
+			Some(start_key),
 		)?)
 	}
 }
 
-
 impl<B, E, Block, RA> BlockBuilderProvider<B, Block, Self> for Client<B, E, Block, RA>
-	where
-		B: backend::Backend<Block> + Send + Sync + 'static,
-		E: CallExecutor<Block> + Send + Sync + 'static,
-		Block: BlockT,
-		Self: ChainHeaderBackend<Block> + ProvideRuntimeApi<Block>,
-		<Self as ProvideRuntimeApi<Block>>::Api: ApiExt<Block, StateBackend = backend::StateBackendFor<B, Block>>
-			+ BlockBuilderApi<Block>,
+where
+	B: backend::Backend<Block> + Send + Sync + 'static,
+	E: CallExecutor<Block> + Send + Sync + 'static,
+	Block: BlockT,
+	Self: ChainHeaderBackend<Block> + ProvideRuntimeApi<Block>,
+	<Self as ProvideRuntimeApi<Block>>::Api:
+		ApiExt<Block, StateBackend = backend::StateBackendFor<B, Block>> + BlockBuilderApi<Block>,
 {
 	fn new_block_at<R: Into<RecordProof>>(
 		&self,
@@ -1425,7 +1419,7 @@ impl<B, E, Block, RA> BlockBuilderProvider<B, Block, Self> for Client<B, E, Bloc
 			self.expect_block_number_from_id(parent)?,
 			record_proof.into(),
 			inherent_digests,
-			&self.backend
+			&self.backend,
 		)
 	}
 
@@ -1445,7 +1439,8 @@ impl<B, E, Block, RA> BlockBuilderProvider<B, Block, Self> for Client<B, E, Bloc
 	}
 }
 
-impl<B, E, Block, RA> ExecutorProvider<Block> for Client<B, E, Block, RA> where
+impl<B, E, Block, RA> ExecutorProvider<Block> for Client<B, E, Block, RA>
+where
 	B: backend::Backend<Block>,
 	E: CallExecutor<Block>,
 	Block: BlockT,
@@ -1461,19 +1456,26 @@ impl<B, E, Block, RA> ExecutorProvider<Block> for Client<B, E, Block, RA> where
 	}
 }
 
-impl<B, E, Block, RA> StorageProvider<Block, B> for Client<B, E, Block, RA> where
+impl<B, E, Block, RA> StorageProvider<Block, B> for Client<B, E, Block, RA>
+where
 	B: backend::Backend<Block>,
 	E: CallExecutor<Block>,
 	Block: BlockT,
 {
-	fn storage_keys(&self, id: &BlockId<Block>, key_prefix: &StorageKey) -> sp_blockchain::Result<Vec<StorageKey>> {
+	fn storage_keys(
+		&self,
+		id: &BlockId<Block>,
+		key_prefix: &StorageKey,
+	) -> sp_blockchain::Result<Vec<StorageKey>> {
 		let keys = self.state_at(id)?.keys(&key_prefix.0).into_iter().map(StorageKey).collect();
 		Ok(keys)
 	}
 
-	fn storage_pairs(&self, id: &BlockId<Block>, key_prefix: &StorageKey)
-		-> sp_blockchain::Result<Vec<(StorageKey, StorageData)>>
-	{
+	fn storage_pairs(
+		&self,
+		id: &BlockId<Block>,
+		key_prefix: &StorageKey,
+	) -> sp_blockchain::Result<Vec<(StorageKey, StorageData)>> {
 		let state = self.state_at(id)?;
 		let keys = state
 			.keys(&key_prefix.0)
@@ -1490,13 +1492,10 @@ impl<B, E, Block, RA> StorageProvider<Block, B> for Client<B, E, Block, RA> wher
 		&self,
 		id: &BlockId<Block>,
 		prefix: Option<&'a StorageKey>,
-		start_key: Option<&StorageKey>
+		start_key: Option<&StorageKey>,
 	) -> sp_blockchain::Result<KeyIterator<'a, B::State, Block>> {
 		let state = self.state_at(id)?;
-		let start_key = start_key
-			.or(prefix)
-			.map(|key| key.0.clone())
-			.unwrap_or_else(Vec::new);
+		let start_key = start_key.or(prefix).map(|key| key.0.clone()).unwrap_or_else(Vec::new);
 		Ok(KeyIterator::new(state, prefix, start_key))
 	}
 
@@ -1505,13 +1504,10 @@ impl<B, E, Block, RA> StorageProvider<Block, B> for Client<B, E, Block, RA> wher
 		id: &BlockId<Block>,
 		child_info: ChildInfo,
 		prefix: Option<&'a StorageKey>,
-		start_key: Option<&StorageKey>
+		start_key: Option<&StorageKey>,
 	) -> sp_blockchain::Result<KeyIterator<'a, B::State, Block>> {
 		let state = self.state_at(id)?;
-		let start_key = start_key
-			.or(prefix)
-			.map(|key| key.0.clone())
-			.unwrap_or_else(Vec::new);
+		let start_key = start_key.or(prefix).map(|key| key.0.clone()).unwrap_or_else(Vec::new);
 		Ok(KeyIterator::new_child(state, child_info, prefix, start_key))
 	}
 
@@ -1520,30 +1516,32 @@ impl<B, E, Block, RA> StorageProvider<Block, B> for Client<B, E, Block, RA> wher
 		id: &BlockId<Block>,
 		key: &StorageKey,
 	) -> sp_blockchain::Result<Option<StorageData>> {
-		Ok(self.state_at(id)?
-			.storage(&key.0).map_err(|e| sp_blockchain::Error::from_state(Box::new(e)))?
-			.map(StorageData)
-		)
+		Ok(self
+			.state_at(id)?
+			.storage(&key.0)
+			.map_err(|e| sp_blockchain::Error::from_state(Box::new(e)))?
+			.map(StorageData))
 	}
 
-
 	fn storage_hash(
 		&self,
 		id: &BlockId<Block>,
 		key: &StorageKey,
 	) -> sp_blockchain::Result<Option<Block::Hash>> {
-		Ok(self.state_at(id)?
-			.storage_hash(&key.0).map_err(|e| sp_blockchain::Error::from_state(Box::new(e)))?
-		)
+		Ok(self
+			.state_at(id)?
+			.storage_hash(&key.0)
+			.map_err(|e| sp_blockchain::Error::from_state(Box::new(e)))?)
 	}
 
 	fn child_storage_keys(
 		&self,
 		id: &BlockId<Block>,
 		child_info: &ChildInfo,
-		key_prefix: &StorageKey
+		key_prefix: &StorageKey,
 	) -> sp_blockchain::Result<Vec<StorageKey>> {
-		let keys = self.state_at(id)?
+		let keys = self
+			.state_at(id)?
 			.child_keys(child_info, &key_prefix.0)
 			.into_iter()
 			.map(StorageKey)
@@ -1555,9 +1553,10 @@ impl<B, E, Block, RA> StorageProvider<Block, B> for Client<B, E, Block, RA> wher
 		&self,
 		id: &BlockId<Block>,
 		child_info: &ChildInfo,
-		key: &StorageKey
+		key: &StorageKey,
 	) -> sp_blockchain::Result<Option<StorageData>> {
-		Ok(self.state_at(id)?
+		Ok(self
+			.state_at(id)?
 			.child_storage(child_info, &key.0)
 			.map_err(|e| sp_blockchain::Error::from_state(Box::new(e)))?
 			.map(StorageData))
@@ -1567,12 +1566,12 @@ impl<B, E, Block, RA> StorageProvider<Block, B> for Client<B, E, Block, RA> wher
 		&self,
 		id: &BlockId<Block>,
 		child_info: &ChildInfo,
-		key: &StorageKey
+		key: &StorageKey,
 	) -> sp_blockchain::Result<Option<Block::Hash>> {
-		Ok(self.state_at(id)?
+		Ok(self
+			.state_at(id)?
 			.child_storage_hash(child_info, &key.0)
-			.map_err(|e| sp_blockchain::Error::from_state(Box::new(e)))?
-		)
+			.map_err(|e| sp_blockchain::Error::from_state(Box::new(e)))?)
 	}
 
 	fn max_key_changes_range(
@@ -1583,7 +1582,9 @@ impl<B, E, Block, RA> StorageProvider<Block, B> for Client<B, E, Block, RA> wher
 		let last_number = self.backend.blockchain().expect_block_number_from_id(&last)?;
 		let last_hash = self.backend.blockchain().expect_block_hash_from_id(&last)?;
 		if first > last_number {
-			return Err(sp_blockchain::Error::ChangesTrieAccessFailed("Invalid changes trie range".into()));
+			return Err(sp_blockchain::Error::ChangesTrieAccessFailed(
+				"Invalid changes trie range".into(),
+			))
 		}
 
 		let (storage, configs) = match self.require_changes_trie(first, last_hash, false).ok() {
@@ -1598,7 +1599,7 @@ impl<B, E, Block, RA> StorageProvider<Block, B> for Client<B, E, Block, RA> wher
 				let first = std::cmp::max(first_available_changes_trie, oldest_unpruned);
 				Ok(Some((first, last)))
 			},
-			None => Ok(None)
+			None => Ok(None),
 		}
 	}
 
@@ -1607,7 +1608,7 @@ impl<B, E, Block, RA> StorageProvider<Block, B> for Client<B, E, Block, RA> wher
 		first: NumberFor<Block>,
 		last: BlockId<Block>,
 		storage_key: Option<&PrefixedStorageKey>,
-		key: &StorageKey
+		key: &StorageKey,
 	) -> sp_blockchain::Result<Vec<(NumberFor<Block>, u32)>> {
 		let last_number = self.backend.blockchain().expect_block_number_from_id(&last)?;
 		let last_hash = self.backend.blockchain().expect_block_hash_from_id(&last)?;
@@ -1618,12 +1619,20 @@ impl<B, E, Block, RA> StorageProvider<Block, B> for Client<B, E, Block, RA> wher
 		for (config_zero, config_end, config) in configs {
 			let range_first = ::std::cmp::max(first, config_zero + One::one());
 			let range_anchor = match config_end {
-				Some((config_end_number, config_end_hash)) => if last_number > config_end_number {
-					ChangesTrieAnchorBlockId { hash: config_end_hash, number: config_end_number }
-				} else {
-					ChangesTrieAnchorBlockId { hash: convert_hash(&last_hash), number: last_number }
-				},
-				None => ChangesTrieAnchorBlockId { hash: convert_hash(&last_hash), number: last_number },
+				Some((config_end_number, config_end_hash)) =>
+					if last_number > config_end_number {
+						ChangesTrieAnchorBlockId {
+							hash: config_end_hash,
+							number: config_end_number,
+						}
+					} else {
+						ChangesTrieAnchorBlockId {
+							hash: convert_hash(&last_hash),
+							number: last_number,
+						}
+					},
+				None =>
+					ChangesTrieAnchorBlockId { hash: convert_hash(&last_hash), number: last_number },
 			};
 
 			let config_range = ChangesTrieConfigurationRange {
@@ -1638,9 +1647,10 @@ impl<B, E, Block, RA> StorageProvider<Block, B> for Client<B, E, Block, RA> wher
 				&range_anchor,
 				best_number,
 				storage_key,
-				&key.0)
-				.and_then(|r| r.map(|r| r.map(|(block, tx)| (block, tx))).collect::<Result<_, _>>())
-				.map_err(|err| sp_blockchain::Error::ChangesTrieAccessFailed(err))?;
+				&key.0,
+			)
+			.and_then(|r| r.map(|r| r.map(|(block, tx)| (block, tx))).collect::<Result<_, _>>())
+			.map_err(|err| sp_blockchain::Error::ChangesTrieAccessFailed(err))?;
 			result.extend(result_range);
 		}
 
@@ -1648,14 +1658,18 @@ impl<B, E, Block, RA> StorageProvider<Block, B> for Client<B, E, Block, RA> wher
 	}
 }
 
-impl<B, E, Block, RA> HeaderMetadata<Block> for Client<B, E, Block, RA> where
+impl<B, E, Block, RA> HeaderMetadata<Block> for Client<B, E, Block, RA>
+where
 	B: backend::Backend<Block>,
 	E: CallExecutor<Block>,
 	Block: BlockT,
 {
 	type Error = sp_blockchain::Error;
 
-	fn header_metadata(&self, hash: Block::Hash) -> Result<CachedHeaderMetadata<Block>, Self::Error> {
+	fn header_metadata(
+		&self,
+		hash: Block::Hash,
+	) -> Result<CachedHeaderMetadata<Block>, Self::Error> {
 		self.backend.blockchain().header_metadata(hash)
 	}
 
@@ -1668,21 +1682,26 @@ impl<B, E, Block, RA> HeaderMetadata<Block> for Client<B, E, Block, RA> where
 	}
 }
 
-impl<B, E, Block, RA> ProvideUncles<Block> for Client<B, E, Block, RA> where
+impl<B, E, Block, RA> ProvideUncles<Block> for Client<B, E, Block, RA>
+where
 	B: backend::Backend<Block>,
 	E: CallExecutor<Block>,
 	Block: BlockT,
 {
-	fn uncles(&self, target_hash: Block::Hash, max_generation: NumberFor<Block>) -> sp_blockchain::Result<Vec<Block::Header>> {
+	fn uncles(
+		&self,
+		target_hash: Block::Hash,
+		max_generation: NumberFor<Block>,
+	) -> sp_blockchain::Result<Vec<Block::Header>> {
 		Ok(Client::uncles(self, target_hash, max_generation)?
 			.into_iter()
 			.filter_map(|hash| Client::header(self, &BlockId::Hash(hash)).unwrap_or(None))
-			.collect()
-		)
+			.collect())
 	}
 }
 
-impl<B, E, Block, RA> ChainHeaderBackend<Block> for Client<B, E, Block, RA> where
+impl<B, E, Block, RA> ChainHeaderBackend<Block> for Client<B, E, Block, RA>
+where
 	B: backend::Backend<Block>,
 	E: CallExecutor<Block> + Send + Sync,
 	Block: BlockT,
@@ -1700,7 +1719,10 @@ impl<B, E, Block, RA> ChainHeaderBackend<Block> for Client<B, E, Block, RA> wher
 		self.backend.blockchain().status(id)
 	}
 
-	fn number(&self, hash: Block::Hash) -> sp_blockchain::Result<Option<<<Block as BlockT>::Header as HeaderT>::Number>> {
+	fn number(
+		&self,
+		hash: Block::Hash,
+	) -> sp_blockchain::Result<Option<<<Block as BlockT>::Header as HeaderT>::Number>> {
 		self.backend.blockchain().number(hash)
 	}
 
@@ -1709,7 +1731,8 @@ impl<B, E, Block, RA> ChainHeaderBackend<Block> for Client<B, E, Block, RA> wher
 	}
 }
 
-impl<B, E, Block, RA> sp_runtime::traits::BlockIdTo<Block> for Client<B, E, Block, RA> where
+impl<B, E, Block, RA> sp_runtime::traits::BlockIdTo<Block> for Client<B, E, Block, RA>
+where
 	B: backend::Backend<Block>,
 	E: CallExecutor<Block> + Send + Sync,
 	Block: BlockT,
@@ -1721,12 +1744,16 @@ impl<B, E, Block, RA> sp_runtime::traits::BlockIdTo<Block> for Client<B, E, Bloc
 		self.block_hash_from_id(block_id)
 	}
 
-	fn to_number(&self, block_id: &BlockId<Block>) -> sp_blockchain::Result<Option<NumberFor<Block>>> {
+	fn to_number(
+		&self,
+		block_id: &BlockId<Block>,
+	) -> sp_blockchain::Result<Option<NumberFor<Block>>> {
 		self.block_number_from_id(block_id)
 	}
 }
 
-impl<B, E, Block, RA> ChainHeaderBackend<Block> for &Client<B, E, Block, RA> where
+impl<B, E, Block, RA> ChainHeaderBackend<Block> for &Client<B, E, Block, RA>
+where
 	B: backend::Backend<Block>,
 	E: CallExecutor<Block> + Send + Sync,
 	Block: BlockT,
@@ -1744,7 +1771,10 @@ impl<B, E, Block, RA> ChainHeaderBackend<Block> for &Client<B, E, Block, RA> whe
 		(**self).status(id)
 	}
 
-	fn number(&self, hash: Block::Hash) -> sp_blockchain::Result<Option<<<Block as BlockT>::Header as HeaderT>::Number>> {
+	fn number(
+		&self,
+		hash: Block::Hash,
+	) -> sp_blockchain::Result<Option<<<Block as BlockT>::Header as HeaderT>::Number>> {
 		(**self).number(hash)
 	}
 
@@ -1753,7 +1783,8 @@ impl<B, E, Block, RA> ChainHeaderBackend<Block> for &Client<B, E, Block, RA> whe
 	}
 }
 
-impl<B, E, Block, RA> ProvideCache<Block> for Client<B, E, Block, RA> where
+impl<B, E, Block, RA> ProvideCache<Block> for Client<B, E, Block, RA>
+where
 	B: backend::Backend<Block>,
 	Block: BlockT,
 {
@@ -1762,7 +1793,8 @@ impl<B, E, Block, RA> ProvideCache<Block> for Client<B, E, Block, RA> where
 	}
 }
 
-impl<B, E, Block, RA> ProvideRuntimeApi<Block> for Client<B, E, Block, RA> where
+impl<B, E, Block, RA> ProvideRuntimeApi<Block> for Client<B, E, Block, RA>
+where
 	B: backend::Backend<Block>,
 	E: CallExecutor<Block, Backend = B> + Send + Sync,
 	Block: BlockT,
@@ -1775,7 +1807,8 @@ impl<B, E, Block, RA> ProvideRuntimeApi<Block> for Client<B, E, Block, RA> where
 	}
 }
 
-impl<B, E, Block, RA> CallApiAt<Block> for Client<B, E, Block, RA> where
+impl<B, E, Block, RA> CallApiAt<Block> for Client<B, E, Block, RA>
+where
 	B: backend::Backend<Block>,
 	E: CallExecutor<Block, Backend = B> + Send + Sync,
 	Block: BlockT,
@@ -1792,28 +1825,25 @@ impl<B, E, Block, RA> CallApiAt<Block> for Client<B, E, Block, RA> where
 	) -> Result<NativeOrEncoded<R>, sp_api::ApiError> {
 		let at = params.at;
 
-		let (manager, extensions) = self.execution_extensions.manager_and_extensions(
-			at,
-			params.context,
-		);
-
-		self.executor.contextual_call::<fn(_,_) -> _, _, _>(
-			at,
-			params.function,
-			&params.arguments,
-			params.overlayed_changes,
-			Some(params.storage_transaction_cache),
-			manager,
-			params.native_call,
-			params.recorder,
-			Some(extensions),
-		).map_err(Into::into)
+		let (manager, extensions) =
+			self.execution_extensions.manager_and_extensions(at, params.context);
+
+		self.executor
+			.contextual_call::<fn(_, _) -> _, _, _>(
+				at,
+				params.function,
+				&params.arguments,
+				params.overlayed_changes,
+				Some(params.storage_transaction_cache),
+				manager,
+				params.native_call,
+				params.recorder,
+				Some(extensions),
+			)
+			.map_err(Into::into)
 	}
 
-	fn runtime_version_at(
-		&self,
-		at: &BlockId<Block>,
-	) -> Result<RuntimeVersion, sp_api::ApiError> {
+	fn runtime_version_at(&self, at: &BlockId<Block>) -> Result<RuntimeVersion, sp_api::ApiError> {
 		self.runtime_version_at(at).map_err(Into::into)
 	}
 }
@@ -1822,13 +1852,14 @@ impl<B, E, Block, RA> CallApiAt<Block> for Client<B, E, Block, RA> where
 /// objects. Otherwise, importing blocks directly into the client would be bypassing
 /// important verification work.
 #[async_trait::async_trait]
-impl<B, E, Block, RA> sp_consensus::BlockImport<Block> for &Client<B, E, Block, RA> where
+impl<B, E, Block, RA> sp_consensus::BlockImport<Block> for &Client<B, E, Block, RA>
+where
 	B: backend::Backend<Block>,
 	E: CallExecutor<Block> + Send + Sync,
 	Block: BlockT,
 	Client<B, E, Block, RA>: ProvideRuntimeApi<Block>,
-	<Client<B, E, Block, RA> as ProvideRuntimeApi<Block>>::Api: CoreApi<Block> +
-		ApiExt<Block, StateBackend = B::State>,
+	<Client<B, E, Block, RA> as ProvideRuntimeApi<Block>>::Api:
+		CoreApi<Block> + ApiExt<Block, StateBackend = B::State>,
 	RA: Sync + Send,
 	backend::TransactionFor<B, Block>: Send + 'static,
 {
@@ -1852,17 +1883,19 @@ impl<B, E, Block, RA> sp_consensus::BlockImport<Block> for &Client<B, E, Block,
 		let span = tracing::span!(tracing::Level::DEBUG, "import_block");
 		let _enter = span.enter();
 
-		let storage_changes = match self.prepare_block_storage_changes(&mut import_block).map_err(|e| {
-			warn!("Block prepare storage changes error:\n{:?}", e);
-			ConsensusError::ClientImport(e.to_string())
-		})? {
-			PrepareStorageChangesResult::Discard(res) => return Ok(res),
-			PrepareStorageChangesResult::Import(storage_changes) => storage_changes,
-		};
+		let storage_changes =
+			match self.prepare_block_storage_changes(&mut import_block).map_err(|e| {
+				warn!("Block prepare storage changes error:\n{:?}", e);
+				ConsensusError::ClientImport(e.to_string())
+			})? {
+				PrepareStorageChangesResult::Discard(res) => return Ok(res),
+				PrepareStorageChangesResult::Import(storage_changes) => storage_changes,
+			};
 
 		self.lock_import_and_run(|operation| {
 			self.apply_block(operation, import_block, new_cache, storage_changes)
-		}).map_err(|e| {
+		})
+		.map_err(|e| {
 			warn!("Block import error:\n{:?}", e);
 			ConsensusError::ClientImport(e.to_string()).into()
 		})
@@ -1873,18 +1906,15 @@ impl<B, E, Block, RA> sp_consensus::BlockImport<Block> for &Client<B, E, Block,
 		&mut self,
 		block: BlockCheckParams<Block>,
 	) -> Result<ImportResult, Self::Error> {
-		let BlockCheckParams { hash, number, parent_hash, allow_missing_state, import_existing } = block;
+		let BlockCheckParams { hash, number, parent_hash, allow_missing_state, import_existing } =
+			block;
 
 		// Check the block against white and black lists if any are defined
 		// (i.e. fork blocks and bad blocks respectively)
 		match self.block_rules.lookup(number, &hash) {
 			BlockLookupResult::KnownBad => {
-				trace!(
-					"Rejecting known bad block: #{} {:?}",
-					number,
-					hash,
-				);
-				return Ok(ImportResult::KnownBad);
+				trace!("Rejecting known bad block: #{} {:?}", number, hash,);
+				return Ok(ImportResult::KnownBad)
 			},
 			BlockLookupResult::Expected(expected_hash) => {
 				trace!(
@@ -1893,51 +1923,51 @@ impl<B, E, Block, RA> sp_consensus::BlockImport<Block> for &Client<B, E, Block,
 					expected_hash,
 					number
 				);
-				return Ok(ImportResult::KnownBad);
+				return Ok(ImportResult::KnownBad)
 			},
-			BlockLookupResult::NotSpecial => {}
+			BlockLookupResult::NotSpecial => {},
 		}
 
 		// Own status must be checked first. If the block and ancestry is pruned
 		// this function must return `AlreadyInChain` rather than `MissingState`
-		match self.block_status(&BlockId::Hash(hash))
+		match self
+			.block_status(&BlockId::Hash(hash))
 			.map_err(|e| ConsensusError::ClientImport(e.to_string()))?
 		{
-			BlockStatus::InChainWithState | BlockStatus::Queued if !import_existing  => {
-				return Ok(ImportResult::AlreadyInChain)
-			},
+			BlockStatus::InChainWithState | BlockStatus::Queued if !import_existing =>
+				return Ok(ImportResult::AlreadyInChain),
 			BlockStatus::InChainWithState | BlockStatus::Queued => {},
-			BlockStatus::InChainPruned if !import_existing => {
-				return Ok(ImportResult::AlreadyInChain)
-			},
+			BlockStatus::InChainPruned if !import_existing =>
+				return Ok(ImportResult::AlreadyInChain),
 			BlockStatus::InChainPruned => {},
 			BlockStatus::Unknown => {},
 			BlockStatus::KnownBad => return Ok(ImportResult::KnownBad),
 		}
 
-		match self.block_status(&BlockId::Hash(parent_hash))
+		match self
+			.block_status(&BlockId::Hash(parent_hash))
 			.map_err(|e| ConsensusError::ClientImport(e.to_string()))?
-			{
-				BlockStatus::InChainWithState | BlockStatus::Queued => {},
-				BlockStatus::Unknown => return Ok(ImportResult::UnknownParent),
-				BlockStatus::InChainPruned if allow_missing_state => {},
-				BlockStatus::InChainPruned => return Ok(ImportResult::MissingState),
-				BlockStatus::KnownBad => return Ok(ImportResult::KnownBad),
-			}
-
+		{
+			BlockStatus::InChainWithState | BlockStatus::Queued => {},
+			BlockStatus::Unknown => return Ok(ImportResult::UnknownParent),
+			BlockStatus::InChainPruned if allow_missing_state => {},
+			BlockStatus::InChainPruned => return Ok(ImportResult::MissingState),
+			BlockStatus::KnownBad => return Ok(ImportResult::KnownBad),
+		}
 
 		Ok(ImportResult::imported(false))
 	}
 }
 
 #[async_trait::async_trait]
-impl<B, E, Block, RA> sp_consensus::BlockImport<Block> for Client<B, E, Block, RA> where
+impl<B, E, Block, RA> sp_consensus::BlockImport<Block> for Client<B, E, Block, RA>
+where
 	B: backend::Backend<Block>,
 	E: CallExecutor<Block> + Send + Sync,
 	Block: BlockT,
 	Self: ProvideRuntimeApi<Block>,
-	<Self as ProvideRuntimeApi<Block>>::Api: CoreApi<Block> +
-		ApiExt<Block, StateBackend = B::State>,
+	<Self as ProvideRuntimeApi<Block>>::Api:
+		CoreApi<Block> + ApiExt<Block, StateBackend = B::State>,
 	RA: Sync + Send,
 	backend::TransactionFor<B, Block>: Send + 'static,
 {
@@ -1960,7 +1990,8 @@ impl<B, E, Block, RA> sp_consensus::BlockImport<Block> for Client<B, E, Block, R
 	}
 }
 
-impl<B, E, Block, RA> Finalizer<Block, B> for Client<B, E, Block, RA> where
+impl<B, E, Block, RA> Finalizer<Block, B> for Client<B, E, Block, RA>
+where
 	B: backend::Backend<Block>,
 	E: CallExecutor<Block>,
 	Block: BlockT,
@@ -1995,8 +2026,8 @@ impl<B, E, Block, RA> Finalizer<Block, B> for Client<B, E, Block, RA> where
 	}
 }
 
-
-impl<B, E, Block, RA> Finalizer<Block, B> for &Client<B, E, Block, RA> where
+impl<B, E, Block, RA> Finalizer<Block, B> for &Client<B, E, Block, RA>
+where
 	B: backend::Backend<Block>,
 	E: CallExecutor<Block>,
 	Block: BlockT,
@@ -2050,10 +2081,10 @@ where
 }
 
 impl<B, E, Block, RA> BlockBackend<Block> for Client<B, E, Block, RA>
-	where
-		B: backend::Backend<Block>,
-		E: CallExecutor<Block>,
-		Block: BlockT,
+where
+	B: backend::Backend<Block>,
+	E: CallExecutor<Block>,
+	Block: BlockT,
 {
 	fn block_body(
 		&self,
@@ -2092,35 +2123,37 @@ impl<B, E, Block, RA> BlockBackend<Block> for Client<B, E, Block, RA>
 
 	fn block_indexed_body(
 		&self,
-		id: &BlockId<Block>
+		id: &BlockId<Block>,
 	) -> sp_blockchain::Result<Option<Vec<Vec<u8>>>> {
 		self.backend.blockchain().block_indexed_body(*id)
 	}
 }
 
 impl<B, E, Block, RA> backend::AuxStore for Client<B, E, Block, RA>
-	where
-		B: backend::Backend<Block>,
-		E: CallExecutor<Block>,
-		Block: BlockT,
-		Self: ProvideRuntimeApi<Block>,
-		<Self as ProvideRuntimeApi<Block>>::Api: CoreApi<Block>,
+where
+	B: backend::Backend<Block>,
+	E: CallExecutor<Block>,
+	Block: BlockT,
+	Self: ProvideRuntimeApi<Block>,
+	<Self as ProvideRuntimeApi<Block>>::Api: CoreApi<Block>,
 {
 	/// Insert auxiliary data into key-value store.
 	fn insert_aux<
 		'a,
 		'b: 'a,
 		'c: 'a,
-		I: IntoIterator<Item=&'a(&'c [u8], &'c [u8])>,
-		D: IntoIterator<Item=&'a &'b [u8]>,
-	>(&self, insert: I, delete: D) -> sp_blockchain::Result<()> {
+		I: IntoIterator<Item = &'a (&'c [u8], &'c [u8])>,
+		D: IntoIterator<Item = &'a &'b [u8]>,
+	>(
+		&self,
+		insert: I,
+		delete: D,
+	) -> sp_blockchain::Result<()> {
 		// Import is locked here because we may have other block import
 		// operations that tries to set aux data. Note that for consensus
 		// layer, one can always use atomic operations to make sure
 		// import is only locked once.
-		self.lock_import_and_run(|operation| {
-			apply_aux(operation, insert, delete)
-		})
+		self.lock_import_and_run(|operation| apply_aux(operation, insert, delete))
 	}
 	/// Query auxiliary data from key-value store.
 	fn get_aux(&self, key: &[u8]) -> sp_blockchain::Result<Option<Vec<u8>>> {
@@ -2129,20 +2162,24 @@ impl<B, E, Block, RA> backend::AuxStore for Client<B, E, Block, RA>
 }
 
 impl<B, E, Block, RA> backend::AuxStore for &Client<B, E, Block, RA>
-	where
-		B: backend::Backend<Block>,
-		E: CallExecutor<Block>,
-		Block: BlockT,
-		Client<B, E, Block, RA>: ProvideRuntimeApi<Block>,
-		<Client<B, E, Block, RA> as ProvideRuntimeApi<Block>>::Api: CoreApi<Block>,
+where
+	B: backend::Backend<Block>,
+	E: CallExecutor<Block>,
+	Block: BlockT,
+	Client<B, E, Block, RA>: ProvideRuntimeApi<Block>,
+	<Client<B, E, Block, RA> as ProvideRuntimeApi<Block>>::Api: CoreApi<Block>,
 {
 	fn insert_aux<
 		'a,
 		'b: 'a,
 		'c: 'a,
-		I: IntoIterator<Item=&'a(&'c [u8], &'c [u8])>,
-		D: IntoIterator<Item=&'a &'b [u8]>,
-	>(&self, insert: I, delete: D) -> sp_blockchain::Result<()> {
+		I: IntoIterator<Item = &'a (&'c [u8], &'c [u8])>,
+		D: IntoIterator<Item = &'a &'b [u8]>,
+	>(
+		&self,
+		insert: I,
+		delete: D,
+	) -> sp_blockchain::Result<()> {
 		(**self).insert_aux(insert, delete)
 	}
 
@@ -2152,10 +2189,10 @@ impl<B, E, Block, RA> backend::AuxStore for &Client<B, E, Block, RA>
 }
 
 impl<BE, E, B, RA> sp_consensus::block_validation::Chain<B> for Client<BE, E, B, RA>
-	where
-		BE: backend::Backend<B>,
-		E: CallExecutor<B>,
-		B: BlockT,
+where
+	BE: backend::Backend<B>,
+	E: CallExecutor<B>,
+	B: BlockT,
 {
 	fn block_status(
 		&self,
@@ -2174,8 +2211,10 @@ where
 	fn block_indexed_body(
 		&self,
 		number: NumberFor<B>,
-	) ->Result<Option<Vec<Vec<u8>>>, sp_transaction_storage_proof::Error> {
-		self.backend.blockchain().block_indexed_body(BlockId::number(number))
+	) -> Result<Option<Vec<Vec<u8>>>, sp_transaction_storage_proof::Error> {
+		self.backend
+			.blockchain()
+			.block_indexed_body(BlockId::number(number))
 			.map_err(|e| sp_transaction_storage_proof::Error::Application(Box::new(e)))
 	}
 
@@ -2183,7 +2222,9 @@ where
 		&self,
 		hash: B::Hash,
 	) -> Result<Option<NumberFor<B>>, sp_transaction_storage_proof::Error> {
-		self.backend.blockchain().number(hash)
+		self.backend
+			.blockchain()
+			.number(hash)
 			.map_err(|e| sp_transaction_storage_proof::Error::Application(Box::new(e)))
 	}
 }
diff --git a/client/service/src/client/genesis.rs b/client/service/src/client/genesis.rs
index 08235f7efb6e..e764e8e24f10 100644
--- a/client/service/src/client/genesis.rs
+++ b/client/service/src/client/genesis.rs
@@ -18,17 +18,12 @@
 
 //! Tool for creating the genesis block.
 
-use sp_runtime::traits::{Block as BlockT, Header as HeaderT, Hash as HashT, Zero};
+use sp_runtime::traits::{Block as BlockT, Hash as HashT, Header as HeaderT, Zero};
 
 /// Create a genesis block, given the initial storage.
-pub fn construct_genesis_block<
-	Block: BlockT
-> (
-	state_root: Block::Hash
-) -> Block {
-	let extrinsics_root = <<<Block as BlockT>::Header as HeaderT>::Hashing as HashT>::trie_root(
-		Vec::new(),
-	);
+pub fn construct_genesis_block<Block: BlockT>(state_root: Block::Hash) -> Block {
+	let extrinsics_root =
+		<<<Block as BlockT>::Header as HeaderT>::Hashing as HashT>::trie_root(Vec::new());
 
 	Block::new(
 		<<Block as BlockT>::Header as HeaderT>::new(
@@ -36,8 +31,8 @@ pub fn construct_genesis_block<
 			extrinsics_root,
 			state_root,
 			Default::default(),
-			Default::default()
+			Default::default(),
 		),
-		Default::default()
+		Default::default(),
 	)
 }
diff --git a/client/service/src/client/light.rs b/client/service/src/client/light.rs
index 3a09bcbd78de..82fe17e6855e 100644
--- a/client/service/src/client/light.rs
+++ b/client/service/src/client/light.rs
@@ -20,15 +20,20 @@
 
 use std::sync::Arc;
 
+use prometheus_endpoint::Registry;
 use sc_executor::RuntimeInfo;
-use sp_core::traits::{CodeExecutor, SpawnNamed};
 use sc_telemetry::TelemetryHandle;
-use sp_runtime::BuildStorage;
-use sp_runtime::traits::{Block as BlockT, HashFor};
 use sp_blockchain::Result as ClientResult;
-use prometheus_endpoint::Registry;
+use sp_core::traits::{CodeExecutor, SpawnNamed};
+use sp_runtime::{
+	traits::{Block as BlockT, HashFor},
+	BuildStorage,
+};
 
-use super::{call_executor::LocalCallExecutor, client::{Client, ClientConfig}};
+use super::{
+	call_executor::LocalCallExecutor,
+	client::{Client, ClientConfig},
+};
 use sc_client_api::light::Storage as BlockchainStorage;
 use sc_light::{Backend, GenesisCallExecutor};
 
@@ -41,26 +46,26 @@ pub fn new_light<B, S, RA, E>(
 	prometheus_registry: Option<Registry>,
 	telemetry: Option<TelemetryHandle>,
 ) -> ClientResult<
-		Client<
+	Client<
+		Backend<S, HashFor<B>>,
+		GenesisCallExecutor<
 			Backend<S, HashFor<B>>,
-			GenesisCallExecutor<
-				Backend<S, HashFor<B>>,
-				LocalCallExecutor<B, Backend<S, HashFor<B>>, E>
-			>,
-			B,
-			RA
-		>
-	>
-	where
-		B: BlockT,
-		S: BlockchainStorage<B> + 'static,
-		E: CodeExecutor + RuntimeInfo + Clone + 'static,
+			LocalCallExecutor<B, Backend<S, HashFor<B>>, E>,
+		>,
+		B,
+		RA,
+	>,
+>
+where
+	B: BlockT,
+	S: BlockchainStorage<B> + 'static,
+	E: CodeExecutor + RuntimeInfo + Clone + 'static,
 {
 	let local_executor = LocalCallExecutor::new(
 		backend.clone(),
 		code_executor,
 		spawn_handle.clone(),
-		ClientConfig::default()
+		ClientConfig::default(),
 	)?;
 	let executor = GenesisCallExecutor::new(backend.clone(), local_executor);
 	Client::new(
diff --git a/client/service/src/client/mod.rs b/client/service/src/client/mod.rs
index dd0b70b551bf..754309e864eb 100644
--- a/client/service/src/client/mod.rs
+++ b/client/service/src/client/mod.rs
@@ -45,11 +45,11 @@
 //! the ways in which the runtime can interface with the outside. Any code that builds a `Client`
 //! is responsible for putting the right marker.
 
-pub mod genesis;
-pub mod light;
+mod block_rules;
 mod call_executor;
 mod client;
-mod block_rules;
+pub mod genesis;
+pub mod light;
 mod wasm_override;
 mod wasm_substitutes;
 
@@ -58,5 +58,5 @@ pub use self::{
 	client::{Client, ClientConfig},
 };
 
-#[cfg(feature="test-helpers")]
-pub use self::client::{new_with_backend, new_in_mem};
+#[cfg(feature = "test-helpers")]
+pub use self::client::{new_in_mem, new_with_backend};
diff --git a/client/service/src/client/wasm_override.rs b/client/service/src/client/wasm_override.rs
index 06a719c346ca..7abd04f2be23 100644
--- a/client/service/src/client/wasm_override.rs
+++ b/client/service/src/client/wasm_override.rs
@@ -35,18 +35,17 @@
 //! A custom WASM blob will override on-chain WASM if the spec version matches. If it is
 //! required to overrides multiple runtimes, multiple WASM blobs matching each of the spec versions
 //! needed must be provided in the given directory.
-//!
+use sc_executor::RuntimeInfo;
+use sp_blockchain::Result;
+use sp_core::traits::{FetchRuntimeCode, RuntimeCode};
+use sp_state_machine::BasicExternalities;
+use sp_version::RuntimeVersion;
 use std::{
-	fs, collections::{HashMap, hash_map::DefaultHasher},
-	path::{Path, PathBuf},
+	collections::{hash_map::DefaultHasher, HashMap},
+	fs,
 	hash::Hasher as _,
+	path::{Path, PathBuf},
 };
-use sp_core::traits::FetchRuntimeCode;
-use sp_state_machine::BasicExternalities;
-use sp_blockchain::Result;
-use sc_executor::RuntimeInfo;
-use sp_version::RuntimeVersion;
-use sp_core::traits::RuntimeCode;
 
 #[derive(Clone, Debug, PartialEq)]
 /// Auxiliary structure that holds a wasm blob and its hash.
@@ -62,11 +61,7 @@ impl WasmBlob {
 	}
 
 	fn runtime_code(&self, heap_pages: Option<u64>) -> RuntimeCode {
-		RuntimeCode {
-			code_fetcher: self,
-			hash: self.hash.clone(),
-			heap_pages,
-		}
+		RuntimeCode { code_fetcher: self, hash: self.hash.clone(), heap_pages }
 	}
 }
 
@@ -117,7 +112,7 @@ pub struct WasmOverride<E> {
 
 impl<E> WasmOverride<E>
 where
-	E: RuntimeInfo + Clone + 'static
+	E: RuntimeInfo + Clone + 'static,
 {
 	pub fn new<P>(path: P, executor: E) -> Result<Self>
 	where
@@ -130,26 +125,19 @@ where
 	/// Gets an override by it's runtime spec version.
 	///
 	/// Returns `None` if an override for a spec version does not exist.
-	pub fn get<'a, 'b: 'a>(
-		&'b self,
-		spec: &u32,
-		pages: Option<u64>,
-	) -> Option<RuntimeCode<'a>> {
-		self.overrides
-			.get(spec)
-			.map(|w| w.runtime_code(pages))
+	pub fn get<'a, 'b: 'a>(&'b self, spec: &u32, pages: Option<u64>) -> Option<RuntimeCode<'a>> {
+		self.overrides.get(spec).map(|w| w.runtime_code(pages))
 	}
 
 	/// Scrapes a folder for WASM runtimes.
 	/// Returns a hashmap of the runtime version and wasm runtime code.
 	fn scrape_overrides(dir: &Path, executor: &E) -> Result<HashMap<u32, WasmBlob>> {
-
-		let handle_err = |e: std::io::Error | -> sp_blockchain::Error {
+		let handle_err = |e: std::io::Error| -> sp_blockchain::Error {
 			WasmOverrideError::Io(dir.to_owned(), e).into()
 		};
 
 		if !dir.is_dir() {
-			return Err(WasmOverrideError::NotADirectory(dir.to_owned()).into());
+			return Err(WasmOverrideError::NotADirectory(dir.to_owned()).into())
 		}
 
 		let mut overrides = HashMap::new();
@@ -176,13 +164,13 @@ where
 						);
 						duplicates.push(format!("{}", path.display()));
 					}
-				}
-				_ => ()
+				},
+				_ => (),
 			}
 		}
 
 		if !duplicates.is_empty() {
-			return Err(WasmOverrideError::DuplicateRuntime(duplicates).into());
+			return Err(WasmOverrideError::DuplicateRuntime(duplicates).into())
 		}
 
 		Ok(overrides)
@@ -194,7 +182,8 @@ where
 		heap_pages: Option<u64>,
 	) -> Result<RuntimeVersion> {
 		let mut ext = BasicExternalities::default();
-		executor.runtime_version(&mut ext, &code.runtime_code(heap_pages))
+		executor
+			.runtime_version(&mut ext, &code.runtime_code(heap_pages))
 			.map_err(|e| WasmOverrideError::VersionInvalid(format!("{:?}", e)).into())
 	}
 }
@@ -203,28 +192,25 @@ where
 #[cfg(test)]
 pub fn dummy_overrides<E>(executor: &E) -> WasmOverride<E>
 where
-	E: RuntimeInfo + Clone + 'static
+	E: RuntimeInfo + Clone + 'static,
 {
 	let mut overrides = HashMap::new();
 	overrides.insert(0, WasmBlob::new(vec![0, 0, 0, 0, 0, 0, 0, 0]));
 	overrides.insert(1, WasmBlob::new(vec![1, 1, 1, 1, 1, 1, 1, 1]));
 	overrides.insert(2, WasmBlob::new(vec![2, 2, 2, 2, 2, 2, 2, 2]));
-	WasmOverride {
-		overrides,
-		executor: executor.clone()
-	}
+	WasmOverride { overrides, executor: executor.clone() }
 }
 
 #[cfg(test)]
 mod tests {
 	use super::*;
 	use sc_executor::{NativeExecutor, WasmExecutionMethod};
-	use substrate_test_runtime_client::LocalExecutor;
 	use std::fs::{self, File};
+	use substrate_test_runtime_client::LocalExecutor;
 
 	fn wasm_test<F>(fun: F)
 	where
-		F: Fn(&Path, &[u8], &NativeExecutor::<LocalExecutor>)
+		F: Fn(&Path, &[u8], &NativeExecutor<LocalExecutor>),
 	{
 		let exec = NativeExecutor::<substrate_test_runtime_client::LocalExecutor>::new(
 			WasmExecutionMethod::Interpreted,
@@ -252,8 +238,8 @@ mod tests {
 	fn should_scrape_wasm() {
 		wasm_test(|dir, wasm_bytes, exec| {
 			fs::write(dir.join("test.wasm"), wasm_bytes).expect("Create test file");
-			let overrides = WasmOverride::scrape_overrides(dir, exec)
-				.expect("HashMap of u32 and WasmBlob");
+			let overrides =
+				WasmOverride::scrape_overrides(dir, exec).expect("HashMap of u32 and WasmBlob");
 			let wasm = overrides.get(&2).expect("WASM binary");
 			assert_eq!(wasm.code, substrate_test_runtime::wasm_binary_unwrap().to_vec())
 		});
@@ -272,10 +258,10 @@ mod tests {
 						Some(WasmOverrideError::DuplicateRuntime(duplicates)) => {
 							assert_eq!(duplicates.len(), 1);
 						},
-						_ => panic!("Test should end with Msg Error Variant")
+						_ => panic!("Test should end with Msg Error Variant"),
 					}
 				},
-				_ => panic!("Test should end in error")
+				_ => panic!("Test should end in error"),
 			}
 		});
 	}
@@ -286,8 +272,8 @@ mod tests {
 			File::create(dir.join("README.md")).expect("Create test file");
 			File::create(dir.join("LICENSE")).expect("Create a test file");
 			fs::write(dir.join("test0.wasm"), wasm_bytes).expect("Create test file");
-			let scraped = WasmOverride::scrape_overrides(dir, exec)
-				.expect("HashMap of u32 and WasmBlob");
+			let scraped =
+				WasmOverride::scrape_overrides(dir, exec).expect("HashMap of u32 and WasmBlob");
 			assert_eq!(scraped.len(), 1);
 		});
 	}
diff --git a/client/service/src/client/wasm_substitutes.rs b/client/service/src/client/wasm_substitutes.rs
index e947e4566f33..ac48059fc2f3 100644
--- a/client/service/src/client/wasm_substitutes.rs
+++ b/client/service/src/client/wasm_substitutes.rs
@@ -18,15 +18,22 @@
 
 //! # WASM substitutes
 
-use std::{collections::{HashMap, hash_map::DefaultHasher}, hash::Hasher as _, sync::Arc};
+use parking_lot::RwLock;
+use sc_client_api::backend;
+use sc_executor::RuntimeInfo;
+use sp_blockchain::{HeaderBackend, Result};
 use sp_core::traits::{FetchRuntimeCode, RuntimeCode};
+use sp_runtime::{
+	generic::BlockId,
+	traits::{Block as BlockT, NumberFor},
+};
 use sp_state_machine::BasicExternalities;
-use sp_blockchain::{Result, HeaderBackend};
-use sc_executor::RuntimeInfo;
 use sp_version::RuntimeVersion;
-use sc_client_api::backend;
-use sp_runtime::{traits::{NumberFor, Block as BlockT}, generic::BlockId};
-use parking_lot::RwLock;
+use std::{
+	collections::{hash_map::DefaultHasher, HashMap},
+	hash::Hasher as _,
+	sync::Arc,
+};
 
 /// A wasm substitute for the on chain wasm.
 #[derive(Debug)]
@@ -51,11 +58,7 @@ impl<Block: BlockT> WasmSubstitute<Block> {
 	}
 
 	fn runtime_code(&self, heap_pages: Option<u64>) -> RuntimeCode {
-		RuntimeCode {
-			code_fetcher: self,
-			hash: self.hash.clone(),
-			heap_pages,
-		}
+		RuntimeCode { code_fetcher: self, hash: self.hash.clone(), heap_pages }
 	}
 
 	/// Returns `true` when the substitute matches for the given `block_id`.
@@ -82,7 +85,8 @@ impl<Block: BlockT> WasmSubstitute<Block> {
 			block_number
 		};
 
-		let requested_block_number = backend.blockchain().block_number_from_id(&block_id).ok().flatten();
+		let requested_block_number =
+			backend.blockchain().block_number_from_id(&block_id).ok().flatten();
 
 		Some(block_number) <= requested_block_number
 	}
@@ -145,11 +149,14 @@ where
 		executor: Executor,
 		backend: Arc<Backend>,
 	) -> Result<Self> {
-		let substitutes = substitutes.into_iter().map(|(parent_block_hash, code)| {
-			let substitute = WasmSubstitute::new(code, parent_block_hash, &*backend)?;
-			let version = Self::runtime_version(&executor, &substitute)?;
-			Ok((version.spec_version, substitute))
-		}).collect::<Result<HashMap<_, _>>>()?;
+		let substitutes = substitutes
+			.into_iter()
+			.map(|(parent_block_hash, code)| {
+				let substitute = WasmSubstitute::new(code, parent_block_hash, &*backend)?;
+				let version = Self::runtime_version(&executor, &substitute)?;
+				Ok((version.spec_version, substitute))
+			})
+			.collect::<Result<HashMap<_, _>>>()?;
 
 		Ok(Self { executor, substitutes: Arc::new(substitutes), backend })
 	}
@@ -172,8 +179,8 @@ where
 		code: &WasmSubstitute<Block>,
 	) -> Result<RuntimeVersion> {
 		let mut ext = BasicExternalities::default();
-		executor.runtime_version(&mut ext, &code.runtime_code(None))
+		executor
+			.runtime_version(&mut ext, &code.runtime_code(None))
 			.map_err(|e| WasmSubstituteError::VersionInvalid(format!("{:?}", e)).into())
 	}
 }
-
diff --git a/client/service/src/config.rs b/client/service/src/config.rs
index be14b4e322e7..c915978f5384 100644
--- a/client/service/src/config.rs
+++ b/client/service/src/config.rs
@@ -18,25 +18,34 @@
 
 //! Service configuration.
 
+pub use sc_client_api::execution_extensions::{ExecutionStrategies, ExecutionStrategy};
 pub use sc_client_db::{
-	Database, PruningMode, DatabaseSettingsSrc as DatabaseConfig,
-	KeepBlocks, TransactionStorageMode
-};
-pub use sc_network::Multiaddr;
-pub use sc_network::config::{
-	ExtTransport, MultiaddrWithPeerId, NetworkConfiguration, Role, NodeKeyConfig,
-	SetConfig, NonDefaultSetConfig, TransportConfig,
-	RequestResponseConfig, IncomingRequest, OutgoingResponse,
+	Database, DatabaseSettingsSrc as DatabaseConfig, KeepBlocks, PruningMode,
+	TransactionStorageMode,
 };
 pub use sc_executor::WasmExecutionMethod;
-pub use sc_client_api::execution_extensions::{ExecutionStrategies, ExecutionStrategy};
+pub use sc_network::{
+	config::{
+		ExtTransport, IncomingRequest, MultiaddrWithPeerId, NetworkConfiguration, NodeKeyConfig,
+		NonDefaultSetConfig, OutgoingResponse, RequestResponseConfig, Role, SetConfig,
+		TransportConfig,
+	},
+	Multiaddr,
+};
 
-use std::{io, future::Future, path::{PathBuf, Path}, pin::Pin, net::SocketAddr, sync::Arc};
-pub use sc_transaction_pool::Options as TransactionPoolOptions;
+use prometheus_endpoint::Registry;
 use sc_chain_spec::ChainSpec;
-use sp_core::crypto::SecretString;
 pub use sc_telemetry::TelemetryEndpoints;
-use prometheus_endpoint::Registry;
+pub use sc_transaction_pool::Options as TransactionPoolOptions;
+use sp_core::crypto::SecretString;
+use std::{
+	future::Future,
+	io,
+	net::SocketAddr,
+	path::{Path, PathBuf},
+	pin::Pin,
+	sync::Arc,
+};
 #[cfg(not(target_os = "unknown"))]
 use tempfile::TempDir;
 
@@ -153,7 +162,7 @@ pub enum KeystoreConfig {
 		/// The path of the keystore.
 		path: PathBuf,
 		/// Node keystore's password.
-		password: Option<SecretString>
+		password: Option<SecretString>,
 	},
 	/// In-memory keystore. Recommended for in-browser nodes.
 	InMemory,
@@ -194,7 +203,7 @@ impl PrometheusConfig {
 		Self {
 			port,
 			registry: Registry::new_custom(Some("substrate".into()), None)
-				.expect("this can only fail if the prefix is empty")
+				.expect("this can only fail if the prefix is empty"),
 		}
 	}
 }
@@ -215,11 +224,13 @@ impl Configuration {
 		let protocol_id_full = match self.chain_spec.protocol_id() {
 			Some(pid) => pid,
 			None => {
-				log::warn!("Using default protocol ID {:?} because none is configured in the \
-					chain specs", crate::DEFAULT_PROTOCOL_ID
+				log::warn!(
+					"Using default protocol ID {:?} because none is configured in the \
+					chain specs",
+					crate::DEFAULT_PROTOCOL_ID
 				);
 				crate::DEFAULT_PROTOCOL_ID
-			}
+			},
 		};
 		sc_network::config::ProtocolId::from(protocol_id_full)
 	}
@@ -261,9 +272,7 @@ impl BasePath {
 	/// instance is dropped.
 	#[cfg(not(target_os = "unknown"))]
 	pub fn new_temp_dir() -> io::Result<BasePath> {
-		Ok(BasePath::Temporary(
-			tempfile::Builder::new().prefix("substrate").tempdir()?,
-		))
+		Ok(BasePath::Temporary(tempfile::Builder::new().prefix("substrate").tempdir()?))
 	}
 
 	/// Create a `BasePath` instance based on an existing path on disk.
diff --git a/client/service/src/error.rs b/client/service/src/error.rs
index 9c653219ca13..1acd33ead677 100644
--- a/client/service/src/error.rs
+++ b/client/service/src/error.rs
@@ -18,10 +18,10 @@
 
 //! Errors that can occur during the service operation.
 
-use sc_network;
 use sc_keystore;
-use sp_consensus;
+use sc_network;
 use sp_blockchain;
+use sp_consensus;
 
 /// Service Result typedef.
 pub type Result<T> = std::result::Result<T, Error>;
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index 40cb1aeea6a9..5d7c490db6ab 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -22,65 +22,62 @@
 #![warn(missing_docs)]
 #![recursion_limit = "1024"]
 
-pub mod config;
 pub mod chain_ops;
+pub mod config;
 pub mod error;
 
-mod metrics;
 mod builder;
 #[cfg(feature = "test-helpers")]
 pub mod client;
 #[cfg(not(feature = "test-helpers"))]
 mod client;
+mod metrics;
 mod task_manager;
 
-use std::{io, pin::Pin};
-use std::net::SocketAddr;
-use std::collections::HashMap;
-use std::task::Poll;
+use std::{collections::HashMap, io, net::SocketAddr, pin::Pin, task::Poll};
 
-use futures::{Future, FutureExt, Stream, StreamExt, stream, compat::*};
-use sc_network::PeerId;
-use log::{warn, debug, error};
-use codec::{Encode, Decode};
-use sp_runtime::generic::BlockId;
-use sp_runtime::traits::{Block as BlockT, Header as HeaderT};
+use codec::{Decode, Encode};
+use futures::{compat::*, stream, Future, FutureExt, Stream, StreamExt};
+use log::{debug, error, warn};
 use parity_util_mem::MallocSizeOf;
+use sc_network::PeerId;
+use sp_runtime::{
+	generic::BlockId,
+	traits::{Block as BlockT, Header as HeaderT},
+};
 use sp_utils::mpsc::TracingUnboundedReceiver;
 
-pub use self::error::Error;
-pub use self::builder::{
-	new_full_client, new_db_backend, new_client, new_full_parts, new_light_parts,
-	spawn_tasks, build_network, build_offchain_workers,
-	BuildNetworkParams, KeystoreContainer, NetworkStarter, SpawnTasksParams, TFullClient, TLightClient,
-	TFullBackend, TLightBackend, TLightBackendWithHash, TLightClientWithBackend,
-	TFullCallExecutor, TLightCallExecutor, RpcExtensionBuilder, NoopRpcExtensionBuilder,
+pub use self::{
+	builder::{
+		build_network, build_offchain_workers, new_client, new_db_backend, new_full_client,
+		new_full_parts, new_light_parts, spawn_tasks, BuildNetworkParams, KeystoreContainer,
+		NetworkStarter, NoopRpcExtensionBuilder, RpcExtensionBuilder, SpawnTasksParams,
+		TFullBackend, TFullCallExecutor, TFullClient, TLightBackend, TLightBackendWithHash,
+		TLightCallExecutor, TLightClient, TLightClientWithBackend,
+	},
+	client::{ClientConfig, LocalCallExecutor},
+	error::Error,
 };
 pub use config::{
-	BasePath, Configuration, DatabaseConfig, PruningMode, Role, RpcMethods, TaskExecutor, TaskType,
-	KeepBlocks, TransactionStorageMode,
+	BasePath, Configuration, DatabaseConfig, KeepBlocks, PruningMode, Role, RpcMethods,
+	TaskExecutor, TaskType, TransactionStorageMode,
 };
 pub use sc_chain_spec::{
-	ChainSpec, GenericChainSpec, Properties, RuntimeGenesis, Extension as ChainSpecExtension,
-	NoExtension, ChainType,
+	ChainSpec, ChainType, Extension as ChainSpecExtension, GenericChainSpec, NoExtension,
+	Properties, RuntimeGenesis,
 };
-pub use sc_transaction_pool_api::{TransactionPool, InPoolTransaction, error::IntoPoolError};
-pub use sc_transaction_pool::Options as TransactionPoolOptions;
-pub use sc_rpc::Metadata as RpcMetadata;
+use sc_client_api::{blockchain::HeaderBackend, BlockchainEvents};
 pub use sc_executor::NativeExecutionDispatch;
 #[doc(hidden)]
-pub use std::{ops::Deref, result::Result, sync::Arc};
-#[doc(hidden)]
-pub use sc_network::config::{
-	OnDemand, TransactionImport,
-	TransactionImportFuture,
-};
+pub use sc_network::config::{OnDemand, TransactionImport, TransactionImportFuture};
+pub use sc_rpc::Metadata as RpcMetadata;
 pub use sc_tracing::TracingReceiver;
-pub use task_manager::SpawnTaskHandle;
-pub use task_manager::TaskManager;
+pub use sc_transaction_pool::Options as TransactionPoolOptions;
+pub use sc_transaction_pool_api::{error::IntoPoolError, InPoolTransaction, TransactionPool};
 pub use sp_consensus::import_queue::ImportQueue;
-pub use self::client::{LocalCallExecutor, ClientConfig};
-use sc_client_api::{blockchain::HeaderBackend, BlockchainEvents};
+#[doc(hidden)]
+pub use std::{ops::Deref, result::Result, sync::Arc};
+pub use task_manager::{SpawnTaskHandle, TaskManager};
 
 const DEFAULT_PROTOCOL_ID: &str = "sup";
 
@@ -96,7 +93,9 @@ impl<T> MallocSizeOfWasm for T {}
 
 /// RPC handlers that can perform RPC queries.
 #[derive(Clone)]
-pub struct RpcHandlers(Arc<jsonrpc_core::MetaIoHandler<sc_rpc::Metadata, sc_rpc_server::RpcMiddleware>>);
+pub struct RpcHandlers(
+	Arc<jsonrpc_core::MetaIoHandler<sc_rpc::Metadata, sc_rpc_server::RpcMiddleware>>,
+);
 
 impl RpcHandlers {
 	/// Starts an RPC query.
@@ -108,17 +107,22 @@ impl RpcHandlers {
 	///
 	/// If the request subscribes you to events, the `Sender` in the `RpcSession` object is used to
 	/// send back spontaneous events.
-	pub fn rpc_query(&self, mem: &RpcSession, request: &str)
-		-> Pin<Box<dyn Future<Output = Option<String>> + Send>> {
-		self.0.handle_request(request, mem.metadata.clone())
+	pub fn rpc_query(
+		&self,
+		mem: &RpcSession,
+		request: &str,
+	) -> Pin<Box<dyn Future<Output = Option<String>> + Send>> {
+		self.0
+			.handle_request(request, mem.metadata.clone())
 			.compat()
 			.map(|res| res.expect("this should never fail"))
 			.boxed()
 	}
 
 	/// Provides access to the underlying `MetaIoHandler`
-	pub fn io_handler(&self)
-		-> Arc<jsonrpc_core::MetaIoHandler<sc_rpc::Metadata, sc_rpc_server::RpcMiddleware>> {
+	pub fn io_handler(
+		&self,
+	) -> Arc<jsonrpc_core::MetaIoHandler<sc_rpc::Metadata, sc_rpc_server::RpcMiddleware>> {
 		self.0.clone()
 	}
 }
@@ -149,8 +153,8 @@ pub struct PartialComponents<Client, Backend, SelectChain, ImportQueue, Transact
 async fn build_network_future<
 	B: BlockT,
 	C: BlockchainEvents<B> + HeaderBackend<B>,
-	H: sc_network::ExHashT
-> (
+	H: sc_network::ExHashT,
+>(
 	role: Role,
 	mut network: sc_network::NetworkWorker<B, H>,
 	client: Arc<C>,
@@ -171,7 +175,9 @@ async fn build_network_future<
 		// ready. This way, we only get the latest finalized block.
 		stream::poll_fn(move |cx| {
 			let mut last = None;
-			while let Poll::Ready(Some(item)) = Pin::new(&mut finality_notification_stream).poll_next(cx) {
+			while let Poll::Ready(Some(item)) =
+				Pin::new(&mut finality_notification_stream).poll_next(cx)
+			{
 				last = Some(item);
 			}
 			if let Some(last) = last {
@@ -179,11 +185,12 @@ async fn build_network_future<
 			} else {
 				Poll::Pending
 			}
-		}).fuse()
+		})
+		.fuse()
 	};
 
 	loop {
-		futures::select!{
+		futures::select! {
 			// List of blocks that the client has imported.
 			notification = imported_blocks_stream.next() => {
 				let notification = match notification {
@@ -338,79 +345,90 @@ mod waiting {
 /// Starts RPC servers that run in their own thread, and returns an opaque object that keeps them alive.
 #[cfg(not(target_os = "unknown"))]
 fn start_rpc_servers<
-	H: FnMut(sc_rpc::DenyUnsafe, sc_rpc_server::RpcMiddleware)
-	-> sc_rpc_server::RpcHandler<sc_rpc::Metadata>
+	H: FnMut(
+		sc_rpc::DenyUnsafe,
+		sc_rpc_server::RpcMiddleware,
+	) -> sc_rpc_server::RpcHandler<sc_rpc::Metadata>,
 >(
 	config: &Configuration,
 	mut gen_handler: H,
 	rpc_metrics: sc_rpc_server::RpcMetrics,
 ) -> Result<Box<dyn std::any::Any + Send + Sync>, error::Error> {
-	fn maybe_start_server<T, F>(address: Option<SocketAddr>, mut start: F) -> Result<Option<T>, io::Error>
-		where F: FnMut(&SocketAddr) -> Result<T, io::Error>,
-		{
-			address.map(|mut address| start(&address)
-				.or_else(|e| match e.kind() {
-					io::ErrorKind::AddrInUse |
-					io::ErrorKind::PermissionDenied => {
+	fn maybe_start_server<T, F>(
+		address: Option<SocketAddr>,
+		mut start: F,
+	) -> Result<Option<T>, io::Error>
+	where
+		F: FnMut(&SocketAddr) -> Result<T, io::Error>,
+	{
+		address
+			.map(|mut address| {
+				start(&address).or_else(|e| match e.kind() {
+					io::ErrorKind::AddrInUse | io::ErrorKind::PermissionDenied => {
 						warn!("Unable to bind RPC server to {}. Trying random port.", address);
 						address.set_port(0);
 						start(&address)
 					},
 					_ => Err(e),
-				}
-			) ).transpose()
-		}
+				})
+			})
+			.transpose()
+	}
 
 	fn deny_unsafe(addr: &SocketAddr, methods: &RpcMethods) -> sc_rpc::DenyUnsafe {
 		let is_exposed_addr = !addr.ip().is_loopback();
 		match (is_exposed_addr, methods) {
-			| (_, RpcMethods::Unsafe)
-			| (false, RpcMethods::Auto) => sc_rpc::DenyUnsafe::No,
-			_ => sc_rpc::DenyUnsafe::Yes
+			| (_, RpcMethods::Unsafe) | (false, RpcMethods::Auto) => sc_rpc::DenyUnsafe::No,
+			_ => sc_rpc::DenyUnsafe::Yes,
 		}
 	}
 
 	Ok(Box::new((
-		config.rpc_ipc.as_ref().map(|path| sc_rpc_server::start_ipc(
-			&*path, gen_handler(
-				sc_rpc::DenyUnsafe::No,
-				sc_rpc_server::RpcMiddleware::new(rpc_metrics.clone(), "ipc")
+		config.rpc_ipc.as_ref().map(|path| {
+			sc_rpc_server::start_ipc(
+				&*path,
+				gen_handler(
+					sc_rpc::DenyUnsafe::No,
+					sc_rpc_server::RpcMiddleware::new(rpc_metrics.clone(), "ipc"),
+				),
 			)
-		)),
-		maybe_start_server(
-			config.rpc_http,
-			|address| sc_rpc_server::start_http(
+		}),
+		maybe_start_server(config.rpc_http, |address| {
+			sc_rpc_server::start_http(
 				address,
 				config.rpc_http_threads,
 				config.rpc_cors.as_ref(),
 				gen_handler(
 					deny_unsafe(&address, &config.rpc_methods),
-					sc_rpc_server::RpcMiddleware::new(rpc_metrics.clone(), "http")
+					sc_rpc_server::RpcMiddleware::new(rpc_metrics.clone(), "http"),
 				),
-				config.rpc_max_payload
-			),
-		)?.map(|s| waiting::HttpServer(Some(s))),
-		maybe_start_server(
-			config.rpc_ws,
-			|address| sc_rpc_server::start_ws(
+				config.rpc_max_payload,
+			)
+		})?
+		.map(|s| waiting::HttpServer(Some(s))),
+		maybe_start_server(config.rpc_ws, |address| {
+			sc_rpc_server::start_ws(
 				address,
 				config.rpc_ws_max_connections,
 				config.rpc_cors.as_ref(),
 				gen_handler(
 					deny_unsafe(&address, &config.rpc_methods),
-					sc_rpc_server::RpcMiddleware::new(rpc_metrics.clone(), "ws")
+					sc_rpc_server::RpcMiddleware::new(rpc_metrics.clone(), "ws"),
 				),
-				config.rpc_max_payload
-			),
-		)?.map(|s| waiting::WsServer(Some(s))),
+				config.rpc_max_payload,
+			)
+		})?
+		.map(|s| waiting::WsServer(Some(s))),
 	)))
 }
 
 /// Starts RPC servers that run in their own thread, and returns an opaque object that keeps them alive.
 #[cfg(target_os = "unknown")]
 fn start_rpc_servers<
-	H: FnMut(sc_rpc::DenyUnsafe, sc_rpc_server::RpcMiddleware)
-	-> sc_rpc_server::RpcHandler<sc_rpc::Metadata>
+	H: FnMut(
+		sc_rpc::DenyUnsafe,
+		sc_rpc_server::RpcMiddleware,
+	) -> sc_rpc_server::RpcHandler<sc_rpc::Metadata>,
 >(
 	_: &Configuration,
 	_: H,
@@ -434,9 +452,7 @@ impl RpcSession {
 	///
 	/// The `RpcSession` must be kept alive in order to receive messages on the sender.
 	pub fn new(sender: futures01::sync::mpsc::Sender<String>) -> RpcSession {
-		RpcSession {
-			metadata: sender.into(),
-		}
+		RpcSession { metadata: sender.into() }
 	}
 }
 
@@ -450,10 +466,9 @@ pub struct TransactionPoolAdapter<C, P> {
 /// Get transactions for propagation.
 ///
 /// Function extracted to simplify the test and prevent creating `ServiceFactory`.
-fn transactions_to_propagate<Pool, B, H, E>(pool: &Pool)
-	-> Vec<(H, B::Extrinsic)>
+fn transactions_to_propagate<Pool, B, H, E>(pool: &Pool) -> Vec<(H, B::Extrinsic)>
 where
-	Pool: TransactionPool<Block=B, Hash=H, Error=E>,
+	Pool: TransactionPool<Block = B, Hash = H, Error = E>,
 	B: BlockT,
 	H: std::hash::Hash + Eq + sp_runtime::traits::Member + sp_runtime::traits::MaybeSerialize,
 	E: IntoPoolError + From<sc_transaction_pool_api::error::Error>,
@@ -468,11 +483,10 @@ where
 		.collect()
 }
 
-impl<B, H, C, Pool, E> sc_network::config::TransactionPool<H, B> for
-	TransactionPoolAdapter<C, Pool>
+impl<B, H, C, Pool, E> sc_network::config::TransactionPool<H, B> for TransactionPoolAdapter<C, Pool>
 where
 	C: sc_network::config::Client<B> + Send + Sync,
-	Pool: 'static + TransactionPool<Block=B, Hash=H, Error=E>,
+	Pool: 'static + TransactionPool<Block = B, Hash = H, Error = E>,
 	B: BlockT,
 	H: std::hash::Hash + Eq + sp_runtime::traits::Member + sp_runtime::traits::MaybeSerialize,
 	E: 'static + IntoPoolError + From<sc_transaction_pool_api::error::Error>,
@@ -485,10 +499,7 @@ where
 		self.pool.hash_of(transaction)
 	}
 
-	fn import(
-		&self,
-		transaction: B::Extrinsic,
-	) -> TransactionImportFuture {
+	fn import(&self, transaction: B::Extrinsic) -> TransactionImportFuture {
 		if !self.imports_external_transactions {
 			debug!("Transaction rejected");
 			Box::pin(futures::future::ready(TransactionImport::None));
@@ -499,28 +510,33 @@ where
 			Ok(uxt) => uxt,
 			Err(e) => {
 				debug!("Transaction invalid: {:?}", e);
-				return Box::pin(futures::future::ready(TransactionImport::Bad));
-			}
+				return Box::pin(futures::future::ready(TransactionImport::Bad))
+			},
 		};
 
 		let best_block_id = BlockId::hash(self.client.info().best_hash);
 
-		let import_future = self.pool.submit_one(&best_block_id, sc_transaction_pool_api::TransactionSource::External, uxt);
+		let import_future = self.pool.submit_one(
+			&best_block_id,
+			sc_transaction_pool_api::TransactionSource::External,
+			uxt,
+		);
 		Box::pin(async move {
 			match import_future.await {
 				Ok(_) => TransactionImport::NewGood,
 				Err(e) => match e.into_pool_error() {
-					Ok(sc_transaction_pool_api::error::Error::AlreadyImported(_)) => TransactionImport::KnownGood,
+					Ok(sc_transaction_pool_api::error::Error::AlreadyImported(_)) =>
+						TransactionImport::KnownGood,
 					Ok(e) => {
 						debug!("Error adding transaction to the pool: {:?}", e);
 						TransactionImport::Bad
-					}
+					},
 					Err(e) => {
 						debug!("Error converting pool error: {:?}", e);
 						// it is not bad at least, just some internal node logic error, so peer is innocent.
 						TransactionImport::KnownGood
-					}
-				}
+					},
+				},
 			}
 		})
 	}
@@ -530,11 +546,10 @@ where
 	}
 
 	fn transaction(&self, hash: &H) -> Option<B::Extrinsic> {
-		self.pool.ready_transaction(hash)
-			.and_then(
-				// Only propagable transactions should be resolved for network service.
-				|tx| if tx.is_propagable() { Some(tx.data().clone()) } else { None }
-			)
+		self.pool.ready_transaction(hash).and_then(
+			// Only propagable transactions should be resolved for network service.
+			|tx| if tx.is_propagable() { Some(tx.data().clone()) } else { None },
+		)
 	}
 }
 
@@ -542,10 +557,13 @@ where
 mod tests {
 	use super::*;
 	use futures::executor::block_on;
+	use sc_transaction_pool::BasicPool;
 	use sp_consensus::SelectChain;
 	use sp_runtime::traits::BlindCheckable;
-	use substrate_test_runtime_client::{prelude::*, runtime::{Extrinsic, Transfer}};
-	use sc_transaction_pool::BasicPool;
+	use substrate_test_runtime_client::{
+		prelude::*,
+		runtime::{Extrinsic, Transfer},
+	};
 
 	#[test]
 	fn should_not_propagate_transactions_that_are_marked_as_such() {
@@ -553,13 +571,8 @@ mod tests {
 		let (client, longest_chain) = TestClientBuilder::new().build_with_longest_chain();
 		let client = Arc::new(client);
 		let spawner = sp_core::testing::TaskExecutor::new();
-		let pool = BasicPool::new_full(
-			Default::default(),
-			true.into(),
-			None,
-			spawner,
-			client.clone(),
-		);
+		let pool =
+			BasicPool::new_full(Default::default(), true.into(), None, spawner, client.clone());
 		let source = sp_runtime::transaction_validity::TransactionSource::External;
 		let best = block_on(longest_chain.best_chain()).unwrap();
 		let transaction = Transfer {
@@ -569,12 +582,14 @@ mod tests {
 			to: Default::default(),
 		}
 		.into_signed_tx();
+		block_on(pool.submit_one(&BlockId::hash(best.hash()), source, transaction.clone()))
+			.unwrap();
 		block_on(pool.submit_one(
-			&BlockId::hash(best.hash()), source, transaction.clone()),
-		).unwrap();
-		block_on(pool.submit_one(
-			&BlockId::hash(best.hash()), source, Extrinsic::IncludeData(vec![1])),
-		).unwrap();
+			&BlockId::hash(best.hash()),
+			source,
+			Extrinsic::IncludeData(vec![1]),
+		))
+		.unwrap();
 		assert_eq!(pool.status().ready, 2);
 
 		// when
diff --git a/client/service/src/metrics.rs b/client/service/src/metrics.rs
index 7c74b327ea26..cd03916c9261 100644
--- a/client/service/src/metrics.rs
+++ b/client/service/src/metrics.rs
@@ -20,16 +20,15 @@ use std::{convert::TryFrom, time::SystemTime};
 
 use crate::config::Configuration;
 use futures_timer::Delay;
-use prometheus_endpoint::{register, Gauge, U64, Registry, PrometheusError, Opts, GaugeVec};
+use prometheus_endpoint::{register, Gauge, GaugeVec, Opts, PrometheusError, Registry, U64};
+use sc_client_api::{ClientInfo, UsageProvider};
+use sc_network::{config::Role, NetworkService, NetworkStatus};
 use sc_telemetry::{telemetry, TelemetryHandle, SUBSTRATE_INFO};
+use sc_transaction_pool_api::{MaintainedTransactionPool, PoolStatus};
 use sp_api::ProvideRuntimeApi;
-use sp_runtime::traits::{NumberFor, Block, SaturatedConversion, UniqueSaturatedInto};
-use sc_transaction_pool_api::{PoolStatus, MaintainedTransactionPool};
+use sp_runtime::traits::{Block, NumberFor, SaturatedConversion, UniqueSaturatedInto};
 use sp_utils::metrics::register_globals;
-use sc_client_api::{ClientInfo, UsageProvider};
-use sc_network::{config::Role, NetworkStatus, NetworkService};
-use std::sync::Arc;
-use std::time::Duration;
+use std::{sync::Arc, time::Duration};
 use wasm_timer::Instant;
 
 struct PrometheusMetrics {
@@ -51,54 +50,74 @@ impl PrometheusMetrics {
 		version: &str,
 		roles: u64,
 	) -> Result<Self, PrometheusError> {
-		register(Gauge::<U64>::with_opts(
-			Opts::new(
-				"build_info",
-				"A metric with a constant '1' value labeled by name, version"
-			)
+		register(
+			Gauge::<U64>::with_opts(
+				Opts::new(
+					"build_info",
+					"A metric with a constant '1' value labeled by name, version",
+				)
 				.const_label("name", name)
-				.const_label("version", version)
-		)?, &registry)?.set(1);
+				.const_label("version", version),
+			)?,
+			&registry,
+		)?
+		.set(1);
 
-		register(Gauge::<U64>::new(
-			"node_roles", "The roles the node is running as",
-		)?, &registry)?.set(roles);
+		register(Gauge::<U64>::new("node_roles", "The roles the node is running as")?, &registry)?
+			.set(roles);
 
 		register_globals(registry)?;
 
-		let start_time_since_epoch = SystemTime::now().duration_since(SystemTime::UNIX_EPOCH)
-			.unwrap_or_default();
-		register(Gauge::<U64>::new(
-			"process_start_time_seconds",
-			"Number of seconds between the UNIX epoch and the moment the process started",
-		)?, registry)?.set(start_time_since_epoch.as_secs());
+		let start_time_since_epoch =
+			SystemTime::now().duration_since(SystemTime::UNIX_EPOCH).unwrap_or_default();
+		register(
+			Gauge::<U64>::new(
+				"process_start_time_seconds",
+				"Number of seconds between the UNIX epoch and the moment the process started",
+			)?,
+			registry,
+		)?
+		.set(start_time_since_epoch.as_secs());
 
 		Ok(Self {
 			// generic internals
-			block_height: register(GaugeVec::new(
-				Opts::new("block_height", "Block height info of the chain"),
-				&["status"]
-			)?, registry)?,
-
-			number_leaves: register(Gauge::new(
-				"number_leaves", "Number of known chain leaves (aka forks)",
-			)?, registry)?,
-
-			ready_transactions_number: register(Gauge::new(
-				"ready_transactions_number", "Number of transactions in the ready queue",
-			)?, registry)?,
+			block_height: register(
+				GaugeVec::new(
+					Opts::new("block_height", "Block height info of the chain"),
+					&["status"],
+				)?,
+				registry,
+			)?,
+
+			number_leaves: register(
+				Gauge::new("number_leaves", "Number of known chain leaves (aka forks)")?,
+				registry,
+			)?,
+
+			ready_transactions_number: register(
+				Gauge::new(
+					"ready_transactions_number",
+					"Number of transactions in the ready queue",
+				)?,
+				registry,
+			)?,
 
 			// I/ O
-			database_cache: register(Gauge::new(
-				"database_cache_bytes", "RocksDB cache size in bytes",
-			)?, registry)?,
-			state_cache: register(Gauge::new(
-				"state_cache_bytes", "State cache size in bytes",
-			)?, registry)?,
-			state_db: register(GaugeVec::new(
-				Opts::new("state_db_cache_bytes", "State DB cache in bytes"),
-				&["subtype"]
-			)?, registry)?,
+			database_cache: register(
+				Gauge::new("database_cache_bytes", "RocksDB cache size in bytes")?,
+				registry,
+			)?,
+			state_cache: register(
+				Gauge::new("state_cache_bytes", "State cache size in bytes")?,
+				registry,
+			)?,
+			state_db: register(
+				GaugeVec::new(
+					Opts::new("state_db_cache_bytes", "State DB cache in bytes"),
+					&["subtype"],
+				)?,
+				registry,
+			)?,
 		})
 	}
 }
@@ -179,11 +198,7 @@ impl MetricsService {
 			let net_status = network.status().await.ok();
 
 			// Update / Send the metrics.
-			self.update(
-				&client.usage_info(),
-				&transactions.status(),
-				net_status,
-			);
+			self.update(&client.usage_info(), &transactions.status(), net_status);
 
 			// Schedule next tick.
 			timer.reset(timer_interval);
@@ -220,14 +235,8 @@ impl MetricsService {
 		);
 
 		if let Some(metrics) = self.metrics.as_ref() {
-			metrics
-				.block_height
-				.with_label_values(&["finalized"])
-				.set(finalized_number);
-			metrics
-				.block_height
-				.with_label_values(&["best"])
-				.set(best_number);
+			metrics.block_height.with_label_values(&["finalized"]).set(finalized_number);
+			metrics.block_height.with_label_values(&["best"]).set(best_number);
 
 			if let Ok(leaves) = u64::try_from(info.chain.number_leaves) {
 				metrics.number_leaves.set(leaves);
@@ -239,15 +248,17 @@ impl MetricsService {
 				metrics.database_cache.set(info.memory.database_cache.as_bytes() as u64);
 				metrics.state_cache.set(info.memory.state_cache.as_bytes() as u64);
 
-				metrics.state_db.with_label_values(&["non_canonical"]).set(
-					info.memory.state_db.non_canonical.as_bytes() as u64,
-				);
+				metrics
+					.state_db
+					.with_label_values(&["non_canonical"])
+					.set(info.memory.state_db.non_canonical.as_bytes() as u64);
 				if let Some(pruning) = info.memory.state_db.pruning {
 					metrics.state_db.with_label_values(&["pruning"]).set(pruning.as_bytes() as u64);
 				}
-				metrics.state_db.with_label_values(&["pinned"]).set(
-					info.memory.state_db.pinned.as_bytes() as u64,
-				);
+				metrics
+					.state_db
+					.with_label_values(&["pinned"])
+					.set(info.memory.state_db.pinned.as_bytes() as u64);
 			}
 		}
 
@@ -259,14 +270,13 @@ impl MetricsService {
 
 			let diff_bytes_inbound = total_bytes_inbound - self.last_total_bytes_inbound;
 			let diff_bytes_outbound = total_bytes_outbound - self.last_total_bytes_outbound;
-			let (avg_bytes_per_sec_inbound, avg_bytes_per_sec_outbound) =
-				if elapsed > 0 {
-					self.last_total_bytes_inbound = total_bytes_inbound;
-					self.last_total_bytes_outbound = total_bytes_outbound;
-					(diff_bytes_inbound / elapsed, diff_bytes_outbound / elapsed)
-				} else {
-					(diff_bytes_inbound, diff_bytes_outbound)
-				};
+			let (avg_bytes_per_sec_inbound, avg_bytes_per_sec_outbound) = if elapsed > 0 {
+				self.last_total_bytes_inbound = total_bytes_inbound;
+				self.last_total_bytes_outbound = total_bytes_outbound;
+				(diff_bytes_inbound / elapsed, diff_bytes_outbound / elapsed)
+			} else {
+				(diff_bytes_inbound, diff_bytes_outbound)
+			};
 
 			telemetry!(
 				self.telemetry;
@@ -278,9 +288,10 @@ impl MetricsService {
 			);
 
 			if let Some(metrics) = self.metrics.as_ref() {
-				let best_seen_block: Option<u64> = net_status
-					.best_seen_block
-					.map(|num: NumberFor<T>| UniqueSaturatedInto::<u64>::unique_saturated_into(num));
+				let best_seen_block: Option<u64> =
+					net_status.best_seen_block.map(|num: NumberFor<T>| {
+						UniqueSaturatedInto::<u64>::unique_saturated_into(num)
+					});
 
 				if let Some(best_seen_block) = best_seen_block {
 					metrics.block_height.with_label_values(&["sync_target"]).set(best_seen_block);
diff --git a/client/service/src/task_manager/mod.rs b/client/service/src/task_manager/mod.rs
index c7254f1f894d..d759798f744b 100644
--- a/client/service/src/task_manager/mod.rs
+++ b/client/service/src/task_manager/mod.rs
@@ -18,22 +18,24 @@
 
 //! Substrate service tasks management module.
 
-use std::{panic, result::Result, pin::Pin};
+use crate::{
+	config::{JoinFuture, TaskExecutor, TaskType},
+	Error,
+};
 use exit_future::Signal;
-use log::{debug, error};
 use futures::{
-	Future, FutureExt, StreamExt,
-	future::{select, Either, BoxFuture, join_all, try_join_all, pending},
+	future::{join_all, pending, select, try_join_all, BoxFuture, Either},
 	sink::SinkExt,
+	Future, FutureExt, StreamExt,
 };
+use log::{debug, error};
 use prometheus_endpoint::{
-	exponential_buckets, register,
-	PrometheusError,
-	CounterVec, HistogramOpts, HistogramVec, Opts, Registry, U64
+	exponential_buckets, register, CounterVec, HistogramOpts, HistogramVec, Opts, PrometheusError,
+	Registry, U64,
 };
-use sp_utils::mpsc::{TracingUnboundedSender, TracingUnboundedReceiver, tracing_unbounded};
+use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
+use std::{panic, pin::Pin, result::Result};
 use tracing_futures::Instrument;
-use crate::{config::{TaskExecutor, TaskType, JoinFuture}, Error};
 
 mod prometheus_future;
 #[cfg(test)]
@@ -62,7 +64,11 @@ impl SpawnTaskHandle {
 	}
 
 	/// Spawns the blocking task with the given name. See also `spawn`.
-	pub fn spawn_blocking(&self, name: &'static str, task: impl Future<Output = ()> + Send + 'static) {
+	pub fn spawn_blocking(
+		&self,
+		name: &'static str,
+		task: impl Future<Output = ()> + Send + 'static,
+	) {
 		self.spawn_inner(name, task, TaskType::Blocking)
 	}
 
@@ -75,7 +81,7 @@ impl SpawnTaskHandle {
 	) {
 		if self.task_notifier.is_closed() {
 			debug!("Attempt to spawn a new task has been prevented: {}", name);
-			return;
+			return
 		}
 
 		let on_exit = self.on_exit.clone();
@@ -95,7 +101,8 @@ impl SpawnTaskHandle {
 				let task = {
 					let poll_duration = metrics.poll_duration.with_label_values(&[name]);
 					let poll_start = metrics.poll_start.with_label_values(&[name]);
-					let inner = prometheus_future::with_poll_durations(poll_duration, poll_start, task);
+					let inner =
+						prometheus_future::with_poll_durations(poll_duration, poll_start, task);
 					// The logic of `AssertUnwindSafe` here is ok considering that we throw
 					// away the `Future` after it has panicked.
 					panic::AssertUnwindSafe(inner).catch_unwind()
@@ -106,16 +113,15 @@ impl SpawnTaskHandle {
 					Either::Right((Err(payload), _)) => {
 						metrics.tasks_ended.with_label_values(&[name, "panic"]).inc();
 						panic::resume_unwind(payload)
-					}
+					},
 					Either::Right((Ok(()), _)) => {
 						metrics.tasks_ended.with_label_values(&[name, "finished"]).inc();
-					}
+					},
 					Either::Left(((), _)) => {
 						// The `on_exit` has triggered.
 						metrics.tasks_ended.with_label_values(&[name, "interrupted"]).inc();
-					}
+					},
 				}
-
 			} else {
 				futures::pin_mut!(task);
 				let _ = select(on_exit, task).await;
@@ -162,10 +168,7 @@ impl SpawnEssentialTaskHandle {
 		essential_failed_tx: TracingUnboundedSender<()>,
 		spawn_task_handle: SpawnTaskHandle,
 	) -> SpawnEssentialTaskHandle {
-		SpawnEssentialTaskHandle {
-			essential_failed_tx,
-			inner: spawn_task_handle,
-		}
+		SpawnEssentialTaskHandle { essential_failed_tx, inner: spawn_task_handle }
 	}
 
 	/// Spawns the given task with the given name.
@@ -193,12 +196,10 @@ impl SpawnEssentialTaskHandle {
 		task_type: TaskType,
 	) {
 		let essential_failed = self.essential_failed_tx.clone();
-		let essential_task = std::panic::AssertUnwindSafe(task)
-			.catch_unwind()
-			.map(move |_| {
-				log::error!("Essential task `{}` failed. Shutting down service.", name);
-				let _ = essential_failed.close_channel();
-			});
+		let essential_task = std::panic::AssertUnwindSafe(task).catch_unwind().map(move |_| {
+			log::error!("Essential task `{}` failed. Shutting down service.", name);
+			let _ = essential_failed.close_channel();
+		});
 
 		let _ = self.inner.spawn_inner(name, essential_task, task_type);
 	}
@@ -260,10 +261,8 @@ impl TaskManager {
 		// NOTE: for_each_concurrent will await on all the JoinHandle futures at the same time. It
 		// is possible to limit this but it's actually better for the memory foot print to await
 		// them all to not accumulate anything on that stream.
-		let completion_future = executor.spawn(
-			Box::pin(background_tasks.for_each_concurrent(None, |x| x)),
-			TaskType::Async,
-		);
+		let completion_future = executor
+			.spawn(Box::pin(background_tasks.for_each_concurrent(None, |x| x)), TaskType::Async);
 
 		Ok(Self {
 			on_exit,
@@ -323,16 +322,21 @@ impl TaskManager {
 	///
 	/// This function will not wait until the end of the remaining task. You must call and await
 	/// `clean_shutdown()` after this.
-	pub fn future<'a>(&'a mut self) -> Pin<Box<dyn Future<Output = Result<(), Error>> + Send + 'a>> {
+	pub fn future<'a>(
+		&'a mut self,
+	) -> Pin<Box<dyn Future<Output = Result<(), Error>> + Send + 'a>> {
 		Box::pin(async move {
 			let mut t1 = self.essential_failed_rx.next().fuse();
 			let mut t2 = self.on_exit.clone().fuse();
 			let mut t3 = try_join_all(
-				self.children.iter_mut().map(|x| x.future())
+				self.children
+					.iter_mut()
+					.map(|x| x.future())
 					// Never end this future if there is no error because if there is no children,
 					// it must not stop
-					.chain(std::iter::once(pending().boxed()))
-			).fuse();
+					.chain(std::iter::once(pending().boxed())),
+			)
+			.fuse();
 
 			futures::select! {
 				_ = t1 => Err(Error::Other("Essential task failed.".into())),
diff --git a/client/service/src/task_manager/prometheus_future.rs b/client/service/src/task_manager/prometheus_future.rs
index 6d2a52354d6c..43a76a0f596c 100644
--- a/client/service/src/task_manager/prometheus_future.rs
+++ b/client/service/src/task_manager/prometheus_future.rs
@@ -20,20 +20,20 @@
 
 use futures::prelude::*;
 use prometheus_endpoint::{Counter, Histogram, U64};
-use std::{fmt, pin::Pin, task::{Context, Poll}};
+use std::{
+	fmt,
+	pin::Pin,
+	task::{Context, Poll},
+};
 
 /// Wraps around a `Future`. Report the polling duration to the `Histogram` and when the polling
 /// starts to the `Counter`.
 pub fn with_poll_durations<T>(
 	poll_duration: Histogram,
 	poll_start: Counter<U64>,
-	inner: T
+	inner: T,
 ) -> PrometheusFuture<T> {
-	PrometheusFuture {
-		inner,
-		poll_duration,
-		poll_start,
-	}
+	PrometheusFuture { inner, poll_duration, poll_start }
 }
 
 /// Wraps around `Future` and adds diagnostics to it.
diff --git a/client/service/src/task_manager/tests.rs b/client/service/src/task_manager/tests.rs
index 09768a19339f..d8789e556e1e 100644
--- a/client/service/src/task_manager/tests.rs
+++ b/client/service/src/task_manager/tests.rs
@@ -16,8 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::config::TaskExecutor;
-use crate::task_manager::TaskManager;
+use crate::{config::TaskExecutor, task_manager::TaskManager};
 use futures::{future::FutureExt, pin_mut, select};
 use parking_lot::Mutex;
 use std::{any::Any, sync::Arc, time::Duration};
@@ -205,7 +204,9 @@ fn ensure_task_manager_future_ends_with_error_when_essential_task_fails() {
 	runtime.block_on(async { tokio::time::delay_for(Duration::from_secs(1)).await });
 	assert_eq!(drop_tester, 2);
 	spawn_essential_handle.spawn("task3", async { panic!("task failed") });
-	runtime.block_on(task_manager.future()).expect_err("future()'s Result must be Err");
+	runtime
+		.block_on(task_manager.future())
+		.expect_err("future()'s Result must be Err");
 	assert_eq!(drop_tester, 2);
 	runtime.block_on(task_manager.clean_shutdown());
 	assert_eq!(drop_tester, 0);
@@ -265,7 +266,9 @@ fn ensure_task_manager_future_ends_with_error_when_childs_essential_task_fails()
 	runtime.block_on(async { tokio::time::delay_for(Duration::from_secs(1)).await });
 	assert_eq!(drop_tester, 4);
 	spawn_essential_handle_child_1.spawn("task5", async { panic!("task failed") });
-	runtime.block_on(task_manager.future()).expect_err("future()'s Result must be Err");
+	runtime
+		.block_on(task_manager.future())
+		.expect_err("future()'s Result must be Err");
 	assert_eq!(drop_tester, 4);
 	runtime.block_on(task_manager.clean_shutdown());
 	assert_eq!(drop_tester, 0);
diff --git a/client/service/test/src/client/db.rs b/client/service/test/src/client/db.rs
index a86e8f2de467..5278c9a13a4d 100644
--- a/client/service/test/src/client/db.rs
+++ b/client/service/test/src/client/db.rs
@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use sp_core::offchain::{OffchainStorage, storage::InMemOffchainStorage};
+use sp_core::offchain::{storage::InMemOffchainStorage, OffchainStorage};
 use std::sync::Arc;
 
 type TestBackend = sc_client_api::in_mem::Backend<substrate_test_runtime::Block>;
@@ -32,12 +32,13 @@ fn test_leaves_with_complex_block_tree() {
 fn test_blockchain_query_by_number_gets_canonical() {
 	let backend = Arc::new(TestBackend::new());
 
-	substrate_test_runtime_client::trait_tests::test_blockchain_query_by_number_gets_canonical(backend);
+	substrate_test_runtime_client::trait_tests::test_blockchain_query_by_number_gets_canonical(
+		backend,
+	);
 }
 
 #[test]
 fn in_memory_offchain_storage() {
-
 	let mut storage = InMemOffchainStorage::default();
 	assert_eq!(storage.get(b"A", b"B"), None);
 	assert_eq!(storage.get(b"B", b"A"), None);
diff --git a/client/service/test/src/client/light.rs b/client/service/test/src/client/light.rs
index 4d620139fa49..8d1411214d34 100644
--- a/client/service/test/src/client/light.rs
+++ b/client/service/test/src/client/light.rs
@@ -16,53 +16,52 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+use super::prepare_client_with_key_changes;
+use parity_scale_codec::{Decode, Encode};
+use parking_lot::Mutex;
+use sc_block_builder::BlockBuilderProvider;
+use sc_client_api::{
+	backend::NewBlockState,
+	blockchain::Info,
+	cht,
+	in_mem::{Backend as InMemBackend, Blockchain as InMemoryBlockchain},
+	AuxStore, Backend as ClientBackend, BlockBackend, BlockImportOperation, CallExecutor,
+	ChangesProof, ExecutionStrategy, FetchChecker, ProofProvider, ProvideChtRoots,
+	RemoteBodyRequest, RemoteCallRequest, RemoteChangesRequest, RemoteHeaderRequest,
+	RemoteReadChildRequest, RemoteReadRequest, Storage, StorageProof, StorageProvider,
+};
+use sc_executor::{NativeExecutor, NativeVersion, RuntimeVersion, WasmExecutionMethod};
 use sc_light::{
-	call_executor::{
-		GenesisCallExecutor,
-		check_execution_proof,
-	},
-	fetcher::LightDataChecker,
-	blockchain::{BlockchainCache, Blockchain},
 	backend::{Backend, GenesisOrUnavailableState},
+	blockchain::{Blockchain, BlockchainCache},
+	call_executor::{check_execution_proof, GenesisCallExecutor},
+	fetcher::LightDataChecker,
+};
+use sp_api::{ProofRecorder, StorageTransactionCache};
+use sp_blockchain::{
+	well_known_cache_keys, BlockStatus, CachedHeaderMetadata, Error as ClientError, HeaderBackend,
+	Result as ClientResult,
 };
-use std::sync::Arc;
+use sp_consensus::BlockOrigin;
+use sp_core::{testing::TaskExecutor, NativeOrEncoded, H256};
+use sp_externalities::Extensions;
 use sp_runtime::{
 	generic::BlockId,
 	traits::{BlakeTwo256, Block as _, HashFor, Header as HeaderT, NumberFor},
 	Digest, Justifications,
 };
-use std::collections::HashMap;
-use parking_lot::Mutex;
+use sp_state_machine::{ExecutionManager, OverlayedChanges};
+use std::{cell::RefCell, collections::HashMap, panic::UnwindSafe, sync::Arc};
 use substrate_test_runtime_client::{
-	runtime::{Hash, Block, Header}, TestClient, ClientBlockImportExt,
-};
-use sp_api::{StorageTransactionCache, ProofRecorder};
-use sp_consensus::BlockOrigin;
-use sc_executor::{NativeExecutor, WasmExecutionMethod, RuntimeVersion, NativeVersion};
-use sp_core::{H256, NativeOrEncoded, testing::TaskExecutor};
-use sc_client_api::{
-	blockchain::Info, backend::NewBlockState, Backend as ClientBackend, ProofProvider,
-	in_mem::{Backend as InMemBackend, Blockchain as InMemoryBlockchain}, ProvideChtRoots,
-	AuxStore, Storage, CallExecutor, cht, ExecutionStrategy, StorageProof, BlockImportOperation,
-	RemoteCallRequest, StorageProvider, ChangesProof, RemoteBodyRequest, RemoteReadRequest,
-	RemoteChangesRequest, FetchChecker, RemoteReadChildRequest, RemoteHeaderRequest, BlockBackend,
-};
-use sp_externalities::Extensions;
-use sc_block_builder::BlockBuilderProvider;
-use sp_blockchain::{
-	BlockStatus, Result as ClientResult, Error as ClientError, CachedHeaderMetadata,
-	HeaderBackend, well_known_cache_keys
-};
-use std::panic::UnwindSafe;
-use std::cell::RefCell;
-use sp_state_machine::{OverlayedChanges, ExecutionManager};
-use parity_scale_codec::{Decode, Encode};
-use super::prepare_client_with_key_changes;
-use substrate_test_runtime_client::{
-	AccountKeyring, runtime::{self, Extrinsic},
+	runtime::{self, Block, Extrinsic, Hash, Header},
+	AccountKeyring, ClientBlockImportExt, TestClient,
 };
 
-use sp_core::{blake2_256, ChangesTrieConfiguration, storage::{well_known_keys, StorageKey, ChildInfo}};
+use sp_core::{
+	blake2_256,
+	storage::{well_known_keys, ChildInfo, StorageKey},
+	ChangesTrieConfiguration,
+};
 use sp_state_machine::Backend as _;
 
 pub type DummyBlockchain = Blockchain<DummyStorage>;
@@ -115,7 +114,8 @@ impl sp_blockchain::HeaderMetadata<Block> for DummyStorage {
 	type Error = ClientError;
 
 	fn header_metadata(&self, hash: Hash) -> Result<CachedHeaderMetadata<Block>, Self::Error> {
-		self.header(BlockId::hash(hash))?.map(|header| CachedHeaderMetadata::from(&header))
+		self.header(BlockId::hash(hash))?
+			.map(|header| CachedHeaderMetadata::from(&header))
 			.ok_or(ClientError::UnknownBlock("header not found".to_owned()))
 	}
 	fn insert_header_metadata(&self, _hash: Hash, _metadata: CachedHeaderMetadata<Block>) {}
@@ -127,9 +127,13 @@ impl AuxStore for DummyStorage {
 		'a,
 		'b: 'a,
 		'c: 'a,
-		I: IntoIterator<Item=&'a(&'c [u8], &'c [u8])>,
-		D: IntoIterator<Item=&'a &'b [u8]>,
-	>(&self, insert: I, _delete: D) -> ClientResult<()> {
+		I: IntoIterator<Item = &'a (&'c [u8], &'c [u8])>,
+		D: IntoIterator<Item = &'a &'b [u8]>,
+	>(
+		&self,
+		insert: I,
+		_delete: D,
+	) -> ClientResult<()> {
 		for (k, v) in insert.into_iter() {
 			self.aux_store.lock().insert(k.to_vec(), v.to_vec());
 		}
@@ -182,9 +186,10 @@ impl ProvideChtRoots<Block> for DummyStorage {
 		cht::block_to_cht_number(cht_size, block)
 			.and_then(|cht_num| self.changes_tries_cht_roots.get(&cht_num))
 			.cloned()
-			.ok_or_else(|| ClientError::Backend(
-				format!("Test error: CHT for block #{} not found", block)
-			).into())
+			.ok_or_else(|| {
+				ClientError::Backend(format!("Test error: CHT for block #{} not found", block))
+					.into()
+			})
 			.map(Some)
 	}
 }
@@ -210,7 +215,7 @@ impl CallExecutor<Block> for DummyCallExecutor {
 	fn contextual_call<
 		EM: Fn(
 			Result<NativeOrEncoded<R>, Self::Error>,
-			Result<NativeOrEncoded<R>, Self::Error>
+			Result<NativeOrEncoded<R>, Self::Error>,
 		) -> Result<NativeOrEncoded<R>, Self::Error>,
 		R: Encode + Decode + PartialEq,
 		NC: FnOnce() -> Result<R, sp_api::ApiError> + UnwindSafe,
@@ -220,17 +225,22 @@ impl CallExecutor<Block> for DummyCallExecutor {
 		_method: &str,
 		_call_data: &[u8],
 		_changes: &RefCell<OverlayedChanges>,
-		_storage_transaction_cache: Option<&RefCell<
-			StorageTransactionCache<
-				Block,
-				<Self::Backend as sc_client_api::backend::Backend<Block>>::State,
-			>
-		>>,
+		_storage_transaction_cache: Option<
+			&RefCell<
+				StorageTransactionCache<
+					Block,
+					<Self::Backend as sc_client_api::backend::Backend<Block>>::State,
+				>,
+			>,
+		>,
 		_execution_manager: ExecutionManager<EM>,
 		_native_call: Option<NC>,
 		_proof_recorder: &Option<ProofRecorder<Block>>,
 		_extensions: Option<Extensions>,
-	) -> ClientResult<NativeOrEncoded<R>> where ExecutionManager<EM>: Clone {
+	) -> ClientResult<NativeOrEncoded<R>>
+	where
+		ExecutionManager<EM>: Clone,
+	{
 		unreachable!()
 	}
 
@@ -243,7 +253,7 @@ impl CallExecutor<Block> for DummyCallExecutor {
 		_trie_state: &sp_state_machine::TrieBackend<S, HashFor<Block>>,
 		_overlay: &mut OverlayedChanges,
 		_method: &str,
-		_call_data: &[u8]
+		_call_data: &[u8],
 	) -> Result<(Vec<u8>, StorageProof), ClientError> {
 		unreachable!()
 	}
@@ -260,11 +270,11 @@ fn local_executor() -> NativeExecutor<substrate_test_runtime_client::LocalExecut
 #[test]
 fn local_state_is_created_when_genesis_state_is_available() {
 	let def = Default::default();
-	let header0 = substrate_test_runtime_client::runtime::Header::new(0, def, def, def, Default::default());
+	let header0 =
+		substrate_test_runtime_client::runtime::Header::new(0, def, def, def, Default::default());
 
-	let backend: Backend<_, BlakeTwo256> = Backend::new(
-		Arc::new(DummyBlockchain::new(DummyStorage::new())),
-	);
+	let backend: Backend<_, BlakeTwo256> =
+		Backend::new(Arc::new(DummyBlockchain::new(DummyStorage::new())));
 	let mut op = backend.begin_operation().unwrap();
 	op.set_block_data(header0, None, None, None, NewBlockState::Final).unwrap();
 	op.set_genesis_state(Default::default(), true).unwrap();
@@ -278,9 +288,8 @@ fn local_state_is_created_when_genesis_state_is_available() {
 
 #[test]
 fn unavailable_state_is_created_when_genesis_state_is_unavailable() {
-	let backend: Backend<_, BlakeTwo256> = Backend::new(
-		Arc::new(DummyBlockchain::new(DummyStorage::new())),
-	);
+	let backend: Backend<_, BlakeTwo256> =
+		Backend::new(Arc::new(DummyBlockchain::new(DummyStorage::new())));
 
 	match backend.state_at(BlockId::Number(0)).unwrap() {
 		GenesisOrUnavailableState::Unavailable => (),
@@ -305,11 +314,8 @@ fn execution_proof_is_generated_and_checked() {
 		let remote_header = remote_client.header(&remote_block_id).unwrap().unwrap();
 
 		// 'fetch' execution proof from remote node
-		let (remote_result, remote_execution_proof) = remote_client.execution_proof(
-			&remote_block_id,
-			method,
-			&[]
-		).unwrap();
+		let (remote_result, remote_execution_proof) =
+			remote_client.execution_proof(&remote_block_id, method, &[]).unwrap();
 
 		// check remote execution proof locally
 		let local_result = check_execution_proof::<_, _, BlakeTwo256>(
@@ -323,7 +329,8 @@ fn execution_proof_is_generated_and_checked() {
 				retry_count: None,
 			},
 			remote_execution_proof,
-		).unwrap();
+		)
+		.unwrap();
 
 		(remote_result, local_result)
 	}
@@ -333,17 +340,20 @@ fn execution_proof_is_generated_and_checked() {
 		let remote_header = remote_client.header(&remote_block_id).unwrap().unwrap();
 
 		// 'fetch' execution proof from remote node
-		let (_, remote_execution_proof) = remote_client.execution_proof(
-			&remote_block_id,
-			"Core_initialize_block",
-			&Header::new(
-				at,
-				Default::default(),
-				Default::default(),
-				Default::default(),
-				Default::default(),
-			).encode(),
-		).unwrap();
+		let (_, remote_execution_proof) = remote_client
+			.execution_proof(
+				&remote_block_id,
+				"Core_initialize_block",
+				&Header::new(
+					at,
+					Default::default(),
+					Default::default(),
+					Default::default(),
+					Default::default(),
+				)
+				.encode(),
+			)
+			.unwrap();
 
 		// check remote execution proof locally
 		let execution_result = check_execution_proof::<_, _, BlakeTwo256>(
@@ -359,7 +369,8 @@ fn execution_proof_is_generated_and_checked() {
 					Default::default(),
 					remote_header.hash(),
 					remote_header.digest().clone(), // this makes next header wrong
-				).encode(),
+				)
+				.encode(),
 				retry_count: None,
 			},
 			remote_execution_proof,
@@ -379,7 +390,8 @@ fn execution_proof_is_generated_and_checked() {
 			BlockOrigin::Own,
 			remote_client.new_block(digest).unwrap().build().unwrap().block,
 			Justifications::from((*b"TEST", Default::default())),
-		)).unwrap();
+		))
+		.unwrap();
 	}
 
 	// check method that doesn't requires environment
@@ -401,22 +413,26 @@ fn execution_proof_is_generated_and_checked() {
 fn code_is_executed_at_genesis_only() {
 	let backend = Arc::new(InMemBackend::<Block>::new());
 	let def = H256::default();
-	let header0 = substrate_test_runtime_client::runtime::Header::new(0, def, def, def, Default::default());
+	let header0 =
+		substrate_test_runtime_client::runtime::Header::new(0, def, def, def, Default::default());
 	let hash0 = header0.hash();
-	let header1 = substrate_test_runtime_client::runtime::Header::new(1, def, def, hash0, Default::default());
+	let header1 =
+		substrate_test_runtime_client::runtime::Header::new(1, def, def, hash0, Default::default());
 	let hash1 = header1.hash();
-	backend.blockchain().insert(hash0, header0, None, None, NewBlockState::Final).unwrap();
-	backend.blockchain().insert(hash1, header1, None, None, NewBlockState::Final).unwrap();
+	backend
+		.blockchain()
+		.insert(hash0, header0, None, None, NewBlockState::Final)
+		.unwrap();
+	backend
+		.blockchain()
+		.insert(hash1, header1, None, None, NewBlockState::Final)
+		.unwrap();
 
 	let genesis_executor = GenesisCallExecutor::new(backend, DummyCallExecutor);
 	assert_eq!(
-		genesis_executor.call(
-			&BlockId::Number(0),
-			"test_method",
-			&[],
-			ExecutionStrategy::NativeElseWasm,
-			None,
-		).unwrap(),
+		genesis_executor
+			.call(&BlockId::Number(0), "test_method", &[], ExecutionStrategy::NativeElseWasm, None,)
+			.unwrap(),
 		vec![42],
 	);
 
@@ -434,7 +450,6 @@ fn code_is_executed_at_genesis_only() {
 	}
 }
 
-
 type TestChecker = LightDataChecker<
 	NativeExecutor<substrate_test_runtime_client::LocalExecutor>,
 	BlakeTwo256,
@@ -448,27 +463,28 @@ fn prepare_for_read_proof_check() -> (TestChecker, Header, StorageProof, u32) {
 	let remote_block_id = BlockId::Number(0);
 	let remote_block_hash = remote_client.block_hash(0).unwrap().unwrap();
 	let mut remote_block_header = remote_client.header(&remote_block_id).unwrap().unwrap();
-	remote_block_header.state_root = remote_client.state_at(&remote_block_id).unwrap()
-		.storage_root(::std::iter::empty()).0.into();
+	remote_block_header.state_root = remote_client
+		.state_at(&remote_block_id)
+		.unwrap()
+		.storage_root(::std::iter::empty())
+		.0
+		.into();
 
 	// 'fetch' read proof from remote node
-	let heap_pages = remote_client.storage(&remote_block_id, &StorageKey(well_known_keys::HEAP_PAGES.to_vec()))
+	let heap_pages = remote_client
+		.storage(&remote_block_id, &StorageKey(well_known_keys::HEAP_PAGES.to_vec()))
 		.unwrap()
-		.and_then(|v| Decode::decode(&mut &v.0[..]).ok()).unwrap();
-	let remote_read_proof = remote_client.read_proof(
-		&remote_block_id,
-		&mut std::iter::once(well_known_keys::HEAP_PAGES),
-	).unwrap();
+		.and_then(|v| Decode::decode(&mut &v.0[..]).ok())
+		.unwrap();
+	let remote_read_proof = remote_client
+		.read_proof(&remote_block_id, &mut std::iter::once(well_known_keys::HEAP_PAGES))
+		.unwrap();
 
 	// check remote read proof locally
 	let local_storage = InMemoryBlockchain::<Block>::new();
-	local_storage.insert(
-		remote_block_hash,
-		remote_block_header.clone(),
-		None,
-		None,
-		NewBlockState::Final,
-	).unwrap();
+	local_storage
+		.insert(remote_block_hash, remote_block_header.clone(), None, None, NewBlockState::Final)
+		.unwrap();
 	let local_checker = LightDataChecker::new(
 		Arc::new(DummyBlockchain::new(DummyStorage::new())),
 		local_executor(),
@@ -478,45 +494,39 @@ fn prepare_for_read_proof_check() -> (TestChecker, Header, StorageProof, u32) {
 }
 
 fn prepare_for_read_child_proof_check() -> (TestChecker, Header, StorageProof, Vec<u8>) {
-	use substrate_test_runtime_client::DefaultTestClientBuilderExt;
-	use substrate_test_runtime_client::TestClientBuilderExt;
+	use substrate_test_runtime_client::{DefaultTestClientBuilderExt, TestClientBuilderExt};
 	let child_info = ChildInfo::new_default(b"child1");
 	let child_info = &child_info;
 	// prepare remote client
 	let remote_client = substrate_test_runtime_client::TestClientBuilder::new()
-		.add_extra_child_storage(
-			child_info,
-			b"key1".to_vec(),
-			b"value1".to_vec(),
-		).build();
+		.add_extra_child_storage(child_info, b"key1".to_vec(), b"value1".to_vec())
+		.build();
 	let remote_block_id = BlockId::Number(0);
 	let remote_block_hash = remote_client.block_hash(0).unwrap().unwrap();
 	let mut remote_block_header = remote_client.header(&remote_block_id).unwrap().unwrap();
-	remote_block_header.state_root = remote_client.state_at(&remote_block_id).unwrap()
-		.storage_root(::std::iter::empty()).0.into();
+	remote_block_header.state_root = remote_client
+		.state_at(&remote_block_id)
+		.unwrap()
+		.storage_root(::std::iter::empty())
+		.0
+		.into();
 
 	// 'fetch' child read proof from remote node
-	let child_value = remote_client.child_storage(
-		&remote_block_id,
-		child_info,
-		&StorageKey(b"key1".to_vec()),
-	).unwrap().unwrap().0;
+	let child_value = remote_client
+		.child_storage(&remote_block_id, child_info, &StorageKey(b"key1".to_vec()))
+		.unwrap()
+		.unwrap()
+		.0;
 	assert_eq!(b"value1"[..], child_value[..]);
-	let remote_read_proof = remote_client.read_child_proof(
-		&remote_block_id,
-		child_info,
-		&mut std::iter::once("key1".as_bytes()),
-	).unwrap();
+	let remote_read_proof = remote_client
+		.read_child_proof(&remote_block_id, child_info, &mut std::iter::once("key1".as_bytes()))
+		.unwrap();
 
 	// check locally
 	let local_storage = InMemoryBlockchain::<Block>::new();
-	local_storage.insert(
-		remote_block_hash,
-		remote_block_header.clone(),
-		None,
-		None,
-		NewBlockState::Final,
-	).unwrap();
+	local_storage
+		.insert(remote_block_hash, remote_block_header.clone(), None, None, NewBlockState::Final)
+		.unwrap();
 	let local_checker = LightDataChecker::new(
 		Arc::new(DummyBlockchain::new(DummyStorage::new())),
 		local_executor(),
@@ -533,18 +543,21 @@ fn prepare_for_header_proof_check(insert_cht: bool) -> (TestChecker, Hash, Heade
 		let block = remote_client.new_block(Default::default()).unwrap().build().unwrap().block;
 		futures::executor::block_on(remote_client.import(BlockOrigin::Own, block)).unwrap();
 		local_headers_hashes.push(
-			remote_client.block_hash(i + 1)
-				.map_err(|_| ClientError::Backend("TestError".into()))
+			remote_client
+				.block_hash(i + 1)
+				.map_err(|_| ClientError::Backend("TestError".into())),
 		);
 	}
 
 	// 'fetch' header proof from remote node
 	let remote_block_id = BlockId::Number(1);
-	let (remote_block_header, remote_header_proof) = remote_client.header_proof_with_cht_size(&remote_block_id, 4).unwrap();
+	let (remote_block_header, remote_header_proof) =
+		remote_client.header_proof_with_cht_size(&remote_block_id, 4).unwrap();
 
 	// check remote read proof locally
 	let local_storage = InMemoryBlockchain::<Block>::new();
-	let local_cht_root = cht::compute_root::<Header, BlakeTwo256, _>(4, 0, local_headers_hashes).unwrap();
+	let local_cht_root =
+		cht::compute_root::<Header, BlakeTwo256, _>(4, 0, local_headers_hashes).unwrap();
 	if insert_cht {
 		local_storage.insert_cht_root(1, local_cht_root);
 	}
@@ -557,7 +570,7 @@ fn prepare_for_header_proof_check(insert_cht: bool) -> (TestChecker, Hash, Heade
 }
 
 fn header_with_computed_extrinsics_root(extrinsics: Vec<Extrinsic>) -> Header {
-	use sp_trie::{TrieConfiguration, trie_types::Layout};
+	use sp_trie::{trie_types::Layout, TrieConfiguration};
 	let iter = extrinsics.iter().map(Encode::encode);
 	let extrinsics_root = Layout::<BlakeTwo256>::ordered_trie_root(iter);
 
@@ -567,66 +580,106 @@ fn header_with_computed_extrinsics_root(extrinsics: Vec<Extrinsic>) -> Header {
 
 #[test]
 fn storage_read_proof_is_generated_and_checked() {
-	let (local_checker, remote_block_header, remote_read_proof, heap_pages) = prepare_for_read_proof_check();
-	assert_eq!((&local_checker as &dyn FetchChecker<Block>).check_read_proof(&RemoteReadRequest::<Header> {
-		block: remote_block_header.hash(),
-		header: remote_block_header,
-		keys: vec![well_known_keys::HEAP_PAGES.to_vec()],
-		retry_count: None,
-	}, remote_read_proof).unwrap().remove(well_known_keys::HEAP_PAGES).unwrap().unwrap()[0], heap_pages as u8);
+	let (local_checker, remote_block_header, remote_read_proof, heap_pages) =
+		prepare_for_read_proof_check();
+	assert_eq!(
+		(&local_checker as &dyn FetchChecker<Block>)
+			.check_read_proof(
+				&RemoteReadRequest::<Header> {
+					block: remote_block_header.hash(),
+					header: remote_block_header,
+					keys: vec![well_known_keys::HEAP_PAGES.to_vec()],
+					retry_count: None,
+				},
+				remote_read_proof
+			)
+			.unwrap()
+			.remove(well_known_keys::HEAP_PAGES)
+			.unwrap()
+			.unwrap()[0],
+		heap_pages as u8
+	);
 }
 
 #[test]
 fn storage_child_read_proof_is_generated_and_checked() {
 	let child_info = ChildInfo::new_default(&b"child1"[..]);
-	let (
-		local_checker,
-		remote_block_header,
-		remote_read_proof,
-		result,
-	) = prepare_for_read_child_proof_check();
-	assert_eq!((&local_checker as &dyn FetchChecker<Block>).check_read_child_proof(
-		&RemoteReadChildRequest::<Header> {
-			block: remote_block_header.hash(),
-			header: remote_block_header,
-			storage_key: child_info.prefixed_storage_key(),
-			keys: vec![b"key1".to_vec()],
-			retry_count: None,
-		},
-		remote_read_proof
-	).unwrap().remove(b"key1".as_ref()).unwrap().unwrap(), result);
+	let (local_checker, remote_block_header, remote_read_proof, result) =
+		prepare_for_read_child_proof_check();
+	assert_eq!(
+		(&local_checker as &dyn FetchChecker<Block>)
+			.check_read_child_proof(
+				&RemoteReadChildRequest::<Header> {
+					block: remote_block_header.hash(),
+					header: remote_block_header,
+					storage_key: child_info.prefixed_storage_key(),
+					keys: vec![b"key1".to_vec()],
+					retry_count: None,
+				},
+				remote_read_proof
+			)
+			.unwrap()
+			.remove(b"key1".as_ref())
+			.unwrap()
+			.unwrap(),
+		result
+	);
 }
 
 #[test]
 fn header_proof_is_generated_and_checked() {
-	let (local_checker, local_cht_root, remote_block_header, remote_header_proof) = prepare_for_header_proof_check(true);
-	assert_eq!((&local_checker as &dyn FetchChecker<Block>).check_header_proof(&RemoteHeaderRequest::<Header> {
-		cht_root: local_cht_root,
-		block: 1,
-		retry_count: None,
-	}, Some(remote_block_header.clone()), remote_header_proof).unwrap(), remote_block_header);
+	let (local_checker, local_cht_root, remote_block_header, remote_header_proof) =
+		prepare_for_header_proof_check(true);
+	assert_eq!(
+		(&local_checker as &dyn FetchChecker<Block>)
+			.check_header_proof(
+				&RemoteHeaderRequest::<Header> {
+					cht_root: local_cht_root,
+					block: 1,
+					retry_count: None,
+				},
+				Some(remote_block_header.clone()),
+				remote_header_proof
+			)
+			.unwrap(),
+		remote_block_header
+	);
 }
 
 #[test]
 fn check_header_proof_fails_if_cht_root_is_invalid() {
-	let (local_checker, _, mut remote_block_header, remote_header_proof) = prepare_for_header_proof_check(true);
+	let (local_checker, _, mut remote_block_header, remote_header_proof) =
+		prepare_for_header_proof_check(true);
 	remote_block_header.number = 100;
-	assert!((&local_checker as &dyn FetchChecker<Block>).check_header_proof(&RemoteHeaderRequest::<Header> {
-		cht_root: Default::default(),
-		block: 1,
-		retry_count: None,
-	}, Some(remote_block_header.clone()), remote_header_proof).is_err());
+	assert!((&local_checker as &dyn FetchChecker<Block>)
+		.check_header_proof(
+			&RemoteHeaderRequest::<Header> {
+				cht_root: Default::default(),
+				block: 1,
+				retry_count: None,
+			},
+			Some(remote_block_header.clone()),
+			remote_header_proof
+		)
+		.is_err());
 }
 
 #[test]
 fn check_header_proof_fails_if_invalid_header_provided() {
-	let (local_checker, local_cht_root, mut remote_block_header, remote_header_proof) = prepare_for_header_proof_check(true);
+	let (local_checker, local_cht_root, mut remote_block_header, remote_header_proof) =
+		prepare_for_header_proof_check(true);
 	remote_block_header.number = 100;
-	assert!((&local_checker as &dyn FetchChecker<Block>).check_header_proof(&RemoteHeaderRequest::<Header> {
-		cht_root: local_cht_root,
-		block: 1,
-		retry_count: None,
-	}, Some(remote_block_header.clone()), remote_header_proof).is_err());
+	assert!((&local_checker as &dyn FetchChecker<Block>)
+		.check_header_proof(
+			&RemoteHeaderRequest::<Header> {
+				cht_root: local_cht_root,
+				block: 1,
+				retry_count: None,
+			},
+			Some(remote_block_header.clone()),
+			remote_header_proof
+		)
+		.is_err());
 }
 
 #[test]
@@ -647,9 +700,9 @@ fn changes_proof_is_generated_and_checked_when_headers_are_not_pruned() {
 
 		// 'fetch' changes proof from remote node
 		let key = StorageKey(key);
-		let remote_proof = remote_client.key_changes_proof(
-			begin_hash, end_hash, begin_hash, max_hash, None, &key
-		).unwrap();
+		let remote_proof = remote_client
+			.key_changes_proof(begin_hash, end_hash, begin_hash, max_hash, None, &key)
+			.unwrap();
 
 		// check proof on local client
 		let local_roots_range = local_roots.clone()[(begin - 1) as usize..].to_vec();
@@ -668,20 +721,23 @@ fn changes_proof_is_generated_and_checked_when_headers_are_not_pruned() {
 			storage_key: None,
 			retry_count: None,
 		};
-		let local_result = local_checker.check_changes_proof(&request, ChangesProof {
-			max_block: remote_proof.max_block,
-			proof: remote_proof.proof,
-			roots: remote_proof.roots,
-			roots_proof: remote_proof.roots_proof,
-		}).unwrap();
+		let local_result = local_checker
+			.check_changes_proof(
+				&request,
+				ChangesProof {
+					max_block: remote_proof.max_block,
+					proof: remote_proof.proof,
+					roots: remote_proof.roots,
+					roots_proof: remote_proof.roots_proof,
+				},
+			)
+			.unwrap();
 
 		// ..and ensure that result is the same as on remote node
 		if local_result != expected_result {
 			panic!(
 				"Failed test {}: local = {:?}, expected = {:?}",
-				index,
-				local_result,
-				expected_result,
+				index, local_result, expected_result,
 			);
 		}
 	}
@@ -702,12 +758,17 @@ fn changes_proof_is_generated_and_checked_when_headers_are_pruned() {
 	let b1 = remote_client.block_hash_from_id(&BlockId::Number(1)).unwrap().unwrap();
 	let b3 = remote_client.block_hash_from_id(&BlockId::Number(3)).unwrap().unwrap();
 	let b4 = remote_client.block_hash_from_id(&BlockId::Number(4)).unwrap().unwrap();
-	let remote_proof = remote_client.key_changes_proof_with_cht_size(
-		b1, b4, b3, b4, None, &dave, 4
-	).unwrap();
+	let remote_proof = remote_client
+		.key_changes_proof_with_cht_size(b1, b4, b3, b4, None, &dave, 4)
+		.unwrap();
 
 	// prepare local checker, having a root of changes trie CHT#0
-	let local_cht_root = cht::compute_root::<Header, BlakeTwo256, _>(4, 0, remote_roots.iter().cloned().map(|ct| Ok(Some(ct)))).unwrap();
+	let local_cht_root = cht::compute_root::<Header, BlakeTwo256, _>(
+		4,
+		0,
+		remote_roots.iter().cloned().map(|ct| Ok(Some(ct))),
+	)
+	.unwrap();
 	let mut local_storage = DummyStorage::new();
 	local_storage.changes_tries_cht_roots.insert(0, local_cht_root);
 	let local_checker = TestChecker::new(
@@ -732,12 +793,18 @@ fn changes_proof_is_generated_and_checked_when_headers_are_pruned() {
 		key: dave.0,
 		retry_count: None,
 	};
-	let local_result = local_checker.check_changes_proof_with_cht_size(&request, ChangesProof {
-		max_block: remote_proof.max_block,
-		proof: remote_proof.proof,
-		roots: remote_proof.roots,
-		roots_proof: remote_proof.roots_proof,
-	}, 4).unwrap();
+	let local_result = local_checker
+		.check_changes_proof_with_cht_size(
+			&request,
+			ChangesProof {
+				max_block: remote_proof.max_block,
+				proof: remote_proof.proof,
+				roots: remote_proof.roots,
+				roots_proof: remote_proof.roots_proof,
+			},
+			4,
+		)
+		.unwrap();
 
 	assert_eq!(local_result, vec![(4, 0), (1, 1), (1, 0)]);
 }
@@ -760,8 +827,9 @@ fn check_changes_proof_fails_if_proof_is_wrong() {
 
 	// 'fetch' changes proof from remote node
 	let key = StorageKey(key);
-	let remote_proof = remote_client.key_changes_proof(
-		begin_hash, end_hash, begin_hash, max_hash, None, &key).unwrap();
+	let remote_proof = remote_client
+		.key_changes_proof(begin_hash, end_hash, begin_hash, max_hash, None, &key)
+		.unwrap();
 
 	let local_roots_range = local_roots.clone()[(begin - 1) as usize..].to_vec();
 	let config = ChangesTrieConfiguration::new(4, 2);
@@ -781,34 +849,54 @@ fn check_changes_proof_fails_if_proof_is_wrong() {
 	};
 
 	// check proof on local client using max from the future
-	assert!(local_checker.check_changes_proof(&request, ChangesProof {
-		max_block: remote_proof.max_block + 1,
-		proof: remote_proof.proof.clone(),
-		roots: remote_proof.roots.clone(),
-		roots_proof: remote_proof.roots_proof.clone(),
-	}).is_err());
+	assert!(local_checker
+		.check_changes_proof(
+			&request,
+			ChangesProof {
+				max_block: remote_proof.max_block + 1,
+				proof: remote_proof.proof.clone(),
+				roots: remote_proof.roots.clone(),
+				roots_proof: remote_proof.roots_proof.clone(),
+			}
+		)
+		.is_err());
 
 	// check proof on local client using broken proof
-	assert!(local_checker.check_changes_proof(&request, ChangesProof {
-		max_block: remote_proof.max_block,
-		proof: local_roots_range.clone().into_iter().map(|v| v.as_ref().to_vec()).collect(),
-		roots: remote_proof.roots,
-		roots_proof: remote_proof.roots_proof,
-	}).is_err());
+	assert!(local_checker
+		.check_changes_proof(
+			&request,
+			ChangesProof {
+				max_block: remote_proof.max_block,
+				proof: local_roots_range.clone().into_iter().map(|v| v.as_ref().to_vec()).collect(),
+				roots: remote_proof.roots,
+				roots_proof: remote_proof.roots_proof,
+			}
+		)
+		.is_err());
 
 	// extra roots proofs are provided
-	assert!(local_checker.check_changes_proof(&request, ChangesProof {
-		max_block: remote_proof.max_block,
-		proof: remote_proof.proof.clone(),
-		roots: vec![(begin - 1, Default::default())].into_iter().collect(),
-		roots_proof: StorageProof::empty(),
-	}).is_err());
-	assert!(local_checker.check_changes_proof(&request, ChangesProof {
-		max_block: remote_proof.max_block,
-		proof: remote_proof.proof.clone(),
-		roots: vec![(end + 1, Default::default())].into_iter().collect(),
-		roots_proof: StorageProof::empty(),
-	}).is_err());
+	assert!(local_checker
+		.check_changes_proof(
+			&request,
+			ChangesProof {
+				max_block: remote_proof.max_block,
+				proof: remote_proof.proof.clone(),
+				roots: vec![(begin - 1, Default::default())].into_iter().collect(),
+				roots_proof: StorageProof::empty(),
+			}
+		)
+		.is_err());
+	assert!(local_checker
+		.check_changes_proof(
+			&request,
+			ChangesProof {
+				max_block: remote_proof.max_block,
+				proof: remote_proof.proof.clone(),
+				roots: vec![(end + 1, Default::default())].into_iter().collect(),
+				roots_proof: StorageProof::empty(),
+			}
+		)
+		.is_err());
 }
 
 #[test]
@@ -817,7 +905,11 @@ fn check_changes_tries_proof_fails_if_proof_is_wrong() {
 	// (1, 4, dave.clone(), vec![(4, 0), (1, 1), (1, 0)]),
 	let (remote_client, remote_roots, _) = prepare_client_with_key_changes();
 	let local_cht_root = cht::compute_root::<Header, BlakeTwo256, _>(
-		4, 0, remote_roots.iter().cloned().map(|ct| Ok(Some(ct)))).unwrap();
+		4,
+		0,
+		remote_roots.iter().cloned().map(|ct| Ok(Some(ct))),
+	)
+	.unwrap();
 	let dave = blake2_256(&runtime::system::balance_of_key(AccountKeyring::Dave.into())).to_vec();
 	let dave = StorageKey(dave);
 
@@ -828,9 +920,9 @@ fn check_changes_tries_proof_fails_if_proof_is_wrong() {
 	let b1 = remote_client.block_hash_from_id(&BlockId::Number(1)).unwrap().unwrap();
 	let b3 = remote_client.block_hash_from_id(&BlockId::Number(3)).unwrap().unwrap();
 	let b4 = remote_client.block_hash_from_id(&BlockId::Number(4)).unwrap().unwrap();
-	let remote_proof = remote_client.key_changes_proof_with_cht_size(
-		b1, b4, b3, b4, None, &dave, 4
-	).unwrap();
+	let remote_proof = remote_client
+		.key_changes_proof_with_cht_size(b1, b4, b3, b4, None, &dave, 4)
+		.unwrap();
 
 	// fails when changes trie CHT is missing from the local db
 	let local_checker = TestChecker::new(
@@ -838,8 +930,9 @@ fn check_changes_tries_proof_fails_if_proof_is_wrong() {
 		local_executor(),
 		Box::new(TaskExecutor::new()),
 	);
-	assert!(local_checker.check_changes_tries_proof(4, &remote_proof.roots,
-													remote_proof.roots_proof.clone()).is_err());
+	assert!(local_checker
+		.check_changes_tries_proof(4, &remote_proof.roots, remote_proof.roots_proof.clone())
+		.is_err());
 
 	// fails when proof is broken
 	let mut local_storage = DummyStorage::new();
@@ -849,17 +942,15 @@ fn check_changes_tries_proof_fails_if_proof_is_wrong() {
 		local_executor(),
 		Box::new(TaskExecutor::new()),
 	);
-	let result = local_checker.check_changes_tries_proof(
-		4, &remote_proof.roots, StorageProof::empty()
-	);
+	let result =
+		local_checker.check_changes_tries_proof(4, &remote_proof.roots, StorageProof::empty());
 	assert!(result.is_err());
 }
 
 #[test]
 fn check_body_proof_faulty() {
-	let header = header_with_computed_extrinsics_root(
-		vec![Extrinsic::IncludeData(vec![1, 2, 3, 4])]
-	);
+	let header =
+		header_with_computed_extrinsics_root(vec![Extrinsic::IncludeData(vec![1, 2, 3, 4])]);
 	let block = Block::new(header.clone(), Vec::new());
 
 	let local_checker = TestChecker::new(
@@ -868,10 +959,7 @@ fn check_body_proof_faulty() {
 		Box::new(TaskExecutor::new()),
 	);
 
-	let body_request = RemoteBodyRequest {
-		header: header.clone(),
-		retry_count: None,
-	};
+	let body_request = RemoteBodyRequest { header: header.clone(), retry_count: None };
 
 	assert!(
 		local_checker.check_body_proof(&body_request, block.extrinsics).is_err(),
@@ -892,10 +980,7 @@ fn check_body_proof_of_same_data_should_succeed() {
 		Box::new(TaskExecutor::new()),
 	);
 
-	let body_request = RemoteBodyRequest {
-		header: header.clone(),
-		retry_count: None,
-	};
+	let body_request = RemoteBodyRequest { header: header.clone(), retry_count: None };
 
 	assert!(local_checker.check_body_proof(&body_request, block.extrinsics).is_ok());
 }
diff --git a/client/service/test/src/client/mod.rs b/client/service/test/src/client/mod.rs
index bdd693f57b2d..9e89dc932b7f 100644
--- a/client/service/test/src/client/mod.rs
+++ b/client/service/test/src/client/mod.rs
@@ -16,48 +16,50 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use parity_scale_codec::{Encode, Decode, Joiner};
-use sc_executor::native_executor_instance;
-use sp_state_machine::{StateMachine, OverlayedChanges, ExecutionStrategy, InMemoryBackend};
-use substrate_test_runtime_client::{
-	prelude::*,
-	runtime::{
-		self, genesismap::{GenesisConfig, insert_genesis_block},
-		Hash, Transfer, Block, BlockNumber, Header, Digest, RuntimeApi,
-	},
-	AccountKeyring, Sr25519Keyring, TestClientBuilder, ClientBlockImportExt,
-	BlockBuilderExt, DefaultTestClientBuilderExt, TestClientBuilderExt, ClientExt,
-};
-use sc_client_api::{
-	StorageProvider, BlockBackend, in_mem, BlockchainEvents,
-};
+use futures::executor::block_on;
+use hex_literal::hex;
+use parity_scale_codec::{Decode, Encode, Joiner};
+use sc_block_builder::BlockBuilderProvider;
+use sc_client_api::{in_mem, BlockBackend, BlockchainEvents, StorageProvider};
 use sc_client_db::{
-	Backend, DatabaseSettings, DatabaseSettingsSrc, PruningMode, KeepBlocks, TransactionStorageMode
+	Backend, DatabaseSettings, DatabaseSettingsSrc, KeepBlocks, PruningMode, TransactionStorageMode,
 };
-use sc_block_builder::BlockBuilderProvider;
-use sc_service::client::{self, Client, LocalCallExecutor, new_in_mem};
+use sc_executor::native_executor_instance;
+use sc_service::client::{self, new_in_mem, Client, LocalCallExecutor};
+use sp_api::ProvideRuntimeApi;
+use sp_consensus::{
+	BlockCheckParams, BlockImport, BlockImportParams, BlockOrigin, BlockStatus,
+	Error as ConsensusError, ForkChoiceStrategy, ImportResult, SelectChain,
+};
+use sp_core::{blake2_256, testing::TaskExecutor, ChangesTrieConfiguration, H256};
 use sp_runtime::{
-	ConsensusEngineId,
+	generic::BlockId,
 	traits::{BlakeTwo256, Block as BlockT, Header as HeaderT},
+	ConsensusEngineId, DigestItem, Justifications,
+};
+use sp_state_machine::{
+	backend::Backend as _, ExecutionStrategy, InMemoryBackend, OverlayedChanges, StateMachine,
+};
+use sp_storage::{ChildInfo, StorageKey};
+use sp_trie::{trie_types::Layout, TrieConfiguration};
+use std::{
+	collections::{HashMap, HashSet},
+	sync::Arc,
 };
 use substrate_test_runtime::TestAPI;
-use sp_state_machine::backend::Backend as _;
-use sp_api::ProvideRuntimeApi;
-use sp_core::{H256, ChangesTrieConfiguration, blake2_256, testing::TaskExecutor};
-use std::collections::{HashMap, HashSet};
-use std::sync::Arc;
-use sp_consensus::{
-	BlockOrigin, SelectChain, BlockImport, Error as ConsensusError, BlockCheckParams, ImportResult,
-	BlockStatus, BlockImportParams, ForkChoiceStrategy,
+use substrate_test_runtime_client::{
+	prelude::*,
+	runtime::{
+		self,
+		genesismap::{insert_genesis_block, GenesisConfig},
+		Block, BlockNumber, Digest, Hash, Header, RuntimeApi, Transfer,
+	},
+	AccountKeyring, BlockBuilderExt, ClientBlockImportExt, ClientExt, DefaultTestClientBuilderExt,
+	Sr25519Keyring, TestClientBuilder, TestClientBuilderExt,
 };
-use sp_storage::{StorageKey, ChildInfo};
-use sp_trie::{TrieConfiguration, trie_types::Layout};
-use sp_runtime::{generic::BlockId, DigestItem, Justifications};
-use hex_literal::hex;
-use futures::executor::block_on;
 
-mod light;
 mod db;
+mod light;
 
 const TEST_ENGINE_ID: ConsensusEngineId = *b"TEST";
 
@@ -68,11 +70,7 @@ native_executor_instance!(
 );
 
 fn executor() -> sc_executor::NativeExecutor<Executor> {
-	sc_executor::NativeExecutor::new(
-		sc_executor::WasmExecutionMethod::Interpreted,
-		None,
-		8,
-	)
+	sc_executor::NativeExecutor::new(sc_executor::WasmExecutionMethod::Interpreted, None, 8)
 }
 
 pub fn prepare_client_with_key_changes() -> (
@@ -80,14 +78,17 @@ pub fn prepare_client_with_key_changes() -> (
 		substrate_test_runtime_client::Backend,
 		substrate_test_runtime_client::Executor,
 		Block,
-		RuntimeApi
+		RuntimeApi,
 	>,
 	Vec<H256>,
 	Vec<(u64, u64, Vec<u8>, Vec<(u64, u32)>)>,
 ) {
 	// prepare block structure
 	let blocks_transfers = vec![
-		vec![(AccountKeyring::Alice, AccountKeyring::Dave), (AccountKeyring::Bob, AccountKeyring::Dave)],
+		vec![
+			(AccountKeyring::Alice, AccountKeyring::Dave),
+			(AccountKeyring::Bob, AccountKeyring::Dave),
+		],
 		vec![(AccountKeyring::Charlie, AccountKeyring::Eve)],
 		vec![],
 		vec![(AccountKeyring::Alice, AccountKeyring::Dave)],
@@ -101,18 +102,22 @@ pub fn prepare_client_with_key_changes() -> (
 	for (i, block_transfers) in blocks_transfers.into_iter().enumerate() {
 		let mut builder = remote_client.new_block(Default::default()).unwrap();
 		for (from, to) in block_transfers {
-			builder.push_transfer(Transfer {
-				from: from.into(),
-				to: to.into(),
-				amount: 1,
-				nonce: *nonces.entry(from).and_modify(|n| { *n = *n + 1 }).or_default(),
-			}).unwrap();
+			builder
+				.push_transfer(Transfer {
+					from: from.into(),
+					to: to.into(),
+					amount: 1,
+					nonce: *nonces.entry(from).and_modify(|n| *n = *n + 1).or_default(),
+				})
+				.unwrap();
 		}
 		let block = builder.build().unwrap().block;
 		block_on(remote_client.import(BlockOrigin::Own, block)).unwrap();
 
 		let header = remote_client.header(&BlockId::Number(i as u64 + 1)).unwrap().unwrap();
-		let trie_root = header.digest().log(DigestItem::as_changes_trie_root)
+		let trie_root = header
+			.digest()
+			.log(DigestItem::as_changes_trie_root)
 			.map(|root| H256::from_slice(root.as_ref()))
 			.unwrap();
 		local_roots.push(trie_root);
@@ -121,10 +126,12 @@ pub fn prepare_client_with_key_changes() -> (
 	// prepare test cases
 	let alice = blake2_256(&runtime::system::balance_of_key(AccountKeyring::Alice.into())).to_vec();
 	let bob = blake2_256(&runtime::system::balance_of_key(AccountKeyring::Bob.into())).to_vec();
-	let charlie = blake2_256(&runtime::system::balance_of_key(AccountKeyring::Charlie.into())).to_vec();
+	let charlie =
+		blake2_256(&runtime::system::balance_of_key(AccountKeyring::Charlie.into())).to_vec();
 	let dave = blake2_256(&runtime::system::balance_of_key(AccountKeyring::Dave.into())).to_vec();
 	let eve = blake2_256(&runtime::system::balance_of_key(AccountKeyring::Eve.into())).to_vec();
-	let ferdie = blake2_256(&runtime::system::balance_of_key(AccountKeyring::Ferdie.into())).to_vec();
+	let ferdie =
+		blake2_256(&runtime::system::balance_of_key(AccountKeyring::Ferdie.into())).to_vec();
 	let test_cases = vec![
 		(1, 4, alice.clone(), vec![(4, 0), (1, 0)]),
 		(1, 3, alice.clone(), vec![(1, 0)]),
@@ -181,9 +188,9 @@ fn construct_block(
 		Default::default(),
 		&runtime_code,
 		task_executor.clone() as Box<_>,
-	).execute(
-		ExecutionStrategy::NativeElseWasm,
-	).unwrap();
+	)
+	.execute(ExecutionStrategy::NativeElseWasm)
+	.unwrap();
 
 	for tx in transactions.iter() {
 		StateMachine::new(
@@ -196,9 +203,9 @@ fn construct_block(
 			Default::default(),
 			&runtime_code,
 			task_executor.clone() as Box<_>,
-		).execute(
-			ExecutionStrategy::NativeElseWasm,
-		).unwrap();
+		)
+		.execute(ExecutionStrategy::NativeElseWasm)
+		.unwrap();
 	}
 
 	let ret_data = StateMachine::new(
@@ -211,9 +218,9 @@ fn construct_block(
 		Default::default(),
 		&runtime_code,
 		task_executor.clone() as Box<_>,
-	).execute(
-		ExecutionStrategy::NativeElseWasm,
-	).unwrap();
+	)
+	.execute(ExecutionStrategy::NativeElseWasm)
+	.unwrap();
 	header = Header::decode(&mut &ret_data[..]).unwrap();
 
 	(vec![].and(&Block { header, extrinsics: transactions }), hash)
@@ -243,7 +250,8 @@ fn construct_genesis_should_work_with_native() {
 		1000,
 		None,
 		Default::default(),
-	).genesis_map();
+	)
+	.genesis_map();
 	let genesis_hash = insert_genesis_block(&mut storage);
 
 	let backend = InMemoryBackend::from(storage);
@@ -263,9 +271,9 @@ fn construct_genesis_should_work_with_native() {
 		Default::default(),
 		&runtime_code,
 		TaskExecutor::new(),
-	).execute(
-		ExecutionStrategy::NativeElseWasm,
-	).unwrap();
+	)
+	.execute(ExecutionStrategy::NativeElseWasm)
+	.unwrap();
 }
 
 #[test]
@@ -277,7 +285,8 @@ fn construct_genesis_should_work_with_wasm() {
 		1000,
 		None,
 		Default::default(),
-	).genesis_map();
+	)
+	.genesis_map();
 	let genesis_hash = insert_genesis_block(&mut storage);
 
 	let backend = InMemoryBackend::from(storage);
@@ -297,9 +306,9 @@ fn construct_genesis_should_work_with_wasm() {
 		Default::default(),
 		&runtime_code,
 		TaskExecutor::new(),
-	).execute(
-		ExecutionStrategy::AlwaysWasm,
-	).unwrap();
+	)
+	.execute(ExecutionStrategy::AlwaysWasm)
+	.unwrap();
 }
 
 #[test]
@@ -311,7 +320,8 @@ fn construct_genesis_with_bad_transaction_should_panic() {
 		68,
 		None,
 		Default::default(),
-	).genesis_map();
+	)
+	.genesis_map();
 	let genesis_hash = insert_genesis_block(&mut storage);
 
 	let backend = InMemoryBackend::from(storage);
@@ -331,9 +341,8 @@ fn construct_genesis_with_bad_transaction_should_panic() {
 		Default::default(),
 		&runtime_code,
 		TaskExecutor::new(),
-	).execute(
-		ExecutionStrategy::NativeElseWasm,
-	);
+	)
+	.execute(ExecutionStrategy::NativeElseWasm);
 	assert!(r.is_err());
 }
 
@@ -342,17 +351,23 @@ fn client_initializes_from_genesis_ok() {
 	let client = substrate_test_runtime_client::new();
 
 	assert_eq!(
-		client.runtime_api().balance_of(
-			&BlockId::Number(client.chain_info().best_number),
-			AccountKeyring::Alice.into(),
-		).unwrap(),
+		client
+			.runtime_api()
+			.balance_of(
+				&BlockId::Number(client.chain_info().best_number),
+				AccountKeyring::Alice.into(),
+			)
+			.unwrap(),
 		1000
 	);
 	assert_eq!(
-		client.runtime_api().balance_of(
-			&BlockId::Number(client.chain_info().best_number),
-			AccountKeyring::Ferdie.into(),
-		).unwrap(),
+		client
+			.runtime_api()
+			.balance_of(
+				&BlockId::Number(client.chain_info().best_number),
+				AccountKeyring::Ferdie.into(),
+			)
+			.unwrap(),
 		0
 	);
 }
@@ -374,12 +389,14 @@ fn block_builder_works_with_transactions() {
 
 	let mut builder = client.new_block(Default::default()).unwrap();
 
-	builder.push_transfer(Transfer {
-		from: AccountKeyring::Alice.into(),
-		to: AccountKeyring::Ferdie.into(),
-		amount: 42,
-		nonce: 0,
-	}).unwrap();
+	builder
+		.push_transfer(Transfer {
+			from: AccountKeyring::Alice.into(),
+			to: AccountKeyring::Ferdie.into(),
+			amount: 42,
+			nonce: 0,
+		})
+		.unwrap();
 
 	let block = builder.build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, block)).unwrap();
@@ -390,17 +407,23 @@ fn block_builder_works_with_transactions() {
 		client.state_at(&BlockId::Number(0)).unwrap().pairs()
 	);
 	assert_eq!(
-		client.runtime_api().balance_of(
-			&BlockId::Number(client.chain_info().best_number),
-			AccountKeyring::Alice.into(),
-		).unwrap(),
+		client
+			.runtime_api()
+			.balance_of(
+				&BlockId::Number(client.chain_info().best_number),
+				AccountKeyring::Alice.into(),
+			)
+			.unwrap(),
 		958
 	);
 	assert_eq!(
-		client.runtime_api().balance_of(
-			&BlockId::Number(client.chain_info().best_number),
-			AccountKeyring::Ferdie.into(),
-		).unwrap(),
+		client
+			.runtime_api()
+			.balance_of(
+				&BlockId::Number(client.chain_info().best_number),
+				AccountKeyring::Ferdie.into(),
+			)
+			.unwrap(),
 		42
 	);
 }
@@ -411,21 +434,23 @@ fn block_builder_does_not_include_invalid() {
 
 	let mut builder = client.new_block(Default::default()).unwrap();
 
-	builder.push_transfer(Transfer {
-		from: AccountKeyring::Alice.into(),
-		to: AccountKeyring::Ferdie.into(),
-		amount: 42,
-		nonce: 0,
-	}).unwrap();
+	builder
+		.push_transfer(Transfer {
+			from: AccountKeyring::Alice.into(),
+			to: AccountKeyring::Ferdie.into(),
+			amount: 42,
+			nonce: 0,
+		})
+		.unwrap();
 
-	assert!(
-		builder.push_transfer(Transfer {
+	assert!(builder
+		.push_transfer(Transfer {
 			from: AccountKeyring::Eve.into(),
 			to: AccountKeyring::Alice.into(),
 			amount: 42,
 			nonce: 0,
-		}).is_err()
-	);
+		})
+		.is_err());
 
 	let block = builder.build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, block)).unwrap();
@@ -462,12 +487,7 @@ fn best_containing_with_hash_not_found() {
 
 	let (client, longest_chain_select) = TestClientBuilder::new().build_with_longest_chain();
 
-	let uninserted_block = client
-		.new_block(Default::default())
-		.unwrap()
-		.build()
-		.unwrap()
-		.block;
+	let uninserted_block = client.new_block(Default::default()).unwrap().build().unwrap().block;
 
 	assert_eq!(
 		None,
@@ -498,8 +518,8 @@ fn uncles_with_multiple_forks() {
 	// block tree:
 	// G -> A1 -> A2 -> A3 -> A4 -> A5
 	//      A1 -> B2 -> B3 -> B4
-	//	          B2 -> C3
-	//	    A1 -> D2
+	// 	          B2 -> C3
+	// 	    A1 -> D2
 	let mut client = substrate_test_runtime_client::new();
 
 	// G -> A1
@@ -507,98 +527,104 @@ fn uncles_with_multiple_forks() {
 	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
 	// A1 -> A2
-	let a2 = client.new_block_at(
-		&BlockId::Hash(a1.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let a2 = client
+		.new_block_at(&BlockId::Hash(a1.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
 	// A2 -> A3
-	let a3 = client.new_block_at(
-		&BlockId::Hash(a2.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let a3 = client
+		.new_block_at(&BlockId::Hash(a2.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a3.clone())).unwrap();
 
 	// A3 -> A4
-	let a4 = client.new_block_at(
-		&BlockId::Hash(a3.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let a4 = client
+		.new_block_at(&BlockId::Hash(a3.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a4.clone())).unwrap();
 
 	// A4 -> A5
-	let a5 = client.new_block_at(
-		&BlockId::Hash(a4.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let a5 = client
+		.new_block_at(&BlockId::Hash(a4.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a5.clone())).unwrap();
 
 	// A1 -> B2
-	let mut builder = client.new_block_at(
-		&BlockId::Hash(a1.hash()),
-		Default::default(),
-		false,
-	).unwrap();
+	let mut builder = client
+		.new_block_at(&BlockId::Hash(a1.hash()), Default::default(), false)
+		.unwrap();
 	// this push is required as otherwise B2 has the same hash as A2 and won't get imported
-	builder.push_transfer(Transfer {
-		from: AccountKeyring::Alice.into(),
-		to: AccountKeyring::Ferdie.into(),
-		amount: 41,
-		nonce: 0,
-	}).unwrap();
+	builder
+		.push_transfer(Transfer {
+			from: AccountKeyring::Alice.into(),
+			to: AccountKeyring::Ferdie.into(),
+			amount: 41,
+			nonce: 0,
+		})
+		.unwrap();
 	let b2 = builder.build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, b2.clone())).unwrap();
 
 	// B2 -> B3
-	let b3 = client.new_block_at(
-		&BlockId::Hash(b2.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let b3 = client
+		.new_block_at(&BlockId::Hash(b2.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, b3.clone())).unwrap();
 
 	// B3 -> B4
-	let b4 = client.new_block_at(
-		&BlockId::Hash(b3.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let b4 = client
+		.new_block_at(&BlockId::Hash(b3.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, b4.clone())).unwrap();
 
 	// // B2 -> C3
-	let mut builder = client.new_block_at(
-		&BlockId::Hash(b2.hash()),
-		Default::default(),
-		false,
-	).unwrap();
+	let mut builder = client
+		.new_block_at(&BlockId::Hash(b2.hash()), Default::default(), false)
+		.unwrap();
 	// this push is required as otherwise C3 has the same hash as B3 and won't get imported
-	builder.push_transfer(Transfer {
-		from: AccountKeyring::Alice.into(),
-		to: AccountKeyring::Ferdie.into(),
-		amount: 1,
-		nonce: 1,
-	}).unwrap();
+	builder
+		.push_transfer(Transfer {
+			from: AccountKeyring::Alice.into(),
+			to: AccountKeyring::Ferdie.into(),
+			amount: 1,
+			nonce: 1,
+		})
+		.unwrap();
 	let c3 = builder.build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, c3.clone())).unwrap();
 
 	// A1 -> D2
-	let mut builder = client.new_block_at(
-		&BlockId::Hash(a1.hash()),
-		Default::default(),
-		false,
-	).unwrap();
+	let mut builder = client
+		.new_block_at(&BlockId::Hash(a1.hash()), Default::default(), false)
+		.unwrap();
 	// this push is required as otherwise D2 has the same hash as B2 and won't get imported
-	builder.push_transfer(Transfer {
-		from: AccountKeyring::Alice.into(),
-		to: AccountKeyring::Ferdie.into(),
-		amount: 1,
-		nonce: 0,
-	}).unwrap();
+	builder
+		.push_transfer(Transfer {
+			from: AccountKeyring::Alice.into(),
+			to: AccountKeyring::Ferdie.into(),
+			amount: 1,
+			nonce: 0,
+		})
+		.unwrap();
 	let d2 = builder.build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, d2.clone())).unwrap();
 
@@ -631,21 +657,11 @@ fn best_containing_on_longest_chain_with_single_chain_3_blocks() {
 	let (mut client, longest_chain_select) = TestClientBuilder::new().build_with_longest_chain();
 
 	// G -> A1
-	let a1 = client
-		.new_block(Default::default())
-		.unwrap()
-		.build()
-		.unwrap()
-		.block;
+	let a1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
 	// A1 -> A2
-	let a2 = client
-		.new_block(Default::default())
-		.unwrap()
-		.build()
-		.unwrap()
-		.block;
+	let a2 = client.new_block(Default::default()).unwrap().build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
 	let genesis_hash = client.chain_info().genesis_hash;
@@ -675,8 +691,8 @@ fn best_containing_on_longest_chain_with_multiple_forks() {
 	// block tree:
 	// G -> A1 -> A2 -> A3 -> A4 -> A5
 	//      A1 -> B2 -> B3 -> B4
-	//	          B2 -> C3
-	//	    A1 -> D2
+	// 	          B2 -> C3
+	// 	    A1 -> D2
 	let (mut client, longest_chain_select) = TestClientBuilder::new().build_with_longest_chain();
 
 	// G -> A1
@@ -684,67 +700,73 @@ fn best_containing_on_longest_chain_with_multiple_forks() {
 	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
 	// A1 -> A2
-	let a2 = client.new_block_at(
-		&BlockId::Hash(a1.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let a2 = client
+		.new_block_at(&BlockId::Hash(a1.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
 	// A2 -> A3
-	let a3 = client.new_block_at(
-		&BlockId::Hash(a2.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let a3 = client
+		.new_block_at(&BlockId::Hash(a2.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a3.clone())).unwrap();
 
 	// A3 -> A4
-	let a4 = client.new_block_at(
-		&BlockId::Hash(a3.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let a4 = client
+		.new_block_at(&BlockId::Hash(a3.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a4.clone())).unwrap();
 
 	// A4 -> A5
-	let a5 = client.new_block_at(
-		&BlockId::Hash(a4.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let a5 = client
+		.new_block_at(&BlockId::Hash(a4.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a5.clone())).unwrap();
 
 	// A1 -> B2
-	let mut builder = client.new_block_at(
-		&BlockId::Hash(a1.hash()),
-		Default::default(),
-		false,
-	).unwrap();
+	let mut builder = client
+		.new_block_at(&BlockId::Hash(a1.hash()), Default::default(), false)
+		.unwrap();
 	// this push is required as otherwise B2 has the same hash as A2 and won't get imported
-	builder.push_transfer(Transfer {
-		from: AccountKeyring::Alice.into(),
-		to: AccountKeyring::Ferdie.into(),
-		amount: 41,
-		nonce: 0,
-	}).unwrap();
+	builder
+		.push_transfer(Transfer {
+			from: AccountKeyring::Alice.into(),
+			to: AccountKeyring::Ferdie.into(),
+			amount: 41,
+			nonce: 0,
+		})
+		.unwrap();
 	let b2 = builder.build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, b2.clone())).unwrap();
 
 	// B2 -> B3
-	let b3 = client.new_block_at(
-		&BlockId::Hash(b2.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let b3 = client
+		.new_block_at(&BlockId::Hash(b2.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, b3.clone())).unwrap();
 
 	// B3 -> B4
-	let b4 = client.new_block_at(
-		&BlockId::Hash(b3.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let b4 = client
+		.new_block_at(&BlockId::Hash(b3.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, b4.clone())).unwrap();
 
 	// B2 -> C3
@@ -764,18 +786,18 @@ fn best_containing_on_longest_chain_with_multiple_forks() {
 	block_on(client.import(BlockOrigin::Own, c3.clone())).unwrap();
 
 	// A1 -> D2
-	let mut builder = client.new_block_at(
-		&BlockId::Hash(a1.hash()),
-		Default::default(),
-		false,
-	).unwrap();
+	let mut builder = client
+		.new_block_at(&BlockId::Hash(a1.hash()), Default::default(), false)
+		.unwrap();
 	// this push is required as otherwise D2 has the same hash as B2 and won't get imported
-	builder.push_transfer(Transfer {
-		from: AccountKeyring::Alice.into(),
-		to: AccountKeyring::Ferdie.into(),
-		amount: 1,
-		nonce: 0,
-	}).unwrap();
+	builder
+		.push_transfer(Transfer {
+			from: AccountKeyring::Alice.into(),
+			to: AccountKeyring::Ferdie.into(),
+			amount: 1,
+			nonce: 0,
+		})
+		.unwrap();
 	let d2 = builder.build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, d2.clone())).unwrap();
 
@@ -957,10 +979,7 @@ fn best_containing_on_longest_chain_with_multiple_forks() {
 			.unwrap()
 			.unwrap()
 	);
-	assert_eq!(
-		None,
-		block_on(longest_chain_select.finality_target(a5.hash(), Some(4))).unwrap()
-	);
+	assert_eq!(None, block_on(longest_chain_select.finality_target(a5.hash(), Some(4))).unwrap());
 	assert_eq!(
 		b4.hash(),
 		block_on(longest_chain_select.finality_target(b2.hash(), Some(4)))
@@ -1017,14 +1036,8 @@ fn best_containing_on_longest_chain_with_multiple_forks() {
 			.unwrap()
 			.unwrap()
 	);
-	assert_eq!(
-		None,
-		block_on(longest_chain_select.finality_target(a4.hash(), Some(3))).unwrap()
-	);
-	assert_eq!(
-		None,
-		block_on(longest_chain_select.finality_target(a5.hash(), Some(3))).unwrap()
-	);
+	assert_eq!(None, block_on(longest_chain_select.finality_target(a4.hash(), Some(3))).unwrap());
+	assert_eq!(None, block_on(longest_chain_select.finality_target(a5.hash(), Some(3))).unwrap());
 	assert_eq!(
 		b3.hash(),
 		block_on(longest_chain_select.finality_target(b2.hash(), Some(3)))
@@ -1037,10 +1050,7 @@ fn best_containing_on_longest_chain_with_multiple_forks() {
 			.unwrap()
 			.unwrap()
 	);
-	assert_eq!(
-		None,
-		block_on(longest_chain_select.finality_target(b4.hash(), Some(3))).unwrap()
-	);
+	assert_eq!(None, block_on(longest_chain_select.finality_target(b4.hash(), Some(3))).unwrap());
 	assert_eq!(
 		c3.hash(),
 		block_on(longest_chain_select.finality_target(c3.hash(), Some(3)))
@@ -1073,36 +1083,18 @@ fn best_containing_on_longest_chain_with_multiple_forks() {
 			.unwrap()
 			.unwrap()
 	);
-	assert_eq!(
-		None,
-		block_on(longest_chain_select.finality_target(a3.hash(), Some(2))).unwrap()
-	);
-	assert_eq!(
-		None,
-		block_on(longest_chain_select.finality_target(a4.hash(), Some(2))).unwrap()
-	);
-	assert_eq!(
-		None,
-		block_on(longest_chain_select.finality_target(a5.hash(), Some(2))).unwrap()
-	);
+	assert_eq!(None, block_on(longest_chain_select.finality_target(a3.hash(), Some(2))).unwrap());
+	assert_eq!(None, block_on(longest_chain_select.finality_target(a4.hash(), Some(2))).unwrap());
+	assert_eq!(None, block_on(longest_chain_select.finality_target(a5.hash(), Some(2))).unwrap());
 	assert_eq!(
 		b2.hash(),
 		block_on(longest_chain_select.finality_target(b2.hash(), Some(2)))
 			.unwrap()
 			.unwrap()
 	);
-	assert_eq!(
-		None,
-		block_on(longest_chain_select.finality_target(b3.hash(), Some(2))).unwrap()
-	);
-	assert_eq!(
-		None,
-		block_on(longest_chain_select.finality_target(b4.hash(), Some(2))).unwrap()
-	);
-	assert_eq!(
-		None,
-		block_on(longest_chain_select.finality_target(c3.hash(), Some(2))).unwrap()
-	);
+	assert_eq!(None, block_on(longest_chain_select.finality_target(b3.hash(), Some(2))).unwrap());
+	assert_eq!(None, block_on(longest_chain_select.finality_target(b4.hash(), Some(2))).unwrap());
+	assert_eq!(None, block_on(longest_chain_select.finality_target(c3.hash(), Some(2))).unwrap());
 	assert_eq!(
 		d2.hash(),
 		block_on(longest_chain_select.finality_target(d2.hash(), Some(2)))
@@ -1123,83 +1115,32 @@ fn best_containing_on_longest_chain_with_multiple_forks() {
 			.unwrap()
 			.unwrap()
 	);
-	assert_eq!(
-		None,
-		block_on(longest_chain_select.finality_target(a2.hash(), Some(1))).unwrap()
-	);
-	assert_eq!(
-		None,
-		block_on(longest_chain_select.finality_target(a3.hash(), Some(1))).unwrap()
-	);
-	assert_eq!(
-		None,
-		block_on(longest_chain_select.finality_target(a4.hash(), Some(1))).unwrap()
-	);
-	assert_eq!(
-		None,
-		block_on(longest_chain_select.finality_target(a5.hash(), Some(1))).unwrap()
-	);
-
-	assert_eq!(
-		None,
-		block_on(longest_chain_select.finality_target(b2.hash(), Some(1))).unwrap()
-	);
-	assert_eq!(
-		None,
-		block_on(longest_chain_select.finality_target(b3.hash(), Some(1))).unwrap()
-	);
-	assert_eq!(
-		None,
-		block_on(longest_chain_select.finality_target(b4.hash(), Some(1))).unwrap()
-	);
-	assert_eq!(
-		None,
-		block_on(longest_chain_select.finality_target(c3.hash(), Some(1))).unwrap()
-	);
-	assert_eq!(
-		None,
-		block_on(longest_chain_select.finality_target(d2.hash(), Some(1))).unwrap()
-	);
-
-	// search only blocks with number <= 0
+	assert_eq!(None, block_on(longest_chain_select.finality_target(a2.hash(), Some(1))).unwrap());
+	assert_eq!(None, block_on(longest_chain_select.finality_target(a3.hash(), Some(1))).unwrap());
+	assert_eq!(None, block_on(longest_chain_select.finality_target(a4.hash(), Some(1))).unwrap());
+	assert_eq!(None, block_on(longest_chain_select.finality_target(a5.hash(), Some(1))).unwrap());
+
+	assert_eq!(None, block_on(longest_chain_select.finality_target(b2.hash(), Some(1))).unwrap());
+	assert_eq!(None, block_on(longest_chain_select.finality_target(b3.hash(), Some(1))).unwrap());
+	assert_eq!(None, block_on(longest_chain_select.finality_target(b4.hash(), Some(1))).unwrap());
+	assert_eq!(None, block_on(longest_chain_select.finality_target(c3.hash(), Some(1))).unwrap());
+	assert_eq!(None, block_on(longest_chain_select.finality_target(d2.hash(), Some(1))).unwrap());
+
+	// search only blocks with number <= 0
 	assert_eq!(
 		genesis_hash,
 		block_on(longest_chain_select.finality_target(genesis_hash, Some(0)))
 			.unwrap()
 			.unwrap()
 	);
-	assert_eq!(
-		None,
-		block_on(longest_chain_select.finality_target(a1.hash(), Some(0))).unwrap()
-	);
-	assert_eq!(
-		None,
-		block_on(longest_chain_select.finality_target(a2.hash(), Some(0))).unwrap()
-	);
-	assert_eq!(
-		None,
-		block_on(longest_chain_select.finality_target(a3.hash(), Some(0))).unwrap()
-	);
-	assert_eq!(
-		None,
-		block_on(longest_chain_select.finality_target(a4.hash(), Some(0))).unwrap()
-	);
-	assert_eq!(
-		None,
-		block_on(longest_chain_select.finality_target(a5.hash(), Some(0))).unwrap()
-	);
-	assert_eq!(
-		None,
-		block_on(longest_chain_select.finality_target(b2.hash(), Some(0))).unwrap()
-	);
-	assert_eq!(
-		None,
-		block_on(longest_chain_select.finality_target(b3.hash(), Some(0))).unwrap()
-	);
-	assert_eq!(
-		None,
-		block_on(longest_chain_select.finality_target(b4.hash(), Some(0))).unwrap()
-	);
+	assert_eq!(None, block_on(longest_chain_select.finality_target(a1.hash(), Some(0))).unwrap());
+	assert_eq!(None, block_on(longest_chain_select.finality_target(a2.hash(), Some(0))).unwrap());
+	assert_eq!(None, block_on(longest_chain_select.finality_target(a3.hash(), Some(0))).unwrap());
+	assert_eq!(None, block_on(longest_chain_select.finality_target(a4.hash(), Some(0))).unwrap());
+	assert_eq!(None, block_on(longest_chain_select.finality_target(a5.hash(), Some(0))).unwrap());
+	assert_eq!(None, block_on(longest_chain_select.finality_target(b2.hash(), Some(0))).unwrap());
+	assert_eq!(None, block_on(longest_chain_select.finality_target(b3.hash(), Some(0))).unwrap());
+	assert_eq!(None, block_on(longest_chain_select.finality_target(b4.hash(), Some(0))).unwrap());
 	assert_eq!(
 		None,
 		block_on(longest_chain_select.finality_target(c3.hash().clone(), Some(0))).unwrap(),
@@ -1218,21 +1159,11 @@ fn best_containing_on_longest_chain_with_max_depth_higher_than_best() {
 	let (mut client, longest_chain_select) = TestClientBuilder::new().build_with_longest_chain();
 
 	// G -> A1
-	let a1 = client
-		.new_block(Default::default())
-		.unwrap()
-		.build()
-		.unwrap()
-		.block;
+	let a1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
 	// A1 -> A2
-	let a2 = client
-		.new_block(Default::default())
-		.unwrap()
-		.build()
-		.unwrap()
-		.block;
+	let a2 = client.new_block(Default::default()).unwrap().build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
 	let genesis_hash = client.chain_info().genesis_hash;
@@ -1251,18 +1182,12 @@ fn key_changes_works() {
 
 	for (index, (begin, end, key, expected_result)) in test_cases.into_iter().enumerate() {
 		let end = client.block_hash(end).unwrap().unwrap();
-		let actual_result = client.key_changes(
-			begin,
-			BlockId::Hash(end),
-			None,
-			&StorageKey(key),
-		).unwrap();
+		let actual_result =
+			client.key_changes(begin, BlockId::Hash(end), None, &StorageKey(key)).unwrap();
 		if actual_result != expected_result {
 			panic!(
 				"Failed test {}: actual = {:?}, expected = {:?}",
-				index,
-				actual_result,
-				expected_result,
+				index, actual_result, expected_result,
 			);
 		}
 	}
@@ -1277,41 +1202,31 @@ fn import_with_justification() {
 	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
 	// A1 -> A2
-	let a2 = client.new_block_at(
-		&BlockId::Hash(a1.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let a2 = client
+		.new_block_at(&BlockId::Hash(a1.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
 	// A2 -> A3
 	let justification = Justifications::from((TEST_ENGINE_ID, vec![1, 2, 3]));
-	let a3 = client.new_block_at(
-		&BlockId::Hash(a2.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let a3 = client
+		.new_block_at(&BlockId::Hash(a2.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import_justified(BlockOrigin::Own, a3.clone(), justification.clone())).unwrap();
 
-	assert_eq!(
-		client.chain_info().finalized_hash,
-		a3.hash(),
-	);
+	assert_eq!(client.chain_info().finalized_hash, a3.hash(),);
 
-	assert_eq!(
-		client.justifications(&BlockId::Hash(a3.hash())).unwrap(),
-		Some(justification),
-	);
+	assert_eq!(client.justifications(&BlockId::Hash(a3.hash())).unwrap(), Some(justification),);
 
-	assert_eq!(
-		client.justifications(&BlockId::Hash(a1.hash())).unwrap(),
-		None,
-	);
+	assert_eq!(client.justifications(&BlockId::Hash(a1.hash())).unwrap(), None,);
 
-	assert_eq!(
-		client.justifications(&BlockId::Hash(a2.hash())).unwrap(),
-		None,
-	);
+	assert_eq!(client.justifications(&BlockId::Hash(a2.hash())).unwrap(), None,);
 }
 
 #[test]
@@ -1321,54 +1236,44 @@ fn importing_diverged_finalized_block_should_trigger_reorg() {
 	// G -> A1 -> A2
 	//   \
 	//    -> B1
-	let a1 = client.new_block_at(
-		&BlockId::Number(0),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let a1 = client
+		.new_block_at(&BlockId::Number(0), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
-	let a2 = client.new_block_at(
-		&BlockId::Hash(a1.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let a2 = client
+		.new_block_at(&BlockId::Hash(a1.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
-	let mut b1 = client.new_block_at(
-		&BlockId::Number(0),
-		Default::default(),
-		false,
-	).unwrap();
+	let mut b1 = client.new_block_at(&BlockId::Number(0), Default::default(), false).unwrap();
 	// needed to make sure B1 gets a different hash from A1
 	b1.push_transfer(Transfer {
 		from: AccountKeyring::Alice.into(),
 		to: AccountKeyring::Ferdie.into(),
 		amount: 1,
 		nonce: 0,
-	}).unwrap();
+	})
+	.unwrap();
 	// create but don't import B1 just yet
 	let b1 = b1.build().unwrap().block;
 
 	// A2 is the current best since it's the longest chain
-	assert_eq!(
-		client.chain_info().best_hash,
-		a2.hash(),
-	);
+	assert_eq!(client.chain_info().best_hash, a2.hash(),);
 
 	// importing B1 as finalized should trigger a re-org and set it as new best
 	let justification = Justifications::from((TEST_ENGINE_ID, vec![1, 2, 3]));
 	block_on(client.import_justified(BlockOrigin::Own, b1.clone(), justification)).unwrap();
 
-	assert_eq!(
-		client.chain_info().best_hash,
-		b1.hash(),
-	);
+	assert_eq!(client.chain_info().best_hash, b1.hash(),);
 
-	assert_eq!(
-		client.chain_info().finalized_hash,
-		b1.hash(),
-	);
+	assert_eq!(client.chain_info().finalized_hash, b1.hash(),);
 }
 
 #[test]
@@ -1378,84 +1283,70 @@ fn finalizing_diverged_block_should_trigger_reorg() {
 	// G -> A1 -> A2
 	//   \
 	//    -> B1 -> B2
-	let a1 = client.new_block_at(
-		&BlockId::Number(0),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let a1 = client
+		.new_block_at(&BlockId::Number(0), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
-	let a2 = client.new_block_at(
-		&BlockId::Hash(a1.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let a2 = client
+		.new_block_at(&BlockId::Hash(a1.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
-	let mut b1 = client.new_block_at(
-		&BlockId::Number(0),
-		Default::default(),
-		false,
-	).unwrap();
+	let mut b1 = client.new_block_at(&BlockId::Number(0), Default::default(), false).unwrap();
 	// needed to make sure B1 gets a different hash from A1
 	b1.push_transfer(Transfer {
 		from: AccountKeyring::Alice.into(),
 		to: AccountKeyring::Ferdie.into(),
 		amount: 1,
 		nonce: 0,
-	}).unwrap();
+	})
+	.unwrap();
 	let b1 = b1.build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, b1.clone())).unwrap();
 
-	let b2 = client.new_block_at(
-		&BlockId::Hash(b1.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let b2 = client
+		.new_block_at(&BlockId::Hash(b1.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, b2.clone())).unwrap();
 
 	// A2 is the current best since it's the longest chain
-	assert_eq!(
-		client.chain_info().best_hash,
-		a2.hash(),
-	);
+	assert_eq!(client.chain_info().best_hash, a2.hash(),);
 
 	// we finalize block B1 which is on a different branch from current best
 	// which should trigger a re-org.
 	ClientExt::finalize_block(&client, BlockId::Hash(b1.hash()), None).unwrap();
 
 	// B1 should now be the latest finalized
-	assert_eq!(
-		client.chain_info().finalized_hash,
-		b1.hash(),
-	);
+	assert_eq!(client.chain_info().finalized_hash, b1.hash(),);
 
 	// and B1 should be the new best block (`finalize_block` as no way of
 	// knowing about B2)
-	assert_eq!(
-		client.chain_info().best_hash,
-		b1.hash(),
-	);
+	assert_eq!(client.chain_info().best_hash, b1.hash(),);
 
 	// `SelectChain` should report B2 as best block though
-	assert_eq!(
-		block_on(select_chain.best_chain()).unwrap().hash(),
-		b2.hash(),
-	);
+	assert_eq!(block_on(select_chain.best_chain()).unwrap().hash(), b2.hash(),);
 
 	// after we build B3 on top of B2 and import it
 	// it should be the new best block,
-	let b3 = client.new_block_at(
-		&BlockId::Hash(b2.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let b3 = client
+		.new_block_at(&BlockId::Hash(b2.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, b3.clone())).unwrap();
 
-	assert_eq!(
-		client.chain_info().best_hash,
-		b3.hash(),
-	);
+	assert_eq!(client.chain_info().best_hash, b3.hash(),);
 }
 
 #[test]
@@ -1473,55 +1364,53 @@ fn state_reverted_on_reorg() {
 	sp_tracing::try_init_simple();
 	let mut client = substrate_test_runtime_client::new();
 
-	let current_balance = |client: &substrate_test_runtime_client::TestClient|
-		client.runtime_api().balance_of(
-			&BlockId::number(client.chain_info().best_number), AccountKeyring::Alice.into(),
-		).unwrap();
+	let current_balance = |client: &substrate_test_runtime_client::TestClient| {
+		client
+			.runtime_api()
+			.balance_of(
+				&BlockId::number(client.chain_info().best_number),
+				AccountKeyring::Alice.into(),
+			)
+			.unwrap()
+	};
 
 	// G -> A1 -> A2
 	//   \
 	//    -> B1
-	let mut a1 = client.new_block_at(
-		&BlockId::Number(0),
-		Default::default(),
-		false,
-	).unwrap();
+	let mut a1 = client.new_block_at(&BlockId::Number(0), Default::default(), false).unwrap();
 	a1.push_transfer(Transfer {
 		from: AccountKeyring::Alice.into(),
 		to: AccountKeyring::Bob.into(),
 		amount: 10,
 		nonce: 0,
-	}).unwrap();
+	})
+	.unwrap();
 	let a1 = a1.build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
-	let mut b1 = client.new_block_at(
-		&BlockId::Number(0),
-		Default::default(),
-		false,
-	).unwrap();
+	let mut b1 = client.new_block_at(&BlockId::Number(0), Default::default(), false).unwrap();
 	b1.push_transfer(Transfer {
 		from: AccountKeyring::Alice.into(),
 		to: AccountKeyring::Ferdie.into(),
 		amount: 50,
 		nonce: 0,
-	}).unwrap();
+	})
+	.unwrap();
 	let b1 = b1.build().unwrap().block;
 	// Reorg to B1
 	block_on(client.import_as_best(BlockOrigin::Own, b1.clone())).unwrap();
 
 	assert_eq!(950, current_balance(&client));
-	let mut a2 = client.new_block_at(
-		&BlockId::Hash(a1.hash()),
-		Default::default(),
-		false,
-	).unwrap();
+	let mut a2 = client
+		.new_block_at(&BlockId::Hash(a1.hash()), Default::default(), false)
+		.unwrap();
 	a2.push_transfer(Transfer {
 		from: AccountKeyring::Alice.into(),
 		to: AccountKeyring::Charlie.into(),
 		amount: 10,
 		nonce: 1,
-	}).unwrap();
+	})
+	.unwrap();
 	let a2 = a2.build().unwrap().block;
 	// Re-org to A2
 	block_on(client.import_as_best(BlockOrigin::Own, a2)).unwrap();
@@ -1535,20 +1424,20 @@ fn doesnt_import_blocks_that_revert_finality() {
 
 	// we need to run with archive pruning to avoid pruning non-canonical
 	// states
-	let backend = Arc::new(Backend::new(
-		DatabaseSettings {
-			state_cache_size: 1 << 20,
-			state_cache_child_ratio: None,
-			state_pruning: PruningMode::ArchiveAll,
-			keep_blocks: KeepBlocks::All,
-			transaction_storage: TransactionStorageMode::BlockBody,
-			source: DatabaseSettingsSrc::RocksDb {
-				path: tmp.path().into(),
-				cache_size: 1024,
+	let backend = Arc::new(
+		Backend::new(
+			DatabaseSettings {
+				state_cache_size: 1 << 20,
+				state_cache_child_ratio: None,
+				state_pruning: PruningMode::ArchiveAll,
+				keep_blocks: KeepBlocks::All,
+				transaction_storage: TransactionStorageMode::BlockBody,
+				source: DatabaseSettingsSrc::RocksDb { path: tmp.path().into(), cache_size: 1024 },
 			},
-		},
-		u64::MAX,
-	).unwrap());
+			u64::MAX,
+		)
+		.unwrap(),
+	);
 
 	let mut client = TestClientBuilder::with_backend(backend).build();
 
@@ -1558,18 +1447,20 @@ fn doesnt_import_blocks_that_revert_finality() {
 	//   \
 	//    -> B1 -> B2 -> B3
 
-	let a1 = client.new_block_at(
-		&BlockId::Number(0),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let a1 = client
+		.new_block_at(&BlockId::Number(0), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
-	let a2 = client.new_block_at(
-		&BlockId::Hash(a1.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let a2 = client
+		.new_block_at(&BlockId::Hash(a1.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
 	let mut b1 = client.new_block_at(&BlockId::Number(0), Default::default(), false).unwrap();
@@ -1580,18 +1471,27 @@ fn doesnt_import_blocks_that_revert_finality() {
 		to: AccountKeyring::Ferdie.into(),
 		amount: 1,
 		nonce: 0,
-	}).unwrap();
+	})
+	.unwrap();
 	let b1 = b1.build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, b1.clone())).unwrap();
 
-	let b2 = client.new_block_at(&BlockId::Hash(b1.hash()), Default::default(), false)
-		.unwrap().build().unwrap().block;
+	let b2 = client
+		.new_block_at(&BlockId::Hash(b1.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, b2.clone())).unwrap();
 
 	// prepare B3 before we finalize A2, because otherwise we won't be able to
 	// read changes trie configuration after A2 is finalized
-	let b3 = client.new_block_at(&BlockId::Hash(b2.hash()), Default::default(), false)
-		.unwrap().build().unwrap().block;
+	let b3 = client
+		.new_block_at(&BlockId::Hash(b2.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 
 	// we will finalize A2 which should make it impossible to import a new
 	// B3 at the same height but that doesn't include it
@@ -1599,15 +1499,13 @@ fn doesnt_import_blocks_that_revert_finality() {
 
 	let import_err = block_on(client.import(BlockOrigin::Own, b3)).err().unwrap();
 	let expected_err = ConsensusError::ClientImport(
-		sp_blockchain::Error::RuntimeApiError(
-			sp_api::ApiError::Application(Box::new(sp_blockchain::Error::NotInFinalizedChain))
-		).to_string()
+		sp_blockchain::Error::RuntimeApiError(sp_api::ApiError::Application(Box::new(
+			sp_blockchain::Error::NotInFinalizedChain,
+		)))
+		.to_string(),
 	);
 
-	assert_eq!(
-		import_err.to_string(),
-		expected_err.to_string(),
-	);
+	assert_eq!(import_err.to_string(), expected_err.to_string(),);
 
 	// adding a C1 block which is lower than the last finalized should also
 	// fail (with a cheaper check that doesn't require checking ancestry).
@@ -1619,18 +1517,15 @@ fn doesnt_import_blocks_that_revert_finality() {
 		to: AccountKeyring::Ferdie.into(),
 		amount: 2,
 		nonce: 0,
-	}).unwrap();
+	})
+	.unwrap();
 	let c1 = c1.build().unwrap().block;
 
 	let import_err = block_on(client.import(BlockOrigin::Own, c1)).err().unwrap();
-	let expected_err = ConsensusError::ClientImport(
-		sp_blockchain::Error::NotInFinalizedChain.to_string()
-	);
+	let expected_err =
+		ConsensusError::ClientImport(sp_blockchain::Error::NotInFinalizedChain.to_string());
 
-	assert_eq!(
-		import_err.to_string(),
-		expected_err.to_string(),
-	);
+	assert_eq!(import_err.to_string(), expected_err.to_string(),);
 }
 
 #[test]
@@ -1644,15 +1539,16 @@ fn respects_block_rules() {
 			TestClientBuilder::new().build()
 		} else {
 			TestClientBuilder::new()
-				.set_block_rules(
-					Some(fork_rules.clone()),
-					Some(known_bad.clone()),
-				)
+				.set_block_rules(Some(fork_rules.clone()), Some(known_bad.clone()))
 				.build()
 		};
 
-		let block_ok = client.new_block_at(&BlockId::Number(0), Default::default(), false)
-			.unwrap().build().unwrap().block;
+		let block_ok = client
+			.new_block_at(&BlockId::Number(0), Default::default(), false)
+			.unwrap()
+			.build()
+			.unwrap()
+			.block;
 
 		let params = BlockCheckParams {
 			hash: block_ok.hash().clone(),
@@ -1664,8 +1560,8 @@ fn respects_block_rules() {
 		assert_eq!(block_on(client.check_block(params)).unwrap(), ImportResult::imported(false));
 
 		// this is 0x0d6d6612a10485370d9e085aeea7ec427fb3f34d961c6a816cdbe5cde2278864
-		let mut block_not_ok = client.new_block_at(&BlockId::Number(0), Default::default(), false)
-			.unwrap();
+		let mut block_not_ok =
+			client.new_block_at(&BlockId::Number(0), Default::default(), false).unwrap();
 		block_not_ok.push_storage_change(vec![0], Some(vec![1])).unwrap();
 		let block_not_ok = block_not_ok.build().unwrap().block;
 
@@ -1686,8 +1582,8 @@ fn respects_block_rules() {
 		block_on(client.import_as_final(BlockOrigin::Own, block_ok)).unwrap();
 
 		// And check good fork
-		let mut block_ok = client.new_block_at(&BlockId::Number(1), Default::default(), false)
-			.unwrap();
+		let mut block_ok =
+			client.new_block_at(&BlockId::Number(1), Default::default(), false).unwrap();
 		block_ok.push_storage_change(vec![0], Some(vec![2])).unwrap();
 		let block_ok = block_ok.build().unwrap().block;
 
@@ -1704,8 +1600,8 @@ fn respects_block_rules() {
 		assert_eq!(block_on(client.check_block(params)).unwrap(), ImportResult::imported(false));
 
 		// And now try bad fork
-		let mut block_not_ok = client.new_block_at(&BlockId::Number(1), Default::default(), false)
-			.unwrap();
+		let mut block_not_ok =
+			client.new_block_at(&BlockId::Number(1), Default::default(), false).unwrap();
 		block_not_ok.push_storage_change(vec![0], Some(vec![3])).unwrap();
 		let block_not_ok = block_not_ok.build().unwrap().block;
 
@@ -1739,28 +1635,29 @@ fn returns_status_for_pruned_blocks() {
 
 	// set to prune after 1 block
 	// states
-	let backend = Arc::new(Backend::new(
-		DatabaseSettings {
-			state_cache_size: 1 << 20,
-			state_cache_child_ratio: None,
-			state_pruning: PruningMode::keep_blocks(1),
-			keep_blocks: KeepBlocks::All,
-			transaction_storage: TransactionStorageMode::BlockBody,
-			source: DatabaseSettingsSrc::RocksDb {
-				path: tmp.path().into(),
-				cache_size: 1024,
+	let backend = Arc::new(
+		Backend::new(
+			DatabaseSettings {
+				state_cache_size: 1 << 20,
+				state_cache_child_ratio: None,
+				state_pruning: PruningMode::keep_blocks(1),
+				keep_blocks: KeepBlocks::All,
+				transaction_storage: TransactionStorageMode::BlockBody,
+				source: DatabaseSettingsSrc::RocksDb { path: tmp.path().into(), cache_size: 1024 },
 			},
-		},
-		u64::MAX,
-	).unwrap());
+			u64::MAX,
+		)
+		.unwrap(),
+	);
 
 	let mut client = TestClientBuilder::with_backend(backend).build();
 
-	let a1 = client.new_block_at(
-		&BlockId::Number(0),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let a1 = client
+		.new_block_at(&BlockId::Number(0), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 
 	let mut b1 = client.new_block_at(&BlockId::Number(0), Default::default(), false).unwrap();
 
@@ -1770,7 +1667,8 @@ fn returns_status_for_pruned_blocks() {
 		to: AccountKeyring::Ferdie.into(),
 		amount: 1,
 		nonce: 0,
-	}).unwrap();
+	})
+	.unwrap();
 	let b1 = b1.build().unwrap().block;
 
 	let check_block_a1 = BlockCheckParams {
@@ -1801,11 +1699,12 @@ fn returns_status_for_pruned_blocks() {
 		BlockStatus::InChainWithState,
 	);
 
-	let a2 = client.new_block_at(
-		&BlockId::Hash(a1.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let a2 = client
+		.new_block_at(&BlockId::Hash(a1.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import_as_final(BlockOrigin::Own, a2.clone())).unwrap();
 
 	let check_block_a2 = BlockCheckParams {
@@ -1833,11 +1732,12 @@ fn returns_status_for_pruned_blocks() {
 		BlockStatus::InChainWithState,
 	);
 
-	let a3 = client.new_block_at(
-		&BlockId::Hash(a2.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let a3 = client
+		.new_block_at(&BlockId::Hash(a2.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 
 	block_on(client.import_as_final(BlockOrigin::Own, a3.clone())).unwrap();
 	let check_block_a3 = BlockCheckParams {
@@ -1904,7 +1804,8 @@ fn imports_blocks_with_changes_tries_config_change() {
 		.changes_trie_config(Some(ChangesTrieConfiguration {
 			digest_interval: 4,
 			digest_levels: 2,
-		})).build();
+		}))
+		.build();
 
 	// ===================================================================
 	// blocks 1,2,3,4,5,6,7,8,9,10 are empty
@@ -1923,70 +1824,114 @@ fn imports_blocks_with_changes_tries_config_change() {
 	// block 31 is L1 digest that covers this change
 	// ===================================================================
 	(1..11).for_each(|number| {
-		let block = client.new_block_at(&BlockId::Number(number - 1), Default::default(), false)
-			.unwrap().build().unwrap().block;
+		let block = client
+			.new_block_at(&BlockId::Number(number - 1), Default::default(), false)
+			.unwrap()
+			.build()
+			.unwrap()
+			.block;
 		block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	});
 	(11..12).for_each(|number| {
-		let mut block = client.new_block_at(&BlockId::Number(number - 1), Default::default(), false).unwrap();
-		block.push_storage_change(vec![42], Some(number.to_le_bytes().to_vec())).unwrap();
+		let mut block = client
+			.new_block_at(&BlockId::Number(number - 1), Default::default(), false)
+			.unwrap();
+		block
+			.push_storage_change(vec![42], Some(number.to_le_bytes().to_vec()))
+			.unwrap();
 		let block = block.build().unwrap().block;
 		block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	});
 	(12..23).for_each(|number| {
-		let block = client.new_block_at(&BlockId::Number(number - 1), Default::default(), false)
-			.unwrap().build().unwrap().block;
+		let block = client
+			.new_block_at(&BlockId::Number(number - 1), Default::default(), false)
+			.unwrap()
+			.build()
+			.unwrap()
+			.block;
 		block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	});
 	(23..24).for_each(|number| {
-		let mut block = client.new_block_at(&BlockId::Number(number - 1), Default::default(), false).unwrap();
-		block.push_changes_trie_configuration_update(Some(ChangesTrieConfiguration {
-			digest_interval: 5,
-			digest_levels: 1,
-		})).unwrap();
+		let mut block = client
+			.new_block_at(&BlockId::Number(number - 1), Default::default(), false)
+			.unwrap();
+		block
+			.push_changes_trie_configuration_update(Some(ChangesTrieConfiguration {
+				digest_interval: 5,
+				digest_levels: 1,
+			}))
+			.unwrap();
 		let block = block.build().unwrap().block;
 		block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	});
 	(24..26).for_each(|number| {
-		let mut block = client.new_block_at(&BlockId::Number(number - 1), Default::default(), false).unwrap();
-		block.push_storage_change(vec![42], Some(number.to_le_bytes().to_vec())).unwrap();
+		let mut block = client
+			.new_block_at(&BlockId::Number(number - 1), Default::default(), false)
+			.unwrap();
+		block
+			.push_storage_change(vec![42], Some(number.to_le_bytes().to_vec()))
+			.unwrap();
 		let block = block.build().unwrap().block;
 		block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	});
 	(26..27).for_each(|number| {
-		let block = client.new_block_at(&BlockId::Number(number - 1), Default::default(), false)
-			.unwrap().build().unwrap().block;
+		let block = client
+			.new_block_at(&BlockId::Number(number - 1), Default::default(), false)
+			.unwrap()
+			.build()
+			.unwrap()
+			.block;
 		block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	});
 	(27..28).for_each(|number| {
-		let mut block = client.new_block_at(&BlockId::Number(number - 1), Default::default(), false).unwrap();
-		block.push_storage_change(vec![42], Some(number.to_le_bytes().to_vec())).unwrap();
+		let mut block = client
+			.new_block_at(&BlockId::Number(number - 1), Default::default(), false)
+			.unwrap();
+		block
+			.push_storage_change(vec![42], Some(number.to_le_bytes().to_vec()))
+			.unwrap();
 		let block = block.build().unwrap().block;
 		block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	});
 	(28..29).for_each(|number| {
-		let mut block = client.new_block_at(&BlockId::Number(number - 1), Default::default(), false).unwrap();
-		block.push_changes_trie_configuration_update(Some(ChangesTrieConfiguration {
-			digest_interval: 3,
-			digest_levels: 1,
-		})).unwrap();
+		let mut block = client
+			.new_block_at(&BlockId::Number(number - 1), Default::default(), false)
+			.unwrap();
+		block
+			.push_changes_trie_configuration_update(Some(ChangesTrieConfiguration {
+				digest_interval: 3,
+				digest_levels: 1,
+			}))
+			.unwrap();
 		let block = block.build().unwrap().block;
 		block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	});
 	(29..30).for_each(|number| {
-		let block = client.new_block_at(&BlockId::Number(number - 1), Default::default(), false)
-			.unwrap().build().unwrap().block;
+		let block = client
+			.new_block_at(&BlockId::Number(number - 1), Default::default(), false)
+			.unwrap()
+			.build()
+			.unwrap()
+			.block;
 		block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	});
 	(30..31).for_each(|number| {
-		let mut block = client.new_block_at(&BlockId::Number(number - 1), Default::default(), false).unwrap();
-		block.push_storage_change(vec![42], Some(number.to_le_bytes().to_vec())).unwrap();
+		let mut block = client
+			.new_block_at(&BlockId::Number(number - 1), Default::default(), false)
+			.unwrap();
+		block
+			.push_storage_change(vec![42], Some(number.to_le_bytes().to_vec()))
+			.unwrap();
 		let block = block.build().unwrap().block;
 		block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	});
 	(31..32).for_each(|number| {
-		let block = client.new_block_at(&BlockId::Number(number - 1), Default::default(), false)
-			.unwrap().build().unwrap().block;
+		let block = client
+			.new_block_at(&BlockId::Number(number - 1), Default::default(), false)
+			.unwrap()
+			.build()
+			.unwrap()
+			.block;
 		block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	});
 
@@ -2010,44 +1955,53 @@ fn storage_keys_iter_prefix_and_start_key_works() {
 	let prefix = StorageKey(hex!("3a").to_vec());
 	let child_prefix = StorageKey(b"sec".to_vec());
 
-	let res: Vec<_> = client.storage_keys_iter(&BlockId::Number(0), Some(&prefix), None)
+	let res: Vec<_> = client
+		.storage_keys_iter(&BlockId::Number(0), Some(&prefix), None)
 		.unwrap()
 		.map(|x| x.0)
 		.collect();
-	assert_eq!(res, [
-		child_root.clone(),
-		hex!("3a636f6465").to_vec(),
-		hex!("3a686561707061676573").to_vec(),
-	]);
+	assert_eq!(
+		res,
+		[child_root.clone(), hex!("3a636f6465").to_vec(), hex!("3a686561707061676573").to_vec(),]
+	);
 
-	let res: Vec<_> = client.storage_keys_iter(&BlockId::Number(0), Some(&prefix), Some(&StorageKey(hex!("3a636f6465").to_vec())))
+	let res: Vec<_> = client
+		.storage_keys_iter(
+			&BlockId::Number(0),
+			Some(&prefix),
+			Some(&StorageKey(hex!("3a636f6465").to_vec())),
+		)
 		.unwrap()
 		.map(|x| x.0)
 		.collect();
 	assert_eq!(res, [hex!("3a686561707061676573").to_vec()]);
 
-	let res: Vec<_> = client.storage_keys_iter(&BlockId::Number(0), Some(&prefix), Some(&StorageKey(hex!("3a686561707061676573").to_vec())))
+	let res: Vec<_> = client
+		.storage_keys_iter(
+			&BlockId::Number(0),
+			Some(&prefix),
+			Some(&StorageKey(hex!("3a686561707061676573").to_vec())),
+		)
 		.unwrap()
 		.map(|x| x.0)
 		.collect();
 	assert_eq!(res, Vec::<Vec<u8>>::new());
 
-	let res: Vec<_> = client.child_storage_keys_iter(
-		&BlockId::Number(0),
-		child_info.clone(),
-		Some(&child_prefix),
-		None,
-	).unwrap()
+	let res: Vec<_> = client
+		.child_storage_keys_iter(&BlockId::Number(0), child_info.clone(), Some(&child_prefix), None)
+		.unwrap()
 		.map(|x| x.0)
 		.collect();
 	assert_eq!(res, [b"second".to_vec()]);
 
-	let res: Vec<_> = client.child_storage_keys_iter(
-		&BlockId::Number(0),
-		child_info,
-		None,
-		Some(&StorageKey(b"second".to_vec())),
-	).unwrap()
+	let res: Vec<_> = client
+		.child_storage_keys_iter(
+			&BlockId::Number(0),
+			child_info,
+			None,
+			Some(&StorageKey(b"second".to_vec())),
+		)
+		.unwrap()
 		.map(|x| x.0)
 		.collect();
 	assert_eq!(res, [b"third".to_vec()]);
@@ -2059,30 +2013,52 @@ fn storage_keys_iter_works() {
 
 	let prefix = StorageKey(hex!("").to_vec());
 
-	let res: Vec<_> = client.storage_keys_iter(&BlockId::Number(0), Some(&prefix), None)
+	let res: Vec<_> = client
+		.storage_keys_iter(&BlockId::Number(0), Some(&prefix), None)
 		.unwrap()
 		.take(2)
 		.map(|x| x.0)
 		.collect();
-	assert_eq!(res, [hex!("0befda6e1ca4ef40219d588a727f1271").to_vec(), hex!("3a636f6465").to_vec()]);
+	assert_eq!(
+		res,
+		[hex!("0befda6e1ca4ef40219d588a727f1271").to_vec(), hex!("3a636f6465").to_vec()]
+	);
 
-	let res: Vec<_> = client.storage_keys_iter(&BlockId::Number(0), Some(&prefix), Some(&StorageKey(hex!("3a636f6465").to_vec())))
+	let res: Vec<_> = client
+		.storage_keys_iter(
+			&BlockId::Number(0),
+			Some(&prefix),
+			Some(&StorageKey(hex!("3a636f6465").to_vec())),
+		)
 		.unwrap()
 		.take(3)
 		.map(|x| x.0)
 		.collect();
-	assert_eq!(res, [
-		hex!("3a686561707061676573").to_vec(),
-		hex!("6644b9b8bc315888ac8e41a7968dc2b4141a5403c58acdf70b7e8f7e07bf5081").to_vec(),
-		hex!("79c07e2b1d2e2abfd4855b936617eeff5e0621c4869aa60c02be9adcc98a0d1d").to_vec(),
-	]);
-
-	let res: Vec<_> = client.storage_keys_iter(&BlockId::Number(0), Some(&prefix), Some(&StorageKey(hex!("79c07e2b1d2e2abfd4855b936617eeff5e0621c4869aa60c02be9adcc98a0d1d").to_vec())))
+	assert_eq!(
+		res,
+		[
+			hex!("3a686561707061676573").to_vec(),
+			hex!("6644b9b8bc315888ac8e41a7968dc2b4141a5403c58acdf70b7e8f7e07bf5081").to_vec(),
+			hex!("79c07e2b1d2e2abfd4855b936617eeff5e0621c4869aa60c02be9adcc98a0d1d").to_vec(),
+		]
+	);
+
+	let res: Vec<_> = client
+		.storage_keys_iter(
+			&BlockId::Number(0),
+			Some(&prefix),
+			Some(&StorageKey(
+				hex!("79c07e2b1d2e2abfd4855b936617eeff5e0621c4869aa60c02be9adcc98a0d1d").to_vec(),
+			)),
+		)
 		.unwrap()
 		.take(1)
 		.map(|x| x.0)
 		.collect();
-	assert_eq!(res, [hex!("cf722c0832b5231d35e29f319ff27389f5032bfc7bfc3ba5ed7839f2042fb99f").to_vec()]);
+	assert_eq!(
+		res,
+		[hex!("cf722c0832b5231d35e29f319ff27389f5032bfc7bfc3ba5ed7839f2042fb99f").to_vec()]
+	);
 }
 
 #[test]
@@ -2092,26 +2068,29 @@ fn cleans_up_closed_notification_sinks_on_block_import() {
 	// NOTE: we need to build the client here instead of using the client
 	// provided by test_runtime_client otherwise we can't access the private
 	// `import_notification_sinks` and `finality_notification_sinks` fields.
-	let mut client =
-		new_in_mem::<
-			_,
-			substrate_test_runtime_client::runtime::Block,
-			_,
-			substrate_test_runtime_client::runtime::RuntimeApi,
-		>(
-			substrate_test_runtime_client::new_native_executor(),
-			&substrate_test_runtime_client::GenesisParameters::default().genesis_storage(),
-			None,
-			None,
-			None,
-			Box::new(TaskExecutor::new()),
-			Default::default(),
-		)
-			.unwrap();
+	let mut client = new_in_mem::<
+		_,
+		substrate_test_runtime_client::runtime::Block,
+		_,
+		substrate_test_runtime_client::runtime::RuntimeApi,
+	>(
+		substrate_test_runtime_client::new_native_executor(),
+		&substrate_test_runtime_client::GenesisParameters::default().genesis_storage(),
+		None,
+		None,
+		None,
+		Box::new(TaskExecutor::new()),
+		Default::default(),
+	)
+	.unwrap();
 
 	type TestClient = Client<
 		in_mem::Backend<Block>,
-		LocalCallExecutor<Block, in_mem::Backend<Block>, sc_executor::NativeExecutor<LocalExecutor>>,
+		LocalCallExecutor<
+			Block,
+			in_mem::Backend<Block>,
+			sc_executor::NativeExecutor<LocalExecutor>,
+		>,
 		substrate_test_runtime_client::runtime::Block,
 		substrate_test_runtime_client::runtime::RuntimeApi,
 	>;
@@ -2123,12 +2102,7 @@ fn cleans_up_closed_notification_sinks_on_block_import() {
 
 	// for some reason I can't seem to use `ClientBlockImportExt`
 	let bake_and_import_block = |client: &mut TestClient, origin| {
-		let block = client
-			.new_block(Default::default())
-			.unwrap()
-			.build()
-			.unwrap()
-			.block;
+		let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
 
 		let (header, extrinsics) = block.deconstruct();
 		let mut import = BlockImportParams::new(origin, header);
@@ -2168,44 +2142,43 @@ fn cleans_up_closed_notification_sinks_on_block_import() {
 fn reorg_triggers_a_notification_even_for_sources_that_should_not_trigger_notifications() {
 	let mut client = TestClientBuilder::new().build();
 
-	let mut notification_stream = futures::executor::block_on_stream(
-		client.import_notification_stream()
-	);
+	let mut notification_stream =
+		futures::executor::block_on_stream(client.import_notification_stream());
 
-	let a1 = client.new_block_at(
-		&BlockId::Number(0),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let a1 = client
+		.new_block_at(&BlockId::Number(0), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::NetworkInitialSync, a1.clone())).unwrap();
 
-	let a2 = client.new_block_at(
-		&BlockId::Hash(a1.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let a2 = client
+		.new_block_at(&BlockId::Hash(a1.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::NetworkInitialSync, a2.clone())).unwrap();
 
-	let mut b1 = client.new_block_at(
-		&BlockId::Number(0),
-		Default::default(),
-		false,
-	).unwrap();
+	let mut b1 = client.new_block_at(&BlockId::Number(0), Default::default(), false).unwrap();
 	// needed to make sure B1 gets a different hash from A1
 	b1.push_transfer(Transfer {
 		from: AccountKeyring::Alice.into(),
 		to: AccountKeyring::Ferdie.into(),
 		amount: 1,
 		nonce: 0,
-	}).unwrap();
+	})
+	.unwrap();
 	let b1 = b1.build().unwrap().block;
 	block_on(client.import(BlockOrigin::NetworkInitialSync, b1.clone())).unwrap();
 
-	let b2 = client.new_block_at(
-		&BlockId::Hash(b1.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let b2 = client
+		.new_block_at(&BlockId::Hash(b1.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 
 	// Should trigger a notification because we reorg
 	block_on(client.import_as_best(BlockOrigin::NetworkInitialSync, b2.clone())).unwrap();
diff --git a/client/service/test/src/lib.rs b/client/service/test/src/lib.rs
index 44228d1575cc..9433ed0bde06 100644
--- a/client/service/test/src/lib.rs
+++ b/client/service/test/src/lib.rs
@@ -18,38 +18,27 @@
 
 //! Service integration test utils.
 
-use std::iter;
-use std::sync::Arc;
-use std::net::Ipv4Addr;
-use std::pin::Pin;
-use std::time::Duration;
-use log::{info, debug};
-use futures01::{Future, Stream, Poll};
 use futures::{FutureExt as _, TryFutureExt as _};
-use tempfile::TempDir;
-use tokio::{runtime::Runtime, prelude::FutureExt};
-use tokio::timer::Interval;
+use futures01::{Future, Poll, Stream};
+use log::{debug, info};
+use parking_lot::Mutex;
+use sc_client_api::{Backend, CallExecutor};
+use sc_network::{
+	config::{NetworkConfiguration, TransportConfig},
+	multiaddr, Multiaddr,
+};
 use sc_service::{
-	TaskManager,
-	SpawnTaskHandle,
-	GenericChainSpec,
-	ChainSpecExtension,
-	Configuration,
-	KeepBlocks, TransactionStorageMode,
-	config::{BasePath, DatabaseConfig, KeystoreConfig},
-	RuntimeGenesis,
-	Role,
-	Error,
-	TaskExecutor,
 	client::Client,
+	config::{BasePath, DatabaseConfig, KeystoreConfig},
+	ChainSpecExtension, Configuration, Error, GenericChainSpec, KeepBlocks, Role, RuntimeGenesis,
+	SpawnTaskHandle, TaskExecutor, TaskManager, TransactionStorageMode,
 };
+use sc_transaction_pool_api::TransactionPool;
 use sp_blockchain::HeaderBackend;
-use sc_network::{multiaddr, Multiaddr};
-use sc_network::config::{NetworkConfiguration, TransportConfig};
 use sp_runtime::{generic::BlockId, traits::Block as BlockT};
-use sc_transaction_pool_api::TransactionPool;
-use sc_client_api::{Backend, CallExecutor};
-use parking_lot::Mutex;
+use std::{iter, net::Ipv4Addr, pin::Pin, sync::Arc, time::Duration};
+use tempfile::TempDir;
+use tokio::{prelude::FutureExt, runtime::Runtime, timer::Interval};
 
 #[cfg(test)]
 mod client;
@@ -67,7 +56,9 @@ struct TestNet<G, E, F, L, U> {
 	nodes: usize,
 }
 
-pub trait TestNetNode: Clone + Future<Item = (), Error = sc_service::Error> + Send + 'static {
+pub trait TestNetNode:
+	Clone + Future<Item = (), Error = sc_service::Error> + Send + 'static
+{
 	type Block: BlockT;
 	type Backend: Backend<Self::Block>;
 	type Executor: CallExecutor<Self::Block> + Send + Sync;
@@ -76,7 +67,9 @@ pub trait TestNetNode: Clone + Future<Item = (), Error = sc_service::Error> + Se
 
 	fn client(&self) -> Arc<Client<Self::Backend, Self::Executor, Self::Block, Self::RuntimeApi>>;
 	fn transaction_pool(&self) -> Arc<Self::TransactionPool>;
-	fn network(&self) -> Arc<sc_network::NetworkService<Self::Block, <Self::Block as BlockT>::Hash>>;
+	fn network(
+		&self,
+	) -> Arc<sc_network::NetworkService<Self::Block, <Self::Block as BlockT>::Hash>>;
 	fn spawn_handle(&self) -> SpawnTaskHandle;
 }
 
@@ -88,23 +81,21 @@ pub struct TestNetComponents<TBl: BlockT, TBackend, TExec, TRtApi, TExPool> {
 }
 
 impl<TBl: BlockT, TBackend, TExec, TRtApi, TExPool>
-TestNetComponents<TBl, TBackend, TExec, TRtApi, TExPool> {
+	TestNetComponents<TBl, TBackend, TExec, TRtApi, TExPool>
+{
 	pub fn new(
 		task_manager: TaskManager,
 		client: Arc<Client<TBackend, TExec, TBl, TRtApi>>,
 		network: Arc<sc_network::NetworkService<TBl, <TBl as BlockT>::Hash>>,
 		transaction_pool: Arc<TExPool>,
 	) -> Self {
-		Self {
-			client, transaction_pool, network,
-			task_manager: Arc::new(Mutex::new(task_manager)),
-		}
+		Self { client, transaction_pool, network, task_manager: Arc::new(Mutex::new(task_manager)) }
 	}
 }
 
-
-impl<TBl: BlockT, TBackend, TExec, TRtApi, TExPool> Clone for
-TestNetComponents<TBl, TBackend, TExec, TRtApi, TExPool> {
+impl<TBl: BlockT, TBackend, TExec, TRtApi, TExPool> Clone
+	for TestNetComponents<TBl, TBackend, TExec, TRtApi, TExPool>
+{
 	fn clone(&self) -> Self {
 		Self {
 			task_manager: self.task_manager.clone(),
@@ -115,8 +106,8 @@ TestNetComponents<TBl, TBackend, TExec, TRtApi, TExPool> {
 	}
 }
 
-impl<TBl: BlockT, TBackend, TExec, TRtApi, TExPool> Future for
-	TestNetComponents<TBl, TBackend, TExec, TRtApi, TExPool>
+impl<TBl: BlockT, TBackend, TExec, TRtApi, TExPool> Future
+	for TestNetComponents<TBl, TBackend, TExec, TRtApi, TExPool>
 {
 	type Item = ();
 	type Error = sc_service::Error;
@@ -126,14 +117,14 @@ impl<TBl: BlockT, TBackend, TExec, TRtApi, TExPool> Future for
 	}
 }
 
-impl<TBl, TBackend, TExec, TRtApi, TExPool> TestNetNode for
-TestNetComponents<TBl, TBackend, TExec, TRtApi, TExPool>
-	where
-		TBl: BlockT,
-		TBackend: sc_client_api::Backend<TBl> + Send + Sync + 'static,
-		TExec: CallExecutor<TBl> + Send + Sync + 'static,
-		TRtApi: Send + Sync + 'static,
-		TExPool: TransactionPool<Block = TBl> + Send + Sync + 'static,
+impl<TBl, TBackend, TExec, TRtApi, TExPool> TestNetNode
+	for TestNetComponents<TBl, TBackend, TExec, TRtApi, TExPool>
+where
+	TBl: BlockT,
+	TBackend: sc_client_api::Backend<TBl> + Send + Sync + 'static,
+	TExec: CallExecutor<TBl> + Send + Sync + 'static,
+	TRtApi: Send + Sync + 'static,
+	TExPool: TransactionPool<Block = TBl> + Send + Sync + 'static,
 {
 	type Block = TBl;
 	type Backend = TBackend;
@@ -147,7 +138,9 @@ TestNetComponents<TBl, TBackend, TExec, TRtApi, TExPool>
 	fn transaction_pool(&self) -> Arc<Self::TransactionPool> {
 		self.transaction_pool.clone()
 	}
-	fn network(&self) -> Arc<sc_network::NetworkService<Self::Block, <Self::Block as BlockT>::Hash>> {
+	fn network(
+		&self,
+	) -> Arc<sc_network::NetworkService<Self::Block, <Self::Block as BlockT>::Hash>> {
 		self.network.clone()
 	}
 	fn spawn_handle(&self) -> SpawnTaskHandle {
@@ -156,33 +149,32 @@ TestNetComponents<TBl, TBackend, TExec, TRtApi, TExPool>
 }
 
 impl<G, E, F, L, U> TestNet<G, E, F, L, U>
-where F: Clone + Send + 'static, L: Clone + Send +'static, U: Clone + Send + 'static
+where
+	F: Clone + Send + 'static,
+	L: Clone + Send + 'static,
+	U: Clone + Send + 'static,
 {
-	pub fn run_until_all_full<FP, LP>(
-		&mut self,
-		full_predicate: FP,
-		light_predicate: LP,
-	)
-		where
-			FP: Send + Fn(usize, &F) -> bool + 'static,
-			LP: Send + Fn(usize, &L) -> bool + 'static,
+	pub fn run_until_all_full<FP, LP>(&mut self, full_predicate: FP, light_predicate: LP)
+	where
+		FP: Send + Fn(usize, &F) -> bool + 'static,
+		LP: Send + Fn(usize, &L) -> bool + 'static,
 	{
 		let full_nodes = self.full_nodes.clone();
 		let light_nodes = self.light_nodes.clone();
 		let interval = Interval::new_interval(Duration::from_millis(100))
 			.map_err(|_| ())
 			.for_each(move |_| {
-				let full_ready = full_nodes.iter().all(|&(ref id, ref service, _, _)|
-					full_predicate(*id, service)
-				);
+				let full_ready = full_nodes
+					.iter()
+					.all(|&(ref id, ref service, _, _)| full_predicate(*id, service));
 
 				if !full_ready {
-					return Ok(());
+					return Ok(())
 				}
 
-				let light_ready = light_nodes.iter().all(|&(ref id, ref service, _)|
-					light_predicate(*id, service)
-				);
+				let light_ready = light_nodes
+					.iter()
+					.all(|&(ref id, ref service, _)| light_predicate(*id, service));
 
 				if !light_ready {
 					Ok(())
@@ -200,7 +192,10 @@ where F: Clone + Send + 'static, L: Clone + Send +'static, U: Clone + Send + 'st
 	}
 }
 
-fn node_config<G: RuntimeGenesis + 'static, E: ChainSpecExtension + Clone + 'static + Send + Sync> (
+fn node_config<
+	G: RuntimeGenesis + 'static,
+	E: ChainSpecExtension + Clone + 'static + Send + Sync,
+>(
 	index: usize,
 	spec: &GenericChainSpec<G, E>,
 	role: Role,
@@ -208,8 +203,7 @@ fn node_config<G: RuntimeGenesis + 'static, E: ChainSpecExtension + Clone + 'sta
 	key_seed: Option<String>,
 	base_port: u16,
 	root: &TempDir,
-) -> Configuration
-{
+) -> Configuration {
 	let root = root.path().join(format!("node-{}", index));
 
 	let mut network_config = NetworkConfiguration::new(
@@ -224,7 +218,7 @@ fn node_config<G: RuntimeGenesis + 'static, E: ChainSpecExtension + Clone + 'sta
 	network_config.listen_addresses.push(
 		iter::once(multiaddr::Protocol::Ip4(Ipv4Addr::new(127, 0, 0, 1)))
 			.chain(iter::once(multiaddr::Protocol::Tcp(base_port + index as u16)))
-			.collect()
+			.collect(),
 	);
 
 	network_config.transport = TransportConfig::Normal {
@@ -241,14 +235,8 @@ fn node_config<G: RuntimeGenesis + 'static, E: ChainSpecExtension + Clone + 'sta
 		transaction_pool: Default::default(),
 		network: network_config,
 		keystore_remote: Default::default(),
-		keystore: KeystoreConfig::Path {
-			path: root.join("key"),
-			password: None
-		},
-		database: DatabaseConfig::RocksDb {
-			path: root.join("db"),
-			cache_size: 128,
-		},
+		keystore: KeystoreConfig::Path { path: root.join("key"), password: None },
+		database: DatabaseConfig::RocksDb { path: root.join("db"), cache_size: 128 },
 		state_cache_size: 16777216,
 		state_cache_child_ratio: None,
 		state_pruning: Default::default(),
@@ -284,7 +272,8 @@ fn node_config<G: RuntimeGenesis + 'static, E: ChainSpecExtension + Clone + 'sta
 	}
 }
 
-impl<G, E, F, L, U> TestNet<G, E, F, L, U> where
+impl<G, E, F, L, U> TestNet<G, E, F, L, U>
+where
 	F: TestNetNode,
 	L: TestNetNode,
 	E: ChainSpecExtension + Clone + 'static + Send + Sync,
@@ -295,11 +284,8 @@ impl<G, E, F, L, U> TestNet<G, E, F, L, U> where
 		spec: GenericChainSpec<G, E>,
 		full: impl Iterator<Item = impl FnOnce(Configuration) -> Result<(F, U), Error>>,
 		light: impl Iterator<Item = impl FnOnce(Configuration) -> Result<L, Error>>,
-		authorities: impl Iterator<Item = (
-			String,
-			impl FnOnce(Configuration) -> Result<(F, U), Error>
-		)>,
-		base_port: u16
+		authorities: impl Iterator<Item = (String, impl FnOnce(Configuration) -> Result<(F, U), Error>)>,
+		base_port: u16,
 	) -> TestNet<G, E, F, L, U> {
 		sp_tracing::try_init_simple();
 		fdlimit::raise_fd_limit();
@@ -322,7 +308,7 @@ impl<G, E, F, L, U> TestNet<G, E, F, L, U> where
 		temp: &TempDir,
 		full: impl Iterator<Item = impl FnOnce(Configuration) -> Result<(F, U), Error>>,
 		light: impl Iterator<Item = impl FnOnce(Configuration) -> Result<L, Error>>,
-		authorities: impl Iterator<Item = (String, impl FnOnce(Configuration) -> Result<(F, U), Error>)>
+		authorities: impl Iterator<Item = (String, impl FnOnce(Configuration) -> Result<(F, U), Error>)>,
 	) {
 		let executor = self.runtime.executor();
 		let task_executor: TaskExecutor = {
@@ -330,7 +316,8 @@ impl<G, E, F, L, U> TestNet<G, E, F, L, U> where
 			(move |fut: Pin<Box<dyn futures::Future<Output = ()> + Send>>, _| {
 				executor.spawn(fut.unit_error().compat());
 				async {}
-			}).into()
+			})
+			.into()
 		};
 
 		for (key, authority) in authorities {
@@ -344,10 +331,12 @@ impl<G, E, F, L, U> TestNet<G, E, F, L, U> where
 				&temp,
 			);
 			let addr = node_config.network.listen_addresses.iter().next().unwrap().clone();
-			let (service, user_data) = authority(node_config).expect("Error creating test node service");
+			let (service, user_data) =
+				authority(node_config).expect("Error creating test node service");
 
 			executor.spawn(service.clone().map_err(|_| ()));
-			let addr = addr.with(multiaddr::Protocol::P2p(service.network().local_peer_id().clone().into()));
+			let addr = addr
+				.with(multiaddr::Protocol::P2p(service.network().local_peer_id().clone().into()));
 			self.authority_nodes.push((self.nodes, service, user_data, addr));
 			self.nodes += 1;
 		}
@@ -366,7 +355,8 @@ impl<G, E, F, L, U> TestNet<G, E, F, L, U> where
 			let (service, user_data) = full(node_config).expect("Error creating test node service");
 
 			executor.spawn(service.clone().map_err(|_| ()));
-			let addr = addr.with(multiaddr::Protocol::P2p(service.network().local_peer_id().clone().into()));
+			let addr = addr
+				.with(multiaddr::Protocol::P2p(service.network().local_peer_id().clone().into()));
 			self.full_nodes.push((self.nodes, service, user_data, addr));
 			self.nodes += 1;
 		}
@@ -385,7 +375,8 @@ impl<G, E, F, L, U> TestNet<G, E, F, L, U> where
 			let service = light(node_config).expect("Error creating test node service");
 
 			executor.spawn(service.clone().map_err(|_| ()));
-			let addr = addr.with(multiaddr::Protocol::P2p(service.network().local_peer_id().clone().into()));
+			let addr = addr
+				.with(multiaddr::Protocol::P2p(service.network().local_peer_id().clone().into()));
 			self.light_nodes.push((self.nodes, service, addr));
 			self.nodes += 1;
 		}
@@ -393,7 +384,10 @@ impl<G, E, F, L, U> TestNet<G, E, F, L, U> where
 }
 
 fn tempdir_with_prefix(prefix: &str) -> TempDir {
-	tempfile::Builder::new().prefix(prefix).tempdir().expect("Error creating test dir")
+	tempfile::Builder::new()
+		.prefix(prefix)
+		.tempdir()
+		.expect("Error creating test dir")
 }
 
 pub fn connectivity<G, E, Fb, F, Lb, L>(
@@ -420,8 +414,8 @@ pub fn connectivity<G, E, Fb, F, Lb, L>(
 			let mut network = TestNet::new(
 				&temp,
 				spec.clone(),
-				(0..NUM_FULL_NODES).map(|_| { |cfg| full_builder(cfg).map(|s| (s, ())) }),
-				(0..NUM_LIGHT_NODES).map(|_| { |cfg| light_builder(cfg) }),
+				(0..NUM_FULL_NODES).map(|_| |cfg| full_builder(cfg).map(|s| (s, ()))),
+				(0..NUM_LIGHT_NODES).map(|_| |cfg| light_builder(cfg)),
 				// Note: this iterator is empty but we can't just use `iter::empty()`, otherwise
 				// the type of the closure cannot be inferred.
 				(0..0).map(|_| (String::new(), { |cfg| full_builder(cfg).map(|s| (s, ())) })),
@@ -430,11 +424,15 @@ pub fn connectivity<G, E, Fb, F, Lb, L>(
 			info!("Checking star topology");
 			let first_address = network.full_nodes[0].3.clone();
 			for (_, service, _, _) in network.full_nodes.iter().skip(1) {
-				service.network().add_reserved_peer(first_address.to_string())
+				service
+					.network()
+					.add_reserved_peer(first_address.to_string())
 					.expect("Error adding reserved peer");
 			}
 			for (_, service, _) in network.light_nodes.iter() {
-				service.network().add_reserved_peer(first_address.to_string())
+				service
+					.network()
+					.add_reserved_peer(first_address.to_string())
 					.expect("Error adding reserved peer");
 			}
 
@@ -464,8 +462,8 @@ pub fn connectivity<G, E, Fb, F, Lb, L>(
 			let mut network = TestNet::new(
 				&temp,
 				spec,
-				(0..NUM_FULL_NODES).map(|_| { |cfg| full_builder(cfg).map(|s| (s, ())) }),
-				(0..NUM_LIGHT_NODES).map(|_| { |cfg| light_builder(cfg) }),
+				(0..NUM_FULL_NODES).map(|_| |cfg| full_builder(cfg).map(|s| (s, ()))),
+				(0..NUM_LIGHT_NODES).map(|_| |cfg| light_builder(cfg)),
 				// Note: this iterator is empty but we can't just use `iter::empty()`, otherwise
 				// the type of the closure cannot be inferred.
 				(0..0).map(|_| (String::new(), { |cfg| full_builder(cfg).map(|s| (s, ())) })),
@@ -477,14 +475,18 @@ pub fn connectivity<G, E, Fb, F, Lb, L>(
 			for i in 0..max_nodes {
 				if i != 0 {
 					if let Some((_, service, _, node_id)) = network.full_nodes.get(i) {
-						service.network().add_reserved_peer(address.to_string())
+						service
+							.network()
+							.add_reserved_peer(address.to_string())
 							.expect("Error adding reserved peer");
 						address = node_id.clone();
 					}
 				}
 
 				if let Some((_, service, node_id)) = network.light_nodes.get(i) {
-					service.network().add_reserved_peer(address.to_string())
+					service
+						.network()
+						.add_reserved_peer(address.to_string())
 						.expect("Error adding reserved peer");
 					address = node_id.clone();
 				}
@@ -512,7 +514,7 @@ pub fn sync<G, E, Fb, F, Lb, L, B, ExF, U>(
 	full_builder: Fb,
 	light_builder: Lb,
 	mut make_block_and_import: B,
-	mut extrinsic_factory: ExF
+	mut extrinsic_factory: ExF,
 ) where
 	Fb: Fn(Configuration) -> Result<(F, U), Error>,
 	F: TestNetNode,
@@ -532,8 +534,8 @@ pub fn sync<G, E, Fb, F, Lb, L, B, ExF, U>(
 	let mut network = TestNet::new(
 		&temp,
 		spec,
-		(0..NUM_FULL_NODES).map(|_| { |cfg| full_builder(cfg) }),
-		(0..NUM_LIGHT_NODES).map(|_| { |cfg| light_builder(cfg) }),
+		(0..NUM_FULL_NODES).map(|_| |cfg| full_builder(cfg)),
+		(0..NUM_LIGHT_NODES).map(|_| |cfg| light_builder(cfg)),
 		// Note: this iterator is empty but we can't just use `iter::empty()`, otherwise
 		// the type of the closure cannot be inferred.
 		(0..0).map(|_| (String::new(), { |cfg| full_builder(cfg) })),
@@ -542,7 +544,7 @@ pub fn sync<G, E, Fb, F, Lb, L, B, ExF, U>(
 	info!("Checking block sync");
 	let first_address = {
 		let &mut (_, ref first_service, ref mut first_user_data, _) = &mut network.full_nodes[0];
-		for i in 0 .. NUM_BLOCKS {
+		for i in 0..NUM_BLOCKS {
 			if i % 128 == 0 {
 				info!("Generating #{}", i + 1);
 			}
@@ -550,24 +552,29 @@ pub fn sync<G, E, Fb, F, Lb, L, B, ExF, U>(
 			make_block_and_import(&first_service, first_user_data);
 		}
 		let info = network.full_nodes[0].1.client().info();
-		network.full_nodes[0].1.network().new_best_block_imported(info.best_hash, info.best_number);
+		network.full_nodes[0]
+			.1
+			.network()
+			.new_best_block_imported(info.best_hash, info.best_number);
 		network.full_nodes[0].3.clone()
 	};
 
 	info!("Running sync");
 	for (_, service, _, _) in network.full_nodes.iter().skip(1) {
-		service.network().add_reserved_peer(first_address.to_string())
+		service
+			.network()
+			.add_reserved_peer(first_address.to_string())
 			.expect("Error adding reserved peer");
 	}
 	for (_, service, _) in network.light_nodes.iter() {
-		service.network().add_reserved_peer(first_address.to_string())
+		service
+			.network()
+			.add_reserved_peer(first_address.to_string())
 			.expect("Error adding reserved peer");
 	}
 	network.run_until_all_full(
-		|_index, service|
-			service.client().info().best_number == (NUM_BLOCKS as u32).into(),
-		|_index, service|
-			service.client().info().best_number == (NUM_BLOCKS as u32).into(),
+		|_index, service| service.client().info().best_number == (NUM_BLOCKS as u32).into(),
+		|_index, service| service.client().info().best_number == (NUM_BLOCKS as u32).into(),
 	);
 
 	info!("Checking extrinsic propagation");
@@ -577,9 +584,12 @@ pub fn sync<G, E, Fb, F, Lb, L, B, ExF, U>(
 	let extrinsic = extrinsic_factory(&first_service, first_user_data);
 	let source = sc_transaction_pool_api::TransactionSource::External;
 
-	futures::executor::block_on(
-		first_service.transaction_pool().submit_one(&best_block, source, extrinsic)
-	).expect("failed to submit extrinsic");
+	futures::executor::block_on(first_service.transaction_pool().submit_one(
+		&best_block,
+		source,
+		extrinsic,
+	))
+	.expect("failed to submit extrinsic");
 
 	network.run_until_all_full(
 		|_index, service| service.transaction_pool().ready().count() == 1,
@@ -591,7 +601,7 @@ pub fn consensus<G, E, Fb, F, Lb, L>(
 	spec: GenericChainSpec<G, E>,
 	full_builder: Fb,
 	light_builder: Lb,
-	authorities: impl IntoIterator<Item = String>
+	authorities: impl IntoIterator<Item = String>,
 ) where
 	Fb: Fn(Configuration) -> Result<F, Error>,
 	F: TestNetNode,
@@ -607,54 +617,64 @@ pub fn consensus<G, E, Fb, F, Lb, L>(
 	let mut network = TestNet::new(
 		&temp,
 		spec,
-		(0..NUM_FULL_NODES / 2).map(|_| { |cfg| full_builder(cfg).map(|s| (s, ())) }),
-		(0..NUM_LIGHT_NODES / 2).map(|_| { |cfg| light_builder(cfg) }),
-		authorities.into_iter().map(|key| (key, { |cfg| full_builder(cfg).map(|s| (s, ())) })),
+		(0..NUM_FULL_NODES / 2).map(|_| |cfg| full_builder(cfg).map(|s| (s, ()))),
+		(0..NUM_LIGHT_NODES / 2).map(|_| |cfg| light_builder(cfg)),
+		authorities
+			.into_iter()
+			.map(|key| (key, { |cfg| full_builder(cfg).map(|s| (s, ())) })),
 		30600,
 	);
 
 	info!("Checking consensus");
 	let first_address = network.authority_nodes[0].3.clone();
 	for (_, service, _, _) in network.full_nodes.iter() {
-		service.network().add_reserved_peer(first_address.to_string())
+		service
+			.network()
+			.add_reserved_peer(first_address.to_string())
 			.expect("Error adding reserved peer");
 	}
 	for (_, service, _) in network.light_nodes.iter() {
-		service.network().add_reserved_peer(first_address.to_string())
+		service
+			.network()
+			.add_reserved_peer(first_address.to_string())
 			.expect("Error adding reserved peer");
 	}
 	for (_, service, _, _) in network.authority_nodes.iter().skip(1) {
-		service.network().add_reserved_peer(first_address.to_string())
+		service
+			.network()
+			.add_reserved_peer(first_address.to_string())
 			.expect("Error adding reserved peer");
 	}
 	network.run_until_all_full(
-		|_index, service|
-			service.client().info().finalized_number >= (NUM_BLOCKS as u32 / 2).into(),
-		|_index, service|
-			service.client().info().best_number >= (NUM_BLOCKS as u32 / 2).into(),
+		|_index, service| {
+			service.client().info().finalized_number >= (NUM_BLOCKS as u32 / 2).into()
+		},
+		|_index, service| service.client().info().best_number >= (NUM_BLOCKS as u32 / 2).into(),
 	);
 
 	info!("Adding more peers");
 	network.insert_nodes(
 		&temp,
-		(0..NUM_FULL_NODES / 2).map(|_| { |cfg| full_builder(cfg).map(|s| (s, ())) }),
-		(0..NUM_LIGHT_NODES / 2).map(|_| { |cfg| light_builder(cfg) }),
+		(0..NUM_FULL_NODES / 2).map(|_| |cfg| full_builder(cfg).map(|s| (s, ()))),
+		(0..NUM_LIGHT_NODES / 2).map(|_| |cfg| light_builder(cfg)),
 		// Note: this iterator is empty but we can't just use `iter::empty()`, otherwise
 		// the type of the closure cannot be inferred.
 		(0..0).map(|_| (String::new(), { |cfg| full_builder(cfg).map(|s| (s, ())) })),
 	);
 	for (_, service, _, _) in network.full_nodes.iter() {
-		service.network().add_reserved_peer(first_address.to_string())
+		service
+			.network()
+			.add_reserved_peer(first_address.to_string())
 			.expect("Error adding reserved peer");
 	}
 	for (_, service, _) in network.light_nodes.iter() {
-		service.network().add_reserved_peer(first_address.to_string())
+		service
+			.network()
+			.add_reserved_peer(first_address.to_string())
 			.expect("Error adding reserved peer");
 	}
 	network.run_until_all_full(
-		|_index, service|
-			service.client().info().finalized_number >= (NUM_BLOCKS as u32).into(),
-		|_index, service|
-			service.client().info().best_number >= (NUM_BLOCKS as u32).into(),
+		|_index, service| service.client().info().finalized_number >= (NUM_BLOCKS as u32).into(),
+		|_index, service| service.client().info().best_number >= (NUM_BLOCKS as u32).into(),
 	);
 }
diff --git a/client/state-db/src/lib.rs b/client/state-db/src/lib.rs
index 1340442061ab..cdff39895d22 100644
--- a/client/state-db/src/lib.rs
+++ b/client/state-db/src/lib.rs
@@ -44,15 +44,17 @@ mod pruning;
 #[cfg(test)]
 mod test;
 
-use std::fmt;
-use parking_lot::RwLock;
 use codec::Codec;
-use std::collections::{HashMap, hash_map::Entry};
+use log::trace;
 use noncanonical::NonCanonicalOverlay;
+use parity_util_mem::{malloc_size, MallocSizeOf};
+use parking_lot::RwLock;
 use pruning::RefWindow;
-use log::trace;
-use parity_util_mem::{MallocSizeOf, malloc_size};
-use sc_client_api::{StateDbMemoryInfo, MemorySize};
+use sc_client_api::{MemorySize, StateDbMemoryInfo};
+use std::{
+	collections::{hash_map::Entry, HashMap},
+	fmt,
+};
 
 const PRUNING_MODE: &[u8] = b"mode";
 const PRUNING_MODE_ARCHIVE: &[u8] = b"archive";
@@ -63,8 +65,35 @@ const PRUNING_MODE_CONSTRAINED: &[u8] = b"constrained";
 pub type DBValue = Vec<u8>;
 
 /// Basic set of requirements for the Block hash and node key types.
-pub trait Hash: Send + Sync + Sized + Eq + PartialEq + Clone + Default + fmt::Debug + Codec + std::hash::Hash + 'static {}
-impl<T: Send + Sync + Sized + Eq + PartialEq + Clone + Default + fmt::Debug + Codec + std::hash::Hash + 'static> Hash for T {}
+pub trait Hash:
+	Send
+	+ Sync
+	+ Sized
+	+ Eq
+	+ PartialEq
+	+ Clone
+	+ Default
+	+ fmt::Debug
+	+ Codec
+	+ std::hash::Hash
+	+ 'static
+{
+}
+impl<
+		T: Send
+			+ Sync
+			+ Sized
+			+ Eq
+			+ PartialEq
+			+ Clone
+			+ Default
+			+ fmt::Debug
+			+ Codec
+			+ std::hash::Hash
+			+ 'static,
+	> Hash for T
+{
+}
 
 /// Backend database trait. Read-only.
 pub trait MetaDb {
@@ -168,17 +197,14 @@ pub enum PruningMode {
 impl PruningMode {
 	/// Create a mode that keeps given number of blocks.
 	pub fn keep_blocks(n: u32) -> PruningMode {
-		PruningMode::Constrained(Constraints {
-			max_blocks: Some(n),
-			max_mem: None,
-		})
+		PruningMode::Constrained(Constraints { max_blocks: Some(n), max_mem: None })
 	}
 
 	/// Is this an archive (either ArchiveAll or ArchiveCanonical) pruning mode?
 	pub fn is_archive(&self) -> bool {
 		match *self {
 			PruningMode::ArchiveAll | PruningMode::ArchiveCanonical => true,
-			PruningMode::Constrained(_) => false
+			PruningMode::Constrained(_) => false,
 		}
 	}
 
@@ -224,20 +250,12 @@ impl<BlockHash: Hash + MallocSizeOf, Key: Hash + MallocSizeOf> StateDbSync<Block
 
 		let non_canonical: NonCanonicalOverlay<BlockHash, Key> = NonCanonicalOverlay::new(db)?;
 		let pruning: Option<RefWindow<BlockHash, Key>> = match mode {
-			PruningMode::Constrained(Constraints {
-				max_mem: Some(_),
-				..
-			}) => unimplemented!(),
+			PruningMode::Constrained(Constraints { max_mem: Some(_), .. }) => unimplemented!(),
 			PruningMode::Constrained(_) => Some(RefWindow::new(db, ref_counting)?),
 			PruningMode::ArchiveAll | PruningMode::ArchiveCanonical => None,
 		};
 
-		Ok(StateDbSync {
-			mode,
-			non_canonical,
-			pruning,
-			pinned: Default::default(),
-		})
+		Ok(StateDbSync { mode, non_canonical, pruning, pinned: Default::default() })
 	}
 
 	fn check_meta<D: MetaDb>(mode: &PruningMode, db: &D) -> Result<(), Error<D::Error>> {
@@ -270,10 +288,7 @@ impl<BlockHash: Hash + MallocSizeOf, Key: Hash + MallocSizeOf> StateDbSync<Block
 			PruningMode::ArchiveAll => {
 				changeset.deleted.clear();
 				// write changes immediately
-				Ok(CommitSet {
-					data: changeset,
-					meta,
-				})
+				Ok(CommitSet { data: changeset, meta })
 			},
 			PruningMode::Constrained(_) | PruningMode::ArchiveCanonical => {
 				let commit = self.non_canonical.insert(hash, number, parent_hash, changeset);
@@ -281,7 +296,7 @@ impl<BlockHash: Hash + MallocSizeOf, Key: Hash + MallocSizeOf> StateDbSync<Block
 					c.meta.inserted.extend(meta.inserted);
 					c
 				})
-			}
+			},
 		}
 	}
 
@@ -294,11 +309,10 @@ impl<BlockHash: Hash + MallocSizeOf, Key: Hash + MallocSizeOf> StateDbSync<Block
 			return Ok(commit)
 		}
 		match self.non_canonical.canonicalize(&hash, &mut commit) {
-			Ok(()) => {
+			Ok(()) =>
 				if self.mode == PruningMode::ArchiveCanonical {
 					commit.data.deleted.clear();
-				}
-			}
+				},
 			Err(e) => return Err(e),
 		};
 		if let Some(ref mut pruning) = self.pruning {
@@ -319,31 +333,30 @@ impl<BlockHash: Hash + MallocSizeOf, Key: Hash + MallocSizeOf> StateDbSync<Block
 				if self.best_canonical().map(|c| number > c).unwrap_or(true) {
 					!self.non_canonical.have_block(hash)
 				} else {
-					self.pruning
-						.as_ref()
-						.map_or(
-							false,
-							|pruning| number < pruning.pending() || !pruning.have_block(hash),
-						)
+					self.pruning.as_ref().map_or(false, |pruning| {
+						number < pruning.pending() || !pruning.have_block(hash)
+					})
 				}
-			}
+			},
 		}
 	}
 
 	fn prune(&mut self, commit: &mut CommitSet<Key>) {
-		if let (&mut Some(ref mut pruning), &PruningMode::Constrained(ref constraints)) = (&mut self.pruning, &self.mode) {
+		if let (&mut Some(ref mut pruning), &PruningMode::Constrained(ref constraints)) =
+			(&mut self.pruning, &self.mode)
+		{
 			loop {
 				if pruning.window_size() <= constraints.max_blocks.unwrap_or(0) as u64 {
-					break;
+					break
 				}
 
 				if constraints.max_mem.map_or(false, |m| pruning.mem_used() > m) {
-					break;
+					break
 				}
 
 				let pinned = &self.pinned;
 				if pruning.next_hash().map_or(false, |h| pinned.contains_key(&h)) {
-					break;
+					break
 				}
 				pruning.prune_one(commit);
 			}
@@ -355,23 +368,17 @@ impl<BlockHash: Hash + MallocSizeOf, Key: Hash + MallocSizeOf> StateDbSync<Block
 	/// For archive an empty commit set is returned.
 	fn revert_one(&mut self) -> Option<CommitSet<Key>> {
 		match self.mode {
-			PruningMode::ArchiveAll => {
-				Some(CommitSet::default())
-			},
-			PruningMode::ArchiveCanonical | PruningMode::Constrained(_) => {
-				self.non_canonical.revert_one()
-			},
+			PruningMode::ArchiveAll => Some(CommitSet::default()),
+			PruningMode::ArchiveCanonical | PruningMode::Constrained(_) =>
+				self.non_canonical.revert_one(),
 		}
 	}
 
 	fn remove(&mut self, hash: &BlockHash) -> Option<CommitSet<Key>> {
 		match self.mode {
-			PruningMode::ArchiveAll => {
-				Some(CommitSet::default())
-			},
-			PruningMode::ArchiveCanonical | PruningMode::Constrained(_) => {
-				self.non_canonical.remove(hash)
-			},
+			PruningMode::ArchiveAll => Some(CommitSet::default()),
+			PruningMode::ArchiveCanonical | PruningMode::Constrained(_) =>
+				self.non_canonical.remove(hash),
 		}
 	}
 
@@ -392,7 +399,7 @@ impl<BlockHash: Hash + MallocSizeOf, Key: Hash + MallocSizeOf> StateDbSync<Block
 				} else {
 					Err(PinError::InvalidBlock)
 				}
-			}
+			},
 		}
 	}
 
@@ -412,14 +419,18 @@ impl<BlockHash: Hash + MallocSizeOf, Key: Hash + MallocSizeOf> StateDbSync<Block
 		}
 	}
 
-	pub fn get<D: NodeDb, Q: ?Sized>(&self, key: &Q, db: &D) -> Result<Option<DBValue>, Error<D::Error>>
+	pub fn get<D: NodeDb, Q: ?Sized>(
+		&self,
+		key: &Q,
+		db: &D,
+	) -> Result<Option<DBValue>, Error<D::Error>>
 	where
 		Q: AsRef<D::Key>,
 		Key: std::borrow::Borrow<Q>,
 		Q: std::hash::Hash + Eq,
 	{
 		if let Some(value) = self.non_canonical.get(key) {
-			return Ok(Some(value));
+			return Ok(Some(value))
 		}
 		db.get(key.as_ref()).map_err(|e| Error::Db(e))
 	}
@@ -469,9 +480,7 @@ impl<BlockHash: Hash + MallocSizeOf, Key: Hash + MallocSizeOf> StateDb<BlockHash
 		ref_counting: bool,
 		db: &D,
 	) -> Result<StateDb<BlockHash, Key>, Error<D::Error>> {
-		Ok(StateDb {
-			db: RwLock::new(StateDbSync::new(mode, ref_counting, db)?)
-		})
+		Ok(StateDb { db: RwLock::new(StateDbSync::new(mode, ref_counting, db)?) })
 	}
 
 	/// Add a new non-canonical block.
@@ -504,11 +513,15 @@ impl<BlockHash: Hash + MallocSizeOf, Key: Hash + MallocSizeOf> StateDb<BlockHash
 	}
 
 	/// Get a value from non-canonical/pruning overlay or the backing DB.
-	pub fn get<D: NodeDb, Q: ?Sized>(&self, key: &Q, db: &D) -> Result<Option<DBValue>, Error<D::Error>>
-		where
-			Q: AsRef<D::Key>,
-			Key: std::borrow::Borrow<Q>,
-			Q: std::hash::Hash + Eq,
+	pub fn get<D: NodeDb, Q: ?Sized>(
+		&self,
+		key: &Q,
+		db: &D,
+	) -> Result<Option<DBValue>, Error<D::Error>>
+	where
+		Q: AsRef<D::Key>,
+		Key: std::borrow::Borrow<Q>,
+		Q: std::hash::Hash + Eq,
 	{
 		self.db.read().get(key, db)
 	}
@@ -554,10 +567,12 @@ impl<BlockHash: Hash + MallocSizeOf, Key: Hash + MallocSizeOf> StateDb<BlockHash
 
 #[cfg(test)]
 mod tests {
-	use std::io;
+	use crate::{
+		test::{make_changeset, make_db, TestDb},
+		Constraints, PruningMode, StateDb,
+	};
 	use sp_core::H256;
-	use crate::{StateDb, PruningMode, Constraints};
-	use crate::test::{make_db, make_changeset, TestDb};
+	use std::io;
 
 	fn make_test_db(settings: PruningMode) -> (TestDb, StateDb<H256, H256>) {
 		let mut db = make_db(&[91, 921, 922, 93, 94]);
@@ -679,13 +694,13 @@ mod tests {
 		let state_db = StateDb::new(PruningMode::ArchiveAll, false, &db).unwrap();
 		db.commit(
 			&state_db
-			.insert_block::<io::Error>(
-				&H256::from_low_u64_be(0),
-				0,
-				&H256::from_low_u64_be(0),
-				make_changeset(&[], &[]),
-			)
-			.unwrap(),
+				.insert_block::<io::Error>(
+					&H256::from_low_u64_be(0),
+					0,
+					&H256::from_low_u64_be(0),
+					make_changeset(&[], &[]),
+				)
+				.unwrap(),
 		);
 		let new_mode = PruningMode::Constrained(Constraints { max_blocks: Some(2), max_mem: None });
 		let state_db: Result<StateDb<H256, H256>, _> = StateDb::new(new_mode, false, &db);
diff --git a/client/state-db/src/noncanonical.rs b/client/state-db/src/noncanonical.rs
index de6d1bfcf8bb..eff440d3375c 100644
--- a/client/state-db/src/noncanonical.rs
+++ b/client/state-db/src/noncanonical.rs
@@ -22,11 +22,13 @@
 //! All pending changes are kept in memory until next call to `apply_pending` or
 //! `revert_pending`
 
-use std::fmt;
-use std::collections::{HashMap, VecDeque, hash_map::Entry};
-use super::{Error, DBValue, ChangeSet, CommitSet, MetaDb, Hash, to_meta_key};
-use codec::{Encode, Decode};
+use super::{to_meta_key, ChangeSet, CommitSet, DBValue, Error, Hash, MetaDb};
+use codec::{Decode, Encode};
 use log::trace;
+use std::{
+	collections::{hash_map::Entry, HashMap, VecDeque},
+	fmt,
+};
 
 const NON_CANONICAL_JOURNAL: &[u8] = b"noncanonical_journal";
 const LAST_CANONICAL: &[u8] = b"last_canonical";
@@ -40,8 +42,8 @@ pub struct NonCanonicalOverlay<BlockHash: Hash, Key: Hash> {
 	parents: HashMap<BlockHash, BlockHash>,
 	pending_canonicalizations: Vec<BlockHash>,
 	pending_insertions: Vec<BlockHash>,
-	values: HashMap<Key, (u32, DBValue)>, //ref counted
-	//would be deleted but kept around because block is pinned, ref counted.
+	values: HashMap<Key, (u32, DBValue)>, // ref counted
+	// would be deleted but kept around because block is pinned, ref counted.
 	pinned: HashMap<BlockHash, u32>,
 	pinned_insertions: HashMap<BlockHash, (Vec<Key>, u32)>,
 }
@@ -69,10 +71,7 @@ impl<BlockHash: Hash, Key: Hash> OverlayLevel<BlockHash, Key> {
 	}
 
 	fn new() -> OverlayLevel<BlockHash, Key> {
-		OverlayLevel {
-			blocks: Vec::new(),
-			used_indicies: 0,
-		}
+		OverlayLevel { blocks: Vec::new(), used_indicies: 0 }
 	}
 }
 
@@ -98,7 +97,10 @@ struct BlockOverlay<BlockHash: Hash, Key: Hash> {
 	deleted: Vec<Key>,
 }
 
-fn insert_values<Key: Hash>(values: &mut HashMap<Key, (u32, DBValue)>, inserted: Vec<(Key, DBValue)>) {
+fn insert_values<Key: Hash>(
+	values: &mut HashMap<Key, (u32, DBValue)>,
+	inserted: Vec<(Key, DBValue)>,
+) {
 	for (k, v) in inserted {
 		debug_assert!(values.get(&k).map_or(true, |(_, value)| *value == v));
 		let (ref mut counter, _) = values.entry(k).or_insert_with(|| (0, v));
@@ -118,7 +120,7 @@ fn discard_values<Key: Hash>(values: &mut HashMap<Key, (u32, DBValue)>, inserted
 			},
 			Entry::Vacant(_) => {
 				debug_assert!(false, "Trying to discard missing value");
-			}
+			},
 		}
 	}
 }
@@ -142,10 +144,12 @@ fn discard_descendants<BlockHash: Hash, Key: Hash>(
 	};
 	let mut pinned_children = 0;
 	if let Some(level) = first {
-		while let Some(i) = level.blocks.iter().position(|overlay| parents.get(&overlay.hash)
-			.expect("there is a parent entry for each entry in levels; qed")
-			== hash)
-		{
+		while let Some(i) = level.blocks.iter().position(|overlay| {
+			parents
+				.get(&overlay.hash)
+				.expect("there is a parent entry for each entry in levels; qed") ==
+				hash
+		}) {
 			let overlay = level.remove(i);
 			let mut num_pinned = discard_descendants(
 				&mut remainder,
@@ -153,7 +157,7 @@ fn discard_descendants<BlockHash: Hash, Key: Hash>(
 				parents,
 				pinned,
 				pinned_insertions,
-				&overlay.hash
+				&overlay.hash,
 			);
 			if pinned.contains_key(&overlay.hash) {
 				num_pinned += 1;
@@ -175,10 +179,11 @@ fn discard_descendants<BlockHash: Hash, Key: Hash>(
 impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 	/// Creates a new instance. Does not expect any metadata to be present in the DB.
 	pub fn new<D: MetaDb>(db: &D) -> Result<NonCanonicalOverlay<BlockHash, Key>, Error<D::Error>> {
-		let last_canonicalized = db.get_meta(&to_meta_key(LAST_CANONICAL, &()))
-			.map_err(|e| Error::Db(e))?;
+		let last_canonicalized =
+			db.get_meta(&to_meta_key(LAST_CANONICAL, &())).map_err(|e| Error::Db(e))?;
 		let last_canonicalized = last_canonicalized
-			.map(|buffer| <(BlockHash, u64)>::decode(&mut buffer.as_slice())).transpose()?;
+			.map(|buffer| <(BlockHash, u64)>::decode(&mut buffer.as_slice()))
+			.transpose()?;
 		let mut levels = VecDeque::new();
 		let mut parents = HashMap::new();
 		let mut values = HashMap::new();
@@ -189,16 +194,17 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 			block += 1;
 			loop {
 				let mut level = OverlayLevel::new();
-				for index in 0 .. MAX_BLOCKS_PER_LEVEL {
+				for index in 0..MAX_BLOCKS_PER_LEVEL {
 					let journal_key = to_journal_key(block, index);
 					if let Some(record) = db.get_meta(&journal_key).map_err(|e| Error::Db(e))? {
-						let record: JournalRecord<BlockHash, Key> = Decode::decode(&mut record.as_slice())?;
+						let record: JournalRecord<BlockHash, Key> =
+							Decode::decode(&mut record.as_slice())?;
 						let inserted = record.inserted.iter().map(|(k, _)| k.clone()).collect();
 						let overlay = BlockOverlay {
 							hash: record.hash.clone(),
 							journal_index: index,
 							journal_key,
-							inserted: inserted,
+							inserted,
 							deleted: record.deleted,
 						};
 						insert_values(&mut values, record.inserted);
@@ -216,7 +222,7 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 					}
 				}
 				if level.blocks.is_empty() {
-					break;
+					break
 				}
 				levels.push_back(level);
 				block += 1;
@@ -231,38 +237,55 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 			pending_insertions: Default::default(),
 			pinned: Default::default(),
 			pinned_insertions: Default::default(),
-			values: values,
+			values,
 		})
 	}
 
 	/// Insert a new block into the overlay. If inserted on the second level or lover expects parent to be present in the window.
-	pub fn insert<E: fmt::Debug>(&mut self, hash: &BlockHash, number: u64, parent_hash: &BlockHash, changeset: ChangeSet<Key>) -> Result<CommitSet<Key>, Error<E>> {
+	pub fn insert<E: fmt::Debug>(
+		&mut self,
+		hash: &BlockHash,
+		number: u64,
+		parent_hash: &BlockHash,
+		changeset: ChangeSet<Key>,
+	) -> Result<CommitSet<Key>, Error<E>> {
 		let mut commit = CommitSet::default();
 		let front_block_number = self.front_block_number();
 		if self.levels.is_empty() && self.last_canonicalized.is_none() && number > 0 {
 			// assume that parent was canonicalized
 			let last_canonicalized = (parent_hash.clone(), number - 1);
-			commit.meta.inserted.push((to_meta_key(LAST_CANONICAL, &()), last_canonicalized.encode()));
+			commit
+				.meta
+				.inserted
+				.push((to_meta_key(LAST_CANONICAL, &()), last_canonicalized.encode()));
 			self.last_canonicalized = Some(last_canonicalized);
 		} else if self.last_canonicalized.is_some() {
-			if number < front_block_number || number >= front_block_number + self.levels.len() as u64 + 1 {
+			if number < front_block_number ||
+				number >= front_block_number + self.levels.len() as u64 + 1
+			{
 				trace!(target: "state-db", "Failed to insert block {}, current is {} .. {})",
 					number,
 					front_block_number,
 					front_block_number + self.levels.len() as u64,
 				);
-				return Err(Error::InvalidBlockNumber);
+				return Err(Error::InvalidBlockNumber)
 			}
 			// check for valid parent if inserting on second level or higher
 			if number == front_block_number {
-				if !self.last_canonicalized.as_ref().map_or(false, |&(ref h, n)| h == parent_hash && n == number - 1) {
-					return Err(Error::InvalidParent);
+				if !self
+					.last_canonicalized
+					.as_ref()
+					.map_or(false, |&(ref h, n)| h == parent_hash && n == number - 1)
+				{
+					return Err(Error::InvalidParent)
 				}
 			} else if !self.parents.contains_key(&parent_hash) {
-				return Err(Error::InvalidParent);
+				return Err(Error::InvalidParent)
 			}
 		}
-		let level = if self.levels.is_empty() || number == front_block_number + self.levels.len() as u64 {
+		let level = if self.levels.is_empty() ||
+			number == front_block_number + self.levels.len() as u64
+		{
 			self.levels.push_back(OverlayLevel::new());
 			self.levels.back_mut().expect("can't be empty after insertion; qed")
 		} else {
@@ -271,7 +294,7 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 		};
 
 		if level.blocks.len() >= MAX_BLOCKS_PER_LEVEL as usize {
-			return Err(Error::TooManySiblingBlocks);
+			return Err(Error::TooManySiblingBlocks)
 		}
 
 		let index = level.available_index();
@@ -282,7 +305,7 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 			hash: hash.clone(),
 			journal_index: index,
 			journal_key: journal_key.clone(),
-			inserted: inserted,
+			inserted,
 			deleted: changeset.deleted.clone(),
 		};
 		level.push(overlay);
@@ -305,15 +328,24 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 		level_index: usize,
 		discarded_journals: &mut Vec<Vec<u8>>,
 		discarded_blocks: &mut Vec<BlockHash>,
-		hash: &BlockHash
+		hash: &BlockHash,
 	) {
 		if let Some(level) = self.levels.get(level_index) {
 			level.blocks.iter().for_each(|overlay| {
-				let parent = self.parents.get(&overlay.hash).expect("there is a parent entry for each entry in levels; qed").clone();
+				let parent = self
+					.parents
+					.get(&overlay.hash)
+					.expect("there is a parent entry for each entry in levels; qed")
+					.clone();
 				if parent == *hash {
 					discarded_journals.push(overlay.journal_key.clone());
 					discarded_blocks.push(overlay.hash.clone());
-					self.discard_journals(level_index + 1, discarded_journals, discarded_blocks, &overlay.hash);
+					self.discard_journals(
+						level_index + 1,
+						discarded_journals,
+						discarded_blocks,
+						&overlay.hash,
+					);
 				}
 			});
 		}
@@ -326,7 +358,8 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 	pub fn last_canonicalized_block_number(&self) -> Option<u64> {
 		match self.last_canonicalized.as_ref().map(|&(_, n)| n) {
 			Some(n) => Some(n + self.pending_canonicalizations.len() as u64),
-			None if !self.pending_canonicalizations.is_empty() => Some(self.pending_canonicalizations.len() as u64),
+			None if !self.pending_canonicalizations.is_empty() =>
+				Some(self.pending_canonicalizations.len() as u64),
 			_ => None,
 		}
 	}
@@ -351,8 +384,12 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 		commit: &mut CommitSet<Key>,
 	) -> Result<(), Error<E>> {
 		trace!(target: "state-db", "Canonicalizing {:?}", hash);
-		let level = self.levels.get(self.pending_canonicalizations.len()).ok_or_else(|| Error::InvalidBlock)?;
-		let index = level.blocks
+		let level = self
+			.levels
+			.get(self.pending_canonicalizations.len())
+			.ok_or_else(|| Error::InvalidBlock)?;
+		let index = level
+			.blocks
 			.iter()
 			.position(|overlay| overlay.hash == *hash)
 			.ok_or_else(|| Error::InvalidBlock)?;
@@ -365,7 +402,7 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 					self.pending_canonicalizations.len() + 1,
 					&mut discarded_journals,
 					&mut discarded_blocks,
-					&overlay.hash
+					&overlay.hash,
 				);
 			}
 			discarded_journals.push(overlay.journal_key.clone());
@@ -374,13 +411,25 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 
 		// get the one we need to canonicalize
 		let overlay = &level.blocks[index];
-		commit.data.inserted.extend(overlay.inserted.iter()
-			.map(|k| (k.clone(), self.values.get(k).expect("For each key in overlays there's a value in values").1.clone())));
+		commit.data.inserted.extend(overlay.inserted.iter().map(|k| {
+			(
+				k.clone(),
+				self.values
+					.get(k)
+					.expect("For each key in overlays there's a value in values")
+					.1
+					.clone(),
+			)
+		}));
 		commit.data.deleted.extend(overlay.deleted.clone());
 
 		commit.meta.deleted.append(&mut discarded_journals);
-		let canonicalized = (hash.clone(), self.front_block_number() + self.pending_canonicalizations.len() as u64);
-		commit.meta.inserted.push((to_meta_key(LAST_CANONICAL, &()), canonicalized.encode()));
+		let canonicalized =
+			(hash.clone(), self.front_block_number() + self.pending_canonicalizations.len() as u64);
+		commit
+			.meta
+			.inserted
+			.push((to_meta_key(LAST_CANONICAL, &()), canonicalized.encode()));
 		trace!(target: "state-db", "Discarding {} records", commit.meta.deleted.len());
 		self.pending_canonicalizations.push(hash.clone());
 		Ok(())
@@ -391,8 +440,10 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 		let count = self.pending_canonicalizations.len() as u64;
 		for hash in self.pending_canonicalizations.drain(..) {
 			trace!(target: "state-db", "Post canonicalizing {:?}", hash);
-			let level = self.levels.pop_front().expect("Hash validity is checked in `canonicalize`");
-			let index = level.blocks
+			let level =
+				self.levels.pop_front().expect("Hash validity is checked in `canonicalize`");
+			let index = level
+				.blocks
 				.iter()
 				.position(|overlay| overlay.hash == hash)
 				.expect("Hash validity is checked in `canonicalize`");
@@ -415,7 +466,8 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 					pinned_children += 1;
 				}
 				if pinned_children != 0 {
-					self.pinned_insertions.insert(overlay.hash.clone(), (overlay.inserted, pinned_children));
+					self.pinned_insertions
+						.insert(overlay.hash.clone(), (overlay.inserted, pinned_children));
 				} else {
 					self.parents.remove(&overlay.hash);
 					discard_values(&mut self.values, overlay.inserted);
@@ -423,7 +475,10 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 			}
 		}
 		if let Some(hash) = last {
-			let last_canonicalized = (hash, self.last_canonicalized.as_ref().map(|(_, n)| n + count).unwrap_or(count - 1));
+			let last_canonicalized = (
+				hash,
+				self.last_canonicalized.as_ref().map(|(_, n)| n + count).unwrap_or(count - 1),
+			);
 			self.last_canonicalized = Some(last_canonicalized);
 		}
 	}
@@ -435,15 +490,15 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 		Q: std::hash::Hash + Eq,
 	{
 		if let Some((_, value)) = self.values.get(&key) {
-			return Some(value.clone());
+			return Some(value.clone())
 		}
 		None
 	}
 
 	/// Check if the block is in the canonicalization queue.
 	pub fn have_block(&self, hash: &BlockHash) -> bool {
-		(self.parents.contains_key(hash) || self.pending_insertions.contains(hash))
-			&& !self.pending_canonicalizations.contains(hash)
+		(self.parents.contains_key(hash) || self.pending_insertions.contains(hash)) &&
+			!self.pending_canonicalizations.contains(hash)
 	}
 
 	/// Revert a single level. Returns commit set that deletes the journal or `None` if not possible.
@@ -471,13 +526,13 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 			// Check that it does not have any children
 			if (level_index != level_count - 1) && self.parents.values().any(|h| h == hash) {
 				log::debug!(target: "state-db", "Trying to remove block {:?} with children", hash);
-				return None;
+				return None
 			}
 			let overlay = level.remove(index);
 			commit.meta.deleted.push(overlay.journal_key);
 			self.parents.remove(&overlay.hash);
 			discard_values(&mut self.values, overlay.inserted);
-			break;
+			break
 		}
 		if self.levels.back().map_or(false, |l| l.blocks.is_empty()) {
 			self.levels.pop_back();
@@ -494,9 +549,13 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 		for hash in self.pending_insertions.drain(..) {
 			self.parents.remove(&hash);
 			// find a level. When iterating insertions backwards the hash is always last in the level.
-			let level_index =
-				self.levels.iter().position(|level|
-					level.blocks.last().expect("Hash is added in `insert` in reverse order").hash == hash)
+			let level_index = self
+				.levels
+				.iter()
+				.position(|level| {
+					level.blocks.last().expect("Hash is added in `insert` in reverse order").hash ==
+						hash
+				})
 				.expect("Hash is added in insert");
 
 			let overlay_index = self.levels[level_index].blocks.len() - 1;
@@ -526,7 +585,7 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 		if self.pending_insertions.contains(hash) {
 			// Pinning pending state is not implemented. Pending states
 			// won't be pruned for quite some time anyway, so it's not a big deal.
-			return;
+			return
 		}
 		let refs = self.pinned.entry(hash.clone()).or_default();
 		if *refs == 0 {
@@ -576,14 +635,17 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 
 #[cfg(test)]
 mod tests {
-	use std::io;
+	use super::{to_journal_key, NonCanonicalOverlay};
+	use crate::{
+		test::{make_changeset, make_db},
+		ChangeSet, CommitSet, MetaDb,
+	};
 	use sp_core::H256;
-	use super::{NonCanonicalOverlay, to_journal_key};
-	use crate::{ChangeSet, CommitSet, MetaDb};
-	use crate::test::{make_db, make_changeset};
+	use std::io;
 
 	fn contains(overlay: &NonCanonicalOverlay<H256, H256>, key: u64) -> bool {
-		overlay.get(&H256::from_low_u64_be(key)) == Some(H256::from_low_u64_be(key).as_bytes().to_vec())
+		overlay.get(&H256::from_low_u64_be(key)) ==
+			Some(H256::from_low_u64_be(key).as_bytes().to_vec())
 	}
 
 	#[test]
@@ -611,7 +673,9 @@ mod tests {
 		let h1 = H256::random();
 		let h2 = H256::random();
 		let mut overlay = NonCanonicalOverlay::<H256, H256>::new(&db).unwrap();
-		overlay.insert::<io::Error>(&h1, 2, &H256::default(), ChangeSet::default()).unwrap();
+		overlay
+			.insert::<io::Error>(&h1, 2, &H256::default(), ChangeSet::default())
+			.unwrap();
 		overlay.insert::<io::Error>(&h2, 1, &h1, ChangeSet::default()).unwrap();
 	}
 
@@ -622,7 +686,9 @@ mod tests {
 		let h2 = H256::random();
 		let db = make_db(&[]);
 		let mut overlay = NonCanonicalOverlay::<H256, H256>::new(&db).unwrap();
-		overlay.insert::<io::Error>(&h1, 1, &H256::default(), ChangeSet::default()).unwrap();
+		overlay
+			.insert::<io::Error>(&h1, 1, &H256::default(), ChangeSet::default())
+			.unwrap();
 		overlay.insert::<io::Error>(&h2, 3, &h1, ChangeSet::default()).unwrap();
 	}
 
@@ -633,8 +699,12 @@ mod tests {
 		let h1 = H256::random();
 		let h2 = H256::random();
 		let mut overlay = NonCanonicalOverlay::<H256, H256>::new(&db).unwrap();
-		overlay.insert::<io::Error>(&h1, 1, &H256::default(), ChangeSet::default()).unwrap();
-		overlay.insert::<io::Error>(&h2, 2, &H256::default(), ChangeSet::default()).unwrap();
+		overlay
+			.insert::<io::Error>(&h1, 1, &H256::default(), ChangeSet::default())
+			.unwrap();
+		overlay
+			.insert::<io::Error>(&h2, 2, &H256::default(), ChangeSet::default())
+			.unwrap();
 	}
 
 	#[test]
@@ -644,7 +714,9 @@ mod tests {
 		let h2 = H256::random();
 		let db = make_db(&[]);
 		let mut overlay = NonCanonicalOverlay::<H256, H256>::new(&db).unwrap();
-		overlay.insert::<io::Error>(&h1, 1, &H256::default(), ChangeSet::default()).unwrap();
+		overlay
+			.insert::<io::Error>(&h1, 1, &H256::default(), ChangeSet::default())
+			.unwrap();
 		let mut commit = CommitSet::default();
 		overlay.canonicalize::<io::Error>(&h2, &mut commit).unwrap();
 	}
@@ -655,7 +727,9 @@ mod tests {
 		let mut db = make_db(&[1, 2]);
 		let mut overlay = NonCanonicalOverlay::<H256, H256>::new(&db).unwrap();
 		let changeset = make_changeset(&[3, 4], &[2]);
-		let insertion = overlay.insert::<io::Error>(&h1, 1, &H256::default(), changeset.clone()).unwrap();
+		let insertion = overlay
+			.insert::<io::Error>(&h1, 1, &H256::default(), changeset.clone())
+			.unwrap();
 		assert_eq!(insertion.data.inserted.len(), 0);
 		assert_eq!(insertion.data.deleted.len(), 0);
 		assert_eq!(insertion.meta.inserted.len(), 2);
@@ -677,7 +751,11 @@ mod tests {
 		let h2 = H256::random();
 		let mut db = make_db(&[1, 2]);
 		let mut overlay = NonCanonicalOverlay::<H256, H256>::new(&db).unwrap();
-		db.commit(&overlay.insert::<io::Error>(&h1, 10, &H256::default(), make_changeset(&[3, 4], &[2])).unwrap());
+		db.commit(
+			&overlay
+				.insert::<io::Error>(&h1, 10, &H256::default(), make_changeset(&[3, 4], &[2]))
+				.unwrap(),
+		);
 		db.commit(&overlay.insert::<io::Error>(&h2, 11, &h1, make_changeset(&[5], &[3])).unwrap());
 		assert_eq!(db.meta.len(), 3);
 
@@ -693,7 +771,11 @@ mod tests {
 		let h2 = H256::random();
 		let mut db = make_db(&[1, 2]);
 		let mut overlay = NonCanonicalOverlay::<H256, H256>::new(&db).unwrap();
-		db.commit(&overlay.insert::<io::Error>(&h1, 10, &H256::default(), make_changeset(&[3, 4], &[2])).unwrap());
+		db.commit(
+			&overlay
+				.insert::<io::Error>(&h1, 10, &H256::default(), make_changeset(&[3, 4], &[2]))
+				.unwrap(),
+		);
 		db.commit(&overlay.insert::<io::Error>(&h2, 11, &h1, make_changeset(&[5], &[3])).unwrap());
 		let mut commit = CommitSet::default();
 		overlay.canonicalize::<io::Error>(&h1, &mut commit).unwrap();
@@ -768,7 +850,11 @@ mod tests {
 		let mut db = make_db(&[]);
 		let mut overlay = NonCanonicalOverlay::<H256, H256>::new(&db).unwrap();
 		let changeset = make_changeset(&[], &[]);
-		db.commit(&overlay.insert::<io::Error>(&h1, 1, &H256::default(), changeset.clone()).unwrap());
+		db.commit(
+			&overlay
+				.insert::<io::Error>(&h1, 1, &H256::default(), changeset.clone())
+				.unwrap(),
+		);
 		db.commit(&overlay.insert::<io::Error>(&h2, 2, &h1, changeset.clone()).unwrap());
 		overlay.apply_pending();
 		let mut commit = CommitSet::default();
@@ -1035,14 +1121,18 @@ mod tests {
 		let h21 = H256::random();
 		let mut db = make_db(&[]);
 		let mut overlay = NonCanonicalOverlay::<H256, H256>::new(&db).unwrap();
-		db.commit(&overlay.insert::<io::Error>(&root, 10, &H256::default(), make_changeset(&[], &[])).unwrap());
+		db.commit(
+			&overlay
+				.insert::<io::Error>(&root, 10, &H256::default(), make_changeset(&[], &[]))
+				.unwrap(),
+		);
 		db.commit(&overlay.insert::<io::Error>(&h1, 11, &root, make_changeset(&[1], &[])).unwrap());
 		db.commit(&overlay.insert::<io::Error>(&h2, 11, &root, make_changeset(&[2], &[])).unwrap());
 		db.commit(&overlay.insert::<io::Error>(&h11, 12, &h1, make_changeset(&[11], &[])).unwrap());
 		db.commit(&overlay.insert::<io::Error>(&h21, 12, &h2, make_changeset(&[21], &[])).unwrap());
 		let mut commit = CommitSet::default();
 		overlay.canonicalize::<io::Error>(&root, &mut commit).unwrap();
-		overlay.canonicalize::<io::Error>(&h2, &mut commit).unwrap();  // h11 should stay in the DB
+		overlay.canonicalize::<io::Error>(&h2, &mut commit).unwrap(); // h11 should stay in the DB
 		db.commit(&commit);
 		overlay.apply_pending();
 		assert_eq!(overlay.levels.len(), 1);
@@ -1056,7 +1146,7 @@ mod tests {
 		assert!(contains(&overlay, 21));
 
 		let mut commit = CommitSet::default();
-		overlay.canonicalize::<io::Error>(&h21, &mut commit).unwrap();  // h11 should stay in the DB
+		overlay.canonicalize::<io::Error>(&h21, &mut commit).unwrap(); // h11 should stay in the DB
 		db.commit(&commit);
 		overlay.apply_pending();
 		assert!(!contains(&overlay, 21));
@@ -1073,19 +1163,23 @@ mod tests {
 		let h21 = H256::random();
 		let mut db = make_db(&[]);
 		let mut overlay = NonCanonicalOverlay::<H256, H256>::new(&db).unwrap();
-		db.commit(&overlay.insert::<io::Error>(&root, 10, &H256::default(), make_changeset(&[], &[])).unwrap());
+		db.commit(
+			&overlay
+				.insert::<io::Error>(&root, 10, &H256::default(), make_changeset(&[], &[]))
+				.unwrap(),
+		);
 		db.commit(&overlay.insert::<io::Error>(&h1, 11, &root, make_changeset(&[1], &[])).unwrap());
 		db.commit(&overlay.insert::<io::Error>(&h2, 11, &root, make_changeset(&[2], &[])).unwrap());
 		db.commit(&overlay.insert::<io::Error>(&h11, 12, &h1, make_changeset(&[11], &[])).unwrap());
 		db.commit(&overlay.insert::<io::Error>(&h21, 12, &h2, make_changeset(&[21], &[])).unwrap());
 		let mut commit = CommitSet::default();
 		overlay.canonicalize::<io::Error>(&root, &mut commit).unwrap();
-		overlay.canonicalize::<io::Error>(&h2, &mut commit).unwrap();  // h11 should stay in the DB
+		overlay.canonicalize::<io::Error>(&h2, &mut commit).unwrap(); // h11 should stay in the DB
 		db.commit(&commit);
 		overlay.apply_pending();
 
 		// add another block at top level. It should reuse journal index 0 of previously discarded block
-		let h22 = H256::random(); 
+		let h22 = H256::random();
 		db.commit(&overlay.insert::<io::Error>(&h22, 12, &h2, make_changeset(&[22], &[])).unwrap());
 		assert_eq!(overlay.levels[0].blocks[0].journal_index, 1);
 		assert_eq!(overlay.levels[0].blocks[1].journal_index, 0);
@@ -1106,7 +1200,11 @@ mod tests {
 		let h21 = H256::random();
 		let mut db = make_db(&[]);
 		let mut overlay = NonCanonicalOverlay::<H256, H256>::new(&db).unwrap();
-		db.commit(&overlay.insert::<io::Error>(&root, 10, &H256::default(), make_changeset(&[], &[])).unwrap());
+		db.commit(
+			&overlay
+				.insert::<io::Error>(&root, 10, &H256::default(), make_changeset(&[], &[]))
+				.unwrap(),
+		);
 		db.commit(&overlay.insert::<io::Error>(&h1, 11, &root, make_changeset(&[1], &[])).unwrap());
 		db.commit(&overlay.insert::<io::Error>(&h2, 11, &root, make_changeset(&[2], &[])).unwrap());
 		db.commit(&overlay.insert::<io::Error>(&h11, 12, &h1, make_changeset(&[11], &[])).unwrap());
diff --git a/client/state-db/src/pruning.rs b/client/state-db/src/pruning.rs
index 0c682d8954b1..bb0f7f796144 100644
--- a/client/state-db/src/pruning.rs
+++ b/client/state-db/src/pruning.rs
@@ -24,10 +24,10 @@
 //! the death list.
 //! The changes are journaled in the DB.
 
-use std::collections::{HashMap, HashSet, VecDeque};
-use codec::{Encode, Decode};
-use crate::{CommitSet, Error, MetaDb, to_meta_key, Hash};
+use crate::{to_meta_key, CommitSet, Error, Hash, MetaDb};
+use codec::{Decode, Encode};
 use log::{trace, warn};
+use std::collections::{HashMap, HashSet, VecDeque};
 
 const LAST_PRUNED: &[u8] = b"last_pruned";
 const PRUNING_JOURNAL: &[u8] = b"pruning_journal";
@@ -72,9 +72,11 @@ fn to_journal_key(block: u64) -> Vec<u8> {
 }
 
 impl<BlockHash: Hash, Key: Hash> RefWindow<BlockHash, Key> {
-	pub fn new<D: MetaDb>(db: &D, count_insertions: bool) -> Result<RefWindow<BlockHash, Key>, Error<D::Error>> {
-		let last_pruned = db.get_meta(&to_meta_key(LAST_PRUNED, &()))
-			.map_err(|e| Error::Db(e))?;
+	pub fn new<D: MetaDb>(
+		db: &D,
+		count_insertions: bool,
+	) -> Result<RefWindow<BlockHash, Key>, Error<D::Error>> {
+		let last_pruned = db.get_meta(&to_meta_key(LAST_PRUNED, &())).map_err(|e| Error::Db(e))?;
 		let pending_number: u64 = match last_pruned {
 			Some(buffer) => u64::decode(&mut buffer.as_slice())? + 1,
 			None => 0,
@@ -83,7 +85,7 @@ impl<BlockHash: Hash, Key: Hash> RefWindow<BlockHash, Key> {
 		let mut pruning = RefWindow {
 			death_rows: Default::default(),
 			death_index: Default::default(),
-			pending_number: pending_number,
+			pending_number,
 			pending_canonicalizations: 0,
 			pending_prunings: 0,
 			count_insertions,
@@ -94,9 +96,15 @@ impl<BlockHash: Hash, Key: Hash> RefWindow<BlockHash, Key> {
 			let journal_key = to_journal_key(block);
 			match db.get_meta(&journal_key).map_err(|e| Error::Db(e))? {
 				Some(record) => {
-					let record: JournalRecord<BlockHash, Key> = Decode::decode(&mut record.as_slice())?;
+					let record: JournalRecord<BlockHash, Key> =
+						Decode::decode(&mut record.as_slice())?;
 					trace!(target: "state-db", "Pruning journal entry {} ({} inserted, {} deleted)", block, record.inserted.len(), record.deleted.len());
-					pruning.import(&record.hash, journal_key, record.inserted.into_iter(), record.deleted);
+					pruning.import(
+						&record.hash,
+						journal_key,
+						record.inserted.into_iter(),
+						record.deleted,
+					);
 				},
 				None => break,
 			}
@@ -105,7 +113,13 @@ impl<BlockHash: Hash, Key: Hash> RefWindow<BlockHash, Key> {
 		Ok(pruning)
 	}
 
-	fn import<I: IntoIterator<Item=Key>>(&mut self, hash: &BlockHash, journal_key: Vec<u8>, inserted: I, deleted: Vec<Key>) {
+	fn import<I: IntoIterator<Item = Key>>(
+		&mut self,
+		hash: &BlockHash,
+		journal_key: Vec<u8>,
+		inserted: I,
+		deleted: Vec<Key>,
+	) {
 		if self.count_insertions {
 			// remove all re-inserted keys from death rows
 			for k in inserted {
@@ -120,13 +134,11 @@ impl<BlockHash: Hash, Key: Hash> RefWindow<BlockHash, Key> {
 				self.death_index.insert(k.clone(), imported_block);
 			}
 		}
-		self.death_rows.push_back(
-			DeathRow {
-				hash: hash.clone(),
-				deleted: deleted.into_iter().collect(),
-				journal_key: journal_key,
-			}
-		);
+		self.death_rows.push_back(DeathRow {
+			hash: hash.clone(),
+			deleted: deleted.into_iter().collect(),
+			journal_key,
+		});
 	}
 
 	pub fn window_size(&self) -> u64 {
@@ -172,23 +184,27 @@ impl<BlockHash: Hash, Key: Hash> RefWindow<BlockHash, Key> {
 			Default::default()
 		};
 		let deleted = ::std::mem::take(&mut commit.data.deleted);
-		let journal_record = JournalRecord {
-			hash: hash.clone(),
-			inserted,
-			deleted,
-		};
+		let journal_record = JournalRecord { hash: hash.clone(), inserted, deleted };
 		let block = self.pending_number + self.death_rows.len() as u64;
 		let journal_key = to_journal_key(block);
 		commit.meta.inserted.push((journal_key.clone(), journal_record.encode()));
-		self.import(&journal_record.hash, journal_key, journal_record.inserted.into_iter(), journal_record.deleted);
+		self.import(
+			&journal_record.hash,
+			journal_key,
+			journal_record.inserted.into_iter(),
+			journal_record.deleted,
+		);
 		self.pending_canonicalizations += 1;
 	}
 
 	/// Apply all pending changes
 	pub fn apply_pending(&mut self) {
 		self.pending_canonicalizations = 0;
-		for _ in 0 .. self.pending_prunings {
-			let pruned = self.death_rows.pop_front().expect("pending_prunings is always < death_rows.len()");
+		for _ in 0..self.pending_prunings {
+			let pruned = self
+				.death_rows
+				.pop_front()
+				.expect("pending_prunings is always < death_rows.len()");
 			trace!(target: "state-db", "Applying pruning {:?} ({} deleted)", pruned.hash, pruned.deleted.len());
 			if self.count_insertions {
 				for k in pruned.deleted.iter() {
@@ -219,9 +235,11 @@ impl<BlockHash: Hash, Key: Hash> RefWindow<BlockHash, Key> {
 #[cfg(test)]
 mod tests {
 	use super::RefWindow;
+	use crate::{
+		test::{make_commit, make_db, TestDb},
+		CommitSet,
+	};
 	use sp_core::H256;
-	use crate::CommitSet;
-	use crate::test::{make_db, make_commit, TestDb};
 
 	fn check_journal(pruning: &RefWindow<H256, H256>, db: &TestDb) {
 		let restored: RefWindow<H256, H256> = RefWindow::new(db, pruning.count_insertions).unwrap();
@@ -419,5 +437,4 @@ mod tests {
 		assert!(db.data_eq(&make_db(&[1, 3])));
 		assert!(pruning.death_index.is_empty());
 	}
-
 }
diff --git a/client/state-db/src/test.rs b/client/state-db/src/test.rs
index e1bb6d01c37e..ad5ce8e874cc 100644
--- a/client/state-db/src/test.rs
+++ b/client/state-db/src/test.rs
@@ -18,9 +18,9 @@
 
 //! Test utils
 
-use std::collections::HashMap;
+use crate::{ChangeSet, CommitSet, DBValue, MetaDb, NodeDb};
 use sp_core::H256;
-use crate::{DBValue, ChangeSet, CommitSet, MetaDb, NodeDb};
+use std::collections::HashMap;
 
 #[derive(Default, Debug, Clone, PartialEq, Eq)]
 pub struct TestDb {
@@ -67,30 +67,22 @@ pub fn make_changeset(inserted: &[u64], deleted: &[u64]) -> ChangeSet<H256> {
 	ChangeSet {
 		inserted: inserted
 			.iter()
-			.map(|v| {
-				(H256::from_low_u64_be(*v), H256::from_low_u64_be(*v).as_bytes().to_vec())
-			})
+			.map(|v| (H256::from_low_u64_be(*v), H256::from_low_u64_be(*v).as_bytes().to_vec()))
 			.collect(),
 		deleted: deleted.iter().map(|v| H256::from_low_u64_be(*v)).collect(),
 	}
 }
 
 pub fn make_commit(inserted: &[u64], deleted: &[u64]) -> CommitSet<H256> {
-	CommitSet {
-		data: make_changeset(inserted, deleted),
-		meta: ChangeSet::default(),
-	}
+	CommitSet { data: make_changeset(inserted, deleted), meta: ChangeSet::default() }
 }
 
 pub fn make_db(inserted: &[u64]) -> TestDb {
 	TestDb {
 		data: inserted
 			.iter()
-			.map(|v| {
-				(H256::from_low_u64_be(*v), H256::from_low_u64_be(*v).as_bytes().to_vec())
-			})
+			.map(|v| (H256::from_low_u64_be(*v), H256::from_low_u64_be(*v).as_bytes().to_vec()))
 			.collect(),
 		meta: Default::default(),
 	}
 }
-
diff --git a/client/sync-state-rpc/src/lib.rs b/client/sync-state-rpc/src/lib.rs
index 4cb495599554..e786a10cd440 100644
--- a/client/sync-state-rpc/src/lib.rs
+++ b/client/sync-state-rpc/src/lib.rs
@@ -21,16 +21,19 @@
 
 #![deny(unused_crate_dependencies)]
 
-use sp_runtime::traits::{Block as BlockT, NumberFor};
 use sp_blockchain::HeaderBackend;
+use sp_runtime::{
+	generic::BlockId,
+	traits::{Block as BlockT, NumberFor},
+};
 use std::sync::Arc;
-use sp_runtime::generic::BlockId;
 
 use jsonrpc_derive::rpc;
 
 type SharedAuthoritySet<TBl> =
 	sc_finality_grandpa::SharedAuthoritySet<<TBl as BlockT>::Hash, NumberFor<TBl>>;
-type SharedEpochChanges<TBl> = sc_consensus_epochs::SharedEpochChanges<TBl, sc_consensus_babe::Epoch>;
+type SharedEpochChanges<TBl> =
+	sc_consensus_epochs::SharedEpochChanges<TBl, sc_consensus_babe::Epoch>;
 
 #[derive(Debug, thiserror::Error)]
 #[allow(missing_docs)]
@@ -51,11 +54,7 @@ impl<Block: BlockT> From<Error<Block>> for jsonrpc_core::Error {
 			Error::JsonRpc(s) => s,
 			_ => error.to_string(),
 		};
-		jsonrpc_core::Error {
-			message,
-			code:  jsonrpc_core::ErrorCode::ServerError(1),
-			data: None,
-		}
+		jsonrpc_core::Error { message, code: jsonrpc_core::ErrorCode::ServerError(1), data: None }
 	}
 }
 
@@ -64,8 +63,7 @@ impl<Block: BlockT> From<Error<Block>> for jsonrpc_core::Error {
 pub trait SyncStateRpcApi {
 	/// Returns the json-serialized chainspec running the node, with a sync state.
 	#[rpc(name = "sync_state_genSyncSpec", returns = "jsonrpc_core::Value")]
-	fn system_gen_sync_spec(&self, raw: bool)
-		-> jsonrpc_core::Result<jsonrpc_core::Value>;
+	fn system_gen_sync_spec(&self, raw: bool) -> jsonrpc_core::Result<jsonrpc_core::Value>;
 }
 
 /// The handler for sync state RPC calls.
@@ -78,9 +76,9 @@ pub struct SyncStateRpcHandler<TBl: BlockT, TCl> {
 }
 
 impl<TBl, TCl> SyncStateRpcHandler<TBl, TCl>
-	where
-		TBl: BlockT,
-		TCl: HeaderBackend<TBl> + sc_client_api::AuxStore + 'static,
+where
+	TBl: BlockT,
+	TCl: HeaderBackend<TBl> + sc_client_api::AuxStore + 'static,
 {
 	/// Create a new handler.
 	pub fn new(
@@ -90,21 +88,19 @@ impl<TBl, TCl> SyncStateRpcHandler<TBl, TCl>
 		shared_epoch_changes: SharedEpochChanges<TBl>,
 		deny_unsafe: sc_rpc_api::DenyUnsafe,
 	) -> Self {
-		Self {
-			chain_spec, client, shared_authority_set, shared_epoch_changes, deny_unsafe,
-		}
+		Self { chain_spec, client, shared_authority_set, shared_epoch_changes, deny_unsafe }
 	}
 
 	fn build_sync_state(&self) -> Result<sc_chain_spec::LightSyncState<TBl>, Error<TBl>> {
 		let finalized_hash = self.client.info().finalized_hash;
-		let finalized_header = self.client.header(BlockId::Hash(finalized_hash))?
+		let finalized_header = self
+			.client
+			.header(BlockId::Hash(finalized_hash))?
 			.ok_or_else(|| sp_blockchain::Error::MissingHeader(finalized_hash.to_string()))?;
 
-		let finalized_block_weight = sc_consensus_babe::aux_schema::load_block_weight(
-				&*self.client,
-				finalized_hash,
-			)?
-			.ok_or_else(|| Error::LoadingBlockWeightFailed(finalized_hash))?;
+		let finalized_block_weight =
+			sc_consensus_babe::aux_schema::load_block_weight(&*self.client, finalized_hash)?
+				.ok_or_else(|| Error::LoadingBlockWeightFailed(finalized_hash))?;
 
 		Ok(sc_chain_spec::LightSyncState {
 			finalized_block_header: finalized_header,
@@ -116,26 +112,23 @@ impl<TBl, TCl> SyncStateRpcHandler<TBl, TCl>
 }
 
 impl<TBl, TCl> SyncStateRpcApi for SyncStateRpcHandler<TBl, TCl>
-	where
-		TBl: BlockT,
-		TCl: HeaderBackend<TBl> + sc_client_api::AuxStore + 'static,
+where
+	TBl: BlockT,
+	TCl: HeaderBackend<TBl> + sc_client_api::AuxStore + 'static,
 {
-	fn system_gen_sync_spec(&self, raw: bool)
-		-> jsonrpc_core::Result<jsonrpc_core::Value>
-	{
+	fn system_gen_sync_spec(&self, raw: bool) -> jsonrpc_core::Result<jsonrpc_core::Value> {
 		if let Err(err) = self.deny_unsafe.check_if_safe() {
-			return Err(err.into());
+			return Err(err.into())
 		}
 
 		let mut chain_spec = self.chain_spec.cloned_box();
 
-		let sync_state = self.build_sync_state()
-			.map_err(map_error::<TBl,Error<TBl>>)?;
+		let sync_state = self.build_sync_state().map_err(map_error::<TBl, Error<TBl>>)?;
 
 		chain_spec.set_light_sync_state(sync_state.to_serializable());
-		let string = chain_spec.as_json(raw).map_err(map_error::<TBl,_>)?;
+		let string = chain_spec.as_json(raw).map_err(map_error::<TBl, _>)?;
 
-		serde_json::from_str(&string).map_err(|err| map_error::<TBl,_>(err))
+		serde_json::from_str(&string).map_err(|err| map_error::<TBl, _>(err))
 	}
 }
 
diff --git a/client/telemetry/src/endpoints.rs b/client/telemetry/src/endpoints.rs
index fe4fa23974a6..62e618031198 100644
--- a/client/telemetry/src/endpoints.rs
+++ b/client/telemetry/src/endpoints.rs
@@ -25,8 +25,7 @@ use serde::{Deserialize, Deserializer, Serialize};
 /// The URL string can be either a URL or a multiaddress.
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Hash)]
 pub struct TelemetryEndpoints(
-	#[serde(deserialize_with = "url_or_multiaddr_deser")]
-	pub(crate) Vec<(Multiaddr, u8)>,
+	#[serde(deserialize_with = "url_or_multiaddr_deser")] pub(crate) Vec<(Multiaddr, u8)>,
 );
 
 /// Custom deserializer for TelemetryEndpoints, used to convert urls or multiaddr to multiaddr.
@@ -36,21 +35,15 @@ where
 {
 	Vec::<(String, u8)>::deserialize(deserializer)?
 		.iter()
-		.map(|e| {
-			url_to_multiaddr(&e.0)
-				.map_err(serde::de::Error::custom)
-				.map(|m| (m, e.1))
-		})
+		.map(|e| url_to_multiaddr(&e.0).map_err(serde::de::Error::custom).map(|m| (m, e.1)))
 		.collect()
 }
 
 impl TelemetryEndpoints {
 	/// Create a `TelemetryEndpoints` based on a list of `(String, u8)`.
 	pub fn new(endpoints: Vec<(String, u8)>) -> Result<Self, libp2p::multiaddr::Error> {
-		let endpoints: Result<Vec<(Multiaddr, u8)>, libp2p::multiaddr::Error> = endpoints
-			.iter()
-			.map(|e| Ok((url_to_multiaddr(&e.0)?, e.1)))
-			.collect();
+		let endpoints: Result<Vec<(Multiaddr, u8)>, libp2p::multiaddr::Error> =
+			endpoints.iter().map(|e| Ok((url_to_multiaddr(&e.0)?, e.1))).collect();
 		endpoints.map(Self)
 	}
 }
@@ -72,7 +65,7 @@ fn url_to_multiaddr(url: &str) -> Result<Multiaddr, libp2p::multiaddr::Error> {
 
 	// If not, try the `ws://path/url` format.
 	if let Ok(ma) = libp2p::multiaddr::from_url(url) {
-		return Ok(ma);
+		return Ok(ma)
 	}
 
 	// If we have no clue about the format of that string, assume that we were expecting a
@@ -82,8 +75,7 @@ fn url_to_multiaddr(url: &str) -> Result<Multiaddr, libp2p::multiaddr::Error> {
 
 #[cfg(test)]
 mod tests {
-	use super::url_to_multiaddr;
-	use super::TelemetryEndpoints;
+	use super::{url_to_multiaddr, TelemetryEndpoints};
 	use libp2p::Multiaddr;
 
 	#[test]
@@ -96,10 +88,7 @@ mod tests {
 			TelemetryEndpoints::new(endp.clone()).expect("Telemetry endpoint should be valid");
 		let mut res: Vec<(Multiaddr, u8)> = vec![];
 		for (a, b) in endp.iter() {
-			res.push((
-				url_to_multiaddr(a).expect("provided url should be valid"),
-				*b,
-			))
+			res.push((url_to_multiaddr(a).expect("provided url should be valid"), *b))
 		}
 		assert_eq!(telem.0, res);
 	}
diff --git a/client/telemetry/src/lib.rs b/client/telemetry/src/lib.rs
index 842d89d7edf0..5bd839e07495 100644
--- a/client/telemetry/src/lib.rs
+++ b/client/telemetry/src/lib.rs
@@ -41,8 +41,10 @@ use libp2p::Multiaddr;
 use log::{error, warn};
 use parking_lot::Mutex;
 use serde::Serialize;
-use std::collections::HashMap;
-use std::sync::{atomic, Arc};
+use std::{
+	collections::HashMap,
+	sync::{atomic, Arc},
+};
 
 pub use libp2p::wasm_ext::ExtTransport;
 pub use log;
@@ -191,11 +193,7 @@ impl TelemetryWorker {
 		let input = input.expect("the stream is never closed; qed");
 
 		match input {
-			Register::Telemetry {
-				id,
-				endpoints,
-				connection_message,
-			} => {
+			Register::Telemetry { id, endpoints, connection_message } => {
 				let endpoints = endpoints.0;
 
 				let connection_message = match serde_json::to_value(&connection_message) {
@@ -205,10 +203,10 @@ impl TelemetryWorker {
 						obj.insert("id".to_string(), id.into());
 						obj.insert("payload".to_string(), value.into());
 						Some(obj)
-					}
+					},
 					Ok(_) => {
 						unreachable!("ConnectionMessage always serialize to an object; qed")
-					}
+					},
 					Err(err) => {
 						log::error!(
 							target: "telemetry",
@@ -216,7 +214,7 @@ impl TelemetryWorker {
 							err,
 						);
 						None
-					}
+					},
 				};
 
 				for (addr, verbosity) in endpoints {
@@ -225,10 +223,7 @@ impl TelemetryWorker {
 						"Initializing telemetry for: {:?}",
 						addr,
 					);
-					node_map
-						.entry(id.clone())
-						.or_default()
-						.push((verbosity, addr.clone()));
+					node_map.entry(id.clone()).or_default().push((verbosity, addr.clone()));
 
 					let node = node_pool.entry(addr.clone()).or_insert_with(|| {
 						Node::new(transport.clone(), addr.clone(), Vec::new(), Vec::new())
@@ -238,32 +233,27 @@ impl TelemetryWorker {
 
 					pending_connection_notifications.retain(|(addr_b, connection_message)| {
 						if *addr_b == addr {
-							node.telemetry_connection_notifier
-								.push(connection_message.clone());
+							node.telemetry_connection_notifier.push(connection_message.clone());
 							false
 						} else {
 							true
 						}
 					});
 				}
-			}
-			Register::Notifier {
-				addresses,
-				connection_notifier,
-			} => {
+			},
+			Register::Notifier { addresses, connection_notifier } => {
 				for addr in addresses {
 					// If the Node has been initialized, we directly push the connection_notifier.
 					// Otherwise we push it to a queue that will be consumed when the connection
 					// initializes, thus ensuring that the connection notifier will be sent to the
 					// Node when it becomes available.
 					if let Some(node) = node_pool.get_mut(&addr) {
-						node.telemetry_connection_notifier
-							.push(connection_notifier.clone());
+						node.telemetry_connection_notifier.push(connection_notifier.clone());
 					} else {
 						pending_connection_notifications.push((addr, connection_notifier.clone()));
 					}
 				}
-			}
+			},
 		}
 	}
 
@@ -297,12 +287,12 @@ impl TelemetryWorker {
 						message,
 					)),
 			);
-			return;
+			return
 		};
 
 		for (node_max_verbosity, addr) in nodes {
 			if verbosity > *node_max_verbosity {
-				continue;
+				continue
 			}
 
 			if let Some(node) = node_pool.get_mut(&addr) {
@@ -376,11 +366,7 @@ impl Telemetry {
 		let endpoints = self.endpoints.take().ok_or_else(|| Error::TelemetryAlreadyInitialized)?;
 
 		self.register_sender
-			.unbounded_send(Register::Telemetry {
-				id: self.id,
-				endpoints,
-				connection_message,
-			})
+			.unbounded_send(Register::Telemetry { id: self.id, endpoints, connection_message })
 			.map_err(|_| Error::TelemetryWorkerDropped)
 	}
 
@@ -407,12 +393,8 @@ pub struct TelemetryHandle {
 impl TelemetryHandle {
 	/// Send telemetry messages.
 	pub fn send_telemetry(&self, verbosity: VerbosityLevel, payload: TelemetryPayload) {
-		match self
-			.message_sender
-			.lock()
-			.try_send((self.id, verbosity, payload))
-		{
-			Ok(()) => {}
+		match self.message_sender.lock().try_send((self.id, verbosity, payload)) {
+			Ok(()) => {},
 			Err(err) if err.is_full() => log::trace!(
 				target: "telemetry",
 				"Telemetry channel full.",
@@ -461,15 +443,8 @@ impl TelemetryConnectionNotifier {
 
 #[derive(Debug)]
 enum Register {
-	Telemetry {
-		id: Id,
-		endpoints: TelemetryEndpoints,
-		connection_message: ConnectionMessage,
-	},
-	Notifier {
-		addresses: Vec<Multiaddr>,
-		connection_notifier: ConnectionNotifierSender,
-	},
+	Telemetry { id: Id, endpoints: TelemetryEndpoints, connection_message: ConnectionMessage },
+	Notifier { addresses: Vec<Multiaddr>, connection_notifier: ConnectionNotifierSender },
 }
 
 /// Report a telemetry.
diff --git a/client/telemetry/src/node.rs b/client/telemetry/src/node.rs
index 9ac7ada4e5d6..9e5738cb8477 100644
--- a/client/telemetry/src/node.rs
+++ b/client/telemetry/src/node.rs
@@ -17,12 +17,15 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::TelemetryPayload;
-use futures::channel::mpsc;
-use futures::prelude::*;
-use libp2p::core::transport::Transport;
-use libp2p::Multiaddr;
+use futures::{channel::mpsc, prelude::*};
+use libp2p::{core::transport::Transport, Multiaddr};
 use rand::Rng as _;
-use std::{fmt, mem, pin::Pin, task::Context, task::Poll, time::Duration};
+use std::{
+	fmt, mem,
+	pin::Pin,
+	task::{Context, Poll},
+	time::Duration,
+};
 use wasm_timer::Delay;
 
 pub(crate) type ConnectionNotifierSender = mpsc::Sender<()>;
@@ -122,7 +125,7 @@ where
 	) -> Poll<Result<(), TSinkErr>> {
 		while let Some(item) = conn.buf.pop() {
 			if let Err(e) = conn.sink.start_send_unpin(item) {
-				return Poll::Ready(Err(e));
+				return Poll::Ready(Err(e))
 			}
 			futures::ready!(conn.sink.poll_ready_unpin(cx))?;
 		}
@@ -152,25 +155,25 @@ where
 							Poll::Ready(Err(err)) => {
 								log::warn!(target: "telemetry", "⚠️  Disconnected from {}: {:?}", self.addr, err);
 								socket = NodeSocket::wait_reconnect();
-							}
+							},
 							Poll::Ready(Ok(())) => {
 								self.socket = NodeSocket::Connected(conn);
-								return Poll::Ready(Ok(()));
-							}
+								return Poll::Ready(Ok(()))
+							},
 							Poll::Pending => {
 								self.socket = NodeSocket::Connected(conn);
-								return Poll::Pending;
-							}
+								return Poll::Pending
+							},
 						}
-					}
+					},
 					Poll::Ready(Err(err)) => {
 						log::warn!(target: "telemetry", "⚠️  Disconnected from {}: {:?}", self.addr, err);
 						socket = NodeSocket::wait_reconnect();
-					}
+					},
 					Poll::Pending => {
 						self.socket = NodeSocket::Connected(conn);
-						return Poll::Pending;
-					}
+						return Poll::Pending
+					},
 				},
 				NodeSocket::Dialing(mut s) => match Future::poll(Pin::new(&mut s), cx) {
 					Poll::Ready(Ok(sink)) => {
@@ -201,39 +204,39 @@ where
 										err,
 									);
 									None
-								}
+								},
 							})
 							.collect();
 
 						socket = NodeSocket::Connected(NodeSocketConnected { sink, buf });
-					}
+					},
 					Poll::Pending => break NodeSocket::Dialing(s),
 					Poll::Ready(Err(err)) => {
 						log::warn!(target: "telemetry", "❌ Error while dialing {}: {:?}", self.addr, err);
 						socket = NodeSocket::wait_reconnect();
-					}
+					},
 				},
 				NodeSocket::ReconnectNow => match self.transport.clone().dial(self.addr.clone()) {
 					Ok(d) => {
 						log::trace!(target: "telemetry", "Re-dialing {}", self.addr);
 						socket = NodeSocket::Dialing(d);
-					}
+					},
 					Err(err) => {
 						log::warn!(target: "telemetry", "❌ Error while re-dialing {}: {:?}", self.addr, err);
 						socket = NodeSocket::wait_reconnect();
-					}
+					},
 				},
 				NodeSocket::WaitingReconnect(mut s) => {
 					if let Poll::Ready(_) = Future::poll(Pin::new(&mut s), cx) {
 						socket = NodeSocket::ReconnectNow;
 					} else {
-						break NodeSocket::WaitingReconnect(s);
+						break NodeSocket::WaitingReconnect(s)
 					}
-				}
+				},
 				NodeSocket::Poisoned => {
 					log::error!(target: "telemetry", "‼️ Poisoned connection with {}", self.addr);
-					break NodeSocket::Poisoned;
-				}
+					break NodeSocket::Poisoned
+				},
 			}
 		};
 
@@ -250,7 +253,7 @@ where
 				Ok(data) => {
 					log::trace!(target: "telemetry", "Sending {} bytes", data.len());
 					let _ = conn.sink.start_send_unpin(data);
-				}
+				},
 				Err(err) => log::debug!(
 					target: "telemetry",
 					"Could not serialize payload: {}",
@@ -262,7 +265,7 @@ where
 			// A new connection should be started as soon as possible.
 			NodeSocket::ReconnectNow => log::trace!(target: "telemetry", "Reconnecting"),
 			// Waiting before attempting to dial again.
-			NodeSocket::WaitingReconnect(_) => {}
+			NodeSocket::WaitingReconnect(_) => {},
 			// Temporary transition state.
 			NodeSocket::Poisoned => log::trace!(target: "telemetry", "Poisoned"),
 		}
@@ -280,7 +283,7 @@ where
 					log::trace!(target: "telemetry", "[poll_flush] Error: {:?}", e);
 					self.socket = NodeSocket::wait_reconnect();
 					Poll::Ready(Ok(()))
-				}
+				},
 				Poll::Ready(Ok(())) => Poll::Ready(Ok(())),
 				Poll::Pending => Poll::Pending,
 			},
diff --git a/client/telemetry/src/transport.rs b/client/telemetry/src/transport.rs
index 0aed263a7275..2c309be0ffb6 100644
--- a/client/telemetry/src/transport.rs
+++ b/client/telemetry/src/transport.rs
@@ -26,9 +26,7 @@ use libp2p::{
 	core::transport::{timeout::TransportTimeout, OptionalTransport},
 	wasm_ext, Transport,
 };
-use std::io;
-use std::pin::Pin;
-use std::time::Duration;
+use std::{io, pin::Pin, time::Duration};
 
 /// Timeout after which a connection attempt is considered failed. Includes the WebSocket HTTP
 /// upgrading.
@@ -111,7 +109,7 @@ impl<T: AsyncRead> Stream for StreamSink<T> {
 			Ok(n) => {
 				buf.truncate(n);
 				Poll::Ready(Some(Ok(buf)))
-			}
+			},
 			Err(err) => Poll::Ready(Some(Err(err))),
 		}
 	}
@@ -126,7 +124,7 @@ impl<T: AsyncWrite> StreamSink<T> {
 				log::error!(target: "telemetry",
 					"Detected some internal buffering happening in the telemetry");
 				let err = io::Error::new(io::ErrorKind::Other, "Internal buffering detected");
-				return Poll::Ready(Err(err));
+				return Poll::Ready(Err(err))
 			}
 		}
 
diff --git a/client/tracing/proc-macro/src/lib.rs b/client/tracing/proc-macro/src/lib.rs
index 7022d394ed95..e9a4f58705b4 100644
--- a/client/tracing/proc-macro/src/lib.rs
+++ b/client/tracing/proc-macro/src/lib.rs
@@ -113,7 +113,7 @@ pub fn prefix_logs_with(arg: TokenStream, item: TokenStream) -> TokenStream {
 			"missing argument: name of the node. Example: sc_cli::prefix_logs_with(<expr>)",
 		)
 		.to_compile_error()
-		.into();
+		.into()
 	}
 
 	let name = syn::parse_macro_input!(arg as Expr);
@@ -124,12 +124,7 @@ pub fn prefix_logs_with(arg: TokenStream, item: TokenStream) -> TokenStream {
 		Err(e) => return Error::new(Span::call_site(), e).to_compile_error().into(),
 	};
 
-	let ItemFn {
-		attrs,
-		vis,
-		sig,
-		block,
-	} = item_fn;
+	let ItemFn { attrs, vis, sig, block } = item_fn;
 
 	(quote! {
 		#(#attrs)*
diff --git a/client/tracing/src/block/mod.rs b/client/tracing/src/block/mod.rs
index cd5cf1052004..57d648619fbe 100644
--- a/client/tracing/src/block/mod.rs
+++ b/client/tracing/src/block/mod.rs
@@ -16,23 +16,34 @@
 
 //! Utilities for tracing block execution
 
-use std::{collections::HashMap, sync::{Arc, atomic::{AtomicU64, Ordering}}, time::Instant};
+use std::{
+	collections::HashMap,
+	sync::{
+		atomic::{AtomicU64, Ordering},
+		Arc,
+	},
+	time::Instant,
+};
 
 use parking_lot::Mutex;
-use tracing::{Dispatch, dispatcher, Subscriber, Level, span::{Attributes, Record, Id}};
+use tracing::{
+	dispatcher,
+	span::{Attributes, Id, Record},
+	Dispatch, Level, Subscriber,
+};
 
+use crate::{SpanDatum, TraceEvent, Values};
 use sc_client_api::BlockBackend;
 use sc_rpc_server::RPC_MAX_PAYLOAD_DEFAULT;
-use sp_api::{Core, Metadata, ProvideRuntimeApi, Encode};
+use sp_api::{Core, Encode, Metadata, ProvideRuntimeApi};
 use sp_blockchain::HeaderBackend;
+use sp_core::hexdisplay::HexDisplay;
+use sp_rpc::tracing::{BlockTrace, Span, TraceBlockResponse, TraceError};
 use sp_runtime::{
 	generic::BlockId,
 	traits::{Block as BlockT, Header},
 };
-use sp_rpc::tracing::{BlockTrace, Span, TraceError, TraceBlockResponse};
 use sp_tracing::{WASM_NAME_KEY, WASM_TARGET_KEY, WASM_TRACE_IDENTIFIER};
-use sp_core::hexdisplay::HexDisplay;
-use crate::{SpanDatum, TraceEvent, Values};
 
 // Heuristic for average event size in bytes.
 const AVG_EVENT: usize = 600 * 8;
@@ -53,7 +64,7 @@ const BASE_PAYLOAD: usize = 100;
 const DEFAULT_TARGETS: &str = "pallet,frame,state";
 const TRACE_TARGET: &str = "block_trace";
 // The name of a field required for all events.
-const REQUIRED_EVENT_FIELD: &str  = "method";
+const REQUIRED_EVENT_FIELD: &str = "method";
 const MEGABYTE: usize = 1024 * 1024;
 
 /// Tracing Block Result type alias
@@ -69,7 +80,7 @@ pub enum Error {
 	#[error("Missing block component: {0}")]
 	MissingBlockComponent(String),
 	#[error("Dispatch error: {0}")]
-	Dispatch(String)
+	Dispatch(String),
 }
 
 struct BlockSubscriber {
@@ -82,10 +93,7 @@ struct BlockSubscriber {
 impl BlockSubscriber {
 	fn new(targets: &str) -> Self {
 		let next_id = AtomicU64::new(1);
-		let mut targets: Vec<_> = targets
-			.split(',')
-			.map(crate::parse_target)
-			.collect();
+		let mut targets: Vec<_> = targets.split(',').map(crate::parse_target).collect();
 		// Ensure that WASM traces are always enabled
 		// Filtering happens when decoding the actual target / level
 		targets.push((WASM_TRACE_IDENTIFIER.to_owned(), Level::TRACE));
@@ -101,11 +109,11 @@ impl BlockSubscriber {
 impl Subscriber for BlockSubscriber {
 	fn enabled(&self, metadata: &tracing::Metadata<'_>) -> bool {
 		if !metadata.is_span() && !metadata.fields().field(REQUIRED_EVENT_FIELD).is_some() {
-			return false;
+			return false
 		}
 		for (target, level) in &self.targets {
 			if metadata.level() <= level && metadata.target().starts_with(target) {
-				return true;
+				return true
 			}
 		}
 		false
@@ -125,7 +133,7 @@ impl Subscriber for BlockSubscriber {
 			line: attrs.metadata().line().unwrap_or(0),
 			start_time: Instant::now(),
 			values,
-			overall_time: Default::default()
+			overall_time: Default::default(),
 		};
 
 		self.spans.lock().insert(id.clone(), span);
@@ -158,11 +166,9 @@ impl Subscriber for BlockSubscriber {
 		self.events.lock().push(trace_event);
 	}
 
-	fn enter(&self, _id: &Id) {
-	}
+	fn enter(&self, _id: &Id) {}
 
-	fn exit(&self, _span: &Id) {
-	}
+	fn exit(&self, _span: &Id) {}
 }
 
 /// Holds a reference to the client in order to execute the given block.
@@ -179,11 +185,15 @@ pub struct BlockExecutor<Block: BlockT, Client> {
 }
 
 impl<Block, Client> BlockExecutor<Block, Client>
-	where
-		Block: BlockT + 'static,
-		Client: HeaderBackend<Block> + BlockBackend<Block> + ProvideRuntimeApi<Block>
-		+ Send + Sync + 'static,
-		Client::Api: Metadata<Block>,
+where
+	Block: BlockT + 'static,
+	Client: HeaderBackend<Block>
+		+ BlockBackend<Block>
+		+ ProvideRuntimeApi<Block>
+		+ Send
+		+ Sync
+		+ 'static,
+	Client::Api: Metadata<Block>,
 {
 	/// Create a new `BlockExecutor`
 	pub fn new(
@@ -193,7 +203,8 @@ impl<Block, Client> BlockExecutor<Block, Client>
 		storage_keys: Option<String>,
 		rpc_max_payload: Option<usize>,
 	) -> Self {
-		let rpc_max_payload = rpc_max_payload.map(|mb| mb.saturating_mul(MEGABYTE))
+		let rpc_max_payload = rpc_max_payload
+			.map(|mb| mb.saturating_mul(MEGABYTE))
 			.unwrap_or(RPC_MAX_PAYLOAD_DEFAULT);
 		Self { client, block, targets, storage_keys, rpc_max_payload }
 	}
@@ -205,10 +216,14 @@ impl<Block, Client> BlockExecutor<Block, Client>
 		tracing::debug!(target: "state_tracing", "Tracing block: {}", self.block);
 		// Prepare the block
 		let id = BlockId::Hash(self.block);
-		let mut header = self.client.header(id)
+		let mut header = self
+			.client
+			.header(id)
 			.map_err(|e| Error::InvalidBlockId(e))?
 			.ok_or_else(|| Error::MissingBlockComponent("Header not found".to_string()))?;
-		let extrinsics = self.client.block_body(&id)
+		let extrinsics = self
+			.client
+			.block_body(&id)
 			.map_err(|e| Error::InvalidBlockId(e))?
 			.ok_or_else(|| Error::MissingBlockComponent("Extrinsics not found".to_string()))?;
 		tracing::debug!(target: "state_tracing", "Found {} extrinsics", extrinsics.len());
@@ -231,45 +246,46 @@ impl<Block, Client> BlockExecutor<Block, Client>
 			);
 			let _guard = dispatcher_span.enter();
 			if let Err(e) = dispatcher::with_default(&dispatch, || {
-				let span = tracing::info_span!(
-					target: TRACE_TARGET,
-					"trace_block",
-				);
+				let span = tracing::info_span!(target: TRACE_TARGET, "trace_block",);
 				let _enter = span.enter();
 				self.client.runtime_api().execute_block(&parent_id, block)
 			}) {
-				return Err(Error::Dispatch(format!("Failed to collect traces and execute block: {:?}", e).to_string()));
+				return Err(Error::Dispatch(
+					format!("Failed to collect traces and execute block: {:?}", e).to_string(),
+				))
 			}
 		}
 
-		let block_subscriber = dispatch.downcast_ref::<BlockSubscriber>()
-			.ok_or(Error::Dispatch(
-				"Cannot downcast Dispatch to BlockSubscriber after tracing block".to_string()
+		let block_subscriber =
+			dispatch.downcast_ref::<BlockSubscriber>().ok_or(Error::Dispatch(
+				"Cannot downcast Dispatch to BlockSubscriber after tracing block".to_string(),
 			))?;
-		let spans: Vec<_> = block_subscriber.spans
+		let spans: Vec<_> = block_subscriber
+			.spans
 			.lock()
 			.drain()
 			// Patch wasm identifiers
 			.filter_map(|(_, s)| patch_and_filter(SpanDatum::from(s), targets))
 			.collect();
-		let events: Vec<_> = block_subscriber.events
+		let events: Vec<_> = block_subscriber
+			.events
 			.lock()
 			.drain(..)
-			.filter(|e| self.storage_keys
-				.as_ref()
-				.map(|keys| event_key_filter(e, keys))
-				.unwrap_or(false)
-			)
+			.filter(|e| {
+				self.storage_keys
+					.as_ref()
+					.map(|keys| event_key_filter(e, keys))
+					.unwrap_or(false)
+			})
 			.map(|s| s.into())
 			.collect();
 		tracing::debug!(target: "state_tracing", "Captured {} spans and {} events", spans.len(), events.len());
 
 		let approx_payload_size = BASE_PAYLOAD + events.len() * AVG_EVENT + spans.len() * AVG_SPAN;
 		let response = if approx_payload_size > self.rpc_max_payload {
-				TraceBlockResponse::TraceError(TraceError {
-					error:
-						"Payload likely exceeds max payload size of RPC server.".to_string()
-				})
+			TraceBlockResponse::TraceError(TraceError {
+				error: "Payload likely exceeds max payload size of RPC server.".to_string(),
+			})
 		} else {
 			TraceBlockResponse::BlockTrace(BlockTrace {
 				block_hash: block_id_as_string(id),
@@ -286,14 +302,16 @@ impl<Block, Client> BlockExecutor<Block, Client>
 }
 
 fn event_key_filter(event: &TraceEvent, storage_keys: &str) -> bool {
-	event.values.string_values.get("key")
+	event
+		.values
+		.string_values
+		.get("key")
 		.and_then(|key| Some(check_target(storage_keys, key, &event.level)))
 		.unwrap_or(false)
 }
 
 /// Filter out spans that do not match our targets and if the span is from WASM update its `name`
 /// and `target` fields to the WASM values for those fields.
-//
 // The `tracing` crate requires trace metadata to be static. This does not work for wasm code in
 // substrate, as it is regularly updated with new code from on-chain events. The workaround for this
 // is for substrate's WASM tracing wrappers to put the `name` and `target` data in the `values` map
@@ -310,7 +328,7 @@ fn patch_and_filter(mut span: SpanDatum, targets: &str) -> Option<Span> {
 			span.target = t;
 		}
 		if !check_target(targets, &span.target, &span.level) {
-			return None;
+			return None
 		}
 	}
 	Some(span.into())
@@ -320,15 +338,15 @@ fn patch_and_filter(mut span: SpanDatum, targets: &str) -> Option<Span> {
 fn check_target(targets: &str, target: &str, level: &Level) -> bool {
 	for (t, l) in targets.split(',').map(crate::parse_target) {
 		if target.starts_with(t.as_str()) && level <= &l {
-			return true;
+			return true
 		}
 	}
 	false
 }
 
 fn block_id_as_string<T: BlockT>(block_id: BlockId<T>) -> String {
-	 match block_id {
+	match block_id {
 		BlockId::Hash(h) => HexDisplay::from(&h.encode()).to_string(),
-		BlockId::Number(n) =>  HexDisplay::from(&n.encode()).to_string()
+		BlockId::Number(n) => HexDisplay::from(&n.encode()).to_string(),
 	}
 }
diff --git a/client/tracing/src/lib.rs b/client/tracing/src/lib.rs
index 9f02bb96e4f7..bf6e3d780c6e 100644
--- a/client/tracing/src/lib.rs
+++ b/client/tracing/src/lib.rs
@@ -34,8 +34,10 @@ pub mod logging;
 use rustc_hash::FxHashMap;
 use serde::ser::{Serialize, SerializeMap, Serializer};
 use sp_tracing::{WASM_NAME_KEY, WASM_TARGET_KEY, WASM_TRACE_IDENTIFIER};
-use std::fmt;
-use std::time::{Duration, Instant};
+use std::{
+	fmt,
+	time::{Duration, Instant},
+};
 use tracing::{
 	event::Event,
 	field::{Field, Visit},
@@ -43,8 +45,10 @@ use tracing::{
 	subscriber::Subscriber,
 	Level,
 };
-use tracing_subscriber::layer::{Context, Layer};
-use tracing_subscriber::registry::LookupSpan;
+use tracing_subscriber::{
+	layer::{Context, Layer},
+	registry::LookupSpan,
+};
 
 #[doc(hidden)]
 pub use tracing;
@@ -137,10 +141,10 @@ impl Values {
 
 	/// Checks if all individual collections are empty
 	pub fn is_empty(&self) -> bool {
-		self.bool_values.is_empty()
-			&& self.i64_values.is_empty()
-			&& self.u64_values.is_empty()
-			&& self.string_values.is_empty()
+		self.bool_values.is_empty() &&
+			self.i64_values.is_empty() &&
+			self.u64_values.is_empty() &&
+			self.string_values.is_empty()
 	}
 }
 
@@ -162,15 +166,20 @@ impl Visit for Values {
 	}
 
 	fn record_debug(&mut self, field: &Field, value: &dyn std::fmt::Debug) {
-		self.string_values.insert(field.name().to_string(), format!("{:?}", value).to_owned());
+		self.string_values
+			.insert(field.name().to_string(), format!("{:?}", value).to_owned());
 	}
 }
 
 impl Serialize for Values {
 	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-		where S: Serializer,
+	where
+		S: Serializer,
 	{
-		let len = self.bool_values.len() + self.i64_values.len() + self.u64_values.len() + self.string_values.len();
+		let len = self.bool_values.len() +
+			self.i64_values.len() +
+			self.u64_values.len() +
+			self.string_values.len();
 		let mut map = serializer.serialize_map(Some(len))?;
 		for (k, v) in &self.bool_values {
 			map.serialize_entry(k, v)?;
@@ -194,7 +203,12 @@ impl fmt::Display for Values {
 		let i64_iter = self.i64_values.iter().map(|(k, v)| format!("{}={}", k, v));
 		let u64_iter = self.u64_values.iter().map(|(k, v)| format!("{}={}", k, v));
 		let string_iter = self.string_values.iter().map(|(k, v)| format!("{}=\"{}\"", k, v));
-		let values = bool_iter.chain(i64_iter).chain(u64_iter).chain(string_iter).collect::<Vec<String>>().join(", ");
+		let values = bool_iter
+			.chain(i64_iter)
+			.chain(u64_iter)
+			.chain(string_iter)
+			.collect::<Vec<String>>()
+			.join(", ");
 		write!(f, "{}", values)
 	}
 }
@@ -217,16 +231,13 @@ impl ProfilingLayer {
 	/// wasm_tracing indicates whether to enable wasm traces
 	pub fn new_with_handler(trace_handler: Box<dyn TraceHandler>, targets: &str) -> Self {
 		let targets: Vec<_> = targets.split(',').map(|s| parse_target(s)).collect();
-		Self {
-			targets,
-			trace_handler,
-		}
+		Self { targets, trace_handler }
 	}
 
 	fn check_target(&self, target: &str, level: &Level) -> bool {
 		for t in &self.targets {
 			if target.starts_with(t.0.as_str()) && level <= &t.1 {
-				return true;
+				return true
 			}
 		}
 		false
@@ -245,8 +256,8 @@ fn parse_target(s: &str) -> (String, Level) {
 			} else {
 				(target, Level::TRACE)
 			}
-		}
-		None => (s.to_string(), Level::TRACE)
+		},
+		None => (s.to_string(), Level::TRACE),
 	}
 }
 
@@ -329,10 +340,7 @@ where
 			if let Some(mut span_datum) = extensions.remove::<SpanDatum>() {
 				span_datum.overall_time += end_time - span_datum.start_time;
 				if span_datum.name == WASM_TRACE_IDENTIFIER {
-					span_datum
-						.values
-						.bool_values
-						.insert("wasm".to_owned(), true);
+					span_datum.values.bool_values.insert("wasm".to_owned(), true);
 					if let Some(n) = span_datum.values.string_values.remove(WASM_NAME_KEY) {
 						span_datum.name = n;
 					}
@@ -404,13 +412,11 @@ impl TraceHandler for LogTraceHandler {
 
 impl From<TraceEvent> for sp_rpc::tracing::Event {
 	fn from(trace_event: TraceEvent) -> Self {
-		let data = sp_rpc::tracing::Data {
-			string_values: trace_event.values.string_values
-		};
+		let data = sp_rpc::tracing::Data { string_values: trace_event.values.string_values };
 		sp_rpc::tracing::Event {
 			target: trace_event.target,
 			data,
-			parent_id: trace_event.parent_id.map(|id| id.into_u64())
+			parent_id: trace_event.parent_id.map(|id| id.into_u64()),
 		}
 	}
 }
@@ -453,18 +459,12 @@ mod tests {
 	fn setup_subscriber() -> (
 		impl tracing::Subscriber + Send + Sync,
 		Arc<Mutex<Vec<SpanDatum>>>,
-		Arc<Mutex<Vec<TraceEvent>>>
+		Arc<Mutex<Vec<TraceEvent>>>,
 	) {
 		let spans = Arc::new(Mutex::new(Vec::new()));
 		let events = Arc::new(Mutex::new(Vec::new()));
-		let handler = TestTraceHandler {
-			spans: spans.clone(),
-			events: events.clone(),
-		};
-		let layer = ProfilingLayer::new_with_handler(
-			Box::new(handler),
-			"test_target",
-		);
+		let handler = TestTraceHandler { spans: spans.clone(), events: events.clone() };
+		let layer = ProfilingLayer::new_with_handler(Box::new(handler), "test_target");
 		let subscriber = tracing_subscriber::fmt().with_writer(std::io::sink).finish().with(layer);
 		(subscriber, spans, events)
 	}
@@ -542,7 +542,10 @@ mod tests {
 		let _sub_guard = tracing::subscriber::set_default(sub);
 		tracing::event!(target: "test_target", tracing::Level::INFO, "test_event");
 		let mut te1 = events.lock().remove(0);
-		assert_eq!(te1.values.string_values.remove(&"message".to_owned()).unwrap(), "test_event".to_owned());
+		assert_eq!(
+			te1.values.string_values.remove(&"message".to_owned()).unwrap(),
+			"test_event".to_owned()
+		);
 	}
 
 	#[test]
@@ -557,7 +560,7 @@ mod tests {
 		// emit event
 		tracing::event!(target: "test_target", tracing::Level::INFO, "test_event");
 
-		//exit span
+		// exit span
 		drop(_guard1);
 		drop(span1);
 
@@ -596,7 +599,7 @@ mod tests {
 				tracing::event!(target: "test_target", tracing::Level::INFO, "test_event1");
 				for msg in rx.recv() {
 					if msg == false {
-						break;
+						break
 					}
 				}
 				// guard2 and span2 dropped / exited
diff --git a/client/tracing/src/logging/directives.rs b/client/tracing/src/logging/directives.rs
index 0e6d949a4139..5aaeb4d17e7d 100644
--- a/client/tracing/src/logging/directives.rs
+++ b/client/tracing/src/logging/directives.rs
@@ -63,12 +63,7 @@ pub fn reload_filter() -> Result<(), String> {
 	let mut env_filter = EnvFilter::default();
 	if let Some(current_directives) = CURRENT_DIRECTIVES.get() {
 		// Use join and then split in case any directives added together
-		for directive in current_directives
-			.lock()
-			.join(",")
-			.split(',')
-			.map(|d| d.parse())
-		{
+		for directive in current_directives.lock().join(",").split(',').map(|d| d.parse()) {
 			match directive {
 				Ok(dir) => env_filter = env_filter.add_directive(dir),
 				Err(invalid_directive) => {
@@ -77,7 +72,7 @@ pub fn reload_filter() -> Result<(), String> {
 						"Unable to parse directive while setting log filter: {:?}",
 						invalid_directive,
 					);
-				}
+				},
 			}
 		}
 	}
@@ -99,14 +94,9 @@ pub fn reload_filter() -> Result<(), String> {
 ///
 /// Includes substrate defaults and CLI supplied directives.
 pub fn reset_log_filter() -> Result<(), String> {
-	let directive = DEFAULT_DIRECTIVES
-		.get_or_init(|| Mutex::new(Vec::new()))
-		.lock()
-		.clone();
+	let directive = DEFAULT_DIRECTIVES.get_or_init(|| Mutex::new(Vec::new())).lock().clone();
 
-	*CURRENT_DIRECTIVES
-		.get_or_init(|| Mutex::new(Vec::new()))
-		.lock() = directive;
+	*CURRENT_DIRECTIVES.get_or_init(|| Mutex::new(Vec::new())).lock() = directive;
 	reload_filter()
 }
 
diff --git a/client/tracing/src/logging/event_format.rs b/client/tracing/src/logging/event_format.rs
index 5e7a5246cca0..01847bc2b5cb 100644
--- a/client/tracing/src/logging/event_format.rs
+++ b/client/tracing/src/logging/event_format.rs
@@ -79,11 +79,11 @@ where
 			match current_thread.name() {
 				Some(name) => {
 					write!(writer, "{} ", FmtThreadName::new(name))?;
-				}
+				},
 				// fall-back to thread id when name is absent and ids are not enabled
 				None => {
 					write!(writer, "{:0>2?} ", current_thread.id())?;
-				}
+				},
 			}
 		}
 
@@ -98,7 +98,7 @@ where
 				let exts = span.extensions();
 				if let Some(prefix) = exts.get::<super::layers::Prefix>() {
 					write!(writer, "{}", prefix.as_str())?;
-					break;
+					break
 				}
 			}
 		}
@@ -125,11 +125,11 @@ where
 		writer: &mut dyn fmt::Write,
 		event: &Event,
 	) -> fmt::Result {
-		if self.dup_to_stdout && (
-			event.metadata().level() == &Level::INFO ||
-			event.metadata().level() == &Level::WARN ||
-			event.metadata().level() == &Level::ERROR
-		) {
+		if self.dup_to_stdout &&
+			(event.metadata().level() == &Level::INFO ||
+				event.metadata().level() == &Level::WARN ||
+				event.metadata().level() == &Level::ERROR)
+		{
 			let mut out = String::new();
 			self.format_event_custom(CustomFmtContext::FmtContext(ctx), &mut out, event)?;
 			writer.write_str(&out)?;
@@ -271,9 +271,8 @@ where
 	) -> fmt::Result {
 		match self {
 			CustomFmtContext::FmtContext(fmt_ctx) => fmt_ctx.format_fields(writer, fields),
-			CustomFmtContext::ContextWithFormatFields(_ctx, fmt_fields) => {
-				fmt_fields.format_fields(writer, fields)
-			}
+			CustomFmtContext::ContextWithFormatFields(_ctx, fmt_fields) =>
+				fmt_fields.format_fields(writer, fields),
 		}
 	}
 }
@@ -321,11 +320,7 @@ impl<'a> fmt::Write for MaybeColorWriter<'a> {
 impl<'a> MaybeColorWriter<'a> {
 	/// Creates a new instance.
 	fn new(enable_color: bool, inner_writer: &'a mut dyn fmt::Write) -> Self {
-		Self {
-			enable_color,
-			inner_writer,
-			buffer: String::new(),
-		}
+		Self { enable_color, inner_writer, buffer: String::new() }
 	}
 
 	/// Write the buffered content to the `inner_writer`.
diff --git a/client/tracing/src/logging/layers/console_log.rs b/client/tracing/src/logging/layers/console_log.rs
index be992ae81423..77295110c896 100644
--- a/client/tracing/src/logging/layers/console_log.rs
+++ b/client/tracing/src/logging/layers/console_log.rs
@@ -40,11 +40,7 @@ pub struct ConsoleLogLayer<S, N = tracing_subscriber::fmt::format::DefaultFields
 impl<S, T> ConsoleLogLayer<S, tracing_subscriber::fmt::format::DefaultFields, T> {
 	/// Create a new [`ConsoleLogLayer`] using the `EventFormat` provided in argument.
 	pub fn new(event_format: EventFormat<T>) -> Self {
-		Self {
-			event_format,
-			fmt_fields: Default::default(),
-			_inner: std::marker::PhantomData,
-		}
+		Self { event_format, fmt_fields: Default::default(), _inner: std::marker::PhantomData }
 	}
 }
 
@@ -90,11 +86,11 @@ where
 				Ok(buf) => {
 					a = buf;
 					&mut *a
-				}
+				},
 				_ => {
 					b = String::new();
 					&mut b
-				}
+				},
 			};
 
 			if self.format_event(&ctx, &mut buf, event).is_ok() {
diff --git a/client/tracing/src/logging/layers/prefix_layer.rs b/client/tracing/src/logging/layers/prefix_layer.rs
index f35b59e8b9af..2ad786a09223 100644
--- a/client/tracing/src/logging/layers/prefix_layer.rs
+++ b/client/tracing/src/logging/layers/prefix_layer.rs
@@ -42,12 +42,12 @@ where
 					"newly created span with ID {:?} did not exist in the registry; this is a bug!",
 					id
 				);
-				return;
-			}
+				return
+			},
 		};
 
 		if span.name() != PREFIX_LOG_SPAN {
-			return;
+			return
 		}
 
 		let mut extensions = span.extensions_mut();
diff --git a/client/tracing/src/logging/mod.rs b/client/tracing/src/logging/mod.rs
index a3fa3a531b3e..3d3b40a14d9f 100644
--- a/client/tracing/src/logging/mod.rs
+++ b/client/tracing/src/logging/mod.rs
@@ -33,10 +33,9 @@ use std::io;
 use tracing::Subscriber;
 use tracing_subscriber::{
 	filter::LevelFilter,
-	fmt::time::ChronoLocal,
 	fmt::{
-		format, FormatEvent, FormatFields, Formatter, Layer as FmtLayer, MakeWriter,
-		SubscriberBuilder,
+		format, time::ChronoLocal, FormatEvent, FormatFields, Formatter, Layer as FmtLayer,
+		MakeWriter, SubscriberBuilder,
 	},
 	layer::{self, SubscriberExt},
 	registry::LookupSpan,
@@ -153,9 +152,7 @@ where
 	let max_level_hint = Layer::<FmtSubscriber>::max_level_hint(&env_filter);
 	let max_level = to_log_level_filter(max_level_hint);
 
-	tracing_log::LogTracer::builder()
-		.with_max_level(max_level)
-		.init()?;
+	tracing_log::LogTracer::builder().with_max_level(max_level).init()?;
 
 	// If we're only logging `INFO` entries then we'll use a simplified logging format.
 	let simple = match max_level_hint {
@@ -276,23 +273,19 @@ impl LoggerBuilder {
 			}
 		} else {
 			if self.log_reloading {
-				let subscriber = prepare_subscriber(
-					&self.directives,
-					None,
-					self.force_colors,
-					|builder| enable_log_reloading!(builder),
-				)?;
+				let subscriber =
+					prepare_subscriber(&self.directives, None, self.force_colors, |builder| {
+						enable_log_reloading!(builder)
+					})?;
 
 				tracing::subscriber::set_global_default(subscriber)?;
 
 				Ok(())
 			} else {
-				let subscriber = prepare_subscriber(
-					&self.directives,
-					None,
-					self.force_colors,
-					|builder| builder,
-				)?;
+				let subscriber =
+					prepare_subscriber(&self.directives, None, self.force_colors, |builder| {
+						builder
+					})?;
 
 				tracing::subscriber::set_global_default(subscriber)?;
 
@@ -410,12 +403,7 @@ mod tests {
 			.unwrap();
 
 		let output = String::from_utf8(output.stderr).unwrap();
-		assert!(
-			re.is_match(output.trim()),
-			"Expected:\n{}\nGot:\n{}",
-			re,
-			output,
-		);
+		assert!(re.is_match(output.trim()), "Expected:\n{}\nGot:\n{}", re, output,);
 	}
 
 	/// This is not an actual test, it is used by the `prefix_in_log_lines` test.
@@ -460,12 +448,7 @@ mod tests {
 			.unwrap();
 
 		let output = String::from_utf8(output.stderr).unwrap();
-		assert!(
-			re.is_match(output.trim()),
-			"Expected:\n{}\nGot:\n{}",
-			re,
-			output,
-		);
+		assert!(re.is_match(output.trim()), "Expected:\n{}\nGot:\n{}", re, output,);
 	}
 
 	#[test]
@@ -503,18 +486,9 @@ mod tests {
 			eprint!("MAX_LOG_LEVEL={:?}", log::max_level());
 		} else {
 			assert_eq!("MAX_LOG_LEVEL=Info", run_test(None, None));
-			assert_eq!(
-				"MAX_LOG_LEVEL=Trace",
-				run_test(Some("test=trace".into()), None)
-			);
-			assert_eq!(
-				"MAX_LOG_LEVEL=Debug",
-				run_test(Some("test=debug".into()), None)
-			);
-			assert_eq!(
-				"MAX_LOG_LEVEL=Trace",
-				run_test(None, Some("test=info".into()))
-			);
+			assert_eq!("MAX_LOG_LEVEL=Trace", run_test(Some("test=trace".into()), None));
+			assert_eq!("MAX_LOG_LEVEL=Debug", run_test(Some("test=debug".into()), None));
+			assert_eq!("MAX_LOG_LEVEL=Trace", run_test(None, Some("test=info".into())));
 		}
 	}
 }
diff --git a/client/transaction-pool/api/src/error.rs b/client/transaction-pool/api/src/error.rs
index dd2d6401c182..365d6a28d6b9 100644
--- a/client/transaction-pool/api/src/error.rs
+++ b/client/transaction-pool/api/src/error.rs
@@ -18,7 +18,7 @@
 //! Transaction pool errors.
 
 use sp_runtime::transaction_validity::{
-	TransactionPriority as Priority, InvalidTransaction, UnknownTransaction,
+	InvalidTransaction, TransactionPriority as Priority, UnknownTransaction,
 };
 
 /// Transaction pool result.
@@ -52,7 +52,7 @@ pub enum Error {
 		/// Transaction already in the pool.
 		old: Priority,
 		/// Transaction entering the pool.
-		new: Priority
+		new: Priority,
 	},
 	#[error("Transaction with cyclic dependency")]
 	CycleDetected,
@@ -78,9 +78,13 @@ pub trait IntoPoolError: std::error::Error + Send + Sized {
 	/// This implementation is optional and used only to
 	/// provide more descriptive error messages for end users
 	/// of RPC API.
-	fn into_pool_error(self) -> std::result::Result<Error, Self> { Err(self) }
+	fn into_pool_error(self) -> std::result::Result<Error, Self> {
+		Err(self)
+	}
 }
 
 impl IntoPoolError for Error {
-	fn into_pool_error(self) -> std::result::Result<Error, Self> { Ok(self) }
+	fn into_pool_error(self) -> std::result::Result<Error, Self> {
+		Ok(self)
+	}
 }
diff --git a/client/transaction-pool/api/src/lib.rs b/client/transaction-pool/api/src/lib.rs
index 198d67f71d1b..eb9b1b09b899 100644
--- a/client/transaction-pool/api/src/lib.rs
+++ b/client/transaction-pool/api/src/lib.rs
@@ -20,21 +20,16 @@
 
 pub mod error;
 
-use std::{
-	collections::HashMap,
-	hash::Hash,
-	sync::Arc,
-	pin::Pin,
-};
 use futures::{Future, Stream};
 use serde::{Deserialize, Serialize};
+pub use sp_runtime::transaction_validity::{
+	TransactionLongevity, TransactionPriority, TransactionSource, TransactionTag,
+};
 use sp_runtime::{
 	generic::BlockId,
 	traits::{Block as BlockT, Member, NumberFor},
 };
-pub use sp_runtime::transaction_validity::{
-	TransactionLongevity, TransactionPriority, TransactionTag, TransactionSource,
-};
+use std::{collections::HashMap, hash::Hash, pin::Pin, sync::Arc};
 
 /// Transaction pool status.
 #[derive(Debug)]
@@ -63,20 +58,20 @@ impl PoolStatus {
 ///
 /// The status events can be grouped based on their kinds as:
 /// 1. Entering/Moving within the pool:
-///		- `Future`
-///		- `Ready`
+/// 		- `Future`
+/// 		- `Ready`
 /// 2. Inside `Ready` queue:
-///		- `Broadcast`
+/// 		- `Broadcast`
 /// 3. Leaving the pool:
-///		- `InBlock`
-///		- `Invalid`
-///		- `Usurped`
-///		- `Dropped`
-///	4. Re-entering the pool:
-///		- `Retracted`
-///	5. Block finalized:
-///		- `Finalized`
-///		- `FinalityTimeout`
+/// 		- `InBlock`
+/// 		- `Invalid`
+/// 		- `Usurped`
+/// 		- `Dropped`
+/// 	4. Re-entering the pool:
+/// 		- `Retracted`
+/// 	5. Block finalized:
+/// 		- `Finalized`
+/// 		- `FinalityTimeout`
 ///
 /// The events will always be received in the order described above, however
 /// there might be cases where transactions alternate between `Future` and `Ready`
@@ -130,7 +125,8 @@ pub enum TransactionStatus<Hash, BlockHash> {
 }
 
 /// The stream of transaction events.
-pub type TransactionStatusStream<Hash, BlockHash> = dyn Stream<Item=TransactionStatus<Hash, BlockHash>> + Send + Unpin;
+pub type TransactionStatusStream<Hash, BlockHash> =
+	dyn Stream<Item = TransactionStatus<Hash, BlockHash>> + Send + Unpin;
 
 /// The import notification event stream.
 pub type ImportNotificationStream<H> = futures::channel::mpsc::Receiver<H>;
@@ -147,7 +143,7 @@ pub type TransactionStatusStreamFor<P> = TransactionStatusStream<TxHash<P>, Bloc
 pub type LocalTransactionFor<P> = <<P as LocalTransactionPool>::Block as BlockT>::Extrinsic;
 
 /// Typical future type used in transaction pool api.
-pub type PoolFuture<T, E> = std::pin::Pin<Box<dyn Future<Output=Result<T, E>> + Send>>;
+pub type PoolFuture<T, E> = std::pin::Pin<Box<dyn Future<Output = Result<T, E>> + Send>>;
 
 /// In-pool transaction interface.
 ///
@@ -184,7 +180,7 @@ pub trait TransactionPool: Send + Sync {
 	/// In-pool transaction type.
 	type InPoolTransaction: InPoolTransaction<
 		Transaction = TransactionFor<Self>,
-		Hash = TxHash<Self>
+		Hash = TxHash<Self>,
 	>;
 	/// Error type.
 	type Error: From<crate::error::Error> + crate::error::IntoPoolError;
@@ -220,11 +216,18 @@ pub trait TransactionPool: Send + Sync {
 	///
 	/// Guarantees to return only when transaction pool got updated at `at` block.
 	/// Guarantees to return immediately when `None` is passed.
-	fn ready_at(&self, at: NumberFor<Self::Block>)
-		-> Pin<Box<dyn Future<Output=Box<dyn Iterator<Item=Arc<Self::InPoolTransaction>> + Send>> + Send>>;
+	fn ready_at(
+		&self,
+		at: NumberFor<Self::Block>,
+	) -> Pin<
+		Box<
+			dyn Future<Output = Box<dyn Iterator<Item = Arc<Self::InPoolTransaction>> + Send>>
+				+ Send,
+		>,
+	>;
 
 	/// Get an iterator for ready transactions ordered by priority.
-	fn ready(&self) -> Box<dyn Iterator<Item=Arc<Self::InPoolTransaction>> + Send>;
+	fn ready(&self) -> Box<dyn Iterator<Item = Arc<Self::InPoolTransaction>> + Send>;
 
 	// *** Block production
 	/// Remove transactions identified by given hashes (and dependent transactions) from the pool.
@@ -270,7 +273,7 @@ pub enum ChainEvent<B: BlockT> {
 /// Trait for transaction pool maintenance.
 pub trait MaintainedTransactionPool: TransactionPool {
 	/// Perform maintenance
-	fn maintain(&self, event: ChainEvent<Self::Block>) -> Pin<Box<dyn Future<Output=()> + Send>>;
+	fn maintain(&self, event: ChainEvent<Self::Block>) -> Pin<Box<dyn Future<Output = ()> + Send>>;
 }
 
 /// Transaction pool interface for submitting local transactions that exposes a
@@ -306,11 +309,7 @@ pub trait OffchainSubmitTransaction<Block: BlockT>: Send + Sync {
 	/// Submit transaction.
 	///
 	/// The transaction will end up in the pool and be propagated to others.
-	fn submit_at(
-		&self,
-		at: &BlockId<Block>,
-		extrinsic: Block::Extrinsic,
-	) -> Result<(), ()>;
+	fn submit_at(&self, at: &BlockId<Block>, extrinsic: Block::Extrinsic) -> Result<(), ()>;
 }
 
 impl<TPool: LocalTransactionPool> OffchainSubmitTransaction<TPool::Block> for TPool {
diff --git a/client/transaction-pool/benches/basics.rs b/client/transaction-pool/benches/basics.rs
index 6995491ea22c..cf30a0200ad7 100644
--- a/client/transaction-pool/benches/basics.rs
+++ b/client/transaction-pool/benches/basics.rs
@@ -18,18 +18,22 @@
 
 use criterion::{criterion_group, criterion_main, Criterion};
 
-use futures::{future::{ready, Ready}, executor::block_on};
-use sc_transaction_pool::{*, test_helpers::*};
 use codec::Encode;
-use substrate_test_runtime::{Block, Extrinsic, Transfer, H256, AccountId};
+use futures::{
+	executor::block_on,
+	future::{ready, Ready},
+};
+use sc_transaction_pool::{test_helpers::*, *};
+use sp_core::blake2_256;
 use sp_runtime::{
-	generic::BlockId, traits::Block as BlockT,
+	generic::BlockId,
+	traits::Block as BlockT,
 	transaction_validity::{
-		ValidTransaction, InvalidTransaction, TransactionValidity, TransactionTag as Tag,
-		TransactionSource,
+		InvalidTransaction, TransactionSource, TransactionTag as Tag, TransactionValidity,
+		ValidTransaction,
 	},
 };
-use sp_core::blake2_256;
+use substrate_test_runtime::{AccountId, Block, Extrinsic, Transfer, H256};
 
 #[derive(Clone, Debug, Default)]
 struct TestApi {
@@ -65,25 +69,21 @@ impl ChainApi for TestApi {
 		let from = uxt.transfer().from.clone();
 
 		match self.block_id_to_number(at) {
-			Ok(Some(num)) if num > 5 => {
-				return ready(
-					Ok(Err(InvalidTransaction::Stale.into()))
-				)
-			},
+			Ok(Some(num)) if num > 5 => return ready(Ok(Err(InvalidTransaction::Stale.into()))),
 			_ => {},
 		}
 
-		ready(
-			Ok(Ok(ValidTransaction {
-				priority: 4,
-				requires: if nonce > 1 && self.nonce_dependant {
-					vec![to_tag(nonce-1, from.clone())]
-				} else { vec![] },
-				provides: vec![to_tag(nonce, from)],
-				longevity: 10,
-				propagate: true,
-			}))
-		)
+		ready(Ok(Ok(ValidTransaction {
+			priority: 4,
+			requires: if nonce > 1 && self.nonce_dependant {
+				vec![to_tag(nonce - 1, from.clone())]
+			} else {
+				vec![]
+			},
+			provides: vec![to_tag(nonce, from)],
+			longevity: 10,
+			propagate: true,
+		})))
 	}
 
 	fn block_id_to_number(
@@ -156,11 +156,7 @@ fn bench_configured(pool: Pool<TestApi>, number: u64) {
 
 	// Prune all transactions.
 	let block_num = 6;
-	block_on(pool.prune_tags(
-		&BlockId::Number(block_num),
-		tags,
-		vec![],
-	)).expect("Prune failed");
+	block_on(pool.prune_tags(&BlockId::Number(block_num), tags, vec![])).expect("Prune failed");
 
 	// pool is empty
 	assert_eq!(pool.validated_pool().status().ready, 0);
@@ -168,7 +164,6 @@ fn bench_configured(pool: Pool<TestApi>, number: u64) {
 }
 
 fn benchmark_main(c: &mut Criterion) {
-
 	c.bench_function("sequential 50 tx", |b| {
 		b.iter(|| {
 			bench_configured(
diff --git a/client/transaction-pool/src/api.rs b/client/transaction-pool/src/api.rs
index 2eb394f76d55..0d9ec122b87d 100644
--- a/client/transaction-pool/src/api.rs
+++ b/client/transaction-pool/src/api.rs
@@ -18,26 +18,35 @@
 
 //! Chain api required for the transaction pool.
 
-use std::{marker::PhantomData, pin::Pin, sync::Arc};
 use codec::{Decode, Encode};
 use futures::{
-	channel::{oneshot, mpsc}, future::{Future, FutureExt, ready, Ready}, lock::Mutex, SinkExt,
-	StreamExt,
+	channel::{mpsc, oneshot},
+	future::{ready, Future, FutureExt, Ready},
+	lock::Mutex,
+	SinkExt, StreamExt,
 };
+use std::{marker::PhantomData, pin::Pin, sync::Arc};
 
+use prometheus_endpoint::Registry as PrometheusRegistry;
 use sc_client_api::{
-	blockchain::HeaderBackend, light::{Fetcher, RemoteCallRequest, RemoteBodyRequest}, BlockBackend,
+	blockchain::HeaderBackend,
+	light::{Fetcher, RemoteBodyRequest, RemoteCallRequest},
+	BlockBackend,
 };
+use sp_api::{ApiExt, ProvideRuntimeApi};
+use sp_core::traits::SpawnEssentialNamed;
 use sp_runtime::{
-	generic::BlockId, traits::{self, Block as BlockT, BlockIdTo, Header as HeaderT, Hash as HashT},
-	transaction_validity::{TransactionValidity, TransactionSource},
+	generic::BlockId,
+	traits::{self, Block as BlockT, BlockIdTo, Hash as HashT, Header as HeaderT},
+	transaction_validity::{TransactionSource, TransactionValidity},
 };
 use sp_transaction_pool::runtime_api::TaggedTransactionQueue;
-use sp_api::{ProvideRuntimeApi, ApiExt};
-use prometheus_endpoint::Registry as PrometheusRegistry;
-use sp_core::traits::SpawnEssentialNamed;
 
-use crate::{metrics::{ApiMetrics, ApiMetricsExt}, error::{self, Error}, graph};
+use crate::{
+	error::{self, Error},
+	graph,
+	metrics::{ApiMetrics, ApiMetricsExt},
+};
 
 /// The transaction pool logic for full client.
 pub struct FullChainApi<Client, Block> {
@@ -63,7 +72,8 @@ fn spawn_validation_pool_task(
 					Some(task) => task.await,
 				}
 			}
-		}.boxed(),
+		}
+		.boxed(),
 	);
 }
 
@@ -74,18 +84,16 @@ impl<Client, Block> FullChainApi<Client, Block> {
 		prometheus: Option<&PrometheusRegistry>,
 		spawner: &impl SpawnEssentialNamed,
 	) -> Self {
-		let metrics = prometheus.map(ApiMetrics::register).and_then(|r| {
-			match r {
-				Err(err) => {
-					log::warn!(
-						target: "txpool",
-						"Failed to register transaction pool api prometheus metrics: {:?}",
-						err,
-					);
-					None
-				},
-				Ok(api) => Some(Arc::new(api))
-			}
+		let metrics = prometheus.map(ApiMetrics::register).and_then(|r| match r {
+			Err(err) => {
+				log::warn!(
+					target: "txpool",
+					"Failed to register transaction pool api prometheus metrics: {:?}",
+					err,
+				);
+				None
+			},
+			Ok(api) => Some(Arc::new(api)),
 		});
 
 		let (sender, receiver) = mpsc::channel(0);
@@ -106,15 +114,15 @@ impl<Client, Block> FullChainApi<Client, Block> {
 impl<Client, Block> graph::ChainApi for FullChainApi<Client, Block>
 where
 	Block: BlockT,
-	Client: ProvideRuntimeApi<Block> + BlockBackend<Block> + BlockIdTo<Block> + HeaderBackend<Block>,
+	Client:
+		ProvideRuntimeApi<Block> + BlockBackend<Block> + BlockIdTo<Block> + HeaderBackend<Block>,
 	Client: Send + Sync + 'static,
 	Client::Api: TaggedTransactionQueue<Block>,
 {
 	type Block = Block;
 	type Error = error::Error;
-	type ValidationFuture = Pin<
-		Box<dyn Future<Output = error::Result<TransactionValidity>> + Send>
-	>;
+	type ValidationFuture =
+		Pin<Box<dyn Future<Output = error::Result<TransactionValidity>> + Send>>;
 	type BodyFuture = Ready<error::Result<Option<Vec<<Self::Block as BlockT>::Extrinsic>>>>;
 
 	fn block_body(&self, id: &BlockId<Self::Block>) -> Self::BodyFuture {
@@ -136,14 +144,16 @@ where
 		async move {
 			metrics.report(|m| m.validations_scheduled.inc());
 
-			validation_pool.lock()
+			validation_pool
+				.lock()
 				.await
 				.send(
 					async move {
 						let res = validate_transaction_blocking(&*client, &at, source, uxt);
 						let _ = tx.send(res);
 						metrics.report(|m| m.validations_finished.inc());
-					}.boxed()
+					}
+					.boxed(),
 				)
 				.await
 				.map_err(|e| Error::RuntimeApi(format!("Validation pool down: {:?}", e)))?;
@@ -152,30 +162,33 @@ where
 				Ok(r) => r,
 				Err(_) => Err(Error::RuntimeApi("Validation was canceled".into())),
 			}
-		}.boxed()
+		}
+		.boxed()
 	}
 
 	fn block_id_to_number(
 		&self,
 		at: &BlockId<Self::Block>,
 	) -> error::Result<Option<graph::NumberFor<Self>>> {
-		self.client.to_number(at).map_err(|e| Error::BlockIdConversion(format!("{:?}", e)))
+		self.client
+			.to_number(at)
+			.map_err(|e| Error::BlockIdConversion(format!("{:?}", e)))
 	}
 
 	fn block_id_to_hash(
 		&self,
 		at: &BlockId<Self::Block>,
 	) -> error::Result<Option<graph::BlockHash<Self>>> {
-		self.client.to_hash(at).map_err(|e| Error::BlockIdConversion(format!("{:?}", e)))
+		self.client
+			.to_hash(at)
+			.map_err(|e| Error::BlockIdConversion(format!("{:?}", e)))
 	}
 
 	fn hash_and_length(
 		&self,
 		ex: &graph::ExtrinsicFor<Self>,
 	) -> (graph::ExtrinsicHash<Self>, usize) {
-		ex.using_encoded(|x| {
-			(<traits::HashFor::<Block> as traits::Hash>::hash(x), x.len())
-		})
+		ex.using_encoded(|x| (<traits::HashFor<Block> as traits::Hash>::hash(x), x.len()))
 	}
 
 	fn block_header(
@@ -196,7 +209,8 @@ fn validate_transaction_blocking<Client, Block>(
 ) -> error::Result<TransactionValidity>
 where
 	Block: BlockT,
-	Client: ProvideRuntimeApi<Block> + BlockBackend<Block> + BlockIdTo<Block> + HeaderBackend<Block>,
+	Client:
+		ProvideRuntimeApi<Block> + BlockBackend<Block> + BlockIdTo<Block> + HeaderBackend<Block>,
 	Client: Send + Sync + 'static,
 	Client::Api: TaggedTransactionQueue<Block>,
 {
@@ -257,7 +271,8 @@ where
 impl<Client, Block> FullChainApi<Client, Block>
 where
 	Block: BlockT,
-	Client: ProvideRuntimeApi<Block> + BlockBackend<Block> + BlockIdTo<Block> + HeaderBackend<Block>,
+	Client:
+		ProvideRuntimeApi<Block> + BlockBackend<Block> + BlockIdTo<Block> + HeaderBackend<Block>,
 	Client: Send + Sync + 'static,
 	Client::Api: TaggedTransactionQueue<Block>,
 {
@@ -285,30 +300,25 @@ pub struct LightChainApi<Client, F, Block> {
 impl<Client, F, Block> LightChainApi<Client, F, Block> {
 	/// Create new transaction pool logic.
 	pub fn new(client: Arc<Client>, fetcher: Arc<F>) -> Self {
-		LightChainApi {
-			client,
-			fetcher,
-			_phantom: Default::default(),
-		}
+		LightChainApi { client, fetcher, _phantom: Default::default() }
 	}
 }
 
-impl<Client, F, Block> graph::ChainApi for
-	LightChainApi<Client, F, Block> where
-		Block: BlockT,
-		Client: HeaderBackend<Block> + 'static,
-		F: Fetcher<Block> + 'static,
+impl<Client, F, Block> graph::ChainApi for LightChainApi<Client, F, Block>
+where
+	Block: BlockT,
+	Client: HeaderBackend<Block> + 'static,
+	F: Fetcher<Block> + 'static,
 {
 	type Block = Block;
 	type Error = error::Error;
-	type ValidationFuture = Box<
-		dyn Future<Output = error::Result<TransactionValidity>> + Send + Unpin
-	>;
+	type ValidationFuture =
+		Box<dyn Future<Output = error::Result<TransactionValidity>> + Send + Unpin>;
 	type BodyFuture = Pin<
 		Box<
 			dyn Future<Output = error::Result<Option<Vec<<Self::Block as BlockT>::Extrinsic>>>>
-				+ Send
-		>
+				+ Send,
+		>,
 	>;
 
 	fn validate_transaction(
@@ -318,9 +328,11 @@ impl<Client, F, Block> graph::ChainApi for
 		uxt: graph::ExtrinsicFor<Self>,
 	) -> Self::ValidationFuture {
 		let header_hash = self.client.expect_block_hash_from_id(at);
-		let header_and_hash = header_hash
-			.and_then(|header_hash| self.client.expect_header(BlockId::Hash(header_hash))
-				.map(|header| (header_hash, header)));
+		let header_and_hash = header_hash.and_then(|header_hash| {
+			self.client
+				.expect_header(BlockId::Hash(header_hash))
+				.map(|header| (header_hash, header))
+		});
 		let (block, header) = match header_and_hash {
 			Ok((header_hash, header)) => (header_hash, header),
 			Err(err) => return Box::new(ready(Err(err.into()))),
@@ -333,13 +345,12 @@ impl<Client, F, Block> graph::ChainApi for
 			retry_count: None,
 		});
 		let remote_validation_request = remote_validation_request.then(move |result| {
-			let result: error::Result<TransactionValidity> = result
-				.map_err(Into::into)
-				.and_then(|result| Decode::decode(&mut &result[..])
-					.map_err(|e| Error::RuntimeApi(
-						format!("Error decoding tx validation result: {:?}", e)
-					))
-				);
+			let result: error::Result<TransactionValidity> =
+				result.map_err(Into::into).and_then(|result| {
+					Decode::decode(&mut &result[..]).map_err(|e| {
+						Error::RuntimeApi(format!("Error decoding tx validation result: {:?}", e))
+					})
+				});
 			ready(result)
 		});
 
@@ -364,30 +375,26 @@ impl<Client, F, Block> graph::ChainApi for
 		&self,
 		ex: &graph::ExtrinsicFor<Self>,
 	) -> (graph::ExtrinsicHash<Self>, usize) {
-		ex.using_encoded(|x| {
-			(<<Block::Header as HeaderT>::Hashing as HashT>::hash(x), x.len())
-		})
+		ex.using_encoded(|x| (<<Block::Header as HeaderT>::Hashing as HashT>::hash(x), x.len()))
 	}
 
 	fn block_body(&self, id: &BlockId<Self::Block>) -> Self::BodyFuture {
-		let header = self.client.header(*id)
+		let header = self
+			.client
+			.header(*id)
 			.and_then(|h| h.ok_or_else(|| sp_blockchain::Error::UnknownBlock(format!("{}", id))));
 		let header = match header {
 			Ok(header) => header,
 			Err(err) => {
 				log::warn!(target: "txpool", "Failed to query header: {:?}", err);
-				return Box::pin(ready(Ok(None)));
-			}
+				return Box::pin(ready(Ok(None)))
+			},
 		};
 
 		let fetcher = self.fetcher.clone();
 		async move {
-			let transactions = fetcher.remote_body({
-					RemoteBodyRequest {
-						header,
-						retry_count: None,
-					}
-				})
+			let transactions = fetcher
+				.remote_body(RemoteBodyRequest { header, retry_count: None })
 				.await
 				.unwrap_or_else(|e| {
 					log::warn!(target: "txpool", "Failed to fetch block body: {:?}", e);
@@ -395,7 +402,8 @@ impl<Client, F, Block> graph::ChainApi for
 				});
 
 			Ok(Some(transactions))
-		}.boxed()
+		}
+		.boxed()
 	}
 
 	fn block_header(
diff --git a/client/transaction-pool/src/error.rs b/client/transaction-pool/src/error.rs
index 23afab0c74a7..b14e0569f083 100644
--- a/client/transaction-pool/src/error.rs
+++ b/client/transaction-pool/src/error.rs
@@ -40,7 +40,6 @@ pub enum Error {
 	RuntimeApi(String),
 }
 
-
 impl sc_transaction_pool_api::error::IntoPoolError for Error {
 	fn into_pool_error(self) -> std::result::Result<TxPoolError, Self> {
 		match self {
diff --git a/client/transaction-pool/src/graph/base_pool.rs b/client/transaction-pool/src/graph/base_pool.rs
index db5927ea0c99..86433bea4928 100644
--- a/client/transaction-pool/src/graph/base_pool.rs
+++ b/client/transaction-pool/src/graph/base_pool.rs
@@ -20,24 +20,19 @@
 //!
 //! For a more full-featured pool, have a look at the `pool` module.
 
-use std::{
-	collections::HashSet,
-	fmt,
-	hash,
-	sync::Arc,
-};
+use std::{collections::HashSet, fmt, hash, sync::Arc};
 
-use log::{trace, debug, warn};
+use log::{debug, trace, warn};
+use sc_transaction_pool_api::{error, InPoolTransaction, PoolStatus};
 use serde::Serialize;
 use sp_core::hexdisplay::HexDisplay;
-use sp_runtime::traits::Member;
-use sp_runtime::transaction_validity::{
-	TransactionTag as Tag,
-	TransactionLongevity as Longevity,
-	TransactionPriority as Priority,
-	TransactionSource as Source,
+use sp_runtime::{
+	traits::Member,
+	transaction_validity::{
+		TransactionLongevity as Longevity, TransactionPriority as Priority,
+		TransactionSource as Source, TransactionTag as Tag,
+	},
 };
-use sc_transaction_pool_api::{error, PoolStatus, InPoolTransaction};
 
 use super::{
 	future::{FutureTransactions, WaitingTransaction},
@@ -62,7 +57,7 @@ pub enum Imported<Hash, Ex> {
 	Future {
 		/// Hash of transaction that was successfully imported.
 		hash: Hash,
-	}
+	},
 }
 
 impl<Hash, Ex> Imported<Hash, Ex> {
@@ -133,7 +128,7 @@ impl<Hash, Extrinsic> InPoolTransaction for Transaction<Hash, Extrinsic> {
 		&self.priority
 	}
 
-	fn longevity(&self) ->&Longevity {
+	fn longevity(&self) -> &Longevity {
 		&self.valid_till
 	}
 
@@ -171,13 +166,17 @@ impl<Hash: Clone, Extrinsic: Clone> Transaction<Hash, Extrinsic> {
 	}
 }
 
-impl<Hash, Extrinsic> fmt::Debug for Transaction<Hash, Extrinsic> where
+impl<Hash, Extrinsic> fmt::Debug for Transaction<Hash, Extrinsic>
+where
 	Hash: fmt::Debug,
 	Extrinsic: fmt::Debug,
 {
 	fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
 		let join_tags = |tags: &[Tag]| {
-			tags.iter().map(|tag| HexDisplay::from(tag).to_string()).collect::<Vec<_>>().join(", ")
+			tags.iter()
+				.map(|tag| HexDisplay::from(tag).to_string())
+				.collect::<Vec<_>>()
+				.join(", ")
 		};
 
 		write!(fmt, "Transaction {{ ")?;
@@ -245,7 +244,10 @@ impl<Hash: hash::Hash + Member + Serialize, Ex: std::fmt::Debug> BasePool<Hash,
 	///
 	/// The closure accepts the mutable reference to the pool and original value
 	/// of the `reject_future_transactions` flag.
-	pub(crate) fn with_futures_enabled<T>(&mut self, closure: impl FnOnce(&mut Self, bool) -> T) -> T {
+	pub(crate) fn with_futures_enabled<T>(
+		&mut self,
+		closure: impl FnOnce(&mut Self, bool) -> T,
+	) -> T {
 		let previous = self.reject_future_transactions;
 		self.reject_future_transactions = false;
 		let return_value = closure(self, previous);
@@ -265,19 +267,12 @@ impl<Hash: hash::Hash + Member + Serialize, Ex: std::fmt::Debug> BasePool<Hash,
 	/// other transactions in the pool.
 	/// The latter contains transactions that have all the requirements satisfied and are
 	/// ready to be included in the block.
-	pub fn import(
-		&mut self,
-		tx: Transaction<Hash, Ex>,
-	) -> error::Result<Imported<Hash, Ex>> {
+	pub fn import(&mut self, tx: Transaction<Hash, Ex>) -> error::Result<Imported<Hash, Ex>> {
 		if self.is_imported(&tx.hash) {
 			return Err(error::Error::AlreadyImported(Box::new(tx.hash)))
 		}
 
-		let tx = WaitingTransaction::new(
-			tx,
-			self.ready.provided_tags(),
-			&self.recently_pruned,
-		);
+		let tx = WaitingTransaction::new(tx, self.ready.provided_tags(), &self.recently_pruned);
 		trace!(target: "txpool", "[{:?}] {:?}", tx.transaction.hash, tx);
 		debug!(
 			target: "txpool",
@@ -289,12 +284,12 @@ impl<Hash: hash::Hash + Member + Serialize, Ex: std::fmt::Debug> BasePool<Hash,
 		// If all tags are not satisfied import to future.
 		if !tx.is_ready() {
 			if self.reject_future_transactions {
-				return Err(error::Error::RejectedFutureTransaction);
+				return Err(error::Error::RejectedFutureTransaction)
 			}
 
 			let hash = tx.transaction.hash.clone();
 			self.future.import(tx);
-			return Ok(Imported::Future { hash });
+			return Ok(Imported::Future { hash })
 		}
 
 		self.import_to_ready(tx)
@@ -303,7 +298,10 @@ impl<Hash: hash::Hash + Member + Serialize, Ex: std::fmt::Debug> BasePool<Hash,
 	/// Imports transaction to ready queue.
 	///
 	/// NOTE the transaction has to have all requirements satisfied.
-	fn import_to_ready(&mut self, tx: WaitingTransaction<Hash, Ex>) -> error::Result<Imported<Hash, Ex>> {
+	fn import_to_ready(
+		&mut self,
+		tx: WaitingTransaction<Hash, Ex>,
+	) -> error::Result<Imported<Hash, Ex>> {
 		let hash = tx.transaction.hash.clone();
 		let mut promoted = vec![];
 		let mut failed = vec![];
@@ -328,12 +326,13 @@ impl<Hash: hash::Hash + Member + Serialize, Ex: std::fmt::Debug> BasePool<Hash,
 					removed.append(&mut replaced);
 				},
 				// transaction failed to be imported.
-				Err(e) => if first {
-					debug!(target: "txpool", "[{:?}] Error importing: {:?}", current_hash, e);
-					return Err(e)
-				} else {
-					failed.push(current_hash);
-				},
+				Err(e) =>
+					if first {
+						debug!(target: "txpool", "[{:?}] Error importing: {:?}", current_hash, e);
+						return Err(e)
+					} else {
+						failed.push(current_hash);
+					},
 			}
 			first = false;
 		}
@@ -352,21 +351,16 @@ impl<Hash: hash::Hash + Member + Serialize, Ex: std::fmt::Debug> BasePool<Hash,
 			return Err(error::Error::CycleDetected)
 		}
 
-		Ok(Imported::Ready {
-			hash,
-			promoted,
-			failed,
-			removed,
-		})
+		Ok(Imported::Ready { hash, promoted, failed, removed })
 	}
 
 	/// Returns an iterator over ready transactions in the pool.
-	pub fn ready(&self) -> impl Iterator<Item=Arc<Transaction<Hash, Ex>>> {
+	pub fn ready(&self) -> impl Iterator<Item = Arc<Transaction<Hash, Ex>>> {
 		self.ready.get()
 	}
 
 	/// Returns an iterator over future transactions in the pool.
-	pub fn futures(&self) -> impl Iterator<Item=&Transaction<Hash, Ex>> {
+	pub fn futures(&self) -> impl Iterator<Item = &Transaction<Hash, Ex>> {
 		self.future.all()
 	}
 
@@ -378,11 +372,7 @@ impl<Hash: hash::Hash + Member + Serialize, Ex: std::fmt::Debug> BasePool<Hash,
 		let ready = self.ready.by_hashes(hashes);
 		let future = self.future.by_hashes(hashes);
 
-		ready
-			.into_iter()
-			.zip(future)
-			.map(|(a, b)| a.or(b))
-			.collect()
+		ready.into_iter().zip(future).map(|(a, b)| a.or(b)).collect()
 	}
 
 	/// Returns pool transaction by hash.
@@ -395,47 +385,44 @@ impl<Hash: hash::Hash + Member + Serialize, Ex: std::fmt::Debug> BasePool<Hash,
 	/// Removes and returns worst transactions from the queues and all transactions that depend on them.
 	/// Technically the worst transaction should be evaluated by computing the entire pending set.
 	/// We use a simplified approach to remove the transaction that occupies the pool for the longest time.
-	pub fn enforce_limits(&mut self, ready: &Limit, future: &Limit) -> Vec<Arc<Transaction<Hash, Ex>>> {
+	pub fn enforce_limits(
+		&mut self,
+		ready: &Limit,
+		future: &Limit,
+	) -> Vec<Arc<Transaction<Hash, Ex>>> {
 		let mut removed = vec![];
 
 		while ready.is_exceeded(self.ready.len(), self.ready.bytes()) {
 			// find the worst transaction
-			let minimal = self.ready
-				.fold(|minimal, current| {
-					let transaction = &current.transaction;
-					match minimal {
-						None => Some(transaction.clone()),
-						Some(ref tx) if tx.insertion_id > transaction.insertion_id => {
-							Some(transaction.clone())
-						},
-						other => other,
-					}
-				});
+			let minimal = self.ready.fold(|minimal, current| {
+				let transaction = &current.transaction;
+				match minimal {
+					None => Some(transaction.clone()),
+					Some(ref tx) if tx.insertion_id > transaction.insertion_id =>
+						Some(transaction.clone()),
+					other => other,
+				}
+			});
 
 			if let Some(minimal) = minimal {
 				removed.append(&mut self.remove_subtree(&[minimal.transaction.hash.clone()]))
 			} else {
-				break;
+				break
 			}
 		}
 
 		while future.is_exceeded(self.future.len(), self.future.bytes()) {
 			// find the worst transaction
-			let minimal = self.future
-				.fold(|minimal, current| {
-					match minimal {
-						None => Some(current.clone()),
-						Some(ref tx) if tx.imported_at > current.imported_at => {
-							Some(current.clone())
-						},
-						other => other,
-					}
-				});
+			let minimal = self.future.fold(|minimal, current| match minimal {
+				None => Some(current.clone()),
+				Some(ref tx) if tx.imported_at > current.imported_at => Some(current.clone()),
+				other => other,
+			});
 
 			if let Some(minimal) = minimal {
 				removed.append(&mut self.remove_subtree(&[minimal.transaction.hash.clone()]))
 			} else {
-				break;
+				break
 			}
 		}
 
@@ -467,7 +454,7 @@ impl<Hash: hash::Hash + Member + Serialize, Ex: std::fmt::Debug> BasePool<Hash,
 	/// but unlike `remove_subtree`, dependent transactions are not touched.
 	/// Additional transactions from future queue might be promoted to ready if you satisfy tags
 	/// that the pool didn't previously know about.
-	pub fn prune_tags(&mut self, tags: impl IntoIterator<Item=Tag>) -> PruneStatus<Hash, Ex> {
+	pub fn prune_tags(&mut self, tags: impl IntoIterator<Item = Tag>) -> PruneStatus<Hash, Ex> {
 		let mut to_import = vec![];
 		let mut pruned = vec![];
 		let recently_pruned = &mut self.recently_pruned[self.recently_pruned_index];
@@ -496,11 +483,7 @@ impl<Hash: hash::Hash + Member + Serialize, Ex: std::fmt::Debug> BasePool<Hash,
 			}
 		}
 
-		PruneStatus {
-			pruned,
-			failed,
-			promoted,
-		}
+		PruneStatus { pruned, failed, promoted }
 	}
 
 	/// Get pool status.
@@ -540,7 +523,7 @@ mod tests {
 		BasePool::default()
 	}
 
-	const DEFAULT_TX: Transaction::<Hash, Vec<u8>> = Transaction {
+	const DEFAULT_TX: Transaction<Hash, Vec<u8>> = Transaction {
 		data: vec![],
 		bytes: 1,
 		hash: 1u64,
@@ -558,11 +541,8 @@ mod tests {
 		let mut pool = pool();
 
 		// when
-		pool.import(Transaction {
-			data: vec![1u8],
-			provides: vec![vec![1]],
-			.. DEFAULT_TX.clone()
-		}).unwrap();
+		pool.import(Transaction { data: vec![1u8], provides: vec![vec![1]], ..DEFAULT_TX.clone() })
+			.unwrap();
 
 		// then
 		assert_eq!(pool.ready().count(), 1);
@@ -575,16 +555,10 @@ mod tests {
 		let mut pool = pool();
 
 		// when
-		pool.import(Transaction {
-			data: vec![1u8],
-			provides: vec![vec![1]],
-			.. DEFAULT_TX.clone()
-		}).unwrap();
-		pool.import(Transaction {
-			data: vec![1u8],
-			provides: vec![vec![1]],
-			.. DEFAULT_TX.clone()
-		}).unwrap_err();
+		pool.import(Transaction { data: vec![1u8], provides: vec![vec![1]], ..DEFAULT_TX.clone() })
+			.unwrap();
+		pool.import(Transaction { data: vec![1u8], provides: vec![vec![1]], ..DEFAULT_TX.clone() })
+			.unwrap_err();
 
 		// then
 		assert_eq!(pool.ready().count(), 1);
@@ -601,16 +575,18 @@ mod tests {
 			data: vec![1u8],
 			requires: vec![vec![0]],
 			provides: vec![vec![1]],
-			.. DEFAULT_TX.clone()
-		}).unwrap();
+			..DEFAULT_TX.clone()
+		})
+		.unwrap();
 		assert_eq!(pool.ready().count(), 0);
 		assert_eq!(pool.ready.len(), 0);
 		pool.import(Transaction {
 			data: vec![2u8],
 			hash: 2,
 			provides: vec![vec![0]],
-			.. DEFAULT_TX.clone()
-		}).unwrap();
+			..DEFAULT_TX.clone()
+		})
+		.unwrap();
 
 		// then
 		assert_eq!(pool.ready().count(), 2);
@@ -627,37 +603,43 @@ mod tests {
 			data: vec![1u8],
 			requires: vec![vec![0]],
 			provides: vec![vec![1]],
-			.. DEFAULT_TX.clone()
-		}).unwrap();
+			..DEFAULT_TX.clone()
+		})
+		.unwrap();
 		pool.import(Transaction {
 			data: vec![3u8],
 			hash: 3,
 			requires: vec![vec![2]],
-			.. DEFAULT_TX.clone()
-		}).unwrap();
+			..DEFAULT_TX.clone()
+		})
+		.unwrap();
 		pool.import(Transaction {
 			data: vec![2u8],
 			hash: 2,
 			requires: vec![vec![1]],
 			provides: vec![vec![3], vec![2]],
-			.. DEFAULT_TX.clone()
-		}).unwrap();
+			..DEFAULT_TX.clone()
+		})
+		.unwrap();
 		pool.import(Transaction {
 			data: vec![4u8],
 			hash: 4,
 			priority: 1_000u64,
 			requires: vec![vec![3], vec![4]],
-			.. DEFAULT_TX.clone()
-		}).unwrap();
+			..DEFAULT_TX.clone()
+		})
+		.unwrap();
 		assert_eq!(pool.ready().count(), 0);
 		assert_eq!(pool.ready.len(), 0);
 
-		let res = pool.import(Transaction {
-			data: vec![5u8],
-			hash: 5,
-			provides: vec![vec![0], vec![4]],
-			.. DEFAULT_TX.clone()
-		}).unwrap();
+		let res = pool
+			.import(Transaction {
+				data: vec![5u8],
+				hash: 5,
+				provides: vec![vec![0], vec![4]],
+				..DEFAULT_TX.clone()
+			})
+			.unwrap();
 
 		// then
 		let mut it = pool.ready().into_iter().map(|tx| tx.data[0]);
@@ -668,12 +650,15 @@ mod tests {
 		assert_eq!(it.next(), Some(4));
 		assert_eq!(it.next(), Some(3));
 		assert_eq!(it.next(), None);
-		assert_eq!(res, Imported::Ready {
-			hash: 5,
-			promoted: vec![1, 2, 3, 4],
-			failed: vec![],
-			removed: vec![],
-		});
+		assert_eq!(
+			res,
+			Imported::Ready {
+				hash: 5,
+				promoted: vec![1, 2, 3, 4],
+				failed: vec![],
+				removed: vec![],
+			}
+		);
 	}
 
 	#[test]
@@ -684,15 +669,17 @@ mod tests {
 			data: vec![1u8],
 			requires: vec![vec![0]],
 			provides: vec![vec![1]],
-			.. DEFAULT_TX.clone()
-		}).unwrap();
+			..DEFAULT_TX.clone()
+		})
+		.unwrap();
 		pool.import(Transaction {
 			data: vec![3u8],
 			hash: 3,
 			requires: vec![vec![1]],
 			provides: vec![vec![2]],
-			.. DEFAULT_TX.clone()
-		}).unwrap();
+			..DEFAULT_TX.clone()
+		})
+		.unwrap();
 		assert_eq!(pool.ready().count(), 0);
 		assert_eq!(pool.ready.len(), 0);
 
@@ -702,8 +689,9 @@ mod tests {
 			hash: 2,
 			requires: vec![vec![2]],
 			provides: vec![vec![0]],
-			.. DEFAULT_TX.clone()
-		}).unwrap();
+			..DEFAULT_TX.clone()
+		})
+		.unwrap();
 
 		// then
 		{
@@ -714,24 +702,24 @@ mod tests {
 		assert_eq!(pool.future.len(), 3);
 
 		// let's close the cycle with one additional transaction
-		let res = pool.import(Transaction {
-			data: vec![4u8],
-			hash: 4,
-			priority: 50u64,
-			provides: vec![vec![0]],
-			.. DEFAULT_TX.clone()
-		}).unwrap();
+		let res = pool
+			.import(Transaction {
+				data: vec![4u8],
+				hash: 4,
+				priority: 50u64,
+				provides: vec![vec![0]],
+				..DEFAULT_TX.clone()
+			})
+			.unwrap();
 		let mut it = pool.ready().into_iter().map(|tx| tx.data[0]);
 		assert_eq!(it.next(), Some(4));
 		assert_eq!(it.next(), Some(1));
 		assert_eq!(it.next(), Some(3));
 		assert_eq!(it.next(), None);
-		assert_eq!(res, Imported::Ready {
-			hash: 4,
-			promoted: vec![1, 3],
-			failed: vec![2],
-			removed: vec![],
-		});
+		assert_eq!(
+			res,
+			Imported::Ready { hash: 4, promoted: vec![1, 3], failed: vec![2], removed: vec![] }
+		);
 		assert_eq!(pool.future.len(), 0);
 	}
 
@@ -743,15 +731,17 @@ mod tests {
 			data: vec![1u8],
 			requires: vec![vec![0]],
 			provides: vec![vec![1]],
-			.. DEFAULT_TX.clone()
-		}).unwrap();
+			..DEFAULT_TX.clone()
+		})
+		.unwrap();
 		pool.import(Transaction {
 			data: vec![3u8],
 			hash: 3,
 			requires: vec![vec![1]],
 			provides: vec![vec![2]],
-			.. DEFAULT_TX.clone()
-		}).unwrap();
+			..DEFAULT_TX.clone()
+		})
+		.unwrap();
 		assert_eq!(pool.ready().count(), 0);
 		assert_eq!(pool.ready.len(), 0);
 
@@ -761,8 +751,9 @@ mod tests {
 			hash: 2,
 			requires: vec![vec![2]],
 			provides: vec![vec![0]],
-			.. DEFAULT_TX.clone()
-		}).unwrap();
+			..DEFAULT_TX.clone()
+		})
+		.unwrap();
 
 		// then
 		{
@@ -773,13 +764,15 @@ mod tests {
 		assert_eq!(pool.future.len(), 3);
 
 		// let's close the cycle with one additional transaction
-		let err = pool.import(Transaction {
-			data: vec![4u8],
-			hash: 4,
-			priority: 1u64, // lower priority than Tx(2)
-			provides: vec![vec![0]],
-			.. DEFAULT_TX.clone()
-		}).unwrap_err();
+		let err = pool
+			.import(Transaction {
+				data: vec![4u8],
+				hash: 4,
+				priority: 1u64, // lower priority than Tx(2)
+				provides: vec![vec![0]],
+				..DEFAULT_TX.clone()
+			})
+			.unwrap_err();
 		let mut it = pool.ready().into_iter().map(|tx| tx.data[0]);
 		assert_eq!(it.next(), None);
 		assert_eq!(pool.ready.len(), 0);
@@ -797,14 +790,16 @@ mod tests {
 			data: vec![5u8; 1024],
 			hash: 5,
 			provides: vec![vec![0], vec![4]],
-			.. DEFAULT_TX.clone()
-		}).expect("import 1 should be ok");
+			..DEFAULT_TX.clone()
+		})
+		.expect("import 1 should be ok");
 		pool.import(Transaction {
 			data: vec![3u8; 1024],
 			hash: 7,
 			provides: vec![vec![2], vec![7]],
-			.. DEFAULT_TX.clone()
-		}).expect("import 2 should be ok");
+			..DEFAULT_TX.clone()
+		})
+		.expect("import 2 should be ok");
 
 		assert!(parity_util_mem::malloc_size(&pool) > 5000);
 	}
@@ -817,42 +812,48 @@ mod tests {
 			data: vec![5u8],
 			hash: 5,
 			provides: vec![vec![0], vec![4]],
-			.. DEFAULT_TX.clone()
-		}).unwrap();
+			..DEFAULT_TX.clone()
+		})
+		.unwrap();
 		pool.import(Transaction {
 			data: vec![1u8],
 			requires: vec![vec![0]],
 			provides: vec![vec![1]],
-			.. DEFAULT_TX.clone()
-		}).unwrap();
+			..DEFAULT_TX.clone()
+		})
+		.unwrap();
 		pool.import(Transaction {
 			data: vec![3u8],
 			hash: 3,
 			requires: vec![vec![2]],
-			.. DEFAULT_TX.clone()
-		}).unwrap();
+			..DEFAULT_TX.clone()
+		})
+		.unwrap();
 		pool.import(Transaction {
 			data: vec![2u8],
 			hash: 2,
 			requires: vec![vec![1]],
 			provides: vec![vec![3], vec![2]],
-			.. DEFAULT_TX.clone()
-		}).unwrap();
+			..DEFAULT_TX.clone()
+		})
+		.unwrap();
 		pool.import(Transaction {
 			data: vec![4u8],
 			hash: 4,
 			priority: 1_000u64,
 			requires: vec![vec![3], vec![4]],
-			.. DEFAULT_TX.clone()
-		}).unwrap();
+			..DEFAULT_TX.clone()
+		})
+		.unwrap();
 		// future
 		pool.import(Transaction {
 			data: vec![6u8],
 			hash: 6,
 			priority: 1_000u64,
 			requires: vec![vec![11]],
-			.. DEFAULT_TX.clone()
-		}).unwrap();
+			..DEFAULT_TX.clone()
+		})
+		.unwrap();
 		assert_eq!(pool.ready().count(), 5);
 		assert_eq!(pool.future.len(), 1);
 
@@ -874,36 +875,37 @@ mod tests {
 			hash: 5,
 			requires: vec![vec![0]],
 			provides: vec![vec![100]],
-			.. DEFAULT_TX.clone()
-		}).unwrap();
+			..DEFAULT_TX.clone()
+		})
+		.unwrap();
 		// ready
-		pool.import(Transaction {
-			data: vec![1u8],
-			provides: vec![vec![1]],
-			.. DEFAULT_TX.clone()
-		}).unwrap();
+		pool.import(Transaction { data: vec![1u8], provides: vec![vec![1]], ..DEFAULT_TX.clone() })
+			.unwrap();
 		pool.import(Transaction {
 			data: vec![2u8],
 			hash: 2,
 			requires: vec![vec![2]],
 			provides: vec![vec![3]],
-			.. DEFAULT_TX.clone()
-		}).unwrap();
+			..DEFAULT_TX.clone()
+		})
+		.unwrap();
 		pool.import(Transaction {
 			data: vec![3u8],
 			hash: 3,
 			requires: vec![vec![1]],
 			provides: vec![vec![2]],
-			.. DEFAULT_TX.clone()
-		}).unwrap();
+			..DEFAULT_TX.clone()
+		})
+		.unwrap();
 		pool.import(Transaction {
 			data: vec![4u8],
 			hash: 4,
 			priority: 1_000u64,
 			requires: vec![vec![3], vec![2]],
 			provides: vec![vec![4]],
-			.. DEFAULT_TX.clone()
-		}).unwrap();
+			..DEFAULT_TX.clone()
+		})
+		.unwrap();
 
 		assert_eq!(pool.ready().count(), 4);
 		assert_eq!(pool.future.len(), 1);
@@ -914,12 +916,10 @@ mod tests {
 		// then
 		assert_eq!(result.pruned.len(), 2);
 		assert_eq!(result.failed.len(), 0);
-		assert_eq!(result.promoted[0], Imported::Ready {
-			hash: 5,
-			promoted: vec![],
-			failed: vec![],
-			removed: vec![],
-		});
+		assert_eq!(
+			result.promoted[0],
+			Imported::Ready { hash: 5, promoted: vec![], failed: vec![], removed: vec![] }
+		);
 		assert_eq!(result.promoted.len(), 1);
 		assert_eq!(pool.future.len(), 0);
 		assert_eq!(pool.ready.len(), 3);
@@ -929,40 +929,52 @@ mod tests {
 	#[test]
 	fn transaction_debug() {
 		assert_eq!(
-			format!("{:?}", Transaction {
-				data: vec![4u8],
-				hash: 4,
-				priority: 1_000u64,
-				requires: vec![vec![3], vec![2]],
-				provides: vec![vec![4]],
-				.. DEFAULT_TX.clone()
-			}),
+			format!(
+				"{:?}",
+				Transaction {
+					data: vec![4u8],
+					hash: 4,
+					priority: 1_000u64,
+					requires: vec![vec![3], vec![2]],
+					provides: vec![vec![4]],
+					..DEFAULT_TX.clone()
+				}
+			),
 			"Transaction { \
 hash: 4, priority: 1000, valid_till: 64, bytes: 1, propagate: true, \
-source: TransactionSource::External, requires: [03, 02], provides: [04], data: [4]}".to_owned()
+source: TransactionSource::External, requires: [03, 02], provides: [04], data: [4]}"
+				.to_owned()
 		);
 	}
 
 	#[test]
 	fn transaction_propagation() {
-		assert_eq!(Transaction {
+		assert_eq!(
+			Transaction {
 				data: vec![4u8],
 				hash: 4,
 				priority: 1_000u64,
 				requires: vec![vec![3], vec![2]],
 				provides: vec![vec![4]],
-				.. DEFAULT_TX.clone()
-		}.is_propagable(), true);
+				..DEFAULT_TX.clone()
+			}
+			.is_propagable(),
+			true
+		);
 
-		assert_eq!(Transaction {
+		assert_eq!(
+			Transaction {
 				data: vec![4u8],
 				hash: 4,
 				priority: 1_000u64,
 				requires: vec![vec![3], vec![2]],
 				provides: vec![vec![4]],
 				propagate: false,
-				.. DEFAULT_TX.clone()
-		}.is_propagable(), false);
+				..DEFAULT_TX.clone()
+			}
+			.is_propagable(),
+			false
+		);
 	}
 
 	#[test]
@@ -978,7 +990,7 @@ source: TransactionSource::External, requires: [03, 02], provides: [04], data: [
 			data: vec![5u8],
 			hash: 5,
 			requires: vec![vec![0]],
-			.. DEFAULT_TX.clone()
+			..DEFAULT_TX.clone()
 		});
 
 		if let Err(error::Error::RejectedFutureTransaction) = err {
@@ -997,8 +1009,9 @@ source: TransactionSource::External, requires: [03, 02], provides: [04], data: [
 			data: vec![5u8],
 			hash: 5,
 			requires: vec![vec![0]],
-			.. DEFAULT_TX.clone()
-		}).unwrap();
+			..DEFAULT_TX.clone()
+		})
+		.unwrap();
 
 		// then
 		assert_eq!(pool.future.len(), 1);
@@ -1022,8 +1035,9 @@ source: TransactionSource::External, requires: [03, 02], provides: [04], data: [
 				data: vec![5u8],
 				hash: 5,
 				requires: vec![vec![0]],
-				.. DEFAULT_TX.clone()
-			}).unwrap();
+				..DEFAULT_TX.clone()
+			})
+			.unwrap();
 
 			flag
 		});
diff --git a/client/transaction-pool/src/graph/future.rs b/client/transaction-pool/src/graph/future.rs
index 083d3c7ec061..b0e70698f383 100644
--- a/client/transaction-pool/src/graph/future.rs
+++ b/client/transaction-pool/src/graph/future.rs
@@ -18,15 +18,12 @@
 
 use std::{
 	collections::{HashMap, HashSet},
-	fmt,
-	hash,
+	fmt, hash,
 	sync::Arc,
 };
 
 use sp_core::hexdisplay::HexDisplay;
-use sp_runtime::transaction_validity::{
-	TransactionTag as Tag,
-};
+use sp_runtime::transaction_validity::TransactionTag as Tag;
 use wasm_timer::Instant;
 
 use super::base_pool::Transaction;
@@ -48,10 +45,13 @@ impl<Hash: fmt::Debug, Ex: fmt::Debug> fmt::Debug for WaitingTransaction<Hash, E
 		write!(fmt, "imported_at: {:?}, ", self.imported_at)?;
 		write!(fmt, "transaction: {:?}, ", self.transaction)?;
 		write!(
-			fmt, 
-			"missing_tags: {{{}}}", 
-			self.missing_tags.iter()
-				.map(|tag| HexDisplay::from(tag).to_string()).collect::<Vec<_>>().join(", "),
+			fmt,
+			"missing_tags: {{{}}}",
+			self.missing_tags
+				.iter()
+				.map(|tag| HexDisplay::from(tag).to_string())
+				.collect::<Vec<_>>()
+				.join(", "),
 		)?;
 		write!(fmt, "}}")
 	}
@@ -77,22 +77,20 @@ impl<Hash, Ex> WaitingTransaction<Hash, Ex> {
 		provided: &HashMap<Tag, Hash>,
 		recently_pruned: &[HashSet<Tag>],
 	) -> Self {
-		let missing_tags = transaction.requires
+		let missing_tags = transaction
+			.requires
 			.iter()
 			.filter(|tag| {
 				// is true if the tag is already satisfied either via transaction in the pool
 				// or one that was recently included.
-				let is_provided = provided.contains_key(&**tag) || recently_pruned.iter().any(|x| x.contains(&**tag));
+				let is_provided = provided.contains_key(&**tag) ||
+					recently_pruned.iter().any(|x| x.contains(&**tag));
 				!is_provided
 			})
 			.cloned()
 			.collect();
 
-		Self {
-			transaction: Arc::new(transaction),
-			missing_tags,
-			imported_at: Instant::now(),
-		}
+		Self { transaction: Arc::new(transaction), missing_tags, imported_at: Instant::now() }
 	}
 
 	/// Marks the tag as satisfied.
@@ -121,10 +119,7 @@ pub struct FutureTransactions<Hash: hash::Hash + Eq, Ex> {
 
 impl<Hash: hash::Hash + Eq, Ex> Default for FutureTransactions<Hash, Ex> {
 	fn default() -> Self {
-		Self {
-			wanted_tags: Default::default(),
-			waiting: Default::default(),
-		}
+		Self { wanted_tags: Default::default(), waiting: Default::default() }
 	}
 }
 
@@ -144,7 +139,10 @@ impl<Hash: hash::Hash + Eq + Clone, Ex> FutureTransactions<Hash, Ex> {
 	/// we should remove the transactions from here and move them to the Ready queue.
 	pub fn import(&mut self, tx: WaitingTransaction<Hash, Ex>) {
 		assert!(!tx.is_ready(), "Transaction is ready.");
-		assert!(!self.waiting.contains_key(&tx.transaction.hash), "Transaction is already imported.");
+		assert!(
+			!self.waiting.contains_key(&tx.transaction.hash),
+			"Transaction is already imported."
+		);
 
 		// Add all tags that are missing
 		for tag in &tx.missing_tags {
@@ -163,14 +161,20 @@ impl<Hash: hash::Hash + Eq + Clone, Ex> FutureTransactions<Hash, Ex> {
 
 	/// Returns a list of known transactions
 	pub fn by_hashes(&self, hashes: &[Hash]) -> Vec<Option<Arc<Transaction<Hash, Ex>>>> {
-		hashes.iter().map(|h| self.waiting.get(h).map(|x| x.transaction.clone())).collect()
+		hashes
+			.iter()
+			.map(|h| self.waiting.get(h).map(|x| x.transaction.clone()))
+			.collect()
 	}
 
 	/// Satisfies provided tags in transactions that are waiting for them.
 	///
 	/// Returns (and removes) transactions that became ready after their last tag got
 	/// satisfied and now we can remove them from Future and move to Ready queue.
-	pub fn satisfy_tags<T: AsRef<Tag>>(&mut self, tags: impl IntoIterator<Item=T>) -> Vec<WaitingTransaction<Hash, Ex>> {
+	pub fn satisfy_tags<T: AsRef<Tag>>(
+		&mut self,
+		tags: impl IntoIterator<Item = T>,
+	) -> Vec<WaitingTransaction<Hash, Ex>> {
 		let mut became_ready = vec![];
 
 		for tag in tags {
@@ -205,7 +209,9 @@ impl<Hash: hash::Hash + Eq + Clone, Ex> FutureTransactions<Hash, Ex> {
 					let remove = if let Some(wanted) = self.wanted_tags.get_mut(&tag) {
 						wanted.remove(hash);
 						wanted.is_empty()
-					} else { false };
+					} else {
+						false
+					};
 					if remove {
 						self.wanted_tags.remove(&tag);
 					}
@@ -218,14 +224,15 @@ impl<Hash: hash::Hash + Eq + Clone, Ex> FutureTransactions<Hash, Ex> {
 	}
 
 	/// Fold a list of future transactions to compute a single value.
-	pub fn fold<R, F: FnMut(Option<R>, &WaitingTransaction<Hash, Ex>) -> Option<R>>(&mut self, f: F) -> Option<R> {
-		self.waiting
-			.values()
-			.fold(None, f)
+	pub fn fold<R, F: FnMut(Option<R>, &WaitingTransaction<Hash, Ex>) -> Option<R>>(
+		&mut self,
+		f: F,
+	) -> Option<R> {
+		self.waiting.values().fold(None, f)
 	}
 
 	/// Returns iterator over all future transactions
-	pub fn all(&self) -> impl Iterator<Item=&Transaction<Hash, Ex>> {
+	pub fn all(&self) -> impl Iterator<Item = &Transaction<Hash, Ex>> {
 		self.waiting.values().map(|waiting| &*waiting.transaction)
 	}
 
@@ -265,7 +272,8 @@ mod tests {
 				provides: vec![vec![3], vec![4]],
 				propagate: true,
 				source: TransactionSource::External,
-			}.into(),
+			}
+			.into(),
 			missing_tags: vec![vec![1u8], vec![2u8]].into_iter().collect(),
 			imported_at: std::time::Instant::now(),
 		});
diff --git a/client/transaction-pool/src/graph/listener.rs b/client/transaction-pool/src/graph/listener.rs
index a6987711f1df..b8149018f783 100644
--- a/client/transaction-pool/src/graph/listener.rs
+++ b/client/transaction-pool/src/graph/listener.rs
@@ -1,4 +1,3 @@
-
 // This file is part of Substrate.
 
 // Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
@@ -17,16 +16,14 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use std::{
-	collections::HashMap, hash, fmt::Debug,
-};
+use std::{collections::HashMap, fmt::Debug, hash};
 
 use linked_hash_map::LinkedHashMap;
-use serde::Serialize;
 use log::{debug, trace};
+use serde::Serialize;
 use sp_runtime::traits;
 
-use super::{watcher, ChainApi, ExtrinsicHash, BlockHash};
+use super::{watcher, BlockHash, ChainApi, ExtrinsicHash};
 
 /// Extrinsic pool default listener.
 pub struct Listener<H: hash::Hash + Eq, C: ChainApi> {
@@ -39,15 +36,15 @@ const MAX_FINALITY_WATCHERS: usize = 512;
 
 impl<H: hash::Hash + Eq + Debug, C: ChainApi> Default for Listener<H, C> {
 	fn default() -> Self {
-		Self {
-			watchers: Default::default(),
-			finality_watchers: Default::default(),
-		}
+		Self { watchers: Default::default(), finality_watchers: Default::default() }
 	}
 }
 
 impl<H: hash::Hash + traits::Member + Serialize, C: ChainApi> Listener<H, C> {
-	fn fire<F>(&mut self, hash: &H, fun: F) where F: FnOnce(&mut watcher::Sender<H, ExtrinsicHash<C>>) {
+	fn fire<F>(&mut self, hash: &H, fun: F)
+	where
+		F: FnOnce(&mut watcher::Sender<H, ExtrinsicHash<C>>),
+	{
 		let clean = if let Some(h) = self.watchers.get_mut(hash) {
 			fun(h);
 			h.is_done()
diff --git a/client/transaction-pool/src/graph/mod.rs b/client/transaction-pool/src/graph/mod.rs
index 92e76b3ecf90..3ecfb8fe68c6 100644
--- a/client/transaction-pool/src/graph/mod.rs
+++ b/client/transaction-pool/src/graph/mod.rs
@@ -31,15 +31,17 @@ mod listener;
 mod pool;
 mod ready;
 mod rotator;
-mod validated_pool;
 mod tracked_map;
+mod validated_pool;
 
 pub mod base_pool;
 pub mod watcher;
 
-pub use self::base_pool::Transaction;
-pub use validated_pool::{IsValidator, ValidatedTransaction};
-pub use self::pool::{
-	BlockHash, ChainApi, EventStream, ExtrinsicFor, ExtrinsicHash,
-	NumberFor, Options, Pool, TransactionFor,
+pub use self::{
+	base_pool::Transaction,
+	pool::{
+		BlockHash, ChainApi, EventStream, ExtrinsicFor, ExtrinsicHash, NumberFor, Options, Pool,
+		TransactionFor,
+	},
 };
+pub use validated_pool::{IsValidator, ValidatedTransaction};
diff --git a/client/transaction-pool/src/graph/pool.rs b/client/transaction-pool/src/graph/pool.rs
index 2c24f3779f0e..c04c167bc750 100644
--- a/client/transaction-pool/src/graph/pool.rs
+++ b/client/transaction-pool/src/graph/pool.rs
@@ -16,26 +16,23 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use std::{
-	collections::HashMap,
-	sync::Arc,
-};
+use std::{collections::HashMap, sync::Arc};
 
-use futures::Future;
+use futures::{channel::mpsc::Receiver, Future};
+use sc_transaction_pool_api::error;
 use sp_runtime::{
 	generic::BlockId,
-	traits::{self, SaturatedConversion, Block as BlockT},
+	traits::{self, Block as BlockT, SaturatedConversion},
 	transaction_validity::{
-		TransactionValidity, TransactionTag as Tag, TransactionValidityError, TransactionSource,
+		TransactionSource, TransactionTag as Tag, TransactionValidity, TransactionValidityError,
 	},
 };
-use sc_transaction_pool_api::error;
 use wasm_timer::Instant;
-use futures::channel::mpsc::Receiver;
 
 use super::{
-	base_pool as base, watcher::Watcher,
-	validated_pool::{IsValidator, ValidatedTransaction, ValidatedPool},
+	base_pool as base,
+	validated_pool::{IsValidator, ValidatedPool, ValidatedTransaction},
+	watcher::Watcher,
 };
 
 /// Modification notification event stream type;
@@ -52,11 +49,8 @@ pub type NumberFor<A> = traits::NumberFor<<A as ChainApi>::Block>;
 /// A type of transaction stored in the pool
 pub type TransactionFor<A> = Arc<base::Transaction<ExtrinsicHash<A>, ExtrinsicFor<A>>>;
 /// A type of validated transaction stored in the pool.
-pub type ValidatedTransactionFor<A> = ValidatedTransaction<
-	ExtrinsicHash<A>,
-	ExtrinsicFor<A>,
-	<A as ChainApi>::Error,
->;
+pub type ValidatedTransactionFor<A> =
+	ValidatedTransaction<ExtrinsicHash<A>, ExtrinsicFor<A>, <A as ChainApi>::Error>;
 
 /// Concrete extrinsic validation and query logic.
 pub trait ChainApi: Send + Sync {
@@ -65,11 +59,12 @@ pub trait ChainApi: Send + Sync {
 	/// Error type.
 	type Error: From<error::Error> + error::IntoPoolError;
 	/// Validate transaction future.
-	type ValidationFuture: Future<Output=Result<TransactionValidity, Self::Error>> + Send + Unpin;
+	type ValidationFuture: Future<Output = Result<TransactionValidity, Self::Error>> + Send + Unpin;
 	/// Body future (since block body might be remote)
-	type BodyFuture: Future<
-		Output = Result<Option<Vec<<Self::Block as traits::Block>::Extrinsic>>, Self::Error>
-	> + Unpin + Send + 'static;
+	type BodyFuture: Future<Output = Result<Option<Vec<<Self::Block as traits::Block>::Extrinsic>>, Self::Error>>
+		+ Unpin
+		+ Send
+		+ 'static;
 
 	/// Verify extrinsic at given block.
 	fn validate_transaction(
@@ -118,14 +113,8 @@ pub struct Options {
 impl Default for Options {
 	fn default() -> Self {
 		Self {
-			ready: base::Limit {
-				count: 8192,
-				total_bytes: 20 * 1024 * 1024,
-			},
-			future: base::Limit {
-				count: 512,
-				total_bytes: 1 * 1024 * 1024,
-			},
+			ready: base::Limit { count: 8192, total_bytes: 20 * 1024 * 1024 },
+			future: base::Limit { count: 512, total_bytes: 1 * 1024 * 1024 },
 			reject_future_transactions: false,
 		}
 	}
@@ -157,9 +146,7 @@ where
 impl<B: ChainApi> Pool<B> {
 	/// Create a new transaction pool.
 	pub fn new(options: Options, is_validator: IsValidator, api: Arc<B>) -> Self {
-		Self {
-			validated_pool: Arc::new(ValidatedPool::new(options, is_validator, api)),
-		}
+		Self { validated_pool: Arc::new(ValidatedPool::new(options, is_validator, api)) }
 	}
 
 	/// Imports a bunch of unverified extrinsics to the pool
@@ -167,7 +154,7 @@ impl<B: ChainApi> Pool<B> {
 		&self,
 		at: &BlockId<B::Block>,
 		source: TransactionSource,
-		xts: impl IntoIterator<Item=ExtrinsicFor<B>>,
+		xts: impl IntoIterator<Item = ExtrinsicFor<B>>,
 	) -> Result<Vec<Result<ExtrinsicHash<B>, B::Error>>, B::Error> {
 		let xts = xts.into_iter().map(|xt| (source, xt));
 		let validated_transactions = self.verify(at, xts, CheckBannedBeforeVerify::Yes).await?;
@@ -181,7 +168,7 @@ impl<B: ChainApi> Pool<B> {
 		&self,
 		at: &BlockId<B::Block>,
 		source: TransactionSource,
-		xts: impl IntoIterator<Item=ExtrinsicFor<B>>,
+		xts: impl IntoIterator<Item = ExtrinsicFor<B>>,
 	) -> Result<Vec<Result<ExtrinsicHash<B>, B::Error>>, B::Error> {
 		let xts = xts.into_iter().map(|xt| (source, xt));
 		let validated_transactions = self.verify(at, xts, CheckBannedBeforeVerify::No).await?;
@@ -207,13 +194,9 @@ impl<B: ChainApi> Pool<B> {
 		xt: ExtrinsicFor<B>,
 	) -> Result<Watcher<ExtrinsicHash<B>, ExtrinsicHash<B>>, B::Error> {
 		let block_number = self.resolve_block_number(at)?;
-		let (_, tx) = self.verify_one(
-			at,
-			block_number,
-			source,
-			xt,
-			CheckBannedBeforeVerify::Yes,
-		).await;
+		let (_, tx) = self
+			.verify_one(at, block_number, source, xt, CheckBannedBeforeVerify::Yes)
+			.await;
 		self.validated_pool.submit_and_watch(tx)
 	}
 
@@ -222,7 +205,6 @@ impl<B: ChainApi> Pool<B> {
 		&self,
 		revalidated_transactions: HashMap<ExtrinsicHash<B>, ValidatedTransactionFor<B>>,
 	) {
-
 		let now = Instant::now();
 		self.validated_pool.resubmit(revalidated_transactions);
 		log::debug!(target: "txpool",
@@ -243,13 +225,17 @@ impl<B: ChainApi> Pool<B> {
 		hashes: &[ExtrinsicHash<B>],
 	) -> Result<(), B::Error> {
 		// Get details of all extrinsics that are already in the pool
-		let in_pool_tags = self.validated_pool.extrinsics_tags(hashes)
-			.into_iter().filter_map(|x| x).flatten();
+		let in_pool_tags = self
+			.validated_pool
+			.extrinsics_tags(hashes)
+			.into_iter()
+			.filter_map(|x| x)
+			.flatten();
 
 		// Prune all transactions that provide given tags
 		let prune_status = self.validated_pool.prune_tags(in_pool_tags)?;
-		let pruned_transactions = hashes.iter().cloned()
-			.chain(prune_status.pruned.iter().map(|tx| tx.hash));
+		let pruned_transactions =
+			hashes.iter().cloned().chain(prune_status.pruned.iter().map(|tx| tx.hash));
 		self.validated_pool.fire_pruned(at, pruned_transactions)
 	}
 
@@ -272,7 +258,8 @@ impl<B: ChainApi> Pool<B> {
 			extrinsics.len()
 		);
 		// Get details of all extrinsics that are already in the pool
-		let in_pool_hashes = extrinsics.iter().map(|extrinsic| self.hash_of(extrinsic)).collect::<Vec<_>>();
+		let in_pool_hashes =
+			extrinsics.iter().map(|extrinsic| self.hash_of(extrinsic)).collect::<Vec<_>>();
 		let in_pool_tags = self.validated_pool.extrinsics_tags(&in_pool_hashes);
 
 		// Zip the ones from the pool with the full list (we get pairs `(Extrinsic, Option<Vec<Tag>>)`)
@@ -286,7 +273,9 @@ impl<B: ChainApi> Pool<B> {
 				// if it's not found in the pool query the runtime at parent block
 				// to get validity info and tags that the extrinsic provides.
 				None => {
-					let validity = self.validated_pool.api()
+					let validity = self
+						.validated_pool
+						.api()
 						.validate_transaction(parent, TransactionSource::InBlock, extrinsic.clone())
 						.await;
 
@@ -324,8 +313,8 @@ impl<B: ChainApi> Pool<B> {
 	pub async fn prune_tags(
 		&self,
 		at: &BlockId<B::Block>,
-		tags: impl IntoIterator<Item=Tag>,
-		known_imported_hashes: impl IntoIterator<Item=ExtrinsicHash<B>> + Clone,
+		tags: impl IntoIterator<Item = Tag>,
+		known_imported_hashes: impl IntoIterator<Item = ExtrinsicHash<B>> + Clone,
 	) -> Result<(), B::Error> {
 		log::debug!(target: "txpool", "Pruning at {:?}", at);
 		// Prune all transactions that provide given tags
@@ -334,22 +323,17 @@ impl<B: ChainApi> Pool<B> {
 		// Make sure that we don't revalidate extrinsics that were part of the recently
 		// imported block. This is especially important for UTXO-like chains cause the
 		// inputs are pruned so such transaction would go to future again.
-		self.validated_pool.ban(&Instant::now(), known_imported_hashes.clone().into_iter());
+		self.validated_pool
+			.ban(&Instant::now(), known_imported_hashes.clone().into_iter());
 
 		// Try to re-validate pruned transactions since some of them might be still valid.
 		// note that `known_imported_hashes` will be rejected here due to temporary ban.
-		let pruned_hashes = prune_status.pruned
-			.iter()
-			.map(|tx| tx.hash).collect::<Vec<_>>();
-		let pruned_transactions = prune_status.pruned
-			.into_iter()
-			.map(|tx| (tx.source, tx.data.clone()));
+		let pruned_hashes = prune_status.pruned.iter().map(|tx| tx.hash).collect::<Vec<_>>();
+		let pruned_transactions =
+			prune_status.pruned.into_iter().map(|tx| (tx.source, tx.data.clone()));
 
-		let reverified_transactions = self.verify(
-			at,
-			pruned_transactions,
-			CheckBannedBeforeVerify::Yes,
-		).await?;
+		let reverified_transactions =
+			self.verify(at, pruned_transactions, CheckBannedBeforeVerify::Yes).await?;
 
 		log::trace!(target: "txpool", "Pruning at {:?}. Resubmitting transactions.", at);
 		// And finally - submit reverified transactions back to the pool
@@ -369,16 +353,16 @@ impl<B: ChainApi> Pool<B> {
 
 	/// Resolves block number by id.
 	fn resolve_block_number(&self, at: &BlockId<B::Block>) -> Result<NumberFor<B>, B::Error> {
-		self.validated_pool.api().block_id_to_number(at)
-			.and_then(|number| number.ok_or_else(||
-				error::Error::InvalidBlockId(format!("{:?}", at)).into()))
+		self.validated_pool.api().block_id_to_number(at).and_then(|number| {
+			number.ok_or_else(|| error::Error::InvalidBlockId(format!("{:?}", at)).into())
+		})
 	}
 
 	/// Returns future that validates a bunch of transactions at given block.
 	async fn verify(
 		&self,
 		at: &BlockId<B::Block>,
-		xts: impl IntoIterator<Item=(TransactionSource, ExtrinsicFor<B>)>,
+		xts: impl IntoIterator<Item = (TransactionSource, ExtrinsicFor<B>)>,
 		check: CheckBannedBeforeVerify,
 	) -> Result<HashMap<ExtrinsicHash<B>, ValidatedTransactionFor<B>>, B::Error> {
 		// we need a block number to compute tx validity
@@ -386,8 +370,11 @@ impl<B: ChainApi> Pool<B> {
 
 		let res = futures::future::join_all(
 			xts.into_iter()
-				.map(|(source, xt)| self.verify_one(at, block_number, source, xt, check))
-		).await.into_iter().collect::<HashMap<_, _>>();
+				.map(|(source, xt)| self.verify_one(at, block_number, source, xt, check)),
+		)
+		.await
+		.into_iter()
+		.collect::<HashMap<_, _>>();
 
 		Ok(res)
 	}
@@ -408,11 +395,11 @@ impl<B: ChainApi> Pool<B> {
 			return (hash, ValidatedTransaction::Invalid(hash, err))
 		}
 
-		let validation_result = self.validated_pool.api().validate_transaction(
-			block_id,
-			source,
-			xt.clone(),
-		).await;
+		let validation_result = self
+			.validated_pool
+			.api()
+			.validate_transaction(block_id, source, xt.clone())
+			.await;
 
 		let status = match validation_result {
 			Ok(status) => status,
@@ -420,7 +407,7 @@ impl<B: ChainApi> Pool<B> {
 		};
 
 		let validity = match status {
-			Ok(validity) => {
+			Ok(validity) =>
 				if validity.provides.is_empty() {
 					ValidatedTransaction::Invalid(hash, error::Error::NoTagsProvided.into())
 				} else {
@@ -432,8 +419,7 @@ impl<B: ChainApi> Pool<B> {
 						bytes,
 						validity,
 					)
-				}
-			},
+				},
 			Err(TransactionValidityError::Invalid(e)) =>
 				ValidatedTransaction::Invalid(hash, error::Error::InvalidTransaction(e).into()),
 			Err(TransactionValidityError::Unknown(e)) =>
@@ -444,35 +430,32 @@ impl<B: ChainApi> Pool<B> {
 	}
 
 	/// get a reference to the underlying validated pool.
-	pub fn validated_pool(&self) ->  &ValidatedPool<B> {
+	pub fn validated_pool(&self) -> &ValidatedPool<B> {
 		&self.validated_pool
 	}
 }
 
 impl<B: ChainApi> Clone for Pool<B> {
 	fn clone(&self) -> Self {
-		Self {
-			validated_pool: self.validated_pool.clone(),
-		}
+		Self { validated_pool: self.validated_pool.clone() }
 	}
 }
 
 #[cfg(test)]
 mod tests {
-	use std::collections::{HashMap, HashSet};
-	use parking_lot::Mutex;
+	use super::{super::base_pool::Limit, *};
+	use assert_matches::assert_matches;
+	use codec::Encode;
 	use futures::executor::block_on;
-	use super::*;
+	use parking_lot::Mutex;
 	use sc_transaction_pool_api::TransactionStatus;
 	use sp_runtime::{
 		traits::Hash,
-		transaction_validity::{ValidTransaction, InvalidTransaction, TransactionSource},
+		transaction_validity::{InvalidTransaction, TransactionSource, ValidTransaction},
 	};
-	use codec::Encode;
-	use substrate_test_runtime::{Block, Extrinsic, Transfer, H256, AccountId, Hashing};
-	use assert_matches::assert_matches;
+	use std::collections::{HashMap, HashSet};
+	use substrate_test_runtime::{AccountId, Block, Extrinsic, Hashing, Transfer, H256};
 	use wasm_timer::Instant;
-	use super::super::base_pool::Limit;
 
 	const INVALID_NONCE: u64 = 254;
 	const SOURCE: TransactionSource = TransactionSource::External;
@@ -522,8 +505,16 @@ mod tests {
 					} else {
 						let mut transaction = ValidTransaction {
 							priority: 4,
-							requires: if nonce > block_number { vec![vec![nonce as u8 - 1]] } else { vec![] },
-							provides: if nonce == INVALID_NONCE { vec![] } else { vec![vec![nonce as u8]] },
+							requires: if nonce > block_number {
+								vec![vec![nonce as u8 - 1]]
+							} else {
+								vec![]
+							},
+							provides: if nonce == INVALID_NONCE {
+								vec![]
+							} else {
+								vec![vec![nonce as u8]]
+							},
 							longevity: 3,
 							propagate: true,
 						};
@@ -539,15 +530,13 @@ mod tests {
 						Ok(transaction)
 					}
 				},
-				Extrinsic::IncludeData(_) => {
-					Ok(ValidTransaction {
-						priority: 9001,
-						requires: vec![],
-						provides: vec![vec![42]],
-						longevity: 9001,
-						propagate: false,
-					})
-				},
+				Extrinsic::IncludeData(_) => Ok(ValidTransaction {
+					priority: 9001,
+					requires: vec![],
+					provides: vec![vec![42]],
+					longevity: 9001,
+					propagate: false,
+				}),
 				_ => unimplemented!(),
 			};
 
@@ -613,12 +602,17 @@ mod tests {
 		let pool = pool();
 
 		// when
-		let hash = block_on(pool.submit_one(&BlockId::Number(0), SOURCE, uxt(Transfer {
-			from: AccountId::from_h256(H256::from_low_u64_be(1)),
-			to: AccountId::from_h256(H256::from_low_u64_be(2)),
-			amount: 5,
-			nonce: 0,
-		}))).unwrap();
+		let hash = block_on(pool.submit_one(
+			&BlockId::Number(0),
+			SOURCE,
+			uxt(Transfer {
+				from: AccountId::from_h256(H256::from_low_u64_be(1)),
+				to: AccountId::from_h256(H256::from_low_u64_be(2)),
+				amount: 5,
+				nonce: 0,
+			}),
+		))
+		.unwrap();
 
 		// then
 		assert_eq!(pool.validated_pool().ready().map(|v| v.hash).collect::<Vec<_>>(), vec![hash]);
@@ -673,25 +667,40 @@ mod tests {
 			let stream = pool.validated_pool().import_notification_stream();
 
 			// when
-			let hash0 = block_on(pool.submit_one(&BlockId::Number(0), SOURCE, uxt(Transfer {
-				from: AccountId::from_h256(H256::from_low_u64_be(1)),
-				to: AccountId::from_h256(H256::from_low_u64_be(2)),
-				amount: 5,
-				nonce: 0,
-			}))).unwrap();
-			let hash1 = block_on(pool.submit_one(&BlockId::Number(0), SOURCE, uxt(Transfer {
-				from: AccountId::from_h256(H256::from_low_u64_be(1)),
-				to: AccountId::from_h256(H256::from_low_u64_be(2)),
-				amount: 5,
-				nonce: 1,
-			}))).unwrap();
+			let hash0 = block_on(pool.submit_one(
+				&BlockId::Number(0),
+				SOURCE,
+				uxt(Transfer {
+					from: AccountId::from_h256(H256::from_low_u64_be(1)),
+					to: AccountId::from_h256(H256::from_low_u64_be(2)),
+					amount: 5,
+					nonce: 0,
+				}),
+			))
+			.unwrap();
+			let hash1 = block_on(pool.submit_one(
+				&BlockId::Number(0),
+				SOURCE,
+				uxt(Transfer {
+					from: AccountId::from_h256(H256::from_low_u64_be(1)),
+					to: AccountId::from_h256(H256::from_low_u64_be(2)),
+					amount: 5,
+					nonce: 1,
+				}),
+			))
+			.unwrap();
 			// future doesn't count
-			let _hash = block_on(pool.submit_one(&BlockId::Number(0), SOURCE, uxt(Transfer {
-				from: AccountId::from_h256(H256::from_low_u64_be(1)),
-				to: AccountId::from_h256(H256::from_low_u64_be(2)),
-				amount: 5,
-				nonce: 3,
-			}))).unwrap();
+			let _hash = block_on(pool.submit_one(
+				&BlockId::Number(0),
+				SOURCE,
+				uxt(Transfer {
+					from: AccountId::from_h256(H256::from_low_u64_be(1)),
+					to: AccountId::from_h256(H256::from_low_u64_be(2)),
+					amount: 5,
+					nonce: 3,
+				}),
+			))
+			.unwrap();
 
 			assert_eq!(pool.validated_pool().status().ready, 2);
 			assert_eq!(pool.validated_pool().status().future, 1);
@@ -710,24 +719,39 @@ mod tests {
 	fn should_clear_stale_transactions() {
 		// given
 		let pool = pool();
-		let hash1 = block_on(pool.submit_one(&BlockId::Number(0), SOURCE, uxt(Transfer {
-			from: AccountId::from_h256(H256::from_low_u64_be(1)),
-			to: AccountId::from_h256(H256::from_low_u64_be(2)),
-			amount: 5,
-			nonce: 0,
-		}))).unwrap();
-		let hash2 = block_on(pool.submit_one(&BlockId::Number(0), SOURCE, uxt(Transfer {
-			from: AccountId::from_h256(H256::from_low_u64_be(1)),
-			to: AccountId::from_h256(H256::from_low_u64_be(2)),
-			amount: 5,
-			nonce: 1,
-		}))).unwrap();
-		let hash3 = block_on(pool.submit_one(&BlockId::Number(0), SOURCE, uxt(Transfer {
-			from: AccountId::from_h256(H256::from_low_u64_be(1)),
-			to: AccountId::from_h256(H256::from_low_u64_be(2)),
-			amount: 5,
-			nonce: 3,
-		}))).unwrap();
+		let hash1 = block_on(pool.submit_one(
+			&BlockId::Number(0),
+			SOURCE,
+			uxt(Transfer {
+				from: AccountId::from_h256(H256::from_low_u64_be(1)),
+				to: AccountId::from_h256(H256::from_low_u64_be(2)),
+				amount: 5,
+				nonce: 0,
+			}),
+		))
+		.unwrap();
+		let hash2 = block_on(pool.submit_one(
+			&BlockId::Number(0),
+			SOURCE,
+			uxt(Transfer {
+				from: AccountId::from_h256(H256::from_low_u64_be(1)),
+				to: AccountId::from_h256(H256::from_low_u64_be(2)),
+				amount: 5,
+				nonce: 1,
+			}),
+		))
+		.unwrap();
+		let hash3 = block_on(pool.submit_one(
+			&BlockId::Number(0),
+			SOURCE,
+			uxt(Transfer {
+				from: AccountId::from_h256(H256::from_low_u64_be(1)),
+				to: AccountId::from_h256(H256::from_low_u64_be(2)),
+				amount: 5,
+				nonce: 3,
+			}),
+		))
+		.unwrap();
 
 		// when
 		pool.validated_pool.clear_stale(&BlockId::Number(5)).unwrap();
@@ -746,12 +770,17 @@ mod tests {
 	fn should_ban_mined_transactions() {
 		// given
 		let pool = pool();
-		let hash1 = block_on(pool.submit_one(&BlockId::Number(0), SOURCE, uxt(Transfer {
-			from: AccountId::from_h256(H256::from_low_u64_be(1)),
-			to: AccountId::from_h256(H256::from_low_u64_be(2)),
-			amount: 5,
-			nonce: 0,
-		}))).unwrap();
+		let hash1 = block_on(pool.submit_one(
+			&BlockId::Number(0),
+			SOURCE,
+			uxt(Transfer {
+				from: AccountId::from_h256(H256::from_low_u64_be(1)),
+				to: AccountId::from_h256(H256::from_low_u64_be(2)),
+				amount: 5,
+				nonce: 0,
+			}),
+		))
+		.unwrap();
 
 		// when
 		block_on(pool.prune_tags(&BlockId::Number(1), vec![vec![0]], vec![hash1.clone()])).unwrap();
@@ -763,34 +792,37 @@ mod tests {
 	#[test]
 	fn should_limit_futures() {
 		// given
-		let limit = Limit {
-			count: 100,
-			total_bytes: 200,
-		};
+		let limit = Limit { count: 100, total_bytes: 200 };
 
-		let options = Options {
-			ready: limit.clone(),
-			future: limit.clone(),
-			..Default::default()
-		};
+		let options = Options { ready: limit.clone(), future: limit.clone(), ..Default::default() };
 
 		let pool = Pool::new(options, true.into(), TestApi::default().into());
 
-		let hash1 = block_on(pool.submit_one(&BlockId::Number(0), SOURCE, uxt(Transfer {
-			from: AccountId::from_h256(H256::from_low_u64_be(1)),
-			to: AccountId::from_h256(H256::from_low_u64_be(2)),
-			amount: 5,
-			nonce: 1,
-		}))).unwrap();
+		let hash1 = block_on(pool.submit_one(
+			&BlockId::Number(0),
+			SOURCE,
+			uxt(Transfer {
+				from: AccountId::from_h256(H256::from_low_u64_be(1)),
+				to: AccountId::from_h256(H256::from_low_u64_be(2)),
+				amount: 5,
+				nonce: 1,
+			}),
+		))
+		.unwrap();
 		assert_eq!(pool.validated_pool().status().future, 1);
 
 		// when
-		let hash2 = block_on(pool.submit_one(&BlockId::Number(0), SOURCE, uxt(Transfer {
-			from: AccountId::from_h256(H256::from_low_u64_be(2)),
-			to: AccountId::from_h256(H256::from_low_u64_be(2)),
-			amount: 5,
-			nonce: 10,
-		}))).unwrap();
+		let hash2 = block_on(pool.submit_one(
+			&BlockId::Number(0),
+			SOURCE,
+			uxt(Transfer {
+				from: AccountId::from_h256(H256::from_low_u64_be(2)),
+				to: AccountId::from_h256(H256::from_low_u64_be(2)),
+				amount: 5,
+				nonce: 10,
+			}),
+		))
+		.unwrap();
 
 		// then
 		assert_eq!(pool.validated_pool().status().future, 1);
@@ -801,26 +833,24 @@ mod tests {
 	#[test]
 	fn should_error_if_reject_immediately() {
 		// given
-		let limit = Limit {
-			count: 100,
-			total_bytes: 10,
-		};
+		let limit = Limit { count: 100, total_bytes: 10 };
 
-		let options = Options {
-			ready: limit.clone(),
-			future: limit.clone(),
-			..Default::default()
-		};
+		let options = Options { ready: limit.clone(), future: limit.clone(), ..Default::default() };
 
 		let pool = Pool::new(options, true.into(), TestApi::default().into());
 
 		// when
-		block_on(pool.submit_one(&BlockId::Number(0), SOURCE, uxt(Transfer {
-			from: AccountId::from_h256(H256::from_low_u64_be(1)),
-			to: AccountId::from_h256(H256::from_low_u64_be(2)),
-			amount: 5,
-			nonce: 1,
-		}))).unwrap_err();
+		block_on(pool.submit_one(
+			&BlockId::Number(0),
+			SOURCE,
+			uxt(Transfer {
+				from: AccountId::from_h256(H256::from_low_u64_be(1)),
+				to: AccountId::from_h256(H256::from_low_u64_be(2)),
+				amount: 5,
+				nonce: 1,
+			}),
+		))
+		.unwrap_err();
 
 		// then
 		assert_eq!(pool.validated_pool().status().ready, 0);
@@ -833,12 +863,17 @@ mod tests {
 		let pool = pool();
 
 		// when
-		let err = block_on(pool.submit_one(&BlockId::Number(0), SOURCE, uxt(Transfer {
-			from: AccountId::from_h256(H256::from_low_u64_be(1)),
-			to: AccountId::from_h256(H256::from_low_u64_be(2)),
-			amount: 5,
-			nonce: INVALID_NONCE,
-		}))).unwrap_err();
+		let err = block_on(pool.submit_one(
+			&BlockId::Number(0),
+			SOURCE,
+			uxt(Transfer {
+				from: AccountId::from_h256(H256::from_low_u64_be(1)),
+				to: AccountId::from_h256(H256::from_low_u64_be(2)),
+				amount: 5,
+				nonce: INVALID_NONCE,
+			}),
+		))
+		.unwrap_err();
 
 		// then
 		assert_eq!(pool.validated_pool().status().ready, 0);
@@ -853,12 +888,17 @@ mod tests {
 		fn should_trigger_ready_and_finalized() {
 			// given
 			let pool = pool();
-			let watcher = block_on(pool.submit_and_watch(&BlockId::Number(0), SOURCE, uxt(Transfer {
-				from: AccountId::from_h256(H256::from_low_u64_be(1)),
-				to: AccountId::from_h256(H256::from_low_u64_be(2)),
-				amount: 5,
-				nonce: 0,
-			}))).unwrap();
+			let watcher = block_on(pool.submit_and_watch(
+				&BlockId::Number(0),
+				SOURCE,
+				uxt(Transfer {
+					from: AccountId::from_h256(H256::from_low_u64_be(1)),
+					to: AccountId::from_h256(H256::from_low_u64_be(2)),
+					amount: 5,
+					nonce: 0,
+				}),
+			))
+			.unwrap();
 			assert_eq!(pool.validated_pool().status().ready, 1);
 			assert_eq!(pool.validated_pool().status().future, 0);
 
@@ -880,19 +920,27 @@ mod tests {
 		fn should_trigger_ready_and_finalized_when_pruning_via_hash() {
 			// given
 			let pool = pool();
-			let watcher = block_on(pool.submit_and_watch(&BlockId::Number(0), SOURCE, uxt(Transfer {
-				from: AccountId::from_h256(H256::from_low_u64_be(1)),
-				to: AccountId::from_h256(H256::from_low_u64_be(2)),
-				amount: 5,
-				nonce: 0,
-			}))).unwrap();
+			let watcher = block_on(pool.submit_and_watch(
+				&BlockId::Number(0),
+				SOURCE,
+				uxt(Transfer {
+					from: AccountId::from_h256(H256::from_low_u64_be(1)),
+					to: AccountId::from_h256(H256::from_low_u64_be(2)),
+					amount: 5,
+					nonce: 0,
+				}),
+			))
+			.unwrap();
 			assert_eq!(pool.validated_pool().status().ready, 1);
 			assert_eq!(pool.validated_pool().status().future, 0);
 
 			// when
-			block_on(
-				pool.prune_tags(&BlockId::Number(2), vec![vec![0u8]], vec![watcher.hash().clone()]),
-			).unwrap();
+			block_on(pool.prune_tags(
+				&BlockId::Number(2),
+				vec![vec![0u8]],
+				vec![watcher.hash().clone()],
+			))
+			.unwrap();
 			assert_eq!(pool.validated_pool().status().ready, 0);
 			assert_eq!(pool.validated_pool().status().future, 0);
 
@@ -909,22 +957,32 @@ mod tests {
 		fn should_trigger_future_and_ready_after_promoted() {
 			// given
 			let pool = pool();
-			let watcher = block_on(pool.submit_and_watch(&BlockId::Number(0), SOURCE, uxt(Transfer {
-				from: AccountId::from_h256(H256::from_low_u64_be(1)),
-				to: AccountId::from_h256(H256::from_low_u64_be(2)),
-				amount: 5,
-				nonce: 1,
-			}))).unwrap();
+			let watcher = block_on(pool.submit_and_watch(
+				&BlockId::Number(0),
+				SOURCE,
+				uxt(Transfer {
+					from: AccountId::from_h256(H256::from_low_u64_be(1)),
+					to: AccountId::from_h256(H256::from_low_u64_be(2)),
+					amount: 5,
+					nonce: 1,
+				}),
+			))
+			.unwrap();
 			assert_eq!(pool.validated_pool().status().ready, 0);
 			assert_eq!(pool.validated_pool().status().future, 1);
 
 			// when
-			block_on(pool.submit_one(&BlockId::Number(0), SOURCE, uxt(Transfer {
-				from: AccountId::from_h256(H256::from_low_u64_be(1)),
-				to: AccountId::from_h256(H256::from_low_u64_be(2)),
-				amount: 5,
-				nonce: 0,
-			}))).unwrap();
+			block_on(pool.submit_one(
+				&BlockId::Number(0),
+				SOURCE,
+				uxt(Transfer {
+					from: AccountId::from_h256(H256::from_low_u64_be(1)),
+					to: AccountId::from_h256(H256::from_low_u64_be(2)),
+					amount: 5,
+					nonce: 0,
+				}),
+			))
+			.unwrap();
 			assert_eq!(pool.validated_pool().status().ready, 2);
 
 			// then
@@ -943,13 +1001,13 @@ mod tests {
 				amount: 5,
 				nonce: 0,
 			});
-			let watcher = block_on(pool.submit_and_watch(&BlockId::Number(0), SOURCE, uxt)).unwrap();
+			let watcher =
+				block_on(pool.submit_and_watch(&BlockId::Number(0), SOURCE, uxt)).unwrap();
 			assert_eq!(pool.validated_pool().status().ready, 1);
 
 			// when
 			pool.validated_pool.remove_invalid(&[*watcher.hash()]);
 
-
 			// then
 			let mut stream = futures::executor::block_on_stream(watcher.into_stream());
 			assert_eq!(stream.next(), Some(TransactionStatus::Ready));
@@ -967,7 +1025,8 @@ mod tests {
 				amount: 5,
 				nonce: 0,
 			});
-			let watcher = block_on(pool.submit_and_watch(&BlockId::Number(0), SOURCE, uxt)).unwrap();
+			let watcher =
+				block_on(pool.submit_and_watch(&BlockId::Number(0), SOURCE, uxt)).unwrap();
 			assert_eq!(pool.validated_pool().status().ready, 1);
 
 			// when
@@ -976,7 +1035,6 @@ mod tests {
 			map.insert(*watcher.hash(), peers.clone());
 			pool.validated_pool().on_broadcasted(map);
 
-
 			// then
 			let mut stream = futures::executor::block_on_stream(watcher.into_stream());
 			assert_eq!(stream.next(), Some(TransactionStatus::Ready));
@@ -986,15 +1044,9 @@ mod tests {
 		#[test]
 		fn should_trigger_dropped() {
 			// given
-			let limit = Limit {
-				count: 1,
-				total_bytes: 1000,
-			};
-			let options = Options {
-				ready: limit.clone(),
-				future: limit.clone(),
-				..Default::default()
-			};
+			let limit = Limit { count: 1, total_bytes: 1000 };
+			let options =
+				Options { ready: limit.clone(), future: limit.clone(), ..Default::default() };
 
 			let pool = Pool::new(options, true.into(), TestApi::default().into());
 
@@ -1064,7 +1116,6 @@ mod tests {
 			block_on(pool.prune_tags(&BlockId::Number(1), vec![provides], vec![])).unwrap();
 			assert_eq!(pool.validated_pool().status().ready, 0);
 
-
 			// so when we release the verification of the previous one it will have
 			// something in `requires`, but should go to ready directly, since the previous transaction was imported
 			// correctly.
diff --git a/client/transaction-pool/src/graph/ready.rs b/client/transaction-pool/src/graph/ready.rs
index 46f13f4e82dc..ac842b99bf12 100644
--- a/client/transaction-pool/src/graph/ready.rs
+++ b/client/transaction-pool/src/graph/ready.rs
@@ -17,19 +17,16 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use std::{
-	collections::{HashMap, HashSet, BTreeSet},
 	cmp,
+	collections::{BTreeSet, HashMap, HashSet},
 	hash,
 	sync::Arc,
 };
 
-use serde::Serialize;
 use log::trace;
-use sp_runtime::traits::Member;
-use sp_runtime::transaction_validity::{
-	TransactionTag as Tag,
-};
 use sc_transaction_pool_api::error;
+use serde::Serialize;
+use sp_runtime::{traits::Member, transaction_validity::TransactionTag as Tag};
 
 use super::{
 	base_pool::Transaction,
@@ -50,16 +47,15 @@ pub struct TransactionRef<Hash, Ex> {
 
 impl<Hash, Ex> Clone for TransactionRef<Hash, Ex> {
 	fn clone(&self) -> Self {
-		Self {
-			transaction: self.transaction.clone(),
-			insertion_id: self.insertion_id,
-		}
+		Self { transaction: self.transaction.clone(), insertion_id: self.insertion_id }
 	}
 }
 
 impl<Hash, Ex> Ord for TransactionRef<Hash, Ex> {
 	fn cmp(&self, other: &Self) -> cmp::Ordering {
-		self.transaction.priority.cmp(&other.transaction.priority)
+		self.transaction
+			.priority
+			.cmp(&other.transaction.priority)
 			.then_with(|| other.transaction.valid_till.cmp(&self.transaction.valid_till))
 			.then_with(|| other.insertion_id.cmp(&self.insertion_id))
 	}
@@ -149,7 +145,7 @@ impl<Hash: hash::Hash + Member + Serialize, Ex> ReadyTransactions<Hash, Ex> {
 	///
 	/// Transactions are returned in order:
 	/// 1. First by the dependencies:
-	///	- never return transaction that requires a tag, which was not provided by one of the previously
+	/// 	- never return transaction that requires a tag, which was not provided by one of the previously
 	/// returned transactions
 	/// 2. Then by priority:
 	/// - If there are two transactions with all requirements satisfied the one with higher priority goes first.
@@ -157,7 +153,7 @@ impl<Hash: hash::Hash + Member + Serialize, Ex> ReadyTransactions<Hash, Ex> {
 	/// - transactions that are valid for a shorter time go first
 	/// 4. Lastly we sort by the time in the queue
 	/// - transactions that are longer in the queue go first
-	pub fn get(&self) -> impl Iterator<Item=Arc<Transaction<Hash, Ex>>> {
+	pub fn get(&self) -> impl Iterator<Item = Arc<Transaction<Hash, Ex>>> {
 		BestIterator {
 			all: self.ready.clone(),
 			best: self.best.clone(),
@@ -176,9 +172,13 @@ impl<Hash: hash::Hash + Member + Serialize, Ex> ReadyTransactions<Hash, Ex> {
 	) -> error::Result<Vec<Arc<Transaction<Hash, Ex>>>> {
 		assert!(
 			tx.is_ready(),
-			"Only ready transactions can be imported. Missing: {:?}", tx.missing_tags
+			"Only ready transactions can be imported. Missing: {:?}",
+			tx.missing_tags
+		);
+		assert!(
+			!self.ready.read().contains_key(&tx.transaction.hash),
+			"Transaction is already imported."
 		);
-		assert!(!self.ready.read().contains_key(&tx.transaction.hash), "Transaction is already imported.");
 
 		self.insertion_id += 1;
 		let insertion_id = self.insertion_id;
@@ -201,7 +201,7 @@ impl<Hash: hash::Hash + Member + Serialize, Ex> ReadyTransactions<Hash, Ex> {
 			} else {
 				requires_offset += 1;
 			}
-	 	}
+		}
 
 		// update provided_tags
 		// call to replace_previous guarantees that we will be overwriting
@@ -210,10 +210,7 @@ impl<Hash: hash::Hash + Member + Serialize, Ex> ReadyTransactions<Hash, Ex> {
 			self.provided_tags.insert(tag.clone(), hash.clone());
 		}
 
-		let transaction = TransactionRef {
-			insertion_id,
-			transaction
-		};
+		let transaction = TransactionRef { insertion_id, transaction };
 
 		// insert to best if it doesn't require any other transaction to be included before it
 		if goes_to_best {
@@ -221,21 +218,17 @@ impl<Hash: hash::Hash + Member + Serialize, Ex> ReadyTransactions<Hash, Ex> {
 		}
 
 		// insert to Ready
-		ready.insert(hash, ReadyTx {
-			transaction,
-			unlocks,
-			requires_offset,
-		});
+		ready.insert(hash, ReadyTx { transaction, unlocks, requires_offset });
 
 		Ok(replaced)
 	}
 
 	/// Fold a list of ready transactions to compute a single value.
-	pub fn fold<R, F: FnMut(Option<R>, &ReadyTx<Hash, Ex>) -> Option<R>>(&mut self, f: F) -> Option<R> {
-		self.ready
-			.read()
-			.values()
-			.fold(None, f)
+	pub fn fold<R, F: FnMut(Option<R>, &ReadyTx<Hash, Ex>) -> Option<R>>(
+		&mut self,
+		f: F,
+	) -> Option<R> {
+		self.ready.read().values().fold(None, f)
 	}
 
 	/// Returns true if given transaction is part of the queue.
@@ -251,9 +244,10 @@ impl<Hash: hash::Hash + Member + Serialize, Ex> ReadyTransactions<Hash, Ex> {
 	/// Retrieve transactions by hash
 	pub fn by_hashes(&self, hashes: &[Hash]) -> Vec<Option<Arc<Transaction<Hash, Ex>>>> {
 		let ready = self.ready.read();
-		hashes.iter().map(|hash| {
-			ready.get(hash).map(|x| x.transaction.transaction.clone())
-		}).collect()
+		hashes
+			.iter()
+			.map(|hash| ready.get(hash).map(|x| x.transaction.transaction.clone()))
+			.collect()
 	}
 
 	/// Removes a subtree of transactions from the ready pool.
@@ -280,13 +274,12 @@ impl<Hash: hash::Hash + Member + Serialize, Ex> ReadyTransactions<Hash, Ex> {
 		let mut ready = self.ready.write();
 		while let Some(hash) = to_remove.pop() {
 			if let Some(mut tx) = ready.remove(&hash) {
-				let invalidated = tx.transaction.transaction.provides
-					.iter()
-					.filter(|tag| provides_tag_filter
+				let invalidated = tx.transaction.transaction.provides.iter().filter(|tag| {
+					provides_tag_filter
 						.as_ref()
 						.map(|filter| !filter.contains(&**tag))
 						.unwrap_or(true)
-					);
+				});
 
 				let mut removed_some_tags = false;
 				// remove entries from provided_tags
@@ -331,7 +324,9 @@ impl<Hash: hash::Hash + Member + Serialize, Ex> ReadyTransactions<Hash, Ex> {
 		let mut to_remove = vec![tag];
 
 		while let Some(tag) = to_remove.pop() {
-			let res = self.provided_tags.remove(&tag)
+			let res = self
+				.provided_tags
+				.remove(&tag)
 				.and_then(|hash| self.ready.write().remove(&hash));
 
 			if let Some(tx) = res {
@@ -417,19 +412,18 @@ impl<Hash: hash::Hash + Member + Serialize, Ex> ReadyTransactions<Hash, Ex> {
 	fn replace_previous(
 		&mut self,
 		tx: &Transaction<Hash, Ex>,
-	) -> error::Result<
-		(Vec<Arc<Transaction<Hash, Ex>>>, Vec<Hash>)
-	> {
+	) -> error::Result<(Vec<Arc<Transaction<Hash, Ex>>>, Vec<Hash>)> {
 		let (to_remove, unlocks) = {
 			// check if we are replacing a transaction
-			let replace_hashes = tx.provides
+			let replace_hashes = tx
+				.provides
 				.iter()
 				.filter_map(|tag| self.provided_tags.get(tag))
 				.collect::<HashSet<_>>();
 
 			// early exit if we are not replacing anything.
 			if replace_hashes.is_empty() {
-				return Ok((vec![], vec![]));
+				return Ok((vec![], vec![]))
 			}
 
 			// now check if collective priority is lower than the replacement transaction.
@@ -438,9 +432,9 @@ impl<Hash: hash::Hash + Member + Serialize, Ex> ReadyTransactions<Hash, Ex> {
 				replace_hashes
 					.iter()
 					.filter_map(|hash| ready.get(hash))
-					.fold(0u64, |total, tx|
+					.fold(0u64, |total, tx| {
 						total.saturating_add(tx.transaction.transaction.priority)
-					)
+					})
 			};
 
 			// bail - the transaction has too low priority to replace the old ones
@@ -451,28 +445,22 @@ impl<Hash: hash::Hash + Member + Serialize, Ex> ReadyTransactions<Hash, Ex> {
 			// construct a list of unlocked transactions
 			let unlocks = {
 				let ready = self.ready.read();
-				replace_hashes
-					.iter()
-					.filter_map(|hash| ready.get(hash))
-					.fold(vec![], |mut list, tx| {
+				replace_hashes.iter().filter_map(|hash| ready.get(hash)).fold(
+					vec![],
+					|mut list, tx| {
 						list.extend(tx.unlocks.iter().cloned());
 						list
-					})
+					},
+				)
 			};
 
-			(
-				replace_hashes.into_iter().cloned().collect::<Vec<_>>(),
-				unlocks
-			)
+			(replace_hashes.into_iter().cloned().collect::<Vec<_>>(), unlocks)
 		};
 
 		let new_provides = tx.provides.iter().cloned().collect::<HashSet<_>>();
 		let removed = self.remove_subtree_with_tag_filter(to_remove, Some(new_provides));
 
-		Ok((
-			removed,
-			unlocks
-		))
+		Ok((removed, unlocks))
 	}
 
 	/// Returns number of transactions in this queue.
@@ -500,7 +488,6 @@ impl<Hash: hash::Hash + Member, Ex> BestIterator<Hash, Ex> {
 		if satisfied >= tx_ref.transaction.requires.len() {
 			// If we have satisfied all deps insert to best
 			self.best.insert(tx_ref);
-
 		} else {
 			// otherwise we're still awaiting for some deps
 			self.awaiting.insert(tx_ref.transaction.hash.clone(), (satisfied, tx_ref));
@@ -531,7 +518,10 @@ impl<Hash: hash::Hash + Member, Ex> Iterator for BestIterator<Hash, Ex> {
 					Some((satisfied, tx_ref))
 				// then get from the pool
 				} else {
-					self.all.read().get(hash).map(|next| (next.requires_offset + 1, next.transaction.clone()))
+					self.all
+						.read()
+						.get(hash)
+						.map(|next| (next.requires_offset + 1, next.transaction.clone()))
 				};
 				if let Some((satisfied, tx_ref)) = res {
 					self.best_or_awaiting(satisfied, tx_ref)
@@ -571,7 +561,7 @@ mod tests {
 
 	fn import<H: hash::Hash + Eq + Member + Serialize, Ex>(
 		ready: &mut ReadyTransactions<H, Ex>,
-		tx: Transaction<H, Ex>
+		tx: Transaction<H, Ex>,
 	) -> error::Result<Vec<Arc<Transaction<H, Ex>>>> {
 		let x = WaitingTransaction::new(tx, ready.provided_tags(), &[]);
 		ready.import(x)
@@ -662,7 +652,7 @@ mod tests {
 			bytes: 1,
 			hash: 5,
 			priority: 1,
-			valid_till: u64::MAX,	// use the max here for testing.
+			valid_till: u64::MAX, // use the max here for testing.
 			requires: vec![tx1.provides[0].clone()],
 			provides: vec![],
 			propagate: true,
@@ -695,7 +685,7 @@ mod tests {
 			bytes: 1,
 			hash: 5,
 			priority: 1,
-			valid_till: u64::MAX,	// use the max here for testing.
+			valid_till: u64::MAX, // use the max here for testing.
 			requires: vec![],
 			provides: vec![],
 			propagate: true,
@@ -717,28 +707,19 @@ mod tests {
 			tx
 		};
 		// higher priority = better
-		assert!(TransactionRef {
-			transaction: Arc::new(with_priority(3, 3)),
-			insertion_id: 1,
-		} > TransactionRef {
-			transaction: Arc::new(with_priority(2, 3)),
-			insertion_id: 2,
-		});
+		assert!(
+			TransactionRef { transaction: Arc::new(with_priority(3, 3)), insertion_id: 1 } >
+				TransactionRef { transaction: Arc::new(with_priority(2, 3)), insertion_id: 2 }
+		);
 		// lower validity = better
-		assert!(TransactionRef {
-			transaction: Arc::new(with_priority(3, 2)),
-			insertion_id: 1,
-		} > TransactionRef {
-			transaction: Arc::new(with_priority(3, 3)),
-			insertion_id: 2,
-		});
+		assert!(
+			TransactionRef { transaction: Arc::new(with_priority(3, 2)), insertion_id: 1 } >
+				TransactionRef { transaction: Arc::new(with_priority(3, 3)), insertion_id: 2 }
+		);
 		// lower insertion_id = better
-		assert!(TransactionRef {
-			transaction: Arc::new(with_priority(3, 3)),
-			insertion_id: 1,
-		} > TransactionRef {
-			transaction: Arc::new(with_priority(3, 3)),
-			insertion_id: 2,
-		});
+		assert!(
+			TransactionRef { transaction: Arc::new(with_priority(3, 3)), insertion_id: 1 } >
+				TransactionRef { transaction: Arc::new(with_priority(3, 3)), insertion_id: 2 }
+		);
 	}
 }
diff --git a/client/transaction-pool/src/graph/rotator.rs b/client/transaction-pool/src/graph/rotator.rs
index 0e4fd0abf297..820fde35dac1 100644
--- a/client/transaction-pool/src/graph/rotator.rs
+++ b/client/transaction-pool/src/graph/rotator.rs
@@ -21,13 +21,8 @@
 //! Keeps only recent extrinsic and discard the ones kept for a significant amount of time.
 //! Discarded extrinsics are banned so that they don't get re-imported again.
 
-use std::{
-	collections::HashMap,
-	hash,
-	iter,
-	time::Duration,
-};
 use parking_lot::RwLock;
+use std::{collections::HashMap, hash, iter, time::Duration};
 use wasm_timer::Instant;
 
 use super::base_pool::Transaction;
@@ -48,10 +43,7 @@ pub struct PoolRotator<Hash> {
 
 impl<Hash: hash::Hash + Eq> Default for PoolRotator<Hash> {
 	fn default() -> Self {
-		Self {
-			ban_time: Duration::from_secs(60 * 30),
-			banned_until: Default::default(),
-		}
+		Self { ban_time: Duration::from_secs(60 * 30), banned_until: Default::default() }
 	}
 }
 
@@ -62,7 +54,7 @@ impl<Hash: hash::Hash + Eq + Clone> PoolRotator<Hash> {
 	}
 
 	/// Bans given set of hashes.
-	pub fn ban(&self, now: &Instant, hashes: impl IntoIterator<Item=Hash>) {
+	pub fn ban(&self, now: &Instant, hashes: impl IntoIterator<Item = Hash>) {
 		let mut banned = self.banned_until.write();
 
 		for hash in hashes {
@@ -81,9 +73,14 @@ impl<Hash: hash::Hash + Eq + Clone> PoolRotator<Hash> {
 	/// Bans extrinsic if it's stale.
 	///
 	/// Returns `true` if extrinsic is stale and got banned.
-	pub fn ban_if_stale<Ex>(&self, now: &Instant, current_block: u64, xt: &Transaction<Hash, Ex>) -> bool {
+	pub fn ban_if_stale<Ex>(
+		&self,
+		now: &Instant,
+		current_block: u64,
+		xt: &Transaction<Hash, Ex>,
+	) -> bool {
 		if xt.valid_till > current_block {
-			return false;
+			return false
 		}
 
 		self.ban(now, iter::once(xt.hash.clone()));
@@ -107,10 +104,7 @@ mod tests {
 	type Ex = ();
 
 	fn rotator() -> PoolRotator<Hash> {
-		PoolRotator {
-			ban_time: Duration::from_millis(10),
-			..Default::default()
-		}
+		PoolRotator { ban_time: Duration::from_millis(10), ..Default::default() }
 	}
 
 	fn tx() -> (Hash, Transaction<Hash, Ex>) {
@@ -160,7 +154,6 @@ mod tests {
 		assert!(rotator.is_banned(&hash));
 	}
 
-
 	#[test]
 	fn should_clear_banned() {
 		// given
@@ -201,14 +194,14 @@ mod tests {
 		let past_block = 0;
 
 		// when
-		for i in 0..2*EXPECTED_SIZE {
+		for i in 0..2 * EXPECTED_SIZE {
 			let tx = tx_with(i as u64, past_block);
 			assert!(rotator.ban_if_stale(&now, past_block, &tx));
 		}
-		assert_eq!(rotator.banned_until.read().len(), 2*EXPECTED_SIZE);
+		assert_eq!(rotator.banned_until.read().len(), 2 * EXPECTED_SIZE);
 
 		// then
-		let tx = tx_with(2*EXPECTED_SIZE as u64, past_block);
+		let tx = tx_with(2 * EXPECTED_SIZE as u64, past_block);
 		// trigger a garbage collection
 		assert!(rotator.ban_if_stale(&now, past_block, &tx));
 		assert_eq!(rotator.banned_until.read().len(), EXPECTED_SIZE);
diff --git a/client/transaction-pool/src/graph/tracked_map.rs b/client/transaction-pool/src/graph/tracked_map.rs
index 98fd9e21b316..c1fdda227c6a 100644
--- a/client/transaction-pool/src/graph/tracked_map.rs
+++ b/client/transaction-pool/src/graph/tracked_map.rs
@@ -16,11 +16,14 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+use parking_lot::{RwLock, RwLockReadGuard, RwLockWriteGuard};
 use std::{
 	collections::HashMap,
-	sync::{Arc, atomic::{AtomicIsize, Ordering as AtomicOrdering}},
+	sync::{
+		atomic::{AtomicIsize, Ordering as AtomicOrdering},
+		Arc,
+	},
 };
-use parking_lot::{RwLock, RwLockWriteGuard, RwLockReadGuard};
 
 /// Something that can report its size.
 pub trait Size {
@@ -39,11 +42,7 @@ pub struct TrackedMap<K, V> {
 
 impl<K, V> Default for TrackedMap<K, V> {
 	fn default() -> Self {
-		Self {
-			index: Arc::new(HashMap::default().into()),
-			bytes: 0.into(),
-			length: 0.into(),
-		}
+		Self { index: Arc::new(HashMap::default().into()), bytes: 0.into(), length: 0.into() }
 	}
 }
 
@@ -65,9 +64,7 @@ impl<K, V> TrackedMap<K, V> {
 
 	/// Lock map for read.
 	pub fn read(&self) -> TrackedMapReadAccess<K, V> {
-		TrackedMapReadAccess {
-			inner_guard: self.index.read(),
-		}
+		TrackedMapReadAccess { inner_guard: self.index.read() }
 	}
 
 	/// Lock map for write.
@@ -87,13 +84,11 @@ pub struct ReadOnlyTrackedMap<K, V>(Arc<RwLock<HashMap<K, V>>>);
 
 impl<K, V> ReadOnlyTrackedMap<K, V>
 where
-	K: Eq + std::hash::Hash
+	K: Eq + std::hash::Hash,
 {
 	/// Lock map for read.
 	pub fn read(&self) -> TrackedMapReadAccess<K, V> {
-		TrackedMapReadAccess {
-			inner_guard: self.0.read(),
-		}
+		TrackedMapReadAccess { inner_guard: self.0.read() }
 	}
 }
 
@@ -103,7 +98,7 @@ pub struct TrackedMapReadAccess<'a, K, V> {
 
 impl<'a, K, V> TrackedMapReadAccess<'a, K, V>
 where
-	K: Eq + std::hash::Hash
+	K: Eq + std::hash::Hash,
 {
 	/// Returns true if map contains key.
 	pub fn contains_key(&self, key: &K) -> bool {
@@ -129,7 +124,8 @@ pub struct TrackedMapWriteAccess<'a, K, V> {
 
 impl<'a, K, V> TrackedMapWriteAccess<'a, K, V>
 where
-	K: Eq + std::hash::Hash, V: Size
+	K: Eq + std::hash::Hash,
+	V: Size,
 {
 	/// Insert value and return previous (if any).
 	pub fn insert(&mut self, key: K, val: V) -> Option<V> {
@@ -165,7 +161,9 @@ mod tests {
 	use super::*;
 
 	impl Size for i32 {
-		fn size(&self) -> usize { *self as usize / 10 }
+		fn size(&self) -> usize {
+			*self as usize / 10
+		}
 	}
 
 	#[test]
diff --git a/client/transaction-pool/src/graph/validated_pool.rs b/client/transaction-pool/src/graph/validated_pool.rs
index 5feba94dc56b..3ac7f002077c 100644
--- a/client/transaction-pool/src/graph/validated_pool.rs
+++ b/client/transaction-pool/src/graph/validated_pool.rs
@@ -17,27 +17,31 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use std::{
-	collections::{HashSet, HashMap},
+	collections::{HashMap, HashSet},
 	hash,
 	sync::Arc,
 };
 
-use serde::Serialize;
+use futures::channel::mpsc::{channel, Sender};
 use parking_lot::{Mutex, RwLock};
+use retain_mut::RetainMut;
+use sc_transaction_pool_api::{error, PoolStatus};
+use serde::Serialize;
 use sp_runtime::{
 	generic::BlockId,
 	traits::{self, SaturatedConversion},
-	transaction_validity::{TransactionTag as Tag, ValidTransaction, TransactionSource},
+	transaction_validity::{TransactionSource, TransactionTag as Tag, ValidTransaction},
 };
-use sc_transaction_pool_api::{error, PoolStatus};
 use wasm_timer::Instant;
-use futures::channel::mpsc::{channel, Sender};
-use retain_mut::RetainMut;
 
 use super::{
-	base_pool::{self as base, PruneStatus}, watcher::Watcher,
-	listener::Listener, rotator::PoolRotator,
-	pool::{EventStream, Options, ChainApi, BlockHash, ExtrinsicHash, ExtrinsicFor, TransactionFor},
+	base_pool::{self as base, PruneStatus},
+	listener::Listener,
+	pool::{
+		BlockHash, ChainApi, EventStream, ExtrinsicFor, ExtrinsicHash, Options, TransactionFor,
+	},
+	rotator::PoolRotator,
+	watcher::Watcher,
 };
 
 /// Pre-validated transaction. Validated pool only accepts transactions wrapped in this enum.
@@ -72,19 +76,14 @@ impl<Hash, Ex, Error> ValidatedTransaction<Hash, Ex, Error> {
 			requires: validity.requires,
 			provides: validity.provides,
 			propagate: validity.propagate,
-			valid_till: at
-				.saturated_into::<u64>()
-				.saturating_add(validity.longevity),
+			valid_till: at.saturated_into::<u64>().saturating_add(validity.longevity),
 		})
 	}
 }
 
 /// A type of validated transaction stored in the pool.
-pub type ValidatedTransactionFor<B> = ValidatedTransaction<
-	ExtrinsicHash<B>,
-	ExtrinsicFor<B>,
-	<B as ChainApi>::Error,
->;
+pub type ValidatedTransactionFor<B> =
+	ValidatedTransaction<ExtrinsicHash<B>, ExtrinsicFor<B>, <B as ChainApi>::Error>;
 
 /// A closure that returns true if the local node is a validator that can author blocks.
 pub struct IsValidator(Box<dyn Fn() -> bool + Send + Sync>);
@@ -107,10 +106,7 @@ pub struct ValidatedPool<B: ChainApi> {
 	is_validator: IsValidator,
 	options: Options,
 	listener: RwLock<Listener<ExtrinsicHash<B>, B>>,
-	pool: RwLock<base::BasePool<
-		ExtrinsicHash<B>,
-		ExtrinsicFor<B>,
-	>>,
+	pool: RwLock<base::BasePool<ExtrinsicHash<B>, ExtrinsicFor<B>>>,
 	import_notification_sinks: Mutex<Vec<Sender<ExtrinsicHash<B>>>>,
 	rotator: PoolRotator<ExtrinsicHash<B>>,
 }
@@ -142,7 +138,7 @@ impl<B: ChainApi> ValidatedPool<B> {
 	}
 
 	/// Bans given set of hashes.
-	pub fn ban(&self, now: &Instant, hashes: impl IntoIterator<Item=ExtrinsicHash<B>>) {
+	pub fn ban(&self, now: &Instant, hashes: impl IntoIterator<Item = ExtrinsicHash<B>>) {
 		self.rotator.ban(now, hashes)
 	}
 
@@ -173,9 +169,10 @@ impl<B: ChainApi> ValidatedPool<B> {
 	/// Imports a bunch of pre-validated transactions to the pool.
 	pub fn submit(
 		&self,
-		txs: impl IntoIterator<Item=ValidatedTransactionFor<B>>,
+		txs: impl IntoIterator<Item = ValidatedTransactionFor<B>>,
 	) -> Vec<Result<ExtrinsicHash<B>, B::Error>> {
-		let results = txs.into_iter()
+		let results = txs
+			.into_iter()
 			.map(|validated_tx| self.submit_one(validated_tx))
 			.collect::<Vec<_>>();
 
@@ -186,10 +183,14 @@ impl<B: ChainApi> ValidatedPool<B> {
 			Default::default()
 		};
 
-		results.into_iter().map(|res| match res {
-			Ok(ref hash) if removed.contains(hash) => Err(error::Error::ImmediatelyDropped.into()),
-			other => other,
-		}).collect()
+		results
+			.into_iter()
+			.map(|res| match res {
+				Ok(ref hash) if removed.contains(hash) =>
+					Err(error::Error::ImmediatelyDropped.into()),
+				other => other,
+			})
+			.collect()
 	}
 
 	/// Submit single pre-validated transaction to the pool.
@@ -197,30 +198,28 @@ impl<B: ChainApi> ValidatedPool<B> {
 		match tx {
 			ValidatedTransaction::Valid(tx) => {
 				if !tx.propagate && !(self.is_validator.0)() {
-					return Err(error::Error::Unactionable.into());
+					return Err(error::Error::Unactionable.into())
 				}
 
 				let imported = self.pool.write().import(tx)?;
 
 				if let base::Imported::Ready { ref hash, .. } = imported {
-					self.import_notification_sinks.lock()
-						.retain_mut(|sink| {
-							match sink.try_send(*hash) {
-								Ok(()) => true,
-								Err(e) => {
-									if e.is_full() {
-										log::warn!(
-											target: "txpool",
-											"[{:?}] Trying to notify an import but the channel is full",
-											hash,
-										);
-										true
-									} else {
-										false
-									}
+					self.import_notification_sinks.lock().retain_mut(|sink| {
+						match sink.try_send(*hash) {
+							Ok(()) => true,
+							Err(e) =>
+								if e.is_full() {
+									log::warn!(
+										target: "txpool",
+										"[{:?}] Trying to notify an import but the channel is full",
+										hash,
+									);
+									true
+								} else {
+									false
 								},
-							}
-						});
+						}
+					});
 				}
 
 				let mut listener = self.listener.write();
@@ -244,8 +243,8 @@ impl<B: ChainApi> ValidatedPool<B> {
 		let future_limit = &self.options.future;
 
 		log::debug!(target: "txpool", "Pool Status: {:?}", status);
-		if ready_limit.is_exceeded(status.ready, status.ready_bytes)
-			|| future_limit.is_exceeded(status.future, status.future_bytes)
+		if ready_limit.is_exceeded(status.ready, status.ready_bytes) ||
+			future_limit.is_exceeded(status.future, status.future_bytes)
 		{
 			log::debug!(
 				target: "txpool",
@@ -257,8 +256,11 @@ impl<B: ChainApi> ValidatedPool<B> {
 			// clean up the pool
 			let removed = {
 				let mut pool = self.pool.write();
-				let removed = pool.enforce_limits(ready_limit, future_limit)
-					.into_iter().map(|x| x.hash).collect::<HashSet<_>>();
+				let removed = pool
+					.enforce_limits(ready_limit, future_limit)
+					.into_iter()
+					.map(|x| x.hash)
+					.collect::<HashSet<_>>();
 				// ban all removed transactions
 				self.rotator.ban(&Instant::now(), removed.iter().copied());
 				removed
@@ -305,9 +307,17 @@ impl<B: ChainApi> ValidatedPool<B> {
 	///
 	/// Removes and then submits passed transactions and all dependent transactions.
 	/// Transactions that are missing from the pool are not submitted.
-	pub fn resubmit(&self, mut updated_transactions: HashMap<ExtrinsicHash<B>, ValidatedTransactionFor<B>>) {
+	pub fn resubmit(
+		&self,
+		mut updated_transactions: HashMap<ExtrinsicHash<B>, ValidatedTransactionFor<B>>,
+	) {
 		#[derive(Debug, Clone, Copy, PartialEq)]
-		enum Status { Future, Ready, Failed, Dropped }
+		enum Status {
+			Future,
+			Ready,
+			Failed,
+			Dropped,
+		}
 
 		let (mut initial_statuses, final_statuses) = {
 			let mut pool = self.pool.write();
@@ -322,7 +332,11 @@ impl<B: ChainApi> ValidatedPool<B> {
 			let mut initial_statuses = HashMap::new();
 			let mut txs_to_resubmit = Vec::with_capacity(updated_transactions.len());
 			while !updated_transactions.is_empty() {
-				let hash = updated_transactions.keys().next().cloned().expect("transactions is not empty; qed");
+				let hash = updated_transactions
+					.keys()
+					.next()
+					.cloned()
+					.expect("transactions is not empty; qed");
 
 				// note we are not considering tx with hash invalid here - we just want
 				// to remove it along with dependent transactions and `remove_subtree()`
@@ -390,7 +404,8 @@ impl<B: ChainApi> ValidatedPool<B> {
 								final_statuses.insert(hash, Status::Failed);
 							},
 						},
-						ValidatedTransaction::Invalid(_, _) | ValidatedTransaction::Unknown(_, _) => {
+						ValidatedTransaction::Invalid(_, _) |
+						ValidatedTransaction::Unknown(_, _) => {
 							final_statuses.insert(hash, Status::Failed);
 						},
 					}
@@ -425,12 +440,13 @@ impl<B: ChainApi> ValidatedPool<B> {
 
 	/// For each extrinsic, returns tags that it provides (if known), or None (if it is unknown).
 	pub fn extrinsics_tags(&self, hashes: &[ExtrinsicHash<B>]) -> Vec<Option<Vec<Tag>>> {
-		self.pool.read()
+		self.pool
+			.read()
 			.by_hashes(&hashes)
 			.into_iter()
-			.map(|existing_in_pool|
+			.map(|existing_in_pool| {
 				existing_in_pool.map(|transaction| transaction.provides.to_vec())
-			)
+			})
 			.collect()
 	}
 
@@ -442,7 +458,7 @@ impl<B: ChainApi> ValidatedPool<B> {
 	/// Prunes ready transactions that provide given list of tags.
 	pub fn prune_tags(
 		&self,
-		tags: impl IntoIterator<Item=Tag>,
+		tags: impl IntoIterator<Item = Tag>,
 	) -> Result<PruneStatus<ExtrinsicHash<B>, ExtrinsicFor<B>>, B::Error> {
 		// Perform tag-based pruning in the base pool
 		let status = self.pool.write().prune_tags(tags);
@@ -465,7 +481,7 @@ impl<B: ChainApi> ValidatedPool<B> {
 	pub fn resubmit_pruned(
 		&self,
 		at: &BlockId<B::Block>,
-		known_imported_hashes: impl IntoIterator<Item=ExtrinsicHash<B>> + Clone,
+		known_imported_hashes: impl IntoIterator<Item = ExtrinsicHash<B>> + Clone,
 		pruned_hashes: Vec<ExtrinsicHash<B>>,
 		pruned_xts: Vec<ValidatedTransactionFor<B>>,
 	) -> Result<(), B::Error> {
@@ -475,13 +491,12 @@ impl<B: ChainApi> ValidatedPool<B> {
 		let results = self.submit(pruned_xts);
 
 		// Collect the hashes of transactions that now became invalid (meaning that they are successfully pruned).
-		let hashes = results
-			.into_iter()
-			.enumerate()
-			.filter_map(|(idx, r)| match r.map_err(error::IntoPoolError::into_pool_error) {
+		let hashes = results.into_iter().enumerate().filter_map(|(idx, r)| {
+			match r.map_err(error::IntoPoolError::into_pool_error) {
 				Err(Ok(error::Error::InvalidTransaction(_))) => Some(pruned_hashes[idx]),
 				_ => None,
-			});
+			}
+		});
 		// Fire `pruned` notifications for collected hashes and make sure to include
 		// `known_imported_hashes` since they were just imported as part of the block.
 		let hashes = hashes.chain(known_imported_hashes.into_iter());
@@ -497,9 +512,11 @@ impl<B: ChainApi> ValidatedPool<B> {
 	pub fn fire_pruned(
 		&self,
 		at: &BlockId<B::Block>,
-		hashes: impl Iterator<Item=ExtrinsicHash<B>>,
+		hashes: impl Iterator<Item = ExtrinsicHash<B>>,
 	) -> Result<(), B::Error> {
-		let header_hash = self.api.block_id_to_hash(at)?
+		let header_hash = self
+			.api
+			.block_id_to_hash(at)?
 			.ok_or_else(|| error::Error::InvalidBlockId(format!("{:?}", at)))?;
 		let mut listener = self.listener.write();
 		let mut set = HashSet::with_capacity(hashes.size_hint().0);
@@ -520,7 +537,9 @@ impl<B: ChainApi> ValidatedPool<B> {
 	/// Note this function does not remove transactions that are already included in the chain.
 	/// See `prune_tags` if you want this.
 	pub fn clear_stale(&self, at: &BlockId<B::Block>) -> Result<(), B::Error> {
-		let block_number = self.api.block_id_to_number(at)?
+		let block_number = self
+			.api
+			.block_id_to_number(at)?
 			.ok_or_else(|| error::Error::InvalidBlockId(format!("{:?}", at)))?
 			.saturated_into::<u64>();
 		let now = Instant::now();
@@ -589,7 +608,7 @@ impl<B: ChainApi> ValidatedPool<B> {
 	pub fn remove_invalid(&self, hashes: &[ExtrinsicHash<B>]) -> Vec<TransactionFor<B>> {
 		// early exit in case there is no invalid transactions.
 		if hashes.is_empty() {
-			return vec![];
+			return vec![]
 		}
 
 		log::debug!(target: "txpool", "Removing invalid transactions: {:?}", hashes);
@@ -610,13 +629,15 @@ impl<B: ChainApi> ValidatedPool<B> {
 	}
 
 	/// Get an iterator for ready transactions ordered by priority
-	pub fn ready(&self) -> impl Iterator<Item=TransactionFor<B>> + Send {
+	pub fn ready(&self) -> impl Iterator<Item = TransactionFor<B>> + Send {
 		self.pool.read().ready()
 	}
 
 	/// Returns a Vec of hashes and extrinsics in the future pool.
 	pub fn futures(&self) -> Vec<(ExtrinsicHash<B>, ExtrinsicFor<B>)> {
-		self.pool.read().futures()
+		self.pool
+			.read()
+			.futures()
 			.map(|tx| (tx.hash.clone(), tx.data.clone()))
 			.collect()
 	}
@@ -639,10 +660,8 @@ impl<B: ChainApi> ValidatedPool<B> {
 	}
 }
 
-fn fire_events<H, B, Ex>(
-	listener: &mut Listener<H, B>,
-	imported: &base::Imported<H, Ex>,
-) where
+fn fire_events<H, B, Ex>(listener: &mut Listener<H, B>, imported: &base::Imported<H, Ex>)
+where
 	H: hash::Hash + Eq + traits::Member + Serialize,
 	B: ChainApi,
 {
@@ -653,8 +672,6 @@ fn fire_events<H, B, Ex>(
 			removed.into_iter().for_each(|r| listener.dropped(&r.hash, Some(hash)));
 			promoted.into_iter().for_each(|p| listener.ready(p, None));
 		},
-		base::Imported::Future { ref hash } => {
-			listener.future(hash)
-		},
+		base::Imported::Future { ref hash } => listener.future(hash),
 	}
 }
diff --git a/client/transaction-pool/src/graph/watcher.rs b/client/transaction-pool/src/graph/watcher.rs
index 64e6032f0c2d..91777117efe9 100644
--- a/client/transaction-pool/src/graph/watcher.rs
+++ b/client/transaction-pool/src/graph/watcher.rs
@@ -20,7 +20,7 @@
 
 use futures::Stream;
 use sc_transaction_pool_api::TransactionStatus;
-use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedSender, TracingUnboundedReceiver};
+use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 
 /// Extrinsic watcher.
 ///
@@ -41,7 +41,7 @@ impl<H, BH> Watcher<H, BH> {
 	/// Pipe the notifications to given sink.
 	///
 	/// Make sure to drive the future to completion.
-	pub fn into_stream(self) -> impl Stream<Item=TransactionStatus<H, BH>> {
+	pub fn into_stream(self) -> impl Stream<Item = TransactionStatus<H, BH>> {
 		self.receiver
 	}
 }
@@ -55,10 +55,7 @@ pub struct Sender<H, BH> {
 
 impl<H, BH> Default for Sender<H, BH> {
 	fn default() -> Self {
-		Sender {
-			receivers: Default::default(),
-			is_finalized: false,
-		}
+		Sender { receivers: Default::default(), is_finalized: false }
 	}
 }
 
@@ -67,10 +64,7 @@ impl<H: Clone, BH: Clone> Sender<H, BH> {
 	pub fn new_watcher(&mut self, hash: H) -> Watcher<H, BH> {
 		let (tx, receiver) = tracing_unbounded("mpsc_txpool_watcher");
 		self.receivers.push(tx);
-		Watcher {
-			receiver,
-			hash,
-		}
+		Watcher { receiver, hash }
 	}
 
 	/// Transaction became ready.
diff --git a/client/transaction-pool/src/lib.rs b/client/transaction-pool/src/lib.rs
index 8f89063657c0..302c7a1b59b6 100644
--- a/client/transaction-pool/src/lib.rs
+++ b/client/transaction-pool/src/lib.rs
@@ -18,14 +18,14 @@
 
 //! Substrate transaction pool implementation.
 
-#![recursion_limit="256"]
+#![recursion_limit = "256"]
 #![warn(missing_docs)]
 #![warn(unused_extern_crates)]
 
 mod api;
 mod graph;
-mod revalidation;
 mod metrics;
+mod revalidation;
 
 pub mod error;
 
@@ -33,53 +33,60 @@ pub mod error;
 #[cfg(feature = "test-helpers")]
 pub mod test_helpers {
 	pub use super::{
-		graph::{ChainApi, Pool, NumberFor, BlockHash, ExtrinsicFor},
+		graph::{BlockHash, ChainApi, ExtrinsicFor, NumberFor, Pool},
 		revalidation::RevalidationQueue,
 	};
 }
 
-pub use graph::{Options, Transaction};
 pub use crate::api::{FullChainApi, LightChainApi};
-use std::{collections::{HashMap, HashSet}, sync::Arc, pin::Pin, convert::TryInto};
-use futures::{prelude::*, future::{self, ready}, channel::oneshot};
+use futures::{
+	channel::oneshot,
+	future::{self, ready},
+	prelude::*,
+};
+pub use graph::{Options, Transaction};
 use parking_lot::Mutex;
+use std::{
+	collections::{HashMap, HashSet},
+	convert::TryInto,
+	pin::Pin,
+	sync::Arc,
+};
 
-use sp_runtime::{
-	generic::BlockId,
-	traits::{Block as BlockT, NumberFor, AtLeast32Bit, Extrinsic, Zero, Header as HeaderT},
+use graph::{ExtrinsicHash, IsValidator};
+use sc_transaction_pool_api::{
+	ChainEvent, ImportNotificationStream, MaintainedTransactionPool, PoolFuture, PoolStatus,
+	TransactionFor, TransactionPool, TransactionSource, TransactionStatusStreamFor, TxHash,
 };
 use sp_core::traits::SpawnEssentialNamed;
-use sc_transaction_pool_api::{
-	TransactionPool, PoolStatus, ImportNotificationStream, TxHash, TransactionFor,
-	TransactionStatusStreamFor, MaintainedTransactionPool, PoolFuture, ChainEvent,
-	TransactionSource,
+use sp_runtime::{
+	generic::BlockId,
+	traits::{AtLeast32Bit, Block as BlockT, Extrinsic, Header as HeaderT, NumberFor, Zero},
 };
-use graph::{IsValidator, ExtrinsicHash};
 use wasm_timer::Instant;
 
-use prometheus_endpoint::Registry as PrometheusRegistry;
 use crate::metrics::MetricsLink as PrometheusMetrics;
+use prometheus_endpoint::Registry as PrometheusRegistry;
 
-type BoxedReadyIterator<Hash, Data> = Box<
-	dyn Iterator<Item=Arc<graph::base_pool::Transaction<Hash, Data>>> + Send
->;
+type BoxedReadyIterator<Hash, Data> =
+	Box<dyn Iterator<Item = Arc<graph::base_pool::Transaction<Hash, Data>>> + Send>;
 
-type ReadyIteratorFor<PoolApi> = BoxedReadyIterator<
-	graph::ExtrinsicHash<PoolApi>, graph::ExtrinsicFor<PoolApi>
->;
+type ReadyIteratorFor<PoolApi> =
+	BoxedReadyIterator<graph::ExtrinsicHash<PoolApi>, graph::ExtrinsicFor<PoolApi>>;
 
-type PolledIterator<PoolApi> = Pin<Box<dyn Future<Output=ReadyIteratorFor<PoolApi>> + Send>>;
+type PolledIterator<PoolApi> = Pin<Box<dyn Future<Output = ReadyIteratorFor<PoolApi>> + Send>>;
 
 /// A transaction pool for a full node.
 pub type FullPool<Block, Client> = BasicPool<FullChainApi<Client, Block>, Block>;
 /// A transaction pool for a light node.
-pub type LightPool<Block, Client, Fetcher> = BasicPool<LightChainApi<Client, Fetcher, Block>, Block>;
+pub type LightPool<Block, Client, Fetcher> =
+	BasicPool<LightChainApi<Client, Fetcher, Block>, Block>;
 
 /// Basic implementation of transaction pool that can be customized by providing PoolApi.
 pub struct BasicPool<PoolApi, Block>
-	where
-		Block: BlockT,
-		PoolApi: graph::ChainApi<Block=Block>,
+where
+	Block: BlockT,
+	PoolApi: graph::ChainApi<Block = Block>,
 {
 	pool: Arc<graph::Pool<PoolApi>>,
 	api: Arc<PoolApi>,
@@ -96,19 +103,13 @@ struct ReadyPoll<T, Block: BlockT> {
 
 impl<T, Block: BlockT> Default for ReadyPoll<T, Block> {
 	fn default() -> Self {
-		Self {
-			updated_at: NumberFor::<Block>::zero(),
-			pollers: Default::default(),
-		}
+		Self { updated_at: NumberFor::<Block>::zero(), pollers: Default::default() }
 	}
 }
 
 impl<T, Block: BlockT> ReadyPoll<T, Block> {
 	fn new(best_block_number: NumberFor<Block>) -> Self {
-		Self {
-			updated_at: best_block_number,
-			pollers: Default::default(),
-		}
+		Self { updated_at: best_block_number, pollers: Default::default() }
 	}
 
 	fn trigger(&mut self, number: NumberFor<Block>, iterator_factory: impl Fn() -> T) {
@@ -140,7 +141,7 @@ impl<T, Block: BlockT> ReadyPoll<T, Block> {
 #[cfg(not(target_os = "unknown"))]
 impl<PoolApi, Block> parity_util_mem::MallocSizeOf for BasicPool<PoolApi, Block>
 where
-	PoolApi: graph::ChainApi<Block=Block>,
+	PoolApi: graph::ChainApi<Block = Block>,
 	Block: BlockT,
 {
 	fn size_of(&self, ops: &mut parity_util_mem::MallocSizeOfOps) -> usize {
@@ -167,15 +168,15 @@ pub enum RevalidationType {
 }
 
 impl<PoolApi, Block> BasicPool<PoolApi, Block>
-	where
-		Block: BlockT,
-		PoolApi: graph::ChainApi<Block=Block> + 'static,
+where
+	Block: BlockT,
+	PoolApi: graph::ChainApi<Block = Block> + 'static,
 {
 	/// Create new basic transaction pool with provided api, for tests.
 	#[cfg(feature = "test-helpers")]
 	pub fn new_test(
 		pool_api: Arc<PoolApi>,
-	) -> (Self, Pin<Box<dyn Future<Output=()> + Send>>, intervalier::BackSignalControl) {
+	) -> (Self, Pin<Box<dyn Future<Output = ()> + Send>>, intervalier::BackSignalControl) {
 		let pool = Arc::new(graph::Pool::new(Default::default(), true.into(), pool_api.clone()));
 		let (revalidation_queue, background_task, notifier) =
 			revalidation::RevalidationQueue::new_test(pool_api.clone(), pool.clone());
@@ -206,15 +207,11 @@ impl<PoolApi, Block> BasicPool<PoolApi, Block>
 	) -> Self {
 		let pool = Arc::new(graph::Pool::new(options, is_validator, pool_api.clone()));
 		let (revalidation_queue, background_task) = match revalidation_type {
-			RevalidationType::Light => (
-				revalidation::RevalidationQueue::new(pool_api.clone(), pool.clone()),
-				None,
-			),
+			RevalidationType::Light =>
+				(revalidation::RevalidationQueue::new(pool_api.clone(), pool.clone()), None),
 			RevalidationType::Full => {
-				let (queue, background) = revalidation::RevalidationQueue::new_background(
-					pool_api.clone(),
-					pool.clone(),
-				);
+				let (queue, background) =
+					revalidation::RevalidationQueue::new_background(pool_api.clone(), pool.clone());
 				(queue, Some(background))
 			},
 		};
@@ -227,12 +224,11 @@ impl<PoolApi, Block> BasicPool<PoolApi, Block>
 			api: pool_api,
 			pool,
 			revalidation_queue: Arc::new(revalidation_queue),
-			revalidation_strategy: Arc::new(Mutex::new(
-				match revalidation_type {
-					RevalidationType::Light => RevalidationStrategy::Light(RevalidationStatus::NotScheduled),
-					RevalidationType::Full => RevalidationStrategy::Always,
-				}
-			)),
+			revalidation_strategy: Arc::new(Mutex::new(match revalidation_type {
+				RevalidationType::Light =>
+					RevalidationStrategy::Light(RevalidationStatus::NotScheduled),
+				RevalidationType::Full => RevalidationStrategy::Always,
+			})),
 			ready_poll: Arc::new(Mutex::new(ReadyPoll::new(best_block_number))),
 			metrics: PrometheusMetrics::new(prometheus),
 		}
@@ -251,15 +247,13 @@ impl<PoolApi, Block> BasicPool<PoolApi, Block>
 }
 
 impl<PoolApi, Block> TransactionPool for BasicPool<PoolApi, Block>
-	where
-		Block: BlockT,
-		PoolApi: 'static + graph::ChainApi<Block=Block>,
+where
+	Block: BlockT,
+	PoolApi: 'static + graph::ChainApi<Block = Block>,
 {
 	type Block = PoolApi::Block;
 	type Hash = graph::ExtrinsicHash<PoolApi>;
-	type InPoolTransaction = graph::base_pool::Transaction<
-		TxHash<Self>, TransactionFor<Self>
-	>;
+	type InPoolTransaction = graph::base_pool::Transaction<TxHash<Self>, TransactionFor<Self>>;
 	type Error = PoolApi::Error;
 
 	fn submit_at(
@@ -271,7 +265,8 @@ impl<PoolApi, Block> TransactionPool for BasicPool<PoolApi, Block>
 		let pool = self.pool.clone();
 		let at = *at;
 
-		self.metrics.report(|metrics| metrics.submitted_transactions.inc_by(xts.len() as u64));
+		self.metrics
+			.report(|metrics| metrics.submitted_transactions.inc_by(xts.len() as u64));
 
 		async move { pool.submit_at(&at, source, xts).await }.boxed()
 	}
@@ -305,12 +300,14 @@ impl<PoolApi, Block> TransactionPool for BasicPool<PoolApi, Block>
 			pool.submit_and_watch(&at, source, xt)
 				.map(|result| result.map(|watcher| Box::new(watcher.into_stream()) as _))
 				.await
-		}.boxed()
+		}
+		.boxed()
 	}
 
 	fn remove_invalid(&self, hashes: &[TxHash<Self>]) -> Vec<Arc<Self::InPoolTransaction>> {
 		let removed = self.pool.validated_pool().remove_invalid(hashes);
-		self.metrics.report(|metrics| metrics.validations_invalid.inc_by(removed.len() as u64));
+		self.metrics
+			.report(|metrics| metrics.validations_invalid.inc_by(removed.len() as u64));
 		removed
 	}
 
@@ -347,16 +344,18 @@ impl<PoolApi, Block> TransactionPool for BasicPool<PoolApi, Block>
 		if self.ready_poll.lock().updated_at() >= at {
 			log::trace!(target: "txpool", "Transaction pool already processed block  #{}", at);
 			let iterator: ReadyIteratorFor<PoolApi> = Box::new(self.pool.validated_pool().ready());
-			return async move { iterator }.boxed();
+			return async move { iterator }.boxed()
 		}
 
 		self.ready_poll
 			.lock()
 			.add(at)
-			.map(|received| received.unwrap_or_else(|e| {
-				log::warn!("Error receiving pending set: {:?}", e);
-				Box::new(std::iter::empty())
-			}))
+			.map(|received| {
+				received.unwrap_or_else(|e| {
+					log::warn!("Error receiving pending set: {:?}", e);
+					Box::new(std::iter::empty())
+				})
+			})
 			.boxed()
 	}
 
@@ -452,9 +451,10 @@ where
 		at: &BlockId<Self::Block>,
 		xt: sc_transaction_pool_api::LocalTransactionFor<Self>,
 	) -> Result<Self::Hash, Self::Error> {
-		use graph::{ValidatedTransaction, ChainApi};
-		use sp_runtime::traits::SaturatedConversion;
-		use sp_runtime::transaction_validity::TransactionValidityError;
+		use graph::{ChainApi, ValidatedTransaction};
+		use sp_runtime::{
+			traits::SaturatedConversion, transaction_validity::TransactionValidityError,
+		};
 
 		let validity = self
 			.api
@@ -527,10 +527,7 @@ impl<N: Clone + Copy + AtLeast32Bit> RevalidationStrategy<N> {
 				),
 				resubmit: false,
 			},
-			Self::Always => RevalidationAction {
-				revalidate: true,
-				resubmit: true,
-			}
+			Self::Always => RevalidationAction { revalidate: true, resubmit: true },
 		}
 	}
 }
@@ -555,15 +552,16 @@ impl<N: Clone + Copy + AtLeast32Bit> RevalidationStatus<N> {
 					revalidate_block_period.map(|period| block + period),
 				);
 				false
-			}
+			},
 			Self::Scheduled(revalidate_at_time, revalidate_at_block) => {
-				let is_required = revalidate_at_time.map(|at| Instant::now() >= at).unwrap_or(false)
-					|| revalidate_at_block.map(|at| block >= at).unwrap_or(false);
+				let is_required =
+					revalidate_at_time.map(|at| Instant::now() >= at).unwrap_or(false) ||
+						revalidate_at_block.map(|at| block >= at).unwrap_or(false);
 				if is_required {
 					*self = Self::InProgress;
 				}
 				is_required
-			}
+			},
 			Self::InProgress => false,
 		}
 	}
@@ -575,16 +573,16 @@ async fn prune_known_txs_for_block<Block: BlockT, Api: graph::ChainApi<Block = B
 	api: &Api,
 	pool: &graph::Pool<Api>,
 ) -> Vec<ExtrinsicHash<Api>> {
-	let extrinsics = api.block_body(&block_id).await
+	let extrinsics = api
+		.block_body(&block_id)
+		.await
 		.unwrap_or_else(|e| {
 			log::warn!("Prune known transactions: error request {:?}!", e);
 			None
 		})
 		.unwrap_or_default();
 
-	let hashes = extrinsics.iter()
-		.map(|tx| pool.hash_of(&tx))
-		.collect::<Vec<_>>();
+	let hashes = extrinsics.iter().map(|tx| pool.hash_of(&tx)).collect::<Vec<_>>();
 
 	log::trace!(target: "txpool", "Pruning transactions: {:?}", hashes);
 
@@ -597,10 +595,11 @@ async fn prune_known_txs_for_block<Block: BlockT, Api: graph::ChainApi<Block = B
 		Err(e) => {
 			log::debug!(target: "txpool", "Error retrieving header for {:?}: {:?}", block_id, e);
 			return hashes
-		}
+		},
 	};
 
-	if let Err(e) = pool.prune(&block_id, &BlockId::hash(*header.parent_hash()), &extrinsics).await {
+	if let Err(e) = pool.prune(&block_id, &BlockId::hash(*header.parent_hash()), &extrinsics).await
+	{
 		log::error!("Cannot prune known in the pool {:?}!", e);
 	}
 
@@ -608,11 +607,11 @@ async fn prune_known_txs_for_block<Block: BlockT, Api: graph::ChainApi<Block = B
 }
 
 impl<PoolApi, Block> MaintainedTransactionPool for BasicPool<PoolApi, Block>
-	where
-		Block: BlockT,
-		PoolApi: 'static + graph::ChainApi<Block=Block>,
+where
+	Block: BlockT,
+	PoolApi: 'static + graph::ChainApi<Block = Block>,
 {
-	fn maintain(&self, event: ChainEvent<Self::Block>) -> Pin<Box<dyn Future<Output=()> + Send>> {
+	fn maintain(&self, event: ChainEvent<Self::Block>) -> Pin<Box<dyn Future<Output = ()> + Send>> {
 		match event {
 			ChainEvent::NewBestBlock { hash, tree_route } => {
 				let pool = self.pool.clone();
@@ -627,8 +626,8 @@ impl<PoolApi, Block> MaintainedTransactionPool for BasicPool<PoolApi, Block>
 							"Skipping chain event - no number for that block {:?}",
 							id,
 						);
-						return Box::pin(ready(()));
-					}
+						return Box::pin(ready(()))
+					},
 				};
 
 				let next_action = self.revalidation_strategy.lock().next(
@@ -657,27 +656,21 @@ impl<PoolApi, Block> MaintainedTransactionPool for BasicPool<PoolApi, Block>
 							pool.validated_pool().on_block_retracted(retracted.hash.clone());
 						}
 
-						future::join_all(
-							tree_route
-								.enacted()
-								.iter()
-								.map(|h|
-									prune_known_txs_for_block(
-										BlockId::Hash(h.hash.clone()),
-										&*api,
-										&*pool,
-									),
-								),
-						).await.into_iter().for_each(|enacted_log|{
+						future::join_all(tree_route.enacted().iter().map(|h| {
+							prune_known_txs_for_block(BlockId::Hash(h.hash.clone()), &*api, &*pool)
+						}))
+						.await
+						.into_iter()
+						.for_each(|enacted_log| {
 							pruned_log.extend(enacted_log);
 						})
 					}
 
 					pruned_log.extend(prune_known_txs_for_block(id.clone(), &*api, &*pool).await);
 
-					metrics.report(
-						|metrics| metrics.block_transactions_pruned.inc_by(pruned_log.len() as u64)
-					);
+					metrics.report(|metrics| {
+						metrics.block_transactions_pruned.inc_by(pruned_log.len() as u64)
+					});
 
 					if let (true, Some(tree_route)) = (next_action.resubmit, tree_route) {
 						let mut resubmit_transactions = Vec::new();
@@ -685,7 +678,8 @@ impl<PoolApi, Block> MaintainedTransactionPool for BasicPool<PoolApi, Block>
 						for retracted in tree_route.retracted() {
 							let hash = retracted.hash.clone();
 
-							let block_transactions = api.block_body(&BlockId::hash(hash))
+							let block_transactions = api
+								.block_body(&BlockId::hash(hash))
 								.await
 								.unwrap_or_else(|e| {
 									log::warn!("Failed to fetch block body {:?}!", e);
@@ -697,8 +691,8 @@ impl<PoolApi, Block> MaintainedTransactionPool for BasicPool<PoolApi, Block>
 
 							let mut resubmitted_to_report = 0;
 
-							resubmit_transactions.extend(
-								block_transactions.into_iter().filter(|tx| {
+							resubmit_transactions.extend(block_transactions.into_iter().filter(
+								|tx| {
 									let tx_hash = pool.hash_of(&tx);
 									let contains = pruned_log.contains(&tx_hash);
 
@@ -714,21 +708,24 @@ impl<PoolApi, Block> MaintainedTransactionPool for BasicPool<PoolApi, Block>
 										);
 									}
 									!contains
-								})
-							);
+								},
+							));
 
-							metrics.report(
-								|metrics| metrics.block_transactions_resubmitted.inc_by(resubmitted_to_report)
-							);
+							metrics.report(|metrics| {
+								metrics.block_transactions_resubmitted.inc_by(resubmitted_to_report)
+							});
 						}
 
-						if let Err(e) = pool.resubmit_at(
-							&id,
-							// These transactions are coming from retracted blocks, we should
-							// simply consider them external.
-							TransactionSource::External,
-							resubmit_transactions,
-						).await {
+						if let Err(e) = pool
+							.resubmit_at(
+								&id,
+								// These transactions are coming from retracted blocks, we should
+								// simply consider them external.
+								TransactionSource::External,
+								resubmit_transactions,
+							)
+							.await
+						{
 							log::debug!(
 								target: "txpool",
 								"[{:?}] Error re-submitting transactions: {:?}",
@@ -741,22 +738,20 @@ impl<PoolApi, Block> MaintainedTransactionPool for BasicPool<PoolApi, Block>
 					let extra_pool = pool.clone();
 					// After #5200 lands, this arguably might be moved to the
 					// handler of "all blocks notification".
-					ready_poll.lock().trigger(
-						block_number,
-						move || Box::new(extra_pool.validated_pool().ready()),
-					);
+					ready_poll.lock().trigger(block_number, move || {
+						Box::new(extra_pool.validated_pool().ready())
+					});
 
 					if next_action.revalidate {
-						let hashes = pool.validated_pool()
-							.ready()
-							.map(|tx| tx.hash.clone())
-							.collect();
+						let hashes =
+							pool.validated_pool().ready().map(|tx| tx.hash.clone()).collect();
 						revalidation_queue.revalidate_later(block_number, hashes).await;
 
 						revalidation_strategy.lock().clear();
 					}
-				}.boxed()
-			}
+				}
+				.boxed()
+			},
 			ChainEvent::Finalized { hash } => {
 				let pool = self.pool.clone();
 				async move {
@@ -767,28 +762,25 @@ impl<PoolApi, Block> MaintainedTransactionPool for BasicPool<PoolApi, Block>
 							e, hash
 						)
 					}
-				}.boxed()
-			}
+				}
+				.boxed()
+			},
 		}
 	}
 }
 
 /// Inform the transaction pool about imported and finalized blocks.
-pub async fn notification_future<Client, Pool, Block>(
-	client: Arc<Client>,
-	txpool: Arc<Pool>
-)
-	where
-		Block: BlockT,
-		Client: sc_client_api::BlockchainEvents<Block>,
-		Pool: MaintainedTransactionPool<Block=Block>,
+pub async fn notification_future<Client, Pool, Block>(client: Arc<Client>, txpool: Arc<Pool>)
+where
+	Block: BlockT,
+	Client: sc_client_api::BlockchainEvents<Block>,
+	Pool: MaintainedTransactionPool<Block = Block>,
 {
-	let import_stream = client.import_notification_stream()
+	let import_stream = client
+		.import_notification_stream()
 		.filter_map(|n| ready(n.try_into().ok()))
 		.fuse();
-	let finality_stream = client.finality_notification_stream()
-		.map(Into::into)
-		.fuse();
+	let finality_stream = client.finality_notification_stream().map(Into::into).fuse();
 
 	futures::stream::select(import_stream, finality_stream)
 		.for_each(|evt| txpool.maintain(evt))
diff --git a/client/transaction-pool/src/metrics.rs b/client/transaction-pool/src/metrics.rs
index e0b70183a86b..d62d64f13a0a 100644
--- a/client/transaction-pool/src/metrics.rs
+++ b/client/transaction-pool/src/metrics.rs
@@ -27,13 +27,13 @@ pub struct MetricsLink(Arc<Option<Metrics>>);
 
 impl MetricsLink {
 	pub fn new(registry: Option<&Registry>) -> Self {
-		Self(Arc::new(
-			registry.and_then(|registry|
-				Metrics::register(registry)
-					.map_err(|err| { log::warn!("Failed to register prometheus metrics: {}", err); })
-					.ok()
-			)
-		))
+		Self(Arc::new(registry.and_then(|registry| {
+			Metrics::register(registry)
+				.map_err(|err| {
+					log::warn!("Failed to register prometheus metrics: {}", err);
+				})
+				.ok()
+		})))
 	}
 
 	pub fn report(&self, do_this: impl FnOnce(&Metrics)) {
diff --git a/client/transaction-pool/src/revalidation.rs b/client/transaction-pool/src/revalidation.rs
index ffc82bf619cc..9f15185694d0 100644
--- a/client/transaction-pool/src/revalidation.rs
+++ b/client/transaction-pool/src/revalidation.rs
@@ -18,13 +18,19 @@
 
 //! Pool periodic revalidation.
 
-use std::{sync::Arc, pin::Pin, collections::{HashMap, HashSet, BTreeMap}};
-
-use crate::graph::{ChainApi, Pool, ExtrinsicHash, NumberFor, ValidatedTransaction};
-use sp_runtime::traits::{Zero, SaturatedConversion};
-use sp_runtime::generic::BlockId;
-use sp_runtime::transaction_validity::TransactionValidityError;
-use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedSender, TracingUnboundedReceiver};
+use std::{
+	collections::{BTreeMap, HashMap, HashSet},
+	pin::Pin,
+	sync::Arc,
+};
+
+use crate::graph::{ChainApi, ExtrinsicHash, NumberFor, Pool, ValidatedTransaction};
+use sp_runtime::{
+	generic::BlockId,
+	traits::{SaturatedConversion, Zero},
+	transaction_validity::TransactionValidityError,
+};
+use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 
 use futures::prelude::*;
 use std::time::Duration;
@@ -63,19 +69,18 @@ async fn batch_revalidate<Api: ChainApi>(
 	pool: Arc<Pool<Api>>,
 	api: Arc<Api>,
 	at: NumberFor<Api>,
-	batch: impl IntoIterator<Item=ExtrinsicHash<Api>>,
+	batch: impl IntoIterator<Item = ExtrinsicHash<Api>>,
 ) {
 	let mut invalid_hashes = Vec::new();
 	let mut revalidated = HashMap::new();
 
-	let validation_results = futures::future::join_all(
-		batch.into_iter().filter_map(|ext_hash| {
-			pool.validated_pool().ready_by_hash(&ext_hash).map(|ext| {
-				api.validate_transaction(&BlockId::Number(at), ext.source, ext.data.clone())
-					.map(move |validation_result| (validation_result, ext_hash, ext))
-			})
+	let validation_results = futures::future::join_all(batch.into_iter().filter_map(|ext_hash| {
+		pool.validated_pool().ready_by_hash(&ext_hash).map(|ext| {
+			api.validate_transaction(&BlockId::Number(at), ext.source, ext.data.clone())
+				.map(move |validation_result| (validation_result, ext_hash, ext))
 		})
-	).await;
+	}))
+	.await;
 
 	for (validation_result, ext_hash, ext) in validation_results {
 		match validation_result {
@@ -98,7 +103,7 @@ async fn batch_revalidate<Api: ChainApi>(
 						ext.data.clone(),
 						api.hash_and_length(&ext.data).1,
 						validity,
-					)
+					),
 				);
 			},
 			Err(validation_err) => {
@@ -109,7 +114,7 @@ async fn batch_revalidate<Api: ChainApi>(
 					validation_err
 				);
 				invalid_hashes.push(ext_hash);
-			}
+			},
 		}
 	}
 
@@ -120,10 +125,7 @@ async fn batch_revalidate<Api: ChainApi>(
 }
 
 impl<Api: ChainApi> RevalidationWorker<Api> {
-	fn new(
-		api: Arc<Api>,
-		pool: Arc<Pool<Api>>,
-	) -> Self {
+	fn new(api: Arc<Api>, pool: Arc<Pool<Api>>) -> Self {
 		Self {
 			api,
 			pool,
@@ -135,7 +137,8 @@ impl<Api: ChainApi> RevalidationWorker<Api> {
 
 	fn prepare_batch(&mut self) -> Vec<ExtrinsicHash<Api>> {
 		let mut queued_exts = Vec::new();
-		let mut left = std::cmp::max(MIN_BACKGROUND_REVALIDATION_BATCH_SIZE, self.members.len() / 4);
+		let mut left =
+			std::cmp::max(MIN_BACKGROUND_REVALIDATION_BATCH_SIZE, self.members.len() / 4);
 
 		// Take maximum of count transaction by order
 		// which they got into the pool
@@ -188,11 +191,14 @@ impl<Api: ChainApi> RevalidationWorker<Api> {
 					ext_hash,
 				);
 
-				continue;
+				continue
 			}
 
-			self.block_ordered.entry(block_number)
-				.and_modify(|value| { value.insert(ext_hash.clone()); })
+			self.block_ordered
+				.entry(block_number)
+				.and_modify(|value| {
+					value.insert(ext_hash.clone());
+				})
 				.or_insert_with(|| {
 					let mut bt = HashSet::new();
 					bt.insert(ext_hash.clone());
@@ -211,7 +217,10 @@ impl<Api: ChainApi> RevalidationWorker<Api> {
 		mut self,
 		from_queue: TracingUnboundedReceiver<WorkerPayload<Api>>,
 		interval: R,
-	) where R: Send, R::Guard: Send {
+	) where
+		R: Send,
+		R::Guard: Send,
+	{
 		let interval = interval.into_stream().fuse();
 		let from_queue = from_queue.fuse();
 		futures::pin_mut!(interval, from_queue);
@@ -269,7 +278,6 @@ impl<Api: ChainApi> RevalidationWorker<Api> {
 	}
 }
 
-
 /// Revalidation queue.
 ///
 /// Can be configured background (`new_background`)
@@ -286,11 +294,7 @@ where
 {
 	/// New revalidation queue without background worker.
 	pub fn new(api: Arc<Api>, pool: Arc<Pool<Api>>) -> Self {
-		Self {
-			api,
-			pool,
-			background: None,
-		}
+		Self { api, pool, background: None }
 	}
 
 	/// New revalidation queue with background worker.
@@ -298,34 +302,40 @@ where
 		api: Arc<Api>,
 		pool: Arc<Pool<Api>>,
 		interval: R,
-	) -> (Self, Pin<Box<dyn Future<Output=()> + Send>>) where R: Send + 'static, R::Guard: Send {
+	) -> (Self, Pin<Box<dyn Future<Output = ()> + Send>>)
+	where
+		R: Send + 'static,
+		R::Guard: Send,
+	{
 		let (to_worker, from_queue) = tracing_unbounded("mpsc_revalidation_queue");
 
 		let worker = RevalidationWorker::new(api.clone(), pool.clone());
 
-		let queue =
-			Self {
-				api,
-				pool,
-				background: Some(to_worker),
-			};
+		let queue = Self { api, pool, background: Some(to_worker) };
 
 		(queue, worker.run(from_queue, interval).boxed())
 	}
 
 	/// New revalidation queue with background worker.
-	pub fn new_background(api: Arc<Api>, pool: Arc<Pool<Api>>) ->
-		(Self, Pin<Box<dyn Future<Output=()> + Send>>)
-	{
-		Self::new_with_interval(api, pool, intervalier::Interval::new(BACKGROUND_REVALIDATION_INTERVAL))
+	pub fn new_background(
+		api: Arc<Api>,
+		pool: Arc<Pool<Api>>,
+	) -> (Self, Pin<Box<dyn Future<Output = ()> + Send>>) {
+		Self::new_with_interval(
+			api,
+			pool,
+			intervalier::Interval::new(BACKGROUND_REVALIDATION_INTERVAL),
+		)
 	}
 
 	/// New revalidation queue with background worker and test signal.
 	#[cfg(feature = "test-helpers")]
-	pub fn new_test(api: Arc<Api>, pool: Arc<Pool<Api>>) ->
-		(Self, Pin<Box<dyn Future<Output=()> + Send>>, intervalier::BackSignalControl)
-	{
-		let (interval, notifier) = intervalier::BackSignalInterval::new(BACKGROUND_REVALIDATION_INTERVAL);
+	pub fn new_test(
+		api: Arc<Api>,
+		pool: Arc<Pool<Api>>,
+	) -> (Self, Pin<Box<dyn Future<Output = ()> + Send>>, intervalier::BackSignalControl) {
+		let (interval, notifier) =
+			intervalier::BackSignalInterval::new(BACKGROUND_REVALIDATION_INTERVAL);
 		let (queue, background) = Self::new_with_interval(api, pool, interval);
 
 		(queue, background, notifier)
@@ -361,6 +371,4 @@ where
 }
 
 #[cfg(test)]
-mod tests {
-
-}
+mod tests {}
diff --git a/client/transaction-pool/tests/pool.rs b/client/transaction-pool/tests/pool.rs
index 9a9d59214d0b..6c34d05cd5dc 100644
--- a/client/transaction-pool/tests/pool.rs
+++ b/client/transaction-pool/tests/pool.rs
@@ -17,37 +17,40 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Tests for top-level transaction pool api
-use sc_transaction_pool_api::{TransactionStatus, ChainEvent, MaintainedTransactionPool, TransactionPool};
-use futures::executor::{block_on, block_on_stream};
+use codec::Encode;
+use futures::{
+	executor::{block_on, block_on_stream},
+	prelude::*,
+	task::Poll,
+};
+use sc_block_builder::BlockBuilderProvider;
+use sc_client_api::client::BlockchainEvents;
+use sc_transaction_pool::{test_helpers::*, *};
+use sc_transaction_pool_api::{
+	ChainEvent, MaintainedTransactionPool, TransactionPool, TransactionStatus,
+};
+use sp_consensus::BlockOrigin;
 use sp_runtime::{
-	generic::BlockId, traits::Block as _,
-	transaction_validity::{ValidTransaction, TransactionSource, InvalidTransaction},
+	generic::BlockId,
+	traits::Block as _,
+	transaction_validity::{InvalidTransaction, TransactionSource, ValidTransaction},
 };
+use std::{collections::BTreeSet, convert::TryInto, sync::Arc};
 use substrate_test_runtime_client::{
-	runtime::{Block, Hash, Index, Header, Extrinsic, Transfer}, AccountKeyring::*,
+	runtime::{Block, Extrinsic, Hash, Header, Index, Transfer},
+	AccountKeyring::*,
 	ClientBlockImportExt,
 };
-use substrate_test_runtime_transaction_pool::{TestApi, uxt};
-use futures::{prelude::*, task::Poll};
-use codec::Encode;
-use std::{collections::BTreeSet, sync::Arc, convert::TryInto};
-use sc_client_api::client::BlockchainEvents;
-use sc_block_builder::BlockBuilderProvider;
-use sp_consensus::BlockOrigin;
-use sc_transaction_pool::{*, test_helpers::*};
+use substrate_test_runtime_transaction_pool::{uxt, TestApi};
 
 fn pool() -> Pool<TestApi> {
 	Pool::new(Default::default(), true.into(), TestApi::with_alice_nonce(209).into())
 }
 
-fn maintained_pool() -> (
-	BasicPool<TestApi, Block>,
-	futures::executor::ThreadPool,
-	intervalier::BackSignalControl,
-) {
-	let (pool, background_task, notifier) = BasicPool::new_test(
-		Arc::new(TestApi::with_alice_nonce(209)),
-	);
+fn maintained_pool(
+) -> (BasicPool<TestApi, Block>, futures::executor::ThreadPool, intervalier::BackSignalControl) {
+	let (pool, background_task, notifier) =
+		BasicPool::new_test(Arc::new(TestApi::with_alice_nonce(209)));
 
 	let thread_pool = futures::executor::ThreadPool::new().unwrap();
 	thread_pool.spawn_ok(background_task);
@@ -107,13 +110,8 @@ fn prune_tags_should_work() {
 	assert_eq!(pending, vec![209, 210]);
 
 	pool.validated_pool().api().push_block(1, Vec::new(), true);
-	block_on(
-		pool.prune_tags(
-			&BlockId::number(1),
-			vec![vec![209]],
-			vec![hash209],
-		)
-	).expect("Prune tags");
+	block_on(pool.prune_tags(&BlockId::number(1), vec![vec![209]], vec![hash209]))
+		.expect("Prune tags");
 
 	let pending: Vec<_> = pool.validated_pool().ready().map(|a| a.data.transfer().nonce).collect();
 	assert_eq!(pending, vec![210]);
@@ -140,17 +138,13 @@ fn only_prune_on_new_best() {
 	let pool = maintained_pool().0;
 	let uxt = uxt(Alice, 209);
 
-	let _ = block_on(
-		pool.submit_and_watch(&BlockId::number(0), SOURCE, uxt.clone())
-	).expect("1. Imported");
+	let _ = block_on(pool.submit_and_watch(&BlockId::number(0), SOURCE, uxt.clone()))
+		.expect("1. Imported");
 	pool.api().push_block(1, vec![uxt.clone()], true);
 	assert_eq!(pool.status().ready, 1);
 
 	let header = pool.api().push_block(2, vec![uxt], true);
-	let event = ChainEvent::NewBestBlock {
-		hash: header.hash(),
-		tree_route: None,
-	};
+	let event = ChainEvent::NewBestBlock { hash: header.hash(), tree_route: None };
 	block_on(pool.maintain(event));
 	assert_eq!(pool.status().ready, 0);
 }
@@ -193,10 +187,7 @@ fn should_correctly_prune_transactions_providing_more_than_one_tag() {
 }
 
 fn block_event(header: Header) -> ChainEvent<Block> {
-	ChainEvent::NewBestBlock {
-		hash: header.hash(),
-		tree_route: None,
-	}
+	ChainEvent::NewBestBlock { hash: header.hash(), tree_route: None }
 }
 
 fn block_event_with_retracted(
@@ -204,12 +195,10 @@ fn block_event_with_retracted(
 	retracted_start: Hash,
 	api: &TestApi,
 ) -> ChainEvent<Block> {
-	let tree_route = api.tree_route(retracted_start, header.parent_hash).expect("Tree route exists");
+	let tree_route =
+		api.tree_route(retracted_start, header.parent_hash).expect("Tree route exists");
 
-	ChainEvent::NewBestBlock {
-		hash: header.hash(),
-		tree_route: Some(Arc::new(tree_route)),
-	}
+	ChainEvent::NewBestBlock { hash: header.hash(), tree_route: Some(Arc::new(tree_route)) }
 }
 
 #[test]
@@ -266,7 +255,6 @@ fn should_resubmit_from_retracted_during_maintenance() {
 	assert_eq!(pool.status().ready, 1);
 }
 
-
 #[test]
 fn should_not_resubmit_from_retracted_during_maintenance_if_tx_is_also_in_enacted() {
 	let xt = uxt(Alice, 209);
@@ -334,7 +322,6 @@ fn should_revalidate_across_many_blocks() {
 	assert_eq!(pool.api().validation_requests().len(), 7);
 }
 
-
 #[test]
 fn should_push_watchers_during_maintenance() {
 	fn alice_uxt(nonce: u64) -> Extrinsic {
@@ -345,25 +332,20 @@ fn should_push_watchers_during_maintenance() {
 	let (pool, _guard, mut notifier) = maintained_pool();
 
 	let tx0 = alice_uxt(0);
-	let watcher0 = block_on(
-		pool.submit_and_watch(&BlockId::Number(0), SOURCE, tx0.clone())
-	).unwrap();
+	let watcher0 =
+		block_on(pool.submit_and_watch(&BlockId::Number(0), SOURCE, tx0.clone())).unwrap();
 	let tx1 = alice_uxt(1);
-	let watcher1 = block_on(
-		pool.submit_and_watch(&BlockId::Number(0), SOURCE, tx1.clone())
-	).unwrap();
+	let watcher1 =
+		block_on(pool.submit_and_watch(&BlockId::Number(0), SOURCE, tx1.clone())).unwrap();
 	let tx2 = alice_uxt(2);
-	let watcher2 = block_on(
-		pool.submit_and_watch(&BlockId::Number(0), SOURCE, tx2.clone())
-	).unwrap();
+	let watcher2 =
+		block_on(pool.submit_and_watch(&BlockId::Number(0), SOURCE, tx2.clone())).unwrap();
 	let tx3 = alice_uxt(3);
-	let watcher3 = block_on(
-		pool.submit_and_watch(&BlockId::Number(0), SOURCE, tx3.clone())
-	).unwrap();
+	let watcher3 =
+		block_on(pool.submit_and_watch(&BlockId::Number(0), SOURCE, tx3.clone())).unwrap();
 	let tx4 = alice_uxt(4);
-	let watcher4 = block_on(
-		pool.submit_and_watch(&BlockId::Number(0), SOURCE, tx4.clone())
-	).unwrap();
+	let watcher4 =
+		block_on(pool.submit_and_watch(&BlockId::Number(0), SOURCE, tx4.clone())).unwrap();
 	assert_eq!(pool.status().ready, 5);
 
 	// when
@@ -405,21 +387,24 @@ fn should_push_watchers_during_maintenance() {
 		vec![
 			TransactionStatus::Ready,
 			TransactionStatus::InBlock(header_hash.clone()),
-			TransactionStatus::Finalized(header_hash.clone())],
+			TransactionStatus::Finalized(header_hash.clone())
+		],
 	);
 	assert_eq!(
 		futures::executor::block_on_stream(watcher1).collect::<Vec<_>>(),
 		vec![
 			TransactionStatus::Ready,
 			TransactionStatus::InBlock(header_hash.clone()),
-			TransactionStatus::Finalized(header_hash.clone())],
+			TransactionStatus::Finalized(header_hash.clone())
+		],
 	);
 	assert_eq!(
 		futures::executor::block_on_stream(watcher2).collect::<Vec<_>>(),
 		vec![
 			TransactionStatus::Ready,
 			TransactionStatus::InBlock(header_hash.clone()),
-			TransactionStatus::Finalized(header_hash.clone())],
+			TransactionStatus::Finalized(header_hash.clone())
+		],
 	);
 }
 
@@ -440,16 +425,12 @@ fn finalization() {
 	let api = TestApi::with_alice_nonce(209);
 	api.push_block(1, vec![], true);
 	let (pool, _background, _) = BasicPool::new_test(api.into());
-	let watcher = block_on(
-		pool.submit_and_watch(&BlockId::number(1), SOURCE, xt.clone())
-	).expect("1. Imported");
+	let watcher = block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, xt.clone()))
+		.expect("1. Imported");
 	pool.api().push_block(2, vec![xt.clone()], true);
 
 	let header = pool.api().chain().read().block_by_number.get(&2).unwrap()[0].0.header().clone();
-	let event = ChainEvent::NewBestBlock {
-		hash: header.hash(),
-		tree_route: None,
-	};
+	let event = ChainEvent::NewBestBlock { hash: header.hash(), tree_route: None };
 	block_on(pool.maintain(event));
 
 	let event = ChainEvent::Finalized { hash: header.hash() };
@@ -489,17 +470,14 @@ fn fork_aware_finalization() {
 
 	// block B1
 	{
-		let watcher = block_on(
-			pool.submit_and_watch(&BlockId::number(1), SOURCE, from_alice.clone())
-		).expect("1. Imported");
+		let watcher =
+			block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_alice.clone()))
+				.expect("1. Imported");
 		let header = pool.api().push_block(2, vec![from_alice.clone()], true);
 		canon_watchers.push((watcher, header.hash()));
 		assert_eq!(pool.status().ready, 1);
 
-		let event = ChainEvent::NewBestBlock {
-			hash: header.hash(),
-			tree_route: None,
-		};
+		let event = ChainEvent::NewBestBlock { hash: header.hash(), tree_route: None };
 		b1 = header.hash();
 		block_on(pool.maintain(event));
 		assert_eq!(pool.status().ready, 0);
@@ -510,14 +488,11 @@ fn fork_aware_finalization() {
 	// block C2
 	{
 		let header = pool.api().push_block_with_parent(b1, vec![from_dave.clone()], true);
-		from_dave_watcher = block_on(
-			pool.submit_and_watch(&BlockId::number(1), SOURCE, from_dave.clone())
-		).expect("1. Imported");
+		from_dave_watcher =
+			block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_dave.clone()))
+				.expect("1. Imported");
 		assert_eq!(pool.status().ready, 1);
-		let event = ChainEvent::NewBestBlock {
-			hash: header.hash(),
-			tree_route: None,
-		};
+		let event = ChainEvent::NewBestBlock { hash: header.hash(), tree_route: None };
 		c2 = header.hash();
 		block_on(pool.maintain(event));
 		assert_eq!(pool.status().ready, 0);
@@ -525,16 +500,13 @@ fn fork_aware_finalization() {
 
 	// block D2
 	{
-		from_bob_watcher = block_on(
-			pool.submit_and_watch(&BlockId::number(1), SOURCE, from_bob.clone())
-		).expect("1. Imported");
+		from_bob_watcher =
+			block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_bob.clone()))
+				.expect("1. Imported");
 		assert_eq!(pool.status().ready, 1);
 		let header = pool.api().push_block_with_parent(c2, vec![from_bob.clone()], true);
 
-		let event = ChainEvent::NewBestBlock {
-			hash: header.hash(),
-			tree_route: None,
-		};
+		let event = ChainEvent::NewBestBlock { hash: header.hash(), tree_route: None };
 		d2 = header.hash();
 		block_on(pool.maintain(event));
 		assert_eq!(pool.status().ready, 0);
@@ -542,9 +514,9 @@ fn fork_aware_finalization() {
 
 	// block C1
 	{
-		let watcher = block_on(
-			pool.submit_and_watch(&BlockId::number(1), SOURCE, from_charlie.clone())
-		).expect("1.Imported");
+		let watcher =
+			block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_charlie.clone()))
+				.expect("1.Imported");
 		assert_eq!(pool.status().ready, 1);
 		let header = pool.api().push_block(3, vec![from_charlie.clone()], true);
 
@@ -560,17 +532,13 @@ fn fork_aware_finalization() {
 	// block D1
 	{
 		let xt = uxt(Eve, 0);
-		let w = block_on(
-			pool.submit_and_watch(&BlockId::number(1), SOURCE, xt.clone())
-		).expect("1. Imported");
+		let w = block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, xt.clone()))
+			.expect("1. Imported");
 		assert_eq!(pool.status().ready, 3);
 		let header = pool.api().push_block(4, vec![xt.clone()], true);
 		canon_watchers.push((w, header.hash()));
 
-		let event = ChainEvent::NewBestBlock {
-			hash: header.hash(),
-			tree_route: None,
-		};
+		let event = ChainEvent::NewBestBlock { hash: header.hash(), tree_route: None };
 		d1 = header.hash();
 		block_on(pool.maintain(event));
 		assert_eq!(pool.status().ready, 2);
@@ -584,16 +552,12 @@ fn fork_aware_finalization() {
 	{
 		let header = pool.api().push_block(5, vec![from_dave, from_bob], true);
 		e1 = header.hash();
-		let event = ChainEvent::NewBestBlock {
-			hash: header.hash(),
-			tree_route: None,
-		};
+		let event = ChainEvent::NewBestBlock { hash: header.hash(), tree_route: None };
 		block_on(pool.maintain(event));
 		assert_eq!(pool.status().ready, 0);
 		block_on(pool.maintain(ChainEvent::Finalized { hash: e1 }));
 	}
 
-
 	for (canon_watcher, h) in canon_watchers {
 		let mut stream = futures::executor::block_on_stream(canon_watcher);
 		assert_eq!(stream.next(), Some(TransactionStatus::Ready));
@@ -602,7 +566,6 @@ fn fork_aware_finalization() {
 		assert_eq!(stream.next(), None);
 	}
 
-
 	{
 		let mut stream = futures::executor::block_on_stream(from_dave_watcher);
 		assert_eq!(stream.next(), Some(TransactionStatus::Ready));
@@ -639,19 +602,15 @@ fn prune_and_retract_tx_at_same_time() {
 	let from_alice = uxt(Alice, 1);
 	pool.api().increment_nonce(Alice.into());
 
-	let watcher = block_on(
-		pool.submit_and_watch(&BlockId::number(1), SOURCE, from_alice.clone())
-	).expect("1. Imported");
+	let watcher = block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_alice.clone()))
+		.expect("1. Imported");
 
 	// Block B1
 	let b1 = {
 		let header = pool.api().push_block(2, vec![from_alice.clone()], true);
 		assert_eq!(pool.status().ready, 1);
 
-		let event = ChainEvent::NewBestBlock {
-			hash: header.hash(),
-			tree_route: None,
-		};
+		let event = ChainEvent::NewBestBlock { hash: header.hash(), tree_route: None };
 		block_on(pool.maintain(event));
 		assert_eq!(pool.status().ready, 0);
 		header.hash()
@@ -683,7 +642,6 @@ fn prune_and_retract_tx_at_same_time() {
 	}
 }
 
-
 /// This test ensures that transactions from a fork are re-submitted if
 /// the forked block is not part of the retracted blocks. This happens as the
 /// retracted block list only contains the route from the old best to the new
@@ -716,16 +674,12 @@ fn resubmit_tx_of_fork_that_is_not_part_of_retracted() {
 
 	// Block D0
 	{
-		let _ = block_on(
-			pool.submit_and_watch(&BlockId::number(1), SOURCE, tx0.clone())
-		).expect("1. Imported");
+		let _ = block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, tx0.clone()))
+			.expect("1. Imported");
 		let header = pool.api().push_block(2, vec![tx0.clone()], true);
 		assert_eq!(pool.status().ready, 1);
 
-		let event = ChainEvent::NewBestBlock {
-			hash: header.hash(),
-			tree_route: None,
-		};
+		let event = ChainEvent::NewBestBlock { hash: header.hash(), tree_route: None };
 		d0 = header.hash();
 		block_on(pool.maintain(event));
 		assert_eq!(pool.status().ready, 0);
@@ -733,9 +687,8 @@ fn resubmit_tx_of_fork_that_is_not_part_of_retracted() {
 
 	// Block D1
 	{
-		let _ = block_on(
-			pool.submit_and_watch(&BlockId::number(1), SOURCE, tx1.clone())
-		).expect("1. Imported");
+		let _ = block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, tx1.clone()))
+			.expect("1. Imported");
 		pool.api().push_block(2, vec![tx1.clone()], false);
 		assert_eq!(pool.status().ready, 1);
 	}
@@ -775,9 +728,8 @@ fn resubmit_from_retracted_fork() {
 
 	// Block D0
 	{
-		let _ = block_on(
-			pool.submit_and_watch(&BlockId::number(1), SOURCE, tx0.clone())
-		).expect("1. Imported");
+		let _ = block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, tx0.clone()))
+			.expect("1. Imported");
 		let header = pool.api().push_block(2, vec![tx0.clone()], true);
 		assert_eq!(pool.status().ready, 1);
 
@@ -787,9 +739,8 @@ fn resubmit_from_retracted_fork() {
 
 	// Block E0
 	{
-		let _ = block_on(
-			pool.submit_and_watch(&BlockId::number(1), SOURCE, tx1.clone())
-		).expect("1. Imported");
+		let _ = block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, tx1.clone()))
+			.expect("1. Imported");
 		let header = pool.api().push_block(3, vec![tx1.clone()], true);
 		block_on(pool.maintain(block_event(header)));
 		assert_eq!(pool.status().ready, 0);
@@ -797,9 +748,8 @@ fn resubmit_from_retracted_fork() {
 
 	// Block F0
 	let f0 = {
-		let _ = block_on(
-			pool.submit_and_watch(&BlockId::number(1), SOURCE, tx2.clone())
-		).expect("1. Imported");
+		let _ = block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, tx2.clone()))
+			.expect("1. Imported");
 		let header = pool.api().push_block(4, vec![tx2.clone()], true);
 		block_on(pool.maintain(block_event(header.clone())));
 		assert_eq!(pool.status().ready, 0);
@@ -808,9 +758,8 @@ fn resubmit_from_retracted_fork() {
 
 	// Block D1
 	let d1 = {
-		let _ = block_on(
-			pool.submit_and_watch(&BlockId::number(1), SOURCE, tx3.clone())
-		).expect("1. Imported");
+		let _ = block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, tx3.clone()))
+			.expect("1. Imported");
 		let header = pool.api().push_block(2, vec![tx3.clone()], true);
 		assert_eq!(pool.status().ready, 1);
 		header.hash()
@@ -818,9 +767,8 @@ fn resubmit_from_retracted_fork() {
 
 	// Block E1
 	let e1 = {
-		let _ = block_on(
-			pool.submit_and_watch(&BlockId::number(1), SOURCE, tx4.clone())
-		).expect("1. Imported");
+		let _ = block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, tx4.clone()))
+			.expect("1. Imported");
 		let header = pool.api().push_block_with_parent(d1.clone(), vec![tx4.clone()], true);
 		assert_eq!(pool.status().ready, 2);
 		header.hash()
@@ -828,9 +776,8 @@ fn resubmit_from_retracted_fork() {
 
 	// Block F1
 	let f1_header = {
-		let _ = block_on(
-			pool.submit_and_watch(&BlockId::number(1), SOURCE, tx5.clone())
-		).expect("1. Imported");
+		let _ = block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, tx5.clone()))
+			.expect("1. Imported");
 		let header = pool.api().push_block_with_parent(e1.clone(), vec![tx5.clone()], true);
 		// Don't announce the block event to the pool directly, because we will
 		// re-org to this block.
@@ -892,14 +839,14 @@ fn ready_set_should_eventually_resolve_when_block_update_arrives() {
 
 	block_on(pool.maintain(block_event(header)));
 
-	match ready_set_future.poll_unpin(&mut context)  {
+	match ready_set_future.poll_unpin(&mut context) {
 		Poll::Pending => {
 			panic!("Ready set should become ready after block update!");
 		},
 		Poll::Ready(iterator) => {
 			let data = iterator.collect::<Vec<_>>();
 			assert_eq!(data.len(), 1);
-		}
+		},
 	}
 }
 
@@ -914,22 +861,22 @@ fn should_not_accept_old_signatures() {
 			client,
 			None,
 			&sp_core::testing::TaskExecutor::new(),
-		))).0
+		)))
+		.0,
 	);
 
-	let transfer = Transfer {
-		from: Alice.into(),
-		to: Bob.into(),
-		nonce: 0,
-		amount: 1,
-	};
+	let transfer = Transfer { from: Alice.into(), to: Bob.into(), nonce: 0, amount: 1 };
 	let _bytes: sp_core::sr25519::Signature = transfer.using_encoded(|e| Alice.sign(e)).into();
 
 	// generated with schnorrkel 0.1.1 from `_bytes`
-	let old_singature = sp_core::sr25519::Signature::try_from(&hex::decode(
-		"c427eb672e8c441c86d31f1a81b22b43102058e9ce237cabe9897ea5099ffd426\
-		cd1c6a1f4f2869c3df57901d36bedcb295657adb3a4355add86ed234eb83108"
-	).expect("hex invalid")[..]).expect("signature construction failed");
+	let old_singature = sp_core::sr25519::Signature::try_from(
+		&hex::decode(
+			"c427eb672e8c441c86d31f1a81b22b43102058e9ce237cabe9897ea5099ffd426\
+		cd1c6a1f4f2869c3df57901d36bedcb295657adb3a4355add86ed234eb83108",
+		)
+		.expect("hex invalid")[..],
+	)
+	.expect("signature construction failed");
 
 	let xt = Extrinsic::Transfer {
 		transfer,
@@ -939,9 +886,9 @@ fn should_not_accept_old_signatures() {
 
 	assert_matches::assert_matches!(
 		block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt.clone())),
-		Err(error::Error::Pool(
-			sc_transaction_pool_api::error::Error::InvalidTransaction(InvalidTransaction::BadProof)
-		)),
+		Err(error::Error::Pool(sc_transaction_pool_api::error::Error::InvalidTransaction(
+			InvalidTransaction::BadProof
+		))),
 		"Should be invalid transaction with bad proof",
 	);
 }
@@ -955,7 +902,8 @@ fn import_notification_to_pool_maintain_works() {
 			client.clone(),
 			None,
 			&sp_core::testing::TaskExecutor::new(),
-		))).0
+		)))
+		.0,
 	);
 
 	// Prepare the extrisic, push it to the pool and check that it was added.
@@ -1021,32 +969,16 @@ fn stale_transactions_are_pruned() {
 
 	// Our initial transactions
 	let xts = vec![
-		Transfer {
-			from: Alice.into(),
-			to: Bob.into(),
-			nonce: 1,
-			amount: 1,
-		},
-		Transfer {
-			from: Alice.into(),
-			to: Bob.into(),
-			nonce: 2,
-			amount: 1,
-		},
-		Transfer {
-			from: Alice.into(),
-			to: Bob.into(),
-			nonce: 3,
-			amount: 1,
-		},
+		Transfer { from: Alice.into(), to: Bob.into(), nonce: 1, amount: 1 },
+		Transfer { from: Alice.into(), to: Bob.into(), nonce: 2, amount: 1 },
+		Transfer { from: Alice.into(), to: Bob.into(), nonce: 3, amount: 1 },
 	];
 
 	let (pool, _guard, _notifier) = maintained_pool();
 
 	xts.into_iter().for_each(|xt| {
-		block_on(
-			pool.submit_one(&BlockId::number(0), SOURCE, xt.into_signed_tx()),
-		).expect("1. Imported");
+		block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt.into_signed_tx()))
+			.expect("1. Imported");
 	});
 	assert_eq!(pool.status().ready, 0);
 	assert_eq!(pool.status().future, 3);
@@ -1054,24 +986,9 @@ fn stale_transactions_are_pruned() {
 	// Almost the same as our initial transactions, but with some different `amount`s to make them
 	// generate a different hash
 	let xts = vec![
-		Transfer {
-			from: Alice.into(),
-			to: Bob.into(),
-			nonce: 1,
-			amount: 2,
-		}.into_signed_tx(),
-		Transfer {
-			from: Alice.into(),
-			to: Bob.into(),
-			nonce: 2,
-			amount: 2,
-		}.into_signed_tx(),
-		Transfer {
-			from: Alice.into(),
-			to: Bob.into(),
-			nonce: 3,
-			amount: 2,
-		}.into_signed_tx(),
+		Transfer { from: Alice.into(), to: Bob.into(), nonce: 1, amount: 2 }.into_signed_tx(),
+		Transfer { from: Alice.into(), to: Bob.into(), nonce: 2, amount: 2 }.into_signed_tx(),
+		Transfer { from: Alice.into(), to: Bob.into(), nonce: 3, amount: 2 }.into_signed_tx(),
 	];
 
 	// Import block
diff --git a/client/transaction-pool/tests/revalidation.rs b/client/transaction-pool/tests/revalidation.rs
index d720f09a7fce..b2c8225b78f5 100644
--- a/client/transaction-pool/tests/revalidation.rs
+++ b/client/transaction-pool/tests/revalidation.rs
@@ -1,32 +1,32 @@
+use futures::executor::block_on;
 use sc_transaction_pool::test_helpers::{Pool, RevalidationQueue};
 use sc_transaction_pool_api::TransactionSource;
-use substrate_test_runtime_transaction_pool::{TestApi, uxt};
-use futures::executor::block_on;
-use substrate_test_runtime_client::AccountKeyring::*;
-use std::sync::Arc;
 use sp_runtime::generic::BlockId;
+use std::sync::Arc;
+use substrate_test_runtime_client::AccountKeyring::*;
+use substrate_test_runtime_transaction_pool::{uxt, TestApi};
 
 fn setup() -> (Arc<TestApi>, Pool<TestApi>) {
-    let test_api = Arc::new(TestApi::empty());
-    let pool = Pool::new(Default::default(), true.into(), test_api.clone());
-    (test_api, pool)
+	let test_api = Arc::new(TestApi::empty());
+	let pool = Pool::new(Default::default(), true.into(), test_api.clone());
+	(test_api, pool)
 }
 
 #[test]
 fn smoky() {
-    let (api, pool) = setup();
-    let pool = Arc::new(pool);
-    let queue = Arc::new(RevalidationQueue::new(api.clone(), pool.clone()));
+	let (api, pool) = setup();
+	let pool = Arc::new(pool);
+	let queue = Arc::new(RevalidationQueue::new(api.clone(), pool.clone()));
 
-    let uxt = uxt(Alice, 0);
-    let uxt_hash = block_on(
-        pool.submit_one(&BlockId::number(0), TransactionSource::External, uxt.clone())
-    ).expect("Should be valid");
+	let uxt = uxt(Alice, 0);
+	let uxt_hash =
+		block_on(pool.submit_one(&BlockId::number(0), TransactionSource::External, uxt.clone()))
+			.expect("Should be valid");
 
-    block_on(queue.revalidate_later(0, vec![uxt_hash]));
+	block_on(queue.revalidate_later(0, vec![uxt_hash]));
 
-    // revalidated in sync offload 2nd time
-    assert_eq!(api.validation_requests().len(), 2);
-    // number of ready
-    assert_eq!(pool.validated_pool().status().ready, 1);
-}
\ No newline at end of file
+	// revalidated in sync offload 2nd time
+	assert_eq!(api.validation_requests().len(), 2);
+	// number of ready
+	assert_eq!(pool.validated_pool().status().ready, 1);
+}
diff --git a/frame/assets/src/benchmarking.rs b/frame/assets/src/benchmarking.rs
index c6925df9ad88..89a1308db171 100644
--- a/frame/assets/src/benchmarking.rs
+++ b/frame/assets/src/benchmarking.rs
@@ -19,23 +19,26 @@
 
 #![cfg(feature = "runtime-benchmarks")]
 
-use sp_std::prelude::*;
 use super::*;
-use sp_runtime::traits::Bounded;
-use frame_system::RawOrigin as SystemOrigin;
 use frame_benchmarking::{
-	benchmarks_instance_pallet, account, whitelisted_caller, whitelist_account, impl_benchmark_test_suite
+	account, benchmarks_instance_pallet, impl_benchmark_test_suite, whitelist_account,
+	whitelisted_caller,
+};
+use frame_support::{
+	dispatch::UnfilteredDispatchable,
+	traits::{EnsureOrigin, Get},
 };
-use frame_support::traits::Get;
-use frame_support::{traits::EnsureOrigin, dispatch::UnfilteredDispatchable};
+use frame_system::RawOrigin as SystemOrigin;
+use sp_runtime::traits::Bounded;
+use sp_std::prelude::*;
 
 use crate::Pallet as Assets;
 
 const SEED: u32 = 0;
 
-fn create_default_asset<T: Config<I>, I: 'static>(is_sufficient: bool)
-	-> (T::AccountId, <T::Lookup as StaticLookup>::Source)
-{
+fn create_default_asset<T: Config<I>, I: 'static>(
+	is_sufficient: bool,
+) -> (T::AccountId, <T::Lookup as StaticLookup>::Source) {
 	let caller: T::AccountId = whitelisted_caller();
 	let caller_lookup = T::Lookup::unlookup(caller.clone());
 	let root = SystemOrigin::Root.into();
@@ -45,14 +48,16 @@ fn create_default_asset<T: Config<I>, I: 'static>(is_sufficient: bool)
 		caller_lookup.clone(),
 		is_sufficient,
 		1u32.into(),
-	).is_ok());
+	)
+	.is_ok());
 	(caller, caller_lookup)
 }
 
-fn create_default_minted_asset<T: Config<I>, I: 'static>(is_sufficient: bool, amount: T::Balance)
-	-> (T::AccountId, <T::Lookup as StaticLookup>::Source)
-{
-	let (caller, caller_lookup)  = create_default_asset::<T, I>(is_sufficient);
+fn create_default_minted_asset<T: Config<I>, I: 'static>(
+	is_sufficient: bool,
+	amount: T::Balance,
+) -> (T::AccountId, <T::Lookup as StaticLookup>::Source) {
+	let (caller, caller_lookup) = create_default_asset::<T, I>(is_sufficient);
 	if !is_sufficient {
 		T::Currency::make_free_balance_be(&caller, T::Currency::minimum_balance());
 	}
@@ -61,14 +66,17 @@ fn create_default_minted_asset<T: Config<I>, I: 'static>(is_sufficient: bool, am
 		Default::default(),
 		caller_lookup.clone(),
 		amount,
-	).is_ok());
+	)
+	.is_ok());
 	(caller, caller_lookup)
 }
 
 fn swap_is_sufficient<T: Config<I>, I: 'static>(s: &mut bool) {
-	Asset::<T, I>::mutate(&T::AssetId::default(), |maybe_a|
-		if let Some(ref mut a) = maybe_a { sp_std::mem::swap(s, &mut a.is_sufficient) }
-	);
+	Asset::<T, I>::mutate(&T::AssetId::default(), |maybe_a| {
+		if let Some(ref mut a) = maybe_a {
+			sp_std::mem::swap(s, &mut a.is_sufficient)
+		}
+	});
 }
 
 fn add_consumers<T: Config<I>, I: 'static>(minter: T::AccountId, n: u32) {
@@ -79,7 +87,13 @@ fn add_consumers<T: Config<I>, I: 'static>(minter: T::AccountId, n: u32) {
 		let target = account("consumer", i, SEED);
 		T::Currency::make_free_balance_be(&target, T::Currency::minimum_balance());
 		let target_lookup = T::Lookup::unlookup(target);
-		assert!(Assets::<T, I>::mint(origin.clone().into(), Default::default(), target_lookup, 100u32.into()).is_ok());
+		assert!(Assets::<T, I>::mint(
+			origin.clone().into(),
+			Default::default(),
+			target_lookup,
+			100u32.into()
+		)
+		.is_ok());
 	}
 	swap_is_sufficient::<T, I>(&mut s);
 }
@@ -91,7 +105,13 @@ fn add_sufficients<T: Config<I>, I: 'static>(minter: T::AccountId, n: u32) {
 	for i in 0..n {
 		let target = account("sufficient", i, SEED);
 		let target_lookup = T::Lookup::unlookup(target);
-		assert!(Assets::<T, I>::mint(origin.clone().into(), Default::default(), target_lookup, 100u32.into()).is_ok());
+		assert!(Assets::<T, I>::mint(
+			origin.clone().into(),
+			Default::default(),
+			target_lookup,
+			100u32.into()
+		)
+		.is_ok());
 	}
 	swap_is_sufficient::<T, I>(&mut s);
 }
@@ -105,7 +125,8 @@ fn add_approvals<T: Config<I>, I: 'static>(minter: T::AccountId, n: u32) {
 		Default::default(),
 		minter_lookup,
 		(100 * (n + 1)).into(),
-	).unwrap();
+	)
+	.unwrap();
 	for i in 0..n {
 		let target = account("approval", i, SEED);
 		T::Currency::make_free_balance_be(&target, T::Currency::minimum_balance());
@@ -115,7 +136,8 @@ fn add_approvals<T: Config<I>, I: 'static>(minter: T::AccountId, n: u32) {
 			Default::default(),
 			target_lookup,
 			100u32.into(),
-		).unwrap();
+		)
+		.unwrap();
 	}
 }
 
diff --git a/frame/assets/src/extra_mutator.rs b/frame/assets/src/extra_mutator.rs
index d86d78ce3e37..8c601b746346 100644
--- a/frame/assets/src/extra_mutator.rs
+++ b/frame/assets/src/extra_mutator.rs
@@ -34,10 +34,7 @@ pub struct ExtraMutator<T: Config<I>, I: 'static = ()> {
 
 impl<T: Config<I>, I: 'static> Drop for ExtraMutator<T, I> {
 	fn drop(&mut self) {
-		debug_assert!(
-			self.commit().is_ok(),
-			"attempt to write to non-existent asset account"
-		);
+		debug_assert!(self.commit().is_ok(), "attempt to write to non-existent asset account");
 	}
 }
 
diff --git a/frame/assets/src/functions.rs b/frame/assets/src/functions.rs
index c6b5391cff86..6e6847ad7dfb 100644
--- a/frame/assets/src/functions.rs
+++ b/frame/assets/src/functions.rs
@@ -38,9 +38,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 
 	/// Get the total supply of an asset `id`.
 	pub fn total_supply(id: T::AssetId) -> T::Balance {
-		Asset::<T, I>::get(id)
-			.map(|x| x.supply)
-			.unwrap_or_else(Zero::zero)
+		Asset::<T, I>::get(id).map(|x| x.supply).unwrap_or_else(Zero::zero)
 	}
 
 	pub(super) fn new_account(
@@ -134,7 +132,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 				match frozen.checked_add(&details.min_balance) {
 					Some(required) if rest < required => return Frozen,
 					None => return Overflow,
-					_ => {}
+					_ => {},
 				}
 			}
 
@@ -171,9 +169,8 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 
 		let amount = if let Some(frozen) = T::Freezer::frozen_balance(id, who) {
 			// Frozen balance: account CANNOT be deleted
-			let required = frozen
-				.checked_add(&details.min_balance)
-				.ok_or(ArithmeticError::Overflow)?;
+			let required =
+				frozen.checked_add(&details.min_balance).ok_or(ArithmeticError::Overflow)?;
 			account.balance.saturating_sub(required)
 		} else {
 			let is_provider = false;
@@ -219,7 +216,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 			Err(e) => {
 				debug_assert!(false, "passed from reducible_balance; qed");
 				return Err(e.into())
-			}
+			},
 		};
 
 		Ok(actual)
@@ -268,12 +265,12 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	) -> DispatchResult {
 		Self::increase_balance(id, beneficiary, amount, |details| -> DispatchResult {
 			if let Some(check_issuer) = maybe_check_issuer {
-				ensure!(
-					&check_issuer == &details.issuer,
-					Error::<T, I>::NoPermission
-				);
+				ensure!(&check_issuer == &details.issuer, Error::<T, I>::NoPermission);
 			}
-			debug_assert!(T::Balance::max_value() - details.supply >= amount, "checked in prep; qed");
+			debug_assert!(
+				T::Balance::max_value() - details.supply >= amount,
+				"checked in prep; qed"
+			);
 			details.supply = details.supply.saturating_add(amount);
 			Ok(())
 		})?;
@@ -295,7 +292,9 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 			&mut AssetDetails<T::Balance, T::AccountId, DepositBalanceOf<T, I>>,
 		) -> DispatchResult,
 	) -> DispatchResult {
-		if amount.is_zero() { return Ok(()) }
+		if amount.is_zero() {
+			return Ok(())
+		}
 
 		Self::can_increase(id, beneficiary, amount).into_result()?;
 		Asset::<T, I>::try_mutate(id, |maybe_details| -> DispatchResult {
@@ -364,7 +363,9 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 			&mut AssetDetails<T::Balance, T::AccountId, DepositBalanceOf<T, I>>,
 		) -> DispatchResult,
 	) -> Result<T::Balance, DispatchError> {
-		if amount.is_zero() { return Ok(amount) }
+		if amount.is_zero() {
+			return Ok(amount)
+		}
 
 		let actual = Self::prep_debit(id, target, amount, f)?;
 
diff --git a/frame/assets/src/impl_fungibles.rs b/frame/assets/src/impl_fungibles.rs
index 71951bae1116..4e85b20a1fbb 100644
--- a/frame/assets/src/impl_fungibles.rs
+++ b/frame/assets/src/impl_fungibles.rs
@@ -24,15 +24,11 @@ impl<T: Config<I>, I: 'static> fungibles::Inspect<<T as SystemConfig>::AccountId
 	type Balance = T::Balance;
 
 	fn total_issuance(asset: Self::AssetId) -> Self::Balance {
-		Asset::<T, I>::get(asset)
-			.map(|x| x.supply)
-			.unwrap_or_else(Zero::zero)
+		Asset::<T, I>::get(asset).map(|x| x.supply).unwrap_or_else(Zero::zero)
 	}
 
 	fn minimum_balance(asset: Self::AssetId) -> Self::Balance {
-		Asset::<T, I>::get(asset)
-			.map(|x| x.min_balance)
-			.unwrap_or_else(Zero::zero)
+		Asset::<T, I>::get(asset).map(|x| x.min_balance).unwrap_or_else(Zero::zero)
 	}
 
 	fn balance(asset: Self::AssetId, who: &<T as SystemConfig>::AccountId) -> Self::Balance {
@@ -78,10 +74,7 @@ impl<T: Config<I>, I: 'static> fungibles::Mutate<<T as SystemConfig>::AccountId>
 		who: &<T as SystemConfig>::AccountId,
 		amount: Self::Balance,
 	) -> Result<Self::Balance, DispatchError> {
-		let f = DebitFlags {
-			keep_alive: false,
-			best_effort: false,
-		};
+		let f = DebitFlags { keep_alive: false, best_effort: false };
 		Self::do_burn(asset, who, amount, None, f)
 	}
 
@@ -90,10 +83,7 @@ impl<T: Config<I>, I: 'static> fungibles::Mutate<<T as SystemConfig>::AccountId>
 		who: &<T as SystemConfig>::AccountId,
 		amount: Self::Balance,
 	) -> Result<Self::Balance, DispatchError> {
-		let f = DebitFlags {
-			keep_alive: false,
-			best_effort: true,
-		};
+		let f = DebitFlags { keep_alive: false, best_effort: true };
 		Self::do_burn(asset, who, amount, None, f)
 	}
 }
@@ -106,11 +96,7 @@ impl<T: Config<I>, I: 'static> fungibles::Transfer<T::AccountId> for Pallet<T, I
 		amount: T::Balance,
 		keep_alive: bool,
 	) -> Result<T::Balance, DispatchError> {
-		let f = TransferFlags {
-			keep_alive,
-			best_effort: false,
-			burn_dust: false
-		};
+		let f = TransferFlags { keep_alive, best_effort: false, burn_dust: false };
 		Self::do_transfer(asset, source, dest, amount, None, f)
 	}
 }
@@ -126,28 +112,35 @@ impl<T: Config<I>, I: 'static> fungibles::Unbalanced<T::AccountId> for Pallet<T,
 			}
 		});
 	}
-	fn decrease_balance(asset: T::AssetId, who: &T::AccountId, amount: Self::Balance)
-		-> Result<Self::Balance, DispatchError>
-	{
+	fn decrease_balance(
+		asset: T::AssetId,
+		who: &T::AccountId,
+		amount: Self::Balance,
+	) -> Result<Self::Balance, DispatchError> {
 		let f = DebitFlags { keep_alive: false, best_effort: false };
 		Self::decrease_balance(asset, who, amount, f, |_, _| Ok(()))
 	}
-	fn decrease_balance_at_most(asset: T::AssetId, who: &T::AccountId, amount: Self::Balance)
-		-> Self::Balance
-	{
+	fn decrease_balance_at_most(
+		asset: T::AssetId,
+		who: &T::AccountId,
+		amount: Self::Balance,
+	) -> Self::Balance {
 		let f = DebitFlags { keep_alive: false, best_effort: true };
-		Self::decrease_balance(asset, who, amount, f, |_, _| Ok(()))
-			.unwrap_or(Zero::zero())
+		Self::decrease_balance(asset, who, amount, f, |_, _| Ok(())).unwrap_or(Zero::zero())
 	}
-	fn increase_balance(asset: T::AssetId, who: &T::AccountId, amount: Self::Balance)
-		-> Result<Self::Balance, DispatchError>
-	{
+	fn increase_balance(
+		asset: T::AssetId,
+		who: &T::AccountId,
+		amount: Self::Balance,
+	) -> Result<Self::Balance, DispatchError> {
 		Self::increase_balance(asset, who, amount, |_| Ok(()))?;
 		Ok(amount)
 	}
-	fn increase_balance_at_most(asset: T::AssetId, who: &T::AccountId, amount: Self::Balance)
-		-> Self::Balance
-	{
+	fn increase_balance_at_most(
+		asset: T::AssetId,
+		who: &T::AccountId,
+		amount: Self::Balance,
+	) -> Self::Balance {
 		match Self::increase_balance(asset, who, amount, |_| Ok(())) {
 			Ok(()) => amount,
 			Err(_) => Zero::zero(),
diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index 5fe167df3f44..65878672c9a7 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -122,40 +122,49 @@
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
 
-pub mod weights;
 #[cfg(feature = "runtime-benchmarks")]
 mod benchmarking;
 #[cfg(test)]
 pub mod mock;
 #[cfg(test)]
 mod tests;
+pub mod weights;
 
 mod extra_mutator;
 pub use extra_mutator::*;
-mod impl_stored_map;
-mod impl_fungibles;
 mod functions;
+mod impl_fungibles;
+mod impl_stored_map;
 mod types;
 pub use types::*;
 
-use sp_std::{prelude::*, borrow::Borrow, convert::TryInto};
-use sp_runtime::{
-	TokenError, ArithmeticError,
-	traits::{AtLeast32BitUnsigned, Zero, StaticLookup, Saturating, CheckedSub, CheckedAdd, Bounded}
-};
 use codec::HasCompact;
-use frame_support::pallet_prelude::*;
-use frame_support::traits::{Currency, ReservableCurrency, BalanceStatus::Reserved, StoredMap};
-use frame_support::traits::tokens::{WithdrawConsequence, DepositConsequence, fungibles};
+use frame_support::{
+	dispatch::{DispatchError, DispatchResult},
+	ensure,
+	traits::{
+		tokens::{fungibles, DepositConsequence, WithdrawConsequence},
+		BalanceStatus::Reserved,
+		Currency, ReservableCurrency, StoredMap,
+	},
+};
 use frame_system::Config as SystemConfig;
+use sp_runtime::{
+	traits::{
+		AtLeast32BitUnsigned, Bounded, CheckedAdd, CheckedSub, Saturating, StaticLookup, Zero,
+	},
+	ArithmeticError, TokenError,
+};
+use sp_std::{borrow::Borrow, convert::TryInto, prelude::*};
 
-pub use weights::WeightInfo;
 pub use pallet::*;
+pub use weights::WeightInfo;
 
 #[frame_support::pallet]
 pub mod pallet {
-	use frame_system::pallet_prelude::*;
 	use super::*;
+	use frame_support::{dispatch::DispatchResult, pallet_prelude::*};
+	use frame_system::pallet_prelude::*;
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
@@ -267,11 +276,7 @@ pub mod pallet {
 
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
-	#[pallet::metadata(
-		T::AccountId = "AccountId",
-		T::Balance = "Balance",
-		T::AssetId = "AssetId"
-	)]
+	#[pallet::metadata(T::AccountId = "AccountId", T::Balance = "Balance", T::AssetId = "AssetId")]
 	pub enum Event<T: Config<I>, I: 'static = ()> {
 		/// Some asset class was created. \[asset_id, creator, owner\]
 		Created(T::AssetId, T::AccountId, T::AccountId),
@@ -514,13 +519,12 @@ pub mod pallet {
 				}
 				Self::deposit_event(Event::Destroyed(id));
 
-				Ok(
-					Some(T::WeightInfo::destroy(
-						details.accounts.saturating_sub(details.sufficients),
-						details.sufficients,
-						details.approvals,
-					)).into()
-				)
+				Ok(Some(T::WeightInfo::destroy(
+					details.accounts.saturating_sub(details.sufficients),
+					details.sufficients,
+					details.approvals,
+				))
+				.into())
 			})
 		}
 
@@ -541,7 +545,7 @@ pub mod pallet {
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId,
 			beneficiary: <T::Lookup as StaticLookup>::Source,
-			#[pallet::compact] amount: T::Balance
+			#[pallet::compact] amount: T::Balance,
 		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
 			let beneficiary = T::Lookup::lookup(beneficiary)?;
@@ -569,7 +573,7 @@ pub mod pallet {
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId,
 			who: <T::Lookup as StaticLookup>::Source,
-			#[pallet::compact] amount: T::Balance
+			#[pallet::compact] amount: T::Balance,
 		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
 			let who = T::Lookup::lookup(who)?;
@@ -602,16 +606,12 @@ pub mod pallet {
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId,
 			target: <T::Lookup as StaticLookup>::Source,
-			#[pallet::compact] amount: T::Balance
+			#[pallet::compact] amount: T::Balance,
 		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
 			let dest = T::Lookup::lookup(target)?;
 
-			let f = TransferFlags {
-				keep_alive: false,
-				best_effort: false,
-				burn_dust: false
-			};
+			let f = TransferFlags { keep_alive: false, best_effort: false, burn_dust: false };
 			Self::do_transfer(id, &origin, &dest, amount, None, f).map(|_| ())
 		}
 
@@ -638,16 +638,12 @@ pub mod pallet {
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId,
 			target: <T::Lookup as StaticLookup>::Source,
-			#[pallet::compact] amount: T::Balance
+			#[pallet::compact] amount: T::Balance,
 		) -> DispatchResult {
 			let source = ensure_signed(origin)?;
 			let dest = T::Lookup::lookup(target)?;
 
-			let f = TransferFlags {
-				keep_alive: true,
-				best_effort: false,
-				burn_dust: false
-			};
+			let f = TransferFlags { keep_alive: true, best_effort: false, burn_dust: false };
 			Self::do_transfer(id, &source, &dest, amount, None, f).map(|_| ())
 		}
 
@@ -682,11 +678,7 @@ pub mod pallet {
 			let source = T::Lookup::lookup(source)?;
 			let dest = T::Lookup::lookup(dest)?;
 
-			let f = TransferFlags {
-				keep_alive: false,
-				best_effort: false,
-				burn_dust: false
-			};
+			let f = TransferFlags { keep_alive: false, best_effort: false, burn_dust: false };
 			Self::do_transfer(id, &source, &dest, amount, Some(origin), f).map(|_| ())
 		}
 
@@ -704,17 +696,14 @@ pub mod pallet {
 		pub fn freeze(
 			origin: OriginFor<T>,
 			#[pallet::compact] id: T::AssetId,
-			who: <T::Lookup as StaticLookup>::Source
+			who: <T::Lookup as StaticLookup>::Source,
 		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
 
 			let d = Asset::<T, I>::get(id).ok_or(Error::<T, I>::Unknown)?;
 			ensure!(&origin == &d.freezer, Error::<T, I>::NoPermission);
 			let who = T::Lookup::lookup(who)?;
-			ensure!(
-				Account::<T, I>::contains_key(id, &who),
-				Error::<T, I>::BalanceZero
-			);
+			ensure!(Account::<T, I>::contains_key(id, &who), Error::<T, I>::BalanceZero);
 
 			Account::<T, I>::mutate(id, &who, |a| a.is_frozen = true);
 
@@ -735,19 +724,15 @@ pub mod pallet {
 		#[pallet::weight(T::WeightInfo::thaw())]
 		pub fn thaw(
 			origin: OriginFor<T>,
-			#[pallet::compact]
-			id: T::AssetId,
-			who: <T::Lookup as StaticLookup>::Source
+			#[pallet::compact] id: T::AssetId,
+			who: <T::Lookup as StaticLookup>::Source,
 		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
 
 			let details = Asset::<T, I>::get(id).ok_or(Error::<T, I>::Unknown)?;
 			ensure!(&origin == &details.admin, Error::<T, I>::NoPermission);
 			let who = T::Lookup::lookup(who)?;
-			ensure!(
-				Account::<T, I>::contains_key(id, &who),
-				Error::<T, I>::BalanceZero
-			);
+			ensure!(Account::<T, I>::contains_key(id, &who), Error::<T, I>::BalanceZero);
 
 			Account::<T, I>::mutate(id, &who, |a| a.is_frozen = false);
 
@@ -767,7 +752,7 @@ pub mod pallet {
 		#[pallet::weight(T::WeightInfo::freeze_asset())]
 		pub fn freeze_asset(
 			origin: OriginFor<T>,
-			#[pallet::compact] id: T::AssetId
+			#[pallet::compact] id: T::AssetId,
 		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
 
@@ -794,7 +779,7 @@ pub mod pallet {
 		#[pallet::weight(T::WeightInfo::thaw_asset())]
 		pub fn thaw_asset(
 			origin: OriginFor<T>,
-			#[pallet::compact] id: T::AssetId
+			#[pallet::compact] id: T::AssetId,
 		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
 
@@ -832,7 +817,7 @@ pub mod pallet {
 				let details = maybe_details.as_mut().ok_or(Error::<T, I>::Unknown)?;
 				ensure!(&origin == &details.owner, Error::<T, I>::NoPermission);
 				if details.owner == owner {
-					return Ok(());
+					return Ok(())
 				}
 
 				let metadata_deposit = Metadata::<T, I>::get(id).deposit;
@@ -912,14 +897,10 @@ pub mod pallet {
 		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
 
-			let bounded_name: BoundedVec<u8, T::StringLimit> = name
-				.clone()
-				.try_into()
-				.map_err(|_| Error::<T, I>::BadMetadata)?;
-			let bounded_symbol: BoundedVec<u8, T::StringLimit> = symbol
-				.clone()
-				.try_into()
-				.map_err(|_| Error::<T, I>::BadMetadata)?;
+			let bounded_name: BoundedVec<u8, T::StringLimit> =
+				name.clone().try_into().map_err(|_| Error::<T, I>::BadMetadata)?;
+			let bounded_symbol: BoundedVec<u8, T::StringLimit> =
+				symbol.clone().try_into().map_err(|_| Error::<T, I>::BadMetadata)?;
 
 			let d = Asset::<T, I>::get(id).ok_or(Error::<T, I>::Unknown)?;
 			ensure!(&origin == &d.owner, Error::<T, I>::NoPermission);
@@ -1008,15 +989,11 @@ pub mod pallet {
 		) -> DispatchResult {
 			T::ForceOrigin::ensure_origin(origin)?;
 
-			let bounded_name: BoundedVec<u8, T::StringLimit> = name
-				.clone()
-				.try_into()
-				.map_err(|_| Error::<T, I>::BadMetadata)?;
+			let bounded_name: BoundedVec<u8, T::StringLimit> =
+				name.clone().try_into().map_err(|_| Error::<T, I>::BadMetadata)?;
 
-			let bounded_symbol: BoundedVec<u8, T::StringLimit> = symbol
-				.clone()
-				.try_into()
-				.map_err(|_| Error::<T, I>::BadMetadata)?;
+			let bounded_symbol: BoundedVec<u8, T::StringLimit> =
+				symbol.clone().try_into().map_err(|_| Error::<T, I>::BadMetadata)?;
 
 			ensure!(Asset::<T, I>::contains_key(id), Error::<T, I>::Unknown);
 			Metadata::<T, I>::try_mutate_exists(id, |metadata| {
@@ -1145,25 +1122,28 @@ pub mod pallet {
 
 			let mut d = Asset::<T, I>::get(id).ok_or(Error::<T, I>::Unknown)?;
 			ensure!(!d.is_frozen, Error::<T, I>::Frozen);
-			Approvals::<T, I>::try_mutate((id, &owner, &delegate), |maybe_approved| -> DispatchResult {
-				let mut approved = match maybe_approved.take() {
-					// an approval already exists and is being updated
-					Some(a) => a,
-					// a new approval is created
-					None => {
-						d.approvals.saturating_inc();
-						Default::default()
+			Approvals::<T, I>::try_mutate(
+				(id, &owner, &delegate),
+				|maybe_approved| -> DispatchResult {
+					let mut approved = match maybe_approved.take() {
+						// an approval already exists and is being updated
+						Some(a) => a,
+						// a new approval is created
+						None => {
+							d.approvals.saturating_inc();
+							Default::default()
+						},
+					};
+					let deposit_required = T::ApprovalDeposit::get();
+					if approved.deposit < deposit_required {
+						T::Currency::reserve(&owner, deposit_required - approved.deposit)?;
+						approved.deposit = deposit_required;
 					}
-				};
-				let deposit_required = T::ApprovalDeposit::get();
-				if approved.deposit < deposit_required {
-					T::Currency::reserve(&owner, deposit_required - approved.deposit)?;
-					approved.deposit = deposit_required;
-				}
-				approved.amount = approved.amount.saturating_add(amount);
-				*maybe_approved = Some(approved);
-				Ok(())
-			})?;
+					approved.amount = approved.amount.saturating_add(amount);
+					*maybe_approved = Some(approved);
+					Ok(())
+				},
+			)?;
 			Asset::<T, I>::insert(id, d);
 			Self::deposit_event(Event::ApprovedTransfer(id, owner, delegate, amount));
 
@@ -1192,7 +1172,8 @@ pub mod pallet {
 			let owner = ensure_signed(origin)?;
 			let delegate = T::Lookup::lookup(delegate)?;
 			let mut d = Asset::<T, I>::get(id).ok_or(Error::<T, I>::Unknown)?;
-			let approval = Approvals::<T, I>::take((id, &owner, &delegate)).ok_or(Error::<T, I>::Unknown)?;
+			let approval =
+				Approvals::<T, I>::take((id, &owner, &delegate)).ok_or(Error::<T, I>::Unknown)?;
 			T::Currency::unreserve(&owner, approval.deposit);
 
 			d.approvals.saturating_dec();
@@ -1234,7 +1215,8 @@ pub mod pallet {
 			let owner = T::Lookup::lookup(owner)?;
 			let delegate = T::Lookup::lookup(delegate)?;
 
-			let approval = Approvals::<T, I>::take((id, &owner, &delegate)).ok_or(Error::<T, I>::Unknown)?;
+			let approval =
+				Approvals::<T, I>::take((id, &owner, &delegate)).ok_or(Error::<T, I>::Unknown)?;
 			T::Currency::unreserve(&owner, approval.deposit);
 			d.approvals.saturating_dec();
 			Asset::<T, I>::insert(id, d);
@@ -1273,33 +1255,31 @@ pub mod pallet {
 			let owner = T::Lookup::lookup(owner)?;
 			let destination = T::Lookup::lookup(destination)?;
 
-			Approvals::<T, I>::try_mutate_exists((id, &owner, delegate), |maybe_approved| -> DispatchResult {
-				let mut approved = maybe_approved.take().ok_or(Error::<T, I>::Unapproved)?;
-				let remaining = approved
-					.amount
-					.checked_sub(&amount)
-					.ok_or(Error::<T, I>::Unapproved)?;
-
-				let f = TransferFlags {
-					keep_alive: false,
-					best_effort: false,
-					burn_dust: false
-				};
-				Self::do_transfer(id, &owner, &destination, amount, None, f)?;
-
-				if remaining.is_zero() {
-					T::Currency::unreserve(&owner, approved.deposit);
-					Asset::<T, I>::mutate(id, |maybe_details| {
-						if let Some(details) = maybe_details {
-							details.approvals.saturating_dec();
-						}
-					});
-				} else {
-					approved.amount = remaining;
-					*maybe_approved = Some(approved);
-				}
-				Ok(())
-			})?;
+			Approvals::<T, I>::try_mutate_exists(
+				(id, &owner, delegate),
+				|maybe_approved| -> DispatchResult {
+					let mut approved = maybe_approved.take().ok_or(Error::<T, I>::Unapproved)?;
+					let remaining =
+						approved.amount.checked_sub(&amount).ok_or(Error::<T, I>::Unapproved)?;
+
+					let f =
+						TransferFlags { keep_alive: false, best_effort: false, burn_dust: false };
+					Self::do_transfer(id, &owner, &destination, amount, None, f)?;
+
+					if remaining.is_zero() {
+						T::Currency::unreserve(&owner, approved.deposit);
+						Asset::<T, I>::mutate(id, |maybe_details| {
+							if let Some(details) = maybe_details {
+								details.approvals.saturating_dec();
+							}
+						});
+					} else {
+						approved.amount = remaining;
+						*maybe_approved = Some(approved);
+					}
+					Ok(())
+				},
+			)?;
 			Ok(())
 		}
 	}
diff --git a/frame/assets/src/mock.rs b/frame/assets/src/mock.rs
index 429548a5d1c2..e4f5763f149f 100644
--- a/frame/assets/src/mock.rs
+++ b/frame/assets/src/mock.rs
@@ -20,9 +20,12 @@
 use super::*;
 use crate as pallet_assets;
 
+use frame_support::{construct_runtime, parameter_types};
 use sp_core::H256;
-use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
-use frame_support::{parameter_types, construct_runtime};
+use sp_runtime::{
+	testing::Header,
+	traits::{BlakeTwo256, IdentityLookup},
+};
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -108,8 +111,7 @@ impl Config for Test {
 	type Extra = ();
 }
 
-use std::cell::RefCell;
-use std::collections::HashMap;
+use std::{cell::RefCell, collections::HashMap};
 
 #[derive(Copy, Clone, Eq, PartialEq, Debug)]
 pub(crate) enum Hook {
diff --git a/frame/assets/src/tests.rs b/frame/assets/src/tests.rs
index c2cf9acf29bd..aab534a6e4ef 100644
--- a/frame/assets/src/tests.rs
+++ b/frame/assets/src/tests.rs
@@ -18,10 +18,10 @@
 //! Tests for Assets pallet.
 
 use super::*;
-use crate::{Error, mock::*};
-use sp_runtime::{TokenError, traits::ConvertInto};
-use frame_support::{assert_ok, assert_noop, traits::Currency};
+use crate::{mock::*, Error};
+use frame_support::{assert_noop, assert_ok, traits::Currency};
 use pallet_balances::Error as BalancesError;
+use sp_runtime::{traits::ConvertInto, TokenError};
 
 #[test]
 fn basic_minting_should_work() {
@@ -151,13 +151,25 @@ fn force_cancel_approval_works() {
 		assert_eq!(Asset::<Test>::get(0).unwrap().approvals, 1);
 		let e = Error::<Test>::NoPermission;
 		assert_noop!(Assets::force_cancel_approval(Origin::signed(2), 0, 1, 2), e);
-		assert_noop!(Assets::force_cancel_approval(Origin::signed(1), 1, 1, 2), Error::<Test>::Unknown);
-		assert_noop!(Assets::force_cancel_approval(Origin::signed(1), 0, 2, 2), Error::<Test>::Unknown);
-		assert_noop!(Assets::force_cancel_approval(Origin::signed(1), 0, 1, 3), Error::<Test>::Unknown);
+		assert_noop!(
+			Assets::force_cancel_approval(Origin::signed(1), 1, 1, 2),
+			Error::<Test>::Unknown
+		);
+		assert_noop!(
+			Assets::force_cancel_approval(Origin::signed(1), 0, 2, 2),
+			Error::<Test>::Unknown
+		);
+		assert_noop!(
+			Assets::force_cancel_approval(Origin::signed(1), 0, 1, 3),
+			Error::<Test>::Unknown
+		);
 		assert_eq!(Asset::<Test>::get(0).unwrap().approvals, 1);
 		assert_ok!(Assets::force_cancel_approval(Origin::signed(1), 0, 1, 2));
 		assert_eq!(Asset::<Test>::get(0).unwrap().approvals, 0);
-		assert_noop!(Assets::force_cancel_approval(Origin::signed(1), 0, 1, 2), Error::<Test>::Unknown);
+		assert_noop!(
+			Assets::force_cancel_approval(Origin::signed(1), 0, 1, 2),
+			Error::<Test>::Unknown
+		);
 	});
 }
 
@@ -222,7 +234,6 @@ fn destroy_with_bad_witness_should_not_work() {
 		w.accounts += 2;
 		w.sufficients += 2;
 		assert_ok!(Assets::destroy(Origin::signed(1), 0, w));
-
 	});
 }
 
@@ -259,7 +270,10 @@ fn non_providing_should_work() {
 		// ...or transfer...
 		assert_noop!(Assets::transfer(Origin::signed(0), 0, 1, 50), TokenError::CannotCreate);
 		// ...or force-transfer
-		assert_noop!(Assets::force_transfer(Origin::signed(1), 0, 0, 1, 50), TokenError::CannotCreate);
+		assert_noop!(
+			Assets::force_transfer(Origin::signed(1), 0, 0, 1, 50),
+			TokenError::CannotCreate
+		);
 
 		Balances::make_free_balance_be(&1, 100);
 		Balances::make_free_balance_be(&2, 100);
@@ -278,7 +292,10 @@ fn min_balance_should_work() {
 		// Cannot create a new account with a balance that is below minimum...
 		assert_noop!(Assets::mint(Origin::signed(1), 0, 2, 9), TokenError::BelowMinimum);
 		assert_noop!(Assets::transfer(Origin::signed(1), 0, 2, 9), TokenError::BelowMinimum);
-		assert_noop!(Assets::force_transfer(Origin::signed(1), 0, 1, 2, 9), TokenError::BelowMinimum);
+		assert_noop!(
+			Assets::force_transfer(Origin::signed(1), 0, 1, 2, 9),
+			TokenError::BelowMinimum
+		);
 
 		// When deducting from an account to below minimum, it should be reaped.
 		assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 91));
@@ -333,7 +350,10 @@ fn transferring_enough_to_kill_source_when_keep_alive_should_fail() {
 		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 10));
 		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
 		assert_eq!(Assets::balance(0, 1), 100);
-		assert_noop!(Assets::transfer_keep_alive(Origin::signed(1), 0, 2, 91), Error::<Test>::BalanceLow);
+		assert_noop!(
+			Assets::transfer_keep_alive(Origin::signed(1), 0, 2, 91),
+			Error::<Test>::BalanceLow
+		);
 		assert_ok!(Assets::transfer_keep_alive(Origin::signed(1), 0, 2, 90));
 		assert_eq!(Assets::balance(0, 1), 10);
 		assert_eq!(Assets::balance(0, 2), 90);
@@ -385,13 +405,19 @@ fn origin_guards_should_work() {
 	new_test_ext().execute_with(|| {
 		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
 		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
-		assert_noop!(Assets::transfer_ownership(Origin::signed(2), 0, 2), Error::<Test>::NoPermission);
+		assert_noop!(
+			Assets::transfer_ownership(Origin::signed(2), 0, 2),
+			Error::<Test>::NoPermission
+		);
 		assert_noop!(Assets::set_team(Origin::signed(2), 0, 2, 2, 2), Error::<Test>::NoPermission);
 		assert_noop!(Assets::freeze(Origin::signed(2), 0, 1), Error::<Test>::NoPermission);
 		assert_noop!(Assets::thaw(Origin::signed(2), 0, 2), Error::<Test>::NoPermission);
 		assert_noop!(Assets::mint(Origin::signed(2), 0, 2, 100), Error::<Test>::NoPermission);
 		assert_noop!(Assets::burn(Origin::signed(2), 0, 1, 100), Error::<Test>::NoPermission);
-		assert_noop!(Assets::force_transfer(Origin::signed(2), 0, 1, 2, 100), Error::<Test>::NoPermission);
+		assert_noop!(
+			Assets::force_transfer(Origin::signed(2), 0, 1, 2, 100),
+			Error::<Test>::NoPermission
+		);
 		let w = Asset::<Test>::get(0).unwrap().destroy_witness();
 		assert_noop!(Assets::destroy(Origin::signed(2), 0, w), Error::<Test>::NoPermission);
 	});
@@ -410,7 +436,10 @@ fn transfer_owner_should_work() {
 		assert_eq!(Balances::reserved_balance(&2), 1);
 		assert_eq!(Balances::reserved_balance(&1), 0);
 
-		assert_noop!(Assets::transfer_ownership(Origin::signed(1), 0, 1), Error::<Test>::NoPermission);
+		assert_noop!(
+			Assets::transfer_ownership(Origin::signed(1), 0, 1),
+			Error::<Test>::NoPermission
+		);
 
 		// Set metadata now and make sure that deposit gets transferred back.
 		assert_ok!(Assets::set_metadata(Origin::signed(2), 0, vec![0u8; 10], vec![0u8; 10], 12));
@@ -513,25 +542,25 @@ fn set_metadata_should_work() {
 	new_test_ext().execute_with(|| {
 		// Cannot add metadata to unknown asset
 		assert_noop!(
-				Assets::set_metadata(Origin::signed(1), 0, vec![0u8; 10], vec![0u8; 10], 12),
-				Error::<Test>::Unknown,
-			);
+			Assets::set_metadata(Origin::signed(1), 0, vec![0u8; 10], vec![0u8; 10], 12),
+			Error::<Test>::Unknown,
+		);
 		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
 		// Cannot add metadata to unowned asset
 		assert_noop!(
-				Assets::set_metadata(Origin::signed(2), 0, vec![0u8; 10], vec![0u8; 10], 12),
-				Error::<Test>::NoPermission,
-			);
+			Assets::set_metadata(Origin::signed(2), 0, vec![0u8; 10], vec![0u8; 10], 12),
+			Error::<Test>::NoPermission,
+		);
 
 		// Cannot add oversized metadata
 		assert_noop!(
-				Assets::set_metadata(Origin::signed(1), 0, vec![0u8; 100], vec![0u8; 10], 12),
-				Error::<Test>::BadMetadata,
-			);
+			Assets::set_metadata(Origin::signed(1), 0, vec![0u8; 100], vec![0u8; 10], 12),
+			Error::<Test>::BadMetadata,
+		);
 		assert_noop!(
-				Assets::set_metadata(Origin::signed(1), 0, vec![0u8; 10], vec![0u8; 100], 12),
-				Error::<Test>::BadMetadata,
-			);
+			Assets::set_metadata(Origin::signed(1), 0, vec![0u8; 10], vec![0u8; 100], 12),
+			Error::<Test>::BadMetadata,
+		);
 
 		// Successfully add metadata and take deposit
 		Balances::make_free_balance_be(&1, 30);
@@ -546,9 +575,9 @@ fn set_metadata_should_work() {
 
 		// Cannot over-reserve
 		assert_noop!(
-				Assets::set_metadata(Origin::signed(1), 0, vec![0u8; 20], vec![0u8; 20], 12),
-				BalancesError::<Test, _>::InsufficientBalance,
-			);
+			Assets::set_metadata(Origin::signed(1), 0, vec![0u8; 20], vec![0u8; 20], 12),
+			BalancesError::<Test, _>::InsufficientBalance,
+		);
 
 		// Clear Metadata
 		assert!(Metadata::<Test>::contains_key(0));
@@ -566,7 +595,6 @@ fn freezer_should_work() {
 		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 100));
 		assert_eq!(Assets::balance(0, 1), 100);
 
-
 		// freeze 50 of it.
 		set_frozen_balance(0, 1, 50);
 
@@ -624,45 +652,73 @@ fn imbalances_should_work() {
 #[test]
 fn force_metadata_should_work() {
 	new_test_ext().execute_with(|| {
-		//force set metadata works
+		// force set metadata works
 		assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
-		assert_ok!(Assets::force_set_metadata(Origin::root(), 0, vec![0u8; 10], vec![0u8; 10], 8, false));
+		assert_ok!(Assets::force_set_metadata(
+			Origin::root(),
+			0,
+			vec![0u8; 10],
+			vec![0u8; 10],
+			8,
+			false
+		));
 		assert!(Metadata::<Test>::contains_key(0));
 
-		//overwrites existing metadata
+		// overwrites existing metadata
 		let asset_original_metadata = Metadata::<Test>::get(0);
-		assert_ok!(Assets::force_set_metadata(Origin::root(), 0, vec![1u8; 10], vec![1u8; 10], 8, false));
+		assert_ok!(Assets::force_set_metadata(
+			Origin::root(),
+			0,
+			vec![1u8; 10],
+			vec![1u8; 10],
+			8,
+			false
+		));
 		assert_ne!(Metadata::<Test>::get(0), asset_original_metadata);
 
-		//attempt to set metadata for non-existent asset class
+		// attempt to set metadata for non-existent asset class
 		assert_noop!(
 			Assets::force_set_metadata(Origin::root(), 1, vec![0u8; 10], vec![0u8; 10], 8, false),
 			Error::<Test>::Unknown
 		);
 
-		//string length limit check
+		// string length limit check
 		let limit = StringLimit::get() as usize;
 		assert_noop!(
-			Assets::force_set_metadata(Origin::root(), 0, vec![0u8; limit + 1], vec![0u8; 10], 8, false),
+			Assets::force_set_metadata(
+				Origin::root(),
+				0,
+				vec![0u8; limit + 1],
+				vec![0u8; 10],
+				8,
+				false
+			),
 			Error::<Test>::BadMetadata
 		);
 		assert_noop!(
-			Assets::force_set_metadata(Origin::root(), 0, vec![0u8; 10], vec![0u8; limit + 1], 8, false),
+			Assets::force_set_metadata(
+				Origin::root(),
+				0,
+				vec![0u8; 10],
+				vec![0u8; limit + 1],
+				8,
+				false
+			),
 			Error::<Test>::BadMetadata
 		);
 
-		//force clear metadata works
+		// force clear metadata works
 		assert!(Metadata::<Test>::contains_key(0));
 		assert_ok!(Assets::force_clear_metadata(Origin::root(), 0));
 		assert!(!Metadata::<Test>::contains_key(0));
 
-		//Error handles clearing non-existent asset class
+		// Error handles clearing non-existent asset class
 		assert_noop!(Assets::force_clear_metadata(Origin::root(), 1), Error::<Test>::Unknown);
 	});
 }
 
 #[test]
-fn force_asset_status_should_work(){
+fn force_asset_status_should_work() {
 	new_test_ext().execute_with(|| {
 		Balances::make_free_balance_be(&1, 10);
 		Balances::make_free_balance_be(&2, 10);
@@ -670,28 +726,28 @@ fn force_asset_status_should_work(){
 		assert_ok!(Assets::mint(Origin::signed(1), 0, 1, 50));
 		assert_ok!(Assets::mint(Origin::signed(1), 0, 2, 150));
 
-		//force asset status to change min_balance > balance
+		// force asset status to change min_balance > balance
 		assert_ok!(Assets::force_asset_status(Origin::root(), 0, 1, 1, 1, 1, 100, true, false));
 		assert_eq!(Assets::balance(0, 1), 50);
 
-		//account can recieve assets for balance < min_balance
+		// account can recieve assets for balance < min_balance
 		assert_ok!(Assets::transfer(Origin::signed(2), 0, 1, 1));
 		assert_eq!(Assets::balance(0, 1), 51);
 
-		//account on outbound transfer will cleanup for balance < min_balance
+		// account on outbound transfer will cleanup for balance < min_balance
 		assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, 1));
-		assert_eq!(Assets::balance(0,1), 0);
+		assert_eq!(Assets::balance(0, 1), 0);
 
-		//won't create new account with balance below min_balance
+		// won't create new account with balance below min_balance
 		assert_noop!(Assets::transfer(Origin::signed(2), 0, 3, 50), TokenError::BelowMinimum);
 
-		//force asset status will not execute for non-existent class
+		// force asset status will not execute for non-existent class
 		assert_noop!(
 			Assets::force_asset_status(Origin::root(), 1, 1, 1, 1, 1, 90, true, false),
 			Error::<Test>::Unknown
 		);
 
-		//account drains to completion when funds dip below min_balance
+		// account drains to completion when funds dip below min_balance
 		assert_ok!(Assets::force_asset_status(Origin::root(), 0, 1, 1, 1, 1, 110, true, false));
 		assert_ok!(Assets::transfer(Origin::signed(2), 0, 1, 110));
 		assert_eq!(Assets::balance(0, 1), 200);
@@ -715,7 +771,10 @@ fn balance_conversion_should_work() {
 			Err(ConversionError::AssetMissing)
 		);
 		assert_eq!(
-			BalanceToAssetBalance::<Balances, Test, ConvertInto>::to_asset_balance(100, not_sufficient),
+			BalanceToAssetBalance::<Balances, Test, ConvertInto>::to_asset_balance(
+				100,
+				not_sufficient
+			),
 			Err(ConversionError::AssetNotSufficient)
 		);
 		// 10 / 1 == 10 -> the conversion should 10x the value
diff --git a/frame/assets/src/types.rs b/frame/assets/src/types.rs
index 478905eb68a3..810b83506e2b 100644
--- a/frame/assets/src/types.rs
+++ b/frame/assets/src/types.rs
@@ -21,18 +21,13 @@ use super::*;
 use frame_support::pallet_prelude::*;
 
 use frame_support::traits::{fungible, tokens::BalanceConversion};
-use sp_runtime::{FixedPointNumber, FixedPointOperand, FixedU128};
-use sp_runtime::traits::Convert;
+use sp_runtime::{traits::Convert, FixedPointNumber, FixedPointOperand, FixedU128};
 
 pub(super) type DepositBalanceOf<T, I = ()> =
 	<<T as Config<I>>::Currency as Currency<<T as SystemConfig>::AccountId>>::Balance;
 
 #[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, MaxEncodedLen)]
-pub struct AssetDetails<
-	Balance,
-	AccountId,
-	DepositBalance,
-> {
+pub struct AssetDetails<Balance, AccountId, DepositBalance> {
 	/// Can change `owner`, `issuer`, `freezer` and `admin` accounts.
 	pub(super) owner: AccountId,
 	/// Can mint tokens.
@@ -144,7 +139,9 @@ pub trait FrozenBalance<AssetId, AccountId, Balance> {
 }
 
 impl<AssetId, AccountId, Balance> FrozenBalance<AssetId, AccountId, Balance> for () {
-	fn frozen_balance(_: AssetId, _: &AccountId) -> Option<Balance> { None }
+	fn frozen_balance(_: AssetId, _: &AccountId) -> Option<Balance> {
+		None
+	}
 	fn died(_: AssetId, _: &AccountId) {}
 }
 
@@ -175,10 +172,7 @@ pub(super) struct DebitFlags {
 
 impl From<TransferFlags> for DebitFlags {
 	fn from(f: TransferFlags) -> Self {
-		Self {
-			keep_alive: f.keep_alive,
-			best_effort: f.best_effort,
-		}
+		Self { keep_alive: f.keep_alive, best_effort: f.best_effort }
 	}
 }
 
@@ -205,7 +199,7 @@ type BalanceOf<F, T> = <F as fungible::Inspect<AccountIdOf<T>>>::Balance;
 /// minimum balance and the minimum asset balance.
 pub struct BalanceToAssetBalance<F, T, CON, I = ()>(PhantomData<(F, T, CON, I)>);
 impl<F, T, CON, I> BalanceConversion<BalanceOf<F, T>, AssetIdOf<T, I>, AssetBalanceOf<T, I>>
-for BalanceToAssetBalance<F, T, CON, I>
+	for BalanceToAssetBalance<F, T, CON, I>
 where
 	F: fungible::Inspect<AccountIdOf<T>>,
 	T: Config<I>,
diff --git a/frame/assets/src/weights.rs b/frame/assets/src/weights.rs
index ae5462288a30..6e8517064f16 100644
--- a/frame/assets/src/weights.rs
+++ b/frame/assets/src/weights.rs
@@ -36,6 +36,7 @@
 // --template=./.maintain/frame-weight-template.hbs
 
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
diff --git a/frame/atomic-swap/src/lib.rs b/frame/atomic-swap/src/lib.rs
index 829328a74e4c..164513136979 100644
--- a/frame/atomic-swap/src/lib.rs
+++ b/frame/atomic-swap/src/lib.rs
@@ -42,16 +42,20 @@
 
 mod tests;
 
-use sp_std::{prelude::*, marker::PhantomData, ops::{Deref, DerefMut}};
-use sp_io::hashing::blake2_256;
+use codec::{Decode, Encode};
 use frame_support::{
-	RuntimeDebugNoBound,
-	traits::{Get, Currency, ReservableCurrency, BalanceStatus},
-	weights::Weight,
 	dispatch::DispatchResult,
+	traits::{BalanceStatus, Currency, Get, ReservableCurrency},
+	weights::Weight,
+	RuntimeDebugNoBound,
 };
-use codec::{Encode, Decode};
+use sp_io::hashing::blake2_256;
 use sp_runtime::RuntimeDebug;
+use sp_std::{
+	marker::PhantomData,
+	ops::{Deref, DerefMut},
+	prelude::*,
+};
 
 /// Pending atomic swap operation.
 #[derive(Clone, Eq, PartialEq, RuntimeDebugNoBound, Encode, Decode)]
@@ -93,14 +97,20 @@ pub struct BalanceSwapAction<AccountId, C: ReservableCurrency<AccountId>> {
 	_marker: PhantomData<C>,
 }
 
-impl<AccountId, C> BalanceSwapAction<AccountId, C> where C: ReservableCurrency<AccountId> {
+impl<AccountId, C> BalanceSwapAction<AccountId, C>
+where
+	C: ReservableCurrency<AccountId>,
+{
 	/// Create a new swap action value of balance.
 	pub fn new(value: <C as Currency<AccountId>>::Balance) -> Self {
 		Self { value, _marker: PhantomData }
 	}
 }
 
-impl<AccountId, C> Deref for BalanceSwapAction<AccountId, C> where C: ReservableCurrency<AccountId> {
+impl<AccountId, C> Deref for BalanceSwapAction<AccountId, C>
+where
+	C: ReservableCurrency<AccountId>,
+{
 	type Target = <C as Currency<AccountId>>::Balance;
 
 	fn deref(&self) -> &Self::Target {
@@ -108,14 +118,18 @@ impl<AccountId, C> Deref for BalanceSwapAction<AccountId, C> where C: Reservable
 	}
 }
 
-impl<AccountId, C> DerefMut for BalanceSwapAction<AccountId, C> where C: ReservableCurrency<AccountId> {
+impl<AccountId, C> DerefMut for BalanceSwapAction<AccountId, C>
+where
+	C: ReservableCurrency<AccountId>,
+{
 	fn deref_mut(&mut self) -> &mut Self::Target {
 		&mut self.value
 	}
 }
 
 impl<T: Config, AccountId, C> SwapAction<AccountId, T> for BalanceSwapAction<AccountId, C>
-	where C: ReservableCurrency<AccountId>
+where
+	C: ReservableCurrency<AccountId>,
 {
 	fn reserve(&self, source: &AccountId) -> DispatchResult {
 		C::reserve(&source, self.value)
@@ -138,9 +152,9 @@ pub use pallet::*;
 
 #[frame_support::pallet]
 pub mod pallet {
+	use super::*;
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
-	use super::*;
 
 	/// Atomic swap's pallet configuration trait.
 	#[pallet::config]
@@ -168,9 +182,12 @@ pub mod pallet {
 	pub struct Pallet<T>(PhantomData<T>);
 
 	#[pallet::storage]
-	pub type PendingSwaps<T: Config> = StorageDoubleMap<_,
-		Twox64Concat, T::AccountId,
-		Blake2_128Concat, HashedProof,
+	pub type PendingSwaps<T: Config> = StorageDoubleMap<
+		_,
+		Twox64Concat,
+		T::AccountId,
+		Blake2_128Concat,
+		HashedProof,
 		PendingSwap<T>,
 	>;
 
@@ -209,7 +226,7 @@ pub mod pallet {
 	}
 
 	/// Old name generated by `decl_event`.
-	#[deprecated(note="use `Event` instead")]
+	#[deprecated(note = "use `Event` instead")]
 	pub type RawEvent<T> = Event<T>;
 
 	#[pallet::call]
@@ -249,9 +266,7 @@ pub mod pallet {
 			};
 			PendingSwaps::<T>::insert(target.clone(), hashed_proof.clone(), swap.clone());
 
-			Self::deposit_event(
-				Event::NewSwap(target, hashed_proof, swap)
-			);
+			Self::deposit_event(Event::NewSwap(target, hashed_proof, swap));
 
 			Ok(())
 		}
@@ -274,25 +289,20 @@ pub mod pallet {
 			proof: Vec<u8>,
 			action: T::SwapAction,
 		) -> DispatchResult {
-			ensure!(
-				proof.len() <= T::ProofLimit::get() as usize,
-				Error::<T>::ProofTooLarge,
-			);
+			ensure!(proof.len() <= T::ProofLimit::get() as usize, Error::<T>::ProofTooLarge,);
 
 			let target = ensure_signed(origin)?;
 			let hashed_proof = blake2_256(&proof);
 
-			let swap = PendingSwaps::<T>::get(&target, hashed_proof)
-				.ok_or(Error::<T>::InvalidProof)?;
+			let swap =
+				PendingSwaps::<T>::get(&target, hashed_proof).ok_or(Error::<T>::InvalidProof)?;
 			ensure!(swap.action == action, Error::<T>::ClaimActionMismatch);
 
 			let succeeded = swap.action.claim(&swap.source, &target);
 
 			PendingSwaps::<T>::remove(target.clone(), hashed_proof.clone());
 
-			Self::deposit_event(
-				Event::SwapClaimed(target, hashed_proof, succeeded)
-			);
+			Self::deposit_event(Event::SwapClaimed(target, hashed_proof, succeeded));
 
 			Ok(())
 		}
@@ -311,12 +321,8 @@ pub mod pallet {
 		) -> DispatchResult {
 			let source = ensure_signed(origin)?;
 
-			let swap = PendingSwaps::<T>::get(&target, hashed_proof)
-				.ok_or(Error::<T>::NotExist)?;
-			ensure!(
-				swap.source == source,
-				Error::<T>::SourceMismatch,
-			);
+			let swap = PendingSwaps::<T>::get(&target, hashed_proof).ok_or(Error::<T>::NotExist)?;
+			ensure!(swap.source == source, Error::<T>::SourceMismatch,);
 			ensure!(
 				frame_system::Pallet::<T>::block_number() >= swap.end_block,
 				Error::<T>::DurationNotPassed,
@@ -325,9 +331,7 @@ pub mod pallet {
 			swap.action.cancel(&swap.source);
 			PendingSwaps::<T>::remove(&target, hashed_proof.clone());
 
-			Self::deposit_event(
-				Event::SwapCancelled(target, hashed_proof)
-			);
+			Self::deposit_event(Event::SwapCancelled(target, hashed_proof));
 
 			Ok(())
 		}
diff --git a/frame/atomic-swap/src/tests.rs b/frame/atomic-swap/src/tests.rs
index 11e74be9b4e7..2165b403dd35 100644
--- a/frame/atomic-swap/src/tests.rs
+++ b/frame/atomic-swap/src/tests.rs
@@ -84,12 +84,7 @@ const B: u64 = 2;
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-	let genesis = pallet_balances::GenesisConfig::<Test> {
-		balances: vec![
-			(A, 100),
-			(B, 200),
-		],
-	};
+	let genesis = pallet_balances::GenesisConfig::<Test> { balances: vec![(A, 100), (B, 200)] };
 	genesis.assimilate_storage(&mut t).unwrap();
 	t.into()
 }
@@ -112,7 +107,8 @@ fn two_party_successful_swap() {
 			hashed_proof.clone(),
 			BalanceSwapAction::new(50),
 			1000,
-		).unwrap();
+		)
+		.unwrap();
 
 		assert_eq!(Balances::free_balance(A), 100 - 50);
 		assert_eq!(Balances::free_balance(B), 200);
@@ -126,7 +122,8 @@ fn two_party_successful_swap() {
 			hashed_proof.clone(),
 			BalanceSwapAction::new(75),
 			1000,
-		).unwrap();
+		)
+		.unwrap();
 
 		assert_eq!(Balances::free_balance(A), 100);
 		assert_eq!(Balances::free_balance(B), 200 - 75);
@@ -134,11 +131,8 @@ fn two_party_successful_swap() {
 
 	// A reveals the proof and claims the swap on chain2.
 	chain2.execute_with(|| {
-		AtomicSwap::claim_swap(
-			Origin::signed(A),
-			proof.to_vec(),
-			BalanceSwapAction::new(75),
-		).unwrap();
+		AtomicSwap::claim_swap(Origin::signed(A), proof.to_vec(), BalanceSwapAction::new(75))
+			.unwrap();
 
 		assert_eq!(Balances::free_balance(A), 100 + 75);
 		assert_eq!(Balances::free_balance(B), 200 - 75);
@@ -146,11 +140,8 @@ fn two_party_successful_swap() {
 
 	// B use the revealed proof to claim the swap on chain1.
 	chain1.execute_with(|| {
-		AtomicSwap::claim_swap(
-			Origin::signed(B),
-			proof.to_vec(),
-			BalanceSwapAction::new(50),
-		).unwrap();
+		AtomicSwap::claim_swap(Origin::signed(B), proof.to_vec(), BalanceSwapAction::new(50))
+			.unwrap();
 
 		assert_eq!(Balances::free_balance(A), 100 - 50);
 		assert_eq!(Balances::free_balance(B), 200 + 50);
diff --git a/frame/aura/src/lib.rs b/frame/aura/src/lib.rs
index 7cc9412776df..41fb69dfb545 100644
--- a/frame/aura/src/lib.rs
+++ b/frame/aura/src/lib.rs
@@ -37,20 +37,22 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use sp_std::prelude::*;
-use codec::{Encode, Decode};
+use codec::{Decode, Encode};
 use frame_support::{
-	Parameter, traits::{Get, FindAuthor, OneSessionHandler, OnTimestampSet}, ConsensusEngineId,
+	traits::{FindAuthor, Get, OnTimestampSet, OneSessionHandler},
+	ConsensusEngineId, Parameter,
 };
+use sp_consensus_aura::{AuthorityIndex, ConsensusLog, Slot, AURA_ENGINE_ID};
 use sp_runtime::{
+	generic::DigestItem,
+	traits::{IsMember, Member, SaturatedConversion, Saturating, Zero},
 	RuntimeAppPublic,
-	traits::{SaturatedConversion, Saturating, Zero, Member, IsMember}, generic::DigestItem,
 };
-use sp_consensus_aura::{AURA_ENGINE_ID, ConsensusLog, AuthorityIndex, Slot};
+use sp_std::prelude::*;
 
+pub mod migrations;
 mod mock;
 mod tests;
-pub mod migrations;
 
 pub use pallet::*;
 
@@ -63,7 +65,11 @@ pub mod pallet {
 	#[pallet::config]
 	pub trait Config: pallet_timestamp::Config + frame_system::Config {
 		/// The identifier type for an authority.
-		type AuthorityId: Member + Parameter + RuntimeAppPublic + Default + MaybeSerializeDeserialize;
+		type AuthorityId: Member
+			+ Parameter
+			+ RuntimeAppPublic
+			+ Default
+			+ MaybeSerializeDeserialize;
 	}
 
 	#[pallet::pallet]
@@ -123,10 +129,8 @@ impl<T: Config> Pallet<T> {
 	fn change_authorities(new: Vec<T::AuthorityId>) {
 		<Authorities<T>>::put(&new);
 
-		let log: DigestItem<T::Hash> = DigestItem::Consensus(
-			AURA_ENGINE_ID,
-			ConsensusLog::AuthoritiesChange(new).encode()
-		);
+		let log: DigestItem<T::Hash> =
+			DigestItem::Consensus(AURA_ENGINE_ID, ConsensusLog::AuthoritiesChange(new).encode());
 		<frame_system::Pallet<T>>::deposit_log(log.into());
 	}
 
@@ -143,7 +147,7 @@ impl<T: Config> Pallet<T> {
 		let pre_runtime_digests = digest.logs.iter().filter_map(|d| d.as_pre_runtime());
 		for (id, mut data) in pre_runtime_digests {
 			if id == AURA_ENGINE_ID {
-				return Slot::decode(&mut data).ok();
+				return Slot::decode(&mut data).ok()
 			}
 		}
 
@@ -166,14 +170,16 @@ impl<T: Config> OneSessionHandler<T::AccountId> for Pallet<T> {
 	type Key = T::AuthorityId;
 
 	fn on_genesis_session<'a, I: 'a>(validators: I)
-		where I: Iterator<Item=(&'a T::AccountId, T::AuthorityId)>
+	where
+		I: Iterator<Item = (&'a T::AccountId, T::AuthorityId)>,
 	{
 		let authorities = validators.map(|(_, k)| k).collect::<Vec<_>>();
 		Self::initialize_authorities(&authorities);
 	}
 
 	fn on_new_session<'a, I: 'a>(changed: bool, validators: I, _queued_validators: I)
-		where I: Iterator<Item=(&'a T::AccountId, T::AuthorityId)>
+	where
+		I: Iterator<Item = (&'a T::AccountId, T::AuthorityId)>,
 	{
 		// instant changes
 		if changed {
@@ -196,8 +202,9 @@ impl<T: Config> OneSessionHandler<T::AccountId> for Pallet<T> {
 }
 
 impl<T: Config> FindAuthor<u32> for Pallet<T> {
-	fn find_author<'a, I>(digests: I) -> Option<u32> where
-		I: 'a + IntoIterator<Item=(ConsensusEngineId, &'a [u8])>
+	fn find_author<'a, I>(digests: I) -> Option<u32>
+	where
+		I: 'a + IntoIterator<Item = (ConsensusEngineId, &'a [u8])>,
 	{
 		for (id, mut data) in digests.into_iter() {
 			if id == AURA_ENGINE_ID {
@@ -220,7 +227,8 @@ impl<T: Config, Inner: FindAuthor<u32>> FindAuthor<T::AuthorityId>
 	for FindAccountFromAuthorIndex<T, Inner>
 {
 	fn find_author<'a, I>(digests: I) -> Option<T::AuthorityId>
-		where I: 'a + IntoIterator<Item=(ConsensusEngineId, &'a [u8])>
+	where
+		I: 'a + IntoIterator<Item = (ConsensusEngineId, &'a [u8])>,
 	{
 		let i = Inner::find_author(digests)?;
 
@@ -234,9 +242,7 @@ pub type AuraAuthorId<T> = FindAccountFromAuthorIndex<T, Pallet<T>>;
 
 impl<T: Config> IsMember<T::AuthorityId> for Pallet<T> {
 	fn is_member(authority_id: &T::AuthorityId) -> bool {
-		Self::authorities()
-			.iter()
-			.any(|id| id == authority_id)
+		Self::authorities().iter().any(|id| id == authority_id)
 	}
 }
 
@@ -248,6 +254,9 @@ impl<T: Config> OnTimestampSet<T::Moment> for Pallet<T> {
 		let timestamp_slot = moment / slot_duration;
 		let timestamp_slot = Slot::from(timestamp_slot.saturated_into::<u64>());
 
-		assert!(CurrentSlot::<T>::get() == timestamp_slot, "Timestamp slot must match `CurrentSlot`");
+		assert!(
+			CurrentSlot::<T>::get() == timestamp_slot,
+			"Timestamp slot must match `CurrentSlot`"
+		);
 	}
 }
diff --git a/frame/aura/src/migrations.rs b/frame/aura/src/migrations.rs
index 038c5b3f3f18..e194c17406b6 100644
--- a/frame/aura/src/migrations.rs
+++ b/frame/aura/src/migrations.rs
@@ -17,11 +17,13 @@
 
 //! Migrations for the AURA pallet.
 
-use frame_support::{traits::Get, weights::Weight, pallet_prelude::*};
+use frame_support::{pallet_prelude::*, traits::Get, weights::Weight};
 
 struct __LastTimestamp<T>(sp_std::marker::PhantomData<T>);
 impl<T: RemoveLastTimestamp> frame_support::traits::StorageInstance for __LastTimestamp<T> {
-	fn pallet_prefix() -> &'static str { T::PalletPrefix::get() }
+	fn pallet_prefix() -> &'static str {
+		T::PalletPrefix::get()
+	}
 	const STORAGE_PREFIX: &'static str = "LastTimestamp";
 }
 
diff --git a/frame/aura/src/mock.rs b/frame/aura/src/mock.rs
index aff6b76a7a49..72d457165d3c 100644
--- a/frame/aura/src/mock.rs
+++ b/frame/aura/src/mock.rs
@@ -20,10 +20,13 @@
 #![cfg(test)]
 
 use crate as pallet_aura;
-use sp_consensus_aura::ed25519::AuthorityId;
-use sp_runtime::{traits::IdentityLookup, testing::{Header, UintAuthorityId}};
 use frame_support::{parameter_types, traits::GenesisBuild};
+use sp_consensus_aura::ed25519::AuthorityId;
 use sp_core::H256;
+use sp_runtime::{
+	testing::{Header, UintAuthorityId},
+	traits::IdentityLookup,
+};
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -86,8 +89,10 @@ impl pallet_aura::Config for Test {
 
 pub fn new_test_ext(authorities: Vec<u64>) -> sp_io::TestExternalities {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-	pallet_aura::GenesisConfig::<Test>{
+	pallet_aura::GenesisConfig::<Test> {
 		authorities: authorities.into_iter().map(|a| UintAuthorityId(a).to_public_key()).collect(),
-	}.assimilate_storage(&mut t).unwrap();
+	}
+	.assimilate_storage(&mut t)
+	.unwrap();
 	t.into()
 }
diff --git a/frame/aura/src/tests.rs b/frame/aura/src/tests.rs
index 18e14e802bd3..14e79ab54753 100644
--- a/frame/aura/src/tests.rs
+++ b/frame/aura/src/tests.rs
@@ -19,7 +19,7 @@
 
 #![cfg(test)]
 
-use crate::mock::{Aura, new_test_ext};
+use crate::mock::{new_test_ext, Aura};
 
 #[test]
 fn initial_values() {
diff --git a/frame/authority-discovery/src/lib.rs b/frame/authority-discovery/src/lib.rs
index 1f480926209e..e30bcb629662 100644
--- a/frame/authority-discovery/src/lib.rs
+++ b/frame/authority-discovery/src/lib.rs
@@ -23,16 +23,16 @@
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use sp_std::prelude::*;
 use frame_support::traits::OneSessionHandler;
 use sp_authority_discovery::AuthorityId;
+use sp_std::prelude::*;
 
 pub use pallet::*;
 
 #[frame_support::pallet]
 pub mod pallet {
-	use frame_support::pallet_prelude::*;
 	use super::*;
+	use frame_support::pallet_prelude::*;
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
@@ -45,20 +45,12 @@ pub mod pallet {
 	#[pallet::storage]
 	#[pallet::getter(fn keys)]
 	/// Keys of the current authority set.
-	pub(super) type Keys<T: Config> = StorageValue<
-		_,
-		Vec<AuthorityId>,
-		ValueQuery,
-	>;
+	pub(super) type Keys<T: Config> = StorageValue<_, Vec<AuthorityId>, ValueQuery>;
 
 	#[pallet::storage]
 	#[pallet::getter(fn next_keys)]
 	/// Keys of the next authority set.
-	pub(super) type NextKeys<T: Config> = StorageValue<
-		_,
-		Vec<AuthorityId>,
-		ValueQuery,
-	>;
+	pub(super) type NextKeys<T: Config> = StorageValue<_, Vec<AuthorityId>, ValueQuery>;
 
 	#[pallet::genesis_config]
 	pub struct GenesisConfig {
@@ -68,9 +60,7 @@ pub mod pallet {
 	#[cfg(feature = "std")]
 	impl Default for GenesisConfig {
 		fn default() -> Self {
-			Self {
-				keys: Default::default(),
-			}
+			Self { keys: Default::default() }
 		}
 	}
 	#[pallet::genesis_build]
@@ -148,18 +138,18 @@ impl<T: Config> OneSessionHandler<T::AccountId> for Pallet<T> {
 
 #[cfg(test)]
 mod tests {
-	use crate as pallet_authority_discovery;
 	use super::*;
-	use sp_authority_discovery::AuthorityPair;
+	use crate as pallet_authority_discovery;
+	use frame_support::{parameter_types, traits::GenesisBuild};
 	use sp_application_crypto::Pair;
+	use sp_authority_discovery::AuthorityPair;
 	use sp_core::{crypto::key_types, H256};
 	use sp_io::TestExternalities;
 	use sp_runtime::{
-		testing::{Header, UintAuthorityId}, traits::{ConvertInto, IdentityLookup, OpaqueKeys},
-		Perbill, KeyTypeId,
+		testing::{Header, UintAuthorityId},
+		traits::{ConvertInto, IdentityLookup, OpaqueKeys},
+		KeyTypeId, Perbill,
 	};
-	use frame_support::parameter_types;
-	use frame_support::traits::GenesisBuild;
 
 	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 	type Block = frame_system::mocking::MockBlock<Test>;
@@ -260,41 +250,44 @@ mod tests {
 		// everywhere.
 		let account_id = AuthorityPair::from_seed_slice(vec![10; 32].as_ref()).unwrap().public();
 
-		let mut first_authorities: Vec<AuthorityId> = vec![0, 1].into_iter()
+		let mut first_authorities: Vec<AuthorityId> = vec![0, 1]
+			.into_iter()
 			.map(|i| AuthorityPair::from_seed_slice(vec![i; 32].as_ref()).unwrap().public())
 			.map(AuthorityId::from)
 			.collect();
 
-		let second_authorities: Vec<AuthorityId> = vec![2, 3].into_iter()
+		let second_authorities: Vec<AuthorityId> = vec![2, 3]
+			.into_iter()
 			.map(|i| AuthorityPair::from_seed_slice(vec![i; 32].as_ref()).unwrap().public())
 			.map(AuthorityId::from)
 			.collect();
 		// Needed for `pallet_session::OneSessionHandler::on_new_session`.
-		let second_authorities_and_account_ids = second_authorities.clone()
+		let second_authorities_and_account_ids = second_authorities
+			.clone()
 			.into_iter()
 			.map(|id| (&account_id, id))
-			.collect::<Vec<(&AuthorityId, AuthorityId)> >();
+			.collect::<Vec<(&AuthorityId, AuthorityId)>>();
 
-		let mut third_authorities: Vec<AuthorityId> = vec![4, 5].into_iter()
+		let mut third_authorities: Vec<AuthorityId> = vec![4, 5]
+			.into_iter()
 			.map(|i| AuthorityPair::from_seed_slice(vec![i; 32].as_ref()).unwrap().public())
 			.map(AuthorityId::from)
 			.collect();
 		// Needed for `pallet_session::OneSessionHandler::on_new_session`.
-		let third_authorities_and_account_ids = third_authorities.clone()
+		let third_authorities_and_account_ids = third_authorities
+			.clone()
 			.into_iter()
 			.map(|id| (&account_id, id))
-			.collect::<Vec<(&AuthorityId, AuthorityId)> >();
+			.collect::<Vec<(&AuthorityId, AuthorityId)>>();
 
 		// Build genesis.
-		let mut t = frame_system::GenesisConfig::default()
-			.build_storage::<Test>()
-			.unwrap();
-
+		let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
 
 		GenesisBuild::<Test>::assimilate_storage(
-			&pallet_authority_discovery::GenesisConfig{keys: vec![]},
-			&mut t
-		).unwrap();
+			&pallet_authority_discovery::GenesisConfig { keys: vec![] },
+			&mut t,
+		)
+		.unwrap();
 
 		// Create externalities.
 		let mut externalities = TestExternalities::new(t);
@@ -303,7 +296,7 @@ mod tests {
 			use frame_support::traits::OneSessionHandler;
 
 			AuthorityDiscovery::on_genesis_session(
-				first_authorities.iter().map(|id| (id, id.clone()))
+				first_authorities.iter().map(|id| (id, id.clone())),
 			);
 			first_authorities.sort();
 			let mut authorities_returned = AuthorityDiscovery::authorities();
@@ -318,8 +311,7 @@ mod tests {
 			);
 			let authorities_returned = AuthorityDiscovery::authorities();
 			assert_eq!(
-				first_authorities,
-				authorities_returned,
+				first_authorities, authorities_returned,
 				"Expected authority set not to change as `changed` was set to false.",
 			);
 
@@ -329,7 +321,8 @@ mod tests {
 				second_authorities_and_account_ids.into_iter(),
 				third_authorities_and_account_ids.clone().into_iter(),
 			);
-			let mut second_and_third_authorities = second_authorities.iter()
+			let mut second_and_third_authorities = second_authorities
+				.iter()
 				.chain(third_authorities.iter())
 				.cloned()
 				.collect::<Vec<AuthorityId>>();
diff --git a/frame/authorship/src/lib.rs b/frame/authorship/src/lib.rs
index ca03320306d3..73efbbe30b01 100644
--- a/frame/authorship/src/lib.rs
+++ b/frame/authorship/src/lib.rs
@@ -21,13 +21,14 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use sp_std::{result, prelude::*, collections::btree_set::BTreeSet};
+use codec::{Decode, Encode};
 use frame_support::{
-	dispatch, traits::{FindAuthor, VerifySeal, Get},
+	dispatch,
+	traits::{FindAuthor, Get, VerifySeal},
 };
-use codec::{Encode, Decode};
+use sp_authorship::{InherentError, UnclesInherentData, INHERENT_IDENTIFIER};
 use sp_runtime::traits::{Header as HeaderT, One, Saturating};
-use sp_authorship::{INHERENT_IDENTIFIER, UnclesInherentData, InherentError};
+use sp_std::{collections::btree_set::BTreeSet, prelude::*, result};
 
 const MAX_UNCLES: usize = 10;
 
@@ -56,15 +57,15 @@ pub trait FilterUncle<Header, Author> {
 
 	/// Do additional filtering on a seal-checked uncle block, with the accumulated
 	/// filter.
-	fn filter_uncle(header: &Header, acc: &mut Self::Accumulator)
-		-> Result<Option<Author>, &'static str>;
+	fn filter_uncle(
+		header: &Header,
+		acc: &mut Self::Accumulator,
+	) -> Result<Option<Author>, &'static str>;
 }
 
 impl<H, A> FilterUncle<H, A> for () {
 	type Accumulator = ();
-	fn filter_uncle(_: &H, _acc: &mut Self::Accumulator)
-		-> Result<Option<A>, &'static str>
-	{
+	fn filter_uncle(_: &H, _acc: &mut Self::Accumulator) -> Result<Option<A>, &'static str> {
 		Ok(None)
 	}
 }
@@ -74,14 +75,10 @@ impl<H, A> FilterUncle<H, A> for () {
 /// equivocating is high.
 pub struct SealVerify<T>(sp_std::marker::PhantomData<T>);
 
-impl<Header, Author, T: VerifySeal<Header, Author>> FilterUncle<Header, Author>
-	for SealVerify<T>
-{
+impl<Header, Author, T: VerifySeal<Header, Author>> FilterUncle<Header, Author> for SealVerify<T> {
 	type Accumulator = ();
 
-	fn filter_uncle(header: &Header, _acc: &mut ())
-		-> Result<Option<Author>, &'static str>
-	{
+	fn filter_uncle(header: &Header, _acc: &mut ()) -> Result<Option<Author>, &'static str> {
 		T::verify_seal(header)
 	}
 }
@@ -92,8 +89,7 @@ impl<Header, Author, T: VerifySeal<Header, Author>> FilterUncle<Header, Author>
 /// This does O(n log n) work in the number of uncles included.
 pub struct OnePerAuthorPerHeight<T, N>(sp_std::marker::PhantomData<(T, N)>);
 
-impl<Header, Author, T> FilterUncle<Header, Author>
-	for OnePerAuthorPerHeight<T, Header::Number>
+impl<Header, Author, T> FilterUncle<Header, Author> for OnePerAuthorPerHeight<T, Header::Number>
 where
 	Header: HeaderT + PartialEq,
 	Header::Number: Ord,
@@ -102,15 +98,16 @@ where
 {
 	type Accumulator = BTreeSet<(Header::Number, Author)>;
 
-	fn filter_uncle(header: &Header, acc: &mut Self::Accumulator)
-		-> Result<Option<Author>, &'static str>
-	{
+	fn filter_uncle(
+		header: &Header,
+		acc: &mut Self::Accumulator,
+	) -> Result<Option<Author>, &'static str> {
 		let author = T::verify_seal(header)?;
 		let number = header.number();
 
 		if let Some(ref author) = author {
 			if !acc.insert((number.clone(), author.clone())) {
-				return Err("more than one uncle per number per author included");
+				return Err("more than one uncle per number per author included")
 			}
 		}
 
@@ -126,9 +123,9 @@ enum UncleEntryItem<BlockNumber, Hash, Author> {
 }
 #[frame_support::pallet]
 pub mod pallet {
+	use super::*;
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
-	use super::*;
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
@@ -161,10 +158,8 @@ pub mod pallet {
 	#[pallet::generate_store(pub(super) trait Store)]
 	pub struct Pallet<T>(_);
 
-
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
-
 		fn on_initialize(now: T::BlockNumber) -> Weight {
 			let uncle_generations = T::UncleGenerations::get();
 			// prune uncles that are older than the allowed number of generations.
@@ -189,11 +184,8 @@ pub mod pallet {
 
 	#[pallet::storage]
 	/// Uncles
-	pub(super) type Uncles<T: Config> = StorageValue<
-		_,
-		Vec<UncleEntryItem<T::BlockNumber, T::Hash, T::AccountId>>,
-		ValueQuery,
-	>;
+	pub(super) type Uncles<T: Config> =
+		StorageValue<_, Vec<UncleEntryItem<T::BlockNumber, T::Hash, T::AccountId>>, ValueQuery>;
 
 	#[pallet::storage]
 	/// Author of current block.
@@ -203,7 +195,6 @@ pub mod pallet {
 	/// Whether uncles were already set in this block.
 	pub(super) type DidSetUncles<T: Config> = StorageValue<_, bool, ValueQuery>;
 
-
 	#[pallet::error]
 	pub enum Error<T> {
 		/// The uncle parent not in the chain.
@@ -251,14 +242,16 @@ pub mod pallet {
 
 			if !uncles.is_empty() {
 				let prev_uncles = <Uncles<T>>::get();
-				let mut existing_hashes: Vec<_> = prev_uncles.into_iter().filter_map(|entry|
-					match entry {
+				let mut existing_hashes: Vec<_> = prev_uncles
+					.into_iter()
+					.filter_map(|entry| match entry {
 						UncleEntryItem::InclusionHeight(_) => None,
 						UncleEntryItem::Uncle(h, _) => Some(h),
-					}
-				).collect();
+					})
+					.collect();
 
-				let mut acc: <T::FilterUncle as FilterUncle<_, _>>::Accumulator = Default::default();
+				let mut acc: <T::FilterUncle as FilterUncle<_, _>>::Accumulator =
+					Default::default();
 
 				for uncle in uncles {
 					match Self::verify_uncle(&uncle, &existing_hashes, &mut acc) {
@@ -270,10 +263,10 @@ pub mod pallet {
 							if set_uncles.len() == MAX_UNCLES {
 								break
 							}
-						}
+						},
 						Err(_) => {
 							// skip this uncle
-						}
+						},
 					}
 				}
 			}
@@ -285,14 +278,14 @@ pub mod pallet {
 			}
 		}
 
-		fn check_inherent(call: &Self::Call, _data: &InherentData) -> result::Result<(), Self::Error> {
+		fn check_inherent(
+			call: &Self::Call,
+			_data: &InherentData,
+		) -> result::Result<(), Self::Error> {
 			match call {
-				Call::set_uncles(ref uncles) if uncles.len() > MAX_UNCLES => {
-					Err(InherentError::Uncles(Error::<T>::TooManyUncles.as_str().into()))
-				},
-				_ => {
-					Ok(())
-				},
+				Call::set_uncles(ref uncles) if uncles.len() > MAX_UNCLES =>
+					Err(InherentError::Uncles(Error::<T>::TooManyUncles.as_str().into())),
+				_ => Ok(()),
 			}
 		}
 
@@ -310,7 +303,7 @@ impl<T: Config> Pallet<T> {
 	pub fn author() -> T::AccountId {
 		// Check the memoized storage value.
 		if let Some(author) = <Author<T>>::get() {
-			return author;
+			return author
 		}
 
 		let digest = <frame_system::Pallet<T>>::digest();
@@ -332,11 +325,10 @@ impl<T: Config> Pallet<T> {
 		let mut acc: <T::FilterUncle as FilterUncle<_, _>>::Accumulator = Default::default();
 
 		for uncle in new_uncles {
-			let prev_uncles = uncles.iter().filter_map(|entry|
-				match entry {
-					UncleEntryItem::InclusionHeight(_) => None,
-					UncleEntryItem::Uncle(h, _) => Some(h),
-				});
+			let prev_uncles = uncles.iter().filter_map(|entry| match entry {
+				UncleEntryItem::InclusionHeight(_) => None,
+				UncleEntryItem::Uncle(h, _) => Some(h),
+			});
 			let author = Self::verify_uncle(&uncle, prev_uncles, &mut acc)?;
 			let hash = uncle.hash();
 
@@ -351,7 +343,7 @@ impl<T: Config> Pallet<T> {
 		Ok(())
 	}
 
-	fn verify_uncle<'a, I: IntoIterator<Item=&'a T::Hash>>(
+	fn verify_uncle<'a, I: IntoIterator<Item = &'a T::Hash>>(
 		uncle: &T::Header,
 		existing_uncles: I,
 		accumulator: &mut <T::FilterUncle as FilterUncle<T::Header, T::AccountId>>::Accumulator,
@@ -368,23 +360,23 @@ impl<T: Config> Pallet<T> {
 		let hash = uncle.hash();
 
 		if uncle.number() < &One::one() {
-			return Err(Error::<T>::GenesisUncle.into());
+			return Err(Error::<T>::GenesisUncle.into())
 		}
 
 		if uncle.number() > &maximum_height {
-			return Err(Error::<T>::TooHighUncle.into());
+			return Err(Error::<T>::TooHighUncle.into())
 		}
 
 		{
 			let parent_number = uncle.number().clone() - One::one();
 			let parent_hash = <frame_system::Pallet<T>>::block_hash(&parent_number);
 			if &parent_hash != uncle.parent_hash() {
-				return Err(Error::<T>::InvalidUncleParent.into());
+				return Err(Error::<T>::InvalidUncleParent.into())
 			}
 		}
 
 		if uncle.number() < &minimum_height {
-			return Err(Error::<T>::OldUncle.into());
+			return Err(Error::<T>::OldUncle.into())
 		}
 
 		let duplicate = existing_uncles.into_iter().any(|h| *h == hash);
@@ -412,13 +404,15 @@ impl<T: Config> Pallet<T> {
 
 #[cfg(test)]
 mod tests {
-	use crate as pallet_authorship;
 	use super::*;
+	use crate as pallet_authorship;
+	use frame_support::{parameter_types, ConsensusEngineId};
 	use sp_core::H256;
 	use sp_runtime::{
-		traits::{BlakeTwo256, IdentityLookup}, testing::Header, generic::DigestItem,
+		generic::DigestItem,
+		testing::Header,
+		traits::{BlakeTwo256, IdentityLookup},
 	};
-	use frame_support::{parameter_types, ConsensusEngineId};
 
 	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 	type Block = frame_system::mocking::MockBlock<Test>;
@@ -483,11 +477,12 @@ mod tests {
 
 	impl FindAuthor<u64> for AuthorGiven {
 		fn find_author<'a, I>(digests: I) -> Option<u64>
-			where I: 'a + IntoIterator<Item=(ConsensusEngineId, &'a [u8])>
+		where
+			I: 'a + IntoIterator<Item = (ConsensusEngineId, &'a [u8])>,
 		{
 			for (id, data) in digests {
 				if id == TEST_ID {
-					return u64::decode(&mut &data[..]).ok();
+					return u64::decode(&mut &data[..]).ok()
 				}
 			}
 
@@ -502,7 +497,8 @@ mod tests {
 			let pre_runtime_digests = header.digest.logs.iter().filter_map(|d| d.as_pre_runtime());
 			let seals = header.digest.logs.iter().filter_map(|d| d.as_seal());
 
-			let author = AuthorGiven::find_author(pre_runtime_digests).ok_or_else(|| "no author")?;
+			let author =
+				AuthorGiven::find_author(pre_runtime_digests).ok_or_else(|| "no author")?;
 
 			for (id, seal) in seals {
 				if id == TEST_ID {
@@ -510,10 +506,10 @@ mod tests {
 						Err(_) => return Err("wrong seal"),
 						Ok(a) => {
 							if a != author {
-								return Err("wrong author in seal");
+								return Err("wrong author in seal")
 							}
 							break
-						}
+						},
 					}
 				}
 			}
@@ -533,13 +529,7 @@ mod tests {
 	}
 
 	fn create_header(number: u64, parent_hash: H256, state_root: H256) -> Header {
-		Header::new(
-			number,
-			Default::default(),
-			state_root,
-			parent_hash,
-			Default::default(),
-		)
+		Header::new(number, Default::default(), state_root, parent_hash, Default::default())
 	}
 
 	fn new_test_ext() -> sp_io::TestExternalities {
@@ -554,9 +544,14 @@ mod tests {
 			let hash = Default::default();
 			let author = Default::default();
 			let uncles = vec![
-				InclusionHeight(1u64), Uncle(hash, Some(author)), Uncle(hash, None), Uncle(hash, None),
-				InclusionHeight(2u64), Uncle(hash, None),
-				InclusionHeight(3u64), Uncle(hash, None),
+				InclusionHeight(1u64),
+				Uncle(hash, Some(author)),
+				Uncle(hash, None),
+				Uncle(hash, None),
+				InclusionHeight(2u64),
+				Uncle(hash, None),
+				InclusionHeight(3u64),
+				Uncle(hash, None),
 			];
 
 			<Authorship as Store>::Uncles::put(uncles);
@@ -595,15 +590,15 @@ mod tests {
 			}
 
 			let mut canon_chain = CanonChain {
-				inner: vec![seal_header(create_header(0, Default::default(), Default::default()), 999)],
+				inner: vec![seal_header(
+					create_header(0, Default::default(), Default::default()),
+					999,
+				)],
 			};
 
-			let initialize_block = |number, hash: H256| System::initialize(
-				&number,
-				&hash,
-				&Default::default(),
-				Default::default()
-			);
+			let initialize_block = |number, hash: H256| {
+				System::initialize(&number, &hash, &Default::default(), Default::default())
+			};
 
 			for number in 1..8 {
 				initialize_block(number, canon_chain.best_hash());
@@ -691,18 +686,11 @@ mod tests {
 	fn sets_author_lazily() {
 		new_test_ext().execute_with(|| {
 			let author = 42;
-			let mut header = seal_header(
-				create_header(1, Default::default(), [1; 32].into()),
-				author,
-			);
+			let mut header =
+				seal_header(create_header(1, Default::default(), [1; 32].into()), author);
 
 			header.digest_mut().pop(); // pop the seal off.
-			System::initialize(
-				&1,
-				&Default::default(),
-				header.digest(),
-				Default::default(),
-			);
+			System::initialize(&1, &Default::default(), header.digest(), Default::default());
 
 			assert_eq!(Authorship::author(), author);
 		});
@@ -716,27 +704,15 @@ mod tests {
 		let author_b = 43;
 
 		let mut acc: <Filter as FilterUncle<Header, u64>>::Accumulator = Default::default();
-		let header_a1 = seal_header(
-			create_header(1, Default::default(), [1; 32].into()),
-			author_a,
-		);
-		let header_b1 = seal_header(
-			create_header(1, Default::default(), [1; 32].into()),
-			author_b,
-		);
-
-		let header_a2_1 = seal_header(
-			create_header(2, Default::default(), [1; 32].into()),
-			author_a,
-		);
-		let header_a2_2 = seal_header(
-			create_header(2, Default::default(), [2; 32].into()),
-			author_a,
-		);
-
-		let mut check_filter = move |uncle| {
-			Filter::filter_uncle(uncle, &mut acc)
-		};
+		let header_a1 = seal_header(create_header(1, Default::default(), [1; 32].into()), author_a);
+		let header_b1 = seal_header(create_header(1, Default::default(), [1; 32].into()), author_b);
+
+		let header_a2_1 =
+			seal_header(create_header(2, Default::default(), [1; 32].into()), author_a);
+		let header_a2_2 =
+			seal_header(create_header(2, Default::default(), [2; 32].into()), author_a);
+
+		let mut check_filter = move |uncle| Filter::filter_uncle(uncle, &mut acc);
 
 		// same height, different author is OK.
 		assert_eq!(check_filter(&header_a1), Ok(Some(author_a)));
diff --git a/frame/babe/src/benchmarking.rs b/frame/babe/src/benchmarking.rs
index 145a82c4f804..b8a85daf6e66 100644
--- a/frame/babe/src/benchmarking.rs
+++ b/frame/babe/src/benchmarking.rs
@@ -95,10 +95,7 @@ mod tests {
 			);
 
 			println!("equivocation_proof: {:?}", equivocation_proof);
-			println!(
-				"equivocation_proof.encode(): {:?}",
-				equivocation_proof.encode()
-			);
+			println!("equivocation_proof.encode(): {:?}", equivocation_proof.encode());
 		});
 	}
 }
diff --git a/frame/babe/src/default_weights.rs b/frame/babe/src/default_weights.rs
index f16f589a77cd..20ac9b961fc8 100644
--- a/frame/babe/src/default_weights.rs
+++ b/frame/babe/src/default_weights.rs
@@ -19,7 +19,8 @@
 //! This file was not auto-generated.
 
 use frame_support::weights::{
-	Weight, constants::{WEIGHT_PER_MICROS, WEIGHT_PER_NANOS, RocksDbWeight as DbWeight},
+	constants::{RocksDbWeight as DbWeight, WEIGHT_PER_MICROS, WEIGHT_PER_NANOS},
+	Weight,
 };
 
 impl crate::WeightInfo for () {
diff --git a/frame/babe/src/equivocation.rs b/frame/babe/src/equivocation.rs
index e9017205c6b5..95abd87787b4 100644
--- a/frame/babe/src/equivocation.rs
+++ b/frame/babe/src/equivocation.rs
@@ -15,7 +15,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//!
 //! An opt-in utility module for reporting equivocations.
 //!
 //! This module defines an offence type for BABE equivocations
@@ -33,22 +32,23 @@
 //! When using this module for enabling equivocation reporting it is required
 //! that the `ValidateUnsigned` for the BABE pallet is used in the runtime
 //! definition.
-//!
 
 use frame_support::traits::{Get, KeyOwnerProofSystem};
 use sp_consensus_babe::{EquivocationProof, Slot};
-use sp_runtime::transaction_validity::{
-	InvalidTransaction, TransactionPriority, TransactionSource, TransactionValidity,
-	TransactionValidityError, ValidTransaction,
+use sp_runtime::{
+	transaction_validity::{
+		InvalidTransaction, TransactionPriority, TransactionSource, TransactionValidity,
+		TransactionValidityError, ValidTransaction,
+	},
+	DispatchResult, Perbill,
 };
-use sp_runtime::{DispatchResult, Perbill};
 use sp_staking::{
 	offence::{Kind, Offence, OffenceError, ReportOffence},
 	SessionIndex,
 };
 use sp_std::prelude::*;
 
-use crate::{Call, Pallet, Config};
+use crate::{Call, Config, Pallet};
 
 /// A trait with utility methods for handling equivocation reports in BABE.
 /// The trait provides methods for reporting an offence triggered by a valid
@@ -115,9 +115,7 @@ pub struct EquivocationHandler<I, R, L> {
 
 impl<I, R, L> Default for EquivocationHandler<I, R, L> {
 	fn default() -> Self {
-		Self {
-			_phantom: Default::default(),
-		}
+		Self { _phantom: Default::default() }
 	}
 }
 
@@ -188,30 +186,28 @@ impl<T: Config> Pallet<T> {
 		if let Call::report_equivocation_unsigned(equivocation_proof, key_owner_proof) = call {
 			// discard equivocation report not coming from the local node
 			match source {
-				TransactionSource::Local | TransactionSource::InBlock => { /* allowed */ }
+				TransactionSource::Local | TransactionSource::InBlock => { /* allowed */ },
 				_ => {
 					log::warn!(
 						target: "runtime::babe",
 						"rejecting unsigned report equivocation transaction because it is not local/in-block.",
 					);
 
-					return InvalidTransaction::Call.into();
-				}
+					return InvalidTransaction::Call.into()
+				},
 			}
 
 			// check report staleness
 			is_known_offence::<T>(equivocation_proof, key_owner_proof)?;
 
-			let longevity = <T::HandleEquivocation as HandleEquivocation<T>>::ReportLongevity::get();
+			let longevity =
+				<T::HandleEquivocation as HandleEquivocation<T>>::ReportLongevity::get();
 
 			ValidTransaction::with_tag_prefix("BabeEquivocation")
 				// We assign the maximum priority for any equivocation report.
 				.priority(TransactionPriority::max_value())
 				// Only one equivocation report for the same offender at the same slot.
-				.and_provides((
-					equivocation_proof.offender.clone(),
-					*equivocation_proof.slot,
-				))
+				.and_provides((equivocation_proof.offender.clone(), *equivocation_proof.slot))
 				.longevity(longevity)
 				// We don't propagate this. This can never be included on a remote node.
 				.propagate(false)
@@ -235,10 +231,7 @@ fn is_known_offence<T: Config>(
 	key_owner_proof: &T::KeyOwnerProof,
 ) -> Result<(), TransactionValidityError> {
 	// check the membership proof to extract the offender's id
-	let key = (
-		sp_consensus_babe::KEY_TYPE,
-		equivocation_proof.offender.clone(),
-	);
+	let key = (sp_consensus_babe::KEY_TYPE, equivocation_proof.offender.clone());
 
 	let offender = T::KeyOwnerProofSystem::check_proof(key, key_owner_proof.clone())
 		.ok_or(InvalidTransaction::BadProof)?;
diff --git a/frame/babe/src/lib.rs b/frame/babe/src/lib.rs
index b52868d1d023..949f55720bbd 100644
--- a/frame/babe/src/lib.rs
+++ b/frame/babe/src/lib.rs
@@ -24,7 +24,7 @@
 use codec::{Decode, Encode};
 use frame_support::{
 	dispatch::DispatchResultWithPostInfo,
-	traits::{FindAuthor, Get, KeyOwnerProofSystem, OneSessionHandler, OnTimestampSet},
+	traits::{FindAuthor, Get, KeyOwnerProofSystem, OnTimestampSet, OneSessionHandler},
 	weights::{Pays, Weight},
 };
 use sp_application_crypto::Public;
@@ -38,8 +38,8 @@ use sp_std::prelude::*;
 
 use sp_consensus_babe::{
 	digests::{NextConfigDescriptor, NextEpochDescriptor, PreDigest},
-	BabeAuthorityWeight, BabeEpochConfiguration, ConsensusLog, Epoch,
-	EquivocationProof, Slot, BABE_ENGINE_ID,
+	BabeAuthorityWeight, BabeEpochConfiguration, ConsensusLog, Epoch, EquivocationProof, Slot,
+	BABE_ENGINE_ID,
 };
 use sp_consensus_vrf::schnorrkel;
 
@@ -80,7 +80,7 @@ pub trait EpochChangeTrigger {
 pub struct ExternalTrigger;
 
 impl EpochChangeTrigger for ExternalTrigger {
-	fn trigger<T: Config>(_: T::BlockNumber) { } // nothing - trigger is external.
+	fn trigger<T: Config>(_: T::BlockNumber) {} // nothing - trigger is external.
 }
 
 /// A type signifying to BABE that it should perform epoch changes
@@ -104,9 +104,9 @@ type MaybeRandomness = Option<schnorrkel::Randomness>;
 
 #[frame_support::pallet]
 pub mod pallet {
+	use super::*;
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
-	use super::*;
 
 	/// The BABE Pallet
 	#[pallet::pallet]
@@ -222,11 +222,8 @@ pub mod pallet {
 
 	/// Next epoch authorities.
 	#[pallet::storage]
-	pub(super) type NextAuthorities<T> = StorageValue<
-		_,
-		Vec<(AuthorityId, BabeAuthorityWeight)>,
-		ValueQuery,
-	>;
+	pub(super) type NextAuthorities<T> =
+		StorageValue<_, Vec<(AuthorityId, BabeAuthorityWeight)>, ValueQuery>;
 
 	/// Randomness under construction.
 	///
@@ -242,13 +239,8 @@ pub mod pallet {
 
 	/// TWOX-NOTE: `SegmentIndex` is an increasing integer, so this is okay.
 	#[pallet::storage]
-	pub(super) type UnderConstruction<T> = StorageMap<
-		_,
-		Twox64Concat,
-		u32,
-		Vec<schnorrkel::Randomness>,
-		ValueQuery,
-	>;
+	pub(super) type UnderConstruction<T> =
+		StorageMap<_, Twox64Concat, u32, Vec<schnorrkel::Randomness>, ValueQuery>;
 
 	/// Temporary value (cleared at block finalization) which is `Some`
 	/// if per-block initialization has already been called for current block.
@@ -270,11 +262,8 @@ pub mod pallet {
 	/// entropy was fixed (i.e. it was known to chain observers). Since epochs are defined in
 	/// slots, which may be skipped, the block numbers may not line up with the slot numbers.
 	#[pallet::storage]
-	pub(super) type EpochStart<T: Config> = StorageValue<
-		_,
-		(T::BlockNumber, T::BlockNumber),
-		ValueQuery,
-	>;
+	pub(super) type EpochStart<T: Config> =
+		StorageValue<_, (T::BlockNumber, T::BlockNumber), ValueQuery>;
 
 	/// How late the current block is compared to its parent.
 	///
@@ -303,10 +292,7 @@ pub mod pallet {
 	#[cfg(feature = "std")]
 	impl Default for GenesisConfig {
 		fn default() -> Self {
-			GenesisConfig {
-				authorities: Default::default(),
-				epoch_config: Default::default(),
-			}
+			GenesisConfig { authorities: Default::default(), epoch_config: Default::default() }
 		}
 	}
 
@@ -315,7 +301,9 @@ pub mod pallet {
 		fn build(&self) {
 			SegmentIndex::<T>::put(0);
 			Pallet::<T>::initialize_authorities(&self.authorities);
-			EpochConfig::<T>::put(self.epoch_config.clone().expect("epoch_config must not be None"));
+			EpochConfig::<T>::put(
+				self.epoch_config.clone().expect("epoch_config must not be None"),
+			);
 		}
 	}
 
@@ -359,11 +347,7 @@ pub mod pallet {
 		) -> DispatchResultWithPostInfo {
 			let reporter = ensure_signed(origin)?;
 
-			Self::do_report_equivocation(
-				Some(reporter),
-				equivocation_proof,
-				key_owner_proof,
-			)
+			Self::do_report_equivocation(Some(reporter), equivocation_proof, key_owner_proof)
 		}
 
 		/// Report authority equivocation/misbehavior. This method will verify
@@ -423,8 +407,9 @@ pub mod pallet {
 pub type BabeKey = [u8; PUBLIC_KEY_LENGTH];
 
 impl<T: Config> FindAuthor<u32> for Pallet<T> {
-	fn find_author<'a, I>(digests: I) -> Option<u32> where
-		I: 'a + IntoIterator<Item=(ConsensusEngineId, &'a [u8])>
+	fn find_author<'a, I>(digests: I) -> Option<u32>
+	where
+		I: 'a + IntoIterator<Item = (ConsensusEngineId, &'a [u8])>,
 	{
 		for (id, mut data) in digests.into_iter() {
 			if id == BABE_ENGINE_ID {
@@ -433,15 +418,13 @@ impl<T: Config> FindAuthor<u32> for Pallet<T> {
 			}
 		}
 
-		return None;
+		return None
 	}
 }
 
 impl<T: Config> IsMember<AuthorityId> for Pallet<T> {
 	fn is_member(authority_id: &AuthorityId) -> bool {
-		<Pallet<T>>::authorities()
-			.iter()
-			.any(|id| &id.0 == authority_id)
+		<Pallet<T>>::authorities().iter().any(|id| &id.0 == authority_id)
 	}
 }
 
@@ -490,7 +473,6 @@ impl<T: Config> Pallet<T> {
 	/// In other word, this is only accurate if no slots are missed. Given missed slots, the slot
 	/// number will grow while the block number will not. Hence, the result can be interpreted as an
 	/// upper bound.
-	//
 	// ## IMPORTANT NOTE
 	//
 	// This implementation is linked to how [`should_epoch_change`] is working. This might need to
@@ -500,13 +482,11 @@ impl<T: Config> Pallet<T> {
 	// update this function, you must also update the corresponding weight.
 	pub fn next_expected_epoch_change(now: T::BlockNumber) -> Option<T::BlockNumber> {
 		let next_slot = Self::current_epoch_start().saturating_add(T::EpochDuration::get());
-		next_slot
-			.checked_sub(*CurrentSlot::<T>::get())
-			.map(|slots_remaining| {
-				// This is a best effort guess. Drifts in the slot/block ratio will cause errors here.
-				let blocks_remaining: T::BlockNumber = slots_remaining.saturated_into();
-				now.saturating_add(blocks_remaining)
-			})
+		next_slot.checked_sub(*CurrentSlot::<T>::get()).map(|slots_remaining| {
+			// This is a best effort guess. Drifts in the slot/block ratio will cause errors here.
+			let blocks_remaining: T::BlockNumber = slots_remaining.saturated_into();
+			now.saturating_add(blocks_remaining)
+		})
 	}
 
 	/// DANGEROUS: Enact an epoch change. Should be done on every block where `should_epoch_change` has returned `true`,
@@ -553,10 +533,8 @@ impl<T: Config> Pallet<T> {
 		// so that nodes can track changes.
 		let next_randomness = NextRandomness::<T>::get();
 
-		let next_epoch = NextEpochDescriptor {
-			authorities: next_authorities,
-			randomness: next_randomness,
-		};
+		let next_epoch =
+			NextEpochDescriptor { authorities: next_authorities, randomness: next_randomness };
 		Self::deposit_consensus(ConsensusLog::NextEpochData(next_epoch));
 
 		if let Some(next_config) = NextEpochConfig::<T>::get() {
@@ -587,7 +565,8 @@ impl<T: Config> Pallet<T> {
 			duration: T::EpochDuration::get(),
 			authorities: Self::authorities(),
 			randomness: Self::randomness(),
-			config: EpochConfig::<T>::get().expect("EpochConfig is initialized in genesis; we never `take` or `kill` it; qed"),
+			config: EpochConfig::<T>::get()
+				.expect("EpochConfig is initialized in genesis; we never `take` or `kill` it; qed"),
 		}
 	}
 
@@ -606,7 +585,9 @@ impl<T: Config> Pallet<T> {
 			authorities: NextAuthorities::<T>::get(),
 			randomness: NextRandomness::<T>::get(),
 			config: NextEpochConfig::<T>::get().unwrap_or_else(|| {
-				EpochConfig::<T>::get().expect("EpochConfig is initialized in genesis; we never `take` or `kill` it; qed")
+				EpochConfig::<T>::get().expect(
+					"EpochConfig is initialized in genesis; we never `take` or `kill` it; qed",
+				)
 			}),
 		}
 	}
@@ -617,9 +598,7 @@ impl<T: Config> Pallet<T> {
 		const PROOF: &str = "slot number is u64; it should relate in some way to wall clock time; \
 							 if u64 is not enough we should crash for safety; qed.";
 
-		let epoch_start = epoch_index
-			.checked_mul(T::EpochDuration::get())
-			.expect(PROOF);
+		let epoch_start = epoch_index.checked_mul(T::EpochDuration::get()).expect(PROOF);
 
 		epoch_start.checked_add(*GenesisSlot::<T>::get()).expect(PROOF).into()
 	}
@@ -649,19 +628,22 @@ impl<T: Config> Pallet<T> {
 		// => let's ensure that we only modify the storage once per block
 		let initialized = Self::initialized().is_some();
 		if initialized {
-			return;
+			return
 		}
 
-		let maybe_pre_digest: Option<PreDigest> = <frame_system::Pallet<T>>::digest()
-			.logs
-			.iter()
-			.filter_map(|s| s.as_pre_runtime())
-			.filter_map(|(id, mut data)| if id == BABE_ENGINE_ID {
-				PreDigest::decode(&mut data).ok()
-			} else {
-				None
-			})
-			.next();
+		let maybe_pre_digest: Option<PreDigest> =
+			<frame_system::Pallet<T>>::digest()
+				.logs
+				.iter()
+				.filter_map(|s| s.as_pre_runtime())
+				.filter_map(|(id, mut data)| {
+					if id == BABE_ENGINE_ID {
+						PreDigest::decode(&mut data).ok()
+					} else {
+						None
+					}
+				})
+				.next();
 
 		let is_primary = matches!(maybe_pre_digest, Some(PreDigest::Primary(..)));
 
@@ -697,31 +679,22 @@ impl<T: Config> Pallet<T> {
 			let authority_index = digest.authority_index();
 
 			// Extract out the VRF output if we have it
-			digest
-				.vrf_output()
-				.and_then(|vrf_output| {
-					// Reconstruct the bytes of VRFInOut using the authority id.
-					Authorities::<T>::get()
-						.get(authority_index as usize)
-						.and_then(|author| {
-							schnorrkel::PublicKey::from_bytes(author.0.as_slice()).ok()
-						})
-						.and_then(|pubkey| {
-							let transcript = sp_consensus_babe::make_transcript(
-								&Self::randomness(),
-								current_slot,
-								EpochIndex::<T>::get(),
-							);
-
-							vrf_output.0.attach_input_hash(
-								&pubkey,
-								transcript
-							).ok()
-						})
-						.map(|inout| {
-							inout.make_bytes(&sp_consensus_babe::BABE_VRF_INOUT_CONTEXT)
-						})
-				})
+			digest.vrf_output().and_then(|vrf_output| {
+				// Reconstruct the bytes of VRFInOut using the authority id.
+				Authorities::<T>::get()
+					.get(authority_index as usize)
+					.and_then(|author| schnorrkel::PublicKey::from_bytes(author.0.as_slice()).ok())
+					.and_then(|pubkey| {
+						let transcript = sp_consensus_babe::make_transcript(
+							&Self::randomness(),
+							current_slot,
+							EpochIndex::<T>::get(),
+						);
+
+						vrf_output.0.attach_input_hash(&pubkey, transcript).ok()
+					})
+					.map(|inout| inout.make_bytes(&sp_consensus_babe::BABE_VRF_INOUT_CONTEXT))
+			})
 		});
 
 		// For primary VRF output we place it in the `Initialized` storage
@@ -774,7 +747,7 @@ impl<T: Config> Pallet<T> {
 
 		// validate the equivocation proof
 		if !sp_consensus_babe::check_equivocation_proof(equivocation_proof) {
-			return Err(Error::<T>::InvalidEquivocationProof.into());
+			return Err(Error::<T>::InvalidEquivocationProof.into())
 		}
 
 		let validator_set_count = key_owner_proof.validator_count();
@@ -786,7 +759,7 @@ impl<T: Config> Pallet<T> {
 		// check that the slot number is consistent with the session index
 		// in the key ownership proof (i.e. slot is for that epoch)
 		if epoch_index != session_index {
-			return Err(Error::<T>::InvalidKeyOwnershipProof.into());
+			return Err(Error::<T>::InvalidKeyOwnershipProof.into())
 		}
 
 		// check the membership proof and extract the offender's id
@@ -794,12 +767,8 @@ impl<T: Config> Pallet<T> {
 		let offender = T::KeyOwnerProofSystem::check_proof(key, key_owner_proof)
 			.ok_or(Error::<T>::InvalidKeyOwnershipProof)?;
 
-		let offence = BabeEquivocationOffence {
-			slot,
-			validator_set_count,
-			offender,
-			session_index,
-		};
+		let offence =
+			BabeEquivocationOffence { slot, validator_set_count, offender, session_index };
 
 		let reporters = match reporter {
 			Some(id) => vec![id],
@@ -837,7 +806,10 @@ impl<T: Config> OnTimestampSet<T::Moment> for Pallet<T> {
 		let timestamp_slot = moment / slot_duration;
 		let timestamp_slot = Slot::from(timestamp_slot.saturated_into::<u64>());
 
-		assert!(CurrentSlot::<T>::get() == timestamp_slot, "Timestamp slot must match `CurrentSlot`");
+		assert!(
+			CurrentSlot::<T>::get() == timestamp_slot,
+			"Timestamp slot must match `CurrentSlot`"
+		);
 	}
 }
 
@@ -850,10 +822,7 @@ impl<T: Config> frame_support::traits::EstimateNextSessionRotation<T::BlockNumbe
 		let elapsed = CurrentSlot::<T>::get().saturating_sub(Self::current_epoch_start()) + 1;
 
 		(
-			Some(Permill::from_rational(
-				*elapsed,
-				T::EpochDuration::get(),
-			)),
+			Some(Permill::from_rational(*elapsed, T::EpochDuration::get())),
 			// Read: Current Slot, Epoch Index, Genesis Slot
 			T::DbWeight::get().reads(3),
 		)
@@ -882,22 +851,20 @@ impl<T: Config> OneSessionHandler<T::AccountId> for Pallet<T> {
 	type Key = AuthorityId;
 
 	fn on_genesis_session<'a, I: 'a>(validators: I)
-		where I: Iterator<Item=(&'a T::AccountId, AuthorityId)>
+	where
+		I: Iterator<Item = (&'a T::AccountId, AuthorityId)>,
 	{
 		let authorities = validators.map(|(_, k)| (k, 1)).collect::<Vec<_>>();
 		Self::initialize_authorities(&authorities);
 	}
 
 	fn on_new_session<'a, I: 'a>(_changed: bool, validators: I, queued_validators: I)
-		where I: Iterator<Item=(&'a T::AccountId, AuthorityId)>
+	where
+		I: Iterator<Item = (&'a T::AccountId, AuthorityId)>,
 	{
-		let authorities = validators.map(|(_account, k)| {
-			(k, 1)
-		}).collect::<Vec<_>>();
+		let authorities = validators.map(|(_account, k)| (k, 1)).collect::<Vec<_>>();
 
-		let next_authorities = queued_validators.map(|(_account, k)| {
-			(k, 1)
-		}).collect::<Vec<_>>();
+		let next_authorities = queued_validators.map(|(_account, k)| (k, 1)).collect::<Vec<_>>();
 
 		Self::enact_epoch_change(authorities, next_authorities)
 	}
@@ -914,7 +881,7 @@ impl<T: Config> OneSessionHandler<T::AccountId> for Pallet<T> {
 fn compute_randomness(
 	last_epoch_randomness: schnorrkel::Randomness,
 	epoch_index: u64,
-	rho: impl Iterator<Item=schnorrkel::Randomness>,
+	rho: impl Iterator<Item = schnorrkel::Randomness>,
 	rho_size_hint: Option<usize>,
 ) -> schnorrkel::Randomness {
 	let mut s = Vec::with_capacity(40 + rho_size_hint.unwrap_or(0) * VRF_OUTPUT_LENGTH);
@@ -930,7 +897,7 @@ fn compute_randomness(
 
 pub mod migrations {
 	use super::*;
-	use frame_support::pallet_prelude::{ValueQuery, StorageValue};
+	use frame_support::pallet_prelude::{StorageValue, ValueQuery};
 
 	/// Something that can return the storage prefix of the `Babe` pallet.
 	pub trait BabePalletPrefix: Config {
@@ -939,13 +906,14 @@ pub mod migrations {
 
 	struct __OldNextEpochConfig<T>(sp_std::marker::PhantomData<T>);
 	impl<T: BabePalletPrefix> frame_support::traits::StorageInstance for __OldNextEpochConfig<T> {
-		fn pallet_prefix() -> &'static str { T::pallet_prefix() }
+		fn pallet_prefix() -> &'static str {
+			T::pallet_prefix()
+		}
 		const STORAGE_PREFIX: &'static str = "NextEpochConfig";
 	}
 
-	type OldNextEpochConfig<T> = StorageValue<
-		__OldNextEpochConfig<T>, Option<NextConfigDescriptor>, ValueQuery
-	>;
+	type OldNextEpochConfig<T> =
+		StorageValue<__OldNextEpochConfig<T>, Option<NextConfigDescriptor>, ValueQuery>;
 
 	/// A storage migration that adds the current epoch configuration for Babe
 	/// to storage.
diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index ea54e9f7cea8..795d51e5876f 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -17,27 +17,31 @@
 
 //! Test utilities
 
-use codec::Encode;
 use crate::{self as pallet_babe, Config, CurrentSlot};
-use sp_runtime::{
-	Perbill, impl_opaque_keys,
-	curve::PiecewiseLinear,
-	testing::{Digest, DigestItem, Header, TestXt,},
-	traits::{Header as _, IdentityLookup, OpaqueKeys},
-};
-use frame_system::InitKind;
+use codec::Encode;
+use frame_election_provider_support::onchain;
 use frame_support::{
 	parameter_types,
-	traits::{KeyOwnerProofSystem, OnInitialize, GenesisBuild},
+	traits::{GenesisBuild, KeyOwnerProofSystem, OnInitialize},
 };
-use sp_io;
-use sp_core::{H256, U256, crypto::{IsWrappedBy, KeyTypeId, Pair}};
+use frame_system::InitKind;
+use pallet_session::historical as pallet_session_historical;
+use pallet_staking::EraIndex;
 use sp_consensus_babe::{AuthorityId, AuthorityPair, Slot};
 use sp_consensus_vrf::schnorrkel::{VRFOutput, VRFProof};
+use sp_core::{
+	crypto::{IsWrappedBy, KeyTypeId, Pair},
+	H256, U256,
+};
+use sp_io;
+use sp_runtime::{
+	curve::PiecewiseLinear,
+	impl_opaque_keys,
+	testing::{Digest, DigestItem, Header, TestXt},
+	traits::{Header as _, IdentityLookup, OpaqueKeys},
+	Perbill,
+};
 use sp_staking::SessionIndex;
-use pallet_staking::EraIndex;
-use frame_election_provider_support::onchain;
-use pallet_session::historical as pallet_session_historical;
 
 type DummyValidatorId = u64;
 
@@ -277,7 +281,7 @@ pub fn go_to_block(n: u64, s: u64) {
 /// Slots will grow accordingly to blocks
 pub fn progress_to_block(n: u64) {
 	let mut slot = u64::from(Babe::current_slot()) + 1;
-	for i in System::block_number() + 1 ..= n {
+	for i in System::block_number() + 1..=n {
 		go_to_block(i, slot);
 		slot += 1;
 	}
@@ -308,7 +312,7 @@ pub fn make_primary_pre_digest(
 			slot,
 			vrf_output,
 			vrf_proof,
-		}
+		},
 	);
 	let log = DigestItem::PreRuntime(sp_consensus_babe::BABE_ENGINE_ID, digest_data.encode());
 	Digest { logs: vec![log] }
@@ -319,10 +323,7 @@ pub fn make_secondary_plain_pre_digest(
 	slot: sp_consensus_babe::Slot,
 ) -> Digest {
 	let digest_data = sp_consensus_babe::digests::PreDigest::SecondaryPlain(
-		sp_consensus_babe::digests::SecondaryPlainPreDigest {
-			authority_index,
-			slot,
-		}
+		sp_consensus_babe::digests::SecondaryPlainPreDigest { authority_index, slot },
 	);
 	let log = DigestItem::PreRuntime(sp_consensus_babe::BABE_ENGINE_ID, digest_data.encode());
 	Digest { logs: vec![log] }
@@ -340,7 +341,7 @@ pub fn make_secondary_vrf_pre_digest(
 			slot,
 			vrf_output,
 			vrf_proof,
-		}
+		},
 	);
 	let log = DigestItem::PreRuntime(sp_consensus_babe::BABE_ENGINE_ID, digest_data.encode());
 	Digest { logs: vec![log] }
@@ -348,13 +349,13 @@ pub fn make_secondary_vrf_pre_digest(
 
 pub fn make_vrf_output(
 	slot: Slot,
-	pair: &sp_consensus_babe::AuthorityPair
+	pair: &sp_consensus_babe::AuthorityPair,
 ) -> (VRFOutput, VRFProof, [u8; 32]) {
 	let pair = sp_core::sr25519::Pair::from_ref(pair).as_ref();
 	let transcript = sp_consensus_babe::make_transcript(&Babe::randomness(), slot, 0);
 	let vrf_inout = pair.vrf_sign(transcript);
-	let vrf_randomness: sp_consensus_vrf::schnorrkel::Randomness = vrf_inout.0
-		.make_bytes::<[u8; 32]>(&sp_consensus_babe::BABE_VRF_INOUT_CONTEXT);
+	let vrf_randomness: sp_consensus_vrf::schnorrkel::Randomness =
+		vrf_inout.0.make_bytes::<[u8; 32]>(&sp_consensus_babe::BABE_VRF_INOUT_CONTEXT);
 	let vrf_output = VRFOutput(vrf_inout.0.to_output());
 	let vrf_proof = VRFProof(vrf_inout.1);
 
@@ -365,10 +366,12 @@ pub fn new_test_ext(authorities_len: usize) -> sp_io::TestExternalities {
 	new_test_ext_with_pairs(authorities_len).1
 }
 
-pub fn new_test_ext_with_pairs(authorities_len: usize) -> (Vec<AuthorityPair>, sp_io::TestExternalities) {
-	let pairs = (0..authorities_len).map(|i| {
-		AuthorityPair::from_seed(&U256::from(i).into())
-	}).collect::<Vec<_>>();
+pub fn new_test_ext_with_pairs(
+	authorities_len: usize,
+) -> (Vec<AuthorityPair>, sp_io::TestExternalities) {
+	let pairs = (0..authorities_len)
+		.map(|i| AuthorityPair::from_seed(&U256::from(i).into()))
+		.collect::<Vec<_>>();
 
 	let public = pairs.iter().map(|p| p.public()).collect();
 
@@ -376,13 +379,9 @@ pub fn new_test_ext_with_pairs(authorities_len: usize) -> (Vec<AuthorityPair>, s
 }
 
 pub fn new_test_ext_raw_authorities(authorities: Vec<AuthorityId>) -> sp_io::TestExternalities {
-	let mut t = frame_system::GenesisConfig::default()
-		.build_storage::<Test>()
-		.unwrap();
+	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
 
-	let balances: Vec<_> = (0..authorities.len())
-		.map(|i| (i as u64, 10_000_000))
-		.collect();
+	let balances: Vec<_> = (0..authorities.len()).map(|i| (i as u64, 10_000_000)).collect();
 
 	pallet_balances::GenesisConfig::<Test> { balances }
 		.assimilate_storage(&mut t)
@@ -393,13 +392,7 @@ pub fn new_test_ext_raw_authorities(authorities: Vec<AuthorityId>) -> sp_io::Tes
 		.iter()
 		.enumerate()
 		.map(|(i, k)| {
-			(
-				i as u64,
-				i as u64,
-				MockSessionKeys {
-					babe_authority: AuthorityId::from(k.clone()),
-				},
-			)
+			(i as u64, i as u64, MockSessionKeys { babe_authority: AuthorityId::from(k.clone()) })
 		})
 		.collect();
 
@@ -412,12 +405,7 @@ pub fn new_test_ext_raw_authorities(authorities: Vec<AuthorityId>) -> sp_io::Tes
 	// controllers are the index + 1000
 	let stakers: Vec<_> = (0..authorities.len())
 		.map(|i| {
-			(
-				i as u64,
-				i as u64 + 1000,
-				10_000,
-				pallet_staking::StakerStatus::<u64>::Validator,
-			)
+			(i as u64, i as u64 + 1000, 10_000, pallet_staking::StakerStatus::<u64>::Validator)
 		})
 		.collect();
 
diff --git a/frame/babe/src/randomness.rs b/frame/babe/src/randomness.rs
index a7e8b3157768..7d1862905021 100644
--- a/frame/babe/src/randomness.rs
+++ b/frame/babe/src/randomness.rs
@@ -21,7 +21,7 @@
 use super::{
 	AuthorVrfRandomness, Config, EpochStart, NextRandomness, Randomness, VRF_OUTPUT_LENGTH,
 };
-use frame_support::{traits::Randomness as RandomnessT};
+use frame_support::traits::Randomness as RandomnessT;
 use sp_runtime::traits::Hash;
 
 /// Randomness usable by consensus protocols that **depend** upon finality and take action
diff --git a/frame/babe/src/tests.rs b/frame/babe/src/tests.rs
index 520a808ab4a5..00ffc7b4edac 100644
--- a/frame/babe/src/tests.rs
+++ b/frame/babe/src/tests.rs
@@ -19,7 +19,7 @@
 
 use super::{Call, *};
 use frame_support::{
-	assert_err, assert_ok, assert_noop,
+	assert_err, assert_noop, assert_ok,
 	traits::{Currency, EstimateNextSessionRotation, OnFinalize},
 	weights::{GetDispatchInfo, Pays},
 };
@@ -29,10 +29,8 @@ use sp_consensus_babe::{AllowedSlots, BabeEpochConfiguration, Slot};
 use sp_core::crypto::Pair;
 
 const EMPTY_RANDOMNESS: [u8; 32] = [
-	74, 25, 49, 128, 53, 97, 244, 49,
-	222, 202, 176, 2, 231, 66, 95, 10,
-	133, 49, 213, 228, 86, 161, 164, 127,
-	217, 153, 138, 37, 48, 192, 248, 0,
+	74, 25, 49, 128, 53, 97, 244, 49, 222, 202, 176, 2, 231, 66, 95, 10, 133, 49, 213, 228, 86,
+	161, 164, 127, 217, 153, 138, 37, 48, 192, 248, 0,
 ];
 
 #[test]
@@ -43,17 +41,17 @@ fn empty_randomness_is_correct() {
 
 #[test]
 fn initial_values() {
-	new_test_ext(4).execute_with(|| {
-		assert_eq!(Babe::authorities().len(), 4)
-	})
+	new_test_ext(4).execute_with(|| assert_eq!(Babe::authorities().len(), 4))
 }
 
 #[test]
 fn check_module() {
 	new_test_ext(4).execute_with(|| {
 		assert!(!Babe::should_end_session(0), "Genesis does not change sessions");
-		assert!(!Babe::should_end_session(200000),
-			"BABE does not include the block number in epoch calculations");
+		assert!(
+			!Babe::should_end_session(200000),
+			"BABE does not include the block number in epoch calculations"
+		);
 	})
 }
 
@@ -66,20 +64,10 @@ fn first_block_epoch_zero_start() {
 		let (vrf_output, vrf_proof, vrf_randomness) = make_vrf_output(genesis_slot, &pairs[0]);
 
 		let first_vrf = vrf_output;
-		let pre_digest = make_primary_pre_digest(
-			0,
-			genesis_slot,
-			first_vrf.clone(),
-			vrf_proof,
-		);
+		let pre_digest = make_primary_pre_digest(0, genesis_slot, first_vrf.clone(), vrf_proof);
 
 		assert_eq!(Babe::genesis_slot(), Slot::from(0));
-		System::initialize(
-			&1,
-			&Default::default(),
-			&pre_digest,
-			Default::default(),
-		);
+		System::initialize(&1, &Default::default(), &pre_digest, Default::default());
 
 		// see implementation of the function for details why: we issue an
 		// epoch-change digest but don't do it via the normal session mechanism.
@@ -106,7 +94,7 @@ fn first_block_epoch_zero_start() {
 			sp_consensus_babe::digests::NextEpochDescriptor {
 				authorities: Babe::authorities(),
 				randomness: Babe::randomness(),
-			}
+			},
 		);
 		let consensus_digest = DigestItem::Consensus(BABE_ENGINE_ID, consensus_log.encode());
 
@@ -124,12 +112,7 @@ fn author_vrf_output_for_primary() {
 		let (vrf_output, vrf_proof, vrf_randomness) = make_vrf_output(genesis_slot, &pairs[0]);
 		let primary_pre_digest = make_primary_pre_digest(0, genesis_slot, vrf_output, vrf_proof);
 
-		System::initialize(
-			&1,
-			&Default::default(),
-			&primary_pre_digest,
-			Default::default(),
-		);
+		System::initialize(&1, &Default::default(), &primary_pre_digest, Default::default());
 
 		Babe::do_initialize(1);
 		assert_eq!(Babe::author_vrf_randomness(), Some(vrf_randomness));
@@ -147,14 +130,10 @@ fn author_vrf_output_for_secondary_vrf() {
 	ext.execute_with(|| {
 		let genesis_slot = Slot::from(10);
 		let (vrf_output, vrf_proof, vrf_randomness) = make_vrf_output(genesis_slot, &pairs[0]);
-		let secondary_vrf_pre_digest = make_secondary_vrf_pre_digest(0, genesis_slot, vrf_output, vrf_proof);
+		let secondary_vrf_pre_digest =
+			make_secondary_vrf_pre_digest(0, genesis_slot, vrf_output, vrf_proof);
 
-		System::initialize(
-			&1,
-			&Default::default(),
-			&secondary_vrf_pre_digest,
-			Default::default(),
-		);
+		System::initialize(&1, &Default::default(), &secondary_vrf_pre_digest, Default::default());
 
 		Babe::do_initialize(1);
 		assert_eq!(Babe::author_vrf_randomness(), Some(vrf_randomness));
@@ -192,8 +171,10 @@ fn no_author_vrf_output_for_secondary_plain() {
 fn authority_index() {
 	new_test_ext(4).execute_with(|| {
 		assert_eq!(
-			Babe::find_author((&[(BABE_ENGINE_ID, &[][..])]).into_iter().cloned()), None,
-			"Trivially invalid authorities are ignored")
+			Babe::find_author((&[(BABE_ENGINE_ID, &[][..])]).into_iter().cloned()),
+			None,
+			"Trivially invalid authorities are ignored"
+		)
 	})
 }
 
@@ -237,7 +218,10 @@ fn can_estimate_current_epoch_progress() {
 					Permill::from_percent(100)
 				);
 			} else {
-				assert!(Babe::estimate_current_session_progress(i).0.unwrap() < Permill::from_percent(100));
+				assert!(
+					Babe::estimate_current_session_progress(i).0.unwrap() <
+						Permill::from_percent(100)
+				);
 			}
 		}
 
@@ -287,7 +271,8 @@ fn can_enact_next_config() {
 				c: next_next_config.c,
 				allowed_slots: next_next_config.allowed_slots,
 			},
-		).unwrap();
+		)
+		.unwrap();
 
 		progress_to_block(4);
 		Babe::on_finalize(9);
@@ -296,12 +281,11 @@ fn can_enact_next_config() {
 		assert_eq!(EpochConfig::<Test>::get(), Some(next_config));
 		assert_eq!(NextEpochConfig::<Test>::get(), Some(next_next_config.clone()));
 
-		let consensus_log = sp_consensus_babe::ConsensusLog::NextConfigData(
-			NextConfigDescriptor::V1 {
+		let consensus_log =
+			sp_consensus_babe::ConsensusLog::NextConfigData(NextConfigDescriptor::V1 {
 				c: next_next_config.c,
 				allowed_slots: next_next_config.allowed_slots,
-			}
-		);
+			});
 		let consensus_digest = DigestItem::Consensus(BABE_ENGINE_ID, consensus_log.encode());
 
 		assert_eq!(header.digest.logs[2], consensus_digest.clone())
@@ -313,29 +297,18 @@ fn only_root_can_enact_config_change() {
 	use sp_runtime::DispatchError;
 
 	new_test_ext(1).execute_with(|| {
-		let next_config = NextConfigDescriptor::V1 {
-			c: (1, 4),
-			allowed_slots: AllowedSlots::PrimarySlots,
-		};
+		let next_config =
+			NextConfigDescriptor::V1 { c: (1, 4), allowed_slots: AllowedSlots::PrimarySlots };
 
-		let res = Babe::plan_config_change(
-			Origin::none(),
-			next_config.clone(),
-		);
+		let res = Babe::plan_config_change(Origin::none(), next_config.clone());
 
 		assert_noop!(res, DispatchError::BadOrigin);
 
-		let res = Babe::plan_config_change(
-			Origin::signed(1),
-			next_config.clone(),
-		);
+		let res = Babe::plan_config_change(Origin::signed(1), next_config.clone());
 
 		assert_noop!(res, DispatchError::BadOrigin);
 
-		let res = Babe::plan_config_change(
-			Origin::root(),
-			next_config,
-		);
+		let res = Babe::plan_config_change(Origin::root(), next_config);
 
 		assert!(res.is_ok());
 	});
@@ -350,10 +323,7 @@ fn can_fetch_current_and_next_epoch_data() {
 		});
 
 		// genesis authorities should be used for the first and second epoch
-		assert_eq!(
-			Babe::current_epoch().authorities,
-			Babe::next_epoch().authorities,
-		);
+		assert_eq!(Babe::current_epoch().authorities, Babe::next_epoch().authorities,);
 		// 1 era = 3 epochs
 		// 1 epoch = 3 slots
 		// Eras start from 0.
@@ -420,11 +390,7 @@ fn report_equivocation_current_session_works() {
 
 			assert_eq!(
 				Staking::eras_stakers(1, validator),
-				pallet_staking::Exposure {
-					total: 10_000,
-					own: 10_000,
-					others: vec![],
-				},
+				pallet_staking::Exposure { total: 10_000, own: 10_000, others: vec![] },
 			);
 		}
 
@@ -445,10 +411,7 @@ fn report_equivocation_current_session_works() {
 		);
 
 		// create the key ownership proof
-		let key = (
-			sp_consensus_babe::KEY_TYPE,
-			&offending_authority_pair.public(),
-		);
+		let key = (sp_consensus_babe::KEY_TYPE, &offending_authority_pair.public());
 		let key_owner_proof = Historical::prove(key).unwrap();
 
 		// report the equivocation
@@ -460,35 +423,24 @@ fn report_equivocation_current_session_works() {
 		start_era(2);
 
 		// check that the balance of offending validator is slashed 100%.
-		assert_eq!(
-			Balances::total_balance(&offending_validator_id),
-			10_000_000 - 10_000
-		);
+		assert_eq!(Balances::total_balance(&offending_validator_id), 10_000_000 - 10_000);
 		assert_eq!(Staking::slashable_balance_of(&offending_validator_id), 0);
 		assert_eq!(
 			Staking::eras_stakers(2, offending_validator_id),
-			pallet_staking::Exposure {
-				total: 0,
-				own: 0,
-				others: vec![],
-			},
+			pallet_staking::Exposure { total: 0, own: 0, others: vec![] },
 		);
 
 		// check that the balances of all other validators are left intact.
 		for validator in &validators {
 			if *validator == offending_validator_id {
-				continue;
+				continue
 			}
 
 			assert_eq!(Balances::total_balance(validator), 10_000_000);
 			assert_eq!(Staking::slashable_balance_of(validator), 10_000);
 			assert_eq!(
 				Staking::eras_stakers(2, validator),
-				pallet_staking::Exposure {
-					total: 10_000,
-					own: 10_000,
-					others: vec![],
-				},
+				pallet_staking::Exposure { total: 10_000, own: 10_000, others: vec![] },
 			);
 		}
 	})
@@ -519,10 +471,7 @@ fn report_equivocation_old_session_works() {
 		);
 
 		// create the key ownership proof
-		let key = (
-			sp_consensus_babe::KEY_TYPE,
-			&offending_authority_pair.public(),
-		);
+		let key = (sp_consensus_babe::KEY_TYPE, &offending_authority_pair.public());
 		let key_owner_proof = Historical::prove(key).unwrap();
 
 		// start a new era and report the equivocation
@@ -531,10 +480,7 @@ fn report_equivocation_old_session_works() {
 
 		// check the balance of the offending validator
 		assert_eq!(Balances::total_balance(&offending_validator_id), 10_000_000);
-		assert_eq!(
-			Staking::slashable_balance_of(&offending_validator_id),
-			10_000
-		);
+		assert_eq!(Staking::slashable_balance_of(&offending_validator_id), 10_000);
 
 		// report the equivocation
 		Babe::report_equivocation_unsigned(Origin::none(), equivocation_proof, key_owner_proof)
@@ -545,18 +491,11 @@ fn report_equivocation_old_session_works() {
 		start_era(3);
 
 		// check that the balance of offending validator is slashed 100%.
-		assert_eq!(
-			Balances::total_balance(&offending_validator_id),
-			10_000_000 - 10_000
-		);
+		assert_eq!(Balances::total_balance(&offending_validator_id), 10_000_000 - 10_000);
 		assert_eq!(Staking::slashable_balance_of(&offending_validator_id), 0);
 		assert_eq!(
 			Staking::eras_stakers(3, offending_validator_id),
-			pallet_staking::Exposure {
-				total: 0,
-				own: 0,
-				others: vec![],
-			},
+			pallet_staking::Exposure { total: 0, own: 0, others: vec![] },
 		);
 	})
 }
@@ -585,10 +524,7 @@ fn report_equivocation_invalid_key_owner_proof() {
 		);
 
 		// create the key ownership proof
-		let key = (
-			sp_consensus_babe::KEY_TYPE,
-			&offending_authority_pair.public(),
-		);
+		let key = (sp_consensus_babe::KEY_TYPE, &offending_authority_pair.public());
 		let mut key_owner_proof = Historical::prove(key).unwrap();
 
 		// we change the session index in the key ownership proof
@@ -640,10 +576,7 @@ fn report_equivocation_invalid_equivocation_proof() {
 			.unwrap();
 
 		// create the key ownership proof
-		let key = (
-			sp_consensus_babe::KEY_TYPE,
-			&offending_authority_pair.public(),
-		);
+		let key = (sp_consensus_babe::KEY_TYPE, &offending_authority_pair.public());
 		let key_owner_proof = Historical::prove(key).unwrap();
 
 		let assert_invalid_equivocation = |equivocation_proof| {
@@ -753,10 +686,7 @@ fn report_equivocation_validate_unsigned_prevents_duplicates() {
 			CurrentSlot::<Test>::get(),
 		);
 
-		let key = (
-			sp_consensus_babe::KEY_TYPE,
-			&offending_authority_pair.public(),
-		);
+		let key = (sp_consensus_babe::KEY_TYPE, &offending_authority_pair.public());
 		let key_owner_proof = Historical::prove(key).unwrap();
 
 		let inner =
@@ -815,23 +745,19 @@ fn report_equivocation_validate_unsigned_prevents_duplicates() {
 fn report_equivocation_has_valid_weight() {
 	// the weight depends on the size of the validator set,
 	// but there's a lower bound of 100 validators.
-	assert!(
-		(1..=100)
-			.map(<Test as Config>::WeightInfo::report_equivocation)
-			.collect::<Vec<_>>()
-			.windows(2)
-			.all(|w| w[0] == w[1])
-	);
+	assert!((1..=100)
+		.map(<Test as Config>::WeightInfo::report_equivocation)
+		.collect::<Vec<_>>()
+		.windows(2)
+		.all(|w| w[0] == w[1]));
 
 	// after 100 validators the weight should keep increasing
 	// with every extra validator.
-	assert!(
-		(100..=1000)
-			.map(<Test as Config>::WeightInfo::report_equivocation)
-			.collect::<Vec<_>>()
-			.windows(2)
-			.all(|w| w[0] < w[1])
-	);
+	assert!((100..=1000)
+		.map(<Test as Config>::WeightInfo::report_equivocation)
+		.collect::<Vec<_>>()
+		.windows(2)
+		.all(|w| w[0] < w[1]));
 }
 
 #[test]
@@ -848,11 +774,9 @@ fn valid_equivocation_reports_dont_pay_fees() {
 			generate_equivocation_proof(0, &offending_authority_pair, CurrentSlot::<Test>::get());
 
 		// create the key ownership proof.
-		let key_owner_proof = Historical::prove((
-			sp_consensus_babe::KEY_TYPE,
-			&offending_authority_pair.public(),
-		))
-		.unwrap();
+		let key_owner_proof =
+			Historical::prove((sp_consensus_babe::KEY_TYPE, &offending_authority_pair.public()))
+				.unwrap();
 
 		// check the dispatch info for the call.
 		let info = Call::<Test>::report_equivocation_unsigned(
@@ -894,9 +818,7 @@ fn valid_equivocation_reports_dont_pay_fees() {
 
 #[test]
 fn add_epoch_configurations_migration_works() {
-	use frame_support::storage::migration::{
-		put_storage_value, get_storage_value,
-	};
+	use frame_support::storage::migration::{get_storage_value, put_storage_value};
 
 	impl crate::migrations::BabePalletPrefix for Test {
 		fn pallet_prefix() -> &'static str {
@@ -905,38 +827,31 @@ fn add_epoch_configurations_migration_works() {
 	}
 
 	new_test_ext(1).execute_with(|| {
-		let next_config_descriptor = NextConfigDescriptor::V1 {
-			c: (3, 4),
-			allowed_slots: AllowedSlots::PrimarySlots
-		};
+		let next_config_descriptor =
+			NextConfigDescriptor::V1 { c: (3, 4), allowed_slots: AllowedSlots::PrimarySlots };
 
-		put_storage_value(
-			b"Babe",
-			b"NextEpochConfig",
-			&[],
-			Some(next_config_descriptor.clone())
-		);
+		put_storage_value(b"Babe", b"NextEpochConfig", &[], Some(next_config_descriptor.clone()));
 
 		assert!(get_storage_value::<Option<NextConfigDescriptor>>(
 			b"Babe",
 			b"NextEpochConfig",
 			&[],
-		).is_some());
+		)
+		.is_some());
 
 		let current_epoch = BabeEpochConfiguration {
 			c: (1, 4),
 			allowed_slots: sp_consensus_babe::AllowedSlots::PrimarySlots,
 		};
 
-		crate::migrations::add_epoch_configuration::<Test>(
-			current_epoch.clone()
-		);
+		crate::migrations::add_epoch_configuration::<Test>(current_epoch.clone());
 
 		assert!(get_storage_value::<Option<NextConfigDescriptor>>(
 			b"Babe",
 			b"NextEpochConfig",
 			&[],
-		).is_none());
+		)
+		.is_none());
 
 		assert_eq!(EpochConfig::<Test>::get(), Some(current_epoch));
 		assert_eq!(PendingEpochConfigChange::<Test>::get(), Some(next_config_descriptor));
diff --git a/frame/balances/src/benchmarking.rs b/frame/balances/src/benchmarking.rs
index 688bcbc262bd..97c3c4309a80 100644
--- a/frame/balances/src/benchmarking.rs
+++ b/frame/balances/src/benchmarking.rs
@@ -21,8 +21,10 @@
 
 use super::*;
 
+use frame_benchmarking::{
+	account, benchmarks_instance_pallet, impl_benchmark_test_suite, whitelisted_caller,
+};
 use frame_system::RawOrigin;
-use frame_benchmarking::{benchmarks_instance_pallet, account, whitelisted_caller, impl_benchmark_test_suite};
 use sp_runtime::traits::Bounded;
 
 use crate::Pallet as Balances;
@@ -31,7 +33,6 @@ const SEED: u32 = 0;
 // existential deposit multiplier
 const ED_MULTIPLIER: u32 = 10;
 
-
 benchmarks_instance_pallet! {
 	// Benchmark `transfer` extrinsic with the worst possible conditions:
 	// * Transfer will kill the sender account.
diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index 7a092a75b23d..e0f4e1003bbf 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -150,51 +150,58 @@
 
 #[macro_use]
 mod tests;
-mod tests_local;
+mod benchmarking;
 mod tests_composite;
+mod tests_local;
 mod tests_reentrancy;
-mod benchmarking;
 pub mod weights;
 
-use sp_std::prelude::*;
-use sp_std::{cmp, result, mem, fmt::Debug, ops::BitOr};
-use codec::{Codec, Encode, Decode, MaxEncodedLen};
+pub use self::imbalances::{NegativeImbalance, PositiveImbalance};
+use codec::{Codec, Decode, Encode, MaxEncodedLen};
+#[cfg(feature = "std")]
+use frame_support::traits::GenesisBuild;
 use frame_support::{
-	ensure, WeakBoundedVec,
+	ensure,
 	traits::{
-		Currency, OnUnbalanced, TryDrop, StoredMap,
-		WithdrawReasons, LockIdentifier, LockableCurrency, ExistenceRequirement,
-		Imbalance, SignedImbalance, ReservableCurrency, Get, ExistenceRequirement::{AllowDeath, KeepAlive},
-		NamedReservableCurrency,
-		tokens::{fungible, DepositConsequence, WithdrawConsequence, BalanceStatus as Status},
-	}
+		tokens::{fungible, BalanceStatus as Status, DepositConsequence, WithdrawConsequence},
+		Currency, ExistenceRequirement,
+		ExistenceRequirement::{AllowDeath, KeepAlive},
+		Get, Imbalance, LockIdentifier, LockableCurrency, NamedReservableCurrency, OnUnbalanced,
+		ReservableCurrency, SignedImbalance, StoredMap, TryDrop, WithdrawReasons,
+	},
+	WeakBoundedVec,
 };
-#[cfg(feature = "std")]
-use frame_support::traits::GenesisBuild;
+use frame_system as system;
 use sp_runtime::{
-	RuntimeDebug, DispatchResult, DispatchError, ArithmeticError,
 	traits::{
-		Zero, AtLeast32BitUnsigned, StaticLookup, CheckedAdd, CheckedSub,
-		MaybeSerializeDeserialize, Saturating, Bounded,
+		AtLeast32BitUnsigned, Bounded, CheckedAdd, CheckedSub, MaybeSerializeDeserialize,
+		Saturating, StaticLookup, Zero,
 	},
+	ArithmeticError, DispatchError, DispatchResult, RuntimeDebug,
 };
-use frame_system as system;
-pub use self::imbalances::{PositiveImbalance, NegativeImbalance};
+use sp_std::{cmp, fmt::Debug, mem, ops::BitOr, prelude::*, result};
 pub use weights::WeightInfo;
 
 pub use pallet::*;
 
 #[frame_support::pallet]
 pub mod pallet {
+	use super::*;
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
-	use super::*;
 
 	#[pallet::config]
 	pub trait Config<I: 'static = ()>: frame_system::Config {
 		/// The balance of an account.
-		type Balance: Parameter + Member + AtLeast32BitUnsigned + Codec + Default + Copy +
-			MaybeSerializeDeserialize + Debug + MaxEncodedLen;
+		type Balance: Parameter
+			+ Member
+			+ AtLeast32BitUnsigned
+			+ Codec
+			+ Default
+			+ Copy
+			+ MaybeSerializeDeserialize
+			+ Debug
+			+ MaxEncodedLen;
 
 		/// Handler for the unbalanced reduction when removing a dust account.
 		type DustRemoval: OnUnbalanced<NegativeImbalance<Self, I>>;
@@ -228,7 +235,7 @@ pub mod pallet {
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
 	#[pallet::generate_storage_info]
-	pub struct Pallet<T, I=()>(PhantomData<(T, I)>);
+	pub struct Pallet<T, I = ()>(PhantomData<(T, I)>);
 
 	#[pallet::call]
 	impl<T: Config<I>, I: 'static> Pallet<T, I> {
@@ -267,7 +274,12 @@ pub mod pallet {
 		) -> DispatchResultWithPostInfo {
 			let transactor = ensure_signed(origin)?;
 			let dest = T::Lookup::lookup(dest)?;
-			<Self as Currency<_>>::transfer(&transactor, &dest, value, ExistenceRequirement::AllowDeath)?;
+			<Self as Currency<_>>::transfer(
+				&transactor,
+				&dest,
+				value,
+				ExistenceRequirement::AllowDeath,
+			)?;
 			Ok(().into())
 		}
 
@@ -345,7 +357,12 @@ pub mod pallet {
 			ensure_root(origin)?;
 			let source = T::Lookup::lookup(source)?;
 			let dest = T::Lookup::lookup(dest)?;
-			<Self as Currency<_>>::transfer(&source, &dest, value, ExistenceRequirement::AllowDeath)?;
+			<Self as Currency<_>>::transfer(
+				&source,
+				&dest,
+				value,
+				ExistenceRequirement::AllowDeath,
+			)?;
 			Ok(().into())
 		}
 
@@ -401,7 +418,12 @@ pub mod pallet {
 			let reducible_balance = Self::reducible_balance(&transactor, keep_alive);
 			let dest = T::Lookup::lookup(dest)?;
 			let keep_alive = if keep_alive { KeepAlive } else { AllowDeath };
-			<Self as Currency<_>>::transfer(&transactor, &dest, reducible_balance, keep_alive.into())?;
+			<Self as Currency<_>>::transfer(
+				&transactor,
+				&dest,
+				reducible_balance,
+				keep_alive.into(),
+			)?;
 			Ok(().into())
 		}
 	}
@@ -496,18 +518,15 @@ pub mod pallet {
 		Blake2_128Concat,
 		T::AccountId,
 		BoundedVec<ReserveData<T::ReserveIdentifier, T::Balance>, T::MaxReserves>,
-		ValueQuery
+		ValueQuery,
 	>;
 
 	/// Storage version of the pallet.
 	///
 	/// This is set to v2.0.0 for new networks.
 	#[pallet::storage]
-	pub(super) type StorageVersion<T: Config<I>, I: 'static = ()> = StorageValue<
-		_,
-		Releases,
-		ValueQuery
-	>;
+	pub(super) type StorageVersion<T: Config<I>, I: 'static = ()> =
+		StorageValue<_, Releases, ValueQuery>;
 
 	#[pallet::genesis_config]
 	pub struct GenesisConfig<T: Config<I>, I: 'static = ()> {
@@ -517,18 +536,14 @@ pub mod pallet {
 	#[cfg(feature = "std")]
 	impl<T: Config<I>, I: 'static> Default for GenesisConfig<T, I> {
 		fn default() -> Self {
-			Self {
-				balances: Default::default(),
-			}
+			Self { balances: Default::default() }
 		}
 	}
 
 	#[pallet::genesis_build]
 	impl<T: Config<I>, I: 'static> GenesisBuild<T, I> for GenesisConfig<T, I> {
 		fn build(&self) {
-			let total = self.balances
-				.iter()
-				.fold(Zero::zero(), |acc: T::Balance, &(_, n)| acc + n);
+			let total = self.balances.iter().fold(Zero::zero(), |acc: T::Balance, &(_, n)| acc + n);
 			<TotalIssuance<T, I>>::put(total);
 
 			<StorageVersion<T, I>>::put(Releases::V2_0_0);
@@ -541,12 +556,21 @@ pub mod pallet {
 			}
 
 			// ensure no duplicates exist.
-			let endowed_accounts = self.balances.iter().map(|(x, _)| x).cloned().collect::<std::collections::BTreeSet<_>>();
+			let endowed_accounts = self
+				.balances
+				.iter()
+				.map(|(x, _)| x)
+				.cloned()
+				.collect::<std::collections::BTreeSet<_>>();
 
-			assert!(endowed_accounts.len() == self.balances.len(), "duplicate balances in genesis.");
+			assert!(
+				endowed_accounts.len() == self.balances.len(),
+				"duplicate balances in genesis."
+			);
 
 			for &(ref who, free) in self.balances.iter() {
-				assert!(T::AccountStore::insert(who, AccountData { free, ..Default::default() }).is_ok());
+				assert!(T::AccountStore::insert(who, AccountData { free, ..Default::default() })
+					.is_ok());
 			}
 		}
 	}
@@ -564,10 +588,7 @@ impl<T: Config<I>, I: 'static> GenesisConfig<T, I> {
 	/// Direct implementation of `GenesisBuild::assimilate_storage`.
 	///
 	/// Kept in order not to break dependency.
-	pub fn assimilate_storage(
-		&self,
-		storage: &mut sp_runtime::Storage
-	) -> Result<(), String> {
+	pub fn assimilate_storage(&self, storage: &mut sp_runtime::Storage) -> Result<(), String> {
 		<Self as GenesisBuild<T, I>>::assimilate_storage(self, storage)
 	}
 }
@@ -598,7 +619,9 @@ impl From<WithdrawReasons> for Reasons {
 impl BitOr for Reasons {
 	type Output = Reasons;
 	fn bitor(self, other: Reasons) -> Reasons {
-		if self == other { return self }
+		if self == other {
+			return self
+		}
 		Reasons::All
 	}
 }
@@ -684,7 +707,9 @@ impl Default for Releases {
 	}
 }
 
-pub struct DustCleaner<T: Config<I>, I: 'static = ()>(Option<(T::AccountId, NegativeImbalance<T, I>)>);
+pub struct DustCleaner<T: Config<I>, I: 'static = ()>(
+	Option<(T::AccountId, NegativeImbalance<T, I>)>,
+);
 
 impl<T: Config<I>, I: 'static> Drop for DustCleaner<T, I> {
 	fn drop(&mut self) {
@@ -752,7 +777,9 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		amount: T::Balance,
 		account: &AccountData<T::Balance>,
 	) -> DepositConsequence {
-		if amount.is_zero() { return DepositConsequence::Success }
+		if amount.is_zero() {
+			return DepositConsequence::Success
+		}
 
 		if TotalIssuance::<T, I>::get().checked_add(&amount).is_none() {
 			return DepositConsequence::Overflow
@@ -778,7 +805,9 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		amount: T::Balance,
 		account: &AccountData<T::Balance>,
 	) -> WithdrawConsequence<T::Balance> {
-		if amount.is_zero() { return WithdrawConsequence::Success }
+		if amount.is_zero() {
+			return WithdrawConsequence::Success
+		}
 
 		if TotalIssuance::<T, I>::get().checked_sub(&amount).is_none() {
 			return WithdrawConsequence::Underflow
@@ -847,11 +876,10 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		who: &T::AccountId,
 		f: impl FnOnce(&mut AccountData<T::Balance>, bool) -> Result<R, E>,
 	) -> Result<R, E> {
-		Self::try_mutate_account_with_dust(who, f)
-			.map(|(result, dust_cleaner)| {
-				drop(dust_cleaner);
-				result
-			})
+		Self::try_mutate_account_with_dust(who, f).map(|(result, dust_cleaner)| {
+			drop(dust_cleaner);
+			result
+		})
 	}
 
 	/// Mutate an account to some new value, or delete it entirely with `None`. Will enforce
@@ -944,7 +972,6 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		}
 	}
 
-
 	/// Move the reserved balance of one account into the balance of another, according to `status`.
 	///
 	/// Is a no-op if:
@@ -957,13 +984,15 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		best_effort: bool,
 		status: Status,
 	) -> Result<T::Balance, DispatchError> {
-		if value.is_zero() { return Ok(Zero::zero()) }
+		if value.is_zero() {
+			return Ok(Zero::zero())
+		}
 
 		if slashed == beneficiary {
 			return match status {
 				Status::Free => Ok(Self::unreserve(slashed, value)),
 				Status::Reserved => Ok(value.saturating_sub(Self::reserved_balance(slashed))),
-			};
+			}
 		}
 
 		let ((actual, _maybe_one_dust), _maybe_other_dust) = Self::try_mutate_account_with_dust(
@@ -976,21 +1005,30 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 						let actual = cmp::min(from_account.reserved, value);
 						ensure!(best_effort || actual == value, Error::<T, I>::InsufficientBalance);
 						match status {
-							Status::Free => to_account.free = to_account.free
-								.checked_add(&actual)
-								.ok_or(ArithmeticError::Overflow)?,
-							Status::Reserved => to_account.reserved = to_account.reserved
-								.checked_add(&actual)
-								.ok_or(ArithmeticError::Overflow)?,
+							Status::Free =>
+								to_account.free = to_account
+									.free
+									.checked_add(&actual)
+									.ok_or(ArithmeticError::Overflow)?,
+							Status::Reserved =>
+								to_account.reserved = to_account
+									.reserved
+									.checked_add(&actual)
+									.ok_or(ArithmeticError::Overflow)?,
 						}
 						from_account.reserved -= actual;
 						Ok(actual)
-					}
+					},
 				)
-			}
+			},
 		)?;
 
-		Self::deposit_event(Event::ReserveRepatriated(slashed.clone(), beneficiary.clone(), actual, status));
+		Self::deposit_event(Event::ReserveRepatriated(
+			slashed.clone(),
+			beneficiary.clone(),
+			actual,
+			status,
+		));
 		Ok(actual)
 	}
 }
@@ -1016,21 +1054,27 @@ impl<T: Config<I>, I: 'static> fungible::Inspect<T::AccountId> for Pallet<T, I>
 		} else {
 			// `must_remain_to_exist` is the part of liquid balance which must remain to keep total over
 			// ED.
-			let must_remain_to_exist = T::ExistentialDeposit::get().saturating_sub(a.total() - liquid);
+			let must_remain_to_exist =
+				T::ExistentialDeposit::get().saturating_sub(a.total() - liquid);
 			liquid.saturating_sub(must_remain_to_exist)
 		}
 	}
 	fn can_deposit(who: &T::AccountId, amount: Self::Balance) -> DepositConsequence {
 		Self::deposit_consequence(who, amount, &Self::account(who))
 	}
-	fn can_withdraw(who: &T::AccountId, amount: Self::Balance) -> WithdrawConsequence<Self::Balance> {
+	fn can_withdraw(
+		who: &T::AccountId,
+		amount: Self::Balance,
+	) -> WithdrawConsequence<Self::Balance> {
 		Self::withdraw_consequence(who, amount, &Self::account(who))
 	}
 }
 
 impl<T: Config<I>, I: 'static> fungible::Mutate<T::AccountId> for Pallet<T, I> {
 	fn mint_into(who: &T::AccountId, amount: Self::Balance) -> DispatchResult {
-		if amount.is_zero() { return Ok(()) }
+		if amount.is_zero() {
+			return Ok(())
+		}
 		Self::try_mutate_account(who, |account, _is_new| -> DispatchResult {
 			Self::deposit_consequence(who, amount, &account).into_result()?;
 			account.free += amount;
@@ -1040,14 +1084,22 @@ impl<T: Config<I>, I: 'static> fungible::Mutate<T::AccountId> for Pallet<T, I> {
 		Ok(())
 	}
 
-	fn burn_from(who: &T::AccountId, amount: Self::Balance) -> Result<Self::Balance, DispatchError> {
-		if amount.is_zero() { return Ok(Self::Balance::zero()); }
-		let actual = Self::try_mutate_account(who, |account, _is_new| -> Result<T::Balance, DispatchError> {
-			let extra = Self::withdraw_consequence(who, amount, &account).into_result()?;
-			let actual = amount + extra;
-			account.free -= actual;
-			Ok(actual)
-		})?;
+	fn burn_from(
+		who: &T::AccountId,
+		amount: Self::Balance,
+	) -> Result<Self::Balance, DispatchError> {
+		if amount.is_zero() {
+			return Ok(Self::Balance::zero())
+		}
+		let actual = Self::try_mutate_account(
+			who,
+			|account, _is_new| -> Result<T::Balance, DispatchError> {
+				let extra = Self::withdraw_consequence(who, amount, &account).into_result()?;
+				let actual = amount + extra;
+				account.free -= actual;
+				Ok(actual)
+			},
+		)?;
 		TotalIssuance::<T, I>::mutate(|t| *t -= actual);
 		Ok(actual)
 	}
@@ -1061,8 +1113,7 @@ impl<T: Config<I>, I: 'static> fungible::Transfer<T::AccountId> for Pallet<T, I>
 		keep_alive: bool,
 	) -> Result<T::Balance, DispatchError> {
 		let er = if keep_alive { KeepAlive } else { AllowDeath };
-		<Self as Currency::<T::AccountId>>::transfer(source, dest, amount, er)
-			.map(|_| amount)
+		<Self as Currency<T::AccountId>>::transfer(source, dest, amount, er).map(|_| amount)
 	}
 }
 
@@ -1084,7 +1135,9 @@ impl<T: Config<I>, I: 'static> fungible::InspectHold<T::AccountId> for Pallet<T,
 	fn can_hold(who: &T::AccountId, amount: T::Balance) -> bool {
 		let a = Self::account(who);
 		let min_balance = T::ExistentialDeposit::get().max(a.frozen(Reasons::All));
-		if a.reserved.checked_add(&amount).is_none() { return false }
+		if a.reserved.checked_add(&amount).is_none() {
+			return false
+		}
 		// We require it to be min_balance + amount to ensure that the full reserved funds may be
 		// slashed without compromising locked funds or destroying the account.
 		let required_free = match min_balance.checked_add(&amount) {
@@ -1096,7 +1149,9 @@ impl<T: Config<I>, I: 'static> fungible::InspectHold<T::AccountId> for Pallet<T,
 }
 impl<T: Config<I>, I: 'static> fungible::MutateHold<T::AccountId> for Pallet<T, I> {
 	fn hold(who: &T::AccountId, amount: Self::Balance) -> DispatchResult {
-		if amount.is_zero() { return Ok(()) }
+		if amount.is_zero() {
+			return Ok(())
+		}
 		ensure!(Self::can_reserve(who, amount), Error::<T, I>::InsufficientBalance);
 		Self::mutate_account(who, |a| {
 			a.free -= amount;
@@ -1104,10 +1159,14 @@ impl<T: Config<I>, I: 'static> fungible::MutateHold<T::AccountId> for Pallet<T,
 		})?;
 		Ok(())
 	}
-	fn release(who: &T::AccountId, amount: Self::Balance, best_effort: bool)
-		-> Result<T::Balance, DispatchError>
-	{
-		if amount.is_zero() { return Ok(amount) }
+	fn release(
+		who: &T::AccountId,
+		amount: Self::Balance,
+		best_effort: bool,
+	) -> Result<T::Balance, DispatchError> {
+		if amount.is_zero() {
+			return Ok(amount)
+		}
 		// Done on a best-effort basis.
 		Self::try_mutate_account(who, |a, _| {
 			let new_free = a.free.saturating_add(amount.min(a.reserved));
@@ -1134,12 +1193,9 @@ impl<T: Config<I>, I: 'static> fungible::MutateHold<T::AccountId> for Pallet<T,
 // wrapping these imbalances in a private module is necessary to ensure absolute privacy
 // of the inner member.
 mod imbalances {
-	use super::{
-		result, Imbalance, Config, Zero, Saturating,
-		TryDrop, RuntimeDebug,
-	};
-	use sp_std::mem;
+	use super::{result, Config, Imbalance, RuntimeDebug, Saturating, TryDrop, Zero};
 	use frame_support::traits::SameOrOther;
+	use sp_std::mem;
 
 	/// Opaque, move-only struct with private fields that serves as a token denoting that
 	/// funds have been created without any equal and opposite accounting.
@@ -1288,24 +1344,21 @@ mod imbalances {
 	impl<T: Config<I>, I: 'static> Drop for PositiveImbalance<T, I> {
 		/// Basic drop handler will just square up the total issuance.
 		fn drop(&mut self) {
-			<super::TotalIssuance<T, I>>::mutate(
-				|v| *v = v.saturating_add(self.0)
-			);
+			<super::TotalIssuance<T, I>>::mutate(|v| *v = v.saturating_add(self.0));
 		}
 	}
 
 	impl<T: Config<I>, I: 'static> Drop for NegativeImbalance<T, I> {
 		/// Basic drop handler will just square up the total issuance.
 		fn drop(&mut self) {
-			<super::TotalIssuance<T, I>>::mutate(
-				|v| *v = v.saturating_sub(self.0)
-			);
+			<super::TotalIssuance<T, I>>::mutate(|v| *v = v.saturating_sub(self.0));
 		}
 	}
 }
 
-impl<T: Config<I>, I: 'static> Currency<T::AccountId> for Pallet<T, I> where
-	T::Balance: MaybeSerializeDeserialize + Debug
+impl<T: Config<I>, I: 'static> Currency<T::AccountId> for Pallet<T, I>
+where
+	T::Balance: MaybeSerializeDeserialize + Debug,
 {
 	type Balance = T::Balance;
 	type PositiveImbalance = PositiveImbalance<T, I>;
@@ -1317,7 +1370,9 @@ impl<T: Config<I>, I: 'static> Currency<T::AccountId> for Pallet<T, I> where
 
 	// Check if `value` amount of free balance can be slashed from `who`.
 	fn can_slash(who: &T::AccountId, value: Self::Balance) -> bool {
-		if value.is_zero() { return true }
+		if value.is_zero() {
+			return true
+		}
 		Self::free_balance(who) >= value
 	}
 
@@ -1332,7 +1387,9 @@ impl<T: Config<I>, I: 'static> Currency<T::AccountId> for Pallet<T, I> where
 	// Burn funds from the total issuance, returning a positive imbalance for the amount burned.
 	// Is a no-op if amount to be burned is zero.
 	fn burn(mut amount: Self::Balance) -> Self::PositiveImbalance {
-		if amount.is_zero() { return PositiveImbalance::zero() }
+		if amount.is_zero() {
+			return PositiveImbalance::zero()
+		}
 		<TotalIssuance<T, I>>::mutate(|issued| {
 			*issued = issued.checked_sub(&amount).unwrap_or_else(|| {
 				amount = *issued;
@@ -1346,13 +1403,15 @@ impl<T: Config<I>, I: 'static> Currency<T::AccountId> for Pallet<T, I> where
 	// for the amount issued.
 	// Is a no-op if amount to be issued it zero.
 	fn issue(mut amount: Self::Balance) -> Self::NegativeImbalance {
-		if amount.is_zero() { return NegativeImbalance::zero() }
-		<TotalIssuance<T, I>>::mutate(|issued|
+		if amount.is_zero() {
+			return NegativeImbalance::zero()
+		}
+		<TotalIssuance<T, I>>::mutate(|issued| {
 			*issued = issued.checked_add(&amount).unwrap_or_else(|| {
 				amount = Self::Balance::max_value() - *issued;
 				Self::Balance::max_value()
 			})
-		);
+		});
 		NegativeImbalance::new(amount)
 	}
 
@@ -1374,7 +1433,9 @@ impl<T: Config<I>, I: 'static> Currency<T::AccountId> for Pallet<T, I> where
 		reasons: WithdrawReasons,
 		new_balance: T::Balance,
 	) -> DispatchResult {
-		if amount.is_zero() { return Ok(()) }
+		if amount.is_zero() {
+			return Ok(())
+		}
 		let min_balance = Self::account(who).frozen(reasons.into());
 		ensure!(new_balance >= min_balance, Error::<T, I>::LiquidityRestrictions);
 		Ok(())
@@ -1388,7 +1449,9 @@ impl<T: Config<I>, I: 'static> Currency<T::AccountId> for Pallet<T, I> where
 		value: Self::Balance,
 		existence_requirement: ExistenceRequirement,
 	) -> DispatchResult {
-		if value.is_zero() || transactor == dest { return Ok(()) }
+		if value.is_zero() || transactor == dest {
+			return Ok(())
+		}
 
 		Self::try_mutate_account_with_dust(
 			dest,
@@ -1396,12 +1459,15 @@ impl<T: Config<I>, I: 'static> Currency<T::AccountId> for Pallet<T, I> where
 				Self::try_mutate_account_with_dust(
 					transactor,
 					|from_account, _| -> DispatchResult {
-						from_account.free = from_account.free.checked_sub(&value)
+						from_account.free = from_account
+							.free
+							.checked_sub(&value)
 							.ok_or(Error::<T, I>::InsufficientBalance)?;
 
 						// NOTE: total stake being stored in the same type means that this could never overflow
 						// but better to be safe than sorry.
-						to_account.free = to_account.free.checked_add(&value).ok_or(ArithmeticError::Overflow)?;
+						to_account.free =
+							to_account.free.checked_add(&value).ok_or(ArithmeticError::Overflow)?;
 
 						let ed = T::ExistentialDeposit::get();
 						ensure!(to_account.total() >= ed, Error::<T, I>::ExistentialDeposit);
@@ -1411,18 +1477,24 @@ impl<T: Config<I>, I: 'static> Currency<T::AccountId> for Pallet<T, I> where
 							value,
 							WithdrawReasons::TRANSFER,
 							from_account.free,
-						).map_err(|_| Error::<T, I>::LiquidityRestrictions)?;
+						)
+						.map_err(|_| Error::<T, I>::LiquidityRestrictions)?;
 
 						// TODO: This is over-conservative. There may now be other providers, and this pallet
 						//   may not even be a provider.
 						let allow_death = existence_requirement == ExistenceRequirement::AllowDeath;
-						let allow_death = allow_death && !system::Pallet::<T>::is_provider_required(transactor);
-						ensure!(allow_death || from_account.total() >= ed, Error::<T, I>::KeepAlive);
+						let allow_death =
+							allow_death && !system::Pallet::<T>::is_provider_required(transactor);
+						ensure!(
+							allow_death || from_account.total() >= ed,
+							Error::<T, I>::KeepAlive
+						);
 
 						Ok(())
-					}
-				).map(|(_, maybe_dust_cleaner)| maybe_dust_cleaner)
-			}
+					},
+				)
+				.map(|(_, maybe_dust_cleaner)| maybe_dust_cleaner)
+			},
 		)?;
 
 		// Emit transfer event.
@@ -1440,23 +1512,30 @@ impl<T: Config<I>, I: 'static> Currency<T::AccountId> for Pallet<T, I> where
 	/// from in extreme circumstances. `can_slash()` should be used prior to `slash()` to avoid having
 	/// to draw from reserved funds, however we err on the side of punishment if things are inconsistent
 	/// or `can_slash` wasn't used appropriately.
-	fn slash(
-		who: &T::AccountId,
-		value: Self::Balance
-	) -> (Self::NegativeImbalance, Self::Balance) {
-		if value.is_zero() { return (NegativeImbalance::zero(), Zero::zero()) }
-		if Self::total_balance(&who).is_zero() { return (NegativeImbalance::zero(), value) }
+	fn slash(who: &T::AccountId, value: Self::Balance) -> (Self::NegativeImbalance, Self::Balance) {
+		if value.is_zero() {
+			return (NegativeImbalance::zero(), Zero::zero())
+		}
+		if Self::total_balance(&who).is_zero() {
+			return (NegativeImbalance::zero(), value)
+		}
 
 		for attempt in 0..2 {
-			match Self::try_mutate_account(who,
-				|account, _is_new| -> Result<(Self::NegativeImbalance, Self::Balance), DispatchError> {
+			match Self::try_mutate_account(
+				who,
+				|account,
+				 _is_new|
+				 -> Result<(Self::NegativeImbalance, Self::Balance), DispatchError> {
 					// Best value is the most amount we can slash following liveness rules.
 					let best_value = match attempt {
 						// First attempt we try to slash the full amount, and see if liveness issues happen.
 						0 => value,
 						// If acting as a critical provider (i.e. first attempt failed), then slash
 						// as much as possible while leaving at least at ED.
-						_ => value.min((account.free + account.reserved).saturating_sub(T::ExistentialDeposit::get())),
+						_ => value.min(
+							(account.free + account.reserved)
+								.saturating_sub(T::ExistentialDeposit::get()),
+						),
 					};
 
 					let free_slash = cmp::min(account.free, best_value);
@@ -1469,7 +1548,7 @@ impl<T: Config<I>, I: 'static> Currency<T::AccountId> for Pallet<T, I> where
 						account.reserved -= reserved_slash; // Safe because of above check
 						Ok((
 							NegativeImbalance::new(free_slash + reserved_slash),
-							value - free_slash - reserved_slash, // Safe because value is gt or eq total slashed
+							value - free_slash - reserved_slash, /* Safe because value is gt or eq total slashed */
 						))
 					} else {
 						// Else we are done!
@@ -1478,7 +1557,7 @@ impl<T: Config<I>, I: 'static> Currency<T::AccountId> for Pallet<T, I> where
 							value - free_slash, // Safe because value is gt or eq to total slashed
 						))
 					}
-				}
+				},
 			) {
 				Ok(r) => return r,
 				Err(_) => (),
@@ -1494,15 +1573,20 @@ impl<T: Config<I>, I: 'static> Currency<T::AccountId> for Pallet<T, I> where
 	/// Is a no-op if the `value` to be deposited is zero.
 	fn deposit_into_existing(
 		who: &T::AccountId,
-		value: Self::Balance
+		value: Self::Balance,
 	) -> Result<Self::PositiveImbalance, DispatchError> {
-		if value.is_zero() { return Ok(PositiveImbalance::zero()) }
+		if value.is_zero() {
+			return Ok(PositiveImbalance::zero())
+		}
 
-		Self::try_mutate_account(who, |account, is_new| -> Result<Self::PositiveImbalance, DispatchError> {
-			ensure!(!is_new, Error::<T, I>::DeadAccount);
-			account.free = account.free.checked_add(&value).ok_or(ArithmeticError::Overflow)?;
-			Ok(PositiveImbalance::new(value))
-		})
+		Self::try_mutate_account(
+			who,
+			|account, is_new| -> Result<Self::PositiveImbalance, DispatchError> {
+				ensure!(!is_new, Error::<T, I>::DeadAccount);
+				account.free = account.free.checked_add(&value).ok_or(ArithmeticError::Overflow)?;
+				Ok(PositiveImbalance::new(value))
+			},
+		)
 	}
 
 	/// Deposit some `value` into the free balance of `who`, possibly creating a new account.
@@ -1512,26 +1596,28 @@ impl<T: Config<I>, I: 'static> Currency<T::AccountId> for Pallet<T, I> where
 	/// - the `value` to be deposited is less than the required ED and the account does not yet exist; or
 	/// - the deposit would necessitate the account to exist and there are no provider references; or
 	/// - `value` is so large it would cause the balance of `who` to overflow.
-	fn deposit_creating(
-		who: &T::AccountId,
-		value: Self::Balance,
-	) -> Self::PositiveImbalance {
-		if value.is_zero() { return Self::PositiveImbalance::zero() }
-
-		let r = Self::try_mutate_account(who, |account, is_new| -> Result<Self::PositiveImbalance, DispatchError> {
-
-			let ed = T::ExistentialDeposit::get();
-			ensure!(value >= ed || !is_new, Error::<T, I>::ExistentialDeposit);
+	fn deposit_creating(who: &T::AccountId, value: Self::Balance) -> Self::PositiveImbalance {
+		if value.is_zero() {
+			return Self::PositiveImbalance::zero()
+		}
 
-			// defensive only: overflow should never happen, however in case it does, then this
-			// operation is a no-op.
-			account.free = match account.free.checked_add(&value) {
-				Some(x) => x,
-				None => return Ok(Self::PositiveImbalance::zero()),
-			};
+		let r = Self::try_mutate_account(
+			who,
+			|account, is_new| -> Result<Self::PositiveImbalance, DispatchError> {
+				let ed = T::ExistentialDeposit::get();
+				ensure!(value >= ed || !is_new, Error::<T, I>::ExistentialDeposit);
+
+				// defensive only: overflow should never happen, however in case it does, then this
+				// operation is a no-op.
+				account.free = match account.free.checked_add(&value) {
+					Some(x) => x,
+					None => return Ok(Self::PositiveImbalance::zero()),
+				};
 
-			Ok(PositiveImbalance::new(value))
-		}).unwrap_or_else(|_| Self::PositiveImbalance::zero());
+				Ok(PositiveImbalance::new(value))
+			},
+		)
+		.unwrap_or_else(|_| Self::PositiveImbalance::zero());
 
 		r
 	}
@@ -1545,70 +1631,79 @@ impl<T: Config<I>, I: 'static> Currency<T::AccountId> for Pallet<T, I> where
 		reasons: WithdrawReasons,
 		liveness: ExistenceRequirement,
 	) -> result::Result<Self::NegativeImbalance, DispatchError> {
-		if value.is_zero() { return Ok(NegativeImbalance::zero()); }
+		if value.is_zero() {
+			return Ok(NegativeImbalance::zero())
+		}
 
-		Self::try_mutate_account(who, |account, _|
-			-> Result<Self::NegativeImbalance, DispatchError>
-		{
-			let new_free_account = account.free.checked_sub(&value)
-				.ok_or(Error::<T, I>::InsufficientBalance)?;
+		Self::try_mutate_account(
+			who,
+			|account, _| -> Result<Self::NegativeImbalance, DispatchError> {
+				let new_free_account =
+					account.free.checked_sub(&value).ok_or(Error::<T, I>::InsufficientBalance)?;
 
-			// bail if we need to keep the account alive and this would kill it.
-			let ed = T::ExistentialDeposit::get();
-			let would_be_dead = new_free_account + account.reserved < ed;
-			let would_kill = would_be_dead && account.free + account.reserved >= ed;
-			ensure!(liveness == AllowDeath || !would_kill, Error::<T, I>::KeepAlive);
+				// bail if we need to keep the account alive and this would kill it.
+				let ed = T::ExistentialDeposit::get();
+				let would_be_dead = new_free_account + account.reserved < ed;
+				let would_kill = would_be_dead && account.free + account.reserved >= ed;
+				ensure!(liveness == AllowDeath || !would_kill, Error::<T, I>::KeepAlive);
 
-			Self::ensure_can_withdraw(who, value, reasons, new_free_account)?;
+				Self::ensure_can_withdraw(who, value, reasons, new_free_account)?;
 
-			account.free = new_free_account;
+				account.free = new_free_account;
 
-			Ok(NegativeImbalance::new(value))
-		})
+				Ok(NegativeImbalance::new(value))
+			},
+		)
 	}
 
 	/// Force the new free balance of a target account `who` to some new value `balance`.
-	fn make_free_balance_be(who: &T::AccountId, value: Self::Balance)
-		-> SignedImbalance<Self::Balance, Self::PositiveImbalance>
-	{
-		Self::try_mutate_account(who, |account, is_new|
-			-> Result<SignedImbalance<Self::Balance, Self::PositiveImbalance>, DispatchError>
-		{
-			let ed = T::ExistentialDeposit::get();
-			let total = value.saturating_add(account.reserved);
-			// If we're attempting to set an existing account to less than ED, then
-			// bypass the entire operation. It's a no-op if you follow it through, but
-			// since this is an instance where we might account for a negative imbalance
-			// (in the dust cleaner of set_account) before we account for its actual
-			// equal and opposite cause (returned as an Imbalance), then in the
-			// instance that there's no other accounts on the system at all, we might
-			// underflow the issuance and our arithmetic will be off.
-			ensure!(total >= ed || !is_new, Error::<T, I>::ExistentialDeposit);
-
-			let imbalance = if account.free <= value {
-				SignedImbalance::Positive(PositiveImbalance::new(value - account.free))
-			} else {
-				SignedImbalance::Negative(NegativeImbalance::new(account.free - value))
-			};
-			account.free = value;
-			Ok(imbalance)
-		}).unwrap_or_else(|_| SignedImbalance::Positive(Self::PositiveImbalance::zero()))
+	fn make_free_balance_be(
+		who: &T::AccountId,
+		value: Self::Balance,
+	) -> SignedImbalance<Self::Balance, Self::PositiveImbalance> {
+		Self::try_mutate_account(
+			who,
+			|account,
+			 is_new|
+			 -> Result<SignedImbalance<Self::Balance, Self::PositiveImbalance>, DispatchError> {
+				let ed = T::ExistentialDeposit::get();
+				let total = value.saturating_add(account.reserved);
+				// If we're attempting to set an existing account to less than ED, then
+				// bypass the entire operation. It's a no-op if you follow it through, but
+				// since this is an instance where we might account for a negative imbalance
+				// (in the dust cleaner of set_account) before we account for its actual
+				// equal and opposite cause (returned as an Imbalance), then in the
+				// instance that there's no other accounts on the system at all, we might
+				// underflow the issuance and our arithmetic will be off.
+				ensure!(total >= ed || !is_new, Error::<T, I>::ExistentialDeposit);
+
+				let imbalance = if account.free <= value {
+					SignedImbalance::Positive(PositiveImbalance::new(value - account.free))
+				} else {
+					SignedImbalance::Negative(NegativeImbalance::new(account.free - value))
+				};
+				account.free = value;
+				Ok(imbalance)
+			},
+		)
+		.unwrap_or_else(|_| SignedImbalance::Positive(Self::PositiveImbalance::zero()))
 	}
 }
 
-impl<T: Config<I>, I: 'static> ReservableCurrency<T::AccountId> for Pallet<T, I>  where
-	T::Balance: MaybeSerializeDeserialize + Debug
+impl<T: Config<I>, I: 'static> ReservableCurrency<T::AccountId> for Pallet<T, I>
+where
+	T::Balance: MaybeSerializeDeserialize + Debug,
 {
 	/// Check if `who` can reserve `value` from their free balance.
 	///
 	/// Always `true` if value to be reserved is zero.
 	fn can_reserve(who: &T::AccountId, value: Self::Balance) -> bool {
-		if value.is_zero() { return true }
-		Self::account(who).free
-			.checked_sub(&value)
-			.map_or(false, |new_balance|
-				Self::ensure_can_withdraw(who, value, WithdrawReasons::RESERVE, new_balance).is_ok()
-			)
+		if value.is_zero() {
+			return true
+		}
+		Self::account(who).free.checked_sub(&value).map_or(false, |new_balance| {
+			Self::ensure_can_withdraw(who, value, WithdrawReasons::RESERVE, new_balance).is_ok()
+		})
 	}
 
 	fn reserved_balance(who: &T::AccountId) -> Self::Balance {
@@ -1619,11 +1714,15 @@ impl<T: Config<I>, I: 'static> ReservableCurrency<T::AccountId> for Pallet<T, I>
 	///
 	/// Is a no-op if value to be reserved is zero.
 	fn reserve(who: &T::AccountId, value: Self::Balance) -> DispatchResult {
-		if value.is_zero() { return Ok(()) }
+		if value.is_zero() {
+			return Ok(())
+		}
 
 		Self::try_mutate_account(who, |account, _| -> DispatchResult {
-			account.free = account.free.checked_sub(&value).ok_or(Error::<T, I>::InsufficientBalance)?;
-			account.reserved = account.reserved.checked_add(&value).ok_or(ArithmeticError::Overflow)?;
+			account.free =
+				account.free.checked_sub(&value).ok_or(Error::<T, I>::InsufficientBalance)?;
+			account.reserved =
+				account.reserved.checked_add(&value).ok_or(ArithmeticError::Overflow)?;
 			Self::ensure_can_withdraw(&who, value.clone(), WithdrawReasons::RESERVE, account.free)
 		})?;
 
@@ -1635,8 +1734,12 @@ impl<T: Config<I>, I: 'static> ReservableCurrency<T::AccountId> for Pallet<T, I>
 	///
 	/// Is a no-op if the value to be unreserved is zero or the account does not exist.
 	fn unreserve(who: &T::AccountId, value: Self::Balance) -> Self::Balance {
-		if value.is_zero() { return Zero::zero() }
-		if Self::total_balance(&who).is_zero() { return value }
+		if value.is_zero() {
+			return Zero::zero()
+		}
+		if Self::total_balance(&who).is_zero() {
+			return value
+		}
 
 		let actual = match Self::mutate_account(who, |account| {
 			let actual = cmp::min(account.reserved, value);
@@ -1652,7 +1755,7 @@ impl<T: Config<I>, I: 'static> ReservableCurrency<T::AccountId> for Pallet<T, I>
 				// If it ever does, then we should fail gracefully though, indicating that nothing
 				// could be done.
 				return value
-			}
+			},
 		};
 
 		Self::deposit_event(Event::Unreserved(who.clone(), actual.clone()));
@@ -1665,10 +1768,14 @@ impl<T: Config<I>, I: 'static> ReservableCurrency<T::AccountId> for Pallet<T, I>
 	/// Is a no-op if the value to be slashed is zero or the account does not exist.
 	fn slash_reserved(
 		who: &T::AccountId,
-		value: Self::Balance
+		value: Self::Balance,
 	) -> (Self::NegativeImbalance, Self::Balance) {
-		if value.is_zero() { return (NegativeImbalance::zero(), Zero::zero()) }
-		if Self::total_balance(&who).is_zero() { return (NegativeImbalance::zero(), value) }
+		if value.is_zero() {
+			return (NegativeImbalance::zero(), Zero::zero())
+		}
+		if Self::total_balance(&who).is_zero() {
+			return (NegativeImbalance::zero(), value)
+		}
 
 		// NOTE: `mutate_account` may fail if it attempts to reduce the balance to the point that an
 		//   account is attempted to be illegally destroyed.
@@ -1679,7 +1786,10 @@ impl<T: Config<I>, I: 'static> ReservableCurrency<T::AccountId> for Pallet<T, I>
 					0 => value,
 					// If acting as a critical provider (i.e. first attempt failed), then ensure
 					// slash leaves at least the ED.
-					_ => value.min((account.free + account.reserved).saturating_sub(T::ExistentialDeposit::get())),
+					_ => value.min(
+						(account.free + account.reserved)
+							.saturating_sub(T::ExistentialDeposit::get()),
+					),
 				};
 
 				let actual = cmp::min(account.reserved, best_value);
@@ -1713,8 +1823,9 @@ impl<T: Config<I>, I: 'static> ReservableCurrency<T::AccountId> for Pallet<T, I>
 	}
 }
 
-impl<T: Config<I>, I: 'static> NamedReservableCurrency<T::AccountId> for Pallet<T, I>  where
-	T::Balance: MaybeSerializeDeserialize + Debug
+impl<T: Config<I>, I: 'static> NamedReservableCurrency<T::AccountId> for Pallet<T, I>
+where
+	T::Balance: MaybeSerializeDeserialize + Debug,
 {
 	type ReserveIdentifier = T::ReserveIdentifier;
 
@@ -1729,8 +1840,14 @@ impl<T: Config<I>, I: 'static> NamedReservableCurrency<T::AccountId> for Pallet<
 	/// Move `value` from the free balance from `who` to a named reserve balance.
 	///
 	/// Is a no-op if value to be reserved is zero.
-	fn reserve_named(id: &Self::ReserveIdentifier, who: &T::AccountId, value: Self::Balance) -> DispatchResult {
-		if value.is_zero() { return Ok(()) }
+	fn reserve_named(
+		id: &Self::ReserveIdentifier,
+		who: &T::AccountId,
+		value: Self::Balance,
+	) -> DispatchResult {
+		if value.is_zero() {
+			return Ok(())
+		}
 
 		Reserves::<T, I>::try_mutate(who, |reserves| -> DispatchResult {
 			match reserves.binary_search_by_key(id, |data| data.id) {
@@ -1739,10 +1856,9 @@ impl<T: Config<I>, I: 'static> NamedReservableCurrency<T::AccountId> for Pallet<
 					reserves[index].amount = reserves[index].amount.saturating_add(value);
 				},
 				Err(index) => {
-					reserves.try_insert(index, ReserveData {
-						id: id.clone(),
-						amount: value
-					}).map_err(|_| Error::<T, I>::TooManyReserves)?;
+					reserves
+						.try_insert(index, ReserveData { id: id.clone(), amount: value })
+						.map_err(|_| Error::<T, I>::TooManyReserves)?;
 				},
 			};
 			<Self as ReservableCurrency<_>>::reserve(who, value)?;
@@ -1753,8 +1869,14 @@ impl<T: Config<I>, I: 'static> NamedReservableCurrency<T::AccountId> for Pallet<
 	/// Unreserve some funds, returning any amount that was unable to be unreserved.
 	///
 	/// Is a no-op if the value to be unreserved is zero.
-	fn unreserve_named(id: &Self::ReserveIdentifier, who: &T::AccountId, value: Self::Balance) -> Self::Balance {
-		if value.is_zero() { return Zero::zero() }
+	fn unreserve_named(
+		id: &Self::ReserveIdentifier,
+		who: &T::AccountId,
+		value: Self::Balance,
+	) -> Self::Balance {
+		if value.is_zero() {
+			return Zero::zero()
+		}
 
 		Reserves::<T, I>::mutate_exists(who, |maybe_reserves| -> Self::Balance {
 			if let Some(reserves) = maybe_reserves.as_mut() {
@@ -1782,9 +1904,7 @@ impl<T: Config<I>, I: 'static> NamedReservableCurrency<T::AccountId> for Pallet<
 
 						value - actual
 					},
-					Err(_) => {
-						value
-					},
+					Err(_) => value,
 				}
 			} else {
 				value
@@ -1799,16 +1919,19 @@ impl<T: Config<I>, I: 'static> NamedReservableCurrency<T::AccountId> for Pallet<
 	fn slash_reserved_named(
 		id: &Self::ReserveIdentifier,
 		who: &T::AccountId,
-		value: Self::Balance
+		value: Self::Balance,
 	) -> (Self::NegativeImbalance, Self::Balance) {
-		if value.is_zero() { return (NegativeImbalance::zero(), Zero::zero()) }
+		if value.is_zero() {
+			return (NegativeImbalance::zero(), Zero::zero())
+		}
 
 		Reserves::<T, I>::mutate(who, |reserves| -> (Self::NegativeImbalance, Self::Balance) {
 			match reserves.binary_search_by_key(id, |data| data.id) {
 				Ok(index) => {
 					let to_change = cmp::min(reserves[index].amount, value);
 
-					let (imb, remain) = <Self as ReservableCurrency<_>>::slash_reserved(who, to_change);
+					let (imb, remain) =
+						<Self as ReservableCurrency<_>>::slash_reserved(who, to_change);
 
 					// remain should always be zero but just to be defensive here
 					let actual = to_change.saturating_sub(remain);
@@ -1818,9 +1941,7 @@ impl<T: Config<I>, I: 'static> NamedReservableCurrency<T::AccountId> for Pallet<
 
 					(imb, value - actual)
 				},
-				Err(_) => {
-					(NegativeImbalance::zero(), value)
-				},
+				Err(_) => (NegativeImbalance::zero(), value),
 			}
 		})
 	}
@@ -1838,13 +1959,16 @@ impl<T: Config<I>, I: 'static> NamedReservableCurrency<T::AccountId> for Pallet<
 		value: Self::Balance,
 		status: Status,
 	) -> Result<Self::Balance, DispatchError> {
-		if value.is_zero() { return Ok(Zero::zero()) }
+		if value.is_zero() {
+			return Ok(Zero::zero())
+		}
 
 		if slashed == beneficiary {
 			return match status {
 				Status::Free => Ok(Self::unreserve_named(id, slashed, value)),
-				Status::Reserved => Ok(value.saturating_sub(Self::reserved_balance_named(id, slashed))),
-			};
+				Status::Reserved =>
+					Ok(value.saturating_sub(Self::reserved_balance_named(id, slashed))),
+			}
 		}
 
 		Reserves::<T, I>::try_mutate(slashed, |reserves| -> Result<Self::Balance, DispatchError> {
@@ -1854,36 +1978,59 @@ impl<T: Config<I>, I: 'static> NamedReservableCurrency<T::AccountId> for Pallet<
 
 					let actual = if status == Status::Reserved {
 						// make it the reserved under same identifier
-						Reserves::<T, I>::try_mutate(beneficiary, |reserves| -> Result<T::Balance, DispatchError> {
-							match reserves.binary_search_by_key(id, |data| data.id) {
-								Ok(index) => {
-									let remain = <Self as ReservableCurrency<_>>::repatriate_reserved(slashed, beneficiary, to_change, status)?;
-
-									// remain should always be zero but just to be defensive here
-									let actual = to_change.saturating_sub(remain);
-
-									// this add can't overflow but just to be defensive.
-									reserves[index].amount = reserves[index].amount.saturating_add(actual);
-
-									Ok(actual)
-								},
-								Err(index) => {
-									let remain = <Self as ReservableCurrency<_>>::repatriate_reserved(slashed, beneficiary, to_change, status)?;
-
-									// remain should always be zero but just to be defensive here
-									let actual = to_change.saturating_sub(remain);
-
-									reserves.try_insert(index, ReserveData {
-										id: id.clone(),
-										amount: actual
-									}).map_err(|_| Error::<T, I>::TooManyReserves)?;
-
-									Ok(actual)
-								},
-							}
-						})?
+						Reserves::<T, I>::try_mutate(
+							beneficiary,
+							|reserves| -> Result<T::Balance, DispatchError> {
+								match reserves.binary_search_by_key(id, |data| data.id) {
+									Ok(index) => {
+										let remain =
+											<Self as ReservableCurrency<_>>::repatriate_reserved(
+												slashed,
+												beneficiary,
+												to_change,
+												status,
+											)?;
+
+										// remain should always be zero but just to be defensive here
+										let actual = to_change.saturating_sub(remain);
+
+										// this add can't overflow but just to be defensive.
+										reserves[index].amount =
+											reserves[index].amount.saturating_add(actual);
+
+										Ok(actual)
+									},
+									Err(index) => {
+										let remain =
+											<Self as ReservableCurrency<_>>::repatriate_reserved(
+												slashed,
+												beneficiary,
+												to_change,
+												status,
+											)?;
+
+										// remain should always be zero but just to be defensive here
+										let actual = to_change.saturating_sub(remain);
+
+										reserves
+											.try_insert(
+												index,
+												ReserveData { id: id.clone(), amount: actual },
+											)
+											.map_err(|_| Error::<T, I>::TooManyReserves)?;
+
+										Ok(actual)
+									},
+								}
+							},
+						)?
 					} else {
-						let remain = <Self as ReservableCurrency<_>>::repatriate_reserved(slashed, beneficiary, to_change, status)?;
+						let remain = <Self as ReservableCurrency<_>>::repatriate_reserved(
+							slashed,
+							beneficiary,
+							to_change,
+							status,
+						)?;
 
 						// remain should always be zero but just to be defensive here
 						to_change.saturating_sub(remain)
@@ -1894,9 +2041,7 @@ impl<T: Config<I>, I: 'static> NamedReservableCurrency<T::AccountId> for Pallet<
 
 					Ok(value - actual)
 				},
-				Err(_) => {
-					Ok(value)
-				},
+				Err(_) => Ok(value),
 			}
 		})
 	}
@@ -1904,7 +2049,7 @@ impl<T: Config<I>, I: 'static> NamedReservableCurrency<T::AccountId> for Pallet<
 
 impl<T: Config<I>, I: 'static> LockableCurrency<T::AccountId> for Pallet<T, I>
 where
-	T::Balance: MaybeSerializeDeserialize + Debug
+	T::Balance: MaybeSerializeDeserialize + Debug,
 {
 	type Moment = T::BlockNumber;
 
@@ -1918,9 +2063,12 @@ where
 		amount: T::Balance,
 		reasons: WithdrawReasons,
 	) {
-		if amount.is_zero() || reasons.is_empty() { return }
+		if amount.is_zero() || reasons.is_empty() {
+			return
+		}
 		let mut new_lock = Some(BalanceLock { id, amount, reasons: reasons.into() });
-		let mut locks = Self::locks(who).into_iter()
+		let mut locks = Self::locks(who)
+			.into_iter()
 			.filter_map(|l| if l.id == id { new_lock.take() } else { Some(l) })
 			.collect::<Vec<_>>();
 		if let Some(lock) = new_lock {
@@ -1937,30 +2085,31 @@ where
 		amount: T::Balance,
 		reasons: WithdrawReasons,
 	) {
-		if amount.is_zero() || reasons.is_empty() { return }
+		if amount.is_zero() || reasons.is_empty() {
+			return
+		}
 		let mut new_lock = Some(BalanceLock { id, amount, reasons: reasons.into() });
-		let mut locks = Self::locks(who).into_iter().filter_map(|l|
-			if l.id == id {
-				new_lock.take().map(|nl| {
-					BalanceLock {
+		let mut locks = Self::locks(who)
+			.into_iter()
+			.filter_map(|l| {
+				if l.id == id {
+					new_lock.take().map(|nl| BalanceLock {
 						id: l.id,
 						amount: l.amount.max(nl.amount),
 						reasons: l.reasons | nl.reasons,
-					}
-				})
-			} else {
-				Some(l)
-			}).collect::<Vec<_>>();
+					})
+				} else {
+					Some(l)
+				}
+			})
+			.collect::<Vec<_>>();
 		if let Some(lock) = new_lock {
 			locks.push(lock)
 		}
 		Self::update_locks(who, &locks[..]);
 	}
 
-	fn remove_lock(
-		id: LockIdentifier,
-		who: &T::AccountId,
-	) {
+	fn remove_lock(id: LockIdentifier, who: &T::AccountId) {
 		let mut locks = Self::locks(who);
 		locks.retain(|l| l.id != id);
 		Self::update_locks(who, &locks[..]);
diff --git a/frame/balances/src/tests_composite.rs b/frame/balances/src/tests_composite.rs
index 1d90b3e70b92..e2d50e8b88aa 100644
--- a/frame/balances/src/tests_composite.rs
+++ b/frame/balances/src/tests_composite.rs
@@ -19,19 +19,15 @@
 
 #![cfg(test)]
 
-use sp_runtime::{
-	traits::IdentityLookup,
-	testing::Header,
+use crate::{self as pallet_balances, decl_tests, Config, Pallet};
+use frame_support::{
+	parameter_types,
+	weights::{DispatchInfo, IdentityFee, Weight},
 };
+use pallet_transaction_payment::CurrencyAdapter;
 use sp_core::H256;
 use sp_io;
-use frame_support::parameter_types;
-use frame_support::weights::{Weight, DispatchInfo, IdentityFee};
-use pallet_transaction_payment::CurrencyAdapter;
-use crate::{
-	self as pallet_balances,
-	Pallet, Config, decl_tests,
-};
+use sp_runtime::{testing::Header, traits::IdentityLookup};
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
@@ -110,10 +106,7 @@ pub struct ExtBuilder {
 }
 impl Default for ExtBuilder {
 	fn default() -> Self {
-		Self {
-			existential_deposit: 1,
-			monied: false,
-		}
+		Self { existential_deposit: 1, monied: false }
 	}
 }
 impl ExtBuilder {
@@ -138,12 +131,14 @@ impl ExtBuilder {
 					(2, 20 * self.existential_deposit),
 					(3, 30 * self.existential_deposit),
 					(4, 40 * self.existential_deposit),
-					(12, 10 * self.existential_deposit)
+					(12, 10 * self.existential_deposit),
 				]
 			} else {
 				vec![]
 			},
-		}.assimilate_storage(&mut t).unwrap();
+		}
+		.assimilate_storage(&mut t)
+		.unwrap();
 
 		let mut ext = sp_io::TestExternalities::new(t);
 		ext.execute_with(|| System::set_block_number(1));
@@ -151,4 +146,4 @@ impl ExtBuilder {
 	}
 }
 
-decl_tests!{ Test, ExtBuilder, EXISTENTIAL_DEPOSIT }
+decl_tests! { Test, ExtBuilder, EXISTENTIAL_DEPOSIT }
diff --git a/frame/balances/src/tests_local.rs b/frame/balances/src/tests_local.rs
index 36351252b445..668c335376c6 100644
--- a/frame/balances/src/tests_local.rs
+++ b/frame/balances/src/tests_local.rs
@@ -19,20 +19,16 @@
 
 #![cfg(test)]
 
-use sp_runtime::{
-	traits::IdentityLookup,
-	testing::Header,
+use crate::{self as pallet_balances, decl_tests, Config, Pallet};
+use frame_support::{
+	parameter_types,
+	traits::StorageMapShim,
+	weights::{DispatchInfo, IdentityFee, Weight},
 };
+use pallet_transaction_payment::CurrencyAdapter;
 use sp_core::H256;
 use sp_io;
-use frame_support::parameter_types;
-use frame_support::traits::StorageMapShim;
-use frame_support::weights::{Weight, DispatchInfo, IdentityFee};
-use crate::{
-	self as pallet_balances,
-	Pallet, Config, decl_tests,
-};
-use pallet_transaction_payment::CurrencyAdapter;
+use sp_runtime::{testing::Header, traits::IdentityLookup};
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -98,12 +94,8 @@ impl Config for Test {
 	type DustRemoval = ();
 	type Event = Event;
 	type ExistentialDeposit = ExistentialDeposit;
-	type AccountStore = StorageMapShim<
-		super::Account<Test>,
-		system::Provider<Test>,
-		u64,
-		super::AccountData<u64>,
-	>;
+	type AccountStore =
+		StorageMapShim<super::Account<Test>, system::Provider<Test>, u64, super::AccountData<u64>>;
 	type MaxLocks = MaxLocks;
 	type MaxReserves = MaxReserves;
 	type ReserveIdentifier = [u8; 8];
@@ -116,10 +108,7 @@ pub struct ExtBuilder {
 }
 impl Default for ExtBuilder {
 	fn default() -> Self {
-		Self {
-			existential_deposit: 1,
-			monied: false,
-		}
+		Self { existential_deposit: 1, monied: false }
 	}
 }
 impl ExtBuilder {
@@ -147,12 +136,14 @@ impl ExtBuilder {
 					(2, 20 * self.existential_deposit),
 					(3, 30 * self.existential_deposit),
 					(4, 40 * self.existential_deposit),
-					(12, 10 * self.existential_deposit)
+					(12, 10 * self.existential_deposit),
 				]
 			} else {
 				vec![]
 			},
-		}.assimilate_storage(&mut t).unwrap();
+		}
+		.assimilate_storage(&mut t)
+		.unwrap();
 
 		let mut ext = sp_io::TestExternalities::new(t);
 		ext.execute_with(|| System::set_block_number(1));
@@ -160,40 +151,37 @@ impl ExtBuilder {
 	}
 }
 
-decl_tests!{ Test, ExtBuilder, EXISTENTIAL_DEPOSIT }
+decl_tests! { Test, ExtBuilder, EXISTENTIAL_DEPOSIT }
 
 #[test]
 fn emit_events_with_no_existential_deposit_suicide_with_dust() {
-	<ExtBuilder>::default()
-		.existential_deposit(2)
-		.build()
-		.execute_with(|| {
-			assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 1, 100, 0));
-
-			assert_eq!(
-				events(),
-				[
-					Event::System(system::Event::NewAccount(1)),
-					Event::Balances(crate::Event::Endowed(1, 100)),
-					Event::Balances(crate::Event::BalanceSet(1, 100, 0)),
-				]
-			);
-
-			let res = Balances::slash(&1, 98);
-			assert_eq!(res, (NegativeImbalance::new(98), 0));
-
-			// no events
-			assert_eq!(events(), []);
-
-			let res = Balances::slash(&1, 1);
-			assert_eq!(res, (NegativeImbalance::new(1), 0));
-
-			assert_eq!(
-				events(),
-				[
-					Event::System(system::Event::KilledAccount(1)),
-					Event::Balances(crate::Event::DustLost(1, 1)),
-				]
-			);
-		});
+	<ExtBuilder>::default().existential_deposit(2).build().execute_with(|| {
+		assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 1, 100, 0));
+
+		assert_eq!(
+			events(),
+			[
+				Event::System(system::Event::NewAccount(1)),
+				Event::Balances(crate::Event::Endowed(1, 100)),
+				Event::Balances(crate::Event::BalanceSet(1, 100, 0)),
+			]
+		);
+
+		let res = Balances::slash(&1, 98);
+		assert_eq!(res, (NegativeImbalance::new(98), 0));
+
+		// no events
+		assert_eq!(events(), []);
+
+		let res = Balances::slash(&1, 1);
+		assert_eq!(res, (NegativeImbalance::new(1), 0));
+
+		assert_eq!(
+			events(),
+			[
+				Event::System(system::Event::KilledAccount(1)),
+				Event::Balances(crate::Event::DustLost(1, 1)),
+			]
+		);
+	});
 }
diff --git a/frame/balances/src/tests_reentrancy.rs b/frame/balances/src/tests_reentrancy.rs
index 2a3a60dfde84..8682949b2c55 100644
--- a/frame/balances/src/tests_reentrancy.rs
+++ b/frame/balances/src/tests_reentrancy.rs
@@ -19,27 +19,17 @@
 
 #![cfg(test)]
 
-use sp_runtime::{
-	traits::IdentityLookup,
-	testing::Header,
-};
+use crate::{self as pallet_balances, Config, Pallet};
+use frame_support::{parameter_types, traits::StorageMapShim, weights::IdentityFee};
+use pallet_transaction_payment::CurrencyAdapter;
 use sp_core::H256;
 use sp_io;
-use frame_support::parameter_types;
-use frame_support::traits::StorageMapShim;
-use frame_support::weights::{IdentityFee};
-use crate::{
-	self as pallet_balances,
-	Pallet, Config,
-};
-use pallet_transaction_payment::CurrencyAdapter;
+use sp_runtime::{testing::Header, traits::IdentityLookup};
 
 use crate::*;
 use frame_support::{
 	assert_ok,
-	traits::{
-		Currency, ReservableCurrency,
-	}
+	traits::{Currency, ReservableCurrency},
 };
 use frame_system::RawOrigin;
 
@@ -113,12 +103,8 @@ impl Config for Test {
 	type DustRemoval = OnDustRemoval;
 	type Event = Event;
 	type ExistentialDeposit = ExistentialDeposit;
-	type AccountStore = StorageMapShim<
-		super::Account<Test>,
-		system::Provider<Test>,
-		u64,
-		super::AccountData<u64>,
-	>;
+	type AccountStore =
+		StorageMapShim<super::Account<Test>, system::Provider<Test>, u64, super::AccountData<u64>>;
 	type MaxLocks = MaxLocks;
 	type MaxReserves = MaxReserves;
 	type ReserveIdentifier = [u8; 8];
@@ -130,13 +116,10 @@ pub struct ExtBuilder {
 }
 impl Default for ExtBuilder {
 	fn default() -> Self {
-		Self {
-			existential_deposit: 1,
-		}
+		Self { existential_deposit: 1 }
 	}
 }
 impl ExtBuilder {
-
 	pub fn existential_deposit(mut self, existential_deposit: u64) -> Self {
 		self.existential_deposit = existential_deposit;
 		self
@@ -149,9 +132,9 @@ impl ExtBuilder {
 	pub fn build(self) -> sp_io::TestExternalities {
 		self.set_associated_consts();
 		let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-		pallet_balances::GenesisConfig::<Test> {
-			balances: vec![],
-		}.assimilate_storage(&mut t).unwrap();
+		pallet_balances::GenesisConfig::<Test> { balances: vec![] }
+			.assimilate_storage(&mut t)
+			.unwrap();
 		let mut ext = sp_io::TestExternalities::new(t);
 		ext.execute_with(|| System::set_block_number(1));
 		ext
@@ -160,112 +143,103 @@ impl ExtBuilder {
 
 #[test]
 fn transfer_dust_removal_tst1_should_work() {
-	ExtBuilder::default()
-		.existential_deposit(100)
-		.build()
-		.execute_with(|| {
-			// Verification of reentrancy in dust removal
-			assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 1, 1000, 0));
-			assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 2, 500, 0));
-
-			// In this transaction, account 2 free balance
-			// drops below existential balance
-			// and dust balance is removed from account 2
-			assert_ok!(Balances::transfer(RawOrigin::Signed(2).into(), 3, 450));
-
-			// As expected dust balance is removed.
-			assert_eq!(Balances::free_balance(&2), 0);
-
-			// As expected beneficiary account 3
-			// received the transfered fund.
-			assert_eq!(Balances::free_balance(&3), 450);
-
-			// Dust balance is deposited to account 1
-			// during the process of dust removal.
-			assert_eq!(Balances::free_balance(&1), 1050);
-
-			// Verify the events
-			// Number of events expected is 8
-			assert_eq!(System::events().len(), 11);
-
-			System::assert_has_event(Event::Balances(crate::Event::Transfer(2, 3, 450)));
-			System::assert_has_event(Event::Balances(crate::Event::DustLost(2, 50)));
-		}
-	);
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		// Verification of reentrancy in dust removal
+		assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 1, 1000, 0));
+		assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 2, 500, 0));
+
+		// In this transaction, account 2 free balance
+		// drops below existential balance
+		// and dust balance is removed from account 2
+		assert_ok!(Balances::transfer(RawOrigin::Signed(2).into(), 3, 450));
+
+		// As expected dust balance is removed.
+		assert_eq!(Balances::free_balance(&2), 0);
+
+		// As expected beneficiary account 3
+		// received the transfered fund.
+		assert_eq!(Balances::free_balance(&3), 450);
+
+		// Dust balance is deposited to account 1
+		// during the process of dust removal.
+		assert_eq!(Balances::free_balance(&1), 1050);
+
+		// Verify the events
+		// Number of events expected is 8
+		assert_eq!(System::events().len(), 11);
+
+		System::assert_has_event(Event::Balances(crate::Event::Transfer(2, 3, 450)));
+		System::assert_has_event(Event::Balances(crate::Event::DustLost(2, 50)));
+	});
 }
 
 #[test]
 fn transfer_dust_removal_tst2_should_work() {
-	ExtBuilder::default()
-		.existential_deposit(100)
-		.build()
-		.execute_with(|| {
-			// Verification of reentrancy in dust removal
-			assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 1, 1000, 0));
-			assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 2, 500, 0));
-
-			// In this transaction, account 2 free balance
-			// drops below existential balance
-			// and dust balance is removed from account 2
-			assert_ok!(Balances::transfer(RawOrigin::Signed(2).into(), 1, 450));
-
-			// As expected dust balance is removed.
-			assert_eq!(Balances::free_balance(&2), 0);
-
-			// Dust balance is deposited to account 1
-			// during the process of dust removal.
-			assert_eq!(Balances::free_balance(&1), 1500);
-
-			// Verify the events
-			// Number of events expected is 8
-			assert_eq!(System::events().len(), 9);
-
-			System::assert_has_event(Event::Balances(crate::Event::Transfer(2, 1, 450)));
-			System::assert_has_event(Event::Balances(crate::Event::DustLost(2, 50)));
-		}
-	);
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		// Verification of reentrancy in dust removal
+		assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 1, 1000, 0));
+		assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 2, 500, 0));
+
+		// In this transaction, account 2 free balance
+		// drops below existential balance
+		// and dust balance is removed from account 2
+		assert_ok!(Balances::transfer(RawOrigin::Signed(2).into(), 1, 450));
+
+		// As expected dust balance is removed.
+		assert_eq!(Balances::free_balance(&2), 0);
+
+		// Dust balance is deposited to account 1
+		// during the process of dust removal.
+		assert_eq!(Balances::free_balance(&1), 1500);
+
+		// Verify the events
+		// Number of events expected is 8
+		assert_eq!(System::events().len(), 9);
+
+		System::assert_has_event(Event::Balances(crate::Event::Transfer(2, 1, 450)));
+		System::assert_has_event(Event::Balances(crate::Event::DustLost(2, 50)));
+	});
 }
 
 #[test]
 fn repatriating_reserved_balance_dust_removal_should_work() {
-	ExtBuilder::default()
-		.existential_deposit(100)
-		.build()
-		.execute_with(|| {
-			// Verification of reentrancy in dust removal
-			assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 1, 1000, 0));
-			assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 2, 500, 0));
-
-			// Reserve a value on account 2,
-			// Such that free balance is lower than
-			// Exestintial deposit.
-			assert_ok!(Balances::reserve(&2, 450));
-
-			// Transfer of reserved fund from slashed account 2 to
-			// beneficiary account 1
-			assert_ok!(Balances::repatriate_reserved(&2, &1, 450, Status::Free), 0);
-
-			// Since free balance of account 2 is lower than
-			// existential deposit, dust amount is
-			// removed from the account 2
-			assert_eq!(Balances::reserved_balance(2), 0);
-			assert_eq!(Balances::free_balance(2), 0);
-
-			// account 1 is credited with reserved amount
-			// together with dust balance during dust
-			// removal.
-			assert_eq!(Balances::reserved_balance(1), 0);
-			assert_eq!(Balances::free_balance(1), 1500);
-
-			// Verify the events
-			// Number of events expected is 10
-			assert_eq!(System::events().len(), 10);
-
-			System::assert_has_event(Event::Balances(
-				crate::Event::ReserveRepatriated(2, 1, 450, Status::Free),
-			));
-
-			System::assert_last_event(Event::Balances(crate::Event::DustLost(2, 50)));
-		}
-	);
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		// Verification of reentrancy in dust removal
+		assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 1, 1000, 0));
+		assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 2, 500, 0));
+
+		// Reserve a value on account 2,
+		// Such that free balance is lower than
+		// Exestintial deposit.
+		assert_ok!(Balances::reserve(&2, 450));
+
+		// Transfer of reserved fund from slashed account 2 to
+		// beneficiary account 1
+		assert_ok!(Balances::repatriate_reserved(&2, &1, 450, Status::Free), 0);
+
+		// Since free balance of account 2 is lower than
+		// existential deposit, dust amount is
+		// removed from the account 2
+		assert_eq!(Balances::reserved_balance(2), 0);
+		assert_eq!(Balances::free_balance(2), 0);
+
+		// account 1 is credited with reserved amount
+		// together with dust balance during dust
+		// removal.
+		assert_eq!(Balances::reserved_balance(1), 0);
+		assert_eq!(Balances::free_balance(1), 1500);
+
+		// Verify the events
+		// Number of events expected is 10
+		assert_eq!(System::events().len(), 10);
+
+		System::assert_has_event(Event::Balances(crate::Event::ReserveRepatriated(
+			2,
+			1,
+			450,
+			Status::Free,
+		)));
+
+		System::assert_last_event(Event::Balances(crate::Event::DustLost(2, 50)));
+	});
 }
diff --git a/frame/balances/src/weights.rs b/frame/balances/src/weights.rs
index 79e6445dd6bb..d1e86ce45e4b 100644
--- a/frame/balances/src/weights.rs
+++ b/frame/balances/src/weights.rs
@@ -36,6 +36,7 @@
 // --template=./.maintain/frame-weight-template.hbs
 
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
diff --git a/frame/benchmarking/src/analysis.rs b/frame/benchmarking/src/analysis.rs
index f37ffba51f3d..fffa6828cede 100644
--- a/frame/benchmarking/src/analysis.rs
+++ b/frame/benchmarking/src/analysis.rs
@@ -17,10 +17,10 @@
 
 //! Tools for analyzing the benchmark results.
 
-use std::collections::BTreeMap;
+use crate::BenchmarkResults;
 use core::convert::TryFrom;
 use linregress::{FormulaRegressionBuilder, RegressionDataBuilder};
-use crate::BenchmarkResults;
+use std::collections::BTreeMap;
 
 pub use linregress::RegressionModel;
 
@@ -63,14 +63,12 @@ impl TryFrom<Option<String>> for AnalysisChoice {
 	fn try_from(s: Option<String>) -> Result<Self, Self::Error> {
 		match s {
 			None => Ok(AnalysisChoice::default()),
-			Some(i) => {
-				match &i[..] {
-					"min-squares" | "min_squares" => Ok(AnalysisChoice::MinSquares),
-					"median-slopes" | "median_slopes" => Ok(AnalysisChoice::MedianSlopes),
-					"max" => Ok(AnalysisChoice::Max),
-					_ => Err("invalid analysis string")
-				}
-			}
+			Some(i) => match &i[..] {
+				"min-squares" | "min_squares" => Ok(AnalysisChoice::MinSquares),
+				"median-slopes" | "median_slopes" => Ok(AnalysisChoice::MedianSlopes),
+				"max" => Ok(AnalysisChoice::Max),
+				_ => Err("invalid analysis string"),
+			},
 		}
 	}
 }
@@ -79,17 +77,20 @@ impl Analysis {
 	// Useful for when there are no components, and we just need an median value of the benchmark results.
 	// Note: We choose the median value because it is more robust to outliers.
 	fn median_value(r: &Vec<BenchmarkResults>, selector: BenchmarkSelector) -> Option<Self> {
-		if r.is_empty() { return None }
+		if r.is_empty() {
+			return None
+		}
 
-		let mut values: Vec<u128> = r.iter().map(|result|
-			match selector {
+		let mut values: Vec<u128> = r
+			.iter()
+			.map(|result| match selector {
 				BenchmarkSelector::ExtrinsicTime => result.extrinsic_time,
 				BenchmarkSelector::StorageRootTime => result.storage_root_time,
 				BenchmarkSelector::Reads => result.reads.into(),
 				BenchmarkSelector::Writes => result.writes.into(),
 				BenchmarkSelector::ProofSize => result.proof_size.into(),
-			}
-		).collect();
+			})
+			.collect();
 
 		values.sort();
 		let mid = values.len() / 2;
@@ -104,64 +105,80 @@ impl Analysis {
 	}
 
 	pub fn median_slopes(r: &Vec<BenchmarkResults>, selector: BenchmarkSelector) -> Option<Self> {
-		if r[0].components.is_empty() { return Self::median_value(r, selector) }
-
-		let results = r[0].components.iter().enumerate().map(|(i, &(param, _))| {
-			let mut counted = BTreeMap::<Vec<u32>, usize>::new();
-			for result in r.iter() {
-				let mut p = result.components.iter().map(|x| x.1).collect::<Vec<_>>();
-				p[i] = 0;
-				*counted.entry(p).or_default() += 1;
-			}
-			let others: Vec<u32> = counted.iter().max_by_key(|i| i.1).expect("r is not empty; qed").0.clone();
-			let values = r.iter()
-				.filter(|v|
-					v.components.iter()
-						.map(|x| x.1)
-						.zip(others.iter())
-						.enumerate()
-						.all(|(j, (v1, v2))| j == i || v1 == *v2)
-				).map(|result| {
-					// Extract the data we are interested in analyzing
-					let data = match selector {
-						BenchmarkSelector::ExtrinsicTime => result.extrinsic_time,
-						BenchmarkSelector::StorageRootTime => result.storage_root_time,
-						BenchmarkSelector::Reads => result.reads.into(),
-						BenchmarkSelector::Writes => result.writes.into(),
-						BenchmarkSelector::ProofSize => result.proof_size.into(),
-					};
-					(result.components[i].1, data)
-				})
-				.collect::<Vec<_>>();
-			(format!("{:?}", param), i, others, values)
-		}).collect::<Vec<_>>();
-
-		let models = results.iter().map(|(_, _, _, ref values)| {
-			let mut slopes = vec![];
-			for (i, &(x1, y1)) in values.iter().enumerate() {
-				for &(x2, y2) in values.iter().skip(i + 1) {
-					if x1 != x2 {
-						slopes.push((y1 as f64 - y2 as f64) / (x1 as f64 - x2 as f64));
+		if r[0].components.is_empty() {
+			return Self::median_value(r, selector)
+		}
+
+		let results = r[0]
+			.components
+			.iter()
+			.enumerate()
+			.map(|(i, &(param, _))| {
+				let mut counted = BTreeMap::<Vec<u32>, usize>::new();
+				for result in r.iter() {
+					let mut p = result.components.iter().map(|x| x.1).collect::<Vec<_>>();
+					p[i] = 0;
+					*counted.entry(p).or_default() += 1;
+				}
+				let others: Vec<u32> =
+					counted.iter().max_by_key(|i| i.1).expect("r is not empty; qed").0.clone();
+				let values = r
+					.iter()
+					.filter(|v| {
+						v.components
+							.iter()
+							.map(|x| x.1)
+							.zip(others.iter())
+							.enumerate()
+							.all(|(j, (v1, v2))| j == i || v1 == *v2)
+					})
+					.map(|result| {
+						// Extract the data we are interested in analyzing
+						let data = match selector {
+							BenchmarkSelector::ExtrinsicTime => result.extrinsic_time,
+							BenchmarkSelector::StorageRootTime => result.storage_root_time,
+							BenchmarkSelector::Reads => result.reads.into(),
+							BenchmarkSelector::Writes => result.writes.into(),
+							BenchmarkSelector::ProofSize => result.proof_size.into(),
+						};
+						(result.components[i].1, data)
+					})
+					.collect::<Vec<_>>();
+				(format!("{:?}", param), i, others, values)
+			})
+			.collect::<Vec<_>>();
+
+		let models = results
+			.iter()
+			.map(|(_, _, _, ref values)| {
+				let mut slopes = vec![];
+				for (i, &(x1, y1)) in values.iter().enumerate() {
+					for &(x2, y2) in values.iter().skip(i + 1) {
+						if x1 != x2 {
+							slopes.push((y1 as f64 - y2 as f64) / (x1 as f64 - x2 as f64));
+						}
 					}
 				}
-			}
-			slopes.sort_by(|a, b| a.partial_cmp(b).expect("values well defined; qed"));
-			let slope = slopes[slopes.len() / 2];
+				slopes.sort_by(|a, b| a.partial_cmp(b).expect("values well defined; qed"));
+				let slope = slopes[slopes.len() / 2];
 
-			let mut offsets = vec![];
-			for &(x, y) in values.iter() {
-				offsets.push(y as f64 - slope * x as f64);
-			}
-			offsets.sort_by(|a, b| a.partial_cmp(b).expect("values well defined; qed"));
-			let offset = offsets[offsets.len() / 2];
+				let mut offsets = vec![];
+				for &(x, y) in values.iter() {
+					offsets.push(y as f64 - slope * x as f64);
+				}
+				offsets.sort_by(|a, b| a.partial_cmp(b).expect("values well defined; qed"));
+				let offset = offsets[offsets.len() / 2];
 
-			(offset, slope)
-		}).collect::<Vec<_>>();
+				(offset, slope)
+			})
+			.collect::<Vec<_>>();
 
-		let models = models.iter()
+		let models = models
+			.iter()
 			.zip(results.iter())
 			.map(|((offset, slope), (_, i, others, _))| {
-				let over = others.iter()
+				let over = others
+					.iter()
 					.enumerate()
 					.filter(|(j, _)| j != i)
 					.map(|(j, v)| models[j].1 * *v as f64)
@@ -183,18 +200,20 @@ impl Analysis {
 	}
 
 	pub fn min_squares_iqr(r: &Vec<BenchmarkResults>, selector: BenchmarkSelector) -> Option<Self> {
-		if r[0].components.is_empty() { return Self::median_value(r, selector) }
+		if r[0].components.is_empty() {
+			return Self::median_value(r, selector)
+		}
 
 		let mut results = BTreeMap::<Vec<u32>, Vec<u128>>::new();
 		for result in r.iter() {
 			let p = result.components.iter().map(|x| x.1).collect::<Vec<_>>();
 			results.entry(p).or_default().push(match selector {
-					BenchmarkSelector::ExtrinsicTime => result.extrinsic_time,
-					BenchmarkSelector::StorageRootTime => result.storage_root_time,
-					BenchmarkSelector::Reads => result.reads.into(),
-					BenchmarkSelector::Writes => result.writes.into(),
-					BenchmarkSelector::ProofSize => result.proof_size.into(),
-				})
+				BenchmarkSelector::ExtrinsicTime => result.extrinsic_time,
+				BenchmarkSelector::StorageRootTime => result.storage_root_time,
+				BenchmarkSelector::Reads => result.reads.into(),
+				BenchmarkSelector::Writes => result.writes.into(),
+				BenchmarkSelector::ProofSize => result.proof_size.into(),
+			})
 		}
 
 		for (_, rs) in results.iter_mut() {
@@ -203,21 +222,19 @@ impl Analysis {
 			*rs = rs[ql..rs.len() - ql].to_vec();
 		}
 
-		let mut data = vec![("Y", results.iter().flat_map(|x| x.1.iter().map(|v| *v as f64)).collect())];
+		let mut data =
+			vec![("Y", results.iter().flat_map(|x| x.1.iter().map(|v| *v as f64)).collect())];
 
 		let names = r[0].components.iter().map(|x| format!("{:?}", x.0)).collect::<Vec<_>>();
-		data.extend(names.iter()
-			.enumerate()
-			.map(|(i, p)| (
+		data.extend(names.iter().enumerate().map(|(i, p)| {
+			(
 				p.as_str(),
-				results.iter()
-					.flat_map(|x| Some(x.0[i] as f64)
-						.into_iter()
-						.cycle()
-						.take(x.1.len())
-					).collect::<Vec<_>>()
-			))
-		);
+				results
+					.iter()
+					.flat_map(|x| Some(x.0[i] as f64).into_iter().cycle().take(x.1.len()))
+					.collect::<Vec<_>>(),
+			)
+		}));
 
 		let data = RegressionDataBuilder::new().build_from(data).ok()?;
 
@@ -227,25 +244,31 @@ impl Analysis {
 			.fit()
 			.ok()?;
 
-		let slopes = model.parameters.regressor_values.iter()
+		let slopes = model
+			.parameters
+			.regressor_values
+			.iter()
 			.enumerate()
 			.map(|(_, x)| (*x + 0.5) as u128)
 			.collect();
 
-		let value_dists = results.iter().map(|(p, vs)| {
-			// Avoid divide by zero
-			if vs.len() == 0 { return (p.clone(), 0, 0) }
-			let total = vs.iter()
-				.fold(0u128, |acc, v| acc + *v);
-			let mean = total / vs.len() as u128;
-			let sum_sq_diff = vs.iter()
-				.fold(0u128, |acc, v| {
+		let value_dists = results
+			.iter()
+			.map(|(p, vs)| {
+				// Avoid divide by zero
+				if vs.len() == 0 {
+					return (p.clone(), 0, 0)
+				}
+				let total = vs.iter().fold(0u128, |acc, v| acc + *v);
+				let mean = total / vs.len() as u128;
+				let sum_sq_diff = vs.iter().fold(0u128, |acc, v| {
 					let d = mean.max(*v) - mean.min(*v);
 					acc + d * d
 				});
-			let stddev = (sum_sq_diff as f64 / vs.len() as f64).sqrt() as u128;
-			(p.clone(), mean, stddev)
-		}).collect::<Vec<_>>();
+				let stddev = (sum_sq_diff as f64 / vs.len() as f64).sqrt() as u128;
+				(p.clone(), mean, stddev)
+			})
+			.collect::<Vec<_>>();
 
 		Some(Self {
 			base: (model.parameters.intercept_value + 0.5) as u128,
@@ -261,32 +284,30 @@ impl Analysis {
 		let min_squares = Self::min_squares_iqr(r, selector);
 
 		if median_slopes.is_none() || min_squares.is_none() {
-			return None;
+			return None
 		}
 
 		let median_slopes = median_slopes.unwrap();
 		let min_squares = min_squares.unwrap();
 
 		let base = median_slopes.base.max(min_squares.base);
-		let slopes = median_slopes.slopes.into_iter()
+		let slopes = median_slopes
+			.slopes
+			.into_iter()
 			.zip(min_squares.slopes.into_iter())
-			.map(|(a, b): (u128, u128)| { a.max(b) })
+			.map(|(a, b): (u128, u128)| a.max(b))
 			.collect::<Vec<u128>>();
 		// components should always be in the same order
-		median_slopes.names.iter()
+		median_slopes
+			.names
+			.iter()
 			.zip(min_squares.names.iter())
 			.for_each(|(a, b)| assert!(a == b, "benchmark results not in the same order"));
 		let names = median_slopes.names;
 		let value_dists = min_squares.value_dists;
 		let model = min_squares.model;
 
-		Some(Self {
-			base,
-			slopes,
-			names,
-			value_dists,
-			model,
-		})
+		Some(Self { base, slopes, names, value_dists, model })
 	}
 }
 
@@ -295,7 +316,7 @@ fn ms(mut nanos: u128) -> String {
 	while x > 1 {
 		if nanos > x * 1_000 {
 			nanos = nanos / x * x;
-			break;
+			break
 		}
 		x /= 10;
 	}
@@ -306,19 +327,35 @@ impl std::fmt::Display for Analysis {
 	fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
 		if let Some(ref value_dists) = self.value_dists {
 			writeln!(f, "\nData points distribution:")?;
-			writeln!(f, "{}   mean µs  sigma µs       %", self.names.iter().map(|p| format!("{:>5}", p)).collect::<Vec<_>>().join(" "))?;
+			writeln!(
+				f,
+				"{}   mean µs  sigma µs       %",
+				self.names.iter().map(|p| format!("{:>5}", p)).collect::<Vec<_>>().join(" ")
+			)?;
 			for (param_values, mean, sigma) in value_dists.iter() {
 				if *mean == 0 {
-					writeln!(f, "{}  {:>8}  {:>8}  {:>3}.{}%",
-						param_values.iter().map(|v| format!("{:>5}", v)).collect::<Vec<_>>().join(" "),
+					writeln!(
+						f,
+						"{}  {:>8}  {:>8}  {:>3}.{}%",
+						param_values
+							.iter()
+							.map(|v| format!("{:>5}", v))
+							.collect::<Vec<_>>()
+							.join(" "),
 						ms(*mean),
 						ms(*sigma),
 						"?",
 						"?"
 					)?;
 				} else {
-					writeln!(f, "{}  {:>8}  {:>8}  {:>3}.{}%",
-						param_values.iter().map(|v| format!("{:>5}", v)).collect::<Vec<_>>().join(" "),
+					writeln!(
+						f,
+						"{}  {:>8}  {:>8}  {:>3}.{}%",
+						param_values
+							.iter()
+							.map(|v| format!("{:>5}", v))
+							.collect::<Vec<_>>()
+							.join(" "),
 						ms(*mean),
 						ms(*sigma),
 						(sigma * 100 / mean),
@@ -350,7 +387,7 @@ impl std::fmt::Debug for Analysis {
 		for (&m, n) in self.slopes.iter().zip(self.names.iter()) {
 			write!(f, " + ({} * {})", m, n)?;
 		}
-		write!(f,"")
+		write!(f, "")
 	}
 }
 
@@ -382,17 +419,66 @@ mod tests {
 	#[test]
 	fn analysis_median_slopes_should_work() {
 		let data = vec![
-			benchmark_result(vec![(BenchmarkParameter::n, 1), (BenchmarkParameter::m, 5)], 11_500_000, 0, 3, 10),
-			benchmark_result(vec![(BenchmarkParameter::n, 2), (BenchmarkParameter::m, 5)], 12_500_000, 0, 4, 10),
-			benchmark_result(vec![(BenchmarkParameter::n, 3), (BenchmarkParameter::m, 5)], 13_500_000, 0, 5, 10),
-			benchmark_result(vec![(BenchmarkParameter::n, 4), (BenchmarkParameter::m, 5)], 14_500_000, 0, 6, 10),
-			benchmark_result(vec![(BenchmarkParameter::n, 3), (BenchmarkParameter::m, 1)], 13_100_000, 0, 5, 2),
-			benchmark_result(vec![(BenchmarkParameter::n, 3), (BenchmarkParameter::m, 3)], 13_300_000, 0, 5, 6),
-			benchmark_result(vec![(BenchmarkParameter::n, 3), (BenchmarkParameter::m, 7)], 13_700_000, 0, 5, 14),
-			benchmark_result(vec![(BenchmarkParameter::n, 3), (BenchmarkParameter::m, 10)], 14_000_000, 0, 5, 20),
+			benchmark_result(
+				vec![(BenchmarkParameter::n, 1), (BenchmarkParameter::m, 5)],
+				11_500_000,
+				0,
+				3,
+				10,
+			),
+			benchmark_result(
+				vec![(BenchmarkParameter::n, 2), (BenchmarkParameter::m, 5)],
+				12_500_000,
+				0,
+				4,
+				10,
+			),
+			benchmark_result(
+				vec![(BenchmarkParameter::n, 3), (BenchmarkParameter::m, 5)],
+				13_500_000,
+				0,
+				5,
+				10,
+			),
+			benchmark_result(
+				vec![(BenchmarkParameter::n, 4), (BenchmarkParameter::m, 5)],
+				14_500_000,
+				0,
+				6,
+				10,
+			),
+			benchmark_result(
+				vec![(BenchmarkParameter::n, 3), (BenchmarkParameter::m, 1)],
+				13_100_000,
+				0,
+				5,
+				2,
+			),
+			benchmark_result(
+				vec![(BenchmarkParameter::n, 3), (BenchmarkParameter::m, 3)],
+				13_300_000,
+				0,
+				5,
+				6,
+			),
+			benchmark_result(
+				vec![(BenchmarkParameter::n, 3), (BenchmarkParameter::m, 7)],
+				13_700_000,
+				0,
+				5,
+				14,
+			),
+			benchmark_result(
+				vec![(BenchmarkParameter::n, 3), (BenchmarkParameter::m, 10)],
+				14_000_000,
+				0,
+				5,
+				20,
+			),
 		];
 
-		let extrinsic_time = Analysis::median_slopes(&data, BenchmarkSelector::ExtrinsicTime).unwrap();
+		let extrinsic_time =
+			Analysis::median_slopes(&data, BenchmarkSelector::ExtrinsicTime).unwrap();
 		assert_eq!(extrinsic_time.base, 10_000_000);
 		assert_eq!(extrinsic_time.slopes, vec![1_000_000, 100_000]);
 
@@ -408,17 +494,66 @@ mod tests {
 	#[test]
 	fn analysis_median_min_squares_should_work() {
 		let data = vec![
-			benchmark_result(vec![(BenchmarkParameter::n, 1), (BenchmarkParameter::m, 5)], 11_500_000, 0, 3, 10),
-			benchmark_result(vec![(BenchmarkParameter::n, 2), (BenchmarkParameter::m, 5)], 12_500_000, 0, 4, 10),
-			benchmark_result(vec![(BenchmarkParameter::n, 3), (BenchmarkParameter::m, 5)], 13_500_000, 0, 5, 10),
-			benchmark_result(vec![(BenchmarkParameter::n, 4), (BenchmarkParameter::m, 5)], 14_500_000, 0, 6, 10),
-			benchmark_result(vec![(BenchmarkParameter::n, 3), (BenchmarkParameter::m, 1)], 13_100_000, 0, 5, 2),
-			benchmark_result(vec![(BenchmarkParameter::n, 3), (BenchmarkParameter::m, 3)], 13_300_000, 0, 5, 6),
-			benchmark_result(vec![(BenchmarkParameter::n, 3), (BenchmarkParameter::m, 7)], 13_700_000, 0, 5, 14),
-			benchmark_result(vec![(BenchmarkParameter::n, 3), (BenchmarkParameter::m, 10)], 14_000_000, 0, 5, 20),
+			benchmark_result(
+				vec![(BenchmarkParameter::n, 1), (BenchmarkParameter::m, 5)],
+				11_500_000,
+				0,
+				3,
+				10,
+			),
+			benchmark_result(
+				vec![(BenchmarkParameter::n, 2), (BenchmarkParameter::m, 5)],
+				12_500_000,
+				0,
+				4,
+				10,
+			),
+			benchmark_result(
+				vec![(BenchmarkParameter::n, 3), (BenchmarkParameter::m, 5)],
+				13_500_000,
+				0,
+				5,
+				10,
+			),
+			benchmark_result(
+				vec![(BenchmarkParameter::n, 4), (BenchmarkParameter::m, 5)],
+				14_500_000,
+				0,
+				6,
+				10,
+			),
+			benchmark_result(
+				vec![(BenchmarkParameter::n, 3), (BenchmarkParameter::m, 1)],
+				13_100_000,
+				0,
+				5,
+				2,
+			),
+			benchmark_result(
+				vec![(BenchmarkParameter::n, 3), (BenchmarkParameter::m, 3)],
+				13_300_000,
+				0,
+				5,
+				6,
+			),
+			benchmark_result(
+				vec![(BenchmarkParameter::n, 3), (BenchmarkParameter::m, 7)],
+				13_700_000,
+				0,
+				5,
+				14,
+			),
+			benchmark_result(
+				vec![(BenchmarkParameter::n, 3), (BenchmarkParameter::m, 10)],
+				14_000_000,
+				0,
+				5,
+				20,
+			),
 		];
 
-		let extrinsic_time = Analysis::min_squares_iqr(&data, BenchmarkSelector::ExtrinsicTime).unwrap();
+		let extrinsic_time =
+			Analysis::min_squares_iqr(&data, BenchmarkSelector::ExtrinsicTime).unwrap();
 		assert_eq!(extrinsic_time.base, 10_000_000);
 		assert_eq!(extrinsic_time.slopes, vec![1_000_000, 100_000]);
 
diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
index fb4fd0801a24..ebf8a209860d 100644
--- a/frame/benchmarking/src/lib.rs
+++ b/frame/benchmarking/src/lib.rs
@@ -19,35 +19,35 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-mod tests;
-mod utils;
 #[cfg(feature = "std")]
 mod analysis;
+mod tests;
+mod utils;
 
-pub use utils::*;
 #[cfg(feature = "std")]
-pub use analysis::{Analysis, BenchmarkSelector, RegressionModel, AnalysisChoice};
-#[doc(hidden)]
-pub use sp_io::storage::root as storage_root;
-#[doc(hidden)]
-pub use sp_runtime::traits::Zero;
+pub use analysis::{Analysis, AnalysisChoice, BenchmarkSelector, RegressionModel};
 #[doc(hidden)]
 pub use frame_support;
 #[doc(hidden)]
-pub use sp_std::{self, vec, prelude::Vec, boxed::Box};
+pub use log;
 #[doc(hidden)]
 pub use paste;
 #[doc(hidden)]
-pub use sp_storage::TrackedStorageKey;
+pub use sp_io::storage::root as storage_root;
 #[doc(hidden)]
-pub use log;
+pub use sp_runtime::traits::Zero;
+#[doc(hidden)]
+pub use sp_std::{self, boxed::Box, prelude::Vec, vec};
+#[doc(hidden)]
+pub use sp_storage::TrackedStorageKey;
+pub use utils::*;
 
 /// Whitelist the given account.
 #[macro_export]
 macro_rules! whitelist {
 	($acc:ident) => {
 		frame_benchmarking::benchmarking::add_to_whitelist(
-			frame_system::Account::<T>::hashed_key_for(&$acc).into()
+			frame_system::Account::<T>::hashed_key_for(&$acc).into(),
 		);
 	};
 }
@@ -1081,7 +1081,6 @@ macro_rules! impl_benchmark_test {
 ///
 /// - It must be the name of a method applied to the output of the `new_test_ext` argument.
 /// - That method must have a signature capable of receiving a single argument of the form `impl FnOnce()`.
-///
 // ## Notes (not for rustdoc)
 //
 // The biggest challenge for this macro is communicating the actual test functions to be run. We
@@ -1260,9 +1259,9 @@ pub fn show_benchmark_debug_info(
 		* Verify: {:?}\n\
 		* Error message: {}",
 		sp_std::str::from_utf8(instance_string)
-		.expect("it's all just strings ran through the wasm interface. qed"),
+			.expect("it's all just strings ran through the wasm interface. qed"),
 		sp_std::str::from_utf8(benchmark)
-		.expect("it's all just strings ran through the wasm interface. qed"),
+			.expect("it's all just strings ran through the wasm interface. qed"),
 		lowest_range_values,
 		highest_range_values,
 		steps,
diff --git a/frame/benchmarking/src/tests.rs b/frame/benchmarking/src/tests.rs
index 646609c7c1e1..7bb1f9d7d62c 100644
--- a/frame/benchmarking/src/tests.rs
+++ b/frame/benchmarking/src/tests.rs
@@ -20,9 +20,13 @@
 #![cfg(test)]
 
 use super::*;
-use sp_std::prelude::*;
-use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::{H256, Header}, BuildStorage};
 use frame_support::parameter_types;
+use sp_runtime::{
+	testing::{Header, H256},
+	traits::{BlakeTwo256, IdentityLookup},
+	BuildStorage,
+};
+use sp_std::prelude::*;
 
 mod pallet_test {
 	use frame_support::pallet_prelude::Get;
@@ -59,7 +63,8 @@ mod pallet_test {
 	}
 
 	pub trait Config: frame_system::Config + OtherConfig
-		where Self::OtherEvent: Into<<Self as Config>::Event>
+	where
+		Self::OtherEvent: Into<<Self as Config>::Event>,
 	{
 		type Event;
 		type LowerBound: Get<u32>;
@@ -107,7 +112,7 @@ impl frame_system::Config for Test {
 	type OnSetCode = ();
 }
 
-parameter_types!{
+parameter_types! {
 	pub const LowerBound: u32 = 1;
 	pub const UpperBound: u32 = 100;
 }
@@ -127,16 +132,20 @@ fn new_test_ext() -> sp_io::TestExternalities {
 }
 
 mod benchmarks {
-	use sp_std::prelude::*;
+	use super::{
+		new_test_ext,
+		pallet_test::{self, Value},
+		Test,
+	};
+	use crate::{account, BenchmarkParameter, BenchmarkingSetup};
+	use frame_support::{assert_err, assert_ok, ensure, traits::Get, StorageValue};
 	use frame_system::RawOrigin;
-	use super::{Test, pallet_test::{self, Value}, new_test_ext};
-	use frame_support::{assert_ok, assert_err, ensure, traits::Get, StorageValue};
-	use crate::{BenchmarkingSetup, BenchmarkParameter, account};
+	use sp_std::prelude::*;
 
 	// Additional used internally by the benchmark macro.
 	use super::pallet_test::{Call, Config, Pallet};
 
-	crate::benchmarks!{
+	crate::benchmarks! {
 		where_clause {
 			where
 				<T as pallet_test::OtherConfig>::OtherEvent: Into<<T as pallet_test::Config>::Event> + Clone,
@@ -204,7 +213,8 @@ mod benchmarks {
 			&selected,
 			&[(BenchmarkParameter::b, 1)],
 			true,
-		).expect("failed to create closure");
+		)
+		.expect("failed to create closure");
 
 		new_test_ext().execute_with(|| {
 			assert_ok!(closure());
@@ -222,7 +232,8 @@ mod benchmarks {
 			&selected,
 			&[(BenchmarkParameter::b, 1)],
 			true,
-		).expect("failed to create closure");
+		)
+		.expect("failed to create closure");
 
 		new_test_ext().execute_with(|| {
 			assert_ok!(closure());
@@ -240,7 +251,8 @@ mod benchmarks {
 			&selected,
 			&[(BenchmarkParameter::x, 1)],
 			true,
-		).expect("failed to create closure");
+		)
+		.expect("failed to create closure");
 
 		assert_ok!(closure());
 	}
@@ -254,7 +266,8 @@ mod benchmarks {
 			&selected,
 			&[(BenchmarkParameter::b, 1)],
 			true,
-		).expect("failed to create closure");
+		)
+		.expect("failed to create closure");
 
 		new_test_ext().execute_with(|| {
 			assert_ok!(closure());
@@ -267,7 +280,8 @@ mod benchmarks {
 			&selected,
 			&[(BenchmarkParameter::x, 10000)],
 			true,
-		).expect("failed to create closure");
+		)
+		.expect("failed to create closure");
 
 		new_test_ext().execute_with(|| {
 			assert_err!(closure(), "You forgot to sort!");
diff --git a/frame/benchmarking/src/utils.rs b/frame/benchmarking/src/utils.rs
index c40434fb1a58..33d479a0b54a 100644
--- a/frame/benchmarking/src/utils.rs
+++ b/frame/benchmarking/src/utils.rs
@@ -17,18 +17,43 @@
 
 //! Interfaces, types and utils for benchmarking a FRAME runtime.
 
-use codec::{Encode, Decode};
-use sp_std::{vec::Vec, prelude::Box};
+use codec::{Decode, Encode};
+use frame_support::traits::StorageInfo;
 use sp_io::hashing::blake2_256;
+use sp_std::{prelude::Box, vec::Vec};
 use sp_storage::TrackedStorageKey;
-use frame_support::traits::StorageInfo;
 
 /// An alphabet of possible parameters to use for benchmarking.
 #[derive(Encode, Decode, Clone, Copy, PartialEq, Debug)]
 #[allow(missing_docs)]
 #[allow(non_camel_case_types)]
 pub enum BenchmarkParameter {
-	a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z,
+	a,
+	b,
+	c,
+	d,
+	e,
+	f,
+	g,
+	h,
+	i,
+	j,
+	k,
+	l,
+	m,
+	n,
+	o,
+	p,
+	q,
+	r,
+	s,
+	t,
+	u,
+	v,
+	w,
+	x,
+	y,
+	z,
 }
 
 #[cfg(feature = "std")]
@@ -105,7 +130,8 @@ pub trait Benchmarking {
 	/// WARNING! This is a non-deterministic call. Do not use this within
 	/// consensus critical logic.
 	fn current_time() -> u128 {
-		std::time::SystemTime::now().duration_since(std::time::SystemTime::UNIX_EPOCH)
+		std::time::SystemTime::now()
+			.duration_since(std::time::SystemTime::UNIX_EPOCH)
 			.expect("Unix time doesn't go backwards; qed")
 			.as_nanos()
 	}
@@ -153,7 +179,7 @@ pub trait Benchmarking {
 			// If the key does not exist, add it.
 			None => {
 				whitelist.push(add);
-			}
+			},
 		}
 		self.set_whitelist(whitelist);
 	}
@@ -217,12 +243,16 @@ pub trait BenchmarkingSetup<T, I = ()> {
 	fn instance(
 		&self,
 		components: &[(BenchmarkParameter, u32)],
-		verify: bool
+		verify: bool,
 	) -> Result<Box<dyn FnOnce() -> Result<(), &'static str>>, &'static str>;
 }
 
 /// Grab an account, seeded by a name and index.
-pub fn account<AccountId: Decode + Default>(name: &'static str, index: u32, seed: u32) -> AccountId {
+pub fn account<AccountId: Decode + Default>(
+	name: &'static str,
+	index: u32,
+	seed: u32,
+) -> AccountId {
 	let entropy = (name, index, seed).using_encoded(blake2_256);
 	AccountId::decode(&mut &entropy[..]).unwrap_or_default()
 }
@@ -236,7 +266,7 @@ pub fn whitelisted_caller<AccountId: Decode + Default>() -> AccountId {
 macro_rules! whitelist_account {
 	($acc:ident) => {
 		frame_benchmarking::benchmarking::add_to_whitelist(
-			frame_system::Account::<T>::hashed_key_for(&$acc).into()
+			frame_system::Account::<T>::hashed_key_for(&$acc).into(),
 		);
-	}
+	};
 }
diff --git a/frame/bounties/src/benchmarking.rs b/frame/bounties/src/benchmarking.rs
index 23542e6c31b8..c95c13649b6a 100644
--- a/frame/bounties/src/benchmarking.rs
+++ b/frame/bounties/src/benchmarking.rs
@@ -21,10 +21,10 @@
 
 use super::*;
 
-use sp_runtime::traits::Bounded;
-use frame_system::RawOrigin;
-use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
+use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, whitelisted_caller};
 use frame_support::traits::OnInitialize;
+use frame_system::RawOrigin;
+use sp_runtime::traits::Bounded;
 
 use crate::Module as Bounties;
 use pallet_treasury::Pallet as Treasury;
@@ -33,7 +33,7 @@ const SEED: u32 = 0;
 
 // Create bounties that are approved for use in `on_initialize`.
 fn create_approved_bounties<T: Config>(n: u32) -> Result<(), &'static str> {
-	for i in 0 .. n {
+	for i in 0..n {
 		let (caller, _curator, _fee, value, reason) = setup_bounty::<T>(i, MAX_BYTES);
 		Bounties::<T>::propose_bounty(RawOrigin::Signed(caller).into(), value, reason)?;
 		let bounty_id = BountyCount::get() - 1;
@@ -44,13 +44,10 @@ fn create_approved_bounties<T: Config>(n: u32) -> Result<(), &'static str> {
 }
 
 // Create the pre-requisite information needed to create a treasury `propose_bounty`.
-fn setup_bounty<T: Config>(u: u32, d: u32) -> (
-	T::AccountId,
-	T::AccountId,
-	BalanceOf<T>,
-	BalanceOf<T>,
-	Vec<u8>,
-) {
+fn setup_bounty<T: Config>(
+	u: u32,
+	d: u32,
+) -> (T::AccountId, T::AccountId, BalanceOf<T>, BalanceOf<T>, Vec<u8>) {
 	let caller = account("caller", u, SEED);
 	let value: BalanceOf<T> = T::BountyValueMinimum::get().saturating_mul(100u32.into());
 	let fee = value / 2u32.into();
@@ -62,10 +59,8 @@ fn setup_bounty<T: Config>(u: u32, d: u32) -> (
 	(caller, curator, fee, value, reason)
 }
 
-fn create_bounty<T: Config>() -> Result<(
-	<T::Lookup as StaticLookup>::Source,
-	BountyIndex,
-), &'static str> {
+fn create_bounty<T: Config>(
+) -> Result<(<T::Lookup as StaticLookup>::Source, BountyIndex), &'static str> {
 	let (caller, curator, fee, value, reason) = setup_bounty::<T>(0, MAX_BYTES);
 	let curator_lookup = T::Lookup::unlookup(curator.clone());
 	Bounties::<T>::propose_bounty(RawOrigin::Signed(caller).into(), value, reason)?;
@@ -216,8 +211,4 @@ benchmarks! {
 	}
 }
 
-impl_benchmark_test_suite!(
-	Bounties,
-	crate::tests::new_test_ext(),
-	crate::tests::Test,
-);
+impl_benchmark_test_suite!(Bounties, crate::tests::new_test_ext(), crate::tests::Test,);
diff --git a/frame/bounties/src/lib.rs b/frame/bounties/src/lib.rs
index 419713ab5eff..4700b1d34d81 100644
--- a/frame/bounties/src/lib.rs
+++ b/frame/bounties/src/lib.rs
@@ -74,28 +74,28 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-mod tests;
 mod benchmarking;
+mod tests;
 pub mod weights;
 
 use sp_std::prelude::*;
 
-use frame_support::{decl_module, decl_storage, decl_event, ensure, decl_error};
+use frame_support::{decl_error, decl_event, decl_module, decl_storage, ensure};
 
 use frame_support::traits::{
-	Currency, Get, Imbalance, OnUnbalanced, ExistenceRequirement::{AllowDeath},
-	ReservableCurrency};
+	Currency, ExistenceRequirement::AllowDeath, Get, Imbalance, OnUnbalanced, ReservableCurrency,
+};
 
-use sp_runtime::{Permill, RuntimeDebug, DispatchResult, traits::{
-	Zero, StaticLookup, AccountIdConversion, Saturating, BadOrigin
-}};
+use sp_runtime::{
+	traits::{AccountIdConversion, BadOrigin, Saturating, StaticLookup, Zero},
+	DispatchResult, Permill, RuntimeDebug,
+};
 
-use frame_support::dispatch::DispatchResultWithPostInfo;
-use frame_support::traits::{EnsureOrigin};
+use frame_support::{dispatch::DispatchResultWithPostInfo, traits::EnsureOrigin};
 
-use frame_support::weights::{Weight};
+use frame_support::weights::Weight;
 
-use codec::{Encode, Decode};
+use codec::{Decode, Encode};
 use frame_system::{self as system, ensure_signed};
 pub use weights::WeightInfo;
 
@@ -104,7 +104,6 @@ type BalanceOf<T> = pallet_treasury::BalanceOf<T>;
 type PositiveImbalanceOf<T> = pallet_treasury::PositiveImbalanceOf<T>;
 
 pub trait Config: frame_system::Config + pallet_treasury::Config {
-
 	/// The amount held on deposit for placing a bounty proposal.
 	type BountyDepositBase: Get<BalanceOf<Self>>;
 
@@ -692,14 +691,17 @@ impl<T: Config> Module<T> {
 		description: Vec<u8>,
 		value: BalanceOf<T>,
 	) -> DispatchResult {
-		ensure!(description.len() <= T::MaximumReasonLength::get() as usize, Error::<T>::ReasonTooBig);
+		ensure!(
+			description.len() <= T::MaximumReasonLength::get() as usize,
+			Error::<T>::ReasonTooBig
+		);
 		ensure!(value >= T::BountyValueMinimum::get(), Error::<T>::InvalidValue);
 
 		let index = Self::bounty_count();
 
 		// reserve deposit for new bounty
-		let bond = T::BountyDepositBase::get()
-			+ T::DataDepositPerByte::get() * (description.len() as u32).into();
+		let bond = T::BountyDepositBase::get() +
+			T::DataDepositPerByte::get() * (description.len() as u32).into();
 		T::Currency::reserve(&proposer, bond)
 			.map_err(|_| Error::<T>::InsufficientProposersBalance)?;
 
@@ -721,7 +723,6 @@ impl<T: Config> Module<T> {
 
 		Ok(())
 	}
-
 }
 
 impl<T: Config> pallet_treasury::SpendFunds<T> for Module<T> {
@@ -729,7 +730,7 @@ impl<T: Config> pallet_treasury::SpendFunds<T> for Module<T> {
 		budget_remaining: &mut BalanceOf<T>,
 		imbalance: &mut PositiveImbalanceOf<T>,
 		total_weight: &mut Weight,
-		missed_any: &mut bool
+		missed_any: &mut bool,
 	) {
 		let bounties_len = BountyApprovals::mutate(|v| {
 			let bounties_approval_len = v.len() as u32;
@@ -747,7 +748,10 @@ impl<T: Config> pallet_treasury::SpendFunds<T> for Module<T> {
 							debug_assert!(err_amount.is_zero());
 
 							// fund the bounty account
-							imbalance.subsume(T::Currency::deposit_creating(&Self::bounty_account_id(index), bounty.value));
+							imbalance.subsume(T::Currency::deposit_creating(
+								&Self::bounty_account_id(index),
+								bounty.value,
+							));
 
 							Self::deposit_event(RawEvent::BountyBecameActive(index));
 							false
diff --git a/frame/bounties/src/tests.rs b/frame/bounties/src/tests.rs
index 2e96d8271e13..5ce1373ed906 100644
--- a/frame/bounties/src/tests.rs
+++ b/frame/bounties/src/tests.rs
@@ -19,20 +19,20 @@
 
 #![cfg(test)]
 
-use crate as pallet_bounties;
 use super::*;
+use crate as pallet_bounties;
 use std::cell::RefCell;
 
 use frame_support::{
-	assert_noop, assert_ok, parameter_types, weights::Weight, traits::OnInitialize,
-	PalletId, pallet_prelude::GenesisBuild,
+	assert_noop, assert_ok, pallet_prelude::GenesisBuild, parameter_types, traits::OnInitialize,
+	weights::Weight, PalletId,
 };
 
 use sp_core::H256;
 use sp_runtime::{
-	Perbill,
 	testing::Header,
-	traits::{BlakeTwo256, IdentityLookup, BadOrigin},
+	traits::{BadOrigin, BlakeTwo256, IdentityLookup},
+	Perbill,
 };
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
@@ -121,7 +121,7 @@ impl pallet_treasury::Config for Test {
 	type ProposalBondMinimum = ProposalBondMinimum;
 	type SpendPeriod = SpendPeriod;
 	type Burn = Burn;
-	type BurnDestination = ();  // Just gets burned.
+	type BurnDestination = (); // Just gets burned.
 	type WeightInfo = ();
 	type SpendFunds = Bounties;
 	type MaxApprovals = MaxApprovals;
@@ -146,23 +146,25 @@ impl Config for Test {
 	type WeightInfo = ();
 }
 
-type TreasuryError = pallet_treasury::Error::<Test>;
+type TreasuryError = pallet_treasury::Error<Test>;
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-	pallet_balances::GenesisConfig::<Test>{
+	pallet_balances::GenesisConfig::<Test> {
 		// Total issuance will be 200 with treasury account initialized at ED.
 		balances: vec![(0, 100), (1, 98), (2, 1)],
-	}.assimilate_storage(&mut t).unwrap();
+	}
+	.assimilate_storage(&mut t)
+	.unwrap();
 	GenesisBuild::<Test>::assimilate_storage(&pallet_treasury::GenesisConfig, &mut t).unwrap();
 	t.into()
 }
 
 fn last_event() -> RawEvent<u64, u128> {
-	System::events().into_iter().map(|r| r.event)
-		.filter_map(|e| {
-			if let Event::Bounties(inner) = e { Some(inner) } else { None }
-		})
+	System::events()
+		.into_iter()
+		.map(|r| r.event)
+		.filter_map(|e| if let Event::Bounties(inner) = e { Some(inner) } else { None })
 		.last()
 		.unwrap()
 }
@@ -267,8 +269,10 @@ fn reject_already_rejected_spend_proposal_fails() {
 #[test]
 fn reject_non_existent_spend_proposal_fails() {
 	new_test_ext().execute_with(|| {
-		assert_noop!(Treasury::reject_proposal(Origin::root(), 0),
-		pallet_treasury::Error::<Test, _>::InvalidIndex);
+		assert_noop!(
+			Treasury::reject_proposal(Origin::root(), 0),
+			pallet_treasury::Error::<Test, _>::InvalidIndex
+		);
 	});
 }
 
@@ -353,9 +357,9 @@ fn treasury_account_doesnt_get_deleted() {
 #[test]
 fn inexistent_account_works() {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-	pallet_balances::GenesisConfig::<Test>{
-		balances: vec![(0, 100), (1, 99), (2, 1)],
-	}.assimilate_storage(&mut t).unwrap();
+	pallet_balances::GenesisConfig::<Test> { balances: vec![(0, 100), (1, 99), (2, 1)] }
+		.assimilate_storage(&mut t)
+		.unwrap();
 	// Treasury genesis config is not build thus treasury account does not exist
 	let mut t: sp_io::TestExternalities = t.into();
 
@@ -398,14 +402,17 @@ fn propose_bounty_works() {
 		assert_eq!(Balances::reserved_balance(0), deposit);
 		assert_eq!(Balances::free_balance(0), 100 - deposit);
 
-		assert_eq!(Bounties::bounties(0).unwrap(), Bounty {
-			proposer: 0,
-			fee: 0,
-			curator_deposit: 0,
-			value: 10,
-			bond: deposit,
-			status: BountyStatus::Proposed,
-		});
+		assert_eq!(
+			Bounties::bounties(0).unwrap(),
+			Bounty {
+				proposer: 0,
+				fee: 0,
+				curator_deposit: 0,
+				value: 10,
+				bond: deposit,
+				status: BountyStatus::Proposed,
+			}
+		);
 
 		assert_eq!(Bounties::bounty_descriptions(0).unwrap(), b"1234567890".to_vec());
 
@@ -476,14 +483,17 @@ fn approve_bounty_works() {
 
 		let deposit: u64 = 80 + 5;
 
-		assert_eq!(Bounties::bounties(0).unwrap(), Bounty {
-			proposer: 0,
-			fee: 0,
-			value: 50,
-			curator_deposit: 0,
-			bond: deposit,
-			status: BountyStatus::Approved,
-		});
+		assert_eq!(
+			Bounties::bounties(0).unwrap(),
+			Bounty {
+				proposer: 0,
+				fee: 0,
+				value: 50,
+				curator_deposit: 0,
+				bond: deposit,
+				status: BountyStatus::Approved,
+			}
+		);
 		assert_eq!(Bounties::bounty_approvals(), vec![0]);
 
 		assert_noop!(Bounties::close_bounty(Origin::root(), 0), Error::<Test>::UnexpectedStatus);
@@ -498,14 +508,17 @@ fn approve_bounty_works() {
 		assert_eq!(Balances::reserved_balance(0), 0);
 		assert_eq!(Balances::free_balance(0), 100);
 
-		assert_eq!(Bounties::bounties(0).unwrap(), Bounty {
-			proposer: 0,
-			fee: 0,
-			curator_deposit: 0,
-			value: 50,
-			bond: deposit,
-			status: BountyStatus::Funded,
-		});
+		assert_eq!(
+			Bounties::bounties(0).unwrap(),
+			Bounty {
+				proposer: 0,
+				fee: 0,
+				curator_deposit: 0,
+				value: 50,
+				bond: deposit,
+				status: BountyStatus::Funded,
+			}
+		);
 
 		assert_eq!(Treasury::pot(), 100 - 50 - 25); // burn 25
 		assert_eq!(Balances::free_balance(Bounties::bounty_account_id(0)), 50);
@@ -518,7 +531,10 @@ fn assign_curator_works() {
 		System::set_block_number(1);
 		Balances::make_free_balance_be(&Treasury::account_id(), 101);
 
-		assert_noop!(Bounties::propose_curator(Origin::root(), 0, 4, 4), Error::<Test>::InvalidIndex);
+		assert_noop!(
+			Bounties::propose_curator(Origin::root(), 0, 4, 4),
+			Error::<Test>::InvalidIndex
+		);
 
 		assert_ok!(Bounties::propose_bounty(Origin::signed(0), 50, b"12345".to_vec()));
 
@@ -527,39 +543,46 @@ fn assign_curator_works() {
 		System::set_block_number(2);
 		<Treasury as OnInitialize<u64>>::on_initialize(2);
 
-		assert_noop!(Bounties::propose_curator(Origin::root(), 0, 4, 50), Error::<Test>::InvalidFee);
+		assert_noop!(
+			Bounties::propose_curator(Origin::root(), 0, 4, 50),
+			Error::<Test>::InvalidFee
+		);
 
 		assert_ok!(Bounties::propose_curator(Origin::root(), 0, 4, 4));
 
-		assert_eq!(Bounties::bounties(0).unwrap(), Bounty {
-			proposer: 0,
-			fee: 4,
-			curator_deposit: 0,
-			value: 50,
-			bond: 85,
-			status: BountyStatus::CuratorProposed {
-				curator: 4,
-			},
-		});
+		assert_eq!(
+			Bounties::bounties(0).unwrap(),
+			Bounty {
+				proposer: 0,
+				fee: 4,
+				curator_deposit: 0,
+				value: 50,
+				bond: 85,
+				status: BountyStatus::CuratorProposed { curator: 4 },
+			}
+		);
 
 		assert_noop!(Bounties::accept_curator(Origin::signed(1), 0), Error::<Test>::RequireCurator);
-		assert_noop!(Bounties::accept_curator(Origin::signed(4), 0), pallet_balances::Error::<Test, _>::InsufficientBalance);
+		assert_noop!(
+			Bounties::accept_curator(Origin::signed(4), 0),
+			pallet_balances::Error::<Test, _>::InsufficientBalance
+		);
 
 		Balances::make_free_balance_be(&4, 10);
 
 		assert_ok!(Bounties::accept_curator(Origin::signed(4), 0));
 
-		assert_eq!(Bounties::bounties(0).unwrap(), Bounty {
-			proposer: 0,
-			fee: 4,
-			curator_deposit: 2,
-			value: 50,
-			bond: 85,
-			status: BountyStatus::Active {
-				curator: 4,
-				update_due: 22,
-			},
-		});
+		assert_eq!(
+			Bounties::bounties(0).unwrap(),
+			Bounty {
+				proposer: 0,
+				fee: 4,
+				curator_deposit: 2,
+				value: 50,
+				bond: 85,
+				status: BountyStatus::Active { curator: 4, update_due: 22 },
+			}
+		);
 
 		assert_eq!(Balances::free_balance(&4), 8);
 		assert_eq!(Balances::reserved_balance(&4), 2);
@@ -584,14 +607,17 @@ fn unassign_curator_works() {
 
 		assert_ok!(Bounties::unassign_curator(Origin::signed(4), 0));
 
-		assert_eq!(Bounties::bounties(0).unwrap(), Bounty {
-			proposer: 0,
-			fee: 4,
-			curator_deposit: 0,
-			value: 50,
-			bond: 85,
-			status: BountyStatus::Funded,
-		});
+		assert_eq!(
+			Bounties::bounties(0).unwrap(),
+			Bounty {
+				proposer: 0,
+				fee: 4,
+				curator_deposit: 0,
+				value: 50,
+				bond: 85,
+				status: BountyStatus::Funded,
+			}
+		);
 
 		assert_ok!(Bounties::propose_curator(Origin::root(), 0, 4, 4));
 
@@ -601,21 +627,23 @@ fn unassign_curator_works() {
 
 		assert_ok!(Bounties::unassign_curator(Origin::root(), 0));
 
-		assert_eq!(Bounties::bounties(0).unwrap(), Bounty {
-			proposer: 0,
-			fee: 4,
-			curator_deposit: 0,
-			value: 50,
-			bond: 85,
-			status: BountyStatus::Funded,
-		});
+		assert_eq!(
+			Bounties::bounties(0).unwrap(),
+			Bounty {
+				proposer: 0,
+				fee: 4,
+				curator_deposit: 0,
+				value: 50,
+				bond: 85,
+				status: BountyStatus::Funded,
+			}
+		);
 
 		assert_eq!(Balances::free_balance(&4), 8);
 		assert_eq!(Balances::reserved_balance(&4), 0); // slashed 2
 	});
 }
 
-
 #[test]
 fn award_and_claim_bounty_works() {
 	new_test_ext().execute_with(|| {
@@ -634,22 +662,24 @@ fn award_and_claim_bounty_works() {
 
 		assert_eq!(Balances::free_balance(4), 8); // inital 10 - 2 deposit
 
-		assert_noop!(Bounties::award_bounty(Origin::signed(1), 0, 3), Error::<Test>::RequireCurator);
+		assert_noop!(
+			Bounties::award_bounty(Origin::signed(1), 0, 3),
+			Error::<Test>::RequireCurator
+		);
 
 		assert_ok!(Bounties::award_bounty(Origin::signed(4), 0, 3));
 
-		assert_eq!(Bounties::bounties(0).unwrap(), Bounty {
-			proposer: 0,
-			fee: 4,
-			curator_deposit: 2,
-			value: 50,
-			bond: 85,
-			status: BountyStatus::PendingPayout {
-				curator: 4,
-				beneficiary: 3,
-				unlock_at: 5
-			},
-		});
+		assert_eq!(
+			Bounties::bounties(0).unwrap(),
+			Bounty {
+				proposer: 0,
+				fee: 4,
+				curator_deposit: 2,
+				value: 50,
+				bond: 85,
+				status: BountyStatus::PendingPayout { curator: 4, beneficiary: 3, unlock_at: 5 },
+			}
+		);
 
 		assert_noop!(Bounties::claim_bounty(Origin::signed(1), 0), Error::<Test>::Premature);
 
@@ -713,7 +743,6 @@ fn claim_handles_high_fee() {
 #[test]
 fn cancel_and_refund() {
 	new_test_ext().execute_with(|| {
-
 		System::set_block_number(1);
 
 		Balances::make_free_balance_be(&Treasury::account_id(), 101);
@@ -727,14 +756,17 @@ fn cancel_and_refund() {
 
 		assert_ok!(Balances::transfer(Origin::signed(0), Bounties::bounty_account_id(0), 10));
 
-		assert_eq!(Bounties::bounties(0).unwrap(), Bounty {
-			proposer: 0,
-			fee: 0,
-			curator_deposit: 0,
-			value: 50,
-			bond: 85,
-			status: BountyStatus::Funded,
-		});
+		assert_eq!(
+			Bounties::bounties(0).unwrap(),
+			Bounty {
+				proposer: 0,
+				fee: 0,
+				curator_deposit: 0,
+				value: 50,
+				bond: 85,
+				status: BountyStatus::Funded,
+			}
+		);
 
 		assert_eq!(Balances::free_balance(Bounties::bounty_account_id(0)), 60);
 
@@ -743,9 +775,7 @@ fn cancel_and_refund() {
 		assert_ok!(Bounties::close_bounty(Origin::root(), 0));
 
 		assert_eq!(Treasury::pot(), 85); // - 25 + 10
-
 	});
-
 }
 
 #[test]
@@ -816,18 +846,20 @@ fn expire_and_unassign() {
 
 		assert_ok!(Bounties::unassign_curator(Origin::signed(0), 0));
 
-		assert_eq!(Bounties::bounties(0).unwrap(), Bounty {
-			proposer: 0,
-			fee: 10,
-			curator_deposit: 0,
-			value: 50,
-			bond: 85,
-			status: BountyStatus::Funded,
-		});
+		assert_eq!(
+			Bounties::bounties(0).unwrap(),
+			Bounty {
+				proposer: 0,
+				fee: 10,
+				curator_deposit: 0,
+				value: 50,
+				bond: 85,
+				status: BountyStatus::Funded,
+			}
+		);
 
 		assert_eq!(Balances::free_balance(1), 93);
 		assert_eq!(Balances::reserved_balance(1), 0); // slashed
-
 	});
 }
 
@@ -841,7 +873,10 @@ fn extend_expiry() {
 
 		assert_ok!(Bounties::approve_bounty(Origin::root(), 0));
 
-		assert_noop!(Bounties::extend_bounty_expiry(Origin::signed(1), 0, Vec::new()), Error::<Test>::UnexpectedStatus);
+		assert_noop!(
+			Bounties::extend_bounty_expiry(Origin::signed(1), 0, Vec::new()),
+			Error::<Test>::UnexpectedStatus
+		);
 
 		System::set_block_number(2);
 		<Treasury as OnInitialize<u64>>::on_initialize(2);
@@ -855,28 +890,37 @@ fn extend_expiry() {
 		System::set_block_number(10);
 		<Treasury as OnInitialize<u64>>::on_initialize(10);
 
-		assert_noop!(Bounties::extend_bounty_expiry(Origin::signed(0), 0, Vec::new()), Error::<Test>::RequireCurator);
+		assert_noop!(
+			Bounties::extend_bounty_expiry(Origin::signed(0), 0, Vec::new()),
+			Error::<Test>::RequireCurator
+		);
 		assert_ok!(Bounties::extend_bounty_expiry(Origin::signed(4), 0, Vec::new()));
 
-		assert_eq!(Bounties::bounties(0).unwrap(), Bounty {
-			proposer: 0,
-			fee: 10,
-			curator_deposit: 5,
-			value: 50,
-			bond: 85,
-			status: BountyStatus::Active { curator: 4, update_due: 30 },
-		});
+		assert_eq!(
+			Bounties::bounties(0).unwrap(),
+			Bounty {
+				proposer: 0,
+				fee: 10,
+				curator_deposit: 5,
+				value: 50,
+				bond: 85,
+				status: BountyStatus::Active { curator: 4, update_due: 30 },
+			}
+		);
 
 		assert_ok!(Bounties::extend_bounty_expiry(Origin::signed(4), 0, Vec::new()));
 
-		assert_eq!(Bounties::bounties(0).unwrap(), Bounty {
-			proposer: 0,
-			fee: 10,
-			curator_deposit: 5,
-			value: 50,
-			bond: 85,
-			status: BountyStatus::Active { curator: 4, update_due: 30 }, // still the same
-		});
+		assert_eq!(
+			Bounties::bounties(0).unwrap(),
+			Bounty {
+				proposer: 0,
+				fee: 10,
+				curator_deposit: 5,
+				value: 50,
+				bond: 85,
+				status: BountyStatus::Active { curator: 4, update_due: 30 }, // still the same
+			}
+		);
 
 		System::set_block_number(25);
 		<Treasury as OnInitialize<u64>>::on_initialize(25);
@@ -893,10 +937,12 @@ fn extend_expiry() {
 fn genesis_funding_works() {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
 	let initial_funding = 100;
-	pallet_balances::GenesisConfig::<Test>{
+	pallet_balances::GenesisConfig::<Test> {
 		// Total issuance will be 200 with treasury account initialized with 100.
 		balances: vec![(0, 100), (Treasury::account_id(), initial_funding)],
-	}.assimilate_storage(&mut t).unwrap();
+	}
+	.assimilate_storage(&mut t)
+	.unwrap();
 	GenesisBuild::<Test>::assimilate_storage(&pallet_treasury::GenesisConfig, &mut t).unwrap();
 	let mut t: sp_io::TestExternalities = t.into();
 
diff --git a/frame/bounties/src/weights.rs b/frame/bounties/src/weights.rs
index 9b50d438923c..2f982490bd44 100644
--- a/frame/bounties/src/weights.rs
+++ b/frame/bounties/src/weights.rs
@@ -36,6 +36,7 @@
 // --template=./.maintain/frame-weight-template.hbs
 
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
diff --git a/frame/collective/src/benchmarking.rs b/frame/collective/src/benchmarking.rs
index 7faaa31dc801..2862c830959c 100644
--- a/frame/collective/src/benchmarking.rs
+++ b/frame/collective/src/benchmarking.rs
@@ -19,19 +19,15 @@
 
 use super::*;
 
-use frame_system::RawOrigin as SystemOrigin;
 use frame_benchmarking::{
-	benchmarks_instance,
-	account,
-	whitelisted_caller,
-	impl_benchmark_test_suite,
+	account, benchmarks_instance, impl_benchmark_test_suite, whitelisted_caller,
 };
+use frame_system::RawOrigin as SystemOrigin;
 use sp_runtime::traits::Bounded;
 use sp_std::mem::size_of;
 
-use frame_system::Call as SystemCall;
-use frame_system::Pallet as System;
 use crate::Module as Collective;
+use frame_system::{Call as SystemCall, Pallet as System};
 
 const SEED: u32 = 0;
 
@@ -639,8 +635,4 @@ benchmarks_instance! {
 	}
 }
 
-impl_benchmark_test_suite!(
-	Collective,
-	crate::tests::new_test_ext(),
-	crate::tests::Test,
-);
+impl_benchmark_test_suite!(Collective, crate::tests::new_test_ext(), crate::tests::Test,);
diff --git a/frame/collective/src/lib.rs b/frame/collective/src/lib.rs
index a6e44b96feaa..0747e4e9ade0 100644
--- a/frame/collective/src/lib.rs
+++ b/frame/collective/src/lib.rs
@@ -42,22 +42,24 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 #![recursion_limit = "128"]
 
-use sp_std::{prelude::*, result};
 use sp_core::u32_trait::Value as U32;
 use sp_io::storage;
-use sp_runtime::{RuntimeDebug, traits::Hash};
+use sp_runtime::{traits::Hash, RuntimeDebug};
+use sp_std::{prelude::*, result};
 
 use frame_support::{
-	decl_error, decl_event, decl_module, decl_storage, ensure, BoundedVec,
 	codec::{Decode, Encode},
+	decl_error, decl_event, decl_module, decl_storage,
 	dispatch::{
 		DispatchError, DispatchResult, DispatchResultWithPostInfo, Dispatchable, Parameter,
 		PostDispatchInfo,
 	},
-	traits::{ChangeMembers, EnsureOrigin, Get, InitializeMembers, GetBacking, Backing},
-	weights::{DispatchClass, GetDispatchInfo, Weight, Pays},
+	ensure,
+	traits::{Backing, ChangeMembers, EnsureOrigin, Get, GetBacking, InitializeMembers},
+	weights::{DispatchClass, GetDispatchInfo, Pays, Weight},
+	BoundedVec,
 };
-use frame_system::{self as system, ensure_signed, ensure_root};
+use frame_system::{self as system, ensure_root, ensure_signed};
 
 #[cfg(feature = "runtime-benchmarks")]
 mod benchmarking;
@@ -120,13 +122,13 @@ impl DefaultVote for MoreThanMajorityThenPrimeDefaultVote {
 	}
 }
 
-pub trait Config<I: Instance=DefaultInstance>: frame_system::Config {
+pub trait Config<I: Instance = DefaultInstance>: frame_system::Config {
 	/// The outer origin type.
 	type Origin: From<RawOrigin<Self::AccountId, I>>;
 
 	/// The outer call dispatch type.
 	type Proposal: Parameter
-		+ Dispatchable<Origin=<Self as Config<I>>::Origin, PostInfo=PostDispatchInfo>
+		+ Dispatchable<Origin = <Self as Config<I>>::Origin, PostInfo = PostDispatchInfo>
 		+ From<frame_system::Call<Self>>
 		+ GetDispatchInfo;
 
@@ -174,7 +176,7 @@ impl<AccountId, I> GetBacking for RawOrigin<AccountId, I> {
 }
 
 /// Origin for the collective module.
-pub type Origin<T, I=DefaultInstance> = RawOrigin<<T as frame_system::Config>::AccountId, I>;
+pub type Origin<T, I = DefaultInstance> = RawOrigin<<T as frame_system::Config>::AccountId, I>;
 
 #[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug)]
 /// Info for keeping track of a motion being voted on.
@@ -287,7 +289,6 @@ fn get_result_weight(result: DispatchResultWithPostInfo) -> Option<Weight> {
 	}
 }
 
-
 // Note that councillor operations are assigned to the operational class.
 decl_module! {
 	pub struct Module<T: Config<I>, I: Instance=DefaultInstance> for enum Call where origin: <T as frame_system::Config>::Origin {
@@ -734,12 +735,12 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 	fn validate_and_get_proposal(
 		hash: &T::Hash,
 		length_bound: u32,
-		weight_bound: Weight
+		weight_bound: Weight,
 	) -> Result<(<T as Config<I>>::Proposal, usize), DispatchError> {
 		let key = ProposalOf::<T, I>::hashed_key_for(hash);
 		// read the length of the proposal storage entry directly
-		let proposal_len = storage::read(&key, &mut [0; 0], 0)
-			.ok_or(Error::<T, I>::ProposalMissing)?;
+		let proposal_len =
+			storage::read(&key, &mut [0; 0], 0).ok_or(Error::<T, I>::ProposalMissing)?;
 		ensure!(proposal_len <= length_bound, Error::<T, I>::WrongProposalLength);
 		let proposal = ProposalOf::<T, I>::get(hash).ok_or(Error::<T, I>::ProposalMissing)?;
 		let proposal_weight = proposal.get_dispatch_info().weight;
@@ -772,9 +773,10 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 		let dispatch_weight = proposal.get_dispatch_info().weight;
 		let origin = RawOrigin::Members(voting.threshold, seats).into();
 		let result = proposal.dispatch(origin);
-		Self::deposit_event(
-			RawEvent::Executed(proposal_hash, result.map(|_| ()).map_err(|e| e.error))
-		);
+		Self::deposit_event(RawEvent::Executed(
+			proposal_hash,
+			result.map(|_| ()).map_err(|e| e.error),
+		));
 		// default to the dispatch info weight for safety
 		let proposal_weight = get_result_weight(result).unwrap_or(dispatch_weight); // P1
 
@@ -836,17 +838,21 @@ impl<T: Config<I>, I: Instance> ChangeMembers<T::AccountId> for Module<T, I> {
 		let mut outgoing = outgoing.to_vec();
 		outgoing.sort();
 		for h in Self::proposals().into_iter() {
-			<Voting<T, I>>::mutate(h, |v|
+			<Voting<T, I>>::mutate(h, |v| {
 				if let Some(mut votes) = v.take() {
-					votes.ayes = votes.ayes.into_iter()
+					votes.ayes = votes
+						.ayes
+						.into_iter()
 						.filter(|i| outgoing.binary_search(i).is_err())
 						.collect();
-					votes.nays = votes.nays.into_iter()
+					votes.nays = votes
+						.nays
+						.into_iter()
 						.filter(|i| outgoing.binary_search(i).is_err())
 						.collect();
 					*v = Some(votes);
 				}
-			);
+			});
 		}
 		Members::<T, I>::put(new);
 		Prime::<T, I>::kill();
@@ -872,10 +878,12 @@ impl<T: Config<I>, I: Instance> InitializeMembers<T::AccountId> for Module<T, I>
 
 /// Ensure that the origin `o` represents at least `n` members. Returns `Ok` or an `Err`
 /// otherwise.
-pub fn ensure_members<OuterOrigin, AccountId, I>(o: OuterOrigin, n: MemberCount)
-	-> result::Result<MemberCount, &'static str>
+pub fn ensure_members<OuterOrigin, AccountId, I>(
+	o: OuterOrigin,
+	n: MemberCount,
+) -> result::Result<MemberCount, &'static str>
 where
-	OuterOrigin: Into<result::Result<RawOrigin<AccountId, I>, OuterOrigin>>
+	OuterOrigin: Into<result::Result<RawOrigin<AccountId, I>, OuterOrigin>>,
 {
 	match o.into() {
 		Ok(RawOrigin::Members(x, _)) if x >= n => Ok(n),
@@ -883,12 +891,15 @@ where
 	}
 }
 
-pub struct EnsureMember<AccountId, I=DefaultInstance>(sp_std::marker::PhantomData<(AccountId, I)>);
+pub struct EnsureMember<AccountId, I = DefaultInstance>(
+	sp_std::marker::PhantomData<(AccountId, I)>,
+);
 impl<
-	O: Into<Result<RawOrigin<AccountId, I>, O>> + From<RawOrigin<AccountId, I>>,
-	AccountId: Default,
-	I,
-> EnsureOrigin<O> for EnsureMember<AccountId, I> {
+		O: Into<Result<RawOrigin<AccountId, I>, O>> + From<RawOrigin<AccountId, I>>,
+		AccountId: Default,
+		I,
+	> EnsureOrigin<O> for EnsureMember<AccountId, I>
+{
 	type Success = AccountId;
 	fn try_origin(o: O) -> Result<Self::Success, O> {
 		o.into().and_then(|o| match o {
@@ -903,13 +914,16 @@ impl<
 	}
 }
 
-pub struct EnsureMembers<N: U32, AccountId, I=DefaultInstance>(sp_std::marker::PhantomData<(N, AccountId, I)>);
+pub struct EnsureMembers<N: U32, AccountId, I = DefaultInstance>(
+	sp_std::marker::PhantomData<(N, AccountId, I)>,
+);
 impl<
-	O: Into<Result<RawOrigin<AccountId, I>, O>> + From<RawOrigin<AccountId, I>>,
-	N: U32,
-	AccountId,
-	I,
-> EnsureOrigin<O> for EnsureMembers<N, AccountId, I> {
+		O: Into<Result<RawOrigin<AccountId, I>, O>> + From<RawOrigin<AccountId, I>>,
+		N: U32,
+		AccountId,
+		I,
+	> EnsureOrigin<O> for EnsureMembers<N, AccountId, I>
+{
 	type Success = (MemberCount, MemberCount);
 	fn try_origin(o: O) -> Result<Self::Success, O> {
 		o.into().and_then(|o| match o {
@@ -924,16 +938,17 @@ impl<
 	}
 }
 
-pub struct EnsureProportionMoreThan<N: U32, D: U32, AccountId, I=DefaultInstance>(
-	sp_std::marker::PhantomData<(N, D, AccountId, I)>
+pub struct EnsureProportionMoreThan<N: U32, D: U32, AccountId, I = DefaultInstance>(
+	sp_std::marker::PhantomData<(N, D, AccountId, I)>,
 );
 impl<
-	O: Into<Result<RawOrigin<AccountId, I>, O>> + From<RawOrigin<AccountId, I>>,
-	N: U32,
-	D: U32,
-	AccountId,
-	I,
-> EnsureOrigin<O> for EnsureProportionMoreThan<N, D, AccountId, I> {
+		O: Into<Result<RawOrigin<AccountId, I>, O>> + From<RawOrigin<AccountId, I>>,
+		N: U32,
+		D: U32,
+		AccountId,
+		I,
+	> EnsureOrigin<O> for EnsureProportionMoreThan<N, D, AccountId, I>
+{
 	type Success = ();
 	fn try_origin(o: O) -> Result<Self::Success, O> {
 		o.into().and_then(|o| match o {
@@ -948,16 +963,17 @@ impl<
 	}
 }
 
-pub struct EnsureProportionAtLeast<N: U32, D: U32, AccountId, I=DefaultInstance>(
-	sp_std::marker::PhantomData<(N, D, AccountId, I)>
+pub struct EnsureProportionAtLeast<N: U32, D: U32, AccountId, I = DefaultInstance>(
+	sp_std::marker::PhantomData<(N, D, AccountId, I)>,
 );
 impl<
-	O: Into<Result<RawOrigin<AccountId, I>, O>> + From<RawOrigin<AccountId, I>>,
-	N: U32,
-	D: U32,
-	AccountId,
-	I,
-> EnsureOrigin<O> for EnsureProportionAtLeast<N, D, AccountId, I> {
+		O: Into<Result<RawOrigin<AccountId, I>, O>> + From<RawOrigin<AccountId, I>>,
+		N: U32,
+		D: U32,
+		AccountId,
+		I,
+	> EnsureOrigin<O> for EnsureProportionAtLeast<N, D, AccountId, I>
+{
 	type Success = ();
 	fn try_origin(o: O) -> Result<Self::Success, O> {
 		o.into().and_then(|o| match o {
@@ -975,15 +991,16 @@ impl<
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use frame_support::{Hashable, assert_ok, assert_noop, parameter_types};
+	use crate as collective;
+	use frame_support::{assert_noop, assert_ok, parameter_types, Hashable};
 	use frame_system::{self as system, EventRecord, Phase};
 	use hex_literal::hex;
 	use sp_core::H256;
 	use sp_runtime::{
-		traits::{BlakeTwo256, IdentityLookup}, testing::Header,
+		testing::Header,
+		traits::{BlakeTwo256, IdentityLookup},
 		BuildStorage,
 	};
-	use crate as collective;
 
 	parameter_types! {
 		pub const BlockHashCount: u64 = 250;
@@ -1076,7 +1093,10 @@ mod tests {
 				phantom: Default::default(),
 			},
 			default_collective: Default::default(),
-		}.build_storage().unwrap().into();
+		}
+		.build_storage()
+		.unwrap()
+		.into();
 		ext.execute_with(|| System::set_block_number(1));
 		ext
 	}
@@ -1101,65 +1121,114 @@ mod tests {
 			let proposal_weight = proposal.get_dispatch_info().weight;
 			let hash = BlakeTwo256::hash_of(&proposal);
 
-			assert_ok!(Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone()), proposal_len));
+			assert_ok!(Collective::propose(
+				Origin::signed(1),
+				3,
+				Box::new(proposal.clone()),
+				proposal_len
+			));
 			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, true));
 			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 0, true));
 
 			System::set_block_number(3);
 			assert_noop!(
-				Collective::close(Origin::signed(4), hash.clone(), 0, proposal_weight, proposal_len),
+				Collective::close(
+					Origin::signed(4),
+					hash.clone(),
+					0,
+					proposal_weight,
+					proposal_len
+				),
 				Error::<Test, Instance1>::TooEarly
 			);
 
 			System::set_block_number(4);
-			assert_ok!(Collective::close(Origin::signed(4), hash.clone(), 0, proposal_weight, proposal_len));
-
-			let record = |event| EventRecord { phase: Phase::Initialization, event, topics: vec![] };
-			assert_eq!(System::events(), vec![
-				record(Event::Collective(RawEvent::Proposed(1, 0, hash.clone(), 3))),
-				record(Event::Collective(RawEvent::Voted(1, hash.clone(), true, 1, 0))),
-				record(Event::Collective(RawEvent::Voted(2, hash.clone(), true, 2, 0))),
-				record(Event::Collective(RawEvent::Closed(hash.clone(), 2, 1))),
-				record(Event::Collective(RawEvent::Disapproved(hash.clone())))
-			]);
+			assert_ok!(Collective::close(
+				Origin::signed(4),
+				hash.clone(),
+				0,
+				proposal_weight,
+				proposal_len
+			));
+
+			let record =
+				|event| EventRecord { phase: Phase::Initialization, event, topics: vec![] };
+			assert_eq!(
+				System::events(),
+				vec![
+					record(Event::Collective(RawEvent::Proposed(1, 0, hash.clone(), 3))),
+					record(Event::Collective(RawEvent::Voted(1, hash.clone(), true, 1, 0))),
+					record(Event::Collective(RawEvent::Voted(2, hash.clone(), true, 2, 0))),
+					record(Event::Collective(RawEvent::Closed(hash.clone(), 2, 1))),
+					record(Event::Collective(RawEvent::Disapproved(hash.clone())))
+				]
+			);
 		});
 	}
 
 	#[test]
 	fn proposal_weight_limit_works_on_approve() {
 		new_test_ext().execute_with(|| {
-			let proposal = Call::Collective(crate::Call::set_members(vec![1, 2, 3], None, MaxMembers::get()));
+			let proposal =
+				Call::Collective(crate::Call::set_members(vec![1, 2, 3], None, MaxMembers::get()));
 			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
 			let proposal_weight = proposal.get_dispatch_info().weight;
 			let hash = BlakeTwo256::hash_of(&proposal);
 			// Set 1 as prime voter
 			Prime::<Test, Instance1>::set(Some(1));
-			assert_ok!(Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone()), proposal_len));
+			assert_ok!(Collective::propose(
+				Origin::signed(1),
+				3,
+				Box::new(proposal.clone()),
+				proposal_len
+			));
 			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, true));
 			// With 1's prime vote, this should pass
 			System::set_block_number(4);
 			assert_noop!(
-				Collective::close(Origin::signed(4), hash.clone(), 0, proposal_weight - 100, proposal_len),
+				Collective::close(
+					Origin::signed(4),
+					hash.clone(),
+					0,
+					proposal_weight - 100,
+					proposal_len
+				),
 				Error::<Test, Instance1>::WrongProposalWeight
 			);
-			assert_ok!(Collective::close(Origin::signed(4), hash.clone(), 0, proposal_weight, proposal_len));
+			assert_ok!(Collective::close(
+				Origin::signed(4),
+				hash.clone(),
+				0,
+				proposal_weight,
+				proposal_len
+			));
 		})
 	}
 
 	#[test]
 	fn proposal_weight_limit_ignored_on_disapprove() {
 		new_test_ext().execute_with(|| {
-			let proposal = Call::Collective(crate::Call::set_members(vec![1, 2, 3], None, MaxMembers::get()));
+			let proposal =
+				Call::Collective(crate::Call::set_members(vec![1, 2, 3], None, MaxMembers::get()));
 			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
 			let proposal_weight = proposal.get_dispatch_info().weight;
 			let hash = BlakeTwo256::hash_of(&proposal);
 
-			assert_ok!(Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone()), proposal_len));
+			assert_ok!(Collective::propose(
+				Origin::signed(1),
+				3,
+				Box::new(proposal.clone()),
+				proposal_len
+			));
 			// No votes, this proposal wont pass
 			System::set_block_number(4);
-			assert_ok!(
-				Collective::close(Origin::signed(4), hash.clone(), 0, proposal_weight - 100, proposal_len)
-			);
+			assert_ok!(Collective::close(
+				Origin::signed(4),
+				hash.clone(),
+				0,
+				proposal_weight - 100,
+				proposal_len
+			));
 		})
 	}
 
@@ -1170,23 +1239,43 @@ mod tests {
 			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
 			let proposal_weight = proposal.get_dispatch_info().weight;
 			let hash = BlakeTwo256::hash_of(&proposal);
-			assert_ok!(Collective::set_members(Origin::root(), vec![1, 2, 3], Some(3), MaxMembers::get()));
-
-			assert_ok!(Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone()), proposal_len));
+			assert_ok!(Collective::set_members(
+				Origin::root(),
+				vec![1, 2, 3],
+				Some(3),
+				MaxMembers::get()
+			));
+
+			assert_ok!(Collective::propose(
+				Origin::signed(1),
+				3,
+				Box::new(proposal.clone()),
+				proposal_len
+			));
 			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, true));
 			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 0, true));
 
 			System::set_block_number(4);
-			assert_ok!(Collective::close(Origin::signed(4), hash.clone(), 0, proposal_weight, proposal_len));
-
-			let record = |event| EventRecord { phase: Phase::Initialization, event, topics: vec![] };
-			assert_eq!(System::events(), vec![
-				record(Event::Collective(RawEvent::Proposed(1, 0, hash.clone(), 3))),
-				record(Event::Collective(RawEvent::Voted(1, hash.clone(), true, 1, 0))),
-				record(Event::Collective(RawEvent::Voted(2, hash.clone(), true, 2, 0))),
-				record(Event::Collective(RawEvent::Closed(hash.clone(), 2, 1))),
-				record(Event::Collective(RawEvent::Disapproved(hash.clone())))
-			]);
+			assert_ok!(Collective::close(
+				Origin::signed(4),
+				hash.clone(),
+				0,
+				proposal_weight,
+				proposal_len
+			));
+
+			let record =
+				|event| EventRecord { phase: Phase::Initialization, event, topics: vec![] };
+			assert_eq!(
+				System::events(),
+				vec![
+					record(Event::Collective(RawEvent::Proposed(1, 0, hash.clone(), 3))),
+					record(Event::Collective(RawEvent::Voted(1, hash.clone(), true, 1, 0))),
+					record(Event::Collective(RawEvent::Voted(2, hash.clone(), true, 2, 0))),
+					record(Event::Collective(RawEvent::Closed(hash.clone(), 2, 1))),
+					record(Event::Collective(RawEvent::Disapproved(hash.clone())))
+				]
+			);
 		});
 	}
 
@@ -1197,24 +1286,47 @@ mod tests {
 			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
 			let proposal_weight = proposal.get_dispatch_info().weight;
 			let hash = BlakeTwo256::hash_of(&proposal);
-			assert_ok!(Collective::set_members(Origin::root(), vec![1, 2, 3], Some(1), MaxMembers::get()));
-
-			assert_ok!(Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone()), proposal_len));
+			assert_ok!(Collective::set_members(
+				Origin::root(),
+				vec![1, 2, 3],
+				Some(1),
+				MaxMembers::get()
+			));
+
+			assert_ok!(Collective::propose(
+				Origin::signed(1),
+				3,
+				Box::new(proposal.clone()),
+				proposal_len
+			));
 			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, true));
 			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 0, true));
 
 			System::set_block_number(4);
-			assert_ok!(Collective::close(Origin::signed(4), hash.clone(), 0, proposal_weight, proposal_len));
-
-			let record = |event| EventRecord { phase: Phase::Initialization, event, topics: vec![] };
-			assert_eq!(System::events(), vec![
-				record(Event::Collective(RawEvent::Proposed(1, 0, hash.clone(), 3))),
-				record(Event::Collective(RawEvent::Voted(1, hash.clone(), true, 1, 0))),
-				record(Event::Collective(RawEvent::Voted(2, hash.clone(), true, 2, 0))),
-				record(Event::Collective(RawEvent::Closed(hash.clone(), 3, 0))),
-				record(Event::Collective(RawEvent::Approved(hash.clone()))),
-				record(Event::Collective(RawEvent::Executed(hash.clone(), Err(DispatchError::BadOrigin))))
-			]);
+			assert_ok!(Collective::close(
+				Origin::signed(4),
+				hash.clone(),
+				0,
+				proposal_weight,
+				proposal_len
+			));
+
+			let record =
+				|event| EventRecord { phase: Phase::Initialization, event, topics: vec![] };
+			assert_eq!(
+				System::events(),
+				vec![
+					record(Event::Collective(RawEvent::Proposed(1, 0, hash.clone(), 3))),
+					record(Event::Collective(RawEvent::Voted(1, hash.clone(), true, 1, 0))),
+					record(Event::Collective(RawEvent::Voted(2, hash.clone(), true, 2, 0))),
+					record(Event::Collective(RawEvent::Closed(hash.clone(), 3, 0))),
+					record(Event::Collective(RawEvent::Approved(hash.clone()))),
+					record(Event::Collective(RawEvent::Executed(
+						hash.clone(),
+						Err(DispatchError::BadOrigin)
+					)))
+				]
+			);
 		});
 	}
 
@@ -1225,26 +1337,49 @@ mod tests {
 			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
 			let proposal_weight = proposal.get_dispatch_info().weight;
 			let hash = BlakeTwo256::hash_of(&proposal);
-			assert_ok!(CollectiveMajority::set_members(Origin::root(), vec![1, 2, 3, 4, 5], Some(5), MaxMembers::get()));
-
-			assert_ok!(CollectiveMajority::propose(Origin::signed(1), 5, Box::new(proposal.clone()), proposal_len));
+			assert_ok!(CollectiveMajority::set_members(
+				Origin::root(),
+				vec![1, 2, 3, 4, 5],
+				Some(5),
+				MaxMembers::get()
+			));
+
+			assert_ok!(CollectiveMajority::propose(
+				Origin::signed(1),
+				5,
+				Box::new(proposal.clone()),
+				proposal_len
+			));
 			assert_ok!(CollectiveMajority::vote(Origin::signed(1), hash.clone(), 0, true));
 			assert_ok!(CollectiveMajority::vote(Origin::signed(2), hash.clone(), 0, true));
 			assert_ok!(CollectiveMajority::vote(Origin::signed(3), hash.clone(), 0, true));
 
 			System::set_block_number(4);
-			assert_ok!(CollectiveMajority::close(Origin::signed(4), hash.clone(), 0, proposal_weight, proposal_len));
-
-			let record = |event| EventRecord { phase: Phase::Initialization, event, topics: vec![] };
-			assert_eq!(System::events(), vec![
-				record(Event::CollectiveMajority(RawEvent::Proposed(1, 0, hash.clone(), 5))),
-				record(Event::CollectiveMajority(RawEvent::Voted(1, hash.clone(), true, 1, 0))),
-				record(Event::CollectiveMajority(RawEvent::Voted(2, hash.clone(), true, 2, 0))),
-				record(Event::CollectiveMajority(RawEvent::Voted(3, hash.clone(), true, 3, 0))),
-				record(Event::CollectiveMajority(RawEvent::Closed(hash.clone(), 5, 0))),
-				record(Event::CollectiveMajority(RawEvent::Approved(hash.clone()))),
-				record(Event::CollectiveMajority(RawEvent::Executed(hash.clone(), Err(DispatchError::BadOrigin))))
-			]);
+			assert_ok!(CollectiveMajority::close(
+				Origin::signed(4),
+				hash.clone(),
+				0,
+				proposal_weight,
+				proposal_len
+			));
+
+			let record =
+				|event| EventRecord { phase: Phase::Initialization, event, topics: vec![] };
+			assert_eq!(
+				System::events(),
+				vec![
+					record(Event::CollectiveMajority(RawEvent::Proposed(1, 0, hash.clone(), 5))),
+					record(Event::CollectiveMajority(RawEvent::Voted(1, hash.clone(), true, 1, 0))),
+					record(Event::CollectiveMajority(RawEvent::Voted(2, hash.clone(), true, 2, 0))),
+					record(Event::CollectiveMajority(RawEvent::Voted(3, hash.clone(), true, 3, 0))),
+					record(Event::CollectiveMajority(RawEvent::Closed(hash.clone(), 5, 0))),
+					record(Event::CollectiveMajority(RawEvent::Approved(hash.clone()))),
+					record(Event::CollectiveMajority(RawEvent::Executed(
+						hash.clone(),
+						Err(DispatchError::BadOrigin)
+					)))
+				]
+			);
 		});
 	}
 
@@ -1255,7 +1390,12 @@ mod tests {
 			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
 			let hash = BlakeTwo256::hash_of(&proposal);
 			let end = 4;
-			assert_ok!(Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone()), proposal_len));
+			assert_ok!(Collective::propose(
+				Origin::signed(1),
+				3,
+				Box::new(proposal.clone()),
+				proposal_len
+			));
 			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, true));
 			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 0, true));
 			assert_eq!(
@@ -1271,7 +1411,12 @@ mod tests {
 			let proposal = make_proposal(69);
 			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
 			let hash = BlakeTwo256::hash_of(&proposal);
-			assert_ok!(Collective::propose(Origin::signed(2), 2, Box::new(proposal.clone()), proposal_len));
+			assert_ok!(Collective::propose(
+				Origin::signed(2),
+				2,
+				Box::new(proposal.clone()),
+				proposal_len
+			));
 			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 1, true));
 			assert_ok!(Collective::vote(Origin::signed(3), hash.clone(), 1, false));
 			assert_eq!(
@@ -1293,14 +1438,24 @@ mod tests {
 			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
 			let hash = BlakeTwo256::hash_of(&proposal);
 			let end = 4;
-			assert_ok!(Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone()), proposal_len));
+			assert_ok!(Collective::propose(
+				Origin::signed(1),
+				3,
+				Box::new(proposal.clone()),
+				proposal_len
+			));
 			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, true));
 			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 0, true));
 			assert_eq!(
 				Collective::voting(&hash),
 				Some(Votes { index: 0, threshold: 3, ayes: vec![1, 2], nays: vec![], end })
 			);
-			assert_ok!(Collective::set_members(Origin::root(), vec![2, 3, 4], None, MaxMembers::get()));
+			assert_ok!(Collective::set_members(
+				Origin::root(),
+				vec![2, 3, 4],
+				None,
+				MaxMembers::get()
+			));
 			assert_eq!(
 				Collective::voting(&hash),
 				Some(Votes { index: 0, threshold: 3, ayes: vec![2], nays: vec![], end })
@@ -1309,14 +1464,24 @@ mod tests {
 			let proposal = make_proposal(69);
 			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
 			let hash = BlakeTwo256::hash_of(&proposal);
-			assert_ok!(Collective::propose(Origin::signed(2), 2, Box::new(proposal.clone()), proposal_len));
+			assert_ok!(Collective::propose(
+				Origin::signed(2),
+				2,
+				Box::new(proposal.clone()),
+				proposal_len
+			));
 			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 1, true));
 			assert_ok!(Collective::vote(Origin::signed(3), hash.clone(), 1, false));
 			assert_eq!(
 				Collective::voting(&hash),
 				Some(Votes { index: 1, threshold: 2, ayes: vec![2], nays: vec![3], end })
 			);
-			assert_ok!(Collective::set_members(Origin::root(), vec![2, 4], None, MaxMembers::get()));
+			assert_ok!(Collective::set_members(
+				Origin::root(),
+				vec![2, 4],
+				None,
+				MaxMembers::get()
+			));
 			assert_eq!(
 				Collective::voting(&hash),
 				Some(Votes { index: 1, threshold: 2, ayes: vec![2], nays: vec![], end })
@@ -1331,7 +1496,12 @@ mod tests {
 			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
 			let hash = proposal.blake2_256().into();
 			let end = 4;
-			assert_ok!(Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone()), proposal_len));
+			assert_ok!(Collective::propose(
+				Origin::signed(1),
+				3,
+				Box::new(proposal.clone()),
+				proposal_len
+			));
 			assert_eq!(*Collective::proposals(), vec![hash]);
 			assert_eq!(Collective::proposal_of(&hash), Some(proposal));
 			assert_eq!(
@@ -1339,25 +1509,27 @@ mod tests {
 				Some(Votes { index: 0, threshold: 3, ayes: vec![], nays: vec![], end })
 			);
 
-			assert_eq!(System::events(), vec![
-				EventRecord {
+			assert_eq!(
+				System::events(),
+				vec![EventRecord {
 					phase: Phase::Initialization,
 					event: Event::Collective(RawEvent::Proposed(
 						1,
 						0,
-						hex!["68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"].into(),
+						hex!["68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"]
+							.into(),
 						3,
 					)),
 					topics: vec![],
-				}
-			]);
+				}]
+			);
 		});
 	}
 
 	#[test]
 	fn limit_active_proposals() {
 		new_test_ext().execute_with(|| {
-			for i in 0 .. MaxProposals::get() {
+			for i in 0..MaxProposals::get() {
 				let proposal = make_proposal(i as u64);
 				let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
 				assert_ok!(Collective::propose(
@@ -1379,14 +1551,24 @@ mod tests {
 	#[test]
 	fn correct_validate_and_get_proposal() {
 		new_test_ext().execute_with(|| {
-			let proposal = Call::Collective(crate::Call::set_members(vec![1, 2, 3], None, MaxMembers::get()));
+			let proposal =
+				Call::Collective(crate::Call::set_members(vec![1, 2, 3], None, MaxMembers::get()));
 			let length = proposal.encode().len() as u32;
-			assert_ok!(Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone()), length));
+			assert_ok!(Collective::propose(
+				Origin::signed(1),
+				3,
+				Box::new(proposal.clone()),
+				length
+			));
 
 			let hash = BlakeTwo256::hash_of(&proposal);
 			let weight = proposal.get_dispatch_info().weight;
 			assert_noop!(
-				Collective::validate_and_get_proposal(&BlakeTwo256::hash_of(&vec![3; 4]), length, weight),
+				Collective::validate_and_get_proposal(
+					&BlakeTwo256::hash_of(&vec![3; 4]),
+					length,
+					weight
+				),
 				Error::<Test, Instance1>::ProposalMissing
 			);
 			assert_noop!(
@@ -1411,7 +1593,12 @@ mod tests {
 			let proposal = make_proposal(42);
 			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
 			assert_noop!(
-				Collective::propose(Origin::signed(42), 3, Box::new(proposal.clone()), proposal_len),
+				Collective::propose(
+					Origin::signed(42),
+					3,
+					Box::new(proposal.clone()),
+					proposal_len
+				),
 				Error::<Test, Instance1>::NotMember
 			);
 		});
@@ -1423,7 +1610,12 @@ mod tests {
 			let proposal = make_proposal(42);
 			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
 			let hash: H256 = proposal.blake2_256().into();
-			assert_ok!(Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone()), proposal_len));
+			assert_ok!(Collective::propose(
+				Origin::signed(1),
+				3,
+				Box::new(proposal.clone()),
+				proposal_len
+			));
 			assert_noop!(
 				Collective::vote(Origin::signed(42), hash.clone(), 0, true),
 				Error::<Test, Instance1>::NotMember,
@@ -1438,7 +1630,12 @@ mod tests {
 			let proposal = make_proposal(42);
 			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
 			let hash: H256 = proposal.blake2_256().into();
-			assert_ok!(Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone()), proposal_len));
+			assert_ok!(Collective::propose(
+				Origin::signed(1),
+				3,
+				Box::new(proposal.clone()),
+				proposal_len
+			));
 			assert_noop!(
 				Collective::vote(Origin::signed(2), hash.clone(), 1, true),
 				Error::<Test, Instance1>::WrongIndex,
@@ -1453,7 +1650,12 @@ mod tests {
 			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
 			let hash: H256 = proposal.blake2_256().into();
 			let end = 4;
-			assert_ok!(Collective::propose(Origin::signed(1), 2, Box::new(proposal.clone()), proposal_len));
+			assert_ok!(Collective::propose(
+				Origin::signed(1),
+				2,
+				Box::new(proposal.clone()),
+				proposal_len
+			));
 			// Initially there a no votes when the motion is proposed.
 			assert_eq!(
 				Collective::voting(&hash),
@@ -1482,41 +1684,52 @@ mod tests {
 				Error::<Test, Instance1>::DuplicateVote,
 			);
 
-			assert_eq!(System::events(), vec![
-				EventRecord {
-					phase: Phase::Initialization,
-					event: Event::Collective(RawEvent::Proposed(
-						1,
-						0,
-						hex!["68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"].into(),
-						2,
-					)),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: Event::Collective(RawEvent::Voted(
-						1,
-						hex!["68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"]
+			assert_eq!(
+				System::events(),
+				vec![
+					EventRecord {
+						phase: Phase::Initialization,
+						event: Event::Collective(RawEvent::Proposed(
+							1,
+							0,
+							hex![
+								"68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"
+							]
 							.into(),
-						true,
-						1,
-						0,
-					)),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: Event::Collective(RawEvent::Voted(
-						1,
-						hex!["68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"].into(),
-						false,
-						0,
-						1,
-					)),
-					topics: vec![],
-				}
-			]);
+							2,
+						)),
+						topics: vec![],
+					},
+					EventRecord {
+						phase: Phase::Initialization,
+						event: Event::Collective(RawEvent::Voted(
+							1,
+							hex![
+								"68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"
+							]
+							.into(),
+							true,
+							1,
+							0,
+						)),
+						topics: vec![],
+					},
+					EventRecord {
+						phase: Phase::Initialization,
+						event: Event::Collective(RawEvent::Voted(
+							1,
+							hex![
+								"68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"
+							]
+							.into(),
+							false,
+							0,
+							1,
+						)),
+						topics: vec![],
+					}
+				]
+			);
 		});
 	}
 
@@ -1527,62 +1740,40 @@ mod tests {
 			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
 			let hash: H256 = proposal.blake2_256().into();
 			let end = 4;
-			assert_ok!(
-				Collective::propose(
-					Origin::signed(1),
-					2,
-					Box::new(proposal.clone()),
-					proposal_len,
-				)
-			);
+			assert_ok!(Collective::propose(
+				Origin::signed(1),
+				2,
+				Box::new(proposal.clone()),
+				proposal_len,
+			));
 			assert_eq!(
 				Collective::voting(&hash),
 				Some(Votes { index: 0, threshold: 2, ayes: vec![], nays: vec![], end })
 			);
 
 			// For the motion, acc 2's first vote, expecting Ok with Pays::No.
-			let vote_rval: DispatchResultWithPostInfo = Collective::vote(
-				Origin::signed(2),
-				hash.clone(),
-				0,
-				true,
-			);
+			let vote_rval: DispatchResultWithPostInfo =
+				Collective::vote(Origin::signed(2), hash.clone(), 0, true);
 			assert_eq!(vote_rval.unwrap().pays_fee, Pays::No);
 
 			// Duplicate vote, expecting error with Pays::Yes.
-			let vote_rval: DispatchResultWithPostInfo = Collective::vote(
-				Origin::signed(2),
-				hash.clone(),
-				0,
-				true,
-			);
+			let vote_rval: DispatchResultWithPostInfo =
+				Collective::vote(Origin::signed(2), hash.clone(), 0, true);
 			assert_eq!(vote_rval.unwrap_err().post_info.pays_fee, Pays::Yes);
 
 			// Modifying vote, expecting ok with Pays::Yes.
-			let vote_rval: DispatchResultWithPostInfo = Collective::vote(
-				Origin::signed(2),
-				hash.clone(),
-				0,
-				false,
-			);
+			let vote_rval: DispatchResultWithPostInfo =
+				Collective::vote(Origin::signed(2), hash.clone(), 0, false);
 			assert_eq!(vote_rval.unwrap().pays_fee, Pays::Yes);
 
 			// For the motion, acc 3's first vote, expecting Ok with Pays::No.
-			let vote_rval: DispatchResultWithPostInfo = Collective::vote(
-				Origin::signed(3),
-				hash.clone(),
-				0,
-				true,
-			);
+			let vote_rval: DispatchResultWithPostInfo =
+				Collective::vote(Origin::signed(3), hash.clone(), 0, true);
 			assert_eq!(vote_rval.unwrap().pays_fee, Pays::No);
 
 			// acc 3 modify the vote, expecting Ok with Pays::Yes.
-			let vote_rval: DispatchResultWithPostInfo = Collective::vote(
-				Origin::signed(3),
-				hash.clone(),
-				0,
-				false,
-			);
+			let vote_rval: DispatchResultWithPostInfo =
+				Collective::vote(Origin::signed(3), hash.clone(), 0, false);
 			assert_eq!(vote_rval.unwrap().pays_fee, Pays::Yes);
 
 			// Test close() Extrincis | Check DispatchResultWithPostInfo with Pay Info
@@ -1617,11 +1808,27 @@ mod tests {
 			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
 			let proposal_weight = proposal.get_dispatch_info().weight;
 			let hash: H256 = proposal.blake2_256().into();
-			assert_ok!(Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone()), proposal_len));
+			assert_ok!(Collective::propose(
+				Origin::signed(1),
+				3,
+				Box::new(proposal.clone()),
+				proposal_len
+			));
 			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 0, false));
-			assert_ok!(Collective::close(Origin::signed(2), hash.clone(), 0, proposal_weight, proposal_len));
+			assert_ok!(Collective::close(
+				Origin::signed(2),
+				hash.clone(),
+				0,
+				proposal_weight,
+				proposal_len
+			));
 			assert_eq!(*Collective::proposals(), vec![]);
-			assert_ok!(Collective::propose(Origin::signed(1), 2, Box::new(proposal.clone()), proposal_len));
+			assert_ok!(Collective::propose(
+				Origin::signed(1),
+				2,
+				Box::new(proposal.clone()),
+				proposal_len
+			));
 			assert_eq!(*Collective::proposals(), vec![hash]);
 		});
 	}
@@ -1633,60 +1840,90 @@ mod tests {
 			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
 			let proposal_weight = proposal.get_dispatch_info().weight;
 			let hash: H256 = proposal.blake2_256().into();
-			assert_ok!(Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone()), proposal_len));
+			assert_ok!(Collective::propose(
+				Origin::signed(1),
+				3,
+				Box::new(proposal.clone()),
+				proposal_len
+			));
 			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, true));
 			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 0, false));
-			assert_ok!(Collective::close(Origin::signed(2), hash.clone(), 0, proposal_weight, proposal_len));
+			assert_ok!(Collective::close(
+				Origin::signed(2),
+				hash.clone(),
+				0,
+				proposal_weight,
+				proposal_len
+			));
 
-			assert_eq!(System::events(), vec![
-				EventRecord {
-					phase: Phase::Initialization,
-					event: Event::Collective(
-						RawEvent::Proposed(
+			assert_eq!(
+				System::events(),
+				vec![
+					EventRecord {
+						phase: Phase::Initialization,
+						event: Event::Collective(RawEvent::Proposed(
 							1,
 							0,
-							hex!["68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"].into(),
+							hex![
+								"68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"
+							]
+							.into(),
 							3,
 						)),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: Event::Collective(RawEvent::Voted(
-						1,
-						hex!["68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"].into(),
-						true,
-						1,
-						0,
-					)),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: Event::Collective(RawEvent::Voted(
-						2,
-						hex!["68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"].into(),
-						false,
-						1,
-						1,
-					)),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: Event::Collective(RawEvent::Closed(
-						hex!["68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"].into(), 1, 1,
-					)),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: Event::Collective(RawEvent::Disapproved(
-						hex!["68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"].into(),
-					)),
-					topics: vec![],
-				}
-			]);
+						topics: vec![],
+					},
+					EventRecord {
+						phase: Phase::Initialization,
+						event: Event::Collective(RawEvent::Voted(
+							1,
+							hex![
+								"68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"
+							]
+							.into(),
+							true,
+							1,
+							0,
+						)),
+						topics: vec![],
+					},
+					EventRecord {
+						phase: Phase::Initialization,
+						event: Event::Collective(RawEvent::Voted(
+							2,
+							hex![
+								"68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"
+							]
+							.into(),
+							false,
+							1,
+							1,
+						)),
+						topics: vec![],
+					},
+					EventRecord {
+						phase: Phase::Initialization,
+						event: Event::Collective(RawEvent::Closed(
+							hex![
+								"68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"
+							]
+							.into(),
+							1,
+							1,
+						)),
+						topics: vec![],
+					},
+					EventRecord {
+						phase: Phase::Initialization,
+						event: Event::Collective(RawEvent::Disapproved(
+							hex![
+								"68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"
+							]
+							.into(),
+						)),
+						topics: vec![],
+					}
+				]
+			);
 		});
 	}
 
@@ -1697,85 +1934,134 @@ mod tests {
 			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
 			let proposal_weight = proposal.get_dispatch_info().weight;
 			let hash: H256 = proposal.blake2_256().into();
-			assert_ok!(Collective::propose(Origin::signed(1), 2, Box::new(proposal.clone()), proposal_len));
+			assert_ok!(Collective::propose(
+				Origin::signed(1),
+				2,
+				Box::new(proposal.clone()),
+				proposal_len
+			));
 			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, true));
 			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 0, true));
-			assert_ok!(Collective::close(Origin::signed(2), hash.clone(), 0, proposal_weight, proposal_len));
+			assert_ok!(Collective::close(
+				Origin::signed(2),
+				hash.clone(),
+				0,
+				proposal_weight,
+				proposal_len
+			));
 
-			assert_eq!(System::events(), vec![
-				EventRecord {
-					phase: Phase::Initialization,
-					event: Event::Collective(RawEvent::Proposed(
-						1,
-						0,
-						hex!["68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"].into(),
-						2,
-					)),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: Event::Collective(RawEvent::Voted(
-						1,
-						hex!["68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"].into(),
-						true,
-						1,
-						0,
-					)),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: Event::Collective(RawEvent::Voted(
-						2,
-						hex!["68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"].into(),
-						true,
-						2,
-						0,
-					)),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: Event::Collective(RawEvent::Closed(
-						hex!["68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"].into(), 2, 0,
-					)),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: Event::Collective(RawEvent::Approved(
-						hex!["68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"].into(),
-					)),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: Event::Collective(RawEvent::Executed(
-						hex!["68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"].into(),
-						Err(DispatchError::BadOrigin),
-					)),
-					topics: vec![],
-				}
-			]);
+			assert_eq!(
+				System::events(),
+				vec![
+					EventRecord {
+						phase: Phase::Initialization,
+						event: Event::Collective(RawEvent::Proposed(
+							1,
+							0,
+							hex![
+								"68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"
+							]
+							.into(),
+							2,
+						)),
+						topics: vec![],
+					},
+					EventRecord {
+						phase: Phase::Initialization,
+						event: Event::Collective(RawEvent::Voted(
+							1,
+							hex![
+								"68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"
+							]
+							.into(),
+							true,
+							1,
+							0,
+						)),
+						topics: vec![],
+					},
+					EventRecord {
+						phase: Phase::Initialization,
+						event: Event::Collective(RawEvent::Voted(
+							2,
+							hex![
+								"68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"
+							]
+							.into(),
+							true,
+							2,
+							0,
+						)),
+						topics: vec![],
+					},
+					EventRecord {
+						phase: Phase::Initialization,
+						event: Event::Collective(RawEvent::Closed(
+							hex![
+								"68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"
+							]
+							.into(),
+							2,
+							0,
+						)),
+						topics: vec![],
+					},
+					EventRecord {
+						phase: Phase::Initialization,
+						event: Event::Collective(RawEvent::Approved(
+							hex![
+								"68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"
+							]
+							.into(),
+						)),
+						topics: vec![],
+					},
+					EventRecord {
+						phase: Phase::Initialization,
+						event: Event::Collective(RawEvent::Executed(
+							hex![
+								"68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"
+							]
+							.into(),
+							Err(DispatchError::BadOrigin),
+						)),
+						topics: vec![],
+					}
+				]
+			);
 		});
 	}
 
 	#[test]
 	fn motion_with_no_votes_closes_with_disapproval() {
 		new_test_ext().execute_with(|| {
-			let record = |event| EventRecord { phase: Phase::Initialization, event, topics: vec![] };
+			let record =
+				|event| EventRecord { phase: Phase::Initialization, event, topics: vec![] };
 			let proposal = make_proposal(42);
 			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
 			let proposal_weight = proposal.get_dispatch_info().weight;
 			let hash: H256 = proposal.blake2_256().into();
-			assert_ok!(Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone()), proposal_len));
-			assert_eq!(System::events()[0], record(Event::Collective(RawEvent::Proposed(1, 0, hash.clone(), 3))));
+			assert_ok!(Collective::propose(
+				Origin::signed(1),
+				3,
+				Box::new(proposal.clone()),
+				proposal_len
+			));
+			assert_eq!(
+				System::events()[0],
+				record(Event::Collective(RawEvent::Proposed(1, 0, hash.clone(), 3)))
+			);
 
 			// Closing the motion too early is not possible because it has neither
 			// an approving or disapproving simple majority due to the lack of votes.
 			assert_noop!(
-				Collective::close(Origin::signed(2), hash.clone(), 0, proposal_weight, proposal_len),
+				Collective::close(
+					Origin::signed(2),
+					hash.clone(),
+					0,
+					proposal_weight,
+					proposal_len
+				),
 				Error::<Test, Instance1>::TooEarly
 			);
 
@@ -1783,13 +2069,24 @@ mod tests {
 			let closing_block = System::block_number() + MotionDuration::get();
 			System::set_block_number(closing_block);
 			// we can successfully close the motion.
-			assert_ok!(Collective::close(Origin::signed(2), hash.clone(), 0, proposal_weight, proposal_len));
+			assert_ok!(Collective::close(
+				Origin::signed(2),
+				hash.clone(),
+				0,
+				proposal_weight,
+				proposal_len
+			));
 
 			// Events show that the close ended in a disapproval.
-			assert_eq!(System::events()[1], record(Event::Collective(RawEvent::Closed(hash.clone(), 0, 3))));
-			assert_eq!(System::events()[2], record(Event::Collective(RawEvent::Disapproved(hash.clone()))));
+			assert_eq!(
+				System::events()[1],
+				record(Event::Collective(RawEvent::Closed(hash.clone(), 0, 3)))
+			);
+			assert_eq!(
+				System::events()[2],
+				record(Event::Collective(RawEvent::Disapproved(hash.clone())))
+			);
 		})
-
 	}
 
 	#[test]
@@ -1801,7 +2098,12 @@ mod tests {
 			let proposal = make_proposal(42);
 			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
 			let hash: H256 = proposal.blake2_256().into();
-			assert_ok!(Collective::propose(Origin::signed(1), 2, Box::new(proposal.clone()), proposal_len));
+			assert_ok!(Collective::propose(
+				Origin::signed(1),
+				2,
+				Box::new(proposal.clone()),
+				proposal_len
+			));
 			// First we make the proposal succeed
 			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, true));
 			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 0, true));
@@ -1828,19 +2130,28 @@ mod tests {
 			let proposal = make_proposal(42);
 			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
 			let hash: H256 = proposal.blake2_256().into();
-			assert_ok!(Collective::propose(Origin::signed(1), 2, Box::new(proposal.clone()), proposal_len));
+			assert_ok!(Collective::propose(
+				Origin::signed(1),
+				2,
+				Box::new(proposal.clone()),
+				proposal_len
+			));
 			// Proposal would normally succeed
 			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, true));
 			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 0, true));
 			// But Root can disapprove and remove it anyway
 			assert_ok!(Collective::disapprove_proposal(Origin::root(), hash.clone()));
-			let record = |event| EventRecord { phase: Phase::Initialization, event, topics: vec![] };
-			assert_eq!(System::events(), vec![
-				record(Event::Collective(RawEvent::Proposed(1, 0, hash.clone(), 2))),
-				record(Event::Collective(RawEvent::Voted(1, hash.clone(), true, 1, 0))),
-				record(Event::Collective(RawEvent::Voted(2, hash.clone(), true, 2, 0))),
-				record(Event::Collective(RawEvent::Disapproved(hash.clone()))),
-			]);
+			let record =
+				|event| EventRecord { phase: Phase::Initialization, event, topics: vec![] };
+			assert_eq!(
+				System::events(),
+				vec![
+					record(Event::Collective(RawEvent::Proposed(1, 0, hash.clone(), 2))),
+					record(Event::Collective(RawEvent::Voted(1, hash.clone(), true, 1, 0))),
+					record(Event::Collective(RawEvent::Voted(2, hash.clone(), true, 2, 0))),
+					record(Event::Collective(RawEvent::Disapproved(hash.clone()))),
+				]
+			);
 		})
 	}
 
@@ -1850,6 +2161,8 @@ mod tests {
 		collective::GenesisConfig::<Test> {
 			members: vec![1, 2, 3, 1],
 			phantom: Default::default(),
-		}.build_storage().unwrap();
+		}
+		.build_storage()
+		.unwrap();
 	}
 }
diff --git a/frame/collective/src/weights.rs b/frame/collective/src/weights.rs
index 2bbec4d7cc3d..aab389a45e5b 100644
--- a/frame/collective/src/weights.rs
+++ b/frame/collective/src/weights.rs
@@ -36,6 +36,7 @@
 // --template=./.maintain/frame-weight-template.hbs
 
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
diff --git a/frame/contracts/common/src/lib.rs b/frame/contracts/common/src/lib.rs
index 098ffd64b8e8..9260b3e05cf3 100644
--- a/frame/contracts/common/src/lib.rs
+++ b/frame/contracts/common/src/lib.rs
@@ -26,7 +26,7 @@ use sp_runtime::{DispatchError, RuntimeDebug};
 use sp_std::prelude::*;
 
 #[cfg(feature = "std")]
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 /// Result type of a `bare_call` or `bare_instantiate` call.
 ///
@@ -163,7 +163,7 @@ pub enum Code<Hash> {
 #[cfg(feature = "std")]
 mod as_string {
 	use super::*;
-	use serde::{Serializer, Deserializer, ser::Error};
+	use serde::{ser::Error, Deserializer, Serializer};
 
 	pub fn serialize<S: Serializer>(bytes: &Vec<u8>, serializer: S) -> Result<S::Ok, S::Error> {
 		std::str::from_utf8(bytes)
diff --git a/frame/contracts/proc-macro/src/lib.rs b/frame/contracts/proc-macro/src/lib.rs
index 3b8b1ea5e663..302a0d01a93d 100644
--- a/frame/contracts/proc-macro/src/lib.rs
+++ b/frame/contracts/proc-macro/src/lib.rs
@@ -21,11 +21,10 @@
 
 extern crate alloc;
 
+use alloc::string::ToString;
 use proc_macro2::TokenStream;
 use quote::{quote, quote_spanned};
-use syn::spanned::Spanned;
-use syn::{parse_macro_input, Data, DataStruct, DeriveInput, Fields, Ident};
-use alloc::string::ToString;
+use syn::{parse_macro_input, spanned::Spanned, Data, DataStruct, DeriveInput, Fields, Ident};
 
 /// This derives `Debug` for a struct where each field must be of some numeric type.
 /// It interprets each field as its represents some weight and formats it as times so that
@@ -44,7 +43,7 @@ pub fn derive_schedule_debug(input: proc_macro::TokenStream) -> proc_macro::Toke
 
 fn derive_debug(
 	input: proc_macro::TokenStream,
-	fmt: impl Fn(&Ident) -> TokenStream
+	fmt: impl Fn(&Ident) -> TokenStream,
 ) -> proc_macro::TokenStream {
 	let input = parse_macro_input!(input as DeriveInput);
 	let name = &input.ident;
@@ -55,7 +54,8 @@ fn derive_debug(
 		return quote_spanned! {
 			name.span() =>
 			compile_error!("WeightDebug is only supported for structs.");
-		}.into();
+		}
+		.into()
 	};
 
 	#[cfg(feature = "full")]
@@ -87,24 +87,22 @@ fn derive_debug(
 fn iterate_fields(data: &DataStruct, fmt: impl Fn(&Ident) -> TokenStream) -> TokenStream {
 	match &data.fields {
 		Fields::Named(fields) => {
-			let recurse = fields.named
-			.iter()
-			.filter_map(|f| {
+			let recurse = fields.named.iter().filter_map(|f| {
 				let name = f.ident.as_ref()?;
 				if name.to_string().starts_with('_') {
-					return None;
+					return None
 				}
 				let value = fmt(name);
-				let ret = quote_spanned!{ f.span() =>
+				let ret = quote_spanned! { f.span() =>
 					formatter.field(stringify!(#name), #value);
 				};
 				Some(ret)
 			});
-			quote!{
+			quote! {
 				#( #recurse )*
 			}
-		}
-		Fields::Unnamed(fields) => quote_spanned!{
+		},
+		Fields::Unnamed(fields) => quote_spanned! {
 			fields.span() =>
 			compile_error!("Unnamed fields are not supported")
 		},
diff --git a/frame/contracts/rpc/runtime-api/src/lib.rs b/frame/contracts/rpc/runtime-api/src/lib.rs
index bb65e1b83739..742c2997287d 100644
--- a/frame/contracts/rpc/runtime-api/src/lib.rs
+++ b/frame/contracts/rpc/runtime-api/src/lib.rs
@@ -24,10 +24,10 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use codec::Codec;
-use sp_std::vec::Vec;
 use pallet_contracts_primitives::{
-	ContractExecResult, GetStorageResult, RentProjectionResult, Code, ContractInstantiateResult,
+	Code, ContractExecResult, ContractInstantiateResult, GetStorageResult, RentProjectionResult,
 };
+use sp_std::vec::Vec;
 
 sp_api::decl_runtime_apis! {
 	/// The API to interact with contracts without using executive.
diff --git a/frame/contracts/rpc/src/lib.rs b/frame/contracts/rpc/src/lib.rs
index 3b95e9850165..2586ec7903dd 100644
--- a/frame/contracts/rpc/src/lib.rs
+++ b/frame/contracts/rpc/src/lib.rs
@@ -22,7 +22,9 @@ use std::sync::Arc;
 use codec::Codec;
 use jsonrpc_core::{Error, ErrorCode, Result};
 use jsonrpc_derive::rpc;
-use pallet_contracts_primitives::RentProjection;
+use pallet_contracts_primitives::{
+	Code, ContractExecResult, ContractInstantiateResult, RentProjection,
+};
 use serde::{Deserialize, Serialize};
 use sp_api::ProvideRuntimeApi;
 use sp_blockchain::HeaderBackend;
@@ -33,7 +35,6 @@ use sp_runtime::{
 	traits::{Block as BlockT, Header as HeaderT},
 };
 use std::convert::{TryFrom, TryInto};
-use pallet_contracts_primitives::{Code, ContractExecResult, ContractInstantiateResult};
 
 pub use pallet_contracts_rpc_runtime_api::ContractsApi as ContractsRuntimeApi;
 
@@ -164,10 +165,7 @@ pub struct Contracts<C, B> {
 impl<C, B> Contracts<C, B> {
 	/// Create new `Contracts` with the given reference to the client.
 	pub fn new(client: Arc<C>) -> Self {
-		Contracts {
-			client,
-			_marker: Default::default(),
-		}
+		Contracts { client, _marker: Default::default() }
 	}
 }
 impl<C, Block, AccountId, Balance, Hash>
@@ -202,13 +200,7 @@ where
 			// If the block hash is not supplied assume the best block.
 			self.client.info().best_hash));
 
-		let CallRequest {
-			origin,
-			dest,
-			value,
-			gas_limit,
-			input_data,
-		} = call_request;
+		let CallRequest { origin, dest, value, gas_limit, input_data } = call_request;
 
 		let value: Balance = decode_hex(value, "balance")?;
 		let gas_limit: Weight = decode_hex(gas_limit, "weight")?;
@@ -225,20 +217,15 @@ where
 		&self,
 		instantiate_request: InstantiateRequest<AccountId, Hash>,
 		at: Option<<Block as BlockT>::Hash>,
-	) -> Result<ContractInstantiateResult<AccountId, <<Block as BlockT>::Header as HeaderT>::Number>> {
+	) -> Result<ContractInstantiateResult<AccountId, <<Block as BlockT>::Header as HeaderT>::Number>>
+	{
 		let api = self.client.runtime_api();
 		let at = BlockId::hash(at.unwrap_or_else(||
 			// If the block hash is not supplied assume the best block.
 			self.client.info().best_hash));
 
-		let InstantiateRequest {
-			origin,
-			endowment,
-			gas_limit,
-			code,
-			data,
-			salt,
-		} = instantiate_request;
+		let InstantiateRequest { origin, endowment, gas_limit, code, data, salt } =
+			instantiate_request;
 
 		let endowment: Balance = decode_hex(endowment, "balance")?;
 		let gas_limit: Weight = decode_hex(gas_limit, "weight")?;
@@ -337,7 +324,8 @@ mod tests {
 	#[test]
 	fn call_request_should_serialize_deserialize_properly() {
 		type Req = CallRequest<String>;
-		let req: Req = serde_json::from_str(r#"
+		let req: Req = serde_json::from_str(
+			r#"
 		{
 			"origin": "5CiPPseXPECbkjWCa6MnjNokrgYjMqmKndv2rSnekmSK2DjL",
 			"dest": "5DRakbLVnjVrW6niwLfHGW24EeCEvDAFGEXrtaYS5M4ynoom",
@@ -345,7 +333,9 @@ mod tests {
 			"gasLimit": 1000000000000,
 			"inputData": "0x8c97db39"
 		}
-		"#).unwrap();
+		"#,
+		)
+		.unwrap();
 		assert_eq!(req.gas_limit.into_u256(), U256::from(0xe8d4a51000u64));
 		assert_eq!(req.value.into_u256(), U256::from(1234567890987654321u128));
 	}
@@ -353,7 +343,8 @@ mod tests {
 	#[test]
 	fn instantiate_request_should_serialize_deserialize_properly() {
 		type Req = InstantiateRequest<String, String>;
-		let req: Req = serde_json::from_str(r#"
+		let req: Req = serde_json::from_str(
+			r#"
 		{
 			"origin": "5CiPPseXPECbkjWCa6MnjNokrgYjMqmKndv2rSnekmSK2DjL",
 			"endowment": "0x88",
@@ -362,7 +353,9 @@ mod tests {
 			"data": "0x4299",
 			"salt": "0x9988"
 		}
-		"#).unwrap();
+		"#,
+		)
+		.unwrap();
 
 		assert_eq!(req.origin, "5CiPPseXPECbkjWCa6MnjNokrgYjMqmKndv2rSnekmSK2DjL");
 		assert_eq!(req.endowment.into_u256(), 0x88.into());
@@ -383,7 +376,8 @@ mod tests {
 			let actual = serde_json::to_string(&res).unwrap();
 			assert_eq!(actual, trim(expected).as_str());
 		}
-		test(r#"{
+		test(
+			r#"{
 			"gasConsumed": 5000,
 			"gasRequired": 8000,
 			"debugMessage": "HelloWorld",
@@ -393,25 +387,30 @@ mod tests {
 				"data": "0x1234"
 			  }
 			}
-		}"#);
-		test(r#"{
+		}"#,
+		);
+		test(
+			r#"{
 			"gasConsumed": 3400,
 			"gasRequired": 5200,
 			"debugMessage": "HelloWorld",
 			"result": {
 			  "Err": "BadOrigin"
 			}
-		}"#);
+		}"#,
+		);
 	}
 
 	#[test]
 	fn instantiate_result_should_serialize_deserialize_properly() {
 		fn test(expected: &str) {
-			let res: ContractInstantiateResult<String, u64> = serde_json::from_str(expected).unwrap();
+			let res: ContractInstantiateResult<String, u64> =
+				serde_json::from_str(expected).unwrap();
 			let actual = serde_json::to_string(&res).unwrap();
 			assert_eq!(actual, trim(expected).as_str());
 		}
-		test(r#"{
+		test(
+			r#"{
 			"gasConsumed": 5000,
 			"gasRequired": 8000,
 			"debugMessage": "HelloWorld",
@@ -425,14 +424,17 @@ mod tests {
 				  "rentProjection": null
 			   }
 			}
-		}"#);
-		test(r#"{
+		}"#,
+		);
+		test(
+			r#"{
 			"gasConsumed": 3400,
 			"gasRequired": 5200,
 			"debugMessage": "HelloWorld",
 			"result": {
 			  "Err": "BadOrigin"
 			}
-		}"#);
+		}"#,
+		);
 	}
 }
diff --git a/frame/contracts/src/benchmarking/code.rs b/frame/contracts/src/benchmarking/code.rs
index cd13e3be6df3..64bdde9b6ea5 100644
--- a/frame/contracts/src/benchmarking/code.rs
+++ b/frame/contracts/src/benchmarking/code.rs
@@ -25,21 +25,20 @@
 //! compiles it down into a `WasmModule` that can be used as a contract's code.
 
 use crate::Config;
+use frame_support::traits::Get;
 use pwasm_utils::{
-	stack_height::inject_limiter,
 	parity_wasm::{
+		builder,
 		elements::{
-			self, Instruction, Instructions, FuncBody, ValueType, BlockType, Section,
-			CustomSection,
+			self, BlockType, CustomSection, FuncBody, Instruction, Instructions, Section, ValueType,
 		},
-		builder,
 	},
+	stack_height::inject_limiter,
 };
 use sp_core::crypto::UncheckedFrom;
 use sp_runtime::traits::Hash;
 use sp_sandbox::{EnvironmentDefinitionBuilder, Memory};
-use sp_std::{prelude::*, convert::TryFrom, borrow::ToOwned};
-use frame_support::traits::Get;
+use sp_std::{borrow::ToOwned, convert::TryFrom, prelude::*};
 
 /// Pass to `create_code` in order to create a compiled `WasmModule`.
 ///
@@ -117,7 +116,7 @@ pub struct ImportedFunction {
 
 /// A wasm module ready to be put on chain.
 #[derive(Clone)]
-pub struct WasmModule<T:Config> {
+pub struct WasmModule<T: Config> {
 	pub code: Vec<u8>,
 	pub hash: <T::Hashing as Hash>::Output,
 	memory: Option<ImportedMemory>,
@@ -136,27 +135,37 @@ where
 		let mut contract = builder::module()
 			// deploy function (first internal function)
 			.function()
-				.signature().build()
-				.with_body(def.deploy_body.unwrap_or_else(||
-					FuncBody::new(Vec::new(), Instructions::empty())
-				))
-				.build()
+			.signature()
+			.build()
+			.with_body(
+				def.deploy_body
+					.unwrap_or_else(|| FuncBody::new(Vec::new(), Instructions::empty())),
+			)
+			.build()
 			// call function (second internal function)
 			.function()
-				.signature().build()
-				.with_body(def.call_body.unwrap_or_else(||
-					FuncBody::new(Vec::new(), Instructions::empty())
-				))
-				.build()
-			.export().field("deploy").internal().func(func_offset).build()
-			.export().field("call").internal().func(func_offset + 1).build();
+			.signature()
+			.build()
+			.with_body(
+				def.call_body
+					.unwrap_or_else(|| FuncBody::new(Vec::new(), Instructions::empty())),
+			)
+			.build()
+			.export()
+			.field("deploy")
+			.internal()
+			.func(func_offset)
+			.build()
+			.export()
+			.field("call")
+			.internal()
+			.func(func_offset + 1)
+			.build();
 
 		// If specified we add an additional internal function
 		if let Some(body) = def.aux_body {
-			let mut signature = contract
-				.function()
-				.signature();
-			for _ in 0 .. def.aux_arg_num {
+			let mut signature = contract.function().signature();
+			for _ in 0..def.aux_arg_num {
 				signature = signature.with_param(ValueType::I64);
 			}
 			contract = signature.build().with_body(body).build();
@@ -164,9 +173,12 @@ where
 
 		// Grant access to linear memory.
 		if let Some(memory) = &def.memory {
-			contract = contract.import()
-				.module("env").field("memory")
-				.external().memory(memory.min_pages, Some(memory.max_pages))
+			contract = contract
+				.import()
+				.module("env")
+				.field("memory")
+				.external()
+				.memory(memory.min_pages, Some(memory.max_pages))
 				.build();
 		}
 
@@ -177,7 +189,8 @@ where
 				.with_results(func.return_type.into_iter().collect())
 				.build_sig();
 			let sig = contract.push_signature(sig);
-			contract = contract.import()
+			contract = contract
+				.import()
 				.module(func.module)
 				.field(func.name)
 				.with_external(elements::External::Function(sig))
@@ -186,7 +199,8 @@ where
 
 		// Initialize memory
 		for data in def.data_segments {
-			contract = contract.data()
+			contract = contract
+				.data()
 				.offset(Instruction::I32Const(data.offset as i32))
 				.value(data.value)
 				.build()
@@ -194,12 +208,13 @@ where
 
 		// Add global variables
 		if def.num_globals > 0 {
-			use rand::{prelude::*, distributions::Standard};
+			use rand::{distributions::Standard, prelude::*};
 			let rng = rand_pcg::Pcg32::seed_from_u64(3112244599778833558);
 			for val in rng.sample_iter(Standard).take(def.num_globals as usize) {
 				contract = contract
 					.global()
-					.value_type().i64()
+					.value_type()
+					.i64()
 					.mutable()
 					.init_expr(Instruction::I64Const(val))
 					.build()
@@ -218,31 +233,22 @@ where
 
 		// Add the dummy section
 		if def.dummy_section > 0 {
-			contract = contract.with_section(
-				Section::Custom(
-					CustomSection::new("dummy".to_owned(), vec![42; def.dummy_section as usize])
-				)
-			);
+			contract = contract.with_section(Section::Custom(CustomSection::new(
+				"dummy".to_owned(),
+				vec![42; def.dummy_section as usize],
+			)));
 		}
 
 		let mut code = contract.build();
 
 		// Inject stack height metering
 		if def.inject_stack_metering {
-			code = inject_limiter(
-				code,
-				T::Schedule::get().limits.stack_height
-			)
-			.unwrap();
+			code = inject_limiter(code, T::Schedule::get().limits.stack_height).unwrap();
 		}
 
 		let code = code.to_bytes().unwrap();
 		let hash = T::Hashing::hash(&code);
-		Self {
-			code,
-			hash,
-			memory: def.memory,
-		}
+		Self { code, hash, memory: def.memory }
 	}
 }
 
@@ -266,7 +272,7 @@ where
 		ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			dummy_section: dummy_bytes.saturating_sub(module_overhead),
-			.. Default::default()
+			..Default::default()
 		}
 		.into()
 	}
@@ -275,23 +281,18 @@ where
 	/// `instantiate_with_code` for different sizes of wasm modules. The generated module maximizes
 	/// instrumentation runtime by nesting blocks as deeply as possible given the byte budget.
 	pub fn sized(target_bytes: u32) -> Self {
-		use self::elements::Instruction::{If, I32Const, Return, End};
+		use self::elements::Instruction::{End, I32Const, If, Return};
 		// Base size of a contract is 63 bytes and each expansion adds 6 bytes.
 		// We do one expansion less to account for the code section and function body
 		// size fields inside the binary wasm module representation which are leb128 encoded
 		// and therefore grow in size when the contract grows. We are not allowed to overshoot
 		// because of the maximum code size that is enforced by `instantiate_with_code`.
 		let expansions = (target_bytes.saturating_sub(63) / 6).saturating_sub(1);
-		const EXPANSION: [Instruction; 4] = [
-			I32Const(0),
-			If(BlockType::NoResult),
-			Return,
-			End,
-		];
+		const EXPANSION: [Instruction; 4] = [I32Const(0), If(BlockType::NoResult), Return, End];
 		ModuleDefinition {
 			call_body: Some(body::repeated(expansions, &EXPANSION)),
 			memory: Some(ImportedMemory::max::<T>()),
-			.. Default::default()
+			..Default::default()
 		}
 		.into()
 	}
@@ -317,12 +318,15 @@ where
 				offset: 0,
 				value: (pages * 64 * 1024 - 4).to_le_bytes().to_vec(),
 			}],
-			call_body: Some(body::repeated(repeat, &[
-				Instruction::I32Const(4), // ptr where to store output
-				Instruction::I32Const(0), // ptr to length
-				Instruction::Call(0), // call the imported function
-			])),
-			.. Default::default()
+			call_body: Some(body::repeated(
+				repeat,
+				&[
+					Instruction::I32Const(4), // ptr where to store output
+					Instruction::I32Const(0), // ptr to length
+					Instruction::Call(0),     // call the imported function
+				],
+			)),
+			..Default::default()
 		}
 		.into()
 	}
@@ -339,13 +343,16 @@ where
 				params: vec![ValueType::I32, ValueType::I32, ValueType::I32],
 				return_type: None,
 			}],
-			call_body: Some(body::repeated(repeat, &[
-				Instruction::I32Const(0), // input_ptr
-				Instruction::I32Const(data_size as i32), // input_len
-				Instruction::I32Const(0), // output_ptr
-				Instruction::Call(0),
-			])),
-			.. Default::default()
+			call_body: Some(body::repeated(
+				repeat,
+				&[
+					Instruction::I32Const(0),                // input_ptr
+					Instruction::I32Const(data_size as i32), // input_len
+					Instruction::I32Const(0),                // output_ptr
+					Instruction::Call(0),
+				],
+			)),
+			..Default::default()
 		}
 		.into()
 	}
@@ -354,11 +361,7 @@ where
 	/// and adds it to `env`. A reference to that memory is returned so that it can be used to
 	/// access the memory contents from the supervisor.
 	pub fn add_memory<S>(&self, env: &mut EnvironmentDefinitionBuilder<S>) -> Option<Memory> {
-		let memory = if let Some(memory) = &self.memory {
-			memory
-		} else {
-			return None;
-		};
+		let memory = if let Some(memory) = &self.memory { memory } else { return None };
 		let memory = Memory::new(memory.min_pages, Some(memory.max_pages)).unwrap();
 		env.add_memory("env", "memory", memory.clone());
 		Some(memory)
@@ -367,25 +370,25 @@ where
 	pub fn unary_instr(instr: Instruction, repeat: u32) -> Self {
 		use body::DynInstr::{RandomI64Repeated, Regular};
 		ModuleDefinition {
-			call_body: Some(body::repeated_dyn(repeat, vec![
-				RandomI64Repeated(1),
-				Regular(instr),
-				Regular(Instruction::Drop),
-			])),
-			.. Default::default()
-		}.into()
+			call_body: Some(body::repeated_dyn(
+				repeat,
+				vec![RandomI64Repeated(1), Regular(instr), Regular(Instruction::Drop)],
+			)),
+			..Default::default()
+		}
+		.into()
 	}
 
 	pub fn binary_instr(instr: Instruction, repeat: u32) -> Self {
 		use body::DynInstr::{RandomI64Repeated, Regular};
 		ModuleDefinition {
-			call_body: Some(body::repeated_dyn(repeat, vec![
-				RandomI64Repeated(2),
-				Regular(instr),
-				Regular(Instruction::Drop),
-			])),
-			.. Default::default()
-		}.into()
+			call_body: Some(body::repeated_dyn(
+				repeat,
+				vec![RandomI64Repeated(2), Regular(instr), Regular(Instruction::Drop)],
+			)),
+			..Default::default()
+		}
+		.into()
 	}
 }
 
@@ -426,7 +429,7 @@ pub mod body {
 		RandomGetGlobal(u32, u32),
 		/// Insert a SetGlobal with a random offset in [low, high).
 		/// (low, high)
-		RandomSetGlobal(u32, u32)
+		RandomSetGlobal(u32, u32),
 	}
 
 	pub fn plain(instructions: Vec<Instruction>) -> FuncBody {
@@ -441,13 +444,13 @@ pub mod body {
 				.take(instructions.len() * usize::try_from(repetitions).unwrap())
 				.cloned()
 				.chain(sp_std::iter::once(Instruction::End))
-				.collect()
+				.collect(),
 		);
 		FuncBody::new(Vec::new(), instructions)
 	}
 
 	pub fn repeated_dyn(repetitions: u32, mut instructions: Vec<DynInstr>) -> FuncBody {
-		use rand::{prelude::*, distributions::Standard};
+		use rand::{distributions::Standard, prelude::*};
 
 		// We do not need to be secure here.
 		let mut rng = rand_pcg::Pcg32::seed_from_u64(8446744073709551615);
@@ -456,50 +459,46 @@ pub mod body {
 		let body = (0..instructions.len())
 			.cycle()
 			.take(instructions.len() * usize::try_from(repetitions).unwrap())
-			.flat_map(|idx|
-				match &mut instructions[idx] {
-					DynInstr::Regular(instruction) => vec![instruction.clone()],
-					DynInstr::Counter(offset, increment_by) => {
-						let current = *offset;
-						*offset += *increment_by;
-						vec![Instruction::I32Const(current as i32)]
-					},
-					DynInstr::RandomUnaligned(low, high) => {
-						let unaligned = rng.gen_range(*low..*high) | 1;
-						vec![Instruction::I32Const(unaligned as i32)]
-					},
-					DynInstr::RandomI32(low, high) => {
-						vec![Instruction::I32Const(rng.gen_range(*low..*high))]
-					},
-					DynInstr::RandomI32Repeated(num) => {
-						(&mut rng).sample_iter(Standard).take(*num).map(|val|
-							Instruction::I32Const(val)
-						)
-						.collect()
-					},
-					DynInstr::RandomI64Repeated(num) => {
-						(&mut rng).sample_iter(Standard).take(*num).map(|val|
-							Instruction::I64Const(val)
-						)
-						.collect()
-					},
-					DynInstr::RandomGetLocal(low, high) => {
-						vec![Instruction::GetLocal(rng.gen_range(*low..*high))]
-					},
-					DynInstr::RandomSetLocal(low, high) => {
-						vec![Instruction::SetLocal(rng.gen_range(*low..*high))]
-					},
-					DynInstr::RandomTeeLocal(low, high) => {
-						vec![Instruction::TeeLocal(rng.gen_range(*low..*high))]
-					},
-					DynInstr::RandomGetGlobal(low, high) => {
-						vec![Instruction::GetGlobal(rng.gen_range(*low..*high))]
-					},
-					DynInstr::RandomSetGlobal(low, high) => {
-						vec![Instruction::SetGlobal(rng.gen_range(*low..*high))]
-					},
-				}
-			)
+			.flat_map(|idx| match &mut instructions[idx] {
+				DynInstr::Regular(instruction) => vec![instruction.clone()],
+				DynInstr::Counter(offset, increment_by) => {
+					let current = *offset;
+					*offset += *increment_by;
+					vec![Instruction::I32Const(current as i32)]
+				},
+				DynInstr::RandomUnaligned(low, high) => {
+					let unaligned = rng.gen_range(*low..*high) | 1;
+					vec![Instruction::I32Const(unaligned as i32)]
+				},
+				DynInstr::RandomI32(low, high) => {
+					vec![Instruction::I32Const(rng.gen_range(*low..*high))]
+				},
+				DynInstr::RandomI32Repeated(num) => (&mut rng)
+					.sample_iter(Standard)
+					.take(*num)
+					.map(|val| Instruction::I32Const(val))
+					.collect(),
+				DynInstr::RandomI64Repeated(num) => (&mut rng)
+					.sample_iter(Standard)
+					.take(*num)
+					.map(|val| Instruction::I64Const(val))
+					.collect(),
+				DynInstr::RandomGetLocal(low, high) => {
+					vec![Instruction::GetLocal(rng.gen_range(*low..*high))]
+				},
+				DynInstr::RandomSetLocal(low, high) => {
+					vec![Instruction::SetLocal(rng.gen_range(*low..*high))]
+				},
+				DynInstr::RandomTeeLocal(low, high) => {
+					vec![Instruction::TeeLocal(rng.gen_range(*low..*high))]
+				},
+				DynInstr::RandomGetGlobal(low, high) => {
+					vec![Instruction::GetGlobal(rng.gen_range(*low..*high))]
+				},
+				DynInstr::RandomSetGlobal(low, high) => {
+					vec![Instruction::SetGlobal(rng.gen_range(*low..*high))]
+				},
+			})
 			.chain(sp_std::iter::once(Instruction::End))
 			.collect();
 		FuncBody::new(Vec::new(), Instructions::new(body))
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index cbe5e48a4f02..83c18f8f79e0 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -22,28 +22,28 @@
 mod code;
 mod sandbox;
 
-use crate::{
-	*, Pallet as Contracts,
-	exec::StorageKey,
-	rent::Rent,
-	schedule::{API_BENCHMARK_BATCH_SIZE, INSTR_BENCHMARK_BATCH_SIZE},
-	storage::Storage,
-};
 use self::{
 	code::{
 		body::{self, DynInstr::*},
-		ModuleDefinition, DataSegment, ImportedMemory, ImportedFunction, WasmModule,
+		DataSegment, ImportedFunction, ImportedMemory, ModuleDefinition, WasmModule,
 	},
 	sandbox::Sandbox,
 };
+use crate::{
+	exec::StorageKey,
+	rent::Rent,
+	schedule::{API_BENCHMARK_BATCH_SIZE, INSTR_BENCHMARK_BATCH_SIZE},
+	storage::Storage,
+	Pallet as Contracts, *,
+};
 use codec::Encode;
-use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
+use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, whitelisted_caller};
+use frame_support::weights::Weight;
 use frame_system::{Pallet as System, RawOrigin};
-use pwasm_utils::parity_wasm::elements::{Instruction, ValueType, BlockType, BrTableData};
-use sp_runtime::traits::{Hash, Bounded, Zero};
-use sp_std::{default::Default, convert::{TryInto}, vec::Vec, vec};
 use pallet_contracts_primitives::RentProjection;
-use frame_support::weights::Weight;
+use pwasm_utils::parity_wasm::elements::{BlockType, BrTableData, Instruction, ValueType};
+use sp_runtime::traits::{Bounded, Hash, Zero};
+use sp_std::{convert::TryInto, default::Default, vec, vec::Vec};
 
 /// How many batches we do per API benchmark.
 const API_BENCHMARK_BATCHES: u32 = 20;
@@ -74,7 +74,7 @@ impl Endow {
 	/// The maximum amount of balance a caller can transfer without being brought below
 	/// the existential deposit. This assumes that every caller is funded with the amount
 	/// returned by `caller_funding`.
-	fn max<T:Config>() -> BalanceOf<T> {
+	fn max<T: Config>() -> BalanceOf<T> {
 		caller_funding::<T>().saturating_sub(T::Currency::minimum_balance())
 	}
 }
@@ -109,8 +109,7 @@ where
 		module: WasmModule<T>,
 		data: Vec<u8>,
 		endowment: Endow,
-	) -> Result<Contract<T>, &'static str>
-	{
+	) -> Result<Contract<T>, &'static str> {
 		let (storage_size, endowment) = match endowment {
 			Endow::CollectRent => {
 				// storage_size cannot be zero because otherwise a contract that is just above
@@ -182,7 +181,8 @@ where
 
 	/// Get the `AliveContractInfo` of the `addr` or an error if it is no longer alive.
 	fn address_alive_info(addr: &T::AccountId) -> Result<AliveContractInfo<T>, &'static str> {
-		ContractInfoOf::<T>::get(addr).and_then(|c| c.get_alive())
+		ContractInfoOf::<T>::get(addr)
+			.and_then(|c| c.get_alive())
 			.ok_or("Expected contract to be alive at this point.")
 	}
 
@@ -193,7 +193,8 @@ where
 
 	/// Return an error if this contract is no tombstone.
 	fn ensure_tombstone(&self) -> Result<(), &'static str> {
-		ContractInfoOf::<T>::get(&self.account_id).and_then(|c| c.get_tombstone())
+		ContractInfoOf::<T>::get(&self.account_id)
+			.and_then(|c| c.get_tombstone())
 			.ok_or("Expected contract to be a tombstone at this point.")
 			.map(|_| ())
 	}
@@ -236,16 +237,13 @@ where
 		let contract = Contract::<T>::new(code, vec![], Endow::CollectRent)?;
 		let storage_items = create_storage::<T>(stor_num, stor_size)?;
 		contract.store(&storage_items)?;
-		Ok(Self {
-			contract,
-			storage: storage_items,
-		})
+		Ok(Self { contract, storage: storage_items })
 	}
 
 	/// Increase the system block number so that this contract is eligible for eviction.
-	fn set_block_num_for_eviction(&self) -> Result<(), &'static str>  {
+	fn set_block_num_for_eviction(&self) -> Result<(), &'static str> {
 		System::<T>::set_block_number(
-			self.contract.eviction_at()? + T::SignedClaimHandicap::get() + 5u32.into()
+			self.contract.eviction_at()? + T::SignedClaimHandicap::get() + 5u32.into(),
 		);
 		Ok(())
 	}
@@ -261,15 +259,17 @@ where
 /// Generate `stor_num` storage items. Each has the size `stor_size`.
 fn create_storage<T: Config>(
 	stor_num: u32,
-	stor_size: u32
+	stor_size: u32,
 ) -> Result<Vec<(StorageKey, Vec<u8>)>, &'static str> {
-	(0..stor_num).map(|i| {
-		let hash = T::Hashing::hash_of(&i)
-			.as_ref()
-			.try_into()
-			.map_err(|_| "Hash too big for storage key")?;
-		Ok((hash, vec![42u8; stor_size as usize]))
-	}).collect::<Result<Vec<_>, &'static str>>()
+	(0..stor_num)
+		.map(|i| {
+			let hash = T::Hashing::hash_of(&i)
+				.as_ref()
+				.try_into()
+				.map_err(|_| "Hash too big for storage key")?;
+			Ok((hash, vec![42u8; stor_size as usize]))
+		})
+		.collect::<Result<Vec<_>, &'static str>>()
 }
 
 /// The funding that each account that either calls or instantiates contracts is funded with.
diff --git a/frame/contracts/src/benchmarking/sandbox.rs b/frame/contracts/src/benchmarking/sandbox.rs
index a97fcc2b113e..320ac90cce64 100644
--- a/frame/contracts/src/benchmarking/sandbox.rs
+++ b/frame/contracts/src/benchmarking/sandbox.rs
@@ -15,14 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-///! For instruction benchmarking we do no instantiate a full contract but merely the
-///! sandbox to execute the wasm code. This is because we do not need the full
-///! environment that provides the seal interface as imported functions.
-
-use super::{
-	Config,
-	code::WasmModule,
-};
+/// ! For instruction benchmarking we do no instantiate a full contract but merely the
+/// ! sandbox to execute the wasm code. This is because we do not need the full
+/// ! environment that provides the seal interface as imported functions.
+use super::{code::WasmModule, Config};
 use sp_core::crypto::UncheckedFrom;
 use sp_sandbox::{EnvironmentDefinitionBuilder, Instance, Memory};
 
@@ -51,9 +47,6 @@ where
 		let memory = module.add_memory(&mut env_builder);
 		let instance = Instance::new(&module.code, &env_builder, &mut ())
 			.expect("Failed to create benchmarking Sandbox instance");
-		Self {
-			instance,
-			_memory: memory,
-		}
+		Self { instance, _memory: memory }
 	}
 }
diff --git a/frame/contracts/src/chain_extension.rs b/frame/contracts/src/chain_extension.rs
index bb352c3a93d6..13696240fe4e 100644
--- a/frame/contracts/src/chain_extension.rs
+++ b/frame/contracts/src/chain_extension.rs
@@ -55,22 +55,19 @@
 //! on how to use a chain extension in order to provide new features to ink! contracts.
 
 use crate::{
-	Error,
-	wasm::{Runtime, RuntimeCosts},
 	gas::ChargedAmount,
+	wasm::{Runtime, RuntimeCosts},
+	Error,
 };
 use codec::{Decode, MaxEncodedLen};
 use frame_support::weights::Weight;
 use sp_runtime::DispatchError;
-use sp_std::{
-	marker::PhantomData,
-	vec::Vec,
-};
+use sp_std::{marker::PhantomData, vec::Vec};
 
+pub use crate::{exec::Ext, Config};
 pub use frame_system::Config as SysConfig;
 pub use pallet_contracts_primitives::ReturnFlags;
 pub use sp_core::crypto::UncheckedFrom;
-pub use crate::{Config, exec::Ext};
 pub use state::Init as InitState;
 
 /// Result that returns a [`DispatchError`] on error.
@@ -90,7 +87,7 @@ pub trait ChainExtension<C: Config> {
 	///
 	/// # Parameters
 	/// - `func_id`: The first argument to `seal_call_chain_extension`. Usually used to
-	///		determine which function to realize.
+	/// 		determine which function to realize.
 	/// - `env`: Access to the remaining arguments and the execution environment.
 	///
 	/// # Return
@@ -143,7 +140,7 @@ pub enum RetVal {
 	/// The semantic is the same as for calling `seal_return`: The control returns to
 	/// the caller of the currently executing contract yielding the supplied buffer and
 	/// flags.
-	Diverging{flags: ReturnFlags, data: Vec<u8>},
+	Diverging { flags: ReturnFlags, data: Vec<u8> },
 }
 
 /// Grants the chain extension access to its parameters and execution environment.
@@ -183,7 +180,9 @@ where
 	/// This is when a maximum a priori amount was charged and then should be partially
 	/// refunded to match the actual amount.
 	pub fn adjust_weight(&mut self, charged: ChargedAmount, actual_weight: Weight) {
-		self.inner.runtime.adjust_gas(charged, RuntimeCosts::ChainExtension(actual_weight))
+		self.inner
+			.runtime
+			.adjust_gas(charged, RuntimeCosts::ChainExtension(actual_weight))
 	}
 
 	/// Grants access to the execution environment of the current contract call.
@@ -204,46 +203,31 @@ impl<'a, 'b, E: Ext> Environment<'a, 'b, E, state::Init> {
 	/// It is only available to this crate because only the wasm runtime module needs to
 	/// ever create this type. Chain extensions merely consume it.
 	pub(crate) fn new(
-		runtime: &'a mut Runtime::<'b, E>,
+		runtime: &'a mut Runtime<'b, E>,
 		input_ptr: u32,
 		input_len: u32,
 		output_ptr: u32,
 		output_len_ptr: u32,
 	) -> Self {
 		Environment {
-			inner: Inner {
-				runtime,
-				input_ptr,
-				input_len,
-				output_ptr,
-				output_len_ptr,
-			},
+			inner: Inner { runtime, input_ptr, input_len, output_ptr, output_len_ptr },
 			phantom: PhantomData,
 		}
 	}
 
 	/// Use all arguments as integer values.
 	pub fn only_in(self) -> Environment<'a, 'b, E, state::OnlyIn> {
-		Environment {
-			inner: self.inner,
-			phantom: PhantomData,
-		}
+		Environment { inner: self.inner, phantom: PhantomData }
 	}
 
 	/// Use input arguments as integer and output arguments as pointer to a buffer.
 	pub fn prim_in_buf_out(self) -> Environment<'a, 'b, E, state::PrimInBufOut> {
-		Environment {
-			inner: self.inner,
-			phantom: PhantomData,
-		}
+		Environment { inner: self.inner, phantom: PhantomData }
 	}
 
 	/// Use input and output arguments as pointers to a buffer.
 	pub fn buf_in_buf_out(self) -> Environment<'a, 'b, E, state::BufInBufOut> {
-		Environment {
-			inner: self.inner,
-			phantom: PhantomData,
-		}
+		Environment { inner: self.inner, phantom: PhantomData }
 	}
 }
 
@@ -287,10 +271,9 @@ where
 	/// charge the overall costs either using `max_len` (worst case approximation) or using
 	/// [`in_len()`](Self::in_len).
 	pub fn read(&self, max_len: u32) -> Result<Vec<u8>> {
-		self.inner.runtime.read_sandbox_memory(
-			self.inner.input_ptr,
-			self.inner.input_len.min(max_len),
-		)
+		self.inner
+			.runtime
+			.read_sandbox_memory(self.inner.input_ptr, self.inner.input_len.min(max_len))
 	}
 
 	/// Reads `min(buffer.len(), in_len) from contract memory.
@@ -304,10 +287,7 @@ where
 			let buffer = core::mem::take(buffer);
 			&mut buffer[..len.min(self.inner.input_len as usize)]
 		};
-		self.inner.runtime.read_sandbox_memory_into_buf(
-			self.inner.input_ptr,
-			sliced,
-		)?;
+		self.inner.runtime.read_sandbox_memory_into_buf(self.inner.input_ptr, sliced)?;
 		*buffer = sliced;
 		Ok(())
 	}
@@ -377,7 +357,7 @@ where
 /// gets too large.
 struct Inner<'a, 'b, E: Ext> {
 	/// The runtime contains all necessary functions to interact with the running contract.
-	runtime: &'a mut Runtime::<'b, E>,
+	runtime: &'a mut Runtime<'b, E>,
 	/// Verbatim argument passed to `seal_call_chain_extension`.
 	input_ptr: u32,
 	/// Verbatim argument passed to `seal_call_chain_extension`.
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index ae1585afbb89..2967e4fa418a 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -16,27 +16,29 @@
 // limitations under the License.
 
 use crate::{
-	CodeHash, Event, Config, Pallet as Contracts,
-	BalanceOf, ContractInfo, gas::GasMeter, rent::{Rent, RentStatus}, storage::Storage,
-	Error, ContractInfoOf, Schedule, AliveContractInfo, AccountCounter,
+	gas::GasMeter,
+	rent::{Rent, RentStatus},
+	storage::Storage,
+	AccountCounter, AliveContractInfo, BalanceOf, CodeHash, Config, ContractInfo, ContractInfoOf,
+	Error, Event, Pallet as Contracts, Schedule,
 };
-use sp_core::crypto::UncheckedFrom;
-use sp_std::{
-	prelude::*,
-	marker::PhantomData,
-	mem,
-};
-use sp_runtime::{Perbill, traits::{Convert, Saturating}};
 use frame_support::{
-	dispatch::{DispatchResult, DispatchError, DispatchResultWithPostInfo, Dispatchable},
+	dispatch::{DispatchError, DispatchResult, DispatchResultWithPostInfo, Dispatchable},
+	ensure,
 	storage::{with_transaction, TransactionOutcome},
-	traits::{ExistenceRequirement, Currency, Time, Randomness, Get, OriginTrait, Filter},
+	traits::{Currency, ExistenceRequirement, Filter, Get, OriginTrait, Randomness, Time},
 	weights::Weight,
-	ensure, DefaultNoBound,
+	DefaultNoBound,
 };
 use frame_system::RawOrigin;
-use pallet_contracts_primitives::{ExecReturnValue};
-use smallvec::{SmallVec, Array};
+use pallet_contracts_primitives::ExecReturnValue;
+use smallvec::{Array, SmallVec};
+use sp_core::crypto::UncheckedFrom;
+use sp_runtime::{
+	traits::{Convert, Saturating},
+	Perbill,
+};
+use sp_std::{marker::PhantomData, mem, prelude::*};
 
 pub type AccountIdOf<T> = <T as frame_system::Config>::AccountId;
 pub type MomentOf<T> = <<T as Config>::Time as Time>::Moment;
@@ -75,10 +77,7 @@ pub struct ExecError {
 
 impl<T: Into<DispatchError>> From<T> for ExecError {
 	fn from(error: T) -> Self {
-		Self {
-			error: error.into(),
-			origin: ErrorOrigin::Caller,
-		}
+		Self { error: error.into(), origin: ErrorOrigin::Caller }
 	}
 }
 
@@ -124,7 +123,7 @@ where
 		account_id: &T::AccountId,
 		value: &BalanceOf<T>,
 		contract: &AliveContractInfo<T>,
-		executable: &E
+		executable: &E,
 	) -> Self {
 		Self {
 			total_balance: T::Currency::total_balance(account_id).saturating_add(*value),
@@ -187,7 +186,7 @@ pub trait Ext: sealing::Sealed {
 		value: BalanceOf<Self::T>,
 		input_data: Vec<u8>,
 		salt: &[u8],
-	) -> Result<(AccountIdOf<Self::T>, ExecReturnValue ), ExecError>;
+	) -> Result<(AccountIdOf<Self::T>, ExecReturnValue), ExecError>;
 
 	/// Transfer all funds to `beneficiary` and delete the contract.
 	///
@@ -218,11 +217,7 @@ pub trait Ext: sealing::Sealed {
 	) -> Result<(), DispatchError>;
 
 	/// Transfer some amount of funds into the specified account.
-	fn transfer(
-		&mut self,
-		to: &AccountIdOf<Self::T>,
-		value: BalanceOf<Self::T>,
-	) -> DispatchResult;
+	fn transfer(&mut self, to: &AccountIdOf<Self::T>, value: BalanceOf<Self::T>) -> DispatchResult;
 
 	/// Returns the storage entry of the executing account by the given `key`.
 	///
@@ -351,8 +346,7 @@ pub trait Executable<T: Config>: Sized {
 	/// # Note
 	///
 	/// Charges weight proportional to the code size from the gas meter.
-	fn add_user(code_hash: CodeHash<T>, gas_meter: &mut GasMeter<T>)
-		-> Result<(), DispatchError>;
+	fn add_user(code_hash: CodeHash<T>, gas_meter: &mut GasMeter<T>) -> Result<(), DispatchError>;
 
 	/// Decrement the refcount by one and remove the code when it drops to zero.
 	///
@@ -361,8 +355,10 @@ pub trait Executable<T: Config>: Sized {
 	/// # Note
 	///
 	/// Charges weight proportional to the code size from the gas meter
-	fn remove_user(code_hash: CodeHash<T>, gas_meter: &mut GasMeter<T>)
-		-> Result<(), DispatchError>;
+	fn remove_user(
+		code_hash: CodeHash<T>,
+		gas_meter: &mut GasMeter<T>,
+	) -> Result<(), DispatchError>;
 
 	/// Execute the specified exported function and return the result.
 	///
@@ -550,15 +546,15 @@ macro_rules! get_cached_or_panic_after_load {
 				qed"
 			);
 		}
-	}}
+	}};
 }
 
 impl<T: Config> CachedContract<T> {
 	/// Load the `contract_info` from storage if necessary.
 	fn load(&mut self, account_id: &T::AccountId) {
 		if let CachedContract::Invalidated = self {
-			let contract = <ContractInfoOf<T>>::get(&account_id)
-				.and_then(|contract| contract.get_alive());
+			let contract =
+				<ContractInfoOf<T>>::get(&account_id).and_then(|contract| contract.get_alive());
 			if let Some(contract) = contract {
 				*self = CachedContract::Cached(contract);
 			}
@@ -610,7 +606,7 @@ where
 		debug_message: Option<&'a mut Vec<u8>>,
 	) -> Result<ExecReturnValue, ExecError> {
 		let (mut stack, executable) = Self::new(
-			FrameArgs::Call{dest, cached_info: None},
+			FrameArgs::Call { dest, cached_info: None },
 			origin,
 			gas_meter,
 			schedule,
@@ -692,18 +688,18 @@ where
 		value_transferred: BalanceOf<T>,
 		gas_meter: &mut GasMeter<T>,
 		gas_limit: Weight,
-		schedule: &Schedule<T>
+		schedule: &Schedule<T>,
 	) -> Result<(Frame<T>, E), ExecError> {
 		let (account_id, contract_info, executable, entry_point) = match frame_args {
-			FrameArgs::Call{dest, cached_info} => {
+			FrameArgs::Call { dest, cached_info } => {
 				let contract = if let Some(contract) = cached_info {
 					contract
 				} else {
 					<ContractInfoOf<T>>::get(&dest)
 						.ok_or(<Error<T>>::ContractNotFound.into())
-						.and_then(|contract|
+						.and_then(|contract| {
 							contract.get_alive().ok_or(<Error<T>>::ContractIsTombstone)
-						)?
+						})?
 				};
 
 				let executable = E::from_storage(contract.code_hash, schedule, gas_meter)?;
@@ -713,15 +709,14 @@ where
 				// changes would be rolled back in case this contract is called by another
 				// contract.
 				// See: https://github.com/paritytech/substrate/issues/6439#issuecomment-648754324
-				let contract = Rent::<T, E>
-					::charge(&dest, contract, executable.occupied_storage())?
-					.ok_or(Error::<T>::RentNotPaid)?;
+				let contract =
+					Rent::<T, E>::charge(&dest, contract, executable.occupied_storage())?
+						.ok_or(Error::<T>::RentNotPaid)?;
 				(dest, contract, executable, ExportedFunction::Call)
-			}
-			FrameArgs::Instantiate{sender, trie_seed, executable, salt} => {
-				let account_id = <Contracts<T>>::contract_address(
-					&sender, executable.code_hash(), &salt,
-				);
+			},
+			FrameArgs::Instantiate { sender, trie_seed, executable, salt } => {
+				let account_id =
+					<Contracts<T>>::contract_address(&sender, executable.code_hash(), &salt);
 				let trie_id = Storage::<T>::generate_trie_id(&account_id, trie_seed);
 				let contract = Storage::<T>::new_contract(
 					&account_id,
@@ -729,12 +724,15 @@ where
 					executable.code_hash().clone(),
 				)?;
 				(account_id, contract, executable, ExportedFunction::Constructor)
-			}
+			},
 		};
 
 		let frame = Frame {
 			rent_params: RentParams::new(
-				&account_id, &value_transferred, &contract_info, &executable,
+				&account_id,
+				&value_transferred,
+				&contract_info,
+				&executable,
 			),
 			value_transferred,
 			contract_info: CachedContract::Cached(contract_info),
@@ -755,7 +753,7 @@ where
 		gas_limit: Weight,
 	) -> Result<E, ExecError> {
 		if self.frames.len() == T::CallStack::size() {
-			return Err(Error::<T>::MaxCallDepthReached.into());
+			return Err(Error::<T>::MaxCallDepthReached.into())
 		}
 
 		// We need to make sure that changes made to the contract info are not discarded.
@@ -772,17 +770,10 @@ where
 			);
 		}
 
-		let nested_meter = &mut self.frames
-			.last_mut()
-			.unwrap_or(&mut self.first_frame)
-			.nested_meter;
-		let (frame, executable) = Self::new_frame(
-			frame_args,
-			value_transferred,
-			nested_meter,
-			gas_limit,
-			self.schedule,
-		)?;
+		let nested_meter =
+			&mut self.frames.last_mut().unwrap_or(&mut self.first_frame).nested_meter;
+		let (frame, executable) =
+			Self::new_frame(frame_args, value_transferred, nested_meter, gas_limit, self.schedule)?;
 		self.frames.push(frame);
 		Ok(executable)
 	}
@@ -790,11 +781,7 @@ where
 	/// Run the current (top) frame.
 	///
 	/// This can be either a call or an instantiate.
-	fn run(
-		&mut self,
-		executable: E,
-		input_data: Vec<u8>
-	) -> Result<ExecReturnValue, ExecError> {
+	fn run(&mut self, executable: E, input_data: Vec<u8>) -> Result<ExecReturnValue, ExecError> {
 		let entry_point = self.top_frame().entry_point;
 		let do_transaction = || {
 			// Cache the value before calling into the constructor because that
@@ -807,11 +794,9 @@ where
 			self.initial_transfer()?;
 
 			// Call into the wasm blob.
-			let output = executable.execute(
-				self,
-				&entry_point,
-				input_data,
-			).map_err(|e| ExecError { error: e.error, origin: ErrorOrigin::Callee })?;
+			let output = executable
+				.execute(self, &entry_point, input_data)
+				.map_err(|e| ExecError { error: e.error, origin: ErrorOrigin::Callee })?;
 
 			// Additional work needs to be performed in case of an instantiation.
 			if output.is_success() && entry_point == ExportedFunction::Constructor {
@@ -820,7 +805,7 @@ where
 
 				// It is not allowed to terminate a contract inside its constructor.
 				if let CachedContract::Terminated = frame.contract_info {
-					return Err(Error::<T>::TerminatedInConstructor.into());
+					return Err(Error::<T>::TerminatedInConstructor.into())
 				}
 
 				// Collect the rent for the first block to prevent the creation of very large
@@ -828,16 +813,13 @@ where
 				// This also makes sure that it is above the subsistence threshold
 				// in order to keep up the guarantuee that we always leave a tombstone behind
 				// with the exception of a contract that called `seal_terminate`.
-				let contract = Rent::<T, E>
-					::charge(&account_id, frame.invalidate(), occupied_storage)?
-					.ok_or(Error::<T>::NewContractNotFunded)?;
+				let contract =
+					Rent::<T, E>::charge(&account_id, frame.invalidate(), occupied_storage)?
+						.ok_or(Error::<T>::NewContractNotFunded)?;
 				frame.contract_info = CachedContract::Cached(contract);
 
 				// Deposit an instantiation event.
-				deposit_event::<T>(vec![], Event::Instantiated(
-					self.caller().clone(),
-					account_id,
-				));
+				deposit_event::<T>(vec![], Event::Instantiated(self.caller().clone(), account_id));
 			}
 
 			Ok(output)
@@ -849,9 +831,7 @@ where
 		let (success, output) = with_transaction(|| {
 			let output = do_transaction();
 			match &output {
-				Ok(result) if result.is_success() => {
-					TransactionOutcome::Commit((true, output))
-				},
+				Ok(result) if result.is_success() => TransactionOutcome::Commit((true, output)),
 				_ => TransactionOutcome::Rollback((false, output)),
 			}
 		});
@@ -880,7 +860,7 @@ where
 			prev.nested_meter.absorb_nested(frame.nested_meter);
 			// Only gas counter changes are persisted in case of a failure.
 			if !persist {
-				return;
+				return
 			}
 			if let CachedContract::Cached(contract) = frame.contract_info {
 				// optimization: Predecessor is the same contract.
@@ -889,7 +869,7 @@ where
 				// trigger a rollback.
 				if prev.account_id == *account_id {
 					prev.contract_info = CachedContract::Cached(contract);
-					return;
+					return
 				}
 
 				// Predecessor is a different contract: We persist the info and invalidate the first
@@ -914,12 +894,12 @@ where
 			self.gas_meter.absorb_nested(mem::take(&mut self.first_frame.nested_meter));
 			// Only gas counter changes are persisted in case of a failure.
 			if !persist {
-				return;
+				return
 			}
 			if let CachedContract::Cached(contract) = &self.first_frame.contract_info {
 				<ContractInfoOf<T>>::insert(
 					&self.first_frame.account_id,
-					ContractInfo::Alive(contract.clone())
+					ContractInfo::Alive(contract.clone()),
 				);
 			}
 			if let Some(counter) = self.account_counter {
@@ -942,7 +922,7 @@ where
 		value: BalanceOf<T>,
 	) -> DispatchResult {
 		if value == 0u32.into() {
-			return Ok(());
+			return Ok(())
 		}
 
 		let existence_requirement = match (allow_death, sender_is_contract) {
@@ -974,16 +954,10 @@ where
 		// we can error out early. This avoids executing the constructor in cases where
 		// we already know that the contract has too little balance.
 		if frame.entry_point == ExportedFunction::Constructor && value < subsistence_threshold {
-			return Err(<Error<T>>::NewContractNotFunded.into());
+			return Err(<Error<T>>::NewContractNotFunded.into())
 		}
 
-		Self::transfer(
-			self.caller_is_origin(),
-			false,
-			self.caller(),
-			&frame.account_id,
-			value,
-		)
+		Self::transfer(self.caller_is_origin(), false, self.caller(), &frame.account_id, value)
 	}
 
 	/// Wether the caller is the initiator of the call stack.
@@ -1004,17 +978,13 @@ where
 	/// Iterator over all frames.
 	///
 	/// The iterator starts with the top frame and ends with the root frame.
-	fn frames(&self) -> impl Iterator<Item=&Frame<T>> {
-		sp_std::iter::once(&self.first_frame)
-			.chain(&self.frames)
-			.rev()
+	fn frames(&self) -> impl Iterator<Item = &Frame<T>> {
+		sp_std::iter::once(&self.first_frame).chain(&self.frames).rev()
 	}
 
 	/// Same as `frames` but with a mutable reference as iterator item.
-	fn frames_mut(&mut self) -> impl Iterator<Item=&mut Frame<T>> {
-		sp_std::iter::once(&mut self.first_frame)
-			.chain(&mut self.frames)
-			.rev()
+	fn frames_mut(&mut self) -> impl Iterator<Item = &mut Frame<T>> {
+		sp_std::iter::once(&mut self.first_frame).chain(&mut self.frames).rev()
 	}
 
 	/// Returns whether the current contract is on the stack multiple times.
@@ -1068,7 +1038,7 @@ where
 
 		let try_call = || {
 			if !self.allows_reentry(&to) {
-				return Err(<Error<T>>::ReentranceDenied.into());
+				return Err(<Error<T>>::ReentranceDenied.into())
 			}
 			// We ignore instantiate frames in our search for a cached contract.
 			// Otherwise it would be possible to recursively call a contract from its own
@@ -1076,17 +1046,12 @@ where
 			let cached_info = self
 				.frames()
 				.find(|f| f.entry_point == ExportedFunction::Call && f.account_id == to)
-				.and_then(|f| {
-					match &f.contract_info {
-						CachedContract::Cached(contract) => Some(contract.clone()),
-						_ => None,
-					}
+				.and_then(|f| match &f.contract_info {
+					CachedContract::Cached(contract) => Some(contract.clone()),
+					_ => None,
 				});
-			let executable = self.push_frame(
-				FrameArgs::Call{dest: to, cached_info},
-				value,
-				gas_limit
-			)?;
+			let executable =
+				self.push_frame(FrameArgs::Call { dest: to, cached_info }, value, gas_limit)?;
 			self.run(executable, input_data)
 		};
 
@@ -1125,7 +1090,7 @@ where
 
 	fn terminate(&mut self, beneficiary: &AccountIdOf<Self::T>) -> Result<(), DispatchError> {
 		if self.is_recursive() {
-			return Err(Error::<T>::TerminatedWhileReentrant.into());
+			return Err(Error::<T>::TerminatedWhileReentrant.into())
 		}
 		let frame = self.top_frame_mut();
 		let info = frame.terminate();
@@ -1139,9 +1104,10 @@ where
 		)?;
 		ContractInfoOf::<T>::remove(&frame.account_id);
 		E::remove_user(info.code_hash, &mut frame.nested_meter)?;
-		Contracts::<T>::deposit_event(
-			Event::Terminated(frame.account_id.clone(), beneficiary.clone()),
-		);
+		Contracts::<T>::deposit_event(Event::Terminated(
+			frame.account_id.clone(),
+			beneficiary.clone(),
+		));
 		Ok(())
 	}
 
@@ -1153,7 +1119,7 @@ where
 		delta: Vec<StorageKey>,
 	) -> Result<(), DispatchError> {
 		if self.is_recursive() {
-			return Err(Error::<T>::TerminatedWhileReentrant.into());
+			return Err(Error::<T>::TerminatedWhileReentrant.into())
 		}
 		let frame = self.top_frame_mut();
 		let origin_contract = frame.contract_info().clone();
@@ -1170,23 +1136,14 @@ where
 		if let Ok(_) = result {
 			deposit_event::<Self::T>(
 				vec![],
-				Event::Restored(
-					account_id,
-					dest,
-					code_hash,
-					rent_allowance,
-				),
+				Event::Restored(account_id, dest, code_hash, rent_allowance),
 			);
 			frame.terminate();
 		}
 		result
 	}
 
-	fn transfer(
-		&mut self,
-		to: &T::AccountId,
-		value: BalanceOf<T>,
-	) -> DispatchResult {
+	fn transfer(&mut self, to: &T::AccountId, value: BalanceOf<T>) -> DispatchResult {
 		Self::transfer(true, false, &self.top_frame().account_id, to, value)
 	}
 
@@ -1197,9 +1154,7 @@ where
 	fn set_storage(&mut self, key: StorageKey, value: Option<Vec<u8>>) -> DispatchResult {
 		let block_number = self.block_number;
 		let frame = self.top_frame_mut();
-		Storage::<T>::write(
-			block_number, frame.contract_info(), &key, value,
-		)
+		Storage::<T>::write(block_number, frame.contract_info(), &key, value)
 	}
 
 	fn address(&self) -> &T::AccountId {
@@ -1237,7 +1192,7 @@ where
 	fn deposit_event(&mut self, topics: Vec<T::Hash>, data: Vec<u8>) {
 		deposit_event::<Self::T>(
 			topics,
-			Event::ContractEmitted(self.top_frame().account_id.clone(), data)
+			Event::ContractEmitted(self.top_frame().account_id.clone(), data),
 		);
 	}
 
@@ -1249,7 +1204,9 @@ where
 		self.top_frame_mut().contract_info().rent_allowance
 	}
 
-	fn block_number(&self) -> T::BlockNumber { self.block_number }
+	fn block_number(&self) -> T::BlockNumber {
+		self.block_number
+	}
 
 	fn max_value_size(&self) -> u32 {
 		T::Schedule::get().limits.payload_len
@@ -1303,10 +1260,7 @@ where
 	}
 }
 
-fn deposit_event<T: Config>(
-	topics: Vec<T::Hash>,
-	event: Event<T>,
-) {
+fn deposit_event<T: Config>(topics: Vec<T::Hash>, event: Event<T>) {
 	<frame_system::Pallet<T>>::deposit_event_indexed(
 		&*topics,
 		<T as Config>::Event::from(event).into(),
@@ -1336,24 +1290,27 @@ mod sealing {
 mod tests {
 	use super::*;
 	use crate::{
+		exec::ExportedFunction::*,
 		gas::GasMeter,
 		storage::Storage,
 		tests::{
-			ALICE, BOB, CHARLIE, Call, TestFilter, ExtBuilder, Test, Event as MetaEvent,
-			test_utils::{place_contract, set_balance, get_balance},
+			test_utils::{get_balance, place_contract, set_balance},
+			Call, Event as MetaEvent, ExtBuilder, Test, TestFilter, ALICE, BOB, CHARLIE,
 		},
-		exec::ExportedFunction::*,
 		Error, Weight,
 	};
-	use codec::{Encode, Decode};
-	use sp_core::Bytes;
-	use sp_runtime::{DispatchError, traits::{BadOrigin, Hash}};
 	use assert_matches::assert_matches;
-	use std::{cell::RefCell, collections::HashMap, rc::Rc};
-	use pretty_assertions::{assert_eq, assert_ne};
-	use pallet_contracts_primitives::ReturnFlags;
-	use frame_support::{assert_ok, assert_err};
+	use codec::{Decode, Encode};
+	use frame_support::{assert_err, assert_ok};
 	use frame_system::{EventRecord, Phase};
+	use pallet_contracts_primitives::ReturnFlags;
+	use pretty_assertions::{assert_eq, assert_ne};
+	use sp_core::Bytes;
+	use sp_runtime::{
+		traits::{BadOrigin, Hash},
+		DispatchError,
+	};
+	use std::{cell::RefCell, collections::HashMap, rc::Rc};
 
 	type System = frame_system::Pallet<Test>;
 
@@ -1404,12 +1361,15 @@ mod tests {
 				// Generate code hashes as monotonically increasing values.
 				let hash = <Test as frame_system::Config>::Hash::from_low_u64_be(loader.counter);
 				loader.counter += 1;
-				loader.map.insert(hash, MockExecutable {
-					func: Rc::new(f),
-					func_type,
-					code_hash: hash.clone(),
-					refcount: 1,
-				});
+				loader.map.insert(
+					hash,
+					MockExecutable {
+						func: Rc::new(f),
+						func_type,
+						code_hash: hash.clone(),
+						refcount: 1,
+					},
+				);
 				hash
 			})
 		}
@@ -1417,7 +1377,8 @@ mod tests {
 		fn increment_refcount(code_hash: CodeHash<Test>) {
 			LOADER.with(|loader| {
 				let mut loader = loader.borrow_mut();
-				loader.map
+				loader
+					.map
 					.entry(code_hash)
 					.and_modify(|executable| executable.refcount += 1)
 					.or_insert_with(|| panic!("code_hash does not exist"));
@@ -1442,12 +1403,7 @@ mod tests {
 
 		fn refcount(code_hash: &CodeHash<Test>) -> u32 {
 			LOADER.with(|loader| {
-				loader
-					.borrow()
-					.map
-					.get(code_hash)
-					.expect("code_hash does not exist")
-					.refcount()
+				loader.borrow().map.get(code_hash).expect("code_hash does not exist").refcount()
 			})
 		}
 	}
@@ -1463,7 +1419,8 @@ mod tests {
 
 		fn from_storage_noinstr(code_hash: CodeHash<Test>) -> Result<Self, DispatchError> {
 			LOADER.with(|loader| {
-				loader.borrow_mut()
+				loader
+					.borrow_mut()
 					.map
 					.get(&code_hash)
 					.cloned()
@@ -1475,16 +1432,18 @@ mod tests {
 			MockLoader::decrement_refcount(self.code_hash);
 		}
 
-		fn add_user(code_hash: CodeHash<Test>, _: &mut GasMeter<Test>)
-			-> Result<(), DispatchError>
-		{
+		fn add_user(
+			code_hash: CodeHash<Test>,
+			_: &mut GasMeter<Test>,
+		) -> Result<(), DispatchError> {
 			MockLoader::increment_refcount(code_hash);
 			Ok(())
 		}
 
-		fn remove_user(code_hash: CodeHash<Test>, _: &mut GasMeter<Test>)
-			-> Result<(), DispatchError>
-		{
+		fn remove_user(
+			code_hash: CodeHash<Test>,
+			_: &mut GasMeter<Test>,
+		) -> Result<(), DispatchError> {
 			MockLoader::decrement_refcount(code_hash);
 			Ok(())
 		}
@@ -1499,10 +1458,7 @@ mod tests {
 				MockLoader::increment_refcount(self.code_hash);
 			}
 			if function == &self.func_type {
-				(self.func)(MockCtx {
-					ext,
-					input_data,
-				}, &self)
+				(self.func)(MockCtx { ext, input_data }, &self)
 			} else {
 				exec_success()
 			}
@@ -1551,9 +1507,7 @@ mod tests {
 			place_contract(&BOB, exec_ch);
 
 			assert_matches!(
-				MockStack::run_call(
-					ALICE, BOB, &mut gas_meter, &schedule, value, vec![], None,
-				),
+				MockStack::run_call(ALICE, BOB, &mut gas_meter, &schedule, value, vec![], None,),
 				Ok(_)
 			);
 		});
@@ -1572,13 +1526,7 @@ mod tests {
 			set_balance(&origin, 100);
 			set_balance(&dest, 0);
 
-			MockStack::transfer(
-				true,
-				false,
-				&origin,
-				&dest,
-				55,
-			).unwrap();
+			MockStack::transfer(true, false, &origin, &dest, 55).unwrap();
 
 			assert_eq!(get_balance(&origin), 45);
 			assert_eq!(get_balance(&dest), 55);
@@ -1592,10 +1540,9 @@ mod tests {
 		let origin = ALICE;
 		let dest = BOB;
 
-		let return_ch = MockLoader::insert(
-			Call,
-			|_, _| Ok(ExecReturnValue { flags: ReturnFlags::REVERT, data: Bytes(Vec::new()) })
-		);
+		let return_ch = MockLoader::insert(Call, |_, _| {
+			Ok(ExecReturnValue { flags: ReturnFlags::REVERT, data: Bytes(Vec::new()) })
+		});
 
 		ExtBuilder::default().build().execute_with(|| {
 			let schedule = <Test as Config>::Schedule::get();
@@ -1611,7 +1558,8 @@ mod tests {
 				55,
 				vec![],
 				None,
-			).unwrap();
+			)
+			.unwrap();
 
 			assert!(!output.is_success());
 			assert_eq!(get_balance(&origin), 100);
@@ -1631,18 +1579,9 @@ mod tests {
 		ExtBuilder::default().build().execute_with(|| {
 			set_balance(&origin, 0);
 
-			let result = MockStack::transfer(
-				false,
-				false,
-				&origin,
-				&dest,
-				100,
-			);
+			let result = MockStack::transfer(false, false, &origin, &dest, 100);
 
-			assert_eq!(
-				result,
-				Err(Error::<Test>::TransferFailed.into())
-			);
+			assert_eq!(result, Err(Error::<Test>::TransferFailed.into()));
 			assert_eq!(get_balance(&origin), 0);
 			assert_eq!(get_balance(&dest), 0);
 		});
@@ -1654,10 +1593,9 @@ mod tests {
 		// is returned from the execution context.
 		let origin = ALICE;
 		let dest = BOB;
-		let return_ch = MockLoader::insert(
-			Call,
-			|_, _| Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: Bytes(vec![1, 2, 3, 4]) })
-		);
+		let return_ch = MockLoader::insert(Call, |_, _| {
+			Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: Bytes(vec![1, 2, 3, 4]) })
+		});
 
 		ExtBuilder::default().build().execute_with(|| {
 			let schedule = <Test as Config>::Schedule::get();
@@ -1685,10 +1623,9 @@ mod tests {
 		// is returned from the execution context.
 		let origin = ALICE;
 		let dest = BOB;
-		let return_ch = MockLoader::insert(
-			Call,
-			|_, _| Ok(ExecReturnValue { flags: ReturnFlags::REVERT, data: Bytes(vec![1, 2, 3, 4]) })
-		);
+		let return_ch = MockLoader::insert(Call, |_, _| {
+			Ok(ExecReturnValue { flags: ReturnFlags::REVERT, data: Bytes(vec![1, 2, 3, 4]) })
+		});
 
 		ExtBuilder::default().build().execute_with(|| {
 			let schedule = <Test as Config>::Schedule::get();
@@ -1747,9 +1684,8 @@ mod tests {
 			let schedule = <Test as Config>::Schedule::get();
 			let subsistence = Contracts::<Test>::subsistence_threshold();
 			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
-			let executable = MockExecutable::from_storage(
-				input_data_ch, &schedule, &mut gas_meter
-			).unwrap();
+			let executable =
+				MockExecutable::from_storage(input_data_ch, &schedule, &mut gas_meter).unwrap();
 
 			set_balance(&ALICE, subsistence * 10);
 
@@ -1784,10 +1720,7 @@ mod tests {
 				if !*reached_bottom {
 					// We are first time here, it means we just reached bottom.
 					// Verify that we've got proper error and set `reached_bottom`.
-					assert_eq!(
-						r,
-						Err(Error::<Test>::MaxCallDepthReached.into())
-					);
+					assert_eq!(r, Err(Error::<Test>::MaxCallDepthReached.into()));
 					*reached_bottom = true;
 				} else {
 					// We just unwinding stack here.
@@ -1829,22 +1762,17 @@ mod tests {
 
 		let bob_ch = MockLoader::insert(Call, |ctx, _| {
 			// Record the caller for bob.
-			WITNESSED_CALLER_BOB.with(|caller|
-				*caller.borrow_mut() = Some(ctx.ext.caller().clone())
-			);
+			WITNESSED_CALLER_BOB
+				.with(|caller| *caller.borrow_mut() = Some(ctx.ext.caller().clone()));
 
 			// Call into CHARLIE contract.
-			assert_matches!(
-				ctx.ext.call(0, CHARLIE, 0, vec![], true),
-				Ok(_)
-			);
+			assert_matches!(ctx.ext.call(0, CHARLIE, 0, vec![], true), Ok(_));
 			exec_success()
 		});
 		let charlie_ch = MockLoader::insert(Call, |ctx, _| {
 			// Record the caller for charlie.
-			WITNESSED_CALLER_CHARLIE.with(|caller|
-				*caller.borrow_mut() = Some(ctx.ext.caller().clone())
-			);
+			WITNESSED_CALLER_CHARLIE
+				.with(|caller| *caller.borrow_mut() = Some(ctx.ext.caller().clone()));
 			exec_success()
 		});
 
@@ -1877,10 +1805,7 @@ mod tests {
 			assert_eq!(*ctx.ext.address(), BOB);
 
 			// Call into charlie contract.
-			assert_matches!(
-				ctx.ext.call(0, CHARLIE, 0, vec![], true),
-				Ok(_)
-			);
+			assert_matches!(ctx.ext.call(0, CHARLIE, 0, vec![], true), Ok(_));
 			exec_success()
 		});
 		let charlie_ch = MockLoader::insert(Call, |ctx, _| {
@@ -1914,9 +1839,8 @@ mod tests {
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
 			let schedule = <Test as Config>::Schedule::get();
 			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
-			let executable = MockExecutable::from_storage(
-				dummy_ch, &schedule, &mut gas_meter
-			).unwrap();
+			let executable =
+				MockExecutable::from_storage(dummy_ch, &schedule, &mut gas_meter).unwrap();
 
 			assert_matches!(
 				MockStack::run_instantiate(
@@ -1936,17 +1860,15 @@ mod tests {
 
 	#[test]
 	fn instantiation_work_with_success_output() {
-		let dummy_ch = MockLoader::insert(
-			Constructor,
-			|_, _| Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: Bytes(vec![80, 65, 83, 83]) })
-		);
+		let dummy_ch = MockLoader::insert(Constructor, |_, _| {
+			Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: Bytes(vec![80, 65, 83, 83]) })
+		});
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
 			let schedule = <Test as Config>::Schedule::get();
 			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
-			let executable = MockExecutable::from_storage(
-				dummy_ch, &schedule, &mut gas_meter
-			).unwrap();
+			let executable =
+				MockExecutable::from_storage(dummy_ch, &schedule, &mut gas_meter).unwrap();
 			set_balance(&ALICE, 1000);
 
 			let instantiated_contract_address = assert_matches!(
@@ -1965,26 +1887,25 @@ mod tests {
 
 			// Check that the newly created account has the expected code hash and
 			// there are instantiation event.
-			assert_eq!(Storage::<Test>::code_hash(&instantiated_contract_address).unwrap(), dummy_ch);
-			assert_eq!(&events(), &[
-				Event::Instantiated(ALICE, instantiated_contract_address)
-			]);
+			assert_eq!(
+				Storage::<Test>::code_hash(&instantiated_contract_address).unwrap(),
+				dummy_ch
+			);
+			assert_eq!(&events(), &[Event::Instantiated(ALICE, instantiated_contract_address)]);
 		});
 	}
 
 	#[test]
 	fn instantiation_fails_with_failing_output() {
-		let dummy_ch = MockLoader::insert(
-			Constructor,
-			|_, _| Ok(ExecReturnValue { flags: ReturnFlags::REVERT, data: Bytes(vec![70, 65, 73, 76]) })
-		);
+		let dummy_ch = MockLoader::insert(Constructor, |_, _| {
+			Ok(ExecReturnValue { flags: ReturnFlags::REVERT, data: Bytes(vec![70, 65, 73, 76]) })
+		});
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
 			let schedule = <Test as Config>::Schedule::get();
 			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
-			let executable = MockExecutable::from_storage(
-				dummy_ch, &schedule, &mut gas_meter
-			).unwrap();
+			let executable =
+				MockExecutable::from_storage(dummy_ch, &schedule, &mut gas_meter).unwrap();
 			set_balance(&ALICE, 1000);
 
 			let instantiated_contract_address = assert_matches!(
@@ -2016,13 +1937,16 @@ mod tests {
 			let instantiated_contract_address = Rc::clone(&instantiated_contract_address);
 			move |ctx, _| {
 				// Instantiate a contract and save it's address in `instantiated_contract_address`.
-				let (address, output) = ctx.ext.instantiate(
-					0,
-					dummy_ch,
-					Contracts::<Test>::subsistence_threshold() * 3,
-					vec![],
-					&[48, 49, 50],
-				).unwrap();
+				let (address, output) = ctx
+					.ext
+					.instantiate(
+						0,
+						dummy_ch,
+						Contracts::<Test>::subsistence_threshold() * 3,
+						vec![],
+						&[48, 49, 50],
+					)
+					.unwrap();
 
 				*instantiated_contract_address.borrow_mut() = address.into();
 				Ok(output)
@@ -2036,27 +1960,33 @@ mod tests {
 
 			assert_matches!(
 				MockStack::run_call(
-					ALICE, BOB, &mut GasMeter::<Test>::new(GAS_LIMIT), &schedule, 20, vec![], None,
+					ALICE,
+					BOB,
+					&mut GasMeter::<Test>::new(GAS_LIMIT),
+					&schedule,
+					20,
+					vec![],
+					None,
 				),
 				Ok(_)
 			);
 
-			let instantiated_contract_address = instantiated_contract_address.borrow().as_ref().unwrap().clone();
+			let instantiated_contract_address =
+				instantiated_contract_address.borrow().as_ref().unwrap().clone();
 
 			// Check that the newly created account has the expected code hash and
 			// there are instantiation event.
-			assert_eq!(Storage::<Test>::code_hash(&instantiated_contract_address).unwrap(), dummy_ch);
-			assert_eq!(&events(), &[
-				Event::Instantiated(BOB, instantiated_contract_address)
-			]);
+			assert_eq!(
+				Storage::<Test>::code_hash(&instantiated_contract_address).unwrap(),
+				dummy_ch
+			);
+			assert_eq!(&events(), &[Event::Instantiated(BOB, instantiated_contract_address)]);
 		});
 	}
 
 	#[test]
 	fn instantiation_traps() {
-		let dummy_ch = MockLoader::insert(Constructor,
-			|_, _| Err("It's a trap!".into())
-		);
+		let dummy_ch = MockLoader::insert(Constructor, |_, _| Err("It's a trap!".into()));
 		let instantiator_ch = MockLoader::insert(Call, {
 			let dummy_ch = dummy_ch.clone();
 			move |ctx, _| {
@@ -2087,7 +2017,13 @@ mod tests {
 
 			assert_matches!(
 				MockStack::run_call(
-					ALICE, BOB, &mut GasMeter::<Test>::new(GAS_LIMIT), &schedule, 20, vec![], None,
+					ALICE,
+					BOB,
+					&mut GasMeter::<Test>::new(GAS_LIMIT),
+					&schedule,
+					20,
+					vec![],
+					None,
 				),
 				Ok(_)
 			);
@@ -2105,36 +2041,29 @@ mod tests {
 			exec_success()
 		});
 
-		ExtBuilder::default()
-			.existential_deposit(15)
-			.build()
-			.execute_with(|| {
-				let schedule = <Test as Config>::Schedule::get();
-				let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
-				let executable = MockExecutable::from_storage(
-					terminate_ch, &schedule, &mut gas_meter
-				).unwrap();
-				set_balance(&ALICE, 1000);
-
-				assert_eq!(
-					MockStack::run_instantiate(
-						ALICE,
-						executable,
-						&mut gas_meter,
-						&schedule,
-						100,
-						vec![],
-						&[],
-						None,
-					),
-					Err(Error::<Test>::TerminatedInConstructor.into())
-				);
+		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
+			let schedule = <Test as Config>::Schedule::get();
+			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
+			let executable =
+				MockExecutable::from_storage(terminate_ch, &schedule, &mut gas_meter).unwrap();
+			set_balance(&ALICE, 1000);
 
-				assert_eq!(
-					&events(),
-					&[]
-				);
-			});
+			assert_eq!(
+				MockStack::run_instantiate(
+					ALICE,
+					executable,
+					&mut gas_meter,
+					&schedule,
+					100,
+					vec![],
+					&[],
+					None,
+				),
+				Err(Error::<Test>::TerminatedInConstructor.into())
+			);
+
+			assert_eq!(&events(), &[]);
+		});
 	}
 
 	#[test]
@@ -2152,9 +2081,8 @@ mod tests {
 			let subsistence = Contracts::<Test>::subsistence_threshold();
 			let schedule = <Test as Config>::Schedule::get();
 			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
-			let executable = MockExecutable::from_storage(
-				rent_allowance_ch, &schedule, &mut gas_meter
-			).unwrap();
+			let executable =
+				MockExecutable::from_storage(rent_allowance_ch, &schedule, &mut gas_meter).unwrap();
 			set_balance(&ALICE, subsistence * 10);
 
 			let result = MockStack::run_instantiate(
@@ -2175,9 +2103,8 @@ mod tests {
 	fn rent_params_works() {
 		let code_hash = MockLoader::insert(Call, |ctx, executable| {
 			let address = ctx.ext.address();
-			let contract = <ContractInfoOf<Test>>::get(address)
-				.and_then(|c| c.get_alive())
-				.unwrap();
+			let contract =
+				<ContractInfoOf<Test>>::get(address).and_then(|c| c.get_alive()).unwrap();
 			assert_eq!(ctx.ext.rent_params(), &RentParams::new(address, &0, &contract, executable));
 			exec_success()
 		});
@@ -2188,15 +2115,7 @@ mod tests {
 			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
 			set_balance(&ALICE, subsistence * 10);
 			place_contract(&BOB, code_hash);
-			MockStack::run_call(
-				ALICE,
-				BOB,
-				&mut gas_meter,
-				&schedule,
-				0,
-				vec![],
-				None,
-			).unwrap();
+			MockStack::run_call(ALICE, BOB, &mut gas_meter, &schedule, 0, vec![], None).unwrap();
 		});
 	}
 
@@ -2205,9 +2124,8 @@ mod tests {
 		let code_hash = MockLoader::insert(Call, |ctx, executable| {
 			let subsistence = Contracts::<Test>::subsistence_threshold();
 			let address = ctx.ext.address();
-			let contract = <ContractInfoOf<Test>>::get(address)
-				.and_then(|c| c.get_alive())
-				.unwrap();
+			let contract =
+				<ContractInfoOf<Test>>::get(address).and_then(|c| c.get_alive()).unwrap();
 			let rent_params = RentParams::new(address, &0, &contract, executable);
 
 			// Changing the allowance during the call: rent params stay unchanged.
@@ -2219,13 +2137,9 @@ mod tests {
 			// Creating another instance from the same code_hash increases the refcount.
 			// This is also not reflected in the rent params.
 			assert_eq!(MockLoader::refcount(&executable.code_hash), 1);
-			ctx.ext.instantiate(
-				0,
-				executable.code_hash,
-				subsistence * 25,
-				vec![],
-				&[],
-			).unwrap();
+			ctx.ext
+				.instantiate(0, executable.code_hash, subsistence * 25, vec![], &[])
+				.unwrap();
 			assert_eq!(MockLoader::refcount(&executable.code_hash), 2);
 			assert_eq!(ctx.ext.rent_params(), &rent_params);
 
@@ -2246,31 +2160,38 @@ mod tests {
 				subsistence * 50,
 				vec![],
 				None,
-			).unwrap();
+			)
+			.unwrap();
 		});
 	}
 
 	#[test]
 	fn rent_status_works() {
 		let code_hash = MockLoader::insert(Call, |ctx, _| {
-			assert_eq!(ctx.ext.rent_status(0), RentStatus {
-				max_deposit: 80000,
-				current_deposit: 80000,
-				custom_refcount_deposit: None,
-				max_rent: 32,
-				current_rent: 32,
-				custom_refcount_rent: None,
-				_reserved: None,
-			});
-			assert_eq!(ctx.ext.rent_status(1), RentStatus {
-				max_deposit: 80000,
-				current_deposit: 80000,
-				custom_refcount_deposit: Some(80000),
-				max_rent: 32,
-				current_rent: 32,
-				custom_refcount_rent: Some(32),
-				_reserved: None,
-			});
+			assert_eq!(
+				ctx.ext.rent_status(0),
+				RentStatus {
+					max_deposit: 80000,
+					current_deposit: 80000,
+					custom_refcount_deposit: None,
+					max_rent: 32,
+					current_rent: 32,
+					custom_refcount_rent: None,
+					_reserved: None,
+				}
+			);
+			assert_eq!(
+				ctx.ext.rent_status(1),
+				RentStatus {
+					max_deposit: 80000,
+					current_deposit: 80000,
+					custom_refcount_deposit: Some(80000),
+					max_rent: 32,
+					current_rent: 32,
+					custom_refcount_rent: Some(32),
+					_reserved: None,
+				}
+			);
 			exec_success()
 		});
 
@@ -2280,15 +2201,7 @@ mod tests {
 			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
 			set_balance(&ALICE, subsistence * 10);
 			place_contract(&BOB, code_hash);
-			MockStack::run_call(
-				ALICE,
-				BOB,
-				&mut gas_meter,
-				&schedule,
-				0,
-				vec![],
-				None,
-			).unwrap();
+			MockStack::run_call(ALICE, BOB, &mut gas_meter, &schedule, 0, vec![], None).unwrap();
 		});
 	}
 
@@ -2308,10 +2221,7 @@ mod tests {
 				let changed_allowance = <BalanceOf<Test>>::max_value() / 2;
 				assert_ne!(original_allowance, changed_allowance);
 				ctx.ext.set_rent_allowance(changed_allowance);
-				assert_eq!(
-					ctx.ext.call(0, CHARLIE, 0, vec![], true),
-					exec_trapped()
-				);
+				assert_eq!(ctx.ext.call(0, CHARLIE, 0, vec![], true), exec_trapped());
 				assert_eq!(ctx.ext.rent_allowance(), changed_allowance);
 				assert_ne!(ctx.ext.rent_allowance(), original_allowance);
 			}
@@ -2356,9 +2266,7 @@ mod tests {
 			let schedule = <Test as Config>::Schedule::get();
 			let subsistence = Contracts::<Test>::subsistence_threshold();
 			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
-			let executable = MockExecutable::from_storage(
-				code, &schedule, &mut gas_meter
-			).unwrap();
+			let executable = MockExecutable::from_storage(code, &schedule, &mut gas_meter).unwrap();
 
 			set_balance(&ALICE, subsistence * 10);
 
@@ -2400,7 +2308,8 @@ mod tests {
 				0,
 				vec![],
 				Some(&mut debug_buffer),
-			).unwrap();
+			)
+			.unwrap();
 		});
 
 		assert_eq!(&String::from_utf8(debug_buffer).unwrap(), "This is a testMore text");
@@ -2445,9 +2354,7 @@ mod tests {
 			ctx.ext.call(0, dest, 0, vec![], false)
 		});
 
-		let code_charlie = MockLoader::insert(Call, |_, _| {
-			exec_success()
-		});
+		let code_charlie = MockLoader::insert(Call, |_, _| exec_success());
 
 		ExtBuilder::default().build().execute_with(|| {
 			let schedule = <Test as Config>::Schedule::get();
@@ -2475,7 +2382,8 @@ mod tests {
 					0,
 					BOB.encode(),
 					None,
-				).map_err(|e| e.error),
+				)
+				.map_err(|e| e.error),
 				<Error<Test>>::ReentranceDenied,
 			);
 		});
@@ -2492,9 +2400,8 @@ mod tests {
 		});
 
 		// call BOB with input set to '1'
-		let code_charlie = MockLoader::insert(Call, |ctx, _| {
-			ctx.ext.call(0, BOB, 0, vec![1], true)
-		});
+		let code_charlie =
+			MockLoader::insert(Call, |ctx, _| ctx.ext.call(0, BOB, 0, vec![1], true));
 
 		ExtBuilder::default().build().execute_with(|| {
 			let schedule = <Test as Config>::Schedule::get();
@@ -2511,7 +2418,8 @@ mod tests {
 					0,
 					vec![0],
 					None,
-				).map_err(|e| e.error),
+				)
+				.map_err(|e| e.error),
 				<Error<Test>>::ReentranceDenied,
 			);
 		});
@@ -2532,24 +2440,17 @@ mod tests {
 			set_balance(&ALICE, subsistence * 10);
 			place_contract(&BOB, code_hash);
 			System::reset_events();
-			MockStack::run_call(
-				ALICE,
-				BOB,
-				&mut gas_meter,
-				&schedule,
-				0,
-				vec![],
-				None,
-			).unwrap();
+			MockStack::run_call(ALICE, BOB, &mut gas_meter, &schedule, 0, vec![], None).unwrap();
 
 			let remark_hash = <Test as frame_system::Config>::Hashing::hash(b"Hello World");
-			assert_eq!(System::events(), vec![
-				EventRecord {
+			assert_eq!(
+				System::events(),
+				vec![EventRecord {
 					phase: Phase::Initialization,
 					event: MetaEvent::System(frame_system::Event::Remarked(BOB, remark_hash)),
 					topics: vec![],
-				},
-			]);
+				},]
+			);
 		});
 	}
 
@@ -2567,17 +2468,14 @@ mod tests {
 			let forbidden_call = Call::Balances(BalanceCall::transfer(CHARLIE, 22));
 
 			// simple cases: direct call
-			assert_err!(
-				ctx.ext.call_runtime(forbidden_call.clone()),
-				BadOrigin,
-			);
+			assert_err!(ctx.ext.call_runtime(forbidden_call.clone()), BadOrigin,);
 
 			// as part of a patch: return is OK (but it interrupted the batch)
-			assert_ok!(
-				ctx.ext.call_runtime(Call::Utility(UtilCall::batch(vec![
-					allowed_call.clone(), forbidden_call, allowed_call
-				]))),
-			);
+			assert_ok!(ctx.ext.call_runtime(Call::Utility(UtilCall::batch(vec![
+				allowed_call.clone(),
+				forbidden_call,
+				allowed_call
+			]))),);
 
 			// the transfer wasn't performed
 			assert_eq!(get_balance(&CHARLIE), 0);
@@ -2585,11 +2483,9 @@ mod tests {
 			exec_success()
 		});
 
-		TestFilter::set_filter(|call| {
-			match call {
-				Call::Balances(pallet_balances::Call::transfer(_, _)) => false,
-				_ => true,
-			}
+		TestFilter::set_filter(|call| match call {
+			Call::Balances(pallet_balances::Call::transfer(_, _)) => false,
+			_ => true,
 		});
 
 		ExtBuilder::default().build().execute_with(|| {
@@ -2599,31 +2495,27 @@ mod tests {
 			set_balance(&ALICE, subsistence * 10);
 			place_contract(&BOB, code_hash);
 			System::reset_events();
-			MockStack::run_call(
-				ALICE,
-				BOB,
-				&mut gas_meter,
-				&schedule,
-				0,
-				vec![],
-				None,
-			).unwrap();
+			MockStack::run_call(ALICE, BOB, &mut gas_meter, &schedule, 0, vec![], None).unwrap();
 
 			let remark_hash = <Test as frame_system::Config>::Hashing::hash(b"Hello");
-			assert_eq!(System::events(), vec![
-				EventRecord {
-					phase: Phase::Initialization,
-					event: MetaEvent::System(frame_system::Event::Remarked(BOB, remark_hash)),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: MetaEvent::Utility(
-						pallet_utility::Event::BatchInterrupted(1, BadOrigin.into()),
-					),
-					topics: vec![],
-				},
-			]);
+			assert_eq!(
+				System::events(),
+				vec![
+					EventRecord {
+						phase: Phase::Initialization,
+						event: MetaEvent::System(frame_system::Event::Remarked(BOB, remark_hash)),
+						topics: vec![],
+					},
+					EventRecord {
+						phase: Phase::Initialization,
+						event: MetaEvent::Utility(pallet_utility::Event::BatchInterrupted(
+							1,
+							BadOrigin.into()
+						),),
+						topics: vec![],
+					},
+				]
+			);
 		});
 	}
 }
diff --git a/frame/contracts/src/gas.rs b/frame/contracts/src/gas.rs
index 64f410c4cef2..38d18c1e24c1 100644
--- a/frame/contracts/src/gas.rs
+++ b/frame/contracts/src/gas.rs
@@ -15,17 +15,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::{Config, Error, exec::ExecError};
-use sp_std::marker::PhantomData;
-use sp_runtime::traits::Zero;
+use crate::{exec::ExecError, Config, Error};
 use frame_support::{
 	dispatch::{
-		DispatchResultWithPostInfo, PostDispatchInfo, DispatchErrorWithPostInfo, DispatchError,
+		DispatchError, DispatchErrorWithPostInfo, DispatchResultWithPostInfo, PostDispatchInfo,
 	},
 	weights::Weight,
 	DefaultNoBound,
 };
 use sp_core::crypto::UncheckedFrom;
+use sp_runtime::traits::Zero;
+use sp_std::marker::PhantomData;
 
 #[cfg(test)]
 use std::{any::Any, fmt::Debug};
@@ -88,7 +88,7 @@ pub struct GasMeter<T: Config> {
 
 impl<T: Config> GasMeter<T>
 where
-	T::AccountId: UncheckedFrom<<T as frame_system::Config>::Hash> + AsRef<[u8]>
+	T::AccountId: UncheckedFrom<<T as frame_system::Config>::Hash> + AsRef<[u8]>,
 {
 	pub fn new(gas_limit: Weight) -> Self {
 		GasMeter {
@@ -107,11 +107,7 @@ where
 	///
 	/// Passing `0` as amount is interpreted as "all remaining gas".
 	pub fn nested(&mut self, amount: Weight) -> Result<Self, DispatchError> {
-		let amount = if amount == 0 {
-			self.gas_left
-		} else {
-			amount
-		};
+		let amount = if amount == 0 { self.gas_left } else { amount };
 
 		// NOTE that it is ok to allocate all available gas since it still ensured
 		// by `charge` that it doesn't reach zero.
@@ -155,10 +151,8 @@ where
 		#[cfg(test)]
 		{
 			// Unconditionally add the token to the storage.
-			let erased_tok = ErasedToken {
-				description: format!("{:?}", token),
-				token: Box::new(token),
-			};
+			let erased_tok =
+				ErasedToken { description: format!("{:?}", token), token: Box::new(token) };
 			self.tokens.push(erased_tok);
 		}
 
@@ -277,7 +271,9 @@ mod tests {
 	#[derive(Copy, Clone, PartialEq, Eq, Debug)]
 	struct SimpleToken(u64);
 	impl Token<Test> for SimpleToken {
-		fn weight(&self) -> u64 { self.0 }
+		fn weight(&self) -> u64 {
+			self.0
+		}
 	}
 
 	#[test]
@@ -318,7 +314,6 @@ mod tests {
 		assert!(gas_meter.charge(SimpleToken(1)).is_err());
 	}
 
-
 	// Charging the exact amount that the user paid for should be
 	// possible.
 	#[test]
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index 116ca6ce1888..a3a3311fa9be 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -78,17 +78,17 @@
 //! WebAssembly based smart contracts in the Rust programming language. This is a work in progress.
 
 #![cfg_attr(not(feature = "std"), no_std)]
-#![cfg_attr(feature = "runtime-benchmarks", recursion_limit="512")]
+#![cfg_attr(feature = "runtime-benchmarks", recursion_limit = "512")]
 
 #[macro_use]
 mod gas;
-mod storage;
+mod benchmarking;
 mod exec;
-mod wasm;
+mod migration;
 mod rent;
-mod benchmarking;
 mod schedule;
-mod migration;
+mod storage;
+mod wasm;
 
 pub mod chain_extension;
 pub mod weights;
@@ -97,49 +97,48 @@ pub mod weights;
 mod tests;
 
 pub use crate::{
-	pallet::*,
-	schedule::{Schedule, Limits, InstructionWeights, HostFnWeights},
 	exec::Frame,
+	pallet::*,
+	schedule::{HostFnWeights, InstructionWeights, Limits, Schedule},
 };
 use crate::{
+	exec::{Executable, Stack as ExecStack},
 	gas::GasMeter,
-	exec::{Stack as ExecStack, Executable},
 	rent::Rent,
-	storage::{Storage, DeletedContract, ContractInfo, AliveContractInfo, TombstoneContractInfo},
-	weights::WeightInfo,
+	storage::{AliveContractInfo, ContractInfo, DeletedContract, Storage, TombstoneContractInfo},
 	wasm::PrefabWasmModule,
-};
-use sp_core::{Bytes, crypto::UncheckedFrom};
-use sp_std::prelude::*;
-use sp_runtime::{
-	traits::{
-		Hash, StaticLookup, Convert, Saturating, Zero,
-	},
-	Perbill,
+	weights::WeightInfo,
 };
 use frame_support::{
-	traits::{OnUnbalanced, Currency, Get, Time, Randomness, Filter},
-	weights::{Weight, PostDispatchInfo, WithPostDispatchInfo, GetDispatchInfo},
 	dispatch::Dispatchable,
+	traits::{Currency, Filter, Get, OnUnbalanced, Randomness, Time},
+	weights::{GetDispatchInfo, PostDispatchInfo, Weight, WithPostDispatchInfo},
 };
 use frame_system::Pallet as System;
 use pallet_contracts_primitives::{
-	RentProjectionResult, GetStorageResult, ContractAccessError, ContractExecResult,
-	ContractInstantiateResult, Code, InstantiateReturnValue,
+	Code, ContractAccessError, ContractExecResult, ContractInstantiateResult, GetStorageResult,
+	InstantiateReturnValue, RentProjectionResult,
+};
+use sp_core::{crypto::UncheckedFrom, Bytes};
+use sp_runtime::{
+	traits::{Convert, Hash, Saturating, StaticLookup, Zero},
+	Perbill,
 };
+use sp_std::prelude::*;
 
 type CodeHash<T> = <T as frame_system::Config>::Hash;
 type TrieId = Vec<u8>;
 type BalanceOf<T> =
 	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
-type NegativeImbalanceOf<T> =
-	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
+type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<
+	<T as frame_system::Config>::AccountId,
+>>::NegativeImbalance;
 
 #[frame_support::pallet]
 pub mod pallet {
+	use super::*;
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
-	use super::*;
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
@@ -156,11 +155,10 @@ pub mod pallet {
 		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
 
 		/// The overarching call type.
-		type Call:
-			Dispatchable<Origin=Self::Origin, PostInfo=PostDispatchInfo> +
-			GetDispatchInfo +
-			codec::Decode +
-			IsType<<Self as frame_system::Config>::Call>;
+		type Call: Dispatchable<Origin = Self::Origin, PostInfo = PostDispatchInfo>
+			+ GetDispatchInfo
+			+ codec::Decode
+			+ IsType<<Self as frame_system::Config>::Call>;
 
 		/// Filter that is applied to calls dispatched by contracts.
 		///
@@ -263,7 +261,7 @@ pub mod pallet {
 		/// The allowed depth is `CallStack::size() + 1`.
 		/// Therefore a size of `0` means that a contract cannot use call or instantiate.
 		/// In other words only the origin called "root contract" is allowed to execute then.
-		type CallStack: smallvec::Array<Item=Frame<Self>>;
+		type CallStack: smallvec::Array<Item = Frame<Self>>;
 
 		/// The maximum number of tries that can be queued for deletion.
 		#[pallet::constant]
@@ -286,7 +284,8 @@ pub mod pallet {
 		fn on_initialize(_block: T::BlockNumber) -> Weight {
 			// We do not want to go above the block limit and rather avoid lazy deletion
 			// in that case. This should only happen on runtime upgrades.
-			let weight_limit = T::BlockWeights::get().max_block
+			let weight_limit = T::BlockWeights::get()
+				.max_block
 				.saturating_sub(System::<T>::block_weight().total())
 				.min(T::DeletionWeightLimit::get());
 			Storage::<T>::process_deletion_queue_batch(weight_limit)
@@ -317,14 +316,20 @@ pub mod pallet {
 			dest: <T::Lookup as StaticLookup>::Source,
 			#[pallet::compact] value: BalanceOf<T>,
 			#[pallet::compact] gas_limit: Weight,
-			data: Vec<u8>
+			data: Vec<u8>,
 		) -> DispatchResultWithPostInfo {
 			let origin = ensure_signed(origin)?;
 			let dest = T::Lookup::lookup(dest)?;
 			let mut gas_meter = GasMeter::new(gas_limit);
 			let schedule = T::Schedule::get();
 			let result = ExecStack::<T, PrefabWasmModule<T>>::run_call(
-				origin, dest, &mut gas_meter, &schedule, value, data, None,
+				origin,
+				dest,
+				&mut gas_meter,
+				&schedule,
+				value,
+				data,
+				None,
 			);
 			gas_meter.into_dispatch_result(result, T::WeightInfo::call())
 		}
@@ -374,11 +379,19 @@ pub mod pallet {
 			let code_len = executable.code_len();
 			ensure!(code_len <= T::Schedule::get().limits.code_len, Error::<T>::CodeTooLarge);
 			let result = ExecStack::<T, PrefabWasmModule<T>>::run_instantiate(
-				origin, executable, &mut gas_meter, &schedule, endowment, data, &salt, None,
-			).map(|(_address, output)| output);
+				origin,
+				executable,
+				&mut gas_meter,
+				&schedule,
+				endowment,
+				data,
+				&salt,
+				None,
+			)
+			.map(|(_address, output)| output);
 			gas_meter.into_dispatch_result(
 				result,
-				T::WeightInfo::instantiate_with_code(code_len / 1024, salt.len() as u32 / 1024)
+				T::WeightInfo::instantiate_with_code(code_len / 1024, salt.len() as u32 / 1024),
 			)
 		}
 
@@ -403,12 +416,18 @@ pub mod pallet {
 			let schedule = T::Schedule::get();
 			let executable = PrefabWasmModule::from_storage(code_hash, &schedule, &mut gas_meter)?;
 			let result = ExecStack::<T, PrefabWasmModule<T>>::run_instantiate(
-				origin, executable, &mut gas_meter, &schedule, endowment, data, &salt, None,
-			).map(|(_address, output)| output);
-			gas_meter.into_dispatch_result(
-				result,
-				T::WeightInfo::instantiate(salt.len() as u32 / 1024),
+				origin,
+				executable,
+				&mut gas_meter,
+				&schedule,
+				endowment,
+				data,
+				&salt,
+				None,
 			)
+			.map(|(_address, output)| output);
+			gas_meter
+				.into_dispatch_result(result, T::WeightInfo::instantiate(salt.len() as u32 / 1024))
 		}
 
 		/// Allows block producers to claim a small reward for evicting a contract. If a block
@@ -424,44 +443,33 @@ pub mod pallet {
 		pub fn claim_surcharge(
 			origin: OriginFor<T>,
 			dest: T::AccountId,
-			aux_sender: Option<T::AccountId>
+			aux_sender: Option<T::AccountId>,
 		) -> DispatchResultWithPostInfo {
 			let origin = origin.into();
 			let (signed, rewarded) = match (origin, aux_sender) {
-				(Ok(frame_system::RawOrigin::Signed(account)), None) => {
-					(true, account)
-				},
-				(Ok(frame_system::RawOrigin::None), Some(aux_sender)) => {
-					(false, aux_sender)
-				},
+				(Ok(frame_system::RawOrigin::Signed(account)), None) => (true, account),
+				(Ok(frame_system::RawOrigin::None), Some(aux_sender)) => (false, aux_sender),
 				_ => Err(Error::<T>::InvalidSurchargeClaim)?,
 			};
 
 			// Add some advantage for block producers (who send unsigned extrinsics) by
 			// adding a handicap: for signed extrinsics we use a slightly older block number
 			// for the eviction check. This can be viewed as if we pushed regular users back in past.
-			let handicap = if signed {
-				T::SignedClaimHandicap::get()
-			} else {
-				Zero::zero()
-			};
+			let handicap = if signed { T::SignedClaimHandicap::get() } else { Zero::zero() };
 
 			// If poking the contract has lead to eviction of the contract, give out the rewards.
 			match Rent::<T, PrefabWasmModule<T>>::try_eviction(&dest, handicap)? {
-				(Some(rent_paid), code_len) => {
-					T::Currency::deposit_into_existing(
-						&rewarded,
-						T::SurchargeReward::get().min(rent_paid),
-					)
-					.map(|_| PostDispatchInfo {
-						actual_weight: Some(T::WeightInfo::claim_surcharge(code_len / 1024)),
-						pays_fee: Pays::No,
-					})
-					.map_err(Into::into)
-				}
-				(None, code_len) => Err(Error::<T>::ContractNotEvictable.with_weight(
-					T::WeightInfo::claim_surcharge(code_len / 1024)
-				)),
+				(Some(rent_paid), code_len) => T::Currency::deposit_into_existing(
+					&rewarded,
+					T::SurchargeReward::get().min(rent_paid),
+				)
+				.map(|_| PostDispatchInfo {
+					actual_weight: Some(T::WeightInfo::claim_surcharge(code_len / 1024)),
+					pays_fee: Pays::No,
+				})
+				.map_err(Into::into),
+				(None, code_len) => Err(Error::<T>::ContractNotEvictable
+					.with_weight(T::WeightInfo::claim_surcharge(code_len / 1024))),
 			}
 		}
 	}
@@ -638,7 +646,8 @@ pub mod pallet {
 
 	/// A mapping between an original code hash and instrumented wasm code, ready for execution.
 	#[pallet::storage]
-	pub(crate) type CodeStorage<T: Config> = StorageMap<_, Identity, CodeHash<T>, PrefabWasmModule<T>>;
+	pub(crate) type CodeStorage<T: Config> =
+		StorageMap<_, Identity, CodeHash<T>, PrefabWasmModule<T>>;
 
 	/// The subtrie counter.
 	#[pallet::storage]
@@ -648,7 +657,8 @@ pub mod pallet {
 	///
 	/// TWOX-NOTE: SAFE since `AccountId` is a secure hash.
 	#[pallet::storage]
-	pub(crate) type ContractInfoOf<T: Config> = StorageMap<_, Twox64Concat, T::AccountId, ContractInfo<T>>;
+	pub(crate) type ContractInfoOf<T: Config> =
+		StorageMap<_, Twox64Concat, T::AccountId, ContractInfo<T>>;
 
 	/// Evicted contracts that await child trie deletion.
 	///
@@ -684,13 +694,15 @@ where
 	) -> ContractExecResult {
 		let mut gas_meter = GasMeter::new(gas_limit);
 		let schedule = T::Schedule::get();
-		let mut debug_message = if debug {
-			Some(Vec::new())
-		} else {
-			None
-		};
+		let mut debug_message = if debug { Some(Vec::new()) } else { None };
 		let result = ExecStack::<T, PrefabWasmModule<T>>::run_call(
-			origin, dest, &mut gas_meter, &schedule, value, input_data, debug_message.as_mut(),
+			origin,
+			dest,
+			&mut gas_meter,
+			&schedule,
+			value,
+			input_data,
+			debug_message.as_mut(),
 		);
 		ContractExecResult {
 			result: result.map_err(|r| r.error),
@@ -734,34 +746,36 @@ where
 		};
 		let executable = match executable {
 			Ok(executable) => executable,
-			Err(error) => return ContractInstantiateResult {
-				result: Err(error.into()),
-				gas_consumed: gas_meter.gas_consumed(),
-				gas_required: gas_meter.gas_required(),
-				debug_message: Vec::new(),
-			}
-		};
-		let mut debug_message = if debug {
-			Some(Vec::new())
-		} else {
-			None
+			Err(error) =>
+				return ContractInstantiateResult {
+					result: Err(error.into()),
+					gas_consumed: gas_meter.gas_consumed(),
+					gas_required: gas_meter.gas_required(),
+					debug_message: Vec::new(),
+				},
 		};
+		let mut debug_message = if debug { Some(Vec::new()) } else { None };
 		let result = ExecStack::<T, PrefabWasmModule<T>>::run_instantiate(
-			origin, executable, &mut gas_meter, &schedule,
-			endowment, data, &salt, debug_message.as_mut(),
-		).and_then(|(account_id, result)| {
+			origin,
+			executable,
+			&mut gas_meter,
+			&schedule,
+			endowment,
+			data,
+			&salt,
+			debug_message.as_mut(),
+		)
+		.and_then(|(account_id, result)| {
 			let rent_projection = if compute_projection {
-				Some(Rent::<T, PrefabWasmModule<T>>::compute_projection(&account_id)
-					.map_err(|_| <Error<T>>::NewContractNotFunded)?)
+				Some(
+					Rent::<T, PrefabWasmModule<T>>::compute_projection(&account_id)
+						.map_err(|_| <Error<T>>::NewContractNotFunded)?,
+				)
 			} else {
 				None
 			};
 
-			Ok(InstantiateReturnValue {
-				result,
-				account_id,
-				rent_projection,
-			})
+			Ok(InstantiateReturnValue { result, account_id, rent_projection })
 		});
 		ContractInstantiateResult {
 			result: result.map_err(|e| e.error),
@@ -800,9 +814,10 @@ where
 		deploying_address: &T::AccountId,
 		code_hash: &CodeHash<T>,
 		salt: &[u8],
-	) -> T::AccountId
-	{
-		let buf: Vec<_> = deploying_address.as_ref().iter()
+	) -> T::AccountId {
+		let buf: Vec<_> = deploying_address
+			.as_ref()
+			.iter()
 			.chain(code_hash.as_ref())
 			.chain(salt)
 			.cloned()
@@ -847,7 +862,7 @@ where
 	#[cfg(feature = "runtime-benchmarks")]
 	fn reinstrument_module(
 		module: &mut PrefabWasmModule<T>,
-		schedule: &Schedule<T>
+		schedule: &Schedule<T>,
 	) -> frame_support::dispatch::DispatchResult {
 		self::wasm::reinstrument(module, schedule)
 	}
diff --git a/frame/contracts/src/migration.rs b/frame/contracts/src/migration.rs
index 8c5c06fde7ab..a28cb87bb60b 100644
--- a/frame/contracts/src/migration.rs
+++ b/frame/contracts/src/migration.rs
@@ -15,10 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::{Config, Weight, Pallet};
+use crate::{Config, Pallet, Weight};
 use frame_support::{
 	storage::migration,
-	traits::{GetPalletVersion, PalletVersion, PalletInfoAccess, Get},
+	traits::{Get, GetPalletVersion, PalletInfoAccess, PalletVersion},
 };
 
 pub fn migrate<T: Config>() -> Weight {
@@ -32,7 +32,7 @@ pub fn migrate<T: Config>() -> Weight {
 				b"CurrentSchedule",
 				b"",
 			);
-		}
+		},
 		_ => (),
 	}
 
diff --git a/frame/contracts/src/rent.rs b/frame/contracts/src/rent.rs
index 3135862e88c9..9446b027ec1f 100644
--- a/frame/contracts/src/rent.rs
+++ b/frame/contracts/src/rent.rs
@@ -18,23 +18,23 @@
 //! A module responsible for computing the right amount of weight and charging it.
 
 use crate::{
-	AliveContractInfo, BalanceOf, ContractInfo, ContractInfoOf, Pallet, Event,
-	TombstoneContractInfo, Config, CodeHash, Error,
-	storage::Storage, wasm::PrefabWasmModule, exec::Executable, gas::GasMeter,
+	exec::Executable, gas::GasMeter, storage::Storage, wasm::PrefabWasmModule, AliveContractInfo,
+	BalanceOf, CodeHash, Config, ContractInfo, ContractInfoOf, Error, Event, Pallet,
+	TombstoneContractInfo,
 };
-use sp_std::prelude::*;
-use sp_io::hashing::blake2_256;
-use sp_core::crypto::UncheckedFrom;
 use frame_support::{
 	storage::child,
 	traits::{Currency, ExistenceRequirement, Get, OnUnbalanced, WithdrawReasons},
 	DefaultNoBound,
 };
 use pallet_contracts_primitives::{ContractAccessError, RentProjection, RentProjectionResult};
+use sp_core::crypto::UncheckedFrom;
+use sp_io::hashing::blake2_256;
 use sp_runtime::{
-	DispatchError,
 	traits::{Bounded, CheckedDiv, CheckedMul, SaturatedConversion, Saturating, Zero},
+	DispatchError,
 };
+use sp_std::prelude::*;
 
 /// Information about the required deposit and resulting rent.
 ///
@@ -83,13 +83,8 @@ where
 		code_size: u32,
 	) -> Result<Option<AliveContractInfo<T>>, DispatchError> {
 		let current_block_number = <frame_system::Pallet<T>>::block_number();
-		let verdict = Self::consider_case(
-			account,
-			current_block_number,
-			Zero::zero(),
-			&contract,
-			code_size,
-		);
+		let verdict =
+			Self::consider_case(account, current_block_number, Zero::zero(), &contract, code_size);
 		Self::enact_verdict(account, contract, current_block_number, verdict, None)
 	}
 
@@ -136,10 +131,14 @@ where
 					.unwrap_or_else(|| <BalanceOf<T>>::zero())
 					.saturating_add(contract.rent_paid);
 				Self::enact_verdict(
-					account, contract, current_block_number, verdict, Some(module),
+					account,
+					contract,
+					current_block_number,
+					verdict,
+					Some(module),
 				)?;
 				Ok((Some(rent_paid), code_len))
-			}
+			},
 			_ => Ok((None, code_len)),
 		}
 	}
@@ -155,9 +154,7 @@ where
 	/// NOTE that this is not a side-effect free function! It will actually collect rent and then
 	/// compute the projection. This function is only used for implementation of an RPC method through
 	/// `RuntimeApi` meaning that the changes will be discarded anyway.
-	pub fn compute_projection(
-		account: &T::AccountId,
-	) -> RentProjectionResult<T::BlockNumber> {
+	pub fn compute_projection(account: &T::AccountId) -> RentProjectionResult<T::BlockNumber> {
 		use ContractAccessError::IsTombstone;
 
 		let contract_info = <ContractInfoOf<T>>::get(account);
@@ -179,45 +176,42 @@ where
 
 		// We skip the eviction in case one is in order.
 		// Evictions should only be performed by [`try_eviction`].
-		let new_contract_info = Self::enact_verdict(
-			account, alive_contract_info, current_block_number, verdict, None,
-		);
+		let new_contract_info =
+			Self::enact_verdict(account, alive_contract_info, current_block_number, verdict, None);
 
 		// Check what happened after enaction of the verdict.
-		let alive_contract_info = new_contract_info.map_err(|_| IsTombstone)?.ok_or_else(|| IsTombstone)?;
+		let alive_contract_info =
+			new_contract_info.map_err(|_| IsTombstone)?.ok_or_else(|| IsTombstone)?;
 
 		// Compute how much would the fee per block be with the *updated* balance.
 		let total_balance = T::Currency::total_balance(account);
 		let free_balance = T::Currency::free_balance(account);
-		let fee_per_block = Self::fee_per_block(
-			&free_balance, &alive_contract_info, code_size,
-		);
+		let fee_per_block = Self::fee_per_block(&free_balance, &alive_contract_info, code_size);
 		if fee_per_block.is_zero() {
-			return Ok(RentProjection::NoEviction);
+			return Ok(RentProjection::NoEviction)
 		}
 
 		// Then compute how much the contract will sustain under these circumstances.
-		let rent_budget = Self::rent_budget(&total_balance, &free_balance, &alive_contract_info).expect(
-			"the contract exists and in the alive state;
+		let rent_budget = Self::rent_budget(&total_balance, &free_balance, &alive_contract_info)
+			.expect(
+				"the contract exists and in the alive state;
 			the updated balance must be greater than subsistence deposit;
 			this function doesn't return `None`;
 			qed
 			",
-		);
+			);
 		let blocks_left = match rent_budget.checked_div(&fee_per_block) {
 			Some(blocks_left) => blocks_left,
 			None => {
 				// `fee_per_block` is not zero here, so `checked_div` can return `None` if
 				// there is an overflow. This cannot happen with integers though. Return
 				// `NoEviction` here just in case.
-				return Ok(RentProjection::NoEviction);
-			}
+				return Ok(RentProjection::NoEviction)
+			},
 		};
 
 		let blocks_left = blocks_left.saturated_into::<u32>().into();
-		Ok(RentProjection::EvictionAt(
-			current_block_number + blocks_left,
-		))
+		Ok(RentProjection::EvictionAt(current_block_number + blocks_left))
 	}
 
 	/// Restores the destination account using the origin as prototype.
@@ -246,18 +240,15 @@ where
 		let current_block = <frame_system::Pallet<T>>::block_number();
 
 		if origin_contract.last_write == Some(current_block) {
-			return Err(Error::<T>::InvalidContractOrigin.into());
+			return Err(Error::<T>::InvalidContractOrigin.into())
 		}
 
 		let dest_tombstone = <ContractInfoOf<T>>::get(&dest)
 			.and_then(|c| c.get_tombstone())
 			.ok_or(Error::<T>::InvalidDestinationContract)?;
 
-		let last_write = if !delta.is_empty() {
-			Some(current_block)
-		} else {
-			origin_contract.last_write
-		};
+		let last_write =
+			if !delta.is_empty() { Some(current_block) } else { origin_contract.last_write };
 
 		// Fails if the code hash does not exist on chain
 		E::add_user(code_hash, gas_meter)?;
@@ -266,7 +257,8 @@ where
 		// fail later due to tombstones not matching. This is because the restoration
 		// is always called from a contract and therefore in a storage transaction.
 		// The failure of this function will lead to this transaction's rollback.
-		let bytes_taken: u32 = delta.iter()
+		let bytes_taken: u32 = delta
+			.iter()
 			.filter_map(|key| {
 				let key = blake2_256(key);
 				child::get_raw(&child_trie_info, &key).map(|value| {
@@ -284,21 +276,24 @@ where
 		);
 
 		if tombstone != dest_tombstone {
-			return Err(Error::<T>::InvalidTombstone.into());
+			return Err(Error::<T>::InvalidTombstone.into())
 		}
 
 		origin_contract.storage_size -= bytes_taken;
 
 		<ContractInfoOf<T>>::remove(&origin);
 		E::remove_user(origin_contract.code_hash, gas_meter)?;
-		<ContractInfoOf<T>>::insert(&dest, ContractInfo::Alive(AliveContractInfo::<T> {
-			code_hash,
-			rent_allowance,
-			rent_paid: <BalanceOf<T>>::zero(),
-			deduct_block: current_block,
-			last_write,
-			.. origin_contract
-		}));
+		<ContractInfoOf<T>>::insert(
+			&dest,
+			ContractInfo::Alive(AliveContractInfo::<T> {
+				code_hash,
+				rent_allowance,
+				rent_paid: <BalanceOf<T>>::zero(),
+				deduct_block: current_block,
+				last_write,
+				..origin_contract
+			}),
+		);
 
 		let origin_free_balance = T::Currency::free_balance(&origin);
 		T::Currency::make_free_balance_be(&origin, <BalanceOf<T>>::zero());
@@ -314,42 +309,34 @@ where
 		current_refcount: u32,
 		at_refcount: u32,
 	) -> RentStatus<T> {
-		let calc_share = |refcount: u32| {
-			aggregated_code_size.checked_div(refcount).unwrap_or(0)
-		};
+		let calc_share = |refcount: u32| aggregated_code_size.checked_div(refcount).unwrap_or(0);
 		let current_share = calc_share(current_refcount);
 		let custom_share = calc_share(at_refcount);
 		RentStatus {
 			max_deposit: Self::required_deposit(contract, aggregated_code_size),
 			current_deposit: Self::required_deposit(contract, current_share),
-			custom_refcount_deposit:
-				if at_refcount > 0 {
-					Some(Self::required_deposit(contract, custom_share))
-				} else {
-					None
-				},
+			custom_refcount_deposit: if at_refcount > 0 {
+				Some(Self::required_deposit(contract, custom_share))
+			} else {
+				None
+			},
 			max_rent: Self::fee_per_block(free_balance, contract, aggregated_code_size),
 			current_rent: Self::fee_per_block(free_balance, contract, current_share),
-			custom_refcount_rent:
-				if at_refcount > 0 {
-					Some(Self::fee_per_block(free_balance, contract, custom_share))
-				} else {
-					None
-				},
+			custom_refcount_rent: if at_refcount > 0 {
+				Some(Self::fee_per_block(free_balance, contract, custom_share))
+			} else {
+				None
+			},
 			_reserved: None,
 		}
 	}
 
 	/// Returns how much deposit is required to not pay rent.
-	fn required_deposit(
-		contract: &AliveContractInfo<T>,
-		code_size_share: u32,
-	) -> BalanceOf<T> {
+	fn required_deposit(contract: &AliveContractInfo<T>, code_size_share: u32) -> BalanceOf<T> {
 		T::DepositPerStorageByte::get()
 			.saturating_mul(contract.storage_size.saturating_add(code_size_share).into())
 			.saturating_add(
-				T::DepositPerStorageItem::get()
-					.saturating_mul(contract.pair_count.into())
+				T::DepositPerStorageItem::get().saturating_mul(contract.pair_count.into()),
 			)
 			.saturating_add(T::DepositPerContract::get())
 	}
@@ -363,8 +350,8 @@ where
 		contract: &AliveContractInfo<T>,
 		code_size_share: u32,
 	) -> BalanceOf<T> {
-		let missing_deposit = Self::required_deposit(contract, code_size_share)
-			.saturating_sub(*free_balance);
+		let missing_deposit =
+			Self::required_deposit(contract, code_size_share).saturating_sub(*free_balance);
 		T::RentFraction::get().mul_ceil(missing_deposit)
 	}
 
@@ -383,16 +370,13 @@ where
 		// Reserved balance contributes towards the subsistence threshold to stay consistent
 		// with the existential deposit where the reserved balance is also counted.
 		if *total_balance < subsistence_threshold {
-			return None;
+			return None
 		}
 
 		// However, reserved balance cannot be charged so we need to use the free balance
 		// to calculate the actual budget (which can be 0).
 		let rent_allowed_to_charge = free_balance.saturating_sub(subsistence_threshold);
-		Some(<BalanceOf<T>>::min(
-			contract.rent_allowance,
-			rent_allowed_to_charge,
-		))
+		Some(<BalanceOf<T>>::min(contract.rent_allowance, rent_allowed_to_charge))
 	}
 
 	/// Consider the case for rent payment of the given account and returns a `Verdict`.
@@ -414,7 +398,7 @@ where
 		};
 		if blocks_passed.is_zero() {
 			// Rent has already been paid
-			return Verdict::Exempt;
+			return Verdict::Exempt
 		}
 
 		let total_balance = T::Currency::total_balance(account);
@@ -425,7 +409,7 @@ where
 		if fee_per_block.is_zero() {
 			// The rent deposit offset reduced the fee to 0. This means that the contract
 			// gets the rent for free.
-			return Verdict::Exempt;
+			return Verdict::Exempt
 		}
 
 		let rent_budget = match Self::rent_budget(&total_balance, &free_balance, contract) {
@@ -443,7 +427,7 @@ where
 					account,
 				);
 				0u32.into()
-			}
+			},
 		};
 
 		let dues = fee_per_block
@@ -469,18 +453,15 @@ where
 		if insufficient_rent || !can_withdraw_rent {
 			// The contract cannot afford the rent payment and has a balance above the subsistence
 			// threshold, so it leaves a tombstone.
-			let amount = if can_withdraw_rent {
-				Some(OutstandingAmount::new(dues_limited))
-			} else {
-				None
-			};
-			return Verdict::Evict { amount };
+			let amount =
+				if can_withdraw_rent { Some(OutstandingAmount::new(dues_limited)) } else { None };
+			return Verdict::Evict { amount }
 		}
 
 		return Verdict::Charge {
 			// We choose to use `dues_limited` here instead of `dues` just to err on the safer side.
 			amount: OutstandingAmount::new(dues_limited),
-		};
+		}
 	}
 
 	/// Enacts the given verdict and returns the updated `ContractInfo`.
@@ -511,9 +492,7 @@ where
 				}
 
 				// Note: this operation is heavy.
-				let child_storage_root = child::root(
-					&alive_contract_info.child_trie_info(),
-				);
+				let child_storage_root = child::root(&alive_contract_info.child_trie_info());
 
 				let tombstone = <TombstoneContractInfo<T>>::new(
 					&child_storage_root[..],
@@ -524,11 +503,9 @@ where
 				code.drop_from_storage();
 				<Pallet<T>>::deposit_event(Event::Evicted(account.clone()));
 				Ok(None)
-			}
-			(Verdict::Evict { amount: _ }, None) => {
-				Ok(None)
-			}
-			(Verdict::Exempt, _) =>  {
+			},
+			(Verdict::Evict { amount: _ }, None) => Ok(None),
+			(Verdict::Exempt, _) => {
 				let contract = ContractInfo::Alive(AliveContractInfo::<T> {
 					deduct_block: current_block_number,
 					..alive_contract_info
@@ -546,11 +523,9 @@ where
 				<ContractInfoOf<T>>::insert(account, &contract);
 				amount.withdraw(account);
 				Ok(Some(contract.get_alive().expect("We just constructed it as alive. qed")))
-			}
+			},
 		}
 	}
-
-
 }
 
 /// The amount to charge.
@@ -596,9 +571,7 @@ enum Verdict<T: Config> {
 	Exempt,
 	/// The contract cannot afford payment within its rent budget so it gets evicted. However,
 	/// because its balance is greater than the subsistence threshold it leaves a tombstone.
-	Evict {
-		amount: Option<OutstandingAmount<T>>,
-	},
+	Evict { amount: Option<OutstandingAmount<T>> },
 	/// Everything is OK, we just only take some charge.
 	Charge { amount: OutstandingAmount<T> },
 }
diff --git a/frame/contracts/src/schedule.rs b/frame/contracts/src/schedule.rs
index 0abe0c54d748..a1118633bfde 100644
--- a/frame/contracts/src/schedule.rs
+++ b/frame/contracts/src/schedule.rs
@@ -18,16 +18,16 @@
 //! This module contains the cost schedule and supporting code that constructs a
 //! sane default schedule from a `WeightInfo` implementation.
 
-use crate::{Config, weights::WeightInfo};
+use crate::{weights::WeightInfo, Config};
 
-#[cfg(feature = "std")]
-use serde::{Serialize, Deserialize};
+use codec::{Decode, Encode};
+use frame_support::{weights::Weight, DefaultNoBound};
 use pallet_contracts_proc_macro::{ScheduleDebug, WeightDebug};
-use frame_support::{DefaultNoBound, weights::Weight};
-use sp_std::{marker::PhantomData, vec::Vec};
-use codec::{Encode, Decode};
 use pwasm_utils::{parity_wasm::elements, rules};
+#[cfg(feature = "std")]
+use serde::{Deserialize, Serialize};
 use sp_runtime::RuntimeDebug;
+use sp_std::{marker::PhantomData, vec::Vec};
 
 /// How many API calls are executed in a single batch. The reason for increasing the amount
 /// of API calls in batches (per benchmark component increase) is so that the linear regression
@@ -50,18 +50,18 @@ pub const INSTR_BENCHMARK_BATCH_SIZE: u32 = 1_000;
 /// fn create_schedule<T: Config>() -> Schedule<T> {
 ///     Schedule {
 ///         limits: Limits {
-///		        globals: 3,
-///		        parameters: 3,
-///		        memory_pages: 16,
-///		        table_size: 3,
-///		        br_table_size: 3,
-///		        .. Default::default()
-///	        },
+/// 		        globals: 3,
+/// 		        parameters: 3,
+/// 		        memory_pages: 16,
+/// 		        table_size: 3,
+/// 		        br_table_size: 3,
+/// 		        .. Default::default()
+/// 	        },
 ///         instruction_weights: InstructionWeights {
-///	            version: 5,
+/// 	            version: 5,
 ///             .. Default::default()
 ///         },
-///	        .. Default::default()
+/// 	        .. Default::default()
 ///     }
 /// }
 /// ```
@@ -392,11 +392,13 @@ pub struct HostFnWeights<T: Config> {
 
 	/// The type parameter is used in the default implementation.
 	#[codec(skip)]
-	pub _phantom: PhantomData<T>
+	pub _phantom: PhantomData<T>,
 }
 
 macro_rules! replace_token {
-	($_in:tt $replacement:tt) => { $replacement };
+	($_in:tt $replacement:tt) => {
+		$replacement
+	};
 }
 
 macro_rules! call_zero {
@@ -420,20 +422,22 @@ macro_rules! cost_batched_args {
 macro_rules! cost_instr_no_params_with_batch_size {
 	($name:ident, $batch_size:expr) => {
 		(cost_args!($name, 1) / Weight::from($batch_size)) as u32
-	}
+	};
 }
 
 macro_rules! cost_instr_with_batch_size {
 	($name:ident, $num_params:expr, $batch_size:expr) => {
-		cost_instr_no_params_with_batch_size!($name, $batch_size)
-			.saturating_sub((cost_instr_no_params_with_batch_size!(instr_i64const, $batch_size) / 2).saturating_mul($num_params))
-	}
+		cost_instr_no_params_with_batch_size!($name, $batch_size).saturating_sub(
+			(cost_instr_no_params_with_batch_size!(instr_i64const, $batch_size) / 2)
+				.saturating_mul($num_params),
+		)
+	};
 }
 
 macro_rules! cost_instr {
 	($name:ident, $num_params:expr) => {
 		cost_instr_with_batch_size!($name, $num_params, INSTR_BENCHMARK_BATCH_SIZE)
-	}
+	};
 }
 
 macro_rules! cost_byte_args {
@@ -451,25 +455,25 @@ macro_rules! cost_byte_batched_args {
 macro_rules! cost {
 	($name:ident) => {
 		cost_args!($name, 1)
-	}
+	};
 }
 
 macro_rules! cost_batched {
 	($name:ident) => {
 		cost_batched_args!($name, 1)
-	}
+	};
 }
 
 macro_rules! cost_byte {
 	($name:ident) => {
 		cost_byte_args!($name, 1)
-	}
+	};
 }
 
 macro_rules! cost_byte_batched {
 	($name:ident) => {
 		cost_byte_batched_args!($name, 1)
-	}
+	};
 }
 
 impl Default for Limits {
@@ -578,7 +582,11 @@ impl<T: Config> Default for HostFnWeights<T> {
 			random: cost_batched!(seal_random),
 			deposit_event: cost_batched!(seal_deposit_event),
 			deposit_event_per_topic: cost_batched_args!(seal_deposit_event_per_topic_and_kb, 1, 0),
-			deposit_event_per_byte: cost_byte_batched_args!(seal_deposit_event_per_topic_and_kb, 0, 1),
+			deposit_event_per_byte: cost_byte_batched_args!(
+				seal_deposit_event_per_topic_and_kb,
+				0,
+				1
+			),
 			debug_message: cost_batched!(seal_debug_message),
 			set_rent_allowance: cost_batched!(seal_set_rent_allowance),
 			set_storage: cost_batched!(seal_set_storage),
@@ -588,13 +596,43 @@ impl<T: Config> Default for HostFnWeights<T> {
 			get_storage_per_byte: cost_byte_batched!(seal_get_storage_per_kb),
 			transfer: cost_batched!(seal_transfer),
 			call: cost_batched!(seal_call),
-			call_transfer_surcharge: cost_batched_args!(seal_call_per_transfer_input_output_kb, 1, 0, 0),
-			call_per_input_byte: cost_byte_batched_args!(seal_call_per_transfer_input_output_kb, 0, 1, 0),
-			call_per_output_byte: cost_byte_batched_args!(seal_call_per_transfer_input_output_kb, 0, 0, 1),
+			call_transfer_surcharge: cost_batched_args!(
+				seal_call_per_transfer_input_output_kb,
+				1,
+				0,
+				0
+			),
+			call_per_input_byte: cost_byte_batched_args!(
+				seal_call_per_transfer_input_output_kb,
+				0,
+				1,
+				0
+			),
+			call_per_output_byte: cost_byte_batched_args!(
+				seal_call_per_transfer_input_output_kb,
+				0,
+				0,
+				1
+			),
 			instantiate: cost_batched!(seal_instantiate),
-			instantiate_per_input_byte: cost_byte_batched_args!(seal_instantiate_per_input_output_salt_kb, 1, 0, 0),
-			instantiate_per_output_byte: cost_byte_batched_args!(seal_instantiate_per_input_output_salt_kb, 0, 1, 0),
-			instantiate_per_salt_byte: cost_byte_batched_args!(seal_instantiate_per_input_output_salt_kb, 0, 0, 1),
+			instantiate_per_input_byte: cost_byte_batched_args!(
+				seal_instantiate_per_input_output_salt_kb,
+				1,
+				0,
+				0
+			),
+			instantiate_per_output_byte: cost_byte_batched_args!(
+				seal_instantiate_per_input_output_salt_kb,
+				0,
+				1,
+				0
+			),
+			instantiate_per_salt_byte: cost_byte_batched_args!(
+				seal_instantiate_per_input_output_salt_kb,
+				0,
+				0,
+				1
+			),
 			hash_sha2_256: cost_batched!(seal_hash_sha2_256),
 			hash_sha2_256_per_byte: cost_byte_batched!(seal_hash_sha2_256_per_kb),
 			hash_keccak_256: cost_batched!(seal_hash_keccak_256),
@@ -625,7 +663,7 @@ impl<T: Config> Schedule<T> {
 					let elements::Type::Function(func) = func;
 					func.params().len() as u32
 				})
-				.collect()
+				.collect(),
 		}
 	}
 }
@@ -639,12 +677,25 @@ impl<'a, T: Config> rules::Rules for ScheduleRules<'a, T> {
 		let weight = match *instruction {
 			End | Unreachable | Return | Else => 0,
 			I32Const(_) | I64Const(_) | Block(_) | Loop(_) | Nop | Drop => w.i64const,
-			I32Load(_, _) | I32Load8S(_, _) | I32Load8U(_, _) | I32Load16S(_, _) |
-			I32Load16U(_, _) | I64Load(_, _) | I64Load8S(_, _) | I64Load8U(_, _) |
-			I64Load16S(_, _) | I64Load16U(_, _) | I64Load32S(_, _) | I64Load32U(_, _)
-				=> w.i64load,
-			I32Store(_, _) | I32Store8(_, _) | I32Store16(_, _) | I64Store(_, _) |
-			I64Store8(_, _) | I64Store16(_, _) | I64Store32(_, _) => w.i64store,
+			I32Load(_, _) |
+			I32Load8S(_, _) |
+			I32Load8U(_, _) |
+			I32Load16S(_, _) |
+			I32Load16U(_, _) |
+			I64Load(_, _) |
+			I64Load8S(_, _) |
+			I64Load8U(_, _) |
+			I64Load16S(_, _) |
+			I64Load16U(_, _) |
+			I64Load32S(_, _) |
+			I64Load32U(_, _) => w.i64load,
+			I32Store(_, _) |
+			I32Store8(_, _) |
+			I32Store16(_, _) |
+			I64Store(_, _) |
+			I64Store8(_, _) |
+			I64Store16(_, _) |
+			I64Store32(_, _) => w.i64store,
 			Select => w.select,
 			If(_) => w.r#if,
 			Br(_) => w.br,
@@ -658,10 +709,9 @@ impl<'a, T: Config> rules::Rules for ScheduleRules<'a, T> {
 			CurrentMemory(_) => w.memory_current,
 			GrowMemory(_) => w.memory_grow,
 			CallIndirect(idx, _) => *self.params.get(idx as usize).unwrap_or(&max_params),
-			BrTable(ref data) =>
-				w.br_table.saturating_add(
-					w.br_table_per_entry.saturating_mul(data.table.len() as u32)
-				),
+			BrTable(ref data) => w
+				.br_table
+				.saturating_add(w.br_table_per_entry.saturating_mul(data.table.len() as u32)),
 			I32Clz | I64Clz => w.i64clz,
 			I32Ctz | I64Ctz => w.i64ctz,
 			I32Popcnt | I64Popcnt => w.i64popcnt,
@@ -711,8 +761,8 @@ impl<'a, T: Config> rules::Rules for ScheduleRules<'a, T> {
 
 #[cfg(test)]
 mod test {
-	use crate::tests::Test;
 	use super::*;
+	use crate::tests::Test;
 
 	#[test]
 	fn print_test_schedule() {
diff --git a/frame/contracts/src/storage.rs b/frame/contracts/src/storage.rs
index 15782d7d1e45..847b57c89d6b 100644
--- a/frame/contracts/src/storage.rs
+++ b/frame/contracts/src/storage.rs
@@ -19,29 +19,30 @@
 
 use crate::{
 	exec::{AccountIdOf, StorageKey},
-	BalanceOf, CodeHash, ContractInfoOf, Config, TrieId, DeletionQueue, Error,
 	weights::WeightInfo,
+	BalanceOf, CodeHash, Config, ContractInfoOf, DeletionQueue, Error, TrieId,
 };
-use codec::{Codec, Encode, Decode};
-use sp_std::prelude::*;
-use sp_std::{marker::PhantomData, fmt::Debug};
-use sp_io::hashing::blake2_256;
-use sp_runtime::{
-	RuntimeDebug,
-	traits::{Bounded, Saturating, Zero, Hash, Member, MaybeSerializeDeserialize},
-};
-use sp_core::crypto::UncheckedFrom;
+use codec::{Codec, Decode, Encode};
 use frame_support::{
 	dispatch::{DispatchError, DispatchResult},
-	storage::child::{self, KillStorageResult, ChildInfo},
+	storage::child::{self, ChildInfo, KillStorageResult},
 	traits::Get,
 	weights::Weight,
 };
+use sp_core::crypto::UncheckedFrom;
+use sp_io::hashing::blake2_256;
+use sp_runtime::{
+	traits::{Bounded, Hash, MaybeSerializeDeserialize, Member, Saturating, Zero},
+	RuntimeDebug,
+};
+use sp_std::{fmt::Debug, marker::PhantomData, prelude::*};
 
 pub type AliveContractInfo<T> =
 	RawAliveContractInfo<CodeHash<T>, BalanceOf<T>, <T as frame_system::Config>::BlockNumber>;
-pub type TombstoneContractInfo<T> =
-	RawTombstoneContractInfo<<T as frame_system::Config>::Hash, <T as frame_system::Config>::Hashing>;
+pub type TombstoneContractInfo<T> = RawTombstoneContractInfo<
+	<T as frame_system::Config>::Hash,
+	<T as frame_system::Config>::Hashing,
+>;
 
 /// Information for managing an account and its sub trie abstraction.
 /// This is the required info to cache for an account
@@ -126,10 +127,16 @@ pub struct RawTombstoneContractInfo<H, Hasher>(H, PhantomData<Hasher>);
 
 impl<H, Hasher> RawTombstoneContractInfo<H, Hasher>
 where
-	H: Member + MaybeSerializeDeserialize+ Debug
-		+ AsRef<[u8]> + AsMut<[u8]> + Copy + Default
-		+ sp_std::hash::Hash + Codec,
-	Hasher: Hash<Output=H>,
+	H: Member
+		+ MaybeSerializeDeserialize
+		+ Debug
+		+ AsRef<[u8]>
+		+ AsMut<[u8]>
+		+ Copy
+		+ Default
+		+ sp_std::hash::Hash
+		+ Codec,
+	Hasher: Hash<Output = H>,
 {
 	pub fn new(storage_root: &[u8], code_hash: H) -> Self {
 		let mut buf = Vec::new();
@@ -156,7 +163,7 @@ pub struct Storage<T>(PhantomData<T>);
 impl<T> Storage<T>
 where
 	T: Config,
-	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
 	/// Reads a storage kv pair of a contract.
 	///
@@ -187,11 +194,15 @@ where
 		// Update the total number of KV pairs and the number of empty pairs.
 		match (&opt_prev_len, &opt_new_value) {
 			(Some(_), None) => {
-				new_info.pair_count = new_info.pair_count.checked_sub(1)
+				new_info.pair_count = new_info
+					.pair_count
+					.checked_sub(1)
 					.ok_or_else(|| Error::<T>::StorageExhausted)?;
 			},
 			(None, Some(_)) => {
-				new_info.pair_count = new_info.pair_count.checked_add(1)
+				new_info.pair_count = new_info
+					.pair_count
+					.checked_add(1)
 					.ok_or_else(|| Error::<T>::StorageExhausted)?;
 			},
 			(Some(_), Some(_)) => {},
@@ -200,10 +211,8 @@ where
 
 		// Update the total storage size.
 		let prev_value_len = opt_prev_len.unwrap_or(0);
-		let new_value_len = opt_new_value
-			.as_ref()
-			.map(|new_value| new_value.len() as u32)
-			.unwrap_or(0);
+		let new_value_len =
+			opt_new_value.as_ref().map(|new_value| new_value.len() as u32).unwrap_or(0);
 		new_info.storage_size = new_info
 			.storage_size
 			.checked_sub(prev_value_len)
@@ -230,7 +239,7 @@ where
 		ch: CodeHash<T>,
 	) -> Result<AliveContractInfo<T>, DispatchError> {
 		if <ContractInfoOf<T>>::contains_key(account) {
-			return Err(Error::<T>::DuplicateContract.into());
+			return Err(Error::<T>::DuplicateContract.into())
 		}
 
 		let contract = AliveContractInfo::<T> {
@@ -297,19 +306,17 @@ where
 	pub fn process_deletion_queue_batch(weight_limit: Weight) -> Weight {
 		let queue_len = <DeletionQueue<T>>::decode_len().unwrap_or(0);
 		if queue_len == 0 {
-			return weight_limit;
+			return weight_limit
 		}
 
-		let (weight_per_key, mut remaining_key_budget) = Self::deletion_budget(
-			queue_len,
-			weight_limit,
-		);
+		let (weight_per_key, mut remaining_key_budget) =
+			Self::deletion_budget(queue_len, weight_limit);
 
 		// We want to check whether we have enough weight to decode the queue before
 		// proceeding. Too little weight for decoding might happen during runtime upgrades
 		// which consume the whole block before the other `on_initialize` blocks are called.
 		if remaining_key_budget == 0 {
-			return weight_limit;
+			return weight_limit
 		}
 
 		let mut queue = <DeletionQueue<T>>::get();
@@ -318,10 +325,8 @@ where
 			// Cannot panic due to loop condition
 			let trie = &mut queue[0];
 			let pair_count = trie.pair_count;
-			let outcome = child::kill_storage(
-				&child_trie_info(&trie.trie_id),
-				Some(remaining_key_budget),
-			);
+			let outcome =
+				child::kill_storage(&child_trie_info(&trie.trie_id), Some(remaining_key_budget));
 			if pair_count > remaining_key_budget {
 				// Cannot underflow because of the if condition
 				trie.pair_count -= remaining_key_budget;
@@ -341,8 +346,8 @@ where
 					KillStorageResult::AllRemoved(_) => (),
 				}
 			}
-			remaining_key_budget = remaining_key_budget
-				.saturating_sub(remaining_key_budget.min(pair_count));
+			remaining_key_budget =
+				remaining_key_budget.saturating_sub(remaining_key_budget.min(pair_count));
 		}
 
 		<DeletionQueue<T>>::put(queue);
@@ -352,29 +357,22 @@ where
 	/// This generator uses inner counter for account id and applies the hash over `AccountId +
 	/// accountid_counter`.
 	pub fn generate_trie_id(account_id: &AccountIdOf<T>, seed: u64) -> TrieId {
-		let buf: Vec<_> = account_id.as_ref().iter()
-			.chain(&seed.to_le_bytes())
-			.cloned()
-			.collect();
+		let buf: Vec<_> = account_id.as_ref().iter().chain(&seed.to_le_bytes()).cloned().collect();
 		T::Hashing::hash(&buf).as_ref().into()
 	}
 
 	/// Returns the code hash of the contract specified by `account` ID.
 	#[cfg(test)]
-	pub fn code_hash(account: &AccountIdOf<T>) -> Option<CodeHash<T>>
-	{
-		<ContractInfoOf<T>>::get(account)
-			.and_then(|i| i.as_alive().map(|i| i.code_hash))
+	pub fn code_hash(account: &AccountIdOf<T>) -> Option<CodeHash<T>> {
+		<ContractInfoOf<T>>::get(account).and_then(|i| i.as_alive().map(|i| i.code_hash))
 	}
 
 	/// Fill up the queue in order to exercise the limits during testing.
 	#[cfg(test)]
 	pub fn fill_queue_with_dummies() {
-		let queue: Vec<_> = (0..T::DeletionQueueDepth::get()).map(|_| DeletedContract {
-			pair_count: 0,
-			trie_id: vec![],
-		})
-		.collect();
+		let queue: Vec<_> = (0..T::DeletionQueueDepth::get())
+			.map(|_| DeletedContract { pair_count: 0, trie_id: vec![] })
+			.collect();
 		<DeletionQueue<T>>::put(queue);
 	}
 }
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index ea5fbccb0f2a..f8528c3dbe7c 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -16,37 +16,35 @@
 // limitations under the License.
 
 use crate::{
-	BalanceOf, ContractInfo, ContractInfoOf, Pallet,
-	Config, Schedule,
-	Error, storage::Storage,
 	chain_extension::{
-		Result as ExtensionResult, Environment, ChainExtension, Ext, SysConfig, RetVal,
-		UncheckedFrom, InitState, ReturnFlags,
+		ChainExtension, Environment, Ext, InitState, Result as ExtensionResult, RetVal,
+		ReturnFlags, SysConfig, UncheckedFrom,
 	},
-	exec::{AccountIdOf, Executable, Frame}, wasm::PrefabWasmModule,
+	exec::{AccountIdOf, Executable, Frame},
+	storage::{RawAliveContractInfo, Storage},
+	wasm::{PrefabWasmModule, ReturnCode as RuntimeReturnCode},
 	weights::WeightInfo,
-	wasm::ReturnCode as RuntimeReturnCode,
-	storage::RawAliveContractInfo,
+	BalanceOf, Config, ContractInfo, ContractInfoOf, Error, Pallet, Schedule,
 };
 use assert_matches::assert_matches;
 use codec::Encode;
-use sp_core::Bytes;
-use sp_runtime::{
-	traits::{BlakeTwo256, Hash, IdentityLookup, Convert},
-	testing::{Header, H256},
-	AccountId32, Perbill,
-};
-use sp_io::hashing::blake2_256;
 use frame_support::{
-	assert_ok, assert_err, assert_err_ignore_postinfo,
-	parameter_types, assert_storage_noop,
-	traits::{Currency, ReservableCurrency, OnInitialize, Filter},
-	weights::{Weight, PostDispatchInfo, DispatchClass, constants::WEIGHT_PER_SECOND},
+	assert_err, assert_err_ignore_postinfo, assert_ok, assert_storage_noop,
 	dispatch::DispatchErrorWithPostInfo,
+	parameter_types,
 	storage::child,
+	traits::{Currency, Filter, OnInitialize, ReservableCurrency},
+	weights::{constants::WEIGHT_PER_SECOND, DispatchClass, PostDispatchInfo, Weight},
 };
 use frame_system::{self as system, EventRecord, Phase};
 use pretty_assertions::assert_eq;
+use sp_core::Bytes;
+use sp_io::hashing::blake2_256;
+use sp_runtime::{
+	testing::{Header, H256},
+	traits::{BlakeTwo256, Convert, Hash, IdentityLookup},
+	AccountId32, Perbill,
+};
 use std::cell::RefCell;
 
 use crate as pallet_contracts;
@@ -71,23 +69,21 @@ frame_support::construct_runtime!(
 
 #[macro_use]
 pub mod test_utils {
-	use super::{Test, Balances, System};
+	use super::{Balances, System, Test};
 	use crate::{
-		ContractInfoOf, CodeHash,
-		storage::{Storage, ContractInfo},
-		exec::{StorageKey, AccountIdOf},
-		Pallet as Contracts,
-		TrieId, AccountCounter,
+		exec::{AccountIdOf, StorageKey},
+		storage::{ContractInfo, Storage},
+		AccountCounter, CodeHash, ContractInfoOf, Pallet as Contracts, TrieId,
 	};
 	use frame_support::traits::Currency;
 
 	pub fn set_storage(addr: &AccountIdOf<Test>, key: &StorageKey, value: Option<Vec<u8>>) {
-		let mut contract_info = <ContractInfoOf::<Test>>::get(&addr).unwrap().get_alive().unwrap();
+		let mut contract_info = <ContractInfoOf<Test>>::get(&addr).unwrap().get_alive().unwrap();
 		let block_number = System::block_number();
 		Storage::<Test>::write(block_number, &mut contract_info, key, value).unwrap();
 	}
 	pub fn get_storage(addr: &AccountIdOf<Test>, key: &StorageKey) -> Option<Vec<u8>> {
-		let contract_info = <ContractInfoOf::<Test>>::get(&addr).unwrap().get_alive().unwrap();
+		let contract_info = <ContractInfoOf<Test>>::get(&addr).unwrap().get_alive().unwrap();
 		Storage::<Test>::read(&contract_info.trie_id, key)
 	}
 	pub fn generate_trie_id(address: &AccountIdOf<Test>) -> TrieId {
@@ -114,15 +110,13 @@ pub mod test_utils {
 		( $x:expr , $y:expr $(,)? ) => {{
 			use sp_std::convert::TryInto;
 			assert_eq!(u32::from_le_bytes($x.data[..].try_into().unwrap()), $y as u32);
-		}}
+		}};
 	}
 	macro_rules! assert_refcount {
 		( $code_hash:expr , $should:expr $(,)? ) => {{
-			let is = crate::CodeStorage::<Test>::get($code_hash)
-				.map(|m| m.refcount())
-				.unwrap_or(0);
+			let is = crate::CodeStorage::<Test>::get($code_hash).map(|m| m.refcount()).unwrap_or(0);
 			assert_eq!(is, $should);
-		}}
+		}};
 	}
 }
 
@@ -152,11 +146,7 @@ impl TestExtension {
 
 impl Default for TestExtension {
 	fn default() -> Self {
-		Self {
-			enabled: true,
-			last_seen_buffer: vec![],
-			last_seen_inputs: (0, 0, 0, 0),
-		}
+		Self { enabled: true, last_seen_buffer: vec![], last_seen_inputs: (0, 0, 0, 0) }
 	}
 }
 
@@ -176,11 +166,10 @@ impl ChainExtension<Test> for TestExtension {
 			},
 			1 => {
 				let env = env.only_in();
-				TEST_EXTENSION.with(|e|
-					e.borrow_mut().last_seen_inputs = (
-						env.val0(), env.val1(), env.val2(), env.val3()
-					)
-				);
+				TEST_EXTENSION.with(|e| {
+					e.borrow_mut().last_seen_inputs =
+						(env.val0(), env.val1(), env.val2(), env.val3())
+				});
 				Ok(RetVal::Converging(func_id))
 			},
 			2 => {
@@ -189,15 +178,10 @@ impl ChainExtension<Test> for TestExtension {
 				env.charge_weight(weight)?;
 				Ok(RetVal::Converging(func_id))
 			},
-			3 => {
-				Ok(RetVal::Diverging{
-					flags: ReturnFlags::REVERT,
-					data: vec![42, 99],
-				})
-			},
+			3 => Ok(RetVal::Diverging { flags: ReturnFlags::REVERT, data: vec![42, 99] }),
 			_ => {
 				panic!("Passed unknown func_id to test chain extension: {}", func_id);
-			}
+			},
 		}
 	}
 
@@ -340,9 +324,7 @@ pub struct ExtBuilder {
 }
 impl Default for ExtBuilder {
 	fn default() -> Self {
-		Self {
-			existential_deposit: 1,
-		}
+		Self { existential_deposit: 1 }
 	}
 }
 impl ExtBuilder {
@@ -356,9 +338,9 @@ impl ExtBuilder {
 	pub fn build(self) -> sp_io::TestExternalities {
 		self.set_associated_consts();
 		let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-		pallet_balances::GenesisConfig::<Test> {
-			balances: vec![],
-		}.assimilate_storage(&mut t).unwrap();
+		pallet_balances::GenesisConfig::<Test> { balances: vec![] }
+			.assimilate_storage(&mut t)
+			.unwrap();
 		let mut ext = sp_io::TestExternalities::new(t);
 		ext.execute_with(|| System::set_block_number(1));
 		ext
@@ -369,9 +351,7 @@ impl ExtBuilder {
 /// with it's hash.
 ///
 /// The fixture files are located under the `fixtures/` directory.
-fn compile_module<T>(
-	fixture_name: &str,
-) -> wat::Result<(Vec<u8>, <T::Hashing as Hash>::Output)>
+fn compile_module<T>(fixture_name: &str) -> wat::Result<(Vec<u8>, <T::Hashing as Hash>::Output)>
 where
 	T: frame_system::Config,
 {
@@ -392,22 +372,20 @@ fn calling_plain_account_fails() {
 
 		assert_eq!(
 			Contracts::call(Origin::signed(ALICE), BOB, 0, GAS_LIMIT, Vec::new()),
-			Err(
-				DispatchErrorWithPostInfo {
-					error: Error::<Test>::ContractNotFound.into(),
-					post_info: PostDispatchInfo {
-						actual_weight: Some(base_cost),
-						pays_fee: Default::default(),
-					},
-				}
-			)
+			Err(DispatchErrorWithPostInfo {
+				error: Error::<Test>::ContractNotFound.into(),
+				post_info: PostDispatchInfo {
+					actual_weight: Some(base_cost),
+					pays_fee: Default::default(),
+				},
+			})
 		);
 	});
 }
 
 #[test]
 fn account_removal_does_not_remove_storage() {
-	use self::test_utils::{set_storage, get_storage};
+	use self::test_utils::{get_storage, set_storage};
 
 	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
 		let trie_id1 = test_utils::generate_trie_id(&ALICE);
@@ -461,23 +439,11 @@ fn account_removal_does_not_remove_storage() {
 
 		// Verify that no entries are removed.
 		{
-			assert_eq!(
-				get_storage(&ALICE, key1),
-				Some(b"1".to_vec())
-			);
-			assert_eq!(
-				get_storage(&ALICE, key2),
-				Some(b"2".to_vec())
-			);
+			assert_eq!(get_storage(&ALICE, key1), Some(b"1".to_vec()));
+			assert_eq!(get_storage(&ALICE, key2), Some(b"2".to_vec()));
 
-			assert_eq!(
-				get_storage(&BOB, key1),
-				Some(b"3".to_vec())
-			);
-			assert_eq!(
-				get_storage(&BOB, key2),
-				Some(b"4".to_vec())
-			);
+			assert_eq!(get_storage(&BOB, key1), Some(b"3".to_vec()));
+			assert_eq!(get_storage(&BOB, key2), Some(b"4".to_vec()));
 		}
 	});
 }
@@ -486,25 +452,24 @@ fn account_removal_does_not_remove_storage() {
 fn instantiate_and_call_and_deposit_event() {
 	let (wasm, code_hash) = compile_module::<Test>("return_from_start_fn").unwrap();
 
-	ExtBuilder::default()
-		.existential_deposit(100)
-		.build()
-		.execute_with(|| {
-			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			let subsistence = Pallet::<Test>::subsistence_threshold();
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
+		let subsistence = Pallet::<Test>::subsistence_threshold();
 
-			// Check at the end to get hash on error easily
-			let creation = Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				subsistence * 100,
-				GAS_LIMIT,
-				wasm,
-				vec![],
-				vec![],
-			);
-			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+		// Check at the end to get hash on error easily
+		let creation = Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			subsistence * 100,
+			GAS_LIMIT,
+			wasm,
+			vec![],
+			vec![],
+		);
+		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
-			assert_eq!(System::events(), vec![
+		assert_eq!(
+			System::events(),
+			vec![
 				EventRecord {
 					phase: Phase::Initialization,
 					event: Event::System(frame_system::Event::NewAccount(ALICE.clone())),
@@ -512,9 +477,7 @@ fn instantiate_and_call_and_deposit_event() {
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::Balances(
-						pallet_balances::Event::Endowed(ALICE, 1_000_000)
-					),
+					event: Event::Balances(pallet_balances::Event::Endowed(ALICE, 1_000_000)),
 					topics: vec![],
 				},
 				EventRecord {
@@ -524,16 +487,19 @@ fn instantiate_and_call_and_deposit_event() {
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::Balances(
-						pallet_balances::Event::Endowed(addr.clone(), subsistence * 100)
-					),
+					event: Event::Balances(pallet_balances::Event::Endowed(
+						addr.clone(),
+						subsistence * 100
+					)),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::Balances(
-						pallet_balances::Event::Transfer(ALICE, addr.clone(), subsistence * 100)
-					),
+					event: Event::Balances(pallet_balances::Event::Transfer(
+						ALICE,
+						addr.clone(),
+						subsistence * 100
+					)),
 					topics: vec![],
 				},
 				EventRecord {
@@ -543,9 +509,10 @@ fn instantiate_and_call_and_deposit_event() {
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::Contracts(
-						crate::Event::ContractEmitted(addr.clone(), vec![1, 2, 3, 4])
-					),
+					event: Event::Contracts(crate::Event::ContractEmitted(
+						addr.clone(),
+						vec![1, 2, 3, 4]
+					)),
 					topics: vec![],
 				},
 				EventRecord {
@@ -553,54 +520,52 @@ fn instantiate_and_call_and_deposit_event() {
 					event: Event::Contracts(crate::Event::Instantiated(ALICE, addr.clone())),
 					topics: vec![],
 				},
-			]);
+			]
+		);
 
-			assert_ok!(creation);
-			assert!(ContractInfoOf::<Test>::contains_key(&addr));
-		});
+		assert_ok!(creation);
+		assert!(ContractInfoOf::<Test>::contains_key(&addr));
+	});
 }
 
 #[test]
 fn deposit_event_max_value_limit() {
 	let (wasm, code_hash) = compile_module::<Test>("event_size").unwrap();
 
-	ExtBuilder::default()
-		.existential_deposit(50)
-		.build()
-		.execute_with(|| {
-			// Create
-			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			assert_ok!(Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				30_000,
-				GAS_LIMIT,
-				wasm,
-				vec![],
-				vec![],
-			));
-			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		// Create
+		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			30_000,
+			GAS_LIMIT,
+			wasm,
+			vec![],
+			vec![],
+		));
+		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
-			// Call contract with allowed storage value.
-			assert_ok!(Contracts::call(
+		// Call contract with allowed storage value.
+		assert_ok!(Contracts::call(
+			Origin::signed(ALICE),
+			addr.clone(),
+			0,
+			GAS_LIMIT * 2, // we are copying a huge buffer,
+			<Test as Config>::Schedule::get().limits.payload_len.encode(),
+		));
+
+		// Call contract with too large a storage value.
+		assert_err_ignore_postinfo!(
+			Contracts::call(
 				Origin::signed(ALICE),
-				addr.clone(),
+				addr,
 				0,
-				GAS_LIMIT * 2, // we are copying a huge buffer,
-				<Test as Config>::Schedule::get().limits.payload_len.encode(),
-			));
-
-			// Call contract with too large a storage value.
-			assert_err_ignore_postinfo!(
-				Contracts::call(
-					Origin::signed(ALICE),
-					addr,
-					0,
-					GAS_LIMIT,
-					(<Test as Config>::Schedule::get().limits.payload_len + 1).encode(),
-				),
-				Error::<Test>::ValueTooLarge,
-			);
-		});
+				GAS_LIMIT,
+				(<Test as Config>::Schedule::get().limits.payload_len + 1).encode(),
+			),
+			Error::<Test>::ValueTooLarge,
+		);
+	});
 }
 
 #[test]
@@ -608,47 +573,50 @@ fn run_out_of_gas() {
 	let (wasm, code_hash) = compile_module::<Test>("run_out_of_gas").unwrap();
 	let subsistence = Pallet::<Test>::subsistence_threshold();
 
-	ExtBuilder::default()
-		.existential_deposit(50)
-		.build()
-		.execute_with(|| {
-			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
 
-			assert_ok!(Contracts::instantiate_with_code(
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			100 * subsistence,
+			GAS_LIMIT,
+			wasm,
+			vec![],
+			vec![],
+		));
+		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+
+		// Call the contract with a fixed gas limit. It must run out of gas because it just
+		// loops forever.
+		assert_err_ignore_postinfo!(
+			Contracts::call(
 				Origin::signed(ALICE),
-				100 * subsistence,
-				GAS_LIMIT,
-				wasm,
-				vec![],
+				addr, // newly created account
+				0,
+				67_500_000,
 				vec![],
-			));
-			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
-
-			// Call the contract with a fixed gas limit. It must run out of gas because it just
-			// loops forever.
-			assert_err_ignore_postinfo!(
-				Contracts::call(
-					Origin::signed(ALICE),
-					addr, // newly created account
-					0,
-					67_500_000,
-					vec![],
-				),
-				Error::<Test>::OutOfGas,
-			);
-		});
+			),
+			Error::<Test>::OutOfGas,
+		);
+	});
 }
 
 /// Input data for each call in set_rent code
 mod call {
 	use super::{AccountIdOf, Test};
-	pub fn set_storage_4_byte() -> Vec<u8> { 0u32.to_le_bytes().to_vec() }
-	pub fn remove_storage_4_byte() -> Vec<u8> { 1u32.to_le_bytes().to_vec() }
+	pub fn set_storage_4_byte() -> Vec<u8> {
+		0u32.to_le_bytes().to_vec()
+	}
+	pub fn remove_storage_4_byte() -> Vec<u8> {
+		1u32.to_le_bytes().to_vec()
+	}
 	#[allow(dead_code)]
 	pub fn transfer(to: &AccountIdOf<Test>) -> Vec<u8> {
 		2u32.to_le_bytes().iter().chain(AsRef::<[u8]>::as_ref(to)).cloned().collect()
 	}
-	pub fn null() -> Vec<u8> { 3u32.to_le_bytes().to_vec() }
+	pub fn null() -> Vec<u8> {
+		3u32.to_le_bytes().to_vec()
+	}
 }
 
 #[test]
@@ -656,117 +624,71 @@ fn storage_size() {
 	let (wasm, code_hash) = compile_module::<Test>("set_rent").unwrap();
 
 	// Storage size
-	ExtBuilder::default()
-		.existential_deposit(50)
-		.build()
-		.execute_with(|| {
-			// Create
-			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			assert_ok!(Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				30_000,
-				GAS_LIMIT,
-				wasm,
-				// rent_allowance
-				<Test as pallet_balances::Config>::Balance::from(10_000u32).encode(),
-				vec![],
-			));
-			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
-			let bob_contract = ContractInfoOf::<Test>::get(&addr)
-				.unwrap()
-				.get_alive()
-				.unwrap();
-			assert_eq!(
-				bob_contract.storage_size,
-				4
-			);
-			assert_eq!(
-				bob_contract.pair_count,
-				1,
-			);
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		// Create
+		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			30_000,
+			GAS_LIMIT,
+			wasm,
+			// rent_allowance
+			<Test as pallet_balances::Config>::Balance::from(10_000u32).encode(),
+			vec![],
+		));
+		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+		let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
+		assert_eq!(bob_contract.storage_size, 4);
+		assert_eq!(bob_contract.pair_count, 1,);
 
-			assert_ok!(Contracts::call(
-				Origin::signed(ALICE),
-				addr.clone(),
-				0,
-				GAS_LIMIT,
-				call::set_storage_4_byte()
-			));
-			let bob_contract = ContractInfoOf::<Test>::get(&addr)
-				.unwrap()
-				.get_alive()
-				.unwrap();
-			assert_eq!(
-				bob_contract.storage_size,
-				4 + 4
-			);
-			assert_eq!(
-				bob_contract.pair_count,
-				2,
-			);
+		assert_ok!(Contracts::call(
+			Origin::signed(ALICE),
+			addr.clone(),
+			0,
+			GAS_LIMIT,
+			call::set_storage_4_byte()
+		));
+		let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
+		assert_eq!(bob_contract.storage_size, 4 + 4);
+		assert_eq!(bob_contract.pair_count, 2,);
 
-			assert_ok!(Contracts::call(
-				Origin::signed(ALICE),
-				addr.clone(),
-				0,
-				GAS_LIMIT,
-				call::remove_storage_4_byte()
-			));
-			let bob_contract = ContractInfoOf::<Test>::get(&addr)
-				.unwrap()
-				.get_alive()
-				.unwrap();
-			assert_eq!(
-				bob_contract.storage_size,
-				4
-			);
-			assert_eq!(
-				bob_contract.pair_count,
-				1,
-			);
-		});
+		assert_ok!(Contracts::call(
+			Origin::signed(ALICE),
+			addr.clone(),
+			0,
+			GAS_LIMIT,
+			call::remove_storage_4_byte()
+		));
+		let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
+		assert_eq!(bob_contract.storage_size, 4);
+		assert_eq!(bob_contract.pair_count, 1,);
+	});
 }
 
 #[test]
 fn empty_kv_pairs() {
 	let (wasm, code_hash) = compile_module::<Test>("set_empty_storage").unwrap();
 
-	ExtBuilder::default()
-		.build()
-		.execute_with(|| {
-			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			assert_ok!(Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				30_000,
-				GAS_LIMIT,
-				wasm,
-				vec![],
-				vec![],
-			));
-			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
-			let bob_contract = ContractInfoOf::<Test>::get(&addr)
-				.unwrap()
-				.get_alive()
-				.unwrap();
+	ExtBuilder::default().build().execute_with(|| {
+		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			30_000,
+			GAS_LIMIT,
+			wasm,
+			vec![],
+			vec![],
+		));
+		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+		let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
 
-			assert_eq!(
-				bob_contract.storage_size,
-				0,
-			);
-			assert_eq!(
-				bob_contract.pair_count,
-				1,
-			);
-		});
+		assert_eq!(bob_contract.storage_size, 0,);
+		assert_eq!(bob_contract.pair_count, 1,);
+	});
 }
 
 fn initialize_block(number: u64) {
-	System::initialize(
-		&number,
-		&[0u8; 32].into(),
-		&Default::default(),
-		Default::default(),
-	);
+	System::initialize(&number, &[0u8; 32].into(), &Default::default(), Default::default());
 }
 
 #[test]
@@ -775,83 +697,92 @@ fn deduct_blocks() {
 	let endowment: BalanceOf<Test> = 100_000;
 	let allowance: BalanceOf<Test> = 70_000;
 
-	ExtBuilder::default()
-		.existential_deposit(50)
-		.build()
-		.execute_with(|| {
-			// Create
-			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			assert_ok!(Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				endowment,
-				GAS_LIMIT,
-				wasm,
-				allowance.encode(),
-				vec![],
-			));
-			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
-			let contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
-			let code_len: BalanceOf<Test> =
-				PrefabWasmModule::<Test>::from_storage_noinstr(contract.code_hash)
-					.unwrap()
-					.occupied_storage()
-					.into();
-
-			// The instantiation deducted the rent for one block immediately
-			let rent0 = <Test as Config>::RentFraction::get()
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		// Create
+		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			endowment,
+			GAS_LIMIT,
+			wasm,
+			allowance.encode(),
+			vec![],
+		));
+		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+		let contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
+		let code_len: BalanceOf<Test> =
+			PrefabWasmModule::<Test>::from_storage_noinstr(contract.code_hash)
+				.unwrap()
+				.occupied_storage()
+				.into();
+
+		// The instantiation deducted the rent for one block immediately
+		let rent0 = <Test as Config>::RentFraction::get()
 				// (base_deposit(8) + bytes in storage(4) + size of code) * byte_price
 				// + 1 storage item (10_000) - free_balance
 				.mul_ceil((8 + 4 + code_len) * 10_000 + 10_000 - endowment)
 				// blocks to rent
 				* 1;
-			assert!(rent0 > 0);
-			assert_eq!(contract.rent_allowance, allowance - rent0);
-			assert_eq!(contract.deduct_block, 1);
-			assert_eq!(Balances::free_balance(&addr), endowment - rent0);
+		assert!(rent0 > 0);
+		assert_eq!(contract.rent_allowance, allowance - rent0);
+		assert_eq!(contract.deduct_block, 1);
+		assert_eq!(Balances::free_balance(&addr), endowment - rent0);
 
-			// Advance 4 blocks
-			initialize_block(5);
+		// Advance 4 blocks
+		initialize_block(5);
 
-			// Trigger rent through call
-			assert_ok!(
-				Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, call::null())
-			);
+		// Trigger rent through call
+		assert_ok!(Contracts::call(
+			Origin::signed(ALICE),
+			addr.clone(),
+			0,
+			GAS_LIMIT,
+			call::null()
+		));
 
-			// Check result
-			let rent = <Test as Config>::RentFraction::get()
-				.mul_ceil((8 + 4 + code_len) * 10_000 + 10_000 - (endowment - rent0))
-				* 4;
-			let contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
-			assert_eq!(contract.rent_allowance, allowance - rent0 - rent);
-			assert_eq!(contract.deduct_block, 5);
-			assert_eq!(Balances::free_balance(&addr), endowment - rent0 - rent);
-
-			// Advance 2 blocks more
-			initialize_block(7);
-
-			// Trigger rent through call
-			assert_ok!(
-				Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, call::null())
-			);
+		// Check result
+		let rent = <Test as Config>::RentFraction::get()
+			.mul_ceil((8 + 4 + code_len) * 10_000 + 10_000 - (endowment - rent0)) *
+			4;
+		let contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
+		assert_eq!(contract.rent_allowance, allowance - rent0 - rent);
+		assert_eq!(contract.deduct_block, 5);
+		assert_eq!(Balances::free_balance(&addr), endowment - rent0 - rent);
 
-			// Check result
-			let rent_2 = <Test as Config>::RentFraction::get()
-				.mul_ceil((8 + 4 + code_len) * 10_000 + 10_000 - (endowment - rent0 - rent))
-				* 2;
-			let contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
-			assert_eq!(contract.rent_allowance, allowance - rent0 - rent - rent_2);
-			assert_eq!(contract.deduct_block, 7);
-			assert_eq!(Balances::free_balance(&addr), endowment - rent0 - rent - rent_2);
-
-			// Second call on same block should have no effect on rent
-			assert_ok!(
-				Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, call::null())
-			);
-			let contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
-			assert_eq!(contract.rent_allowance, allowance - rent0 - rent - rent_2);
-			assert_eq!(contract.deduct_block, 7);
-			assert_eq!(Balances::free_balance(&addr), endowment - rent0 - rent - rent_2)
-		});
+		// Advance 2 blocks more
+		initialize_block(7);
+
+		// Trigger rent through call
+		assert_ok!(Contracts::call(
+			Origin::signed(ALICE),
+			addr.clone(),
+			0,
+			GAS_LIMIT,
+			call::null()
+		));
+
+		// Check result
+		let rent_2 = <Test as Config>::RentFraction::get()
+			.mul_ceil((8 + 4 + code_len) * 10_000 + 10_000 - (endowment - rent0 - rent)) *
+			2;
+		let contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
+		assert_eq!(contract.rent_allowance, allowance - rent0 - rent - rent_2);
+		assert_eq!(contract.deduct_block, 7);
+		assert_eq!(Balances::free_balance(&addr), endowment - rent0 - rent - rent_2);
+
+		// Second call on same block should have no effect on rent
+		assert_ok!(Contracts::call(
+			Origin::signed(ALICE),
+			addr.clone(),
+			0,
+			GAS_LIMIT,
+			call::null()
+		));
+		let contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
+		assert_eq!(contract.rent_allowance, allowance - rent0 - rent - rent_2);
+		assert_eq!(contract.deduct_block, 7);
+		assert_eq!(Balances::free_balance(&addr), endowment - rent0 - rent - rent_2)
+	});
 }
 
 #[test]
@@ -867,16 +798,48 @@ fn signed_claim_surcharge_contract_removals() {
 #[test]
 fn claim_surcharge_malus() {
 	// Test surcharge malus for inherent
-	claim_surcharge(8, |addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(), true);
-	claim_surcharge(7, |addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(), true);
-	claim_surcharge(6, |addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(), true);
-	claim_surcharge(5, |addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(), false);
+	claim_surcharge(
+		8,
+		|addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(),
+		true,
+	);
+	claim_surcharge(
+		7,
+		|addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(),
+		true,
+	);
+	claim_surcharge(
+		6,
+		|addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(),
+		true,
+	);
+	claim_surcharge(
+		5,
+		|addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(),
+		false,
+	);
 
 	// Test surcharge malus for signed
-	claim_surcharge(8, |addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(), true);
-	claim_surcharge(7, |addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(), false);
-	claim_surcharge(6, |addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(), false);
-	claim_surcharge(5, |addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(), false);
+	claim_surcharge(
+		8,
+		|addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(),
+		true,
+	);
+	claim_surcharge(
+		7,
+		|addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(),
+		false,
+	);
+	claim_surcharge(
+		6,
+		|addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(),
+		false,
+	);
+	claim_surcharge(
+		5,
+		|addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(),
+		false,
+	);
 }
 
 /// Claim surcharge with the given trigger_call at the given blocks.
@@ -884,203 +847,174 @@ fn claim_surcharge_malus() {
 fn claim_surcharge(blocks: u64, trigger_call: impl Fn(AccountIdOf<Test>) -> bool, removes: bool) {
 	let (wasm, code_hash) = compile_module::<Test>("set_rent").unwrap();
 
-	ExtBuilder::default()
-		.existential_deposit(50)
-		.build()
-		.execute_with(|| {
-			// Create
-			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			assert_ok!(Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				100_000,
-				GAS_LIMIT,
-				wasm,
-				<Test as pallet_balances::Config>::Balance::from(30_000u32).encode(), // rent allowance
-				vec![],
-			));
-			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		// Create
+		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			100_000,
+			GAS_LIMIT,
+			wasm,
+			<Test as pallet_balances::Config>::Balance::from(30_000u32).encode(), // rent allowance
+			vec![],
+		));
+		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
-			// Advance blocks
-			initialize_block(blocks);
+		// Advance blocks
+		initialize_block(blocks);
 
-			// Trigger rent through call
-			assert_eq!(trigger_call(addr.clone()), removes);
+		// Trigger rent through call
+		assert_eq!(trigger_call(addr.clone()), removes);
 
-			if removes {
-				assert!(ContractInfoOf::<Test>::get(&addr).unwrap().get_tombstone().is_some());
-			} else {
-				assert!(ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().is_some());
-			}
-		});
+		if removes {
+			assert!(ContractInfoOf::<Test>::get(&addr).unwrap().get_tombstone().is_some());
+		} else {
+			assert!(ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().is_some());
+		}
+	});
 }
 
 /// Test for all kind of removals for the given trigger:
 /// * if balance is reached and balance > subsistence threshold
 /// * if allowance is exceeded
 /// * if balance is reached and balance < subsistence threshold
-///	    * this case cannot be triggered by a contract: we check whether a tombstone is left
+/// 	    * this case cannot be triggered by a contract: we check whether a tombstone is left
 fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
 	let (wasm, code_hash) = compile_module::<Test>("set_rent").unwrap();
 
 	// Balance reached and superior to subsistence threshold
-	ExtBuilder::default()
-		.existential_deposit(50)
-		.build()
-		.execute_with(|| {
-			// Create
-			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			assert_ok!(Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				70_000,
-				GAS_LIMIT,
-				wasm.clone(),
-				<Test as pallet_balances::Config>::Balance::from(100_000u32).encode(), // rent allowance
-				vec![],
-			));
-			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
-			let allowance = ContractInfoOf::<Test>::get(&addr)
-				.unwrap().get_alive().unwrap().rent_allowance;
-			let balance = Balances::free_balance(&addr);
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		// Create
+		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			70_000,
+			GAS_LIMIT,
+			wasm.clone(),
+			<Test as pallet_balances::Config>::Balance::from(100_000u32).encode(), /* rent allowance */
+			vec![],
+		));
+		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+		let allowance =
+			ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap().rent_allowance;
+		let balance = Balances::free_balance(&addr);
 
-			let subsistence_threshold = Pallet::<Test>::subsistence_threshold();
+		let subsistence_threshold = Pallet::<Test>::subsistence_threshold();
 
-			// Trigger rent must have no effect
-			assert!(!trigger_call(addr.clone()));
-			assert_eq!(
-				ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap().rent_allowance,
-				allowance,
-			);
-			assert_eq!(Balances::free_balance(&addr), balance);
+		// Trigger rent must have no effect
+		assert!(!trigger_call(addr.clone()));
+		assert_eq!(
+			ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap().rent_allowance,
+			allowance,
+		);
+		assert_eq!(Balances::free_balance(&addr), balance);
 
-			// Advance blocks
-			initialize_block(27);
+		// Advance blocks
+		initialize_block(27);
 
-			// Trigger rent through call (should remove the contract)
-			assert!(trigger_call(addr.clone()));
-			assert!(ContractInfoOf::<Test>::get(&addr).unwrap().get_tombstone().is_some());
-			assert_eq!(Balances::free_balance(&addr), subsistence_threshold);
+		// Trigger rent through call (should remove the contract)
+		assert!(trigger_call(addr.clone()));
+		assert!(ContractInfoOf::<Test>::get(&addr).unwrap().get_tombstone().is_some());
+		assert_eq!(Balances::free_balance(&addr), subsistence_threshold);
 
-			// Advance blocks
-			initialize_block(30);
+		// Advance blocks
+		initialize_block(30);
 
-			// Trigger rent must have no effect
-			assert!(!trigger_call(addr.clone()));
-			assert!(ContractInfoOf::<Test>::get(&addr).unwrap().get_tombstone().is_some());
-			assert_eq!(Balances::free_balance(&addr), subsistence_threshold);
-		});
+		// Trigger rent must have no effect
+		assert!(!trigger_call(addr.clone()));
+		assert!(ContractInfoOf::<Test>::get(&addr).unwrap().get_tombstone().is_some());
+		assert_eq!(Balances::free_balance(&addr), subsistence_threshold);
+	});
 
 	// Allowance exceeded
-	ExtBuilder::default()
-		.existential_deposit(50)
-		.build()
-		.execute_with(|| {
-			// Create
-			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			assert_ok!(Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				100_000,
-				GAS_LIMIT,
-				wasm.clone(),
-				<Test as pallet_balances::Config>::Balance::from(70_000u32).encode(), // rent allowance
-				vec![],
-			));
-			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
-			let allowance = ContractInfoOf::<Test>::get(&addr)
-				.unwrap().get_alive().unwrap().rent_allowance;
-			let balance = Balances::free_balance(&addr);
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		// Create
+		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			100_000,
+			GAS_LIMIT,
+			wasm.clone(),
+			<Test as pallet_balances::Config>::Balance::from(70_000u32).encode(), // rent allowance
+			vec![],
+		));
+		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+		let allowance =
+			ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap().rent_allowance;
+		let balance = Balances::free_balance(&addr);
 
-			// Trigger rent must have no effect
-			assert!(!trigger_call(addr.clone()));
-			assert_eq!(
-				ContractInfoOf::<Test>::get(&addr)
-					.unwrap()
-					.get_alive()
-					.unwrap()
-					.rent_allowance,
-				allowance,
-			);
-			assert_eq!(Balances::free_balance(&addr), balance);
+		// Trigger rent must have no effect
+		assert!(!trigger_call(addr.clone()));
+		assert_eq!(
+			ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap().rent_allowance,
+			allowance,
+		);
+		assert_eq!(Balances::free_balance(&addr), balance);
 
-			// Advance blocks
-			initialize_block(27);
+		// Advance blocks
+		initialize_block(27);
 
-			// Trigger rent through call
-			assert!(trigger_call(addr.clone()));
-			assert!(ContractInfoOf::<Test>::get(&addr)
-				.unwrap()
-				.get_tombstone()
-				.is_some());
-			// Balance should be initial balance - initial rent_allowance
-			assert_eq!(Balances::free_balance(&addr), 30_000);
+		// Trigger rent through call
+		assert!(trigger_call(addr.clone()));
+		assert!(ContractInfoOf::<Test>::get(&addr).unwrap().get_tombstone().is_some());
+		// Balance should be initial balance - initial rent_allowance
+		assert_eq!(Balances::free_balance(&addr), 30_000);
 
-			// Advance blocks
-			initialize_block(20);
+		// Advance blocks
+		initialize_block(20);
 
-			// Trigger rent must have no effect
-			assert!(!trigger_call(addr.clone()));
-			assert!(ContractInfoOf::<Test>::get(&addr)
-				.unwrap()
-				.get_tombstone()
-				.is_some());
-			assert_eq!(Balances::free_balance(&addr), 30_000);
-		});
+		// Trigger rent must have no effect
+		assert!(!trigger_call(addr.clone()));
+		assert!(ContractInfoOf::<Test>::get(&addr).unwrap().get_tombstone().is_some());
+		assert_eq!(Balances::free_balance(&addr), 30_000);
+	});
 
 	// Balance reached and inferior to subsistence threshold
-	ExtBuilder::default()
-		.existential_deposit(50)
-		.build()
-		.execute_with(|| {
-			// Create
-			let subsistence_threshold = Pallet::<Test>::subsistence_threshold();
-			let _ = Balances::deposit_creating(&ALICE, subsistence_threshold * 1000);
-			assert_ok!(Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				subsistence_threshold * 100,
-				GAS_LIMIT,
-				wasm,
-				(subsistence_threshold * 100).encode(), // rent allowance
-				vec![],
-			));
-			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
-			let allowance = ContractInfoOf::<Test>::get(&addr)
-				.unwrap().get_alive().unwrap().rent_allowance;
-			let balance = Balances::free_balance(&addr);
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		// Create
+		let subsistence_threshold = Pallet::<Test>::subsistence_threshold();
+		let _ = Balances::deposit_creating(&ALICE, subsistence_threshold * 1000);
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			subsistence_threshold * 100,
+			GAS_LIMIT,
+			wasm,
+			(subsistence_threshold * 100).encode(), // rent allowance
+			vec![],
+		));
+		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+		let allowance =
+			ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap().rent_allowance;
+		let balance = Balances::free_balance(&addr);
 
-			// Trigger rent must have no effect
-			assert!(!trigger_call(addr.clone()));
-			assert_eq!(
-				ContractInfoOf::<Test>::get(&addr)
-					.unwrap()
-					.get_alive()
-					.unwrap()
-					.rent_allowance,
-				allowance,
-			);
-			assert_eq!(
-				Balances::free_balance(&addr),
-				balance,
-			);
+		// Trigger rent must have no effect
+		assert!(!trigger_call(addr.clone()));
+		assert_eq!(
+			ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap().rent_allowance,
+			allowance,
+		);
+		assert_eq!(Balances::free_balance(&addr), balance,);
 
-			// Make contract have exactly the subsistence threshold
-			Balances::make_free_balance_be(&addr, subsistence_threshold);
-			assert_eq!(Balances::free_balance(&addr), subsistence_threshold);
+		// Make contract have exactly the subsistence threshold
+		Balances::make_free_balance_be(&addr, subsistence_threshold);
+		assert_eq!(Balances::free_balance(&addr), subsistence_threshold);
 
-			// Advance blocks (should remove as balance is exactly subsistence)
-			initialize_block(10);
+		// Advance blocks (should remove as balance is exactly subsistence)
+		initialize_block(10);
 
-			// Trigger rent through call
-			assert!(trigger_call(addr.clone()));
-			assert_matches!(ContractInfoOf::<Test>::get(&addr), Some(ContractInfo::Tombstone(_)));
-			assert_eq!(Balances::free_balance(&addr), subsistence_threshold);
+		// Trigger rent through call
+		assert!(trigger_call(addr.clone()));
+		assert_matches!(ContractInfoOf::<Test>::get(&addr), Some(ContractInfo::Tombstone(_)));
+		assert_eq!(Balances::free_balance(&addr), subsistence_threshold);
 
-			// Advance blocks
-			initialize_block(20);
+		// Advance blocks
+		initialize_block(20);
 
-			// Trigger rent must have no effect
-			assert!(!trigger_call(addr.clone()));
-			assert_matches!(ContractInfoOf::<Test>::get(&addr), Some(ContractInfo::Tombstone(_)));
-			assert_eq!(Balances::free_balance(&addr), subsistence_threshold);
-		});
+		// Trigger rent must have no effect
+		assert!(!trigger_call(addr.clone()));
+		assert_matches!(ContractInfoOf::<Test>::get(&addr), Some(ContractInfo::Tombstone(_)));
+		assert_eq!(Balances::free_balance(&addr), subsistence_threshold);
+	});
 }
 
 #[test]
@@ -1088,97 +1022,99 @@ fn call_removed_contract() {
 	let (wasm, code_hash) = compile_module::<Test>("set_rent").unwrap();
 
 	// Balance reached and superior to subsistence threshold
-	ExtBuilder::default()
-		.existential_deposit(50)
-		.build()
-		.execute_with(|| {
-			// Create
-			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			assert_ok!(Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				30_000,
-				GAS_LIMIT,
-				wasm,
-				// rent allowance
-				<Test as pallet_balances::Config>::Balance::from(10_000u32).encode(),
-				vec![],
-			));
-			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		// Create
+		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			30_000,
+			GAS_LIMIT,
+			wasm,
+			// rent allowance
+			<Test as pallet_balances::Config>::Balance::from(10_000u32).encode(),
+			vec![],
+		));
+		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
-			// Calling contract should succeed.
-			assert_ok!(
-				Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, call::null())
-			);
+		// Calling contract should succeed.
+		assert_ok!(Contracts::call(
+			Origin::signed(ALICE),
+			addr.clone(),
+			0,
+			GAS_LIMIT,
+			call::null()
+		));
 
-			// Advance blocks
-			initialize_block(27);
+		// Advance blocks
+		initialize_block(27);
 
-			// Calling contract should deny access because rent cannot be paid.
-			assert_err_ignore_postinfo!(
-				Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, call::null()),
-				Error::<Test>::RentNotPaid,
-			);
-			// No event is generated because the contract is not actually removed.
-			assert_eq!(System::events(), vec![]);
+		// Calling contract should deny access because rent cannot be paid.
+		assert_err_ignore_postinfo!(
+			Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, call::null()),
+			Error::<Test>::RentNotPaid,
+		);
+		// No event is generated because the contract is not actually removed.
+		assert_eq!(System::events(), vec![]);
 
-			// Subsequent contract calls should also fail.
-			assert_err_ignore_postinfo!(
-				Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, call::null()),
-				Error::<Test>::RentNotPaid,
-			);
+		// Subsequent contract calls should also fail.
+		assert_err_ignore_postinfo!(
+			Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, call::null()),
+			Error::<Test>::RentNotPaid,
+		);
 
-			// A snitch can now remove the contract
-			assert_ok!(Contracts::claim_surcharge(Origin::none(), addr.clone(), Some(ALICE)));
-			assert!(ContractInfoOf::<Test>::get(&addr).unwrap().get_tombstone().is_some());
-		})
+		// A snitch can now remove the contract
+		assert_ok!(Contracts::claim_surcharge(Origin::none(), addr.clone(), Some(ALICE)));
+		assert!(ContractInfoOf::<Test>::get(&addr).unwrap().get_tombstone().is_some());
+	})
 }
 
 #[test]
 fn default_rent_allowance_on_instantiate() {
 	let (wasm, code_hash) = compile_module::<Test>("check_default_rent_allowance").unwrap();
 
-	ExtBuilder::default()
-		.existential_deposit(50)
-		.build()
-		.execute_with(|| {
-			// Create
-			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			assert_ok!(Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				30_000,
-				GAS_LIMIT,
-				wasm,
-				vec![],
-				vec![],
-			));
-			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
-			let contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
-			let code_len: BalanceOf<Test> =
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		// Create
+		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			30_000,
+			GAS_LIMIT,
+			wasm,
+			vec![],
+			vec![],
+		));
+		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+		let contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
+		let code_len: BalanceOf<Test> =
 			PrefabWasmModule::<Test>::from_storage_noinstr(contract.code_hash)
 				.unwrap()
 				.occupied_storage()
 				.into();
 
-			// The instantiation deducted the rent for one block immediately
-			let first_rent = <Test as Config>::RentFraction::get()
+		// The instantiation deducted the rent for one block immediately
+		let first_rent = <Test as Config>::RentFraction::get()
 				// (base_deposit(8) + code_len) * byte_price - free_balance
 				.mul_ceil((8 + code_len) * 10_000 - 30_000)
 				// blocks to rent
 				* 1;
-			assert_eq!(contract.rent_allowance, <BalanceOf<Test>>::max_value() - first_rent);
+		assert_eq!(contract.rent_allowance, <BalanceOf<Test>>::max_value() - first_rent);
 
-			// Advance blocks
-			initialize_block(5);
+		// Advance blocks
+		initialize_block(5);
 
-			// Trigger rent through call
-			assert_ok!(
-				Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, call::null())
-			);
+		// Trigger rent through call
+		assert_ok!(Contracts::call(
+			Origin::signed(ALICE),
+			addr.clone(),
+			0,
+			GAS_LIMIT,
+			call::null()
+		));
 
-			// Check contract is still alive
-			let contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive();
-			assert!(contract.is_some())
-		});
+		// Check contract is still alive
+		let contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive();
+		assert!(contract.is_some())
+	});
 }
 
 #[test]
@@ -1209,92 +1145,84 @@ fn restoration_success() {
 fn restoration(
 	test_different_storage: bool,
 	test_restore_to_with_dirty_storage: bool,
-	test_code_evicted: bool
+	test_code_evicted: bool,
 ) {
 	let (set_rent_wasm, set_rent_code_hash) = compile_module::<Test>("set_rent").unwrap();
 	let (restoration_wasm, restoration_code_hash) = compile_module::<Test>("restoration").unwrap();
 	let allowance: <Test as pallet_balances::Config>::Balance = 10_000;
 
-	ExtBuilder::default()
-		.existential_deposit(50)
-		.build()
-		.execute_with(|| {
-			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
+
+		// Create an account with address `BOB` with code `CODE_SET_RENT`.
+		// The input parameter sets the rent allowance to 0.
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			30_000,
+			GAS_LIMIT,
+			set_rent_wasm.clone(),
+			allowance.encode(),
+			vec![],
+		));
+		let addr_bob = Contracts::contract_address(&ALICE, &set_rent_code_hash, &[]);
 
-			// Create an account with address `BOB` with code `CODE_SET_RENT`.
-			// The input parameter sets the rent allowance to 0.
+		let mut events = vec![
+			EventRecord {
+				phase: Phase::Initialization,
+				event: Event::System(frame_system::Event::NewAccount(ALICE)),
+				topics: vec![],
+			},
+			EventRecord {
+				phase: Phase::Initialization,
+				event: Event::Balances(pallet_balances::Event::Endowed(ALICE, 1_000_000)),
+				topics: vec![],
+			},
+			EventRecord {
+				phase: Phase::Initialization,
+				event: Event::System(frame_system::Event::NewAccount(addr_bob.clone())),
+				topics: vec![],
+			},
+			EventRecord {
+				phase: Phase::Initialization,
+				event: Event::Balances(pallet_balances::Event::Endowed(addr_bob.clone(), 30_000)),
+				topics: vec![],
+			},
+			EventRecord {
+				phase: Phase::Initialization,
+				event: Event::Balances(pallet_balances::Event::Transfer(
+					ALICE,
+					addr_bob.clone(),
+					30_000,
+				)),
+				topics: vec![],
+			},
+			EventRecord {
+				phase: Phase::Initialization,
+				event: Event::Contracts(crate::Event::CodeStored(set_rent_code_hash.into())),
+				topics: vec![],
+			},
+			EventRecord {
+				phase: Phase::Initialization,
+				event: Event::Contracts(crate::Event::Instantiated(ALICE, addr_bob.clone())),
+				topics: vec![],
+			},
+		];
+
+		// Create another contract from the same code in order to increment the codes
+		// refcounter so that it stays on chain.
+		if !test_code_evicted {
 			assert_ok!(Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
-				30_000,
+				20_000,
 				GAS_LIMIT,
-				set_rent_wasm.clone(),
+				set_rent_wasm,
 				allowance.encode(),
-				vec![],
+				vec![1],
 			));
-			let addr_bob = Contracts::contract_address(&ALICE, &set_rent_code_hash, &[]);
-
-			let mut events = vec![
-				EventRecord {
-					phase: Phase::Initialization,
-					event: Event::System(frame_system::Event::NewAccount(ALICE)),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: Event::Balances(
-						pallet_balances::Event::Endowed(ALICE, 1_000_000)
-					),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: Event::System(frame_system::Event::NewAccount(addr_bob.clone())),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: Event::Balances(
-						pallet_balances::Event::Endowed(addr_bob.clone(), 30_000)
-					),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: Event::Balances(
-						pallet_balances::Event::Transfer(ALICE, addr_bob.clone(), 30_000)
-					),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: Event::Contracts(
-						crate::Event::CodeStored(set_rent_code_hash.into())
-					),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: Event::Contracts(
-						crate::Event::Instantiated(ALICE, addr_bob.clone())
-					),
-					topics: vec![],
-				},
-			];
-
-			// Create another contract from the same code in order to increment the codes
-			// refcounter so that it stays on chain.
-			if !test_code_evicted {
-				assert_ok!(Contracts::instantiate_with_code(
-					Origin::signed(ALICE),
-					20_000,
-					GAS_LIMIT,
-					set_rent_wasm,
-					allowance.encode(),
-					vec![1],
-				));
-				assert_refcount!(set_rent_code_hash, 2);
-				let addr_dummy = Contracts::contract_address(&ALICE, &set_rent_code_hash, &[1]);
-				events.extend([
+			assert_refcount!(set_rent_code_hash, 2);
+			let addr_dummy = Contracts::contract_address(&ALICE, &set_rent_code_hash, &[1]);
+			events.extend(
+				[
 					EventRecord {
 						phase: Phase::Initialization,
 						event: Event::System(frame_system::Event::NewAccount(addr_dummy.clone())),
@@ -1302,146 +1230,144 @@ fn restoration(
 					},
 					EventRecord {
 						phase: Phase::Initialization,
-						event: Event::Balances(
-							pallet_balances::Event::Endowed(addr_dummy.clone(), 20_000)
-						),
+						event: Event::Balances(pallet_balances::Event::Endowed(
+							addr_dummy.clone(),
+							20_000,
+						)),
 						topics: vec![],
 					},
 					EventRecord {
 						phase: Phase::Initialization,
-						event: Event::Balances(
-							pallet_balances::Event::Transfer(ALICE, addr_dummy.clone(), 20_000)
-						),
+						event: Event::Balances(pallet_balances::Event::Transfer(
+							ALICE,
+							addr_dummy.clone(),
+							20_000,
+						)),
 						topics: vec![],
 					},
 					EventRecord {
 						phase: Phase::Initialization,
-						event: Event::Contracts(
-							crate::Event::Instantiated(ALICE, addr_dummy.clone())
-						),
+						event: Event::Contracts(crate::Event::Instantiated(
+							ALICE,
+							addr_dummy.clone(),
+						)),
 						topics: vec![],
 					},
-				].iter().cloned());
-			}
-
-			assert_eq!(System::events(), events);
+				]
+				.iter()
+				.cloned(),
+			);
+		}
 
-			// Check if `BOB` was created successfully and that the rent allowance is below what
-			// we specified as the first rent was already collected.
-			let bob_contract = ContractInfoOf::<Test>::get(&addr_bob).unwrap().get_alive().unwrap();
-			assert!(bob_contract.rent_allowance < allowance);
-
-			if test_different_storage {
-				assert_ok!(Contracts::call(
-					Origin::signed(ALICE),
-					addr_bob.clone(), 0, GAS_LIMIT,
-					call::set_storage_4_byte())
-				);
-			}
+		assert_eq!(System::events(), events);
 
-			// Advance blocks in order to make the contract run out of money for rent.
-			initialize_block(27);
-
-			// Call `BOB`, which makes it pay rent. Since the rent allowance is set to 20_000
-			// we expect that it is no longer callable but keeps existing until someone
-			// calls `claim_surcharge`.
-			assert_err_ignore_postinfo!(
-				Contracts::call(
-					Origin::signed(ALICE), addr_bob.clone(), 0, GAS_LIMIT, call::null()
-				),
-				Error::<Test>::RentNotPaid,
-			);
-			assert!(System::events().is_empty());
-			assert!(ContractInfoOf::<Test>::get(&addr_bob).unwrap().get_alive().is_some());
-			assert_ok!(Contracts::claim_surcharge(Origin::none(), addr_bob.clone(), Some(ALICE)));
-			assert!(ContractInfoOf::<Test>::get(&addr_bob).unwrap().get_tombstone().is_some());
-			if test_code_evicted {
-				assert_refcount!(set_rent_code_hash, 0);
-			} else {
-				assert_refcount!(set_rent_code_hash, 1);
-			}
+		// Check if `BOB` was created successfully and that the rent allowance is below what
+		// we specified as the first rent was already collected.
+		let bob_contract = ContractInfoOf::<Test>::get(&addr_bob).unwrap().get_alive().unwrap();
+		assert!(bob_contract.rent_allowance < allowance);
 
-			// Create another account with the address `DJANGO` with `CODE_RESTORATION`.
-			//
-			// Note that we can't use `ALICE` for creating `DJANGO` so we create yet another
-			// account `CHARLIE` and create `DJANGO` with it.
-			let _ = Balances::deposit_creating(&CHARLIE, 1_000_000);
-			assert_ok!(Contracts::instantiate_with_code(
-				Origin::signed(CHARLIE),
-				30_000,
+		if test_different_storage {
+			assert_ok!(Contracts::call(
+				Origin::signed(ALICE),
+				addr_bob.clone(),
+				0,
 				GAS_LIMIT,
-				restoration_wasm,
-				vec![],
-				vec![],
+				call::set_storage_4_byte()
 			));
-			let addr_django = Contracts::contract_address(&CHARLIE, &restoration_code_hash, &[]);
+		}
 
-			// Before performing a call to `DJANGO` save its original trie id.
-			let django_trie_id = ContractInfoOf::<Test>::get(&addr_django).unwrap()
-				.get_alive().unwrap().trie_id;
+		// Advance blocks in order to make the contract run out of money for rent.
+		initialize_block(27);
 
-			// The trie is regarded as 'dirty' when it was written to in the current block.
-			if !test_restore_to_with_dirty_storage {
-				// Advance 1 block.
-				initialize_block(28);
-			}
+		// Call `BOB`, which makes it pay rent. Since the rent allowance is set to 20_000
+		// we expect that it is no longer callable but keeps existing until someone
+		// calls `claim_surcharge`.
+		assert_err_ignore_postinfo!(
+			Contracts::call(Origin::signed(ALICE), addr_bob.clone(), 0, GAS_LIMIT, call::null()),
+			Error::<Test>::RentNotPaid,
+		);
+		assert!(System::events().is_empty());
+		assert!(ContractInfoOf::<Test>::get(&addr_bob).unwrap().get_alive().is_some());
+		assert_ok!(Contracts::claim_surcharge(Origin::none(), addr_bob.clone(), Some(ALICE)));
+		assert!(ContractInfoOf::<Test>::get(&addr_bob).unwrap().get_tombstone().is_some());
+		if test_code_evicted {
+			assert_refcount!(set_rent_code_hash, 0);
+		} else {
+			assert_refcount!(set_rent_code_hash, 1);
+		}
 
-			// Perform a call to `DJANGO`. This should either perform restoration successfully or
-			// fail depending on the test parameters.
-			let perform_the_restoration = || {
-				Contracts::call(
-					Origin::signed(ALICE),
-					addr_django.clone(),
-					0,
-					GAS_LIMIT,
-					set_rent_code_hash
-						.as_ref()
-						.iter()
-						.chain(AsRef::<[u8]>::as_ref(&addr_bob))
-						.cloned()
-						.collect(),
-				)
-			};
+		// Create another account with the address `DJANGO` with `CODE_RESTORATION`.
+		//
+		// Note that we can't use `ALICE` for creating `DJANGO` so we create yet another
+		// account `CHARLIE` and create `DJANGO` with it.
+		let _ = Balances::deposit_creating(&CHARLIE, 1_000_000);
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(CHARLIE),
+			30_000,
+			GAS_LIMIT,
+			restoration_wasm,
+			vec![],
+			vec![],
+		));
+		let addr_django = Contracts::contract_address(&CHARLIE, &restoration_code_hash, &[]);
 
-			// The key that is used in the restorer contract but is not in the target contract.
-			// Is supplied as delta to the restoration. We need it to check whether the key
-			// is properly removed on success but still there on failure.
-			let delta_key = {
-				let mut key = [0u8; 32];
-				key[0] = 1;
-				key
-			};
+		// Before performing a call to `DJANGO` save its original trie id.
+		let django_trie_id =
+			ContractInfoOf::<Test>::get(&addr_django).unwrap().get_alive().unwrap().trie_id;
 
-			if test_different_storage || test_restore_to_with_dirty_storage || test_code_evicted {
-				// Parametrization of the test imply restoration failure. Check that `DJANGO` aka
-				// restoration contract is still in place and also that `BOB` doesn't exist.
-				let result = perform_the_restoration();
-				assert!(ContractInfoOf::<Test>::get(&addr_bob).unwrap().get_tombstone().is_some());
-				let django_contract = ContractInfoOf::<Test>::get(&addr_django).unwrap()
-					.get_alive().unwrap();
-				assert_eq!(django_contract.storage_size, 8);
-				assert_eq!(django_contract.trie_id, django_trie_id);
-				assert_eq!(django_contract.deduct_block, System::block_number());
-				assert_eq!(
-					Storage::<Test>::read(&django_trie_id, &delta_key),
-					Some(vec![40, 0, 0, 0]),
-				);
-				match (
-					test_different_storage,
-					test_restore_to_with_dirty_storage,
-					test_code_evicted
-				) {
-					(true, false, false) => {
-						assert_err_ignore_postinfo!(
-							result, Error::<Test>::InvalidTombstone,
-						);
-						assert_eq!(System::events(), vec![]);
-					}
-					(_, true, false) => {
-						assert_err_ignore_postinfo!(
-							result, Error::<Test>::InvalidContractOrigin,
-						);
-						assert_eq!(System::events(), vec![
+		// The trie is regarded as 'dirty' when it was written to in the current block.
+		if !test_restore_to_with_dirty_storage {
+			// Advance 1 block.
+			initialize_block(28);
+		}
+
+		// Perform a call to `DJANGO`. This should either perform restoration successfully or
+		// fail depending on the test parameters.
+		let perform_the_restoration = || {
+			Contracts::call(
+				Origin::signed(ALICE),
+				addr_django.clone(),
+				0,
+				GAS_LIMIT,
+				set_rent_code_hash
+					.as_ref()
+					.iter()
+					.chain(AsRef::<[u8]>::as_ref(&addr_bob))
+					.cloned()
+					.collect(),
+			)
+		};
+
+		// The key that is used in the restorer contract but is not in the target contract.
+		// Is supplied as delta to the restoration. We need it to check whether the key
+		// is properly removed on success but still there on failure.
+		let delta_key = {
+			let mut key = [0u8; 32];
+			key[0] = 1;
+			key
+		};
+
+		if test_different_storage || test_restore_to_with_dirty_storage || test_code_evicted {
+			// Parametrization of the test imply restoration failure. Check that `DJANGO` aka
+			// restoration contract is still in place and also that `BOB` doesn't exist.
+			let result = perform_the_restoration();
+			assert!(ContractInfoOf::<Test>::get(&addr_bob).unwrap().get_tombstone().is_some());
+			let django_contract =
+				ContractInfoOf::<Test>::get(&addr_django).unwrap().get_alive().unwrap();
+			assert_eq!(django_contract.storage_size, 8);
+			assert_eq!(django_contract.trie_id, django_trie_id);
+			assert_eq!(django_contract.deduct_block, System::block_number());
+			assert_eq!(Storage::<Test>::read(&django_trie_id, &delta_key), Some(vec![40, 0, 0, 0]),);
+			match (test_different_storage, test_restore_to_with_dirty_storage, test_code_evicted) {
+				(true, false, false) => {
+					assert_err_ignore_postinfo!(result, Error::<Test>::InvalidTombstone,);
+					assert_eq!(System::events(), vec![]);
+				},
+				(_, true, false) => {
+					assert_err_ignore_postinfo!(result, Error::<Test>::InvalidContractOrigin,);
+					assert_eq!(
+						System::events(),
+						vec![
 							EventRecord {
 								phase: Phase::Initialization,
 								event: Event::Contracts(crate::Event::Evicted(addr_bob)),
@@ -1454,67 +1380,76 @@ fn restoration(
 							},
 							EventRecord {
 								phase: Phase::Initialization,
-								event: Event::Balances(pallet_balances::Event::Endowed(CHARLIE, 1_000_000)),
+								event: Event::Balances(pallet_balances::Event::Endowed(
+									CHARLIE, 1_000_000
+								)),
 								topics: vec![],
 							},
 							EventRecord {
 								phase: Phase::Initialization,
-								event: Event::System(frame_system::Event::NewAccount(addr_django.clone())),
+								event: Event::System(frame_system::Event::NewAccount(
+									addr_django.clone()
+								)),
 								topics: vec![],
 							},
 							EventRecord {
 								phase: Phase::Initialization,
-								event: Event::Balances(pallet_balances::Event::Endowed(addr_django.clone(), 30_000)),
+								event: Event::Balances(pallet_balances::Event::Endowed(
+									addr_django.clone(),
+									30_000
+								)),
 								topics: vec![],
 							},
 							EventRecord {
 								phase: Phase::Initialization,
-								event: Event::Balances(
-									pallet_balances::Event::Transfer(CHARLIE, addr_django.clone(), 30_000)
-								),
+								event: Event::Balances(pallet_balances::Event::Transfer(
+									CHARLIE,
+									addr_django.clone(),
+									30_000
+								)),
 								topics: vec![],
 							},
 							EventRecord {
 								phase: Phase::Initialization,
-								event: Event::Contracts(
-									crate::Event::CodeStored(restoration_code_hash)
-								),
+								event: Event::Contracts(crate::Event::CodeStored(
+									restoration_code_hash
+								)),
 								topics: vec![],
 							},
 							EventRecord {
 								phase: Phase::Initialization,
-								event: Event::Contracts(
-									crate::Event::Instantiated(CHARLIE, addr_django.clone())
-								),
+								event: Event::Contracts(crate::Event::Instantiated(
+									CHARLIE,
+									addr_django.clone()
+								)),
 								topics: vec![],
 							},
+						]
+					);
+				},
+				(false, false, true) => {
+					assert_err_ignore_postinfo!(result, Error::<Test>::CodeNotFound,);
+					assert_refcount!(set_rent_code_hash, 0);
+					assert_eq!(System::events(), vec![]);
+				},
+				_ => unreachable!(),
+			}
+		} else {
+			assert_ok!(perform_the_restoration());
+			assert_refcount!(set_rent_code_hash, 2);
 
-						]);
-					},
-					(false, false, true) => {
-						assert_err_ignore_postinfo!(
-							result, Error::<Test>::CodeNotFound,
-						);
-						assert_refcount!(set_rent_code_hash, 0);
-						assert_eq!(System::events(), vec![]);
-					},
-					_ => unreachable!(),
-				}
-			} else {
-				assert_ok!(perform_the_restoration());
-				assert_refcount!(set_rent_code_hash, 2);
-
-				// Here we expect that the restoration is succeeded. Check that the restoration
-				// contract `DJANGO` ceased to exist and that `BOB` returned back.
-				let bob_contract = ContractInfoOf::<Test>::get(&addr_bob).unwrap()
-					.get_alive().unwrap();
-				assert_eq!(bob_contract.rent_allowance, 50);
-				assert_eq!(bob_contract.storage_size, 4);
-				assert_eq!(bob_contract.trie_id, django_trie_id);
-				assert_eq!(bob_contract.deduct_block, System::block_number());
-				assert!(ContractInfoOf::<Test>::get(&addr_django).is_none());
-				assert_matches!(Storage::<Test>::read(&django_trie_id, &delta_key), None);
-				assert_eq!(System::events(), vec![
+			// Here we expect that the restoration is succeeded. Check that the restoration
+			// contract `DJANGO` ceased to exist and that `BOB` returned back.
+			let bob_contract = ContractInfoOf::<Test>::get(&addr_bob).unwrap().get_alive().unwrap();
+			assert_eq!(bob_contract.rent_allowance, 50);
+			assert_eq!(bob_contract.storage_size, 4);
+			assert_eq!(bob_contract.trie_id, django_trie_id);
+			assert_eq!(bob_contract.deduct_block, System::block_number());
+			assert!(ContractInfoOf::<Test>::get(&addr_django).is_none());
+			assert_matches!(Storage::<Test>::read(&django_trie_id, &delta_key), None);
+			assert_eq!(
+				System::events(),
+				vec![
 					EventRecord {
 						phase: Phase::Initialization,
 						event: Event::Contracts(crate::Event::CodeRemoved(restoration_code_hash)),
@@ -1527,60 +1462,59 @@ fn restoration(
 					},
 					EventRecord {
 						phase: Phase::Initialization,
-						event: Event::Contracts(
-							crate::Event::Restored(
-								addr_django, addr_bob, bob_contract.code_hash, 50
-							)
-						),
+						event: Event::Contracts(crate::Event::Restored(
+							addr_django,
+							addr_bob,
+							bob_contract.code_hash,
+							50
+						)),
 						topics: vec![],
 					},
-				]);
-			}
-		});
+				]
+			);
+		}
+	});
 }
 
 #[test]
 fn storage_max_value_limit() {
 	let (wasm, code_hash) = compile_module::<Test>("storage_size").unwrap();
 
-	ExtBuilder::default()
-		.existential_deposit(50)
-		.build()
-		.execute_with(|| {
-			// Create
-			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			assert_ok!(Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				30_000,
-				GAS_LIMIT,
-				wasm,
-				vec![],
-				vec![],
-			));
-			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
-			ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		// Create
+		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			30_000,
+			GAS_LIMIT,
+			wasm,
+			vec![],
+			vec![],
+		));
+		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+		ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
 
-			// Call contract with allowed storage value.
-			assert_ok!(Contracts::call(
+		// Call contract with allowed storage value.
+		assert_ok!(Contracts::call(
+			Origin::signed(ALICE),
+			addr.clone(),
+			0,
+			GAS_LIMIT * 2, // we are copying a huge buffer
+			<Test as Config>::Schedule::get().limits.payload_len.encode(),
+		));
+
+		// Call contract with too large a storage value.
+		assert_err_ignore_postinfo!(
+			Contracts::call(
 				Origin::signed(ALICE),
-				addr.clone(),
+				addr,
 				0,
-				GAS_LIMIT * 2, // we are copying a huge buffer
-				<Test as Config>::Schedule::get().limits.payload_len.encode(),
-			));
-
-			// Call contract with too large a storage value.
-			assert_err_ignore_postinfo!(
-				Contracts::call(
-					Origin::signed(ALICE),
-					addr,
-					0,
-					GAS_LIMIT,
-					(<Test as Config>::Schedule::get().limits.payload_len + 1).encode(),
-				),
-				Error::<Test>::ValueTooLarge,
-			);
-		});
+				GAS_LIMIT,
+				(<Test as Config>::Schedule::get().limits.payload_len + 1).encode(),
+			),
+			Error::<Test>::ValueTooLarge,
+		);
+	});
 }
 
 #[test]
@@ -1588,187 +1522,145 @@ fn deploy_and_call_other_contract() {
 	let (callee_wasm, callee_code_hash) = compile_module::<Test>("return_with_data").unwrap();
 	let (caller_wasm, caller_code_hash) = compile_module::<Test>("caller_contract").unwrap();
 
-	ExtBuilder::default()
-		.existential_deposit(50)
-		.build()
-		.execute_with(|| {
-			// Create
-			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			assert_ok!(Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				100_000,
-				GAS_LIMIT,
-				caller_wasm,
-				vec![],
-				vec![],
-			));
-			assert_ok!(Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				100_000,
-				GAS_LIMIT,
-				callee_wasm,
-				0u32.to_le_bytes().encode(),
-				vec![42],
-			));
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		// Create
+		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			100_000,
+			GAS_LIMIT,
+			caller_wasm,
+			vec![],
+			vec![],
+		));
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			100_000,
+			GAS_LIMIT,
+			callee_wasm,
+			0u32.to_le_bytes().encode(),
+			vec![42],
+		));
 
-			// Call BOB contract, which attempts to instantiate and call the callee contract and
-			// makes various assertions on the results from those calls.
-			assert_ok!(Contracts::call(
-				Origin::signed(ALICE),
-				Contracts::contract_address(&ALICE, &caller_code_hash, &[]),
-				0,
-				GAS_LIMIT,
-				callee_code_hash.as_ref().to_vec(),
-			));
-		});
+		// Call BOB contract, which attempts to instantiate and call the callee contract and
+		// makes various assertions on the results from those calls.
+		assert_ok!(Contracts::call(
+			Origin::signed(ALICE),
+			Contracts::contract_address(&ALICE, &caller_code_hash, &[]),
+			0,
+			GAS_LIMIT,
+			callee_code_hash.as_ref().to_vec(),
+		));
+	});
 }
 
 #[test]
 fn cannot_self_destruct_through_draning() {
 	let (wasm, code_hash) = compile_module::<Test>("drain").unwrap();
-	ExtBuilder::default()
-		.existential_deposit(50)
-		.build()
-		.execute_with(|| {
-			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
 
-			// Instantiate the BOB contract.
-			assert_ok!(Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				100_000,
-				GAS_LIMIT,
-				wasm,
-				vec![],
-				vec![],
-			));
-			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+		// Instantiate the BOB contract.
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			100_000,
+			GAS_LIMIT,
+			wasm,
+			vec![],
+			vec![],
+		));
+		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
-			// Check that the BOB contract has been instantiated.
-			assert_matches!(
-				ContractInfoOf::<Test>::get(&addr),
-				Some(ContractInfo::Alive(_))
-			);
+		// Check that the BOB contract has been instantiated.
+		assert_matches!(ContractInfoOf::<Test>::get(&addr), Some(ContractInfo::Alive(_)));
 
-			// Call BOB which makes it send all funds to the zero address
-			// The contract code asserts that the correct error value is returned.
-			assert_ok!(
-				Contracts::call(
-					Origin::signed(ALICE),
-					addr,
-					0,
-					GAS_LIMIT,
-					vec![],
-				)
-			);
-		});
+		// Call BOB which makes it send all funds to the zero address
+		// The contract code asserts that the correct error value is returned.
+		assert_ok!(Contracts::call(Origin::signed(ALICE), addr, 0, GAS_LIMIT, vec![],));
+	});
 }
 
 #[test]
 fn cannot_self_destruct_while_live() {
 	let (wasm, code_hash) = compile_module::<Test>("self_destruct").unwrap();
-	ExtBuilder::default()
-		.existential_deposit(50)
-		.build()
-		.execute_with(|| {
-			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
 
-			// Instantiate the BOB contract.
-			assert_ok!(Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				100_000,
-				GAS_LIMIT,
-				wasm,
-				vec![],
-				vec![],
-			));
-			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+		// Instantiate the BOB contract.
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			100_000,
+			GAS_LIMIT,
+			wasm,
+			vec![],
+			vec![],
+		));
+		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
-			// Check that the BOB contract has been instantiated.
-			assert_matches!(
-				ContractInfoOf::<Test>::get(&addr),
-				Some(ContractInfo::Alive(_))
-			);
+		// Check that the BOB contract has been instantiated.
+		assert_matches!(ContractInfoOf::<Test>::get(&addr), Some(ContractInfo::Alive(_)));
 
-			// Call BOB with input data, forcing it make a recursive call to itself to
-			// self-destruct, resulting in a trap.
-			assert_err_ignore_postinfo!(
-				Contracts::call(
-					Origin::signed(ALICE),
-					addr.clone(),
-					0,
-					GAS_LIMIT,
-					vec![0],
-				),
-				Error::<Test>::ContractTrapped,
-			);
+		// Call BOB with input data, forcing it make a recursive call to itself to
+		// self-destruct, resulting in a trap.
+		assert_err_ignore_postinfo!(
+			Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, vec![0],),
+			Error::<Test>::ContractTrapped,
+		);
 
-			// Check that BOB is still alive.
-			assert_matches!(
-				ContractInfoOf::<Test>::get(&addr),
-				Some(ContractInfo::Alive(_))
-			);
-		});
+		// Check that BOB is still alive.
+		assert_matches!(ContractInfoOf::<Test>::get(&addr), Some(ContractInfo::Alive(_)));
+	});
 }
 
 #[test]
 fn self_destruct_works() {
 	let (wasm, code_hash) = compile_module::<Test>("self_destruct").unwrap();
-	ExtBuilder::default()
-		.existential_deposit(50)
-		.build()
-		.execute_with(|| {
-			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			let _ = Balances::deposit_creating(&DJANGO, 1_000_000);
-
-			// Instantiate the BOB contract.
-			assert_ok!(Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				100_000,
-				GAS_LIMIT,
-				wasm,
-				vec![],
-				vec![],
-			));
-			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
+		let _ = Balances::deposit_creating(&DJANGO, 1_000_000);
 
-			// Check that the BOB contract has been instantiated.
-			assert_matches!(
-				ContractInfoOf::<Test>::get(&addr),
-				Some(ContractInfo::Alive(_))
-			);
+		// Instantiate the BOB contract.
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			100_000,
+			GAS_LIMIT,
+			wasm,
+			vec![],
+			vec![],
+		));
+		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
-			// Drop all previous events
-			initialize_block(2);
-
-			// Call BOB without input data which triggers termination.
-			assert_matches!(
-				Contracts::call(
-					Origin::signed(ALICE),
-					addr.clone(),
-					0,
-					GAS_LIMIT,
-					vec![],
-				),
-				Ok(_)
-			);
+		// Check that the BOB contract has been instantiated.
+		assert_matches!(ContractInfoOf::<Test>::get(&addr), Some(ContractInfo::Alive(_)));
+
+		// Drop all previous events
+		initialize_block(2);
+
+		// Call BOB without input data which triggers termination.
+		assert_matches!(
+			Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, vec![],),
+			Ok(_)
+		);
 
-			// The call triggers rent collection that reduces the amount of balance
-			// that remains for the beneficiary.
-			let balance_after_rent = 93_078;
+		// The call triggers rent collection that reduces the amount of balance
+		// that remains for the beneficiary.
+		let balance_after_rent = 93_078;
 
-			pretty_assertions::assert_eq!(System::events(), vec![
+		pretty_assertions::assert_eq!(
+			System::events(),
+			vec![
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::System(
-						frame_system::Event::KilledAccount(addr.clone())
-					),
+					event: Event::System(frame_system::Event::KilledAccount(addr.clone())),
 					topics: vec![],
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::Balances(
-						pallet_balances::Event::Transfer(addr.clone(), DJANGO, balance_after_rent)
-					),
+					event: Event::Balances(pallet_balances::Event::Transfer(
+						addr.clone(),
+						DJANGO,
+						balance_after_rent
+					)),
 					topics: vec![],
 				},
 				EventRecord {
@@ -1778,20 +1670,19 @@ fn self_destruct_works() {
 				},
 				EventRecord {
 					phase: Phase::Initialization,
-					event: Event::Contracts(
-						crate::Event::Terminated(addr.clone(), DJANGO)
-					),
+					event: Event::Contracts(crate::Event::Terminated(addr.clone(), DJANGO)),
 					topics: vec![],
 				},
-			]);
+			]
+		);
 
-			// Check that account is gone
-			assert!(ContractInfoOf::<Test>::get(&addr).is_none());
+		// Check that account is gone
+		assert!(ContractInfoOf::<Test>::get(&addr).is_none());
 
-			// check that the beneficiary (django) got remaining balance
-			// some rent was deducted before termination
-			assert_eq!(Balances::free_balance(DJANGO), 1_000_000 + balance_after_rent);
-		});
+		// check that the beneficiary (django) got remaining balance
+		// some rent was deducted before termination
+		assert_eq!(Balances::free_balance(DJANGO), 1_000_000 + balance_after_rent);
+	});
 }
 
 // This tests that one contract cannot prevent another from self-destructing by sending it
@@ -1801,134 +1692,116 @@ fn destroy_contract_and_transfer_funds() {
 	let (callee_wasm, callee_code_hash) = compile_module::<Test>("self_destruct").unwrap();
 	let (caller_wasm, caller_code_hash) = compile_module::<Test>("destroy_and_transfer").unwrap();
 
-	ExtBuilder::default()
-		.existential_deposit(50)
-		.build()
-		.execute_with(|| {
-			// Create
-			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			assert_ok!(Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				200_000,
-				GAS_LIMIT,
-				callee_wasm,
-				vec![],
-				vec![42]
-			));
-
-			// This deploys the BOB contract, which in turn deploys the CHARLIE contract during
-			// construction.
-			assert_ok!(Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				200_000,
-				GAS_LIMIT,
-				caller_wasm,
-				callee_code_hash.as_ref().to_vec(),
-				vec![],
-			));
-			let addr_bob = Contracts::contract_address(&ALICE, &caller_code_hash, &[]);
-			let addr_charlie = Contracts::contract_address(
-				&addr_bob, &callee_code_hash, &[0x47, 0x11]
-			);
-
-			// Check that the CHARLIE contract has been instantiated.
-			assert_matches!(
-				ContractInfoOf::<Test>::get(&addr_charlie),
-				Some(ContractInfo::Alive(_))
-			);
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		// Create
+		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			200_000,
+			GAS_LIMIT,
+			callee_wasm,
+			vec![],
+			vec![42]
+		));
 
-			// Call BOB, which calls CHARLIE, forcing CHARLIE to self-destruct.
-			assert_ok!(Contracts::call(
-				Origin::signed(ALICE),
-				addr_bob,
-				0,
-				GAS_LIMIT,
-				addr_charlie.encode(),
-			));
+		// This deploys the BOB contract, which in turn deploys the CHARLIE contract during
+		// construction.
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			200_000,
+			GAS_LIMIT,
+			caller_wasm,
+			callee_code_hash.as_ref().to_vec(),
+			vec![],
+		));
+		let addr_bob = Contracts::contract_address(&ALICE, &caller_code_hash, &[]);
+		let addr_charlie = Contracts::contract_address(&addr_bob, &callee_code_hash, &[0x47, 0x11]);
 
-			// Check that CHARLIE has moved on to the great beyond (ie. died).
-			assert!(ContractInfoOf::<Test>::get(&addr_charlie).is_none());
-		});
-}
+		// Check that the CHARLIE contract has been instantiated.
+		assert_matches!(ContractInfoOf::<Test>::get(&addr_charlie), Some(ContractInfo::Alive(_)));
 
-#[test]
-fn cannot_self_destruct_in_constructor() {
-	let (wasm, _) = compile_module::<Test>("self_destructing_constructor").unwrap();
-	ExtBuilder::default()
-		.existential_deposit(50)
-		.build()
-		.execute_with(|| {
-			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-
-			// Fail to instantiate the BOB because the contructor calls seal_terminate.
-			assert_err_ignore_postinfo!(
-				Contracts::instantiate_with_code(
-					Origin::signed(ALICE),
-					100_000,
-					GAS_LIMIT,
-					wasm,
-					vec![],
-					vec![],
-				),
-				Error::<Test>::TerminatedInConstructor,
-			);
-		});
+		// Call BOB, which calls CHARLIE, forcing CHARLIE to self-destruct.
+		assert_ok!(Contracts::call(
+			Origin::signed(ALICE),
+			addr_bob,
+			0,
+			GAS_LIMIT,
+			addr_charlie.encode(),
+		));
+
+		// Check that CHARLIE has moved on to the great beyond (ie. died).
+		assert!(ContractInfoOf::<Test>::get(&addr_charlie).is_none());
+	});
 }
 
 #[test]
-fn crypto_hashes() {
-	let (wasm, code_hash) = compile_module::<Test>("crypto_hashes").unwrap();
-
-	ExtBuilder::default()
-		.existential_deposit(50)
-		.build()
-		.execute_with(|| {
-			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
+fn cannot_self_destruct_in_constructor() {
+	let (wasm, _) = compile_module::<Test>("self_destructing_constructor").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
 
-			// Instantiate the CRYPTO_HASHES contract.
-			assert_ok!(Contracts::instantiate_with_code(
+		// Fail to instantiate the BOB because the contructor calls seal_terminate.
+		assert_err_ignore_postinfo!(
+			Contracts::instantiate_with_code(
 				Origin::signed(ALICE),
 				100_000,
 				GAS_LIMIT,
 				wasm,
 				vec![],
 				vec![],
-			));
-			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
-			// Perform the call.
-			let input = b"_DEAD_BEEF";
-			use sp_io::hashing::*;
-			// Wraps a hash function into a more dynamic form usable for testing.
-			macro_rules! dyn_hash_fn {
-				($name:ident) => {
-					Box::new(|input| $name(input).as_ref().to_vec().into_boxed_slice())
-				};
-			}
-			// All hash functions and their associated output byte lengths.
-			let test_cases: &[(Box<dyn Fn(&[u8]) -> Box<[u8]>>, usize)] = &[
-				(dyn_hash_fn!(sha2_256), 32),
-				(dyn_hash_fn!(keccak_256), 32),
-				(dyn_hash_fn!(blake2_256), 32),
-				(dyn_hash_fn!(blake2_128), 16),
-			];
-			// Test the given hash functions for the input: "_DEAD_BEEF"
-			for (n, (hash_fn, expected_size)) in test_cases.iter().enumerate() {
-				// We offset data in the contract tables by 1.
-				let mut params = vec![(n + 1) as u8];
-				params.extend_from_slice(input);
-				let result = <Pallet<Test>>::bare_call(
-					ALICE,
-					addr.clone(),
-					0,
-					GAS_LIMIT,
-					params,
-					false,
-				).result.unwrap();
-				assert!(result.is_success());
-				let expected = hash_fn(input.as_ref());
-				assert_eq!(&result.data[..*expected_size], &*expected);
-			}
-		})
+			),
+			Error::<Test>::TerminatedInConstructor,
+		);
+	});
+}
+
+#[test]
+fn crypto_hashes() {
+	let (wasm, code_hash) = compile_module::<Test>("crypto_hashes").unwrap();
+
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
+
+		// Instantiate the CRYPTO_HASHES contract.
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			100_000,
+			GAS_LIMIT,
+			wasm,
+			vec![],
+			vec![],
+		));
+		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+		// Perform the call.
+		let input = b"_DEAD_BEEF";
+		use sp_io::hashing::*;
+		// Wraps a hash function into a more dynamic form usable for testing.
+		macro_rules! dyn_hash_fn {
+			($name:ident) => {
+				Box::new(|input| $name(input).as_ref().to_vec().into_boxed_slice())
+			};
+		}
+		// All hash functions and their associated output byte lengths.
+		let test_cases: &[(Box<dyn Fn(&[u8]) -> Box<[u8]>>, usize)] = &[
+			(dyn_hash_fn!(sha2_256), 32),
+			(dyn_hash_fn!(keccak_256), 32),
+			(dyn_hash_fn!(blake2_256), 32),
+			(dyn_hash_fn!(blake2_128), 16),
+		];
+		// Test the given hash functions for the input: "_DEAD_BEEF"
+		for (n, (hash_fn, expected_size)) in test_cases.iter().enumerate() {
+			// We offset data in the contract tables by 1.
+			let mut params = vec![(n + 1) as u8];
+			params.extend_from_slice(input);
+			let result =
+				<Pallet<Test>>::bare_call(ALICE, addr.clone(), 0, GAS_LIMIT, params, false)
+					.result
+					.unwrap();
+			assert!(result.is_success());
+			let expected = hash_fn(input.as_ref());
+			assert_eq!(&result.data[..*expected_size], &*expected);
+		}
+	})
 }
 
 #[test]
@@ -1938,28 +1811,21 @@ fn transfer_return_code() {
 		let subsistence = Pallet::<Test>::subsistence_threshold();
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 
-		assert_ok!(
-			Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				subsistence * 100,
-				GAS_LIMIT,
-				wasm,
-				vec![],
-				vec![],
-			),
-		);
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			subsistence * 100,
+			GAS_LIMIT,
+			wasm,
+			vec![],
+			vec![],
+		),);
 		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
 		// Contract has only the minimal balance so any transfer will return BelowSubsistence.
 		Balances::make_free_balance_be(&addr, subsistence);
-		let result = Contracts::bare_call(
-			ALICE,
-			addr.clone(),
-			0,
-			GAS_LIMIT,
-			vec![],
-			false,
-		).result.unwrap();
+		let result = Contracts::bare_call(ALICE, addr.clone(), 0, GAS_LIMIT, vec![], false)
+			.result
+			.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::BelowSubsistenceThreshold);
 
 		// Contract has enough total balance in order to not go below the subsistence
@@ -1967,14 +1833,7 @@ fn transfer_return_code() {
 		// the transfer still fails but with another return code.
 		Balances::make_free_balance_be(&addr, subsistence + 100);
 		Balances::reserve(&addr, subsistence + 100).unwrap();
-		let result = Contracts::bare_call(
-			ALICE,
-			addr,
-			0,
-			GAS_LIMIT,
-			vec![],
-			false,
-		).result.unwrap();
+		let result = Contracts::bare_call(ALICE, addr, 0, GAS_LIMIT, vec![], false).result.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::TransferFailed);
 	});
 }
@@ -1988,16 +1847,14 @@ fn call_return_code() {
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 		let _ = Balances::deposit_creating(&CHARLIE, 1000 * subsistence);
 
-		assert_ok!(
-			Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				subsistence * 100,
-				GAS_LIMIT,
-				caller_code,
-				vec![0],
-				vec![],
-			),
-		);
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			subsistence * 100,
+			GAS_LIMIT,
+			caller_code,
+			vec![0],
+			vec![],
+		),);
 		let addr_bob = Contracts::contract_address(&ALICE, &caller_hash, &[]);
 		Balances::make_free_balance_be(&addr_bob, subsistence);
 
@@ -2009,19 +1866,19 @@ fn call_return_code() {
 			GAS_LIMIT,
 			AsRef::<[u8]>::as_ref(&DJANGO).to_vec(),
 			false,
-		).result.unwrap();
+		)
+		.result
+		.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::NotCallable);
 
-		assert_ok!(
-			Contracts::instantiate_with_code(
-				Origin::signed(CHARLIE),
-				subsistence * 100,
-				GAS_LIMIT,
-				callee_code,
-				vec![0],
-				vec![],
-			),
-		);
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(CHARLIE),
+			subsistence * 100,
+			GAS_LIMIT,
+			callee_code,
+			vec![0],
+			vec![],
+		),);
 		let addr_django = Contracts::contract_address(&CHARLIE, &callee_hash, &[]);
 		Balances::make_free_balance_be(&addr_django, subsistence);
 
@@ -2031,9 +1888,15 @@ fn call_return_code() {
 			addr_bob.clone(),
 			0,
 			GAS_LIMIT,
-			AsRef::<[u8]>::as_ref(&addr_django).iter().chain(&0u32.to_le_bytes()).cloned().collect(),
+			AsRef::<[u8]>::as_ref(&addr_django)
+				.iter()
+				.chain(&0u32.to_le_bytes())
+				.cloned()
+				.collect(),
 			false,
-		).result.unwrap();
+		)
+		.result
+		.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::BelowSubsistenceThreshold);
 
 		// Contract has enough total balance in order to not go below the subsistence
@@ -2046,9 +1909,15 @@ fn call_return_code() {
 			addr_bob.clone(),
 			0,
 			GAS_LIMIT,
-			AsRef::<[u8]>::as_ref(&addr_django).iter().chain(&0u32.to_le_bytes()).cloned().collect(),
+			AsRef::<[u8]>::as_ref(&addr_django)
+				.iter()
+				.chain(&0u32.to_le_bytes())
+				.cloned()
+				.collect(),
 			false,
-		).result.unwrap();
+		)
+		.result
+		.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::TransferFailed);
 
 		// Contract has enough balance but callee reverts because "1" is passed.
@@ -2058,9 +1927,15 @@ fn call_return_code() {
 			addr_bob.clone(),
 			0,
 			GAS_LIMIT,
-			AsRef::<[u8]>::as_ref(&addr_django).iter().chain(&1u32.to_le_bytes()).cloned().collect(),
+			AsRef::<[u8]>::as_ref(&addr_django)
+				.iter()
+				.chain(&1u32.to_le_bytes())
+				.cloned()
+				.collect(),
 			false,
-		).result.unwrap();
+		)
+		.result
+		.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::CalleeReverted);
 
 		// Contract has enough balance but callee traps because "2" is passed.
@@ -2069,11 +1944,16 @@ fn call_return_code() {
 			addr_bob,
 			0,
 			GAS_LIMIT,
-			AsRef::<[u8]>::as_ref(&addr_django).iter().chain(&2u32.to_le_bytes()).cloned().collect(),
+			AsRef::<[u8]>::as_ref(&addr_django)
+				.iter()
+				.chain(&2u32.to_le_bytes())
+				.cloned()
+				.collect(),
 			false,
-		).result.unwrap();
+		)
+		.result
+		.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::CalleeTrapped);
-
 	});
 }
 
@@ -2087,39 +1967,31 @@ fn instantiate_return_code() {
 		let _ = Balances::deposit_creating(&CHARLIE, 1000 * subsistence);
 		let callee_hash = callee_hash.as_ref().to_vec();
 
-		assert_ok!(
-			Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				subsistence * 100,
-				GAS_LIMIT,
-				callee_code,
-				vec![],
-				vec![],
-			),
-		);
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			subsistence * 100,
+			GAS_LIMIT,
+			callee_code,
+			vec![],
+			vec![],
+		),);
 
-		assert_ok!(
-			Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				subsistence * 100,
-				GAS_LIMIT,
-				caller_code,
-				vec![],
-				vec![],
-			),
-		);
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			subsistence * 100,
+			GAS_LIMIT,
+			caller_code,
+			vec![],
+			vec![],
+		),);
 		let addr = Contracts::contract_address(&ALICE, &caller_hash, &[]);
 
 		// Contract has only the minimal balance so any transfer will return BelowSubsistence.
 		Balances::make_free_balance_be(&addr, subsistence);
-		let result = Contracts::bare_call(
-			ALICE,
-			addr.clone(),
-			0,
-			GAS_LIMIT,
-			callee_hash.clone(),
-			false,
-		).result.unwrap();
+		let result =
+			Contracts::bare_call(ALICE, addr.clone(), 0, GAS_LIMIT, callee_hash.clone(), false)
+				.result
+				.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::BelowSubsistenceThreshold);
 
 		// Contract has enough total balance in order to not go below the subsistence
@@ -2127,26 +1999,17 @@ fn instantiate_return_code() {
 		// the transfer still fails but with another return code.
 		Balances::make_free_balance_be(&addr, subsistence + 10_000);
 		Balances::reserve(&addr, subsistence + 10_000).unwrap();
-		let result = Contracts::bare_call(
-			ALICE,
-			addr.clone(),
-			0,
-			GAS_LIMIT,
-			callee_hash.clone(),
-			false,
-		).result.unwrap();
+		let result =
+			Contracts::bare_call(ALICE, addr.clone(), 0, GAS_LIMIT, callee_hash.clone(), false)
+				.result
+				.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::TransferFailed);
 
 		// Contract has enough balance but the passed code hash is invalid
 		Balances::make_free_balance_be(&addr, subsistence + 10_000);
-		let result = Contracts::bare_call(
-			ALICE,
-			addr.clone(),
-			0,
-			GAS_LIMIT,
-			vec![0; 33],
-			false,
-		).result.unwrap();
+		let result = Contracts::bare_call(ALICE, addr.clone(), 0, GAS_LIMIT, vec![0; 33], false)
+			.result
+			.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::CodeNotFound);
 
 		// Contract has enough balance but callee reverts because "1" is passed.
@@ -2157,7 +2020,9 @@ fn instantiate_return_code() {
 			GAS_LIMIT,
 			callee_hash.iter().chain(&1u32.to_le_bytes()).cloned().collect(),
 			false,
-		).result.unwrap();
+		)
+		.result
+		.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::CalleeReverted);
 
 		// Contract has enough balance but callee traps because "2" is passed.
@@ -2168,9 +2033,10 @@ fn instantiate_return_code() {
 			GAS_LIMIT,
 			callee_hash.iter().chain(&2u32.to_le_bytes()).cloned().collect(),
 			false,
-		).result.unwrap();
+		)
+		.result
+		.unwrap();
 		assert_return_code!(result, RuntimeReturnCode::CalleeTrapped);
-
 	});
 }
 
@@ -2201,26 +2067,18 @@ fn disabled_chain_extension_errors_on_call() {
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
 		let subsistence = Pallet::<Test>::subsistence_threshold();
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
-		assert_ok!(
-			Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				subsistence * 100,
-				GAS_LIMIT,
-				code,
-				vec![],
-				vec![],
-			),
-		);
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			subsistence * 100,
+			GAS_LIMIT,
+			code,
+			vec![],
+			vec![],
+		),);
 		let addr = Contracts::contract_address(&ALICE, &hash, &[]);
 		TestExtension::disable();
 		assert_err_ignore_postinfo!(
-			Contracts::call(
-				Origin::signed(ALICE),
-				addr.clone(),
-				0,
-				GAS_LIMIT,
-				vec![],
-			),
+			Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, vec![],),
 			Error::<Test>::NoChainExtension,
 		);
 	});
@@ -2232,16 +2090,14 @@ fn chain_extension_works() {
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
 		let subsistence = Pallet::<Test>::subsistence_threshold();
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
-		assert_ok!(
-			Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				subsistence * 100,
-				GAS_LIMIT,
-				code,
-				vec![],
-				vec![],
-			),
-		);
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			subsistence * 100,
+			GAS_LIMIT,
+			code,
+			vec![],
+			vec![],
+		),);
 		let addr = Contracts::contract_address(&ALICE, &hash, &[]);
 
 		// The contract takes a up to 2 byte buffer where the first byte passed is used as
@@ -2249,51 +2105,27 @@ fn chain_extension_works() {
 		// func_id.
 
 		// 0 = read input buffer and pass it through as output
-		let result = Contracts::bare_call(
-			ALICE,
-			addr.clone(),
-			0,
-			GAS_LIMIT,
-			vec![0, 99],
-			false,
-		);
+		let result = Contracts::bare_call(ALICE, addr.clone(), 0, GAS_LIMIT, vec![0, 99], false);
 		let gas_consumed = result.gas_consumed;
 		assert_eq!(TestExtension::last_seen_buffer(), vec![0, 99]);
 		assert_eq!(result.result.unwrap().data, Bytes(vec![0, 99]));
 
 		// 1 = treat inputs as integer primitives and store the supplied integers
-		Contracts::bare_call(
-			ALICE,
-			addr.clone(),
-			0,
-			GAS_LIMIT,
-			vec![1],
-			false,
-		).result.unwrap();
+		Contracts::bare_call(ALICE, addr.clone(), 0, GAS_LIMIT, vec![1], false)
+			.result
+			.unwrap();
 		// those values passed in the fixture
 		assert_eq!(TestExtension::last_seen_inputs(), (4, 1, 16, 12));
 
 		// 2 = charge some extra weight (amount supplied in second byte)
-		let result = Contracts::bare_call(
-			ALICE,
-			addr.clone(),
-			0,
-			GAS_LIMIT,
-			vec![2, 42],
-			false,
-		);
+		let result = Contracts::bare_call(ALICE, addr.clone(), 0, GAS_LIMIT, vec![2, 42], false);
 		assert_ok!(result.result);
 		assert_eq!(result.gas_consumed, gas_consumed + 42);
 
 		// 3 = diverging chain extension call that sets flags to 0x1 and returns a fixed buffer
-		let result = Contracts::bare_call(
-			ALICE,
-			addr.clone(),
-			0,
-			GAS_LIMIT,
-			vec![3],
-			false,
-		).result.unwrap();
+		let result = Contracts::bare_call(ALICE, addr.clone(), 0, GAS_LIMIT, vec![3], false)
+			.result
+			.unwrap();
 		assert_eq!(result.flags, ReturnFlags::REVERT);
 		assert_eq!(result.data, Bytes(vec![42, 99]));
 	});
@@ -2306,32 +2138,24 @@ fn lazy_removal_works() {
 		let subsistence = Pallet::<Test>::subsistence_threshold();
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 
-		assert_ok!(
-			Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				subsistence * 100,
-				GAS_LIMIT,
-				code,
-				vec![],
-				vec![],
-			),
-		);
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			subsistence * 100,
+			GAS_LIMIT,
+			code,
+			vec![],
+			vec![],
+		),);
 
 		let addr = Contracts::contract_address(&ALICE, &hash, &[]);
-		let info = <ContractInfoOf::<Test>>::get(&addr).unwrap().get_alive().unwrap();
+		let info = <ContractInfoOf<Test>>::get(&addr).unwrap().get_alive().unwrap();
 		let trie = &info.child_trie_info();
 
 		// Put value into the contracts child trie
 		child::put(trie, &[99], &42);
 
 		// Terminate the contract
-		assert_ok!(Contracts::call(
-			Origin::signed(ALICE),
-			addr.clone(),
-			0,
-			GAS_LIMIT,
-			vec![],
-		));
+		assert_ok!(Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, vec![],));
 
 		// Contract info should be gone
 		assert!(!<ContractInfoOf::<Test>>::contains_key(&addr));
@@ -2355,10 +2179,9 @@ fn lazy_removal_partial_remove_works() {
 	let extra_keys = 7u32;
 	let weight_limit = 5_000_000_000;
 	let (_, max_keys) = Storage::<Test>::deletion_budget(1, weight_limit);
-	let vals: Vec<_> = (0..max_keys + extra_keys).map(|i| {
-		(blake2_256(&i.encode()), (i as u32), (i as u32).encode())
-	})
-	.collect();
+	let vals: Vec<_> = (0..max_keys + extra_keys)
+		.map(|i| (blake2_256(&i.encode()), (i as u32), (i as u32).encode()))
+		.collect();
 
 	let mut ext = ExtBuilder::default().existential_deposit(50).build();
 
@@ -2366,39 +2189,27 @@ fn lazy_removal_partial_remove_works() {
 		let subsistence = Pallet::<Test>::subsistence_threshold();
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 
-		assert_ok!(
-			Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				subsistence * 100,
-				GAS_LIMIT,
-				code,
-				vec![],
-				vec![],
-			),
-		);
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			subsistence * 100,
+			GAS_LIMIT,
+			code,
+			vec![],
+			vec![],
+		),);
 
 		let addr = Contracts::contract_address(&ALICE, &hash, &[]);
-		let mut info = <ContractInfoOf::<Test>>::get(&addr).unwrap().get_alive().unwrap();
+		let mut info = <ContractInfoOf<Test>>::get(&addr).unwrap().get_alive().unwrap();
 
 		// Put value into the contracts child trie
 		for val in &vals {
-			Storage::<Test>::write(
-				System::block_number(),
-				&mut info,
-				&val.0,
-				Some(val.2.clone()),
-			).unwrap();
-		}
-		<ContractInfoOf<Test>>::insert(&addr, ContractInfo::Alive(info.clone()));
-
-		// Terminate the contract
-		assert_ok!(Contracts::call(
-			Origin::signed(ALICE),
-			addr.clone(),
-			0,
-			GAS_LIMIT,
-			vec![],
-		));
+			Storage::<Test>::write(System::block_number(), &mut info, &val.0, Some(val.2.clone()))
+				.unwrap();
+		}
+		<ContractInfoOf<Test>>::insert(&addr, ContractInfo::Alive(info.clone()));
+
+		// Terminate the contract
+		assert_ok!(Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, vec![],));
 
 		// Contract info should be gone
 		assert!(!<ContractInfoOf::<Test>>::contains_key(&addr));
@@ -2449,46 +2260,33 @@ fn lazy_removal_does_no_run_on_full_block() {
 		let subsistence = Pallet::<Test>::subsistence_threshold();
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 
-		assert_ok!(
-			Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				subsistence * 100,
-				GAS_LIMIT,
-				code,
-				vec![],
-				vec![],
-			),
-		);
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			subsistence * 100,
+			GAS_LIMIT,
+			code,
+			vec![],
+			vec![],
+		),);
 
 		let addr = Contracts::contract_address(&ALICE, &hash, &[]);
-		let mut info = <ContractInfoOf::<Test>>::get(&addr).unwrap().get_alive().unwrap();
+		let mut info = <ContractInfoOf<Test>>::get(&addr).unwrap().get_alive().unwrap();
 		let max_keys = 30;
 
 		// Create some storage items for the contract.
-		let vals: Vec<_> = (0..max_keys).map(|i| {
-			(blake2_256(&i.encode()), (i as u32), (i as u32).encode())
-		})
-		.collect();
+		let vals: Vec<_> = (0..max_keys)
+			.map(|i| (blake2_256(&i.encode()), (i as u32), (i as u32).encode()))
+			.collect();
 
 		// Put value into the contracts child trie
 		for val in &vals {
-			Storage::<Test>::write(
-				System::block_number(),
-				&mut info,
-				&val.0,
-				Some(val.2.clone()),
-			).unwrap();
+			Storage::<Test>::write(System::block_number(), &mut info, &val.0, Some(val.2.clone()))
+				.unwrap();
 		}
 		<ContractInfoOf<Test>>::insert(&addr, ContractInfo::Alive(info.clone()));
 
 		// Terminate the contract
-		assert_ok!(Contracts::call(
-			Origin::signed(ALICE),
-			addr.clone(),
-			0,
-			GAS_LIMIT,
-			vec![],
-		));
+		assert_ok!(Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, vec![],));
 
 		// Contract info should be gone
 		assert!(!<ContractInfoOf::<Test>>::contains_key(&addr));
@@ -2527,7 +2325,6 @@ fn lazy_removal_does_no_run_on_full_block() {
 	});
 }
 
-
 #[test]
 fn lazy_removal_does_not_use_all_weight() {
 	let (code, hash) = compile_module::<Test>("self_destruct").unwrap();
@@ -2535,47 +2332,34 @@ fn lazy_removal_does_not_use_all_weight() {
 		let subsistence = Pallet::<Test>::subsistence_threshold();
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 
-		assert_ok!(
-			Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				subsistence * 100,
-				GAS_LIMIT,
-				code,
-				vec![],
-				vec![],
-			),
-		);
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			subsistence * 100,
+			GAS_LIMIT,
+			code,
+			vec![],
+			vec![],
+		),);
 
 		let addr = Contracts::contract_address(&ALICE, &hash, &[]);
-		let mut info = <ContractInfoOf::<Test>>::get(&addr).unwrap().get_alive().unwrap();
+		let mut info = <ContractInfoOf<Test>>::get(&addr).unwrap().get_alive().unwrap();
 		let weight_limit = 5_000_000_000;
 		let (weight_per_key, max_keys) = Storage::<Test>::deletion_budget(1, weight_limit);
 
 		// We create a contract with one less storage item than we can remove within the limit
-		let vals: Vec<_> = (0..max_keys - 1).map(|i| {
-			(blake2_256(&i.encode()), (i as u32), (i as u32).encode())
-		})
-		.collect();
+		let vals: Vec<_> = (0..max_keys - 1)
+			.map(|i| (blake2_256(&i.encode()), (i as u32), (i as u32).encode()))
+			.collect();
 
 		// Put value into the contracts child trie
 		for val in &vals {
-			Storage::<Test>::write(
-				System::block_number(),
-				&mut info,
-				&val.0,
-				Some(val.2.clone()),
-			).unwrap();
+			Storage::<Test>::write(System::block_number(), &mut info, &val.0, Some(val.2.clone()))
+				.unwrap();
 		}
 		<ContractInfoOf<Test>>::insert(&addr, ContractInfo::Alive(info.clone()));
 
 		// Terminate the contract
-		assert_ok!(Contracts::call(
-			Origin::signed(ALICE),
-			addr.clone(),
-			0,
-			GAS_LIMIT,
-			vec![],
-		));
+		assert_ok!(Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, vec![],));
 
 		// Contract info should be gone
 		assert!(!<ContractInfoOf::<Test>>::contains_key(&addr));
@@ -2607,16 +2391,14 @@ fn deletion_queue_full() {
 		let subsistence = Pallet::<Test>::subsistence_threshold();
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 
-		assert_ok!(
-			Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				subsistence * 100,
-				GAS_LIMIT,
-				code,
-				vec![],
-				vec![],
-			),
-		);
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			subsistence * 100,
+			GAS_LIMIT,
+			code,
+			vec![],
+			vec![],
+		),);
 
 		let addr = Contracts::contract_address(&ALICE, &hash, &[]);
 
@@ -2625,18 +2407,12 @@ fn deletion_queue_full() {
 
 		// Terminate the contract should fail
 		assert_err_ignore_postinfo!(
-			Contracts::call(
-				Origin::signed(ALICE),
-				addr.clone(),
-				0,
-				GAS_LIMIT,
-				vec![],
-			),
+			Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, vec![],),
 			Error::<Test>::DeletionQueueFull,
 		);
 
 		// Contract should be alive because removal failed
-		<ContractInfoOf::<Test>>::get(&addr).unwrap().get_alive().unwrap();
+		<ContractInfoOf<Test>>::get(&addr).unwrap().get_alive().unwrap();
 
 		// make the contract ripe for eviction
 		initialize_block(5);
@@ -2648,7 +2424,7 @@ fn deletion_queue_full() {
 		);
 
 		// Contract should be alive because removal failed
-		<ContractInfoOf::<Test>>::get(&addr).unwrap().get_alive().unwrap();
+		<ContractInfoOf<Test>>::get(&addr).unwrap().get_alive().unwrap();
 	});
 }
 
@@ -2672,8 +2448,7 @@ fn not_deployed_if_endowment_too_low_for_first_rent() {
 				30_000,
 				GAS_LIMIT,
 				wasm,
-				(BalanceOf::<Test>::from(first_rent) - BalanceOf::<Test>::from(1u32))
-					.encode(), // rent allowance
+				(BalanceOf::<Test>::from(first_rent) - BalanceOf::<Test>::from(1u32)).encode(), /* rent allowance */
 				vec![],
 			),
 			Error::<Test>::NewContractNotFunded,
@@ -2697,7 +2472,7 @@ fn surcharge_reward_is_capped() {
 			vec![],
 		));
 		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
-		let contract = <ContractInfoOf::<Test>>::get(&addr).unwrap().get_alive().unwrap();
+		let contract = <ContractInfoOf<Test>>::get(&addr).unwrap().get_alive().unwrap();
 		let balance = Balances::free_balance(&ALICE);
 		let reward = <Test as Config>::SurchargeReward::get();
 
@@ -2768,13 +2543,7 @@ fn refcounter() {
 		let addr2 = Contracts::contract_address(&ALICE, &code_hash, &[2]);
 
 		// Terminating one contract should decrement the refcount
-		assert_ok!(Contracts::call(
-			Origin::signed(ALICE),
-			addr0,
-			0,
-			GAS_LIMIT,
-			vec![],
-		));
+		assert_ok!(Contracts::call(Origin::signed(ALICE), addr0, 0, GAS_LIMIT, vec![],));
 		assert_refcount!(code_hash, 2);
 
 		// make remaining contracts eligible for eviction
@@ -2819,24 +2588,10 @@ fn reinstrument_does_charge() {
 
 		// Call the contract two times without reinstrument
 
-		let result0 = Contracts::bare_call(
-			ALICE,
-			addr.clone(),
-			0,
-			GAS_LIMIT,
-			zero.clone(),
-			false,
-		);
+		let result0 = Contracts::bare_call(ALICE, addr.clone(), 0, GAS_LIMIT, zero.clone(), false);
 		assert!(result0.result.unwrap().is_success());
 
-		let result1 = Contracts::bare_call(
-			ALICE,
-			addr.clone(),
-			0,
-			GAS_LIMIT,
-			zero.clone(),
-			false,
-		);
+		let result1 = Contracts::bare_call(ALICE, addr.clone(), 0, GAS_LIMIT, zero.clone(), false);
 		assert!(result1.result.unwrap().is_success());
 
 		// They should match because both where called with the same schedule.
@@ -2849,14 +2604,7 @@ fn reinstrument_does_charge() {
 		});
 
 		// This call should trigger reinstrumentation
-		let result2 = Contracts::bare_call(
-			ALICE,
-			addr.clone(),
-			0,
-			GAS_LIMIT,
-			zero.clone(),
-			false,
-		);
+		let result2 = Contracts::bare_call(ALICE, addr.clone(), 0, GAS_LIMIT, zero.clone(), false);
 		assert!(result2.result.unwrap().is_success());
 		assert!(result2.gas_consumed > result1.gas_consumed);
 		assert_eq!(
@@ -2873,25 +2621,16 @@ fn debug_message_works() {
 
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
 		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-		assert_ok!(
-			Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				30_000,
-				GAS_LIMIT,
-				wasm,
-				vec![],
-				vec![],
-			),
-		);
-		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
-		let result = Contracts::bare_call(
-			ALICE,
-			addr,
-			0,
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			30_000,
 			GAS_LIMIT,
+			wasm,
 			vec![],
-			true,
-		);
+			vec![],
+		),);
+		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+		let result = Contracts::bare_call(ALICE, addr, 0, GAS_LIMIT, vec![], true);
 
 		assert_matches!(result.result, Ok(_));
 		assert_eq!(std::str::from_utf8(&result.debug_message).unwrap(), "Hello World!");
@@ -2905,35 +2644,20 @@ fn debug_message_logging_disabled() {
 
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
 		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-		assert_ok!(
-			Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				30_000,
-				GAS_LIMIT,
-				wasm,
-				vec![],
-				vec![],
-			),
-		);
-		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
-		// disable logging by passing `false`
-		let result = Contracts::bare_call(
-			ALICE,
-			addr.clone(),
-			0,
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			30_000,
 			GAS_LIMIT,
+			wasm,
 			vec![],
-			false,
-		);
+			vec![],
+		),);
+		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+		// disable logging by passing `false`
+		let result = Contracts::bare_call(ALICE, addr.clone(), 0, GAS_LIMIT, vec![], false);
 		assert_matches!(result.result, Ok(_));
 		// the dispatchables always run without debugging
-		assert_ok!(Contracts::call(
-			Origin::signed(ALICE),
-			addr,
-			0,
-			GAS_LIMIT,
-			vec![],
-		));
+		assert_ok!(Contracts::call(Origin::signed(ALICE), addr, 0, GAS_LIMIT, vec![],));
 		assert!(result.debug_message.is_empty());
 	});
 }
@@ -2945,25 +2669,16 @@ fn debug_message_invalid_utf8() {
 
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
 		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-		assert_ok!(
-			Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				30_000,
-				GAS_LIMIT,
-				wasm,
-				vec![],
-				vec![],
-			),
-		);
-		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
-		let result = Contracts::bare_call(
-			ALICE,
-			addr,
-			0,
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			30_000,
 			GAS_LIMIT,
+			wasm,
 			vec![],
-			true,
-		);
+			vec![],
+		),);
+		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+		let result = Contracts::bare_call(ALICE, addr, 0, GAS_LIMIT, vec![], true);
 		assert_err!(result.result, <Error<Test>>::DebugMessageInvalidUTF8);
 	});
 }
@@ -2977,28 +2692,24 @@ fn gas_estimation_nested_call_fixed_limit() {
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 		let _ = Balances::deposit_creating(&CHARLIE, 1000 * subsistence);
 
-		assert_ok!(
-			Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				subsistence * 100,
-				GAS_LIMIT,
-				caller_code,
-				vec![],
-				vec![0],
-			),
-		);
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			subsistence * 100,
+			GAS_LIMIT,
+			caller_code,
+			vec![],
+			vec![0],
+		),);
 		let addr_caller = Contracts::contract_address(&ALICE, &caller_hash, &[0]);
 
-		assert_ok!(
-			Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				subsistence * 100,
-				GAS_LIMIT,
-				callee_code,
-				vec![],
-				vec![1],
-			),
-		);
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			subsistence * 100,
+			GAS_LIMIT,
+			callee_code,
+			vec![],
+			vec![1],
+		),);
 		let addr_callee = Contracts::contract_address(&ALICE, &callee_hash, &[1]);
 
 		let input: Vec<u8> = AsRef::<[u8]>::as_ref(&addr_callee)
@@ -3008,27 +2719,16 @@ fn gas_estimation_nested_call_fixed_limit() {
 			.collect();
 
 		// Call in order to determine the gas that is required for this call
-		let result = Contracts::bare_call(
-			ALICE,
-			addr_caller.clone(),
-			0,
-			GAS_LIMIT,
-			input.clone(),
-			false,
-		);
+		let result =
+			Contracts::bare_call(ALICE, addr_caller.clone(), 0, GAS_LIMIT, input.clone(), false);
 		assert_ok!(&result.result);
 
 		assert!(result.gas_required > result.gas_consumed);
 
 		// Make the same call using the estimated gas. Should succeed.
-		assert_ok!(Contracts::bare_call(
-			ALICE,
-			addr_caller,
-			0,
-			result.gas_required,
-			input,
-			false,
-		).result);
+		assert_ok!(
+			Contracts::bare_call(ALICE, addr_caller, 0, result.gas_required, input, false,).result
+		);
 	});
 }
 
@@ -3042,53 +2742,39 @@ fn gas_estimation_call_runtime() {
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 		let _ = Balances::deposit_creating(&CHARLIE, 1000 * subsistence);
 
-		assert_ok!(
-			Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				subsistence * 100,
-				GAS_LIMIT,
-				caller_code,
-				vec![],
-				vec![0],
-			),
-		);
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			subsistence * 100,
+			GAS_LIMIT,
+			caller_code,
+			vec![],
+			vec![0],
+		),);
 		let addr_caller = Contracts::contract_address(&ALICE, &caller_hash, &[0]);
 
-		assert_ok!(
-			Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				subsistence * 100,
-				GAS_LIMIT,
-				callee_code,
-				vec![],
-				vec![1],
-			),
-		);
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			subsistence * 100,
+			GAS_LIMIT,
+			callee_code,
+			vec![],
+			vec![1],
+		),);
 		let addr_callee = Contracts::contract_address(&ALICE, &callee_hash, &[1]);
 
 		// Call something trivial with a huge gas limit so that we can observe the effects
 		// of pre-charging. This should create a difference between consumed and required.
 		let call = Call::Contracts(crate::Call::call(addr_callee, 0, GAS_LIMIT / 3, vec![]));
-		let result = Contracts::bare_call(
-			ALICE,
-			addr_caller.clone(),
-			0,
-			GAS_LIMIT,
-			call.encode(),
-			false,
-		);
+		let result =
+			Contracts::bare_call(ALICE, addr_caller.clone(), 0, GAS_LIMIT, call.encode(), false);
 		assert_ok!(&result.result);
 
 		assert!(result.gas_required > result.gas_consumed);
 
 		// Make the same call using the required gas. Should succeed.
-		assert_ok!(Contracts::bare_call(
-			ALICE,
-			addr_caller,
-			0,
-			result.gas_required,
-			call.encode(),
-			false,
-		).result);
+		assert_ok!(
+			Contracts::bare_call(ALICE, addr_caller, 0, result.gas_required, call.encode(), false,)
+				.result
+		);
 	});
 }
diff --git a/frame/contracts/src/wasm/code_cache.rs b/frame/contracts/src/wasm/code_cache.rs
index a2aa2b55e165..06329a7e81ad 100644
--- a/frame/contracts/src/wasm/code_cache.rs
+++ b/frame/contracts/src/wasm/code_cache.rs
@@ -27,16 +27,17 @@
 //! this guarantees that every instrumented contract code in cache cannot have the version equal to the current one.
 //! Thus, before executing a contract it should be reinstrument with new schedule.
 
+#[cfg(feature = "runtime-benchmarks")]
+pub use self::private::reinstrument;
 use crate::{
-	CodeHash, CodeStorage, PristineCode, Schedule, Config, Error, Weight,
-	wasm::{prepare, PrefabWasmModule}, Pallet as Contracts, Event,
 	gas::{GasMeter, Token},
+	wasm::{prepare, PrefabWasmModule},
 	weights::WeightInfo,
+	CodeHash, CodeStorage, Config, Error, Event, Pallet as Contracts, PristineCode, Schedule,
+	Weight,
 };
-use sp_core::crypto::UncheckedFrom;
 use frame_support::dispatch::DispatchError;
-#[cfg(feature = "runtime-benchmarks")]
-pub use self::private::reinstrument as reinstrument;
+use sp_core::crypto::UncheckedFrom;
 
 /// Put the instrumented module in storage.
 ///
@@ -44,7 +45,7 @@ pub use self::private::reinstrument as reinstrument;
 /// under the specified `code_hash`.
 pub fn store<T: Config>(mut prefab_module: PrefabWasmModule<T>)
 where
-	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
 	let code_hash = sp_std::mem::take(&mut prefab_module.code_hash);
 
@@ -53,14 +54,12 @@ where
 	if let Some(code) = prefab_module.original_code.take() {
 		<PristineCode<T>>::insert(&code_hash, code);
 	}
-	<CodeStorage<T>>::mutate(&code_hash, |existing| {
-		match existing {
-			Some(module) => increment_64(&mut module.refcount),
-			None => {
-				*existing = Some(prefab_module);
-				Contracts::<T>::deposit_event(Event::CodeStored(code_hash))
-			}
-		}
+	<CodeStorage<T>>::mutate(&code_hash, |existing| match existing {
+		Some(module) => increment_64(&mut module.refcount),
+		None => {
+			*existing = Some(prefab_module);
+			Contracts::<T>::deposit_event(Event::CodeStored(code_hash))
+		},
 	});
 }
 
@@ -69,7 +68,7 @@ where
 /// Removes the code instead of storing it when the refcount drops to zero.
 pub fn store_decremented<T: Config>(mut prefab_module: PrefabWasmModule<T>)
 where
-	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
 	prefab_module.refcount = prefab_module.refcount.saturating_sub(1);
 	if prefab_module.refcount > 0 {
@@ -81,10 +80,12 @@ where
 }
 
 /// Increment the refcount of a code in-storage by one.
-pub fn increment_refcount<T: Config>(code_hash: CodeHash<T>, gas_meter: &mut GasMeter<T>)
-	-> Result<(), DispatchError>
+pub fn increment_refcount<T: Config>(
+	code_hash: CodeHash<T>,
+	gas_meter: &mut GasMeter<T>,
+) -> Result<(), DispatchError>
 where
-	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
 	gas_meter.charge(CodeToken::UpdateRefcount(estimate_code_size::<T>(&code_hash)?))?;
 	<CodeStorage<T>>::mutate(code_hash, |existing| {
@@ -98,10 +99,12 @@ where
 }
 
 /// Decrement the refcount of a code in-storage by one and remove the code when it drops to zero.
-pub fn decrement_refcount<T: Config>(code_hash: CodeHash<T>, gas_meter: &mut GasMeter<T>)
-	-> Result<(), DispatchError>
+pub fn decrement_refcount<T: Config>(
+	code_hash: CodeHash<T>,
+	gas_meter: &mut GasMeter<T>,
+) -> Result<(), DispatchError>
 where
-	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
 	if let Ok(len) = estimate_code_size::<T>(&code_hash) {
 		gas_meter.charge(CodeToken::UpdateRefcount(len))?;
@@ -133,7 +136,7 @@ pub fn load<T: Config>(
 	mut reinstrument: Option<(&Schedule<T>, &mut GasMeter<T>)>,
 ) -> Result<PrefabWasmModule<T>, DispatchError>
 where
-	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
 	// The reinstrument case coincides with the cases where we need to charge extra
 	// based upon the code size: On-chain execution.
@@ -141,8 +144,8 @@ where
 		gas_meter.charge(CodeToken::Load(estimate_code_size::<T>(&code_hash)?))?;
 	}
 
-	let mut prefab_module = <CodeStorage<T>>::get(code_hash)
-		.ok_or_else(|| Error::<T>::CodeNotFound)?;
+	let mut prefab_module =
+		<CodeStorage<T>>::get(code_hash).ok_or_else(|| Error::<T>::CodeNotFound)?;
 	prefab_module.code_hash = code_hash;
 
 	if let Some((schedule, gas_meter)) = reinstrument {
@@ -165,7 +168,7 @@ mod private {
 		schedule: &Schedule<T>,
 	) -> Result<(), DispatchError>
 	where
-		T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
+		T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 	{
 		let original_code = <PristineCode<T>>::get(&prefab_module.code_hash)
 			.ok_or_else(|| Error::<T>::CodeNotFound)?;
@@ -179,7 +182,7 @@ mod private {
 /// Finish removal of a code by deleting the pristine code and emitting an event.
 fn finish_removal<T: Config>(code_hash: CodeHash<T>)
 where
-	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
 	<PristineCode<T>>::remove(code_hash);
 	Contracts::<T>::deposit_event(Event::CodeRemoved(code_hash))
@@ -190,13 +193,15 @@ where
 /// We try hard to be infallible here because otherwise more storage transactions would be
 /// necessary to account for failures in storing code for an already instantiated contract.
 fn increment_64(refcount: &mut u64) {
-	*refcount = refcount.checked_add(1).expect("
+	*refcount = refcount.checked_add(1).expect(
+		"
 		refcount is 64bit. Generating this overflow would require to store
 		_at least_ 18 exabyte of data assuming that a contract consumes only
 		one byte of data. Any node would run out of storage space before hitting
 		this overflow.
 		qed
-	");
+	",
+	);
 }
 
 /// Get the size of the instrumented code stored at `code_hash` without loading it.
@@ -206,7 +211,7 @@ fn increment_64(refcount: &mut u64) {
 /// compared to the code size. Additionally, charging too much weight is completely safe.
 fn estimate_code_size<T: Config>(code_hash: &CodeHash<T>) -> Result<u32, DispatchError>
 where
-	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
 	let key = <CodeStorage<T>>::hashed_key_for(code_hash);
 	let mut data = [0u8; 0];
@@ -229,7 +234,7 @@ enum CodeToken {
 impl<T> Token<T> for CodeToken
 where
 	T: Config,
-	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
 	fn weight(&self) -> Weight {
 		use self::CodeToken::*;
@@ -240,9 +245,10 @@ where
 		// the contract.
 		match *self {
 			Instrument(len) => T::WeightInfo::instrument(len / 1024),
-			Load(len) => T::WeightInfo::code_load(len / 1024).saturating_sub(T::WeightInfo::code_load(0)),
-			UpdateRefcount(len) =>
-				T::WeightInfo::code_refcount(len / 1024).saturating_sub(T::WeightInfo::code_refcount(0)),
+			Load(len) =>
+				T::WeightInfo::code_load(len / 1024).saturating_sub(T::WeightInfo::code_load(0)),
+			UpdateRefcount(len) => T::WeightInfo::code_refcount(len / 1024)
+				.saturating_sub(T::WeightInfo::code_refcount(0)),
 		}
 	}
 }
diff --git a/frame/contracts/src/wasm/env_def/macros.rs b/frame/contracts/src/wasm/env_def/macros.rs
index b7358f6aa234..8d316794c639 100644
--- a/frame/contracts/src/wasm/env_def/macros.rs
+++ b/frame/contracts/src/wasm/env_def/macros.rs
@@ -255,14 +255,14 @@ macro_rules! define_env {
 
 #[cfg(test)]
 mod tests {
-	use pwasm_utils::parity_wasm::elements::{FunctionType, ValueType};
-	use sp_runtime::traits::Zero;
-	use sp_sandbox::{ReturnValue, Value};
 	use crate::{
-		Weight,
-		wasm::{Runtime, runtime::TrapReason, tests::MockExt},
 		exec::Ext,
+		wasm::{runtime::TrapReason, tests::MockExt, Runtime},
+		Weight,
 	};
+	use pwasm_utils::parity_wasm::elements::{FunctionType, ValueType};
+	use sp_runtime::traits::Zero;
+	use sp_sandbox::{ReturnValue, Value};
 
 	struct TestRuntime {
 		value: u32,
@@ -333,16 +333,15 @@ mod tests {
 				Err(TrapReason::Termination)
 			}
 		});
-		let _f: fn(&mut Runtime<MockExt>, &[sp_sandbox::Value])
-			-> Result<sp_sandbox::ReturnValue, sp_sandbox::HostError> = seal_gas::<MockExt>;
+		let _f: fn(
+			&mut Runtime<MockExt>,
+			&[sp_sandbox::Value],
+		) -> Result<sp_sandbox::ReturnValue, sp_sandbox::HostError> = seal_gas::<MockExt>;
 	}
 
 	#[test]
 	fn macro_gen_signature() {
-		assert_eq!(
-			gen_signature!((i32)),
-			FunctionType::new(vec![ValueType::I32], vec![]),
-		);
+		assert_eq!(gen_signature!((i32)), FunctionType::new(vec![ValueType::I32], vec![]),);
 
 		assert_eq!(
 			gen_signature!( (i32, u32) -> u32 ),
@@ -387,11 +386,11 @@ mod tests {
 			},
 		);
 
-		assert!(
-			Env::can_satisfy(b"seal0", b"seal_gas",&FunctionType::new(vec![ValueType::I32], vec![]))
-		);
-		assert!(
-			!Env::can_satisfy(b"seal0", b"not_exists", &FunctionType::new(vec![], vec![]))
-		);
+		assert!(Env::can_satisfy(
+			b"seal0",
+			b"seal_gas",
+			&FunctionType::new(vec![ValueType::I32], vec![])
+		));
+		assert!(!Env::can_satisfy(b"seal0", b"not_exists", &FunctionType::new(vec![], vec![])));
 	}
 }
diff --git a/frame/contracts/src/wasm/env_def/mod.rs b/frame/contracts/src/wasm/env_def/mod.rs
index 5855befd34cb..6a55677f69a0 100644
--- a/frame/contracts/src/wasm/env_def/mod.rs
+++ b/frame/contracts/src/wasm/env_def/mod.rs
@@ -18,8 +18,8 @@
 use super::Runtime;
 use crate::exec::Ext;
 
-use sp_sandbox::Value;
 use pwasm_utils::parity_wasm::elements::{FunctionType, ValueType};
+use sp_sandbox::Value;
 
 #[macro_use]
 pub mod macros;
@@ -67,11 +67,10 @@ impl ConvertibleToWasm for u64 {
 	}
 }
 
-pub type HostFunc<E> =
-	fn(
-		&mut Runtime<E>,
-		&[sp_sandbox::Value]
-	) -> Result<sp_sandbox::ReturnValue, sp_sandbox::HostError>;
+pub type HostFunc<E> = fn(
+	&mut Runtime<E>,
+	&[sp_sandbox::Value],
+) -> Result<sp_sandbox::ReturnValue, sp_sandbox::HostError>;
 
 pub trait FunctionImplProvider<E: Ext> {
 	fn impls<F: FnMut(&[u8], &[u8], HostFunc<E>)>(f: &mut F);
diff --git a/frame/contracts/src/wasm/mod.rs b/frame/contracts/src/wasm/mod.rs
index ef45f35d0dae..8ef11c8f4c87 100644
--- a/frame/contracts/src/wasm/mod.rs
+++ b/frame/contracts/src/wasm/mod.rs
@@ -24,19 +24,19 @@ mod code_cache;
 mod prepare;
 mod runtime;
 
+#[cfg(feature = "runtime-benchmarks")]
+pub use self::code_cache::reinstrument;
+pub use self::runtime::{ReturnCode, Runtime, RuntimeCosts};
 use crate::{
-	CodeHash, Schedule, Config,
-	wasm::env_def::FunctionImplProvider,
-	exec::{Ext, Executable, ExportedFunction, ExecResult},
+	exec::{ExecResult, Executable, ExportedFunction, Ext},
 	gas::GasMeter,
+	wasm::env_def::FunctionImplProvider,
+	CodeHash, Config, Schedule,
 };
-use sp_std::prelude::*;
-use sp_core::crypto::UncheckedFrom;
-use codec::{Encode, Decode};
+use codec::{Decode, Encode};
 use frame_support::dispatch::DispatchError;
-pub use self::runtime::{ReturnCode, Runtime, RuntimeCosts};
-#[cfg(feature = "runtime-benchmarks")]
-pub use self::code_cache::reinstrument;
+use sp_core::crypto::UncheckedFrom;
+use sp_std::prelude::*;
 #[cfg(test)]
 pub use tests::MockExt;
 
@@ -108,12 +108,12 @@ impl ExportedFunction {
 
 impl<T: Config> PrefabWasmModule<T>
 where
-	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
 	/// Create the module by checking and instrumenting `original_code`.
 	pub fn from_code(
 		original_code: Vec<u8>,
-		schedule: &Schedule<T>
+		schedule: &Schedule<T>,
 	) -> Result<Self, DispatchError> {
 		prepare::prepare_contract(original_code, schedule).map_err(Into::into)
 	}
@@ -127,7 +127,7 @@ where
 	#[cfg(feature = "runtime-benchmarks")]
 	pub fn store_code_unchecked(
 		original_code: Vec<u8>,
-		schedule: &Schedule<T>
+		schedule: &Schedule<T>,
 	) -> Result<(), DispatchError> {
 		let executable = prepare::benchmarking::prepare_contract(original_code, schedule)
 			.map_err::<DispatchError, _>(Into::into)?;
@@ -150,7 +150,7 @@ where
 
 impl<T: Config> Executable<T> for PrefabWasmModule<T>
 where
-	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
 	fn from_storage(
 		code_hash: CodeHash<T>,
@@ -168,15 +168,14 @@ where
 		code_cache::store_decremented(self);
 	}
 
-	fn add_user(code_hash: CodeHash<T>, gas_meter: &mut GasMeter<T>)
-		-> Result<(), DispatchError>
-	{
+	fn add_user(code_hash: CodeHash<T>, gas_meter: &mut GasMeter<T>) -> Result<(), DispatchError> {
 		code_cache::increment_refcount::<T>(code_hash, gas_meter)
 	}
 
-	fn remove_user(code_hash: CodeHash<T>, gas_meter: &mut GasMeter<T>)
-		-> Result<(), DispatchError>
-	{
+	fn remove_user(
+		code_hash: CodeHash<T>,
+		gas_meter: &mut GasMeter<T>,
+	) -> Result<(), DispatchError> {
 		code_cache::decrement_refcount::<T>(code_hash, gas_meter)
 	}
 
@@ -187,16 +186,15 @@ where
 		input_data: Vec<u8>,
 	) -> ExecResult {
 		let memory =
-			sp_sandbox::Memory::new(self.initial, Some(self.maximum))
-				.unwrap_or_else(|_| {
+			sp_sandbox::Memory::new(self.initial, Some(self.maximum)).unwrap_or_else(|_| {
 				// unlike `.expect`, explicit panic preserves the source location.
 				// Needed as we can't use `RUST_BACKTRACE` in here.
-					panic!(
-						"exec.prefab_module.initial can't be greater than exec.prefab_module.maximum;
+				panic!(
+					"exec.prefab_module.initial can't be greater than exec.prefab_module.maximum;
 						thus Memory::new must not fail;
 						qed"
-					)
-				});
+				)
+			});
 
 		let mut imports = sp_sandbox::EnvironmentDefinitionBuilder::new();
 		imports.add_memory(self::prepare::IMPORT_MODULE_MEMORY, "memory", memory.clone());
@@ -204,11 +202,7 @@ where
 			imports.add_host_func(module, name, func_ptr);
 		});
 
-		let mut runtime = Runtime::new(
-			ext,
-			input_data,
-			memory,
-		);
+		let mut runtime = Runtime::new(ext, input_data, memory);
 
 		// We store before executing so that the code hash is available in the constructor.
 		let code = self.code.clone();
@@ -245,31 +239,27 @@ where
 mod tests {
 	use super::*;
 	use crate::{
-		CodeHash, BalanceOf, Error, Pallet as Contracts,
 		exec::{
-			Ext, StorageKey, AccountIdOf, Executable, SeedOf, BlockNumberOf,
-			RentParams, ExecError, ErrorOrigin,
+			AccountIdOf, BlockNumberOf, ErrorOrigin, ExecError, Executable, Ext, RentParams,
+			SeedOf, StorageKey,
 		},
 		gas::GasMeter,
 		rent::RentStatus,
-		tests::{Test, Call, ALICE, BOB},
+		tests::{Call, Test, ALICE, BOB},
+		BalanceOf, CodeHash, Error, Pallet as Contracts,
 	};
-	use std::{
-		borrow::BorrowMut,
-		cell::RefCell,
-		collections::HashMap,
-	};
-	use sp_core::{Bytes, H256};
-	use hex_literal::hex;
-	use sp_runtime::DispatchError;
+	use assert_matches::assert_matches;
 	use frame_support::{
 		assert_ok,
 		dispatch::{DispatchResult, DispatchResultWithPostInfo},
 		weights::Weight,
 	};
-	use assert_matches::assert_matches;
+	use hex_literal::hex;
 	use pallet_contracts_primitives::{ExecReturnValue, ReturnFlags};
 	use pretty_assertions::assert_eq;
+	use sp_core::{Bytes, H256};
+	use sp_runtime::DispatchError;
+	use std::{borrow::BorrowMut, cell::RefCell, collections::HashMap};
 
 	#[derive(Debug, PartialEq, Eq)]
 	struct RestoreEntry {
@@ -360,12 +350,7 @@ mod tests {
 			data: Vec<u8>,
 			allows_reentry: bool,
 		) -> Result<ExecReturnValue, ExecError> {
-			self.calls.push(CallEntry {
-				to,
-				value,
-				data,
-				allows_reentry,
-			});
+			self.calls.push(CallEntry { to, value, data, allows_reentry });
 			Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: call_return_data() })
 		}
 		fn instantiate(
@@ -385,30 +370,15 @@ mod tests {
 			});
 			Ok((
 				Contracts::<Test>::contract_address(&ALICE, &code_hash, salt),
-				ExecReturnValue {
-					flags: ReturnFlags::empty(),
-					data: Bytes(Vec::new()),
-				},
+				ExecReturnValue { flags: ReturnFlags::empty(), data: Bytes(Vec::new()) },
 			))
 		}
-		fn transfer(
-			&mut self,
-			to: &AccountIdOf<Self::T>,
-			value: u64,
-		) -> Result<(), DispatchError> {
-			self.transfers.push(TransferEntry {
-				to: to.clone(),
-				value,
-			});
+		fn transfer(&mut self, to: &AccountIdOf<Self::T>, value: u64) -> Result<(), DispatchError> {
+			self.transfers.push(TransferEntry { to: to.clone(), value });
 			Ok(())
 		}
-		fn terminate(
-			&mut self,
-			beneficiary: &AccountIdOf<Self::T>,
-		) -> Result<(), DispatchError> {
-			self.terminations.push(TerminationEntry {
-				beneficiary: beneficiary.clone(),
-			});
+		fn terminate(&mut self, beneficiary: &AccountIdOf<Self::T>) -> Result<(), DispatchError> {
+			self.terminations.push(TerminationEntry { beneficiary: beneficiary.clone() });
 			Ok(())
 		}
 		fn restore_to(
@@ -418,12 +388,7 @@ mod tests {
 			rent_allowance: u64,
 			delta: Vec<StorageKey>,
 		) -> Result<(), DispatchError> {
-			self.restores.push(RestoreEntry {
-				dest,
-				code_hash,
-				rent_allowance,
-				delta,
-			});
+			self.restores.push(RestoreEntry { dest, code_hash, rent_allowance, delta });
 			Ok(())
 		}
 		fn get_storage(&mut self, key: &StorageKey) -> Option<Vec<u8>> {
@@ -466,8 +431,12 @@ mod tests {
 		fn rent_allowance(&mut self) -> u64 {
 			self.rent_allowance
 		}
-		fn block_number(&self) -> u64 { 121 }
-		fn max_value_size(&self) -> u32 { 16_384 }
+		fn block_number(&self) -> u64 {
+			121
+		}
+		fn max_value_size(&self) -> u32 {
+			16_384
+		}
 		fn get_weight_price(&self, weight: Weight) -> BalanceOf<Self::T> {
 			BalanceOf::<Self::T>::from(1312_u32).saturating_mul(weight.into())
 		}
@@ -493,16 +462,11 @@ mod tests {
 		}
 	}
 
-	fn execute<E: BorrowMut<MockExt>>(
-		wat: &str,
-		input_data: Vec<u8>,
-		mut ext: E,
-	) -> ExecResult
-	{
+	fn execute<E: BorrowMut<MockExt>>(wat: &str, input_data: Vec<u8>, mut ext: E) -> ExecResult {
 		let wasm = wat::parse_str(wat).unwrap();
 		let schedule = crate::Schedule::default();
-		let executable = PrefabWasmModule::<<MockExt as Ext>::T>::from_code(wasm, &schedule)
-			.unwrap();
+		let executable =
+			PrefabWasmModule::<<MockExt as Ext>::T>::from_code(wasm, &schedule).unwrap();
 		executable.execute(ext.borrow_mut(), &ExportedFunction::Call, input_data)
 	}
 
@@ -543,19 +507,9 @@ mod tests {
 	#[test]
 	fn contract_transfer() {
 		let mut mock_ext = MockExt::default();
-		assert_ok!(execute(
-			CODE_TRANSFER,
-			vec![],
-			&mut mock_ext,
-		));
+		assert_ok!(execute(CODE_TRANSFER, vec![], &mut mock_ext,));
 
-		assert_eq!(
-			&mock_ext.transfers,
-			&[TransferEntry {
-				to: ALICE,
-				value: 153,
-			}]
-		);
+		assert_eq!(&mock_ext.transfers, &[TransferEntry { to: ALICE, value: 153 }]);
 	}
 
 	const CODE_CALL: &str = r#"
@@ -607,20 +561,11 @@ mod tests {
 	#[test]
 	fn contract_call() {
 		let mut mock_ext = MockExt::default();
-		assert_ok!(execute(
-			CODE_CALL,
-			vec![],
-			&mut mock_ext,
-		));
+		assert_ok!(execute(CODE_CALL, vec![], &mut mock_ext,));
 
 		assert_eq!(
 			&mock_ext.calls,
-			&[CallEntry {
-				to: ALICE,
-				value: 6,
-				data: vec![1, 2, 3, 4],
-				allows_reentry: true,
-			}]
+			&[CallEntry { to: ALICE, value: 6, data: vec![1, 2, 3, 4], allows_reentry: true }]
 		);
 	}
 
@@ -675,12 +620,7 @@ mod tests {
 
 		assert_eq!(
 			&mock_ext.calls,
-			&[CallEntry {
-				to: ALICE,
-				value: 0x2a,
-				data: input,
-				allows_reentry: false,
-			}]
+			&[CallEntry { to: ALICE, value: 0x2a, data: input, allows_reentry: false }]
 		);
 	}
 
@@ -736,12 +676,7 @@ mod tests {
 		assert_eq!(result.data.0, input);
 		assert_eq!(
 			&mock_ext.calls,
-			&[CallEntry {
-				to: ALICE,
-				value: 0x2a,
-				data: input,
-				allows_reentry: true,
-			}]
+			&[CallEntry { to: ALICE, value: 0x2a, data: input, allows_reentry: true }]
 		);
 	}
 
@@ -789,12 +724,7 @@ mod tests {
 		assert_eq!(result.data, call_return_data());
 		assert_eq!(
 			&mock_ext.calls,
-			&[CallEntry {
-				to: ALICE,
-				value: 0x2a,
-				data: input,
-				allows_reentry: false,
-			}]
+			&[CallEntry { to: ALICE, value: 0x2a, data: input, allows_reentry: false }]
 		);
 	}
 
@@ -857,11 +787,7 @@ mod tests {
 	#[test]
 	fn contract_instantiate() {
 		let mut mock_ext = MockExt::default();
-		assert_ok!(execute(
-			CODE_INSTANTIATE,
-			vec![],
-			&mut mock_ext,
-		));
+		assert_ok!(execute(CODE_INSTANTIATE, vec![], &mut mock_ext,));
 
 		assert_matches!(
 			&mock_ext.instantiates[..],
@@ -905,18 +831,9 @@ mod tests {
 	#[test]
 	fn contract_terminate() {
 		let mut mock_ext = MockExt::default();
-		execute(
-			CODE_TERMINATE,
-			vec![],
-			&mut mock_ext,
-		).unwrap();
+		execute(CODE_TERMINATE, vec![], &mut mock_ext).unwrap();
 
-		assert_eq!(
-			&mock_ext.terminations,
-			&[TerminationEntry {
-				beneficiary: ALICE,
-			}]
-		);
+		assert_eq!(&mock_ext.terminations, &[TerminationEntry { beneficiary: ALICE }]);
 	}
 
 	const CODE_TRANSFER_LIMITED_GAS: &str = r#"
@@ -967,20 +884,11 @@ mod tests {
 	#[test]
 	fn contract_call_limited_gas() {
 		let mut mock_ext = MockExt::default();
-		assert_ok!(execute(
-			&CODE_TRANSFER_LIMITED_GAS,
-			vec![],
-			&mut mock_ext,
-		));
+		assert_ok!(execute(&CODE_TRANSFER_LIMITED_GAS, vec![], &mut mock_ext,));
 
 		assert_eq!(
 			&mock_ext.calls,
-			&[CallEntry {
-				to: ALICE,
-				value: 6,
-				data: vec![1, 2, 3, 4],
-				allows_reentry: true,
-			}]
+			&[CallEntry { to: ALICE, value: 6, data: vec![1, 2, 3, 4], allows_reentry: true }]
 		);
 	}
 
@@ -1051,20 +959,14 @@ mod tests {
 	#[test]
 	fn get_storage_puts_data_into_buf() {
 		let mut mock_ext = MockExt::default();
-		mock_ext
-			.storage
-			.insert([0x11; 32], [0x22; 32].to_vec());
+		mock_ext.storage.insert([0x11; 32], [0x22; 32].to_vec());
 
-		let output = execute(
-			CODE_GET_STORAGE,
-			vec![],
-			mock_ext,
-		).unwrap();
-
-		assert_eq!(output, ExecReturnValue {
-			flags: ReturnFlags::empty(),
-			data: Bytes([0x22; 32].to_vec())
-		});
+		let output = execute(CODE_GET_STORAGE, vec![], mock_ext).unwrap();
+
+		assert_eq!(
+			output,
+			ExecReturnValue { flags: ReturnFlags::empty(), data: Bytes([0x22; 32].to_vec()) }
+		);
 	}
 
 	/// calls `seal_caller` and compares the result with the constant 42.
@@ -1112,11 +1014,7 @@ mod tests {
 
 	#[test]
 	fn caller() {
-		assert_ok!(execute(
-			CODE_CALLER,
-			vec![],
-			MockExt::default(),
-		));
+		assert_ok!(execute(CODE_CALLER, vec![], MockExt::default(),));
 	}
 
 	/// calls `seal_address` and compares the result with the constant 69.
@@ -1164,11 +1062,7 @@ mod tests {
 
 	#[test]
 	fn address() {
-		assert_ok!(execute(
-			CODE_ADDRESS,
-			vec![],
-			MockExt::default(),
-		));
+		assert_ok!(execute(CODE_ADDRESS, vec![], MockExt::default(),));
 	}
 
 	const CODE_BALANCE: &str = r#"
@@ -1214,11 +1108,7 @@ mod tests {
 
 	#[test]
 	fn balance() {
-		assert_ok!(execute(
-			CODE_BALANCE,
-			vec![],
-			MockExt::default(),
-		));
+		assert_ok!(execute(CODE_BALANCE, vec![], MockExt::default(),));
 	}
 
 	const CODE_GAS_PRICE: &str = r#"
@@ -1264,11 +1154,7 @@ mod tests {
 
 	#[test]
 	fn gas_price() {
-		assert_ok!(execute(
-			CODE_GAS_PRICE,
-			vec![],
-			MockExt::default(),
-		));
+		assert_ok!(execute(CODE_GAS_PRICE, vec![], MockExt::default(),));
 	}
 
 	const CODE_GAS_LEFT: &str = r#"
@@ -1315,11 +1201,7 @@ mod tests {
 		let mut ext = MockExt::default();
 		let gas_limit = ext.gas_meter.gas_left();
 
-		let output = execute(
-			CODE_GAS_LEFT,
-			vec![],
-			&mut ext,
-		).unwrap();
+		let output = execute(CODE_GAS_LEFT, vec![], &mut ext).unwrap();
 
 		let gas_left = Weight::decode(&mut &*output.data).unwrap();
 		let actual_left = ext.gas_meter.gas_left();
@@ -1370,11 +1252,7 @@ mod tests {
 
 	#[test]
 	fn value_transferred() {
-		assert_ok!(execute(
-			CODE_VALUE_TRANSFERRED,
-			vec![],
-			MockExt::default(),
-		));
+		assert_ok!(execute(CODE_VALUE_TRANSFERRED, vec![], MockExt::default(),));
 	}
 
 	const CODE_RETURN_FROM_START_FN: &str = r#"
@@ -1403,18 +1281,11 @@ mod tests {
 
 	#[test]
 	fn return_from_start_fn() {
-		let output = execute(
-			CODE_RETURN_FROM_START_FN,
-			vec![],
-			MockExt::default(),
-		).unwrap();
+		let output = execute(CODE_RETURN_FROM_START_FN, vec![], MockExt::default()).unwrap();
 
 		assert_eq!(
 			output,
-			ExecReturnValue {
-				flags: ReturnFlags::empty(),
-				data: Bytes(vec![1, 2, 3, 4])
-			}
+			ExecReturnValue { flags: ReturnFlags::empty(), data: Bytes(vec![1, 2, 3, 4]) }
 		);
 	}
 
@@ -1461,11 +1332,7 @@ mod tests {
 
 	#[test]
 	fn now() {
-		assert_ok!(execute(
-			CODE_TIMESTAMP_NOW,
-			vec![],
-			MockExt::default(),
-		));
+		assert_ok!(execute(CODE_TIMESTAMP_NOW, vec![], MockExt::default(),));
 	}
 
 	const CODE_MINIMUM_BALANCE: &str = r#"
@@ -1510,11 +1377,7 @@ mod tests {
 
 	#[test]
 	fn minimum_balance() {
-		assert_ok!(execute(
-			CODE_MINIMUM_BALANCE,
-			vec![],
-			MockExt::default(),
-		));
+		assert_ok!(execute(CODE_MINIMUM_BALANCE, vec![], MockExt::default(),));
 	}
 
 	const CODE_TOMBSTONE_DEPOSIT: &str = r#"
@@ -1559,11 +1422,7 @@ mod tests {
 
 	#[test]
 	fn tombstone_deposit() {
-		assert_ok!(execute(
-			CODE_TOMBSTONE_DEPOSIT,
-			vec![],
-			MockExt::default(),
-		));
+		assert_ok!(execute(CODE_TOMBSTONE_DEPOSIT, vec![], MockExt::default(),));
 	}
 
 	const CODE_RANDOM: &str = r#"
@@ -1622,11 +1481,7 @@ mod tests {
 
 	#[test]
 	fn random() {
-		let output = execute(
-			CODE_RANDOM,
-			vec![],
-			MockExt::default(),
-		).unwrap();
+		let output = execute(CODE_RANDOM, vec![], MockExt::default()).unwrap();
 
 		// The mock ext just returns the same data that was passed as the subject.
 		assert_eq!(
@@ -1697,26 +1552,24 @@ mod tests {
 
 	#[test]
 	fn random_v1() {
-		let output = execute(
-			CODE_RANDOM_V1,
-			vec![],
-			MockExt::default(),
-		).unwrap();
+		let output = execute(CODE_RANDOM_V1, vec![], MockExt::default()).unwrap();
 
 		// The mock ext just returns the same data that was passed as the subject.
 		assert_eq!(
 			output,
 			ExecReturnValue {
 				flags: ReturnFlags::empty(),
-				data: Bytes((
+				data: Bytes(
+					(
 						hex!("000102030405060708090A0B0C0D0E0F000102030405060708090A0B0C0D0E0F"),
 						42u64,
-					).encode()),
+					)
+						.encode()
+				),
 			},
 		);
 	}
 
-
 	const CODE_DEPOSIT_EVENT: &str = r#"
 (module
 	(import "seal0" "seal_deposit_event" (func $seal_deposit_event (param i32 i32 i32 i32)))
@@ -1743,16 +1596,15 @@ mod tests {
 	#[test]
 	fn deposit_event() {
 		let mut mock_ext = MockExt::default();
-		assert_ok!(execute(
-			CODE_DEPOSIT_EVENT,
-			vec![],
-			&mut mock_ext,
-		));
+		assert_ok!(execute(CODE_DEPOSIT_EVENT, vec![], &mut mock_ext,));
 
-		assert_eq!(mock_ext.events, vec![
-			(vec![H256::repeat_byte(0x33)],
-			vec![0x00, 0x01, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe5, 0x14, 0x00])
-		]);
+		assert_eq!(
+			mock_ext.events,
+			vec![(
+				vec![H256::repeat_byte(0x33)],
+				vec![0x00, 0x01, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe5, 0x14, 0x00]
+			)]
+		);
 
 		assert!(mock_ext.gas_meter.gas_left() > 0);
 	}
@@ -1788,11 +1640,7 @@ mod tests {
 	#[test]
 	fn deposit_event_max_topics() {
 		assert_eq!(
-			execute(
-				CODE_DEPOSIT_EVENT_MAX_TOPICS,
-				vec![],
-				MockExt::default(),
-			),
+			execute(CODE_DEPOSIT_EVENT_MAX_TOPICS, vec![], MockExt::default(),),
 			Err(ExecError {
 				error: Error::<Test>::TooManyTopics.into(),
 				origin: ErrorOrigin::Caller,
@@ -1830,11 +1678,7 @@ mod tests {
 	#[test]
 	fn deposit_event_duplicates() {
 		assert_eq!(
-			execute(
-				CODE_DEPOSIT_EVENT_DUPLICATES,
-				vec![],
-				MockExt::default(),
-			),
+			execute(CODE_DEPOSIT_EVENT_DUPLICATES, vec![], MockExt::default(),),
 			Err(ExecError {
 				error: Error::<Test>::DuplicateTopics.into(),
 				origin: ErrorOrigin::Caller,
@@ -1887,11 +1731,7 @@ mod tests {
 
 	#[test]
 	fn block_number() {
-		let _ = execute(
-			CODE_BLOCK_NUMBER,
-			vec![],
-			MockExt::default(),
-		).unwrap();
+		let _ = execute(CODE_BLOCK_NUMBER, vec![], MockExt::default()).unwrap();
 	}
 
 	const CODE_RETURN_WITH_DATA: &str = r#"
@@ -1932,27 +1772,32 @@ mod tests {
 			CODE_RETURN_WITH_DATA,
 			hex!("00000000445566778899").to_vec(),
 			MockExt::default(),
-		).unwrap();
+		)
+		.unwrap();
 
-		assert_eq!(output, ExecReturnValue {
-			flags: ReturnFlags::empty(),
-			data: Bytes(hex!("445566778899").to_vec()),
-		});
+		assert_eq!(
+			output,
+			ExecReturnValue {
+				flags: ReturnFlags::empty(),
+				data: Bytes(hex!("445566778899").to_vec()),
+			}
+		);
 		assert!(output.is_success());
 	}
 
 	#[test]
 	fn return_with_revert_status() {
-		let output = execute(
-			CODE_RETURN_WITH_DATA,
-			hex!("010000005566778899").to_vec(),
-			MockExt::default(),
-		).unwrap();
+		let output =
+			execute(CODE_RETURN_WITH_DATA, hex!("010000005566778899").to_vec(), MockExt::default())
+				.unwrap();
 
-		assert_eq!(output, ExecReturnValue {
-			flags: ReturnFlags::REVERT,
-			data: Bytes(hex!("5566778899").to_vec()),
-		});
+		assert_eq!(
+			output,
+			ExecReturnValue {
+				flags: ReturnFlags::REVERT,
+				data: Bytes(hex!("5566778899").to_vec()),
+			}
+		);
 		assert!(!output.is_success());
 	}
 
@@ -1975,11 +1820,7 @@ mod tests {
 	#[test]
 	fn contract_out_of_bounds_access() {
 		let mut mock_ext = MockExt::default();
-		let result = execute(
-			CODE_OUT_OF_BOUNDS_ACCESS,
-			vec![],
-			&mut mock_ext,
-		);
+		let result = execute(CODE_OUT_OF_BOUNDS_ACCESS, vec![], &mut mock_ext);
 
 		assert_eq!(
 			result,
@@ -2009,11 +1850,7 @@ mod tests {
 	#[test]
 	fn contract_decode_length_ignored() {
 		let mut mock_ext = MockExt::default();
-		let result = execute(
-			CODE_DECODE_FAILURE,
-			vec![],
-			&mut mock_ext,
-		);
+		let result = execute(CODE_DECODE_FAILURE, vec![], &mut mock_ext);
 		// AccountID implements `MaxEncodeLen` and therefore the supplied length is
 		// no longer needed nor used to determine how much is read from contract memory.
 		assert_ok!(result);
@@ -2051,17 +1888,11 @@ mod tests {
 	(func (export "deploy"))
 )
 "#;
-		let output = execute(
-			CODE_RENT_PARAMS,
-			vec![],
-			MockExt::default(),
-		).unwrap();
+		let output = execute(CODE_RENT_PARAMS, vec![], MockExt::default()).unwrap();
 		let rent_params = Bytes(<RentParams<Test>>::default().encode());
 		assert_eq!(output, ExecReturnValue { flags: ReturnFlags::empty(), data: rent_params });
 	}
 
-
-
 	#[test]
 	#[cfg(feature = "unstable-interface")]
 	fn rent_status_works() {
@@ -2095,11 +1926,7 @@ mod tests {
 	(func (export "deploy"))
 )
 "#;
-		let output = execute(
-			CODE_RENT_STATUS,
-			vec![],
-			MockExt::default(),
-		).unwrap();
+		let output = execute(CODE_RENT_STATUS, vec![], MockExt::default()).unwrap();
 		let rent_status = Bytes(<RentStatus<Test>>::default().encode());
 		assert_eq!(output, ExecReturnValue { flags: ReturnFlags::empty(), data: rent_status });
 	}
@@ -2126,11 +1953,7 @@ mod tests {
 )
 "#;
 		let mut ext = MockExt::default();
-		execute(
-			CODE_DEBUG_MESSAGE,
-			vec![],
-			&mut ext,
-		).unwrap();
+		execute(CODE_DEBUG_MESSAGE, vec![], &mut ext).unwrap();
 
 		assert_eq!(std::str::from_utf8(&ext.debug_buffer).unwrap(), "Hello World!");
 	}
@@ -2157,11 +1980,7 @@ mod tests {
 )
 "#;
 		let mut ext = MockExt::default();
-		let result = execute(
-			CODE_DEBUG_MESSAGE_FAIL,
-			vec![],
-			&mut ext,
-		);
+		let result = execute(CODE_DEBUG_MESSAGE_FAIL, vec![], &mut ext);
 		assert_eq!(
 			result,
 			Err(ExecError {
@@ -2213,15 +2032,8 @@ mod tests {
 		use std::convert::TryInto;
 		let call = Call::System(frame_system::Call::remark(b"Hello World".to_vec()));
 		let mut ext = MockExt::default();
-		let result = execute(
-			CODE_CALL_RUNTIME,
-			call.encode(),
-			&mut ext,
-		).unwrap();
-		assert_eq!(
-			*ext.runtime_calls.borrow(),
-			vec![call],
-		);
+		let result = execute(CODE_CALL_RUNTIME, call.encode(), &mut ext).unwrap();
+		assert_eq!(*ext.runtime_calls.borrow(), vec![call],);
 		// 0 = ReturnCode::Success
 		assert_eq!(u32::from_le_bytes(result.data.0.try_into().unwrap()), 0);
 	}
@@ -2230,11 +2042,7 @@ mod tests {
 	#[cfg(feature = "unstable-interface")]
 	fn call_runtime_panics_on_invalid_call() {
 		let mut ext = MockExt::default();
-		let result = execute(
-			CODE_CALL_RUNTIME,
-			vec![0x42],
-			&mut ext,
-		);
+		let result = execute(CODE_CALL_RUNTIME, vec![0x42], &mut ext);
 		assert_eq!(
 			result,
 			Err(ExecError {
@@ -2242,9 +2050,6 @@ mod tests {
 				origin: ErrorOrigin::Caller,
 			})
 		);
-		assert_eq!(
-			*ext.runtime_calls.borrow(),
-			vec![],
-		);
+		assert_eq!(*ext.runtime_calls.borrow(), vec![],);
 	}
 }
diff --git a/frame/contracts/src/wasm/prepare.rs b/frame/contracts/src/wasm/prepare.rs
index 2b52d9438904..280dedc39e66 100644
--- a/frame/contracts/src/wasm/prepare.rs
+++ b/frame/contracts/src/wasm/prepare.rs
@@ -20,11 +20,11 @@
 //! from a module.
 
 use crate::{
-	Schedule, Config,
 	chain_extension::ChainExtension,
-	wasm::{PrefabWasmModule, env_def::ImportSatisfyCheck},
+	wasm::{env_def::ImportSatisfyCheck, PrefabWasmModule},
+	Config, Schedule,
 };
-use pwasm_utils::parity_wasm::elements::{self, Internal, External, MemoryType, Type, ValueType};
+use pwasm_utils::parity_wasm::elements::{self, External, Internal, MemoryType, Type, ValueType};
 use sp_runtime::traits::Hash;
 use sp_std::prelude::*;
 
@@ -43,10 +43,7 @@ impl<'a, T: Config> ContractModule<'a, T> {
 	///
 	/// Returns `Err` if the `original_code` couldn't be decoded or
 	/// if it contains an invalid module.
-	fn new(
-		original_code: &[u8],
-		schedule: &'a Schedule<T>,
-	) -> Result<Self, &'static str> {
+	fn new(original_code: &[u8], schedule: &'a Schedule<T>) -> Result<Self, &'static str> {
 		use wasmi_validation::{validate_module, PlainValidator};
 
 		let module =
@@ -57,10 +54,7 @@ impl<'a, T: Config> ContractModule<'a, T> {
 
 		// Return a `ContractModule` instance with
 		// __valid__ module.
-		Ok(ContractModule {
-			module,
-			schedule,
-		})
+		Ok(ContractModule { module, schedule })
 	}
 
 	/// Ensures that module doesn't declare internal memories.
@@ -69,11 +63,8 @@ impl<'a, T: Config> ContractModule<'a, T> {
 	/// Memory section contains declarations of internal linear memories, so if we find one
 	/// we reject such a module.
 	fn ensure_no_internal_memory(&self) -> Result<(), &'static str> {
-		if self.module
-			.memory_section()
-			.map_or(false, |ms| ms.entries().len() > 0)
-		{
-			return Err("module declares internal memory");
+		if self.module.memory_section().map_or(false, |ms| ms.entries().len() > 0) {
+			return Err("module declares internal memory")
 		}
 		Ok(())
 	}
@@ -84,7 +75,7 @@ impl<'a, T: Config> ContractModule<'a, T> {
 			// In Wasm MVP spec, there may be at most one table declared. Double check this
 			// explicitly just in case the Wasm version changes.
 			if table_section.entries().len() > 1 {
-				return Err("multiple tables declared");
+				return Err("multiple tables declared")
 			}
 			if let Some(table_type) = table_section.entries().first() {
 				// Check the table's initial size as there is no instruction or environment function
@@ -102,7 +93,7 @@ impl<'a, T: Config> ContractModule<'a, T> {
 		let code_section = if let Some(type_section) = self.module.code_section() {
 			type_section
 		} else {
-			return Ok(());
+			return Ok(())
 		};
 		for instr in code_section.bodies().iter().flat_map(|body| body.code().elements()) {
 			use self::elements::Instruction::BrTable;
@@ -131,7 +122,7 @@ impl<'a, T: Config> ContractModule<'a, T> {
 				match global.global_type().content_type() {
 					ValueType::F32 | ValueType::F64 =>
 						return Err("use of floating point type in globals is forbidden"),
-					_ => {}
+					_ => {},
 				}
 			}
 		}
@@ -142,7 +133,7 @@ impl<'a, T: Config> ContractModule<'a, T> {
 					match local.value_type() {
 						ValueType::F32 | ValueType::F64 =>
 							return Err("use of floating point type in locals is forbidden"),
-						_ => {}
+						_ => {},
 					}
 				}
 			}
@@ -156,11 +147,13 @@ impl<'a, T: Config> ContractModule<'a, T> {
 						for value_type in func_type.params().iter().chain(return_type) {
 							match value_type {
 								ValueType::F32 | ValueType::F64 =>
-									return Err("use of floating point type in function types is forbidden"),
-								_ => {}
+									return Err(
+										"use of floating point type in function types is forbidden",
+									),
+								_ => {},
 							}
 						}
-					}
+					},
 				}
 			}
 		}
@@ -173,12 +166,12 @@ impl<'a, T: Config> ContractModule<'a, T> {
 		let type_section = if let Some(type_section) = self.module.type_section() {
 			type_section
 		} else {
-			return Ok(());
+			return Ok(())
 		};
 
 		for Type::Function(func) in type_section.types() {
 			if func.params().len() > limit as usize {
-				return Err("Use of a function type with too many parameters.");
+				return Err("Use of a function type with too many parameters.")
 			}
 		}
 
@@ -187,26 +180,18 @@ impl<'a, T: Config> ContractModule<'a, T> {
 
 	fn inject_gas_metering(self) -> Result<Self, &'static str> {
 		let gas_rules = self.schedule.rules(&self.module);
-		let contract_module = pwasm_utils::inject_gas_counter(
-			self.module,
-			&gas_rules,
-			"seal0",
-		).map_err(|_| "gas instrumentation failed")?;
-		Ok(ContractModule {
-			module: contract_module,
-			schedule: self.schedule,
-		})
+		let contract_module = pwasm_utils::inject_gas_counter(self.module, &gas_rules, "seal0")
+			.map_err(|_| "gas instrumentation failed")?;
+		Ok(ContractModule { module: contract_module, schedule: self.schedule })
 	}
 
 	fn inject_stack_height_metering(self) -> Result<Self, &'static str> {
-		let contract_module =
-			pwasm_utils::stack_height
-				::inject_limiter(self.module, self.schedule.limits.stack_height)
-				.map_err(|_| "stack height instrumentation failed")?;
-		Ok(ContractModule {
-			module: contract_module,
-			schedule: self.schedule,
-		})
+		let contract_module = pwasm_utils::stack_height::inject_limiter(
+			self.module,
+			self.schedule.limits.stack_height,
+		)
+		.map_err(|_| "stack height instrumentation failed")?;
+		Ok(ContractModule { module: contract_module, schedule: self.schedule })
 	}
 
 	/// Check that the module has required exported functions. For now
@@ -223,14 +208,8 @@ impl<'a, T: Config> ContractModule<'a, T> {
 		let module = &self.module;
 
 		let types = module.type_section().map(|ts| ts.types()).unwrap_or(&[]);
-		let export_entries = module
-			.export_section()
-			.map(|is| is.entries())
-			.unwrap_or(&[]);
-		let func_entries = module
-			.function_section()
-			.map(|fs| fs.entries())
-			.unwrap_or(&[]);
+		let export_entries = module.export_section().map(|is| is.entries()).unwrap_or(&[]);
+		let func_entries = module.function_section().map(|fs| fs.entries()).unwrap_or(&[]);
 
 		// Function index space consists of imported function following by
 		// declared functions. Calculate the total number of imported functions so
@@ -240,11 +219,9 @@ impl<'a, T: Config> ContractModule<'a, T> {
 			.map(|is| is.entries())
 			.unwrap_or(&[])
 			.iter()
-			.filter(|entry| {
-				match *entry.external() {
-					External::Function(_) => true,
-					_ => false,
-				}
+			.filter(|entry| match *entry.external() {
+				External::Function(_) => true,
+				_ => false,
 			})
 			.count();
 
@@ -267,32 +244,32 @@ impl<'a, T: Config> ContractModule<'a, T> {
 				Some(fn_idx) => fn_idx,
 				None => {
 					// Underflow here means fn_idx points to imported function which we don't allow!
-					return Err("entry point points to an imported function");
-				}
+					return Err("entry point points to an imported function")
+				},
 			};
 
 			// Then check the signature.
 			// Both "call" and "deploy" has a () -> () function type.
 			// We still support () -> (i32) for backwards compatibility.
-			let func_ty_idx = func_entries.get(fn_idx as usize)
+			let func_ty_idx = func_entries
+				.get(fn_idx as usize)
 				.ok_or_else(|| "export refers to non-existent function")?
 				.type_ref();
 			let Type::Function(ref func_ty) = types
 				.get(func_ty_idx as usize)
 				.ok_or_else(|| "function has a non-existent type")?;
-			if !(
-				func_ty.params().is_empty() &&
-				(func_ty.results().is_empty() || func_ty.results() == [ValueType::I32])
-			) {
-				return Err("entry point has wrong signature");
+			if !(func_ty.params().is_empty() &&
+				(func_ty.results().is_empty() || func_ty.results() == [ValueType::I32]))
+			{
+				return Err("entry point has wrong signature")
 			}
 		}
 
 		if !deploy_found {
-			return Err("deploy function isn't exported");
+			return Err("deploy function isn't exported")
 		}
 		if !call_found {
-			return Err("call function isn't exported");
+			return Err("call function isn't exported")
 		}
 
 		Ok(())
@@ -306,16 +283,14 @@ impl<'a, T: Config> ContractModule<'a, T> {
 	///   their signatures.
 	/// - if there is a memory import, returns it's descriptor
 	/// `import_fn_banlist`: list of function names that are disallowed to be imported
-	fn scan_imports<C: ImportSatisfyCheck>(&self, import_fn_banlist: &[&[u8]])
-		-> Result<Option<&MemoryType>, &'static str>
-	{
+	fn scan_imports<C: ImportSatisfyCheck>(
+		&self,
+		import_fn_banlist: &[&[u8]],
+	) -> Result<Option<&MemoryType>, &'static str> {
 		let module = &self.module;
 
 		let types = module.type_section().map(|ts| ts.types()).unwrap_or(&[]);
-		let import_entries = module
-			.import_section()
-			.map(|is| is.entries())
-			.unwrap_or(&[]);
+		let import_entries = module.import_section().map(|is| is.entries()).unwrap_or(&[]);
 
 		let mut imported_mem_type = None;
 
@@ -326,7 +301,7 @@ impl<'a, T: Config> ContractModule<'a, T> {
 				&External::Function(ref type_idx) => type_idx,
 				&External::Memory(ref memory_type) => {
 					if import.module() != IMPORT_MODULE_MEMORY {
-						return Err("Invalid module for imported memory");
+						return Err("Invalid module for imported memory")
 					}
 					if import.field() != "memory" {
 						return Err("Memory import must have the field name 'memory'")
@@ -335,8 +310,8 @@ impl<'a, T: Config> ContractModule<'a, T> {
 						return Err("Multiple memory imports defined")
 					}
 					imported_mem_type = Some(memory_type);
-					continue;
-				}
+					continue
+				},
 			};
 
 			let Type::Function(ref func_ty) = types
@@ -346,48 +321,44 @@ impl<'a, T: Config> ContractModule<'a, T> {
 			if !T::ChainExtension::enabled() &&
 				import.field().as_bytes() == b"seal_call_chain_extension"
 			{
-				return Err("module uses chain extensions but chain extensions are disabled");
+				return Err("module uses chain extensions but chain extensions are disabled")
 			}
 
-			if import_fn_banlist.iter().any(|f| import.field().as_bytes() == *f)
-				|| !C::can_satisfy(
-					import.module().as_bytes(), import.field().as_bytes(), func_ty,
-				)
+			if import_fn_banlist.iter().any(|f| import.field().as_bytes() == *f) ||
+				!C::can_satisfy(import.module().as_bytes(), import.field().as_bytes(), func_ty)
 			{
-				return Err("module imports a non-existent function");
+				return Err("module imports a non-existent function")
 			}
 		}
 		Ok(imported_mem_type)
 	}
 
 	fn into_wasm_code(self) -> Result<Vec<u8>, &'static str> {
-		elements::serialize(self.module)
-			.map_err(|_| "error serializing instrumented module")
+		elements::serialize(self.module).map_err(|_| "error serializing instrumented module")
 	}
 }
 
-fn get_memory_limits<T: Config>(module: Option<&MemoryType>, schedule: &Schedule<T>)
-	-> Result<(u32, u32), &'static str>
-{
+fn get_memory_limits<T: Config>(
+	module: Option<&MemoryType>,
+	schedule: &Schedule<T>,
+) -> Result<(u32, u32), &'static str> {
 	if let Some(memory_type) = module {
 		// Inspect the module to extract the initial and maximum page count.
 		let limits = memory_type.limits();
 		match (limits.initial(), limits.maximum()) {
-			(initial, Some(maximum)) if initial > maximum => {
+			(initial, Some(maximum)) if initial > maximum =>
 				return Err(
 					"Requested initial number of pages should not exceed the requested maximum",
-				);
-			}
-			(_, Some(maximum)) if maximum > schedule.limits.memory_pages => {
-				return Err("Maximum number of pages should not exceed the configured maximum.");
-			}
+				),
+			(_, Some(maximum)) if maximum > schedule.limits.memory_pages =>
+				return Err("Maximum number of pages should not exceed the configured maximum."),
 			(initial, Some(maximum)) => Ok((initial, maximum)),
 			(_, None) => {
 				// Maximum number of pages should be always declared.
 				// This isn't a hard requirement and can be treated as a maximum set
 				// to configured maximum.
-				return Err("Maximum number of pages should be always declared.");
-			}
+				return Err("Maximum number of pages should be always declared.")
+			},
 		}
 	} else {
 		// If none memory imported then just crate an empty placeholder.
@@ -411,10 +382,8 @@ fn check_and_instrument<C: ImportSatisfyCheck, T: Config>(
 
 	// We disallow importing `gas` function here since it is treated as implementation detail.
 	let disallowed_imports = [b"gas".as_ref()];
-	let memory_limits = get_memory_limits(
-		contract_module.scan_imports::<C>(&disallowed_imports)?,
-		schedule
-	)?;
+	let memory_limits =
+		get_memory_limits(contract_module.scan_imports::<C>(&disallowed_imports)?, schedule)?;
 
 	let code = contract_module
 		.inject_gas_metering()?
@@ -428,10 +397,8 @@ fn do_preparation<C: ImportSatisfyCheck, T: Config>(
 	original_code: Vec<u8>,
 	schedule: &Schedule<T>,
 ) -> Result<PrefabWasmModule<T>, &'static str> {
-	let (code, (initial, maximum)) = check_and_instrument::<C, T>(
-		original_code.as_ref(),
-		schedule,
-	)?;
+	let (code, (initial, maximum)) =
+		check_and_instrument::<C, T>(original_code.as_ref(), schedule)?;
 	Ok(PrefabWasmModule {
 		instruction_weights_version: schedule.instruction_weights.version,
 		initial,
@@ -483,8 +450,7 @@ pub fn reinstrument_contract<T: Config>(
 /// in production code.
 #[cfg(feature = "runtime-benchmarks")]
 pub mod benchmarking {
-	use super::*;
-	use super::elements::FunctionType;
+	use super::{elements::FunctionType, *};
 
 	impl ImportSatisfyCheck for () {
 		fn can_satisfy(_module: &[u8], _name: &[u8], _func_type: &FunctionType) -> bool {
@@ -493,9 +459,10 @@ pub mod benchmarking {
 	}
 
 	/// Prepare function that neither checks nor instruments the passed in code.
-	pub fn prepare_contract<T: Config>(original_code: Vec<u8>, schedule: &Schedule<T>)
-		-> Result<PrefabWasmModule<T>, &'static str>
-	{
+	pub fn prepare_contract<T: Config>(
+		original_code: Vec<u8>,
+		schedule: &Schedule<T>,
+	) -> Result<PrefabWasmModule<T>, &'static str> {
 		let contract_module = ContractModule::new(&original_code, schedule)?;
 		let memory_limits = get_memory_limits(contract_module.scan_imports::<()>(&[])?, schedule)?;
 		Ok(PrefabWasmModule {
@@ -566,7 +533,8 @@ mod tests {
 		};
 	}
 
-	prepare_test!(no_floats,
+	prepare_test!(
+		no_floats,
 		r#"
 		(module
 			(func (export "call")
@@ -585,7 +553,8 @@ mod tests {
 	mod functions {
 		use super::*;
 
-		prepare_test!(param_number_valid,
+		prepare_test!(
+			param_number_valid,
 			r#"
 			(module
 				(func (export "call"))
@@ -596,7 +565,8 @@ mod tests {
 			Ok(_)
 		);
 
-		prepare_test!(param_number_invalid,
+		prepare_test!(
+			param_number_invalid,
 			r#"
 			(module
 				(func (export "call"))
@@ -612,7 +582,8 @@ mod tests {
 	mod globals {
 		use super::*;
 
-		prepare_test!(global_number_valid,
+		prepare_test!(
+			global_number_valid,
 			r#"
 			(module
 				(global i64 (i64.const 0))
@@ -625,7 +596,8 @@ mod tests {
 			Ok(_)
 		);
 
-		prepare_test!(global_number_too_high,
+		prepare_test!(
+			global_number_too_high,
 			r#"
 			(module
 				(global i64 (i64.const 0))
@@ -643,7 +615,8 @@ mod tests {
 	mod memories {
 		use super::*;
 
-		prepare_test!(memory_with_one_page,
+		prepare_test!(
+			memory_with_one_page,
 			r#"
 			(module
 				(import "env" "memory" (memory 1 1))
@@ -655,7 +628,8 @@ mod tests {
 			Ok(_)
 		);
 
-		prepare_test!(internal_memory_declaration,
+		prepare_test!(
+			internal_memory_declaration,
 			r#"
 			(module
 				(memory 1 1)
@@ -667,7 +641,8 @@ mod tests {
 			Err("module declares internal memory")
 		);
 
-		prepare_test!(no_memory_import,
+		prepare_test!(
+			no_memory_import,
 			r#"
 			(module
 				;; no memory imported
@@ -678,7 +653,8 @@ mod tests {
 			Ok(_)
 		);
 
-		prepare_test!(initial_exceeds_maximum,
+		prepare_test!(
+			initial_exceeds_maximum,
 			r#"
 			(module
 				(import "env" "memory" (memory 16 1))
@@ -690,7 +666,8 @@ mod tests {
 			Err("Module is not valid")
 		);
 
-		prepare_test!(no_maximum,
+		prepare_test!(
+			no_maximum,
 			r#"
 			(module
 				(import "env" "memory" (memory 1))
@@ -702,7 +679,8 @@ mod tests {
 			Err("Maximum number of pages should be always declared.")
 		);
 
-		prepare_test!(requested_maximum_valid,
+		prepare_test!(
+			requested_maximum_valid,
 			r#"
 			(module
 				(import "env" "memory" (memory 1 16))
@@ -714,7 +692,8 @@ mod tests {
 			Ok(_)
 		);
 
-		prepare_test!(requested_maximum_exceeds_configured_maximum,
+		prepare_test!(
+			requested_maximum_exceeds_configured_maximum,
 			r#"
 			(module
 				(import "env" "memory" (memory 1 17))
@@ -726,7 +705,8 @@ mod tests {
 			Err("Maximum number of pages should not exceed the configured maximum.")
 		);
 
-		prepare_test!(field_name_not_memory,
+		prepare_test!(
+			field_name_not_memory,
 			r#"
 			(module
 				(import "env" "forgetit" (memory 1 1))
@@ -738,7 +718,8 @@ mod tests {
 			Err("Memory import must have the field name 'memory'")
 		);
 
-		prepare_test!(multiple_memory_imports,
+		prepare_test!(
+			multiple_memory_imports,
 			r#"
 			(module
 				(import "env" "memory" (memory 1 1))
@@ -751,7 +732,8 @@ mod tests {
 			Err("Module is not valid")
 		);
 
-		prepare_test!(table_import,
+		prepare_test!(
+			table_import,
 			r#"
 			(module
 				(import "seal0" "table" (table 1 anyfunc))
@@ -763,7 +745,8 @@ mod tests {
 			Err("Cannot import tables")
 		);
 
-		prepare_test!(global_import,
+		prepare_test!(
+			global_import,
 			r#"
 			(module
 				(global $g (import "seal0" "global") i32)
@@ -778,7 +761,8 @@ mod tests {
 	mod tables {
 		use super::*;
 
-		prepare_test!(no_tables,
+		prepare_test!(
+			no_tables,
 			r#"
 			(module
 				(func (export "call"))
@@ -788,7 +772,8 @@ mod tests {
 			Ok(_)
 		);
 
-		prepare_test!(table_valid_size,
+		prepare_test!(
+			table_valid_size,
 			r#"
 			(module
 				(table 3 funcref)
@@ -800,7 +785,8 @@ mod tests {
 			Ok(_)
 		);
 
-		prepare_test!(table_too_big,
+		prepare_test!(
+			table_too_big,
 			r#"
 			(module
 				(table 4 funcref)
@@ -811,7 +797,8 @@ mod tests {
 			Err("table exceeds maximum size allowed")
 		);
 
-		prepare_test!(br_table_valid_size,
+		prepare_test!(
+			br_table_valid_size,
 			r#"
 			(module
 				(func (export "call"))
@@ -825,7 +812,8 @@ mod tests {
 			Ok(_)
 		);
 
-		prepare_test!(br_table_too_big,
+		prepare_test!(
+			br_table_too_big,
 			r#"
 			(module
 				(func (export "call"))
@@ -842,7 +830,8 @@ mod tests {
 	mod imports {
 		use super::*;
 
-		prepare_test!(can_import_legit_function,
+		prepare_test!(
+			can_import_legit_function,
 			r#"
 			(module
 				(import "seal0" "nop" (func (param i64)))
@@ -856,7 +845,8 @@ mod tests {
 
 		// even though gas is defined the contract can't import it since
 		// it is an implementation defined.
-		prepare_test!(can_not_import_gas_function,
+		prepare_test!(
+			can_not_import_gas_function,
 			r#"
 			(module
 				(import "seal0" "gas" (func (param i32)))
@@ -869,7 +859,8 @@ mod tests {
 		);
 
 		// memory is in "env" and not in "seal0"
-		prepare_test!(memory_not_in_seal0,
+		prepare_test!(
+			memory_not_in_seal0,
 			r#"
 			(module
 				(import "seal0" "memory" (memory 1 1))
@@ -882,7 +873,8 @@ mod tests {
 		);
 
 		// memory is in "env" and not in some arbitrary module
-		prepare_test!(memory_not_in_arbitrary_module,
+		prepare_test!(
+			memory_not_in_arbitrary_module,
 			r#"
 			(module
 				(import "any_module" "memory" (memory 1 1))
@@ -894,7 +886,8 @@ mod tests {
 			Err("Invalid module for imported memory")
 		);
 
-		prepare_test!(function_in_other_module_works,
+		prepare_test!(
+			function_in_other_module_works,
 			r#"
 			(module
 				(import "seal1" "nop" (func (param i32)))
@@ -907,7 +900,8 @@ mod tests {
 		);
 
 		// wrong signature
-		prepare_test!(wrong_signature,
+		prepare_test!(
+			wrong_signature,
 			r#"
 			(module
 				(import "seal0" "gas" (func (param i64)))
@@ -919,7 +913,8 @@ mod tests {
 			Err("module imports a non-existent function")
 		);
 
-		prepare_test!(unknown_func_name,
+		prepare_test!(
+			unknown_func_name,
 			r#"
 			(module
 				(import "seal0" "unknown_func" (func))
@@ -935,7 +930,8 @@ mod tests {
 	mod entrypoints {
 		use super::*;
 
-		prepare_test!(it_works,
+		prepare_test!(
+			it_works,
 			r#"
 			(module
 				(func (export "call"))
@@ -945,7 +941,8 @@ mod tests {
 			Ok(_)
 		);
 
-		prepare_test!(omit_deploy,
+		prepare_test!(
+			omit_deploy,
 			r#"
 			(module
 				(func (export "call"))
@@ -954,7 +951,8 @@ mod tests {
 			Err("deploy function isn't exported")
 		);
 
-		prepare_test!(omit_call,
+		prepare_test!(
+			omit_call,
 			r#"
 			(module
 				(func (export "deploy"))
@@ -964,7 +962,8 @@ mod tests {
 		);
 
 		// Try to use imported function as an entry point.
-		prepare_test!(try_sneak_export_as_entrypoint,
+		prepare_test!(
+			try_sneak_export_as_entrypoint,
 			r#"
 			(module
 				(import "seal0" "panic" (func))
@@ -978,7 +977,8 @@ mod tests {
 		);
 
 		// Try to use imported function as an entry point.
-		prepare_test!(try_sneak_export_as_global,
+		prepare_test!(
+			try_sneak_export_as_global,
 			r#"
 			(module
 				(func (export "deploy"))
@@ -988,7 +988,8 @@ mod tests {
 			Err("expected a function")
 		);
 
-		prepare_test!(wrong_signature,
+		prepare_test!(
+			wrong_signature,
 			r#"
 			(module
 				(func (export "deploy"))
@@ -998,7 +999,8 @@ mod tests {
 			Err("entry point has wrong signature")
 		);
 
-		prepare_test!(unknown_exports,
+		prepare_test!(
+			unknown_exports,
 			r#"
 			(module
 				(func (export "call"))
@@ -1009,7 +1011,8 @@ mod tests {
 			Err("unknown export: expecting only deploy and call functions")
 		);
 
-		prepare_test!(global_float,
+		prepare_test!(
+			global_float,
 			r#"
 			(module
 				(global $x f32 (f32.const 0))
@@ -1020,7 +1023,8 @@ mod tests {
 			Err("use of floating point type in globals is forbidden")
 		);
 
-		prepare_test!(local_float,
+		prepare_test!(
+			local_float,
 			r#"
 			(module
 				(func $foo (local f32))
@@ -1031,7 +1035,8 @@ mod tests {
 			Err("use of floating point type in locals is forbidden")
 		);
 
-		prepare_test!(param_float,
+		prepare_test!(
+			param_float,
 			r#"
 			(module
 				(func $foo (param f32))
@@ -1042,7 +1047,8 @@ mod tests {
 			Err("use of floating point type in function types is forbidden")
 		);
 
-		prepare_test!(result_float,
+		prepare_test!(
+			result_float,
 			r#"
 			(module
 				(func $foo (result f32) (f32.const 0))
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index 7b6004a84f06..c04f25766dc7 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -18,25 +18,20 @@
 //! Environment definition of the wasm smart-contract runtime.
 
 use crate::{
-	Config, CodeHash, BalanceOf, Error,
-	exec::{Ext, StorageKey, TopicOf, ExecResult, ExecError},
-	gas::{Token, ChargedAmount},
-	wasm::env_def::ConvertibleToWasm,
+	exec::{ExecError, ExecResult, Ext, StorageKey, TopicOf},
+	gas::{ChargedAmount, Token},
 	schedule::HostFnWeights,
+	wasm::env_def::ConvertibleToWasm,
+	BalanceOf, CodeHash, Config, Error,
 };
 use bitflags::bitflags;
-use pwasm_utils::parity_wasm::elements::ValueType;
-use frame_support::{dispatch::DispatchError, ensure, weights::Weight};
-use sp_std::prelude::*;
 use codec::{Decode, DecodeAll, Encode, MaxEncodedLen};
-use sp_core::{Bytes, crypto::UncheckedFrom};
-use sp_io::hashing::{
-	keccak_256,
-	blake2_256,
-	blake2_128,
-	sha2_256,
-};
+use frame_support::{dispatch::DispatchError, ensure, weights::Weight};
 use pallet_contracts_primitives::{ExecReturnValue, ReturnFlags};
+use pwasm_utils::parity_wasm::elements::ValueType;
+use sp_core::{crypto::UncheckedFrom, Bytes};
+use sp_io::hashing::{blake2_128, blake2_256, keccak_256, sha2_256};
+use sp_std::prelude::*;
 
 /// Every error that can be returned to a contract when it calls any of the host functions.
 ///
@@ -178,7 +173,7 @@ pub enum RuntimeCosts {
 	/// Weight of calling `seal_random`. It includes the weight for copying the subject.
 	Random,
 	/// Weight of calling `seal_deposit_event` with the given number of topics and event size.
-	DepositEvent{num_topic: u32, len: u32},
+	DepositEvent { num_topic: u32, len: u32 },
 	/// Weight of calling `seal_debug_message`.
 	#[cfg(feature = "unstable-interface")]
 	DebugMessage,
@@ -203,7 +198,7 @@ pub enum RuntimeCosts {
 	/// Weight of calling `seal_instantiate` for the given input and salt without output weight.
 	/// This includes the transfer as an instantiate without a value will always be below
 	/// the existential deposit and is disregarded as corner case.
-	InstantiateBase{input_data_len: u32, salt_len: u32},
+	InstantiateBase { input_data_len: u32, salt_len: u32 },
 	/// Weight of output received through `seal_instantiate` for the given size.
 	InstantiateCopyOut(u32),
 	/// Weight of calling `seal_hash_sha_256` for the given input size.
@@ -228,7 +223,7 @@ impl RuntimeCosts {
 	fn token<T>(&self, s: &HostFnWeights<T>) -> RuntimeToken
 	where
 		T: Config,
-		T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
+		T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 	{
 		use self::RuntimeCosts::*;
 		let weight = match *self {
@@ -246,40 +241,44 @@ impl RuntimeCosts {
 			WeightToFee => s.weight_to_fee,
 			InputBase => s.input,
 			InputCopyOut(len) => s.input_per_byte.saturating_mul(len.into()),
-			Return(len) => s.r#return
-				.saturating_add(s.return_per_byte.saturating_mul(len.into())),
+			Return(len) => s.r#return.saturating_add(s.return_per_byte.saturating_mul(len.into())),
 			Terminate => s.terminate,
-			RestoreTo(delta) => s.restore_to
-				.saturating_add(s.restore_to_per_delta.saturating_mul(delta.into())),
+			RestoreTo(delta) =>
+				s.restore_to.saturating_add(s.restore_to_per_delta.saturating_mul(delta.into())),
 			Random => s.random,
-			DepositEvent{num_topic, len} => s.deposit_event
+			DepositEvent { num_topic, len } => s
+				.deposit_event
 				.saturating_add(s.deposit_event_per_topic.saturating_mul(num_topic.into()))
 				.saturating_add(s.deposit_event_per_byte.saturating_mul(len.into())),
 			#[cfg(feature = "unstable-interface")]
 			DebugMessage => s.debug_message,
 			SetRentAllowance => s.set_rent_allowance,
-			SetStorage(len) => s.set_storage
-				.saturating_add(s.set_storage_per_byte.saturating_mul(len.into())),
+			SetStorage(len) =>
+				s.set_storage.saturating_add(s.set_storage_per_byte.saturating_mul(len.into())),
 			ClearStorage => s.clear_storage,
 			GetStorageBase => s.get_storage,
 			GetStorageCopyOut(len) => s.get_storage_per_byte.saturating_mul(len.into()),
 			Transfer => s.transfer,
-			CallBase(len) => s.call
-				.saturating_add(s.call_per_input_byte.saturating_mul(len.into())),
+			CallBase(len) =>
+				s.call.saturating_add(s.call_per_input_byte.saturating_mul(len.into())),
 			CallSurchargeTransfer => s.call_transfer_surcharge,
 			CallCopyOut(len) => s.call_per_output_byte.saturating_mul(len.into()),
-			InstantiateBase{input_data_len, salt_len} => s.instantiate
+			InstantiateBase { input_data_len, salt_len } => s
+				.instantiate
 				.saturating_add(s.instantiate_per_input_byte.saturating_mul(input_data_len.into()))
 				.saturating_add(s.instantiate_per_salt_byte.saturating_mul(salt_len.into())),
-			InstantiateCopyOut(len) => s.instantiate_per_output_byte
-				.saturating_mul(len.into()),
-			HashSha256(len) => s.hash_sha2_256
+			InstantiateCopyOut(len) => s.instantiate_per_output_byte.saturating_mul(len.into()),
+			HashSha256(len) => s
+				.hash_sha2_256
 				.saturating_add(s.hash_sha2_256_per_byte.saturating_mul(len.into())),
-			HashKeccak256(len) => s.hash_keccak_256
+			HashKeccak256(len) => s
+				.hash_keccak_256
 				.saturating_add(s.hash_keccak_256_per_byte.saturating_mul(len.into())),
-			HashBlake256(len) => s.hash_blake2_256
+			HashBlake256(len) => s
+				.hash_blake2_256
 				.saturating_add(s.hash_blake2_256_per_byte.saturating_mul(len.into())),
-			HashBlake128(len) => s.hash_blake2_128
+			HashBlake128(len) => s
+				.hash_blake2_128
 				.saturating_add(s.hash_blake2_128_per_byte.saturating_mul(len.into())),
 			ChainExtension(amount) => amount,
 			#[cfg(feature = "unstable-interface")]
@@ -306,7 +305,7 @@ struct RuntimeToken {
 impl<T> Token<T> for RuntimeToken
 where
 	T: Config,
-	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
+	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
 	fn weight(&self) -> Weight {
 		self.weight
@@ -373,19 +372,10 @@ impl<'a, E> Runtime<'a, E>
 where
 	E: Ext + 'a,
 	<E::T as frame_system::Config>::AccountId:
-		UncheckedFrom<<E::T as frame_system::Config>::Hash> + AsRef<[u8]>
+		UncheckedFrom<<E::T as frame_system::Config>::Hash> + AsRef<[u8]>,
 {
-	pub fn new(
-		ext: &'a mut E,
-		input_data: Vec<u8>,
-		memory: sp_sandbox::Memory,
-	) -> Self {
-		Runtime {
-			ext,
-			input_data: Some(input_data),
-			memory,
-			trap_reason: None,
-		}
+	pub fn new(ext: &'a mut E, input_data: Vec<u8>, memory: sp_sandbox::Memory) -> Self {
+		Runtime { ext, input_data: Some(input_data), memory, trap_reason: None }
 	}
 
 	/// Converts the sandbox result and the runtime state into the execution outcome.
@@ -401,27 +391,15 @@ where
 		if let Some(trap_reason) = self.trap_reason {
 			return match trap_reason {
 				// The trap was the result of the execution `return` host function.
-				TrapReason::Return(ReturnData{ flags, data }) => {
-					let flags = ReturnFlags::from_bits(flags).ok_or_else(||
-						"used reserved bit in return flags"
-					)?;
-					Ok(ExecReturnValue {
-						flags,
-						data: Bytes(data),
-					})
-				},
-				TrapReason::Termination => {
-					Ok(ExecReturnValue {
-						flags: ReturnFlags::empty(),
-						data: Bytes(Vec::new()),
-					})
-				},
-				TrapReason::Restoration => {
-					Ok(ExecReturnValue {
-						flags: ReturnFlags::empty(),
-						data: Bytes(Vec::new()),
-					})
+				TrapReason::Return(ReturnData { flags, data }) => {
+					let flags = ReturnFlags::from_bits(flags)
+						.ok_or_else(|| "used reserved bit in return flags")?;
+					Ok(ExecReturnValue { flags, data: Bytes(data) })
 				},
+				TrapReason::Termination =>
+					Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: Bytes(Vec::new()) }),
+				TrapReason::Restoration =>
+					Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: Bytes(Vec::new()) }),
 				TrapReason::SupervisorError(error) => Err(error)?,
 			}
 		}
@@ -429,9 +407,7 @@ where
 		// Check the exact type of the error.
 		match sandbox_result {
 			// No traps were generated. Proceed normally.
-			Ok(_) => {
-				Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: Bytes(Vec::new()) })
-			}
+			Ok(_) => Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: Bytes(Vec::new()) }),
 			// `Error::Module` is returned only if instantiation or linking failed (i.e.
 			// wasm binary tried to import a function that is not provided by the host).
 			// This shouldn't happen because validation process ought to reject such binaries.
@@ -441,7 +417,7 @@ where
 			Err(sp_sandbox::Error::Module) => Err("validation error")?,
 			// Any other kind of a trap should result in a failure.
 			Err(sp_sandbox::Error::Execution) | Err(sp_sandbox::Error::OutOfBounds) =>
-				Err(Error::<E::T>::ContractTrapped)?
+				Err(Error::<E::T>::ContractTrapped)?,
 		}
 	}
 
@@ -484,12 +460,11 @@ where
 	/// Returns `Err` if one of the following conditions occurs:
 	///
 	/// - requested buffer is not within the bounds of the sandbox memory.
-	pub fn read_sandbox_memory(&self, ptr: u32, len: u32)
-	-> Result<Vec<u8>, DispatchError>
-	{
+	pub fn read_sandbox_memory(&self, ptr: u32, len: u32) -> Result<Vec<u8>, DispatchError> {
 		ensure!(len <= self.ext.schedule().limits.max_memory_size(), Error::<E::T>::OutOfBounds);
 		let mut buf = vec![0u8; len as usize];
-		self.memory.get(ptr, buf.as_mut_slice())
+		self.memory
+			.get(ptr, buf.as_mut_slice())
 			.map_err(|_| Error::<E::T>::OutOfBounds)?;
 		Ok(buf)
 	}
@@ -499,9 +474,11 @@ where
 	/// Returns `Err` if one of the following conditions occurs:
 	///
 	/// - requested buffer is not within the bounds of the sandbox memory.
-	pub fn read_sandbox_memory_into_buf(&self, ptr: u32, buf: &mut [u8])
-	-> Result<(), DispatchError>
-	{
+	pub fn read_sandbox_memory_into_buf(
+		&self,
+		ptr: u32,
+		buf: &mut [u8],
+	) -> Result<(), DispatchError> {
 		self.memory.get(ptr, buf).map_err(|_| Error::<E::T>::OutOfBounds.into())
 	}
 
@@ -511,9 +488,10 @@ where
 	///
 	/// The weight of reading a fixed value is included in the overall weight of any
 	/// contract callable function.
-	pub fn read_sandbox_memory_as<D: Decode + MaxEncodedLen>(&self, ptr: u32)
-	-> Result<D, DispatchError>
-	{
+	pub fn read_sandbox_memory_as<D: Decode + MaxEncodedLen>(
+		&self,
+		ptr: u32,
+	) -> Result<D, DispatchError> {
 		let buf = self.read_sandbox_memory(ptr, D::max_encoded_len() as u32)?;
 		let decoded = D::decode_all(&mut &buf[..])
 			.map_err(|_| DispatchError::from(Error::<E::T>::DecodingFailed))?;
@@ -531,9 +509,11 @@ where
 	///
 	/// There must be an extra benchmark for determining the influence of `len` with
 	/// regard to the overall weight.
-	pub fn read_sandbox_memory_as_unbounded<D: Decode>(&self, ptr: u32, len: u32)
-	-> Result<D, DispatchError>
-	{
+	pub fn read_sandbox_memory_as_unbounded<D: Decode>(
+		&self,
+		ptr: u32,
+		len: u32,
+	) -> Result<D, DispatchError> {
 		let buf = self.read_sandbox_memory(ptr, len)?;
 		let decoded = D::decode_all(&mut &buf[..])
 			.map_err(|_| DispatchError::from(Error::<E::T>::DecodingFailed))?;
@@ -566,10 +546,9 @@ where
 		buf: &[u8],
 		allow_skip: bool,
 		create_token: impl FnOnce(u32) -> Option<RuntimeCosts>,
-	) -> Result<(), DispatchError>
-	{
+	) -> Result<(), DispatchError> {
 		if allow_skip && out_ptr == u32::MAX {
-			return Ok(());
+			return Ok(())
 		}
 
 		let buf_len = buf.len() as u32;
@@ -583,10 +562,10 @@ where
 			self.charge_gas(costs)?;
 		}
 
-		self.memory.set(out_ptr, buf).and_then(|_| {
-			self.memory.set(out_len_ptr, &buf_len.encode())
-		})
-		.map_err(|_| Error::<E::T>::OutOfBounds)?;
+		self.memory
+			.set(out_ptr, buf)
+			.and_then(|_| self.memory.set(out_len_ptr, &buf_len.encode()))
+			.map_err(|_| Error::<E::T>::OutOfBounds)?;
 
 		Ok(())
 	}
@@ -650,7 +629,7 @@ where
 			x if x == not_funded => Ok(NewContractNotFunded),
 			x if x == no_code => Ok(CodeNotFound),
 			x if (x == not_found || x == is_tombstone || x == rent_not_paid) => Ok(NotCallable),
-			err => Err(err)
+			err => Err(err),
 		}
 	}
 
@@ -665,7 +644,7 @@ where
 
 		match (error, origin) {
 			(_, Callee) => Ok(ReturnCode::CalleeTrapped),
-			(err, _) => Self::err_into_return_code(err)
+			(err, _) => Self::err_into_return_code(err),
 		}
 	}
 
@@ -678,9 +657,8 @@ where
 		input_data_ptr: u32,
 		input_data_len: u32,
 		output_ptr: u32,
-		output_len_ptr: u32
-	) -> Result<ReturnCode, TrapReason>
-	{
+		output_len_ptr: u32,
+	) -> Result<ReturnCode, TrapReason> {
 		self.charge_gas(RuntimeCosts::CallBase(input_data_len))?;
 		let callee: <<E as Ext>::T as frame_system::Config>::AccountId =
 			self.read_sandbox_memory_as(callee_ptr)?;
@@ -696,9 +674,8 @@ where
 			self.charge_gas(RuntimeCosts::CallSurchargeTransfer)?;
 		}
 		let ext = &mut self.ext;
-		let call_outcome = ext.call(
-			gas, callee, value, input_data, flags.contains(CallFlags::ALLOW_REENTRY),
-		);
+		let call_outcome =
+			ext.call(gas, callee, value, input_data, flags.contains(CallFlags::ALLOW_REENTRY));
 
 		// `TAIL_CALL` only matters on an `OK` result. Otherwise the call stack comes to
 		// a halt anyways without anymore code being executed.
@@ -707,7 +684,7 @@ where
 				return Err(TrapReason::Return(ReturnData {
 					flags: return_value.flags.bits(),
 					data: return_value.data.0,
-				}));
+				}))
 			}
 		}
 
@@ -731,10 +708,9 @@ where
 		output_ptr: u32,
 		output_len_ptr: u32,
 		salt_ptr: u32,
-		salt_len: u32
-	) -> Result<ReturnCode, TrapReason>
-	{
-		self.charge_gas(RuntimeCosts::InstantiateBase {input_data_len, salt_len})?;
+		salt_len: u32,
+	) -> Result<ReturnCode, TrapReason> {
+		self.charge_gas(RuntimeCosts::InstantiateBase { input_data_len, salt_len })?;
 		let code_hash: CodeHash<<E as Ext>::T> = self.read_sandbox_memory_as(code_hash_ptr)?;
 		let value: BalanceOf<<E as Ext>::T> = self.read_sandbox_memory_as(value_ptr)?;
 		let input_data = self.read_sandbox_memory(input_data_ptr, input_data_len)?;
@@ -743,7 +719,11 @@ where
 		if let Ok((address, output)) = &instantiate_outcome {
 			if !output.flags.contains(ReturnFlags::REVERT) {
 				self.write_sandbox_output(
-					address_ptr, address_len_ptr, &address.encode(), true, already_charged,
+					address_ptr,
+					address_len_ptr,
+					&address.encode(),
+					true,
+					already_charged,
 				)?;
 			}
 			self.write_sandbox_output(output_ptr, output_len_ptr, &output.data, true, |len| {
@@ -767,13 +747,12 @@ where
 		code_hash_ptr: u32,
 		rent_allowance_ptr: u32,
 		delta_ptr: u32,
-		delta_count: u32
+		delta_count: u32,
 	) -> Result<(), TrapReason> {
 		self.charge_gas(RuntimeCosts::RestoreTo(delta_count))?;
 		let dest: <<E as Ext>::T as frame_system::Config>::AccountId =
 			self.read_sandbox_memory_as(dest_ptr)?;
-		let code_hash: CodeHash<<E as Ext>::T> =
-			self.read_sandbox_memory_as(code_hash_ptr)?;
+		let code_hash: CodeHash<<E as Ext>::T> = self.read_sandbox_memory_as(code_hash_ptr)?;
 		let rent_allowance: BalanceOf<<E as Ext>::T> =
 			self.read_sandbox_memory_as(rent_allowance_ptr)?;
 		let delta = {
diff --git a/frame/contracts/src/weights.rs b/frame/contracts/src/weights.rs
index 503d952b110e..390873949ab6 100644
--- a/frame/contracts/src/weights.rs
+++ b/frame/contracts/src/weights.rs
@@ -36,6 +36,7 @@
 // --template=./.maintain/frame-weight-template.hbs
 
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
diff --git a/frame/democracy/src/benchmarking.rs b/frame/democracy/src/benchmarking.rs
index ef2c7de27ba5..1c506461408d 100644
--- a/frame/democracy/src/benchmarking.rs
+++ b/frame/democracy/src/benchmarking.rs
@@ -19,13 +19,15 @@
 
 use super::*;
 
-use frame_benchmarking::{benchmarks, account, whitelist_account, impl_benchmark_test_suite};
+use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, whitelist_account};
 use frame_support::{
 	assert_noop, assert_ok,
-	traits::{Currency, Get, EnsureOrigin, OnInitialize, UnfilteredDispatchable, schedule::DispatchTime},
+	traits::{
+		schedule::DispatchTime, Currency, EnsureOrigin, Get, OnInitialize, UnfilteredDispatchable,
+	},
 };
-use frame_system::{RawOrigin, Pallet as System, self};
-use sp_runtime::traits::{Bounded, One, BadOrigin};
+use frame_system::{Pallet as System, RawOrigin};
+use sp_runtime::traits::{BadOrigin, Bounded, One};
 
 use crate::Pallet as Democracy;
 
@@ -49,11 +51,7 @@ fn add_proposal<T: Config>(n: u32) -> Result<T::Hash, &'static str> {
 	let value = T::MinimumDeposit::get();
 	let proposal_hash: T::Hash = T::Hashing::hash_of(&n);
 
-	Democracy::<T>::propose(
-		RawOrigin::Signed(other).into(),
-		proposal_hash,
-		value.into(),
-	)?;
+	Democracy::<T>::propose(RawOrigin::Signed(other).into(), proposal_hash, value.into())?;
 
 	Ok(proposal_hash)
 }
@@ -76,20 +74,15 @@ fn add_referendum<T: Config>(n: u32) -> Result<ReferendumIndex, &'static str> {
 		63,
 		frame_system::RawOrigin::Root.into(),
 		Call::enact_proposal(proposal_hash, referendum_index).into(),
-	).map_err(|_| "failed to schedule named")?;
+	)
+	.map_err(|_| "failed to schedule named")?;
 	Ok(referendum_index)
 }
 
 fn account_vote<T: Config>(b: BalanceOf<T>) -> AccountVote<BalanceOf<T>> {
-	let v = Vote {
-		aye: true,
-		conviction: Conviction::Locked1x,
-	};
-
-	AccountVote::Standard {
-		vote: v,
-		balance: b,
-	}
+	let v = Vote { aye: true, conviction: Conviction::Locked1x };
+
+	AccountVote::Standard { vote: v, balance: b }
 }
 
 benchmarks! {
@@ -224,8 +217,8 @@ benchmarks! {
 		// Place our proposal in the external queue, too.
 		let hash = T::Hashing::hash_of(&0);
 		assert_ok!(
-            Democracy::<T>::external_propose(T::ExternalOrigin::successful_origin(), hash.clone())
-        );
+			Democracy::<T>::external_propose(T::ExternalOrigin::successful_origin(), hash.clone())
+		);
 
 		// Add a referendum of our proposal.
 		let referendum_index = add_referendum::<T>(0)?;
@@ -237,9 +230,9 @@ benchmarks! {
 	verify {
 		// Referendum has been canceled
 		assert_noop!(
-            Democracy::<T>::referendum_status(referendum_index),
-            Error::<T>::ReferendumInvalid
-        );
+			Democracy::<T>::referendum_status(referendum_index),
+			Error::<T>::ReferendumInvalid
+		);
 	}
 
 	// Worst case scenario, we external propose a previously blacklisted proposal
@@ -785,9 +778,4 @@ benchmarks! {
 	}
 }
 
-
-impl_benchmark_test_suite!(
-	Democracy,
-	crate::tests::new_test_ext(),
-	crate::tests::Test,
-);
+impl_benchmark_test_suite!(Democracy, crate::tests::new_test_ext(), crate::tests::Test,);
diff --git a/frame/democracy/src/conviction.rs b/frame/democracy/src/conviction.rs
index c2dff741a9c2..6b77acfab5b0 100644
--- a/frame/democracy/src/conviction.rs
+++ b/frame/democracy/src/conviction.rs
@@ -17,10 +17,13 @@
 
 //! The conviction datatype.
 
-use sp_std::{result::Result, convert::TryFrom};
-use sp_runtime::{RuntimeDebug, traits::{Zero, Bounded, CheckedMul, CheckedDiv}};
-use codec::{Encode, Decode};
 use crate::types::Delegations;
+use codec::{Decode, Encode};
+use sp_runtime::{
+	traits::{Bounded, CheckedDiv, CheckedMul, Zero},
+	RuntimeDebug,
+};
+use sp_std::{convert::TryFrom, result::Result};
 
 /// A value denoting the strength of conviction of a vote.
 #[derive(Encode, Decode, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, RuntimeDebug)]
@@ -93,9 +96,10 @@ impl Conviction {
 	}
 
 	/// The votes of a voter of the given `balance` with our conviction.
-	pub fn votes<
-		B: From<u8> + Zero + Copy + CheckedMul + CheckedDiv + Bounded
-	>(self, capital: B) -> Delegations<B> {
+	pub fn votes<B: From<u8> + Zero + Copy + CheckedMul + CheckedDiv + Bounded>(
+		self,
+		capital: B,
+	) -> Delegations<B> {
 		let votes = match self {
 			Conviction::None => capital.checked_div(&10u8.into()).unwrap_or_else(Zero::zero),
 			x => capital.checked_mul(&u8::from(x).into()).unwrap_or_else(B::max_value),
diff --git a/frame/democracy/src/lib.rs b/frame/democracy/src/lib.rs
index 42b00b8682a4..65bc483d2e5b 100644
--- a/frame/democracy/src/lib.rs
+++ b/frame/democracy/src/lib.rs
@@ -121,7 +121,7 @@
 //! This call can only be made by the `ExternalMajorityOrigin`.
 //!
 //! - `external_propose_majority` - Schedules a proposal to become a majority-carries
-//!	 referendum once it is legal for an externally proposed referendum.
+//! 	 referendum once it is legal for an externally proposed referendum.
 //!
 //! #### External Default Origin
 //!
@@ -149,34 +149,36 @@
 //! - `cancel_queued` - Cancels a proposal that is queued for enactment.
 //! - `clear_public_proposal` - Removes all public proposals.
 
-#![recursion_limit="128"]
+#![recursion_limit = "128"]
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use sp_std::prelude::*;
-use sp_runtime::{
-	DispatchResult, DispatchError, ArithmeticError, RuntimeDebug,
-	traits::{Zero, Hash, Dispatchable, Saturating, Bounded},
-};
-use codec::{Encode, Decode, Input};
+use codec::{Decode, Encode, Input};
 use frame_support::{
-	ensure, weights::Weight,
+	ensure,
 	traits::{
-		Currency, ReservableCurrency, LockableCurrency, WithdrawReasons, LockIdentifier, Get,
-		OnUnbalanced, BalanceStatus, schedule::{Named as ScheduleNamed, DispatchTime},
+		schedule::{DispatchTime, Named as ScheduleNamed},
+		BalanceStatus, Currency, Get, LockIdentifier, LockableCurrency, OnUnbalanced,
+		ReservableCurrency, WithdrawReasons,
 	},
+	weights::Weight,
 };
+use sp_runtime::{
+	traits::{Bounded, Dispatchable, Hash, Saturating, Zero},
+	ArithmeticError, DispatchError, DispatchResult, RuntimeDebug,
+};
+use sp_std::prelude::*;
 
-mod vote_threshold;
-mod vote;
 mod conviction;
 mod types;
+mod vote;
+mod vote_threshold;
 pub mod weights;
-pub use weights::WeightInfo;
-pub use vote_threshold::{Approved, VoteThreshold};
-pub use vote::{Vote, AccountVote, Voting};
 pub use conviction::Conviction;
-pub use types::{ReferendumInfo, ReferendumStatus, Tally, UnvoteScope, Delegations};
 pub use pallet::*;
+pub use types::{Delegations, ReferendumInfo, ReferendumStatus, Tally, UnvoteScope};
+pub use vote::{AccountVote, Vote, Voting};
+pub use vote_threshold::{Approved, VoteThreshold};
+pub use weights::WeightInfo;
 
 #[cfg(test)]
 mod tests;
@@ -197,9 +199,11 @@ pub type PropIndex = u32;
 /// A referendum index.
 pub type ReferendumIndex = u32;
 
-type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
-type NegativeImbalanceOf<T> =
-	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
+type BalanceOf<T> =
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<
+	<T as frame_system::Config>::AccountId,
+>>::NegativeImbalance;
 
 #[derive(Clone, Encode, Decode, RuntimeDebug)]
 pub enum PreimageStatus<AccountId, Balance, BlockNumber> {
@@ -235,13 +239,16 @@ enum Releases {
 
 #[frame_support::pallet]
 pub mod pallet {
-	use sp_runtime::DispatchResult;
+	use super::*;
 	use frame_support::{
-		pallet_prelude::*, Parameter,
-		weights::{DispatchClass, Pays}, traits::EnsureOrigin, dispatch::DispatchResultWithPostInfo,
+		dispatch::DispatchResultWithPostInfo,
+		pallet_prelude::*,
+		traits::EnsureOrigin,
+		weights::{DispatchClass, Pays},
+		Parameter,
 	};
-	use frame_system::{pallet_prelude::*, ensure_signed, ensure_root};
-	use super::*;
+	use frame_system::{ensure_root, ensure_signed, pallet_prelude::*};
+	use sp_runtime::DispatchResult;
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
@@ -249,12 +256,12 @@ pub mod pallet {
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config + Sized {
-		type Proposal: Parameter + Dispatchable<Origin=Self::Origin> + From<Call<Self>>;
+		type Proposal: Parameter + Dispatchable<Origin = Self::Origin> + From<Call<Self>>;
 		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
 
 		/// Currency type for this pallet.
 		type Currency: ReservableCurrency<Self::AccountId>
-			+ LockableCurrency<Self::AccountId, Moment=Self::BlockNumber>;
+			+ LockableCurrency<Self::AccountId, Moment = Self::BlockNumber>;
 
 		/// The minimum period of locking and the period between a proposal being approved and enacted.
 		///
@@ -323,7 +330,7 @@ pub mod pallet {
 		///
 		/// The number of Vetoers for a proposal must be small, extrinsics are weighted according to
 		/// [MAX_VETOERS](./const.MAX_VETOERS.html)
-		type VetoOrigin: EnsureOrigin<Self::Origin, Success=Self::AccountId>;
+		type VetoOrigin: EnsureOrigin<Self::Origin, Success = Self::AccountId>;
 
 		/// Period in blocks where an external proposal may not be re-submitted after being vetoed.
 		#[pallet::constant]
@@ -334,7 +341,7 @@ pub mod pallet {
 		type PreimageByteDeposit: Get<BalanceOf<Self>>;
 
 		/// An origin that can provide a preimage using operational extrinsics.
-		type OperationalPreimageOrigin: EnsureOrigin<Self::Origin, Success=Self::AccountId>;
+		type OperationalPreimageOrigin: EnsureOrigin<Self::Origin, Success = Self::AccountId>;
 
 		/// Handler for the unbalanced reduction when slashing a preimage deposit.
 		type Slash: OnUnbalanced<NegativeImbalanceOf<Self>>;
@@ -370,18 +377,16 @@ pub mod pallet {
 	/// The public proposals. Unsorted. The second item is the proposal's hash.
 	#[pallet::storage]
 	#[pallet::getter(fn public_props)]
-	pub type PublicProps<T: Config> = StorageValue<_, Vec<(PropIndex, T::Hash, T::AccountId)>, ValueQuery>;
+	pub type PublicProps<T: Config> =
+		StorageValue<_, Vec<(PropIndex, T::Hash, T::AccountId)>, ValueQuery>;
 
 	/// Those who have locked a deposit.
 	///
 	/// TWOX-NOTE: Safe, as increasing integer keys are safe.
 	#[pallet::storage]
 	#[pallet::getter(fn deposit_of)]
-	pub type DepositOf<T: Config> = StorageMap<
-		_,
-		Twox64Concat, PropIndex,
-		(Vec<T::AccountId>, BalanceOf<T>),
-	>;
+	pub type DepositOf<T: Config> =
+		StorageMap<_, Twox64Concat, PropIndex, (Vec<T::AccountId>, BalanceOf<T>)>;
 
 	/// Map of hashes to the proposal preimage, along with who registered it and their deposit.
 	/// The block number is the block at which it was deposited.
@@ -390,7 +395,8 @@ pub mod pallet {
 	#[pallet::storage]
 	pub type Preimages<T: Config> = StorageMap<
 		_,
-		Identity, T::Hash,
+		Identity,
+		T::Hash,
 		PreimageStatus<T::AccountId, BalanceOf<T>, T::BlockNumber>,
 	>;
 
@@ -412,7 +418,8 @@ pub mod pallet {
 	#[pallet::getter(fn referendum_info)]
 	pub type ReferendumInfoOf<T: Config> = StorageMap<
 		_,
-		Twox64Concat, ReferendumIndex,
+		Twox64Concat,
+		ReferendumIndex,
 		ReferendumInfo<T::BlockNumber, T::Hash, BalanceOf<T>>,
 	>;
 
@@ -422,7 +429,9 @@ pub mod pallet {
 	/// TWOX-NOTE: SAFE as `AccountId`s are crypto hashes anyway.
 	#[pallet::storage]
 	pub type VotingOf<T: Config> = StorageMap<
-		_, Twox64Concat, T::AccountId,
+		_,
+		Twox64Concat,
+		T::AccountId,
 		Voting<BalanceOf<T>, T::AccountId, T::BlockNumber>,
 		ValueQuery,
 	>;
@@ -452,7 +461,8 @@ pub mod pallet {
 	/// A record of who vetoed what. Maps proposal hash to a possible existent block number
 	/// (until when it may not be resubmitted) and who vetoed it.
 	#[pallet::storage]
-	pub type Blacklist<T: Config> = StorageMap<_, Identity, T::Hash, (T::BlockNumber, Vec<T::AccountId>)>;
+	pub type Blacklist<T: Config> =
+		StorageMap<_, Identity, T::Hash, (T::BlockNumber, Vec<T::AccountId>)>;
 
 	/// Record of all proposals that have been subject to emergency cancellation.
 	#[pallet::storage]
@@ -472,9 +482,7 @@ pub mod pallet {
 	#[cfg(feature = "std")]
 	impl<T: Config> Default for GenesisConfig<T> {
 		fn default() -> Self {
-			GenesisConfig {
-				_phantom: Default::default(),
-			}
+			GenesisConfig { _phantom: Default::default() }
 		}
 	}
 
@@ -684,11 +692,10 @@ pub mod pallet {
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 
-			let seconds = Self::len_of_deposit_of(proposal)
-				.ok_or_else(|| Error::<T>::ProposalMissing)?;
+			let seconds =
+				Self::len_of_deposit_of(proposal).ok_or_else(|| Error::<T>::ProposalMissing)?;
 			ensure!(seconds <= seconds_upper_bound, Error::<T>::WrongUpperBound);
-			let mut deposit = Self::deposit_of(proposal)
-				.ok_or(Error::<T>::ProposalMissing)?;
+			let mut deposit = Self::deposit_of(proposal).ok_or(Error::<T>::ProposalMissing)?;
 			T::Currency::reserve(&who, deposit.1)?;
 			deposit.0.push(who);
 			<DepositOf<T>>::insert(proposal, deposit);
@@ -726,7 +733,10 @@ pub mod pallet {
 		///
 		/// Weight: `O(1)`.
 		#[pallet::weight((T::WeightInfo::emergency_cancel(), DispatchClass::Operational))]
-		pub fn emergency_cancel(origin: OriginFor<T>, ref_index: ReferendumIndex) -> DispatchResult {
+		pub fn emergency_cancel(
+			origin: OriginFor<T>,
+			ref_index: ReferendumIndex,
+		) -> DispatchResult {
 			T::CancellationOrigin::ensure_origin(origin)?;
 
 			let status = Self::referendum_status(ref_index)?;
@@ -842,8 +852,8 @@ pub mod pallet {
 				ensure!(T::InstantAllowed::get(), Error::<T>::InstantNotAllowed);
 			}
 
-			let (e_proposal_hash, threshold) = <NextExternal<T>>::get()
-				.ok_or(Error::<T>::ProposalMissing)?;
+			let (e_proposal_hash, threshold) =
+				<NextExternal<T>>::get().ok_or(Error::<T>::ProposalMissing)?;
 			ensure!(
 				threshold != VoteThreshold::SuperMajorityApprove,
 				Error::<T>::NotSimpleMajority,
@@ -875,11 +885,10 @@ pub mod pallet {
 				Err(Error::<T>::NoProposal)?;
 			}
 
-			let mut existing_vetoers = <Blacklist<T>>::get(&proposal_hash)
-				.map(|pair| pair.1)
-				.unwrap_or_else(Vec::new);
-			let insert_position = existing_vetoers.binary_search(&who)
-				.err().ok_or(Error::<T>::AlreadyVetoed)?;
+			let mut existing_vetoers =
+				<Blacklist<T>>::get(&proposal_hash).map(|pair| pair.1).unwrap_or_else(Vec::new);
+			let insert_position =
+				existing_vetoers.binary_search(&who).err().ok_or(Error::<T>::AlreadyVetoed)?;
 
 			existing_vetoers.insert(insert_position, who.clone());
 			let until = <frame_system::Pallet<T>>::block_number() + T::CooloffPeriod::get();
@@ -949,7 +958,7 @@ pub mod pallet {
 			origin: OriginFor<T>,
 			to: T::AccountId,
 			conviction: Conviction,
-			balance: BalanceOf<T>
+			balance: BalanceOf<T>,
 		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
 			let votes = Self::try_delegate(who, to, conviction, balance)?;
@@ -1089,10 +1098,11 @@ pub mod pallet {
 
 			let (provider, deposit, since, expiry) = <Preimages<T>>::get(&proposal_hash)
 				.and_then(|m| match m {
-					PreimageStatus::Available { provider, deposit, since, expiry, .. }
-						=> Some((provider, deposit, since, expiry)),
+					PreimageStatus::Available { provider, deposit, since, expiry, .. } =>
+						Some((provider, deposit, since, expiry)),
 					_ => None,
-				}).ok_or(Error::<T>::PreimageMissing)?;
+				})
+				.ok_or(Error::<T>::PreimageMissing)?;
 
 			let now = <frame_system::Pallet<T>>::block_number();
 			let (voting, enactment) = (T::VotingPeriod::get(), T::EnactmentPeriod::get());
@@ -1100,7 +1110,8 @@ pub mod pallet {
 			ensure!(now >= since + voting + additional, Error::<T>::TooEarly);
 			ensure!(expiry.map_or(true, |e| now > e), Error::<T>::Imminent);
 
-			let res = T::Currency::repatriate_reserved(&provider, &who, deposit, BalanceStatus::Free);
+			let res =
+				T::Currency::repatriate_reserved(&provider, &who, deposit, BalanceStatus::Free);
 			debug_assert!(res.is_ok());
 			<Preimages<T>>::remove(&proposal_hash);
 			Self::deposit_event(Event::<T>::PreimageReaped(proposal_hash, provider, deposit, who));
@@ -1211,7 +1222,8 @@ pub mod pallet {
 		/// Weight: `O(p)` (though as this is an high-privilege dispatch, we assume it has a
 		///   reasonable value).
 		#[pallet::weight((T::WeightInfo::blacklist(T::MaxProposals::get()), DispatchClass::Operational))]
-		pub fn blacklist(origin: OriginFor<T>,
+		pub fn blacklist(
+			origin: OriginFor<T>,
 			proposal_hash: T::Hash,
 			maybe_ref_index: Option<ReferendumIndex>,
 		) -> DispatchResult {
@@ -1288,7 +1300,7 @@ impl<T: Config> Pallet<T> {
 
 	/// Get all referenda ready for tally at block `n`.
 	pub fn maturing_referenda_at(
-		n: T::BlockNumber
+		n: T::BlockNumber,
 	) -> Vec<(ReferendumIndex, ReferendumStatus<T::BlockNumber, T::Hash, BalanceOf<T>>)> {
 		let next = Self::lowest_unbaked();
 		let last = Self::referendum_count();
@@ -1299,7 +1311,8 @@ impl<T: Config> Pallet<T> {
 		n: T::BlockNumber,
 		range: core::ops::Range<PropIndex>,
 	) -> Vec<(ReferendumIndex, ReferendumStatus<T::BlockNumber, T::Hash, BalanceOf<T>>)> {
-		range.into_iter()
+		range
+			.into_iter()
 			.map(|i| (i, Self::referendum_info(i)))
 			.filter_map(|(i, maybe_info)| match maybe_info {
 				Some(ReferendumInfo::Ongoing(status)) => Some((i, status)),
@@ -1315,13 +1328,13 @@ impl<T: Config> Pallet<T> {
 	pub fn internal_start_referendum(
 		proposal_hash: T::Hash,
 		threshold: VoteThreshold,
-		delay: T::BlockNumber
+		delay: T::BlockNumber,
 	) -> ReferendumIndex {
 		<Pallet<T>>::inject_referendum(
 			<frame_system::Pallet<T>>::block_number() + T::VotingPeriod::get(),
 			proposal_hash,
 			threshold,
-			delay
+			delay,
 		)
 	}
 
@@ -1334,25 +1347,28 @@ impl<T: Config> Pallet<T> {
 	// private.
 
 	/// Ok if the given referendum is active, Err otherwise
-	fn ensure_ongoing(r: ReferendumInfo<T::BlockNumber, T::Hash, BalanceOf<T>>)
-		-> Result<ReferendumStatus<T::BlockNumber, T::Hash, BalanceOf<T>>, DispatchError>
-	{
+	fn ensure_ongoing(
+		r: ReferendumInfo<T::BlockNumber, T::Hash, BalanceOf<T>>,
+	) -> Result<ReferendumStatus<T::BlockNumber, T::Hash, BalanceOf<T>>, DispatchError> {
 		match r {
 			ReferendumInfo::Ongoing(s) => Ok(s),
 			_ => Err(Error::<T>::ReferendumInvalid.into()),
 		}
 	}
 
-	fn referendum_status(ref_index: ReferendumIndex)
-		-> Result<ReferendumStatus<T::BlockNumber, T::Hash, BalanceOf<T>>, DispatchError>
-	{
-		let info = ReferendumInfoOf::<T>::get(ref_index)
-			.ok_or(Error::<T>::ReferendumInvalid)?;
+	fn referendum_status(
+		ref_index: ReferendumIndex,
+	) -> Result<ReferendumStatus<T::BlockNumber, T::Hash, BalanceOf<T>>, DispatchError> {
+		let info = ReferendumInfoOf::<T>::get(ref_index).ok_or(Error::<T>::ReferendumInvalid)?;
 		Self::ensure_ongoing(info)
 	}
 
 	/// Actually enact a vote, if legit.
-	fn try_vote(who: &T::AccountId, ref_index: ReferendumIndex, vote: AccountVote<BalanceOf<T>>) -> DispatchResult {
+	fn try_vote(
+		who: &T::AccountId,
+		ref_index: ReferendumIndex,
+		vote: AccountVote<BalanceOf<T>>,
+	) -> DispatchResult {
 		let mut status = Self::referendum_status(ref_index)?;
 		ensure!(vote.balance() <= T::Currency::free_balance(who), Error::<T>::InsufficientFunds);
 		VotingOf::<T>::try_mutate(who, |voting| -> DispatchResult {
@@ -1365,11 +1381,14 @@ impl<T: Config> Pallet<T> {
 							status.tally.reduce(approve, *delegations);
 						}
 						votes[i].1 = vote;
-					}
+					},
 					Err(i) => {
-						ensure!(votes.len() as u32 <= T::MaxVotes::get(), Error::<T>::MaxVotesReached);
+						ensure!(
+							votes.len() as u32 <= T::MaxVotes::get(),
+							Error::<T>::MaxVotesReached
+						);
 						votes.insert(i, (ref_index, vote));
-					}
+					},
 				}
 				// Shouldn't be possible to fail, but we handle it gracefully.
 				status.tally.add(vote).ok_or(ArithmeticError::Overflow)?;
@@ -1383,12 +1402,7 @@ impl<T: Config> Pallet<T> {
 		})?;
 		// Extend the lock to `balance` (rather than setting it) since we don't know what other
 		// votes are in place.
-		T::Currency::extend_lock(
-			DEMOCRACY_ID,
-			who,
-			vote.balance(),
-			WithdrawReasons::TRANSFER
-		);
+		T::Currency::extend_lock(DEMOCRACY_ID, who, vote.balance(), WithdrawReasons::TRANSFER);
 		ReferendumInfoOf::<T>::insert(ref_index, ReferendumInfo::Ongoing(status));
 		Ok(())
 	}
@@ -1399,11 +1413,17 @@ impl<T: Config> Pallet<T> {
 	/// - The referendum has finished and the voter's lock period is up.
 	///
 	/// This will generally be combined with a call to `unlock`.
-	fn try_remove_vote(who: &T::AccountId, ref_index: ReferendumIndex, scope: UnvoteScope) -> DispatchResult {
+	fn try_remove_vote(
+		who: &T::AccountId,
+		ref_index: ReferendumIndex,
+		scope: UnvoteScope,
+	) -> DispatchResult {
 		let info = ReferendumInfoOf::<T>::get(ref_index);
 		VotingOf::<T>::try_mutate(who, |voting| -> DispatchResult {
 			if let Voting::Direct { ref mut votes, delegations, ref mut prior } = voting {
-				let i = votes.binary_search_by_key(&ref_index, |i| i.0).map_err(|_| Error::<T>::NotVoter)?;
+				let i = votes
+					.binary_search_by_key(&ref_index, |i| i.0)
+					.map_err(|_| Error::<T>::NotVoter)?;
 				match info {
 					Some(ReferendumInfo::Ongoing(mut status)) => {
 						ensure!(matches!(scope, UnvoteScope::Any), Error::<T>::NoPermission);
@@ -1413,17 +1433,20 @@ impl<T: Config> Pallet<T> {
 							status.tally.reduce(approve, *delegations);
 						}
 						ReferendumInfoOf::<T>::insert(ref_index, ReferendumInfo::Ongoing(status));
-					}
-					Some(ReferendumInfo::Finished{end, approved}) =>
+					},
+					Some(ReferendumInfo::Finished { end, approved }) =>
 						if let Some((lock_periods, balance)) = votes[i].1.locked_if(approved) {
 							let unlock_at = end + T::EnactmentPeriod::get() * lock_periods.into();
 							let now = frame_system::Pallet::<T>::block_number();
 							if now < unlock_at {
-								ensure!(matches!(scope, UnvoteScope::Any), Error::<T>::NoPermission);
+								ensure!(
+									matches!(scope, UnvoteScope::Any),
+									Error::<T>::NoPermission
+								);
 								prior.accumulate(unlock_at, balance)
 							}
 						},
-					None => {}  // Referendum was cancelled.
+					None => {}, // Referendum was cancelled.
 				}
 				votes.remove(i);
 			}
@@ -1444,15 +1467,15 @@ impl<T: Config> Pallet<T> {
 				*delegations = delegations.saturating_add(amount);
 				for &(ref_index, account_vote) in votes.iter() {
 					if let AccountVote::Standard { vote, .. } = account_vote {
-						ReferendumInfoOf::<T>::mutate(ref_index, |maybe_info|
+						ReferendumInfoOf::<T>::mutate(ref_index, |maybe_info| {
 							if let Some(ReferendumInfo::Ongoing(ref mut status)) = maybe_info {
 								status.tally.increase(vote.aye, amount);
 							}
-						);
+						});
 					}
 				}
 				votes.len() as u32
-			}
+			},
 		})
 	}
 
@@ -1463,20 +1486,20 @@ impl<T: Config> Pallet<T> {
 				// We don't support second level delegating, so we don't need to do anything more.
 				*delegations = delegations.saturating_sub(amount);
 				1
-			}
+			},
 			Voting::Direct { votes, delegations, .. } => {
 				*delegations = delegations.saturating_sub(amount);
 				for &(ref_index, account_vote) in votes.iter() {
 					if let AccountVote::Standard { vote, .. } = account_vote {
-						ReferendumInfoOf::<T>::mutate(ref_index, |maybe_info|
+						ReferendumInfoOf::<T>::mutate(ref_index, |maybe_info| {
 							if let Some(ReferendumInfo::Ongoing(ref mut status)) = maybe_info {
 								status.tally.reduce(vote.aye, amount);
 							}
-						);
+						});
 					}
 				}
 				votes.len() as u32
-			}
+			},
 		})
 	}
 
@@ -1505,22 +1528,17 @@ impl<T: Config> Pallet<T> {
 					// remove any delegation votes to our current target.
 					Self::reduce_upstream_delegation(&target, conviction.votes(balance));
 					voting.set_common(delegations, prior);
-				}
+				},
 				Voting::Direct { votes, delegations, prior } => {
 					// here we just ensure that we're currently idling with no votes recorded.
 					ensure!(votes.is_empty(), Error::<T>::VotesExist);
 					voting.set_common(delegations, prior);
-				}
+				},
 			}
 			let votes = Self::increase_upstream_delegation(&target, conviction.votes(balance));
 			// Extend the lock to `balance` (rather than setting it) since we don't know what other
 			// votes are in place.
-			T::Currency::extend_lock(
-				DEMOCRACY_ID,
-				&who,
-				balance,
-				WithdrawReasons::TRANSFER
-			);
+			T::Currency::extend_lock(DEMOCRACY_ID, &who, balance, WithdrawReasons::TRANSFER);
 			Ok(votes)
 		})?;
 		Self::deposit_event(Event::<T>::Delegated(who, target));
@@ -1535,25 +1553,18 @@ impl<T: Config> Pallet<T> {
 			let mut old = Voting::default();
 			sp_std::mem::swap(&mut old, voting);
 			match old {
-				Voting::Delegating {
-					balance,
-					target,
-					conviction,
-					delegations,
-					mut prior,
-				} => {
+				Voting::Delegating { balance, target, conviction, delegations, mut prior } => {
 					// remove any delegation votes to our current target.
-					let votes = Self::reduce_upstream_delegation(&target, conviction.votes(balance));
+					let votes =
+						Self::reduce_upstream_delegation(&target, conviction.votes(balance));
 					let now = frame_system::Pallet::<T>::block_number();
 					let lock_periods = conviction.lock_periods().into();
 					prior.accumulate(now + T::EnactmentPeriod::get() * lock_periods, balance);
 					voting.set_common(delegations, prior);
 
 					Ok(votes)
-				}
-				Voting::Direct { .. } => {
-					Err(Error::<T>::NotDelegating.into())
-				}
+				},
+				Voting::Direct { .. } => Err(Error::<T>::NotDelegating.into()),
 			}
 		})?;
 		Self::deposit_event(Event::<T>::Undelegated(who));
@@ -1583,7 +1594,8 @@ impl<T: Config> Pallet<T> {
 	) -> ReferendumIndex {
 		let ref_index = Self::referendum_count();
 		ReferendumCount::<T>::put(ref_index + 1);
-		let status = ReferendumStatus { end, proposal_hash, threshold, delay, tally: Default::default() };
+		let status =
+			ReferendumStatus { end, proposal_hash, threshold, delay, tally: Default::default() };
 		let item = ReferendumInfo::Ongoing(status);
 		<ReferendumInfoOf<T>>::insert(ref_index, item);
 		Self::deposit_event(Event::<T>::Started(ref_index, threshold));
@@ -1596,7 +1608,8 @@ impl<T: Config> Pallet<T> {
 			Self::launch_public(now).or_else(|_| Self::launch_external(now))
 		} else {
 			Self::launch_external(now).or_else(|_| Self::launch_public(now))
-		}.map_err(|_| Error::<T>::NoneWaiting.into())
+		}
+		.map_err(|_| Error::<T>::NoneWaiting.into())
 	}
 
 	/// Table the waiting external proposal for a vote, if there is one.
@@ -1654,8 +1667,10 @@ impl<T: Config> Pallet<T> {
 				debug_assert!(err_amount.is_zero());
 				Self::deposit_event(Event::<T>::PreimageUsed(proposal_hash, provider, deposit));
 
-				let res = proposal.dispatch(frame_system::RawOrigin::Root.into())
-					.map(|_| ()).map_err(|e| e.error);
+				let res = proposal
+					.dispatch(frame_system::RawOrigin::Root.into())
+					.map(|_| ())
+					.map_err(|e| e.error);
 				Self::deposit_event(Event::<T>::Executed(index, res));
 
 				Ok(())
@@ -1685,10 +1700,14 @@ impl<T: Config> Pallet<T> {
 			} else {
 				let when = now + status.delay;
 				// Note that we need the preimage now.
-				Preimages::<T>::mutate_exists(&status.proposal_hash, |maybe_pre| match *maybe_pre {
-					Some(PreimageStatus::Available { ref mut expiry, .. }) => *expiry = Some(when),
-					ref mut a => *a = Some(PreimageStatus::Missing(when)),
-				});
+				Preimages::<T>::mutate_exists(
+					&status.proposal_hash,
+					|maybe_pre| match *maybe_pre {
+						Some(PreimageStatus::Available { ref mut expiry, .. }) =>
+							*expiry = Some(when),
+						ref mut a => *a = Some(PreimageStatus::Missing(when)),
+					},
+				);
 
 				if T::Scheduler::schedule_named(
 					(DEMOCRACY_ID, index).encode(),
@@ -1697,7 +1716,9 @@ impl<T: Config> Pallet<T> {
 					63,
 					frame_system::RawOrigin::Root.into(),
 					Call::enact_proposal(status.proposal_hash, index).into(),
-				).is_err() {
+				)
+				.is_err()
+				{
 					frame_support::print("LOGIC ERROR: bake_referendum/schedule_named failed");
 				}
 			}
@@ -1762,7 +1783,8 @@ impl<T: Config> Pallet<T> {
 		// To decode the enum variant we only need the first byte.
 		let mut buf = [0u8; 1];
 		let key = <Preimages<T>>::hashed_key_for(proposal_hash);
-		let bytes = sp_io::storage::read(&key, &mut buf, 0).ok_or_else(|| Error::<T>::NotImminent)?;
+		let bytes =
+			sp_io::storage::read(&key, &mut buf, 0).ok_or_else(|| Error::<T>::NotImminent)?;
 		// The value may be smaller that 1 byte.
 		let mut input = &buf[0..buf.len().min(bytes as usize)];
 
@@ -1772,7 +1794,7 @@ impl<T: Config> Pallet<T> {
 			_ => {
 				sp_runtime::print("Failed to decode `PreimageStatus` variant");
 				Err(Error::<T>::NotImminent.into())
-			}
+			},
 		}
 	}
 
@@ -1790,7 +1812,8 @@ impl<T: Config> Pallet<T> {
 		// * at most 5 bytes to decode a `Compact<u32>`
 		let mut buf = [0u8; 6];
 		let key = <Preimages<T>>::hashed_key_for(proposal_hash);
-		let bytes = sp_io::storage::read(&key, &mut buf, 0).ok_or_else(|| Error::<T>::PreimageMissing)?;
+		let bytes =
+			sp_io::storage::read(&key, &mut buf, 0).ok_or_else(|| Error::<T>::PreimageMissing)?;
 		// The value may be smaller that 6 bytes.
 		let mut input = &buf[0..buf.len().min(bytes as usize)];
 
@@ -1799,15 +1822,17 @@ impl<T: Config> Pallet<T> {
 			Ok(0) => return Err(Error::<T>::PreimageMissing.into()),
 			_ => {
 				sp_runtime::print("Failed to decode `PreimageStatus` variant");
-				return Err(Error::<T>::PreimageMissing.into());
-			}
+				return Err(Error::<T>::PreimageMissing.into())
+			},
 		}
 
 		// Decode the length of the vector.
-		let len = codec::Compact::<u32>::decode(&mut input).map_err(|_| {
-			sp_runtime::print("Failed to decode `PreimageStatus` variant");
-			DispatchError::from(Error::<T>::PreimageMissing)
-		})?.0;
+		let len = codec::Compact::<u32>::decode(&mut input)
+			.map_err(|_| {
+				sp_runtime::print("Failed to decode `PreimageStatus` variant");
+				DispatchError::from(Error::<T>::PreimageMissing)
+			})?
+			.0;
 
 		Ok(len)
 	}
@@ -1837,7 +1862,10 @@ impl<T: Config> Pallet<T> {
 	}
 
 	// See `note_imminent_preimage`
-	fn note_imminent_preimage_inner(who: T::AccountId, encoded_proposal: Vec<u8>) -> DispatchResult {
+	fn note_imminent_preimage_inner(
+		who: T::AccountId,
+		encoded_proposal: Vec<u8>,
+	) -> DispatchResult {
 		let proposal_hash = T::Hashing::hash(&encoded_proposal[..]);
 		Self::check_pre_image_is_missing(proposal_hash)?;
 		let status = Preimages::<T>::get(&proposal_hash).ok_or(Error::<T>::NotImminent)?;
@@ -1873,6 +1901,6 @@ fn decode_compact_u32_at(key: &[u8]) -> Option<u32> {
 			sp_runtime::print("Failed to decode compact u32 at:");
 			sp_runtime::print(key);
 			None
-		}
+		},
 	}
 }
diff --git a/frame/democracy/src/tests.rs b/frame/democracy/src/tests.rs
index 1c68715d49e3..64444304db67 100644
--- a/frame/democracy/src/tests.rs
+++ b/frame/democracy/src/tests.rs
@@ -17,23 +17,25 @@
 
 //! The crate's tests.
 
-use crate as pallet_democracy;
 use super::*;
+use crate as pallet_democracy;
 use codec::Encode;
 use frame_support::{
-	assert_noop, assert_ok, parameter_types, ord_parameter_types,
-	traits::{SortedMembers, OnInitialize, Filter, GenesisBuild},
+	assert_noop, assert_ok, ord_parameter_types, parameter_types,
+	traits::{Filter, GenesisBuild, OnInitialize, SortedMembers},
 	weights::Weight,
 };
+use frame_system::{EnsureRoot, EnsureSignedBy};
+use pallet_balances::{BalanceLock, Error as BalancesError};
 use sp_core::H256;
 use sp_runtime::{
-	traits::{BlakeTwo256, IdentityLookup, BadOrigin},
-	testing::Header, Perbill,
+	testing::Header,
+	traits::{BadOrigin, BlakeTwo256, IdentityLookup},
+	Perbill,
 };
-use pallet_balances::{BalanceLock, Error as BalancesError};
-use frame_system::{EnsureSignedBy, EnsureRoot};
 
 mod cancellation;
+mod decoders;
 mod delegation;
 mod external_proposing;
 mod fast_tracking;
@@ -42,7 +44,6 @@ mod preimage;
 mod public_proposals;
 mod scheduling;
 mod voting;
-mod decoders;
 
 const AYE: Vote = Vote { aye: true, conviction: Conviction::None };
 const NAY: Vote = Vote { aye: false, conviction: Conviction::None };
@@ -194,10 +195,14 @@ impl Config for Test {
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-	pallet_balances::GenesisConfig::<Test>{
+	pallet_balances::GenesisConfig::<Test> {
 		balances: vec![(1, 10), (2, 20), (3, 30), (4, 40), (5, 50), (6, 60)],
-	}.assimilate_storage(&mut t).unwrap();
-	pallet_democracy::GenesisConfig::<Test>::default().assimilate_storage(&mut t).unwrap();
+	}
+	.assimilate_storage(&mut t)
+	.unwrap();
+	pallet_democracy::GenesisConfig::<Test>::default()
+		.assimilate_storage(&mut t)
+		.unwrap();
 	let mut ext = sp_io::TestExternalities::new(t);
 	ext.execute_with(|| System::set_block_number(1));
 	ext
@@ -246,19 +251,11 @@ fn set_balance_proposal_hash_and_note(value: u64) -> H256 {
 }
 
 fn propose_set_balance(who: u64, value: u64, delay: u64) -> DispatchResult {
-	Democracy::propose(
-		Origin::signed(who),
-		set_balance_proposal_hash(value),
-		delay,
-	)
+	Democracy::propose(Origin::signed(who), set_balance_proposal_hash(value), delay)
 }
 
 fn propose_set_balance_and_note(who: u64, value: u64, delay: u64) -> DispatchResult {
-	Democracy::propose(
-		Origin::signed(who),
-		set_balance_proposal_hash_and_note(value),
-		delay,
-	)
+	Democracy::propose(Origin::signed(who), set_balance_proposal_hash_and_note(value), delay)
 }
 
 fn next_block() {
diff --git a/frame/democracy/src/tests/cancellation.rs b/frame/democracy/src/tests/cancellation.rs
index d48173a39d83..c2bd725ce934 100644
--- a/frame/democracy/src/tests/cancellation.rs
+++ b/frame/democracy/src/tests/cancellation.rs
@@ -26,7 +26,7 @@ fn cancel_referendum_should_work() {
 			2,
 			set_balance_proposal_hash_and_note(2),
 			VoteThreshold::SuperMajorityApprove,
-			0
+			0,
 		);
 		assert_ok!(Democracy::vote(Origin::signed(1), r, aye(1)));
 		assert_ok!(Democracy::cancel_referendum(Origin::root(), r.into()));
@@ -67,7 +67,7 @@ fn emergency_cancel_should_work() {
 			2,
 			set_balance_proposal_hash_and_note(2),
 			VoteThreshold::SuperMajorityApprove,
-			2
+			2,
 		);
 		assert!(Democracy::referendum_status(r).is_ok());
 
@@ -81,7 +81,7 @@ fn emergency_cancel_should_work() {
 			2,
 			set_balance_proposal_hash_and_note(2),
 			VoteThreshold::SuperMajorityApprove,
-			2
+			2,
 		);
 		assert!(Democracy::referendum_status(r).is_ok());
 		assert_noop!(
diff --git a/frame/democracy/src/tests/decoders.rs b/frame/democracy/src/tests/decoders.rs
index c3eb9ca7e332..3c1729c4355c 100644
--- a/frame/democracy/src/tests/decoders.rs
+++ b/frame/democracy/src/tests/decoders.rs
@@ -66,7 +66,7 @@ fn pre_image() {
 		assert_noop!(Democracy::check_pre_image_is_missing(key), Error::<Test>::NotImminent);
 
 		for l in vec![0, 10, 100, 1000u32] {
-			let available = PreimageStatus::Available{
+			let available = PreimageStatus::Available {
 				data: (0..l).map(|i| i as u8).collect(),
 				provider: 0,
 				deposit: 0,
@@ -76,8 +76,10 @@ fn pre_image() {
 
 			Preimages::<Test>::insert(key, available);
 			assert_eq!(Democracy::pre_image_data_len(key), Ok(l));
-			assert_noop!(Democracy::check_pre_image_is_missing(key),
-				Error::<Test>::DuplicatePreimage);
+			assert_noop!(
+				Democracy::check_pre_image_is_missing(key),
+				Error::<Test>::DuplicatePreimage
+			);
 		}
 	})
 }
diff --git a/frame/democracy/src/tests/external_proposing.rs b/frame/democracy/src/tests/external_proposing.rs
index 37654a5e9146..7442964584fa 100644
--- a/frame/democracy/src/tests/external_proposing.rs
+++ b/frame/democracy/src/tests/external_proposing.rs
@@ -34,17 +34,17 @@ fn veto_external_works() {
 		// cancelled.
 		assert!(!<NextExternal<Test>>::exists());
 		// fails - same proposal can't be resubmitted.
-		assert_noop!(Democracy::external_propose(
-			Origin::signed(2),
-			set_balance_proposal_hash(2),
-		), Error::<Test>::ProposalBlacklisted);
+		assert_noop!(
+			Democracy::external_propose(Origin::signed(2), set_balance_proposal_hash(2),),
+			Error::<Test>::ProposalBlacklisted
+		);
 
 		fast_forward_to(1);
 		// fails as we're still in cooloff period.
-		assert_noop!(Democracy::external_propose(
-			Origin::signed(2),
-			set_balance_proposal_hash(2),
-		), Error::<Test>::ProposalBlacklisted);
+		assert_noop!(
+			Democracy::external_propose(Origin::signed(2), set_balance_proposal_hash(2),),
+			Error::<Test>::ProposalBlacklisted
+		);
 
 		fast_forward_to(2);
 		// works; as we're out of the cooloff period.
@@ -67,10 +67,10 @@ fn veto_external_works() {
 
 		fast_forward_to(3);
 		// same proposal fails as we're still in cooloff
-		assert_noop!(Democracy::external_propose(
-			Origin::signed(2),
-			set_balance_proposal_hash(2),
-		), Error::<Test>::ProposalBlacklisted);
+		assert_noop!(
+			Democracy::external_propose(Origin::signed(2), set_balance_proposal_hash(2),),
+			Error::<Test>::ProposalBlacklisted
+		);
 		// different proposal works fine.
 		assert_ok!(Democracy::external_propose(
 			Origin::signed(2),
@@ -96,10 +96,7 @@ fn external_blacklisting_should_work() {
 		assert_noop!(Democracy::referendum_status(0), Error::<Test>::ReferendumInvalid);
 
 		assert_noop!(
-			Democracy::external_propose(
-				Origin::signed(2),
-				set_balance_proposal_hash_and_note(2),
-			),
+			Democracy::external_propose(Origin::signed(2), set_balance_proposal_hash_and_note(2),),
 			Error::<Test>::ProposalBlacklisted,
 		);
 	});
@@ -110,20 +107,17 @@ fn external_referendum_works() {
 	new_test_ext().execute_with(|| {
 		System::set_block_number(0);
 		assert_noop!(
-			Democracy::external_propose(
-				Origin::signed(1),
-				set_balance_proposal_hash(2),
-			),
+			Democracy::external_propose(Origin::signed(1), set_balance_proposal_hash(2),),
 			BadOrigin,
 		);
 		assert_ok!(Democracy::external_propose(
 			Origin::signed(2),
 			set_balance_proposal_hash_and_note(2),
 		));
-		assert_noop!(Democracy::external_propose(
-			Origin::signed(2),
-			set_balance_proposal_hash(1),
-		), Error::<Test>::DuplicateProposal);
+		assert_noop!(
+			Democracy::external_propose(Origin::signed(2), set_balance_proposal_hash(1),),
+			Error::<Test>::DuplicateProposal
+		);
 		fast_forward_to(2);
 		assert_eq!(
 			Democracy::referendum_status(0),
@@ -143,10 +137,7 @@ fn external_majority_referendum_works() {
 	new_test_ext().execute_with(|| {
 		System::set_block_number(0);
 		assert_noop!(
-			Democracy::external_propose_majority(
-				Origin::signed(1),
-				set_balance_proposal_hash(2)
-			),
+			Democracy::external_propose_majority(Origin::signed(1), set_balance_proposal_hash(2)),
 			BadOrigin,
 		);
 		assert_ok!(Democracy::external_propose_majority(
@@ -172,10 +163,7 @@ fn external_default_referendum_works() {
 	new_test_ext().execute_with(|| {
 		System::set_block_number(0);
 		assert_noop!(
-			Democracy::external_propose_default(
-				Origin::signed(3),
-				set_balance_proposal_hash(2)
-			),
+			Democracy::external_propose_default(Origin::signed(3), set_balance_proposal_hash(2)),
 			BadOrigin,
 		);
 		assert_ok!(Democracy::external_propose_default(
@@ -196,7 +184,6 @@ fn external_default_referendum_works() {
 	});
 }
 
-
 #[test]
 fn external_and_public_interleaving_works() {
 	new_test_ext().execute_with(|| {
@@ -222,9 +209,9 @@ fn external_and_public_interleaving_works() {
 		);
 		// replenish external
 		assert_ok!(Democracy::external_propose(
-				Origin::signed(2),
-				set_balance_proposal_hash_and_note(3),
-			));
+			Origin::signed(2),
+			set_balance_proposal_hash_and_note(3),
+		));
 
 		fast_forward_to(4);
 
@@ -256,9 +243,9 @@ fn external_and_public_interleaving_works() {
 		);
 		// replenish external
 		assert_ok!(Democracy::external_propose(
-				Origin::signed(2),
-				set_balance_proposal_hash_and_note(5),
-			));
+			Origin::signed(2),
+			set_balance_proposal_hash_and_note(5),
+		));
 
 		fast_forward_to(8);
 
diff --git a/frame/democracy/src/tests/fast_tracking.rs b/frame/democracy/src/tests/fast_tracking.rs
index d01dafaa762b..9b2f2760bde1 100644
--- a/frame/democracy/src/tests/fast_tracking.rs
+++ b/frame/democracy/src/tests/fast_tracking.rs
@@ -24,7 +24,10 @@ fn fast_track_referendum_works() {
 	new_test_ext().execute_with(|| {
 		System::set_block_number(0);
 		let h = set_balance_proposal_hash_and_note(2);
-		assert_noop!(Democracy::fast_track(Origin::signed(5), h, 3, 2), Error::<Test>::ProposalMissing);
+		assert_noop!(
+			Democracy::fast_track(Origin::signed(5), h, 3, 2),
+			Error::<Test>::ProposalMissing
+		);
 		assert_ok!(Democracy::external_propose_majority(
 			Origin::signed(3),
 			set_balance_proposal_hash_and_note(2)
@@ -49,14 +52,20 @@ fn instant_referendum_works() {
 	new_test_ext().execute_with(|| {
 		System::set_block_number(0);
 		let h = set_balance_proposal_hash_and_note(2);
-		assert_noop!(Democracy::fast_track(Origin::signed(5), h, 3, 2), Error::<Test>::ProposalMissing);
+		assert_noop!(
+			Democracy::fast_track(Origin::signed(5), h, 3, 2),
+			Error::<Test>::ProposalMissing
+		);
 		assert_ok!(Democracy::external_propose_majority(
 			Origin::signed(3),
 			set_balance_proposal_hash_and_note(2)
 		));
 		assert_noop!(Democracy::fast_track(Origin::signed(1), h, 3, 2), BadOrigin);
 		assert_noop!(Democracy::fast_track(Origin::signed(5), h, 1, 0), BadOrigin);
-		assert_noop!(Democracy::fast_track(Origin::signed(6), h, 1, 0), Error::<Test>::InstantNotAllowed);
+		assert_noop!(
+			Democracy::fast_track(Origin::signed(6), h, 1, 0),
+			Error::<Test>::InstantNotAllowed
+		);
 		INSTANT_ALLOWED.with(|v| *v.borrow_mut() = true);
 		assert_ok!(Democracy::fast_track(Origin::signed(6), h, 1, 0));
 		assert_eq!(
diff --git a/frame/democracy/src/tests/lock_voting.rs b/frame/democracy/src/tests/lock_voting.rs
index 29cd24e1de60..c1a27400fe55 100644
--- a/frame/democracy/src/tests/lock_voting.rs
+++ b/frame/democracy/src/tests/lock_voting.rs
@@ -23,23 +23,19 @@ use std::convert::TryFrom;
 fn aye(x: u8, balance: u64) -> AccountVote<u64> {
 	AccountVote::Standard {
 		vote: Vote { aye: true, conviction: Conviction::try_from(x).unwrap() },
-		balance
+		balance,
 	}
 }
 
 fn nay(x: u8, balance: u64) -> AccountVote<u64> {
 	AccountVote::Standard {
 		vote: Vote { aye: false, conviction: Conviction::try_from(x).unwrap() },
-		balance
+		balance,
 	}
 }
 
 fn the_lock(amount: u64) -> BalanceLock<u64> {
-	BalanceLock {
-		id: DEMOCRACY_ID,
-		amount,
-		reasons: pallet_balances::Reasons::Misc,
-	}
+	BalanceLock { id: DEMOCRACY_ID, amount, reasons: pallet_balances::Reasons::Misc }
 }
 
 #[test]
@@ -50,7 +46,7 @@ fn lock_voting_should_work() {
 			2,
 			set_balance_proposal_hash_and_note(2),
 			VoteThreshold::SuperMajorityApprove,
-			0
+			0,
 		);
 		assert_ok!(Democracy::vote(Origin::signed(1), r, nay(5, 10)));
 		assert_ok!(Democracy::vote(Origin::signed(2), r, aye(4, 20)));
@@ -74,7 +70,10 @@ fn lock_voting_should_work() {
 		assert_ok!(Democracy::unlock(Origin::signed(2), 5));
 
 		// 2, 3, 4 got their way with the vote, so they cannot be reaped by others.
-		assert_noop!(Democracy::remove_other_vote(Origin::signed(1), 2, r), Error::<Test>::NoPermission);
+		assert_noop!(
+			Democracy::remove_other_vote(Origin::signed(1), 2, r),
+			Error::<Test>::NoPermission
+		);
 		// However, they can be unvoted by the owner, though it will make no difference to the lock.
 		assert_ok!(Democracy::remove_vote(Origin::signed(2), r));
 		assert_ok!(Democracy::unlock(Origin::signed(2), 2));
@@ -86,10 +85,12 @@ fn lock_voting_should_work() {
 		assert_eq!(Balances::locks(5), vec![]);
 		assert_eq!(Balances::free_balance(42), 2);
 
-
 		fast_forward_to(5);
 		// No change yet...
-		assert_noop!(Democracy::remove_other_vote(Origin::signed(1), 4, r), Error::<Test>::NoPermission);
+		assert_noop!(
+			Democracy::remove_other_vote(Origin::signed(1), 4, r),
+			Error::<Test>::NoPermission
+		);
 		assert_ok!(Democracy::unlock(Origin::signed(1), 4));
 		assert_eq!(Balances::locks(4), vec![the_lock(40)]);
 		fast_forward_to(6);
@@ -99,7 +100,10 @@ fn lock_voting_should_work() {
 		assert_eq!(Balances::locks(4), vec![]);
 
 		fast_forward_to(9);
-		assert_noop!(Democracy::remove_other_vote(Origin::signed(1), 3, r), Error::<Test>::NoPermission);
+		assert_noop!(
+			Democracy::remove_other_vote(Origin::signed(1), 3, r),
+			Error::<Test>::NoPermission
+		);
 		assert_ok!(Democracy::unlock(Origin::signed(1), 3));
 		assert_eq!(Balances::locks(3), vec![the_lock(30)]);
 		fast_forward_to(10);
@@ -145,7 +149,7 @@ fn lock_voting_should_work_with_delegation() {
 			2,
 			set_balance_proposal_hash_and_note(2),
 			VoteThreshold::SuperMajorityApprove,
-			0
+			0,
 		);
 		assert_ok!(Democracy::vote(Origin::signed(1), r, nay(5, 10)));
 		assert_ok!(Democracy::vote(Origin::signed(2), r, aye(4, 20)));
@@ -168,7 +172,7 @@ fn setup_three_referenda() -> (u32, u32, u32) {
 		2,
 		set_balance_proposal_hash_and_note(2),
 		VoteThreshold::SimpleMajority,
-		0
+		0,
 	);
 	assert_ok!(Democracy::vote(Origin::signed(5), r1, aye(4, 10)));
 
@@ -176,7 +180,7 @@ fn setup_three_referenda() -> (u32, u32, u32) {
 		2,
 		set_balance_proposal_hash_and_note(2),
 		VoteThreshold::SimpleMajority,
-		0
+		0,
 	);
 	assert_ok!(Democracy::vote(Origin::signed(5), r2, aye(3, 20)));
 
@@ -184,7 +188,7 @@ fn setup_three_referenda() -> (u32, u32, u32) {
 		2,
 		set_balance_proposal_hash_and_note(2),
 		VoteThreshold::SimpleMajority,
-		0
+		0,
 	);
 	assert_ok!(Democracy::vote(Origin::signed(5), r3, aye(2, 50)));
 
@@ -202,7 +206,10 @@ fn prior_lockvotes_should_be_enforced() {
 		// r.2 locked 50 until #6.
 
 		fast_forward_to(5);
-		assert_noop!(Democracy::remove_other_vote(Origin::signed(1), 5, r.2), Error::<Test>::NoPermission);
+		assert_noop!(
+			Democracy::remove_other_vote(Origin::signed(1), 5, r.2),
+			Error::<Test>::NoPermission
+		);
 		assert_ok!(Democracy::unlock(Origin::signed(5), 5));
 		assert_eq!(Balances::locks(5), vec![the_lock(50)]);
 		fast_forward_to(6);
@@ -210,7 +217,10 @@ fn prior_lockvotes_should_be_enforced() {
 		assert_ok!(Democracy::unlock(Origin::signed(5), 5));
 		assert_eq!(Balances::locks(5), vec![the_lock(20)]);
 		fast_forward_to(9);
-		assert_noop!(Democracy::remove_other_vote(Origin::signed(1), 5, r.1), Error::<Test>::NoPermission);
+		assert_noop!(
+			Democracy::remove_other_vote(Origin::signed(1), 5, r.1),
+			Error::<Test>::NoPermission
+		);
 		assert_ok!(Democracy::unlock(Origin::signed(5), 5));
 		assert_eq!(Balances::locks(5), vec![the_lock(20)]);
 		fast_forward_to(10);
@@ -218,7 +228,10 @@ fn prior_lockvotes_should_be_enforced() {
 		assert_ok!(Democracy::unlock(Origin::signed(5), 5));
 		assert_eq!(Balances::locks(5), vec![the_lock(10)]);
 		fast_forward_to(17);
-		assert_noop!(Democracy::remove_other_vote(Origin::signed(1), 5, r.0), Error::<Test>::NoPermission);
+		assert_noop!(
+			Democracy::remove_other_vote(Origin::signed(1), 5, r.0),
+			Error::<Test>::NoPermission
+		);
 		assert_ok!(Democracy::unlock(Origin::signed(5), 5));
 		assert_eq!(Balances::locks(5), vec![the_lock(10)]);
 		fast_forward_to(18);
@@ -296,7 +309,7 @@ fn locks_should_persist_from_voting_to_delegation() {
 			2,
 			set_balance_proposal_hash_and_note(2),
 			VoteThreshold::SimpleMajority,
-			0
+			0,
 		);
 		assert_ok!(Democracy::vote(Origin::signed(5), r, aye(4, 10)));
 		fast_forward_to(2);
diff --git a/frame/democracy/src/tests/preimage.rs b/frame/democracy/src/tests/preimage.rs
index a412343299d9..6d478fcaa68c 100644
--- a/frame/democracy/src/tests/preimage.rs
+++ b/frame/democracy/src/tests/preimage.rs
@@ -26,7 +26,7 @@ fn missing_preimage_should_fail() {
 			2,
 			set_balance_proposal_hash(2),
 			VoteThreshold::SuperMajorityApprove,
-			0
+			0,
 		);
 		assert_ok!(Democracy::vote(Origin::signed(1), r, aye(1)));
 
@@ -43,8 +43,11 @@ fn preimage_deposit_should_be_required_and_returned() {
 		// fee of 100 is too much.
 		PREIMAGE_BYTE_DEPOSIT.with(|v| *v.borrow_mut() = 100);
 		assert_noop!(
-			if operational { Democracy::note_preimage_operational(Origin::signed(6), vec![0; 500]) }
-			else { Democracy::note_preimage(Origin::signed(6), vec![0; 500]) },
+			if operational {
+				Democracy::note_preimage_operational(Origin::signed(6), vec![0; 500])
+			} else {
+				Democracy::note_preimage(Origin::signed(6), vec![0; 500])
+			},
 			BalancesError::<Test, _>::InsufficientBalance,
 		);
 		// fee of 1 is reasonable.
@@ -53,7 +56,7 @@ fn preimage_deposit_should_be_required_and_returned() {
 			2,
 			set_balance_proposal_hash_and_note(2),
 			VoteThreshold::SuperMajorityApprove,
-			0
+			0,
 		);
 		assert_ok!(Democracy::vote(Origin::signed(1), r, aye(1)));
 
@@ -72,10 +75,11 @@ fn preimage_deposit_should_be_required_and_returned() {
 fn preimage_deposit_should_be_reapable_earlier_by_owner() {
 	new_test_ext_execute_with_cond(|operational| {
 		PREIMAGE_BYTE_DEPOSIT.with(|v| *v.borrow_mut() = 1);
-		assert_ok!(
-			if operational { Democracy::note_preimage_operational(Origin::signed(6), set_balance_proposal(2)) }
-			else { Democracy::note_preimage(Origin::signed(6), set_balance_proposal(2)) }
-		);
+		assert_ok!(if operational {
+			Democracy::note_preimage_operational(Origin::signed(6), set_balance_proposal(2))
+		} else {
+			Democracy::note_preimage(Origin::signed(6), set_balance_proposal(2))
+		});
 
 		assert_eq!(Balances::reserved_balance(6), 12);
 
@@ -85,7 +89,11 @@ fn preimage_deposit_should_be_reapable_earlier_by_owner() {
 			Error::<Test>::TooEarly
 		);
 		next_block();
-		assert_ok!(Democracy::reap_preimage(Origin::signed(6), set_balance_proposal_hash(2), u32::MAX));
+		assert_ok!(Democracy::reap_preimage(
+			Origin::signed(6),
+			set_balance_proposal_hash(2),
+			u32::MAX
+		));
 
 		assert_eq!(Balances::free_balance(6), 60);
 		assert_eq!(Balances::reserved_balance(6), 0);
@@ -96,27 +104,32 @@ fn preimage_deposit_should_be_reapable_earlier_by_owner() {
 fn preimage_deposit_should_be_reapable() {
 	new_test_ext_execute_with_cond(|operational| {
 		assert_noop!(
-				Democracy::reap_preimage(Origin::signed(5), set_balance_proposal_hash(2), u32::MAX),
-				Error::<Test>::PreimageMissing
-			);
+			Democracy::reap_preimage(Origin::signed(5), set_balance_proposal_hash(2), u32::MAX),
+			Error::<Test>::PreimageMissing
+		);
 
 		PREIMAGE_BYTE_DEPOSIT.with(|v| *v.borrow_mut() = 1);
-		assert_ok!(
-			if operational { Democracy::note_preimage_operational(Origin::signed(6), set_balance_proposal(2)) }
-			else { Democracy::note_preimage(Origin::signed(6), set_balance_proposal(2)) }
-		);
+		assert_ok!(if operational {
+			Democracy::note_preimage_operational(Origin::signed(6), set_balance_proposal(2))
+		} else {
+			Democracy::note_preimage(Origin::signed(6), set_balance_proposal(2))
+		});
 		assert_eq!(Balances::reserved_balance(6), 12);
 
 		next_block();
 		next_block();
 		next_block();
 		assert_noop!(
-				Democracy::reap_preimage(Origin::signed(5), set_balance_proposal_hash(2), u32::MAX),
-				Error::<Test>::TooEarly
-			);
+			Democracy::reap_preimage(Origin::signed(5), set_balance_proposal_hash(2), u32::MAX),
+			Error::<Test>::TooEarly
+		);
 
 		next_block();
-		assert_ok!(Democracy::reap_preimage(Origin::signed(5), set_balance_proposal_hash(2), u32::MAX));
+		assert_ok!(Democracy::reap_preimage(
+			Origin::signed(5),
+			set_balance_proposal_hash(2),
+			u32::MAX
+		));
 		assert_eq!(Balances::reserved_balance(6), 0);
 		assert_eq!(Balances::free_balance(6), 48);
 		assert_eq!(Balances::free_balance(5), 62);
@@ -132,13 +145,19 @@ fn noting_imminent_preimage_for_free_should_work() {
 			2,
 			set_balance_proposal_hash(2),
 			VoteThreshold::SuperMajorityApprove,
-			1
+			1,
 		);
 		assert_ok!(Democracy::vote(Origin::signed(1), r, aye(1)));
 
 		assert_noop!(
-			if operational { Democracy::note_imminent_preimage_operational(Origin::signed(6), set_balance_proposal(2)) }
-			else { Democracy::note_imminent_preimage(Origin::signed(6), set_balance_proposal(2)) },
+			if operational {
+				Democracy::note_imminent_preimage_operational(
+					Origin::signed(6),
+					set_balance_proposal(2),
+				)
+			} else {
+				Democracy::note_imminent_preimage(Origin::signed(6), set_balance_proposal(2))
+			},
 			Error::<Test>::NotImminent
 		);
 
@@ -161,7 +180,10 @@ fn reaping_imminent_preimage_should_fail() {
 		assert_ok!(Democracy::vote(Origin::signed(1), r, aye(1)));
 		next_block();
 		next_block();
-		assert_noop!(Democracy::reap_preimage(Origin::signed(6), h, u32::MAX), Error::<Test>::Imminent);
+		assert_noop!(
+			Democracy::reap_preimage(Origin::signed(6), h, u32::MAX),
+			Error::<Test>::Imminent
+		);
 	});
 }
 
@@ -174,7 +196,7 @@ fn note_imminent_preimage_can_only_be_successful_once() {
 			2,
 			set_balance_proposal_hash(2),
 			VoteThreshold::SuperMajorityApprove,
-			1
+			1,
 		);
 		assert_ok!(Democracy::vote(Origin::signed(1), r, aye(1)));
 		next_block();
diff --git a/frame/democracy/src/tests/public_proposals.rs b/frame/democracy/src/tests/public_proposals.rs
index 1d323d684d7f..34713c3e1572 100644
--- a/frame/democracy/src/tests/public_proposals.rs
+++ b/frame/democracy/src/tests/public_proposals.rs
@@ -89,10 +89,7 @@ fn poor_seconder_should_not_work() {
 fn invalid_seconds_upper_bound_should_not_work() {
 	new_test_ext().execute_with(|| {
 		assert_ok!(propose_set_balance_and_note(1, 2, 5));
-		assert_noop!(
-			Democracy::second(Origin::signed(2), 0, 0),
-			Error::<Test>::WrongUpperBound
-		);
+		assert_noop!(Democracy::second(Origin::signed(2), 0, 0), Error::<Test>::WrongUpperBound);
 	});
 }
 
diff --git a/frame/democracy/src/tests/scheduling.rs b/frame/democracy/src/tests/scheduling.rs
index e178ff0fc1a2..06b492bc6093 100644
--- a/frame/democracy/src/tests/scheduling.rs
+++ b/frame/democracy/src/tests/scheduling.rs
@@ -26,7 +26,7 @@ fn simple_passing_should_work() {
 			2,
 			set_balance_proposal_hash_and_note(2),
 			VoteThreshold::SuperMajorityApprove,
-			0
+			0,
 		);
 		assert_ok!(Democracy::vote(Origin::signed(1), r, aye(1)));
 		assert_eq!(tally(r), Tally { ayes: 1, nays: 0, turnout: 10 });
@@ -43,7 +43,7 @@ fn simple_failing_should_work() {
 			2,
 			set_balance_proposal_hash_and_note(2),
 			VoteThreshold::SuperMajorityApprove,
-			0
+			0,
 		);
 		assert_ok!(Democracy::vote(Origin::signed(1), r, nay(1)));
 		assert_eq!(tally(r), Tally { ayes: 0, nays: 1, turnout: 10 });
@@ -62,13 +62,13 @@ fn ooo_inject_referendums_should_work() {
 			3,
 			set_balance_proposal_hash_and_note(3),
 			VoteThreshold::SuperMajorityApprove,
-			0
+			0,
 		);
 		let r2 = Democracy::inject_referendum(
 			2,
 			set_balance_proposal_hash_and_note(2),
 			VoteThreshold::SuperMajorityApprove,
-			0
+			0,
 		);
 
 		assert_ok!(Democracy::vote(Origin::signed(1), r2, aye(1)));
@@ -92,7 +92,7 @@ fn delayed_enactment_should_work() {
 			2,
 			set_balance_proposal_hash_and_note(2),
 			VoteThreshold::SuperMajorityApprove,
-			1
+			1,
 		);
 		assert_ok!(Democracy::vote(Origin::signed(1), r, aye(1)));
 		assert_ok!(Democracy::vote(Origin::signed(2), r, aye(2)));
diff --git a/frame/democracy/src/tests/voting.rs b/frame/democracy/src/tests/voting.rs
index 13072ebf87b1..e035c2d46c1b 100644
--- a/frame/democracy/src/tests/voting.rs
+++ b/frame/democracy/src/tests/voting.rs
@@ -23,7 +23,10 @@ use super::*;
 fn overvoting_should_fail() {
 	new_test_ext().execute_with(|| {
 		let r = begin_referendum();
-		assert_noop!(Democracy::vote(Origin::signed(1), r, aye(2)), Error::<Test>::InsufficientFunds);
+		assert_noop!(
+			Democracy::vote(Origin::signed(1), r, aye(2)),
+			Error::<Test>::InsufficientFunds
+		);
 	});
 }
 
@@ -102,7 +105,7 @@ fn controversial_voting_should_work() {
 			2,
 			set_balance_proposal_hash_and_note(2),
 			VoteThreshold::SuperMajorityApprove,
-			0
+			0,
 		);
 
 		assert_ok!(Democracy::vote(Origin::signed(1), r, big_aye(1)));
@@ -128,7 +131,7 @@ fn controversial_low_turnout_voting_should_work() {
 			2,
 			set_balance_proposal_hash_and_note(2),
 			VoteThreshold::SuperMajorityApprove,
-			0
+			0,
 		);
 		assert_ok!(Democracy::vote(Origin::signed(5), r, big_nay(5)));
 		assert_ok!(Democracy::vote(Origin::signed(6), r, big_aye(6)));
@@ -152,7 +155,7 @@ fn passing_low_turnout_voting_should_work() {
 			2,
 			set_balance_proposal_hash_and_note(2),
 			VoteThreshold::SuperMajorityApprove,
-			0
+			0,
 		);
 		assert_ok!(Democracy::vote(Origin::signed(4), r, big_aye(4)));
 		assert_ok!(Democracy::vote(Origin::signed(5), r, big_nay(5)));
diff --git a/frame/democracy/src/types.rs b/frame/democracy/src/types.rs
index 22341ba31ee0..4e643006e516 100644
--- a/frame/democracy/src/types.rs
+++ b/frame/democracy/src/types.rs
@@ -17,29 +17,31 @@
 
 //! Miscellaneous additional datatypes.
 
-use codec::{Encode, Decode};
-use sp_runtime::RuntimeDebug;
-use sp_runtime::traits::{Zero, Bounded, CheckedAdd, CheckedSub, CheckedMul, CheckedDiv, Saturating};
-use crate::{Vote, VoteThreshold, AccountVote, Conviction};
+use crate::{AccountVote, Conviction, Vote, VoteThreshold};
+use codec::{Decode, Encode};
+use sp_runtime::{
+	traits::{Bounded, CheckedAdd, CheckedDiv, CheckedMul, CheckedSub, Saturating, Zero},
+	RuntimeDebug,
+};
 
 /// Info regarding an ongoing referendum.
 #[derive(Encode, Decode, Default, Clone, PartialEq, Eq, RuntimeDebug)]
 pub struct Tally<Balance> {
 	/// The number of aye votes, expressed in terms of post-conviction lock-vote.
-	pub (crate) ayes: Balance,
+	pub(crate) ayes: Balance,
 	/// The number of nay votes, expressed in terms of post-conviction lock-vote.
-	pub (crate) nays: Balance,
+	pub(crate) nays: Balance,
 	/// The amount of funds currently expressing its opinion. Pre-conviction.
-	pub (crate) turnout: Balance,
+	pub(crate) turnout: Balance,
 }
 
 /// Amount of votes and capital placed in delegation for an account.
 #[derive(Encode, Decode, Default, Copy, Clone, PartialEq, Eq, RuntimeDebug)]
 pub struct Delegations<Balance> {
 	/// The number of votes (this is post-conviction).
-	pub (crate) votes: Balance,
+	pub(crate) votes: Balance,
 	/// The amount of raw capital, used for the turnout.
-	pub (crate) capital: Balance,
+	pub(crate) capital: Balance,
 }
 
 impl<Balance: Saturating> Saturating for Delegations<Balance> {
@@ -65,22 +67,24 @@ impl<Balance: Saturating> Saturating for Delegations<Balance> {
 	}
 
 	fn saturating_pow(self, exp: usize) -> Self {
-		Self {
-			votes: self.votes.saturating_pow(exp),
-			capital: self.capital.saturating_pow(exp),
-		}
+		Self { votes: self.votes.saturating_pow(exp), capital: self.capital.saturating_pow(exp) }
 	}
 }
 
 impl<
-	Balance: From<u8> + Zero + Copy + CheckedAdd + CheckedSub + CheckedMul + CheckedDiv + Bounded +
-		Saturating
-> Tally<Balance> {
+		Balance: From<u8>
+			+ Zero
+			+ Copy
+			+ CheckedAdd
+			+ CheckedSub
+			+ CheckedMul
+			+ CheckedDiv
+			+ Bounded
+			+ Saturating,
+	> Tally<Balance>
+{
 	/// Create a new tally.
-	pub fn new(
-		vote: Vote,
-		balance: Balance,
-	) -> Self {
+	pub fn new(vote: Vote, balance: Balance) -> Self {
 		let Delegations { votes, capital } = vote.conviction.votes(balance);
 		Self {
 			ayes: if vote.aye { votes } else { Zero::zero() },
@@ -90,10 +94,7 @@ impl<
 	}
 
 	/// Add an account's vote into the tally.
-	pub fn add(
-		&mut self,
-		vote: AccountVote<Balance>,
-	) -> Option<()> {
+	pub fn add(&mut self, vote: AccountVote<Balance>) -> Option<()> {
 		match vote {
 			AccountVote::Standard { vote, balance } => {
 				let Delegations { votes, capital } = vote.conviction.votes(balance);
@@ -102,23 +103,20 @@ impl<
 					true => self.ayes = self.ayes.checked_add(&votes)?,
 					false => self.nays = self.nays.checked_add(&votes)?,
 				}
-			}
+			},
 			AccountVote::Split { aye, nay } => {
 				let aye = Conviction::None.votes(aye);
 				let nay = Conviction::None.votes(nay);
 				self.turnout = self.turnout.checked_add(&aye.capital)?.checked_add(&nay.capital)?;
 				self.ayes = self.ayes.checked_add(&aye.votes)?;
 				self.nays = self.nays.checked_add(&nay.votes)?;
-			}
+			},
 		}
 		Some(())
 	}
 
 	/// Remove an account's vote from the tally.
-	pub fn remove(
-		&mut self,
-		vote: AccountVote<Balance>,
-	) -> Option<()> {
+	pub fn remove(&mut self, vote: AccountVote<Balance>) -> Option<()> {
 		match vote {
 			AccountVote::Standard { vote, balance } => {
 				let Delegations { votes, capital } = vote.conviction.votes(balance);
@@ -127,14 +125,14 @@ impl<
 					true => self.ayes = self.ayes.checked_sub(&votes)?,
 					false => self.nays = self.nays.checked_sub(&votes)?,
 				}
-			}
+			},
 			AccountVote::Split { aye, nay } => {
 				let aye = Conviction::None.votes(aye);
 				let nay = Conviction::None.votes(nay);
 				self.turnout = self.turnout.checked_sub(&aye.capital)?.checked_sub(&nay.capital)?;
 				self.ayes = self.ayes.checked_sub(&aye.votes)?;
 				self.nays = self.nays.checked_sub(&nay.votes)?;
-			}
+			},
 		}
 		Some(())
 	}
@@ -164,15 +162,15 @@ impl<
 #[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug)]
 pub struct ReferendumStatus<BlockNumber, Hash, Balance> {
 	/// When voting on this referendum will end.
-	pub (crate) end: BlockNumber,
+	pub(crate) end: BlockNumber,
 	/// The hash of the proposal being voted on.
-	pub (crate) proposal_hash: Hash,
+	pub(crate) proposal_hash: Hash,
 	/// The thresholding mechanism to determine whether it passed.
-	pub (crate) threshold: VoteThreshold,
+	pub(crate) threshold: VoteThreshold,
 	/// The delay (in blocks) to wait after a successful referendum before deploying.
-	pub (crate) delay: BlockNumber,
+	pub(crate) delay: BlockNumber,
 	/// The current tally of votes in this referendum.
-	pub (crate) tally: Tally<Balance>,
+	pub(crate) tally: Tally<Balance>,
 }
 
 /// Info regarding a referendum, present or past.
@@ -181,7 +179,7 @@ pub enum ReferendumInfo<BlockNumber, Hash, Balance> {
 	/// Referendum is happening, the arg is the block number at which it will end.
 	Ongoing(ReferendumStatus<BlockNumber, Hash, Balance>),
 	/// Referendum finished at `end`, and has been `approved` or rejected.
-	Finished{approved: bool, end: BlockNumber},
+	Finished { approved: bool, end: BlockNumber },
 }
 
 impl<BlockNumber, Hash, Balance: Default> ReferendumInfo<BlockNumber, Hash, Balance> {
@@ -192,7 +190,7 @@ impl<BlockNumber, Hash, Balance: Default> ReferendumInfo<BlockNumber, Hash, Bala
 		threshold: VoteThreshold,
 		delay: BlockNumber,
 	) -> Self {
-		let s = ReferendumStatus{ end, proposal_hash, threshold, delay, tally: Tally::default() };
+		let s = ReferendumStatus { end, proposal_hash, threshold, delay, tally: Tally::default() };
 		ReferendumInfo::Ongoing(s)
 	}
 }
diff --git a/frame/democracy/src/vote.rs b/frame/democracy/src/vote.rs
index 5adc76f4ae00..7b1b32ea37f5 100644
--- a/frame/democracy/src/vote.rs
+++ b/frame/democracy/src/vote.rs
@@ -17,10 +17,13 @@
 
 //! The vote datatype.
 
-use sp_std::{prelude::*, result::Result, convert::TryFrom};
-use codec::{Encode, EncodeLike, Decode, Output, Input};
-use sp_runtime::{RuntimeDebug, traits::{Saturating, Zero}};
-use crate::{Conviction, ReferendumIndex, Delegations};
+use crate::{Conviction, Delegations, ReferendumIndex};
+use codec::{Decode, Encode, EncodeLike, Input, Output};
+use sp_runtime::{
+	traits::{Saturating, Zero},
+	RuntimeDebug,
+};
+use sp_std::{convert::TryFrom, prelude::*, result::Result};
 
 /// A number of lock periods, plus a vote, one way or the other.
 #[derive(Copy, Clone, Eq, PartialEq, Default, RuntimeDebug)]
@@ -136,7 +139,9 @@ pub enum Voting<Balance, AccountId, BlockNumber> {
 	},
 }
 
-impl<Balance: Default, AccountId, BlockNumber: Zero> Default for Voting<Balance, AccountId, BlockNumber> {
+impl<Balance: Default, AccountId, BlockNumber: Zero> Default
+	for Voting<Balance, AccountId, BlockNumber>
+{
 	fn default() -> Self {
 		Voting::Direct {
 			votes: Vec::new(),
@@ -146,31 +151,30 @@ impl<Balance: Default, AccountId, BlockNumber: Zero> Default for Voting<Balance,
 	}
 }
 
-impl<
-	Balance: Saturating + Ord + Zero + Copy,
-	BlockNumber: Ord + Copy + Zero,
-	AccountId,
-> Voting<Balance, AccountId, BlockNumber> {
+impl<Balance: Saturating + Ord + Zero + Copy, BlockNumber: Ord + Copy + Zero, AccountId>
+	Voting<Balance, AccountId, BlockNumber>
+{
 	pub fn rejig(&mut self, now: BlockNumber) {
 		match self {
 			Voting::Direct { prior, .. } => prior,
 			Voting::Delegating { prior, .. } => prior,
-		}.rejig(now);
+		}
+		.rejig(now);
 	}
 
 	/// The amount of this account's balance that much currently be locked due to voting.
 	pub fn locked_balance(&self) -> Balance {
 		match self {
-			Voting::Direct { votes, prior, .. } => votes.iter()
-				.map(|i| i.1.balance())
-				.fold(prior.locked(), |a, i| a.max(i)),
+			Voting::Direct { votes, prior, .. } =>
+				votes.iter().map(|i| i.1.balance()).fold(prior.locked(), |a, i| a.max(i)),
 			Voting::Delegating { balance, .. } => *balance,
 		}
 	}
 
-	pub fn set_common(&mut self,
+	pub fn set_common(
+		&mut self,
 		delegations: Delegations<Balance>,
-		prior: PriorLock<BlockNumber, Balance>
+		prior: PriorLock<BlockNumber, Balance>,
 	) {
 		let (d, p) = match self {
 			Voting::Direct { ref mut delegations, ref mut prior, .. } => (delegations, prior),
diff --git a/frame/democracy/src/vote_threshold.rs b/frame/democracy/src/vote_threshold.rs
index 3114b22499d0..feaa596921c4 100644
--- a/frame/democracy/src/vote_threshold.rs
+++ b/frame/democracy/src/vote_threshold.rs
@@ -17,12 +17,12 @@
 
 //! Voting thresholds.
 
-#[cfg(feature = "std")]
-use serde::{Serialize, Deserialize};
-use codec::{Encode, Decode};
-use sp_runtime::traits::{Zero, IntegerSquareRoot};
-use sp_std::ops::{Add, Mul, Div, Rem};
 use crate::Tally;
+use codec::{Decode, Encode};
+#[cfg(feature = "std")]
+use serde::{Deserialize, Serialize};
+use sp_runtime::traits::{IntegerSquareRoot, Zero};
+use sp_std::ops::{Add, Div, Mul, Rem};
 
 /// A means of determining if a vote is past pass threshold.
 #[derive(Clone, Copy, PartialEq, Eq, Encode, Decode, sp_runtime::RuntimeDebug)]
@@ -43,25 +43,32 @@ pub trait Approved<Balance> {
 }
 
 /// Return `true` iff `n1 / d1 < n2 / d2`. `d1` and `d2` may not be zero.
-fn compare_rationals<T: Zero + Mul<T, Output = T> + Div<T, Output = T> + Rem<T, Output = T> + Ord + Copy>(mut n1: T, mut d1: T, mut n2: T, mut d2: T) -> bool {
+fn compare_rationals<
+	T: Zero + Mul<T, Output = T> + Div<T, Output = T> + Rem<T, Output = T> + Ord + Copy,
+>(
+	mut n1: T,
+	mut d1: T,
+	mut n2: T,
+	mut d2: T,
+) -> bool {
 	// Uses a continued fractional representation for a non-overflowing compare.
 	// Detailed at https://janmr.com/blog/2014/05/comparing-rational-numbers-without-overflow/.
 	loop {
 		let q1 = n1 / d1;
 		let q2 = n2 / d2;
 		if q1 < q2 {
-			return true;
+			return true
 		}
 		if q2 < q1 {
-			return false;
+			return false
 		}
 		let r1 = n1 % d1;
 		let r2 = n2 % d2;
 		if r2.is_zero() {
-			return false;
+			return false
 		}
 		if r1.is_zero() {
-			return true;
+			return true
 		}
 		n1 = d2;
 		n2 = d1;
@@ -71,14 +78,22 @@ fn compare_rationals<T: Zero + Mul<T, Output = T> + Div<T, Output = T> + Rem<T,
 }
 
 impl<
-	Balance: IntegerSquareRoot + Zero + Ord + Add<Balance, Output = Balance>
-		+ Mul<Balance, Output = Balance> + Div<Balance, Output = Balance>
-		+ Rem<Balance, Output = Balance> + Copy,
-> Approved<Balance> for VoteThreshold {
+		Balance: IntegerSquareRoot
+			+ Zero
+			+ Ord
+			+ Add<Balance, Output = Balance>
+			+ Mul<Balance, Output = Balance>
+			+ Div<Balance, Output = Balance>
+			+ Rem<Balance, Output = Balance>
+			+ Copy,
+	> Approved<Balance> for VoteThreshold
+{
 	fn approved(&self, tally: Tally<Balance>, electorate: Balance) -> bool {
 		let sqrt_voters = tally.turnout.integer_sqrt();
 		let sqrt_electorate = electorate.integer_sqrt();
-		if sqrt_voters.is_zero() { return false; }
+		if sqrt_voters.is_zero() {
+			return false
+		}
 		match *self {
 			VoteThreshold::SuperMajorityApprove =>
 				compare_rationals(tally.nays, sqrt_voters, tally.ayes, sqrt_electorate),
@@ -95,7 +110,9 @@ mod tests {
 
 	#[test]
 	fn should_work() {
-		assert!(!VoteThreshold::SuperMajorityApprove.approved(Tally{ayes: 60, nays: 50, turnout: 110}, 210));
-		assert!(VoteThreshold::SuperMajorityApprove.approved(Tally{ayes: 100, nays: 50, turnout: 150}, 210));
+		assert!(!VoteThreshold::SuperMajorityApprove
+			.approved(Tally { ayes: 60, nays: 50, turnout: 110 }, 210));
+		assert!(VoteThreshold::SuperMajorityApprove
+			.approved(Tally { ayes: 100, nays: 50, turnout: 150 }, 210));
 	}
 }
diff --git a/frame/democracy/src/weights.rs b/frame/democracy/src/weights.rs
index 1462e65c409b..6572e62889c1 100644
--- a/frame/democracy/src/weights.rs
+++ b/frame/democracy/src/weights.rs
@@ -36,6 +36,7 @@
 // --template=./.maintain/frame-weight-template.hbs
 
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
diff --git a/frame/election-provider-multi-phase/src/benchmarking.rs b/frame/election-provider-multi-phase/src/benchmarking.rs
index 6cf581135f14..5e89db7537d0 100644
--- a/frame/election-provider-multi-phase/src/benchmarking.rs
+++ b/frame/election-provider-multi-phase/src/benchmarking.rs
@@ -18,7 +18,7 @@
 //! Two phase election pallet benchmarking.
 
 use super::*;
-use crate::{Pallet as MultiPhase, unsigned::IndexAssignmentOf};
+use crate::{unsigned::IndexAssignmentOf, Pallet as MultiPhase};
 use frame_benchmarking::{account, impl_benchmark_test_suite};
 use frame_support::{assert_ok, traits::Hooks};
 use frame_system::RawOrigin;
@@ -53,8 +53,9 @@ fn solution_with_size<T: Config>(
 	let stake: VoteWeight = ed.max(One::one()).saturating_mul(100);
 
 	// first generates random targets.
-	let targets: Vec<T::AccountId> =
-		(0..size.targets).map(|i| frame_benchmarking::account("Targets", i, SEED)).collect();
+	let targets: Vec<T::AccountId> = (0..size.targets)
+		.map(|i| frame_benchmarking::account("Targets", i, SEED))
+		.collect();
 
 	let mut rng = SmallRng::seed_from_u64(SEED.into());
 
@@ -80,8 +81,11 @@ fn solution_with_size<T: Config>(
 		.collect::<Vec<_>>();
 
 	// rest of the voters. They can only vote for non-winners.
-	let non_winners =
-		targets.iter().filter(|t| !winners.contains(t)).cloned().collect::<Vec<T::AccountId>>();
+	let non_winners = targets
+		.iter()
+		.filter(|t| !winners.contains(t))
+		.cloned()
+		.collect::<Vec<T::AccountId>>();
 	let rest_voters = (active_voters_count..size.voters)
 		.map(|i| {
 			let votes = (&non_winners)
@@ -147,14 +151,22 @@ fn set_up_data_provider<T: Config>(v: u32, t: u32) {
 	// number of votes in snapshot.
 
 	T::DataProvider::clear();
-	log!(info, "setting up with voters = {} [degree = {}], targets = {}", v, T::DataProvider::MAXIMUM_VOTES_PER_VOTER, t);
+	log!(
+		info,
+		"setting up with voters = {} [degree = {}], targets = {}",
+		v,
+		T::DataProvider::MAXIMUM_VOTES_PER_VOTER,
+		t
+	);
 
 	// fill targets.
-	let mut targets = (0..t).map(|i| {
-		let target = frame_benchmarking::account::<T::AccountId>("Target", i, SEED);
-		T::DataProvider::add_target(target.clone());
-		target
-	}).collect::<Vec<_>>();
+	let mut targets = (0..t)
+		.map(|i| {
+			let target = frame_benchmarking::account::<T::AccountId>("Target", i, SEED);
+			T::DataProvider::add_target(target.clone());
+			target
+		})
+		.collect::<Vec<_>>();
 	// we should always have enough voters to fill.
 	assert!(targets.len() > T::DataProvider::MAXIMUM_VOTES_PER_VOTER as usize);
 	targets.truncate(T::DataProvider::MAXIMUM_VOTES_PER_VOTER as usize);
diff --git a/frame/election-provider-multi-phase/src/helpers.rs b/frame/election-provider-multi-phase/src/helpers.rs
index 46eeef0a6bf7..0abf448a4567 100644
--- a/frame/election-provider-multi-phase/src/helpers.rs
+++ b/frame/election-provider-multi-phase/src/helpers.rs
@@ -17,7 +17,7 @@
 
 //! Some helper functions/macros for this crate.
 
-use super::{Config, VoteWeight, CompactVoterIndexOf, CompactTargetIndexOf};
+use super::{CompactTargetIndexOf, CompactVoterIndexOf, Config, VoteWeight};
 use sp_std::{collections::btree_map::BTreeMap, convert::TryInto, prelude::*};
 
 #[macro_export]
@@ -58,7 +58,9 @@ pub fn voter_index_fn<T: Config>(
 	cache: &BTreeMap<T::AccountId, usize>,
 ) -> impl Fn(&T::AccountId) -> Option<CompactVoterIndexOf<T>> + '_ {
 	move |who| {
-		cache.get(who).and_then(|i| <usize as TryInto<CompactVoterIndexOf<T>>>::try_into(*i).ok())
+		cache
+			.get(who)
+			.and_then(|i| <usize as TryInto<CompactVoterIndexOf<T>>>::try_into(*i).ok())
 	}
 }
 
@@ -70,7 +72,9 @@ pub fn voter_index_fn_owned<T: Config>(
 	cache: BTreeMap<T::AccountId, usize>,
 ) -> impl Fn(&T::AccountId) -> Option<CompactVoterIndexOf<T>> {
 	move |who| {
-		cache.get(who).and_then(|i| <usize as TryInto<CompactVoterIndexOf<T>>>::try_into(*i).ok())
+		cache
+			.get(who)
+			.and_then(|i| <usize as TryInto<CompactVoterIndexOf<T>>>::try_into(*i).ok())
 	}
 }
 
@@ -173,7 +177,11 @@ pub fn stake_of_fn_linear<T: Config>(
 	snapshot: &Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)>,
 ) -> impl Fn(&T::AccountId) -> VoteWeight + '_ {
 	move |who| {
-		snapshot.iter().find(|(x, _, _)| x == who).map(|(_, x, _)| *x).unwrap_or_default()
+		snapshot
+			.iter()
+			.find(|(x, _, _)| x == who)
+			.map(|(_, x, _)| *x)
+			.unwrap_or_default()
 	}
 }
 
diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index e552335d0253..905492d6ca04 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -48,7 +48,7 @@
 //!
 //! ### Signed Phase
 //!
-//!	In the signed phase, solutions (of type [`RawSolution`]) are submitted and queued on chain. A
+//! In the signed phase, solutions (of type [`RawSolution`]) are submitted and queued on chain. A
 //! deposit is reserved, based on the size of the solution, for the cost of keeping this solution
 //! on-chain for a number of blocks, and the potential weight of the solution upon being checked. A
 //! maximum of `pallet::Config::MaxSignedSubmissions` solutions are stored. The queue is always
@@ -228,34 +228,31 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use codec::{Decode, Encode};
+use frame_election_provider_support::{onchain, ElectionDataProvider, ElectionProvider};
 use frame_support::{
 	dispatch::DispatchResultWithPostInfo,
 	ensure,
-	traits::{Currency, Get, ReservableCurrency, OnUnbalanced},
+	traits::{Currency, Get, OnUnbalanced, ReservableCurrency},
 	weights::Weight,
 };
 use frame_system::{ensure_none, offchain::SendTransactionTypes};
-use frame_election_provider_support::{ElectionDataProvider, ElectionProvider, onchain};
+use sp_arithmetic::{
+	traits::{CheckedAdd, Zero},
+	UpperOf,
+};
 use sp_npos_elections::{
-	assignment_ratio_to_staked_normalized, CompactSolution, ElectionScore,
-	EvaluateSupport, PerThing128, Supports, VoteWeight,
+	assignment_ratio_to_staked_normalized, CompactSolution, ElectionScore, EvaluateSupport,
+	PerThing128, Supports, VoteWeight,
 };
 use sp_runtime::{
+	traits::Bounded,
 	transaction_validity::{
 		InvalidTransaction, TransactionPriority, TransactionSource, TransactionValidity,
 		TransactionValidityError, ValidTransaction,
 	},
 	DispatchError, PerThing, Perbill, RuntimeDebug, SaturatedConversion,
-	traits::Bounded,
-};
-use sp_std::{
-	convert::TryInto,
-	prelude::*,
-};
-use sp_arithmetic::{
-	UpperOf,
-	traits::{Zero, CheckedAdd},
 };
+use sp_std::{convert::TryInto, prelude::*};
 
 #[cfg(any(feature = "runtime-benchmarks", test))]
 mod benchmarking;
@@ -562,7 +559,9 @@ pub mod pallet {
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config + SendTransactionTypes<Call<Self>> {
-		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event> + TryInto<Event<Self>>;
+		type Event: From<Event<Self>>
+			+ IsType<<Self as frame_system::Config>::Event>
+			+ TryInto<Event<Self>>;
 
 		/// Currency type.
 		type Currency: ReservableCurrency<Self::AccountId> + Currency<Self::AccountId>;
@@ -701,21 +700,22 @@ pub mod pallet {
 						Ok(snap_weight) => {
 							log!(info, "Starting signed phase round {}.", Self::round());
 							T::WeightInfo::on_initialize_open_signed().saturating_add(snap_weight)
-						}
+						},
 						Err(why) => {
 							// Not much we can do about this at this point.
 							log!(warn, "failed to open signed phase due to {:?}", why);
 							T::WeightInfo::on_initialize_nothing()
 							// NOTE: ^^ The trait specifies that this is a noop in terms of weight
 							// in case of error.
-						}
+						},
 					}
-				}
+				},
 				Phase::Signed | Phase::Off
 					if remaining <= unsigned_deadline && remaining > Zero::zero() =>
 				{
 					// our needs vary according to whether or not the unsigned phase follows a signed phase
-					let (need_snapshot, enabled, signed_weight) = if current_phase == Phase::Signed {
+					let (need_snapshot, enabled, signed_weight) = if current_phase == Phase::Signed
+					{
 						// there was previously a signed phase: close the signed phase, no need for snapshot.
 						//
 						// Notes:
@@ -744,14 +744,14 @@ pub mod pallet {
 							};
 
 							base_weight.saturating_add(snap_weight).saturating_add(signed_weight)
-						}
+						},
 						Err(why) => {
 							// Not much we can do about this at this point.
 							log!(warn, "failed to open unsigned phase due to {:?}", why);
 							T::WeightInfo::on_initialize_nothing()
 							// NOTE: ^^ The trait specifies that this is a noop in terms of weight
 							// in case of error.
-						}
+						},
 					}
 				}
 				_ => T::WeightInfo::on_initialize_nothing(),
@@ -759,15 +759,16 @@ pub mod pallet {
 		}
 
 		fn offchain_worker(now: T::BlockNumber) {
-			use sp_runtime::offchain::storage_lock::{StorageLock, BlockAndTime};
+			use sp_runtime::offchain::storage_lock::{BlockAndTime, StorageLock};
 
 			// Create a lock with the maximum deadline of number of blocks in the unsigned phase.
 			// This should only come useful in an **abrupt** termination of execution, otherwise the
 			// guard will be dropped upon successful execution.
-			let mut lock = StorageLock::<BlockAndTime<frame_system::Pallet::<T>>>::with_block_deadline(
-				unsigned::OFFCHAIN_LOCK,
-				T::UnsignedPhase::get().saturated_into(),
-			);
+			let mut lock =
+				StorageLock::<BlockAndTime<frame_system::Pallet<T>>>::with_block_deadline(
+					unsigned::OFFCHAIN_LOCK,
+					T::UnsignedPhase::get().saturated_into(),
+				);
 
 			match lock.try_lock() {
 				Ok(_guard) => {
@@ -775,7 +776,7 @@ pub mod pallet {
 				},
 				Err(deadline) => {
 					log!(debug, "offchain worker lock not released, deadline is {:?}", deadline);
-				}
+				},
 			};
 		}
 
@@ -857,8 +858,7 @@ pub mod pallet {
 			witness: SolutionOrSnapshotSize,
 		) -> DispatchResultWithPostInfo {
 			ensure_none(origin)?;
-			let error_message =
-				"Invalid unsigned submission must produce invalid block and \
+			let error_message = "Invalid unsigned submission must produce invalid block and \
 				 deprive validator from their authoring reward.";
 
 			// Check score being an improvement, phase, and desired targets.
@@ -921,11 +921,8 @@ pub mod pallet {
 			// Note: we don't `rotate_round` at this point; the next call to
 			// `ElectionProvider::elect` will succeed and take care of that.
 
-			let solution = ReadySolution {
-				supports,
-				score: [0, 0, 0],
-				compute: ElectionCompute::Emergency,
-			};
+			let solution =
+				ReadySolution { supports, score: [0, 0, 0], compute: ElectionCompute::Emergency };
 
 			<QueuedSolution<T>>::put(solution);
 			Ok(())
@@ -954,7 +951,8 @@ pub mod pallet {
 
 			// ensure witness data is correct.
 			ensure!(
-				num_signed_submissions >= <SignedSubmissions<T>>::decode_len().unwrap_or_default() as u32,
+				num_signed_submissions >=
+					<SignedSubmissions<T>>::decode_len().unwrap_or_default() as u32,
 				Error::<T>::SignedInvalidWitness,
 			);
 
@@ -989,8 +987,7 @@ pub mod pallet {
 			};
 
 			// collect deposit. Thereafter, the function cannot fail.
-			T::Currency::reserve(&who, deposit)
-				.map_err(|_| Error::<T>::SignedCannotPayDeposit)?;
+			T::Currency::reserve(&who, deposit).map_err(|_| Error::<T>::SignedCannotPayDeposit)?;
 
 			let ejected_a_solution = maybe_removed.is_some();
 			// if we had to remove the weakest solution, unreserve its deposit
@@ -1068,10 +1065,8 @@ pub mod pallet {
 			if let Call::submit_unsigned(solution, _) = call {
 				// Discard solution not coming from the local OCW.
 				match source {
-					TransactionSource::Local | TransactionSource::InBlock => { /* allowed */ }
-					_ => {
-						return InvalidTransaction::Call.into();
-					}
+					TransactionSource::Local | TransactionSource::InBlock => { /* allowed */ },
+					_ => return InvalidTransaction::Call.into(),
 				}
 
 				let _ = Self::unsigned_pre_dispatch_checks(solution)
@@ -1084,9 +1079,8 @@ pub mod pallet {
 				ValidTransaction::with_tag_prefix("OffchainElection")
 					// The higher the score[0], the better a solution is.
 					.priority(
-						T::MinerTxPriority::get().saturating_add(
-							solution.score[0].saturated_into()
-						),
+						T::MinerTxPriority::get()
+							.saturating_add(solution.score[0].saturated_into()),
 					)
 					// Used to deduplicate unsigned solutions: each validator should produce one
 					// solution per round at most, and solutions are not propagate.
@@ -1219,20 +1213,18 @@ impl<T: Config> Pallet<T> {
 		match current_phase {
 			Phase::Unsigned((true, opened)) if opened == now => {
 				// Mine a new solution, cache it, and attempt to submit it
-				let initial_output = Self::ensure_offchain_repeat_frequency(now).and_then(|_| {
-					Self::mine_check_save_submit()
-				});
+				let initial_output = Self::ensure_offchain_repeat_frequency(now)
+					.and_then(|_| Self::mine_check_save_submit());
 				log!(debug, "initial offchain thread output: {:?}", initial_output);
-			}
+			},
 			Phase::Unsigned((true, opened)) if opened < now => {
 				// Try and resubmit the cached solution, and recompute ONLY if it is not
 				// feasible.
-				let resubmit_output = Self::ensure_offchain_repeat_frequency(now).and_then(|_| {
-					Self::restore_or_compute_then_maybe_submit()
-				});
+				let resubmit_output = Self::ensure_offchain_repeat_frequency(now)
+					.and_then(|_| Self::restore_or_compute_then_maybe_submit());
 				log!(debug, "resubmit offchain thread output: {:?}", resubmit_output);
-			}
-			_ => {}
+			},
+			_ => {},
 		}
 
 		// After election finalization, clear OCW solution storage.
@@ -1242,9 +1234,7 @@ impl<T: Config> Pallet<T> {
 				let local_event = <T as Config>::Event::from(event_record.event);
 				local_event.try_into().ok()
 			})
-			.any(|event| {
-				matches!(event, Event::ElectionFinalized(_))
-			})
+			.any(|event| matches!(event, Event::ElectionFinalized(_)))
 		{
 			unsigned::kill_ocw_solution::<T>();
 		}
@@ -1308,14 +1298,12 @@ impl<T: Config> Pallet<T> {
 		// Defensive-only.
 		if targets.len() > target_limit || voters.len() > voter_limit {
 			debug_assert!(false, "Snapshot limit has not been respected.");
-			return Err(ElectionError::DataProvider("Snapshot too big for submission."));
+			return Err(ElectionError::DataProvider("Snapshot too big for submission."))
 		}
 
 		// Only write snapshot if all existed.
-		let metadata = SolutionOrSnapshotSize {
-			voters: voters.len() as u32,
-			targets: targets.len() as u32,
-		};
+		let metadata =
+			SolutionOrSnapshotSize { voters: voters.len() as u32, targets: targets.len() as u32 };
 		log!(debug, "creating a snapshot with metadata {:?}", metadata);
 
 		<SnapshotMetadata<T>>::put(metadata);
@@ -1335,7 +1323,10 @@ impl<T: Config> Pallet<T> {
 		debug_assert!(buffer.len() == size && size == buffer.capacity());
 
 		sp_io::storage::set(&<Snapshot<T>>::hashed_key(), &buffer);
-		Ok(w1.saturating_add(w2).saturating_add(w3).saturating_add(T::DbWeight::get().writes(3)))
+		Ok(w1
+			.saturating_add(w2)
+			.saturating_add(w3)
+			.saturating_add(T::DbWeight::get().writes(3)))
 	}
 
 	/// Kill everything created by [`Pallet::create_snapshot`].
@@ -1369,9 +1360,9 @@ impl<T: Config> Pallet<T> {
 		// Ensure that the solution's score can pass absolute min-score.
 		let submitted_score = solution.score.clone();
 		ensure!(
-			Self::minimum_untrusted_score().map_or(true, |min_score|
+			Self::minimum_untrusted_score().map_or(true, |min_score| {
 				sp_npos_elections::is_score_better(submitted_score, min_score, Perbill::zero())
-			),
+			}),
 			FeasibilityError::UntrustedScoreTooLow
 		);
 
@@ -1418,7 +1409,7 @@ impl<T: Config> Pallet<T> {
 
 				// Check that all of the targets are valid based on the snapshot.
 				if assignment.distribution.iter().any(|(d, _)| !targets.contains(d)) {
-					return Err(FeasibilityError::InvalidVote);
+					return Err(FeasibilityError::InvalidVote)
 				}
 				Ok(())
 			})
@@ -1494,8 +1485,13 @@ impl<T: Config> Pallet<T> {
 						.fold(Zero::zero(), |acc, next| acc + next.voters.len() as u32);
 					Ok((
 						supports,
-						T::WeightInfo::elect_queued(metadata.voters, metadata.targets, active_voters, desired),
-						compute
+						T::WeightInfo::elect_queued(
+							metadata.voters,
+							metadata.targets,
+							active_voters,
+							desired,
+						),
+						compute,
 					))
 				},
 			)
@@ -1526,12 +1522,12 @@ impl<T: Config> ElectionProvider<T::AccountId, T::BlockNumber> for Pallet<T> {
 				// All went okay, put sign to be Off, clean snapshot, etc.
 				Self::rotate_round();
 				Ok((supports, weight))
-			}
+			},
 			Err(why) => {
 				log!(error, "Entering emergency mode: {:?}", why);
 				<CurrentPhase<T>>::put(Phase::Emergency);
 				Err(why)
-			}
+			},
 		}
 	}
 }
@@ -1553,11 +1549,9 @@ mod feasibility_check {
 	//! that is invalid, but gets through the system as valid.
 
 	use super::*;
-	use crate::{
-		mock::{
-			MultiPhase, Runtime, roll_to, TargetIndex, raw_solution, EpochLength, UnsignedPhase,
-			SignedPhase, VoterIndex, ExtBuilder,
-		},
+	use crate::mock::{
+		raw_solution, roll_to, EpochLength, ExtBuilder, MultiPhase, Runtime, SignedPhase,
+		TargetIndex, UnsignedPhase, VoterIndex,
 	};
 	use frame_support::assert_noop;
 
@@ -1728,11 +1722,11 @@ mod feasibility_check {
 mod tests {
 	use super::*;
 	use crate::{
-		Phase,
 		mock::{
-			ExtBuilder, MultiPhase, Runtime, roll_to, MockWeightInfo, AccountId, TargetIndex,
-			Targets, multi_phase_events, System, SignedMaxSubmissions,
+			multi_phase_events, roll_to, AccountId, ExtBuilder, MockWeightInfo, MultiPhase,
+			Runtime, SignedMaxSubmissions, System, TargetIndex, Targets,
 		},
+		Phase,
 	};
 	use frame_election_provider_support::ElectionProvider;
 	use frame_support::{assert_noop, assert_ok};
@@ -2002,7 +1996,6 @@ mod tests {
 			roll_to(15);
 			assert_eq!(MultiPhase::current_phase(), Phase::Signed);
 
-
 			let (solution, _) = MultiPhase::mine_solution(2).unwrap();
 			// Default solution has a score of [50, 100, 5000].
 			assert_eq!(solution.score, [50, 100, 5000]);
@@ -2012,10 +2005,7 @@ mod tests {
 
 			<MinimumUntrustedScore<Runtime>>::put([51, 0, 0]);
 			assert_noop!(
-				MultiPhase::feasibility_check(
-					solution,
-					ElectionCompute::Signed
-				),
+				MultiPhase::feasibility_check(solution, ElectionCompute::Signed),
 				FeasibilityError::UntrustedScoreTooLow,
 			);
 		})
@@ -2039,9 +2029,9 @@ mod tests {
 		};
 
 		let mut active = 1;
-		while weight_with(active)
-			<= <Runtime as frame_system::Config>::BlockWeights::get().max_block
-			|| active == all_voters
+		while weight_with(active) <=
+			<Runtime as frame_system::Config>::BlockWeights::get().max_block ||
+			active == all_voters
 		{
 			active += 1;
 		}
diff --git a/frame/election-provider-multi-phase/src/mock.rs b/frame/election-provider-multi-phase/src/mock.rs
index 55fa58590ce7..c5007733c1e3 100644
--- a/frame/election-provider-multi-phase/src/mock.rs
+++ b/frame/election-provider-multi-phase/src/mock.rs
@@ -17,13 +17,10 @@
 
 use super::*;
 use crate as multi_phase;
-use multi_phase::unsigned::{IndexAssignmentOf, Voter};
+use frame_election_provider_support::{data_provider, ElectionDataProvider};
 pub use frame_support::{assert_noop, assert_ok};
-use frame_support::{
-	parameter_types,
-	traits::{Hooks},
-	weights::Weight,
-};
+use frame_support::{parameter_types, traits::Hooks, weights::Weight};
+use multi_phase::unsigned::{IndexAssignmentOf, Voter};
 use parking_lot::RwLock;
 use sp_core::{
 	offchain::{
@@ -32,7 +29,6 @@ use sp_core::{
 	},
 	H256,
 };
-use frame_election_provider_support::{ElectionDataProvider, data_provider};
 use sp_npos_elections::{
 	assignment_ratio_to_staked_normalized, seq_phragmen, to_supports, to_without_backing,
 	CompactSolution, ElectionResult, EvaluateSupport,
@@ -405,7 +401,7 @@ impl ElectionDataProvider<AccountId, u64> for StakingMock {
 		let targets = Targets::get();
 
 		if maybe_max_len.map_or(false, |max_len| targets.len() > max_len) {
-			return Err("Targets too big");
+			return Err("Targets too big")
 		}
 
 		Ok((targets, 0))
@@ -416,7 +412,7 @@ impl ElectionDataProvider<AccountId, u64> for StakingMock {
 	) -> data_provider::Result<(Vec<(AccountId, VoteWeight, Vec<AccountId>)>, Weight)> {
 		let voters = Voters::get();
 		if maybe_max_len.map_or(false, |max_len| voters.len() > max_len) {
-			return Err("Voters too big");
+			return Err("Voters too big")
 		}
 
 		Ok((voters, 0))
diff --git a/frame/election-provider-multi-phase/src/signed.rs b/frame/election-provider-multi-phase/src/signed.rs
index 1aaf96b8add9..c91c923d93e9 100644
--- a/frame/election-provider-multi-phase/src/signed.rs
+++ b/frame/election-provider-multi-phase/src/signed.rs
@@ -18,11 +18,11 @@
 //! The signed phase implementation.
 
 use crate::{
-	CompactOf, Config, ElectionCompute, Pallet, RawSolution, ReadySolution, SolutionOrSnapshotSize,
-	Weight, WeightInfo, QueuedSolution, SignedSubmissionsMap, SignedSubmissionIndices,
-	SignedSubmissionNextIndex,
+	CompactOf, Config, ElectionCompute, Pallet, QueuedSolution, RawSolution, ReadySolution,
+	SignedSubmissionIndices, SignedSubmissionNextIndex, SignedSubmissionsMap,
+	SolutionOrSnapshotSize, Weight, WeightInfo,
 };
-use codec::{Encode, Decode, HasCompact};
+use codec::{Decode, Encode, HasCompact};
 use frame_support::{
 	storage::bounded_btree_map::BoundedBTreeMap,
 	traits::{Currency, Get, OnUnbalanced, ReservableCurrency},
@@ -31,8 +31,8 @@ use frame_support::{
 use sp_arithmetic::traits::SaturatedConversion;
 use sp_npos_elections::{is_score_better, CompactSolution, ElectionScore};
 use sp_runtime::{
-	RuntimeDebug,
 	traits::{Saturating, Zero},
+	RuntimeDebug,
 };
 use sp_std::{
 	cmp::Ordering,
@@ -131,24 +131,30 @@ impl<T: Config> SignedSubmissions<T> {
 			deletion_overlay: BTreeSet::new(),
 		};
 		// validate that the stored state is sane
-		debug_assert!(submissions.indices.values().copied().max().map_or(
-			true,
-			|max_idx| submissions.next_idx > max_idx,
-		));
+		debug_assert!(submissions
+			.indices
+			.values()
+			.copied()
+			.max()
+			.map_or(true, |max_idx| submissions.next_idx > max_idx,));
 		submissions
 	}
 
 	/// Put the signed submissions back into storage.
 	pub fn put(mut self) {
 		// validate that we're going to write only sane things to storage
-		debug_assert!(self.insertion_overlay.keys().copied().max().map_or(
-			true,
-			|max_idx| self.next_idx > max_idx,
-		));
-		debug_assert!(self.indices.values().copied().max().map_or(
-			true,
-			|max_idx| self.next_idx > max_idx,
-		));
+		debug_assert!(self
+			.insertion_overlay
+			.keys()
+			.copied()
+			.max()
+			.map_or(true, |max_idx| self.next_idx > max_idx,));
+		debug_assert!(self
+			.indices
+			.values()
+			.copied()
+			.max()
+			.map_or(true, |max_idx| self.next_idx > max_idx,));
 
 		SignedSubmissionIndices::<T>::put(self.indices);
 		SignedSubmissionNextIndex::<T>::put(self.next_idx);
@@ -203,10 +209,12 @@ impl<T: Config> SignedSubmissions<T> {
 		}
 
 		self.insertion_overlay.remove(&remove_idx).or_else(|| {
-			(!self.deletion_overlay.contains(&remove_idx)).then(|| {
-				self.deletion_overlay.insert(remove_idx);
-				SignedSubmissionsMap::<T>::try_get(remove_idx).ok()
-			}).flatten()
+			(!self.deletion_overlay.contains(&remove_idx))
+				.then(|| {
+					self.deletion_overlay.insert(remove_idx);
+					SignedSubmissionsMap::<T>::try_get(remove_idx).ok()
+				})
+				.flatten()
 		})
 	}
 
@@ -256,10 +264,7 @@ impl<T: Config> SignedSubmissions<T> {
 	///
 	/// In the event that the new submission is not better than the current weakest according
 	/// to `is_score_better`, we do not change anything.
-	pub fn insert(
-		&mut self,
-		submission: SignedSubmissionOf<T>,
-	) -> InsertResult<T> {
+	pub fn insert(&mut self, submission: SignedSubmissionOf<T>) -> InsertResult<T> {
 		// verify the expectation that we never reuse an index
 		debug_assert!(!self.indices.values().any(|&idx| idx == self.next_idx));
 
@@ -271,12 +276,12 @@ impl<T: Config> SignedSubmissions<T> {
 				self.indices
 					.try_insert(submission.solution.score, prev_idx)
 					.expect("didn't change the map size; qed");
-				return InsertResult::NotInserted;
-			}
+				return InsertResult::NotInserted
+			},
 			Ok(None) => {
 				// successfully inserted into the set; no need to take out weakest member
 				None
-			}
+			},
 			Err((insert_score, insert_idx)) => {
 				// could not insert into the set because it is full.
 				// note that we short-circuit return here in case the iteration produces `None`.
@@ -290,11 +295,11 @@ impl<T: Config> SignedSubmissions<T> {
 
 				// if we haven't improved on the weakest score, don't change anything.
 				if !is_score_better(insert_score, weakest_score, threshold) {
-					return InsertResult::NotInserted;
+					return InsertResult::NotInserted
 				}
 
 				self.swap_out_submission(weakest_score, Some((insert_score, insert_idx)))
-			}
+			},
 		};
 
 		// we've taken out the weakest, so update the storage map and the next index
@@ -349,17 +354,12 @@ impl<T: Config> Pallet<T> {
 		let reward = T::SignedRewardBase::get();
 
 		while let Some(best) = all_submissions.pop_last() {
-			let SignedSubmission { solution, who, deposit} = best;
+			let SignedSubmission { solution, who, deposit } = best;
 			let active_voters = solution.compact.voter_count() as u32;
 			let feasibility_weight = {
 				// defensive only: at the end of signed phase, snapshot will exits.
 				let desired_targets = Self::desired_targets().unwrap_or_default();
-				T::WeightInfo::feasibility_check(
-					voters,
-					targets,
-					active_voters,
-					desired_targets,
-				)
+				T::WeightInfo::feasibility_check(voters, targets, active_voters, desired_targets)
 			};
 			// the feasibility check itself has some weight
 			weight = weight.saturating_add(feasibility_weight);
@@ -375,13 +375,13 @@ impl<T: Config> Pallet<T> {
 
 					weight = weight
 						.saturating_add(T::WeightInfo::finalize_signed_phase_accept_solution());
-					break;
-				}
+					break
+				},
 				Err(_) => {
 					Self::finalize_signed_phase_reject_solution(&who, deposit);
 					weight = weight
 						.saturating_add(T::WeightInfo::finalize_signed_phase_reject_solution());
-				}
+				},
 			}
 		}
 
@@ -398,7 +398,12 @@ impl<T: Config> Pallet<T> {
 		debug_assert!(!SignedSubmissionNextIndex::<T>::exists());
 		debug_assert!(SignedSubmissionsMap::<T>::iter().next().is_none());
 
-		log!(debug, "closed signed phase, found solution? {}, discarded {}", found_solution, discarded);
+		log!(
+			debug,
+			"closed signed phase, found solution? {}, discarded {}",
+			found_solution,
+			discarded
+		);
 		(found_solution, weight)
 	}
 
@@ -469,9 +474,12 @@ impl<T: Config> Pallet<T> {
 		let feasibility_weight = Self::feasibility_weight_of(solution, size);
 
 		let len_deposit = T::SignedDepositByte::get().saturating_mul(encoded_len);
-		let weight_deposit = T::SignedDepositWeight::get().saturating_mul(feasibility_weight.saturated_into());
+		let weight_deposit =
+			T::SignedDepositWeight::get().saturating_mul(feasibility_weight.saturated_into());
 
-		T::SignedDepositBase::get().saturating_add(len_deposit).saturating_add(weight_deposit)
+		T::SignedDepositBase::get()
+			.saturating_add(len_deposit)
+			.saturating_add(weight_deposit)
 	}
 }
 
@@ -479,13 +487,13 @@ impl<T: Config> Pallet<T> {
 mod tests {
 	use super::*;
 	use crate::{
-		Phase, Error,
 		mock::{
-			balances, ExtBuilder, MultiPhase, Origin, raw_solution, roll_to, Runtime,
+			balances, raw_solution, roll_to, ExtBuilder, MultiPhase, Origin, Runtime,
 			SignedMaxSubmissions, SignedMaxWeight,
 		},
+		Error, Phase,
 	};
-	use frame_support::{dispatch::DispatchResult, assert_noop, assert_storage_noop, assert_ok};
+	use frame_support::{assert_noop, assert_ok, assert_storage_noop, dispatch::DispatchResult};
 
 	fn submit_with_witness(
 		origin: Origin,
@@ -626,7 +634,6 @@ mod tests {
 				assert_ok!(submit_with_witness(Origin::signed(99), solution));
 			}
 
-
 			// weaker.
 			let solution = RawSolution { score: [4, 0, 0], ..Default::default() };
 
@@ -810,33 +817,36 @@ mod tests {
 
 	#[test]
 	fn cannot_consume_too_much_future_weight() {
-		ExtBuilder::default().signed_weight(40).mock_weight_info(true).build_and_execute(|| {
-			roll_to(15);
-			assert!(MultiPhase::current_phase().is_signed());
-
-			let (solution, witness) = MultiPhase::mine_solution(2).unwrap();
-			let solution_weight = <Runtime as Config>::WeightInfo::feasibility_check(
-				witness.voters,
-				witness.targets,
-				solution.compact.voter_count() as u32,
-				solution.compact.unique_targets().len() as u32,
-			);
-			// default solution will have 5 edges (5 * 5 + 10)
-			assert_eq!(solution_weight, 35);
-			assert_eq!(solution.compact.voter_count(), 5);
-			assert_eq!(<Runtime as Config>::SignedMaxWeight::get(), 40);
-
-			assert_ok!(submit_with_witness(Origin::signed(99), solution.clone()));
-
-			<SignedMaxWeight>::set(30);
-
-			// note: resubmitting the same solution is technically okay as long as the queue has
-			// space.
-			assert_noop!(
-				submit_with_witness(Origin::signed(99), solution),
-				Error::<Runtime>::SignedTooMuchWeight,
-			);
-		})
+		ExtBuilder::default()
+			.signed_weight(40)
+			.mock_weight_info(true)
+			.build_and_execute(|| {
+				roll_to(15);
+				assert!(MultiPhase::current_phase().is_signed());
+
+				let (solution, witness) = MultiPhase::mine_solution(2).unwrap();
+				let solution_weight = <Runtime as Config>::WeightInfo::feasibility_check(
+					witness.voters,
+					witness.targets,
+					solution.compact.voter_count() as u32,
+					solution.compact.unique_targets().len() as u32,
+				);
+				// default solution will have 5 edges (5 * 5 + 10)
+				assert_eq!(solution_weight, 35);
+				assert_eq!(solution.compact.voter_count(), 5);
+				assert_eq!(<Runtime as Config>::SignedMaxWeight::get(), 40);
+
+				assert_ok!(submit_with_witness(Origin::signed(99), solution.clone()));
+
+				<SignedMaxWeight>::set(30);
+
+				// note: resubmitting the same solution is technically okay as long as the queue has
+				// space.
+				assert_noop!(
+					submit_with_witness(Origin::signed(99), solution),
+					Error::<Runtime>::SignedTooMuchWeight,
+				);
+			})
 	}
 
 	#[test]
diff --git a/frame/election-provider-multi-phase/src/unsigned.rs b/frame/election-provider-multi-phase/src/unsigned.rs
index aaeb5e4c0c9e..93e3878a7152 100644
--- a/frame/election-provider-multi-phase/src/unsigned.rs
+++ b/frame/election-provider-multi-phase/src/unsigned.rs
@@ -21,19 +21,18 @@ use crate::{
 	helpers, Call, CompactAccuracyOf, CompactOf, Config, ElectionCompute, Error, FeasibilityError,
 	Pallet, RawSolution, ReadySolution, RoundSnapshot, SolutionOrSnapshotSize, Weight, WeightInfo,
 };
-use codec::{Encode, Decode};
+use codec::{Decode, Encode};
 use frame_support::{dispatch::DispatchResult, ensure, traits::Get};
 use frame_system::offchain::SubmitTransaction;
 use sp_arithmetic::Perbill;
 use sp_npos_elections::{
-	CompactSolution, ElectionResult, assignment_ratio_to_staked_normalized,
-	assignment_staked_to_ratio_normalized, is_score_better, seq_phragmen,
+	assignment_ratio_to_staked_normalized, assignment_staked_to_ratio_normalized, is_score_better,
+	seq_phragmen, CompactSolution, ElectionResult,
 };
 use sp_runtime::{
-	DispatchError,
-	SaturatedConversion,
 	offchain::storage::{MutateStorageError, StorageValueRef},
 	traits::TrailingZeroInput,
+	DispatchError, SaturatedConversion,
 };
 use sp_std::{cmp::Ordering, convert::TryFrom, vec::Vec};
 
@@ -54,10 +53,8 @@ pub type Voter<T> = (
 );
 
 /// The relative distribution of a voter's stake among the winning targets.
-pub type Assignment<T> = sp_npos_elections::Assignment<
-	<T as frame_system::Config>::AccountId,
-	CompactAccuracyOf<T>,
->;
+pub type Assignment<T> =
+	sp_npos_elections::Assignment<<T as frame_system::Config>::AccountId, CompactAccuracyOf<T>>;
 
 /// The [`IndexAssignment`][sp_npos_elections::IndexAssignment] type specialized for a particular
 /// runtime `T`.
@@ -105,7 +102,8 @@ fn save_solution<T: Config>(call: &Call<T>) -> Result<(), MinerError> {
 	let storage = StorageValueRef::persistent(&OFFCHAIN_CACHED_CALL);
 	match storage.mutate::<_, (), _>(|_| Ok(call.clone())) {
 		Ok(_) => Ok(()),
-		Err(MutateStorageError::ConcurrentModification(_)) => Err(MinerError::FailedToStoreSolution),
+		Err(MutateStorageError::ConcurrentModification(_)) =>
+			Err(MinerError::FailedToStoreSolution),
 		Err(MutateStorageError::ValueFunctionFailed(_)) => {
 			// this branch should be unreachable according to the definition of
 			// `StorageValueRef::mutate`: that function should only ever `Err` if the closure we
@@ -151,44 +149,45 @@ impl<T: Config> Pallet<T> {
 	/// Attempt to restore a solution from cache. Otherwise, compute it fresh. Either way, submit
 	/// if our call's score is greater than that of the cached solution.
 	pub fn restore_or_compute_then_maybe_submit() -> Result<(), MinerError> {
-		log!(debug,"miner attempting to restore or compute an unsigned solution.");
+		log!(debug, "miner attempting to restore or compute an unsigned solution.");
 
 		let call = restore_solution::<T>()
-		.and_then(|call| {
-			// ensure the cached call is still current before submitting
-			if let Call::submit_unsigned(solution, _) = &call {
-				// prevent errors arising from state changes in a forkful chain
-				Self::basic_checks(solution, "restored")?;
-				Ok(call)
-			} else {
-				Err(MinerError::SolutionCallInvalid)
-			}
-		}).or_else::<MinerError, _>(|error| {
-			log!(debug, "restoring solution failed due to {:?}", error);
-			match error {
-				MinerError::NoStoredSolution => {
-					log!(trace, "mining a new solution.");
-					// if not present or cache invalidated due to feasibility, regenerate.
-					// note that failing `Feasibility` can only mean that the solution was
-					// computed over a snapshot that has changed due to a fork.
-					let call = Self::mine_checked_call()?;
-					save_solution(&call)?;
+			.and_then(|call| {
+				// ensure the cached call is still current before submitting
+				if let Call::submit_unsigned(solution, _) = &call {
+					// prevent errors arising from state changes in a forkful chain
+					Self::basic_checks(solution, "restored")?;
 					Ok(call)
+				} else {
+					Err(MinerError::SolutionCallInvalid)
 				}
-				MinerError::Feasibility(_) => {
-					log!(trace, "wiping infeasible solution.");
-					// kill the infeasible solution, hopefully in the next runs (whenever they
-					// may be) we mine a new one.
-					kill_ocw_solution::<T>();
-					clear_offchain_repeat_frequency();
-					Err(error)
-				},
-				_ => {
-					// nothing to do. Return the error as-is.
-					Err(error)
+			})
+			.or_else::<MinerError, _>(|error| {
+				log!(debug, "restoring solution failed due to {:?}", error);
+				match error {
+					MinerError::NoStoredSolution => {
+						log!(trace, "mining a new solution.");
+						// if not present or cache invalidated due to feasibility, regenerate.
+						// note that failing `Feasibility` can only mean that the solution was
+						// computed over a snapshot that has changed due to a fork.
+						let call = Self::mine_checked_call()?;
+						save_solution(&call)?;
+						Ok(call)
+					},
+					MinerError::Feasibility(_) => {
+						log!(trace, "wiping infeasible solution.");
+						// kill the infeasible solution, hopefully in the next runs (whenever they
+						// may be) we mine a new one.
+						kill_ocw_solution::<T>();
+						clear_offchain_repeat_frequency();
+						Err(error)
+					},
+					_ => {
+						// nothing to do. Return the error as-is.
+						Err(error)
+					},
 				}
-			}
-		})?;
+			})?;
 
 		Self::submit_call(call)
 	}
@@ -240,10 +239,12 @@ impl<T: Config> Pallet<T> {
 			MinerError::PreDispatchChecksFailed(err)
 		})?;
 
-		Self::feasibility_check(raw_solution.clone(), ElectionCompute::Unsigned).map_err(|err| {
-			log!(debug, "feasibility check failed for {} solution: {:?}", solution_type, err);
-			err
-		})?;
+		Self::feasibility_check(raw_solution.clone(), ElectionCompute::Unsigned).map_err(
+			|err| {
+				log!(debug, "feasibility check failed for {} solution: {:?}", solution_type, err);
+				err
+			},
+		)?;
 
 		Ok(())
 	}
@@ -347,11 +348,7 @@ impl<T: Config> Pallet<T> {
 		// converting to `Compact`.
 		let mut index_assignments = sorted_assignments
 			.into_iter()
-			.map(|assignment| IndexAssignmentOf::<T>::new(
-				&assignment,
-				&voter_index,
-				&target_index,
-			))
+			.map(|assignment| IndexAssignmentOf::<T>::new(&assignment, &voter_index, &target_index))
 			.collect::<Result<Vec<_>, _>>()?;
 
 		// trim assignments list for weight and length.
@@ -390,10 +387,10 @@ impl<T: Config> Pallet<T> {
 			max @ _ => {
 				let seed = sp_io::offchain::random_seed();
 				let random = <u32>::decode(&mut TrailingZeroInput::new(seed.as_ref()))
-					.expect("input is padded with zeroes; qed")
-					% max.saturating_add(1);
+					.expect("input is padded with zeroes; qed") %
+					max.saturating_add(1);
 				random as usize
-			}
+			},
 		}
 	}
 
@@ -418,18 +415,16 @@ impl<T: Config> Pallet<T> {
 		max_weight: Weight,
 		assignments: &mut Vec<IndexAssignmentOf<T>>,
 	) {
-		let maximum_allowed_voters = Self::maximum_voter_for_weight::<T::WeightInfo>(
-			desired_targets,
-			size,
-			max_weight,
-		);
-		let removing: usize = assignments.len().saturating_sub(
-			maximum_allowed_voters.saturated_into(),
-		);
+		let maximum_allowed_voters =
+			Self::maximum_voter_for_weight::<T::WeightInfo>(desired_targets, size, max_weight);
+		let removing: usize =
+			assignments.len().saturating_sub(maximum_allowed_voters.saturated_into());
 		log!(
 			debug,
 			"from {} assignments, truncating to {} for weight, removing {}",
-			assignments.len(), maximum_allowed_voters, removing,
+			assignments.len(),
+			maximum_allowed_voters,
+			removing,
 		);
 		assignments.truncate(maximum_allowed_voters as usize);
 	}
@@ -461,7 +456,7 @@ impl<T: Config> Pallet<T> {
 
 		// not much we can do if assignments are already empty.
 		if high == low {
-			return Ok(());
+			return Ok(())
 		}
 
 		while high - low > 1 {
@@ -472,22 +467,21 @@ impl<T: Config> Pallet<T> {
 				high = test;
 			}
 		}
-		let maximum_allowed_voters =
-			if low < assignments.len() &&
-				encoded_size_of(&assignments[..low + 1])? <= max_allowed_length
-			{
-				low + 1
-			} else {
-				low
-			};
+		let maximum_allowed_voters = if low < assignments.len() &&
+			encoded_size_of(&assignments[..low + 1])? <= max_allowed_length
+		{
+			low + 1
+		} else {
+			low
+		};
 
 		// ensure our post-conditions are correct
 		debug_assert!(
 			encoded_size_of(&assignments[..maximum_allowed_voters]).unwrap() <= max_allowed_length
 		);
 		debug_assert!(if maximum_allowed_voters < assignments.len() {
-			encoded_size_of(&assignments[..maximum_allowed_voters + 1]).unwrap()
-				> max_allowed_length
+			encoded_size_of(&assignments[..maximum_allowed_voters + 1]).unwrap() >
+				max_allowed_length
 		} else {
 			true
 		});
@@ -517,7 +511,7 @@ impl<T: Config> Pallet<T> {
 		max_weight: Weight,
 	) -> u32 {
 		if size.voters < 1 {
-			return size.voters;
+			return size.voters
 		}
 
 		let max_voters = size.voters.max(1);
@@ -536,7 +530,7 @@ impl<T: Config> Pallet<T> {
 						Some(voters) if voters < max_voters => Ok(voters),
 						_ => Err(()),
 					}
-				}
+				},
 				Ordering::Greater => voters.checked_sub(step).ok_or(()),
 				Ordering::Equal => Ok(voters),
 			}
@@ -551,11 +545,9 @@ impl<T: Config> Pallet<T> {
 				// proceed with the binary search
 				Ok(next) if next != voters => {
 					voters = next;
-				}
+				},
 				// we are out of bounds, break out of the loop.
-				Err(()) => {
-					break;
-				}
+				Err(()) => break,
 				// we found the right value - early exit the function.
 				Ok(next) => return next,
 			}
@@ -599,17 +591,16 @@ impl<T: Config> Pallet<T> {
 			|maybe_head: Result<Option<T::BlockNumber>, _>| {
 				match maybe_head {
 					Ok(Some(head)) if now < head => Err("fork."),
-					Ok(Some(head)) if now >= head && now <= head + threshold => {
-						Err("recently executed.")
-					}
+					Ok(Some(head)) if now >= head && now <= head + threshold =>
+						Err("recently executed."),
 					Ok(Some(head)) if now > head + threshold => {
 						// we can run again now. Write the new head.
 						Ok(now)
-					}
+					},
 					_ => {
 						// value doesn't exists. Probably this node just booted up. Write, and run
 						Ok(now)
-					}
+					},
 				}
 			},
 		);
@@ -632,9 +623,7 @@ impl<T: Config> Pallet<T> {
 	///
 	/// NOTE: Ideally, these tests should move more and more outside of this and more to the miner's
 	/// code, so that we do less and less storage reads here.
-	pub fn unsigned_pre_dispatch_checks(
-		solution: &RawSolution<CompactOf<T>>,
-	) -> DispatchResult {
+	pub fn unsigned_pre_dispatch_checks(solution: &RawSolution<CompactOf<T>>) -> DispatchResult {
 		// ensure solution is timely. Don't panic yet. This is a cheap check.
 		ensure!(Self::current_phase().is_unsigned_open(), Error::<T>::PreDispatchEarlySubmission);
 
@@ -643,8 +632,8 @@ impl<T: Config> Pallet<T> {
 
 		// ensure correct number of winners.
 		ensure!(
-			Self::desired_targets().unwrap_or_default()
-				== solution.compact.unique_targets().len() as u32,
+			Self::desired_targets().unwrap_or_default() ==
+				solution.compact.unique_targets().len() as u32,
 			Error::<T>::PreDispatchWrongWinnerCount,
 		);
 
@@ -761,19 +750,22 @@ mod max_weight {
 mod tests {
 	use super::*;
 	use crate::{
-		CurrentPhase, InvalidTransaction, Phase, QueuedSolution, TransactionSource,
-		TransactionValidityError,
 		mock::{
-			Call as OuterCall, ExtBuilder, Extrinsic, MinerMaxWeight, MultiPhase, Origin, Runtime,
-			TestCompact, TrimHelpers, roll_to, roll_to_with_ocw, trim_helpers, witness,
-			UnsignedPhase, BlockNumber, System,
+			roll_to, roll_to_with_ocw, trim_helpers, witness, BlockNumber, Call as OuterCall,
+			ExtBuilder, Extrinsic, MinerMaxWeight, MultiPhase, Origin, Runtime, System,
+			TestCompact, TrimHelpers, UnsignedPhase,
 		},
+		CurrentPhase, InvalidTransaction, Phase, QueuedSolution, TransactionSource,
+		TransactionValidityError,
 	};
 	use frame_benchmarking::Zero;
 	use frame_support::{assert_noop, assert_ok, dispatch::Dispatchable, traits::OffchainWorker};
 	use sp_npos_elections::IndexAssignment;
-	use sp_runtime::offchain::storage_lock::{StorageLock, BlockAndTime};
-	use sp_runtime::{traits::ValidateUnsigned, PerU16};
+	use sp_runtime::{
+		offchain::storage_lock::{BlockAndTime, StorageLock},
+		traits::ValidateUnsigned,
+		PerU16,
+	};
 
 	type Assignment = crate::unsigned::Assignment<Runtime>;
 
@@ -786,8 +778,11 @@ mod tests {
 			// initial
 			assert_eq!(MultiPhase::current_phase(), Phase::Off);
 			assert!(matches!(
-				<MultiPhase as ValidateUnsigned>::validate_unsigned(TransactionSource::Local, &call)
-					.unwrap_err(),
+				<MultiPhase as ValidateUnsigned>::validate_unsigned(
+					TransactionSource::Local,
+					&call
+				)
+				.unwrap_err(),
 				TransactionValidityError::Invalid(InvalidTransaction::Custom(0))
 			));
 			assert!(matches!(
@@ -799,8 +794,11 @@ mod tests {
 			roll_to(15);
 			assert_eq!(MultiPhase::current_phase(), Phase::Signed);
 			assert!(matches!(
-				<MultiPhase as ValidateUnsigned>::validate_unsigned(TransactionSource::Local, &call)
-					.unwrap_err(),
+				<MultiPhase as ValidateUnsigned>::validate_unsigned(
+					TransactionSource::Local,
+					&call
+				)
+				.unwrap_err(),
 				TransactionValidityError::Invalid(InvalidTransaction::Custom(0))
 			));
 			assert!(matches!(
@@ -823,8 +821,11 @@ mod tests {
 			<CurrentPhase<Runtime>>::put(Phase::Unsigned((false, 25)));
 			assert!(MultiPhase::current_phase().is_unsigned());
 			assert!(matches!(
-				<MultiPhase as ValidateUnsigned>::validate_unsigned(TransactionSource::Local, &call)
-					.unwrap_err(),
+				<MultiPhase as ValidateUnsigned>::validate_unsigned(
+					TransactionSource::Local,
+					&call
+				)
+				.unwrap_err(),
 				TransactionValidityError::Invalid(InvalidTransaction::Custom(0))
 			));
 			assert!(matches!(
@@ -895,23 +896,27 @@ mod tests {
 
 	#[test]
 	fn priority_is_set() {
-		ExtBuilder::default().miner_tx_priority(20).desired_targets(0).build_and_execute(|| {
-			roll_to(25);
-			assert!(MultiPhase::current_phase().is_unsigned());
-
-			let solution = RawSolution::<TestCompact> { score: [5, 0, 0], ..Default::default() };
-			let call = Call::submit_unsigned(solution.clone(), witness());
+		ExtBuilder::default()
+			.miner_tx_priority(20)
+			.desired_targets(0)
+			.build_and_execute(|| {
+				roll_to(25);
+				assert!(MultiPhase::current_phase().is_unsigned());
 
-			assert_eq!(
-				<MultiPhase as ValidateUnsigned>::validate_unsigned(
-					TransactionSource::Local,
-					&call
-				)
-				.unwrap()
-				.priority,
-				25
-			);
-		})
+				let solution =
+					RawSolution::<TestCompact> { score: [5, 0, 0], ..Default::default() };
+				let call = Call::submit_unsigned(solution.clone(), witness());
+
+				assert_eq!(
+					<MultiPhase as ValidateUnsigned>::validate_unsigned(
+						TransactionSource::Local,
+						&call
+					)
+					.unwrap()
+					.priority,
+					25
+				);
+			})
 	}
 
 	#[test]
@@ -974,35 +979,38 @@ mod tests {
 
 	#[test]
 	fn miner_trims_weight() {
-		ExtBuilder::default().miner_weight(100).mock_weight_info(true).build_and_execute(|| {
-			roll_to(25);
-			assert!(MultiPhase::current_phase().is_unsigned());
-
-			let (solution, witness) = MultiPhase::mine_solution(2).unwrap();
-			let solution_weight = <Runtime as Config>::WeightInfo::submit_unsigned(
-				witness.voters,
-				witness.targets,
-				solution.compact.voter_count() as u32,
-				solution.compact.unique_targets().len() as u32,
-			);
-			// default solution will have 5 edges (5 * 5 + 10)
-			assert_eq!(solution_weight, 35);
-			assert_eq!(solution.compact.voter_count(), 5);
-
-			// now reduce the max weight
-			<MinerMaxWeight>::set(25);
+		ExtBuilder::default()
+			.miner_weight(100)
+			.mock_weight_info(true)
+			.build_and_execute(|| {
+				roll_to(25);
+				assert!(MultiPhase::current_phase().is_unsigned());
 
-			let (solution, witness) = MultiPhase::mine_solution(2).unwrap();
-			let solution_weight = <Runtime as Config>::WeightInfo::submit_unsigned(
-				witness.voters,
-				witness.targets,
-				solution.compact.voter_count() as u32,
-				solution.compact.unique_targets().len() as u32,
-			);
-			// default solution will have 5 edges (5 * 5 + 10)
-			assert_eq!(solution_weight, 25);
-			assert_eq!(solution.compact.voter_count(), 3);
-		})
+				let (solution, witness) = MultiPhase::mine_solution(2).unwrap();
+				let solution_weight = <Runtime as Config>::WeightInfo::submit_unsigned(
+					witness.voters,
+					witness.targets,
+					solution.compact.voter_count() as u32,
+					solution.compact.unique_targets().len() as u32,
+				);
+				// default solution will have 5 edges (5 * 5 + 10)
+				assert_eq!(solution_weight, 35);
+				assert_eq!(solution.compact.voter_count(), 5);
+
+				// now reduce the max weight
+				<MinerMaxWeight>::set(25);
+
+				let (solution, witness) = MultiPhase::mine_solution(2).unwrap();
+				let solution_weight = <Runtime as Config>::WeightInfo::submit_unsigned(
+					witness.voters,
+					witness.targets,
+					solution.compact.voter_count() as u32,
+					solution.compact.unique_targets().len() as u32,
+				);
+				// default solution will have 5 edges (5 * 5 + 10)
+				assert_eq!(solution_weight, 25);
+				assert_eq!(solution.compact.voter_count(), 3);
+			})
 	}
 
 	#[test]
@@ -1014,7 +1022,7 @@ mod tests {
 
 			assert_eq!(
 				MultiPhase::mine_check_save_submit().unwrap_err(),
-				MinerError::PreDispatchChecksFailed(DispatchError::Module{
+				MinerError::PreDispatchChecksFailed(DispatchError::Module {
 					index: 2,
 					error: 1,
 					message: Some("PreDispatchWrongWinnerCount"),
@@ -1360,15 +1368,14 @@ mod tests {
 			};
 
 			// Custom(7) maps to PreDispatchChecksFailed
-			let pre_dispatch_check_error = TransactionValidityError::Invalid(
-				InvalidTransaction::Custom(7),
-			);
+			let pre_dispatch_check_error =
+				TransactionValidityError::Invalid(InvalidTransaction::Custom(7));
 			assert_eq!(
 				<MultiPhase as ValidateUnsigned>::validate_unsigned(
 					TransactionSource::Local,
 					&call,
 				)
-					.unwrap_err(),
+				.unwrap_err(),
 				pre_dispatch_check_error,
 			);
 			assert_eq!(
@@ -1384,21 +1391,14 @@ mod tests {
 			roll_to(25);
 
 			// given
-			let TrimHelpers {
-				mut assignments,
-				encoded_size_of,
-				..
-			} = trim_helpers();
+			let TrimHelpers { mut assignments, encoded_size_of, .. } = trim_helpers();
 			let compact = CompactOf::<Runtime>::try_from(assignments.as_slice()).unwrap();
 			let encoded_len = compact.encoded_size() as u32;
 			let compact_clone = compact.clone();
 
 			// when
-			MultiPhase::trim_assignments_length(
-				encoded_len,
-				&mut assignments,
-				encoded_size_of,
-			).unwrap();
+			MultiPhase::trim_assignments_length(encoded_len, &mut assignments, encoded_size_of)
+				.unwrap();
 
 			// then
 			let compact = CompactOf::<Runtime>::try_from(assignments.as_slice()).unwrap();
@@ -1412,11 +1412,7 @@ mod tests {
 			roll_to(25);
 
 			// given
-			let TrimHelpers {
-				mut assignments,
-				encoded_size_of,
-				..
-			} = trim_helpers();
+			let TrimHelpers { mut assignments, encoded_size_of, .. } = trim_helpers();
 			let compact = CompactOf::<Runtime>::try_from(assignments.as_slice()).unwrap();
 			let encoded_len = compact.encoded_size();
 			let compact_clone = compact.clone();
@@ -1426,7 +1422,8 @@ mod tests {
 				encoded_len as u32 - 1,
 				&mut assignments,
 				encoded_size_of,
-			).unwrap();
+			)
+			.unwrap();
 
 			// then
 			let compact = CompactOf::<Runtime>::try_from(assignments.as_slice()).unwrap();
@@ -1441,33 +1438,26 @@ mod tests {
 			roll_to(25);
 
 			// given
-			let TrimHelpers {
-				voters,
-				mut assignments,
-				encoded_size_of,
-				voter_index,
-			} = trim_helpers();
+			let TrimHelpers { voters, mut assignments, encoded_size_of, voter_index } =
+				trim_helpers();
 			let compact = CompactOf::<Runtime>::try_from(assignments.as_slice()).unwrap();
 			let encoded_len = compact.encoded_size() as u32;
 			let count = assignments.len();
-			let min_stake_voter = voters.iter()
+			let min_stake_voter = voters
+				.iter()
 				.map(|(id, weight, _)| (weight, id))
 				.min()
 				.and_then(|(_, id)| voter_index(id))
 				.unwrap();
 
 			// when
-			MultiPhase::trim_assignments_length(
-				encoded_len - 1,
-				&mut assignments,
-				encoded_size_of,
-			).unwrap();
+			MultiPhase::trim_assignments_length(encoded_len - 1, &mut assignments, encoded_size_of)
+				.unwrap();
 
 			// then
 			assert_eq!(assignments.len(), count - 1, "we must have removed exactly one assignment");
 			assert!(
-				assignments.iter()
-					.all(|IndexAssignment{ who, ..}| *who != min_stake_voter),
+				assignments.iter().all(|IndexAssignment { who, .. }| *who != min_stake_voter),
 				"min_stake_voter must no longer be in the set of voters",
 			);
 		});
diff --git a/frame/election-provider-multi-phase/src/weights.rs b/frame/election-provider-multi-phase/src/weights.rs
index 0f732784c62c..99fad2f06818 100644
--- a/frame/election-provider-multi-phase/src/weights.rs
+++ b/frame/election-provider-multi-phase/src/weights.rs
@@ -36,6 +36,7 @@
 // --template=./.maintain/frame-weight-template.hbs
 
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
diff --git a/frame/election-provider-support/src/lib.rs b/frame/election-provider-support/src/lib.rs
index 1d1ebf02a263..72896e559913 100644
--- a/frame/election-provider-support/src/lib.rs
+++ b/frame/election-provider-support/src/lib.rs
@@ -164,13 +164,13 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 pub mod onchain;
-use sp_std::{prelude::*, fmt::Debug};
 use frame_support::weights::Weight;
+use sp_std::{fmt::Debug, prelude::*};
 
 /// Re-export some type as they are used in the interface.
 pub use sp_arithmetic::PerThing;
 pub use sp_npos_elections::{
-	Assignment, ExtendedBalance, PerThing128, Supports, Support, VoteWeight
+	Assignment, ExtendedBalance, PerThing128, Support, Supports, VoteWeight,
 };
 
 /// Types that are used by the data provider trait.
@@ -224,7 +224,8 @@ pub trait ElectionDataProvider<AccountId, BlockNumber> {
 		_voters: Vec<(AccountId, VoteWeight, Vec<AccountId>)>,
 		_targets: Vec<AccountId>,
 		_target_stake: Option<VoteWeight>,
-	) {}
+	) {
+	}
 
 	/// Utility function only to be used in benchmarking scenarios, to be implemented optionally,
 	/// else a noop.
diff --git a/frame/election-provider-support/src/onchain.rs b/frame/election-provider-support/src/onchain.rs
index e034a9c36a8a..2e2c286dc642 100644
--- a/frame/election-provider-support/src/onchain.rs
+++ b/frame/election-provider-support/src/onchain.rs
@@ -18,9 +18,9 @@
 //! An implementation of [`ElectionProvider`] that does an on-chain sequential phragmen.
 
 use crate::{ElectionDataProvider, ElectionProvider};
+use frame_support::{traits::Get, weights::Weight};
 use sp_npos_elections::*;
 use sp_std::{collections::btree_map::BTreeMap, marker::PhantomData, prelude::*};
-use frame_support::{traits::Get, weights::Weight};
 
 /// Errors of the on-chain election.
 #[derive(Eq, PartialEq, Debug)]
@@ -83,9 +83,8 @@ impl<T: Config> ElectionProvider<T::AccountId, T::BlockNumber> for OnChainSequen
 			stake_map.insert(v.clone(), *s);
 		});
 
-		let stake_of = |w: &T::AccountId| -> VoteWeight {
-			stake_map.get(w).cloned().unwrap_or_default()
-		};
+		let stake_of =
+			|w: &T::AccountId| -> VoteWeight { stake_map.get(w).cloned().unwrap_or_default() };
 
 		let ElectionResult { winners, assignments } =
 			seq_phragmen::<_, T::Accuracy>(desired_targets as usize, targets, voters, None)
@@ -94,16 +93,18 @@ impl<T: Config> ElectionProvider<T::AccountId, T::BlockNumber> for OnChainSequen
 		let staked = assignment_ratio_to_staked_normalized(assignments, &stake_of)?;
 		let winners = to_without_backing(winners);
 
-		to_supports(&winners, &staked).map_err(Error::from).map(|s| (s, T::BlockWeights::get().max_block))
+		to_supports(&winners, &staked)
+			.map_err(Error::from)
+			.map(|s| (s, T::BlockWeights::get().max_block))
 	}
 }
 
 #[cfg(test)]
 mod tests {
 	use super::*;
+	use frame_support::weights::Weight;
 	use sp_npos_elections::Support;
 	use sp_runtime::Perbill;
-	use frame_support::weights::Weight;
 
 	type AccountId = u64;
 	type BlockNumber = u32;
@@ -151,20 +152,8 @@ mod tests {
 		assert_eq!(
 			OnChainPhragmen::elect().unwrap().0,
 			vec![
-				(
-					10,
-					Support {
-						total: 25,
-						voters: vec![(1, 10), (3, 15)]
-					}
-				),
-				(
-					30,
-					Support {
-						total: 35,
-						voters: vec![(2, 20), (3, 15)]
-					}
-				)
+				(10, Support { total: 25, voters: vec![(1, 10), (3, 15)] }),
+				(30, Support { total: 35, voters: vec![(2, 20), (3, 15)] })
 			]
 		);
 	}
diff --git a/frame/elections-phragmen/src/benchmarking.rs b/frame/elections-phragmen/src/benchmarking.rs
index 86a011697806..4e19b64ef7a5 100644
--- a/frame/elections-phragmen/src/benchmarking.rs
+++ b/frame/elections-phragmen/src/benchmarking.rs
@@ -21,9 +21,9 @@
 
 use super::*;
 
+use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, whitelist};
+use frame_support::{dispatch::DispatchResultWithPostInfo, traits::OnInitialize};
 use frame_system::RawOrigin;
-use frame_benchmarking::{benchmarks, account, whitelist, impl_benchmark_test_suite};
-use frame_support::{traits::OnInitialize, dispatch::DispatchResultWithPostInfo};
 
 use crate::Pallet as Elections;
 
@@ -62,28 +62,34 @@ fn candidate_count<T: Config>() -> u32 {
 }
 
 /// Add `c` new candidates.
-fn submit_candidates<T: Config>(c: u32, prefix: &'static str)
-	-> Result<Vec<T::AccountId>, &'static str>
-{
-	(0..c).map(|i| {
-		let account = endowed_account::<T>(prefix, i);
-		<Elections<T>>::submit_candidacy(
-			RawOrigin::Signed(account.clone()).into(),
-			candidate_count::<T>(),
-		).map_err(|_| "failed to submit candidacy")?;
-		Ok(account)
-	}).collect::<Result<_, _>>()
+fn submit_candidates<T: Config>(
+	c: u32,
+	prefix: &'static str,
+) -> Result<Vec<T::AccountId>, &'static str> {
+	(0..c)
+		.map(|i| {
+			let account = endowed_account::<T>(prefix, i);
+			<Elections<T>>::submit_candidacy(
+				RawOrigin::Signed(account.clone()).into(),
+				candidate_count::<T>(),
+			)
+			.map_err(|_| "failed to submit candidacy")?;
+			Ok(account)
+		})
+		.collect::<Result<_, _>>()
 }
 
 /// Add `c` new candidates with self vote.
-fn submit_candidates_with_self_vote<T: Config>(c: u32, prefix: &'static str)
-	-> Result<Vec<T::AccountId>, &'static str>
-{
+fn submit_candidates_with_self_vote<T: Config>(
+	c: u32,
+	prefix: &'static str,
+) -> Result<Vec<T::AccountId>, &'static str> {
 	let candidates = submit_candidates::<T>(c, prefix)?;
 	let stake = default_stake::<T>(BALANCE_FACTOR);
-	let _ = candidates.iter().map(|c|
-		submit_voter::<T>(c.clone(), vec![c.clone()], stake).map(|_| ())
-	).collect::<Result<_, _>>()?;
+	let _ = candidates
+		.iter()
+		.map(|c| submit_voter::<T>(c.clone(), vec![c.clone()], stake).map(|_| ()))
+		.collect::<Result<_, _>>()?;
 	Ok(candidates)
 }
 
@@ -98,18 +104,16 @@ fn submit_voter<T: Config>(
 
 /// create `num_voter` voters who randomly vote for at most `votes` of `all_candidates` if
 /// available.
-fn distribute_voters<T: Config>(mut all_candidates: Vec<T::AccountId>, num_voters: u32, votes: usize)
-	-> Result<(), &'static str>
-{
+fn distribute_voters<T: Config>(
+	mut all_candidates: Vec<T::AccountId>,
+	num_voters: u32,
+	votes: usize,
+) -> Result<(), &'static str> {
 	let stake = default_stake::<T>(BALANCE_FACTOR);
 	for i in 0..num_voters {
 		// to ensure that votes are different
 		all_candidates.rotate_left(1);
-		let votes = all_candidates
-			.iter()
-			.cloned()
-			.take(votes)
-			.collect::<Vec<_>>();
+		let votes = all_candidates.iter().cloned().take(votes).collect::<Vec<_>>();
 		let voter = endowed_account::<T>("voter", i);
 		submit_voter::<T>(voter, votes, stake)?;
 	}
@@ -128,13 +132,11 @@ fn fill_seats_up_to<T: Config>(m: u32) -> Result<Vec<T::AccountId>, &'static str
 		m as usize,
 		"wrong number of members and runners-up",
 	);
-	Ok(
-		<Elections<T>>::members()
-			.into_iter()
-			.map(|m| m.who)
-			.chain(<Elections<T>>::runners_up().into_iter().map(|r| r.who))
-			.collect()
-	)
+	Ok(<Elections<T>>::members()
+		.into_iter()
+		.map(|m| m.who)
+		.chain(<Elections<T>>::runners_up().into_iter().map(|r| r.who))
+		.collect())
 }
 
 /// removes all the storage items to reverse any genesis state.
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index a3232ac0d28f..97147692fd6d 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -100,11 +100,11 @@
 
 use codec::{Decode, Encode};
 use frame_support::{
-	dispatch::{WithPostDispatchInfo},
+	dispatch::WithPostDispatchInfo,
 	traits::{
 		ChangeMembers, Contains, ContainsLengthBound, Currency, CurrencyToVote, Get,
 		InitializeMembers, LockIdentifier, LockableCurrency, OnUnbalanced, ReservableCurrency,
-		WithdrawReasons, SortedMembers,
+		SortedMembers, WithdrawReasons,
 	},
 	weights::Weight,
 };
@@ -113,7 +113,7 @@ use sp_runtime::{
 	traits::{Saturating, StaticLookup, Zero},
 	DispatchError, Perbill, RuntimeDebug,
 };
-use sp_std::{prelude::*, cmp::Ordering};
+use sp_std::{cmp::Ordering, prelude::*};
 
 mod benchmarking;
 pub mod weights;
@@ -127,8 +127,9 @@ pub const MAXIMUM_VOTE: usize = 16;
 
 type BalanceOf<T> =
 	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
-type NegativeImbalanceOf<T> =
-	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
+type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<
+	<T as frame_system::Config>::AccountId,
+>>::NegativeImbalance;
 
 /// An indication that the renouncing account currently has which of the below roles.
 #[derive(Encode, Decode, Clone, PartialEq, RuntimeDebug)]
@@ -171,14 +172,13 @@ pub use pallet::*;
 
 #[frame_support::pallet]
 pub mod pallet {
+	use super::*;
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
-	use super::*;
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
-		type Event: From<Event<Self>>
-			+ IsType<<Self as frame_system::Config>::Event>;
+		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
 
 		/// Identifier for the elections-phragmen pallet's lock
 		#[pallet::constant]
@@ -320,24 +320,19 @@ pub mod pallet {
 					let to_reserve = new_deposit - old_deposit;
 					T::Currency::reserve(&who, to_reserve)
 						.map_err(|_| Error::<T>::UnableToPayBond)?;
-				}
-				Ordering::Equal => {}
+				},
+				Ordering::Equal => {},
 				Ordering::Less => {
 					// Must unreserve a bit.
 					let to_unreserve = old_deposit - new_deposit;
 					let _remainder = T::Currency::unreserve(&who, to_unreserve);
 					debug_assert!(_remainder.is_zero());
-				}
+				},
 			};
 
 			// Amount to be locked up.
 			let locked_stake = value.min(T::Currency::total_balance(&who));
-			T::Currency::set_lock(
-				T::PalletId::get(),
-				&who,
-				locked_stake,
-				WithdrawReasons::all(),
-			);
+			T::Currency::set_lock(T::PalletId::get(), &who, locked_stake, WithdrawReasons::all());
 
 			Voting::<T>::insert(&who, Voter { votes, deposit: new_deposit, stake: locked_stake });
 			Ok(None.into())
@@ -426,7 +421,7 @@ pub mod pallet {
 					let _ = Self::remove_and_replace_member(&who, false)
 						.map_err(|_| Error::<T>::InvalidRenouncing)?;
 					Self::deposit_event(Event::Renounced(who));
-				}
+				},
 				Renouncing::RunnerUp => {
 					<RunnersUp<T>>::try_mutate::<_, Error<T>, _>(|runners_up| {
 						let index = runners_up
@@ -440,7 +435,7 @@ pub mod pallet {
 						Self::deposit_event(Event::Renounced(who));
 						Ok(())
 					})?;
-				}
+				},
 				Renouncing::Candidate(count) => {
 					<Candidates<T>>::try_mutate::<_, Error<T>, _>(|candidates| {
 						ensure!(count >= candidates.len() as u32, Error::<T>::InvalidWitnessData);
@@ -453,7 +448,7 @@ pub mod pallet {
 						Self::deposit_event(Event::Renounced(who));
 						Ok(())
 					})?;
-				}
+				},
 			};
 			Ok(None.into())
 		}
@@ -491,7 +486,7 @@ pub mod pallet {
 				return Err(Error::<T>::InvalidReplacement.with_weight(
 					// refund. The weight value comes from a benchmark which is special to this.
 					T::WeightInfo::remove_member_wrong_refund(),
-				));
+				))
 			}
 
 			let had_replacement = Self::remove_and_replace_member(&who, true)?;
@@ -664,37 +659,46 @@ pub mod pallet {
 				self.members.len() as u32 <= T::DesiredMembers::get(),
 				"Cannot accept more than DesiredMembers genesis member",
 			);
-			let members = self.members.iter().map(|(ref member, ref stake)| {
-				// make sure they have enough stake.
-				assert!(
-					T::Currency::free_balance(member) >= *stake,
-					"Genesis member does not have enough stake.",
-				);
+			let members = self
+				.members
+				.iter()
+				.map(|(ref member, ref stake)| {
+					// make sure they have enough stake.
+					assert!(
+						T::Currency::free_balance(member) >= *stake,
+						"Genesis member does not have enough stake.",
+					);
 
-				// Note: all members will only vote for themselves, hence they must be given exactly
-				// their own stake as total backing. Any sane election should behave as such.
-				// Nonetheless, stakes will be updated for term 1 onwards according to the election.
-				Members::<T>::mutate(|members| {
-					match members.binary_search_by(|m| m.who.cmp(member)) {
-						Ok(_) => panic!("Duplicate member in elections-phragmen genesis: {}", member),
-						Err(pos) => members.insert(
-							pos,
-							SeatHolder { who: member.clone(), stake: *stake, deposit: Zero::zero() },
-						),
-					}
-				});
-
-				// set self-votes to make persistent. Genesis voters don't have any bond, nor do
-				// they have any lock. NOTE: this means that we will still try to remove a lock once
-				// this genesis voter is removed, and for now it is okay because remove_lock is noop
-				// if lock is not there.
-				<Voting<T>>::insert(
-					&member,
-					Voter { votes: vec![member.clone()], stake: *stake, deposit: Zero::zero() },
-				);
+					// Note: all members will only vote for themselves, hence they must be given exactly
+					// their own stake as total backing. Any sane election should behave as such.
+					// Nonetheless, stakes will be updated for term 1 onwards according to the election.
+					Members::<T>::mutate(|members| {
+						match members.binary_search_by(|m| m.who.cmp(member)) {
+							Ok(_) =>
+								panic!("Duplicate member in elections-phragmen genesis: {}", member),
+							Err(pos) => members.insert(
+								pos,
+								SeatHolder {
+									who: member.clone(),
+									stake: *stake,
+									deposit: Zero::zero(),
+								},
+							),
+						}
+					});
+
+					// set self-votes to make persistent. Genesis voters don't have any bond, nor do
+					// they have any lock. NOTE: this means that we will still try to remove a lock once
+					// this genesis voter is removed, and for now it is okay because remove_lock is noop
+					// if lock is not there.
+					<Voting<T>>::insert(
+						&member,
+						Voter { votes: vec![member.clone()], stake: *stake, deposit: Zero::zero() },
+					);
 
-				member.clone()
-			}).collect::<Vec<T::AccountId>>();
+					member.clone()
+				})
+				.collect::<Vec<T::AccountId>>();
 
 			// report genesis members to upstream, if any.
 			T::InitializeMembers::initialize_members(&members);
@@ -731,8 +735,9 @@ impl<T: Config> Pallet<T> {
 		// - `Ok(None)` if member was removed but no replacement was found
 		// - `Err(_)` if who is not a member.
 		let maybe_replacement = <Members<T>>::try_mutate::<_, Error<T>, _>(|members| {
-			let remove_index =
-				members.binary_search_by(|m| m.who.cmp(who)).map_err(|_| Error::<T>::NotMember)?;
+			let remove_index = members
+				.binary_search_by(|m| m.who.cmp(who))
+				.map_err(|_| Error::<T>::NotMember)?;
 			// we remove the member anyhow, regardless of having a runner-up or not.
 			let removed = members.remove(remove_index);
 
@@ -764,10 +769,8 @@ impl<T: Config> Pallet<T> {
 			Ok(maybe_next_best)
 		})?;
 
-		let remaining_member_ids_sorted = Self::members()
-			.into_iter()
-			.map(|x| x.who.clone())
-			.collect::<Vec<_>>();
+		let remaining_member_ids_sorted =
+			Self::members().into_iter().map(|x| x.who.clone()).collect::<Vec<_>>();
 		let outgoing = &[who.clone()];
 		let maybe_current_prime = T::ChangeMembers::get_prime();
 		let return_value = match maybe_replacement {
@@ -776,18 +779,18 @@ impl<T: Config> Pallet<T> {
 				T::ChangeMembers::change_members_sorted(
 					&[incoming.who],
 					outgoing,
-					&remaining_member_ids_sorted[..]
+					&remaining_member_ids_sorted[..],
 				);
 				true
-			}
+			},
 			None => {
 				T::ChangeMembers::change_members_sorted(
 					&[],
 					outgoing,
-					&remaining_member_ids_sorted[..]
+					&remaining_member_ids_sorted[..],
 				);
 				false
-			}
+			},
 		};
 
 		// if there was a prime before and they are not the one being removed, then set them
@@ -845,11 +848,9 @@ impl<T: Config> Pallet<T> {
 	/// O(NLogM) with M candidates and `who` having voted for `N` of them.
 	/// Reads Members, RunnersUp, Candidates and Voting(who) from database.
 	fn is_defunct_voter(votes: &[T::AccountId]) -> bool {
-		votes.iter().all(|v|
-			!Self::is_member(v) &&
-			!Self::is_runner_up(v) &&
-			!Self::is_candidate(v).is_ok()
-		)
+		votes.iter().all(|v| {
+			!Self::is_member(v) && !Self::is_runner_up(v) && !Self::is_candidate(v).is_ok()
+		})
 	}
 
 	/// Remove a certain someone as a voter.
@@ -880,15 +881,12 @@ impl<T: Config> Pallet<T> {
 
 		if candidates_and_deposit.len().is_zero() {
 			Self::deposit_event(Event::EmptyTerm);
-			return T::DbWeight::get().reads(5);
+			return T::DbWeight::get().reads(5)
 		}
 
 		// All of the new winners that come out of phragmen will thus have a deposit recorded.
-		let candidate_ids = candidates_and_deposit
-			.iter()
-			.map(|(x, _)| x)
-			.cloned()
-			.collect::<Vec<_>>();
+		let candidate_ids =
+			candidates_and_deposit.iter().map(|(x, _)| x).cloned().collect::<Vec<_>>();
 
 		// helper closures to deal with balance/stake.
 		let total_issuance = T::Currency::total_issuance();
@@ -898,10 +896,11 @@ impl<T: Config> Pallet<T> {
 		let mut num_edges: u32 = 0;
 		// used for prime election.
 		let voters_and_stakes = Voting::<T>::iter()
-			.map(|(voter, Voter { stake, votes, .. })| { (voter, stake, votes) })
+			.map(|(voter, Voter { stake, votes, .. })| (voter, stake, votes))
 			.collect::<Vec<_>>();
 		// used for phragmen.
-		let voters_and_votes = voters_and_stakes.iter()
+		let voters_and_votes = voters_and_stakes
+			.iter()
 			.cloned()
 			.map(|(voter, stake, votes)| {
 				num_edges = num_edges.saturating_add(votes.len() as u32);
@@ -917,15 +916,14 @@ impl<T: Config> Pallet<T> {
 			candidate_ids,
 			voters_and_votes.clone(),
 			None,
-		).map(|ElectionResult { winners, assignments: _, }| {
+		)
+		.map(|ElectionResult { winners, assignments: _ }| {
 			// this is already sorted by id.
-			let old_members_ids_sorted = <Members<T>>::take().into_iter()
-				.map(|m| m.who)
-				.collect::<Vec<T::AccountId>>();
+			let old_members_ids_sorted =
+				<Members<T>>::take().into_iter().map(|m| m.who).collect::<Vec<T::AccountId>>();
 			// this one needs a sort by id.
-			let mut old_runners_up_ids_sorted = <RunnersUp<T>>::take().into_iter()
-				.map(|r| r.who)
-				.collect::<Vec<T::AccountId>>();
+			let mut old_runners_up_ids_sorted =
+				<RunnersUp<T>>::take().into_iter().map(|r| r.who).collect::<Vec<T::AccountId>>();
 			old_runners_up_ids_sorted.sort();
 
 			// filter out those who end up with no backing stake.
@@ -941,16 +939,15 @@ impl<T: Config> Pallet<T> {
 
 			// split new set into winners and runners up.
 			let split_point = desired_seats.min(new_set_with_stake.len());
-			let mut new_members_sorted_by_id = new_set_with_stake.drain(..split_point).collect::<Vec<_>>();
+			let mut new_members_sorted_by_id =
+				new_set_with_stake.drain(..split_point).collect::<Vec<_>>();
 			new_members_sorted_by_id.sort_by(|i, j| i.0.cmp(&j.0));
 
 			// all the rest will be runners-up
 			new_set_with_stake.reverse();
 			let new_runners_up_sorted_by_rank = new_set_with_stake;
-			let mut new_runners_up_ids_sorted = new_runners_up_sorted_by_rank
-				.iter()
-				.map(|(r, _)| r.clone())
-				.collect::<Vec<_>>();
+			let mut new_runners_up_ids_sorted =
+				new_runners_up_sorted_by_rank.iter().map(|(r, _)| r.clone()).collect::<Vec<_>>();
 			new_runners_up_ids_sorted.sort();
 
 			// Now we select a prime member using a [Borda
@@ -963,14 +960,15 @@ impl<T: Config> Pallet<T> {
 				.map(|c| (&c.0, BalanceOf::<T>::zero()))
 				.collect::<Vec<_>>();
 			for (_, stake, votes) in voters_and_stakes.into_iter() {
-				for (vote_multiplier, who) in votes.iter()
+				for (vote_multiplier, who) in votes
+					.iter()
 					.enumerate()
 					.map(|(vote_position, who)| ((MAXIMUM_VOTE - vote_position) as u32, who))
 				{
 					if let Ok(i) = prime_votes.binary_search_by_key(&who, |k| k.0) {
-						prime_votes[i].1 = prime_votes[i].1.saturating_add(
-							stake.saturating_mul(vote_multiplier.into())
-						);
+						prime_votes[i].1 = prime_votes[i]
+							.1
+							.saturating_add(stake.saturating_mul(vote_multiplier.into()));
 					}
 				}
 			}
@@ -990,18 +988,13 @@ impl<T: Config> Pallet<T> {
 				&new_members_ids_sorted,
 				&old_members_ids_sorted,
 			);
-			T::ChangeMembers::change_members_sorted(
-				&incoming,
-				&outgoing,
-				&new_members_ids_sorted,
-			);
+			T::ChangeMembers::change_members_sorted(&incoming, &outgoing, &new_members_ids_sorted);
 			T::ChangeMembers::set_prime(prime);
 
 			// All candidates/members/runners-up who are no longer retaining a position as a
 			// seat holder will lose their bond.
 			candidates_and_deposit.iter().for_each(|(c, d)| {
-				if
-					new_members_ids_sorted.binary_search(c).is_err() &&
+				if new_members_ids_sorted.binary_search(c).is_err() &&
 					new_runners_up_ids_sorted.binary_search(c).is_err()
 				{
 					let (imbalance, _) = T::Currency::slash_reserved(c, *d);
@@ -1048,7 +1041,8 @@ impl<T: Config> Pallet<T> {
 
 			Self::deposit_event(Event::NewTerm(new_members_sorted_by_id));
 			<ElectionRounds<T>>::mutate(|v| *v += 1);
-		}).map_err(|e| {
+		})
+		.map_err(|e| {
 			log::error!(
 				target: "runtime::elections-phragmen",
 				"Failed to run election [{:?}].",
@@ -1080,11 +1074,9 @@ impl<T: Config> SortedMembers<T::AccountId> for Pallet<T> {
 	// checks in runtime benchmarking.
 	#[cfg(feature = "runtime-benchmarks")]
 	fn add(who: &T::AccountId) {
-		Members::<T>::mutate(|members| {
-			match members.binary_search_by(|m| m.who.cmp(who)) {
-				Ok(_) => (),
-				Err(pos) => members.insert(pos, SeatHolder { who: who.clone(), ..Default::default() }),
-			}
+		Members::<T>::mutate(|members| match members.binary_search_by(|m| m.who.cmp(who)) {
+			Ok(_) => (),
+			Err(pos) => members.insert(pos, SeatHolder { who: who.clone(), ..Default::default() }),
 		})
 	}
 }
@@ -1103,19 +1095,19 @@ impl<T: Config> ContainsLengthBound for Pallet<T> {
 #[cfg(test)]
 mod tests {
 	use super::*;
+	use crate as elections_phragmen;
 	use frame_support::{
-		assert_ok, assert_noop, parameter_types, traits::OnInitialize,
-		dispatch::DispatchResultWithPostInfo,
+		assert_noop, assert_ok, dispatch::DispatchResultWithPostInfo, parameter_types,
+		traits::OnInitialize,
 	};
-	use substrate_test_utils::assert_eq_uvec;
+	use frame_system::ensure_signed;
 	use sp_core::H256;
 	use sp_runtime::{
-		BuildStorage,
 		testing::Header,
 		traits::{BlakeTwo256, IdentityLookup},
+		BuildStorage,
 	};
-	use frame_system::ensure_signed;
-	use crate as elections_phragmen;
+	use substrate_test_utils::assert_eq_uvec;
 
 	parameter_types! {
 		pub const BlockHashCount: u64 = 250;
@@ -1264,10 +1256,7 @@ mod tests {
 
 	impl Default for ExtBuilder {
 		fn default() -> Self {
-			Self {
-				balance_factor: 1,
-				genesis_members: vec![],
-			}
+			Self { balance_factor: 1, genesis_members: vec![] }
 		}
 	}
 
@@ -1290,10 +1279,7 @@ mod tests {
 		}
 		pub fn genesis_members(mut self, members: Vec<(u64, u64)>) -> Self {
 			MEMBERS.with(|m| {
-				*m.borrow_mut() = members
-					.iter()
-					.map(|(m, _)| m.clone())
-					.collect::<Vec<_>>()
+				*m.borrow_mut() = members.iter().map(|(m, _)| m.clone()).collect::<Vec<_>>()
 			});
 			self.genesis_members = members;
 			self
@@ -1307,22 +1293,28 @@ mod tests {
 			self
 		}
 		pub fn build_and_execute(self, test: impl FnOnce() -> ()) {
-			MEMBERS.with(|m| *m.borrow_mut() = self.genesis_members.iter().map(|(m, _)| m.clone()).collect::<Vec<_>>());
+			MEMBERS.with(|m| {
+				*m.borrow_mut() =
+					self.genesis_members.iter().map(|(m, _)| m.clone()).collect::<Vec<_>>()
+			});
 			let mut ext: sp_io::TestExternalities = GenesisConfig {
-				balances: pallet_balances::GenesisConfig::<Test>{
+				balances: pallet_balances::GenesisConfig::<Test> {
 					balances: vec![
 						(1, 10 * self.balance_factor),
 						(2, 20 * self.balance_factor),
 						(3, 30 * self.balance_factor),
 						(4, 40 * self.balance_factor),
 						(5, 50 * self.balance_factor),
-						(6, 60 * self.balance_factor)
+						(6, 60 * self.balance_factor),
 					],
 				},
 				elections: elections_phragmen::GenesisConfig::<Test> {
-					members: self.genesis_members
+					members: self.genesis_members,
 				},
-			}.build_storage().unwrap().into();
+			}
+			.build_storage()
+			.unwrap()
+			.into();
 			ext.execute_with(pre_conditions);
 			ext.execute_with(test);
 			ext.execute_with(post_conditions)
@@ -1330,10 +1322,7 @@ mod tests {
 	}
 
 	fn candidate_ids() -> Vec<u64> {
-		Elections::candidates()
-			.into_iter()
-			.map(|(c, _)| c)
-			.collect::<Vec<_>>()
+		Elections::candidates().into_iter().map(|(c, _)| c).collect::<Vec<_>>()
 	}
 
 	fn candidate_deposit(who: &u64) -> u64 {
@@ -1360,7 +1349,10 @@ mod tests {
 	}
 
 	fn runners_up_and_stake() -> Vec<(u64, u64)> {
-		Elections::runners_up().into_iter().map(|r| (r.who, r.stake)).collect::<Vec<_>>()
+		Elections::runners_up()
+			.into_iter()
+			.map(|r| (r.who, r.stake))
+			.collect::<Vec<_>>()
 	}
 
 	fn all_voters() -> Vec<u64> {
@@ -1473,64 +1465,88 @@ mod tests {
 
 	#[test]
 	fn genesis_members_should_work() {
-		ExtBuilder::default().genesis_members(vec![(1, 10), (2, 20)]).build_and_execute(|| {
-			System::set_block_number(1);
-			assert_eq!(
-				Elections::members(),
-				vec![
-					SeatHolder { who: 1, stake: 10, deposit: 0 },
-					SeatHolder { who: 2, stake: 20, deposit: 0 }
-				]
-			);
+		ExtBuilder::default()
+			.genesis_members(vec![(1, 10), (2, 20)])
+			.build_and_execute(|| {
+				System::set_block_number(1);
+				assert_eq!(
+					Elections::members(),
+					vec![
+						SeatHolder { who: 1, stake: 10, deposit: 0 },
+						SeatHolder { who: 2, stake: 20, deposit: 0 }
+					]
+				);
 
-			assert_eq!(Elections::voting(1), Voter { stake: 10u64, votes: vec![1], deposit: 0 });
-			assert_eq!(Elections::voting(2), Voter { stake: 20u64, votes: vec![2], deposit: 0 });
+				assert_eq!(
+					Elections::voting(1),
+					Voter { stake: 10u64, votes: vec![1], deposit: 0 }
+				);
+				assert_eq!(
+					Elections::voting(2),
+					Voter { stake: 20u64, votes: vec![2], deposit: 0 }
+				);
 
-			// they will persist since they have self vote.
-			System::set_block_number(5);
-			Elections::on_initialize(System::block_number());
+				// they will persist since they have self vote.
+				System::set_block_number(5);
+				Elections::on_initialize(System::block_number());
 
-			assert_eq!(members_ids(), vec![1, 2]);
-		})
+				assert_eq!(members_ids(), vec![1, 2]);
+			})
 	}
 
 	#[test]
 	fn genesis_voters_can_remove_lock() {
-		ExtBuilder::default().genesis_members(vec![(1, 10), (2, 20)]).build_and_execute(|| {
-			System::set_block_number(1);
+		ExtBuilder::default()
+			.genesis_members(vec![(1, 10), (2, 20)])
+			.build_and_execute(|| {
+				System::set_block_number(1);
 
-			assert_eq!(Elections::voting(1), Voter { stake: 10u64, votes: vec![1], deposit: 0 });
-			assert_eq!(Elections::voting(2), Voter { stake: 20u64, votes: vec![2], deposit: 0 });
+				assert_eq!(
+					Elections::voting(1),
+					Voter { stake: 10u64, votes: vec![1], deposit: 0 }
+				);
+				assert_eq!(
+					Elections::voting(2),
+					Voter { stake: 20u64, votes: vec![2], deposit: 0 }
+				);
 
-			assert_ok!(Elections::remove_voter(Origin::signed(1)));
-			assert_ok!(Elections::remove_voter(Origin::signed(2)));
+				assert_ok!(Elections::remove_voter(Origin::signed(1)));
+				assert_ok!(Elections::remove_voter(Origin::signed(2)));
 
-			assert_eq!(Elections::voting(1), Default::default());
-			assert_eq!(Elections::voting(2), Default::default());
-		})
+				assert_eq!(Elections::voting(1), Default::default());
+				assert_eq!(Elections::voting(2), Default::default());
+			})
 	}
 
 	#[test]
 	fn genesis_members_unsorted_should_work() {
-		ExtBuilder::default().genesis_members(vec![(2, 20), (1, 10)]).build_and_execute(|| {
-			System::set_block_number(1);
-			assert_eq!(
-				Elections::members(),
-				vec![
-					SeatHolder { who: 1, stake: 10, deposit: 0 },
-					SeatHolder { who: 2, stake: 20, deposit: 0 },
-				]
-			);
+		ExtBuilder::default()
+			.genesis_members(vec![(2, 20), (1, 10)])
+			.build_and_execute(|| {
+				System::set_block_number(1);
+				assert_eq!(
+					Elections::members(),
+					vec![
+						SeatHolder { who: 1, stake: 10, deposit: 0 },
+						SeatHolder { who: 2, stake: 20, deposit: 0 },
+					]
+				);
 
-			assert_eq!(Elections::voting(1), Voter { stake: 10u64, votes: vec![1], deposit: 0 });
-			assert_eq!(Elections::voting(2), Voter { stake: 20u64, votes: vec![2], deposit: 0 });
+				assert_eq!(
+					Elections::voting(1),
+					Voter { stake: 10u64, votes: vec![1], deposit: 0 }
+				);
+				assert_eq!(
+					Elections::voting(2),
+					Voter { stake: 20u64, votes: vec![2], deposit: 0 }
+				);
 
-			// they will persist since they have self vote.
-			System::set_block_number(5);
-			Elections::on_initialize(System::block_number());
+				// they will persist since they have self vote.
+				System::set_block_number(5);
+				Elections::on_initialize(System::block_number());
 
-			assert_eq!(members_ids(), vec![1, 2]);
-		})
+				assert_eq!(members_ids(), vec![1, 2]);
+			})
 	}
 
 	#[test]
@@ -1562,10 +1578,7 @@ mod tests {
 
 	#[test]
 	fn term_duration_zero_is_passive() {
-		ExtBuilder::default()
-			.term_duration(0)
-			.build_and_execute(||
-		{
+		ExtBuilder::default().term_duration(0).build_and_execute(|| {
 			assert_eq!(<Test as Config>::TermDuration::get(), 0);
 			assert_eq!(<Test as Config>::DesiredMembers::get(), 2);
 			assert_eq!(Elections::election_rounds(), 0);
@@ -1664,10 +1677,7 @@ mod tests {
 			assert_eq!(candidate_ids(), Vec::<u64>::new());
 			assert_ok!(submit_candidacy(Origin::signed(1)));
 			assert_eq!(candidate_ids(), vec![1]);
-			assert_noop!(
-				submit_candidacy(Origin::signed(1)),
-				Error::<Test>::DuplicatedCandidate,
-			);
+			assert_noop!(submit_candidacy(Origin::signed(1)), Error::<Test>::DuplicatedCandidate,);
 		});
 	}
 
@@ -1685,10 +1695,7 @@ mod tests {
 			assert!(Elections::runners_up().is_empty());
 			assert!(candidate_ids().is_empty());
 
-			assert_noop!(
-				submit_candidacy(Origin::signed(5)),
-				Error::<Test>::MemberSubmit,
-			);
+			assert_noop!(submit_candidacy(Origin::signed(5)), Error::<Test>::MemberSubmit,);
 		});
 	}
 
@@ -1708,10 +1715,7 @@ mod tests {
 			assert_eq!(members_ids(), vec![4, 5]);
 			assert_eq!(runners_up_ids(), vec![3]);
 
-			assert_noop!(
-				submit_candidacy(Origin::signed(3)),
-				Error::<Test>::RunnerUpSubmit,
-			);
+			assert_noop!(submit_candidacy(Origin::signed(3)), Error::<Test>::RunnerUpSubmit,);
 		});
 	}
 
@@ -1846,10 +1850,7 @@ mod tests {
 	#[test]
 	fn cannot_vote_for_no_candidate() {
 		ExtBuilder::default().build_and_execute(|| {
-			assert_noop!(
-				vote(Origin::signed(2), vec![], 20),
-				Error::<Test>::NoVotes,
-			);
+			assert_noop!(vote(Origin::signed(2), vec![], 20), Error::<Test>::NoVotes,);
 		});
 	}
 
@@ -1934,10 +1935,7 @@ mod tests {
 
 			assert_eq!(members_ids(), vec![4, 5]);
 			assert_eq!(PRIME.with(|p| *p.borrow()), Some(5));
-			assert_ok!(Elections::renounce_candidacy(
-				Origin::signed(4),
-				Renouncing::Member
-			));
+			assert_ok!(Elections::renounce_candidacy(Origin::signed(4), Renouncing::Member));
 
 			assert_eq!(members_ids(), vec![5]);
 			assert_eq!(PRIME.with(|p| *p.borrow()), Some(5));
@@ -1970,35 +1968,34 @@ mod tests {
 		ExtBuilder::default()
 			.desired_runners_up(1)
 			.balance_factor(10)
-			.build_and_execute(
-		|| {
-			// when we have only candidates
-			assert_ok!(submit_candidacy(Origin::signed(5)));
-			assert_ok!(submit_candidacy(Origin::signed(4)));
-			assert_ok!(submit_candidacy(Origin::signed(3)));
+			.build_and_execute(|| {
+				// when we have only candidates
+				assert_ok!(submit_candidacy(Origin::signed(5)));
+				assert_ok!(submit_candidacy(Origin::signed(4)));
+				assert_ok!(submit_candidacy(Origin::signed(3)));
 
-			assert_noop!(
-				// content of the vote is irrelevant.
-				vote(Origin::signed(1), vec![9, 99, 999, 9999], 5),
-				Error::<Test>::TooManyVotes,
-			);
+				assert_noop!(
+					// content of the vote is irrelevant.
+					vote(Origin::signed(1), vec![9, 99, 999, 9999], 5),
+					Error::<Test>::TooManyVotes,
+				);
 
-			assert_ok!(vote(Origin::signed(3), vec![3], 30));
-			assert_ok!(vote(Origin::signed(4), vec![4], 40));
-			assert_ok!(vote(Origin::signed(5), vec![5], 50));
+				assert_ok!(vote(Origin::signed(3), vec![3], 30));
+				assert_ok!(vote(Origin::signed(4), vec![4], 40));
+				assert_ok!(vote(Origin::signed(5), vec![5], 50));
 
-			System::set_block_number(5);
-			Elections::on_initialize(System::block_number());
+				System::set_block_number(5);
+				Elections::on_initialize(System::block_number());
 
-			// now we have 2 members, 1 runner-up, and 1 new candidate
-			assert_ok!(submit_candidacy(Origin::signed(2)));
+				// now we have 2 members, 1 runner-up, and 1 new candidate
+				assert_ok!(submit_candidacy(Origin::signed(2)));
 
-			assert_ok!(vote(Origin::signed(1), vec![9, 99, 999, 9999], 5));
-			assert_noop!(
-				vote(Origin::signed(1), vec![9, 99, 999, 9_999, 99_999], 5),
-				Error::<Test>::TooManyVotes,
-			);
-		});
+				assert_ok!(vote(Origin::signed(1), vec![9, 99, 999, 9999], 5));
+				assert_noop!(
+					vote(Origin::signed(1), vec![9, 99, 999, 9_999, 99_999], 5),
+					Error::<Test>::TooManyVotes,
+				);
+			});
 	}
 
 	#[test]
@@ -2007,10 +2004,7 @@ mod tests {
 			assert_ok!(submit_candidacy(Origin::signed(5)));
 			assert_ok!(submit_candidacy(Origin::signed(4)));
 
-			assert_noop!(
-				vote(Origin::signed(2), vec![4], 1),
-				Error::<Test>::LowBalance,
-			);
+			assert_noop!(vote(Origin::signed(2), vec![4], 1), Error::<Test>::LowBalance,);
 		})
 	}
 
@@ -2151,7 +2145,10 @@ mod tests {
 			System::set_block_number(5);
 			Elections::on_initialize(System::block_number());
 
-			System::assert_last_event(Event::Elections(super::Event::NewTerm(vec![(4, 40), (5, 50)])));
+			System::assert_last_event(Event::Elections(super::Event::NewTerm(vec![
+				(4, 40),
+				(5, 50),
+			])));
 
 			assert_eq!(members_and_stake(), vec![(4, 40), (5, 50)]);
 			assert_eq!(runners_up_and_stake(), vec![]);
@@ -2480,10 +2477,7 @@ mod tests {
 			let unwrapped_error = Elections::remove_member(Origin::root(), 4, true).unwrap_err();
 			assert!(matches!(
 				unwrapped_error.error,
-				DispatchError::Module {
-					message: Some("InvalidReplacement"),
-					..
-				}
+				DispatchError::Module { message: Some("InvalidReplacement"), .. }
 			));
 			assert!(unwrapped_error.post_info.actual_weight.is_some());
 		});
@@ -2506,10 +2500,7 @@ mod tests {
 			let unwrapped_error = Elections::remove_member(Origin::root(), 4, false).unwrap_err();
 			assert!(matches!(
 				unwrapped_error.error,
-				DispatchError::Module {
-					message: Some("InvalidReplacement"),
-					..
-				}
+				DispatchError::Module { message: Some("InvalidReplacement"), .. }
 			));
 			assert!(unwrapped_error.post_info.actual_weight.is_some());
 		});
@@ -2590,7 +2581,10 @@ mod tests {
 			// 5 is an outgoing loser. will also get slashed.
 			assert_eq!(balances(&5), (45, 2));
 
-			System::assert_has_event(Event::Elections(super::Event::NewTerm(vec![(4, 40), (5, 50)])));
+			System::assert_has_event(Event::Elections(super::Event::NewTerm(vec![
+				(4, 40),
+				(5, 50),
+			])));
 		})
 	}
 
@@ -2636,24 +2630,22 @@ mod tests {
 
 	#[test]
 	fn runner_up_replacement_maintains_members_order() {
-		ExtBuilder::default()
-			.desired_runners_up(2)
-			.build_and_execute(|| {
-				assert_ok!(submit_candidacy(Origin::signed(5)));
-				assert_ok!(submit_candidacy(Origin::signed(4)));
+		ExtBuilder::default().desired_runners_up(2).build_and_execute(|| {
+			assert_ok!(submit_candidacy(Origin::signed(5)));
+			assert_ok!(submit_candidacy(Origin::signed(4)));
 			assert_ok!(submit_candidacy(Origin::signed(2)));
 
 			assert_ok!(vote(Origin::signed(2), vec![5], 20));
 			assert_ok!(vote(Origin::signed(4), vec![4], 40));
 			assert_ok!(vote(Origin::signed(5), vec![2], 50));
 
-				System::set_block_number(5);
-				Elections::on_initialize(System::block_number());
+			System::set_block_number(5);
+			Elections::on_initialize(System::block_number());
 
-				assert_eq!(members_ids(), vec![2, 4]);
-				assert_ok!(Elections::remove_member(Origin::root(), 2, true));
-				assert_eq!(members_ids(), vec![4, 5]);
-			});
+			assert_eq!(members_ids(), vec![2, 4]);
+			assert_ok!(Elections::remove_member(Origin::root(), 2, true));
+			assert_eq!(members_ids(), vec![4, 5]);
+		});
 	}
 
 	#[test]
@@ -2709,12 +2701,10 @@ mod tests {
 
 	#[test]
 	fn can_renounce_candidacy_runner_up() {
-		ExtBuilder::default()
-			.desired_runners_up(2)
-			.build_and_execute(|| {
-				assert_ok!(submit_candidacy(Origin::signed(5)));
-				assert_ok!(submit_candidacy(Origin::signed(4)));
-				assert_ok!(submit_candidacy(Origin::signed(3)));
+		ExtBuilder::default().desired_runners_up(2).build_and_execute(|| {
+			assert_ok!(submit_candidacy(Origin::signed(5)));
+			assert_ok!(submit_candidacy(Origin::signed(4)));
+			assert_ok!(submit_candidacy(Origin::signed(3)));
 			assert_ok!(submit_candidacy(Origin::signed(2)));
 
 			assert_ok!(vote(Origin::signed(5), vec![4], 50));
@@ -2722,21 +2712,18 @@ mod tests {
 			assert_ok!(vote(Origin::signed(3), vec![3], 30));
 			assert_ok!(vote(Origin::signed(2), vec![2], 20));
 
-				System::set_block_number(5);
-				Elections::on_initialize(System::block_number());
+			System::set_block_number(5);
+			Elections::on_initialize(System::block_number());
 
-				assert_eq!(members_ids(), vec![4, 5]);
-				assert_eq!(runners_up_ids(), vec![2, 3]);
+			assert_eq!(members_ids(), vec![4, 5]);
+			assert_eq!(runners_up_ids(), vec![2, 3]);
 
-				assert_ok!(Elections::renounce_candidacy(
-					Origin::signed(3),
-					Renouncing::RunnerUp
-				));
-				assert_eq!(balances(&3), (28, 2)); // 2 is voting bond.
+			assert_ok!(Elections::renounce_candidacy(Origin::signed(3), Renouncing::RunnerUp));
+			assert_eq!(balances(&3), (28, 2)); // 2 is voting bond.
 
-				assert_eq!(members_ids(), vec![4, 5]);
-				assert_eq!(runners_up_ids(), vec![2]);
-			})
+			assert_eq!(members_ids(), vec![4, 5]);
+			assert_eq!(runners_up_ids(), vec![2]);
+		})
 	}
 
 	#[test]
@@ -2871,117 +2858,124 @@ mod tests {
 
 	#[test]
 	fn unsorted_runners_up_are_detected() {
-		ExtBuilder::default().desired_runners_up(2).desired_members(1).build_and_execute(|| {
-			assert_ok!(submit_candidacy(Origin::signed(5)));
-			assert_ok!(submit_candidacy(Origin::signed(4)));
-			assert_ok!(submit_candidacy(Origin::signed(3)));
+		ExtBuilder::default()
+			.desired_runners_up(2)
+			.desired_members(1)
+			.build_and_execute(|| {
+				assert_ok!(submit_candidacy(Origin::signed(5)));
+				assert_ok!(submit_candidacy(Origin::signed(4)));
+				assert_ok!(submit_candidacy(Origin::signed(3)));
 
-			assert_ok!(vote(Origin::signed(5), vec![5], 50));
-			assert_ok!(vote(Origin::signed(4), vec![4], 5));
-			assert_ok!(vote(Origin::signed(3), vec![3], 15));
+				assert_ok!(vote(Origin::signed(5), vec![5], 50));
+				assert_ok!(vote(Origin::signed(4), vec![4], 5));
+				assert_ok!(vote(Origin::signed(3), vec![3], 15));
 
-			System::set_block_number(5);
-			Elections::on_initialize(System::block_number());
+				System::set_block_number(5);
+				Elections::on_initialize(System::block_number());
 
-			assert_eq!(members_ids(), vec![5]);
-			assert_eq!(runners_up_ids(), vec![4, 3]);
+				assert_eq!(members_ids(), vec![5]);
+				assert_eq!(runners_up_ids(), vec![4, 3]);
 
-			assert_ok!(submit_candidacy(Origin::signed(2)));
-			assert_ok!(vote(Origin::signed(2), vec![2], 10));
+				assert_ok!(submit_candidacy(Origin::signed(2)));
+				assert_ok!(vote(Origin::signed(2), vec![2], 10));
 
-			System::set_block_number(10);
-			Elections::on_initialize(System::block_number());
+				System::set_block_number(10);
+				Elections::on_initialize(System::block_number());
 
-			assert_eq!(members_ids(), vec![5]);
-			assert_eq!(runners_up_ids(), vec![2, 3]);
+				assert_eq!(members_ids(), vec![5]);
+				assert_eq!(runners_up_ids(), vec![2, 3]);
 
-			// 4 is outgoing runner-up. Slash candidacy bond.
-			assert_eq!(balances(&4), (35, 2));
-			// 3 stays.
-			assert_eq!(balances(&3), (25, 5));
-		})
+				// 4 is outgoing runner-up. Slash candidacy bond.
+				assert_eq!(balances(&4), (35, 2));
+				// 3 stays.
+				assert_eq!(balances(&3), (25, 5));
+			})
 	}
 
 	#[test]
 	fn member_to_runner_up_wont_slash() {
-		ExtBuilder::default().desired_runners_up(2).desired_members(1).build_and_execute(|| {
-			assert_ok!(submit_candidacy(Origin::signed(4)));
-			assert_ok!(submit_candidacy(Origin::signed(3)));
-			assert_ok!(submit_candidacy(Origin::signed(2)));
-
+		ExtBuilder::default()
+			.desired_runners_up(2)
+			.desired_members(1)
+			.build_and_execute(|| {
+				assert_ok!(submit_candidacy(Origin::signed(4)));
+				assert_ok!(submit_candidacy(Origin::signed(3)));
+				assert_ok!(submit_candidacy(Origin::signed(2)));
 
-			assert_ok!(vote(Origin::signed(4), vec![4], 40));
-			assert_ok!(vote(Origin::signed(3), vec![3], 30));
-			assert_ok!(vote(Origin::signed(2), vec![2], 20));
+				assert_ok!(vote(Origin::signed(4), vec![4], 40));
+				assert_ok!(vote(Origin::signed(3), vec![3], 30));
+				assert_ok!(vote(Origin::signed(2), vec![2], 20));
 
-			System::set_block_number(5);
-			Elections::on_initialize(System::block_number());
+				System::set_block_number(5);
+				Elections::on_initialize(System::block_number());
 
-			assert_eq!(members_ids(), vec![4]);
-			assert_eq!(runners_up_ids(), vec![2, 3]);
+				assert_eq!(members_ids(), vec![4]);
+				assert_eq!(runners_up_ids(), vec![2, 3]);
 
-			assert_eq!(balances(&4), (35, 5));
-			assert_eq!(balances(&3), (25, 5));
-			assert_eq!(balances(&2), (15, 5));
+				assert_eq!(balances(&4), (35, 5));
+				assert_eq!(balances(&3), (25, 5));
+				assert_eq!(balances(&2), (15, 5));
 
-			// this guy will shift everyone down.
-			assert_ok!(submit_candidacy(Origin::signed(5)));
-			assert_ok!(vote(Origin::signed(5), vec![5], 50));
+				// this guy will shift everyone down.
+				assert_ok!(submit_candidacy(Origin::signed(5)));
+				assert_ok!(vote(Origin::signed(5), vec![5], 50));
 
-			System::set_block_number(10);
-			Elections::on_initialize(System::block_number());
+				System::set_block_number(10);
+				Elections::on_initialize(System::block_number());
 
-			assert_eq!(members_ids(), vec![5]);
-			assert_eq!(runners_up_ids(), vec![3, 4]);
+				assert_eq!(members_ids(), vec![5]);
+				assert_eq!(runners_up_ids(), vec![3, 4]);
 
-			// 4 went from member to runner-up -- don't slash.
-			assert_eq!(balances(&4), (35, 5));
-			// 3 stayed runner-up -- don't slash.
-			assert_eq!(balances(&3), (25, 5));
-			// 2 was removed -- slash.
-			assert_eq!(balances(&2), (15, 2));
-		});
+				// 4 went from member to runner-up -- don't slash.
+				assert_eq!(balances(&4), (35, 5));
+				// 3 stayed runner-up -- don't slash.
+				assert_eq!(balances(&3), (25, 5));
+				// 2 was removed -- slash.
+				assert_eq!(balances(&2), (15, 2));
+			});
 	}
 
 	#[test]
 	fn runner_up_to_member_wont_slash() {
-		ExtBuilder::default().desired_runners_up(2).desired_members(1).build_and_execute(|| {
-			assert_ok!(submit_candidacy(Origin::signed(4)));
-			assert_ok!(submit_candidacy(Origin::signed(3)));
-			assert_ok!(submit_candidacy(Origin::signed(2)));
-
+		ExtBuilder::default()
+			.desired_runners_up(2)
+			.desired_members(1)
+			.build_and_execute(|| {
+				assert_ok!(submit_candidacy(Origin::signed(4)));
+				assert_ok!(submit_candidacy(Origin::signed(3)));
+				assert_ok!(submit_candidacy(Origin::signed(2)));
 
-			assert_ok!(vote(Origin::signed(4), vec![4], 40));
-			assert_ok!(vote(Origin::signed(3), vec![3], 30));
-			assert_ok!(vote(Origin::signed(2), vec![2], 20));
+				assert_ok!(vote(Origin::signed(4), vec![4], 40));
+				assert_ok!(vote(Origin::signed(3), vec![3], 30));
+				assert_ok!(vote(Origin::signed(2), vec![2], 20));
 
-			System::set_block_number(5);
-			Elections::on_initialize(System::block_number());
+				System::set_block_number(5);
+				Elections::on_initialize(System::block_number());
 
-			assert_eq!(members_ids(), vec![4]);
-			assert_eq!(runners_up_ids(), vec![2, 3]);
+				assert_eq!(members_ids(), vec![4]);
+				assert_eq!(runners_up_ids(), vec![2, 3]);
 
-			assert_eq!(balances(&4), (35, 5));
-			assert_eq!(balances(&3), (25, 5));
-			assert_eq!(balances(&2), (15, 5));
+				assert_eq!(balances(&4), (35, 5));
+				assert_eq!(balances(&3), (25, 5));
+				assert_eq!(balances(&2), (15, 5));
 
-			// swap some votes.
-			assert_ok!(vote(Origin::signed(4), vec![2], 40));
-			assert_ok!(vote(Origin::signed(2), vec![4], 20));
+				// swap some votes.
+				assert_ok!(vote(Origin::signed(4), vec![2], 40));
+				assert_ok!(vote(Origin::signed(2), vec![4], 20));
 
-			System::set_block_number(10);
-			Elections::on_initialize(System::block_number());
+				System::set_block_number(10);
+				Elections::on_initialize(System::block_number());
 
-			assert_eq!(members_ids(), vec![2]);
-			assert_eq!(runners_up_ids(), vec![4, 3]);
+				assert_eq!(members_ids(), vec![2]);
+				assert_eq!(runners_up_ids(), vec![4, 3]);
 
-			// 2 went from runner to member, don't slash
-			assert_eq!(balances(&2), (15, 5));
-			// 4 went from member to runner, don't slash
-			assert_eq!(balances(&4), (35, 5));
-			// 3 stayed the same
-			assert_eq!(balances(&3), (25, 5));
-		});
+				// 2 went from runner to member, don't slash
+				assert_eq!(balances(&2), (15, 5));
+				// 4 went from member to runner, don't slash
+				assert_eq!(balances(&4), (35, 5));
+				// 3 stayed the same
+				assert_eq!(balances(&3), (25, 5));
+			});
 	}
 
 	#[test]
@@ -3031,14 +3025,17 @@ mod tests {
 	#[test]
 	fn no_desired_members() {
 		// not interested in anything
-		ExtBuilder::default().desired_members(0).desired_runners_up(0).build_and_execute(|| {
-			assert_eq!(Elections::candidates().len(), 0);
+		ExtBuilder::default()
+			.desired_members(0)
+			.desired_runners_up(0)
+			.build_and_execute(|| {
+				assert_eq!(Elections::candidates().len(), 0);
 
-			assert_ok!(submit_candidacy(Origin::signed(4)));
-			assert_ok!(submit_candidacy(Origin::signed(3)));
-			assert_ok!(submit_candidacy(Origin::signed(2)));
+				assert_ok!(submit_candidacy(Origin::signed(4)));
+				assert_ok!(submit_candidacy(Origin::signed(3)));
+				assert_ok!(submit_candidacy(Origin::signed(2)));
 
-			assert_eq!(Elections::candidates().len(), 3);
+				assert_eq!(Elections::candidates().len(), 3);
 
 				assert_ok!(vote(Origin::signed(4), vec![4], 40));
 				assert_ok!(vote(Origin::signed(3), vec![3], 30));
@@ -3048,56 +3045,62 @@ mod tests {
 				Elections::on_initialize(System::block_number());
 
 				assert_eq!(members_ids().len(), 0);
-			assert_eq!(runners_up_ids().len(), 0);
-			assert_eq!(all_voters().len(), 3);
-			assert_eq!(Elections::candidates().len(), 0);
-		});
+				assert_eq!(runners_up_ids().len(), 0);
+				assert_eq!(all_voters().len(), 3);
+				assert_eq!(Elections::candidates().len(), 0);
+			});
 
 		// not interested in members
-		ExtBuilder::default().desired_members(0).desired_runners_up(2).build_and_execute(|| {
-			assert_eq!(Elections::candidates().len(), 0);
+		ExtBuilder::default()
+			.desired_members(0)
+			.desired_runners_up(2)
+			.build_and_execute(|| {
+				assert_eq!(Elections::candidates().len(), 0);
 
-			assert_ok!(submit_candidacy(Origin::signed(4)));
-			assert_ok!(submit_candidacy(Origin::signed(3)));
-			assert_ok!(submit_candidacy(Origin::signed(2)));
+				assert_ok!(submit_candidacy(Origin::signed(4)));
+				assert_ok!(submit_candidacy(Origin::signed(3)));
+				assert_ok!(submit_candidacy(Origin::signed(2)));
 
-			assert_eq!(Elections::candidates().len(), 3);
+				assert_eq!(Elections::candidates().len(), 3);
 
-			assert_ok!(vote(Origin::signed(4), vec![4], 40));
-			assert_ok!(vote(Origin::signed(3), vec![3], 30));
-			assert_ok!(vote(Origin::signed(2), vec![2], 20));
+				assert_ok!(vote(Origin::signed(4), vec![4], 40));
+				assert_ok!(vote(Origin::signed(3), vec![3], 30));
+				assert_ok!(vote(Origin::signed(2), vec![2], 20));
 
-			System::set_block_number(5);
-			Elections::on_initialize(System::block_number());
+				System::set_block_number(5);
+				Elections::on_initialize(System::block_number());
 
-			assert_eq!(members_ids().len(), 0);
-			assert_eq!(runners_up_ids(), vec![3, 4]);
-			assert_eq!(all_voters().len(), 3);
-			assert_eq!(Elections::candidates().len(), 0);
-		});
+				assert_eq!(members_ids().len(), 0);
+				assert_eq!(runners_up_ids(), vec![3, 4]);
+				assert_eq!(all_voters().len(), 3);
+				assert_eq!(Elections::candidates().len(), 0);
+			});
 
 		// not interested in runners-up
-		ExtBuilder::default().desired_members(2).desired_runners_up(0).build_and_execute(|| {
-			assert_eq!(Elections::candidates().len(), 0);
+		ExtBuilder::default()
+			.desired_members(2)
+			.desired_runners_up(0)
+			.build_and_execute(|| {
+				assert_eq!(Elections::candidates().len(), 0);
 
-			assert_ok!(submit_candidacy(Origin::signed(4)));
-			assert_ok!(submit_candidacy(Origin::signed(3)));
-			assert_ok!(submit_candidacy(Origin::signed(2)));
+				assert_ok!(submit_candidacy(Origin::signed(4)));
+				assert_ok!(submit_candidacy(Origin::signed(3)));
+				assert_ok!(submit_candidacy(Origin::signed(2)));
 
-			assert_eq!(Elections::candidates().len(), 3);
+				assert_eq!(Elections::candidates().len(), 3);
 
-			assert_ok!(vote(Origin::signed(4), vec![4], 40));
-			assert_ok!(vote(Origin::signed(3), vec![3], 30));
-			assert_ok!(vote(Origin::signed(2), vec![2], 20));
+				assert_ok!(vote(Origin::signed(4), vec![4], 40));
+				assert_ok!(vote(Origin::signed(3), vec![3], 30));
+				assert_ok!(vote(Origin::signed(2), vec![2], 20));
 
-			System::set_block_number(5);
-			Elections::on_initialize(System::block_number());
+				System::set_block_number(5);
+				Elections::on_initialize(System::block_number());
 
-			assert_eq!(members_ids(), vec![3, 4]);
-			assert_eq!(runners_up_ids().len(), 0);
-			assert_eq!(all_voters().len(), 3);
-			assert_eq!(Elections::candidates().len(), 0);
-		});
+				assert_eq!(members_ids(), vec![3, 4]);
+				assert_eq!(runners_up_ids().len(), 0);
+				assert_eq!(all_voters().len(), 3);
+				assert_eq!(Elections::candidates().len(), 0);
+			});
 	}
 
 	#[test]
diff --git a/frame/elections-phragmen/src/migrations/v3.rs b/frame/elections-phragmen/src/migrations/v3.rs
index 8afc9ed66920..b19146a9e28e 100644
--- a/frame/elections-phragmen/src/migrations/v3.rs
+++ b/frame/elections-phragmen/src/migrations/v3.rs
@@ -17,12 +17,13 @@
 
 //! Migrations to version [`3.0.0`], as denoted by the changelog.
 
-use codec::{Encode, Decode, FullCodec};
-use sp_std::prelude::*;
+use codec::{Decode, Encode, FullCodec};
 use frame_support::{
-	RuntimeDebug, weights::Weight, Twox64Concat,
 	traits::{GetPalletVersion, PalletVersion},
+	weights::Weight,
+	RuntimeDebug, Twox64Concat,
 };
+use sp_std::prelude::*;
 
 #[derive(Encode, Decode, Clone, Default, RuntimeDebug, PartialEq)]
 struct SeatHolder<AccountId, Balance> {
@@ -89,7 +90,7 @@ pub fn apply<T: V2ToV3>(old_voter_bond: T::Balance, old_candidacy_bond: T::Balan
 			migrate_runners_up_to_recorded_deposit::<T>(old_candidacy_bond);
 			migrate_members_to_recorded_deposit::<T>(old_candidacy_bond);
 			Weight::max_value()
-		}
+		},
 		_ => {
 			log::warn!(
 				target: "runtime::elections-phragmen",
@@ -103,15 +104,9 @@ pub fn apply<T: V2ToV3>(old_voter_bond: T::Balance, old_candidacy_bond: T::Balan
 
 /// Migrate from the old legacy voting bond (fixed) to the new one (per-vote dynamic).
 pub fn migrate_voters_to_recorded_deposit<T: V2ToV3>(old_deposit: T::Balance) {
-	<Voting<T>>::translate::<(T::Balance, Vec<T::AccountId>), _>(
-		|_who, (stake, votes)| {
-			Some(Voter {
-				votes,
-				stake,
-				deposit: old_deposit,
-			})
-		},
-	);
+	<Voting<T>>::translate::<(T::Balance, Vec<T::AccountId>), _>(|_who, (stake, votes)| {
+		Some(Voter { votes, stake, deposit: old_deposit })
+	});
 
 	log::info!(
 		target: "runtime::elections-phragmen",
@@ -122,50 +117,39 @@ pub fn migrate_voters_to_recorded_deposit<T: V2ToV3>(old_deposit: T::Balance) {
 
 /// Migrate all candidates to recorded deposit.
 pub fn migrate_candidates_to_recorded_deposit<T: V2ToV3>(old_deposit: T::Balance) {
-	let _ = <Candidates<T>>::translate::<Vec<T::AccountId>, _>(
-		|maybe_old_candidates| {
-			maybe_old_candidates.map(|old_candidates| {
-				log::info!(
-					target: "runtime::elections-phragmen",
-					"migrated {} candidate accounts.",
-					old_candidates.len(),
-				);
-				old_candidates
-					.into_iter()
-					.map(|c| (c, old_deposit))
-					.collect::<Vec<_>>()
-			})
-		},
-	);
+	let _ = <Candidates<T>>::translate::<Vec<T::AccountId>, _>(|maybe_old_candidates| {
+		maybe_old_candidates.map(|old_candidates| {
+			log::info!(
+				target: "runtime::elections-phragmen",
+				"migrated {} candidate accounts.",
+				old_candidates.len(),
+			);
+			old_candidates.into_iter().map(|c| (c, old_deposit)).collect::<Vec<_>>()
+		})
+	});
 }
 
 /// Migrate all members to recorded deposit.
 pub fn migrate_members_to_recorded_deposit<T: V2ToV3>(old_deposit: T::Balance) {
-	let _ = <Members<T>>::translate::<Vec<(T::AccountId, T::Balance)>, _>(
-		|maybe_old_members| {
-			maybe_old_members.map(|old_members| {
-				log::info!(
-					target: "runtime::elections-phragmen",
-					"migrated {} member accounts.",
-					old_members.len(),
-				);
-				old_members
-					.into_iter()
-					.map(|(who, stake)| SeatHolder {
-						who,
-						stake,
-						deposit: old_deposit,
-					})
-					.collect::<Vec<_>>()
-			})
-		},
-	);
+	let _ = <Members<T>>::translate::<Vec<(T::AccountId, T::Balance)>, _>(|maybe_old_members| {
+		maybe_old_members.map(|old_members| {
+			log::info!(
+				target: "runtime::elections-phragmen",
+				"migrated {} member accounts.",
+				old_members.len(),
+			);
+			old_members
+				.into_iter()
+				.map(|(who, stake)| SeatHolder { who, stake, deposit: old_deposit })
+				.collect::<Vec<_>>()
+		})
+	});
 }
 
 /// Migrate all runners-up to recorded deposit.
 pub fn migrate_runners_up_to_recorded_deposit<T: V2ToV3>(old_deposit: T::Balance) {
-	let _ = <RunnersUp<T>>::translate::<Vec<(T::AccountId, T::Balance)>, _>(
-		|maybe_old_runners_up| {
+	let _ =
+		<RunnersUp<T>>::translate::<Vec<(T::AccountId, T::Balance)>, _>(|maybe_old_runners_up| {
 			maybe_old_runners_up.map(|old_runners_up| {
 				log::info!(
 					target: "runtime::elections-phragmen",
@@ -174,13 +158,8 @@ pub fn migrate_runners_up_to_recorded_deposit<T: V2ToV3>(old_deposit: T::Balance
 				);
 				old_runners_up
 					.into_iter()
-					.map(|(who, stake)| SeatHolder {
-						who,
-						stake,
-						deposit: old_deposit,
-					})
+					.map(|(who, stake)| SeatHolder { who, stake, deposit: old_deposit })
 					.collect::<Vec<_>>()
 			})
-		},
-	);
+		});
 }
diff --git a/frame/elections-phragmen/src/migrations/v4.rs b/frame/elections-phragmen/src/migrations/v4.rs
index f704b203d34c..fde9a768f335 100644
--- a/frame/elections-phragmen/src/migrations/v4.rs
+++ b/frame/elections-phragmen/src/migrations/v4.rs
@@ -18,8 +18,8 @@
 //! Migrations to version [`4.0.0`], as denoted by the changelog.
 
 use frame_support::{
+	traits::{Get, GetPalletVersion, PalletVersion},
 	weights::Weight,
-	traits::{GetPalletVersion, PalletVersion, Get},
 };
 
 /// The old prefix.
@@ -32,17 +32,15 @@ pub const OLD_PREFIX: &[u8] = b"PhragmenElection";
 /// `<Runtime as frame_system::Config>::PalletInfo::name::<ElectionsPhragmenPallet>`.
 ///
 /// The old storage prefix, `PhragmenElection` is hardcoded in the migration code.
-pub fn migrate<
-	T: frame_system::Config,
-	P: GetPalletVersion,
-	N: AsRef<str>,
->(new_pallet_name: N) -> Weight {
+pub fn migrate<T: frame_system::Config, P: GetPalletVersion, N: AsRef<str>>(
+	new_pallet_name: N,
+) -> Weight {
 	if new_pallet_name.as_ref().as_bytes() == OLD_PREFIX {
 		log::info!(
 			target: "runtime::elections-phragmen",
 			"New pallet name is equal to the old prefix. No migration needs to be done.",
 		);
-		return 0;
+		return 0
 	}
 	let maybe_storage_version = <P as GetPalletVersion>::storage_version();
 	log::info!(
@@ -59,7 +57,7 @@ pub fn migrate<
 				new_pallet_name.as_ref().as_bytes(),
 			);
 			<T as frame_system::Config>::BlockWeights::get().max_block
-		}
+		},
 		_ => {
 			log::warn!(
 				target: "runtime::elections-phragmen",
@@ -103,7 +101,7 @@ pub fn pre_migration<P: GetPalletVersion, N: AsRef<str>>(new: N) {
 /// [`frame_support::traits::OnRuntimeUpgrade::post_upgrade`] for further testing.
 ///
 /// Panics if anything goes wrong.
-pub fn post_migration<P : GetPalletVersion>() {
+pub fn post_migration<P: GetPalletVersion>() {
 	log::info!("post-migration elections-phragmen");
 	// ensure we've been updated to v4 by the automatic write of crate version -> storage version.
 	assert!(<P as GetPalletVersion>::storage_version().unwrap().major == 4);
diff --git a/frame/elections-phragmen/src/weights.rs b/frame/elections-phragmen/src/weights.rs
index 12a3a433401b..ce558fb9d7f0 100644
--- a/frame/elections-phragmen/src/weights.rs
+++ b/frame/elections-phragmen/src/weights.rs
@@ -36,6 +36,7 @@
 // --template=./.maintain/frame-weight-template.hbs
 
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
diff --git a/frame/elections/src/lib.rs b/frame/elections/src/lib.rs
index 54bdb1f90dde..e51733a79db9 100644
--- a/frame/elections/src/lib.rs
+++ b/frame/elections/src/lib.rs
@@ -29,24 +29,26 @@
 //! whose voting is serially unsuccessful.
 
 #![cfg_attr(not(feature = "std"), no_std)]
-#![recursion_limit="128"]
+#![recursion_limit = "128"]
 
-use sp_std::prelude::*;
-use sp_runtime::{
-	RuntimeDebug, print,
-	traits::{Zero, One, StaticLookup, Saturating},
-};
+use codec::{Decode, Encode};
 use frame_support::{
-	pallet_prelude::*, ensure,
-	weights::{Weight, DispatchClass},
+	ensure,
+	pallet_prelude::*,
 	traits::{
-		Currency, ExistenceRequirement, LockableCurrency, LockIdentifier, BalanceStatus,
-		OnUnbalanced, ReservableCurrency, WithdrawReasons, ChangeMembers,
-	}
+		BalanceStatus, ChangeMembers, Currency, ExistenceRequirement, LockIdentifier,
+		LockableCurrency, OnUnbalanced, ReservableCurrency, WithdrawReasons,
+	},
+	weights::{DispatchClass, Weight},
 };
-use codec::{Encode, Decode};
 use frame_system::pallet_prelude::*;
 pub use pallet::*;
+use sp_runtime::{
+	print,
+	traits::{One, Saturating, StaticLookup, Zero},
+	RuntimeDebug,
+};
+use sp_std::prelude::*;
 
 mod mock;
 mod tests;
@@ -140,9 +142,11 @@ pub const VOTER_SET_SIZE: usize = 64;
 /// NUmber of approvals grouped in one chunk.
 pub const APPROVAL_SET_SIZE: usize = 8;
 
-type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
-type NegativeImbalanceOf<T> =
-	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
+type BalanceOf<T> =
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<
+	<T as frame_system::Config>::AccountId,
+>>::NegativeImbalance;
 
 /// Index used to access chunks.
 type SetIndex = u32;
@@ -170,8 +174,7 @@ pub mod pallet {
 		type PalletId: Get<LockIdentifier>;
 
 		/// The currency that people are electing with.
-		type Currency:
-			LockableCurrency<Self::AccountId, Moment=Self::BlockNumber>
+		type Currency: LockableCurrency<Self::AccountId, Moment = Self::BlockNumber>
 			+ ReservableCurrency<Self::AccountId>;
 
 		/// Handler for the unbalanced reduction when slashing a validator.
@@ -239,14 +242,14 @@ pub mod pallet {
 
 	#[pallet::extra_constants]
 	impl<T: Config> Pallet<T> {
-		//TODO: rename to snake case after https://github.com/paritytech/substrate/issues/8826 fixed.
+		// TODO: rename to snake case after https://github.com/paritytech/substrate/issues/8826 fixed.
 		/// The chunk size of the voter vector.
 		#[allow(non_snake_case)]
 		fn VOTER_SET_SIZE() -> u32 {
 			VOTER_SET_SIZE as u32
 		}
 
-		//TODO: rename to snake case after https://github.com/paritytech/substrate/issues/8826 fixed.
+		// TODO: rename to snake case after https://github.com/paritytech/substrate/issues/8826 fixed.
 		/// The chunk size of the approval vector.
 		#[allow(non_snake_case)]
 		fn APPROVAL_SET_SIZE() -> u32 {
@@ -292,17 +295,12 @@ pub mod pallet {
 	// bit-wise manner. In order to get a human-readable representation (`Vec<bool>`), use
 	// [`all_approvals_of`]. Furthermore, each vector of scalars is chunked with the cap of
 	// `APPROVAL_SET_SIZE`.
-	///
 	/// TWOX-NOTE: SAFE as `AccountId` is a crypto hash and `SetIndex` is not
 	/// attacker-controlled.
 	#[pallet::storage]
 	#[pallet::getter(fn approvals_of)]
-	pub type ApprovalsOf<T: Config> = StorageMap<
-		_,
-		Twox64Concat, (T::AccountId, SetIndex),
-		Vec<ApprovalFlag>,
-		ValueQuery,
-	>;
+	pub type ApprovalsOf<T: Config> =
+		StorageMap<_, Twox64Concat, (T::AccountId, SetIndex), Vec<ApprovalFlag>, ValueQuery>;
 
 	/// The vote index and list slot that the candidate `who` was registered or `None` if they
 	/// are not currently registered.
@@ -310,26 +308,24 @@ pub mod pallet {
 	/// TWOX-NOTE: SAFE as `AccountId` is a crypto hash.
 	#[pallet::storage]
 	#[pallet::getter(fn candidate_reg_info)]
-	pub type RegisterInfoOf<T: Config> = StorageMap<_, Twox64Concat, T::AccountId, (VoteIndex, u32)>;
+	pub type RegisterInfoOf<T: Config> =
+		StorageMap<_, Twox64Concat, T::AccountId, (VoteIndex, u32)>;
 
 	/// Basic information about a voter.
 	///
 	/// TWOX-NOTE: SAFE as `AccountId` is a crypto hash.
 	#[pallet::storage]
 	#[pallet::getter(fn voter_info)]
-	pub type VoterInfoOf<T: Config> = StorageMap<_, Twox64Concat, T::AccountId, VoterInfo<BalanceOf<T>>>;
+	pub type VoterInfoOf<T: Config> =
+		StorageMap<_, Twox64Concat, T::AccountId, VoterInfo<BalanceOf<T>>>;
 
 	/// The present voter list (chunked and capped at [`VOTER_SET_SIZE`]).
 	///
 	/// TWOX-NOTE: OKAY ― `SetIndex` is not user-controlled data.
 	#[pallet::storage]
 	#[pallet::getter(fn voters)]
-	pub type Voters<T: Config> = StorageMap<
-		_,
-		Twox64Concat, SetIndex,
-		Vec<Option<T::AccountId>>,
-		ValueQuery,
-	>;
+	pub type Voters<T: Config> =
+		StorageMap<_, Twox64Concat, SetIndex, Vec<Option<T::AccountId>>, ValueQuery>;
 
 	/// the next free set to store a voter in. This will keep growing.
 	#[pallet::storage]
@@ -559,7 +555,8 @@ pub mod pallet {
 
 			let reporter_index = reporter_index as usize;
 			let who_index = who_index as usize;
-			let assumed_reporter = Self::voter_at(reporter_index).ok_or(Error::<T>::InvalidReporterIndex)?;
+			let assumed_reporter =
+				Self::voter_at(reporter_index).ok_or(Error::<T>::InvalidReporterIndex)?;
 			let assumed_who = Self::voter_at(who_index).ok_or(Error::<T>::InvalidTargetIndex)?;
 
 			ensure!(assumed_reporter == reporter, Error::<T>::InvalidReporterIndex);
@@ -567,29 +564,31 @@ pub mod pallet {
 
 			// will definitely kill one of reporter or who now.
 
-			let valid = !Self::all_approvals_of(&who).iter()
-				.zip(Self::candidates().iter())
-				.any(|(&appr, addr)|
-					 appr &&
+			let valid = !Self::all_approvals_of(&who).iter().zip(Self::candidates().iter()).any(
+				|(&appr, addr)| {
+					appr &&
 					 *addr != T::AccountId::default() &&
 					 // defensive only: all items in candidates list are registered
 					 Self::candidate_reg_info(addr).map_or(false, |x| x.0 <= last_active)
-				);
+				},
+			);
 
 			Self::remove_voter(
 				if valid { &who } else { &reporter },
-				if valid { who_index } else { reporter_index }
+				if valid { who_index } else { reporter_index },
 			);
 
-			T::Currency::remove_lock(
-				T::PalletId::get(),
-				if valid { &who } else { &reporter }
-			);
+			T::Currency::remove_lock(T::PalletId::get(), if valid { &who } else { &reporter });
 
 			if valid {
 				// This only fails if `reporter` doesn't exist, which it clearly must do since its
 				// the origin. Still, it's no more harmful to propagate any error at this point.
-				T::Currency::repatriate_reserved(&who, &reporter, T::VotingBond::get(), BalanceStatus::Free)?;
+				T::Currency::repatriate_reserved(
+					&who,
+					&reporter,
+					T::VotingBond::get(),
+					BalanceStatus::Free,
+				)?;
 				Self::deposit_event(Event::<T>::VoterReaped(who, reporter));
 			} else {
 				let imbalance = T::Currency::slash_reserved(&reporter, T::VotingBond::get()).0;
@@ -614,7 +613,10 @@ pub mod pallet {
 		/// - Two fewer DB entries, one DB change.
 		/// # </weight>
 		#[pallet::weight(1_250_000_000)]
-		pub fn retract_voter(origin: OriginFor<T>, #[pallet::compact] index: u32) -> DispatchResult {
+		pub fn retract_voter(
+			origin: OriginFor<T>,
+			#[pallet::compact] index: u32,
+		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 
 			ensure!(!Self::presentation_active(), Error::<T>::CannotRetractPresenting);
@@ -644,7 +646,10 @@ pub mod pallet {
 		/// - Three DB changes.
 		/// # </weight>
 		#[pallet::weight(2_500_000_000)]
-		pub fn submit_candidacy(origin: OriginFor<T>, #[pallet::compact] slot: u32) -> DispatchResult {
+		pub fn submit_candidacy(
+			origin: OriginFor<T>,
+			#[pallet::compact] slot: u32,
+		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 
 			ensure!(!Self::is_a_candidate(&who), Error::<T>::DuplicatedCandidate);
@@ -689,38 +694,31 @@ pub mod pallet {
 			#[pallet::compact] index: VoteIndex,
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
-			ensure!(
-				!total.is_zero(),
-				Error::<T>::ZeroDeposit,
-			);
+			ensure!(!total.is_zero(), Error::<T>::ZeroDeposit,);
 
 			let candidate = T::Lookup::lookup(candidate)?;
 			ensure!(index == Self::vote_index(), Error::<T>::InvalidVoteIndex);
-			let (_, _, expiring) = Self::next_finalize()
-				.ok_or(Error::<T>::NotPresentationPeriod)?;
+			let (_, _, expiring) =
+				Self::next_finalize().ok_or(Error::<T>::NotPresentationPeriod)?;
 			let bad_presentation_punishment =
-				T::PresentSlashPerVoter::get()
-				* BalanceOf::<T>::from(Self::voter_count() as u32);
+				T::PresentSlashPerVoter::get() * BalanceOf::<T>::from(Self::voter_count() as u32);
 			ensure!(
 				T::Currency::can_slash(&who, bad_presentation_punishment),
 				Error::<T>::InsufficientPresenterFunds,
 			);
 
-			let mut leaderboard = Self::leaderboard()
-				.ok_or(Error::<T>::LeaderboardMustExist)?;
+			let mut leaderboard = Self::leaderboard().ok_or(Error::<T>::LeaderboardMustExist)?;
 			ensure!(total > leaderboard[0].0, Error::<T>::UnworthyCandidate);
 
 			if let Some(p) = Self::members().iter().position(|&(ref c, _)| c == &candidate) {
-				ensure!(
-					p < expiring.len(),
-					Error::<T>::DuplicatedCandidate,
-				);
+				ensure!(p < expiring.len(), Error::<T>::DuplicatedCandidate,);
 			}
 
 			let voters = Self::all_voters();
 			let (registered_since, candidate_index): (VoteIndex, u32) =
 				Self::candidate_reg_info(&candidate).ok_or(Error::<T>::InvalidCandidate)?;
-			let actual_total = voters.iter()
+			let actual_total = voters
+				.iter()
 				.filter_map(|maybe_voter| maybe_voter.as_ref())
 				.filter_map(|voter| match Self::voter_info(voter) {
 					Some(b) if b.last_active >= registered_since => {
@@ -731,7 +729,9 @@ pub mod pallet {
 						let weight = stake + offset + b.pot;
 						if Self::approvals_of_at(voter, candidate_index as usize) {
 							Some(weight)
-						} else { None }
+						} else {
+							None
+						}
 					},
 					_ => None,
 				})
@@ -748,7 +748,11 @@ pub mod pallet {
 				// better safe than sorry.
 				let imbalance = T::Currency::slash(&who, bad_presentation_punishment).0;
 				T::BadPresentation::on_unbalanced(imbalance);
-				Err(if dupe { Error::<T>::DuplicatedPresentation } else { Error::<T>::IncorrectTotal })?
+				Err(if dupe {
+					Error::<T>::DuplicatedPresentation
+				} else {
+					Error::<T>::IncorrectTotal
+				})?
 			}
 		}
 
@@ -756,7 +760,10 @@ pub mod pallet {
 		/// election when they expire. If more, then a new vote will be started if one is not
 		/// already in progress.
 		#[pallet::weight((0, DispatchClass::Operational))]
-		pub fn set_desired_seats(origin: OriginFor<T>, #[pallet::compact] count: u32) -> DispatchResult {
+		pub fn set_desired_seats(
+			origin: OriginFor<T>,
+			#[pallet::compact] count: u32,
+		) -> DispatchResult {
 			ensure_root(origin)?;
 			DesiredSeats::<T>::put(count);
 			Ok(())
@@ -767,13 +774,14 @@ pub mod pallet {
 		/// Note: A tally should happen instantly (if not already in a presentation
 		/// period) to fill the seat if removal means that the desired members are not met.
 		#[pallet::weight((0, DispatchClass::Operational))]
-		pub fn remove_member(origin: OriginFor<T>, who: <T::Lookup as StaticLookup>::Source) -> DispatchResult {
+		pub fn remove_member(
+			origin: OriginFor<T>,
+			who: <T::Lookup as StaticLookup>::Source,
+		) -> DispatchResult {
 			ensure_root(origin)?;
 			let who = T::Lookup::lookup(who)?;
-			let new_set: Vec<(T::AccountId, T::BlockNumber)> = Self::members()
-				.into_iter()
-				.filter(|i| i.0 != who)
-				.collect();
+			let new_set: Vec<(T::AccountId, T::BlockNumber)> =
+				Self::members().into_iter().filter(|i| i.0 != who).collect();
 			<Members<T>>::put(&new_set);
 			let new_set = new_set.into_iter().map(|x| x.0).collect::<Vec<_>>();
 			T::ChangeMembers::change_members(&[], &[who], new_set);
@@ -821,7 +829,8 @@ impl<T: Config> Pallet<T> {
 
 	/// Iff the member `who` still has a seat at blocknumber `n` returns `true`.
 	pub fn will_still_be_member_at(who: &T::AccountId, n: T::BlockNumber) -> bool {
-		Self::members().iter()
+		Self::members()
+			.iter()
 			.find(|&&(ref a, _)| a == who)
 			.map(|&(_, expires)| expires > n)
 			.unwrap_or(false)
@@ -859,7 +868,8 @@ impl<T: Config> Pallet<T> {
 				} else {
 					Some(c[c.len() - (desired_seats - coming) as usize].1)
 				}
-			}.map(Self::next_vote_from)
+			}
+			.map(Self::next_vote_from)
 		}
 	}
 
@@ -906,18 +916,12 @@ impl<T: Config> Pallet<T> {
 
 		ensure!(!Self::presentation_active(), Error::<T>::ApprovalPresentation);
 		ensure!(index == Self::vote_index(), Error::<T>::InvalidVoteIndex);
-		ensure!(
-			!candidates_len.is_zero(),
-			Error::<T>::ZeroCandidates,
-		);
+		ensure!(!candidates_len.is_zero(), Error::<T>::ZeroCandidates,);
 		// Prevent a vote from voters that provide a list of votes that exceeds the candidates
 		// length since otherwise an attacker may be able to submit a very long list of `votes` that
 		// far exceeds the amount of candidates and waste more computation than a reasonable voting
 		// bond would cover.
-		ensure!(
-			candidates_len >= votes.len(),
-			Error::<T>::TooManyVotes,
-		);
+		ensure!(candidates_len >= votes.len(), Error::<T>::TooManyVotes,);
 		ensure!(value >= T::MinimumVotingLock::get(), Error::<T>::InsufficientLockedValue);
 
 		// Amount to be locked up.
@@ -969,19 +973,14 @@ impl<T: Config> Pallet<T> {
 						NextVoterSet::<T>::put(next + 1);
 					}
 					<Voters<T>>::append(next, Some(who.clone()));
-				}
+				},
 			}
 
 			T::Currency::reserve(&who, T::VotingBond::get())?;
 			VoterCount::<T>::mutate(|c| *c = *c + 1);
 		}
 
-		T::Currency::set_lock(
-			T::PalletId::get(),
-			&who,
-			locked_balance,
-			WithdrawReasons::all(),
-		);
+		T::Currency::set_lock(T::PalletId::get(), &who, locked_balance, WithdrawReasons::all());
 
 		<VoterInfoOf<T>>::insert(
 			&who,
@@ -990,7 +989,7 @@ impl<T: Config> Pallet<T> {
 				last_win: index,
 				stake: locked_balance,
 				pot: pot_to_set,
-			}
+			},
 		);
 		Self::set_approvals_chunked(&who, votes);
 
@@ -1002,18 +1001,26 @@ impl<T: Config> Pallet<T> {
 		let members = Self::members();
 		let desired_seats = Self::desired_seats() as usize;
 		let number = <frame_system::Pallet<T>>::block_number();
-		let expiring =
-			members.iter().take_while(|i| i.1 <= number).map(|i| i.0.clone()).collect::<Vec<_>>();
+		let expiring = members
+			.iter()
+			.take_while(|i| i.1 <= number)
+			.map(|i| i.0.clone())
+			.collect::<Vec<_>>();
 		let retaining_seats = members.len() - expiring.len();
 		if retaining_seats < desired_seats {
 			let empty_seats = desired_seats - retaining_seats;
-			<NextFinalize<T>>::put(
-				(number + Self::presentation_duration(), empty_seats as u32, expiring)
-			);
+			<NextFinalize<T>>::put((
+				number + Self::presentation_duration(),
+				empty_seats as u32,
+				expiring,
+			));
 
 			// initialize leaderboard.
 			let leaderboard_size = empty_seats + T::CarryCount::get() as usize;
-			<Leaderboard<T>>::put(vec![(BalanceOf::<T>::zero(), T::AccountId::default()); leaderboard_size]);
+			<Leaderboard<T>>::put(vec![
+				(BalanceOf::<T>::zero(), T::AccountId::default());
+				leaderboard_size
+			]);
 
 			Self::deposit_event(Event::<T>::TallyStarted(empty_seats as u32));
 		}
@@ -1027,19 +1034,22 @@ impl<T: Config> Pallet<T> {
 		let (_, coming, expiring): (T::BlockNumber, u32, Vec<T::AccountId>) =
 			<NextFinalize<T>>::take()
 				.ok_or("finalize can only be called after a tally is started.")?;
-		let leaderboard: Vec<(BalanceOf<T>, T::AccountId)> = <Leaderboard<T>>::take()
-			.unwrap_or_default();
+		let leaderboard: Vec<(BalanceOf<T>, T::AccountId)> =
+			<Leaderboard<T>>::take().unwrap_or_default();
 		let new_expiry = <frame_system::Pallet<T>>::block_number() + Self::term_duration();
 
 		// return bond to winners.
 		let candidacy_bond = T::CandidacyBond::get();
-		let incoming: Vec<_> = leaderboard.iter()
+		let incoming: Vec<_> = leaderboard
+			.iter()
 			.rev()
 			.take_while(|&&(b, _)| !b.is_zero())
 			.take(coming as usize)
 			.map(|(_, a)| a)
 			.cloned()
-			.inspect(|a| { T::Currency::unreserve(a, candidacy_bond); })
+			.inspect(|a| {
+				T::Currency::unreserve(a, candidacy_bond);
+			})
 			.collect();
 
 		// Update last win index for anyone voted for any of the incomings.
@@ -1049,14 +1059,16 @@ impl<T: Config> Pallet<T> {
 				.iter()
 				.filter_map(|mv| mv.as_ref())
 				.filter(|v| Self::approvals_of_at(*v, index))
-				.for_each(|v| <VoterInfoOf<T>>::mutate(v, |a| {
-					if let Some(activity) = a { activity.last_win = Self::vote_index() + 1; }
-				}));
+				.for_each(|v| {
+					<VoterInfoOf<T>>::mutate(v, |a| {
+						if let Some(activity) = a {
+							activity.last_win = Self::vote_index() + 1;
+						}
+					})
+				});
 		});
 		let members = Self::members();
-		let outgoing: Vec<_> = members.iter()
-			.take(expiring.len())
-			.map(|a| a.0.clone()).collect();
+		let outgoing: Vec<_> = members.iter().take(expiring.len()).map(|a| a.0.clone()).collect();
 
 		// set the new membership set.
 		let mut new_set: Vec<_> = members
@@ -1072,8 +1084,9 @@ impl<T: Config> Pallet<T> {
 
 		// clear all except runners-up from candidate list.
 		let candidates = Self::candidates();
-		let mut new_candidates = vec![T::AccountId::default(); candidates.len()];	// shrink later.
-		let runners_up = leaderboard.into_iter()
+		let mut new_candidates = vec![T::AccountId::default(); candidates.len()]; // shrink later.
+		let runners_up = leaderboard
+			.into_iter()
 			.rev()
 			.take_while(|&(b, _)| !b.is_zero())
 			.skip(coming as usize)
@@ -1098,11 +1111,10 @@ impl<T: Config> Pallet<T> {
 			}
 		}
 		// discard any superfluous slots.
-		if let Some(last_index) = new_candidates
-			.iter()
-			.rposition(|c| *c != T::AccountId::default()) {
-				new_candidates.truncate(last_index + 1);
-			}
+		if let Some(last_index) = new_candidates.iter().rposition(|c| *c != T::AccountId::default())
+		{
+			new_candidates.truncate(last_index + 1);
+		}
 
 		Self::deposit_event(Event::<T>::TallyFinalized(incoming, outgoing));
 
@@ -1131,7 +1143,7 @@ impl<T: Config> Pallet<T> {
 		loop {
 			let next_set = <Voters<T>>::get(index);
 			if next_set.is_empty() {
-				break;
+				break
 			} else {
 				index += 1;
 				all.extend(next_set);
@@ -1177,9 +1189,7 @@ impl<T: Config> Pallet<T> {
 		approvals_flag_vec
 			.chunks(APPROVAL_SET_SIZE)
 			.enumerate()
-			.for_each(|(index, slice)| <ApprovalsOf<T>>::insert(
-				(&who, index as SetIndex), slice)
-			);
+			.for_each(|(index, slice)| <ApprovalsOf<T>>::insert((&who, index as SetIndex), slice));
 	}
 
 	/// shorthand for fetching a specific approval of a voter at a specific (global) index.
@@ -1204,7 +1214,7 @@ impl<T: Config> Pallet<T> {
 	/// Return true of the bit `n` of scalar `x` is set to `1` and false otherwise.
 	fn bit_at(x: ApprovalFlag, n: usize) -> bool {
 		if n < APPROVAL_FLAG_LEN {
-			x & ( 1 << n ) != 0
+			x & (1 << n) != 0
 		} else {
 			false
 		}
@@ -1215,7 +1225,7 @@ impl<T: Config> Pallet<T> {
 	pub fn bool_to_flag(x: Vec<bool>) -> Vec<ApprovalFlag> {
 		let mut result: Vec<ApprovalFlag> = Vec::with_capacity(x.len() / APPROVAL_FLAG_LEN);
 		if x.is_empty() {
-			return result;
+			return result
 		}
 		result.push(0);
 		let mut index = 0;
@@ -1224,7 +1234,9 @@ impl<T: Config> Pallet<T> {
 			let shl_index = counter % APPROVAL_FLAG_LEN;
 			result[index] += (if x[counter] { 1 } else { 0 }) << shl_index;
 			counter += 1;
-			if counter > x.len() - 1 { break; }
+			if counter > x.len() - 1 {
+				break
+			}
 			if counter % APPROVAL_FLAG_LEN == 0 {
 				result.push(0);
 				index += 1;
@@ -1236,15 +1248,18 @@ impl<T: Config> Pallet<T> {
 	/// Convert a vec of flags (u32) to boolean.
 	pub fn flag_to_bool(chunk: Vec<ApprovalFlag>) -> Vec<bool> {
 		let mut result = Vec::with_capacity(chunk.len());
-		if chunk.is_empty() { return vec![] }
-		chunk.into_iter()
-			.map(|num|
+		if chunk.is_empty() {
+			return vec![]
+		}
+		chunk
+			.into_iter()
+			.map(|num| {
 				(0..APPROVAL_FLAG_LEN).map(|bit| Self::bit_at(num, bit)).collect::<Vec<bool>>()
-			)
+			})
 			.for_each(|c| {
 				let last_approve = match c.iter().rposition(|n| *n) {
 					Some(index) => index + 1,
-					None => 0
+					None => 0,
 				};
 				result.extend(c.into_iter().take(last_approve));
 			});
@@ -1258,7 +1273,9 @@ impl<T: Config> Pallet<T> {
 		let mut index = 0_u32;
 		loop {
 			let chunk = Self::approvals_of((who.clone(), index));
-			if chunk.is_empty() { break; }
+			if chunk.is_empty() {
+				break
+			}
 			all.extend(Self::flag_to_bool(chunk));
 			index += 1;
 		}
@@ -1291,7 +1308,9 @@ impl<T: Config> Pallet<T> {
 	/// returned if `t` is zero.
 	fn get_offset(stake: BalanceOf<T>, t: VoteIndex) -> BalanceOf<T> {
 		let decay_ratio: BalanceOf<T> = T::DecayRatio::get().into();
-		if t > 150 { return stake * decay_ratio }
+		if t > 150 {
+			return stake * decay_ratio
+		}
 		let mut offset = stake;
 		let mut r = Zero::zero();
 		let decay = decay_ratio + One::one();
diff --git a/frame/elections/src/mock.rs b/frame/elections/src/mock.rs
index 4df6da829a18..78982f7af398 100644
--- a/frame/elections/src/mock.rs
+++ b/frame/elections/src/mock.rs
@@ -19,16 +19,17 @@
 
 #![cfg(test)]
 
+use crate as elections;
 use frame_support::{
-	parameter_types, assert_ok,
+	assert_ok, parameter_types,
 	traits::{ChangeMembers, Currency, LockIdentifier},
 };
 use sp_core::H256;
 use sp_runtime::{
-	BuildStorage, testing::Header, traits::{BlakeTwo256, IdentityLookup},
+	testing::Header,
+	traits::{BlakeTwo256, IdentityLookup},
+	BuildStorage,
 };
-use crate as elections;
-
 
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
@@ -104,7 +105,7 @@ impl ChangeMembers<u64> for TestChangeMembers {
 	}
 }
 
-parameter_types!{
+parameter_types! {
 	pub const ElectionPalletId: LockIdentifier = *b"py/elect";
 }
 
@@ -197,56 +198,55 @@ impl ExtBuilder {
 		PRESENT_SLASH_PER_VOTER.with(|v| *v.borrow_mut() = self.bad_presentation_punishment);
 		DECAY_RATIO.with(|v| *v.borrow_mut() = self.decay_ratio);
 		let mut ext: sp_io::TestExternalities = GenesisConfig {
-			balances: pallet_balances::GenesisConfig::<Test>{
+			balances: pallet_balances::GenesisConfig::<Test> {
 				balances: vec![
 					(1, 10 * self.balance_factor),
 					(2, 20 * self.balance_factor),
 					(3, 30 * self.balance_factor),
 					(4, 40 * self.balance_factor),
 					(5, 50 * self.balance_factor),
-					(6, 60 * self.balance_factor)
+					(6, 60 * self.balance_factor),
 				],
 			},
-			elections: elections::GenesisConfig::<Test>{
+			elections: elections::GenesisConfig::<Test> {
 				members: vec![],
 				desired_seats: self.desired_seats,
 				presentation_duration: 2,
 				term_duration: 5,
 			},
-		}.build_storage().unwrap().into();
+		}
+		.build_storage()
+		.unwrap()
+		.into();
 		ext.execute_with(|| System::set_block_number(1));
 		ext
 	}
 }
 
 pub(crate) fn voter_ids() -> Vec<u64> {
-	Elections::all_voters().iter().map(|v| v.unwrap_or(0) ).collect::<Vec<u64>>()
+	Elections::all_voters().iter().map(|v| v.unwrap_or(0)).collect::<Vec<u64>>()
 }
 
 pub(crate) fn vote(i: u64, l: usize) {
 	let _ = Balances::make_free_balance_be(&i, 20);
-	assert_ok!(
-		Elections::set_approvals(
-			Origin::signed(i),
-			(0..l).map(|_| true).collect::<Vec<bool>>(),
-			0,
-			0,
-			20,
-		)
-	);
+	assert_ok!(Elections::set_approvals(
+		Origin::signed(i),
+		(0..l).map(|_| true).collect::<Vec<bool>>(),
+		0,
+		0,
+		20,
+	));
 }
 
 pub(crate) fn vote_at(i: u64, l: usize, index: elections::VoteIndex) {
 	let _ = Balances::make_free_balance_be(&i, 20);
-	assert_ok!(
-		Elections::set_approvals(
-			Origin::signed(i),
-			(0..l).map(|_| true).collect::<Vec<bool>>(),
-			0,
-			index,
-			20,
-		)
-	);
+	assert_ok!(Elections::set_approvals(
+		Origin::signed(i),
+		(0..l).map(|_| true).collect::<Vec<bool>>(),
+		0,
+		index,
+		20,
+	));
 }
 
 pub(crate) fn create_candidate(i: u64, index: u32) {
diff --git a/frame/elections/src/tests.rs b/frame/elections/src/tests.rs
index 62e28eb6da08..0df84c6d79ba 100644
--- a/frame/elections/src/tests.rs
+++ b/frame/elections/src/tests.rs
@@ -19,10 +19,9 @@
 
 #![cfg(test)]
 
-use crate::mock::*;
-use crate::*;
+use crate::{mock::*, *};
 
-use frame_support::{assert_ok, assert_err, assert_noop};
+use frame_support::{assert_err, assert_noop, assert_ok};
 
 #[test]
 fn params_should_work() {
@@ -60,38 +59,23 @@ fn chunking_bool_to_flag_should_work() {
 		assert_eq!(Elections::bool_to_flag(vec![true, true, true, true, true]), vec![15 + 16]);
 
 		let set_1 = vec![
-				true, false, false, false, // 0x1
-				false, true, true, true, // 0xE
+			true, false, false, false, // 0x1
+			false, true, true, true, // 0xE
 		];
-		assert_eq!(
-			Elections::bool_to_flag(set_1.clone()),
-			vec![0x00_00_00_E1_u32]
-		);
-		assert_eq!(
-			Elections::flag_to_bool(vec![0x00_00_00_E1_u32]),
-			set_1
-		);
+		assert_eq!(Elections::bool_to_flag(set_1.clone()), vec![0x00_00_00_E1_u32]);
+		assert_eq!(Elections::flag_to_bool(vec![0x00_00_00_E1_u32]), set_1);
 
 		let set_2 = vec![
-				false, false, false, true, // 0x8
-				false, true, false, true, // 0xA
+			false, false, false, true, // 0x8
+			false, true, false, true, // 0xA
 		];
-		assert_eq!(
-			Elections::bool_to_flag(set_2.clone()),
-			vec![0x00_00_00_A8_u32]
-		);
-		assert_eq!(
-			Elections::flag_to_bool(vec![0x00_00_00_A8_u32]),
-			set_2
-		);
+		assert_eq!(Elections::bool_to_flag(set_2.clone()), vec![0x00_00_00_A8_u32]);
+		assert_eq!(Elections::flag_to_bool(vec![0x00_00_00_A8_u32]), set_2);
 
-		let mut rhs = (0..100/APPROVAL_FLAG_LEN).map(|_| 0xFFFFFFFF_u32).collect::<Vec<u32>>();
+		let mut rhs = (0..100 / APPROVAL_FLAG_LEN).map(|_| 0xFFFFFFFF_u32).collect::<Vec<u32>>();
 		// NOTE: this might be need change based on `APPROVAL_FLAG_LEN`.
 		rhs.extend(vec![0x00_00_00_0F]);
-		assert_eq!(
-			Elections::bool_to_flag((0..100).map(|_| true).collect()),
-			rhs
-		)
+		assert_eq!(Elections::bool_to_flag((0..100).map(|_| true).collect()), rhs)
 	})
 }
 
@@ -160,7 +144,7 @@ fn chunking_voter_set_reclaim_should_work() {
 fn chunking_approvals_set_growth_should_work() {
 	ExtBuilder::default().build().execute_with(|| {
 		// create candidates and voters.
-		(1..=250).for_each(|i| create_candidate(i, (i-1) as u32));
+		(1..=250).for_each(|i| create_candidate(i, (i - 1) as u32));
 		(1..=250).for_each(|i| vote(i, i as usize));
 
 		// all approvals of should return the exact expected vector.
@@ -168,26 +152,11 @@ fn chunking_approvals_set_growth_should_work() {
 			Elections::all_approvals_of(&180),
 			(0..180).map(|_| true).collect::<Vec<bool>>()
 		);
-		assert_eq!(
-			Elections::all_approvals_of(&32),
-			(0..32).map(|_| true).collect::<Vec<bool>>()
-		);
-		assert_eq!(
-			Elections::all_approvals_of(&8),
-			(0..8).map(|_| true).collect::<Vec<bool>>()
-		);
-		assert_eq!(
-			Elections::all_approvals_of(&64),
-			(0..64).map(|_| true).collect::<Vec<bool>>()
-		);
-		assert_eq!(
-			Elections::all_approvals_of(&65),
-			(0..65).map(|_| true).collect::<Vec<bool>>()
-		);
-		assert_eq!(
-			Elections::all_approvals_of(&63),
-			(0..63).map(|_| true).collect::<Vec<bool>>()
-		);
+		assert_eq!(Elections::all_approvals_of(&32), (0..32).map(|_| true).collect::<Vec<bool>>());
+		assert_eq!(Elections::all_approvals_of(&8), (0..8).map(|_| true).collect::<Vec<bool>>());
+		assert_eq!(Elections::all_approvals_of(&64), (0..64).map(|_| true).collect::<Vec<bool>>());
+		assert_eq!(Elections::all_approvals_of(&65), (0..65).map(|_| true).collect::<Vec<bool>>());
+		assert_eq!(Elections::all_approvals_of(&63), (0..63).map(|_| true).collect::<Vec<bool>>());
 
 		// NOTE: assuming that APPROVAL_SET_SIZE is more or less small-ish. Might fail otherwise.
 		let full_sets = (180 / APPROVAL_FLAG_LEN) / APPROVAL_SET_SIZE;
@@ -197,10 +166,9 @@ fn chunking_approvals_set_growth_should_work() {
 		// grab and check the last full set, if it exists.
 		if full_sets > 0 {
 			assert_eq!(
-				Elections::approvals_of((180, (full_sets-1) as SetIndex )),
+				Elections::approvals_of((180, (full_sets - 1) as SetIndex)),
 				Elections::bool_to_flag(
-					(0..APPROVAL_SET_SIZE * APPROVAL_FLAG_LEN)
-					.map(|_| true).collect::<Vec<bool>>()
+					(0..APPROVAL_SET_SIZE * APPROVAL_FLAG_LEN).map(|_| true).collect::<Vec<bool>>()
 				)
 			);
 		}
@@ -210,8 +178,7 @@ fn chunking_approvals_set_growth_should_work() {
 			assert_eq!(
 				Elections::approvals_of((180, full_sets as SetIndex)),
 				Elections::bool_to_flag(
-					(0..left_over * APPROVAL_FLAG_LEN + rem)
-					.map(|_| true).collect::<Vec<bool>>()
+					(0..left_over * APPROVAL_FLAG_LEN + rem).map(|_| true).collect::<Vec<bool>>()
 				)
 			);
 		}
@@ -311,7 +278,7 @@ fn voting_bad_approval_index_slashes_voters_and_bond_reduces_stake() {
 		assert_eq!(balances(&64), (18, 2));
 		assert_eq!(
 			Elections::voter_info(&64).unwrap(),
-			VoterInfo { last_win: 0, last_active: 0, stake: 20, pot:0 }
+			VoterInfo { last_win: 0, last_active: 0, stake: 20, pot: 0 }
 		);
 
 		assert_eq!(Elections::next_nonfull_voter_set(), 1);
@@ -321,7 +288,7 @@ fn voting_bad_approval_index_slashes_voters_and_bond_reduces_stake() {
 		assert_eq!(balances(&65), (13, 2));
 		assert_eq!(
 			Elections::voter_info(&65).unwrap(),
-			VoterInfo { last_win: 0, last_active: 0, stake: 15, pot:0 }
+			VoterInfo { last_win: 0, last_active: 0, stake: 15, pot: 0 }
 		);
 	});
 }
@@ -374,7 +341,7 @@ fn voting_locking_more_than_total_balance_is_moot() {
 		assert_eq!(balances(&3), (28, 2));
 		assert_eq!(
 			Elections::voter_info(&3).unwrap(),
-			VoterInfo { last_win: 0, last_active: 0, stake: 30, pot:0 }
+			VoterInfo { last_win: 0, last_active: 0, stake: 30, pot: 0 }
 		);
 	});
 }
@@ -424,7 +391,7 @@ fn voting_setting_an_approval_vote_count_more_than_candidate_count_should_not_wo
 		assert_eq!(Elections::candidates().len(), 1);
 
 		assert_noop!(
-			Elections::set_approvals(Origin::signed(4),vec![true, true], 0, 0, 40),
+			Elections::set_approvals(Origin::signed(4), vec![true, true], 0, 0, 40),
 			Error::<Test>::TooManyVotes,
 		);
 	});
@@ -498,7 +465,10 @@ fn voting_invalid_retraction_index_should_not_work() {
 		assert_ok!(Elections::set_approvals(Origin::signed(1), vec![true], 0, 0, 10));
 		assert_ok!(Elections::set_approvals(Origin::signed(2), vec![true], 0, 0, 20));
 		assert_eq!(voter_ids(), vec![1, 2]);
-		assert_noop!(Elections::retract_voter(Origin::signed(1), 1), Error::<Test>::InvalidRetractionIndex);
+		assert_noop!(
+			Elections::retract_voter(Origin::signed(1), 1),
+			Error::<Test>::InvalidRetractionIndex
+		);
 	});
 }
 
@@ -508,7 +478,10 @@ fn voting_overflow_retraction_index_should_not_work() {
 		assert_ok!(Elections::submit_candidacy(Origin::signed(3), 0));
 
 		assert_ok!(Elections::set_approvals(Origin::signed(1), vec![true], 0, 0, 10));
-		assert_noop!(Elections::retract_voter(Origin::signed(1), 1), Error::<Test>::InvalidRetractionIndex);
+		assert_noop!(
+			Elections::retract_voter(Origin::signed(1), 1),
+			Error::<Test>::InvalidRetractionIndex
+		);
 	});
 }
 
@@ -518,7 +491,10 @@ fn voting_non_voter_retraction_should_not_work() {
 		assert_ok!(Elections::submit_candidacy(Origin::signed(3), 0));
 
 		assert_ok!(Elections::set_approvals(Origin::signed(1), vec![true], 0, 0, 10));
-		assert_noop!(Elections::retract_voter(Origin::signed(2), 0), Error::<Test>::RetractNonVoter);
+		assert_noop!(
+			Elections::retract_voter(Origin::signed(2), 0),
+			Error::<Test>::RetractNonVoter
+		);
 	});
 }
 
@@ -543,9 +519,11 @@ fn retracting_inactive_voter_should_work() {
 		assert_ok!(Elections::present_winner(Origin::signed(4), 5, 50, 1));
 		assert_ok!(Elections::end_block(System::block_number()));
 
-		assert_ok!(Elections::reap_inactive_voter(Origin::signed(5),
+		assert_ok!(Elections::reap_inactive_voter(
+			Origin::signed(5),
 			(voter_ids().iter().position(|&i| i == 5).unwrap() as u32).into(),
-			2, (voter_ids().iter().position(|&i| i == 2).unwrap() as u32).into(),
+			2,
+			(voter_ids().iter().position(|&i| i == 2).unwrap() as u32).into(),
 			2
 		));
 
@@ -580,9 +558,11 @@ fn retracting_inactive_voter_with_other_candidates_in_slots_should_work() {
 		System::set_block_number(11);
 		assert_ok!(Elections::submit_candidacy(Origin::signed(1), 0));
 
-		assert_ok!(Elections::reap_inactive_voter(Origin::signed(5),
+		assert_ok!(Elections::reap_inactive_voter(
+			Origin::signed(5),
 			(voter_ids().iter().position(|&i| i == 5).unwrap() as u32).into(),
-			2, (voter_ids().iter().position(|&i| i == 2).unwrap() as u32).into(),
+			2,
+			(voter_ids().iter().position(|&i| i == 2).unwrap() as u32).into(),
 			2
 		));
 
@@ -612,11 +592,16 @@ fn retracting_inactive_voter_with_bad_reporter_index_should_not_work() {
 		assert_ok!(Elections::present_winner(Origin::signed(4), 5, 50, 1));
 		assert_ok!(Elections::end_block(System::block_number()));
 
-		assert_noop!(Elections::reap_inactive_voter(Origin::signed(2),
-			42,
-			2, (voter_ids().iter().position(|&i| i == 2).unwrap() as u32).into(),
-			2
-		), Error::<Test>::InvalidReporterIndex);
+		assert_noop!(
+			Elections::reap_inactive_voter(
+				Origin::signed(2),
+				42,
+				2,
+				(voter_ids().iter().position(|&i| i == 2).unwrap() as u32).into(),
+				2
+			),
+			Error::<Test>::InvalidReporterIndex
+		);
 	});
 }
 
@@ -641,11 +626,16 @@ fn retracting_inactive_voter_with_bad_target_index_should_not_work() {
 		assert_ok!(Elections::present_winner(Origin::signed(4), 5, 50, 1));
 		assert_ok!(Elections::end_block(System::block_number()));
 
-		assert_noop!(Elections::reap_inactive_voter(Origin::signed(2),
-			(voter_ids().iter().position(|&i| i == 2).unwrap() as u32).into(),
-			2, 42,
-			2
-		), Error::<Test>::InvalidTargetIndex);
+		assert_noop!(
+			Elections::reap_inactive_voter(
+				Origin::signed(2),
+				(voter_ids().iter().position(|&i| i == 2).unwrap() as u32).into(),
+				2,
+				42,
+				2
+			),
+			Error::<Test>::InvalidTargetIndex
+		);
 	});
 }
 
@@ -657,10 +647,34 @@ fn retracting_active_voter_should_slash_reporter() {
 		assert_ok!(Elections::submit_candidacy(Origin::signed(3), 1));
 		assert_ok!(Elections::submit_candidacy(Origin::signed(4), 2));
 		assert_ok!(Elections::submit_candidacy(Origin::signed(5), 3));
-		assert_ok!(Elections::set_approvals(Origin::signed(2), vec![true, false, false, false], 0, 0, 20));
-		assert_ok!(Elections::set_approvals(Origin::signed(3), vec![false, true, false, false], 0, 0, 30));
-		assert_ok!(Elections::set_approvals(Origin::signed(4), vec![false, false, true, false], 0, 0, 40));
-		assert_ok!(Elections::set_approvals(Origin::signed(5), vec![false, false, false, true], 0, 0, 50));
+		assert_ok!(Elections::set_approvals(
+			Origin::signed(2),
+			vec![true, false, false, false],
+			0,
+			0,
+			20
+		));
+		assert_ok!(Elections::set_approvals(
+			Origin::signed(3),
+			vec![false, true, false, false],
+			0,
+			0,
+			30
+		));
+		assert_ok!(Elections::set_approvals(
+			Origin::signed(4),
+			vec![false, false, true, false],
+			0,
+			0,
+			40
+		));
+		assert_ok!(Elections::set_approvals(
+			Origin::signed(5),
+			vec![false, false, false, true],
+			0,
+			0,
+			50
+		));
 		assert_ok!(Elections::end_block(System::block_number()));
 
 		System::set_block_number(6);
@@ -675,16 +689,30 @@ fn retracting_active_voter_should_slash_reporter() {
 		assert_ok!(Elections::end_block(System::block_number()));
 
 		System::set_block_number(10);
-		assert_ok!(Elections::present_winner(Origin::signed(4), 2, 20 + Elections::get_offset(20, 1), 1));
-		assert_ok!(Elections::present_winner(Origin::signed(4), 3, 30 + Elections::get_offset(30, 1), 1));
+		assert_ok!(Elections::present_winner(
+			Origin::signed(4),
+			2,
+			20 + Elections::get_offset(20, 1),
+			1
+		));
+		assert_ok!(Elections::present_winner(
+			Origin::signed(4),
+			3,
+			30 + Elections::get_offset(30, 1),
+			1
+		));
 		assert_ok!(Elections::end_block(System::block_number()));
 
 		assert_eq!(Elections::vote_index(), 2);
 		assert_eq!(<Test as Config>::InactiveGracePeriod::get(), 1);
 		assert_eq!(<Test as Config>::VotingPeriod::get(), 4);
-		assert_eq!(Elections::voter_info(4), Some(VoterInfo { last_win: 1, last_active: 0, stake: 40, pot: 0 }));
+		assert_eq!(
+			Elections::voter_info(4),
+			Some(VoterInfo { last_win: 1, last_active: 0, stake: 40, pot: 0 })
+		);
 
-		assert_ok!(Elections::reap_inactive_voter(Origin::signed(4),
+		assert_ok!(Elections::reap_inactive_voter(
+			Origin::signed(4),
 			(voter_ids().iter().position(|&i| i == 4).unwrap() as u32).into(),
 			2,
 			(voter_ids().iter().position(|&i| i == 2).unwrap() as u32).into(),
@@ -718,11 +746,16 @@ fn retracting_inactive_voter_by_nonvoter_should_not_work() {
 		assert_ok!(Elections::present_winner(Origin::signed(4), 5, 50, 1));
 		assert_ok!(Elections::end_block(System::block_number()));
 
-		assert_noop!(Elections::reap_inactive_voter(Origin::signed(4),
-			0,
-			2, (voter_ids().iter().position(|&i| i == 2).unwrap() as u32).into(),
-			2
-		), Error::<Test>::NotVoter);
+		assert_noop!(
+			Elections::reap_inactive_voter(
+				Origin::signed(4),
+				0,
+				2,
+				(voter_ids().iter().position(|&i| i == 2).unwrap() as u32).into(),
+				2
+			),
+			Error::<Test>::NotVoter
+		);
 	});
 }
 
@@ -933,7 +966,7 @@ fn election_seats_should_be_released() {
 			assert_ok!(Elections::end_block(System::block_number()));
 			if Elections::members().len() == 0 {
 				free_block = current;
-				break;
+				break
 			}
 		}
 		// 11 + 2 which is the next voting period.
@@ -1021,9 +1054,21 @@ fn election_presenting_loser_should_not_work() {
 		assert_ok!(Elections::submit_candidacy(Origin::signed(3), 2));
 		assert_ok!(Elections::set_approvals(Origin::signed(3), vec![false, false, true], 0, 0, 30));
 		assert_ok!(Elections::submit_candidacy(Origin::signed(4), 3));
-		assert_ok!(Elections::set_approvals(Origin::signed(4), vec![false, false, false, true], 0, 0, 40));
+		assert_ok!(Elections::set_approvals(
+			Origin::signed(4),
+			vec![false, false, false, true],
+			0,
+			0,
+			40
+		));
 		assert_ok!(Elections::submit_candidacy(Origin::signed(5), 4));
-		assert_ok!(Elections::set_approvals(Origin::signed(5), vec![false, false, false, false, true], 0, 0, 50));
+		assert_ok!(Elections::set_approvals(
+			Origin::signed(5),
+			vec![false, false, false, false, true],
+			0,
+			0,
+			50
+		));
 		assert_ok!(Elections::end_block(System::block_number()));
 
 		System::set_block_number(6);
@@ -1032,14 +1077,12 @@ fn election_presenting_loser_should_not_work() {
 		assert_ok!(Elections::present_winner(Origin::signed(4), 4, 40, 0));
 		assert_ok!(Elections::present_winner(Origin::signed(4), 5, 50, 0));
 
-		assert_eq!(Elections::leaderboard(), Some(vec![
-			(30, 3),
-			(40, 4),
-			(50, 5),
-			(60, 1)
-		]));
+		assert_eq!(Elections::leaderboard(), Some(vec![(30, 3), (40, 4), (50, 5), (60, 1)]));
 
-		assert_noop!(Elections::present_winner(Origin::signed(4), 2, 20, 0), Error::<Test>::UnworthyCandidate);
+		assert_noop!(
+			Elections::present_winner(Origin::signed(4), 2, 20, 0),
+			Error::<Test>::UnworthyCandidate
+		);
 	});
 }
 
@@ -1054,9 +1097,21 @@ fn election_presenting_loser_first_should_not_matter() {
 		assert_ok!(Elections::submit_candidacy(Origin::signed(3), 2));
 		assert_ok!(Elections::set_approvals(Origin::signed(3), vec![false, false, true], 0, 0, 30));
 		assert_ok!(Elections::submit_candidacy(Origin::signed(4), 3));
-		assert_ok!(Elections::set_approvals(Origin::signed(4), vec![false, false, false, true], 0, 0, 40));
+		assert_ok!(Elections::set_approvals(
+			Origin::signed(4),
+			vec![false, false, false, true],
+			0,
+			0,
+			40
+		));
 		assert_ok!(Elections::submit_candidacy(Origin::signed(5), 4));
-		assert_ok!(Elections::set_approvals(Origin::signed(5), vec![false, false, false, false, true], 0, 0, 50));
+		assert_ok!(Elections::set_approvals(
+			Origin::signed(5),
+			vec![false, false, false, false, true],
+			0,
+			0,
+			50
+		));
 		assert_ok!(Elections::end_block(System::block_number()));
 
 		System::set_block_number(6);
@@ -1066,12 +1121,7 @@ fn election_presenting_loser_first_should_not_matter() {
 		assert_ok!(Elections::present_winner(Origin::signed(4), 4, 40, 0));
 		assert_ok!(Elections::present_winner(Origin::signed(4), 5, 50, 0));
 
-		assert_eq!(Elections::leaderboard(), Some(vec![
-			(30, 3),
-			(40, 4),
-			(50, 5),
-			(60, 1)
-		]));
+		assert_eq!(Elections::leaderboard(), Some(vec![(30, 3), (40, 4), (50, 5), (60, 1)]));
 	});
 }
 
@@ -1098,7 +1148,10 @@ fn election_present_with_invalid_vote_index_should_not_work() {
 		assert_ok!(Elections::end_block(System::block_number()));
 
 		System::set_block_number(6);
-		assert_noop!(Elections::present_winner(Origin::signed(4), 2, 20, 1), Error::<Test>::InvalidVoteIndex);
+		assert_noop!(
+			Elections::present_winner(Origin::signed(4), 2, 20, 1),
+			Error::<Test>::InvalidVoteIndex
+		);
 	});
 }
 
@@ -1115,10 +1168,10 @@ fn election_present_when_presenter_is_poor_should_not_work() {
 				let _ = Balances::make_free_balance_be(&1, 15);
 				assert!(!Elections::presentation_active());
 
- 				// -3
+				// -3
 				assert_ok!(Elections::submit_candidacy(Origin::signed(1), 0));
 				assert_eq!(Balances::free_balance(1), 12);
- 				// -2 -5
+				// -2 -5
 				assert_ok!(Elections::set_approvals(Origin::signed(1), vec![true], 0, 0, 15));
 				assert_ok!(Elections::end_block(System::block_number()));
 
@@ -1126,8 +1179,8 @@ fn election_present_when_presenter_is_poor_should_not_work() {
 				assert_eq!(Balances::free_balance(1), 5);
 				assert_eq!(Balances::reserved_balance(1), 5);
 				if p > 5 {
-					assert_noop!(Elections::present_winner(
-						Origin::signed(1), 1, 10, 0),
+					assert_noop!(
+						Elections::present_winner(Origin::signed(1), 1, 10, 0),
 						Error::<Test>::InsufficientPresenterFunds,
 					);
 				} else {
@@ -1153,7 +1206,10 @@ fn election_invalid_present_tally_should_slash() {
 		assert_ok!(Elections::end_block(System::block_number()));
 
 		System::set_block_number(6);
-		assert_err!(Elections::present_winner(Origin::signed(4), 2, 80, 0), Error::<Test>::IncorrectTotal);
+		assert_err!(
+			Elections::present_winner(Origin::signed(4), 2, 80, 0),
+			Error::<Test>::IncorrectTotal
+		);
 
 		assert_eq!(Balances::total_balance(&4), 38);
 	});
@@ -1172,9 +1228,21 @@ fn election_runners_up_should_be_kept() {
 		assert_ok!(Elections::submit_candidacy(Origin::signed(3), 2));
 		assert_ok!(Elections::set_approvals(Origin::signed(3), vec![false, false, true], 0, 0, 30));
 		assert_ok!(Elections::submit_candidacy(Origin::signed(4), 3));
-		assert_ok!(Elections::set_approvals(Origin::signed(4), vec![false, false, false, true], 0, 0, 40));
+		assert_ok!(Elections::set_approvals(
+			Origin::signed(4),
+			vec![false, false, false, true],
+			0,
+			0,
+			40
+		));
 		assert_ok!(Elections::submit_candidacy(Origin::signed(5), 4));
-		assert_ok!(Elections::set_approvals(Origin::signed(5), vec![false, false, false, false, true], 0, 0, 50));
+		assert_ok!(Elections::set_approvals(
+			Origin::signed(5),
+			vec![false, false, false, false, true],
+			0,
+			0,
+			50
+		));
 
 		assert_ok!(Elections::end_block(System::block_number()));
 
@@ -1183,21 +1251,11 @@ fn election_runners_up_should_be_kept() {
 		assert_ok!(Elections::present_winner(Origin::signed(4), 1, 60, 0));
 		// leaderboard length is the empty seats plus the carry count (i.e. 5 + 2), where those
 		// to be carried are the lowest and stored in lowest indices
-		assert_eq!(Elections::leaderboard(), Some(vec![
-			(0, 0),
-			(0, 0),
-			(0, 0),
-			(60, 1)
-		]));
+		assert_eq!(Elections::leaderboard(), Some(vec![(0, 0), (0, 0), (0, 0), (60, 1)]));
 		assert_ok!(Elections::present_winner(Origin::signed(4), 3, 30, 0));
 		assert_ok!(Elections::present_winner(Origin::signed(4), 4, 40, 0));
 		assert_ok!(Elections::present_winner(Origin::signed(4), 5, 50, 0));
-		assert_eq!(Elections::leaderboard(), Some(vec![
-			(30, 3),
-			(40, 4),
-			(50, 5),
-			(60, 1)
-		]));
+		assert_eq!(Elections::leaderboard(), Some(vec![(30, 3), (40, 4), (50, 5), (60, 1)]));
 
 		assert_ok!(Elections::end_block(System::block_number()));
 
@@ -1210,11 +1268,26 @@ fn election_runners_up_should_be_kept() {
 		assert!(Elections::is_a_candidate(&3));
 		assert!(Elections::is_a_candidate(&4));
 		assert_eq!(Elections::vote_index(), 1);
-		assert_eq!(Elections::voter_info(2), Some(VoterInfo { last_win: 0, last_active: 0, stake: 20, pot: 0 }));
-		assert_eq!(Elections::voter_info(3), Some(VoterInfo { last_win: 0, last_active: 0, stake: 30, pot: 0 }));
-		assert_eq!(Elections::voter_info(4), Some(VoterInfo { last_win: 0, last_active: 0, stake: 40, pot: 0 }));
-		assert_eq!(Elections::voter_info(5), Some(VoterInfo { last_win: 1, last_active: 0, stake: 50, pot: 0 }));
-		assert_eq!(Elections::voter_info(6), Some(VoterInfo { last_win: 1, last_active: 0, stake: 60, pot: 0 }));
+		assert_eq!(
+			Elections::voter_info(2),
+			Some(VoterInfo { last_win: 0, last_active: 0, stake: 20, pot: 0 })
+		);
+		assert_eq!(
+			Elections::voter_info(3),
+			Some(VoterInfo { last_win: 0, last_active: 0, stake: 30, pot: 0 })
+		);
+		assert_eq!(
+			Elections::voter_info(4),
+			Some(VoterInfo { last_win: 0, last_active: 0, stake: 40, pot: 0 })
+		);
+		assert_eq!(
+			Elections::voter_info(5),
+			Some(VoterInfo { last_win: 1, last_active: 0, stake: 50, pot: 0 })
+		);
+		assert_eq!(
+			Elections::voter_info(6),
+			Some(VoterInfo { last_win: 1, last_active: 0, stake: 60, pot: 0 })
+		);
 		assert_eq!(Elections::candidate_reg_info(3), Some((0, 2)));
 		assert_eq!(Elections::candidate_reg_info(4), Some((0, 3)));
 	});
@@ -1231,9 +1304,21 @@ fn election_second_tally_should_use_runners_up() {
 		assert_ok!(Elections::submit_candidacy(Origin::signed(3), 2));
 		assert_ok!(Elections::set_approvals(Origin::signed(3), vec![false, false, true], 0, 0, 30));
 		assert_ok!(Elections::submit_candidacy(Origin::signed(4), 3));
-		assert_ok!(Elections::set_approvals(Origin::signed(4), vec![false, false, false, true], 0, 0, 40));
+		assert_ok!(Elections::set_approvals(
+			Origin::signed(4),
+			vec![false, false, false, true],
+			0,
+			0,
+			40
+		));
 		assert_ok!(Elections::submit_candidacy(Origin::signed(5), 4));
-		assert_ok!(Elections::set_approvals(Origin::signed(5), vec![false, false, false, false, true], 0, 0, 50));
+		assert_ok!(Elections::set_approvals(
+			Origin::signed(5),
+			vec![false, false, false, false, true],
+			0,
+			0,
+			50
+		));
 		assert_ok!(Elections::end_block(System::block_number()));
 
 		System::set_block_number(6);
@@ -1244,13 +1329,29 @@ fn election_second_tally_should_use_runners_up() {
 		assert_ok!(Elections::end_block(System::block_number()));
 
 		System::set_block_number(8);
-		assert_ok!(Elections::set_approvals(Origin::signed(6), vec![false, false, true, false], 1, 0, 60));
+		assert_ok!(Elections::set_approvals(
+			Origin::signed(6),
+			vec![false, false, true, false],
+			1,
+			0,
+			60
+		));
 		assert_ok!(Elections::set_desired_seats(Origin::root(), 3));
 		assert_ok!(Elections::end_block(System::block_number()));
 
 		System::set_block_number(10);
-		assert_ok!(Elections::present_winner(Origin::signed(4), 3, 30 + Elections::get_offset(30, 1) + 60, 1));
-		assert_ok!(Elections::present_winner(Origin::signed(4), 4, 40 + Elections::get_offset(40, 1), 1));
+		assert_ok!(Elections::present_winner(
+			Origin::signed(4),
+			3,
+			30 + Elections::get_offset(30, 1) + 60,
+			1
+		));
+		assert_ok!(Elections::present_winner(
+			Origin::signed(4),
+			4,
+			40 + Elections::get_offset(40, 1),
+			1
+		));
 		assert_ok!(Elections::end_block(System::block_number()));
 
 		assert!(!Elections::presentation_active());
@@ -1262,13 +1363,25 @@ fn election_second_tally_should_use_runners_up() {
 		assert!(!Elections::is_a_candidate(&5));
 		assert!(Elections::is_a_candidate(&4));
 		assert_eq!(Elections::vote_index(), 2);
-		assert_eq!(Elections::voter_info(2), Some( VoterInfo { last_win: 0, last_active: 0, stake: 20, pot: 0}));
-		assert_eq!(Elections::voter_info(3), Some( VoterInfo { last_win: 2, last_active: 0, stake: 30, pot: 0}));
-		assert_eq!(Elections::voter_info(4), Some( VoterInfo { last_win: 0, last_active: 0, stake: 40, pot: 0}));
-		assert_eq!(Elections::voter_info(5), Some( VoterInfo { last_win: 1, last_active: 0, stake: 50, pot: 0}));
+		assert_eq!(
+			Elections::voter_info(2),
+			Some(VoterInfo { last_win: 0, last_active: 0, stake: 20, pot: 0 })
+		);
+		assert_eq!(
+			Elections::voter_info(3),
+			Some(VoterInfo { last_win: 2, last_active: 0, stake: 30, pot: 0 })
+		);
+		assert_eq!(
+			Elections::voter_info(4),
+			Some(VoterInfo { last_win: 0, last_active: 0, stake: 40, pot: 0 })
+		);
+		assert_eq!(
+			Elections::voter_info(5),
+			Some(VoterInfo { last_win: 1, last_active: 0, stake: 50, pot: 0 })
+		);
 		assert_eq!(
 			Elections::voter_info(6),
-			Some(VoterInfo { last_win: 2, last_active: 1, stake: 60, pot: 0})
+			Some(VoterInfo { last_win: 2, last_active: 1, stake: 60, pot: 0 })
 		);
 
 		assert_eq!(Elections::candidate_reg_info(4), Some((0, 3)));
@@ -1289,9 +1402,13 @@ fn election_loser_candidates_bond_gets_slashed() {
 		assert_eq!(balances(&2), (17, 3));
 
 		assert_ok!(Elections::set_approvals(Origin::signed(5), vec![true], 0, 0, 50));
-		assert_ok!(
-			Elections::set_approvals(Origin::signed(1), vec![false, true, true, true], 0, 0, 10)
-		);
+		assert_ok!(Elections::set_approvals(
+			Origin::signed(1),
+			vec![false, true, true, true],
+			0,
+			0,
+			10
+		));
 
 		assert_ok!(Elections::end_block(System::block_number()));
 
@@ -1302,7 +1419,6 @@ fn election_loser_candidates_bond_gets_slashed() {
 		assert_eq!(Elections::present_winner(Origin::signed(2), 2, 10, 0), Ok(()));
 		assert_eq!(Elections::present_winner(Origin::signed(1), 1, 50, 0), Ok(()));
 
-
 		// winner + carry
 		assert_eq!(Elections::leaderboard(), Some(vec![(10, 3), (10, 4), (50, 1)]));
 		assert_ok!(Elections::end_block(System::block_number()));
@@ -1324,15 +1440,27 @@ fn pot_accumulating_weight_and_decaying_should_work() {
 		assert_ok!(Elections::submit_candidacy(Origin::signed(5), 1));
 		assert_ok!(Elections::submit_candidacy(Origin::signed(1), 2));
 
-		assert_ok!(
-			Elections::set_approvals(Origin::signed(6), vec![true, false, false], 0, 0, 600)
-		);
-		assert_ok!(
-			Elections::set_approvals(Origin::signed(5), vec![false, true, false], 0, 0, 500)
-		);
-		assert_ok!(
-			Elections::set_approvals(Origin::signed(1), vec![false, false, true], 0, 0, 100)
-		);
+		assert_ok!(Elections::set_approvals(
+			Origin::signed(6),
+			vec![true, false, false],
+			0,
+			0,
+			600
+		));
+		assert_ok!(Elections::set_approvals(
+			Origin::signed(5),
+			vec![false, true, false],
+			0,
+			0,
+			500
+		));
+		assert_ok!(Elections::set_approvals(
+			Origin::signed(1),
+			vec![false, false, true],
+			0,
+			0,
+			100
+		));
 
 		assert_ok!(Elections::end_block(System::block_number()));
 
@@ -1348,15 +1476,15 @@ fn pot_accumulating_weight_and_decaying_should_work() {
 		assert_eq!(Elections::members(), vec![(6, 11), (5, 11)]);
 		assert_eq!(
 			Elections::voter_info(6).unwrap(),
-			VoterInfo { last_win: 1, last_active: 0, stake: 600, pot: 0},
+			VoterInfo { last_win: 1, last_active: 0, stake: 600, pot: 0 },
 		);
 		assert_eq!(
 			Elections::voter_info(5).unwrap(),
-			VoterInfo { last_win: 1, last_active: 0, stake: 500, pot: 0},
+			VoterInfo { last_win: 1, last_active: 0, stake: 500, pot: 0 },
 		);
 		assert_eq!(
 			Elections::voter_info(1).unwrap(),
-			VoterInfo { last_win: 0, last_active: 0, stake: 100, pot: 0},
+			VoterInfo { last_win: 0, last_active: 0, stake: 100, pot: 0 },
 		);
 
 		System::set_block_number(12);
@@ -1365,80 +1493,144 @@ fn pot_accumulating_weight_and_decaying_should_work() {
 		assert_ok!(Elections::retract_voter(Origin::signed(5), 1));
 		assert_ok!(Elections::submit_candidacy(Origin::signed(6), 0));
 		assert_ok!(Elections::submit_candidacy(Origin::signed(5), 1));
-		assert_ok!(
-			Elections::set_approvals(Origin::signed(6), vec![true, false, false], 1, 0, 600)
-		);
-		assert_ok!(
-			Elections::set_approvals(Origin::signed(5), vec![false, true, false], 1, 1, 500)
-		);
+		assert_ok!(Elections::set_approvals(
+			Origin::signed(6),
+			vec![true, false, false],
+			1,
+			0,
+			600
+		));
+		assert_ok!(Elections::set_approvals(
+			Origin::signed(5),
+			vec![false, true, false],
+			1,
+			1,
+			500
+		));
 		assert_ok!(Elections::end_block(System::block_number()));
 
 		System::set_block_number(14);
 		assert!(Elections::presentation_active());
 		assert_eq!(Elections::present_winner(Origin::signed(6), 6, 600, 1), Ok(()));
 		assert_eq!(Elections::present_winner(Origin::signed(5), 5, 500, 1), Ok(()));
-		assert_eq!(Elections::present_winner(Origin::signed(1), 1, 100 + Elections::get_offset(100, 1), 1), Ok(()));
+		assert_eq!(
+			Elections::present_winner(Origin::signed(1), 1, 100 + Elections::get_offset(100, 1), 1),
+			Ok(())
+		);
 		assert_eq!(Elections::leaderboard(), Some(vec![(0, 0), (100 + 96, 1), (500, 5), (600, 6)]));
 		assert_ok!(Elections::end_block(System::block_number()));
 
 		assert_eq!(Elections::members(), vec![(6, 19), (5, 19)]);
 		assert_eq!(
 			Elections::voter_info(6).unwrap(),
-			VoterInfo { last_win: 2, last_active: 1, stake: 600, pot:0 }
+			VoterInfo { last_win: 2, last_active: 1, stake: 600, pot: 0 }
+		);
+		assert_eq!(
+			Elections::voter_info(5).unwrap(),
+			VoterInfo { last_win: 2, last_active: 1, stake: 500, pot: 0 }
+		);
+		assert_eq!(
+			Elections::voter_info(1).unwrap(),
+			VoterInfo { last_win: 0, last_active: 0, stake: 100, pot: 0 }
 		);
-		assert_eq!(Elections::voter_info(5).unwrap(), VoterInfo { last_win: 2, last_active: 1, stake: 500, pot:0 });
-		assert_eq!(Elections::voter_info(1).unwrap(), VoterInfo { last_win: 0, last_active: 0, stake: 100, pot:0 });
 
 		System::set_block_number(20);
 		assert_ok!(Elections::retract_voter(Origin::signed(6), 0));
 		assert_ok!(Elections::retract_voter(Origin::signed(5), 1));
 		assert_ok!(Elections::submit_candidacy(Origin::signed(6), 0));
 		assert_ok!(Elections::submit_candidacy(Origin::signed(5), 1));
-		assert_ok!(Elections::set_approvals(Origin::signed(6), vec![true, false, false], 2, 0, 600));
-		assert_ok!(Elections::set_approvals(Origin::signed(5), vec![false, true, false], 2, 1, 500));
+		assert_ok!(Elections::set_approvals(
+			Origin::signed(6),
+			vec![true, false, false],
+			2,
+			0,
+			600
+		));
+		assert_ok!(Elections::set_approvals(
+			Origin::signed(5),
+			vec![false, true, false],
+			2,
+			1,
+			500
+		));
 		assert_ok!(Elections::end_block(System::block_number()));
 
 		System::set_block_number(22);
 		assert!(Elections::presentation_active());
 		assert_eq!(Elections::present_winner(Origin::signed(6), 6, 600, 2), Ok(()));
 		assert_eq!(Elections::present_winner(Origin::signed(5), 5, 500, 2), Ok(()));
-		assert_eq!(Elections::present_winner(Origin::signed(1), 1, 100 + Elections::get_offset(100, 2), 2), Ok(()));
-		assert_eq!(Elections::leaderboard(), Some(vec![(0, 0), (100 + 96 + 93, 1), (500, 5), (600, 6)]));
+		assert_eq!(
+			Elections::present_winner(Origin::signed(1), 1, 100 + Elections::get_offset(100, 2), 2),
+			Ok(())
+		);
+		assert_eq!(
+			Elections::leaderboard(),
+			Some(vec![(0, 0), (100 + 96 + 93, 1), (500, 5), (600, 6)])
+		);
 		assert_ok!(Elections::end_block(System::block_number()));
 
 		assert_eq!(Elections::members(), vec![(6, 27), (5, 27)]);
 		assert_eq!(
 			Elections::voter_info(6).unwrap(),
-			VoterInfo { last_win: 3, last_active: 2, stake: 600, pot: 0}
+			VoterInfo { last_win: 3, last_active: 2, stake: 600, pot: 0 }
+		);
+		assert_eq!(
+			Elections::voter_info(5).unwrap(),
+			VoterInfo { last_win: 3, last_active: 2, stake: 500, pot: 0 }
+		);
+		assert_eq!(
+			Elections::voter_info(1).unwrap(),
+			VoterInfo { last_win: 0, last_active: 0, stake: 100, pot: 0 }
 		);
-		assert_eq!(Elections::voter_info(5).unwrap(), VoterInfo { last_win: 3, last_active: 2, stake: 500, pot: 0});
-		assert_eq!(Elections::voter_info(1).unwrap(), VoterInfo { last_win: 0, last_active: 0, stake: 100, pot: 0});
-
 
 		System::set_block_number(28);
 		assert_ok!(Elections::retract_voter(Origin::signed(6), 0));
 		assert_ok!(Elections::retract_voter(Origin::signed(5), 1));
 		assert_ok!(Elections::submit_candidacy(Origin::signed(6), 0));
 		assert_ok!(Elections::submit_candidacy(Origin::signed(5), 1));
-		assert_ok!(Elections::set_approvals(Origin::signed(6), vec![true, false, false], 3, 0, 600));
-		assert_ok!(Elections::set_approvals(Origin::signed(5), vec![false, true, false], 3, 1, 500));
+		assert_ok!(Elections::set_approvals(
+			Origin::signed(6),
+			vec![true, false, false],
+			3,
+			0,
+			600
+		));
+		assert_ok!(Elections::set_approvals(
+			Origin::signed(5),
+			vec![false, true, false],
+			3,
+			1,
+			500
+		));
 		assert_ok!(Elections::end_block(System::block_number()));
 
 		System::set_block_number(30);
 		assert!(Elections::presentation_active());
 		assert_eq!(Elections::present_winner(Origin::signed(6), 6, 600, 3), Ok(()));
 		assert_eq!(Elections::present_winner(Origin::signed(5), 5, 500, 3), Ok(()));
-		assert_eq!(Elections::present_winner(Origin::signed(1), 1, 100 + Elections::get_offset(100, 3), 3), Ok(()));
-		assert_eq!(Elections::leaderboard(), Some(vec![(0, 0), (100 + 96 + 93 + 90, 1), (500, 5), (600, 6)]));
+		assert_eq!(
+			Elections::present_winner(Origin::signed(1), 1, 100 + Elections::get_offset(100, 3), 3),
+			Ok(())
+		);
+		assert_eq!(
+			Elections::leaderboard(),
+			Some(vec![(0, 0), (100 + 96 + 93 + 90, 1), (500, 5), (600, 6)])
+		);
 		assert_ok!(Elections::end_block(System::block_number()));
 
 		assert_eq!(Elections::members(), vec![(6, 35), (5, 35)]);
 		assert_eq!(
 			Elections::voter_info(6).unwrap(),
-			VoterInfo { last_win: 4, last_active: 3, stake: 600, pot: 0}
+			VoterInfo { last_win: 4, last_active: 3, stake: 600, pot: 0 }
+		);
+		assert_eq!(
+			Elections::voter_info(5).unwrap(),
+			VoterInfo { last_win: 4, last_active: 3, stake: 500, pot: 0 }
+		);
+		assert_eq!(
+			Elections::voter_info(1).unwrap(),
+			VoterInfo { last_win: 0, last_active: 0, stake: 100, pot: 0 }
 		);
-		assert_eq!(Elections::voter_info(5).unwrap(), VoterInfo { last_win: 4, last_active: 3, stake: 500, pot: 0});
-		assert_eq!(Elections::voter_info(1).unwrap(), VoterInfo { last_win: 0, last_active: 0, stake: 100, pot: 0});
 	})
 }
 
@@ -1453,9 +1645,27 @@ fn pot_winning_resets_accumulated_pot() {
 		assert_ok!(Elections::submit_candidacy(Origin::signed(3), 2));
 		assert_ok!(Elections::submit_candidacy(Origin::signed(2), 3));
 
-		assert_ok!(Elections::set_approvals(Origin::signed(6), vec![true, false, false, false], 0, 0, 600));
-		assert_ok!(Elections::set_approvals(Origin::signed(4), vec![false, true, false, false], 0, 1, 400));
-		assert_ok!(Elections::set_approvals(Origin::signed(3), vec![false, false, true, true], 0, 2, 300));
+		assert_ok!(Elections::set_approvals(
+			Origin::signed(6),
+			vec![true, false, false, false],
+			0,
+			0,
+			600
+		));
+		assert_ok!(Elections::set_approvals(
+			Origin::signed(4),
+			vec![false, true, false, false],
+			0,
+			1,
+			400
+		));
+		assert_ok!(Elections::set_approvals(
+			Origin::signed(3),
+			vec![false, false, true, true],
+			0,
+			2,
+			300
+		));
 		assert_ok!(Elections::end_block(System::block_number()));
 
 		System::set_block_number(6);
@@ -1474,16 +1684,34 @@ fn pot_winning_resets_accumulated_pot() {
 		assert_ok!(Elections::retract_voter(Origin::signed(4), 1));
 		assert_ok!(Elections::submit_candidacy(Origin::signed(6), 0));
 		assert_ok!(Elections::submit_candidacy(Origin::signed(4), 1));
-		assert_ok!(Elections::set_approvals(Origin::signed(6), vec![true, false, false, false], 1, 0, 600));
-		assert_ok!(Elections::set_approvals(Origin::signed(4), vec![false, true, false, false], 1, 1, 400));
+		assert_ok!(Elections::set_approvals(
+			Origin::signed(6),
+			vec![true, false, false, false],
+			1,
+			0,
+			600
+		));
+		assert_ok!(Elections::set_approvals(
+			Origin::signed(4),
+			vec![false, true, false, false],
+			1,
+			1,
+			400
+		));
 		assert_ok!(Elections::end_block(System::block_number()));
 
 		System::set_block_number(14);
 		assert!(Elections::presentation_active());
 		assert_eq!(Elections::present_winner(Origin::signed(6), 6, 600, 1), Ok(()));
 		assert_eq!(Elections::present_winner(Origin::signed(4), 4, 400, 1), Ok(()));
-		assert_eq!(Elections::present_winner(Origin::signed(3), 3, 300 + Elections::get_offset(300, 1), 1), Ok(()));
-		assert_eq!(Elections::present_winner(Origin::signed(2), 2, 300 + Elections::get_offset(300, 1), 1), Ok(()));
+		assert_eq!(
+			Elections::present_winner(Origin::signed(3), 3, 300 + Elections::get_offset(300, 1), 1),
+			Ok(())
+		);
+		assert_eq!(
+			Elections::present_winner(Origin::signed(2), 2, 300 + Elections::get_offset(300, 1), 1),
+			Ok(())
+		);
 		assert_eq!(Elections::leaderboard(), Some(vec![(400, 4), (588, 2), (588, 3), (600, 6)]));
 		assert_ok!(Elections::end_block(System::block_number()));
 
@@ -1497,7 +1725,10 @@ fn pot_winning_resets_accumulated_pot() {
 		// because one of 3's candidates (3) won in previous round
 		// 4 on the other hand will get extra weight since it was unlucky.
 		assert_eq!(Elections::present_winner(Origin::signed(3), 2, 300, 2), Ok(()));
-		assert_eq!(Elections::present_winner(Origin::signed(4), 4, 400 + Elections::get_offset(400, 1), 2), Ok(()));
+		assert_eq!(
+			Elections::present_winner(Origin::signed(4), 4, 400 + Elections::get_offset(400, 1), 2),
+			Ok(())
+		);
 		assert_ok!(Elections::end_block(System::block_number()));
 
 		assert_eq!(Elections::members(), vec![(4, 27), (2, 27)]);
@@ -1519,15 +1750,27 @@ fn pot_resubmitting_approvals_stores_pot() {
 			assert_ok!(Elections::submit_candidacy(Origin::signed(5), 1));
 			assert_ok!(Elections::submit_candidacy(Origin::signed(1), 2));
 
-			assert_ok!(
-				Elections::set_approvals(Origin::signed(6), vec![true, false, false], 0, 0, 600),
-			);
-			assert_ok!(
-				Elections::set_approvals(Origin::signed(5), vec![false, true, false], 0, 1, 500),
-			);
-			assert_ok!(
-				Elections::set_approvals(Origin::signed(1), vec![false, false, true], 0, 2, 100),
-			);
+			assert_ok!(Elections::set_approvals(
+				Origin::signed(6),
+				vec![true, false, false],
+				0,
+				0,
+				600
+			),);
+			assert_ok!(Elections::set_approvals(
+				Origin::signed(5),
+				vec![false, true, false],
+				0,
+				1,
+				500
+			),);
+			assert_ok!(Elections::set_approvals(
+				Origin::signed(1),
+				vec![false, false, true],
+				0,
+				2,
+				100
+			),);
 
 			assert_ok!(Elections::end_block(System::block_number()));
 
@@ -1547,18 +1790,31 @@ fn pot_resubmitting_approvals_stores_pot() {
 			assert_ok!(Elections::retract_voter(Origin::signed(5), 1));
 			assert_ok!(Elections::submit_candidacy(Origin::signed(6), 0));
 			assert_ok!(Elections::submit_candidacy(Origin::signed(5), 1));
-			assert_ok!(
-				Elections::set_approvals(Origin::signed(6), vec![true, false, false], 1, 0, 600),
-			);
-			assert_ok!(
-				Elections::set_approvals(Origin::signed(5), vec![false, true, false], 1, 1, 500),
-			);
+			assert_ok!(Elections::set_approvals(
+				Origin::signed(6),
+				vec![true, false, false],
+				1,
+				0,
+				600
+			),);
+			assert_ok!(Elections::set_approvals(
+				Origin::signed(5),
+				vec![false, true, false],
+				1,
+				1,
+				500
+			),);
 			// give 1 some new high balance
 			let _ = Balances::make_free_balance_be(&1, 997);
-			assert_ok!(
-				Elections::set_approvals(Origin::signed(1), vec![false, false, true], 1, 2, 1000),
-			);
-			assert_eq!(Elections::voter_info(1).unwrap(),
+			assert_ok!(Elections::set_approvals(
+				Origin::signed(1),
+				vec![false, false, true],
+				1,
+				2,
+				1000
+			),);
+			assert_eq!(
+				Elections::voter_info(1).unwrap(),
 				VoterInfo {
 					stake: 1000, // 997 + 3 which is candidacy bond.
 					pot: Elections::get_offset(100, 1),
@@ -1599,7 +1855,10 @@ fn pot_get_offset_should_work() {
 		assert_eq!(Elections::get_offset(50_000_000_000, 0), 0);
 		assert_eq!(Elections::get_offset(50_000_000_000, 1), 48_000_000_000);
 		assert_eq!(Elections::get_offset(50_000_000_000, 2), 48_000_000_000 + 46_080_000_000);
-		assert_eq!(Elections::get_offset(50_000_000_000, 3), 48_000_000_000 + 46_080_000_000 + 44_236_800_000);
+		assert_eq!(
+			Elections::get_offset(50_000_000_000, 3),
+			48_000_000_000 + 46_080_000_000 + 44_236_800_000
+		);
 		assert_eq!(
 			Elections::get_offset(50_000_000_000, 4),
 			48_000_000_000 + 46_080_000_000 + 44_236_800_000 + 42_467_328_000
diff --git a/frame/example-offchain-worker/src/lib.rs b/frame/example-offchain-worker/src/lib.rs
index b7a766ad847b..01f3c355fa43 100644
--- a/frame/example-offchain-worker/src/lib.rs
+++ b/frame/example-offchain-worker/src/lib.rs
@@ -42,24 +42,28 @@
 //! one unsigned transaction floating in the network.
 #![cfg_attr(not(feature = "std"), no_std)]
 
+use codec::{Decode, Encode};
+use frame_support::traits::Get;
 use frame_system::{
 	self as system,
 	offchain::{
-		AppCrypto, CreateSignedTransaction, SendUnsignedTransaction, SendSignedTransaction,
-		SignedPayload, SigningTypes, Signer, SubmitTransaction,
-	}
+		AppCrypto, CreateSignedTransaction, SendSignedTransaction, SendUnsignedTransaction,
+		SignedPayload, Signer, SigningTypes, SubmitTransaction,
+	},
 };
-use frame_support::traits::Get;
+use lite_json::json::JsonValue;
 use sp_core::crypto::KeyTypeId;
 use sp_runtime::{
-	RuntimeDebug,
-	offchain::{http, Duration, storage::{MutateStorageError, StorageRetrievalError, StorageValueRef}},
+	offchain::{
+		http,
+		storage::{MutateStorageError, StorageRetrievalError, StorageValueRef},
+		Duration,
+	},
 	traits::Zero,
-	transaction_validity::{InvalidTransaction, ValidTransaction, TransactionValidity},
+	transaction_validity::{InvalidTransaction, TransactionValidity, ValidTransaction},
+	RuntimeDebug,
 };
-use codec::{Encode, Decode};
 use sp_std::vec::Vec;
-use lite_json::json::JsonValue;
 
 #[cfg(test)]
 mod tests;
@@ -78,15 +82,17 @@ pub const KEY_TYPE: KeyTypeId = KeyTypeId(*b"btc!");
 /// the types with this pallet-specific identifier.
 pub mod crypto {
 	use super::KEY_TYPE;
+	use sp_core::sr25519::Signature as Sr25519Signature;
 	use sp_runtime::{
 		app_crypto::{app_crypto, sr25519},
 		traits::Verify,
 	};
-	use sp_core::sr25519::Signature as Sr25519Signature;
 	app_crypto!(sr25519, KEY_TYPE);
 
 	pub struct TestAuthId;
-	impl frame_system::offchain::AppCrypto<<Sr25519Signature as Verify>::Signer, Sr25519Signature> for TestAuthId {
+	impl frame_system::offchain::AppCrypto<<Sr25519Signature as Verify>::Signer, Sr25519Signature>
+		for TestAuthId
+	{
 		type RuntimeAppPublic = Public;
 		type GenericSignature = sp_core::sr25519::Signature;
 		type GenericPublic = sp_core::sr25519::Public;
@@ -97,9 +103,9 @@ pub use pallet::*;
 
 #[frame_support::pallet]
 pub mod pallet {
+	use super::*;
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
-	use super::*;
 
 	/// This pallet's configuration trait
 	#[pallet::config]
@@ -179,8 +185,10 @@ pub mod pallet {
 			let should_send = Self::choose_transaction_type(block_number);
 			let res = match should_send {
 				TransactionType::Signed => Self::fetch_price_and_send_signed(),
-				TransactionType::UnsignedForAny => Self::fetch_price_and_send_unsigned_for_any_account(block_number),
-				TransactionType::UnsignedForAll => Self::fetch_price_and_send_unsigned_for_all_accounts(block_number),
+				TransactionType::UnsignedForAny =>
+					Self::fetch_price_and_send_unsigned_for_any_account(block_number),
+				TransactionType::UnsignedForAll =>
+					Self::fetch_price_and_send_unsigned_for_all_accounts(block_number),
 				TransactionType::Raw => Self::fetch_price_and_send_raw_unsigned(block_number),
 				TransactionType::None => Ok(()),
 			};
@@ -236,7 +244,7 @@ pub mod pallet {
 		pub fn submit_price_unsigned(
 			origin: OriginFor<T>,
 			_block_number: T::BlockNumber,
-			price: u32
+			price: u32,
 		) -> DispatchResultWithPostInfo {
 			// This ensures that the function can only be called via unsigned transaction.
 			ensure_none(origin)?;
@@ -283,17 +291,15 @@ pub mod pallet {
 		/// By default unsigned transactions are disallowed, but implementing the validator
 		/// here we make sure that some particular calls (the ones produced by offchain worker)
 		/// are being whitelisted and marked as valid.
-		fn validate_unsigned(
-			_source: TransactionSource,
-			call: &Self::Call,
-		) -> TransactionValidity {
+		fn validate_unsigned(_source: TransactionSource, call: &Self::Call) -> TransactionValidity {
 			// Firstly let's check that we call the right function.
-			if let Call::submit_price_unsigned_with_signed_payload(
-				ref payload, ref signature
-			) = call {
-				let signature_valid = SignedPayload::<T>::verify::<T::AuthorityId>(payload, signature.clone());
+			if let Call::submit_price_unsigned_with_signed_payload(ref payload, ref signature) =
+				call
+			{
+				let signature_valid =
+					SignedPayload::<T>::verify::<T::AuthorityId>(payload, signature.clone());
 				if !signature_valid {
-					return InvalidTransaction::BadProof.into();
+					return InvalidTransaction::BadProof.into()
 				}
 				Self::validate_transaction_parameters(&payload.block_number, &payload.price)
 			} else if let Call::submit_price_unsigned(block_number, new_price) = call {
@@ -370,11 +376,10 @@ impl<T: Config> Pallet<T> {
 			match last_send {
 				// If we already have a value in storage and the block number is recent enough
 				// we avoid sending another transaction at this time.
-				Ok(Some(block)) if block_number < block + T::GracePeriod::get() => {
-					Err(RECENTLY_SENT)
-				},
+				Ok(Some(block)) if block_number < block + T::GracePeriod::get() =>
+					Err(RECENTLY_SENT),
 				// In every other case we attempt to acquire the lock and send a transaction.
-				_ => Ok(block_number)
+				_ => Ok(block_number),
 			}
 		});
 
@@ -396,10 +401,15 @@ impl<T: Config> Pallet<T> {
 				// the storage entry for that. (for instance store both block number and a flag
 				// indicating the type of next transaction to send).
 				let transaction_type = block_number % 3u32.into();
-				if transaction_type == Zero::zero() { TransactionType::Signed }
-				else if transaction_type == T::BlockNumber::from(1u32) { TransactionType::UnsignedForAny }
-				else if transaction_type == T::BlockNumber::from(2u32) { TransactionType::UnsignedForAll }
-				else { TransactionType::Raw }
+				if transaction_type == Zero::zero() {
+					TransactionType::Signed
+				} else if transaction_type == T::BlockNumber::from(1u32) {
+					TransactionType::UnsignedForAny
+				} else if transaction_type == T::BlockNumber::from(2u32) {
+					TransactionType::UnsignedForAll
+				} else {
+					TransactionType::Raw
+				}
 			},
 			// We are in the grace period, we should not send a transaction this time.
 			Err(MutateStorageError::ValueFunctionFailed(RECENTLY_SENT)) => TransactionType::None,
@@ -417,7 +427,7 @@ impl<T: Config> Pallet<T> {
 		let signer = Signer::<T, T::AuthorityId>::all_accounts();
 		if !signer.can_sign() {
 			return Err(
-				"No local accounts available. Consider adding one via `author_insertKey` RPC."
+				"No local accounts available. Consider adding one via `author_insertKey` RPC.",
 			)?
 		}
 		// Make an external HTTP request to fetch the current price.
@@ -428,14 +438,12 @@ impl<T: Config> Pallet<T> {
 		// representing the call, we've just created.
 		// Submit signed will return a vector of results for all accounts that were found in the
 		// local keystore with expected `KEY_TYPE`.
-		let results = signer.send_signed_transaction(
-			|_account| {
-				// Received price is wrapped into a call to `submit_price` public function of this pallet.
-				// This means that the transaction, when executed, will simply call that function passing
-				// `price` as an argument.
-				Call::submit_price(price)
-			}
-		);
+		let results = signer.send_signed_transaction(|_account| {
+			// Received price is wrapped into a call to `submit_price` public function of this pallet.
+			// This means that the transaction, when executed, will simply call that function passing
+			// `price` as an argument.
+			Call::submit_price(price)
+		});
 
 		for (acc, res) in &results {
 			match res {
@@ -480,7 +488,9 @@ impl<T: Config> Pallet<T> {
 	}
 
 	/// A helper function to fetch the price, sign payload and send an unsigned transaction
-	fn fetch_price_and_send_unsigned_for_any_account(block_number: T::BlockNumber) -> Result<(), &'static str> {
+	fn fetch_price_and_send_unsigned_for_any_account(
+		block_number: T::BlockNumber,
+	) -> Result<(), &'static str> {
 		// Make sure we don't fetch the price if unsigned transaction is going to be rejected
 		// anyway.
 		let next_unsigned_at = <NextUnsignedAt<T>>::get();
@@ -493,23 +503,23 @@ impl<T: Config> Pallet<T> {
 		let price = Self::fetch_price().map_err(|_| "Failed to fetch price")?;
 
 		// -- Sign using any account
-		let (_, result) = Signer::<T, T::AuthorityId>::any_account().send_unsigned_transaction(
-			|account| PricePayload {
-				price,
-				block_number,
-				public: account.public.clone()
-			},
-			|payload, signature| {
-				Call::submit_price_unsigned_with_signed_payload(payload, signature)
-			}
-		).ok_or("No local accounts accounts available.")?;
+		let (_, result) = Signer::<T, T::AuthorityId>::any_account()
+			.send_unsigned_transaction(
+				|account| PricePayload { price, block_number, public: account.public.clone() },
+				|payload, signature| {
+					Call::submit_price_unsigned_with_signed_payload(payload, signature)
+				},
+			)
+			.ok_or("No local accounts accounts available.")?;
 		result.map_err(|()| "Unable to submit transaction")?;
 
 		Ok(())
 	}
 
 	/// A helper function to fetch the price, sign payload and send an unsigned transaction
-	fn fetch_price_and_send_unsigned_for_all_accounts(block_number: T::BlockNumber) -> Result<(), &'static str> {
+	fn fetch_price_and_send_unsigned_for_all_accounts(
+		block_number: T::BlockNumber,
+	) -> Result<(), &'static str> {
 		// Make sure we don't fetch the price if unsigned transaction is going to be rejected
 		// anyway.
 		let next_unsigned_at = <NextUnsignedAt<T>>::get();
@@ -524,18 +534,14 @@ impl<T: Config> Pallet<T> {
 		// -- Sign using all accounts
 		let transaction_results = Signer::<T, T::AuthorityId>::all_accounts()
 			.send_unsigned_transaction(
-				|account| PricePayload {
-					price,
-					block_number,
-					public: account.public.clone()
-				},
+				|account| PricePayload { price, block_number, public: account.public.clone() },
 				|payload, signature| {
 					Call::submit_price_unsigned_with_signed_payload(payload, signature)
-				}
+				},
 			);
 		for (_account_id, result) in transaction_results.into_iter() {
 			if result.is_err() {
-				return Err("Unable to submit transaction");
+				return Err("Unable to submit transaction")
 			}
 		}
 
@@ -554,16 +560,12 @@ impl<T: Config> Pallet<T> {
 		// you can find in `sp_io`. The API is trying to be similar to `reqwest`, but
 		// since we are running in a custom WASM execution environment we can't simply
 		// import the library here.
-		let request = http::Request::get(
-			"https://min-api.cryptocompare.com/data/price?fsym=BTC&tsyms=USD"
-		);
+		let request =
+			http::Request::get("https://min-api.cryptocompare.com/data/price?fsym=BTC&tsyms=USD");
 		// We set the deadline for sending of the request, note that awaiting response can
 		// have a separate deadline. Next we send the request, before that it's also possible
 		// to alter request headers or stream body content in case of non-GET requests.
-		let pending = request
-			.deadline(deadline)
-			.send()
-			.map_err(|_| http::Error::IoError)?;
+		let pending = request.deadline(deadline).send().map_err(|_| http::Error::IoError)?;
 
 		// The request is already being processed by the host, we are free to do anything
 		// else in the worker (we can send multiple concurrent requests too).
@@ -571,12 +573,11 @@ impl<T: Config> Pallet<T> {
 		// so we can block current thread and wait for it to finish.
 		// Note that since the request is being driven by the host, we don't have to wait
 		// for the request to have it complete, we will just not read the response.
-		let response = pending.try_wait(deadline)
-			.map_err(|_| http::Error::DeadlineReached)??;
+		let response = pending.try_wait(deadline).map_err(|_| http::Error::DeadlineReached)??;
 		// Let's check the status code before we proceed to reading the response.
 		if response.code != 200 {
 			log::warn!("Unexpected status code: {}", response.code);
-			return Err(http::Error::Unknown);
+			return Err(http::Error::Unknown)
 		}
 
 		// Next we want to fully read the response body and collect it to a vector of bytes.
@@ -595,7 +596,7 @@ impl<T: Config> Pallet<T> {
 			None => {
 				log::warn!("Unable to extract price from the response: {:?}", body_str);
 				Err(http::Error::Unknown)
-			}
+			},
 		}?;
 
 		log::warn!("Got price: {} cents", price);
@@ -610,8 +611,7 @@ impl<T: Config> Pallet<T> {
 		let val = lite_json::parse_json(price_str);
 		let price = match val.ok()? {
 			JsonValue::Object(obj) => {
-				let (_, v) = obj.into_iter()
-					.find(|(k, _)| k.iter().copied().eq("USD".chars()))?;
+				let (_, v) = obj.into_iter().find(|(k, _)| k.iter().copied().eq("USD".chars()))?;
 				match v {
 					JsonValue::Number(number) => number,
 					_ => return None,
@@ -661,12 +661,12 @@ impl<T: Config> Pallet<T> {
 		// Now let's check if the transaction has any chance to succeed.
 		let next_unsigned_at = <NextUnsignedAt<T>>::get();
 		if &next_unsigned_at > block_number {
-			return InvalidTransaction::Stale.into();
+			return InvalidTransaction::Stale.into()
 		}
 		// Let's make sure to reject transactions from the future.
 		let current_block = <system::Pallet<T>>::block_number();
 		if &current_block < block_number {
-			return InvalidTransaction::Future.into();
+			return InvalidTransaction::Future.into()
 		}
 
 		// We prioritize transactions that are more far away from current average.
diff --git a/frame/example-offchain-worker/src/tests.rs b/frame/example-offchain-worker/src/tests.rs
index 7d16e5949034..706569e0e18d 100644
--- a/frame/example-offchain-worker/src/tests.rs
+++ b/frame/example-offchain-worker/src/tests.rs
@@ -15,28 +15,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::*;
 use crate as example_offchain_worker;
-use std::sync::Arc;
+use crate::*;
 use codec::Decode;
 use frame_support::{assert_ok, parameter_types};
 use sp_core::{
-	H256,
-	offchain::{OffchainWorkerExt, TransactionPoolExt, testing},
+	offchain::{testing, OffchainWorkerExt, TransactionPoolExt},
 	sr25519::Signature,
+	H256,
 };
+use std::sync::Arc;
 
-use sp_keystore::{
-	{KeystoreExt, SyncCryptoStore},
-	testing::KeyStore,
-};
+use sp_keystore::{testing::KeyStore, KeystoreExt, SyncCryptoStore};
 use sp_runtime::{
-	RuntimeAppPublic,
 	testing::{Header, TestXt},
-	traits::{
-		BlakeTwo256, IdentityLookup, Extrinsic as ExtrinsicT,
-		IdentifyAccount, Verify,
-	},
+	traits::{BlakeTwo256, Extrinsic as ExtrinsicT, IdentifyAccount, IdentityLookup, Verify},
+	RuntimeAppPublic,
 };
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
@@ -93,14 +87,16 @@ impl frame_system::offchain::SigningTypes for Test {
 	type Signature = Signature;
 }
 
-impl<LocalCall> frame_system::offchain::SendTransactionTypes<LocalCall> for Test where
+impl<LocalCall> frame_system::offchain::SendTransactionTypes<LocalCall> for Test
+where
 	Call: From<LocalCall>,
 {
 	type OverarchingCall = Call;
 	type Extrinsic = Extrinsic;
 }
 
-impl<LocalCall> frame_system::offchain::CreateSignedTransaction<LocalCall> for Test where
+impl<LocalCall> frame_system::offchain::CreateSignedTransaction<LocalCall> for Test
+where
 	Call: From<LocalCall>,
 {
 	fn create_transaction<C: frame_system::offchain::AppCrypto<Self::Public, Self::Signature>>(
@@ -190,7 +186,6 @@ fn knows_how_to_mock_several_http_calls() {
 		});
 	}
 
-
 	t.execute_with(|| {
 		let price1 = Example::fetch_price().unwrap();
 		let price2 = Example::fetch_price().unwrap();
@@ -200,12 +195,12 @@ fn knows_how_to_mock_several_http_calls() {
 		assert_eq!(price2, 200);
 		assert_eq!(price3, 300);
 	})
-
 }
 
 #[test]
 fn should_submit_signed_transaction_on_chain() {
-	const PHRASE: &str = "news slush supreme milk chapter athlete soap sausage put clutch what kitten";
+	const PHRASE: &str =
+		"news slush supreme milk chapter athlete soap sausage put clutch what kitten";
 
 	let (offchain, offchain_state) = testing::TestOffchainExt::new();
 	let (pool, pool_state) = testing::TestTransactionPoolExt::new();
@@ -213,9 +208,9 @@ fn should_submit_signed_transaction_on_chain() {
 	SyncCryptoStore::sr25519_generate_new(
 		&keystore,
 		crate::crypto::Public::ID,
-		Some(&format!("{}/hunter1", PHRASE))
-	).unwrap();
-
+		Some(&format!("{}/hunter1", PHRASE)),
+	)
+	.unwrap();
 
 	let mut t = sp_io::TestExternalities::default();
 	t.register_extension(OffchainWorkerExt::new(offchain));
@@ -238,7 +233,8 @@ fn should_submit_signed_transaction_on_chain() {
 
 #[test]
 fn should_submit_unsigned_transaction_on_chain_for_any_account() {
-	const PHRASE: &str = "news slush supreme milk chapter athlete soap sausage put clutch what kitten";
+	const PHRASE: &str =
+		"news slush supreme milk chapter athlete soap sausage put clutch what kitten";
 	let (offchain, offchain_state) = testing::TestOffchainExt::new();
 	let (pool, pool_state) = testing::TestTransactionPoolExt::new();
 
@@ -247,8 +243,9 @@ fn should_submit_unsigned_transaction_on_chain_for_any_account() {
 	SyncCryptoStore::sr25519_generate_new(
 		&keystore,
 		crate::crypto::Public::ID,
-		Some(&format!("{}/hunter1", PHRASE))
-	).unwrap();
+		Some(&format!("{}/hunter1", PHRASE)),
+	)
+	.unwrap();
 
 	let public_key = SyncCryptoStore::sr25519_public_keys(&keystore, crate::crypto::Public::ID)
 		.get(0)
@@ -276,13 +273,18 @@ fn should_submit_unsigned_transaction_on_chain_for_any_account() {
 		let tx = pool_state.write().transactions.pop().unwrap();
 		let tx = Extrinsic::decode(&mut &*tx).unwrap();
 		assert_eq!(tx.signature, None);
-		if let Call::Example(crate::Call::submit_price_unsigned_with_signed_payload(body, signature)) = tx.call {
+		if let Call::Example(crate::Call::submit_price_unsigned_with_signed_payload(
+			body,
+			signature,
+		)) = tx.call
+		{
 			assert_eq!(body, price_payload);
 
-			let signature_valid = <PricePayload<
-				<Test as SigningTypes>::Public,
-				<Test as frame_system::Config>::BlockNumber
-					> as SignedPayload<Test>>::verify::<crypto::TestAuthId>(&price_payload, signature);
+			let signature_valid =
+				<PricePayload<
+					<Test as SigningTypes>::Public,
+					<Test as frame_system::Config>::BlockNumber,
+				> as SignedPayload<Test>>::verify::<crypto::TestAuthId>(&price_payload, signature);
 
 			assert!(signature_valid);
 		}
@@ -291,7 +293,8 @@ fn should_submit_unsigned_transaction_on_chain_for_any_account() {
 
 #[test]
 fn should_submit_unsigned_transaction_on_chain_for_all_accounts() {
-	const PHRASE: &str = "news slush supreme milk chapter athlete soap sausage put clutch what kitten";
+	const PHRASE: &str =
+		"news slush supreme milk chapter athlete soap sausage put clutch what kitten";
 	let (offchain, offchain_state) = testing::TestOffchainExt::new();
 	let (pool, pool_state) = testing::TestTransactionPoolExt::new();
 
@@ -300,8 +303,9 @@ fn should_submit_unsigned_transaction_on_chain_for_all_accounts() {
 	SyncCryptoStore::sr25519_generate_new(
 		&keystore,
 		crate::crypto::Public::ID,
-		Some(&format!("{}/hunter1", PHRASE))
-	).unwrap();
+		Some(&format!("{}/hunter1", PHRASE)),
+	)
+	.unwrap();
 
 	let public_key = SyncCryptoStore::sr25519_public_keys(&keystore, crate::crypto::Public::ID)
 		.get(0)
@@ -329,13 +333,18 @@ fn should_submit_unsigned_transaction_on_chain_for_all_accounts() {
 		let tx = pool_state.write().transactions.pop().unwrap();
 		let tx = Extrinsic::decode(&mut &*tx).unwrap();
 		assert_eq!(tx.signature, None);
-		if let Call::Example(crate::Call::submit_price_unsigned_with_signed_payload(body, signature)) = tx.call {
+		if let Call::Example(crate::Call::submit_price_unsigned_with_signed_payload(
+			body,
+			signature,
+		)) = tx.call
+		{
 			assert_eq!(body, price_payload);
 
-			let signature_valid = <PricePayload<
-				<Test as SigningTypes>::Public,
-				<Test as frame_system::Config>::BlockNumber
-					> as SignedPayload<Test>>::verify::<crypto::TestAuthId>(&price_payload, signature);
+			let signature_valid =
+				<PricePayload<
+					<Test as SigningTypes>::Public,
+					<Test as frame_system::Config>::BlockNumber,
+				> as SignedPayload<Test>>::verify::<crypto::TestAuthId>(&price_payload, signature);
 
 			assert!(signature_valid);
 		}
diff --git a/frame/example-parallel/src/lib.rs b/frame/example-parallel/src/lib.rs
index 24668c5b5ab0..c41cd2401dd2 100644
--- a/frame/example-parallel/src/lib.rs
+++ b/frame/example-parallel/src/lib.rs
@@ -24,7 +24,7 @@
 
 use sp_runtime::RuntimeDebug;
 
-use codec::{Encode, Decode};
+use codec::{Decode, Encode};
 use sp_std::vec::Vec;
 
 #[cfg(test)]
@@ -34,9 +34,9 @@ pub use pallet::*;
 
 #[frame_support::pallet]
 pub mod pallet {
+	use super::*;
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
-	use super::*;
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
@@ -65,9 +65,10 @@ pub mod pallet {
 		/// The example utilizes parallel execution by checking half of the
 		/// signatures in spawned task.
 		#[pallet::weight(0)]
-		pub fn enlist_participants(origin: OriginFor<T>, participants: Vec<EnlistedParticipant>)
-			-> DispatchResultWithPostInfo
-		{
+		pub fn enlist_participants(
+			origin: OriginFor<T>,
+			participants: Vec<EnlistedParticipant>,
+		) -> DispatchResultWithPostInfo {
 			let _ = ensure_signed(origin)?;
 
 			if validate_participants_parallel(&<CurrentEventId<T>>::get(), &participants[..]) {
@@ -103,21 +104,20 @@ pub struct EnlistedParticipant {
 impl EnlistedParticipant {
 	fn verify(&self, event_id: &[u8]) -> bool {
 		use sp_core::Public;
-		use std::convert::TryFrom;
 		use sp_runtime::traits::Verify;
+		use std::convert::TryFrom;
 
 		match sp_core::sr25519::Signature::try_from(&self.signature[..]) {
 			Ok(signature) => {
 				let public = sp_core::sr25519::Public::from_slice(self.account.as_ref());
 				signature.verify(event_id, &public)
-			}
-			_ => false
+			},
+			_ => false,
 		}
 	}
 }
 
 fn validate_participants_parallel(event_id: &[u8], participants: &[EnlistedParticipant]) -> bool {
-
 	fn spawn_verify(data: Vec<u8>) -> Vec<u8> {
 		let stream = &mut &data[..];
 		let event_id = Vec::<u8>::decode(stream).expect("Failed to decode");
@@ -138,10 +138,10 @@ fn validate_participants_parallel(event_id: &[u8], participants: &[EnlistedParti
 	let handle = sp_tasks::spawn(spawn_verify, async_payload);
 	let mut result = true;
 
-	for participant in &participants[participants.len()/2+1..] {
+	for participant in &participants[participants.len() / 2 + 1..] {
 		if !participant.verify(event_id) {
 			result = false;
-			break;
+			break
 		}
 	}
 
diff --git a/frame/example-parallel/src/tests.rs b/frame/example-parallel/src/tests.rs
index 395290c0bf6e..f67c5ae51b50 100644
--- a/frame/example-parallel/src/tests.rs
+++ b/frame/example-parallel/src/tests.rs
@@ -20,8 +20,9 @@ use crate::{self as pallet_example_parallel, *};
 use frame_support::parameter_types;
 use sp_core::H256;
 use sp_runtime::{
-	Perbill, testing::Header,
+	testing::Header,
 	traits::{BlakeTwo256, IdentityLookup},
+	Perbill,
 };
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
@@ -108,7 +109,6 @@ fn it_can_enlist() {
 
 		assert_eq!(Example::participants().len(), 2);
 	});
-
 }
 
 #[test]
@@ -146,5 +146,4 @@ fn one_wrong_will_not_enlist_anyone() {
 
 		assert_eq!(Example::participants().len(), 0);
 	});
-
 }
diff --git a/frame/example/src/benchmarking.rs b/frame/example/src/benchmarking.rs
index 64602ca41cee..cdf6c152a488 100644
--- a/frame/example/src/benchmarking.rs
+++ b/frame/example/src/benchmarking.rs
@@ -20,7 +20,7 @@
 #![cfg(feature = "runtime-benchmarks")]
 
 use crate::*;
-use frame_benchmarking::{benchmarks, whitelisted_caller, impl_benchmark_test_suite};
+use frame_benchmarking::{benchmarks, impl_benchmark_test_suite, whitelisted_caller};
 use frame_system::RawOrigin;
 
 // To actually run this benchmark on pallet-example, we need to put this pallet into the
@@ -33,7 +33,7 @@ use frame_system::RawOrigin;
 
 // Details on using the benchmarks macro can be seen at:
 //   https://substrate.dev/rustdocs/v3.0.0/frame_benchmarking/macro.benchmarks.html
-benchmarks!{
+benchmarks! {
 	// This will measure the execution time of `set_dummy` for b in [1..1000] range.
 	set_dummy_benchmark {
 		// This is the benchmark setup phase
diff --git a/frame/example/src/lib.rs b/frame/example/src/lib.rs
index f5014b75640b..48b356df792e 100644
--- a/frame/example/src/lib.rs
+++ b/frame/example/src/lib.rs
@@ -255,25 +255,21 @@
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use sp_std::{
-	prelude::*,
-	marker::PhantomData
-};
+use codec::{Decode, Encode};
 use frame_support::{
-	dispatch::DispatchResult, traits::IsSubType,
-	weights::{DispatchClass, ClassifyDispatch, WeighData, Weight, PaysFee, Pays},
+	dispatch::DispatchResult,
+	traits::IsSubType,
+	weights::{ClassifyDispatch, DispatchClass, Pays, PaysFee, WeighData, Weight},
 };
-use frame_system::{ensure_signed};
-use codec::{Encode, Decode};
+use frame_system::ensure_signed;
+use log::info;
 use sp_runtime::{
-	traits::{
-		SignedExtension, Bounded, SaturatedConversion, DispatchInfoOf, Saturating
-	},
+	traits::{Bounded, DispatchInfoOf, SaturatedConversion, Saturating, SignedExtension},
 	transaction_validity::{
-		ValidTransaction, TransactionValidityError, InvalidTransaction, TransactionValidity,
+		InvalidTransaction, TransactionValidity, TransactionValidityError, ValidTransaction,
 	},
 };
-use log::info;
+use sp_std::{marker::PhantomData, prelude::*};
 
 // Re-export pallet items so that they can be accessed from the crate namespace.
 pub use pallet::*;
@@ -312,8 +308,7 @@ const MILLICENTS: u32 = 1_000_000_000;
 //   fulfilled by running the benchmarking toolchain. Refer to `benchmarking.rs` file.
 struct WeightForSetDummy<T: pallet_balances::Config>(BalanceOf<T>);
 
-impl<T: pallet_balances::Config> WeighData<(&BalanceOf<T>,)> for WeightForSetDummy<T>
-{
+impl<T: pallet_balances::Config> WeighData<(&BalanceOf<T>,)> for WeightForSetDummy<T> {
 	fn weigh_data(&self, target: (&BalanceOf<T>,)) -> Weight {
 		let multiplier = self.0;
 		// *target.0 is the amount passed into the extrinsic
@@ -343,9 +338,9 @@ impl<T: pallet_balances::Config> PaysFee<(&BalanceOf<T>,)> for WeightForSetDummy
 #[frame_support::pallet]
 pub mod pallet {
 	// Import various types used to declare pallet in scope.
+	use super::*;
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
-	use super::*;
 
 	/// Our pallet's configuration trait. All our types and constants go in here. If the
 	/// pallet is dependent on specific other pallets, then their configuration traits
@@ -397,7 +392,7 @@ pub mod pallet {
 			// but we could dispatch extrinsic (transaction/unsigned/inherent) using
 			// sp_io::submit_extrinsic.
 			// To see example on offchain worker, please refer to example-offchain-worker pallet
-		 	// accompanied in this repository.
+			// accompanied in this repository.
 		}
 	}
 
@@ -488,10 +483,7 @@ pub mod pallet {
 		#[pallet::weight(
 			<T as pallet::Config>::WeightInfo::accumulate_dummy((*increase_by).saturated_into())
 		)]
-		pub fn accumulate_dummy(
-			origin: OriginFor<T>,
-			increase_by: T::Balance
-		) -> DispatchResult {
+		pub fn accumulate_dummy(origin: OriginFor<T>, increase_by: T::Balance) -> DispatchResult {
 			// This is a public call, so we ensure that the origin is some signed account.
 			let _sender = ensure_signed(origin)?;
 
@@ -610,11 +602,7 @@ pub mod pallet {
 	#[cfg(feature = "std")]
 	impl<T: Config> Default for GenesisConfig<T> {
 		fn default() -> Self {
-			Self {
-				dummy: Default::default(),
-				bar: Default::default(),
-				foo: Default::default(),
-			}
+			Self { dummy: Default::default(), bar: Default::default(), foo: Default::default() }
 		}
 	}
 
@@ -709,7 +697,9 @@ where
 	type AdditionalSigned = ();
 	type Pre = ();
 
-	fn additional_signed(&self) -> sp_std::result::Result<(), TransactionValidityError> { Ok(()) }
+	fn additional_signed(&self) -> sp_std::result::Result<(), TransactionValidityError> {
+		Ok(())
+	}
 
 	fn validate(
 		&self,
@@ -731,7 +721,7 @@ where
 				let mut valid_tx = ValidTransaction::default();
 				valid_tx.priority = Bounded::max_value();
 				Ok(valid_tx)
-			}
+			},
 			_ => Ok(Default::default()),
 		}
 	}
diff --git a/frame/example/src/tests.rs b/frame/example/src/tests.rs
index 68a923792180..18089888dba1 100644
--- a/frame/example/src/tests.rs
+++ b/frame/example/src/tests.rs
@@ -20,14 +20,16 @@
 use crate::*;
 use frame_support::{
 	assert_ok, parameter_types,
-	weights::{DispatchInfo, GetDispatchInfo}, traits::OnInitialize
+	traits::OnInitialize,
+	weights::{DispatchInfo, GetDispatchInfo},
 };
 use sp_core::H256;
 // The testing primitives are very useful for avoiding having to work with signatures
 // or public keys. `u64` is used as the `AccountId` and no `Signature`s are required.
 use sp_runtime::{
-	testing::Header, BuildStorage,
+	testing::Header,
 	traits::{BlakeTwo256, IdentityLookup},
+	BuildStorage,
 };
 // Reexport crate as its pallet name for construct_runtime.
 use crate as pallet_example;
@@ -115,7 +117,9 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 			bar: vec![(1, 2), (2, 3)],
 			foo: 24,
 		},
-	}.build_storage().unwrap();
+	}
+	.build_storage()
+	.unwrap();
 	t.into()
 }
 
@@ -163,7 +167,8 @@ fn signed_ext_watch_dummy_works() {
 		let info = DispatchInfo::default();
 
 		assert_eq!(
-			WatchDummy::<Test>(PhantomData).validate(&1, &call, &info, 150)
+			WatchDummy::<Test>(PhantomData)
+				.validate(&1, &call, &info, 150)
 				.unwrap()
 				.priority,
 			u64::MAX,
@@ -183,7 +188,6 @@ fn weights_work() {
 	// aka. `let info = <Call<Test> as GetDispatchInfo>::get_dispatch_info(&default_call);`
 	assert!(info1.weight > 0);
 
-
 	// `set_dummy` is simpler than `accumulate_dummy`, and the weight
 	//   should be less.
 	let custom_call = <pallet_example::Call<Test>>::set_dummy(20);
diff --git a/frame/example/src/weights.rs b/frame/example/src/weights.rs
index db6491335c76..efcfdc6729b5 100644
--- a/frame/example/src/weights.rs
+++ b/frame/example/src/weights.rs
@@ -45,6 +45,7 @@
 // ./.maintain/frame-weight-template.hbs
 
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index a11a5172dc95..65512998252a 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -116,25 +116,26 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use sp_std::{prelude::*, marker::PhantomData};
+use codec::{Codec, Encode};
 use frame_support::{
-	weights::{GetDispatchInfo, DispatchInfo, DispatchClass},
+	dispatch::PostDispatchInfo,
 	traits::{
-		OnInitialize, OnIdle, OnFinalize, OnRuntimeUpgrade, OffchainWorker, ExecuteBlock,
-		EnsureInherentsAreFirst,
+		EnsureInherentsAreFirst, ExecuteBlock, OffchainWorker, OnFinalize, OnIdle, OnInitialize,
+		OnRuntimeUpgrade,
 	},
-	dispatch::PostDispatchInfo,
+	weights::{DispatchClass, DispatchInfo, GetDispatchInfo},
 };
+use frame_system::DigestOf;
 use sp_runtime::{
-	generic::Digest, ApplyExtrinsicResult,
+	generic::Digest,
 	traits::{
-		self, Header, Zero, One, Checkable, Applyable, CheckEqual, ValidateUnsigned, NumberFor,
-		Dispatchable, Saturating,
+		self, Applyable, CheckEqual, Checkable, Dispatchable, Header, NumberFor, One, Saturating,
+		ValidateUnsigned, Zero,
 	},
-	transaction_validity::{TransactionValidity, TransactionSource},
+	transaction_validity::{TransactionSource, TransactionValidity},
+	ApplyExtrinsicResult,
 };
-use codec::{Codec, Encode};
-use frame_system::DigestOf;
+use sp_std::{marker::PhantomData, prelude::*};
 
 pub type CheckedOf<E, C> = <E as Checkable<C>>::Checked;
 pub type CallOf<E, C> = <CheckedOf<E, C> as Applyable>::Call;
@@ -152,31 +153,29 @@ pub type OriginOf<E, C> = <CallOf<E, C> as Dispatchable>::Origin;
 ///                       already called by `AllPallets`. It will be called before all modules will
 ///                       be called.
 pub struct Executive<System, Block, Context, UnsignedValidator, AllPallets, OnRuntimeUpgrade = ()>(
-	PhantomData<(System, Block, Context, UnsignedValidator, AllPallets, OnRuntimeUpgrade)>
+	PhantomData<(System, Block, Context, UnsignedValidator, AllPallets, OnRuntimeUpgrade)>,
 );
 
 impl<
-	System: frame_system::Config + EnsureInherentsAreFirst<Block>,
-	Block: traits::Block<Header=System::Header, Hash=System::Hash>,
-	Context: Default,
-	UnsignedValidator,
-	AllPallets:
-		OnRuntimeUpgrade +
-		OnInitialize<System::BlockNumber> +
-		OnIdle<System::BlockNumber> +
-		OnFinalize<System::BlockNumber> +
-		OffchainWorker<System::BlockNumber>,
-	COnRuntimeUpgrade: OnRuntimeUpgrade,
-> ExecuteBlock<Block> for
-	Executive<System, Block, Context, UnsignedValidator, AllPallets, COnRuntimeUpgrade>
+		System: frame_system::Config + EnsureInherentsAreFirst<Block>,
+		Block: traits::Block<Header = System::Header, Hash = System::Hash>,
+		Context: Default,
+		UnsignedValidator,
+		AllPallets: OnRuntimeUpgrade
+			+ OnInitialize<System::BlockNumber>
+			+ OnIdle<System::BlockNumber>
+			+ OnFinalize<System::BlockNumber>
+			+ OffchainWorker<System::BlockNumber>,
+		COnRuntimeUpgrade: OnRuntimeUpgrade,
+	> ExecuteBlock<Block>
+	for Executive<System, Block, Context, UnsignedValidator, AllPallets, COnRuntimeUpgrade>
 where
 	Block::Extrinsic: Checkable<Context> + Codec,
-	CheckedOf<Block::Extrinsic, Context>:
-		Applyable +
-		GetDispatchInfo,
-	CallOf<Block::Extrinsic, Context>: Dispatchable<Info=DispatchInfo, PostInfo=PostDispatchInfo>,
+	CheckedOf<Block::Extrinsic, Context>: Applyable + GetDispatchInfo,
+	CallOf<Block::Extrinsic, Context>:
+		Dispatchable<Info = DispatchInfo, PostInfo = PostDispatchInfo>,
 	OriginOf<Block::Extrinsic, Context>: From<Option<System::AccountId>>,
-	UnsignedValidator: ValidateUnsigned<Call=CallOf<Block::Extrinsic, Context>>,
+	UnsignedValidator: ValidateUnsigned<Call = CallOf<Block::Extrinsic, Context>>,
 {
 	fn execute_block(block: Block) {
 		Executive::<
@@ -249,20 +248,16 @@ where
 		sp_io::init_tracing();
 		sp_tracing::enter_span!(sp_tracing::Level::TRACE, "init_block");
 		let digests = Self::extract_pre_digest(&header);
-		Self::initialize_block_impl(
-			header.number(),
-			header.parent_hash(),
-			&digests
-		);
+		Self::initialize_block_impl(header.number(), header.parent_hash(), &digests);
 	}
 
 	fn extract_pre_digest(header: &System::Header) -> DigestOf<System> {
 		let mut digest = <DigestOf<System>>::default();
-		header.digest().logs()
-			.iter()
-			.for_each(|d| if d.as_pre_runtime().is_some() {
+		header.digest().logs().iter().for_each(|d| {
+			if d.as_pre_runtime().is_some() {
 				digest.push(d.clone())
-			});
+			}
+		});
 		digest
 	}
 
@@ -281,16 +276,19 @@ where
 			digest,
 			frame_system::InitKind::Full,
 		);
+		weight = weight.saturating_add(<frame_system::Pallet<System> as OnInitialize<
+			System::BlockNumber,
+		>>::on_initialize(*block_number));
 		weight = weight.saturating_add(
-			<frame_system::Pallet<System> as OnInitialize<System::BlockNumber>>::on_initialize(*block_number)
+			<AllPallets as OnInitialize<System::BlockNumber>>::on_initialize(*block_number),
 		);
 		weight = weight.saturating_add(
-			<AllPallets as OnInitialize<System::BlockNumber>>::on_initialize(*block_number)
+			<System::BlockWeights as frame_support::traits::Get<_>>::get().base_block,
 		);
-		weight = weight.saturating_add(
-			<System::BlockWeights as frame_support::traits::Get<_>>::get().base_block
+		<frame_system::Pallet<System>>::register_extra_weight_unchecked(
+			weight,
+			DispatchClass::Mandatory,
 		);
-		<frame_system::Pallet::<System>>::register_extra_weight_unchecked(weight, DispatchClass::Mandatory);
 
 		frame_system::Pallet::<System>::note_finished_initialize();
 	}
@@ -317,8 +315,9 @@ where
 		// Check that `parent_hash` is correct.
 		let n = header.number().clone();
 		assert!(
-			n > System::BlockNumber::zero()
-			&& <frame_system::Pallet<System>>::block_hash(n - System::BlockNumber::one()) == *header.parent_hash(),
+			n > System::BlockNumber::zero() &&
+				<frame_system::Pallet<System>>::block_hash(n - System::BlockNumber::one()) ==
+					*header.parent_hash(),
 			"Parent hash should be valid.",
 		);
 
@@ -358,9 +357,11 @@ where
 		extrinsics: Vec<Block::Extrinsic>,
 		block_number: NumberFor<Block>,
 	) {
-		extrinsics.into_iter().for_each(|e| if let Err(e) = Self::apply_extrinsic(e) {
-			let err: &'static str = e.into();
-			panic!("{}", err)
+		extrinsics.into_iter().for_each(|e| {
+			if let Err(e) = Self::apply_extrinsic(e) {
+				let err: &'static str = e.into();
+				panic!("{}", err)
+			}
 		});
 
 		// post-extrinsics book-keeping
@@ -373,7 +374,7 @@ where
 	/// except state-root.
 	pub fn finalize_block() -> System::Header {
 		sp_io::init_tracing();
-		sp_tracing::enter_span!( sp_tracing::Level::TRACE, "finalize_block" );
+		sp_tracing::enter_span!(sp_tracing::Level::TRACE, "finalize_block");
 		<frame_system::Pallet<System>>::note_finished_extrinsics();
 		let block_number = <frame_system::Pallet<System>>::block_number();
 
@@ -383,26 +384,31 @@ where
 	}
 
 	fn idle_and_finalize_hook(block_number: NumberFor<Block>) {
-		let weight =  <frame_system::Pallet<System>>::block_weight();
-		let max_weight =  <System::BlockWeights as frame_support::traits::Get<_>>::get().max_block;
+		let weight = <frame_system::Pallet<System>>::block_weight();
+		let max_weight = <System::BlockWeights as frame_support::traits::Get<_>>::get().max_block;
 		let mut remaining_weight = max_weight.saturating_sub(weight.total());
 
 		if remaining_weight > 0 {
 			let mut used_weight =
 				<frame_system::Pallet<System> as OnIdle<System::BlockNumber>>::on_idle(
 					block_number,
-					remaining_weight
+					remaining_weight,
 				);
 			remaining_weight = remaining_weight.saturating_sub(used_weight);
 			used_weight = <AllPallets as OnIdle<System::BlockNumber>>::on_idle(
 				block_number,
-				remaining_weight
+				remaining_weight,
 			)
 			.saturating_add(used_weight);
-			<frame_system::Pallet::<System>>::register_extra_weight_unchecked(used_weight, DispatchClass::Mandatory);
+			<frame_system::Pallet<System>>::register_extra_weight_unchecked(
+				used_weight,
+				DispatchClass::Mandatory,
+			);
 		}
 
-		<frame_system::Pallet<System> as OnFinalize<System::BlockNumber>>::on_finalize(block_number);
+		<frame_system::Pallet<System> as OnFinalize<System::BlockNumber>>::on_finalize(
+			block_number,
+		);
 		<AllPallets as OnFinalize<System::BlockNumber>>::on_finalize(block_number);
 	}
 
@@ -423,10 +429,8 @@ where
 		encoded_len: usize,
 		to_note: Vec<u8>,
 	) -> ApplyExtrinsicResult {
-		sp_tracing::enter_span!(
-			sp_tracing::info_span!("apply_extrinsic",
-				ext=?sp_core::hexdisplay::HexDisplay::from(&uxt.encode()))
-		);
+		sp_tracing::enter_span!(sp_tracing::info_span!("apply_extrinsic",
+				ext=?sp_core::hexdisplay::HexDisplay::from(&uxt.encode())));
 		// Verify that the signature is good.
 		let xt = uxt.check(&Default::default())?;
 
@@ -493,17 +497,17 @@ where
 			frame_system::InitKind::Inspection,
 		);
 
-		enter_span!{ sp_tracing::Level::TRACE, "validate_transaction" };
+		enter_span! { sp_tracing::Level::TRACE, "validate_transaction" };
 
-		let encoded_len = within_span!{ sp_tracing::Level::TRACE, "using_encoded";
+		let encoded_len = within_span! { sp_tracing::Level::TRACE, "using_encoded";
 			uxt.using_encoded(|d| d.len())
 		};
 
-		let xt = within_span!{ sp_tracing::Level::TRACE, "check";
+		let xt = within_span! { sp_tracing::Level::TRACE, "check";
 			uxt.check(&Default::default())
 		}?;
 
-		let dispatch_info = within_span!{ sp_tracing::Level::TRACE, "dispatch_info";
+		let dispatch_info = within_span! { sp_tracing::Level::TRACE, "dispatch_info";
 			xt.get_dispatch_info()
 		};
 
@@ -537,35 +541,34 @@ where
 	}
 }
 
-
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use sp_core::H256;
-	use sp_runtime::{
-		generic::{Era, DigestItem}, DispatchError, testing::{Digest, Header, Block},
-		traits::{Header as HeaderT, BlakeTwo256, IdentityLookup, Block as BlockT},
-		transaction_validity::{
-			InvalidTransaction, ValidTransaction, TransactionValidityError, UnknownTransaction
-		},
-	};
 	use frame_support::{
 		assert_err, parameter_types,
-		weights::{Weight, RuntimeDbWeight, IdentityFee, WeightToFeePolynomial},
 		traits::{Currency, LockIdentifier, LockableCurrency, WithdrawReasons},
+		weights::{IdentityFee, RuntimeDbWeight, Weight, WeightToFeePolynomial},
 	};
-	use frame_system::{
-		Call as SystemCall, ChainContext, LastRuntimeUpgradeInfo,
-	};
-	use pallet_transaction_payment::CurrencyAdapter;
-	use pallet_balances::Call as BalancesCall;
+	use frame_system::{Call as SystemCall, ChainContext, LastRuntimeUpgradeInfo};
 	use hex_literal::hex;
+	use pallet_balances::Call as BalancesCall;
+	use pallet_transaction_payment::CurrencyAdapter;
+	use sp_core::H256;
+	use sp_runtime::{
+		generic::{DigestItem, Era},
+		testing::{Block, Digest, Header},
+		traits::{BlakeTwo256, Block as BlockT, Header as HeaderT, IdentityLookup},
+		transaction_validity::{
+			InvalidTransaction, TransactionValidityError, UnknownTransaction, ValidTransaction,
+		},
+		DispatchError,
+	};
 	const TEST_KEY: &[u8] = &*b":test:key:";
 
 	mod custom {
-		use frame_support::weights::{Weight, DispatchClass};
+		use frame_support::weights::{DispatchClass, Weight};
 		use sp_runtime::transaction_validity::{
-			UnknownTransaction, TransactionSource, TransactionValidity, TransactionValidityError,
+			TransactionSource, TransactionValidity, TransactionValidityError, UnknownTransaction,
 		};
 
 		pub trait Config: frame_system::Config {}
@@ -658,13 +661,10 @@ mod tests {
 					Call::allowed_unsigned(..) => Ok(Default::default()),
 					_ => UnknownTransaction::NoUnsignedValidator.into(),
 				}
-
 			}
 
 			// Inherent call is accepted for being dispatched
-			fn pre_dispatch(
-				call: &Self::Call,
-			) -> Result<(), TransactionValidityError> {
+			fn pre_dispatch(call: &Self::Call) -> Result<(), TransactionValidityError> {
 				match call {
 					Call::allowed_unsigned(..) => Ok(()),
 					Call::inherent_call(..) => Ok(()),
@@ -793,7 +793,7 @@ mod tests {
 		ChainContext<Runtime>,
 		Runtime,
 		AllPallets,
-		CustomOnRuntimeUpgrade
+		CustomOnRuntimeUpgrade,
 	>;
 
 	fn extra(nonce: u64, fee: Balance) -> SignedExtra {
@@ -801,7 +801,7 @@ mod tests {
 			frame_system::CheckEra::from(Era::Immortal),
 			frame_system::CheckNonce::from(nonce),
 			frame_system::CheckWeight::new(),
-			pallet_transaction_payment::ChargeTransactionPayment::from(fee)
+			pallet_transaction_payment::ChargeTransactionPayment::from(fee),
 		)
 	}
 
@@ -812,14 +812,16 @@ mod tests {
 	#[test]
 	fn balance_transfer_dispatch_works() {
 		let mut t = frame_system::GenesisConfig::default().build_storage::<Runtime>().unwrap();
-		pallet_balances::GenesisConfig::<Runtime> {
-			balances: vec![(1, 211)],
-		}.assimilate_storage(&mut t).unwrap();
+		pallet_balances::GenesisConfig::<Runtime> { balances: vec![(1, 211)] }
+			.assimilate_storage(&mut t)
+			.unwrap();
 		let xt = TestXt::new(Call::Balances(BalancesCall::transfer(2, 69)), sign_extra(1, 0, 0));
 		let weight = xt.get_dispatch_info().weight +
-			<Runtime as frame_system::Config>::BlockWeights::get().get(DispatchClass::Normal).base_extrinsic;
-		let fee: Balance
-			= <Runtime as pallet_transaction_payment::Config>::WeightToFee::calc(&weight);
+			<Runtime as frame_system::Config>::BlockWeights::get()
+				.get(DispatchClass::Normal)
+				.base_extrinsic;
+		let fee: Balance =
+			<Runtime as pallet_transaction_payment::Config>::WeightToFee::calc(&weight);
 		let mut t = sp_io::TestExternalities::new(t);
 		t.execute_with(|| {
 			Executive::initialize_block(&Header::new(
@@ -838,9 +840,9 @@ mod tests {
 
 	fn new_test_ext(balance_factor: Balance) -> sp_io::TestExternalities {
 		let mut t = frame_system::GenesisConfig::default().build_storage::<Runtime>().unwrap();
-		pallet_balances::GenesisConfig::<Runtime> {
-			balances: vec![(1, 111 * balance_factor)],
-		}.assimilate_storage(&mut t).unwrap();
+		pallet_balances::GenesisConfig::<Runtime> { balances: vec![(1, 111 * balance_factor)] }
+			.assimilate_storage(&mut t)
+			.unwrap();
 		t.into()
 	}
 
@@ -851,9 +853,15 @@ mod tests {
 				header: Header {
 					parent_hash: [69u8; 32].into(),
 					number: 1,
-					state_root: hex!("1039e1a4bd0cf5deefe65f313577e70169c41c7773d6acf31ca8d671397559f5").into(),
-					extrinsics_root: hex!("03170a2e7597b7b7e3d84c05391d139a62b157e78786d8c082f29dcf4c111314").into(),
-					digest: Digest { logs: vec![], },
+					state_root: hex!(
+						"1039e1a4bd0cf5deefe65f313577e70169c41c7773d6acf31ca8d671397559f5"
+					)
+					.into(),
+					extrinsics_root: hex!(
+						"03170a2e7597b7b7e3d84c05391d139a62b157e78786d8c082f29dcf4c111314"
+					)
+					.into(),
+					digest: Digest { logs: vec![] },
 				},
 				extrinsics: vec![],
 			});
@@ -869,8 +877,11 @@ mod tests {
 					parent_hash: [69u8; 32].into(),
 					number: 1,
 					state_root: [0u8; 32].into(),
-					extrinsics_root: hex!("03170a2e7597b7b7e3d84c05391d139a62b157e78786d8c082f29dcf4c111314").into(),
-					digest: Digest { logs: vec![], },
+					extrinsics_root: hex!(
+						"03170a2e7597b7b7e3d84c05391d139a62b157e78786d8c082f29dcf4c111314"
+					)
+					.into(),
+					digest: Digest { logs: vec![] },
 				},
 				extrinsics: vec![],
 			});
@@ -885,9 +896,12 @@ mod tests {
 				header: Header {
 					parent_hash: [69u8; 32].into(),
 					number: 1,
-					state_root: hex!("49cd58a254ccf6abc4a023d9a22dcfc421e385527a250faec69f8ad0d8ed3e48").into(),
+					state_root: hex!(
+						"49cd58a254ccf6abc4a023d9a22dcfc421e385527a250faec69f8ad0d8ed3e48"
+					)
+					.into(),
 					extrinsics_root: [0u8; 32].into(),
-					digest: Digest { logs: vec![], },
+					digest: Digest { logs: vec![] },
 				},
 				extrinsics: vec![],
 			});
@@ -907,7 +921,8 @@ mod tests {
 				[69u8; 32].into(),
 				Digest::default(),
 			));
-			assert_err!(Executive::apply_extrinsic(xt),
+			assert_err!(
+				Executive::apply_extrinsic(xt),
 				TransactionValidityError::Invalid(InvalidTransaction::Future)
 			);
 			assert_eq!(<frame_system::Pallet<Runtime>>::extrinsic_index(), Some(0));
@@ -924,8 +939,7 @@ mod tests {
 		// on_initialize weight + base block execution weight
 		let block_weights = <Runtime as frame_system::Config>::BlockWeights::get();
 		let base_block_weight = 175 + block_weights.base_block;
-		let limit = block_weights.get(DispatchClass::Normal).max_total.unwrap()
-			- base_block_weight;
+		let limit = block_weights.get(DispatchClass::Normal).max_total.unwrap() - base_block_weight;
 		let num_to_exhaust_block = limit / (encoded_len + 5);
 		t.execute_with(|| {
 			Executive::initialize_block(&Header::new(
@@ -940,7 +954,8 @@ mod tests {
 
 			for nonce in 0..=num_to_exhaust_block {
 				let xt = TestXt::new(
-					Call::Balances(BalancesCall::transfer(33, 0)), sign_extra(1, nonce.into(), 0),
+					Call::Balances(BalancesCall::transfer(33, 0)),
+					sign_extra(1, nonce.into(), 0),
 				);
 				let res = Executive::apply_extrinsic(xt);
 				if nonce != num_to_exhaust_block {
@@ -950,7 +965,10 @@ mod tests {
 						//--------------------- on_initialize + block_execution + extrinsic_base weight
 						(encoded_len + 5) * (nonce + 1) + base_block_weight,
 					);
-					assert_eq!(<frame_system::Pallet<Runtime>>::extrinsic_index(), Some(nonce as u32 + 1));
+					assert_eq!(
+						<frame_system::Pallet<Runtime>>::extrinsic_index(),
+						Some(nonce as u32 + 1)
+					);
 				} else {
 					assert_eq!(res, Err(InvalidTransaction::ExhaustsResources.into()));
 				}
@@ -967,7 +985,8 @@ mod tests {
 		let mut t = new_test_ext(1);
 		t.execute_with(|| {
 			// Block execution weight + on_initialize weight from custom module
-			let base_block_weight = 175 + <Runtime as frame_system::Config>::BlockWeights::get().base_block;
+			let base_block_weight =
+				175 + <Runtime as frame_system::Config>::BlockWeights::get().base_block;
 
 			Executive::initialize_block(&Header::new(
 				1,
@@ -985,8 +1004,10 @@ mod tests {
 			assert!(Executive::apply_extrinsic(x2.clone()).unwrap().is_ok());
 
 			// default weight for `TestXt` == encoded length.
-			let extrinsic_weight = len as Weight + <Runtime as frame_system::Config>::BlockWeights
-				::get().get(DispatchClass::Normal).base_extrinsic;
+			let extrinsic_weight = len as Weight +
+				<Runtime as frame_system::Config>::BlockWeights::get()
+					.get(DispatchClass::Normal)
+					.base_extrinsic;
 			assert_eq!(
 				<frame_system::Pallet<Runtime>>::block_weight().total(),
 				base_block_weight + 3 * extrinsic_weight,
@@ -1051,20 +1072,14 @@ mod tests {
 			let mut t = new_test_ext(1);
 			t.execute_with(|| {
 				<pallet_balances::Pallet<Runtime> as LockableCurrency<Balance>>::set_lock(
-					id,
-					&1,
-					110,
-					lock,
-				);
-				let xt = TestXt::new(
-					Call::System(SystemCall::remark(vec![1u8])),
-					sign_extra(1, 0, 0),
+					id, &1, 110, lock,
 				);
-				let weight = xt.get_dispatch_info().weight + <Runtime as frame_system::Config>
-					::BlockWeights
-					::get()
-					.get(DispatchClass::Normal)
-					.base_extrinsic;
+				let xt =
+					TestXt::new(Call::System(SystemCall::remark(vec![1u8])), sign_extra(1, 0, 0));
+				let weight = xt.get_dispatch_info().weight +
+					<Runtime as frame_system::Config>::BlockWeights::get()
+						.get(DispatchClass::Normal)
+						.base_extrinsic;
 				let fee: Balance =
 					<Runtime as pallet_transaction_payment::Config>::WeightToFee::calc(&weight);
 				Executive::initialize_block(&Header::new(
@@ -1096,13 +1111,12 @@ mod tests {
 	#[test]
 	fn block_hooks_weight_is_stored() {
 		new_test_ext(1).execute_with(|| {
-
 			Executive::initialize_block(&Header::new_from_number(1));
 			Executive::finalize_block();
 			// NOTE: might need updates over time if new weights are introduced.
 			// For now it only accounts for the base block execution weight and
 			// the `on_initialize` weight defined in the custom test module.
-			assert_eq!(<frame_system::Pallet<Runtime>>::block_weight().total(), 175 + 175  + 10);
+			assert_eq!(<frame_system::Pallet<Runtime>>::block_weight().total(), 175 + 175 + 10);
 		})
 	}
 
@@ -1114,9 +1128,9 @@ mod tests {
 			assert!(frame_system::LastRuntimeUpgrade::<Runtime>::exists());
 			assert!(!Executive::runtime_upgraded());
 
-			RUNTIME_VERSION.with(|v| *v.borrow_mut() = sp_version::RuntimeVersion {
-				spec_version: 1,
-				..Default::default()
+			RUNTIME_VERSION.with(|v| {
+				*v.borrow_mut() =
+					sp_version::RuntimeVersion { spec_version: 1, ..Default::default() }
 			});
 			assert!(Executive::runtime_upgraded());
 			assert_eq!(
@@ -1124,10 +1138,12 @@ mod tests {
 				frame_system::LastRuntimeUpgrade::<Runtime>::get(),
 			);
 
-			RUNTIME_VERSION.with(|v| *v.borrow_mut() = sp_version::RuntimeVersion {
-				spec_version: 1,
-				spec_name: "test".into(),
-				..Default::default()
+			RUNTIME_VERSION.with(|v| {
+				*v.borrow_mut() = sp_version::RuntimeVersion {
+					spec_version: 1,
+					spec_name: "test".into(),
+					..Default::default()
+				}
 			});
 			assert!(Executive::runtime_upgraded());
 			assert_eq!(
@@ -1135,11 +1151,13 @@ mod tests {
 				frame_system::LastRuntimeUpgrade::<Runtime>::get(),
 			);
 
-			RUNTIME_VERSION.with(|v| *v.borrow_mut() = sp_version::RuntimeVersion {
-				spec_version: 1,
-				spec_name: "test".into(),
-				impl_version: 2,
-				..Default::default()
+			RUNTIME_VERSION.with(|v| {
+				*v.borrow_mut() = sp_version::RuntimeVersion {
+					spec_version: 1,
+					spec_name: "test".into(),
+					impl_version: 2,
+					..Default::default()
+				}
 			});
 			assert!(!Executive::runtime_upgraded());
 
@@ -1182,9 +1200,9 @@ mod tests {
 	fn custom_runtime_upgrade_is_called_before_modules() {
 		new_test_ext(1).execute_with(|| {
 			// Make sure `on_runtime_upgrade` is called.
-			RUNTIME_VERSION.with(|v| *v.borrow_mut() = sp_version::RuntimeVersion {
-				spec_version: 1,
-				..Default::default()
+			RUNTIME_VERSION.with(|v| {
+				*v.borrow_mut() =
+					sp_version::RuntimeVersion { spec_version: 1, ..Default::default() }
 			});
 
 			Executive::initialize_block(&Header::new(
@@ -1251,9 +1269,9 @@ mod tests {
 	fn all_weights_are_recorded_correctly() {
 		new_test_ext(1).execute_with(|| {
 			// Make sure `on_runtime_upgrade` is called for maximum complexity
-			RUNTIME_VERSION.with(|v| *v.borrow_mut() = sp_version::RuntimeVersion {
-				spec_version: 1,
-				..Default::default()
+			RUNTIME_VERSION.with(|v| {
+				*v.borrow_mut() =
+					sp_version::RuntimeVersion { spec_version: 1, ..Default::default() }
 			});
 
 			let block_number = 1;
@@ -1270,19 +1288,21 @@ mod tests {
 			let frame_system_upgrade_weight = frame_system::Pallet::<Runtime>::on_runtime_upgrade();
 			let custom_runtime_upgrade_weight = CustomOnRuntimeUpgrade::on_runtime_upgrade();
 			let runtime_upgrade_weight = <AllPallets as OnRuntimeUpgrade>::on_runtime_upgrade();
-			let frame_system_on_initialize_weight = frame_system::Pallet::<Runtime>::on_initialize(block_number);
-			let on_initialize_weight = <AllPallets as OnInitialize<u64>>::on_initialize(block_number);
-			let base_block_weight = <Runtime as frame_system::Config>::BlockWeights::get().base_block;
+			let frame_system_on_initialize_weight =
+				frame_system::Pallet::<Runtime>::on_initialize(block_number);
+			let on_initialize_weight =
+				<AllPallets as OnInitialize<u64>>::on_initialize(block_number);
+			let base_block_weight =
+				<Runtime as frame_system::Config>::BlockWeights::get().base_block;
 
 			// Weights are recorded correctly
 			assert_eq!(
 				frame_system::Pallet::<Runtime>::block_weight().total(),
 				frame_system_upgrade_weight +
-				custom_runtime_upgrade_weight +
-				runtime_upgrade_weight +
-				frame_system_on_initialize_weight +
-				on_initialize_weight +
-				base_block_weight,
+					custom_runtime_upgrade_weight +
+					runtime_upgrade_weight +
+					frame_system_on_initialize_weight +
+					on_initialize_weight + base_block_weight,
 			);
 		});
 	}
@@ -1294,13 +1314,8 @@ mod tests {
 			let mut digest = Digest::default();
 			digest.push(DigestItem::Seal([1, 2, 3, 4], vec![5, 6, 7, 8]));
 
-			let header = Header::new(
-				1,
-				H256::default(),
-				H256::default(),
-				parent_hash,
-				digest.clone(),
-			);
+			let header =
+				Header::new(1, H256::default(), H256::default(), parent_hash, digest.clone());
 
 			Executive::offchain_worker(&header);
 
diff --git a/frame/gilt/src/benchmarking.rs b/frame/gilt/src/benchmarking.rs
index 2ee7bffd9410..73e1c9a901cb 100644
--- a/frame/gilt/src/benchmarking.rs
+++ b/frame/gilt/src/benchmarking.rs
@@ -19,17 +19,21 @@
 
 #![cfg(feature = "runtime-benchmarks")]
 
-use sp_std::prelude::*;
 use super::*;
-use sp_runtime::traits::{Zero, Bounded};
-use sp_arithmetic::Perquintill;
+use frame_benchmarking::{benchmarks, impl_benchmark_test_suite, whitelisted_caller};
+use frame_support::{
+	dispatch::UnfilteredDispatchable,
+	traits::{Currency, EnsureOrigin, Get},
+};
 use frame_system::RawOrigin;
-use frame_benchmarking::{benchmarks, whitelisted_caller, impl_benchmark_test_suite};
-use frame_support::{traits::{Currency, Get, EnsureOrigin}, dispatch::UnfilteredDispatchable};
+use sp_arithmetic::Perquintill;
+use sp_runtime::traits::{Bounded, Zero};
+use sp_std::prelude::*;
 
 use crate::Pallet as Gilt;
 
-type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+type BalanceOf<T> =
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 
 benchmarks! {
 	place_bid {
@@ -129,8 +133,4 @@ benchmarks! {
 	}: { Gilt::<T>::pursue_target(q) }
 }
 
-impl_benchmark_test_suite!(
-	Gilt,
-	crate::mock::new_test_ext(),
-	crate::mock::Test,
-);
+impl_benchmark_test_suite!(Gilt, crate::mock::new_test_ext(), crate::mock::Test,);
diff --git a/frame/gilt/src/lib.rs b/frame/gilt/src/lib.rs
index 6956191ecb4d..3803d78c0531 100644
--- a/frame/gilt/src/lib.rs
+++ b/frame/gilt/src/lib.rs
@@ -67,28 +67,33 @@
 
 pub use pallet::*;
 
+mod benchmarking;
 #[cfg(test)]
 mod mock;
 #[cfg(test)]
 mod tests;
-mod benchmarking;
 pub mod weights;
 
 #[frame_support::pallet]
 pub mod pallet {
-	use sp_std::prelude::*;
-	use sp_arithmetic::{Perquintill, PerThing};
-	use sp_runtime::traits::{Zero, Saturating};
-	use frame_support::traits::{Currency, OnUnbalanced, ReservableCurrency};
-	use frame_support::pallet_prelude::*;
-	use frame_system::pallet_prelude::*;
 	pub use crate::weights::WeightInfo;
+	use frame_support::{
+		pallet_prelude::*,
+		traits::{Currency, OnUnbalanced, ReservableCurrency},
+	};
+	use frame_system::pallet_prelude::*;
+	use sp_arithmetic::{PerThing, Perquintill};
+	use sp_runtime::traits::{Saturating, Zero};
+	use sp_std::prelude::*;
 
-	type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
-	type PositiveImbalanceOf<T> =
-		<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::PositiveImbalance;
-	type NegativeImbalanceOf<T> =
-		<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
+	type BalanceOf<T> =
+		<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+	type PositiveImbalanceOf<T> = <<T as Config>::Currency as Currency<
+		<T as frame_system::Config>::AccountId,
+	>>::PositiveImbalance;
+	type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<
+		<T as frame_system::Config>::AccountId,
+	>>::NegativeImbalance;
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
@@ -96,13 +101,17 @@ pub mod pallet {
 		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
 
 		/// Currency type that this works on.
-		type Currency: ReservableCurrency<Self::AccountId, Balance=Self::CurrencyBalance>;
+		type Currency: ReservableCurrency<Self::AccountId, Balance = Self::CurrencyBalance>;
 
 		/// Just the `Currency::Balance` type; we have this item to allow us to constrain it to
 		/// `From<u64>`.
-		type CurrencyBalance:
-			sp_runtime::traits::AtLeast32BitUnsigned + codec::FullCodec + Copy
-				+ MaybeSerializeDeserialize + sp_std::fmt::Debug + Default + From<u64>;
+		type CurrencyBalance: sp_runtime::traits::AtLeast32BitUnsigned
+			+ codec::FullCodec
+			+ Copy
+			+ MaybeSerializeDeserialize
+			+ sp_std::fmt::Debug
+			+ Default
+			+ From<u64>;
 
 		/// Origin required for setting the target proportion to be under gilt.
 		type AdminOrigin: EnsureOrigin<Self::Origin>;
@@ -227,13 +236,8 @@ pub mod pallet {
 
 	/// The queues of bids ready to become gilts. Indexed by duration (in `Period`s).
 	#[pallet::storage]
-	pub type Queues<T: Config> = StorageMap<
-		_,
-		Blake2_128Concat,
-		u32,
-		Vec<GiltBid<BalanceOf<T>, T::AccountId>>,
-		ValueQuery,
-	>;
+	pub type Queues<T: Config> =
+		StorageMap<_, Blake2_128Concat, u32, Vec<GiltBid<BalanceOf<T>, T::AccountId>>, ValueQuery>;
 
 	/// Information relating to the gilts currently active.
 	#[pallet::storage]
@@ -245,7 +249,11 @@ pub mod pallet {
 		_,
 		Blake2_128Concat,
 		ActiveIndex,
-		ActiveGilt<BalanceOf<T>, <T as frame_system::Config>::AccountId, <T as frame_system::Config>::BlockNumber>,
+		ActiveGilt<
+			BalanceOf<T>,
+			<T as frame_system::Config>::AccountId,
+			<T as frame_system::Config>::BlockNumber,
+		>,
 		OptionQuery,
 	>;
 
@@ -255,7 +263,7 @@ pub mod pallet {
 
 	#[pallet::genesis_build]
 	impl<T: Config> GenesisBuild<T> for GenesisConfig {
-	 	fn build(&self) {
+		fn build(&self) {
 			QueueTotals::<T>::put(vec![(0, BalanceOf::<T>::zero()); T::QueueCount::get() as usize]);
 		}
 	}
@@ -311,7 +319,7 @@ pub mod pallet {
 	}
 
 	#[pallet::call]
-	impl<T:Config> Pallet<T> {
+	impl<T: Config> Pallet<T> {
 		/// Place a bid for a gilt to be issued.
 		///
 		/// Origin must be Signed, and account must have at least `amount` in free balance.
@@ -335,35 +343,35 @@ pub mod pallet {
 
 			ensure!(amount >= T::MinFreeze::get(), Error::<T>::AmountTooSmall);
 			let queue_count = T::QueueCount::get() as usize;
-			let queue_index = duration.checked_sub(1)
-				.ok_or(Error::<T>::DurationTooSmall)? as usize;
+			let queue_index = duration.checked_sub(1).ok_or(Error::<T>::DurationTooSmall)? as usize;
 			ensure!(queue_index < queue_count, Error::<T>::DurationTooBig);
 
-			let net = Queues::<T>::try_mutate(duration, |q|
-				-> Result<(u32, BalanceOf::<T>), DispatchError>
-			{
-				let queue_full = q.len() == T::MaxQueueLen::get() as usize;
-				ensure!(!queue_full || q[0].amount < amount, Error::<T>::BidTooLow);
-				T::Currency::reserve(&who, amount)?;
-
-				// queue is <Ordered: Lowest ... Highest><Fifo: Last ... First>
-				let mut bid = GiltBid { amount, who: who.clone() };
-				let net = if queue_full {
-					sp_std::mem::swap(&mut q[0], &mut bid);
-					T::Currency::unreserve(&bid.who, bid.amount);
-					(0, amount - bid.amount)
-				} else {
-					q.insert(0, bid);
-					(1, amount)
-				};
-
-				let sorted_item_count = q.len().saturating_sub(T::FifoQueueLen::get() as usize);
-				if sorted_item_count > 1 {
-					q[0..sorted_item_count].sort_by_key(|x| x.amount);
-				}
+			let net = Queues::<T>::try_mutate(
+				duration,
+				|q| -> Result<(u32, BalanceOf<T>), DispatchError> {
+					let queue_full = q.len() == T::MaxQueueLen::get() as usize;
+					ensure!(!queue_full || q[0].amount < amount, Error::<T>::BidTooLow);
+					T::Currency::reserve(&who, amount)?;
+
+					// queue is <Ordered: Lowest ... Highest><Fifo: Last ... First>
+					let mut bid = GiltBid { amount, who: who.clone() };
+					let net = if queue_full {
+						sp_std::mem::swap(&mut q[0], &mut bid);
+						T::Currency::unreserve(&bid.who, bid.amount);
+						(0, amount - bid.amount)
+					} else {
+						q.insert(0, bid);
+						(1, amount)
+					};
+
+					let sorted_item_count = q.len().saturating_sub(T::FifoQueueLen::get() as usize);
+					if sorted_item_count > 1 {
+						q[0..sorted_item_count].sort_by_key(|x| x.amount);
+					}
 
-				Ok(net)
-			})?;
+					Ok(net)
+				},
+			)?;
 			QueueTotals::<T>::mutate(|qs| {
 				qs.resize(queue_count, (0, Zero::zero()));
 				qs[queue_index].0 += net.0;
@@ -390,8 +398,7 @@ pub mod pallet {
 			let who = ensure_signed(origin)?;
 
 			let queue_count = T::QueueCount::get() as usize;
-			let queue_index = duration.checked_sub(1)
-				.ok_or(Error::<T>::DurationTooSmall)? as usize;
+			let queue_index = duration.checked_sub(1).ok_or(Error::<T>::DurationTooSmall)? as usize;
 			ensure!(queue_index < queue_count, Error::<T>::DurationTooBig);
 
 			let bid = GiltBid { amount, who };
@@ -453,11 +460,12 @@ pub mod pallet {
 			Active::<T>::remove(index);
 
 			// Multiply the proportion it is by the total issued.
-			let total_issuance = T::Currency::total_issuance().saturating_sub(T::IgnoredIssuance::get());
+			let total_issuance =
+				T::Currency::total_issuance().saturating_sub(T::IgnoredIssuance::get());
 			ActiveTotal::<T>::mutate(|totals| {
 				let nongilt_issuance = total_issuance.saturating_sub(totals.frozen);
-				let effective_issuance = totals.proportion.left_from_one()
-					.saturating_reciprocal_mul(nongilt_issuance);
+				let effective_issuance =
+					totals.proportion.left_from_one().saturating_reciprocal_mul(nongilt_issuance);
 				let gilt_value = gilt.proportion * effective_issuance;
 
 				totals.frozen = totals.frozen.saturating_sub(gilt.amount);
@@ -518,14 +526,9 @@ pub mod pallet {
 
 			let total_issuance = T::Currency::total_issuance();
 			let non_gilt = total_issuance.saturating_sub(totals.frozen);
-			let effective = totals.proportion.left_from_one()
-				.saturating_reciprocal_mul(non_gilt);
+			let effective = totals.proportion.left_from_one().saturating_reciprocal_mul(non_gilt);
 
-			IssuanceInfo {
-				reserved: totals.frozen,
-				non_gilt,
-				effective,
-			}
+			IssuanceInfo { reserved: totals.frozen, non_gilt, effective }
 		}
 
 		/// Attempt to enlarge our gilt-set from bids in order to satisfy our desired target amount
@@ -535,16 +538,17 @@ pub mod pallet {
 			if totals.proportion < totals.target {
 				let missing = totals.target.saturating_sub(totals.proportion);
 
-				let total_issuance = T::Currency::total_issuance().saturating_sub(T::IgnoredIssuance::get());
+				let total_issuance =
+					T::Currency::total_issuance().saturating_sub(T::IgnoredIssuance::get());
 				let nongilt_issuance = total_issuance.saturating_sub(totals.frozen);
-				let effective_issuance = totals.proportion.left_from_one()
-					.saturating_reciprocal_mul(nongilt_issuance);
+				let effective_issuance =
+					totals.proportion.left_from_one().saturating_reciprocal_mul(nongilt_issuance);
 				let intake = missing * effective_issuance;
 
 				let (bids_taken, queues_hit) = Self::enlarge(intake, max_bids);
 				let first_from_each_queue = T::WeightInfo::pursue_target_per_queue(queues_hit);
 				let rest_from_each_queue = T::WeightInfo::pursue_target_per_item(bids_taken)
-						.saturating_sub(T::WeightInfo::pursue_target_per_item(queues_hit));
+					.saturating_sub(T::WeightInfo::pursue_target_per_item(queues_hit));
 				first_from_each_queue + rest_from_each_queue
 			} else {
 				T::WeightInfo::pursue_target_noop()
@@ -555,11 +559,9 @@ pub mod pallet {
 		/// from the queue.
 		///
 		/// Return the number of bids taken and the number of distinct queues taken from.
-		pub fn enlarge(
-			amount: BalanceOf<T>,
-			max_bids: u32,
-		) -> (u32, u32) {
-			let total_issuance = T::Currency::total_issuance().saturating_sub(T::IgnoredIssuance::get());
+		pub fn enlarge(amount: BalanceOf<T>, max_bids: u32) -> (u32, u32) {
+			let total_issuance =
+				T::Currency::total_issuance().saturating_sub(T::IgnoredIssuance::get());
 			let mut remaining = amount;
 			let mut bids_taken = 0;
 			let mut queues_hit = 0;
@@ -572,7 +574,8 @@ pub mod pallet {
 							continue
 						}
 						let queue_index = duration as usize - 1;
-						let expiry = now.saturating_add(T::Period::get().saturating_mul(duration.into()));
+						let expiry =
+							now.saturating_add(T::Period::get().saturating_mul(duration.into()));
 						Queues::<T>::mutate(duration, |q| {
 							while let Some(mut bid) = q.pop() {
 								if remaining < bid.amount {
@@ -589,7 +592,9 @@ pub mod pallet {
 
 								// Now to activate the bid...
 								let nongilt_issuance = total_issuance.saturating_sub(totals.frozen);
-								let effective_issuance = totals.proportion.left_from_one()
+								let effective_issuance = totals
+									.proportion
+									.left_from_one()
 									.saturating_reciprocal_mul(nongilt_issuance);
 								let n = amount;
 								let d = effective_issuance;
@@ -607,7 +612,7 @@ pub mod pallet {
 								bids_taken += 1;
 
 								if remaining.is_zero() || bids_taken == max_bids {
-									break;
+									break
 								}
 							}
 							queues_hit += 1;
diff --git a/frame/gilt/src/mock.rs b/frame/gilt/src/mock.rs
index aeff70610d4b..91606f185231 100644
--- a/frame/gilt/src/mock.rs
+++ b/frame/gilt/src/mock.rs
@@ -20,11 +20,14 @@
 use crate as pallet_gilt;
 
 use frame_support::{
-	parameter_types, ord_parameter_types,
-	traits::{OnInitialize, OnFinalize, GenesisBuild, Currency},
+	ord_parameter_types, parameter_types,
+	traits::{Currency, GenesisBuild, OnFinalize, OnInitialize},
 };
 use sp_core::H256;
-use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
+use sp_runtime::{
+	testing::Header,
+	traits::{BlakeTwo256, IdentityLookup},
+};
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -125,9 +128,11 @@ impl pallet_gilt::Config for Test {
 // our desired mockup.
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-	pallet_balances::GenesisConfig::<Test>{
+	pallet_balances::GenesisConfig::<Test> {
 		balances: vec![(1, 100), (2, 100), (3, 100), (4, 100)],
-	}.assimilate_storage(&mut t).unwrap();
+	}
+	.assimilate_storage(&mut t)
+	.unwrap();
 	GenesisBuild::<Test>::assimilate_storage(&crate::GenesisConfig, &mut t).unwrap();
 	t.into()
 }
diff --git a/frame/gilt/src/tests.rs b/frame/gilt/src/tests.rs
index 2f328ba904bb..80315141e232 100644
--- a/frame/gilt/src/tests.rs
+++ b/frame/gilt/src/tests.rs
@@ -18,10 +18,10 @@
 //! Tests for Gilt pallet.
 
 use super::*;
-use crate::{Error, mock::*};
-use frame_support::{assert_ok, assert_noop, dispatch::DispatchError, traits::Currency};
-use sp_arithmetic::Perquintill;
+use crate::{mock::*, Error};
+use frame_support::{assert_noop, assert_ok, dispatch::DispatchError, traits::Currency};
 use pallet_balances::Error as BalancesError;
+use sp_arithmetic::Perquintill;
 
 #[test]
 fn basic_setup_works() {
@@ -31,12 +31,15 @@ fn basic_setup_works() {
 		for q in 0..3 {
 			assert!(Queues::<Test>::get(q).is_empty());
 		}
-		assert_eq!(ActiveTotal::<Test>::get(), ActiveGiltsTotal {
-			frozen: 0,
-			proportion: Perquintill::zero(),
-			index: 0,
-			target: Perquintill::zero(),
-		});
+		assert_eq!(
+			ActiveTotal::<Test>::get(),
+			ActiveGiltsTotal {
+				frozen: 0,
+				proportion: Perquintill::zero(),
+				index: 0,
+				target: Perquintill::zero(),
+			}
+		);
 		assert_eq!(QueueTotals::<Test>::get(), vec![(0, 0); 3]);
 	});
 }
@@ -49,12 +52,15 @@ fn set_target_works() {
 		assert_noop!(Gilt::set_target(Origin::signed(2), Perquintill::from_percent(50)), e);
 		assert_ok!(Gilt::set_target(Origin::signed(1), Perquintill::from_percent(50)));
 
-		assert_eq!(ActiveTotal::<Test>::get(), ActiveGiltsTotal {
-			frozen: 0,
-			proportion: Perquintill::zero(),
-			index: 0,
-			target: Perquintill::from_percent(50),
-		});
+		assert_eq!(
+			ActiveTotal::<Test>::get(),
+			ActiveGiltsTotal {
+				frozen: 0,
+				proportion: Perquintill::zero(),
+				index: 0,
+				target: Perquintill::from_percent(50),
+			}
+		);
 	});
 }
 
@@ -63,7 +69,10 @@ fn place_bid_works() {
 	new_test_ext().execute_with(|| {
 		run_to_block(1);
 		assert_noop!(Gilt::place_bid(Origin::signed(1), 1, 2), Error::<Test>::AmountTooSmall);
-		assert_noop!(Gilt::place_bid(Origin::signed(1), 101, 2), BalancesError::<Test>::InsufficientBalance);
+		assert_noop!(
+			Gilt::place_bid(Origin::signed(1), 101, 2),
+			BalancesError::<Test>::InsufficientBalance
+		);
 		assert_noop!(Gilt::place_bid(Origin::signed(1), 10, 4), Error::<Test>::DurationTooBig);
 		assert_ok!(Gilt::place_bid(Origin::signed(1), 10, 2));
 		assert_eq!(Balances::reserved_balance(1), 10);
@@ -86,11 +95,14 @@ fn place_bid_queuing_works() {
 		assert_ok!(Gilt::place_bid(Origin::signed(1), 25, 2));
 		assert_eq!(Balances::reserved_balance(1), 60);
 		assert_noop!(Gilt::place_bid(Origin::signed(1), 10, 2), Error::<Test>::BidTooLow);
-		assert_eq!(Queues::<Test>::get(2), vec![
-			GiltBid { amount: 15, who: 1 },
-			GiltBid { amount: 25, who: 1 },
-			GiltBid { amount: 20, who: 1 },
-		]);
+		assert_eq!(
+			Queues::<Test>::get(2),
+			vec![
+				GiltBid { amount: 15, who: 1 },
+				GiltBid { amount: 25, who: 1 },
+				GiltBid { amount: 20, who: 1 },
+			]
+		);
 		assert_eq!(QueueTotals::<Test>::get(), vec![(0, 0), (3, 60), (0, 0)]);
 	});
 }
@@ -119,17 +131,16 @@ fn multiple_place_bids_works() {
 
 		assert_eq!(Balances::reserved_balance(1), 40);
 		assert_eq!(Balances::reserved_balance(2), 10);
-		assert_eq!(Queues::<Test>::get(1), vec![
-			GiltBid { amount: 10, who: 1 },
-		]);
-		assert_eq!(Queues::<Test>::get(2), vec![
-			GiltBid { amount: 10, who: 2 },
-			GiltBid { amount: 10, who: 1 },
-			GiltBid { amount: 10, who: 1 },
-		]);
-		assert_eq!(Queues::<Test>::get(3), vec![
-			GiltBid { amount: 10, who: 1 },
-		]);
+		assert_eq!(Queues::<Test>::get(1), vec![GiltBid { amount: 10, who: 1 },]);
+		assert_eq!(
+			Queues::<Test>::get(2),
+			vec![
+				GiltBid { amount: 10, who: 2 },
+				GiltBid { amount: 10, who: 1 },
+				GiltBid { amount: 10, who: 1 },
+			]
+		);
+		assert_eq!(Queues::<Test>::get(3), vec![GiltBid { amount: 10, who: 1 },]);
 		assert_eq!(QueueTotals::<Test>::get(), vec![(1, 10), (3, 30), (1, 10)]);
 	});
 }
@@ -144,7 +155,7 @@ fn retract_single_item_queue_works() {
 
 		assert_eq!(Balances::reserved_balance(1), 10);
 		assert_eq!(Queues::<Test>::get(1), vec![]);
-		assert_eq!(Queues::<Test>::get(2), vec![ GiltBid { amount: 10, who: 1 } ]);
+		assert_eq!(Queues::<Test>::get(2), vec![GiltBid { amount: 10, who: 1 }]);
 		assert_eq!(QueueTotals::<Test>::get(), vec![(0, 0), (1, 10), (0, 0)]);
 	});
 }
@@ -161,13 +172,11 @@ fn retract_with_other_and_duplicate_works() {
 		assert_ok!(Gilt::retract_bid(Origin::signed(1), 10, 2));
 		assert_eq!(Balances::reserved_balance(1), 20);
 		assert_eq!(Balances::reserved_balance(2), 10);
-		assert_eq!(Queues::<Test>::get(1), vec![
-			GiltBid { amount: 10, who: 1 },
-		]);
-		assert_eq!(Queues::<Test>::get(2), vec![
-			GiltBid { amount: 10, who: 2 },
-			GiltBid { amount: 10, who: 1 },
-		]);
+		assert_eq!(Queues::<Test>::get(1), vec![GiltBid { amount: 10, who: 1 },]);
+		assert_eq!(
+			Queues::<Test>::get(2),
+			vec![GiltBid { amount: 10, who: 2 }, GiltBid { amount: 10, who: 1 },]
+		);
 		assert_eq!(QueueTotals::<Test>::get(), vec![(1, 10), (2, 20), (0, 0)]);
 	});
 }
@@ -195,22 +204,23 @@ fn basic_enlarge_works() {
 		// Takes 2/2, then stopped because it reaches its max amount
 		assert_eq!(Balances::reserved_balance(1), 40);
 		assert_eq!(Balances::reserved_balance(2), 40);
-		assert_eq!(Queues::<Test>::get(1), vec![ GiltBid { amount: 40, who: 1 } ]);
+		assert_eq!(Queues::<Test>::get(1), vec![GiltBid { amount: 40, who: 1 }]);
 		assert_eq!(Queues::<Test>::get(2), vec![]);
 		assert_eq!(QueueTotals::<Test>::get(), vec![(1, 40), (0, 0), (0, 0)]);
 
-		assert_eq!(ActiveTotal::<Test>::get(), ActiveGiltsTotal {
-			frozen: 40,
-			proportion: Perquintill::from_percent(10),
-			index: 1,
-			target: Perquintill::zero(),
-		});
-		assert_eq!(Active::<Test>::get(0).unwrap(), ActiveGilt {
-			proportion: Perquintill::from_percent(10),
-			amount: 40,
-			who: 2,
-			expiry: 7,
-		});
+		assert_eq!(
+			ActiveTotal::<Test>::get(),
+			ActiveGiltsTotal {
+				frozen: 40,
+				proportion: Perquintill::from_percent(10),
+				index: 1,
+				target: Perquintill::zero(),
+			}
+		);
+		assert_eq!(
+			Active::<Test>::get(0).unwrap(),
+			ActiveGilt { proportion: Perquintill::from_percent(10), amount: 40, who: 2, expiry: 7 }
+		);
 	});
 }
 
@@ -225,29 +235,33 @@ fn enlarge_respects_bids_limit() {
 		Gilt::enlarge(100, 2);
 
 		// Should have taken 4/3 and 2/2, then stopped because it's only allowed 2.
-		assert_eq!(Queues::<Test>::get(1), vec![ GiltBid { amount: 40, who: 1 } ]);
-		assert_eq!(Queues::<Test>::get(2), vec![ GiltBid { amount: 40, who: 3 } ]);
+		assert_eq!(Queues::<Test>::get(1), vec![GiltBid { amount: 40, who: 1 }]);
+		assert_eq!(Queues::<Test>::get(2), vec![GiltBid { amount: 40, who: 3 }]);
 		assert_eq!(Queues::<Test>::get(3), vec![]);
 		assert_eq!(QueueTotals::<Test>::get(), vec![(1, 40), (1, 40), (0, 0)]);
 
-		assert_eq!(Active::<Test>::get(0).unwrap(), ActiveGilt {
-			proportion: Perquintill::from_percent(10),
-			amount: 40,
-			who: 4,
-			expiry: 10,
-		});
-		assert_eq!(Active::<Test>::get(1).unwrap(), ActiveGilt {
-			proportion: Perquintill::from_percent(10),
-			amount: 40,
-			who: 2,
-			expiry: 7,
-		});
-		assert_eq!(ActiveTotal::<Test>::get(), ActiveGiltsTotal {
-			frozen: 80,
-			proportion: Perquintill::from_percent(20),
-			index: 2,
-			target: Perquintill::zero(),
-		});
+		assert_eq!(
+			Active::<Test>::get(0).unwrap(),
+			ActiveGilt {
+				proportion: Perquintill::from_percent(10),
+				amount: 40,
+				who: 4,
+				expiry: 10,
+			}
+		);
+		assert_eq!(
+			Active::<Test>::get(1).unwrap(),
+			ActiveGilt { proportion: Perquintill::from_percent(10), amount: 40, who: 2, expiry: 7 }
+		);
+		assert_eq!(
+			ActiveTotal::<Test>::get(),
+			ActiveGiltsTotal {
+				frozen: 80,
+				proportion: Perquintill::from_percent(20),
+				index: 2,
+				target: Perquintill::zero(),
+			}
+		);
 	});
 }
 
@@ -259,21 +273,22 @@ fn enlarge_respects_amount_limit_and_will_split() {
 		Gilt::enlarge(40, 2);
 
 		// Takes 2/2, then stopped because it reaches its max amount
-		assert_eq!(Queues::<Test>::get(1), vec![ GiltBid { amount: 40, who: 1 } ]);
+		assert_eq!(Queues::<Test>::get(1), vec![GiltBid { amount: 40, who: 1 }]);
 		assert_eq!(QueueTotals::<Test>::get(), vec![(1, 40), (0, 0), (0, 0)]);
 
-		assert_eq!(Active::<Test>::get(0).unwrap(), ActiveGilt {
-			proportion: Perquintill::from_percent(10),
-			amount: 40,
-			who: 1,
-			expiry: 4,
-		});
-		assert_eq!(ActiveTotal::<Test>::get(), ActiveGiltsTotal {
-			frozen: 40,
-			proportion: Perquintill::from_percent(10),
-			index: 1,
-			target: Perquintill::zero(),
-		});
+		assert_eq!(
+			Active::<Test>::get(0).unwrap(),
+			ActiveGilt { proportion: Perquintill::from_percent(10), amount: 40, who: 1, expiry: 4 }
+		);
+		assert_eq!(
+			ActiveTotal::<Test>::get(),
+			ActiveGiltsTotal {
+				frozen: 40,
+				proportion: Perquintill::from_percent(10),
+				index: 1,
+				target: Perquintill::zero(),
+			}
+		);
 	});
 }
 
@@ -290,12 +305,15 @@ fn basic_thaw_works() {
 		assert_noop!(Gilt::thaw(Origin::signed(2), 0), Error::<Test>::NotOwner);
 		assert_ok!(Gilt::thaw(Origin::signed(1), 0));
 
-		assert_eq!(ActiveTotal::<Test>::get(), ActiveGiltsTotal {
-			frozen: 0,
-			proportion: Perquintill::zero(),
-			index: 1,
-			target: Perquintill::zero(),
-		});
+		assert_eq!(
+			ActiveTotal::<Test>::get(),
+			ActiveGiltsTotal {
+				frozen: 0,
+				proportion: Perquintill::zero(),
+				index: 1,
+				target: Perquintill::zero(),
+			}
+		);
 		assert_eq!(Active::<Test>::get(0), None);
 		assert_eq!(Balances::free_balance(1), 100);
 		assert_eq!(Balances::reserved_balance(1), 0);
@@ -426,98 +444,124 @@ fn enlargement_to_target_works() {
 		assert_ok!(Gilt::set_target(Origin::signed(1), Perquintill::from_percent(40)));
 
 		run_to_block(3);
-		assert_eq!(Queues::<Test>::get(1), vec![
-			GiltBid { amount: 40, who: 1 },
-		]);
-		assert_eq!(Queues::<Test>::get(2), vec![
-			GiltBid { amount: 40, who: 2 },
-			GiltBid { amount: 40, who: 1 },
-		]);
-		assert_eq!(Queues::<Test>::get(3), vec![
-			GiltBid { amount: 40, who: 3 },
-			GiltBid { amount: 40, who: 2 },
-		]);
+		assert_eq!(Queues::<Test>::get(1), vec![GiltBid { amount: 40, who: 1 },]);
+		assert_eq!(
+			Queues::<Test>::get(2),
+			vec![GiltBid { amount: 40, who: 2 }, GiltBid { amount: 40, who: 1 },]
+		);
+		assert_eq!(
+			Queues::<Test>::get(3),
+			vec![GiltBid { amount: 40, who: 3 }, GiltBid { amount: 40, who: 2 },]
+		);
 		assert_eq!(QueueTotals::<Test>::get(), vec![(1, 40), (2, 80), (2, 80)]);
 
 		run_to_block(4);
 		// Two new gilts should have been issued to 2 & 3 for 40 each & duration of 3.
-		assert_eq!(Active::<Test>::get(0).unwrap(), ActiveGilt {
-			proportion: Perquintill::from_percent(10),
-			amount: 40,
-			who: 2,
-			expiry: 13,
-		});
-		assert_eq!(Active::<Test>::get(1).unwrap(), ActiveGilt {
-			proportion: Perquintill::from_percent(10),
-			amount: 40,
-			who: 3,
-			expiry: 13,
-
-		});
-		assert_eq!(ActiveTotal::<Test>::get(), ActiveGiltsTotal {
-			frozen: 80,
-			proportion: Perquintill::from_percent(20),
-			index: 2,
-			target: Perquintill::from_percent(40),
-		});
+		assert_eq!(
+			Active::<Test>::get(0).unwrap(),
+			ActiveGilt {
+				proportion: Perquintill::from_percent(10),
+				amount: 40,
+				who: 2,
+				expiry: 13,
+			}
+		);
+		assert_eq!(
+			Active::<Test>::get(1).unwrap(),
+			ActiveGilt {
+				proportion: Perquintill::from_percent(10),
+				amount: 40,
+				who: 3,
+				expiry: 13,
+			}
+		);
+		assert_eq!(
+			ActiveTotal::<Test>::get(),
+			ActiveGiltsTotal {
+				frozen: 80,
+				proportion: Perquintill::from_percent(20),
+				index: 2,
+				target: Perquintill::from_percent(40),
+			}
+		);
 
 		run_to_block(5);
 		// No change
-		assert_eq!(ActiveTotal::<Test>::get(), ActiveGiltsTotal {
-			frozen: 80,
-			proportion: Perquintill::from_percent(20),
-			index: 2,
-			target: Perquintill::from_percent(40),
-		});
+		assert_eq!(
+			ActiveTotal::<Test>::get(),
+			ActiveGiltsTotal {
+				frozen: 80,
+				proportion: Perquintill::from_percent(20),
+				index: 2,
+				target: Perquintill::from_percent(40),
+			}
+		);
 
 		run_to_block(6);
 		// Two new gilts should have been issued to 1 & 2 for 40 each & duration of 2.
-		assert_eq!(Active::<Test>::get(2).unwrap(), ActiveGilt {
-			proportion: Perquintill::from_percent(10),
-			amount: 40,
-			who: 1,
-			expiry: 12,
-		});
-		assert_eq!(Active::<Test>::get(3).unwrap(), ActiveGilt {
-			proportion: Perquintill::from_percent(10),
-			amount: 40,
-			who: 2,
-			expiry: 12,
-
-		});
-		assert_eq!(ActiveTotal::<Test>::get(), ActiveGiltsTotal {
-			frozen: 160,
-			proportion: Perquintill::from_percent(40),
-			index: 4,
-			target: Perquintill::from_percent(40),
-		});
+		assert_eq!(
+			Active::<Test>::get(2).unwrap(),
+			ActiveGilt {
+				proportion: Perquintill::from_percent(10),
+				amount: 40,
+				who: 1,
+				expiry: 12,
+			}
+		);
+		assert_eq!(
+			Active::<Test>::get(3).unwrap(),
+			ActiveGilt {
+				proportion: Perquintill::from_percent(10),
+				amount: 40,
+				who: 2,
+				expiry: 12,
+			}
+		);
+		assert_eq!(
+			ActiveTotal::<Test>::get(),
+			ActiveGiltsTotal {
+				frozen: 160,
+				proportion: Perquintill::from_percent(40),
+				index: 4,
+				target: Perquintill::from_percent(40),
+			}
+		);
 
 		run_to_block(8);
 		// No change now.
-		assert_eq!(ActiveTotal::<Test>::get(), ActiveGiltsTotal {
-			frozen: 160,
-			proportion: Perquintill::from_percent(40),
-			index: 4,
-			target: Perquintill::from_percent(40),
-		});
+		assert_eq!(
+			ActiveTotal::<Test>::get(),
+			ActiveGiltsTotal {
+				frozen: 160,
+				proportion: Perquintill::from_percent(40),
+				index: 4,
+				target: Perquintill::from_percent(40),
+			}
+		);
 
 		// Set target a bit higher to use up the remaining bid.
 		assert_ok!(Gilt::set_target(Origin::signed(1), Perquintill::from_percent(60)));
 		run_to_block(10);
 
 		// Two new gilts should have been issued to 1 & 2 for 40 each & duration of 2.
-		assert_eq!(Active::<Test>::get(4).unwrap(), ActiveGilt {
-			proportion: Perquintill::from_percent(10),
-			amount: 40,
-			who: 1,
-			expiry: 13,
-		});
-
-		assert_eq!(ActiveTotal::<Test>::get(), ActiveGiltsTotal {
-			frozen: 200,
-			proportion: Perquintill::from_percent(50),
-			index: 5,
-			target: Perquintill::from_percent(60),
-		});
+		assert_eq!(
+			Active::<Test>::get(4).unwrap(),
+			ActiveGilt {
+				proportion: Perquintill::from_percent(10),
+				amount: 40,
+				who: 1,
+				expiry: 13,
+			}
+		);
+
+		assert_eq!(
+			ActiveTotal::<Test>::get(),
+			ActiveGiltsTotal {
+				frozen: 200,
+				proportion: Perquintill::from_percent(50),
+				index: 5,
+				target: Perquintill::from_percent(60),
+			}
+		);
 	});
 }
diff --git a/frame/gilt/src/weights.rs b/frame/gilt/src/weights.rs
index c9e16c041874..7a12687260a7 100644
--- a/frame/gilt/src/weights.rs
+++ b/frame/gilt/src/weights.rs
@@ -36,6 +36,7 @@
 // --template=./.maintain/frame-weight-template.hbs
 
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
diff --git a/frame/grandpa/src/benchmarking.rs b/frame/grandpa/src/benchmarking.rs
index 1bd65944f0a3..d5372c5687a4 100644
--- a/frame/grandpa/src/benchmarking.rs
+++ b/frame/grandpa/src/benchmarking.rs
@@ -19,7 +19,7 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use super::{*, Pallet as Grandpa};
+use super::{Pallet as Grandpa, *};
 use frame_benchmarking::benchmarks;
 use frame_system::RawOrigin;
 use sp_core::H256;
@@ -106,10 +106,7 @@ mod tests {
 			);
 
 			println!("equivocation_proof: {:?}", equivocation_proof);
-			println!(
-				"equivocation_proof.encode(): {:?}",
-				equivocation_proof.encode()
-			);
+			println!("equivocation_proof.encode(): {:?}", equivocation_proof.encode());
 		});
 	}
 }
diff --git a/frame/grandpa/src/default_weights.rs b/frame/grandpa/src/default_weights.rs
index 63122fcf4b53..edc18a7ff8c9 100644
--- a/frame/grandpa/src/default_weights.rs
+++ b/frame/grandpa/src/default_weights.rs
@@ -19,7 +19,8 @@
 //! This file was not auto-generated.
 
 use frame_support::weights::{
-	Weight, constants::{WEIGHT_PER_MICROS, WEIGHT_PER_NANOS, RocksDbWeight as DbWeight},
+	constants::{RocksDbWeight as DbWeight, WEIGHT_PER_MICROS, WEIGHT_PER_NANOS},
+	Weight,
 };
 
 impl crate::WeightInfo for () {
@@ -48,7 +49,6 @@ impl crate::WeightInfo for () {
 	}
 
 	fn note_stalled() -> Weight {
-		(3 * WEIGHT_PER_MICROS)
-			.saturating_add(DbWeight::get().writes(1))
+		(3 * WEIGHT_PER_MICROS).saturating_add(DbWeight::get().writes(1))
 	}
 }
diff --git a/frame/grandpa/src/equivocation.rs b/frame/grandpa/src/equivocation.rs
index 0383d2d9a9be..2ef106817c3e 100644
--- a/frame/grandpa/src/equivocation.rs
+++ b/frame/grandpa/src/equivocation.rs
@@ -15,7 +15,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//!
 //! An opt-in utility module for reporting equivocations.
 //!
 //! This module defines an offence type for GRANDPA equivocations
@@ -35,7 +34,6 @@
 //! When using this module for enabling equivocation reporting it is required
 //! that the `ValidateUnsigned` for the GRANDPA pallet is used in the runtime
 //! definition.
-//!
 
 use sp_std::prelude::*;
 
@@ -54,7 +52,7 @@ use sp_staking::{
 	SessionIndex,
 };
 
-use super::{Call, Pallet, Config};
+use super::{Call, Config, Pallet};
 
 /// A trait with utility methods for handling equivocation reports in GRANDPA.
 /// The offence type is generic, and the trait provides , reporting an offence
@@ -130,9 +128,7 @@ pub struct EquivocationHandler<I, R, L, O = GrandpaEquivocationOffence<I>> {
 
 impl<I, R, L, O> Default for EquivocationHandler<I, R, L, O> {
 	fn default() -> Self {
-		Self {
-			_phantom: Default::default(),
-		}
+		Self { _phantom: Default::default() }
 	}
 }
 
@@ -209,21 +205,22 @@ impl<T: Config> Pallet<T> {
 		if let Call::report_equivocation_unsigned(equivocation_proof, key_owner_proof) = call {
 			// discard equivocation report not coming from the local node
 			match source {
-				TransactionSource::Local | TransactionSource::InBlock => { /* allowed */ }
+				TransactionSource::Local | TransactionSource::InBlock => { /* allowed */ },
 				_ => {
 					log::warn!(
 						target: "runtime::afg",
 						"rejecting unsigned report equivocation transaction because it is not local/in-block."
 					);
 
-					return InvalidTransaction::Call.into();
-				}
+					return InvalidTransaction::Call.into()
+				},
 			}
 
 			// check report staleness
 			is_known_offence::<T>(equivocation_proof, key_owner_proof)?;
 
-			let longevity = <T::HandleEquivocation as HandleEquivocation<T>>::ReportLongevity::get();
+			let longevity =
+				<T::HandleEquivocation as HandleEquivocation<T>>::ReportLongevity::get();
 
 			ValidTransaction::with_tag_prefix("GrandpaEquivocation")
 				// We assign the maximum priority for any equivocation report.
@@ -257,10 +254,7 @@ fn is_known_offence<T: Config>(
 	key_owner_proof: &T::KeyOwnerProof,
 ) -> Result<(), TransactionValidityError> {
 	// check the membership proof to extract the offender's id
-	let key = (
-		sp_finality_grandpa::KEY_TYPE,
-		equivocation_proof.offender().clone(),
-	);
+	let key = (sp_finality_grandpa::KEY_TYPE, equivocation_proof.offender().clone());
 
 	let offender = T::KeyOwnerProofSystem::check_proof(key, key_owner_proof.clone())
 		.ok_or(InvalidTransaction::BadProof)?;
diff --git a/frame/grandpa/src/lib.rs b/frame/grandpa/src/lib.rs
index 2d10e3c96b14..184ab4960874 100644
--- a/frame/grandpa/src/lib.rs
+++ b/frame/grandpa/src/lib.rs
@@ -41,18 +41,16 @@ use fg_primitives::{
 };
 use frame_support::{
 	dispatch::DispatchResultWithPostInfo,
-	storage, traits::{OneSessionHandler, KeyOwnerProofSystem}, weights::{Pays, Weight},
-};
-use sp_runtime::{
-	generic::DigestItem,
-	traits::Zero,
-	DispatchResult, KeyTypeId,
+	storage,
+	traits::{KeyOwnerProofSystem, OneSessionHandler},
+	weights::{Pays, Weight},
 };
+use sp_runtime::{generic::DigestItem, traits::Zero, DispatchResult, KeyTypeId};
 use sp_session::{GetSessionNumber, GetValidatorCount};
 use sp_staking::SessionIndex;
 
-mod equivocation;
 mod default_weights;
+mod equivocation;
 pub mod migrations;
 
 #[cfg(any(feature = "runtime-benchmarks", test))]
@@ -71,9 +69,9 @@ pub use pallet::*;
 
 #[frame_support::pallet]
 pub mod pallet {
+	use super::*;
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
-	use super::*;
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
@@ -130,24 +128,20 @@ pub mod pallet {
 							ScheduledChange {
 								delay: pending_change.delay,
 								next_authorities: pending_change.next_authorities.clone(),
-							}
+							},
 						))
 					} else {
-						Self::deposit_log(ConsensusLog::ScheduledChange(
-							ScheduledChange {
-								delay: pending_change.delay,
-								next_authorities: pending_change.next_authorities.clone(),
-							}
-						));
+						Self::deposit_log(ConsensusLog::ScheduledChange(ScheduledChange {
+							delay: pending_change.delay,
+							next_authorities: pending_change.next_authorities.clone(),
+						}));
 					}
 				}
 
 				// enact the change if we've reached the enacting block
 				if block_number == pending_change.scheduled_at + pending_change.delay {
 					Self::set_grandpa_authorities(&pending_change.next_authorities);
-					Self::deposit_event(
-						Event::NewAuthorities(pending_change.next_authorities)
-					);
+					Self::deposit_event(Event::NewAuthorities(pending_change.next_authorities));
 					<PendingChange<T>>::kill();
 				}
 			}
@@ -197,11 +191,7 @@ pub mod pallet {
 		) -> DispatchResultWithPostInfo {
 			let reporter = ensure_signed(origin)?;
 
-			Self::do_report_equivocation(
-				Some(reporter),
-				equivocation_proof,
-				key_owner_proof,
-			)
+			Self::do_report_equivocation(Some(reporter), equivocation_proof, key_owner_proof)
 		}
 
 		/// Report voter equivocation/misbehavior. This method will verify the
@@ -289,7 +279,8 @@ pub mod pallet {
 	/// State of the current authority set.
 	#[pallet::storage]
 	#[pallet::getter(fn state)]
-	pub(super) type State<T: Config> = StorageValue<_, StoredState<T::BlockNumber>, ValueQuery, DefaultForState<T>>;
+	pub(super) type State<T: Config> =
+		StorageValue<_, StoredState<T::BlockNumber>, ValueQuery, DefaultForState<T>>;
 
 	/// Pending change: (signaled at, scheduled change).
 	#[pallet::storage]
@@ -328,9 +319,7 @@ pub mod pallet {
 	#[cfg(feature = "std")]
 	impl Default for GenesisConfig {
 		fn default() -> Self {
-			Self {
-				authorities: Default::default(),
-			}
+			Self { authorities: Default::default() }
 		}
 	}
 
@@ -388,7 +377,7 @@ pub enum StoredState<N> {
 		/// Block at which the intention to pause was scheduled.
 		scheduled_at: N,
 		/// Number of blocks after which the change will be enacted.
-		delay: N
+		delay: N,
 	},
 	/// The current GRANDPA authority set is paused.
 	Paused,
@@ -410,10 +399,7 @@ impl<T: Config> Pallet<T> {
 
 	/// Set the current set of authorities, along with their respective weights.
 	fn set_grandpa_authorities(authorities: &AuthorityList) {
-		storage::unhashed::put(
-			GRANDPA_AUTHORITIES_KEY,
-			&VersionedAuthorityList::from(authorities),
-		);
+		storage::unhashed::put(GRANDPA_AUTHORITIES_KEY, &VersionedAuthorityList::from(authorities));
 	}
 
 	/// Schedule GRANDPA to pause starting in the given number of blocks.
@@ -421,10 +407,7 @@ impl<T: Config> Pallet<T> {
 	pub fn schedule_pause(in_blocks: T::BlockNumber) -> DispatchResult {
 		if let StoredState::Live = <State<T>>::get() {
 			let scheduled_at = <frame_system::Pallet<T>>::block_number();
-			<State<T>>::put(StoredState::PendingPause {
-				delay: in_blocks,
-				scheduled_at,
-			});
+			<State<T>>::put(StoredState::PendingPause { delay: in_blocks, scheduled_at });
 
 			Ok(())
 		} else {
@@ -436,10 +419,7 @@ impl<T: Config> Pallet<T> {
 	pub fn schedule_resume(in_blocks: T::BlockNumber) -> DispatchResult {
 		if let StoredState::Paused = <State<T>>::get() {
 			let scheduled_at = <frame_system::Pallet<T>>::block_number();
-			<State<T>>::put(StoredState::PendingResume {
-				delay: in_blocks,
-				scheduled_at,
-			});
+			<State<T>>::put(StoredState::PendingResume { delay: in_blocks, scheduled_at });
 
 			Ok(())
 		} else {
@@ -502,10 +482,7 @@ impl<T: Config> Pallet<T> {
 	// config builder or through `on_genesis_session`.
 	fn initialize(authorities: &AuthorityList) {
 		if !authorities.is_empty() {
-			assert!(
-				Self::grandpa_authorities().is_empty(),
-				"Authorities are already initialized!"
-			);
+			assert!(Self::grandpa_authorities().is_empty(), "Authorities are already initialized!");
 			Self::set_grandpa_authorities(authorities);
 		}
 
@@ -530,16 +507,16 @@ impl<T: Config> Pallet<T> {
 		let validator_count = key_owner_proof.validator_count();
 
 		// validate the key ownership proof extracting the id of the offender.
-		let offender =
-			T::KeyOwnerProofSystem::check_proof(
-				(fg_primitives::KEY_TYPE, equivocation_proof.offender().clone()),
-				key_owner_proof,
-			).ok_or(Error::<T>::InvalidKeyOwnershipProof)?;
+		let offender = T::KeyOwnerProofSystem::check_proof(
+			(fg_primitives::KEY_TYPE, equivocation_proof.offender().clone()),
+			key_owner_proof,
+		)
+		.ok_or(Error::<T>::InvalidKeyOwnershipProof)?;
 
 		// validate equivocation proof (check votes are different and
 		// signatures are valid).
 		if !sp_finality_grandpa::check_equivocation_proof(equivocation_proof) {
-			return Err(Error::<T>::InvalidEquivocationProof.into());
+			return Err(Error::<T>::InvalidEquivocationProof.into())
 		}
 
 		// fetch the current and previous sets last session index. on the
@@ -547,8 +524,8 @@ impl<T: Config> Pallet<T> {
 		let previous_set_id_session_index = if set_id == 0 {
 			None
 		} else {
-			let session_index =
-				Self::session_for_set(set_id - 1).ok_or_else(|| Error::<T>::InvalidEquivocationProof)?;
+			let session_index = Self::session_for_set(set_id - 1)
+				.ok_or_else(|| Error::<T>::InvalidEquivocationProof)?;
 
 			Some(session_index)
 		};
@@ -560,10 +537,10 @@ impl<T: Config> Pallet<T> {
 		// bounds of the set id reported in the equivocation.
 		if session_index > set_id_session_index ||
 			previous_set_id_session_index
-			.map(|previous_index| session_index <= previous_index)
-			.unwrap_or(false)
+				.map(|previous_index| session_index <= previous_index)
+				.unwrap_or(false)
 		{
-			return Err(Error::<T>::InvalidEquivocationProof.into());
+			return Err(Error::<T>::InvalidEquivocationProof.into())
 		}
 
 		// report to the offences module rewarding the sender.
@@ -576,7 +553,8 @@ impl<T: Config> Pallet<T> {
 				set_id,
 				round,
 			),
-		).map_err(|_| Error::<T>::DuplicateOffenceReport)?;
+		)
+		.map_err(|_| Error::<T>::DuplicateOffenceReport)?;
 
 		// waive the fee since the report is valid and beneficial
 		Ok(Pays::No.into())
@@ -610,19 +588,22 @@ impl<T: Config> sp_runtime::BoundToRuntimeAppPublic for Pallet<T> {
 }
 
 impl<T: Config> OneSessionHandler<T::AccountId> for Pallet<T>
-	where T: pallet_session::Config
+where
+	T: pallet_session::Config,
 {
 	type Key = AuthorityId;
 
 	fn on_genesis_session<'a, I: 'a>(validators: I)
-		where I: Iterator<Item=(&'a T::AccountId, AuthorityId)>
+	where
+		I: Iterator<Item = (&'a T::AccountId, AuthorityId)>,
 	{
 		let authorities = validators.map(|(_, k)| (k, 1)).collect::<Vec<_>>();
 		Self::initialize(&authorities);
 	}
 
 	fn on_new_session<'a, I: 'a>(changed: bool, validators: I, _queued_validators: I)
-		where I: Iterator<Item=(&'a T::AccountId, AuthorityId)>
+	where
+		I: Iterator<Item = (&'a T::AccountId, AuthorityId)>,
 	{
 		// Always issue a change if `session` says that the validators have changed.
 		// Even if their session keys are the same as before, the underlying economic
diff --git a/frame/grandpa/src/migrations/v3_1.rs b/frame/grandpa/src/migrations/v3_1.rs
index fc626578098d..c2ab9d3b7f66 100644
--- a/frame/grandpa/src/migrations/v3_1.rs
+++ b/frame/grandpa/src/migrations/v3_1.rs
@@ -16,8 +16,8 @@
 // limitations under the License.
 
 use frame_support::{
+	traits::{Get, GetPalletVersion, PalletVersion},
 	weights::Weight,
-	traits::{GetPalletVersion, PalletVersion, Get},
 };
 use sp_io::hashing::twox_128;
 
@@ -31,18 +31,15 @@ pub const OLD_PREFIX: &[u8] = b"GrandpaFinality";
 /// `<Runtime as frame_system::Config>::PalletInfo::name::<GrandpaPallet>`.
 ///
 /// The old storage prefix, `GrandpaFinality` is hardcoded in the migration code.
-pub fn migrate<
-	T: frame_system::Config,
-	P: GetPalletVersion,
-	N: AsRef<str>,
->(new_pallet_name: N) -> Weight {
-
+pub fn migrate<T: frame_system::Config, P: GetPalletVersion, N: AsRef<str>>(
+	new_pallet_name: N,
+) -> Weight {
 	if new_pallet_name.as_ref().as_bytes() == OLD_PREFIX {
 		log::info!(
 			target: "runtime::afg",
 			"New pallet name is equal to the old prefix. No migration needs to be done.",
 		);
-		return 0;
+		return 0
 	}
 	let maybe_storage_version = <P as GetPalletVersion>::storage_version();
 	log::info!(
@@ -59,7 +56,7 @@ pub fn migrate<
 				new_pallet_name.as_ref().as_bytes(),
 			);
 			<T as frame_system::Config>::BlockWeights::get().max_block
-		}
+		},
 		_ => {
 			log::warn!(
 				target: "runtime::afg",
@@ -75,11 +72,9 @@ pub fn migrate<
 /// [`frame_support::traits::OnRuntimeUpgrade::pre_upgrade`] for further testing.
 ///
 /// Panics if anything goes wrong.
-pub fn pre_migration<
-	T: frame_system::Config,
-	P: GetPalletVersion + 'static,
-	N: AsRef<str>,
->(new: N) {
+pub fn pre_migration<T: frame_system::Config, P: GetPalletVersion + 'static, N: AsRef<str>>(
+	new: N,
+) {
 	let new = new.as_ref();
 	log::info!("pre-migration grandpa test with new = {}", new);
 
@@ -119,10 +114,6 @@ pub fn post_migration<P: GetPalletVersion>() {
 	log::info!("post-migration grandpa");
 
 	// Assert that nothing remains at the old prefix
-	assert!(
-		sp_io::storage::next_key(&twox_128(OLD_PREFIX)).map_or(
-			true,
-			|next_key| !next_key.starts_with(&twox_128(OLD_PREFIX))
-		)
-	);
+	assert!(sp_io::storage::next_key(&twox_128(OLD_PREFIX))
+		.map_or(true, |next_key| !next_key.starts_with(&twox_128(OLD_PREFIX))));
 }
diff --git a/frame/grandpa/src/mock.rs b/frame/grandpa/src/mock.rs
index 768564c30105..882acdb4bcc1 100644
--- a/frame/grandpa/src/mock.rs
+++ b/frame/grandpa/src/mock.rs
@@ -19,13 +19,15 @@
 
 #![cfg(test)]
 
-use crate::{AuthorityId, AuthorityList, ConsensusLog, Config, self as pallet_grandpa};
+use crate::{self as pallet_grandpa, AuthorityId, AuthorityList, Config, ConsensusLog};
 use ::grandpa as finality_grandpa;
 use codec::Encode;
+use frame_election_provider_support::onchain;
 use frame_support::{
 	parameter_types,
-	traits::{KeyOwnerProofSystem, OnFinalize, OnInitialize, GenesisBuild},
+	traits::{GenesisBuild, KeyOwnerProofSystem, OnFinalize, OnInitialize},
 };
+use pallet_session::historical as pallet_session_historical;
 use pallet_staking::EraIndex;
 use sp_core::{crypto::KeyTypeId, H256};
 use sp_finality_grandpa::{RoundNumber, SetId, GRANDPA_ENGINE_ID};
@@ -38,8 +40,6 @@ use sp_runtime::{
 	DigestItem, Perbill,
 };
 use sp_staking::SessionIndex;
-use pallet_session::historical as pallet_session_historical;
-use frame_election_provider_support::onchain;
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -275,13 +275,9 @@ pub fn new_test_ext(vec: Vec<(u64, u64)>) -> sp_io::TestExternalities {
 }
 
 pub fn new_test_ext_raw_authorities(authorities: AuthorityList) -> sp_io::TestExternalities {
-	let mut t = frame_system::GenesisConfig::default()
-		.build_storage::<Test>()
-		.unwrap();
+	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
 
-	let balances: Vec<_> = (0..authorities.len())
-		.map(|i| (i as u64, 10_000_000))
-		.collect();
+	let balances: Vec<_> = (0..authorities.len()).map(|i| (i as u64, 10_000_000)).collect();
 
 	pallet_balances::GenesisConfig::<Test> { balances }
 		.assimilate_storage(&mut t)
@@ -295,9 +291,7 @@ pub fn new_test_ext_raw_authorities(authorities: AuthorityList) -> sp_io::TestEx
 			(
 				i as u64,
 				i as u64,
-				TestSessionKeys {
-					grandpa_authority: AuthorityId::from(k.clone()),
-				},
+				TestSessionKeys { grandpa_authority: AuthorityId::from(k.clone()) },
 			)
 		})
 		.collect();
@@ -311,12 +305,7 @@ pub fn new_test_ext_raw_authorities(authorities: AuthorityList) -> sp_io::TestEx
 	// controllers are the index + 1000
 	let stakers: Vec<_> = (0..authorities.len())
 		.map(|i| {
-			(
-				i as u64,
-				i as u64 + 1000,
-				10_000,
-				pallet_staking::StakerStatus::<u64>::Validator,
-			)
+			(i as u64, i as u64 + 1000, 10_000, pallet_staking::StakerStatus::<u64>::Validator)
 		})
 		.collect();
 
@@ -348,12 +337,7 @@ pub fn start_session(session_index: SessionIndex) {
 			System::parent_hash()
 		};
 
-		System::initialize(
-			&(i as u64 + 1),
-			&parent_hash,
-			&Default::default(),
-			Default::default(),
-		);
+		System::initialize(&(i as u64 + 1), &parent_hash, &Default::default(), Default::default());
 		System::set_block_number((i + 1).into());
 		Timestamp::set_timestamp(System::block_number() * 6000);
 
@@ -372,12 +356,7 @@ pub fn start_era(era_index: EraIndex) {
 }
 
 pub fn initialize_block(number: u64, parent_hash: H256) {
-	System::initialize(
-		&number,
-		&parent_hash,
-		&Default::default(),
-		Default::default(),
-	);
+	System::initialize(&number, &parent_hash, &Default::default(), Default::default());
 }
 
 pub fn generate_equivocation_proof(
@@ -386,10 +365,7 @@ pub fn generate_equivocation_proof(
 	vote2: (RoundNumber, H256, u64, &Ed25519Keyring),
 ) -> sp_finality_grandpa::EquivocationProof<H256, u64> {
 	let signed_prevote = |round, hash, number, keyring: &Ed25519Keyring| {
-		let prevote = finality_grandpa::Prevote {
-			target_hash: hash,
-			target_number: number,
-		};
+		let prevote = finality_grandpa::Prevote { target_hash: hash, target_number: number };
 
 		let prevote_msg = finality_grandpa::Message::Prevote(prevote.clone());
 		let payload = sp_finality_grandpa::localized_payload(round, set_id, &prevote_msg);
diff --git a/frame/grandpa/src/tests.rs b/frame/grandpa/src/tests.rs
index 0692102771bf..8337876d88bc 100644
--- a/frame/grandpa/src/tests.rs
+++ b/frame/grandpa/src/tests.rs
@@ -24,7 +24,7 @@ use crate::mock::*;
 use codec::Encode;
 use fg_primitives::ScheduledChange;
 use frame_support::{
-	assert_err, assert_ok, assert_noop,
+	assert_err, assert_noop, assert_ok,
 	traits::{Currency, OnFinalize, OneSessionHandler},
 	weights::{GetDispatchInfo, Pays},
 };
@@ -43,21 +43,24 @@ fn authorities_change_logged() {
 		Grandpa::on_finalize(1);
 
 		let header = System::finalize();
-		assert_eq!(header.digest, Digest {
-			logs: vec![
-				grandpa_log(ConsensusLog::ScheduledChange(
-					ScheduledChange { delay: 0, next_authorities: to_authorities(vec![(4, 1), (5, 1), (6, 1)]) }
-				)),
-			],
-		});
-
-		assert_eq!(System::events(), vec![
-			EventRecord {
+		assert_eq!(
+			header.digest,
+			Digest {
+				logs: vec![grandpa_log(ConsensusLog::ScheduledChange(ScheduledChange {
+					delay: 0,
+					next_authorities: to_authorities(vec![(4, 1), (5, 1), (6, 1)])
+				})),],
+			}
+		);
+
+		assert_eq!(
+			System::events(),
+			vec![EventRecord {
 				phase: Phase::Finalization,
 				event: Event::NewAuthorities(to_authorities(vec![(4, 1), (5, 1), (6, 1)])).into(),
 				topics: vec![],
-			},
-		]);
+			},]
+		);
 	});
 }
 
@@ -68,13 +71,15 @@ fn authorities_change_logged_after_delay() {
 		Grandpa::schedule_change(to_authorities(vec![(4, 1), (5, 1), (6, 1)]), 1, None).unwrap();
 		Grandpa::on_finalize(1);
 		let header = System::finalize();
-		assert_eq!(header.digest, Digest {
-			logs: vec![
-				grandpa_log(ConsensusLog::ScheduledChange(
-					ScheduledChange { delay: 1, next_authorities: to_authorities(vec![(4, 1), (5, 1), (6, 1)]) }
-				)),
-			],
-		});
+		assert_eq!(
+			header.digest,
+			Digest {
+				logs: vec![grandpa_log(ConsensusLog::ScheduledChange(ScheduledChange {
+					delay: 1,
+					next_authorities: to_authorities(vec![(4, 1), (5, 1), (6, 1)])
+				})),],
+			}
+		);
 
 		// no change at this height.
 		assert_eq!(System::events(), vec![]);
@@ -84,13 +89,14 @@ fn authorities_change_logged_after_delay() {
 		Grandpa::on_finalize(2);
 
 		let _header = System::finalize();
-		assert_eq!(System::events(), vec![
-			EventRecord {
+		assert_eq!(
+			System::events(),
+			vec![EventRecord {
 				phase: Phase::Finalization,
 				event: Event::NewAuthorities(to_authorities(vec![(4, 1), (5, 1), (6, 1)])).into(),
 				topics: vec![],
-			},
-		]);
+			},]
+		);
 	});
 }
 
@@ -131,11 +137,7 @@ fn cannot_schedule_change_when_one_pending() {
 fn dispatch_forced_change() {
 	new_test_ext(vec![(1, 1), (2, 1), (3, 1)]).execute_with(|| {
 		initialize_block(1, Default::default());
-		Grandpa::schedule_change(
-			to_authorities(vec![(4, 1), (5, 1), (6, 1)]),
-			5,
-			Some(0),
-		).unwrap();
+		Grandpa::schedule_change(to_authorities(vec![(4, 1), (5, 1), (6, 1)]), 5, Some(0)).unwrap();
 
 		assert!(<PendingChange<Test>>::exists());
 		assert_noop!(
@@ -168,7 +170,10 @@ fn dispatch_forced_change() {
 		{
 			initialize_block(7, header.hash());
 			assert!(!<PendingChange<Test>>::exists());
-			assert_eq!(Grandpa::grandpa_authorities(), to_authorities(vec![(4, 1), (5, 1), (6, 1)]));
+			assert_eq!(
+				Grandpa::grandpa_authorities(),
+				to_authorities(vec![(4, 1), (5, 1), (6, 1)])
+			);
 			assert_ok!(Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, None));
 			Grandpa::on_finalize(7);
 			header = System::finalize();
@@ -178,7 +183,10 @@ fn dispatch_forced_change() {
 		{
 			initialize_block(8, header.hash());
 			assert!(<PendingChange<Test>>::exists());
-			assert_eq!(Grandpa::grandpa_authorities(), to_authorities(vec![(4, 1), (5, 1), (6, 1)]));
+			assert_eq!(
+				Grandpa::grandpa_authorities(),
+				to_authorities(vec![(4, 1), (5, 1), (6, 1)])
+			);
 			assert_noop!(
 				Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, None),
 				Error::<Test>::ChangePending
@@ -205,7 +213,11 @@ fn dispatch_forced_change() {
 		{
 			initialize_block(11, header.hash());
 			assert!(!<PendingChange<Test>>::exists());
-			assert_ok!(Grandpa::schedule_change(to_authorities(vec![(5, 1), (6, 1), (7, 1)]), 5, Some(0)));
+			assert_ok!(Grandpa::schedule_change(
+				to_authorities(vec![(5, 1), (6, 1), (7, 1)]),
+				5,
+				Some(0)
+			));
 			assert_eq!(Grandpa::next_forced(), Some(21));
 			Grandpa::on_finalize(11);
 			header = System::finalize();
@@ -222,13 +234,7 @@ fn schedule_pause_only_when_live() {
 		Grandpa::schedule_pause(1).unwrap();
 
 		// we've switched to the pending pause state
-		assert_eq!(
-			Grandpa::state(),
-			StoredState::PendingPause {
-				scheduled_at: 1u64,
-				delay: 1,
-			},
-		);
+		assert_eq!(Grandpa::state(), StoredState::PendingPause { scheduled_at: 1u64, delay: 1 },);
 
 		Grandpa::on_finalize(1);
 		let _ = System::finalize();
@@ -242,10 +248,7 @@ fn schedule_pause_only_when_live() {
 		let _ = System::finalize();
 
 		// after finalizing block 2 the set should have switched to paused state
-		assert_eq!(
-			Grandpa::state(),
-			StoredState::Paused,
-		);
+		assert_eq!(Grandpa::state(), StoredState::Paused,);
 	});
 }
 
@@ -257,20 +260,14 @@ fn schedule_resume_only_when_paused() {
 		// the set is currently live, resuming it is an error
 		assert_noop!(Grandpa::schedule_resume(1), Error::<Test>::ResumeFailed);
 
-		assert_eq!(
-			Grandpa::state(),
-			StoredState::Live,
-		);
+		assert_eq!(Grandpa::state(), StoredState::Live,);
 
 		// we schedule a pause to be applied instantly
 		Grandpa::schedule_pause(0).unwrap();
 		Grandpa::on_finalize(1);
 		let _ = System::finalize();
 
-		assert_eq!(
-			Grandpa::state(),
-			StoredState::Paused,
-		);
+		assert_eq!(Grandpa::state(), StoredState::Paused,);
 
 		// we schedule the set to go back live in 2 blocks
 		initialize_block(2, Default::default());
@@ -287,10 +284,7 @@ fn schedule_resume_only_when_paused() {
 		let _ = System::finalize();
 
 		// it should be live at block 4
-		assert_eq!(
-			Grandpa::state(),
-			StoredState::Live,
-		);
+		assert_eq!(Grandpa::state(), StoredState::Live,);
 	});
 }
 
@@ -298,26 +292,11 @@ fn schedule_resume_only_when_paused() {
 fn time_slot_have_sane_ord() {
 	// Ensure that `Ord` implementation is sane.
 	const FIXTURE: &[GrandpaTimeSlot] = &[
-		GrandpaTimeSlot {
-			set_id: 0,
-			round: 0,
-		},
-		GrandpaTimeSlot {
-			set_id: 0,
-			round: 1,
-		},
-		GrandpaTimeSlot {
-			set_id: 1,
-			round: 0,
-		},
-		GrandpaTimeSlot {
-			set_id: 1,
-			round: 1,
-		},
-		GrandpaTimeSlot {
-			set_id: 1,
-			round: 2,
-		}
+		GrandpaTimeSlot { set_id: 0, round: 0 },
+		GrandpaTimeSlot { set_id: 0, round: 1 },
+		GrandpaTimeSlot { set_id: 1, round: 0 },
+		GrandpaTimeSlot { set_id: 1, round: 1 },
+		GrandpaTimeSlot { set_id: 1, round: 2 },
 	];
 	assert!(FIXTURE.windows(2).all(|f| f[0] < f[1]));
 }
@@ -325,16 +304,9 @@ fn time_slot_have_sane_ord() {
 /// Returns a list with 3 authorities with known keys:
 /// Alice, Bob and Charlie.
 pub fn test_authorities() -> AuthorityList {
-	let authorities = vec![
-		Ed25519Keyring::Alice,
-		Ed25519Keyring::Bob,
-		Ed25519Keyring::Charlie,
-	];
+	let authorities = vec![Ed25519Keyring::Alice, Ed25519Keyring::Bob, Ed25519Keyring::Charlie];
 
-	authorities
-		.into_iter()
-		.map(|id| (id.public().into(), 1u64))
-		.collect()
+	authorities.into_iter().map(|id| (id.public().into(), 1u64)).collect()
 }
 
 #[test]
@@ -357,11 +329,7 @@ fn report_equivocation_current_set_works() {
 
 			assert_eq!(
 				Staking::eras_stakers(1, validator),
-				pallet_staking::Exposure {
-					total: 10_000,
-					own: 10_000,
-					others: vec![],
-				},
+				pallet_staking::Exposure { total: 10_000, own: 10_000, others: vec![] },
 			);
 		}
 
@@ -384,13 +352,11 @@ fn report_equivocation_current_set_works() {
 			Historical::prove((sp_finality_grandpa::KEY_TYPE, &equivocation_key)).unwrap();
 
 		// report the equivocation and the tx should be dispatched successfully
-		assert_ok!(
-			Grandpa::report_equivocation_unsigned(
-				Origin::none(),
-				equivocation_proof,
-				key_owner_proof,
-			),
-		);
+		assert_ok!(Grandpa::report_equivocation_unsigned(
+			Origin::none(),
+			equivocation_proof,
+			key_owner_proof,
+		),);
 
 		start_era(2);
 
@@ -401,17 +367,13 @@ fn report_equivocation_current_set_works() {
 		assert_eq!(Staking::slashable_balance_of(&equivocation_validator_id), 0);
 		assert_eq!(
 			Staking::eras_stakers(2, equivocation_validator_id),
-			pallet_staking::Exposure {
-				total: 0,
-				own: 0,
-				others: vec![],
-			},
+			pallet_staking::Exposure { total: 0, own: 0, others: vec![] },
 		);
 
 		// check that the balances of all other validators are left intact.
 		for validator in &validators {
 			if *validator == equivocation_validator_id {
-				continue;
+				continue
 			}
 
 			assert_eq!(Balances::total_balance(validator), 10_000_000);
@@ -419,11 +381,7 @@ fn report_equivocation_current_set_works() {
 
 			assert_eq!(
 				Staking::eras_stakers(2, validator),
-				pallet_staking::Exposure {
-					total: 10_000,
-					own: 10_000,
-					others: vec![],
-				},
+				pallet_staking::Exposure { total: 10_000, own: 10_000, others: vec![] },
 			);
 		}
 	});
@@ -455,11 +413,7 @@ fn report_equivocation_old_set_works() {
 
 			assert_eq!(
 				Staking::eras_stakers(2, validator),
-				pallet_staking::Exposure {
-					total: 10_000,
-					own: 10_000,
-					others: vec![],
-				},
+				pallet_staking::Exposure { total: 10_000, own: 10_000, others: vec![] },
 			);
 		}
 
@@ -476,13 +430,11 @@ fn report_equivocation_old_set_works() {
 
 		// report the equivocation using the key ownership proof generated on
 		// the old set, the tx should be dispatched successfully
-		assert_ok!(
-			Grandpa::report_equivocation_unsigned(
-				Origin::none(),
-				equivocation_proof,
-				key_owner_proof,
-			),
-		);
+		assert_ok!(Grandpa::report_equivocation_unsigned(
+			Origin::none(),
+			equivocation_proof,
+			key_owner_proof,
+		),);
 
 		start_era(3);
 
@@ -494,17 +446,13 @@ fn report_equivocation_old_set_works() {
 
 		assert_eq!(
 			Staking::eras_stakers(3, equivocation_validator_id),
-			pallet_staking::Exposure {
-				total: 0,
-				own: 0,
-				others: vec![],
-			},
+			pallet_staking::Exposure { total: 0, own: 0, others: vec![] },
 		);
 
 		// check that the balances of all other validators are left intact.
 		for validator in &validators {
 			if *validator == equivocation_validator_id {
-				continue;
+				continue
 			}
 
 			assert_eq!(Balances::total_balance(validator), 10_000_000);
@@ -512,11 +460,7 @@ fn report_equivocation_old_set_works() {
 
 			assert_eq!(
 				Staking::eras_stakers(3, validator),
-				pallet_staking::Exposure {
-					total: 10_000,
-					own: 10_000,
-					others: vec![],
-				},
+				pallet_staking::Exposure { total: 10_000, own: 10_000, others: vec![] },
 			);
 		}
 	});
@@ -737,10 +681,8 @@ fn report_equivocation_validate_unsigned_prevents_duplicates() {
 		let key_owner_proof =
 			Historical::prove((sp_finality_grandpa::KEY_TYPE, &equivocation_key)).unwrap();
 
-		let call = Call::report_equivocation_unsigned(
-			equivocation_proof.clone(),
-			key_owner_proof.clone(),
-		);
+		let call =
+			Call::report_equivocation_unsigned(equivocation_proof.clone(), key_owner_proof.clone());
 
 		// only local/inblock reports are allowed
 		assert_eq!(
@@ -752,11 +694,7 @@ fn report_equivocation_validate_unsigned_prevents_duplicates() {
 		);
 
 		// the transaction is valid when passed as local
-		let tx_tag = (
-			equivocation_key,
-			set_id,
-			1u64,
-		);
+		let tx_tag = (equivocation_key, set_id, 1u64);
 
 		assert_eq!(
 			<Grandpa as sp_runtime::traits::ValidateUnsigned>::validate_unsigned(
@@ -861,23 +799,19 @@ fn always_schedules_a_change_on_new_session_when_stalled() {
 fn report_equivocation_has_valid_weight() {
 	// the weight depends on the size of the validator set,
 	// but there's a lower bound of 100 validators.
-	assert!(
-		(1..=100)
-			.map(<Test as Config>::WeightInfo::report_equivocation)
-			.collect::<Vec<_>>()
-			.windows(2)
-			.all(|w| w[0] == w[1])
-	);
+	assert!((1..=100)
+		.map(<Test as Config>::WeightInfo::report_equivocation)
+		.collect::<Vec<_>>()
+		.windows(2)
+		.all(|w| w[0] == w[1]));
 
 	// after 100 validators the weight should keep increasing
 	// with every extra validator.
-	assert!(
-		(100..=1000)
-			.map(<Test as Config>::WeightInfo::report_equivocation)
-			.collect::<Vec<_>>()
-			.windows(2)
-			.all(|w| w[0] < w[1])
-	);
+	assert!((100..=1000)
+		.map(<Test as Config>::WeightInfo::report_equivocation)
+		.collect::<Vec<_>>()
+		.windows(2)
+		.all(|w| w[0] < w[1]));
 }
 
 #[test]
diff --git a/frame/identity/src/benchmarking.rs b/frame/identity/src/benchmarking.rs
index 4fb76fcb4138..5cae65818145 100644
--- a/frame/identity/src/benchmarking.rs
+++ b/frame/identity/src/benchmarking.rs
@@ -21,11 +21,11 @@
 
 use super::*;
 
+use crate::Pallet as Identity;
+use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, whitelisted_caller};
+use frame_support::{ensure, traits::Get};
 use frame_system::RawOrigin;
-use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
 use sp_runtime::traits::Bounded;
-use frame_support::{ensure, traits::Get};
-use crate::Pallet as Identity;
 
 const SEED: u32 = 0;
 
@@ -39,11 +39,19 @@ fn add_registrars<T: Config>(r: u32) -> Result<(), &'static str> {
 		let registrar: T::AccountId = account("registrar", i, SEED);
 		let _ = T::Currency::make_free_balance_be(&registrar, BalanceOf::<T>::max_value());
 		Identity::<T>::add_registrar(RawOrigin::Root.into(), registrar.clone())?;
-		Identity::<T>::set_fee(RawOrigin::Signed(registrar.clone()).into(), i.into(), 10u32.into())?;
-		let fields = IdentityFields(
-			IdentityField::Display | IdentityField::Legal | IdentityField::Web | IdentityField::Riot
-			| IdentityField::Email | IdentityField::PgpFingerprint | IdentityField::Image | IdentityField::Twitter
-		);
+		Identity::<T>::set_fee(
+			RawOrigin::Signed(registrar.clone()).into(),
+			i.into(),
+			10u32.into(),
+		)?;
+		let fields =
+			IdentityFields(
+				IdentityField::Display |
+					IdentityField::Legal | IdentityField::Web |
+					IdentityField::Riot | IdentityField::Email |
+					IdentityField::PgpFingerprint |
+					IdentityField::Image | IdentityField::Twitter,
+			);
 		Identity::<T>::set_fields(RawOrigin::Signed(registrar.clone()).into(), i.into(), fields)?;
 	}
 
@@ -53,7 +61,10 @@ fn add_registrars<T: Config>(r: u32) -> Result<(), &'static str> {
 
 // Create `s` sub-accounts for the identity of `who` and return them.
 // Each will have 32 bytes of raw data added to it.
-fn create_sub_accounts<T: Config>(who: &T::AccountId, s: u32) -> Result<Vec<(T::AccountId, Data)>, &'static str> {
+fn create_sub_accounts<T: Config>(
+	who: &T::AccountId,
+	s: u32,
+) -> Result<Vec<(T::AccountId, Data)>, &'static str> {
 	let mut subs = Vec::new();
 	let who_origin = RawOrigin::Signed(who.clone());
 	let data = Data::Raw(vec![0; 32].try_into().unwrap());
@@ -73,7 +84,10 @@ fn create_sub_accounts<T: Config>(who: &T::AccountId, s: u32) -> Result<Vec<(T::
 
 // Adds `s` sub-accounts to the identity of `who`. Each will have 32 bytes of raw data added to it.
 // This additionally returns the vector of sub-accounts so it can be modified if needed.
-fn add_sub_accounts<T: Config>(who: &T::AccountId, s: u32) -> Result<Vec<(T::AccountId, Data)>, &'static str> {
+fn add_sub_accounts<T: Config>(
+	who: &T::AccountId,
+	s: u32,
+) -> Result<Vec<(T::AccountId, Data)>, &'static str> {
 	let who_origin = RawOrigin::Signed(who.clone());
 	let subs = create_sub_accounts::<T>(who, s)?;
 
@@ -399,8 +413,4 @@ benchmarks! {
 
 }
 
-impl_benchmark_test_suite!(
-	Identity,
-	crate::tests::new_test_ext(),
-	crate::tests::Test,
-);
+impl_benchmark_test_suite!(Identity, crate::tests::new_test_ext(), crate::tests::Test,);
diff --git a/frame/identity/src/lib.rs b/frame/identity/src/lib.rs
index f6e3f0639f16..7b401d95573f 100644
--- a/frame/identity/src/lib.rs
+++ b/frame/identity/src/lib.rs
@@ -72,32 +72,34 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
+mod benchmarking;
 #[cfg(test)]
 mod tests;
 mod types;
-mod benchmarking;
 pub mod weights;
 
-use sp_std::prelude::*;
-use sp_std::convert::TryInto;
-use sp_runtime::traits::{StaticLookup, Zero, AppendZerosInput, Saturating};
 use frame_support::traits::{BalanceStatus, Currency, OnUnbalanced, ReservableCurrency};
+use sp_runtime::traits::{AppendZerosInput, Saturating, StaticLookup, Zero};
+use sp_std::{convert::TryInto, prelude::*};
 pub use weights::WeightInfo;
 
 pub use pallet::*;
 pub use types::{
-	Data, IdentityField, IdentityFields, IdentityInfo, Judgement, RegistrarIndex,
-	RegistrarInfo, Registration,
+	Data, IdentityField, IdentityFields, IdentityInfo, Judgement, RegistrarIndex, RegistrarInfo,
+	Registration,
 };
 
-type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
-type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
+type BalanceOf<T> =
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<
+	<T as frame_system::Config>::AccountId,
+>>::NegativeImbalance;
 
 #[frame_support::pallet]
 pub mod pallet {
+	use super::*;
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
-	use super::*;
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
@@ -121,7 +123,6 @@ pub mod pallet {
 		#[pallet::constant]
 		type SubAccountDeposit: Get<BalanceOf<Self>>;
 
-
 		/// The maximum number of sub-accounts allowed per identified account.
 		#[pallet::constant]
 		type MaxSubAccounts: Get<u32>;
@@ -171,13 +172,8 @@ pub mod pallet {
 	/// context. If the account is not some other account's sub-identity, then just `None`.
 	#[pallet::storage]
 	#[pallet::getter(fn super_of)]
-	pub(super) type SuperOf<T: Config> = StorageMap<
-		_,
-		Blake2_128Concat,
-		T::AccountId,
-		(T::AccountId, Data),
-		OptionQuery,
-	>;
+	pub(super) type SuperOf<T: Config> =
+		StorageMap<_, Blake2_128Concat, T::AccountId, (T::AccountId, Data), OptionQuery>;
 
 	/// Alternative "sub" identities of this account.
 	///
@@ -239,7 +235,7 @@ pub mod pallet {
 		/// Sender is not a sub-account.
 		NotSub,
 		/// Sub-account isn't owned by sender.
-		NotOwned
+		NotOwned,
 	}
 
 	#[pallet::event]
@@ -290,17 +286,23 @@ pub mod pallet {
 		/// - One event.
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::add_registrar(T::MaxRegistrars::get()))]
-		pub fn add_registrar(origin: OriginFor<T>, account: T::AccountId) -> DispatchResultWithPostInfo {
+		pub fn add_registrar(
+			origin: OriginFor<T>,
+			account: T::AccountId,
+		) -> DispatchResultWithPostInfo {
 			T::RegistrarOrigin::ensure_origin(origin)?;
 
 			let (i, registrar_count) = <Registrars<T>>::try_mutate(
 				|registrars| -> Result<(RegistrarIndex, usize), DispatchError> {
-					registrars.try_push(Some(RegistrarInfo {
-						account, fee: Zero::zero(), fields: Default::default()
-					}))
-					.map_err(|_| Error::<T>::TooManyRegistrars)?;
+					registrars
+						.try_push(Some(RegistrarInfo {
+							account,
+							fee: Zero::zero(),
+							fields: Default::default(),
+						}))
+						.map_err(|_| Error::<T>::TooManyRegistrars)?;
 					Ok(((registrars.len() - 1) as RegistrarIndex, registrars.len()))
-				}
+				},
 			)?;
 
 			Self::deposit_event(Event::RegistrarAdded(i));
@@ -331,7 +333,10 @@ pub mod pallet {
 			T::MaxRegistrars::get().into(), // R
 			T::MaxAdditionalFields::get().into(), // X
 		))]
-		pub fn set_identity(origin: OriginFor<T>, info: IdentityInfo<T::MaxAdditionalFields>) -> DispatchResultWithPostInfo {
+		pub fn set_identity(
+			origin: OriginFor<T>,
+			info: IdentityInfo<T::MaxAdditionalFields>,
+		) -> DispatchResultWithPostInfo {
 			let sender = ensure_signed(origin)?;
 			let extra_fields = info.additional.len() as u32;
 			ensure!(extra_fields <= T::MaxAdditionalFields::get(), Error::<T>::TooManyFields);
@@ -343,8 +348,9 @@ pub mod pallet {
 					id.judgements.retain(|j| j.1.is_sticky());
 					id.info = info;
 					id
-				}
-				None => Registration { info, judgements: BoundedVec::default(), deposit: Zero::zero() },
+				},
+				None =>
+					Registration { info, judgements: BoundedVec::default(), deposit: Zero::zero() },
 			};
 
 			let old_deposit = id.deposit;
@@ -363,8 +369,9 @@ pub mod pallet {
 
 			Ok(Some(T::WeightInfo::set_identity(
 				judgements as u32, // R
-				extra_fields // X
-			)).into())
+				extra_fields,      // X
+			))
+			.into())
 		}
 
 		/// Set the sub-accounts of the sender.
@@ -397,15 +404,22 @@ pub mod pallet {
 		#[pallet::weight(T::WeightInfo::set_subs_old(T::MaxSubAccounts::get()) // P: Assume max sub accounts removed.
 			.saturating_add(T::WeightInfo::set_subs_new(subs.len() as u32)) // S: Assume all subs are new.
 		)]
-		pub fn set_subs(origin: OriginFor<T>, subs: Vec<(T::AccountId, Data)>) -> DispatchResultWithPostInfo {
+		pub fn set_subs(
+			origin: OriginFor<T>,
+			subs: Vec<(T::AccountId, Data)>,
+		) -> DispatchResultWithPostInfo {
 			let sender = ensure_signed(origin)?;
 			ensure!(<IdentityOf<T>>::contains_key(&sender), Error::<T>::NotFound);
-			ensure!(subs.len() <= T::MaxSubAccounts::get() as usize, Error::<T>::TooManySubAccounts);
+			ensure!(
+				subs.len() <= T::MaxSubAccounts::get() as usize,
+				Error::<T>::TooManySubAccounts
+			);
 
 			let (old_deposit, old_ids) = <SubsOf<T>>::get(&sender);
 			let new_deposit = T::SubAccountDeposit::get() * <BalanceOf<T>>::from(subs.len() as u32);
 
-			let not_other_sub = subs.iter().filter_map(|i| SuperOf::<T>::get(&i.0)).all(|i| &i.0 == &sender);
+			let not_other_sub =
+				subs.iter().filter_map(|i| SuperOf::<T>::get(&i.0)).all(|i| &i.0 == &sender);
 			ensure!(not_other_sub, Error::<T>::AlreadyClaimed);
 
 			if old_deposit < new_deposit {
@@ -434,8 +448,9 @@ pub mod pallet {
 
 			Ok(Some(
 				T::WeightInfo::set_subs_old(old_ids.len() as u32) // P: Real number of old accounts removed.
-				.saturating_add(T::WeightInfo::set_subs_new(new_subs as u32)) // S: New subs added.
-			).into())
+					.saturating_add(T::WeightInfo::set_subs_new(new_subs as u32)), /* S: New subs added. */
+			)
+			.into())
 		}
 
 		/// Clear an account's identity info and all sub-accounts and return all deposits.
@@ -477,10 +492,11 @@ pub mod pallet {
 			Self::deposit_event(Event::IdentityCleared(sender, deposit));
 
 			Ok(Some(T::WeightInfo::clear_identity(
-				id.judgements.len() as u32, // R
-				sub_ids.len() as u32, // S
-				id.info.additional.len() as u32 // X
-			)).into())
+				id.judgements.len() as u32,      // R
+				sub_ids.len() as u32,            // S
+				id.info.additional.len() as u32, // X
+			))
+			.into())
 		}
 
 		/// Request a judgement from a registrar.
@@ -510,28 +526,30 @@ pub mod pallet {
 			T::MaxRegistrars::get().into(), // R
 			T::MaxAdditionalFields::get().into(), // X
 		))]
-		pub fn request_judgement(origin: OriginFor<T>,
+		pub fn request_judgement(
+			origin: OriginFor<T>,
 			#[pallet::compact] reg_index: RegistrarIndex,
 			#[pallet::compact] max_fee: BalanceOf<T>,
 		) -> DispatchResultWithPostInfo {
 			let sender = ensure_signed(origin)?;
 			let registrars = <Registrars<T>>::get();
-			let registrar = registrars.get(reg_index as usize).and_then(Option::as_ref)
+			let registrar = registrars
+				.get(reg_index as usize)
+				.and_then(Option::as_ref)
 				.ok_or(Error::<T>::EmptyIndex)?;
 			ensure!(max_fee >= registrar.fee, Error::<T>::FeeChanged);
 			let mut id = <IdentityOf<T>>::get(&sender).ok_or(Error::<T>::NoIdentity)?;
 
 			let item = (reg_index, Judgement::FeePaid(registrar.fee));
 			match id.judgements.binary_search_by_key(&reg_index, |x| x.0) {
-				Ok(i) => if id.judgements[i].1.is_sticky() {
-					Err(Error::<T>::StickyJudgement)?
-				} else {
-					id.judgements[i] = item
-				},
-				Err(i) => id
-					.judgements
-					.try_insert(i, item)
-					.map_err(|_| Error::<T>::TooManyRegistrars)?,
+				Ok(i) =>
+					if id.judgements[i].1.is_sticky() {
+						Err(Error::<T>::StickyJudgement)?
+					} else {
+						id.judgements[i] = item
+					},
+				Err(i) =>
+					id.judgements.try_insert(i, item).map_err(|_| Error::<T>::TooManyRegistrars)?,
 			}
 
 			T::Currency::reserve(&sender, registrar.fee)?;
@@ -542,10 +560,8 @@ pub mod pallet {
 
 			Self::deposit_event(Event::JudgementRequested(sender, reg_index));
 
-			Ok(Some(T::WeightInfo::request_judgement(
-				judgements as u32,
-				extra_fields as u32,
-			)).into())
+			Ok(Some(T::WeightInfo::request_judgement(judgements as u32, extra_fields as u32))
+				.into())
 		}
 
 		/// Cancel a previous request.
@@ -569,11 +585,16 @@ pub mod pallet {
 			T::MaxRegistrars::get().into(), // R
 			T::MaxAdditionalFields::get().into(), // X
 		))]
-		pub fn cancel_request(origin: OriginFor<T>, reg_index: RegistrarIndex) -> DispatchResultWithPostInfo {
+		pub fn cancel_request(
+			origin: OriginFor<T>,
+			reg_index: RegistrarIndex,
+		) -> DispatchResultWithPostInfo {
 			let sender = ensure_signed(origin)?;
 			let mut id = <IdentityOf<T>>::get(&sender).ok_or(Error::<T>::NoIdentity)?;
 
-			let pos = id.judgements.binary_search_by_key(&reg_index, |x| x.0)
+			let pos = id
+				.judgements
+				.binary_search_by_key(&reg_index, |x| x.0)
 				.map_err(|_| Error::<T>::NotFound)?;
 			let fee = if let Judgement::FeePaid(fee) = id.judgements.remove(pos).1 {
 				fee
@@ -589,10 +610,7 @@ pub mod pallet {
 
 			Self::deposit_event(Event::JudgementUnrequested(sender, reg_index));
 
-			Ok(Some(T::WeightInfo::cancel_request(
-				judgements as u32,
-				extra_fields as u32
-			)).into())
+			Ok(Some(T::WeightInfo::cancel_request(judgements as u32, extra_fields as u32)).into())
 		}
 
 		/// Set the fee required for a judgement to be requested from a registrar.
@@ -609,7 +627,8 @@ pub mod pallet {
 		/// - Benchmark: 7.315 + R * 0.329 µs (min squares analysis)
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::set_fee(T::MaxRegistrars::get()))] // R
-		pub fn set_fee(origin: OriginFor<T>,
+		pub fn set_fee(
+			origin: OriginFor<T>,
 			#[pallet::compact] index: RegistrarIndex,
 			#[pallet::compact] fee: BalanceOf<T>,
 		) -> DispatchResultWithPostInfo {
@@ -618,7 +637,14 @@ pub mod pallet {
 			let registrars = <Registrars<T>>::mutate(|rs| -> Result<usize, DispatchError> {
 				rs.get_mut(index as usize)
 					.and_then(|x| x.as_mut())
-					.and_then(|r| if r.account == who { r.fee = fee; Some(()) } else { None })
+					.and_then(|r| {
+						if r.account == who {
+							r.fee = fee;
+							Some(())
+						} else {
+							None
+						}
+					})
 					.ok_or_else(|| DispatchError::from(Error::<T>::InvalidIndex))?;
 				Ok(rs.len())
 			})?;
@@ -639,7 +665,8 @@ pub mod pallet {
 		/// - Benchmark: 8.823 + R * 0.32 µs (min squares analysis)
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::set_account_id(T::MaxRegistrars::get()))] // R
-		pub fn set_account_id(origin: OriginFor<T>,
+		pub fn set_account_id(
+			origin: OriginFor<T>,
 			#[pallet::compact] index: RegistrarIndex,
 			new: T::AccountId,
 		) -> DispatchResultWithPostInfo {
@@ -648,7 +675,14 @@ pub mod pallet {
 			let registrars = <Registrars<T>>::mutate(|rs| -> Result<usize, DispatchError> {
 				rs.get_mut(index as usize)
 					.and_then(|x| x.as_mut())
-					.and_then(|r| if r.account == who { r.account = new; Some(()) } else { None })
+					.and_then(|r| {
+						if r.account == who {
+							r.account = new;
+							Some(())
+						} else {
+							None
+						}
+					})
 					.ok_or_else(|| DispatchError::from(Error::<T>::InvalidIndex))?;
 				Ok(rs.len())
 			})?;
@@ -669,7 +703,8 @@ pub mod pallet {
 		/// - Benchmark: 7.464 + R * 0.325 µs (min squares analysis)
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::set_fields(T::MaxRegistrars::get()))] // R
-		pub fn set_fields(origin: OriginFor<T>,
+		pub fn set_fields(
+			origin: OriginFor<T>,
 			#[pallet::compact] index: RegistrarIndex,
 			fields: IdentityFields,
 		) -> DispatchResultWithPostInfo {
@@ -678,13 +713,21 @@ pub mod pallet {
 			let registrars = <Registrars<T>>::mutate(|rs| -> Result<usize, DispatchError> {
 				rs.get_mut(index as usize)
 					.and_then(|x| x.as_mut())
-					.and_then(|r| if r.account == who { r.fields = fields; Some(()) } else { None })
+					.and_then(|r| {
+						if r.account == who {
+							r.fields = fields;
+							Some(())
+						} else {
+							None
+						}
+					})
 					.ok_or_else(|| DispatchError::from(Error::<T>::InvalidIndex))?;
 				Ok(rs.len())
 			})?;
 			Ok(Some(T::WeightInfo::set_fields(
-				registrars as u32 // R
-			)).into())
+				registrars as u32, // R
+			))
+			.into())
 		}
 
 		/// Provide a judgement for an account's identity.
@@ -710,7 +753,8 @@ pub mod pallet {
 			T::MaxRegistrars::get().into(), // R
 			T::MaxAdditionalFields::get().into(), // X
 		))]
-		pub fn provide_judgement(origin: OriginFor<T>,
+		pub fn provide_judgement(
+			origin: OriginFor<T>,
 			#[pallet::compact] reg_index: RegistrarIndex,
 			target: <T::Lookup as StaticLookup>::Source,
 			judgement: Judgement<BalanceOf<T>>,
@@ -729,10 +773,15 @@ pub mod pallet {
 			match id.judgements.binary_search_by_key(&reg_index, |x| x.0) {
 				Ok(position) => {
 					if let Judgement::FeePaid(fee) = id.judgements[position].1 {
-						let _ = T::Currency::repatriate_reserved(&target, &sender, fee, BalanceStatus::Free);
+						let _ = T::Currency::repatriate_reserved(
+							&target,
+							&sender,
+							fee,
+							BalanceStatus::Free,
+						);
 					}
 					id.judgements[position] = item
-				}
+				},
 				Err(position) => id
 					.judgements
 					.try_insert(position, item)
@@ -744,10 +793,8 @@ pub mod pallet {
 			<IdentityOf<T>>::insert(&target, id);
 			Self::deposit_event(Event::JudgementGiven(target, reg_index));
 
-			Ok(Some(T::WeightInfo::provide_judgement(
-				judgements as u32,
-				extra_fields as u32,
-			)).into())
+			Ok(Some(T::WeightInfo::provide_judgement(judgements as u32, extra_fields as u32))
+				.into())
 		}
 
 		/// Remove an account's identity and sub-account information and slash the deposits.
@@ -775,7 +822,8 @@ pub mod pallet {
 			T::MaxAdditionalFields::get().into(), // X
 		))]
 		pub fn kill_identity(
-			origin: OriginFor<T>, target: <T::Lookup as StaticLookup>::Source
+			origin: OriginFor<T>,
+			target: <T::Lookup as StaticLookup>::Source,
 		) -> DispatchResultWithPostInfo {
 			T::ForceOrigin::ensure_origin(origin)?;
 
@@ -794,10 +842,11 @@ pub mod pallet {
 			Self::deposit_event(Event::IdentityKilled(target, deposit));
 
 			Ok(Some(T::WeightInfo::kill_identity(
-				id.judgements.len() as u32, // R
-				sub_ids.len() as u32, // S
-				id.info.additional.len() as u32 // X
-			)).into())
+				id.judgements.len() as u32,      // R
+				sub_ids.len() as u32,            // S
+				id.info.additional.len() as u32, // X
+			))
+			.into())
 		}
 
 		/// Add the given account to the sender's subs.
@@ -808,7 +857,11 @@ pub mod pallet {
 		/// The dispatch origin for this call must be _Signed_ and the sender must have a registered
 		/// sub identity of `sub`.
 		#[pallet::weight(T::WeightInfo::add_sub(T::MaxSubAccounts::get()))]
-		pub fn add_sub(origin: OriginFor<T>, sub: <T::Lookup as StaticLookup>::Source, data: Data) -> DispatchResult {
+		pub fn add_sub(
+			origin: OriginFor<T>,
+			sub: <T::Lookup as StaticLookup>::Source,
+			data: Data,
+		) -> DispatchResult {
 			let sender = ensure_signed(origin)?;
 			let sub = T::Lookup::lookup(sub)?;
 			ensure!(IdentityOf::<T>::contains_key(&sender), Error::<T>::NoIdentity);
@@ -818,7 +871,10 @@ pub mod pallet {
 
 			SubsOf::<T>::try_mutate(&sender, |(ref mut subs_deposit, ref mut sub_ids)| {
 				// Ensure there is space and that the deposit is paid.
-				ensure!(sub_ids.len() < T::MaxSubAccounts::get() as usize, Error::<T>::TooManySubAccounts);
+				ensure!(
+					sub_ids.len() < T::MaxSubAccounts::get() as usize,
+					Error::<T>::TooManySubAccounts
+				);
 				let deposit = T::SubAccountDeposit::get();
 				T::Currency::reserve(&sender, deposit)?;
 
@@ -837,7 +893,9 @@ pub mod pallet {
 		/// sub identity of `sub`.
 		#[pallet::weight(T::WeightInfo::rename_sub(T::MaxSubAccounts::get()))]
 		pub fn rename_sub(
-			origin: OriginFor<T>, sub: <T::Lookup as StaticLookup>::Source, data: Data
+			origin: OriginFor<T>,
+			sub: <T::Lookup as StaticLookup>::Source,
+			data: Data,
 		) -> DispatchResult {
 			let sender = ensure_signed(origin)?;
 			let sub = T::Lookup::lookup(sub)?;
@@ -855,7 +913,10 @@ pub mod pallet {
 		/// The dispatch origin for this call must be _Signed_ and the sender must have a registered
 		/// sub identity of `sub`.
 		#[pallet::weight(T::WeightInfo::remove_sub(T::MaxSubAccounts::get()))]
-		pub fn remove_sub(origin: OriginFor<T>, sub: <T::Lookup as StaticLookup>::Source) -> DispatchResult {
+		pub fn remove_sub(
+			origin: OriginFor<T>,
+			sub: <T::Lookup as StaticLookup>::Source,
+		) -> DispatchResult {
 			let sender = ensure_signed(origin)?;
 			ensure!(IdentityOf::<T>::contains_key(&sender), Error::<T>::NoIdentity);
 			let sub = T::Lookup::lookup(sub)?;
@@ -891,19 +952,20 @@ pub mod pallet {
 				sub_ids.retain(|x| x != &sender);
 				let deposit = T::SubAccountDeposit::get().min(*subs_deposit);
 				*subs_deposit -= deposit;
-				let _ = T::Currency::repatriate_reserved(&sup, &sender, deposit, BalanceStatus::Free);
+				let _ =
+					T::Currency::repatriate_reserved(&sup, &sender, deposit, BalanceStatus::Free);
 				Self::deposit_event(Event::SubIdentityRevoked(sender, sup.clone(), deposit));
 			});
 			Ok(())
 		}
 	}
-
 }
 
 impl<T: Config> Pallet<T> {
 	/// Get the subs of an account.
 	pub fn subs(who: &T::AccountId) -> Vec<(T::AccountId, Data)> {
-		SubsOf::<T>::get(who).1
+		SubsOf::<T>::get(who)
+			.1
 			.into_iter()
 			.filter_map(|a| SuperOf::<T>::get(&a).map(|x| (a, x.1)))
 			.collect()
diff --git a/frame/identity/src/tests.rs b/frame/identity/src/tests.rs
index 7a8bb4fa6d92..127b0a9ecb17 100644
--- a/frame/identity/src/tests.rs
+++ b/frame/identity/src/tests.rs
@@ -20,13 +20,13 @@
 use super::*;
 use crate as pallet_identity;
 
-use codec::{Encode, Decode};
-use sp_runtime::traits::BadOrigin;
-use frame_support::{assert_ok, assert_noop, parameter_types, ord_parameter_types, BoundedVec};
+use codec::{Decode, Encode};
+use frame_support::{assert_noop, assert_ok, ord_parameter_types, parameter_types, BoundedVec};
+use frame_system::{EnsureOneOf, EnsureRoot, EnsureSignedBy};
 use sp_core::H256;
-use frame_system::{EnsureSignedBy, EnsureOneOf, EnsureRoot};
 use sp_runtime::{
-	testing::Header, traits::{BlakeTwo256, IdentityLookup},
+	testing::Header,
+	traits::{BadOrigin, BlakeTwo256, IdentityLookup},
 };
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
@@ -100,16 +100,8 @@ ord_parameter_types! {
 	pub const One: u64 = 1;
 	pub const Two: u64 = 2;
 }
-type EnsureOneOrRoot = EnsureOneOf<
-	u64,
-	EnsureRoot<u64>,
-	EnsureSignedBy<One, u64>
->;
-type EnsureTwoOrRoot = EnsureOneOf<
-	u64,
-	EnsureRoot<u64>,
-	EnsureSignedBy<Two, u64>
->;
+type EnsureOneOrRoot = EnsureOneOf<u64, EnsureRoot<u64>, EnsureSignedBy<One, u64>>;
+type EnsureTwoOrRoot = EnsureOneOf<u64, EnsureRoot<u64>, EnsureSignedBy<Two, u64>>;
 impl pallet_identity::Config for Test {
 	type Event = Event;
 	type Currency = Balances;
@@ -128,15 +120,10 @@ impl pallet_identity::Config for Test {
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
 	pallet_balances::GenesisConfig::<Test> {
-		balances: vec![
-			(1, 10),
-			(2, 10),
-			(3, 10),
-			(10, 100),
-			(20, 100),
-			(30, 100),
-		],
-	}.assimilate_storage(&mut t).unwrap();
+		balances: vec![(1, 10), (2, 10), (3, 10), (10, 100), (20, 100), (30, 100)],
+	}
+	.assimilate_storage(&mut t)
+	.unwrap();
 	t.into()
 }
 
@@ -144,7 +131,7 @@ fn ten() -> IdentityInfo<MaxAdditionalFields> {
 	IdentityInfo {
 		display: Data::Raw(b"ten".to_vec().try_into().unwrap()),
 		legal: Data::Raw(b"The Right Ordinal Ten, Esq.".to_vec().try_into().unwrap()),
-		.. Default::default()
+		..Default::default()
 	}
 }
 
@@ -152,7 +139,7 @@ fn twenty() -> IdentityInfo<MaxAdditionalFields> {
 	IdentityInfo {
 		display: Data::Raw(b"twenty".to_vec().try_into().unwrap()),
 		legal: Data::Raw(b"The Right Ordinal Twenty, Esq.".to_vec().try_into().unwrap()),
-		.. Default::default()
+		..Default::default()
 	}
 }
 
@@ -177,7 +164,10 @@ fn editing_subaccounts_should_work() {
 		assert_eq!(Balances::free_balance(10), 70);
 
 		// third sub account is too many
-		assert_noop!(Identity::add_sub(Origin::signed(10), 3, data(3)), Error::<Test>::TooManySubAccounts);
+		assert_noop!(
+			Identity::add_sub(Origin::signed(10), 3, data(3)),
+			Error::<Test>::TooManySubAccounts
+		);
 
 		// rename first sub account
 		assert_ok!(Identity::rename_sub(Origin::signed(10), 1, data(11)));
@@ -214,7 +204,10 @@ fn resolving_subaccount_ownership_works() {
 		assert_eq!(Balances::free_balance(10), 80);
 		assert_eq!(Balances::reserved_balance(10), 20);
 		// 20 cannot claim 1 now
-		assert_noop!(Identity::add_sub(Origin::signed(20), 1, data(1)), Error::<Test>::AlreadyClaimed);
+		assert_noop!(
+			Identity::add_sub(Origin::signed(20), 1, data(1)),
+			Error::<Test>::AlreadyClaimed
+		);
 		// 1 wants to be with 20 so it quits from 10
 		assert_ok!(Identity::quit_sub(Origin::signed(1)));
 		// 1 gets the 10 that 10 paid.
@@ -243,9 +236,10 @@ fn adding_registrar_should_work() {
 		assert_ok!(Identity::set_fee(Origin::signed(3), 0, 10));
 		let fields = IdentityFields(IdentityField::Display | IdentityField::Legal);
 		assert_ok!(Identity::set_fields(Origin::signed(3), 0, fields));
-		assert_eq!(Identity::registrars(), vec![
-			Some(RegistrarInfo { account: 3, fee: 10, fields })
-		]);
+		assert_eq!(
+			Identity::registrars(),
+			vec![Some(RegistrarInfo { account: 3, fee: 10, fields })]
+		);
 	});
 }
 
@@ -370,7 +364,10 @@ fn setting_subaccounts_should_work() {
 		assert_eq!(Identity::super_of(40), None);
 
 		subs.push((20, Data::Raw(vec![40; 1].try_into().unwrap())));
-		assert_noop!(Identity::set_subs(Origin::signed(10), subs.clone()), Error::<Test>::TooManySubAccounts);
+		assert_noop!(
+			Identity::set_subs(Origin::signed(10), subs.clone()),
+			Error::<Test>::TooManySubAccounts
+		);
 	});
 }
 
@@ -378,7 +375,10 @@ fn setting_subaccounts_should_work() {
 fn clearing_account_should_remove_subaccounts_and_refund() {
 	new_test_ext().execute_with(|| {
 		assert_ok!(Identity::set_identity(Origin::signed(10), ten()));
-		assert_ok!(Identity::set_subs(Origin::signed(10), vec![(20, Data::Raw(vec![40; 1].try_into().unwrap()))]));
+		assert_ok!(Identity::set_subs(
+			Origin::signed(10),
+			vec![(20, Data::Raw(vec![40; 1].try_into().unwrap()))]
+		));
 		assert_ok!(Identity::clear_identity(Origin::signed(10)));
 		assert_eq!(Balances::free_balance(10), 100);
 		assert!(Identity::super_of(20).is_none());
@@ -389,7 +389,10 @@ fn clearing_account_should_remove_subaccounts_and_refund() {
 fn killing_account_should_remove_subaccounts_and_not_refund() {
 	new_test_ext().execute_with(|| {
 		assert_ok!(Identity::set_identity(Origin::signed(10), ten()));
-		assert_ok!(Identity::set_subs(Origin::signed(10), vec![(20, Data::Raw(vec![40; 1].try_into().unwrap()))]));
+		assert_ok!(Identity::set_subs(
+			Origin::signed(10),
+			vec![(20, Data::Raw(vec![40; 1].try_into().unwrap()))]
+		));
 		assert_ok!(Identity::kill_identity(Origin::signed(2), 10));
 		assert_eq!(Balances::free_balance(10), 80);
 		assert!(Identity::super_of(20).is_none());
@@ -409,7 +412,10 @@ fn cancelling_requested_judgement_should_work() {
 		assert_noop!(Identity::cancel_request(Origin::signed(10), 0), Error::<Test>::NotFound);
 
 		assert_ok!(Identity::provide_judgement(Origin::signed(3), 0, 10, Judgement::Reasonable));
-		assert_noop!(Identity::cancel_request(Origin::signed(10), 0), Error::<Test>::JudgementGiven);
+		assert_noop!(
+			Identity::cancel_request(Origin::signed(10), 0),
+			Error::<Test>::JudgementGiven
+		);
 	});
 }
 
@@ -419,19 +425,28 @@ fn requesting_judgement_should_work() {
 		assert_ok!(Identity::add_registrar(Origin::signed(1), 3));
 		assert_ok!(Identity::set_fee(Origin::signed(3), 0, 10));
 		assert_ok!(Identity::set_identity(Origin::signed(10), ten()));
-		assert_noop!(Identity::request_judgement(Origin::signed(10), 0, 9), Error::<Test>::FeeChanged);
+		assert_noop!(
+			Identity::request_judgement(Origin::signed(10), 0, 9),
+			Error::<Test>::FeeChanged
+		);
 		assert_ok!(Identity::request_judgement(Origin::signed(10), 0, 10));
 		// 10 for the judgement request, 10 for the identity.
 		assert_eq!(Balances::free_balance(10), 80);
 
 		// Re-requesting won't work as we already paid.
-		assert_noop!(Identity::request_judgement(Origin::signed(10), 0, 10), Error::<Test>::StickyJudgement);
+		assert_noop!(
+			Identity::request_judgement(Origin::signed(10), 0, 10),
+			Error::<Test>::StickyJudgement
+		);
 		assert_ok!(Identity::provide_judgement(Origin::signed(3), 0, 10, Judgement::Erroneous));
 		// Registrar got their payment now.
 		assert_eq!(Balances::free_balance(3), 20);
 
 		// Re-requesting still won't work as it's erroneous.
-		assert_noop!(Identity::request_judgement(Origin::signed(10), 0, 10), Error::<Test>::StickyJudgement);
+		assert_noop!(
+			Identity::request_judgement(Origin::signed(10), 0, 10),
+			Error::<Test>::StickyJudgement
+		);
 
 		// Requesting from a second registrar still works.
 		assert_ok!(Identity::add_registrar(Origin::signed(1), 4));
@@ -448,14 +463,24 @@ fn field_deposit_should_work() {
 	new_test_ext().execute_with(|| {
 		assert_ok!(Identity::add_registrar(Origin::signed(1), 3));
 		assert_ok!(Identity::set_fee(Origin::signed(3), 0, 10));
-		assert_ok!(Identity::set_identity(Origin::signed(10), IdentityInfo {
-			additional: vec![
-				(Data::Raw(b"number".to_vec().try_into().unwrap()), Data::Raw(10u32.encode().try_into().unwrap())),
-				(Data::Raw(b"text".to_vec().try_into().unwrap()), Data::Raw(b"10".to_vec().try_into().unwrap())),
-			]
-			.try_into()
-			.unwrap(), .. Default::default()
-		}));
+		assert_ok!(Identity::set_identity(
+			Origin::signed(10),
+			IdentityInfo {
+				additional: vec![
+					(
+						Data::Raw(b"number".to_vec().try_into().unwrap()),
+						Data::Raw(10u32.encode().try_into().unwrap())
+					),
+					(
+						Data::Raw(b"text".to_vec().try_into().unwrap()),
+						Data::Raw(b"10".to_vec().try_into().unwrap())
+					),
+				]
+				.try_into()
+				.unwrap(),
+				..Default::default()
+			}
+		));
 		assert_eq!(Balances::free_balance(10), 70);
 	});
 }
@@ -465,7 +490,10 @@ fn setting_account_id_should_work() {
 	new_test_ext().execute_with(|| {
 		assert_ok!(Identity::add_registrar(Origin::signed(1), 3));
 		// account 4 cannot change the first registrar's identity since it's owned by 3.
-		assert_noop!(Identity::set_account_id(Origin::signed(4), 0, 3), Error::<Test>::InvalidIndex);
+		assert_noop!(
+			Identity::set_account_id(Origin::signed(4), 0, 3),
+			Error::<Test>::InvalidIndex
+		);
 		// account 3 can, because that's the registrar's current account.
 		assert_ok!(Identity::set_account_id(Origin::signed(3), 0, 4));
 		// account 4 can now, because that's their new ID.
diff --git a/frame/identity/src/types.rs b/frame/identity/src/types.rs
index 59781aadbd31..38bd6458a488 100644
--- a/frame/identity/src/types.rs
+++ b/frame/identity/src/types.rs
@@ -15,19 +15,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use codec::{Encode, Decode, MaxEncodedLen};
+use super::*;
+use codec::{Decode, Encode, MaxEncodedLen};
 use enumflags2::BitFlags;
 use frame_support::{
-    traits::{ConstU32, Get},
-    BoundedVec, CloneNoBound, PartialEqNoBound, RuntimeDebugNoBound,
-};
-use sp_std::prelude::*;
-use sp_std::{fmt::Debug, iter::once, ops::Add};
-use sp_runtime::{
-    traits::Zero,
-    RuntimeDebug,
+	traits::{ConstU32, Get},
+	BoundedVec, CloneNoBound, PartialEqNoBound, RuntimeDebugNoBound,
 };
-use super::*;
+use sp_runtime::{traits::Zero, RuntimeDebug};
+use sp_std::{fmt::Debug, iter::once, ops::Add, prelude::*};
 
 /// Either underlying data blob if it is at most 32 bytes, or a hash of it. If the data is greater
 /// than 32-bytes then it will be truncated when encoding.
@@ -58,13 +54,13 @@ impl Decode for Data {
 		let b = input.read_byte()?;
 		Ok(match b {
 			0 => Data::None,
-			n @ 1 ..= 33 => {
+			n @ 1..=33 => {
 				let mut r: BoundedVec<_, _> = vec![0u8; n as usize - 1]
 					.try_into()
 					.expect("bound checked in match arm condition; qed");
 				input.read(&mut r[..])?;
 				Data::Raw(r)
-			}
+			},
 			34 => Data::BlakeTwo256(<[u8; 32]>::decode(input)?),
 			35 => Data::Sha256(<[u8; 32]>::decode(input)?),
 			36 => Data::Keccak256(<[u8; 32]>::decode(input)?),
@@ -83,7 +79,7 @@ impl Encode for Data {
 				let mut r = vec![l as u8 + 1; l + 1];
 				r[1..].copy_from_slice(&x[..l as usize]);
 				r
-			}
+			},
 			Data::BlakeTwo256(ref h) => once(34u8).chain(h.iter().cloned()).collect(),
 			Data::Sha256(ref h) => once(35u8).chain(h.iter().cloned()).collect(),
 			Data::Keccak256(ref h) => once(36u8).chain(h.iter().cloned()).collect(),
@@ -107,9 +103,8 @@ pub type RegistrarIndex = u32;
 /// NOTE: Registrars may pay little attention to some fields. Registrars may want to make clear
 /// which fields their attestation is relevant for by off-chain means.
 #[derive(Copy, Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, MaxEncodedLen)]
-pub enum Judgement<
-	Balance: Encode + Decode + MaxEncodedLen + Copy + Clone + Debug + Eq + PartialEq
-> {
+pub enum Judgement<Balance: Encode + Decode + MaxEncodedLen + Copy + Clone + Debug + Eq + PartialEq>
+{
 	/// The default value; no opinion is held.
 	Unknown,
 	/// No judgement is yet in place, but a deposit is reserved as payment for providing one.
@@ -131,9 +126,9 @@ pub enum Judgement<
 	Erroneous,
 }
 
-impl<
-	Balance: Encode + Decode + MaxEncodedLen + Copy + Clone + Debug + Eq + PartialEq
-> Judgement<Balance> {
+impl<Balance: Encode + Decode + MaxEncodedLen + Copy + Clone + Debug + Eq + PartialEq>
+	Judgement<Balance>
+{
 	/// Returns `true` if this judgement is indicative of a deposit being currently held. This means
 	/// it should not be cleared or replaced except by an operation which utilizes the deposit.
 	pub(crate) fn has_deposit(&self) -> bool {
@@ -159,14 +154,14 @@ impl<
 #[repr(u64)]
 #[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, BitFlags, RuntimeDebug)]
 pub enum IdentityField {
-	Display        = 0b0000000000000000000000000000000000000000000000000000000000000001,
-	Legal          = 0b0000000000000000000000000000000000000000000000000000000000000010,
-	Web            = 0b0000000000000000000000000000000000000000000000000000000000000100,
-	Riot           = 0b0000000000000000000000000000000000000000000000000000000000001000,
-	Email          = 0b0000000000000000000000000000000000000000000000000000000000010000,
+	Display = 0b0000000000000000000000000000000000000000000000000000000000000001,
+	Legal = 0b0000000000000000000000000000000000000000000000000000000000000010,
+	Web = 0b0000000000000000000000000000000000000000000000000000000000000100,
+	Riot = 0b0000000000000000000000000000000000000000000000000000000000001000,
+	Email = 0b0000000000000000000000000000000000000000000000000000000000010000,
 	PgpFingerprint = 0b0000000000000000000000000000000000000000000000000000000000100000,
-	Image          = 0b0000000000000000000000000000000000000000000000000000000001000000,
-	Twitter        = 0b0000000000000000000000000000000000000000000000000000000010000000,
+	Image = 0b0000000000000000000000000000000000000000000000000000000001000000,
+	Twitter = 0b0000000000000000000000000000000000000000000000000000000010000000,
 }
 
 impl MaxEncodedLen for IdentityField {
@@ -202,7 +197,9 @@ impl Decode for IdentityFields {
 ///
 /// NOTE: This should be stored at the end of the storage item to facilitate the addition of extra
 /// fields in a backwards compatible way through a specialized `Decode` impl.
-#[derive(CloneNoBound, Encode, Decode, Eq, MaxEncodedLen, PartialEqNoBound, RuntimeDebugNoBound)]
+#[derive(
+	CloneNoBound, Encode, Decode, Eq, MaxEncodedLen, PartialEqNoBound, RuntimeDebugNoBound,
+)]
 #[codec(mel_bound(FieldLimit: Get<u32>))]
 #[cfg_attr(test, derive(frame_support::DefaultNoBound))]
 pub struct IdentityInfo<FieldLimit: Get<u32>> {
@@ -277,23 +274,27 @@ pub struct Registration<
 	pub info: IdentityInfo<MaxAdditionalFields>,
 }
 
-impl <
-	Balance: Encode + Decode + MaxEncodedLen + Copy + Clone + Debug + Eq + PartialEq + Zero + Add,
-	MaxJudgements: Get<u32>,
-	MaxAdditionalFields: Get<u32>,
-> Registration<Balance, MaxJudgements, MaxAdditionalFields> {
+impl<
+		Balance: Encode + Decode + MaxEncodedLen + Copy + Clone + Debug + Eq + PartialEq + Zero + Add,
+		MaxJudgements: Get<u32>,
+		MaxAdditionalFields: Get<u32>,
+	> Registration<Balance, MaxJudgements, MaxAdditionalFields>
+{
 	pub(crate) fn total_deposit(&self) -> Balance {
-		self.deposit + self.judgements.iter()
-			.map(|(_, ref j)| if let Judgement::FeePaid(fee) = j { *fee } else { Zero::zero() })
-			.fold(Zero::zero(), |a, i| a + i)
+		self.deposit +
+			self.judgements
+				.iter()
+				.map(|(_, ref j)| if let Judgement::FeePaid(fee) = j { *fee } else { Zero::zero() })
+				.fold(Zero::zero(), |a, i| a + i)
 	}
 }
 
 impl<
-	Balance: Encode + Decode + MaxEncodedLen + Copy + Clone + Debug + Eq + PartialEq,
-	MaxJudgements: Get<u32>,
-	MaxAdditionalFields: Get<u32>,
-> Decode for Registration<Balance, MaxJudgements, MaxAdditionalFields> {
+		Balance: Encode + Decode + MaxEncodedLen + Copy + Clone + Debug + Eq + PartialEq,
+		MaxJudgements: Get<u32>,
+		MaxAdditionalFields: Get<u32>,
+	> Decode for Registration<Balance, MaxJudgements, MaxAdditionalFields>
+{
 	fn decode<I: codec::Input>(input: &mut I) -> sp_std::result::Result<Self, codec::Error> {
 		let (judgements, deposit, info) = Decode::decode(&mut AppendZerosInput::new(input))?;
 		Ok(Self { judgements, deposit, info })
@@ -304,7 +305,7 @@ impl<
 #[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, MaxEncodedLen)]
 pub struct RegistrarInfo<
 	Balance: Encode + Decode + Clone + Debug + Eq + PartialEq,
-	AccountId: Encode + Decode + Clone + Debug + Eq + PartialEq
+	AccountId: Encode + Decode + Clone + Debug + Eq + PartialEq,
 > {
 	/// The account of the registrar.
 	pub account: AccountId,
diff --git a/frame/identity/src/weights.rs b/frame/identity/src/weights.rs
index f283b2869bdf..b23df125c23b 100644
--- a/frame/identity/src/weights.rs
+++ b/frame/identity/src/weights.rs
@@ -36,6 +36,7 @@
 // --template=./.maintain/frame-weight-template.hbs
 
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
diff --git a/frame/im-online/src/benchmarking.rs b/frame/im-online/src/benchmarking.rs
index 5ab4d16c7fe0..ec53ec534850 100644
--- a/frame/im-online/src/benchmarking.rs
+++ b/frame/im-online/src/benchmarking.rs
@@ -21,22 +21,27 @@
 
 use super::*;
 
-use frame_system::RawOrigin;
 use frame_benchmarking::{benchmarks, impl_benchmark_test_suite};
-use sp_core::OpaquePeerId;
-use sp_core::offchain::OpaqueMultiaddr;
-use sp_runtime::traits::{ValidateUnsigned, Zero};
-use sp_runtime::transaction_validity::TransactionSource;
 use frame_support::traits::UnfilteredDispatchable;
+use frame_system::RawOrigin;
+use sp_core::{offchain::OpaqueMultiaddr, OpaquePeerId};
+use sp_runtime::{
+	traits::{ValidateUnsigned, Zero},
+	transaction_validity::TransactionSource,
+};
 
 use crate::Pallet as ImOnline;
 
 const MAX_KEYS: u32 = 1000;
 const MAX_EXTERNAL_ADDRESSES: u32 = 100;
 
-pub fn create_heartbeat<T: Config>(k: u32, e: u32) ->
-	Result<(crate::Heartbeat<T::BlockNumber>, <T::AuthorityId as RuntimeAppPublic>::Signature), &'static str>
-{
+pub fn create_heartbeat<T: Config>(
+	k: u32,
+	e: u32,
+) -> Result<
+	(crate::Heartbeat<T::BlockNumber>, <T::AuthorityId as RuntimeAppPublic>::Signature),
+	&'static str,
+> {
 	let mut keys = Vec::new();
 	for _ in 0..k {
 		keys.push(T::AuthorityId::generate_pair(None));
@@ -51,12 +56,12 @@ pub fn create_heartbeat<T: Config>(k: u32, e: u32) ->
 		block_number: T::BlockNumber::zero(),
 		network_state,
 		session_index: 0,
-		authority_index: k-1,
+		authority_index: k - 1,
 		validators_len: keys.len() as u32,
 	};
 
 	let encoded_heartbeat = input_heartbeat.encode();
-	let authority_id = keys.get((k-1) as usize).ok_or("out of range")?;
+	let authority_id = keys.get((k - 1) as usize).ok_or("out of range")?;
 	let signature = authority_id.sign(&encoded_heartbeat).ok_or("couldn't make signature")?;
 
 	Ok((input_heartbeat, signature))
@@ -91,9 +96,4 @@ benchmarks! {
 	}
 }
 
-
-impl_benchmark_test_suite!(
-	ImOnline,
-	crate::mock::new_test_ext(),
-	crate::mock::Runtime,
-);
+impl_benchmark_test_suite!(ImOnline, crate::mock::new_test_ext(), crate::mock::Runtime,);
diff --git a/frame/im-online/src/lib.rs b/frame/im-online/src/lib.rs
index 90ba04f3b60d..99500ece837f 100644
--- a/frame/im-online/src/lib.rs
+++ b/frame/im-online/src/lib.rs
@@ -69,31 +69,30 @@
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
 
+mod benchmarking;
 mod mock;
 mod tests;
-mod benchmarking;
 pub mod weights;
 
+use codec::{Decode, Encode};
+use frame_support::traits::{
+	EstimateNextSessionRotation, OneSessionHandler, ValidatorSet, ValidatorSetWithIdentification,
+};
+use frame_system::offchain::{SendTransactionTypes, SubmitTransaction};
+pub use pallet::*;
 use sp_application_crypto::RuntimeAppPublic;
-use codec::{Encode, Decode};
 use sp_core::offchain::OpaqueNetworkState;
-use sp_std::prelude::*;
-use sp_std::convert::TryInto;
 use sp_runtime::{
 	offchain::storage::{MutateStorageError, StorageRetrievalError, StorageValueRef},
 	traits::{AtLeast32BitUnsigned, Convert, Saturating, TrailingZeroInput},
-	Perbill, Permill, PerThing, RuntimeDebug, SaturatedConversion,
+	PerThing, Perbill, Permill, RuntimeDebug, SaturatedConversion,
 };
 use sp_staking::{
+	offence::{Kind, Offence, ReportOffence},
 	SessionIndex,
-	offence::{ReportOffence, Offence, Kind},
 };
-use frame_support::traits::{
-	EstimateNextSessionRotation, OneSessionHandler, ValidatorSet, ValidatorSetWithIdentification,
-};
-use frame_system::offchain::{SendTransactionTypes, SubmitTransaction};
+use sp_std::{convert::TryInto, prelude::*};
 pub use weights::WeightInfo;
-pub use pallet::*;
 
 pub mod sr25519 {
 	mod app_sr25519 {
@@ -115,7 +114,7 @@ pub mod sr25519 {
 
 pub mod ed25519 {
 	mod app_ed25519 {
-		use sp_application_crypto::{app_crypto, key_types::IM_ONLINE, ed25519};
+		use sp_application_crypto::{app_crypto, ed25519, key_types::IM_ONLINE};
 		app_crypto!(ed25519, IM_ONLINE);
 	}
 
@@ -185,8 +184,7 @@ enum OffchainErr<BlockNumber> {
 impl<BlockNumber: sp_std::fmt::Debug> sp_std::fmt::Debug for OffchainErr<BlockNumber> {
 	fn fmt(&self, fmt: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
 		match *self {
-			OffchainErr::TooEarly =>
-				write!(fmt, "Too early to send heartbeat."),
+			OffchainErr::TooEarly => write!(fmt, "Too early to send heartbeat."),
 			OffchainErr::WaitingForInclusion(ref block) =>
 				write!(fmt, "Heartbeat already sent at {:?}. Waiting for inclusion.", block),
 			OffchainErr::AlreadyOnline(auth_idx) =>
@@ -204,7 +202,8 @@ pub type AuthIndex = u32;
 /// Heartbeat which is sent/received.
 #[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug)]
 pub struct Heartbeat<BlockNumber>
-	where BlockNumber: PartialEq + Eq + Decode + Encode,
+where
+	BlockNumber: PartialEq + Eq + Decode + Encode,
 {
 	/// Block number at the time heartbeat is created..
 	pub block_number: BlockNumber,
@@ -219,31 +218,32 @@ pub struct Heartbeat<BlockNumber>
 }
 
 /// A type for representing the validator id in a session.
-pub type ValidatorId<T> = <
-	<T as Config>::ValidatorSet as ValidatorSet<<T as frame_system::Config>::AccountId>
->::ValidatorId;
+pub type ValidatorId<T> = <<T as Config>::ValidatorSet as ValidatorSet<
+	<T as frame_system::Config>::AccountId,
+>>::ValidatorId;
 
 /// A tuple of (ValidatorId, Identification) where `Identification` is the full identification of `ValidatorId`.
 pub type IdentificationTuple<T> = (
 	ValidatorId<T>,
-	<<T as Config>::ValidatorSet as
-		ValidatorSetWithIdentification<<T as frame_system::Config>::AccountId>>::Identification,
+	<<T as Config>::ValidatorSet as ValidatorSetWithIdentification<
+		<T as frame_system::Config>::AccountId,
+	>>::Identification,
 );
 
 type OffchainResult<T, A> = Result<A, OffchainErr<<T as frame_system::Config>::BlockNumber>>;
 
 #[frame_support::pallet]
 pub mod pallet {
-	use frame_support::{pallet_prelude::*, traits::Get};
-	use frame_system::{pallet_prelude::*, ensure_none};
+	use super::*;
+	use frame_support::{pallet_prelude::*, traits::Get, Parameter};
+	use frame_system::{ensure_none, pallet_prelude::*};
 	use sp_runtime::{
-		traits::{Member, MaybeSerializeDeserialize},
+		traits::{MaybeSerializeDeserialize, Member},
 		transaction_validity::{
-			InvalidTransaction, TransactionPriority, TransactionSource, TransactionValidity, ValidTransaction,
+			InvalidTransaction, TransactionPriority, TransactionSource, TransactionValidity,
+			ValidTransaction,
 		},
 	};
-	use frame_support::Parameter;
-	use super::*;
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
@@ -252,7 +252,12 @@ pub mod pallet {
 	#[pallet::config]
 	pub trait Config: SendTransactionTypes<Call<Self>> + frame_system::Config {
 		/// The identifier type for an authority.
-		type AuthorityId: Member + Parameter + RuntimeAppPublic + Default + Ord + MaybeSerializeDeserialize;
+		type AuthorityId: Member
+			+ Parameter
+			+ RuntimeAppPublic
+			+ Default
+			+ Ord
+			+ MaybeSerializeDeserialize;
 
 		/// The overarching event type.
 		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
@@ -331,14 +336,8 @@ pub mod pallet {
 	/// `offchain::OpaqueNetworkState`.
 	#[pallet::storage]
 	#[pallet::getter(fn received_heartbeats)]
-	pub(crate) type ReceivedHeartbeats<T> = StorageDoubleMap<
-		_,
-		Twox64Concat,
-		SessionIndex,
-		Twox64Concat,
-		AuthIndex,
-		Vec<u8>,
-	>;
+	pub(crate) type ReceivedHeartbeats<T> =
+		StorageDoubleMap<_, Twox64Concat, SessionIndex, Twox64Concat, AuthIndex, Vec<u8>>;
 
 	/// For each session index, we keep a mapping of `ValidatorId<T>` to the
 	/// number of blocks authored by the given authority.
@@ -362,9 +361,7 @@ pub mod pallet {
 	#[cfg(feature = "std")]
 	impl<T: Config> Default for GenesisConfig<T> {
 		fn default() -> Self {
-			GenesisConfig {
-				keys: Default::default(),
-			}
+			GenesisConfig { keys: Default::default() }
 		}
 	}
 
@@ -402,10 +399,8 @@ pub mod pallet {
 			ensure_none(origin)?;
 
 			let current_session = T::ValidatorSet::session_index();
-			let exists = ReceivedHeartbeats::<T>::contains_key(
-				&current_session,
-				&heartbeat.authority_index
-			);
+			let exists =
+				ReceivedHeartbeats::<T>::contains_key(&current_session, &heartbeat.authority_index);
 			let keys = Keys::<T>::get();
 			let public = keys.get(heartbeat.authority_index as usize);
 			if let (false, Some(public)) = (exists, public) {
@@ -415,7 +410,7 @@ pub mod pallet {
 				ReceivedHeartbeats::<T>::insert(
 					&current_session,
 					&heartbeat.authority_index,
-					&network_state
+					&network_state,
 				);
 
 				Ok(())
@@ -463,19 +458,19 @@ pub mod pallet {
 			if let Call::heartbeat(heartbeat, signature) = call {
 				if <Pallet<T>>::is_online(heartbeat.authority_index) {
 					// we already received a heartbeat for this authority
-					return InvalidTransaction::Stale.into();
+					return InvalidTransaction::Stale.into()
 				}
 
 				// check if session index from heartbeat is recent
 				let current_session = T::ValidatorSet::session_index();
 				if heartbeat.session_index != current_session {
-					return InvalidTransaction::Stale.into();
+					return InvalidTransaction::Stale.into()
 				}
 
 				// verify that the incoming (unverified) pubkey is actually an authority id
 				let keys = Keys::<T>::get();
 				if keys.len() as u32 != heartbeat.validators_len {
-					return InvalidTransaction::Custom(INVALID_VALIDATORS_LEN).into();
+					return InvalidTransaction::Custom(INVALID_VALIDATORS_LEN).into()
 				}
 				let authority_id = match keys.get(heartbeat.authority_index as usize) {
 					Some(id) => id,
@@ -488,7 +483,7 @@ pub mod pallet {
 				});
 
 				if !signature_valid {
-					return InvalidTransaction::BadProof.into();
+					return InvalidTransaction::BadProof.into()
 				}
 
 				ValidTransaction::with_tag_prefix("ImOnline")
@@ -511,9 +506,8 @@ pub mod pallet {
 
 /// Keep track of number of authored blocks per authority, uncles are counted as
 /// well since they're a valid proof of being online.
-impl<
-	T: Config + pallet_authorship::Config,
-> pallet_authorship::EventHandler<ValidatorId<T>, T::BlockNumber> for Pallet<T>
+impl<T: Config + pallet_authorship::Config>
+	pallet_authorship::EventHandler<ValidatorId<T>, T::BlockNumber> for Pallet<T>
 {
 	fn note_author(author: ValidatorId<T>) {
 		Self::note_authorship(author);
@@ -533,7 +527,7 @@ impl<T: Config> Pallet<T> {
 		let current_validators = T::ValidatorSet::validators();
 
 		if authority_index >= current_validators.len() as u32 {
-			return false;
+			return false
 		}
 
 		let authority = &current_validators[authority_index as usize];
@@ -545,10 +539,7 @@ impl<T: Config> Pallet<T> {
 		let current_session = T::ValidatorSet::session_index();
 
 		ReceivedHeartbeats::<T>::contains_key(&current_session, &authority_index) ||
-			AuthoredBlocks::<T>::get(
-				&current_session,
-				authority,
-			) != 0
+			AuthoredBlocks::<T>::get(&current_session, authority) != 0
 	}
 
 	/// Returns `true` if a heartbeat has been received for the authority at `authority_index` in
@@ -562,11 +553,7 @@ impl<T: Config> Pallet<T> {
 	fn note_authorship(author: ValidatorId<T>) {
 		let current_session = T::ValidatorSet::session_index();
 
-		AuthoredBlocks::<T>::mutate(
-			&current_session,
-			author,
-			|authored| *authored += 1,
-		);
+		AuthoredBlocks::<T>::mutate(&current_session, author, |authored| *authored += 1);
 	}
 
 	pub(crate) fn send_heartbeats(
@@ -602,8 +589,8 @@ impl<T: Config> Pallet<T> {
 			// haven't sent an heartbeat yet we'll send one unconditionally. the idea is to prevent
 			// all nodes from sending the heartbeats at the same block and causing a temporary (but
 			// deterministic) spike in transactions.
-			progress >= START_HEARTBEAT_FINAL_PERIOD
-				|| progress >= START_HEARTBEAT_RANDOM_PERIOD && random_choice(progress)
+			progress >= START_HEARTBEAT_FINAL_PERIOD ||
+				progress >= START_HEARTBEAT_RANDOM_PERIOD && random_choice(progress)
 		} else {
 			// otherwise we fallback to using the block number calculated at the beginning
 			// of the session that should roughly correspond to the middle of the session
@@ -612,23 +599,21 @@ impl<T: Config> Pallet<T> {
 		};
 
 		if !should_heartbeat {
-			return Err(OffchainErr::TooEarly);
+			return Err(OffchainErr::TooEarly)
 		}
 
 		let session_index = T::ValidatorSet::session_index();
 		let validators_len = Keys::<T>::decode_len().unwrap_or_default() as u32;
 
-		Ok(
-			Self::local_authority_keys().map(move |(authority_index, key)| {
-				Self::send_single_heartbeat(
-					authority_index,
-					key,
-					session_index,
-					block_number,
-					validators_len,
-				)
-			}),
-		)
+		Ok(Self::local_authority_keys().map(move |(authority_index, key)| {
+			Self::send_single_heartbeat(
+				authority_index,
+				key,
+				session_index,
+				block_number,
+				validators_len,
+			)
+		}))
 	}
 
 	fn send_single_heartbeat(
@@ -640,8 +625,8 @@ impl<T: Config> Pallet<T> {
 	) -> OffchainResult<T, ()> {
 		// A helper function to prepare heartbeat call.
 		let prepare_heartbeat = || -> OffchainResult<T, Call<T>> {
-			let network_state = sp_io::offchain::network_state()
-				.map_err(|_| OffchainErr::NetworkState)?;
+			let network_state =
+				sp_io::offchain::network_state().map_err(|_| OffchainErr::NetworkState)?;
 			let heartbeat_data = Heartbeat {
 				block_number,
 				network_state,
@@ -656,35 +641,30 @@ impl<T: Config> Pallet<T> {
 		};
 
 		if Self::is_online(authority_index) {
-			return Err(OffchainErr::AlreadyOnline(authority_index));
+			return Err(OffchainErr::AlreadyOnline(authority_index))
 		}
 
 		// acquire lock for that authority at current heartbeat to make sure we don't
 		// send concurrent heartbeats.
-		Self::with_heartbeat_lock(
-			authority_index,
-			session_index,
-			block_number,
-			|| {
-				let call = prepare_heartbeat()?;
-				log::info!(
-					target: "runtime::im-online",
-					"[index: {:?}] Reporting im-online at block: {:?} (session: {:?}): {:?}",
-					authority_index,
-					block_number,
-					session_index,
-					call,
-				);
+		Self::with_heartbeat_lock(authority_index, session_index, block_number, || {
+			let call = prepare_heartbeat()?;
+			log::info!(
+				target: "runtime::im-online",
+				"[index: {:?}] Reporting im-online at block: {:?} (session: {:?}): {:?}",
+				authority_index,
+				block_number,
+				session_index,
+				call,
+			);
 
-				SubmitTransaction::<T, Call<T>>::submit_unsigned_transaction(call.into())
-					.map_err(|_| OffchainErr::SubmitTransaction)?;
+			SubmitTransaction::<T, Call<T>>::submit_unsigned_transaction(call.into())
+				.map_err(|_| OffchainErr::SubmitTransaction)?;
 
-				Ok(())
-			},
-		)
+			Ok(())
+		})
 	}
 
-	fn local_authority_keys() -> impl Iterator<Item=(u32, T::AuthorityId)> {
+	fn local_authority_keys() -> impl Iterator<Item = (u32, T::AuthorityId)> {
 		// on-chain storage
 		//
 		// At index `idx`:
@@ -699,13 +679,12 @@ impl<T: Config> Pallet<T> {
 
 		local_keys.sort();
 
-		authorities.into_iter()
-			.enumerate()
-			.filter_map(move |(index, authority)| {
-				local_keys.binary_search(&authority)
-					.ok()
-					.map(|location| (index as u32, local_keys[location].clone()))
-			})
+		authorities.into_iter().enumerate().filter_map(move |(index, authority)| {
+			local_keys
+				.binary_search(&authority)
+				.ok()
+				.map(|location| (index as u32, local_keys[location].clone()))
+		})
 	}
 
 	fn with_heartbeat_lock<R>(
@@ -722,24 +701,21 @@ impl<T: Config> Pallet<T> {
 		let storage = StorageValueRef::persistent(&key);
 		let res = storage.mutate(
 			|status: Result<Option<HeartbeatStatus<T::BlockNumber>>, StorageRetrievalError>| {
-			// Check if there is already a lock for that particular block.
-			// This means that the heartbeat has already been sent, and we are just waiting
-			// for it to be included. However if it doesn't get included for INCLUDE_THRESHOLD
-			// we will re-send it.
-			match status {
-				// we are still waiting for inclusion.
-				Ok(Some(status)) if status.is_recent(session_index, now) => {
-					Err(OffchainErr::WaitingForInclusion(status.sent_at))
-				},
-				// attempt to set new status
-				_ => Ok(HeartbeatStatus {
-					session_index,
-					sent_at: now,
-				}),
-			}
-		});
+				// Check if there is already a lock for that particular block.
+				// This means that the heartbeat has already been sent, and we are just waiting
+				// for it to be included. However if it doesn't get included for INCLUDE_THRESHOLD
+				// we will re-send it.
+				match status {
+					// we are still waiting for inclusion.
+					Ok(Some(status)) if status.is_recent(session_index, now) =>
+						Err(OffchainErr::WaitingForInclusion(status.sent_at)),
+					// attempt to set new status
+					_ => Ok(HeartbeatStatus { session_index, sent_at: now }),
+				}
+			},
+		);
 		if let Err(MutateStorageError::ValueFunctionFailed(err)) = res {
-			return Err(err);
+			return Err(err)
 		}
 
 		let mut new_status = res.map_err(|_| OffchainErr::FailedToAcquireLock)?;
@@ -777,14 +753,16 @@ impl<T: Config> OneSessionHandler<T::AccountId> for Pallet<T> {
 	type Key = T::AuthorityId;
 
 	fn on_genesis_session<'a, I: 'a>(validators: I)
-		where I: Iterator<Item=(&'a T::AccountId, T::AuthorityId)>
+	where
+		I: Iterator<Item = (&'a T::AccountId, T::AuthorityId)>,
 	{
 		let keys = validators.map(|x| x.1).collect::<Vec<_>>();
 		Self::initialize_keys(&keys);
 	}
 
 	fn on_new_session<'a, I: 'a>(_changed: bool, validators: I, _queued_validators: I)
-		where I: Iterator<Item=(&'a T::AccountId, T::AuthorityId)>
+	where
+		I: Iterator<Item = (&'a T::AccountId, T::AuthorityId)>,
 	{
 		// Tell the offchain worker to start making the next session's heartbeats.
 		// Since we consider producing blocks as being online,
@@ -802,14 +780,16 @@ impl<T: Config> OneSessionHandler<T::AccountId> for Pallet<T> {
 		let keys = Keys::<T>::get();
 		let current_validators = T::ValidatorSet::validators();
 
-		let offenders = current_validators.into_iter().enumerate()
-			.filter(|(index, id)|
-				!Self::is_online_aux(*index as u32, id)
-			).filter_map(|(_, id)|
+		let offenders = current_validators
+			.into_iter()
+			.enumerate()
+			.filter(|(index, id)| !Self::is_online_aux(*index as u32, id))
+			.filter_map(|(_, id)| {
 				<T::ValidatorSet as ValidatorSetWithIdentification<T::AccountId>>::IdentificationOf::convert(
 					id.clone()
 				).map(|full_id| (id, full_id))
-			).collect::<Vec<IdentificationTuple<T>>>();
+			})
+			.collect::<Vec<IdentificationTuple<T>>>();
 
 		// Remove all received heartbeats and number of authored blocks from the
 		// current session, they have already been processed and won't be needed
diff --git a/frame/im-online/src/mock.rs b/frame/im-online/src/mock.rs
index 3d7d6d73cd83..a04da49c6526 100644
--- a/frame/im-online/src/mock.rs
+++ b/frame/im-online/src/mock.rs
@@ -24,9 +24,11 @@ use std::cell::RefCell;
 use frame_support::{parameter_types, weights::Weight};
 use pallet_session::historical as pallet_session_historical;
 use sp_core::H256;
-use sp_runtime::testing::{Header, TestXt, UintAuthorityId};
-use sp_runtime::traits::{BlakeTwo256, ConvertInto, IdentityLookup};
-use sp_runtime::{Perbill, Permill};
+use sp_runtime::{
+	testing::{Header, TestXt, UintAuthorityId},
+	traits::{BlakeTwo256, ConvertInto, IdentityLookup},
+	Perbill, Permill,
+};
 use sp_staking::{
 	offence::{OffenceError, ReportOffence},
 	SessionIndex,
@@ -70,13 +72,11 @@ impl pallet_session::SessionManager<u64> for TestSessionManager {
 
 impl pallet_session::historical::SessionManager<u64, u64> for TestSessionManager {
 	fn new_session(_new_index: SessionIndex) -> Option<Vec<(u64, u64)>> {
-		VALIDATORS.with(|l| l
-			.borrow_mut()
-			.take()
-			.map(|validators| {
-				validators.iter().map(|v| (*v, *v)).collect()
-			})
-		)
+		VALIDATORS.with(|l| {
+			l.borrow_mut()
+				.take()
+				.map(|validators| validators.iter().map(|v| (*v, *v)).collect())
+		})
 	}
 	fn end_session(_: SessionIndex) {}
 	fn start_session(_: SessionIndex) {}
@@ -105,9 +105,7 @@ impl ReportOffence<u64, IdentificationTuple, Offence> for OffenceHandler {
 }
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
-	let t = frame_system::GenesisConfig::default()
-		.build_storage::<Runtime>()
-		.unwrap();
+	let t = frame_system::GenesisConfig::default().build_storage::<Runtime>().unwrap();
 	t.into()
 }
 
@@ -154,8 +152,9 @@ parameter_types! {
 
 impl pallet_session::Config for Runtime {
 	type ShouldEndSession = pallet_session::PeriodicSessions<Period, Offset>;
-	type SessionManager = pallet_session::historical::NoteHistoricalRoot<Runtime, TestSessionManager>;
-	type SessionHandler = (ImOnline, );
+	type SessionManager =
+		pallet_session::historical::NoteHistoricalRoot<Runtime, TestSessionManager>;
+	type SessionHandler = (ImOnline,);
 	type ValidatorId = u64;
 	type ValidatorIdOf = ConvertInto;
 	type Keys = UintAuthorityId;
@@ -230,7 +229,8 @@ impl Config for Runtime {
 	type WeightInfo = ();
 }
 
-impl<LocalCall> frame_system::offchain::SendTransactionTypes<LocalCall> for Runtime where
+impl<LocalCall> frame_system::offchain::SendTransactionTypes<LocalCall> for Runtime
+where
 	Call: From<LocalCall>,
 {
 	type OverarchingCall = Call;
diff --git a/frame/im-online/src/tests.rs b/frame/im-online/src/tests.rs
index 5fb8fd3a791e..30af2d31fda3 100644
--- a/frame/im-online/src/tests.rs
+++ b/frame/im-online/src/tests.rs
@@ -21,23 +21,23 @@
 
 use super::*;
 use crate::mock::*;
-use sp_core::OpaquePeerId;
-use sp_core::offchain::{
-	OffchainDbExt,
-	OffchainWorkerExt,
-	TransactionPoolExt,
-	testing::{TestOffchainExt, TestTransactionPoolExt},
+use frame_support::{assert_noop, dispatch};
+use sp_core::{
+	offchain::{
+		testing::{TestOffchainExt, TestTransactionPoolExt},
+		OffchainDbExt, OffchainWorkerExt, TransactionPoolExt,
+	},
+	OpaquePeerId,
+};
+use sp_runtime::{
+	testing::UintAuthorityId,
+	transaction_validity::{InvalidTransaction, TransactionValidityError},
 };
-use frame_support::{dispatch, assert_noop};
-use sp_runtime::{testing::UintAuthorityId, transaction_validity::{TransactionValidityError, InvalidTransaction}};
 
 #[test]
 fn test_unresponsiveness_slash_fraction() {
 	// A single case of unresponsiveness is not slashed.
-	assert_eq!(
-		UnresponsivenessOffence::<()>::slash_fraction(1, 50),
-		Perbill::zero(),
-	);
+	assert_eq!(UnresponsivenessOffence::<()>::slash_fraction(1, 50), Perbill::zero(),);
 
 	assert_eq!(
 		UnresponsivenessOffence::<()>::slash_fraction(5, 50),
@@ -75,17 +75,17 @@ fn should_report_offline_validators() {
 
 		// then
 		let offences = OFFENCES.with(|l| l.replace(vec![]));
-		assert_eq!(offences, vec![
-			(vec![], UnresponsivenessOffence {
-				session_index: 2,
-				validator_set_count: 3,
-				offenders: vec![
-					(1, 1),
-					(2, 2),
-					(3, 3),
-				],
-			})
-		]);
+		assert_eq!(
+			offences,
+			vec![(
+				vec![],
+				UnresponsivenessOffence {
+					session_index: 2,
+					validator_set_count: 3,
+					offenders: vec![(1, 1), (2, 2), (3, 3),],
+				}
+			)]
+		);
 
 		// should not report when heartbeat is sent
 		for (idx, v) in validators.into_iter().take(4).enumerate() {
@@ -95,16 +95,17 @@ fn should_report_offline_validators() {
 
 		// then
 		let offences = OFFENCES.with(|l| l.replace(vec![]));
-		assert_eq!(offences, vec![
-			(vec![], UnresponsivenessOffence {
-				session_index: 3,
-				validator_set_count: 6,
-				offenders: vec![
-					(5, 5),
-					(6, 6),
-				],
-			})
-		]);
+		assert_eq!(
+			offences,
+			vec![(
+				vec![],
+				UnresponsivenessOffence {
+					session_index: 3,
+					validator_set_count: 6,
+					offenders: vec![(5, 5), (6, 6),],
+				}
+			)]
+		);
 	});
 }
 
@@ -129,17 +130,15 @@ fn heartbeat(
 	};
 	let signature = id.sign(&heartbeat.encode()).unwrap();
 
-	ImOnline::pre_dispatch(&crate::Call::heartbeat(heartbeat.clone(), signature.clone()))
-		.map_err(|e| match e {
-			TransactionValidityError::Invalid(InvalidTransaction::Custom(INVALID_VALIDATORS_LEN)) =>
-				"invalid validators len",
+	ImOnline::pre_dispatch(&crate::Call::heartbeat(heartbeat.clone(), signature.clone())).map_err(
+		|e| match e {
+			TransactionValidityError::Invalid(InvalidTransaction::Custom(
+				INVALID_VALIDATORS_LEN,
+			)) => "invalid validators len",
 			e @ _ => <&'static str>::from(e),
-		})?;
-	ImOnline::heartbeat(
-		Origin::none(),
-		heartbeat,
-		signature,
-	)
+		},
+	)?;
+	ImOnline::heartbeat(Origin::none(), heartbeat, signature)
 }
 
 #[test]
@@ -191,8 +190,14 @@ fn late_heartbeat_and_invalid_keys_len_should_fail() {
 		assert_eq!(Session::validators(), vec![1, 2, 3]);
 
 		// when
-		assert_noop!(heartbeat(1, 3, 0, 1.into(), Session::validators()), "Transaction is outdated");
-		assert_noop!(heartbeat(1, 1, 0, 1.into(), Session::validators()), "Transaction is outdated");
+		assert_noop!(
+			heartbeat(1, 3, 0, 1.into(), Session::validators()),
+			"Transaction is outdated"
+		);
+		assert_noop!(
+			heartbeat(1, 1, 0, 1.into(), Session::validators()),
+			"Transaction is outdated"
+		);
 
 		// invalid validators_len
 		assert_noop!(heartbeat(1, 2, 0, 1.into(), vec![]), "invalid validators len");
@@ -236,13 +241,16 @@ fn should_generate_heartbeats() {
 			e => panic!("Unexpected call: {:?}", e),
 		};
 
-		assert_eq!(heartbeat, Heartbeat {
-			block_number: block,
-			network_state: sp_io::offchain::network_state().unwrap(),
-			session_index: 2,
-			authority_index: 2,
-			validators_len: 3,
-		});
+		assert_eq!(
+			heartbeat,
+			Heartbeat {
+				block_number: block,
+				network_state: sp_io::offchain::network_state().unwrap(),
+				session_index: 2,
+				authority_index: 2,
+				validators_len: 3,
+			}
+		);
 	});
 }
 
@@ -348,13 +356,16 @@ fn should_not_send_a_report_if_already_online() {
 			e => panic!("Unexpected call: {:?}", e),
 		};
 
-		assert_eq!(heartbeat, Heartbeat {
-			block_number: 4,
-			network_state: sp_io::offchain::network_state().unwrap(),
-			session_index: 2,
-			authority_index: 0,
-			validators_len: 3,
-		});
+		assert_eq!(
+			heartbeat,
+			Heartbeat {
+				block_number: 4,
+				network_state: sp_io::offchain::network_state().unwrap(),
+				session_index: 2,
+				authority_index: 0,
+				validators_len: 3,
+			}
+		);
 	});
 }
 
@@ -424,10 +435,7 @@ fn should_handle_non_linear_session_progress() {
 		// if we don't have valid results for the current session progres then
 		// we'll fallback to `HeartbeatAfter` and only heartbeat on block 5.
 		MOCK_CURRENT_SESSION_PROGRESS.with(|p| *p.borrow_mut() = Some(None));
-		assert_eq!(
-			ImOnline::send_heartbeats(2).err(),
-			Some(OffchainErr::TooEarly),
-		);
+		assert_eq!(ImOnline::send_heartbeats(2).err(), Some(OffchainErr::TooEarly),);
 
 		MOCK_CURRENT_SESSION_PROGRESS.with(|p| *p.borrow_mut() = Some(None));
 		assert!(ImOnline::send_heartbeats(5).ok().is_some());
@@ -453,11 +461,9 @@ fn test_does_not_heartbeat_early_in_the_session() {
 	ext.execute_with(|| {
 		// mock current session progress as being 5%. we only randomly start
 		// heartbeating after 10% of the session has elapsed.
-		MOCK_CURRENT_SESSION_PROGRESS.with(|p| *p.borrow_mut() = Some(Some(Permill::from_float(0.05))));
-		assert_eq!(
-			ImOnline::send_heartbeats(2).err(),
-			Some(OffchainErr::TooEarly),
-		);
+		MOCK_CURRENT_SESSION_PROGRESS
+			.with(|p| *p.borrow_mut() = Some(Some(Permill::from_float(0.05))));
+		assert_eq!(ImOnline::send_heartbeats(2).err(), Some(OffchainErr::TooEarly),);
 	});
 }
 
@@ -475,8 +481,8 @@ fn test_probability_of_heartbeating_increases_with_session_progress() {
 			// the average session length is 100 blocks, therefore the residual
 			// probability of sending a heartbeat is 1%
 			MOCK_AVERAGE_SESSION_LENGTH.with(|p| *p.borrow_mut() = Some(100));
-			MOCK_CURRENT_SESSION_PROGRESS.with(|p| *p.borrow_mut() =
-				Some(Some(Permill::from_float(progress))));
+			MOCK_CURRENT_SESSION_PROGRESS
+				.with(|p| *p.borrow_mut() = Some(Some(Permill::from_float(progress))));
 
 			let mut seed = [0u8; 32];
 			let encoded = ((random * Permill::ACCURACY as f64) as u32).encode();
@@ -486,10 +492,7 @@ fn test_probability_of_heartbeating_increases_with_session_progress() {
 
 		let assert_too_early = |progress, random| {
 			set_test(progress, random);
-			assert_eq!(
-				ImOnline::send_heartbeats(2).err(),
-				Some(OffchainErr::TooEarly),
-			);
+			assert_eq!(ImOnline::send_heartbeats(2).err(), Some(OffchainErr::TooEarly),);
 		};
 
 		let assert_heartbeat_ok = |progress, random| {
diff --git a/frame/im-online/src/weights.rs b/frame/im-online/src/weights.rs
index 6a1f575b856c..5f04a3637d16 100644
--- a/frame/im-online/src/weights.rs
+++ b/frame/im-online/src/weights.rs
@@ -36,6 +36,7 @@
 // --template=./.maintain/frame-weight-template.hbs
 
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
diff --git a/frame/indices/src/benchmarking.rs b/frame/indices/src/benchmarking.rs
index 625a994af38f..6829a6605160 100644
--- a/frame/indices/src/benchmarking.rs
+++ b/frame/indices/src/benchmarking.rs
@@ -20,8 +20,8 @@
 #![cfg(feature = "runtime-benchmarks")]
 
 use super::*;
+use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, whitelisted_caller};
 use frame_system::RawOrigin;
-use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
 use sp_runtime::traits::Bounded;
 
 use crate::Pallet as Indices;
@@ -93,9 +93,4 @@ benchmarks! {
 	// TODO in another PR: lookup and unlookup trait weights (not critical)
 }
 
-
-impl_benchmark_test_suite!(
-	Indices,
-	crate::mock::new_test_ext(),
-	crate::mock::Test,
-);
+impl_benchmark_test_suite!(Indices, crate::mock::new_test_ext(), crate::mock::Test,);
diff --git a/frame/indices/src/lib.rs b/frame/indices/src/lib.rs
index 778173dbc971..ced8c1e06165 100644
--- a/frame/indices/src/lib.rs
+++ b/frame/indices/src/lib.rs
@@ -20,36 +20,43 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
+mod benchmarking;
 mod mock;
 mod tests;
-mod benchmarking;
 pub mod weights;
 
-use sp_std::prelude::*;
 use codec::Codec;
-use sp_runtime::MultiAddress;
-use sp_runtime::traits::{
-	StaticLookup, LookupError, Zero, Saturating, AtLeast32Bit
+use frame_support::traits::{BalanceStatus::Reserved, Currency, ReservableCurrency};
+use sp_runtime::{
+	traits::{AtLeast32Bit, LookupError, Saturating, StaticLookup, Zero},
+	MultiAddress,
 };
-use frame_support::traits::{Currency, ReservableCurrency, BalanceStatus::Reserved};
+use sp_std::prelude::*;
 pub use weights::WeightInfo;
 
-type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+type BalanceOf<T> =
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 
 pub use pallet::*;
 
 #[frame_support::pallet]
 pub mod pallet {
+	use super::*;
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
-	use super::*;
 
 	/// The module's config trait.
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
 		/// Type used for storing an account's index; implies the maximum number of accounts the system
 		/// can hold.
-		type AccountIndex: Parameter + Member + MaybeSerializeDeserialize + Codec + Default + AtLeast32Bit + Copy;
+		type AccountIndex: Parameter
+			+ Member
+			+ MaybeSerializeDeserialize
+			+ Codec
+			+ Default
+			+ AtLeast32Bit
+			+ Copy;
 
 		/// The currency trait.
 		type Currency: ReservableCurrency<Self::AccountId>;
@@ -263,7 +270,7 @@ pub mod pallet {
 	}
 
 	/// Old name generated by `decl_event`.
-	#[deprecated(note="use `Event` instead")]
+	#[deprecated(note = "use `Event` instead")]
 	pub type RawEvent<T> = Event<T>;
 
 	#[pallet::error]
@@ -282,11 +289,8 @@ pub mod pallet {
 
 	/// The lookup from index to account.
 	#[pallet::storage]
-	pub type Accounts<T: Config> = StorageMap<
-		_, Blake2_128Concat,
-		T::AccountIndex,
-		(T::AccountId, BalanceOf<T>, bool)
-	>;
+	pub type Accounts<T: Config> =
+		StorageMap<_, Blake2_128Concat, T::AccountIndex, (T::AccountId, BalanceOf<T>, bool)>;
 
 	#[pallet::genesis_config]
 	pub struct GenesisConfig<T: Config> {
@@ -296,9 +300,7 @@ pub mod pallet {
 	#[cfg(feature = "std")]
 	impl<T: Config> Default for GenesisConfig<T> {
 		fn default() -> Self {
-			Self {
-				indices: Default::default(),
-			}
+			Self { indices: Default::default() }
 		}
 	}
 
@@ -321,9 +323,7 @@ impl<T: Config> Pallet<T> {
 	}
 
 	/// Lookup an address to get an Id, if there's one there.
-	pub fn lookup_address(
-		a: MultiAddress<T::AccountId, T::AccountIndex>
-	) -> Option<T::AccountId> {
+	pub fn lookup_address(a: MultiAddress<T::AccountId, T::AccountIndex>) -> Option<T::AccountId> {
 		match a {
 			MultiAddress::Id(i) => Some(i),
 			MultiAddress::Index(i) => Self::lookup_index(i),
diff --git a/frame/indices/src/mock.rs b/frame/indices/src/mock.rs
index 46c1d814acb6..e026e36bc389 100644
--- a/frame/indices/src/mock.rs
+++ b/frame/indices/src/mock.rs
@@ -19,10 +19,10 @@
 
 #![cfg(test)]
 
-use sp_runtime::testing::Header;
-use sp_core::H256;
-use frame_support::parameter_types;
 use crate::{self as pallet_indices, Config};
+use frame_support::parameter_types;
+use sp_core::H256;
+use sp_runtime::testing::Header;
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -101,8 +101,10 @@ impl Config for Test {
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-	pallet_balances::GenesisConfig::<Test>{
+	pallet_balances::GenesisConfig::<Test> {
 		balances: vec![(1, 10), (2, 20), (3, 30), (4, 40), (5, 50), (6, 60)],
-	}.assimilate_storage(&mut t).unwrap();
+	}
+	.assimilate_storage(&mut t)
+	.unwrap();
 	t.into()
 }
diff --git a/frame/indices/src/tests.rs b/frame/indices/src/tests.rs
index 96b8c4acfcd2..37df20e9b928 100644
--- a/frame/indices/src/tests.rs
+++ b/frame/indices/src/tests.rs
@@ -19,15 +19,17 @@
 
 #![cfg(test)]
 
-use super::*;
-use super::mock::*;
-use frame_support::{assert_ok, assert_noop};
+use super::{mock::*, *};
+use frame_support::{assert_noop, assert_ok};
 use pallet_balances::Error as BalancesError;
 
 #[test]
 fn claiming_should_work() {
 	new_test_ext().execute_with(|| {
-		assert_noop!(Indices::claim(Some(0).into(), 0), BalancesError::<Test, _>::InsufficientBalance);
+		assert_noop!(
+			Indices::claim(Some(0).into(), 0),
+			BalancesError::<Test, _>::InsufficientBalance
+		);
 		assert_ok!(Indices::claim(Some(1).into(), 0));
 		assert_noop!(Indices::claim(Some(2).into(), 0), Error::<Test>::InUse);
 		assert_eq!(Balances::reserved_balance(1), 1);
diff --git a/frame/indices/src/weights.rs b/frame/indices/src/weights.rs
index 559392d3d2ba..6c49615a8521 100644
--- a/frame/indices/src/weights.rs
+++ b/frame/indices/src/weights.rs
@@ -36,6 +36,7 @@
 // --template=./.maintain/frame-weight-template.hbs
 
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
diff --git a/frame/lottery/src/benchmarking.rs b/frame/lottery/src/benchmarking.rs
index 8fe91088b84e..cf58a5f81b10 100644
--- a/frame/lottery/src/benchmarking.rs
+++ b/frame/lottery/src/benchmarking.rs
@@ -21,9 +21,9 @@
 
 use super::*;
 
-use frame_system::RawOrigin;
+use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, whitelisted_caller};
 use frame_support::traits::{EnsureOrigin, OnInitialize, UnfilteredDispatchable};
-use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
+use frame_system::RawOrigin;
 use sp_runtime::traits::{Bounded, Zero};
 
 use crate::Pallet as Lottery;
@@ -170,8 +170,4 @@ benchmarks! {
 	}
 }
 
-impl_benchmark_test_suite!(
-	Lottery,
-	crate::mock::new_test_ext(),
-	crate::mock::Test,
-);
+impl_benchmark_test_suite!(Lottery, crate::mock::new_test_ext(), crate::mock::Test,);
diff --git a/frame/lottery/src/lib.rs b/frame/lottery/src/lib.rs
index c979500b36f0..e2e56860e605 100644
--- a/frame/lottery/src/lib.rs
+++ b/frame/lottery/src/lib.rs
@@ -47,30 +47,30 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
+mod benchmarking;
 #[cfg(test)]
 mod mock;
 #[cfg(test)]
 mod tests;
-mod benchmarking;
 pub mod weights;
 
-use sp_std::prelude::*;
+use codec::{Decode, Encode};
+use frame_support::{
+	dispatch::{DispatchResult, Dispatchable, GetDispatchInfo},
+	ensure,
+	traits::{Currency, ExistenceRequirement::KeepAlive, Get, Randomness, ReservableCurrency},
+	PalletId, RuntimeDebug,
+};
+pub use pallet::*;
 use sp_runtime::{
-	DispatchError, ArithmeticError,
 	traits::{AccountIdConversion, Saturating, Zero},
+	ArithmeticError, DispatchError,
 };
-use frame_support::{
-	ensure, PalletId, RuntimeDebug,
-	dispatch::{Dispatchable, DispatchResult, GetDispatchInfo},
-	traits::{
-		Currency, ReservableCurrency, Get, ExistenceRequirement::KeepAlive, Randomness,
-	},
-};
-use codec::{Encode, Decode};
+use sp_std::prelude::*;
 pub use weights::WeightInfo;
-pub use pallet::*;
 
-type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+type BalanceOf<T> =
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 
 // Any runtime call can be encoded into two bytes which represent the pallet and call index.
 // We use this to uniquely match someone's incoming call with the calls configured for the lottery.
@@ -96,7 +96,9 @@ pub trait ValidateCall<T: Config> {
 }
 
 impl<T: Config> ValidateCall<T> for () {
-	fn validate_call(_: &<T as Config>::Call) -> bool { false }
+	fn validate_call(_: &<T as Config>::Call) -> bool {
+		false
+	}
 }
 
 impl<T: Config> ValidateCall<T> for Pallet<T> {
@@ -112,9 +114,9 @@ impl<T: Config> ValidateCall<T> for Pallet<T> {
 
 #[frame_support::pallet]
 pub mod pallet {
-	use frame_support::{Parameter, pallet_prelude::*, traits::EnsureOrigin, weights::Weight};
-	use frame_system::{ensure_signed, pallet_prelude::*};
 	use super::*;
+	use frame_support::{pallet_prelude::*, traits::EnsureOrigin, weights::Weight, Parameter};
+	use frame_system::{ensure_signed, pallet_prelude::*};
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
@@ -128,7 +130,10 @@ pub mod pallet {
 		type PalletId: Get<PalletId>;
 
 		/// A dispatchable call.
-		type Call: Parameter + Dispatchable<Origin=Self::Origin> + GetDispatchInfo + From<frame_system::Call<Self>>;
+		type Call: Parameter
+			+ Dispatchable<Origin = Self::Origin>
+			+ GetDispatchInfo
+			+ From<frame_system::Call<Self>>;
 
 		/// The currency trait.
 		type Currency: ReservableCurrency<Self::AccountId>;
@@ -200,16 +205,13 @@ pub mod pallet {
 
 	/// The configuration for the current lottery.
 	#[pallet::storage]
-	pub(crate) type Lottery<T: Config> = StorageValue<_, LotteryConfig<T::BlockNumber, BalanceOf<T>>>;
+	pub(crate) type Lottery<T: Config> =
+		StorageValue<_, LotteryConfig<T::BlockNumber, BalanceOf<T>>>;
 
 	/// Users who have purchased a ticket. (Lottery Index, Tickets Purchased)
 	#[pallet::storage]
-	pub(crate) type Participants<T: Config> = StorageMap<
-		_,
-		Twox64Concat, T::AccountId,
-		(u32, Vec<CallIndex>),
-		ValueQuery,
-	>;
+	pub(crate) type Participants<T: Config> =
+		StorageMap<_, Twox64Concat, T::AccountId, (u32, Vec<CallIndex>), ValueQuery>;
 
 	/// Total number of tickets sold.
 	#[pallet::storage]
@@ -232,9 +234,8 @@ pub mod pallet {
 		fn on_initialize(n: T::BlockNumber) -> Weight {
 			Lottery::<T>::mutate(|mut lottery| -> Weight {
 				if let Some(config) = &mut lottery {
-					let payout_block = config.start
-						.saturating_add(config.length)
-						.saturating_add(config.delay);
+					let payout_block =
+						config.start.saturating_add(config.length).saturating_add(config.delay);
 					if payout_block <= n {
 						let (lottery_account, lottery_balance) = Self::pot();
 						let ticket_count = TicketsCount::<T>::get();
@@ -242,7 +243,12 @@ pub mod pallet {
 						let winning_number = Self::choose_winner(ticket_count);
 						let winner = Tickets::<T>::get(winning_number).unwrap_or(lottery_account);
 						// Not much we can do if this fails...
-						let res = T::Currency::transfer(&Self::account_id(), &winner, lottery_balance, KeepAlive);
+						let res = T::Currency::transfer(
+							&Self::account_id(),
+							&winner,
+							lottery_balance,
+							KeepAlive,
+						);
 						debug_assert!(res.is_ok());
 
 						Self::deposit_event(Event::<T>::Winner(winner, lottery_balance));
@@ -340,13 +346,7 @@ pub mod pallet {
 				let new_index = index.checked_add(1).ok_or(ArithmeticError::Overflow)?;
 				let start = frame_system::Pallet::<T>::block_number();
 				// Use new_index to more easily track everything with the current state.
-				*lottery = Some(LotteryConfig {
-					price,
-					start,
-					length,
-					delay,
-					repeat,
-				});
+				*lottery = Some(LotteryConfig { price, start, length, delay, repeat });
 				LotteryIndex::<T>::put(new_index);
 				Ok(())
 			})?;
@@ -389,8 +389,8 @@ impl<T: Config> Pallet<T> {
 	// The existential deposit is not part of the pot so lottery account never gets deleted.
 	fn pot() -> (T::AccountId, BalanceOf<T>) {
 		let account_id = Self::account_id();
-		let balance = T::Currency::free_balance(&account_id)
-			.saturating_sub(T::Currency::minimum_balance());
+		let balance =
+			T::Currency::free_balance(&account_id).saturating_sub(T::Currency::minimum_balance());
 
 		(account_id, balance)
 	}
@@ -408,7 +408,9 @@ impl<T: Config> Pallet<T> {
 	// Convert a call to it's call index by encoding the call and taking the first two bytes.
 	fn call_to_index(call: &<T as Config>::Call) -> Result<CallIndex, DispatchError> {
 		let encoded_call = call.encode();
-		if encoded_call.len() < 2 { Err(Error::<T>::EncodingFailed)? }
+		if encoded_call.len() < 2 {
+			Err(Error::<T>::EncodingFailed)?
+		}
 		return Ok((encoded_call[0], encoded_call[1]))
 	}
 
@@ -417,30 +419,39 @@ impl<T: Config> Pallet<T> {
 		// Check the call is valid lottery
 		let config = Lottery::<T>::get().ok_or(Error::<T>::NotConfigured)?;
 		let block_number = frame_system::Pallet::<T>::block_number();
-		ensure!(block_number < config.start.saturating_add(config.length), Error::<T>::AlreadyEnded);
+		ensure!(
+			block_number < config.start.saturating_add(config.length),
+			Error::<T>::AlreadyEnded
+		);
 		ensure!(T::ValidateCall::validate_call(call), Error::<T>::InvalidCall);
 		let call_index = Self::call_to_index(call)?;
 		let ticket_count = TicketsCount::<T>::get();
 		let new_ticket_count = ticket_count.checked_add(1).ok_or(ArithmeticError::Overflow)?;
 		// Try to update the participant status
-		Participants::<T>::try_mutate(&caller, |(lottery_index, participating_calls)| -> DispatchResult {
-			let index = LotteryIndex::<T>::get();
-			// If lottery index doesn't match, then reset participating calls and index.
-			if *lottery_index != index {
-				*participating_calls = Vec::new();
-				*lottery_index = index;
-			} else {
-				// Check that user is not already participating under this call.
-				ensure!(!participating_calls.iter().any(|c| call_index == *c), Error::<T>::AlreadyParticipating);
-			}
-			// Check user has enough funds and send it to the Lottery account.
-			T::Currency::transfer(caller, &Self::account_id(), config.price, KeepAlive)?;
-			// Create a new ticket.
-			TicketsCount::<T>::put(new_ticket_count);
-			Tickets::<T>::insert(ticket_count, caller.clone());
-			participating_calls.push(call_index);
-			Ok(())
-		})?;
+		Participants::<T>::try_mutate(
+			&caller,
+			|(lottery_index, participating_calls)| -> DispatchResult {
+				let index = LotteryIndex::<T>::get();
+				// If lottery index doesn't match, then reset participating calls and index.
+				if *lottery_index != index {
+					*participating_calls = Vec::new();
+					*lottery_index = index;
+				} else {
+					// Check that user is not already participating under this call.
+					ensure!(
+						!participating_calls.iter().any(|c| call_index == *c),
+						Error::<T>::AlreadyParticipating
+					);
+				}
+				// Check user has enough funds and send it to the Lottery account.
+				T::Currency::transfer(caller, &Self::account_id(), config.price, KeepAlive)?;
+				// Create a new ticket.
+				TicketsCount::<T>::put(new_ticket_count);
+				Tickets::<T>::insert(ticket_count, caller.clone());
+				participating_calls.push(call_index);
+				Ok(())
+			},
+		)?;
 
 		Self::deposit_event(Event::<T>::TicketBought(caller.clone(), call_index));
 
@@ -452,9 +463,9 @@ impl<T: Config> Pallet<T> {
 		let mut random_number = Self::generate_random_number(0);
 
 		// Best effort attempt to remove bias from modulus operator.
-		for i in 1 .. T::MaxGenerateRandom::get() {
+		for i in 1..T::MaxGenerateRandom::get() {
 			if random_number < u32::MAX - u32::MAX % total {
-				break;
+				break
 			}
 
 			random_number = Self::generate_random_number(i);
diff --git a/frame/lottery/src/mock.rs b/frame/lottery/src/mock.rs
index 885e81bb32ea..253923de0d5e 100644
--- a/frame/lottery/src/mock.rs
+++ b/frame/lottery/src/mock.rs
@@ -25,13 +25,13 @@ use frame_support::{
 	traits::{OnFinalize, OnInitialize},
 };
 use frame_support_test::TestRandomness;
+use frame_system::EnsureRoot;
 use sp_core::H256;
 use sp_runtime::{
-	Perbill,
 	testing::Header,
 	traits::{BlakeTwo256, IdentityLookup},
+	Perbill,
 };
-use frame_system::EnsureRoot;
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -123,7 +123,9 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
 	pallet_balances::GenesisConfig::<Test> {
 		balances: vec![(1, 100), (2, 100), (3, 100), (4, 100), (5, 100)],
-	}.assimilate_storage(&mut t).unwrap();
+	}
+	.assimilate_storage(&mut t)
+	.unwrap();
 	t.into()
 }
 
diff --git a/frame/lottery/src/tests.rs b/frame/lottery/src/tests.rs
index 38994b2864c6..800ae223d973 100644
--- a/frame/lottery/src/tests.rs
+++ b/frame/lottery/src/tests.rs
@@ -18,13 +18,12 @@
 //! Tests for the module.
 
 use super::*;
+use frame_support::{assert_noop, assert_ok};
 use mock::{
-	Lottery, Balances, Test, Origin, Call, SystemCall, BalancesCall,
-	new_test_ext, run_to_block
+	new_test_ext, run_to_block, Balances, BalancesCall, Call, Lottery, Origin, SystemCall, Test,
 };
-use sp_runtime::traits::{BadOrigin};
-use frame_support::{assert_noop, assert_ok};
 use pallet_balances::Error as BalancesError;
+use sp_runtime::traits::BadOrigin;
 
 #[test]
 fn initial_state() {
@@ -86,13 +85,7 @@ fn basic_end_to_end_works() {
 		assert_eq!(LotteryIndex::<Test>::get(), 2);
 		assert_eq!(
 			crate::Lottery::<Test>::get().unwrap(),
-			LotteryConfig {
-				price,
-				start: 25,
-				length,
-				delay,
-				repeat: true,
-			}
+			LotteryConfig { price, start: 25, length, delay, repeat: true }
 		);
 	});
 }
@@ -184,10 +177,7 @@ fn buy_ticket_works_as_simple_passthrough() {
 		);
 
 		let bad_origin_call = Box::new(Call::Balances(BalancesCall::force_transfer(0, 0, 0)));
-		assert_noop!(
-			Lottery::buy_ticket(Origin::signed(1), bad_origin_call),
-			BadOrigin,
-		);
+		assert_noop!(Lottery::buy_ticket(Origin::signed(1), bad_origin_call), BadOrigin,);
 
 		// User can call other txs, but doesn't get a ticket
 		let remark_call = Box::new(Call::System(SystemCall::remark(b"hello, world!".to_vec())));
@@ -210,7 +200,6 @@ fn buy_ticket_works() {
 		];
 		assert_ok!(Lottery::set_calls(Origin::root(), calls));
 
-
 		// Can't buy ticket before start
 		let call = Box::new(Call::Balances(BalancesCall::transfer(2, 1)));
 		assert_ok!(Lottery::buy_ticket(Origin::signed(1), call.clone()));
diff --git a/frame/lottery/src/weights.rs b/frame/lottery/src/weights.rs
index a73d0b667e35..1b191ef53459 100644
--- a/frame/lottery/src/weights.rs
+++ b/frame/lottery/src/weights.rs
@@ -36,6 +36,7 @@
 // --template=./.maintain/frame-weight-template.hbs
 
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
diff --git a/frame/membership/src/lib.rs b/frame/membership/src/lib.rs
index c834ed23659e..ed0c78f82d26 100644
--- a/frame/membership/src/lib.rs
+++ b/frame/membership/src/lib.rs
@@ -23,12 +23,12 @@
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use sp_std::prelude::*;
 use frame_support::{
-	decl_module, decl_storage, decl_event, decl_error,
-	traits::{ChangeMembers, InitializeMembers, EnsureOrigin, Contains, SortedMembers, Get},
+	decl_error, decl_event, decl_module, decl_storage,
+	traits::{ChangeMembers, Contains, EnsureOrigin, Get, InitializeMembers, SortedMembers},
 };
 use frame_system::ensure_signed;
+use sp_std::prelude::*;
 
 pub mod weights;
 pub use weights::WeightInfo;
@@ -321,10 +321,10 @@ impl<T: Config<I>, I: Instance> SortedMembers<T::AccountId> for Module<T, I> {
 
 #[cfg(feature = "runtime-benchmarks")]
 mod benchmark {
-	use super::{*, Module as Membership};
+	use super::{Module as Membership, *};
+	use frame_benchmarking::{account, benchmarks_instance, impl_benchmark_test_suite, whitelist};
+	use frame_support::{assert_ok, traits::EnsureOrigin};
 	use frame_system::RawOrigin;
-	use frame_support::{traits::EnsureOrigin, assert_ok};
-	use frame_benchmarking::{benchmarks_instance, whitelist, account, impl_benchmark_test_suite};
 
 	const SEED: u32 = 0;
 
@@ -467,10 +467,13 @@ mod tests {
 	use super::*;
 	use crate as pallet_membership;
 
-	use frame_support::{assert_ok, assert_noop, parameter_types, ord_parameter_types};
-	use sp_core::H256;
-	use sp_runtime::{traits::{BlakeTwo256, IdentityLookup, BadOrigin}, testing::Header};
+	use frame_support::{assert_noop, assert_ok, ord_parameter_types, parameter_types};
 	use frame_system::EnsureSignedBy;
+	use sp_core::H256;
+	use sp_runtime::{
+		testing::Header,
+		traits::{BadOrigin, BlakeTwo256, IdentityLookup},
+	};
 
 	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 	type Block = frame_system::mocking::MockBlock<Test>;
@@ -572,10 +575,12 @@ mod tests {
 	pub(crate) fn new_test_ext() -> sp_io::TestExternalities {
 		let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
 		// We use default for brevity, but you can configure as desired if needed.
-		pallet_membership::GenesisConfig::<Test>{
+		pallet_membership::GenesisConfig::<Test> {
 			members: vec![10, 20, 30],
-			.. Default::default()
-		}.assimilate_storage(&mut t).unwrap();
+			..Default::default()
+		}
+		.assimilate_storage(&mut t)
+		.unwrap();
 		t.into()
 	}
 
@@ -617,7 +622,10 @@ mod tests {
 	fn add_member_works() {
 		new_test_ext().execute_with(|| {
 			assert_noop!(Membership::add_member(Origin::signed(5), 15), BadOrigin);
-			assert_noop!(Membership::add_member(Origin::signed(1), 10), Error::<Test, _>::AlreadyMember);
+			assert_noop!(
+				Membership::add_member(Origin::signed(1), 10),
+				Error::<Test, _>::AlreadyMember
+			);
 			assert_ok!(Membership::add_member(Origin::signed(1), 15));
 			assert_eq!(Membership::members(), vec![10, 15, 20, 30]);
 			assert_eq!(MEMBERS.with(|m| m.borrow().clone()), Membership::members());
@@ -628,7 +636,10 @@ mod tests {
 	fn remove_member_works() {
 		new_test_ext().execute_with(|| {
 			assert_noop!(Membership::remove_member(Origin::signed(5), 20), BadOrigin);
-			assert_noop!(Membership::remove_member(Origin::signed(2), 15), Error::<Test, _>::NotMember);
+			assert_noop!(
+				Membership::remove_member(Origin::signed(2), 15),
+				Error::<Test, _>::NotMember
+			);
 			assert_ok!(Membership::set_prime(Origin::signed(5), 20));
 			assert_ok!(Membership::remove_member(Origin::signed(2), 20));
 			assert_eq!(Membership::members(), vec![10, 30]);
@@ -642,8 +653,14 @@ mod tests {
 	fn swap_member_works() {
 		new_test_ext().execute_with(|| {
 			assert_noop!(Membership::swap_member(Origin::signed(5), 10, 25), BadOrigin);
-			assert_noop!(Membership::swap_member(Origin::signed(3), 15, 25), Error::<Test, _>::NotMember);
-			assert_noop!(Membership::swap_member(Origin::signed(3), 10, 30), Error::<Test, _>::AlreadyMember);
+			assert_noop!(
+				Membership::swap_member(Origin::signed(3), 15, 25),
+				Error::<Test, _>::NotMember
+			);
+			assert_noop!(
+				Membership::swap_member(Origin::signed(3), 10, 30),
+				Error::<Test, _>::AlreadyMember
+			);
 
 			assert_ok!(Membership::set_prime(Origin::signed(5), 20));
 			assert_ok!(Membership::swap_member(Origin::signed(3), 20, 20));
@@ -673,8 +690,14 @@ mod tests {
 	fn change_key_works() {
 		new_test_ext().execute_with(|| {
 			assert_ok!(Membership::set_prime(Origin::signed(5), 10));
-			assert_noop!(Membership::change_key(Origin::signed(3), 25), Error::<Test, _>::NotMember);
-			assert_noop!(Membership::change_key(Origin::signed(10), 20), Error::<Test, _>::AlreadyMember);
+			assert_noop!(
+				Membership::change_key(Origin::signed(3), 25),
+				Error::<Test, _>::NotMember
+			);
+			assert_noop!(
+				Membership::change_key(Origin::signed(10), 20),
+				Error::<Test, _>::AlreadyMember
+			);
 			assert_ok!(Membership::change_key(Origin::signed(10), 40));
 			assert_eq!(Membership::members(), vec![20, 30, 40]);
 			assert_eq!(MEMBERS.with(|m| m.borrow().clone()), Membership::members());
@@ -718,6 +741,8 @@ mod tests {
 		pallet_membership::GenesisConfig::<Test> {
 			members: vec![1, 2, 3, 1],
 			phantom: Default::default(),
-		}.build_storage().unwrap();
+		}
+		.build_storage()
+		.unwrap();
 	}
 }
diff --git a/frame/membership/src/weights.rs b/frame/membership/src/weights.rs
index 8e2d8bb26616..bd2a09cb534c 100644
--- a/frame/membership/src/weights.rs
+++ b/frame/membership/src/weights.rs
@@ -36,6 +36,7 @@
 // --template=./.maintain/frame-weight-template.hbs
 
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
diff --git a/frame/merkle-mountain-range/primitives/src/lib.rs b/frame/merkle-mountain-range/primitives/src/lib.rs
index 7b562656a1e0..c556583a9dd1 100644
--- a/frame/merkle-mountain-range/primitives/src/lib.rs
+++ b/frame/merkle-mountain-range/primitives/src/lib.rs
@@ -21,7 +21,7 @@
 #![warn(missing_docs)]
 
 use frame_support::RuntimeDebug;
-use sp_runtime::traits::{self, Saturating, One};
+use sp_runtime::traits::{self, One, Saturating};
 use sp_std::fmt;
 #[cfg(not(feature = "std"))]
 use sp_std::prelude::Vec;
@@ -55,16 +55,10 @@ impl LeafDataProvider for () {
 /// current block hash is not available (since the block is not finished yet),
 /// we use the `parent_hash` here along with parent block number.
 impl<T: frame_system::Config> LeafDataProvider for frame_system::Pallet<T> {
-	type LeafData = (
-		<T as frame_system::Config>::BlockNumber,
-		<T as frame_system::Config>::Hash
-	);
+	type LeafData = (<T as frame_system::Config>::BlockNumber, <T as frame_system::Config>::Hash);
 
 	fn leaf_data() -> Self::LeafData {
-		(
-			Self::block_number().saturating_sub(One::one()),
-			Self::parent_hash()
-		)
+		(Self::block_number().saturating_sub(One::one()), Self::parent_hash())
 	}
 }
 
@@ -130,7 +124,8 @@ mod encoding {
 		fn encode_to<T: codec::Output + ?Sized>(&self, dest: &mut T) {
 			match self {
 				Self::Data(l) => l.using_encoded(
-					|data| Either::<&[u8], &H::Output>::Left(data).encode_to(dest), false
+					|data| Either::<&[u8], &H::Output>::Left(data).encode_to(dest),
+					false,
 				),
 				Self::Hash(h) => Either::<&[u8], &H::Output>::Right(h).encode_to(dest),
 			}
@@ -258,7 +253,8 @@ macro_rules! impl_leaf_data_for_tuple {
 
 /// Test functions implementation for `Compact<H, (DataOrHash<H, Tuple>, ...)>`
 #[cfg(test)]
-impl<H, A, B> Compact<H, (DataOrHash<H, A>, DataOrHash<H, B>)> where
+impl<H, A, B> Compact<H, (DataOrHash<H, A>, DataOrHash<H, B>)>
+where
 	H: traits::Hash,
 	A: FullLeaf,
 	B: FullLeaf,
@@ -346,7 +342,7 @@ pub struct OpaqueLeaf(
 	///
 	/// NOTE it DOES NOT include length prefix (like `Vec<u8>` encoding would).
 	#[cfg_attr(feature = "std", serde(with = "sp_core::bytes"))]
-	pub Vec<u8>
+	pub Vec<u8>,
 );
 
 impl OpaqueLeaf {
@@ -474,25 +470,21 @@ mod tests {
 		];
 
 		// when
-		let encoded = cases
-			.iter()
-			.map(codec::Encode::encode)
-			.collect::<Vec<_>>();
+		let encoded = cases.iter().map(codec::Encode::encode).collect::<Vec<_>>();
 
-		let decoded = encoded
-			.iter()
-			.map(|x| Test::decode(&mut &**x))
-			.collect::<Vec<_>>();
+		let decoded = encoded.iter().map(|x| Test::decode(&mut &**x)).collect::<Vec<_>>();
 
 		// then
-		assert_eq!(decoded, cases.into_iter().map(Result::<_, codec::Error>::Ok).collect::<Vec<_>>());
+		assert_eq!(
+			decoded,
+			cases.into_iter().map(Result::<_, codec::Error>::Ok).collect::<Vec<_>>()
+		);
 		// check encoding correctness
 		assert_eq!(&encoded[0], &hex_literal::hex!("00343048656c6c6f20576f726c6421"));
 		assert_eq!(
 			encoded[1].as_slice(),
-			hex_literal::hex!(
-				"01c3e7ba6b511162fead58f2c8b5764ce869ed1118011ac37392522ed16720bbcd"
-			).as_ref()
+			hex_literal::hex!("01c3e7ba6b511162fead58f2c8b5764ce869ed1118011ac37392522ed16720bbcd")
+				.as_ref()
 		);
 	}
 
@@ -519,10 +511,7 @@ mod tests {
 
 		// when
 		let c: TestCompact = Compact::new((a.clone(), b.clone()));
-		let d: TestCompact = Compact::new((
-			Test::Hash(a.hash()),
-			Test::Hash(b.hash()),
-		));
+		let d: TestCompact = Compact::new((Test::Hash(a.hash()), Test::Hash(b.hash())));
 
 		// then
 		assert_eq!(c.hash(), d.hash());
@@ -535,35 +524,28 @@ mod tests {
 		let b = Test::Data("".into());
 
 		let c: TestCompact = Compact::new((a.clone(), b.clone()));
-		let d: TestCompact = Compact::new((
-			Test::Hash(a.hash()),
-			Test::Hash(b.hash()),
-		));
+		let d: TestCompact = Compact::new((Test::Hash(a.hash()), Test::Hash(b.hash())));
 		let cases = vec![c, d.clone()];
 
 		// when
-		let encoded_compact = cases
-			.iter()
-			.map(|c| c.using_encoded(|x| x.to_vec(), true))
-			.collect::<Vec<_>>();
+		let encoded_compact =
+			cases.iter().map(|c| c.using_encoded(|x| x.to_vec(), true)).collect::<Vec<_>>();
 
-		let encoded = cases
-			.iter()
-			.map(|c| c.using_encoded(|x| x.to_vec(), false))
-			.collect::<Vec<_>>();
+		let encoded =
+			cases.iter().map(|c| c.using_encoded(|x| x.to_vec(), false)).collect::<Vec<_>>();
 
 		let decoded_compact = encoded_compact
 			.iter()
 			.map(|x| TestCompact::decode(&mut &**x))
 			.collect::<Vec<_>>();
 
-		let decoded = encoded
-			.iter()
-			.map(|x| TestCompact::decode(&mut &**x))
-			.collect::<Vec<_>>();
+		let decoded = encoded.iter().map(|x| TestCompact::decode(&mut &**x)).collect::<Vec<_>>();
 
 		// then
-		assert_eq!(decoded, cases.into_iter().map(Result::<_, codec::Error>::Ok).collect::<Vec<_>>());
+		assert_eq!(
+			decoded,
+			cases.into_iter().map(Result::<_, codec::Error>::Ok).collect::<Vec<_>>()
+		);
 
 		assert_eq!(decoded_compact, vec![Ok(d.clone()), Ok(d.clone())]);
 	}
@@ -575,10 +557,7 @@ mod tests {
 		let b = Test::Data("".into());
 
 		let c: TestCompact = Compact::new((a.clone(), b.clone()));
-		let d: TestCompact = Compact::new((
-			Test::Hash(a.hash()),
-			Test::Hash(b.hash()),
-		));
+		let d: TestCompact = Compact::new((Test::Hash(a.hash()), Test::Hash(b.hash())));
 		let cases = vec![c, d.clone()];
 
 		let encoded_compact = cases
@@ -587,16 +566,10 @@ mod tests {
 			.map(OpaqueLeaf::from_encoded_leaf)
 			.collect::<Vec<_>>();
 
-		let opaque = cases
-			.iter()
-			.map(OpaqueLeaf::from_leaf)
-			.collect::<Vec<_>>();
+		let opaque = cases.iter().map(OpaqueLeaf::from_leaf).collect::<Vec<_>>();
 
 		// then
-		assert_eq!(
-			encoded_compact,
-			opaque,
-		);
+		assert_eq!(encoded_compact, opaque,);
 	}
 
 	#[test]
@@ -610,10 +583,7 @@ mod tests {
 		let case3 = a.encode().encode();
 
 		// when
-		let encoded = vec![&case1, &case2]
-			.into_iter()
-			.map(|x| x.encode())
-			.collect::<Vec<_>>();
+		let encoded = vec![&case1, &case2].into_iter().map(|x| x.encode()).collect::<Vec<_>>();
 		let decoded = vec![&*encoded[0], &*encoded[1], &*case3]
 			.into_iter()
 			.map(|x| EncodableOpaqueLeaf::decode(&mut &*x))
diff --git a/frame/merkle-mountain-range/rpc/src/lib.rs b/frame/merkle-mountain-range/rpc/src/lib.rs
index fb46fc6280b8..4719893778f6 100644
--- a/frame/merkle-mountain-range/rpc/src/lib.rs
+++ b/frame/merkle-mountain-range/rpc/src/lib.rs
@@ -26,14 +26,11 @@ use jsonrpc_core::{Error, ErrorCode, Result};
 use jsonrpc_derive::rpc;
 use serde::{Deserialize, Serialize};
 
+use pallet_mmr_primitives::{Error as MmrError, Proof};
 use sp_api::ProvideRuntimeApi;
 use sp_blockchain::HeaderBackend;
 use sp_core::Bytes;
-use sp_runtime::{
-	generic::BlockId,
-	traits::{Block as BlockT},
-};
-use pallet_mmr_primitives::{Error as MmrError, Proof};
+use sp_runtime::{generic::BlockId, traits::Block as BlockT};
 
 pub use pallet_mmr_primitives::MmrApi as MmrRuntimeApi;
 
@@ -51,19 +48,12 @@ pub struct LeafProof<BlockHash> {
 
 impl<BlockHash> LeafProof<BlockHash> {
 	/// Create new `LeafProof` from given concrete `leaf` and `proof`.
-	pub fn new<Leaf, MmrHash>(
-		block_hash: BlockHash,
-		leaf: Leaf,
-		proof: Proof<MmrHash>,
-	) -> Self where
+	pub fn new<Leaf, MmrHash>(block_hash: BlockHash, leaf: Leaf, proof: Proof<MmrHash>) -> Self
+	where
 		Leaf: Encode,
 		MmrHash: Encode,
 	{
-		Self {
-			block_hash,
-			leaf: Bytes(leaf.encode()),
-			proof: Bytes(proof.encode()),
-		}
+		Self { block_hash, leaf: Bytes(leaf.encode()), proof: Bytes(proof.encode()) }
 	}
 }
 
@@ -95,21 +85,15 @@ pub struct Mmr<C, B> {
 impl<C, B> Mmr<C, B> {
 	/// Create new `Mmr` with the given reference to the client.
 	pub fn new(client: Arc<C>) -> Self {
-		Self {
-			client,
-			_marker: Default::default(),
-		}
+		Self { client, _marker: Default::default() }
 	}
 }
 
-impl<C, Block, MmrHash> MmrApi<<Block as BlockT>::Hash,> for Mmr<C, (Block, MmrHash)>
+impl<C, Block, MmrHash> MmrApi<<Block as BlockT>::Hash> for Mmr<C, (Block, MmrHash)>
 where
 	Block: BlockT,
 	C: Send + Sync + 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block>,
-	C::Api: MmrRuntimeApi<
-		Block,
-		MmrHash,
-	>,
+	C::Api: MmrRuntimeApi<Block, MmrHash>,
 	MmrHash: Codec + Send + Sync + 'static,
 {
 	fn generate_proof(
@@ -120,8 +104,7 @@ where
 		let api = self.client.runtime_api();
 		let block_hash = at.unwrap_or_else(||
 			// If the block hash is not supplied assume the best block.
-			self.client.info().best_hash
-		);
+			self.client.info().best_hash);
 
 		let (leaf, proof) = api
 			.generate_proof_with_context(
@@ -202,11 +185,14 @@ mod tests {
 		let expected = LeafProof {
 			block_hash: H256::repeat_byte(0),
 			leaf: Bytes(vec![1_u8, 2, 3, 4].encode()),
-			proof: Bytes(Proof {
-				leaf_index: 1,
-				leaf_count: 9,
-				items: vec![H256::repeat_byte(1), H256::repeat_byte(2)],
-			}.encode()),
+			proof: Bytes(
+				Proof {
+					leaf_index: 1,
+					leaf_count: 9,
+					items: vec![H256::repeat_byte(1), H256::repeat_byte(2)],
+				}
+				.encode(),
+			),
 		};
 
 		// when
@@ -218,6 +204,5 @@ mod tests {
 
 		// then
 		assert_eq!(actual, expected);
-
 	}
 }
diff --git a/frame/merkle-mountain-range/src/benchmarking.rs b/frame/merkle-mountain-range/src/benchmarking.rs
index af7531a00bdc..97a880b222ec 100644
--- a/frame/merkle-mountain-range/src/benchmarking.rs
+++ b/frame/merkle-mountain-range/src/benchmarking.rs
@@ -20,8 +20,8 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use crate::*;
-use frame_support::traits::OnInitialize;
 use frame_benchmarking::{benchmarks_instance_pallet, impl_benchmark_test_suite};
+use frame_support::traits::OnInitialize;
 
 benchmarks_instance_pallet! {
 	on_initialize {
@@ -37,8 +37,4 @@ benchmarks_instance_pallet! {
 	}
 }
 
-impl_benchmark_test_suite!(
-	Pallet,
-	crate::tests::new_test_ext(),
-	crate::mock::Test,
-);
+impl_benchmark_test_suite!(Pallet, crate::tests::new_test_ext(), crate::mock::Test,);
diff --git a/frame/merkle-mountain-range/src/default_weights.rs b/frame/merkle-mountain-range/src/default_weights.rs
index 98bb404e3f3a..6308975ce7d2 100644
--- a/frame/merkle-mountain-range/src/default_weights.rs
+++ b/frame/merkle-mountain-range/src/default_weights.rs
@@ -19,7 +19,8 @@
 //! This file was not auto-generated.
 
 use frame_support::weights::{
-	Weight, constants::{WEIGHT_PER_NANOS, RocksDbWeight as DbWeight},
+	constants::{RocksDbWeight as DbWeight, WEIGHT_PER_NANOS},
+	Weight,
 };
 
 impl crate::WeightInfo for () {
@@ -34,9 +35,6 @@ impl crate::WeightInfo for () {
 		leaf_weight
 			.saturating_add(hash_weight)
 			.saturating_add(hook_weight)
-			.saturating_add(DbWeight::get().reads_writes(
-				2 + peaks,
-				2 + peaks,
-			))
+			.saturating_add(DbWeight::get().reads_writes(2 + peaks, 2 + peaks))
 	}
 }
diff --git a/frame/merkle-mountain-range/src/lib.rs b/frame/merkle-mountain-range/src/lib.rs
index 307326b59b65..974b868f6105 100644
--- a/frame/merkle-mountain-range/src/lib.rs
+++ b/frame/merkle-mountain-range/src/lib.rs
@@ -40,38 +40,37 @@
 //!
 //! ## What for?
 //!
-//!	Primary use case for this pallet is to generate MMR root hashes, that can latter on be used by
-//!	BEEFY protocol (see <https://github.com/paritytech/grandpa-bridge-gadget>).
-//!	MMR root hashes along with BEEFY will make it possible to build Super Light Clients (SLC) of
-//!	Substrate-based chains. The SLC will be able to follow finality and can be shown proofs of more
-//!	details that happened on the source chain.
-//!	In that case the chain which contains the pallet generates the Root Hashes and Proofs, which
-//!	are then presented to another chain acting as a light client which can verify them.
+//! Primary use case for this pallet is to generate MMR root hashes, that can latter on be used by
+//! BEEFY protocol (see <https://github.com/paritytech/grandpa-bridge-gadget>).
+//! MMR root hashes along with BEEFY will make it possible to build Super Light Clients (SLC) of
+//! Substrate-based chains. The SLC will be able to follow finality and can be shown proofs of more
+//! details that happened on the source chain.
+//! In that case the chain which contains the pallet generates the Root Hashes and Proofs, which
+//! are then presented to another chain acting as a light client which can verify them.
 //!
-//!	Secondary use case is to archive historical data, but still be able to retrieve them on-demand
-//!	if needed. For instance if parent block hashes are stored in the MMR it's possible at any point
-//!	in time to provide a MMR proof about some past block hash, while this data can be safely pruned
-//!	from on-chain storage.
+//! Secondary use case is to archive historical data, but still be able to retrieve them on-demand
+//! if needed. For instance if parent block hashes are stored in the MMR it's possible at any point
+//! in time to provide a MMR proof about some past block hash, while this data can be safely pruned
+//! from on-chain storage.
 //!
 //! NOTE This pallet is experimental and not proven to work in production.
-//!
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use codec::Encode;
 use frame_support::weights::Weight;
 use sp_runtime::traits;
 
-mod default_weights;
-mod mmr;
 #[cfg(any(feature = "runtime-benchmarks", test))]
 mod benchmarking;
+mod default_weights;
+mod mmr;
 #[cfg(test)]
 mod mock;
 #[cfg(test)]
 mod tests;
 
-pub use pallet_mmr_primitives as primitives;
 pub use pallet::*;
+pub use pallet_mmr_primitives as primitives;
 
 pub trait WeightInfo {
 	fn on_initialize(peaks: u64) -> Weight;
@@ -79,9 +78,9 @@ pub trait WeightInfo {
 
 #[frame_support::pallet]
 pub mod pallet {
+	use super::*;
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
-	use super::*;
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
@@ -116,8 +115,15 @@ pub mod pallet {
 		///
 		/// This type is actually going to be stored in the MMR.
 		/// Required to be provided again, to satisfy trait bounds for storage items.
-		type Hash: traits::Member + traits::MaybeSerializeDeserialize + sp_std::fmt::Debug
-			+ sp_std::hash::Hash + AsRef<[u8]> + AsMut<[u8]> + Copy + Default + codec::Codec
+		type Hash: traits::Member
+			+ traits::MaybeSerializeDeserialize
+			+ sp_std::fmt::Debug
+			+ sp_std::hash::Hash
+			+ AsRef<[u8]>
+			+ AsMut<[u8]>
+			+ Copy
+			+ Default
+			+ codec::Codec
 			+ codec::EncodeLike;
 
 		/// Data stored in the leaf nodes.
@@ -147,7 +153,8 @@ pub mod pallet {
 	/// Latest MMR Root hash.
 	#[pallet::storage]
 	#[pallet::getter(fn mmr_root_hash)]
-	pub type RootHash<T: Config<I>, I: 'static = ()> = StorageValue<_, <T as Config<I>>::Hash, ValueQuery>;
+	pub type RootHash<T: Config<I>, I: 'static = ()> =
+		StorageValue<_, <T as Config<I>>::Hash, ValueQuery>;
 
 	/// Current size of the MMR (number of leaves).
 	#[pallet::storage]
@@ -160,13 +167,8 @@ pub mod pallet {
 	/// are pruned and only stored in the Offchain DB.
 	#[pallet::storage]
 	#[pallet::getter(fn mmr_peak)]
-	pub type Nodes<T: Config<I>, I: 'static = ()> = StorageMap<
-		_,
-		Identity,
-		u64,
-		<T as Config<I>>::Hash,
-		OptionQuery
-	>;
+	pub type Nodes<T: Config<I>, I: 'static = ()> =
+		StorageMap<_, Identity, u64, <T as Config<I>>::Hash, OptionQuery>;
 
 	#[pallet::hooks]
 	impl<T: Config<I>, I: 'static> Hooks<BlockNumberFor<T>> for Pallet<T, I> {
@@ -211,7 +213,8 @@ pub fn verify_leaf_proof<H, L>(
 	root: H::Output,
 	leaf: mmr::Node<H, L>,
 	proof: primitives::Proof<H::Output>,
-) -> Result<(), primitives::Error> where
+) -> Result<(), primitives::Error>
+where
 	H: traits::Hash,
 	L: primitives::FullLeaf,
 {
@@ -234,10 +237,9 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	/// (Offchain Worker or Runtime API call), since it requires
 	/// all the leaves to be present.
 	/// It may return an error or panic if used incorrectly.
-	pub fn generate_proof(leaf_index: u64) -> Result<
-		(LeafOf<T, I>, primitives::Proof<<T as Config<I>>::Hash>),
-		primitives::Error,
-	> {
+	pub fn generate_proof(
+		leaf_index: u64,
+	) -> Result<(LeafOf<T, I>, primitives::Proof<<T as Config<I>>::Hash>), primitives::Error> {
 		let mmr: ModuleMmr<mmr::storage::OffchainStorage, T, I> = mmr::Mmr::new(Self::mmr_leaves());
 		mmr.generate_proof(leaf_index)
 	}
@@ -252,13 +254,12 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		leaf: LeafOf<T, I>,
 		proof: primitives::Proof<<T as Config<I>>::Hash>,
 	) -> Result<(), primitives::Error> {
-		if proof.leaf_count > Self::mmr_leaves()
-			|| proof.leaf_count == 0
-			|| proof.items.len() as u32 > mmr::utils::NodesUtils::new(proof.leaf_count).depth()
+		if proof.leaf_count > Self::mmr_leaves() ||
+			proof.leaf_count == 0 ||
+			proof.items.len() as u32 > mmr::utils::NodesUtils::new(proof.leaf_count).depth()
 		{
-			return Err(primitives::Error::Verify.log_debug(
-				"The proof has incorrect number of leaves or proof items."
-			));
+			return Err(primitives::Error::Verify
+				.log_debug("The proof has incorrect number of leaves or proof items."))
 		}
 
 		let mmr: ModuleMmr<mmr::storage::RuntimeStorage, T, I> = mmr::Mmr::new(proof.leaf_count);
diff --git a/frame/merkle-mountain-range/src/mmr/mmr.rs b/frame/merkle-mountain-range/src/mmr/mmr.rs
index 53b76ba8000a..d5036e58f432 100644
--- a/frame/merkle-mountain-range/src/mmr/mmr.rs
+++ b/frame/merkle-mountain-range/src/mmr/mmr.rs
@@ -16,13 +16,13 @@
 // limitations under the License.
 
 use crate::{
-	Config, HashingOf,
 	mmr::{
-		Node, NodeOf, Hasher,
-		storage::{Storage, OffchainStorage, RuntimeStorage},
+		storage::{OffchainStorage, RuntimeStorage, Storage},
 		utils::NodesUtils,
+		Hasher, Node, NodeOf,
 	},
 	primitives::{self, Error},
+	Config, HashingOf,
 };
 #[cfg(not(feature = "std"))]
 use sp_std::vec;
@@ -32,45 +32,39 @@ pub fn verify_leaf_proof<H, L>(
 	root: H::Output,
 	leaf: Node<H, L>,
 	proof: primitives::Proof<H::Output>,
-) -> Result<bool, Error> where
+) -> Result<bool, Error>
+where
 	H: sp_runtime::traits::Hash,
 	L: primitives::FullLeaf,
 {
 	let size = NodesUtils::new(proof.leaf_count).size();
 	let leaf_position = mmr_lib::leaf_index_to_pos(proof.leaf_index);
 
-	let p = mmr_lib::MerkleProof::<
-		Node<H, L>,
-		Hasher<H, L>,
-	>::new(
+	let p = mmr_lib::MerkleProof::<Node<H, L>, Hasher<H, L>>::new(
 		size,
 		proof.items.into_iter().map(Node::Hash).collect(),
 	);
-	p.verify(
-		Node::Hash(root),
-		vec![(leaf_position, leaf)],
-	).map_err(|e| Error::Verify.log_debug(e))
+	p.verify(Node::Hash(root), vec![(leaf_position, leaf)])
+		.map_err(|e| Error::Verify.log_debug(e))
 }
 
 /// A wrapper around a MMR library to expose limited functionality.
 ///
 /// Available functions depend on the storage kind ([Runtime](crate::mmr::storage::RuntimeStorage)
 /// vs [Off-chain](crate::mmr::storage::OffchainStorage)).
-pub struct Mmr<StorageType, T, I, L> where
+pub struct Mmr<StorageType, T, I, L>
+where
 	T: Config<I>,
 	I: 'static,
 	L: primitives::FullLeaf,
 	Storage<StorageType, T, I, L>: mmr_lib::MMRStore<NodeOf<T, I, L>>,
 {
-	mmr: mmr_lib::MMR<
-		NodeOf<T, I, L>,
-		Hasher<HashingOf<T, I>, L>,
-		Storage<StorageType, T, I, L>
-	>,
+	mmr: mmr_lib::MMR<NodeOf<T, I, L>, Hasher<HashingOf<T, I>, L>, Storage<StorageType, T, I, L>>,
 	leaves: u64,
 }
 
-impl<StorageType, T, I, L> Mmr<StorageType, T, I, L> where
+impl<StorageType, T, I, L> Mmr<StorageType, T, I, L>
+where
 	T: Config<I>,
 	I: 'static,
 	L: primitives::FullLeaf,
@@ -79,10 +73,7 @@ impl<StorageType, T, I, L> Mmr<StorageType, T, I, L> where
 	/// Create a pointer to an existing MMR with given number of leaves.
 	pub fn new(leaves: u64) -> Self {
 		let size = NodesUtils::new(leaves).size();
-		Self {
-			mmr: mmr_lib::MMR::new(size, Default::default()),
-			leaves,
-		}
+		Self { mmr: mmr_lib::MMR::new(size, Default::default()), leaves }
 	}
 
 	/// Verify proof of a single leaf.
@@ -91,19 +82,14 @@ impl<StorageType, T, I, L> Mmr<StorageType, T, I, L> where
 		leaf: L,
 		proof: primitives::Proof<<T as Config<I>>::Hash>,
 	) -> Result<bool, Error> {
-		let p = mmr_lib::MerkleProof::<
-			NodeOf<T, I, L>,
-			Hasher<HashingOf<T, I>, L>,
-		>::new(
+		let p = mmr_lib::MerkleProof::<NodeOf<T, I, L>, Hasher<HashingOf<T, I>, L>>::new(
 			self.mmr.mmr_size(),
 			proof.items.into_iter().map(Node::Hash).collect(),
 		);
 		let position = mmr_lib::leaf_index_to_pos(proof.leaf_index);
 		let root = self.mmr.get_root().map_err(|e| Error::GetRoot.log_error(e))?;
-		p.verify(
-			root,
-			vec![(position, Node::Data(leaf))],
-		).map_err(|e| Error::Verify.log_debug(e))
+		p.verify(root, vec![(position, Node::Data(leaf))])
+			.map_err(|e| Error::Verify.log_debug(e))
 	}
 
 	/// Return the internal size of the MMR (number of nodes).
@@ -114,19 +100,18 @@ impl<StorageType, T, I, L> Mmr<StorageType, T, I, L> where
 }
 
 /// Runtime specific MMR functions.
-impl<T, I, L> Mmr<RuntimeStorage, T, I, L> where
+impl<T, I, L> Mmr<RuntimeStorage, T, I, L>
+where
 	T: Config<I>,
 	I: 'static,
 	L: primitives::FullLeaf,
 {
-
 	/// Push another item to the MMR.
 	///
 	/// Returns element position (index) in the MMR.
 	pub fn push(&mut self, leaf: L) -> Option<u64> {
-		let position = self.mmr.push(Node::Data(leaf))
-			.map_err(|e| Error::Push.log_error(e))
-			.ok()?;
+		let position =
+			self.mmr.push(Node::Data(leaf)).map_err(|e| Error::Push.log_error(e)).ok()?;
 
 		self.leaves += 1;
 
@@ -143,7 +128,8 @@ impl<T, I, L> Mmr<RuntimeStorage, T, I, L> where
 }
 
 /// Off-chain specific MMR functions.
-impl<T, I, L> Mmr<OffchainStorage, T, I, L> where
+impl<T, I, L> Mmr<OffchainStorage, T, I, L>
+where
 	T: Config<I>,
 	I: 'static,
 	L: primitives::FullLeaf + codec::Decode,
@@ -152,10 +138,10 @@ impl<T, I, L> Mmr<OffchainStorage, T, I, L> where
 	///
 	/// Proof generation requires all the nodes (or their hashes) to be available in the storage.
 	/// (i.e. you can't run the function in the pruned storage).
-	pub fn generate_proof(&self, leaf_index: u64) -> Result<
-		(L, primitives::Proof<<T as Config<I>>::Hash>),
-		Error
-	> {
+	pub fn generate_proof(
+		&self,
+		leaf_index: u64,
+	) -> Result<(L, primitives::Proof<<T as Config<I>>::Hash>), Error> {
 		let position = mmr_lib::leaf_index_to_pos(leaf_index);
 		let store = <Storage<OffchainStorage, T, I, L>>::default();
 		let leaf = match mmr_lib::MMRStore::get_elem(&store, position) {
@@ -163,7 +149,8 @@ impl<T, I, L> Mmr<OffchainStorage, T, I, L> where
 			e => return Err(Error::LeafNotFound.log_debug(e)),
 		};
 		let leaf_count = self.leaves;
-		self.mmr.gen_proof(vec![position])
+		self.mmr
+			.gen_proof(vec![position])
 			.map_err(|e| Error::GenerateProof.log_error(e))
 			.map(|p| primitives::Proof {
 				leaf_index,
@@ -173,4 +160,3 @@ impl<T, I, L> Mmr<OffchainStorage, T, I, L> where
 			.map(|p| (leaf, p))
 	}
 }
-
diff --git a/frame/merkle-mountain-range/src/mmr/mod.rs b/frame/merkle-mountain-range/src/mmr/mod.rs
index e705b247067e..ec2dfe245bd4 100644
--- a/frame/merkle-mountain-range/src/mmr/mod.rs
+++ b/frame/merkle-mountain-range/src/mmr/mod.rs
@@ -15,14 +15,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+mod mmr;
 pub mod storage;
 pub mod utils;
-mod mmr;
 
 use crate::primitives::FullLeaf;
 use sp_runtime::traits;
 
-pub use self::mmr::{Mmr, verify_leaf_proof};
+pub use self::mmr::{verify_leaf_proof, Mmr};
 
 /// Node type for runtime `T`.
 pub type NodeOf<T, I, L> = Node<<T as crate::Config<I>>::Hashing, L>;
diff --git a/frame/merkle-mountain-range/src/mmr/storage.rs b/frame/merkle-mountain-range/src/mmr/storage.rs
index 65fe19556630..09e24017816e 100644
--- a/frame/merkle-mountain-range/src/mmr/storage.rs
+++ b/frame/merkle-mountain-range/src/mmr/storage.rs
@@ -21,8 +21,10 @@ use codec::Encode;
 #[cfg(not(feature = "std"))]
 use sp_std::prelude::Vec;
 
-use crate::mmr::{NodeOf, Node};
-use crate::{NumberOfLeaves, Nodes, Pallet, Config, primitives};
+use crate::{
+	mmr::{Node, NodeOf},
+	primitives, Config, Nodes, NumberOfLeaves, Pallet,
+};
 
 /// A marker type for runtime-specific storage implementation.
 ///
@@ -44,9 +46,7 @@ pub struct OffchainStorage;
 ///
 /// There are two different implementations depending on the use case.
 /// See docs for [RuntimeStorage] and [OffchainStorage].
-pub struct Storage<StorageType, T, I, L>(
-	sp_std::marker::PhantomData<(StorageType, T, I, L)>
-);
+pub struct Storage<StorageType, T, I, L>(sp_std::marker::PhantomData<(StorageType, T, I, L)>);
 
 impl<StorageType, T, I, L> Default for Storage<StorageType, T, I, L> {
 	fn default() -> Self {
@@ -54,7 +54,8 @@ impl<StorageType, T, I, L> Default for Storage<StorageType, T, I, L> {
 	}
 }
 
-impl<T, I, L> mmr_lib::MMRStore<NodeOf<T, I, L>> for Storage<OffchainStorage, T, I, L> where
+impl<T, I, L> mmr_lib::MMRStore<NodeOf<T, I, L>> for Storage<OffchainStorage, T, I, L>
+where
 	T: Config<I>,
 	I: 'static,
 	L: primitives::FullLeaf + codec::Decode,
@@ -62,32 +63,30 @@ impl<T, I, L> mmr_lib::MMRStore<NodeOf<T, I, L>> for Storage<OffchainStorage, T,
 	fn get_elem(&self, pos: u64) -> mmr_lib::Result<Option<NodeOf<T, I, L>>> {
 		let key = Pallet::<T, I>::offchain_key(pos);
 		// Retrieve the element from Off-chain DB.
-		Ok(sp_io::offchain
-			::local_storage_get(sp_core::offchain::StorageKind::PERSISTENT, &key)
+		Ok(sp_io::offchain::local_storage_get(sp_core::offchain::StorageKind::PERSISTENT, &key)
 			.and_then(|v| codec::Decode::decode(&mut &*v).ok()))
 	}
 
 	fn append(&mut self, _: u64, _: Vec<NodeOf<T, I, L>>) -> mmr_lib::Result<()> {
 		panic!("MMR must not be altered in the off-chain context.")
- 	}
+	}
 }
 
-impl<T, I, L> mmr_lib::MMRStore<NodeOf<T, I, L>> for Storage<RuntimeStorage, T, I, L> where
+impl<T, I, L> mmr_lib::MMRStore<NodeOf<T, I, L>> for Storage<RuntimeStorage, T, I, L>
+where
 	T: Config<I>,
 	I: 'static,
 	L: primitives::FullLeaf,
 {
 	fn get_elem(&self, pos: u64) -> mmr_lib::Result<Option<NodeOf<T, I, L>>> {
-		Ok(<Nodes<T, I>>::get(pos)
-			.map(Node::Hash)
-		)
+		Ok(<Nodes<T, I>>::get(pos).map(Node::Hash))
 	}
 
 	fn append(&mut self, pos: u64, elems: Vec<NodeOf<T, I, L>>) -> mmr_lib::Result<()> {
 		let mut leaves = crate::NumberOfLeaves::<T, I>::get();
 		let mut size = crate::mmr::utils::NodesUtils::new(leaves).size();
 		if pos != size {
-			return Err(mmr_lib::Error::InconsistentStore);
+			return Err(mmr_lib::Error::InconsistentStore)
 		}
 
 		for elem in elems {
diff --git a/frame/merkle-mountain-range/src/mmr/utils.rs b/frame/merkle-mountain-range/src/mmr/utils.rs
index 34ae6e1a3c78..4f103fa3b8c0 100644
--- a/frame/merkle-mountain-range/src/mmr/utils.rs
+++ b/frame/merkle-mountain-range/src/mmr/utils.rs
@@ -49,9 +49,7 @@ impl NodesUtils {
 			return 0
 		}
 
-		64 - self.no_of_leaves
-				.next_power_of_two()
-				.leading_zeros()
+		64 - self.no_of_leaves.next_power_of_two().leading_zeros()
 	}
 }
 
@@ -123,9 +121,6 @@ mod tests {
 				actual_sizes.push(mmr.size());
 			})
 		}
-		assert_eq!(
-			sizes[1..],
-			actual_sizes[..],
-		);
+		assert_eq!(sizes[1..], actual_sizes[..],);
 	}
 }
diff --git a/frame/merkle-mountain-range/src/mock.rs b/frame/merkle-mountain-range/src/mock.rs
index cfd8212e6984..4a6b224b051b 100644
--- a/frame/merkle-mountain-range/src/mock.rs
+++ b/frame/merkle-mountain-range/src/mock.rs
@@ -15,21 +15,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::*;
 use crate as pallet_mmr;
+use crate::*;
 
-use codec::{Encode, Decode};
+use codec::{Decode, Encode};
 use frame_support::parameter_types;
-use pallet_mmr_primitives::{LeafDataProvider, Compact};
+use pallet_mmr_primitives::{Compact, LeafDataProvider};
 use sp_core::H256;
 use sp_runtime::{
 	testing::Header,
-	traits::{
-		BlakeTwo256, Keccak256, IdentityLookup,
-	},
+	traits::{BlakeTwo256, IdentityLookup, Keccak256},
 };
-use sp_std::cell::RefCell;
-use sp_std::prelude::*;
+use sp_std::{cell::RefCell, prelude::*};
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -92,10 +89,7 @@ pub struct LeafData {
 
 impl LeafData {
 	pub fn new(a: u64) -> Self {
-		Self {
-			a,
-			b: Default::default(),
-		}
+		Self { a, b: Default::default() }
 	}
 }
 
diff --git a/frame/merkle-mountain-range/src/tests.rs b/frame/merkle-mountain-range/src/tests.rs
index 5640468ac93a..50512e928695 100644
--- a/frame/merkle-mountain-range/src/tests.rs
+++ b/frame/merkle-mountain-range/src/tests.rs
@@ -15,18 +15,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::*;
-use crate::mock::*;
+use crate::{mock::*, *};
 
 use frame_support::traits::OnInitialize;
+use pallet_mmr_primitives::{Compact, Proof};
 use sp_core::{
+	offchain::{testing::TestOffchainExt, OffchainDbExt, OffchainWorkerExt},
 	H256,
-	offchain::{
-		testing::TestOffchainExt,
-		OffchainWorkerExt, OffchainDbExt,
-	},
 };
-use pallet_mmr_primitives::{Proof, Compact};
 
 pub(crate) fn new_test_ext() -> sp_io::TestExternalities {
 	frame_system::GenesisConfig::default().build_storage::<Test>().unwrap().into()
@@ -58,13 +54,12 @@ pub(crate) fn hex(s: &str) -> H256 {
 
 type BlockNumber = <Test as frame_system::Config>::BlockNumber;
 
-fn decode_node(v: Vec<u8>) -> mmr::Node<
-	<Test as Config>::Hashing,
-	((BlockNumber, H256), LeafData),
-> {
+fn decode_node(
+	v: Vec<u8>,
+) -> mmr::Node<<Test as Config>::Hashing, ((BlockNumber, H256), LeafData)> {
 	use crate::primitives::DataOrHash;
-	type A = DataOrHash::<<Test as Config>::Hashing, (BlockNumber, H256)>;
-	type B = DataOrHash::<<Test as Config>::Hashing, LeafData>;
+	type A = DataOrHash<<Test as Config>::Hashing, (BlockNumber, H256)>;
+	type B = DataOrHash<<Test as Config>::Hashing, LeafData>;
 	type Node = mmr::Node<<Test as Config>::Hashing, (A, B)>;
 	let tuple: Node = codec::Decode::decode(&mut &v[..]).unwrap();
 
@@ -89,7 +84,9 @@ fn should_start_empty() {
 		// given
 		assert_eq!(
 			crate::RootHash::<Test>::get(),
-			"0000000000000000000000000000000000000000000000000000000000000000".parse().unwrap()
+			"0000000000000000000000000000000000000000000000000000000000000000"
+				.parse()
+				.unwrap()
 		);
 		assert_eq!(crate::NumberOfLeaves::<Test>::get(), 0);
 		assert_eq!(crate::Nodes::<Test>::get(0), None);
@@ -99,8 +96,10 @@ fn should_start_empty() {
 
 		// then
 		assert_eq!(crate::NumberOfLeaves::<Test>::get(), 1);
-		assert_eq!(crate::Nodes::<Test>::get(0),
-			Some(hex("4320435e8c3318562dba60116bdbcc0b82ffcecb9bb39aae3300cfda3ad0b8b0")));
+		assert_eq!(
+			crate::Nodes::<Test>::get(0),
+			Some(hex("4320435e8c3318562dba60116bdbcc0b82ffcecb9bb39aae3300cfda3ad0b8b0"))
+		);
 		assert_eq!(
 			crate::RootHash::<Test>::get(),
 			hex("4320435e8c3318562dba60116bdbcc0b82ffcecb9bb39aae3300cfda3ad0b8b0")
@@ -120,35 +119,41 @@ fn should_append_to_mmr_when_on_initialize_is_called() {
 
 		// then
 		assert_eq!(crate::NumberOfLeaves::<Test>::get(), 2);
-		assert_eq!((
-			crate::Nodes::<Test>::get(0),
-			crate::Nodes::<Test>::get(1),
-			crate::Nodes::<Test>::get(2),
-			crate::Nodes::<Test>::get(3),
-			crate::RootHash::<Test>::get(),
-		), (
-			Some(hex("4320435e8c3318562dba60116bdbcc0b82ffcecb9bb39aae3300cfda3ad0b8b0")),
-			Some(hex("ad4cbc033833612ccd4626d5f023b9dfc50a35e838514dd1f3c86f8506728705")),
-			Some(hex("672c04a9cd05a644789d769daa552d35d8de7c33129f8a7cbf49e595234c4854")),
-			None,
-			hex("672c04a9cd05a644789d769daa552d35d8de7c33129f8a7cbf49e595234c4854"),
-		));
+		assert_eq!(
+			(
+				crate::Nodes::<Test>::get(0),
+				crate::Nodes::<Test>::get(1),
+				crate::Nodes::<Test>::get(2),
+				crate::Nodes::<Test>::get(3),
+				crate::RootHash::<Test>::get(),
+			),
+			(
+				Some(hex("4320435e8c3318562dba60116bdbcc0b82ffcecb9bb39aae3300cfda3ad0b8b0")),
+				Some(hex("ad4cbc033833612ccd4626d5f023b9dfc50a35e838514dd1f3c86f8506728705")),
+				Some(hex("672c04a9cd05a644789d769daa552d35d8de7c33129f8a7cbf49e595234c4854")),
+				None,
+				hex("672c04a9cd05a644789d769daa552d35d8de7c33129f8a7cbf49e595234c4854"),
+			)
+		);
 	});
 
 	// make sure the leaves end up in the offchain DB
 	ext.persist_offchain_overlay();
 	let offchain_db = ext.offchain_db();
-	assert_eq!(offchain_db.get(&MMR::offchain_key(0)).map(decode_node), Some(mmr::Node::Data((
-		(0, H256::repeat_byte(1)),
-		LeafData::new(1),
-	))));
-	assert_eq!(offchain_db.get(&MMR::offchain_key(1)).map(decode_node), Some(mmr::Node::Data((
-		(1, H256::repeat_byte(2)),
-		LeafData::new(2),
-	))));
-	assert_eq!(offchain_db.get(&MMR::offchain_key(2)).map(decode_node), Some(mmr::Node::Hash(
-		hex("672c04a9cd05a644789d769daa552d35d8de7c33129f8a7cbf49e595234c4854")
-	)));
+	assert_eq!(
+		offchain_db.get(&MMR::offchain_key(0)).map(decode_node),
+		Some(mmr::Node::Data(((0, H256::repeat_byte(1)), LeafData::new(1),)))
+	);
+	assert_eq!(
+		offchain_db.get(&MMR::offchain_key(1)).map(decode_node),
+		Some(mmr::Node::Data(((1, H256::repeat_byte(2)), LeafData::new(2),)))
+	);
+	assert_eq!(
+		offchain_db.get(&MMR::offchain_key(2)).map(decode_node),
+		Some(mmr::Node::Hash(hex(
+			"672c04a9cd05a644789d769daa552d35d8de7c33129f8a7cbf49e595234c4854"
+		)))
+	);
 	assert_eq!(offchain_db.get(&MMR::offchain_key(3)), None);
 }
 
@@ -161,15 +166,18 @@ fn should_construct_larger_mmr_correctly() {
 
 		// then
 		assert_eq!(crate::NumberOfLeaves::<Test>::get(), 7);
-		assert_eq!((
-			crate::Nodes::<Test>::get(0),
-			crate::Nodes::<Test>::get(10),
-			crate::RootHash::<Test>::get(),
-		), (
-			Some(hex("4320435e8c3318562dba60116bdbcc0b82ffcecb9bb39aae3300cfda3ad0b8b0")),
-			Some(hex("611c2174c6164952a66d985cfe1ec1a623794393e3acff96b136d198f37a648c")),
-			hex("e45e25259f7930626431347fa4dd9aae7ac83b4966126d425ca70ab343709d2c"),
-		));
+		assert_eq!(
+			(
+				crate::Nodes::<Test>::get(0),
+				crate::Nodes::<Test>::get(10),
+				crate::RootHash::<Test>::get(),
+			),
+			(
+				Some(hex("4320435e8c3318562dba60116bdbcc0b82ffcecb9bb39aae3300cfda3ad0b8b0")),
+				Some(hex("611c2174c6164952a66d985cfe1ec1a623794393e3acff96b136d198f37a648c")),
+				hex("e45e25259f7930626431347fa4dd9aae7ac83b4966126d425ca70ab343709d2c"),
+			)
+		);
 	});
 }
 
@@ -192,41 +200,50 @@ fn should_generate_proofs_correctly() {
 			.collect::<Vec<_>>();
 
 		// then
-		assert_eq!(proofs[0], (Compact::new((
-			(0, H256::repeat_byte(1)).into(),
-			LeafData::new(1).into(),
-		)), Proof {
-			leaf_index: 0,
-			leaf_count: 7,
-			items: vec![
-				hex("ad4cbc033833612ccd4626d5f023b9dfc50a35e838514dd1f3c86f8506728705"),
-				hex("cb24f4614ad5b2a5430344c99545b421d9af83c46fd632d70a332200884b4d46"),
-				hex("dca421199bdcc55bb773c6b6967e8d16675de69062b52285ca63685241fdf626"),
-			],
-		}));
-		assert_eq!(proofs[4], (Compact::new((
-			(4, H256::repeat_byte(5)).into(),
-			LeafData::new(5).into(),
-		)), Proof {
-			leaf_index: 4,
-			leaf_count: 7,
-			items: vec![
-				hex("ae88a0825da50e953e7a359c55fe13c8015e48d03d301b8bdfc9193874da9252"),
-				hex("8ed25570209d8f753d02df07c1884ddb36a3d9d4770e4608b188322151c657fe"),
-				hex("611c2174c6164952a66d985cfe1ec1a623794393e3acff96b136d198f37a648c"),
-			],
-		}));
-		assert_eq!(proofs[6], (Compact::new((
-			(6, H256::repeat_byte(7)).into(),
-			LeafData::new(7).into(),
-		)), Proof {
-			leaf_index: 6,
-			leaf_count: 7,
-			items: vec![
-				hex("ae88a0825da50e953e7a359c55fe13c8015e48d03d301b8bdfc9193874da9252"),
-				hex("7e4316ae2ebf7c3b6821cb3a46ca8b7a4f9351a9b40fcf014bb0a4fd8e8f29da"),
-			],
-		}));
+		assert_eq!(
+			proofs[0],
+			(
+				Compact::new(((0, H256::repeat_byte(1)).into(), LeafData::new(1).into(),)),
+				Proof {
+					leaf_index: 0,
+					leaf_count: 7,
+					items: vec![
+						hex("ad4cbc033833612ccd4626d5f023b9dfc50a35e838514dd1f3c86f8506728705"),
+						hex("cb24f4614ad5b2a5430344c99545b421d9af83c46fd632d70a332200884b4d46"),
+						hex("dca421199bdcc55bb773c6b6967e8d16675de69062b52285ca63685241fdf626"),
+					],
+				}
+			)
+		);
+		assert_eq!(
+			proofs[4],
+			(
+				Compact::new(((4, H256::repeat_byte(5)).into(), LeafData::new(5).into(),)),
+				Proof {
+					leaf_index: 4,
+					leaf_count: 7,
+					items: vec![
+						hex("ae88a0825da50e953e7a359c55fe13c8015e48d03d301b8bdfc9193874da9252"),
+						hex("8ed25570209d8f753d02df07c1884ddb36a3d9d4770e4608b188322151c657fe"),
+						hex("611c2174c6164952a66d985cfe1ec1a623794393e3acff96b136d198f37a648c"),
+					],
+				}
+			)
+		);
+		assert_eq!(
+			proofs[6],
+			(
+				Compact::new(((6, H256::repeat_byte(7)).into(), LeafData::new(7).into(),)),
+				Proof {
+					leaf_index: 6,
+					leaf_count: 7,
+					items: vec![
+						hex("ae88a0825da50e953e7a359c55fe13c8015e48d03d301b8bdfc9193874da9252"),
+						hex("7e4316ae2ebf7c3b6821cb3a46ca8b7a4f9351a9b40fcf014bb0a4fd8e8f29da"),
+					],
+				}
+			)
+		);
 	});
 }
 
@@ -280,7 +297,10 @@ fn verification_should_be_stateless() {
 
 	// Verify proof without relying on any on-chain data.
 	let leaf = crate::primitives::DataOrHash::Data(leaf);
-	assert_eq!(crate::verify_leaf_proof::<<Test as Config>::Hashing, _>(root, leaf, proof5), Ok(()));
+	assert_eq!(
+		crate::verify_leaf_proof::<<Test as Config>::Hashing, _>(root, leaf, proof5),
+		Ok(())
+	);
 }
 
 #[test]
diff --git a/frame/metadata/src/lib.rs b/frame/metadata/src/lib.rs
index ba232a88f11c..7dcf5932df28 100644
--- a/frame/metadata/src/lib.rs
+++ b/frame/metadata/src/lib.rs
@@ -24,12 +24,12 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 #[cfg(feature = "std")]
-use serde::Serialize;
-#[cfg(feature = "std")]
-use codec::{Decode, Input, Error};
+use codec::{Decode, Error, Input};
 use codec::{Encode, Output};
-use sp_std::vec::Vec;
+#[cfg(feature = "std")]
+use serde::Serialize;
 use sp_core::RuntimeDebug;
+use sp_std::vec::Vec;
 
 #[cfg(feature = "std")]
 type StringBuf = String;
@@ -47,12 +47,20 @@ type StringBuf = &'static str;
 ///
 /// For example a `&'static [ &'static str ]` can be decoded to a `Vec<String>`.
 #[derive(Clone)]
-pub enum DecodeDifferent<B, O> where B: 'static, O: 'static {
+pub enum DecodeDifferent<B, O>
+where
+	B: 'static,
+	O: 'static,
+{
 	Encode(B),
 	Decoded(O),
 }
 
-impl<B, O> Encode for DecodeDifferent<B, O> where B: Encode + 'static, O: Encode + 'static {
+impl<B, O> Encode for DecodeDifferent<B, O>
+where
+	B: Encode + 'static,
+	O: Encode + 'static,
+{
 	fn encode_to<W: Output + ?Sized>(&self, dest: &mut W) {
 		match self {
 			DecodeDifferent::Encode(b) => b.encode_to(dest),
@@ -61,14 +69,21 @@ impl<B, O> Encode for DecodeDifferent<B, O> where B: Encode + 'static, O: Encode
 	}
 }
 
-impl<B, O> codec::EncodeLike for DecodeDifferent<B, O> where B: Encode + 'static, O: Encode + 'static {}
+impl<B, O> codec::EncodeLike for DecodeDifferent<B, O>
+where
+	B: Encode + 'static,
+	O: Encode + 'static,
+{
+}
 
 #[cfg(feature = "std")]
-impl<B, O> Decode for DecodeDifferent<B, O> where B: 'static, O: Decode + 'static {
+impl<B, O> Decode for DecodeDifferent<B, O>
+where
+	B: 'static,
+	O: Decode + 'static,
+{
 	fn decode<I: Input>(input: &mut I) -> Result<Self, Error> {
-		<O>::decode(input).map(|val| {
-			DecodeDifferent::Decoded(val)
-		})
+		<O>::decode(input).map(|val| DecodeDifferent::Decoded(val))
 	}
 }
 
@@ -83,13 +98,16 @@ where
 }
 
 impl<B, O> Eq for DecodeDifferent<B, O>
-	where B: Encode + Eq + PartialEq + 'static, O: Encode + Eq + PartialEq + 'static
-{}
+where
+	B: Encode + Eq + PartialEq + 'static,
+	O: Encode + Eq + PartialEq + 'static,
+{
+}
 
 impl<B, O> sp_std::fmt::Debug for DecodeDifferent<B, O>
-	where
-		B: sp_std::fmt::Debug + Eq + 'static,
-		O: sp_std::fmt::Debug + Eq + 'static,
+where
+	B: sp_std::fmt::Debug + Eq + 'static,
+	O: sp_std::fmt::Debug + Eq + 'static,
 {
 	fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
 		match self {
@@ -101,11 +119,14 @@ impl<B, O> sp_std::fmt::Debug for DecodeDifferent<B, O>
 
 #[cfg(feature = "std")]
 impl<B, O> serde::Serialize for DecodeDifferent<B, O>
-	where
-		B: serde::Serialize + 'static,
-		O: serde::Serialize + 'static,
+where
+	B: serde::Serialize + 'static,
+	O: serde::Serialize + 'static,
 {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: serde::Serializer {
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+	where
+		S: serde::Serializer,
+	{
 		match self {
 			DecodeDifferent::Encode(b) => b.serialize(serializer),
 			DecodeDifferent::Decoded(o) => o.serialize(serializer),
@@ -113,7 +134,7 @@ impl<B, O> serde::Serialize for DecodeDifferent<B, O>
 	}
 }
 
-pub type DecodeDifferentArray<B, O=B> = DecodeDifferent<&'static [B], Vec<O>>;
+pub type DecodeDifferentArray<B, O = B> = DecodeDifferent<&'static [B], Vec<O>>;
 
 type DecodeDifferentStr = DecodeDifferent<&'static str, StringBuf>;
 
@@ -136,7 +157,9 @@ pub struct FunctionArgumentMetadata {
 
 /// Newtype wrapper for support encoding functions (actual the result of the function).
 #[derive(Clone, Eq)]
-pub struct FnEncode<E>(pub fn() -> E) where E: Encode + 'static;
+pub struct FnEncode<E>(pub fn() -> E)
+where
+	E: Encode + 'static;
 
 impl<E: Encode> Encode for FnEncode<E> {
 	fn encode_to<W: Output + ?Sized>(&self, dest: &mut W) {
@@ -160,7 +183,10 @@ impl<E: Encode + sp_std::fmt::Debug> sp_std::fmt::Debug for FnEncode<E> {
 
 #[cfg(feature = "std")]
 impl<E: Encode + serde::Serialize> serde::Serialize for FnEncode<E> {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: serde::Serializer {
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+	where
+		S: serde::Serializer,
+	{
 		self.0().serialize(serializer)
 	}
 }
@@ -172,7 +198,7 @@ pub struct OuterEventMetadata {
 	pub name: DecodeDifferentStr,
 	pub events: DecodeDifferentArray<
 		(&'static str, FnEncode<&'static [EventMetadata]>),
-		(StringBuf, Vec<EventMetadata>)
+		(StringBuf, Vec<EventMetadata>),
 	>,
 }
 
@@ -253,11 +279,14 @@ impl PartialEq<DefaultByteGetter> for DefaultByteGetter {
 	}
 }
 
-impl Eq for DefaultByteGetter { }
+impl Eq for DefaultByteGetter {}
 
 #[cfg(feature = "std")]
 impl serde::Serialize for DefaultByteGetter {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: serde::Serializer {
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+	where
+		S: serde::Serializer,
+	{
 		self.0.default_byte().serialize(serializer)
 	}
 }
@@ -378,7 +407,7 @@ pub enum RuntimeMetadata {
 /// Enum that should fail.
 #[derive(Eq, PartialEq, RuntimeDebug)]
 #[cfg_attr(feature = "std", derive(Serialize))]
-pub enum RuntimeMetadataDeprecated { }
+pub enum RuntimeMetadataDeprecated {}
 
 impl Encode for RuntimeMetadataDeprecated {
 	fn encode_to<W: Output + ?Sized>(&self, _dest: &mut W) {}
diff --git a/frame/multisig/src/benchmarking.rs b/frame/multisig/src/benchmarking.rs
index 63a178313add..393e15292e6b 100644
--- a/frame/multisig/src/benchmarking.rs
+++ b/frame/multisig/src/benchmarking.rs
@@ -20,20 +20,18 @@
 #![cfg(feature = "runtime-benchmarks")]
 
 use super::*;
+use core::convert::TryInto;
+use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite};
 use frame_system::RawOrigin;
-use frame_benchmarking::{benchmarks, account, impl_benchmark_test_suite};
 use sp_runtime::traits::Bounded;
-use core::convert::TryInto;
 
 use crate::Pallet as Multisig;
 
 const SEED: u32 = 0;
 
-fn setup_multi<T: Config>(s: u32, z: u32)
-	-> Result<(Vec<T::AccountId>, Vec<u8>), &'static str>
-{
+fn setup_multi<T: Config>(s: u32, z: u32) -> Result<(Vec<T::AccountId>, Vec<u8>), &'static str> {
 	let mut signatories: Vec<T::AccountId> = Vec::new();
-	for i in 0 .. s {
+	for i in 0..s {
 		let signatory = account("signatory", i, SEED);
 		// Give them some balance for a possible deposit
 		let balance = BalanceOf::<T>::max_value();
@@ -298,8 +296,4 @@ benchmarks! {
 	}
 }
 
-impl_benchmark_test_suite!(
-	Multisig,
-	crate::tests::new_test_ext(),
-	crate::tests::Test,
-);
+impl_benchmark_test_suite!(Multisig, crate::tests::new_test_ext(), crate::tests::Test,);
diff --git a/frame/multisig/src/lib.rs b/frame/multisig/src/lib.rs
index bc7ce7029a95..6522abd72f07 100644
--- a/frame/multisig/src/lib.rs
+++ b/frame/multisig/src/lib.rs
@@ -46,25 +46,33 @@
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
 
-mod tests;
 mod benchmarking;
+mod tests;
 pub mod weights;
 
-use sp_std::prelude::*;
-use codec::{Encode, Decode};
-use sp_io::hashing::blake2_256;
-use frame_support::{ensure, RuntimeDebug};
-use frame_support::{traits::{Get, ReservableCurrency, Currency},
-	weights::{Weight, GetDispatchInfo},
-	dispatch::{DispatchResultWithPostInfo, DispatchResult, DispatchErrorWithPostInfo, PostDispatchInfo},
+use codec::{Decode, Encode};
+use frame_support::{
+	dispatch::{
+		DispatchErrorWithPostInfo, DispatchResult, DispatchResultWithPostInfo, PostDispatchInfo,
+	},
+	ensure,
+	traits::{Currency, Get, ReservableCurrency},
+	weights::{GetDispatchInfo, Weight},
+	RuntimeDebug,
 };
 use frame_system::{self as system, RawOrigin};
-use sp_runtime::{DispatchError, traits::{Dispatchable, Zero}};
+use sp_io::hashing::blake2_256;
+use sp_runtime::{
+	traits::{Dispatchable, Zero},
+	DispatchError,
+};
+use sp_std::prelude::*;
 pub use weights::WeightInfo;
 
 pub use pallet::*;
 
-type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+type BalanceOf<T> =
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 /// Just a bunch of bytes, but they should decode to a valid `Call`.
 pub type OpaqueCall = Vec<u8>;
 
@@ -100,10 +108,10 @@ enum CallOrHash {
 }
 
 #[frame_support::pallet]
-pub mod pallet{
+pub mod pallet {
+	use super::*;
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
-	use super::*;
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
@@ -111,8 +119,10 @@ pub mod pallet{
 		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
 
 		/// The overarching call type.
-		type Call: Parameter + Dispatchable<Origin=Self::Origin, PostInfo=PostDispatchInfo>
-			+ GetDispatchInfo + From<frame_system::Call<Self>>;
+		type Call: Parameter
+			+ Dispatchable<Origin = Self::Origin, PostInfo = PostDispatchInfo>
+			+ GetDispatchInfo
+			+ From<frame_system::Call<Self>>;
 
 		/// The currency mechanism.
 		type Currency: ReservableCurrency<Self::AccountId>;
@@ -156,12 +166,8 @@ pub mod pallet{
 	>;
 
 	#[pallet::storage]
-	pub type Calls<T: Config> = StorageMap<
-		_,
-		Identity,
-		[u8; 32],
-		(OpaqueCall, T::AccountId, BalanceOf<T>),
-	>;
+	pub type Calls<T: Config> =
+		StorageMap<_, Identity, [u8; 32], (OpaqueCall, T::AccountId, BalanceOf<T>)>;
 
 	#[pallet::error]
 	pub enum Error<T> {
@@ -209,9 +215,15 @@ pub mod pallet{
 		/// \[approving, timepoint, multisig, call_hash\]
 		MultisigApproval(T::AccountId, Timepoint<T::BlockNumber>, T::AccountId, CallHash),
 		/// A multisig operation has been executed. \[approving, timepoint, multisig, call_hash\]
-		MultisigExecuted(T::AccountId, Timepoint<T::BlockNumber>, T::AccountId, CallHash, DispatchResult),
+		MultisigExecuted(
+			T::AccountId,
+			Timepoint<T::BlockNumber>,
+			T::AccountId,
+			CallHash,
+			DispatchResult,
+		),
 		/// A multisig operation has been cancelled. \[cancelling, timepoint, multisig, call_hash\]
-		MultisigCancelled(T::AccountId, Timepoint<T::BlockNumber>, T::AccountId, CallHash)
+		MultisigCancelled(T::AccountId, Timepoint<T::BlockNumber>, T::AccountId, CallHash),
 	}
 
 	#[pallet::hooks]
@@ -262,21 +274,26 @@ pub mod pallet{
 			let call_len = call.using_encoded(|c| c.len());
 			let result = call.dispatch(RawOrigin::Signed(id).into());
 
-			result.map(|post_dispatch_info| post_dispatch_info.actual_weight
-				.map(|actual_weight|
-					T::WeightInfo::as_multi_threshold_1(call_len as u32)
-						.saturating_add(actual_weight)
-				).into()
-			).map_err(|err| match err.post_info.actual_weight {
-				Some(actual_weight) => {
-					let weight_used = T::WeightInfo::as_multi_threshold_1(call_len as u32)
-						.saturating_add(actual_weight);
-					let post_info = Some(weight_used).into();
-					let error = err.error.into();
-					DispatchErrorWithPostInfo { post_info, error }
-				},
-				None => err,
-			})
+			result
+				.map(|post_dispatch_info| {
+					post_dispatch_info
+						.actual_weight
+						.map(|actual_weight| {
+							T::WeightInfo::as_multi_threshold_1(call_len as u32)
+								.saturating_add(actual_weight)
+						})
+						.into()
+				})
+				.map_err(|err| match err.post_info.actual_weight {
+					Some(actual_weight) => {
+						let weight_used = T::WeightInfo::as_multi_threshold_1(call_len as u32)
+							.saturating_add(actual_weight);
+						let post_info = Some(weight_used).into();
+						let error = err.error.into();
+						DispatchErrorWithPostInfo { post_info, error }
+					},
+					None => err,
+				})
 		}
 
 		/// Register approval for a dispatch to be made from a deterministic composite account if
@@ -345,7 +362,14 @@ pub mod pallet{
 			max_weight: Weight,
 		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
-			Self::operate(who, threshold, other_signatories, maybe_timepoint, CallOrHash::Call(call, store_call), max_weight)
+			Self::operate(
+				who,
+				threshold,
+				other_signatories,
+				maybe_timepoint,
+				CallOrHash::Call(call, store_call),
+				max_weight,
+			)
 		}
 
 		/// Register approval for a dispatch to be made from a deterministic composite account if
@@ -401,7 +425,14 @@ pub mod pallet{
 			max_weight: Weight,
 		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
-			Self::operate(who, threshold, other_signatories, maybe_timepoint, CallOrHash::Hash(call_hash), max_weight)
+			Self::operate(
+				who,
+				threshold,
+				other_signatories,
+				maybe_timepoint,
+				CallOrHash::Hash(call_hash),
+				max_weight,
+			)
 		}
 
 		/// Cancel a pre-existing, on-going multisig transaction. Any deposit reserved previously
@@ -447,8 +478,7 @@ pub mod pallet{
 
 			let id = Self::multi_account_id(&signatories, threshold);
 
-			let m = <Multisigs<T>>::get(&id, call_hash)
-				.ok_or(Error::<T>::NotFound)?;
+			let m = <Multisigs<T>>::get(&id, call_hash).ok_or(Error::<T>::NotFound)?;
 			ensure!(m.when == timepoint, Error::<T>::WrongTimepoint);
 			ensure!(m.depositor == who, Error::<T>::NotOwner);
 
@@ -496,7 +526,7 @@ impl<T: Config> Pallet<T> {
 				let call_hash = blake2_256(&call);
 				let call_len = call.len();
 				(call_hash, call_len, Some(call), should_store)
-			}
+			},
 			CallOrHash::Hash(h) => (h, 0, None, false),
 		};
 
@@ -511,12 +541,16 @@ impl<T: Config> Pallet<T> {
 			// We only bother with the approval if we're below threshold.
 			let maybe_pos = m.approvals.binary_search(&who).err().filter(|_| approvals < threshold);
 			// Bump approvals if not yet voted and the vote is needed.
-			if maybe_pos.is_some() { approvals += 1; }
+			if maybe_pos.is_some() {
+				approvals += 1;
+			}
 
 			// We only bother fetching/decoding call if we know that we're ready to execute.
 			let maybe_approved_call = if approvals >= threshold {
 				Self::get_call(&call_hash, maybe_call.as_ref().map(|c| c.as_ref()))
-			} else { None };
+			} else {
+				None
+			};
 
 			if let Some((call, call_len)) = maybe_approved_call {
 				// verify weight
@@ -530,21 +564,33 @@ impl<T: Config> Pallet<T> {
 
 				let result = call.dispatch(RawOrigin::Signed(id.clone()).into());
 				Self::deposit_event(Event::MultisigExecuted(
-					who, timepoint, id, call_hash, result.map(|_| ()).map_err(|e| e.error)
+					who,
+					timepoint,
+					id,
+					call_hash,
+					result.map(|_| ()).map_err(|e| e.error),
 				));
-				Ok(get_result_weight(result).map(|actual_weight|
-					T::WeightInfo::as_multi_complete(
-						other_signatories_len as u32,
-						call_len as u32
-					).saturating_add(actual_weight)
-				).into())
+				Ok(get_result_weight(result)
+					.map(|actual_weight| {
+						T::WeightInfo::as_multi_complete(
+							other_signatories_len as u32,
+							call_len as u32,
+						)
+						.saturating_add(actual_weight)
+					})
+					.into())
 			} else {
 				// We cannot dispatch the call now; either it isn't available, or it is, but we
 				// don't have threshold approvals even with our signature.
 
 				// Store the call if desired.
 				let stored = if let Some(data) = maybe_call.filter(|_| store) {
-					Self::store_call_and_reserve(who.clone(), &call_hash, data, BalanceOf::<T>::zero())?;
+					Self::store_call_and_reserve(
+						who.clone(),
+						&call_hash,
+						data,
+						BalanceOf::<T>::zero(),
+					)?;
 					true
 				} else {
 					false
@@ -567,10 +613,7 @@ impl<T: Config> Pallet<T> {
 						call_len as u32,
 					)
 				} else {
-					T::WeightInfo::as_multi_approve(
-						other_signatories_len as u32,
-						call_len as u32,
-					)
+					T::WeightInfo::as_multi_approve(other_signatories_len as u32, call_len as u32)
 				};
 				// Call is not made, so the actual weight does not include call
 				Ok(Some(final_weight).into())
@@ -591,24 +634,22 @@ impl<T: Config> Pallet<T> {
 				false
 			};
 
-			<Multisigs<T>>::insert(&id, call_hash, Multisig {
-				when: Self::timepoint(),
-				deposit,
-				depositor: who.clone(),
-				approvals: vec![who.clone()],
-			});
+			<Multisigs<T>>::insert(
+				&id,
+				call_hash,
+				Multisig {
+					when: Self::timepoint(),
+					deposit,
+					depositor: who.clone(),
+					approvals: vec![who.clone()],
+				},
+			);
 			Self::deposit_event(Event::NewMultisig(who, id, call_hash));
 
 			let final_weight = if stored {
-				T::WeightInfo::as_multi_create_store(
-					other_signatories_len as u32,
-					call_len as u32,
-				)
+				T::WeightInfo::as_multi_create_store(other_signatories_len as u32, call_len as u32)
 			} else {
-				T::WeightInfo::as_multi_create(
-					other_signatories_len as u32,
-					call_len as u32,
-				)
+				T::WeightInfo::as_multi_create(other_signatories_len as u32, call_len as u32)
 			};
 			// Call is not made, so the actual weight does not include call
 			Ok(Some(final_weight).into())
@@ -627,22 +668,27 @@ impl<T: Config> Pallet<T> {
 		other_deposit: BalanceOf<T>,
 	) -> DispatchResult {
 		ensure!(!Calls::<T>::contains_key(hash), Error::<T>::AlreadyStored);
-		let deposit = other_deposit + T::DepositBase::get()
-			+ T::DepositFactor::get() * BalanceOf::<T>::from(((data.len() + 31) / 32) as u32);
+		let deposit = other_deposit +
+			T::DepositBase::get() +
+			T::DepositFactor::get() * BalanceOf::<T>::from(((data.len() + 31) / 32) as u32);
 		T::Currency::reserve(&who, deposit)?;
 		Calls::<T>::insert(&hash, (data, who, deposit));
 		Ok(())
 	}
 
 	/// Attempt to decode and return the call, provided by the user or from storage.
-	fn get_call(hash: &[u8; 32], maybe_known: Option<&[u8]>) -> Option<(<T as Config>::Call, usize)> {
-		maybe_known.map_or_else(|| {
-			Calls::<T>::get(hash).and_then(|(data, ..)| {
-				Decode::decode(&mut &data[..]).ok().map(|d| (d, data.len()))
-			})
-		}, |data| {
-			Decode::decode(&mut &data[..]).ok().map(|d| (d, data.len()))
-		})
+	fn get_call(
+		hash: &[u8; 32],
+		maybe_known: Option<&[u8]>,
+	) -> Option<(<T as Config>::Call, usize)> {
+		maybe_known.map_or_else(
+			|| {
+				Calls::<T>::get(hash).and_then(|(data, ..)| {
+					Decode::decode(&mut &data[..]).ok().map(|d| (d, data.len()))
+				})
+			},
+			|data| Decode::decode(&mut &data[..]).ok().map(|d| (d, data.len())),
+		)
 	}
 
 	/// Attempt to remove a call from storage, returning any deposit on it to the owner.
@@ -661,9 +707,10 @@ impl<T: Config> Pallet<T> {
 	}
 
 	/// Check that signatories is sorted and doesn't contain sender, then insert sender.
-	fn ensure_sorted_and_insert(other_signatories: Vec<T::AccountId>, who: T::AccountId)
-		-> Result<Vec<T::AccountId>, DispatchError>
-	{
+	fn ensure_sorted_and_insert(
+		other_signatories: Vec<T::AccountId>,
+		who: T::AccountId,
+	) -> Result<Vec<T::AccountId>, DispatchError> {
 		let mut signatories = other_signatories;
 		let mut maybe_last = None;
 		let mut index = 0;
diff --git a/frame/multisig/src/tests.rs b/frame/multisig/src/tests.rs
index 69f7cb17b0f5..6dba6f7d4ab5 100644
--- a/frame/multisig/src/tests.rs
+++ b/frame/multisig/src/tests.rs
@@ -21,12 +21,13 @@
 
 use super::*;
 
-use frame_support::{
-	assert_ok, assert_noop, parameter_types, traits::Filter,
-};
-use sp_core::H256;
-use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
 use crate as pallet_multisig;
+use frame_support::{assert_noop, assert_ok, parameter_types, traits::Filter};
+use sp_core::H256;
+use sp_runtime::{
+	testing::Header,
+	traits::{BlakeTwo256, IdentityLookup},
+};
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -113,14 +114,15 @@ impl Config for Test {
 	type WeightInfo = ();
 }
 
-use pallet_balances::Call as BalancesCall;
-use pallet_balances::Error as BalancesError;
+use pallet_balances::{Call as BalancesCall, Error as BalancesError};
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
 	pallet_balances::GenesisConfig::<Test> {
 		balances: vec![(1, 10), (2, 10), (3, 10), (4, 10), (5, 2)],
-	}.assimilate_storage(&mut t).unwrap();
+	}
+	.assimilate_storage(&mut t)
+	.unwrap();
 	let mut ext = sp_io::TestExternalities::new(t);
 	ext.execute_with(|| System::set_block_number(1));
 	ext
@@ -141,11 +143,27 @@ fn multisig_deposit_is_taken_and_returned() {
 		let call = Call::Balances(BalancesCall::transfer(6, 15));
 		let call_weight = call.get_dispatch_info().weight;
 		let data = call.encode();
-		assert_ok!(Multisig::as_multi(Origin::signed(1), 2, vec![2, 3], None, data.clone(), false, 0));
+		assert_ok!(Multisig::as_multi(
+			Origin::signed(1),
+			2,
+			vec![2, 3],
+			None,
+			data.clone(),
+			false,
+			0
+		));
 		assert_eq!(Balances::free_balance(1), 2);
 		assert_eq!(Balances::reserved_balance(1), 3);
 
-		assert_ok!(Multisig::as_multi(Origin::signed(2), 2, vec![1, 3], Some(now()), data, false, call_weight));
+		assert_ok!(Multisig::as_multi(
+			Origin::signed(2),
+			2,
+			vec![1, 3],
+			Some(now()),
+			data,
+			false,
+			call_weight
+		));
 		assert_eq!(Balances::free_balance(1), 5);
 		assert_eq!(Balances::reserved_balance(1), 0);
 	});
@@ -167,7 +185,14 @@ fn multisig_deposit_is_taken_and_returned_with_call_storage() {
 		assert_eq!(Balances::free_balance(1), 0);
 		assert_eq!(Balances::reserved_balance(1), 5);
 
-		assert_ok!(Multisig::approve_as_multi(Origin::signed(2), 2, vec![1, 3], Some(now()), hash, call_weight));
+		assert_ok!(Multisig::approve_as_multi(
+			Origin::signed(2),
+			2,
+			vec![1, 3],
+			Some(now()),
+			hash,
+			call_weight
+		));
 		assert_eq!(Balances::free_balance(1), 5);
 		assert_eq!(Balances::reserved_balance(1), 0);
 	});
@@ -186,17 +211,39 @@ fn multisig_deposit_is_taken_and_returned_with_alt_call_storage() {
 		let data = call.encode();
 		let hash = blake2_256(&data);
 
-		assert_ok!(Multisig::approve_as_multi(Origin::signed(1), 3, vec![2, 3], None, hash.clone(), 0));
+		assert_ok!(Multisig::approve_as_multi(
+			Origin::signed(1),
+			3,
+			vec![2, 3],
+			None,
+			hash.clone(),
+			0
+		));
 		assert_eq!(Balances::free_balance(1), 1);
 		assert_eq!(Balances::reserved_balance(1), 4);
 
-		assert_ok!(Multisig::as_multi(Origin::signed(2), 3, vec![1, 3], Some(now()), data, true, 0));
+		assert_ok!(Multisig::as_multi(
+			Origin::signed(2),
+			3,
+			vec![1, 3],
+			Some(now()),
+			data,
+			true,
+			0
+		));
 		assert_eq!(Balances::free_balance(2), 3);
 		assert_eq!(Balances::reserved_balance(2), 2);
 		assert_eq!(Balances::free_balance(1), 1);
 		assert_eq!(Balances::reserved_balance(1), 4);
 
-		assert_ok!(Multisig::approve_as_multi(Origin::signed(3), 3, vec![1, 2], Some(now()), hash, call_weight));
+		assert_ok!(Multisig::approve_as_multi(
+			Origin::signed(3),
+			3,
+			vec![1, 2],
+			Some(now()),
+			hash,
+			call_weight
+		));
 		assert_eq!(Balances::free_balance(1), 5);
 		assert_eq!(Balances::reserved_balance(1), 0);
 		assert_eq!(Balances::free_balance(2), 5);
@@ -209,13 +256,31 @@ fn cancel_multisig_returns_deposit() {
 	new_test_ext().execute_with(|| {
 		let call = Call::Balances(BalancesCall::transfer(6, 15)).encode();
 		let hash = blake2_256(&call);
-		assert_ok!(Multisig::approve_as_multi(Origin::signed(1), 3, vec![2, 3], None, hash.clone(), 0));
-		assert_ok!(Multisig::approve_as_multi(Origin::signed(2), 3, vec![1, 3], Some(now()), hash.clone(), 0));
+		assert_ok!(Multisig::approve_as_multi(
+			Origin::signed(1),
+			3,
+			vec![2, 3],
+			None,
+			hash.clone(),
+			0
+		));
+		assert_ok!(Multisig::approve_as_multi(
+			Origin::signed(2),
+			3,
+			vec![1, 3],
+			Some(now()),
+			hash.clone(),
+			0
+		));
 		assert_eq!(Balances::free_balance(1), 6);
 		assert_eq!(Balances::reserved_balance(1), 4);
-		assert_ok!(
-			Multisig::cancel_as_multi(Origin::signed(1), 3, vec![2, 3], now(), hash.clone()),
-		);
+		assert_ok!(Multisig::cancel_as_multi(
+			Origin::signed(1),
+			3,
+			vec![2, 3],
+			now(),
+			hash.clone()
+		),);
 		assert_eq!(Balances::free_balance(1), 10);
 		assert_eq!(Balances::reserved_balance(1), 0);
 	});
@@ -233,7 +298,14 @@ fn timepoint_checking_works() {
 		let hash = blake2_256(&call);
 
 		assert_noop!(
-			Multisig::approve_as_multi(Origin::signed(2), 2, vec![1, 3], Some(now()), hash.clone(), 0),
+			Multisig::approve_as_multi(
+				Origin::signed(2),
+				2,
+				vec![1, 3],
+				Some(now()),
+				hash.clone(),
+				0
+			),
 			Error::<Test>::UnexpectedTimepoint,
 		);
 
@@ -243,9 +315,17 @@ fn timepoint_checking_works() {
 			Multisig::as_multi(Origin::signed(2), 2, vec![1, 3], None, call.clone(), false, 0),
 			Error::<Test>::NoTimepoint,
 		);
-		let later = Timepoint { index: 1, .. now() };
+		let later = Timepoint { index: 1, ..now() };
 		assert_noop!(
-			Multisig::as_multi(Origin::signed(2), 2, vec![1, 3], Some(later), call.clone(), false, 0),
+			Multisig::as_multi(
+				Origin::signed(2),
+				2,
+				vec![1, 3],
+				Some(later),
+				call.clone(),
+				false,
+				0
+			),
 			Error::<Test>::WrongTimepoint,
 		);
 	});
@@ -266,7 +346,14 @@ fn multisig_2_of_3_works_with_call_storing() {
 		assert_ok!(Multisig::as_multi(Origin::signed(1), 2, vec![2, 3], None, data, true, 0));
 		assert_eq!(Balances::free_balance(6), 0);
 
-		assert_ok!(Multisig::approve_as_multi(Origin::signed(2), 2, vec![1, 3], Some(now()), hash, call_weight));
+		assert_ok!(Multisig::approve_as_multi(
+			Origin::signed(2),
+			2,
+			vec![1, 3],
+			Some(now()),
+			hash,
+			call_weight
+		));
 		assert_eq!(Balances::free_balance(6), 15);
 	});
 }
@@ -286,7 +373,15 @@ fn multisig_2_of_3_works() {
 		assert_ok!(Multisig::approve_as_multi(Origin::signed(1), 2, vec![2, 3], None, hash, 0));
 		assert_eq!(Balances::free_balance(6), 0);
 
-		assert_ok!(Multisig::as_multi(Origin::signed(2), 2, vec![1, 3], Some(now()), data, false, call_weight));
+		assert_ok!(Multisig::as_multi(
+			Origin::signed(2),
+			2,
+			vec![1, 3],
+			Some(now()),
+			data,
+			false,
+			call_weight
+		));
 		assert_eq!(Balances::free_balance(6), 15);
 	});
 }
@@ -303,11 +398,33 @@ fn multisig_3_of_3_works() {
 		let call_weight = call.get_dispatch_info().weight;
 		let data = call.encode();
 		let hash = blake2_256(&data);
-		assert_ok!(Multisig::approve_as_multi(Origin::signed(1), 3, vec![2, 3], None, hash.clone(), 0));
-		assert_ok!(Multisig::approve_as_multi(Origin::signed(2), 3, vec![1, 3], Some(now()), hash.clone(), 0));
+		assert_ok!(Multisig::approve_as_multi(
+			Origin::signed(1),
+			3,
+			vec![2, 3],
+			None,
+			hash.clone(),
+			0
+		));
+		assert_ok!(Multisig::approve_as_multi(
+			Origin::signed(2),
+			3,
+			vec![1, 3],
+			Some(now()),
+			hash.clone(),
+			0
+		));
 		assert_eq!(Balances::free_balance(6), 0);
 
-		assert_ok!(Multisig::as_multi(Origin::signed(3), 3, vec![1, 2], Some(now()), data, false, call_weight));
+		assert_ok!(Multisig::as_multi(
+			Origin::signed(3),
+			3,
+			vec![1, 2],
+			Some(now()),
+			data,
+			false,
+			call_weight
+		));
 		assert_eq!(Balances::free_balance(6), 15);
 	});
 }
@@ -317,15 +434,33 @@ fn cancel_multisig_works() {
 	new_test_ext().execute_with(|| {
 		let call = Call::Balances(BalancesCall::transfer(6, 15)).encode();
 		let hash = blake2_256(&call);
-		assert_ok!(Multisig::approve_as_multi(Origin::signed(1), 3, vec![2, 3], None, hash.clone(), 0));
-		assert_ok!(Multisig::approve_as_multi(Origin::signed(2), 3, vec![1, 3], Some(now()), hash.clone(), 0));
+		assert_ok!(Multisig::approve_as_multi(
+			Origin::signed(1),
+			3,
+			vec![2, 3],
+			None,
+			hash.clone(),
+			0
+		));
+		assert_ok!(Multisig::approve_as_multi(
+			Origin::signed(2),
+			3,
+			vec![1, 3],
+			Some(now()),
+			hash.clone(),
+			0
+		));
 		assert_noop!(
 			Multisig::cancel_as_multi(Origin::signed(2), 3, vec![1, 3], now(), hash.clone()),
 			Error::<Test>::NotOwner,
 		);
-		assert_ok!(
-			Multisig::cancel_as_multi(Origin::signed(1), 3, vec![2, 3], now(), hash.clone()),
-		);
+		assert_ok!(Multisig::cancel_as_multi(
+			Origin::signed(1),
+			3,
+			vec![2, 3],
+			now(),
+			hash.clone()
+		),);
 	});
 }
 
@@ -336,14 +471,25 @@ fn cancel_multisig_with_call_storage_works() {
 		let hash = blake2_256(&call);
 		assert_ok!(Multisig::as_multi(Origin::signed(1), 3, vec![2, 3], None, call, true, 0));
 		assert_eq!(Balances::free_balance(1), 4);
-		assert_ok!(Multisig::approve_as_multi(Origin::signed(2), 3, vec![1, 3], Some(now()), hash.clone(), 0));
+		assert_ok!(Multisig::approve_as_multi(
+			Origin::signed(2),
+			3,
+			vec![1, 3],
+			Some(now()),
+			hash.clone(),
+			0
+		));
 		assert_noop!(
 			Multisig::cancel_as_multi(Origin::signed(2), 3, vec![1, 3], now(), hash.clone()),
 			Error::<Test>::NotOwner,
 		);
-		assert_ok!(
-			Multisig::cancel_as_multi(Origin::signed(1), 3, vec![2, 3], now(), hash.clone()),
-		);
+		assert_ok!(Multisig::cancel_as_multi(
+			Origin::signed(1),
+			3,
+			vec![2, 3],
+			now(),
+			hash.clone()
+		),);
 		assert_eq!(Balances::free_balance(1), 10);
 	});
 }
@@ -353,9 +499,24 @@ fn cancel_multisig_with_alt_call_storage_works() {
 	new_test_ext().execute_with(|| {
 		let call = Call::Balances(BalancesCall::transfer(6, 15)).encode();
 		let hash = blake2_256(&call);
-		assert_ok!(Multisig::approve_as_multi(Origin::signed(1), 3, vec![2, 3], None, hash.clone(), 0));
+		assert_ok!(Multisig::approve_as_multi(
+			Origin::signed(1),
+			3,
+			vec![2, 3],
+			None,
+			hash.clone(),
+			0
+		));
 		assert_eq!(Balances::free_balance(1), 6);
-		assert_ok!(Multisig::as_multi(Origin::signed(2), 3, vec![1, 3], Some(now()), call, true, 0));
+		assert_ok!(Multisig::as_multi(
+			Origin::signed(2),
+			3,
+			vec![1, 3],
+			Some(now()),
+			call,
+			true,
+			0
+		));
 		assert_eq!(Balances::free_balance(2), 8);
 		assert_ok!(Multisig::cancel_as_multi(Origin::signed(1), 3, vec![2, 3], now(), hash));
 		assert_eq!(Balances::free_balance(1), 10);
@@ -374,10 +535,26 @@ fn multisig_2_of_3_as_multi_works() {
 		let call = Call::Balances(BalancesCall::transfer(6, 15));
 		let call_weight = call.get_dispatch_info().weight;
 		let data = call.encode();
-		assert_ok!(Multisig::as_multi(Origin::signed(1), 2, vec![2, 3], None, data.clone(), false, 0));
+		assert_ok!(Multisig::as_multi(
+			Origin::signed(1),
+			2,
+			vec![2, 3],
+			None,
+			data.clone(),
+			false,
+			0
+		));
 		assert_eq!(Balances::free_balance(6), 0);
 
-		assert_ok!(Multisig::as_multi(Origin::signed(2), 2, vec![1, 3], Some(now()), data, false, call_weight));
+		assert_ok!(Multisig::as_multi(
+			Origin::signed(2),
+			2,
+			vec![1, 3],
+			Some(now()),
+			data,
+			false,
+			call_weight
+		));
 		assert_eq!(Balances::free_balance(6), 15);
 	});
 }
@@ -397,10 +574,42 @@ fn multisig_2_of_3_as_multi_with_many_calls_works() {
 		let call2_weight = call2.get_dispatch_info().weight;
 		let data2 = call2.encode();
 
-		assert_ok!(Multisig::as_multi(Origin::signed(1), 2, vec![2, 3], None, data1.clone(), false, 0));
-		assert_ok!(Multisig::as_multi(Origin::signed(2), 2, vec![1, 3], None, data2.clone(), false, 0));
-		assert_ok!(Multisig::as_multi(Origin::signed(3), 2, vec![1, 2], Some(now()), data1, false, call1_weight));
-		assert_ok!(Multisig::as_multi(Origin::signed(3), 2, vec![1, 2], Some(now()), data2, false, call2_weight));
+		assert_ok!(Multisig::as_multi(
+			Origin::signed(1),
+			2,
+			vec![2, 3],
+			None,
+			data1.clone(),
+			false,
+			0
+		));
+		assert_ok!(Multisig::as_multi(
+			Origin::signed(2),
+			2,
+			vec![1, 3],
+			None,
+			data2.clone(),
+			false,
+			0
+		));
+		assert_ok!(Multisig::as_multi(
+			Origin::signed(3),
+			2,
+			vec![1, 2],
+			Some(now()),
+			data1,
+			false,
+			call1_weight
+		));
+		assert_ok!(Multisig::as_multi(
+			Origin::signed(3),
+			2,
+			vec![1, 2],
+			Some(now()),
+			data2,
+			false,
+			call2_weight
+		));
 
 		assert_eq!(Balances::free_balance(6), 10);
 		assert_eq!(Balances::free_balance(7), 5);
@@ -419,15 +628,49 @@ fn multisig_2_of_3_cannot_reissue_same_call() {
 		let call_weight = call.get_dispatch_info().weight;
 		let data = call.encode();
 		let hash = blake2_256(&data);
-		assert_ok!(Multisig::as_multi(Origin::signed(1), 2, vec![2, 3], None, data.clone(), false, 0));
-		assert_ok!(Multisig::as_multi(Origin::signed(2), 2, vec![1, 3], Some(now()), data.clone(), false, call_weight));
+		assert_ok!(Multisig::as_multi(
+			Origin::signed(1),
+			2,
+			vec![2, 3],
+			None,
+			data.clone(),
+			false,
+			0
+		));
+		assert_ok!(Multisig::as_multi(
+			Origin::signed(2),
+			2,
+			vec![1, 3],
+			Some(now()),
+			data.clone(),
+			false,
+			call_weight
+		));
 		assert_eq!(Balances::free_balance(multi), 5);
 
-		assert_ok!(Multisig::as_multi(Origin::signed(1), 2, vec![2, 3], None, data.clone(), false, 0));
-		assert_ok!(Multisig::as_multi(Origin::signed(3), 2, vec![1, 2], Some(now()), data.clone(), false, call_weight));
+		assert_ok!(Multisig::as_multi(
+			Origin::signed(1),
+			2,
+			vec![2, 3],
+			None,
+			data.clone(),
+			false,
+			0
+		));
+		assert_ok!(Multisig::as_multi(
+			Origin::signed(3),
+			2,
+			vec![1, 2],
+			Some(now()),
+			data.clone(),
+			false,
+			call_weight
+		));
 
 		let err = DispatchError::from(BalancesError::<Test, _>::InsufficientBalance).stripped();
-		System::assert_last_event(pallet_multisig::Event::MultisigExecuted(3, now(), multi, hash, Err(err)).into());
+		System::assert_last_event(
+			pallet_multisig::Event::MultisigExecuted(3, now(), multi, hash, Err(err)).into(),
+		);
 	});
 }
 
@@ -462,14 +705,42 @@ fn duplicate_approvals_are_ignored() {
 	new_test_ext().execute_with(|| {
 		let call = Call::Balances(BalancesCall::transfer(6, 15)).encode();
 		let hash = blake2_256(&call);
-		assert_ok!(Multisig::approve_as_multi(Origin::signed(1), 2, vec![2, 3], None, hash.clone(), 0));
+		assert_ok!(Multisig::approve_as_multi(
+			Origin::signed(1),
+			2,
+			vec![2, 3],
+			None,
+			hash.clone(),
+			0
+		));
 		assert_noop!(
-			Multisig::approve_as_multi(Origin::signed(1), 2, vec![2, 3], Some(now()), hash.clone(), 0),
+			Multisig::approve_as_multi(
+				Origin::signed(1),
+				2,
+				vec![2, 3],
+				Some(now()),
+				hash.clone(),
+				0
+			),
 			Error::<Test>::AlreadyApproved,
 		);
-		assert_ok!(Multisig::approve_as_multi(Origin::signed(2), 2, vec![1, 3], Some(now()), hash.clone(), 0));
+		assert_ok!(Multisig::approve_as_multi(
+			Origin::signed(2),
+			2,
+			vec![1, 3],
+			Some(now()),
+			hash.clone(),
+			0
+		));
 		assert_noop!(
-			Multisig::approve_as_multi(Origin::signed(3), 2, vec![1, 2], Some(now()), hash.clone(), 0),
+			Multisig::approve_as_multi(
+				Origin::signed(3),
+				2,
+				vec![1, 2],
+				Some(now()),
+				hash.clone(),
+				0
+			),
 			Error::<Test>::AlreadyApproved,
 		);
 	});
@@ -521,7 +792,15 @@ fn weight_check_works() {
 
 		let call = Call::Balances(BalancesCall::transfer(6, 15));
 		let data = call.encode();
-		assert_ok!(Multisig::as_multi(Origin::signed(1), 2, vec![2, 3], None, data.clone(), false, 0));
+		assert_ok!(Multisig::as_multi(
+			Origin::signed(1),
+			2,
+			vec![2, 3],
+			None,
+			data.clone(),
+			false,
+			0
+		));
 		assert_eq!(Balances::free_balance(6), 0);
 
 		assert_noop!(
@@ -545,12 +824,41 @@ fn multisig_handles_no_preimage_after_all_approve() {
 		let call_weight = call.get_dispatch_info().weight;
 		let data = call.encode();
 		let hash = blake2_256(&data);
-		assert_ok!(Multisig::approve_as_multi(Origin::signed(1), 3, vec![2, 3], None, hash.clone(), 0));
-		assert_ok!(Multisig::approve_as_multi(Origin::signed(2), 3, vec![1, 3], Some(now()), hash.clone(), 0));
-		assert_ok!(Multisig::approve_as_multi(Origin::signed(3), 3, vec![1, 2], Some(now()), hash.clone(), 0));
+		assert_ok!(Multisig::approve_as_multi(
+			Origin::signed(1),
+			3,
+			vec![2, 3],
+			None,
+			hash.clone(),
+			0
+		));
+		assert_ok!(Multisig::approve_as_multi(
+			Origin::signed(2),
+			3,
+			vec![1, 3],
+			Some(now()),
+			hash.clone(),
+			0
+		));
+		assert_ok!(Multisig::approve_as_multi(
+			Origin::signed(3),
+			3,
+			vec![1, 2],
+			Some(now()),
+			hash.clone(),
+			0
+		));
 		assert_eq!(Balances::free_balance(6), 0);
 
-		assert_ok!(Multisig::as_multi(Origin::signed(3), 3, vec![1, 2], Some(now()), data, false, call_weight));
+		assert_ok!(Multisig::as_multi(
+			Origin::signed(3),
+			3,
+			vec![1, 2],
+			Some(now()),
+			data,
+			false,
+			call_weight
+		));
 		assert_eq!(Balances::free_balance(6), 15);
 	});
 }
diff --git a/frame/multisig/src/weights.rs b/frame/multisig/src/weights.rs
index 50f774030015..ce111911bbd2 100644
--- a/frame/multisig/src/weights.rs
+++ b/frame/multisig/src/weights.rs
@@ -36,6 +36,7 @@
 // --template=./.maintain/frame-weight-template.hbs
 
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
diff --git a/frame/nicks/src/lib.rs b/frame/nicks/src/lib.rs
index afdcca7e91a5..d78f1c446565 100644
--- a/frame/nicks/src/lib.rs
+++ b/frame/nicks/src/lib.rs
@@ -41,21 +41,26 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use sp_std::prelude::*;
-use sp_runtime::{
-	traits::{StaticLookup, Zero}
-};
-use frame_support::traits::{Currency, ReservableCurrency, OnUnbalanced};
+use frame_support::traits::{Currency, OnUnbalanced, ReservableCurrency};
 pub use pallet::*;
+use sp_runtime::traits::{StaticLookup, Zero};
+use sp_std::prelude::*;
 
-type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
-type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
+type BalanceOf<T> =
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<
+	<T as frame_system::Config>::AccountId,
+>>::NegativeImbalance;
 
 #[frame_support::pallet]
 pub mod pallet {
-	use frame_system::{ensure_signed, pallet_prelude::*};
-	use frame_support::{ensure, pallet_prelude::*, traits::{EnsureOrigin, Get}};
 	use super::*;
+	use frame_support::{
+		ensure,
+		pallet_prelude::*,
+		traits::{EnsureOrigin, Get},
+	};
+	use frame_system::{ensure_signed, pallet_prelude::*};
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
@@ -113,7 +118,8 @@ pub mod pallet {
 
 	/// The lookup table for names.
 	#[pallet::storage]
-	pub(super) type NameOf<T: Config> = StorageMap<_, Twox64Concat, T::AccountId, (Vec<u8>, BalanceOf<T>)>;
+	pub(super) type NameOf<T: Config> =
+		StorageMap<_, Twox64Concat, T::AccountId, (Vec<u8>, BalanceOf<T>)>;
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
@@ -197,7 +203,7 @@ pub mod pallet {
 		#[pallet::weight(70_000_000)]
 		pub fn kill_name(
 			origin: OriginFor<T>,
-			target: <T::Lookup as StaticLookup>::Source
+			target: <T::Lookup as StaticLookup>::Source,
 		) -> DispatchResult {
 			T::ForceOrigin::ensure_origin(origin)?;
 
@@ -228,7 +234,7 @@ pub mod pallet {
 		pub fn force_name(
 			origin: OriginFor<T>,
 			target: <T::Lookup as StaticLookup>::Source,
-			name: Vec<u8>
+			name: Vec<u8>,
 		) -> DispatchResult {
 			T::ForceOrigin::ensure_origin(origin)?;
 
@@ -247,11 +253,12 @@ mod tests {
 	use super::*;
 	use crate as pallet_nicks;
 
-	use frame_support::{assert_ok, assert_noop, parameter_types, ord_parameter_types};
-	use sp_core::H256;
+	use frame_support::{assert_noop, assert_ok, ord_parameter_types, parameter_types};
 	use frame_system::EnsureSignedBy;
+	use sp_core::H256;
 	use sp_runtime::{
-		testing::Header, traits::{BlakeTwo256, IdentityLookup, BadOrigin},
+		testing::Header,
+		traits::{BadOrigin, BlakeTwo256, IdentityLookup},
 	};
 
 	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
@@ -333,12 +340,9 @@ mod tests {
 
 	fn new_test_ext() -> sp_io::TestExternalities {
 		let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-		pallet_balances::GenesisConfig::<Test> {
-			balances: vec![
-				(1, 10),
-				(2, 10),
-			],
-		}.assimilate_storage(&mut t).unwrap();
+		pallet_balances::GenesisConfig::<Test> { balances: vec![(1, 10), (2, 10)] }
+			.assimilate_storage(&mut t)
+			.unwrap();
 		t.into()
 	}
 
@@ -398,7 +402,10 @@ mod tests {
 				pallet_balances::Error::<Test, _>::InsufficientBalance
 			);
 
-			assert_noop!(Nicks::set_name(Origin::signed(1), b"Ga".to_vec()), Error::<Test>::TooShort);
+			assert_noop!(
+				Nicks::set_name(Origin::signed(1), b"Ga".to_vec()),
+				Error::<Test>::TooShort
+			);
 			assert_noop!(
 				Nicks::set_name(Origin::signed(1), b"Gavin James Wood, Esquire".to_vec()),
 				Error::<Test>::TooLong
diff --git a/frame/node-authorization/src/lib.rs b/frame/node-authorization/src/lib.rs
index 5f233549c73c..5551ec2ad2c4 100644
--- a/frame/node-authorization/src/lib.rs
+++ b/frame/node-authorization/src/lib.rs
@@ -44,22 +44,15 @@ mod tests;
 
 pub mod weights;
 
-use sp_core::OpaquePeerId as PeerId;
-use sp_std::{
-	collections::btree_set::BTreeSet,
-	iter::FromIterator,
-	prelude::*,
-};
 pub use pallet::*;
+use sp_core::OpaquePeerId as PeerId;
+use sp_std::{collections::btree_set::BTreeSet, iter::FromIterator, prelude::*};
 pub use weights::WeightInfo;
 
 #[frame_support::pallet]
 pub mod pallet {
 	use super::*;
-	use frame_support::{
-		dispatch::DispatchResult,
-		pallet_prelude::*,
-	};
+	use frame_support::{dispatch::DispatchResult, pallet_prelude::*};
 	use frame_system::pallet_prelude::*;
 
 	#[pallet::pallet]
@@ -104,23 +97,13 @@ pub mod pallet {
 	/// A map that maintains the ownership of each node.
 	#[pallet::storage]
 	#[pallet::getter(fn owners)]
-	pub type Owners<T: Config> = StorageMap<
-		_,
-		Blake2_128Concat,
-		PeerId,
-		T::AccountId,
-	>;
+	pub type Owners<T: Config> = StorageMap<_, Blake2_128Concat, PeerId, T::AccountId>;
 
 	/// The additional adapative connections of each node.
 	#[pallet::storage]
 	#[pallet::getter(fn additional_connection)]
-	pub type AdditionalConnections<T> = StorageMap<
-		_,
-		Blake2_128Concat,
-		PeerId,
-		BTreeSet<PeerId>,
-		ValueQuery,
-	>;
+	pub type AdditionalConnections<T> =
+		StorageMap<_, Blake2_128Concat, PeerId, BTreeSet<PeerId>, ValueQuery>;
 
 	#[pallet::genesis_config]
 	pub struct GenesisConfig<T: Config> {
@@ -208,10 +191,10 @@ pub mod pallet {
 						),
 						Ok(node) => sp_io::offchain::set_authorized_nodes(
 							Self::get_authorized_nodes(&PeerId(node)),
-							true
-						)
+							true,
+						),
 					}
-				}
+				},
 			}
 		}
 	}
@@ -228,7 +211,7 @@ pub mod pallet {
 		pub fn add_well_known_node(
 			origin: OriginFor<T>,
 			node: PeerId,
-			owner: T::AccountId
+			owner: T::AccountId,
 		) -> DispatchResult {
 			T::AddOrigin::ensure_origin(origin)?;
 			ensure!(node.0.len() < T::MaxPeerIdLength::get() as usize, Error::<T>::PeerIdTooLong);
@@ -281,16 +264,15 @@ pub mod pallet {
 		pub fn swap_well_known_node(
 			origin: OriginFor<T>,
 			remove: PeerId,
-			add: PeerId
+			add: PeerId,
 		) -> DispatchResult {
 			T::SwapOrigin::ensure_origin(origin)?;
-			ensure!(
-				remove.0.len() < T::MaxPeerIdLength::get() as usize,
-				Error::<T>::PeerIdTooLong
-			);
+			ensure!(remove.0.len() < T::MaxPeerIdLength::get() as usize, Error::<T>::PeerIdTooLong);
 			ensure!(add.0.len() < T::MaxPeerIdLength::get() as usize, Error::<T>::PeerIdTooLong);
 
-			if remove == add { return Ok(()) }
+			if remove == add {
+				return Ok(())
+			}
 
 			let mut nodes = WellKnownNodes::<T>::get();
 			ensure!(nodes.contains(&remove), Error::<T>::NotExist);
@@ -317,7 +299,7 @@ pub mod pallet {
 		#[pallet::weight((T::WeightInfo::reset_well_known_nodes(), DispatchClass::Operational))]
 		pub fn reset_well_known_nodes(
 			origin: OriginFor<T>,
-			nodes: Vec<(PeerId, T::AccountId)>
+			nodes: Vec<(PeerId, T::AccountId)>,
 		) -> DispatchResult {
 			T::ResetOrigin::ensure_origin(origin)?;
 			ensure!(nodes.len() < T::MaxWellKnownNodes::get() as usize, Error::<T>::TooManyNodes);
@@ -337,7 +319,7 @@ pub mod pallet {
 			let sender = ensure_signed(origin)?;
 
 			ensure!(node.0.len() < T::MaxPeerIdLength::get() as usize, Error::<T>::PeerIdTooLong);
-			ensure!(!Owners::<T>::contains_key(&node),Error::<T>::AlreadyClaimed);
+			ensure!(!Owners::<T>::contains_key(&node), Error::<T>::AlreadyClaimed);
 
 			Owners::<T>::insert(&node, &sender);
 			Self::deposit_event(Event::NodeClaimed(node, sender));
@@ -373,7 +355,7 @@ pub mod pallet {
 		pub fn transfer_node(
 			origin: OriginFor<T>,
 			node: PeerId,
-			owner: T::AccountId
+			owner: T::AccountId,
 		) -> DispatchResult {
 			let sender = ensure_signed(origin)?;
 
@@ -395,7 +377,7 @@ pub mod pallet {
 		pub fn add_connections(
 			origin: OriginFor<T>,
 			node: PeerId,
-			connections: Vec<PeerId>
+			connections: Vec<PeerId>,
 		) -> DispatchResult {
 			let sender = ensure_signed(origin)?;
 
@@ -407,7 +389,7 @@ pub mod pallet {
 
 			for add_node in connections.iter() {
 				if *add_node == node {
-					continue;
+					continue
 				}
 				nodes.insert(add_node.clone());
 			}
@@ -426,7 +408,7 @@ pub mod pallet {
 		pub fn remove_connections(
 			origin: OriginFor<T>,
 			node: PeerId,
-			connections: Vec<PeerId>
+			connections: Vec<PeerId>,
 		) -> DispatchResult {
 			let sender = ensure_signed(origin)?;
 
@@ -450,9 +432,7 @@ pub mod pallet {
 
 impl<T: Config> Pallet<T> {
 	fn initialize_nodes(nodes: &Vec<(PeerId, T::AccountId)>) {
-		let peer_ids = nodes.iter()
-			.map(|item| item.0.clone())
-			.collect::<BTreeSet<PeerId>>();
+		let peer_ids = nodes.iter().map(|item| item.0.clone()).collect::<BTreeSet<PeerId>>();
 		WellKnownNodes::<T>::put(&peer_ids);
 
 		for (node, who) in nodes.iter() {
diff --git a/frame/node-authorization/src/mock.rs b/frame/node-authorization/src/mock.rs
index e952ed900d4b..302378f48ce6 100644
--- a/frame/node-authorization/src/mock.rs
+++ b/frame/node-authorization/src/mock.rs
@@ -20,13 +20,13 @@
 use super::*;
 use crate as pallet_node_authorization;
 
-use frame_support::{
-	parameter_types, ord_parameter_types,
-	traits::GenesisBuild,
-};
+use frame_support::{ord_parameter_types, parameter_types, traits::GenesisBuild};
 use frame_system::EnsureSignedBy;
 use sp_core::H256;
-use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
+use sp_runtime::{
+	testing::Header,
+	traits::{BlakeTwo256, IdentityLookup},
+};
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -102,6 +102,8 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
 	pallet_node_authorization::GenesisConfig::<Test> {
 		nodes: vec![(test_node(10), 10), (test_node(20), 20), (test_node(30), 30)],
-	}.assimilate_storage(&mut t).unwrap();
+	}
+	.assimilate_storage(&mut t)
+	.unwrap();
 	t.into()
 }
diff --git a/frame/node-authorization/src/tests.rs b/frame/node-authorization/src/tests.rs
index 15a286fbc239..530904fa7348 100644
--- a/frame/node-authorization/src/tests.rs
+++ b/frame/node-authorization/src/tests.rs
@@ -19,7 +19,7 @@
 
 use super::*;
 use crate::mock::*;
-use frame_support::{assert_ok, assert_noop};
+use frame_support::{assert_noop, assert_ok};
 use sp_runtime::traits::BadOrigin;
 
 #[test]
@@ -38,9 +38,7 @@ fn add_well_known_node_works() {
 			Error::<Test>::AlreadyJoined
 		);
 
-		assert_ok!(
-			NodeAuthorization::add_well_known_node(Origin::signed(1), test_node(15), 15)
-		);
+		assert_ok!(NodeAuthorization::add_well_known_node(Origin::signed(1), test_node(15), 15));
 		assert_eq!(
 			WellKnownNodes::<Test>::get(),
 			BTreeSet::from_iter(vec![test_node(10), test_node(15), test_node(20), test_node(30)])
@@ -75,13 +73,11 @@ fn remove_well_known_node_works() {
 
 		AdditionalConnections::<Test>::insert(
 			test_node(20),
-			BTreeSet::from_iter(vec![test_node(40)])
+			BTreeSet::from_iter(vec![test_node(40)]),
 		);
 		assert!(AdditionalConnections::<Test>::contains_key(test_node(20)));
 
-		assert_ok!(
-			NodeAuthorization::remove_well_known_node(Origin::signed(2), test_node(20))
-		);
+		assert_ok!(NodeAuthorization::remove_well_known_node(Origin::signed(2), test_node(20)));
 		assert_eq!(
 			WellKnownNodes::<Test>::get(),
 			BTreeSet::from_iter(vec![test_node(10), test_node(30)])
@@ -95,56 +91,58 @@ fn remove_well_known_node_works() {
 fn swap_well_known_node_works() {
 	new_test_ext().execute_with(|| {
 		assert_noop!(
-			NodeAuthorization::swap_well_known_node(
-				Origin::signed(4), test_node(20), test_node(5)
-			),
+			NodeAuthorization::swap_well_known_node(Origin::signed(4), test_node(20), test_node(5)),
 			BadOrigin
 		);
 		assert_noop!(
 			NodeAuthorization::swap_well_known_node(
-				Origin::signed(3), PeerId(vec![1, 2, 3]), test_node(20)
+				Origin::signed(3),
+				PeerId(vec![1, 2, 3]),
+				test_node(20)
 			),
 			Error::<Test>::PeerIdTooLong
 		);
 		assert_noop!(
 			NodeAuthorization::swap_well_known_node(
-				Origin::signed(3), test_node(20), PeerId(vec![1, 2, 3])
+				Origin::signed(3),
+				test_node(20),
+				PeerId(vec![1, 2, 3])
 			),
 			Error::<Test>::PeerIdTooLong
 		);
 
-		assert_ok!(
-			NodeAuthorization::swap_well_known_node(
-				Origin::signed(3), test_node(20), test_node(20)
-			)
-		);
+		assert_ok!(NodeAuthorization::swap_well_known_node(
+			Origin::signed(3),
+			test_node(20),
+			test_node(20)
+		));
 		assert_eq!(
 			WellKnownNodes::<Test>::get(),
 			BTreeSet::from_iter(vec![test_node(10), test_node(20), test_node(30)])
 		);
 
 		assert_noop!(
-			NodeAuthorization::swap_well_known_node(
-				Origin::signed(3), test_node(15), test_node(5)
-			),
+			NodeAuthorization::swap_well_known_node(Origin::signed(3), test_node(15), test_node(5)),
 			Error::<Test>::NotExist
 		);
 		assert_noop!(
 			NodeAuthorization::swap_well_known_node(
-				Origin::signed(3), test_node(20), test_node(30)
+				Origin::signed(3),
+				test_node(20),
+				test_node(30)
 			),
 			Error::<Test>::AlreadyJoined
 		);
 
 		AdditionalConnections::<Test>::insert(
 			test_node(20),
-			BTreeSet::from_iter(vec![test_node(15)])
-		);
-		assert_ok!(
-			NodeAuthorization::swap_well_known_node(
-				Origin::signed(3), test_node(20), test_node(5)
-			)
+			BTreeSet::from_iter(vec![test_node(15)]),
 		);
+		assert_ok!(NodeAuthorization::swap_well_known_node(
+			Origin::signed(3),
+			test_node(20),
+			test_node(5)
+		));
 		assert_eq!(
 			WellKnownNodes::<Test>::get(),
 			BTreeSet::from_iter(vec![test_node(5), test_node(10), test_node(30)])
@@ -182,12 +180,10 @@ fn reset_well_known_nodes_works() {
 			Error::<Test>::TooManyNodes
 		);
 
-		assert_ok!(
-			NodeAuthorization::reset_well_known_nodes(
-				Origin::signed(4),
-				vec![(test_node(15), 15), (test_node(5), 5), (test_node(20), 20)]
-			)
-		);
+		assert_ok!(NodeAuthorization::reset_well_known_nodes(
+			Origin::signed(4),
+			vec![(test_node(15), 15), (test_node(5), 5), (test_node(20), 20)]
+		));
 		assert_eq!(
 			WellKnownNodes::<Test>::get(),
 			BTreeSet::from_iter(vec![test_node(5), test_node(15), test_node(20)])
@@ -240,7 +236,7 @@ fn remove_claim_works() {
 		Owners::<Test>::insert(test_node(15), 15);
 		AdditionalConnections::<Test>::insert(
 			test_node(15),
-			BTreeSet::from_iter(vec![test_node(20)])
+			BTreeSet::from_iter(vec![test_node(20)]),
 		);
 		assert_ok!(NodeAuthorization::remove_claim(Origin::signed(15), test_node(15)));
 		assert!(!Owners::<Test>::contains_key(test_node(15)));
@@ -275,31 +271,35 @@ fn add_connections_works() {
 	new_test_ext().execute_with(|| {
 		assert_noop!(
 			NodeAuthorization::add_connections(
-				Origin::signed(15), PeerId(vec![1, 2, 3]), vec![test_node(5)]
+				Origin::signed(15),
+				PeerId(vec![1, 2, 3]),
+				vec![test_node(5)]
 			),
 			Error::<Test>::PeerIdTooLong
 		);
 		assert_noop!(
 			NodeAuthorization::add_connections(
-				Origin::signed(15), test_node(15), vec![test_node(5)]
+				Origin::signed(15),
+				test_node(15),
+				vec![test_node(5)]
 			),
 			Error::<Test>::NotClaimed
 		);
 
 		assert_noop!(
 			NodeAuthorization::add_connections(
-				Origin::signed(15), test_node(20), vec![test_node(5)]
+				Origin::signed(15),
+				test_node(20),
+				vec![test_node(5)]
 			),
 			Error::<Test>::NotOwner
 		);
 
-		assert_ok!(
-			NodeAuthorization::add_connections(
-				Origin::signed(20),
-				test_node(20),
-				vec![test_node(15), test_node(5), test_node(25), test_node(20)]
-			)
-		);
+		assert_ok!(NodeAuthorization::add_connections(
+			Origin::signed(20),
+			test_node(20),
+			vec![test_node(15), test_node(5), test_node(25), test_node(20)]
+		));
 		assert_eq!(
 			AdditionalConnections::<Test>::get(test_node(20)),
 			BTreeSet::from_iter(vec![test_node(5), test_node(15), test_node(25)])
@@ -312,35 +312,39 @@ fn remove_connections_works() {
 	new_test_ext().execute_with(|| {
 		assert_noop!(
 			NodeAuthorization::remove_connections(
-				Origin::signed(15), PeerId(vec![1, 2, 3]), vec![test_node(5)]
+				Origin::signed(15),
+				PeerId(vec![1, 2, 3]),
+				vec![test_node(5)]
 			),
 			Error::<Test>::PeerIdTooLong
 		);
 		assert_noop!(
 			NodeAuthorization::remove_connections(
-				Origin::signed(15), test_node(15), vec![test_node(5)]
+				Origin::signed(15),
+				test_node(15),
+				vec![test_node(5)]
 			),
 			Error::<Test>::NotClaimed
 		);
 
 		assert_noop!(
 			NodeAuthorization::remove_connections(
-				Origin::signed(15), test_node(20), vec![test_node(5)]
+				Origin::signed(15),
+				test_node(20),
+				vec![test_node(5)]
 			),
 			Error::<Test>::NotOwner
 		);
 
 		AdditionalConnections::<Test>::insert(
 			test_node(20),
-			BTreeSet::from_iter(vec![test_node(5), test_node(15), test_node(25)])
-		);
-		assert_ok!(
-			NodeAuthorization::remove_connections(
-				Origin::signed(20),
-				test_node(20),
-				vec![test_node(15), test_node(5)]
-			)
+			BTreeSet::from_iter(vec![test_node(5), test_node(15), test_node(25)]),
 		);
+		assert_ok!(NodeAuthorization::remove_connections(
+			Origin::signed(20),
+			test_node(20),
+			vec![test_node(15), test_node(5)]
+		));
 		assert_eq!(
 			AdditionalConnections::<Test>::get(test_node(20)),
 			BTreeSet::from_iter(vec![test_node(25)])
@@ -353,7 +357,7 @@ fn get_authorized_nodes_works() {
 	new_test_ext().execute_with(|| {
 		AdditionalConnections::<Test>::insert(
 			test_node(20),
-			BTreeSet::from_iter(vec![test_node(5), test_node(15), test_node(25)])
+			BTreeSet::from_iter(vec![test_node(5), test_node(15), test_node(25)]),
 		);
 
 		let mut authorized_nodes = Pallet::<Test>::get_authorized_nodes(&test_node(20));
diff --git a/frame/node-authorization/src/weights.rs b/frame/node-authorization/src/weights.rs
index 3d01e40d67ac..dbb7956cff96 100644
--- a/frame/node-authorization/src/weights.rs
+++ b/frame/node-authorization/src/weights.rs
@@ -17,6 +17,7 @@
 
 //! Autogenerated weights for pallet_node_authorization
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
diff --git a/frame/offences/benchmarking/src/lib.rs b/frame/offences/benchmarking/src/lib.rs
index d424cfc751ee..0332272cf2df 100644
--- a/frame/offences/benchmarking/src/lib.rs
+++ b/frame/offences/benchmarking/src/lib.rs
@@ -21,29 +21,30 @@
 
 mod mock;
 
-use sp_std::prelude::*;
-use sp_std::vec;
+use sp_std::{prelude::*, vec};
 
-use frame_system::{RawOrigin, Pallet as System, Config as SystemConfig};
-use frame_benchmarking::{benchmarks, account, impl_benchmark_test_suite};
+use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite};
 use frame_support::traits::{Currency, ValidatorSet, ValidatorSetWithIdentification};
+use frame_system::{Config as SystemConfig, Pallet as System, RawOrigin};
 
 use sp_runtime::{
+	traits::{Convert, Saturating, StaticLookup, UniqueSaturatedInto},
 	Perbill,
-	traits::{Convert, StaticLookup, Saturating, UniqueSaturatedInto},
 };
-use sp_staking::offence::{ReportOffence, Offence};
+use sp_staking::offence::{Offence, ReportOffence};
 
-use pallet_balances::Config as BalancesConfig;
 use pallet_babe::BabeEquivocationOffence;
+use pallet_balances::Config as BalancesConfig;
 use pallet_grandpa::{GrandpaEquivocationOffence, GrandpaTimeSlot};
 use pallet_im_online::{Config as ImOnlineConfig, Pallet as ImOnline, UnresponsivenessOffence};
 use pallet_offences::{Config as OffencesConfig, Pallet as Offences};
-use pallet_session::historical::{Config as HistoricalConfig, IdentificationTuple};
-use pallet_session::{Config as SessionConfig, SessionManager};
+use pallet_session::{
+	historical::{Config as HistoricalConfig, IdentificationTuple},
+	Config as SessionConfig, SessionManager,
+};
 use pallet_staking::{
-	Pallet as Staking, Config as StakingConfig, RewardDestination, ValidatorPrefs, Exposure,
-	IndividualExposure, Event as StakingEvent,
+	Config as StakingConfig, Event as StakingEvent, Exposure, IndividualExposure,
+	Pallet as Staking, RewardDestination, ValidatorPrefs,
 };
 
 const SEED: u32 = 0;
@@ -62,7 +63,8 @@ pub trait Config:
 	+ HistoricalConfig
 	+ BalancesConfig
 	+ IdTupleConvert<Self>
-{}
+{
+}
 
 /// A helper trait to make sure we can convert `IdentificationTuple` coming from historical
 /// and the one required by offences.
@@ -71,8 +73,9 @@ pub trait IdTupleConvert<T: HistoricalConfig + OffencesConfig> {
 	fn convert(id: IdentificationTuple<T>) -> <T as OffencesConfig>::IdentificationTuple;
 }
 
-impl<T: HistoricalConfig + OffencesConfig> IdTupleConvert<T> for T where
-	<T as OffencesConfig>::IdentificationTuple: From<IdentificationTuple<T>>
+impl<T: HistoricalConfig + OffencesConfig> IdTupleConvert<T> for T
+where
+	<T as OffencesConfig>::IdentificationTuple: From<IdentificationTuple<T>>,
 {
 	fn convert(id: IdentificationTuple<T>) -> <T as OffencesConfig>::IdentificationTuple {
 		id.into()
@@ -80,7 +83,8 @@ impl<T: HistoricalConfig + OffencesConfig> IdTupleConvert<T> for T where
 }
 
 type LookupSourceOf<T> = <<T as SystemConfig>::Lookup as StaticLookup>::Source;
-type BalanceOf<T> = <<T as StakingConfig>::Currency as Currency<<T as SystemConfig>::AccountId>>::Balance;
+type BalanceOf<T> =
+	<<T as StakingConfig>::Currency as Currency<<T as SystemConfig>::AccountId>>::Balance;
 
 struct Offender<T: Config> {
 	pub controller: T::AccountId,
@@ -109,19 +113,20 @@ fn create_offender<T: Config>(n: u32, nominators: u32) -> Result<Offender<T>, &'
 		reward_destination.clone(),
 	)?;
 
-	let validator_prefs = ValidatorPrefs {
-		commission: Perbill::from_percent(50),
-		.. Default::default()
-	};
+	let validator_prefs =
+		ValidatorPrefs { commission: Perbill::from_percent(50), ..Default::default() };
 	Staking::<T>::validate(RawOrigin::Signed(controller.clone()).into(), validator_prefs)?;
 
 	let mut individual_exposures = vec![];
 	let mut nominator_stashes = vec![];
 	// Create n nominators
-	for i in 0 .. nominators {
-		let nominator_stash: T::AccountId = account("nominator stash", n * MAX_NOMINATORS + i, SEED);
-		let nominator_controller: T::AccountId = account("nominator controller", n * MAX_NOMINATORS + i, SEED);
-		let nominator_controller_lookup: LookupSourceOf<T> = T::Lookup::unlookup(nominator_controller.clone());
+	for i in 0..nominators {
+		let nominator_stash: T::AccountId =
+			account("nominator stash", n * MAX_NOMINATORS + i, SEED);
+		let nominator_controller: T::AccountId =
+			account("nominator controller", n * MAX_NOMINATORS + i, SEED);
+		let nominator_controller_lookup: LookupSourceOf<T> =
+			T::Lookup::unlookup(nominator_controller.clone());
 		T::Currency::make_free_balance_be(&nominator_stash, free_amount.into());
 
 		Staking::<T>::bond(
@@ -132,76 +137,82 @@ fn create_offender<T: Config>(n: u32, nominators: u32) -> Result<Offender<T>, &'
 		)?;
 
 		let selected_validators: Vec<LookupSourceOf<T>> = vec![controller_lookup.clone()];
-		Staking::<T>::nominate(RawOrigin::Signed(nominator_controller.clone()).into(), selected_validators)?;
+		Staking::<T>::nominate(
+			RawOrigin::Signed(nominator_controller.clone()).into(),
+			selected_validators,
+		)?;
 
-		individual_exposures.push(IndividualExposure {
-			who: nominator_stash.clone(),
-			value: amount.clone(),
-		});
+		individual_exposures
+			.push(IndividualExposure { who: nominator_stash.clone(), value: amount.clone() });
 		nominator_stashes.push(nominator_stash.clone());
 	}
 
-	let exposure = Exposure {
-		total: amount.clone() * n.into(),
-		own: amount,
-		others: individual_exposures,
-	};
+	let exposure =
+		Exposure { total: amount.clone() * n.into(), own: amount, others: individual_exposures };
 	let current_era = 0u32;
 	Staking::<T>::add_era_stakers(current_era.into(), stash.clone().into(), exposure);
 
 	Ok(Offender { controller, stash, nominator_stashes })
 }
 
-fn make_offenders<T: Config>(num_offenders: u32, num_nominators: u32) -> Result<
-	(Vec<IdentificationTuple<T>>, Vec<Offender<T>>),
-	&'static str
-> {
+fn make_offenders<T: Config>(
+	num_offenders: u32,
+	num_nominators: u32,
+) -> Result<(Vec<IdentificationTuple<T>>, Vec<Offender<T>>), &'static str> {
 	Staking::<T>::new_session(0);
 
 	let mut offenders = vec![];
-	for i in 0 .. num_offenders {
+	for i in 0..num_offenders {
 		let offender = create_offender::<T>(i + 1, num_nominators)?;
 		offenders.push(offender);
 	}
 
 	Staking::<T>::start_session(0);
 
-	let id_tuples = offenders.iter()
-		.map(|offender|
+	let id_tuples = offenders
+		.iter()
+		.map(|offender| {
 			<T as SessionConfig>::ValidatorIdOf::convert(offender.controller.clone())
-				.expect("failed to get validator id from account id"))
-		.map(|validator_id|
+				.expect("failed to get validator id from account id")
+		})
+		.map(|validator_id| {
 			<T as HistoricalConfig>::FullIdentificationOf::convert(validator_id.clone())
-			.map(|full_id| (validator_id, full_id))
-			.expect("failed to convert validator id to full identification"))
+				.map(|full_id| (validator_id, full_id))
+				.expect("failed to convert validator id to full identification")
+		})
 		.collect::<Vec<IdentificationTuple<T>>>();
 	Ok((id_tuples, offenders))
 }
 
-fn make_offenders_im_online<T: Config>(num_offenders: u32, num_nominators: u32) -> Result<
-	(Vec<pallet_im_online::IdentificationTuple<T>>, Vec<Offender<T>>),
-	&'static str
-> {
+fn make_offenders_im_online<T: Config>(
+	num_offenders: u32,
+	num_nominators: u32,
+) -> Result<(Vec<pallet_im_online::IdentificationTuple<T>>, Vec<Offender<T>>), &'static str> {
 	Staking::<T>::new_session(0);
 
 	let mut offenders = vec![];
-	for i in 0 .. num_offenders {
+	for i in 0..num_offenders {
 		let offender = create_offender::<T>(i + 1, num_nominators)?;
 		offenders.push(offender);
 	}
 
 	Staking::<T>::start_session(0);
 
-	let id_tuples = offenders.iter()
-		.map(|offender| <
+	let id_tuples = offenders
+		.iter()
+		.map(|offender| {
+			<
 				<T as ImOnlineConfig>::ValidatorSet as ValidatorSet<T::AccountId>
 			>::ValidatorIdOf::convert(offender.controller.clone())
-			.expect("failed to get validator id from account id"))
-		.map(|validator_id| <
+			.expect("failed to get validator id from account id")
+		})
+		.map(|validator_id| {
+			<
 				<T as ImOnlineConfig>::ValidatorSet as ValidatorSetWithIdentification<T::AccountId>
 			>::IdentificationOf::convert(validator_id.clone())
 			.map(|full_id| (validator_id, full_id))
-			.expect("failed to convert validator id to full identification"))
+			.expect("failed to convert validator id to full identification")
+		})
 		.collect::<Vec<pallet_im_online::IdentificationTuple<T>>>();
 	Ok((id_tuples, offenders))
 }
@@ -224,7 +235,9 @@ fn check_events<T: Config, I: Iterator<Item = <T as SystemConfig>::Event>>(expec
 		pretty("--Got:", &events);
 		pretty("--Expected:", &expected);
 		format!("Mismatching length. Got: {}, expected: {}", lengths.0, lengths.1)
-	} else { Default::default() };
+	} else {
+		Default::default()
+	};
 
 	for (idx, (a, b)) in events.into_iter().zip(expected).enumerate() {
 		assert_eq!(a, b, "Mismatch at: {}. {}", idx, length_mismatch);
@@ -388,8 +401,4 @@ benchmarks! {
 	}
 }
 
-impl_benchmark_test_suite!(
-	Pallet,
-	crate::mock::new_test_ext(),
-	crate::mock::Test,
-);
+impl_benchmark_test_suite!(Pallet, crate::mock::new_test_ext(), crate::mock::Test,);
diff --git a/frame/offences/benchmarking/src/mock.rs b/frame/offences/benchmarking/src/mock.rs
index 4e7a63c58a40..6fc5ee8b66eb 100644
--- a/frame/offences/benchmarking/src/mock.rs
+++ b/frame/offences/benchmarking/src/mock.rs
@@ -20,17 +20,14 @@
 #![cfg(test)]
 
 use super::*;
-use frame_support::{
-	parameter_types,
-	weights::constants::WEIGHT_PER_SECOND,
-};
+use frame_election_provider_support::onchain;
+use frame_support::{parameter_types, weights::constants::WEIGHT_PER_SECOND};
 use frame_system as system;
+use pallet_session::historical as pallet_session_historical;
 use sp_runtime::{
-	traits::IdentityLookup,
 	testing::{Header, UintAuthorityId},
+	traits::IdentityLookup,
 };
-use frame_election_provider_support::onchain;
-use pallet_session::historical as pallet_session_historical;
 
 type AccountId = u64;
 type AccountIndex = u32;
@@ -112,7 +109,8 @@ impl pallet_session::SessionHandler<AccountId> for TestSessionHandler {
 		_: bool,
 		_: &[(AccountId, Ks)],
 		_: &[(AccountId, Ks)],
-	) {}
+	) {
+	}
 
 	fn on_disabled(_: usize) {}
 }
@@ -198,7 +196,10 @@ impl pallet_offences::Config for Test {
 	type OnOffenceHandler = Staking;
 }
 
-impl<T> frame_system::offchain::SendTransactionTypes<T> for Test where Call: From<T> {
+impl<T> frame_system::offchain::SendTransactionTypes<T> for Test
+where
+	Call: From<T>,
+{
 	type Extrinsic = Extrinsic;
 	type OverarchingCall = Call;
 }
diff --git a/frame/offences/src/lib.rs b/frame/offences/src/lib.rs
index 1076dd615496..3392cd6e4a88 100644
--- a/frame/offences/src/lib.rs
+++ b/frame/offences/src/lib.rs
@@ -22,18 +22,18 @@
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
 
+mod migration;
 mod mock;
 mod tests;
-mod migration;
 
-use sp_std::prelude::*;
+use codec::{Decode, Encode};
 use frame_support::weights::Weight;
 use sp_runtime::{traits::Hash, Perbill};
 use sp_staking::{
 	offence::{Kind, Offence, OffenceDetails, OffenceError, OnOffenceHandler, ReportOffence},
-	SessionIndex
+	SessionIndex,
 };
-use codec::{Decode, Encode};
+use sp_std::prelude::*;
 
 pub use pallet::*;
 
@@ -44,17 +44,25 @@ type OpaqueTimeSlot = Vec<u8>;
 type ReportIdOf<T> = <T as frame_system::Config>::Hash;
 
 pub trait WeightInfo {
-	fn report_offence_im_online(r: u32, o: u32, n: u32, ) -> Weight;
-	fn report_offence_grandpa(r: u32, n: u32, ) -> Weight;
-	fn report_offence_babe(r: u32, n: u32, ) -> Weight;
-	fn on_initialize(d: u32, ) -> Weight;
+	fn report_offence_im_online(r: u32, o: u32, n: u32) -> Weight;
+	fn report_offence_grandpa(r: u32, n: u32) -> Weight;
+	fn report_offence_babe(r: u32, n: u32) -> Weight;
+	fn on_initialize(d: u32) -> Weight;
 }
 
 impl WeightInfo for () {
-	fn report_offence_im_online(_r: u32, _o: u32, _n: u32, ) -> Weight { 1_000_000_000 }
-	fn report_offence_grandpa(_r: u32, _n: u32, ) -> Weight { 1_000_000_000 }
-	fn report_offence_babe(_r: u32, _n: u32, ) -> Weight { 1_000_000_000 }
-	fn on_initialize(_d: u32, ) -> Weight { 1_000_000_000 }
+	fn report_offence_im_online(_r: u32, _o: u32, _n: u32) -> Weight {
+		1_000_000_000
+	}
+	fn report_offence_grandpa(_r: u32, _n: u32) -> Weight {
+		1_000_000_000
+	}
+	fn report_offence_babe(_r: u32, _n: u32) -> Weight {
+		1_000_000_000
+	}
+	fn on_initialize(_d: u32) -> Weight {
+		1_000_000_000
+	}
 }
 
 #[frame_support::pallet]
@@ -145,22 +153,20 @@ where
 
 		// Go through all offenders in the offence report and find all offenders that were spotted
 		// in unique reports.
-		let TriageOutcome {
-			concurrent_offenders,
-		} = match Self::triage_offence_report::<O>(reporters, &time_slot, offenders) {
-			Some(triage) => triage,
-			// The report contained only duplicates, so there is no need to slash again.
-			None => return Err(OffenceError::DuplicateReport),
-		};
+		let TriageOutcome { concurrent_offenders } =
+			match Self::triage_offence_report::<O>(reporters, &time_slot, offenders) {
+				Some(triage) => triage,
+				// The report contained only duplicates, so there is no need to slash again.
+				None => return Err(OffenceError::DuplicateReport),
+			};
 
 		let offenders_count = concurrent_offenders.len() as u32;
 
 		// The amount new offenders are slashed
 		let new_fraction = O::slash_fraction(offenders_count, validator_set_count);
 
-		let slash_perbill: Vec<_> = (0..concurrent_offenders.len())
-			.map(|_| new_fraction.clone())
-			.collect();
+		let slash_perbill: Vec<_> =
+			(0..concurrent_offenders.len()).map(|_| new_fraction.clone()).collect();
 
 		T::OnOffenceHandler::on_offence(
 			&concurrent_offenders,
@@ -212,10 +218,7 @@ impl<T: Config> Pallet<T> {
 				any_new = true;
 				<Reports<T>>::insert(
 					&report_id,
-					OffenceDetails {
-						offender,
-						reporters: reporters.clone(),
-					},
+					OffenceDetails { offender, reporters: reporters.clone() },
 				);
 
 				storage.insert(time_slot, report_id);
@@ -232,9 +235,7 @@ impl<T: Config> Pallet<T> {
 
 			storage.save();
 
-			Some(TriageOutcome {
-				concurrent_offenders,
-			})
+			Some(TriageOutcome { concurrent_offenders })
 		} else {
 			None
 		}
@@ -270,20 +271,14 @@ impl<T: Config, O: Offence<T::IdentificationTuple>> ReportIndexStorage<T, O> {
 
 		let concurrent_reports = <ConcurrentReportsIndex<T>>::get(&O::ID, &opaque_time_slot);
 
-		Self {
-			opaque_time_slot,
-			concurrent_reports,
-			same_kind_reports,
-		}
+		Self { opaque_time_slot, concurrent_reports, same_kind_reports }
 	}
 
 	/// Insert a new report to the index.
 	fn insert(&mut self, time_slot: &O::TimeSlot, report_id: ReportIdOf<T>) {
 		// Insert the report id into the list while maintaining the ordering by the time
 		// slot.
-		let pos = self
-			.same_kind_reports
-			.partition_point(|&(ref when, _)| when <= time_slot);
+		let pos = self.same_kind_reports.partition_point(|&(ref when, _)| when <= time_slot);
 		self.same_kind_reports.insert(pos, (time_slot.clone(), report_id));
 
 		// Update the list of concurrent reports.
diff --git a/frame/offences/src/migration.rs b/frame/offences/src/migration.rs
index ce8a125e7e1a..cb5c520392c9 100644
--- a/frame/offences/src/migration.rs
+++ b/frame/offences/src/migration.rs
@@ -16,18 +16,13 @@
 // limitations under the License.
 
 use super::{Config, OffenceDetails, Perbill, SessionIndex};
-use frame_support::{traits::Get, weights::Weight, generate_storage_alias};
+use frame_support::{generate_storage_alias, traits::Get, weights::Weight};
 use sp_staking::offence::OnOffenceHandler;
 use sp_std::vec::Vec;
 
 /// Type of data stored as a deferred offence
 type DeferredOffenceOf<T> = (
-	Vec<
-		OffenceDetails<
-			<T as frame_system::Config>::AccountId,
-			<T as Config>::IdentificationTuple,
-		>,
-	>,
+	Vec<OffenceDetails<<T as frame_system::Config>::AccountId, <T as Config>::IdentificationTuple>>,
 	Vec<Perbill>,
 	SessionIndex,
 );
diff --git a/frame/offences/src/mock.rs b/frame/offences/src/mock.rs
index 5818ae71687b..84114f015089 100644
--- a/frame/offences/src/mock.rs
+++ b/frame/offences/src/mock.rs
@@ -19,22 +19,27 @@
 
 #![cfg(test)]
 
-use std::cell::RefCell;
+use crate as offences;
 use crate::Config;
 use codec::Encode;
-use sp_runtime::Perbill;
-use sp_staking::{
-	SessionIndex,
-	offence::{self, Kind, OffenceDetails},
-};
-use sp_runtime::testing::Header;
-use sp_runtime::traits::{IdentityLookup, BlakeTwo256};
-use sp_core::H256;
 use frame_support::{
 	parameter_types,
-	weights::{Weight, constants::{WEIGHT_PER_SECOND, RocksDbWeight}},
+	weights::{
+		constants::{RocksDbWeight, WEIGHT_PER_SECOND},
+		Weight,
+	},
 };
-use crate as offences;
+use sp_core::H256;
+use sp_runtime::{
+	testing::Header,
+	traits::{BlakeTwo256, IdentityLookup},
+	Perbill,
+};
+use sp_staking::{
+	offence::{self, Kind, OffenceDetails},
+	SessionIndex,
+};
+use std::cell::RefCell;
 
 pub struct OnOffenceHandler;
 
@@ -43,8 +48,8 @@ thread_local! {
 	pub static OFFENCE_WEIGHT: RefCell<Weight> = RefCell::new(Default::default());
 }
 
-impl<Reporter, Offender>
-	offence::OnOffenceHandler<Reporter, Offender, Weight> for OnOffenceHandler
+impl<Reporter, Offender> offence::OnOffenceHandler<Reporter, Offender, Weight>
+	for OnOffenceHandler
 {
 	fn on_offence(
 		_offenders: &[OffenceDetails<Reporter, Offender>],
@@ -60,9 +65,7 @@ impl<Reporter, Offender>
 }
 
 pub fn with_on_offence_fractions<R, F: FnOnce(&mut Vec<Perbill>) -> R>(f: F) -> R {
-	ON_OFFENCE_PERBILL.with(|fractions| {
-		f(&mut *fractions.borrow_mut())
-	})
+	ON_OFFENCE_PERBILL.with(|fractions| f(&mut *fractions.borrow_mut()))
 }
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
@@ -163,10 +166,7 @@ impl<T: Clone> offence::Offence<T> for Offence<T> {
 		1
 	}
 
-	fn slash_fraction(
-		offenders_count: u32,
-		validator_set_count: u32,
-	) -> Perbill {
+	fn slash_fraction(offenders_count: u32, validator_set_count: u32) -> Perbill {
 		Perbill::from_percent(5 + offenders_count * 100 / validator_set_count)
 	}
 }
diff --git a/frame/offences/src/tests.rs b/frame/offences/src/tests.rs
index d2e0f2d63d55..18cfa9410a6c 100644
--- a/frame/offences/src/tests.rs
+++ b/frame/offences/src/tests.rs
@@ -21,11 +21,11 @@
 
 use super::*;
 use crate::mock::{
-	Offences, System, Offence, Event, KIND, new_test_ext, with_on_offence_fractions,
-	offence_reports, report_id,
+	new_test_ext, offence_reports, report_id, with_on_offence_fractions, Event, Offence, Offences,
+	System, KIND,
 };
-use sp_runtime::Perbill;
 use frame_system::{EventRecord, Phase};
+use sp_runtime::Perbill;
 
 #[test]
 fn should_report_an_authority_and_trigger_on_offence() {
@@ -34,11 +34,7 @@ fn should_report_an_authority_and_trigger_on_offence() {
 		let time_slot = 42;
 		assert_eq!(offence_reports(KIND, time_slot), vec![]);
 
-		let offence = Offence {
-			validator_set_count: 5,
-			time_slot,
-			offenders: vec![5],
-		};
+		let offence = Offence { validator_set_count: 5, time_slot, offenders: vec![5] };
 
 		// when
 		Offences::report_offence(vec![], offence).unwrap();
@@ -57,11 +53,7 @@ fn should_not_report_the_same_authority_twice_in_the_same_slot() {
 		let time_slot = 42;
 		assert_eq!(offence_reports(KIND, time_slot), vec![]);
 
-		let offence = Offence {
-			validator_set_count: 5,
-			time_slot,
-			offenders: vec![5],
-		};
+		let offence = Offence { validator_set_count: 5, time_slot, offenders: vec![5] };
 		Offences::report_offence(vec![], offence.clone()).unwrap();
 		with_on_offence_fractions(|f| {
 			assert_eq!(f.clone(), vec![Perbill::from_percent(25)]);
@@ -79,7 +71,6 @@ fn should_not_report_the_same_authority_twice_in_the_same_slot() {
 	});
 }
 
-
 #[test]
 fn should_report_in_different_time_slot() {
 	new_test_ext().execute_with(|| {
@@ -87,11 +78,7 @@ fn should_report_in_different_time_slot() {
 		let time_slot = 42;
 		assert_eq!(offence_reports(KIND, time_slot), vec![]);
 
-		let mut offence = Offence {
-			validator_set_count: 5,
-			time_slot,
-			offenders: vec![5],
-		};
+		let mut offence = Offence { validator_set_count: 5, time_slot, offenders: vec![5] };
 		Offences::report_offence(vec![], offence.clone()).unwrap();
 		with_on_offence_fractions(|f| {
 			assert_eq!(f.clone(), vec![Perbill::from_percent(25)]);
@@ -117,11 +104,7 @@ fn should_deposit_event() {
 		let time_slot = 42;
 		assert_eq!(offence_reports(KIND, time_slot), vec![]);
 
-		let offence = Offence {
-			validator_set_count: 5,
-			time_slot,
-			offenders: vec![5],
-		};
+		let offence = Offence { validator_set_count: 5, time_slot, offenders: vec![5] };
 
 		// when
 		Offences::report_offence(vec![], offence).unwrap();
@@ -145,11 +128,7 @@ fn doesnt_deposit_event_for_dups() {
 		let time_slot = 42;
 		assert_eq!(offence_reports(KIND, time_slot), vec![]);
 
-		let offence = Offence {
-			validator_set_count: 5,
-			time_slot,
-			offenders: vec![5],
-		};
+		let offence = Offence { validator_set_count: 5, time_slot, offenders: vec![5] };
 		Offences::report_offence(vec![], offence.clone()).unwrap();
 		with_on_offence_fractions(|f| {
 			assert_eq!(f.clone(), vec![Perbill::from_percent(25)]);
@@ -181,33 +160,26 @@ fn reports_if_an_offence_is_dup() {
 		let time_slot = 42;
 		assert_eq!(offence_reports(KIND, time_slot), vec![]);
 
-		let offence = |time_slot, offenders| TestOffence {
-			validator_set_count: 5,
-			time_slot,
-			offenders,
-		};
+		let offence =
+			|time_slot, offenders| TestOffence { validator_set_count: 5, time_slot, offenders };
 
 		let mut test_offence = offence(time_slot, vec![0]);
 
 		// the report for authority 0 at time slot 42 should not be a known
 		// offence
-		assert!(
-			!<Offences as ReportOffence<_, _, TestOffence>>::is_known_offence(
-				&test_offence.offenders,
-				&test_offence.time_slot
-			)
-		);
+		assert!(!<Offences as ReportOffence<_, _, TestOffence>>::is_known_offence(
+			&test_offence.offenders,
+			&test_offence.time_slot
+		));
 
 		// we report an offence for authority 0 at time slot 42
 		Offences::report_offence(vec![], test_offence.clone()).unwrap();
 
 		// the same report should be a known offence now
-		assert!(
-			<Offences as ReportOffence<_, _, TestOffence>>::is_known_offence(
-				&test_offence.offenders,
-				&test_offence.time_slot
-			)
-		);
+		assert!(<Offences as ReportOffence<_, _, TestOffence>>::is_known_offence(
+			&test_offence.offenders,
+			&test_offence.time_slot
+		));
 
 		// and reporting it again should yield a duplicate report error
 		assert_eq!(
@@ -219,28 +191,21 @@ fn reports_if_an_offence_is_dup() {
 		test_offence.offenders.push(1);
 
 		// it should not be a known offence anymore
-		assert!(
-			!<Offences as ReportOffence<_, _, TestOffence>>::is_known_offence(
-				&test_offence.offenders,
-				&test_offence.time_slot
-			)
-		);
+		assert!(!<Offences as ReportOffence<_, _, TestOffence>>::is_known_offence(
+			&test_offence.offenders,
+			&test_offence.time_slot
+		));
 
 		// and reporting it again should work without any error
-		assert_eq!(
-			Offences::report_offence(vec![], test_offence.clone()),
-			Ok(())
-		);
+		assert_eq!(Offences::report_offence(vec![], test_offence.clone()), Ok(()));
 
 		// creating a new offence for the same authorities on the next slot
 		// should be considered a new offence and thefore not known
 		let test_offence_next_slot = offence(time_slot + 1, vec![0, 1]);
-		assert!(
-			!<Offences as ReportOffence<_, _, TestOffence>>::is_known_offence(
-				&test_offence_next_slot.offenders,
-				&test_offence_next_slot.time_slot
-			)
-		);
+		assert!(!<Offences as ReportOffence<_, _, TestOffence>>::is_known_offence(
+			&test_offence_next_slot.offenders,
+			&test_offence_next_slot.time_slot
+		));
 	});
 }
 
@@ -253,16 +218,8 @@ fn should_properly_count_offences() {
 		let time_slot = 42;
 		assert_eq!(offence_reports(KIND, time_slot), vec![]);
 
-		let offence1 = Offence {
-			validator_set_count: 5,
-			time_slot,
-			offenders: vec![5],
-		};
-		let offence2 = Offence {
-			validator_set_count: 5,
-			time_slot,
-			offenders: vec![4],
-		};
+		let offence1 = Offence { validator_set_count: 5, time_slot, offenders: vec![5] };
+		let offence2 = Offence { validator_set_count: 5, time_slot, offenders: vec![4] };
 		Offences::report_offence(vec![], offence1).unwrap();
 		with_on_offence_fractions(|f| {
 			assert_eq!(f.clone(), vec![Perbill::from_percent(25)]);
@@ -294,26 +251,12 @@ fn should_properly_sort_offences() {
 		let time_slot = 42;
 		assert_eq!(offence_reports(KIND, time_slot), vec![]);
 
-		let offence1 = Offence {
-			validator_set_count: 5,
-			time_slot,
-			offenders: vec![5],
-		};
-		let offence2 = Offence {
-			validator_set_count: 5,
-			time_slot,
-			offenders: vec![4],
-		};
-		let offence3 = Offence {
-			validator_set_count: 5,
-			time_slot: time_slot + 1,
-			offenders: vec![6, 7],
-		};
-		let offence4 = Offence {
-			validator_set_count: 5,
-			time_slot: time_slot - 1,
-			offenders: vec![3],
-		};
+		let offence1 = Offence { validator_set_count: 5, time_slot, offenders: vec![5] };
+		let offence2 = Offence { validator_set_count: 5, time_slot, offenders: vec![4] };
+		let offence3 =
+			Offence { validator_set_count: 5, time_slot: time_slot + 1, offenders: vec![6, 7] };
+		let offence4 =
+			Offence { validator_set_count: 5, time_slot: time_slot - 1, offenders: vec![3] };
 		Offences::report_offence(vec![], offence1).unwrap();
 		with_on_offence_fractions(|f| {
 			assert_eq!(f.clone(), vec![Perbill::from_percent(25)]);
@@ -327,10 +270,10 @@ fn should_properly_sort_offences() {
 		Offences::report_offence(vec![], offence4).unwrap();
 
 		// then
-		let same_kind_reports =
-			Vec::<(u128, sp_core::H256)>::decode(
-				&mut &crate::ReportsByKindIndex::<crate::mock::Runtime>::get(KIND)[..],
-			).unwrap();
+		let same_kind_reports = Vec::<(u128, sp_core::H256)>::decode(
+			&mut &crate::ReportsByKindIndex::<crate::mock::Runtime>::get(KIND)[..],
+		)
+		.unwrap();
 		assert_eq!(
 			same_kind_reports,
 			vec![
diff --git a/frame/proxy/src/benchmarking.rs b/frame/proxy/src/benchmarking.rs
index 336a80dd4ac5..a06c22a3ed8f 100644
--- a/frame/proxy/src/benchmarking.rs
+++ b/frame/proxy/src/benchmarking.rs
@@ -20,10 +20,10 @@
 #![cfg(feature = "runtime-benchmarks")]
 
 use super::*;
+use crate::Pallet as Proxy;
+use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, whitelisted_caller};
 use frame_system::RawOrigin;
-use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
 use sp_runtime::traits::Bounded;
-use crate::Pallet as Proxy;
 
 const SEED: u32 = 0;
 
@@ -48,7 +48,7 @@ fn add_proxies<T: Config>(n: u32, maybe_who: Option<T::AccountId>) -> Result<(),
 fn add_announcements<T: Config>(
 	n: u32,
 	maybe_who: Option<T::AccountId>,
-	maybe_real: Option<T::AccountId>
+	maybe_real: Option<T::AccountId>,
 ) -> Result<(), &'static str> {
 	let caller = maybe_who.unwrap_or_else(|| account("caller", 0, SEED));
 	T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
@@ -247,8 +247,4 @@ benchmarks! {
 	}
 }
 
-impl_benchmark_test_suite!(
-	Proxy,
-	crate::tests::new_test_ext(),
-	crate::tests::Test,
-);
+impl_benchmark_test_suite!(Proxy, crate::tests::new_test_ext(), crate::tests::Test,);
diff --git a/frame/proxy/src/lib.rs b/frame/proxy/src/lib.rs
index d4f430a7e8b0..56932669ed8c 100644
--- a/frame/proxy/src/lib.rs
+++ b/frame/proxy/src/lib.rs
@@ -29,39 +29,39 @@
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
 
-mod tests;
 mod benchmarking;
+mod tests;
 pub mod weights;
 
-use sp_std::{prelude::*, convert::TryInto};
-use codec::{Encode, Decode, MaxEncodedLen};
+use codec::{Decode, Encode, MaxEncodedLen};
+use frame_support::{
+	dispatch::{DispatchError, DispatchResultWithPostInfo, PostDispatchInfo},
+	ensure,
+	traits::{Currency, Get, InstanceFilter, IsSubType, IsType, OriginTrait, ReservableCurrency},
+	weights::GetDispatchInfo,
+	RuntimeDebug,
+};
+use frame_system::{self as system};
 use sp_io::hashing::blake2_256;
 use sp_runtime::{
+	traits::{Dispatchable, Hash, Saturating, Zero},
 	DispatchResult,
-	traits::{Dispatchable, Zero, Hash, Saturating}
 };
-use frame_support::{
-		RuntimeDebug, ensure,
-		dispatch::{DispatchResultWithPostInfo, PostDispatchInfo},
-		traits::{
-			Get, ReservableCurrency, Currency, InstanceFilter, OriginTrait,
-			IsType, IsSubType,
-		},
-		weights::GetDispatchInfo,
-};
-use frame_system::{self as system};
-use frame_support::dispatch::DispatchError;
+use sp_std::{convert::TryInto, prelude::*};
 pub use weights::WeightInfo;
 
 pub use pallet::*;
 
 type CallHashOf<T> = <<T as Config>::CallHasher as Hash>::Output;
 
-type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+type BalanceOf<T> =
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 
 /// The parameters under which a particular account has a proxy relationship with some other
 /// account.
-#[derive(Encode, Decode, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, RuntimeDebug, MaxEncodedLen)]
+#[derive(
+	Encode, Decode, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, RuntimeDebug, MaxEncodedLen,
+)]
 pub struct ProxyDefinition<AccountId, ProxyType, BlockNumber> {
 	/// The account which may act on behalf of another.
 	pub delegate: AccountId,
@@ -85,9 +85,9 @@ pub struct Announcement<AccountId, Hash, BlockNumber> {
 
 #[frame_support::pallet]
 pub mod pallet {
+	use super::{DispatchResult, *};
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
-	use super::{*, DispatchResult};
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
@@ -101,8 +101,11 @@ pub mod pallet {
 		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
 
 		/// The overarching call type.
-		type Call: Parameter + Dispatchable<Origin=Self::Origin, PostInfo=PostDispatchInfo>
-			+ GetDispatchInfo + From<frame_system::Call<Self>> + IsSubType<Call<Self>>
+		type Call: Parameter
+			+ Dispatchable<Origin = Self::Origin, PostInfo = PostDispatchInfo>
+			+ GetDispatchInfo
+			+ From<frame_system::Call<Self>>
+			+ IsSubType<Call<Self>>
 			+ IsType<<Self as frame_system::Config>::Call>;
 
 		/// The currency mechanism.
@@ -112,8 +115,13 @@ pub mod pallet {
 		/// The instance filter determines whether a given call may be proxied under this type.
 		///
 		/// IMPORTANT: `Default` must be provided and MUST BE the the *most permissive* value.
-		type ProxyType: Parameter + Member + Ord + PartialOrd + InstanceFilter<<Self as Config>::Call>
-			+ Default + MaxEncodedLen;
+		type ProxyType: Parameter
+			+ Member
+			+ Ord
+			+ PartialOrd
+			+ InstanceFilter<<Self as Config>::Call>
+			+ Default
+			+ MaxEncodedLen;
 
 		/// The base amount of currency needed to reserve for creating a proxy.
 		///
@@ -291,21 +299,17 @@ pub mod pallet {
 			origin: OriginFor<T>,
 			proxy_type: T::ProxyType,
 			delay: T::BlockNumber,
-			index: u16
+			index: u16,
 		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
 
 			let anonymous = Self::anonymous_account(&who, &proxy_type, index, None);
 			ensure!(!Proxies::<T>::contains_key(&anonymous), Error::<T>::Duplicate);
 
-			let proxy_def = ProxyDefinition {
-				delegate: who.clone(),
-				proxy_type: proxy_type.clone(),
-				delay,
-			};
-			let bounded_proxies: BoundedVec<_, T::MaxProxies> = vec![proxy_def]
-				.try_into()
-				.map_err(|_| Error::<T>::TooMany)?;
+			let proxy_def =
+				ProxyDefinition { delegate: who.clone(), proxy_type: proxy_type.clone(), delay };
+			let bounded_proxies: BoundedVec<_, T::MaxProxies> =
+				vec![proxy_def].try_into().map_err(|_| Error::<T>::TooMany)?;
 
 			let deposit = T::ProxyDepositBase::get() + T::ProxyDepositFactor::get();
 			T::Currency::reserve(&who, deposit)?;
@@ -382,10 +386,12 @@ pub mod pallet {
 		pub fn announce(
 			origin: OriginFor<T>,
 			real: T::AccountId,
-			call_hash: CallHashOf<T>
-		) -> DispatchResultWithPostInfo{
+			call_hash: CallHashOf<T>,
+		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
-			Proxies::<T>::get(&real).0.into_iter()
+			Proxies::<T>::get(&real)
+				.0
+				.into_iter()
 				.find(|x| &x.delegate == &who)
 				.ok_or(Error::<T>::NotProxy)?;
 
@@ -403,7 +409,10 @@ pub mod pallet {
 					T::AnnouncementDepositBase::get(),
 					T::AnnouncementDepositFactor::get(),
 					pending.len(),
-				).map(|d| d.expect("Just pushed; pending.len() > 0; rejig_deposit returns Some; qed"))
+				)
+				.map(|d| {
+					d.expect("Just pushed; pending.len() > 0; rejig_deposit returns Some; qed")
+				})
 				.map(|d| *deposit = d)
 			})?;
 			Self::deposit_event(Event::Announced(real, who, call_hash));
@@ -433,7 +442,7 @@ pub mod pallet {
 		pub fn remove_announcement(
 			origin: OriginFor<T>,
 			real: T::AccountId,
-			call_hash: CallHashOf<T>
+			call_hash: CallHashOf<T>,
 		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
 			Self::edit_announcements(&who, |ann| ann.real != real || ann.call_hash != call_hash)?;
@@ -463,10 +472,12 @@ pub mod pallet {
 		pub fn reject_announcement(
 			origin: OriginFor<T>,
 			delegate: T::AccountId,
-			call_hash: CallHashOf<T>
+			call_hash: CallHashOf<T>,
 		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
-			Self::edit_announcements(&delegate, |ann| ann.real != who || ann.call_hash != call_hash)?;
+			Self::edit_announcements(&delegate, |ann| {
+				ann.real != who || ann.call_hash != call_hash
+			})?;
 
 			Ok(().into())
 		}
@@ -508,9 +519,12 @@ pub mod pallet {
 
 			let call_hash = T::CallHasher::hash_of(&call);
 			let now = system::Pallet::<T>::block_number();
-			Self::edit_announcements(&delegate, |ann|
-				ann.real != real || ann.call_hash != call_hash || now.saturating_sub(ann.height) < def.delay
-			).map_err(|_| Error::<T>::Unannounced)?;
+			Self::edit_announcements(&delegate, |ann| {
+				ann.real != real ||
+					ann.call_hash != call_hash ||
+					now.saturating_sub(ann.height) < def.delay
+			})
+			.map_err(|_| Error::<T>::Unannounced)?;
 
 			Self::do_proxy(def, real, *call);
 
@@ -521,8 +535,7 @@ pub mod pallet {
 	#[pallet::event]
 	#[pallet::metadata(T::AccountId = "AccountId", T::ProxyType = "ProxyType", CallHashOf<T> = "Hash")]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
-	pub enum Event<T: Config>
-	{
+	pub enum Event<T: Config> {
 		/// A proxy was executed correctly, with the given \[result\].
 		ProxyExecuted(DispatchResult),
 		/// Anonymous account has been created by new proxy with given
@@ -533,10 +546,10 @@ pub mod pallet {
 	}
 
 	/// Old name generated by `decl_event`.
-	#[deprecated(note="use `Event` instead")]
+	#[deprecated(note = "use `Event` instead")]
 	pub type RawEvent<T> = Event<T>;
 
-	 #[pallet::error]
+	#[pallet::error]
 	pub enum Error<T> {
 		/// There are too many proxies registered or too many announcements pending.
 		TooMany,
@@ -565,13 +578,10 @@ pub mod pallet {
 		Twox64Concat,
 		T::AccountId,
 		(
-			BoundedVec<
-				ProxyDefinition<T::AccountId, T::ProxyType, T::BlockNumber>,
-				T::MaxProxies,
-			>,
-			BalanceOf<T>
+			BoundedVec<ProxyDefinition<T::AccountId, T::ProxyType, T::BlockNumber>, T::MaxProxies>,
+			BalanceOf<T>,
 		),
-		ValueQuery
+		ValueQuery,
 	>;
 
 	/// The announcements made by the proxy (key).
@@ -582,19 +592,14 @@ pub mod pallet {
 		Twox64Concat,
 		T::AccountId,
 		(
-			BoundedVec<
-				Announcement<T::AccountId, CallHashOf<T>, T::BlockNumber>,
-				T::MaxPending,
-			>,
+			BoundedVec<Announcement<T::AccountId, CallHashOf<T>, T::BlockNumber>, T::MaxPending>,
 			BalanceOf<T>,
 		),
-		ValueQuery
+		ValueQuery,
 	>;
-
 }
 
 impl<T: Config> Pallet<T> {
-
 	/// Calculate the address of an anonymous account.
 	///
 	/// - `who`: The spawner account.
@@ -612,10 +617,12 @@ impl<T: Config> Pallet<T> {
 		index: u16,
 		maybe_when: Option<(T::BlockNumber, u32)>,
 	) -> T::AccountId {
-		let (height, ext_index) = maybe_when.unwrap_or_else(|| (
-			system::Pallet::<T>::block_number(),
-			system::Pallet::<T>::extrinsic_index().unwrap_or_default()
-		));
+		let (height, ext_index) = maybe_when.unwrap_or_else(|| {
+			(
+				system::Pallet::<T>::block_number(),
+				system::Pallet::<T>::extrinsic_index().unwrap_or_default(),
+			)
+		});
 		let entropy = (b"modlpy/proxy____", who, height, ext_index, proxy_type, index)
 			.using_encoded(blake2_256);
 		T::AccountId::decode(&mut &entropy[..]).unwrap_or_default()
@@ -698,26 +705,22 @@ impl<T: Config> Pallet<T> {
 		factor: BalanceOf<T>,
 		len: usize,
 	) -> Result<Option<BalanceOf<T>>, DispatchError> {
-		let new_deposit = if len == 0 {
-			BalanceOf::<T>::zero()
-		} else {
-			base + factor * (len as u32).into()
-		};
+		let new_deposit =
+			if len == 0 { BalanceOf::<T>::zero() } else { base + factor * (len as u32).into() };
 		if new_deposit > old_deposit {
 			T::Currency::reserve(&who, new_deposit - old_deposit)?;
 		} else if new_deposit < old_deposit {
 			T::Currency::unreserve(&who, old_deposit - new_deposit);
 		}
-		Ok(if len == 0 {
-			None
-		} else {
-			Some(new_deposit)
-		})
+		Ok(if len == 0 { None } else { Some(new_deposit) })
 	}
 
 	fn edit_announcements<
-		F: FnMut(&Announcement<T::AccountId, CallHashOf<T>, T::BlockNumber>) -> bool
-	>(delegate: &T::AccountId, f: F) -> DispatchResult {
+		F: FnMut(&Announcement<T::AccountId, CallHashOf<T>, T::BlockNumber>) -> bool,
+	>(
+		delegate: &T::AccountId,
+		f: F,
+	) -> DispatchResult {
 		Announcements::<T>::try_mutate_exists(delegate, |x| {
 			let (mut pending, old_deposit) = x.take().ok_or(Error::<T>::NotFound)?;
 			let orig_pending_len = pending.len();
@@ -729,7 +732,8 @@ impl<T: Config> Pallet<T> {
 				T::AnnouncementDepositBase::get(),
 				T::AnnouncementDepositFactor::get(),
 				pending.len(),
-			)?.map(|deposit| (pending, deposit));
+			)?
+			.map(|deposit| (pending, deposit));
 			Ok(())
 		})
 	}
@@ -740,7 +744,8 @@ impl<T: Config> Pallet<T> {
 		force_proxy_type: Option<T::ProxyType>,
 	) -> Result<ProxyDefinition<T::AccountId, T::ProxyType, T::BlockNumber>, DispatchError> {
 		let f = |x: &ProxyDefinition<T::AccountId, T::ProxyType, T::BlockNumber>| -> bool {
-			&x.delegate == delegate && force_proxy_type.as_ref().map_or(true, |y| &x.proxy_type == y)
+			&x.delegate == delegate &&
+				force_proxy_type.as_ref().map_or(true, |y| &x.proxy_type == y)
 		};
 		Ok(Proxies::<T>::get(real).0.into_iter().find(f).ok_or(Error::<T>::NotProxy)?)
 	}
@@ -758,11 +763,13 @@ impl<T: Config> Pallet<T> {
 			match c.is_sub_type() {
 				// Proxy call cannot add or remove a proxy with more permissions than it already has.
 				Some(Call::add_proxy(_, ref pt, _)) | Some(Call::remove_proxy(_, ref pt, _))
-					if !def.proxy_type.is_superset(&pt) => false,
+					if !def.proxy_type.is_superset(&pt) =>
+					false,
 				// Proxy call cannot remove all proxies or kill anonymous proxies unless it has full permissions.
 				Some(Call::remove_proxies(..)) | Some(Call::kill_anonymous(..))
-					if def.proxy_type != T::ProxyType::default() => false,
-				_ => def.proxy_type.filter(c)
+					if def.proxy_type != T::ProxyType::default() =>
+					false,
+				_ => def.proxy_type.filter(c),
 			}
 		});
 		let e = call.dispatch(origin);
diff --git a/frame/proxy/src/tests.rs b/frame/proxy/src/tests.rs
index 4383fbea0071..536a226c7b46 100644
--- a/frame/proxy/src/tests.rs
+++ b/frame/proxy/src/tests.rs
@@ -21,13 +21,16 @@
 
 use super::*;
 
+use crate as proxy;
+use codec::{Decode, Encode};
 use frame_support::{
-	assert_ok, assert_noop, parameter_types, RuntimeDebug, dispatch::DispatchError, traits::Filter,
+	assert_noop, assert_ok, dispatch::DispatchError, parameter_types, traits::Filter, RuntimeDebug,
 };
-use codec::{Encode, Decode};
 use sp_core::H256;
-use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
-use crate as proxy;
+use sp_runtime::{
+	testing::Header,
+	traits::{BlakeTwo256, IdentityLookup},
+};
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -102,18 +105,25 @@ parameter_types! {
 	pub const AnnouncementDepositBase: u64 = 1;
 	pub const AnnouncementDepositFactor: u64 = 1;
 }
-#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, RuntimeDebug, MaxEncodedLen)]
+#[derive(
+	Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, RuntimeDebug, MaxEncodedLen,
+)]
 pub enum ProxyType {
 	Any,
 	JustTransfer,
 	JustUtility,
 }
-impl Default for ProxyType { fn default() -> Self { Self::Any } }
+impl Default for ProxyType {
+	fn default() -> Self {
+		Self::Any
+	}
+}
 impl InstanceFilter<Call> for ProxyType {
 	fn filter(&self, c: &Call) -> bool {
 		match self {
 			ProxyType::Any => true,
-			ProxyType::JustTransfer => matches!(c, Call::Balances(pallet_balances::Call::transfer(..))),
+			ProxyType::JustTransfer =>
+				matches!(c, Call::Balances(pallet_balances::Call::transfer(..))),
 			ProxyType::JustUtility => matches!(c, Call::Utility(..)),
 		}
 	}
@@ -147,27 +157,31 @@ impl Config for Test {
 	type AnnouncementDepositFactor = AnnouncementDepositFactor;
 }
 
+use super::{Call as ProxyCall, Event as ProxyEvent};
 use frame_system::Call as SystemCall;
-use pallet_balances::Call as BalancesCall;
-use pallet_balances::Error as BalancesError;
-use pallet_balances::Event as BalancesEvent;
-use pallet_utility::Call as UtilityCall;
-use pallet_utility::Event as UtilityEvent;
-use super::Event as ProxyEvent;
-use super::Call as ProxyCall;
+use pallet_balances::{Call as BalancesCall, Error as BalancesError, Event as BalancesEvent};
+use pallet_utility::{Call as UtilityCall, Event as UtilityEvent};
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
 	pallet_balances::GenesisConfig::<Test> {
 		balances: vec![(1, 10), (2, 10), (3, 10), (4, 10), (5, 2)],
-	}.assimilate_storage(&mut t).unwrap();
+	}
+	.assimilate_storage(&mut t)
+	.unwrap();
 	let mut ext = sp_io::TestExternalities::new(t);
 	ext.execute_with(|| System::set_block_number(1));
 	ext
 }
 
 fn last_events(n: usize) -> Vec<Event> {
-	system::Pallet::<Test>::events().into_iter().rev().take(n).rev().map(|e| e.event).collect()
+	system::Pallet::<Test>::events()
+		.into_iter()
+		.rev()
+		.take(n)
+		.rev()
+		.map(|e| e.event)
+		.collect()
 }
 
 fn expect_events(e: Vec<Event>) {
@@ -183,27 +197,21 @@ fn announcement_works() {
 
 		assert_ok!(Proxy::announce(Origin::signed(3), 1, [1; 32].into()));
 		let announcements = Announcements::<Test>::get(3);
-		assert_eq!(announcements.0, vec![Announcement {
-			real: 1,
-			call_hash: [1; 32].into(),
-			height: 1,
-		}]);
+		assert_eq!(
+			announcements.0,
+			vec![Announcement { real: 1, call_hash: [1; 32].into(), height: 1 }]
+		);
 		assert_eq!(Balances::reserved_balance(3), announcements.1);
 
 		assert_ok!(Proxy::announce(Origin::signed(3), 2, [2; 32].into()));
 		let announcements = Announcements::<Test>::get(3);
-		assert_eq!(announcements.0, vec![
-			Announcement {
-				real: 1,
-				call_hash: [1; 32].into(),
-				height: 1,
-			},
-			Announcement {
-				real: 2,
-				call_hash: [2; 32].into(),
-				height: 1,
-			},
-		]);
+		assert_eq!(
+			announcements.0,
+			vec![
+				Announcement { real: 1, call_hash: [1; 32].into(), height: 1 },
+				Announcement { real: 2, call_hash: [2; 32].into(), height: 1 },
+			]
+		);
 		assert_eq!(Balances::reserved_balance(3), announcements.1);
 
 		assert_noop!(Proxy::announce(Origin::signed(3), 2, [3; 32].into()), Error::<Test>::TooMany);
@@ -221,11 +229,10 @@ fn remove_announcement_works() {
 		assert_noop!(Proxy::remove_announcement(Origin::signed(3), 1, [0; 32].into()), e);
 		assert_ok!(Proxy::remove_announcement(Origin::signed(3), 1, [1; 32].into()));
 		let announcements = Announcements::<Test>::get(3);
-		assert_eq!(announcements.0, vec![Announcement {
-			real: 2,
-			call_hash: [2; 32].into(),
-			height: 1,
-		}]);
+		assert_eq!(
+			announcements.0,
+			vec![Announcement { real: 2, call_hash: [2; 32].into(), height: 1 }]
+		);
 		assert_eq!(Balances::reserved_balance(3), announcements.1);
 	});
 }
@@ -243,11 +250,10 @@ fn reject_announcement_works() {
 		assert_noop!(Proxy::reject_announcement(Origin::signed(4), 3, [1; 32].into()), e);
 		assert_ok!(Proxy::reject_announcement(Origin::signed(1), 3, [1; 32].into()));
 		let announcements = Announcements::<Test>::get(3);
-		assert_eq!(announcements.0, vec![Announcement {
-			real: 2,
-			call_hash: [2; 32].into(),
-			height: 1,
-		}]);
+		assert_eq!(
+			announcements.0,
+			vec![Announcement { real: 2, call_hash: [2; 32].into(), height: 1 }]
+		);
 		assert_eq!(Balances::reserved_balance(3), announcements.1);
 	});
 }
@@ -291,11 +297,7 @@ fn proxy_announced_removes_announcement_and_returns_deposit() {
 		system::Pallet::<Test>::set_block_number(2);
 		assert_ok!(Proxy::proxy_announced(Origin::signed(0), 3, 1, None, call.clone()));
 		let announcements = Announcements::<Test>::get(3);
-		assert_eq!(announcements.0, vec![Announcement {
-			real: 2,
-			call_hash,
-			height: 1,
-		}]);
+		assert_eq!(announcements.0, vec![Announcement { real: 2, call_hash, height: 1 }]);
 		assert_eq!(Balances::reserved_balance(3), announcements.1);
 	});
 }
@@ -330,7 +332,10 @@ fn filtering_works() {
 
 		let call = Box::new(Call::Utility(UtilityCall::batch(vec![*inner])));
 		assert_ok!(Proxy::proxy(Origin::signed(2), 1, None, call.clone()));
-		expect_events(vec![UtilityEvent::BatchCompleted.into(), ProxyEvent::ProxyExecuted(Ok(())).into()]);
+		expect_events(vec![
+			UtilityEvent::BatchCompleted.into(),
+			ProxyEvent::ProxyExecuted(Ok(())).into(),
+		]);
 		assert_ok!(Proxy::proxy(Origin::signed(3), 1, None, call.clone()));
 		System::assert_last_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)).into());
 		assert_ok!(Proxy::proxy(Origin::signed(4), 1, None, call.clone()));
@@ -342,7 +347,10 @@ fn filtering_works() {
 		let inner = Box::new(Call::Proxy(ProxyCall::add_proxy(5, ProxyType::Any, 0)));
 		let call = Box::new(Call::Utility(UtilityCall::batch(vec![*inner])));
 		assert_ok!(Proxy::proxy(Origin::signed(2), 1, None, call.clone()));
-		expect_events(vec![UtilityEvent::BatchCompleted.into(), ProxyEvent::ProxyExecuted(Ok(())).into()]);
+		expect_events(vec![
+			UtilityEvent::BatchCompleted.into(),
+			ProxyEvent::ProxyExecuted(Ok(())).into(),
+		]);
 		assert_ok!(Proxy::proxy(Origin::signed(3), 1, None, call.clone()));
 		System::assert_last_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)).into());
 		assert_ok!(Proxy::proxy(Origin::signed(4), 1, None, call.clone()));
@@ -357,7 +365,10 @@ fn filtering_works() {
 		assert_ok!(Proxy::proxy(Origin::signed(4), 1, None, call.clone()));
 		System::assert_last_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)).into());
 		assert_ok!(Proxy::proxy(Origin::signed(2), 1, None, call.clone()));
-		expect_events(vec![BalancesEvent::<Test>::Unreserved(1, 5).into(), ProxyEvent::ProxyExecuted(Ok(())).into()]);
+		expect_events(vec![
+			BalancesEvent::<Test>::Unreserved(1, 5).into(),
+			ProxyEvent::ProxyExecuted(Ok(())).into(),
+		]);
 	});
 }
 
@@ -365,7 +376,10 @@ fn filtering_works() {
 fn add_remove_proxies_works() {
 	new_test_ext().execute_with(|| {
 		assert_ok!(Proxy::add_proxy(Origin::signed(1), 2, ProxyType::Any, 0));
-		assert_noop!(Proxy::add_proxy(Origin::signed(1), 2, ProxyType::Any, 0), Error::<Test>::Duplicate);
+		assert_noop!(
+			Proxy::add_proxy(Origin::signed(1), 2, ProxyType::Any, 0),
+			Error::<Test>::Duplicate
+		);
 		assert_eq!(Balances::reserved_balance(1), 2);
 		assert_ok!(Proxy::add_proxy(Origin::signed(1), 2, ProxyType::JustTransfer, 0));
 		assert_eq!(Balances::reserved_balance(1), 3);
@@ -373,8 +387,14 @@ fn add_remove_proxies_works() {
 		assert_eq!(Balances::reserved_balance(1), 4);
 		assert_ok!(Proxy::add_proxy(Origin::signed(1), 4, ProxyType::JustUtility, 0));
 		assert_eq!(Balances::reserved_balance(1), 5);
-		assert_noop!(Proxy::add_proxy(Origin::signed(1), 4, ProxyType::Any, 0), Error::<Test>::TooMany);
-		assert_noop!(Proxy::remove_proxy(Origin::signed(1), 3, ProxyType::JustTransfer, 0), Error::<Test>::NotFound);
+		assert_noop!(
+			Proxy::add_proxy(Origin::signed(1), 4, ProxyType::Any, 0),
+			Error::<Test>::TooMany
+		);
+		assert_noop!(
+			Proxy::remove_proxy(Origin::signed(1), 3, ProxyType::JustTransfer, 0),
+			Error::<Test>::NotFound
+		);
 		assert_ok!(Proxy::remove_proxy(Origin::signed(1), 4, ProxyType::JustUtility, 0));
 		assert_eq!(Balances::reserved_balance(1), 4);
 		assert_ok!(Proxy::remove_proxy(Origin::signed(1), 3, ProxyType::Any, 0));
@@ -383,7 +403,10 @@ fn add_remove_proxies_works() {
 		assert_eq!(Balances::reserved_balance(1), 2);
 		assert_ok!(Proxy::remove_proxy(Origin::signed(1), 2, ProxyType::JustTransfer, 0));
 		assert_eq!(Balances::reserved_balance(1), 0);
-		assert_noop!(Proxy::add_proxy(Origin::signed(1), 1, ProxyType::Any, 0), Error::<Test>::NoSelfProxy);
+		assert_noop!(
+			Proxy::add_proxy(Origin::signed(1), 1, ProxyType::Any, 0),
+			Error::<Test>::NoSelfProxy
+		);
 	});
 }
 
@@ -406,7 +429,10 @@ fn proxying_works() {
 		assert_ok!(Proxy::add_proxy(Origin::signed(1), 3, ProxyType::Any, 0));
 
 		let call = Box::new(Call::Balances(BalancesCall::transfer(6, 1)));
-		assert_noop!(Proxy::proxy(Origin::signed(4), 1, None, call.clone()), Error::<Test>::NotProxy);
+		assert_noop!(
+			Proxy::proxy(Origin::signed(4), 1, None, call.clone()),
+			Error::<Test>::NotProxy
+		);
 		assert_noop!(
 			Proxy::proxy(Origin::signed(2), 1, Some(ProxyType::Any), call.clone()),
 			Error::<Test>::NotProxy
@@ -420,7 +446,9 @@ fn proxying_works() {
 		System::assert_last_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)).into());
 
 		let call = Box::new(Call::Balances(BalancesCall::transfer_keep_alive(6, 1)));
-		assert_ok!(Call::Proxy(super::Call::proxy(1, None, call.clone())).dispatch(Origin::signed(2)));
+		assert_ok!(
+			Call::Proxy(super::Call::proxy(1, None, call.clone())).dispatch(Origin::signed(2))
+		);
 		System::assert_last_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)).into());
 		assert_ok!(Proxy::proxy(Origin::signed(3), 1, None, call.clone()));
 		System::assert_last_event(ProxyEvent::ProxyExecuted(Ok(())).into());
@@ -433,14 +461,19 @@ fn anonymous_works() {
 	new_test_ext().execute_with(|| {
 		assert_ok!(Proxy::anonymous(Origin::signed(1), ProxyType::Any, 0, 0));
 		let anon = Proxy::anonymous_account(&1, &ProxyType::Any, 0, None);
-		System::assert_last_event(ProxyEvent::AnonymousCreated(anon.clone(), 1, ProxyType::Any, 0).into());
+		System::assert_last_event(
+			ProxyEvent::AnonymousCreated(anon.clone(), 1, ProxyType::Any, 0).into(),
+		);
 
 		// other calls to anonymous allowed as long as they're not exactly the same.
 		assert_ok!(Proxy::anonymous(Origin::signed(1), ProxyType::JustTransfer, 0, 0));
 		assert_ok!(Proxy::anonymous(Origin::signed(1), ProxyType::Any, 0, 1));
 		let anon2 = Proxy::anonymous_account(&2, &ProxyType::Any, 0, None);
 		assert_ok!(Proxy::anonymous(Origin::signed(2), ProxyType::Any, 0, 0));
-		assert_noop!(Proxy::anonymous(Origin::signed(1), ProxyType::Any, 0, 0), Error::<Test>::Duplicate);
+		assert_noop!(
+			Proxy::anonymous(Origin::signed(1), ProxyType::Any, 0, 0),
+			Error::<Test>::Duplicate
+		);
 		System::set_extrinsic_index(1);
 		assert_ok!(Proxy::anonymous(Origin::signed(1), ProxyType::Any, 0, 0));
 		System::set_extrinsic_index(0);
@@ -464,6 +497,9 @@ fn anonymous_works() {
 		assert_eq!(Balances::free_balance(1), 0);
 		assert_ok!(Proxy::proxy(Origin::signed(1), anon, None, call.clone()));
 		assert_eq!(Balances::free_balance(1), 2);
-		assert_noop!(Proxy::proxy(Origin::signed(1), anon, None, call.clone()), Error::<Test>::NotProxy);
+		assert_noop!(
+			Proxy::proxy(Origin::signed(1), anon, None, call.clone()),
+			Error::<Test>::NotProxy
+		);
 	});
 }
diff --git a/frame/proxy/src/weights.rs b/frame/proxy/src/weights.rs
index f250186ad81d..872c7b79fb60 100644
--- a/frame/proxy/src/weights.rs
+++ b/frame/proxy/src/weights.rs
@@ -36,6 +36,7 @@
 // --template=./.maintain/frame-weight-template.hbs
 
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
diff --git a/frame/randomness-collective-flip/src/lib.rs b/frame/randomness-collective-flip/src/lib.rs
index 1ff7d4382da1..64a263dd5bbd 100644
--- a/frame/randomness-collective-flip/src/lib.rs
+++ b/frame/randomness-collective-flip/src/lib.rs
@@ -69,9 +69,9 @@
 use safe_mix::TripletMix;
 
 use codec::Encode;
-use sp_std::{prelude::*, convert::TryInto};
-use sp_runtime::traits::{Hash, Saturating};
 use frame_support::traits::Randomness;
+use sp_runtime::traits::{Hash, Saturating};
+use sp_std::{convert::TryInto, prelude::*};
 
 const RANDOM_MATERIAL_LEN: u32 = 81;
 
@@ -85,9 +85,9 @@ pub use pallet::*;
 
 #[frame_support::pallet]
 pub mod pallet {
+	use super::*;
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
-	use super::*;
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
@@ -101,11 +101,13 @@ pub mod pallet {
 		fn on_initialize(block_number: T::BlockNumber) -> Weight {
 			let parent_hash = <frame_system::Pallet<T>>::parent_hash();
 
-			<RandomMaterial<T>>::mutate(|ref mut values| if values.len() < RANDOM_MATERIAL_LEN as usize {
-				values.push(parent_hash)
-			} else {
-				let index = block_number_to_index::<T>(block_number);
-				values[index] = parent_hash;
+			<RandomMaterial<T>>::mutate(|ref mut values| {
+				if values.len() < RANDOM_MATERIAL_LEN as usize {
+					values.push(parent_hash)
+				} else {
+					let index = block_number_to_index::<T>(block_number);
+					values[index] = parent_hash;
+				}
 			});
 
 			T::DbWeight::get().reads_writes(1, 1)
@@ -117,8 +119,7 @@ pub mod pallet {
 	/// the oldest hash.
 	#[pallet::storage]
 	#[pallet::getter(fn random_material)]
-	pub(super) type RandomMaterial<T: Config> =
-		StorageValue<_, Vec<T::Hash>, ValueQuery>;
+	pub(super) type RandomMaterial<T: Config> = StorageValue<_, Vec<T::Hash>, ValueQuery>;
 }
 
 impl<T: Config> Randomness<T::Hash, T::BlockNumber> for Pallet<T> {
@@ -151,17 +152,14 @@ impl<T: Config> Randomness<T::Hash, T::BlockNumber> for Pallet<T> {
 			T::Hash::default()
 		};
 
-		(
-			seed,
-			block_number.saturating_sub(RANDOM_MATERIAL_LEN.into()),
-		)
+		(seed, block_number.saturating_sub(RANDOM_MATERIAL_LEN.into()))
 	}
 }
 
 #[cfg(test)]
 mod tests {
-	use crate as pallet_randomness_collective_flip;
 	use super::*;
+	use crate as pallet_randomness_collective_flip;
 
 	use sp_core::H256;
 	use sp_runtime::{
@@ -169,7 +167,10 @@ mod tests {
 		traits::{BlakeTwo256, Header as _, IdentityLookup},
 	};
 
-	use frame_support::{parameter_types, traits::{Randomness, OnInitialize}};
+	use frame_support::{
+		parameter_types,
+		traits::{OnInitialize, Randomness},
+	};
 	use frame_system::limits;
 
 	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
@@ -229,7 +230,7 @@ mod tests {
 
 	#[test]
 	fn test_block_number_to_index() {
-		for i in 1 .. 1000 {
+		for i in 1..1000 {
 			assert_eq!((i - 1) as usize % 81, block_number_to_index::<Test>(i));
 		}
 	}
@@ -237,13 +238,8 @@ mod tests {
 	fn setup_blocks(blocks: u64) {
 		let mut parent_hash = System::parent_hash();
 
-		for i in 1 .. (blocks + 1) {
-			System::initialize(
-				&i,
-				&parent_hash,
-				&Default::default(),
-				frame_system::InitKind::Full,
-			);
+		for i in 1..(blocks + 1) {
+			System::initialize(&i, &parent_hash, &Default::default(), frame_system::InitKind::Full);
 			CollectiveFlip::on_initialize(i);
 
 			let header = System::finalize();
diff --git a/frame/recovery/src/lib.rs b/frame/recovery/src/lib.rs
index 6f5c7ebcb6e4..0214a38b0e8e 100644
--- a/frame/recovery/src/lib.rs
+++ b/frame/recovery/src/lib.rs
@@ -151,14 +151,15 @@
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
 
+use codec::{Decode, Encode};
+use sp_runtime::traits::{CheckedAdd, CheckedMul, Dispatchable, SaturatedConversion};
 use sp_std::prelude::*;
-use sp_runtime::traits::{Dispatchable, SaturatedConversion, CheckedAdd, CheckedMul};
-use codec::{Encode, Decode};
 
 use frame_support::{
-	RuntimeDebug, weights::GetDispatchInfo,
-	traits::{Currency, ReservableCurrency, BalanceStatus},
 	dispatch::PostDispatchInfo,
+	traits::{BalanceStatus, Currency, ReservableCurrency},
+	weights::GetDispatchInfo,
+	RuntimeDebug,
 };
 
 pub use pallet::*;
@@ -200,10 +201,10 @@ pub struct RecoveryConfig<BlockNumber, Balance, AccountId> {
 
 #[frame_support::pallet]
 pub mod pallet {
-	use frame_support::{ensure, Parameter, pallet_prelude::*, traits::Get};
-	use frame_system::{pallet_prelude::*, ensure_signed, ensure_root};
-	use sp_runtime::ArithmeticError;
 	use super::*;
+	use frame_support::{ensure, pallet_prelude::*, traits::Get, Parameter};
+	use frame_system::{ensure_root, ensure_signed, pallet_prelude::*};
+	use sp_runtime::ArithmeticError;
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
@@ -216,7 +217,9 @@ pub mod pallet {
 		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
 
 		/// The overarching call type.
-		type Call: Parameter + Dispatchable<Origin=Self::Origin, PostInfo=PostDispatchInfo> + GetDispatchInfo;
+		type Call: Parameter
+			+ Dispatchable<Origin = Self::Origin, PostInfo = PostDispatchInfo>
+			+ GetDispatchInfo;
 
 		/// The currency mechanism.
 		type Currency: ReservableCurrency<Self::AccountId>;
@@ -313,7 +316,8 @@ pub mod pallet {
 	#[pallet::getter(fn recovery_config)]
 	pub type Recoverable<T: Config> = StorageMap<
 		_,
-		Twox64Concat, T::AccountId,
+		Twox64Concat,
+		T::AccountId,
 		RecoveryConfig<T::BlockNumber, BalanceOf<T>, T::AccountId>,
 	>;
 
@@ -323,10 +327,12 @@ pub mod pallet {
 	/// is the user trying to recover the account.
 	#[pallet::storage]
 	#[pallet::getter(fn active_recovery)]
-	pub type ActiveRecoveries<T: Config>= StorageDoubleMap<
+	pub type ActiveRecoveries<T: Config> = StorageDoubleMap<
 		_,
-		Twox64Concat, T::AccountId,
-		Twox64Concat, T::AccountId,
+		Twox64Concat,
+		T::AccountId,
+		Twox64Concat,
+		T::AccountId,
 		ActiveRecovery<T::BlockNumber, BalanceOf<T>, T::AccountId>,
 	>;
 
@@ -365,14 +371,15 @@ pub mod pallet {
 		pub fn as_recovered(
 			origin: OriginFor<T>,
 			account: T::AccountId,
-			call: Box<<T as Config>::Call>
+			call: Box<<T as Config>::Call>,
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			// Check `who` is allowed to make a call on behalf of `account`
 			let target = Self::proxy(&who).ok_or(Error::<T>::NotAllowed)?;
 			ensure!(&target == &account, Error::<T>::NotAllowed);
 			call.dispatch(frame_system::RawOrigin::Signed(account).into())
-				.map(|_| ()).map_err(|e| e.error)
+				.map(|_| ())
+				.map_err(|e| e.error)
 		}
 
 		/// Allow ROOT to bypass the recovery process and set an a rescuer account
@@ -433,7 +440,7 @@ pub mod pallet {
 			origin: OriginFor<T>,
 			friends: Vec<T::AccountId>,
 			threshold: u16,
-			delay_period: T::BlockNumber
+			delay_period: T::BlockNumber,
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			// Check account is not already set up for recovery
@@ -455,12 +462,8 @@ pub mod pallet {
 			// Reserve the deposit
 			T::Currency::reserve(&who, total_deposit)?;
 			// Create the recovery configuration
-			let recovery_config = RecoveryConfig {
-				delay_period,
-				deposit: total_deposit,
-				friends,
-				threshold,
-			};
+			let recovery_config =
+				RecoveryConfig { delay_period, deposit: total_deposit, friends, threshold };
 			// Create the recovery configuration storage item
 			<Recoverable<T>>::insert(&who, recovery_config);
 
@@ -496,7 +499,10 @@ pub mod pallet {
 			// Check that the account is recoverable
 			ensure!(<Recoverable<T>>::contains_key(&account), Error::<T>::NotRecoverable);
 			// Check that the recovery process has not already been started
-			ensure!(!<ActiveRecoveries<T>>::contains_key(&account, &who), Error::<T>::AlreadyStarted);
+			ensure!(
+				!<ActiveRecoveries<T>>::contains_key(&account, &who),
+				Error::<T>::AlreadyStarted
+			);
 			// Take recovery deposit
 			let recovery_deposit = T::RecoveryDeposit::get();
 			T::Currency::reserve(&who, recovery_deposit)?;
@@ -541,13 +547,14 @@ pub mod pallet {
 		pub fn vouch_recovery(
 			origin: OriginFor<T>,
 			lost: T::AccountId,
-			rescuer: T::AccountId
+			rescuer: T::AccountId,
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			// Get the recovery configuration for the lost account.
 			let recovery_config = Self::recovery_config(&lost).ok_or(Error::<T>::NotRecoverable)?;
 			// Get the active recovery process for the rescuer.
-			let mut active_recovery = Self::active_recovery(&lost, &rescuer).ok_or(Error::<T>::NotStarted)?;
+			let mut active_recovery =
+				Self::active_recovery(&lost, &rescuer).ok_or(Error::<T>::NotStarted)?;
 			// Make sure the voter is a friend
 			ensure!(Self::is_friend(&recovery_config.friends, &who), Error::<T>::NotFriend);
 			// Either insert the vouch, or return an error that the user already vouched.
@@ -585,13 +592,16 @@ pub mod pallet {
 		pub fn claim_recovery(origin: OriginFor<T>, account: T::AccountId) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			// Get the recovery configuration for the lost account
-			let recovery_config = Self::recovery_config(&account).ok_or(Error::<T>::NotRecoverable)?;
+			let recovery_config =
+				Self::recovery_config(&account).ok_or(Error::<T>::NotRecoverable)?;
 			// Get the active recovery process for the rescuer
-			let active_recovery = Self::active_recovery(&account, &who).ok_or(Error::<T>::NotStarted)?;
+			let active_recovery =
+				Self::active_recovery(&account, &who).ok_or(Error::<T>::NotStarted)?;
 			ensure!(!Proxy::<T>::contains_key(&who), Error::<T>::AlreadyProxy);
 			// Make sure the delay period has passed
 			let current_block_number = <frame_system::Pallet<T>>::block_number();
-			let recoverable_block_number = active_recovery.created
+			let recoverable_block_number = active_recovery
+				.created
 				.checked_add(&recovery_config.delay_period)
 				.ok_or(ArithmeticError::Overflow)?;
 			ensure!(recoverable_block_number <= current_block_number, Error::<T>::DelayPeriod);
@@ -631,10 +641,16 @@ pub mod pallet {
 		pub fn close_recovery(origin: OriginFor<T>, rescuer: T::AccountId) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			// Take the active recovery process started by the rescuer for this account.
-			let active_recovery = <ActiveRecoveries<T>>::take(&who, &rescuer).ok_or(Error::<T>::NotStarted)?;
+			let active_recovery =
+				<ActiveRecoveries<T>>::take(&who, &rescuer).ok_or(Error::<T>::NotStarted)?;
 			// Move the reserved funds from the rescuer to the rescued account.
 			// Acts like a slashing mechanism for those who try to maliciously recover accounts.
-			let res = T::Currency::repatriate_reserved(&rescuer, &who, active_recovery.deposit, BalanceStatus::Free);
+			let res = T::Currency::repatriate_reserved(
+				&rescuer,
+				&who,
+				active_recovery.deposit,
+				BalanceStatus::Free,
+			);
 			debug_assert!(res.is_ok());
 			Self::deposit_event(Event::<T>::RecoveryClosed(who, rescuer));
 			Ok(())
diff --git a/frame/recovery/src/mock.rs b/frame/recovery/src/mock.rs
index 9139cc12ce54..c9c01e35bf9b 100644
--- a/frame/recovery/src/mock.rs
+++ b/frame/recovery/src/mock.rs
@@ -19,12 +19,16 @@
 
 use super::*;
 
-use frame_support::{parameter_types, traits::{OnInitialize, OnFinalize}};
+use crate as recovery;
+use frame_support::{
+	parameter_types,
+	traits::{OnFinalize, OnInitialize},
+};
 use sp_core::H256;
 use sp_runtime::{
-	traits::{BlakeTwo256, IdentityLookup}, testing::Header,
+	testing::Header,
+	traits::{BlakeTwo256, IdentityLookup},
 };
-use crate as recovery;
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -113,7 +117,9 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
 	pallet_balances::GenesisConfig::<Test> {
 		balances: vec![(1, 100), (2, 100), (3, 100), (4, 100), (5, 100)],
-	}.assimilate_storage(&mut t).unwrap();
+	}
+	.assimilate_storage(&mut t)
+	.unwrap();
 	t.into()
 }
 
diff --git a/frame/recovery/src/tests.rs b/frame/recovery/src/tests.rs
index 4c7c6ef108d7..9065e9afe886 100644
--- a/frame/recovery/src/tests.rs
+++ b/frame/recovery/src/tests.rs
@@ -18,15 +18,11 @@
 //! Tests for the module.
 
 use super::*;
+use frame_support::{assert_noop, assert_ok, traits::Currency};
 use mock::{
-	Recovery, Balances, Test, Origin, Call, BalancesCall, RecoveryCall,
-	new_test_ext, run_to_block
-};
-use sp_runtime::traits::{BadOrigin};
-use frame_support::{
-	assert_noop, assert_ok,
-	traits::{Currency},
+	new_test_ext, run_to_block, Balances, BalancesCall, Call, Origin, Recovery, RecoveryCall, Test,
 };
+use sp_runtime::traits::BadOrigin;
 
 #[test]
 fn basic_setup_works() {
@@ -118,7 +114,7 @@ fn malicious_recovery_fails() {
 		assert_ok!(Recovery::vouch_recovery(Origin::signed(2), 5, 1)); // shame on you
 		assert_ok!(Recovery::vouch_recovery(Origin::signed(3), 5, 1)); // shame on you
 		assert_ok!(Recovery::vouch_recovery(Origin::signed(4), 5, 1)); // shame on you
-		// We met the threshold, lets try to recover the account...?
+															   // We met the threshold, lets try to recover the account...?
 		assert_noop!(Recovery::claim_recovery(Origin::signed(1), 5), Error::<Test>::DelayPeriod);
 		// Account 1 needs to wait...
 		run_to_block(19);
@@ -136,7 +132,12 @@ fn malicious_recovery_fails() {
 		assert_noop!(Recovery::claim_recovery(Origin::signed(1), 5), Error::<Test>::NotStarted);
 		// Account 5 can remove their recovery config and pick some better friends
 		assert_ok!(Recovery::remove_recovery(Origin::signed(5)));
-		assert_ok!(Recovery::create_recovery(Origin::signed(5), vec![22, 33, 44], threshold, delay_period));
+		assert_ok!(Recovery::create_recovery(
+			Origin::signed(5),
+			vec![22, 33, 44],
+			threshold,
+			delay_period
+		));
 	});
 }
 
@@ -174,9 +175,7 @@ fn create_recovery_handles_basic_errors() {
 			Error::<Test>::NotSorted
 		);
 		// Already configured
-		assert_ok!(
-			Recovery::create_recovery(Origin::signed(5), vec![2, 3, 4], 3, 10)
-		);
+		assert_ok!(Recovery::create_recovery(Origin::signed(5), vec![2, 3, 4], 3, 10));
 		assert_noop!(
 			Recovery::create_recovery(Origin::signed(5), vec![2, 3, 4], 3, 10),
 			Error::<Test>::AlreadyRecoverable
@@ -191,17 +190,18 @@ fn create_recovery_works() {
 		let threshold = 3;
 		let delay_period = 10;
 		// Account 5 sets up a recovery configuration on their account
-		assert_ok!(Recovery::create_recovery(Origin::signed(5), friends.clone(), threshold, delay_period));
+		assert_ok!(Recovery::create_recovery(
+			Origin::signed(5),
+			friends.clone(),
+			threshold,
+			delay_period
+		));
 		// Deposit is taken, and scales with the number of friends they pick
 		// Base 10 + 1 per friends = 13 total reserved
 		assert_eq!(Balances::reserved_balance(5), 13);
 		// Recovery configuration is correctly stored
-		let recovery_config = RecoveryConfig {
-			delay_period,
-			deposit: 13,
-			friends: friends.clone(),
-			threshold,
-		};
+		let recovery_config =
+			RecoveryConfig { delay_period, deposit: 13, friends: friends.clone(), threshold };
 		assert_eq!(Recovery::recovery_config(5), Some(recovery_config));
 	});
 }
@@ -218,10 +218,18 @@ fn initiate_recovery_handles_basic_errors() {
 		let friends = vec![2, 3, 4];
 		let threshold = 3;
 		let delay_period = 10;
-		assert_ok!(Recovery::create_recovery(Origin::signed(5), friends.clone(), threshold, delay_period));
+		assert_ok!(Recovery::create_recovery(
+			Origin::signed(5),
+			friends.clone(),
+			threshold,
+			delay_period
+		));
 		// Same user cannot recover same account twice
 		assert_ok!(Recovery::initiate_recovery(Origin::signed(1), 5));
-		assert_noop!(Recovery::initiate_recovery(Origin::signed(1), 5), Error::<Test>::AlreadyStarted);
+		assert_noop!(
+			Recovery::initiate_recovery(Origin::signed(1), 5),
+			Error::<Test>::AlreadyStarted
+		);
 		// No double deposit
 		assert_eq!(Balances::reserved_balance(1), 10);
 	});
@@ -234,17 +242,18 @@ fn initiate_recovery_works() {
 		let friends = vec![2, 3, 4];
 		let threshold = 3;
 		let delay_period = 10;
-		assert_ok!(Recovery::create_recovery(Origin::signed(5), friends.clone(), threshold, delay_period));
+		assert_ok!(Recovery::create_recovery(
+			Origin::signed(5),
+			friends.clone(),
+			threshold,
+			delay_period
+		));
 		// Recovery can be initiated
 		assert_ok!(Recovery::initiate_recovery(Origin::signed(1), 5));
 		// Deposit is reserved
 		assert_eq!(Balances::reserved_balance(1), 10);
 		// Recovery status object is created correctly
-		let recovery_status = ActiveRecovery {
-			created: 0,
-			deposit: 10,
-			friends: vec![],
-		};
+		let recovery_status = ActiveRecovery { created: 0, deposit: 10, friends: vec![] };
 		assert_eq!(<ActiveRecoveries<Test>>::get(&5, &1), Some(recovery_status));
 		// Multiple users can attempt to recover the same account
 		assert_ok!(Recovery::initiate_recovery(Origin::signed(2), 5));
@@ -255,12 +264,20 @@ fn initiate_recovery_works() {
 fn vouch_recovery_handles_basic_errors() {
 	new_test_ext().execute_with(|| {
 		// Cannot vouch for non-recoverable account
-		assert_noop!(Recovery::vouch_recovery(Origin::signed(2), 5, 1), Error::<Test>::NotRecoverable);
+		assert_noop!(
+			Recovery::vouch_recovery(Origin::signed(2), 5, 1),
+			Error::<Test>::NotRecoverable
+		);
 		// Create a recovery process for next tests
 		let friends = vec![2, 3, 4];
 		let threshold = 3;
 		let delay_period = 10;
-		assert_ok!(Recovery::create_recovery(Origin::signed(5), friends.clone(), threshold, delay_period));
+		assert_ok!(Recovery::create_recovery(
+			Origin::signed(5),
+			friends.clone(),
+			threshold,
+			delay_period
+		));
 		// Cannot vouch a recovery process that has not started
 		assert_noop!(Recovery::vouch_recovery(Origin::signed(2), 5, 1), Error::<Test>::NotStarted);
 		// Initiate a recovery process
@@ -269,7 +286,10 @@ fn vouch_recovery_handles_basic_errors() {
 		assert_noop!(Recovery::vouch_recovery(Origin::signed(22), 5, 1), Error::<Test>::NotFriend);
 		// Cannot vouch twice
 		assert_ok!(Recovery::vouch_recovery(Origin::signed(2), 5, 1));
-		assert_noop!(Recovery::vouch_recovery(Origin::signed(2), 5, 1), Error::<Test>::AlreadyVouched);
+		assert_noop!(
+			Recovery::vouch_recovery(Origin::signed(2), 5, 1),
+			Error::<Test>::AlreadyVouched
+		);
 	});
 }
 
@@ -280,7 +300,12 @@ fn vouch_recovery_works() {
 		let friends = vec![2, 3, 4];
 		let threshold = 3;
 		let delay_period = 10;
-		assert_ok!(Recovery::create_recovery(Origin::signed(5), friends.clone(), threshold, delay_period));
+		assert_ok!(Recovery::create_recovery(
+			Origin::signed(5),
+			friends.clone(),
+			threshold,
+			delay_period
+		));
 		assert_ok!(Recovery::initiate_recovery(Origin::signed(1), 5));
 		// Vouching works
 		assert_ok!(Recovery::vouch_recovery(Origin::signed(2), 5, 1));
@@ -288,11 +313,7 @@ fn vouch_recovery_works() {
 		assert_ok!(Recovery::vouch_recovery(Origin::signed(4), 5, 1));
 		assert_ok!(Recovery::vouch_recovery(Origin::signed(3), 5, 1));
 		// Final recovery status object is updated correctly
-		let recovery_status = ActiveRecovery {
-			created: 0,
-			deposit: 10,
-			friends: vec![2, 3, 4],
-		};
+		let recovery_status = ActiveRecovery { created: 0, deposit: 10, friends: vec![2, 3, 4] };
 		assert_eq!(<ActiveRecoveries<Test>>::get(&5, &1), Some(recovery_status));
 	});
 }
@@ -306,7 +327,12 @@ fn claim_recovery_handles_basic_errors() {
 		let friends = vec![2, 3, 4];
 		let threshold = 3;
 		let delay_period = 10;
-		assert_ok!(Recovery::create_recovery(Origin::signed(5), friends.clone(), threshold, delay_period));
+		assert_ok!(Recovery::create_recovery(
+			Origin::signed(5),
+			friends.clone(),
+			threshold,
+			delay_period
+		));
 		// Cannot claim an account which has not started the recovery process
 		assert_noop!(Recovery::claim_recovery(Origin::signed(1), 5), Error::<Test>::NotStarted);
 		assert_ok!(Recovery::initiate_recovery(Origin::signed(1), 5));
@@ -328,7 +354,12 @@ fn claim_recovery_works() {
 		let friends = vec![2, 3, 4];
 		let threshold = 3;
 		let delay_period = 10;
-		assert_ok!(Recovery::create_recovery(Origin::signed(5), friends.clone(), threshold, delay_period));
+		assert_ok!(Recovery::create_recovery(
+			Origin::signed(5),
+			friends.clone(),
+			threshold,
+			delay_period
+		));
 		assert_ok!(Recovery::initiate_recovery(Origin::signed(1), 5));
 		assert_ok!(Recovery::vouch_recovery(Origin::signed(2), 5, 1));
 		assert_ok!(Recovery::vouch_recovery(Origin::signed(3), 5, 1));
@@ -372,7 +403,12 @@ fn remove_recovery_works() {
 		let friends = vec![2, 3, 4];
 		let threshold = 3;
 		let delay_period = 10;
-		assert_ok!(Recovery::create_recovery(Origin::signed(5), friends.clone(), threshold, delay_period));
+		assert_ok!(Recovery::create_recovery(
+			Origin::signed(5),
+			friends.clone(),
+			threshold,
+			delay_period
+		));
 		assert_ok!(Recovery::initiate_recovery(Origin::signed(1), 5));
 		assert_ok!(Recovery::initiate_recovery(Origin::signed(2), 5));
 		// Cannot remove a recovery when there are active recoveries.
diff --git a/frame/scheduler/src/benchmarking.rs b/frame/scheduler/src/benchmarking.rs
index 47375658fb9b..f6909160c5ee 100644
--- a/frame/scheduler/src/benchmarking.rs
+++ b/frame/scheduler/src/benchmarking.rs
@@ -20,10 +20,10 @@
 #![cfg(feature = "runtime-benchmarks")]
 
 use super::*;
-use sp_std::{vec, prelude::*};
-use frame_system::RawOrigin;
-use frame_support::{ensure, traits::OnInitialize};
 use frame_benchmarking::{benchmarks, impl_benchmark_test_suite};
+use frame_support::{ensure, traits::OnInitialize};
+use frame_system::RawOrigin;
+use sp_std::{prelude::*, vec};
 
 use crate::Pallet as Scheduler;
 use frame_system::Pallet as System;
@@ -31,7 +31,7 @@ use frame_system::Pallet as System;
 const BLOCK_NUMBER: u32 = 2;
 
 // Add `n` named items to the schedule
-fn fill_schedule<T: Config> (when: T::BlockNumber, n: u32) -> Result<(), &'static str> {
+fn fill_schedule<T: Config>(when: T::BlockNumber, n: u32) -> Result<(), &'static str> {
 	// Essentially a no-op call.
 	let call = frame_system::Call::set_storage(vec![]);
 	for i in 0..n {
@@ -141,8 +141,4 @@ benchmarks! {
 	}
 }
 
-impl_benchmark_test_suite!(
-	Scheduler,
-	crate::tests::new_test_ext(),
-	crate::tests::Test,
-);
+impl_benchmark_test_suite!(Scheduler, crate::tests::new_test_ext(), crate::tests::Test,);
diff --git a/frame/scheduler/src/lib.rs b/frame/scheduler/src/lib.rs
index 4fdf1891be99..6cbf172d26d8 100644
--- a/frame/scheduler/src/lib.rs
+++ b/frame/scheduler/src/lib.rs
@@ -54,17 +54,23 @@
 mod benchmarking;
 pub mod weights;
 
-use sp_std::{prelude::*, marker::PhantomData, borrow::Borrow};
-use codec::{Encode, Decode, Codec};
-use sp_runtime::{RuntimeDebug, traits::{Zero, One, BadOrigin, Saturating}};
+use codec::{Codec, Decode, Encode};
 use frame_support::{
-	dispatch::{Dispatchable, DispatchError, DispatchResult, Parameter},
-	traits::{Get, schedule::{self, DispatchTime}, OriginTrait, EnsureOrigin, IsType},
+	dispatch::{DispatchError, DispatchResult, Dispatchable, Parameter},
+	traits::{
+		schedule::{self, DispatchTime},
+		EnsureOrigin, Get, IsType, OriginTrait,
+	},
 	weights::{GetDispatchInfo, Weight},
 };
 use frame_system::{self as system, ensure_signed};
-pub use weights::WeightInfo;
 pub use pallet::*;
+use sp_runtime::{
+	traits::{BadOrigin, One, Saturating, Zero},
+	RuntimeDebug,
+};
+use sp_std::{borrow::Borrow, marker::PhantomData, prelude::*};
+pub use weights::WeightInfo;
 
 /// Just a simple index for naming period tasks.
 pub type PeriodicIndex = u32;
@@ -210,21 +216,21 @@ pub mod pallet {
 	}
 
 	#[pallet::genesis_config]
- 	pub struct GenesisConfig;
+	pub struct GenesisConfig;
 
- 	#[cfg(feature = "std")]
- 	impl Default for GenesisConfig {
- 		fn default() -> Self {
+	#[cfg(feature = "std")]
+	impl Default for GenesisConfig {
+		fn default() -> Self {
 			Self
 		}
- 	}
+	}
 
- 	#[pallet::genesis_build]
- 	impl<T: Config> GenesisBuild<T> for GenesisConfig {
- 		fn build(&self) {
+	#[pallet::genesis_build]
+	impl<T: Config> GenesisBuild<T> for GenesisConfig {
+		fn build(&self) {
 			StorageVersion::<T>::put(Releases::V2);
- 		}
- 	}
+		}
+	}
 
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
@@ -291,9 +297,9 @@ pub mod pallet {
 					// - It's priority is `HARD_DEADLINE`
 					// - It does not push the weight past the limit.
 					// - It is the first item in the schedule
-					if s.priority <= schedule::HARD_DEADLINE
-						|| cumulative_weight <= limit
-						|| order == 0
+					if s.priority <= schedule::HARD_DEADLINE ||
+						cumulative_weight <= limit ||
+						order == 0
 					{
 						let r = s.call.clone().dispatch(s.origin.clone().into());
 						let maybe_id = s.maybe_id.clone();
@@ -497,20 +503,25 @@ impl<T: Config> Pallet<T> {
 			StorageVersion::<T>::put(Releases::V2);
 
 			Agenda::<T>::translate::<
-				Vec<Option<ScheduledV1<<T as Config>::Call, T::BlockNumber>>>, _
-			>(|_, agenda| Some(
-				agenda
-					.into_iter()
-					.map(|schedule| schedule.map(|schedule| ScheduledV2 {
-						maybe_id: schedule.maybe_id,
-						priority: schedule.priority,
-						call: schedule.call,
-						maybe_periodic: schedule.maybe_periodic,
-						origin: system::RawOrigin::Root.into(),
-						_phantom: Default::default(),
-					}))
-					.collect::<Vec<_>>()
-			));
+				Vec<Option<ScheduledV1<<T as Config>::Call, T::BlockNumber>>>,
+				_,
+			>(|_, agenda| {
+				Some(
+					agenda
+						.into_iter()
+						.map(|schedule| {
+							schedule.map(|schedule| ScheduledV2 {
+								maybe_id: schedule.maybe_id,
+								priority: schedule.priority,
+								call: schedule.call,
+								maybe_periodic: schedule.maybe_periodic,
+								origin: system::RawOrigin::Root.into(),
+								_phantom: Default::default(),
+							})
+						})
+						.collect::<Vec<_>>(),
+				)
+			});
 
 			true
 		} else {
@@ -521,20 +532,25 @@ impl<T: Config> Pallet<T> {
 	/// Helper to migrate scheduler when the pallet origin type has changed.
 	pub fn migrate_origin<OldOrigin: Into<T::PalletsOrigin> + codec::Decode>() {
 		Agenda::<T>::translate::<
-			Vec<Option<Scheduled<<T as Config>::Call, T::BlockNumber, OldOrigin, T::AccountId>>>, _
-		>(|_, agenda| Some(
-			agenda
-				.into_iter()
-				.map(|schedule| schedule.map(|schedule| Scheduled {
-					maybe_id: schedule.maybe_id,
-					priority: schedule.priority,
-					call: schedule.call,
-					maybe_periodic: schedule.maybe_periodic,
-					origin: schedule.origin.into(),
-					_phantom: Default::default(),
-				}))
-				.collect::<Vec<_>>()
-		));
+			Vec<Option<Scheduled<<T as Config>::Call, T::BlockNumber, OldOrigin, T::AccountId>>>,
+			_,
+		>(|_, agenda| {
+			Some(
+				agenda
+					.into_iter()
+					.map(|schedule| {
+						schedule.map(|schedule| Scheduled {
+							maybe_id: schedule.maybe_id,
+							priority: schedule.priority,
+							call: schedule.call,
+							maybe_periodic: schedule.maybe_periodic,
+							origin: schedule.origin.into(),
+							_phantom: Default::default(),
+						})
+					})
+					.collect::<Vec<_>>(),
+			)
+		});
 	}
 
 	fn resolve_time(when: DispatchTime<T::BlockNumber>) -> Result<T::BlockNumber, DispatchError> {
@@ -548,7 +564,7 @@ impl<T: Config> Pallet<T> {
 		};
 
 		if when <= now {
-			return Err(Error::<T>::TargetBlockNumberInPast.into());
+			return Err(Error::<T>::TargetBlockNumberInPast.into())
 		}
 
 		Ok(when)
@@ -600,7 +616,7 @@ impl<T: Config> Pallet<T> {
 				|s| -> Result<Option<Scheduled<_, _, _, _>>, DispatchError> {
 					if let (Some(ref o), Some(ref s)) = (origin, s.borrow()) {
 						if *o != s.origin {
-							return Err(BadOrigin.into());
+							return Err(BadOrigin.into())
 						}
 					};
 					Ok(s.take())
@@ -625,7 +641,7 @@ impl<T: Config> Pallet<T> {
 		let new_time = Self::resolve_time(new_time)?;
 
 		if new_time == when {
-			return Err(Error::<T>::RescheduleNoChange.into());
+			return Err(Error::<T>::RescheduleNoChange.into())
 		}
 
 		Agenda::<T>::try_mutate(when, |agenda| -> DispatchResult {
@@ -652,7 +668,7 @@ impl<T: Config> Pallet<T> {
 	) -> Result<TaskAddress<T::BlockNumber>, DispatchError> {
 		// ensure id it is unique
 		if Lookup::<T>::contains_key(&id) {
-			return Err(Error::<T>::FailedToSchedule)?;
+			return Err(Error::<T>::FailedToSchedule)?
 		}
 
 		let when = Self::resolve_time(when)?;
@@ -695,7 +711,7 @@ impl<T: Config> Pallet<T> {
 					if let Some(s) = agenda.get_mut(i) {
 						if let (Some(ref o), Some(ref s)) = (origin, s.borrow()) {
 							if *o != s.origin {
-								return Err(BadOrigin.into());
+								return Err(BadOrigin.into())
 							}
 						}
 						*s = None;
@@ -722,7 +738,7 @@ impl<T: Config> Pallet<T> {
 				let (when, index) = lookup.ok_or(Error::<T>::NotFound)?;
 
 				if new_time == when {
-					return Err(Error::<T>::RescheduleNoChange.into());
+					return Err(Error::<T>::RescheduleNoChange.into())
 				}
 
 				Agenda::<T>::try_mutate(when, |agenda| -> DispatchResult {
@@ -772,10 +788,7 @@ impl<T: Config> schedule::Anon<T::BlockNumber, <T as Config>::Call, T::PalletsOr
 	}
 
 	fn next_dispatch_time((when, index): Self::Address) -> Result<T::BlockNumber, ()> {
-		Agenda::<T>::get(when)
-			.get(index as usize)
-			.ok_or(())
-			.map(|_| when)
+		Agenda::<T>::get(when).get(index as usize).ok_or(()).map(|_| when)
 	}
 }
 
@@ -867,7 +880,10 @@ mod tests {
 		}
 
 		#[pallet::call]
-		impl<T: Config> Pallet<T> where <T as system::Config>::Origin: OriginTrait<PalletsOrigin = OriginCaller>  {
+		impl<T: Config> Pallet<T>
+		where
+			<T as system::Config>::Origin: OriginTrait<PalletsOrigin = OriginCaller>,
+		{
 			#[pallet::weight(*weight)]
 			pub fn log(origin: OriginFor<T>, i: u32, weight: Weight) -> DispatchResult {
 				Self::deposit_event(Event::Logged(i, weight));
@@ -878,7 +894,11 @@ mod tests {
 			}
 
 			#[pallet::weight(*weight)]
-			pub fn log_without_filter(origin: OriginFor<T>, i: u32, weight: Weight) -> DispatchResult {
+			pub fn log_without_filter(
+				origin: OriginFor<T>,
+				i: u32,
+				weight: Weight,
+			) -> DispatchResult {
 				Self::deposit_event(Event::Logged(i, weight));
 				LOG.with(|log| {
 					log.borrow_mut().push((origin.caller().clone(), i));
@@ -986,9 +1006,7 @@ mod tests {
 	fn basic_scheduling_works() {
 		new_test_ext().execute_with(|| {
 			let call = Call::Logger(LoggerCall::log(42, 1000));
-			assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(
-				&call
-			));
+			assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
 			assert_ok!(Scheduler::do_schedule(DispatchTime::At(4), None, 127, root(), call));
 			run_to_block(3);
 			assert!(logger::log().is_empty());
@@ -1004,9 +1022,7 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			run_to_block(2);
 			let call = Call::Logger(LoggerCall::log(42, 1000));
-			assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(
-				&call
-			));
+			assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
 			// This will schedule the call 3 blocks after the next block... so block 3 + 3 = 6
 			assert_ok!(Scheduler::do_schedule(DispatchTime::After(3), None, 127, root(), call));
 			run_to_block(5);
@@ -1038,7 +1054,11 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			// at #4, every 3 blocks, 3 times.
 			assert_ok!(Scheduler::do_schedule(
-				DispatchTime::At(4), Some((3, 3)), 127, root(), Call::Logger(logger::Call::log(42, 1000))
+				DispatchTime::At(4),
+				Some((3, 3)),
+				127,
+				root(),
+				Call::Logger(logger::Call::log(42, 1000))
 			));
 			run_to_block(3);
 			assert!(logger::log().is_empty());
@@ -1051,15 +1071,9 @@ mod tests {
 			run_to_block(9);
 			assert_eq!(logger::log(), vec![(root(), 42u32), (root(), 42u32)]);
 			run_to_block(10);
-			assert_eq!(
-				logger::log(),
-				vec![(root(), 42u32), (root(), 42u32), (root(), 42u32)]
-			);
+			assert_eq!(logger::log(), vec![(root(), 42u32), (root(), 42u32), (root(), 42u32)]);
 			run_to_block(100);
-			assert_eq!(
-				logger::log(),
-				vec![(root(), 42u32), (root(), 42u32), (root(), 42u32)]
-			);
+			assert_eq!(logger::log(), vec![(root(), 42u32), (root(), 42u32), (root(), 42u32)]);
 		});
 	}
 
@@ -1068,14 +1082,20 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			let call = Call::Logger(LoggerCall::log(42, 1000));
 			assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
-			assert_eq!(Scheduler::do_schedule(DispatchTime::At(4), None, 127, root(), call).unwrap(), (4, 0));
+			assert_eq!(
+				Scheduler::do_schedule(DispatchTime::At(4), None, 127, root(), call).unwrap(),
+				(4, 0)
+			);
 
 			run_to_block(3);
 			assert!(logger::log().is_empty());
 
 			assert_eq!(Scheduler::do_reschedule((4, 0), DispatchTime::At(6)).unwrap(), (6, 0));
 
-			assert_noop!(Scheduler::do_reschedule((6, 0), DispatchTime::At(6)), Error::<Test>::RescheduleNoChange);
+			assert_noop!(
+				Scheduler::do_reschedule((6, 0), DispatchTime::At(6)),
+				Error::<Test>::RescheduleNoChange
+			);
 
 			run_to_block(4);
 			assert!(logger::log().is_empty());
@@ -1093,16 +1113,31 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			let call = Call::Logger(LoggerCall::log(42, 1000));
 			assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
-			assert_eq!(Scheduler::do_schedule_named(
-				1u32.encode(), DispatchTime::At(4), None, 127, root(), call
-			).unwrap(), (4, 0));
+			assert_eq!(
+				Scheduler::do_schedule_named(
+					1u32.encode(),
+					DispatchTime::At(4),
+					None,
+					127,
+					root(),
+					call
+				)
+				.unwrap(),
+				(4, 0)
+			);
 
 			run_to_block(3);
 			assert!(logger::log().is_empty());
 
-			assert_eq!(Scheduler::do_reschedule_named(1u32.encode(), DispatchTime::At(6)).unwrap(), (6, 0));
+			assert_eq!(
+				Scheduler::do_reschedule_named(1u32.encode(), DispatchTime::At(6)).unwrap(),
+				(6, 0)
+			);
 
-			assert_noop!(Scheduler::do_reschedule_named(1u32.encode(), DispatchTime::At(6)), Error::<Test>::RescheduleNoChange);
+			assert_noop!(
+				Scheduler::do_reschedule_named(1u32.encode(), DispatchTime::At(6)),
+				Error::<Test>::RescheduleNoChange
+			);
 
 			run_to_block(4);
 			assert!(logger::log().is_empty());
@@ -1120,15 +1155,30 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			let call = Call::Logger(LoggerCall::log(42, 1000));
 			assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
-			assert_eq!(Scheduler::do_schedule_named(
-				1u32.encode(), DispatchTime::At(4), Some((3, 3)), 127, root(), call
-			).unwrap(), (4, 0));
+			assert_eq!(
+				Scheduler::do_schedule_named(
+					1u32.encode(),
+					DispatchTime::At(4),
+					Some((3, 3)),
+					127,
+					root(),
+					call
+				)
+				.unwrap(),
+				(4, 0)
+			);
 
 			run_to_block(3);
 			assert!(logger::log().is_empty());
 
-			assert_eq!(Scheduler::do_reschedule_named(1u32.encode(), DispatchTime::At(5)).unwrap(), (5, 0));
-			assert_eq!(Scheduler::do_reschedule_named(1u32.encode(), DispatchTime::At(6)).unwrap(), (6, 0));
+			assert_eq!(
+				Scheduler::do_reschedule_named(1u32.encode(), DispatchTime::At(5)).unwrap(),
+				(5, 0)
+			);
+			assert_eq!(
+				Scheduler::do_reschedule_named(1u32.encode(), DispatchTime::At(6)).unwrap(),
+				(6, 0)
+			);
 
 			run_to_block(5);
 			assert!(logger::log().is_empty());
@@ -1136,7 +1186,10 @@ mod tests {
 			run_to_block(6);
 			assert_eq!(logger::log(), vec![(root(), 42u32)]);
 
-			assert_eq!(Scheduler::do_reschedule_named(1u32.encode(), DispatchTime::At(10)).unwrap(), (10, 0));
+			assert_eq!(
+				Scheduler::do_reschedule_named(1u32.encode(), DispatchTime::At(10)).unwrap(),
+				(10, 0)
+			);
 
 			run_to_block(9);
 			assert_eq!(logger::log(), vec![(root(), 42u32)]);
@@ -1157,11 +1210,22 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			// at #4.
 			Scheduler::do_schedule_named(
-				1u32.encode(), DispatchTime::At(4), None, 127, root(), Call::Logger(LoggerCall::log(69, 1000))
-			).unwrap();
+				1u32.encode(),
+				DispatchTime::At(4),
+				None,
+				127,
+				root(),
+				Call::Logger(LoggerCall::log(69, 1000)),
+			)
+			.unwrap();
 			let i = Scheduler::do_schedule(
-				DispatchTime::At(4), None, 127, root(), Call::Logger(LoggerCall::log(42, 1000))
-			).unwrap();
+				DispatchTime::At(4),
+				None,
+				127,
+				root(),
+				Call::Logger(LoggerCall::log(42, 1000)),
+			)
+			.unwrap();
 			run_to_block(3);
 			assert!(logger::log().is_empty());
 			assert_ok!(Scheduler::do_cancel_named(None, 1u32.encode()));
@@ -1315,10 +1379,7 @@ mod tests {
 			assert_eq!(logger::log(), vec![(root(), 2600u32)]);
 			// 69 and 42 fit together
 			run_to_block(5);
-			assert_eq!(
-				logger::log(),
-				vec![(root(), 2600u32), (root(), 69u32), (root(), 42u32)]
-			);
+			assert_eq!(logger::log(), vec![(root(), 2600u32), (root(), 69u32), (root(), 42u32)]);
 		});
 	}
 
@@ -1372,9 +1433,9 @@ mod tests {
 			let call_weight = MaximumSchedulerWeight::get() / 2;
 			assert_eq!(
 				actual_weight,
-				call_weight
-					+ base_weight + base_multiplier
-					+ named_multiplier + periodic_multiplier
+				call_weight +
+					base_weight + base_multiplier +
+					named_multiplier + periodic_multiplier
 			);
 			assert_eq!(logger::log(), vec![(root(), 2600u32)]);
 
@@ -1385,10 +1446,7 @@ mod tests {
 				actual_weight,
 				call_weight + base_weight + base_multiplier * 2 + periodic_multiplier
 			);
-			assert_eq!(
-				logger::log(),
-				vec![(root(), 2600u32), (root(), 69u32), (root(), 42u32)]
-			);
+			assert_eq!(logger::log(), vec![(root(), 2600u32), (root(), 69u32), (root(), 42u32)]);
 
 			// Will include named only
 			let actual_weight = Scheduler::on_initialize(3);
@@ -1399,12 +1457,7 @@ mod tests {
 			);
 			assert_eq!(
 				logger::log(),
-				vec![
-					(root(), 2600u32),
-					(root(), 69u32),
-					(root(), 42u32),
-					(root(), 3u32)
-				]
+				vec![(root(), 2600u32), (root(), 69u32), (root(), 42u32), (root(), 3u32)]
 			);
 
 			// Will contain none
@@ -1488,10 +1541,7 @@ mod tests {
 			// Scheduled calls are in the agenda.
 			assert_eq!(Agenda::<Test>::get(4).len(), 2);
 			assert!(logger::log().is_empty());
-			assert_ok!(Scheduler::cancel_named(
-				system::RawOrigin::Signed(1).into(),
-				1u32.encode()
-			));
+			assert_ok!(Scheduler::cancel_named(system::RawOrigin::Signed(1).into(), 1u32.encode()));
 			assert_ok!(Scheduler::cancel(system::RawOrigin::Signed(1).into(), 4, 1));
 			// Scheduled calls are made NONE, so should not effect state
 			run_to_block(100);
@@ -1550,18 +1600,12 @@ mod tests {
 				Scheduler::cancel_named(system::RawOrigin::Signed(2).into(), 1u32.encode()),
 				BadOrigin
 			);
-			assert_noop!(
-				Scheduler::cancel(system::RawOrigin::Signed(2).into(), 4, 1),
-				BadOrigin
-			);
+			assert_noop!(Scheduler::cancel(system::RawOrigin::Signed(2).into(), 4, 1), BadOrigin);
 			assert_noop!(
 				Scheduler::cancel_named(system::RawOrigin::Root.into(), 1u32.encode()),
 				BadOrigin
 			);
-			assert_noop!(
-				Scheduler::cancel(system::RawOrigin::Root.into(), 4, 1),
-				BadOrigin
-			);
+			assert_noop!(Scheduler::cancel(system::RawOrigin::Root.into(), 4, 1), BadOrigin);
 			run_to_block(5);
 			assert_eq!(
 				logger::log(),
diff --git a/frame/scheduler/src/weights.rs b/frame/scheduler/src/weights.rs
index 648652428cbb..854cd5a525ce 100644
--- a/frame/scheduler/src/weights.rs
+++ b/frame/scheduler/src/weights.rs
@@ -36,6 +36,7 @@
 // --template=./.maintain/frame-weight-template.hbs
 
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
diff --git a/frame/scored-pool/src/lib.rs b/frame/scored-pool/src/lib.rs
index 5892862b4307..fc25004eda68 100644
--- a/frame/scored-pool/src/lib.rs
+++ b/frame/scored-pool/src/lib.rs
@@ -91,18 +91,16 @@ mod mock;
 mod tests;
 
 use codec::FullCodec;
-use sp_std::{
-	fmt::Debug,
-	prelude::*,
-};
 use frame_support::{
 	ensure,
-	traits::{ChangeMembers, InitializeMembers, Currency, Get, ReservableCurrency},
+	traits::{ChangeMembers, Currency, Get, InitializeMembers, ReservableCurrency},
 };
-use sp_runtime::traits::{AtLeast32Bit, Zero, StaticLookup};
 pub use pallet::*;
+use sp_runtime::traits::{AtLeast32Bit, StaticLookup, Zero};
+use sp_std::{fmt::Debug, prelude::*};
 
-type BalanceOf<T, I> = <<T as Config<I>>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+type BalanceOf<T, I> =
+	<<T as Config<I>>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 type PoolT<T, I> = Vec<(<T as frame_system::Config>::AccountId, Option<<T as Config<I>>::Score>)>;
 
 /// The enum is supplied when refreshing the members set.
@@ -117,10 +115,10 @@ enum ChangeReceiver {
 
 #[frame_support::pallet]
 pub mod pallet {
+	use super::*;
 	use frame_support::{pallet_prelude::*, traits::EnsureOrigin, weights::Weight};
 	use frame_system::{ensure_root, ensure_signed, pallet_prelude::*};
 	use sp_runtime::traits::MaybeSerializeDeserialize;
-	use super::*;
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
@@ -132,8 +130,13 @@ pub mod pallet {
 		type Currency: Currency<Self::AccountId> + ReservableCurrency<Self::AccountId>;
 
 		/// The score attributed to a member or candidate.
-		type Score:
-			AtLeast32Bit + Clone + Copy + Default + FullCodec + MaybeSerializeDeserialize + Debug;
+		type Score: AtLeast32Bit
+			+ Clone
+			+ Copy
+			+ Default
+			+ FullCodec
+			+ MaybeSerializeDeserialize
+			+ Debug;
 
 		/// The overarching event type.
 		type Event: From<Event<Self, I>> + IsType<<Self as frame_system::Config>::Event>;
@@ -209,22 +212,19 @@ pub mod pallet {
 	/// `T::AccountId`, but by `T::Score` instead).
 	#[pallet::storage]
 	#[pallet::getter(fn candidate_exists)]
-	pub(crate) type CandidateExists<T: Config<I>, I: 'static = ()> = StorageMap<
-		_,
-		Twox64Concat, T::AccountId,
-		bool,
-		ValueQuery,
-	>;
+	pub(crate) type CandidateExists<T: Config<I>, I: 'static = ()> =
+		StorageMap<_, Twox64Concat, T::AccountId, bool, ValueQuery>;
 
 	/// The current membership, stored as an ordered Vec.
 	#[pallet::storage]
 	#[pallet::getter(fn members)]
-	pub(crate) type Members<T: Config<I>, I: 'static = ()> = StorageValue<_, Vec<T::AccountId>, ValueQuery>;
+	pub(crate) type Members<T: Config<I>, I: 'static = ()> =
+		StorageValue<_, Vec<T::AccountId>, ValueQuery>;
 
 	/// Size of the `Members` set.
 	#[pallet::storage]
 	#[pallet::getter(fn member_count)]
-	pub(crate) type MemberCount<T, I=()> = StorageValue<_, u32, ValueQuery>;
+	pub(crate) type MemberCount<T, I = ()> = StorageValue<_, u32, ValueQuery>;
 
 	#[pallet::genesis_config]
 	pub struct GenesisConfig<T: Config<I>, I: 'static = ()> {
@@ -235,10 +235,7 @@ pub mod pallet {
 	#[cfg(feature = "std")]
 	impl<T: Config<I>, I: 'static> Default for GenesisConfig<T, I> {
 		fn default() -> Self {
-			Self {
-				pool: Default::default(),
-				member_count: Default::default(),
-			}
+			Self { pool: Default::default(), member_count: Default::default() }
 		}
 	}
 
@@ -249,19 +246,15 @@ pub mod pallet {
 
 			// reserve balance for each candidate in the pool.
 			// panicking here is ok, since this just happens one time, pre-genesis.
-			pool
-				.iter()
-				.for_each(|(who, _)| {
-					T::Currency::reserve(&who, T::CandidateDeposit::get())
-						.expect("balance too low to create candidacy");
-					<CandidateExists<T, I>>::insert(who, true);
-				});
+			pool.iter().for_each(|(who, _)| {
+				T::Currency::reserve(&who, T::CandidateDeposit::get())
+					.expect("balance too low to create candidacy");
+				<CandidateExists<T, I>>::insert(who, true);
+			});
 
 			// Sorts the `Pool` by score in a descending order. Entities which
 			// have a score of `None` are sorted to the beginning of the vec.
-			pool.sort_by_key(|(_, maybe_score)|
-				Reverse(maybe_score.unwrap_or_default())
-			);
+			pool.sort_by_key(|(_, maybe_score)| Reverse(maybe_score.unwrap_or_default()));
 
 			<MemberCount<T, I>>::put(self.member_count);
 			<Pool<T, I>>::put(&pool);
@@ -324,10 +317,7 @@ pub mod pallet {
 		/// The `index` parameter of this function must be set to
 		/// the index of the transactor in the `Pool`.
 		#[pallet::weight(0)]
-		pub fn withdraw_candidacy(
-			origin: OriginFor<T>,
-			index: u32
-		) -> DispatchResult {
+		pub fn withdraw_candidacy(origin: OriginFor<T>, index: u32) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 
 			let pool = <Pool<T, I>>::get();
@@ -348,7 +338,7 @@ pub mod pallet {
 		pub fn kick(
 			origin: OriginFor<T>,
 			dest: <T::Lookup as StaticLookup>::Source,
-			index: u32
+			index: u32,
 		) -> DispatchResult {
 			T::KickOrigin::ensure_origin(origin)?;
 
@@ -373,7 +363,7 @@ pub mod pallet {
 			origin: OriginFor<T>,
 			dest: <T::Lookup as StaticLookup>::Source,
 			index: u32,
-			score: T::Score
+			score: T::Score,
 		) -> DispatchResult {
 			T::ScoreOrigin::ensure_origin(origin)?;
 
@@ -390,10 +380,9 @@ pub mod pallet {
 			// where we can insert while maintaining order.
 			let item = (who, Some(score.clone()));
 			let location = pool
-				.binary_search_by_key(
-					&Reverse(score),
-					|(_, maybe_score)| Reverse(maybe_score.unwrap_or_default())
-				)
+				.binary_search_by_key(&Reverse(score), |(_, maybe_score)| {
+					Reverse(maybe_score.unwrap_or_default())
+				})
 				.unwrap_or_else(|l| l);
 			pool.insert(location, item);
 
@@ -418,16 +407,12 @@ pub mod pallet {
 }
 
 impl<T: Config<I>, I: 'static> Pallet<T, I> {
-
 	/// Fetches the `MemberCount` highest scoring members from
 	/// `Pool` and puts them into `Members`.
 	///
 	/// The `notify` parameter is used to deduct which associated
 	/// type function to invoke at the end of the method.
-	fn refresh_members(
-		pool: PoolT<T, I>,
-		notify: ChangeReceiver
-	) {
+	fn refresh_members(pool: PoolT<T, I>, notify: ChangeReceiver) {
 		let count = MemberCount::<T, I>::get();
 
 		let mut new_members: Vec<T::AccountId> = pool
@@ -445,10 +430,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 			ChangeReceiver::MembershipInitialized =>
 				T::MembershipInitialized::initialize_members(&new_members),
 			ChangeReceiver::MembershipChanged =>
-				T::MembershipChanged::set_members_sorted(
-					&new_members[..],
-					&old_members[..],
-				),
+				T::MembershipChanged::set_members_sorted(&new_members[..], &old_members[..]),
 		}
 	}
 
@@ -459,7 +441,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	fn remove_member(
 		mut pool: PoolT<T, I>,
 		remove: T::AccountId,
-		index: u32
+		index: u32,
 	) -> Result<(), Error<T, I>> {
 		// all callers of this function in this pallet also check
 		// the index for validity before calling this function.
@@ -486,11 +468,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 
 	/// Checks if `index` is a valid number and if the element found
 	/// at `index` in `Pool` is equal to `who`.
-	fn ensure_index(
-		pool: &PoolT<T, I>,
-		who: &T::AccountId,
-		index: u32
-	) -> Result<(), Error<T, I>> {
+	fn ensure_index(pool: &PoolT<T, I>, who: &T::AccountId, index: u32) -> Result<(), Error<T, I>> {
 		ensure!(index < pool.len() as u32, Error::<T, I>::InvalidIndex);
 
 		let (index_who, _index_score) = &pool[index as usize];
diff --git a/frame/scored-pool/src/mock.rs b/frame/scored-pool/src/mock.rs
index 30dc48dd19d0..80ded36fbf0a 100644
--- a/frame/scored-pool/src/mock.rs
+++ b/frame/scored-pool/src/mock.rs
@@ -20,13 +20,14 @@
 use super::*;
 use crate as pallet_scored_pool;
 
-use std::cell::RefCell;
-use frame_support::{parameter_types, ord_parameter_types, traits::GenesisBuild};
+use frame_support::{ord_parameter_types, parameter_types, traits::GenesisBuild};
+use frame_system::EnsureSignedBy;
 use sp_core::H256;
 use sp_runtime::{
-	traits::{BlakeTwo256, IdentityLookup}, testing::Header,
+	testing::Header,
+	traits::{BlakeTwo256, IdentityLookup},
 };
-use frame_system::EnsureSignedBy;
+use std::cell::RefCell;
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -145,32 +146,26 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 			(40, 500_000),
 			(99, 1),
 		],
-	}.assimilate_storage(&mut t).unwrap();
-	pallet_scored_pool::GenesisConfig::<Test>{
-		pool: vec![
-			(5, None),
-			(10, Some(1)),
-			(20, Some(2)),
-			(31, Some(2)),
-			(40, Some(3)),
-		],
+	}
+	.assimilate_storage(&mut t)
+	.unwrap();
+	pallet_scored_pool::GenesisConfig::<Test> {
+		pool: vec![(5, None), (10, Some(1)), (20, Some(2)), (31, Some(2)), (40, Some(3))],
 		member_count: 2,
-		.. Default::default()
-	}.assimilate_storage(&mut t).unwrap();
+		..Default::default()
+	}
+	.assimilate_storage(&mut t)
+	.unwrap();
 	t.into()
 }
 
 /// Fetch an entity from the pool, if existent.
 pub fn fetch_from_pool(who: u64) -> Option<(u64, Option<u64>)> {
-	<Pallet<Test>>::pool()
-		.into_iter()
-		.find(|item| item.0 == who)
+	<Pallet<Test>>::pool().into_iter().find(|item| item.0 == who)
 }
 
 /// Find an entity in the pool.
 /// Returns its position in the `Pool` vec, if existent.
 pub fn find_in_pool(who: u64) -> Option<usize> {
-	<Pallet<Test>>::pool()
-		.into_iter()
-		.position(|item| item.0 == who)
+	<Pallet<Test>>::pool().into_iter().position(|item| item.0 == who)
 }
diff --git a/frame/scored-pool/src/tests.rs b/frame/scored-pool/src/tests.rs
index 4a3b8384b744..0503e308e76a 100644
--- a/frame/scored-pool/src/tests.rs
+++ b/frame/scored-pool/src/tests.rs
@@ -20,7 +20,7 @@
 use super::*;
 use mock::*;
 
-use frame_support::{assert_ok, assert_noop, traits::OnInitialize};
+use frame_support::{assert_noop, assert_ok, traits::OnInitialize};
 use sp_runtime::traits::BadOrigin;
 
 type ScoredPool = Pallet<Test>;
@@ -142,14 +142,12 @@ fn unscored_entities_must_not_be_used_for_filling_members() {
 
 		// when
 		// we remove every scored member
-		ScoredPool::pool()
-			.into_iter()
-			.for_each(|(who, score)| {
-				if let Some(_) = score {
-					let index = find_in_pool(who).expect("entity must be in pool") as u32;
-					assert_ok!(ScoredPool::kick(Origin::signed(KickOrigin::get()), who, index));
-				}
-			});
+		ScoredPool::pool().into_iter().for_each(|(who, score)| {
+			if let Some(_) = score {
+				let index = find_in_pool(who).expect("entity must be in pool") as u32;
+				assert_ok!(ScoredPool::kick(Origin::signed(KickOrigin::get()), who, index));
+			}
+		});
 
 		// then
 		// the `None` candidates should not have been filled in
@@ -201,7 +199,10 @@ fn withdraw_candidacy_must_only_work_for_members() {
 	new_test_ext().execute_with(|| {
 		let who = 77;
 		let index = 0;
-		assert_noop!( ScoredPool::withdraw_candidacy(Origin::signed(who), index), Error::<Test, _>::WrongAccountIndex);
+		assert_noop!(
+			ScoredPool::withdraw_candidacy(Origin::signed(who), index),
+			Error::<Test, _>::WrongAccountIndex
+		);
 	});
 }
 
@@ -210,9 +211,18 @@ fn oob_index_should_abort() {
 	new_test_ext().execute_with(|| {
 		let who = 40;
 		let oob_index = ScoredPool::pool().len() as u32;
-		assert_noop!(ScoredPool::withdraw_candidacy(Origin::signed(who), oob_index), Error::<Test, _>::InvalidIndex);
-		assert_noop!(ScoredPool::score(Origin::signed(ScoreOrigin::get()), who, oob_index, 99), Error::<Test, _>::InvalidIndex);
-		assert_noop!(ScoredPool::kick(Origin::signed(KickOrigin::get()), who, oob_index), Error::<Test, _>::InvalidIndex);
+		assert_noop!(
+			ScoredPool::withdraw_candidacy(Origin::signed(who), oob_index),
+			Error::<Test, _>::InvalidIndex
+		);
+		assert_noop!(
+			ScoredPool::score(Origin::signed(ScoreOrigin::get()), who, oob_index, 99),
+			Error::<Test, _>::InvalidIndex
+		);
+		assert_noop!(
+			ScoredPool::kick(Origin::signed(KickOrigin::get()), who, oob_index),
+			Error::<Test, _>::InvalidIndex
+		);
 	});
 }
 
@@ -221,9 +231,18 @@ fn index_mismatches_should_abort() {
 	new_test_ext().execute_with(|| {
 		let who = 40;
 		let index = 3;
-		assert_noop!(ScoredPool::withdraw_candidacy(Origin::signed(who), index), Error::<Test, _>::WrongAccountIndex);
-		assert_noop!(ScoredPool::score(Origin::signed(ScoreOrigin::get()), who, index, 99), Error::<Test, _>::WrongAccountIndex);
-		assert_noop!(ScoredPool::kick(Origin::signed(KickOrigin::get()), who, index), Error::<Test, _>::WrongAccountIndex);
+		assert_noop!(
+			ScoredPool::withdraw_candidacy(Origin::signed(who), index),
+			Error::<Test, _>::WrongAccountIndex
+		);
+		assert_noop!(
+			ScoredPool::score(Origin::signed(ScoreOrigin::get()), who, index, 99),
+			Error::<Test, _>::WrongAccountIndex
+		);
+		assert_noop!(
+			ScoredPool::kick(Origin::signed(KickOrigin::get()), who, index),
+			Error::<Test, _>::WrongAccountIndex
+		);
 	});
 }
 
diff --git a/frame/session/benchmarking/src/lib.rs b/frame/session/benchmarking/src/lib.rs
index d9a50b431f2e..117ef07d60a2 100644
--- a/frame/session/benchmarking/src/lib.rs
+++ b/frame/session/benchmarking/src/lib.rs
@@ -22,8 +22,7 @@
 
 mod mock;
 
-use sp_std::prelude::*;
-use sp_std::vec;
+use sp_std::{prelude::*, vec};
 
 use frame_benchmarking::{benchmarks, impl_benchmark_test_suite};
 use frame_support::{
@@ -41,7 +40,10 @@ use sp_runtime::traits::{One, StaticLookup};
 const MAX_VALIDATORS: u32 = 1000;
 
 pub struct Pallet<T: Config>(pallet_session::Module<T>);
-pub trait Config: pallet_session::Config + pallet_session::historical::Config + pallet_staking::Config {}
+pub trait Config:
+	pallet_session::Config + pallet_session::historical::Config + pallet_staking::Config
+{
+}
 
 impl<T: Config> OnInitialize<T::BlockNumber> for Pallet<T> {
 	fn on_initialize(n: T::BlockNumber) -> frame_support::weights::Weight {
@@ -120,20 +122,12 @@ benchmarks! {
 /// proof for the first authority and returns its key and the proof.
 fn check_membership_proof_setup<T: Config>(
 	n: u32,
-) -> (
-	(sp_runtime::KeyTypeId, &'static [u8; 32]),
-	sp_session::MembershipProof,
-) {
+) -> ((sp_runtime::KeyTypeId, &'static [u8; 32]), sp_session::MembershipProof) {
 	pallet_staking::ValidatorCount::<T>::put(n);
 
 	// create validators and set random session keys
-	for (n, who) in create_validators::<T>(n, 1000)
-		.unwrap()
-		.into_iter()
-		.enumerate()
-	{
-		use rand::RngCore;
-		use rand::SeedableRng;
+	for (n, who) in create_validators::<T>(n, 1000).unwrap().into_iter().enumerate() {
+		use rand::{RngCore, SeedableRng};
 
 		let validator = T::Lookup::lookup(who).unwrap();
 		let controller = pallet_staking::Pallet::<T>::bonded(validator).unwrap();
@@ -168,9 +162,4 @@ fn check_membership_proof_setup<T: Config>(
 	(key, Historical::<T>::prove(key).unwrap())
 }
 
-impl_benchmark_test_suite!(
-	Pallet,
-	crate::mock::new_test_ext(),
-	crate::mock::Test,
-	extra = false,
-);
+impl_benchmark_test_suite!(Pallet, crate::mock::new_test_ext(), crate::mock::Test, extra = false,);
diff --git a/frame/session/benchmarking/src/mock.rs b/frame/session/benchmarking/src/mock.rs
index a3f9b6b447c3..bd61acb9de18 100644
--- a/frame/session/benchmarking/src/mock.rs
+++ b/frame/session/benchmarking/src/mock.rs
@@ -19,9 +19,9 @@
 
 #![cfg(test)]
 
-use sp_runtime::traits::IdentityLookup;
 use frame_election_provider_support::onchain;
 use frame_support::parameter_types;
+use sp_runtime::traits::IdentityLookup;
 
 type AccountId = u64;
 type AccountIndex = u32;
@@ -114,7 +114,8 @@ impl pallet_session::SessionHandler<AccountId> for TestSessionHandler {
 		_: bool,
 		_: &[(AccountId, Ks)],
 		_: &[(AccountId, Ks)],
-	) {}
+	) {
+	}
 
 	fn on_disabled(_: usize) {}
 }
diff --git a/frame/session/src/historical/mod.rs b/frame/session/src/historical/mod.rs
index 3cfcbf98bf38..c9b13e3c7f26 100644
--- a/frame/session/src/historical/mod.rs
+++ b/frame/session/src/historical/mod.rs
@@ -26,22 +26,27 @@
 //! These roots and proofs of inclusion can be generated at any time during the current session.
 //! Afterwards, the proofs can be fed to a consensus module when reporting misbehavior.
 
-use sp_std::prelude::*;
-use codec::{Encode, Decode};
-use sp_runtime::KeyTypeId;
-use sp_runtime::traits::{Convert, OpaqueKeys};
-use sp_session::{MembershipProof, ValidatorCount};
+use super::{Module as SessionModule, SessionIndex};
+use codec::{Decode, Encode};
 use frame_support::{
-	decl_module, decl_storage, Parameter, print,
+	decl_module, decl_storage, print,
 	traits::{ValidatorSet, ValidatorSetWithIdentification},
+	Parameter,
+};
+use sp_runtime::{
+	traits::{Convert, OpaqueKeys},
+	KeyTypeId,
+};
+use sp_session::{MembershipProof, ValidatorCount};
+use sp_std::prelude::*;
+use sp_trie::{
+	trie_types::{TrieDB, TrieDBMut},
+	MemoryDB, Recorder, Trie, TrieMut, EMPTY_PREFIX,
 };
-use sp_trie::{MemoryDB, Trie, TrieMut, Recorder, EMPTY_PREFIX};
-use sp_trie::trie_types::{TrieDBMut, TrieDB};
-use super::{SessionIndex, Module as SessionModule};
 
-mod shared;
 pub mod offchain;
 pub mod onchain;
+mod shared;
 
 /// Config necessary for the historical module.
 pub trait Config: super::Config {
@@ -165,7 +170,7 @@ impl<T: Config, I: SessionManager<T::ValidatorId, T::FullIdentification>> NoteHi
 				Err(reason) => {
 					print("Failed to generate historical ancestry-inclusion proof.");
 					print(reason);
-				}
+				},
 			};
 		} else {
 			let previous_index = new_index.saturating_sub(1);
@@ -201,7 +206,8 @@ where
 }
 
 /// A tuple of the validator's ID and their full identification.
-pub type IdentificationTuple<T> = (<T as crate::Config>::ValidatorId, <T as Config>::FullIdentification);
+pub type IdentificationTuple<T> =
+	(<T as crate::Config>::ValidatorId, <T as Config>::FullIdentification);
 
 /// A trie instance for checking and generating proofs.
 pub struct ProvingTrie<T: Config> {
@@ -211,7 +217,8 @@ pub struct ProvingTrie<T: Config> {
 
 impl<T: Config> ProvingTrie<T> {
 	fn generate_for<I>(validators: I) -> Result<Self, &'static str>
-		where I: IntoIterator<Item=(T::ValidatorId, T::FullIdentification)>
+	where
+		I: IntoIterator<Item = (T::ValidatorId, T::FullIdentification)>,
 	{
 		let mut db = MemoryDB::default();
 		let mut root = Default::default();
@@ -230,23 +237,20 @@ impl<T: Config> ProvingTrie<T> {
 				// map each key to the owner index.
 				for key_id in T::Keys::key_ids() {
 					let key = keys.get_raw(*key_id);
-					let res = (key_id, key).using_encoded(|k|
-						i.using_encoded(|v| trie.insert(k, v))
-					);
+					let res =
+						(key_id, key).using_encoded(|k| i.using_encoded(|v| trie.insert(k, v)));
 
 					let _ = res.map_err(|_| "failed to insert into trie")?;
 				}
 
 				// map each owner index to the full identification.
-				let _ = i.using_encoded(|k| full_id.using_encoded(|v| trie.insert(k, v)))
+				let _ = i
+					.using_encoded(|k| full_id.using_encoded(|v| trie.insert(k, v)))
 					.map_err(|_| "failed to insert into trie")?;
 			}
 		}
 
-		Ok(ProvingTrie {
-			db,
-			root,
-		})
+		Ok(ProvingTrie { db, root })
 	}
 
 	fn from_nodes(root: T::Hash, nodes: &[Vec<u8>]) -> Self {
@@ -257,10 +261,7 @@ impl<T: Config> ProvingTrie<T> {
 			HashDBT::insert(&mut memory_db, EMPTY_PREFIX, &node[..]);
 		}
 
-		ProvingTrie {
-			db: memory_db,
-			root,
-		}
+		ProvingTrie { db: memory_db, root }
 	}
 
 	/// Prove the full verification data for a given key and key ID.
@@ -291,11 +292,13 @@ impl<T: Config> ProvingTrie<T> {
 	// nodes within the current `MemoryDB` are insufficient to query the item.
 	fn query(&self, key_id: KeyTypeId, key_data: &[u8]) -> Option<IdentificationTuple<T>> {
 		let trie = TrieDB::new(&self.db, &self.root).ok()?;
-		let val_idx = (key_id, key_data).using_encoded(|s| trie.get(s))
+		let val_idx = (key_id, key_data)
+			.using_encoded(|s| trie.get(s))
 			.ok()?
 			.and_then(|raw| u32::decode(&mut &*raw).ok())?;
 
-		val_idx.using_encoded(|s| trie.get(s))
+		val_idx
+			.using_encoded(|s| trie.get(s))
 			.ok()?
 			.and_then(|raw| <IdentificationTuple<T>>::decode(&mut &*raw).ok())
 	}
@@ -322,12 +325,11 @@ impl<T: Config, D: AsRef<[u8]>> frame_support::traits::KeyOwnerProofSystem<(KeyT
 		let trie = ProvingTrie::<T>::generate_for(validators).ok()?;
 
 		let (id, data) = key;
-		trie.prove(id, data.as_ref())
-			.map(|trie_nodes| MembershipProof {
-				session,
-				trie_nodes,
-				validator_count: count,
-			})
+		trie.prove(id, data.as_ref()).map(|trie_nodes| MembershipProof {
+			session,
+			trie_nodes,
+			validator_count: count,
+		})
 	}
 
 	fn check_proof(key: (KeyTypeId, D), proof: Self::Proof) -> Option<IdentificationTuple<T>> {
@@ -339,7 +341,7 @@ impl<T: Config, D: AsRef<[u8]>> frame_support::traits::KeyOwnerProofSystem<(KeyT
 					let count = <SessionModule<T>>::validators().len() as ValidatorCount;
 
 					if count != proof.validator_count {
-						return None;
+						return None
 					}
 
 					Some((owner, id))
@@ -349,7 +351,7 @@ impl<T: Config, D: AsRef<[u8]>> frame_support::traits::KeyOwnerProofSystem<(KeyT
 			let (root, count) = <HistoricalSessions<T>>::get(&proof.session)?;
 
 			if count != proof.validator_count {
-				return None;
+				return None
 			}
 
 			let trie = ProvingTrie::<T>::from_nodes(root, &proof.trie_nodes);
@@ -361,22 +363,22 @@ impl<T: Config, D: AsRef<[u8]>> frame_support::traits::KeyOwnerProofSystem<(KeyT
 #[cfg(test)]
 pub(crate) mod tests {
 	use super::*;
-	use sp_runtime::key_types::DUMMY;
-	use sp_runtime::testing::UintAuthorityId;
 	use crate::mock::{
-		NEXT_VALIDATORS, force_new_session,
-		set_next_validators, Test, System, Session,
+		force_new_session, set_next_validators, Session, System, Test, NEXT_VALIDATORS,
 	};
-	use frame_support::traits::{KeyOwnerProofSystem, OnInitialize};
-	use frame_support::BasicExternalities;
+	use frame_support::{
+		traits::{KeyOwnerProofSystem, OnInitialize},
+		BasicExternalities,
+	};
+	use sp_runtime::{key_types::DUMMY, testing::UintAuthorityId};
 
 	type Historical = Module<Test>;
 
 	pub(crate) fn new_test_ext() -> sp_io::TestExternalities {
 		let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-		let keys: Vec<_> = NEXT_VALIDATORS.with(|l|
+		let keys: Vec<_> = NEXT_VALIDATORS.with(|l| {
 			l.borrow().iter().cloned().map(|i| (i, i, UintAuthorityId(i).into())).collect()
-		);
+		});
 		BasicExternalities::execute_with_storage(&mut t, || {
 			for (ref k, ..) in &keys {
 				frame_system::Pallet::<Test>::inc_providers(k);
@@ -430,7 +432,6 @@ pub(crate) mod tests {
 
 				System::set_block_number(i);
 				Session::on_initialize(i);
-
 			}
 
 			assert_eq!(StoredRange::get(), Some((0, 100)));
@@ -461,7 +462,6 @@ pub(crate) mod tests {
 
 				System::set_block_number(i);
 				Session::on_initialize(i);
-
 			}
 
 			assert_eq!(StoredRange::get(), Some((100, 200)));
diff --git a/frame/session/src/historical/offchain.rs b/frame/session/src/historical/offchain.rs
index 68cc78029f12..8583c2bb439b 100644
--- a/frame/session/src/historical/offchain.rs
+++ b/frame/session/src/historical/offchain.rs
@@ -27,17 +27,18 @@
 
 use sp_runtime::{
 	offchain::storage::{MutateStorageError, StorageRetrievalError, StorageValueRef},
-	KeyTypeId
+	KeyTypeId,
 };
 use sp_session::MembershipProof;
 
-use super::super::{Pallet as SessionModule, SessionIndex};
-use super::{IdentificationTuple, ProvingTrie, Config};
+use super::{
+	super::{Pallet as SessionModule, SessionIndex},
+	Config, IdentificationTuple, ProvingTrie,
+};
 
 use super::shared;
 use sp_std::prelude::*;
 
-
 /// A set of validators, which was used for a fixed session index.
 struct ValidatorSet<T: Config> {
 	validator_set: Vec<IdentificationTuple<T>>,
@@ -87,15 +88,13 @@ pub fn prove_session_membership<T: Config, D: AsRef<[u8]>>(
 	let trie = ProvingTrie::<T>::generate_for(validators.into_iter()).ok()?;
 
 	let (id, data) = session_key;
-	trie.prove(id, data.as_ref())
-		.map(|trie_nodes| MembershipProof {
-			session: session_index,
-			trie_nodes,
-			validator_count: count,
-		})
+	trie.prove(id, data.as_ref()).map(|trie_nodes| MembershipProof {
+		session: session_index,
+		trie_nodes,
+		validator_count: count,
+	})
 }
 
-
 /// Attempt to prune anything that is older than `first_to_keep` session index.
 ///
 /// Due to re-organisation it could be that the `first_to_keep` might be less
@@ -104,18 +103,20 @@ pub fn prove_session_membership<T: Config, D: AsRef<[u8]>>(
 pub fn prune_older_than<T: Config>(first_to_keep: SessionIndex) {
 	let derived_key = shared::LAST_PRUNE.to_vec();
 	let entry = StorageValueRef::persistent(derived_key.as_ref());
-	match entry.mutate(|current: Result<Option<SessionIndex>, StorageRetrievalError>| -> Result<_, ()> {
-		match current {
-			Ok(Some(current)) if current < first_to_keep => Ok(first_to_keep),
-			// do not move the cursor, if the new one would be behind ours
-			Ok(Some(current)) => Ok(current),
-			Ok(None) => Ok(first_to_keep),
-			// if the storage contains undecodable data, overwrite with current anyways
-			// which might leak some entries being never purged, but that is acceptable
-			// in this context
-			Err(_) => Ok(first_to_keep),
-		}
-	}) {
+	match entry.mutate(
+		|current: Result<Option<SessionIndex>, StorageRetrievalError>| -> Result<_, ()> {
+			match current {
+				Ok(Some(current)) if current < first_to_keep => Ok(first_to_keep),
+				// do not move the cursor, if the new one would be behind ours
+				Ok(Some(current)) => Ok(current),
+				Ok(None) => Ok(first_to_keep),
+				// if the storage contains undecodable data, overwrite with current anyways
+				// which might leak some entries being never purged, but that is acceptable
+				// in this context
+				Err(_) => Ok(first_to_keep),
+			}
+		},
+	) {
 		Ok(new_value) => {
 			// on a re-org this is not necessarily true, with the above they might be equal
 			if new_value < first_to_keep {
@@ -124,9 +125,9 @@ pub fn prune_older_than<T: Config>(first_to_keep: SessionIndex) {
 					let _ = StorageValueRef::persistent(derived_key.as_ref()).clear();
 				}
 			}
-		}
-		Err(MutateStorageError::ConcurrentModification(_)) => {}
-		Err(MutateStorageError::ValueFunctionFailed(_)) => {}
+		},
+		Err(MutateStorageError::ConcurrentModification(_)) => {},
+		Err(MutateStorageError::ValueFunctionFailed(_)) => {},
 	}
 }
 
@@ -141,23 +142,22 @@ pub fn keep_newest<T: Config>(n_to_keep: usize) {
 
 #[cfg(test)]
 mod tests {
-	use super::super::{onchain, Module};
-	use super::*;
+	use super::{
+		super::{onchain, Module},
+		*,
+	};
 	use crate::mock::{
 		force_new_session, set_next_validators, Session, System, Test, NEXT_VALIDATORS,
 	};
 	use codec::Encode;
 	use frame_support::traits::{KeyOwnerProofSystem, OnInitialize};
-	use sp_core::crypto::key_types::DUMMY;
-	use sp_core::offchain::{
-		testing::TestOffchainExt,
-		OffchainDbExt,
-		OffchainWorkerExt,
-		StorageKind,
+	use sp_core::{
+		crypto::key_types::DUMMY,
+		offchain::{testing::TestOffchainExt, OffchainDbExt, OffchainWorkerExt, StorageKind},
 	};
 
-	use sp_runtime::testing::UintAuthorityId;
 	use frame_support::BasicExternalities;
+	use sp_runtime::testing::UintAuthorityId;
 
 	type Historical = Module<Test>;
 
@@ -166,16 +166,16 @@ mod tests {
 			.build_storage::<Test>()
 			.expect("Failed to create test externalities.");
 
-		let keys: Vec<_> = NEXT_VALIDATORS.with(|l|
+		let keys: Vec<_> = NEXT_VALIDATORS.with(|l| {
 			l.borrow().iter().cloned().map(|i| (i, i, UintAuthorityId(i).into())).collect()
-		);
+		});
 		BasicExternalities::execute_with_storage(&mut t, || {
 			for (ref k, ..) in &keys {
 				frame_system::Pallet::<Test>::inc_providers(k);
 			}
 		});
 
-		crate::GenesisConfig::<Test>{ keys }.assimilate_storage(&mut t).unwrap();
+		crate::GenesisConfig::<Test> { keys }.assimilate_storage(&mut t).unwrap();
 
 		let mut ext = sp_io::TestExternalities::new(t);
 
@@ -193,13 +193,13 @@ mod tests {
 
 	#[test]
 	fn encode_decode_roundtrip() {
+		use super::super::{super::Config as SessionConfig, Config as HistoricalConfig};
 		use codec::{Decode, Encode};
-		use super::super::super::Config as SessionConfig;
-		use super::super::Config as HistoricalConfig;
 
 		let sample = (
-				22u32 as <Test as SessionConfig>::ValidatorId,
-				7_777_777 as <Test as HistoricalConfig>::FullIdentification);
+			22u32 as <Test as SessionConfig>::ValidatorId,
+			7_777_777 as <Test as HistoricalConfig>::FullIdentification,
+		);
 
 		let encoded = sample.encode();
 		let decoded = Decode::decode(&mut encoded.as_slice()).expect("Must decode");
@@ -210,7 +210,7 @@ mod tests {
 	fn onchain_to_offchain() {
 		let mut ext = new_test_ext();
 
-		const DATA: &[u8] = &[7,8,9,10,11];
+		const DATA: &[u8] = &[7, 8, 9, 10, 11];
 		ext.execute_with(|| {
 			b"alphaomega"[..].using_encoded(|key| sp_io::offchain_index::set(key, DATA));
 		});
@@ -218,15 +218,13 @@ mod tests {
 		ext.persist_offchain_overlay();
 
 		ext.execute_with(|| {
-			let data =
-			b"alphaomega"[..].using_encoded(|key| {
+			let data = b"alphaomega"[..].using_encoded(|key| {
 				sp_io::offchain::local_storage_get(StorageKind::PERSISTENT, key)
 			});
 			assert_eq!(data, Some(DATA.to_vec()));
 		});
 	}
 
-
 	#[test]
 	fn historical_proof_offchain() {
 		let mut ext = new_test_ext();
@@ -251,8 +249,6 @@ mod tests {
 		ext.persist_offchain_overlay();
 
 		ext.execute_with(|| {
-
-
 			System::set_block_number(2);
 			Session::on_initialize(2);
 			assert_eq!(<SessionModule<Test>>::current_index(), 2);
diff --git a/frame/session/src/historical/onchain.rs b/frame/session/src/historical/onchain.rs
index 8fe63a79e1c5..514e343f4e0f 100644
--- a/frame/session/src/historical/onchain.rs
+++ b/frame/session/src/historical/onchain.rs
@@ -20,9 +20,10 @@
 use codec::Encode;
 use sp_runtime::traits::Convert;
 
-use super::super::Config as SessionConfig;
-use super::super::{Pallet as SessionModule, SessionIndex};
-use super::Config as HistoricalConfig;
+use super::{
+	super::{Config as SessionConfig, Pallet as SessionModule, SessionIndex},
+	Config as HistoricalConfig,
+};
 
 use super::shared;
 use sp_std::prelude::*;
diff --git a/frame/session/src/historical/shared.rs b/frame/session/src/historical/shared.rs
index b054854d88fe..e801aa80eef4 100644
--- a/frame/session/src/historical/shared.rs
+++ b/frame/session/src/historical/shared.rs
@@ -18,10 +18,9 @@
 //! Shared logic between on-chain and off-chain components used for slashing using an off-chain
 //! worker.
 
-
 use super::SessionIndex;
-use sp_std::prelude::*;
 use codec::Encode;
+use sp_std::prelude::*;
 
 pub(super) const PREFIX: &[u8] = b"session_historical";
 pub(super) const LAST_PRUNE: &[u8] = b"session_historical_last_prune";
@@ -30,10 +29,11 @@ pub(super) const LAST_PRUNE: &[u8] = b"session_historical_last_prune";
 pub(super) fn derive_key<P: AsRef<[u8]>>(prefix: P, session_index: SessionIndex) -> Vec<u8> {
 	let prefix: &[u8] = prefix.as_ref();
 	session_index.using_encoded(|encoded_session_index| {
-		prefix.into_iter()
+		prefix
+			.into_iter()
 			.chain(b"/".into_iter())
 			.chain(encoded_session_index.into_iter())
 			.copied()
 			.collect::<Vec<u8>>()
 	})
-}
\ No newline at end of file
+}
diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs
index 5095ed015465..cdeceb1ef53d 100644
--- a/frame/session/src/lib.rs
+++ b/frame/session/src/lib.rs
@@ -106,31 +106,37 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
+#[cfg(feature = "historical")]
+pub mod historical;
 #[cfg(test)]
 mod mock;
 #[cfg(test)]
 mod tests;
-#[cfg(feature = "historical")]
-pub mod historical;
 pub mod weights;
 
-use sp_std::{prelude::*, marker::PhantomData, ops::{Sub, Rem}};
 use codec::Decode;
-use sp_runtime::{
-	traits::{AtLeast32BitUnsigned, Convert, Member, One, OpaqueKeys, Zero},
-	KeyTypeId, Perbill, Permill, RuntimeAppPublic,
-};
-use sp_staking::SessionIndex;
 use frame_support::{
-	ensure, decl_module, decl_event, decl_storage, decl_error, ConsensusEngineId, Parameter,
+	decl_error, decl_event, decl_module, decl_storage,
+	dispatch::{self, DispatchError, DispatchResult},
+	ensure,
 	traits::{
-		Get, FindAuthor, ValidatorRegistration, EstimateNextSessionRotation, EstimateNextNewSession,
-		OneSessionHandler, ValidatorSet,
+		EstimateNextNewSession, EstimateNextSessionRotation, FindAuthor, Get, OneSessionHandler,
+		ValidatorRegistration, ValidatorSet,
 	},
-	dispatch::{self, DispatchResult, DispatchError},
 	weights::Weight,
+	ConsensusEngineId, Parameter,
 };
 use frame_system::ensure_signed;
+use sp_runtime::{
+	traits::{AtLeast32BitUnsigned, Convert, Member, One, OpaqueKeys, Zero},
+	KeyTypeId, Perbill, Permill, RuntimeAppPublic,
+};
+use sp_staking::SessionIndex;
+use sp_std::{
+	marker::PhantomData,
+	ops::{Rem, Sub},
+	prelude::*,
+};
 pub use weights::WeightInfo;
 
 /// Decides whether the session should be ended.
@@ -147,10 +153,10 @@ pub trait ShouldEndSession<BlockNumber> {
 pub struct PeriodicSessions<Period, Offset>(PhantomData<(Period, Offset)>);
 
 impl<
-	BlockNumber: Rem<Output = BlockNumber> + Sub<Output = BlockNumber> + Zero + PartialOrd,
-	Period: Get<BlockNumber>,
-	Offset: Get<BlockNumber>,
-> ShouldEndSession<BlockNumber> for PeriodicSessions<Period, Offset>
+		BlockNumber: Rem<Output = BlockNumber> + Sub<Output = BlockNumber> + Zero + PartialOrd,
+		Period: Get<BlockNumber>,
+		Offset: Get<BlockNumber>,
+	> ShouldEndSession<BlockNumber> for PeriodicSessions<Period, Offset>
 {
 	fn should_end_session(now: BlockNumber) -> bool {
 		let offset = Offset::get();
@@ -159,10 +165,10 @@ impl<
 }
 
 impl<
-	BlockNumber: AtLeast32BitUnsigned + Clone,
-	Period: Get<BlockNumber>,
-	Offset: Get<BlockNumber>
-> EstimateNextSessionRotation<BlockNumber> for PeriodicSessions<Period, Offset>
+		BlockNumber: AtLeast32BitUnsigned + Clone,
+		Period: Get<BlockNumber>,
+		Offset: Get<BlockNumber>,
+	> EstimateNextSessionRotation<BlockNumber> for PeriodicSessions<Period, Offset>
 {
 	fn average_session_length() -> BlockNumber {
 		Period::get()
@@ -177,15 +183,9 @@ impl<
 		// (0% is never returned).
 		let progress = if now >= offset {
 			let current = (now - offset) % period.clone() + One::one();
-			Some(Permill::from_rational(
-				current.clone(),
-				period.clone(),
-			))
+			Some(Permill::from_rational(current.clone(), period.clone()))
 		} else {
-			Some(Permill::from_rational(
-				now + One::one(),
-				offset,
-			))
+			Some(Permill::from_rational(now + One::one(), offset))
 		};
 
 		// Weight note: `estimate_current_session_progress` has no storage reads and trivial
@@ -257,7 +257,9 @@ pub trait SessionManager<ValidatorId> {
 }
 
 impl<A> SessionManager<A> for () {
-	fn new_session(_: SessionIndex) -> Option<Vec<A>> { None }
+	fn new_session(_: SessionIndex) -> Option<Vec<A>> {
+		None
+	}
 	fn start_session(_: SessionIndex) {}
 	fn end_session(_: SessionIndex) {}
 }
@@ -591,9 +593,8 @@ impl<T: Config> Module<T> {
 
 		// Get queued session keys and validators.
 		let session_keys = <QueuedKeys<T>>::get();
-		let validators = session_keys.iter()
-			.map(|(validator, _)| validator.clone())
-			.collect::<Vec<_>>();
+		let validators =
+			session_keys.iter().map(|(validator, _)| validator.clone()).collect::<Vec<_>>();
 		<Validators<T>>::put(&validators);
 
 		if changed {
@@ -609,16 +610,15 @@ impl<T: Config> Module<T> {
 
 		// Get next validator set.
 		let maybe_next_validators = T::SessionManager::new_session(session_index + 1);
-		let (next_validators, next_identities_changed)
-			= if let Some(validators) = maybe_next_validators
-		{
-			// NOTE: as per the documentation on `OnSessionEnding`, we consider
-			// the validator set as having changed even if the validators are the
-			// same as before, as underlying economic conditions may have changed.
-			(validators, true)
-		} else {
-			(<Validators<T>>::get(), false)
-		};
+		let (next_validators, next_identities_changed) =
+			if let Some(validators) = maybe_next_validators {
+				// NOTE: as per the documentation on `OnSessionEnding`, we consider
+				// the validator set as having changed even if the validators are the
+				// same as before, as underlying economic conditions may have changed.
+				(validators, true)
+			} else {
+				(<Validators<T>>::get(), false)
+			};
 
 		// Queue next session keys.
 		let (queued_amalgamated, next_changed) = {
@@ -628,7 +628,9 @@ impl<T: Config> Module<T> {
 
 			let mut now_session_keys = session_keys.iter();
 			let mut check_next_changed = |keys: &T::Keys| {
-				if changed { return }
+				if changed {
+					return
+				}
 				// since a new validator set always leads to `changed` starting
 				// as true, we can ensure that `now_session_keys` and `next_validators`
 				// have the same length. this function is called once per iteration.
@@ -639,7 +641,8 @@ impl<T: Config> Module<T> {
 					}
 				}
 			};
-			let queued_amalgamated = next_validators.into_iter()
+			let queued_amalgamated = next_validators
+				.into_iter()
 				.map(|a| {
 					let k = Self::load_keys(&a).unwrap_or_default();
 					check_next_changed(&k);
@@ -657,11 +660,7 @@ impl<T: Config> Module<T> {
 		Self::deposit_event(Event::NewSession(session_index));
 
 		// Tell everyone about the new session keys.
-		T::SessionHandler::on_new_session::<T::Keys>(
-			changed,
-			&session_keys,
-			&queued_amalgamated,
-		);
+		T::SessionHandler::on_new_session::<T::Keys>(changed, &session_keys, &queued_amalgamated);
 	}
 
 	/// Disable the validator of index `i`.
@@ -695,7 +694,11 @@ impl<T: Config> Module<T> {
 	/// session is already disabled.
 	/// If used with the staking module it allows to force a new era in such case.
 	pub fn disable(c: &T::ValidatorId) -> sp_std::result::Result<bool, ()> {
-		Self::validators().iter().position(|i| i == c).map(Self::disable_index).ok_or(())
+		Self::validators()
+			.iter()
+			.position(|i| i == c)
+			.map(Self::disable_index)
+			.ok_or(())
 	}
 
 	/// Upgrade the key type from some old type to a new type. Supports adding
@@ -713,7 +716,8 @@ impl<T: Config> Module<T> {
 	/// it's recommended to initialize the keys to a (unique) dummy value with the expectation
 	/// that all validators should invoke `set_keys` before those keys are actually
 	/// required.
-	pub fn upgrade_keys<Old, F>(upgrade: F) where
+	pub fn upgrade_keys<Old, F>(upgrade: F)
+	where
 		Old: OpaqueKeys + Member + Decode,
 		F: Fn(T::ValidatorId, Old) -> T::Keys,
 	{
@@ -738,13 +742,13 @@ impl<T: Config> Module<T> {
 			Some(new_keys)
 		});
 
-		let _ = <QueuedKeys<T>>::translate::<Vec<(T::ValidatorId, Old)>, _>(
-			|k| {
-				k.map(|k| k.into_iter()
+		let _ = <QueuedKeys<T>>::translate::<Vec<(T::ValidatorId, Old)>, _>(|k| {
+			k.map(|k| {
+				k.into_iter()
 					.map(|(val, old_keys)| (val.clone(), upgrade(val, old_keys)))
-					.collect::<Vec<_>>())
-			}
-		);
+					.collect::<Vec<_>>()
+			})
+		});
 	}
 
 	/// Perform the set_key operation, checking for duplicates. Does not set `Changed`.
@@ -771,7 +775,10 @@ impl<T: Config> Module<T> {
 	///
 	/// This does not ensure that the reference counter in system is incremented appropriately, it
 	/// must be done by the caller or the keys will be leaked in storage.
-	fn inner_set_keys(who: &T::ValidatorId, keys: T::Keys) -> Result<Option<T::Keys>, DispatchError> {
+	fn inner_set_keys(
+		who: &T::ValidatorId,
+		keys: T::Keys,
+	) -> Result<Option<T::Keys>, DispatchError> {
 		let old_keys = Self::load_keys(who);
 
 		for id in T::Keys::key_ids() {
@@ -789,7 +796,7 @@ impl<T: Config> Module<T> {
 
 			if let Some(old) = old_keys.as_ref().map(|k| k.get_raw(*id)) {
 				if key == old {
-					continue;
+					continue
 				}
 
 				Self::clear_key_owner(*id, old);
@@ -864,7 +871,8 @@ impl<T: Config, Inner: FindAuthor<u32>> FindAuthor<T::ValidatorId>
 	for FindAccountFromAuthorIndex<T, Inner>
 {
 	fn find_author<'a, I>(digests: I) -> Option<T::ValidatorId>
-		where I: 'a + IntoIterator<Item=(ConsensusEngineId, &'a [u8])>
+	where
+		I: 'a + IntoIterator<Item = (ConsensusEngineId, &'a [u8])>,
 	{
 		let i = Inner::find_author(digests)?;
 
diff --git a/frame/session/src/mock.rs b/frame/session/src/mock.rs
index 1462b2326777..7007286de641 100644
--- a/frame/session/src/mock.rs
+++ b/frame/session/src/mock.rs
@@ -18,18 +18,19 @@
 //! Mock helpers for Session.
 
 use super::*;
-use std::cell::RefCell;
+use crate as pallet_session;
+#[cfg(feature = "historical")]
+use crate::historical as pallet_session_historical;
 use frame_support::{parameter_types, BasicExternalities};
 use sp_core::{crypto::key_types::DUMMY, H256};
 use sp_runtime::{
-	Perbill, impl_opaque_keys,
-	traits::{BlakeTwo256, IdentityLookup, ConvertInto},
+	impl_opaque_keys,
 	testing::{Header, UintAuthorityId},
+	traits::{BlakeTwo256, ConvertInto, IdentityLookup},
+	Perbill,
 };
 use sp_staking::SessionIndex;
-use crate as pallet_session;
-#[cfg(feature = "historical")]
-use crate::historical as pallet_session_historical;
+use std::cell::RefCell;
 
 impl_opaque_keys! {
 	pub struct MockSessionKeys {
@@ -114,7 +115,12 @@ pub struct TestShouldEndSession;
 impl ShouldEndSession<u64> for TestShouldEndSession {
 	fn should_end_session(now: u64) -> bool {
 		let l = SESSION_LENGTH.with(|l| *l.borrow());
-		now % l == 0 || FORCE_SESSION_END.with(|l| { let r = *l.borrow(); *l.borrow_mut() = false; r })
+		now % l == 0 ||
+			FORCE_SESSION_END.with(|l| {
+				let r = *l.borrow();
+				*l.borrow_mut() = false;
+				r
+			})
 	}
 }
 
@@ -128,11 +134,12 @@ impl SessionHandler<u64> for TestSessionHandler {
 		_queued_validators: &[(u64, T)],
 	) {
 		SESSION_CHANGED.with(|l| *l.borrow_mut() = changed);
-		AUTHORITIES.with(|l|
-			*l.borrow_mut() = validators.iter()
+		AUTHORITIES.with(|l| {
+			*l.borrow_mut() = validators
+				.iter()
 				.map(|(_, id)| id.get::<UintAuthorityId>(DUMMY).unwrap_or_default())
 				.collect()
-		);
+		});
 	}
 	fn on_disabled(_validator_index: usize) {
 		DISABLED.with(|l| *l.borrow_mut() = true)
@@ -167,9 +174,7 @@ impl SessionManager<u64> for TestSessionManager {
 impl crate::historical::SessionManager<u64, u64> for TestSessionManager {
 	fn end_session(_: SessionIndex) {}
 	fn start_session(_: SessionIndex) {}
-	fn new_session(new_index: SessionIndex)
-		-> Option<Vec<(u64, u64)>>
-	{
+	fn new_session(new_index: SessionIndex) -> Option<Vec<(u64, u64)>> {
 		<Self as SessionManager<_>>::new_session(new_index)
 			.map(|vals| vals.into_iter().map(|val| (val, val)).collect())
 	}
@@ -180,11 +185,11 @@ pub fn authorities() -> Vec<UintAuthorityId> {
 }
 
 pub fn force_new_session() {
-	FORCE_SESSION_END.with(|l| *l.borrow_mut() = true )
+	FORCE_SESSION_END.with(|l| *l.borrow_mut() = true)
 }
 
 pub fn set_session_length(x: u64) {
-	SESSION_LENGTH.with(|l| *l.borrow_mut() = x )
+	SESSION_LENGTH.with(|l| *l.borrow_mut() = x)
 }
 
 pub fn session_changed() -> bool {
@@ -205,9 +210,8 @@ pub fn reset_before_session_end_called() {
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-	let keys: Vec<_> = NEXT_VALIDATORS.with(|l|
-		l.borrow().iter().cloned().map(|i| (i, i, UintAuthorityId(i).into())).collect()
-	);
+	let keys: Vec<_> = NEXT_VALIDATORS
+		.with(|l| l.borrow().iter().cloned().map(|i| (i, i, UintAuthorityId(i).into())).collect());
 	BasicExternalities::execute_with_storage(&mut t, || {
 		for (ref k, ..) in &keys {
 			frame_system::Pallet::<Test>::inc_providers(k);
@@ -216,7 +220,9 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 		// An additional identity that we use.
 		frame_system::Pallet::<Test>::inc_providers(&69);
 	});
-	pallet_session::GenesisConfig::<Test> { keys }.assimilate_storage(&mut t).unwrap();
+	pallet_session::GenesisConfig::<Test> { keys }
+		.assimilate_storage(&mut t)
+		.unwrap();
 	sp_io::TestExternalities::new(t)
 }
 
diff --git a/frame/session/src/tests.rs b/frame/session/src/tests.rs
index a551e1a4a261..cb1a21bbd647 100644
--- a/frame/session/src/tests.rs
+++ b/frame/session/src/tests.rs
@@ -18,17 +18,16 @@
 // Tests for the Session Pallet
 
 use super::*;
-use mock::Test;
 use codec::Decode;
-use frame_support::{traits::OnInitialize, assert_ok, assert_noop};
-use sp_core::crypto::key_types::DUMMY;
-use sp_runtime::testing::UintAuthorityId;
+use frame_support::{assert_noop, assert_ok, traits::OnInitialize};
 use mock::{
-	SESSION_CHANGED, TEST_SESSION_CHANGED, authorities, force_new_session,
-	set_next_validators, set_session_length, session_changed, Origin, System, Session,
-	reset_before_session_end_called, before_session_end_called, new_test_ext,
-	PreUpgradeMockSessionKeys,
+	authorities, before_session_end_called, force_new_session, new_test_ext,
+	reset_before_session_end_called, session_changed, set_next_validators, set_session_length,
+	Origin, PreUpgradeMockSessionKeys, Session, System, Test, SESSION_CHANGED,
+	TEST_SESSION_CHANGED,
 };
+use sp_core::crypto::key_types::DUMMY;
+use sp_runtime::testing::UintAuthorityId;
 
 fn initialize_block(block: u64) {
 	SESSION_CHANGED.with(|l| *l.borrow_mut() = false);
@@ -79,10 +78,10 @@ fn authorities_should_track_validators() {
 		set_next_validators(vec![1, 2]);
 		force_new_session();
 		initialize_block(1);
-		assert_eq!(Session::queued_keys(), vec![
-			(1, UintAuthorityId(1).into()),
-			(2, UintAuthorityId(2).into()),
-		]);
+		assert_eq!(
+			Session::queued_keys(),
+			vec![(1, UintAuthorityId(1).into()), (2, UintAuthorityId(2).into()),]
+		);
 		assert_eq!(Session::validators(), vec![1, 2, 3]);
 		assert_eq!(authorities(), vec![UintAuthorityId(1), UintAuthorityId(2), UintAuthorityId(3)]);
 		assert!(before_session_end_called());
@@ -90,10 +89,10 @@ fn authorities_should_track_validators() {
 
 		force_new_session();
 		initialize_block(2);
-		assert_eq!(Session::queued_keys(), vec![
-			(1, UintAuthorityId(1).into()),
-			(2, UintAuthorityId(2).into()),
-		]);
+		assert_eq!(
+			Session::queued_keys(),
+			vec![(1, UintAuthorityId(1).into()), (2, UintAuthorityId(2).into()),]
+		);
 		assert_eq!(Session::validators(), vec![1, 2]);
 		assert_eq!(authorities(), vec![UintAuthorityId(1), UintAuthorityId(2)]);
 		assert!(before_session_end_called());
@@ -103,22 +102,28 @@ fn authorities_should_track_validators() {
 		assert_ok!(Session::set_keys(Origin::signed(4), UintAuthorityId(4).into(), vec![]));
 		force_new_session();
 		initialize_block(3);
-		assert_eq!(Session::queued_keys(), vec![
-			(1, UintAuthorityId(1).into()),
-			(2, UintAuthorityId(2).into()),
-			(4, UintAuthorityId(4).into()),
-		]);
+		assert_eq!(
+			Session::queued_keys(),
+			vec![
+				(1, UintAuthorityId(1).into()),
+				(2, UintAuthorityId(2).into()),
+				(4, UintAuthorityId(4).into()),
+			]
+		);
 		assert_eq!(Session::validators(), vec![1, 2]);
 		assert_eq!(authorities(), vec![UintAuthorityId(1), UintAuthorityId(2)]);
 		assert!(before_session_end_called());
 
 		force_new_session();
 		initialize_block(4);
-		assert_eq!(Session::queued_keys(), vec![
-			(1, UintAuthorityId(1).into()),
-			(2, UintAuthorityId(2).into()),
-			(4, UintAuthorityId(4).into()),
-		]);
+		assert_eq!(
+			Session::queued_keys(),
+			vec![
+				(1, UintAuthorityId(1).into()),
+				(2, UintAuthorityId(2).into()),
+				(4, UintAuthorityId(4).into()),
+			]
+		);
 		assert_eq!(Session::validators(), vec![1, 2, 4]);
 		assert_eq!(authorities(), vec![UintAuthorityId(1), UintAuthorityId(2), UintAuthorityId(4)]);
 	});
@@ -288,10 +293,7 @@ fn periodic_session_works() {
 	// 1/10 of progress.
 	assert!(P::should_end_session(3u64));
 	assert_eq!(P::estimate_next_session_rotation(3u64).0.unwrap(), 3);
-	assert_eq!(
-		P::estimate_current_session_progress(3u64).0.unwrap(),
-		Permill::from_percent(10),
-	);
+	assert_eq!(P::estimate_current_session_progress(3u64).0.unwrap(), Permill::from_percent(10),);
 
 	for i in (1u64..10).map(|i| 3 + i) {
 		assert!(!P::should_end_session(i));
@@ -314,30 +316,22 @@ fn periodic_session_works() {
 	// the new session starts and we proceed in 1/10 increments.
 	assert!(P::should_end_session(13u64));
 	assert_eq!(P::estimate_next_session_rotation(13u64).0.unwrap(), 23);
-	assert_eq!(
-		P::estimate_current_session_progress(13u64).0.unwrap(),
-		Permill::from_percent(10)
-	);
+	assert_eq!(P::estimate_current_session_progress(13u64).0.unwrap(), Permill::from_percent(10));
 
 	assert!(!P::should_end_session(14u64));
 	assert_eq!(P::estimate_next_session_rotation(14u64).0.unwrap(), 23);
-	assert_eq!(
-		P::estimate_current_session_progress(14u64).0.unwrap(),
-		Permill::from_percent(20)
-	);
+	assert_eq!(P::estimate_current_session_progress(14u64).0.unwrap(), Permill::from_percent(20));
 }
 
 #[test]
 fn session_keys_generate_output_works_as_set_keys_input() {
 	new_test_ext().execute_with(|| {
 		let new_keys = mock::MockSessionKeys::generate(None);
-		assert_ok!(
-			Session::set_keys(
-				Origin::signed(2),
-				<mock::Test as Config>::Keys::decode(&mut &new_keys[..]).expect("Decode keys"),
-				vec![],
-			)
-		);
+		assert_ok!(Session::set_keys(
+			Origin::signed(2),
+			<mock::Test as Config>::Keys::decode(&mut &new_keys[..]).expect("Decode keys"),
+			vec![],
+		));
 	});
 }
 
@@ -368,26 +362,13 @@ fn upgrade_keys() {
 	assert_eq!(mock::VALIDATORS.with(|l| l.borrow().clone()), vec![1, 2, 3]);
 
 	new_test_ext().execute_with(|| {
-		let pre_one = PreUpgradeMockSessionKeys {
-			a: [1u8; 32],
-			b: [1u8; 64],
-		};
-
-		let pre_two = PreUpgradeMockSessionKeys {
-			a: [2u8; 32],
-			b: [2u8; 64],
-		};
-
-		let pre_three = PreUpgradeMockSessionKeys {
-			a: [3u8; 32],
-			b: [3u8; 64],
-		};
-
-		let val_keys = vec![
-			(1u64, pre_one),
-			(2u64, pre_two),
-			(3u64, pre_three),
-		];
+		let pre_one = PreUpgradeMockSessionKeys { a: [1u8; 32], b: [1u8; 64] };
+
+		let pre_two = PreUpgradeMockSessionKeys { a: [2u8; 32], b: [2u8; 64] };
+
+		let pre_three = PreUpgradeMockSessionKeys { a: [3u8; 32], b: [3u8; 64] };
+
+		let val_keys = vec![(1u64, pre_one), (2u64, pre_two), (3u64, pre_three)];
 
 		// Set `QueuedKeys`.
 		{
@@ -422,9 +403,7 @@ fn upgrade_keys() {
 
 		// Do the upgrade and check sanity.
 		let mock_keys_for = |val| mock::MockSessionKeys { dummy: UintAuthorityId(val) };
-		Session::upgrade_keys::<PreUpgradeMockSessionKeys, _>(
-			|val, _old_keys| mock_keys_for(val),
-		);
+		Session::upgrade_keys::<PreUpgradeMockSessionKeys, _>(|val, _old_keys| mock_keys_for(val));
 
 		// Check key ownership.
 		for (i, ref keys) in val_keys.iter() {
@@ -438,11 +417,7 @@ fn upgrade_keys() {
 		// Check queued keys.
 		assert_eq!(
 			Session::queued_keys(),
-			vec![
-				(1, mock_keys_for(1)),
-				(2, mock_keys_for(2)),
-				(3, mock_keys_for(3)),
-			],
+			vec![(1, mock_keys_for(1)), (2, mock_keys_for(2)), (3, mock_keys_for(3)),],
 		);
 
 		for i in 1u64..4 {
diff --git a/frame/session/src/weights.rs b/frame/session/src/weights.rs
index ec911d8c01cc..ad722fdec159 100644
--- a/frame/session/src/weights.rs
+++ b/frame/session/src/weights.rs
@@ -36,6 +36,7 @@
 // --template=./.maintain/frame-weight-template.hbs
 
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
diff --git a/frame/society/src/lib.rs b/frame/society/src/lib.rs
index ff6cc0786dcb..ffe2759eb8f3 100644
--- a/frame/society/src/lib.rs
+++ b/frame/society/src/lib.rs
@@ -251,25 +251,37 @@ mod mock;
 #[cfg(test)]
 mod tests;
 
-use rand_chacha::{rand_core::{RngCore, SeedableRng}, ChaChaRng};
-use sp_std::prelude::*;
-use codec::{Encode, Decode};
-use sp_runtime::{Percent, RuntimeDebug,
+use codec::{Decode, Encode};
+use frame_support::{
+	decl_error, decl_event, decl_module, decl_storage,
+	dispatch::DispatchResult,
+	ensure,
 	traits::{
-		StaticLookup, AccountIdConversion, Saturating, Zero, IntegerSquareRoot, Hash,
-		TrailingZeroInput, CheckedSub
-	}
+		BalanceStatus, ChangeMembers, Currency, EnsureOrigin, ExistenceRequirement::AllowDeath,
+		Get, Imbalance, OnUnbalanced, Randomness, ReservableCurrency,
+	},
+	weights::Weight,
+	PalletId,
 };
-use frame_support::{decl_error, decl_module, decl_storage, decl_event, ensure, dispatch::DispatchResult, PalletId};
-use frame_support::weights::Weight;
-use frame_support::traits::{
-	Currency, ReservableCurrency, Randomness, Get, ChangeMembers, BalanceStatus,
-	ExistenceRequirement::AllowDeath, EnsureOrigin, OnUnbalanced, Imbalance
+use frame_system::{self as system, ensure_root, ensure_signed};
+use rand_chacha::{
+	rand_core::{RngCore, SeedableRng},
+	ChaChaRng,
+};
+use sp_runtime::{
+	traits::{
+		AccountIdConversion, CheckedSub, Hash, IntegerSquareRoot, Saturating, StaticLookup,
+		TrailingZeroInput, Zero,
+	},
+	Percent, RuntimeDebug,
 };
-use frame_system::{self as system, ensure_signed, ensure_root};
+use sp_std::prelude::*;
 
-type BalanceOf<T, I> = <<T as Config<I>>::Currency as Currency<<T as system::Config>::AccountId>>::Balance;
-type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
+type BalanceOf<T, I> =
+	<<T as Config<I>>::Currency as Currency<<T as system::Config>::AccountId>>::Balance;
+type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<
+	<T as frame_system::Config>::AccountId,
+>>::NegativeImbalance;
 
 /// The module's configuration trait.
 pub trait Config<I = DefaultInstance>: system::Config {
@@ -370,7 +382,7 @@ pub enum VouchingStatus {
 pub type StrikeCount = u32;
 
 /// A bid for entry into society.
-#[derive(Encode, Decode, Copy, Clone, PartialEq, Eq, RuntimeDebug,)]
+#[derive(Encode, Decode, Copy, Clone, PartialEq, Eq, RuntimeDebug)]
 pub struct Bid<AccountId, Balance> {
 	/// The bidder/candidate trying to enter society
 	who: AccountId,
@@ -1187,7 +1199,6 @@ fn pick_item<'a, R: RngCore, T>(rng: &mut R, items: &'a [T]) -> Option<&'a T> {
 
 /// Pick a new PRN, in the range [0, `max`] (inclusive).
 fn pick_usize<'a, R: RngCore>(rng: &mut R, max: usize) -> usize {
-
 	(rng.next_u32() % (max as u32 + 1)) as usize
 }
 
@@ -1198,7 +1209,7 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 		mut bids: Vec<Bid<T::AccountId, BalanceOf<T, I>>>,
 		who: &T::AccountId,
 		value: BalanceOf<T, I>,
-		bid_kind: BidKind<T::AccountId, BalanceOf<T, I>>
+		bid_kind: BidKind<T::AccountId, BalanceOf<T, I>>,
 	) {
 		const MAX_BID_COUNT: usize = 1000;
 
@@ -1206,7 +1217,8 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 			// Insert new elements after the existing ones. This ensures new bids
 			// with the same bid value are further down the list than existing ones.
 			Ok(pos) => {
-				let different_bid = bids.iter()
+				let different_bid = bids
+					.iter()
 					// Easily extract the index we are on
 					.enumerate()
 					// Skip ahead to the suggested position
@@ -1218,25 +1230,13 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 				// If the element is not at the end of the list, insert the new element
 				// in the spot.
 				if let Some((p, _)) = different_bid {
-					bids.insert(p, Bid {
-						value,
-						who: who.clone(),
-						kind: bid_kind,
-					});
+					bids.insert(p, Bid { value, who: who.clone(), kind: bid_kind });
 				// If the element is at the end of the list, push the element on the end.
 				} else {
-					bids.push(Bid {
-						value,
-						who: who.clone(),
-						kind: bid_kind,
-					});
+					bids.push(Bid { value, who: who.clone(), kind: bid_kind });
 				}
 			},
-			Err(pos) => bids.insert(pos, Bid {
-				value,
-				who: who.clone(),
-				kind: bid_kind,
-			}),
+			Err(pos) => bids.insert(pos, Bid { value, who: who.clone(), kind: bid_kind }),
 		}
 		// Keep it reasonably small.
 		if bids.len() > MAX_BID_COUNT {
@@ -1245,10 +1245,10 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 				BidKind::Deposit(deposit) => {
 					let err_amount = T::Currency::unreserve(&popped, deposit);
 					debug_assert!(err_amount.is_zero());
-				}
+				},
 				BidKind::Vouch(voucher, _) => {
 					<Vouching<T, I>>::remove(&voucher);
-				}
+				},
 			}
 			Self::deposit_event(RawEvent::AutoUnbid(popped));
 		}
@@ -1263,7 +1263,10 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 	}
 
 	/// Check a user is a candidate.
-	fn is_candidate(candidates: &Vec<Bid<T::AccountId, BalanceOf<T, I>>>, who: &T::AccountId) -> bool {
+	fn is_candidate(
+		candidates: &Vec<Bid<T::AccountId, BalanceOf<T, I>>>,
+		who: &T::AccountId,
+	) -> bool {
 		// Looking up a candidate is the same as looking up a bid
 		Self::is_bid(candidates, who)
 	}
@@ -1307,7 +1310,7 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 				T::MembershipChanged::change_members_sorted(&[], &[m.clone()], &members[..]);
 				<Members<T, I>>::put(members);
 				Ok(())
-			}
+			},
 		}
 	}
 
@@ -1333,73 +1336,87 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 			// critical issues or side-effects. This is auto-correcting as members fall out of society.
 			members.reserve(candidates.len());
 
-			let maturity = <system::Pallet<T>>::block_number()
-				+ Self::lock_duration(members.len() as u32);
+			let maturity =
+				<system::Pallet<T>>::block_number() + Self::lock_duration(members.len() as u32);
 
 			let mut rewardees = Vec::new();
 			let mut total_approvals = 0;
 			let mut total_slash = <BalanceOf<T, I>>::zero();
 			let mut total_payouts = <BalanceOf<T, I>>::zero();
 
-			let accepted = candidates.into_iter().filter_map(|Bid {value, who: candidate, kind }| {
-				let mut approval_count = 0;
-
-				// Creates a vector of (vote, member) for the given candidate
-				// and tallies total number of approve votes for that candidate.
-				let votes = members.iter()
-					.filter_map(|m| <Votes<T, I>>::take(&candidate, m).map(|v| (v, m)))
-					.inspect(|&(v, _)| if v == Vote::Approve { approval_count += 1 })
-					.collect::<Vec<_>>();
-
-				// Select one of the votes at random.
-				// Note that `Vote::Skeptical` and `Vote::Reject` both reject the candidate.
-				let is_accepted = pick_item(&mut rng, &votes).map(|x| x.0) == Some(Vote::Approve);
-
-				let matching_vote = if is_accepted { Vote::Approve } else { Vote::Reject };
-
-				let bad_vote = |m: &T::AccountId| {
-					// Voter voted wrong way (or was just a lazy skeptic) then reduce their payout
-					// and increase their strikes. after MaxStrikes then they go into suspension.
-					let amount = Self::slash_payout(m, T::WrongSideDeduction::get());
-
-					let strikes = <Strikes<T, I>>::mutate(m, |s| {
-						*s += 1;
-						*s
-					});
-					if strikes >= T::MaxStrikes::get() {
-						Self::suspend_member(m);
-					}
-					amount
-				};
-
-				// Collect the voters who had a matching vote.
-				rewardees.extend(votes.into_iter()
-					.filter_map(|(v, m)|
-						if v == matching_vote { Some(m) } else {
-							total_slash += bad_vote(m);
-							None
+			let accepted = candidates
+				.into_iter()
+				.filter_map(|Bid { value, who: candidate, kind }| {
+					let mut approval_count = 0;
+
+					// Creates a vector of (vote, member) for the given candidate
+					// and tallies total number of approve votes for that candidate.
+					let votes = members
+						.iter()
+						.filter_map(|m| <Votes<T, I>>::take(&candidate, m).map(|v| (v, m)))
+						.inspect(|&(v, _)| {
+							if v == Vote::Approve {
+								approval_count += 1
+							}
+						})
+						.collect::<Vec<_>>();
+
+					// Select one of the votes at random.
+					// Note that `Vote::Skeptical` and `Vote::Reject` both reject the candidate.
+					let is_accepted =
+						pick_item(&mut rng, &votes).map(|x| x.0) == Some(Vote::Approve);
+
+					let matching_vote = if is_accepted { Vote::Approve } else { Vote::Reject };
+
+					let bad_vote = |m: &T::AccountId| {
+						// Voter voted wrong way (or was just a lazy skeptic) then reduce their payout
+						// and increase their strikes. after MaxStrikes then they go into suspension.
+						let amount = Self::slash_payout(m, T::WrongSideDeduction::get());
+
+						let strikes = <Strikes<T, I>>::mutate(m, |s| {
+							*s += 1;
+							*s
+						});
+						if strikes >= T::MaxStrikes::get() {
+							Self::suspend_member(m);
 						}
-					).cloned()
-				);
+						amount
+					};
+
+					// Collect the voters who had a matching vote.
+					rewardees.extend(
+						votes
+							.into_iter()
+							.filter_map(|(v, m)| {
+								if v == matching_vote {
+									Some(m)
+								} else {
+									total_slash += bad_vote(m);
+									None
+								}
+							})
+							.cloned(),
+					);
 
-				if is_accepted {
-					total_approvals += approval_count;
-					total_payouts += value;
-					members.push(candidate.clone());
+					if is_accepted {
+						total_approvals += approval_count;
+						total_payouts += value;
+						members.push(candidate.clone());
 
-					Self::pay_accepted_candidate(&candidate, value, kind, maturity);
+						Self::pay_accepted_candidate(&candidate, value, kind, maturity);
 
-					// We track here the total_approvals so that every candidate has a unique range
-					// of numbers from 0 to `total_approvals` with length `approval_count` so each
-					// candidate is proportionally represented when selecting a "primary" below.
-					Some((candidate, total_approvals, value))
-				} else {
-					// Suspend Candidate
-					<SuspendedCandidates<T, I>>::insert(&candidate, (value, kind));
-					Self::deposit_event(RawEvent::CandidateSuspended(candidate));
-					None
-				}
-			}).collect::<Vec<_>>();
+						// We track here the total_approvals so that every candidate has a unique range
+						// of numbers from 0 to `total_approvals` with length `approval_count` so each
+						// candidate is proportionally represented when selecting a "primary" below.
+						Some((candidate, total_approvals, value))
+					} else {
+						// Suspend Candidate
+						<SuspendedCandidates<T, I>>::insert(&candidate, (value, kind));
+						Self::deposit_event(RawEvent::CandidateSuspended(candidate));
+						None
+					}
+				})
+				.collect::<Vec<_>>();
 
 			// Clean up all votes.
 			<Votes<T, I>>::remove_all(None);
@@ -1411,7 +1428,12 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 					Self::bump_payout(winner, maturity, total_slash);
 				} else {
 					// Move the slashed amount back from payouts account to local treasury.
-					let res = T::Currency::transfer(&Self::payouts(), &Self::account_id(), total_slash, AllowDeath);
+					let res = T::Currency::transfer(
+						&Self::payouts(),
+						&Self::account_id(),
+						total_slash,
+						AllowDeath,
+					);
 					debug_assert!(res.is_ok());
 				}
 			}
@@ -1423,7 +1445,12 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 
 				// this should never fail since we ensure we can afford the payouts in a previous
 				// block, but there's not much we can do to recover if it fails anyway.
-				let res = T::Currency::transfer(&Self::account_id(), &Self::payouts(), total_payouts, AllowDeath);
+				let res = T::Currency::transfer(
+					&Self::account_id(),
+					&Self::payouts(),
+					total_payouts,
+					AllowDeath,
+				);
 				debug_assert!(res.is_ok());
 			}
 
@@ -1433,10 +1460,15 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 				// Choose a random number between 0 and `total_approvals`
 				let primary_point = pick_usize(&mut rng, total_approvals - 1);
 				// Find the zero bid or the user who falls on that point
-				let primary = accepted.iter().find(|e| e.2.is_zero() || e.1 > primary_point)
-					.expect("e.1 of final item == total_approvals; \
-						worst case find will always return that item; qed")
-					.0.clone();
+				let primary = accepted
+					.iter()
+					.find(|e| e.2.is_zero() || e.1 > primary_point)
+					.expect(
+						"e.1 of final item == total_approvals; \
+						worst case find will always return that item; qed",
+					)
+					.0
+					.clone();
 
 				let accounts = accepted.into_iter().map(|x| x.0).collect::<Vec<_>>();
 
@@ -1464,9 +1496,10 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 		<Candidates<T, I>>::put(&candidates);
 
 		// Select sqrt(n) random members from the society and make them skeptics.
-		let pick_member = |_| pick_item(&mut rng, &members[..]).expect("exited if members empty; qed");
+		let pick_member =
+			|_| pick_item(&mut rng, &members[..]).expect("exited if members empty; qed");
 		for skeptic in (0..members.len().integer_sqrt()).map(pick_member) {
-			for Bid{ who: c, .. } in candidates.iter() {
+			for Bid { who: c, .. } in candidates.iter() {
 				<Votes<T, I>>::insert(c, skeptic, Vote::Skeptic);
 			}
 		}
@@ -1487,7 +1520,7 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 					// whole slash is accounted for.
 					*amount -= rest;
 					rest = Zero::zero();
-					break;
+					break
 				}
 			}
 			<Payouts<T, I>>::insert(who, &payouts[dropped..]);
@@ -1497,10 +1530,12 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 
 	/// Bump the payout amount of `who`, to be unlocked at the given block number.
 	fn bump_payout(who: &T::AccountId, when: T::BlockNumber, value: BalanceOf<T, I>) {
-		if !value.is_zero(){
-			<Payouts<T, I>>::mutate(who, |payouts| match payouts.binary_search_by_key(&when, |x| x.0) {
-				Ok(index) => payouts[index].1 += value,
-				Err(index) => payouts.insert(index, (when, value)),
+		if !value.is_zero() {
+			<Payouts<T, I>>::mutate(who, |payouts| {
+				match payouts.binary_search_by_key(&when, |x| x.0) {
+					Ok(index) => payouts[index].1 += value,
+					Err(index) => payouts.insert(index, (when, value)),
+				}
 			});
 		}
 	}
@@ -1528,7 +1563,7 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 				let err_amount = T::Currency::unreserve(candidate, deposit);
 				debug_assert!(err_amount.is_zero());
 				value
-			}
+			},
 			BidKind::Vouch(voucher, tip) => {
 				// Check that the voucher is still vouching, else some other logic may have removed their status.
 				if <Vouching<T, I>>::take(&voucher) == Some(VouchingStatus::Vouching) {
@@ -1539,7 +1574,7 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 				} else {
 					value
 				}
-			}
+			},
 		};
 
 		Self::bump_payout(candidate, maturity, value);
@@ -1554,14 +1589,12 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 				let mut approval_count = 0;
 				let mut rejection_count = 0;
 				// Tallies total number of approve and reject votes for the defender.
-				members.iter()
-					.filter_map(|m| <DefenderVotes<T, I>>::take(m))
-					.for_each(|v| {
-						match v {
-							Vote::Approve => approval_count += 1,
-							_ => rejection_count += 1,
-						}
-					});
+				members.iter().filter_map(|m| <DefenderVotes<T, I>>::take(m)).for_each(
+					|v| match v {
+						Vote::Approve => approval_count += 1,
+						_ => rejection_count += 1,
+					},
+				);
 
 				if approval_count <= rejection_count {
 					// User has failed the challenge
diff --git a/frame/society/src/mock.rs b/frame/society/src/mock.rs
index 18cdda678da6..2ae9f7b44ba7 100644
--- a/frame/society/src/mock.rs
+++ b/frame/society/src/mock.rs
@@ -21,16 +21,16 @@ use super::*;
 use crate as pallet_society;
 
 use frame_support::{
-	parameter_types, ord_parameter_types,
-	traits::{OnInitialize, OnFinalize},
+	ord_parameter_types, parameter_types,
+	traits::{OnFinalize, OnInitialize},
 };
 use frame_support_test::TestRandomness;
+use frame_system::EnsureSignedBy;
 use sp_core::H256;
 use sp_runtime::{
 	testing::Header,
 	traits::{BlakeTwo256, IdentityLookup},
 };
-use frame_system::EnsureSignedBy;
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -156,14 +156,16 @@ impl EnvBuilder {
 	pub fn execute<R, F: FnOnce() -> R>(mut self, f: F) -> R {
 		let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
 		self.balances.push((Society::account_id(), self.balance.max(self.pot)));
-		pallet_balances::GenesisConfig::<Test> {
-			balances: self.balances,
-		}.assimilate_storage(&mut t).unwrap();
-		pallet_society::GenesisConfig::<Test>{
+		pallet_balances::GenesisConfig::<Test> { balances: self.balances }
+			.assimilate_storage(&mut t)
+			.unwrap();
+		pallet_society::GenesisConfig::<Test> {
 			members: self.members,
 			pot: self.pot,
 			max_members: self.max_members,
-		}.assimilate_storage(&mut t).unwrap();
+		}
+		.assimilate_storage(&mut t)
+		.unwrap();
 		let mut ext: sp_io::TestExternalities = t.into();
 		ext.execute_with(f)
 	}
@@ -210,12 +212,7 @@ pub fn run_to_block(n: u64) {
 pub fn create_bid<AccountId, Balance>(
 	value: Balance,
 	who: AccountId,
-	kind: BidKind<AccountId, Balance>
-) -> Bid<AccountId, Balance>
-{
-	Bid {
-		who,
-		kind,
-		value
-	}
+	kind: BidKind<AccountId, Balance>,
+) -> Bid<AccountId, Balance> {
+	Bid { who, kind, value }
 }
diff --git a/frame/society/src/tests.rs b/frame/society/src/tests.rs
index 7c8344839577..9f8e32dea508 100644
--- a/frame/society/src/tests.rs
+++ b/frame/society/src/tests.rs
@@ -20,9 +20,9 @@
 use super::*;
 use mock::*;
 
-use frame_support::{assert_ok, assert_noop};
-use sp_runtime::traits::BadOrigin;
+use frame_support::{assert_noop, assert_ok};
 use sp_core::blake2_256;
+use sp_runtime::traits::BadOrigin;
 
 #[test]
 fn founding_works() {
@@ -118,10 +118,13 @@ fn bidding_works() {
 		assert_eq!(Society::pot(), 1000);
 		assert_eq!(Balances::free_balance(Society::account_id()), 10_000);
 		// Choose smallest bidding users whose total is less than pot
-		assert_eq!(Society::candidates(), vec![
-			create_bid(300, 30, BidKind::Deposit(25)),
-			create_bid(400, 40, BidKind::Deposit(25)),
-		]);
+		assert_eq!(
+			Society::candidates(),
+			vec![
+				create_bid(300, 30, BidKind::Deposit(25)),
+				create_bid(400, 40, BidKind::Deposit(25)),
+			]
+		);
 		// A member votes for these candidates to join the society
 		assert_ok!(Society::vote(Origin::signed(10), 30, true));
 		assert_ok!(Society::vote(Origin::signed(10), 40, true));
@@ -132,7 +135,7 @@ fn bidding_works() {
 		assert_eq!(Balances::free_balance(Society::account_id()), 9_300);
 		assert_eq!(Society::pot(), 1_300);
 		// Left over from the original bids is 50 who satisfies the condition of bid less than pot.
-		assert_eq!(Society::candidates(), vec![ create_bid(500, 50, BidKind::Deposit(25)) ]);
+		assert_eq!(Society::candidates(), vec![create_bid(500, 50, BidKind::Deposit(25))]);
 		// 40, now a member, can vote for 50
 		assert_ok!(Society::vote(Origin::signed(40), 50, true));
 		run_to_block(12);
@@ -144,7 +147,7 @@ fn bidding_works() {
 		// No more candidates satisfy the requirements
 		assert_eq!(Society::candidates(), vec![]);
 		assert_ok!(Society::defender_vote(Origin::signed(10), true)); // Keep defender around
-		// Next period
+															  // Next period
 		run_to_block(16);
 		// Same members
 		assert_eq!(Society::members(), vec![10, 30, 40, 50]);
@@ -153,7 +156,7 @@ fn bidding_works() {
 		// No payouts
 		assert_eq!(Balances::free_balance(Society::account_id()), 8_800);
 		// Candidate 60 now qualifies based on the increased pot size.
-		assert_eq!(Society::candidates(), vec![ create_bid(1900, 60, BidKind::Deposit(25)) ]);
+		assert_eq!(Society::candidates(), vec![create_bid(1900, 60, BidKind::Deposit(25))]);
 		// Candidate 60 is voted in.
 		assert_ok!(Society::vote(Origin::signed(50), 60, true));
 		run_to_block(20);
@@ -183,7 +186,7 @@ fn unbidding_works() {
 		assert_eq!(Balances::reserved_balance(30), 0);
 		// 20 wins candidacy
 		run_to_block(4);
-		assert_eq!(Society::candidates(), vec![ create_bid(1000, 20, BidKind::Deposit(25)) ]);
+		assert_eq!(Society::candidates(), vec![create_bid(1000, 20, BidKind::Deposit(25))]);
 	});
 }
 
@@ -350,7 +353,10 @@ fn suspended_candidate_rejected_works() {
 		assert_eq!(Society::suspended_candidate(20).is_some(), true);
 
 		// Normal user cannot make judgement on suspended candidate
-		assert_noop!(Society::judge_suspended_candidate(Origin::signed(20), 20, Judgement::Approve), BadOrigin);
+		assert_noop!(
+			Society::judge_suspended_candidate(Origin::signed(20), 20, Judgement::Approve),
+			BadOrigin
+		);
 
 		// Suspension judgement origin makes no direct judgement
 		assert_ok!(Society::judge_suspended_candidate(Origin::signed(2), 20, Judgement::Rebid));
@@ -391,7 +397,10 @@ fn vouch_works() {
 		assert_ok!(Society::vouch(Origin::signed(10), 20, 1000, 100));
 		assert_eq!(<Vouching<Test>>::get(10), Some(VouchingStatus::Vouching));
 		// A member cannot vouch twice at the same time
-		assert_noop!(Society::vouch(Origin::signed(10), 30, 100, 0), Error::<Test, _>::AlreadyVouching);
+		assert_noop!(
+			Society::vouch(Origin::signed(10), 30, 100, 0),
+			Error::<Test, _>::AlreadyVouching
+		);
 		// Vouching creates the right kind of bid
 		assert_eq!(<Bids<Test>>::get(), vec![create_bid(1000, 20, BidKind::Vouch(10, 100))]);
 		// Vouched user can become candidate
@@ -475,7 +484,10 @@ fn unvouch_works() {
 		assert_eq!(Society::members(), vec![10]);
 
 		// 10 cannot vouch again
-		assert_noop!(Society::vouch(Origin::signed(10), 30, 100, 0), Error::<Test, _>::AlreadyVouching);
+		assert_noop!(
+			Society::vouch(Origin::signed(10), 30, 100, 0),
+			Error::<Test, _>::AlreadyVouching
+		);
 		// 10 cannot unvouch either, so they are banned forever.
 		assert_noop!(Society::unvouch(Origin::signed(10), 0), Error::<Test, _>::NotVouching);
 	});
@@ -654,7 +666,7 @@ fn bad_vote_slash_works() {
 		assert_eq!(<Strikes<Test>>::get(30), 0);
 		assert_eq!(<Strikes<Test>>::get(40), 0);
 		// Their payout is slashed, a random person is rewarded
-		assert_eq!(<Payouts<Test>>::get(10), vec![(5, 100), (9,2)]);
+		assert_eq!(<Payouts<Test>>::get(10), vec![(5, 100), (9, 2)]);
 		assert_eq!(<Payouts<Test>>::get(20), vec![(5, 98)]);
 		assert_eq!(<Payouts<Test>>::get(30), vec![(5, 100)]);
 		assert_eq!(<Payouts<Test>>::get(40), vec![(5, 100)]);
@@ -672,7 +684,10 @@ fn user_cannot_bid_twice() {
 		assert_noop!(Society::bid(Origin::signed(30), 100), Error::<Test, _>::AlreadyBid);
 		// Cannot vouch when already bid
 		assert_ok!(Society::add_member(&50));
-		assert_noop!(Society::vouch(Origin::signed(50), 20, 100, 100), Error::<Test, _>::AlreadyBid);
+		assert_noop!(
+			Society::vouch(Origin::signed(50), 20, 100, 100),
+			Error::<Test, _>::AlreadyBid
+		);
 	});
 }
 
@@ -794,7 +809,11 @@ fn max_limits_work() {
 		assert_eq!(Society::candidates().len(), 4);
 		// Fill up members with suspended candidates from the first rotation
 		for i in 100..104 {
-			assert_ok!(Society::judge_suspended_candidate(Origin::signed(2), i, Judgement::Approve));
+			assert_ok!(Society::judge_suspended_candidate(
+				Origin::signed(2),
+				i,
+				Judgement::Approve
+			));
 		}
 		assert_eq!(Society::members().len(), 100);
 		// Can't add any more members
@@ -840,15 +859,18 @@ fn zero_bid_works() {
 		assert_eq!(Society::pot(), 1000);
 		assert_eq!(Balances::free_balance(Society::account_id()), 10_000);
 		// Choose smallest bidding users whose total is less than pot, with only one zero bid.
-		assert_eq!(Society::candidates(), vec![
-			create_bid(0, 30, BidKind::Deposit(25)),
-			create_bid(300, 50, BidKind::Deposit(25)),
-			create_bid(400, 60, BidKind::Deposit(25)),
-		]);
-		assert_eq!(<Bids<Test>>::get(), vec![
-			create_bid(0, 20, BidKind::Deposit(25)),
-			create_bid(0, 40, BidKind::Deposit(25)),
-		]);
+		assert_eq!(
+			Society::candidates(),
+			vec![
+				create_bid(0, 30, BidKind::Deposit(25)),
+				create_bid(300, 50, BidKind::Deposit(25)),
+				create_bid(400, 60, BidKind::Deposit(25)),
+			]
+		);
+		assert_eq!(
+			<Bids<Test>>::get(),
+			vec![create_bid(0, 20, BidKind::Deposit(25)), create_bid(0, 40, BidKind::Deposit(25)),]
+		);
 		// A member votes for these candidates to join the society
 		assert_ok!(Society::vote(Origin::signed(10), 30, true));
 		assert_ok!(Society::vote(Origin::signed(10), 50, true));
@@ -878,7 +900,7 @@ fn bids_ordered_correctly() {
 
 		for j in 0..5 {
 			for i in 0..5 {
-				final_list.push(create_bid(j, 100 + (i * 5 + j) as u128,  BidKind::Deposit(25)));
+				final_list.push(create_bid(j, 100 + (i * 5 + j) as u128, BidKind::Deposit(25)));
 			}
 		}
 
diff --git a/frame/staking/reward-curve/src/lib.rs b/frame/staking/reward-curve/src/lib.rs
index de912eee99ce..c225c9045783 100644
--- a/frame/staking/reward-curve/src/lib.rs
+++ b/frame/staking/reward-curve/src/lib.rs
@@ -21,7 +21,7 @@ mod log;
 
 use log::log2;
 use proc_macro::TokenStream;
-use proc_macro2::{TokenStream as TokenStream2, Span};
+use proc_macro2::{Span, TokenStream as TokenStream2};
 use proc_macro_crate::{crate_name, FoundCrate};
 use quote::{quote, ToTokens};
 use std::convert::TryInto;
@@ -82,7 +82,9 @@ pub fn build(input: TokenStream) -> TokenStream {
 	let test_module = generate_test_module(&input);
 
 	let imports = match crate_name("sp-runtime") {
-		Ok(FoundCrate::Itself) => quote!( extern crate sp_runtime as _sp_runtime; ),
+		Ok(FoundCrate::Itself) => quote!(
+			extern crate sp_runtime as _sp_runtime;
+		),
 		Ok(FoundCrate::Name(sp_runtime)) => {
 			let ident = syn::Ident::new(&sp_runtime, Span::call_site());
 			quote!( extern crate #ident as _sp_runtime; )
@@ -99,7 +101,8 @@ pub fn build(input: TokenStream) -> TokenStream {
 			#declaration
 		};
 		#test_module
-	).into()
+	)
+	.into()
 }
 
 const MILLION: u32 = 1_000_000;
@@ -134,10 +137,10 @@ struct Bounds {
 
 impl Bounds {
 	fn check(&self, value: u32) -> bool {
-		let wrong = (self.min_strict && value <= self.min)
-			|| (!self.min_strict && value < self.min)
-			|| (self.max_strict && value >= self.max)
-			|| (!self.max_strict && value > self.max);
+		let wrong = (self.min_strict && value <= self.min) ||
+			(!self.min_strict && value < self.min) ||
+			(self.max_strict && value >= self.max) ||
+			(!self.max_strict && value > self.max);
 
 		!wrong
 	}
@@ -156,17 +159,24 @@ impl core::fmt::Display for Bounds {
 	}
 }
 
-fn parse_field<Token: Parse + Default + ToTokens>(input: ParseStream, bounds: Bounds)
-	-> syn::Result<u32>
-{
+fn parse_field<Token: Parse + Default + ToTokens>(
+	input: ParseStream,
+	bounds: Bounds,
+) -> syn::Result<u32> {
 	<Token>::parse(&input)?;
 	<syn::Token![:]>::parse(&input)?;
 	let value_lit = syn::LitInt::parse(&input)?;
 	let value: u32 = value_lit.base10_parse()?;
 	if !bounds.check(value) {
-		return Err(syn::Error::new(value_lit.span(), format!(
-			"Invalid {}: {},  must be in {}", Token::default().to_token_stream(), value, bounds,
-		)));
+		return Err(syn::Error::new(
+			value_lit.span(),
+			format!(
+				"Invalid {}: {},  must be in {}",
+				Token::default().to_token_stream(),
+				value,
+				bounds,
+			),
+		))
 	}
 
 	Ok(value)
@@ -187,54 +197,42 @@ impl Parse for INposInput {
 		<syn::Token![;]>::parse(&input)?;
 
 		if !input.is_empty() {
-			return Err(input.error("expected end of input stream, no token expected"));
+			return Err(input.error("expected end of input stream, no token expected"))
 		}
 
-		let min_inflation = parse_field::<keyword::min_inflation>(&args_input, Bounds {
-			min: 0,
-			min_strict: true,
-			max: 1_000_000,
-			max_strict: false,
-		})?;
+		let min_inflation = parse_field::<keyword::min_inflation>(
+			&args_input,
+			Bounds { min: 0, min_strict: true, max: 1_000_000, max_strict: false },
+		)?;
 		<syn::Token![,]>::parse(&args_input)?;
-		let max_inflation = parse_field::<keyword::max_inflation>(&args_input, Bounds {
-			min: min_inflation,
-			min_strict: true,
-			max: 1_000_000,
-			max_strict: false,
-		})?;
+		let max_inflation = parse_field::<keyword::max_inflation>(
+			&args_input,
+			Bounds { min: min_inflation, min_strict: true, max: 1_000_000, max_strict: false },
+		)?;
 		<syn::Token![,]>::parse(&args_input)?;
-		let ideal_stake = parse_field::<keyword::ideal_stake>(&args_input, Bounds {
-			min: 0_100_000,
-			min_strict: false,
-			max: 0_900_000,
-			max_strict: false,
-		})?;
+		let ideal_stake = parse_field::<keyword::ideal_stake>(
+			&args_input,
+			Bounds { min: 0_100_000, min_strict: false, max: 0_900_000, max_strict: false },
+		)?;
 		<syn::Token![,]>::parse(&args_input)?;
-		let falloff = parse_field::<keyword::falloff>(&args_input, Bounds {
-			min: 0_010_000,
-			min_strict: false,
-			max: 1_000_000,
-			max_strict: false,
-		})?;
+		let falloff = parse_field::<keyword::falloff>(
+			&args_input,
+			Bounds { min: 0_010_000, min_strict: false, max: 1_000_000, max_strict: false },
+		)?;
 		<syn::Token![,]>::parse(&args_input)?;
-		let max_piece_count = parse_field::<keyword::max_piece_count>(&args_input, Bounds {
-			min: 2,
-			min_strict: false,
-			max: 1_000,
-			max_strict: false,
-		})?;
+		let max_piece_count = parse_field::<keyword::max_piece_count>(
+			&args_input,
+			Bounds { min: 2, min_strict: false, max: 1_000, max_strict: false },
+		)?;
 		<syn::Token![,]>::parse(&args_input)?;
-		let test_precision = parse_field::<keyword::test_precision>(&args_input, Bounds {
-			min: 0,
-			min_strict: false,
-			max: 1_000_000,
-			max_strict: false,
-		})?;
+		let test_precision = parse_field::<keyword::test_precision>(
+			&args_input,
+			Bounds { min: 0, min_strict: false, max: 1_000_000, max_strict: false },
+		)?;
 		<Option<syn::Token![,]>>::parse(&args_input)?;
 
 		if !args_input.is_empty() {
-			return Err(args_input.error("expected end of input stream, no token expected"));
+			return Err(args_input.error("expected end of input stream, no token expected"))
 		}
 
 		Ok(Self {
@@ -263,7 +261,8 @@ impl INPoS {
 		INPoS {
 			i_0: input.min_inflation,
 			i_ideal: (input.max_inflation as u64 * MILLION as u64 / input.ideal_stake as u64)
-				.try_into().unwrap(),
+				.try_into()
+				.unwrap(),
 			i_ideal_times_x_ideal: input.max_inflation,
 			x_ideal: input.ideal_stake,
 			d: input.falloff,
@@ -275,7 +274,7 @@ impl INPoS {
 	// See web3 docs for the details
 	fn compute_opposite_after_x_ideal(&self, y: u32) -> u32 {
 		if y == self.i_0 {
-			return u32::MAX;
+			return u32::MAX
 		}
 		// Note: the log term calculated here represents a per_million value
 		let log = log2(self.i_ideal_times_x_ideal - self.i_0, y - self.i_0);
@@ -295,8 +294,8 @@ fn compute_points(input: &INposInput) -> Vec<(u32, u32)> {
 
 	// For each point p: (next_p.0 - p.0) < segment_length && (next_p.1 - p.1) < segment_length.
 	// This ensures that the total number of segment doesn't overflow max_piece_count.
-	let max_length = (input.max_inflation - input.min_inflation + 1_000_000 - inpos.x_ideal)
-		/ (input.max_piece_count - 1);
+	let max_length = (input.max_inflation - input.min_inflation + 1_000_000 - inpos.x_ideal) /
+		(input.max_piece_count - 1);
 
 	let mut delta_y = max_length;
 	let mut y = input.max_inflation;
@@ -322,16 +321,15 @@ fn compute_points(input: &INposInput) -> Vec<(u32, u32)> {
 			let prev = points.last().unwrap();
 			// Compute the y corresponding to x=1_000_000 using the this point and the previous one.
 
-			let delta_y: u32 = (
-				(next_x - 1_000_000) as u64
-				* (prev.1 - next_y) as u64
-				/ (next_x - prev.0) as u64
-			).try_into().unwrap();
+			let delta_y: u32 = ((next_x - 1_000_000) as u64 * (prev.1 - next_y) as u64 /
+				(next_x - prev.0) as u64)
+				.try_into()
+				.unwrap();
 
 			let y = next_y + delta_y;
 
 			points.push((1_000_000, y));
-			return points;
+			return points
 		}
 		points.push((next_x, next_y));
 		y = next_y;
@@ -345,7 +343,8 @@ fn compute_points(input: &INposInput) -> Vec<(u32, u32)> {
 fn generate_piecewise_linear(points: Vec<(u32, u32)>) -> TokenStream2 {
 	let mut points_tokens = quote!();
 
-	let max = points.iter()
+	let max = points
+		.iter()
 		.map(|&(_, x)| x)
 		.max()
 		.unwrap_or(0)
@@ -354,13 +353,15 @@ fn generate_piecewise_linear(points: Vec<(u32, u32)>) -> TokenStream2 {
 		.unwrap_or(1_000_000_000);
 
 	for (x, y) in points {
-		let error = || panic!(
-			"Generated reward curve approximation doesn't fit into [0, 1] -> [0, 1] \
+		let error = || {
+			panic!(
+				"Generated reward curve approximation doesn't fit into [0, 1] -> [0, 1] \
 			because of point:
 			x = {:07} per million
 			y = {:07} per million",
-			x, y
-		);
+				x, y
+			)
+		};
 
 		let x_perbill = x.checked_mul(1_000).unwrap_or_else(error);
 		let y_perbill = y.checked_mul(1_000).unwrap_or_else(error);
@@ -386,7 +387,7 @@ fn generate_test_module(input: &INposInput) -> TokenStream2 {
 
 	let ident = &input.ident;
 	let precision = input.test_precision;
-	let i_0 = inpos.i_0 as f64/ MILLION as f64;
+	let i_0 = inpos.i_0 as f64 / MILLION as f64;
 	let i_ideal_times_x_ideal = inpos.i_ideal_times_x_ideal as f64 / MILLION as f64;
 	let i_ideal = inpos.i_ideal as f64 / MILLION as f64;
 	let x_ideal = inpos.x_ideal as f64 / MILLION as f64;
@@ -443,5 +444,6 @@ fn generate_test_module(input: &INposInput) -> TokenStream2 {
 				);
 			}
 		}
-	).into()
+	)
+	.into()
 }
diff --git a/frame/staking/reward-curve/src/log.rs b/frame/staking/reward-curve/src/log.rs
index 747011a73e1d..06d2000619b5 100644
--- a/frame/staking/reward-curve/src/log.rs
+++ b/frame/staking/reward-curve/src/log.rs
@@ -4,7 +4,7 @@ use std::convert::TryInto;
 macro_rules! pow2 {
 	($n:expr) => {
 		1_u32 << $n
-	}
+	};
 }
 
 /// Returns the k_th per_million taylor term for a log2 function
@@ -33,7 +33,7 @@ fn taylor_term(k: u32, y_num: u128, y_den: u128) -> u32 {
 /// * result represents a per-million output of log2
 pub fn log2(p: u32, q: u32) -> u32 {
 	assert!(p >= q); // keep p/q bound to [1, inf)
-	assert!(p <= u32::MAX/2);
+	assert!(p <= u32::MAX / 2);
 
 	// This restriction should not be mandatory. But function is only tested and used for this.
 	assert!(p <= 1_000_000);
@@ -79,7 +79,7 @@ fn test_log() {
 			let p: u32 = (1_000_000 as u64 * p as u64 / div as u64).try_into().unwrap();
 			let q: u32 = (1_000_000 as u64 * q as u64 / div as u64).try_into().unwrap();
 
-			let res = - (log2(p, q) as i64);
+			let res = -(log2(p, q) as i64);
 			let expected = ((q as f64 / p as f64).log(2.0) * 1_000_000 as f64).round() as i64;
 			assert!((res - expected).abs() <= 6);
 		}
@@ -124,4 +124,4 @@ fn test_log_of_largest_input() {
 	let expected = 19_931_568;
 	let tolerance = 100;
 	assert!((log2(p, q) as i32 - expected as i32).abs() < tolerance);
-}
\ No newline at end of file
+}
diff --git a/frame/staking/reward-fn/src/lib.rs b/frame/staking/reward-fn/src/lib.rs
index 205f0207673a..3f91c39b4055 100644
--- a/frame/staking/reward-fn/src/lib.rs
+++ b/frame/staking/reward-fn/src/lib.rs
@@ -19,8 +19,12 @@
 
 //! Useful function for inflation for nominated proof of stake.
 
-use sp_arithmetic::{Perquintill, PerThing, biguint::BigUint, traits::{Zero, SaturatedConversion}};
 use core::convert::TryFrom;
+use sp_arithmetic::{
+	biguint::BigUint,
+	traits::{SaturatedConversion, Zero},
+	PerThing, Perquintill,
+};
 
 /// Compute yearly inflation using function
 ///
@@ -54,11 +58,7 @@ use core::convert::TryFrom;
 ///   the global incentivization to get the `ideal_stake`. A higher number results in less typical
 ///   inflation at the cost of greater volatility for validators.
 ///   Must be more than 0.01.
-pub fn compute_inflation<P: PerThing>(
-	stake: P,
-	ideal_stake: P,
-	falloff: P,
-) -> P {
+pub fn compute_inflation<P: PerThing>(stake: P, ideal_stake: P, falloff: P) -> P {
 	if stake < ideal_stake {
 		// ideal_stake is more than 0 because it is strictly more than stake
 		return stake / ideal_stake
@@ -98,9 +98,7 @@ pub fn compute_inflation<P: PerThing>(
 	let res = compute_taylor_serie_part(&inpos_param);
 
 	match u128::try_from(res.clone()) {
-		Ok(res) if res <= Into::<u128>::into(P::ACCURACY) => {
-			P::from_parts(res.saturated_into())
-		},
+		Ok(res) if res <= Into::<u128>::into(P::ACCURACY) => P::from_parts(res.saturated_into()),
 		// If result is beyond bounds there is nothing we can do
 		_ => {
 			log::error!("Invalid inflation computation: unexpected result {:?}", res);
@@ -109,7 +107,6 @@ pub fn compute_inflation<P: PerThing>(
 	}
 }
 
-
 /// Internal struct holding parameter info alongside other cached value.
 ///
 /// All expressed in part from `accuracy`
@@ -149,12 +146,15 @@ fn compute_taylor_serie_part(p: &INPoSParam) -> BigUint {
 			taylor_sum = taylor_sum.add(&last_taylor_term);
 		} else {
 			if taylor_sum >= last_taylor_term {
-				taylor_sum = taylor_sum.sub(&last_taylor_term)
+				taylor_sum = taylor_sum
+					.sub(&last_taylor_term)
 					// NOTE: Should never happen as checked above
 					.unwrap_or_else(|e| e);
 			} else {
 				taylor_sum_positive = !taylor_sum_positive;
-				taylor_sum = last_taylor_term.clone().sub(&taylor_sum)
+				taylor_sum = last_taylor_term
+					.clone()
+					.sub(&taylor_sum)
 					// NOTE: Should never happen as checked above
 					.unwrap_or_else(|e| e);
 			}
@@ -180,14 +180,13 @@ fn compute_taylor_serie_part(p: &INPoSParam) -> BigUint {
 ///
 /// `previous_taylor_term` and result are expressed with accuracy `INPoSParam.accuracy`
 fn compute_taylor_term(k: u32, previous_taylor_term: &BigUint, p: &INPoSParam) -> BigUint {
-	let x_minus_x_ideal = p.x.clone().sub(&p.x_ideal)
-		// NOTE: Should never happen, as x must be more than x_ideal
-		.unwrap_or_else(|_| BigUint::zero());
+	let x_minus_x_ideal =
+		p.x.clone()
+			.sub(&p.x_ideal)
+			// NOTE: Should never happen, as x must be more than x_ideal
+			.unwrap_or_else(|_| BigUint::zero());
 
-	let res = previous_taylor_term.clone()
-		.mul(&x_minus_x_ideal)
-		.mul(&p.ln2_div_d)
-		.div_unit(k);
+	let res = previous_taylor_term.clone().mul(&x_minus_x_ideal).mul(&p.ln2_div_d).div_unit(k);
 
 	// p.accuracy is stripped by definition.
 	let res = div_by_stripped(res, &p.accuracy);
@@ -230,7 +229,5 @@ fn div_by_stripped(mut a: BigUint, b: &BigUint) -> BigUint {
 			.div_unit(100_000)
 	}
 
-	a.div(b, false)
-		.map(|res| res.0)
-		.unwrap_or_else(|| BigUint::zero())
+	a.div(b, false).map(|res| res.0).unwrap_or_else(|| BigUint::zero())
 }
diff --git a/frame/staking/reward-fn/tests/test.rs b/frame/staking/reward-fn/tests/test.rs
index 32daf9d09a76..dc5b661c4098 100644
--- a/frame/staking/reward-fn/tests/test.rs
+++ b/frame/staking/reward-fn/tests/test.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use sp_arithmetic::{PerThing, Perbill, PerU16, Percent, Perquintill};
+use sp_arithmetic::{PerThing, PerU16, Perbill, Percent, Perquintill};
 
 /// This test the precision and panics if error too big error.
 ///
@@ -32,7 +32,7 @@ fn test_precision<P: PerThing>(stake: P, ideal_stake: P, falloff: P) {
 	if error > 8f64 / accuracy_f64 && error > 8.0 * f64::EPSILON {
 		panic!(
 			"stake: {:?}, ideal_stake: {:?}, falloff: {:?}, res: {}, expect: {}",
-			stake, ideal_stake, falloff, res , expect
+			stake, ideal_stake, falloff, res, expect
 		);
 	}
 }
diff --git a/frame/staking/src/benchmarking.rs b/frame/staking/src/benchmarking.rs
index ff7be272eec8..15a20dfb937c 100644
--- a/frame/staking/src/benchmarking.rs
+++ b/frame/staking/src/benchmarking.rs
@@ -21,11 +21,11 @@ use super::*;
 use crate::Pallet as Staking;
 use testing_utils::*;
 
-use sp_runtime::traits::One;
-use frame_system::RawOrigin;
 pub use frame_benchmarking::{
-	benchmarks, account, whitelisted_caller, whitelist_account, impl_benchmark_test_suite,
+	account, benchmarks, impl_benchmark_test_suite, whitelist_account, whitelisted_caller,
 };
+use frame_system::RawOrigin;
+use sp_runtime::traits::One;
 
 const SEED: u32 = 0;
 const MAX_SPANS: u32 = 100;
@@ -36,13 +36,15 @@ const MAX_SLASHES: u32 = 1000;
 // Add slashing spans to a user account. Not relevant for actual use, only to benchmark
 // read and write operations.
 fn add_slashing_spans<T: Config>(who: &T::AccountId, spans: u32) {
-	if spans == 0 { return }
+	if spans == 0 {
+		return
+	}
 
 	// For the first slashing span, we initialize
 	let mut slashing_spans = crate::slashing::SlashingSpans::new(0);
 	SpanSlash::<T>::insert((who, 0), crate::slashing::SpanRecord::default());
 
-	for i in 1 .. spans {
+	for i in 1..spans {
 		assert!(slashing_spans.end_span(i));
 		SpanSlash::<T>::insert((who, i), crate::slashing::SpanRecord::default());
 	}
@@ -56,7 +58,7 @@ pub fn create_validator_with_nominators<T: Config>(
 	n: u32,
 	upper_bound: u32,
 	dead: bool,
-	destination: RewardDestination<T::AccountId>
+	destination: RewardDestination<T::AccountId>,
 ) -> Result<(T::AccountId, Vec<(T::AccountId, T::AccountId)>), &'static str> {
 	// Clean up any existing state.
 	clear_validators_and_nominators::<T>();
@@ -64,10 +66,8 @@ pub fn create_validator_with_nominators<T: Config>(
 	let mut points_individual = Vec::new();
 
 	let (v_stash, v_controller) = create_stash_controller::<T>(0, 100, destination.clone())?;
-	let validator_prefs = ValidatorPrefs {
-		commission: Perbill::from_percent(50),
-		.. Default::default()
-	};
+	let validator_prefs =
+		ValidatorPrefs { commission: Perbill::from_percent(50), ..Default::default() };
 	Staking::<T>::validate(RawOrigin::Signed(v_controller).into(), validator_prefs)?;
 	let stash_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(v_stash.clone());
 
@@ -77,14 +77,17 @@ pub fn create_validator_with_nominators<T: Config>(
 	let mut nominators = Vec::new();
 
 	// Give the validator n nominators, but keep total users in the system the same.
-	for i in 0 .. upper_bound {
+	for i in 0..upper_bound {
 		let (n_stash, n_controller) = if !dead {
 			create_stash_controller::<T>(u32::MAX - i, 100, destination.clone())?
 		} else {
 			create_stash_and_dead_controller::<T>(u32::MAX - i, 100, destination.clone())?
 		};
 		if i < n {
-			Staking::<T>::nominate(RawOrigin::Signed(n_controller.clone()).into(), vec![stash_lookup.clone()])?;
+			Staking::<T>::nominate(
+				RawOrigin::Signed(n_controller.clone()).into(),
+				vec![stash_lookup.clone()],
+			)?;
 			nominators.push((n_stash, n_controller));
 		}
 	}
@@ -639,7 +642,7 @@ benchmarks! {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use crate::mock::{ExtBuilder, Test, Balances, Staking, Origin};
+	use crate::mock::{Balances, ExtBuilder, Origin, Staking, Test};
 	use frame_support::assert_ok;
 
 	#[test]
@@ -654,7 +657,8 @@ mod tests {
 				<Test as Config>::MAX_NOMINATIONS as usize,
 				false,
 				None,
-			).unwrap();
+			)
+			.unwrap();
 
 			let count_validators = Validators::<Test>::iter().count();
 			let count_nominators = Nominators::<Test>::iter().count();
@@ -674,7 +678,8 @@ mod tests {
 				<Test as Config>::MaxNominatorRewardedPerValidator::get() as u32,
 				false,
 				RewardDestination::Staked,
-			).unwrap();
+			)
+			.unwrap();
 
 			assert_eq!(nominators.len() as u32, n);
 
@@ -698,7 +703,8 @@ mod tests {
 				<Test as Config>::MaxNominatorRewardedPerValidator::get() as u32,
 				false,
 				RewardDestination::Staked,
-			).unwrap();
+			)
+			.unwrap();
 
 			// Add 20 slashing spans
 			let num_of_slashing_spans = 20;
@@ -706,14 +712,14 @@ mod tests {
 
 			let slashing_spans = SlashingSpans::<Test>::get(&validator_stash).unwrap();
 			assert_eq!(slashing_spans.iter().count(), num_of_slashing_spans as usize);
-			for i in 0 .. num_of_slashing_spans {
+			for i in 0..num_of_slashing_spans {
 				assert!(SpanSlash::<Test>::contains_key((&validator_stash, i)));
 			}
 
 			// Test everything is cleaned up
 			assert_ok!(Staking::kill_stash(&validator_stash, num_of_slashing_spans));
 			assert!(SlashingSpans::<Test>::get(&validator_stash).is_none());
-			for i in 0 .. num_of_slashing_spans {
+			for i in 0..num_of_slashing_spans {
 				assert!(!SpanSlash::<Test>::contains_key((&validator_stash, i)));
 			}
 		});
@@ -726,13 +732,17 @@ mod tests {
 			let n = 100;
 
 			let selected_benchmark = SelectedBenchmark::payout_all;
-			let c = vec![(frame_benchmarking::BenchmarkParameter::v, v), (frame_benchmarking::BenchmarkParameter::n, n)];
+			let c = vec![
+				(frame_benchmarking::BenchmarkParameter::v, v),
+				(frame_benchmarking::BenchmarkParameter::n, n),
+			];
 			let closure_to_benchmark =
 				<SelectedBenchmark as frame_benchmarking::BenchmarkingSetup<Test>>::instance(
 					&selected_benchmark,
 					&c,
-					true
-				).unwrap();
+					true,
+				)
+				.unwrap();
 
 			assert_ok!(closure_to_benchmark());
 		});
diff --git a/frame/staking/src/inflation.rs b/frame/staking/src/inflation.rs
index e5259543fd4b..6f2bfe06ac24 100644
--- a/frame/staking/src/inflation.rs
+++ b/frame/staking/src/inflation.rs
@@ -20,7 +20,7 @@
 //! The staking rate in NPoS is the total amount of tokens staked by nominators and validators,
 //! divided by the total token supply.
 
-use sp_runtime::{Perbill, traits::AtLeast32BitUnsigned, curve::PiecewiseLinear};
+use sp_runtime::{curve::PiecewiseLinear, traits::AtLeast32BitUnsigned, Perbill};
 
 /// The total payout to all validators (and their nominators) per era and maximum payout.
 ///
@@ -33,16 +33,18 @@ pub fn compute_total_payout<N>(
 	yearly_inflation: &PiecewiseLinear<'static>,
 	npos_token_staked: N,
 	total_tokens: N,
-	era_duration: u64
-) -> (N, N) where N: AtLeast32BitUnsigned + Clone {
+	era_duration: u64,
+) -> (N, N)
+where
+	N: AtLeast32BitUnsigned + Clone,
+{
 	// Milliseconds per year for the Julian year (365.25 days).
 	const MILLISECONDS_PER_YEAR: u64 = 1000 * 3600 * 24 * 36525 / 100;
 
 	let portion = Perbill::from_rational(era_duration as u64, MILLISECONDS_PER_YEAR);
-	let payout = portion * yearly_inflation.calculate_for_fraction_times_denominator(
-		npos_token_staked,
-		total_tokens.clone(),
-	);
+	let payout = portion *
+		yearly_inflation
+			.calculate_for_fraction_times_denominator(npos_token_staked, total_tokens.clone());
 	let maximum = portion * (yearly_inflation.maximum * total_tokens);
 	(payout, maximum)
 }
@@ -70,7 +72,7 @@ mod test {
 		// not 10_000 due to rounding error.
 		assert_eq!(super::compute_total_payout(&I_NPOS, 0, 100_000u64, YEAR).1, 9_993);
 
-		//super::I_NPOS.calculate_for_fraction_times_denominator(25, 100)
+		// super::I_NPOS.calculate_for_fraction_times_denominator(25, 100)
 		assert_eq!(super::compute_total_payout(&I_NPOS, 0, 100_000u64, YEAR).0, 2_498);
 		assert_eq!(super::compute_total_payout(&I_NPOS, 5_000, 100_000u64, YEAR).0, 3_248);
 		assert_eq!(super::compute_total_payout(&I_NPOS, 25_000, 100_000u64, YEAR).0, 6_246);
@@ -98,7 +100,8 @@ mod test {
 				2_500_000_000_000_000_000_000_000_000u128,
 				5_000_000_000_000_000_000_000_000_000u128,
 				HOUR
-			).0,
+			)
+			.0,
 			57_038_500_000_000_000_000_000
 		);
 	}
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 340e1a2a3f07..594773f658ec 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -267,57 +267,49 @@
 #![recursion_limit = "128"]
 #![cfg_attr(not(feature = "std"), no_std)]
 
+#[cfg(any(feature = "runtime-benchmarks", test))]
+pub mod benchmarking;
 #[cfg(test)]
 mod mock;
-#[cfg(test)]
-mod tests;
 #[cfg(any(feature = "runtime-benchmarks", test))]
 pub mod testing_utils;
-#[cfg(any(feature = "runtime-benchmarks", test))]
-pub mod benchmarking;
+#[cfg(test)]
+mod tests;
 
-pub mod slashing;
 pub mod inflation;
+pub mod slashing;
 pub mod weights;
 
-use sp_std::{
-	result,
-	prelude::*,
-	collections::btree_map::BTreeMap,
-	convert::From,
-};
-use codec::{HasCompact, Encode, Decode};
+use codec::{Decode, Encode, HasCompact};
+use frame_election_provider_support::{data_provider, ElectionProvider, Supports, VoteWeight};
 use frame_support::{
 	pallet_prelude::*,
+	traits::{
+		Currency, CurrencyToVote, EnsureOrigin, EstimateNextNewSession, Get, Imbalance,
+		LockIdentifier, LockableCurrency, OnUnbalanced, UnixTime, WithdrawReasons,
+	},
 	weights::{
-		Weight, WithPostDispatchInfo,
 		constants::{WEIGHT_PER_MICROS, WEIGHT_PER_NANOS},
-	},
-	traits::{
-		Currency, LockIdentifier, LockableCurrency, WithdrawReasons, OnUnbalanced, Imbalance, Get,
-		UnixTime, EstimateNextNewSession, EnsureOrigin, CurrencyToVote,
+		Weight, WithPostDispatchInfo,
 	},
 };
+use frame_system::{ensure_root, ensure_signed, offchain::SendTransactionTypes, pallet_prelude::*};
+pub use pallet::*;
 use pallet_session::historical;
 use sp_runtime::{
-	Percent, Perbill, RuntimeDebug, DispatchError,
 	curve::PiecewiseLinear,
 	traits::{
-		Convert, Zero, StaticLookup, CheckedSub, Saturating, SaturatedConversion,
-		AtLeast32BitUnsigned, Bounded,
+		AtLeast32BitUnsigned, Bounded, CheckedSub, Convert, SaturatedConversion, Saturating,
+		StaticLookup, Zero,
 	},
+	DispatchError, Perbill, Percent, RuntimeDebug,
 };
 use sp_staking::{
+	offence::{Offence, OffenceDetails, OffenceError, OnOffenceHandler, ReportOffence},
 	SessionIndex,
-	offence::{OnOffenceHandler, OffenceDetails, Offence, ReportOffence, OffenceError},
 };
-use frame_system::{
-	ensure_signed, ensure_root, pallet_prelude::*,
-	offchain::SendTransactionTypes,
-};
-use frame_election_provider_support::{ElectionProvider, VoteWeight, Supports, data_provider};
+use sp_std::{collections::btree_map::BTreeMap, convert::From, prelude::*, result};
 pub use weights::WeightInfo;
-pub use pallet::*;
 
 const STAKING_ID: LockIdentifier = *b"staking ";
 pub(crate) const LOG_TARGET: &'static str = "runtime::staking";
@@ -423,10 +415,7 @@ pub struct ValidatorPrefs {
 
 impl Default for ValidatorPrefs {
 	fn default() -> Self {
-		ValidatorPrefs {
-			commission: Default::default(),
-			blocked: false,
-		}
+		ValidatorPrefs { commission: Default::default(), blocked: false }
 	}
 }
 
@@ -462,20 +451,23 @@ pub struct StakingLedger<AccountId, Balance: HasCompact> {
 	pub claimed_rewards: Vec<EraIndex>,
 }
 
-impl<
-	AccountId,
-	Balance: HasCompact + Copy + Saturating + AtLeast32BitUnsigned,
-> StakingLedger<AccountId, Balance> {
+impl<AccountId, Balance: HasCompact + Copy + Saturating + AtLeast32BitUnsigned>
+	StakingLedger<AccountId, Balance>
+{
 	/// Remove entries from `unlocking` that are sufficiently old and reduce the
 	/// total by the sum of their balances.
 	fn consolidate_unlocked(self, current_era: EraIndex) -> Self {
 		let mut total = self.total;
-		let unlocking = self.unlocking.into_iter()
-			.filter(|chunk| if chunk.era > current_era {
-				true
-			} else {
-				total = total.saturating_sub(chunk.value);
-				false
+		let unlocking = self
+			.unlocking
+			.into_iter()
+			.filter(|chunk| {
+				if chunk.era > current_era {
+					true
+				} else {
+					total = total.saturating_sub(chunk.value);
+					false
+				}
 			})
 			.collect();
 
@@ -484,7 +476,7 @@ impl<
 			total,
 			active: self.active,
 			unlocking,
-			claimed_rewards: self.claimed_rewards
+			claimed_rewards: self.claimed_rewards,
 		}
 	}
 
@@ -514,7 +506,8 @@ impl<
 	}
 }
 
-impl<AccountId, Balance> StakingLedger<AccountId, Balance> where
+impl<AccountId, Balance> StakingLedger<AccountId, Balance>
+where
 	Balance: AtLeast32BitUnsigned + Saturating + Copy,
 {
 	/// Slash the validator for a given amount of balance. This can grow the value
@@ -523,39 +516,34 @@ impl<AccountId, Balance> StakingLedger<AccountId, Balance> where
 	///
 	/// Slashes from `active` funds first, and then `unlocking`, starting with the
 	/// chunks that are closest to unlocking.
-	fn slash(
-		&mut self,
-		mut value: Balance,
-		minimum_balance: Balance,
-	) -> Balance {
+	fn slash(&mut self, mut value: Balance, minimum_balance: Balance) -> Balance {
 		let pre_total = self.total;
 		let total = &mut self.total;
 		let active = &mut self.active;
 
-		let slash_out_of = |
-			total_remaining: &mut Balance,
-			target: &mut Balance,
-			value: &mut Balance,
-		| {
-			let mut slash_from_target = (*value).min(*target);
+		let slash_out_of =
+			|total_remaining: &mut Balance, target: &mut Balance, value: &mut Balance| {
+				let mut slash_from_target = (*value).min(*target);
 
-			if !slash_from_target.is_zero() {
-				*target -= slash_from_target;
+				if !slash_from_target.is_zero() {
+					*target -= slash_from_target;
 
-				// Don't leave a dust balance in the staking system.
-				if *target <= minimum_balance {
-					slash_from_target += *target;
-					*value += sp_std::mem::replace(target, Zero::zero());
-				}
+					// Don't leave a dust balance in the staking system.
+					if *target <= minimum_balance {
+						slash_from_target += *target;
+						*value += sp_std::mem::replace(target, Zero::zero());
+					}
 
-				*total_remaining = total_remaining.saturating_sub(slash_from_target);
-				*value -= slash_from_target;
-			}
-		};
+					*total_remaining = total_remaining.saturating_sub(slash_from_target);
+					*value -= slash_from_target;
+				}
+			};
 
 		slash_out_of(total, active, &mut value);
 
-		let i = self.unlocking.iter_mut()
+		let i = self
+			.unlocking
+			.iter_mut()
 			.map(|chunk| {
 				slash_out_of(total, &mut chunk.value, &mut value);
 				chunk.value
@@ -641,7 +629,8 @@ pub trait SessionInterface<AccountId>: frame_system::Config {
 	fn prune_historical_up_to(up_to: SessionIndex);
 }
 
-impl<T: Config> SessionInterface<<T as frame_system::Config>::AccountId> for T where
+impl<T: Config> SessionInterface<<T as frame_system::Config>::AccountId> for T
+where
 	T: pallet_session::Config<ValidatorId = <T as frame_system::Config>::AccountId>,
 	T: pallet_session::historical::Config<
 		FullIdentification = Exposure<<T as frame_system::Config>::AccountId, BalanceOf<T>>,
@@ -649,8 +638,10 @@ impl<T: Config> SessionInterface<<T as frame_system::Config>::AccountId> for T w
 	>,
 	T::SessionHandler: pallet_session::SessionHandler<<T as frame_system::Config>::AccountId>,
 	T::SessionManager: pallet_session::SessionManager<<T as frame_system::Config>::AccountId>,
-	T::ValidatorIdOf:
-		Convert<<T as frame_system::Config>::AccountId, Option<<T as frame_system::Config>::AccountId>>,
+	T::ValidatorIdOf: Convert<
+		<T as frame_system::Config>::AccountId,
+		Option<<T as frame_system::Config>::AccountId>,
+	>,
 {
 	fn disable_validator(validator: &<T as frame_system::Config>::AccountId) -> Result<bool, ()> {
 		<pallet_session::Pallet<T>>::disable(validator)
@@ -691,10 +682,9 @@ impl<Balance: Default> EraPayout<Balance> for () {
 /// Adaptor to turn a `PiecewiseLinear` curve definition into an `EraPayout` impl, used for
 /// backwards compatibility.
 pub struct ConvertCurve<T>(sp_std::marker::PhantomData<T>);
-impl<
-	Balance: AtLeast32BitUnsigned + Clone,
-	T: Get<&'static PiecewiseLinear<'static>>,
-> EraPayout<Balance> for ConvertCurve<T> {
+impl<Balance: AtLeast32BitUnsigned + Clone, T: Get<&'static PiecewiseLinear<'static>>>
+	EraPayout<Balance> for ConvertCurve<T>
+{
 	fn era_payout(
 		total_staked: Balance,
 		total_issuance: Balance,
@@ -761,8 +751,14 @@ pub mod migrations {
 		use super::*;
 
 		pub fn pre_migrate<T: Config>() -> Result<(), &'static str> {
-			assert!(CounterForValidators::<T>::get().is_zero(), "CounterForValidators already set.");
-			assert!(CounterForNominators::<T>::get().is_zero(), "CounterForNominators already set.");
+			assert!(
+				CounterForValidators::<T>::get().is_zero(),
+				"CounterForValidators already set."
+			);
+			assert!(
+				CounterForNominators::<T>::get().is_zero(),
+				"CounterForNominators already set."
+			);
 			assert!(StorageVersion::<T>::get() == Releases::V6_0_0);
 			Ok(())
 		}
@@ -778,16 +774,14 @@ pub mod migrations {
 			StorageVersion::<T>::put(Releases::V7_0_0);
 			log!(info, "Completed staking migration to Releases::V7_0_0");
 
-			T::DbWeight::get().reads_writes(
-				validator_count.saturating_add(nominator_count).into(),
-				2,
-			)
+			T::DbWeight::get()
+				.reads_writes(validator_count.saturating_add(nominator_count).into(), 2)
 		}
 	}
 
 	pub mod v6 {
 		use super::*;
-		use frame_support::{traits::Get, weights::Weight, generate_storage_alias};
+		use frame_support::{generate_storage_alias, traits::Get, weights::Weight};
 
 		// NOTE: value type doesn't matter, we just set it to () here.
 		generate_storage_alias!(Staking, SnapshotValidators => Value<()>);
@@ -805,7 +799,10 @@ pub mod migrations {
 			log!(info, "QueuedElected.exits()? {:?}", QueuedElected::exists());
 			log!(info, "QueuedScore.exits()? {:?}", QueuedScore::exists());
 			// these must exist.
-			assert!(IsCurrentSessionFinal::exists(), "IsCurrentSessionFinal storage item not found!");
+			assert!(
+				IsCurrentSessionFinal::exists(),
+				"IsCurrentSessionFinal storage item not found!"
+			);
 			assert!(EraElectionStatus::exists(), "EraElectionStatus storage item not found!");
 			Ok(())
 		}
@@ -926,7 +923,7 @@ pub mod pallet {
 
 	#[pallet::extra_constants]
 	impl<T: Config> Pallet<T> {
-		//TODO: rename to snake case after https://github.com/paritytech/substrate/issues/8826 fixed.
+		// TODO: rename to snake case after https://github.com/paritytech/substrate/issues/8826 fixed.
 		#[allow(non_snake_case)]
 		fn MaxNominations() -> u32 {
 			T::MAX_NOMINATIONS
@@ -934,7 +931,9 @@ pub mod pallet {
 	}
 
 	#[pallet::type_value]
-	pub(crate) fn HistoryDepthOnEmpty() -> u32 { 84u32 }
+	pub(crate) fn HistoryDepthOnEmpty() -> u32 {
+		84u32
+	}
 
 	/// Number of eras to keep in history.
 	///
@@ -980,28 +979,22 @@ pub mod pallet {
 	/// Map from all (unlocked) "controller" accounts to the info regarding the staking.
 	#[pallet::storage]
 	#[pallet::getter(fn ledger)]
-	pub type Ledger<T: Config> = StorageMap<
-		_,
-		Blake2_128Concat, T::AccountId,
-		StakingLedger<T::AccountId, BalanceOf<T>>,
-	>;
+	pub type Ledger<T: Config> =
+		StorageMap<_, Blake2_128Concat, T::AccountId, StakingLedger<T::AccountId, BalanceOf<T>>>;
 
 	/// Where the reward payment should be made. Keyed by stash.
 	#[pallet::storage]
 	#[pallet::getter(fn payee)]
-	pub type Payee<T: Config> = StorageMap<
-		_,
-		Twox64Concat, T::AccountId,
-		RewardDestination<T::AccountId>,
-		ValueQuery,
-	>;
+	pub type Payee<T: Config> =
+		StorageMap<_, Twox64Concat, T::AccountId, RewardDestination<T::AccountId>, ValueQuery>;
 
 	/// The map from (wannabe) validator stash key to the preferences of that validator.
 	///
 	/// When updating this storage item, you must also update the `CounterForValidators`.
 	#[pallet::storage]
 	#[pallet::getter(fn validators)]
-	pub type Validators<T: Config> = StorageMap<_, Twox64Concat, T::AccountId, ValidatorPrefs, ValueQuery>;
+	pub type Validators<T: Config> =
+		StorageMap<_, Twox64Concat, T::AccountId, ValidatorPrefs, ValueQuery>;
 
 	/// A tracker to keep count of the number of items in the `Validators` map.
 	#[pallet::storage]
@@ -1018,7 +1011,8 @@ pub mod pallet {
 	/// When updating this storage item, you must also update the `CounterForNominators`.
 	#[pallet::storage]
 	#[pallet::getter(fn nominators)]
-	pub type Nominators<T: Config> = StorageMap<_, Twox64Concat, T::AccountId, Nominations<T::AccountId>>;
+	pub type Nominators<T: Config> =
+		StorageMap<_, Twox64Concat, T::AccountId, Nominations<T::AccountId>>;
 
 	/// A tracker to keep count of the number of items in the `Nominators` map.
 	#[pallet::storage]
@@ -1064,8 +1058,10 @@ pub mod pallet {
 	#[pallet::getter(fn eras_stakers)]
 	pub type ErasStakers<T: Config> = StorageDoubleMap<
 		_,
-		Twox64Concat, EraIndex,
-		Twox64Concat, T::AccountId,
+		Twox64Concat,
+		EraIndex,
+		Twox64Concat,
+		T::AccountId,
 		Exposure<T::AccountId, BalanceOf<T>>,
 		ValueQuery,
 	>;
@@ -1085,8 +1081,10 @@ pub mod pallet {
 	#[pallet::getter(fn eras_stakers_clipped)]
 	pub type ErasStakersClipped<T: Config> = StorageDoubleMap<
 		_,
-		Twox64Concat, EraIndex,
-		Twox64Concat, T::AccountId,
+		Twox64Concat,
+		EraIndex,
+		Twox64Concat,
+		T::AccountId,
 		Exposure<T::AccountId, BalanceOf<T>>,
 		ValueQuery,
 	>;
@@ -1101,8 +1099,10 @@ pub mod pallet {
 	#[pallet::getter(fn eras_validator_prefs)]
 	pub type ErasValidatorPrefs<T: Config> = StorageDoubleMap<
 		_,
-		Twox64Concat, EraIndex,
-		Twox64Concat, T::AccountId,
+		Twox64Concat,
+		EraIndex,
+		Twox64Concat,
+		T::AccountId,
 		ValidatorPrefs,
 		ValueQuery,
 	>;
@@ -1118,18 +1118,15 @@ pub mod pallet {
 	/// If reward hasn't been set or has been removed then 0 reward is returned.
 	#[pallet::storage]
 	#[pallet::getter(fn eras_reward_points)]
-	pub type ErasRewardPoints<T: Config> = StorageMap<
-		_,
-		Twox64Concat, EraIndex,
-		EraRewardPoints<T::AccountId>,
-		ValueQuery,
-	>;
+	pub type ErasRewardPoints<T: Config> =
+		StorageMap<_, Twox64Concat, EraIndex, EraRewardPoints<T::AccountId>, ValueQuery>;
 
 	/// The total amount staked for the last `HISTORY_DEPTH` eras.
 	/// If total hasn't been set or has been removed then 0 stake is returned.
 	#[pallet::storage]
 	#[pallet::getter(fn eras_total_stake)]
-	pub type ErasTotalStake<T: Config> = StorageMap<_, Twox64Concat, EraIndex, BalanceOf<T>, ValueQuery>;
+	pub type ErasTotalStake<T: Config> =
+		StorageMap<_, Twox64Concat, EraIndex, BalanceOf<T>, ValueQuery>;
 
 	/// Mode of era forcing.
 	#[pallet::storage]
@@ -1153,7 +1150,8 @@ pub mod pallet {
 	#[pallet::storage]
 	pub type UnappliedSlashes<T: Config> = StorageMap<
 		_,
-		Twox64Concat, EraIndex,
+		Twox64Concat,
+		EraIndex,
 		Vec<UnappliedSlash<T::AccountId, BalanceOf<T>>>,
 		ValueQuery,
 	>;
@@ -1163,37 +1161,38 @@ pub mod pallet {
 	/// Must contains information for eras for the range:
 	/// `[active_era - bounding_duration; active_era]`
 	#[pallet::storage]
-	pub(crate) type BondedEras<T: Config> = StorageValue<_, Vec<(EraIndex, SessionIndex)>, ValueQuery>;
+	pub(crate) type BondedEras<T: Config> =
+		StorageValue<_, Vec<(EraIndex, SessionIndex)>, ValueQuery>;
 
 	/// All slashing events on validators, mapped by era to the highest slash proportion
 	/// and slash value of the era.
 	#[pallet::storage]
 	pub(crate) type ValidatorSlashInEra<T: Config> = StorageDoubleMap<
 		_,
-		Twox64Concat, EraIndex,
-		Twox64Concat, T::AccountId,
+		Twox64Concat,
+		EraIndex,
+		Twox64Concat,
+		T::AccountId,
 		(Perbill, BalanceOf<T>),
 	>;
 
 	/// All slashing events on nominators, mapped by era to the highest slash value of the era.
 	#[pallet::storage]
-	pub(crate) type NominatorSlashInEra<T: Config> = StorageDoubleMap<
-		_,
-		Twox64Concat, EraIndex,
-		Twox64Concat, T::AccountId,
-		BalanceOf<T>,
-	>;
+	pub(crate) type NominatorSlashInEra<T: Config> =
+		StorageDoubleMap<_, Twox64Concat, EraIndex, Twox64Concat, T::AccountId, BalanceOf<T>>;
 
 	/// Slashing spans for stash accounts.
 	#[pallet::storage]
-	pub(crate) type SlashingSpans<T: Config> = StorageMap<_, Twox64Concat, T::AccountId, slashing::SlashingSpans>;
+	pub(crate) type SlashingSpans<T: Config> =
+		StorageMap<_, Twox64Concat, T::AccountId, slashing::SlashingSpans>;
 
 	/// Records information about the maximum slash of a stash within a slashing span,
 	/// as well as how much reward has been paid out.
 	#[pallet::storage]
 	pub(crate) type SpanSlash<T: Config> = StorageMap<
 		_,
-		Twox64Concat, (T::AccountId, slashing::SpanIndex),
+		Twox64Concat,
+		(T::AccountId, slashing::SpanIndex),
 		slashing::SpanRecord<BalanceOf<T>>,
 		ValueQuery,
 	>;
@@ -1280,18 +1279,15 @@ pub mod pallet {
 					RewardDestination::Staked,
 				);
 				let _ = match status {
-					StakerStatus::Validator => {
-						<Pallet<T>>::validate(
-							T::Origin::from(Some(controller.clone()).into()),
-							Default::default(),
-						)
-					},
-					StakerStatus::Nominator(votes) => {
-						<Pallet<T>>::nominate(
-							T::Origin::from(Some(controller.clone()).into()),
-							votes.iter().map(|l| T::Lookup::unlookup(l.clone())).collect(),
-						)
-					}, _ => Ok(())
+					StakerStatus::Validator => <Pallet<T>>::validate(
+						T::Origin::from(Some(controller.clone()).into()),
+						Default::default(),
+					),
+					StakerStatus::Nominator(votes) => <Pallet<T>>::nominate(
+						T::Origin::from(Some(controller.clone()).into()),
+						votes.iter().map(|l| T::Lookup::unlookup(l.clone())).collect(),
+					),
+					_ => Ok(()),
 				};
 			}
 		}
@@ -1536,7 +1532,10 @@ pub mod pallet {
 				ledger.total += extra;
 				ledger.active += extra;
 				// Last check: the new active amount of ledger must be more than ED.
-				ensure!(ledger.active >= T::Currency::minimum_balance(), Error::<T>::InsufficientBond);
+				ensure!(
+					ledger.active >= T::Currency::minimum_balance(),
+					Error::<T>::InsufficientBond
+				);
 
 				Self::deposit_event(Event::<T>::Bonded(stash, extra));
 				Self::update_ledger(&controller, &ledger);
@@ -1564,13 +1563,13 @@ pub mod pallet {
 		///
 		/// See also [`Call::withdraw_unbonded`].
 		#[pallet::weight(T::WeightInfo::unbond())]
-		pub fn unbond(origin: OriginFor<T>, #[pallet::compact] value: BalanceOf<T>) -> DispatchResult {
+		pub fn unbond(
+			origin: OriginFor<T>,
+			#[pallet::compact] value: BalanceOf<T>,
+		) -> DispatchResult {
 			let controller = ensure_signed(origin)?;
 			let mut ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
-			ensure!(
-				ledger.unlocking.len() < MAX_UNLOCKING_CHUNKS,
-				Error::<T>::NoMoreChunks,
-			);
+			ensure!(ledger.unlocking.len() < MAX_UNLOCKING_CHUNKS, Error::<T>::NoMoreChunks,);
 
 			let mut value = value.min(ledger.active);
 
@@ -1631,22 +1630,23 @@ pub mod pallet {
 				ledger = ledger.consolidate_unlocked(current_era)
 			}
 
-			let post_info_weight = if ledger.unlocking.is_empty() && ledger.active < T::Currency::minimum_balance() {
-				// This account must have called `unbond()` with some value that caused the active
-				// portion to fall below existential deposit + will have no more unlocking chunks
-				// left. We can now safely remove all staking-related information.
-				Self::kill_stash(&stash, num_slashing_spans)?;
-				// Remove the lock.
-				T::Currency::remove_lock(STAKING_ID, &stash);
-				// This is worst case scenario, so we use the full weight and return None
-				None
-			} else {
-				// This was the consequence of a partial unbond. just update the ledger and move on.
-				Self::update_ledger(&controller, &ledger);
+			let post_info_weight =
+				if ledger.unlocking.is_empty() && ledger.active < T::Currency::minimum_balance() {
+					// This account must have called `unbond()` with some value that caused the active
+					// portion to fall below existential deposit + will have no more unlocking chunks
+					// left. We can now safely remove all staking-related information.
+					Self::kill_stash(&stash, num_slashing_spans)?;
+					// Remove the lock.
+					T::Currency::remove_lock(STAKING_ID, &stash);
+					// This is worst case scenario, so we use the full weight and return None
+					None
+				} else {
+					// This was the consequence of a partial unbond. just update the ledger and move on.
+					Self::update_ledger(&controller, &ledger);
 
-				// This is only an update, so we use less overall weight.
-				Some(T::WeightInfo::withdraw_unbonded_update(num_slashing_spans))
-			};
+					// This is only an update, so we use less overall weight.
+					Some(T::WeightInfo::withdraw_unbonded_update(num_slashing_spans))
+				};
 
 			// `old_total` should never be less than the new total because
 			// `consolidate_unlocked` strictly subtracts balance.
@@ -1677,7 +1677,10 @@ pub mod pallet {
 				// If this error is reached, we need to adjust the `MinValidatorBond` and start calling `chill_other`.
 				// Until then, we explicitly block new validators to protect the runtime.
 				if let Some(max_validators) = MaxValidatorsCount::<T>::get() {
-					ensure!(CounterForValidators::<T>::get() < max_validators, Error::<T>::TooManyValidators);
+					ensure!(
+						CounterForValidators::<T>::get() < max_validators,
+						Error::<T>::TooManyValidators
+					);
 				}
 			}
 
@@ -1713,7 +1716,10 @@ pub mod pallet {
 				// If this error is reached, we need to adjust the `MinNominatorBond` and start calling `chill_other`.
 				// Until then, we explicitly block new nominators to protect the runtime.
 				if let Some(max_nominators) = MaxNominatorsCount::<T>::get() {
-					ensure!(CounterForNominators::<T>::get() < max_nominators, Error::<T>::TooManyNominators);
+					ensure!(
+						CounterForNominators::<T>::get() < max_nominators,
+						Error::<T>::TooManyNominators
+					);
 				}
 			}
 
@@ -1722,13 +1728,18 @@ pub mod pallet {
 
 			let old = Nominators::<T>::get(stash).map_or_else(Vec::new, |x| x.targets);
 
-			let targets = targets.into_iter()
+			let targets = targets
+				.into_iter()
 				.map(|t| T::Lookup::lookup(t).map_err(DispatchError::from))
-				.map(|n| n.and_then(|n| if old.contains(&n) || !Validators::<T>::get(&n).blocked {
-					Ok(n)
-				} else {
-					Err(Error::<T>::BadTarget.into())
-				}))
+				.map(|n| {
+					n.and_then(|n| {
+						if old.contains(&n) || !Validators::<T>::get(&n).blocked {
+							Ok(n)
+						} else {
+							Err(Error::<T>::BadTarget.into())
+						}
+					})
+				})
 				.collect::<result::Result<Vec<T::AccountId>, _>>()?;
 
 			let nominations = Nominations {
@@ -2043,7 +2054,9 @@ pub mod pallet {
 		///   NOTE: weights are assuming that payouts are made to alive stash account (Staked).
 		///   Paying even a dead controller is cheaper weight-wise. We don't do any refunds here.
 		/// # </weight>
-		#[pallet::weight(T::WeightInfo::payout_stakers_alive_staked(T::MaxNominatorRewardedPerValidator::get()))]
+		#[pallet::weight(T::WeightInfo::payout_stakers_alive_staked(
+			T::MaxNominatorRewardedPerValidator::get()
+		))]
 		pub fn payout_stakers(
 			origin: OriginFor<T>,
 			validator_stash: T::AccountId,
@@ -2078,10 +2091,11 @@ pub mod pallet {
 			Self::deposit_event(Event::<T>::Bonded(ledger.stash.clone(), value));
 			Self::update_ledger(&controller, &ledger);
 			Ok(Some(
-				35 * WEIGHT_PER_MICROS
-				+ 50 * WEIGHT_PER_NANOS * (ledger.unlocking.len() as Weight)
-				+ T::DbWeight::get().reads_writes(3, 2)
-			).into())
+				35 * WEIGHT_PER_MICROS +
+					50 * WEIGHT_PER_NANOS * (ledger.unlocking.len() as Weight) +
+					T::DbWeight::get().reads_writes(3, 2),
+			)
+			.into())
 		}
 
 		/// Set `HistoryDepth` value. This function will delete any history information
@@ -2106,7 +2120,8 @@ pub mod pallet {
 		///     - Writes Each: ErasValidatorReward, ErasRewardPoints, ErasTotalStake, ErasStartSessionIndex
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::set_history_depth(*_era_items_deleted))]
-		pub fn set_history_depth(origin: OriginFor<T>,
+		pub fn set_history_depth(
+			origin: OriginFor<T>,
 			#[pallet::compact] new_history_depth: EraIndex,
 			#[pallet::compact] _era_items_deleted: u32,
 		) -> DispatchResult {
@@ -2164,20 +2179,29 @@ pub mod pallet {
 		/// Note: Making this call only makes sense if you first set the validator preferences to
 		/// block any further nominations.
 		#[pallet::weight(T::WeightInfo::kick(who.len() as u32))]
-		pub fn kick(origin: OriginFor<T>, who: Vec<<T::Lookup as StaticLookup>::Source>) -> DispatchResult {
+		pub fn kick(
+			origin: OriginFor<T>,
+			who: Vec<<T::Lookup as StaticLookup>::Source>,
+		) -> DispatchResult {
 			let controller = ensure_signed(origin)?;
 			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
 			let stash = &ledger.stash;
 
-			for nom_stash in who.into_iter()
+			for nom_stash in who
+				.into_iter()
 				.map(T::Lookup::lookup)
 				.collect::<Result<Vec<T::AccountId>, _>>()?
 				.into_iter()
 			{
-				Nominators::<T>::mutate(&nom_stash, |maybe_nom| if let Some(ref mut nom) = maybe_nom {
-					if let Some(pos) = nom.targets.iter().position(|v| v == stash) {
-						nom.targets.swap_remove(pos);
-						Self::deposit_event(Event::<T>::Kicked(nom_stash.clone(), stash.clone()));
+				Nominators::<T>::mutate(&nom_stash, |maybe_nom| {
+					if let Some(ref mut nom) = maybe_nom {
+						if let Some(pos) = nom.targets.iter().position(|v| v == stash) {
+							nom.targets.swap_remove(pos);
+							Self::deposit_event(Event::<T>::Kicked(
+								nom_stash.clone(),
+								stash.clone(),
+							));
+						}
 					}
 				});
 			}
@@ -2237,14 +2261,10 @@ pub mod pallet {
 		///
 		/// This can be helpful if bond requirements are updated, and we need to remove old users
 		/// who do not satisfy these requirements.
-		///
 		// TODO: Maybe we can deprecate `chill` in the future.
 		// https://github.com/paritytech/substrate/issues/9111
 		#[pallet::weight(T::WeightInfo::chill_other())]
-		pub fn chill_other(
-			origin: OriginFor<T>,
-			controller: T::AccountId,
-		) -> DispatchResult {
+		pub fn chill_other(origin: OriginFor<T>, controller: T::AccountId) -> DispatchResult {
 			// Anyone can call this function.
 			let caller = ensure_signed(origin)?;
 			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
@@ -2263,14 +2283,22 @@ pub mod pallet {
 			if caller != controller {
 				let threshold = ChillThreshold::<T>::get().ok_or(Error::<T>::CannotChillOther)?;
 				let min_active_bond = if Nominators::<T>::contains_key(&stash) {
-					let max_nominator_count = MaxNominatorsCount::<T>::get().ok_or(Error::<T>::CannotChillOther)?;
+					let max_nominator_count =
+						MaxNominatorsCount::<T>::get().ok_or(Error::<T>::CannotChillOther)?;
 					let current_nominator_count = CounterForNominators::<T>::get();
-					ensure!(threshold * max_nominator_count < current_nominator_count, Error::<T>::CannotChillOther);
+					ensure!(
+						threshold * max_nominator_count < current_nominator_count,
+						Error::<T>::CannotChillOther
+					);
 					MinNominatorBond::<T>::get()
 				} else if Validators::<T>::contains_key(&stash) {
-					let max_validator_count = MaxValidatorsCount::<T>::get().ok_or(Error::<T>::CannotChillOther)?;
+					let max_validator_count =
+						MaxValidatorsCount::<T>::get().ok_or(Error::<T>::CannotChillOther)?;
 					let current_validator_count = CounterForValidators::<T>::get();
-					ensure!(threshold * max_validator_count < current_validator_count, Error::<T>::CannotChillOther);
+					ensure!(
+						threshold * max_validator_count < current_validator_count,
+						Error::<T>::CannotChillOther
+					);
 					MinValidatorBond::<T>::get()
 				} else {
 					Zero::zero()
@@ -2313,41 +2341,46 @@ impl<T: Config> Pallet<T> {
 		})
 	}
 
-	fn do_payout_stakers(validator_stash: T::AccountId, era: EraIndex) -> DispatchResultWithPostInfo {
+	fn do_payout_stakers(
+		validator_stash: T::AccountId,
+		era: EraIndex,
+	) -> DispatchResultWithPostInfo {
 		// Validate input data
 		let current_era = CurrentEra::<T>::get().ok_or(
-			Error::<T>::InvalidEraToReward.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
+			Error::<T>::InvalidEraToReward
+				.with_weight(T::WeightInfo::payout_stakers_alive_staked(0)),
 		)?;
 		let history_depth = Self::history_depth();
 		ensure!(
 			era <= current_era && era >= current_era.saturating_sub(history_depth),
-			Error::<T>::InvalidEraToReward.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
+			Error::<T>::InvalidEraToReward
+				.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
 		);
 
 		// Note: if era has no reward to be claimed, era may be future. better not to update
 		// `ledger.claimed_rewards` in this case.
-		let era_payout = <ErasValidatorReward<T>>::get(&era)
-			.ok_or_else(||
-				Error::<T>::InvalidEraToReward
-					.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
-			)?;
+		let era_payout = <ErasValidatorReward<T>>::get(&era).ok_or_else(|| {
+			Error::<T>::InvalidEraToReward
+				.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
+		})?;
 
 		let controller = Self::bonded(&validator_stash).ok_or(
-			Error::<T>::NotStash.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
+			Error::<T>::NotStash.with_weight(T::WeightInfo::payout_stakers_alive_staked(0)),
 		)?;
 		let mut ledger = <Ledger<T>>::get(&controller).ok_or_else(|| Error::<T>::NotController)?;
 
-		ledger.claimed_rewards.retain(|&x| x >= current_era.saturating_sub(history_depth));
+		ledger
+			.claimed_rewards
+			.retain(|&x| x >= current_era.saturating_sub(history_depth));
 		match ledger.claimed_rewards.binary_search(&era) {
-			Ok(_) => Err(
-				Error::<T>::AlreadyClaimed.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
-			)?,
+			Ok(_) => Err(Error::<T>::AlreadyClaimed
+				.with_weight(T::WeightInfo::payout_stakers_alive_staked(0)))?,
 			Err(pos) => ledger.claimed_rewards.insert(pos, era),
 		}
 
 		let exposure = <ErasStakersClipped<T>>::get(&era, &ledger.stash);
 
-		/* Input data seems good, no errors allowed after this point */
+		// Input data seems good, no errors allowed after this point
 
 		<Ledger<T>>::insert(&controller, &ledger);
 
@@ -2360,7 +2393,9 @@ impl<T: Config> Pallet<T> {
 
 		let era_reward_points = <ErasRewardPoints<T>>::get(&era);
 		let total_reward_points = era_reward_points.total;
-		let validator_reward_points = era_reward_points.individual.get(&ledger.stash)
+		let validator_reward_points = era_reward_points
+			.individual
+			.get(&ledger.stash)
 			.map(|points| *points)
 			.unwrap_or_else(|| Zero::zero());
 
@@ -2371,10 +2406,8 @@ impl<T: Config> Pallet<T> {
 
 		// This is the fraction of the total reward that the validator and the
 		// nominators will get.
-		let validator_total_reward_part = Perbill::from_rational(
-			validator_reward_points,
-			total_reward_points,
-		);
+		let validator_total_reward_part =
+			Perbill::from_rational(validator_reward_points, total_reward_points);
 
 		// This is how much validator + nominators are entitled to.
 		let validator_total_payout = validator_total_reward_part * era_payout;
@@ -2386,17 +2419,13 @@ impl<T: Config> Pallet<T> {
 
 		let validator_leftover_payout = validator_total_payout - validator_commission_payout;
 		// Now let's calculate how this is split to the validator.
-		let validator_exposure_part = Perbill::from_rational(
-			exposure.own,
-			exposure.total,
-		);
+		let validator_exposure_part = Perbill::from_rational(exposure.own, exposure.total);
 		let validator_staking_payout = validator_exposure_part * validator_leftover_payout;
 
 		// We can now make total validator payout:
-		if let Some(imbalance) = Self::make_payout(
-			&ledger.stash,
-			validator_staking_payout + validator_commission_payout
-		) {
+		if let Some(imbalance) =
+			Self::make_payout(&ledger.stash, validator_staking_payout + validator_commission_payout)
+		{
 			Self::deposit_event(Event::<T>::Reward(ledger.stash, imbalance.peek()));
 		}
 
@@ -2407,12 +2436,10 @@ impl<T: Config> Pallet<T> {
 		// Lets now calculate how this is split to the nominators.
 		// Reward only the clipped exposures. Note this is not necessarily sorted.
 		for nominator in exposure.others.iter() {
-			let nominator_exposure_part = Perbill::from_rational(
-				nominator.value,
-				exposure.total,
-			);
+			let nominator_exposure_part = Perbill::from_rational(nominator.value, exposure.total);
 
-			let nominator_reward: BalanceOf<T> = nominator_exposure_part * validator_leftover_payout;
+			let nominator_reward: BalanceOf<T> =
+				nominator_exposure_part * validator_leftover_payout;
 			// We can now make nominator payout:
 			if let Some(imbalance) = Self::make_payout(&nominator.who, nominator_reward) {
 				// Note: this logic does not count payouts for `RewardDestination::None`.
@@ -2430,14 +2457,9 @@ impl<T: Config> Pallet<T> {
 	/// This will also update the stash lock.
 	fn update_ledger(
 		controller: &T::AccountId,
-		ledger: &StakingLedger<T::AccountId, BalanceOf<T>>
+		ledger: &StakingLedger<T::AccountId, BalanceOf<T>>,
 	) {
-		T::Currency::set_lock(
-			STAKING_ID,
-			&ledger.stash,
-			ledger.total,
-			WithdrawReasons::all(),
-		);
+		T::Currency::set_lock(STAKING_ID, &ledger.stash, ledger.total, WithdrawReasons::all());
 		<Ledger<T>>::insert(controller, ledger);
 	}
 
@@ -2456,11 +2478,8 @@ impl<T: Config> Pallet<T> {
 		let dest = Self::payee(stash);
 		match dest {
 			RewardDestination::Controller => Self::bonded(stash)
-				.and_then(|controller|
-					Some(T::Currency::deposit_creating(&controller, amount))
-				),
-			RewardDestination::Stash =>
-				T::Currency::deposit_into_existing(stash, amount).ok(),
+				.and_then(|controller| Some(T::Currency::deposit_creating(&controller, amount))),
+			RewardDestination::Stash => T::Currency::deposit_into_existing(stash, amount).ok(),
 			RewardDestination::Staked => Self::bonded(stash)
 				.and_then(|c| Self::ledger(&c).map(|l| (c, l)))
 				.and_then(|(controller, mut l)| {
@@ -2470,9 +2489,8 @@ impl<T: Config> Pallet<T> {
 					Self::update_ledger(&controller, &l);
 					r
 				}),
-			RewardDestination::Account(dest_account) => {
-				Some(T::Currency::deposit_creating(&dest_account, amount))
-			},
+			RewardDestination::Account(dest_account) =>
+				Some(T::Currency::deposit_creating(&dest_account, amount)),
 			RewardDestination::None => None,
 		}
 	}
@@ -2487,8 +2505,8 @@ impl<T: Config> Pallet<T> {
 					0
 				});
 
-			let era_length = session_index.checked_sub(current_era_start_session_index)
-				.unwrap_or(0); // Must never happen.
+			let era_length =
+				session_index.checked_sub(current_era_start_session_index).unwrap_or(0); // Must never happen.
 
 			match ForceEra::<T>::get() {
 				// Will be set to `NotForcing` again if a new era has been triggered.
@@ -2506,8 +2524,8 @@ impl<T: Config> Pallet<T> {
 
 			// New era.
 			let maybe_new_era_validators = Self::try_trigger_new_era(session_index, is_genesis);
-			if maybe_new_era_validators.is_some()
-				&& matches!(ForceEra::<T>::get(), Forcing::ForceNew)
+			if maybe_new_era_validators.is_some() &&
+				matches!(ForceEra::<T>::get(), Forcing::ForceNew)
 			{
 				ForceEra::<T>::put(Forcing::NotForcing);
 			}
@@ -2576,9 +2594,8 @@ impl<T: Config> Pallet<T> {
 				let first_kept = active_era - bonding_duration;
 
 				// Prune out everything that's from before the first-kept index.
-				let n_to_prune = bonded.iter()
-					.take_while(|&&(era_idx, _)| era_idx < first_kept)
-					.count();
+				let n_to_prune =
+					bonded.iter().take_while(|&&(era_idx, _)| era_idx < first_kept).count();
 
 				// Kill slashing metadata.
 				for (pruned_era, _) in bonded.drain(..n_to_prune) {
@@ -2647,7 +2664,10 @@ impl<T: Config> Pallet<T> {
 	/// In case election result has more than [`MinimumValidatorCount`] validator trigger a new era.
 	///
 	/// In case a new era is planned, the new validator set is returned.
-	fn try_trigger_new_era(start_session_index: SessionIndex, is_genesis: bool) -> Option<Vec<T::AccountId>> {
+	fn try_trigger_new_era(
+		start_session_index: SessionIndex,
+		is_genesis: bool,
+	) -> Option<Vec<T::AccountId>> {
 		let (election_result, weight) = if is_genesis {
 			T::GenesisElectionProvider::elect().map_err(|e| {
 				log!(warn, "genesis election provider failed due to {:?}", e);
@@ -2687,7 +2707,7 @@ impl<T: Config> Pallet<T> {
 					CurrentEra::<T>::put(0);
 					ErasStartSessionIndex::<T>::insert(&0, &start_session_index);
 				},
-				_ => ()
+				_ => (),
 			}
 
 			Self::deposit_event(Event::StakingElectionFailed);
@@ -2766,7 +2786,7 @@ impl<T: Config> Pallet<T> {
 					.map(|(nominator, weight)| (nominator, to_currency(weight)))
 					.for_each(|(nominator, stake)| {
 						if nominator == validator {
-						own = own.saturating_add(stake);
+							own = own.saturating_add(stake);
 						} else {
 							others.push(IndividualExposure { who: nominator, value: stake });
 						}
@@ -2817,16 +2837,18 @@ impl<T: Config> Pallet<T> {
 	/// Apply previously-unapplied slashes on the beginning of a new era, after a delay.
 	fn apply_unapplied_slashes(active_era: EraIndex) {
 		let slash_defer_duration = T::SlashDeferDuration::get();
-		<Self as Store>::EarliestUnappliedSlash::mutate(|earliest| if let Some(ref mut earliest) = earliest {
-			let keep_from = active_era.saturating_sub(slash_defer_duration);
-			for era in (*earliest)..keep_from {
-				let era_slashes = <Self as Store>::UnappliedSlashes::take(&era);
-				for slash in era_slashes {
-					slashing::apply_slash::<T>(slash);
+		<Self as Store>::EarliestUnappliedSlash::mutate(|earliest| {
+			if let Some(ref mut earliest) = earliest {
+				let keep_from = active_era.saturating_sub(slash_defer_duration);
+				for era in (*earliest)..keep_from {
+					let era_slashes = <Self as Store>::UnappliedSlashes::take(&era);
+					for slash in era_slashes {
+						slashing::apply_slash::<T>(slash);
+					}
 				}
-			}
 
-			*earliest = (*earliest).max(keep_from)
+				*earliest = (*earliest).max(keep_from)
+			}
 		})
 	}
 
@@ -2841,9 +2863,7 @@ impl<T: Config> Pallet<T> {
 	/// relatively to their points.
 	///
 	/// COMPLEXITY: Complexity is `number_of_validator_to_reward x current_elected_len`.
-	pub fn reward_by_ids(
-		validators_points: impl IntoIterator<Item = (T::AccountId, u32)>
-	) {
+	pub fn reward_by_ids(validators_points: impl IntoIterator<Item = (T::AccountId, u32)>) {
 		if let Some(active_era) = Self::active_era() {
 			<ErasRewardPoints<T>>::mutate(active_era.index, |era_rewards| {
 				for (validator, points) in validators_points.into_iter() {
@@ -2993,7 +3013,7 @@ impl<T: Config> frame_election_provider_support::ElectionDataProvider<T::Account
 		debug_assert!(<Validators<T>>::iter().count() as u32 == CounterForValidators::<T>::get());
 
 		if maybe_max_len.map_or(false, |max_len| voter_count > max_len) {
-			return Err("Voter snapshot too big");
+			return Err("Voter snapshot too big")
 		}
 
 		let slashing_span_count = <SlashingSpans<T>>::iter().count();
@@ -3009,7 +3029,7 @@ impl<T: Config> frame_election_provider_support::ElectionDataProvider<T::Account
 		let target_count = CounterForValidators::<T>::get() as usize;
 
 		if maybe_max_len.map_or(false, |max_len| target_count > max_len) {
-			return Err("Target snapshot too big");
+			return Err("Target snapshot too big")
 		}
 
 		let weight = <T as frame_system::Config>::DbWeight::get().reads(target_count as u64);
@@ -3066,10 +3086,7 @@ impl<T: Config> frame_election_provider_support::ElectionDataProvider<T::Account
 				claimed_rewards: vec![],
 			},
 		);
-		Self::do_add_nominator(
-			&voter,
-			Nominations { targets: targets, submitted_in: 0, suppressed: false },
-		);
+		Self::do_add_nominator(&voter, Nominations { targets, submitted_in: 0, suppressed: false });
 	}
 
 	#[cfg(any(feature = "runtime-benchmarks", test))]
@@ -3188,25 +3205,33 @@ impl<T: Config> historical::SessionManager<T::AccountId, Exposure<T::AccountId,
 				// Must be some as a new era has been created.
 				.unwrap_or(0);
 
-			validators.into_iter().map(|v| {
-				let exposure = Self::eras_stakers(current_era, &v);
-				(v, exposure)
-			}).collect()
+			validators
+				.into_iter()
+				.map(|v| {
+					let exposure = Self::eras_stakers(current_era, &v);
+					(v, exposure)
+				})
+				.collect()
 		})
 	}
 	fn new_session_genesis(
 		new_index: SessionIndex,
 	) -> Option<Vec<(T::AccountId, Exposure<T::AccountId, BalanceOf<T>>)>> {
-		<Self as pallet_session::SessionManager<_>>::new_session_genesis(new_index).map(|validators| {
-			let current_era = Self::current_era()
-				// Must be some as a new era has been created.
-				.unwrap_or(0);
+		<Self as pallet_session::SessionManager<_>>::new_session_genesis(new_index).map(
+			|validators| {
+				let current_era = Self::current_era()
+					// Must be some as a new era has been created.
+					.unwrap_or(0);
 
-			validators.into_iter().map(|v| {
-				let exposure = Self::eras_stakers(current_era, &v);
-				(v, exposure)
-			}).collect()
-		})
+				validators
+					.into_iter()
+					.map(|v| {
+						let exposure = Self::eras_stakers(current_era, &v);
+						(v, exposure)
+					})
+					.collect()
+			},
+		)
 	}
 	fn start_session(start_index: SessionIndex) {
 		<Self as pallet_session::SessionManager<_>>::start_session(start_index)
@@ -3228,10 +3253,7 @@ where
 		Self::reward_by_ids(vec![(author, 20)])
 	}
 	fn note_uncle(author: T::AccountId, _age: T::BlockNumber) {
-		Self::reward_by_ids(vec![
-			(<pallet_authorship::Pallet<T>>::author(), 2),
-			(author, 1)
-		])
+		Self::reward_by_ids(vec![(<pallet_authorship::Pallet<T>>::author(), 2), (author, 1)])
 	}
 }
 
@@ -3374,15 +3396,14 @@ where
 						let reward_cost = (2, 2);
 						add_db_reads_writes(
 							(1 + nominators_len) * slash_cost.0 + reward_cost.0 * reporters_len,
-							(1 + nominators_len) * slash_cost.1 + reward_cost.1 * reporters_len
+							(1 + nominators_len) * slash_cost.1 + reward_cost.1 * reporters_len,
 						);
 					}
 				} else {
 					// Defer to end of some `slash_defer_duration` from now.
-					<Self as Store>::UnappliedSlashes::mutate(
-						active_era,
-						move |for_later| for_later.push(unapplied),
-					);
+					<Self as Store>::UnappliedSlashes::mutate(active_era, move |for_later| {
+						for_later.push(unapplied)
+					});
 					add_db_reads_writes(1, 1);
 				}
 			} else {
@@ -3414,9 +3435,7 @@ where
 		if bonded_eras.first().filter(|(_, start)| offence_session >= *start).is_some() {
 			R::report_offence(reporters, offence)
 		} else {
-			<Pallet<T>>::deposit_event(
-				Event::<T>::OldSlashingReportDiscarded(offence_session)
-			);
+			<Pallet<T>>::deposit_event(Event::<T>::OldSlashingReportDiscarded(offence_session));
 			Ok(())
 		}
 	}
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index 3242a40ccd45..d17076f4c36f 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -17,8 +17,9 @@
 
 //! Test utilities
 
-use crate::*;
 use crate as staking;
+use crate::*;
+use frame_election_provider_support::onchain;
 use frame_support::{
 	assert_ok, parameter_types,
 	traits::{Currency, FindAuthor, Get, OnInitialize, OneSessionHandler},
@@ -33,7 +34,6 @@ use sp_runtime::{
 };
 use sp_staking::offence::{OffenceDetails, OnOffenceHandler};
 use std::{cell::RefCell, collections::HashSet};
-use frame_election_provider_support::onchain;
 
 pub const INIT_TIMESTAMP: u64 = 30_000;
 pub const BLOCK_TIME: u64 = 1000;
@@ -54,16 +54,19 @@ impl OneSessionHandler<AccountId> for OtherSessionHandler {
 	type Key = UintAuthorityId;
 
 	fn on_genesis_session<'a, I: 'a>(_: I)
-		where I: Iterator<Item=(&'a AccountId, Self::Key)>, AccountId: 'a {}
+	where
+		I: Iterator<Item = (&'a AccountId, Self::Key)>,
+		AccountId: 'a,
+	{
+	}
 
-	fn on_new_session<'a, I: 'a>(_: bool, validators: I, _: I,)
-		where I: Iterator<Item=(&'a AccountId, Self::Key)>, AccountId: 'a
+	fn on_new_session<'a, I: 'a>(_: bool, validators: I, _: I)
+	where
+		I: Iterator<Item = (&'a AccountId, Self::Key)>,
+		AccountId: 'a,
 	{
 		SESSION.with(|x| {
-			*x.borrow_mut() = (
-				validators.map(|x| x.0.clone()).collect(),
-				HashSet::new(),
-			)
+			*x.borrow_mut() = (validators.map(|x| x.0.clone()).collect(), HashSet::new())
 		});
 	}
 
@@ -107,7 +110,8 @@ frame_support::construct_runtime!(
 pub struct Author11;
 impl FindAuthor<AccountId> for Author11 {
 	fn find_author<'a, I>(_digests: I) -> Option<AccountId>
-		where I: 'a + IntoIterator<Item = (frame_support::ConsensusEngineId, &'a [u8])>,
+	where
+		I: 'a + IntoIterator<Item = (frame_support::ConsensusEngineId, &'a [u8])>,
 	{
 		Some(11)
 	}
@@ -376,21 +380,14 @@ impl ExtBuilder {
 	}
 	fn build(self) -> sp_io::TestExternalities {
 		sp_tracing::try_init_simple();
-		let mut storage = frame_system::GenesisConfig::default()
-			.build_storage::<Test>()
-			.unwrap();
-		let balance_factor = if ExistentialDeposit::get() > 1 {
-			256
-		} else {
-			1
-		};
+		let mut storage = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+		let balance_factor = if ExistentialDeposit::get() > 1 { 256 } else { 1 };
 
 		let num_validators = self.num_validators.unwrap_or(self.validator_count);
 		// Check that the number of validators is sensible.
 		assert!(num_validators <= 8);
-		let validators = (0..num_validators)
-			.map(|x| ((x + 1) * 10 + 1) as AccountId)
-			.collect::<Vec<_>>();
+		let validators =
+			(0..num_validators).map(|x| ((x + 1) * 10 + 1) as AccountId).collect::<Vec<_>>();
 
 		let _ = pallet_balances::GenesisConfig::<Test> {
 			balances: vec![
@@ -419,7 +416,8 @@ impl ExtBuilder {
 				// This allows us to have a total_payout different from 0.
 				(999, 1_000_000_000_000),
 			],
-		}.assimilate_storage(&mut storage);
+		}
+		.assimilate_storage(&mut storage);
 
 		let mut stakers = vec![];
 		if self.has_stakers {
@@ -438,11 +436,11 @@ impl ExtBuilder {
 				(31, 30, stake_31, StakerStatus::<AccountId>::Validator),
 				(41, 40, balance_factor * 1000, status_41),
 				// nominator
-				(101, 100, balance_factor * 500, StakerStatus::<AccountId>::Nominator(nominated))
+				(101, 100, balance_factor * 500, StakerStatus::<AccountId>::Nominator(nominated)),
 			];
 		}
-		let _ = staking::GenesisConfig::<Test>{
-			stakers: stakers,
+		let _ = staking::GenesisConfig::<Test> {
+			stakers,
 			validator_count: self.validator_count,
 			minimum_validator_count: self.minimum_validator_count,
 			invulnerables: self.invulnerables,
@@ -454,12 +452,12 @@ impl ExtBuilder {
 		.assimilate_storage(&mut storage);
 
 		let _ = pallet_session::GenesisConfig::<Test> {
-			keys: validators.iter().map(|x| (
-				*x,
-				*x,
-				SessionKeys { other: UintAuthorityId(*x as u64) }
-			)).collect(),
-		}.assimilate_storage(&mut storage);
+			keys: validators
+				.iter()
+				.map(|x| (*x, *x, SessionKeys { other: UintAuthorityId(*x as u64) }))
+				.collect(),
+		}
+		.assimilate_storage(&mut storage);
 
 		let mut ext = sp_io::TestExternalities::from(storage);
 		ext.execute_with(|| {
@@ -524,42 +522,46 @@ fn check_nominators() {
 	// in if the nomination was submitted before the current era.
 	let era = active_era();
 	<Nominators<Test>>::iter()
-		.filter_map(|(nominator, nomination)|
-			if nomination.submitted_in > era {
-				Some(nominator)
-			} else {
-				None
-		})
+		.filter_map(
+			|(nominator, nomination)| {
+				if nomination.submitted_in > era {
+					Some(nominator)
+				} else {
+					None
+				}
+			},
+		)
 		.for_each(|nominator| {
-		// must be bonded.
-		assert_is_stash(nominator);
-		let mut sum = 0;
-		Session::validators()
-			.iter()
-			.map(|v| Staking::eras_stakers(era, v))
-			.for_each(|e| {
-				let individual = e.others.iter().filter(|e| e.who == nominator).collect::<Vec<_>>();
-				let len = individual.len();
-				match len {
-					0 => { /* not supporting this validator at all. */ },
-					1 => sum += individual[0].value,
-					_ => panic!("nominator cannot back a validator more than once."),
-				};
-			});
-
-		let nominator_stake = Staking::slashable_balance_of(&nominator);
-		// a nominator cannot over-spend.
-		assert!(
-			nominator_stake >= sum,
-			"failed: Nominator({}) stake({}) >= sum divided({})",
-			nominator,
-			nominator_stake,
-			sum,
-		);
+			// must be bonded.
+			assert_is_stash(nominator);
+			let mut sum = 0;
+			Session::validators()
+				.iter()
+				.map(|v| Staking::eras_stakers(era, v))
+				.for_each(|e| {
+					let individual =
+						e.others.iter().filter(|e| e.who == nominator).collect::<Vec<_>>();
+					let len = individual.len();
+					match len {
+						0 => { /* not supporting this validator at all. */ },
+						1 => sum += individual[0].value,
+						_ => panic!("nominator cannot back a validator more than once."),
+					};
+				});
+
+			let nominator_stake = Staking::slashable_balance_of(&nominator);
+			// a nominator cannot over-spend.
+			assert!(
+				nominator_stake >= sum,
+				"failed: Nominator({}) stake({}) >= sum divided({})",
+				nominator,
+				nominator_stake,
+				sum,
+			);
 
-		let diff = nominator_stake - sum;
-		assert!(diff < 100);
-	});
+			let diff = nominator_stake - sum;
+			assert!(diff < 100);
+		});
 }
 
 fn assert_is_stash(acc: AccountId) {
@@ -569,10 +571,7 @@ fn assert_is_stash(acc: AccountId) {
 fn assert_ledger_consistent(ctrl: AccountId) {
 	// ensures ledger.total == ledger.active + sum(ledger.unlocking).
 	let ledger = Staking::ledger(ctrl).expect("Not a controller.");
-	let real_total: Balance = ledger
-		.unlocking
-		.iter()
-		.fold(ledger.active, |a, c| a + c.value);
+	let real_total: Balance = ledger.unlocking.iter().fold(ledger.active, |a, c| a + c.value);
 	assert_eq!(real_total, ledger.total);
 	assert!(
 		ledger.active >= Balances::minimum_balance() || ledger.active == 0,
@@ -594,16 +593,8 @@ pub(crate) fn current_era() -> EraIndex {
 pub(crate) fn bond_validator(stash: AccountId, ctrl: AccountId, val: Balance) {
 	let _ = Balances::make_free_balance_be(&stash, val);
 	let _ = Balances::make_free_balance_be(&ctrl, val);
-	assert_ok!(Staking::bond(
-		Origin::signed(stash),
-		ctrl,
-		val,
-		RewardDestination::Controller,
-	));
-	assert_ok!(Staking::validate(
-		Origin::signed(ctrl),
-		ValidatorPrefs::default()
-	));
+	assert_ok!(Staking::bond(Origin::signed(stash), ctrl, val, RewardDestination::Controller,));
+	assert_ok!(Staking::validate(Origin::signed(ctrl), ValidatorPrefs::default()));
 }
 
 pub(crate) fn bond_nominator(
@@ -614,12 +605,7 @@ pub(crate) fn bond_nominator(
 ) {
 	let _ = Balances::make_free_balance_be(&stash, val);
 	let _ = Balances::make_free_balance_be(&ctrl, val);
-	assert_ok!(Staking::bond(
-		Origin::signed(stash),
-		ctrl,
-		val,
-		RewardDestination::Controller,
-	));
+	assert_ok!(Staking::bond(Origin::signed(stash), ctrl, val, RewardDestination::Controller,));
 	assert_ok!(Staking::nominate(Origin::signed(ctrl), target));
 }
 
@@ -715,9 +701,7 @@ pub(crate) fn reward_time_per_era() -> u64 {
 }
 
 pub(crate) fn reward_all_elected() {
-	let rewards = <Test as Config>::SessionInterface::validators()
-		.into_iter()
-		.map(|v| (v, 1));
+	let rewards = <Test as Config>::SessionInterface::validators().into_iter().map(|v| (v, 1));
 
 	<Pallet<Test>>::reward_by_ids(rewards)
 }
@@ -741,26 +725,28 @@ pub(crate) fn on_offence_in_era(
 	for &(bonded_era, start_session) in bonded_eras.iter() {
 		if bonded_era == era {
 			let _ = Staking::on_offence(offenders, slash_fraction, start_session);
-			return;
+			return
 		} else if bonded_era > era {
-			break;
+			break
 		}
 	}
 
 	if Staking::active_era().unwrap().index == era {
-		let _ =
-			Staking::on_offence(
-				offenders,
-				slash_fraction,
-				Staking::eras_start_session_index(era).unwrap()
-			);
+		let _ = Staking::on_offence(
+			offenders,
+			slash_fraction,
+			Staking::eras_start_session_index(era).unwrap(),
+		);
 	} else {
 		panic!("cannot slash in era {}", era);
 	}
 }
 
 pub(crate) fn on_offence_now(
-	offenders: &[OffenceDetails<AccountId, pallet_session::historical::IdentificationTuple<Test>>],
+	offenders: &[OffenceDetails<
+		AccountId,
+		pallet_session::historical::IdentificationTuple<Test>,
+	>],
 	slash_fraction: &[Perbill],
 ) {
 	let now = Staking::active_era().unwrap().index;
@@ -769,29 +755,26 @@ pub(crate) fn on_offence_now(
 
 pub(crate) fn add_slash(who: &AccountId) {
 	on_offence_now(
-		&[
-			OffenceDetails {
-				offender: (who.clone(), Staking::eras_stakers(active_era(), who.clone())),
-				reporters: vec![],
-			},
-		],
+		&[OffenceDetails {
+			offender: (who.clone(), Staking::eras_stakers(active_era(), who.clone())),
+			reporters: vec![],
+		}],
 		&[Perbill::from_percent(10)],
 	);
 }
 
 /// Make all validator and nominator request their payment
 pub(crate) fn make_all_reward_payment(era: EraIndex) {
-	let validators_with_reward =
-		ErasRewardPoints::<Test>::get(era).individual.keys().cloned().collect::<Vec<_>>();
+	let validators_with_reward = ErasRewardPoints::<Test>::get(era)
+		.individual
+		.keys()
+		.cloned()
+		.collect::<Vec<_>>();
 
 	// reward validators
 	for validator_controller in validators_with_reward.iter().filter_map(Staking::bonded) {
 		let ledger = <Ledger<Test>>::get(&validator_controller).unwrap();
-		assert_ok!(Staking::payout_stakers(
-			Origin::signed(1337),
-			ledger.stash,
-			era
-		));
+		assert_ok!(Staking::payout_stakers(Origin::signed(1337), ledger.stash, era));
 	}
 }
 
@@ -816,13 +799,11 @@ macro_rules! assert_session_era {
 }
 
 pub(crate) fn staking_events() -> Vec<staking::Event<Test>> {
-	System::events().into_iter().map(|r| r.event).filter_map(|e| {
-		if let Event::Staking(inner) = e {
-			Some(inner)
-		} else {
-			None
-		}
-	}).collect()
+	System::events()
+		.into_iter()
+		.map(|r| r.event)
+		.filter_map(|e| if let Event::Staking(inner) = e { Some(inner) } else { None })
+		.collect()
 }
 
 pub(crate) fn balances(who: &AccountId) -> (Balance, Balance) {
diff --git a/frame/staking/src/slashing.rs b/frame/staking/src/slashing.rs
index 1e959e9341ad..227043b656ee 100644
--- a/frame/staking/src/slashing.rs
+++ b/frame/staking/src/slashing.rs
@@ -50,16 +50,19 @@
 //! Based on research at <https://w3f-research.readthedocs.io/en/latest/polkadot/slashing/npos.html>
 
 use super::{
-	EraIndex, Config, Pallet, Store, BalanceOf, Exposure, Perbill, SessionInterface,
-	NegativeImbalanceOf, UnappliedSlash, Error,
+	BalanceOf, Config, EraIndex, Error, Exposure, NegativeImbalanceOf, Pallet, Perbill,
+	SessionInterface, Store, UnappliedSlash,
 };
-use sp_runtime::{traits::{Zero, Saturating}, RuntimeDebug, DispatchResult};
+use codec::{Decode, Encode};
 use frame_support::{
 	ensure,
-	traits::{Currency, OnUnbalanced, Imbalance},
+	traits::{Currency, Imbalance, OnUnbalanced},
+};
+use sp_runtime::{
+	traits::{Saturating, Zero},
+	DispatchResult, RuntimeDebug,
 };
 use sp_std::vec::Vec;
-use codec::{Encode, Decode};
 
 /// The proportion of the slashing reward to be paid out on the first slashing detection.
 /// This is f_1 in the paper.
@@ -118,7 +121,9 @@ impl SlashingSpans {
 	// that internal state is unchanged.
 	pub(crate) fn end_span(&mut self, now: EraIndex) -> bool {
 		let next_start = now + 1;
-		if next_start <= self.last_start { return false }
+		if next_start <= self.last_start {
+			return false
+		}
 
 		let last_length = next_start - self.last_start;
 		self.prior.insert(0, last_length);
@@ -153,7 +158,8 @@ impl SlashingSpans {
 	// If this returns `Some`, then it includes a range start..end of all the span
 	// indices which were pruned.
 	fn prune(&mut self, window_start: EraIndex) -> Option<(SpanIndex, SpanIndex)> {
-		let old_idx = self.iter()
+		let old_idx = self
+			.iter()
 			.skip(1) // skip ongoing span.
 			.position(|span| span.length.map_or(false, |len| span.start + len <= window_start));
 
@@ -163,7 +169,7 @@ impl SlashingSpans {
 				self.prior.truncate(o);
 				let new_earliest = self.span_index - self.prior.len() as SpanIndex;
 				Some((earliest_span_index, new_earliest))
-			}
+			},
 			None => None,
 		};
 
@@ -214,18 +220,11 @@ pub(crate) struct SlashParams<'a, T: 'a + Config> {
 ///
 /// The pending slash record returned does not have initialized reporters. Those have
 /// to be set at a higher level, if any.
-pub(crate) fn compute_slash<T: Config>(params: SlashParams<T>)
-	-> Option<UnappliedSlash<T::AccountId, BalanceOf<T>>>
-{
-	let SlashParams {
-		stash,
-		slash,
-		exposure,
-		slash_era,
-		window_start,
-		now,
-		reward_proportion,
-	} = params.clone();
+pub(crate) fn compute_slash<T: Config>(
+	params: SlashParams<T>,
+) -> Option<UnappliedSlash<T::AccountId, BalanceOf<T>>> {
+	let SlashParams { stash, slash, exposure, slash_era, window_start, now, reward_proportion } =
+		params.clone();
 
 	let mut reward_payout = Zero::zero();
 	let mut val_slashed = Zero::zero();
@@ -236,22 +235,17 @@ pub(crate) fn compute_slash<T: Config>(params: SlashParams<T>)
 		// kick out the validator even if they won't be slashed,
 		// as long as the misbehavior is from their most recent slashing span.
 		kick_out_if_recent::<T>(params);
-		return None;
+		return None
 	}
 
-	let (prior_slash_p, _era_slash) = <Pallet<T> as Store>::ValidatorSlashInEra::get(
-		&slash_era,
-		stash,
-	).unwrap_or((Perbill::zero(), Zero::zero()));
+	let (prior_slash_p, _era_slash) =
+		<Pallet<T> as Store>::ValidatorSlashInEra::get(&slash_era, stash)
+			.unwrap_or((Perbill::zero(), Zero::zero()));
 
 	// compare slash proportions rather than slash values to avoid issues due to rounding
 	// error.
 	if slash.deconstruct() > prior_slash_p.deconstruct() {
-		<Pallet<T> as Store>::ValidatorSlashInEra::insert(
-			&slash_era,
-			stash,
-			&(slash, own_slash),
-		);
+		<Pallet<T> as Store>::ValidatorSlashInEra::insert(&slash_era, stash, &(slash, own_slash));
 	} else {
 		// we slash based on the max in era - this new event is not the max,
 		// so neither the validator or any nominators will need an update.
@@ -260,7 +254,7 @@ pub(crate) fn compute_slash<T: Config>(params: SlashParams<T>)
 		// pays out some reward even if the latest report is not max-in-era.
 		// we opt to avoid the nominator lookups and edits and leave more rewards
 		// for more drastic misbehavior.
-		return None;
+		return None
 	}
 
 	// apply slash to validator.
@@ -273,10 +267,7 @@ pub(crate) fn compute_slash<T: Config>(params: SlashParams<T>)
 			reward_proportion,
 		);
 
-		let target_span = spans.compare_and_update_span_slash(
-			slash_era,
-			own_slash,
-		);
+		let target_span = spans.compare_and_update_span_slash(slash_era, own_slash);
 
 		if target_span == Some(spans.span_index()) {
 			// misbehavior occurred within the current slashing span - take appropriate
@@ -309,9 +300,7 @@ pub(crate) fn compute_slash<T: Config>(params: SlashParams<T>)
 
 // doesn't apply any slash, but kicks out the validator if the misbehavior is from
 // the most recent slashing span.
-fn kick_out_if_recent<T: Config>(
-	params: SlashParams<T>,
-) {
+fn kick_out_if_recent<T: Config>(params: SlashParams<T>) {
 	// these are not updated by era-span or end-span.
 	let mut reward_payout = Zero::zero();
 	let mut val_slashed = Zero::zero();
@@ -343,15 +332,8 @@ fn slash_nominators<T: Config>(
 	prior_slash_p: Perbill,
 	nominators_slashed: &mut Vec<(T::AccountId, BalanceOf<T>)>,
 ) -> BalanceOf<T> {
-	let SlashParams {
-		stash: _,
-		slash,
-		exposure,
-		slash_era,
-		window_start,
-		now,
-		reward_proportion,
-	} = params;
+	let SlashParams { stash: _, slash, exposure, slash_era, window_start, now, reward_proportion } =
+		params;
 
 	let mut reward_payout = Zero::zero();
 
@@ -367,18 +349,12 @@ fn slash_nominators<T: Config>(
 			let own_slash_by_validator = slash * nominator.value;
 			let own_slash_difference = own_slash_by_validator.saturating_sub(own_slash_prior);
 
-			let mut era_slash = <Pallet<T> as Store>::NominatorSlashInEra::get(
-				&slash_era,
-				stash,
-			).unwrap_or_else(|| Zero::zero());
+			let mut era_slash = <Pallet<T> as Store>::NominatorSlashInEra::get(&slash_era, stash)
+				.unwrap_or_else(|| Zero::zero());
 
 			era_slash += own_slash_difference;
 
-			<Pallet<T> as Store>::NominatorSlashInEra::insert(
-				&slash_era,
-				stash,
-				&era_slash,
-			);
+			<Pallet<T> as Store>::NominatorSlashInEra::insert(&slash_era, stash, &era_slash);
 
 			era_slash
 		};
@@ -393,10 +369,7 @@ fn slash_nominators<T: Config>(
 				reward_proportion,
 			);
 
-			let target_span = spans.compare_and_update_span_slash(
-				slash_era,
-				era_slash,
-			);
+			let target_span = spans.compare_and_update_span_slash(slash_era, era_slash);
 
 			if target_span == Some(spans.span_index()) {
 				// End the span, but don't chill the nominator. its nomination
@@ -497,8 +470,8 @@ impl<'a, T: 'a + Config> InspectingSpans<'a, T> {
 			span_record.slashed = slash;
 
 			// compute reward.
-			let reward = REWARD_F1
-				* (self.reward_proportion * slash).saturating_sub(span_record.paid_out);
+			let reward =
+				REWARD_F1 * (self.reward_proportion * slash).saturating_sub(span_record.paid_out);
 
 			self.add_slash(difference, slash_era);
 			changed = true;
@@ -529,7 +502,9 @@ impl<'a, T: 'a + Config> InspectingSpans<'a, T> {
 impl<'a, T: 'a + Config> Drop for InspectingSpans<'a, T> {
 	fn drop(&mut self) {
 		// only update on disk if we slashed this account.
-		if !self.dirty { return }
+		if !self.dirty {
+			return
+		}
 
 		if let Some((start, end)) = self.spans.prune(self.window_start) {
 			for span_index in start..end {
@@ -557,7 +532,10 @@ pub(crate) fn clear_stash_metadata<T: Config>(
 		Some(s) => s,
 	};
 
-	ensure!(num_slashing_spans as usize >= spans.iter().count(), Error::<T>::IncorrectSlashingSpans);
+	ensure!(
+		num_slashing_spans as usize >= spans.iter().count(),
+		Error::<T>::IncorrectSlashingSpans
+	);
 
 	<Pallet<T> as Store>::SlashingSpans::remove(stash);
 
@@ -606,9 +584,7 @@ pub fn do_slash<T: Config>(
 		<Pallet<T>>::update_ledger(&controller, &ledger);
 
 		// trigger the event
-		<Pallet<T>>::deposit_event(
-			super::Event::<T>::Slash(stash.clone(), value)
-		);
+		<Pallet<T>>::deposit_event(super::Event::<T>::Slash(stash.clone(), value));
 	}
 }
 
@@ -625,18 +601,12 @@ pub(crate) fn apply_slash<T: Config>(unapplied_slash: UnappliedSlash<T::AccountI
 	);
 
 	for &(ref nominator, nominator_slash) in &unapplied_slash.others {
-		do_slash::<T>(
-			&nominator,
-			nominator_slash,
-			&mut reward_payout,
-			&mut slashed_imbalance,
-		);
+		do_slash::<T>(&nominator, nominator_slash, &mut reward_payout, &mut slashed_imbalance);
 	}
 
 	pay_reporters::<T>(reward_payout, slashed_imbalance, &unapplied_slash.reporters);
 }
 
-
 /// Apply a reward payout to some reporters, paying the rewards out of the slashed imbalance.
 fn pay_reporters<T: Config>(
 	reward_payout: BalanceOf<T>,
@@ -774,17 +744,13 @@ mod tests {
 		assert_eq!(spans.prune(1000), Some((8, 10)));
 		assert_eq!(
 			spans.iter().collect::<Vec<_>>(),
-			vec![
-				SlashingSpan { index: 10, start: 1000, length: None },
-			],
+			vec![SlashingSpan { index: 10, start: 1000, length: None },],
 		);
 
 		assert_eq!(spans.prune(2000), None);
 		assert_eq!(
 			spans.iter().collect::<Vec<_>>(),
-			vec![
-				SlashingSpan { index: 10, start: 2000, length: None },
-			],
+			vec![SlashingSpan { index: 10, start: 2000, length: None },],
 		);
 
 		// now all in one shot.
@@ -797,9 +763,7 @@ mod tests {
 		assert_eq!(spans.prune(2000), Some((6, 10)));
 		assert_eq!(
 			spans.iter().collect::<Vec<_>>(),
-			vec![
-				SlashingSpan { index: 10, start: 2000, length: None },
-			],
+			vec![SlashingSpan { index: 10, start: 2000, length: None },],
 		);
 	}
 
diff --git a/frame/staking/src/testing_utils.rs b/frame/staking/src/testing_utils.rs
index 18b77d59b3e2..0d9ae2c8e41a 100644
--- a/frame/staking/src/testing_utils.rs
+++ b/frame/staking/src/testing_utils.rs
@@ -18,12 +18,14 @@
 //! Testing utils for staking. Provides some common functions to setup staking state, such as
 //! bonding validators, nominators, and generating different types of solutions.
 
-use crate::*;
-use crate::Pallet as Staking;
+use crate::{Pallet as Staking, *};
 use frame_benchmarking::account;
 use frame_system::RawOrigin;
+use rand_chacha::{
+	rand_core::{RngCore, SeedableRng},
+	ChaChaRng,
+};
 use sp_io::hashing::blake2_256;
-use rand_chacha::{rand_core::{RngCore, SeedableRng}, ChaChaRng};
 
 const SEED: u32 = 0;
 
@@ -54,14 +56,18 @@ pub fn create_stash_controller<T: Config>(
 	n: u32,
 	balance_factor: u32,
 	destination: RewardDestination<T::AccountId>,
-)
-	-> Result<(T::AccountId, T::AccountId), &'static str>
-{
+) -> Result<(T::AccountId, T::AccountId), &'static str> {
 	let stash = create_funded_user::<T>("stash", n, balance_factor);
 	let controller = create_funded_user::<T>("controller", n, balance_factor);
-	let controller_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(controller.clone());
+	let controller_lookup: <T::Lookup as StaticLookup>::Source =
+		T::Lookup::unlookup(controller.clone());
 	let amount = T::Currency::minimum_balance() * (balance_factor / 10).max(1).into();
-	Staking::<T>::bond(RawOrigin::Signed(stash.clone()).into(), controller_lookup, amount, destination)?;
+	Staking::<T>::bond(
+		RawOrigin::Signed(stash.clone()).into(),
+		controller_lookup,
+		amount,
+		destination,
+	)?;
 	return Ok((stash, controller))
 }
 
@@ -71,15 +77,19 @@ pub fn create_stash_and_dead_controller<T: Config>(
 	n: u32,
 	balance_factor: u32,
 	destination: RewardDestination<T::AccountId>,
-)
-	-> Result<(T::AccountId, T::AccountId), &'static str>
-{
+) -> Result<(T::AccountId, T::AccountId), &'static str> {
 	let stash = create_funded_user::<T>("stash", n, balance_factor);
 	// controller has no funds
 	let controller = create_funded_user::<T>("controller", n, 0);
-	let controller_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(controller.clone());
+	let controller_lookup: <T::Lookup as StaticLookup>::Source =
+		T::Lookup::unlookup(controller.clone());
 	let amount = T::Currency::minimum_balance() * (balance_factor / 10).max(1).into();
-	Staking::<T>::bond(RawOrigin::Signed(stash.clone()).into(), controller_lookup, amount, destination)?;
+	Staking::<T>::bond(
+		RawOrigin::Signed(stash.clone()).into(),
+		controller_lookup,
+		amount,
+		destination,
+	)?;
 	return Ok((stash, controller))
 }
 
@@ -89,12 +99,11 @@ pub fn create_validators<T: Config>(
 	balance_factor: u32,
 ) -> Result<Vec<<T::Lookup as StaticLookup>::Source>, &'static str> {
 	let mut validators: Vec<<T::Lookup as StaticLookup>::Source> = Vec::with_capacity(max as usize);
-	for i in 0 .. max {
-		let (stash, controller) = create_stash_controller::<T>(i, balance_factor, RewardDestination::Staked)?;
-		let validator_prefs = ValidatorPrefs {
-			commission: Perbill::from_percent(50),
-			.. Default::default()
-		};
+	for i in 0..max {
+		let (stash, controller) =
+			create_stash_controller::<T>(i, balance_factor, RewardDestination::Staked)?;
+		let validator_prefs =
+			ValidatorPrefs { commission: Perbill::from_percent(50), ..Default::default() };
 		Staking::<T>::validate(RawOrigin::Signed(controller).into(), validator_prefs)?;
 		let stash_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(stash);
 		validators.push(stash_lookup);
@@ -126,20 +135,20 @@ pub fn create_validators_with_nominators_for_era<T: Config>(
 ) -> Result<Vec<<T::Lookup as StaticLookup>::Source>, &'static str> {
 	clear_validators_and_nominators::<T>();
 
-	let mut validators_stash: Vec<<T::Lookup as StaticLookup>::Source>
-		= Vec::with_capacity(validators as usize);
+	let mut validators_stash: Vec<<T::Lookup as StaticLookup>::Source> =
+		Vec::with_capacity(validators as usize);
 	let mut rng = ChaChaRng::from_seed(SEED.using_encoded(blake2_256));
 
 	// Create validators
-	for i in 0 .. validators {
+	for i in 0..validators {
 		let balance_factor = if randomize_stake { rng.next_u32() % 255 + 10 } else { 100u32 };
-		let (v_stash, v_controller) = create_stash_controller::<T>(i, balance_factor, RewardDestination::Staked)?;
-		let validator_prefs = ValidatorPrefs {
-			commission: Perbill::from_percent(50),
-			.. Default::default()
-		};
+		let (v_stash, v_controller) =
+			create_stash_controller::<T>(i, balance_factor, RewardDestination::Staked)?;
+		let validator_prefs =
+			ValidatorPrefs { commission: Perbill::from_percent(50), ..Default::default() };
 		Staking::<T>::validate(RawOrigin::Signed(v_controller.clone()).into(), validator_prefs)?;
-		let stash_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(v_stash.clone());
+		let stash_lookup: <T::Lookup as StaticLookup>::Source =
+			T::Lookup::unlookup(v_stash.clone());
 		validators_stash.push(stash_lookup.clone());
 	}
 
@@ -147,25 +156,25 @@ pub fn create_validators_with_nominators_for_era<T: Config>(
 	let validator_chosen = validators_stash[0..to_nominate].to_vec();
 
 	// Create nominators
-	for j in 0 .. nominators {
+	for j in 0..nominators {
 		let balance_factor = if randomize_stake { rng.next_u32() % 255 + 10 } else { 100u32 };
-		let (_n_stash, n_controller) = create_stash_controller::<T>(
-			u32::MAX - j,
-			balance_factor,
-			RewardDestination::Staked,
-		)?;
+		let (_n_stash, n_controller) =
+			create_stash_controller::<T>(u32::MAX - j, balance_factor, RewardDestination::Staked)?;
 
 		// Have them randomly validate
 		let mut available_validators = validator_chosen.clone();
 		let mut selected_validators: Vec<<T::Lookup as StaticLookup>::Source> =
 			Vec::with_capacity(edge_per_nominator);
 
-		for _ in 0 .. validators.min(edge_per_nominator as u32) {
+		for _ in 0..validators.min(edge_per_nominator as u32) {
 			let selected = rng.next_u32() as usize % available_validators.len();
 			let validator = available_validators.remove(selected);
 			selected_validators.push(validator);
 		}
-		Staking::<T>::nominate(RawOrigin::Signed(n_controller.clone()).into(), selected_validators)?;
+		Staking::<T>::nominate(
+			RawOrigin::Signed(n_controller.clone()).into(),
+			selected_validators,
+		)?;
 	}
 
 	ValidatorCount::<T>::put(validators);
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index bbb0d5522fcc..9aae4cb15768 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -17,21 +17,21 @@
 
 //! Tests for the module.
 
-use super::{*, Event};
+use super::{Event, *};
+use frame_election_provider_support::Support;
+use frame_support::{
+	assert_noop, assert_ok,
+	traits::{Currency, OnInitialize, ReservableCurrency},
+	weights::{extract_actual_weight, GetDispatchInfo},
+};
 use mock::*;
+use pallet_balances::Error as BalancesError;
 use sp_runtime::{
 	assert_eq_error_rate,
 	traits::{BadOrigin, Dispatchable},
 };
 use sp_staking::offence::OffenceDetails;
-use frame_support::{
-	assert_ok, assert_noop,
-	traits::{Currency, ReservableCurrency, OnInitialize},
-	weights::{extract_actual_weight, GetDispatchInfo},
-};
-use pallet_balances::Error as BalancesError;
 use substrate_test_utils::assert_eq_uvec;
-use frame_election_provider_support::Support;
 
 #[test]
 fn force_unstake_works() {
@@ -48,7 +48,10 @@ fn force_unstake_works() {
 		// Force unstake requires root.
 		assert_noop!(Staking::force_unstake(Origin::signed(11), 11, 2), BadOrigin);
 		// Force unstake needs correct number of slashing spans (for weight calculation)
-		assert_noop!(Staking::force_unstake(Origin::root(), 11, 0), Error::<Test>::IncorrectSlashingSpans);
+		assert_noop!(
+			Staking::force_unstake(Origin::root(), 11, 0),
+			Error::<Test>::IncorrectSlashingSpans
+		);
 		// We now force them to unstake
 		assert_ok!(Staking::force_unstake(Origin::root(), 11, 2));
 		// No longer bonded.
@@ -90,26 +93,47 @@ fn basic_setup_works() {
 		// Account 10 controls the stash from account 11, which is 100 * balance_factor units
 		assert_eq!(
 			Staking::ledger(&10),
-			Some(StakingLedger { stash: 11, total: 1000, active: 1000, unlocking: vec![], claimed_rewards: vec![] })
+			Some(StakingLedger {
+				stash: 11,
+				total: 1000,
+				active: 1000,
+				unlocking: vec![],
+				claimed_rewards: vec![]
+			})
 		);
 		// Account 20 controls the stash from account 21, which is 200 * balance_factor units
 		assert_eq!(
 			Staking::ledger(&20),
-			Some(StakingLedger { stash: 21, total: 1000, active: 1000, unlocking: vec![], claimed_rewards: vec![] })
+			Some(StakingLedger {
+				stash: 21,
+				total: 1000,
+				active: 1000,
+				unlocking: vec![],
+				claimed_rewards: vec![]
+			})
 		);
 		// Account 1 does not control any stash
 		assert_eq!(Staking::ledger(&1), None);
 
 		// ValidatorPrefs are default
-		assert_eq_uvec!(<Validators<Test>>::iter().collect::<Vec<_>>(), vec![
-			(31, ValidatorPrefs::default()),
-			(21, ValidatorPrefs::default()),
-			(11, ValidatorPrefs::default())
-		]);
+		assert_eq_uvec!(
+			<Validators<Test>>::iter().collect::<Vec<_>>(),
+			vec![
+				(31, ValidatorPrefs::default()),
+				(21, ValidatorPrefs::default()),
+				(11, ValidatorPrefs::default())
+			]
+		);
 
 		assert_eq!(
 			Staking::ledger(100),
-			Some(StakingLedger { stash: 101, total: 500, active: 500, unlocking: vec![], claimed_rewards: vec![] })
+			Some(StakingLedger {
+				stash: 101,
+				total: 500,
+				active: 500,
+				unlocking: vec![],
+				claimed_rewards: vec![]
+			})
 		);
 		assert_eq!(Staking::nominators(101).unwrap().targets, vec![11, 21]);
 
@@ -118,7 +142,7 @@ fn basic_setup_works() {
 			Exposure {
 				total: 1125,
 				own: 1000,
-				others: vec![ IndividualExposure { who: 101, value: 125 }]
+				others: vec![IndividualExposure { who: 101, value: 125 }]
 			},
 		);
 		assert_eq!(
@@ -126,14 +150,13 @@ fn basic_setup_works() {
 			Exposure {
 				total: 1375,
 				own: 1000,
-				others: vec![ IndividualExposure { who: 101, value: 375 }]
+				others: vec![IndividualExposure { who: 101, value: 375 }]
 			},
 		);
 
 		// initial total stake = 1125 + 1375
 		assert_eq!(Staking::eras_total_stake(Staking::active_era().unwrap().index), 2500);
 
-
 		// The number of validators required.
 		assert_eq!(Staking::validator_count(), 2);
 
@@ -245,9 +268,9 @@ fn rewards_should_work() {
 		assert_eq_error_rate!(Balances::total_balance(&21), init_balance_21, 2,);
 		assert_eq_error_rate!(
 			Balances::total_balance(&100),
-			init_balance_100
-				+ part_for_100_from_10 * total_payout_0 * 2/3
-				+ part_for_100_from_20 * total_payout_0 * 1/3,
+			init_balance_100 +
+				part_for_100_from_10 * total_payout_0 * 2 / 3 +
+				part_for_100_from_20 * total_payout_0 * 1 / 3,
 			2
 		);
 		assert_eq_error_rate!(Balances::total_balance(&101), init_balance_101, 2);
@@ -283,9 +306,9 @@ fn rewards_should_work() {
 		assert_eq_error_rate!(Balances::total_balance(&21), init_balance_21, 2,);
 		assert_eq_error_rate!(
 			Balances::total_balance(&100),
-			init_balance_100
-				+ part_for_100_from_10 * (total_payout_0 * 2/3 + total_payout_1)
-				+ part_for_100_from_20 * total_payout_0 * 1/3,
+			init_balance_100 +
+				part_for_100_from_10 * (total_payout_0 * 2 / 3 + total_payout_1) +
+				part_for_100_from_20 * total_payout_0 * 1 / 3,
 			2
 		);
 		assert_eq_error_rate!(Balances::total_balance(&101), init_balance_101, 2);
@@ -302,7 +325,9 @@ fn staking_should_work() {
 			assert_eq_uvec!(validator_controllers(), vec![20, 10]);
 
 			// put some money in account that we'll use.
-			for i in 1..5 { let _ = Balances::make_free_balance_be(&i, 2000); }
+			for i in 1..5 {
+				let _ = Balances::make_free_balance_be(&i, 2000);
+			}
 
 			// --- Block 2:
 			start_session(2);
@@ -319,7 +344,6 @@ fn staking_should_work() {
 			// No effects will be seen so far. Era has not been yet triggered.
 			assert_eq_uvec!(validator_controllers(), vec![20, 10]);
 
-
 			// --- Block 4: the validators will now be queued.
 			start_session(4);
 			assert_eq!(Staking::active_era().unwrap().index, 1);
@@ -375,7 +399,10 @@ fn blocking_and_kicking_works() {
 		.num_validators(3)
 		.build_and_execute(|| {
 			// block validator 10/11
-			assert_ok!(Staking::validate(Origin::signed(10), ValidatorPrefs { blocked: true, .. Default::default() }));
+			assert_ok!(Staking::validate(
+				Origin::signed(10),
+				ValidatorPrefs { blocked: true, ..Default::default() }
+			));
 			// attempt to nominate from 100/101...
 			assert_ok!(Staking::nominate(Origin::signed(100), vec![11]));
 			// should have worked since we're already nominated them
@@ -385,7 +412,10 @@ fn blocking_and_kicking_works() {
 			// should have been kicked now
 			assert!(Nominators::<Test>::get(&101).unwrap().targets.is_empty());
 			// attempt to nominate from 100/101...
-			assert_noop!(Staking::nominate(Origin::signed(100), vec![11]), Error::<Test>::BadTarget);
+			assert_noop!(
+				Staking::nominate(Origin::signed(100), vec![11]),
+				Error::<Test>::BadTarget
+			);
 		});
 }
 
@@ -408,10 +438,8 @@ fn less_than_needed_candidates_works() {
 
 			// But the exposure is updated in a simple way. No external votes exists.
 			// This is purely self-vote.
-			assert!(
-				ErasStakers::<Test>::iter_prefix_values(Staking::active_era().unwrap().index)
-					.all(|exposure| exposure.others.is_empty())
-			);
+			assert!(ErasStakers::<Test>::iter_prefix_values(Staking::active_era().unwrap().index)
+				.all(|exposure| exposure.others.is_empty()));
 		});
 }
 
@@ -426,7 +454,7 @@ fn no_candidate_emergency_condition() {
 		.build_and_execute(|| {
 			// initial validators
 			assert_eq_uvec!(validator_controllers(), vec![10, 20, 30, 40]);
-			let prefs = ValidatorPrefs { commission: Perbill::one(), .. Default::default() };
+			let prefs = ValidatorPrefs { commission: Perbill::one(), ..Default::default() };
 			<Staking as crate::Store>::Validators::insert(11, prefs.clone());
 
 			// set the minimum validator count.
@@ -440,10 +468,7 @@ fn no_candidate_emergency_condition() {
 
 			// try trigger new era
 			mock::run_to_block(20);
-			assert_eq!(
-				*staking_events().last().unwrap(),
-				Event::StakingElectionFailed,
-			);
+			assert_eq!(*staking_events().last().unwrap(), Event::StakingElectionFailed,);
 			// No new era is created
 			assert_eq!(current_era, CurrentEra::<Test>::get());
 
@@ -506,7 +531,11 @@ fn nominating_and_rewards_should_work() {
 			// ------ check the staked value of all parties.
 
 			// 30 and 40 are not chosen anymore
-			assert_eq!(ErasStakers::<Test>::iter_prefix_values(Staking::active_era().unwrap().index).count(), 2);
+			assert_eq!(
+				ErasStakers::<Test>::iter_prefix_values(Staking::active_era().unwrap().index)
+					.count(),
+				2
+			);
 			assert_eq!(
 				Staking::eras_stakers(Staking::active_era().unwrap().index, 11),
 				Exposure {
@@ -578,10 +607,7 @@ fn nominators_also_get_slashed_pro_rata() {
 		let slash_percent = Perbill::from_percent(5);
 		let initial_exposure = Staking::eras_stakers(active_era(), 11);
 		// 101 is a nominator for 11
-		assert_eq!(
-			initial_exposure.others.first().unwrap().who,
-			101,
-		);
+		assert_eq!(initial_exposure.others.first().unwrap().who, 101,);
 
 		// staked values;
 		let nominator_stake = Staking::ledger(100).unwrap().active;
@@ -594,13 +620,7 @@ fn nominators_also_get_slashed_pro_rata() {
 
 		// 11 goes offline
 		on_offence_now(
-			&[OffenceDetails {
-				offender: (
-					11,
-					initial_exposure.clone(),
-				),
-				reporters: vec![],
-			}],
+			&[OffenceDetails { offender: (11, initial_exposure.clone()), reporters: vec![] }],
 			&[slash_percent],
 		);
 
@@ -611,24 +631,16 @@ fn nominators_also_get_slashed_pro_rata() {
 		let slash_amount = slash_percent * exposed_stake;
 		let validator_share =
 			Perbill::from_rational(exposed_validator, exposed_stake) * slash_amount;
-		let nominator_share = Perbill::from_rational(
-			exposed_nominator,
-			exposed_stake,
-		) * slash_amount;
+		let nominator_share =
+			Perbill::from_rational(exposed_nominator, exposed_stake) * slash_amount;
 
 		// both slash amounts need to be positive for the test to make sense.
 		assert!(validator_share > 0);
 		assert!(nominator_share > 0);
 
 		// both stakes must have been decreased pro-rata.
-		assert_eq!(
-			Staking::ledger(100).unwrap().active,
-			nominator_stake - nominator_share,
-		);
-		assert_eq!(
-			Staking::ledger(10).unwrap().active,
-			validator_stake - validator_share,
-		);
+		assert_eq!(Staking::ledger(100).unwrap().active, nominator_stake - nominator_share,);
+		assert_eq!(Staking::ledger(10).unwrap().active, validator_stake - validator_share,);
 		assert_eq!(
 			balances(&101).0, // free balance
 			nominator_balance - nominator_share,
@@ -651,14 +663,16 @@ fn double_staking_should_fail() {
 	ExtBuilder::default().build_and_execute(|| {
 		let arbitrary_value = 5;
 		// 2 = controller, 1 stashed => ok
-		assert_ok!(
-			Staking::bond(Origin::signed(1), 2, arbitrary_value,
-			RewardDestination::default())
-		);
+		assert_ok!(Staking::bond(
+			Origin::signed(1),
+			2,
+			arbitrary_value,
+			RewardDestination::default()
+		));
 		// 4 = not used so far, 1 stashed => not allowed.
 		assert_noop!(
-			Staking::bond(Origin::signed(1), 4, arbitrary_value,
-			RewardDestination::default()), Error::<Test>::AlreadyBonded,
+			Staking::bond(Origin::signed(1), 4, arbitrary_value, RewardDestination::default()),
+			Error::<Test>::AlreadyBonded,
 		);
 		// 1 = stashed => attempting to nominate should fail.
 		assert_noop!(Staking::nominate(Origin::signed(1), vec![1]), Error::<Test>::NotController);
@@ -833,7 +847,6 @@ fn forcing_new_era_works() {
 
 		start_session(15);
 		assert_eq!(active_era(), 6);
-
 	});
 }
 
@@ -892,10 +905,7 @@ fn cannot_reserve_staked_balance() {
 		// Confirm account 11 (via controller 10) is totally staked
 		assert_eq!(Staking::eras_stakers(Staking::active_era().unwrap().index, 11).own, 1000);
 		// Confirm account 11 cannot reserve as a result
-		assert_noop!(
-			Balances::reserve(&11, 1),
-			BalancesError::<Test, _>::LiquidityRestrictions,
-		);
+		assert_noop!(Balances::reserve(&11, 1), BalancesError::<Test, _>::LiquidityRestrictions,);
 
 		// Give account 11 extra free balance
 		let _ = Balances::make_free_balance_be(&11, 10000);
@@ -915,13 +925,16 @@ fn reward_destination_works() {
 		// Check the balance of the stash account
 		assert_eq!(Balances::free_balance(11), 1000);
 		// Check how much is at stake
-		assert_eq!(Staking::ledger(&10), Some(StakingLedger {
-			stash: 11,
-			total: 1000,
-			active: 1000,
-			unlocking: vec![],
-			claimed_rewards: vec![],
-		}));
+		assert_eq!(
+			Staking::ledger(&10),
+			Some(StakingLedger {
+				stash: 11,
+				total: 1000,
+				active: 1000,
+				unlocking: vec![],
+				claimed_rewards: vec![],
+			})
+		);
 
 		// Compute total payout now for whole duration as other parameter won't change
 		let total_payout_0 = current_total_payout_for_duration(reward_time_per_era());
@@ -935,15 +948,18 @@ fn reward_destination_works() {
 		// Check that reward went to the stash account of validator
 		assert_eq!(Balances::free_balance(11), 1000 + total_payout_0);
 		// Check that amount at stake increased accordingly
-		assert_eq!(Staking::ledger(&10), Some(StakingLedger {
-			stash: 11,
-			total: 1000 + total_payout_0,
-			active: 1000 + total_payout_0,
-			unlocking: vec![],
-			claimed_rewards: vec![0],
-		}));
-
-		//Change RewardDestination to Stash
+		assert_eq!(
+			Staking::ledger(&10),
+			Some(StakingLedger {
+				stash: 11,
+				total: 1000 + total_payout_0,
+				active: 1000 + total_payout_0,
+				unlocking: vec![],
+				claimed_rewards: vec![0],
+			})
+		);
+
+		// Change RewardDestination to Stash
 		<Payee<Test>>::insert(&11, RewardDestination::Stash);
 
 		// Compute total payout now for whole duration as other parameter won't change
@@ -960,13 +976,16 @@ fn reward_destination_works() {
 		// Record this value
 		let recorded_stash_balance = 1000 + total_payout_0 + total_payout_1;
 		// Check that amount at stake is NOT increased
-		assert_eq!(Staking::ledger(&10), Some(StakingLedger {
-			stash: 11,
-			total: 1000 + total_payout_0,
-			active: 1000 + total_payout_0,
-			unlocking: vec![],
-			claimed_rewards: vec![0,1],
-		}));
+		assert_eq!(
+			Staking::ledger(&10),
+			Some(StakingLedger {
+				stash: 11,
+				total: 1000 + total_payout_0,
+				active: 1000 + total_payout_0,
+				unlocking: vec![],
+				claimed_rewards: vec![0, 1],
+			})
+		);
 
 		// Change RewardDestination to Controller
 		<Payee<Test>>::insert(&11, RewardDestination::Controller);
@@ -986,13 +1005,16 @@ fn reward_destination_works() {
 		// Check that reward went to the controller account
 		assert_eq!(Balances::free_balance(10), 1 + total_payout_2);
 		// Check that amount at stake is NOT increased
-		assert_eq!(Staking::ledger(&10), Some(StakingLedger {
-			stash: 11,
-			total: 1000 + total_payout_0,
-			active: 1000 + total_payout_0,
-			unlocking: vec![],
-			claimed_rewards: vec![0,1,2],
-		}));
+		assert_eq!(
+			Staking::ledger(&10),
+			Some(StakingLedger {
+				stash: 11,
+				total: 1000 + total_payout_0,
+				active: 1000 + total_payout_0,
+				unlocking: vec![],
+				claimed_rewards: vec![0, 1, 2],
+			})
+		);
 		// Check that amount in staked account is NOT increased.
 		assert_eq!(Balances::free_balance(11), recorded_stash_balance);
 	});
@@ -1005,10 +1027,10 @@ fn validator_payment_prefs_work() {
 	// This test will focus on validator payment.
 	ExtBuilder::default().build_and_execute(|| {
 		let commission = Perbill::from_percent(40);
-		<Validators<Test>>::insert(&11, ValidatorPrefs {
-			commission: commission.clone(),
-			.. Default::default()
-		});
+		<Validators<Test>>::insert(
+			&11,
+			ValidatorPrefs { commission: commission.clone(), ..Default::default() },
+		);
 
 		// Reward controller so staked ratio doesn't change.
 		<Payee<Test>>::insert(&11, RewardDestination::Controller);
@@ -1035,7 +1057,6 @@ fn validator_payment_prefs_work() {
 		assert_eq_error_rate!(Balances::total_balance(&10), balance_era_1_10 + reward_of_10, 2);
 		assert_eq_error_rate!(Balances::total_balance(&100), balance_era_1_100 + reward_of_100, 2);
 	});
-
 }
 
 #[test]
@@ -1049,13 +1070,16 @@ fn bond_extra_works() {
 		// Check that account 10 is bonded to account 11
 		assert_eq!(Staking::bonded(&11), Some(10));
 		// Check how much is at stake
-		assert_eq!(Staking::ledger(&10), Some(StakingLedger {
-			stash: 11,
-			total: 1000,
-			active: 1000,
-			unlocking: vec![],
-			claimed_rewards: vec![],
-		}));
+		assert_eq!(
+			Staking::ledger(&10),
+			Some(StakingLedger {
+				stash: 11,
+				total: 1000,
+				active: 1000,
+				unlocking: vec![],
+				claimed_rewards: vec![],
+			})
+		);
 
 		// Give account 11 some large free balance greater than total
 		let _ = Balances::make_free_balance_be(&11, 1000000);
@@ -1063,24 +1087,30 @@ fn bond_extra_works() {
 		// Call the bond_extra function from controller, add only 100
 		assert_ok!(Staking::bond_extra(Origin::signed(11), 100));
 		// There should be 100 more `total` and `active` in the ledger
-		assert_eq!(Staking::ledger(&10), Some(StakingLedger {
-			stash: 11,
-			total: 1000 + 100,
-			active: 1000 + 100,
-			unlocking: vec![],
-			claimed_rewards: vec![],
-		}));
+		assert_eq!(
+			Staking::ledger(&10),
+			Some(StakingLedger {
+				stash: 11,
+				total: 1000 + 100,
+				active: 1000 + 100,
+				unlocking: vec![],
+				claimed_rewards: vec![],
+			})
+		);
 
 		// Call the bond_extra function with a large number, should handle it
 		assert_ok!(Staking::bond_extra(Origin::signed(11), Balance::max_value()));
 		// The full amount of the funds should now be in the total and active
-		assert_eq!(Staking::ledger(&10), Some(StakingLedger {
-			stash: 11,
-			total: 1000000,
-			active: 1000000,
-			unlocking: vec![],
-			claimed_rewards: vec![],
-		}));
+		assert_eq!(
+			Staking::ledger(&10),
+			Some(StakingLedger {
+				stash: 11,
+				total: 1000000,
+				active: 1000000,
+				unlocking: vec![],
+				claimed_rewards: vec![],
+			})
+		);
 	});
 }
 
@@ -1108,13 +1138,16 @@ fn bond_extra_and_withdraw_unbonded_works() {
 		mock::start_active_era(1);
 
 		// Initial state of 10
-		assert_eq!(Staking::ledger(&10), Some(StakingLedger {
-			stash: 11,
-			total: 1000,
-			active: 1000,
-			unlocking: vec![],
-			claimed_rewards: vec![],
-		}));
+		assert_eq!(
+			Staking::ledger(&10),
+			Some(StakingLedger {
+				stash: 11,
+				total: 1000,
+				active: 1000,
+				unlocking: vec![],
+				claimed_rewards: vec![],
+			})
+		);
 		assert_eq!(
 			Staking::eras_stakers(Staking::active_era().unwrap().index, 11),
 			Exposure { total: 1000, own: 1000, others: vec![] }
@@ -1123,13 +1156,16 @@ fn bond_extra_and_withdraw_unbonded_works() {
 		// deposit the extra 100 units
 		Staking::bond_extra(Origin::signed(11), 100).unwrap();
 
-		assert_eq!(Staking::ledger(&10), Some(StakingLedger {
-			stash: 11,
-			total: 1000 + 100,
-			active: 1000 + 100,
-			unlocking: vec![],
-			claimed_rewards: vec![],
-		}));
+		assert_eq!(
+			Staking::ledger(&10),
+			Some(StakingLedger {
+				stash: 11,
+				total: 1000 + 100,
+				active: 1000 + 100,
+				unlocking: vec![],
+				claimed_rewards: vec![],
+			})
+		);
 		// Exposure is a snapshot! only updated after the next era update.
 		assert_ne!(
 			Staking::eras_stakers(Staking::active_era().unwrap().index, 11),
@@ -1141,13 +1177,16 @@ fn bond_extra_and_withdraw_unbonded_works() {
 		assert_eq!(Staking::active_era().unwrap().index, 2);
 
 		// ledger should be the same.
-		assert_eq!(Staking::ledger(&10), Some(StakingLedger {
-			stash: 11,
-			total: 1000 + 100,
-			active: 1000 + 100,
-			unlocking: vec![],
-			claimed_rewards: vec![],
-		}));
+		assert_eq!(
+			Staking::ledger(&10),
+			Some(StakingLedger {
+				stash: 11,
+				total: 1000 + 100,
+				active: 1000 + 100,
+				unlocking: vec![],
+				claimed_rewards: vec![],
+			})
+		);
 		// Exposure is now updated.
 		assert_eq!(
 			Staking::eras_stakers(Staking::active_era().unwrap().index, 11),
@@ -1162,7 +1201,7 @@ fn bond_extra_and_withdraw_unbonded_works() {
 				stash: 11,
 				total: 1000 + 100,
 				active: 100,
-				unlocking: vec![UnlockChunk{ value: 1000, era: 2 + 3}],
+				unlocking: vec![UnlockChunk { value: 1000, era: 2 + 3 }],
 				claimed_rewards: vec![]
 			}),
 		);
@@ -1175,7 +1214,7 @@ fn bond_extra_and_withdraw_unbonded_works() {
 				stash: 11,
 				total: 1000 + 100,
 				active: 100,
-				unlocking: vec![UnlockChunk{ value: 1000, era: 2 + 3}],
+				unlocking: vec![UnlockChunk { value: 1000, era: 2 + 3 }],
 				claimed_rewards: vec![]
 			}),
 		);
@@ -1191,7 +1230,7 @@ fn bond_extra_and_withdraw_unbonded_works() {
 				stash: 11,
 				total: 1000 + 100,
 				active: 100,
-				unlocking: vec![UnlockChunk{ value: 1000, era: 2 + 3}],
+				unlocking: vec![UnlockChunk { value: 1000, era: 2 + 3 }],
 				claimed_rewards: vec![]
 			}),
 		);
@@ -1218,7 +1257,7 @@ fn bond_extra_and_withdraw_unbonded_works() {
 fn too_many_unbond_calls_should_not_work() {
 	ExtBuilder::default().build_and_execute(|| {
 		// locked at era 0 until 3
-		for _ in 0..MAX_UNLOCKING_CHUNKS-1 {
+		for _ in 0..MAX_UNLOCKING_CHUNKS - 1 {
 			assert_ok!(Staking::unbond(Origin::signed(10), 1));
 		}
 
@@ -1247,247 +1286,229 @@ fn rebond_works() {
 	// * Given an account being bonded [and chosen as a validator](not mandatory)
 	// * it can unbond a portion of its funds from the stash account.
 	// * it can re-bond a portion of the funds scheduled to unlock.
-	ExtBuilder::default()
-		.nominate(false)
-		.build_and_execute(|| {
-			// Set payee to controller. avoids confusion
-			assert_ok!(Staking::set_payee(
-				Origin::signed(10),
-				RewardDestination::Controller
-			));
+	ExtBuilder::default().nominate(false).build_and_execute(|| {
+		// Set payee to controller. avoids confusion
+		assert_ok!(Staking::set_payee(Origin::signed(10), RewardDestination::Controller));
 
-			// Give account 11 some large free balance greater than total
-			let _ = Balances::make_free_balance_be(&11, 1000000);
+		// Give account 11 some large free balance greater than total
+		let _ = Balances::make_free_balance_be(&11, 1000000);
 
-			// confirm that 10 is a normal validator and gets paid at the end of the era.
-			mock::start_active_era(1);
+		// confirm that 10 is a normal validator and gets paid at the end of the era.
+		mock::start_active_era(1);
 
-			// Initial state of 10
-			assert_eq!(
-				Staking::ledger(&10),
-				Some(StakingLedger {
-					stash: 11,
-					total: 1000,
-					active: 1000,
-					unlocking: vec![],
-					claimed_rewards: vec![],
-				})
-			);
+		// Initial state of 10
+		assert_eq!(
+			Staking::ledger(&10),
+			Some(StakingLedger {
+				stash: 11,
+				total: 1000,
+				active: 1000,
+				unlocking: vec![],
+				claimed_rewards: vec![],
+			})
+		);
 
-			mock::start_active_era(2);
-			assert_eq!(Staking::active_era().unwrap().index, 2);
+		mock::start_active_era(2);
+		assert_eq!(Staking::active_era().unwrap().index, 2);
 
-			// Try to rebond some funds. We get an error since no fund is unbonded.
-			assert_noop!(
-				Staking::rebond(Origin::signed(10), 500),
-				Error::<Test>::NoUnlockChunk,
-			);
+		// Try to rebond some funds. We get an error since no fund is unbonded.
+		assert_noop!(Staking::rebond(Origin::signed(10), 500), Error::<Test>::NoUnlockChunk,);
 
-			// Unbond almost all of the funds in stash.
-			Staking::unbond(Origin::signed(10), 900).unwrap();
-			assert_eq!(
-				Staking::ledger(&10),
-				Some(StakingLedger {
-					stash: 11,
-					total: 1000,
-					active: 100,
-					unlocking: vec![UnlockChunk {
-						value: 900,
-						era: 2 + 3,
-					}],
-					claimed_rewards: vec![],
-				})
-			);
+		// Unbond almost all of the funds in stash.
+		Staking::unbond(Origin::signed(10), 900).unwrap();
+		assert_eq!(
+			Staking::ledger(&10),
+			Some(StakingLedger {
+				stash: 11,
+				total: 1000,
+				active: 100,
+				unlocking: vec![UnlockChunk { value: 900, era: 2 + 3 }],
+				claimed_rewards: vec![],
+			})
+		);
 
-			// Re-bond all the funds unbonded.
-			Staking::rebond(Origin::signed(10), 900).unwrap();
-			assert_eq!(
-				Staking::ledger(&10),
-				Some(StakingLedger {
-					stash: 11,
-					total: 1000,
-					active: 1000,
-					unlocking: vec![],
-					claimed_rewards: vec![],
-				})
-			);
+		// Re-bond all the funds unbonded.
+		Staking::rebond(Origin::signed(10), 900).unwrap();
+		assert_eq!(
+			Staking::ledger(&10),
+			Some(StakingLedger {
+				stash: 11,
+				total: 1000,
+				active: 1000,
+				unlocking: vec![],
+				claimed_rewards: vec![],
+			})
+		);
 
-			// Unbond almost all of the funds in stash.
-			Staking::unbond(Origin::signed(10), 900).unwrap();
-			assert_eq!(
-				Staking::ledger(&10),
-				Some(StakingLedger {
-					stash: 11,
-					total: 1000,
-					active: 100,
-					unlocking: vec![UnlockChunk { value: 900, era: 5 }],
-					claimed_rewards: vec![],
-				})
-			);
+		// Unbond almost all of the funds in stash.
+		Staking::unbond(Origin::signed(10), 900).unwrap();
+		assert_eq!(
+			Staking::ledger(&10),
+			Some(StakingLedger {
+				stash: 11,
+				total: 1000,
+				active: 100,
+				unlocking: vec![UnlockChunk { value: 900, era: 5 }],
+				claimed_rewards: vec![],
+			})
+		);
 
-			// Re-bond part of the funds unbonded.
-			Staking::rebond(Origin::signed(10), 500).unwrap();
-			assert_eq!(
-				Staking::ledger(&10),
-				Some(StakingLedger {
-					stash: 11,
-					total: 1000,
-					active: 600,
-					unlocking: vec![UnlockChunk { value: 400, era: 5 }],
-					claimed_rewards: vec![],
-				})
-			);
+		// Re-bond part of the funds unbonded.
+		Staking::rebond(Origin::signed(10), 500).unwrap();
+		assert_eq!(
+			Staking::ledger(&10),
+			Some(StakingLedger {
+				stash: 11,
+				total: 1000,
+				active: 600,
+				unlocking: vec![UnlockChunk { value: 400, era: 5 }],
+				claimed_rewards: vec![],
+			})
+		);
 
-			// Re-bond the remainder of the funds unbonded.
-			Staking::rebond(Origin::signed(10), 500).unwrap();
-			assert_eq!(
-				Staking::ledger(&10),
-				Some(StakingLedger {
-					stash: 11,
-					total: 1000,
-					active: 1000,
-					unlocking: vec![],
-					claimed_rewards: vec![],
-				})
-			);
+		// Re-bond the remainder of the funds unbonded.
+		Staking::rebond(Origin::signed(10), 500).unwrap();
+		assert_eq!(
+			Staking::ledger(&10),
+			Some(StakingLedger {
+				stash: 11,
+				total: 1000,
+				active: 1000,
+				unlocking: vec![],
+				claimed_rewards: vec![],
+			})
+		);
 
-			// Unbond parts of the funds in stash.
-			Staking::unbond(Origin::signed(10), 300).unwrap();
-			Staking::unbond(Origin::signed(10), 300).unwrap();
-			Staking::unbond(Origin::signed(10), 300).unwrap();
-			assert_eq!(
-				Staking::ledger(&10),
-				Some(StakingLedger {
-					stash: 11,
-					total: 1000,
-					active: 100,
-					unlocking: vec![
-						UnlockChunk { value: 300, era: 5 },
-						UnlockChunk { value: 300, era: 5 },
-						UnlockChunk { value: 300, era: 5 },
-					],
-					claimed_rewards: vec![],
-				})
-			);
+		// Unbond parts of the funds in stash.
+		Staking::unbond(Origin::signed(10), 300).unwrap();
+		Staking::unbond(Origin::signed(10), 300).unwrap();
+		Staking::unbond(Origin::signed(10), 300).unwrap();
+		assert_eq!(
+			Staking::ledger(&10),
+			Some(StakingLedger {
+				stash: 11,
+				total: 1000,
+				active: 100,
+				unlocking: vec![
+					UnlockChunk { value: 300, era: 5 },
+					UnlockChunk { value: 300, era: 5 },
+					UnlockChunk { value: 300, era: 5 },
+				],
+				claimed_rewards: vec![],
+			})
+		);
 
-			// Re-bond part of the funds unbonded.
-			Staking::rebond(Origin::signed(10), 500).unwrap();
-			assert_eq!(
-				Staking::ledger(&10),
-				Some(StakingLedger {
-					stash: 11,
-					total: 1000,
-					active: 600,
-					unlocking: vec![
-						UnlockChunk { value: 300, era: 5 },
-						UnlockChunk { value: 100, era: 5 },
-					],
-					claimed_rewards: vec![],
-				})
-			);
-		})
+		// Re-bond part of the funds unbonded.
+		Staking::rebond(Origin::signed(10), 500).unwrap();
+		assert_eq!(
+			Staking::ledger(&10),
+			Some(StakingLedger {
+				stash: 11,
+				total: 1000,
+				active: 600,
+				unlocking: vec![
+					UnlockChunk { value: 300, era: 5 },
+					UnlockChunk { value: 100, era: 5 },
+				],
+				claimed_rewards: vec![],
+			})
+		);
+	})
 }
 
 #[test]
 fn rebond_is_fifo() {
 	// Rebond should proceed by reversing the most recent bond operations.
-	ExtBuilder::default()
-		.nominate(false)
-		.build_and_execute(|| {
-			// Set payee to controller. avoids confusion
-			assert_ok!(Staking::set_payee(
-				Origin::signed(10),
-				RewardDestination::Controller
-			));
+	ExtBuilder::default().nominate(false).build_and_execute(|| {
+		// Set payee to controller. avoids confusion
+		assert_ok!(Staking::set_payee(Origin::signed(10), RewardDestination::Controller));
 
-			// Give account 11 some large free balance greater than total
-			let _ = Balances::make_free_balance_be(&11, 1000000);
+		// Give account 11 some large free balance greater than total
+		let _ = Balances::make_free_balance_be(&11, 1000000);
 
-			// confirm that 10 is a normal validator and gets paid at the end of the era.
-			mock::start_active_era(1);
+		// confirm that 10 is a normal validator and gets paid at the end of the era.
+		mock::start_active_era(1);
 
-			// Initial state of 10
-			assert_eq!(
-				Staking::ledger(&10),
-				Some(StakingLedger {
-					stash: 11,
-					total: 1000,
-					active: 1000,
-					unlocking: vec![],
-					claimed_rewards: vec![],
-				})
-			);
+		// Initial state of 10
+		assert_eq!(
+			Staking::ledger(&10),
+			Some(StakingLedger {
+				stash: 11,
+				total: 1000,
+				active: 1000,
+				unlocking: vec![],
+				claimed_rewards: vec![],
+			})
+		);
 
-			mock::start_active_era(2);
+		mock::start_active_era(2);
 
-			// Unbond some of the funds in stash.
-			Staking::unbond(Origin::signed(10), 400).unwrap();
-			assert_eq!(
-				Staking::ledger(&10),
-				Some(StakingLedger {
-					stash: 11,
-					total: 1000,
-					active: 600,
-					unlocking: vec![
-						UnlockChunk { value: 400, era: 2 + 3 },
-					],
-					claimed_rewards: vec![],
-				})
-			);
+		// Unbond some of the funds in stash.
+		Staking::unbond(Origin::signed(10), 400).unwrap();
+		assert_eq!(
+			Staking::ledger(&10),
+			Some(StakingLedger {
+				stash: 11,
+				total: 1000,
+				active: 600,
+				unlocking: vec![UnlockChunk { value: 400, era: 2 + 3 },],
+				claimed_rewards: vec![],
+			})
+		);
 
-			mock::start_active_era(3);
+		mock::start_active_era(3);
 
-			// Unbond more of the funds in stash.
-			Staking::unbond(Origin::signed(10), 300).unwrap();
-			assert_eq!(
-				Staking::ledger(&10),
-				Some(StakingLedger {
-					stash: 11,
-					total: 1000,
-					active: 300,
-					unlocking: vec![
-						UnlockChunk { value: 400, era: 2 + 3 },
-						UnlockChunk { value: 300, era: 3 + 3 },
-					],
-					claimed_rewards: vec![],
-				})
-			);
+		// Unbond more of the funds in stash.
+		Staking::unbond(Origin::signed(10), 300).unwrap();
+		assert_eq!(
+			Staking::ledger(&10),
+			Some(StakingLedger {
+				stash: 11,
+				total: 1000,
+				active: 300,
+				unlocking: vec![
+					UnlockChunk { value: 400, era: 2 + 3 },
+					UnlockChunk { value: 300, era: 3 + 3 },
+				],
+				claimed_rewards: vec![],
+			})
+		);
 
-			mock::start_active_era(4);
+		mock::start_active_era(4);
 
-			// Unbond yet more of the funds in stash.
-			Staking::unbond(Origin::signed(10), 200).unwrap();
-			assert_eq!(
-				Staking::ledger(&10),
-				Some(StakingLedger {
-					stash: 11,
-					total: 1000,
-					active: 100,
-					unlocking: vec![
-						UnlockChunk { value: 400, era: 2 + 3 },
-						UnlockChunk { value: 300, era: 3 + 3 },
-						UnlockChunk { value: 200, era: 4 + 3 },
-					],
-					claimed_rewards: vec![],
-				})
-			);
+		// Unbond yet more of the funds in stash.
+		Staking::unbond(Origin::signed(10), 200).unwrap();
+		assert_eq!(
+			Staking::ledger(&10),
+			Some(StakingLedger {
+				stash: 11,
+				total: 1000,
+				active: 100,
+				unlocking: vec![
+					UnlockChunk { value: 400, era: 2 + 3 },
+					UnlockChunk { value: 300, era: 3 + 3 },
+					UnlockChunk { value: 200, era: 4 + 3 },
+				],
+				claimed_rewards: vec![],
+			})
+		);
 
-			// Re-bond half of the unbonding funds.
-			Staking::rebond(Origin::signed(10), 400).unwrap();
-			assert_eq!(
-				Staking::ledger(&10),
-				Some(StakingLedger {
-					stash: 11,
-					total: 1000,
-					active: 500,
-					unlocking: vec![
-						UnlockChunk { value: 400, era: 2 + 3 },
-						UnlockChunk { value: 100, era: 3 + 3 },
-					],
-					claimed_rewards: vec![],
-				})
-			);
-		})
+		// Re-bond half of the unbonding funds.
+		Staking::rebond(Origin::signed(10), 400).unwrap();
+		assert_eq!(
+			Staking::ledger(&10),
+			Some(StakingLedger {
+				stash: 11,
+				total: 1000,
+				active: 500,
+				unlocking: vec![
+					UnlockChunk { value: 400, era: 2 + 3 },
+					UnlockChunk { value: 100, era: 3 + 3 },
+				],
+				claimed_rewards: vec![],
+			})
+		);
+	})
 }
 
 #[test]
@@ -1510,7 +1531,16 @@ fn reward_to_stake_works() {
 
 		// Now lets lower account 20 stake
 		assert_eq!(Staking::eras_stakers(Staking::active_era().unwrap().index, 21).total, 69);
-		<Ledger<Test>>::insert(&20, StakingLedger { stash: 21, total: 69, active: 69, unlocking: vec![], claimed_rewards: vec![] });
+		<Ledger<Test>>::insert(
+			&20,
+			StakingLedger {
+				stash: 21,
+				total: 69,
+				active: 69,
+				unlocking: vec![],
+				claimed_rewards: vec![],
+			},
+		);
 
 		// Compute total payout now for whole duration as other parameter won't change
 		let total_payout_0 = current_total_payout_for_duration(reward_time_per_era());
@@ -1531,8 +1561,14 @@ fn reward_to_stake_works() {
 		mock::start_active_era(2);
 
 		// -- new infos
-		assert_eq!(Staking::eras_stakers(Staking::active_era().unwrap().index, 11).total, 1000 + total_payout_0 / 2);
-		assert_eq!(Staking::eras_stakers(Staking::active_era().unwrap().index, 21).total, 69 + total_payout_0 / 2);
+		assert_eq!(
+			Staking::eras_stakers(Staking::active_era().unwrap().index, 11).total,
+			1000 + total_payout_0 / 2
+		);
+		assert_eq!(
+			Staking::eras_stakers(Staking::active_era().unwrap().index, 21).total,
+			69 + total_payout_0 / 2
+		);
 	});
 }
 
@@ -1653,18 +1689,21 @@ fn on_free_balance_zero_stash_removes_nominator() {
 		});
 }
 
-
 #[test]
 fn switching_roles() {
 	// Test that it should be possible to switch between roles (nominator, validator, idle) with minimal overhead.
 	ExtBuilder::default().nominate(false).build_and_execute(|| {
 		// Reset reward destination
-		for i in &[10, 20] { assert_ok!(Staking::set_payee(Origin::signed(*i), RewardDestination::Controller)); }
+		for i in &[10, 20] {
+			assert_ok!(Staking::set_payee(Origin::signed(*i), RewardDestination::Controller));
+		}
 
 		assert_eq_uvec!(validator_controllers(), vec![20, 10]);
 
 		// put some money in account that we'll use.
-		for i in 1..7 { let _ = Balances::deposit_creating(&i, 5000); }
+		for i in 1..7 {
+			let _ = Balances::deposit_creating(&i, 5000);
+		}
 
 		// add 2 nominators
 		assert_ok!(Staking::bond(Origin::signed(1), 2, 2000, RewardDestination::Controller));
@@ -1699,24 +1738,32 @@ fn switching_roles() {
 
 #[test]
 fn wrong_vote_is_null() {
-	ExtBuilder::default().nominate(false).validator_pool(true).build_and_execute(|| {
-		assert_eq_uvec!(validator_controllers(), vec![40, 30]);
+	ExtBuilder::default()
+		.nominate(false)
+		.validator_pool(true)
+		.build_and_execute(|| {
+			assert_eq_uvec!(validator_controllers(), vec![40, 30]);
 
-		// put some money in account that we'll use.
-		for i in 1..3 { let _ = Balances::deposit_creating(&i, 5000); }
+			// put some money in account that we'll use.
+			for i in 1..3 {
+				let _ = Balances::deposit_creating(&i, 5000);
+			}
 
-		// add 1 nominators
-		assert_ok!(Staking::bond(Origin::signed(1), 2, 2000, RewardDestination::default()));
-		assert_ok!(Staking::nominate(Origin::signed(2), vec![
-			11, 21, 			// good votes
-			1, 2, 15, 1000, 25  // crap votes. No effect.
-		]));
+			// add 1 nominators
+			assert_ok!(Staking::bond(Origin::signed(1), 2, 2000, RewardDestination::default()));
+			assert_ok!(Staking::nominate(
+				Origin::signed(2),
+				vec![
+					11, 21, // good votes
+					1, 2, 15, 1000, 25 // crap votes. No effect.
+				]
+			));
 
-		// new block
-		mock::start_active_era(1);
+			// new block
+			mock::start_active_era(1);
 
-		assert_eq_uvec!(validator_controllers(), vec![20, 10]);
-	});
+			assert_eq_uvec!(validator_controllers(), vec![20, 10]);
+		});
 }
 
 #[test]
@@ -1748,7 +1795,7 @@ fn bond_with_no_staked_value() {
 					stash: 1,
 					active: 0,
 					total: 5,
-					unlocking: vec![UnlockChunk {value: 5, era: 3}],
+					unlocking: vec![UnlockChunk { value: 5, era: 3 }],
 					claimed_rewards: vec![],
 				})
 			);
@@ -1800,7 +1847,11 @@ fn bond_with_little_staked_value_bounded() {
 			assert_eq!(Staking::eras_stakers(active_era(), 2).total, 0);
 
 			// Old ones are rewarded.
-			assert_eq_error_rate!(Balances::free_balance(10), init_balance_10 + total_payout_0 / 3, 1);
+			assert_eq_error_rate!(
+				Balances::free_balance(10),
+				init_balance_10 + total_payout_0 / 3,
+				1
+			);
 			// no rewards paid to 2. This was initial election.
 			assert_eq!(Balances::free_balance(2), init_balance_2);
 
@@ -1814,7 +1865,11 @@ fn bond_with_little_staked_value_bounded() {
 			assert_eq!(Staking::eras_stakers(active_era(), 2).total, 0);
 
 			// 2 is now rewarded.
-			assert_eq_error_rate!(Balances::free_balance(2), init_balance_2 + total_payout_1 / 3, 1);
+			assert_eq_error_rate!(
+				Balances::free_balance(2),
+				init_balance_2 + total_payout_1 / 3,
+				1
+			);
 			assert_eq_error_rate!(
 				Balances::free_balance(&10),
 				init_balance_10 + total_payout_0 / 3 + total_payout_1 / 3,
@@ -1893,7 +1948,7 @@ fn bond_with_duplicate_vote_should_be_ignored_by_election_provider_elected() {
 
 			// give the man some money.
 			let initial_balance = 1000;
-			for i in [1, 2, 3, 4,].iter() {
+			for i in [1, 2, 3, 4].iter() {
 				let _ = Balances::make_free_balance_be(i, initial_balance);
 			}
 
@@ -1991,20 +2046,22 @@ fn reward_validator_slashing_validator_does_not_overflow() {
 		// it is 0.
 		Staking::bond(Origin::signed(2), 20000, stake - 1, RewardDestination::default()).unwrap();
 		// Override exposure of 11
-		ErasStakers::<Test>::insert(0, 11, Exposure {
-			total: stake,
-			own: 1,
-			others: vec![ IndividualExposure { who: 2, value: stake - 1 }]
-		});
+		ErasStakers::<Test>::insert(
+			0,
+			11,
+			Exposure {
+				total: stake,
+				own: 1,
+				others: vec![IndividualExposure { who: 2, value: stake - 1 }],
+			},
+		);
 
 		// Check slashing
 		on_offence_now(
-			&[
-				OffenceDetails {
-					offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
-					reporters: vec![],
-				},
-			],
+			&[OffenceDetails {
+				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
+				reporters: vec![],
+			}],
 			&[Perbill::from_percent(100)],
 		);
 
@@ -2046,24 +2103,13 @@ fn add_reward_points_fns_works() {
 		// Not mandatory but must be coherent with rewards
 		assert_eq_uvec!(Session::validators(), vec![21, 11]);
 
-		<Pallet<Test>>::reward_by_ids(vec![
-			(21, 1),
-			(11, 1),
-			(11, 1),
-		]);
+		<Pallet<Test>>::reward_by_ids(vec![(21, 1), (11, 1), (11, 1)]);
 
-		<Pallet<Test>>::reward_by_ids(vec![
-			(21, 1),
-			(11, 1),
-			(11, 1),
-		]);
+		<Pallet<Test>>::reward_by_ids(vec![(21, 1), (11, 1), (11, 1)]);
 
 		assert_eq!(
 			ErasRewardPoints::<Test>::get(Staking::active_era().unwrap().index),
-			EraRewardPoints {
-				individual: vec![(11, 4), (21, 2)].into_iter().collect(),
-				total: 6,
-			},
+			EraRewardPoints { individual: vec![(11, 4), (21, 2)].into_iter().collect(), total: 6 },
 		);
 	})
 }
@@ -2074,7 +2120,7 @@ fn unbonded_balance_is_not_slashable() {
 		// total amount staked is slashable.
 		assert_eq!(Staking::slashable_balance_of(&11), 1000);
 
-		assert_ok!(Staking::unbond(Origin::signed(10),  800));
+		assert_ok!(Staking::unbond(Origin::signed(10), 800));
 
 		// only the active portion.
 		assert_eq!(Staking::slashable_balance_of(&11), 200);
@@ -2092,7 +2138,10 @@ fn era_is_always_same_length() {
 		assert_eq!(Staking::eras_start_session_index(current_era()).unwrap(), session_per_era);
 
 		mock::start_active_era(2);
-		assert_eq!(Staking::eras_start_session_index(current_era()).unwrap(), session_per_era * 2u32);
+		assert_eq!(
+			Staking::eras_start_session_index(current_era()).unwrap(),
+			session_per_era * 2u32
+		);
 
 		let session = Session::current_index();
 		ForceEra::<Test>::put(Forcing::ForceNew);
@@ -2102,7 +2151,10 @@ fn era_is_always_same_length() {
 		assert_eq!(Staking::eras_start_session_index(current_era()).unwrap(), session + 2);
 
 		mock::start_active_era(4);
-		assert_eq!(Staking::eras_start_session_index(current_era()).unwrap(), session + 2u32 + session_per_era);
+		assert_eq!(
+			Staking::eras_start_session_index(current_era()).unwrap(),
+			session + 2u32 + session_per_era
+		);
 	});
 }
 
@@ -2111,10 +2163,7 @@ fn offence_forces_new_era() {
 	ExtBuilder::default().build_and_execute(|| {
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (
-					11,
-					Staking::eras_stakers(Staking::active_era().unwrap().index, 11),
-				),
+				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(5)],
@@ -2132,10 +2181,7 @@ fn offence_ensures_new_era_without_clobbering() {
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (
-					11,
-					Staking::eras_stakers(Staking::active_era().unwrap().index, 11),
-				),
+				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(5)],
@@ -2153,10 +2199,7 @@ fn offence_deselects_validator_even_when_slash_is_zero() {
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (
-					11,
-					Staking::eras_stakers(Staking::active_era().unwrap().index, 11),
-				),
+				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(0)],
@@ -2182,14 +2225,7 @@ fn slashing_performed_according_exposure() {
 		// Handle an offence with a historical exposure.
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (
-					11,
-					Exposure {
-						total: 500,
-						own: 500,
-						others: vec![],
-					},
-				),
+				offender: (11, Exposure { total: 500, own: 500, others: vec![] }),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(50)],
@@ -2210,10 +2246,7 @@ fn slash_in_old_span_does_not_deselect() {
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (
-					11,
-					Staking::eras_stakers(Staking::active_era().unwrap().index, 11),
-				),
+				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(0)],
@@ -2236,10 +2269,7 @@ fn slash_in_old_span_does_not_deselect() {
 
 		on_offence_in_era(
 			&[OffenceDetails {
-				offender: (
-					11,
-					Staking::eras_stakers(Staking::active_era().unwrap().index, 11),
-				),
+				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(0)],
@@ -2253,10 +2283,7 @@ fn slash_in_old_span_does_not_deselect() {
 
 		on_offence_in_era(
 			&[OffenceDetails {
-				offender: (
-					11,
-					Staking::eras_stakers(Staking::active_era().unwrap().index, 11),
-				),
+				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
 				reporters: vec![],
 			}],
 			// NOTE: A 100% slash here would clean up the account, causing de-registration.
@@ -2279,14 +2306,14 @@ fn reporters_receive_their_slice() {
 		// The reporters' reward is calculated from the total exposure.
 		let initial_balance = 1125;
 
-		assert_eq!(Staking::eras_stakers(Staking::active_era().unwrap().index, 11).total, initial_balance);
+		assert_eq!(
+			Staking::eras_stakers(Staking::active_era().unwrap().index, 11).total,
+			initial_balance
+		);
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (
-					11,
-					Staking::eras_stakers(Staking::active_era().unwrap().index, 11),
-				),
+				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
 				reporters: vec![1, 2],
 			}],
 			&[Perbill::from_percent(50)],
@@ -2309,14 +2336,14 @@ fn subsequent_reports_in_same_span_pay_out_less() {
 		// The reporters' reward is calculated from the total exposure.
 		let initial_balance = 1125;
 
-		assert_eq!(Staking::eras_stakers(Staking::active_era().unwrap().index, 11).total, initial_balance);
+		assert_eq!(
+			Staking::eras_stakers(Staking::active_era().unwrap().index, 11).total,
+			initial_balance
+		);
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (
-					11,
-					Staking::eras_stakers(Staking::active_era().unwrap().index, 11),
-				),
+				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
 				reporters: vec![1],
 			}],
 			&[Perbill::from_percent(20)],
@@ -2329,10 +2356,7 @@ fn subsequent_reports_in_same_span_pay_out_less() {
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (
-					11,
-					Staking::eras_stakers(Staking::active_era().unwrap().index, 11),
-				),
+				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
 				reporters: vec![1],
 			}],
 			&[Perbill::from_percent(50)],
@@ -2357,8 +2381,8 @@ fn invulnerables_are_not_slashed() {
 		let exposure = Staking::eras_stakers(Staking::active_era().unwrap().index, 21);
 		let initial_balance = Staking::slashable_balance_of(&21);
 
-		let nominator_balances: Vec<_> = exposure.others
-			.iter().map(|o| Balances::free_balance(&o.who)).collect();
+		let nominator_balances: Vec<_> =
+			exposure.others.iter().map(|o| Balances::free_balance(&o.who)).collect();
 
 		on_offence_now(
 			&[
@@ -2397,10 +2421,7 @@ fn dont_slash_if_fraction_is_zero() {
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (
-					11,
-					Staking::eras_stakers(Staking::active_era().unwrap().index, 11),
-				),
+				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(0)],
@@ -2420,12 +2441,10 @@ fn only_slash_for_max_in_era() {
 		assert_eq!(Balances::free_balance(11), 1000);
 
 		on_offence_now(
-			&[
-				OffenceDetails {
-					offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
-					reporters: vec![],
-				},
-			],
+			&[OffenceDetails {
+				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
+				reporters: vec![],
+			}],
 			&[Perbill::from_percent(50)],
 		);
 
@@ -2434,12 +2453,10 @@ fn only_slash_for_max_in_era() {
 		assert_eq!(Staking::force_era(), Forcing::ForceNew);
 
 		on_offence_now(
-			&[
-				OffenceDetails {
-					offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
-					reporters: vec![],
-				},
-			],
+			&[OffenceDetails {
+				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
+				reporters: vec![],
+			}],
 			&[Perbill::from_percent(25)],
 		);
 
@@ -2447,12 +2464,10 @@ fn only_slash_for_max_in_era() {
 		assert_eq!(Balances::free_balance(11), 500);
 
 		on_offence_now(
-			&[
-				OffenceDetails {
-					offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
-					reporters: vec![],
-				},
-			],
+			&[OffenceDetails {
+				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
+				reporters: vec![],
+			}],
 			&[Perbill::from_percent(60)],
 		);
 
@@ -2465,52 +2480,54 @@ fn only_slash_for_max_in_era() {
 fn garbage_collection_after_slashing() {
 	// ensures that `SlashingSpans` and `SpanSlash` of an account is removed after reaping.
 	ExtBuilder::default()
-	.existential_deposit(2)
-	.min_nominator_bond(2)
-	.min_validator_bond(2)
-	.build_and_execute(|| {
-		assert_eq!(Balances::free_balance(11), 256_000);
+		.existential_deposit(2)
+		.min_nominator_bond(2)
+		.min_validator_bond(2)
+		.build_and_execute(|| {
+			assert_eq!(Balances::free_balance(11), 256_000);
 
-		on_offence_now(
-			&[
-				OffenceDetails {
+			on_offence_now(
+				&[OffenceDetails {
 					offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
 					reporters: vec![],
-				},
-			],
-			&[Perbill::from_percent(10)],
-		);
+				}],
+				&[Perbill::from_percent(10)],
+			);
 
-		assert_eq!(Balances::free_balance(11), 256_000 - 25_600);
-		assert!(<Staking as crate::Store>::SlashingSpans::get(&11).is_some());
-		assert_eq!(<Staking as crate::Store>::SpanSlash::get(&(11, 0)).amount_slashed(), &25_600);
+			assert_eq!(Balances::free_balance(11), 256_000 - 25_600);
+			assert!(<Staking as crate::Store>::SlashingSpans::get(&11).is_some());
+			assert_eq!(
+				<Staking as crate::Store>::SpanSlash::get(&(11, 0)).amount_slashed(),
+				&25_600
+			);
 
-		on_offence_now(
-			&[
-				OffenceDetails {
+			on_offence_now(
+				&[OffenceDetails {
 					offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
 					reporters: vec![],
-				},
-			],
-			&[Perbill::from_percent(100)],
-		);
+				}],
+				&[Perbill::from_percent(100)],
+			);
 
-		// validator and nominator slash in era are garbage-collected by era change,
-		// so we don't test those here.
+			// validator and nominator slash in era are garbage-collected by era change,
+			// so we don't test those here.
 
-		assert_eq!(Balances::free_balance(11), 2);
-		assert_eq!(Balances::total_balance(&11), 2);
+			assert_eq!(Balances::free_balance(11), 2);
+			assert_eq!(Balances::total_balance(&11), 2);
 
-		let slashing_spans = <Staking as crate::Store>::SlashingSpans::get(&11).unwrap();
-		assert_eq!(slashing_spans.iter().count(), 2);
+			let slashing_spans = <Staking as crate::Store>::SlashingSpans::get(&11).unwrap();
+			assert_eq!(slashing_spans.iter().count(), 2);
 
-		// reap_stash respects num_slashing_spans so that weight is accurate
-		assert_noop!(Staking::reap_stash(Origin::none(), 11, 0), Error::<Test>::IncorrectSlashingSpans);
-		assert_ok!(Staking::reap_stash(Origin::none(), 11, 2));
+			// reap_stash respects num_slashing_spans so that weight is accurate
+			assert_noop!(
+				Staking::reap_stash(Origin::none(), 11, 0),
+				Error::<Test>::IncorrectSlashingSpans
+			);
+			assert_ok!(Staking::reap_stash(Origin::none(), 11, 2));
 
-		assert!(<Staking as crate::Store>::SlashingSpans::get(&11).is_none());
-		assert_eq!(<Staking as crate::Store>::SpanSlash::get(&(11, 0)).amount_slashed(), &0);
-	})
+			assert!(<Staking as crate::Store>::SlashingSpans::get(&11).is_none());
+			assert_eq!(<Staking as crate::Store>::SpanSlash::get(&(11, 0)).amount_slashed(), &0);
+		})
 }
 
 #[test]
@@ -2527,13 +2544,8 @@ fn garbage_collection_on_window_pruning() {
 		assert_eq!(Balances::free_balance(101), 2000);
 		let nominated_value = exposure.others.iter().find(|o| o.who == 101).unwrap().value;
 
-		on_offence_now(
-			&[
-				OffenceDetails {
-					offender: (11, Staking::eras_stakers(now, 11)),
-					reporters: vec![],
-				},
-			],
+		on_offence_now(
+			&[OffenceDetails { offender: (11, Staking::eras_stakers(now, 11)), reporters: vec![] }],
 			&[Perbill::from_percent(10)],
 		);
 
@@ -2574,12 +2586,10 @@ fn slashing_nominators_by_span_max() {
 		let nominated_value_21 = exposure_21.others.iter().find(|o| o.who == 101).unwrap().value;
 
 		on_offence_in_era(
-			&[
-				OffenceDetails {
-					offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
-					reporters: vec![],
-				},
-			],
+			&[OffenceDetails {
+				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
+				reporters: vec![],
+			}],
 			&[Perbill::from_percent(10)],
 			2,
 		);
@@ -2596,24 +2606,16 @@ fn slashing_nominators_by_span_max() {
 
 		let get_span = |account| <Staking as crate::Store>::SlashingSpans::get(&account).unwrap();
 
-		assert_eq!(
-			get_span(11).iter().collect::<Vec<_>>(),
-			expected_spans,
-		);
+		assert_eq!(get_span(11).iter().collect::<Vec<_>>(), expected_spans,);
 
-		assert_eq!(
-			get_span(101).iter().collect::<Vec<_>>(),
-			expected_spans,
-		);
+		assert_eq!(get_span(101).iter().collect::<Vec<_>>(), expected_spans,);
 
 		// second slash: higher era, higher value, same span.
 		on_offence_in_era(
-			&[
-				OffenceDetails {
-					offender: (21, Staking::eras_stakers(Staking::active_era().unwrap().index, 21)),
-					reporters: vec![],
-				},
-			],
+			&[OffenceDetails {
+				offender: (21, Staking::eras_stakers(Staking::active_era().unwrap().index, 21)),
+				reporters: vec![],
+			}],
 			&[Perbill::from_percent(30)],
 			3,
 		);
@@ -2631,12 +2633,10 @@ fn slashing_nominators_by_span_max() {
 		// third slash: in same era and on same validator as first, higher
 		// in-era value, but lower slash value than slash 2.
 		on_offence_in_era(
-			&[
-				OffenceDetails {
-					offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
-					reporters: vec![],
-				},
-			],
+			&[OffenceDetails {
+				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
+				reporters: vec![],
+			}],
 			&[Perbill::from_percent(20)],
 			2,
 		);
@@ -2667,12 +2667,10 @@ fn slashes_are_summed_across_spans() {
 		let get_span = |account| <Staking as crate::Store>::SlashingSpans::get(&account).unwrap();
 
 		on_offence_now(
-			&[
-				OffenceDetails {
-					offender: (21, Staking::eras_stakers(Staking::active_era().unwrap().index, 21)),
-					reporters: vec![],
-				},
-			],
+			&[OffenceDetails {
+				offender: (21, Staking::eras_stakers(Staking::active_era().unwrap().index, 21)),
+				reporters: vec![],
+			}],
 			&[Perbill::from_percent(10)],
 		);
 
@@ -2692,12 +2690,10 @@ fn slashes_are_summed_across_spans() {
 		assert_eq!(Staking::slashable_balance_of(&21), 900);
 
 		on_offence_now(
-			&[
-				OffenceDetails {
-					offender: (21, Staking::eras_stakers(Staking::active_era().unwrap().index, 21)),
-					reporters: vec![],
-				},
-			],
+			&[OffenceDetails {
+				offender: (21, Staking::eras_stakers(Staking::active_era().unwrap().index, 21)),
+				reporters: vec![],
+			}],
 			&[Perbill::from_percent(10)],
 		);
 
@@ -2714,84 +2710,68 @@ fn slashes_are_summed_across_spans() {
 
 #[test]
 fn deferred_slashes_are_deferred() {
-	ExtBuilder::default()
-		.slash_defer_duration(2)
-		.build_and_execute(|| {
-			mock::start_active_era(1);
+	ExtBuilder::default().slash_defer_duration(2).build_and_execute(|| {
+		mock::start_active_era(1);
 
-			assert_eq!(Balances::free_balance(11), 1000);
+		assert_eq!(Balances::free_balance(11), 1000);
 
-			let exposure = Staking::eras_stakers(Staking::active_era().unwrap().index, 11);
-			assert_eq!(Balances::free_balance(101), 2000);
-			let nominated_value = exposure.others.iter().find(|o| o.who == 101).unwrap().value;
+		let exposure = Staking::eras_stakers(Staking::active_era().unwrap().index, 11);
+		assert_eq!(Balances::free_balance(101), 2000);
+		let nominated_value = exposure.others.iter().find(|o| o.who == 101).unwrap().value;
 
-			on_offence_now(
-			&[
-				OffenceDetails {
-					offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
-					reporters: vec![],
-				},
-			],
+		on_offence_now(
+			&[OffenceDetails {
+				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
+				reporters: vec![],
+			}],
 			&[Perbill::from_percent(10)],
 		);
 
-			assert_eq!(Balances::free_balance(11), 1000);
-			assert_eq!(Balances::free_balance(101), 2000);
+		assert_eq!(Balances::free_balance(11), 1000);
+		assert_eq!(Balances::free_balance(101), 2000);
 
-			mock::start_active_era(2);
+		mock::start_active_era(2);
 
-			assert_eq!(Balances::free_balance(11), 1000);
-			assert_eq!(Balances::free_balance(101), 2000);
+		assert_eq!(Balances::free_balance(11), 1000);
+		assert_eq!(Balances::free_balance(101), 2000);
 
-			mock::start_active_era(3);
+		mock::start_active_era(3);
 
-			assert_eq!(Balances::free_balance(11), 1000);
-			assert_eq!(Balances::free_balance(101), 2000);
+		assert_eq!(Balances::free_balance(11), 1000);
+		assert_eq!(Balances::free_balance(101), 2000);
 
-			// at the start of era 4, slashes from era 1 are processed,
-			// after being deferred for at least 2 full eras.
-			mock::start_active_era(4);
+		// at the start of era 4, slashes from era 1 are processed,
+		// after being deferred for at least 2 full eras.
+		mock::start_active_era(4);
 
-			assert_eq!(Balances::free_balance(11), 900);
-			assert_eq!(Balances::free_balance(101), 2000 - (nominated_value / 10));
-		})
+		assert_eq!(Balances::free_balance(11), 900);
+		assert_eq!(Balances::free_balance(101), 2000 - (nominated_value / 10));
+	})
 }
 
 #[test]
 fn remove_deferred() {
-	ExtBuilder::default()
-		.slash_defer_duration(2)
-		.build_and_execute(|| {
-			mock::start_active_era(1);
+	ExtBuilder::default().slash_defer_duration(2).build_and_execute(|| {
+		mock::start_active_era(1);
 
-			assert_eq!(Balances::free_balance(11), 1000);
+		assert_eq!(Balances::free_balance(11), 1000);
 
-			let exposure = Staking::eras_stakers(Staking::active_era().unwrap().index, 11);
-			assert_eq!(Balances::free_balance(101), 2000);
-			let nominated_value = exposure.others.iter().find(|o| o.who == 101).unwrap().value;
+		let exposure = Staking::eras_stakers(Staking::active_era().unwrap().index, 11);
+		assert_eq!(Balances::free_balance(101), 2000);
+		let nominated_value = exposure.others.iter().find(|o| o.who == 101).unwrap().value;
 
-			on_offence_now(
-			&[
-				OffenceDetails {
-					offender: (11, exposure.clone()),
-					reporters: vec![],
-				},
-			],
+		on_offence_now(
+			&[OffenceDetails { offender: (11, exposure.clone()), reporters: vec![] }],
 			&[Perbill::from_percent(10)],
 		);
 
-			assert_eq!(Balances::free_balance(11), 1000);
-			assert_eq!(Balances::free_balance(101), 2000);
+		assert_eq!(Balances::free_balance(11), 1000);
+		assert_eq!(Balances::free_balance(101), 2000);
 
-			mock::start_active_era(2);
+		mock::start_active_era(2);
 
-			on_offence_in_era(
-			&[
-				OffenceDetails {
-					offender: (11, exposure.clone()),
-					reporters: vec![],
-				},
-			],
+		on_offence_in_era(
+			&[OffenceDetails { offender: (11, exposure.clone()), reporters: vec![] }],
 			&[Perbill::from_percent(15)],
 			1,
 		);
@@ -2802,32 +2782,32 @@ fn remove_deferred() {
 			Error::<Test>::EmptyTargets
 		);
 
-			assert_ok!(Staking::cancel_deferred_slash(Origin::root(), 1, vec![0]));
+		assert_ok!(Staking::cancel_deferred_slash(Origin::root(), 1, vec![0]));
 
-			assert_eq!(Balances::free_balance(11), 1000);
-			assert_eq!(Balances::free_balance(101), 2000);
+		assert_eq!(Balances::free_balance(11), 1000);
+		assert_eq!(Balances::free_balance(101), 2000);
 
-			mock::start_active_era(3);
+		mock::start_active_era(3);
 
-			assert_eq!(Balances::free_balance(11), 1000);
-			assert_eq!(Balances::free_balance(101), 2000);
+		assert_eq!(Balances::free_balance(11), 1000);
+		assert_eq!(Balances::free_balance(101), 2000);
 
-			// at the start of era 4, slashes from era 1 are processed,
-			// after being deferred for at least 2 full eras.
-			mock::start_active_era(4);
+		// at the start of era 4, slashes from era 1 are processed,
+		// after being deferred for at least 2 full eras.
+		mock::start_active_era(4);
 
-			// the first slash for 10% was cancelled, so no effect.
-			assert_eq!(Balances::free_balance(11), 1000);
-			assert_eq!(Balances::free_balance(101), 2000);
+		// the first slash for 10% was cancelled, so no effect.
+		assert_eq!(Balances::free_balance(11), 1000);
+		assert_eq!(Balances::free_balance(101), 2000);
 
-			mock::start_active_era(5);
+		mock::start_active_era(5);
 
-			let slash_10 = Perbill::from_percent(10);
-			let slash_15 = Perbill::from_percent(15);
-			let initial_slash = slash_10 * nominated_value;
+		let slash_10 = Perbill::from_percent(10);
+		let slash_15 = Perbill::from_percent(15);
+		let initial_slash = slash_10 * nominated_value;
 
-			let total_slash = slash_15 * nominated_value;
-			let actual_slash = total_slash - initial_slash;
+		let total_slash = slash_15 * nominated_value;
+		let actual_slash = total_slash - initial_slash;
 
 		// 5% slash (15 - 10) processed now.
 		assert_eq!(Balances::free_balance(11), 950);
@@ -2837,63 +2817,39 @@ fn remove_deferred() {
 
 #[test]
 fn remove_multi_deferred() {
-	ExtBuilder::default()
-		.slash_defer_duration(2)
-		.build_and_execute(|| {
-			mock::start_active_era(1);
+	ExtBuilder::default().slash_defer_duration(2).build_and_execute(|| {
+		mock::start_active_era(1);
 
-			assert_eq!(Balances::free_balance(11), 1000);
+		assert_eq!(Balances::free_balance(11), 1000);
 
-			let exposure = Staking::eras_stakers(Staking::active_era().unwrap().index, 11);
-			assert_eq!(Balances::free_balance(101), 2000);
+		let exposure = Staking::eras_stakers(Staking::active_era().unwrap().index, 11);
+		assert_eq!(Balances::free_balance(101), 2000);
 
-			on_offence_now(
-			&[
-				OffenceDetails {
-					offender: (11, exposure.clone()),
-					reporters: vec![],
-				},
-			],
+		on_offence_now(
+			&[OffenceDetails { offender: (11, exposure.clone()), reporters: vec![] }],
 			&[Perbill::from_percent(10)],
 		);
 
 		on_offence_now(
-			&[
-				OffenceDetails {
-					offender: (21, Staking::eras_stakers(Staking::active_era().unwrap().index, 21)),
-					reporters: vec![],
-				}
-			],
+			&[OffenceDetails {
+				offender: (21, Staking::eras_stakers(Staking::active_era().unwrap().index, 21)),
+				reporters: vec![],
+			}],
 			&[Perbill::from_percent(10)],
 		);
 
 		on_offence_now(
-			&[
-				OffenceDetails {
-					offender: (11, exposure.clone()),
-					reporters: vec![],
-				},
-			],
+			&[OffenceDetails { offender: (11, exposure.clone()), reporters: vec![] }],
 			&[Perbill::from_percent(25)],
 		);
 
 		on_offence_now(
-			&[
-				OffenceDetails {
-					offender: (42, exposure.clone()),
-					reporters: vec![],
-				},
-			],
+			&[OffenceDetails { offender: (42, exposure.clone()), reporters: vec![] }],
 			&[Perbill::from_percent(25)],
 		);
 
 		on_offence_now(
-			&[
-				OffenceDetails {
-					offender: (69, exposure.clone()),
-					reporters: vec![],
-				},
-			],
+			&[OffenceDetails { offender: (69, exposure.clone()), reporters: vec![] }],
 			&[Perbill::from_percent(25)],
 		);
 
@@ -2942,20 +2898,14 @@ fn slash_kicks_validators_not_nominators_and_disables_nominator_for_kicked_valid
 		assert_eq!(exposure_21.total, 1000 + 375);
 
 		on_offence_now(
-			&[OffenceDetails {
-				offender: (11, exposure_11.clone()),
-				reporters: vec![],
-			}],
+			&[OffenceDetails { offender: (11, exposure_11.clone()), reporters: vec![] }],
 			&[Perbill::from_percent(10)],
 		);
 
 		// post-slash balance
 		let nominator_slash_amount_11 = 125 / 10;
 		assert_eq!(Balances::free_balance(11), 900);
-		assert_eq!(
-			Balances::free_balance(101),
-			2000 - nominator_slash_amount_11
-		);
+		assert_eq!(Balances::free_balance(101), 2000 - nominator_slash_amount_11);
 
 		// This is the best way to check that the validator was chilled; `get` will
 		// return default value.
@@ -2967,9 +2917,7 @@ fn slash_kicks_validators_not_nominators_and_disables_nominator_for_kicked_valid
 
 		// and make sure that the vote will be ignored even if the validator
 		// re-registers.
-		let last_slash = <Staking as Store>::SlashingSpans::get(&11)
-			.unwrap()
-			.last_nonzero_slash();
+		let last_slash = <Staking as Store>::SlashingSpans::get(&11).unwrap().last_nonzero_slash();
 		assert!(nominations.submitted_in < last_slash);
 
 		// actually re-bond the slashed validator
@@ -3082,12 +3030,7 @@ fn zero_slash_keeps_nominators() {
 		assert_eq!(Balances::free_balance(101), 2000);
 
 		on_offence_now(
-			&[
-				OffenceDetails {
-					offender: (11, exposure.clone()),
-					reporters: vec![],
-				},
-			],
+			&[OffenceDetails { offender: (11, exposure.clone()), reporters: vec![] }],
 			&[Perbill::from_percent(0)],
 		);
 
@@ -3120,10 +3063,16 @@ fn six_session_delay() {
 
 		// pallet-session is delaying session by one, thus the next session to plan is +2.
 		assert_eq!(<Staking as SessionManager<_>>::new_session(init_session + 2), None);
-		assert_eq!(<Staking as SessionManager<_>>::new_session(init_session + 3), Some(val_set.clone()));
+		assert_eq!(
+			<Staking as SessionManager<_>>::new_session(init_session + 3),
+			Some(val_set.clone())
+		);
 		assert_eq!(<Staking as SessionManager<_>>::new_session(init_session + 4), None);
 		assert_eq!(<Staking as SessionManager<_>>::new_session(init_session + 5), None);
-		assert_eq!(<Staking as SessionManager<_>>::new_session(init_session + 6), Some(val_set.clone()));
+		assert_eq!(
+			<Staking as SessionManager<_>>::new_session(init_session + 6),
+			Some(val_set.clone())
+		);
 
 		<Staking as SessionManager<_>>::end_session(init_session);
 		<Staking as SessionManager<_>>::start_session(init_session + 1);
@@ -3171,14 +3120,12 @@ fn test_max_nominator_rewarded_per_validator_and_cant_steal_someone_else_reward(
 			let controller = 20_000 + i as AccountId;
 			let balance = 10_000 + i as Balance;
 			Balances::make_free_balance_be(&stash, balance);
-			assert_ok!(
-				Staking::bond(
-					Origin::signed(stash),
-					controller,
-					balance,
-					RewardDestination::Stash
-				)
-			);
+			assert_ok!(Staking::bond(
+				Origin::signed(stash),
+				controller,
+				balance,
+				RewardDestination::Stash
+			));
 			assert_ok!(Staking::nominate(Origin::signed(controller), vec![11]));
 		}
 		mock::start_active_era(1);
@@ -3259,7 +3206,13 @@ fn test_payout_stakers() {
 		// We track rewards in `claimed_rewards` vec
 		assert_eq!(
 			Staking::ledger(&10),
-			Some(StakingLedger { stash: 11, total: 1000, active: 1000, unlocking: vec![], claimed_rewards: vec![1] })
+			Some(StakingLedger {
+				stash: 11,
+				total: 1000,
+				active: 1000,
+				unlocking: vec![],
+				claimed_rewards: vec![1]
+			})
 		);
 
 		for i in 3..16 {
@@ -3275,7 +3228,13 @@ fn test_payout_stakers() {
 		// We track rewards in `claimed_rewards` vec
 		assert_eq!(
 			Staking::ledger(&10),
-			Some(StakingLedger { stash: 11, total: 1000, active: 1000, unlocking: vec![], claimed_rewards: (1..=14).collect() })
+			Some(StakingLedger {
+				stash: 11,
+				total: 1000,
+				active: 1000,
+				unlocking: vec![],
+				claimed_rewards: (1..=14).collect()
+			})
 		);
 
 		for i in 16..100 {
@@ -3290,7 +3249,13 @@ fn test_payout_stakers() {
 		assert_ok!(Staking::payout_stakers(Origin::signed(1337), 11, 98));
 		assert_eq!(
 			Staking::ledger(&10),
-			Some(StakingLedger { stash: 11, total: 1000, active: 1000, unlocking: vec![], claimed_rewards: vec![15, 98] })
+			Some(StakingLedger {
+				stash: 11,
+				total: 1000,
+				active: 1000,
+				unlocking: vec![],
+				claimed_rewards: vec![15, 98]
+			})
 		);
 
 		// Out of order claims works.
@@ -3299,7 +3264,13 @@ fn test_payout_stakers() {
 		assert_ok!(Staking::payout_stakers(Origin::signed(1337), 11, 42));
 		assert_eq!(
 			Staking::ledger(&10),
-			Some(StakingLedger { stash: 11, total: 1000, active: 1000, unlocking: vec![], claimed_rewards: vec![15, 23, 42, 69, 98] })
+			Some(StakingLedger {
+				stash: 11,
+				total: 1000,
+				active: 1000,
+				unlocking: vec![],
+				claimed_rewards: vec![15, 23, 42, 69, 98]
+			})
 		);
 	});
 }
@@ -3383,10 +3354,10 @@ fn payout_stakers_handles_weight_refund() {
 		assert!(half_max_nom_rewarded > 0);
 		assert!(max_nom_rewarded > half_max_nom_rewarded);
 
-		let max_nom_rewarded_weight
-			= <Test as Config>::WeightInfo::payout_stakers_alive_staked(max_nom_rewarded);
-		let half_max_nom_rewarded_weight
-			= <Test as Config>::WeightInfo::payout_stakers_alive_staked(half_max_nom_rewarded);
+		let max_nom_rewarded_weight =
+			<Test as Config>::WeightInfo::payout_stakers_alive_staked(max_nom_rewarded);
+		let half_max_nom_rewarded_weight =
+			<Test as Config>::WeightInfo::payout_stakers_alive_staked(half_max_nom_rewarded);
 		let zero_nom_payouts_weight = <Test as Config>::WeightInfo::payout_stakers_alive_staked(0);
 		assert!(zero_nom_payouts_weight > 0);
 		assert!(half_max_nom_rewarded_weight > zero_nom_payouts_weight);
@@ -3395,7 +3366,7 @@ fn payout_stakers_handles_weight_refund() {
 		let balance = 1000;
 		bond_validator(11, 10, balance);
 
-		/* Era 1 */
+		// Era 1
 		start_active_era(1);
 
 		// Reward just the validator.
@@ -3407,7 +3378,7 @@ fn payout_stakers_handles_weight_refund() {
 			bond_nominator((1000 + i).into(), (100 + i).into(), balance + i as Balance, vec![11]);
 		}
 
-		/* Era 2 */
+		// Era 2
 		start_active_era(2);
 
 		// Collect payouts when there are no nominators
@@ -3415,14 +3386,11 @@ fn payout_stakers_handles_weight_refund() {
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(Origin::signed(20));
 		assert_ok!(result);
-		assert_eq!(
-			extract_actual_weight(&result, &info),
-			zero_nom_payouts_weight
-		);
+		assert_eq!(extract_actual_weight(&result, &info), zero_nom_payouts_weight);
 
 		// The validator is not rewarded in this era; so there will be zero payouts to claim for this era.
 
-		/* Era 3 */
+		// Era 3
 		start_active_era(3);
 
 		// Collect payouts for an era where the validator did not receive any points.
@@ -3435,7 +3403,7 @@ fn payout_stakers_handles_weight_refund() {
 		// Reward the validator and its nominators.
 		Staking::reward_by_ids(vec![(11, 1)]);
 
-		/* Era 4 */
+		// Era 4
 		start_active_era(4);
 
 		// Collect payouts when the validator has `half_max_nom_rewarded` nominators.
@@ -3451,14 +3419,14 @@ fn payout_stakers_handles_weight_refund() {
 			bond_nominator((1000 + i).into(), (100 + i).into(), balance + i as Balance, vec![11]);
 		}
 
-		/* Era 5 */
+		// Era 5
 		start_active_era(5);
 		// We now have `max_nom_rewarded` nominators actively nominating our validator.
 
 		// Reward the validator so we can collect for everyone in the next era.
 		Staking::reward_by_ids(vec![(11, 1)]);
 
-		/* Era 6 */
+		// Era 6
 		start_active_era(6);
 
 		// Collect payouts when the validator had `half_max_nom_rewarded` nominators.
@@ -3665,7 +3633,6 @@ fn session_buffering_with_offset() {
 			assert_eq!(current_era(), 2);
 			assert_eq!(active_era(), 2);
 			assert_eq!(Session::current_index(), 10);
-
 		});
 }
 
@@ -3717,7 +3684,6 @@ fn session_buffering_no_offset() {
 			assert_eq!(current_era(), 2);
 			assert_eq!(active_era(), 2);
 			assert_eq!(Session::current_index(), 10);
-
 		});
 }
 
@@ -3758,10 +3724,7 @@ fn cannot_rebond_to_lower_than_ed() {
 			);
 
 			// now bond a wee bit more
-			assert_noop!(
-				Staking::rebond(Origin::signed(20), 5),
-				Error::<Test>::InsufficientBond,
-			);
+			assert_noop!(Staking::rebond(Origin::signed(20), 5), Error::<Test>::InsufficientBond,);
 		})
 }
 
@@ -3796,10 +3759,7 @@ fn cannot_bond_extra_to_lower_than_ed() {
 					stash: 21,
 					total: 1000,
 					active: 0,
-					unlocking: vec![UnlockChunk {
-						value: 1000,
-						era: 3
-					}],
+					unlocking: vec![UnlockChunk { value: 1000, era: 3 }],
 					claimed_rewards: vec![]
 				}
 			);
@@ -3866,8 +3826,8 @@ mod election_data_provider {
 	#[test]
 	fn targets_2sec_block() {
 		let mut validators = 1000;
-		while <Test as Config>::WeightInfo::get_npos_targets(validators)
-			< 2 * frame_support::weights::constants::WEIGHT_PER_SECOND
+		while <Test as Config>::WeightInfo::get_npos_targets(validators) <
+			2 * frame_support::weights::constants::WEIGHT_PER_SECOND
 		{
 			validators += 1;
 		}
@@ -3884,8 +3844,8 @@ mod election_data_provider {
 		let slashing_spans = validators;
 		let mut nominators = 1000;
 
-		while <Test as Config>::WeightInfo::get_npos_voters(validators, nominators, slashing_spans)
-			< 2 * frame_support::weights::constants::WEIGHT_PER_SECOND
+		while <Test as Config>::WeightInfo::get_npos_voters(validators, nominators, slashing_spans) <
+			2 * frame_support::weights::constants::WEIGHT_PER_SECOND
 		{
 			nominators += 1;
 		}
@@ -3975,10 +3935,7 @@ mod election_data_provider {
 			run_to_block(20);
 			assert_eq!(Staking::next_election_prediction(System::block_number()), 45);
 			assert_eq!(staking_events().len(), 1);
-			assert_eq!(
-				*staking_events().last().unwrap(),
-				Event::StakingElection
-			);
+			assert_eq!(*staking_events().last().unwrap(), Event::StakingElection);
 
 			for b in 21..45 {
 				run_to_block(b);
@@ -3989,10 +3946,7 @@ mod election_data_provider {
 			run_to_block(45);
 			assert_eq!(Staking::next_election_prediction(System::block_number()), 70);
 			assert_eq!(staking_events().len(), 3);
-			assert_eq!(
-				*staking_events().last().unwrap(),
-				Event::StakingElection
-			);
+			assert_eq!(*staking_events().last().unwrap(), Event::StakingElection);
 
 			Staking::force_no_eras(Origin::root()).unwrap();
 			assert_eq!(Staking::next_election_prediction(System::block_number()), u64::MAX);
@@ -4015,10 +3969,7 @@ mod election_data_provider {
 			run_to_block(55);
 			assert_eq!(Staking::next_election_prediction(System::block_number()), 55 + 25);
 			assert_eq!(staking_events().len(), 6);
-			assert_eq!(
-				*staking_events().last().unwrap(),
-				Event::StakingElection
-			);
+			assert_eq!(*staking_events().last().unwrap(), Event::StakingElection);
 			// The new era has been planned, forcing is changed from `ForceNew` to `NotForcing`.
 			assert_eq!(ForceEra::<Test>::get(), Forcing::NotForcing);
 		})
@@ -4032,11 +3983,14 @@ mod election_data_provider {
 			// not keep track of the count. This test should panic as we verify the count is accurate
 			// after every test using the `post_checks` in `mock`.
 			Validators::<Test>::insert(987654321, ValidatorPrefs::default());
-			Nominators::<Test>::insert(987654321, Nominations {
-				targets: vec![],
-				submitted_in: Default::default(),
-				suppressed: false,
-			});
+			Nominators::<Test>::insert(
+				987654321,
+				Nominations {
+					targets: vec![],
+					submitted_in: Default::default(),
+					suppressed: false,
+				},
+			);
 		})
 	}
 
@@ -4049,7 +4003,10 @@ mod election_data_provider {
 			.build_and_execute(|| {
 				// 500 is not enough for any role
 				assert_ok!(Staking::bond(Origin::signed(3), 4, 500, RewardDestination::Controller));
-				assert_noop!(Staking::nominate(Origin::signed(4), vec![1]), Error::<Test>::InsufficientBond);
+				assert_noop!(
+					Staking::nominate(Origin::signed(4), vec![1]),
+					Error::<Test>::InsufficientBond
+				);
 				assert_noop!(
 					Staking::validate(Origin::signed(4), ValidatorPrefs::default()),
 					Error::<Test>::InsufficientBond,
@@ -4069,12 +4026,18 @@ mod election_data_provider {
 				assert_ok!(Staking::validate(Origin::signed(4), ValidatorPrefs::default()));
 
 				// Can't unbond anything as validator
-				assert_noop!(Staking::unbond(Origin::signed(4), 500), Error::<Test>::InsufficientBond);
+				assert_noop!(
+					Staking::unbond(Origin::signed(4), 500),
+					Error::<Test>::InsufficientBond
+				);
 
 				// Once they are a nominator, they can unbond 500
 				assert_ok!(Staking::nominate(Origin::signed(4), vec![1]));
 				assert_ok!(Staking::unbond(Origin::signed(4), 500));
-				assert_noop!(Staking::unbond(Origin::signed(4), 500), Error::<Test>::InsufficientBond);
+				assert_noop!(
+					Staking::unbond(Origin::signed(4), 500),
+					Error::<Test>::InsufficientBond
+				);
 
 				// Once they are chilled they can unbond everything
 				assert_ok!(Staking::chill(Origin::signed(4)));
@@ -4089,7 +4052,7 @@ mod election_data_provider {
 			.min_nominator_bond(1_000)
 			.min_validator_bond(1_500)
 			.build_and_execute(|| {
-				for i in 0 .. 15 {
+				for i in 0..15 {
 					let a = 4 * i;
 					let b = 4 * i + 1;
 					let c = 4 * i + 2;
@@ -4100,11 +4063,21 @@ mod election_data_provider {
 					Balances::make_free_balance_be(&d, 100_000);
 
 					// Nominator
-					assert_ok!(Staking::bond(Origin::signed(a), b, 1000, RewardDestination::Controller));
+					assert_ok!(Staking::bond(
+						Origin::signed(a),
+						b,
+						1000,
+						RewardDestination::Controller
+					));
 					assert_ok!(Staking::nominate(Origin::signed(b), vec![1]));
 
 					// Validator
-					assert_ok!(Staking::bond(Origin::signed(c), d, 1500, RewardDestination::Controller));
+					assert_ok!(Staking::bond(
+						Origin::signed(c),
+						d,
+						1500,
+						RewardDestination::Controller
+					));
 					assert_ok!(Staking::validate(Origin::signed(d), ValidatorPrefs::default()));
 				}
 
@@ -4117,35 +4090,83 @@ mod election_data_provider {
 				// `chill_other` to succeed from one user to another.
 
 				// Can't chill these users
-				assert_noop!(Staking::chill_other(Origin::signed(1337), 1), Error::<Test>::CannotChillOther);
-				assert_noop!(Staking::chill_other(Origin::signed(1337), 3), Error::<Test>::CannotChillOther);
+				assert_noop!(
+					Staking::chill_other(Origin::signed(1337), 1),
+					Error::<Test>::CannotChillOther
+				);
+				assert_noop!(
+					Staking::chill_other(Origin::signed(1337), 3),
+					Error::<Test>::CannotChillOther
+				);
 
 				// Change the minimum bond... but no limits.
-				assert_ok!(Staking::set_staking_limits(Origin::root(), 1_500, 2_000, None, None, None));
+				assert_ok!(Staking::set_staking_limits(
+					Origin::root(),
+					1_500,
+					2_000,
+					None,
+					None,
+					None
+				));
 
 				// Still can't chill these users
-				assert_noop!(Staking::chill_other(Origin::signed(1337), 1), Error::<Test>::CannotChillOther);
-				assert_noop!(Staking::chill_other(Origin::signed(1337), 3), Error::<Test>::CannotChillOther);
+				assert_noop!(
+					Staking::chill_other(Origin::signed(1337), 1),
+					Error::<Test>::CannotChillOther
+				);
+				assert_noop!(
+					Staking::chill_other(Origin::signed(1337), 3),
+					Error::<Test>::CannotChillOther
+				);
 
 				// Add limits, but no threshold
-				assert_ok!(Staking::set_staking_limits(Origin::root(), 1_500, 2_000, Some(10), Some(10), None));
+				assert_ok!(Staking::set_staking_limits(
+					Origin::root(),
+					1_500,
+					2_000,
+					Some(10),
+					Some(10),
+					None
+				));
 
 				// Still can't chill these users
-				assert_noop!(Staking::chill_other(Origin::signed(1337), 1), Error::<Test>::CannotChillOther);
-				assert_noop!(Staking::chill_other(Origin::signed(1337), 3), Error::<Test>::CannotChillOther);
+				assert_noop!(
+					Staking::chill_other(Origin::signed(1337), 1),
+					Error::<Test>::CannotChillOther
+				);
+				assert_noop!(
+					Staking::chill_other(Origin::signed(1337), 3),
+					Error::<Test>::CannotChillOther
+				);
 
 				// Add threshold, but no limits
 				assert_ok!(Staking::set_staking_limits(
-					Origin::root(), 1_500, 2_000, None, None, Some(Percent::from_percent(0))
+					Origin::root(),
+					1_500,
+					2_000,
+					None,
+					None,
+					Some(Percent::from_percent(0))
 				));
 
 				// Still can't chill these users
-				assert_noop!(Staking::chill_other(Origin::signed(1337), 1), Error::<Test>::CannotChillOther);
-				assert_noop!(Staking::chill_other(Origin::signed(1337), 3), Error::<Test>::CannotChillOther);
+				assert_noop!(
+					Staking::chill_other(Origin::signed(1337), 1),
+					Error::<Test>::CannotChillOther
+				);
+				assert_noop!(
+					Staking::chill_other(Origin::signed(1337), 3),
+					Error::<Test>::CannotChillOther
+				);
 
 				// Add threshold and limits
 				assert_ok!(Staking::set_staking_limits(
-					Origin::root(), 1_500, 2_000, Some(10), Some(10), Some(Percent::from_percent(75))
+					Origin::root(),
+					1_500,
+					2_000,
+					Some(10),
+					Some(10),
+					Some(Percent::from_percent(75))
 				));
 
 				// 16 people total because tests start with 1 active one
@@ -4153,7 +4174,7 @@ mod election_data_provider {
 				assert_eq!(CounterForValidators::<Test>::get(), 16);
 
 				// Users can now be chilled down to 7 people, so we try to remove 9 of them (starting with 16)
-				for i in 6 .. 15 {
+				for i in 6..15 {
 					let b = 4 * i + 1;
 					let d = 4 * i + 3;
 					assert_ok!(Staking::chill_other(Origin::signed(1337), b));
@@ -4161,8 +4182,14 @@ mod election_data_provider {
 				}
 
 				// Cant go lower.
-				assert_noop!(Staking::chill_other(Origin::signed(1337), 1), Error::<Test>::CannotChillOther);
-				assert_noop!(Staking::chill_other(Origin::signed(1337), 3), Error::<Test>::CannotChillOther);
+				assert_noop!(
+					Staking::chill_other(Origin::signed(1337), 1),
+					Error::<Test>::CannotChillOther
+				);
+				assert_noop!(
+					Staking::chill_other(Origin::signed(1337), 3),
+					Error::<Test>::CannotChillOther
+				);
 			})
 	}
 
@@ -4177,23 +4204,37 @@ mod election_data_provider {
 			// Change the maximums
 			let max = 10;
 			assert_ok!(Staking::set_staking_limits(
-				Origin::root(), 10, 10, Some(max), Some(max), Some(Percent::from_percent(0))
+				Origin::root(),
+				10,
+				10,
+				Some(max),
+				Some(max),
+				Some(Percent::from_percent(0))
 			));
 
 			// can create `max - validator_count` validators
 			let mut some_existing_validator = AccountId::default();
-			for i in 0 .. max - validator_count {
+			for i in 0..max - validator_count {
 				let (_, controller) = testing_utils::create_stash_controller::<Test>(
-					i + 10_000_000, 100, RewardDestination::Controller,
-				).unwrap();
-				assert_ok!(Staking::validate(Origin::signed(controller), ValidatorPrefs::default()));
+					i + 10_000_000,
+					100,
+					RewardDestination::Controller,
+				)
+				.unwrap();
+				assert_ok!(Staking::validate(
+					Origin::signed(controller),
+					ValidatorPrefs::default()
+				));
 				some_existing_validator = controller;
 			}
 
 			// but no more
 			let (_, last_validator) = testing_utils::create_stash_controller::<Test>(
-				1337, 100, RewardDestination::Controller,
-			).unwrap();
+				1337,
+				100,
+				RewardDestination::Controller,
+			)
+			.unwrap();
 
 			assert_noop!(
 				Staking::validate(Origin::signed(last_validator), ValidatorPrefs::default()),
@@ -4202,29 +4243,44 @@ mod election_data_provider {
 
 			// same with nominators
 			let mut some_existing_nominator = AccountId::default();
-			for i in 0 .. max - nominator_count {
+			for i in 0..max - nominator_count {
 				let (_, controller) = testing_utils::create_stash_controller::<Test>(
-					i + 20_000_000, 100, RewardDestination::Controller,
-				).unwrap();
+					i + 20_000_000,
+					100,
+					RewardDestination::Controller,
+				)
+				.unwrap();
 				assert_ok!(Staking::nominate(Origin::signed(controller), vec![1]));
 				some_existing_nominator = controller;
 			}
 
 			// one more is too many
 			let (_, last_nominator) = testing_utils::create_stash_controller::<Test>(
-				30_000_000, 100, RewardDestination::Controller,
-			).unwrap();
-			assert_noop!(Staking::nominate(Origin::signed(last_nominator), vec![1]), Error::<Test>::TooManyNominators);
+				30_000_000,
+				100,
+				RewardDestination::Controller,
+			)
+			.unwrap();
+			assert_noop!(
+				Staking::nominate(Origin::signed(last_nominator), vec![1]),
+				Error::<Test>::TooManyNominators
+			);
 
 			// Re-nominate works fine
 			assert_ok!(Staking::nominate(Origin::signed(some_existing_nominator), vec![1]));
 			// Re-validate works fine
-			assert_ok!(Staking::validate(Origin::signed(some_existing_validator), ValidatorPrefs::default()));
+			assert_ok!(Staking::validate(
+				Origin::signed(some_existing_validator),
+				ValidatorPrefs::default()
+			));
 
 			// No problem when we set to `None` again
 			assert_ok!(Staking::set_staking_limits(Origin::root(), 10, 10, None, None, None));
 			assert_ok!(Staking::nominate(Origin::signed(last_nominator), vec![1]));
-			assert_ok!(Staking::validate(Origin::signed(last_validator), ValidatorPrefs::default()));
+			assert_ok!(Staking::validate(
+				Origin::signed(last_validator),
+				ValidatorPrefs::default()
+			));
 		})
 	}
 }
diff --git a/frame/staking/src/weights.rs b/frame/staking/src/weights.rs
index cf14e8b22362..cba4e68b5f61 100644
--- a/frame/staking/src/weights.rs
+++ b/frame/staking/src/weights.rs
@@ -36,6 +36,7 @@
 // --template=./.maintain/frame-weight-template.hbs
 
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
diff --git a/frame/sudo/src/lib.rs b/frame/sudo/src/lib.rs
index 6f70ddda99f6..7f0f6f57bf42 100644
--- a/frame/sudo/src/lib.rs
+++ b/frame/sudo/src/lib.rs
@@ -93,13 +93,10 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
+use sp_runtime::{traits::StaticLookup, DispatchResult};
 use sp_std::prelude::*;
-use sp_runtime::{DispatchResult, traits::StaticLookup};
 
-use frame_support::{
-	weights::GetDispatchInfo,
-	traits::UnfilteredDispatchable,
-};
+use frame_support::{traits::UnfilteredDispatchable, weights::GetDispatchInfo};
 
 #[cfg(test)]
 mod mock;
@@ -110,9 +107,9 @@ pub use pallet::*;
 
 #[frame_support::pallet]
 pub mod pallet {
+	use super::{DispatchResult, *};
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
-	use super::{*, DispatchResult};
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
@@ -120,7 +117,7 @@ pub mod pallet {
 		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
 
 		/// A sudo-able call.
-		type Call: Parameter + UnfilteredDispatchable<Origin=Self::Origin> + GetDispatchInfo;
+		type Call: Parameter + UnfilteredDispatchable<Origin = Self::Origin> + GetDispatchInfo;
 	}
 
 	#[pallet::pallet]
@@ -233,7 +230,7 @@ pub mod pallet {
 		pub fn sudo_as(
 			origin: OriginFor<T>,
 			who: <T::Lookup as StaticLookup>::Source,
-			call: Box<<T as Config>::Call>
+			call: Box<<T as Config>::Call>,
 		) -> DispatchResultWithPostInfo {
 			// This is a public call, so we ensure that the origin is some signed account.
 			let sender = ensure_signed(origin)?;
@@ -282,9 +279,7 @@ pub mod pallet {
 	#[cfg(feature = "std")]
 	impl<T: Config> Default for GenesisConfig<T> {
 		fn default() -> Self {
-			Self {
-				key: Default::default(),
-			}
+			Self { key: Default::default() }
 		}
 	}
 
diff --git a/frame/sudo/src/mock.rs b/frame/sudo/src/mock.rs
index 92683f98fb64..4fa24dd56ce5 100644
--- a/frame/sudo/src/mock.rs
+++ b/frame/sudo/src/mock.rs
@@ -18,20 +18,25 @@
 //! Test utilities
 
 use super::*;
-use frame_support::{parameter_types, traits::GenesisBuild};
-use sp_core::H256;
-use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
-use sp_io;
 use crate as sudo;
-use frame_support::traits::Filter;
+use frame_support::{
+	parameter_types,
+	traits::{Filter, GenesisBuild},
+};
 use frame_system::limits;
+use sp_core::H256;
+use sp_io;
+use sp_runtime::{
+	testing::Header,
+	traits::{BlakeTwo256, IdentityLookup},
+};
 
 // Logger module to track execution.
 #[frame_support::pallet]
 pub mod logger {
+	use super::*;
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
-	use super::*;
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
@@ -48,7 +53,7 @@ pub mod logger {
 		pub fn privileged_i32_log(
 			origin: OriginFor<T>,
 			i: i32,
-			weight: Weight
+			weight: Weight,
 		) -> DispatchResultWithPostInfo {
 			// Ensure that the `origin` is `Root`.
 			ensure_root(origin)?;
@@ -61,7 +66,7 @@ pub mod logger {
 		pub fn non_privileged_log(
 			origin: OriginFor<T>,
 			i: i32,
-			weight: Weight
+			weight: Weight,
 		) -> DispatchResultWithPostInfo {
 			// Ensure that the `origin` is some signed account.
 			let sender = ensure_signed(origin)?;
@@ -82,22 +87,13 @@ pub mod logger {
 
 	#[pallet::storage]
 	#[pallet::getter(fn account_log)]
-	pub(super) type AccountLog<T: Config> = StorageValue<
-		_,
-		Vec<T::AccountId>,
-		ValueQuery
-	>;
+	pub(super) type AccountLog<T: Config> = StorageValue<_, Vec<T::AccountId>, ValueQuery>;
 
 	#[pallet::storage]
 	#[pallet::getter(fn i32_log)]
-	pub(super) type I32Log<T> = StorageValue<
-		_,
-		Vec<i32>,
-		ValueQuery
-	>;
+	pub(super) type I32Log<T> = StorageValue<_, Vec<i32>, ValueQuery>;
 }
 
-
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
@@ -169,8 +165,8 @@ pub type LoggerCall = logger::Call<Test>;
 // Build test environment by setting the root `key` for the Genesis.
 pub fn new_test_ext(root_key: u64) -> sp_io::TestExternalities {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-	sudo::GenesisConfig::<Test>{
-		key: root_key,
-	}.assimilate_storage(&mut t).unwrap();
+	sudo::GenesisConfig::<Test> { key: root_key }
+		.assimilate_storage(&mut t)
+		.unwrap();
 	t.into()
 }
diff --git a/frame/sudo/src/tests.rs b/frame/sudo/src/tests.rs
index aa859c547c03..9437f20832c4 100644
--- a/frame/sudo/src/tests.rs
+++ b/frame/sudo/src/tests.rs
@@ -18,17 +18,17 @@
 //! Tests for the module.
 
 use super::*;
+use frame_support::{assert_noop, assert_ok};
 use mock::{
-	Sudo, SudoCall, Origin, Call, Test, new_test_ext, LoggerCall, Logger, System,
-	Event as TestEvent,
+	new_test_ext, Call, Event as TestEvent, Logger, LoggerCall, Origin, Sudo, SudoCall, System,
+	Test,
 };
-use frame_support::{assert_ok, assert_noop};
 
 #[test]
 fn test_setup_works() {
 	// Environment setup, logger storage, and sudo `key` retrieval should work as expected.
 	new_test_ext(1).execute_with(|| {
-		assert_eq!(Sudo::key(),  1u64);
+		assert_eq!(Sudo::key(), 1u64);
 		assert!(Logger::i32_log().is_empty());
 		assert!(Logger::account_log().is_empty());
 	});
@@ -105,7 +105,7 @@ fn set_key_basics() {
 	new_test_ext(1).execute_with(|| {
 		// A root `key` can change the root `key`
 		assert_ok!(Sudo::set_key(Origin::signed(1), 2));
-		assert_eq!(Sudo::key(),  2u64);
+		assert_eq!(Sudo::key(), 2u64);
 	});
 
 	new_test_ext(1).execute_with(|| {
@@ -146,14 +146,14 @@ fn sudo_as_basics() {
 		let call = Box::new(Call::Logger(LoggerCall::non_privileged_log(42, 1)));
 		assert_ok!(Sudo::sudo_as(Origin::signed(1), 2, call));
 		assert_eq!(Logger::i32_log(), vec![42i32]);
-		 // The correct user makes the call within `sudo_as`.
+		// The correct user makes the call within `sudo_as`.
 		assert_eq!(Logger::account_log(), vec![2]);
 	});
 }
 
 #[test]
 fn sudo_as_emits_events_correctly() {
-		new_test_ext(1).execute_with(|| {
+	new_test_ext(1).execute_with(|| {
 		// Set block number to 1 because events are not emitted on block 0.
 		System::set_block_number(1);
 
diff --git a/frame/support/procedural/src/clone_no_bound.rs b/frame/support/procedural/src/clone_no_bound.rs
index 1911fdfd9fb2..747900fd023f 100644
--- a/frame/support/procedural/src/clone_no_bound.rs
+++ b/frame/support/procedural/src/clone_no_bound.rs
@@ -30,56 +30,61 @@ pub fn derive_clone_no_bound(input: proc_macro::TokenStream) -> proc_macro::Toke
 	let impl_ = match input.data {
 		syn::Data::Struct(struct_) => match struct_.fields {
 			syn::Fields::Named(named) => {
-				let fields = named.named.iter()
-					.map(|i| &i.ident)
-					.map(|i| quote::quote_spanned!(i.span() =>
+				let fields = named.named.iter().map(|i| &i.ident).map(|i| {
+					quote::quote_spanned!(i.span() =>
 						#i: core::clone::Clone::clone(&self.#i)
-					));
+					)
+				});
 
 				quote::quote!( Self { #( #fields, )* } )
 			},
 			syn::Fields::Unnamed(unnamed) => {
-				let fields = unnamed.unnamed.iter().enumerate()
-					.map(|(i, _)| syn::Index::from(i))
-					.map(|i| quote::quote_spanned!(i.span() =>
-						core::clone::Clone::clone(&self.#i)
-					));
+				let fields =
+					unnamed.unnamed.iter().enumerate().map(|(i, _)| syn::Index::from(i)).map(|i| {
+						quote::quote_spanned!(i.span() =>
+							core::clone::Clone::clone(&self.#i)
+						)
+					});
 
 				quote::quote!( Self ( #( #fields, )* ) )
 			},
 			syn::Fields::Unit => {
-				quote::quote!( Self )
-			}
+				quote::quote!(Self)
+			},
 		},
 		syn::Data::Enum(enum_) => {
-			let variants = enum_.variants.iter()
-				.map(|variant| {
-					let ident = &variant.ident;
-					match &variant.fields {
-						syn::Fields::Named(named) => {
-							let captured = named.named.iter().map(|i| &i.ident);
-							let cloned = captured.clone()
-								.map(|i| quote::quote_spanned!(i.span() =>
-									#i: core::clone::Clone::clone(#i)
-								));
-							quote::quote!(
-								Self::#ident { #( ref #captured, )* } => Self::#ident { #( #cloned, )*}
+			let variants = enum_.variants.iter().map(|variant| {
+				let ident = &variant.ident;
+				match &variant.fields {
+					syn::Fields::Named(named) => {
+						let captured = named.named.iter().map(|i| &i.ident);
+						let cloned = captured.clone().map(|i| {
+							quote::quote_spanned!(i.span() =>
+								#i: core::clone::Clone::clone(#i)
 							)
-						},
-						syn::Fields::Unnamed(unnamed) => {
-							let captured = unnamed.unnamed.iter().enumerate()
-								.map(|(i, f)| syn::Ident::new(&format!("_{}", i), f.span()));
-							let cloned = captured.clone()
-								.map(|i| quote::quote_spanned!(i.span() =>
-									core::clone::Clone::clone(#i)
-								));
-							quote::quote!(
-								Self::#ident ( #( ref #captured, )* ) => Self::#ident ( #( #cloned, )*)
+						});
+						quote::quote!(
+							Self::#ident { #( ref #captured, )* } => Self::#ident { #( #cloned, )*}
+						)
+					},
+					syn::Fields::Unnamed(unnamed) => {
+						let captured = unnamed
+							.unnamed
+							.iter()
+							.enumerate()
+							.map(|(i, f)| syn::Ident::new(&format!("_{}", i), f.span()));
+						let cloned = captured.clone().map(|i| {
+							quote::quote_spanned!(i.span() =>
+								core::clone::Clone::clone(#i)
 							)
-						},
-						syn::Fields::Unit => quote::quote!( Self::#ident => Self::#ident ),
-					}
-				});
+						});
+						quote::quote!(
+							Self::#ident ( #( ref #captured, )* ) => Self::#ident ( #( #cloned, )*)
+						)
+					},
+					syn::Fields::Unit => quote::quote!( Self::#ident => Self::#ident ),
+				}
+			});
 
 			quote::quote!(match self {
 				#( #variants, )*
@@ -99,5 +104,6 @@ pub fn derive_clone_no_bound(input: proc_macro::TokenStream) -> proc_macro::Toke
 				}
 			}
 		};
-	).into()
+	)
+	.into()
 }
diff --git a/frame/support/procedural/src/construct_runtime/expand/call.rs b/frame/support/procedural/src/construct_runtime/expand/call.rs
index 6a44468f25b2..f847bc6dbfbd 100644
--- a/frame/support/procedural/src/construct_runtime/expand/call.rs
+++ b/frame/support/procedural/src/construct_runtime/expand/call.rs
@@ -30,16 +30,16 @@ pub fn expand_outer_dispatch(
 	let mut query_call_part_macros = Vec::new();
 	let mut pallet_names = Vec::new();
 
-	let pallets_with_call = pallet_decls
-		.iter()
-		.filter(|decl| decl.exists_part("Call"));
+	let pallets_with_call = pallet_decls.iter().filter(|decl| decl.exists_part("Call"));
 
 	for pallet_declaration in pallets_with_call {
 		let name = &pallet_declaration.name;
 		let path = &pallet_declaration.path;
 		let index = pallet_declaration.index;
 
-		variant_defs.extend(quote!(#[codec(index = #index)] #name( #scrate::dispatch::CallableCallFor<#name, #runtime> ),));
+		variant_defs.extend(
+			quote!(#[codec(index = #index)] #name( #scrate::dispatch::CallableCallFor<#name, #runtime> ),),
+		);
 		variant_patterns.push(quote!(Call::#name(call)));
 		pallet_names.push(name);
 		query_call_part_macros.push(quote! {
diff --git a/frame/support/procedural/src/construct_runtime/expand/config.rs b/frame/support/procedural/src/construct_runtime/expand/config.rs
index 8dc2710b192d..5e1b9d94700e 100644
--- a/frame/support/procedural/src/construct_runtime/expand/config.rs
+++ b/frame/support/procedural/src/construct_runtime/expand/config.rs
@@ -18,7 +18,7 @@
 use crate::construct_runtime::Pallet;
 use inflector::Inflector;
 use proc_macro2::TokenStream;
-use quote::{ToTokens, format_ident, quote};
+use quote::{format_ident, quote, ToTokens};
 use syn::Ident;
 
 pub fn expand_outer_config(
@@ -37,15 +37,18 @@ pub fn expand_outer_config(
 			let pallet_name = &decl.name;
 			let path_str = path.into_token_stream().to_string();
 			let config = format_ident!("{}Config", pallet_name);
-			let field_name = &Ident::new(
-				&pallet_name.to_string().to_snake_case(),
-				decl.name.span(),
-			);
+			let field_name =
+				&Ident::new(&pallet_name.to_string().to_snake_case(), decl.name.span());
 			let part_is_generic = !pallet_entry.generics.params.is_empty();
 
 			types.extend(expand_config_types(runtime, decl, &config, part_is_generic));
 			fields.extend(quote!(pub #field_name: #config,));
-			build_storage_calls.extend(expand_config_build_storage_call(scrate, runtime, decl, &field_name));
+			build_storage_calls.extend(expand_config_build_storage_call(
+				scrate,
+				runtime,
+				decl,
+				&field_name,
+			));
 			query_genesis_config_part_macros.push(quote! {
 				#path::__substrate_genesis_config_check::is_genesis_config_defined!(#pallet_name);
 				#[cfg(feature = "std")]
@@ -97,15 +100,15 @@ fn expand_config_types(
 	let path = &decl.path;
 
 	match (decl.instance.as_ref(), part_is_generic) {
-		(Some(inst), true) => quote!{
+		(Some(inst), true) => quote! {
 			#[cfg(any(feature = "std", test))]
 			pub type #config = #path::GenesisConfig<#runtime, #path::#inst>;
 		},
-		(None, true) => quote!{
+		(None, true) => quote! {
 			#[cfg(any(feature = "std", test))]
 			pub type #config = #path::GenesisConfig<#runtime>;
 		},
-		(_, false) => quote!{
+		(_, false) => quote! {
 			#[cfg(any(feature = "std", test))]
 			pub type #config = #path::GenesisConfig;
 		},
@@ -125,7 +128,7 @@ fn expand_config_build_storage_call(
 		quote!(#path::__InherentHiddenInstance)
 	};
 
-	quote!{
+	quote! {
 		#scrate::sp_runtime::BuildModuleGenesisStorage::
 			<#runtime, #instance>::build_module_genesis_storage(&self.#field_name, storage)?;
 	}
diff --git a/frame/support/procedural/src/construct_runtime/expand/event.rs b/frame/support/procedural/src/construct_runtime/expand/event.rs
index d304a30b7df0..a04759ec972b 100644
--- a/frame/support/procedural/src/construct_runtime/expand/event.rs
+++ b/frame/support/procedural/src/construct_runtime/expand/event.rs
@@ -43,7 +43,7 @@ pub fn expand_outer_event(
 					 be constructed: pallet `{}` must have generic `Event`",
 					pallet_name,
 				);
-				return Err(syn::Error::new(pallet_name.span(), msg));
+				return Err(syn::Error::new(pallet_name.span(), msg))
 			}
 
 			let part_is_generic = !generics.params.is_empty();
@@ -54,7 +54,13 @@ pub fn expand_outer_event(
 				(None, false) => quote!(#path::Event),
 			};
 
-			event_variants.extend(expand_event_variant(runtime, pallet_decl, index, instance, generics));
+			event_variants.extend(expand_event_variant(
+				runtime,
+				pallet_decl,
+				index,
+				instance,
+				generics,
+			));
 			event_conversions.extend(expand_event_conversion(scrate, pallet_decl, &pallet_event));
 			query_event_part_macros.push(quote! {
 				#path::__substrate_event_check::is_event_part_defined!(#pallet_name);
@@ -94,16 +100,16 @@ fn expand_event_variant(
 	match instance {
 		Some(inst) if part_is_generic => {
 			quote!(#[codec(index = #index)] #variant_name(#path::Event<#runtime, #path::#inst>),)
-		}
+		},
 		Some(inst) => {
 			quote!(#[codec(index = #index)] #variant_name(#path::Event<#path::#inst>),)
-		}
+		},
 		None if part_is_generic => {
 			quote!(#[codec(index = #index)] #variant_name(#path::Event<#runtime>),)
-		}
+		},
 		None => {
 			quote!(#[codec(index = #index)] #variant_name(#path::Event),)
-		}
+		},
 	}
 }
 
@@ -114,7 +120,7 @@ fn expand_event_conversion(
 ) -> TokenStream {
 	let variant_name = &pallet.name;
 
-	quote!{
+	quote! {
 		impl From<#pallet_event> for Event {
 			fn from(x: #pallet_event) -> Self {
 				Event::#variant_name(x)
diff --git a/frame/support/procedural/src/construct_runtime/expand/metadata.rs b/frame/support/procedural/src/construct_runtime/expand/metadata.rs
index 5854d0edccab..fa12242f4fcd 100644
--- a/frame/support/procedural/src/construct_runtime/expand/metadata.rs
+++ b/frame/support/procedural/src/construct_runtime/expand/metadata.rs
@@ -15,10 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License
 
-use proc_macro2::TokenStream;
 use crate::construct_runtime::Pallet;
-use syn::{Ident, TypePath};
+use proc_macro2::TokenStream;
 use quote::quote;
+use syn::{Ident, TypePath};
 
 pub fn expand_runtime_metadata(
 	runtime: &Ident,
@@ -48,7 +48,7 @@ pub fn expand_runtime_metadata(
 			let constants = expand_pallet_metadata_constants(runtime, scrate, decl);
 			let errors = expand_pallet_metadata_errors(runtime, scrate, decl);
 
-			quote!{
+			quote! {
 				#scrate::metadata::ModuleMetadata {
 					name: #scrate::metadata::DecodeDifferent::Encode(stringify!(#name)),
 					index: #index,
@@ -62,7 +62,7 @@ pub fn expand_runtime_metadata(
 		})
 		.collect::<Vec<_>>();
 
-	quote!{
+	quote! {
 		impl #runtime {
 			pub fn metadata() -> #scrate::metadata::RuntimeMetadataPrefixed {
 				#scrate::metadata::RuntimeMetadataLastVersion {
@@ -94,7 +94,7 @@ fn expand_pallet_metadata_storage(
 		let instance = decl.instance.as_ref().into_iter();
 		let path = &decl.path;
 
-		quote!{
+		quote! {
 			Some(#scrate::metadata::DecodeDifferent::Encode(
 				#scrate::metadata::FnEncode(
 					#path::Pallet::<#runtime #(, #path::#instance)*>::storage_metadata
@@ -116,7 +116,7 @@ fn expand_pallet_metadata_calls(
 		let instance = decl.instance.as_ref().into_iter();
 		let path = &decl.path;
 
-		quote!{
+		quote! {
 			Some(#scrate::metadata::DecodeDifferent::Encode(
 				#scrate::metadata::FnEncode(
 					#path::Pallet::<#runtime #(, #path::#instance)*>::call_functions
@@ -136,8 +136,12 @@ fn expand_pallet_metadata_events(
 ) -> TokenStream {
 	if filtered_names.contains(&"Event") {
 		let path = &decl.path;
-		let part_is_generic =
-			!decl.find_part("Event").expect("Event part exists; qed").generics.params.is_empty();
+		let part_is_generic = !decl
+			.find_part("Event")
+			.expect("Event part exists; qed")
+			.generics
+			.params
+			.is_empty();
 		let pallet_event = match (decl.instance.as_ref(), part_is_generic) {
 			(Some(inst), true) => quote!(#path::Event::<#runtime, #path::#inst>),
 			(Some(inst), false) => quote!(#path::Event::<#path::#inst>),
@@ -145,7 +149,7 @@ fn expand_pallet_metadata_events(
 			(None, false) => quote!(#path::Event),
 		};
 
-		quote!{
+		quote! {
 			Some(#scrate::metadata::DecodeDifferent::Encode(
 				#scrate::metadata::FnEncode(#pallet_event::metadata)
 			))
@@ -163,7 +167,7 @@ fn expand_pallet_metadata_constants(
 	let path = &decl.path;
 	let instance = decl.instance.as_ref().into_iter();
 
-	quote!{
+	quote! {
 		#scrate::metadata::DecodeDifferent::Encode(
 			#scrate::metadata::FnEncode(
 				#path::Pallet::<#runtime #(, #path::#instance)*>::module_constants_metadata
@@ -180,7 +184,7 @@ fn expand_pallet_metadata_errors(
 	let path = &decl.path;
 	let instance = decl.instance.as_ref().into_iter();
 
-	quote!{
+	quote! {
 		#scrate::metadata::DecodeDifferent::Encode(
 			#scrate::metadata::FnEncode(
 				<#path::Pallet::<#runtime #(, #path::#instance)*> as #scrate::metadata::ModuleErrorMetadata>::metadata
diff --git a/frame/support/procedural/src/construct_runtime/expand/origin.rs b/frame/support/procedural/src/construct_runtime/expand/origin.rs
index 962d25835940..5091867eeef5 100644
--- a/frame/support/procedural/src/construct_runtime/expand/origin.rs
+++ b/frame/support/procedural/src/construct_runtime/expand/origin.rs
@@ -18,7 +18,7 @@
 use crate::construct_runtime::{Pallet, SYSTEM_PALLET_NAME};
 use proc_macro2::TokenStream;
 use quote::quote;
-use syn::{token, Ident, Generics};
+use syn::{token, Generics, Ident};
 
 pub fn expand_outer_origin(
 	runtime: &Ident,
@@ -26,13 +26,14 @@ pub fn expand_outer_origin(
 	pallets_token: token::Brace,
 	scrate: &TokenStream,
 ) -> syn::Result<TokenStream> {
-	let system_pallet = pallets.iter()
-		.find(|decl| decl.name == SYSTEM_PALLET_NAME)
-		.ok_or_else(|| syn::Error::new(
-			pallets_token.span,
-			"`System` pallet declaration is missing. \
+	let system_pallet =
+		pallets.iter().find(|decl| decl.name == SYSTEM_PALLET_NAME).ok_or_else(|| {
+			syn::Error::new(
+				pallets_token.span,
+				"`System` pallet declaration is missing. \
 			 Please add this line: `System: frame_system::{Pallet, Call, Storage, Config, Event<T>},`",
-		))?;
+			)
+		})?;
 
 	let mut caller_variants = TokenStream::new();
 	let mut pallet_conversions = TokenStream::new();
@@ -52,15 +53,23 @@ pub fn expand_outer_origin(
 					 be constructed: pallet `{}` must have generic `Origin`",
 					name
 				);
-				return Err(syn::Error::new(name.span(), msg));
+				return Err(syn::Error::new(name.span(), msg))
 			}
 
-			caller_variants.extend(
-				expand_origin_caller_variant(runtime, pallet_decl, index, instance, generics),
-			);
-			pallet_conversions.extend(
-				expand_origin_pallet_conversions(scrate, runtime, pallet_decl, instance, generics),
-			);
+			caller_variants.extend(expand_origin_caller_variant(
+				runtime,
+				pallet_decl,
+				index,
+				instance,
+				generics,
+			));
+			pallet_conversions.extend(expand_origin_pallet_conversions(
+				scrate,
+				runtime,
+				pallet_decl,
+				instance,
+				generics,
+			));
 			query_origin_part_macros.push(quote! {
 				#path::__substrate_origin_check::is_origin_part_defined!(#name);
 			});
@@ -270,16 +279,16 @@ fn expand_origin_caller_variant(
 	match instance {
 		Some(inst) if part_is_generic => {
 			quote!(#[codec(index = #index)] #variant_name(#path::Origin<#runtime, #path::#inst>),)
-		}
+		},
 		Some(inst) => {
 			quote!(#[codec(index = #index)] #variant_name(#path::Origin<#path::#inst>),)
-		}
+		},
 		None if part_is_generic => {
 			quote!(#[codec(index = #index)] #variant_name(#path::Origin<#runtime>),)
-		}
+		},
 		None => {
 			quote!(#[codec(index = #index)] #variant_name(#path::Origin),)
-		}
+		},
 	}
 }
 
@@ -301,7 +310,7 @@ fn expand_origin_pallet_conversions(
 		None => quote!(#path::Origin),
 	};
 
-	quote!{
+	quote! {
 		impl From<#pallet_origin> for OriginCaller {
 			fn from(x: #pallet_origin) -> Self {
 				OriginCaller::#variant_name(x)
diff --git a/frame/support/procedural/src/construct_runtime/mod.rs b/frame/support/procedural/src/construct_runtime/mod.rs
index 6f8924a14bcc..402cb5458851 100644
--- a/frame/support/procedural/src/construct_runtime/mod.rs
+++ b/frame/support/procedural/src/construct_runtime/mod.rs
@@ -18,14 +18,15 @@
 mod expand;
 mod parse;
 
-use frame_support_procedural_tools::syn_ext as ext;
-use frame_support_procedural_tools::{generate_crate_access, generate_hidden_includes};
+use frame_support_procedural_tools::{
+	generate_crate_access, generate_hidden_includes, syn_ext as ext,
+};
 use parse::{PalletDeclaration, PalletPart, PalletPath, RuntimeDefinition, WhereSection};
 use proc_macro::TokenStream;
 use proc_macro2::TokenStream as TokenStream2;
 use quote::quote;
-use syn::{Ident, Result};
 use std::collections::HashMap;
+use syn::{Ident, Result};
 
 /// The fixed name of the system pallet.
 const SYSTEM_PALLET_NAME: &str = "System";
@@ -65,48 +66,44 @@ fn complete_pallets(decl: impl Iterator<Item = PalletDeclaration>) -> syn::Resul
 	let mut last_index: Option<u8> = None;
 	let mut names = HashMap::new();
 
-	decl
-		.map(|pallet| {
-			let final_index = match pallet.index {
-				Some(i) => i,
-				None => last_index.map_or(Some(0), |i| i.checked_add(1))
-					.ok_or_else(|| {
-						let msg = "Pallet index doesn't fit into u8, index is 256";
-						syn::Error::new(pallet.name.span(), msg)
-					})?,
-			};
-
-			last_index = Some(final_index);
-
-			if let Some(used_pallet) = indices.insert(final_index, pallet.name.clone()) {
-				let msg = format!(
-					"Pallet indices are conflicting: Both pallets {} and {} are at index {}",
-					used_pallet,
-					pallet.name,
-					final_index,
-				);
-				let mut err = syn::Error::new(used_pallet.span(), &msg);
-				err.combine(syn::Error::new(pallet.name.span(), msg));
-				return Err(err);
-			}
+	decl.map(|pallet| {
+		let final_index = match pallet.index {
+			Some(i) => i,
+			None => last_index.map_or(Some(0), |i| i.checked_add(1)).ok_or_else(|| {
+				let msg = "Pallet index doesn't fit into u8, index is 256";
+				syn::Error::new(pallet.name.span(), msg)
+			})?,
+		};
 
-			if let Some(used_pallet) = names.insert(pallet.name.clone(), pallet.name.span()) {
-				let msg = "Two pallets with the same name!";
+		last_index = Some(final_index);
 
-				let mut err = syn::Error::new(used_pallet, &msg);
-				err.combine(syn::Error::new(pallet.name.span(), &msg));
-				return Err(err);
-			}
+		if let Some(used_pallet) = indices.insert(final_index, pallet.name.clone()) {
+			let msg = format!(
+				"Pallet indices are conflicting: Both pallets {} and {} are at index {}",
+				used_pallet, pallet.name, final_index,
+			);
+			let mut err = syn::Error::new(used_pallet.span(), &msg);
+			err.combine(syn::Error::new(pallet.name.span(), msg));
+			return Err(err)
+		}
 
-			Ok(Pallet {
-				name: pallet.name,
-				index: final_index,
-				path: pallet.path,
-				instance: pallet.instance,
-				pallet_parts: pallet.pallet_parts,
-			})
+		if let Some(used_pallet) = names.insert(pallet.name.clone(), pallet.name.span()) {
+			let msg = "Two pallets with the same name!";
+
+			let mut err = syn::Error::new(used_pallet, &msg);
+			err.combine(syn::Error::new(pallet.name.span(), &msg));
+			return Err(err)
+		}
+
+		Ok(Pallet {
+			name: pallet.name,
+			index: final_index,
+			path: pallet.path,
+			instance: pallet.instance,
+			pallet_parts: pallet.pallet_parts,
 		})
-		.collect()
+	})
+	.collect()
 }
 
 pub fn construct_runtime(input: TokenStream) -> TokenStream {
@@ -119,17 +116,9 @@ pub fn construct_runtime(input: TokenStream) -> TokenStream {
 fn construct_runtime_parsed(definition: RuntimeDefinition) -> Result<TokenStream2> {
 	let RuntimeDefinition {
 		name,
-		where_section: WhereSection {
-			block,
-			node_block,
-			unchecked_extrinsic,
-			..
-		},
+		where_section: WhereSection { block, node_block, unchecked_extrinsic, .. },
 		pallets:
-			ext::Braces {
-				content: ext::Punctuated { inner: pallets, .. },
-				token: pallets_token,
-			},
+			ext::Braces { content: ext::Punctuated { inner: pallets, .. }, token: pallets_token },
 		..
 	} = definition;
 
@@ -148,13 +137,8 @@ fn construct_runtime_parsed(definition: RuntimeDefinition) -> Result<TokenStream
 	let dispatch = expand::expand_outer_dispatch(&name, &pallets, &scrate);
 	let metadata = expand::expand_runtime_metadata(&name, &pallets, &scrate, &unchecked_extrinsic);
 	let outer_config = expand::expand_outer_config(&name, &pallets, &scrate);
-	let inherent = expand::expand_outer_inherent(
-		&name,
-		&block,
-		&unchecked_extrinsic,
-		&pallets,
-		&scrate,
-	);
+	let inherent =
+		expand::expand_outer_inherent(&name, &block, &unchecked_extrinsic, &pallets, &scrate);
 	let validate_unsigned = expand::expand_outer_validate_unsigned(&name, &pallets, &scrate);
 	let integrity_test = decl_integrity_test(&scrate);
 
@@ -210,12 +194,7 @@ fn decl_all_pallets<'a>(
 		let type_name = &pallet_declaration.name;
 		let pallet = &pallet_declaration.path;
 		let mut generics = vec![quote!(#runtime)];
-		generics.extend(
-			pallet_declaration
-				.instance
-				.iter()
-				.map(|name| quote!(#pallet::#name)),
-		);
+		generics.extend(pallet_declaration.instance.iter().map(|name| quote!(#pallet::#name)));
 		let type_decl = quote!(
 			pub type #type_name = #pallet::Pallet <#(#generics),*>;
 		);
@@ -224,11 +203,13 @@ fn decl_all_pallets<'a>(
 	}
 	// Make nested tuple structure like (((Babe, Consensus), Grandpa), ...)
 	// But ignore the system pallet.
-	let all_pallets = names.iter()
+	let all_pallets = names
+		.iter()
 		.filter(|n| **n != SYSTEM_PALLET_NAME)
 		.fold(TokenStream2::default(), |combined, name| quote!((#name, #combined)));
 
-	let all_pallets_with_system = names.iter()
+	let all_pallets_with_system = names
+		.iter()
 		.fold(TokenStream2::default(), |combined, name| quote!((#name, #combined)));
 
 	quote!(
@@ -258,8 +239,7 @@ fn decl_pallet_runtime_setup(
 	let names = pallet_declarations.iter().map(|d| &d.name);
 	let names2 = pallet_declarations.iter().map(|d| &d.name);
 	let name_strings = pallet_declarations.iter().map(|d| d.name.to_string());
-	let indices = pallet_declarations.iter()
-		.map(|pallet| pallet.index as usize);
+	let indices = pallet_declarations.iter().map(|pallet| pallet.index as usize);
 
 	quote!(
 		/// Provides an implementation of `PalletInfo` to provide information
diff --git a/frame/support/procedural/src/construct_runtime/parse.rs b/frame/support/procedural/src/construct_runtime/parse.rs
index 2d242749cfe0..6f2fd82e73f4 100644
--- a/frame/support/procedural/src/construct_runtime/parse.rs
+++ b/frame/support/procedural/src/construct_runtime/parse.rs
@@ -77,9 +77,9 @@ impl Parse for WhereSection {
 			definitions.push(definition);
 			if !input.peek(Token![,]) {
 				if !input.peek(token::Brace) {
-					return Err(input.error("Expected `,` or `{`"));
+					return Err(input.error("Expected `,` or `{`"))
 				}
-				break;
+				break
 			}
 			input.parse::<Token![,]>()?;
 		}
@@ -87,23 +87,14 @@ impl Parse for WhereSection {
 		let node_block = remove_kind(input, WhereKind::NodeBlock, &mut definitions)?.value;
 		let unchecked_extrinsic =
 			remove_kind(input, WhereKind::UncheckedExtrinsic, &mut definitions)?.value;
-		if let Some(WhereDefinition {
-			ref kind_span,
-			ref kind,
-			..
-		}) = definitions.first()
-		{
+		if let Some(WhereDefinition { ref kind_span, ref kind, .. }) = definitions.first() {
 			let msg = format!(
 				"`{:?}` was declared above. Please use exactly one declaration for `{:?}`.",
 				kind, kind
 			);
-			return Err(Error::new(*kind_span, msg));
+			return Err(Error::new(*kind_span, msg))
 		}
-		Ok(Self {
-			block,
-			node_block,
-			unchecked_extrinsic,
-		})
+		Ok(Self { block, node_block, unchecked_extrinsic })
 	}
 }
 
@@ -127,17 +118,11 @@ impl Parse for WhereDefinition {
 		let (kind_span, kind) = if lookahead.peek(keyword::Block) {
 			(input.parse::<keyword::Block>()?.span(), WhereKind::Block)
 		} else if lookahead.peek(keyword::NodeBlock) {
-			(
-				input.parse::<keyword::NodeBlock>()?.span(),
-				WhereKind::NodeBlock,
-			)
+			(input.parse::<keyword::NodeBlock>()?.span(), WhereKind::NodeBlock)
 		} else if lookahead.peek(keyword::UncheckedExtrinsic) {
-			(
-				input.parse::<keyword::UncheckedExtrinsic>()?.span(),
-				WhereKind::UncheckedExtrinsic,
-			)
+			(input.parse::<keyword::UncheckedExtrinsic>()?.span(), WhereKind::UncheckedExtrinsic)
 		} else {
-			return Err(lookahead.error());
+			return Err(lookahead.error())
 		};
 
 		Ok(Self {
@@ -187,13 +172,7 @@ impl Parse for PalletDeclaration {
 			None
 		};
 
-		let parsed = Self {
-			name,
-			path,
-			instance,
-			pallet_parts,
-			index,
-		};
+		let parsed = Self { name, path, instance, pallet_parts, index };
 
 		Ok(parsed)
 	}
@@ -214,17 +193,17 @@ impl Parse for PalletPath {
 		let mut lookahead = input.lookahead1();
 		let mut segments = Punctuated::new();
 
-		if lookahead.peek(Token![crate])
-			|| lookahead.peek(Token![self])
-			|| lookahead.peek(Token![super])
-			|| lookahead.peek(Ident)
+		if lookahead.peek(Token![crate]) ||
+			lookahead.peek(Token![self]) ||
+			lookahead.peek(Token![super]) ||
+			lookahead.peek(Ident)
 		{
 			let ident = input.call(Ident::parse_any)?;
 			segments.push(PathSegment { ident, arguments: PathArguments::None });
 			let _: Token![::] = input.parse()?;
 			lookahead = input.lookahead1();
 		} else {
-			return Err(lookahead.error());
+			return Err(lookahead.error())
 		}
 
 		while lookahead.peek(Ident) {
@@ -235,15 +214,10 @@ impl Parse for PalletPath {
 		}
 
 		if !lookahead.peek(token::Brace) && !lookahead.peek(Token![<]) {
-			return Err(lookahead.error());
+			return Err(lookahead.error())
 		}
 
-		Ok(Self {
-			inner: Path {
-				leading_colon: None,
-				segments,
-			}
-		})
+		Ok(Self { inner: Path { leading_colon: None, segments } })
 	}
 }
 
@@ -257,7 +231,7 @@ impl quote::ToTokens for PalletPath {
 ///
 /// `{ Call, Event }`
 fn parse_pallet_parts(input: ParseStream) -> Result<Vec<PalletPart>> {
-	let pallet_parts :ext::Braces<ext::Punctuated<PalletPart, Token![,]>> = input.parse()?;
+	let pallet_parts: ext::Braces<ext::Punctuated<PalletPart, Token![,]>> = input.parse()?;
 
 	let mut resolved = HashSet::new();
 	for part in pallet_parts.content.inner.iter() {
@@ -266,7 +240,7 @@ fn parse_pallet_parts(input: ParseStream) -> Result<Vec<PalletPart>> {
 				"`{}` was already declared before. Please remove the duplicate declaration",
 				part.name(),
 			);
-			return Err(Error::new(part.keyword.span(), msg));
+			return Err(Error::new(part.keyword.span(), msg))
 		}
 	}
 
@@ -371,13 +345,10 @@ impl Parse for PalletPart {
 				keyword.name(),
 				valid_generics,
 			);
-			return Err(syn::Error::new(keyword.span(), msg));
+			return Err(syn::Error::new(keyword.span(), msg))
 		}
 
-		Ok(Self {
-			keyword,
-			generics,
-		})
+		Ok(Self { keyword, generics })
 	}
 }
 
diff --git a/frame/support/procedural/src/debug_no_bound.rs b/frame/support/procedural/src/debug_no_bound.rs
index 7a5509cf986d..acfd8d0cabc8 100644
--- a/frame/support/procedural/src/debug_no_bound.rs
+++ b/frame/support/procedural/src/debug_no_bound.rs
@@ -30,9 +30,10 @@ pub fn derive_debug_no_bound(input: proc_macro::TokenStream) -> proc_macro::Toke
 	let impl_ = match input.data {
 		syn::Data::Struct(struct_) => match struct_.fields {
 			syn::Fields::Named(named) => {
-				let fields = named.named.iter()
-					.map(|i| &i.ident)
-					.map(|i| quote::quote_spanned!(i.span() => .field(stringify!(#i), &self.#i) ));
+				let fields =
+					named.named.iter().map(|i| &i.ident).map(
+						|i| quote::quote_spanned!(i.span() => .field(stringify!(#i), &self.#i) ),
+					);
 
 				quote::quote!(
 					fmt.debug_struct(stringify!(#input_ident))
@@ -41,7 +42,10 @@ pub fn derive_debug_no_bound(input: proc_macro::TokenStream) -> proc_macro::Toke
 				)
 			},
 			syn::Fields::Unnamed(unnamed) => {
-				let fields = unnamed.unnamed.iter().enumerate()
+				let fields = unnamed
+					.unnamed
+					.iter()
+					.enumerate()
 					.map(|(i, _)| syn::Index::from(i))
 					.map(|i| quote::quote_spanned!(i.span() => .field(&self.#i) ));
 
@@ -51,46 +55,50 @@ pub fn derive_debug_no_bound(input: proc_macro::TokenStream) -> proc_macro::Toke
 						.finish()
 				)
 			},
-			syn::Fields::Unit => quote::quote!( fmt.write_str(stringify!(#input_ident)) ),
+			syn::Fields::Unit => quote::quote!(fmt.write_str(stringify!(#input_ident))),
 		},
 		syn::Data::Enum(enum_) => {
-			let variants = enum_.variants.iter()
-				.map(|variant| {
-					let ident = &variant.ident;
-					let full_variant_str = format!("{}::{}", input_ident, ident);
-					match &variant.fields {
-						syn::Fields::Named(named) => {
-							let captured = named.named.iter().map(|i| &i.ident);
-							let debugged = captured.clone()
-								.map(|i| quote::quote_spanned!(i.span() =>
-									.field(stringify!(#i), &#i)
-								));
-							quote::quote!(
-								Self::#ident { #( ref #captured, )* } => {
-									fmt.debug_struct(#full_variant_str)
-										#( #debugged )*
-										.finish()
-								}
+			let variants = enum_.variants.iter().map(|variant| {
+				let ident = &variant.ident;
+				let full_variant_str = format!("{}::{}", input_ident, ident);
+				match &variant.fields {
+					syn::Fields::Named(named) => {
+						let captured = named.named.iter().map(|i| &i.ident);
+						let debugged = captured.clone().map(|i| {
+							quote::quote_spanned!(i.span() =>
+								.field(stringify!(#i), &#i)
 							)
-						},
-						syn::Fields::Unnamed(unnamed) => {
-							let captured = unnamed.unnamed.iter().enumerate()
-								.map(|(i, f)| syn::Ident::new(&format!("_{}", i), f.span()));
-							let debugged = captured.clone()
-								.map(|i| quote::quote_spanned!(i.span() => .field(&#i)));
-							quote::quote!(
-								Self::#ident ( #( ref #captured, )* ) => {
-									fmt.debug_tuple(#full_variant_str)
-										#( #debugged )*
-										.finish()
-								}
-							)
-						},
-						syn::Fields::Unit => quote::quote!(
-							Self::#ident => fmt.write_str(#full_variant_str)
-						),
-					}
-				});
+						});
+						quote::quote!(
+							Self::#ident { #( ref #captured, )* } => {
+								fmt.debug_struct(#full_variant_str)
+									#( #debugged )*
+									.finish()
+							}
+						)
+					},
+					syn::Fields::Unnamed(unnamed) => {
+						let captured = unnamed
+							.unnamed
+							.iter()
+							.enumerate()
+							.map(|(i, f)| syn::Ident::new(&format!("_{}", i), f.span()));
+						let debugged = captured
+							.clone()
+							.map(|i| quote::quote_spanned!(i.span() => .field(&#i)));
+						quote::quote!(
+							Self::#ident ( #( ref #captured, )* ) => {
+								fmt.debug_tuple(#full_variant_str)
+									#( #debugged )*
+									.finish()
+							}
+						)
+					},
+					syn::Fields::Unit => quote::quote!(
+						Self::#ident => fmt.write_str(#full_variant_str)
+					),
+				}
+			});
 
 			quote::quote!(match *self {
 				#( #variants, )*
@@ -110,5 +118,6 @@ pub fn derive_debug_no_bound(input: proc_macro::TokenStream) -> proc_macro::Toke
 				}
 			}
 		};
-	).into()
+	)
+	.into()
 }
diff --git a/frame/support/procedural/src/default_no_bound.rs b/frame/support/procedural/src/default_no_bound.rs
index ed35e057f037..38d6e19b1732 100644
--- a/frame/support/procedural/src/default_no_bound.rs
+++ b/frame/support/procedural/src/default_no_bound.rs
@@ -30,56 +30,60 @@ pub fn derive_default_no_bound(input: proc_macro::TokenStream) -> proc_macro::To
 	let impl_ = match input.data {
 		syn::Data::Struct(struct_) => match struct_.fields {
 			syn::Fields::Named(named) => {
-				let fields = named.named.iter()
-					.map(|i| &i.ident)
-					.map(|i| quote::quote_spanned!(i.span() =>
+				let fields = named.named.iter().map(|i| &i.ident).map(|i| {
+					quote::quote_spanned!(i.span() =>
 						#i: core::default::Default::default()
-					));
+					)
+				});
 
 				quote::quote!( Self { #( #fields, )* } )
 			},
 			syn::Fields::Unnamed(unnamed) => {
-				let fields = unnamed.unnamed.iter().enumerate()
-					.map(|(i, _)| syn::Index::from(i))
-					.map(|i| quote::quote_spanned!(i.span() =>
-						core::default::Default::default()
-					));
+				let fields =
+					unnamed.unnamed.iter().enumerate().map(|(i, _)| syn::Index::from(i)).map(|i| {
+						quote::quote_spanned!(i.span() =>
+							core::default::Default::default()
+						)
+					});
 
 				quote::quote!( Self ( #( #fields, )* ) )
 			},
 			syn::Fields::Unit => {
-				quote::quote!( Self )
-			}
+				quote::quote!(Self)
+			},
 		},
-		syn::Data::Enum(enum_) => {
+		syn::Data::Enum(enum_) =>
 			if let Some(first_variant) = enum_.variants.first() {
 				let variant_ident = &first_variant.ident;
 				match &first_variant.fields {
 					syn::Fields::Named(named) => {
-						let fields = named.named.iter()
-							.map(|i| &i.ident)
-							.map(|i| quote::quote_spanned!(i.span() =>
+						let fields = named.named.iter().map(|i| &i.ident).map(|i| {
+							quote::quote_spanned!(i.span() =>
 								#i: core::default::Default::default()
-							));
+							)
+						});
 
 						quote::quote!( #name :: #ty_generics :: #variant_ident { #( #fields, )* } )
 					},
 					syn::Fields::Unnamed(unnamed) => {
-						let fields = unnamed.unnamed.iter().enumerate()
+						let fields = unnamed
+							.unnamed
+							.iter()
+							.enumerate()
 							.map(|(i, _)| syn::Index::from(i))
-							.map(|i| quote::quote_spanned!(i.span() =>
-								core::default::Default::default()
-							));
+							.map(|i| {
+								quote::quote_spanned!(i.span() =>
+									core::default::Default::default()
+								)
+							});
 
 						quote::quote!( #name :: #ty_generics :: #variant_ident ( #( #fields, )* ) )
 					},
 					syn::Fields::Unit => quote::quote!( #name :: #ty_generics :: #variant_ident ),
 				}
 			} else {
-				quote::quote!( Self )
-			}
-
-		},
+				quote::quote!(Self)
+			},
 		syn::Data::Union(_) => {
 			let msg = "Union type not supported by `derive(CloneNoBound)`";
 			return syn::Error::new(input.span(), msg).to_compile_error().into()
@@ -94,5 +98,6 @@ pub fn derive_default_no_bound(input: proc_macro::TokenStream) -> proc_macro::To
 				}
 			}
 		};
-	).into()
+	)
+	.into()
 }
diff --git a/frame/support/procedural/src/dummy_part_checker.rs b/frame/support/procedural/src/dummy_part_checker.rs
index f1649aebe970..792b17a8f775 100644
--- a/frame/support/procedural/src/dummy_part_checker.rs
+++ b/frame/support/procedural/src/dummy_part_checker.rs
@@ -1,18 +1,17 @@
-use proc_macro::TokenStream;
 use crate::COUNTER;
+use proc_macro::TokenStream;
 
 pub fn generate_dummy_part_checker(input: TokenStream) -> TokenStream {
 	if !input.is_empty() {
 		return syn::Error::new(proc_macro2::Span::call_site(), "No arguments expected")
-			.to_compile_error().into()
+			.to_compile_error()
+			.into()
 	}
 
 	let count = COUNTER.with(|counter| counter.borrow_mut().inc());
 
-	let no_op_macro_ident = syn::Ident::new(
-		&format!("__dummy_part_checker_{}", count),
-		proc_macro2::Span::call_site(),
-	);
+	let no_op_macro_ident =
+		syn::Ident::new(&format!("__dummy_part_checker_{}", count), proc_macro2::Span::call_site());
 
 	quote::quote!(
 		#[macro_export]
@@ -58,5 +57,6 @@ pub fn generate_dummy_part_checker(input: TokenStream) -> TokenStream {
 			#[doc(hidden)]
 			pub use #no_op_macro_ident as is_origin_part_defined;
 		}
-	).into()
+	)
+	.into()
 }
diff --git a/frame/support/procedural/src/key_prefix.rs b/frame/support/procedural/src/key_prefix.rs
index 17c310c2bcad..c4683bc456da 100644
--- a/frame/support/procedural/src/key_prefix.rs
+++ b/frame/support/procedural/src/key_prefix.rs
@@ -16,14 +16,14 @@
 // limitations under the License.
 
 use proc_macro2::{Span, TokenStream};
-use quote::{ToTokens, format_ident, quote};
+use quote::{format_ident, quote, ToTokens};
 use syn::{Ident, Result};
 
 const MAX_IDENTS: usize = 18;
 
 pub fn impl_key_prefix_for_tuples(input: proc_macro::TokenStream) -> Result<TokenStream> {
 	if !input.is_empty() {
-		return Err(syn::Error::new(Span::call_site(), "No arguments expected"));
+		return Err(syn::Error::new(Span::call_site(), "No arguments expected"))
 	}
 
 	let mut all_trait_impls = TokenStream::new();
@@ -36,13 +36,17 @@ pub fn impl_key_prefix_for_tuples(input: proc_macro::TokenStream) -> Result<Toke
 		for prefix_count in 1..i {
 			let (prefixes, suffixes) = current_tuple.split_at(prefix_count);
 
-			let hashers = current_tuple.iter().map(|ident| format_ident!("Hasher{}", ident)).collect::<Vec<_>>();
-			let kargs = prefixes.iter().map(|ident| format_ident!("KArg{}", ident)).collect::<Vec<_>>();
+			let hashers = current_tuple
+				.iter()
+				.map(|ident| format_ident!("Hasher{}", ident))
+				.collect::<Vec<_>>();
+			let kargs =
+				prefixes.iter().map(|ident| format_ident!("KArg{}", ident)).collect::<Vec<_>>();
 			let partial_keygen = generate_keygen(prefixes);
 			let suffix_keygen = generate_keygen(suffixes);
 			let suffix_tuple = generate_tuple(suffixes);
 
-			let trait_impls = quote!{
+			let trait_impls = quote! {
 				impl<
 					#(#current_tuple: FullCodec,)*
 					#(#hashers: StorageHasher,)*
diff --git a/frame/support/procedural/src/lib.rs b/frame/support/procedural/src/lib.rs
index 9ac648f5e795..ab9ea1563479 100644
--- a/frame/support/procedural/src/lib.rs
+++ b/frame/support/procedural/src/lib.rs
@@ -19,21 +19,21 @@
 
 #![recursion_limit = "512"]
 
-mod storage;
+mod clone_no_bound;
 mod construct_runtime;
-mod pallet;
-mod pallet_version;
-mod transactional;
 mod debug_no_bound;
-mod clone_no_bound;
-mod partial_eq_no_bound;
 mod default_no_bound;
-mod key_prefix;
 mod dummy_part_checker;
+mod key_prefix;
+mod pallet;
+mod pallet_version;
+mod partial_eq_no_bound;
+mod storage;
+mod transactional;
 
-pub(crate) use storage::INHERENT_INSTANCE_NAME;
 use proc_macro::TokenStream;
 use std::cell::RefCell;
+pub(crate) use storage::INHERENT_INSTANCE_NAME;
 
 thread_local! {
 	/// A global counter, can be used to generate a relatively unique identifier.
@@ -200,14 +200,14 @@ impl Counter {
 ///
 /// 		// Your storage items
 /// 	}
-///		add_extra_genesis {
-///			config(genesis_field): GenesisFieldType;
-///			config(genesis_field2): GenesisFieldType;
-///			...
-///			build(|_: &Self| {
-///				// Modification of storage
-///			})
-///		}
+/// 		add_extra_genesis {
+/// 			config(genesis_field): GenesisFieldType;
+/// 			config(genesis_field2): GenesisFieldType;
+/// 			...
+/// 			build(|_: &Self| {
+/// 				// Modification of storage
+/// 			})
+/// 		}
 /// }
 /// ```
 ///
@@ -219,7 +219,7 @@ impl Counter {
 ///         ...,
 ///         Example: example::{Pallet, Storage, ..., Config<T>},
 ///         ...,
-///	}
+/// 	}
 /// );
 /// ```
 ///
@@ -413,7 +413,8 @@ pub fn derive_runtime_debug_no_bound(input: TokenStream) -> TokenStream {
 					}
 				}
 			};
-		).into()
+		)
+		.into()
 	}
 
 	#[cfg(feature = "std")]
@@ -444,7 +445,8 @@ pub fn derive_eq_no_bound(input: TokenStream) -> TokenStream {
 		const _: () = {
 			impl #impl_generics core::cmp::Eq for #name #ty_generics #where_clause {}
 		};
-	).into()
+	)
+	.into()
 }
 
 /// derive `Default` but do no bound any generic. Docs are at `frame_support::DefaultNoBound`.
@@ -455,12 +457,15 @@ pub fn derive_default_no_bound(input: TokenStream) -> TokenStream {
 
 #[proc_macro_attribute]
 pub fn require_transactional(attr: TokenStream, input: TokenStream) -> TokenStream {
-	transactional::require_transactional(attr, input).unwrap_or_else(|e| e.to_compile_error().into())
+	transactional::require_transactional(attr, input)
+		.unwrap_or_else(|e| e.to_compile_error().into())
 }
 
 #[proc_macro]
 pub fn crate_to_pallet_version(input: TokenStream) -> TokenStream {
-	pallet_version::crate_to_pallet_version(input).unwrap_or_else(|e| e.to_compile_error()).into()
+	pallet_version::crate_to_pallet_version(input)
+		.unwrap_or_else(|e| e.to_compile_error())
+		.into()
 }
 
 /// The number of module instances supported by the runtime, starting at index 1,
@@ -471,7 +476,9 @@ pub(crate) const NUMBER_OF_INSTANCE: u8 = 16;
 /// It implements the trait `HasKeyPrefix` and `HasReversibleKeyPrefix` for tuple of `Key`.
 #[proc_macro]
 pub fn impl_key_prefix_for_tuples(input: TokenStream) -> TokenStream {
-	key_prefix::impl_key_prefix_for_tuples(input).unwrap_or_else(syn::Error::into_compile_error).into()
+	key_prefix::impl_key_prefix_for_tuples(input)
+		.unwrap_or_else(syn::Error::into_compile_error)
+		.into()
 }
 
 /// Internal macro use by frame_support to generate dummy part checker for old pallet declaration
diff --git a/frame/support/procedural/src/pallet/expand/call.rs b/frame/support/procedural/src/pallet/expand/call.rs
index 28280a5e8922..4dcee9e24fe3 100644
--- a/frame/support/procedural/src/pallet/expand/call.rs
+++ b/frame/support/procedural/src/pallet/expand/call.rs
@@ -15,9 +15,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::pallet::Def;
+use crate::{pallet::Def, COUNTER};
 use frame_support_procedural_tools::clean_type_string;
-use crate::COUNTER;
 use syn::spanned::Spanned;
 
 /// * Generate enum call and implement various trait on it.
@@ -31,7 +30,7 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
 			let docs = call.docs.clone();
 
 			(span, where_clause, methods, docs)
-		}
+		},
 		None => (def.item.span(), None, Vec::new(), Vec::new()),
 	};
 	let frame_support = &def.frame_support;
@@ -48,16 +47,20 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
 
 	let fn_doc = methods.iter().map(|method| &method.docs).collect::<Vec<_>>();
 
-	let args_name = methods.iter()
+	let args_name = methods
+		.iter()
 		.map(|method| method.args.iter().map(|(_, name, _)| name.clone()).collect::<Vec<_>>())
 		.collect::<Vec<_>>();
 
-	let args_type = methods.iter()
+	let args_type = methods
+		.iter()
 		.map(|method| method.args.iter().map(|(_, _, type_)| type_.clone()).collect::<Vec<_>>())
 		.collect::<Vec<_>>();
 
 	let args_compact_attr = methods.iter().map(|method| {
-		method.args.iter()
+		method
+			.args
+			.iter()
 			.map(|(is_compact, _, type_)| {
 				if *is_compact {
 					quote::quote_spanned!(type_.span() => #[codec(compact)] )
@@ -69,7 +72,9 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
 	});
 
 	let args_metadata_type = methods.iter().map(|method| {
-		method.args.iter()
+		method
+			.args
+			.iter()
 			.map(|(is_compact, _, type_)| {
 				let final_type = if *is_compact {
 					quote::quote_spanned!(type_.span() => Compact<#type_>)
@@ -84,14 +89,10 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
 	let default_docs = [syn::parse_quote!(
 		r"Contains one variant per dispatchable that can be called by an extrinsic."
 	)];
-	let docs = if docs.is_empty() {
-		&default_docs[..]
-	} else {
-		&docs[..]
-	};
+	let docs = if docs.is_empty() { &default_docs[..] } else { &docs[..] };
 
 	let maybe_compile_error = if def.call.is_none() {
-		quote::quote!{
+		quote::quote! {
 			compile_error!(concat!(
 				"`",
 				stringify!($pallet_name),
diff --git a/frame/support/procedural/src/pallet/expand/config.rs b/frame/support/procedural/src/pallet/expand/config.rs
index 1e60313c5531..306578cc3adc 100644
--- a/frame/support/procedural/src/pallet/expand/config.rs
+++ b/frame/support/procedural/src/pallet/expand/config.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::pallet::{Def, parse::helper::get_doc_literals};
+use crate::pallet::{parse::helper::get_doc_literals, Def};
 
 /// * Generate default rust doc
 pub fn expand_config(def: &mut Def) -> proc_macro2::TokenStream {
diff --git a/frame/support/procedural/src/pallet/expand/constants.rs b/frame/support/procedural/src/pallet/expand/constants.rs
index e5acf42270aa..58df22e361c4 100644
--- a/frame/support/procedural/src/pallet/expand/constants.rs
+++ b/frame/support/procedural/src/pallet/expand/constants.rs
@@ -71,58 +71,55 @@ pub fn expand_constants(def: &mut Def) -> proc_macro2::TokenStream {
 		}
 	});
 
-	let consts = config_consts.chain(extra_consts)
-		.map(|const_| {
-			let const_type = &const_.type_;
-			let const_type_str = clean_type_string(&const_type.to_token_stream().to_string());
-			let ident = &const_.ident;
-			let ident_str = format!("{}", ident);
-			let doc = const_.doc.clone().into_iter();
-			let default_byte_impl = &const_.default_byte_impl;
-			let default_byte_getter = syn::Ident::new(
-				&format!("{}DefaultByteGetter", ident),
-				ident.span()
+	let consts = config_consts.chain(extra_consts).map(|const_| {
+		let const_type = &const_.type_;
+		let const_type_str = clean_type_string(&const_type.to_token_stream().to_string());
+		let ident = &const_.ident;
+		let ident_str = format!("{}", ident);
+		let doc = const_.doc.clone().into_iter();
+		let default_byte_impl = &const_.default_byte_impl;
+		let default_byte_getter =
+			syn::Ident::new(&format!("{}DefaultByteGetter", ident), ident.span());
+
+		quote::quote!({
+			#[allow(non_upper_case_types)]
+			#[allow(non_camel_case_types)]
+			struct #default_byte_getter<#type_decl_gen>(
+				#frame_support::sp_std::marker::PhantomData<(#type_use_gen)>
 			);
 
-			quote::quote!({
-				#[allow(non_upper_case_types)]
-				#[allow(non_camel_case_types)]
-				struct #default_byte_getter<#type_decl_gen>(
-					#frame_support::sp_std::marker::PhantomData<(#type_use_gen)>
-				);
-
-				impl<#type_impl_gen> #frame_support::dispatch::DefaultByte for
-					#default_byte_getter<#type_use_gen>
-					#completed_where_clause
-				{
-					fn default_byte(&self) -> #frame_support::sp_std::vec::Vec<u8> {
-						#default_byte_impl
-					}
+			impl<#type_impl_gen> #frame_support::dispatch::DefaultByte for
+				#default_byte_getter<#type_use_gen>
+				#completed_where_clause
+			{
+				fn default_byte(&self) -> #frame_support::sp_std::vec::Vec<u8> {
+					#default_byte_impl
 				}
+			}
 
-				unsafe impl<#type_impl_gen> Send for #default_byte_getter<#type_use_gen>
-					#completed_where_clause
-				{}
-				unsafe impl<#type_impl_gen> Sync for #default_byte_getter<#type_use_gen>
-					#completed_where_clause
-				{}
-
-				#frame_support::dispatch::ModuleConstantMetadata {
-					name: #frame_support::dispatch::DecodeDifferent::Encode(#ident_str),
-					ty: #frame_support::dispatch::DecodeDifferent::Encode(#const_type_str),
-					value: #frame_support::dispatch::DecodeDifferent::Encode(
-						#frame_support::dispatch::DefaultByteGetter(
-							&#default_byte_getter::<#type_use_gen>(
-								#frame_support::sp_std::marker::PhantomData
-							)
+			unsafe impl<#type_impl_gen> Send for #default_byte_getter<#type_use_gen>
+				#completed_where_clause
+			{}
+			unsafe impl<#type_impl_gen> Sync for #default_byte_getter<#type_use_gen>
+				#completed_where_clause
+			{}
+
+			#frame_support::dispatch::ModuleConstantMetadata {
+				name: #frame_support::dispatch::DecodeDifferent::Encode(#ident_str),
+				ty: #frame_support::dispatch::DecodeDifferent::Encode(#const_type_str),
+				value: #frame_support::dispatch::DecodeDifferent::Encode(
+					#frame_support::dispatch::DefaultByteGetter(
+						&#default_byte_getter::<#type_use_gen>(
+							#frame_support::sp_std::marker::PhantomData
 						)
-					),
-					documentation: #frame_support::dispatch::DecodeDifferent::Encode(
-						&[ #( #doc ),* ]
-					),
-				}
-			})
-		});
+					)
+				),
+				documentation: #frame_support::dispatch::DecodeDifferent::Encode(
+					&[ #( #doc ),* ]
+				),
+			}
+		})
+	});
 
 	quote::quote!(
 		impl<#type_impl_gen> #pallet_ident<#type_use_gen> #completed_where_clause{
diff --git a/frame/support/procedural/src/pallet/expand/error.rs b/frame/support/procedural/src/pallet/expand/error.rs
index 000f476d94d8..ce3d3428fc6e 100644
--- a/frame/support/procedural/src/pallet/expand/error.rs
+++ b/frame/support/procedural/src/pallet/expand/error.rs
@@ -15,16 +15,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::pallet::{Def, parse::helper::get_doc_literals};
+use crate::pallet::{parse::helper::get_doc_literals, Def};
 
 /// * impl various trait on Error
 /// * impl ModuleErrorMetadata for Error
 pub fn expand_error(def: &mut Def) -> proc_macro2::TokenStream {
-	let error = if let Some(error) = &def.error {
-		error
-	} else {
-		return Default::default()
-	};
+	let error = if let Some(error) = &def.error { error } else { return Default::default() };
 
 	let error_ident = &error.error;
 	let frame_support = &def.frame_support;
@@ -41,27 +37,24 @@ pub fn expand_error(def: &mut Def) -> proc_macro2::TokenStream {
 		)
 	);
 
-	let as_u8_matches = error.variants.iter().enumerate()
-		.map(|(i, (variant, _))| {
-			quote::quote_spanned!(error.attr_span => Self::#variant => #i as u8,)
-		});
-
-	let as_str_matches = error.variants.iter()
-		.map(|(variant, _)| {
-			let variant_str = format!("{}", variant);
-			quote::quote_spanned!(error.attr_span => Self::#variant => #variant_str,)
-		});
-
-	let metadata = error.variants.iter()
-		.map(|(variant, doc)| {
-			let variant_str = format!("{}", variant);
-			quote::quote_spanned!(error.attr_span =>
-				#frame_support::error::ErrorMetadata {
-					name: #frame_support::error::DecodeDifferent::Encode(#variant_str),
-					documentation: #frame_support::error::DecodeDifferent::Encode(&[ #( #doc, )* ]),
-				},
-			)
-		});
+	let as_u8_matches = error.variants.iter().enumerate().map(
+		|(i, (variant, _))| quote::quote_spanned!(error.attr_span => Self::#variant => #i as u8,),
+	);
+
+	let as_str_matches = error.variants.iter().map(|(variant, _)| {
+		let variant_str = format!("{}", variant);
+		quote::quote_spanned!(error.attr_span => Self::#variant => #variant_str,)
+	});
+
+	let metadata = error.variants.iter().map(|(variant, doc)| {
+		let variant_str = format!("{}", variant);
+		quote::quote_spanned!(error.attr_span =>
+			#frame_support::error::ErrorMetadata {
+				name: #frame_support::error::DecodeDifferent::Encode(#variant_str),
+				documentation: #frame_support::error::DecodeDifferent::Encode(&[ #( #doc, )* ]),
+			},
+		)
+	});
 
 	let error_item = {
 		let item = &mut def.item.content.as_mut().expect("Checked by def parser").1[error.index];
diff --git a/frame/support/procedural/src/pallet/expand/event.rs b/frame/support/procedural/src/pallet/expand/event.rs
index d932206be09f..08e59ae7e877 100644
--- a/frame/support/procedural/src/pallet/expand/event.rs
+++ b/frame/support/procedural/src/pallet/expand/event.rs
@@ -15,8 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::pallet::{Def, parse::helper::get_doc_literals};
-use crate::COUNTER;
+use crate::{
+	pallet::{parse::helper::get_doc_literals, Def},
+	COUNTER,
+};
 use syn::{spanned::Spanned, Ident};
 
 /// * Add __Ignore variant on Event
@@ -29,10 +31,8 @@ pub fn expand_event(def: &mut Def) -> proc_macro2::TokenStream {
 		let ident = Ident::new(&format!("__is_event_part_defined_{}", count), event.attr_span);
 		(event, ident)
 	} else {
-		let macro_ident = Ident::new(
-			&format!("__is_event_part_defined_{}", count),
-			def.item.span(),
-		);
+		let macro_ident =
+			Ident::new(&format!("__is_event_part_defined_{}", count), def.item.span());
 
 		return quote::quote! {
 			#[doc(hidden)]
@@ -49,42 +49,39 @@ pub fn expand_event(def: &mut Def) -> proc_macro2::TokenStream {
 						));
 					}
 				}
-	
+
 				#[doc(hidden)]
 				pub use #macro_ident as is_event_part_defined;
 			}
-		};
+		}
 	};
 
 	let event_where_clause = &event.where_clause;
 
 	// NOTE: actually event where clause must be a subset of config where clause because of
 	// `type Event: From<Event<Self>>`. But we merge either way for potential better error message
-	let completed_where_clause = super::merge_where_clauses(&[
-		&event.where_clause,
-		&def.config.where_clause,
-	]);
+	let completed_where_clause =
+		super::merge_where_clauses(&[&event.where_clause, &def.config.where_clause]);
 
 	let event_ident = &event.event;
 	let frame_system = &def.frame_system;
 	let frame_support = &def.frame_support;
 	let event_use_gen = &event.gen_kind.type_use_gen(event.attr_span);
-	let event_impl_gen= &event.gen_kind.type_impl_gen(event.attr_span);
-	let metadata = event.metadata.iter()
-		.map(|(ident, args, docs)| {
-			let name = format!("{}", ident);
-			quote::quote_spanned!(event.attr_span =>
-				#frame_support::event::EventMetadata {
-					name: #frame_support::event::DecodeDifferent::Encode(#name),
-					arguments: #frame_support::event::DecodeDifferent::Encode(&[
-						#( #args, )*
-					]),
-					documentation: #frame_support::event::DecodeDifferent::Encode(&[
-						#( #docs, )*
-					]),
-				},
-			)
-		});
+	let event_impl_gen = &event.gen_kind.type_impl_gen(event.attr_span);
+	let metadata = event.metadata.iter().map(|(ident, args, docs)| {
+		let name = format!("{}", ident);
+		quote::quote_spanned!(event.attr_span =>
+			#frame_support::event::EventMetadata {
+				name: #frame_support::event::DecodeDifferent::Encode(#name),
+				arguments: #frame_support::event::DecodeDifferent::Encode(&[
+					#( #args, )*
+				]),
+				documentation: #frame_support::event::DecodeDifferent::Encode(&[
+					#( #docs, )*
+				]),
+			},
+		)
+	});
 
 	let event_item = {
 		let item = &mut def.item.content.as_mut().expect("Checked by def parser").1[event.index];
@@ -166,7 +163,7 @@ pub fn expand_event(def: &mut Def) -> proc_macro2::TokenStream {
 			macro_rules! #macro_ident {
 				($pallet_name:ident) => {};
 			}
-	
+
 			#[doc(hidden)]
 			pub use #macro_ident as is_event_part_defined;
 		}
diff --git a/frame/support/procedural/src/pallet/expand/genesis_build.rs b/frame/support/procedural/src/pallet/expand/genesis_build.rs
index 374d21001d6a..c68f2339cfce 100644
--- a/frame/support/procedural/src/pallet/expand/genesis_build.rs
+++ b/frame/support/procedural/src/pallet/expand/genesis_build.rs
@@ -40,8 +40,8 @@ pub fn expand_genesis_build(def: &mut Def) -> proc_macro2::TokenStream {
 
 	let gen_cfg_use_gen = genesis_config.gen_kind.type_use_gen(genesis_build.attr_span);
 
-	let genesis_build_item = &mut def.item.content.as_mut()
-		.expect("Checked by def parser").1[genesis_build.index];
+	let genesis_build_item =
+		&mut def.item.content.as_mut().expect("Checked by def parser").1[genesis_build.index];
 
 	let genesis_build_item_impl = if let syn::Item::Impl(impl_) = genesis_build_item {
 		impl_
diff --git a/frame/support/procedural/src/pallet/expand/genesis_config.rs b/frame/support/procedural/src/pallet/expand/genesis_config.rs
index 013b9016c2f4..b26be2b34aa7 100644
--- a/frame/support/procedural/src/pallet/expand/genesis_config.rs
+++ b/frame/support/procedural/src/pallet/expand/genesis_config.rs
@@ -15,9 +15,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::pallet::{Def, parse::helper::get_doc_literals};
-use crate::COUNTER;
-use syn::{Ident, spanned::Spanned};
+use crate::{
+	pallet::{parse::helper::get_doc_literals, Def},
+	COUNTER,
+};
+use syn::{spanned::Spanned, Ident};
 
 /// * add various derive trait on GenesisConfig struct.
 pub fn expand_genesis_config(def: &mut Def) -> proc_macro2::TokenStream {
@@ -37,15 +39,11 @@ pub fn expand_genesis_config(def: &mut Def) -> proc_macro2::TokenStream {
 
 			(genesis_config, def_macro_ident, std_macro_ident)
 		} else {
-			let def_macro_ident = Ident::new(
-				&format!("__is_genesis_config_defined_{}", count),
-				def.item.span(),
-			);
+			let def_macro_ident =
+				Ident::new(&format!("__is_genesis_config_defined_{}", count), def.item.span());
 
-			let std_macro_ident = Ident::new(
-				&format!("__is_std_enabled_for_genesis_{}", count),
-				def.item.span(),
-			);
+			let std_macro_ident =
+				Ident::new(&format!("__is_std_enabled_for_genesis_{}", count), def.item.span());
 
 			return quote::quote! {
 				#[doc(hidden)]
@@ -74,18 +72,18 @@ pub fn expand_genesis_config(def: &mut Def) -> proc_macro2::TokenStream {
 					#[doc(hidden)]
 					pub use #std_macro_ident as is_std_enabled_for_genesis;
 				}
-			};
+			}
 		};
 
 	let frame_support = &def.frame_support;
 
-	let genesis_config_item = &mut def.item.content.as_mut()
-		.expect("Checked by def parser").1[genesis_config.index];
+	let genesis_config_item =
+		&mut def.item.content.as_mut().expect("Checked by def parser").1[genesis_config.index];
 
 	let serde_crate = format!("{}::serde", frame_support);
 
 	match genesis_config_item {
-		syn::Item::Enum(syn::ItemEnum { attrs, ..}) |
+		syn::Item::Enum(syn::ItemEnum { attrs, .. }) |
 		syn::Item::Struct(syn::ItemStruct { attrs, .. }) |
 		syn::Item::Type(syn::ItemType { attrs, .. }) => {
 			if get_doc_literals(&attrs).is_empty() {
diff --git a/frame/support/procedural/src/pallet/expand/hooks.rs b/frame/support/procedural/src/pallet/expand/hooks.rs
index 6e21c892d8eb..c279a83d3daa 100644
--- a/frame/support/procedural/src/pallet/expand/hooks.rs
+++ b/frame/support/procedural/src/pallet/expand/hooks.rs
@@ -59,7 +59,7 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 
 	let hooks_impl = if def.hooks.is_none() {
 		let frame_system = &def.frame_system;
-		quote::quote!{
+		quote::quote! {
 			impl<#type_impl_gen>
 				#frame_support::traits::Hooks<<T as #frame_system::Config>::BlockNumber>
 				for Pallet<#type_use_gen> {}
diff --git a/frame/support/procedural/src/pallet/expand/inherent.rs b/frame/support/procedural/src/pallet/expand/inherent.rs
index f1d58b28a514..185211ecd4df 100644
--- a/frame/support/procedural/src/pallet/expand/inherent.rs
+++ b/frame/support/procedural/src/pallet/expand/inherent.rs
@@ -15,11 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::pallet::Def;
+use crate::{pallet::Def, COUNTER};
 use proc_macro2::TokenStream;
 use quote::quote;
-use crate::COUNTER;
-use syn::{Ident, spanned::Spanned};
+use syn::{spanned::Spanned, Ident};
 
 pub fn expand_inherents(def: &mut Def) -> TokenStream {
 	let count = COUNTER.with(|counter| counter.borrow_mut().inc());
@@ -48,7 +47,7 @@ pub fn expand_inherents(def: &mut Def) -> TokenStream {
 					#maybe_compile_error
 				}
 			}
-	
+
 			#[doc(hidden)]
 			pub use #macro_ident as is_inherent_part_defined;
 		}
diff --git a/frame/support/procedural/src/pallet/expand/instances.rs b/frame/support/procedural/src/pallet/expand/instances.rs
index 9f48563ab7e6..ceb86fcad7ea 100644
--- a/frame/support/procedural/src/pallet/expand/instances.rs
+++ b/frame/support/procedural/src/pallet/expand/instances.rs
@@ -15,9 +15,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use crate::{pallet::Def, NUMBER_OF_INSTANCE};
 use proc_macro2::Span;
-use crate::pallet::Def;
-use crate::NUMBER_OF_INSTANCE;
 
 /// * Provide inherent instance to be used by construct_runtime
 /// * Provide Instance1 ..= Instance16 for instantiable pallet
@@ -25,7 +24,9 @@ pub fn expand_instances(def: &mut Def) -> proc_macro2::TokenStream {
 	let frame_support = &def.frame_support;
 	let inherent_ident = syn::Ident::new(crate::INHERENT_INSTANCE_NAME, Span::call_site());
 	let instances = if def.config.has_instance {
-		(1..=NUMBER_OF_INSTANCE).map(|i| syn::Ident::new(&format!("Instance{}", i), Span::call_site())).collect()
+		(1..=NUMBER_OF_INSTANCE)
+			.map(|i| syn::Ident::new(&format!("Instance{}", i), Span::call_site()))
+			.collect()
 	} else {
 		vec![]
 	};
diff --git a/frame/support/procedural/src/pallet/expand/mod.rs b/frame/support/procedural/src/pallet/expand/mod.rs
index f3a42dfa868b..cfb61e700ac2 100644
--- a/frame/support/procedural/src/pallet/expand/mod.rs
+++ b/frame/support/procedural/src/pallet/expand/mod.rs
@@ -15,24 +15,24 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-mod constants;
-mod pallet_struct;
 mod call;
 mod config;
+mod constants;
 mod error;
 mod event;
-mod storage;
+mod genesis_build;
+mod genesis_config;
 mod hooks;
-mod store_trait;
 mod inherent;
 mod instances;
-mod genesis_build;
-mod genesis_config;
-mod type_value;
 mod origin;
+mod pallet_struct;
+mod storage;
+mod store_trait;
+mod type_value;
 mod validate_unsigned;
 
-use crate::pallet::{Def, parse::helper::get_doc_literals};
+use crate::pallet::{parse::helper::get_doc_literals, Def};
 use quote::ToTokens;
 
 /// Merge where clause together, `where` token span is taken from the first not none one.
@@ -97,7 +97,11 @@ pub fn expand(mut def: Def) -> proc_macro2::TokenStream {
 		#validate_unsigned
 	);
 
-	def.item.content.as_mut().expect("This is checked by parsing").1
+	def.item
+		.content
+		.as_mut()
+		.expect("This is checked by parsing")
+		.1
 		.push(syn::Item::Verbatim(new_items));
 
 	def.item.into_token_stream()
diff --git a/frame/support/procedural/src/pallet/expand/origin.rs b/frame/support/procedural/src/pallet/expand/origin.rs
index 578c641b43e4..987512f69a02 100644
--- a/frame/support/procedural/src/pallet/expand/origin.rs
+++ b/frame/support/procedural/src/pallet/expand/origin.rs
@@ -18,7 +18,7 @@
 use crate::{pallet::Def, COUNTER};
 use proc_macro2::TokenStream;
 use quote::quote;
-use syn::{Ident, spanned::Spanned};
+use syn::{spanned::Spanned, Ident};
 
 pub fn expand_origins(def: &mut Def) -> TokenStream {
 	let count = COUNTER.with(|counter| counter.borrow_mut().inc());
@@ -47,7 +47,7 @@ pub fn expand_origins(def: &mut Def) -> TokenStream {
 					#maybe_compile_error
 				}
 			}
-	
+
 			#[doc(hidden)]
 			pub use #macro_ident as is_origin_part_defined;
 		}
diff --git a/frame/support/procedural/src/pallet/expand/pallet_struct.rs b/frame/support/procedural/src/pallet/expand/pallet_struct.rs
index 3be9d60492e9..8be933fc3cf9 100644
--- a/frame/support/procedural/src/pallet/expand/pallet_struct.rs
+++ b/frame/support/procedural/src/pallet/expand/pallet_struct.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::pallet::{Def, expand::merge_where_clauses, parse::helper::get_doc_literals};
+use crate::pallet::{expand::merge_where_clauses, parse::helper::get_doc_literals, Def};
 
 /// * Add derive trait on Pallet
 /// * Implement GetPalletVersion on Pallet
@@ -104,29 +104,25 @@ pub fn expand_pallet_struct(def: &mut Def) -> proc_macro2::TokenStream {
 
 	// Depending on the flag `generate_storage_info` we use partial or full storage info from
 	// storage.
-	let (
-		storage_info_span,
-		storage_info_trait,
-		storage_info_method,
-	) = if let Some(span) = def.pallet_struct.generate_storage_info {
-		(
-			span,
-			quote::quote_spanned!(span => StorageInfoTrait),
-			quote::quote_spanned!(span => storage_info),
-		)
-	} else {
-		let span = def.pallet_struct.attr_span;
-		(
-			span,
-			quote::quote_spanned!(span => PartialStorageInfoTrait),
-			quote::quote_spanned!(span => partial_storage_info),
-		)
-	};
+	let (storage_info_span, storage_info_trait, storage_info_method) =
+		if let Some(span) = def.pallet_struct.generate_storage_info {
+			(
+				span,
+				quote::quote_spanned!(span => StorageInfoTrait),
+				quote::quote_spanned!(span => storage_info),
+			)
+		} else {
+			let span = def.pallet_struct.attr_span;
+			(
+				span,
+				quote::quote_spanned!(span => PartialStorageInfoTrait),
+				quote::quote_spanned!(span => partial_storage_info),
+			)
+		};
 
 	let storage_names = &def.storages.iter().map(|storage| &storage.ident).collect::<Vec<_>>();
-	let storage_cfg_attrs = &def.storages.iter()
-		.map(|storage| &storage.cfg_attrs)
-		.collect::<Vec<_>>();
+	let storage_cfg_attrs =
+		&def.storages.iter().map(|storage| &storage.cfg_attrs).collect::<Vec<_>>();
 
 	let storage_info = quote::quote_spanned!(storage_info_span =>
 		impl<#type_impl_gen> #frame_support::traits::StorageInfoTrait
diff --git a/frame/support/procedural/src/pallet/expand/storage.rs b/frame/support/procedural/src/pallet/expand/storage.rs
index 0000051dd9b9..21d6628c8b84 100644
--- a/frame/support/procedural/src/pallet/expand/storage.rs
+++ b/frame/support/procedural/src/pallet/expand/storage.rs
@@ -15,8 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::pallet::{Def, parse::storage::StorageDef};
-use crate::pallet::parse::storage::{Metadata, QueryKind, StorageGenerics};
+use crate::pallet::{
+	parse::storage::{Metadata, QueryKind, StorageDef, StorageGenerics},
+	Def,
+};
 use frame_support_procedural_tools::clean_type_string;
 use std::collections::HashSet;
 
@@ -30,10 +32,7 @@ fn prefix_ident(storage: &StorageDef) -> syn::Ident {
 /// Check for duplicated storage prefixes. This step is necessary since users can specify an
 /// alternative storage prefix using the #[pallet::storage_prefix] syntax, and we need to ensure
 /// that the prefix specified by the user is not a duplicate of an existing one.
-fn check_prefix_duplicates(
-	storage_def: &StorageDef,
-	set: &mut HashSet<String>,
-) -> syn::Result<()> {
+fn check_prefix_duplicates(storage_def: &StorageDef, set: &mut HashSet<String>) -> syn::Result<()> {
 	let prefix = storage_def.prefix();
 
 	if !set.insert(prefix.clone()) {
@@ -41,7 +40,7 @@ fn check_prefix_duplicates(
 			storage_def.prefix_span(),
 			format!("Duplicate storage prefixes found for `{}`", prefix),
 		);
-		return Err(err);
+		return Err(err)
 	}
 
 	Ok(())
@@ -85,10 +84,8 @@ pub fn process_generics(def: &mut Def) -> syn::Result<()> {
 
 		let default_query_kind: syn::Type =
 			syn::parse_quote!(#frame_support::storage::types::OptionQuery);
-		let default_on_empty: syn::Type =
-			syn::parse_quote!(#frame_support::traits::GetDefault);
-		let default_max_values: syn::Type =
-			syn::parse_quote!(#frame_support::traits::GetDefault);
+		let default_on_empty: syn::Type = syn::parse_quote!(#frame_support::traits::GetDefault);
+		let default_max_values: syn::Type = syn::parse_quote!(#frame_support::traits::GetDefault);
 
 		if let Some(named_generics) = storage_def.named_generics.clone() {
 			args.args.clear();
@@ -100,7 +97,7 @@ pub fn process_generics(def: &mut Def) -> syn::Result<()> {
 					args.args.push(syn::GenericArgument::Type(query_kind));
 					let on_empty = on_empty.unwrap_or_else(|| default_on_empty.clone());
 					args.args.push(syn::GenericArgument::Type(on_empty));
-				}
+				},
 				StorageGenerics::Map { hasher, key, value, query_kind, on_empty, max_values } => {
 					args.args.push(syn::GenericArgument::Type(hasher));
 					args.args.push(syn::GenericArgument::Type(key));
@@ -111,9 +108,16 @@ pub fn process_generics(def: &mut Def) -> syn::Result<()> {
 					args.args.push(syn::GenericArgument::Type(on_empty));
 					let max_values = max_values.unwrap_or_else(|| default_max_values.clone());
 					args.args.push(syn::GenericArgument::Type(max_values));
-				}
+				},
 				StorageGenerics::DoubleMap {
-					hasher1, key1, hasher2, key2, value, query_kind, on_empty, max_values,
+					hasher1,
+					key1,
+					hasher2,
+					key2,
+					value,
+					query_kind,
+					on_empty,
+					max_values,
 				} => {
 					args.args.push(syn::GenericArgument::Type(hasher1));
 					args.args.push(syn::GenericArgument::Type(key1));
@@ -126,8 +130,8 @@ pub fn process_generics(def: &mut Def) -> syn::Result<()> {
 					args.args.push(syn::GenericArgument::Type(on_empty));
 					let max_values = max_values.unwrap_or_else(|| default_max_values.clone());
 					args.args.push(syn::GenericArgument::Type(max_values));
-				}
-				StorageGenerics::NMap { keygen, value, query_kind, on_empty, max_values, } => {
+				},
+				StorageGenerics::NMap { keygen, value, query_kind, on_empty, max_values } => {
 					args.args.push(syn::GenericArgument::Type(keygen));
 					args.args.push(syn::GenericArgument::Type(value));
 					let query_kind = query_kind.unwrap_or_else(|| default_query_kind.clone());
@@ -136,7 +140,7 @@ pub fn process_generics(def: &mut Def) -> syn::Result<()> {
 					args.args.push(syn::GenericArgument::Type(on_empty));
 					let max_values = max_values.unwrap_or_else(|| default_max_values.clone());
 					args.args.push(syn::GenericArgument::Type(max_values));
-				}
+				},
 			}
 		} else {
 			args.args[0] = syn::parse_quote!( #prefix_ident<#type_use_gen> );
@@ -154,118 +158,116 @@ pub fn process_generics(def: &mut Def) -> syn::Result<()> {
 /// * generate metadatas
 pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 	if let Err(e) = process_generics(def) {
-		return e.into_compile_error().into();
+		return e.into_compile_error().into()
 	}
 
 	let frame_support = &def.frame_support;
 	let frame_system = &def.frame_system;
 	let pallet_ident = &def.pallet_struct.pallet;
 
+	let entries = def.storages.iter().map(|storage| {
+		let docs = &storage.docs;
+
+		let ident = &storage.ident;
+		let gen = &def.type_use_generics(storage.attr_span);
+		let full_ident = quote::quote_spanned!(storage.attr_span => #ident<#gen> );
+
+		let cfg_attrs = &storage.cfg_attrs;
+
+		let metadata_trait = match &storage.metadata {
+			Metadata::Value { .. } => quote::quote_spanned!(storage.attr_span =>
+				#frame_support::storage::types::StorageValueMetadata
+			),
+			Metadata::Map { .. } => quote::quote_spanned!(storage.attr_span =>
+				#frame_support::storage::types::StorageMapMetadata
+			),
+			Metadata::DoubleMap { .. } => quote::quote_spanned!(storage.attr_span =>
+				#frame_support::storage::types::StorageDoubleMapMetadata
+			),
+			Metadata::NMap { .. } => quote::quote_spanned!(storage.attr_span =>
+				#frame_support::storage::types::StorageNMapMetadata
+			),
+		};
 
-	let entries = def.storages.iter()
-		.map(|storage| {
-			let docs = &storage.docs;
-
-			let ident = &storage.ident;
-			let gen = &def.type_use_generics(storage.attr_span);
-			let full_ident = quote::quote_spanned!(storage.attr_span => #ident<#gen> );
-
-			let cfg_attrs = &storage.cfg_attrs;
+		let ty = match &storage.metadata {
+			Metadata::Value { value } => {
+				let value = clean_type_string(&quote::quote!(#value).to_string());
+				quote::quote_spanned!(storage.attr_span =>
+					#frame_support::metadata::StorageEntryType::Plain(
+						#frame_support::metadata::DecodeDifferent::Encode(#value)
+					)
+				)
+			},
+			Metadata::Map { key, value } => {
+				let value = clean_type_string(&quote::quote!(#value).to_string());
+				let key = clean_type_string(&quote::quote!(#key).to_string());
+				quote::quote_spanned!(storage.attr_span =>
+					#frame_support::metadata::StorageEntryType::Map {
+						hasher: <#full_ident as #metadata_trait>::HASHER,
+						key: #frame_support::metadata::DecodeDifferent::Encode(#key),
+						value: #frame_support::metadata::DecodeDifferent::Encode(#value),
+						unused: false,
+					}
+				)
+			},
+			Metadata::DoubleMap { key1, key2, value } => {
+				let value = clean_type_string(&quote::quote!(#value).to_string());
+				let key1 = clean_type_string(&quote::quote!(#key1).to_string());
+				let key2 = clean_type_string(&quote::quote!(#key2).to_string());
+				quote::quote_spanned!(storage.attr_span =>
+					#frame_support::metadata::StorageEntryType::DoubleMap {
+						hasher: <#full_ident as #metadata_trait>::HASHER1,
+						key2_hasher: <#full_ident as #metadata_trait>::HASHER2,
+						key1: #frame_support::metadata::DecodeDifferent::Encode(#key1),
+						key2: #frame_support::metadata::DecodeDifferent::Encode(#key2),
+						value: #frame_support::metadata::DecodeDifferent::Encode(#value),
+					}
+				)
+			},
+			Metadata::NMap { keys, value, .. } => {
+				let keys = keys
+					.iter()
+					.map(|key| clean_type_string(&quote::quote!(#key).to_string()))
+					.collect::<Vec<_>>();
+				let value = clean_type_string(&quote::quote!(#value).to_string());
+				quote::quote_spanned!(storage.attr_span =>
+					#frame_support::metadata::StorageEntryType::NMap {
+						keys: #frame_support::metadata::DecodeDifferent::Encode(&[
+							#( #keys, )*
+						]),
+						hashers: #frame_support::metadata::DecodeDifferent::Encode(
+							<#full_ident as #metadata_trait>::HASHERS,
+						),
+						value: #frame_support::metadata::DecodeDifferent::Encode(#value),
+					}
+				)
+			},
+		};
 
-			let metadata_trait = match &storage.metadata {
-				Metadata::Value { .. } => quote::quote_spanned!(storage.attr_span =>
-					#frame_support::storage::types::StorageValueMetadata
-				),
-				Metadata::Map { .. } => quote::quote_spanned!(storage.attr_span =>
-					#frame_support::storage::types::StorageMapMetadata
+		quote::quote_spanned!(storage.attr_span =>
+			#(#cfg_attrs)* #frame_support::metadata::StorageEntryMetadata {
+				name: #frame_support::metadata::DecodeDifferent::Encode(
+					<#full_ident as #metadata_trait>::NAME
 				),
-				Metadata::DoubleMap { .. } => quote::quote_spanned!(storage.attr_span =>
-					#frame_support::storage::types::StorageDoubleMapMetadata
+				modifier: <#full_ident as #metadata_trait>::MODIFIER,
+				ty: #ty,
+				default: #frame_support::metadata::DecodeDifferent::Encode(
+					<#full_ident as #metadata_trait>::DEFAULT
 				),
-				Metadata::NMap { .. } => quote::quote_spanned!(storage.attr_span =>
-					#frame_support::storage::types::StorageNMapMetadata
-				),
-			};
-
-			let ty = match &storage.metadata {
-				Metadata::Value { value } => {
-					let value = clean_type_string(&quote::quote!(#value).to_string());
-					quote::quote_spanned!(storage.attr_span =>
-						#frame_support::metadata::StorageEntryType::Plain(
-							#frame_support::metadata::DecodeDifferent::Encode(#value)
-						)
-					)
-				},
-				Metadata::Map { key, value } => {
-					let value = clean_type_string(&quote::quote!(#value).to_string());
-					let key = clean_type_string(&quote::quote!(#key).to_string());
-					quote::quote_spanned!(storage.attr_span =>
-						#frame_support::metadata::StorageEntryType::Map {
-							hasher: <#full_ident as #metadata_trait>::HASHER,
-							key: #frame_support::metadata::DecodeDifferent::Encode(#key),
-							value: #frame_support::metadata::DecodeDifferent::Encode(#value),
-							unused: false,
-						}
-					)
-				},
-				Metadata::DoubleMap { key1, key2, value } => {
-					let value = clean_type_string(&quote::quote!(#value).to_string());
-					let key1 = clean_type_string(&quote::quote!(#key1).to_string());
-					let key2 = clean_type_string(&quote::quote!(#key2).to_string());
-					quote::quote_spanned!(storage.attr_span =>
-						#frame_support::metadata::StorageEntryType::DoubleMap {
-							hasher: <#full_ident as #metadata_trait>::HASHER1,
-							key2_hasher: <#full_ident as #metadata_trait>::HASHER2,
-							key1: #frame_support::metadata::DecodeDifferent::Encode(#key1),
-							key2: #frame_support::metadata::DecodeDifferent::Encode(#key2),
-							value: #frame_support::metadata::DecodeDifferent::Encode(#value),
-						}
-					)
-				},
-				Metadata::NMap { keys, value, .. } => {
-					let keys = keys
-						.iter()
-						.map(|key| clean_type_string(&quote::quote!(#key).to_string()))
-						.collect::<Vec<_>>();
-					let value = clean_type_string(&quote::quote!(#value).to_string());
-					quote::quote_spanned!(storage.attr_span =>
-						#frame_support::metadata::StorageEntryType::NMap {
-							keys: #frame_support::metadata::DecodeDifferent::Encode(&[
-								#( #keys, )*
-							]),
-							hashers: #frame_support::metadata::DecodeDifferent::Encode(
-								<#full_ident as #metadata_trait>::HASHERS,
-							),
-							value: #frame_support::metadata::DecodeDifferent::Encode(#value),
-						}
-					)
-				}
-			};
+				documentation: #frame_support::metadata::DecodeDifferent::Encode(&[
+					#( #docs, )*
+				]),
+			}
+		)
+	});
 
-			quote::quote_spanned!(storage.attr_span =>
-				#(#cfg_attrs)* #frame_support::metadata::StorageEntryMetadata {
-					name: #frame_support::metadata::DecodeDifferent::Encode(
-						<#full_ident as #metadata_trait>::NAME
-					),
-					modifier: <#full_ident as #metadata_trait>::MODIFIER,
-					ty: #ty,
-					default: #frame_support::metadata::DecodeDifferent::Encode(
-						<#full_ident as #metadata_trait>::DEFAULT
-					),
-					documentation: #frame_support::metadata::DecodeDifferent::Encode(&[
-						#( #docs, )*
-					]),
-				}
-			)
-		});
-
-	let getters = def.storages.iter()
-		.map(|storage| if let Some(getter) = &storage.getter {
-			let completed_where_clause = super::merge_where_clauses(&[
-				&storage.where_clause,
-				&def.config.where_clause,
-			]);
-			let docs = storage.docs.iter()
+	let getters = def.storages.iter().map(|storage| {
+		if let Some(getter) = &storage.getter {
+			let completed_where_clause =
+				super::merge_where_clauses(&[&storage.where_clause, &def.config.where_clause]);
+			let docs = storage
+				.docs
+				.iter()
 				.map(|d| quote::quote_spanned!(storage.attr_span => #[doc = #d]));
 
 			let ident = &storage.ident;
@@ -365,11 +367,12 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 							}
 						}
 					)
-				}
+				},
 			}
 		} else {
 			Default::default()
-		});
+		}
+	});
 
 	let prefix_structs = def.storages.iter().map(|storage_def| {
 		let type_impl_gen = &def.type_impl_generics(storage_def.attr_span);
diff --git a/frame/support/procedural/src/pallet/expand/store_trait.rs b/frame/support/procedural/src/pallet/expand/store_trait.rs
index 81ed52ac87a6..36cc08b732fe 100644
--- a/frame/support/procedural/src/pallet/expand/store_trait.rs
+++ b/frame/support/procedural/src/pallet/expand/store_trait.rs
@@ -22,11 +22,8 @@ use syn::spanned::Spanned;
 /// * generate Store trait with all storages,
 /// * implement Store trait for Pallet.
 pub fn expand_store_trait(def: &mut Def) -> proc_macro2::TokenStream {
-	let (trait_vis, trait_store) = if let Some(store) = &def.pallet_struct.store {
-		store
-	} else {
-		return Default::default()
-	};
+	let (trait_vis, trait_store) =
+		if let Some(store) = &def.pallet_struct.store { store } else { return Default::default() };
 
 	let type_impl_gen = &def.type_impl_generics(trait_store.span());
 	let type_use_gen = &def.type_use_generics(trait_store.span());
@@ -37,7 +34,8 @@ pub fn expand_store_trait(def: &mut Def) -> proc_macro2::TokenStream {
 	let completed_where_clause = super::merge_where_clauses(&where_clauses);
 
 	let storage_names = &def.storages.iter().map(|storage| &storage.ident).collect::<Vec<_>>();
-	let storage_cfg_attrs = &def.storages.iter().map(|storage| &storage.cfg_attrs).collect::<Vec<_>>();
+	let storage_cfg_attrs =
+		&def.storages.iter().map(|storage| &storage.cfg_attrs).collect::<Vec<_>>();
 
 	quote::quote_spanned!(trait_store.span() =>
 		#trait_vis trait #trait_store {
diff --git a/frame/support/procedural/src/pallet/expand/validate_unsigned.rs b/frame/support/procedural/src/pallet/expand/validate_unsigned.rs
index 1abf7d893b93..5f30d712e9a5 100644
--- a/frame/support/procedural/src/pallet/expand/validate_unsigned.rs
+++ b/frame/support/procedural/src/pallet/expand/validate_unsigned.rs
@@ -15,15 +15,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::pallet::Def;
+use crate::{pallet::Def, COUNTER};
 use proc_macro2::TokenStream;
 use quote::quote;
-use crate::COUNTER;
-use syn::{Ident, spanned::Spanned};
+use syn::{spanned::Spanned, Ident};
 
 pub fn expand_validate_unsigned(def: &mut Def) -> TokenStream {
 	let count = COUNTER.with(|counter| counter.borrow_mut().inc());
-	let macro_ident = Ident::new(&format!("__is_validate_unsigned_part_defined_{}", count), def.item.span());
+	let macro_ident =
+		Ident::new(&format!("__is_validate_unsigned_part_defined_{}", count), def.item.span());
 
 	let maybe_compile_error = if def.validate_unsigned.is_none() {
 		quote! {
@@ -48,7 +48,7 @@ pub fn expand_validate_unsigned(def: &mut Def) -> TokenStream {
 					#maybe_compile_error
 				}
 			}
-	
+
 			#[doc(hidden)]
 			pub use #macro_ident as is_validate_unsigned_part_defined;
 		}
diff --git a/frame/support/procedural/src/pallet/mod.rs b/frame/support/procedural/src/pallet/mod.rs
index 560d57d50e03..93797906d04d 100644
--- a/frame/support/procedural/src/pallet/mod.rs
+++ b/frame/support/procedural/src/pallet/mod.rs
@@ -25,21 +25,22 @@
 //!   This step will modify the ItemMod by adding some derive attributes or phantom data variants
 //!   to user defined types. And also crate new types and implement block.
 
-mod parse;
 mod expand;
+mod parse;
 
 pub use parse::Def;
 use syn::spanned::Spanned;
 
 pub fn pallet(
 	attr: proc_macro::TokenStream,
-	item: proc_macro::TokenStream
+	item: proc_macro::TokenStream,
 ) -> proc_macro::TokenStream {
 	if !attr.is_empty() {
-		let msg = "Invalid pallet macro call: expected no attributes, e.g. macro call must be just \
+		let msg =
+			"Invalid pallet macro call: expected no attributes, e.g. macro call must be just \
 			`#[frame_support::pallet]` or `#[pallet]`";
 		let span = proc_macro2::TokenStream::from(attr).span();
-		return syn::Error::new(span, msg).to_compile_error().into();
+		return syn::Error::new(span, msg).to_compile_error().into()
 	}
 
 	let item = syn::parse_macro_input!(item as syn::ItemMod);
diff --git a/frame/support/procedural/src/pallet/parse/call.rs b/frame/support/procedural/src/pallet/parse/call.rs
index 299b86cf6f84..d022e8025aab 100644
--- a/frame/support/procedural/src/pallet/parse/call.rs
+++ b/frame/support/procedural/src/pallet/parse/call.rs
@@ -75,9 +75,7 @@ impl syn::parse::Parse for FunctionAttr {
 
 		let weight_content;
 		syn::parenthesized!(weight_content in content);
-		Ok(FunctionAttr {
-			weight: weight_content.parse::<syn::Expr>()?,
-		})
+		Ok(FunctionAttr { weight: weight_content.parse::<syn::Expr>()? })
 	}
 }
 
@@ -100,7 +98,6 @@ impl syn::parse::Parse for ArgAttrIsCompact {
 
 /// Check the syntax is `OriginFor<T>`
 pub fn check_dispatchable_first_arg_type(ty: &syn::Type) -> syn::Result<()> {
-
 	pub struct CheckDispatchableFirstArg;
 	impl syn::parse::Parse for CheckDispatchableFirstArg {
 		fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
@@ -113,13 +110,12 @@ pub fn check_dispatchable_first_arg_type(ty: &syn::Type) -> syn::Result<()> {
 		}
 	}
 
-	syn::parse2::<CheckDispatchableFirstArg>(ty.to_token_stream())
-		.map_err(|e| {
-			let msg = "Invalid type: expected `OriginFor<T>`";
-			let mut err = syn::Error::new(ty.span(), msg);
-			err.combine(e);
-			err
-		})?;
+	syn::parse2::<CheckDispatchableFirstArg>(ty.to_token_stream()).map_err(|e| {
+		let msg = "Invalid type: expected `OriginFor<T>`";
+		let mut err = syn::Error::new(ty.span(), msg);
+		err.combine(e);
+		err
+	})?;
 
 	Ok(())
 }
@@ -128,12 +124,12 @@ impl CallDef {
 	pub fn try_from(
 		attr_span: proc_macro2::Span,
 		index: usize,
-		item: &mut syn::Item
+		item: &mut syn::Item,
 	) -> syn::Result<Self> {
 		let item = if let syn::Item::Impl(item) = item {
 			item
 		} else {
-			return Err(syn::Error::new(item.span(), "Invalid pallet::call, expected item impl"));
+			return Err(syn::Error::new(item.span(), "Invalid pallet::call, expected item impl"))
 		};
 
 		let mut instances = vec![];
@@ -158,18 +154,18 @@ impl CallDef {
 						_ => method.vis.span(),
 					};
 
-					return Err(syn::Error::new(span, msg));
+					return Err(syn::Error::new(span, msg))
 				}
 
 				match method.sig.inputs.first() {
 					None => {
 						let msg = "Invalid pallet::call, must have at least origin arg";
-						return Err(syn::Error::new(method.sig.span(), msg));
+						return Err(syn::Error::new(method.sig.span(), msg))
 					},
 					Some(syn::FnArg::Receiver(_)) => {
 						let msg = "Invalid pallet::call, first argument must be a typed argument, \
 							e.g. `origin: OriginFor<T>`";
-						return Err(syn::Error::new(method.sig.span(), msg));
+						return Err(syn::Error::new(method.sig.span(), msg))
 					},
 					Some(syn::FnArg::Typed(arg)) => {
 						check_dispatchable_first_arg_type(&*arg.ty)?;
@@ -181,7 +177,7 @@ impl CallDef {
 				} else {
 					let msg = "Invalid pallet::call, require return type \
 						DispatchResultWithPostInfo";
-					return Err(syn::Error::new(method.sig.span(), msg));
+					return Err(syn::Error::new(method.sig.span(), msg))
 				}
 
 				let mut call_var_attrs: Vec<FunctionAttr> =
@@ -193,7 +189,7 @@ impl CallDef {
 					} else {
 						"Invalid pallet::call, too many weight attributes given"
 					};
-					return Err(syn::Error::new(method.sig.span(), msg));
+					return Err(syn::Error::new(method.sig.span(), msg))
 				}
 				let weight = call_var_attrs.pop().unwrap().weight;
 
@@ -210,14 +206,14 @@ impl CallDef {
 
 					if arg_attrs.len() > 1 {
 						let msg = "Invalid pallet::call, argument has too many attributes";
-						return Err(syn::Error::new(arg.span(), msg));
+						return Err(syn::Error::new(arg.span(), msg))
 					}
 
 					let arg_ident = if let syn::Pat::Ident(pat) = &*arg.pat {
 						pat.ident.clone()
 					} else {
 						let msg = "Invalid pallet::call, argument must be ident";
-						return Err(syn::Error::new(arg.pat.span(), msg));
+						return Err(syn::Error::new(arg.pat.span(), msg))
 					};
 
 					args.push((!arg_attrs.is_empty(), arg_ident, arg.ty.clone()));
@@ -225,15 +221,10 @@ impl CallDef {
 
 				let docs = helper::get_doc_literals(&method.attrs);
 
-				methods.push(CallVariantDef {
-					name: method.sig.ident.clone(),
-					weight,
-					args,
-					docs,
-				});
+				methods.push(CallVariantDef { name: method.sig.ident.clone(), weight, args, docs });
 			} else {
 				let msg = "Invalid pallet::call, only method accepted";
-				return Err(syn::Error::new(impl_item.span(), msg));
+				return Err(syn::Error::new(impl_item.span(), msg))
 			}
 		}
 
diff --git a/frame/support/procedural/src/pallet/parse/config.rs b/frame/support/procedural/src/pallet/parse/config.rs
index 69dfaeb7f9e9..b006aadf51a0 100644
--- a/frame/support/procedural/src/pallet/parse/config.rs
+++ b/frame/support/procedural/src/pallet/parse/config.rs
@@ -17,8 +17,8 @@
 
 use super::helper;
 use core::convert::TryFrom;
-use syn::spanned::Spanned;
 use quote::ToTokens;
+use syn::spanned::Spanned;
 
 /// List of additional token to be used for parsing.
 mod keyword {
@@ -66,23 +66,26 @@ impl TryFrom<&syn::TraitItemType> for ConstMetadataDef {
 	type Error = syn::Error;
 
 	fn try_from(trait_ty: &syn::TraitItemType) -> Result<Self, Self::Error> {
-		let err = |span, msg|
-			syn::Error::new(span, format!("Invalid usage of `#[pallet::constant]`: {}", msg));
+		let err = |span, msg| {
+			syn::Error::new(span, format!("Invalid usage of `#[pallet::constant]`: {}", msg))
+		};
 		let doc = helper::get_doc_literals(&trait_ty.attrs);
 		let ident = trait_ty.ident.clone();
-		let bound = trait_ty.bounds
+		let bound = trait_ty
+			.bounds
 			.iter()
-			.find_map(|b|
+			.find_map(|b| {
 				if let syn::TypeParamBound::Trait(tb) = b {
-					tb.path.segments
+					tb.path
+						.segments
 						.last()
-						.and_then(|s| if s.ident == "Get" { Some(s) } else { None } )
+						.and_then(|s| if s.ident == "Get" { Some(s) } else { None })
 				} else {
 					None
 				}
-			)
+			})
 			.ok_or_else(|| err(trait_ty.span(), "`Get<T>` trait bound not found"))?;
-		let type_arg = if let syn::PathArguments::AngleBracketed (ref ab) = bound.arguments {
+		let type_arg = if let syn::PathArguments::AngleBracketed(ref ab) = bound.arguments {
 			if ab.args.len() == 1 {
 				if let syn::GenericArgument::Type(ref ty) = ab.args[0] {
 					Ok(ty)
@@ -214,15 +217,15 @@ impl syn::parse::Parse for FromEventParse {
 fn check_event_type(
 	frame_system: &syn::Ident,
 	trait_item: &syn::TraitItem,
-	trait_has_instance: bool
-)  -> syn::Result<bool> {
+	trait_has_instance: bool,
+) -> syn::Result<bool> {
 	if let syn::TraitItem::Type(type_) = trait_item {
 		if type_.ident == "Event" {
 			// Check event has no generics
 			if !type_.generics.params.is_empty() || type_.generics.where_clause.is_some() {
 				let msg = "Invalid `type Event`, associated type `Event` is reserved and must have\
 					no generics nor where_clause";
-				return Err(syn::Error::new(trait_item.span(), msg));
+				return Err(syn::Error::new(trait_item.span(), msg))
 			}
 			// Check bound contains IsType and From
 
@@ -237,28 +240,28 @@ fn check_event_type(
 					bound: `IsType<<Self as {}::Config>::Event>`",
 					frame_system,
 				);
-				return Err(syn::Error::new(type_.span(), msg));
+				return Err(syn::Error::new(type_.span(), msg))
 			}
 
-			let from_event_bound = type_.bounds.iter().find_map(|s| {
-				syn::parse2::<FromEventParse>(s.to_token_stream()).ok()
-			});
+			let from_event_bound = type_
+				.bounds
+				.iter()
+				.find_map(|s| syn::parse2::<FromEventParse>(s.to_token_stream()).ok());
 
 			let from_event_bound = if let Some(b) = from_event_bound {
 				b
 			} else {
 				let msg = "Invalid `type Event`, associated type `Event` is reserved and must \
 					bound: `From<Event>` or `From<Event<Self>>` or `From<Event<Self, I>>`";
-				return Err(syn::Error::new(type_.span(), msg));
+				return Err(syn::Error::new(type_.span(), msg))
 			};
 
-			if from_event_bound.is_generic
-				&& (from_event_bound.has_instance != trait_has_instance)
+			if from_event_bound.is_generic && (from_event_bound.has_instance != trait_has_instance)
 			{
 				let msg = "Invalid `type Event`, associated type `Event` bounds inconsistent \
 					`From<Event..>`. Config and generic Event must be both with instance or \
 					without instance";
-				return Err(syn::Error::new(type_.span(), msg));
+				return Err(syn::Error::new(type_.span(), msg))
 			}
 
 			Ok(true)
@@ -272,16 +275,14 @@ fn check_event_type(
 
 /// Replace ident `Self` by `T`
 pub fn replace_self_by_t(input: proc_macro2::TokenStream) -> proc_macro2::TokenStream {
-	input.into_iter()
+	input
+		.into_iter()
 		.map(|token_tree| match token_tree {
 			proc_macro2::TokenTree::Group(group) =>
-				proc_macro2::Group::new(
-					group.delimiter(),
-					replace_self_by_t(group.stream())
-				).into(),
+				proc_macro2::Group::new(group.delimiter(), replace_self_by_t(group.stream())).into(),
 			proc_macro2::TokenTree::Ident(ident) if ident == "Self" =>
 				proc_macro2::Ident::new("T", ident.span()).into(),
-			other => other
+			other => other,
 		})
 		.collect()
 }
@@ -297,27 +298,27 @@ impl ConfigDef {
 			item
 		} else {
 			let msg = "Invalid pallet::config, expected trait definition";
-			return Err(syn::Error::new(item.span(), msg));
+			return Err(syn::Error::new(item.span(), msg))
 		};
 
 		if !matches!(item.vis, syn::Visibility::Public(_)) {
 			let msg = "Invalid pallet::config, trait must be public";
-			return Err(syn::Error::new(item.span(), msg));
+			return Err(syn::Error::new(item.span(), msg))
 		}
 
 		syn::parse2::<keyword::Config>(item.ident.to_token_stream())?;
 
-
 		let where_clause = {
 			let stream = replace_self_by_t(item.generics.where_clause.to_token_stream());
-			syn::parse2::<Option<syn::WhereClause>>(stream)
-				.expect("Internal error: replacing `Self` by `T` should result in valid where
-					clause")
+			syn::parse2::<Option<syn::WhereClause>>(stream).expect(
+				"Internal error: replacing `Self` by `T` should result in valid where
+					clause",
+			)
 		};
 
 		if item.generics.params.len() > 1 {
 			let msg = "Invalid pallet::config, expected no more than one generic";
-			return Err(syn::Error::new(item.generics.params[2].span(), msg));
+			return Err(syn::Error::new(item.generics.params[2].span(), msg))
 		}
 
 		let has_instance = if item.generics.params.first().is_some() {
@@ -331,15 +332,15 @@ impl ConfigDef {
 		let mut consts_metadata = vec![];
 		for trait_item in &mut item.items {
 			// Parse for event
-			has_event_type = has_event_type
-				|| check_event_type(frame_system, trait_item, has_instance)?;
+			has_event_type =
+				has_event_type || check_event_type(frame_system, trait_item, has_instance)?;
 
 			// Parse for constant
 			let type_attrs_const: Vec<TypeAttrConst> = helper::take_item_pallet_attrs(trait_item)?;
 
 			if type_attrs_const.len() > 1 {
 				let msg = "Invalid attribute in pallet::config, only one attribute is expected";
-				return Err(syn::Error::new(type_attrs_const[1].span(), msg));
+				return Err(syn::Error::new(type_attrs_const[1].span(), msg))
 			}
 
 			if type_attrs_const.len() == 1 {
@@ -349,17 +350,17 @@ impl ConfigDef {
 						consts_metadata.push(constant);
 					},
 					_ => {
-						let msg = "Invalid pallet::constant in pallet::config, expected type trait \
+						let msg =
+							"Invalid pallet::constant in pallet::config, expected type trait \
 							item";
-						return Err(syn::Error::new(trait_item.span(), msg));
+						return Err(syn::Error::new(trait_item.span(), msg))
 					},
 				}
 			}
 		}
 
-		let attr: Option<DisableFrameSystemSupertraitCheck> = helper::take_first_item_pallet_attr(
-			&mut item.attrs
-		)?;
+		let attr: Option<DisableFrameSystemSupertraitCheck> =
+			helper::take_first_item_pallet_attr(&mut item.attrs)?;
 
 		let disable_system_supertrait_check = attr.is_some();
 
@@ -372,10 +373,9 @@ impl ConfigDef {
 			let found = if item.supertraits.is_empty() {
 				"none".to_string()
 			} else {
-				let mut found = item.supertraits.iter()
-					.fold(String::new(), |acc, s| {
-						format!("{}`{}`, ", acc, quote::quote!(#s).to_string())
-					});
+				let mut found = item.supertraits.iter().fold(String::new(), |acc, s| {
+					format!("{}`{}`, ", acc, quote::quote!(#s).to_string())
+				});
 				found.pop();
 				found.pop();
 				found
@@ -387,19 +387,11 @@ impl ConfigDef {
 				(try `pub trait Config: frame_system::Config {{ ...` or \
 				`pub trait Config<I: 'static>: frame_system::Config {{ ...`). \
 				To disable this check, use `#[pallet::disable_frame_system_supertrait_check]`",
-				frame_system,
-				found,
+				frame_system, found,
 			);
-			return Err(syn::Error::new(item.span(), msg));
+			return Err(syn::Error::new(item.span(), msg))
 		}
 
-		Ok(Self {
-			index,
-			has_instance,
-			consts_metadata,
-			has_event_type,
-			where_clause,
-			attr_span,
-		})
+		Ok(Self { index, has_instance, consts_metadata, has_event_type, where_clause, attr_span })
 	}
 }
diff --git a/frame/support/procedural/src/pallet/parse/error.rs b/frame/support/procedural/src/pallet/parse/error.rs
index 49aaebc87f42..9b96a1876917 100644
--- a/frame/support/procedural/src/pallet/parse/error.rs
+++ b/frame/support/procedural/src/pallet/parse/error.rs
@@ -16,8 +16,8 @@
 // limitations under the License.
 
 use super::helper;
-use syn::spanned::Spanned;
 use quote::ToTokens;
+use syn::spanned::Spanned;
 
 /// List of additional token to be used for parsing.
 mod keyword {
@@ -48,11 +48,11 @@ impl ErrorDef {
 		let item = if let syn::Item::Enum(item) = item {
 			item
 		} else {
-			return Err(syn::Error::new(item.span(), "Invalid pallet::error, expected item enum"));
+			return Err(syn::Error::new(item.span(), "Invalid pallet::error, expected item enum"))
 		};
 		if !matches!(item.vis, syn::Visibility::Public(_)) {
 			let msg = "Invalid pallet::error, `Error` must be public";
-			return Err(syn::Error::new(item.span(), msg));
+			return Err(syn::Error::new(item.span(), msg))
 		}
 
 		let mut instances = vec![];
@@ -60,34 +60,30 @@ impl ErrorDef {
 
 		if item.generics.where_clause.is_some() {
 			let msg = "Invalid pallet::error, where clause is not allowed on pallet error item";
-			return Err(syn::Error::new(item.generics.where_clause.as_ref().unwrap().span(), msg));
+			return Err(syn::Error::new(item.generics.where_clause.as_ref().unwrap().span(), msg))
 		}
 
 		let error = syn::parse2::<keyword::Error>(item.ident.to_token_stream())?;
 
-		let variants = item.variants.iter()
+		let variants = item
+			.variants
+			.iter()
 			.map(|variant| {
 				if !matches!(variant.fields, syn::Fields::Unit) {
 					let msg = "Invalid pallet::error, unexpected fields, must be `Unit`";
-					return Err(syn::Error::new(variant.fields.span(), msg));
+					return Err(syn::Error::new(variant.fields.span(), msg))
 				}
 				if variant.discriminant.is_some() {
 					let msg = "Invalid pallet::error, unexpected discriminant, discriminant \
 						are not supported";
 					let span = variant.discriminant.as_ref().unwrap().0.span();
-					return Err(syn::Error::new(span, msg));
+					return Err(syn::Error::new(span, msg))
 				}
 
 				Ok((variant.ident.clone(), helper::get_doc_literals(&variant.attrs)))
 			})
 			.collect::<Result<_, _>>()?;
 
-		Ok(ErrorDef {
-			attr_span,
-			index,
-			variants,
-			instances,
-			error,
-		})
+		Ok(ErrorDef { attr_span, index, variants, instances, error })
 	}
 }
diff --git a/frame/support/procedural/src/pallet/parse/event.rs b/frame/support/procedural/src/pallet/parse/event.rs
index e5aad2b5b5d2..1bec2d775f85 100644
--- a/frame/support/procedural/src/pallet/parse/event.rs
+++ b/frame/support/procedural/src/pallet/parse/event.rs
@@ -16,9 +16,9 @@
 // limitations under the License.
 
 use super::helper;
-use syn::spanned::Spanned;
-use quote::ToTokens;
 use frame_support_procedural_tools::clean_type_string;
+use quote::ToTokens;
+use syn::spanned::Spanned;
 
 /// List of additional token to be used for parsing.
 mod keyword {
@@ -80,7 +80,7 @@ impl PalletEventAttr {
 
 /// Parse for syntax `$Type = "$SomeString"`.
 fn parse_event_metadata_element(
-	input: syn::parse::ParseStream
+	input: syn::parse::ParseStream,
 ) -> syn::Result<(syn::Type, String)> {
 	let typ = input.parse::<syn::Type>()?;
 	input.parse::<syn::Token![=]>()?;
@@ -118,7 +118,6 @@ impl syn::parse::Parse for PalletEventAttr {
 			generate_content.parse::<syn::Token![fn]>()?;
 			let fn_span = generate_content.parse::<keyword::deposit_event>()?.span();
 
-
 			Ok(PalletEventAttr::DepositEvent { fn_vis, span, fn_span })
 		} else {
 			Err(lookahead.error())
@@ -139,11 +138,10 @@ impl PalletEventAttrInfo {
 			match attr {
 				PalletEventAttr::Metadata { metadata: m, .. } if metadata.is_none() =>
 					metadata = Some(m),
-				PalletEventAttr::DepositEvent { fn_vis, fn_span, .. } if deposit_event.is_none() =>
+				PalletEventAttr::DepositEvent { fn_vis, fn_span, .. }
+					if deposit_event.is_none() =>
 					deposit_event = Some((fn_vis, fn_span)),
-				attr => {
-					return Err(syn::Error::new(attr.span(), "Duplicate attribute"));
-				}
+				attr => return Err(syn::Error::new(attr.span(), "Duplicate attribute")),
 			}
 		}
 
@@ -170,7 +168,7 @@ impl EventDef {
 
 		if !matches!(item.vis, syn::Visibility::Public(_)) {
 			let msg = "Invalid pallet::event, `Error` must be public";
-			return Err(syn::Error::new(item.span(), msg));
+			return Err(syn::Error::new(item.span(), msg))
 		}
 
 		let where_clause = item.generics.where_clause.clone();
@@ -182,10 +180,7 @@ impl EventDef {
 			instances.push(u);
 		} else {
 			// construct_runtime only allow non generic event for non instantiable pallet.
-			instances.push(helper::InstanceUsage {
-				has_instance: false,
-				span: item.ident.span(),
-			})
+			instances.push(helper::InstanceUsage { has_instance: false, span: item.ident.span() })
 		}
 
 		let has_instance = item.generics.type_params().any(|t| t.ident == "I");
@@ -195,13 +190,19 @@ impl EventDef {
 
 		let event = syn::parse2::<keyword::Event>(item.ident.to_token_stream())?;
 
-		let metadata = item.variants.iter()
+		let metadata = item
+			.variants
+			.iter()
 			.map(|variant| {
 				let name = variant.ident.clone();
 				let docs = helper::get_doc_literals(&variant.attrs);
-				let args = variant.fields.iter()
+				let args = variant
+					.fields
+					.iter()
 					.map(|field| {
-						metadata.iter().find(|m| m.0 == field.ty)
+						metadata
+							.iter()
+							.find(|m| m.0 == field.ty)
 							.map(|m| m.1.clone())
 							.unwrap_or_else(|| {
 								clean_type_string(&field.ty.to_token_stream().to_string())
diff --git a/frame/support/procedural/src/pallet/parse/extra_constants.rs b/frame/support/procedural/src/pallet/parse/extra_constants.rs
index 430bf9478377..71208f3329a1 100644
--- a/frame/support/procedural/src/pallet/parse/extra_constants.rs
+++ b/frame/support/procedural/src/pallet/parse/extra_constants.rs
@@ -52,14 +52,11 @@ pub struct ExtraConstantDef {
 }
 
 impl ExtraConstantsDef {
-	pub fn try_from(
-		index: usize,
-		item: &mut syn::Item
-	) -> syn::Result<Self> {
+	pub fn try_from(index: usize, item: &mut syn::Item) -> syn::Result<Self> {
 		let item = if let syn::Item::Impl(item) = item {
 			item
 		} else {
-			return Err(syn::Error::new(item.span(), "Invalid pallet::call, expected item impl"));
+			return Err(syn::Error::new(item.span(), "Invalid pallet::call, expected item impl"))
 		};
 
 		let mut instances = vec![];
@@ -78,28 +75,28 @@ impl ExtraConstantsDef {
 				method
 			} else {
 				let msg = "Invalid pallet::call, only method accepted";
-				return Err(syn::Error::new(impl_item.span(), msg));
+				return Err(syn::Error::new(impl_item.span(), msg))
 			};
 
 			if !method.sig.inputs.is_empty() {
 				let msg = "Invalid pallet::extra_constants, method must have 0 args";
-				return Err(syn::Error::new(method.sig.span(), msg));
+				return Err(syn::Error::new(method.sig.span(), msg))
 			}
 
 			if !method.sig.generics.params.is_empty() {
 				let msg = "Invalid pallet::extra_constants, method must have 0 generics";
-				return Err(syn::Error::new(method.sig.generics.params[0].span(), msg));
+				return Err(syn::Error::new(method.sig.generics.params[0].span(), msg))
 			}
 
 			if method.sig.generics.where_clause.is_some() {
 				let msg = "Invalid pallet::extra_constants, method must have no where clause";
-				return Err(syn::Error::new(method.sig.generics.where_clause.span(), msg));
+				return Err(syn::Error::new(method.sig.generics.where_clause.span(), msg))
 			}
 
 			let type_ = match &method.sig.output {
 				syn::ReturnType::Default => {
 					let msg = "Invalid pallet::extra_constants, method must have a return type";
-					return Err(syn::Error::new(method.span(), msg));
+					return Err(syn::Error::new(method.span(), msg))
 				},
 				syn::ReturnType::Type(_, type_) => *type_.clone(),
 			};
diff --git a/frame/support/procedural/src/pallet/parse/genesis_build.rs b/frame/support/procedural/src/pallet/parse/genesis_build.rs
index 1438c400b17f..82e297b4e26e 100644
--- a/frame/support/procedural/src/pallet/parse/genesis_build.rs
+++ b/frame/support/procedural/src/pallet/parse/genesis_build.rs
@@ -15,8 +15,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use syn::spanned::Spanned;
 use super::helper;
+use syn::spanned::Spanned;
 
 /// Definition for pallet genesis build implementation.
 pub struct GenesisBuildDef {
@@ -40,24 +40,22 @@ impl GenesisBuildDef {
 			item
 		} else {
 			let msg = "Invalid pallet::genesis_build, expected item impl";
-			return Err(syn::Error::new(item.span(), msg));
+			return Err(syn::Error::new(item.span(), msg))
 		};
 
-		let item_trait = &item.trait_.as_ref()
+		let item_trait = &item
+			.trait_
+			.as_ref()
 			.ok_or_else(|| {
 				let msg = "Invalid pallet::genesis_build, expected impl<..> GenesisBuild<..> \
 					for GenesisConfig<..>";
 				syn::Error::new(item.span(), msg)
-			})?.1;
+			})?
+			.1;
 
 		let mut instances = vec![];
 		instances.push(helper::check_genesis_builder_usage(&item_trait)?);
 
-		Ok(Self {
-			attr_span,
-			index,
-			instances,
-			where_clause: item.generics.where_clause.clone(),
-		})
+		Ok(Self { attr_span, index, instances, where_clause: item.generics.where_clause.clone() })
 	}
 }
diff --git a/frame/support/procedural/src/pallet/parse/genesis_config.rs b/frame/support/procedural/src/pallet/parse/genesis_config.rs
index 729d1241390a..a0cf7de1a846 100644
--- a/frame/support/procedural/src/pallet/parse/genesis_config.rs
+++ b/frame/support/procedural/src/pallet/parse/genesis_config.rs
@@ -15,8 +15,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use syn::spanned::Spanned;
 use super::helper;
+use syn::spanned::Spanned;
 
 /// Definition for pallet genesis config type.
 ///
@@ -42,7 +42,7 @@ impl GenesisConfigDef {
 			syn::Item::Struct(item) => (&item.vis, &item.ident, &item.generics),
 			_ => {
 				let msg = "Invalid pallet::genesis_config, expected enum or struct";
-				return Err(syn::Error::new(item.span(), msg));
+				return Err(syn::Error::new(item.span(), msg))
 			},
 		};
 
@@ -60,19 +60,14 @@ impl GenesisConfigDef {
 
 		if !matches!(vis, syn::Visibility::Public(_)) {
 			let msg = "Invalid pallet::genesis_config, GenesisConfig must be public";
-			return Err(syn::Error::new(item_span, msg));
+			return Err(syn::Error::new(item_span, msg))
 		}
 
 		if ident != "GenesisConfig" {
 			let msg = "Invalid pallet::genesis_config, ident must `GenesisConfig`";
-			return Err(syn::Error::new(ident.span(), msg));
+			return Err(syn::Error::new(ident.span(), msg))
 		}
 
-		Ok(GenesisConfigDef {
-			index,
-			genesis_config: ident.clone(),
-			instances,
-			gen_kind,
-		})
+		Ok(GenesisConfigDef { index, genesis_config: ident.clone(), instances, gen_kind })
 	}
 }
diff --git a/frame/support/procedural/src/pallet/parse/helper.rs b/frame/support/procedural/src/pallet/parse/helper.rs
index 3a7729c47e1d..211f1ed5ee42 100644
--- a/frame/support/procedural/src/pallet/parse/helper.rs
+++ b/frame/support/procedural/src/pallet/parse/helper.rs
@@ -15,8 +15,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use syn::spanned::Spanned;
 use quote::ToTokens;
+use syn::spanned::Spanned;
 
 /// List of additional token to be used for parsing.
 mod keyword {
@@ -47,20 +47,15 @@ pub trait MutItemAttrs {
 }
 
 /// Take the first pallet attribute (e.g. attribute like `#[pallet..]`) and decode it to `Attr`
-pub fn take_first_item_pallet_attr<Attr>(item: &mut impl MutItemAttrs) -> syn::Result<Option<Attr>> where
+pub fn take_first_item_pallet_attr<Attr>(item: &mut impl MutItemAttrs) -> syn::Result<Option<Attr>>
+where
 	Attr: syn::parse::Parse,
 {
-	let attrs = if let Some(attrs) = item.mut_item_attrs() {
-		attrs
-	} else {
-		return Ok(None)
-	};
-
-	if let Some(index) = attrs.iter()
-		.position(|attr|
-			attr.path.segments.first().map_or(false, |segment| segment.ident == "pallet")
-		)
-	{
+	let attrs = if let Some(attrs) = item.mut_item_attrs() { attrs } else { return Ok(None) };
+
+	if let Some(index) = attrs.iter().position(|attr| {
+		attr.path.segments.first().map_or(false, |segment| segment.ident == "pallet")
+	}) {
 		let pallet_attr = attrs.remove(index);
 		Ok(Some(syn::parse2(pallet_attr.into_token_stream())?))
 	} else {
@@ -69,7 +64,8 @@ pub fn take_first_item_pallet_attr<Attr>(item: &mut impl MutItemAttrs) -> syn::R
 }
 
 /// Take all the pallet attributes (e.g. attribute like `#[pallet..]`) and decode them to `Attr`
-pub fn take_item_pallet_attrs<Attr>(item: &mut impl MutItemAttrs) -> syn::Result<Vec<Attr>> where
+pub fn take_item_pallet_attrs<Attr>(item: &mut impl MutItemAttrs) -> syn::Result<Vec<Attr>>
+where
 	Attr: syn::parse::Parse,
 {
 	let mut pallet_attrs = Vec::new();
@@ -83,13 +79,16 @@ pub fn take_item_pallet_attrs<Attr>(item: &mut impl MutItemAttrs) -> syn::Result
 
 /// Get all the cfg attributes (e.g. attribute like `#[cfg..]`) and decode them to `Attr`
 pub fn get_item_cfg_attrs(attrs: &[syn::Attribute]) -> Vec<syn::Attribute> {
-	attrs.iter().filter_map(|attr|  {
-		if attr.path.segments.first().map_or(false, |segment| segment.ident == "cfg") {
-			Some(attr.clone())
-		} else {
-			None
-		}
-	}).collect::<Vec<_>>()
+	attrs
+		.iter()
+		.filter_map(|attr| {
+			if attr.path.segments.first().map_or(false, |segment| segment.ident == "cfg") {
+				Some(attr.clone())
+			} else {
+				None
+			}
+		})
+		.collect::<Vec<_>>()
 }
 
 impl MutItemAttrs for syn::Item {
@@ -116,7 +115,6 @@ impl MutItemAttrs for syn::Item {
 	}
 }
 
-
 impl MutItemAttrs for syn::TraitItem {
 	fn mut_item_attrs(&mut self) -> Option<&mut Vec<syn::Attribute>> {
 		match self {
@@ -143,7 +141,8 @@ impl MutItemAttrs for syn::ItemMod {
 
 /// Return all doc attributes literals found.
 pub fn get_doc_literals(attrs: &Vec<syn::Attribute>) -> Vec<syn::Lit> {
-	attrs.iter()
+	attrs
+		.iter()
 		.filter_map(|attr| {
 			if let Ok(syn::Meta::NameValue(meta)) = attr.parse_meta() {
 				if meta.path.get_ident().map_or(false, |ident| ident == "doc") {
@@ -166,7 +165,7 @@ impl syn::parse::Parse for Unit {
 		syn::parenthesized!(content in input);
 		if !content.is_empty() {
 			let msg = "unexpected tokens, expected nothing inside parenthesis as `()`";
-			return Err(syn::Error::new(content.span(), msg));
+			return Err(syn::Error::new(content.span(), msg))
 		}
 		Ok(Self)
 	}
@@ -179,7 +178,7 @@ impl syn::parse::Parse for StaticLifetime {
 		let lifetime = input.parse::<syn::Lifetime>()?;
 		if lifetime.ident != "static" {
 			let msg = "unexpected tokens, expected `static`";
-			return Err(syn::Error::new(lifetime.ident.span(), msg));
+			return Err(syn::Error::new(lifetime.ident.span(), msg))
 		}
 		Ok(Self)
 	}
@@ -190,10 +189,7 @@ impl syn::parse::Parse for StaticLifetime {
 /// `span` is used in case generics is empty (empty generics has span == call_site).
 ///
 /// return the instance if found.
-pub fn check_config_def_gen(
-	gen: &syn::Generics,
-	span: proc_macro2::Span,
-) -> syn::Result<()> {
+pub fn check_config_def_gen(gen: &syn::Generics, span: proc_macro2::Span) -> syn::Result<()> {
 	let expected = "expected `I: 'static = ()`";
 	pub struct CheckTraitDefGenerics;
 	impl syn::parse::Parse for CheckTraitDefGenerics {
@@ -208,13 +204,12 @@ pub fn check_config_def_gen(
 		}
 	}
 
-	syn::parse2::<CheckTraitDefGenerics>(gen.params.to_token_stream())
-		.map_err(|e| {
-			let msg = format!("Invalid generics: {}", expected);
-			let mut err = syn::Error::new(span, msg);
-			err.combine(e);
-			err
-		})?;
+	syn::parse2::<CheckTraitDefGenerics>(gen.params.to_token_stream()).map_err(|e| {
+		let msg = format!("Invalid generics: {}", expected);
+		let mut err = syn::Error::new(span, msg);
+		err.combine(e);
+		err
+	})?;
 
 	Ok(())
 }
@@ -234,10 +229,7 @@ pub fn check_type_def_gen_no_bounds(
 	pub struct Checker(InstanceUsage);
 	impl syn::parse::Parse for Checker {
 		fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
-			let mut instance_usage = InstanceUsage {
-				has_instance: false,
-				span: input.span(),
-			};
+			let mut instance_usage = InstanceUsage { has_instance: false, span: input.span() };
 
 			input.parse::<keyword::T>()?;
 			if input.peek(syn::Token![,]) {
@@ -258,7 +250,8 @@ pub fn check_type_def_gen_no_bounds(
 			let mut err = syn::Error::new(span, msg);
 			err.combine(e);
 			err
-		})?.0;
+		})?
+		.0;
 
 	Ok(i)
 }
@@ -286,10 +279,7 @@ pub fn check_type_def_optional_gen(
 				return Ok(Self(None))
 			}
 
-			let mut instance_usage = InstanceUsage {
-				span: input.span(),
-				has_instance: false,
-			};
+			let mut instance_usage = InstanceUsage { span: input.span(), has_instance: false };
 
 			input.parse::<keyword::T>()?;
 
@@ -338,9 +328,13 @@ pub fn check_type_def_optional_gen(
 			let mut err = syn::Error::new(span, msg);
 			err.combine(e);
 			err
-		})?.0
+		})?
+		.0
 		// Span can be call_site if generic is empty. Thus we replace it.
-		.map(|mut i| { i.span = span; i });
+		.map(|mut i| {
+			i.span = span;
+			i
+		});
 
 	Ok(i)
 }
@@ -355,10 +349,7 @@ pub fn check_pallet_struct_usage(type_: &Box<syn::Type>) -> syn::Result<Instance
 	pub struct Checker(InstanceUsage);
 	impl syn::parse::Parse for Checker {
 		fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
-			let mut instance_usage = InstanceUsage {
-				span: input.span(),
-				has_instance: false,
-			};
+			let mut instance_usage = InstanceUsage { span: input.span(), has_instance: false };
 
 			input.parse::<keyword::Pallet>()?;
 			input.parse::<syn::Token![<]>()?;
@@ -380,7 +371,8 @@ pub fn check_pallet_struct_usage(type_: &Box<syn::Type>) -> syn::Result<Instance
 			let mut err = syn::Error::new(type_.span(), msg);
 			err.combine(e);
 			err
-		})?.0;
+		})?
+		.0;
 
 	Ok(i)
 }
@@ -392,18 +384,12 @@ pub fn check_pallet_struct_usage(type_: &Box<syn::Type>) -> syn::Result<Instance
 /// `span` is used in case generics is empty (empty generics has span == call_site).
 ///
 /// return whether it contains instance.
-pub fn check_impl_gen(
-	gen: &syn::Generics,
-	span: proc_macro2::Span
-) -> syn::Result<InstanceUsage> {
+pub fn check_impl_gen(gen: &syn::Generics, span: proc_macro2::Span) -> syn::Result<InstanceUsage> {
 	let expected = "expected `impl<T: Config>` or `impl<T: Config<I>, I: 'static>`";
 	pub struct Checker(InstanceUsage);
 	impl syn::parse::Parse for Checker {
 		fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
-			let mut instance_usage = InstanceUsage {
-				span: input.span(),
-				has_instance: false,
-			};
+			let mut instance_usage = InstanceUsage { span: input.span(), has_instance: false };
 
 			input.parse::<keyword::T>()?;
 			input.parse::<syn::Token![:]>()?;
@@ -428,7 +414,8 @@ pub fn check_impl_gen(
 			let mut err = syn::Error::new(span, format!("Invalid generics: {}", expected));
 			err.combine(e);
 			err
-		})?.0;
+		})?
+		.0;
 
 	Ok(i)
 }
@@ -451,10 +438,7 @@ pub fn check_type_def_gen(
 	pub struct Checker(InstanceUsage);
 	impl syn::parse::Parse for Checker {
 		fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
-			let mut instance_usage = InstanceUsage {
-				span: input.span(),
-				has_instance: false,
-			};
+			let mut instance_usage = InstanceUsage { span: input.span(), has_instance: false };
 
 			input.parse::<keyword::T>()?;
 
@@ -503,7 +487,8 @@ pub fn check_type_def_gen(
 			let mut err = syn::Error::new(span, msg);
 			err.combine(e);
 			err
-		})?.0;
+		})?
+		.0;
 
 	// Span can be call_site if generic is empty. Thus we replace it.
 	i.span = span;
@@ -521,10 +506,7 @@ pub fn check_genesis_builder_usage(type_: &syn::Path) -> syn::Result<InstanceUsa
 	pub struct Checker(InstanceUsage);
 	impl syn::parse::Parse for Checker {
 		fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
-			let mut instance_usage = InstanceUsage {
-				span: input.span(),
-				has_instance: false,
-			};
+			let mut instance_usage = InstanceUsage { span: input.span(), has_instance: false };
 
 			input.parse::<keyword::GenesisBuild>()?;
 			input.parse::<syn::Token![<]>()?;
@@ -546,7 +528,8 @@ pub fn check_genesis_builder_usage(type_: &syn::Path) -> syn::Result<InstanceUsa
 			let mut err = syn::Error::new(type_.span(), msg);
 			err.combine(e);
 			err
-		})?.0;
+		})?
+		.0;
 
 	Ok(i)
 }
@@ -575,10 +558,7 @@ pub fn check_type_value_gen(
 			input.parse::<syn::Token![:]>()?;
 			input.parse::<keyword::Config>()?;
 
-			let mut instance_usage = InstanceUsage {
-				span: input.span(),
-				has_instance: false,
-			};
+			let mut instance_usage = InstanceUsage { span: input.span(), has_instance: false };
 
 			if input.is_empty() {
 				return Ok(Self(Some(instance_usage)))
@@ -603,17 +583,19 @@ pub fn check_type_value_gen(
 			let mut err = syn::Error::new(span, msg);
 			err.combine(e);
 			err
-		})?.0
+		})?
+		.0
 		// Span can be call_site if generic is empty. Thus we replace it.
-		.map(|mut i| { i.span = span; i });
+		.map(|mut i| {
+			i.span = span;
+			i
+		});
 
 	Ok(i)
 }
 
 /// Check the keyword `DispatchResultWithPostInfo` or `DispatchResult`.
-pub fn check_pallet_call_return_type(
-	type_: &syn::Type,
-) -> syn::Result<()> {
+pub fn check_pallet_call_return_type(type_: &syn::Type) -> syn::Result<()> {
 	pub struct Checker;
 	impl syn::parse::Parse for Checker {
 		fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
diff --git a/frame/support/procedural/src/pallet/parse/hooks.rs b/frame/support/procedural/src/pallet/parse/hooks.rs
index 99ae3ed62541..1dd86498f22d 100644
--- a/frame/support/procedural/src/pallet/parse/hooks.rs
+++ b/frame/support/procedural/src/pallet/parse/hooks.rs
@@ -15,8 +15,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use syn::spanned::Spanned;
 use super::helper;
+use syn::spanned::Spanned;
 
 /// Implementation of the pallet hooks.
 pub struct HooksDef {
@@ -42,30 +42,31 @@ impl HooksDef {
 			item
 		} else {
 			let msg = "Invalid pallet::hooks, expected item impl";
-			return Err(syn::Error::new(item.span(), msg));
+			return Err(syn::Error::new(item.span(), msg))
 		};
 
 		let mut instances = vec![];
 		instances.push(helper::check_pallet_struct_usage(&item.self_ty)?);
 		instances.push(helper::check_impl_gen(&item.generics, item.impl_token.span())?);
 
-		let item_trait = &item.trait_.as_ref()
+		let item_trait = &item
+			.trait_
+			.as_ref()
 			.ok_or_else(|| {
 				let msg = "Invalid pallet::hooks, expected impl<..> Hooks \
 					for Pallet<..>";
 				syn::Error::new(item.span(), msg)
-			})?.1;
+			})?
+			.1;
 
-		if item_trait.segments.len() != 1
-			|| item_trait.segments[0].ident != "Hooks"
-		{
+		if item_trait.segments.len() != 1 || item_trait.segments[0].ident != "Hooks" {
 			let msg = format!(
 				"Invalid pallet::hooks, expected trait to be `Hooks` found `{}`\
 				, you can import from `frame_support::pallet_prelude`",
 				quote::quote!(#item_trait)
 			);
 
-			return Err(syn::Error::new(item_trait.span(), msg));
+			return Err(syn::Error::new(item_trait.span(), msg))
 		}
 
 		let has_runtime_upgrade = item.items.iter().any(|i| match i {
diff --git a/frame/support/procedural/src/pallet/parse/inherent.rs b/frame/support/procedural/src/pallet/parse/inherent.rs
index a3f12b157498..de5ad8f795db 100644
--- a/frame/support/procedural/src/pallet/parse/inherent.rs
+++ b/frame/support/procedural/src/pallet/parse/inherent.rs
@@ -15,8 +15,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use syn::spanned::Spanned;
 use super::helper;
+use syn::spanned::Spanned;
 
 /// The definition of the pallet inherent implementation.
 pub struct InherentDef {
@@ -32,22 +32,22 @@ impl InherentDef {
 			item
 		} else {
 			let msg = "Invalid pallet::inherent, expected item impl";
-			return Err(syn::Error::new(item.span(), msg));
+			return Err(syn::Error::new(item.span(), msg))
 		};
 
 		if item.trait_.is_none() {
 			let msg = "Invalid pallet::inherent, expected impl<..> ProvideInherent for Pallet<..>";
-			return Err(syn::Error::new(item.span(), msg));
+			return Err(syn::Error::new(item.span(), msg))
 		}
 
 		if let Some(last) = item.trait_.as_ref().unwrap().1.segments.last() {
 			if last.ident != "ProvideInherent" {
 				let msg = "Invalid pallet::inherent, expected trait ProvideInherent";
-				return Err(syn::Error::new(last.span(), msg));
+				return Err(syn::Error::new(last.span(), msg))
 			}
 		} else {
 			let msg = "Invalid pallet::inherent, expected impl<..> ProvideInherent for Pallet<..>";
-			return Err(syn::Error::new(item.span(), msg));
+			return Err(syn::Error::new(item.span(), msg))
 		}
 
 		let mut instances = vec![];
diff --git a/frame/support/procedural/src/pallet/parse/mod.rs b/frame/support/procedural/src/pallet/parse/mod.rs
index 2f378c52e8b3..c7367e582044 100644
--- a/frame/support/procedural/src/pallet/parse/mod.rs
+++ b/frame/support/procedural/src/pallet/parse/mod.rs
@@ -19,24 +19,24 @@
 //!
 //! Parse the module into `Def` struct through `Def::try_from` function.
 
-pub mod config;
-pub mod pallet_struct;
-pub mod hooks;
 pub mod call;
+pub mod config;
 pub mod error;
-pub mod origin;
-pub mod inherent;
-pub mod storage;
 pub mod event;
-pub mod helper;
-pub mod genesis_config;
+pub mod extra_constants;
 pub mod genesis_build;
-pub mod validate_unsigned;
+pub mod genesis_config;
+pub mod helper;
+pub mod hooks;
+pub mod inherent;
+pub mod origin;
+pub mod pallet_struct;
+pub mod storage;
 pub mod type_value;
-pub mod extra_constants;
+pub mod validate_unsigned;
 
-use syn::spanned::Spanned;
 use frame_support_procedural_tools::generate_crate_access_2018;
+use syn::spanned::Spanned;
 
 /// Parsed definition of a pallet.
 pub struct Def {
@@ -67,11 +67,14 @@ impl Def {
 		let frame_support = generate_crate_access_2018("frame-support")?;
 
 		let item_span = item.span();
-		let items = &mut item.content.as_mut()
+		let items = &mut item
+			.content
+			.as_mut()
 			.ok_or_else(|| {
 				let msg = "Invalid pallet definition, expected mod to be inlined.";
 				syn::Error::new(item_span, msg)
-			})?.1;
+			})?
+			.1;
 
 		let mut config = None;
 		let mut pallet_struct = None;
@@ -128,13 +131,12 @@ impl Def {
 				},
 				Some(PalletAttr::TypeValue(span)) =>
 					type_values.push(type_value::TypeValueDef::try_from(span, index, item)?),
-				Some(PalletAttr::ExtraConstants(_)) => {
+				Some(PalletAttr::ExtraConstants(_)) =>
 					extra_constants =
-						Some(extra_constants::ExtraConstantsDef::try_from(index, item)?)
-				},
+						Some(extra_constants::ExtraConstantsDef::try_from(index, item)?),
 				Some(attr) => {
 					let msg = "Invalid duplicated attribute";
-					return Err(syn::Error::new(attr.span(), msg));
+					return Err(syn::Error::new(attr.span(), msg))
 				},
 				None => (),
 			}
@@ -148,12 +150,13 @@ impl Def {
 				genesis_config.as_ref().map_or("unused", |_| "used"),
 				genesis_build.as_ref().map_or("unused", |_| "used"),
 			);
-			return Err(syn::Error::new(item_span, msg));
+			return Err(syn::Error::new(item_span, msg))
 		}
 
 		let def = Def {
 			item,
-			config: config.ok_or_else(|| syn::Error::new(item_span, "Missing `#[pallet::config]`"))?,
+			config: config
+				.ok_or_else(|| syn::Error::new(item_span, "Missing `#[pallet::config]`"))?,
 			pallet_struct: pallet_struct
 				.ok_or_else(|| syn::Error::new(item_span, "Missing `#[pallet::pallet]`"))?,
 			hooks,
@@ -181,10 +184,7 @@ impl Def {
 	/// Check that usage of trait `Event` is consistent with the definition, i.e. it is declared
 	/// and trait defines type Event, or not declared and no trait associated type.
 	fn check_event_usage(&self) -> syn::Result<()> {
-		match (
-			self.config.has_event_type,
-			self.event.is_some(),
-		) {
+		match (self.config.has_event_type, self.event.is_some()) {
 			(true, false) => {
 				let msg = "Invalid usage of Event, `Config` contains associated type `Event`, \
 					but enum `Event` is not declared (i.e. no use of `#[pallet::event]`). \
@@ -197,7 +197,7 @@ impl Def {
 					An Event associated type must be declare on trait `Config`.";
 				Err(syn::Error::new(proc_macro2::Span::call_site(), msg))
 			},
-			_ => Ok(())
+			_ => Ok(()),
 		}
 	}
 
@@ -235,19 +235,18 @@ impl Def {
 			instances.extend_from_slice(&extra_constants.instances[..]);
 		}
 
-		let mut errors = instances.into_iter()
-			.filter_map(|instances| {
-				if instances.has_instance == self.config.has_instance {
-					return None
-				}
-				let msg = if self.config.has_instance {
-					"Invalid generic declaration, trait is defined with instance but generic use none"
-				} else {
-					"Invalid generic declaration, trait is defined without instance but generic use \
+		let mut errors = instances.into_iter().filter_map(|instances| {
+			if instances.has_instance == self.config.has_instance {
+				return None
+			}
+			let msg = if self.config.has_instance {
+				"Invalid generic declaration, trait is defined with instance but generic use none"
+			} else {
+				"Invalid generic declaration, trait is defined without instance but generic use \
 						some"
-				};
-				Some(syn::Error::new(instances.span, msg))
-			});
+			};
+			Some(syn::Error::new(instances.span, msg))
+		});
 
 		if let Some(mut first_error) = errors.next() {
 			for error in errors {
@@ -351,7 +350,8 @@ impl GenericKind {
 		match self {
 			GenericKind::None => quote::quote!(),
 			GenericKind::Config => quote::quote_spanned!(span => T: Config),
-			GenericKind::ConfigAndInstance => quote::quote_spanned!(span => T: Config<I>, I: 'static),
+			GenericKind::ConfigAndInstance =>
+				quote::quote_spanned!(span => T: Config<I>, I: 'static),
 		}
 	}
 
diff --git a/frame/support/procedural/src/pallet/parse/origin.rs b/frame/support/procedural/src/pallet/parse/origin.rs
index 2b47978b808a..c4e1197ac511 100644
--- a/frame/support/procedural/src/pallet/parse/origin.rs
+++ b/frame/support/procedural/src/pallet/parse/origin.rs
@@ -15,8 +15,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use syn::spanned::Spanned;
 use super::helper;
+use syn::spanned::Spanned;
 
 /// Definition of the pallet origin type.
 ///
@@ -42,7 +42,7 @@ impl OriginDef {
 			syn::Item::Type(item) => (&item.vis, &item.ident, &item.generics),
 			_ => {
 				let msg = "Invalid pallet::origin, expected enum or struct or type";
-				return Err(syn::Error::new(item.span(), msg));
+				return Err(syn::Error::new(item.span(), msg))
 			},
 		};
 
@@ -54,27 +54,19 @@ impl OriginDef {
 			instances.push(u);
 		} else {
 			// construct_runtime only allow generic event for instantiable pallet.
-			instances.push(helper::InstanceUsage {
-				has_instance: false,
-				span: ident.span(),
-			})
+			instances.push(helper::InstanceUsage { has_instance: false, span: ident.span() })
 		}
 
 		if !matches!(vis, syn::Visibility::Public(_)) {
 			let msg = "Invalid pallet::origin, Origin must be public";
-			return Err(syn::Error::new(item_span, msg));
+			return Err(syn::Error::new(item_span, msg))
 		}
 
 		if ident != "Origin" {
 			let msg = "Invalid pallet::origin, ident must `Origin`";
-			return Err(syn::Error::new(ident.span(), msg));
+			return Err(syn::Error::new(ident.span(), msg))
 		}
 
-		Ok(OriginDef {
-			index,
-			has_instance,
-			is_generic,
-			instances,
-		})
+		Ok(OriginDef { index, has_instance, is_generic, instances })
 	}
 }
diff --git a/frame/support/procedural/src/pallet/parse/pallet_struct.rs b/frame/support/procedural/src/pallet/parse/pallet_struct.rs
index ba85da2d9e68..088b647fad7d 100644
--- a/frame/support/procedural/src/pallet/parse/pallet_struct.rs
+++ b/frame/support/procedural/src/pallet/parse/pallet_struct.rs
@@ -16,8 +16,8 @@
 // limitations under the License.
 
 use super::helper;
-use syn::spanned::Spanned;
 use quote::ToTokens;
+use syn::spanned::Spanned;
 
 /// List of additional token to be used for parsing.
 mod keyword {
@@ -49,11 +49,7 @@ pub struct PalletStructDef {
 /// * `#[pallet::generate_store($vis trait Store)]`
 /// * `#[pallet::generate_storage_info]`
 pub enum PalletStructAttr {
-	GenerateStore {
-		span: proc_macro2::Span,
-		vis: syn::Visibility,
-		keyword: keyword::Store,
-	},
+	GenerateStore { span: proc_macro2::Span, vis: syn::Visibility, keyword: keyword::Store },
 	GenerateStorageInfoTrait(proc_macro2::Span),
 }
 
@@ -103,7 +99,7 @@ impl PalletStructDef {
 			item
 		} else {
 			let msg = "Invalid pallet::pallet, expected struct definition";
-			return Err(syn::Error::new(item.span(), msg));
+			return Err(syn::Error::new(item.span(), msg))
 		};
 
 		let mut store = None;
@@ -115,12 +111,14 @@ impl PalletStructDef {
 				PalletStructAttr::GenerateStore { vis, keyword, .. } if store.is_none() => {
 					store = Some((vis, keyword));
 				},
-				PalletStructAttr::GenerateStorageInfoTrait(span) if generate_storage_info.is_none() => {
+				PalletStructAttr::GenerateStorageInfoTrait(span)
+					if generate_storage_info.is_none() =>
+				{
 					generate_storage_info = Some(span);
-				},
+				}
 				attr => {
 					let msg = "Unexpected duplicated attribute";
-					return Err(syn::Error::new(attr.span(), msg));
+					return Err(syn::Error::new(attr.span(), msg))
 				},
 			}
 		}
@@ -129,12 +127,12 @@ impl PalletStructDef {
 
 		if !matches!(item.vis, syn::Visibility::Public(_)) {
 			let msg = "Invalid pallet::pallet, Pallet must be public";
-			return Err(syn::Error::new(item.span(), msg));
+			return Err(syn::Error::new(item.span(), msg))
 		}
 
 		if item.generics.where_clause.is_some() {
 			let msg = "Invalid pallet::pallet, where clause not supported on Pallet declaration";
-			return Err(syn::Error::new(item.generics.where_clause.span(), msg));
+			return Err(syn::Error::new(item.generics.where_clause.span(), msg))
 		}
 
 		let mut instances = vec![];
diff --git a/frame/support/procedural/src/pallet/parse/storage.rs b/frame/support/procedural/src/pallet/parse/storage.rs
index 9ec890e66e57..7927aa2455fe 100644
--- a/frame/support/procedural/src/pallet/parse/storage.rs
+++ b/frame/support/procedural/src/pallet/parse/storage.rs
@@ -16,9 +16,9 @@
 // limitations under the License.
 
 use super::helper;
-use syn::spanned::Spanned;
 use quote::ToTokens;
 use std::collections::HashMap;
+use syn::spanned::Spanned;
 
 /// List of additional token to be used for parsing.
 mod keyword {
@@ -69,11 +69,10 @@ impl syn::parse::Parse for PalletStorageAttr {
 
 			let renamed_prefix = content.parse::<syn::LitStr>()?;
 			// Ensure the renamed prefix is a proper Rust identifier
-			syn::parse_str::<syn::Ident>(&renamed_prefix.value())
-				.map_err(|_| {
-					let msg = format!("`{}` is not a valid identifier", renamed_prefix.value());
-					syn::Error::new(renamed_prefix.span(), msg)
-				})?;
+			syn::parse_str::<syn::Ident>(&renamed_prefix.value()).map_err(|_| {
+				let msg = format!("`{}` is not a valid identifier", renamed_prefix.value());
+				syn::Error::new(renamed_prefix.span(), msg)
+			})?;
 
 			Ok(Self::StorageName(renamed_prefix, attr_span))
 		} else {
@@ -86,16 +85,8 @@ impl syn::parse::Parse for PalletStorageAttr {
 pub enum Metadata {
 	Value { value: syn::Type },
 	Map { value: syn::Type, key: syn::Type },
-	DoubleMap {
-		value: syn::Type,
-		key1: syn::Type,
-		key2: syn::Type
-	},
-	NMap {
-		keys: Vec<syn::Type>,
-		keygen: syn::Type,
-		value: syn::Type,
-	},
+	DoubleMap { value: syn::Type, key1: syn::Type, key2: syn::Type },
+	NMap { keys: Vec<syn::Type>, keygen: syn::Type, value: syn::Type },
 }
 
 pub enum QueryKind {
@@ -181,11 +172,8 @@ impl StorageGenerics {
 			Self::DoubleMap { value, key1, key2, .. } => Metadata::DoubleMap { value, key1, key2 },
 			Self::Map { value, key, .. } => Metadata::Map { value, key },
 			Self::Value { value, .. } => Metadata::Value { value },
-			Self::NMap { keygen, value, .. } => Metadata::NMap {
-				keys: collect_keys(&keygen)?,
-				keygen,
-				value,
-			},
+			Self::NMap { keygen, value, .. } =>
+				Metadata::NMap { keys: collect_keys(&keygen)?, keygen, value },
 		};
 
 		Ok(res)
@@ -194,11 +182,10 @@ impl StorageGenerics {
 	/// Return the query kind from the defined generics
 	fn query_kind(&self) -> Option<syn::Type> {
 		match &self {
-			Self::DoubleMap { query_kind, .. }
-			| Self::Map { query_kind, .. }
-			| Self::Value { query_kind, .. }
-			| Self::NMap { query_kind, .. }
-				=> query_kind.clone(),
+			Self::DoubleMap { query_kind, .. } |
+			Self::Map { query_kind, .. } |
+			Self::Value { query_kind, .. } |
+			Self::NMap { query_kind, .. } => query_kind.clone(),
 		}
 	}
 }
@@ -225,7 +212,10 @@ fn check_generics(
 		let mut e = format!(
 			"`{}` expect generics {}and optional generics {}",
 			storage_type_name,
-			mandatory_generics.iter().map(|name| format!("`{}`, ", name)).collect::<String>(),
+			mandatory_generics
+				.iter()
+				.map(|name| format!("`{}`, ", name))
+				.collect::<String>(),
 			&optional_generics.iter().map(|name| format!("`{}`, ", name)).collect::<String>(),
 		);
 		e.pop();
@@ -235,14 +225,12 @@ fn check_generics(
 	};
 
 	for (gen_name, gen_binding) in map {
-		if !mandatory_generics.contains(&gen_name.as_str())
-			&& !optional_generics.contains(&gen_name.as_str())
+		if !mandatory_generics.contains(&gen_name.as_str()) &&
+			!optional_generics.contains(&gen_name.as_str())
 		{
 			let msg = format!(
 				"Invalid pallet::storage, Unexpected generic `{}` for `{}`. {}",
-				gen_name,
-				storage_type_name,
-				expectation,
+				gen_name, storage_type_name, expectation,
 			);
 			errors.push(syn::Error::new(gen_binding.span(), msg));
 		}
@@ -252,8 +240,7 @@ fn check_generics(
 		if !map.contains_key(&mandatory_generic.to_string()) {
 			let msg = format!(
 				"Invalid pallet::storage, cannot find `{}` generic, required for `{}`.",
-				mandatory_generic,
-				storage_type_name
+				mandatory_generic, storage_type_name
 			);
 			errors.push(syn::Error::new(args_span, msg));
 		}
@@ -284,7 +271,7 @@ fn process_named_generics(
 			let msg = "Invalid pallet::storage, Duplicated named generic";
 			let mut err = syn::Error::new(arg.ident.span(), msg);
 			err.combine(syn::Error::new(other.ident.span(), msg));
-			return Err(err);
+			return Err(err)
 		}
 		parsed.insert(arg.ident.to_string(), arg.clone());
 	}
@@ -300,15 +287,14 @@ fn process_named_generics(
 			)?;
 
 			StorageGenerics::Value {
-				value: parsed.remove("Value")
+				value: parsed
+					.remove("Value")
 					.map(|binding| binding.ty)
 					.expect("checked above as mandatory generic"),
-				query_kind: parsed.remove("QueryKind")
-					.map(|binding| binding.ty),
-				on_empty: parsed.remove("OnEmpty")
-					.map(|binding| binding.ty),
+				query_kind: parsed.remove("QueryKind").map(|binding| binding.ty),
+				on_empty: parsed.remove("OnEmpty").map(|binding| binding.ty),
 			}
-		}
+		},
 		StorageKind::Map => {
 			check_generics(
 				&parsed,
@@ -319,20 +305,23 @@ fn process_named_generics(
 			)?;
 
 			StorageGenerics::Map {
-				hasher: parsed.remove("Hasher")
+				hasher: parsed
+					.remove("Hasher")
 					.map(|binding| binding.ty)
 					.expect("checked above as mandatory generic"),
-				key: parsed.remove("Key")
+				key: parsed
+					.remove("Key")
 					.map(|binding| binding.ty)
 					.expect("checked above as mandatory generic"),
-				value: parsed.remove("Value")
+				value: parsed
+					.remove("Value")
 					.map(|binding| binding.ty)
 					.expect("checked above as mandatory generic"),
 				query_kind: parsed.remove("QueryKind").map(|binding| binding.ty),
 				on_empty: parsed.remove("OnEmpty").map(|binding| binding.ty),
 				max_values: parsed.remove("MaxValues").map(|binding| binding.ty),
 			}
-		}
+		},
 		StorageKind::DoubleMap => {
 			check_generics(
 				&parsed,
@@ -343,26 +332,31 @@ fn process_named_generics(
 			)?;
 
 			StorageGenerics::DoubleMap {
-				hasher1: parsed.remove("Hasher1")
+				hasher1: parsed
+					.remove("Hasher1")
 					.map(|binding| binding.ty)
 					.expect("checked above as mandatory generic"),
-				key1: parsed.remove("Key1")
+				key1: parsed
+					.remove("Key1")
 					.map(|binding| binding.ty)
 					.expect("checked above as mandatory generic"),
-				hasher2: parsed.remove("Hasher2")
+				hasher2: parsed
+					.remove("Hasher2")
 					.map(|binding| binding.ty)
 					.expect("checked above as mandatory generic"),
-				key2: parsed.remove("Key2")
+				key2: parsed
+					.remove("Key2")
 					.map(|binding| binding.ty)
 					.expect("checked above as mandatory generic"),
-				value: parsed.remove("Value")
+				value: parsed
+					.remove("Value")
 					.map(|binding| binding.ty)
 					.expect("checked above as mandatory generic"),
 				query_kind: parsed.remove("QueryKind").map(|binding| binding.ty),
 				on_empty: parsed.remove("OnEmpty").map(|binding| binding.ty),
 				max_values: parsed.remove("MaxValues").map(|binding| binding.ty),
 			}
-		}
+		},
 		StorageKind::NMap => {
 			check_generics(
 				&parsed,
@@ -373,17 +367,19 @@ fn process_named_generics(
 			)?;
 
 			StorageGenerics::NMap {
-				keygen: parsed.remove("Key")
+				keygen: parsed
+					.remove("Key")
 					.map(|binding| binding.ty)
 					.expect("checked above as mandatory generic"),
-				value: parsed.remove("Value")
+				value: parsed
+					.remove("Value")
 					.map(|binding| binding.ty)
 					.expect("checked above as mandatory generic"),
 				query_kind: parsed.remove("QueryKind").map(|binding| binding.ty),
 				on_empty: parsed.remove("OnEmpty").map(|binding| binding.ty),
 				max_values: parsed.remove("MaxValues").map(|binding| binding.ty),
 			}
-		}
+		},
 	};
 
 	let metadata = generics.metadata()?;
@@ -399,41 +395,32 @@ fn process_unnamed_generics(
 	args: &[syn::Type],
 ) -> syn::Result<(Option<StorageGenerics>, Metadata, Option<syn::Type>)> {
 	let retrieve_arg = |arg_pos| {
-		args.get(arg_pos)
-			.cloned()
-			.ok_or_else(|| {
-				let msg = format!(
-					"Invalid pallet::storage, unexpected number of generic argument, \
+		args.get(arg_pos).cloned().ok_or_else(|| {
+			let msg = format!(
+				"Invalid pallet::storage, unexpected number of generic argument, \
 						expect at least {} args, found {}.",
-					arg_pos + 1,
-					args.len(),
-				);
-				syn::Error::new(args_span, msg)
-			})
+				arg_pos + 1,
+				args.len(),
+			);
+			syn::Error::new(args_span, msg)
+		})
 	};
 
 	let prefix_arg = retrieve_arg(0)?;
-	syn::parse2::<syn::Token![_]>(prefix_arg.to_token_stream())
-		.map_err(|e| {
-			let msg = "Invalid pallet::storage, for unnamed generic arguments the type \
+	syn::parse2::<syn::Token![_]>(prefix_arg.to_token_stream()).map_err(|e| {
+		let msg = "Invalid pallet::storage, for unnamed generic arguments the type \
 				first generic argument must be `_`, the argument is then replaced by macro.";
-			let mut err = syn::Error::new(prefix_arg.span(), msg);
-			err.combine(e);
-			err
-		})?;
+		let mut err = syn::Error::new(prefix_arg.span(), msg);
+		err.combine(e);
+		err
+	})?;
 
 	let res = match storage {
-		StorageKind::Value => (
-			None,
-			Metadata::Value { value: retrieve_arg(1)? },
-			retrieve_arg(2).ok(),
-		),
+		StorageKind::Value =>
+			(None, Metadata::Value { value: retrieve_arg(1)? }, retrieve_arg(2).ok()),
 		StorageKind::Map => (
 			None,
-			Metadata::Map {
-				key: retrieve_arg(2)?,
-				value: retrieve_arg(3)?,
-			},
+			Metadata::Map { key: retrieve_arg(2)?, value: retrieve_arg(3)? },
 			retrieve_arg(4).ok(),
 		),
 		StorageKind::DoubleMap => (
@@ -448,15 +435,7 @@ fn process_unnamed_generics(
 		StorageKind::NMap => {
 			let keygen = retrieve_arg(1)?;
 			let keys = collect_keys(&keygen)?;
-			(
-				None,
-				Metadata::NMap {
-					keys,
-					keygen,
-					value: retrieve_arg(2)?,
-				},
-				retrieve_arg(3).ok(),
-			)
+			(None, Metadata::NMap { keys, keygen, value: retrieve_arg(2)? }, retrieve_arg(3).ok())
 		},
 	};
 
@@ -479,8 +458,8 @@ fn process_generics(
 				found `{}`.",
 				found,
 			);
-			return Err(syn::Error::new(segment.ident.span(), msg));
-		}
+			return Err(syn::Error::new(segment.ident.span(), msg))
+		},
 	};
 
 	let args_span = segment.arguments.span();
@@ -490,12 +469,14 @@ fn process_generics(
 		_ => {
 			let msg = "Invalid pallet::storage, invalid number of generic generic arguments, \
 				expect more that 0 generic arguments.";
-			return Err(syn::Error::new(segment.span(), msg));
-		}
+			return Err(syn::Error::new(segment.span(), msg))
+		},
 	};
 
 	if args.args.iter().all(|gen| matches!(gen, syn::GenericArgument::Type(_))) {
-		let args = args.args.iter()
+		let args = args
+			.args
+			.iter()
 			.map(|gen| match gen {
 				syn::GenericArgument::Type(gen) => gen.clone(),
 				_ => unreachable!("It is asserted above that all generics are types"),
@@ -503,7 +484,9 @@ fn process_generics(
 			.collect::<Vec<_>>();
 		process_unnamed_generics(&storage_kind, args_span, &args)
 	} else if args.args.iter().all(|gen| matches!(gen, syn::GenericArgument::Binding(_))) {
-		let args = args.args.iter()
+		let args = args
+			.args
+			.iter()
 			.map(|gen| match gen {
 				syn::GenericArgument::Binding(gen) => gen.clone(),
 				_ => unreachable!("It is asserted above that all generics are bindings"),
@@ -521,11 +504,7 @@ fn process_generics(
 /// Parse the 2nd type argument to `StorageNMap` and return its keys.
 fn collect_keys(keygen: &syn::Type) -> syn::Result<Vec<syn::Type>> {
 	if let syn::Type::Tuple(tup) = keygen {
-		tup
-			.elems
-			.iter()
-			.map(extract_key)
-			.collect::<syn::Result<Vec<_>>>()
+		tup.elems.iter().map(extract_key).collect::<syn::Result<Vec<_>>>()
 	} else {
 		Ok(vec![extract_key(keygen)?])
 	}
@@ -537,7 +516,7 @@ fn extract_key(ty: &syn::Type) -> syn::Result<syn::Type> {
 		typ
 	} else {
 		let msg = "Invalid pallet::storage, expected type path";
-		return Err(syn::Error::new(ty.span(), msg));
+		return Err(syn::Error::new(ty.span(), msg))
 	};
 
 	let key_struct = typ.path.segments.last().ok_or_else(|| {
@@ -546,28 +525,31 @@ fn extract_key(ty: &syn::Type) -> syn::Result<syn::Type> {
 	})?;
 	if key_struct.ident != "Key" && key_struct.ident != "NMapKey" {
 		let msg = "Invalid pallet::storage, expected Key or NMapKey struct";
-		return Err(syn::Error::new(key_struct.ident.span(), msg));
+		return Err(syn::Error::new(key_struct.ident.span(), msg))
 	}
 
 	let ty_params = if let syn::PathArguments::AngleBracketed(args) = &key_struct.arguments {
 		args
 	} else {
 		let msg = "Invalid pallet::storage, expected angle bracketed arguments";
-		return Err(syn::Error::new(key_struct.arguments.span(), msg));
+		return Err(syn::Error::new(key_struct.arguments.span(), msg))
 	};
 
 	if ty_params.args.len() != 2 {
-		let msg = format!("Invalid pallet::storage, unexpected number of generic arguments \
-			for Key struct, expected 2 args, found {}", ty_params.args.len());
-		return Err(syn::Error::new(ty_params.span(), msg));
+		let msg = format!(
+			"Invalid pallet::storage, unexpected number of generic arguments \
+			for Key struct, expected 2 args, found {}",
+			ty_params.args.len()
+		);
+		return Err(syn::Error::new(ty_params.span(), msg))
 	}
 
 	let key = match &ty_params.args[1] {
 		syn::GenericArgument::Type(key_ty) => key_ty.clone(),
 		_ => {
 			let msg = "Invalid pallet::storage, expected type";
-			return Err(syn::Error::new(ty_params.args[1].span(), msg));
-		}
+			return Err(syn::Error::new(ty_params.args[1].span(), msg))
+		},
 	};
 
 	Ok(key)
@@ -576,8 +558,7 @@ fn extract_key(ty: &syn::Type) -> syn::Result<syn::Type> {
 impl StorageDef {
 	/// Return the storage prefix for this storage item
 	pub fn prefix(&self) -> String {
-		self
-			.rename_as
+		self.rename_as
 			.as_ref()
 			.map(syn::LitStr::value)
 			.unwrap_or(self.ident.to_string())
@@ -586,11 +567,7 @@ impl StorageDef {
 	/// Return either the span of the ident or the span of the literal in the
 	/// #[storage_prefix] attribute
 	pub fn prefix_span(&self) -> proc_macro2::Span {
-		self
-			.rename_as
-			.as_ref()
-			.map(syn::LitStr::span)
-			.unwrap_or(self.ident.span())
+		self.rename_as.as_ref().map(syn::LitStr::span).unwrap_or(self.ident.span())
 	}
 
 	pub fn try_from(
@@ -601,7 +578,7 @@ impl StorageDef {
 		let item = if let syn::Item::Type(item) = item {
 			item
 		} else {
-			return Err(syn::Error::new(item.span(), "Invalid pallet::storage, expect item type."));
+			return Err(syn::Error::new(item.span(), "Invalid pallet::storage, expect item type."))
 		};
 
 		let attrs: Vec<PalletStorageAttr> = helper::take_item_pallet_attrs(&mut item.attrs)?;
@@ -610,23 +587,19 @@ impl StorageDef {
 			.partition::<Vec<_>, _>(|attr| matches!(attr, PalletStorageAttr::Getter(..)));
 		if getters.len() > 1 {
 			let msg = "Invalid pallet::storage, multiple argument pallet::getter found";
-			return Err(syn::Error::new(getters[1].attr_span(), msg));
+			return Err(syn::Error::new(getters[1].attr_span(), msg))
 		}
 		if names.len() > 1 {
 			let msg = "Invalid pallet::storage, multiple argument pallet::storage_prefix found";
-			return Err(syn::Error::new(names[1].attr_span(), msg));
+			return Err(syn::Error::new(names[1].attr_span(), msg))
 		}
-		let getter = getters.pop().map(|attr| {
-			match attr {
-				PalletStorageAttr::Getter(ident, _) => ident,
-				_ => unreachable!(),
-			}
+		let getter = getters.pop().map(|attr| match attr {
+			PalletStorageAttr::Getter(ident, _) => ident,
+			_ => unreachable!(),
 		});
-		let rename_as = names.pop().map(|attr| {
-			match attr {
-				PalletStorageAttr::StorageName(lit, _) => lit,
-				_ => unreachable!(),
-			}
+		let rename_as = names.pop().map(|attr| match attr {
+			PalletStorageAttr::StorageName(lit, _) => lit,
+			_ => unreachable!(),
 		});
 
 		let cfg_attrs = helper::get_item_cfg_attrs(&item.attrs);
@@ -641,12 +614,12 @@ impl StorageDef {
 			typ
 		} else {
 			let msg = "Invalid pallet::storage, expected type path";
-			return Err(syn::Error::new(item.ty.span(), msg));
+			return Err(syn::Error::new(item.ty.span(), msg))
 		};
 
 		if typ.path.segments.len() != 1 {
 			let msg = "Invalid pallet::storage, expected type path with one segment";
-			return Err(syn::Error::new(item.ty.span(), msg));
+			return Err(syn::Error::new(item.ty.span(), msg))
 		}
 
 		let (named_generics, metadata, query_kind) = process_generics(&typ.path.segments[0])?;
@@ -654,11 +627,11 @@ impl StorageDef {
 		let query_kind = query_kind
 			.map(|query_kind| match query_kind {
 				syn::Type::Path(path)
-					if path.path.segments.last().map_or(false, |s| s.ident == "OptionQuery")
-				=> Some(QueryKind::OptionQuery),
+					if path.path.segments.last().map_or(false, |s| s.ident == "OptionQuery") =>
+					Some(QueryKind::OptionQuery),
 				syn::Type::Path(path)
-					if path.path.segments.last().map_or(false, |s| s.ident == "ValueQuery")
-				=> Some(QueryKind::ValueQuery),
+					if path.path.segments.last().map_or(false, |s| s.ident == "ValueQuery") =>
+					Some(QueryKind::ValueQuery),
 				_ => None,
 			})
 			.unwrap_or(Some(QueryKind::OptionQuery)); // This value must match the default generic.
@@ -667,7 +640,7 @@ impl StorageDef {
 			let msg = "Invalid pallet::storage, cannot generate getter because QueryKind is not \
 				identifiable. QueryKind must be `OptionQuery`, `ValueQuery`, or default one to be \
 				identifiable.";
-			return Err(syn::Error::new(getter.unwrap().span(), msg));
+			return Err(syn::Error::new(getter.unwrap().span(), msg))
 		}
 
 		Ok(StorageDef {
diff --git a/frame/support/procedural/src/pallet/parse/type_value.rs b/frame/support/procedural/src/pallet/parse/type_value.rs
index 58e6105818e0..7b9d57472db4 100644
--- a/frame/support/procedural/src/pallet/parse/type_value.rs
+++ b/frame/support/procedural/src/pallet/parse/type_value.rs
@@ -50,28 +50,31 @@ impl TypeValueDef {
 			item
 		} else {
 			let msg = "Invalid pallet::type_value, expected item fn";
-			return Err(syn::Error::new(item.span(), msg));
+			return Err(syn::Error::new(item.span(), msg))
 		};
 
-
 		if !item.attrs.is_empty() {
 			let msg = "Invalid pallet::type_value, unexpected attribute";
-			return Err(syn::Error::new(item.attrs[0].span(), msg));
+			return Err(syn::Error::new(item.attrs[0].span(), msg))
 		}
 
-		if let Some(span) = item.sig.constness.as_ref().map(|t| t.span())
+		if let Some(span) = item
+			.sig
+			.constness
+			.as_ref()
+			.map(|t| t.span())
 			.or_else(|| item.sig.asyncness.as_ref().map(|t| t.span()))
 			.or_else(|| item.sig.unsafety.as_ref().map(|t| t.span()))
 			.or_else(|| item.sig.abi.as_ref().map(|t| t.span()))
 			.or_else(|| item.sig.variadic.as_ref().map(|t| t.span()))
 		{
 			let msg = "Invalid pallet::type_value, unexpected token";
-			return Err(syn::Error::new(span, msg));
+			return Err(syn::Error::new(span, msg))
 		}
 
 		if !item.sig.inputs.is_empty() {
 			let msg = "Invalid pallet::type_value, unexpected argument";
-			return Err(syn::Error::new(item.sig.inputs[0].span(), msg));
+			return Err(syn::Error::new(item.sig.inputs[0].span(), msg))
 		}
 
 		let vis = item.vis.clone();
@@ -81,7 +84,7 @@ impl TypeValueDef {
 			syn::ReturnType::Type(_, type_) => type_,
 			syn::ReturnType::Default => {
 				let msg = "Invalid pallet::type_value, expected return type";
-				return Err(syn::Error::new(item.sig.span(), msg));
+				return Err(syn::Error::new(item.sig.span(), msg))
 			},
 		};
 
diff --git a/frame/support/procedural/src/pallet/parse/validate_unsigned.rs b/frame/support/procedural/src/pallet/parse/validate_unsigned.rs
index 0a406413f394..87e2a326f186 100644
--- a/frame/support/procedural/src/pallet/parse/validate_unsigned.rs
+++ b/frame/support/procedural/src/pallet/parse/validate_unsigned.rs
@@ -15,8 +15,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use syn::spanned::Spanned;
 use super::helper;
+use syn::spanned::Spanned;
 
 /// The definition of the pallet validate unsigned implementation.
 pub struct ValidateUnsignedDef {
@@ -32,24 +32,24 @@ impl ValidateUnsignedDef {
 			item
 		} else {
 			let msg = "Invalid pallet::validate_unsigned, expected item impl";
-			return Err(syn::Error::new(item.span(), msg));
+			return Err(syn::Error::new(item.span(), msg))
 		};
 
 		if item.trait_.is_none() {
 			let msg = "Invalid pallet::validate_unsigned, expected impl<..> ValidateUnsigned for \
 				Pallet<..>";
-			return Err(syn::Error::new(item.span(), msg));
+			return Err(syn::Error::new(item.span(), msg))
 		}
 
 		if let Some(last) = item.trait_.as_ref().unwrap().1.segments.last() {
 			if last.ident != "ValidateUnsigned" {
 				let msg = "Invalid pallet::validate_unsigned, expected trait ValidateUnsigned";
-				return Err(syn::Error::new(last.span(), msg));
+				return Err(syn::Error::new(last.span(), msg))
 			}
 		} else {
 			let msg = "Invalid pallet::validate_unsigned, expected impl<..> ValidateUnsigned for \
 				Pallet<..>";
-			return Err(syn::Error::new(item.span(), msg));
+			return Err(syn::Error::new(item.span(), msg))
 		}
 
 		let mut instances = vec![];
diff --git a/frame/support/procedural/src/pallet_version.rs b/frame/support/procedural/src/pallet_version.rs
index 0f3c478d4977..f0821f343c03 100644
--- a/frame/support/procedural/src/pallet_version.rs
+++ b/frame/support/procedural/src/pallet_version.rs
@@ -17,10 +17,10 @@
 
 //! Implementation of macros related to pallet versioning.
 
-use proc_macro2::{TokenStream, Span};
-use syn::{Result, Error};
-use std::{env, str::FromStr};
 use frame_support_procedural_tools::generate_crate_access_2018;
+use proc_macro2::{Span, TokenStream};
+use std::{env, str::FromStr};
+use syn::{Error, Result};
 
 /// Get the version from the given version environment variable.
 ///
diff --git a/frame/support/procedural/src/partial_eq_no_bound.rs b/frame/support/procedural/src/partial_eq_no_bound.rs
index 1c37be8021c9..3dbabf3f5d39 100644
--- a/frame/support/procedural/src/partial_eq_no_bound.rs
+++ b/frame/support/procedural/src/partial_eq_no_bound.rs
@@ -30,41 +30,47 @@ pub fn derive_partial_eq_no_bound(input: proc_macro::TokenStream) -> proc_macro:
 	let impl_ = match input.data {
 		syn::Data::Struct(struct_) => match struct_.fields {
 			syn::Fields::Named(named) => {
-				let fields = named.named.iter()
+				let fields = named
+					.named
+					.iter()
 					.map(|i| &i.ident)
 					.map(|i| quote::quote_spanned!(i.span() => self.#i == other.#i ));
 
 				quote::quote!( true #( && #fields )* )
 			},
 			syn::Fields::Unnamed(unnamed) => {
-				let fields = unnamed.unnamed.iter().enumerate()
+				let fields = unnamed
+					.unnamed
+					.iter()
+					.enumerate()
 					.map(|(i, _)| syn::Index::from(i))
 					.map(|i| quote::quote_spanned!(i.span() => self.#i == other.#i ));
 
 				quote::quote!( true #( && #fields )* )
 			},
 			syn::Fields::Unit => {
-				quote::quote!( true )
-			}
+				quote::quote!(true)
+			},
 		},
 		syn::Data::Enum(enum_) => {
-			let variants = enum_.variants.iter()
-				.map(|variant| {
+			let variants =
+				enum_.variants.iter().map(|variant| {
 					let ident = &variant.ident;
 					match &variant.fields {
 						syn::Fields::Named(named) => {
 							let names = named.named.iter().map(|i| &i.ident);
-							let other_names = names.clone()
-								.enumerate()
-								.map(|(n, ident)|
-									syn::Ident::new(&format!("_{}", n), ident.span())
-								);
+							let other_names = names.clone().enumerate().map(|(n, ident)| {
+								syn::Ident::new(&format!("_{}", n), ident.span())
+							});
 
 							let capture = names.clone();
-							let other_capture = names.clone().zip(other_names.clone())
+							let other_capture = names
+								.clone()
+								.zip(other_names.clone())
 								.map(|(i, other_i)| quote::quote!(#i: #other_i));
-							let eq = names.zip(other_names)
-								.map(|(i, other_i)| quote::quote_spanned!(i.span() => #i == #other_i));
+							let eq = names.zip(other_names).map(
+								|(i, other_i)| quote::quote_spanned!(i.span() => #i == #other_i),
+							);
 							quote::quote!(
 								(
 									Self::#ident { #( #capture, )* },
@@ -73,12 +79,18 @@ pub fn derive_partial_eq_no_bound(input: proc_macro::TokenStream) -> proc_macro:
 							)
 						},
 						syn::Fields::Unnamed(unnamed) => {
-							let names = unnamed.unnamed.iter().enumerate()
+							let names = unnamed
+								.unnamed
+								.iter()
+								.enumerate()
 								.map(|(i, f)| syn::Ident::new(&format!("_{}", i), f.span()));
-							let other_names = unnamed.unnamed.iter().enumerate()
-								.map(|(i, f)| syn::Ident::new(&format!("_{}_other", i), f.span()));
-							let eq = names.clone().zip(other_names.clone())
-								.map(|(i, other_i)| quote::quote_spanned!(i.span() => #i == #other_i));
+							let other_names =
+								unnamed.unnamed.iter().enumerate().map(|(i, f)| {
+									syn::Ident::new(&format!("_{}_other", i), f.span())
+								});
+							let eq = names.clone().zip(other_names.clone()).map(
+								|(i, other_i)| quote::quote_spanned!(i.span() => #i == #other_i),
+							);
 							quote::quote!(
 								(
 									Self::#ident ( #( #names, )* ),
@@ -122,5 +134,6 @@ pub fn derive_partial_eq_no_bound(input: proc_macro::TokenStream) -> proc_macro:
 				}
 			}
 		};
-	).into()
+	)
+	.into()
 }
diff --git a/frame/support/procedural/src/storage/genesis_config/builder_def.rs b/frame/support/procedural/src/storage/genesis_config/builder_def.rs
index 5b73928951cf..9669212f198f 100644
--- a/frame/support/procedural/src/storage/genesis_config/builder_def.rs
+++ b/frame/support/procedural/src/storage/genesis_config/builder_def.rs
@@ -17,11 +17,11 @@
 
 //! Builder logic definition used to build genesis storage.
 
+use super::super::{DeclStorageDefExt, StorageLineTypeDef};
 use frame_support_procedural_tools::syn_ext as ext;
 use proc_macro2::TokenStream;
-use syn::spanned::Spanned;
 use quote::{quote, quote_spanned};
-use super::super::{DeclStorageDefExt, StorageLineTypeDef};
+use syn::spanned::Spanned;
 
 /// Definition of builder blocks, each block insert some value in the storage.
 /// They must be called inside externalities, and with `self` being the genesis config.
@@ -79,7 +79,7 @@ impl BuilderDef {
 			if let Some(data) = data {
 				blocks.push(match &line.storage_type {
 					StorageLineTypeDef::Simple(_) if line.is_option => {
-						quote!{{
+						quote! {{
 							#data
 							let v: Option<&#value_type>= data;
 							if let Some(v) = v {
@@ -88,7 +88,7 @@ impl BuilderDef {
 						}}
 					},
 					StorageLineTypeDef::Simple(_) if !line.is_option => {
-						quote!{{
+						quote! {{
 							#data
 							let v: &#value_type = data;
 							<#storage_struct as #scrate::#storage_trait>::put::<&#value_type>(v);
@@ -97,7 +97,7 @@ impl BuilderDef {
 					StorageLineTypeDef::Simple(_) => unreachable!(),
 					StorageLineTypeDef::Map(map) => {
 						let key = &map.key;
-						quote!{{
+						quote! {{
 							#data
 							let data: &#scrate::sp_std::vec::Vec<(#key, #value_type)> = data;
 							data.iter().for_each(|(k, v)| {
@@ -110,7 +110,7 @@ impl BuilderDef {
 					StorageLineTypeDef::DoubleMap(map) => {
 						let key1 = &map.key1;
 						let key2 = &map.key2;
-						quote!{{
+						quote! {{
 							#data
 							let data: &#scrate::sp_std::vec::Vec<(#key1, #key2, #value_type)> = data;
 							data.iter().for_each(|(k1, k2, v)| {
@@ -122,12 +122,8 @@ impl BuilderDef {
 					},
 					StorageLineTypeDef::NMap(map) => {
 						let key_tuple = map.to_key_tuple();
-						let key_arg = if map.keys.len() == 1 {
-							quote!((k,))
-						} else {
-							quote!(k)
-						};
-						quote!{{
+						let key_arg = if map.keys.len() == 1 { quote!((k,)) } else { quote!(k) };
+						quote! {{
 							#data
 							let data: &#scrate::sp_std::vec::Vec<(#key_tuple, #value_type)> = data;
 							data.iter().for_each(|(k, v)| {
@@ -148,10 +144,6 @@ impl BuilderDef {
 			});
 		}
 
-
-		Self {
-			blocks,
-			is_generic,
-		}
+		Self { blocks, is_generic }
 	}
 }
diff --git a/frame/support/procedural/src/storage/genesis_config/genesis_config_def.rs b/frame/support/procedural/src/storage/genesis_config/genesis_config_def.rs
index c54349136cf0..fbdaab06b489 100644
--- a/frame/support/procedural/src/storage/genesis_config/genesis_config_def.rs
+++ b/frame/support/procedural/src/storage/genesis_config/genesis_config_def.rs
@@ -17,11 +17,11 @@
 
 //! Genesis config definition.
 
+use super::super::{DeclStorageDefExt, StorageLineTypeDef};
 use frame_support_procedural_tools::syn_ext as ext;
 use proc_macro2::TokenStream;
-use syn::{spanned::Spanned, parse_quote};
 use quote::quote;
-use super::super::{DeclStorageDefExt, StorageLineTypeDef};
+use syn::{parse_quote, spanned::Spanned};
 
 pub struct GenesisConfigFieldDef {
 	pub name: syn::Ident,
@@ -47,30 +47,28 @@ impl GenesisConfigDef {
 	pub fn from_def(def: &DeclStorageDefExt) -> syn::Result<Self> {
 		let fields = Self::get_genesis_config_field_defs(def)?;
 
-		let is_generic = fields.iter()
+		let is_generic = fields
+			.iter()
 			.any(|field| ext::type_contains_ident(&field.typ, &def.module_runtime_generic));
 
-		let (
-			genesis_struct_decl,
-			genesis_impl,
-			genesis_struct,
-			genesis_where_clause
-		) = if is_generic {
-			let runtime_generic = &def.module_runtime_generic;
-			let runtime_trait = &def.module_runtime_trait;
-			let optional_instance = &def.optional_instance;
-			let optional_instance_bound = &def.optional_instance_bound;
-			let optional_instance_bound_optional_default = &def.optional_instance_bound_optional_default;
-			let where_clause = &def.where_clause;
-			(
-				quote!(<#runtime_generic: #runtime_trait, #optional_instance_bound_optional_default>),
-				quote!(<#runtime_generic: #runtime_trait, #optional_instance_bound>),
-				quote!(<#runtime_generic, #optional_instance>),
-				where_clause.clone(),
-			)
-		} else {
-			(quote!(), quote!(), quote!(), None)
-		};
+		let (genesis_struct_decl, genesis_impl, genesis_struct, genesis_where_clause) =
+			if is_generic {
+				let runtime_generic = &def.module_runtime_generic;
+				let runtime_trait = &def.module_runtime_trait;
+				let optional_instance = &def.optional_instance;
+				let optional_instance_bound = &def.optional_instance_bound;
+				let optional_instance_bound_optional_default =
+					&def.optional_instance_bound_optional_default;
+				let where_clause = &def.where_clause;
+				(
+					quote!(<#runtime_generic: #runtime_trait, #optional_instance_bound_optional_default>),
+					quote!(<#runtime_generic: #runtime_trait, #optional_instance_bound>),
+					quote!(<#runtime_generic, #optional_instance>),
+					where_clause.clone(),
+				)
+			} else {
+				(quote!(), quote!(), quote!(), None)
+			};
 
 		Ok(Self {
 			is_generic,
@@ -82,14 +80,14 @@ impl GenesisConfigDef {
 		})
 	}
 
-	fn get_genesis_config_field_defs(def: &DeclStorageDefExt)
-		-> syn::Result<Vec<GenesisConfigFieldDef>>
-	{
+	fn get_genesis_config_field_defs(
+		def: &DeclStorageDefExt,
+	) -> syn::Result<Vec<GenesisConfigFieldDef>> {
 		let mut config_field_defs = Vec::new();
 
-		for (config_field, line) in def.storage_lines.iter()
-			.filter_map(|line| line.config.as_ref().map(|config_field| (config_field.clone(), line)))
-		{
+		for (config_field, line) in def.storage_lines.iter().filter_map(|line| {
+			line.config.as_ref().map(|config_field| (config_field.clone(), line))
+		}) {
 			let value_type = &line.value_type;
 
 			let typ = match &line.storage_type {
@@ -107,18 +105,20 @@ impl GenesisConfigDef {
 				StorageLineTypeDef::NMap(map) => {
 					let key_tuple = map.to_key_tuple();
 					parse_quote!( Vec<(#key_tuple, #value_type)> )
-				}
+				},
 			};
 
-			let default = line.default_value.as_ref()
-				.map(|d| {
-					if line.is_option {
-						quote!( #d.unwrap_or_default() )
-					} else {
-						quote!( #d )
-					}
-				})
-				.unwrap_or_else(|| quote!( Default::default() ));
+			let default =
+				line.default_value
+					.as_ref()
+					.map(|d| {
+						if line.is_option {
+							quote!( #d.unwrap_or_default() )
+						} else {
+							quote!( #d )
+						}
+					})
+					.unwrap_or_else(|| quote!(Default::default()));
 
 			config_field_defs.push(GenesisConfigFieldDef {
 				name: config_field,
@@ -129,22 +129,26 @@ impl GenesisConfigDef {
 		}
 
 		for line in &def.extra_genesis_config_lines {
-			let attrs = line.attrs.iter()
+			let attrs = line
+				.attrs
+				.iter()
 				.map(|attr| {
 					let meta = attr.parse_meta()?;
 					if meta.path().is_ident("cfg") {
 						return Err(syn::Error::new(
 							meta.span(),
-							"extra genesis config items do not support `cfg` attribute"
-						));
+							"extra genesis config items do not support `cfg` attribute",
+						))
 					}
 					Ok(meta)
 				})
 				.collect::<syn::Result<_>>()?;
 
-			let default = line.default.as_ref().map(|e| quote!( #e ))
-				.unwrap_or_else(|| quote!( Default::default() ));
-
+			let default = line
+				.default
+				.as_ref()
+				.map(|e| quote!( #e ))
+				.unwrap_or_else(|| quote!(Default::default()));
 
 			config_field_defs.push(GenesisConfigFieldDef {
 				name: line.name.clone(),
diff --git a/frame/support/procedural/src/storage/genesis_config/mod.rs b/frame/support/procedural/src/storage/genesis_config/mod.rs
index abc7af729f06..d2d1afb01773 100644
--- a/frame/support/procedural/src/storage/genesis_config/mod.rs
+++ b/frame/support/procedural/src/storage/genesis_config/mod.rs
@@ -18,14 +18,14 @@
 //! Declaration of genesis config structure and implementation of build storage trait and
 //! functions.
 
-use proc_macro2::{TokenStream, Span};
-use quote::quote;
 use super::DeclStorageDefExt;
-pub use genesis_config_def::GenesisConfigDef;
 pub use builder_def::BuilderDef;
+pub use genesis_config_def::GenesisConfigDef;
+use proc_macro2::{Span, TokenStream};
+use quote::quote;
 
-mod genesis_config_def;
 mod builder_def;
+mod genesis_config_def;
 
 const DEFAULT_INSTANCE_NAME: &str = "__GeneratedInstance";
 
@@ -118,19 +118,16 @@ fn impl_build_storage(
 	let genesis_impl = &genesis_config.genesis_impl;
 	let genesis_where_clause = &genesis_config.genesis_where_clause;
 
-	let (
-		fn_generic,
-		fn_traitinstance,
-		fn_where_clause
-	) = if !genesis_config.is_generic && builders.is_generic {
-		(
-			quote!( <#runtime_generic: #runtime_trait, #optional_instance_bound> ),
-			quote!( #runtime_generic, #optional_instance ),
-			Some(&def.where_clause),
-		)
-	} else {
-		(quote!(), quote!(), None)
-	};
+	let (fn_generic, fn_traitinstance, fn_where_clause) =
+		if !genesis_config.is_generic && builders.is_generic {
+			(
+				quote!( <#runtime_generic: #runtime_trait, #optional_instance_bound> ),
+				quote!( #runtime_generic, #optional_instance ),
+				Some(&def.where_clause),
+			)
+		} else {
+			(quote!(), quote!(), None)
+		};
 
 	let builder_blocks = &builders.blocks;
 
@@ -138,7 +135,7 @@ fn impl_build_storage(
 		#scrate::sp_runtime::BuildModuleGenesisStorage<#runtime_generic, #inherent_instance>
 	);
 
-	quote!{
+	quote! {
 		#[cfg(feature = "std")]
 		impl#genesis_impl GenesisConfig#genesis_struct #genesis_where_clause {
 			/// Build the storage for this module.
@@ -189,7 +186,7 @@ pub fn genesis_config_and_build_storage(def: &DeclStorageDefExt) -> TokenStream
 			decl_genesis_config_and_impl_default(scrate, &genesis_config);
 		let impl_build_storage = impl_build_storage(scrate, def, &genesis_config, &builders);
 
-		quote!{
+		quote! {
 			#decl_genesis_config_and_impl_default
 			#impl_build_storage
 		}
diff --git a/frame/support/procedural/src/storage/getters.rs b/frame/support/procedural/src/storage/getters.rs
index 32155239acdc..988e6fa09624 100644
--- a/frame/support/procedural/src/storage/getters.rs
+++ b/frame/support/procedural/src/storage/getters.rs
@@ -17,15 +17,17 @@
 
 //! Implementation of getters on module structure.
 
+use super::{DeclStorageDefExt, StorageLineTypeDef};
 use proc_macro2::TokenStream;
 use quote::quote;
-use super::{DeclStorageDefExt, StorageLineTypeDef};
 
 pub fn impl_getters(def: &DeclStorageDefExt) -> TokenStream {
 	let scrate = &def.hidden_crate;
 	let mut getters = TokenStream::new();
 
-	for (get_fn, line) in def.storage_lines.iter()
+	for (get_fn, line) in def
+		.storage_lines
+		.iter()
 		.filter_map(|line| line.getter.as_ref().map(|get_fn| (get_fn, line)))
 	{
 		let attrs = &line.doc_attrs;
@@ -35,7 +37,7 @@ pub fn impl_getters(def: &DeclStorageDefExt) -> TokenStream {
 
 		let getter = match &line.storage_type {
 			StorageLineTypeDef::Simple(value) => {
-				quote!{
+				quote! {
 					#( #[ #attrs ] )*
 					pub fn #get_fn() -> #value {
 						<#storage_struct as #scrate::#storage_trait>::get()
@@ -45,7 +47,7 @@ pub fn impl_getters(def: &DeclStorageDefExt) -> TokenStream {
 			StorageLineTypeDef::Map(map) => {
 				let key = &map.key;
 				let value = &map.value;
-				quote!{
+				quote! {
 					#( #[ #attrs ] )*
 					pub fn #get_fn<K: #scrate::codec::EncodeLike<#key>>(key: K) -> #value {
 						<#storage_struct as #scrate::#storage_trait>::get(key)
@@ -56,7 +58,7 @@ pub fn impl_getters(def: &DeclStorageDefExt) -> TokenStream {
 				let key1 = &map.key1;
 				let key2 = &map.key2;
 				let value = &map.value;
-				quote!{
+				quote! {
 					pub fn #get_fn<KArg1, KArg2>(k1: KArg1, k2: KArg2) -> #value
 					where
 						KArg1: #scrate::codec::EncodeLike<#key1>,
@@ -69,7 +71,7 @@ pub fn impl_getters(def: &DeclStorageDefExt) -> TokenStream {
 			StorageLineTypeDef::NMap(map) => {
 				let keygen = map.to_keygen_struct(&def.hidden_crate);
 				let value = &map.value;
-				quote!{
+				quote! {
 					pub fn #get_fn<KArg>(key: KArg) -> #value
 					where
 						KArg: #scrate::storage::types::EncodeLikeTuple<
@@ -80,7 +82,7 @@ pub fn impl_getters(def: &DeclStorageDefExt) -> TokenStream {
 						<#storage_struct as #scrate::#storage_trait>::get(key)
 					}
 				}
-			}
+			},
 		};
 		getters.extend(getter);
 	}
diff --git a/frame/support/procedural/src/storage/instance_trait.rs b/frame/support/procedural/src/storage/instance_trait.rs
index 55f6ef478054..4f55d3859666 100644
--- a/frame/support/procedural/src/storage/instance_trait.rs
+++ b/frame/support/procedural/src/storage/instance_trait.rs
@@ -18,10 +18,10 @@
 //! Implementation of the trait instance and the instance structures implementing it.
 //! (For not instantiable traits there is still the inherent instance implemented).
 
-use proc_macro2::{TokenStream, Span};
-use quote::quote;
 use super::DeclStorageDefExt;
 use crate::NUMBER_OF_INSTANCE;
+use proc_macro2::{Span, TokenStream};
+use quote::quote;
 
 pub(crate) const INHERENT_INSTANCE_NAME: &str = "__InherentHiddenInstance";
 
@@ -52,14 +52,12 @@ pub fn decl_and_impl(def: &DeclStorageDefExt) -> TokenStream {
 					index: i,
 				}
 			})
-			.chain(
-				module_instance.instance_default.as_ref().map(|ident| InstanceDef {
-					prefix: String::new(),
-					instance_struct: ident.clone(),
-					doc: quote!(#[doc=r"Default module instance"]),
-					index: 0,
-				})
-			);
+			.chain(module_instance.instance_default.as_ref().map(|ident| InstanceDef {
+				prefix: String::new(),
+				instance_struct: ident.clone(),
+				doc: quote!(#[doc=r"Default module instance"]),
+				index: 0,
+			}));
 
 		for instance_def in instance_defs {
 			impls.extend(create_and_impl_instance_struct(scrate, &instance_def, def));
@@ -70,8 +68,8 @@ pub fn decl_and_impl(def: &DeclStorageDefExt) -> TokenStream {
 	let inherent_instance = syn::Ident::new(INHERENT_INSTANCE_NAME, Span::call_site());
 
 	// Implementation of inherent instance.
-	if let Some(default_instance) = def.module_instance.as_ref()
-		.and_then(|i| i.instance_default.as_ref())
+	if let Some(default_instance) =
+		def.module_instance.as_ref().and_then(|i| i.instance_default.as_ref())
 	{
 		impls.extend(quote! {
 			/// Hidden instance generated to be internally used when module is used without
@@ -97,10 +95,7 @@ pub fn decl_and_impl(def: &DeclStorageDefExt) -> TokenStream {
 	impls
 }
 
-fn reexport_instance_trait(
-	scrate: &TokenStream,
-	def: &DeclStorageDefExt,
-) -> TokenStream {
+fn reexport_instance_trait(scrate: &TokenStream, def: &DeclStorageDefExt) -> TokenStream {
 	if let Some(i) = def.module_instance.as_ref() {
 		let instance_trait = &i.instance_trait;
 		quote!(
diff --git a/frame/support/procedural/src/storage/metadata.rs b/frame/support/procedural/src/storage/metadata.rs
index 8a42dd4308d1..ca7dd97c155f 100644
--- a/frame/support/procedural/src/storage/metadata.rs
+++ b/frame/support/procedural/src/storage/metadata.rs
@@ -17,17 +17,17 @@
 
 //! Implementation of `storage_metadata` on module structure, used by construct_runtime.
 
+use super::{DeclStorageDefExt, StorageLineDefExt, StorageLineTypeDef};
 use frame_support_procedural_tools::clean_type_string;
 use proc_macro2::TokenStream;
 use quote::quote;
-use super::{DeclStorageDefExt, StorageLineDefExt, StorageLineTypeDef};
 
 fn storage_line_metadata_type(scrate: &TokenStream, line: &StorageLineDefExt) -> TokenStream {
 	let value_type = &line.value_type;
 	let value_type = clean_type_string(&quote!( #value_type ).to_string());
 	match &line.storage_type {
 		StorageLineTypeDef::Simple(_) => {
-			quote!{
+			quote! {
 				#scrate::metadata::StorageEntryType::Plain(
 					#scrate::metadata::DecodeDifferent::Encode(#value_type),
 				)
@@ -37,7 +37,7 @@ fn storage_line_metadata_type(scrate: &TokenStream, line: &StorageLineDefExt) ->
 			let hasher = map.hasher.into_metadata();
 			let key = &map.key;
 			let key = clean_type_string(&quote!(#key).to_string());
-			quote!{
+			quote! {
 				#scrate::metadata::StorageEntryType::Map {
 					hasher: #scrate::metadata::#hasher,
 					key: #scrate::metadata::DecodeDifferent::Encode(#key),
@@ -53,7 +53,7 @@ fn storage_line_metadata_type(scrate: &TokenStream, line: &StorageLineDefExt) ->
 			let key1 = clean_type_string(&quote!(#key1).to_string());
 			let key2 = &map.key2;
 			let key2 = clean_type_string(&quote!(#key2).to_string());
-			quote!{
+			quote! {
 				#scrate::metadata::StorageEntryType::DoubleMap {
 					hasher: #scrate::metadata::#hasher1,
 					key1: #scrate::metadata::DecodeDifferent::Encode(#key1),
@@ -64,15 +64,17 @@ fn storage_line_metadata_type(scrate: &TokenStream, line: &StorageLineDefExt) ->
 			}
 		},
 		StorageLineTypeDef::NMap(map) => {
-			let keys = map.keys
+			let keys = map
+				.keys
 				.iter()
 				.map(|key| clean_type_string(&quote!(#key).to_string()))
 				.collect::<Vec<_>>();
-			let hashers = map.hashers
+			let hashers = map
+				.hashers
 				.iter()
 				.map(|hasher| hasher.to_storage_hasher_struct())
 				.collect::<Vec<_>>();
-			quote!{
+			quote! {
 				#scrate::metadata::StorageEntryType::NMap {
 					keys: #scrate::metadata::DecodeDifferent::Encode(&[
 						#( #keys, )*
@@ -83,7 +85,7 @@ fn storage_line_metadata_type(scrate: &TokenStream, line: &StorageLineDefExt) ->
 					value: #scrate::metadata::DecodeDifferent::Encode(#value_type),
 				}
 			}
-		}
+		},
 	}
 }
 
@@ -92,12 +94,17 @@ fn default_byte_getter(
 	line: &StorageLineDefExt,
 	def: &DeclStorageDefExt,
 ) -> (TokenStream, TokenStream) {
-	let default = line.default_value.as_ref().map(|d| quote!( #d ))
-		.unwrap_or_else(|| quote!( Default::default() ));
+	let default = line
+		.default_value
+		.as_ref()
+		.map(|d| quote!( #d ))
+		.unwrap_or_else(|| quote!(Default::default()));
 
 	let str_name = line.name.to_string();
-	let struct_name = syn::Ident::new(&("__GetByteStruct".to_string() + &str_name), line.name.span());
-	let cache_name = syn::Ident::new(&("__CACHE_GET_BYTE_STRUCT_".to_string() + &str_name), line.name.span());
+	let struct_name =
+		syn::Ident::new(&("__GetByteStruct".to_string() + &str_name), line.name.span());
+	let cache_name =
+		syn::Ident::new(&("__CACHE_GET_BYTE_STRUCT_".to_string() + &str_name), line.name.span());
 
 	let runtime_generic = &def.module_runtime_generic;
 	let runtime_trait = &def.module_runtime_trait;
@@ -177,10 +184,8 @@ pub fn impl_metadata(def: &DeclStorageDefExt) -> TokenStream {
 
 		let ty = storage_line_metadata_type(scrate, line);
 
-		let (
-			default_byte_getter_struct_def,
-			default_byte_getter_struct_instance,
-		) = default_byte_getter(scrate, line, def);
+		let (default_byte_getter_struct_def, default_byte_getter_struct_instance) =
+			default_byte_getter(scrate, line, def);
 
 		let mut docs = TokenStream::new();
 		for attr in line.attrs.iter().filter_map(|v| v.parse_meta().ok()) {
diff --git a/frame/support/procedural/src/storage/mod.rs b/frame/support/procedural/src/storage/mod.rs
index 570ef447a43c..27964d7012a2 100644
--- a/frame/support/procedural/src/storage/mod.rs
+++ b/frame/support/procedural/src/storage/mod.rs
@@ -17,22 +17,22 @@
 
 //! `decl_storage` input definition and expansion.
 
-mod storage_struct;
-mod storage_info;
-mod parse;
-mod store_trait;
+mod genesis_config;
 mod getters;
-mod metadata;
 mod instance_trait;
-mod genesis_config;
+mod metadata;
+mod parse;
 mod print_pallet_upgrade;
+mod storage_info;
+mod storage_struct;
+mod store_trait;
 
 pub(crate) use instance_trait::INHERENT_INSTANCE_NAME;
 
-use quote::quote;
 use frame_support_procedural_tools::{
-	generate_crate_access, generate_hidden_includes, syn_ext as ext
+	generate_crate_access, generate_hidden_includes, syn_ext as ext,
 };
+use quote::quote;
 
 /// All information contained in input of decl_storage
 pub struct DeclStorageDef {
@@ -115,34 +115,37 @@ pub struct DeclStorageDefExt {
 
 impl From<DeclStorageDef> for DeclStorageDefExt {
 	fn from(mut def: DeclStorageDef) -> Self {
-		let hidden_crate_name = def.hidden_crate.as_ref().map(|i| i.to_string())
+		let hidden_crate_name = def
+			.hidden_crate
+			.as_ref()
+			.map(|i| i.to_string())
 			.unwrap_or_else(|| "decl_storage".to_string());
 
 		let hidden_crate = generate_crate_access(&hidden_crate_name, "frame-support");
 		let hidden_imports = generate_hidden_includes(&hidden_crate_name, "frame-support");
 
 		let storage_lines = def.storage_lines.drain(..).collect::<Vec<_>>();
-		let storage_lines = storage_lines.into_iter()
+		let storage_lines = storage_lines
+			.into_iter()
 			.map(|line| StorageLineDefExt::from_def(line, &def, &hidden_crate))
 			.collect();
 
-		let (
-			optional_instance,
-			optional_instance_bound,
-			optional_instance_bound_optional_default,
-		) = if let Some(instance) = def.module_instance.as_ref() {
-			let instance_generic = &instance.instance_generic;
-			let instance_trait= &instance.instance_trait;
-			let optional_equal_instance_default = instance.instance_default.as_ref()
-				.map(|d| quote!( = #d ));
-			(
-				Some(quote!(#instance_generic)),
-				Some(quote!(#instance_generic: #instance_trait)),
-				Some(quote!(#instance_generic: #instance_trait #optional_equal_instance_default)),
-			)
-		} else {
-			(None, None, None)
-		};
+		let (optional_instance, optional_instance_bound, optional_instance_bound_optional_default) =
+			if let Some(instance) = def.module_instance.as_ref() {
+				let instance_generic = &instance.instance_generic;
+				let instance_trait = &instance.instance_trait;
+				let optional_equal_instance_default =
+					instance.instance_default.as_ref().map(|d| quote!( = #d ));
+				(
+					Some(quote!(#instance_generic)),
+					Some(quote!(#instance_generic: #instance_trait)),
+					Some(
+						quote!(#instance_generic: #instance_trait #optional_equal_instance_default),
+					),
+				)
+			} else {
+				(None, None, None)
+			};
 
 		let module_runtime_generic = &def.module_runtime_generic;
 		let module_runtime_trait = &def.module_runtime_trait;
@@ -255,22 +258,20 @@ impl StorageLineDefExt {
 		hidden_crate: &proc_macro2::TokenStream,
 	) -> Self {
 		let is_generic = match &storage_def.storage_type {
-			StorageLineTypeDef::Simple(value) => {
-				ext::type_contains_ident(&value, &def.module_runtime_generic)
-			},
-			StorageLineTypeDef::Map(map) => {
-				ext::type_contains_ident(&map.key, &def.module_runtime_generic)
-					|| ext::type_contains_ident(&map.value, &def.module_runtime_generic)
-			}
-			StorageLineTypeDef::DoubleMap(map) => {
-				ext::type_contains_ident(&map.key1, &def.module_runtime_generic)
-					|| ext::type_contains_ident(&map.key2, &def.module_runtime_generic)
-					|| ext::type_contains_ident(&map.value, &def.module_runtime_generic)
-			}
-			StorageLineTypeDef::NMap(map) => {
-				map.keys.iter().any(|key| ext::type_contains_ident(key, &def.module_runtime_generic))
-					|| ext::type_contains_ident(&map.value, &def.module_runtime_generic)
-			}
+			StorageLineTypeDef::Simple(value) =>
+				ext::type_contains_ident(&value, &def.module_runtime_generic),
+			StorageLineTypeDef::Map(map) =>
+				ext::type_contains_ident(&map.key, &def.module_runtime_generic) ||
+					ext::type_contains_ident(&map.value, &def.module_runtime_generic),
+			StorageLineTypeDef::DoubleMap(map) =>
+				ext::type_contains_ident(&map.key1, &def.module_runtime_generic) ||
+					ext::type_contains_ident(&map.key2, &def.module_runtime_generic) ||
+					ext::type_contains_ident(&map.value, &def.module_runtime_generic),
+			StorageLineTypeDef::NMap(map) =>
+				map.keys
+					.iter()
+					.any(|key| ext::type_contains_ident(key, &def.module_runtime_generic)) ||
+					ext::type_contains_ident(&map.value, &def.module_runtime_generic),
 		};
 
 		let query_type = match &storage_def.storage_type {
@@ -280,15 +281,13 @@ impl StorageLineDefExt {
 			StorageLineTypeDef::NMap(map) => map.value.clone(),
 		};
 		let is_option = ext::extract_type_option(&query_type).is_some();
-		let value_type = ext::extract_type_option(&query_type).unwrap_or_else(|| query_type.clone());
+		let value_type =
+			ext::extract_type_option(&query_type).unwrap_or_else(|| query_type.clone());
 
 		let module_runtime_generic = &def.module_runtime_generic;
 		let module_runtime_trait = &def.module_runtime_trait;
-		let optional_storage_runtime_comma = if is_generic {
-			Some(quote!( #module_runtime_generic, ))
-		} else {
-			None
-		};
+		let optional_storage_runtime_comma =
+			if is_generic { Some(quote!( #module_runtime_generic, )) } else { None };
 		let optional_storage_runtime_bound_comma = if is_generic {
 			Some(quote!( #module_runtime_generic: #module_runtime_trait, ))
 		} else {
@@ -304,11 +303,8 @@ impl StorageLineDefExt {
 			#storage_name<#optional_storage_runtime_comma #optional_instance_generic>
 		);
 
-		let optional_storage_where_clause = if is_generic {
-			def.where_clause.as_ref().map(|w| quote!( #w ))
-		} else {
-			None
-		};
+		let optional_storage_where_clause =
+			if is_generic { def.where_clause.as_ref().map(|w| quote!( #w )) } else { None };
 
 		let storage_trait_truncated = match &storage_def.storage_type {
 			StorageLineTypeDef::Simple(_) => {
@@ -326,13 +322,15 @@ impl StorageLineDefExt {
 			StorageLineTypeDef::NMap(map) => {
 				let keygen = map.to_keygen_struct(hidden_crate);
 				quote!( StorageNMap<#keygen, #value_type> )
-			}
+			},
 		};
 
 		let storage_trait = quote!( storage::#storage_trait_truncated );
 		let storage_generator_trait = quote!( storage::generator::#storage_trait_truncated );
 
-		let doc_attrs = storage_def.attrs.iter()
+		let doc_attrs = storage_def
+			.attrs
+			.iter()
 			.filter_map(|a| a.parse_meta().ok())
 			.filter(|m| m.path().is_ident("doc"))
 			.collect();
@@ -396,27 +394,28 @@ impl NMapDef {
 		if self.keys.len() == 1 {
 			let hasher = &self.hashers[0].to_storage_hasher_struct();
 			let key = &self.keys[0];
-			return quote!( #scrate::storage::types::Key<#scrate::#hasher, #key> );
+			return quote!( #scrate::storage::types::Key<#scrate::#hasher, #key> )
 		}
 
-		let key_hasher = self.keys.iter().zip(&self.hashers).map(|(key, hasher)| {
-			let hasher = hasher.to_storage_hasher_struct();
-			quote!( #scrate::storage::types::Key<#scrate::#hasher, #key> )
-		})
-		.collect::<Vec<_>>();
+		let key_hasher = self
+			.keys
+			.iter()
+			.zip(&self.hashers)
+			.map(|(key, hasher)| {
+				let hasher = hasher.to_storage_hasher_struct();
+				quote!( #scrate::storage::types::Key<#scrate::#hasher, #key> )
+			})
+			.collect::<Vec<_>>();
 		quote!(( #(#key_hasher,)* ))
 	}
 
 	fn to_key_tuple(&self) -> proc_macro2::TokenStream {
 		if self.keys.len() == 1 {
 			let key = &self.keys[0];
-			return quote!(#key);
+			return quote!(#key)
 		}
 
-		let tuple = self.keys.iter().map(|key| {
-			quote!(#key)
-		})
-		.collect::<Vec<_>>();
+		let tuple = self.keys.iter().map(|key| quote!(#key)).collect::<Vec<_>>();
 		quote!(( #(#tuple,)* ))
 	}
 }
@@ -442,25 +441,25 @@ pub enum HasherKind {
 impl HasherKind {
 	fn to_storage_hasher_struct(&self) -> proc_macro2::TokenStream {
 		match self {
-			HasherKind::Blake2_256 => quote!( Blake2_256 ),
-			HasherKind::Blake2_128 => quote!( Blake2_128 ),
-			HasherKind::Blake2_128Concat => quote!( Blake2_128Concat ),
-			HasherKind::Twox256 => quote!( Twox256 ),
-			HasherKind::Twox128 => quote!( Twox128 ),
-			HasherKind::Twox64Concat => quote!( Twox64Concat ),
-			HasherKind::Identity => quote!( Identity ),
+			HasherKind::Blake2_256 => quote!(Blake2_256),
+			HasherKind::Blake2_128 => quote!(Blake2_128),
+			HasherKind::Blake2_128Concat => quote!(Blake2_128Concat),
+			HasherKind::Twox256 => quote!(Twox256),
+			HasherKind::Twox128 => quote!(Twox128),
+			HasherKind::Twox64Concat => quote!(Twox64Concat),
+			HasherKind::Identity => quote!(Identity),
 		}
 	}
 
 	fn into_metadata(&self) -> proc_macro2::TokenStream {
 		match self {
-			HasherKind::Blake2_256 => quote!( StorageHasher::Blake2_256 ),
-			HasherKind::Blake2_128 => quote!( StorageHasher::Blake2_128 ),
-			HasherKind::Blake2_128Concat => quote!( StorageHasher::Blake2_128Concat ),
-			HasherKind::Twox256 => quote!( StorageHasher::Twox256 ),
-			HasherKind::Twox128 => quote!( StorageHasher::Twox128 ),
-			HasherKind::Twox64Concat => quote!( StorageHasher::Twox64Concat ),
-			HasherKind::Identity => quote!( StorageHasher::Identity ),
+			HasherKind::Blake2_256 => quote!(StorageHasher::Blake2_256),
+			HasherKind::Blake2_128 => quote!(StorageHasher::Blake2_128),
+			HasherKind::Blake2_128Concat => quote!(StorageHasher::Blake2_128Concat),
+			HasherKind::Twox256 => quote!(StorageHasher::Twox256),
+			HasherKind::Twox128 => quote!(StorageHasher::Twox128),
+			HasherKind::Twox64Concat => quote!(StorageHasher::Twox64Concat),
+			HasherKind::Identity => quote!(StorageHasher::Identity),
 		}
 	}
 }
@@ -502,5 +501,6 @@ pub fn decl_storage_impl(input: proc_macro::TokenStream) -> proc_macro::TokenStr
 		#genesis_config
 		#storage_struct
 		#storage_info
-	).into()
+	)
+	.into()
 }
diff --git a/frame/support/procedural/src/storage/parse.rs b/frame/support/procedural/src/storage/parse.rs
index ca97b7957c10..d3b73843da17 100644
--- a/frame/support/procedural/src/storage/parse.rs
+++ b/frame/support/procedural/src/storage/parse.rs
@@ -17,8 +17,8 @@
 
 //! Parsing of decl_storage input.
 
-use frame_support_procedural_tools::{ToTokens, Parse, syn_ext as ext};
-use syn::{Ident, Token, spanned::Spanned};
+use frame_support_procedural_tools::{syn_ext as ext, Parse, ToTokens};
+use syn::{spanned::Spanned, Ident, Token};
 
 mod keyword {
 	syn::custom_keyword!(generate_storage_info);
@@ -367,48 +367,35 @@ fn get_module_instance(
 			it is now defined at frame_support::traits::Instance. Expect `Instance` found `{}`",
 			instantiable.as_ref().unwrap(),
 		);
-		return Err(syn::Error::new(instantiable.span(), msg));
+		return Err(syn::Error::new(instantiable.span(), msg))
 	}
 
 	match (instance, instantiable, default_instance) {
-		(Some(instance), Some(instantiable), default_instance) => {
+		(Some(instance), Some(instantiable), default_instance) =>
 			Ok(Some(super::ModuleInstanceDef {
 				instance_generic: instance,
 				instance_trait: instantiable,
 				instance_default: default_instance,
-			}))
-		},
+			})),
 		(None, None, None) => Ok(None),
-		(Some(instance), None, _) => Err(
-			syn::Error::new(
-				instance.span(),
-				format!(
-					"Expect instantiable trait bound for instance: {}. {}",
-					instance,
-					right_syntax,
-				)
-			)
-		),
-		(None, Some(instantiable), _) => Err(
-			syn::Error::new(
-				instantiable.span(),
-				format!(
-					"Expect instance generic for bound instantiable: {}. {}",
-					instantiable,
-					right_syntax,
-				)
-			)
-		),
-		(None, _, Some(default_instance)) => Err(
-			syn::Error::new(
-				default_instance.span(),
-				format!(
-					"Expect instance generic for default instance: {}. {}",
-					default_instance,
-					right_syntax,
-				)
-			)
-		),
+		(Some(instance), None, _) => Err(syn::Error::new(
+			instance.span(),
+			format!("Expect instantiable trait bound for instance: {}. {}", instance, right_syntax,),
+		)),
+		(None, Some(instantiable), _) => Err(syn::Error::new(
+			instantiable.span(),
+			format!(
+				"Expect instance generic for bound instantiable: {}. {}",
+				instantiable, right_syntax,
+			),
+		)),
+		(None, _, Some(default_instance)) => Err(syn::Error::new(
+			default_instance.span(),
+			format!(
+				"Expect instance generic for default instance: {}. {}",
+				default_instance, right_syntax,
+			),
+		)),
 	}
 }
 
@@ -417,37 +404,37 @@ pub fn parse(input: syn::parse::ParseStream) -> syn::Result<super::DeclStorageDe
 
 	let def = StorageDefinition::parse(input)?;
 
-	let module_instance = get_module_instance(
-		def.mod_instance,
-		def.mod_instantiable,
-		def.mod_default_instance,
-	)?;
+	let module_instance =
+		get_module_instance(def.mod_instance, def.mod_instantiable, def.mod_default_instance)?;
 
 	let mut extra_genesis_config_lines = vec![];
 	let mut extra_genesis_build = None;
 
-	for line in def.extra_genesis.inner.into_iter()
+	for line in def
+		.extra_genesis
+		.inner
+		.into_iter()
 		.flat_map(|o| o.content.content.lines.inner.into_iter())
 	{
 		match line {
 			AddExtraGenesisLineEnum::AddExtraGenesisLine(def) => {
-				extra_genesis_config_lines.push(super::ExtraGenesisLineDef{
+				extra_genesis_config_lines.push(super::ExtraGenesisLineDef {
 					attrs: def.attrs.inner,
 					name: def.extra_field.content,
 					typ: def.extra_type,
 					default: def.default_value.inner.map(|o| o.expr),
 				});
-			}
+			},
 			AddExtraGenesisLineEnum::AddExtraGenesisBuild(def) => {
 				if extra_genesis_build.is_some() {
 					return Err(syn::Error::new(
 						def.span(),
-						"Only one build expression allowed for extra genesis"
+						"Only one build expression allowed for extra genesis",
 					))
 				}
 
 				extra_genesis_build = Some(def.expr.content);
-			}
+			},
 		}
 	}
 
@@ -496,68 +483,65 @@ fn parse_storage_line_defs(
 		};
 
 		if let Some(ref config) = config {
-			storage_lines.iter().filter_map(|sl| sl.config.as_ref()).try_for_each(|other_config| {
-				if other_config == config {
-					Err(syn::Error::new(
-						config.span(),
-						"`config()`/`get()` with the same name already defined.",
-					))
-				} else {
-					Ok(())
-				}
-			})?;
+			storage_lines.iter().filter_map(|sl| sl.config.as_ref()).try_for_each(
+				|other_config| {
+					if other_config == config {
+						Err(syn::Error::new(
+							config.span(),
+							"`config()`/`get()` with the same name already defined.",
+						))
+					} else {
+						Ok(())
+					}
+				},
+			)?;
 		}
 
 		let max_values = match &line.storage_type {
-			DeclStorageType::Map(_) | DeclStorageType::DoubleMap(_) | DeclStorageType::NMap(_) => {
-				line.max_values.inner.map(|i| i.expr.content)
-			},
-			DeclStorageType::Simple(_) => {
+			DeclStorageType::Map(_) | DeclStorageType::DoubleMap(_) | DeclStorageType::NMap(_) =>
+				line.max_values.inner.map(|i| i.expr.content),
+			DeclStorageType::Simple(_) =>
 				if let Some(max_values) = line.max_values.inner {
 					let msg = "unexpected max_values attribute for storage value.";
 					let span = max_values.max_values_keyword.span();
-					return Err(syn::Error::new(span, msg));
+					return Err(syn::Error::new(span, msg))
 				} else {
 					Some(syn::parse_quote!(1u32))
-				}
-			},
+				},
 		};
 
 		let span = line.storage_type.span();
-		let no_hasher_error = || syn::Error::new(
-			span,
-			"Default hasher has been removed, use explicit hasher(blake2_128_concat) instead."
-		);
+		let no_hasher_error = || {
+			syn::Error::new(
+				span,
+				"Default hasher has been removed, use explicit hasher(blake2_128_concat) instead.",
+			)
+		};
 
 		let storage_type = match line.storage_type {
-			DeclStorageType::Map(map) => super::StorageLineTypeDef::Map(
-				super::MapDef {
-					hasher: map.hasher.inner.ok_or_else(no_hasher_error)?.into(),
-					key: map.key,
-					value: map.value,
-				}
-			),
-			DeclStorageType::DoubleMap(map) => super::StorageLineTypeDef::DoubleMap(
-				Box::new(super::DoubleMapDef {
+			DeclStorageType::Map(map) => super::StorageLineTypeDef::Map(super::MapDef {
+				hasher: map.hasher.inner.ok_or_else(no_hasher_error)?.into(),
+				key: map.key,
+				value: map.value,
+			}),
+			DeclStorageType::DoubleMap(map) =>
+				super::StorageLineTypeDef::DoubleMap(Box::new(super::DoubleMapDef {
 					hasher1: map.hasher1.inner.ok_or_else(no_hasher_error)?.into(),
 					hasher2: map.hasher2.inner.ok_or_else(no_hasher_error)?.into(),
 					key1: map.key1,
 					key2: map.key2,
 					value: map.value,
-				})
-			),
-			DeclStorageType::NMap(map) => super::StorageLineTypeDef::NMap(
-				super::NMapDef {
-					hashers: map
-						.storage_keys
-						.inner
-						.iter()
-						.map(|pair| Ok(pair.hasher.inner.clone().ok_or_else(no_hasher_error)?.into()))
-						.collect::<Result<Vec<_>, syn::Error>>()?,
-					keys: map.storage_keys.inner.iter().map(|pair| pair.key.clone()).collect(),
-					value: map.value,
-				}
-			),
+				})),
+			DeclStorageType::NMap(map) => super::StorageLineTypeDef::NMap(super::NMapDef {
+				hashers: map
+					.storage_keys
+					.inner
+					.iter()
+					.map(|pair| Ok(pair.hasher.inner.clone().ok_or_else(no_hasher_error)?.into()))
+					.collect::<Result<Vec<_>, syn::Error>>()?,
+				keys: map.storage_keys.inner.iter().map(|pair| pair.key.clone()).collect(),
+				value: map.value,
+			}),
 			DeclStorageType::Simple(expr) => super::StorageLineTypeDef::Simple(expr),
 		};
 
diff --git a/frame/support/procedural/src/storage/print_pallet_upgrade.rs b/frame/support/procedural/src/storage/print_pallet_upgrade.rs
index a6f64a588b63..03f09a7edb48 100644
--- a/frame/support/procedural/src/storage/print_pallet_upgrade.rs
+++ b/frame/support/procedural/src/storage/print_pallet_upgrade.rs
@@ -1,6 +1,6 @@
 use super::StorageLineTypeDef;
-use quote::ToTokens;
 use frame_support_procedural_tools::clean_type_string;
+use quote::ToTokens;
 
 /// Environment variable that tells us to print pallet upgrade helper.
 const PRINT_PALLET_UPGRADE: &str = "PRINT_PALLET_UPGRADE";
@@ -10,7 +10,7 @@ fn check_print_pallet_upgrade() -> bool {
 }
 
 /// Convert visibilty as now objects are defined in a module.
-fn convert_vis(vis: &syn::Visibility) -> &'static str{
+fn convert_vis(vis: &syn::Visibility) -> &'static str {
 	match vis {
 		syn::Visibility::Inherited => "pub(super)",
 		syn::Visibility::Public(_) => "pub",
@@ -31,23 +31,13 @@ pub fn maybe_print_pallet_upgrade(def: &super::DeclStorageDefExt) {
 
 	let scrate = &quote::quote!(frame_support);
 
-	let config_gen = if def.optional_instance.is_some() {
-		"<I: 'static = ()>"
-	} else {
-		Default::default()
-	};
+	let config_gen =
+		if def.optional_instance.is_some() { "<I: 'static = ()>" } else { Default::default() };
 
-	let impl_gen = if def.optional_instance.is_some() {
-		"<T: Config<I>, I: 'static>"
-	} else {
-		"<T: Config>"
-	};
+	let impl_gen =
+		if def.optional_instance.is_some() { "<T: Config<I>, I: 'static>" } else { "<T: Config>" };
 
-	let decl_gen = if def.optional_instance.is_some() {
-		"<T, I=()>"
-	} else {
-		"<T>"
-	};
+	let decl_gen = if def.optional_instance.is_some() { "<T, I=()>" } else { "<T>" };
 
 	let full_decl_gen = if def.optional_instance.is_some() {
 		"<T: Config<I>, I: 'static = ()>"
@@ -55,17 +45,9 @@ pub fn maybe_print_pallet_upgrade(def: &super::DeclStorageDefExt) {
 		"<T: Config>"
 	};
 
-	let use_gen = if def.optional_instance.is_some() {
-		"<T, I>"
-	} else {
-		"<T>"
-	};
+	let use_gen = if def.optional_instance.is_some() { "<T, I>" } else { "<T>" };
 
-	let use_gen_tuple = if def.optional_instance.is_some() {
-		"<(T, I)>"
-	} else {
-		"<T>"
-	};
+	let use_gen_tuple = if def.optional_instance.is_some() { "<(T, I)>" } else { "<T>" };
 
 	let mut genesis_config = String::new();
 	let mut genesis_build = String::new();
@@ -80,17 +62,11 @@ pub fn maybe_print_pallet_upgrade(def: &super::DeclStorageDefExt) {
 			},
 		};
 
-		let genesis_config_impl_gen = if genesis_config_def.is_generic {
-			impl_gen
-		} else {
-			Default::default()
-		};
+		let genesis_config_impl_gen =
+			if genesis_config_def.is_generic { impl_gen } else { Default::default() };
 
-		let genesis_config_use_gen = if genesis_config_def.is_generic {
-			use_gen
-		} else {
-			Default::default()
-		};
+		let genesis_config_use_gen =
+			if genesis_config_def.is_generic { use_gen } else { Default::default() };
 
 		let genesis_config_decl_gen = if genesis_config_def.is_generic {
 			if def.optional_instance.is_some() {
@@ -105,26 +81,31 @@ pub fn maybe_print_pallet_upgrade(def: &super::DeclStorageDefExt) {
 		let mut genesis_config_decl_fields = String::new();
 		let mut genesis_config_default_fields = String::new();
 		for field in &genesis_config_def.fields {
-			genesis_config_decl_fields.push_str(&format!("
+			genesis_config_decl_fields.push_str(&format!(
+				"
 		{attrs}pub {name}: {typ},",
-				attrs = field.attrs.iter()
-					.fold(String::new(), |res, attr| {
-						format!("{}#[{}]
+				attrs = field.attrs.iter().fold(String::new(), |res, attr| {
+					format!(
+						"{}#[{}]
 		",
-						res, attr.to_token_stream())
-					}),
+						res,
+						attr.to_token_stream()
+					)
+				}),
 				name = field.name,
 				typ = to_cleaned_string(&field.typ),
 			));
 
-			genesis_config_default_fields.push_str(&format!("
+			genesis_config_default_fields.push_str(&format!(
+				"
 				{name}: {default},",
 				name = field.name,
 				default = to_cleaned_string(&field.default),
 			));
 		}
 
-		genesis_config = format!("
+		genesis_config = format!(
+			"
 	#[pallet::genesis_config]
 	pub struct GenesisConfig{genesis_config_decl_gen}
 		// TODO_MAYBE_WHERE_CLAUSE
@@ -147,16 +128,18 @@ pub fn maybe_print_pallet_upgrade(def: &super::DeclStorageDefExt) {
 			genesis_config_use_gen = genesis_config_use_gen,
 		);
 
-		let genesis_config_build = genesis_config_builder_def.blocks.iter()
-			.fold(String::new(), |res, block| {
-				format!("{}
+		let genesis_config_build =
+			genesis_config_builder_def.blocks.iter().fold(String::new(), |res, block| {
+				format!(
+					"{}
 					{}",
 					res,
 					to_cleaned_string(block),
 				)
 			});
 
-		genesis_build = format!("
+		genesis_build = format!(
+			"
 	#[pallet::genesis_build]
 	impl{impl_gen} GenesisBuild{use_gen} for GenesisConfig{genesis_config_use_gen}
 		// TODO_MAYBE_WHERE_CLAUSE
@@ -176,7 +159,8 @@ pub fn maybe_print_pallet_upgrade(def: &super::DeclStorageDefExt) {
 		let storage_vis = convert_vis(&line.visibility);
 
 		let getter = if let Some(getter) = &line.getter {
-			format!("
+			format!(
+				"
 	#[pallet::getter(fn {getter})]",
 				getter = getter
 			)
@@ -186,9 +170,12 @@ pub fn maybe_print_pallet_upgrade(def: &super::DeclStorageDefExt) {
 
 		let value_type = &line.value_type;
 
-		let default_value_type_value = line.default_value.as_ref()
+		let default_value_type_value = line
+			.default_value
+			.as_ref()
 			.map(|default_expr| {
-				format!("
+				format!(
+					"
 	#[pallet::type_value]
 	{storage_vis} fn DefaultFor{name} /* TODO_MAYBE_GENERICS */ () -> {value_type} {{
 		{default_expr}
@@ -212,13 +199,16 @@ pub fn maybe_print_pallet_upgrade(def: &super::DeclStorageDefExt) {
 			", ValueQuery"
 		};
 
-		let comma_default_value_getter_name = line.default_value.as_ref()
+		let comma_default_value_getter_name = line
+			.default_value
+			.as_ref()
 			.map(|_| format!(", DefaultFor{}", line.name))
 			.unwrap_or_else(String::new);
 
 		let typ = match &line.storage_type {
 			StorageLineTypeDef::Map(map) => {
-				format!("StorageMap<_, {hasher}, {key}, {value_type}{comma_query_kind}\
+				format!(
+					"StorageMap<_, {hasher}, {key}, {value_type}{comma_query_kind}\
 					{comma_default_value_getter_name}>",
 					hasher = &map.hasher.to_storage_hasher_struct(),
 					key = to_cleaned_string(&map.key),
@@ -228,7 +218,8 @@ pub fn maybe_print_pallet_upgrade(def: &super::DeclStorageDefExt) {
 				)
 			},
 			StorageLineTypeDef::DoubleMap(double_map) => {
-				format!("StorageDoubleMap<_, {hasher1}, {key1}, {hasher2}, {key2}, {value_type}\
+				format!(
+					"StorageDoubleMap<_, {hasher1}, {key1}, {hasher2}, {key2}, {value_type}\
 					{comma_query_kind}{comma_default_value_getter_name}>",
 					hasher1 = double_map.hasher1.to_storage_hasher_struct(),
 					key1 = to_cleaned_string(&double_map.key1),
@@ -240,16 +231,18 @@ pub fn maybe_print_pallet_upgrade(def: &super::DeclStorageDefExt) {
 				)
 			},
 			StorageLineTypeDef::NMap(map) => {
-				format!("StorageNMap<_, {keygen}, {value_type}{comma_query_kind}\
+				format!(
+					"StorageNMap<_, {keygen}, {value_type}{comma_query_kind}\
 					{comma_default_value_getter_name}>",
 					keygen = map.to_keygen_struct(&def.hidden_crate),
 					value_type = to_cleaned_string(&value_type),
 					comma_query_kind = comma_query_kind,
 					comma_default_value_getter_name = comma_default_value_getter_name,
 				)
-			}
+			},
 			StorageLineTypeDef::Simple(_) => {
-				format!("StorageValue<_, {value_type}{comma_query_kind}\
+				format!(
+					"StorageValue<_, {value_type}{comma_query_kind}\
 					{comma_default_value_getter_name}>",
 					value_type = to_cleaned_string(&value_type),
 					comma_query_kind = comma_query_kind,
@@ -265,7 +258,8 @@ pub fn maybe_print_pallet_upgrade(def: &super::DeclStorageDefExt) {
 			""
 		};
 
-		storages.push_str(&format!("
+		storages.push_str(&format!(
+			"
 {default_value_type_value}{doc}
 	#[pallet::storage]{getter}
 	{storage_vis} type {name}{full_decl_gen} = {typ};{additional_comment}",
@@ -276,21 +270,21 @@ pub fn maybe_print_pallet_upgrade(def: &super::DeclStorageDefExt) {
 			full_decl_gen = full_decl_gen,
 			typ = typ,
 			additional_comment = additional_comment,
-			doc = line.doc_attrs.iter()
-				.fold(String::new(), |mut res, attr| {
-					if let syn::Meta::NameValue(name_value) = attr {
-						if name_value.path.is_ident("doc") {
-							if let syn::Lit::Str(string) = &name_value.lit {
-								res = format!("{}
+			doc = line.doc_attrs.iter().fold(String::new(), |mut res, attr| {
+				if let syn::Meta::NameValue(name_value) = attr {
+					if name_value.path.is_ident("doc") {
+						if let syn::Lit::Str(string) = &name_value.lit {
+							res = format!(
+								"{}
 	///{}",
-									res,
-									string.value(),
-								);
-							}
+								res,
+								string.value(),
+							);
 						}
 					}
-					res
-				}),
+				}
+				res
+			}),
 		));
 	}
 
@@ -308,7 +302,8 @@ pub fn maybe_print_pallet_upgrade(def: &super::DeclStorageDefExt) {
 		""
 	};
 
-	println!("
+	println!(
+		"
 // Template for pallet upgrade for {pallet_name}
 
 pub use pallet::*;
diff --git a/frame/support/procedural/src/storage/storage_info.rs b/frame/support/procedural/src/storage/storage_info.rs
index c7707f6cb724..844896409f85 100644
--- a/frame/support/procedural/src/storage/storage_info.rs
+++ b/frame/support/procedural/src/storage/storage_info.rs
@@ -17,9 +17,9 @@
 
 //! Implementation of trait `StorageInfoTrait` on module structure.
 
+use super::DeclStorageDefExt;
 use proc_macro2::TokenStream;
 use quote::quote;
-use super::DeclStorageDefExt;
 
 pub fn impl_storage_info(def: &DeclStorageDefExt) -> TokenStream {
 	let scrate = &def.hidden_crate;
diff --git a/frame/support/procedural/src/storage/storage_struct.rs b/frame/support/procedural/src/storage/storage_struct.rs
index 3b182983cd4e..b318225681c1 100644
--- a/frame/support/procedural/src/storage/storage_struct.rs
+++ b/frame/support/procedural/src/storage/storage_struct.rs
@@ -17,16 +17,15 @@
 
 //! Implementation of storage structures and implementation of storage traits on them.
 
-use proc_macro2::{TokenStream, Ident, Span};
+use super::{instance_trait::INHERENT_INSTANCE_NAME, DeclStorageDefExt, StorageLineTypeDef};
+use proc_macro2::{Ident, Span, TokenStream};
 use quote::quote;
-use super::{
-	DeclStorageDefExt, StorageLineTypeDef,
-	instance_trait::INHERENT_INSTANCE_NAME,
-};
 
 fn from_optional_value_to_query(is_option: bool, default: &Option<syn::Expr>) -> TokenStream {
-	let default = default.as_ref().map(|d| quote!( #d ))
-		.unwrap_or_else(|| quote!( Default::default() ));
+	let default = default
+		.as_ref()
+		.map(|d| quote!( #d ))
+		.unwrap_or_else(|| quote!(Default::default()));
 
 	if !is_option {
 		// raw type case
@@ -40,10 +39,10 @@ fn from_optional_value_to_query(is_option: bool, default: &Option<syn::Expr>) ->
 fn from_query_to_optional_value(is_option: bool) -> TokenStream {
 	if !is_option {
 		// raw type case
-		quote!( Some(v) )
+		quote!(Some(v))
 	} else {
 		// Option<> type case
-		quote!( v )
+		quote!(v)
 	}
 }
 
@@ -52,7 +51,6 @@ pub fn decl_and_impl(def: &DeclStorageDefExt) -> TokenStream {
 	let mut impls = TokenStream::new();
 
 	for line in &def.storage_lines {
-
 		// Propagate doc attributes.
 		let attrs = &line.doc_attrs;
 
@@ -60,7 +58,8 @@ pub fn decl_and_impl(def: &DeclStorageDefExt) -> TokenStream {
 		let optional_storage_runtime_comma = &line.optional_storage_runtime_comma;
 		let optional_storage_runtime_bound_comma = &line.optional_storage_runtime_bound_comma;
 		let optional_storage_where_clause = &line.optional_storage_where_clause;
-		let optional_instance_bound_optional_default = &def.optional_instance_bound_optional_default;
+		let optional_instance_bound_optional_default =
+			&def.optional_instance_bound_optional_default;
 		let optional_instance_bound = &def.optional_instance_bound;
 		let optional_instance = &def.optional_instance;
 		let name = &line.name;
@@ -87,10 +86,8 @@ pub fn decl_and_impl(def: &DeclStorageDefExt) -> TokenStream {
 			Ident::new(INHERENT_INSTANCE_NAME, Span::call_site())
 		};
 
-		let storage_name_bstr = syn::LitByteStr::new(
-			line.name.to_string().as_ref(),
-			line.name.span()
-		);
+		let storage_name_bstr =
+			syn::LitByteStr::new(line.name.to_string().as_ref(), line.name.span());
 
 		let storage_generator_trait = &line.storage_generator_trait;
 		let storage_struct = &line.storage_struct;
@@ -242,7 +239,7 @@ pub fn decl_and_impl(def: &DeclStorageDefExt) -> TokenStream {
 						}
 					}
 				)
-			}
+			},
 		};
 
 		let max_values = if let Some(max_values) = &line.max_values {
diff --git a/frame/support/procedural/src/storage/store_trait.rs b/frame/support/procedural/src/storage/store_trait.rs
index 18adadbc6105..7dde92cf9a75 100644
--- a/frame/support/procedural/src/storage/store_trait.rs
+++ b/frame/support/procedural/src/storage/store_trait.rs
@@ -17,26 +17,26 @@
 
 //! Declaration of store trait and implementation on module structure.
 
+use super::DeclStorageDefExt;
 use proc_macro2::TokenStream;
 use quote::quote;
-use super::DeclStorageDefExt;
 
 pub fn decl_and_impl(def: &DeclStorageDefExt) -> TokenStream {
-	let decl_store_items = def.storage_lines.iter()
-		.map(|sline| &sline.name)
-		.fold(TokenStream::new(), |mut items, name| {
+	let decl_store_items = def.storage_lines.iter().map(|sline| &sline.name).fold(
+		TokenStream::new(),
+		|mut items, name| {
 			items.extend(quote!(type #name;));
 			items
-		});
+		},
+	);
 
-	let impl_store_items = def.storage_lines.iter()
-		.fold(TokenStream::new(), |mut items, line| {
-			let name = &line.name;
-			let storage_struct = &line.storage_struct;
+	let impl_store_items = def.storage_lines.iter().fold(TokenStream::new(), |mut items, line| {
+		let name = &line.name;
+		let storage_struct = &line.storage_struct;
 
-			items.extend(quote!(type #name = #storage_struct;));
-			items
-		});
+		items.extend(quote!(type #name = #storage_struct;));
+		items
+	});
 
 	let visibility = &def.visibility;
 	let store_trait = &def.store_trait;
diff --git a/frame/support/procedural/src/transactional.rs b/frame/support/procedural/src/transactional.rs
index 6ef26834cf02..403f1cd02bac 100644
--- a/frame/support/procedural/src/transactional.rs
+++ b/frame/support/procedural/src/transactional.rs
@@ -15,10 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use frame_support_procedural_tools::generate_crate_access_2018;
 use proc_macro::TokenStream;
 use quote::quote;
 use syn::{ItemFn, Result};
-use frame_support_procedural_tools::generate_crate_access_2018;
 
 pub fn transactional(_attr: TokenStream, input: TokenStream) -> Result<TokenStream> {
 	let ItemFn { attrs, vis, sig, block } = syn::parse(input)?;
diff --git a/frame/support/procedural/tools/derive/src/lib.rs b/frame/support/procedural/tools/derive/src/lib.rs
index 15394e0c559d..792210589560 100644
--- a/frame/support/procedural/tools/derive/src/lib.rs
+++ b/frame/support/procedural/tools/derive/src/lib.rs
@@ -23,14 +23,14 @@
 
 use proc_macro::TokenStream;
 use proc_macro2::Span;
-use syn::parse_macro_input;
 use quote::quote;
+use syn::parse_macro_input;
 
 pub(crate) fn fields_idents(
 	fields: impl Iterator<Item = syn::Field>,
 ) -> impl Iterator<Item = proc_macro2::TokenStream> {
 	fields.enumerate().map(|(ix, field)| {
-		field.ident.map(|i| quote!{#i}).unwrap_or_else(|| {
+		field.ident.map(|i| quote! {#i}).unwrap_or_else(|| {
 			let f_ix: syn::Ident = syn::Ident::new(&format!("f_{}", ix), Span::call_site());
 			quote!( #f_ix )
 		})
@@ -42,10 +42,7 @@ pub(crate) fn fields_access(
 ) -> impl Iterator<Item = proc_macro2::TokenStream> {
 	fields.enumerate().map(|(ix, field)| {
 		field.ident.map(|i| quote!( #i )).unwrap_or_else(|| {
-			let f_ix: syn::Index = syn::Index {
-				index: ix as u32,
-				span: Span::call_site(),
-			};
+			let f_ix: syn::Index = syn::Index { index: ix as u32, span: Span::call_site() };
 			quote!( #f_ix )
 		})
 	})
@@ -64,15 +61,10 @@ pub fn derive_parse(input: TokenStream) -> TokenStream {
 }
 
 fn derive_parse_struct(input: syn::ItemStruct) -> TokenStream {
-	let syn::ItemStruct {
-		ident,
-		generics,
-		fields,
-		..
-	} = input;
+	let syn::ItemStruct { ident, generics, fields, .. } = input;
 	let field_names = {
 		let name = fields_idents(fields.iter().map(Clone::clone));
-		quote!{
+		quote! {
 			#(
 				#name,
 			)*
@@ -110,12 +102,7 @@ pub fn derive_totokens(input: TokenStream) -> TokenStream {
 }
 
 fn derive_totokens_struct(input: syn::ItemStruct) -> TokenStream {
- let syn::ItemStruct {
-		ident,
-		generics,
-		fields,
-		..
-	} = input;
+	let syn::ItemStruct { ident, generics, fields, .. } = input;
 
 	let fields = fields_access(fields.iter().map(Clone::clone));
 	let tokens = quote! {
@@ -133,12 +120,7 @@ fn derive_totokens_struct(input: syn::ItemStruct) -> TokenStream {
 }
 
 fn derive_totokens_enum(input: syn::ItemEnum) -> TokenStream {
-	let syn::ItemEnum {
-		ident,
-		generics,
-		variants,
-		..
-	} = input;
+	let syn::ItemEnum { ident, generics, variants, .. } = input;
 	let variants = variants.iter().map(|v| {
 		let v_ident = v.ident.clone();
 		let fields_build = if v.fields.iter().count() > 0 {
diff --git a/frame/support/procedural/tools/src/lib.rs b/frame/support/procedural/tools/src/lib.rs
index 64f21d66391c..19242db4594c 100644
--- a/frame/support/procedural/tools/src/lib.rs
+++ b/frame/support/procedural/tools/src/lib.rs
@@ -23,13 +23,13 @@
 pub use frame_support_procedural_tools_derive::*;
 
 use proc_macro_crate::{crate_name, FoundCrate};
-use syn::parse::Error;
 use quote::quote;
+use syn::parse::Error;
 
 pub mod syn_ext;
 
 // FIXME #1569, remove the following functions, which are copied from sp-api-macros
-use proc_macro2::{TokenStream, Span};
+use proc_macro2::{Span, TokenStream};
 use syn::Ident;
 
 fn generate_hidden_includes_mod_name(unique_id: &str) -> Ident {
@@ -39,7 +39,7 @@ fn generate_hidden_includes_mod_name(unique_id: &str) -> Ident {
 /// Generates the access to the `frame-support` crate.
 pub fn generate_crate_access(unique_id: &str, def_crate: &str) -> TokenStream {
 	if std::env::var("CARGO_PKG_NAME").unwrap() == def_crate {
-		quote::quote!( frame_support )
+		quote::quote!(frame_support)
 	} else {
 		let mod_name = generate_hidden_includes_mod_name(unique_id);
 		quote::quote!( self::#mod_name::hidden_include )
@@ -55,12 +55,8 @@ pub fn generate_crate_access_2018(def_crate: &str) -> Result<syn::Ident, Error>
 			let name = def_crate.to_string().replace("-", "_");
 			Ok(syn::Ident::new(&name, Span::call_site()))
 		},
-		Ok(FoundCrate::Name(name)) => {
-			Ok(Ident::new(&name, Span::call_site()))
-		},
-		Err(e) => {
-			Err(Error::new(Span::call_site(), e))
-		}
+		Ok(FoundCrate::Name(name)) => Ok(Ident::new(&name, Span::call_site())),
+		Err(e) => Err(Error::new(Span::call_site(), e)),
 	}
 }
 
@@ -82,7 +78,7 @@ pub fn generate_hidden_includes(unique_id: &str, def_crate: &str) -> TokenStream
 		Err(e) => {
 			let err = Error::new(Span::call_site(), e).to_compile_error();
 			quote!( #err )
-		}
+		},
 	}
 }
 
diff --git a/frame/support/procedural/tools/src/syn_ext.rs b/frame/support/procedural/tools/src/syn_ext.rs
index 36bd03fed1be..a9e9ef573985 100644
--- a/frame/support/procedural/tools/src/syn_ext.rs
+++ b/frame/support/procedural/tools/src/syn_ext.rs
@@ -19,11 +19,15 @@
 //! Extension to syn types, mainly for parsing
 // end::description[]
 
-use syn::{visit::{Visit, self}, parse::{Parse, ParseStream, Result}, Ident};
+use frame_support_procedural_tools_derive::{Parse, ToTokens};
 use proc_macro2::{TokenStream, TokenTree};
 use quote::ToTokens;
 use std::iter::once;
-use frame_support_procedural_tools_derive::{ToTokens, Parse};
+use syn::{
+	parse::{Parse, ParseStream, Result},
+	visit::{self, Visit},
+	Ident,
+};
 
 /// stop parsing here getting remaining token as content
 /// Warn duplicate stream (part of)
@@ -35,7 +39,6 @@ pub struct StopParse {
 // inner macro really dependant on syn naming convention, do not export
 macro_rules! groups_impl {
 	($name:ident, $tok:ident, $deli:ident, $parse:ident) => {
-
 		#[derive(Debug)]
 		pub struct $name<P> {
 			pub token: syn::token::$tok,
@@ -46,7 +49,7 @@ macro_rules! groups_impl {
 			fn parse(input: ParseStream) -> Result<Self> {
 				let syn::group::$name { token, content } = syn::group::$parse(input)?;
 				let content = content.parse()?;
-				Ok($name { token, content, })
+				Ok($name { token, content })
 			}
 		}
 
@@ -60,12 +63,12 @@ macro_rules! groups_impl {
 			}
 		}
 
-		impl <P: Clone> Clone for $name<P> {
+		impl<P: Clone> Clone for $name<P> {
 			fn clone(&self) -> Self {
 				Self { token: self.token.clone(), content: self.content.clone() }
 			}
 		}
-	}
+	};
 }
 
 groups_impl!(Braces, Brace, Brace, parse_braces);
@@ -73,23 +76,22 @@ groups_impl!(Brackets, Bracket, Bracket, parse_brackets);
 groups_impl!(Parens, Paren, Parenthesis, parse_parens);
 
 #[derive(Debug)]
-pub struct PunctuatedInner<P,T,V> {
-	pub inner: syn::punctuated::Punctuated<P,T>,
+pub struct PunctuatedInner<P, T, V> {
+	pub inner: syn::punctuated::Punctuated<P, T>,
 	pub variant: V,
 }
 
 #[derive(Debug, Clone)]
 pub struct NoTrailing;
 
-
 #[derive(Debug, Clone)]
 pub struct Trailing;
 
-pub type Punctuated<P,T> = PunctuatedInner<P,T,NoTrailing>;
+pub type Punctuated<P, T> = PunctuatedInner<P, T, NoTrailing>;
 
-pub type PunctuatedTrailing<P,T> = PunctuatedInner<P,T,Trailing>;
+pub type PunctuatedTrailing<P, T> = PunctuatedInner<P, T, Trailing>;
 
-impl<P: Parse, T: Parse + syn::token::Token> Parse for PunctuatedInner<P,T,Trailing> {
+impl<P: Parse, T: Parse + syn::token::Token> Parse for PunctuatedInner<P, T, Trailing> {
 	fn parse(input: ParseStream) -> Result<Self> {
 		Ok(PunctuatedInner {
 			inner: syn::punctuated::Punctuated::parse_separated_nonempty(input)?,
@@ -98,7 +100,7 @@ impl<P: Parse, T: Parse + syn::token::Token> Parse for PunctuatedInner<P,T,Trail
 	}
 }
 
-impl<P: Parse, T: Parse> Parse for PunctuatedInner<P,T,NoTrailing> {
+impl<P: Parse, T: Parse> Parse for PunctuatedInner<P, T, NoTrailing> {
 	fn parse(input: ParseStream) -> Result<Self> {
 		Ok(PunctuatedInner {
 			inner: syn::punctuated::Punctuated::parse_terminated(input)?,
@@ -107,13 +109,13 @@ impl<P: Parse, T: Parse> Parse for PunctuatedInner<P,T,NoTrailing> {
 	}
 }
 
-impl<P: ToTokens, T: ToTokens, V> ToTokens for PunctuatedInner<P,T,V> {
+impl<P: ToTokens, T: ToTokens, V> ToTokens for PunctuatedInner<P, T, V> {
 	fn to_tokens(&self, tokens: &mut TokenStream) {
 		self.inner.to_tokens(tokens)
 	}
 }
 
-impl <P: Clone, T: Clone, V: Clone> Clone for PunctuatedInner<P, T, V> {
+impl<P: Clone, T: Clone, V: Clone> Clone for PunctuatedInner<P, T, V> {
 	fn clone(&self) -> Self {
 		Self { inner: self.inner.clone(), variant: self.variant.clone() }
 	}
@@ -127,9 +129,7 @@ pub struct Meta {
 
 impl Parse for Meta {
 	fn parse(input: ParseStream) -> Result<Self> {
-		Ok(Meta {
-			inner: syn::Meta::parse(input)?,
-		})
+		Ok(Meta { inner: syn::Meta::parse(input)? })
 	}
 }
 
@@ -151,9 +151,7 @@ pub struct OuterAttributes {
 impl Parse for OuterAttributes {
 	fn parse(input: ParseStream) -> Result<Self> {
 		let inner = syn::Attribute::parse_outer(input)?;
-		Ok(OuterAttributes {
-			inner,
-		})
+		Ok(OuterAttributes { inner })
 	}
 }
 
@@ -189,13 +187,11 @@ struct ContainsIdent<'a> {
 
 impl<'ast> ContainsIdent<'ast> {
 	fn visit_tokenstream(&mut self, stream: TokenStream) {
-		stream.into_iter().for_each(|tt|
-			match tt {
-				TokenTree::Ident(id) => self.visit_ident(&id),
-				TokenTree::Group(ref group) => self.visit_tokenstream(group.stream()),
-				_ => {}
-			}
-		)
+		stream.into_iter().for_each(|tt| match tt {
+			TokenTree::Ident(id) => self.visit_ident(&id),
+			TokenTree::Group(ref group) => self.visit_tokenstream(group.stream()),
+			_ => {},
+		})
 	}
 
 	fn visit_ident(&mut self, ident: &Ident) {
@@ -218,10 +214,7 @@ impl<'ast> Visit<'ast> for ContainsIdent<'ast> {
 
 /// Check if a `Type` contains the given `Ident`.
 pub fn type_contains_ident(typ: &syn::Type, ident: &Ident) -> bool {
-	let mut visit = ContainsIdent {
-		result: false,
-		ident,
-	};
+	let mut visit = ContainsIdent { result: false, ident };
 
 	visit::visit_type(&mut visit, typ);
 	visit.result
@@ -229,10 +222,7 @@ pub fn type_contains_ident(typ: &syn::Type, ident: &Ident) -> bool {
 
 /// Check if a `Expr` contains the given `Ident`.
 pub fn expr_contains_ident(expr: &syn::Expr, ident: &Ident) -> bool {
-	let mut visit = ContainsIdent {
-		result: false,
-		ident,
-	};
+	let mut visit = ContainsIdent { result: false, ident };
 
 	visit::visit_expr(&mut visit, expr);
 	visit.result
diff --git a/frame/support/src/dispatch.rs b/frame/support/src/dispatch.rs
index 12c1161a6a6c..d962f6e00d70 100644
--- a/frame/support/src/dispatch.rs
+++ b/frame/support/src/dispatch.rs
@@ -18,20 +18,26 @@
 //! Dispatch system. Contains a macro for defining runtime modules and
 //! generating values representing lazy module function calls.
 
-pub use crate::sp_std::{result, fmt, prelude::{Vec, Clone, Eq, PartialEq}, marker};
-pub use crate::codec::{Codec, EncodeLike, Decode, Encode, Input, Output, HasCompact, EncodeAsRef};
-pub use frame_metadata::{
-	FunctionMetadata, DecodeDifferent, DecodeDifferentArray, FunctionArgumentMetadata,
-	ModuleConstantMetadata, DefaultByte, DefaultByteGetter, ModuleErrorMetadata, ErrorMetadata
+pub use crate::{
+	codec::{Codec, Decode, Encode, EncodeAsRef, EncodeLike, HasCompact, Input, Output},
+	sp_std::{
+		fmt, marker,
+		prelude::{Clone, Eq, PartialEq, Vec},
+		result,
+	},
+	traits::{
+		CallMetadata, GetCallMetadata, GetCallName, GetPalletVersion, UnfilteredDispatchable,
+	},
+	weights::{
+		ClassifyDispatch, DispatchInfo, GetDispatchInfo, PaysFee, PostDispatchInfo,
+		TransactionPriority, WeighData, Weight, WithPostDispatchInfo,
+	},
 };
-pub use crate::weights::{
-	GetDispatchInfo, DispatchInfo, WeighData, ClassifyDispatch, TransactionPriority, Weight,
-	PaysFee, PostDispatchInfo, WithPostDispatchInfo,
+pub use frame_metadata::{
+	DecodeDifferent, DecodeDifferentArray, DefaultByte, DefaultByteGetter, ErrorMetadata,
+	FunctionArgumentMetadata, FunctionMetadata, ModuleConstantMetadata, ModuleErrorMetadata,
 };
 pub use sp_runtime::{traits::Dispatchable, DispatchError};
-pub use crate::traits::{
-	CallMetadata, GetCallMetadata, GetCallName, UnfilteredDispatchable, GetPalletVersion,
-};
 
 /// The return typ of a `Dispatchable` in frame. When returned explicitly from
 /// a dispatchable function it allows overriding the default `PostDispatchInfo`
@@ -2331,7 +2337,6 @@ macro_rules! __call_to_functions {
 	};
 }
 
-
 /// Convert a list of functions into a list of `FunctionMetadata` items.
 #[macro_export]
 #[doc(hidden)]
@@ -2465,13 +2470,19 @@ macro_rules! __check_reserved_fn_name {
 #[allow(dead_code)]
 mod tests {
 	use super::*;
-	use crate::weights::{DispatchInfo, DispatchClass, Pays, RuntimeDbWeight};
-	use crate::traits::{
-		GetCallName, OnInitialize, OnFinalize, OnIdle, OnRuntimeUpgrade,
-		IntegrityTest, Get, PalletInfo,
+	use crate::{
+		traits::{
+			Get, GetCallName, IntegrityTest, OnFinalize, OnIdle, OnInitialize, OnRuntimeUpgrade,
+			PalletInfo,
+		},
+		weights::{DispatchClass, DispatchInfo, Pays, RuntimeDbWeight},
 	};
 
-	pub trait Config: system::Config + Sized where Self::AccountId: From<u32> { }
+	pub trait Config: system::Config + Sized
+	where
+		Self::AccountId: From<u32>,
+	{
+	}
 
 	pub mod system {
 		use super::*;
@@ -2546,18 +2557,14 @@ mod tests {
 		FunctionMetadata {
 			name: DecodeDifferent::Encode("aux_0"),
 			arguments: DecodeDifferent::Encode(&[]),
-			documentation: DecodeDifferent::Encode(&[
-				" Hi, this is a comment."
-			])
+			documentation: DecodeDifferent::Encode(&[" Hi, this is a comment."]),
 		},
 		FunctionMetadata {
 			name: DecodeDifferent::Encode("aux_1"),
-			arguments: DecodeDifferent::Encode(&[
-				FunctionArgumentMetadata {
-					name: DecodeDifferent::Encode("_data"),
-					ty: DecodeDifferent::Encode("Compact<u32>")
-				}
-			]),
+			arguments: DecodeDifferent::Encode(&[FunctionArgumentMetadata {
+				name: DecodeDifferent::Encode("_data"),
+				ty: DecodeDifferent::Encode("Compact<u32>"),
+			}]),
 			documentation: DecodeDifferent::Encode(&[]),
 		},
 		FunctionMetadata {
@@ -2570,7 +2577,7 @@ mod tests {
 				FunctionArgumentMetadata {
 					name: DecodeDifferent::Encode("_data2"),
 					ty: DecodeDifferent::Encode("String"),
-				}
+				},
 			]),
 			documentation: DecodeDifferent::Encode(&[]),
 		},
@@ -2581,12 +2588,10 @@ mod tests {
 		},
 		FunctionMetadata {
 			name: DecodeDifferent::Encode("aux_4"),
-			arguments: DecodeDifferent::Encode(&[
-				FunctionArgumentMetadata {
-					name: DecodeDifferent::Encode("_data"),
-					ty: DecodeDifferent::Encode("i32"),
-				}
-			]),
+			arguments: DecodeDifferent::Encode(&[FunctionArgumentMetadata {
+				name: DecodeDifferent::Encode("_data"),
+				ty: DecodeDifferent::Encode("i32"),
+			}]),
 			documentation: DecodeDifferent::Encode(&[]),
 		},
 		FunctionMetadata {
@@ -2598,8 +2603,8 @@ mod tests {
 				},
 				FunctionArgumentMetadata {
 					name: DecodeDifferent::Encode("_data2"),
-					ty: DecodeDifferent::Encode("Compact<u32>")
-				}
+					ty: DecodeDifferent::Encode("Compact<u32>"),
+				},
 			]),
 			documentation: DecodeDifferent::Encode(&[]),
 		},
@@ -2611,7 +2616,7 @@ mod tests {
 	];
 
 	pub struct TraitImpl {}
-	impl Config for TraitImpl { }
+	impl Config for TraitImpl {}
 
 	type Test = Module<TraitImpl>;
 
@@ -2679,7 +2684,6 @@ mod tests {
 		}
 	}
 
-
 	impl system::Config for TraitImpl {
 		type Origin = OuterOrigin;
 		type AccountId = u32;
@@ -2760,9 +2764,9 @@ mod tests {
 
 	#[test]
 	fn on_runtime_upgrade_should_work() {
-		sp_io::TestExternalities::default().execute_with(||
+		sp_io::TestExternalities::default().execute_with(|| {
 			assert_eq!(<Module<TraitImpl> as OnRuntimeUpgrade>::on_runtime_upgrade(), 10)
-		);
+		});
 	}
 
 	#[test]
@@ -2788,7 +2792,10 @@ mod tests {
 	#[test]
 	fn get_call_names() {
 		let call_names = Call::<TraitImpl>::get_call_names();
-		assert_eq!(["aux_0", "aux_1", "aux_2", "aux_3", "aux_4", "aux_5", "operational"], call_names);
+		assert_eq!(
+			["aux_0", "aux_1", "aux_2", "aux_3", "aux_4", "aux_5", "operational"],
+			call_names
+		);
 	}
 
 	#[test]
diff --git a/frame/support/src/error.rs b/frame/support/src/error.rs
index 508de49e949c..f0c6ba0f3b1c 100644
--- a/frame/support/src/error.rs
+++ b/frame/support/src/error.rs
@@ -18,9 +18,9 @@
 //! Macro for declaring a module error.
 
 #[doc(hidden)]
-pub use sp_runtime::traits::{LookupError, BadOrigin};
+pub use frame_metadata::{DecodeDifferent, ErrorMetadata, ModuleErrorMetadata};
 #[doc(hidden)]
-pub use frame_metadata::{ModuleErrorMetadata, ErrorMetadata, DecodeDifferent};
+pub use sp_runtime::traits::{BadOrigin, LookupError};
 
 /// Declare an error type for a runtime module.
 ///
diff --git a/frame/support/src/event.rs b/frame/support/src/event.rs
index a1e5609e67ef..6e0d4ba6b47b 100644
--- a/frame/support/src/event.rs
+++ b/frame/support/src/event.rs
@@ -21,7 +21,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
-pub use frame_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, FnEncode};
+pub use frame_metadata::{DecodeDifferent, EventMetadata, FnEncode, OuterEventMetadata};
 
 /// Implement the `Event` for a module.
 ///
@@ -35,7 +35,7 @@ pub use frame_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, FnE
 ///    }
 /// );
 ///
-///# fn main() {}
+/// # fn main() {}
 /// ```
 ///
 /// # Generic Event Example:
@@ -75,7 +75,7 @@ pub use frame_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, FnE
 ///     );
 /// }
 ///
-///# fn main() {}
+/// # fn main() {}
 /// ```
 ///
 /// The syntax for generic events requires the `where`.
@@ -83,9 +83,9 @@ pub use frame_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, FnE
 /// # Generic Event with Instance Example:
 ///
 /// ```rust
-///# struct DefaultInstance;
-///# trait Instance {}
-///# impl Instance for DefaultInstance {}
+/// # struct DefaultInstance;
+/// # trait Instance {}
+/// # impl Instance for DefaultInstance {}
 /// trait Config<I: Instance=DefaultInstance> {
 ///     type Balance;
 ///     type Token;
@@ -100,7 +100,7 @@ pub use frame_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, FnE
 ///       Message(Balance, Token),
 ///    }
 /// );
-///# fn main() {}
+/// # fn main() {}
 /// ```
 #[macro_export]
 macro_rules! decl_event {
@@ -337,8 +337,8 @@ macro_rules! __events_to_metadata {
 #[allow(dead_code)]
 mod tests {
 	use super::*;
+	use codec::{Decode, Encode};
 	use serde::Serialize;
-	use codec::{Encode, Decode};
 
 	mod system {
 		pub trait Config: 'static {
@@ -414,9 +414,10 @@ mod tests {
 
 		decl_event!(
 			/// Event with renamed generic parameter
-			pub enum Event<T> where
+			pub enum Event<T>
+			where
 				BalanceRenamed = <T as Config>::Balance,
-				OriginRenamed = <T as system::Config>::Origin
+				OriginRenamed = <T as system::Config>::Origin,
 			{
 				TestEvent(BalanceRenamed),
 				TestOrigin(OriginRenamed),
@@ -467,15 +468,13 @@ mod tests {
 
 		decl_event!(
 			/// Event finish formatting on an named one with trailing comma
-			pub enum Event<T> where
+			pub enum Event<T>
+			where
 				BalanceRenamed = <T as Config>::Balance,
 				OriginRenamed = <T as system::Config>::Origin,
 			{
 				TestEvent(BalanceRenamed, OriginRenamed),
-				TrailingCommaInArgs(
-					u32,
-					u32,
-				),
+				TrailingCommaInArgs(u32, u32),
 			}
 		);
 	}
@@ -505,26 +504,24 @@ mod tests {
 	fn event_metadata() {
 		assert_eq!(
 			system_renamed::Event::metadata(),
-			&[
-				EventMetadata {
-					name: DecodeDifferent::Encode("SystemEvent"),
-					arguments: DecodeDifferent::Encode(&[]),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-			]
+			&[EventMetadata {
+				name: DecodeDifferent::Encode("SystemEvent"),
+				arguments: DecodeDifferent::Encode(&[]),
+				documentation: DecodeDifferent::Encode(&[]),
+			},]
 		);
 		assert_eq!(
 			event_module::Event::<TestRuntime>::metadata(),
 			&[
 				EventMetadata {
 					name: DecodeDifferent::Encode("TestEvent"),
-					arguments: DecodeDifferent::Encode(&[ "Balance", "Origin" ]),
-					documentation: DecodeDifferent::Encode(&[ " Hi, I am a comment." ])
+					arguments: DecodeDifferent::Encode(&["Balance", "Origin"]),
+					documentation: DecodeDifferent::Encode(&[" Hi, I am a comment."])
 				},
 				EventMetadata {
 					name: DecodeDifferent::Encode("EventWithoutParams"),
 					arguments: DecodeDifferent::Encode(&[]),
-					documentation: DecodeDifferent::Encode(&[ " Dog" ]),
+					documentation: DecodeDifferent::Encode(&[" Dog"]),
 				},
 			]
 		);
@@ -533,25 +530,23 @@ mod tests {
 			&[
 				EventMetadata {
 					name: DecodeDifferent::Encode("TestEvent"),
-					arguments: DecodeDifferent::Encode(&[ "BalanceRenamed" ]),
+					arguments: DecodeDifferent::Encode(&["BalanceRenamed"]),
 					documentation: DecodeDifferent::Encode(&[])
 				},
 				EventMetadata {
 					name: DecodeDifferent::Encode("TestOrigin"),
-					arguments: DecodeDifferent::Encode(&[ "OriginRenamed" ]),
+					arguments: DecodeDifferent::Encode(&["OriginRenamed"]),
 					documentation: DecodeDifferent::Encode(&[]),
 				},
 			]
 		);
 		assert_eq!(
 			event_module3::Event::metadata(),
-			&[
-				EventMetadata {
-					name: DecodeDifferent::Encode("HiEvent"),
-					arguments: DecodeDifferent::Encode(&[]),
-					documentation: DecodeDifferent::Encode(&[])
-				}
-			],
+			&[EventMetadata {
+				name: DecodeDifferent::Encode("HiEvent"),
+				arguments: DecodeDifferent::Encode(&[]),
+				documentation: DecodeDifferent::Encode(&[])
+			}],
 		);
 	}
 }
diff --git a/frame/support/src/hash.rs b/frame/support/src/hash.rs
index 1425760051d2..4136bd518f4c 100644
--- a/frame/support/src/hash.rs
+++ b/frame/support/src/hash.rs
@@ -18,8 +18,8 @@
 //! Hash utilities.
 
 use codec::{Codec, MaxEncodedLen};
+use sp_io::hashing::{blake2_128, blake2_256, twox_128, twox_256, twox_64};
 use sp_std::prelude::Vec;
-use sp_io::hashing::{blake2_128, blake2_256, twox_64, twox_128, twox_256};
 
 // This trait must be kept coherent with frame-support-procedural HasherKind usage
 pub trait Hashable: Sized {
@@ -51,7 +51,9 @@ impl<T: Codec> Hashable for T {
 	fn twox_64_concat(&self) -> Vec<u8> {
 		self.using_encoded(Twox64Concat::hash)
 	}
-	fn identity(&self) -> Vec<u8> { self.encode() }
+	fn identity(&self) -> Vec<u8> {
+		self.encode()
+	}
 }
 
 /// Hasher to use to hash keys to insert to storage.
@@ -98,11 +100,7 @@ impl StorageHasher for Twox64Concat {
 	const METADATA: frame_metadata::StorageHasher = frame_metadata::StorageHasher::Twox64Concat;
 	type Output = Vec<u8>;
 	fn hash(x: &[u8]) -> Vec<u8> {
-		twox_64(x)
-			.iter()
-			.chain(x.into_iter())
-			.cloned()
-			.collect::<Vec<_>>()
+		twox_64(x).iter().chain(x.into_iter()).cloned().collect::<Vec<_>>()
 	}
 	fn max_len<K: MaxEncodedLen>() -> usize {
 		K::max_encoded_len().saturating_add(8)
@@ -124,11 +122,7 @@ impl StorageHasher for Blake2_128Concat {
 	const METADATA: frame_metadata::StorageHasher = frame_metadata::StorageHasher::Blake2_128Concat;
 	type Output = Vec<u8>;
 	fn hash(x: &[u8]) -> Vec<u8> {
-		blake2_128(x)
-			.iter()
-			.chain(x.into_iter())
-			.cloned()
-			.collect::<Vec<_>>()
+		blake2_128(x).iter().chain(x.into_iter()).cloned().collect::<Vec<_>>()
 	}
 	fn max_len<K: MaxEncodedLen>() -> usize {
 		K::max_encoded_len().saturating_add(16)
diff --git a/frame/support/src/inherent.rs b/frame/support/src/inherent.rs
index cccbbbaa517c..2125f3e7f50a 100644
--- a/frame/support/src/inherent.rs
+++ b/frame/support/src/inherent.rs
@@ -15,13 +15,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[doc(hidden)]
-pub use crate::sp_std::vec::Vec;
 #[doc(hidden)]
 pub use crate::sp_runtime::traits::{Block as BlockT, Extrinsic};
+#[doc(hidden)]
+pub use crate::sp_std::vec::Vec;
 
 pub use sp_inherents::{
-	InherentData, CheckInherentsResult, IsFatalError, InherentIdentifier, MakeFatalError,
+	CheckInherentsResult, InherentData, InherentIdentifier, IsFatalError, MakeFatalError,
 };
 
 /// A pallet that provides or verifies an inherent extrinsic.
@@ -53,7 +53,9 @@ pub trait ProvideInherent {
 	/// one inherent for which:
 	/// * type is [`Self::Call`],
 	/// * [`Self::is_inherent`] returns true.
-	fn is_inherent_required(_: &InherentData) -> Result<Option<Self::Error>, Self::Error> { Ok(None) }
+	fn is_inherent_required(_: &InherentData) -> Result<Option<Self::Error>, Self::Error> {
+		Ok(None)
+	}
 
 	/// Check whether the given inherent is valid. Checking the inherent is optional and can be
 	/// omitted by using the default implementation.
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 34836dd5518e..0cdaadbdae3a 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -25,42 +25,42 @@ extern crate self as frame_support;
 #[doc(hidden)]
 pub use sp_tracing;
 
-#[cfg(feature = "std")]
-pub use serde;
-pub use sp_core::Void;
-#[doc(hidden)]
-pub use sp_std;
 #[doc(hidden)]
 pub use codec;
+#[doc(hidden)]
+pub use frame_metadata as metadata;
+#[doc(hidden)]
+pub use log;
 #[cfg(feature = "std")]
 #[doc(hidden)]
 pub use once_cell;
 #[doc(hidden)]
 pub use paste;
 #[cfg(feature = "std")]
+pub use serde;
+pub use sp_core::Void;
 #[doc(hidden)]
-pub use sp_state_machine::BasicExternalities;
-#[doc(hidden)]
-pub use sp_io::{storage::root as storage_root, self};
+pub use sp_io::{self, storage::root as storage_root};
 #[doc(hidden)]
 pub use sp_runtime::RuntimeDebug;
+#[cfg(feature = "std")]
 #[doc(hidden)]
-pub use log;
+pub use sp_state_machine::BasicExternalities;
 #[doc(hidden)]
-pub use frame_metadata as metadata;
+pub use sp_std;
 
 #[macro_use]
 pub mod dispatch;
-pub mod storage;
 mod hash;
+pub mod storage;
 #[macro_use]
 pub mod event;
 pub mod inherent;
 #[macro_use]
 pub mod error;
+pub mod instances;
 pub mod traits;
 pub mod weights;
-pub mod instances;
 
 #[doc(hidden)]
 pub mod unsigned {
@@ -68,23 +68,27 @@ pub mod unsigned {
 	pub use crate::sp_runtime::traits::ValidateUnsigned;
 	#[doc(hidden)]
 	pub use crate::sp_runtime::transaction_validity::{
-		TransactionValidity, UnknownTransaction, TransactionValidityError, TransactionSource,
+		TransactionSource, TransactionValidity, TransactionValidityError, UnknownTransaction,
 	};
 }
 
-pub use self::hash::{
-	Twox256, Twox128, Blake2_256, Blake2_128, Identity, Twox64Concat, Blake2_128Concat, Hashable,
-	StorageHasher, ReversibleStorageHasher
-};
-pub use self::storage::{
-	StorageValue, StorageMap, StorageDoubleMap, StorageNMap, StoragePrefixedMap,
-	IterableStorageMap, IterableStorageDoubleMap, IterableStorageNMap, migration,
-	bounded_vec::{BoundedVec, BoundedSlice}, weak_bounded_vec::WeakBoundedVec,
+pub use self::{
+	dispatch::{Callable, Parameter},
+	hash::{
+		Blake2_128, Blake2_128Concat, Blake2_256, Hashable, Identity, ReversibleStorageHasher,
+		StorageHasher, Twox128, Twox256, Twox64Concat,
+	},
+	storage::{
+		bounded_vec::{BoundedSlice, BoundedVec},
+		migration,
+		weak_bounded_vec::WeakBoundedVec,
+		IterableStorageDoubleMap, IterableStorageMap, IterableStorageNMap, StorageDoubleMap,
+		StorageMap, StorageNMap, StoragePrefixedMap, StorageValue,
+	},
 };
-pub use self::dispatch::{Parameter, Callable};
-pub use sp_runtime::{self, ConsensusEngineId, print, traits::Printable};
+pub use sp_runtime::{self, print, traits::Printable, ConsensusEngineId};
 
-use codec::{Encode, Decode};
+use codec::{Decode, Encode};
 use sp_runtime::TypeId;
 
 /// A unified log target for support operations.
@@ -108,14 +112,14 @@ impl TypeId for PalletId {
 ///
 /// Useful for creating a *storage-like* struct for test and migrations.
 ///
-///```
+/// ```
 /// # use frame_support::generate_storage_alias;
 /// use frame_support::codec;
 /// use frame_support::Twox64Concat;
 /// // generate a storage value with type u32.
 /// generate_storage_alias!(Prefix, StorageName => Value<u32>);
 ///
-/// // generate a double map from `(u32, u32)` (with hashers `Twox64Concat` for each key) 
+/// // generate a double map from `(u32, u32)` (with hashers `Twox64Concat` for each key)
 /// // to `Vec<u8>`
 /// generate_storage_alias!(
 /// 	OtherPrefix, OtherStorageName => DoubleMap<
@@ -534,7 +538,7 @@ pub fn debug(data: &impl sp_std::fmt::Debug) {
 
 #[doc(inline)]
 pub use frame_support_procedural::{
-	decl_storage, construct_runtime, transactional, RuntimeDebugNoBound,
+	construct_runtime, decl_storage, transactional, RuntimeDebugNoBound,
 };
 
 #[doc(hidden)]
@@ -546,14 +550,14 @@ pub use frame_support_procedural::__generate_dummy_part_checker;
 /// ```
 /// # use frame_support::CloneNoBound;
 /// trait Config {
-///		type C: Clone;
+/// 		type C: Clone;
 /// }
 ///
 /// // Foo implements [`Clone`] because `C` bounds [`Clone`].
 /// // Otherwise compilation will fail with an output telling `c` doesn't implement [`Clone`].
 /// #[derive(CloneNoBound)]
 /// struct Foo<T: Config> {
-///		c: T::C,
+/// 		c: T::C,
 /// }
 /// ```
 pub use frame_support_procedural::CloneNoBound;
@@ -564,14 +568,14 @@ pub use frame_support_procedural::CloneNoBound;
 /// ```
 /// # use frame_support::{EqNoBound, PartialEqNoBound};
 /// trait Config {
-///		type C: Eq;
+/// 		type C: Eq;
 /// }
 ///
 /// // Foo implements [`Eq`] because `C` bounds [`Eq`].
 /// // Otherwise compilation will fail with an output telling `c` doesn't implement [`Eq`].
 /// #[derive(PartialEqNoBound, EqNoBound)]
 /// struct Foo<T: Config> {
-///		c: T::C,
+/// 		c: T::C,
 /// }
 /// ```
 pub use frame_support_procedural::EqNoBound;
@@ -582,14 +586,14 @@ pub use frame_support_procedural::EqNoBound;
 /// ```
 /// # use frame_support::PartialEqNoBound;
 /// trait Config {
-///		type C: PartialEq;
+/// 		type C: PartialEq;
 /// }
 ///
 /// // Foo implements [`PartialEq`] because `C` bounds [`PartialEq`].
 /// // Otherwise compilation will fail with an output telling `c` doesn't implement [`PartialEq`].
 /// #[derive(PartialEqNoBound)]
 /// struct Foo<T: Config> {
-///		c: T::C,
+/// 		c: T::C,
 /// }
 /// ```
 pub use frame_support_procedural::PartialEqNoBound;
@@ -601,14 +605,14 @@ pub use frame_support_procedural::PartialEqNoBound;
 /// # use frame_support::DebugNoBound;
 /// # use core::fmt::Debug;
 /// trait Config {
-///		type C: Debug;
+/// 		type C: Debug;
 /// }
 ///
 /// // Foo implements [`Debug`] because `C` bounds [`Debug`].
 /// // Otherwise compilation will fail with an output telling `c` doesn't implement [`Debug`].
 /// #[derive(DebugNoBound)]
 /// struct Foo<T: Config> {
-///		c: T::C,
+/// 		c: T::C,
 /// }
 /// ```
 pub use frame_support_procedural::DebugNoBound;
@@ -620,14 +624,14 @@ pub use frame_support_procedural::DebugNoBound;
 /// # use frame_support::DefaultNoBound;
 /// # use core::default::Default;
 /// trait Config {
-///		type C: Default;
+/// 		type C: Default;
 /// }
 ///
 /// // Foo implements [`Default`] because `C` bounds [`Default`].
 /// // Otherwise compilation will fail with an output telling `c` doesn't implement [`Default`].
 /// #[derive(DefaultNoBound)]
 /// struct Foo<T: Config> {
-///		c: T::C,
+/// 		c: T::C,
 /// }
 /// ```
 pub use frame_support_procedural::DefaultNoBound;
@@ -684,8 +688,8 @@ pub use frame_support_procedural::crate_to_pallet_version;
 #[macro_export]
 macro_rules! fail {
 	( $y:expr ) => {{
-		return Err($y.into());
-	}}
+		return Err($y.into())
+	}};
 }
 
 /// Evaluate `$x:expr` and if not true return `Err($y:expr)`.
@@ -697,7 +701,7 @@ macro_rules! ensure {
 		if !$x {
 			$crate::fail!($y);
 		}
-	}}
+	}};
 }
 
 /// Evaluate an expression, assert it returns an expected `Err` value and that
@@ -713,7 +717,7 @@ macro_rules! assert_noop {
 		let h = $crate::storage_root();
 		$crate::assert_err!($x, $y);
 		assert_eq!(h, $crate::storage_root());
-	}
+	};
 }
 
 /// Evaluate any expression and assert that runtime storage has not been mutated
@@ -728,7 +732,7 @@ macro_rules! assert_storage_noop {
 		let h = $crate::storage_root();
 		$x;
 		assert_eq!(h, $crate::storage_root());
-	}
+	};
 }
 
 /// Assert an expression returns an error specified.
@@ -738,7 +742,7 @@ macro_rules! assert_storage_noop {
 macro_rules! assert_err {
 	( $x:expr , $y:expr $(,)? ) => {
 		assert_eq!($x, Err($y.into()));
-	}
+	};
 }
 
 /// Assert an expression returns an error specified.
@@ -749,7 +753,7 @@ macro_rules! assert_err {
 macro_rules! assert_err_ignore_postinfo {
 	( $x:expr , $y:expr $(,)? ) => {
 		$crate::assert_err!($x.map(|_| ()).map_err(|e| e.error), $y);
-	}
+	};
 }
 
 /// Assert an expression returns error with the given weight.
@@ -762,7 +766,7 @@ macro_rules! assert_err_with_weight {
 		} else {
 			panic!("expected Err(_), got Ok(_).")
 		}
-	}
+	};
 }
 
 /// Panic if an expression doesn't evaluate to `Ok`.
@@ -780,23 +784,23 @@ macro_rules! assert_ok {
 	};
 	( $x:expr, $y:expr $(,)? ) => {
 		assert_eq!($x, Ok($y));
-	}
+	};
 }
 
 #[cfg(feature = "std")]
 #[doc(hidden)]
-pub use serde::{Serialize, Deserialize};
+pub use serde::{Deserialize, Serialize};
 
 #[cfg(test)]
 pub mod tests {
 	use super::*;
 	use codec::{Codec, EncodeLike};
 	use frame_metadata::{
-		DecodeDifferent, StorageEntryMetadata, StorageMetadata, StorageEntryType,
-		StorageEntryModifier, DefaultByteGetter, StorageHasher,
+		DecodeDifferent, DefaultByteGetter, StorageEntryMetadata, StorageEntryModifier,
+		StorageEntryType, StorageHasher, StorageMetadata,
 	};
-	use sp_std::{marker::PhantomData, result};
 	use sp_io::TestExternalities;
+	use sp_std::{marker::PhantomData, result};
 
 	/// A PalletInfo implementation which just panics.
 	pub struct PanicPalletInfo;
@@ -864,7 +868,9 @@ pub mod tests {
 
 	type Map = Data;
 
-	trait Sorted { fn sorted(self) -> Self; }
+	trait Sorted {
+		fn sorted(self) -> Self;
+	}
 	impl<T: Ord> Sorted for Vec<T> {
 		fn sorted(mut self) -> Self {
 			self.sort();
@@ -918,13 +924,15 @@ pub mod tests {
 			DataDM::insert(1, 0, 2);
 			DataDM::insert(1, 1, 3);
 
-			let get_all = || vec![
-				DataDM::get(0, 1),
-				DataDM::get(1, 0),
-				DataDM::get(1, 1),
-				DataDM::get(2, 0),
-				DataDM::get(2, 1),
-			];
+			let get_all = || {
+				vec![
+					DataDM::get(0, 1),
+					DataDM::get(1, 0),
+					DataDM::get(1, 1),
+					DataDM::get(2, 0),
+					DataDM::get(2, 1),
+				]
+			};
 			assert_eq!(get_all(), vec![1, 2, 3, 0, 0]);
 
 			// Two existing
@@ -990,15 +998,24 @@ pub mod tests {
 			Map::mutate(&key, |val| {
 				*val = 15;
 			});
-			assert_eq!(Map::iter().collect::<Vec<_>>().sorted(), vec![(key - 2, 42), (key - 1, 43), (key, 15)]);
+			assert_eq!(
+				Map::iter().collect::<Vec<_>>().sorted(),
+				vec![(key - 2, 42), (key - 1, 43), (key, 15)]
+			);
 			Map::mutate(&key, |val| {
 				*val = 17;
 			});
-			assert_eq!(Map::iter().collect::<Vec<_>>().sorted(), vec![(key - 2, 42), (key - 1, 43), (key, 17)]);
+			assert_eq!(
+				Map::iter().collect::<Vec<_>>().sorted(),
+				vec![(key - 2, 42), (key - 1, 43), (key, 17)]
+			);
 
 			// remove first
 			Map::remove(&key);
-			assert_eq!(Map::iter().collect::<Vec<_>>().sorted(), vec![(key - 2, 42), (key - 1, 43)]);
+			assert_eq!(
+				Map::iter().collect::<Vec<_>>().sorted(),
+				vec![(key - 2, 42), (key - 1, 43)]
+			);
 
 			// remove last from the list
 			Map::remove(&(key - 2));
@@ -1049,7 +1066,6 @@ pub mod tests {
 			assert_eq!(DoubleMap::get(&key1, &(key2 + 1)), 0u64);
 			assert_eq!(DoubleMap::get(&(key1 + 1), &key2), 4u64);
 			assert_eq!(DoubleMap::get(&(key1 + 1), &(key2 + 1)), 4u64);
-
 		});
 	}
 
@@ -1100,10 +1116,13 @@ pub mod tests {
 			assert_eq!(DoubleMap::get(&key1, key2), 1);
 
 			// no-op if `Err`
-			assert_noop!(DoubleMap::try_mutate_exists(key1, key2, |v| -> TestResult {
-				*v = Some(2);
-				Err("nah")
-			}), "nah");
+			assert_noop!(
+				DoubleMap::try_mutate_exists(key1, key2, |v| -> TestResult {
+					*v = Some(2);
+					Err("nah")
+				}),
+				"nah"
+			);
 
 			// removed if mutated to`None`
 			assert_ok!(DoubleMap::try_mutate_exists(key1, key2, |v| -> TestResult {
@@ -1116,126 +1135,124 @@ pub mod tests {
 
 	const EXPECTED_METADATA: StorageMetadata = StorageMetadata {
 		prefix: DecodeDifferent::Encode("Test"),
-		entries: DecodeDifferent::Encode(
-			&[
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("Data"),
-					modifier: StorageEntryModifier::Default,
-					ty: StorageEntryType::Map{
-						hasher: StorageHasher::Twox64Concat,
-						key: DecodeDifferent::Encode("u32"),
-						value: DecodeDifferent::Encode("u64"),
-						unused: false,
-					},
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructData(PhantomData::<Test>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
+		entries: DecodeDifferent::Encode(&[
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("Data"),
+				modifier: StorageEntryModifier::Default,
+				ty: StorageEntryType::Map {
+					hasher: StorageHasher::Twox64Concat,
+					key: DecodeDifferent::Encode("u32"),
+					value: DecodeDifferent::Encode("u64"),
+					unused: false,
 				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("OptionLinkedMap"),
-					modifier: StorageEntryModifier::Optional,
-					ty: StorageEntryType::Map {
-						hasher: StorageHasher::Blake2_128Concat,
-						key: DecodeDifferent::Encode("u32"),
-						value: DecodeDifferent::Encode("u32"),
-						unused: false,
-					},
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructOptionLinkedMap(PhantomData::<Test>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
+				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructData(
+					PhantomData::<Test>,
+				))),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("OptionLinkedMap"),
+				modifier: StorageEntryModifier::Optional,
+				ty: StorageEntryType::Map {
+					hasher: StorageHasher::Blake2_128Concat,
+					key: DecodeDifferent::Encode("u32"),
+					value: DecodeDifferent::Encode("u32"),
+					unused: false,
 				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("GenericData"),
-					modifier: StorageEntryModifier::Default,
-					ty: StorageEntryType::Map{
-						hasher: StorageHasher::Identity,
-						key: DecodeDifferent::Encode("T::BlockNumber"),
-						value: DecodeDifferent::Encode("T::BlockNumber"),
-						unused: false
-					},
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructGenericData(PhantomData::<Test>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
+				default: DecodeDifferent::Encode(DefaultByteGetter(
+					&__GetByteStructOptionLinkedMap(PhantomData::<Test>),
+				)),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("GenericData"),
+				modifier: StorageEntryModifier::Default,
+				ty: StorageEntryType::Map {
+					hasher: StorageHasher::Identity,
+					key: DecodeDifferent::Encode("T::BlockNumber"),
+					value: DecodeDifferent::Encode("T::BlockNumber"),
+					unused: false,
 				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("GenericData2"),
-					modifier: StorageEntryModifier::Optional,
-					ty: StorageEntryType::Map{
-						hasher: StorageHasher::Blake2_128Concat,
-						key: DecodeDifferent::Encode("T::BlockNumber"),
-						value: DecodeDifferent::Encode("T::BlockNumber"),
-						unused: false
-					},
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructGenericData2(PhantomData::<Test>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
+				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructGenericData(
+					PhantomData::<Test>,
+				))),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("GenericData2"),
+				modifier: StorageEntryModifier::Optional,
+				ty: StorageEntryType::Map {
+					hasher: StorageHasher::Blake2_128Concat,
+					key: DecodeDifferent::Encode("T::BlockNumber"),
+					value: DecodeDifferent::Encode("T::BlockNumber"),
+					unused: false,
 				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("DataDM"),
-					modifier: StorageEntryModifier::Default,
-					ty: StorageEntryType::DoubleMap{
-						hasher: StorageHasher::Twox64Concat,
-						key1: DecodeDifferent::Encode("u32"),
-						key2: DecodeDifferent::Encode("u32"),
-						value: DecodeDifferent::Encode("u64"),
-						key2_hasher: StorageHasher::Blake2_128Concat,
-					},
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructDataDM(PhantomData::<Test>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
+				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructGenericData2(
+					PhantomData::<Test>,
+				))),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("DataDM"),
+				modifier: StorageEntryModifier::Default,
+				ty: StorageEntryType::DoubleMap {
+					hasher: StorageHasher::Twox64Concat,
+					key1: DecodeDifferent::Encode("u32"),
+					key2: DecodeDifferent::Encode("u32"),
+					value: DecodeDifferent::Encode("u64"),
+					key2_hasher: StorageHasher::Blake2_128Concat,
 				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("GenericDataDM"),
-					modifier: StorageEntryModifier::Default,
-					ty: StorageEntryType::DoubleMap{
-						hasher: StorageHasher::Blake2_128Concat,
-						key1: DecodeDifferent::Encode("T::BlockNumber"),
-						key2: DecodeDifferent::Encode("T::BlockNumber"),
-						value: DecodeDifferent::Encode("T::BlockNumber"),
-						key2_hasher: StorageHasher::Identity,
-					},
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructGenericDataDM(PhantomData::<Test>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
+				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructDataDM(
+					PhantomData::<Test>,
+				))),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("GenericDataDM"),
+				modifier: StorageEntryModifier::Default,
+				ty: StorageEntryType::DoubleMap {
+					hasher: StorageHasher::Blake2_128Concat,
+					key1: DecodeDifferent::Encode("T::BlockNumber"),
+					key2: DecodeDifferent::Encode("T::BlockNumber"),
+					value: DecodeDifferent::Encode("T::BlockNumber"),
+					key2_hasher: StorageHasher::Identity,
 				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("GenericData2DM"),
-					modifier: StorageEntryModifier::Optional,
-					ty: StorageEntryType::DoubleMap{
-						hasher: StorageHasher::Blake2_128Concat,
-						key1: DecodeDifferent::Encode("T::BlockNumber"),
-						key2: DecodeDifferent::Encode("T::BlockNumber"),
-						value: DecodeDifferent::Encode("T::BlockNumber"),
-						key2_hasher: StorageHasher::Twox64Concat,
-					},
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructGenericData2DM(PhantomData::<Test>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
+				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructGenericDataDM(
+					PhantomData::<Test>,
+				))),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("GenericData2DM"),
+				modifier: StorageEntryModifier::Optional,
+				ty: StorageEntryType::DoubleMap {
+					hasher: StorageHasher::Blake2_128Concat,
+					key1: DecodeDifferent::Encode("T::BlockNumber"),
+					key2: DecodeDifferent::Encode("T::BlockNumber"),
+					value: DecodeDifferent::Encode("T::BlockNumber"),
+					key2_hasher: StorageHasher::Twox64Concat,
 				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("AppendableDM"),
-					modifier: StorageEntryModifier::Default,
-					ty: StorageEntryType::DoubleMap{
-						hasher: StorageHasher::Blake2_128Concat,
-						key1: DecodeDifferent::Encode("u32"),
-						key2: DecodeDifferent::Encode("T::BlockNumber"),
-						value: DecodeDifferent::Encode("Vec<u32>"),
-						key2_hasher: StorageHasher::Blake2_128Concat,
-					},
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructGenericData2DM(PhantomData::<Test>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
+				default: DecodeDifferent::Encode(DefaultByteGetter(
+					&__GetByteStructGenericData2DM(PhantomData::<Test>),
+				)),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("AppendableDM"),
+				modifier: StorageEntryModifier::Default,
+				ty: StorageEntryType::DoubleMap {
+					hasher: StorageHasher::Blake2_128Concat,
+					key1: DecodeDifferent::Encode("u32"),
+					key2: DecodeDifferent::Encode("T::BlockNumber"),
+					value: DecodeDifferent::Encode("Vec<u32>"),
+					key2_hasher: StorageHasher::Blake2_128Concat,
 				},
-			]
-		),
+				default: DecodeDifferent::Encode(DefaultByteGetter(
+					&__GetByteStructGenericData2DM(PhantomData::<Test>),
+				)),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+		]),
 	};
 
 	#[test]
@@ -1269,35 +1286,38 @@ pub mod tests {
 
 /// Prelude to be used alongside pallet macro, for ease of use.
 pub mod pallet_prelude {
-	pub use sp_std::marker::PhantomData;
 	#[cfg(feature = "std")]
 	pub use crate::traits::GenesisBuild;
 	pub use crate::{
-		EqNoBound, PartialEqNoBound, RuntimeDebugNoBound, DebugNoBound, CloneNoBound, Twox256,
-		Twox128, Blake2_256, Blake2_128, Identity, Twox64Concat, Blake2_128Concat, ensure,
-		RuntimeDebug, storage,
+		dispatch::{DispatchError, DispatchResult, DispatchResultWithPostInfo, Parameter},
+		ensure,
+		inherent::{InherentData, InherentIdentifier, ProvideInherent},
+		storage,
+		storage::{
+			bounded_vec::BoundedVec,
+			types::{
+				Key as NMapKey, OptionQuery, StorageDoubleMap, StorageMap, StorageNMap,
+				StorageValue, ValueQuery,
+			},
+		},
 		traits::{
-			Get, Hooks, IsType, GetPalletVersion, EnsureOrigin, PalletInfoAccess, StorageInfoTrait,
-			ConstU32, GetDefault,
+			ConstU32, EnsureOrigin, Get, GetDefault, GetPalletVersion, Hooks, IsType,
+			PalletInfoAccess, StorageInfoTrait,
 		},
-		dispatch::{DispatchResultWithPostInfo, Parameter, DispatchError, DispatchResult},
 		weights::{DispatchClass, Pays, Weight},
-		storage::types::{
-			Key as NMapKey, StorageDoubleMap, StorageMap, StorageNMap, StorageValue, ValueQuery,
-			OptionQuery,
-		},
-		storage::bounded_vec::BoundedVec,
+		Blake2_128, Blake2_128Concat, Blake2_256, CloneNoBound, DebugNoBound, EqNoBound, Identity,
+		PartialEqNoBound, RuntimeDebug, RuntimeDebugNoBound, Twox128, Twox256, Twox64Concat,
 	};
-	pub use codec::{Encode, Decode, MaxEncodedLen};
-	pub use crate::inherent::{InherentData, InherentIdentifier, ProvideInherent};
+	pub use codec::{Decode, Encode, MaxEncodedLen};
 	pub use sp_runtime::{
 		traits::{MaybeSerializeDeserialize, Member, ValidateUnsigned},
 		transaction_validity::{
-			TransactionSource, TransactionValidity, ValidTransaction, TransactionPriority,
-			TransactionTag, TransactionLongevity, TransactionValidityError, InvalidTransaction,
-			UnknownTransaction,
+			InvalidTransaction, TransactionLongevity, TransactionPriority, TransactionSource,
+			TransactionTag, TransactionValidity, TransactionValidityError, UnknownTransaction,
+			ValidTransaction,
 		},
 	};
+	pub use sp_std::marker::PhantomData;
 }
 
 /// `pallet` attribute macro allows to define a pallet to be used in `construct_runtime!`.
@@ -1321,9 +1341,9 @@ pub mod pallet_prelude {
 /// ```ignore
 /// #[pallet]
 /// pub mod pallet {
-///		use frame_support::pallet_prelude::*;
-///		use frame_system::pallet_prelude::*;
-///		...
+/// 		use frame_support::pallet_prelude::*;
+/// 		use frame_system::pallet_prelude::*;
+/// 		...
 /// }
 /// ```
 ///
@@ -1350,8 +1370,8 @@ pub mod pallet_prelude {
 /// ```ignore
 /// #[pallet::config]
 /// pub trait Config: frame_system::Config {
-///		#[pallet::constant]
-///		type Foo: Get<u32>;
+/// 		#[pallet::constant]
+/// 		type Foo: Get<u32>;
 /// }
 /// ```
 ///
@@ -2378,5 +2398,4 @@ pub mod pallet_prelude {
 /// 	}
 /// 	```
 /// * use the newest nightly possible.
-///
 pub use frame_support_procedural::pallet;
diff --git a/frame/support/src/storage/bounded_btree_map.rs b/frame/support/src/storage/bounded_btree_map.rs
index 7b3efbfbeee5..f8ea35ae584d 100644
--- a/frame/support/src/storage/bounded_btree_map.rs
+++ b/frame/support/src/storage/bounded_btree_map.rs
@@ -17,15 +17,12 @@
 
 //! Traits, types and structs to support a bounded BTreeMap.
 
+use crate::{storage::StorageDecodeLength, traits::Get};
+use codec::{Decode, Encode, MaxEncodedLen};
 use sp_std::{
 	borrow::Borrow, collections::btree_map::BTreeMap, convert::TryFrom, fmt, marker::PhantomData,
 	ops::Deref,
 };
-use crate::{
-	storage::StorageDecodeLength,
-	traits::Get,
-};
-use codec::{Encode, Decode, MaxEncodedLen};
 
 /// A bounded map based on a B-Tree.
 ///
@@ -46,7 +43,7 @@ where
 	fn decode<I: codec::Input>(input: &mut I) -> Result<Self, codec::Error> {
 		let inner = BTreeMap::<K, V>::decode(input)?;
 		if inner.len() > S::get() as usize {
-			return Err("BoundedBTreeMap exceeds its limit".into());
+			return Err("BoundedBTreeMap exceeds its limit".into())
 		}
 		Ok(Self(inner, PhantomData))
 	}
@@ -280,7 +277,9 @@ where
 	type Error = ();
 
 	fn try_from(value: BTreeMap<K, V>) -> Result<Self, Self::Error> {
-		(value.len() <= Self::bound()).then(move || BoundedBTreeMap(value, PhantomData)).ok_or(())
+		(value.len() <= Self::bound())
+			.then(move || BoundedBTreeMap(value, PhantomData))
+			.ok_or(())
 	}
 }
 
@@ -303,9 +302,9 @@ impl<K, V, S> codec::EncodeLike<BTreeMap<K, V>> for BoundedBTreeMap<K, V, S> whe
 #[cfg(test)]
 pub mod test {
 	use super::*;
+	use crate::Twox128;
 	use sp_io::TestExternalities;
 	use sp_std::convert::TryInto;
-	use crate::Twox128;
 
 	crate::parameter_types! {
 		pub const Seven: u32 = 7;
diff --git a/frame/support/src/storage/bounded_btree_set.rs b/frame/support/src/storage/bounded_btree_set.rs
index 461b1de58ec8..182884e655dd 100644
--- a/frame/support/src/storage/bounded_btree_set.rs
+++ b/frame/support/src/storage/bounded_btree_set.rs
@@ -17,15 +17,12 @@
 
 //! Traits, types and structs to support a bounded `BTreeSet`.
 
+use crate::{storage::StorageDecodeLength, traits::Get};
+use codec::{Decode, Encode, MaxEncodedLen};
 use sp_std::{
 	borrow::Borrow, collections::btree_set::BTreeSet, convert::TryFrom, fmt, marker::PhantomData,
 	ops::Deref,
 };
-use crate::{
-	storage::StorageDecodeLength,
-	traits::Get,
-};
-use codec::{Encode, Decode, MaxEncodedLen};
 
 /// A bounded set based on a B-Tree.
 ///
@@ -45,7 +42,7 @@ where
 	fn decode<I: codec::Input>(input: &mut I) -> Result<Self, codec::Error> {
 		let inner = BTreeSet::<T>::decode(input)?;
 		if inner.len() > S::get() as usize {
-			return Err("BoundedBTreeSet exceeds its limit".into());
+			return Err("BoundedBTreeSet exceeds its limit".into())
 		}
 		Ok(Self(inner, PhantomData))
 	}
@@ -266,7 +263,9 @@ where
 	type Error = ();
 
 	fn try_from(value: BTreeSet<T>) -> Result<Self, Self::Error> {
-		(value.len() <= Self::bound()).then(move || BoundedBTreeSet(value, PhantomData)).ok_or(())
+		(value.len() <= Self::bound())
+			.then(move || BoundedBTreeSet(value, PhantomData))
+			.ok_or(())
 	}
 }
 
@@ -281,16 +280,14 @@ impl<T, S> codec::DecodeLength for BoundedBTreeSet<T, S> {
 
 impl<T, S> StorageDecodeLength for BoundedBTreeSet<T, S> {}
 
-impl<T, S> codec::EncodeLike<BTreeSet<T>> for BoundedBTreeSet<T, S> where
-	BTreeSet<T>: Encode
-{}
+impl<T, S> codec::EncodeLike<BTreeSet<T>> for BoundedBTreeSet<T, S> where BTreeSet<T>: Encode {}
 
 #[cfg(test)]
 pub mod test {
 	use super::*;
+	use crate::Twox128;
 	use sp_io::TestExternalities;
 	use sp_std::convert::TryInto;
-	use crate::Twox128;
 
 	crate::parameter_types! {
 		pub const Seven: u32 = 7;
diff --git a/frame/support/src/storage/bounded_vec.rs b/frame/support/src/storage/bounded_vec.rs
index b5b5252f9ec4..6d25e058c0f4 100644
--- a/frame/support/src/storage/bounded_vec.rs
+++ b/frame/support/src/storage/bounded_vec.rs
@@ -18,17 +18,16 @@
 //! Traits, types and structs to support putting a bounded vector into storage, as a raw value, map
 //! or a double map.
 
-use sp_std::prelude::*;
-use sp_std::{convert::TryFrom, fmt, marker::PhantomData};
-use codec::{Encode, Decode, EncodeLike, MaxEncodedLen};
+use crate::{
+	storage::{StorageDecodeLength, StorageTryAppend},
+	traits::Get,
+};
+use codec::{Decode, Encode, EncodeLike, MaxEncodedLen};
 use core::{
 	ops::{Deref, Index, IndexMut},
 	slice::SliceIndex,
 };
-use crate::{
-	traits::Get,
-	storage::{StorageDecodeLength, StorageTryAppend},
-};
+use sp_std::{convert::TryFrom, fmt, marker::PhantomData, prelude::*};
 
 /// A bounded vector.
 ///
@@ -71,7 +70,7 @@ impl<T: Decode, S: Get<u32>> Decode for BoundedVec<T, S> {
 	fn decode<I: codec::Input>(input: &mut I) -> Result<Self, codec::Error> {
 		let inner = Vec::<T>::decode(input)?;
 		if inner.len() > S::get() as usize {
-			return Err("BoundedVec exceeds its limit".into());
+			return Err("BoundedVec exceeds its limit".into())
 		}
 		Ok(Self(inner, PhantomData))
 	}
@@ -341,9 +340,9 @@ where
 #[cfg(test)]
 pub mod test {
 	use super::*;
+	use crate::Twox128;
 	use sp_io::TestExternalities;
 	use sp_std::convert::TryInto;
-	use crate::Twox128;
 
 	crate::parameter_types! {
 		pub const Seven: u32 = 7;
diff --git a/frame/support/src/storage/child.rs b/frame/support/src/storage/child.rs
index 52830c8ac5dc..4b237aaa561f 100644
--- a/frame/support/src/storage/child.rs
+++ b/frame/support/src/storage/child.rs
@@ -21,23 +21,17 @@
 // NOTE: could replace unhashed by having only one kind of storage (top trie being the child info
 // of null length parent storage key).
 
+pub use crate::sp_io::KillStorageResult;
 use crate::sp_std::prelude::*;
-use codec::{Codec, Encode, Decode};
+use codec::{Codec, Decode, Encode};
 pub use sp_core::storage::{ChildInfo, ChildType};
-pub use crate::sp_io::KillStorageResult;
 
 /// Return the value of the item in storage under `key`, or `None` if there is no explicit entry.
-pub fn get<T: Decode + Sized>(
-	child_info: &ChildInfo,
-	key: &[u8],
-) -> Option<T> {
+pub fn get<T: Decode + Sized>(child_info: &ChildInfo, key: &[u8]) -> Option<T> {
 	match child_info.child_type() {
 		ChildType::ParentKeyId => {
 			let storage_key = child_info.storage_key();
-			sp_io::default_child_storage::get(
-				storage_key,
-				key,
-			).and_then(|v| {
+			sp_io::default_child_storage::get(storage_key, key).and_then(|v| {
 				Decode::decode(&mut &v[..]).map(Some).unwrap_or_else(|_| {
 					// TODO #3700: error should be handleable.
 					crate::runtime_print!(
@@ -54,20 +48,13 @@ pub fn get<T: Decode + Sized>(
 
 /// Return the value of the item in storage under `key`, or the type's default if there is no
 /// explicit entry.
-pub fn get_or_default<T: Decode + Sized + Default>(
-	child_info: &ChildInfo,
-	key: &[u8],
-) -> T {
+pub fn get_or_default<T: Decode + Sized + Default>(child_info: &ChildInfo, key: &[u8]) -> T {
 	get(child_info, key).unwrap_or_else(Default::default)
 }
 
 /// Return the value of the item in storage under `key`, or `default_value` if there is no
 /// explicit entry.
-pub fn get_or<T: Decode + Sized>(
-	child_info: &ChildInfo,
-	key: &[u8],
-	default_value: T,
-) -> T {
+pub fn get_or<T: Decode + Sized>(child_info: &ChildInfo, key: &[u8], default_value: T) -> T {
 	get(child_info, key).unwrap_or(default_value)
 }
 
@@ -82,27 +69,16 @@ pub fn get_or_else<T: Decode + Sized, F: FnOnce() -> T>(
 }
 
 /// Put `value` in storage under `key`.
-pub fn put<T: Encode>(
-	child_info: &ChildInfo,
-	key: &[u8],
-	value: &T,
-) {
+pub fn put<T: Encode>(child_info: &ChildInfo, key: &[u8], value: &T) {
 	match child_info.child_type() {
-		ChildType::ParentKeyId => value.using_encoded(|slice|
-			sp_io::default_child_storage::set(
-				child_info.storage_key(),
-				key,
-				slice,
-			)
-		),
+		ChildType::ParentKeyId => value.using_encoded(|slice| {
+			sp_io::default_child_storage::set(child_info.storage_key(), key, slice)
+		}),
 	}
 }
 
 /// Remove `key` from storage, returning its value if it had an explicit entry or `None` otherwise.
-pub fn take<T: Decode + Sized>(
-	child_info: &ChildInfo,
-	key: &[u8],
-) -> Option<T> {
+pub fn take<T: Decode + Sized>(child_info: &ChildInfo, key: &[u8]) -> Option<T> {
 	let r = get(child_info, key);
 	if r.is_some() {
 		kill(child_info, key);
@@ -112,20 +88,13 @@ pub fn take<T: Decode + Sized>(
 
 /// Remove `key` from storage, returning its value, or, if there was no explicit entry in storage,
 /// the default for its type.
-pub fn take_or_default<T: Codec + Sized + Default>(
-	child_info: &ChildInfo,
-	key: &[u8],
-) -> T {
+pub fn take_or_default<T: Codec + Sized + Default>(child_info: &ChildInfo, key: &[u8]) -> T {
 	take(child_info, key).unwrap_or_else(Default::default)
 }
 
 /// Return the value of the item in storage under `key`, or `default_value` if there is no
 /// explicit entry. Ensure there is no explicit entry on return.
-pub fn take_or<T: Codec + Sized>(
-	child_info: &ChildInfo,
-	key: &[u8],
-	default_value: T,
-) -> T {
+pub fn take_or<T: Codec + Sized>(child_info: &ChildInfo, key: &[u8], default_value: T) -> T {
 	take(child_info, key).unwrap_or(default_value)
 }
 
@@ -140,15 +109,11 @@ pub fn take_or_else<T: Codec + Sized, F: FnOnce() -> T>(
 }
 
 /// Check to see if `key` has an explicit entry in storage.
-pub fn exists(
-	child_info: &ChildInfo,
-	key: &[u8],
-) -> bool {
+pub fn exists(child_info: &ChildInfo, key: &[u8]) -> bool {
 	match child_info.child_type() {
-		ChildType::ParentKeyId => sp_io::default_child_storage::read(
-			child_info.storage_key(),
-			key, &mut [0;0][..], 0,
-		).is_some(),
+		ChildType::ParentKeyId =>
+			sp_io::default_child_storage::read(child_info.storage_key(), key, &mut [0; 0][..], 0)
+				.is_some(),
 	}
 }
 
@@ -171,86 +136,50 @@ pub fn exists(
 /// not make much sense because it is not cumulative when called inside the same block.
 /// Use this function to distribute the deletion of a single child trie across multiple
 /// blocks.
-pub fn kill_storage(
-	child_info: &ChildInfo,
-	limit: Option<u32>,
-) -> KillStorageResult {
+pub fn kill_storage(child_info: &ChildInfo, limit: Option<u32>) -> KillStorageResult {
 	match child_info.child_type() {
-		ChildType::ParentKeyId => sp_io::default_child_storage::storage_kill(
-			child_info.storage_key(),
-			limit
-		),
+		ChildType::ParentKeyId =>
+			sp_io::default_child_storage::storage_kill(child_info.storage_key(), limit),
 	}
 }
 
 /// Ensure `key` has no explicit entry in storage.
-pub fn kill(
-	child_info: &ChildInfo,
-	key: &[u8],
-) {
+pub fn kill(child_info: &ChildInfo, key: &[u8]) {
 	match child_info.child_type() {
 		ChildType::ParentKeyId => {
-			sp_io::default_child_storage::clear(
-				child_info.storage_key(),
-				key,
-			);
+			sp_io::default_child_storage::clear(child_info.storage_key(), key);
 		},
 	}
 }
 
 /// Get a Vec of bytes from storage.
-pub fn get_raw(
-	child_info: &ChildInfo,
-	key: &[u8],
-) -> Option<Vec<u8>> {
+pub fn get_raw(child_info: &ChildInfo, key: &[u8]) -> Option<Vec<u8>> {
 	match child_info.child_type() {
-		ChildType::ParentKeyId => sp_io::default_child_storage::get(
-			child_info.storage_key(),
-			key,
-		),
+		ChildType::ParentKeyId => sp_io::default_child_storage::get(child_info.storage_key(), key),
 	}
 }
 
 /// Put a raw byte slice into storage.
-pub fn put_raw(
-	child_info: &ChildInfo,
-	key: &[u8],
-	value: &[u8],
-) {
+pub fn put_raw(child_info: &ChildInfo, key: &[u8], value: &[u8]) {
 	match child_info.child_type() {
-		ChildType::ParentKeyId => sp_io::default_child_storage::set(
-			child_info.storage_key(),
-			key,
-			value,
-		),
+		ChildType::ParentKeyId =>
+			sp_io::default_child_storage::set(child_info.storage_key(), key, value),
 	}
 }
 
 /// Calculate current child root value.
-pub fn root(
-	child_info: &ChildInfo,
-) -> Vec<u8> {
+pub fn root(child_info: &ChildInfo) -> Vec<u8> {
 	match child_info.child_type() {
-		ChildType::ParentKeyId => sp_io::default_child_storage::root(
-			child_info.storage_key(),
-		),
+		ChildType::ParentKeyId => sp_io::default_child_storage::root(child_info.storage_key()),
 	}
 }
 
 /// Return the length in bytes of the value without reading it. `None` if it does not exist.
-pub fn len(
-	child_info: &ChildInfo,
-	key: &[u8],
-) -> Option<u32> {
+pub fn len(child_info: &ChildInfo, key: &[u8]) -> Option<u32> {
 	match child_info.child_type() {
 		ChildType::ParentKeyId => {
 			let mut buffer = [0; 0];
-			sp_io::default_child_storage::read(
-				child_info.storage_key(),
-				key,
-				&mut buffer,
-				0,
-			)
-		}
+			sp_io::default_child_storage::read(child_info.storage_key(), key, &mut buffer, 0)
+		},
 	}
 }
diff --git a/frame/support/src/storage/generator/double_map.rs b/frame/support/src/storage/generator/double_map.rs
index 71d8ca3c043a..3a68fe740ab0 100644
--- a/frame/support/src/storage/generator/double_map.rs
+++ b/frame/support/src/storage/generator/double_map.rs
@@ -15,11 +15,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use sp_std::prelude::*;
-use sp_std::borrow::Borrow;
-use codec::{FullCodec, FullEncode, Decode, Encode, EncodeLike};
-use crate::{storage::{self, unhashed, KeyPrefixIterator, StorageAppend, PrefixIterator}, Never};
-use crate::hash::{StorageHasher, Twox128, ReversibleStorageHasher};
+use crate::{
+	hash::{ReversibleStorageHasher, StorageHasher, Twox128},
+	storage::{self, unhashed, KeyPrefixIterator, PrefixIterator, StorageAppend},
+	Never,
+};
+use codec::{Decode, Encode, EncodeLike, FullCodec, FullEncode};
+use sp_std::{borrow::Borrow, prelude::*};
 
 /// Generator for `StorageDoubleMap` used by `decl_storage`.
 ///
@@ -63,9 +65,8 @@ pub trait StorageDoubleMap<K1: FullEncode, K2: FullEncode, V: FullCodec> {
 		let module_prefix_hashed = Twox128::hash(Self::module_prefix());
 		let storage_prefix_hashed = Twox128::hash(Self::storage_prefix());
 
-		let mut result = Vec::with_capacity(
-			module_prefix_hashed.len() + storage_prefix_hashed.len()
-		);
+		let mut result =
+			Vec::with_capacity(module_prefix_hashed.len() + storage_prefix_hashed.len());
 
 		result.extend_from_slice(&module_prefix_hashed[..]);
 		result.extend_from_slice(&storage_prefix_hashed[..]);
@@ -80,7 +81,8 @@ pub trait StorageDoubleMap<K1: FullEncode, K2: FullEncode, V: FullCodec> {
 	fn from_query_to_optional_value(v: Self::Query) -> Option<V>;
 
 	/// Generate the first part of the key used in top storage.
-	fn storage_double_map_final_key1<KArg1>(k1: KArg1) -> Vec<u8> where
+	fn storage_double_map_final_key1<KArg1>(k1: KArg1) -> Vec<u8>
+	where
 		KArg1: EncodeLike<K1>,
 	{
 		let module_prefix_hashed = Twox128::hash(Self::module_prefix());
@@ -88,7 +90,7 @@ pub trait StorageDoubleMap<K1: FullEncode, K2: FullEncode, V: FullCodec> {
 		let key_hashed = k1.borrow().using_encoded(Self::Hasher1::hash);
 
 		let mut final_key = Vec::with_capacity(
-			module_prefix_hashed.len() + storage_prefix_hashed.len() + key_hashed.as_ref().len()
+			module_prefix_hashed.len() + storage_prefix_hashed.len() + key_hashed.as_ref().len(),
 		);
 
 		final_key.extend_from_slice(&module_prefix_hashed[..]);
@@ -99,7 +101,8 @@ pub trait StorageDoubleMap<K1: FullEncode, K2: FullEncode, V: FullCodec> {
 	}
 
 	/// Generate the full key used in top storage.
-	fn storage_double_map_final_key<KArg1, KArg2>(k1: KArg1, k2: KArg2) -> Vec<u8> where
+	fn storage_double_map_final_key<KArg1, KArg2>(k1: KArg1, k2: KArg2) -> Vec<u8>
+	where
 		KArg1: EncodeLike<K1>,
 		KArg2: EncodeLike<K2>,
 	{
@@ -109,10 +112,10 @@ pub trait StorageDoubleMap<K1: FullEncode, K2: FullEncode, V: FullCodec> {
 		let key2_hashed = k2.borrow().using_encoded(Self::Hasher2::hash);
 
 		let mut final_key = Vec::with_capacity(
-			module_prefix_hashed.len()
-				+ storage_prefix_hashed.len()
-				+ key1_hashed.as_ref().len()
-				+ key2_hashed.as_ref().len()
+			module_prefix_hashed.len() +
+				storage_prefix_hashed.len() +
+				key1_hashed.as_ref().len() +
+				key2_hashed.as_ref().len(),
 		);
 
 		final_key.extend_from_slice(&module_prefix_hashed[..]);
@@ -124,7 +127,8 @@ pub trait StorageDoubleMap<K1: FullEncode, K2: FullEncode, V: FullCodec> {
 	}
 }
 
-impl<K1, K2, V, G> storage::StorageDoubleMap<K1, K2, V> for G where
+impl<K1, K2, V, G> storage::StorageDoubleMap<K1, K2, V> for G
+where
 	K1: FullEncode,
 	K2: FullEncode,
 	V: FullCodec,
@@ -132,21 +136,24 @@ impl<K1, K2, V, G> storage::StorageDoubleMap<K1, K2, V> for G where
 {
 	type Query = G::Query;
 
-	fn hashed_key_for<KArg1, KArg2>(k1: KArg1, k2: KArg2) -> Vec<u8> where
+	fn hashed_key_for<KArg1, KArg2>(k1: KArg1, k2: KArg2) -> Vec<u8>
+	where
 		KArg1: EncodeLike<K1>,
 		KArg2: EncodeLike<K2>,
 	{
 		Self::storage_double_map_final_key(k1, k2)
 	}
 
-	fn contains_key<KArg1, KArg2>(k1: KArg1, k2: KArg2) -> bool where
+	fn contains_key<KArg1, KArg2>(k1: KArg1, k2: KArg2) -> bool
+	where
 		KArg1: EncodeLike<K1>,
 		KArg2: EncodeLike<K2>,
 	{
 		unhashed::exists(&Self::storage_double_map_final_key(k1, k2))
 	}
 
-	fn get<KArg1, KArg2>(k1: KArg1, k2: KArg2) -> Self::Query where
+	fn get<KArg1, KArg2>(k1: KArg1, k2: KArg2) -> Self::Query
+	where
 		KArg1: EncodeLike<K1>,
 		KArg2: EncodeLike<K2>,
 	{
@@ -156,11 +163,13 @@ impl<K1, K2, V, G> storage::StorageDoubleMap<K1, K2, V> for G where
 	fn try_get<KArg1, KArg2>(k1: KArg1, k2: KArg2) -> Result<V, ()>
 	where
 		KArg1: EncodeLike<K1>,
-		KArg2: EncodeLike<K2> {
+		KArg2: EncodeLike<K2>,
+	{
 		unhashed::get(&Self::storage_double_map_final_key(k1, k2)).ok_or(())
 	}
 
-	fn take<KArg1, KArg2>(k1: KArg1, k2: KArg2) -> Self::Query where
+	fn take<KArg1, KArg2>(k1: KArg1, k2: KArg2) -> Self::Query
+	where
 		KArg1: EncodeLike<K1>,
 		KArg2: EncodeLike<K2>,
 	{
@@ -170,16 +179,12 @@ impl<K1, K2, V, G> storage::StorageDoubleMap<K1, K2, V> for G where
 		G::from_optional_value_to_query(value)
 	}
 
-	fn swap<XKArg1, XKArg2, YKArg1, YKArg2>(
-		x_k1: XKArg1,
-		x_k2: XKArg2,
-		y_k1: YKArg1,
-		y_k2: YKArg2
-	) where
+	fn swap<XKArg1, XKArg2, YKArg1, YKArg2>(x_k1: XKArg1, x_k2: XKArg2, y_k1: YKArg1, y_k2: YKArg2)
+	where
 		XKArg1: EncodeLike<K1>,
 		XKArg2: EncodeLike<K2>,
 		YKArg1: EncodeLike<K1>,
-		YKArg2: EncodeLike<K2>
+		YKArg2: EncodeLike<K2>,
 	{
 		let final_x_key = Self::storage_double_map_final_key(x_k1, x_k2);
 		let final_y_key = Self::storage_double_map_final_key(y_k1, y_k2);
@@ -197,7 +202,8 @@ impl<K1, K2, V, G> storage::StorageDoubleMap<K1, K2, V> for G where
 		}
 	}
 
-	fn insert<KArg1, KArg2, VArg>(k1: KArg1, k2: KArg2, val: VArg) where
+	fn insert<KArg1, KArg2, VArg>(k1: KArg1, k2: KArg2, val: VArg)
+	where
 		KArg1: EncodeLike<K1>,
 		KArg2: EncodeLike<K2>,
 		VArg: EncodeLike<V>,
@@ -205,7 +211,8 @@ impl<K1, K2, V, G> storage::StorageDoubleMap<K1, K2, V> for G where
 		unhashed::put(&Self::storage_double_map_final_key(k1, k2), &val.borrow())
 	}
 
-	fn remove<KArg1, KArg2>(k1: KArg1, k2: KArg2) where
+	fn remove<KArg1, KArg2>(k1: KArg1, k2: KArg2)
+	where
 		KArg1: EncodeLike<K1>,
 		KArg2: EncodeLike<K2>,
 	{
@@ -213,12 +220,15 @@ impl<K1, K2, V, G> storage::StorageDoubleMap<K1, K2, V> for G where
 	}
 
 	fn remove_prefix<KArg1>(k1: KArg1, limit: Option<u32>) -> sp_io::KillStorageResult
-		where KArg1: EncodeLike<K1> {
+	where
+		KArg1: EncodeLike<K1>,
+	{
 		unhashed::kill_prefix(Self::storage_double_map_final_key1(k1).as_ref(), limit)
 	}
 
-	fn iter_prefix_values<KArg1>(k1: KArg1) -> storage::PrefixIterator<V> where
-		KArg1: ?Sized + EncodeLike<K1>
+	fn iter_prefix_values<KArg1>(k1: KArg1) -> storage::PrefixIterator<V>
+	where
+		KArg1: ?Sized + EncodeLike<K1>,
 	{
 		let prefix = Self::storage_double_map_final_key1(k1);
 		storage::PrefixIterator {
@@ -229,12 +239,14 @@ impl<K1, K2, V, G> storage::StorageDoubleMap<K1, K2, V> for G where
 		}
 	}
 
-	fn mutate<KArg1, KArg2, R, F>(k1: KArg1, k2: KArg2, f: F) -> R where
+	fn mutate<KArg1, KArg2, R, F>(k1: KArg1, k2: KArg2, f: F) -> R
+	where
 		KArg1: EncodeLike<K1>,
 		KArg2: EncodeLike<K2>,
 		F: FnOnce(&mut Self::Query) -> R,
 	{
-		Self::try_mutate(k1, k2, |v| Ok::<R, Never>(f(v))).expect("`Never` can not be constructed; qed")
+		Self::try_mutate(k1, k2, |v| Ok::<R, Never>(f(v)))
+			.expect("`Never` can not be constructed; qed")
 	}
 
 	fn mutate_exists<KArg1, KArg2, R, F>(k1: KArg1, k2: KArg2, f: F) -> R
@@ -243,10 +255,12 @@ impl<K1, K2, V, G> storage::StorageDoubleMap<K1, K2, V> for G where
 		KArg2: EncodeLike<K2>,
 		F: FnOnce(&mut Option<V>) -> R,
 	{
-		Self::try_mutate_exists(k1, k2, |v| Ok::<R, Never>(f(v))).expect("`Never` can not be constructed; qed")
+		Self::try_mutate_exists(k1, k2, |v| Ok::<R, Never>(f(v)))
+			.expect("`Never` can not be constructed; qed")
 	}
 
-	fn try_mutate<KArg1, KArg2, R, E, F>(k1: KArg1, k2: KArg2, f: F) -> Result<R, E> where
+	fn try_mutate<KArg1, KArg2, R, E, F>(k1: KArg1, k2: KArg2, f: F) -> Result<R, E>
+	where
 		KArg1: EncodeLike<K1>,
 		KArg2: EncodeLike<K2>,
 		F: FnOnce(&mut Self::Query) -> Result<R, E>,
@@ -283,11 +297,8 @@ impl<K1, K2, V, G> storage::StorageDoubleMap<K1, K2, V> for G where
 		ret
 	}
 
-	fn append<Item, EncodeLikeItem, KArg1, KArg2>(
-		k1: KArg1,
-		k2: KArg2,
-		item: EncodeLikeItem,
-	) where
+	fn append<Item, EncodeLikeItem, KArg1, KArg2>(k1: KArg1, k2: KArg2, item: EncodeLikeItem)
+	where
 		KArg1: EncodeLike<K1>,
 		KArg2: EncodeLike<K2>,
 		Item: Encode,
@@ -303,7 +314,10 @@ impl<K1, K2, V, G> storage::StorageDoubleMap<K1, K2, V> for G where
 		OldHasher2: StorageHasher,
 		KeyArg1: EncodeLike<K1>,
 		KeyArg2: EncodeLike<K2>,
-	>(key1: KeyArg1, key2: KeyArg2) -> Option<V> {
+	>(
+		key1: KeyArg1,
+		key2: KeyArg2,
+	) -> Option<V> {
 		let old_key = {
 			let module_prefix_hashed = Twox128::hash(Self::module_prefix());
 			let storage_prefix_hashed = Twox128::hash(Self::storage_prefix());
@@ -311,10 +325,10 @@ impl<K1, K2, V, G> storage::StorageDoubleMap<K1, K2, V> for G where
 			let key2_hashed = key2.borrow().using_encoded(OldHasher2::hash);
 
 			let mut final_key = Vec::with_capacity(
-				module_prefix_hashed.len()
-					+ storage_prefix_hashed.len()
-					+ key1_hashed.as_ref().len()
-					+ key2_hashed.as_ref().len()
+				module_prefix_hashed.len() +
+					storage_prefix_hashed.len() +
+					key1_hashed.as_ref().len() +
+					key2_hashed.as_ref().len(),
 			);
 
 			final_key.extend_from_slice(&module_prefix_hashed[..]);
@@ -331,14 +345,11 @@ impl<K1, K2, V, G> storage::StorageDoubleMap<K1, K2, V> for G where
 	}
 }
 
-impl<
-	K1: FullCodec,
-	K2: FullCodec,
-	V: FullCodec,
-	G: StorageDoubleMap<K1, K2, V>,
-> storage::IterableStorageDoubleMap<K1, K2, V> for G where
+impl<K1: FullCodec, K2: FullCodec, V: FullCodec, G: StorageDoubleMap<K1, K2, V>>
+	storage::IterableStorageDoubleMap<K1, K2, V> for G
+where
 	G::Hasher1: ReversibleStorageHasher,
-	G::Hasher2: ReversibleStorageHasher
+	G::Hasher2: ReversibleStorageHasher,
 {
 	type PartialKeyIterator = KeyPrefixIterator<K2>;
 	type PrefixIterator = PrefixIterator<(K2, V)>;
@@ -367,7 +378,7 @@ impl<
 			closure: |raw_key_without_prefix| {
 				let mut key_material = G::Hasher2::reverse(raw_key_without_prefix);
 				K2::decode(&mut key_material)
-			}
+			},
 		}
 	}
 
@@ -405,7 +416,7 @@ impl<
 				let mut k2_material = G::Hasher2::reverse(k1_k2_material);
 				let k2 = K2::decode(&mut k2_material)?;
 				Ok((k1, k2))
-			}
+			},
 		}
 	}
 
@@ -418,8 +429,8 @@ impl<
 	fn translate<O: Decode, F: FnMut(K1, K2, O) -> Option<V>>(mut f: F) {
 		let prefix = G::prefix_hash();
 		let mut previous_key = prefix.clone();
-		while let Some(next) = sp_io::storage::next_key(&previous_key)
-			.filter(|n| n.starts_with(&prefix))
+		while let Some(next) =
+			sp_io::storage::next_key(&previous_key).filter(|n| n.starts_with(&prefix))
 		{
 			previous_key = next;
 			let value = match unhashed::get::<O>(&previous_key) {
@@ -458,11 +469,11 @@ impl<
 /// Test iterators for StorageDoubleMap
 #[cfg(test)]
 mod test_iterators {
-	use codec::{Encode, Decode};
 	use crate::{
 		hash::StorageHasher,
-		storage::{generator::StorageDoubleMap, IterableStorageDoubleMap, unhashed},
+		storage::{generator::StorageDoubleMap, unhashed, IterableStorageDoubleMap},
 	};
+	use codec::{Decode, Encode};
 
 	pub trait Config: 'static {
 		type Origin;
@@ -521,10 +532,7 @@ mod test_iterators {
 				vec![(3, 3), (0, 0), (2, 2), (1, 1)],
 			);
 
-			assert_eq!(
-				DoubleMap::iter_values().collect::<Vec<_>>(),
-				vec![3, 0, 2, 1],
-			);
+			assert_eq!(DoubleMap::iter_values().collect::<Vec<_>>(), vec![3, 0, 2, 1],);
 
 			assert_eq!(
 				DoubleMap::drain().collect::<Vec<_>>(),
@@ -551,15 +559,9 @@ mod test_iterators {
 				vec![(1, 1), (2, 2), (0, 0), (3, 3)],
 			);
 
-			assert_eq!(
-				DoubleMap::iter_key_prefix(k1).collect::<Vec<_>>(),
-				vec![1, 2, 0, 3],
-			);
+			assert_eq!(DoubleMap::iter_key_prefix(k1).collect::<Vec<_>>(), vec![1, 2, 0, 3],);
 
-			assert_eq!(
-				DoubleMap::iter_prefix_values(k1).collect::<Vec<_>>(),
-				vec![1, 2, 0, 3],
-			);
+			assert_eq!(DoubleMap::iter_prefix_values(k1).collect::<Vec<_>>(), vec![1, 2, 0, 3],);
 
 			assert_eq!(
 				DoubleMap::drain_prefix(k1).collect::<Vec<_>>(),
@@ -580,15 +582,12 @@ mod test_iterators {
 			}
 
 			// Wrong key1
-			unhashed::put(
-				&[prefix.clone(), vec![1, 2, 3]].concat(),
-				&3u64.encode()
-			);
+			unhashed::put(&[prefix.clone(), vec![1, 2, 3]].concat(), &3u64.encode());
 
 			// Wrong key2
 			unhashed::put(
 				&[prefix.clone(), crate::Blake2_128Concat::hash(&1u16.encode())].concat(),
-				&3u64.encode()
+				&3u64.encode(),
 			);
 
 			// Wrong value
@@ -597,11 +596,12 @@ mod test_iterators {
 					prefix.clone(),
 					crate::Blake2_128Concat::hash(&1u16.encode()),
 					crate::Twox64Concat::hash(&2u32.encode()),
-				].concat(),
+				]
+				.concat(),
 				&vec![1],
 			);
 
-			DoubleMap::translate(|_k1, _k2, v: u64| Some(v*2));
+			DoubleMap::translate(|_k1, _k2, v: u64| Some(v * 2));
 			assert_eq!(
 				DoubleMap::iter().collect::<Vec<_>>(),
 				vec![(3, 3, 6), (0, 0, 0), (2, 2, 4), (1, 1, 2)],
diff --git a/frame/support/src/storage/generator/map.rs b/frame/support/src/storage/generator/map.rs
index e58a001c679f..48593dba17bd 100644
--- a/frame/support/src/storage/generator/map.rs
+++ b/frame/support/src/storage/generator/map.rs
@@ -15,14 +15,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(not(feature = "std"))]
-use sp_std::prelude::*;
-use sp_std::borrow::Borrow;
-use codec::{FullCodec, FullEncode, Decode, Encode, EncodeLike};
 use crate::{
-	storage::{self, unhashed, KeyPrefixIterator, StorageAppend, PrefixIterator},
-	Never, hash::{StorageHasher, Twox128, ReversibleStorageHasher},
+	hash::{ReversibleStorageHasher, StorageHasher, Twox128},
+	storage::{self, unhashed, KeyPrefixIterator, PrefixIterator, StorageAppend},
+	Never,
 };
+use codec::{Decode, Encode, EncodeLike, FullCodec, FullEncode};
+use sp_std::borrow::Borrow;
+#[cfg(not(feature = "std"))]
+use sp_std::prelude::*;
 
 /// Generator for `StorageMap` used by `decl_storage`.
 ///
@@ -54,9 +55,8 @@ pub trait StorageMap<K: FullEncode, V: FullCodec> {
 		let module_prefix_hashed = Twox128::hash(Self::module_prefix());
 		let storage_prefix_hashed = Twox128::hash(Self::storage_prefix());
 
-		let mut result = Vec::with_capacity(
-			module_prefix_hashed.len() + storage_prefix_hashed.len()
-		);
+		let mut result =
+			Vec::with_capacity(module_prefix_hashed.len() + storage_prefix_hashed.len());
 
 		result.extend_from_slice(&module_prefix_hashed[..]);
 		result.extend_from_slice(&storage_prefix_hashed[..]);
@@ -71,7 +71,8 @@ pub trait StorageMap<K: FullEncode, V: FullCodec> {
 	fn from_query_to_optional_value(v: Self::Query) -> Option<V>;
 
 	/// Generate the full key used in top storage.
-	fn storage_map_final_key<KeyArg>(key: KeyArg) -> Vec<u8> where
+	fn storage_map_final_key<KeyArg>(key: KeyArg) -> Vec<u8>
+	where
 		KeyArg: EncodeLike<K>,
 	{
 		let module_prefix_hashed = Twox128::hash(Self::module_prefix());
@@ -79,7 +80,7 @@ pub trait StorageMap<K: FullEncode, V: FullCodec> {
 		let key_hashed = key.borrow().using_encoded(Self::Hasher::hash);
 
 		let mut final_key = Vec::with_capacity(
-			module_prefix_hashed.len() + storage_prefix_hashed.len() + key_hashed.as_ref().len()
+			module_prefix_hashed.len() + storage_prefix_hashed.len() + key_hashed.as_ref().len(),
 		);
 
 		final_key.extend_from_slice(&module_prefix_hashed[..]);
@@ -98,11 +99,9 @@ pub struct StorageMapIterator<K, V, Hasher> {
 	_phantom: ::sp_std::marker::PhantomData<(K, V, Hasher)>,
 }
 
-impl<
-	K: Decode + Sized,
-	V: Decode + Sized,
-	Hasher: ReversibleStorageHasher
-> Iterator for StorageMapIterator<K, V, Hasher> {
+impl<K: Decode + Sized, V: Decode + Sized, Hasher: ReversibleStorageHasher> Iterator
+	for StorageMapIterator<K, V, Hasher>
+{
 	type Item = (K, V);
 
 	fn next(&mut self) -> Option<(K, V)> {
@@ -117,27 +116,25 @@ impl<
 							if self.drain {
 								unhashed::kill(&self.previous_key)
 							}
-							let mut key_material = Hasher::reverse(&self.previous_key[self.prefix.len()..]);
+							let mut key_material =
+								Hasher::reverse(&self.previous_key[self.prefix.len()..]);
 							match K::decode(&mut key_material) {
 								Ok(key) => Some((key, value)),
 								Err(_) => continue,
 							}
-						}
+						},
 						None => continue,
 					}
-				}
+				},
 				None => None,
 			}
 		}
 	}
 }
 
-impl<
-	K: FullCodec,
-	V: FullCodec,
-	G: StorageMap<K, V>,
-> storage::IterableStorageMap<K, V> for G where
-	G::Hasher: ReversibleStorageHasher
+impl<K: FullCodec, V: FullCodec, G: StorageMap<K, V>> storage::IterableStorageMap<K, V> for G
+where
+	G::Hasher: ReversibleStorageHasher,
 {
 	type Iterator = PrefixIterator<(K, V)>;
 	type KeyIterator = KeyPrefixIterator<K>;
@@ -166,7 +163,7 @@ impl<
 			closure: |raw_key_without_prefix| {
 				let mut key_material = G::Hasher::reverse(raw_key_without_prefix);
 				K::decode(&mut key_material)
-			}
+			},
 		}
 	}
 
@@ -180,8 +177,8 @@ impl<
 	fn translate<O: Decode, F: FnMut(K, O) -> Option<V>>(mut f: F) {
 		let prefix = G::prefix_hash();
 		let mut previous_key = prefix.clone();
-		while let Some(next) = sp_io::storage::next_key(&previous_key)
-			.filter(|n| n.starts_with(&prefix))
+		while let Some(next) =
+			sp_io::storage::next_key(&previous_key).filter(|n| n.starts_with(&prefix))
 		{
 			previous_key = next;
 			let value = match unhashed::get::<O>(&previous_key) {
@@ -254,16 +251,21 @@ impl<K: FullEncode, V: FullCodec, G: StorageMap<K, V>> storage::StorageMap<K, V>
 	}
 
 	fn mutate<KeyArg: EncodeLike<K>, R, F: FnOnce(&mut Self::Query) -> R>(key: KeyArg, f: F) -> R {
-		Self::try_mutate(key, |v| Ok::<R, Never>(f(v))).expect("`Never` can not be constructed; qed")
+		Self::try_mutate(key, |v| Ok::<R, Never>(f(v)))
+			.expect("`Never` can not be constructed; qed")
 	}
 
-	fn mutate_exists<KeyArg: EncodeLike<K>, R, F: FnOnce(&mut Option<V>) -> R>(key: KeyArg, f: F) -> R {
-		Self::try_mutate_exists(key, |v| Ok::<R, Never>(f(v))).expect("`Never` can not be constructed; qed")
+	fn mutate_exists<KeyArg: EncodeLike<K>, R, F: FnOnce(&mut Option<V>) -> R>(
+		key: KeyArg,
+		f: F,
+	) -> R {
+		Self::try_mutate_exists(key, |v| Ok::<R, Never>(f(v)))
+			.expect("`Never` can not be constructed; qed")
 	}
 
 	fn try_mutate<KeyArg: EncodeLike<K>, R, E, F: FnOnce(&mut Self::Query) -> Result<R, E>>(
 		key: KeyArg,
-		f: F
+		f: F,
 	) -> Result<R, E> {
 		let final_key = Self::storage_map_final_key(key);
 		let mut val = G::from_optional_value_to_query(unhashed::get(final_key.as_ref()));
@@ -280,7 +282,7 @@ impl<K: FullEncode, V: FullCodec, G: StorageMap<K, V>> storage::StorageMap<K, V>
 
 	fn try_mutate_exists<KeyArg: EncodeLike<K>, R, E, F: FnOnce(&mut Option<V>) -> Result<R, E>>(
 		key: KeyArg,
-		f: F
+		f: F,
 	) -> Result<R, E> {
 		let final_key = Self::storage_map_final_key(key);
 		let mut val = unhashed::get(final_key.as_ref());
@@ -319,7 +321,9 @@ impl<K: FullEncode, V: FullCodec, G: StorageMap<K, V>> storage::StorageMap<K, V>
 			let key_hashed = key.borrow().using_encoded(OldHasher::hash);
 
 			let mut final_key = Vec::with_capacity(
-				module_prefix_hashed.len() + storage_prefix_hashed.len() + key_hashed.as_ref().len()
+				module_prefix_hashed.len() +
+					storage_prefix_hashed.len() +
+					key_hashed.as_ref().len(),
 			);
 
 			final_key.extend_from_slice(&module_prefix_hashed[..]);
@@ -338,11 +342,11 @@ impl<K: FullEncode, V: FullCodec, G: StorageMap<K, V>> storage::StorageMap<K, V>
 /// Test iterators for StorageMap
 #[cfg(test)]
 mod test_iterators {
-	use codec::{Encode, Decode};
 	use crate::{
 		hash::StorageHasher,
-		storage::{generator::StorageMap, IterableStorageMap, unhashed},
+		storage::{generator::StorageMap, unhashed, IterableStorageMap},
 	};
+	use codec::{Decode, Encode};
 
 	pub trait Config: 'static {
 		type Origin;
@@ -421,7 +425,7 @@ mod test_iterators {
 				&vec![1],
 			);
 
-			Map::translate(|_k1, v: u64| Some(v*2));
+			Map::translate(|_k1, v: u64| Some(v * 2));
 			assert_eq!(Map::iter().collect::<Vec<_>>(), vec![(3, 6), (0, 0), (2, 4), (1, 2)]);
 		})
 	}
diff --git a/frame/support/src/storage/generator/mod.rs b/frame/support/src/storage/generator/mod.rs
index 578831314c1f..86129091b7ef 100644
--- a/frame/support/src/storage/generator/mod.rs
+++ b/frame/support/src/storage/generator/mod.rs
@@ -24,23 +24,25 @@
 //!
 //! This is internal api and is subject to change.
 
+mod double_map;
 mod map;
 mod nmap;
-mod double_map;
 mod value;
 
+pub use double_map::StorageDoubleMap;
 pub use map::StorageMap;
 pub use nmap::StorageNMap;
-pub use double_map::StorageDoubleMap;
 pub use value::StorageValue;
 
 #[cfg(test)]
 #[allow(dead_code)]
 mod tests {
-	use sp_io::TestExternalities;
+	use crate::{
+		assert_noop, assert_ok,
+		storage::{generator::StorageValue, unhashed, IterableStorageMap},
+	};
 	use codec::Encode;
-	use crate::storage::{unhashed, generator::StorageValue, IterableStorageMap};
-	use crate::{assert_noop, assert_ok};
+	use sp_io::TestExternalities;
 
 	struct Runtime;
 
@@ -80,7 +82,7 @@ mod tests {
 
 			// translate
 			let translate_fn = |old: Option<u32>| -> Option<(u64, u64)> {
-				old.map(|o| (o.into(), (o*2).into()))
+				old.map(|o| (o.into(), (o * 2).into()))
 			};
 			let res = Value::translate(translate_fn);
 			debug_assert!(res.is_ok());
@@ -105,11 +107,16 @@ mod tests {
 			);
 
 			// do translation.
-			NumberMap::translate(|k: u32, v: u64| if k % 2 == 0 { Some((k as u64) << 32 | v) } else { None });
+			NumberMap::translate(
+				|k: u32, v: u64| if k % 2 == 0 { Some((k as u64) << 32 | v) } else { None },
+			);
 
 			assert_eq!(
 				NumberMap::iter().collect::<Vec<_>>(),
-				(0..50u32).map(|x| x * 2).map(|x| (x, (x as u64) << 32 | x as u64)).collect::<Vec<_>>(),
+				(0..50u32)
+					.map(|x| x * 2)
+					.map(|x| (x, (x as u64) << 32 | x as u64))
+					.collect::<Vec<_>>(),
 			);
 		})
 	}
@@ -123,20 +130,29 @@ mod tests {
 			assert_eq!(DoubleMap::get(0, 0), 0);
 
 			// `assert_noop` ensures that the state does not change
-			assert_noop!(Value::try_mutate(|value| -> Result<(), &'static str> {
-				*value = (2, 2);
-				Err("don't change value")
-			}), "don't change value");
+			assert_noop!(
+				Value::try_mutate(|value| -> Result<(), &'static str> {
+					*value = (2, 2);
+					Err("don't change value")
+				}),
+				"don't change value"
+			);
 
-			assert_noop!(NumberMap::try_mutate(0, |value| -> Result<(), &'static str> {
-				*value = 4;
-				Err("don't change value")
-			}), "don't change value");
+			assert_noop!(
+				NumberMap::try_mutate(0, |value| -> Result<(), &'static str> {
+					*value = 4;
+					Err("don't change value")
+				}),
+				"don't change value"
+			);
 
-			assert_noop!(DoubleMap::try_mutate(0, 0, |value| -> Result<(), &'static str> {
-				*value = 6;
-				Err("don't change value")
-			}), "don't change value");
+			assert_noop!(
+				DoubleMap::try_mutate(0, 0, |value| -> Result<(), &'static str> {
+					*value = 6;
+					Err("don't change value")
+				}),
+				"don't change value"
+			);
 
 			// Showing this explicitly for clarity
 			assert_eq!(Value::get(), (0, 0));
diff --git a/frame/support/src/storage/generator/nmap.rs b/frame/support/src/storage/generator/nmap.rs
index 49c8c94ea7a9..54824c62048c 100755
--- a/frame/support/src/storage/generator/nmap.rs
+++ b/frame/support/src/storage/generator/nmap.rs
@@ -228,7 +228,7 @@ where
 	fn try_mutate<KArg, R, E, F>(key: KArg, f: F) -> Result<R, E>
 	where
 		KArg: EncodeLikeTuple<K::KArg> + TupleToEncodedIter,
-		F: FnOnce(&mut Self::Query) -> Result<R, E>
+		F: FnOnce(&mut Self::Query) -> Result<R, E>,
 	{
 		let final_key = Self::storage_n_map_final_key::<K, _>(key);
 		let mut val = G::from_optional_value_to_query(unhashed::get(final_key.as_ref()));
@@ -373,7 +373,7 @@ impl<K: ReversibleKeyGenerator, V: FullCodec, G: StorageNMap<K, V>>
 			closure: |raw_key_without_prefix| {
 				let (final_key, _) = K::decode_final_key(raw_key_without_prefix)?;
 				Ok(final_key)
-			}
+			},
 		}
 	}
 
@@ -394,16 +394,16 @@ impl<K: ReversibleKeyGenerator, V: FullCodec, G: StorageNMap<K, V>>
 				Some(value) => value,
 				None => {
 					log::error!("Invalid translate: fail to decode old value");
-					continue;
-				}
+					continue
+				},
 			};
 
 			let final_key = match K::decode_final_key(&previous_key[prefix.len()..]) {
 				Ok((final_key, _)) => final_key,
 				Err(_) => {
 					log::error!("Invalid translate: fail to decode key");
-					continue;
-				}
+					continue
+				},
 			};
 
 			match f(final_key, value) {
@@ -452,10 +452,7 @@ mod test_iterators {
 
 	fn key_after_prefix(mut prefix: Vec<u8>) -> Vec<u8> {
 		let last = prefix.iter_mut().last().unwrap();
-		assert!(
-			*last != 255,
-			"mock function not implemented for this prefix"
-		);
+		assert!(*last != 255, "mock function not implemented for this prefix");
 		*last += 1;
 		prefix
 	}
@@ -498,10 +495,7 @@ mod test_iterators {
 				vec![((3, 3), 3), ((0, 0), 0), ((2, 2), 2), ((1, 1), 1)],
 			);
 
-			assert_eq!(
-				NMap::iter_keys().collect::<Vec<_>>(),
-				vec![(3, 3), (0, 0), (2, 2), (1, 1)],
-			);
+			assert_eq!(NMap::iter_keys().collect::<Vec<_>>(), vec![(3, 3), (0, 0), (2, 2), (1, 1)],);
 
 			assert_eq!(NMap::iter_values().collect::<Vec<_>>(), vec![3, 0, 2, 1],);
 
@@ -511,10 +505,7 @@ mod test_iterators {
 			);
 
 			assert_eq!(NMap::iter().collect::<Vec<_>>(), vec![]);
-			assert_eq!(
-				unhashed::get(&key_before_prefix(prefix.clone())),
-				Some(1u64)
-			);
+			assert_eq!(unhashed::get(&key_before_prefix(prefix.clone())), Some(1u64));
 			assert_eq!(unhashed::get(&key_after_prefix(prefix.clone())), Some(1u64));
 
 			// Prefix iterator
@@ -533,15 +524,9 @@ mod test_iterators {
 				vec![(1, 1), (2, 2), (0, 0), (3, 3)],
 			);
 
-			assert_eq!(
-				NMap::iter_key_prefix((k1,)).collect::<Vec<_>>(),
-				vec![1, 2, 0, 3],
-			);
+			assert_eq!(NMap::iter_key_prefix((k1,)).collect::<Vec<_>>(), vec![1, 2, 0, 3],);
 
-			assert_eq!(
-				NMap::iter_prefix_values((k1,)).collect::<Vec<_>>(),
-				vec![1, 2, 0, 3],
-			);
+			assert_eq!(NMap::iter_prefix_values((k1,)).collect::<Vec<_>>(), vec![1, 2, 0, 3],);
 
 			assert_eq!(
 				NMap::drain_prefix((k1,)).collect::<Vec<_>>(),
@@ -549,10 +534,7 @@ mod test_iterators {
 			);
 
 			assert_eq!(NMap::iter_prefix((k1,)).collect::<Vec<_>>(), vec![]);
-			assert_eq!(
-				unhashed::get(&key_before_prefix(prefix.clone())),
-				Some(1u64)
-			);
+			assert_eq!(unhashed::get(&key_before_prefix(prefix.clone())), Some(1u64));
 			assert_eq!(unhashed::get(&key_after_prefix(prefix.clone())), Some(1u64));
 
 			// Translate
@@ -569,11 +551,7 @@ mod test_iterators {
 
 			// Wrong key2
 			unhashed::put(
-				&[
-					prefix.clone(),
-					crate::Blake2_128Concat::hash(&1u16.encode()),
-				]
-				.concat(),
+				&[prefix.clone(), crate::Blake2_128Concat::hash(&1u16.encode())].concat(),
 				&3u64.encode(),
 			);
 
diff --git a/frame/support/src/storage/generator/value.rs b/frame/support/src/storage/generator/value.rs
index e07c952320aa..c765e059ec14 100644
--- a/frame/support/src/storage/generator/value.rs
+++ b/frame/support/src/storage/generator/value.rs
@@ -15,12 +15,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use codec::{FullCodec, Encode, EncodeLike, Decode};
 use crate::{
-	Never,
+	hash::{StorageHasher, Twox128},
 	storage::{self, unhashed, StorageAppend},
-	hash::{Twox128, StorageHasher},
+	Never,
 };
+use codec::{Decode, Encode, EncodeLike, FullCodec};
 
 /// Generator for `StorageValue` used by `decl_storage`.
 ///
@@ -78,7 +78,8 @@ impl<T: FullCodec, G: StorageValue<T>> storage::StorageValue<T> for G {
 
 		// attempt to get the length directly.
 		let maybe_old = unhashed::get_raw(&key)
-			.map(|old_data| O::decode(&mut &old_data[..]).map_err(|_| ())).transpose()?;
+			.map(|old_data| O::decode(&mut &old_data[..]).map_err(|_| ()))
+			.transpose()?;
 		let maybe_new = f(maybe_old);
 		if let Some(new) = maybe_new.as_ref() {
 			new.using_encoded(|d| unhashed::put_raw(&key, d));
diff --git a/frame/support/src/storage/hashed.rs b/frame/support/src/storage/hashed.rs
index a0c9ab6708e7..241caff809b3 100644
--- a/frame/support/src/storage/hashed.rs
+++ b/frame/support/src/storage/hashed.rs
@@ -18,8 +18,8 @@
 //! Operation on runtime storage using hashed keys.
 
 use super::unhashed;
+use codec::{Decode, Encode};
 use sp_std::prelude::*;
-use codec::{Encode, Decode};
 
 /// Return the value of the item in storage under `key`, or `None` if there is no explicit entry.
 pub fn get<T, HashFn, R>(hash: &HashFn, key: &[u8]) -> Option<T>
diff --git a/frame/support/src/storage/migration.rs b/frame/support/src/storage/migration.rs
index 62db2eff839f..701b2627f31c 100644
--- a/frame/support/src/storage/migration.rs
+++ b/frame/support/src/storage/migration.rs
@@ -17,10 +17,9 @@
 
 //! Some utilities for helping access storage with arbitrary key types.
 
+use crate::{hash::ReversibleStorageHasher, storage::unhashed, StorageHasher, Twox128};
+use codec::{Decode, Encode};
 use sp_std::prelude::*;
-use codec::{Encode, Decode};
-use crate::{StorageHasher, Twox128, storage::unhashed};
-use crate::hash::ReversibleStorageHasher;
 
 use super::PrefixIterator;
 
@@ -34,14 +33,18 @@ pub struct StorageIterator<T> {
 
 impl<T> StorageIterator<T> {
 	/// Construct iterator to iterate over map items in `module` for the map called `item`.
-	#[deprecated(note="Please use the storage_iter or storage_iter_with_suffix functions instead")]
+	#[deprecated(
+		note = "Please use the storage_iter or storage_iter_with_suffix functions instead"
+	)]
 	pub fn new(module: &[u8], item: &[u8]) -> Self {
 		#[allow(deprecated)]
 		Self::with_suffix(module, item, &[][..])
 	}
 
 	/// Construct iterator to iterate over map items in `module` for the map called `item`.
-	#[deprecated(note="Please use the storage_iter or storage_iter_with_suffix functions instead")]
+	#[deprecated(
+		note = "Please use the storage_iter or storage_iter_with_suffix functions instead"
+	)]
 	pub fn with_suffix(module: &[u8], item: &[u8], suffix: &[u8]) -> Self {
 		let mut prefix = Vec::new();
 		prefix.extend_from_slice(&Twox128::hash(module));
@@ -75,10 +78,10 @@ impl<T: Decode + Sized> Iterator for StorageIterator<T> {
 								frame_support::storage::unhashed::kill(&next);
 							}
 							Some((self.previous_key[self.prefix.len()..].to_vec(), value))
-						}
+						},
 						None => continue,
 					}
-				}
+				},
 				None => None,
 			}
 		}
@@ -95,14 +98,18 @@ pub struct StorageKeyIterator<K, T, H: ReversibleStorageHasher> {
 
 impl<K, T, H: ReversibleStorageHasher> StorageKeyIterator<K, T, H> {
 	/// Construct iterator to iterate over map items in `module` for the map called `item`.
-	#[deprecated(note="Please use the storage_key_iter or storage_key_iter_with_suffix functions instead")]
+	#[deprecated(
+		note = "Please use the storage_key_iter or storage_key_iter_with_suffix functions instead"
+	)]
 	pub fn new(module: &[u8], item: &[u8]) -> Self {
 		#[allow(deprecated)]
 		Self::with_suffix(module, item, &[][..])
 	}
 
 	/// Construct iterator to iterate over map items in `module` for the map called `item`.
-	#[deprecated(note="Please use the storage_key_iter or storage_key_iter_with_suffix functions instead")]
+	#[deprecated(
+		note = "Please use the storage_key_iter or storage_key_iter_with_suffix functions instead"
+	)]
 	pub fn with_suffix(module: &[u8], item: &[u8], suffix: &[u8]) -> Self {
 		let mut prefix = Vec::new();
 		prefix.extend_from_slice(&Twox128::hash(module));
@@ -141,13 +148,13 @@ impl<K: Decode + Sized, T: Decode + Sized, H: ReversibleStorageHasher> Iterator
 										frame_support::storage::unhashed::kill(&next);
 									}
 									Some((key, value))
-								}
+								},
 								None => continue,
 							}
-						}
+						},
 						Err(_) => continue,
 					}
-				}
+				},
 				None => None,
 			}
 		}
@@ -187,7 +194,11 @@ pub fn storage_key_iter<K: Decode + Sized, T: Decode + Sized, H: ReversibleStora
 }
 
 /// Construct iterator to iterate over map items in `module` for the map called `item`.
-pub fn storage_key_iter_with_suffix<K: Decode + Sized, T: Decode + Sized, H: ReversibleStorageHasher>(
+pub fn storage_key_iter_with_suffix<
+	K: Decode + Sized,
+	T: Decode + Sized,
+	H: ReversibleStorageHasher,
+>(
 	module: &[u8],
 	item: &[u8],
 	suffix: &[u8],
@@ -279,7 +290,7 @@ pub fn take_storage_item<K: Encode + Sized, T: Decode + Sized, H: StorageHasher>
 pub fn move_storage_from_pallet(
 	storage_name: &[u8],
 	old_pallet_name: &[u8],
-	new_pallet_name: &[u8]
+	new_pallet_name: &[u8],
 ) {
 	let mut new_prefix = Vec::new();
 	new_prefix.extend_from_slice(&Twox128::hash(new_pallet_name));
@@ -347,18 +358,14 @@ pub fn move_prefix(from_prefix: &[u8], to_prefix: &[u8]) {
 
 #[cfg(test)]
 mod tests {
+	use super::{
+		move_pallet, move_prefix, move_storage_from_pallet, storage_iter, storage_key_iter,
+	};
 	use crate::{
-		pallet_prelude::{StorageValue, StorageMap, Twox64Concat, Twox128},
 		hash::StorageHasher,
+		pallet_prelude::{StorageMap, StorageValue, Twox128, Twox64Concat},
 	};
 	use sp_io::TestExternalities;
-	use super::{
-		move_prefix,
-		move_pallet,
-		move_storage_from_pallet,
-		storage_iter,
-		storage_key_iter,
-	};
 
 	struct OldPalletStorageValuePrefix;
 	impl frame_support::traits::StorageInstance for OldPalletStorageValuePrefix {
@@ -459,21 +466,22 @@ mod tests {
 			OldStorageMap::insert(3, 4);
 
 			assert_eq!(
-				storage_key_iter::<i32, i32, Twox64Concat>(b"my_old_pallet", b"foo_map").collect::<Vec<_>>(),
+				storage_key_iter::<i32, i32, Twox64Concat>(b"my_old_pallet", b"foo_map")
+					.collect::<Vec<_>>(),
 				vec![(1, 2), (3, 4)],
 			);
 
 			assert_eq!(
-				storage_iter(b"my_old_pallet", b"foo_map").drain().map(|t| t.1).collect::<Vec<i32>>(),
+				storage_iter(b"my_old_pallet", b"foo_map")
+					.drain()
+					.map(|t| t.1)
+					.collect::<Vec<i32>>(),
 				vec![2, 4],
 			);
 			assert_eq!(OldStorageMap::iter().collect::<Vec<_>>(), vec![]);
 
 			// Empty because storage iterator skips over the entry under the first key
-			assert_eq!(
-				storage_iter::<i32>(b"my_old_pallet", b"foo_value").drain().next(),
-				None
-			);
+			assert_eq!(storage_iter::<i32>(b"my_old_pallet", b"foo_value").drain().next(), None);
 			assert_eq!(OldStorageValue::get(), Some(3));
 		});
 	}
diff --git a/frame/support/src/storage/mod.rs b/frame/support/src/storage/mod.rs
index 65bd9af6c498..867935003080 100644
--- a/frame/support/src/storage/mod.rs
+++ b/frame/support/src/storage/mod.rs
@@ -17,31 +17,31 @@
 
 //! Stuff to do with the runtime's storage.
 
-use sp_core::storage::ChildInfo;
-use sp_std::prelude::*;
-use codec::{FullCodec, FullEncode, Encode, EncodeLike, Decode};
 use crate::{
-	hash::{Twox128, StorageHasher, ReversibleStorageHasher},
+	hash::{ReversibleStorageHasher, StorageHasher, Twox128},
 	storage::types::{
 		EncodeLikeTuple, HasKeyPrefix, HasReversibleKeyPrefix, KeyGenerator,
 		ReversibleKeyGenerator, TupleToEncodedIter,
 	},
 };
+use codec::{Decode, Encode, EncodeLike, FullCodec, FullEncode};
+use sp_core::storage::ChildInfo;
 use sp_runtime::generic::{Digest, DigestItem};
 pub use sp_runtime::TransactionOutcome;
+use sp_std::prelude::*;
 pub use types::Key;
 
-pub mod unhashed;
-pub mod hashed;
 pub mod bounded_btree_map;
 pub mod bounded_btree_set;
 pub mod bounded_vec;
-pub mod weak_bounded_vec;
 pub mod child;
 #[doc(hidden)]
 pub mod generator;
+pub mod hashed;
 pub mod migration;
 pub mod types;
+pub mod unhashed;
+pub mod weak_bounded_vec;
 
 #[cfg(all(feature = "std", any(test, debug_assertions)))]
 mod debug_helper {
@@ -101,9 +101,7 @@ pub fn require_transaction() {
 ///
 /// Transactions can be nested to any depth. Commits happen to the parent transaction.
 pub fn with_transaction<R>(f: impl FnOnce() -> TransactionOutcome<R>) -> R {
-	use sp_io::storage::{
-		start_transaction, commit_transaction, rollback_transaction,
-	};
+	use sp_io::storage::{commit_transaction, rollback_transaction, start_transaction};
 	use TransactionOutcome::*;
 
 	start_transaction();
@@ -112,8 +110,14 @@ pub fn with_transaction<R>(f: impl FnOnce() -> TransactionOutcome<R>) -> R {
 	let _guard = debug_helper::inc_transaction_level();
 
 	match f() {
-		Commit(res) => { commit_transaction(); res },
-		Rollback(res) => { rollback_transaction(); res },
+		Commit(res) => {
+			commit_transaction();
+			res
+		},
+		Rollback(res) => {
+			rollback_transaction();
+			res
+		},
 	}
 }
 
@@ -205,7 +209,10 @@ pub trait StorageValue<T: FullCodec> {
 	///
 	/// `None` does not mean that `get()` does not return a value. The default value is completly
 	/// ignored by this function.
-	fn decode_len() -> Option<usize> where T: StorageDecodeLength {
+	fn decode_len() -> Option<usize>
+	where
+		T: StorageDecodeLength,
+	{
 		T::decode_len(&Self::hashed_key())
 	}
 }
@@ -252,7 +259,10 @@ pub trait StorageMap<K: FullEncode, V: FullCodec> {
 	/// Mutate the value under a key.
 	///
 	/// Deletes the item if mutated to a `None`.
-	fn mutate_exists<KeyArg: EncodeLike<K>, R, F: FnOnce(&mut Option<V>) -> R>(key: KeyArg, f: F) -> R;
+	fn mutate_exists<KeyArg: EncodeLike<K>, R, F: FnOnce(&mut Option<V>) -> R>(
+		key: KeyArg,
+		f: F,
+	) -> R;
 
 	/// Mutate the item, only if an `Ok` value is returned. Deletes the item if mutated to a `None`.
 	fn try_mutate_exists<KeyArg: EncodeLike<K>, R, E, F: FnOnce(&mut Option<V>) -> Result<R, E>>(
@@ -292,7 +302,8 @@ pub trait StorageMap<K: FullEncode, V: FullCodec> {
 	/// `None` does not mean that `get()` does not return a value. The default value is completly
 	/// ignored by this function.
 	fn decode_len<KeyArg: EncodeLike<K>>(key: KeyArg) -> Option<usize>
-		where V: StorageDecodeLength,
+	where
+		V: StorageDecodeLength,
 	{
 		V::decode_len(&Self::hashed_key_for(key))
 	}
@@ -337,11 +348,9 @@ pub trait IterableStorageMap<K: FullEncode, V: FullCodec>: StorageMap<K, V> {
 }
 
 /// A strongly-typed double map in storage whose secondary keys and values can be iterated over.
-pub trait IterableStorageDoubleMap<
-	K1: FullCodec,
-	K2: FullCodec,
-	V: FullCodec
->: StorageDoubleMap<K1, K2, V> {
+pub trait IterableStorageDoubleMap<K1: FullCodec, K2: FullCodec, V: FullCodec>:
+	StorageDoubleMap<K1, K2, V>
+{
 	/// The type that iterates over all `key2`.
 	type PartialKeyIterator: Iterator<Item = K2>;
 
@@ -401,19 +410,22 @@ pub trait IterableStorageNMap<K: ReversibleKeyGenerator, V: FullCodec>: StorageN
 	/// remove values whose prefix is `kp` to the map while doing this, you'll get undefined
 	/// results.
 	fn iter_prefix<KP>(kp: KP) -> PrefixIterator<(<K as HasKeyPrefix<KP>>::Suffix, V)>
-	where K: HasReversibleKeyPrefix<KP>;
+	where
+		K: HasReversibleKeyPrefix<KP>;
 
 	/// Enumerate all suffix keys in the map with prefix key `kp` in no particular order. If you
 	/// add or remove values whose prefix is `kp` to the map while doing this, you'll get undefined
 	/// results.
 	fn iter_key_prefix<KP>(kp: KP) -> KeyPrefixIterator<<K as HasKeyPrefix<KP>>::Suffix>
-	where K: HasReversibleKeyPrefix<KP>;
+	where
+		K: HasReversibleKeyPrefix<KP>;
 
 	/// Remove all elements from the map with prefix key `kp` and iterate through them in no
 	/// particular order. If you add elements with prefix key `kp` to the map while doing this,
 	/// you'll get undefined results.
 	fn drain_prefix<KP>(kp: KP) -> PrefixIterator<(<K as HasKeyPrefix<KP>>::Suffix, V)>
-	where K: HasReversibleKeyPrefix<KP>;
+	where
+		K: HasReversibleKeyPrefix<KP>;
 
 	/// Enumerate all elements in the map in no particular order. If you add or remove values to
 	/// the map while doing this, you'll get undefined results.
@@ -499,11 +511,13 @@ pub trait StorageDoubleMap<K1: FullEncode, K2: FullEncode, V: FullCodec> {
 
 	/// Remove all values under the first key.
 	fn remove_prefix<KArg1>(k1: KArg1, limit: Option<u32>) -> sp_io::KillStorageResult
-		where KArg1: ?Sized + EncodeLike<K1>;
+	where
+		KArg1: ?Sized + EncodeLike<K1>;
 
 	/// Iterate over values that share the first key.
 	fn iter_prefix_values<KArg1>(k1: KArg1) -> PrefixIterator<V>
-		where KArg1: ?Sized + EncodeLike<K1>;
+	where
+		KArg1: ?Sized + EncodeLike<K1>;
 
 	/// Mutate the value under the given keys.
 	fn mutate<KArg1, KArg2, R, F>(k1: KArg1, k2: KArg2, f: F) -> R
@@ -542,11 +556,8 @@ pub trait StorageDoubleMap<K1: FullEncode, K2: FullEncode, V: FullCodec> {
 	/// If the storage item is not encoded properly, the storage will be overwritten
 	/// and set to `[item]`. Any default value set for the storage item will be ignored
 	/// on overwrite.
-	fn append<Item, EncodeLikeItem, KArg1, KArg2>(
-		k1: KArg1,
-		k2: KArg2,
-		item: EncodeLikeItem,
-	) where
+	fn append<Item, EncodeLikeItem, KArg1, KArg2>(k1: KArg1, k2: KArg2, item: EncodeLikeItem)
+	where
 		KArg1: EncodeLike<K1>,
 		KArg2: EncodeLike<K2>,
 		Item: Encode,
@@ -566,10 +577,10 @@ pub trait StorageDoubleMap<K1: FullEncode, K2: FullEncode, V: FullCodec> {
 	/// `None` does not mean that `get()` does not return a value. The default value is completly
 	/// ignored by this function.
 	fn decode_len<KArg1, KArg2>(key1: KArg1, key2: KArg2) -> Option<usize>
-		where
-			KArg1: EncodeLike<K1>,
-			KArg2: EncodeLike<K2>,
-			V: StorageDecodeLength,
+	where
+		KArg1: EncodeLike<K1>,
+		KArg2: EncodeLike<K2>,
+		V: StorageDecodeLength,
 	{
 		V::decode_len(&Self::hashed_key_for(key1, key2))
 	}
@@ -583,7 +594,10 @@ pub trait StorageDoubleMap<K1: FullEncode, K2: FullEncode, V: FullCodec> {
 		OldHasher2: StorageHasher,
 		KeyArg1: EncodeLike<K1>,
 		KeyArg2: EncodeLike<K2>,
-	>(key1: KeyArg1, key2: KeyArg2) -> Option<V>;
+	>(
+		key1: KeyArg1,
+		key2: KeyArg2,
+	) -> Option<V>;
 }
 
 /// An implementation of a map with an arbitrary number of keys.
@@ -625,10 +639,13 @@ pub trait StorageNMap<K: KeyGenerator, V: FullCodec> {
 
 	/// Remove all values under the partial prefix key.
 	fn remove_prefix<KP>(partial_key: KP, limit: Option<u32>) -> sp_io::KillStorageResult
-		where K: HasKeyPrefix<KP>;
+	where
+		K: HasKeyPrefix<KP>;
 
 	/// Iterate over values that share the partial prefix key.
-	fn iter_prefix_values<KP>(partial_key: KP) -> PrefixIterator<V> where K: HasKeyPrefix<KP>;
+	fn iter_prefix_values<KP>(partial_key: KP) -> PrefixIterator<V>
+	where
+		K: HasKeyPrefix<KP>;
 
 	/// Mutate the value under a key.
 	fn mutate<KArg, R, F>(key: KArg, f: F) -> R
@@ -741,7 +758,7 @@ impl<T> Iterator for PrefixIterator<T> {
 								self.previous_key,
 							);
 							continue
-						}
+						},
 					};
 					if self.drain {
 						unhashed::kill(&self.previous_key)
@@ -756,11 +773,11 @@ impl<T> Iterator for PrefixIterator<T> {
 								e,
 							);
 							continue
-						}
+						},
 					};
 
 					Some(item)
-				}
+				},
 				None => None,
 			}
 		}
@@ -807,12 +824,12 @@ impl<T> Iterator for KeyPrefixIterator<T> {
 					Ok(item) => return Some(item),
 					Err(e) => {
 						log::error!("key failed to decode at {:?}: {:?}", self.previous_key, e);
-						continue;
-					}
+						continue
+					},
 				}
 			}
 
-			return None;
+			return None
 		}
 	}
 }
@@ -871,7 +888,10 @@ impl<K: Decode + Sized, T: Decode + Sized> ChildTriePrefixIterator<(K, T)> {
 	/// Construct iterator to iterate over child trie items in `child_info` with the prefix `prefix`.
 	///
 	/// NOTE: Iterator with [`Self::drain`] will remove any key or value who failed to decode
-	pub fn with_prefix_over_key<H: ReversibleStorageHasher>(child_info: &ChildInfo, prefix: &[u8]) -> Self {
+	pub fn with_prefix_over_key<H: ReversibleStorageHasher>(
+		child_info: &ChildInfo,
+		prefix: &[u8],
+	) -> Self {
 		let prefix = prefix.to_vec();
 		let previous_key = prefix.clone();
 		let closure = |raw_key_without_prefix: &[u8], raw_value: &[u8]| {
@@ -888,7 +908,7 @@ impl<K: Decode + Sized, T: Decode + Sized> ChildTriePrefixIterator<(K, T)> {
 			drain: false,
 			fetch_previous_key: true,
 			closure,
-		 }
+		}
 	}
 }
 
@@ -905,7 +925,7 @@ impl<T> Iterator for ChildTriePrefixIterator<T> {
 					&self.child_info.storage_key(),
 					&self.previous_key,
 				)
-					.filter(|n| n.starts_with(&self.prefix))
+				.filter(|n| n.starts_with(&self.prefix))
 			};
 			break match maybe_next {
 				Some(next) => {
@@ -918,7 +938,7 @@ impl<T> Iterator for ChildTriePrefixIterator<T> {
 								self.previous_key,
 							);
 							continue
-						}
+						},
 					};
 					if self.drain {
 						child::kill(&self.child_info, &self.previous_key)
@@ -933,11 +953,11 @@ impl<T> Iterator for ChildTriePrefixIterator<T> {
 								e,
 							);
 							continue
-						}
+						},
 					};
 
 					Some(item)
-				}
+				},
 				None => None,
 			}
 		}
@@ -999,8 +1019,8 @@ pub trait StoragePrefixedMap<Value: FullCodec> {
 	fn translate_values<OldValue: Decode, F: FnMut(OldValue) -> Option<Value>>(mut f: F) {
 		let prefix = Self::final_prefix();
 		let mut previous_key = prefix.clone().to_vec();
-		while let Some(next) = sp_io::storage::next_key(&previous_key)
-			.filter(|n| n.starts_with(&prefix))
+		while let Some(next) =
+			sp_io::storage::next_key(&previous_key).filter(|n| n.starts_with(&prefix))
 		{
 			previous_key = next;
 			let maybe_value = unhashed::get::<OldValue>(&previous_key);
@@ -1010,10 +1030,7 @@ pub trait StoragePrefixedMap<Value: FullCodec> {
 					None => unhashed::kill(&previous_key),
 				},
 				None => {
-					log::error!(
-						"old key failed to decode at {:?}",
-						previous_key,
-					);
+					log::error!("old key failed to decode at {:?}", previous_key,);
 					continue
 				},
 			}
@@ -1218,13 +1235,13 @@ where
 #[cfg(test)]
 mod test {
 	use super::*;
+	use crate::{assert_ok, hash::Identity};
+	use bounded_vec::BoundedVec;
+	use core::convert::{TryFrom, TryInto};
+	use generator::StorageValue as _;
 	use sp_core::hashing::twox_128;
-	use crate::{hash::Identity, assert_ok};
 	use sp_io::TestExternalities;
-	use generator::StorageValue as _;
-	use bounded_vec::BoundedVec;
 	use weak_bounded_vec::WeakBoundedVec;
-	use core::convert::{TryFrom, TryInto};
 
 	#[test]
 	fn prefixed_map_works() {
@@ -1363,8 +1380,7 @@ mod test {
 	#[test]
 	fn key_prefix_iterator_works() {
 		TestExternalities::default().execute_with(|| {
-			use crate::storage::generator::StorageMap;
-			use crate::hash::Twox64Concat;
+			use crate::{hash::Twox64Concat, storage::generator::StorageMap};
 			struct MyStorageMap;
 			impl StorageMap<u64, u64> for MyStorageMap {
 				type Query = u64;
@@ -1426,30 +1442,21 @@ mod test {
 			assert_eq!(
 				ChildTriePrefixIterator::with_prefix(&child_info_a, &[2])
 					.collect::<Vec<(Vec<u8>, u16)>>(),
-				vec![
-					(vec![], 8),
-					(vec![2, 3], 8),
-				],
+				vec![(vec![], 8), (vec![2, 3], 8),],
 			);
 
 			assert_eq!(
 				ChildTriePrefixIterator::with_prefix(&child_info_a, &[2])
 					.drain()
 					.collect::<Vec<(Vec<u8>, u16)>>(),
-				vec![
-					(vec![], 8),
-					(vec![2, 3], 8),
-				],
+				vec![(vec![], 8), (vec![2, 3], 8),],
 			);
 
 			// The only remaining is the ones outside prefix
 			assert_eq!(
 				ChildTriePrefixIterator::with_prefix(&child_info_a, &[])
 					.collect::<Vec<(Vec<u8>, u8)>>(),
-				vec![
-					(vec![1, 2, 3], 8),
-					(vec![3], 8),
-				],
+				vec![(vec![1, 2, 3], 8), (vec![3], 8),],
 			);
 
 			child::put(&child_info_a, &[1, 2, 3], &8u16);
@@ -1461,28 +1468,21 @@ mod test {
 			assert_eq!(
 				ChildTriePrefixIterator::with_prefix_over_key::<Identity>(&child_info_a, &[2])
 					.collect::<Vec<(u16, u16)>>(),
-				vec![
-					(u16::decode(&mut &[2, 3][..]).unwrap(), 8),
-				],
+				vec![(u16::decode(&mut &[2, 3][..]).unwrap(), 8),],
 			);
 
 			assert_eq!(
 				ChildTriePrefixIterator::with_prefix_over_key::<Identity>(&child_info_a, &[2])
 					.drain()
 					.collect::<Vec<(u16, u16)>>(),
-				vec![
-					(u16::decode(&mut &[2, 3][..]).unwrap(), 8),
-				],
+				vec![(u16::decode(&mut &[2, 3][..]).unwrap(), 8),],
 			);
 
 			// The only remaining is the ones outside prefix
 			assert_eq!(
 				ChildTriePrefixIterator::with_prefix(&child_info_a, &[])
 					.collect::<Vec<(Vec<u8>, u8)>>(),
-				vec![
-					(vec![1, 2, 3], 8),
-					(vec![3], 8),
-				],
+				vec![(vec![1, 2, 3], 8), (vec![3], 8),],
 			);
 		});
 	}
diff --git a/frame/support/src/storage/types/double_map.rs b/frame/support/src/storage/types/double_map.rs
index 5143967d8c97..1704f8a647cb 100644
--- a/frame/support/src/storage/types/double_map.rs
+++ b/frame/support/src/storage/types/double_map.rs
@@ -18,14 +18,14 @@
 //! Storage map type. Implements StorageDoubleMap, StorageIterableDoubleMap,
 //! StoragePrefixedDoubleMap traits and their methods directly.
 
-use codec::{Decode, Encode, EncodeLike, FullCodec, MaxEncodedLen};
 use crate::{
 	storage::{
-		StorageAppend, StorageTryAppend, StorageDecodeLength, StoragePrefixedMap,
-		types::{OptionQuery, QueryKindTrait, OnEmptyGetter},
+		types::{OnEmptyGetter, OptionQuery, QueryKindTrait},
+		StorageAppend, StorageDecodeLength, StoragePrefixedMap, StorageTryAppend,
 	},
-	traits::{GetDefault, StorageInstance, Get, StorageInfo},
+	traits::{Get, GetDefault, StorageInfo, StorageInstance},
 };
+use codec::{Decode, Encode, EncodeLike, FullCodec, MaxEncodedLen};
 use frame_metadata::{DefaultByteGetter, StorageEntryModifier};
 use sp_arithmetic::traits::SaturatedConversion;
 use sp_std::prelude::*;
@@ -36,9 +36,9 @@ use sp_std::prelude::*;
 /// Each value is stored at:
 /// ```nocompile
 /// Twox128(Prefix::pallet_prefix())
-///		++ Twox128(Prefix::STORAGE_PREFIX)
-///		++ Hasher1(encode(key1))
-///		++ Hasher2(encode(key2))
+/// 		++ Twox128(Prefix::STORAGE_PREFIX)
+/// 		++ Hasher1(encode(key1))
+/// 		++ Hasher2(encode(key2))
 /// ```
 ///
 /// # Warning
@@ -53,18 +53,26 @@ pub struct StorageDoubleMap<
 	Hasher2,
 	Key2,
 	Value,
-	QueryKind=OptionQuery,
-	OnEmpty=GetDefault,
-	MaxValues=GetDefault,
+	QueryKind = OptionQuery,
+	OnEmpty = GetDefault,
+	MaxValues = GetDefault,
 >(
-	core::marker::PhantomData<
-		(Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty, MaxValues)
-	>
+	core::marker::PhantomData<(
+		Prefix,
+		Hasher1,
+		Key1,
+		Hasher2,
+		Key2,
+		Value,
+		QueryKind,
+		OnEmpty,
+		MaxValues,
+	)>,
 );
 
 impl<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty, MaxValues>
-	crate::storage::generator::StorageDoubleMap<Key1, Key2, Value> for
-	StorageDoubleMap<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty, MaxValues>
+	crate::storage::generator::StorageDoubleMap<Key1, Key2, Value>
+	for StorageDoubleMap<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty, MaxValues>
 where
 	Prefix: StorageInstance,
 	Hasher1: crate::hash::StorageHasher,
@@ -94,8 +102,8 @@ where
 }
 
 impl<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty, MaxValues>
-	StoragePrefixedMap<Value> for
-	StorageDoubleMap<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty, MaxValues>
+	StoragePrefixedMap<Value>
+	for StorageDoubleMap<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty, MaxValues>
 where
 	Prefix: StorageInstance,
 	Hasher1: crate::hash::StorageHasher,
@@ -161,7 +169,8 @@ where
 	pub fn try_get<KArg1, KArg2>(k1: KArg1, k2: KArg2) -> Result<Value, ()>
 	where
 		KArg1: EncodeLike<Key1>,
-		KArg2: EncodeLike<Key2> {
+		KArg2: EncodeLike<Key2>,
+	{
 		<Self as crate::storage::StorageDoubleMap<Key1, Key2, Value>>::try_get(k1, k2)
 	}
 
@@ -175,8 +184,12 @@ where
 	}
 
 	/// Swap the values of two key-pairs.
-	pub fn swap<XKArg1, XKArg2, YKArg1, YKArg2>(x_k1: XKArg1, x_k2: XKArg2, y_k1: YKArg1, y_k2: YKArg2)
-	where
+	pub fn swap<XKArg1, XKArg2, YKArg1, YKArg2>(
+		x_k1: XKArg1,
+		x_k2: XKArg2,
+		y_k1: YKArg1,
+		y_k2: YKArg2,
+	) where
 		XKArg1: EncodeLike<Key1>,
 		XKArg2: EncodeLike<Key2>,
 		YKArg1: EncodeLike<Key1>,
@@ -206,13 +219,16 @@ where
 
 	/// Remove all values under the first key.
 	pub fn remove_prefix<KArg1>(k1: KArg1, limit: Option<u32>) -> sp_io::KillStorageResult
-		where KArg1: ?Sized + EncodeLike<Key1> {
+	where
+		KArg1: ?Sized + EncodeLike<Key1>,
+	{
 		<Self as crate::storage::StorageDoubleMap<Key1, Key2, Value>>::remove_prefix(k1, limit)
 	}
 
 	/// Iterate over values that share the first key.
 	pub fn iter_prefix_values<KArg1>(k1: KArg1) -> crate::storage::PrefixIterator<Value>
-	where KArg1: ?Sized + EncodeLike<Key1>
+	where
+		KArg1: ?Sized + EncodeLike<Key1>,
 	{
 		<Self as crate::storage::StorageDoubleMap<Key1, Key2, Value>>::iter_prefix_values(k1)
 	}
@@ -266,11 +282,8 @@ where
 	/// If the storage item is not encoded properly, the storage will be overwritten
 	/// and set to `[item]`. Any default value set for the storage item will be ignored
 	/// on overwrite.
-	pub fn append<Item, EncodeLikeItem, KArg1, KArg2>(
-		k1: KArg1,
-		k2: KArg2,
-		item: EncodeLikeItem,
-	) where
+	pub fn append<Item, EncodeLikeItem, KArg1, KArg2>(k1: KArg1, k2: KArg2, item: EncodeLikeItem)
+	where
 		KArg1: EncodeLike<Key1>,
 		KArg2: EncodeLike<Key2>,
 		Item: Encode,
@@ -310,10 +323,16 @@ where
 		OldHasher2: crate::StorageHasher,
 		KeyArg1: EncodeLike<Key1>,
 		KeyArg2: EncodeLike<Key2>,
-	>(key1: KeyArg1, key2: KeyArg2) -> Option<Value> {
-		<
-			Self as crate::storage::StorageDoubleMap<Key1, Key2, Value>
-		>::migrate_keys::<OldHasher1, OldHasher2, _, _>(key1, key2)
+	>(
+		key1: KeyArg1,
+		key2: KeyArg2,
+	) -> Option<Value> {
+		<Self as crate::storage::StorageDoubleMap<Key1, Key2, Value>>::migrate_keys::<
+			OldHasher1,
+			OldHasher2,
+			_,
+			_,
+		>(key1, key2)
 	}
 
 	/// Remove all value of the storage.
@@ -360,9 +379,9 @@ where
 		EncodeLikeItem: EncodeLike<Item>,
 		Value: StorageTryAppend<Item>,
 	{
-		<
-			Self as crate::storage::TryAppendDoubleMap<Key1, Key2, Value, Item>
-		>::try_append(key1, key2, item)
+		<Self as crate::storage::TryAppendDoubleMap<Key1, Key2, Value, Item>>::try_append(
+			key1, key2, item,
+		)
 	}
 }
 
@@ -401,7 +420,9 @@ where
 	///
 	/// If you add elements with first key `k1` to the map while doing this, you'll get undefined
 	/// results.
-	pub fn drain_prefix(k1: impl EncodeLike<Key1>) -> crate::storage::PrefixIterator<(Key2, Value)> {
+	pub fn drain_prefix(
+		k1: impl EncodeLike<Key1>,
+	) -> crate::storage::PrefixIterator<(Key2, Value)> {
 		<Self as crate::storage::IterableStorageDoubleMap<Key1, Key2, Value>>::drain_prefix(k1)
 	}
 
@@ -448,8 +469,8 @@ pub trait StorageDoubleMapMetadata {
 }
 
 impl<Prefix, Hasher1, Hasher2, Key1, Key2, Value, QueryKind, OnEmpty, MaxValues>
-	StorageDoubleMapMetadata for
-	StorageDoubleMap<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty, MaxValues>
+	StorageDoubleMapMetadata
+	for StorageDoubleMap<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty, MaxValues>
 where
 	Prefix: StorageInstance,
 	Hasher1: crate::hash::StorageHasher,
@@ -470,8 +491,8 @@ where
 }
 
 impl<Prefix, Hasher1, Hasher2, Key1, Key2, Value, QueryKind, OnEmpty, MaxValues>
-	crate::traits::StorageInfoTrait for
-	StorageDoubleMap<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty, MaxValues>
+	crate::traits::StorageInfoTrait
+	for StorageDoubleMap<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty, MaxValues>
 where
 	Prefix: StorageInstance,
 	Hasher1: crate::hash::StorageHasher,
@@ -484,27 +505,25 @@ where
 	MaxValues: Get<Option<u32>>,
 {
 	fn storage_info() -> Vec<StorageInfo> {
-		vec![
-			StorageInfo {
-				pallet_name: Self::module_prefix().to_vec(),
-				storage_name: Self::storage_prefix().to_vec(),
-				prefix: Self::final_prefix().to_vec(),
-				max_values: MaxValues::get(),
-				max_size: Some(
-					Hasher1::max_len::<Key1>()
-						.saturating_add(Hasher2::max_len::<Key2>())
-						.saturating_add(Value::max_encoded_len())
-						.saturated_into(),
-				),
-			}
-		]
+		vec![StorageInfo {
+			pallet_name: Self::module_prefix().to_vec(),
+			storage_name: Self::storage_prefix().to_vec(),
+			prefix: Self::final_prefix().to_vec(),
+			max_values: MaxValues::get(),
+			max_size: Some(
+				Hasher1::max_len::<Key1>()
+					.saturating_add(Hasher2::max_len::<Key2>())
+					.saturating_add(Value::max_encoded_len())
+					.saturated_into(),
+			),
+		}]
 	}
 }
 
 /// It doesn't require to implement `MaxEncodedLen` and give no information for `max_size`.
 impl<Prefix, Hasher1, Hasher2, Key1, Key2, Value, QueryKind, OnEmpty, MaxValues>
-	crate::traits::PartialStorageInfoTrait for
-	StorageDoubleMap<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty, MaxValues>
+	crate::traits::PartialStorageInfoTrait
+	for StorageDoubleMap<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty, MaxValues>
 where
 	Prefix: StorageInstance,
 	Hasher1: crate::hash::StorageHasher,
@@ -517,29 +536,28 @@ where
 	MaxValues: Get<Option<u32>>,
 {
 	fn partial_storage_info() -> Vec<StorageInfo> {
-		vec![
-			StorageInfo {
-				pallet_name: Self::module_prefix().to_vec(),
-				storage_name: Self::storage_prefix().to_vec(),
-				prefix: Self::final_prefix().to_vec(),
-				max_values: MaxValues::get(),
-				max_size: None
-			}
-		]
+		vec![StorageInfo {
+			pallet_name: Self::module_prefix().to_vec(),
+			storage_name: Self::storage_prefix().to_vec(),
+			prefix: Self::final_prefix().to_vec(),
+			max_values: MaxValues::get(),
+			max_size: None,
+		}]
 	}
 }
 
 #[cfg(test)]
 mod test {
 	use super::*;
-	use sp_io::{TestExternalities, hashing::twox_128};
-	use crate::hash::*;
-	use crate::storage::types::ValueQuery;
+	use crate::{hash::*, storage::types::ValueQuery};
 	use frame_metadata::StorageEntryModifier;
+	use sp_io::{hashing::twox_128, TestExternalities};
 
 	struct Prefix;
 	impl StorageInstance for Prefix {
-		fn pallet_prefix() -> &'static str { "test" }
+		fn pallet_prefix() -> &'static str {
+			"test"
+		}
 		const STORAGE_PREFIX: &'static str = "foo";
 	}
 
@@ -552,11 +570,17 @@ mod test {
 
 	#[test]
 	fn test() {
-		type A = StorageDoubleMap<
-			Prefix, Blake2_128Concat, u16, Twox64Concat, u8, u32, OptionQuery
-		>;
+		type A =
+			StorageDoubleMap<Prefix, Blake2_128Concat, u16, Twox64Concat, u8, u32, OptionQuery>;
 		type AValueQueryWithAnOnEmpty = StorageDoubleMap<
-			Prefix, Blake2_128Concat, u16, Twox64Concat, u8, u32, ValueQuery, ADefault
+			Prefix,
+			Blake2_128Concat,
+			u16,
+			Twox64Concat,
+			u8,
+			u32,
+			ValueQuery,
+			ADefault,
 		>;
 		type B = StorageDoubleMap<Prefix, Blake2_256, u16, Twox128, u8, u32, ValueQuery>;
 		type C = StorageDoubleMap<Prefix, Blake2_128Concat, u16, Twox64Concat, u8, u8, ValueQuery>;
@@ -598,17 +622,20 @@ mod test {
 
 			A::remove(2, 20);
 			let _: Result<(), ()> = AValueQueryWithAnOnEmpty::try_mutate(2, 20, |v| {
-				*v = *v * 2; Ok(())
+				*v = *v * 2;
+				Ok(())
 			});
 			let _: Result<(), ()> = AValueQueryWithAnOnEmpty::try_mutate(2, 20, |v| {
-				*v = *v * 2; Ok(())
+				*v = *v * 2;
+				Ok(())
 			});
 			assert_eq!(A::contains_key(2, 20), true);
 			assert_eq!(A::get(2, 20), Some(97 * 4));
 
 			A::remove(2, 20);
 			let _: Result<(), ()> = AValueQueryWithAnOnEmpty::try_mutate(2, 20, |v| {
-				*v = *v * 2; Err(())
+				*v = *v * 2;
+				Err(())
 			});
 			assert_eq!(A::contains_key(2, 20), false);
 
@@ -647,7 +674,6 @@ mod test {
 			assert_eq!(A::contains_key(2, 20), true);
 			assert_eq!(A::get(2, 20), Some(100));
 
-
 			A::insert(2, 20, 10);
 			assert_eq!(A::take(2, 20), Some(10));
 			assert_eq!(A::contains_key(2, 20), false);
@@ -672,7 +698,7 @@ mod test {
 
 			C::insert(3, 30, 10);
 			C::insert(4, 40, 10);
-			A::translate_values::<u8,_>(|v| Some((v * 2).into()));
+			A::translate_values::<u8, _>(|v| Some((v * 2).into()));
 			assert_eq!(A::iter().collect::<Vec<_>>(), vec![(4, 40, 20), (3, 30, 20)]);
 
 			A::insert(3, 30, 10);
@@ -683,7 +709,7 @@ mod test {
 
 			C::insert(3, 30, 10);
 			C::insert(4, 40, 10);
-			A::translate::<u8,_>(|k1, k2, v| Some((k1 * k2 as u16 * v as u16).into()));
+			A::translate::<u8, _>(|k1, k2, v| Some((k1 * k2 as u16 * v as u16).into()));
 			assert_eq!(A::iter().collect::<Vec<_>>(), vec![(4, 40, 1600), (3, 30, 900)]);
 
 			assert_eq!(A::MODIFIER, StorageEntryModifier::Optional);
diff --git a/frame/support/src/storage/types/key.rs b/frame/support/src/storage/types/key.rs
index cafb501f9e41..a8cdb4546a6f 100755
--- a/frame/support/src/storage/types/key.rs
+++ b/frame/support/src/storage/types/key.rs
@@ -75,24 +75,16 @@ impl<H: StorageHasher, K: FullCodec> KeyGenerator for Key<H, K> {
 	const HASHER_METADATA: &'static [frame_metadata::StorageHasher] = &[H::METADATA];
 
 	fn final_key<KArg: EncodeLikeTuple<Self::KArg> + TupleToEncodedIter>(key: KArg) -> Vec<u8> {
-		H::hash(
-			&key.to_encoded_iter()
-				.next()
-				.expect("should have at least one element!"),
-		)
-		.as_ref()
-		.to_vec()
+		H::hash(&key.to_encoded_iter().next().expect("should have at least one element!"))
+			.as_ref()
+			.to_vec()
 	}
 
 	fn migrate_key<KArg: EncodeLikeTuple<Self::KArg> + TupleToEncodedIter>(
 		key: &KArg,
 		hash_fns: Self::HArg,
 	) -> Vec<u8> {
-		(hash_fns.0)(
-			&key.to_encoded_iter()
-				.next()
-				.expect("should have at least one element!"),
-		)
+		(hash_fns.0)(&key.to_encoded_iter().next().expect("should have at least one element!"))
 	}
 }
 
@@ -118,9 +110,8 @@ impl KeyGenerator for Tuple {
 	for_tuples!( type HArg = ( #(Tuple::HashFn),* ); );
 	type HashFn = Box<dyn FnOnce(&[u8]) -> Vec<u8>>;
 
-	const HASHER_METADATA: &'static [frame_metadata::StorageHasher] = &[
-		for_tuples!( #(Tuple::Hasher::METADATA),* )
-	];
+	const HASHER_METADATA: &'static [frame_metadata::StorageHasher] =
+		&[for_tuples!( #(Tuple::Hasher::METADATA),* )];
 
 	fn final_key<KArg: EncodeLikeTuple<Self::KArg> + TupleToEncodedIter>(key: KArg) -> Vec<u8> {
 		let mut final_key = Vec::new();
@@ -210,9 +201,7 @@ pub trait TupleToEncodedIter {
 #[tuple_types_custom_trait_bound(Encode)]
 impl TupleToEncodedIter for Tuple {
 	fn to_encoded_iter(&self) -> sp_std::vec::IntoIter<Vec<u8>> {
-		[for_tuples!( #(self.Tuple.encode()),* )]
-			.to_vec()
-			.into_iter()
+		[for_tuples!( #(self.Tuple.encode()),* )].to_vec().into_iter()
 	}
 }
 
@@ -246,7 +235,7 @@ impl ReversibleKeyGenerator for Tuple {
 	fn decode_final_key(key_material: &[u8]) -> Result<(Self::Key, &[u8]), codec::Error> {
 		let mut current_key_material = key_material;
 		Ok((
-			(for_tuples!{
+			(for_tuples! {
 				#({
 					let (key, material) = Tuple::decode_final_key(current_key_material)?;
 					current_key_material = material;
diff --git a/frame/support/src/storage/types/map.rs b/frame/support/src/storage/types/map.rs
index 168d5236ccfb..00fa3a3b8b40 100644
--- a/frame/support/src/storage/types/map.rs
+++ b/frame/support/src/storage/types/map.rs
@@ -18,14 +18,14 @@
 //! Storage map type. Implements StorageMap, StorageIterableMap, StoragePrefixedMap traits and their
 //! methods directly.
 
-use codec::{FullCodec, Decode, EncodeLike, Encode, MaxEncodedLen};
 use crate::{
 	storage::{
-		StorageAppend, StorageTryAppend, StorageDecodeLength, StoragePrefixedMap,
-		types::{OptionQuery, QueryKindTrait, OnEmptyGetter},
+		types::{OnEmptyGetter, OptionQuery, QueryKindTrait},
+		StorageAppend, StorageDecodeLength, StoragePrefixedMap, StorageTryAppend,
 	},
-	traits::{GetDefault, StorageInstance, Get, StorageInfo},
+	traits::{Get, GetDefault, StorageInfo, StorageInstance},
 };
+use codec::{Decode, Encode, EncodeLike, FullCodec, MaxEncodedLen};
 use frame_metadata::{DefaultByteGetter, StorageEntryModifier};
 use sp_arithmetic::traits::SaturatedConversion;
 use sp_std::prelude::*;
@@ -35,8 +35,8 @@ use sp_std::prelude::*;
 /// Each value is stored at:
 /// ```nocompile
 /// Twox128(Prefix::pallet_prefix())
-///		++ Twox128(Prefix::STORAGE_PREFIX)
-///		++ Hasher1(encode(key))
+/// 		++ Twox128(Prefix::STORAGE_PREFIX)
+/// 		++ Hasher1(encode(key))
 /// ```
 ///
 /// # Warning
@@ -44,10 +44,14 @@ use sp_std::prelude::*;
 /// If the keys are not trusted (e.g. can be set by a user), a cryptographic `hasher` such as
 /// `blake2_128_concat` must be used.  Otherwise, other values in storage can be compromised.
 pub struct StorageMap<
-	Prefix, Hasher, Key, Value, QueryKind=OptionQuery, OnEmpty=GetDefault, MaxValues=GetDefault,
->(
-	core::marker::PhantomData<(Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues)>
-);
+	Prefix,
+	Hasher,
+	Key,
+	Value,
+	QueryKind = OptionQuery,
+	OnEmpty = GetDefault,
+	MaxValues = GetDefault,
+>(core::marker::PhantomData<(Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues)>);
 
 impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
 	crate::storage::generator::StorageMap<Key, Value>
@@ -77,9 +81,8 @@ where
 	}
 }
 
-impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
-	StoragePrefixedMap<Value> for
-	StorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
+impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues> StoragePrefixedMap<Value>
+	for StorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
 where
 	Prefix: StorageInstance,
 	Hasher: crate::hash::StorageHasher,
@@ -148,7 +151,7 @@ where
 	/// Mutate the value under a key.
 	pub fn mutate<KeyArg: EncodeLike<Key>, R, F: FnOnce(&mut QueryKind::Query) -> R>(
 		key: KeyArg,
-		f: F
+		f: F,
 	) -> R {
 		<Self as crate::storage::StorageMap<Key, Value>>::mutate(key, f)
 	}
@@ -165,7 +168,7 @@ where
 	/// Mutate the value under a key. Deletes the item if mutated to a `None`.
 	pub fn mutate_exists<KeyArg: EncodeLike<Key>, R, F: FnOnce(&mut Option<Value>) -> R>(
 		key: KeyArg,
-		f: F
+		f: F,
 	) -> R {
 		<Self as crate::storage::StorageMap<Key, Value>>::mutate_exists(key, f)
 	}
@@ -198,7 +201,7 @@ where
 		EncodeLikeKey: EncodeLike<Key>,
 		Item: Encode,
 		EncodeLikeItem: EncodeLike<Item>,
-		Value: StorageAppend<Item>
+		Value: StorageAppend<Item>,
 	{
 		<Self as crate::storage::StorageMap<Key, Value>>::append(key, item)
 	}
@@ -216,7 +219,8 @@ where
 	/// `None` does not mean that `get()` does not return a value. The default value is completly
 	/// ignored by this function.
 	pub fn decode_len<KeyArg: EncodeLike<Key>>(key: KeyArg) -> Option<usize>
-		where Value: StorageDecodeLength,
+	where
+		Value: StorageDecodeLength,
 	{
 		<Self as crate::storage::StorageMap<Key, Value>>::decode_len(key)
 	}
@@ -225,7 +229,7 @@ where
 	///
 	/// If the key doesn't exist, then it's a no-op. If it does, then it returns its value.
 	pub fn migrate_key<OldHasher: crate::hash::StorageHasher, KeyArg: EncodeLike<Key>>(
-		key: KeyArg
+		key: KeyArg,
 	) -> Option<Value> {
 		<Self as crate::storage::StorageMap<Key, Value>>::migrate_key::<OldHasher, _>(key)
 	}
@@ -263,19 +267,14 @@ where
 	/// Try and append the given item to the value in the storage.
 	///
 	/// Is only available if `Value` of the storage implements [`StorageTryAppend`].
-	pub fn try_append<KArg, Item, EncodeLikeItem>(
-		key: KArg,
-		item: EncodeLikeItem,
-	) -> Result<(), ()>
+	pub fn try_append<KArg, Item, EncodeLikeItem>(key: KArg, item: EncodeLikeItem) -> Result<(), ()>
 	where
 		KArg: EncodeLike<Key> + Clone,
 		Item: Encode,
 		EncodeLikeItem: EncodeLike<Item>,
 		Value: StorageTryAppend<Item>,
 	{
-		<
-			Self as crate::storage::TryAppendMap<Key, Value, Item>
-		>::try_append(key, item)
+		<Self as crate::storage::TryAppendMap<Key, Value, Item>>::try_append(key, item)
 	}
 }
 
@@ -332,7 +331,8 @@ pub trait StorageMapMetadata {
 }
 
 impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues> StorageMapMetadata
-	for StorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues> where
+	for StorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
+where
 	Prefix: StorageInstance,
 	Hasher: crate::hash::StorageHasher,
 	Key: FullCodec,
@@ -348,9 +348,8 @@ impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues> StorageMapMetada
 		DefaultByteGetter(&OnEmptyGetter::<QueryKind::Query, OnEmpty>(core::marker::PhantomData));
 }
 
-impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
-	crate::traits::StorageInfoTrait for
-	StorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
+impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues> crate::traits::StorageInfoTrait
+	for StorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
 where
 	Prefix: StorageInstance,
 	Hasher: crate::hash::StorageHasher,
@@ -361,26 +360,24 @@ where
 	MaxValues: Get<Option<u32>>,
 {
 	fn storage_info() -> Vec<StorageInfo> {
-		vec![
-			StorageInfo {
-				pallet_name: Self::module_prefix().to_vec(),
-				storage_name: Self::storage_prefix().to_vec(),
-				prefix: Self::final_prefix().to_vec(),
-				max_values: MaxValues::get(),
-				max_size: Some(
-					Hasher::max_len::<Key>()
-						.saturating_add(Value::max_encoded_len())
-						.saturated_into(),
-				),
-			}
-		]
+		vec![StorageInfo {
+			pallet_name: Self::module_prefix().to_vec(),
+			storage_name: Self::storage_prefix().to_vec(),
+			prefix: Self::final_prefix().to_vec(),
+			max_values: MaxValues::get(),
+			max_size: Some(
+				Hasher::max_len::<Key>()
+					.saturating_add(Value::max_encoded_len())
+					.saturated_into(),
+			),
+		}]
 	}
 }
 
 /// It doesn't require to implement `MaxEncodedLen` and give no information for `max_size`.
 impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
-	crate::traits::PartialStorageInfoTrait for
-	StorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
+	crate::traits::PartialStorageInfoTrait
+	for StorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
 where
 	Prefix: StorageInstance,
 	Hasher: crate::hash::StorageHasher,
@@ -391,29 +388,28 @@ where
 	MaxValues: Get<Option<u32>>,
 {
 	fn partial_storage_info() -> Vec<StorageInfo> {
-		vec![
-			StorageInfo {
-				pallet_name: Self::module_prefix().to_vec(),
-				storage_name: Self::storage_prefix().to_vec(),
-				prefix: Self::final_prefix().to_vec(),
-				max_values: MaxValues::get(),
-				max_size: None,
-			}
-		]
+		vec![StorageInfo {
+			pallet_name: Self::module_prefix().to_vec(),
+			storage_name: Self::storage_prefix().to_vec(),
+			prefix: Self::final_prefix().to_vec(),
+			max_values: MaxValues::get(),
+			max_size: None,
+		}]
 	}
 }
 
 #[cfg(test)]
 mod test {
 	use super::*;
-	use sp_io::{TestExternalities, hashing::twox_128};
-	use crate::hash::*;
-	use crate::storage::types::ValueQuery;
+	use crate::{hash::*, storage::types::ValueQuery};
 	use frame_metadata::StorageEntryModifier;
+	use sp_io::{hashing::twox_128, TestExternalities};
 
 	struct Prefix;
 	impl StorageInstance for Prefix {
-		fn pallet_prefix() -> &'static str { "test" }
+		fn pallet_prefix() -> &'static str {
+			"test"
+		}
 		const STORAGE_PREFIX: &'static str = "foo";
 	}
 
@@ -427,9 +423,8 @@ mod test {
 	#[test]
 	fn test() {
 		type A = StorageMap<Prefix, Blake2_128Concat, u16, u32, OptionQuery>;
-		type AValueQueryWithAnOnEmpty = StorageMap<
-			Prefix, Blake2_128Concat, u16, u32, ValueQuery, ADefault
-		>;
+		type AValueQueryWithAnOnEmpty =
+			StorageMap<Prefix, Blake2_128Concat, u16, u32, ValueQuery, ADefault>;
 		type B = StorageMap<Prefix, Blake2_256, u16, u32, ValueQuery>;
 		type C = StorageMap<Prefix, Blake2_128Concat, u16, u8, ValueQuery>;
 		type WithLen = StorageMap<Prefix, Blake2_128Concat, u16, Vec<u32>>;
@@ -471,17 +466,20 @@ mod test {
 
 			A::remove(2);
 			let _: Result<(), ()> = AValueQueryWithAnOnEmpty::try_mutate(2, |v| {
-				*v = *v * 2; Ok(())
+				*v = *v * 2;
+				Ok(())
 			});
 			let _: Result<(), ()> = AValueQueryWithAnOnEmpty::try_mutate(2, |v| {
-				*v = *v * 2; Ok(())
+				*v = *v * 2;
+				Ok(())
 			});
 			assert_eq!(A::contains_key(2), true);
 			assert_eq!(A::get(2), Some(97 * 4));
 
 			A::remove(2);
 			let _: Result<(), ()> = AValueQueryWithAnOnEmpty::try_mutate(2, |v| {
-				*v = *v * 2; Err(())
+				*v = *v * 2;
+				Err(())
 			});
 			assert_eq!(A::contains_key(2), false);
 
@@ -519,7 +517,6 @@ mod test {
 			assert_eq!(A::contains_key(2), true);
 			assert_eq!(A::get(2), Some(100));
 
-
 			A::insert(2, 10);
 			assert_eq!(A::take(2), Some(10));
 			assert_eq!(A::contains_key(2), false);
@@ -543,7 +540,7 @@ mod test {
 
 			C::insert(3, 10);
 			C::insert(4, 10);
-			A::translate_values::<u8,_>(|v| Some((v * 2).into()));
+			A::translate_values::<u8, _>(|v| Some((v * 2).into()));
 			assert_eq!(A::iter().collect::<Vec<_>>(), vec![(4, 20), (3, 20)]);
 
 			A::insert(3, 10);
@@ -554,7 +551,7 @@ mod test {
 
 			C::insert(3, 10);
 			C::insert(4, 10);
-			A::translate::<u8,_>(|k, v| Some((k * v as u16).into()));
+			A::translate::<u8, _>(|k, v| Some((k * v as u16).into()));
 			assert_eq!(A::iter().collect::<Vec<_>>(), vec![(4, 40), (3, 30)]);
 
 			assert_eq!(A::MODIFIER, StorageEntryModifier::Optional);
diff --git a/frame/support/src/storage/types/mod.rs b/frame/support/src/storage/types/mod.rs
index f61065671315..f800f33dc316 100644
--- a/frame/support/src/storage/types/mod.rs
+++ b/frame/support/src/storage/types/mod.rs
@@ -30,7 +30,7 @@ mod value;
 pub use double_map::{StorageDoubleMap, StorageDoubleMapMetadata};
 pub use key::{
 	EncodeLikeTuple, HasKeyPrefix, HasReversibleKeyPrefix, Key, KeyGenerator,
-	ReversibleKeyGenerator, TupleToEncodedIter, KeyGeneratorMaxEncodedLen,
+	KeyGeneratorMaxEncodedLen, ReversibleKeyGenerator, TupleToEncodedIter,
 };
 pub use map::{StorageMap, StorageMapMetadata};
 pub use nmap::{StorageNMap, StorageNMapMetadata};
diff --git a/frame/support/src/storage/types/nmap.rs b/frame/support/src/storage/types/nmap.rs
index 63c27729d281..f62cd1435a2d 100755
--- a/frame/support/src/storage/types/nmap.rs
+++ b/frame/support/src/storage/types/nmap.rs
@@ -21,12 +21,12 @@
 use crate::{
 	storage::{
 		types::{
-			EncodeLikeTuple, HasKeyPrefix, HasReversibleKeyPrefix, OnEmptyGetter,
-			OptionQuery, QueryKindTrait, TupleToEncodedIter,
+			EncodeLikeTuple, HasKeyPrefix, HasReversibleKeyPrefix, OnEmptyGetter, OptionQuery,
+			QueryKindTrait, TupleToEncodedIter,
 		},
 		KeyGenerator, PrefixIterator, StorageAppend, StorageDecodeLength, StoragePrefixedMap,
 	},
-	traits::{Get, GetDefault, StorageInstance, StorageInfo},
+	traits::{Get, GetDefault, StorageInfo, StorageInstance},
 };
 use codec::{Decode, Encode, EncodeLike, FullCodec, MaxEncodedLen};
 use frame_metadata::{DefaultByteGetter, StorageEntryModifier};
@@ -39,9 +39,9 @@ use sp_std::prelude::*;
 /// Each value is stored at:
 /// ```nocompile
 /// Twox128(Prefix::pallet_prefix())
-///		++ Twox128(Prefix::STORAGE_PREFIX)
-///		++ Hasher1(encode(key1))
-///		++ Hasher2(encode(key2))
+/// 		++ Twox128(Prefix::STORAGE_PREFIX)
+/// 		++ Hasher1(encode(key1))
+/// 		++ Hasher2(encode(key2))
 /// 	++ ...
 /// 	++ HasherN(encode(keyN))
 /// ```
@@ -52,10 +52,13 @@ use sp_std::prelude::*;
 /// such as `blake2_128_concat` must be used for the key hashers. Otherwise, other values
 /// in storage can be compromised.
 pub struct StorageNMap<
-	Prefix, Key, Value, QueryKind = OptionQuery, OnEmpty = GetDefault, MaxValues=GetDefault,
->(
-	core::marker::PhantomData<(Prefix, Key, Value, QueryKind, OnEmpty, MaxValues)>,
-);
+	Prefix,
+	Key,
+	Value,
+	QueryKind = OptionQuery,
+	OnEmpty = GetDefault,
+	MaxValues = GetDefault,
+>(core::marker::PhantomData<(Prefix, Key, Value, QueryKind, OnEmpty, MaxValues)>);
 
 impl<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues>
 	crate::storage::generator::StorageNMap<Key, Value>
@@ -83,8 +86,7 @@ where
 	}
 }
 
-impl<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues>
-	crate::storage::StoragePrefixedMap<Value>
+impl<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues> crate::storage::StoragePrefixedMap<Value>
 	for StorageNMap<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues>
 where
 	Prefix: StorageInstance,
@@ -113,7 +115,9 @@ where
 	MaxValues: Get<Option<u32>>,
 {
 	/// Get the storage key used to fetch a value corresponding to a specific key.
-	pub fn hashed_key_for<KArg: EncodeLikeTuple<Key::KArg> + TupleToEncodedIter>(key: KArg) -> Vec<u8> {
+	pub fn hashed_key_for<KArg: EncodeLikeTuple<Key::KArg> + TupleToEncodedIter>(
+		key: KArg,
+	) -> Vec<u8> {
 		<Self as crate::storage::StorageNMap<Key, Value>>::hashed_key_for(key)
 	}
 
@@ -123,7 +127,9 @@ where
 	}
 
 	/// Load the value associated with the given key from the map.
-	pub fn get<KArg: EncodeLikeTuple<Key::KArg> + TupleToEncodedIter>(key: KArg) -> QueryKind::Query {
+	pub fn get<KArg: EncodeLikeTuple<Key::KArg> + TupleToEncodedIter>(
+		key: KArg,
+	) -> QueryKind::Query {
 		<Self as crate::storage::StorageNMap<Key, Value>>::get(key)
 	}
 
@@ -137,7 +143,9 @@ where
 	}
 
 	/// Take a value from storage, removing it afterwards.
-	pub fn take<KArg: EncodeLikeTuple<Key::KArg> + TupleToEncodedIter>(key: KArg) -> QueryKind::Query {
+	pub fn take<KArg: EncodeLikeTuple<Key::KArg> + TupleToEncodedIter>(
+		key: KArg,
+	) -> QueryKind::Query {
 		<Self as crate::storage::StorageNMap<Key, Value>>::take(key)
 	}
 
@@ -248,7 +256,9 @@ where
 	///
 	/// `None` does not mean that `get()` does not return a value. The default value is completly
 	/// ignored by this function.
-	pub fn decode_len<KArg: EncodeLikeTuple<Key::KArg> + TupleToEncodedIter>(key: KArg) -> Option<usize>
+	pub fn decode_len<KArg: EncodeLikeTuple<Key::KArg> + TupleToEncodedIter>(
+		key: KArg,
+	) -> Option<usize>
 	where
 		Value: StorageDecodeLength,
 	{
@@ -260,7 +270,7 @@ where
 	/// If the key doesn't exist, then it's a no-op. If it does, then it returns its value.
 	pub fn migrate_keys<KArg>(key: KArg, hash_fns: Key::HArg) -> Option<Value>
 	where
-		KArg: EncodeLikeTuple<Key::KArg> + TupleToEncodedIter
+		KArg: EncodeLikeTuple<Key::KArg> + TupleToEncodedIter,
 	{
 		<Self as crate::storage::StorageNMap<Key, Value>>::migrate_keys::<_>(key, hash_fns)
 	}
@@ -398,15 +408,13 @@ where
 {
 	const MODIFIER: StorageEntryModifier = QueryKind::METADATA;
 	const NAME: &'static str = Prefix::STORAGE_PREFIX;
-	const DEFAULT: DefaultByteGetter = DefaultByteGetter(
-		&OnEmptyGetter::<QueryKind::Query, OnEmpty>(core::marker::PhantomData),
-	);
+	const DEFAULT: DefaultByteGetter =
+		DefaultByteGetter(&OnEmptyGetter::<QueryKind::Query, OnEmpty>(core::marker::PhantomData));
 	const HASHERS: &'static [frame_metadata::StorageHasher] = Key::HASHER_METADATA;
 }
 
-impl<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues>
-	crate::traits::StorageInfoTrait for
-	StorageNMap<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues>
+impl<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues> crate::traits::StorageInfoTrait
+	for StorageNMap<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues>
 where
 	Prefix: StorageInstance,
 	Key: super::key::KeyGenerator + super::key::KeyGeneratorMaxEncodedLen,
@@ -416,26 +424,23 @@ where
 	MaxValues: Get<Option<u32>>,
 {
 	fn storage_info() -> Vec<StorageInfo> {
-		vec![
-			StorageInfo {
-				pallet_name: Self::module_prefix().to_vec(),
-				storage_name: Self::storage_prefix().to_vec(),
-				prefix: Self::final_prefix().to_vec(),
-				max_values: MaxValues::get(),
-				max_size: Some(
-					Key::key_max_encoded_len()
-						.saturating_add(Value::max_encoded_len())
-						.saturated_into(),
-				),
-			}
-		]
+		vec![StorageInfo {
+			pallet_name: Self::module_prefix().to_vec(),
+			storage_name: Self::storage_prefix().to_vec(),
+			prefix: Self::final_prefix().to_vec(),
+			max_values: MaxValues::get(),
+			max_size: Some(
+				Key::key_max_encoded_len()
+					.saturating_add(Value::max_encoded_len())
+					.saturated_into(),
+			),
+		}]
 	}
 }
 
 /// It doesn't require to implement `MaxEncodedLen` and give no information for `max_size`.
-impl<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues>
-	crate::traits::PartialStorageInfoTrait for
-	StorageNMap<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues>
+impl<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues> crate::traits::PartialStorageInfoTrait
+	for StorageNMap<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues>
 where
 	Prefix: StorageInstance,
 	Key: super::key::KeyGenerator,
@@ -445,22 +450,22 @@ where
 	MaxValues: Get<Option<u32>>,
 {
 	fn partial_storage_info() -> Vec<StorageInfo> {
-		vec![
-			StorageInfo {
-				pallet_name: Self::module_prefix().to_vec(),
-				storage_name: Self::storage_prefix().to_vec(),
-				prefix: Self::final_prefix().to_vec(),
-				max_values: MaxValues::get(),
-				max_size: None,
-			}
-		]
+		vec![StorageInfo {
+			pallet_name: Self::module_prefix().to_vec(),
+			storage_name: Self::storage_prefix().to_vec(),
+			prefix: Self::final_prefix().to_vec(),
+			max_values: MaxValues::get(),
+			max_size: None,
+		}]
 	}
 }
 #[cfg(test)]
 mod test {
 	use super::*;
-	use crate::hash::*;
-	use crate::storage::types::{Key, ValueQuery};
+	use crate::{
+		hash::*,
+		storage::types::{Key, ValueQuery},
+	};
 	use frame_metadata::StorageEntryModifier;
 	use sp_io::{hashing::twox_128, TestExternalities};
 
@@ -627,15 +632,9 @@ mod test {
 			assert_eq!(A::iter().collect::<Vec<_>>(), vec![(4, 40), (3, 30)]);
 
 			assert_eq!(A::MODIFIER, StorageEntryModifier::Optional);
-			assert_eq!(
-				AValueQueryWithAnOnEmpty::MODIFIER,
-				StorageEntryModifier::Default
-			);
+			assert_eq!(AValueQueryWithAnOnEmpty::MODIFIER, StorageEntryModifier::Default);
 			assert_eq!(A::NAME, "Foo");
-			assert_eq!(
-				AValueQueryWithAnOnEmpty::DEFAULT.0.default_byte(),
-				98u32.encode()
-			);
+			assert_eq!(AValueQueryWithAnOnEmpty::DEFAULT.0.default_byte(), 98u32.encode());
 			assert_eq!(A::DEFAULT.0.default_byte(), Option::<u32>::None.encode());
 
 			WithLen::remove_all(None);
@@ -787,41 +786,23 @@ mod test {
 			C::insert((3, 30), 10);
 			C::insert((4, 40), 10);
 			A::translate_values::<u8, _>(|v| Some((v * 2).into()));
-			assert_eq!(
-				A::iter().collect::<Vec<_>>(),
-				vec![((4, 40), 20), ((3, 30), 20)]
-			);
+			assert_eq!(A::iter().collect::<Vec<_>>(), vec![((4, 40), 20), ((3, 30), 20)]);
 
 			A::insert((3, 30), 10);
 			A::insert((4, 40), 10);
-			assert_eq!(
-				A::iter().collect::<Vec<_>>(),
-				vec![((4, 40), 10), ((3, 30), 10)]
-			);
-			assert_eq!(
-				A::drain().collect::<Vec<_>>(),
-				vec![((4, 40), 10), ((3, 30), 10)]
-			);
+			assert_eq!(A::iter().collect::<Vec<_>>(), vec![((4, 40), 10), ((3, 30), 10)]);
+			assert_eq!(A::drain().collect::<Vec<_>>(), vec![((4, 40), 10), ((3, 30), 10)]);
 			assert_eq!(A::iter().collect::<Vec<_>>(), vec![]);
 
 			C::insert((3, 30), 10);
 			C::insert((4, 40), 10);
 			A::translate::<u8, _>(|(k1, k2), v| Some((k1 * k2 as u16 * v as u16).into()));
-			assert_eq!(
-				A::iter().collect::<Vec<_>>(),
-				vec![((4, 40), 1600), ((3, 30), 900)]
-			);
+			assert_eq!(A::iter().collect::<Vec<_>>(), vec![((4, 40), 1600), ((3, 30), 900)]);
 
 			assert_eq!(A::MODIFIER, StorageEntryModifier::Optional);
-			assert_eq!(
-				AValueQueryWithAnOnEmpty::MODIFIER,
-				StorageEntryModifier::Default
-			);
+			assert_eq!(AValueQueryWithAnOnEmpty::MODIFIER, StorageEntryModifier::Default);
 			assert_eq!(A::NAME, "Foo");
-			assert_eq!(
-				AValueQueryWithAnOnEmpty::DEFAULT.0.default_byte(),
-				98u32.encode()
-			);
+			assert_eq!(AValueQueryWithAnOnEmpty::DEFAULT.0.default_byte(), 98u32.encode());
 			assert_eq!(A::DEFAULT.0.default_byte(), Option::<u32>::None.encode());
 
 			WithLen::remove_all(None);
@@ -833,14 +814,8 @@ mod test {
 			A::insert((3, 31), 12);
 			A::insert((4, 40), 13);
 			A::insert((4, 41), 14);
-			assert_eq!(
-				A::iter_prefix_values((3,)).collect::<Vec<_>>(),
-				vec![12, 11]
-			);
-			assert_eq!(
-				A::iter_prefix_values((4,)).collect::<Vec<_>>(),
-				vec![13, 14]
-			);
+			assert_eq!(A::iter_prefix_values((3,)).collect::<Vec<_>>(), vec![12, 11]);
+			assert_eq!(A::iter_prefix_values((4,)).collect::<Vec<_>>(), vec![13, 14]);
 		});
 	}
 
@@ -848,52 +823,32 @@ mod test {
 	fn test_3_keys() {
 		type A = StorageNMap<
 			Prefix,
-			(
-				Key<Blake2_128Concat, u16>,
-				Key<Blake2_128Concat, u16>,
-				Key<Twox64Concat, u16>,
-			),
+			(Key<Blake2_128Concat, u16>, Key<Blake2_128Concat, u16>, Key<Twox64Concat, u16>),
 			u32,
 			OptionQuery,
 		>;
 		type AValueQueryWithAnOnEmpty = StorageNMap<
 			Prefix,
-			(
-				Key<Blake2_128Concat, u16>,
-				Key<Blake2_128Concat, u16>,
-				Key<Twox64Concat, u16>,
-			),
+			(Key<Blake2_128Concat, u16>, Key<Blake2_128Concat, u16>, Key<Twox64Concat, u16>),
 			u32,
 			ValueQuery,
 			ADefault,
 		>;
 		type B = StorageNMap<
 			Prefix,
-			(
-				Key<Blake2_256, u16>,
-				Key<Blake2_256, u16>,
-				Key<Twox128, u16>,
-			),
+			(Key<Blake2_256, u16>, Key<Blake2_256, u16>, Key<Twox128, u16>),
 			u32,
 			ValueQuery,
 		>;
 		type C = StorageNMap<
 			Prefix,
-			(
-				Key<Blake2_128Concat, u16>,
-				Key<Blake2_128Concat, u16>,
-				Key<Twox64Concat, u16>,
-			),
+			(Key<Blake2_128Concat, u16>, Key<Blake2_128Concat, u16>, Key<Twox64Concat, u16>),
 			u8,
 			ValueQuery,
 		>;
 		type WithLen = StorageNMap<
 			Prefix,
-			(
-				Key<Blake2_128Concat, u16>,
-				Key<Blake2_128Concat, u16>,
-				Key<Twox64Concat, u16>,
-			),
+			(Key<Blake2_128Concat, u16>, Key<Blake2_128Concat, u16>, Key<Twox64Concat, u16>),
 			Vec<u32>,
 		>;
 
@@ -916,11 +871,7 @@ mod test {
 			assert_eq!(AValueQueryWithAnOnEmpty::get((1, 10, 100)), 30);
 
 			A::swap::<
-				(
-					Key<Blake2_128Concat, u16>,
-					Key<Blake2_128Concat, u16>,
-					Key<Twox64Concat, u16>,
-				),
+				(Key<Blake2_128Concat, u16>, Key<Blake2_128Concat, u16>, Key<Twox64Concat, u16>),
 				_,
 				_,
 			>((1, 10, 100), (2, 20, 200));
@@ -1020,17 +971,11 @@ mod test {
 			C::insert((3, 30, 300), 10);
 			C::insert((4, 40, 400), 10);
 			A::translate_values::<u8, _>(|v| Some((v * 2).into()));
-			assert_eq!(
-				A::iter().collect::<Vec<_>>(),
-				vec![((4, 40, 400), 20), ((3, 30, 300), 20)]
-			);
+			assert_eq!(A::iter().collect::<Vec<_>>(), vec![((4, 40, 400), 20), ((3, 30, 300), 20)]);
 
 			A::insert((3, 30, 300), 10);
 			A::insert((4, 40, 400), 10);
-			assert_eq!(
-				A::iter().collect::<Vec<_>>(),
-				vec![((4, 40, 400), 10), ((3, 30, 300), 10)]
-			);
+			assert_eq!(A::iter().collect::<Vec<_>>(), vec![((4, 40, 400), 10), ((3, 30, 300), 10)]);
 			assert_eq!(
 				A::drain().collect::<Vec<_>>(),
 				vec![((4, 40, 400), 10), ((3, 30, 300), 10)]
@@ -1042,21 +987,12 @@ mod test {
 			A::translate::<u8, _>(|(k1, k2, k3), v| {
 				Some((k1 * k2 as u16 * v as u16 / k3 as u16).into())
 			});
-			assert_eq!(
-				A::iter().collect::<Vec<_>>(),
-				vec![((4, 40, 400), 4), ((3, 30, 300), 3)]
-			);
+			assert_eq!(A::iter().collect::<Vec<_>>(), vec![((4, 40, 400), 4), ((3, 30, 300), 3)]);
 
 			assert_eq!(A::MODIFIER, StorageEntryModifier::Optional);
-			assert_eq!(
-				AValueQueryWithAnOnEmpty::MODIFIER,
-				StorageEntryModifier::Default
-			);
+			assert_eq!(AValueQueryWithAnOnEmpty::MODIFIER, StorageEntryModifier::Default);
 			assert_eq!(A::NAME, "Foo");
-			assert_eq!(
-				AValueQueryWithAnOnEmpty::DEFAULT.0.default_byte(),
-				98u32.encode()
-			);
+			assert_eq!(AValueQueryWithAnOnEmpty::DEFAULT.0.default_byte(), 98u32.encode());
 			assert_eq!(A::DEFAULT.0.default_byte(), Option::<u32>::None.encode());
 
 			WithLen::remove_all(None);
@@ -1068,22 +1004,10 @@ mod test {
 			A::insert((3, 30, 301), 12);
 			A::insert((4, 40, 400), 13);
 			A::insert((4, 40, 401), 14);
-			assert_eq!(
-				A::iter_prefix_values((3,)).collect::<Vec<_>>(),
-				vec![11, 12]
-			);
-			assert_eq!(
-				A::iter_prefix_values((4,)).collect::<Vec<_>>(),
-				vec![14, 13]
-			);
-			assert_eq!(
-				A::iter_prefix_values((3, 30)).collect::<Vec<_>>(),
-				vec![11, 12]
-			);
-			assert_eq!(
-				A::iter_prefix_values((4, 40)).collect::<Vec<_>>(),
-				vec![14, 13]
-			);
+			assert_eq!(A::iter_prefix_values((3,)).collect::<Vec<_>>(), vec![11, 12]);
+			assert_eq!(A::iter_prefix_values((4,)).collect::<Vec<_>>(), vec![14, 13]);
+			assert_eq!(A::iter_prefix_values((3, 30)).collect::<Vec<_>>(), vec![11, 12]);
+			assert_eq!(A::iter_prefix_values((4, 40)).collect::<Vec<_>>(), vec![14, 13]);
 		});
 	}
 }
diff --git a/frame/support/src/storage/types/value.rs b/frame/support/src/storage/types/value.rs
index 3fe7d4364024..ad835e928bdd 100644
--- a/frame/support/src/storage/types/value.rs
+++ b/frame/support/src/storage/types/value.rs
@@ -17,15 +17,15 @@
 
 //! Storage value type. Implements StorageValue trait and its method directly.
 
-use codec::{FullCodec, Decode, EncodeLike, Encode, MaxEncodedLen};
 use crate::{
 	storage::{
-		StorageAppend, StorageTryAppend, StorageDecodeLength,
-		types::{OptionQuery, QueryKindTrait, OnEmptyGetter},
-		generator::{StorageValue as StorageValueT},
+		generator::StorageValue as StorageValueT,
+		types::{OnEmptyGetter, OptionQuery, QueryKindTrait},
+		StorageAppend, StorageDecodeLength, StorageTryAppend,
 	},
-	traits::{GetDefault, StorageInstance, StorageInfo},
+	traits::{GetDefault, StorageInfo, StorageInstance},
 };
+use codec::{Decode, Encode, EncodeLike, FullCodec, MaxEncodedLen};
 use frame_metadata::{DefaultByteGetter, StorageEntryModifier};
 use sp_arithmetic::traits::SaturatedConversion;
 use sp_std::prelude::*;
@@ -36,12 +36,12 @@ use sp_std::prelude::*;
 /// ```nocompile
 /// Twox128(Prefix::pallet_prefix()) ++ Twox128(Prefix::STORAGE_PREFIX)
 /// ```
-pub struct StorageValue<Prefix, Value, QueryKind=OptionQuery, OnEmpty=GetDefault>(
-	core::marker::PhantomData<(Prefix, Value, QueryKind, OnEmpty)>
+pub struct StorageValue<Prefix, Value, QueryKind = OptionQuery, OnEmpty = GetDefault>(
+	core::marker::PhantomData<(Prefix, Value, QueryKind, OnEmpty)>,
 );
 
-impl<Prefix, Value, QueryKind, OnEmpty> crate::storage::generator::StorageValue<Value> for
-	StorageValue<Prefix, Value, QueryKind, OnEmpty>
+impl<Prefix, Value, QueryKind, OnEmpty> crate::storage::generator::StorageValue<Value>
+	for StorageValue<Prefix, Value, QueryKind, OnEmpty>
 where
 	Prefix: StorageInstance,
 	Value: FullCodec,
@@ -71,13 +71,19 @@ where
 	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
 {
 	/// Get the storage key.
-	pub fn hashed_key() -> [u8; 32] { <Self as crate::storage::StorageValue<Value>>::hashed_key() }
+	pub fn hashed_key() -> [u8; 32] {
+		<Self as crate::storage::StorageValue<Value>>::hashed_key()
+	}
 
 	/// Does the value (explicitly) exist in storage?
-	pub fn exists() -> bool { <Self as crate::storage::StorageValue<Value>>::exists() }
+	pub fn exists() -> bool {
+		<Self as crate::storage::StorageValue<Value>>::exists()
+	}
 
 	/// Load the value from the provided storage instance.
-	pub fn get() -> QueryKind::Query { <Self as crate::storage::StorageValue<Value>>::get() }
+	pub fn get() -> QueryKind::Query {
+		<Self as crate::storage::StorageValue<Value>>::get()
+	}
 
 	/// Try to get the underlying value from the provided storage instance; `Ok` if it exists,
 	/// `Err` if not.
@@ -120,7 +126,9 @@ where
 	/// Store a value under this key into the provided storage instance.
 	///
 	/// this uses the query type rather than the underlying value.
-	pub fn set(val: QueryKind::Query) { <Self as crate::storage::StorageValue<Value>>::set(val) }
+	pub fn set(val: QueryKind::Query) {
+		<Self as crate::storage::StorageValue<Value>>::set(val)
+	}
 
 	/// Mutate the value
 	pub fn mutate<R, F: FnOnce(&mut QueryKind::Query) -> R>(f: F) -> R {
@@ -135,10 +143,14 @@ where
 	}
 
 	/// Clear the storage value.
-	pub fn kill() { <Self as crate::storage::StorageValue<Value>>::kill() }
+	pub fn kill() {
+		<Self as crate::storage::StorageValue<Value>>::kill()
+	}
 
 	/// Take a value from storage, removing it afterwards.
-	pub fn take() -> QueryKind::Query { <Self as crate::storage::StorageValue<Value>>::take() }
+	pub fn take() -> QueryKind::Query {
+		<Self as crate::storage::StorageValue<Value>>::take()
+	}
 
 	/// Append the given item to the value in the storage.
 	///
@@ -153,7 +165,7 @@ where
 	where
 		Item: Encode,
 		EncodeLikeItem: EncodeLike<Item>,
-		Value: StorageAppend<Item>
+		Value: StorageAppend<Item>,
 	{
 		<Self as crate::storage::StorageValue<Value>>::append(item)
 	}
@@ -169,7 +181,10 @@ where
 	///
 	/// `None` does not mean that `get()` does not return a value. The default value is completly
 	/// ignored by this function.
-	pub fn decode_len() -> Option<usize> where Value: StorageDecodeLength {
+	pub fn decode_len() -> Option<usize>
+	where
+		Value: StorageDecodeLength,
+	{
 		<Self as crate::storage::StorageValue<Value>>::decode_len()
 	}
 
@@ -194,7 +209,8 @@ pub trait StorageValueMetadata {
 }
 
 impl<Prefix, Value, QueryKind, OnEmpty> StorageValueMetadata
-	for StorageValue<Prefix, Value, QueryKind, OnEmpty> where
+	for StorageValue<Prefix, Value, QueryKind, OnEmpty>
+where
 	Prefix: StorageInstance,
 	Value: FullCodec,
 	QueryKind: QueryKindTrait<Value, OnEmpty>,
@@ -206,64 +222,57 @@ impl<Prefix, Value, QueryKind, OnEmpty> StorageValueMetadata
 		DefaultByteGetter(&OnEmptyGetter::<QueryKind::Query, OnEmpty>(core::marker::PhantomData));
 }
 
-impl<Prefix, Value, QueryKind, OnEmpty>
-	crate::traits::StorageInfoTrait for
-	StorageValue<Prefix, Value, QueryKind, OnEmpty>
+impl<Prefix, Value, QueryKind, OnEmpty> crate::traits::StorageInfoTrait
+	for StorageValue<Prefix, Value, QueryKind, OnEmpty>
 where
 	Prefix: StorageInstance,
 	Value: FullCodec + MaxEncodedLen,
 	QueryKind: QueryKindTrait<Value, OnEmpty>,
-	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static
+	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
 {
 	fn storage_info() -> Vec<StorageInfo> {
-		vec![
-			StorageInfo {
-				pallet_name: Self::module_prefix().to_vec(),
-				storage_name: Self::storage_prefix().to_vec(),
-				prefix: Self::hashed_key().to_vec(),
-				max_values: Some(1),
-				max_size: Some(
-					Value::max_encoded_len()
-						.saturated_into(),
-				),
-			}
-		]
+		vec![StorageInfo {
+			pallet_name: Self::module_prefix().to_vec(),
+			storage_name: Self::storage_prefix().to_vec(),
+			prefix: Self::hashed_key().to_vec(),
+			max_values: Some(1),
+			max_size: Some(Value::max_encoded_len().saturated_into()),
+		}]
 	}
 }
 
 /// It doesn't require to implement `MaxEncodedLen` and give no information for `max_size`.
-impl<Prefix, Value, QueryKind, OnEmpty>
-	crate::traits::PartialStorageInfoTrait for
-	StorageValue<Prefix, Value, QueryKind, OnEmpty>
+impl<Prefix, Value, QueryKind, OnEmpty> crate::traits::PartialStorageInfoTrait
+	for StorageValue<Prefix, Value, QueryKind, OnEmpty>
 where
 	Prefix: StorageInstance,
 	Value: FullCodec,
 	QueryKind: QueryKindTrait<Value, OnEmpty>,
-	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static
+	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
 {
 	fn partial_storage_info() -> Vec<StorageInfo> {
-		vec![
-			StorageInfo {
-				pallet_name: Self::module_prefix().to_vec(),
-				storage_name: Self::storage_prefix().to_vec(),
-				prefix: Self::hashed_key().to_vec(),
-				max_values: Some(1),
-				max_size: None,
-			}
-		]
+		vec![StorageInfo {
+			pallet_name: Self::module_prefix().to_vec(),
+			storage_name: Self::storage_prefix().to_vec(),
+			prefix: Self::hashed_key().to_vec(),
+			max_values: Some(1),
+			max_size: None,
+		}]
 	}
 }
 
 #[cfg(test)]
 mod test {
 	use super::*;
-	use sp_io::{TestExternalities, hashing::twox_128};
 	use crate::storage::types::ValueQuery;
 	use frame_metadata::StorageEntryModifier;
+	use sp_io::{hashing::twox_128, TestExternalities};
 
 	struct Prefix;
 	impl StorageInstance for Prefix {
-		fn pallet_prefix() -> &'static str { "test" }
+		fn pallet_prefix() -> &'static str {
+			"test"
+		}
 		const STORAGE_PREFIX: &'static str = "foo";
 	}
 
@@ -309,10 +318,16 @@ mod test {
 			assert_eq!(A::try_get(), Ok(4));
 
 			A::set(Some(4));
-			let _: Result<(), ()> = A::try_mutate(|v| { *v = Some(v.unwrap() * 2); Ok(()) });
+			let _: Result<(), ()> = A::try_mutate(|v| {
+				*v = Some(v.unwrap() * 2);
+				Ok(())
+			});
 			assert_eq!(A::try_get(), Ok(8));
 
-			let _: Result<(), ()> = A::try_mutate(|v| { *v = Some(v.unwrap() * 2); Err(()) });
+			let _: Result<(), ()> = A::try_mutate(|v| {
+				*v = Some(v.unwrap() * 2);
+				Err(())
+			});
 			assert_eq!(A::try_get(), Ok(8));
 
 			A::kill();
@@ -321,7 +336,8 @@ mod test {
 
 			AValueQueryWithAnOnEmpty::kill();
 			let _: Result<(), ()> = AValueQueryWithAnOnEmpty::try_mutate(|v| {
-				*v = *v * 2; Ok(())
+				*v = *v * 2;
+				Ok(())
 			});
 			assert_eq!(AValueQueryWithAnOnEmpty::try_get(), Ok(97 * 2));
 
diff --git a/frame/support/src/storage/unhashed.rs b/frame/support/src/storage/unhashed.rs
index 134b3debcd31..f700771b2d5c 100644
--- a/frame/support/src/storage/unhashed.rs
+++ b/frame/support/src/storage/unhashed.rs
@@ -17,8 +17,8 @@
 
 //! Operation on unhashed runtime storage.
 
+use codec::{Decode, Encode};
 use sp_std::prelude::*;
-use codec::{Encode, Decode};
 
 /// Return the value of the item in storage under `key`, or `None` if there is no explicit entry.
 pub fn get<T: Decode + Sized>(key: &[u8]) -> Option<T> {
diff --git a/frame/support/src/storage/weak_bounded_vec.rs b/frame/support/src/storage/weak_bounded_vec.rs
index a98d2182d091..9fa360230691 100644
--- a/frame/support/src/storage/weak_bounded_vec.rs
+++ b/frame/support/src/storage/weak_bounded_vec.rs
@@ -18,17 +18,16 @@
 //! Traits, types and structs to support putting a bounded vector into storage, as a raw value, map
 //! or a double map.
 
-use sp_std::prelude::*;
-use sp_std::{convert::TryFrom, fmt, marker::PhantomData};
-use codec::{Encode, Decode, MaxEncodedLen};
+use crate::{
+	storage::{StorageDecodeLength, StorageTryAppend},
+	traits::Get,
+};
+use codec::{Decode, Encode, MaxEncodedLen};
 use core::{
 	ops::{Deref, Index, IndexMut},
 	slice::SliceIndex,
 };
-use crate::{
-	traits::Get,
-	storage::{StorageDecodeLength, StorageTryAppend},
-};
+use sp_std::{convert::TryFrom, fmt, marker::PhantomData, prelude::*};
 
 /// A weakly bounded vector.
 ///
@@ -317,9 +316,9 @@ where
 #[cfg(test)]
 pub mod test {
 	use super::*;
+	use crate::Twox128;
 	use sp_io::TestExternalities;
 	use sp_std::convert::TryInto;
-	use crate::Twox128;
 
 	crate::parameter_types! {
 		pub const Seven: u32 = 7;
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index ec47331285ef..fcc3305c409c 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -20,62 +20,67 @@
 //! NOTE: If you're looking for `parameter_types`, it has moved in to the top-level module.
 
 pub mod tokens;
-pub use tokens::fungible;
-pub use tokens::fungibles;
-pub use tokens::currency::{
-	Currency, LockIdentifier, LockableCurrency, ReservableCurrency, NamedReservableCurrency,
-	VestingSchedule,
+pub use tokens::{
+	currency::{
+		Currency, LockIdentifier, LockableCurrency, NamedReservableCurrency, ReservableCurrency,
+		VestingSchedule,
+	},
+	fungible, fungibles,
+	imbalance::{Imbalance, OnUnbalanced, SignedImbalance},
+	BalanceStatus, ExistenceRequirement, WithdrawReasons,
 };
-pub use tokens::imbalance::{Imbalance, OnUnbalanced, SignedImbalance};
-pub use tokens::{ExistenceRequirement, WithdrawReasons, BalanceStatus};
 
 mod members;
 pub use members::{
-	Contains, ContainsLengthBound, SortedMembers, InitializeMembers, ChangeMembers, All, IsInVec,
-	AsContains,
+	All, AsContains, ChangeMembers, Contains, ContainsLengthBound, InitializeMembers, IsInVec,
+	SortedMembers,
 };
 
 mod validation;
 pub use validation::{
-	ValidatorSet, ValidatorSetWithIdentification, OneSessionHandler, FindAuthor, VerifySeal,
-	EstimateNextNewSession, EstimateNextSessionRotation, KeyOwnerProofSystem, ValidatorRegistration,
-	Lateness,
+	EstimateNextNewSession, EstimateNextSessionRotation, FindAuthor, KeyOwnerProofSystem, Lateness,
+	OneSessionHandler, ValidatorRegistration, ValidatorSet, ValidatorSetWithIdentification,
+	VerifySeal,
 };
 
 mod filter;
 pub use filter::{
-	Filter, FilterStack, FilterStackGuard, ClearFilterGuard, InstanceFilter, IntegrityTest,
-	AllowAll, DenyAll,
+	AllowAll, ClearFilterGuard, DenyAll, Filter, FilterStack, FilterStackGuard, InstanceFilter,
+	IntegrityTest,
 };
 
 mod misc;
 pub use misc::{
-	Len, Get, GetDefault, HandleLifetime, TryDrop, Time, UnixTime, IsType, IsSubType, ExecuteBlock,
-	SameOrOther, OnNewAccount, OnKilledAccount, OffchainWorker, GetBacking, Backing, ExtrinsicCall,
-	EnsureInherentsAreFirst, ConstU32,
+	Backing, ConstU32, EnsureInherentsAreFirst, ExecuteBlock, ExtrinsicCall, Get, GetBacking,
+	GetDefault, HandleLifetime, IsSubType, IsType, Len, OffchainWorker, OnKilledAccount,
+	OnNewAccount, SameOrOther, Time, TryDrop, UnixTime,
 };
 
 mod stored_map;
-pub use stored_map::{StoredMap, StorageMapShim};
+pub use stored_map::{StorageMapShim, StoredMap};
 mod randomness;
 pub use randomness::Randomness;
 
 mod metadata;
 pub use metadata::{
-	CallMetadata, GetCallMetadata, GetCallName, PalletInfo, PalletVersion, GetPalletVersion,
-	PALLET_VERSION_STORAGE_KEY_POSTFIX, PalletInfoAccess,
+	CallMetadata, GetCallMetadata, GetCallName, GetPalletVersion, PalletInfo, PalletInfoAccess,
+	PalletVersion, PALLET_VERSION_STORAGE_KEY_POSTFIX,
 };
 
 mod hooks;
-pub use hooks::{Hooks, OnGenesis, OnInitialize, OnFinalize, OnIdle, OnRuntimeUpgrade, OnTimestampSet};
-#[cfg(feature = "try-runtime")]
-pub use hooks::{OnRuntimeUpgradeHelpersExt, ON_RUNTIME_UPGRADE_PREFIX};
 #[cfg(feature = "std")]
 pub use hooks::GenesisBuild;
+pub use hooks::{
+	Hooks, OnFinalize, OnGenesis, OnIdle, OnInitialize, OnRuntimeUpgrade, OnTimestampSet,
+};
+#[cfg(feature = "try-runtime")]
+pub use hooks::{OnRuntimeUpgradeHelpersExt, ON_RUNTIME_UPGRADE_PREFIX};
 
 pub mod schedule;
 mod storage;
-pub use storage::{Instance, PartialStorageInfoTrait, StorageInstance, StorageInfo, StorageInfoTrait};
+pub use storage::{
+	Instance, PartialStorageInfoTrait, StorageInfo, StorageInfoTrait, StorageInstance,
+};
 
 mod dispatch;
 pub use dispatch::{EnsureOrigin, OriginTrait, UnfilteredDispatchable};
diff --git a/frame/support/src/traits/filter.rs b/frame/support/src/traits/filter.rs
index 4b70fa177e5c..b9f5037abc66 100644
--- a/frame/support/src/traits/filter.rs
+++ b/frame/support/src/traits/filter.rs
@@ -32,11 +32,15 @@ pub enum AllowAll {}
 pub enum DenyAll {}
 
 impl<T> Filter<T> for AllowAll {
-	fn filter(_: &T) -> bool { true }
+	fn filter(_: &T) -> bool {
+		true
+	}
 }
 
 impl<T> Filter<T> for DenyAll {
-	fn filter(_: &T) -> bool { false }
+	fn filter(_: &T) -> bool {
+		false
+	}
 }
 
 /// Trait to add a constraint onto the filter.
@@ -101,17 +105,28 @@ pub trait InstanceFilter<T>: Sized + Send + Sync {
 	fn filter(&self, _: &T) -> bool;
 
 	/// Determines whether `self` matches at least everything that `_o` does.
-	fn is_superset(&self, _o: &Self) -> bool { false }
+	fn is_superset(&self, _o: &Self) -> bool {
+		false
+	}
 }
 
 impl<T> InstanceFilter<T> for () {
-	fn filter(&self, _: &T) -> bool { true }
-	fn is_superset(&self, _o: &Self) -> bool { true }
+	fn filter(&self, _: &T) -> bool {
+		true
+	}
+	fn is_superset(&self, _o: &Self) -> bool {
+		true
+	}
 }
 
 /// Re-expected for the macro.
 #[doc(hidden)]
-pub use sp_std::{mem::{swap, take}, cell::RefCell, vec::Vec, boxed::Box};
+pub use sp_std::{
+	boxed::Box,
+	cell::RefCell,
+	mem::{swap, take},
+	vec::Vec,
+};
 
 #[macro_export]
 macro_rules! impl_filter_stack {
@@ -206,7 +221,9 @@ pub mod test_impl_filter_stack {
 	pub struct IsCallable;
 	pub struct BaseFilter;
 	impl Filter<u32> for BaseFilter {
-		fn filter(x: &u32) -> bool { x % 2 == 0 }
+		fn filter(x: &u32) -> bool {
+			x % 2 == 0
+		}
 	}
 	impl_filter_stack!(
 		crate::traits::filter::test_impl_filter_stack::IsCallable,
diff --git a/frame/support/src/traits/hooks.rs b/frame/support/src/traits/hooks.rs
index 5f7b35a9ad25..37b07c311301 100644
--- a/frame/support/src/traits/hooks.rs
+++ b/frame/support/src/traits/hooks.rs
@@ -17,9 +17,9 @@
 
 //! Traits for hooking tasks to events in a blockchain's lifecycle.
 
+use impl_trait_for_tuples::impl_for_tuples;
 use sp_arithmetic::traits::Saturating;
 use sp_runtime::traits::MaybeSerializeDeserialize;
-use impl_trait_for_tuples::impl_for_tuples;
 
 /// The block initialization trait.
 ///
@@ -33,7 +33,9 @@ pub trait OnInitialize<BlockNumber> {
 	/// NOTE: This function is called BEFORE ANY extrinsic in a block is applied,
 	/// including inherent extrinsics. Hence for instance, if you runtime includes
 	/// `pallet_timestamp`, the `timestamp` is not yet up to date at this point.
-	fn on_initialize(_n: BlockNumber) -> crate::weights::Weight { 0 }
+	fn on_initialize(_n: BlockNumber) -> crate::weights::Weight {
+		0
+	}
 }
 
 #[impl_for_tuples(30)]
@@ -71,7 +73,7 @@ pub trait OnIdle<BlockNumber> {
 	/// in a block are applied but before `on_finalize` is executed.
 	fn on_idle(
 		_n: BlockNumber,
-		_remaining_weight: crate::weights::Weight
+		_remaining_weight: crate::weights::Weight,
 	) -> crate::weights::Weight {
 		0
 	}
@@ -79,7 +81,7 @@ pub trait OnIdle<BlockNumber> {
 
 #[impl_for_tuples(30)]
 impl<BlockNumber: Clone> OnIdle<BlockNumber> for Tuple {
-	fn on_idle(n: BlockNumber,  remaining_weight: crate::weights::Weight) -> crate::weights::Weight {
+	fn on_idle(n: BlockNumber, remaining_weight: crate::weights::Weight) -> crate::weights::Weight {
 		let mut weight = 0;
 		for_tuples!( #(
 			let adjusted_remaining_weight = remaining_weight.saturating_sub(weight);
@@ -170,13 +172,17 @@ pub trait OnRuntimeUpgrade {
 	///
 	/// This hook is never meant to be executed on-chain but is meant to be used by testing tools.
 	#[cfg(feature = "try-runtime")]
-	fn pre_upgrade() -> Result<(), &'static str> { Ok(()) }
+	fn pre_upgrade() -> Result<(), &'static str> {
+		Ok(())
+	}
 
 	/// Execute some post-checks after a runtime upgrade.
 	///
 	/// This hook is never meant to be executed on-chain but is meant to be used by testing tools.
 	#[cfg(feature = "try-runtime")]
-	fn post_upgrade() -> Result<(), &'static str> { Ok(()) }
+	fn post_upgrade() -> Result<(), &'static str> {
+		Ok(())
+	}
 }
 
 #[impl_for_tuples(30)]
@@ -214,7 +220,7 @@ pub trait Hooks<BlockNumber> {
 	/// and pass the result to the next `on_idle` hook if it exists.
 	fn on_idle(
 		_n: BlockNumber,
-		_remaining_weight: crate::weights::Weight
+		_remaining_weight: crate::weights::Weight,
 	) -> crate::weights::Weight {
 		0
 	}
@@ -222,7 +228,9 @@ pub trait Hooks<BlockNumber> {
 	/// The block is being initialized. Implement to have something happen.
 	///
 	/// Return the non-negotiable weight consumed in the block.
-	fn on_initialize(_n: BlockNumber) -> crate::weights::Weight { 0 }
+	fn on_initialize(_n: BlockNumber) -> crate::weights::Weight {
+		0
+	}
 
 	/// Perform a module upgrade.
 	///
@@ -238,7 +246,9 @@ pub trait Hooks<BlockNumber> {
 	/// block local data are not accessible.
 	///
 	/// Return the non-negotiable weight consumed for runtime upgrade.
-	fn on_runtime_upgrade() -> crate::weights::Weight { 0 }
+	fn on_runtime_upgrade() -> crate::weights::Weight {
+		0
+	}
 
 	/// Execute some pre-checks prior to a runtime upgrade.
 	///
@@ -282,7 +292,7 @@ pub trait Hooks<BlockNumber> {
 /// A trait to define the build function of a genesis config, T and I are placeholder for pallet
 /// trait and pallet instance.
 #[cfg(feature = "std")]
-pub trait GenesisBuild<T, I=()>: Default + MaybeSerializeDeserialize {
+pub trait GenesisBuild<T, I = ()>: Default + MaybeSerializeDeserialize {
 	/// The build function is called within an externalities allowing storage APIs.
 	/// Thus one can write to storage using regular pallet storages.
 	fn build(&self);
diff --git a/frame/support/src/traits/members.rs b/frame/support/src/traits/members.rs
index 8b9c2c90f541..dbfc2e0120e4 100644
--- a/frame/support/src/traits/members.rs
+++ b/frame/support/src/traits/members.rs
@@ -17,7 +17,7 @@
 
 //! Traits for dealing with the idea of membership.
 
-use sp_std::{prelude::*, marker::PhantomData};
+use sp_std::{marker::PhantomData, prelude::*};
 
 /// A trait for querying whether a type can be said to "contain" a value.
 pub trait Contains<T> {
@@ -28,7 +28,9 @@ pub trait Contains<T> {
 /// A `Contains` implementation which always returns `true`.
 pub struct All<T>(PhantomData<T>);
 impl<T> Contains<T> for All<T> {
-	fn contains(_: &T) -> bool { true }
+	fn contains(_: &T) -> bool {
+		true
+	}
 }
 
 #[impl_trait_for_tuples::impl_for_tuples(30)]
@@ -77,32 +79,46 @@ pub trait SortedMembers<T: Ord> {
 	fn sorted_members() -> Vec<T>;
 
 	/// Return `true` if this "contains" the given value `t`.
-	fn contains(t: &T) -> bool { Self::sorted_members().binary_search(t).is_ok() }
+	fn contains(t: &T) -> bool {
+		Self::sorted_members().binary_search(t).is_ok()
+	}
 
 	/// Get the number of items in the set.
-	fn count() -> usize { Self::sorted_members().len() }
+	fn count() -> usize {
+		Self::sorted_members().len()
+	}
 
 	/// Add an item that would satisfy `contains`. It does not make sure any other
 	/// state is correctly maintained or generated.
 	///
 	/// **Should be used for benchmarking only!!!**
 	#[cfg(feature = "runtime-benchmarks")]
-	fn add(_t: &T) { unimplemented!() }
+	fn add(_t: &T) {
+		unimplemented!()
+	}
 }
 
 /// Adapter struct for turning an `OrderedMembership` impl into a `Contains` impl.
 pub struct AsContains<OM>(PhantomData<(OM,)>);
 impl<T: Ord + Eq, OM: SortedMembers<T>> Contains<T> for AsContains<OM> {
-	fn contains(t: &T) -> bool { OM::contains(t) }
+	fn contains(t: &T) -> bool {
+		OM::contains(t)
+	}
 }
 
 /// Trivial utility for implementing `Contains`/`OrderedMembership` with a `Vec`.
 pub struct IsInVec<T>(PhantomData<T>);
 impl<X: Eq, T: super::Get<Vec<X>>> Contains<X> for IsInVec<T> {
-	fn contains(t: &X) -> bool { T::get().contains(t) }
+	fn contains(t: &X) -> bool {
+		T::get().contains(t)
+	}
 }
 impl<X: Ord + PartialOrd, T: super::Get<Vec<X>>> SortedMembers<X> for IsInVec<T> {
-	fn sorted_members() -> Vec<X> { let mut r = T::get(); r.sort(); r }
+	fn sorted_members() -> Vec<X> {
+		let mut r = T::get();
+		r.sort();
+		r
+	}
 }
 
 /// A trait for querying bound for the length of an implementation of `Contains`
@@ -174,19 +190,19 @@ pub trait ChangeMembers<AccountId: Clone + Ord> {
 				(Some(old), Some(new)) if old == new => {
 					old_i = old_iter.next();
 					new_i = new_iter.next();
-				}
+				},
 				(Some(old), Some(new)) if old < new => {
 					outgoing.push(old.clone());
 					old_i = old_iter.next();
-				}
+				},
 				(Some(old), None) => {
 					outgoing.push(old.clone());
 					old_i = old_iter.next();
-				}
+				},
 				(_, Some(new)) => {
 					incoming.push(new.clone());
 					new_i = new_iter.next();
-				}
+				},
 			}
 		}
 		(incoming, outgoing)
diff --git a/frame/support/src/traits/metadata.rs b/frame/support/src/traits/metadata.rs
index b13a0464b30c..ba2630563844 100644
--- a/frame/support/src/traits/metadata.rs
+++ b/frame/support/src/traits/metadata.rs
@@ -17,7 +17,7 @@
 
 //! Traits for managing information attached to pallets and their constituents.
 
-use codec::{Encode, Decode};
+use codec::{Decode, Encode};
 use sp_runtime::RuntimeDebug;
 
 /// Provides information about the pallet setup in the runtime.
@@ -91,11 +91,7 @@ pub struct PalletVersion {
 impl PalletVersion {
 	/// Creates a new instance of `Self`.
 	pub fn new(major: u16, minor: u8, patch: u8) -> Self {
-		Self {
-			major,
-			minor,
-			patch,
-		}
+		Self { major, minor, patch }
 	}
 
 	/// Returns the storage key for a pallet version.
@@ -139,13 +135,10 @@ impl PalletVersion {
 
 impl sp_std::cmp::PartialOrd for PalletVersion {
 	fn partial_cmp(&self, other: &Self) -> Option<sp_std::cmp::Ordering> {
-		let res = self.major
+		let res = self
+			.major
 			.cmp(&other.major)
-			.then_with(||
-				self.minor
-					.cmp(&other.minor)
-					.then_with(|| self.patch.cmp(&other.patch)
-					));
+			.then_with(|| self.minor.cmp(&other.minor).then_with(|| self.patch.cmp(&other.patch)));
 
 		Some(res)
 	}
diff --git a/frame/support/src/traits/misc.rs b/frame/support/src/traits/misc.rs
index 9cab2626cd6c..d6eb8331cdb5 100644
--- a/frame/support/src/traits/misc.rs
+++ b/frame/support/src/traits/misc.rs
@@ -17,9 +17,9 @@
 
 //! Smaller traits used in FRAME which don't need their own file.
 
-use sp_runtime::{traits::Block as BlockT, DispatchError};
-use sp_arithmetic::traits::AtLeast32Bit;
 use crate::dispatch::Parameter;
+use sp_arithmetic::traits::AtLeast32Bit;
+use sp_runtime::{traits::Block as BlockT, DispatchError};
 
 /// Anything that can have a `::len()` method.
 pub trait Len {
@@ -27,7 +27,10 @@ pub trait Len {
 	fn len(&self) -> usize;
 }
 
-impl<T: IntoIterator + Clone,> Len for T where <T as IntoIterator>::IntoIter: ExactSizeIterator {
+impl<T: IntoIterator + Clone> Len for T
+where
+	<T as IntoIterator>::IntoIter: ExactSizeIterator,
+{
 	fn len(&self) -> usize {
 		self.clone().into_iter().len()
 	}
@@ -42,7 +45,9 @@ pub trait Get<T> {
 }
 
 impl<T: Default> Get<T> for () {
-	fn get() -> T { T::default() }
+	fn get() -> T {
+		T::default()
+	}
 }
 
 /// Implement Get by returning Default for any type that implements Default.
@@ -123,7 +128,10 @@ impl<A, B> SameOrOther<A, B> {
 		}
 	}
 
-	pub fn same(self) -> Result<A, B> where A: Default {
+	pub fn same(self) -> Result<A, B>
+	where
+		A: Default,
+	{
 		match self {
 			SameOrOther::Same(a) => Ok(a),
 			SameOrOther::None => Ok(A::default()),
@@ -131,7 +139,10 @@ impl<A, B> SameOrOther<A, B> {
 		}
 	}
 
-	pub fn other(self) -> Result<B, A> where B: Default {
+	pub fn other(self) -> Result<B, A>
+	where
+		B: Default,
+	{
 		match self {
 			SameOrOther::Same(a) => Err(a),
 			SameOrOther::None => Ok(B::default()),
@@ -157,10 +168,14 @@ pub trait OnKilledAccount<AccountId> {
 /// A simple, generic one-parameter event notifier/handler.
 pub trait HandleLifetime<T> {
 	/// An account was created.
-	fn created(_t: &T) -> Result<(), DispatchError> { Ok(()) }
+	fn created(_t: &T) -> Result<(), DispatchError> {
+		Ok(())
+	}
 
 	/// An account was killed.
-	fn killed(_t: &T) -> Result<(), DispatchError> { Ok(()) }
+	fn killed(_t: &T) -> Result<(), DispatchError> {
+		Ok(())
+	}
 }
 
 impl<T> HandleLifetime<T> for () {}
@@ -195,10 +210,18 @@ pub trait IsType<T>: Into<T> + From<T> {
 }
 
 impl<T> IsType<T> for T {
-	fn from_ref(t: &T) -> &Self { t }
-	fn into_ref(&self) -> &T { self }
-	fn from_mut(t: &mut T) -> &mut Self { t }
-	fn into_mut(&mut self) -> &mut T { self }
+	fn from_ref(t: &T) -> &Self {
+		t
+	}
+	fn into_ref(&self) -> &T {
+		self
+	}
+	fn from_mut(t: &mut T) -> &mut Self {
+		t
+	}
+	fn into_mut(&mut self) -> &mut T {
+		self
+	}
 }
 
 /// Something that can be checked to be a of sub type `T`.
@@ -300,8 +323,6 @@ pub trait GetBacking {
 	fn get_backing(&self) -> Option<Backing>;
 }
 
-
-
 /// A trait to ensure the inherent are before non-inherent in a block.
 ///
 /// This is typically implemented on runtime, through `construct_runtime!`.
@@ -319,7 +340,8 @@ pub trait ExtrinsicCall: sp_runtime::traits::Extrinsic {
 }
 
 #[cfg(feature = "std")]
-impl<Call, Extra> ExtrinsicCall for sp_runtime::testing::TestXt<Call, Extra> where
+impl<Call, Extra> ExtrinsicCall for sp_runtime::testing::TestXt<Call, Extra>
+where
 	Call: codec::Codec + Sync + Send,
 {
 	fn call(&self) -> &Self::Call {
@@ -328,7 +350,7 @@ impl<Call, Extra> ExtrinsicCall for sp_runtime::testing::TestXt<Call, Extra> whe
 }
 
 impl<Address, Call, Signature, Extra> ExtrinsicCall
-for sp_runtime::generic::UncheckedExtrinsic<Address, Call, Signature, Extra>
+	for sp_runtime::generic::UncheckedExtrinsic<Address, Call, Signature, Extra>
 where
 	Extra: sp_runtime::traits::SignedExtension,
 {
diff --git a/frame/support/src/traits/schedule.rs b/frame/support/src/traits/schedule.rs
index 58e4c419f281..10a973a993df 100644
--- a/frame/support/src/traits/schedule.rs
+++ b/frame/support/src/traits/schedule.rs
@@ -17,9 +17,9 @@
 
 //! Traits and associated utilities for scheduling dispatchables in FRAME.
 
-use sp_std::{prelude::*, fmt::Debug};
-use codec::{Encode, Decode, Codec, EncodeLike};
-use sp_runtime::{RuntimeDebug, DispatchError};
+use codec::{Codec, Decode, Encode, EncodeLike};
+use sp_runtime::{DispatchError, RuntimeDebug};
+use sp_std::{fmt::Debug, prelude::*};
 
 /// Information relating to the period of a scheduled task. First item is the length of the
 /// period and the second is the number of times it should be executed in total before the task
@@ -61,7 +61,7 @@ pub trait Anon<BlockNumber, Call, Origin> {
 		maybe_periodic: Option<Period<BlockNumber>>,
 		priority: Priority,
 		origin: Origin,
-		call: Call
+		call: Call,
 	) -> Result<Self::Address, DispatchError>;
 
 	/// Cancel a scheduled task. If periodic, then it will cancel all further instances of that,
@@ -107,7 +107,7 @@ pub trait Named<BlockNumber, Call, Origin> {
 		maybe_periodic: Option<Period<BlockNumber>>,
 		priority: Priority,
 		origin: Origin,
-		call: Call
+		call: Call,
 	) -> Result<Self::Address, ()>;
 
 	/// Cancel a scheduled, named task. If periodic, then it will cancel all further instances
diff --git a/frame/support/src/traits/stored_map.rs b/frame/support/src/traits/stored_map.rs
index 0e1660df546f..715a5211be43 100644
--- a/frame/support/src/traits/stored_map.rs
+++ b/frame/support/src/traits/stored_map.rs
@@ -17,10 +17,9 @@
 
 //! Traits and associated datatypes for managing abstract stored values.
 
+use crate::{storage::StorageMap, traits::misc::HandleLifetime};
 use codec::FullCodec;
 use sp_runtime::DispatchError;
-use crate::storage::StorageMap;
-use crate::traits::misc::HandleLifetime;
 
 /// An abstraction of a value stored within storage, but possibly as part of a larger composite
 /// item.
@@ -47,25 +46,26 @@ pub trait StoredMap<K, T: Default> {
 				let r = f(&mut account);
 				*x = Some(account);
 				r
-			}
+			},
 		})
 	}
 
 	/// Mutate the item, removing or resetting to default value if it has been mutated to `None`.
 	///
 	/// This is infallible as long as the value does not get destroyed.
-	fn mutate_exists<R>(
-		k: &K,
-		f: impl FnOnce(&mut Option<T>) -> R,
-	) -> Result<R, DispatchError> {
+	fn mutate_exists<R>(k: &K, f: impl FnOnce(&mut Option<T>) -> R) -> Result<R, DispatchError> {
 		Self::try_mutate_exists(k, |x| -> Result<R, DispatchError> { Ok(f(x)) })
 	}
 
 	/// Set the item to something new.
-	fn insert(k: &K, t: T) -> Result<(), DispatchError> { Self::mutate(k, |i| *i = t) }
+	fn insert(k: &K, t: T) -> Result<(), DispatchError> {
+		Self::mutate(k, |i| *i = t)
+	}
 
 	/// Remove the item or otherwise replace it with its default value; we don't care which.
-	fn remove(k: &K) -> Result<(), DispatchError> { Self::mutate_exists(k, |x| *x = None) }
+	fn remove(k: &K) -> Result<(), DispatchError> {
+		Self::mutate_exists(k, |x| *x = None)
+	}
 }
 
 /// A shim for placing around a storage item in order to use it as a `StoredValue`. Ideally this
@@ -81,12 +81,15 @@ pub trait StoredMap<K, T: Default> {
 /// system module's `CallOnCreatedAccount` and `CallKillAccount`.
 pub struct StorageMapShim<S, L, K, T>(sp_std::marker::PhantomData<(S, L, K, T)>);
 impl<
-	S: StorageMap<K, T, Query=T>,
-	L: HandleLifetime<K>,
-	K: FullCodec,
-	T: FullCodec + Default,
-> StoredMap<K, T> for StorageMapShim<S, L, K, T> {
-	fn get(k: &K) -> T { S::get(k) }
+		S: StorageMap<K, T, Query = T>,
+		L: HandleLifetime<K>,
+		K: FullCodec,
+		T: FullCodec + Default,
+	> StoredMap<K, T> for StorageMapShim<S, L, K, T>
+{
+	fn get(k: &K) -> T {
+		S::get(k)
+	}
 	fn insert(k: &K, t: T) -> Result<(), DispatchError> {
 		if !S::contains_key(&k) {
 			L::created(k)?;
diff --git a/frame/support/src/traits/tokens.rs b/frame/support/src/traits/tokens.rs
index faf8ebfd306c..aca62bcad65c 100644
--- a/frame/support/src/traits/tokens.rs
+++ b/frame/support/src/traits/tokens.rs
@@ -17,15 +17,15 @@
 
 //! Traits for working with tokens and their associated datastructures.
 
+pub mod currency;
 pub mod fungible;
 pub mod fungibles;
-pub mod currency;
 pub mod imbalance;
+mod misc;
 pub mod nonfungible;
 pub mod nonfungibles;
-mod misc;
+pub use imbalance::Imbalance;
 pub use misc::{
-	BalanceConversion, BalanceStatus,  DepositConsequence,
-	ExistenceRequirement, WithdrawConsequence, WithdrawReasons,
+	BalanceConversion, BalanceStatus, DepositConsequence, ExistenceRequirement,
+	WithdrawConsequence, WithdrawReasons,
 };
-pub use imbalance::Imbalance;
diff --git a/frame/support/src/traits/tokens/currency.rs b/frame/support/src/traits/tokens/currency.rs
index 7882d04c035b..6c73a1527b48 100644
--- a/frame/support/src/traits/tokens/currency.rs
+++ b/frame/support/src/traits/tokens/currency.rs
@@ -17,17 +17,19 @@
 
 //! The Currency trait and associated types.
 
-use sp_std::fmt::Debug;
-use sp_runtime::traits::MaybeSerializeDeserialize;
-use crate::dispatch::{DispatchResult, DispatchError};
-use super::misc::{Balance, WithdrawReasons, ExistenceRequirement};
-use super::imbalance::{Imbalance, SignedImbalance};
+use super::{
+	imbalance::{Imbalance, SignedImbalance},
+	misc::{Balance, ExistenceRequirement, WithdrawReasons},
+};
+use crate::dispatch::{DispatchError, DispatchResult};
 use codec::MaxEncodedLen;
+use sp_runtime::traits::MaybeSerializeDeserialize;
+use sp_std::fmt::Debug;
 
 mod reservable;
-pub use reservable::{ReservableCurrency, NamedReservableCurrency};
+pub use reservable::{NamedReservableCurrency, ReservableCurrency};
 mod lockable;
-pub use lockable::{LockableCurrency, VestingSchedule, LockIdentifier};
+pub use lockable::{LockIdentifier, LockableCurrency, VestingSchedule};
 
 /// Abstraction over a fungible assets system.
 pub trait Currency<AccountId> {
@@ -36,11 +38,11 @@ pub trait Currency<AccountId> {
 
 	/// The opaque token type for an imbalance. This is returned by unbalanced operations
 	/// and must be dealt with. It may be dropped but cannot be cloned.
-	type PositiveImbalance: Imbalance<Self::Balance, Opposite=Self::NegativeImbalance>;
+	type PositiveImbalance: Imbalance<Self::Balance, Opposite = Self::NegativeImbalance>;
 
 	/// The opaque token type for an imbalance. This is returned by unbalanced operations
 	/// and must be dealt with. It may be dropped but cannot be cloned.
-	type NegativeImbalance: Imbalance<Self::Balance, Opposite=Self::PositiveImbalance>;
+	type NegativeImbalance: Imbalance<Self::Balance, Opposite = Self::PositiveImbalance>;
 
 	// PUBLIC IMMUTABLES
 
@@ -123,17 +125,14 @@ pub trait Currency<AccountId> {
 	///
 	/// As much funds up to `value` will be deducted as possible. If this is less than `value`,
 	/// then a non-zero second item will be returned.
-	fn slash(
-		who: &AccountId,
-		value: Self::Balance
-	) -> (Self::NegativeImbalance, Self::Balance);
+	fn slash(who: &AccountId, value: Self::Balance) -> (Self::NegativeImbalance, Self::Balance);
 
 	/// Mints `value` to the free balance of `who`.
 	///
 	/// If `who` doesn't exist, nothing is done and an Err returned.
 	fn deposit_into_existing(
 		who: &AccountId,
-		value: Self::Balance
+		value: Self::Balance,
 	) -> Result<Self::PositiveImbalance, DispatchError>;
 
 	/// Similar to deposit_creating, only accepts a `NegativeImbalance` and returns nothing on
@@ -152,17 +151,11 @@ pub trait Currency<AccountId> {
 	/// Adds up to `value` to the free balance of `who`. If `who` doesn't exist, it is created.
 	///
 	/// Infallible.
-	fn deposit_creating(
-		who: &AccountId,
-		value: Self::Balance,
-	) -> Self::PositiveImbalance;
+	fn deposit_creating(who: &AccountId, value: Self::Balance) -> Self::PositiveImbalance;
 
 	/// Similar to deposit_creating, only accepts a `NegativeImbalance` and returns nothing on
 	/// success.
-	fn resolve_creating(
-		who: &AccountId,
-		value: Self::NegativeImbalance,
-	) {
+	fn resolve_creating(who: &AccountId, value: Self::NegativeImbalance) {
 		let v = value.peek();
 		drop(value.offset(Self::deposit_creating(who, v)));
 	}
diff --git a/frame/support/src/traits/tokens/currency/lockable.rs b/frame/support/src/traits/tokens/currency/lockable.rs
index ed3d1cf46362..94bce216dcbc 100644
--- a/frame/support/src/traits/tokens/currency/lockable.rs
+++ b/frame/support/src/traits/tokens/currency/lockable.rs
@@ -17,10 +17,8 @@
 
 //! The lockable currency trait and some associated types.
 
-use crate::dispatch::DispatchResult;
-use crate::traits::misc::Get;
-use super::Currency;
-use super::super::misc::WithdrawReasons;
+use super::{super::misc::WithdrawReasons, Currency};
+use crate::{dispatch::DispatchResult, traits::misc::Get};
 
 /// An identifier for a lock. Used for disambiguating different locks so that
 /// they can be individually replaced or removed.
@@ -63,10 +61,7 @@ pub trait LockableCurrency<AccountId>: Currency<AccountId> {
 	);
 
 	/// Remove an existing lock.
-	fn remove_lock(
-		id: LockIdentifier,
-		who: &AccountId,
-	);
+	fn remove_lock(id: LockIdentifier, who: &AccountId);
 }
 
 /// A vesting schedule over a currency. This allows a particular currency to have vesting limits
@@ -80,7 +75,8 @@ pub trait VestingSchedule<AccountId> {
 
 	/// Get the amount that is currently being vested and cannot be transferred out of this account.
 	/// Returns `None` if the account has no vesting schedule.
-	fn vesting_balance(who: &AccountId) -> Option<<Self::Currency as Currency<AccountId>>::Balance>;
+	fn vesting_balance(who: &AccountId)
+		-> Option<<Self::Currency as Currency<AccountId>>::Balance>;
 
 	/// Adds a vesting schedule to a given account.
 	///
diff --git a/frame/support/src/traits/tokens/currency/reservable.rs b/frame/support/src/traits/tokens/currency/reservable.rs
index 69017357cfa8..41220ca81cac 100644
--- a/frame/support/src/traits/tokens/currency/reservable.rs
+++ b/frame/support/src/traits/tokens/currency/reservable.rs
@@ -17,9 +17,8 @@
 
 //! The reservable currency trait.
 
-use super::Currency;
-use super::super::misc::BalanceStatus;
-use crate::dispatch::{DispatchResult, DispatchError};
+use super::{super::misc::BalanceStatus, Currency};
+use crate::dispatch::{DispatchError, DispatchResult};
 
 /// A currency where funds can be reserved from the user.
 pub trait ReservableCurrency<AccountId>: Currency<AccountId> {
@@ -33,7 +32,7 @@ pub trait ReservableCurrency<AccountId>: Currency<AccountId> {
 	/// is less than `value`, then a non-zero second item will be returned.
 	fn slash_reserved(
 		who: &AccountId,
-		value: Self::Balance
+		value: Self::Balance,
 	) -> (Self::NegativeImbalance, Self::Balance);
 
 	/// The amount of the balance of a given account that is externally reserved; this can still get
@@ -94,7 +93,7 @@ pub trait NamedReservableCurrency<AccountId>: ReservableCurrency<AccountId> {
 	fn slash_reserved_named(
 		id: &Self::ReserveIdentifier,
 		who: &AccountId,
-		value: Self::Balance
+		value: Self::Balance,
 	) -> (Self::NegativeImbalance, Self::Balance);
 
 	/// The amount of the balance of a given account that is externally reserved; this can still get
@@ -114,7 +113,11 @@ pub trait NamedReservableCurrency<AccountId>: ReservableCurrency<AccountId> {
 	///
 	/// If the free balance is lower than `value`, then no funds will be moved and an `Err` will
 	/// be returned to notify of this. This is different behavior than `unreserve`.
-	fn reserve_named(id: &Self::ReserveIdentifier, who: &AccountId, value: Self::Balance) -> DispatchResult;
+	fn reserve_named(
+		id: &Self::ReserveIdentifier,
+		who: &AccountId,
+		value: Self::Balance,
+	) -> DispatchResult;
 
 	/// Moves up to `value` from reserved balance to free balance. This function cannot fail.
 	///
@@ -126,7 +129,11 @@ pub trait NamedReservableCurrency<AccountId>: ReservableCurrency<AccountId> {
 	/// - This is different from `reserve`.
 	/// - If the remaining reserved balance is less than `ExistentialDeposit`, it will
 	/// invoke `on_reserved_too_low` and could reap the account.
-	fn unreserve_named(id: &Self::ReserveIdentifier, who: &AccountId, value: Self::Balance) -> Self::Balance;
+	fn unreserve_named(
+		id: &Self::ReserveIdentifier,
+		who: &AccountId,
+		value: Self::Balance,
+	) -> Self::Balance;
 
 	/// Moves up to `value` from reserved balance of account `slashed` to balance of account
 	/// `beneficiary`. `beneficiary` must exist for this to succeed. If it does not, `Err` will be
@@ -147,16 +154,21 @@ pub trait NamedReservableCurrency<AccountId>: ReservableCurrency<AccountId> {
 	///
 	/// This will reserve extra amount of current reserved balance is less than `value`.
 	/// And unreserve if current reserved balance is greater than `value`.
-	fn ensure_reserved_named(id: &Self::ReserveIdentifier, who: &AccountId, value: Self::Balance) -> DispatchResult {
+	fn ensure_reserved_named(
+		id: &Self::ReserveIdentifier,
+		who: &AccountId,
+		value: Self::Balance,
+	) -> DispatchResult {
 		let current = Self::reserved_balance_named(id, who);
- 		if current > value {
+		if current > value {
 			// we always have enough balance to unreserve here
 			Self::unreserve_named(id, who, current - value);
 			Ok(())
 		} else if value > current {
 			// we checked value > current
 			Self::reserve_named(id, who, value - current)
-		} else { // current == value
+		} else {
+			// current == value
 			Ok(())
 		}
 	}
@@ -173,7 +185,10 @@ pub trait NamedReservableCurrency<AccountId>: ReservableCurrency<AccountId> {
 	/// Slash all the reserved balance, returning the negative imbalance created.
 	///
 	/// Is a no-op if the value to be slashed is zero.
-	fn slash_all_reserved_named(id: &Self::ReserveIdentifier, who: &AccountId) -> Self::NegativeImbalance {
+	fn slash_all_reserved_named(
+		id: &Self::ReserveIdentifier,
+		who: &AccountId,
+	) -> Self::NegativeImbalance {
 		let value = Self::reserved_balance_named(id, who);
 		Self::slash_reserved_named(id, who, value).0
 	}
diff --git a/frame/support/src/traits/tokens/fungible.rs b/frame/support/src/traits/tokens/fungible.rs
index 5472212aaa65..b033236d447b 100644
--- a/frame/support/src/traits/tokens/fungible.rs
+++ b/frame/support/src/traits/tokens/fungible.rs
@@ -17,16 +17,20 @@
 
 //! The traits for dealing with a single fungible token class and any associated types.
 
-use super::*;
+use super::{
+	misc::{Balance, DepositConsequence, WithdrawConsequence},
+	*,
+};
+use crate::{
+	dispatch::{DispatchError, DispatchResult},
+	traits::misc::Get,
+};
 use sp_runtime::traits::Saturating;
-use crate::traits::misc::Get;
-use crate::dispatch::{DispatchResult, DispatchError};
-use super::misc::{DepositConsequence, WithdrawConsequence, Balance};
 
 mod balanced;
 mod imbalance;
 pub use balanced::{Balanced, Unbalanced};
-pub use imbalance::{Imbalance, HandleImbalanceDrop, DebtOf, CreditOf};
+pub use imbalance::{CreditOf, DebtOf, HandleImbalanceDrop, Imbalance};
 
 /// Trait for providing balance-inspection access to a fungible asset.
 pub trait Inspect<AccountId> {
@@ -84,7 +88,10 @@ pub trait Mutate<AccountId>: Inspect<AccountId> {
 		let extra = Self::can_withdraw(&source, amount).into_result()?;
 		Self::can_deposit(&dest, amount.saturating_add(extra)).into_result()?;
 		let actual = Self::burn_from(source, amount)?;
-		debug_assert!(actual == amount.saturating_add(extra), "can_withdraw must agree with withdraw; qed");
+		debug_assert!(
+			actual == amount.saturating_add(extra),
+			"can_withdraw must agree with withdraw; qed"
+		);
 		match Self::mint_into(dest, actual) {
 			Ok(_) => Ok(actual),
 			Err(err) => {
@@ -93,7 +100,7 @@ pub trait Mutate<AccountId>: Inspect<AccountId> {
 				let revert = Self::mint_into(source, actual);
 				debug_assert!(revert.is_ok(), "withdrew funds previously; qed");
 				Err(err)
-			}
+			},
 		}
 	}
 }
@@ -129,8 +136,11 @@ pub trait MutateHold<AccountId>: InspectHold<AccountId> + Transfer<AccountId> {
 	///
 	/// If `best_effort` is `true`, then the amount actually unreserved and returned as the inner
 	/// value of `Ok` may be smaller than the `amount` passed.
-	fn release(who: &AccountId, amount: Self::Balance, best_effort: bool)
-		-> Result<Self::Balance, DispatchError>;
+	fn release(
+		who: &AccountId,
+		amount: Self::Balance,
+		best_effort: bool,
+	) -> Result<Self::Balance, DispatchError>;
 
 	/// Transfer held funds into a destination account.
 	///
@@ -160,17 +170,17 @@ pub trait BalancedHold<AccountId>: Balanced<AccountId> + MutateHold<AccountId> {
 	///
 	/// As much funds that are on hold up to `amount` will be deducted as possible. If this is less
 	/// than `amount`, then a non-zero second item will be returned.
-	fn slash_held(who: &AccountId, amount: Self::Balance)
-		-> (CreditOf<AccountId, Self>, Self::Balance);
+	fn slash_held(
+		who: &AccountId,
+		amount: Self::Balance,
+	) -> (CreditOf<AccountId, Self>, Self::Balance);
 }
 
-impl<
-	AccountId,
-	T: Balanced<AccountId> + MutateHold<AccountId>,
-> BalancedHold<AccountId> for T {
-	fn slash_held(who: &AccountId, amount: Self::Balance)
-		-> (CreditOf<AccountId, Self>, Self::Balance)
-	{
+impl<AccountId, T: Balanced<AccountId> + MutateHold<AccountId>> BalancedHold<AccountId> for T {
+	fn slash_held(
+		who: &AccountId,
+		amount: Self::Balance,
+	) -> (CreditOf<AccountId, Self>, Self::Balance) {
 		let actual = match Self::release(who, amount, true) {
 			Ok(x) => x,
 			Err(_) => return (Imbalance::default(), amount),
@@ -185,15 +195,14 @@ pub struct ItemOf<
 	F: fungibles::Inspect<AccountId>,
 	A: Get<<F as fungibles::Inspect<AccountId>>::AssetId>,
 	AccountId,
->(
-	sp_std::marker::PhantomData<(F, A, AccountId)>
-);
+>(sp_std::marker::PhantomData<(F, A, AccountId)>);
 
 impl<
-	F: fungibles::Inspect<AccountId>,
-	A: Get<<F as fungibles::Inspect<AccountId>>::AssetId>,
-	AccountId,
-> Inspect<AccountId> for ItemOf<F, A, AccountId> {
+		F: fungibles::Inspect<AccountId>,
+		A: Get<<F as fungibles::Inspect<AccountId>>::AssetId>,
+		AccountId,
+	> Inspect<AccountId> for ItemOf<F, A, AccountId>
+{
 	type Balance = <F as fungibles::Inspect<AccountId>>::Balance;
 	fn total_issuance() -> Self::Balance {
 		<F as fungibles::Inspect<AccountId>>::total_issuance(A::get())
@@ -216,10 +225,11 @@ impl<
 }
 
 impl<
-	F: fungibles::Mutate<AccountId>,
-	A: Get<<F as fungibles::Inspect<AccountId>>::AssetId>,
-	AccountId,
-> Mutate<AccountId> for ItemOf<F, A, AccountId> {
+		F: fungibles::Mutate<AccountId>,
+		A: Get<<F as fungibles::Inspect<AccountId>>::AssetId>,
+		AccountId,
+	> Mutate<AccountId> for ItemOf<F, A, AccountId>
+{
 	fn mint_into(who: &AccountId, amount: Self::Balance) -> DispatchResult {
 		<F as fungibles::Mutate<AccountId>>::mint_into(A::get(), who, amount)
 	}
@@ -229,22 +239,27 @@ impl<
 }
 
 impl<
-	F: fungibles::Transfer<AccountId>,
-	A: Get<<F as fungibles::Inspect<AccountId>>::AssetId>,
-	AccountId,
-> Transfer<AccountId> for ItemOf<F, A, AccountId> {
-	fn transfer(source: &AccountId, dest: &AccountId, amount: Self::Balance, keep_alive: bool)
-		-> Result<Self::Balance, DispatchError>
-	{
+		F: fungibles::Transfer<AccountId>,
+		A: Get<<F as fungibles::Inspect<AccountId>>::AssetId>,
+		AccountId,
+	> Transfer<AccountId> for ItemOf<F, A, AccountId>
+{
+	fn transfer(
+		source: &AccountId,
+		dest: &AccountId,
+		amount: Self::Balance,
+		keep_alive: bool,
+	) -> Result<Self::Balance, DispatchError> {
 		<F as fungibles::Transfer<AccountId>>::transfer(A::get(), source, dest, amount, keep_alive)
 	}
 }
 
 impl<
-	F: fungibles::InspectHold<AccountId>,
-	A: Get<<F as fungibles::Inspect<AccountId>>::AssetId>,
-	AccountId,
-> InspectHold<AccountId> for ItemOf<F, A, AccountId> {
+		F: fungibles::InspectHold<AccountId>,
+		A: Get<<F as fungibles::Inspect<AccountId>>::AssetId>,
+		AccountId,
+	> InspectHold<AccountId> for ItemOf<F, A, AccountId>
+{
 	fn balance_on_hold(who: &AccountId) -> Self::Balance {
 		<F as fungibles::InspectHold<AccountId>>::balance_on_hold(A::get(), who)
 	}
@@ -254,16 +269,19 @@ impl<
 }
 
 impl<
-	F: fungibles::MutateHold<AccountId>,
-	A: Get<<F as fungibles::Inspect<AccountId>>::AssetId>,
-	AccountId,
-> MutateHold<AccountId> for ItemOf<F, A, AccountId> {
+		F: fungibles::MutateHold<AccountId>,
+		A: Get<<F as fungibles::Inspect<AccountId>>::AssetId>,
+		AccountId,
+	> MutateHold<AccountId> for ItemOf<F, A, AccountId>
+{
 	fn hold(who: &AccountId, amount: Self::Balance) -> DispatchResult {
 		<F as fungibles::MutateHold<AccountId>>::hold(A::get(), who, amount)
 	}
-	fn release(who: &AccountId, amount: Self::Balance, best_effort: bool)
-		-> Result<Self::Balance, DispatchError>
-	{
+	fn release(
+		who: &AccountId,
+		amount: Self::Balance,
+		best_effort: bool,
+	) -> Result<Self::Balance, DispatchError> {
 		<F as fungibles::MutateHold<AccountId>>::release(A::get(), who, amount, best_effort)
 	}
 	fn transfer_held(
@@ -285,23 +303,30 @@ impl<
 }
 
 impl<
-	F: fungibles::Unbalanced<AccountId>,
-	A: Get<<F as fungibles::Inspect<AccountId>>::AssetId>,
-	AccountId,
-> Unbalanced<AccountId> for ItemOf<F, A, AccountId> {
+		F: fungibles::Unbalanced<AccountId>,
+		A: Get<<F as fungibles::Inspect<AccountId>>::AssetId>,
+		AccountId,
+	> Unbalanced<AccountId> for ItemOf<F, A, AccountId>
+{
 	fn set_balance(who: &AccountId, amount: Self::Balance) -> DispatchResult {
 		<F as fungibles::Unbalanced<AccountId>>::set_balance(A::get(), who, amount)
 	}
 	fn set_total_issuance(amount: Self::Balance) -> () {
 		<F as fungibles::Unbalanced<AccountId>>::set_total_issuance(A::get(), amount)
 	}
-	fn decrease_balance(who: &AccountId, amount: Self::Balance) -> Result<Self::Balance, DispatchError> {
+	fn decrease_balance(
+		who: &AccountId,
+		amount: Self::Balance,
+	) -> Result<Self::Balance, DispatchError> {
 		<F as fungibles::Unbalanced<AccountId>>::decrease_balance(A::get(), who, amount)
 	}
 	fn decrease_balance_at_most(who: &AccountId, amount: Self::Balance) -> Self::Balance {
 		<F as fungibles::Unbalanced<AccountId>>::decrease_balance_at_most(A::get(), who, amount)
 	}
-	fn increase_balance(who: &AccountId, amount: Self::Balance) -> Result<Self::Balance, DispatchError> {
+	fn increase_balance(
+		who: &AccountId,
+		amount: Self::Balance,
+	) -> Result<Self::Balance, DispatchError> {
 		<F as fungibles::Unbalanced<AccountId>>::increase_balance(A::get(), who, amount)
 	}
 	fn increase_balance_at_most(who: &AccountId, amount: Self::Balance) -> Self::Balance {
diff --git a/frame/support/src/traits/tokens/fungible/balanced.rs b/frame/support/src/traits/tokens/fungible/balanced.rs
index 1cd0fcf0ca41..a54b29a9d913 100644
--- a/frame/support/src/traits/tokens/fungible/balanced.rs
+++ b/frame/support/src/traits/tokens/fungible/balanced.rs
@@ -18,12 +18,16 @@
 //! The trait and associated types for sets of fungible tokens that manage total issuance without
 //! requiring atomic balanced operations.
 
-use super::*;
+use super::{super::Imbalance as ImbalanceT, *};
+use crate::{
+	dispatch::{DispatchError, DispatchResult},
+	traits::misc::{SameOrOther, TryDrop},
+};
+use sp_runtime::{
+	traits::{CheckedAdd, Zero},
+	ArithmeticError, TokenError,
+};
 use sp_std::marker::PhantomData;
-use sp_runtime::{TokenError, ArithmeticError, traits::{CheckedAdd, Zero}};
-use super::super::Imbalance as ImbalanceT;
-use crate::traits::misc::{SameOrOther, TryDrop};
-use crate::dispatch::{DispatchResult, DispatchError};
 
 /// A fungible token class where any creation and deletion of tokens is semi-explicit and where the
 /// total supply is maintained automatically.
@@ -65,10 +69,7 @@ pub trait Balanced<AccountId>: Inspect<AccountId> {
 	///
 	/// As much funds up to `value` will be deducted as possible. If this is less than `value`,
 	/// then a non-zero second item will be returned.
-	fn slash(
-		who: &AccountId,
-		amount: Self::Balance,
-	) -> (CreditOf<AccountId, Self>, Self::Balance);
+	fn slash(who: &AccountId, amount: Self::Balance) -> (CreditOf<AccountId, Self>, Self::Balance);
 
 	/// Mints exactly `value` into the account of `who`.
 	///
@@ -90,7 +91,7 @@ pub trait Balanced<AccountId>: Inspect<AccountId> {
 	fn withdraw(
 		who: &AccountId,
 		value: Self::Balance,
-		//TODO: liveness: ExistenceRequirement,
+		// TODO: liveness: ExistenceRequirement,
 	) -> Result<CreditOf<AccountId, Self>, DispatchError>;
 
 	/// The balance of `who` is increased in order to counter `credit`. If the whole of `credit`
@@ -119,7 +120,7 @@ pub trait Balanced<AccountId>: Inspect<AccountId> {
 	fn settle(
 		who: &AccountId,
 		debt: DebtOf<AccountId, Self>,
-		//TODO: liveness: ExistenceRequirement,
+		// TODO: liveness: ExistenceRequirement,
 	) -> Result<CreditOf<AccountId, Self>, DebtOf<AccountId, Self>> {
 		let amount = debt.peek();
 		let credit = match Self::withdraw(who, amount) {
@@ -132,7 +133,7 @@ pub trait Balanced<AccountId>: Inspect<AccountId> {
 			SameOrOther::Other(rest) => {
 				debug_assert!(false, "ok withdraw return must be at least debt value; qed");
 				Err(rest)
-			}
+			},
 		}
 	}
 }
@@ -158,9 +159,10 @@ pub trait Unbalanced<AccountId>: Inspect<AccountId> {
 	///
 	/// Minimum balance will be respected and the returned imbalance may be up to
 	/// `Self::minimum_balance() - 1` greater than `amount`.
-	fn decrease_balance(who: &AccountId, amount: Self::Balance)
-		-> Result<Self::Balance, DispatchError>
-	{
+	fn decrease_balance(
+		who: &AccountId,
+		amount: Self::Balance,
+	) -> Result<Self::Balance, DispatchError> {
 		let old_balance = Self::balance(who);
 		let (mut new_balance, mut amount) = if old_balance < amount {
 			Err(TokenError::NoFunds)?
@@ -182,9 +184,7 @@ pub trait Unbalanced<AccountId>: Inspect<AccountId> {
 	/// `Self::minimum_balance() - 1` greater than `amount`.
 	///
 	/// Return the imbalance by which the account was reduced.
-	fn decrease_balance_at_most(who: &AccountId, amount: Self::Balance)
-		-> Self::Balance
-	{
+	fn decrease_balance_at_most(who: &AccountId, amount: Self::Balance) -> Self::Balance {
 		let old_balance = Self::balance(who);
 		let (mut new_balance, mut amount) = if old_balance < amount {
 			(Zero::zero(), old_balance)
@@ -217,9 +217,10 @@ pub trait Unbalanced<AccountId>: Inspect<AccountId> {
 	///
 	/// Minimum balance will be respected and an error will be returned if
 	/// `amount < Self::minimum_balance()` when the account of `who` is zero.
-	fn increase_balance(who: &AccountId, amount: Self::Balance)
-		-> Result<Self::Balance, DispatchError>
-	{
+	fn increase_balance(
+		who: &AccountId,
+		amount: Self::Balance,
+	) -> Result<Self::Balance, DispatchError> {
 		let old_balance = Self::balance(who);
 		let new_balance = old_balance.checked_add(&amount).ok_or(ArithmeticError::Overflow)?;
 		if new_balance < Self::minimum_balance() {
@@ -237,9 +238,7 @@ pub trait Unbalanced<AccountId>: Inspect<AccountId> {
 	/// `amount < Self::minimum_balance()`.
 	///
 	/// Return the imbalance by which the account was increased.
-	fn increase_balance_at_most(who: &AccountId, amount: Self::Balance)
-		-> Self::Balance
-	{
+	fn increase_balance_at_most(who: &AccountId, amount: Self::Balance) -> Self::Balance {
 		let old_balance = Self::balance(who);
 		let mut new_balance = old_balance.saturating_add(amount);
 		let mut amount = new_balance - old_balance;
@@ -300,16 +299,12 @@ type Debt<AccountId, U> = Imbalance<
 >;
 
 /// Create some `Credit` item. Only for internal use.
-fn credit<AccountId, U: Unbalanced<AccountId>>(
-	amount: U::Balance,
-) -> Credit<AccountId, U> {
+fn credit<AccountId, U: Unbalanced<AccountId>>(amount: U::Balance) -> Credit<AccountId, U> {
 	Imbalance::new(amount)
 }
 
 /// Create some `Debt` item. Only for internal use.
-fn debt<AccountId, U: Unbalanced<AccountId>>(
-	amount: U::Balance,
-) -> Debt<AccountId, U> {
+fn debt<AccountId, U: Unbalanced<AccountId>>(amount: U::Balance) -> Debt<AccountId, U> {
 	Imbalance::new(amount)
 }
 
@@ -328,10 +323,7 @@ impl<AccountId, U: Unbalanced<AccountId>> Balanced<AccountId> for U {
 		U::set_total_issuance(new);
 		credit(new - old)
 	}
-	fn slash(
-		who: &AccountId,
-		amount: Self::Balance,
-	) -> (Credit<AccountId, Self>, Self::Balance) {
+	fn slash(who: &AccountId, amount: Self::Balance) -> (Credit<AccountId, Self>, Self::Balance) {
 		let slashed = U::decrease_balance_at_most(who, amount);
 		// `slashed` could be less than, greater than or equal to `amount`.
 		// If slashed == amount, it means the account had at least amount in it and it could all be
@@ -344,7 +336,7 @@ impl<AccountId, U: Unbalanced<AccountId>> Balanced<AccountId> for U {
 	}
 	fn deposit(
 		who: &AccountId,
-		amount: Self::Balance
+		amount: Self::Balance,
 	) -> Result<Debt<AccountId, Self>, DispatchError> {
 		let increase = U::increase_balance(who, amount)?;
 		Ok(debt(increase))
@@ -352,7 +344,7 @@ impl<AccountId, U: Unbalanced<AccountId>> Balanced<AccountId> for U {
 	fn withdraw(
 		who: &AccountId,
 		amount: Self::Balance,
-		//TODO: liveness: ExistenceRequirement,
+		// TODO: liveness: ExistenceRequirement,
 	) -> Result<Credit<AccountId, Self>, DispatchError> {
 		let decrease = U::decrease_balance(who, amount)?;
 		Ok(credit(decrease))
diff --git a/frame/support/src/traits/tokens/fungible/imbalance.rs b/frame/support/src/traits/tokens/fungible/imbalance.rs
index ab3694359ce9..e6d3b5bed66a 100644
--- a/frame/support/src/traits/tokens/fungible/imbalance.rs
+++ b/frame/support/src/traits/tokens/fungible/imbalance.rs
@@ -18,13 +18,10 @@
 //! The imbalance type and its associates, which handles keeps everything adding up properly with
 //! unbalanced operations.
 
-use super::*;
+use super::{super::Imbalance as ImbalanceT, balanced::Balanced, misc::Balance, *};
+use crate::traits::misc::{SameOrOther, TryDrop};
+use sp_runtime::{traits::Zero, RuntimeDebug};
 use sp_std::marker::PhantomData;
-use sp_runtime::{RuntimeDebug, traits::Zero};
-use super::misc::Balance;
-use super::balanced::Balanced;
-use crate::traits::misc::{TryDrop, SameOrOther};
-use super::super::Imbalance as ImbalanceT;
 
 /// Handler for when an imbalance gets dropped. This could handle either a credit (negative) or
 /// debt (positive) imbalance.
@@ -49,11 +46,9 @@ pub struct Imbalance<
 	_phantom: PhantomData<(OnDrop, OppositeOnDrop)>,
 }
 
-impl<
-	B: Balance,
-	OnDrop: HandleImbalanceDrop<B>,
-	OppositeOnDrop: HandleImbalanceDrop<B>
-> Drop for Imbalance<B, OnDrop, OppositeOnDrop> {
+impl<B: Balance, OnDrop: HandleImbalanceDrop<B>, OppositeOnDrop: HandleImbalanceDrop<B>> Drop
+	for Imbalance<B, OnDrop, OppositeOnDrop>
+{
 	fn drop(&mut self) {
 		if !self.amount.is_zero() {
 			OnDrop::handle(self.amount)
@@ -61,42 +56,34 @@ impl<
 	}
 }
 
-impl<
-	B: Balance,
-	OnDrop: HandleImbalanceDrop<B>,
-	OppositeOnDrop: HandleImbalanceDrop<B>,
-> TryDrop for Imbalance<B, OnDrop, OppositeOnDrop> {
+impl<B: Balance, OnDrop: HandleImbalanceDrop<B>, OppositeOnDrop: HandleImbalanceDrop<B>> TryDrop
+	for Imbalance<B, OnDrop, OppositeOnDrop>
+{
 	/// Drop an instance cleanly. Only works if its value represents "no-operation".
 	fn try_drop(self) -> Result<(), Self> {
 		self.drop_zero()
 	}
 }
 
-impl<
-	B: Balance,
-	OnDrop: HandleImbalanceDrop<B>,
-	OppositeOnDrop: HandleImbalanceDrop<B>,
-> Default for Imbalance<B, OnDrop, OppositeOnDrop> {
+impl<B: Balance, OnDrop: HandleImbalanceDrop<B>, OppositeOnDrop: HandleImbalanceDrop<B>> Default
+	for Imbalance<B, OnDrop, OppositeOnDrop>
+{
 	fn default() -> Self {
 		Self::zero()
 	}
 }
 
-impl<
-	B: Balance,
-	OnDrop: HandleImbalanceDrop<B>,
-	OppositeOnDrop: HandleImbalanceDrop<B>,
-> Imbalance<B, OnDrop, OppositeOnDrop> {
+impl<B: Balance, OnDrop: HandleImbalanceDrop<B>, OppositeOnDrop: HandleImbalanceDrop<B>>
+	Imbalance<B, OnDrop, OppositeOnDrop>
+{
 	pub(crate) fn new(amount: B) -> Self {
 		Self { amount, _phantom: PhantomData }
 	}
 }
 
-impl<
-	B: Balance,
-	OnDrop: HandleImbalanceDrop<B>,
-	OppositeOnDrop: HandleImbalanceDrop<B>,
-> ImbalanceT<B> for Imbalance<B, OnDrop, OppositeOnDrop> {
+impl<B: Balance, OnDrop: HandleImbalanceDrop<B>, OppositeOnDrop: HandleImbalanceDrop<B>>
+	ImbalanceT<B> for Imbalance<B, OnDrop, OppositeOnDrop>
+{
 	type Opposite = Imbalance<B, OppositeOnDrop, OnDrop>;
 
 	fn zero() -> Self {
@@ -127,9 +114,10 @@ impl<
 		self.amount = self.amount.saturating_add(other.amount);
 		sp_std::mem::forget(other);
 	}
-	fn offset(self, other: Imbalance<B, OppositeOnDrop, OnDrop>)
-		-> SameOrOther<Self, Imbalance<B, OppositeOnDrop, OnDrop>>
-	{
+	fn offset(
+		self,
+		other: Imbalance<B, OppositeOnDrop, OnDrop>,
+	) -> SameOrOther<Self, Imbalance<B, OppositeOnDrop, OnDrop>> {
 		let (a, b) = (self.amount, other.amount);
 		sp_std::mem::forget((self, other));
 
diff --git a/frame/support/src/traits/tokens/fungibles.rs b/frame/support/src/traits/tokens/fungibles.rs
index 490f28dfb453..3f5a1c75860c 100644
--- a/frame/support/src/traits/tokens/fungibles.rs
+++ b/frame/support/src/traits/tokens/fungibles.rs
@@ -17,15 +17,17 @@
 
 //! The traits for sets of fungible tokens and any associated types.
 
-use super::*;
+use super::{
+	misc::{AssetId, Balance},
+	*,
+};
 use crate::dispatch::{DispatchError, DispatchResult};
-use super::misc::{AssetId, Balance};
 use sp_runtime::traits::Saturating;
 
 mod balanced;
 pub use balanced::{Balanced, Unbalanced};
 mod imbalance;
-pub use imbalance::{Imbalance, HandleImbalanceDrop, DebtOf, CreditOf};
+pub use imbalance::{CreditOf, DebtOf, HandleImbalanceDrop, Imbalance};
 
 /// Trait for providing balance-inspection access to a set of named fungible assets.
 pub trait Inspect<AccountId> {
@@ -48,8 +50,11 @@ pub trait Inspect<AccountId> {
 	fn reducible_balance(asset: Self::AssetId, who: &AccountId, keep_alive: bool) -> Self::Balance;
 
 	/// Returns `true` if the `asset` balance of `who` may be increased by `amount`.
-	fn can_deposit(asset: Self::AssetId, who: &AccountId, amount: Self::Balance)
-		-> DepositConsequence;
+	fn can_deposit(
+		asset: Self::AssetId,
+		who: &AccountId,
+		amount: Self::Balance,
+	) -> DepositConsequence;
 
 	/// Returns `Failed` if the `asset` balance of `who` may not be decreased by `amount`, otherwise
 	/// the consequence.
@@ -87,8 +92,11 @@ pub trait Mutate<AccountId>: Inspect<AccountId> {
 	/// Due to minimum balance requirements, it's possible that the amount withdrawn could be up to
 	/// `Self::minimum_balance() - 1` more than the `amount`. The total amount withdrawn is returned
 	/// in an `Ok` result. This may be safely ignored if you don't mind the overall supply reducing.
-	fn burn_from(asset: Self::AssetId, who: &AccountId, amount: Self::Balance)
-		-> Result<Self::Balance, DispatchError>;
+	fn burn_from(
+		asset: Self::AssetId,
+		who: &AccountId,
+		amount: Self::Balance,
+	) -> Result<Self::Balance, DispatchError>;
 
 	/// Attempt to reduce the `asset` balance of `who` by as much as possible up to `amount`, and
 	/// possibly slightly more due to minimum_balance requirements. If no decrease is possible then
@@ -97,9 +105,11 @@ pub trait Mutate<AccountId>: Inspect<AccountId> {
 	///
 	/// The default implementation just uses `withdraw` along with `reducible_balance` to ensure
 	/// that is doesn't fail.
-	fn slash(asset: Self::AssetId, who: &AccountId, amount: Self::Balance)
-		-> Result<Self::Balance, DispatchError>
-	{
+	fn slash(
+		asset: Self::AssetId,
+		who: &AccountId,
+		amount: Self::Balance,
+	) -> Result<Self::Balance, DispatchError> {
 		Self::burn_from(asset, who, Self::reducible_balance(asset, who, false).min(amount))
 	}
 
@@ -114,7 +124,10 @@ pub trait Mutate<AccountId>: Inspect<AccountId> {
 		let extra = Self::can_withdraw(asset, &source, amount).into_result()?;
 		Self::can_deposit(asset, &dest, amount.saturating_add(extra)).into_result()?;
 		let actual = Self::burn_from(asset, source, amount)?;
-		debug_assert!(actual == amount.saturating_add(extra), "can_withdraw must agree with withdraw; qed");
+		debug_assert!(
+			actual == amount.saturating_add(extra),
+			"can_withdraw must agree with withdraw; qed"
+		);
 		match Self::mint_into(asset, dest, actual) {
 			Ok(_) => Ok(actual),
 			Err(err) => {
@@ -123,7 +136,7 @@ pub trait Mutate<AccountId>: Inspect<AccountId> {
 				let revert = Self::mint_into(asset, source, actual);
 				debug_assert!(revert.is_ok(), "withdrew funds previously; qed");
 				Err(err)
-			}
+			},
 		}
 	}
 }
@@ -158,8 +171,12 @@ pub trait MutateHold<AccountId>: InspectHold<AccountId> + Transfer<AccountId> {
 	///
 	/// If `best_effort` is `true`, then the amount actually released and returned as the inner
 	/// value of `Ok` may be smaller than the `amount` passed.
-	fn release(asset: Self::AssetId, who: &AccountId, amount: Self::Balance, best_effort: bool)
-		-> Result<Self::Balance, DispatchError>;
+	fn release(
+		asset: Self::AssetId,
+		who: &AccountId,
+		amount: Self::Balance,
+		best_effort: bool,
+	) -> Result<Self::Balance, DispatchError>;
 
 	/// Transfer held funds into a destination account.
 	///
@@ -190,17 +207,19 @@ pub trait BalancedHold<AccountId>: Balanced<AccountId> + MutateHold<AccountId> {
 	///
 	/// As much funds up to `amount` will be deducted as possible. If this is less than `amount`,
 	/// then a non-zero second item will be returned.
-	fn slash_held(asset: Self::AssetId, who: &AccountId, amount: Self::Balance)
-		-> (CreditOf<AccountId, Self>, Self::Balance);
+	fn slash_held(
+		asset: Self::AssetId,
+		who: &AccountId,
+		amount: Self::Balance,
+	) -> (CreditOf<AccountId, Self>, Self::Balance);
 }
 
-impl<
-	AccountId,
-	T: Balanced<AccountId> + MutateHold<AccountId>,
-> BalancedHold<AccountId> for T {
-	fn slash_held(asset: Self::AssetId, who: &AccountId, amount: Self::Balance)
-		-> (CreditOf<AccountId, Self>, Self::Balance)
-	{
+impl<AccountId, T: Balanced<AccountId> + MutateHold<AccountId>> BalancedHold<AccountId> for T {
+	fn slash_held(
+		asset: Self::AssetId,
+		who: &AccountId,
+		amount: Self::Balance,
+	) -> (CreditOf<AccountId, Self>, Self::Balance) {
 		let actual = match Self::release(asset, who, amount, true) {
 			Ok(x) => x,
 			Err(_) => return (Imbalance::zero(asset), amount),
diff --git a/frame/support/src/traits/tokens/fungibles/balanced.rs b/frame/support/src/traits/tokens/fungibles/balanced.rs
index a1016f8c1195..9c601c3e7c42 100644
--- a/frame/support/src/traits/tokens/fungibles/balanced.rs
+++ b/frame/support/src/traits/tokens/fungibles/balanced.rs
@@ -19,11 +19,16 @@
 //! requiring atomic balanced operations.
 
 use super::*;
-use sp_std::marker::PhantomData;
-use sp_runtime::{ArithmeticError, TokenError, traits::{Zero, CheckedAdd}};
+use crate::{
+	dispatch::{DispatchError, DispatchResult},
+	traits::misc::{SameOrOther, TryDrop},
+};
 use sp_arithmetic::traits::Saturating;
-use crate::dispatch::{DispatchError, DispatchResult};
-use crate::traits::misc::{SameOrOther, TryDrop};
+use sp_runtime::{
+	traits::{CheckedAdd, Zero},
+	ArithmeticError, TokenError,
+};
+use sp_std::marker::PhantomData;
 
 /// A fungible token class where any creation and deletion of tokens is semi-explicit and where the
 /// total supply is maintained automatically.
@@ -55,9 +60,10 @@ pub trait Balanced<AccountId>: Inspect<AccountId> {
 	///
 	/// This is just the same as burning and issuing the same amount and has no effect on the
 	/// total issuance.
-	fn pair(asset: Self::AssetId, amount: Self::Balance)
-			-> (DebtOf<AccountId, Self>, CreditOf<AccountId, Self>)
-	{
+	fn pair(
+		asset: Self::AssetId,
+		amount: Self::Balance,
+	) -> (DebtOf<AccountId, Self>, CreditOf<AccountId, Self>) {
 		(Self::rescind(asset, amount), Self::issue(asset, amount))
 	}
 
@@ -96,7 +102,7 @@ pub trait Balanced<AccountId>: Inspect<AccountId> {
 		asset: Self::AssetId,
 		who: &AccountId,
 		value: Self::Balance,
-		//TODO: liveness: ExistenceRequirement,
+		// TODO: liveness: ExistenceRequirement,
 	) -> Result<CreditOf<AccountId, Self>, DispatchError>;
 
 	/// The balance of `who` is increased in order to counter `credit`. If the whole of `credit`
@@ -129,7 +135,7 @@ pub trait Balanced<AccountId>: Inspect<AccountId> {
 	fn settle(
 		who: &AccountId,
 		debt: DebtOf<AccountId, Self>,
-		//TODO: liveness: ExistenceRequirement,
+		// TODO: liveness: ExistenceRequirement,
 	) -> Result<CreditOf<AccountId, Self>, DebtOf<AccountId, Self>> {
 		let amount = debt.peek();
 		let asset = debt.asset();
@@ -143,11 +149,11 @@ pub trait Balanced<AccountId>: Inspect<AccountId> {
 			Ok(SameOrOther::Other(rest)) => {
 				debug_assert!(false, "ok withdraw return must be at least debt value; qed");
 				Err(rest)
-			}
+			},
 			Err(_) => {
 				debug_assert!(false, "debt.asset is credit.asset; qed");
 				Ok(CreditOf::<AccountId, Self>::zero(asset))
-			}
+			},
 		}
 	}
 }
@@ -173,9 +179,11 @@ pub trait Unbalanced<AccountId>: Inspect<AccountId> {
 	///
 	/// Minimum balance will be respected and the returned imbalance may be up to
 	/// `Self::minimum_balance() - 1` greater than `amount`.
-	fn decrease_balance(asset: Self::AssetId, who: &AccountId, amount: Self::Balance)
-		-> Result<Self::Balance, DispatchError>
-	{
+	fn decrease_balance(
+		asset: Self::AssetId,
+		who: &AccountId,
+		amount: Self::Balance,
+	) -> Result<Self::Balance, DispatchError> {
 		let old_balance = Self::balance(asset, who);
 		let (mut new_balance, mut amount) = if old_balance < amount {
 			Err(TokenError::NoFunds)?
@@ -197,9 +205,11 @@ pub trait Unbalanced<AccountId>: Inspect<AccountId> {
 	/// `Self::minimum_balance() - 1` greater than `amount`.
 	///
 	/// Return the imbalance by which the account was reduced.
-	fn decrease_balance_at_most(asset: Self::AssetId, who: &AccountId, amount: Self::Balance)
-		-> Self::Balance
-	{
+	fn decrease_balance_at_most(
+		asset: Self::AssetId,
+		who: &AccountId,
+		amount: Self::Balance,
+	) -> Self::Balance {
 		let old_balance = Self::balance(asset, who);
 		let (mut new_balance, mut amount) = if old_balance < amount {
 			(Zero::zero(), old_balance)
@@ -232,9 +242,11 @@ pub trait Unbalanced<AccountId>: Inspect<AccountId> {
 	///
 	/// Minimum balance will be respected and an error will be returned if
 	/// `amount < Self::minimum_balance()` when the account of `who` is zero.
-	fn increase_balance(asset: Self::AssetId, who: &AccountId, amount: Self::Balance)
-		-> Result<Self::Balance, DispatchError>
-	{
+	fn increase_balance(
+		asset: Self::AssetId,
+		who: &AccountId,
+		amount: Self::Balance,
+	) -> Result<Self::Balance, DispatchError> {
 		let old_balance = Self::balance(asset, who);
 		let new_balance = old_balance.checked_add(&amount).ok_or(ArithmeticError::Overflow)?;
 		if new_balance < Self::minimum_balance(asset) {
@@ -252,9 +264,11 @@ pub trait Unbalanced<AccountId>: Inspect<AccountId> {
 	/// `amount < Self::minimum_balance()`.
 	///
 	/// Return the imbalance by which the account was increased.
-	fn increase_balance_at_most(asset: Self::AssetId, who: &AccountId, amount: Self::Balance)
-		-> Self::Balance
-	{
+	fn increase_balance_at_most(
+		asset: Self::AssetId,
+		who: &AccountId,
+		amount: Self::Balance,
+	) -> Self::Balance {
 		let old_balance = Self::balance(asset, who);
 		let mut new_balance = old_balance.saturating_add(amount);
 		let mut amount = new_balance - old_balance;
@@ -361,7 +375,7 @@ impl<AccountId, U: Unbalanced<AccountId>> Balanced<AccountId> for U {
 	fn deposit(
 		asset: Self::AssetId,
 		who: &AccountId,
-		amount: Self::Balance
+		amount: Self::Balance,
 	) -> Result<Debt<AccountId, Self>, DispatchError> {
 		let increase = U::increase_balance(asset, who, amount)?;
 		Ok(debt(asset, increase))
@@ -370,7 +384,7 @@ impl<AccountId, U: Unbalanced<AccountId>> Balanced<AccountId> for U {
 		asset: Self::AssetId,
 		who: &AccountId,
 		amount: Self::Balance,
-		//TODO: liveness: ExistenceRequirement,
+		// TODO: liveness: ExistenceRequirement,
 	) -> Result<Credit<AccountId, Self>, DispatchError> {
 		let decrease = U::decrease_balance(asset, who, amount)?;
 		Ok(credit(asset, decrease))
diff --git a/frame/support/src/traits/tokens/fungibles/imbalance.rs b/frame/support/src/traits/tokens/fungibles/imbalance.rs
index 9ecdeac1d4f0..2195cacc4282 100644
--- a/frame/support/src/traits/tokens/fungibles/imbalance.rs
+++ b/frame/support/src/traits/tokens/fungibles/imbalance.rs
@@ -18,12 +18,14 @@
 //! The imbalance type and its associates, which handles keeps everything adding up properly with
 //! unbalanced operations.
 
-use super::*;
+use super::{
+	balanced::Balanced,
+	fungibles::{AssetId, Balance},
+	*,
+};
+use crate::traits::misc::{SameOrOther, TryDrop};
+use sp_runtime::{traits::Zero, RuntimeDebug};
 use sp_std::marker::PhantomData;
-use sp_runtime::{RuntimeDebug, traits::Zero};
-use super::fungibles::{AssetId, Balance};
-use super::balanced::Balanced;
-use crate::traits::misc::{TryDrop, SameOrOther};
 
 /// Handler for when an imbalance gets dropped. This could handle either a credit (negative) or
 /// debt (positive) imbalance.
@@ -50,11 +52,12 @@ pub struct Imbalance<
 }
 
 impl<
-	A: AssetId,
-	B: Balance,
-	OnDrop: HandleImbalanceDrop<A, B>,
-	OppositeOnDrop: HandleImbalanceDrop<A, B>
-> Drop for Imbalance<A, B, OnDrop, OppositeOnDrop> {
+		A: AssetId,
+		B: Balance,
+		OnDrop: HandleImbalanceDrop<A, B>,
+		OppositeOnDrop: HandleImbalanceDrop<A, B>,
+	> Drop for Imbalance<A, B, OnDrop, OppositeOnDrop>
+{
 	fn drop(&mut self) {
 		if !self.amount.is_zero() {
 			OnDrop::handle(self.asset, self.amount)
@@ -63,11 +66,12 @@ impl<
 }
 
 impl<
-	A: AssetId,
-	B: Balance,
-	OnDrop: HandleImbalanceDrop<A, B>,
-	OppositeOnDrop: HandleImbalanceDrop<A, B>,
-> TryDrop for Imbalance<A, B, OnDrop, OppositeOnDrop> {
+		A: AssetId,
+		B: Balance,
+		OnDrop: HandleImbalanceDrop<A, B>,
+		OppositeOnDrop: HandleImbalanceDrop<A, B>,
+	> TryDrop for Imbalance<A, B, OnDrop, OppositeOnDrop>
+{
 	/// Drop an instance cleanly. Only works if its value represents "no-operation".
 	fn try_drop(self) -> Result<(), Self> {
 		self.drop_zero()
@@ -75,11 +79,12 @@ impl<
 }
 
 impl<
-	A: AssetId,
-	B: Balance,
-	OnDrop: HandleImbalanceDrop<A, B>,
-	OppositeOnDrop: HandleImbalanceDrop<A, B>,
-> Imbalance<A, B, OnDrop, OppositeOnDrop> {
+		A: AssetId,
+		B: Balance,
+		OnDrop: HandleImbalanceDrop<A, B>,
+		OppositeOnDrop: HandleImbalanceDrop<A, B>,
+	> Imbalance<A, B, OnDrop, OppositeOnDrop>
+{
 	pub fn zero(asset: A) -> Self {
 		Self { asset, amount: Zero::zero(), _phantom: PhantomData }
 	}
@@ -122,7 +127,10 @@ impl<
 			Err(other)
 		}
 	}
-	pub fn offset(self, other: Imbalance<A, B, OppositeOnDrop, OnDrop>) -> Result<
+	pub fn offset(
+		self,
+		other: Imbalance<A, B, OppositeOnDrop, OnDrop>,
+	) -> Result<
 		SameOrOther<Self, Imbalance<A, B, OppositeOnDrop, OnDrop>>,
 		(Self, Imbalance<A, B, OppositeOnDrop, OnDrop>),
 	> {
diff --git a/frame/support/src/traits/tokens/imbalance.rs b/frame/support/src/traits/tokens/imbalance.rs
index 9652b9a0275a..0f7b38a65efc 100644
--- a/frame/support/src/traits/tokens/imbalance.rs
+++ b/frame/support/src/traits/tokens/imbalance.rs
@@ -18,16 +18,16 @@
 //! The imbalance trait type and its associates, which handles keeps everything adding up properly
 //! with unbalanced operations.
 
-use sp_std::ops::Div;
+use crate::traits::misc::{SameOrOther, TryDrop};
 use sp_runtime::traits::Saturating;
-use crate::traits::misc::{TryDrop, SameOrOther};
+use sp_std::ops::Div;
 
-mod split_two_ways;
-mod signed_imbalance;
 mod on_unbalanced;
-pub use split_two_ways::SplitTwoWays;
-pub use signed_imbalance::SignedImbalance;
+mod signed_imbalance;
+mod split_two_ways;
 pub use on_unbalanced::OnUnbalanced;
+pub use signed_imbalance::SignedImbalance;
+pub use split_two_ways::SplitTwoWays;
 
 /// A trait for a not-quite Linear Type that tracks an imbalance.
 ///
@@ -78,10 +78,13 @@ pub trait Imbalance<Balance>: Sized + TryDrop + Default {
 	/// NOTE: This requires up to `first + second` room for a multiply, and `first + second` should
 	/// fit into a `u32`. Overflow will safely saturate in both cases.
 	fn ration(self, first: u32, second: u32) -> (Self, Self)
-		where Balance: From<u32> + Saturating + Div<Output=Balance>
+	where
+		Balance: From<u32> + Saturating + Div<Output = Balance>,
 	{
 		let total: u32 = first.saturating_add(second);
-		if total == 0 { return (Self::zero(), Self::zero()) }
+		if total == 0 {
+			return (Self::zero(), Self::zero())
+		}
 		let amount1 = self.peek().saturating_mul(first.into()) / total.into();
 		self.split(amount1)
 	}
@@ -100,7 +103,8 @@ pub trait Imbalance<Balance>: Sized + TryDrop + Default {
 	///
 	/// A convenient replacement for `split` and `merge`.
 	fn ration_merge(self, first: u32, second: u32, others: (Self, Self)) -> (Self, Self)
-		where Balance: From<u32> + Saturating + Div<Output=Balance>
+	where
+		Balance: From<u32> + Saturating + Div<Output = Balance>,
 	{
 		let (a, b) = self.ration(first, second);
 		(a.merge(others.0), b.merge(others.1))
@@ -121,7 +125,8 @@ pub trait Imbalance<Balance>: Sized + TryDrop + Default {
 	///
 	/// A convenient replacement for `split` and `merge`.
 	fn ration_merge_into(self, first: u32, second: u32, others: &mut (Self, Self))
-		where Balance: From<u32> + Saturating + Div<Output=Balance>
+	where
+		Balance: From<u32> + Saturating + Div<Output = Balance>,
 	{
 		let (a, b) = self.ration(first, second);
 		others.0.subsume(a);
@@ -167,7 +172,7 @@ pub trait Imbalance<Balance>: Sized + TryDrop + Default {
 	/// greater value than the `other`. Otherwise returns `Err` with an instance of
 	/// the `Opposite`. In both cases the value represents the combination of `self`
 	/// and `other`.
-	fn offset(self, other: Self::Opposite)-> SameOrOther<Self, Self::Opposite>;
+	fn offset(self, other: Self::Opposite) -> SameOrOther<Self, Self::Opposite>;
 
 	/// The raw value of self.
 	fn peek(&self) -> Balance;
diff --git a/frame/support/src/traits/tokens/imbalance/on_unbalanced.rs b/frame/support/src/traits/tokens/imbalance/on_unbalanced.rs
index f3ecc14308e7..bc7df0e2acf3 100644
--- a/frame/support/src/traits/tokens/imbalance/on_unbalanced.rs
+++ b/frame/support/src/traits/tokens/imbalance/on_unbalanced.rs
@@ -33,7 +33,10 @@ pub trait OnUnbalanced<Imbalance: TryDrop> {
 	/// Handler for some imbalances. The different imbalances might have different origins or
 	/// meanings, dependent on the context. Will default to simply calling on_unbalanced for all
 	/// of them. Infallible.
-	fn on_unbalanceds<B>(amounts: impl Iterator<Item=Imbalance>) where Imbalance: crate::traits::Imbalance<B> {
+	fn on_unbalanceds<B>(amounts: impl Iterator<Item = Imbalance>)
+	where
+		Imbalance: crate::traits::Imbalance<B>,
+	{
 		Self::on_unbalanced(amounts.fold(Imbalance::zero(), |i, x| x.merge(i)))
 	}
 
@@ -44,7 +47,9 @@ pub trait OnUnbalanced<Imbalance: TryDrop> {
 
 	/// Actually handle a non-zero imbalance. You probably want to implement this rather than
 	/// `on_unbalanced`.
-	fn on_nonzero_unbalanced(amount: Imbalance) { drop(amount); }
+	fn on_nonzero_unbalanced(amount: Imbalance) {
+		drop(amount);
+	}
 }
 
 impl<Imbalance: TryDrop> OnUnbalanced<Imbalance> for () {}
diff --git a/frame/support/src/traits/tokens/imbalance/signed_imbalance.rs b/frame/support/src/traits/tokens/imbalance/signed_imbalance.rs
index e3523f86804f..59302b975854 100644
--- a/frame/support/src/traits/tokens/imbalance/signed_imbalance.rs
+++ b/frame/support/src/traits/tokens/imbalance/signed_imbalance.rs
@@ -17,14 +17,14 @@
 
 //! Convenience type for managing an imbalance whose sign is unknown.
 
+use super::super::imbalance::Imbalance;
+use crate::traits::misc::SameOrOther;
 use codec::FullCodec;
-use sp_std::fmt::Debug;
 use sp_runtime::traits::{AtLeast32BitUnsigned, MaybeSerializeDeserialize};
-use crate::traits::misc::SameOrOther;
-use super::super::imbalance::Imbalance;
+use sp_std::fmt::Debug;
 
 /// Either a positive or a negative imbalance.
-pub enum SignedImbalance<B, PositiveImbalance: Imbalance<B>>{
+pub enum SignedImbalance<B, PositiveImbalance: Imbalance<B>> {
 	/// A positive imbalance (funds have been created but none destroyed).
 	Positive(PositiveImbalance),
 	/// A negative imbalance (funds have been destroyed but none created).
@@ -32,10 +32,11 @@ pub enum SignedImbalance<B, PositiveImbalance: Imbalance<B>>{
 }
 
 impl<
-	P: Imbalance<B, Opposite=N>,
-	N: Imbalance<B, Opposite=P>,
-	B: AtLeast32BitUnsigned + FullCodec + Copy + MaybeSerializeDeserialize + Debug + Default,
-> SignedImbalance<B, P> {
+		P: Imbalance<B, Opposite = N>,
+		N: Imbalance<B, Opposite = P>,
+		B: AtLeast32BitUnsigned + FullCodec + Copy + MaybeSerializeDeserialize + Debug + Default,
+	> SignedImbalance<B, P>
+{
 	/// Create a `Positive` instance of `Self` whose value is zero.
 	pub fn zero() -> Self {
 		SignedImbalance::Positive(P::zero())
diff --git a/frame/support/src/traits/tokens/imbalance/split_two_ways.rs b/frame/support/src/traits/tokens/imbalance/split_two_ways.rs
index f3f9870b62cd..882b43c2e914 100644
--- a/frame/support/src/traits/tokens/imbalance/split_two_ways.rs
+++ b/frame/support/src/traits/tokens/imbalance/split_two_ways.rs
@@ -17,29 +17,24 @@
 
 //! Means for splitting an imbalance into two and hanlding them differently.
 
-use sp_std::{ops::Div, marker::PhantomData};
+use super::super::imbalance::{Imbalance, OnUnbalanced};
 use sp_core::u32_trait::Value as U32;
 use sp_runtime::traits::Saturating;
-use super::super::imbalance::{Imbalance, OnUnbalanced};
+use sp_std::{marker::PhantomData, ops::Div};
 
 /// Split an unbalanced amount two ways between a common divisor.
-pub struct SplitTwoWays<
-	Balance,
-	Imbalance,
-	Part1,
-	Target1,
-	Part2,
-	Target2,
->(PhantomData<(Balance, Imbalance, Part1, Target1, Part2, Target2)>);
+pub struct SplitTwoWays<Balance, Imbalance, Part1, Target1, Part2, Target2>(
+	PhantomData<(Balance, Imbalance, Part1, Target1, Part2, Target2)>,
+);
 
 impl<
-	Balance: From<u32> + Saturating + Div<Output=Balance>,
-	I: Imbalance<Balance>,
-	Part1: U32,
-	Target1: OnUnbalanced<I>,
-	Part2: U32,
-	Target2: OnUnbalanced<I>,
-> OnUnbalanced<I> for SplitTwoWays<Balance, I, Part1, Target1, Part2, Target2>
+		Balance: From<u32> + Saturating + Div<Output = Balance>,
+		I: Imbalance<Balance>,
+		Part1: U32,
+		Target1: OnUnbalanced<I>,
+		Part2: U32,
+		Target2: OnUnbalanced<I>,
+	> OnUnbalanced<I> for SplitTwoWays<Balance, I, Part1, Target1, Part2, Target2>
 {
 	fn on_nonzero_unbalanced(amount: I) {
 		let total: u32 = Part1::VALUE + Part2::VALUE;
diff --git a/frame/support/src/traits/tokens/misc.rs b/frame/support/src/traits/tokens/misc.rs
index 97c111798caa..8eda930380d8 100644
--- a/frame/support/src/traits/tokens/misc.rs
+++ b/frame/support/src/traits/tokens/misc.rs
@@ -17,11 +17,11 @@
 
 //! Miscellaneous types.
 
-use sp_std::fmt::Debug;
-use codec::{Encode, Decode, FullCodec};
+use codec::{Decode, Encode, FullCodec};
+use sp_arithmetic::traits::{AtLeast32BitUnsigned, Zero};
 use sp_core::RuntimeDebug;
-use sp_arithmetic::traits::{Zero, AtLeast32BitUnsigned};
-use sp_runtime::{DispatchError, ArithmeticError, TokenError};
+use sp_runtime::{ArithmeticError, DispatchError, TokenError};
+use sp_std::fmt::Debug;
 
 /// One of a number of consequences of withdrawing a fungible from an account.
 #[derive(Copy, Clone, Eq, PartialEq)]
@@ -150,7 +150,7 @@ impl WithdrawReasons {
 	/// assert_eq!(
 	/// 	WithdrawReasons::FEE | WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE | WithdrawReasons::TIP,
 	/// 	WithdrawReasons::except(WithdrawReasons::TRANSACTION_PAYMENT),
-	///	);
+	/// 	);
 	/// # }
 	/// ```
 	pub fn except(one: WithdrawReasons) -> WithdrawReasons {
@@ -161,7 +161,7 @@ impl WithdrawReasons {
 }
 
 /// Simple amalgamation trait to collect together properties for an AssetId under one roof.
-pub trait AssetId: FullCodec + Copy  + Eq + PartialEq + Debug {}
+pub trait AssetId: FullCodec + Copy + Eq + PartialEq + Debug {}
 impl<T: FullCodec + Copy + Eq + PartialEq + Debug> AssetId for T {}
 
 /// Simple amalgamation trait to collect together properties for a Balance under one roof.
diff --git a/frame/support/src/traits/tokens/nonfungible.rs b/frame/support/src/traits/tokens/nonfungible.rs
index 27e6cf8126a8..821884f6e390 100644
--- a/frame/support/src/traits/tokens/nonfungible.rs
+++ b/frame/support/src/traits/tokens/nonfungible.rs
@@ -24,12 +24,11 @@
 //! For an NFT API which has dual-level namespacing, the traits in `nonfungibles` are better to
 //! use.
 
-use codec::{Encode, Decode};
-use sp_std::prelude::*;
-use sp_runtime::TokenError;
-use crate::dispatch::DispatchResult;
-use crate::traits::Get;
 use super::nonfungibles;
+use crate::{dispatch::DispatchResult, traits::Get};
+use codec::{Decode, Encode};
+use sp_runtime::TokenError;
+use sp_std::prelude::*;
 
 /// Trait for providing an interface to a read-only NFT-like set of asset instances.
 pub trait Inspect<AccountId> {
@@ -43,7 +42,9 @@ pub trait Inspect<AccountId> {
 	/// Returns the attribute value of `instance` corresponding to `key`.
 	///
 	/// By default this is `None`; no attributes are defined.
-	fn attribute(_instance: &Self::InstanceId, _key: &[u8]) -> Option<Vec<u8>> { None }
+	fn attribute(_instance: &Self::InstanceId, _key: &[u8]) -> Option<Vec<u8>> {
+		None
+	}
 
 	/// Returns the strongly-typed attribute value of `instance` corresponding to `key`.
 	///
@@ -56,7 +57,9 @@ pub trait Inspect<AccountId> {
 	/// Returns `true` if the asset `instance` may be transferred.
 	///
 	/// Default implementation is that all assets are transferable.
-	fn can_transfer(_instance: &Self::InstanceId) -> bool { true }
+	fn can_transfer(_instance: &Self::InstanceId) -> bool {
+		true
+	}
 }
 
 /// Interface for enumerating assets in existence or owned by a given account over a collection
@@ -117,15 +120,14 @@ pub struct ItemOf<
 	F: nonfungibles::Inspect<AccountId>,
 	A: Get<<F as nonfungibles::Inspect<AccountId>>::ClassId>,
 	AccountId,
->(
-	sp_std::marker::PhantomData<(F, A, AccountId)>
-);
+>(sp_std::marker::PhantomData<(F, A, AccountId)>);
 
 impl<
-	F: nonfungibles::Inspect<AccountId>,
-	A: Get<<F as nonfungibles::Inspect<AccountId>>::ClassId>,
-	AccountId,
-> Inspect<AccountId> for ItemOf<F, A, AccountId> {
+		F: nonfungibles::Inspect<AccountId>,
+		A: Get<<F as nonfungibles::Inspect<AccountId>>::ClassId>,
+		AccountId,
+	> Inspect<AccountId> for ItemOf<F, A, AccountId>
+{
 	type InstanceId = <F as nonfungibles::Inspect<AccountId>>::InstanceId;
 	fn owner(instance: &Self::InstanceId) -> Option<AccountId> {
 		<F as nonfungibles::Inspect<AccountId>>::owner(&A::get(), instance)
@@ -142,10 +144,11 @@ impl<
 }
 
 impl<
-	F: nonfungibles::InspectEnumerable<AccountId>,
-	A: Get<<F as nonfungibles::Inspect<AccountId>>::ClassId>,
-	AccountId,
-> InspectEnumerable<AccountId> for ItemOf<F, A, AccountId> {
+		F: nonfungibles::InspectEnumerable<AccountId>,
+		A: Get<<F as nonfungibles::Inspect<AccountId>>::ClassId>,
+		AccountId,
+	> InspectEnumerable<AccountId> for ItemOf<F, A, AccountId>
+{
 	fn instances() -> Box<dyn Iterator<Item = Self::InstanceId>> {
 		<F as nonfungibles::InspectEnumerable<AccountId>>::instances(&A::get())
 	}
@@ -155,10 +158,11 @@ impl<
 }
 
 impl<
-	F: nonfungibles::Mutate<AccountId>,
-	A: Get<<F as nonfungibles::Inspect<AccountId>>::ClassId>,
-	AccountId,
-> Mutate<AccountId> for ItemOf<F, A, AccountId> {
+		F: nonfungibles::Mutate<AccountId>,
+		A: Get<<F as nonfungibles::Inspect<AccountId>>::ClassId>,
+		AccountId,
+	> Mutate<AccountId> for ItemOf<F, A, AccountId>
+{
 	fn mint_into(instance: &Self::InstanceId, who: &AccountId) -> DispatchResult {
 		<F as nonfungibles::Mutate<AccountId>>::mint_into(&A::get(), instance, who)
 	}
@@ -178,10 +182,11 @@ impl<
 }
 
 impl<
-	F: nonfungibles::Transfer<AccountId>,
-	A: Get<<F as nonfungibles::Inspect<AccountId>>::ClassId>,
-	AccountId,
-> Transfer<AccountId> for ItemOf<F, A, AccountId> {
+		F: nonfungibles::Transfer<AccountId>,
+		A: Get<<F as nonfungibles::Inspect<AccountId>>::ClassId>,
+		AccountId,
+	> Transfer<AccountId> for ItemOf<F, A, AccountId>
+{
 	fn transfer(instance: &Self::InstanceId, destination: &AccountId) -> DispatchResult {
 		<F as nonfungibles::Transfer<AccountId>>::transfer(&A::get(), instance, destination)
 	}
diff --git a/frame/support/src/traits/tokens/nonfungibles.rs b/frame/support/src/traits/tokens/nonfungibles.rs
index b50c5f4d9814..64bbf3a8edf7 100644
--- a/frame/support/src/traits/tokens/nonfungibles.rs
+++ b/frame/support/src/traits/tokens/nonfungibles.rs
@@ -27,10 +27,10 @@
 //! Implementations of these traits may be converted to implementations of corresponding
 //! `nonfungible` traits by using the `nonfungible::ItemOf` type adapter.
 
-use sp_std::prelude::*;
-use codec::{Encode, Decode};
-use sp_runtime::TokenError;
 use crate::dispatch::DispatchResult;
+use codec::{Decode, Encode};
+use sp_runtime::TokenError;
+use sp_std::prelude::*;
 
 /// Trait for providing an interface to many read-only NFT-like sets of asset instances.
 pub trait Inspect<AccountId> {
@@ -48,14 +48,18 @@ pub trait Inspect<AccountId> {
 	/// Returns the owner of the asset `class`, if there is one. For many NFTs this may not make
 	/// any sense, so users of this API should not be surprised to find an asset class results in
 	/// `None` here.
-	fn class_owner(_class: &Self::ClassId) -> Option<AccountId> { None }
+	fn class_owner(_class: &Self::ClassId) -> Option<AccountId> {
+		None
+	}
 
 	/// Returns the attribute value of `instance` of `class` corresponding to `key`.
 	///
 	/// By default this is `None`; no attributes are defined.
-	fn attribute(_class: &Self::ClassId, _instance: &Self::InstanceId, _key: &[u8])
-		-> Option<Vec<u8>>
-	{
+	fn attribute(
+		_class: &Self::ClassId,
+		_instance: &Self::InstanceId,
+		_key: &[u8],
+	) -> Option<Vec<u8>> {
 		None
 	}
 
@@ -74,15 +78,14 @@ pub trait Inspect<AccountId> {
 	/// Returns the attribute value of `class` corresponding to `key`.
 	///
 	/// By default this is `None`; no attributes are defined.
-	fn class_attribute(_class: &Self::ClassId, _key: &[u8]) -> Option<Vec<u8>> { None }
+	fn class_attribute(_class: &Self::ClassId, _key: &[u8]) -> Option<Vec<u8>> {
+		None
+	}
 
 	/// Returns the strongly-typed attribute value of `class` corresponding to `key`.
 	///
 	/// By default this just attempts to use `class_attribute`.
-	fn typed_class_attribute<K: Encode, V: Decode>(
-		class: &Self::ClassId,
-		key: &K,
-	) -> Option<V> {
+	fn typed_class_attribute<K: Encode, V: Decode>(class: &Self::ClassId, key: &K) -> Option<V> {
 		key.using_encoded(|d| Self::class_attribute(class, d))
 			.and_then(|v| V::decode(&mut &v[..]).ok())
 	}
@@ -90,7 +93,9 @@ pub trait Inspect<AccountId> {
 	/// Returns `true` if the asset `instance` of `class` may be transferred.
 	///
 	/// Default implementation is that all assets are transferable.
-	fn can_transfer(_class: &Self::ClassId, _instance: &Self::InstanceId) -> bool { true }
+	fn can_transfer(_class: &Self::ClassId, _instance: &Self::InstanceId) -> bool {
+		true
+	}
 }
 
 /// Interface for enumerating assets in existence or owned by a given account over many collections
@@ -106,7 +111,10 @@ pub trait InspectEnumerable<AccountId>: Inspect<AccountId> {
 	fn owned(who: &AccountId) -> Box<dyn Iterator<Item = (Self::ClassId, Self::InstanceId)>>;
 
 	/// Returns an iterator of the asset instances of `class` owned by `who`.
-	fn owned_in_class(class: &Self::ClassId, who: &AccountId) -> Box<dyn Iterator<Item = Self::InstanceId>>;
+	fn owned_in_class(
+		class: &Self::ClassId,
+		who: &AccountId,
+	) -> Box<dyn Iterator<Item = Self::InstanceId>>;
 }
 
 /// Trait for providing an interface for multiple classes of NFT-like assets which may be minted,
@@ -151,19 +159,13 @@ pub trait Mutate<AccountId>: Inspect<AccountId> {
 		key: &K,
 		value: &V,
 	) -> DispatchResult {
-		key.using_encoded(|k| value.using_encoded(|v|
-			Self::set_attribute(class, instance, k, v)
-		))
+		key.using_encoded(|k| value.using_encoded(|v| Self::set_attribute(class, instance, k, v)))
 	}
 
 	/// Set attribute `value` of asset `class`'s `key`.
 	///
 	/// By default, this is not a supported operation.
-	fn set_class_attribute(
-		_class: &Self::ClassId,
-		_key: &[u8],
-		_value: &[u8],
-	) -> DispatchResult {
+	fn set_class_attribute(_class: &Self::ClassId, _key: &[u8], _value: &[u8]) -> DispatchResult {
 		Err(TokenError::Unsupported.into())
 	}
 
@@ -175,9 +177,7 @@ pub trait Mutate<AccountId>: Inspect<AccountId> {
 		key: &K,
 		value: &V,
 	) -> DispatchResult {
-		key.using_encoded(|k| value.using_encoded(|v|
-			Self::set_class_attribute(class, k, v)
-		))
+		key.using_encoded(|k| value.using_encoded(|v| Self::set_class_attribute(class, k, v)))
 	}
 }
 
diff --git a/frame/support/src/traits/validation.rs b/frame/support/src/traits/validation.rs
index d0583d6991fe..5a68f289df48 100644
--- a/frame/support/src/traits/validation.rs
+++ b/frame/support/src/traits/validation.rs
@@ -17,13 +17,14 @@
 
 //! Traits for dealing with validation and validators.
 
-use sp_std::prelude::*;
+use crate::{dispatch::Parameter, weights::Weight};
 use codec::{Codec, Decode};
-use sp_runtime::traits::{Convert, Zero};
-use sp_runtime::{BoundToRuntimeAppPublic, ConsensusEngineId, Permill, RuntimeAppPublic};
+use sp_runtime::{
+	traits::{Convert, Zero},
+	BoundToRuntimeAppPublic, ConsensusEngineId, Permill, RuntimeAppPublic,
+};
 use sp_staking::SessionIndex;
-use crate::dispatch::Parameter;
-use crate::weights::Weight;
+use sp_std::prelude::*;
 
 /// A trait for online node inspection in a session.
 ///
@@ -54,12 +55,14 @@ pub trait ValidatorSetWithIdentification<AccountId>: ValidatorSet<AccountId> {
 pub trait FindAuthor<Author> {
 	/// Find the author of a block based on the pre-runtime digests.
 	fn find_author<'a, I>(digests: I) -> Option<Author>
-		where I: 'a + IntoIterator<Item=(ConsensusEngineId, &'a [u8])>;
+	where
+		I: 'a + IntoIterator<Item = (ConsensusEngineId, &'a [u8])>;
 }
 
 impl<A> FindAuthor<A> for () {
 	fn find_author<'a, I>(_: I) -> Option<A>
-		where I: 'a + IntoIterator<Item=(ConsensusEngineId, &'a [u8])>
+	where
+		I: 'a + IntoIterator<Item = (ConsensusEngineId, &'a [u8])>,
 	{
 		None
 	}
@@ -81,7 +84,9 @@ pub trait OneSessionHandler<ValidatorId>: BoundToRuntimeAppPublic {
 	/// for the second session, therefore the first call to `on_new_session`
 	/// should provide the same validator set.
 	fn on_genesis_session<'a, I: 'a>(validators: I)
-		where I: Iterator<Item=(&'a ValidatorId, Self::Key)>, ValidatorId: 'a;
+	where
+		I: Iterator<Item = (&'a ValidatorId, Self::Key)>,
+		ValidatorId: 'a;
 
 	/// Session set has changed; act appropriately. Note that this can be called
 	/// before initialization of your module.
@@ -92,11 +97,10 @@ pub trait OneSessionHandler<ValidatorId>: BoundToRuntimeAppPublic {
 	///
 	/// The `validators` are the validators of the incoming session, and `queued_validators`
 	/// will follow.
-	fn on_new_session<'a, I: 'a>(
-		changed: bool,
-		validators: I,
-		queued_validators: I,
-	) where I: Iterator<Item=(&'a ValidatorId, Self::Key)>, ValidatorId: 'a;
+	fn on_new_session<'a, I: 'a>(changed: bool, validators: I, queued_validators: I)
+	where
+		I: Iterator<Item = (&'a ValidatorId, Self::Key)>,
+		ValidatorId: 'a;
 
 	/// A notification for end of the session.
 	///
diff --git a/frame/support/src/traits/voting.rs b/frame/support/src/traits/voting.rs
index f5afbac12955..62c6217ad59b 100644
--- a/frame/support/src/traits/voting.rs
+++ b/frame/support/src/traits/voting.rs
@@ -18,7 +18,7 @@
 //! Traits and associated data structures concerned with voting, and moving between tokens and
 //! votes.
 
-use sp_arithmetic::traits::{UniqueSaturatedInto, UniqueSaturatedFrom, SaturatedConversion};
+use sp_arithmetic::traits::{SaturatedConversion, UniqueSaturatedFrom, UniqueSaturatedInto};
 
 /// A trait similar to `Convert` to convert values from `B` an abstract balance type
 /// into u64 and back from u128. (This conversion is used in election and other places where complex
@@ -69,7 +69,6 @@ impl CurrencyToVote<u128> for U128CurrencyToVote {
 	}
 }
 
-
 /// A naive implementation of `CurrencyConvert` that simply saturates all conversions.
 ///
 /// # Warning
@@ -77,7 +76,9 @@ impl CurrencyToVote<u128> for U128CurrencyToVote {
 /// This is designed to be used mostly for testing. Use with care, and think about the consequences.
 pub struct SaturatingCurrencyToVote;
 
-impl<B: UniqueSaturatedInto<u64> + UniqueSaturatedFrom<u128>> CurrencyToVote<B> for SaturatingCurrencyToVote {
+impl<B: UniqueSaturatedInto<u64> + UniqueSaturatedFrom<u128>> CurrencyToVote<B>
+	for SaturatingCurrencyToVote
+{
 	fn to_vote(value: B, _: B) -> u64 {
 		value.unique_saturated_into()
 	}
diff --git a/frame/support/src/weights.rs b/frame/support/src/weights.rs
index 2b7cff8c6168..c0431534ed93 100644
--- a/frame/support/src/weights.rs
+++ b/frame/support/src/weights.rs
@@ -127,15 +127,20 @@
 //! - Ubuntu 19.10 (GNU/Linux 5.3.0-18-generic x86_64)
 //! - rustc 1.42.0 (b8cedc004 2020-03-09)
 
+use crate::dispatch::{DispatchError, DispatchErrorWithPostInfo, DispatchResultWithPostInfo};
+use codec::{Decode, Encode};
 #[cfg(feature = "std")]
-use serde::{Serialize, Deserialize};
-use codec::{Encode, Decode};
-use sp_runtime::{RuntimeDebug, traits::SignedExtension};
-use sp_runtime::generic::{CheckedExtrinsic, UncheckedExtrinsic};
-use crate::dispatch::{DispatchErrorWithPostInfo, DispatchResultWithPostInfo, DispatchError};
-use sp_runtime::traits::SaturatedConversion;
-use sp_arithmetic::{Perbill, traits::{BaseArithmetic, Saturating, Unsigned}};
+use serde::{Deserialize, Serialize};
 use smallvec::{smallvec, SmallVec};
+use sp_arithmetic::{
+	traits::{BaseArithmetic, Saturating, Unsigned},
+	Perbill,
+};
+use sp_runtime::{
+	generic::{CheckedExtrinsic, UncheckedExtrinsic},
+	traits::{SaturatedConversion, SignedExtension},
+	RuntimeDebug,
+};
 
 /// Re-export priority as type
 pub use sp_runtime::transaction_validity::TransactionPriority;
@@ -152,7 +157,7 @@ pub mod constants {
 	pub const WEIGHT_PER_SECOND: Weight = 1_000_000_000_000;
 	pub const WEIGHT_PER_MILLIS: Weight = WEIGHT_PER_SECOND / 1000; // 1_000_000_000
 	pub const WEIGHT_PER_MICROS: Weight = WEIGHT_PER_MILLIS / 1000; // 1_000_000
-	pub const WEIGHT_PER_NANOS:  Weight = WEIGHT_PER_MICROS / 1000; // 1_000
+	pub const WEIGHT_PER_NANOS: Weight = WEIGHT_PER_MICROS / 1000; // 1_000
 
 	parameter_types! {
 		/// Importing a block with 0 txs takes ~5 ms
@@ -267,13 +272,17 @@ pub trait OneOrMany<T> {
 }
 
 impl OneOrMany<DispatchClass> for DispatchClass {
-    type Iter = sp_std::iter::Once<DispatchClass>;
-    fn into_iter(self) -> Self::Iter { sp_std::iter::once(self) }
+	type Iter = sp_std::iter::Once<DispatchClass>;
+	fn into_iter(self) -> Self::Iter {
+		sp_std::iter::once(self)
+	}
 }
 
 impl<'a> OneOrMany<DispatchClass> for &'a [DispatchClass] {
-    type Iter = sp_std::iter::Cloned<sp_std::slice::Iter<'a, DispatchClass>>;
-    fn into_iter(self) -> Self::Iter { self.iter().cloned() }
+	type Iter = sp_std::iter::Cloned<sp_std::slice::Iter<'a, DispatchClass>>;
+	fn into_iter(self) -> Self::Iter {
+		self.iter().cloned()
+	}
 }
 
 /// Primitives related to priority management of Frame.
@@ -365,43 +374,32 @@ pub fn extract_actual_weight(result: &DispatchResultWithPostInfo, info: &Dispatc
 	match result {
 		Ok(post_info) => &post_info,
 		Err(err) => &err.post_info,
-	}.calc_actual_weight(info)
+	}
+	.calc_actual_weight(info)
 }
 
 impl From<(Option<Weight>, Pays)> for PostDispatchInfo {
 	fn from(post_weight_info: (Option<Weight>, Pays)) -> Self {
 		let (actual_weight, pays_fee) = post_weight_info;
-		Self {
-			actual_weight,
-			pays_fee,
-		}
+		Self { actual_weight, pays_fee }
 	}
 }
 
 impl From<Pays> for PostDispatchInfo {
 	fn from(pays_fee: Pays) -> Self {
-		Self {
-			actual_weight: None,
-			pays_fee,
-		}
+		Self { actual_weight: None, pays_fee }
 	}
 }
 
 impl From<Option<Weight>> for PostDispatchInfo {
 	fn from(actual_weight: Option<Weight>) -> Self {
-		Self {
-			actual_weight,
-			pays_fee: Default::default(),
-		}
+		Self { actual_weight, pays_fee: Default::default() }
 	}
 }
 
 impl From<()> for PostDispatchInfo {
 	fn from(_: ()) -> Self {
-		Self {
-			actual_weight: None,
-			pays_fee: Default::default(),
-		}
+		Self { actual_weight: None, pays_fee: Default::default() }
 	}
 }
 
@@ -434,8 +432,9 @@ pub trait WithPostDispatchInfo {
 	fn with_weight(self, actual_weight: Weight) -> DispatchErrorWithPostInfo;
 }
 
-impl<T> WithPostDispatchInfo for T where
-	T: Into<DispatchError>
+impl<T> WithPostDispatchInfo for T
+where
+	T: Into<DispatchError>,
 {
 	fn with_weight(self, actual_weight: Weight) -> DispatchErrorWithPostInfo {
 		DispatchErrorWithPostInfo {
@@ -542,8 +541,9 @@ impl<Args, CD, PF> WeighData<Args> for FunctionOf<Weight, CD, PF> {
 
 // `WeighData` as a closure
 #[allow(deprecated)]
-impl<Args, WD, CD, PF> WeighData<Args> for FunctionOf<WD, CD, PF> where
-	WD : Fn(Args) -> Weight
+impl<Args, WD, CD, PF> WeighData<Args> for FunctionOf<WD, CD, PF>
+where
+	WD: Fn(Args) -> Weight,
 {
 	fn weigh_data(&self, args: Args) -> Weight {
 		(self.0)(args)
@@ -560,8 +560,9 @@ impl<Args, WD, PF> ClassifyDispatch<Args> for FunctionOf<WD, DispatchClass, PF>
 
 // `ClassifyDispatch` as a raw value
 #[allow(deprecated)]
-impl<Args, WD, CD, PF> ClassifyDispatch<Args> for FunctionOf<WD, CD, PF> where
-	CD : Fn(Args) -> DispatchClass
+impl<Args, WD, CD, PF> ClassifyDispatch<Args> for FunctionOf<WD, CD, PF>
+where
+	CD: Fn(Args) -> DispatchClass,
 {
 	fn classify_dispatch(&self, args: Args) -> DispatchClass {
 		(self.1)(args)
@@ -578,8 +579,9 @@ impl<Args, WD, CD> PaysFee<Args> for FunctionOf<WD, CD, Pays> {
 
 // `PaysFee` as a closure
 #[allow(deprecated)]
-impl<Args, WD, CD, PF> PaysFee<Args> for FunctionOf<WD, CD, PF> where
-	PF : Fn(Args) -> Pays
+impl<Args, WD, CD, PF> PaysFee<Args> for FunctionOf<WD, CD, PF>
+where
+	PF: Fn(Args) -> Pays,
 {
 	fn pays_fee(&self, args: Args) -> Pays {
 		(self.2)(args)
@@ -599,8 +601,7 @@ where
 }
 
 /// Implementation for checked extrinsic.
-impl<AccountId, Call, Extra> GetDispatchInfo
-	for CheckedExtrinsic<AccountId, Call, Extra>
+impl<AccountId, Call, Extra> GetDispatchInfo for CheckedExtrinsic<AccountId, Call, Extra>
 where
 	Call: GetDispatchInfo,
 {
@@ -614,11 +615,7 @@ where
 impl<Call: Encode, Extra: Encode> GetDispatchInfo for sp_runtime::testing::TestXt<Call, Extra> {
 	fn get_dispatch_info(&self) -> DispatchInfo {
 		// for testing: weight == size.
-		DispatchInfo {
-			weight: self.encode().len() as _,
-			pays_fee: Pays::Yes,
-			..Default::default()
-		}
+		DispatchInfo { weight: self.encode().len() as _, pays_fee: Pays::Yes, ..Default::default() }
 	}
 }
 
@@ -690,32 +687,35 @@ pub trait WeightToFeePolynomial {
 	/// This should not be overriden in most circumstances. Calculation is done in the
 	/// `Balance` type and never overflows. All evaluation is saturating.
 	fn calc(weight: &Weight) -> Self::Balance {
-		Self::polynomial().iter().fold(Self::Balance::saturated_from(0u32), |mut acc, args| {
-			let w = Self::Balance::saturated_from(*weight).saturating_pow(args.degree.into());
-
-			// The sum could get negative. Therefore we only sum with the accumulator.
-			// The Perbill Mul implementation is non overflowing.
-			let frac = args.coeff_frac * w;
-			let integer = args.coeff_integer.saturating_mul(w);
-
-			if args.negative {
-				acc = acc.saturating_sub(frac);
-				acc = acc.saturating_sub(integer);
-			} else {
-				acc = acc.saturating_add(frac);
-				acc = acc.saturating_add(integer);
-			}
+		Self::polynomial()
+			.iter()
+			.fold(Self::Balance::saturated_from(0u32), |mut acc, args| {
+				let w = Self::Balance::saturated_from(*weight).saturating_pow(args.degree.into());
 
-			acc
-		})
+				// The sum could get negative. Therefore we only sum with the accumulator.
+				// The Perbill Mul implementation is non overflowing.
+				let frac = args.coeff_frac * w;
+				let integer = args.coeff_integer.saturating_mul(w);
+
+				if args.negative {
+					acc = acc.saturating_sub(frac);
+					acc = acc.saturating_sub(integer);
+				} else {
+					acc = acc.saturating_add(frac);
+					acc = acc.saturating_add(integer);
+				}
+
+				acc
+			})
 	}
 }
 
 /// Implementor of `WeightToFeePolynomial` that maps one unit of weight to one unit of fee.
 pub struct IdentityFee<T>(sp_std::marker::PhantomData<T>);
 
-impl<T> WeightToFeePolynomial for IdentityFee<T> where
-	T: BaseArithmetic + From<u32> + Copy + Unsigned
+impl<T> WeightToFeePolynomial for IdentityFee<T>
+where
+	T: BaseArithmetic + From<u32> + Copy + Unsigned,
 {
 	type Balance = T;
 
@@ -813,8 +813,8 @@ impl PerDispatchClass<Weight> {
 #[cfg(test)]
 #[allow(dead_code)]
 mod tests {
-	use crate::{decl_module, parameter_types, traits::Get};
 	use super::*;
+	use crate::{decl_module, parameter_types, traits::Get};
 
 	pub trait Config: 'static {
 		type Origin;
@@ -925,24 +925,15 @@ mod tests {
 
 	#[test]
 	fn extract_actual_weight_works() {
-		let pre = DispatchInfo {
-			weight: 1000,
-			.. Default::default()
-		};
+		let pre = DispatchInfo { weight: 1000, ..Default::default() };
 		assert_eq!(extract_actual_weight(&Ok(Some(7).into()), &pre), 7);
 		assert_eq!(extract_actual_weight(&Ok(Some(1000).into()), &pre), 1000);
-		assert_eq!(
-			extract_actual_weight(&Err(DispatchError::BadOrigin.with_weight(9)), &pre),
-			9
-		);
+		assert_eq!(extract_actual_weight(&Err(DispatchError::BadOrigin.with_weight(9)), &pre), 9);
 	}
 
 	#[test]
 	fn extract_actual_weight_caps_at_pre_weight() {
-		let pre = DispatchInfo {
-			weight: 1000,
-			.. Default::default()
-		};
+		let pre = DispatchInfo { weight: 1000, ..Default::default() };
 		assert_eq!(extract_actual_weight(&Ok(Some(1250).into()), &pre), 1000);
 		assert_eq!(
 			extract_actual_weight(&Err(DispatchError::BadOrigin.with_weight(1300)), &pre),
diff --git a/frame/support/test/src/pallet_version.rs b/frame/support/test/src/pallet_version.rs
index aaa46c3ef2c6..882c0b78b733 100644
--- a/frame/support/test/src/pallet_version.rs
+++ b/frame/support/test/src/pallet_version.rs
@@ -25,8 +25,5 @@ fn ensure_that_current_pallet_version_is_correct() {
 		patch: env!("CARGO_PKG_VERSION_PATCH").parse().unwrap(),
 	};
 
-	assert_eq!(
-		expected,
-		crate_to_pallet_version!(),
-	)
+	assert_eq!(expected, crate_to_pallet_version!(),)
 }
diff --git a/frame/support/test/tests/construct_runtime.rs b/frame/support/test/tests/construct_runtime.rs
index dde7f6d53f8e..98669cb1add0 100644
--- a/frame/support/test/tests/construct_runtime.rs
+++ b/frame/support/test/tests/construct_runtime.rs
@@ -19,12 +19,16 @@
 //! * error declareed with decl_error works
 //! * integrity test is generated
 
-#![recursion_limit="128"]
+#![recursion_limit = "128"]
 
-use sp_runtime::{generic, traits::{BlakeTwo256, Verify}, DispatchError};
-use sp_core::{H256, sr25519};
-use sp_std::cell::RefCell;
 use frame_support::traits::PalletInfo as _;
+use sp_core::{sr25519, H256};
+use sp_runtime::{
+	generic,
+	traits::{BlakeTwo256, Verify},
+	DispatchError,
+};
+use sp_std::cell::RefCell;
 
 mod system;
 
@@ -51,7 +55,7 @@ mod module1 {
 	}
 
 	#[derive(Clone, PartialEq, Eq, Debug, codec::Encode, codec::Decode)]
-	pub struct Origin<T, I: Instance = DefaultInstance>(pub core::marker::PhantomData::<(T, I)>);
+	pub struct Origin<T, I: Instance = DefaultInstance>(pub core::marker::PhantomData<(T, I)>);
 
 	frame_support::decl_event! {
 		pub enum Event<T, I: Instance = DefaultInstance> where
@@ -263,8 +267,8 @@ pub type Block = generic::Block<Header, UncheckedExtrinsic>;
 pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, Call, Signature, ()>;
 
 mod origin_test {
-	use frame_support::traits::{Filter, OriginTrait};
 	use super::{module3, nested, system, Block, UncheckedExtrinsic};
+	use frame_support::traits::{Filter, OriginTrait};
 
 	impl nested::module3::Config for RuntimeOriginTest {}
 	impl module3::Config for RuntimeOriginTest {}
@@ -556,10 +560,22 @@ fn get_call_names() {
 fn get_module_names() {
 	use frame_support::dispatch::GetCallMetadata;
 	let module_names = Call::get_module_names();
-	assert_eq!([
-		"System", "Module1_1", "Module2", "Module1_2", "NestedModule3", "Module3",
-		"Module1_4", "Module1_6", "Module1_7", "Module1_8", "Module1_9",
-	], module_names);
+	assert_eq!(
+		[
+			"System",
+			"Module1_1",
+			"Module2",
+			"Module1_2",
+			"NestedModule3",
+			"Module3",
+			"Module1_4",
+			"Module1_6",
+			"Module1_7",
+			"Module1_8",
+			"Module1_9",
+		],
+		module_names
+	);
 }
 
 #[test]
@@ -583,28 +599,32 @@ fn test_metadata() {
 			ModuleMetadata {
 				name: DecodeDifferent::Encode("System"),
 				storage: None,
-				calls: Some(DecodeDifferent::Encode(FnEncode(|| &[FunctionMetadata {
-					name: DecodeDifferent::Encode("noop"),
-					arguments: DecodeDifferent::Encode(&[]),
-					documentation: DecodeDifferent::Encode(&[]),
-				}]))),
-				event: Some(DecodeDifferent::Encode(FnEncode(|| &[
-					EventMetadata {
-						name: DecodeDifferent::Encode("ExtrinsicSuccess"),
-						arguments: DecodeDifferent::Encode(&[]),
-						documentation: DecodeDifferent::Encode(&[]),
-					},
-					EventMetadata {
-						name: DecodeDifferent::Encode("ExtrinsicFailed"),
+				calls: Some(DecodeDifferent::Encode(FnEncode(|| {
+					&[FunctionMetadata {
+						name: DecodeDifferent::Encode("noop"),
 						arguments: DecodeDifferent::Encode(&[]),
 						documentation: DecodeDifferent::Encode(&[]),
-					},
-					EventMetadata {
-						name: DecodeDifferent::Encode("Ignore"),
-						arguments: DecodeDifferent::Encode(&["BlockNumber"]),
-						documentation: DecodeDifferent::Encode(&[]),
-					},
-				]))),
+					}]
+				}))),
+				event: Some(DecodeDifferent::Encode(FnEncode(|| {
+					&[
+						EventMetadata {
+							name: DecodeDifferent::Encode("ExtrinsicSuccess"),
+							arguments: DecodeDifferent::Encode(&[]),
+							documentation: DecodeDifferent::Encode(&[]),
+						},
+						EventMetadata {
+							name: DecodeDifferent::Encode("ExtrinsicFailed"),
+							arguments: DecodeDifferent::Encode(&[]),
+							documentation: DecodeDifferent::Encode(&[]),
+						},
+						EventMetadata {
+							name: DecodeDifferent::Encode("Ignore"),
+							arguments: DecodeDifferent::Encode(&["BlockNumber"]),
+							documentation: DecodeDifferent::Encode(&[]),
+						},
+					]
+				}))),
 				constants: DecodeDifferent::Encode(FnEncode(|| &[])),
 				errors: DecodeDifferent::Encode(FnEncode(|| &[])),
 				index: 30,
@@ -615,18 +635,20 @@ fn test_metadata() {
 					prefix: DecodeDifferent::Encode("Instance1Module"),
 					entries: DecodeDifferent::Encode(&[]),
 				}))),
-				calls: Some(DecodeDifferent::Encode(FnEncode(|| &[
-					FunctionMetadata {
+				calls: Some(DecodeDifferent::Encode(FnEncode(|| {
+					&[FunctionMetadata {
 						name: DecodeDifferent::Encode("fail"),
 						arguments: DecodeDifferent::Encode(&[]),
 						documentation: DecodeDifferent::Encode(&[]),
-					},
-				]))),
-				event: Some(DecodeDifferent::Encode(FnEncode(|| &[EventMetadata {
-					name: DecodeDifferent::Encode("A"),
-					arguments: DecodeDifferent::Encode(&["AccountId"]),
-					documentation: DecodeDifferent::Encode(&[]),
-				}]))),
+					}]
+				}))),
+				event: Some(DecodeDifferent::Encode(FnEncode(|| {
+					&[EventMetadata {
+						name: DecodeDifferent::Encode("A"),
+						arguments: DecodeDifferent::Encode(&["AccountId"]),
+						documentation: DecodeDifferent::Encode(&[]),
+					}]
+				}))),
 				constants: DecodeDifferent::Encode(FnEncode(|| &[])),
 				errors: DecodeDifferent::Encode(FnEncode(|| &[])),
 				index: 31,
@@ -637,20 +659,20 @@ fn test_metadata() {
 					prefix: DecodeDifferent::Encode("Module"),
 					entries: DecodeDifferent::Encode(&[]),
 				}))),
-				calls: Some(DecodeDifferent::Encode(FnEncode(|| &[
-					FunctionMetadata {
+				calls: Some(DecodeDifferent::Encode(FnEncode(|| {
+					&[FunctionMetadata {
 						name: DecodeDifferent::Encode("fail"),
 						arguments: DecodeDifferent::Encode(&[]),
 						documentation: DecodeDifferent::Encode(&[]),
-					},
-				]))),
-				event: Some(DecodeDifferent::Encode(FnEncode(|| &[
-					EventMetadata {
+					}]
+				}))),
+				event: Some(DecodeDifferent::Encode(FnEncode(|| {
+					&[EventMetadata {
 						name: DecodeDifferent::Encode("A"),
 						arguments: DecodeDifferent::Encode(&[]),
 						documentation: DecodeDifferent::Encode(&[]),
-					},
-				]))),
+					}]
+				}))),
 				constants: DecodeDifferent::Encode(FnEncode(|| &[])),
 				errors: DecodeDifferent::Encode(FnEncode(|| &[])),
 				index: 32,
@@ -661,16 +683,20 @@ fn test_metadata() {
 					prefix: DecodeDifferent::Encode("Instance2Module"),
 					entries: DecodeDifferent::Encode(&[]),
 				}))),
-				calls: Some(DecodeDifferent::Encode(FnEncode(|| &[FunctionMetadata {
-					name: DecodeDifferent::Encode("fail"),
-					arguments: DecodeDifferent::Encode(&[]),
-					documentation: DecodeDifferent::Encode(&[]),
-				}]))),
-				event: Some(DecodeDifferent::Encode(FnEncode(|| &[EventMetadata {
-					name: DecodeDifferent::Encode("A"),
-					arguments: DecodeDifferent::Encode(&["AccountId"]),
-					documentation: DecodeDifferent::Encode(&[]),
-				}]))),
+				calls: Some(DecodeDifferent::Encode(FnEncode(|| {
+					&[FunctionMetadata {
+						name: DecodeDifferent::Encode("fail"),
+						arguments: DecodeDifferent::Encode(&[]),
+						documentation: DecodeDifferent::Encode(&[]),
+					}]
+				}))),
+				event: Some(DecodeDifferent::Encode(FnEncode(|| {
+					&[EventMetadata {
+						name: DecodeDifferent::Encode("A"),
+						arguments: DecodeDifferent::Encode(&["AccountId"]),
+						documentation: DecodeDifferent::Encode(&[]),
+					}]
+				}))),
 				constants: DecodeDifferent::Encode(FnEncode(|| &[])),
 				errors: DecodeDifferent::Encode(FnEncode(|| &[])),
 				index: 33,
@@ -681,20 +707,20 @@ fn test_metadata() {
 					prefix: DecodeDifferent::Encode("Module"),
 					entries: DecodeDifferent::Encode(&[]),
 				}))),
-				calls: Some(DecodeDifferent::Encode(FnEncode(|| &[
-					FunctionMetadata {
+				calls: Some(DecodeDifferent::Encode(FnEncode(|| {
+					&[FunctionMetadata {
 						name: DecodeDifferent::Encode("fail"),
 						arguments: DecodeDifferent::Encode(&[]),
 						documentation: DecodeDifferent::Encode(&[]),
-					},
-				]))),
-				event: Some(DecodeDifferent::Encode(FnEncode(|| &[
-					EventMetadata {
+					}]
+				}))),
+				event: Some(DecodeDifferent::Encode(FnEncode(|| {
+					&[EventMetadata {
 						name: DecodeDifferent::Encode("A"),
 						arguments: DecodeDifferent::Encode(&[]),
 						documentation: DecodeDifferent::Encode(&[]),
-					},
-				]))),
+					}]
+				}))),
 				constants: DecodeDifferent::Encode(FnEncode(|| &[])),
 				errors: DecodeDifferent::Encode(FnEncode(|| &[])),
 				index: 34,
@@ -705,68 +731,68 @@ fn test_metadata() {
 					prefix: DecodeDifferent::Encode("Module"),
 					entries: DecodeDifferent::Encode(&[]),
 				}))),
-				calls: Some(DecodeDifferent::Encode(FnEncode(|| &[
-					FunctionMetadata {
-						name: DecodeDifferent::Encode("fail"),
-						arguments: DecodeDifferent::Encode(&[]),
-						documentation: DecodeDifferent::Encode(&[]),
-					},
-					FunctionMetadata {
-						name: DecodeDifferent::Encode("aux_1"),
-						arguments: DecodeDifferent::Encode(&[
-							FunctionArgumentMetadata {
+				calls: Some(DecodeDifferent::Encode(FnEncode(|| {
+					&[
+						FunctionMetadata {
+							name: DecodeDifferent::Encode("fail"),
+							arguments: DecodeDifferent::Encode(&[]),
+							documentation: DecodeDifferent::Encode(&[]),
+						},
+						FunctionMetadata {
+							name: DecodeDifferent::Encode("aux_1"),
+							arguments: DecodeDifferent::Encode(&[FunctionArgumentMetadata {
 								name: DecodeDifferent::Encode("_data"),
 								ty: DecodeDifferent::Encode("Compact<u32>"),
-							},
-						]),
-						documentation: DecodeDifferent::Encode(&[]),
-					},
-					FunctionMetadata {
-						name: DecodeDifferent::Encode("aux_2"),
-						arguments: DecodeDifferent::Encode(&[
-							FunctionArgumentMetadata {
-								name: DecodeDifferent::Encode("_data"),
-								ty: DecodeDifferent::Encode("i32"),
-							},
-							FunctionArgumentMetadata {
-								name: DecodeDifferent::Encode("_data2"),
-								ty: DecodeDifferent::Encode("Compact<u32>"),
-							},
-						]),
-						documentation: DecodeDifferent::Encode(&[]),
-					},
-					FunctionMetadata {
-						name: DecodeDifferent::Encode("aux_3"),
-						arguments: DecodeDifferent::Encode(&[
-							FunctionArgumentMetadata {
-								name: DecodeDifferent::Encode("_data"),
-								ty: DecodeDifferent::Encode("i32"),
-							},
-							FunctionArgumentMetadata {
-								name: DecodeDifferent::Encode("_data2"),
-								ty: DecodeDifferent::Encode("String"),
-							},
-						]),
-						documentation: DecodeDifferent::Encode(&[]),
-					},
-					FunctionMetadata {
-						name: DecodeDifferent::Encode("aux_4"),
-						arguments: DecodeDifferent::Encode(&[]),
-						documentation: DecodeDifferent::Encode(&[]),
-					},
-					FunctionMetadata {
-						name: DecodeDifferent::Encode("operational"),
-						arguments: DecodeDifferent::Encode(&[]),
-						documentation: DecodeDifferent::Encode(&[]),
-					},
-				]))),
-				event: Some(DecodeDifferent::Encode(FnEncode(|| &[
-					EventMetadata {
+							}]),
+							documentation: DecodeDifferent::Encode(&[]),
+						},
+						FunctionMetadata {
+							name: DecodeDifferent::Encode("aux_2"),
+							arguments: DecodeDifferent::Encode(&[
+								FunctionArgumentMetadata {
+									name: DecodeDifferent::Encode("_data"),
+									ty: DecodeDifferent::Encode("i32"),
+								},
+								FunctionArgumentMetadata {
+									name: DecodeDifferent::Encode("_data2"),
+									ty: DecodeDifferent::Encode("Compact<u32>"),
+								},
+							]),
+							documentation: DecodeDifferent::Encode(&[]),
+						},
+						FunctionMetadata {
+							name: DecodeDifferent::Encode("aux_3"),
+							arguments: DecodeDifferent::Encode(&[
+								FunctionArgumentMetadata {
+									name: DecodeDifferent::Encode("_data"),
+									ty: DecodeDifferent::Encode("i32"),
+								},
+								FunctionArgumentMetadata {
+									name: DecodeDifferent::Encode("_data2"),
+									ty: DecodeDifferent::Encode("String"),
+								},
+							]),
+							documentation: DecodeDifferent::Encode(&[]),
+						},
+						FunctionMetadata {
+							name: DecodeDifferent::Encode("aux_4"),
+							arguments: DecodeDifferent::Encode(&[]),
+							documentation: DecodeDifferent::Encode(&[]),
+						},
+						FunctionMetadata {
+							name: DecodeDifferent::Encode("operational"),
+							arguments: DecodeDifferent::Encode(&[]),
+							documentation: DecodeDifferent::Encode(&[]),
+						},
+					]
+				}))),
+				event: Some(DecodeDifferent::Encode(FnEncode(|| {
+					&[EventMetadata {
 						name: DecodeDifferent::Encode("A"),
 						arguments: DecodeDifferent::Encode(&[]),
 						documentation: DecodeDifferent::Encode(&[]),
-					},
-				]))),
+					}]
+				}))),
 				constants: DecodeDifferent::Encode(FnEncode(|| &[])),
 				errors: DecodeDifferent::Encode(FnEncode(|| &[])),
 				index: 35,
@@ -786,11 +812,13 @@ fn test_metadata() {
 			ModuleMetadata {
 				name: DecodeDifferent::Encode("Module1_4"),
 				storage: None,
-				calls: Some(DecodeDifferent::Encode(FnEncode(|| &[FunctionMetadata {
-					name: DecodeDifferent::Encode("fail"),
-					arguments: DecodeDifferent::Encode(&[]),
-					documentation: DecodeDifferent::Encode(&[]),
-				}]))),
+				calls: Some(DecodeDifferent::Encode(FnEncode(|| {
+					&[FunctionMetadata {
+						name: DecodeDifferent::Encode("fail"),
+						arguments: DecodeDifferent::Encode(&[]),
+						documentation: DecodeDifferent::Encode(&[]),
+					}]
+				}))),
 				event: None,
 				constants: DecodeDifferent::Encode(FnEncode(|| &[])),
 				errors: DecodeDifferent::Encode(FnEncode(|| &[])),
@@ -800,11 +828,13 @@ fn test_metadata() {
 				name: DecodeDifferent::Encode("Module1_5"),
 				storage: None,
 				calls: None,
-				event: Some(DecodeDifferent::Encode(FnEncode(|| &[EventMetadata {
-					name: DecodeDifferent::Encode("A"),
-					arguments: DecodeDifferent::Encode(&["AccountId"]),
-					documentation: DecodeDifferent::Encode(&[]),
-				}]))),
+				event: Some(DecodeDifferent::Encode(FnEncode(|| {
+					&[EventMetadata {
+						name: DecodeDifferent::Encode("A"),
+						arguments: DecodeDifferent::Encode(&["AccountId"]),
+						documentation: DecodeDifferent::Encode(&[]),
+					}]
+				}))),
 				constants: DecodeDifferent::Encode(FnEncode(|| &[])),
 				errors: DecodeDifferent::Encode(FnEncode(|| &[])),
 				index: 4,
@@ -815,16 +845,20 @@ fn test_metadata() {
 					prefix: DecodeDifferent::Encode("Instance6Module"),
 					entries: DecodeDifferent::Encode(&[]),
 				}))),
-				calls: Some(DecodeDifferent::Encode(FnEncode(|| &[FunctionMetadata {
-					name: DecodeDifferent::Encode("fail"),
-					arguments: DecodeDifferent::Encode(&[]),
-					documentation: DecodeDifferent::Encode(&[]),
-				}]))),
-				event: Some(DecodeDifferent::Encode(FnEncode(|| &[EventMetadata {
-					name: DecodeDifferent::Encode("A"),
-					arguments: DecodeDifferent::Encode(&["AccountId"]),
-					documentation: DecodeDifferent::Encode(&[]),
-				}]))),
+				calls: Some(DecodeDifferent::Encode(FnEncode(|| {
+					&[FunctionMetadata {
+						name: DecodeDifferent::Encode("fail"),
+						arguments: DecodeDifferent::Encode(&[]),
+						documentation: DecodeDifferent::Encode(&[]),
+					}]
+				}))),
+				event: Some(DecodeDifferent::Encode(FnEncode(|| {
+					&[EventMetadata {
+						name: DecodeDifferent::Encode("A"),
+						arguments: DecodeDifferent::Encode(&["AccountId"]),
+						documentation: DecodeDifferent::Encode(&[]),
+					}]
+				}))),
 				constants: DecodeDifferent::Encode(FnEncode(|| &[])),
 				errors: DecodeDifferent::Encode(FnEncode(|| &[])),
 				index: 1,
@@ -835,16 +869,20 @@ fn test_metadata() {
 					prefix: DecodeDifferent::Encode("Instance7Module"),
 					entries: DecodeDifferent::Encode(&[]),
 				}))),
-				calls: Some(DecodeDifferent::Encode(FnEncode(|| &[FunctionMetadata {
-					name: DecodeDifferent::Encode("fail"),
-					arguments: DecodeDifferent::Encode(&[]),
-					documentation: DecodeDifferent::Encode(&[]),
-				}]))),
-				event: Some(DecodeDifferent::Encode(FnEncode(|| &[EventMetadata {
-					name: DecodeDifferent::Encode("A"),
-					arguments: DecodeDifferent::Encode(&["AccountId"]),
-					documentation: DecodeDifferent::Encode(&[]),
-				}]))),
+				calls: Some(DecodeDifferent::Encode(FnEncode(|| {
+					&[FunctionMetadata {
+						name: DecodeDifferent::Encode("fail"),
+						arguments: DecodeDifferent::Encode(&[]),
+						documentation: DecodeDifferent::Encode(&[]),
+					}]
+				}))),
+				event: Some(DecodeDifferent::Encode(FnEncode(|| {
+					&[EventMetadata {
+						name: DecodeDifferent::Encode("A"),
+						arguments: DecodeDifferent::Encode(&["AccountId"]),
+						documentation: DecodeDifferent::Encode(&[]),
+					}]
+				}))),
 				constants: DecodeDifferent::Encode(FnEncode(|| &[])),
 				errors: DecodeDifferent::Encode(FnEncode(|| &[])),
 				index: 2,
@@ -855,16 +893,20 @@ fn test_metadata() {
 					prefix: DecodeDifferent::Encode("Instance8Module"),
 					entries: DecodeDifferent::Encode(&[]),
 				}))),
-				calls: Some(DecodeDifferent::Encode(FnEncode(|| &[FunctionMetadata {
-					name: DecodeDifferent::Encode("fail"),
-					arguments: DecodeDifferent::Encode(&[]),
-					documentation: DecodeDifferent::Encode(&[]),
-				}]))),
-				event: Some(DecodeDifferent::Encode(FnEncode(|| &[EventMetadata {
-					name: DecodeDifferent::Encode("A"),
-					arguments: DecodeDifferent::Encode(&["AccountId"]),
-					documentation: DecodeDifferent::Encode(&[]),
-				}]))),
+				calls: Some(DecodeDifferent::Encode(FnEncode(|| {
+					&[FunctionMetadata {
+						name: DecodeDifferent::Encode("fail"),
+						arguments: DecodeDifferent::Encode(&[]),
+						documentation: DecodeDifferent::Encode(&[]),
+					}]
+				}))),
+				event: Some(DecodeDifferent::Encode(FnEncode(|| {
+					&[EventMetadata {
+						name: DecodeDifferent::Encode("A"),
+						arguments: DecodeDifferent::Encode(&["AccountId"]),
+						documentation: DecodeDifferent::Encode(&[]),
+					}]
+				}))),
 				constants: DecodeDifferent::Encode(FnEncode(|| &[])),
 				errors: DecodeDifferent::Encode(FnEncode(|| &[])),
 				index: 12,
@@ -875,16 +917,20 @@ fn test_metadata() {
 					prefix: DecodeDifferent::Encode("Instance9Module"),
 					entries: DecodeDifferent::Encode(&[]),
 				}))),
-				calls: Some(DecodeDifferent::Encode(FnEncode(|| &[FunctionMetadata {
-					name: DecodeDifferent::Encode("fail"),
-					arguments: DecodeDifferent::Encode(&[]),
-					documentation: DecodeDifferent::Encode(&[]),
-				}]))),
-				event: Some(DecodeDifferent::Encode(FnEncode(|| &[EventMetadata {
-					name: DecodeDifferent::Encode("A"),
-					arguments: DecodeDifferent::Encode(&["AccountId"]),
-					documentation: DecodeDifferent::Encode(&[]),
-				}]))),
+				calls: Some(DecodeDifferent::Encode(FnEncode(|| {
+					&[FunctionMetadata {
+						name: DecodeDifferent::Encode("fail"),
+						arguments: DecodeDifferent::Encode(&[]),
+						documentation: DecodeDifferent::Encode(&[]),
+					}]
+				}))),
+				event: Some(DecodeDifferent::Encode(FnEncode(|| {
+					&[EventMetadata {
+						name: DecodeDifferent::Encode("A"),
+						arguments: DecodeDifferent::Encode(&["AccountId"]),
+						documentation: DecodeDifferent::Encode(&[]),
+					}]
+				}))),
 				constants: DecodeDifferent::Encode(FnEncode(|| &[])),
 				errors: DecodeDifferent::Encode(FnEncode(|| &[])),
 				index: 13,
diff --git a/frame/support/test/tests/decl_storage.rs b/frame/support/test/tests/decl_storage.rs
index 85c3d8f6756a..666dda49935e 100644
--- a/frame/support/test/tests/decl_storage.rs
+++ b/frame/support/test/tests/decl_storage.rs
@@ -28,8 +28,7 @@ mod tests {
 	}
 
 	pub trait Config: frame_support_test::Config {
-		type Origin2: codec::Codec + codec::EncodeLike + Default
-			+ codec::MaxEncodedLen;
+		type Origin2: codec::Codec + codec::EncodeLike + Default + codec::MaxEncodedLen;
 	}
 
 	frame_support::decl_storage! {
@@ -104,329 +103,334 @@ mod tests {
 
 	const EXPECTED_METADATA: StorageMetadata = StorageMetadata {
 		prefix: DecodeDifferent::Encode("TestStorage"),
-		entries: DecodeDifferent::Encode(
-			&[
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("U32"),
-					modifier: StorageEntryModifier::Optional,
-					ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructU32(PhantomData::<TraitImpl>))
-					),
-					documentation: DecodeDifferent::Encode(&[ " Hello, this is doc!" ]),
-				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("PUBU32"),
-					modifier: StorageEntryModifier::Optional,
-					ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructPUBU32(PhantomData::<TraitImpl>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("U32MYDEF"),
-					modifier: StorageEntryModifier::Optional,
-					ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructU32MYDEF(PhantomData::<TraitImpl>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("PUBU32MYDEF"),
-					modifier: StorageEntryModifier::Optional,
-					ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructPUBU32MYDEF(PhantomData::<TraitImpl>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("GETU32"),
-					modifier: StorageEntryModifier::Default,
-					ty: StorageEntryType::Plain(DecodeDifferent::Encode("T::Origin2")),
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructGETU32(PhantomData::<TraitImpl>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("PUBGETU32"),
-					modifier: StorageEntryModifier::Default,
-					ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructPUBGETU32(PhantomData::<TraitImpl>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("GETU32WITHCONFIG"),
-					modifier: StorageEntryModifier::Default,
-					ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructGETU32WITHCONFIG(PhantomData::<TraitImpl>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("PUBGETU32WITHCONFIG"),
-					modifier: StorageEntryModifier::Default,
-					ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructPUBGETU32WITHCONFIG(PhantomData::<TraitImpl>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("GETU32MYDEF"),
-					modifier: StorageEntryModifier::Optional,
-					ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructGETU32MYDEF(PhantomData::<TraitImpl>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("PUBGETU32MYDEF"),
-					modifier: StorageEntryModifier::Default,
-					ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructPUBGETU32MYDEF(PhantomData::<TraitImpl>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("GETU32WITHCONFIGMYDEF"),
-					modifier: StorageEntryModifier::Default,
-					ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructGETU32WITHCONFIGMYDEF(PhantomData::<TraitImpl>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("PUBGETU32WITHCONFIGMYDEF"),
-					modifier: StorageEntryModifier::Default,
-					ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructPUBGETU32WITHCONFIGMYDEF(PhantomData::<TraitImpl>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("PUBGETU32WITHCONFIGMYDEFOPT"),
-					modifier: StorageEntryModifier::Optional,
-					ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructPUBGETU32WITHCONFIGMYDEFOPT(PhantomData::<TraitImpl>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("GetU32WithBuilder"),
-					modifier: StorageEntryModifier::Default,
-					ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructGetU32WithBuilder(PhantomData::<TraitImpl>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("GetOptU32WithBuilderSome"),
-					modifier: StorageEntryModifier::Optional,
-					ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructGetOptU32WithBuilderSome(PhantomData::<TraitImpl>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("GetOptU32WithBuilderNone"),
-					modifier: StorageEntryModifier::Optional,
-					ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructGetOptU32WithBuilderNone(PhantomData::<TraitImpl>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("MAPU32"),
-					modifier: StorageEntryModifier::Optional,
-					ty: StorageEntryType::Map {
-						hasher: StorageHasher::Blake2_128Concat,
-						key: DecodeDifferent::Encode("u32"),
-						value: DecodeDifferent::Encode("[u8; 4]"),
-						unused: false,
-					},
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructMAPU32(PhantomData::<TraitImpl>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("PUBMAPU32"),
-					modifier: StorageEntryModifier::Optional,
-					ty: StorageEntryType::Map {
-						hasher: StorageHasher::Blake2_128Concat,
-						key: DecodeDifferent::Encode("u32"),
-						value: DecodeDifferent::Encode("[u8; 4]"),
-						unused: false,
-					},
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructPUBMAPU32(PhantomData::<TraitImpl>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("GETMAPU32"),
-					modifier: StorageEntryModifier::Default,
-					ty: StorageEntryType::Map {
-						hasher: StorageHasher::Blake2_128Concat,
-						key: DecodeDifferent::Encode("u32"),
-						value: DecodeDifferent::Encode("[u8; 4]"),
-						unused: false,
-					},
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructGETMAPU32(PhantomData::<TraitImpl>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("PUBGETMAPU32"),
-					modifier: StorageEntryModifier::Default,
-					ty: StorageEntryType::Map {
-						hasher: StorageHasher::Blake2_128Concat,
-						key: DecodeDifferent::Encode("u32"),
-						value: DecodeDifferent::Encode("[u8; 4]"),
-						unused: false,
-					},
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructPUBGETMAPU32(PhantomData::<TraitImpl>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("GETMAPU32MYDEF"),
-					modifier: StorageEntryModifier::Default,
-					ty: StorageEntryType::Map {
-						hasher: StorageHasher::Blake2_128Concat,
-						key: DecodeDifferent::Encode("u32"),
-						value: DecodeDifferent::Encode("[u8; 4]"),
-						unused: false,
-					},
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructGETMAPU32MYDEF(PhantomData::<TraitImpl>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("PUBGETMAPU32MYDEF"),
-					modifier: StorageEntryModifier::Default,
-					ty: StorageEntryType::Map {
-						hasher: StorageHasher::Blake2_128Concat,
-						key: DecodeDifferent::Encode("u32"),
-						value: DecodeDifferent::Encode("[u8; 4]"),
-						unused: false,
-					},
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructPUBGETMAPU32MYDEF(PhantomData::<TraitImpl>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("DOUBLEMAP"),
-					modifier: StorageEntryModifier::Optional,
-					ty: StorageEntryType::DoubleMap {
-						hasher: StorageHasher::Blake2_128Concat,
-						key1: DecodeDifferent::Encode("u32"),
-						key2: DecodeDifferent::Encode("u32"),
-						value: DecodeDifferent::Encode("[u8; 4]"),
-						key2_hasher: StorageHasher::Blake2_128Concat,
-					},
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructDOUBLEMAP(PhantomData::<TraitImpl>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("DOUBLEMAP2"),
-					modifier: StorageEntryModifier::Optional,
-					ty: StorageEntryType::DoubleMap {
-						hasher: StorageHasher::Blake2_128Concat,
-						key1: DecodeDifferent::Encode("u32"),
-						key2: DecodeDifferent::Encode("u32"),
-						value: DecodeDifferent::Encode("[u8; 4]"),
-						key2_hasher: StorageHasher::Blake2_128Concat,
-					},
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructDOUBLEMAP2(PhantomData::<TraitImpl>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("COMPLEXTYPE1"),
-					modifier: StorageEntryModifier::Default,
-					ty: StorageEntryType::Plain(DecodeDifferent::Encode("(::std::option::Option<T::Origin2>,)")),
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructCOMPLEXTYPE1(PhantomData::<TraitImpl>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("COMPLEXTYPE2"),
-					modifier: StorageEntryModifier::Default,
-					ty: StorageEntryType::Plain(DecodeDifferent::Encode("([[(u16, Option<()>); 32]; 12], u32)")),
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructCOMPLEXTYPE2(PhantomData::<TraitImpl>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("COMPLEXTYPE3"),
-					modifier: StorageEntryModifier::Default,
-					ty: StorageEntryType::Plain(DecodeDifferent::Encode("[u32; 25]")),
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructCOMPLEXTYPE3(PhantomData::<TraitImpl>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("NMAP"),
-					modifier: StorageEntryModifier::Default,
-					ty: StorageEntryType::NMap {
-						keys: DecodeDifferent::Encode(&["u32", "u16"]),
-						hashers: DecodeDifferent::Encode(&[StorageHasher::Blake2_128Concat, StorageHasher::Twox64Concat]),
-						value: DecodeDifferent::Encode("u8"),
-					},
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructNMAP(PhantomData::<TraitImpl>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Encode("NMAP2"),
-					modifier: StorageEntryModifier::Default,
-					ty: StorageEntryType::NMap {
-						keys: DecodeDifferent::Encode(&["u32"]),
-						hashers: DecodeDifferent::Encode(&[StorageHasher::Blake2_128Concat]),
-						value: DecodeDifferent::Encode("u8"),
-					},
-					default: DecodeDifferent::Encode(
-						DefaultByteGetter(&__GetByteStructNMAP(PhantomData::<TraitImpl>))
-					),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-			]
-		),
+		entries: DecodeDifferent::Encode(&[
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("U32"),
+				modifier: StorageEntryModifier::Optional,
+				ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
+				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructU32(
+					PhantomData::<TraitImpl>,
+				))),
+				documentation: DecodeDifferent::Encode(&[" Hello, this is doc!"]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("PUBU32"),
+				modifier: StorageEntryModifier::Optional,
+				ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
+				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructPUBU32(
+					PhantomData::<TraitImpl>,
+				))),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("U32MYDEF"),
+				modifier: StorageEntryModifier::Optional,
+				ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
+				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructU32MYDEF(
+					PhantomData::<TraitImpl>,
+				))),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("PUBU32MYDEF"),
+				modifier: StorageEntryModifier::Optional,
+				ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
+				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructPUBU32MYDEF(
+					PhantomData::<TraitImpl>,
+				))),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("GETU32"),
+				modifier: StorageEntryModifier::Default,
+				ty: StorageEntryType::Plain(DecodeDifferent::Encode("T::Origin2")),
+				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructGETU32(
+					PhantomData::<TraitImpl>,
+				))),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("PUBGETU32"),
+				modifier: StorageEntryModifier::Default,
+				ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
+				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructPUBGETU32(
+					PhantomData::<TraitImpl>,
+				))),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("GETU32WITHCONFIG"),
+				modifier: StorageEntryModifier::Default,
+				ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
+				default: DecodeDifferent::Encode(DefaultByteGetter(
+					&__GetByteStructGETU32WITHCONFIG(PhantomData::<TraitImpl>),
+				)),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("PUBGETU32WITHCONFIG"),
+				modifier: StorageEntryModifier::Default,
+				ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
+				default: DecodeDifferent::Encode(DefaultByteGetter(
+					&__GetByteStructPUBGETU32WITHCONFIG(PhantomData::<TraitImpl>),
+				)),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("GETU32MYDEF"),
+				modifier: StorageEntryModifier::Optional,
+				ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
+				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructGETU32MYDEF(
+					PhantomData::<TraitImpl>,
+				))),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("PUBGETU32MYDEF"),
+				modifier: StorageEntryModifier::Default,
+				ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
+				default: DecodeDifferent::Encode(DefaultByteGetter(
+					&__GetByteStructPUBGETU32MYDEF(PhantomData::<TraitImpl>),
+				)),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("GETU32WITHCONFIGMYDEF"),
+				modifier: StorageEntryModifier::Default,
+				ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
+				default: DecodeDifferent::Encode(DefaultByteGetter(
+					&__GetByteStructGETU32WITHCONFIGMYDEF(PhantomData::<TraitImpl>),
+				)),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("PUBGETU32WITHCONFIGMYDEF"),
+				modifier: StorageEntryModifier::Default,
+				ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
+				default: DecodeDifferent::Encode(DefaultByteGetter(
+					&__GetByteStructPUBGETU32WITHCONFIGMYDEF(PhantomData::<TraitImpl>),
+				)),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("PUBGETU32WITHCONFIGMYDEFOPT"),
+				modifier: StorageEntryModifier::Optional,
+				ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
+				default: DecodeDifferent::Encode(DefaultByteGetter(
+					&__GetByteStructPUBGETU32WITHCONFIGMYDEFOPT(PhantomData::<TraitImpl>),
+				)),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("GetU32WithBuilder"),
+				modifier: StorageEntryModifier::Default,
+				ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
+				default: DecodeDifferent::Encode(DefaultByteGetter(
+					&__GetByteStructGetU32WithBuilder(PhantomData::<TraitImpl>),
+				)),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("GetOptU32WithBuilderSome"),
+				modifier: StorageEntryModifier::Optional,
+				ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
+				default: DecodeDifferent::Encode(DefaultByteGetter(
+					&__GetByteStructGetOptU32WithBuilderSome(PhantomData::<TraitImpl>),
+				)),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("GetOptU32WithBuilderNone"),
+				modifier: StorageEntryModifier::Optional,
+				ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
+				default: DecodeDifferent::Encode(DefaultByteGetter(
+					&__GetByteStructGetOptU32WithBuilderNone(PhantomData::<TraitImpl>),
+				)),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("MAPU32"),
+				modifier: StorageEntryModifier::Optional,
+				ty: StorageEntryType::Map {
+					hasher: StorageHasher::Blake2_128Concat,
+					key: DecodeDifferent::Encode("u32"),
+					value: DecodeDifferent::Encode("[u8; 4]"),
+					unused: false,
+				},
+				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructMAPU32(
+					PhantomData::<TraitImpl>,
+				))),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("PUBMAPU32"),
+				modifier: StorageEntryModifier::Optional,
+				ty: StorageEntryType::Map {
+					hasher: StorageHasher::Blake2_128Concat,
+					key: DecodeDifferent::Encode("u32"),
+					value: DecodeDifferent::Encode("[u8; 4]"),
+					unused: false,
+				},
+				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructPUBMAPU32(
+					PhantomData::<TraitImpl>,
+				))),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("GETMAPU32"),
+				modifier: StorageEntryModifier::Default,
+				ty: StorageEntryType::Map {
+					hasher: StorageHasher::Blake2_128Concat,
+					key: DecodeDifferent::Encode("u32"),
+					value: DecodeDifferent::Encode("[u8; 4]"),
+					unused: false,
+				},
+				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructGETMAPU32(
+					PhantomData::<TraitImpl>,
+				))),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("PUBGETMAPU32"),
+				modifier: StorageEntryModifier::Default,
+				ty: StorageEntryType::Map {
+					hasher: StorageHasher::Blake2_128Concat,
+					key: DecodeDifferent::Encode("u32"),
+					value: DecodeDifferent::Encode("[u8; 4]"),
+					unused: false,
+				},
+				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructPUBGETMAPU32(
+					PhantomData::<TraitImpl>,
+				))),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("GETMAPU32MYDEF"),
+				modifier: StorageEntryModifier::Default,
+				ty: StorageEntryType::Map {
+					hasher: StorageHasher::Blake2_128Concat,
+					key: DecodeDifferent::Encode("u32"),
+					value: DecodeDifferent::Encode("[u8; 4]"),
+					unused: false,
+				},
+				default: DecodeDifferent::Encode(DefaultByteGetter(
+					&__GetByteStructGETMAPU32MYDEF(PhantomData::<TraitImpl>),
+				)),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("PUBGETMAPU32MYDEF"),
+				modifier: StorageEntryModifier::Default,
+				ty: StorageEntryType::Map {
+					hasher: StorageHasher::Blake2_128Concat,
+					key: DecodeDifferent::Encode("u32"),
+					value: DecodeDifferent::Encode("[u8; 4]"),
+					unused: false,
+				},
+				default: DecodeDifferent::Encode(DefaultByteGetter(
+					&__GetByteStructPUBGETMAPU32MYDEF(PhantomData::<TraitImpl>),
+				)),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("DOUBLEMAP"),
+				modifier: StorageEntryModifier::Optional,
+				ty: StorageEntryType::DoubleMap {
+					hasher: StorageHasher::Blake2_128Concat,
+					key1: DecodeDifferent::Encode("u32"),
+					key2: DecodeDifferent::Encode("u32"),
+					value: DecodeDifferent::Encode("[u8; 4]"),
+					key2_hasher: StorageHasher::Blake2_128Concat,
+				},
+				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructDOUBLEMAP(
+					PhantomData::<TraitImpl>,
+				))),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("DOUBLEMAP2"),
+				modifier: StorageEntryModifier::Optional,
+				ty: StorageEntryType::DoubleMap {
+					hasher: StorageHasher::Blake2_128Concat,
+					key1: DecodeDifferent::Encode("u32"),
+					key2: DecodeDifferent::Encode("u32"),
+					value: DecodeDifferent::Encode("[u8; 4]"),
+					key2_hasher: StorageHasher::Blake2_128Concat,
+				},
+				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructDOUBLEMAP2(
+					PhantomData::<TraitImpl>,
+				))),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("COMPLEXTYPE1"),
+				modifier: StorageEntryModifier::Default,
+				ty: StorageEntryType::Plain(DecodeDifferent::Encode(
+					"(::std::option::Option<T::Origin2>,)",
+				)),
+				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructCOMPLEXTYPE1(
+					PhantomData::<TraitImpl>,
+				))),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("COMPLEXTYPE2"),
+				modifier: StorageEntryModifier::Default,
+				ty: StorageEntryType::Plain(DecodeDifferent::Encode(
+					"([[(u16, Option<()>); 32]; 12], u32)",
+				)),
+				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructCOMPLEXTYPE2(
+					PhantomData::<TraitImpl>,
+				))),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("COMPLEXTYPE3"),
+				modifier: StorageEntryModifier::Default,
+				ty: StorageEntryType::Plain(DecodeDifferent::Encode("[u32; 25]")),
+				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructCOMPLEXTYPE3(
+					PhantomData::<TraitImpl>,
+				))),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("NMAP"),
+				modifier: StorageEntryModifier::Default,
+				ty: StorageEntryType::NMap {
+					keys: DecodeDifferent::Encode(&["u32", "u16"]),
+					hashers: DecodeDifferent::Encode(&[
+						StorageHasher::Blake2_128Concat,
+						StorageHasher::Twox64Concat,
+					]),
+					value: DecodeDifferent::Encode("u8"),
+				},
+				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructNMAP(
+					PhantomData::<TraitImpl>,
+				))),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+			StorageEntryMetadata {
+				name: DecodeDifferent::Encode("NMAP2"),
+				modifier: StorageEntryModifier::Default,
+				ty: StorageEntryType::NMap {
+					keys: DecodeDifferent::Encode(&["u32"]),
+					hashers: DecodeDifferent::Encode(&[StorageHasher::Blake2_128Concat]),
+					value: DecodeDifferent::Encode("u8"),
+				},
+				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructNMAP(
+					PhantomData::<TraitImpl>,
+				))),
+				documentation: DecodeDifferent::Encode(&[]),
+			},
+		]),
 	};
 
 	#[test]
 	fn storage_info() {
 		use frame_support::{
-			StorageHasher,
-			traits::{StorageInfoTrait, StorageInfo},
 			pallet_prelude::*,
+			traits::{StorageInfo, StorageInfoTrait},
+			StorageHasher,
 		};
 		let prefix = |pallet_name, storage_name| {
 			let mut res = [0u8; 32];
@@ -713,9 +717,9 @@ mod test2 {
 	#[test]
 	fn storage_info() {
 		use frame_support::{
-			StorageHasher,
-			traits::{StorageInfoTrait, StorageInfo},
 			pallet_prelude::*,
+			traits::{StorageInfo, StorageInfoTrait},
+			StorageHasher,
 		};
 		let prefix = |pallet_name, storage_name| {
 			let mut res = [0u8; 32];
@@ -757,7 +761,6 @@ mod test2 {
 			],
 		);
 	}
-
 }
 
 #[cfg(test)]
@@ -791,8 +794,8 @@ mod test3 {
 #[cfg(test)]
 #[allow(dead_code)]
 mod test_append_and_len {
+	use codec::{Decode, Encode};
 	use sp_io::TestExternalities;
-	use codec::{Encode, Decode};
 
 	pub trait Config: frame_support_test::Config {}
 
diff --git a/frame/support/test/tests/derive_no_bound.rs b/frame/support/test/tests/derive_no_bound.rs
index 3081a332b72c..457ece8b8590 100644
--- a/frame/support/test/tests/derive_no_bound.rs
+++ b/frame/support/test/tests/derive_no_bound.rs
@@ -19,7 +19,7 @@
 //! RuntimeDebugNoBound
 
 use frame_support::{
-	DebugNoBound, CloneNoBound, EqNoBound, PartialEqNoBound, RuntimeDebugNoBound, DefaultNoBound,
+	CloneNoBound, DebugNoBound, DefaultNoBound, EqNoBound, PartialEqNoBound, RuntimeDebugNoBound,
 };
 
 #[derive(RuntimeDebugNoBound)]
@@ -59,7 +59,7 @@ fn test_struct_named() {
 		phantom: Default::default(),
 	};
 
-	let a_default: StructNamed::<Runtime, ImplNone, ImplNone> = Default::default();
+	let a_default: StructNamed<Runtime, ImplNone, ImplNone> = Default::default();
 	assert_eq!(a_default.a, 0);
 	assert_eq!(a_default.b, 0);
 	assert_eq!(a_default.c, 0);
@@ -90,14 +90,9 @@ struct StructUnnamed<T: Config, U, V>(u32, u64, T::C, core::marker::PhantomData<
 
 #[test]
 fn test_struct_unnamed() {
-	let a_1 = StructUnnamed::<Runtime, ImplNone, ImplNone>(
-		1,
-		2,
-		3,
-		Default::default(),
-	);
+	let a_1 = StructUnnamed::<Runtime, ImplNone, ImplNone>(1, 2, 3, Default::default());
 
-	let a_default: StructUnnamed::<Runtime, ImplNone, ImplNone> = Default::default();
+	let a_default: StructUnnamed<Runtime, ImplNone, ImplNone> = Default::default();
 	assert_eq!(a_default.0, 0);
 	assert_eq!(a_default.1, 0);
 	assert_eq!(a_default.2, 0);
@@ -108,17 +103,9 @@ fn test_struct_unnamed() {
 	assert_eq!(a_2.1, 2);
 	assert_eq!(a_2.2, 3);
 	assert_eq!(a_2, a_1);
-	assert_eq!(
-		format!("{:?}", a_1),
-		String::from("StructUnnamed(1, 2, 3, PhantomData)")
-	);
+	assert_eq!(format!("{:?}", a_1), String::from("StructUnnamed(1, 2, 3, PhantomData)"));
 
-	let b = StructUnnamed::<Runtime, ImplNone, ImplNone>(
-		1,
-		2,
-		4,
-		Default::default(),
-	);
+	let b = StructUnnamed::<Runtime, ImplNone, ImplNone>(1, 2, 4, Default::default());
 
 	assert!(b != a_1);
 }
@@ -126,12 +113,7 @@ fn test_struct_unnamed() {
 #[derive(DebugNoBound, CloneNoBound, EqNoBound, PartialEqNoBound, DefaultNoBound)]
 enum Enum<T: Config, U, V> {
 	VariantUnnamed(u32, u64, T::C, core::marker::PhantomData<(U, V)>),
-	VariantNamed {
-		a: u32,
-		b: u64,
-		c: T::C,
-		phantom: core::marker::PhantomData<(U, V)>,
-	},
+	VariantNamed { a: u32, b: u64, c: T::C, phantom: core::marker::PhantomData<(U, V)> },
 	VariantUnit,
 	VariantUnit2,
 }
@@ -139,11 +121,7 @@ enum Enum<T: Config, U, V> {
 // enum that will have a named default.
 #[derive(DebugNoBound, CloneNoBound, EqNoBound, PartialEqNoBound, DefaultNoBound)]
 enum Enum2<T: Config> {
-	VariantNamed {
-		a: u32,
-		b: u64,
-		c: T::C,
-	},
+	VariantNamed { a: u32, b: u64, c: T::C },
 	VariantUnnamed(u32, u64, T::C),
 	VariantUnit,
 	VariantUnit2,
@@ -153,18 +131,14 @@ enum Enum2<T: Config> {
 #[derive(DebugNoBound, CloneNoBound, EqNoBound, PartialEqNoBound, DefaultNoBound)]
 enum Enum3<T: Config> {
 	VariantUnit,
-	VariantNamed {
-		a: u32,
-		b: u64,
-		c: T::C,
-	},
+	VariantNamed { a: u32, b: u64, c: T::C },
 	VariantUnnamed(u32, u64, T::C),
 	VariantUnit2,
 }
 
 #[test]
 fn test_enum() {
-	type TestEnum = Enum::<Runtime, ImplNone, ImplNone>;
+	type TestEnum = Enum<Runtime, ImplNone, ImplNone>;
 	let variant_0 = TestEnum::VariantUnnamed(1, 2, 3, Default::default());
 	let variant_0_bis = TestEnum::VariantUnnamed(1, 2, 4, Default::default());
 	let variant_1 = TestEnum::VariantNamed { a: 1, b: 2, c: 3, phantom: Default::default() };
@@ -179,14 +153,8 @@ fn test_enum() {
 		TestEnum::VariantUnnamed(0, 0, 0, Default::default())
 	);
 
-	assert_eq!(
-		Enum2::<Runtime>::default(),
-		Enum2::<Runtime>::VariantNamed { a: 0, b: 0, c: 0},
-	);
-	assert_eq!(
-		Enum3::<Runtime>::default(),
-		Enum3::<Runtime>::VariantUnit,
-	);
+	assert_eq!(Enum2::<Runtime>::default(), Enum2::<Runtime>::VariantNamed { a: 0, b: 0, c: 0 },);
+	assert_eq!(Enum3::<Runtime>::default(), Enum3::<Runtime>::VariantUnit,);
 
 	assert!(variant_0 != variant_0_bis);
 	assert!(variant_1 != variant_1_bis);
@@ -216,12 +184,6 @@ fn test_enum() {
 		format!("{:?}", variant_1),
 		String::from("Enum::VariantNamed { a: 1, b: 2, c: 3, phantom: PhantomData }"),
 	);
-	assert_eq!(
-		format!("{:?}", variant_2),
-		String::from("Enum::VariantUnit"),
-	);
-	assert_eq!(
-		format!("{:?}", variant_3),
-		String::from("Enum::VariantUnit2"),
-	);
+	assert_eq!(format!("{:?}", variant_2), String::from("Enum::VariantUnit"),);
+	assert_eq!(format!("{:?}", variant_3), String::from("Enum::VariantUnit2"),);
 }
diff --git a/frame/support/test/tests/final_keys.rs b/frame/support/test/tests/final_keys.rs
index 9839a3d3b2d9..e89f961d893f 100644
--- a/frame/support/test/tests/final_keys.rs
+++ b/frame/support/test/tests/final_keys.rs
@@ -15,10 +15,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use frame_support::storage::unhashed;
 use codec::Encode;
-use frame_support::{StorageDoubleMap, StorageMap, StorageValue, StoragePrefixedMap};
-use sp_io::{TestExternalities, hashing::{twox_64, twox_128, blake2_128}};
+use frame_support::{
+	storage::unhashed, StorageDoubleMap, StorageMap, StoragePrefixedMap, StorageValue,
+};
+use sp_io::{
+	hashing::{blake2_128, twox_128, twox_64},
+	TestExternalities,
+};
 
 mod no_instance {
 	pub trait Config: frame_support_test::Config {}
@@ -27,7 +31,7 @@ mod no_instance {
 		pub struct Module<T: Config> for enum Call where origin: T::Origin, system=frame_support_test {}
 	}
 
-	frame_support::decl_storage!{
+	frame_support::decl_storage! {
 		trait Store for Module<T: Config> as FinalKeysNone {
 			pub Value config(value): u32;
 
@@ -52,7 +56,7 @@ mod instance {
 			for enum Call where origin: T::Origin, system=frame_support_test {}
 	}
 
-	frame_support::decl_storage!{
+	frame_support::decl_storage! {
 		trait Store for Module<T: Config<I>, I: Instance = DefaultInstance>
 			as FinalKeysSome
 		{
diff --git a/frame/support/test/tests/genesisconfig.rs b/frame/support/test/tests/genesisconfig.rs
index a30b021d13e5..d488e8bfbfaf 100644
--- a/frame/support/test/tests/genesisconfig.rs
+++ b/frame/support/test/tests/genesisconfig.rs
@@ -40,7 +40,5 @@ impl Config for Test {}
 
 #[test]
 fn init_genesis_config() {
-	GenesisConfig::<Test> {
-		t: Default::default(),
-	};
+	GenesisConfig::<Test> { t: Default::default() };
 }
diff --git a/frame/support/test/tests/instance.rs b/frame/support/test/tests/instance.rs
index 7d18a8368eda..65a2c11d0d13 100644
--- a/frame/support/test/tests/instance.rs
+++ b/frame/support/test/tests/instance.rs
@@ -15,20 +15,25 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#![recursion_limit="128"]
+#![recursion_limit = "128"]
 
-use codec::{Codec, EncodeLike, Encode, Decode};
-use sp_runtime::{generic, BuildStorage, traits::{BlakeTwo256, Verify}};
+use codec::{Codec, Decode, Encode, EncodeLike};
 use frame_support::{
-	Parameter, traits::Get, parameter_types,
+	inherent::{InherentData, InherentIdentifier, MakeFatalError, ProvideInherent},
 	metadata::{
-		DecodeDifferent, StorageMetadata, StorageEntryModifier, StorageEntryType, DefaultByteGetter,
-		StorageEntryMetadata, StorageHasher,
+		DecodeDifferent, DefaultByteGetter, StorageEntryMetadata, StorageEntryModifier,
+		StorageEntryType, StorageHasher, StorageMetadata,
 	},
-	StorageValue, StorageMap, StorageDoubleMap,
-	inherent::{ProvideInherent, InherentData, InherentIdentifier, MakeFatalError},
+	parameter_types,
+	traits::Get,
+	Parameter, StorageDoubleMap, StorageMap, StorageValue,
+};
+use sp_core::{sr25519, H256};
+use sp_runtime::{
+	generic,
+	traits::{BlakeTwo256, Verify},
+	BuildStorage,
 };
-use sp_core::{H256, sr25519};
 
 mod system;
 
@@ -41,7 +46,10 @@ mod module1 {
 	use super::*;
 	use sp_std::ops::Add;
 
-	pub trait Config<I>: system::Config where <Self as system::Config>::BlockNumber: From<u32> {
+	pub trait Config<I>: system::Config
+	where
+		<Self as system::Config>::BlockNumber: From<u32>,
+	{
 		type Event: From<Event<Self, I>> + Into<<Self as system::Config>::Event>;
 		type Origin: From<Origin<Self, I>>;
 		type SomeParameter: Get<u32>;
@@ -101,15 +109,19 @@ mod module1 {
 	}
 
 	#[derive(PartialEq, Eq, Clone, sp_runtime::RuntimeDebug, Encode, Decode)]
-	pub enum Origin<T: Config<I>, I> where T::BlockNumber: From<u32> {
+	pub enum Origin<T: Config<I>, I>
+	where
+		T::BlockNumber: From<u32>,
+	{
 		Members(u32),
 		_Phantom(std::marker::PhantomData<(T, I)>),
 	}
 
 	pub const INHERENT_IDENTIFIER: InherentIdentifier = *b"12345678";
 
-	impl<T: Config<I>, I: Instance> ProvideInherent for Module<T, I> where
-		T::BlockNumber: From<u32>
+	impl<T: Config<I>, I: Instance> ProvideInherent for Module<T, I>
+	where
+		T::BlockNumber: From<u32>,
 	{
 		type Call = Call<T, I>;
 		type Error = MakeFatalError<()>;
@@ -119,7 +131,10 @@ mod module1 {
 			unimplemented!();
 		}
 
-		fn check_inherent(_: &Self::Call, _: &InherentData) -> std::result::Result<(), Self::Error> {
+		fn check_inherent(
+			_: &Self::Call,
+			_: &InherentData,
+		) -> std::result::Result<(), Self::Error> {
 			unimplemented!();
 		}
 
@@ -135,7 +150,7 @@ mod module1 {
 mod module2 {
 	use super::*;
 
-	pub trait Config<I=DefaultInstance>: system::Config {
+	pub trait Config<I = DefaultInstance>: system::Config {
 		type Amount: Parameter + Default;
 		type Event: From<Event<Self, I>> + Into<<Self as system::Config>::Event>;
 		type Origin: From<Origin<Self, I>>;
@@ -167,7 +182,7 @@ mod module2 {
 	}
 
 	#[derive(PartialEq, Eq, Clone, sp_runtime::RuntimeDebug, Encode, Decode)]
-	pub enum Origin<T: Config<I>, I=DefaultInstance> {
+	pub enum Origin<T: Config<I>, I = DefaultInstance> {
 		Members(u32),
 		_Phantom(std::marker::PhantomData<(T, I)>),
 	}
@@ -183,7 +198,10 @@ mod module2 {
 			unimplemented!();
 		}
 
-		fn check_inherent(_call: &Self::Call, _data: &InherentData) -> std::result::Result<(), Self::Error> {
+		fn check_inherent(
+			_call: &Self::Call,
+			_data: &InherentData,
+		) -> std::result::Result<(), Self::Error> {
 			unimplemented!();
 		}
 
@@ -198,7 +216,9 @@ mod module2 {
 mod module3 {
 	use super::*;
 
-	pub trait Config: module2::Config + module2::Config<module2::Instance1> + system::Config {
+	pub trait Config:
+		module2::Config + module2::Config<module2::Instance1> + system::Config
+	{
 		type Currency: Currency;
 		type Currency2: Currency;
 	}
@@ -255,7 +275,7 @@ pub type BlockNumber = u64;
 pub type Index = u64;
 
 impl system::Config for Runtime {
-	type BaseCallFilter= frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::AllowAll;
 	type Hash = H256;
 	type Origin = Origin;
 	type BlockNumber = BlockNumber;
@@ -298,15 +318,9 @@ pub type Block = generic::Block<Header, UncheckedExtrinsic>;
 pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, Call, Signature, ()>;
 
 fn new_test_ext() -> sp_io::TestExternalities {
-	GenesisConfig{
-		module_1_1: module1::GenesisConfig {
-			value: 3,
-			test: 2,
-		},
-		module_1_2: module1::GenesisConfig {
-			value: 4,
-			test: 5,
-		},
+	GenesisConfig {
+		module_1_1: module1::GenesisConfig { value: 3, test: 2 },
+		module_1_2: module1::GenesisConfig { value: 4, test: 5 },
 		module_2: module2::GenesisConfig {
 			value: 4,
 			map: vec![(0, 0)],
@@ -319,14 +333,17 @@ fn new_test_ext() -> sp_io::TestExternalities {
 		},
 		module_2_2: Default::default(),
 		module_2_3: Default::default(),
-	}.build_storage().unwrap().into()
+	}
+	.build_storage()
+	.unwrap()
+	.into()
 }
 
 #[test]
 fn storage_instance_independence() {
 	let mut storage = sp_core::storage::Storage {
 		top: std::collections::BTreeMap::new(),
-		children_default: std::collections::HashMap::new()
+		children_default: std::collections::HashMap::new(),
 	};
 	sp_state_machine::BasicExternalities::execute_with_storage(&mut storage, || {
 		module2::Value::<Runtime>::put(0);
@@ -359,7 +376,7 @@ fn storage_with_instance_basic_operation() {
 		assert_eq!(Value::get(), 1);
 		assert_eq!(Value::take(), 1);
 		assert_eq!(Value::get(), 0);
-		Value::mutate(|a| *a=2);
+		Value::mutate(|a| *a = 2);
 		assert_eq!(Value::get(), 2);
 		Value::kill();
 		assert_eq!(Value::exists(), false);
@@ -372,7 +389,7 @@ fn storage_with_instance_basic_operation() {
 		assert_eq!(Map::get(key), 1);
 		assert_eq!(Map::take(key), 1);
 		assert_eq!(Map::get(key), 0);
-		Map::mutate(key, |a| *a=2);
+		Map::mutate(key, |a| *a = 2);
 		assert_eq!(Map::get(key), 2);
 		Map::remove(key);
 		assert_eq!(Map::contains_key(key), false);
@@ -386,7 +403,7 @@ fn storage_with_instance_basic_operation() {
 		assert_eq!(DoubleMap::get(&key1, &key2), 1);
 		assert_eq!(DoubleMap::take(&key1, &key2), 1);
 		assert_eq!(DoubleMap::get(&key1, &key2), 0);
-		DoubleMap::mutate(&key1, &key2, |a| *a=2);
+		DoubleMap::mutate(&key1, &key2, |a| *a = 2);
 		assert_eq!(DoubleMap::get(&key1, &key2), 2);
 		DoubleMap::remove(&key1, &key2);
 		assert_eq!(DoubleMap::get(&key1, &key2), 0);
@@ -395,60 +412,48 @@ fn storage_with_instance_basic_operation() {
 
 const EXPECTED_METADATA: StorageMetadata = StorageMetadata {
 	prefix: DecodeDifferent::Encode("Instance2Module2"),
-	entries: DecodeDifferent::Encode(
-		&[
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("Value"),
-				modifier: StorageEntryModifier::Default,
-				ty: StorageEntryType::Plain(DecodeDifferent::Encode("T::Amount")),
-				default: DecodeDifferent::Encode(
-					DefaultByteGetter(
-						&module2::__GetByteStructValue(
-							std::marker::PhantomData::<(Runtime, module2::Instance2)>
-						)
-					)
-				),
-				documentation: DecodeDifferent::Encode(&[]),
+	entries: DecodeDifferent::Encode(&[
+		StorageEntryMetadata {
+			name: DecodeDifferent::Encode("Value"),
+			modifier: StorageEntryModifier::Default,
+			ty: StorageEntryType::Plain(DecodeDifferent::Encode("T::Amount")),
+			default: DecodeDifferent::Encode(DefaultByteGetter(&module2::__GetByteStructValue(
+				std::marker::PhantomData::<(Runtime, module2::Instance2)>,
+			))),
+			documentation: DecodeDifferent::Encode(&[]),
+		},
+		StorageEntryMetadata {
+			name: DecodeDifferent::Encode("Map"),
+			modifier: StorageEntryModifier::Default,
+			ty: StorageEntryType::Map {
+				hasher: StorageHasher::Identity,
+				key: DecodeDifferent::Encode("u64"),
+				value: DecodeDifferent::Encode("u64"),
+				unused: false,
 			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("Map"),
-				modifier: StorageEntryModifier::Default,
-				ty: StorageEntryType::Map {
-					hasher: StorageHasher::Identity,
-					key: DecodeDifferent::Encode("u64"),
-					value: DecodeDifferent::Encode("u64"),
-					unused: false,
-				},
-				default: DecodeDifferent::Encode(
-					DefaultByteGetter(
-						&module2::__GetByteStructMap(
-							std::marker::PhantomData::<(Runtime, module2::Instance2)>
-						)
-					)
-				),
-				documentation: DecodeDifferent::Encode(&[]),
+			default: DecodeDifferent::Encode(DefaultByteGetter(&module2::__GetByteStructMap(
+				std::marker::PhantomData::<(Runtime, module2::Instance2)>,
+			))),
+			documentation: DecodeDifferent::Encode(&[]),
+		},
+		StorageEntryMetadata {
+			name: DecodeDifferent::Encode("DoubleMap"),
+			modifier: StorageEntryModifier::Default,
+			ty: StorageEntryType::DoubleMap {
+				hasher: StorageHasher::Identity,
+				key2_hasher: StorageHasher::Identity,
+				key1: DecodeDifferent::Encode("u64"),
+				key2: DecodeDifferent::Encode("u64"),
+				value: DecodeDifferent::Encode("u64"),
 			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("DoubleMap"),
-				modifier: StorageEntryModifier::Default,
-				ty: StorageEntryType::DoubleMap {
-					hasher: StorageHasher::Identity,
-					key2_hasher: StorageHasher::Identity,
-					key1: DecodeDifferent::Encode("u64"),
-					key2: DecodeDifferent::Encode("u64"),
-					value: DecodeDifferent::Encode("u64"),
-				},
-				default: DecodeDifferent::Encode(
-					DefaultByteGetter(
-						&module2::__GetByteStructDoubleMap(
-							std::marker::PhantomData::<(Runtime, module2::Instance2)>
-						)
-					)
+			default: DecodeDifferent::Encode(DefaultByteGetter(
+				&module2::__GetByteStructDoubleMap(
+					std::marker::PhantomData::<(Runtime, module2::Instance2)>,
 				),
-				documentation: DecodeDifferent::Encode(&[]),
-			}
-		]
-	)
+			)),
+			documentation: DecodeDifferent::Encode(&[]),
+		},
+	]),
 };
 
 #[test]
diff --git a/frame/support/test/tests/issue2219.rs b/frame/support/test/tests/issue2219.rs
index 78a79055a389..dd73700cf5ca 100644
--- a/frame/support/test/tests/issue2219.rs
+++ b/frame/support/test/tests/issue2219.rs
@@ -15,22 +15,23 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use frame_support::sp_runtime::generic;
-use frame_support::sp_runtime::traits::{BlakeTwo256, Verify};
-use frame_support::codec::{Encode, Decode};
-use sp_core::{H256, sr25519};
-use serde::{Serialize, Deserialize};
+use frame_support::{
+	codec::{Decode, Encode},
+	sp_runtime::{
+		generic,
+		traits::{BlakeTwo256, Verify},
+	},
+};
+use serde::{Deserialize, Serialize};
+use sp_core::{sr25519, H256};
 
 mod system;
 
 mod module {
 	use super::*;
 
-	pub type Request<T> = (
-		<T as system::Config>::AccountId,
-		Role,
-		<T as system::Config>::BlockNumber,
-	);
+	pub type Request<T> =
+		(<T as system::Config>::AccountId, Role, <T as system::Config>::BlockNumber);
 	pub type Requests<T> = Vec<Request<T>>;
 
 	#[derive(Encode, Decode, Copy, Clone, Eq, PartialEq, Debug)]
@@ -89,14 +90,12 @@ mod module {
 
 	#[derive(Encode, Decode, Copy, Clone, Serialize, Deserialize)]
 	pub struct Data<T: Config> {
-		pub	data: T::BlockNumber,
+		pub data: T::BlockNumber,
 	}
 
 	impl<T: Config> Default for Data<T> {
 		fn default() -> Self {
-			Self {
-				data: T::BlockNumber::default(),
-			}
+			Self { data: T::BlockNumber::default() }
 		}
 	}
 
@@ -185,9 +184,6 @@ frame_support::construct_runtime!(
 #[test]
 fn create_genesis_config() {
 	GenesisConfig {
-		module: module::GenesisConfig {
-			request_life_time: 0,
-			enable_storage_role: true,
-		}
+		module: module::GenesisConfig { request_life_time: 0, enable_storage_role: true },
 	};
 }
diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index 59ebd2e71e59..7385eeb6ad74 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -16,48 +16,87 @@
 // limitations under the License.
 
 use frame_support::{
-	weights::{DispatchInfo, DispatchClass, Pays, GetDispatchInfo},
+	dispatch::{Parameter, UnfilteredDispatchable},
+	storage::unhashed,
 	traits::{
-		GetCallName, OnInitialize, OnFinalize, OnRuntimeUpgrade, GetPalletVersion, OnGenesis,
+		GetCallName, GetPalletVersion, OnFinalize, OnGenesis, OnInitialize, OnRuntimeUpgrade,
 	},
-	dispatch::{UnfilteredDispatchable, Parameter},
-	storage::unhashed,
+	weights::{DispatchClass, DispatchInfo, GetDispatchInfo, Pays},
+};
+use sp_io::{
+	hashing::{blake2_128, twox_128, twox_64},
+	TestExternalities,
 };
 use sp_runtime::DispatchError;
-use sp_io::{TestExternalities, hashing::{twox_64, twox_128, blake2_128}};
 
 pub struct SomeType1;
-impl From<SomeType1> for u64 { fn from(_t: SomeType1) -> Self { 0u64 } }
+impl From<SomeType1> for u64 {
+	fn from(_t: SomeType1) -> Self {
+		0u64
+	}
+}
 
 pub struct SomeType2;
-impl From<SomeType2> for u64 { fn from(_t: SomeType2) -> Self { 100u64 } }
+impl From<SomeType2> for u64 {
+	fn from(_t: SomeType2) -> Self {
+		100u64
+	}
+}
 
 pub struct SomeType3;
-impl From<SomeType3> for u64 { fn from(_t: SomeType3) -> Self { 0u64 } }
+impl From<SomeType3> for u64 {
+	fn from(_t: SomeType3) -> Self {
+		0u64
+	}
+}
 
 pub struct SomeType4;
-impl From<SomeType4> for u64 { fn from(_t: SomeType4) -> Self { 0u64 } }
+impl From<SomeType4> for u64 {
+	fn from(_t: SomeType4) -> Self {
+		0u64
+	}
+}
 
 pub struct SomeType5;
-impl From<SomeType5> for u64 { fn from(_t: SomeType5) -> Self { 0u64 } }
+impl From<SomeType5> for u64 {
+	fn from(_t: SomeType5) -> Self {
+		0u64
+	}
+}
 
 pub struct SomeType6;
-impl From<SomeType6> for u64 { fn from(_t: SomeType6) -> Self { 0u64 } }
+impl From<SomeType6> for u64 {
+	fn from(_t: SomeType6) -> Self {
+		0u64
+	}
+}
 
 pub struct SomeType7;
-impl From<SomeType7> for u64 { fn from(_t: SomeType7) -> Self { 0u64 } }
+impl From<SomeType7> for u64 {
+	fn from(_t: SomeType7) -> Self {
+		0u64
+	}
+}
 
-pub trait SomeAssociation1 { type _1: Parameter + codec::MaxEncodedLen; }
-impl SomeAssociation1 for u64 { type _1 = u64; }
+pub trait SomeAssociation1 {
+	type _1: Parameter + codec::MaxEncodedLen;
+}
+impl SomeAssociation1 for u64 {
+	type _1 = u64;
+}
 
-pub trait SomeAssociation2 { type _2: Parameter + codec::MaxEncodedLen; }
-impl SomeAssociation2 for u64 { type _2 = u64; }
+pub trait SomeAssociation2 {
+	type _2: Parameter + codec::MaxEncodedLen;
+}
+impl SomeAssociation2 for u64 {
+	type _2 = u64;
+}
 
 #[frame_support::pallet]
 pub mod pallet {
 	use super::{
-		SomeType1, SomeType2, SomeType3, SomeType4, SomeType5, SomeType6, SomeType7,
-		SomeAssociation1, SomeAssociation2,
+		SomeAssociation1, SomeAssociation2, SomeType1, SomeType2, SomeType3, SomeType4, SomeType5,
+		SomeType6, SomeType7,
 	};
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
@@ -66,7 +105,8 @@ pub mod pallet {
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config
-	where <Self as frame_system::Config>::AccountId: From<SomeType1> + SomeAssociation1,
+	where
+		<Self as frame_system::Config>::AccountId: From<SomeType1> + SomeAssociation1,
 	{
 		/// Some comment
 		/// Some comment
@@ -88,14 +128,19 @@ pub mod pallet {
 
 	#[pallet::extra_constants]
 	impl<T: Config> Pallet<T>
-	where T::AccountId: From<SomeType1> + SomeAssociation1 + From<SomeType2>,
+	where
+		T::AccountId: From<SomeType1> + SomeAssociation1 + From<SomeType2>,
 	{
 		/// Some doc
 		/// Some doc
-		fn some_extra() -> T::AccountId { SomeType2.into() }
+		fn some_extra() -> T::AccountId {
+			SomeType2.into()
+		}
 
 		/// Some doc
-		fn some_extra_extra() -> T::AccountId { SomeType1.into() }
+		fn some_extra_extra() -> T::AccountId {
+			SomeType1.into()
+		}
 	}
 
 	#[pallet::pallet]
@@ -105,7 +150,8 @@ pub mod pallet {
 
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T>
-	where T::AccountId: From<SomeType2> + From<SomeType1> + SomeAssociation1,
+	where
+		T::AccountId: From<SomeType2> + From<SomeType1> + SomeAssociation1,
 	{
 		fn on_initialize(_: BlockNumberFor<T>) -> Weight {
 			T::AccountId::from(SomeType1); // Test for where clause
@@ -132,7 +178,8 @@ pub mod pallet {
 
 	#[pallet::call]
 	impl<T: Config> Pallet<T>
-		where T::AccountId: From<SomeType1> + From<SomeType3> + SomeAssociation1
+	where
+		T::AccountId: From<SomeType1> + From<SomeType3> + SomeAssociation1,
 	{
 		/// Doc comment put in metadata
 		#[pallet::weight(Weight::from(*_foo))]
@@ -165,9 +212,7 @@ pub mod pallet {
 
 		// Test for DispatchResult return type
 		#[pallet::weight(1)]
-		pub fn foo_no_post_info(
-			_origin: OriginFor<T>,
-		) -> DispatchResult {
+		pub fn foo_no_post_info(_origin: OriginFor<T>) -> DispatchResult {
 			Ok(())
 		}
 	}
@@ -181,7 +226,10 @@ pub mod pallet {
 	#[pallet::event]
 	#[pallet::metadata(BalanceOf<T> = "Balance", u32 = "Other")]
 	#[pallet::generate_deposit(fn deposit_event)]
-	pub enum Event<T: Config> where T::AccountId: SomeAssociation1 + From<SomeType1>{
+	pub enum Event<T: Config>
+	where
+		T::AccountId: SomeAssociation1 + From<SomeType1>,
+	{
 		/// doc comment put in metadata
 		Proposed(<T as frame_system::Config>::AccountId),
 		/// doc
@@ -191,8 +239,10 @@ pub mod pallet {
 	}
 
 	#[pallet::storage]
-	pub type ValueWhereClause<T: Config> where T::AccountId: SomeAssociation2 =
-		StorageValue<_, <T::AccountId as SomeAssociation2>::_2>;
+	pub type ValueWhereClause<T: Config>
+	where
+		T::AccountId: SomeAssociation2,
+	= StorageValue<_, <T::AccountId as SomeAssociation2>::_2>;
 
 	#[pallet::storage]
 	pub type Value<T> = StorageValue<Value = u32>;
@@ -203,28 +253,32 @@ pub mod pallet {
 
 	#[pallet::type_value]
 	pub fn MyDefault<T: Config>() -> u16
-	where T::AccountId: From<SomeType7> + From<SomeType1> + SomeAssociation1
+	where
+		T::AccountId: From<SomeType7> + From<SomeType1> + SomeAssociation1,
 	{
 		T::AccountId::from(SomeType7); // Test where clause works
 		4u16
 	}
 
 	#[pallet::storage]
-	pub type Map<T: Config> where T::AccountId: From<SomeType7> =
-		StorageMap<_, Blake2_128Concat, u8, u16, ValueQuery, MyDefault<T>>;
+	pub type Map<T: Config>
+	where
+		T::AccountId: From<SomeType7>,
+	= StorageMap<_, Blake2_128Concat, u8, u16, ValueQuery, MyDefault<T>>;
 
 	#[pallet::storage]
-	pub type Map2<T> = StorageMap<
-		Hasher = Twox64Concat, Key = u16, Value = u32, MaxValues = ConstU32<3>
-	>;
+	pub type Map2<T> =
+		StorageMap<Hasher = Twox64Concat, Key = u16, Value = u32, MaxValues = ConstU32<3>>;
 
 	#[pallet::storage]
 	pub type DoubleMap<T> = StorageDoubleMap<_, Blake2_128Concat, u8, Twox64Concat, u16, u32>;
 
 	#[pallet::storage]
 	pub type DoubleMap2<T> = StorageDoubleMap<
-		Hasher1 = Twox64Concat, Key1 = u16,
-		Hasher2 = Blake2_128Concat, Key2 = u32,
+		Hasher1 = Twox64Concat,
+		Key1 = u16,
+		Hasher2 = Blake2_128Concat,
+		Key2 = u32,
 		Value = u64,
 		MaxValues = ConstU32<5>,
 	>;
@@ -255,26 +309,14 @@ pub mod pallet {
 	#[cfg(feature = "conditional-storage")]
 	#[pallet::storage]
 	#[pallet::getter(fn conditional_double_map)]
-	pub type ConditionalDoubleMap<T> = StorageDoubleMap<
-		_,
-		Blake2_128Concat,
-		u8,
-		Twox64Concat,
-		u16,
-		u32,
-	>;
+	pub type ConditionalDoubleMap<T> =
+		StorageDoubleMap<_, Blake2_128Concat, u8, Twox64Concat, u16, u32>;
 
 	#[cfg(feature = "conditional-storage")]
 	#[pallet::storage]
 	#[pallet::getter(fn conditional_nmap)]
-	pub type ConditionalNMap<T> = StorageNMap<
-		_,
-		(
-			storage::Key<Blake2_128Concat, u8>,
-			storage::Key<Twox64Concat, u16>,
-		),
-		u32,
-	>;
+	pub type ConditionalNMap<T> =
+		StorageNMap<_, (storage::Key<Blake2_128Concat, u8>, storage::Key<Twox64Concat, u16>), u32>;
 
 	#[pallet::genesis_config]
 	#[derive(Default)]
@@ -284,7 +326,8 @@ pub mod pallet {
 
 	#[pallet::genesis_build]
 	impl<T: Config> GenesisBuild<T> for GenesisConfig
-	where T::AccountId: From<SomeType1> + SomeAssociation1 + From<SomeType4>
+	where
+		T::AccountId: From<SomeType1> + SomeAssociation1 + From<SomeType4>,
 	{
 		fn build(&self) {
 			T::AccountId::from(SomeType1); // Test for where clause
@@ -298,17 +341,15 @@ pub mod pallet {
 
 	#[pallet::validate_unsigned]
 	impl<T: Config> ValidateUnsigned for Pallet<T>
-	where T::AccountId: From<SomeType1> + SomeAssociation1 + From<SomeType5> + From<SomeType3>
+	where
+		T::AccountId: From<SomeType1> + SomeAssociation1 + From<SomeType5> + From<SomeType3>,
 	{
 		type Call = Call<T>;
-		fn validate_unsigned(
-			_source: TransactionSource,
-			call: &Self::Call
-		) -> TransactionValidity {
+		fn validate_unsigned(_source: TransactionSource, call: &Self::Call) -> TransactionValidity {
 			T::AccountId::from(SomeType1); // Test for where clause
 			T::AccountId::from(SomeType5); // Test for where clause
 			if matches!(call, Call::foo_transactional(_)) {
-				return Ok(ValidTransaction::default());
+				return Ok(ValidTransaction::default())
 			}
 			Err(TransactionValidityError::Invalid(InvalidTransaction::Call))
 		}
@@ -316,7 +357,8 @@ pub mod pallet {
 
 	#[pallet::inherent]
 	impl<T: Config> ProvideInherent for Pallet<T>
-	where T::AccountId: From<SomeType1> + SomeAssociation1 + From<SomeType6> + From<SomeType3>
+	where
+		T::AccountId: From<SomeType1> + SomeAssociation1 + From<SomeType6> + From<SomeType3>,
 	{
 		type Call = Call<T>;
 		type Error = InherentError;
@@ -369,13 +411,14 @@ pub mod pallet {
 // Test that a pallet with non generic event and generic genesis_config is correctly handled
 #[frame_support::pallet]
 pub mod pallet2 {
-	use super::{SomeType1, SomeAssociation1};
+	use super::{SomeAssociation1, SomeType1};
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config
-	where <Self as frame_system::Config>::AccountId: From<SomeType1> + SomeAssociation1,
+	where
+		<Self as frame_system::Config>::AccountId: From<SomeType1> + SomeAssociation1,
 	{
 		type Event: From<Event> + IsType<<Self as frame_system::Config>::Event>;
 	}
@@ -385,16 +428,13 @@ pub mod pallet2 {
 	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
-	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T>
-	where T::AccountId: From<SomeType1> + SomeAssociation1,
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> where
+		T::AccountId: From<SomeType1> + SomeAssociation1
 	{
 	}
 
 	#[pallet::call]
-	impl<T: Config> Pallet<T>
-	where T::AccountId: From<SomeType1> + SomeAssociation1,
-	{
-	}
+	impl<T: Config> Pallet<T> where T::AccountId: From<SomeType1> + SomeAssociation1 {}
 
 	#[pallet::storage]
 	pub type SomeValue<T: Config> = StorageValue<_, Vec<u32>>;
@@ -407,24 +447,25 @@ pub mod pallet2 {
 
 	#[pallet::genesis_config]
 	pub struct GenesisConfig<T: Config>
-	where T::AccountId: From<SomeType1> + SomeAssociation1,
+	where
+		T::AccountId: From<SomeType1> + SomeAssociation1,
 	{
 		phantom: PhantomData<T>,
 	}
 
 	impl<T: Config> Default for GenesisConfig<T>
-	where T::AccountId: From<SomeType1> + SomeAssociation1,
+	where
+		T::AccountId: From<SomeType1> + SomeAssociation1,
 	{
 		fn default() -> Self {
-			GenesisConfig {
-				phantom: Default::default(),
-			}
+			GenesisConfig { phantom: Default::default() }
 		}
 	}
 
 	#[pallet::genesis_build]
 	impl<T: Config> GenesisBuild<T> for GenesisConfig<T>
-	where T::AccountId: From<SomeType1> + SomeAssociation1,
+	where
+		T::AccountId: From<SomeType1> + SomeAssociation1,
 	{
 		fn build(&self) {}
 	}
@@ -441,9 +482,9 @@ pub mod pallet3 {
 }
 
 frame_support::parameter_types!(
-	pub const MyGetParam: u32= 10;
-	pub const MyGetParam2: u32= 11;
-	pub const MyGetParam3: u32= 12;
+	pub const MyGetParam: u32 = 10;
+	pub const MyGetParam2: u32 = 11;
+	pub const MyGetParam3: u32 = 12;
 	pub const BlockHashCount: u32 = 250;
 );
 
@@ -505,13 +546,20 @@ fn transactional_works() {
 	TestExternalities::default().execute_with(|| {
 		frame_system::Pallet::<Runtime>::set_block_number(1);
 
-		pallet::Call::<Runtime>::foo_transactional(0).dispatch_bypass_filter(None.into())
-			.err().unwrap();
+		pallet::Call::<Runtime>::foo_transactional(0)
+			.dispatch_bypass_filter(None.into())
+			.err()
+			.unwrap();
 		assert!(frame_system::Pallet::<Runtime>::events().is_empty());
 
-		pallet::Call::<Runtime>::foo_transactional(1).dispatch_bypass_filter(None.into()).unwrap();
+		pallet::Call::<Runtime>::foo_transactional(1)
+			.dispatch_bypass_filter(None.into())
+			.unwrap();
 		assert_eq!(
-			frame_system::Pallet::<Runtime>::events().iter().map(|e| &e.event).collect::<Vec<_>>(),
+			frame_system::Pallet::<Runtime>::events()
+				.iter()
+				.map(|e| &e.event)
+				.collect::<Vec<_>>(),
 			vec![&Event::Example(pallet::Event::Something(0))],
 		);
 	})
@@ -522,11 +570,7 @@ fn call_expand() {
 	let call_foo = pallet::Call::<Runtime>::foo(3, 0);
 	assert_eq!(
 		call_foo.get_dispatch_info(),
-		DispatchInfo {
-			weight: 3,
-			class: DispatchClass::Normal,
-			pays_fee: Pays::Yes,
-		}
+		DispatchInfo { weight: 3, class: DispatchClass::Normal, pays_fee: Pays::Yes }
 	);
 	assert_eq!(call_foo.get_call_name(), "foo");
 	assert_eq!(
@@ -547,11 +591,7 @@ fn error_expand() {
 	);
 	assert_eq!(
 		DispatchError::from(pallet::Error::<Runtime>::InsufficientProposersBalance),
-		DispatchError::Module {
-			index: 1,
-			error: 0,
-			message: Some("InsufficientProposersBalance"),
-		},
+		DispatchError::Module { index: 1, error: 0, message: Some("InsufficientProposersBalance") },
 	);
 }
 
@@ -568,13 +608,17 @@ fn inherent_expand() {
 		traits::EnsureInherentsAreFirst,
 	};
 	use sp_core::Hasher;
-	use sp_runtime::{traits::{BlakeTwo256, Header}, Digest};
+	use sp_runtime::{
+		traits::{BlakeTwo256, Header},
+		Digest,
+	};
 
 	let inherents = InherentData::new().create_extrinsics();
 
-	let expected = vec![
-		UncheckedExtrinsic { function: Call::Example(pallet::Call::foo_no_post_info()), signature: None },
-	];
+	let expected = vec![UncheckedExtrinsic {
+		function: Call::Example(pallet::Call::foo_no_post_info()),
+		signature: None,
+	}];
 	assert_eq!(expected, inherents);
 
 	let block = Block::new(
@@ -586,8 +630,14 @@ fn inherent_expand() {
 			Digest::default(),
 		),
 		vec![
-			UncheckedExtrinsic { function: Call::Example(pallet::Call::foo_no_post_info()), signature: None },
-			UncheckedExtrinsic { function: Call::Example(pallet::Call::foo(1, 0)), signature: None },
+			UncheckedExtrinsic {
+				function: Call::Example(pallet::Call::foo_no_post_info()),
+				signature: None,
+			},
+			UncheckedExtrinsic {
+				function: Call::Example(pallet::Call::foo(1, 0)),
+				signature: None,
+			},
 		],
 	);
 
@@ -602,8 +652,14 @@ fn inherent_expand() {
 			Digest::default(),
 		),
 		vec![
-			UncheckedExtrinsic { function: Call::Example(pallet::Call::foo_no_post_info()), signature: None },
-			UncheckedExtrinsic { function: Call::Example(pallet::Call::foo(0, 0)), signature: None },
+			UncheckedExtrinsic {
+				function: Call::Example(pallet::Call::foo_no_post_info()),
+				signature: None,
+			},
+			UncheckedExtrinsic {
+				function: Call::Example(pallet::Call::foo(0, 0)),
+				signature: None,
+			},
 		],
 	);
 
@@ -617,9 +673,10 @@ fn inherent_expand() {
 			BlakeTwo256::hash(b"test"),
 			Digest::default(),
 		),
-		vec![
-			UncheckedExtrinsic { function: Call::Example(pallet::Call::foo_transactional(0)), signature: None },
-		],
+		vec![UncheckedExtrinsic {
+			function: Call::Example(pallet::Call::foo_transactional(0)),
+			signature: None,
+		}],
 	);
 
 	let mut inherent = InherentData::new();
@@ -634,9 +691,10 @@ fn inherent_expand() {
 			BlakeTwo256::hash(b"test"),
 			Digest::default(),
 		),
-		vec![
-			UncheckedExtrinsic { function: Call::Example(pallet::Call::foo_no_post_info()), signature: Some((1, (), ())) },
-		],
+		vec![UncheckedExtrinsic {
+			function: Call::Example(pallet::Call::foo_no_post_info()),
+			signature: Some((1, (), ())),
+		}],
 	);
 
 	let mut inherent = InherentData::new();
@@ -652,8 +710,14 @@ fn inherent_expand() {
 			Digest::default(),
 		),
 		vec![
-			UncheckedExtrinsic { function: Call::Example(pallet::Call::foo(1, 1)), signature: None },
-			UncheckedExtrinsic { function: Call::Example(pallet::Call::foo_transactional(0)), signature: None },
+			UncheckedExtrinsic {
+				function: Call::Example(pallet::Call::foo(1, 1)),
+				signature: None,
+			},
+			UncheckedExtrinsic {
+				function: Call::Example(pallet::Call::foo_transactional(0)),
+				signature: None,
+			},
 		],
 	);
 
@@ -668,9 +732,18 @@ fn inherent_expand() {
 			Digest::default(),
 		),
 		vec![
-			UncheckedExtrinsic { function: Call::Example(pallet::Call::foo(1, 1)), signature: None },
-			UncheckedExtrinsic { function: Call::Example(pallet::Call::foo_transactional(0)), signature: None },
-			UncheckedExtrinsic { function: Call::Example(pallet::Call::foo_no_post_info()), signature: None },
+			UncheckedExtrinsic {
+				function: Call::Example(pallet::Call::foo(1, 1)),
+				signature: None,
+			},
+			UncheckedExtrinsic {
+				function: Call::Example(pallet::Call::foo_transactional(0)),
+				signature: None,
+			},
+			UncheckedExtrinsic {
+				function: Call::Example(pallet::Call::foo_no_post_info()),
+				signature: None,
+			},
 		],
 	);
 
@@ -685,9 +758,18 @@ fn inherent_expand() {
 			Digest::default(),
 		),
 		vec![
-			UncheckedExtrinsic { function: Call::Example(pallet::Call::foo(1, 1)), signature: None },
-			UncheckedExtrinsic { function: Call::Example(pallet::Call::foo(1, 0)), signature: Some((1, (), ())) },
-			UncheckedExtrinsic { function: Call::Example(pallet::Call::foo_no_post_info()), signature: None },
+			UncheckedExtrinsic {
+				function: Call::Example(pallet::Call::foo(1, 1)),
+				signature: None,
+			},
+			UncheckedExtrinsic {
+				function: Call::Example(pallet::Call::foo(1, 0)),
+				signature: Some((1, (), ())),
+			},
+			UncheckedExtrinsic {
+				function: Call::Example(pallet::Call::foo_no_post_info()),
+				signature: None,
+			},
 		],
 	);
 
@@ -697,7 +779,8 @@ fn inherent_expand() {
 #[test]
 fn validate_unsigned_expand() {
 	use frame_support::pallet_prelude::{
-		InvalidTransaction, TransactionSource, TransactionValidityError, ValidTransaction, ValidateUnsigned,
+		InvalidTransaction, TransactionSource, TransactionValidityError, ValidTransaction,
+		ValidateUnsigned,
 	};
 	let call = pallet::Call::<Runtime>::foo_no_post_info();
 
@@ -733,8 +816,7 @@ fn pallet_expand_deposit_event() {
 
 #[test]
 fn storage_expand() {
-	use frame_support::pallet_prelude::*;
-	use frame_support::storage::StoragePrefixedMap;
+	use frame_support::{pallet_prelude::*, storage::StoragePrefixedMap};
 
 	fn twox_64_concat(d: &[u8]) -> Vec<u8> {
 		let mut v = twox_64(d).to_vec();
@@ -850,8 +932,8 @@ fn pallet_on_genesis() {
 
 #[test]
 fn metadata() {
-	use frame_metadata::*;
 	use codec::{Decode, Encode};
+	use frame_metadata::*;
 
 	let expected_pallet_metadata = ModuleMetadata {
 		index: 1,
@@ -862,11 +944,9 @@ fn metadata() {
 				StorageEntryMetadata {
 					name: DecodeDifferent::Decoded("ValueWhereClause".to_string()),
 					modifier: StorageEntryModifier::Optional,
-					ty: StorageEntryType::Plain(
-						DecodeDifferent::Decoded(
-							"<T::AccountId as SomeAssociation2>::_2".to_string()
-						),
-					),
+					ty: StorageEntryType::Plain(DecodeDifferent::Decoded(
+						"<T::AccountId as SomeAssociation2>::_2".to_string(),
+					)),
 					default: DecodeDifferent::Decoded(vec![0]),
 					documentation: DecodeDifferent::Decoded(vec![]),
 				},
@@ -939,9 +1019,7 @@ fn metadata() {
 					modifier: StorageEntryModifier::Optional,
 					ty: StorageEntryType::NMap {
 						keys: DecodeDifferent::Decoded(vec!["u8".to_string()]),
-						hashers: DecodeDifferent::Decoded(vec![
-							StorageHasher::Blake2_128Concat,
-						]),
+						hashers: DecodeDifferent::Decoded(vec![StorageHasher::Blake2_128Concat]),
 						value: DecodeDifferent::Decoded("u32".to_string()),
 					},
 					default: DecodeDifferent::Decoded(vec![0]),
@@ -951,10 +1029,7 @@ fn metadata() {
 					name: DecodeDifferent::Decoded("NMap2".to_string()),
 					modifier: StorageEntryModifier::Optional,
 					ty: StorageEntryType::NMap {
-						keys: DecodeDifferent::Decoded(vec![
-							"u16".to_string(),
-							"u32".to_string(),
-						]),
+						keys: DecodeDifferent::Decoded(vec!["u16".to_string(), "u32".to_string()]),
 						hashers: DecodeDifferent::Decoded(vec![
 							StorageHasher::Twox64Concat,
 							StorageHasher::Blake2_128Concat,
@@ -964,14 +1039,16 @@ fn metadata() {
 					default: DecodeDifferent::Decoded(vec![0]),
 					documentation: DecodeDifferent::Decoded(vec![]),
 				},
-				#[cfg(feature = "conditional-storage")] StorageEntryMetadata {
+				#[cfg(feature = "conditional-storage")]
+				StorageEntryMetadata {
 					name: DecodeDifferent::Decoded("ConditionalValue".to_string()),
 					modifier: StorageEntryModifier::Optional,
 					ty: StorageEntryType::Plain(DecodeDifferent::Decoded("u32".to_string())),
 					default: DecodeDifferent::Decoded(vec![0]),
 					documentation: DecodeDifferent::Decoded(vec![]),
 				},
-				#[cfg(feature = "conditional-storage")] StorageEntryMetadata {
+				#[cfg(feature = "conditional-storage")]
+				StorageEntryMetadata {
 					name: DecodeDifferent::Decoded("ConditionalMap".to_string()),
 					modifier: StorageEntryModifier::Optional,
 					ty: StorageEntryType::Map {
@@ -983,7 +1060,8 @@ fn metadata() {
 					default: DecodeDifferent::Decoded(vec![0]),
 					documentation: DecodeDifferent::Decoded(vec![]),
 				},
-				#[cfg(feature = "conditional-storage")] StorageEntryMetadata {
+				#[cfg(feature = "conditional-storage")]
+				StorageEntryMetadata {
 					name: DecodeDifferent::Decoded("ConditionalDoubleMap".to_string()),
 					modifier: StorageEntryModifier::Optional,
 					ty: StorageEntryType::DoubleMap {
@@ -996,7 +1074,8 @@ fn metadata() {
 					default: DecodeDifferent::Decoded(vec![0]),
 					documentation: DecodeDifferent::Decoded(vec![]),
 				},
-				#[cfg(feature = "conditional-storage")] StorageEntryMetadata {
+				#[cfg(feature = "conditional-storage")]
+				StorageEntryMetadata {
 					name: DecodeDifferent::Decoded("ConditionalNMap".to_string()),
 					modifier: StorageEntryModifier::Optional,
 					ty: StorageEntryType::NMap {
@@ -1023,22 +1102,20 @@ fn metadata() {
 					FunctionArgumentMetadata {
 						name: DecodeDifferent::Decoded("_bar".to_string()),
 						ty: DecodeDifferent::Decoded("u32".to_string()),
-					}
+					},
 				]),
 				documentation: DecodeDifferent::Decoded(vec![
-					" Doc comment put in metadata".to_string(),
+					" Doc comment put in metadata".to_string()
 				]),
 			},
 			FunctionMetadata {
 				name: DecodeDifferent::Decoded("foo_transactional".to_string()),
-				arguments: DecodeDifferent::Decoded(vec![
-					FunctionArgumentMetadata {
-						name: DecodeDifferent::Decoded("foo".to_string()),
-						ty: DecodeDifferent::Decoded("Compact<u32>".to_string()),
-					}
-				]),
+				arguments: DecodeDifferent::Decoded(vec![FunctionArgumentMetadata {
+					name: DecodeDifferent::Decoded("foo".to_string()),
+					ty: DecodeDifferent::Decoded("Compact<u32>".to_string()),
+				}]),
 				documentation: DecodeDifferent::Decoded(vec![
-					" Doc comment put in metadata".to_string(),
+					" Doc comment put in metadata".to_string()
 				]),
 			},
 			FunctionMetadata {
@@ -1050,7 +1127,9 @@ fn metadata() {
 		event: Some(DecodeDifferent::Decoded(vec![
 			EventMetadata {
 				name: DecodeDifferent::Decoded("Proposed".to_string()),
-				arguments: DecodeDifferent::Decoded(vec!["<T as frame_system::Config>::AccountId".to_string()]),
+				arguments: DecodeDifferent::Decoded(vec![
+					"<T as frame_system::Config>::AccountId".to_string()
+				]),
 				documentation: DecodeDifferent::Decoded(vec![
 					" doc comment put in metadata".to_string()
 				]),
@@ -1058,9 +1137,7 @@ fn metadata() {
 			EventMetadata {
 				name: DecodeDifferent::Decoded("Spending".to_string()),
 				arguments: DecodeDifferent::Decoded(vec!["Balance".to_string()]),
-				documentation: DecodeDifferent::Decoded(vec![
-					" doc".to_string()
-				]),
+				documentation: DecodeDifferent::Decoded(vec![" doc".to_string()]),
 			},
 			EventMetadata {
 				name: DecodeDifferent::Decoded("Something".to_string()),
@@ -1069,7 +1146,9 @@ fn metadata() {
 			},
 			EventMetadata {
 				name: DecodeDifferent::Decoded("SomethingElse".to_string()),
-				arguments: DecodeDifferent::Decoded(vec!["<T::AccountId as SomeAssociation1>::_1".to_string()]),
+				arguments: DecodeDifferent::Decoded(vec![
+					"<T::AccountId as SomeAssociation1>::_1".to_string()
+				]),
 				documentation: DecodeDifferent::Decoded(vec![]),
 			},
 		])),
@@ -1111,19 +1190,15 @@ fn metadata() {
 				name: DecodeDifferent::Decoded("some_extra_extra".to_string()),
 				ty: DecodeDifferent::Decoded("T::AccountId".to_string()),
 				value: DecodeDifferent::Decoded(vec![0, 0, 0, 0, 0, 0, 0, 0]),
-				documentation: DecodeDifferent::Decoded(vec![
-					" Some doc".to_string(),
-				]),
-			},
-		]),
-		errors: DecodeDifferent::Decoded(vec![
-			ErrorMetadata {
-				name: DecodeDifferent::Decoded("InsufficientProposersBalance".to_string()),
-				documentation: DecodeDifferent::Decoded(vec![
-					" doc comment put into metadata".to_string(),
-				]),
+				documentation: DecodeDifferent::Decoded(vec![" Some doc".to_string()]),
 			},
 		]),
+		errors: DecodeDifferent::Decoded(vec![ErrorMetadata {
+			name: DecodeDifferent::Decoded("InsufficientProposersBalance".to_string()),
+			documentation: DecodeDifferent::Decoded(vec![
+				" doc comment put into metadata".to_string()
+			]),
+		}]),
 	};
 
 	let metadata = match Runtime::metadata().1 {
@@ -1155,9 +1230,9 @@ fn test_pallet_info_access() {
 #[test]
 fn test_storage_info() {
 	use frame_support::{
-		StorageHasher,
-		traits::{StorageInfoTrait, StorageInfo},
 		pallet_prelude::*,
+		traits::{StorageInfo, StorageInfoTrait},
+		StorageHasher,
 	};
 
 	let prefix = |pallet_name, storage_name| {
@@ -1278,14 +1353,12 @@ fn test_storage_info() {
 
 	assert_eq!(
 		Example2::storage_info(),
-		vec![
-			StorageInfo {
-				pallet_name: b"Example2".to_vec(),
-				storage_name: b"SomeValue".to_vec(),
-				prefix: prefix(b"Example2", b"SomeValue").to_vec(),
-				max_values: Some(1),
-				max_size: None,
-			},
-		],
+		vec![StorageInfo {
+			pallet_name: b"Example2".to_vec(),
+			storage_name: b"SomeValue".to_vec(),
+			prefix: prefix(b"Example2", b"SomeValue").to_vec(),
+			max_values: Some(1),
+			max_size: None,
+		},],
 	);
 }
diff --git a/frame/support/test/tests/pallet_compatibility.rs b/frame/support/test/tests/pallet_compatibility.rs
index 3c055b9f45ae..35c991432acd 100644
--- a/frame/support/test/tests/pallet_compatibility.rs
+++ b/frame/support/test/tests/pallet_compatibility.rs
@@ -23,15 +23,19 @@ impl SomeAssociation for u64 {
 }
 
 mod pallet_old {
+	use super::SomeAssociation;
 	use frame_support::{
-		decl_storage, decl_error, decl_event, decl_module, weights::Weight, traits::Get, Parameter
+		decl_error, decl_event, decl_module, decl_storage, traits::Get, weights::Weight, Parameter,
 	};
 	use frame_system::ensure_root;
-	use super::SomeAssociation;
 
 	pub trait Config: frame_system::Config {
 		type SomeConst: Get<Self::Balance>;
-		type Balance: Parameter + codec::HasCompact + From<u32> + Into<Weight> + Default
+		type Balance: Parameter
+			+ codec::HasCompact
+			+ From<u32>
+			+ Into<Weight>
+			+ Default
 			+ SomeAssociation;
 		type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 	}
@@ -50,7 +54,10 @@ mod pallet_old {
 	}
 
 	decl_event!(
-		pub enum Event<T> where Balance = <T as Config>::Balance {
+		pub enum Event<T>
+		where
+			Balance = <T as Config>::Balance,
+		{
 			/// Dummy event, just here so there's a generic type that's used.
 			Dummy(Balance),
 		}
@@ -93,13 +100,17 @@ mod pallet_old {
 pub mod pallet {
 	use super::SomeAssociation;
 	use frame_support::pallet_prelude::*;
-	use frame_system::pallet_prelude::*;
-	use frame_system::ensure_root;
+	use frame_system::{ensure_root, pallet_prelude::*};
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
-		type Balance: Parameter + codec::HasCompact + From<u32> + Into<Weight> + Default
-			+ MaybeSerializeDeserialize + SomeAssociation;
+		type Balance: Parameter
+			+ codec::HasCompact
+			+ From<u32>
+			+ Into<Weight>
+			+ Default
+			+ MaybeSerializeDeserialize
+			+ SomeAssociation;
 		#[pallet::constant]
 		type SomeConst: Get<Self::Balance>;
 		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
@@ -125,7 +136,7 @@ pub mod pallet {
 		#[pallet::weight(<T::Balance as Into<Weight>>::into(new_value.clone()))]
 		pub fn set_dummy(
 			origin: OriginFor<T>,
-			#[pallet::compact] new_value: T::Balance
+			#[pallet::compact] new_value: T::Balance,
 		) -> DispatchResultWithPostInfo {
 			ensure_root(origin)?;
 
@@ -157,13 +168,22 @@ pub mod pallet {
 	#[pallet::storage]
 	type Bar<T: Config> = StorageMap<_, Blake2_128Concat, T::AccountId, T::Balance, ValueQuery>;
 
-	#[pallet::type_value] pub fn OnFooEmpty<T: Config>() -> T::Balance { 3.into() }
+	#[pallet::type_value]
+	pub fn OnFooEmpty<T: Config>() -> T::Balance {
+		3.into()
+	}
 	#[pallet::storage]
 	type Foo<T: Config> = StorageValue<_, T::Balance, ValueQuery, OnFooEmpty<T>>;
 
 	#[pallet::storage]
 	type Double<T: Config> = StorageDoubleMap<
-		_, Blake2_128Concat, u32, Twox64Concat, u64, <T::Balance as SomeAssociation>::A, ValueQuery
+		_,
+		Blake2_128Concat,
+		u32,
+		Twox64Concat,
+		u64,
+		<T::Balance as SomeAssociation>::A,
+		ValueQuery,
 	>;
 
 	#[pallet::genesis_config]
@@ -257,9 +277,7 @@ frame_support::construct_runtime!(
 
 #[cfg(test)]
 mod test {
-	use super::Runtime;
-	use super::pallet;
-	use super::pallet_old;
+	use super::{pallet, pallet_old, Runtime};
 	use codec::{Decode, Encode};
 
 	#[test]
@@ -284,14 +302,16 @@ mod test {
 		assert_eq!(
 			pallet_old::Event::<Runtime>::decode(
 				&mut &pallet::Event::<Runtime>::Dummy(10).encode()[..]
-			).unwrap(),
+			)
+			.unwrap(),
 			pallet_old::Event::<Runtime>::Dummy(10),
 		);
 
 		assert_eq!(
 			pallet_old::Call::<Runtime>::decode(
 				&mut &pallet::Call::<Runtime>::set_dummy(10).encode()[..]
-			).unwrap(),
+			)
+			.unwrap(),
 			pallet_old::Call::<Runtime>::set_dummy(10),
 		);
 	}
diff --git a/frame/support/test/tests/pallet_compatibility_instance.rs b/frame/support/test/tests/pallet_compatibility_instance.rs
index fd5d5fb7fdbb..2d92920b81d8 100644
--- a/frame/support/test/tests/pallet_compatibility_instance.rs
+++ b/frame/support/test/tests/pallet_compatibility_instance.rs
@@ -17,7 +17,7 @@
 
 mod pallet_old {
 	use frame_support::{
-		decl_storage, decl_error, decl_event, decl_module, weights::Weight, traits::Get, Parameter
+		decl_error, decl_event, decl_module, decl_storage, traits::Get, weights::Weight, Parameter,
 	};
 	use frame_system::ensure_root;
 
@@ -39,7 +39,10 @@ mod pallet_old {
 	}
 
 	decl_event!(
-		pub enum Event<T, I = DefaultInstance> where Balance = <T as Config<I>>::Balance {
+		pub enum Event<T, I = DefaultInstance>
+		where
+			Balance = <T as Config<I>>::Balance,
+		{
 			/// Dummy event, just here so there's a generic type that's used.
 			Dummy(Balance),
 		}
@@ -83,12 +86,15 @@ mod pallet_old {
 #[frame_support::pallet]
 pub mod pallet {
 	use frame_support::pallet_prelude::*;
-	use frame_system::pallet_prelude::*;
-	use frame_system::ensure_root;
+	use frame_system::{ensure_root, pallet_prelude::*};
 
 	#[pallet::config]
 	pub trait Config<I: 'static = ()>: frame_system::Config {
-		type Balance: Parameter + codec::HasCompact + From<u32> + Into<Weight> + Default
+		type Balance: Parameter
+			+ codec::HasCompact
+			+ From<u32>
+			+ Into<Weight>
+			+ Default
 			+ MaybeSerializeDeserialize;
 		#[pallet::constant]
 		type SomeConst: Get<Self::Balance>;
@@ -115,7 +121,7 @@ pub mod pallet {
 		#[pallet::weight(<T::Balance as Into<Weight>>::into(new_value.clone()))]
 		pub fn set_dummy(
 			origin: OriginFor<T>,
-			#[pallet::compact] new_value: T::Balance
+			#[pallet::compact] new_value: T::Balance,
 		) -> DispatchResultWithPostInfo {
 			ensure_root(origin)?;
 
@@ -151,12 +157,14 @@ pub mod pallet {
 	#[pallet::storage]
 	type Foo<T: Config<I>, I: 'static = ()> =
 		StorageValue<_, T::Balance, ValueQuery, OnFooEmpty<T, I>>;
-	#[pallet::type_value] pub fn OnFooEmpty<T: Config<I>, I: 'static>() -> T::Balance { 3.into() }
+	#[pallet::type_value]
+	pub fn OnFooEmpty<T: Config<I>, I: 'static>() -> T::Balance {
+		3.into()
+	}
 
 	#[pallet::storage]
-	type Double<T, I = ()> = StorageDoubleMap<
-		_, Blake2_128Concat, u32, Twox64Concat, u64, u16, ValueQuery
-	>;
+	type Double<T, I = ()> =
+		StorageDoubleMap<_, Blake2_128Concat, u32, Twox64Concat, u64, u16, ValueQuery>;
 
 	#[pallet::genesis_config]
 	pub struct GenesisConfig<T: Config<I>, I: 'static = ()> {
@@ -272,9 +280,7 @@ frame_support::construct_runtime!(
 
 #[cfg(test)]
 mod test {
-	use super::Runtime;
-	use super::pallet;
-	use super::pallet_old;
+	use super::{pallet, pallet_old, Runtime};
 	use codec::{Decode, Encode};
 
 	#[test]
@@ -288,11 +294,11 @@ mod test {
 			_ => unreachable!(),
 		};
 		for i in vec![1, 3, 5].into_iter() {
-			pretty_assertions::assert_eq!(modules[i].storage, modules[i+1].storage);
-			pretty_assertions::assert_eq!(modules[i].calls, modules[i+1].calls);
-			pretty_assertions::assert_eq!(modules[i].event, modules[i+1].event);
-			pretty_assertions::assert_eq!(modules[i].constants, modules[i+1].constants);
-			pretty_assertions::assert_eq!(modules[i].errors, modules[i+1].errors);
+			pretty_assertions::assert_eq!(modules[i].storage, modules[i + 1].storage);
+			pretty_assertions::assert_eq!(modules[i].calls, modules[i + 1].calls);
+			pretty_assertions::assert_eq!(modules[i].event, modules[i + 1].event);
+			pretty_assertions::assert_eq!(modules[i].constants, modules[i + 1].constants);
+			pretty_assertions::assert_eq!(modules[i].errors, modules[i + 1].errors);
 		}
 	}
 
@@ -301,14 +307,16 @@ mod test {
 		assert_eq!(
 			pallet_old::Event::<Runtime>::decode(
 				&mut &pallet::Event::<Runtime>::Dummy(10).encode()[..]
-			).unwrap(),
+			)
+			.unwrap(),
 			pallet_old::Event::<Runtime>::Dummy(10),
 		);
 
 		assert_eq!(
 			pallet_old::Call::<Runtime>::decode(
 				&mut &pallet::Call::<Runtime>::set_dummy(10).encode()[..]
-			).unwrap(),
+			)
+			.unwrap(),
 			pallet_old::Call::<Runtime>::set_dummy(10),
 		);
 	}
diff --git a/frame/support/test/tests/pallet_instance.rs b/frame/support/test/tests/pallet_instance.rs
index 11f9497b7bec..3181f54f06a9 100644
--- a/frame/support/test/tests/pallet_instance.rs
+++ b/frame/support/test/tests/pallet_instance.rs
@@ -16,21 +16,24 @@
 // limitations under the License.
 
 use frame_support::{
-	weights::{DispatchInfo, DispatchClass, Pays, GetDispatchInfo},
-	traits::{
-		GetCallName, GetPalletVersion, OnInitialize, OnFinalize, OnRuntimeUpgrade, OnGenesis,
-	},
 	dispatch::UnfilteredDispatchable,
 	storage::unhashed,
+	traits::{
+		GetCallName, GetPalletVersion, OnFinalize, OnGenesis, OnInitialize, OnRuntimeUpgrade,
+	},
+	weights::{DispatchClass, DispatchInfo, GetDispatchInfo, Pays},
+};
+use sp_io::{
+	hashing::{blake2_128, twox_128, twox_64},
+	TestExternalities,
 };
 use sp_runtime::DispatchError;
-use sp_io::{TestExternalities, hashing::{twox_64, twox_128, blake2_128}};
 
 #[frame_support::pallet]
 pub mod pallet {
-	use sp_std::any::TypeId;
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
+	use sp_std::any::TypeId;
 
 	type BalanceOf<T, I> = <T as Config<I>>::Balance;
 
@@ -73,15 +76,17 @@ pub mod pallet {
 				31
 			}
 		}
-		fn integrity_test() {
-		}
+		fn integrity_test() {}
 	}
 
 	#[pallet::call]
 	impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		/// Doc comment put in metadata
 		#[pallet::weight(Weight::from(*_foo))]
-		pub fn foo(origin: OriginFor<T>, #[pallet::compact] _foo: u32) -> DispatchResultWithPostInfo {
+		pub fn foo(
+			origin: OriginFor<T>,
+			#[pallet::compact] _foo: u32,
+		) -> DispatchResultWithPostInfo {
 			let _ = origin;
 			Self::deposit_event(Event::Something(3));
 			Ok(().into())
@@ -92,14 +97,13 @@ pub mod pallet {
 		#[frame_support::transactional]
 		pub fn foo_transactional(
 			origin: OriginFor<T>,
-			#[pallet::compact] _foo: u32
+			#[pallet::compact] _foo: u32,
 		) -> DispatchResultWithPostInfo {
 			let _ = origin;
 			Ok(().into())
 		}
 	}
 
-
 	#[pallet::error]
 	pub enum Error<T, I = ()> {
 		/// doc comment put into metadata
@@ -140,14 +144,8 @@ pub mod pallet {
 
 	#[pallet::storage]
 	#[pallet::getter(fn nmap2)]
-	pub type NMap2<T, I = ()> = StorageNMap<
-		_,
-		(
-			storage::Key<Twox64Concat, u16>,
-			storage::Key<Blake2_128Concat, u32>,
-		),
-		u64,
-	>;
+	pub type NMap2<T, I = ()> =
+		StorageNMap<_, (storage::Key<Twox64Concat, u16>, storage::Key<Blake2_128Concat, u32>), u64>;
 
 	#[pallet::genesis_config]
 	#[derive(Default)]
@@ -156,7 +154,7 @@ pub mod pallet {
 	}
 
 	#[pallet::genesis_build]
-	impl<T: Config<I>, I:'static> GenesisBuild<T, I> for GenesisConfig {
+	impl<T: Config<I>, I: 'static> GenesisBuild<T, I> for GenesisConfig {
 		fn build(&self) {}
 	}
 
@@ -169,7 +167,7 @@ pub mod pallet {
 		type Call = Call<T, I>;
 		fn validate_unsigned(
 			_source: TransactionSource,
-			_call: &Self::Call
+			_call: &Self::Call,
 		) -> TransactionValidity {
 			Err(TransactionValidityError::Invalid(InvalidTransaction::Call))
 		}
@@ -193,8 +191,7 @@ pub mod pallet {
 
 	#[derive(codec::Encode, sp_runtime::RuntimeDebug)]
 	#[cfg_attr(feature = "std", derive(codec::Decode))]
-	pub enum InherentError {
-	}
+	pub enum InherentError {}
 
 	impl frame_support::inherent::IsFatalError for InherentError {
 		fn is_fatal_error(&self) -> bool {
@@ -232,9 +229,7 @@ pub mod pallet2 {
 
 	impl<T: Config<I>, I: 'static> Default for GenesisConfig<T, I> {
 		fn default() -> Self {
-			GenesisConfig {
-				phantom: Default::default(),
-			}
+			GenesisConfig { phantom: Default::default() }
 		}
 	}
 
@@ -245,7 +240,7 @@ pub mod pallet2 {
 }
 
 frame_support::parameter_types!(
-	pub const MyGetParam: u32= 10;
+	pub const MyGetParam: u32 = 10;
 	pub const BlockHashCount: u32 = 250;
 );
 
@@ -276,12 +271,12 @@ impl frame_system::Config for Runtime {
 }
 impl pallet::Config for Runtime {
 	type Event = Event;
-	type MyGetParam= MyGetParam;
+	type MyGetParam = MyGetParam;
 	type Balance = u64;
 }
 impl pallet::Config<pallet::Instance1> for Runtime {
 	type Event = Event;
-	type MyGetParam= MyGetParam;
+	type MyGetParam = MyGetParam;
 	type Balance = u64;
 }
 impl pallet2::Config for Runtime {
@@ -316,26 +311,15 @@ fn call_expand() {
 	let call_foo = pallet::Call::<Runtime>::foo(3);
 	assert_eq!(
 		call_foo.get_dispatch_info(),
-		DispatchInfo {
-			weight: 3,
-			class: DispatchClass::Normal,
-			pays_fee: Pays::Yes,
-		}
+		DispatchInfo { weight: 3, class: DispatchClass::Normal, pays_fee: Pays::Yes }
 	);
 	assert_eq!(call_foo.get_call_name(), "foo");
-	assert_eq!(
-		pallet::Call::<Runtime>::get_call_names(),
-		&["foo", "foo_transactional"],
-	);
+	assert_eq!(pallet::Call::<Runtime>::get_call_names(), &["foo", "foo_transactional"],);
 
 	let call_foo = pallet::Call::<Runtime, pallet::Instance1>::foo(3);
 	assert_eq!(
 		call_foo.get_dispatch_info(),
-		DispatchInfo {
-			weight: 3,
-			class: DispatchClass::Normal,
-			pays_fee: Pays::Yes,
-		}
+		DispatchInfo { weight: 3, class: DispatchClass::Normal, pays_fee: Pays::Yes }
 	);
 	assert_eq!(call_foo.get_call_name(), "foo");
 	assert_eq!(
@@ -356,11 +340,7 @@ fn error_expand() {
 	);
 	assert_eq!(
 		DispatchError::from(pallet::Error::<Runtime>::InsufficientProposersBalance),
-		DispatchError::Module {
-			index: 1,
-			error: 0,
-			message: Some("InsufficientProposersBalance"),
-		},
+		DispatchError::Module { index: 1, error: 0, message: Some("InsufficientProposersBalance") },
 	);
 
 	assert_eq!(
@@ -368,16 +348,16 @@ fn error_expand() {
 		String::from("InsufficientProposersBalance"),
 	);
 	assert_eq!(
-		<&'static str>::from(pallet::Error::<Runtime, pallet::Instance1>::InsufficientProposersBalance),
+		<&'static str>::from(
+			pallet::Error::<Runtime, pallet::Instance1>::InsufficientProposersBalance
+		),
 		"InsufficientProposersBalance",
 	);
 	assert_eq!(
-		DispatchError::from(pallet::Error::<Runtime, pallet::Instance1>::InsufficientProposersBalance),
-		DispatchError::Module {
-			index: 2,
-			error: 0,
-			message: Some("InsufficientProposersBalance"),
-		},
+		DispatchError::from(
+			pallet::Error::<Runtime, pallet::Instance1>::InsufficientProposersBalance
+		),
+		DispatchError::Module { index: 2, error: 0, message: Some("InsufficientProposersBalance") },
 	);
 }
 
@@ -400,7 +380,9 @@ fn pallet_expand_deposit_event() {
 
 	TestExternalities::default().execute_with(|| {
 		frame_system::Pallet::<Runtime>::set_block_number(1);
-		pallet::Call::<Runtime, pallet::Instance1>::foo(3).dispatch_bypass_filter(None.into()).unwrap();
+		pallet::Call::<Runtime, pallet::Instance1>::foo(3)
+			.dispatch_bypass_filter(None.into())
+			.unwrap();
 		assert_eq!(
 			frame_system::Pallet::<Runtime>::events()[0].event,
 			Event::Instance1Example(pallet::Event::Something(3)),
@@ -410,8 +392,7 @@ fn pallet_expand_deposit_event() {
 
 #[test]
 fn storage_expand() {
-	use frame_support::pallet_prelude::*;
-	use frame_support::storage::StoragePrefixedMap;
+	use frame_support::{pallet_prelude::*, storage::StoragePrefixedMap};
 
 	fn twox_64_concat(d: &[u8]) -> Vec<u8> {
 		let mut v = twox_64(d).to_vec();
@@ -585,8 +566,8 @@ fn pallet_on_genesis() {
 
 #[test]
 fn metadata() {
-	use frame_metadata::*;
 	use codec::{Decode, Encode};
+	use frame_metadata::*;
 
 	let expected_pallet_metadata = ModuleMetadata {
 		index: 1,
@@ -656,9 +637,7 @@ fn metadata() {
 					modifier: StorageEntryModifier::Optional,
 					ty: StorageEntryType::NMap {
 						keys: DecodeDifferent::Decoded(vec!["u8".to_string()]),
-						hashers: DecodeDifferent::Decoded(vec![
-							StorageHasher::Blake2_128Concat,
-						]),
+						hashers: DecodeDifferent::Decoded(vec![StorageHasher::Blake2_128Concat]),
 						value: DecodeDifferent::Decoded("u32".to_string()),
 					},
 					default: DecodeDifferent::Decoded(vec![0]),
@@ -668,10 +647,7 @@ fn metadata() {
 					name: DecodeDifferent::Decoded("NMap2".to_string()),
 					modifier: StorageEntryModifier::Optional,
 					ty: StorageEntryType::NMap {
-						keys: DecodeDifferent::Decoded(vec![
-							"u16".to_string(),
-							"u32".to_string(),
-						]),
+						keys: DecodeDifferent::Decoded(vec!["u16".to_string(), "u32".to_string()]),
 						hashers: DecodeDifferent::Decoded(vec![
 							StorageHasher::Twox64Concat,
 							StorageHasher::Blake2_128Concat,
@@ -686,33 +662,31 @@ fn metadata() {
 		calls: Some(DecodeDifferent::Decoded(vec![
 			FunctionMetadata {
 				name: DecodeDifferent::Decoded("foo".to_string()),
-				arguments: DecodeDifferent::Decoded(vec![
-					FunctionArgumentMetadata {
-						name: DecodeDifferent::Decoded("_foo".to_string()),
-						ty: DecodeDifferent::Decoded("Compact<u32>".to_string()),
-					}
-				]),
+				arguments: DecodeDifferent::Decoded(vec![FunctionArgumentMetadata {
+					name: DecodeDifferent::Decoded("_foo".to_string()),
+					ty: DecodeDifferent::Decoded("Compact<u32>".to_string()),
+				}]),
 				documentation: DecodeDifferent::Decoded(vec![
-					" Doc comment put in metadata".to_string(),
+					" Doc comment put in metadata".to_string()
 				]),
 			},
 			FunctionMetadata {
 				name: DecodeDifferent::Decoded("foo_transactional".to_string()),
-				arguments: DecodeDifferent::Decoded(vec![
-					FunctionArgumentMetadata {
-						name: DecodeDifferent::Decoded("_foo".to_string()),
-						ty: DecodeDifferent::Decoded("Compact<u32>".to_string()),
-					}
-				]),
+				arguments: DecodeDifferent::Decoded(vec![FunctionArgumentMetadata {
+					name: DecodeDifferent::Decoded("_foo".to_string()),
+					ty: DecodeDifferent::Decoded("Compact<u32>".to_string()),
+				}]),
 				documentation: DecodeDifferent::Decoded(vec![
-					" Doc comment put in metadata".to_string(),
+					" Doc comment put in metadata".to_string()
 				]),
 			},
 		])),
 		event: Some(DecodeDifferent::Decoded(vec![
 			EventMetadata {
 				name: DecodeDifferent::Decoded("Proposed".to_string()),
-				arguments: DecodeDifferent::Decoded(vec!["<T as frame_system::Config>::AccountId".to_string()]),
+				arguments: DecodeDifferent::Decoded(vec![
+					"<T as frame_system::Config>::AccountId".to_string()
+				]),
 				documentation: DecodeDifferent::Decoded(vec![
 					" doc comment put in metadata".to_string()
 				]),
@@ -720,9 +694,7 @@ fn metadata() {
 			EventMetadata {
 				name: DecodeDifferent::Decoded("Spending".to_string()),
 				arguments: DecodeDifferent::Decoded(vec!["Balance".to_string()]),
-				documentation: DecodeDifferent::Decoded(vec![
-					" doc".to_string()
-				]),
+				documentation: DecodeDifferent::Decoded(vec![" doc".to_string()]),
 			},
 			EventMetadata {
 				name: DecodeDifferent::Decoded("Something".to_string()),
@@ -730,26 +702,23 @@ fn metadata() {
 				documentation: DecodeDifferent::Decoded(vec![]),
 			},
 		])),
-		constants: DecodeDifferent::Decoded(vec![
-			ModuleConstantMetadata {
-				name: DecodeDifferent::Decoded("MyGetParam".to_string()),
-				ty: DecodeDifferent::Decoded("u32".to_string()),
-				value: DecodeDifferent::Decoded(vec![10, 0, 0, 0]),
-				documentation: DecodeDifferent::Decoded(vec![]),
-			},
-		]),
-		errors: DecodeDifferent::Decoded(vec![
-			ErrorMetadata {
-				name: DecodeDifferent::Decoded("InsufficientProposersBalance".to_string()),
-				documentation: DecodeDifferent::Decoded(vec![
-					" doc comment put into metadata".to_string(),
-				]),
-			},
-		]),
+		constants: DecodeDifferent::Decoded(vec![ModuleConstantMetadata {
+			name: DecodeDifferent::Decoded("MyGetParam".to_string()),
+			ty: DecodeDifferent::Decoded("u32".to_string()),
+			value: DecodeDifferent::Decoded(vec![10, 0, 0, 0]),
+			documentation: DecodeDifferent::Decoded(vec![]),
+		}]),
+		errors: DecodeDifferent::Decoded(vec![ErrorMetadata {
+			name: DecodeDifferent::Decoded("InsufficientProposersBalance".to_string()),
+			documentation: DecodeDifferent::Decoded(vec![
+				" doc comment put into metadata".to_string()
+			]),
+		}]),
 	};
 
 	let mut expected_pallet_instance1_metadata = expected_pallet_metadata.clone();
-	expected_pallet_instance1_metadata.name = DecodeDifferent::Decoded("Instance1Example".to_string());
+	expected_pallet_instance1_metadata.name =
+		DecodeDifferent::Decoded("Instance1Example".to_string());
 	expected_pallet_instance1_metadata.index = 2;
 	match expected_pallet_instance1_metadata.storage {
 		Some(DecodeDifferent::Decoded(ref mut storage_meta)) => {
@@ -758,7 +727,6 @@ fn metadata() {
 		_ => unreachable!(),
 	}
 
-
 	let metadata = match Runtime::metadata().1 {
 		RuntimeMetadata::V13(metadata) => metadata,
 		_ => panic!("metadata has been bump, test needs to be updated"),
@@ -781,9 +749,15 @@ fn metadata() {
 fn test_pallet_info_access() {
 	assert_eq!(<System as frame_support::traits::PalletInfoAccess>::name(), "System");
 	assert_eq!(<Example as frame_support::traits::PalletInfoAccess>::name(), "Example");
-	assert_eq!(<Instance1Example as frame_support::traits::PalletInfoAccess>::name(), "Instance1Example");
+	assert_eq!(
+		<Instance1Example as frame_support::traits::PalletInfoAccess>::name(),
+		"Instance1Example"
+	);
 	assert_eq!(<Example2 as frame_support::traits::PalletInfoAccess>::name(), "Example2");
-	assert_eq!(<Instance1Example2 as frame_support::traits::PalletInfoAccess>::name(), "Instance1Example2");
+	assert_eq!(
+		<Instance1Example2 as frame_support::traits::PalletInfoAccess>::name(),
+		"Instance1Example2"
+	);
 
 	assert_eq!(<System as frame_support::traits::PalletInfoAccess>::index(), 0);
 	assert_eq!(<Example as frame_support::traits::PalletInfoAccess>::index(), 1);
diff --git a/frame/support/test/tests/pallet_ui/genesis_default_not_satisfied.stderr b/frame/support/test/tests/pallet_ui/genesis_default_not_satisfied.stderr
index 8a6ee8b8f504..4bc3cfdcbf9b 100644
--- a/frame/support/test/tests/pallet_ui/genesis_default_not_satisfied.stderr
+++ b/frame/support/test/tests/pallet_ui/genesis_default_not_satisfied.stderr
@@ -6,5 +6,5 @@ error[E0277]: the trait bound `pallet::GenesisConfig: std::default::Default` is
     |
    ::: $WORKSPACE/frame/support/src/traits/hooks.rs
     |
-    | pub trait GenesisBuild<T, I=()>: Default + MaybeSerializeDeserialize {
-    |                                  ------- required by this bound in `GenesisBuild`
+    | pub trait GenesisBuild<T, I = ()>: Default + MaybeSerializeDeserialize {
+    |                                    ------- required by this bound in `GenesisBuild`
diff --git a/frame/support/test/tests/pallet_ui/hooks_invalid_item.stderr b/frame/support/test/tests/pallet_ui/hooks_invalid_item.stderr
index 3812b433e20c..23651faa59d5 100644
--- a/frame/support/test/tests/pallet_ui/hooks_invalid_item.stderr
+++ b/frame/support/test/tests/pallet_ui/hooks_invalid_item.stderr
@@ -5,9 +5,9 @@ error[E0107]: missing generics for trait `Hooks`
     |                     ^^^^^ expected 1 type argument
     |
 note: trait defined here, with 1 type parameter: `BlockNumber`
-   --> $DIR/hooks.rs:206:11
+   --> $DIR/hooks.rs:212:11
     |
-206 | pub trait Hooks<BlockNumber> {
+212 | pub trait Hooks<BlockNumber> {
     |           ^^^^^ -----------
 help: use angle brackets to add missing type argument
     |
diff --git a/frame/support/test/tests/pallet_version.rs b/frame/support/test/tests/pallet_version.rs
index ed0bf52a0346..5048f47f6752 100644
--- a/frame/support/test/tests/pallet_version.rs
+++ b/frame/support/test/tests/pallet_version.rs
@@ -17,15 +17,22 @@
 
 //! Tests related to the pallet version.
 
-#![recursion_limit="128"]
+#![recursion_limit = "128"]
 
 use codec::{Decode, Encode};
-use sp_runtime::{generic, traits::{BlakeTwo256, Verify}, BuildStorage};
 use frame_support::{
-	traits::{PALLET_VERSION_STORAGE_KEY_POSTFIX, PalletVersion, OnRuntimeUpgrade, GetPalletVersion},
-	crate_to_pallet_version, weights::Weight,
+	crate_to_pallet_version,
+	traits::{
+		GetPalletVersion, OnRuntimeUpgrade, PalletVersion, PALLET_VERSION_STORAGE_KEY_POSTFIX,
+	},
+	weights::Weight,
+};
+use sp_core::{sr25519, H256};
+use sp_runtime::{
+	generic,
+	traits::{BlakeTwo256, Verify},
+	BuildStorage,
 };
-use sp_core::{H256, sr25519};
 
 /// A version that we will check for in the tests
 const SOME_TEST_VERSION: PalletVersion = PalletVersion { major: 3000, minor: 30, patch: 13 };
@@ -47,7 +54,7 @@ mod module1 {
 mod module2 {
 	use super::*;
 
-	pub trait Config<I=DefaultInstance>: frame_system::Config {}
+	pub trait Config<I = DefaultInstance>: frame_system::Config {}
 
 	frame_support::decl_module! {
 		pub struct Module<T: Config<I>, I: Instance=DefaultInstance> for enum Call where
@@ -82,8 +89,7 @@ mod pallet3 {
 	use frame_system::pallet_prelude::*;
 
 	#[pallet::config]
-	pub trait Config: frame_system::Config {
-	}
+	pub trait Config: frame_system::Config {}
 
 	#[pallet::pallet]
 	pub struct Pallet<T>(_);
@@ -91,13 +97,12 @@ mod pallet3 {
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
 		fn on_runtime_upgrade() -> Weight {
-			return 3;
+			return 3
 		}
 	}
 
 	#[pallet::call]
-	impl<T: Config> Pallet<T> {
-	}
+	impl<T: Config> Pallet<T> {}
 }
 
 #[frame_support::pallet]
@@ -106,22 +111,20 @@ mod pallet4 {
 	use frame_system::pallet_prelude::*;
 
 	#[pallet::config]
-	pub trait Config<I: 'static = ()>: frame_system::Config {
-	}
+	pub trait Config<I: 'static = ()>: frame_system::Config {}
 
 	#[pallet::pallet]
-	pub struct Pallet<T, I=()>(PhantomData<(T, I)>);
+	pub struct Pallet<T, I = ()>(PhantomData<(T, I)>);
 
 	#[pallet::hooks]
 	impl<T: Config<I>, I: 'static> Hooks<BlockNumberFor<T>> for Pallet<T, I> {
 		fn on_runtime_upgrade() -> Weight {
-			return 3;
+			return 3
 		}
 	}
 
 	#[pallet::call]
-	impl<T: Config<I>, I: 'static> Pallet<T, I> {
-	}
+	impl<T: Config<I>, I: 'static> Pallet<T, I> {}
 }
 
 impl module1::Config for Runtime {}
@@ -210,8 +213,8 @@ fn get_pallet_version_storage_key_for_pallet(pallet: &str) -> [u8; 32] {
 fn check_pallet_version(pallet: &str) {
 	let key = get_pallet_version_storage_key_for_pallet(pallet);
 	let value = sp_io::storage::get(&key).expect("Pallet version exists");
-	let version = PalletVersion::decode(&mut &value[..])
-		.expect("Pallet version is encoded correctly");
+	let version =
+		PalletVersion::decode(&mut &value[..]).expect("Pallet version is encoded correctly");
 
 	assert_eq!(crate_to_pallet_version!(), version);
 }
diff --git a/frame/support/test/tests/pallet_with_name_trait_is_valid.rs b/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
index 665bbc2b5c51..867d95274101 100644
--- a/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
+++ b/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
@@ -28,7 +28,10 @@ frame_support::decl_storage! {
 }
 
 frame_support::decl_event!(
-	pub enum Event<T> where B = <T as Trait>::Balance {
+	pub enum Event<T>
+	where
+		B = <T as Trait>::Balance,
+	{
 		Dummy(B),
 	}
 );
diff --git a/frame/support/test/tests/storage_transaction.rs b/frame/support/test/tests/storage_transaction.rs
index b518c60e957c..4e97a87377b1 100644
--- a/frame/support/test/tests/storage_transaction.rs
+++ b/frame/support/test/tests/storage_transaction.rs
@@ -16,8 +16,10 @@
 // limitations under the License.
 
 use frame_support::{
-	assert_ok, assert_noop, transactional, StorageMap, StorageValue,
-	dispatch::{DispatchError, DispatchResult}, storage::{with_transaction, TransactionOutcome::*},
+	assert_noop, assert_ok,
+	dispatch::{DispatchError, DispatchResult},
+	storage::{with_transaction, TransactionOutcome::*},
+	transactional, StorageMap, StorageValue,
 };
 use sp_io::TestExternalities;
 use sp_std::result;
@@ -41,7 +43,7 @@ frame_support::decl_module! {
 	}
 }
 
-frame_support::decl_storage!{
+frame_support::decl_storage! {
 	trait Store for Module<T: Config> as StorageTransactions {
 		pub Value: u32;
 		pub Map: map hasher(twox_64_concat) String => u32;
@@ -62,7 +64,6 @@ impl Config for Runtime {}
 #[test]
 fn storage_transaction_basic_commit() {
 	TestExternalities::default().execute_with(|| {
-
 		assert_eq!(Value::get(), 0);
 		assert!(!Map::contains_key("val0"));
 
@@ -82,7 +83,6 @@ fn storage_transaction_basic_commit() {
 #[test]
 fn storage_transaction_basic_rollback() {
 	TestExternalities::default().execute_with(|| {
-
 		assert_eq!(Value::get(), 0);
 		assert_eq!(Map::get("val0"), 0);
 
diff --git a/frame/support/test/tests/system.rs b/frame/support/test/tests/system.rs
index c4d7cf01ae21..a0947e72b194 100644
--- a/frame/support/test/tests/system.rs
+++ b/frame/support/test/tests/system.rs
@@ -16,7 +16,9 @@
 // limitations under the License.
 
 use frame_support::{
-	codec::{Encode, Decode, EncodeLike}, traits::Get, weights::RuntimeDbWeight,
+	codec::{Decode, Encode, EncodeLike},
+	traits::Get,
+	weights::RuntimeDbWeight,
 };
 
 pub trait Config: 'static + Eq + Clone {
@@ -45,7 +47,10 @@ impl<T: Config> Module<T> {
 }
 
 frame_support::decl_event!(
-	pub enum Event<T> where BlockNumber = <T as Config>::BlockNumber {
+	pub enum Event<T>
+	where
+		BlockNumber = <T as Config>::BlockNumber,
+	{
 		ExtrinsicSuccess,
 		ExtrinsicFailed,
 		Ignore(BlockNumber),
@@ -83,7 +88,8 @@ pub type Origin<T> = RawOrigin<<T as Config>::AccountId>;
 
 #[allow(dead_code)]
 pub fn ensure_root<OuterOrigin, AccountId>(o: OuterOrigin) -> Result<(), &'static str>
-	where OuterOrigin: Into<Result<RawOrigin<AccountId>, OuterOrigin>>
+where
+	OuterOrigin: Into<Result<RawOrigin<AccountId>, OuterOrigin>>,
 {
 	o.into().map(|_| ()).map_err(|_| "bad origin: expected to be a root origin")
 }
diff --git a/frame/system/benches/bench.rs b/frame/system/benches/bench.rs
index 02ea48bdde03..e3f60733a623 100644
--- a/frame/system/benches/bench.rs
+++ b/frame/system/benches/bench.rs
@@ -15,11 +15,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use criterion::{Criterion, criterion_group, criterion_main, black_box};
+use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use frame_support::{decl_event, decl_module};
 use frame_system as system;
-use frame_support::{decl_module, decl_event};
 use sp_core::H256;
-use sp_runtime::{Perbill, traits::{BlakeTwo256, IdentityLookup}, testing::Header};
+use sp_runtime::{
+	testing::Header,
+	traits::{BlakeTwo256, IdentityLookup},
+	Perbill,
+};
 
 mod module {
 	use super::*;
@@ -104,17 +108,18 @@ fn deposit_events(n: usize) {
 	let mut t = new_test_ext();
 	t.execute_with(|| {
 		for _ in 0..n {
-			module::Module::<Runtime>::deposit_event(
-				module::Event::Complex(vec![1, 2, 3], 2, 3, 899)
-			);
+			module::Module::<Runtime>::deposit_event(module::Event::Complex(
+				vec![1, 2, 3],
+				2,
+				3,
+				899,
+			));
 		}
 	});
 }
 
 fn sr_system_benchmark(c: &mut Criterion) {
-	c.bench_function("deposit 100 events", |b| {
-		b.iter(|| deposit_events(black_box(100)))
-	});
+	c.bench_function("deposit 100 events", |b| b.iter(|| deposit_events(black_box(100))));
 }
 
 criterion_group!(benches, sr_system_benchmark);
diff --git a/frame/system/benchmarking/src/lib.rs b/frame/system/benchmarking/src/lib.rs
index 7146bcd60645..4b25dcd06a63 100644
--- a/frame/system/benchmarking/src/lib.rs
+++ b/frame/system/benchmarking/src/lib.rs
@@ -20,17 +20,12 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use codec::Encode;
-use sp_std::vec;
-use sp_std::prelude::*;
-use sp_core::{ChangesTrieConfiguration, storage::well_known_keys};
+use frame_benchmarking::{benchmarks, impl_benchmark_test_suite, whitelisted_caller};
+use frame_support::{storage, traits::Get, weights::DispatchClass};
+use frame_system::{Call, DigestItemOf, Pallet as System, RawOrigin};
+use sp_core::{storage::well_known_keys, ChangesTrieConfiguration};
 use sp_runtime::traits::Hash;
-use frame_benchmarking::{benchmarks, whitelisted_caller, impl_benchmark_test_suite};
-use frame_support::{
-	storage,
-	traits::Get,
-	weights::DispatchClass,
-};
-use frame_system::{Pallet as System, Call, RawOrigin, DigestItemOf};
+use sp_std::{prelude::*, vec};
 
 mod mock;
 
@@ -144,8 +139,4 @@ benchmarks! {
 	}
 }
 
-impl_benchmark_test_suite!(
-	Pallet,
-	crate::mock::new_test_ext(),
-	crate::mock::Test,
-);
+impl_benchmark_test_suite!(Pallet, crate::mock::new_test_ext(), crate::mock::Test,);
diff --git a/frame/system/src/extensions/check_genesis.rs b/frame/system/src/extensions/check_genesis.rs
index aa6c1358790a..4f561f17c356 100644
--- a/frame/system/src/extensions/check_genesis.rs
+++ b/frame/system/src/extensions/check_genesis.rs
@@ -15,8 +15,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use codec::{Encode, Decode};
 use crate::{Config, Pallet};
+use codec::{Decode, Encode};
 use sp_runtime::{
 	traits::{SignedExtension, Zero},
 	transaction_validity::TransactionValidityError,
diff --git a/frame/system/src/extensions/check_mortality.rs b/frame/system/src/extensions/check_mortality.rs
index b3e4c4ecfda8..6596939eb9d6 100644
--- a/frame/system/src/extensions/check_mortality.rs
+++ b/frame/system/src/extensions/check_mortality.rs
@@ -15,13 +15,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use codec::{Encode, Decode};
-use crate::{Config, Pallet, BlockHash};
+use crate::{BlockHash, Config, Pallet};
+use codec::{Decode, Encode};
 use sp_runtime::{
 	generic::Era,
-	traits::{SignedExtension, DispatchInfoOf, SaturatedConversion},
+	traits::{DispatchInfoOf, SaturatedConversion, SignedExtension},
 	transaction_validity::{
-		ValidTransaction, TransactionValidityError, InvalidTransaction, TransactionValidity,
+		InvalidTransaction, TransactionValidity, TransactionValidityError, ValidTransaction,
 	},
 };
 
@@ -84,7 +84,7 @@ impl<T: Config + Send + Sync> SignedExtension for CheckMortality<T> {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use crate::mock::{Test, new_test_ext, System, CALL};
+	use crate::mock::{new_test_ext, System, Test, CALL};
 	use frame_support::weights::{DispatchClass, DispatchInfo, Pays};
 	use sp_core::H256;
 
@@ -93,7 +93,10 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			// future
 			assert_eq!(
-				CheckMortality::<Test>::from(Era::mortal(4, 2)).additional_signed().err().unwrap(),
+				CheckMortality::<Test>::from(Era::mortal(4, 2))
+					.additional_signed()
+					.err()
+					.unwrap(),
 				InvalidTransaction::AncientBirthBlock.into(),
 			);
 
@@ -107,7 +110,8 @@ mod tests {
 	#[test]
 	fn signed_ext_check_era_should_change_longevity() {
 		new_test_ext().execute_with(|| {
-			let normal = DispatchInfo { weight: 100, class: DispatchClass::Normal, pays_fee: Pays::Yes };
+			let normal =
+				DispatchInfo { weight: 100, class: DispatchClass::Normal, pays_fee: Pays::Yes };
 			let len = 0_usize;
 			let ext = (
 				crate::CheckWeight::<Test>::new(),
diff --git a/frame/system/src/extensions/check_nonce.rs b/frame/system/src/extensions/check_nonce.rs
index cb25c3c02788..6eaa9f9e02a4 100644
--- a/frame/system/src/extensions/check_nonce.rs
+++ b/frame/system/src/extensions/check_nonce.rs
@@ -15,14 +15,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use codec::{Encode, Decode};
 use crate::Config;
+use codec::{Decode, Encode};
 use frame_support::weights::DispatchInfo;
 use sp_runtime::{
-	traits::{SignedExtension, DispatchInfoOf, Dispatchable, One},
+	traits::{DispatchInfoOf, Dispatchable, One, SignedExtension},
 	transaction_validity::{
-		ValidTransaction, TransactionValidityError, InvalidTransaction, TransactionValidity,
-		TransactionLongevity,
+		InvalidTransaction, TransactionLongevity, TransactionValidity, TransactionValidityError,
+		ValidTransaction,
 	},
 };
 use sp_std::vec;
@@ -53,8 +53,9 @@ impl<T: Config> sp_std::fmt::Debug for CheckNonce<T> {
 	}
 }
 
-impl<T: Config> SignedExtension for CheckNonce<T> where
-	T::Call: Dispatchable<Info=DispatchInfo>
+impl<T: Config> SignedExtension for CheckNonce<T>
+where
+	T::Call: Dispatchable<Info = DispatchInfo>,
 {
 	type AccountId = T::AccountId;
 	type Call = T::Call;
@@ -62,7 +63,9 @@ impl<T: Config> SignedExtension for CheckNonce<T> where
 	type Pre = ();
 	const IDENTIFIER: &'static str = "CheckNonce";
 
-	fn additional_signed(&self) -> sp_std::result::Result<(), TransactionValidityError> { Ok(()) }
+	fn additional_signed(&self) -> sp_std::result::Result<(), TransactionValidityError> {
+		Ok(())
+	}
 
 	fn pre_dispatch(
 		self,
@@ -73,13 +76,12 @@ impl<T: Config> SignedExtension for CheckNonce<T> where
 	) -> Result<(), TransactionValidityError> {
 		let mut account = crate::Account::<T>::get(who);
 		if self.0 != account.nonce {
-			return Err(
-				if self.0 < account.nonce {
-					InvalidTransaction::Stale
-				} else {
-					InvalidTransaction::Future
-				}.into()
-			)
+			return Err(if self.0 < account.nonce {
+				InvalidTransaction::Stale
+			} else {
+				InvalidTransaction::Future
+			}
+			.into())
 		}
 		account.nonce += T::Index::one();
 		crate::Account::<T>::insert(who, account);
@@ -119,19 +121,22 @@ impl<T: Config> SignedExtension for CheckNonce<T> where
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use crate::mock::{Test, new_test_ext, CALL};
+	use crate::mock::{new_test_ext, Test, CALL};
 	use frame_support::{assert_noop, assert_ok};
 
 	#[test]
 	fn signed_ext_check_nonce_works() {
 		new_test_ext().execute_with(|| {
-			crate::Account::<Test>::insert(1, crate::AccountInfo {
-				nonce: 1,
-				consumers: 0,
-				providers: 0,
-				sufficients: 0,
-				data: 0,
-			});
+			crate::Account::<Test>::insert(
+				1,
+				crate::AccountInfo {
+					nonce: 1,
+					consumers: 0,
+					providers: 0,
+					sufficients: 0,
+					data: 0,
+				},
+			);
 			let info = DispatchInfo::default();
 			let len = 0_usize;
 			// stale
diff --git a/frame/system/src/extensions/check_spec_version.rs b/frame/system/src/extensions/check_spec_version.rs
index e41ce1725a54..7f5629fefa92 100644
--- a/frame/system/src/extensions/check_spec_version.rs
+++ b/frame/system/src/extensions/check_spec_version.rs
@@ -16,11 +16,8 @@
 // limitations under the License.
 
 use crate::{Config, Pallet};
-use codec::{Encode, Decode};
-use sp_runtime::{
-	traits::SignedExtension,
-	transaction_validity::TransactionValidityError,
-};
+use codec::{Decode, Encode};
+use sp_runtime::{traits::SignedExtension, transaction_validity::TransactionValidityError};
 
 /// Ensure the runtime version registered in the transaction is the same as at present.
 #[derive(Encode, Decode, Clone, Eq, PartialEq)]
diff --git a/frame/system/src/extensions/check_tx_version.rs b/frame/system/src/extensions/check_tx_version.rs
index ad23dc7e9dd0..badf0292601b 100644
--- a/frame/system/src/extensions/check_tx_version.rs
+++ b/frame/system/src/extensions/check_tx_version.rs
@@ -16,11 +16,8 @@
 // limitations under the License.
 
 use crate::{Config, Pallet};
-use codec::{Encode, Decode};
-use sp_runtime::{
-	traits::SignedExtension,
-	transaction_validity::TransactionValidityError,
-};
+use codec::{Decode, Encode};
+use sp_runtime::{traits::SignedExtension, transaction_validity::TransactionValidityError};
 
 /// Ensure the transaction version registered in the transaction is the same as at present.
 #[derive(Encode, Decode, Clone, Eq, PartialEq)]
diff --git a/frame/system/src/extensions/check_weight.rs b/frame/system/src/extensions/check_weight.rs
index e01c91317615..40be222c2f87 100644
--- a/frame/system/src/extensions/check_weight.rs
+++ b/frame/system/src/extensions/check_weight.rs
@@ -16,26 +16,27 @@
 // limitations under the License.
 
 use crate::{limits::BlockWeights, Config, Pallet};
-use codec::{Encode, Decode};
+use codec::{Decode, Encode};
+use frame_support::{
+	traits::Get,
+	weights::{priority::FrameTransactionPriority, DispatchClass, DispatchInfo, PostDispatchInfo},
+};
 use sp_runtime::{
-	traits::{SignedExtension, DispatchInfoOf, Dispatchable, PostDispatchInfoOf},
+	traits::{DispatchInfoOf, Dispatchable, PostDispatchInfoOf, SignedExtension},
 	transaction_validity::{
-		ValidTransaction, TransactionValidityError, InvalidTransaction, TransactionValidity,
-		TransactionPriority,
+		InvalidTransaction, TransactionPriority, TransactionValidity, TransactionValidityError,
+		ValidTransaction,
 	},
 	DispatchResult,
 };
-use frame_support::{
-	traits::Get,
-	weights::{PostDispatchInfo, DispatchInfo, DispatchClass, priority::FrameTransactionPriority},
-};
 
 /// Block resource (weight) limit check.
 #[derive(Encode, Decode, Clone, Eq, PartialEq, Default)]
 pub struct CheckWeight<T: Config + Send + Sync>(sp_std::marker::PhantomData<T>);
 
-impl<T: Config + Send + Sync> CheckWeight<T> where
-	T::Call: Dispatchable<Info=DispatchInfo, PostInfo=PostDispatchInfo>,
+impl<T: Config + Send + Sync> CheckWeight<T>
+where
+	T::Call: Dispatchable<Info = DispatchInfo, PostInfo = PostDispatchInfo>,
 {
 	/// Checks if the current extrinsic does not exceed the maximum weight a single extrinsic
 	/// with given `DispatchClass` can have.
@@ -44,9 +45,7 @@ impl<T: Config + Send + Sync> CheckWeight<T> where
 	) -> Result<(), TransactionValidityError> {
 		let max = T::BlockWeights::get().get(info.class).max_extrinsic;
 		match max {
-			Some(max) if info.weight > max => {
-				Err(InvalidTransaction::ExhaustsResources.into())
-			},
+			Some(max) if info.weight > max => Err(InvalidTransaction::ExhaustsResources.into()),
 			_ => Ok(()),
 		}
 	}
@@ -87,8 +86,7 @@ impl<T: Config + Send + Sync> CheckWeight<T> where
 	fn get_priority(info: &DispatchInfoOf<T::Call>) -> TransactionPriority {
 		match info.class {
 			// Normal transaction.
-			DispatchClass::Normal =>
-				FrameTransactionPriority::Normal(info.weight.into()).into(),
+			DispatchClass::Normal => FrameTransactionPriority::Normal(info.weight.into()).into(),
 			// Don't use up the whole priority space, to allow things like `tip` to be taken into
 			// account as well.
 			DispatchClass::Operational =>
@@ -122,10 +120,7 @@ impl<T: Config + Send + Sync> CheckWeight<T> where
 	/// Do the validate checks. This can be applied to both signed and unsigned.
 	///
 	/// It only checks that the block weight and length limit will not exceed.
-	pub fn do_validate(
-		info: &DispatchInfoOf<T::Call>,
-		len: usize,
-	) -> TransactionValidity {
+	pub fn do_validate(info: &DispatchInfoOf<T::Call>, len: usize) -> TransactionValidity {
 		// ignore the next length. If they return `Ok`, then it is below the limit.
 		let _ = Self::check_block_length(info, len)?;
 		// during validation we skip block limit check. Since the `validate_transaction`
@@ -141,17 +136,20 @@ pub fn calculate_consumed_weight<Call>(
 	maximum_weight: BlockWeights,
 	mut all_weight: crate::ConsumedWeight,
 	info: &DispatchInfoOf<Call>,
-) -> Result<crate::ConsumedWeight, TransactionValidityError> where
-	Call: Dispatchable<Info=DispatchInfo, PostInfo=PostDispatchInfo>,
+) -> Result<crate::ConsumedWeight, TransactionValidityError>
+where
+	Call: Dispatchable<Info = DispatchInfo, PostInfo = PostDispatchInfo>,
 {
-	let extrinsic_weight = info.weight.saturating_add(maximum_weight.get(info.class).base_extrinsic);
+	let extrinsic_weight =
+		info.weight.saturating_add(maximum_weight.get(info.class).base_extrinsic);
 	let limit_per_class = maximum_weight.get(info.class);
 
 	// add the weight. If class is unlimited, use saturating add instead of checked one.
 	if limit_per_class.max_total.is_none() && limit_per_class.reserved.is_none() {
 		all_weight.add(extrinsic_weight, info.class)
 	} else {
-		all_weight.checked_add(extrinsic_weight, info.class)
+		all_weight
+			.checked_add(extrinsic_weight, info.class)
 			.map_err(|_| InvalidTransaction::ExhaustsResources)?;
 	}
 
@@ -159,9 +157,7 @@ pub fn calculate_consumed_weight<Call>(
 
 	// Check if we don't exceed per-class allowance
 	match limit_per_class.max_total {
-		Some(max) if per_class > max => {
-			return Err(InvalidTransaction::ExhaustsResources.into());
-		},
+		Some(max) if per_class > max => return Err(InvalidTransaction::ExhaustsResources.into()),
 		// There is no `max_total` limit (`None`),
 		// or we are below the limit.
 		_ => {},
@@ -172,9 +168,8 @@ pub fn calculate_consumed_weight<Call>(
 	if all_weight.total() > maximum_weight.max_block {
 		match limit_per_class.reserved {
 			// We are over the limit in reserved pool.
-			Some(reserved) if per_class > reserved => {
-				return Err(InvalidTransaction::ExhaustsResources.into());
-			}
+			Some(reserved) if per_class > reserved =>
+				return Err(InvalidTransaction::ExhaustsResources.into()),
 			// There is either no limit in reserved pool (`None`),
 			// or we are below the limit.
 			_ => {},
@@ -184,8 +179,9 @@ pub fn calculate_consumed_weight<Call>(
 	Ok(all_weight)
 }
 
-impl<T: Config + Send + Sync> SignedExtension for CheckWeight<T> where
-	T::Call: Dispatchable<Info=DispatchInfo, PostInfo=PostDispatchInfo>
+impl<T: Config + Send + Sync> SignedExtension for CheckWeight<T>
+where
+	T::Call: Dispatchable<Info = DispatchInfo, PostInfo = PostDispatchInfo>,
 {
 	type AccountId = T::AccountId;
 	type Call = T::Call;
@@ -193,7 +189,9 @@ impl<T: Config + Send + Sync> SignedExtension for CheckWeight<T> where
 	type Pre = ();
 	const IDENTIFIER: &'static str = "CheckWeight";
 
-	fn additional_signed(&self) -> sp_std::result::Result<(), TransactionValidityError> { Ok(()) }
+	fn additional_signed(&self) -> sp_std::result::Result<(), TransactionValidityError> {
+		Ok(())
+	}
 
 	fn pre_dispatch(
 		self,
@@ -278,17 +276,24 @@ impl<T: Config + Send + Sync> sp_std::fmt::Debug for CheckWeight<T> {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use crate::{BlockWeight, AllExtrinsicsLen};
-	use crate::mock::{Test, CALL, new_test_ext, System};
+	use crate::{
+		mock::{new_test_ext, System, Test, CALL},
+		AllExtrinsicsLen, BlockWeight,
+	};
+	use frame_support::{
+		assert_err, assert_ok,
+		weights::{Pays, Weight},
+	};
 	use sp_std::marker::PhantomData;
-	use frame_support::{assert_err, assert_ok, weights::{Weight, Pays}};
 
 	fn block_weights() -> crate::limits::BlockWeights {
 		<Test as crate::Config>::BlockWeights::get()
 	}
 
 	fn normal_weight_limit() -> Weight {
-		block_weights().get(DispatchClass::Normal).max_total
+		block_weights()
+			.get(DispatchClass::Normal)
+			.max_total
 			.unwrap_or_else(|| block_weights().max_block)
 	}
 
@@ -334,7 +339,10 @@ mod tests {
 				..Default::default()
 			};
 			let len = 0_usize;
-			assert_err!(CheckWeight::<Test>::do_validate(&max, len), InvalidTransaction::ExhaustsResources);
+			assert_err!(
+				CheckWeight::<Test>::do_validate(&max, len),
+				InvalidTransaction::ExhaustsResources
+			);
 		});
 	}
 
@@ -342,16 +350,15 @@ mod tests {
 	fn operational_extrinsic_limited_by_operational_space_limit() {
 		new_test_ext().execute_with(|| {
 			let weights = block_weights();
-			let operational_limit = weights.get(DispatchClass::Operational).max_total
+			let operational_limit = weights
+				.get(DispatchClass::Operational)
+				.max_total
 				.unwrap_or_else(|| weights.max_block);
 			let base_weight = weights.get(DispatchClass::Normal).base_extrinsic;
 
 			let weight = operational_limit - base_weight;
-			let okay = DispatchInfo {
-				weight,
-				class: DispatchClass::Operational,
-				..Default::default()
-			};
+			let okay =
+				DispatchInfo { weight, class: DispatchClass::Operational, ..Default::default() };
 			let max = DispatchInfo {
 				weight: weight + 1,
 				class: DispatchClass::Operational,
@@ -366,7 +373,10 @@ mod tests {
 					..Default::default()
 				})
 			);
-			assert_err!(CheckWeight::<Test>::do_validate(&max, len), InvalidTransaction::ExhaustsResources);
+			assert_err!(
+				CheckWeight::<Test>::do_validate(&max, len),
+				InvalidTransaction::ExhaustsResources
+			);
 		});
 	}
 
@@ -388,7 +398,11 @@ mod tests {
 			// So normal extrinsic can be 758 weight (-5 for base extrinsic weight)
 			// And Operational can be 256 to produce a full block (-5 for base)
 			let max_normal = DispatchInfo { weight: 753, ..Default::default() };
-			let rest_operational = DispatchInfo { weight: 251, class: DispatchClass::Operational, ..Default::default() };
+			let rest_operational = DispatchInfo {
+				weight: 251,
+				class: DispatchClass::Operational,
+				..Default::default()
+			};
 
 			let len = 0_usize;
 
@@ -407,7 +421,11 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			// We switch the order of `full_block_with_normal_and_operational`
 			let max_normal = DispatchInfo { weight: 753, ..Default::default() };
-			let rest_operational = DispatchInfo { weight: 251, class: DispatchClass::Operational, ..Default::default() };
+			let rest_operational = DispatchInfo {
+				weight: 251,
+				class: DispatchClass::Operational,
+				..Default::default()
+			};
 
 			let len = 0_usize;
 
@@ -425,17 +443,24 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			// An on_initialize takes up the whole block! (Every time!)
 			System::register_extra_weight_unchecked(Weight::max_value(), DispatchClass::Mandatory);
-			let dispatch_normal = DispatchInfo { weight: 251, class: DispatchClass::Normal, ..Default::default() };
-			let dispatch_operational = DispatchInfo { weight: 251, class: DispatchClass::Operational, ..Default::default() };
+			let dispatch_normal =
+				DispatchInfo { weight: 251, class: DispatchClass::Normal, ..Default::default() };
+			let dispatch_operational = DispatchInfo {
+				weight: 251,
+				class: DispatchClass::Operational,
+				..Default::default()
+			};
 			let len = 0_usize;
 
-			assert_err!( CheckWeight::<Test>::do_pre_dispatch(&dispatch_normal, len),
+			assert_err!(
+				CheckWeight::<Test>::do_pre_dispatch(&dispatch_normal, len),
 				InvalidTransaction::ExhaustsResources
 			);
 			// Thank goodness we can still do an operational transaction to possibly save the blockchain.
 			assert_ok!(CheckWeight::<Test>::do_pre_dispatch(&dispatch_operational, len));
 			// Not too much though
-			assert_err!(CheckWeight::<Test>::do_pre_dispatch(&dispatch_operational, len),
+			assert_err!(
+				CheckWeight::<Test>::do_pre_dispatch(&dispatch_operational, len),
 				InvalidTransaction::ExhaustsResources
 			);
 			// Even with full block, validity of single transaction should be correct.
@@ -447,7 +472,11 @@ mod tests {
 	fn signed_ext_check_weight_works_operational_tx() {
 		new_test_ext().execute_with(|| {
 			let normal = DispatchInfo { weight: 100, ..Default::default() };
-			let op = DispatchInfo { weight: 100, class: DispatchClass::Operational, pays_fee: Pays::Yes };
+			let op = DispatchInfo {
+				weight: 100,
+				class: DispatchClass::Operational,
+				pays_fee: Pays::Yes,
+			};
 			let len = 0_usize;
 			let normal_limit = normal_weight_limit();
 
@@ -456,7 +485,8 @@ mod tests {
 				current_weight.set(normal_limit, DispatchClass::Normal)
 			});
 			// will not fit.
-			assert_err!(CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &normal, len),
+			assert_err!(
+				CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &normal, len),
 				InvalidTransaction::ExhaustsResources
 			);
 			// will fit.
@@ -465,7 +495,8 @@ mod tests {
 			// likewise for length limit.
 			let len = 100_usize;
 			AllExtrinsicsLen::<Test>::put(normal_length_limit());
-			assert_err!(CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &normal, len),
+			assert_err!(
+				CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &normal, len),
 				InvalidTransaction::ExhaustsResources
 			);
 			assert_ok!(CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &op, len));
@@ -475,8 +506,13 @@ mod tests {
 	#[test]
 	fn signed_ext_check_weight_works() {
 		new_test_ext().execute_with(|| {
-			let normal = DispatchInfo { weight: 100, class: DispatchClass::Normal, pays_fee: Pays::Yes };
-			let op = DispatchInfo { weight: 100, class: DispatchClass::Operational, pays_fee: Pays::Yes };
+			let normal =
+				DispatchInfo { weight: 100, class: DispatchClass::Normal, pays_fee: Pays::Yes };
+			let op = DispatchInfo {
+				weight: 100,
+				class: DispatchClass::Operational,
+				pays_fee: Pays::Yes,
+			};
 			let len = 0_usize;
 
 			let priority = CheckWeight::<Test>(PhantomData)
@@ -485,10 +521,8 @@ mod tests {
 				.priority;
 			assert_eq!(priority, 100);
 
-			let priority = CheckWeight::<Test>(PhantomData)
-				.validate(&1, CALL, &op, len)
-				.unwrap()
-				.priority;
+			let priority =
+				CheckWeight::<Test>(PhantomData).validate(&1, CALL, &op, len).unwrap().priority;
 			assert_eq!(priority, frame_support::weights::priority::LIMIT + 100);
 		})
 	}
@@ -501,7 +535,11 @@ mod tests {
 			let reset_check_weight = |tx, s, f| {
 				AllExtrinsicsLen::<Test>::put(0);
 				let r = CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, tx, s);
-				if f { assert!(r.is_err()) } else { assert!(r.is_ok()) }
+				if f {
+					assert!(r.is_err())
+				} else {
+					assert!(r.is_ok())
+				}
 			};
 
 			reset_check_weight(&normal, normal_limit - 1, false);
@@ -509,7 +547,8 @@ mod tests {
 			reset_check_weight(&normal, normal_limit + 1, true);
 
 			// Operational ones don't have this limit.
-			let op = DispatchInfo { weight: 0, class: DispatchClass::Operational, pays_fee: Pays::Yes };
+			let op =
+				DispatchInfo { weight: 0, class: DispatchClass::Operational, pays_fee: Pays::Yes };
 			reset_check_weight(&op, normal_limit, false);
 			reset_check_weight(&op, normal_limit + 100, false);
 			reset_check_weight(&op, 1024, false);
@@ -517,21 +556,16 @@ mod tests {
 		})
 	}
 
-
 	#[test]
 	fn signed_ext_check_weight_works_normal_tx() {
 		new_test_ext().execute_with(|| {
 			let normal_limit = normal_weight_limit();
 			let small = DispatchInfo { weight: 100, ..Default::default() };
 			let base_extrinsic = block_weights().get(DispatchClass::Normal).base_extrinsic;
-			let medium = DispatchInfo {
-				weight: normal_limit - base_extrinsic,
-				..Default::default()
-			};
-			let big = DispatchInfo {
-				weight: normal_limit - base_extrinsic + 1,
-				..Default::default()
-			};
+			let medium =
+				DispatchInfo { weight: normal_limit - base_extrinsic, ..Default::default() };
+			let big =
+				DispatchInfo { weight: normal_limit - base_extrinsic + 1, ..Default::default() };
 			let len = 0_usize;
 
 			let reset_check_weight = |i, f, s| {
@@ -539,7 +573,11 @@ mod tests {
 					current_weight.set(s, DispatchClass::Normal)
 				});
 				let r = CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, i, len);
-				if f { assert!(r.is_err()) } else { assert!(r.is_ok()) }
+				if f {
+					assert!(r.is_err())
+				} else {
+					assert!(r.is_ok())
+				}
 			};
 
 			reset_check_weight(&small, false, 0);
@@ -553,10 +591,8 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			// This is half of the max block weight
 			let info = DispatchInfo { weight: 512, ..Default::default() };
-			let post_info = PostDispatchInfo {
-				actual_weight: Some(128),
-				pays_fee: Default::default(),
-			};
+			let post_info =
+				PostDispatchInfo { actual_weight: Some(128), pays_fee: Default::default() };
 			let len = 0_usize;
 			let base_extrinsic = block_weights().get(DispatchClass::Normal).base_extrinsic;
 
@@ -569,11 +605,8 @@ mod tests {
 			let pre = CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &info, len).unwrap();
 			assert_eq!(BlockWeight::<Test>::get().total(), info.weight + 256);
 
-			assert_ok!( CheckWeight::<Test>::post_dispatch(pre, &info, &post_info, len, &Ok(())));
-			assert_eq!(
-				BlockWeight::<Test>::get().total(),
-				post_info.actual_weight.unwrap() + 256,
-			);
+			assert_ok!(CheckWeight::<Test>::post_dispatch(pre, &info, &post_info, len, &Ok(())));
+			assert_eq!(BlockWeight::<Test>::get().total(), post_info.actual_weight.unwrap() + 256,);
 		})
 	}
 
@@ -581,10 +614,8 @@ mod tests {
 	fn signed_ext_check_weight_actual_weight_higher_than_max_is_capped() {
 		new_test_ext().execute_with(|| {
 			let info = DispatchInfo { weight: 512, ..Default::default() };
-			let post_info = PostDispatchInfo {
-				actual_weight: Some(700),
-				pays_fee: Default::default(),
-			};
+			let post_info =
+				PostDispatchInfo { actual_weight: Some(700), pays_fee: Default::default() };
 			let len = 0_usize;
 
 			BlockWeight::<Test>::mutate(|current_weight| {
@@ -614,10 +645,7 @@ mod tests {
 			let len = 0_usize;
 
 			// Initial weight from `weights.base_block`
-			assert_eq!(
-				System::block_weight().total(),
-				weights.base_block
-			);
+			assert_eq!(System::block_weight().total(), weights.base_block);
 			assert_ok!(CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &free, len));
 			assert_eq!(
 				System::block_weight().total(),
@@ -633,7 +661,11 @@ mod tests {
 			// Max normal is 768 (75%)
 			// Max mandatory is unlimited
 			let max_normal = DispatchInfo { weight: 753, ..Default::default() };
-			let mandatory = DispatchInfo { weight: 1019, class: DispatchClass::Mandatory, ..Default::default() };
+			let mandatory = DispatchInfo {
+				weight: 1019,
+				class: DispatchClass::Mandatory,
+				..Default::default()
+			};
 
 			let len = 0_usize;
 
@@ -669,18 +701,24 @@ mod tests {
 		assert_eq!(maximum_weight.max_block, all_weight.total());
 
 		// fits into reserved
-		let mandatory1 = DispatchInfo { weight: 5, class: DispatchClass::Mandatory, ..Default::default() };
+		let mandatory1 =
+			DispatchInfo { weight: 5, class: DispatchClass::Mandatory, ..Default::default() };
 		// does not fit into reserved and the block is full.
-		let mandatory2 = DispatchInfo { weight: 6, class: DispatchClass::Mandatory, ..Default::default() };
+		let mandatory2 =
+			DispatchInfo { weight: 6, class: DispatchClass::Mandatory, ..Default::default() };
 
 		// when
-		assert_ok!(
-			calculate_consumed_weight::<<Test as Config>::Call>(
-				maximum_weight.clone(), all_weight.clone(), &mandatory1
-			)
-		);
+		assert_ok!(calculate_consumed_weight::<<Test as Config>::Call>(
+			maximum_weight.clone(),
+			all_weight.clone(),
+			&mandatory1
+		));
 		assert_err!(
-			calculate_consumed_weight::<<Test as Config>::Call>( maximum_weight, all_weight, &mandatory2),
+			calculate_consumed_weight::<<Test as Config>::Call>(
+				maximum_weight,
+				all_weight,
+				&mandatory2
+			),
 			InvalidTransaction::ExhaustsResources
 		);
 	}
diff --git a/frame/system/src/extensions/mod.rs b/frame/system/src/extensions/mod.rs
index 8b6c9b49e4d6..0af9722e475d 100644
--- a/frame/system/src/extensions/mod.rs
+++ b/frame/system/src/extensions/mod.rs
@@ -21,4 +21,3 @@ pub mod check_nonce;
 pub mod check_spec_version;
 pub mod check_tx_version;
 pub mod check_weight;
-
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index 1c16514750d9..68681ea5aca6 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -66,57 +66,55 @@
 
 #[cfg(feature = "std")]
 use serde::Serialize;
-use sp_std::prelude::*;
-#[cfg(any(feature = "std", test))]
-use sp_std::map;
-use sp_std::marker::PhantomData;
-use sp_std::fmt::Debug;
-use sp_version::RuntimeVersion;
 use sp_runtime::{
-	RuntimeDebug, Perbill, DispatchError, Either, generic,
+	generic,
 	traits::{
-		self, CheckEqual, AtLeast32Bit, Zero, Lookup, LookupError,
-		SimpleBitOps, Hash, Member, MaybeDisplay, BadOrigin,
-		MaybeSerializeDeserialize, MaybeMallocSizeOf, StaticLookup, One, Bounded,
-		Dispatchable, AtLeast32BitUnsigned, Saturating, BlockNumberProvider,
+		self, AtLeast32Bit, AtLeast32BitUnsigned, BadOrigin, BlockNumberProvider, Bounded,
+		CheckEqual, Dispatchable, Hash, Lookup, LookupError, MaybeDisplay, MaybeMallocSizeOf,
+		MaybeSerializeDeserialize, Member, One, Saturating, SimpleBitOps, StaticLookup, Zero,
 	},
+	DispatchError, Either, Perbill, RuntimeDebug,
 };
+#[cfg(any(feature = "std", test))]
+use sp_std::map;
+use sp_std::{fmt::Debug, marker::PhantomData, prelude::*};
+use sp_version::RuntimeVersion;
 
-use sp_core::{ChangesTrieConfiguration, storage::well_known_keys};
+use codec::{Decode, Encode, EncodeLike, FullCodec, MaxEncodedLen};
 use frame_support::{
-	Parameter, storage,
+	dispatch::{DispatchResult, DispatchResultWithPostInfo},
+	storage,
 	traits::{
-		SortedMembers, Get, PalletInfo, OnNewAccount, OnKilledAccount, HandleLifetime,
-		StoredMap, EnsureOrigin, OriginTrait, Filter,
+		EnsureOrigin, Filter, Get, HandleLifetime, OnKilledAccount, OnNewAccount, OriginTrait,
+		PalletInfo, SortedMembers, StoredMap,
 	},
 	weights::{
-		Weight, RuntimeDbWeight, DispatchInfo, DispatchClass,
-		extract_actual_weight, PerDispatchClass,
+		extract_actual_weight, DispatchClass, DispatchInfo, PerDispatchClass, RuntimeDbWeight,
+		Weight,
 	},
-	dispatch::{DispatchResultWithPostInfo, DispatchResult},
+	Parameter,
 };
-use codec::{Encode, Decode, FullCodec, EncodeLike, MaxEncodedLen};
+use sp_core::{storage::well_known_keys, ChangesTrieConfiguration};
 
 #[cfg(feature = "std")]
 use frame_support::traits::GenesisBuild;
 #[cfg(any(feature = "std", test))]
 use sp_io::TestExternalities;
 
-pub mod offchain;
 pub mod limits;
 #[cfg(test)]
 pub(crate) mod mock;
+pub mod offchain;
 
 mod extensions;
-pub mod weights;
-#[cfg(test)]
-mod tests;
 #[cfg(feature = "std")]
 pub mod mocking;
-
+#[cfg(test)]
+mod tests;
+pub mod weights;
 
 pub use extensions::{
-	check_mortality::CheckMortality, check_genesis::CheckGenesis, check_nonce::CheckNonce,
+	check_genesis::CheckGenesis, check_mortality::CheckMortality, check_nonce::CheckNonce,
 	check_spec_version::CheckSpecVersion, check_tx_version::CheckTxVersion,
 	check_weight::CheckWeight,
 };
@@ -154,7 +152,7 @@ impl SetCode for () {
 
 #[frame_support::pallet]
 pub mod pallet {
-	use crate::{*, pallet_prelude::*, self as frame_system};
+	use crate::{self as frame_system, pallet_prelude::*, *};
 	use frame_support::pallet_prelude::*;
 
 	/// System configuration trait. Implemented by runtime.
@@ -174,39 +172,69 @@ pub mod pallet {
 		type BlockLength: Get<limits::BlockLength>;
 
 		/// The `Origin` type used by dispatchable calls.
-		type Origin:
-			Into<Result<RawOrigin<Self::AccountId>, Self::Origin>>
+		type Origin: Into<Result<RawOrigin<Self::AccountId>, Self::Origin>>
 			+ From<RawOrigin<Self::AccountId>>
 			+ Clone
-			+ OriginTrait<Call=Self::Call>;
+			+ OriginTrait<Call = Self::Call>;
 
 		/// The aggregated `Call` type.
 		type Call: Dispatchable + Debug;
 
 		/// Account index (aka nonce) type. This stores the number of previous transactions associated
 		/// with a sender account.
-		type Index:
-			Parameter + Member + MaybeSerializeDeserialize + Debug + Default + MaybeDisplay + AtLeast32Bit
+		type Index: Parameter
+			+ Member
+			+ MaybeSerializeDeserialize
+			+ Debug
+			+ Default
+			+ MaybeDisplay
+			+ AtLeast32Bit
 			+ Copy;
 
 		/// The block number type used by the runtime.
-		type BlockNumber:
-			Parameter + Member + MaybeSerializeDeserialize + Debug + MaybeDisplay +
-			AtLeast32BitUnsigned + Default + Bounded + Copy + sp_std::hash::Hash +
-			sp_std::str::FromStr + MaybeMallocSizeOf + MaxEncodedLen;
+		type BlockNumber: Parameter
+			+ Member
+			+ MaybeSerializeDeserialize
+			+ Debug
+			+ MaybeDisplay
+			+ AtLeast32BitUnsigned
+			+ Default
+			+ Bounded
+			+ Copy
+			+ sp_std::hash::Hash
+			+ sp_std::str::FromStr
+			+ MaybeMallocSizeOf
+			+ MaxEncodedLen;
 
 		/// The output of the `Hashing` function.
-		type Hash:
-			Parameter + Member + MaybeSerializeDeserialize + Debug + MaybeDisplay + SimpleBitOps + Ord
-			+ Default + Copy + CheckEqual + sp_std::hash::Hash + AsRef<[u8]> + AsMut<[u8]>
-			+ MaybeMallocSizeOf + MaxEncodedLen;
+		type Hash: Parameter
+			+ Member
+			+ MaybeSerializeDeserialize
+			+ Debug
+			+ MaybeDisplay
+			+ SimpleBitOps
+			+ Ord
+			+ Default
+			+ Copy
+			+ CheckEqual
+			+ sp_std::hash::Hash
+			+ AsRef<[u8]>
+			+ AsMut<[u8]>
+			+ MaybeMallocSizeOf
+			+ MaxEncodedLen;
 
 		/// The hashing system (algorithm) being used in the runtime (e.g. Blake2).
-		type Hashing: Hash<Output=Self::Hash>;
+		type Hashing: Hash<Output = Self::Hash>;
 
 		/// The user account identifier type for the runtime.
-		type AccountId: Parameter + Member + MaybeSerializeDeserialize + Debug + MaybeDisplay + Ord
-			+ Default + MaxEncodedLen;
+		type AccountId: Parameter
+			+ Member
+			+ MaybeSerializeDeserialize
+			+ Debug
+			+ MaybeDisplay
+			+ Ord
+			+ Default
+			+ MaxEncodedLen;
 
 		/// Converting trait to take a source type and convert to `AccountId`.
 		///
@@ -214,16 +242,17 @@ pub mod pallet {
 		/// It's perfectly reasonable for this to be an identity conversion (with the source type being
 		/// `AccountId`), but other pallets (e.g. Indices pallet) may provide more functional/efficient
 		/// alternatives.
-		type Lookup: StaticLookup<Target=Self::AccountId>;
+		type Lookup: StaticLookup<Target = Self::AccountId>;
 
 		/// The block header.
-		type Header: Parameter + traits::Header<
-			Number=Self::BlockNumber,
-			Hash=Self::Hash,
-		>;
+		type Header: Parameter + traits::Header<Number = Self::BlockNumber, Hash = Self::Hash>;
 
 		/// The aggregated event type of the runtime.
-		type Event: Parameter + Member + From<Event<Self>> + Debug + IsType<<Self as frame_system::Config>::Event>;
+		type Event: Parameter
+			+ Member
+			+ From<Event<Self>>
+			+ Debug
+			+ IsType<<Self as frame_system::Config>::Event>;
 
 		/// Maximum number of block number to block hash mappings to keep (oldest pruned first).
 		#[pallet::constant]
@@ -288,9 +317,7 @@ pub mod pallet {
 		}
 
 		fn integrity_test() {
-			T::BlockWeights::get()
-				.validate()
-				.expect("The weights are invalid.");
+			T::BlockWeights::get().validate().expect("The weights are invalid.");
 		}
 	}
 
@@ -413,7 +440,10 @@ pub mod pallet {
 			T::SystemWeightInfo::set_storage(items.len() as u32),
 			DispatchClass::Operational,
 		))]
-		pub fn set_storage(origin: OriginFor<T>, items: Vec<KeyValue>) -> DispatchResultWithPostInfo {
+		pub fn set_storage(
+			origin: OriginFor<T>,
+			items: Vec<KeyValue>,
+		) -> DispatchResultWithPostInfo {
 			ensure_root(origin)?;
 			for i in &items {
 				storage::unhashed::put_raw(&i.0, &i.1);
@@ -473,7 +503,10 @@ pub mod pallet {
 		/// - 1 event.
 		/// # </weight>
 		#[pallet::weight(T::SystemWeightInfo::remark_with_event(remark.len() as u32))]
-		pub fn remark_with_event(origin: OriginFor<T>, remark: Vec<u8>) -> DispatchResultWithPostInfo {
+		pub fn remark_with_event(
+			origin: OriginFor<T>,
+			remark: Vec<u8>,
+		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
 			let hash = T::Hashing::hash(&remark[..]);
 			Self::deposit_event(Event::Remarked(who, hash));
@@ -580,8 +613,7 @@ pub mod pallet {
 	/// Events deposited for the current block.
 	#[pallet::storage]
 	#[pallet::getter(fn events)]
-	pub type Events<T: Config> =
-		StorageValue<_, Vec<EventRecord<T::Event, T::Hash>>, ValueQuery>;
+	pub type Events<T: Config> = StorageValue<_, Vec<EventRecord<T::Event, T::Hash>>, ValueQuery>;
 
 	/// The number of events in the `Events<T>` list.
 	#[pallet::storage]
@@ -630,10 +662,7 @@ pub mod pallet {
 	#[cfg(feature = "std")]
 	impl Default for GenesisConfig {
 		fn default() -> Self {
-			Self {
-				changes_trie_config: Default::default(),
-				code: Default::default(),
-			}
+			Self { changes_trie_config: Default::default(), code: Default::default() }
 		}
 	}
 
@@ -649,7 +678,10 @@ pub mod pallet {
 			sp_io::storage::set(well_known_keys::CODE, &self.code);
 			sp_io::storage::set(well_known_keys::EXTRINSIC_INDEX, &0u32.encode());
 			if let Some(ref changes_trie_config) = self.changes_trie_config {
-				sp_io::storage::set(well_known_keys::CHANGES_TRIE_CONFIG, &changes_trie_config.encode());
+				sp_io::storage::set(
+					well_known_keys::CHANGES_TRIE_CONFIG,
+					&changes_trie_config.encode(),
+				);
 			}
 		}
 	}
@@ -661,17 +693,25 @@ pub mod migrations {
 	#[allow(dead_code)]
 	/// Migrate from unique `u8` reference counting to triple `u32` reference counting.
 	pub fn migrate_all<T: Config>() -> frame_support::weights::Weight {
-		Account::<T>::translate::<(T::Index, u8, T::AccountData), _>(|_key, (nonce, rc, data)|
-			Some(AccountInfo { nonce, consumers: rc as RefCount, providers: 1, sufficients: 0, data })
-		);
+		Account::<T>::translate::<(T::Index, u8, T::AccountData), _>(|_key, (nonce, rc, data)| {
+			Some(AccountInfo {
+				nonce,
+				consumers: rc as RefCount,
+				providers: 1,
+				sufficients: 0,
+				data,
+			})
+		});
 		T::BlockWeights::get().max_block
 	}
 
 	#[allow(dead_code)]
 	/// Migrate from unique `u32` reference counting to triple `u32` reference counting.
 	pub fn migrate_to_dual_ref_count<T: Config>() -> frame_support::weights::Weight {
-		Account::<T>::translate::<(T::Index, RefCount, T::AccountData), _>(|_key, (nonce, consumers, data)|
-			Some(AccountInfo { nonce, consumers, providers: 1, sufficients: 0, data })
+		Account::<T>::translate::<(T::Index, RefCount, T::AccountData), _>(
+			|_key, (nonce, consumers, data)| {
+				Some(AccountInfo { nonce, consumers, providers: 1, sufficients: 0, data })
+			},
 		);
 		T::BlockWeights::get().max_block
 	}
@@ -681,7 +721,7 @@ pub mod migrations {
 		Account::<T>::translate::<(T::Index, RefCount, RefCount, T::AccountData), _>(
 			|_key, (nonce, consumers, providers, data)| {
 				Some(AccountInfo { nonce, consumers, providers, sufficients: 0, data })
-			}
+			},
 		);
 		T::BlockWeights::get().max_block
 	}
@@ -701,7 +741,7 @@ impl GenesisConfig {
 	/// Kept in order not to break dependency.
 	pub fn assimilate_storage<T: Config>(
 		&self,
-		storage: &mut sp_runtime::Storage
+		storage: &mut sp_runtime::Storage,
 	) -> Result<(), String> {
 		<Self as GenesisBuild<T>>::assimilate_storage(self, storage)
 	}
@@ -822,18 +862,14 @@ impl LastRuntimeUpgradeInfo {
 
 impl From<sp_version::RuntimeVersion> for LastRuntimeUpgradeInfo {
 	fn from(version: sp_version::RuntimeVersion) -> Self {
-		Self {
-			spec_version: version.spec_version.into(),
-			spec_name: version.spec_name,
-		}
+		Self { spec_version: version.spec_version.into(), spec_name: version.spec_name }
 	}
 }
 
 pub struct EnsureRoot<AccountId>(sp_std::marker::PhantomData<AccountId>);
-impl<
-	O: Into<Result<RawOrigin<AccountId>, O>> + From<RawOrigin<AccountId>>,
-	AccountId,
-> EnsureOrigin<O> for EnsureRoot<AccountId> {
+impl<O: Into<Result<RawOrigin<AccountId>, O>> + From<RawOrigin<AccountId>>, AccountId>
+	EnsureOrigin<O> for EnsureRoot<AccountId>
+{
 	type Success = ();
 	fn try_origin(o: O) -> Result<Self::Success, O> {
 		o.into().and_then(|o| match o {
@@ -849,10 +885,9 @@ impl<
 }
 
 pub struct EnsureSigned<AccountId>(sp_std::marker::PhantomData<AccountId>);
-impl<
-	O: Into<Result<RawOrigin<AccountId>, O>> + From<RawOrigin<AccountId>>,
-	AccountId: Default,
-> EnsureOrigin<O> for EnsureSigned<AccountId> {
+impl<O: Into<Result<RawOrigin<AccountId>, O>> + From<RawOrigin<AccountId>>, AccountId: Default>
+	EnsureOrigin<O> for EnsureSigned<AccountId>
+{
 	type Success = AccountId;
 	fn try_origin(o: O) -> Result<Self::Success, O> {
 		o.into().and_then(|o| match o {
@@ -869,10 +904,11 @@ impl<
 
 pub struct EnsureSignedBy<Who, AccountId>(sp_std::marker::PhantomData<(Who, AccountId)>);
 impl<
-	O: Into<Result<RawOrigin<AccountId>, O>> + From<RawOrigin<AccountId>>,
-	Who: SortedMembers<AccountId>,
-	AccountId: PartialEq + Clone + Ord + Default,
-> EnsureOrigin<O> for EnsureSignedBy<Who, AccountId> {
+		O: Into<Result<RawOrigin<AccountId>, O>> + From<RawOrigin<AccountId>>,
+		Who: SortedMembers<AccountId>,
+		AccountId: PartialEq + Clone + Ord + Default,
+	> EnsureOrigin<O> for EnsureSignedBy<Who, AccountId>
+{
 	type Success = AccountId;
 	fn try_origin(o: O) -> Result<Self::Success, O> {
 		o.into().and_then(|o| match o {
@@ -893,10 +929,9 @@ impl<
 }
 
 pub struct EnsureNone<AccountId>(sp_std::marker::PhantomData<AccountId>);
-impl<
-	O: Into<Result<RawOrigin<AccountId>, O>> + From<RawOrigin<AccountId>>,
-	AccountId,
-> EnsureOrigin<O> for EnsureNone<AccountId> {
+impl<O: Into<Result<RawOrigin<AccountId>, O>> + From<RawOrigin<AccountId>>, AccountId>
+	EnsureOrigin<O> for EnsureNone<AccountId>
+{
 	type Success = ();
 	fn try_origin(o: O) -> Result<Self::Success, O> {
 		o.into().and_then(|o| match o {
@@ -929,17 +964,16 @@ impl<O, T> EnsureOrigin<O> for EnsureNever<T> {
 /// Origin check will pass if `L` or `R` origin check passes. `L` is tested first.
 pub struct EnsureOneOf<AccountId, L, R>(sp_std::marker::PhantomData<(AccountId, L, R)>);
 impl<
-	AccountId,
-	O: Into<Result<RawOrigin<AccountId>, O>> + From<RawOrigin<AccountId>>,
-	L: EnsureOrigin<O>,
-	R: EnsureOrigin<O>,
-> EnsureOrigin<O> for EnsureOneOf<AccountId, L, R> {
+		AccountId,
+		O: Into<Result<RawOrigin<AccountId>, O>> + From<RawOrigin<AccountId>>,
+		L: EnsureOrigin<O>,
+		R: EnsureOrigin<O>,
+	> EnsureOrigin<O> for EnsureOneOf<AccountId, L, R>
+{
 	type Success = Either<L::Success, R::Success>;
 	fn try_origin(o: O) -> Result<Self::Success, O> {
-		L::try_origin(o).map_or_else(
-			|o| R::try_origin(o).map(|o| Either::Right(o)),
-			|o| Ok(Either::Left(o)),
-		)
+		L::try_origin(o)
+			.map_or_else(|o| R::try_origin(o).map(|o| Either::Right(o)), |o| Ok(Either::Left(o)))
 	}
 
 	#[cfg(feature = "runtime-benchmarks")]
@@ -951,7 +985,8 @@ impl<
 /// Ensure that the origin `o` represents a signed extrinsic (i.e. transaction).
 /// Returns `Ok` with the account that signed the extrinsic or an `Err` otherwise.
 pub fn ensure_signed<OuterOrigin, AccountId>(o: OuterOrigin) -> Result<AccountId, BadOrigin>
-	where OuterOrigin: Into<Result<RawOrigin<AccountId>, OuterOrigin>>
+where
+	OuterOrigin: Into<Result<RawOrigin<AccountId>, OuterOrigin>>,
 {
 	match o.into() {
 		Ok(RawOrigin::Signed(t)) => Ok(t),
@@ -961,7 +996,8 @@ pub fn ensure_signed<OuterOrigin, AccountId>(o: OuterOrigin) -> Result<AccountId
 
 /// Ensure that the origin `o` represents the root. Returns `Ok` or an `Err` otherwise.
 pub fn ensure_root<OuterOrigin, AccountId>(o: OuterOrigin) -> Result<(), BadOrigin>
-	where OuterOrigin: Into<Result<RawOrigin<AccountId>, OuterOrigin>>
+where
+	OuterOrigin: Into<Result<RawOrigin<AccountId>, OuterOrigin>>,
 {
 	match o.into() {
 		Ok(RawOrigin::Root) => Ok(()),
@@ -971,7 +1007,8 @@ pub fn ensure_root<OuterOrigin, AccountId>(o: OuterOrigin) -> Result<(), BadOrig
 
 /// Ensure that the origin `o` represents an unsigned extrinsic. Returns `Ok` or an `Err` otherwise.
 pub fn ensure_none<OuterOrigin, AccountId>(o: OuterOrigin) -> Result<(), BadOrigin>
-	where OuterOrigin: Into<Result<RawOrigin<AccountId>, OuterOrigin>>
+where
+	OuterOrigin: Into<Result<RawOrigin<AccountId>, OuterOrigin>>,
 {
 	match o.into() {
 		Ok(RawOrigin::None) => Ok(()),
@@ -1057,14 +1094,16 @@ impl<T: Config> Pallet<T> {
 
 	/// Increment the provider reference counter on an account.
 	pub fn inc_providers(who: &T::AccountId) -> IncRefStatus {
-		Account::<T>::mutate(who, |a| if a.providers == 0 && a.sufficients == 0 {
-			// Account is being created.
-			a.providers = 1;
-			Self::on_created_account(who.clone(), a);
-			IncRefStatus::Created
-		} else {
-			a.providers = a.providers.saturating_add(1);
-			IncRefStatus::Existed
+		Account::<T>::mutate(who, |a| {
+			if a.providers == 0 && a.sufficients == 0 {
+				// Account is being created.
+				a.providers = 1;
+				Self::on_created_account(who.clone(), a);
+				IncRefStatus::Created
+			} else {
+				a.providers = a.providers.saturating_add(1);
+				IncRefStatus::Existed
+			}
 		})
 	}
 
@@ -1088,18 +1127,18 @@ impl<T: Config> Pallet<T> {
 
 						Pallet::<T>::on_killed_account(who.clone());
 						Ok(DecRefStatus::Reaped)
-					}
+					},
 					(1, c, _) if c > 0 => {
 						// Cannot remove last provider if there are consumers.
 						Err(DispatchError::ConsumerRemaining)
-					}
+					},
 					(x, _, _) => {
 						// Account will continue to exist as there is either > 1 provider or
 						// > 0 sufficients.
 						account.providers = x - 1;
 						*maybe_account = Some(account);
 						Ok(DecRefStatus::Exists)
-					}
+					},
 				}
 			} else {
 				log::error!(
@@ -1113,14 +1152,16 @@ impl<T: Config> Pallet<T> {
 
 	/// Increment the self-sufficient reference counter on an account.
 	pub fn inc_sufficients(who: &T::AccountId) -> IncRefStatus {
-		Account::<T>::mutate(who, |a| if a.providers + a.sufficients == 0 {
-			// Account is being created.
-			a.sufficients = 1;
-			Self::on_created_account(who.clone(), a);
-			IncRefStatus::Created
-		} else {
-			a.sufficients = a.sufficients.saturating_add(1);
-			IncRefStatus::Existed
+		Account::<T>::mutate(who, |a| {
+			if a.providers + a.sufficients == 0 {
+				// Account is being created.
+				a.sufficients = 1;
+				Self::on_created_account(who.clone(), a);
+				IncRefStatus::Created
+			} else {
+				a.sufficients = a.sufficients.saturating_add(1);
+				IncRefStatus::Existed
+			}
 		})
 	}
 
@@ -1141,12 +1182,12 @@ impl<T: Config> Pallet<T> {
 					(0, 0) | (1, 0) => {
 						Pallet::<T>::on_killed_account(who.clone());
 						DecRefStatus::Reaped
-					}
+					},
 					(x, _) => {
 						account.sufficients = x - 1;
 						*maybe_account = Some(account);
 						DecRefStatus::Exists
-					}
+					},
 				}
 			} else {
 				log::error!(
@@ -1178,24 +1219,28 @@ impl<T: Config> Pallet<T> {
 	///
 	/// The account `who`'s `providers` must be non-zero or this will return an error.
 	pub fn inc_consumers(who: &T::AccountId) -> Result<(), DispatchError> {
-		Account::<T>::try_mutate(who, |a| if a.providers > 0 {
-			a.consumers = a.consumers.saturating_add(1);
-			Ok(())
-		} else {
-			Err(DispatchError::NoProviders)
+		Account::<T>::try_mutate(who, |a| {
+			if a.providers > 0 {
+				a.consumers = a.consumers.saturating_add(1);
+				Ok(())
+			} else {
+				Err(DispatchError::NoProviders)
+			}
 		})
 	}
 
 	/// Decrement the reference counter on an account. This *MUST* only be done once for every time
 	/// you called `inc_consumers` on `who`.
 	pub fn dec_consumers(who: &T::AccountId) {
-		Account::<T>::mutate(who, |a| if a.consumers > 0 {
-			a.consumers -= 1;
-		} else {
-			log::error!(
-				target: "runtime::system",
-				"Logic error: Unexpected underflow in reducing consumer",
-			);
+		Account::<T>::mutate(who, |a| {
+			if a.consumers > 0 {
+				a.consumers -= 1;
+			} else {
+				log::error!(
+					target: "runtime::system",
+					"Logic error: Unexpected underflow in reducing consumer",
+				);
+			}
 		})
 	}
 
@@ -1233,14 +1278,13 @@ impl<T: Config> Pallet<T> {
 	pub fn deposit_event_indexed(topics: &[T::Hash], event: T::Event) {
 		let block_number = Self::block_number();
 		// Don't populate events on genesis.
-		if block_number.is_zero() { return }
+		if block_number.is_zero() {
+			return
+		}
 
 		let phase = ExecutionPhase::<T>::get().unwrap_or_default();
-		let event = EventRecord {
-			phase,
-			event,
-			topics: topics.iter().cloned().collect::<Vec<_>>(),
-		};
+		let event =
+			EventRecord { phase, event, topics: topics.iter().cloned().collect::<Vec<_>>() };
 
 		// Index of the to be added event.
 		let event_idx = {
@@ -1366,12 +1410,18 @@ impl<T: Config> Pallet<T> {
 		if let Some(storage_changes_root) = storage_changes_root {
 			let item = generic::DigestItem::ChangesTrieRoot(
 				T::Hash::decode(&mut &storage_changes_root[..])
-					.expect("Node is configured to use the same hash; qed")
+					.expect("Node is configured to use the same hash; qed"),
 			);
 			digest.push(item);
 		}
 
-		<T::Header as traits::Header>::new(number, extrinsics_root, storage_root, parent_hash, digest)
+		<T::Header as traits::Header>::new(
+			number,
+			extrinsics_root,
+			storage_root,
+			parent_hash,
+			digest,
+		)
 	}
 
 	/// Deposits a log and ensures it matches the block's log data.
@@ -1448,7 +1498,9 @@ impl<T: Config> Pallet<T> {
 	}
 
 	/// Return the chain's current runtime version.
-	pub fn runtime_version() -> RuntimeVersion { T::Version::get() }
+	pub fn runtime_version() -> RuntimeVersion {
+		T::Version::get()
+	}
 
 	/// Retrieve the account transaction counter from storage.
 	pub fn account_nonce(who: impl EncodeLike<T::AccountId>) -> T::Index {
@@ -1471,20 +1523,18 @@ impl<T: Config> Pallet<T> {
 	/// To be called immediately after an extrinsic has been applied.
 	pub fn note_applied_extrinsic(r: &DispatchResultWithPostInfo, mut info: DispatchInfo) {
 		info.weight = extract_actual_weight(r, &info);
-		Self::deposit_event(
-			match r {
-				Ok(_) => Event::ExtrinsicSuccess(info),
-				Err(err) => {
-					log::trace!(
-						target: "runtime::system",
-						"Extrinsic failed at block({:?}): {:?}",
-						Self::block_number(),
-						err,
-					);
-					Event::ExtrinsicFailed(err.error, info)
-				},
-			}
-		);
+		Self::deposit_event(match r {
+			Ok(_) => Event::ExtrinsicSuccess(info),
+			Err(err) => {
+				log::trace!(
+					target: "runtime::system",
+					"Extrinsic failed at block({:?}): {:?}",
+					Self::block_number(),
+					err,
+				);
+				Event::ExtrinsicFailed(err.error, info)
+			},
+		});
 
 		let next_extrinsic_index = Self::extrinsic_index().unwrap_or_default() + 1u32;
 
@@ -1495,8 +1545,8 @@ impl<T: Config> Pallet<T> {
 	/// To be called immediately after `note_applied_extrinsic` of the last extrinsic of the block
 	/// has been called.
 	pub fn note_finished_extrinsics() {
-		let extrinsic_index: u32 = storage::unhashed::take(well_known_keys::EXTRINSIC_INDEX)
-			.unwrap_or_default();
+		let extrinsic_index: u32 =
+			storage::unhashed::take(well_known_keys::EXTRINSIC_INDEX).unwrap_or_default();
 		ExtrinsicCount::<T>::put(extrinsic_index);
 		ExecutionPhase::<T>::put(Phase::Finalization);
 	}
@@ -1579,8 +1629,7 @@ impl<T: Config> HandleLifetime<T::AccountId> for Consumer<T> {
 	}
 }
 
-impl<T: Config> BlockNumberProvider for Pallet<T>
-{
+impl<T: Config> BlockNumberProvider for Pallet<T> {
 	type BlockNumber = <T as Config>::BlockNumber;
 
 	fn current_block_number() -> Self::BlockNumber {
@@ -1618,7 +1667,7 @@ impl<T: Config> StoredMap<T::AccountId, T::AccountData> for Pallet<T> {
 				DecRefStatus::Reaped => return Ok(result),
 				DecRefStatus::Exists => {
 					// Update value as normal...
-				}
+				},
 			}
 		} else if !was_providing && !is_providing {
 			return Ok(result)
@@ -1629,14 +1678,15 @@ impl<T: Config> StoredMap<T::AccountId, T::AccountData> for Pallet<T> {
 }
 
 /// Split an `option` into two constituent options, as defined by a `splitter` function.
-pub fn split_inner<T, R, S>(option: Option<T>, splitter: impl FnOnce(T) -> (R, S))
-	-> (Option<R>, Option<S>)
-{
+pub fn split_inner<T, R, S>(
+	option: Option<T>,
+	splitter: impl FnOnce(T) -> (R, S),
+) -> (Option<R>, Option<S>) {
 	match option {
 		Some(inner) => {
 			let (r, s) = splitter(inner);
 			(Some(r), Some(s))
-		}
+		},
 		None => (None, None),
 	}
 }
@@ -1659,7 +1709,7 @@ impl<T: Config> Lookup for ChainContext<T> {
 
 /// Prelude to be used alongside pallet macro, for ease of use.
 pub mod pallet_prelude {
-	pub use crate::{ensure_signed, ensure_none, ensure_root};
+	pub use crate::{ensure_none, ensure_root, ensure_signed};
 
 	/// Type alias for the `Origin` associated type of system config.
 	pub type OriginFor<T> = <T as crate::Config>::Origin;
diff --git a/frame/system/src/limits.rs b/frame/system/src/limits.rs
index 49a458224020..74ffc828314b 100644
--- a/frame/system/src/limits.rs
+++ b/frame/system/src/limits.rs
@@ -25,8 +25,8 @@
 //! `DispatchClass`. This module contains configuration object for both resources,
 //! which should be passed to `frame_system` configuration when runtime is being set up.
 
-use frame_support::weights::{Weight, DispatchClass, constants, PerDispatchClass, OneOrMany};
-use sp_runtime::{RuntimeDebug, Perbill};
+use frame_support::weights::{constants, DispatchClass, OneOrMany, PerDispatchClass, Weight};
+use sp_runtime::{Perbill, RuntimeDebug};
 
 /// Block length limit configuration.
 #[derive(RuntimeDebug, Clone, codec::Encode, codec::Decode)]
@@ -40,29 +40,26 @@ pub struct BlockLength {
 
 impl Default for BlockLength {
 	fn default() -> Self {
-		BlockLength::max_with_normal_ratio(
-			5 * 1024 * 1024,
-			DEFAULT_NORMAL_RATIO,
-		)
+		BlockLength::max_with_normal_ratio(5 * 1024 * 1024, DEFAULT_NORMAL_RATIO)
 	}
 }
 
 impl BlockLength {
 	/// Create new `BlockLength` with `max` for every class.
 	pub fn max(max: u32) -> Self {
-		Self {
-			max: PerDispatchClass::new(|_| max),
-		}
+		Self { max: PerDispatchClass::new(|_| max) }
 	}
 
 	/// Create new `BlockLength` with `max` for `Operational` & `Mandatory`
 	/// and `normal * max` for `Normal`.
 	pub fn max_with_normal_ratio(max: u32, normal: Perbill) -> Self {
 		Self {
-			max: PerDispatchClass::new(|class| if class == DispatchClass::Normal {
-				normal * max
-			} else {
-				max
+			max: PerDispatchClass::new(|class| {
+				if class == DispatchClass::Normal {
+					normal * max
+				} else {
+					max
+				}
 			}),
 		}
 	}
@@ -206,10 +203,7 @@ pub struct BlockWeights {
 
 impl Default for BlockWeights {
 	fn default() -> Self {
-		Self::with_sensible_defaults(
-			1 * constants::WEIGHT_PER_SECOND,
-			DEFAULT_NORMAL_RATIO,
-		)
+		Self::with_sensible_defaults(1 * constants::WEIGHT_PER_SECOND, DEFAULT_NORMAL_RATIO)
 	}
 }
 
@@ -245,7 +239,8 @@ impl BlockWeights {
 				weights.max_extrinsic.unwrap_or(0) <= max_for_class.saturating_sub(base_for_class),
 				&mut error,
 				"[{:?}] {:?} (max_extrinsic) can't be greater than {:?} (max for class)",
-				class, weights.max_extrinsic,
+				class,
+				weights.max_extrinsic,
 				max_for_class.saturating_sub(base_for_class),
 			);
 			// Max extrinsic should not be 0
@@ -260,21 +255,27 @@ impl BlockWeights {
 				reserved > base_for_class || reserved == 0,
 				&mut error,
 				"[{:?}] {:?} (reserved) has to be greater than {:?} (base extrinsic) if set",
-				class, reserved, base_for_class,
+				class,
+				reserved,
+				base_for_class,
 			);
 			// Make sure max block is greater than max_total if it's set.
 			error_assert!(
 				self.max_block >= weights.max_total.unwrap_or(0),
 				&mut error,
 				"[{:?}] {:?} (max block) has to be greater than {:?} (max for class)",
-				class, self.max_block, weights.max_total,
+				class,
+				self.max_block,
+				weights.max_total,
 			);
 			// Make sure we can fit at least one extrinsic.
 			error_assert!(
 				self.max_block > base_for_class + self.base_block,
 				&mut error,
 				"[{:?}] {:?} (max block) must fit at least one extrinsic {:?} (base weight)",
-				class, self.max_block, base_for_class + self.base_block,
+				class,
+				self.max_block,
+				base_for_class + self.base_block,
 			);
 		}
 
@@ -309,10 +310,7 @@ impl BlockWeights {
 	/// Assumptions:
 	///  - Average block initialization is assumed to be `10%`.
 	///  - `Operational` transactions have reserved allowance (`1.0 - normal_ratio`)
-	pub fn with_sensible_defaults(
-		expected_block_weight: Weight,
-		normal_ratio: Perbill,
-	) -> Self {
+	pub fn with_sensible_defaults(expected_block_weight: Weight, normal_ratio: Perbill) -> Self {
 		let normal_weight = normal_ratio * expected_block_weight;
 		Self::builder()
 			.for_class(DispatchClass::Normal, |weights| {
@@ -388,7 +386,7 @@ impl BlockWeightsBuilder {
 		for class in class.into_iter() {
 			action(self.weights.per_class.get_mut(class));
 		}
- 		self
+		self
 	}
 
 	/// Construct the `BlockWeights` object.
@@ -408,7 +406,8 @@ impl BlockWeightsBuilder {
 			for class in DispatchClass::all() {
 				let per_class = weights.per_class.get_mut(*class);
 				if per_class.max_extrinsic.is_none() && init_cost.is_some() {
-					per_class.max_extrinsic = per_class.max_total
+					per_class.max_extrinsic = per_class
+						.max_total
 						.map(|x| x.saturating_sub(init_weight))
 						.map(|x| x.saturating_sub(per_class.base_extrinsic));
 				}
@@ -435,8 +434,6 @@ mod tests {
 
 	#[test]
 	fn default_weights_are_valid() {
-		BlockWeights::default()
-			.validate()
-			.unwrap();
+		BlockWeights::default().validate().unwrap();
 	}
 }
diff --git a/frame/system/src/mock.rs b/frame/system/src/mock.rs
index e9b6fb7d968e..480e8b1a26ba 100644
--- a/frame/system/src/mock.rs
+++ b/frame/system/src/mock.rs
@@ -16,13 +16,14 @@
 // limitations under the License.
 
 use crate::{self as frame_system, *};
-use sp_std::cell::RefCell;
+use frame_support::parameter_types;
 use sp_core::H256;
 use sp_runtime::{
+	testing::Header,
 	traits::{BlakeTwo256, IdentityLookup},
-	testing::Header, BuildStorage,
+	BuildStorage,
 };
-use frame_support::parameter_types;
+use sp_std::cell::RefCell;
 
 type UncheckedExtrinsic = mocking::MockUncheckedExtrinsic<Test>;
 type Block = mocking::MockBlock<Test>;
@@ -75,13 +76,15 @@ parameter_types! {
 		limits::BlockLength::max_with_normal_ratio(1024, NORMAL_DISPATCH_RATIO);
 }
 
-thread_local!{
+thread_local! {
 	pub static KILLED: RefCell<Vec<u64>> = RefCell::new(vec![]);
 }
 
 pub struct RecordKilled;
 impl OnKilledAccount<u64> for RecordKilled {
-	fn on_killed_account(who: &u64) { KILLED.with(|r| r.borrow_mut().push(*who)) }
+	fn on_killed_account(who: &u64) {
+		KILLED.with(|r| r.borrow_mut().push(*who))
+	}
 }
 
 impl Config for Test {
@@ -117,12 +120,14 @@ pub const CALL: &<Test as Config>::Call = &Call::System(frame_system::Call::set_
 
 /// Create new externalities for `System` module tests.
 pub fn new_test_ext() -> sp_io::TestExternalities {
-	let mut ext: sp_io::TestExternalities = GenesisConfig::default()
-		.build_storage().unwrap().into();
+	let mut ext: sp_io::TestExternalities =
+		GenesisConfig::default().build_storage().unwrap().into();
 	// Add to each test the initial weight of a block
-	ext.execute_with(|| System::register_extra_weight_unchecked(
-		<Test as crate::Config>::BlockWeights::get().base_block,
-		DispatchClass::Mandatory
-	));
+	ext.execute_with(|| {
+		System::register_extra_weight_unchecked(
+			<Test as crate::Config>::BlockWeights::get().base_block,
+			DispatchClass::Mandatory,
+		)
+	});
 	ext
 }
diff --git a/frame/system/src/mocking.rs b/frame/system/src/mocking.rs
index 9f80c59a9c4d..7e6026b72618 100644
--- a/frame/system/src/mocking.rs
+++ b/frame/system/src/mocking.rs
@@ -21,7 +21,10 @@ use sp_runtime::generic;
 
 /// An unchecked extrinsic type to be used in tests.
 pub type MockUncheckedExtrinsic<T, Signature = (), Extra = ()> = generic::UncheckedExtrinsic<
-	<T as crate::Config>::AccountId, <T as crate::Config>::Call, Signature, Extra,
+	<T as crate::Config>::AccountId,
+	<T as crate::Config>::Call,
+	Signature,
+	Extra,
 >;
 
 /// An implementation of `sp_runtime::traits::Block` to be used in tests.
diff --git a/frame/system/src/offchain.rs b/frame/system/src/offchain.rs
index 6769923bc04b..e9f3d82ea3c2 100644
--- a/frame/system/src/offchain.rs
+++ b/frame/system/src/offchain.rs
@@ -57,12 +57,16 @@
 #![warn(missing_docs)]
 
 use codec::Encode;
-use sp_std::collections::btree_set::BTreeSet;
-use sp_std::convert::{TryInto, TryFrom};
-use sp_std::prelude::{Box, Vec};
-use sp_runtime::app_crypto::RuntimeAppPublic;
-use sp_runtime::traits::{Extrinsic as ExtrinsicT, IdentifyAccount, One};
 use frame_support::RuntimeDebug;
+use sp_runtime::{
+	app_crypto::RuntimeAppPublic,
+	traits::{Extrinsic as ExtrinsicT, IdentifyAccount, One},
+};
+use sp_std::{
+	collections::btree_set::BTreeSet,
+	convert::{TryFrom, TryInto},
+	prelude::{Box, Vec},
+};
 
 /// Marker struct used to flag using all supported keys to sign a payload.
 pub struct ForAll {}
@@ -76,7 +80,7 @@ pub struct ForAny {}
 /// utility function can be used. However, this struct is used by `Signer`
 /// to submit a signed transactions providing the signature along with the call.
 pub struct SubmitTransaction<T: SendTransactionTypes<OverarchingCall>, OverarchingCall> {
-	_phantom: sp_std::marker::PhantomData<(T, OverarchingCall)>
+	_phantom: sp_std::marker::PhantomData<(T, OverarchingCall)>,
 }
 
 impl<T, LocalCall> SubmitTransaction<T, LocalCall>
@@ -120,10 +124,7 @@ pub struct Signer<T: SigningTypes, C: AppCrypto<T::Public, T::Signature>, X = Fo
 
 impl<T: SigningTypes, C: AppCrypto<T::Public, T::Signature>, X> Default for Signer<T, C, X> {
 	fn default() -> Self {
-		Self {
-			accounts: Default::default(),
-			_phantom: Default::default(),
-		}
+		Self { accounts: Default::default(), _phantom: Default::default() }
 	}
 }
 
@@ -161,72 +162,73 @@ impl<T: SigningTypes, C: AppCrypto<T::Public, T::Signature>, X> Signer<T, C, X>
 		let keystore_accounts = self.keystore_accounts();
 		match self.accounts {
 			None => Box::new(keystore_accounts),
-			Some(ref keys) =>  {
-				let keystore_lookup: BTreeSet<<T as SigningTypes>::Public> = keystore_accounts
-					.map(|account| account.public).collect();
-
-				Box::new(keys.into_iter()
-					.enumerate()
-					.map(|(index, key)| {
-						let account_id = key.clone().into_account();
-						Account::new(index, account_id, key.clone())
-					})
-					.filter(move |account| keystore_lookup.contains(&account.public)))
-			}
+			Some(ref keys) => {
+				let keystore_lookup: BTreeSet<<T as SigningTypes>::Public> =
+					keystore_accounts.map(|account| account.public).collect();
+
+				Box::new(
+					keys.into_iter()
+						.enumerate()
+						.map(|(index, key)| {
+							let account_id = key.clone().into_account();
+							Account::new(index, account_id, key.clone())
+						})
+						.filter(move |account| keystore_lookup.contains(&account.public)),
+				)
+			},
 		}
 	}
 
 	fn keystore_accounts(&self) -> impl Iterator<Item = Account<T>> {
-		C::RuntimeAppPublic::all()
-			.into_iter()
-			.enumerate()
-			.map(|(index, key)| {
-				let generic_public = C::GenericPublic::from(key);
-				let public: T::Public = generic_public.into();
-				let account_id = public.clone().into_account();
-				Account::new(index, account_id, public)
-			})
+		C::RuntimeAppPublic::all().into_iter().enumerate().map(|(index, key)| {
+			let generic_public = C::GenericPublic::from(key);
+			let public: T::Public = generic_public.into();
+			let account_id = public.clone().into_account();
+			Account::new(index, account_id, public)
+		})
 	}
 }
 
-
 impl<T: SigningTypes, C: AppCrypto<T::Public, T::Signature>> Signer<T, C, ForAll> {
-	fn for_all<F, R>(&self, f: F) -> Vec<(Account<T>, R)> where
+	fn for_all<F, R>(&self, f: F) -> Vec<(Account<T>, R)>
+	where
 		F: Fn(&Account<T>) -> Option<R>,
 	{
 		let accounts = self.accounts_from_keys();
 		accounts
 			.into_iter()
-			.filter_map(|account| {
-				f(&account).map(|res| (account, res))
-			})
+			.filter_map(|account| f(&account).map(|res| (account, res)))
 			.collect()
 	}
 }
 
 impl<T: SigningTypes, C: AppCrypto<T::Public, T::Signature>> Signer<T, C, ForAny> {
-	fn for_any<F, R>(&self, f: F) -> Option<(Account<T>, R)> where
+	fn for_any<F, R>(&self, f: F) -> Option<(Account<T>, R)>
+	where
 		F: Fn(&Account<T>) -> Option<R>,
 	{
 		let accounts = self.accounts_from_keys();
 		for account in accounts.into_iter() {
 			let res = f(&account);
 			if let Some(res) = res {
-				return Some((account, res));
+				return Some((account, res))
 			}
 		}
 		None
 	}
 }
 
-impl<T: SigningTypes, C: AppCrypto<T::Public, T::Signature>> SignMessage<T> for Signer<T, C, ForAll> {
+impl<T: SigningTypes, C: AppCrypto<T::Public, T::Signature>> SignMessage<T>
+	for Signer<T, C, ForAll>
+{
 	type SignatureData = Vec<(Account<T>, T::Signature)>;
 
 	fn sign_message(&self, message: &[u8]) -> Self::SignatureData {
 		self.for_all(|account| C::sign(message, account.public.clone()))
 	}
 
-	fn sign<TPayload, F>(&self, f: F) -> Self::SignatureData where
+	fn sign<TPayload, F>(&self, f: F) -> Self::SignatureData
+	where
 		F: Fn(&Account<T>) -> TPayload,
 		TPayload: SignedPayload<T>,
 	{
@@ -234,14 +236,17 @@ impl<T: SigningTypes, C: AppCrypto<T::Public, T::Signature>> SignMessage<T> for
 	}
 }
 
-impl<T: SigningTypes, C: AppCrypto<T::Public, T::Signature>> SignMessage<T> for Signer<T, C, ForAny> {
+impl<T: SigningTypes, C: AppCrypto<T::Public, T::Signature>> SignMessage<T>
+	for Signer<T, C, ForAny>
+{
 	type SignatureData = Option<(Account<T>, T::Signature)>;
 
 	fn sign_message(&self, message: &[u8]) -> Self::SignatureData {
 		self.for_any(|account| C::sign(message, account.public.clone()))
 	}
 
-	fn sign<TPayload, F>(&self, f: F) -> Self::SignatureData where
+	fn sign<TPayload, F>(&self, f: F) -> Self::SignatureData
+	where
 		F: Fn(&Account<T>) -> TPayload,
 		TPayload: SignedPayload<T>,
 	{
@@ -250,16 +255,14 @@ impl<T: SigningTypes, C: AppCrypto<T::Public, T::Signature>> SignMessage<T> for
 }
 
 impl<
-	T: CreateSignedTransaction<LocalCall> + SigningTypes,
-	C: AppCrypto<T::Public, T::Signature>,
-	LocalCall,
-> SendSignedTransaction<T, C, LocalCall> for Signer<T, C, ForAny> {
+		T: CreateSignedTransaction<LocalCall> + SigningTypes,
+		C: AppCrypto<T::Public, T::Signature>,
+		LocalCall,
+	> SendSignedTransaction<T, C, LocalCall> for Signer<T, C, ForAny>
+{
 	type Result = Option<(Account<T>, Result<(), ()>)>;
 
-	fn send_signed_transaction(
-		&self,
-		f: impl Fn(&Account<T>) -> LocalCall,
-	) -> Self::Result {
+	fn send_signed_transaction(&self, f: impl Fn(&Account<T>) -> LocalCall) -> Self::Result {
 		self.for_any(|account| {
 			let call = f(account);
 			self.send_single_signed_transaction(account, call)
@@ -268,16 +271,14 @@ impl<
 }
 
 impl<
-	T: SigningTypes + CreateSignedTransaction<LocalCall>,
-	C: AppCrypto<T::Public, T::Signature>,
-	LocalCall,
-> SendSignedTransaction<T, C, LocalCall> for Signer<T, C, ForAll> {
+		T: SigningTypes + CreateSignedTransaction<LocalCall>,
+		C: AppCrypto<T::Public, T::Signature>,
+		LocalCall,
+	> SendSignedTransaction<T, C, LocalCall> for Signer<T, C, ForAll>
+{
 	type Result = Vec<(Account<T>, Result<(), ()>)>;
 
-	fn send_signed_transaction(
-		&self,
-		f: impl Fn(&Account<T>) -> LocalCall,
-	) -> Self::Result {
+	fn send_signed_transaction(&self, f: impl Fn(&Account<T>) -> LocalCall) -> Self::Result {
 		self.for_all(|account| {
 			let call = f(account);
 			self.send_single_signed_transaction(account, call)
@@ -286,10 +287,11 @@ impl<
 }
 
 impl<
-	T: SigningTypes + SendTransactionTypes<LocalCall>,
-	C: AppCrypto<T::Public, T::Signature>,
-	LocalCall,
-> SendUnsignedTransaction<T, LocalCall> for Signer<T, C, ForAny> {
+		T: SigningTypes + SendTransactionTypes<LocalCall>,
+		C: AppCrypto<T::Public, T::Signature>,
+		LocalCall,
+	> SendUnsignedTransaction<T, LocalCall> for Signer<T, C, ForAny>
+{
 	type Result = Option<(Account<T>, Result<(), ()>)>;
 
 	fn send_unsigned_transaction<TPayload, F>(
@@ -303,7 +305,7 @@ impl<
 	{
 		self.for_any(|account| {
 			let payload = f(account);
-			let signature= payload.sign::<C>()?;
+			let signature = payload.sign::<C>()?;
 			let call = f2(payload, signature);
 			self.submit_unsigned_transaction(call)
 		})
@@ -311,10 +313,11 @@ impl<
 }
 
 impl<
-	T: SigningTypes + SendTransactionTypes<LocalCall>,
-	C: AppCrypto<T::Public, T::Signature>,
-	LocalCall,
-> SendUnsignedTransaction<T, LocalCall> for Signer<T, C, ForAll> {
+		T: SigningTypes + SendTransactionTypes<LocalCall>,
+		C: AppCrypto<T::Public, T::Signature>,
+		LocalCall,
+	> SendUnsignedTransaction<T, LocalCall> for Signer<T, C, ForAll>
+{
 	type Result = Vec<(Account<T>, Result<(), ()>)>;
 
 	fn send_unsigned_transaction<TPayload, F>(
@@ -324,7 +327,8 @@ impl<
 	) -> Self::Result
 	where
 		F: Fn(&Account<T>) -> TPayload,
-		TPayload: SignedPayload<T> {
+		TPayload: SignedPayload<T>,
+	{
 		self.for_all(|account| {
 			let payload = f(account);
 			let signature = payload.sign::<C>()?;
@@ -352,16 +356,13 @@ impl<T: SigningTypes> Account<T> {
 	}
 }
 
-impl<T: SigningTypes> Clone for Account<T> where
+impl<T: SigningTypes> Clone for Account<T>
+where
 	T::AccountId: Clone,
 	T::Public: Clone,
 {
 	fn clone(&self) -> Self {
-		Self {
-			index: self.index,
-			id: self.id.clone(),
-			public: self.public.clone(),
-		}
+		Self { index: self.index, id: self.id.clone(), public: self.public.clone() }
 	}
 }
 
@@ -375,9 +376,9 @@ impl<T: SigningTypes> Clone for Account<T> where
 /// The point of this trait is to be able to easily convert between `RuntimeAppPublic`, the wrapped
 /// (generic = non application-specific) crypto types and the `Public` type required by the runtime.
 ///
-///	Example (pseudo-)implementation:
+/// Example (pseudo-)implementation:
 /// ```ignore
-///	// im-online specific crypto
+/// // im-online specific crypto
 /// type RuntimeAppPublic = ImOnline(sr25519::Public);
 ///
 /// // wrapped "raw" crypto
@@ -395,15 +396,13 @@ pub trait AppCrypto<Public, Signature> {
 	type RuntimeAppPublic: RuntimeAppPublic;
 
 	/// A raw crypto public key wrapped by `RuntimeAppPublic`.
-	type GenericPublic:
-		From<Self::RuntimeAppPublic>
+	type GenericPublic: From<Self::RuntimeAppPublic>
 		+ Into<Self::RuntimeAppPublic>
 		+ TryFrom<Public>
 		+ Into<Public>;
 
 	/// A matching raw crypto `Signature` type.
-	type GenericSignature:
-		From<<Self::RuntimeAppPublic as RuntimeAppPublic>::Signature>
+	type GenericSignature: From<<Self::RuntimeAppPublic as RuntimeAppPublic>::Signature>
 		+ Into<<Self::RuntimeAppPublic as RuntimeAppPublic>::Signature>
 		+ TryFrom<Signature>
 		+ Into<Signature>;
@@ -424,16 +423,15 @@ pub trait AppCrypto<Public, Signature> {
 	fn verify(payload: &[u8], public: Public, signature: Signature) -> bool {
 		let p: Self::GenericPublic = match public.try_into() {
 			Ok(a) => a,
-			_ => return false
+			_ => return false,
 		};
 		let x = Into::<Self::RuntimeAppPublic>::into(p);
 		let signature: Self::GenericSignature = match signature.try_into() {
 			Ok(a) => a,
-			_ => return false
+			_ => return false,
 		};
-		let signature = Into::<<
-			Self::RuntimeAppPublic as RuntimeAppPublic
-		>::Signature>::into(signature);
+		let signature =
+			Into::<<Self::RuntimeAppPublic as RuntimeAppPublic>::Signature>::into(signature);
 
 		x.verify(&payload, &signature)
 	}
@@ -443,7 +441,6 @@ pub trait AppCrypto<Public, Signature> {
 ///
 /// This trait adds extra bounds to `Public` and `Signature` types of the runtime
 /// that are necessary to use these types for signing.
-///
 // TODO [#5663] Could this be just `T::Signature as traits::Verify>::Signer`?
 // Seems that this may cause issues with bounds resolution.
 pub trait SigningTypes: crate::Config {
@@ -459,16 +456,13 @@ pub trait SigningTypes: crate::Config {
 		+ Ord;
 
 	/// A matching `Signature` type.
-	type Signature: Clone
-		+ PartialEq
-		+ core::fmt::Debug
-		+ codec::Codec;
+	type Signature: Clone + PartialEq + core::fmt::Debug + codec::Codec;
 }
 
 /// A definition of types required to submit transactions from within the runtime.
 pub trait SendTransactionTypes<LocalCall> {
 	/// The extrinsic type expected by the runtime.
-	type Extrinsic: ExtrinsicT<Call=Self::OverarchingCall> + codec::Encode;
+	type Extrinsic: ExtrinsicT<Call = Self::OverarchingCall> + codec::Encode;
 	/// The runtime's call type.
 	///
 	/// This has additional bound to be able to be created from pallet-local `Call` types.
@@ -482,7 +476,9 @@ pub trait SendTransactionTypes<LocalCall> {
 /// This will most likely include creation of `SignedExtra` (a set of `SignedExtensions`).
 /// Note that the result can be altered by inspecting the `Call` (for instance adjusting
 /// fees, or mortality depending on the `pallet` being called).
-pub trait CreateSignedTransaction<LocalCall>: SendTransactionTypes<LocalCall> + SigningTypes {
+pub trait CreateSignedTransaction<LocalCall>:
+	SendTransactionTypes<LocalCall> + SigningTypes
+{
 	/// Attempt to create signed extrinsic data that encodes call from given account.
 	///
 	/// Runtime implementation is free to construct the payload to sign and the signature
@@ -514,18 +510,19 @@ pub trait SignMessage<T: SigningTypes> {
 	///
 	/// This method expects `f` to return a `SignedPayload`
 	/// object which is then used for signing.
-	fn sign<TPayload, F>(&self, f: F) -> Self::SignatureData where
+	fn sign<TPayload, F>(&self, f: F) -> Self::SignatureData
+	where
 		F: Fn(&Account<T>) -> TPayload,
-		TPayload: SignedPayload<T>,
-		;
+		TPayload: SignedPayload<T>;
 }
 
 /// Submit a signed transaction to the transaction pool.
 pub trait SendSignedTransaction<
 	T: SigningTypes + CreateSignedTransaction<LocalCall>,
 	C: AppCrypto<T::Public, T::Signature>,
-	LocalCall
-> {
+	LocalCall,
+>
+{
 	/// A submission result.
 	///
 	/// This should contain an indication of success and the account that was used for signing.
@@ -537,10 +534,7 @@ pub trait SendSignedTransaction<
 	/// to be returned.
 	/// The call is then wrapped into a transaction (see `#CreateSignedTransaction`), signed and
 	/// submitted to the pool.
-	fn send_signed_transaction(
-		&self,
-		f: impl Fn(&Account<T>) -> LocalCall,
-	) -> Self::Result;
+	fn send_signed_transaction(&self, f: impl Fn(&Account<T>) -> LocalCall) -> Self::Result;
 
 	/// Wraps the call into transaction, signs using given account and submits to the pool.
 	fn send_single_signed_transaction(
@@ -559,10 +553,9 @@ pub trait SendSignedTransaction<
 			call.into(),
 			account.public.clone(),
 			account.id.clone(),
-			account_data.nonce
+			account_data.nonce,
 		)?;
-		let res = SubmitTransaction::<T, LocalCall>
-			::submit_transaction(call, Some(signature));
+		let res = SubmitTransaction::<T, LocalCall>::submit_transaction(call, Some(signature));
 
 		if res.is_ok() {
 			// increment the nonce. This is fine, since the code should always
@@ -576,10 +569,7 @@ pub trait SendSignedTransaction<
 }
 
 /// Submit an unsigned transaction onchain with a signed payload
-pub trait SendUnsignedTransaction<
-	T: SigningTypes + SendTransactionTypes<LocalCall>,
-	LocalCall,
-> {
+pub trait SendUnsignedTransaction<T: SigningTypes + SendTransactionTypes<LocalCall>, LocalCall> {
 	/// A submission result.
 	///
 	/// Should contain the submission result and the account(s) that signed the payload.
@@ -601,12 +591,8 @@ pub trait SendUnsignedTransaction<
 		TPayload: SignedPayload<T>;
 
 	/// Submits an unsigned call to the transaction pool.
-	fn submit_unsigned_transaction(
-		&self,
-		call: LocalCall
-	) -> Option<Result<(), ()>> {
-		Some(SubmitTransaction::<T, LocalCall>
-			::submit_unsigned_transaction(call.into()))
+	fn submit_unsigned_transaction(&self, call: LocalCall) -> Option<Result<(), ()>> {
+		Some(SubmitTransaction::<T, LocalCall>::submit_unsigned_transaction(call.into()))
 	}
 }
 
@@ -631,14 +617,13 @@ pub trait SignedPayload<T: SigningTypes>: Encode {
 	}
 }
 
-
 #[cfg(test)]
 mod tests {
 	use super::*;
+	use crate::mock::{Call, Test as TestRuntime, CALL};
 	use codec::Decode;
-	use crate::mock::{Test as TestRuntime, Call, CALL};
 	use sp_core::offchain::{testing, TransactionPoolExt};
-	use sp_runtime::testing::{UintAuthorityId, TestSignature, TestXt};
+	use sp_runtime::testing::{TestSignature, TestXt, UintAuthorityId};
 
 	impl SigningTypes for TestRuntime {
 		type Public = UintAuthorityId;
@@ -675,16 +660,8 @@ mod tests {
 		type GenericSignature = TestSignature;
 	}
 
-	fn assert_account(
-		next: Option<(Account<TestRuntime>, Result<(), ()>)>,
-		index: usize,
-		id: u64,
-	) {
-		assert_eq!(next, Some((Account {
-			index,
-			id,
-			public: id.into(),
-		}, Ok(()))));
+	fn assert_account(next: Option<(Account<TestRuntime>, Result<(), ()>)>, index: usize, id: u64) {
+		assert_eq!(next, Some((Account { index, id, public: id.into() }, Ok(()))));
 	}
 
 	#[test]
@@ -699,16 +676,10 @@ mod tests {
 
 		t.execute_with(|| {
 			// when
-			let result = Signer::<TestRuntime, DummyAppCrypto>
-				::all_accounts()
+			let result = Signer::<TestRuntime, DummyAppCrypto>::all_accounts()
 				.send_unsigned_transaction(
-					|account| SimplePayload {
-						data: vec![1, 2, 3],
-						public: account.public.clone()
-					},
-					|_payload, _signature| {
-						CALL.clone()
-					}
+					|account| SimplePayload { data: vec![1, 2, 3], public: account.public.clone() },
+					|_payload, _signature| CALL.clone(),
 				);
 
 			// then
@@ -740,16 +711,10 @@ mod tests {
 
 		t.execute_with(|| {
 			// when
-			let result = Signer::<TestRuntime, DummyAppCrypto>
-				::any_account()
+			let result = Signer::<TestRuntime, DummyAppCrypto>::any_account()
 				.send_unsigned_transaction(
-					|account| SimplePayload {
-						data: vec![1, 2, 3],
-						public: account.public.clone()
-					},
-					|_payload, _signature| {
-						CALL.clone()
-					}
+					|account| SimplePayload { data: vec![1, 2, 3], public: account.public.clone() },
+					|_payload, _signature| CALL.clone(),
 				);
 
 			// then
@@ -777,17 +742,11 @@ mod tests {
 
 		t.execute_with(|| {
 			// when
-			let result = Signer::<TestRuntime, DummyAppCrypto>
-				::all_accounts()
+			let result = Signer::<TestRuntime, DummyAppCrypto>::all_accounts()
 				.with_filter(vec![0xf2.into(), 0xf1.into()])
 				.send_unsigned_transaction(
-					|account| SimplePayload {
-						data: vec![1, 2, 3],
-						public: account.public.clone()
-					},
-					|_payload, _signature| {
-						CALL.clone()
-					}
+					|account| SimplePayload { data: vec![1, 2, 3], public: account.public.clone() },
+					|_payload, _signature| CALL.clone(),
 				);
 
 			// then
@@ -817,17 +776,11 @@ mod tests {
 
 		t.execute_with(|| {
 			// when
-			let result = Signer::<TestRuntime, DummyAppCrypto>
-				::any_account()
+			let result = Signer::<TestRuntime, DummyAppCrypto>::any_account()
 				.with_filter(vec![0xf2.into(), 0xf1.into()])
 				.send_unsigned_transaction(
-					|account| SimplePayload {
-						data: vec![1, 2, 3],
-						public: account.public.clone()
-					},
-					|_payload, _signature| {
-						CALL.clone()
-					}
+					|account| SimplePayload { data: vec![1, 2, 3], public: account.public.clone() },
+					|_payload, _signature| CALL.clone(),
 				);
 
 			// then
@@ -842,5 +795,4 @@ mod tests {
 			assert_eq!(tx1.signature, None);
 		});
 	}
-
 }
diff --git a/frame/system/src/tests.rs b/frame/system/src/tests.rs
index 77d4baee88ac..f171fe661f69 100644
--- a/frame/system/src/tests.rs
+++ b/frame/system/src/tests.rs
@@ -16,11 +16,14 @@
 // limitations under the License.
 
 use crate::*;
-use mock::{*, Origin};
-use sp_core::H256;
-use sp_runtime::{DispatchError, DispatchErrorWithPostInfo, traits::{Header, BlakeTwo256}};
 use frame_support::{
-	assert_noop, assert_ok, weights::WithPostDispatchInfo, dispatch::PostDispatchInfo
+	assert_noop, assert_ok, dispatch::PostDispatchInfo, weights::WithPostDispatchInfo,
+};
+use mock::{Origin, *};
+use sp_core::H256;
+use sp_runtime::{
+	traits::{BlakeTwo256, Header},
+	DispatchError, DispatchErrorWithPostInfo,
 };
 
 #[test]
@@ -36,13 +39,10 @@ fn stored_map_works() {
 		assert_ok!(System::insert(&0, 42));
 		assert!(!System::is_provider_required(&0));
 
-		assert_eq!(Account::<Test>::get(0), AccountInfo {
-			nonce: 0,
-			providers: 1,
-			consumers: 0,
-			sufficients: 0,
-			data: 42,
-		});
+		assert_eq!(
+			Account::<Test>::get(0),
+			AccountInfo { nonce: 0, providers: 1, consumers: 0, sufficients: 0, data: 42 }
+		);
 
 		assert_ok!(System::inc_consumers(&0));
 		assert!(System::is_provider_required(&0));
@@ -154,40 +154,25 @@ fn provider_required_to_support_consumer() {
 #[test]
 fn deposit_event_should_work() {
 	new_test_ext().execute_with(|| {
-		System::initialize(
-			&1,
-			&[0u8; 32].into(),
-			&Default::default(),
-			InitKind::Full,
-		);
+		System::initialize(&1, &[0u8; 32].into(), &Default::default(), InitKind::Full);
 		System::note_finished_extrinsics();
 		System::deposit_event(SysEvent::CodeUpdated);
 		System::finalize();
 		assert_eq!(
 			System::events(),
-			vec![
-				EventRecord {
-					phase: Phase::Finalization,
-					event: SysEvent::CodeUpdated.into(),
-					topics: vec![],
-				}
-			]
+			vec![EventRecord {
+				phase: Phase::Finalization,
+				event: SysEvent::CodeUpdated.into(),
+				topics: vec![],
+			}]
 		);
 
-		System::initialize(
-			&2,
-			&[0u8; 32].into(),
-			&Default::default(),
-			InitKind::Full,
-		);
+		System::initialize(&2, &[0u8; 32].into(), &Default::default(), InitKind::Full);
 		System::deposit_event(SysEvent::NewAccount(32));
 		System::note_finished_initialize();
 		System::deposit_event(SysEvent::KilledAccount(42));
 		System::note_applied_extrinsic(&Ok(().into()), Default::default());
-		System::note_applied_extrinsic(
-			&Err(DispatchError::BadOrigin.into()),
-			Default::default()
-		);
+		System::note_applied_extrinsic(&Err(DispatchError::BadOrigin.into()), Default::default());
 		System::note_finished_extrinsics();
 		System::deposit_event(SysEvent::NewAccount(3));
 		System::finalize();
@@ -214,7 +199,8 @@ fn deposit_event_should_work() {
 					event: SysEvent::ExtrinsicFailed(
 						DispatchError::BadOrigin.into(),
 						Default::default()
-					).into(),
+					)
+					.into(),
 					topics: vec![]
 				},
 				EventRecord {
@@ -230,78 +216,56 @@ fn deposit_event_should_work() {
 #[test]
 fn deposit_event_uses_actual_weight() {
 	new_test_ext().execute_with(|| {
-		System::initialize(
-			&1,
-			&[0u8; 32].into(),
-			&Default::default(),
-			InitKind::Full,
-		);
+		System::initialize(&1, &[0u8; 32].into(), &Default::default(), InitKind::Full);
 		System::note_finished_initialize();
 
-		let pre_info = DispatchInfo {
-			weight: 1000,
-			.. Default::default()
-		};
-		System::note_applied_extrinsic(
-			&Ok(Some(300).into()),
-			pre_info,
-		);
-		System::note_applied_extrinsic(
-			&Ok(Some(1000).into()),
-			pre_info,
-		);
+		let pre_info = DispatchInfo { weight: 1000, ..Default::default() };
+		System::note_applied_extrinsic(&Ok(Some(300).into()), pre_info);
+		System::note_applied_extrinsic(&Ok(Some(1000).into()), pre_info);
 		System::note_applied_extrinsic(
 			// values over the pre info should be capped at pre dispatch value
 			&Ok(Some(1200).into()),
 			pre_info,
 		);
-		System::note_applied_extrinsic(
-			&Err(DispatchError::BadOrigin.with_weight(999)),
-			pre_info,
-		);
+		System::note_applied_extrinsic(&Err(DispatchError::BadOrigin.with_weight(999)), pre_info);
 
 		assert_eq!(
 			System::events(),
 			vec![
 				EventRecord {
 					phase: Phase::ApplyExtrinsic(0),
-					event: SysEvent::ExtrinsicSuccess(
-						DispatchInfo {
-							weight: 300,
-							.. Default::default()
-						},
-					).into(),
+					event: SysEvent::ExtrinsicSuccess(DispatchInfo {
+						weight: 300,
+						..Default::default()
+					},)
+					.into(),
 					topics: vec![]
 				},
 				EventRecord {
 					phase: Phase::ApplyExtrinsic(1),
-					event: SysEvent::ExtrinsicSuccess(
-						DispatchInfo {
-							weight: 1000,
-							.. Default::default()
-						},
-					).into(),
+					event: SysEvent::ExtrinsicSuccess(DispatchInfo {
+						weight: 1000,
+						..Default::default()
+					},)
+					.into(),
 					topics: vec![]
 				},
 				EventRecord {
 					phase: Phase::ApplyExtrinsic(2),
-					event: SysEvent::ExtrinsicSuccess(
-						DispatchInfo {
-							weight: 1000,
-							.. Default::default()
-						},
-					).into(),
+					event: SysEvent::ExtrinsicSuccess(DispatchInfo {
+						weight: 1000,
+						..Default::default()
+					},)
+					.into(),
 					topics: vec![]
 				},
 				EventRecord {
 					phase: Phase::ApplyExtrinsic(3),
 					event: SysEvent::ExtrinsicFailed(
 						DispatchError::BadOrigin.into(),
-						DispatchInfo {
-							weight: 999,
-							.. Default::default()
-						},
-					).into(),
+						DispatchInfo { weight: 999, ..Default::default() },
+					)
+					.into(),
 					topics: vec![]
 				},
 			]
@@ -314,19 +278,10 @@ fn deposit_event_topics() {
 	new_test_ext().execute_with(|| {
 		const BLOCK_NUMBER: u64 = 1;
 
-		System::initialize(
-			&BLOCK_NUMBER,
-			&[0u8; 32].into(),
-			&Default::default(),
-			InitKind::Full,
-		);
+		System::initialize(&BLOCK_NUMBER, &[0u8; 32].into(), &Default::default(), InitKind::Full);
 		System::note_finished_extrinsics();
 
-		let topics = vec![
-			H256::repeat_byte(1),
-			H256::repeat_byte(2),
-			H256::repeat_byte(3),
-		];
+		let topics = vec![H256::repeat_byte(1), H256::repeat_byte(2), H256::repeat_byte(3)];
 
 		// We deposit a few events with different sets of topics.
 		System::deposit_event_indexed(&topics[0..3], SysEvent::NewAccount(1).into());
@@ -359,18 +314,9 @@ fn deposit_event_topics() {
 
 		// Check that the topic-events mapping reflects the deposited topics.
 		// Note that these are indexes of the events.
-		assert_eq!(
-			System::event_topics(&topics[0]),
-			vec![(BLOCK_NUMBER, 0), (BLOCK_NUMBER, 1)],
-		);
-		assert_eq!(
-			System::event_topics(&topics[1]),
-			vec![(BLOCK_NUMBER, 0), (BLOCK_NUMBER, 2)],
-		);
-		assert_eq!(
-			System::event_topics(&topics[2]),
-			vec![(BLOCK_NUMBER, 0)],
-		);
+		assert_eq!(System::event_topics(&topics[0]), vec![(BLOCK_NUMBER, 0), (BLOCK_NUMBER, 1)],);
+		assert_eq!(System::event_topics(&topics[1]), vec![(BLOCK_NUMBER, 0), (BLOCK_NUMBER, 2)],);
+		assert_eq!(System::event_topics(&topics[2]), vec![(BLOCK_NUMBER, 0)],);
 	});
 }
 
@@ -390,30 +336,19 @@ fn prunes_block_hash_mappings() {
 	new_test_ext().execute_with(|| {
 		// simulate import of 15 blocks
 		for n in 1..=15 {
-			System::initialize(
-				&n,
-				&[n as u8 - 1; 32].into(),
-				&Default::default(),
-				InitKind::Full,
-			);
+			System::initialize(&n, &[n as u8 - 1; 32].into(), &Default::default(), InitKind::Full);
 
 			System::finalize();
 		}
 
 		// first 5 block hashes are pruned
 		for n in 0..5 {
-			assert_eq!(
-				System::block_hash(n),
-				H256::zero(),
-			);
+			assert_eq!(System::block_hash(n), H256::zero(),);
 		}
 
 		// the remaining 10 are kept
 		for n in 5..15 {
-			assert_eq!(
-				System::block_hash(n),
-				[n as u8; 32].into(),
-			);
+			assert_eq!(System::block_hash(n), [n as u8; 32].into(),);
 		}
 	})
 }
@@ -453,10 +388,7 @@ fn set_code_checks_works() {
 		let mut ext = new_test_ext();
 		ext.register_extension(sp_core::traits::ReadRuntimeVersionExt::new(read_runtime_version));
 		ext.execute_with(|| {
-			let res = System::set_code(
-				RawOrigin::Root.into(),
-				vec![1, 2, 3, 4],
-			);
+			let res = System::set_code(RawOrigin::Root.into(), vec![1, 2, 3, 4]);
 
 			assert_eq!(expected.map_err(DispatchErrorWithPostInfo::from), res);
 		});
@@ -473,7 +405,8 @@ fn set_code_with_real_wasm_blob() {
 		System::set_code(
 			RawOrigin::Root.into(),
 			substrate_test_runtime_client::runtime::wasm_binary_unwrap().to_vec(),
-		).unwrap();
+		)
+		.unwrap();
 
 		assert_eq!(
 			System::events(),
@@ -496,9 +429,10 @@ fn runtime_upgraded_with_set_storage() {
 			RawOrigin::Root.into(),
 			vec![(
 				well_known_keys::CODE.to_vec(),
-				substrate_test_runtime_client::runtime::wasm_binary_unwrap().to_vec()
+				substrate_test_runtime_client::runtime::wasm_binary_unwrap().to_vec(),
 			)],
-		).unwrap();
+		)
+		.unwrap();
 	});
 }
 
@@ -531,20 +465,12 @@ fn ensure_one_of_works() {
 #[test]
 fn extrinsics_root_is_calculated_correctly() {
 	new_test_ext().execute_with(|| {
-		System::initialize(
-			&1,
-			&[0u8; 32].into(),
-			&Default::default(),
-			InitKind::Full,
-		);
+		System::initialize(&1, &[0u8; 32].into(), &Default::default(), InitKind::Full);
 		System::note_finished_initialize();
 		System::note_extrinsic(vec![1]);
 		System::note_applied_extrinsic(&Ok(().into()), Default::default());
 		System::note_extrinsic(vec![2]);
-		System::note_applied_extrinsic(
-			&Err(DispatchError::BadOrigin.into()),
-			Default::default()
-		);
+		System::note_applied_extrinsic(&Err(DispatchError::BadOrigin.into()), Default::default());
 		System::note_finished_extrinsics();
 		let header = System::finalize();
 
diff --git a/frame/system/src/weights.rs b/frame/system/src/weights.rs
index c6284ba17d63..89fc63fab844 100644
--- a/frame/system/src/weights.rs
+++ b/frame/system/src/weights.rs
@@ -36,6 +36,7 @@
 // --template=./.maintain/frame-weight-template.hbs
 
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
diff --git a/frame/timestamp/src/benchmarking.rs b/frame/timestamp/src/benchmarking.rs
index 5d0178dc1484..84391380da83 100644
--- a/frame/timestamp/src/benchmarking.rs
+++ b/frame/timestamp/src/benchmarking.rs
@@ -20,9 +20,9 @@
 #![cfg(feature = "runtime-benchmarks")]
 
 use super::*;
-use frame_system::RawOrigin;
+use frame_benchmarking::{benchmarks, impl_benchmark_test_suite, TrackedStorageKey};
 use frame_support::{ensure, traits::OnFinalize};
-use frame_benchmarking::{benchmarks, TrackedStorageKey, impl_benchmark_test_suite};
+use frame_system::RawOrigin;
 
 use crate::Pallet as Timestamp;
 
@@ -57,8 +57,4 @@ benchmarks! {
 	}
 }
 
-impl_benchmark_test_suite!(
-	Timestamp,
-	crate::tests::new_test_ext(),
-	crate::tests::Test,
-);
+impl_benchmark_test_suite!(Timestamp, crate::tests::new_test_ext(), crate::tests::Test,);
diff --git a/frame/timestamp/src/lib.rs b/frame/timestamp/src/lib.rs
index e9b6388340b2..247520297d24 100644
--- a/frame/timestamp/src/lib.rs
+++ b/frame/timestamp/src/lib.rs
@@ -95,28 +95,30 @@
 mod benchmarking;
 pub mod weights;
 
-use sp_std::{result, cmp};
-use frame_support::traits::{Time, UnixTime, OnTimestampSet};
-use sp_runtime::traits::{AtLeast32Bit, Zero, SaturatedConversion, Scale};
-use sp_timestamp::{
-	InherentError, INHERENT_IDENTIFIER, InherentType,
-};
+use frame_support::traits::{OnTimestampSet, Time, UnixTime};
+use sp_runtime::traits::{AtLeast32Bit, SaturatedConversion, Scale, Zero};
+use sp_std::{cmp, result};
+use sp_timestamp::{InherentError, InherentType, INHERENT_IDENTIFIER};
 pub use weights::WeightInfo;
 
 pub use pallet::*;
 
 #[frame_support::pallet]
 pub mod pallet {
+	use super::*;
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
-	use super::*;
 
 	/// The pallet configuration trait
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
 		/// Type used for expressing timestamp.
-		type Moment: Parameter + Default + AtLeast32Bit
-			+ Scale<Self::BlockNumber, Output = Self::Moment> + Copy + MaxEncodedLen;
+		type Moment: Parameter
+			+ Default
+			+ AtLeast32Bit
+			+ Scale<Self::BlockNumber, Output = Self::Moment>
+			+ Copy
+			+ MaxEncodedLen;
 
 		/// Something which can be notified when the timestamp is set. Set this to `()` if not needed.
 		type OnTimestampSet: OnTimestampSet<Self::Moment>;
@@ -208,7 +210,8 @@ pub mod pallet {
 		const INHERENT_IDENTIFIER: InherentIdentifier = INHERENT_IDENTIFIER;
 
 		fn create_inherent(data: &InherentData) -> Option<Self::Call> {
-			let inherent_data = data.get_data::<InherentType>(&INHERENT_IDENTIFIER)
+			let inherent_data = data
+				.get_data::<InherentType>(&INHERENT_IDENTIFIER)
 				.expect("Timestamp inherent data not correctly encoded")
 				.expect("Timestamp inherent data must be provided");
 			let data = (*inherent_data).saturated_into::<T::Moment>();
@@ -217,7 +220,10 @@ pub mod pallet {
 			Some(Call::set(next_time.into()))
 		}
 
-		fn check_inherent(call: &Self::Call, data: &InherentData) -> result::Result<(), Self::Error> {
+		fn check_inherent(
+			call: &Self::Call,
+			data: &InherentData,
+		) -> result::Result<(), Self::Error> {
 			const MAX_TIMESTAMP_DRIFT_MILLIS: sp_timestamp::Timestamp =
 				sp_timestamp::Timestamp::new(30 * 1000);
 
@@ -226,7 +232,8 @@ pub mod pallet {
 				_ => return Ok(()),
 			};
 
-			let data = data.get_data::<InherentType>(&INHERENT_IDENTIFIER)
+			let data = data
+				.get_data::<InherentType>(&INHERENT_IDENTIFIER)
 				.expect("Timestamp inherent data not correctly encoded")
 				.expect("Timestamp inherent data must be provided");
 
@@ -293,13 +300,16 @@ impl<T: Config> UnixTime for Pallet<T> {
 
 #[cfg(test)]
 mod tests {
-	use crate as pallet_timestamp;
 	use super::*;
+	use crate as pallet_timestamp;
 
 	use frame_support::{assert_ok, parameter_types};
-	use sp_io::TestExternalities;
 	use sp_core::H256;
-	use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
+	use sp_io::TestExternalities;
+	use sp_runtime::{
+		testing::Header,
+		traits::{BlakeTwo256, IdentityLookup},
+	};
 
 	pub fn new_test_ext() -> TestExternalities {
 		let t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
@@ -380,7 +390,9 @@ mod tests {
 	}
 
 	#[test]
-	#[should_panic(expected = "Timestamp must increment by at least <MinimumPeriod> between sequential blocks")]
+	#[should_panic(
+		expected = "Timestamp must increment by at least <MinimumPeriod> between sequential blocks"
+	)]
 	fn block_period_minimum_enforced() {
 		new_test_ext().execute_with(|| {
 			Timestamp::set_timestamp(42);
diff --git a/frame/timestamp/src/weights.rs b/frame/timestamp/src/weights.rs
index cf4fa6ea3d63..a3fe6f198346 100644
--- a/frame/timestamp/src/weights.rs
+++ b/frame/timestamp/src/weights.rs
@@ -36,6 +36,7 @@
 // --template=./.maintain/frame-weight-template.hbs
 
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
diff --git a/frame/tips/src/benchmarking.rs b/frame/tips/src/benchmarking.rs
index 6c304fabb5a2..794a6815b3a3 100644
--- a/frame/tips/src/benchmarking.rs
+++ b/frame/tips/src/benchmarking.rs
@@ -21,8 +21,8 @@
 
 use super::*;
 
+use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, whitelisted_caller};
 use frame_system::RawOrigin;
-use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
 use sp_runtime::traits::Saturating;
 
 use crate::Module as TipsMod;
@@ -32,9 +32,9 @@ const SEED: u32 = 0;
 // Create the pre-requisite information needed to create a `report_awesome`.
 fn setup_awesome<T: Config>(length: u32) -> (T::AccountId, Vec<u8>, T::AccountId) {
 	let caller = whitelisted_caller();
-	let value = T::TipReportDepositBase::get()
-		+ T::DataDepositPerByte::get() * length.into()
-		+ T::Currency::minimum_balance();
+	let value = T::TipReportDepositBase::get() +
+		T::DataDepositPerByte::get() * length.into() +
+		T::Currency::minimum_balance();
 	let _ = T::Currency::make_free_balance_be(&caller, value);
 	let reason = vec![0; length as usize];
 	let awesome_person = account("awesome", 0, SEED);
@@ -42,12 +42,13 @@ fn setup_awesome<T: Config>(length: u32) -> (T::AccountId, Vec<u8>, T::AccountId
 }
 
 // Create the pre-requisite information needed to call `tip_new`.
-fn setup_tip<T: Config>(r: u32, t: u32) ->
-	Result<(T::AccountId, Vec<u8>, T::AccountId, BalanceOf<T>), &'static str>
-{
+fn setup_tip<T: Config>(
+	r: u32,
+	t: u32,
+) -> Result<(T::AccountId, Vec<u8>, T::AccountId, BalanceOf<T>), &'static str> {
 	let tippers_count = T::Tippers::count();
 
-	for i in 0 .. t {
+	for i in 0..t {
 		let member = account("member", i, SEED);
 		T::Tippers::add(&member);
 		ensure!(T::Tippers::contains(&member), "failed to add tipper");
@@ -63,10 +64,8 @@ fn setup_tip<T: Config>(r: u32, t: u32) ->
 
 // Create `t` new tips for the tip proposal with `hash`.
 // This function automatically makes the tip able to close.
-fn create_tips<T: Config>(t: u32, hash: T::Hash, value: BalanceOf<T>) ->
-	Result<(), &'static str>
-{
-	for i in 0 .. t {
+fn create_tips<T: Config>(t: u32, hash: T::Hash, value: BalanceOf<T>) -> Result<(), &'static str> {
+	for i in 0..t {
 		let caller = account("member", i, SEED);
 		ensure!(T::Tippers::contains(&caller), "caller is not a tipper");
 		TipsMod::<T>::tip(RawOrigin::Signed(caller).into(), hash, value)?;
@@ -193,8 +192,4 @@ benchmarks! {
 	}: _(RawOrigin::Root, hash)
 }
 
-impl_benchmark_test_suite!(
-	TipsMod,
-	crate::tests::new_test_ext(),
-	crate::tests::Test,
-);
+impl_benchmark_test_suite!(TipsMod, crate::tests::new_test_ext(), crate::tests::Test,);
diff --git a/frame/tips/src/lib.rs b/frame/tips/src/lib.rs
index e57f0d7b8df0..e8b5544bd664 100644
--- a/frame/tips/src/lib.rs
+++ b/frame/tips/src/lib.rs
@@ -54,23 +54,24 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-mod tests;
 mod benchmarking;
+mod tests;
 pub mod weights;
 
-use sp_std::prelude::*;
-use frame_support::{decl_module, decl_storage, decl_event, ensure, decl_error, Parameter};
-use frame_support::traits::{
-	Currency, Get, ExistenceRequirement::{KeepAlive},
-	ReservableCurrency
+use frame_support::{
+	decl_error, decl_event, decl_module, decl_storage, ensure,
+	traits::{Currency, ExistenceRequirement::KeepAlive, Get, ReservableCurrency},
+	Parameter,
 };
+use sp_std::prelude::*;
 
-use sp_runtime::{ Percent, RuntimeDebug, traits::{
-	Zero, AccountIdConversion, Hash, BadOrigin
-}};
-use frame_support::traits::{SortedMembers, ContainsLengthBound, OnUnbalanced, EnsureOrigin};
-use codec::{Encode, Decode};
+use codec::{Decode, Encode};
+use frame_support::traits::{ContainsLengthBound, EnsureOrigin, OnUnbalanced, SortedMembers};
 use frame_system::{self as system, ensure_signed};
+use sp_runtime::{
+	traits::{AccountIdConversion, BadOrigin, Hash, Zero},
+	Percent, RuntimeDebug,
+};
 pub use weights::WeightInfo;
 
 pub type BalanceOf<T> = pallet_treasury::BalanceOf<T>;
@@ -484,9 +485,9 @@ impl<T: Config> Module<T> {
 					if m < a {
 						continue
 					} else {
-						break true;
+						break true
 					}
-				}
+				},
 			}
 		});
 	}
@@ -495,7 +496,10 @@ impl<T: Config> Module<T> {
 	///
 	/// Up to three balance operations.
 	/// Plus `O(T)` (`T` is Tippers length).
-	fn payout_tip(hash: T::Hash, tip: OpenTip<T::AccountId, BalanceOf<T>, T::BlockNumber, T::Hash>) {
+	fn payout_tip(
+		hash: T::Hash,
+		tip: OpenTip<T::AccountId, BalanceOf<T>, T::BlockNumber, T::Hash>,
+	) {
 		let mut tips = tip.tips;
 		Self::retain_active_tips(&mut tips);
 		tips.sort_by_key(|i| i.1);
@@ -549,22 +553,18 @@ impl<T: Config> Module<T> {
 			tips: Vec<(AccountId, Balance)>,
 		}
 
-		use frame_support::{Twox64Concat, migration::storage_key_iter};
+		use frame_support::{migration::storage_key_iter, Twox64Concat};
 
 		for (hash, old_tip) in storage_key_iter::<
 			T::Hash,
 			OldOpenTip<T::AccountId, BalanceOf<T>, T::BlockNumber, T::Hash>,
 			Twox64Concat,
-		>(b"Treasury", b"Tips").drain()
+		>(b"Treasury", b"Tips")
+		.drain()
 		{
-
 			let (finder, deposit, finders_fee) = match old_tip.finder {
-				Some((finder, deposit)) => {
-					(finder, deposit, true)
-				},
-				None => {
-					(T::AccountId::default(), Zero::zero(), false)
-				},
+				Some((finder, deposit)) => (finder, deposit, true),
+				None => (T::AccountId::default(), Zero::zero(), false),
 			};
 			let new_tip = OpenTip {
 				reason: old_tip.reason,
@@ -573,7 +573,7 @@ impl<T: Config> Module<T> {
 				deposit,
 				closes: old_tip.closes,
 				tips: old_tip.tips,
-				finders_fee
+				finders_fee,
 			};
 			Tips::<T>::insert(hash, new_tip)
 		}
diff --git a/frame/tips/src/tests.rs b/frame/tips/src/tests.rs
index 7cf4c31a6495..eb52acf8026b 100644
--- a/frame/tips/src/tests.rs
+++ b/frame/tips/src/tests.rs
@@ -19,21 +19,19 @@
 
 #![cfg(test)]
 
-use crate as tips;
 use super::*;
-use std::cell::RefCell;
+use crate as tips;
 use frame_support::{
-	assert_noop, assert_ok, parameter_types,
-	weights::Weight, traits::SortedMembers,
-	PalletId, pallet_prelude::GenesisBuild,
+	assert_noop, assert_ok, pallet_prelude::GenesisBuild, parameter_types, traits::SortedMembers,
+	weights::Weight, PalletId,
 };
-use sp_runtime::Permill;
 use sp_core::H256;
 use sp_runtime::{
-	Perbill,
 	testing::Header,
-	traits::{BlakeTwo256, IdentityLookup, BadOrigin},
+	traits::{BadOrigin, BlakeTwo256, IdentityLookup},
+	Perbill, Permill,
 };
+use std::cell::RefCell;
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -102,9 +100,7 @@ thread_local! {
 pub struct TenToFourteen;
 impl SortedMembers<u128> for TenToFourteen {
 	fn sorted_members() -> Vec<u128> {
-		TEN_TO_FOURTEEN.with(|v| {
-			v.borrow().clone()
-		})
+		TEN_TO_FOURTEEN.with(|v| v.borrow().clone())
 	}
 	#[cfg(feature = "runtime-benchmarks")]
 	fn add(new: &u128) {
@@ -119,7 +115,9 @@ impl ContainsLengthBound for TenToFourteen {
 	fn max_len() -> usize {
 		TEN_TO_FOURTEEN.with(|v| v.borrow().len())
 	}
-	fn min_len() -> usize { 0 }
+	fn min_len() -> usize {
+		0
+	}
 }
 parameter_types! {
 	pub const ProposalBond: Permill = Permill::from_percent(5);
@@ -142,7 +140,7 @@ impl pallet_treasury::Config for Test {
 	type ProposalBondMinimum = ProposalBondMinimum;
 	type SpendPeriod = SpendPeriod;
 	type Burn = Burn;
-	type BurnDestination = ();  // Just gets burned.
+	type BurnDestination = (); // Just gets burned.
 	type WeightInfo = ();
 	type SpendFunds = ();
 	type MaxApprovals = MaxApprovals;
@@ -165,19 +163,21 @@ impl Config for Test {
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-	pallet_balances::GenesisConfig::<Test>{
+	pallet_balances::GenesisConfig::<Test> {
 		// Total issuance will be 200 with treasury account initialized at ED.
 		balances: vec![(0, 100), (1, 98), (2, 1)],
-	}.assimilate_storage(&mut t).unwrap();
+	}
+	.assimilate_storage(&mut t)
+	.unwrap();
 	GenesisBuild::<Test>::assimilate_storage(&pallet_treasury::GenesisConfig, &mut t).unwrap();
 	t.into()
 }
 
 fn last_event() -> RawEvent<u64, u128, H256> {
-	System::events().into_iter().map(|r| r.event)
-		.filter_map(|e| {
-			if let Event::TipsModTestInst(inner) = e { Some(inner) } else { None }
-		})
+	System::events()
+		.into_iter()
+		.map(|r| r.event)
+		.filter_map(|e| if let Event::TipsModTestInst(inner) = e { Some(inner) } else { None })
 		.last()
 		.unwrap()
 }
@@ -267,13 +267,19 @@ fn close_tip_works() {
 
 		assert_ok!(TipsModTestInst::tip(Origin::signed(11), h.clone(), 10));
 
-		assert_noop!(TipsModTestInst::close_tip(Origin::signed(0), h.into()), Error::<Test>::StillOpen);
+		assert_noop!(
+			TipsModTestInst::close_tip(Origin::signed(0), h.into()),
+			Error::<Test>::StillOpen
+		);
 
 		assert_ok!(TipsModTestInst::tip(Origin::signed(12), h.clone(), 10));
 
 		assert_eq!(last_event(), RawEvent::TipClosing(h));
 
-		assert_noop!(TipsModTestInst::close_tip(Origin::signed(0), h.into()), Error::<Test>::Premature);
+		assert_noop!(
+			TipsModTestInst::close_tip(Origin::signed(0), h.into()),
+			Error::<Test>::Premature
+		);
 
 		System::set_block_number(2);
 		assert_noop!(TipsModTestInst::close_tip(Origin::none(), h.into()), BadOrigin);
@@ -282,7 +288,10 @@ fn close_tip_works() {
 
 		assert_eq!(last_event(), RawEvent::TipClosed(h, 3, 10));
 
-		assert_noop!(TipsModTestInst::close_tip(Origin::signed(100), h.into()), Error::<Test>::UnknownTip);
+		assert_noop!(
+			TipsModTestInst::close_tip(Origin::signed(100), h.into()),
+			Error::<Test>::UnknownTip
+		);
 	});
 }
 
@@ -305,10 +314,7 @@ fn slash_tip_works() {
 		assert_eq!(last_event(), RawEvent::NewTip(h));
 
 		// can't remove from any origin
-		assert_noop!(
-			TipsModTestInst::slash_tip(Origin::signed(0), h.clone()),
-			BadOrigin,
-		);
+		assert_noop!(TipsModTestInst::slash_tip(Origin::signed(0), h.clone()), BadOrigin,);
 
 		// can remove from root.
 		assert_ok!(TipsModTestInst::slash_tip(Origin::root(), h.clone()));
@@ -330,10 +336,16 @@ fn retract_tip_works() {
 		assert_ok!(TipsModTestInst::tip(Origin::signed(10), h.clone(), 10));
 		assert_ok!(TipsModTestInst::tip(Origin::signed(11), h.clone(), 10));
 		assert_ok!(TipsModTestInst::tip(Origin::signed(12), h.clone(), 10));
-		assert_noop!(TipsModTestInst::retract_tip(Origin::signed(10), h.clone()), Error::<Test>::NotFinder);
+		assert_noop!(
+			TipsModTestInst::retract_tip(Origin::signed(10), h.clone()),
+			Error::<Test>::NotFinder
+		);
 		assert_ok!(TipsModTestInst::retract_tip(Origin::signed(0), h.clone()));
 		System::set_block_number(2);
-		assert_noop!(TipsModTestInst::close_tip(Origin::signed(0), h.into()), Error::<Test>::UnknownTip);
+		assert_noop!(
+			TipsModTestInst::close_tip(Origin::signed(0), h.into()),
+			Error::<Test>::UnknownTip
+		);
 
 		// with tip new
 		Balances::make_free_balance_be(&Treasury::account_id(), 101);
@@ -341,10 +353,16 @@ fn retract_tip_works() {
 		let h = tip_hash();
 		assert_ok!(TipsModTestInst::tip(Origin::signed(11), h.clone(), 10));
 		assert_ok!(TipsModTestInst::tip(Origin::signed(12), h.clone(), 10));
-		assert_noop!(TipsModTestInst::retract_tip(Origin::signed(0), h.clone()), Error::<Test>::NotFinder);
+		assert_noop!(
+			TipsModTestInst::retract_tip(Origin::signed(0), h.clone()),
+			Error::<Test>::NotFinder
+		);
 		assert_ok!(TipsModTestInst::retract_tip(Origin::signed(10), h.clone()));
 		System::set_block_number(2);
-		assert_noop!(TipsModTestInst::close_tip(Origin::signed(10), h.into()), Error::<Test>::UnknownTip);
+		assert_noop!(
+			TipsModTestInst::close_tip(Origin::signed(10), h.into()),
+			Error::<Test>::UnknownTip
+		);
 	});
 }
 
@@ -416,7 +434,7 @@ fn test_last_reward_migration() {
 		who: 10,
 		finder: Some((20, 30)),
 		closes: Some(13),
-		tips: vec![(40, 50), (60, 70)]
+		tips: vec![(40, 50), (60, 70)],
 	};
 
 	let reason2 = BlakeTwo256::hash(b"reason2");
@@ -427,24 +445,17 @@ fn test_last_reward_migration() {
 		who: 20,
 		finder: None,
 		closes: Some(13),
-		tips: vec![(40, 50), (60, 70)]
+		tips: vec![(40, 50), (60, 70)],
 	};
 
 	let data = vec![
-		(
-			Tips::<Test>::hashed_key_for(hash1),
-			old_tip_finder.encode().to_vec()
-		),
-		(
-			Tips::<Test>::hashed_key_for(hash2),
-			old_tip_no_finder.encode().to_vec()
-		),
+		(Tips::<Test>::hashed_key_for(hash1), old_tip_finder.encode().to_vec()),
+		(Tips::<Test>::hashed_key_for(hash2), old_tip_no_finder.encode().to_vec()),
 	];
 
 	s.top = data.into_iter().collect();
 
 	sp_io::TestExternalities::new(s).execute_with(|| {
-
 		TipsModTestInst::migrate_retract_tip_for_tip_new();
 
 		// Test w/ finder
@@ -481,10 +492,12 @@ fn test_last_reward_migration() {
 fn genesis_funding_works() {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
 	let initial_funding = 100;
-	pallet_balances::GenesisConfig::<Test>{
+	pallet_balances::GenesisConfig::<Test> {
 		// Total issuance will be 200 with treasury account initialized with 100.
 		balances: vec![(0, 100), (Treasury::account_id(), initial_funding)],
-	}.assimilate_storage(&mut t).unwrap();
+	}
+	.assimilate_storage(&mut t)
+	.unwrap();
 	GenesisBuild::<Test>::assimilate_storage(&pallet_treasury::GenesisConfig, &mut t).unwrap();
 	let mut t: sp_io::TestExternalities = t.into();
 
diff --git a/frame/tips/src/weights.rs b/frame/tips/src/weights.rs
index ceee79bd6f07..439c7f976c12 100644
--- a/frame/tips/src/weights.rs
+++ b/frame/tips/src/weights.rs
@@ -36,6 +36,7 @@
 // --template=./.maintain/frame-weight-template.hbs
 
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
diff --git a/frame/transaction-payment/rpc/src/lib.rs b/frame/transaction-payment/rpc/src/lib.rs
index efe9f010d139..945156d12a6a 100644
--- a/frame/transaction-payment/rpc/src/lib.rs
+++ b/frame/transaction-payment/rpc/src/lib.rs
@@ -17,33 +17,31 @@
 
 //! RPC interface for the transaction payment pallet.
 
-use std::sync::Arc;
-use std::convert::TryInto;
+pub use self::gen_client::Client as TransactionPaymentClient;
 use codec::{Codec, Decode};
-use sp_blockchain::HeaderBackend;
 use jsonrpc_core::{Error as RpcError, ErrorCode, Result};
 use jsonrpc_derive::rpc;
-use sp_runtime::{generic::BlockId, traits::{Block as BlockT, MaybeDisplay}};
+pub use pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi as TransactionPaymentRuntimeApi;
+use pallet_transaction_payment_rpc_runtime_api::{FeeDetails, InclusionFee, RuntimeDispatchInfo};
 use sp_api::ProvideRuntimeApi;
+use sp_blockchain::HeaderBackend;
 use sp_core::Bytes;
 use sp_rpc::number::NumberOrHex;
-use pallet_transaction_payment_rpc_runtime_api::{FeeDetails, InclusionFee, RuntimeDispatchInfo};
-pub use pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi as TransactionPaymentRuntimeApi;
-pub use self::gen_client::Client as TransactionPaymentClient;
+use sp_runtime::{
+	generic::BlockId,
+	traits::{Block as BlockT, MaybeDisplay},
+};
+use std::{convert::TryInto, sync::Arc};
 
 #[rpc]
 pub trait TransactionPaymentApi<BlockHash, ResponseType> {
 	#[rpc(name = "payment_queryInfo")]
-	fn query_info(
-		&self,
-		encoded_xt: Bytes,
-		at: Option<BlockHash>
-	) -> Result<ResponseType>;
+	fn query_info(&self, encoded_xt: Bytes, at: Option<BlockHash>) -> Result<ResponseType>;
 	#[rpc(name = "payment_queryFeeDetails")]
 	fn query_fee_details(
 		&self,
 		encoded_xt: Bytes,
-		at: Option<BlockHash>
+		at: Option<BlockHash>,
 	) -> Result<FeeDetails<NumberOrHex>>;
 }
 
@@ -77,10 +75,8 @@ impl From<Error> for i64 {
 	}
 }
 
-impl<C, Block, Balance> TransactionPaymentApi<
-	<Block as BlockT>::Hash,
-	RuntimeDispatchInfo<Balance>,
-> for TransactionPayment<C, Block>
+impl<C, Block, Balance> TransactionPaymentApi<<Block as BlockT>::Hash, RuntimeDispatchInfo<Balance>>
+	for TransactionPayment<C, Block>
 where
 	Block: BlockT,
 	C: 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block>,
@@ -90,13 +86,12 @@ where
 	fn query_info(
 		&self,
 		encoded_xt: Bytes,
-		at: Option<<Block as BlockT>::Hash>
+		at: Option<<Block as BlockT>::Hash>,
 	) -> Result<RuntimeDispatchInfo<Balance>> {
 		let api = self.client.runtime_api();
 		let at = BlockId::hash(at.unwrap_or_else(||
 			// If the block hash is not supplied assume the best block.
-			self.client.info().best_hash
-		));
+			self.client.info().best_hash));
 
 		let encoded_len = encoded_xt.len() as u32;
 
@@ -120,8 +115,7 @@ where
 		let api = self.client.runtime_api();
 		let at = BlockId::hash(at.unwrap_or_else(||
 			// If the block hash is not supplied assume the best block.
-			self.client.info().best_hash
-		));
+			self.client.info().best_hash));
 
 		let encoded_len = encoded_xt.len() as u32;
 
@@ -136,11 +130,13 @@ where
 			data: Some(format!("{:?}", e).into()),
 		})?;
 
-		let try_into_rpc_balance = |value: Balance| value.try_into().map_err(|_| RpcError {
-			code: ErrorCode::InvalidParams,
-			message: format!("{} doesn't fit in NumberOrHex representation", value),
-			data: None,
-		});
+		let try_into_rpc_balance = |value: Balance| {
+			value.try_into().map_err(|_| RpcError {
+				code: ErrorCode::InvalidParams,
+				message: format!("{} doesn't fit in NumberOrHex representation", value),
+				data: None,
+			})
+		};
 
 		Ok(FeeDetails {
 			inclusion_fee: if let Some(inclusion_fee) = fee_details.inclusion_fee {
diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
index 25fce83e6993..882f37dceedf 100644
--- a/frame/transaction-payment/src/lib.rs
+++ b/frame/transaction-payment/src/lib.rs
@@ -47,27 +47,27 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use codec::{Encode, Decode};
+use codec::{Decode, Encode};
 
 use sp_runtime::{
-	FixedU128, FixedPointNumber, FixedPointOperand, Perquintill, RuntimeDebug,
-	transaction_validity::{
-		TransactionPriority, ValidTransaction, TransactionValidityError, TransactionValidity,
-	},
 	traits::{
-		Saturating, SignedExtension, SaturatedConversion, Convert, Dispatchable,
-		DispatchInfoOf, PostDispatchInfoOf,
+		Convert, DispatchInfoOf, Dispatchable, PostDispatchInfoOf, SaturatedConversion, Saturating,
+		SignedExtension,
 	},
+	transaction_validity::{
+		TransactionPriority, TransactionValidity, TransactionValidityError, ValidTransaction,
+	},
+	FixedPointNumber, FixedPointOperand, FixedU128, Perquintill, RuntimeDebug,
 };
 use sp_std::prelude::*;
 
 use frame_support::{
+	dispatch::DispatchResult,
 	traits::Get,
 	weights::{
-		Weight, DispatchInfo, PostDispatchInfo, GetDispatchInfo, Pays, WeightToFeePolynomial,
-		WeightToFeeCoefficient, DispatchClass,
+		DispatchClass, DispatchInfo, GetDispatchInfo, Pays, PostDispatchInfo, Weight,
+		WeightToFeeCoefficient, WeightToFeePolynomial,
 	},
-	dispatch::DispatchResult,
 };
 
 mod payment;
@@ -75,7 +75,7 @@ mod types;
 
 pub use pallet::*;
 pub use payment::*;
-pub use types::{InclusionFee, FeeDetails, RuntimeDispatchInfo};
+pub use types::{FeeDetails, InclusionFee, RuntimeDispatchInfo};
 
 /// Fee multiplier.
 pub type Multiplier = FixedU128;
@@ -91,11 +91,11 @@ type BalanceOf<T> = <<T as Config>::OnChargeTransaction as OnChargeTransaction<T
 /// 	s = previous block weight
 /// 	s'= ideal block weight
 /// 	m = maximum block weight
-///		diff = (s - s')/m
-///		v = 0.00001
-///		t1 = (v * diff)
-///		t2 = (v * diff)^2 / 2
-///	then:
+/// 		diff = (s - s')/m
+/// 		v = 0.00001
+/// 		t1 = (v * diff)
+/// 		t2 = (v * diff)^2 / 2
+/// 	then:
 /// 	next_multiplier = prev_multiplier * (1 + t1 + t2)
 ///
 /// Where `(s', v)` must be given as the `Get` implementation of the `T` generic type. Moreover, `M`
@@ -152,7 +152,11 @@ impl MultiplierUpdate for () {
 }
 
 impl<T, S, V, M> MultiplierUpdate for TargetedFeeAdjustment<T, S, V, M>
-	where T: frame_system::Config, S: Get<Perquintill>, V: Get<Multiplier>, M: Get<Multiplier>,
+where
+	T: frame_system::Config,
+	S: Get<Perquintill>,
+	V: Get<Multiplier>,
+	M: Get<Multiplier>,
 {
 	fn min() -> Multiplier {
 		M::get()
@@ -166,7 +170,11 @@ impl<T, S, V, M> MultiplierUpdate for TargetedFeeAdjustment<T, S, V, M>
 }
 
 impl<T, S, V, M> Convert<Multiplier, Multiplier> for TargetedFeeAdjustment<T, S, V, M>
-	where T: frame_system::Config, S: Get<Perquintill>, V: Get<Multiplier>, M: Get<Multiplier>,
+where
+	T: frame_system::Config,
+	S: Get<Perquintill>,
+	V: Get<Multiplier>,
+	M: Get<Multiplier>,
 {
 	fn convert(previous: Multiplier) -> Multiplier {
 		// Defensive only. The multiplier in storage should always be at most positive. Nonetheless
@@ -177,12 +185,13 @@ impl<T, S, V, M> Convert<Multiplier, Multiplier> for TargetedFeeAdjustment<T, S,
 
 		let weights = T::BlockWeights::get();
 		// the computed ratio is only among the normal class.
-		let normal_max_weight = weights.get(DispatchClass::Normal).max_total
+		let normal_max_weight = weights
+			.get(DispatchClass::Normal)
+			.max_total
 			.unwrap_or_else(|| weights.max_block);
 		let current_block_weight = <frame_system::Pallet<T>>::block_weight();
-		let normal_block_weight = *current_block_weight
-			.get(DispatchClass::Normal)
-			.min(&normal_max_weight);
+		let normal_block_weight =
+			*current_block_weight.get(DispatchClass::Normal).min(&normal_max_weight);
 
 		let s = S::get();
 		let v = V::get();
@@ -232,9 +241,9 @@ impl Default for Releases {
 
 #[frame_support::pallet]
 pub mod pallet {
+	use super::*;
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
-	use super::*;
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
@@ -263,7 +272,7 @@ pub mod pallet {
 
 	#[pallet::extra_constants]
 	impl<T: Config> Pallet<T> {
-		//TODO: rename to snake case after https://github.com/paritytech/substrate/issues/8826 fixed.
+		// TODO: rename to snake case after https://github.com/paritytech/substrate/issues/8826 fixed.
 		#[allow(non_snake_case)]
 		/// The polynomial that is applied in order to derive fee from weight.
 		fn WeightToFee() -> Vec<WeightToFeeCoefficient<BalanceOf<T>>> {
@@ -272,16 +281,14 @@ pub mod pallet {
 	}
 
 	#[pallet::type_value]
-	pub fn NextFeeMultiplierOnEmpty() -> Multiplier { Multiplier::saturating_from_integer(1) }
+	pub fn NextFeeMultiplierOnEmpty() -> Multiplier {
+		Multiplier::saturating_from_integer(1)
+	}
 
 	#[pallet::storage]
 	#[pallet::getter(fn next_fee_multiplier)]
-	pub type NextFeeMultiplier<T: Config> = StorageValue<
-		_,
-		Multiplier,
-		ValueQuery,
-		NextFeeMultiplierOnEmpty
-	>;
+	pub type NextFeeMultiplier<T: Config> =
+		StorageValue<_, Multiplier, ValueQuery, NextFeeMultiplierOnEmpty>;
 
 	#[pallet::storage]
 	pub(super) type StorageVersion<T: Config> = StorageValue<_, Releases, ValueQuery>;
@@ -318,9 +325,10 @@ pub mod pallet {
 			use sp_std::convert::TryInto;
 			assert!(
 				<Multiplier as sp_runtime::traits::Bounded>::max_value() >=
-				Multiplier::checked_from_integer(
-					T::BlockWeights::get().max_block.try_into().unwrap()
-				).unwrap(),
+					Multiplier::checked_from_integer(
+						T::BlockWeights::get().max_block.try_into().unwrap()
+					)
+					.unwrap(),
 			);
 
 			// This is the minimum value of the multiplier. Make sure that if we collapse to this
@@ -331,13 +339,13 @@ pub mod pallet {
 			let mut target = T::FeeMultiplierUpdate::target() *
 				T::BlockWeights::get().get(DispatchClass::Normal).max_total.expect(
 					"Setting `max_total` for `Normal` dispatch class is not compatible with \
-					`transaction-payment` pallet."
+					`transaction-payment` pallet.",
 				);
 			// add 1 percent;
 			let addition = target / 100;
 			if addition == 0 {
 				// this is most likely because in a test setup we set everything to ().
-				return;
+				return
 			}
 			target += addition;
 
@@ -345,7 +353,9 @@ pub mod pallet {
 			sp_io::TestExternalities::new_empty().execute_with(|| {
 				<frame_system::Pallet<T>>::set_block_consumed_resources(target, 0);
 				let next = T::FeeMultiplierUpdate::convert(min_value);
-				assert!(next > min_value, "The minimum bound of the multiplier is too low. When \
+				assert!(
+					next > min_value,
+					"The minimum bound of the multiplier is too low. When \
 					block saturation is more than target by 1% and multiplier is minimal then \
 					the multiplier doesn't increase."
 				);
@@ -354,8 +364,9 @@ pub mod pallet {
 	}
 }
 
-impl<T: Config> Pallet<T> where
-	BalanceOf<T>: FixedPointOperand
+impl<T: Config> Pallet<T>
+where
+	BalanceOf<T>: FixedPointOperand,
 {
 	/// Query the data that we know about the fee of a given `call`.
 	///
@@ -398,11 +409,8 @@ impl<T: Config> Pallet<T> where
 	}
 
 	/// Compute the final fee value for a particular transaction.
-	pub fn compute_fee(
-		len: u32,
-		info: &DispatchInfoOf<T::Call>,
-		tip: BalanceOf<T>,
-	) -> BalanceOf<T> where
+	pub fn compute_fee(len: u32, info: &DispatchInfoOf<T::Call>, tip: BalanceOf<T>) -> BalanceOf<T>
+	where
 		T::Call: Dispatchable<Info = DispatchInfo>,
 	{
 		Self::compute_fee_details(len, info, tip).final_fee()
@@ -413,7 +421,8 @@ impl<T: Config> Pallet<T> where
 		len: u32,
 		info: &DispatchInfoOf<T::Call>,
 		tip: BalanceOf<T>,
-	) -> FeeDetails<BalanceOf<T>> where
+	) -> FeeDetails<BalanceOf<T>>
+	where
 		T::Call: Dispatchable<Info = DispatchInfo>,
 	{
 		Self::compute_fee_raw(len, info.weight, tip, info.pays_fee, info.class)
@@ -428,7 +437,8 @@ impl<T: Config> Pallet<T> where
 		info: &DispatchInfoOf<T::Call>,
 		post_info: &PostDispatchInfoOf<T::Call>,
 		tip: BalanceOf<T>,
-	) -> BalanceOf<T> where
+	) -> BalanceOf<T>
+	where
 		T::Call: Dispatchable<Info = DispatchInfo, PostInfo = PostDispatchInfo>,
 	{
 		Self::compute_actual_fee_details(len, info, post_info, tip).final_fee()
@@ -440,7 +450,8 @@ impl<T: Config> Pallet<T> where
 		info: &DispatchInfoOf<T::Call>,
 		post_info: &PostDispatchInfoOf<T::Call>,
 		tip: BalanceOf<T>,
-	) -> FeeDetails<BalanceOf<T>> where
+	) -> FeeDetails<BalanceOf<T>>
+	where
 		T::Call: Dispatchable<Info = DispatchInfo, PostInfo = PostDispatchInfo>,
 	{
 		Self::compute_fee_raw(
@@ -477,15 +488,12 @@ impl<T: Config> Pallet<T> where
 				inclusion_fee: Some(InclusionFee {
 					base_fee,
 					len_fee: fixed_len_fee,
-					adjusted_weight_fee
+					adjusted_weight_fee,
 				}),
-				tip
+				tip,
 			}
 		} else {
-			FeeDetails {
-				inclusion_fee: None,
-				tip
-			}
+			FeeDetails { inclusion_fee: None, tip }
 		}
 	}
 
@@ -497,7 +505,8 @@ impl<T: Config> Pallet<T> where
 	}
 }
 
-impl<T> Convert<Weight, BalanceOf<T>> for Pallet<T> where
+impl<T> Convert<Weight, BalanceOf<T>> for Pallet<T>
+where
 	T: Config,
 	BalanceOf<T>: FixedPointOperand,
 {
@@ -516,7 +525,8 @@ impl<T> Convert<Weight, BalanceOf<T>> for Pallet<T> where
 #[derive(Encode, Decode, Clone, Eq, PartialEq)]
 pub struct ChargeTransactionPayment<T: Config>(#[codec(compact)] BalanceOf<T>);
 
-impl<T: Config> ChargeTransactionPayment<T> where
+impl<T: Config> ChargeTransactionPayment<T>
+where
 	T::Call: Dispatchable<Info = DispatchInfo, PostInfo = PostDispatchInfo>,
 	BalanceOf<T>: Send + Sync + FixedPointOperand,
 {
@@ -546,8 +556,10 @@ impl<T: Config> ChargeTransactionPayment<T> where
 		let tip = self.0;
 		let fee = Pallet::<T>::compute_fee(len as u32, info, tip);
 
-		<<T as Config>::OnChargeTransaction as OnChargeTransaction<T>>::withdraw_fee(who, call, info, fee, tip)
-			.map(|i| (fee, i))
+		<<T as Config>::OnChargeTransaction as OnChargeTransaction<T>>::withdraw_fee(
+			who, call, info, fee, tip,
+		)
+		.map(|i| (fee, i))
 	}
 
 	/// Get an appropriate priority for a transaction with the given length and info.
@@ -560,11 +572,16 @@ impl<T: Config> ChargeTransactionPayment<T> where
 	/// and the entire block weight `(1/1)`, its priority is `fee * min(1, 4) = fee * 1`. This means
 	///  that the transaction which consumes more resources (either length or weight) with the same
 	/// `fee` ends up having lower priority.
-	fn get_priority(len: usize, info: &DispatchInfoOf<T::Call>, final_fee: BalanceOf<T>) -> TransactionPriority {
+	fn get_priority(
+		len: usize,
+		info: &DispatchInfoOf<T::Call>,
+		final_fee: BalanceOf<T>,
+	) -> TransactionPriority {
 		let weight_saturation = T::BlockWeights::get().max_block / info.weight.max(1);
 		let max_block_length = *T::BlockLength::get().max.get(DispatchClass::Normal);
 		let len_saturation = max_block_length as u64 / (len as u64).max(1);
-		let coefficient: BalanceOf<T> = weight_saturation.min(len_saturation).saturated_into::<BalanceOf<T>>();
+		let coefficient: BalanceOf<T> =
+			weight_saturation.min(len_saturation).saturated_into::<BalanceOf<T>>();
 		final_fee.saturating_mul(coefficient).saturated_into::<TransactionPriority>()
 	}
 }
@@ -580,7 +597,8 @@ impl<T: Config> sp_std::fmt::Debug for ChargeTransactionPayment<T> {
 	}
 }
 
-impl<T: Config> SignedExtension for ChargeTransactionPayment<T> where
+impl<T: Config> SignedExtension for ChargeTransactionPayment<T>
+where
 	BalanceOf<T>: Send + Sync + From<u64> + FixedPointOperand,
 	T::Call: Dispatchable<Info = DispatchInfo, PostInfo = PostDispatchInfo>,
 {
@@ -596,7 +614,9 @@ impl<T: Config> SignedExtension for ChargeTransactionPayment<T> where
 		// imbalance resulting from withdrawing the fee
 		<<T as Config>::OnChargeTransaction as OnChargeTransaction<T>>::LiquidityInfo,
 	);
-	fn additional_signed(&self) -> sp_std::result::Result<(), TransactionValidityError> { Ok(()) }
+	fn additional_signed(&self) -> sp_std::result::Result<(), TransactionValidityError> {
+		Ok(())
+	}
 
 	fn validate(
 		&self,
@@ -606,10 +626,7 @@ impl<T: Config> SignedExtension for ChargeTransactionPayment<T> where
 		len: usize,
 	) -> TransactionValidity {
 		let (fee, _) = self.withdraw_fee(who, call, info, len)?;
-		Ok(ValidTransaction {
-			priority: Self::get_priority(len, info, fee),
-			..Default::default()
-		})
+		Ok(ValidTransaction { priority: Self::get_priority(len, info, fee), ..Default::default() })
 	}
 
 	fn pre_dispatch(
@@ -617,7 +634,7 @@ impl<T: Config> SignedExtension for ChargeTransactionPayment<T> where
 		who: &Self::AccountId,
 		call: &Self::Call,
 		info: &DispatchInfoOf<Self::Call>,
-		len: usize
+		len: usize,
 	) -> Result<Self::Pre, TransactionValidityError> {
 		let (_fee, imbalance) = self.withdraw_fee(who, call, info, len)?;
 		Ok((self.0, who.clone(), imbalance))
@@ -631,13 +648,10 @@ impl<T: Config> SignedExtension for ChargeTransactionPayment<T> where
 		_result: &DispatchResult,
 	) -> Result<(), TransactionValidityError> {
 		let (tip, who, imbalance) = pre;
-		let actual_fee = Pallet::<T>::compute_actual_fee(
-			len as u32,
-			info,
-			post_info,
-			tip,
-		);
-		T::OnChargeTransaction::correct_and_deposit_fee(&who, info, post_info, actual_fee, tip, imbalance)?;
+		let actual_fee = Pallet::<T>::compute_actual_fee(len as u32, info, post_info, tip);
+		T::OnChargeTransaction::correct_and_deposit_fee(
+			&who, info, post_info, actual_fee, tip, imbalance,
+		)?;
 		Ok(())
 	}
 }
@@ -662,11 +676,11 @@ mod tests {
 
 	use frame_support::{
 		assert_noop, assert_ok, parameter_types,
+		traits::{Currency, Imbalance, OnUnbalanced},
 		weights::{
-			DispatchClass, DispatchInfo, PostDispatchInfo, GetDispatchInfo, Weight,
-			WeightToFeePolynomial, WeightToFeeCoefficients, WeightToFeeCoefficient,
+			DispatchClass, DispatchInfo, GetDispatchInfo, PostDispatchInfo, Weight,
+			WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial,
 		},
-		traits::{Currency, OnUnbalanced, Imbalance},
 	};
 	use frame_system as system;
 	use pallet_balances::Call as BalancesCall;
@@ -777,7 +791,7 @@ mod tests {
 	pub struct DealWithFees;
 	impl OnUnbalanced<pallet_balances::NegativeImbalance<Runtime>> for DealWithFees {
 		fn on_unbalanceds<B>(
-			mut fees_then_tips: impl Iterator<Item = pallet_balances::NegativeImbalance<Runtime>>
+			mut fees_then_tips: impl Iterator<Item = pallet_balances::NegativeImbalance<Runtime>>,
 		) {
 			if let Some(fees) = fees_then_tips.next() {
 				FEE_UNBALANCED_AMOUNT.with(|a| *a.borrow_mut() += fees.peek());
@@ -799,17 +813,12 @@ mod tests {
 		balance_factor: u64,
 		base_weight: u64,
 		byte_fee: u64,
-		weight_to_fee: u64
+		weight_to_fee: u64,
 	}
 
 	impl Default for ExtBuilder {
 		fn default() -> Self {
-			Self {
-				balance_factor: 1,
-				base_weight: 0,
-				byte_fee: 1,
-				weight_to_fee: 1,
-			}
+			Self { balance_factor: 1, base_weight: 0, byte_fee: 1, weight_to_fee: 1 }
 		}
 	}
 
@@ -846,12 +855,14 @@ mod tests {
 						(3, 30 * self.balance_factor),
 						(4, 40 * self.balance_factor),
 						(5, 50 * self.balance_factor),
-						(6, 60 * self.balance_factor)
+						(6, 60 * self.balance_factor),
 					]
 				} else {
 					vec![]
 				},
-			}.assimilate_storage(&mut t).unwrap();
+			}
+			.assimilate_storage(&mut t)
+			.unwrap();
 			t.into()
 		}
 	}
@@ -863,24 +874,15 @@ mod tests {
 	}
 
 	fn post_info_from_weight(w: Weight) -> PostDispatchInfo {
-		PostDispatchInfo {
-			actual_weight: Some(w),
-			pays_fee: Default::default(),
-		}
+		PostDispatchInfo { actual_weight: Some(w), pays_fee: Default::default() }
 	}
 
 	fn post_info_from_pays(p: Pays) -> PostDispatchInfo {
-		PostDispatchInfo {
-			actual_weight: None,
-			pays_fee: p,
-		}
+		PostDispatchInfo { actual_weight: None, pays_fee: p }
 	}
 
 	fn default_post_info() -> PostDispatchInfo {
-		PostDispatchInfo {
-			actual_weight: None,
-			pays_fee: Default::default(),
-		}
+		PostDispatchInfo { actual_weight: None, pays_fee: Default::default() }
 	}
 
 	#[test]
@@ -889,37 +891,42 @@ mod tests {
 			.balance_factor(10)
 			.base_weight(5)
 			.build()
-			.execute_with(||
-		{
-			let len = 10;
-			let pre = ChargeTransactionPayment::<Runtime>::from(0)
-				.pre_dispatch(&1, CALL, &info_from_weight(5), len)
-				.unwrap();
-			assert_eq!(Balances::free_balance(1), 100 - 5 - 5 - 10);
-
-			assert_ok!(
-				ChargeTransactionPayment::<Runtime>
-					::post_dispatch(pre, &info_from_weight(5), &default_post_info(), len, &Ok(()))
-			);
-			assert_eq!(Balances::free_balance(1), 100 - 5 - 5 - 10);
-			assert_eq!(FEE_UNBALANCED_AMOUNT.with(|a| a.borrow().clone()), 5 + 5 + 10);
-			assert_eq!(TIP_UNBALANCED_AMOUNT.with(|a| a.borrow().clone()), 0);
-
-			FEE_UNBALANCED_AMOUNT.with(|a| *a.borrow_mut() = 0);
-
-			let pre = ChargeTransactionPayment::<Runtime>::from(5 /* tipped */)
-				.pre_dispatch(&2, CALL, &info_from_weight(100), len)
-				.unwrap();
-			assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 100 - 5);
-
-			assert_ok!(
-				ChargeTransactionPayment::<Runtime>
-					::post_dispatch(pre, &info_from_weight(100), &post_info_from_weight(50), len, &Ok(()))
-			);
-			assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 50 - 5);
-			assert_eq!(FEE_UNBALANCED_AMOUNT.with(|a| a.borrow().clone()), 5 + 10 + 50);
-			assert_eq!(TIP_UNBALANCED_AMOUNT.with(|a| a.borrow().clone()), 5);
-		});
+			.execute_with(|| {
+				let len = 10;
+				let pre = ChargeTransactionPayment::<Runtime>::from(0)
+					.pre_dispatch(&1, CALL, &info_from_weight(5), len)
+					.unwrap();
+				assert_eq!(Balances::free_balance(1), 100 - 5 - 5 - 10);
+
+				assert_ok!(ChargeTransactionPayment::<Runtime>::post_dispatch(
+					pre,
+					&info_from_weight(5),
+					&default_post_info(),
+					len,
+					&Ok(())
+				));
+				assert_eq!(Balances::free_balance(1), 100 - 5 - 5 - 10);
+				assert_eq!(FEE_UNBALANCED_AMOUNT.with(|a| a.borrow().clone()), 5 + 5 + 10);
+				assert_eq!(TIP_UNBALANCED_AMOUNT.with(|a| a.borrow().clone()), 0);
+
+				FEE_UNBALANCED_AMOUNT.with(|a| *a.borrow_mut() = 0);
+
+				let pre = ChargeTransactionPayment::<Runtime>::from(5 /* tipped */)
+					.pre_dispatch(&2, CALL, &info_from_weight(100), len)
+					.unwrap();
+				assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 100 - 5);
+
+				assert_ok!(ChargeTransactionPayment::<Runtime>::post_dispatch(
+					pre,
+					&info_from_weight(100),
+					&post_info_from_weight(50),
+					len,
+					&Ok(())
+				));
+				assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 50 - 5);
+				assert_eq!(FEE_UNBALANCED_AMOUNT.with(|a| a.borrow().clone()), 5 + 10 + 50);
+				assert_eq!(TIP_UNBALANCED_AMOUNT.with(|a| a.borrow().clone()), 5);
+			});
 	}
 
 	#[test]
@@ -928,39 +935,38 @@ mod tests {
 			.balance_factor(10)
 			.base_weight(5)
 			.build()
-			.execute_with(||
-		{
-			let len = 10;
-			<NextFeeMultiplier<Runtime>>::put(Multiplier::saturating_from_rational(3, 2));
-
-			let pre = ChargeTransactionPayment::<Runtime>::from(5 /* tipped */)
-				.pre_dispatch(&2, CALL, &info_from_weight(100), len)
-				.unwrap();
-			// 5 base fee, 10 byte fee, 3/2 * 100 weight fee, 5 tip
-			assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 150 - 5);
-
-			assert_ok!(
-				ChargeTransactionPayment::<Runtime>
-					::post_dispatch(pre, &info_from_weight(100), &post_info_from_weight(50), len, &Ok(()))
-			);
-			// 75 (3/2 of the returned 50 units of weight) is refunded
-			assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 75 - 5);
-		});
+			.execute_with(|| {
+				let len = 10;
+				<NextFeeMultiplier<Runtime>>::put(Multiplier::saturating_from_rational(3, 2));
+
+				let pre = ChargeTransactionPayment::<Runtime>::from(5 /* tipped */)
+					.pre_dispatch(&2, CALL, &info_from_weight(100), len)
+					.unwrap();
+				// 5 base fee, 10 byte fee, 3/2 * 100 weight fee, 5 tip
+				assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 150 - 5);
+
+				assert_ok!(ChargeTransactionPayment::<Runtime>::post_dispatch(
+					pre,
+					&info_from_weight(100),
+					&post_info_from_weight(50),
+					len,
+					&Ok(())
+				));
+				// 75 (3/2 of the returned 50 units of weight) is refunded
+				assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 75 - 5);
+			});
 	}
 
 	#[test]
 	fn signed_extension_transaction_payment_is_bounded() {
-		ExtBuilder::default()
-			.balance_factor(1000)
-			.byte_fee(0)
-			.build()
-			.execute_with(||
-		{
+		ExtBuilder::default().balance_factor(1000).byte_fee(0).build().execute_with(|| {
 			// maximum weight possible
-			assert_ok!(
-				ChargeTransactionPayment::<Runtime>::from(0)
-					.pre_dispatch(&1, CALL, &info_from_weight(Weight::max_value()), 10)
-			);
+			assert_ok!(ChargeTransactionPayment::<Runtime>::from(0).pre_dispatch(
+				&1,
+				CALL,
+				&info_from_weight(Weight::max_value()),
+				10
+			));
 			// fee will be proportional to what is the actual maximum weight in the runtime.
 			assert_eq!(
 				Balances::free_balance(&1),
@@ -975,36 +981,38 @@ mod tests {
 			.base_weight(100)
 			.balance_factor(0)
 			.build()
-			.execute_with(||
-		{
-			// 1 ain't have a penny.
-			assert_eq!(Balances::free_balance(1), 0);
-
-			let len = 100;
-
-			// This is a completely free (and thus wholly insecure/DoS-ridden) transaction.
-			let operational_transaction = DispatchInfo {
-				weight: 0,
-				class: DispatchClass::Operational,
-				pays_fee: Pays::No,
-			};
-			assert_ok!(
-				ChargeTransactionPayment::<Runtime>::from(0)
-					.validate(&1, CALL, &operational_transaction , len)
-			);
-
-			// like a InsecureFreeNormal
-			let free_transaction = DispatchInfo {
-				weight: 0,
-				class: DispatchClass::Normal,
-				pays_fee: Pays::Yes,
-			};
-			assert_noop!(
-				ChargeTransactionPayment::<Runtime>::from(0)
-					.validate(&1, CALL, &free_transaction , len),
-				TransactionValidityError::Invalid(InvalidTransaction::Payment),
-			);
-		});
+			.execute_with(|| {
+				// 1 ain't have a penny.
+				assert_eq!(Balances::free_balance(1), 0);
+
+				let len = 100;
+
+				// This is a completely free (and thus wholly insecure/DoS-ridden) transaction.
+				let operational_transaction = DispatchInfo {
+					weight: 0,
+					class: DispatchClass::Operational,
+					pays_fee: Pays::No,
+				};
+				assert_ok!(ChargeTransactionPayment::<Runtime>::from(0).validate(
+					&1,
+					CALL,
+					&operational_transaction,
+					len
+				));
+
+				// like a InsecureFreeNormal
+				let free_transaction =
+					DispatchInfo { weight: 0, class: DispatchClass::Normal, pays_fee: Pays::Yes };
+				assert_noop!(
+					ChargeTransactionPayment::<Runtime>::from(0).validate(
+						&1,
+						CALL,
+						&free_transaction,
+						len
+					),
+					TransactionValidityError::Invalid(InvalidTransaction::Payment),
+				);
+			});
 	}
 
 	#[test]
@@ -1013,25 +1021,22 @@ mod tests {
 			.base_weight(5)
 			.balance_factor(10)
 			.build()
-			.execute_with(||
-		{
-			// all fees should be x1.5
-			<NextFeeMultiplier<Runtime>>::put(Multiplier::saturating_from_rational(3, 2));
-			let len = 10;
-
-			assert_ok!(
-				ChargeTransactionPayment::<Runtime>::from(10) // tipped
-					.pre_dispatch(&1, CALL, &info_from_weight(3), len)
-			);
-			assert_eq!(
-				Balances::free_balance(1),
-				100 // original
+			.execute_with(|| {
+				// all fees should be x1.5
+				<NextFeeMultiplier<Runtime>>::put(Multiplier::saturating_from_rational(3, 2));
+				let len = 10;
+
+				assert_ok!(ChargeTransactionPayment::<Runtime>::from(10) // tipped
+					.pre_dispatch(&1, CALL, &info_from_weight(3), len));
+				assert_eq!(
+					Balances::free_balance(1),
+					100 // original
 				- 10 // tip
 				- 5 // base
 				- 10 // len
 				- (3 * 3 / 2) // adjusted weight
-			);
-		})
+				);
+			})
 	}
 
 	#[test]
@@ -1040,15 +1045,10 @@ mod tests {
 		let origin = 111111;
 		let extra = ();
 		let xt = TestXt::new(call, Some((origin, extra)));
-		let info  = xt.get_dispatch_info();
+		let info = xt.get_dispatch_info();
 		let ext = xt.encode();
 		let len = ext.len() as u32;
-		ExtBuilder::default()
-			.base_weight(5)
-			.weight_fee(2)
-			.build()
-			.execute_with(||
-		{
+		ExtBuilder::default().base_weight(5).weight_fee(2).build().execute_with(|| {
 			// all fees should be x1.5
 			<NextFeeMultiplier<Runtime>>::put(Multiplier::saturating_from_rational(3, 2));
 
@@ -1057,13 +1057,11 @@ mod tests {
 				RuntimeDispatchInfo {
 					weight: info.weight,
 					class: info.class,
-					partial_fee:
-						5 * 2 /* base * weight_fee */
+					partial_fee: 5 * 2 /* base * weight_fee */
 						+ len as u64  /* len * 1 */
 						+ info.weight.min(BlockWeights::get().max_block) as u64 * 2 * 3 / 2 /* weight */
 				},
 			);
-
 		});
 	}
 
@@ -1074,37 +1072,36 @@ mod tests {
 			.byte_fee(10)
 			.balance_factor(0)
 			.build()
-			.execute_with(||
-		{
-			// Next fee multiplier is zero
-			assert_eq!(<NextFeeMultiplier<Runtime>>::get(), Multiplier::one());
-
-			// Tip only, no fees works
-			let dispatch_info = DispatchInfo {
-				weight: 0,
-				class: DispatchClass::Operational,
-				pays_fee: Pays::No,
-			};
-			assert_eq!(Pallet::<Runtime>::compute_fee(0, &dispatch_info, 10), 10);
-			// No tip, only base fee works
-			let dispatch_info = DispatchInfo {
-				weight: 0,
-				class: DispatchClass::Operational,
-				pays_fee: Pays::Yes,
-			};
-			assert_eq!(Pallet::<Runtime>::compute_fee(0, &dispatch_info, 0), 100);
-			// Tip + base fee works
-			assert_eq!(Pallet::<Runtime>::compute_fee(0, &dispatch_info, 69), 169);
-			// Len (byte fee) + base fee works
-			assert_eq!(Pallet::<Runtime>::compute_fee(42, &dispatch_info, 0), 520);
-			// Weight fee + base fee works
-			let dispatch_info = DispatchInfo {
-				weight: 1000,
-				class: DispatchClass::Operational,
-				pays_fee: Pays::Yes,
-			};
-			assert_eq!(Pallet::<Runtime>::compute_fee(0, &dispatch_info, 0), 1100);
-		});
+			.execute_with(|| {
+				// Next fee multiplier is zero
+				assert_eq!(<NextFeeMultiplier<Runtime>>::get(), Multiplier::one());
+
+				// Tip only, no fees works
+				let dispatch_info = DispatchInfo {
+					weight: 0,
+					class: DispatchClass::Operational,
+					pays_fee: Pays::No,
+				};
+				assert_eq!(Pallet::<Runtime>::compute_fee(0, &dispatch_info, 10), 10);
+				// No tip, only base fee works
+				let dispatch_info = DispatchInfo {
+					weight: 0,
+					class: DispatchClass::Operational,
+					pays_fee: Pays::Yes,
+				};
+				assert_eq!(Pallet::<Runtime>::compute_fee(0, &dispatch_info, 0), 100);
+				// Tip + base fee works
+				assert_eq!(Pallet::<Runtime>::compute_fee(0, &dispatch_info, 69), 169);
+				// Len (byte fee) + base fee works
+				assert_eq!(Pallet::<Runtime>::compute_fee(42, &dispatch_info, 0), 520);
+				// Weight fee + base fee works
+				let dispatch_info = DispatchInfo {
+					weight: 1000,
+					class: DispatchClass::Operational,
+					pays_fee: Pays::Yes,
+				};
+				assert_eq!(Pallet::<Runtime>::compute_fee(0, &dispatch_info, 0), 1100);
+			});
 	}
 
 	#[test]
@@ -1114,30 +1111,29 @@ mod tests {
 			.byte_fee(10)
 			.balance_factor(0)
 			.build()
-			.execute_with(||
-		{
-			// Add a next fee multiplier. Fees will be x3/2.
-			<NextFeeMultiplier<Runtime>>::put(Multiplier::saturating_from_rational(3, 2));
-			// Base fee is unaffected by multiplier
-			let dispatch_info = DispatchInfo {
-				weight: 0,
-				class: DispatchClass::Operational,
-				pays_fee: Pays::Yes,
-			};
-			assert_eq!(Pallet::<Runtime>::compute_fee(0, &dispatch_info, 0), 100);
-
-			// Everything works together :)
-			let dispatch_info = DispatchInfo {
-				weight: 123,
-				class: DispatchClass::Operational,
-				pays_fee: Pays::Yes,
-			};
-			// 123 weight, 456 length, 100 base
-			assert_eq!(
-				Pallet::<Runtime>::compute_fee(456, &dispatch_info, 789),
-				100 + (3 * 123 / 2) + 4560 + 789,
-			);
-		});
+			.execute_with(|| {
+				// Add a next fee multiplier. Fees will be x3/2.
+				<NextFeeMultiplier<Runtime>>::put(Multiplier::saturating_from_rational(3, 2));
+				// Base fee is unaffected by multiplier
+				let dispatch_info = DispatchInfo {
+					weight: 0,
+					class: DispatchClass::Operational,
+					pays_fee: Pays::Yes,
+				};
+				assert_eq!(Pallet::<Runtime>::compute_fee(0, &dispatch_info, 0), 100);
+
+				// Everything works together :)
+				let dispatch_info = DispatchInfo {
+					weight: 123,
+					class: DispatchClass::Operational,
+					pays_fee: Pays::Yes,
+				};
+				// 123 weight, 456 length, 100 base
+				assert_eq!(
+					Pallet::<Runtime>::compute_fee(456, &dispatch_info, 789),
+					100 + (3 * 123 / 2) + 4560 + 789,
+				);
+			});
 	}
 
 	#[test]
@@ -1147,31 +1143,30 @@ mod tests {
 			.byte_fee(10)
 			.balance_factor(0)
 			.build()
-			.execute_with(||
-		{
-			// Add a next fee multiplier. All fees will be x1/2.
-			<NextFeeMultiplier<Runtime>>::put(Multiplier::saturating_from_rational(1, 2));
-
-			// Base fee is unaffected by multiplier.
-			let dispatch_info = DispatchInfo {
-				weight: 0,
-				class: DispatchClass::Operational,
-				pays_fee: Pays::Yes,
-			};
-			assert_eq!(Pallet::<Runtime>::compute_fee(0, &dispatch_info, 0), 100);
-
-			// Everything works together.
-			let dispatch_info = DispatchInfo {
-				weight: 123,
-				class: DispatchClass::Operational,
-				pays_fee: Pays::Yes,
-			};
-			// 123 weight, 456 length, 100 base
-			assert_eq!(
-				Pallet::<Runtime>::compute_fee(456, &dispatch_info, 789),
-				100 + (123 / 2) + 4560 + 789,
-			);
-		});
+			.execute_with(|| {
+				// Add a next fee multiplier. All fees will be x1/2.
+				<NextFeeMultiplier<Runtime>>::put(Multiplier::saturating_from_rational(1, 2));
+
+				// Base fee is unaffected by multiplier.
+				let dispatch_info = DispatchInfo {
+					weight: 0,
+					class: DispatchClass::Operational,
+					pays_fee: Pays::Yes,
+				};
+				assert_eq!(Pallet::<Runtime>::compute_fee(0, &dispatch_info, 0), 100);
+
+				// Everything works together.
+				let dispatch_info = DispatchInfo {
+					weight: 123,
+					class: DispatchClass::Operational,
+					pays_fee: Pays::Yes,
+				};
+				// 123 weight, 456 length, 100 base
+				assert_eq!(
+					Pallet::<Runtime>::compute_fee(456, &dispatch_info, 789),
+					100 + (123 / 2) + 4560 + 789,
+				);
+			});
 	}
 
 	#[test]
@@ -1181,23 +1176,18 @@ mod tests {
 			.byte_fee(10)
 			.balance_factor(0)
 			.build()
-			.execute_with(||
-		{
-			// Overflow is handled
-			let dispatch_info = DispatchInfo {
-				weight: Weight::max_value(),
-				class: DispatchClass::Operational,
-				pays_fee: Pays::Yes,
-			};
-			assert_eq!(
-				Pallet::<Runtime>::compute_fee(
-					u32::MAX,
-					&dispatch_info,
+			.execute_with(|| {
+				// Overflow is handled
+				let dispatch_info = DispatchInfo {
+					weight: Weight::max_value(),
+					class: DispatchClass::Operational,
+					pays_fee: Pays::Yes,
+				};
+				assert_eq!(
+					Pallet::<Runtime>::compute_fee(u32::MAX, &dispatch_info, u64::MAX),
 					u64::MAX
-				),
-				u64::MAX
-			);
-		});
+				);
+			});
 	}
 
 	#[test]
@@ -1206,30 +1196,34 @@ mod tests {
 			.balance_factor(10)
 			.base_weight(5)
 			.build()
-			.execute_with(||
-		{
-			// So events are emitted
-			System::set_block_number(10);
-			let len = 10;
-			let pre = ChargeTransactionPayment::<Runtime>::from(5 /* tipped */)
-				.pre_dispatch(&2, CALL, &info_from_weight(100), len)
-				.unwrap();
-			assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 100 - 5);
-
-			// kill the account between pre and post dispatch
-			assert_ok!(Balances::transfer(Some(2).into(), 3, Balances::free_balance(2)));
-			assert_eq!(Balances::free_balance(2), 0);
-
-			assert_ok!(
-				ChargeTransactionPayment::<Runtime>
-					::post_dispatch(pre, &info_from_weight(100), &post_info_from_weight(50), len, &Ok(()))
-			);
-			assert_eq!(Balances::free_balance(2), 0);
-			// Transfer Event
-			System::assert_has_event(Event::Balances(pallet_balances::Event::Transfer(2, 3, 80)));
-			// Killed Event
-			System::assert_has_event(Event::System(system::Event::KilledAccount(2)));
-		});
+			.execute_with(|| {
+				// So events are emitted
+				System::set_block_number(10);
+				let len = 10;
+				let pre = ChargeTransactionPayment::<Runtime>::from(5 /* tipped */)
+					.pre_dispatch(&2, CALL, &info_from_weight(100), len)
+					.unwrap();
+				assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 100 - 5);
+
+				// kill the account between pre and post dispatch
+				assert_ok!(Balances::transfer(Some(2).into(), 3, Balances::free_balance(2)));
+				assert_eq!(Balances::free_balance(2), 0);
+
+				assert_ok!(ChargeTransactionPayment::<Runtime>::post_dispatch(
+					pre,
+					&info_from_weight(100),
+					&post_info_from_weight(50),
+					len,
+					&Ok(())
+				));
+				assert_eq!(Balances::free_balance(2), 0);
+				// Transfer Event
+				System::assert_has_event(Event::Balances(pallet_balances::Event::Transfer(
+					2, 3, 80,
+				)));
+				// Killed Event
+				System::assert_has_event(Event::System(system::Event::KilledAccount(2)));
+			});
 	}
 
 	#[test]
@@ -1238,20 +1232,22 @@ mod tests {
 			.balance_factor(10)
 			.base_weight(5)
 			.build()
-			.execute_with(||
-		{
-			let len = 10;
-			let pre = ChargeTransactionPayment::<Runtime>::from(5 /* tipped */)
-				.pre_dispatch(&2, CALL, &info_from_weight(100), len)
-				.unwrap();
-			assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 100 - 5);
-
-			assert_ok!(
-				ChargeTransactionPayment::<Runtime>
-					::post_dispatch(pre, &info_from_weight(100), &post_info_from_weight(101), len, &Ok(()))
-			);
-			assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 100 - 5);
-		});
+			.execute_with(|| {
+				let len = 10;
+				let pre = ChargeTransactionPayment::<Runtime>::from(5 /* tipped */)
+					.pre_dispatch(&2, CALL, &info_from_weight(100), len)
+					.unwrap();
+				assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 100 - 5);
+
+				assert_ok!(ChargeTransactionPayment::<Runtime>::post_dispatch(
+					pre,
+					&info_from_weight(100),
+					&post_info_from_weight(101),
+					len,
+					&Ok(())
+				));
+				assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 100 - 5);
+			});
 	}
 
 	#[test]
@@ -1260,29 +1256,28 @@ mod tests {
 			.balance_factor(10)
 			.base_weight(5)
 			.build()
-			.execute_with(||
-		{
-			// So events are emitted
-			System::set_block_number(10);
-			let len = 10;
-			let dispatch_info = DispatchInfo {
-				weight: 100,
-				pays_fee: Pays::No,
-				class: DispatchClass::Normal,
-			};
-			let user = 69;
-			let pre = ChargeTransactionPayment::<Runtime>::from(0)
-				.pre_dispatch(&user, CALL, &dispatch_info, len)
-				.unwrap();
-			assert_eq!(Balances::total_balance(&user), 0);
-			assert_ok!(
-				ChargeTransactionPayment::<Runtime>
-					::post_dispatch(pre, &dispatch_info, &default_post_info(), len, &Ok(()))
-			);
-			assert_eq!(Balances::total_balance(&user), 0);
-			// No events for such a scenario
-			assert_eq!(System::events().len(), 0);
-		});
+			.execute_with(|| {
+				// So events are emitted
+				System::set_block_number(10);
+				let len = 10;
+				let dispatch_info =
+					DispatchInfo { weight: 100, pays_fee: Pays::No, class: DispatchClass::Normal };
+				let user = 69;
+				let pre = ChargeTransactionPayment::<Runtime>::from(0)
+					.pre_dispatch(&user, CALL, &dispatch_info, len)
+					.unwrap();
+				assert_eq!(Balances::total_balance(&user), 0);
+				assert_ok!(ChargeTransactionPayment::<Runtime>::post_dispatch(
+					pre,
+					&dispatch_info,
+					&default_post_info(),
+					len,
+					&Ok(())
+				));
+				assert_eq!(Balances::total_balance(&user), 0);
+				// No events for such a scenario
+				assert_eq!(System::events().len(), 0);
+			});
 	}
 
 	#[test]
@@ -1291,32 +1286,36 @@ mod tests {
 			.balance_factor(10)
 			.base_weight(7)
 			.build()
-			.execute_with(||
-		{
-			let info = info_from_weight(100);
-			let post_info = post_info_from_weight(33);
-			let prev_balance = Balances::free_balance(2);
-			let len = 10;
-			let tip = 5;
-
-			<NextFeeMultiplier<Runtime>>::put(Multiplier::saturating_from_rational(5, 4));
-
-			let pre = ChargeTransactionPayment::<Runtime>::from(tip)
-				.pre_dispatch(&2, CALL, &info, len)
-				.unwrap();
-
-			ChargeTransactionPayment::<Runtime>
-				::post_dispatch(pre, &info, &post_info, len, &Ok(()))
+			.execute_with(|| {
+				let info = info_from_weight(100);
+				let post_info = post_info_from_weight(33);
+				let prev_balance = Balances::free_balance(2);
+				let len = 10;
+				let tip = 5;
+
+				<NextFeeMultiplier<Runtime>>::put(Multiplier::saturating_from_rational(5, 4));
+
+				let pre = ChargeTransactionPayment::<Runtime>::from(tip)
+					.pre_dispatch(&2, CALL, &info, len)
+					.unwrap();
+
+				ChargeTransactionPayment::<Runtime>::post_dispatch(
+					pre,
+					&info,
+					&post_info,
+					len,
+					&Ok(()),
+				)
 				.unwrap();
 
-			let refund_based_fee = prev_balance - Balances::free_balance(2);
-			let actual_fee = Pallet::<Runtime>
-				::compute_actual_fee(len as u32, &info, &post_info, tip);
+				let refund_based_fee = prev_balance - Balances::free_balance(2);
+				let actual_fee =
+					Pallet::<Runtime>::compute_actual_fee(len as u32, &info, &post_info, tip);
 
-			// 33 weight, 10 length, 7 base, 5 tip
-			assert_eq!(actual_fee, 7 + 10 + (33 * 5 / 4) + 5);
-			assert_eq!(refund_based_fee, actual_fee);
-		});
+				// 33 weight, 10 length, 7 base, 5 tip
+				assert_eq!(actual_fee, 7 + 10 + (33 * 5 / 4) + 5);
+				assert_eq!(refund_based_fee, actual_fee);
+			});
 	}
 
 	#[test]
@@ -1325,31 +1324,35 @@ mod tests {
 			.balance_factor(10)
 			.base_weight(7)
 			.build()
-			.execute_with(||
-		{
-			let info = info_from_weight(100);
-			let post_info = post_info_from_pays(Pays::No);
-			let prev_balance = Balances::free_balance(2);
-			let len = 10;
-			let tip = 5;
-
-			<NextFeeMultiplier<Runtime>>::put(Multiplier::saturating_from_rational(5, 4));
-
-			let pre = ChargeTransactionPayment::<Runtime>::from(tip)
-				.pre_dispatch(&2, CALL, &info, len)
+			.execute_with(|| {
+				let info = info_from_weight(100);
+				let post_info = post_info_from_pays(Pays::No);
+				let prev_balance = Balances::free_balance(2);
+				let len = 10;
+				let tip = 5;
+
+				<NextFeeMultiplier<Runtime>>::put(Multiplier::saturating_from_rational(5, 4));
+
+				let pre = ChargeTransactionPayment::<Runtime>::from(tip)
+					.pre_dispatch(&2, CALL, &info, len)
+					.unwrap();
+
+				ChargeTransactionPayment::<Runtime>::post_dispatch(
+					pre,
+					&info,
+					&post_info,
+					len,
+					&Ok(()),
+				)
 				.unwrap();
 
-			ChargeTransactionPayment::<Runtime>
-				::post_dispatch(pre, &info, &post_info, len, &Ok(()))
-				.unwrap();
-
-			let refund_based_fee = prev_balance - Balances::free_balance(2);
-			let actual_fee = Pallet::<Runtime>
-				::compute_actual_fee(len as u32, &info, &post_info, tip);
+				let refund_based_fee = prev_balance - Balances::free_balance(2);
+				let actual_fee =
+					Pallet::<Runtime>::compute_actual_fee(len as u32, &info, &post_info, tip);
 
-			// Only 5 tip is paid
-			assert_eq!(actual_fee, 5);
-			assert_eq!(refund_based_fee, actual_fee);
-		});
+				// Only 5 tip is paid
+				assert_eq!(actual_fee, 5);
+				assert_eq!(refund_based_fee, actual_fee);
+			});
 	}
 }
diff --git a/frame/transaction-payment/src/payment.rs b/frame/transaction-payment/src/payment.rs
index 376cd77ce3f8..832e4d5359a1 100644
--- a/frame/transaction-payment/src/payment.rs
+++ b/frame/transaction-payment/src/payment.rs
@@ -1,10 +1,12 @@
-///! Traits and default implementation for paying transaction fees.
-
+/// ! Traits and default implementation for paying transaction fees.
 use crate::Config;
 
 use codec::FullCodec;
 use sp_runtime::{
-	traits::{AtLeast32BitUnsigned, DispatchInfoOf, MaybeSerializeDeserialize, PostDispatchInfoOf, Saturating, Zero},
+	traits::{
+		AtLeast32BitUnsigned, DispatchInfoOf, MaybeSerializeDeserialize, PostDispatchInfoOf,
+		Saturating, Zero,
+	},
 	transaction_validity::InvalidTransaction,
 };
 use sp_std::{fmt::Debug, marker::PhantomData};
@@ -20,7 +22,12 @@ type NegativeImbalanceOf<C, T> =
 /// Handle withdrawing, refunding and depositing of transaction fees.
 pub trait OnChargeTransaction<T: Config> {
 	/// The underlying integer type in which fees are calculated.
-	type Balance: AtLeast32BitUnsigned + FullCodec + Copy + MaybeSerializeDeserialize + Debug + Default;
+	type Balance: AtLeast32BitUnsigned
+		+ FullCodec
+		+ Copy
+		+ MaybeSerializeDeserialize
+		+ Debug
+		+ Default;
 	type LiquidityInfo: Default;
 
 	/// Before the transaction is executed the payment of the transaction fees
@@ -67,10 +74,14 @@ where
 	T: Config,
 	T::TransactionByteFee: Get<<C as Currency<<T as frame_system::Config>::AccountId>>::Balance>,
 	C: Currency<<T as frame_system::Config>::AccountId>,
-	C::PositiveImbalance:
-		Imbalance<<C as Currency<<T as frame_system::Config>::AccountId>>::Balance, Opposite = C::NegativeImbalance>,
-	C::NegativeImbalance:
-		Imbalance<<C as Currency<<T as frame_system::Config>::AccountId>>::Balance, Opposite = C::PositiveImbalance>,
+	C::PositiveImbalance: Imbalance<
+		<C as Currency<<T as frame_system::Config>::AccountId>>::Balance,
+		Opposite = C::NegativeImbalance,
+	>,
+	C::NegativeImbalance: Imbalance<
+		<C as Currency<<T as frame_system::Config>::AccountId>>::Balance,
+		Opposite = C::PositiveImbalance,
+	>,
 	OU: OnUnbalanced<NegativeImbalanceOf<C, T>>,
 {
 	type LiquidityInfo = Option<NegativeImbalanceOf<C, T>>;
@@ -87,7 +98,7 @@ where
 		tip: Self::Balance,
 	) -> Result<Self::LiquidityInfo, TransactionValidityError> {
 		if fee.is_zero() {
-			return Ok(None);
+			return Ok(None)
 		}
 
 		let withdraw_reason = if tip.is_zero() {
@@ -121,8 +132,8 @@ where
 			// refund to the the account that paid the fees. If this fails, the
 			// account might have dropped below the existential balance. In
 			// that case we don't refund anything.
-			let refund_imbalance =
-				C::deposit_into_existing(&who, refund_amount).unwrap_or_else(|_| C::PositiveImbalance::zero());
+			let refund_imbalance = C::deposit_into_existing(&who, refund_amount)
+				.unwrap_or_else(|_| C::PositiveImbalance::zero());
 			// merge the imbalance caused by paying the fees and refunding parts of it again.
 			let adjusted_paid = paid
 				.offset(refund_imbalance)
diff --git a/frame/transaction-payment/src/types.rs b/frame/transaction-payment/src/types.rs
index b5d46a9167a7..345bd39718a7 100644
--- a/frame/transaction-payment/src/types.rs
+++ b/frame/transaction-payment/src/types.rs
@@ -17,14 +17,14 @@
 
 //! Types for transaction-payment RPC.
 
-use codec::{Encode, Decode};
+use codec::{Decode, Encode};
 #[cfg(feature = "std")]
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 use sp_runtime::traits::{AtLeast32BitUnsigned, Zero};
 use sp_std::prelude::*;
 
-use frame_support::weights::{Weight, DispatchClass};
+use frame_support::weights::{DispatchClass, Weight};
 
 /// The base fee and adjusted weight and length fees constitute the _inclusion fee_.
 #[derive(Encode, Decode, Clone, Eq, PartialEq)]
@@ -80,7 +80,11 @@ impl<Balance: AtLeast32BitUnsigned + Copy> FeeDetails<Balance> {
 	/// final_fee = inclusion_fee + tip;
 	/// ```
 	pub fn final_fee(&self) -> Balance {
-		self.inclusion_fee.as_ref().map(|i| i.inclusion_fee()).unwrap_or_else(|| Zero::zero()).saturating_add(self.tip)
+		self.inclusion_fee
+			.as_ref()
+			.map(|i| i.inclusion_fee())
+			.unwrap_or_else(|| Zero::zero())
+			.saturating_add(self.tip)
 	}
 }
 
@@ -105,13 +109,18 @@ pub struct RuntimeDispatchInfo<Balance> {
 
 #[cfg(feature = "std")]
 mod serde_balance {
-	use serde::{Deserialize, Serializer, Deserializer};
+	use serde::{Deserialize, Deserializer, Serializer};
 
-	pub fn serialize<S: Serializer, T: std::fmt::Display>(t: &T, serializer: S) -> Result<S::Ok, S::Error> {
+	pub fn serialize<S: Serializer, T: std::fmt::Display>(
+		t: &T,
+		serializer: S,
+	) -> Result<S::Ok, S::Error> {
 		serializer.serialize_str(&t.to_string())
 	}
 
-	pub fn deserialize<'de, D: Deserializer<'de>, T: std::str::FromStr>(deserializer: D) -> Result<T, D::Error> {
+	pub fn deserialize<'de, D: Deserializer<'de>, T: std::str::FromStr>(
+		deserializer: D,
+	) -> Result<T, D::Error> {
 		let s = String::deserialize(deserializer)?;
 		s.parse::<T>().map_err(|_| serde::de::Error::custom("Parse from string failed"))
 	}
diff --git a/frame/transaction-storage/src/benchmarking.rs b/frame/transaction-storage/src/benchmarking.rs
index ffb4d23de119..64081c3202c0 100644
--- a/frame/transaction-storage/src/benchmarking.rs
+++ b/frame/transaction-storage/src/benchmarking.rs
@@ -19,17 +19,18 @@
 
 #![cfg(feature = "runtime-benchmarks")]
 
-use sp_std::*;
 use super::*;
-use sp_runtime::traits::{Zero, One, Bounded};
+use frame_benchmarking::{benchmarks, impl_benchmark_test_suite, whitelisted_caller};
+use frame_support::traits::{Currency, OnFinalize, OnInitialize};
+use frame_system::{EventRecord, Pallet as System, RawOrigin};
+use sp_runtime::traits::{Bounded, One, Zero};
+use sp_std::*;
 use sp_transaction_storage_proof::TransactionStorageProof;
-use frame_system::{RawOrigin, Pallet as System, EventRecord};
-use frame_benchmarking::{benchmarks, whitelisted_caller, impl_benchmark_test_suite};
-use frame_support::{traits::{Currency, OnFinalize, OnInitialize}};
 
 use crate::Pallet as TransactionStorage;
 
-const PROOF: &[u8] = &hex_literal::hex!("
+const PROOF: &[u8] = &hex_literal::hex!(
+	"
 	0104000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 	0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 	0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
@@ -75,9 +76,11 @@ const PROOF: &[u8] = &hex_literal::hex!("
 	0c8e67d9b280f2b31a5707d52b892977acaac84d530bd188544c5f9b80b4f23ac50c8e67d9b280f2b31a5707d52b89297
 	7acaac84d530bd188544c5f9b80b4f23ac50c8e67d9b280f2b31a5707d52b892977acaac84d530bd188544c5f9b104401
 	0000
-");
+"
+);
 
-type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+type BalanceOf<T> =
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 
 fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
 	let events = System::<T>::events();
@@ -90,7 +93,9 @@ pub fn run_to_block<T: Config>(n: T::BlockNumber) {
 	while frame_system::Pallet::<T>::block_number() < n {
 		crate::Pallet::<T>::on_finalize(frame_system::Pallet::<T>::block_number());
 		frame_system::Pallet::<T>::on_finalize(frame_system::Pallet::<T>::block_number());
-		frame_system::Pallet::<T>::set_block_number(frame_system::Pallet::<T>::block_number() + One::one());
+		frame_system::Pallet::<T>::set_block_number(
+			frame_system::Pallet::<T>::block_number() + One::one(),
+		);
 		frame_system::Pallet::<T>::on_initialize(frame_system::Pallet::<T>::block_number());
 		crate::Pallet::<T>::on_initialize(frame_system::Pallet::<T>::block_number());
 	}
@@ -140,8 +145,4 @@ benchmarks! {
 	}
 }
 
-impl_benchmark_test_suite!(
-	TransactionStorage,
-	crate::mock::new_test_ext(),
-	crate::mock::Test,
-);
+impl_benchmark_test_suite!(TransactionStorage, crate::mock::new_test_ext(), crate::mock::Test,);
diff --git a/frame/transaction-storage/src/lib.rs b/frame/transaction-storage/src/lib.rs
index 97dfd76fe677..3964f42998b4 100644
--- a/frame/transaction-storage/src/lib.rs
+++ b/frame/transaction-storage/src/lib.rs
@@ -28,24 +28,24 @@ mod mock;
 #[cfg(test)]
 mod tests;
 
+use codec::{Decode, Encode};
 use frame_support::{
-	traits::{ReservableCurrency, Currency, OnUnbalanced},
 	dispatch::{Dispatchable, GetDispatchInfo},
+	traits::{Currency, OnUnbalanced, ReservableCurrency},
 };
-use sp_std::prelude::*;
-use sp_std::{result};
-use codec::{Encode, Decode};
-use sp_runtime::traits::{Saturating, BlakeTwo256, Hash, Zero, One};
+use sp_runtime::traits::{BlakeTwo256, Hash, One, Saturating, Zero};
+use sp_std::{prelude::*, result};
 use sp_transaction_storage_proof::{
-	TransactionStorageProof, InherentError,
-	random_chunk, encode_index,
-	CHUNK_SIZE, INHERENT_IDENTIFIER, DEFAULT_STORAGE_PERIOD,
+	encode_index, random_chunk, InherentError, TransactionStorageProof, CHUNK_SIZE,
+	DEFAULT_STORAGE_PERIOD, INHERENT_IDENTIFIER,
 };
 
 /// A type alias for the balance type from this pallet's point of view.
-type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
-type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>
-	::NegativeImbalance;
+type BalanceOf<T> =
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<
+	<T as frame_system::Config>::AccountId,
+>>::NegativeImbalance;
 
 // Re-export pallet items so that they can be accessed from the crate namespace.
 pub use pallet::*;
@@ -76,16 +76,19 @@ fn num_chunks(bytes: u32) -> u32 {
 
 #[frame_support::pallet]
 pub mod pallet {
+	use super::*;
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
-	use super::*;
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
 		/// The overarching event type.
 		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
 		/// A dispatchable call.
-		type Call: Parameter + Dispatchable<Origin=Self::Origin> + GetDispatchInfo + From<frame_system::Call<Self>>;
+		type Call: Parameter
+			+ Dispatchable<Origin = Self::Origin>
+			+ GetDispatchInfo
+			+ From<frame_system::Call<Self>>;
 		/// The currency trait.
 		type Currency: ReservableCurrency<Self::AccountId>;
 		/// Handler for the unbalanced decrease when fees are burned.
@@ -145,8 +148,7 @@ pub mod pallet {
 
 		fn on_finalize(n: T::BlockNumber) {
 			assert!(
-				<ProofChecked<T>>::take()
-				|| {
+				<ProofChecked<T>>::take() || {
 					// Proof is not required for early or empty blocks.
 					let number = <frame_system::Pallet<T>>::block_number();
 					let period = <StoragePeriod<T>>::get();
@@ -174,12 +176,12 @@ pub mod pallet {
 		/// Additionally contains a DB write.
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::store(data.len() as u32))]
-		pub fn store(
-			origin: OriginFor<T>,
-			data: Vec<u8>,
-		) -> DispatchResult {
+		pub fn store(origin: OriginFor<T>, data: Vec<u8>) -> DispatchResult {
 			ensure!(data.len() > 0, Error::<T>::EmptyTransaction);
-			ensure!(data.len() <= MaxTransactionSize::<T>::get() as usize, Error::<T>::TransactionTooLarge);
+			ensure!(
+				data.len() <= MaxTransactionSize::<T>::get() as usize,
+				Error::<T>::TransactionTooLarge
+			);
 			let sender = ensure_signed(origin)?;
 			Self::apply_fee(sender, data.len() as u32)?;
 
@@ -189,8 +191,8 @@ pub mod pallet {
 			let root = sp_io::trie::blake2_256_ordered_root(chunks);
 
 			let content_hash = sp_io::hashing::blake2_256(&data);
-			let extrinsic_index = <frame_system::Pallet<T>>::extrinsic_index().ok_or_else(
-				|| Error::<T>::BadContext)?;
+			let extrinsic_index = <frame_system::Pallet<T>>::extrinsic_index()
+				.ok_or_else(|| Error::<T>::BadContext)?;
 			sp_io::transaction_index::index(extrinsic_index, data.len() as u32, content_hash);
 
 			let mut index = 0;
@@ -277,11 +279,14 @@ pub mod pallet {
 			let selected_chunk_index = random_chunk(parent_hash.as_ref(), total_chunks);
 			let (info, chunk_index) = match <Transactions<T>>::get(target_number) {
 				Some(infos) => {
-					let index = match infos.binary_search_by_key(&selected_chunk_index, |info| info.block_chunks) {
+					let index = match infos
+						.binary_search_by_key(&selected_chunk_index, |info| info.block_chunks)
+					{
 						Ok(index) => index,
 						Err(index) => index,
 					};
-					let info = infos.get(index).ok_or_else(|| Error::<T>::MissingStateData)?.clone();
+					let info =
+						infos.get(index).ok_or_else(|| Error::<T>::MissingStateData)?.clone();
 					let chunks = num_chunks(info.size);
 					let prev_chunks = info.block_chunks - chunks;
 					(info, selected_chunk_index - prev_chunks)
@@ -317,23 +322,13 @@ pub mod pallet {
 	/// Collection of transaction metadata by block number.
 	#[pallet::storage]
 	#[pallet::getter(fn transaction_roots)]
-	pub(super) type Transactions<T: Config> = StorageMap<
-		_,
-		Blake2_128Concat,
-		T::BlockNumber,
-		Vec<TransactionInfo>,
-		OptionQuery,
-	>;
+	pub(super) type Transactions<T: Config> =
+		StorageMap<_, Blake2_128Concat, T::BlockNumber, Vec<TransactionInfo>, OptionQuery>;
 
 	/// Count indexed chunks for each block.
 	#[pallet::storage]
-	pub(super) type ChunkCount<T: Config> = StorageMap<
-		_,
-		Blake2_128Concat,
-		T::BlockNumber,
-		u32,
-		ValueQuery,
-	>;
+	pub(super) type ChunkCount<T: Config> =
+		StorageMap<_, Blake2_128Concat, T::BlockNumber, u32, ValueQuery>;
 
 	#[pallet::storage]
 	#[pallet::getter(fn byte_fee)]
@@ -362,13 +357,13 @@ pub mod pallet {
 
 	// Intermediates
 	#[pallet::storage]
-	pub(super) type BlockTransactions<T: Config> = StorageValue<_, Vec<TransactionInfo>, ValueQuery>;
+	pub(super) type BlockTransactions<T: Config> =
+		StorageValue<_, Vec<TransactionInfo>, ValueQuery>;
 
 	/// Was the proof checked in this block?
 	#[pallet::storage]
 	pub(super) type ProofChecked<T: Config> = StorageValue<_, bool, ValueQuery>;
 
-
 	#[pallet::genesis_config]
 	pub struct GenesisConfig<T: Config> {
 		pub byte_fee: BalanceOf<T>,
@@ -409,11 +404,16 @@ pub mod pallet {
 		const INHERENT_IDENTIFIER: InherentIdentifier = INHERENT_IDENTIFIER;
 
 		fn create_inherent(data: &InherentData) -> Option<Self::Call> {
-			let proof = data.get_data::<TransactionStorageProof>(&Self::INHERENT_IDENTIFIER).unwrap_or(None);
+			let proof = data
+				.get_data::<TransactionStorageProof>(&Self::INHERENT_IDENTIFIER)
+				.unwrap_or(None);
 			proof.map(Call::check_proof)
 		}
 
-		fn check_inherent(_call: &Self::Call, _data: &InherentData) -> result::Result<(), Self::Error> {
+		fn check_inherent(
+			_call: &Self::Call,
+			_data: &InherentData,
+		) -> result::Result<(), Self::Error> {
 			Ok(())
 		}
 
diff --git a/frame/transaction-storage/src/mock.rs b/frame/transaction-storage/src/mock.rs
index 344d7b736953..17a5d8097b67 100644
--- a/frame/transaction-storage/src/mock.rs
+++ b/frame/transaction-storage/src/mock.rs
@@ -19,13 +19,16 @@
 
 use crate as pallet_transaction_storage;
 use crate::TransactionStorageProof;
-use sp_core::H256;
-use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header, BuildStorage};
 use frame_support::{
 	parameter_types,
-	traits::{OnInitialize, OnFinalize},
+	traits::{OnFinalize, OnInitialize},
+};
+use sp_core::H256;
+use sp_runtime::{
+	testing::Header,
+	traits::{BlakeTwo256, IdentityLookup},
+	BuildStorage,
 };
-
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 pub type Block = frame_system::mocking::MockBlock<Test>;
@@ -104,7 +107,7 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 	let t = GenesisConfig {
 		system: Default::default(),
 		balances: pallet_balances::GenesisConfig::<Test> {
-			balances: vec![(1, 1000000000), (2, 100), (3, 100), (4, 100)]
+			balances: vec![(1, 1000000000), (2, 100), (3, 100), (4, 100)],
 		},
 		transaction_storage: pallet_transaction_storage::GenesisConfig::<Test> {
 			storage_period: 10,
@@ -113,7 +116,9 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 			max_block_transactions: crate::DEFAULT_MAX_BLOCK_TRANSACTIONS,
 			max_transaction_size: crate::DEFAULT_MAX_TRANSACTION_SIZE,
 		},
-	}.build_storage().unwrap();
+	}
+	.build_storage()
+	.unwrap();
 	t.into()
 }
 
diff --git a/frame/transaction-storage/src/tests.rs b/frame/transaction-storage/src/tests.rs
index 50594f1bce9d..c443f51ffb50 100644
--- a/frame/transaction-storage/src/tests.rs
+++ b/frame/transaction-storage/src/tests.rs
@@ -17,10 +17,9 @@
 
 //! Tests for transction-storage pallet.
 
-use super::*;
+use super::{Pallet as TransactionStorage, *};
 use crate::mock::*;
-use super::Pallet as TransactionStorage;
-use frame_support::{assert_ok, assert_noop};
+use frame_support::{assert_noop, assert_ok};
 use frame_system::RawOrigin;
 use sp_transaction_storage_proof::registration::build_proof;
 
@@ -41,9 +40,12 @@ fn discards_data() {
 		));
 		let proof_provider = || {
 			let block_num = <frame_system::Pallet<Test>>::block_number();
-			if block_num == 11  {
+			if block_num == 11 {
 				let parent_hash = <frame_system::Pallet<Test>>::parent_hash();
-				Some(build_proof(parent_hash.as_ref(), vec![vec![0u8; 2000], vec![0u8; 2000]]).unwrap())
+				Some(
+					build_proof(parent_hash.as_ref(), vec![vec![0u8; 2000], vec![0u8; 2000]])
+						.unwrap(),
+				)
 			} else {
 				None
 			}
@@ -64,15 +66,16 @@ fn burns_fee() {
 	new_test_ext().execute_with(|| {
 		run_to_block(1, || None);
 		let caller = 1;
-		assert_noop!(TransactionStorage::<Test>::store(
+		assert_noop!(
+			TransactionStorage::<Test>::store(
 				RawOrigin::Signed(5).into(),
 				vec![0u8; 2000 as usize]
 			),
 			Error::<Test>::InsufficientFunds,
 		);
 		assert_ok!(TransactionStorage::<Test>::store(
-				RawOrigin::Signed(caller.clone()).into(),
-				vec![0u8; 2000 as usize]
+			RawOrigin::Signed(caller.clone()).into(),
+			vec![0u8; 2000 as usize]
 		));
 		assert_eq!(Balances::free_balance(1), 1_000_000_000 - 2000 * 2 - 200);
 	});
@@ -89,34 +92,23 @@ fn checks_proof() {
 		));
 		run_to_block(10, || None);
 		let parent_hash = <frame_system::Pallet<Test>>::parent_hash();
-		let proof = build_proof(
-			parent_hash.as_ref(),
-			vec![vec![0u8; MAX_DATA_SIZE as usize]]
-		).unwrap();
-		assert_noop!(TransactionStorage::<Test>::check_proof(
-				Origin::none(),
-				proof,
-			),
+		let proof =
+			build_proof(parent_hash.as_ref(), vec![vec![0u8; MAX_DATA_SIZE as usize]]).unwrap();
+		assert_noop!(
+			TransactionStorage::<Test>::check_proof(Origin::none(), proof,),
 			Error::<Test>::UnexpectedProof,
 		);
 		run_to_block(11, || None);
 		let parent_hash = <frame_system::Pallet<Test>>::parent_hash();
 
-		let invalid_proof = build_proof(
-			parent_hash.as_ref(),
-			vec![vec![0u8; 1000]]
-		).unwrap();
-		assert_noop!(TransactionStorage::<Test>::check_proof(
-				Origin::none(),
-				invalid_proof,
-		),
-		Error::<Test>::InvalidProof,
+		let invalid_proof = build_proof(parent_hash.as_ref(), vec![vec![0u8; 1000]]).unwrap();
+		assert_noop!(
+			TransactionStorage::<Test>::check_proof(Origin::none(), invalid_proof,),
+			Error::<Test>::InvalidProof,
 		);
 
-		let proof = build_proof(
-			parent_hash.as_ref(),
-			vec![vec![0u8; MAX_DATA_SIZE as usize]]
-		).unwrap();
+		let proof =
+			build_proof(parent_hash.as_ref(), vec![vec![0u8; MAX_DATA_SIZE as usize]]).unwrap();
 		assert_ok!(TransactionStorage::<Test>::check_proof(Origin::none(), proof));
 	});
 }
@@ -127,20 +119,20 @@ fn renews_data() {
 		run_to_block(1, || None);
 		let caller = 1;
 		assert_ok!(TransactionStorage::<Test>::store(
-				RawOrigin::Signed(caller.clone()).into(),
-				vec![0u8; 2000]
+			RawOrigin::Signed(caller.clone()).into(),
+			vec![0u8; 2000]
 		));
 		let info = BlockTransactions::<Test>::get().last().unwrap().clone();
 		run_to_block(6, || None);
 		assert_ok!(TransactionStorage::<Test>::renew(
-				RawOrigin::Signed(caller.clone()).into(),
-				1, // block
-				0, // transaction
+			RawOrigin::Signed(caller.clone()).into(),
+			1, // block
+			0, // transaction
 		));
 		assert_eq!(Balances::free_balance(1), 1_000_000_000 - 4000 * 2 - 200 * 2);
 		let proof_provider = || {
 			let block_num = <frame_system::Pallet<Test>>::block_number();
-			if block_num == 11 || block_num == 16  {
+			if block_num == 11 || block_num == 16 {
 				let parent_hash = <frame_system::Pallet<Test>>::parent_hash();
 				Some(build_proof(parent_hash.as_ref(), vec![vec![0u8; 2000]]).unwrap())
 			} else {
@@ -154,4 +146,3 @@ fn renews_data() {
 		assert!(Transactions::<Test>::get(6).is_none());
 	});
 }
-
diff --git a/frame/transaction-storage/src/weights.rs b/frame/transaction-storage/src/weights.rs
index 46fc664d977c..82259e60d874 100644
--- a/frame/transaction-storage/src/weights.rs
+++ b/frame/transaction-storage/src/weights.rs
@@ -36,6 +36,7 @@
 // --template=./.maintain/frame-weight-template.hbs
 
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
diff --git a/frame/treasury/src/benchmarking.rs b/frame/treasury/src/benchmarking.rs
index cc5db8ce94c7..98fed2c6a536 100644
--- a/frame/treasury/src/benchmarking.rs
+++ b/frame/treasury/src/benchmarking.rs
@@ -19,20 +19,18 @@
 
 #![cfg(feature = "runtime-benchmarks")]
 
-use super::{*, Pallet as Treasury};
+use super::{Pallet as Treasury, *};
 
-use frame_benchmarking::{benchmarks_instance_pallet, account, impl_benchmark_test_suite};
-use frame_support::{traits::OnInitialize, ensure};
+use frame_benchmarking::{account, benchmarks_instance_pallet, impl_benchmark_test_suite};
+use frame_support::{ensure, traits::OnInitialize};
 use frame_system::RawOrigin;
 
 const SEED: u32 = 0;
 
 // Create the pre-requisite information needed to create a treasury `propose_spend`.
-fn setup_proposal<T: Config<I>, I: 'static>(u: u32) -> (
-	T::AccountId,
-	BalanceOf<T, I>,
-	<T::Lookup as StaticLookup>::Source,
-) {
+fn setup_proposal<T: Config<I>, I: 'static>(
+	u: u32,
+) -> (T::AccountId, BalanceOf<T, I>, <T::Lookup as StaticLookup>::Source) {
 	let caller = account("caller", u, SEED);
 	let value: BalanceOf<T, I> = T::ProposalBondMinimum::get().saturating_mul(100u32.into());
 	let _ = T::Currency::make_free_balance_be(&caller, value);
@@ -43,13 +41,9 @@ fn setup_proposal<T: Config<I>, I: 'static>(u: u32) -> (
 
 // Create proposals that are approved for use in `on_initialize`.
 fn create_approved_proposals<T: Config<I>, I: 'static>(n: u32) -> Result<(), &'static str> {
-	for i in 0 .. n {
+	for i in 0..n {
 		let (caller, value, lookup) = setup_proposal::<T, I>(i);
-		Treasury::<T, I>::propose_spend(
-			RawOrigin::Signed(caller).into(),
-			value,
-			lookup
-		)?;
+		Treasury::<T, I>::propose_spend(RawOrigin::Signed(caller).into(), value, lookup)?;
 		let proposal_id = <ProposalCount<T, I>>::get() - 1;
 		Treasury::<T, I>::approve_proposal(RawOrigin::Root.into(), proposal_id)?;
 	}
@@ -102,8 +96,4 @@ benchmarks_instance_pallet! {
 	}
 }
 
-impl_benchmark_test_suite!(
-	Treasury,
-	crate::tests::new_test_ext(),
-	crate::tests::Test,
-);
+impl_benchmark_test_suite!(Treasury, crate::tests::new_test_ext(), crate::tests::Test,);
diff --git a/frame/treasury/src/lib.rs b/frame/treasury/src/lib.rs
index b6b9097e3a36..207d51905af5 100644
--- a/frame/treasury/src/lib.rs
+++ b/frame/treasury/src/lib.rs
@@ -57,37 +57,40 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
+mod benchmarking;
 #[cfg(test)]
 mod tests;
-mod benchmarking;
 pub mod weights;
 
-use codec::{Encode, Decode, MaxEncodedLen};
+use codec::{Decode, Encode, MaxEncodedLen};
 
-use sp_std::prelude::*;
 use sp_runtime::{
+	traits::{AccountIdConversion, Saturating, StaticLookup, Zero},
 	Permill, RuntimeDebug,
-	traits::{
-		Zero, StaticLookup, AccountIdConversion, Saturating
-	}
 };
+use sp_std::prelude::*;
 
-use frame_support::{print, PalletId};
-use frame_support::traits::{
-	Currency, Get, Imbalance, OnUnbalanced, ExistenceRequirement::KeepAlive,
-	ReservableCurrency, WithdrawReasons
+use frame_support::{
+	print,
+	traits::{
+		Currency, ExistenceRequirement::KeepAlive, Get, Imbalance, OnUnbalanced,
+		ReservableCurrency, WithdrawReasons,
+	},
+	weights::Weight,
+	PalletId,
 };
-use frame_support::weights::Weight;
 
-pub use weights::WeightInfo;
 pub use pallet::*;
+pub use weights::WeightInfo;
 
 pub type BalanceOf<T, I = ()> =
 	<<T as Config<I>>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
-pub type PositiveImbalanceOf<T, I = ()> =
-	<<T as Config<I>>::Currency as Currency<<T as frame_system::Config>::AccountId>>::PositiveImbalance;
-pub type NegativeImbalanceOf<T, I = ()> =
-	<<T as Config<I>>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
+pub type PositiveImbalanceOf<T, I = ()> = <<T as Config<I>>::Currency as Currency<
+	<T as frame_system::Config>::AccountId,
+>>::PositiveImbalance;
+pub type NegativeImbalanceOf<T, I = ()> = <<T as Config<I>>::Currency as Currency<
+	<T as frame_system::Config>::AccountId,
+>>::NegativeImbalance;
 
 /// A trait to allow the Treasury Pallet to spend it's funds for other purposes.
 /// There is an expectation that the implementer of this trait will correctly manage
@@ -130,9 +133,9 @@ pub struct Proposal<AccountId, Balance> {
 
 #[frame_support::pallet]
 pub mod pallet {
+	use super::*;
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
-	use super::*;
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
@@ -204,17 +207,14 @@ pub mod pallet {
 		Twox64Concat,
 		ProposalIndex,
 		Proposal<T::AccountId, BalanceOf<T, I>>,
-		OptionQuery
+		OptionQuery,
 	>;
 
 	/// Proposal indices that have been approved but not yet awarded.
 	#[pallet::storage]
 	#[pallet::getter(fn approvals)]
-	pub type Approvals<T: Config<I>, I: 'static = ()> = StorageValue<
-		_,
-		BoundedVec<ProposalIndex, T::MaxApprovals>,
-		ValueQuery
-	>;
+	pub type Approvals<T: Config<I>, I: 'static = ()> =
+		StorageValue<_, BoundedVec<ProposalIndex, T::MaxApprovals>, ValueQuery>;
 
 	#[pallet::genesis_config]
 	pub struct GenesisConfig;
@@ -229,10 +229,12 @@ pub mod pallet {
 	#[cfg(feature = "std")]
 	impl GenesisConfig {
 		/// Direct implementation of `GenesisBuild::assimilate_storage`.
-		#[deprecated(note = "use `<GensisConfig<T, I> as GenesisBuild<T, I>>::assimilate_storage` instead")]
+		#[deprecated(
+			note = "use `<GensisConfig<T, I> as GenesisBuild<T, I>>::assimilate_storage` instead"
+		)]
 		pub fn assimilate_storage<T: Config<I>, I: 'static>(
 			&self,
-			storage: &mut sp_runtime::Storage
+			storage: &mut sp_runtime::Storage,
 		) -> Result<(), String> {
 			<Self as GenesisBuild<T, I>>::assimilate_storage(self, storage)
 		}
@@ -272,8 +274,8 @@ pub mod pallet {
 	}
 
 	/// Old name generated by `decl_event`.
-    #[deprecated(note = "use `Event` instead")]
-    pub type RawEvent<T, I = ()> = Event<T, I>;
+	#[deprecated(note = "use `Event` instead")]
+	pub type RawEvent<T, I = ()> = Event<T, I>;
 
 	/// Error for the treasury pallet.
 	#[pallet::error]
@@ -320,7 +322,7 @@ pub mod pallet {
 		pub fn propose_spend(
 			origin: OriginFor<T>,
 			#[pallet::compact] value: BalanceOf<T, I>,
-			beneficiary: <T::Lookup as StaticLookup>::Source
+			beneficiary: <T::Lookup as StaticLookup>::Source,
 		) -> DispatchResult {
 			let proposer = ensure_signed(origin)?;
 			let beneficiary = T::Lookup::lookup(beneficiary)?;
@@ -349,11 +351,12 @@ pub mod pallet {
 		#[pallet::weight((T::WeightInfo::reject_proposal(), DispatchClass::Operational))]
 		pub fn reject_proposal(
 			origin: OriginFor<T>,
-			#[pallet::compact] proposal_id: ProposalIndex
+			#[pallet::compact] proposal_id: ProposalIndex,
 		) -> DispatchResult {
 			T::RejectOrigin::ensure_origin(origin)?;
 
-			let proposal = <Proposals<T, I>>::take(&proposal_id).ok_or(Error::<T, I>::InvalidIndex)?;
+			let proposal =
+				<Proposals<T, I>>::take(&proposal_id).ok_or(Error::<T, I>::InvalidIndex)?;
 			let value = proposal.bond;
 			let imbalance = T::Currency::slash_reserved(&proposal.proposer, value).0;
 			T::OnSlash::on_unbalanced(imbalance);
@@ -375,12 +378,13 @@ pub mod pallet {
 		#[pallet::weight((T::WeightInfo::approve_proposal(T::MaxApprovals::get()), DispatchClass::Operational))]
 		pub fn approve_proposal(
 			origin: OriginFor<T>,
-			#[pallet::compact] proposal_id: ProposalIndex
+			#[pallet::compact] proposal_id: ProposalIndex,
 		) -> DispatchResult {
 			T::ApproveOrigin::ensure_origin(origin)?;
 
 			ensure!(<Proposals<T, I>>::contains_key(proposal_id), Error::<T, I>::InvalidIndex);
-			Approvals::<T, I>::try_append(proposal_id).map_err(|_| Error::<T, I>::TooManyApprovals)?;
+			Approvals::<T, I>::try_append(proposal_id)
+				.map_err(|_| Error::<T, I>::TooManyApprovals)?;
 			Ok(())
 		}
 	}
@@ -444,7 +448,12 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		total_weight += T::WeightInfo::on_initialize_proposals(proposals_len);
 
 		// Call Runtime hooks to external pallet using treasury to compute spend funds.
-		T::SpendFunds::spend_funds( &mut budget_remaining, &mut imbalance, &mut total_weight, &mut missed_any);
+		T::SpendFunds::spend_funds(
+			&mut budget_remaining,
+			&mut imbalance,
+			&mut total_weight,
+			&mut missed_any,
+		);
 
 		if !missed_any {
 			// burn some proportion of the remaining budget if we run a surplus.
@@ -461,12 +470,9 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		// proof: budget_remaining is account free balance minus ED;
 		// Thus we can't spend more than account free balance minus ED;
 		// Thus account is kept alive; qed;
-		if let Err(problem) = T::Currency::settle(
-			&account_id,
-			imbalance,
-			WithdrawReasons::TRANSFER,
-			KeepAlive
-		) {
+		if let Err(problem) =
+			T::Currency::settle(&account_id, imbalance, WithdrawReasons::TRANSFER, KeepAlive)
+		{
 			print("Inconsistent state - couldn't settle imbalance for funds spent by treasury");
 			// Nothing else to do here.
 			drop(problem);
diff --git a/frame/treasury/src/tests.rs b/frame/treasury/src/tests.rs
index a59491e1f6e9..cf341d5ad80f 100644
--- a/frame/treasury/src/tests.rs
+++ b/frame/treasury/src/tests.rs
@@ -28,12 +28,12 @@ use sp_runtime::{
 };
 
 use frame_support::{
-	assert_noop, assert_ok, parameter_types,
-	traits::OnInitialize, PalletId, pallet_prelude::GenesisBuild,
+	assert_noop, assert_ok, pallet_prelude::GenesisBuild, parameter_types, traits::OnInitialize,
+	PalletId,
 };
 
-use crate as treasury;
 use super::*;
+use crate as treasury;
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -119,7 +119,7 @@ impl Config for Test {
 	type ProposalBondMinimum = ProposalBondMinimum;
 	type SpendPeriod = SpendPeriod;
 	type Burn = Burn;
-	type BurnDestination = ();  // Just gets burned.
+	type BurnDestination = (); // Just gets burned.
 	type WeightInfo = ();
 	type SpendFunds = ();
 	type MaxApprovals = MaxApprovals;
@@ -127,10 +127,12 @@ impl Config for Test {
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-	pallet_balances::GenesisConfig::<Test>{
+	pallet_balances::GenesisConfig::<Test> {
 		// Total issuance will be 200 with treasury account initialized at ED.
 		balances: vec![(0, 100), (1, 98), (2, 1)],
-	}.assimilate_storage(&mut t).unwrap();
+	}
+	.assimilate_storage(&mut t)
+	.unwrap();
 	GenesisBuild::<Test>::assimilate_storage(&crate::GenesisConfig, &mut t).unwrap();
 	t.into()
 }
@@ -320,9 +322,9 @@ fn treasury_account_doesnt_get_deleted() {
 #[test]
 fn inexistent_account_works() {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-	pallet_balances::GenesisConfig::<Test>{
-		balances: vec![(0, 100), (1, 99), (2, 1)],
-	}.assimilate_storage(&mut t).unwrap();
+	pallet_balances::GenesisConfig::<Test> { balances: vec![(0, 100), (1, 99), (2, 1)] }
+		.assimilate_storage(&mut t)
+		.unwrap();
 	// Treasury genesis config is not build thus treasury account does not exist
 	let mut t: sp_io::TestExternalities = t.into();
 
@@ -353,10 +355,12 @@ fn inexistent_account_works() {
 fn genesis_funding_works() {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
 	let initial_funding = 100;
-	pallet_balances::GenesisConfig::<Test>{
+	pallet_balances::GenesisConfig::<Test> {
 		// Total issuance will be 200 with treasury account initialized with 100.
 		balances: vec![(0, 100), (Treasury::account_id(), initial_funding)],
-	}.assimilate_storage(&mut t).unwrap();
+	}
+	.assimilate_storage(&mut t)
+	.unwrap();
 	GenesisBuild::<Test>::assimilate_storage(&crate::GenesisConfig, &mut t).unwrap();
 	let mut t: sp_io::TestExternalities = t.into();
 
@@ -372,13 +376,16 @@ fn max_approvals_limited() {
 		Balances::make_free_balance_be(&Treasury::account_id(), u64::MAX);
 		Balances::make_free_balance_be(&0, u64::MAX);
 
-		for _ in 0 .. MaxApprovals::get() {
+		for _ in 0..MaxApprovals::get() {
 			assert_ok!(Treasury::propose_spend(Origin::signed(0), 100, 3));
 			assert_ok!(Treasury::approve_proposal(Origin::root(), 0));
 		}
 
 		// One too many will fail
 		assert_ok!(Treasury::propose_spend(Origin::signed(0), 100, 3));
-		assert_noop!(Treasury::approve_proposal(Origin::root(), 0), Error::<Test, _>::TooManyApprovals);
+		assert_noop!(
+			Treasury::approve_proposal(Origin::root(), 0),
+			Error::<Test, _>::TooManyApprovals
+		);
 	});
 }
diff --git a/frame/treasury/src/weights.rs b/frame/treasury/src/weights.rs
index d293399e7b48..234d71e3add2 100644
--- a/frame/treasury/src/weights.rs
+++ b/frame/treasury/src/weights.rs
@@ -36,6 +36,7 @@
 // --template=./.maintain/frame-weight-template.hbs
 
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
diff --git a/frame/try-runtime/src/lib.rs b/frame/try-runtime/src/lib.rs
index dcd3a4787823..b2dfdfac6429 100644
--- a/frame/try-runtime/src/lib.rs
+++ b/frame/try-runtime/src/lib.rs
@@ -19,8 +19,8 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use sp_std::prelude::*;
 use frame_support::weights::Weight;
+use sp_std::prelude::*;
 
 sp_api::decl_runtime_apis! {
 	/// Runtime api for testing the execution of a runtime upgrade.
diff --git a/frame/uniques/src/benchmarking.rs b/frame/uniques/src/benchmarking.rs
index ca6d656bd500..20ddbb15d536 100644
--- a/frame/uniques/src/benchmarking.rs
+++ b/frame/uniques/src/benchmarking.rs
@@ -19,22 +19,26 @@
 
 #![cfg(feature = "runtime-benchmarks")]
 
-use sp_std::{prelude::*, convert::TryInto};
 use super::*;
-use sp_runtime::traits::Bounded;
-use frame_system::RawOrigin as SystemOrigin;
 use frame_benchmarking::{
-	benchmarks_instance_pallet, account, whitelisted_caller, whitelist_account, impl_benchmark_test_suite
+	account, benchmarks_instance_pallet, impl_benchmark_test_suite, whitelist_account,
+	whitelisted_caller,
+};
+use frame_support::{
+	dispatch::UnfilteredDispatchable,
+	traits::{EnsureOrigin, Get},
+	BoundedVec,
 };
-use frame_support::{traits::{Get, EnsureOrigin}, dispatch::UnfilteredDispatchable, BoundedVec};
+use frame_system::RawOrigin as SystemOrigin;
+use sp_runtime::traits::Bounded;
+use sp_std::{convert::TryInto, prelude::*};
 
 use crate::Pallet as Uniques;
 
 const SEED: u32 = 0;
 
-fn create_class<T: Config<I>, I: 'static>()
-	-> (T::ClassId, T::AccountId, <T::Lookup as StaticLookup>::Source)
-{
+fn create_class<T: Config<I>, I: 'static>(
+) -> (T::ClassId, T::AccountId, <T::Lookup as StaticLookup>::Source) {
 	let caller: T::AccountId = whitelisted_caller();
 	let caller_lookup = T::Lookup::unlookup(caller.clone());
 	let class = Default::default();
@@ -43,13 +47,13 @@ fn create_class<T: Config<I>, I: 'static>()
 		SystemOrigin::Signed(caller.clone()).into(),
 		class,
 		caller_lookup.clone(),
-	).is_ok());
+	)
+	.is_ok());
 	(class, caller, caller_lookup)
 }
 
-fn add_class_metadata<T: Config<I>, I: 'static>()
-	-> (T::AccountId, <T::Lookup as StaticLookup>::Source)
-{
+fn add_class_metadata<T: Config<I>, I: 'static>(
+) -> (T::AccountId, <T::Lookup as StaticLookup>::Source) {
 	let caller = Class::<T, I>::get(T::ClassId::default()).unwrap().owner;
 	if caller != whitelisted_caller() {
 		whitelist_account!(caller);
@@ -60,13 +64,14 @@ fn add_class_metadata<T: Config<I>, I: 'static>()
 		Default::default(),
 		vec![0; T::StringLimit::get() as usize].try_into().unwrap(),
 		false,
-	).is_ok());
+	)
+	.is_ok());
 	(caller, caller_lookup)
 }
 
-fn mint_instance<T: Config<I>, I: 'static>(index: u16)
-	-> (T::InstanceId, T::AccountId, <T::Lookup as StaticLookup>::Source)
-{
+fn mint_instance<T: Config<I>, I: 'static>(
+	index: u16,
+) -> (T::InstanceId, T::AccountId, <T::Lookup as StaticLookup>::Source) {
 	let caller = Class::<T, I>::get(T::ClassId::default()).unwrap().admin;
 	if caller != whitelisted_caller() {
 		whitelist_account!(caller);
@@ -78,13 +83,14 @@ fn mint_instance<T: Config<I>, I: 'static>(index: u16)
 		Default::default(),
 		instance,
 		caller_lookup.clone(),
-	).is_ok());
+	)
+	.is_ok());
 	(instance, caller, caller_lookup)
 }
 
-fn add_instance_metadata<T: Config<I>, I: 'static>(instance: T::InstanceId)
-	-> (T::AccountId, <T::Lookup as StaticLookup>::Source)
-{
+fn add_instance_metadata<T: Config<I>, I: 'static>(
+	instance: T::InstanceId,
+) -> (T::AccountId, <T::Lookup as StaticLookup>::Source) {
 	let caller = Class::<T, I>::get(T::ClassId::default()).unwrap().owner;
 	if caller != whitelisted_caller() {
 		whitelist_account!(caller);
@@ -96,13 +102,14 @@ fn add_instance_metadata<T: Config<I>, I: 'static>(instance: T::InstanceId)
 		instance,
 		vec![0; T::StringLimit::get() as usize].try_into().unwrap(),
 		false,
-	).is_ok());
+	)
+	.is_ok());
 	(caller, caller_lookup)
 }
 
-fn add_instance_attribute<T: Config<I>, I: 'static>(instance: T::InstanceId)
-	-> (BoundedVec<u8, T::KeyLimit>, T::AccountId, <T::Lookup as StaticLookup>::Source)
-{
+fn add_instance_attribute<T: Config<I>, I: 'static>(
+	instance: T::InstanceId,
+) -> (BoundedVec<u8, T::KeyLimit>, T::AccountId, <T::Lookup as StaticLookup>::Source) {
 	let caller = Class::<T, I>::get(T::ClassId::default()).unwrap().owner;
 	if caller != whitelisted_caller() {
 		whitelist_account!(caller);
@@ -115,7 +122,8 @@ fn add_instance_attribute<T: Config<I>, I: 'static>(instance: T::InstanceId)
 		Some(instance),
 		key.clone(),
 		vec![0; T::ValueLimit::get() as usize].try_into().unwrap(),
-	).is_ok());
+	)
+	.is_ok());
 	(key, caller, caller_lookup)
 }
 
diff --git a/frame/uniques/src/functions.rs b/frame/uniques/src/functions.rs
index 28ff5ac6a703..5d1e75735752 100644
--- a/frame/uniques/src/functions.rs
+++ b/frame/uniques/src/functions.rs
@@ -19,7 +19,7 @@
 
 use super::*;
 use frame_support::{ensure, traits::Get};
-use sp_runtime::{DispatchResult, DispatchError};
+use sp_runtime::{DispatchError, DispatchResult};
 
 impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	pub(crate) fn do_transfer(
@@ -52,9 +52,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		class: T::ClassId,
 		instance: T::InstanceId,
 		owner: T::AccountId,
-		with_details: impl FnOnce(
-			&ClassDetailsFor<T, I>,
-		) -> DispatchResult,
+		with_details: impl FnOnce(&ClassDetailsFor<T, I>) -> DispatchResult,
 	) -> DispatchResult {
 		ensure!(!Asset::<T, I>::contains_key(class, instance), Error::<T, I>::AlreadyExists);
 
@@ -63,8 +61,8 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 
 			with_details(&class_details)?;
 
-			let instances = class_details.instances.checked_add(1)
-				.ok_or(ArithmeticError::Overflow)?;
+			let instances =
+				class_details.instances.checked_add(1).ok_or(ArithmeticError::Overflow)?;
 			class_details.instances = instances;
 
 			let deposit = match class_details.free_holding {
@@ -76,7 +74,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 
 			let owner = owner.clone();
 			Account::<T, I>::insert((&owner, &class, &instance), ());
-			let details = InstanceDetails { owner, approved: None, is_frozen: false, deposit};
+			let details = InstanceDetails { owner, approved: None, is_frozen: false, deposit };
 			Asset::<T, I>::insert(&class, &instance, details);
 			Ok(())
 		})?;
@@ -88,23 +86,23 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	pub(super) fn do_burn(
 		class: T::ClassId,
 		instance: T::InstanceId,
-		with_details: impl FnOnce(
-			&ClassDetailsFor<T, I>,
-			&InstanceDetailsFor<T, I>,
-		) -> DispatchResult,
+		with_details: impl FnOnce(&ClassDetailsFor<T, I>, &InstanceDetailsFor<T, I>) -> DispatchResult,
 	) -> DispatchResult {
-		let owner = Class::<T, I>::try_mutate(&class, |maybe_class_details| -> Result<T::AccountId, DispatchError> {
-			let class_details = maybe_class_details.as_mut().ok_or(Error::<T, I>::Unknown)?;
-			let details = Asset::<T, I>::get(&class, &instance)
-				.ok_or(Error::<T, I>::Unknown)?;
-			with_details(&class_details, &details)?;
-
-			// Return the deposit.
-			T::Currency::unreserve(&class_details.owner, details.deposit);
-			class_details.total_deposit.saturating_reduce(details.deposit);
-			class_details.instances.saturating_dec();
-			Ok(details.owner)
-		})?;
+		let owner = Class::<T, I>::try_mutate(
+			&class,
+			|maybe_class_details| -> Result<T::AccountId, DispatchError> {
+				let class_details = maybe_class_details.as_mut().ok_or(Error::<T, I>::Unknown)?;
+				let details =
+					Asset::<T, I>::get(&class, &instance).ok_or(Error::<T, I>::Unknown)?;
+				with_details(&class_details, &details)?;
+
+				// Return the deposit.
+				T::Currency::unreserve(&class_details.owner, details.deposit);
+				class_details.total_deposit.saturating_reduce(details.deposit);
+				class_details.instances.saturating_dec();
+				Ok(details.owner)
+			},
+		)?;
 
 		Asset::<T, I>::remove(&class, &instance);
 		Account::<T, I>::remove((&owner, &class, &instance));
diff --git a/frame/uniques/src/impl_nonfungibles.rs b/frame/uniques/src/impl_nonfungibles.rs
index 7113f314697a..fb1e28d4c77b 100644
--- a/frame/uniques/src/impl_nonfungibles.rs
+++ b/frame/uniques/src/impl_nonfungibles.rs
@@ -18,10 +18,12 @@
 //! Implementations for `nonfungibles` traits.
 
 use super::*;
-use sp_std::convert::TryFrom;
-use frame_support::traits::tokens::nonfungibles::{Inspect, InspectEnumerable, Mutate, Transfer};
-use frame_support::BoundedSlice;
+use frame_support::{
+	traits::tokens::nonfungibles::{Inspect, InspectEnumerable, Mutate, Transfer},
+	BoundedSlice,
+};
 use sp_runtime::DispatchResult;
+use sp_std::convert::TryFrom;
 
 impl<T: Config<I>, I: 'static> Inspect<<T as SystemConfig>::AccountId> for Pallet<T, I> {
 	type InstanceId = T::InstanceId;
@@ -43,9 +45,11 @@ impl<T: Config<I>, I: 'static> Inspect<<T as SystemConfig>::AccountId> for Palle
 	/// When `key` is empty, we return the instance metadata value.
 	///
 	/// By default this is `None`; no attributes are defined.
-	fn attribute(class: &Self::ClassId, instance: &Self::InstanceId, key: &[u8])
-		-> Option<Vec<u8>>
-	{
+	fn attribute(
+		class: &Self::ClassId,
+		instance: &Self::InstanceId,
+		key: &[u8],
+	) -> Option<Vec<u8>> {
 		if key.is_empty() {
 			// We make the empty key map to the instance metadata value.
 			InstanceMetadataOf::<T, I>::get(class, instance).map(|m| m.data.into())
@@ -60,9 +64,7 @@ impl<T: Config<I>, I: 'static> Inspect<<T as SystemConfig>::AccountId> for Palle
 	/// When `key` is empty, we return the instance metadata value.
 	///
 	/// By default this is `None`; no attributes are defined.
-	fn class_attribute(class: &Self::ClassId, key: &[u8])
-		-> Option<Vec<u8>>
-	{
+	fn class_attribute(class: &Self::ClassId, key: &[u8]) -> Option<Vec<u8>> {
 		if key.is_empty() {
 			// We make the empty key map to the instance metadata value.
 			ClassMetadataOf::<T, I>::get(class).map(|m| m.data.into())
@@ -132,7 +134,10 @@ impl<T: Config<I>, I: 'static> InspectEnumerable<T::AccountId> for Pallet<T, I>
 	/// Returns an iterator of the asset instances of `class` owned by `who`.
 	///
 	/// NOTE: iterating this list invokes a storage read per item.
-	fn owned_in_class(class: &Self::ClassId, who: &T::AccountId) -> Box<dyn Iterator<Item = Self::InstanceId>> {
+	fn owned_in_class(
+		class: &Self::ClassId,
+		who: &T::AccountId,
+	) -> Box<dyn Iterator<Item = Self::InstanceId>> {
 		Box::new(Account::<T, I>::iter_key_prefix((who, class)))
 	}
 }
diff --git a/frame/uniques/src/lib.rs b/frame/uniques/src/lib.rs
index 2275be6419ca..d42b2ec55c96 100644
--- a/frame/uniques/src/lib.rs
+++ b/frame/uniques/src/lib.rs
@@ -27,33 +27,36 @@
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
 
-pub mod weights;
 #[cfg(feature = "runtime-benchmarks")]
 mod benchmarking;
 #[cfg(test)]
 pub mod mock;
 #[cfg(test)]
 mod tests;
+pub mod weights;
 
-mod types;
 mod functions;
 mod impl_nonfungibles;
+mod types;
 pub use types::*;
 
-use sp_std::prelude::*;
-use sp_runtime::{RuntimeDebug, ArithmeticError, traits::{Zero, StaticLookup, Saturating}};
-use codec::{Encode, Decode, HasCompact};
-use frame_support::traits::{Currency, ReservableCurrency, BalanceStatus::Reserved};
+use codec::{Decode, Encode, HasCompact};
+use frame_support::traits::{BalanceStatus::Reserved, Currency, ReservableCurrency};
 use frame_system::Config as SystemConfig;
+use sp_runtime::{
+	traits::{Saturating, StaticLookup, Zero},
+	ArithmeticError, RuntimeDebug,
+};
+use sp_std::prelude::*;
 
-pub use weights::WeightInfo;
 pub use pallet::*;
+pub use weights::WeightInfo;
 
 #[frame_support::pallet]
 pub mod pallet {
+	use super::*;
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
-	use super::*;
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
@@ -182,7 +185,7 @@ pub mod pallet {
 			NMapKey<Blake2_128Concat, BoundedVec<u8, T::KeyLimit>>,
 		),
 		(BoundedVec<u8, T::ValueLimit>, DepositBalanceOf<T, I>),
-		OptionQuery
+		OptionQuery,
 	>;
 
 	#[pallet::event]
@@ -190,7 +193,7 @@ pub mod pallet {
 	#[pallet::metadata(
 		T::AccountId = "AccountId",
 		T::ClassId = "ClassId",
-		T::InstanceId = "InstanceId",
+		T::InstanceId = "InstanceId"
 	)]
 	pub enum Event<T: Config<I>, I: 'static = ()> {
 		/// An asset class was created. \[ class, creator, owner \]
@@ -419,7 +422,10 @@ pub mod pallet {
 					ensure!(class_details.owner == check_owner, Error::<T, I>::NoPermission);
 				}
 				ensure!(class_details.instances == witness.instances, Error::<T, I>::BadWitness);
-				ensure!(class_details.instance_metadatas == witness.instance_metadatas, Error::<T, I>::BadWitness);
+				ensure!(
+					class_details.instance_metadatas == witness.instance_metadatas,
+					Error::<T, I>::BadWitness
+				);
 				ensure!(class_details.attributes == witness.attributes, Error::<T, I>::BadWitness);
 
 				for (instance, details) in Asset::<T, I>::drain_prefix(&class) {
@@ -490,7 +496,10 @@ pub mod pallet {
 			Self::do_burn(class, instance, |class_details, details| {
 				let is_permitted = class_details.admin == origin || details.owner == origin;
 				ensure!(is_permitted, Error::<T, I>::NoPermission);
-				ensure!(check_owner.map_or(true, |o| o == details.owner), Error::<T, I>::WrongOwner);
+				ensure!(
+					check_owner.map_or(true, |o| o == details.owner),
+					Error::<T, I>::WrongOwner
+				);
 				Ok(())
 			})
 		}
@@ -610,8 +619,8 @@ pub mod pallet {
 		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
 
-			let mut details = Asset::<T, I>::get(&class, &instance)
-				.ok_or(Error::<T, I>::Unknown)?;
+			let mut details =
+				Asset::<T, I>::get(&class, &instance).ok_or(Error::<T, I>::Unknown)?;
 			let class_details = Class::<T, I>::get(&class).ok_or(Error::<T, I>::Unknown)?;
 			ensure!(class_details.freezer == origin, Error::<T, I>::NoPermission);
 
@@ -640,8 +649,8 @@ pub mod pallet {
 		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
 
-			let mut details = Asset::<T, I>::get(&class, &instance)
-				.ok_or(Error::<T, I>::Unknown)?;
+			let mut details =
+				Asset::<T, I>::get(&class, &instance).ok_or(Error::<T, I>::Unknown)?;
 			let class_details = Class::<T, I>::get(&class).ok_or(Error::<T, I>::Unknown)?;
 			ensure!(class_details.admin == origin, Error::<T, I>::NoPermission);
 
@@ -664,7 +673,7 @@ pub mod pallet {
 		#[pallet::weight(T::WeightInfo::freeze_class())]
 		pub fn freeze_class(
 			origin: OriginFor<T>,
-			#[pallet::compact] class: T::ClassId
+			#[pallet::compact] class: T::ClassId,
 		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
 
@@ -691,7 +700,7 @@ pub mod pallet {
 		#[pallet::weight(T::WeightInfo::thaw_class())]
 		pub fn thaw_class(
 			origin: OriginFor<T>,
-			#[pallet::compact] class: T::ClassId
+			#[pallet::compact] class: T::ClassId,
 		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
 
@@ -729,7 +738,7 @@ pub mod pallet {
 				let details = maybe_details.as_mut().ok_or(Error::<T, I>::Unknown)?;
 				ensure!(&origin == &details.owner, Error::<T, I>::NoPermission);
 				if details.owner == owner {
-					return Ok(());
+					return Ok(())
 				}
 
 				// Move the deposit to the new owner.
@@ -809,8 +818,8 @@ pub mod pallet {
 			let delegate = T::Lookup::lookup(delegate)?;
 
 			let class_details = Class::<T, I>::get(&class).ok_or(Error::<T, I>::Unknown)?;
-			let mut details = Asset::<T, I>::get(&class, &instance)
-				.ok_or(Error::<T, I>::Unknown)?;
+			let mut details =
+				Asset::<T, I>::get(&class, &instance).ok_or(Error::<T, I>::Unknown)?;
 
 			if let Some(check) = maybe_check {
 				let permitted = &check == &class_details.admin || &check == &details.owner;
@@ -854,8 +863,8 @@ pub mod pallet {
 				.or_else(|origin| ensure_signed(origin).map(Some).map_err(DispatchError::from))?;
 
 			let class_details = Class::<T, I>::get(&class).ok_or(Error::<T, I>::Unknown)?;
-			let mut details = Asset::<T, I>::get(&class, &instance)
-				.ok_or(Error::<T, I>::Unknown)?;
+			let mut details =
+				Asset::<T, I>::get(&class, &instance).ok_or(Error::<T, I>::Unknown)?;
 			if let Some(check) = maybe_check {
 				let permitted = &check == &class_details.admin || &check == &details.owner;
 				ensure!(permitted, Error::<T, I>::NoPermission);
@@ -1060,8 +1069,7 @@ pub mod pallet {
 				.map(|_| None)
 				.or_else(|origin| ensure_signed(origin).map(Some))?;
 
-			let mut class_details = Class::<T, I>::get(&class)
-				.ok_or(Error::<T, I>::Unknown)?;
+			let mut class_details = Class::<T, I>::get(&class).ok_or(Error::<T, I>::Unknown)?;
 
 			if let Some(check_owner) = &maybe_check_owner {
 				ensure!(check_owner == &class_details.owner, Error::<T, I>::NoPermission);
@@ -1089,11 +1097,7 @@ pub mod pallet {
 				}
 				class_details.total_deposit.saturating_accrue(deposit);
 
-				*metadata = Some(InstanceMetadata {
-					deposit,
-					data: data.clone(),
-					is_frozen,
-				});
+				*metadata = Some(InstanceMetadata { deposit, data: data.clone(), is_frozen });
 
 				Class::<T, I>::insert(&class, &class_details);
 				Self::deposit_event(Event::MetadataSet(class, instance, data, is_frozen));
@@ -1124,8 +1128,7 @@ pub mod pallet {
 				.map(|_| None)
 				.or_else(|origin| ensure_signed(origin).map(Some))?;
 
-			let mut class_details = Class::<T, I>::get(&class)
-				.ok_or(Error::<T, I>::Unknown)?;
+			let mut class_details = Class::<T, I>::get(&class).ok_or(Error::<T, I>::Unknown)?;
 			if let Some(check_owner) = &maybe_check_owner {
 				ensure!(check_owner == &class_details.owner, Error::<T, I>::NoPermission);
 			}
@@ -1200,11 +1203,7 @@ pub mod pallet {
 
 				Class::<T, I>::insert(&class, details);
 
-				*metadata = Some(ClassMetadata {
-					deposit,
-					data: data.clone(),
-					is_frozen,
-				});
+				*metadata = Some(ClassMetadata { deposit, data: data.clone(), is_frozen });
 
 				Self::deposit_event(Event::ClassMetadataSet(class, data, is_frozen));
 				Ok(())
diff --git a/frame/uniques/src/mock.rs b/frame/uniques/src/mock.rs
index 254acd6c419c..4b80aa73030c 100644
--- a/frame/uniques/src/mock.rs
+++ b/frame/uniques/src/mock.rs
@@ -20,9 +20,12 @@
 use super::*;
 use crate as pallet_uniques;
 
+use frame_support::{construct_runtime, parameter_types};
 use sp_core::H256;
-use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
-use frame_support::{parameter_types, construct_runtime};
+use sp_runtime::{
+	testing::Header,
+	traits::{BlakeTwo256, IdentityLookup},
+};
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
diff --git a/frame/uniques/src/tests.rs b/frame/uniques/src/tests.rs
index 4673ff71f8ed..8a4f978b7f4f 100644
--- a/frame/uniques/src/tests.rs
+++ b/frame/uniques/src/tests.rs
@@ -19,9 +19,9 @@
 
 use super::*;
 use crate::mock::*;
-use sp_std::convert::TryInto;
-use frame_support::{assert_ok, assert_noop, traits::Currency};
+use frame_support::{assert_noop, assert_ok, traits::Currency};
 use pallet_balances::Error as BalancesError;
+use sp_std::convert::TryInto;
 
 fn assets() -> Vec<(u64, u32, u32)> {
 	let mut r: Vec<_> = Account::<Test>::iter().map(|x| x.0).collect();
@@ -31,13 +31,15 @@ fn assets() -> Vec<(u64, u32, u32)> {
 	assert_eq!(r, s);
 	for class in Asset::<Test>::iter()
 		.map(|x| x.0)
-		.scan(None, |s, item| if s.map_or(false, |last| last == item) {
+		.scan(None, |s, item| {
+			if s.map_or(false, |last| last == item) {
 				*s = Some(item);
 				Some(None)
 			} else {
 				Some(Some(item))
 			}
-		).filter_map(|item| item)
+		})
+		.filter_map(|item| item)
 	{
 		let details = Class::<Test>::get(class).unwrap();
 		let instances = Asset::<Test>::iter_prefix(class).count() as u32;
@@ -181,7 +183,10 @@ fn origin_guards_should_work() {
 	new_test_ext().execute_with(|| {
 		assert_ok!(Uniques::force_create(Origin::root(), 0, 1, true));
 		assert_ok!(Uniques::mint(Origin::signed(1), 0, 42, 1));
-		assert_noop!(Uniques::transfer_ownership(Origin::signed(2), 0, 2), Error::<Test>::NoPermission);
+		assert_noop!(
+			Uniques::transfer_ownership(Origin::signed(2), 0, 2),
+			Error::<Test>::NoPermission
+		);
 		assert_noop!(Uniques::set_team(Origin::signed(2), 0, 2, 2, 2), Error::<Test>::NoPermission);
 		assert_noop!(Uniques::freeze(Origin::signed(2), 0, 42), Error::<Test>::NoPermission);
 		assert_noop!(Uniques::thaw(Origin::signed(2), 0, 42), Error::<Test>::NoPermission);
@@ -205,7 +210,10 @@ fn transfer_owner_should_work() {
 		assert_eq!(Balances::reserved_balance(&1), 0);
 		assert_eq!(Balances::reserved_balance(&2), 2);
 
-		assert_noop!(Uniques::transfer_ownership(Origin::signed(1), 0, 1), Error::<Test>::NoPermission);
+		assert_noop!(
+			Uniques::transfer_ownership(Origin::signed(1), 0, 1),
+			Error::<Test>::NoPermission
+		);
 
 		// Mint and set metadata now and make sure that deposit gets transferred back.
 		assert_ok!(Uniques::set_class_metadata(Origin::signed(2), 0, bvec![0u8; 20], false));
@@ -279,7 +287,10 @@ fn set_class_metadata_should_work() {
 
 		// Clear Metadata
 		assert_ok!(Uniques::set_class_metadata(Origin::root(), 0, bvec![0u8; 15], false));
-		assert_noop!(Uniques::clear_class_metadata(Origin::signed(2), 0), Error::<Test>::NoPermission);
+		assert_noop!(
+			Uniques::clear_class_metadata(Origin::signed(2), 0),
+			Error::<Test>::NoPermission
+		);
 		assert_noop!(Uniques::clear_class_metadata(Origin::signed(1), 1), Error::<Test>::Unknown);
 		assert_ok!(Uniques::clear_class_metadata(Origin::signed(1), 0));
 		assert!(!ClassMetadataOf::<Test>::contains_key(0));
@@ -330,7 +341,10 @@ fn set_instance_metadata_should_work() {
 
 		// Clear Metadata
 		assert_ok!(Uniques::set_metadata(Origin::root(), 0, 42, bvec![0u8; 15], false));
-		assert_noop!(Uniques::clear_metadata(Origin::signed(2), 0, 42), Error::<Test>::NoPermission);
+		assert_noop!(
+			Uniques::clear_metadata(Origin::signed(2), 0, 42),
+			Error::<Test>::NoPermission
+		);
 		assert_noop!(Uniques::clear_metadata(Origin::signed(1), 1, 42), Error::<Test>::Unknown);
 		assert_ok!(Uniques::clear_metadata(Origin::signed(1), 0, 42));
 		assert!(!InstanceMetadataOf::<Test>::contains_key(0, 42));
@@ -347,26 +361,32 @@ fn set_attribute_should_work() {
 		assert_ok!(Uniques::set_attribute(Origin::signed(1), 0, None, bvec![0], bvec![0]));
 		assert_ok!(Uniques::set_attribute(Origin::signed(1), 0, Some(0), bvec![0], bvec![0]));
 		assert_ok!(Uniques::set_attribute(Origin::signed(1), 0, Some(0), bvec![1], bvec![0]));
-		assert_eq!(attributes(0), vec![
-			(None, bvec![0], bvec![0]),
-			(Some(0), bvec![0], bvec![0]),
-			(Some(0), bvec![1], bvec![0]),
-		]);
+		assert_eq!(
+			attributes(0),
+			vec![
+				(None, bvec![0], bvec![0]),
+				(Some(0), bvec![0], bvec![0]),
+				(Some(0), bvec![1], bvec![0]),
+			]
+		);
 		assert_eq!(Balances::reserved_balance(1), 9);
 
 		assert_ok!(Uniques::set_attribute(Origin::signed(1), 0, None, bvec![0], bvec![0; 10]));
-		assert_eq!(attributes(0), vec![
-			(None, bvec![0], bvec![0; 10]),
-			(Some(0), bvec![0], bvec![0]),
-			(Some(0), bvec![1], bvec![0]),
-		]);
+		assert_eq!(
+			attributes(0),
+			vec![
+				(None, bvec![0], bvec![0; 10]),
+				(Some(0), bvec![0], bvec![0]),
+				(Some(0), bvec![1], bvec![0]),
+			]
+		);
 		assert_eq!(Balances::reserved_balance(1), 18);
 
 		assert_ok!(Uniques::clear_attribute(Origin::signed(1), 0, Some(0), bvec![1]));
-		assert_eq!(attributes(0), vec![
-			(None, bvec![0], bvec![0; 10]),
-			(Some(0), bvec![0], bvec![0]),
-		]);
+		assert_eq!(
+			attributes(0),
+			vec![(None, bvec![0], bvec![0; 10]), (Some(0), bvec![0], bvec![0]),]
+		);
 		assert_eq!(Balances::reserved_balance(1), 15);
 
 		let w = Class::<Test>::get(0).unwrap().destroy_witness();
@@ -386,11 +406,14 @@ fn set_attribute_should_respect_freeze() {
 		assert_ok!(Uniques::set_attribute(Origin::signed(1), 0, None, bvec![0], bvec![0]));
 		assert_ok!(Uniques::set_attribute(Origin::signed(1), 0, Some(0), bvec![0], bvec![0]));
 		assert_ok!(Uniques::set_attribute(Origin::signed(1), 0, Some(1), bvec![0], bvec![0]));
-		assert_eq!(attributes(0), vec![
-			(None, bvec![0], bvec![0]),
-			(Some(0), bvec![0], bvec![0]),
-			(Some(1), bvec![0], bvec![0]),
-		]);
+		assert_eq!(
+			attributes(0),
+			vec![
+				(None, bvec![0], bvec![0]),
+				(Some(0), bvec![0], bvec![0]),
+				(Some(1), bvec![0], bvec![0]),
+			]
+		);
 		assert_eq!(Balances::reserved_balance(1), 9);
 
 		assert_ok!(Uniques::set_class_metadata(Origin::signed(1), 0, bvec![], true));
@@ -406,7 +429,7 @@ fn set_attribute_should_respect_freeze() {
 }
 
 #[test]
-fn force_asset_status_should_work(){
+fn force_asset_status_should_work() {
 	new_test_ext().execute_with(|| {
 		Balances::make_free_balance_be(&1, 100);
 
@@ -418,7 +441,7 @@ fn force_asset_status_should_work(){
 		assert_ok!(Uniques::set_metadata(Origin::signed(1), 0, 69, bvec![0; 20], false));
 		assert_eq!(Balances::reserved_balance(1), 65);
 
-		//force asset status to be free holding
+		// force asset status to be free holding
 		assert_ok!(Uniques::force_asset_status(Origin::root(), 0, 1, 1, 1, 1, true, false));
 		assert_ok!(Uniques::mint(Origin::signed(1), 0, 142, 1));
 		assert_ok!(Uniques::mint(Origin::signed(1), 0, 169, 2));
@@ -484,13 +507,28 @@ fn cancel_approval_works() {
 		assert_ok!(Uniques::mint(Origin::signed(1), 0, 42, 2));
 
 		assert_ok!(Uniques::approve_transfer(Origin::signed(2), 0, 42, 3));
-		assert_noop!(Uniques::cancel_approval(Origin::signed(2), 1, 42, None), Error::<Test>::Unknown);
-		assert_noop!(Uniques::cancel_approval(Origin::signed(2), 0, 43, None), Error::<Test>::Unknown);
-		assert_noop!(Uniques::cancel_approval(Origin::signed(3), 0, 42, None), Error::<Test>::NoPermission);
-		assert_noop!(Uniques::cancel_approval(Origin::signed(2), 0, 42, Some(4)), Error::<Test>::WrongDelegate);
+		assert_noop!(
+			Uniques::cancel_approval(Origin::signed(2), 1, 42, None),
+			Error::<Test>::Unknown
+		);
+		assert_noop!(
+			Uniques::cancel_approval(Origin::signed(2), 0, 43, None),
+			Error::<Test>::Unknown
+		);
+		assert_noop!(
+			Uniques::cancel_approval(Origin::signed(3), 0, 42, None),
+			Error::<Test>::NoPermission
+		);
+		assert_noop!(
+			Uniques::cancel_approval(Origin::signed(2), 0, 42, Some(4)),
+			Error::<Test>::WrongDelegate
+		);
 
 		assert_ok!(Uniques::cancel_approval(Origin::signed(2), 0, 42, Some(3)));
-		assert_noop!(Uniques::cancel_approval(Origin::signed(2), 0, 42, None), Error::<Test>::NoDelegate);
+		assert_noop!(
+			Uniques::cancel_approval(Origin::signed(2), 0, 42, None),
+			Error::<Test>::NoDelegate
+		);
 	});
 }
 
@@ -501,12 +539,24 @@ fn cancel_approval_works_with_admin() {
 		assert_ok!(Uniques::mint(Origin::signed(1), 0, 42, 2));
 
 		assert_ok!(Uniques::approve_transfer(Origin::signed(2), 0, 42, 3));
-		assert_noop!(Uniques::cancel_approval(Origin::signed(1), 1, 42, None), Error::<Test>::Unknown);
-		assert_noop!(Uniques::cancel_approval(Origin::signed(1), 0, 43, None), Error::<Test>::Unknown);
-		assert_noop!(Uniques::cancel_approval(Origin::signed(1), 0, 42, Some(4)), Error::<Test>::WrongDelegate);
+		assert_noop!(
+			Uniques::cancel_approval(Origin::signed(1), 1, 42, None),
+			Error::<Test>::Unknown
+		);
+		assert_noop!(
+			Uniques::cancel_approval(Origin::signed(1), 0, 43, None),
+			Error::<Test>::Unknown
+		);
+		assert_noop!(
+			Uniques::cancel_approval(Origin::signed(1), 0, 42, Some(4)),
+			Error::<Test>::WrongDelegate
+		);
 
 		assert_ok!(Uniques::cancel_approval(Origin::signed(1), 0, 42, Some(3)));
-		assert_noop!(Uniques::cancel_approval(Origin::signed(1), 0, 42, None), Error::<Test>::NoDelegate);
+		assert_noop!(
+			Uniques::cancel_approval(Origin::signed(1), 0, 42, None),
+			Error::<Test>::NoDelegate
+		);
 	});
 }
 
@@ -519,9 +569,15 @@ fn cancel_approval_works_with_force() {
 		assert_ok!(Uniques::approve_transfer(Origin::signed(2), 0, 42, 3));
 		assert_noop!(Uniques::cancel_approval(Origin::root(), 1, 42, None), Error::<Test>::Unknown);
 		assert_noop!(Uniques::cancel_approval(Origin::root(), 0, 43, None), Error::<Test>::Unknown);
-		assert_noop!(Uniques::cancel_approval(Origin::root(), 0, 42, Some(4)), Error::<Test>::WrongDelegate);
+		assert_noop!(
+			Uniques::cancel_approval(Origin::root(), 0, 42, Some(4)),
+			Error::<Test>::WrongDelegate
+		);
 
 		assert_ok!(Uniques::cancel_approval(Origin::root(), 0, 42, Some(3)));
-		assert_noop!(Uniques::cancel_approval(Origin::root(), 0, 42, None), Error::<Test>::NoDelegate);
+		assert_noop!(
+			Uniques::cancel_approval(Origin::root(), 0, 42, None),
+			Error::<Test>::NoDelegate
+		);
 	});
 }
diff --git a/frame/uniques/src/types.rs b/frame/uniques/src/types.rs
index f73a18c7f3f3..ae61b6b5e1fd 100644
--- a/frame/uniques/src/types.rs
+++ b/frame/uniques/src/types.rs
@@ -27,12 +27,8 @@ pub(super) type ClassDetailsFor<T, I> =
 pub(super) type InstanceDetailsFor<T, I> =
 	InstanceDetails<<T as SystemConfig>::AccountId, DepositBalanceOf<T, I>>;
 
-
 #[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug)]
-pub struct ClassDetails<
-	AccountId,
-	DepositBalance,
-> {
+pub struct ClassDetails<AccountId, DepositBalance> {
 	/// Can change `owner`, `issuer`, `freezer` and `admin` accounts.
 	pub(super) owner: AccountId,
 	/// Can mint tokens.
diff --git a/frame/uniques/src/weights.rs b/frame/uniques/src/weights.rs
index a2263d6cd348..0bef1cb5d693 100644
--- a/frame/uniques/src/weights.rs
+++ b/frame/uniques/src/weights.rs
@@ -36,6 +36,7 @@
 // --template=./.maintain/frame-weight-template.hbs
 
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
diff --git a/frame/utility/src/benchmarking.rs b/frame/utility/src/benchmarking.rs
index 44019e48c1eb..ae4eb68661ea 100644
--- a/frame/utility/src/benchmarking.rs
+++ b/frame/utility/src/benchmarking.rs
@@ -20,8 +20,8 @@
 #![cfg(feature = "runtime-benchmarks")]
 
 use super::*;
+use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, whitelisted_caller};
 use frame_system::RawOrigin;
-use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
 
 const SEED: u32 = 0;
 
@@ -65,8 +65,4 @@ benchmarks! {
 	}
 }
 
-impl_benchmark_test_suite!(
-	Pallet,
-	crate::tests::new_test_ext(),
-	crate::tests::Test,
-);
+impl_benchmark_test_suite!(Pallet, crate::tests::new_test_ext(), crate::tests::Test,);
diff --git a/frame/utility/src/lib.rs b/frame/utility/src/lib.rs
index b8170ac8ba00..1133bd869857 100644
--- a/frame/utility/src/lib.rs
+++ b/frame/utility/src/lib.rs
@@ -52,36 +52,35 @@
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
 
-mod tests;
 mod benchmarking;
+mod tests;
 pub mod weights;
 
-use sp_std::prelude::*;
-use codec::{Encode, Decode};
-use sp_core::TypeId;
-use sp_io::hashing::blake2_256;
+use codec::{Decode, Encode};
 use frame_support::{
-	transactional,
-	traits::{OriginTrait, UnfilteredDispatchable, IsSubType},
-	weights::{GetDispatchInfo, extract_actual_weight},
 	dispatch::PostDispatchInfo,
+	traits::{IsSubType, OriginTrait, UnfilteredDispatchable},
+	transactional,
+	weights::{extract_actual_weight, GetDispatchInfo},
 };
+use sp_core::TypeId;
+use sp_io::hashing::blake2_256;
 use sp_runtime::traits::Dispatchable;
+use sp_std::prelude::*;
 pub use weights::WeightInfo;
 
 pub use pallet::*;
 
 #[frame_support::pallet]
 pub mod pallet {
+	use super::*;
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
-	use super::*;
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
 	pub struct Pallet<T>(_);
 
-
 	/// Configuration trait.
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
@@ -89,9 +88,11 @@ pub mod pallet {
 		type Event: From<Event> + IsType<<Self as frame_system::Config>::Event>;
 
 		/// The overarching call type.
-		type Call: Parameter + Dispatchable<Origin=Self::Origin, PostInfo=PostDispatchInfo>
-			+ GetDispatchInfo + From<frame_system::Call<Self>>
-			+ UnfilteredDispatchable<Origin=Self::Origin>
+		type Call: Parameter
+			+ Dispatchable<Origin = Self::Origin, PostInfo = PostDispatchInfo>
+			+ GetDispatchInfo
+			+ From<frame_system::Call<Self>>
+			+ UnfilteredDispatchable<Origin = Self::Origin>
 			+ IsSubType<Call<Self>>
 			+ IsType<<Self as frame_system::Config>::Call>;
 
@@ -170,7 +171,7 @@ pub mod pallet {
 					// Take the weight of this function itself into account.
 					let base_weight = T::WeightInfo::batch(index.saturating_add(1) as u32);
 					// Return the actual used weight + base_weight of this call.
-					return Ok(Some(base_weight + weight).into());
+					return Ok(Some(base_weight + weight).into())
 				}
 			}
 			Self::deposit_event(Event::BatchCompleted);
@@ -213,13 +214,16 @@ pub mod pallet {
 			let info = call.get_dispatch_info();
 			let result = call.dispatch(origin);
 			// Always take into account the base weight of this call.
-			let mut weight = T::WeightInfo::as_derivative().saturating_add(T::DbWeight::get().reads_writes(1, 1));
+			let mut weight = T::WeightInfo::as_derivative()
+				.saturating_add(T::DbWeight::get().reads_writes(1, 1));
 			// Add the real weight of the dispatch.
 			weight = weight.saturating_add(extract_actual_weight(&result, &info));
-			result.map_err(|mut err| {
-				err.post_info = Some(weight).into();
-				err
-			}).map(|_| Some(weight).into())
+			result
+				.map_err(|mut err| {
+					err.post_info = Some(weight).into();
+					err
+				})
+				.map(|_| Some(weight).into())
 		}
 
 		/// Send a batch of dispatch calls and atomically execute them.
@@ -291,7 +295,6 @@ pub mod pallet {
 			Ok(Some(base_weight + weight).into())
 		}
 	}
-
 }
 
 /// A pallet identifier. These are per pallet and should be stored in a registry somewhere.
diff --git a/frame/utility/src/tests.rs b/frame/utility/src/tests.rs
index aa6bea8a27d3..61890972d3a0 100644
--- a/frame/utility/src/tests.rs
+++ b/frame/utility/src/tests.rs
@@ -21,23 +21,26 @@
 
 use super::*;
 
+use crate as utility;
 use frame_support::{
-	assert_ok, assert_noop, parameter_types, assert_err_ignore_postinfo, decl_module,
-	weights::{Weight, Pays},
+	assert_err_ignore_postinfo, assert_noop, assert_ok, decl_module,
 	dispatch::{DispatchError, DispatchErrorWithPostInfo, Dispatchable},
+	parameter_types, storage,
 	traits::Filter,
-	storage,
+	weights::{Pays, Weight},
 };
 use sp_core::H256;
-use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
-use crate as utility;
+use sp_runtime::{
+	testing::Header,
+	traits::{BlakeTwo256, IdentityLookup},
+};
 
 // example module to test behaviors.
 pub mod example {
 	use super::*;
-	use frame_system::ensure_signed;
 	use frame_support::dispatch::{DispatchResultWithPostInfo, WithPostDispatchInfo};
-	pub trait Config: frame_system::Config { }
+	use frame_system::ensure_signed;
+	pub trait Config: frame_system::Config {}
 
 	decl_module! {
 		pub struct Module<T: Config> for enum Call where origin: <T as frame_system::Config>::Origin {
@@ -160,14 +163,15 @@ type ExampleCall = example::Call<Test>;
 type UtilityCall = crate::Call<Test>;
 
 use frame_system::Call as SystemCall;
-use pallet_balances::Call as BalancesCall;
-use pallet_balances::Error as BalancesError;
+use pallet_balances::{Call as BalancesCall, Error as BalancesError};
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
 	pallet_balances::GenesisConfig::<Test> {
 		balances: vec![(1, 10), (2, 10), (3, 10), (4, 10), (5, 2)],
-	}.assimilate_storage(&mut t).unwrap();
+	}
+	.assimilate_storage(&mut t)
+	.unwrap();
 	let mut ext = sp_io::TestExternalities::new(t);
 	ext.execute_with(|| System::set_block_number(1));
 	ext
@@ -178,11 +182,14 @@ fn as_derivative_works() {
 	new_test_ext().execute_with(|| {
 		let sub_1_0 = Utility::derivative_account_id(1, 0);
 		assert_ok!(Balances::transfer(Origin::signed(1), sub_1_0, 5));
-		assert_err_ignore_postinfo!(Utility::as_derivative(
-			Origin::signed(1),
-			1,
-			Box::new(Call::Balances(BalancesCall::transfer(6, 3))),
-		), BalancesError::<Test, _>::InsufficientBalance);
+		assert_err_ignore_postinfo!(
+			Utility::as_derivative(
+				Origin::signed(1),
+				1,
+				Box::new(Call::Balances(BalancesCall::transfer(6, 3))),
+			),
+			BalancesError::<Test, _>::InsufficientBalance
+		);
 		assert_ok!(Utility::as_derivative(
 			Origin::signed(1),
 			0,
@@ -256,11 +263,14 @@ fn as_derivative_handles_weight_refund() {
 #[test]
 fn as_derivative_filters() {
 	new_test_ext().execute_with(|| {
-		assert_err_ignore_postinfo!(Utility::as_derivative(
-			Origin::signed(1),
-			1,
-			Box::new(Call::Balances(pallet_balances::Call::transfer_keep_alive(2, 1))),
-		), DispatchError::BadOrigin);
+		assert_err_ignore_postinfo!(
+			Utility::as_derivative(
+				Origin::signed(1),
+				1,
+				Box::new(Call::Balances(pallet_balances::Call::transfer_keep_alive(2, 1))),
+			),
+			DispatchError::BadOrigin
+		);
 	});
 }
 
@@ -272,11 +282,14 @@ fn batch_with_root_works() {
 		assert!(!TestBaseCallFilter::filter(&call));
 		assert_eq!(Balances::free_balance(1), 10);
 		assert_eq!(Balances::free_balance(2), 10);
-		assert_ok!(Utility::batch(Origin::root(), vec![
-			Call::Balances(BalancesCall::force_transfer(1, 2, 5)),
-			Call::Balances(BalancesCall::force_transfer(1, 2, 5)),
-			call, // Check filters are correctly bypassed
-		]));
+		assert_ok!(Utility::batch(
+			Origin::root(),
+			vec![
+				Call::Balances(BalancesCall::force_transfer(1, 2, 5)),
+				Call::Balances(BalancesCall::force_transfer(1, 2, 5)),
+				call, // Check filters are correctly bypassed
+			]
+		));
 		assert_eq!(Balances::free_balance(1), 0);
 		assert_eq!(Balances::free_balance(2), 20);
 		assert_eq!(storage::unhashed::get_raw(&k), Some(k));
@@ -288,12 +301,13 @@ fn batch_with_signed_works() {
 	new_test_ext().execute_with(|| {
 		assert_eq!(Balances::free_balance(1), 10);
 		assert_eq!(Balances::free_balance(2), 10);
-		assert_ok!(
-			Utility::batch(Origin::signed(1), vec![
+		assert_ok!(Utility::batch(
+			Origin::signed(1),
+			vec![
 				Call::Balances(BalancesCall::transfer(2, 5)),
 				Call::Balances(BalancesCall::transfer(2, 5))
-			]),
-		);
+			]
+		),);
 		assert_eq!(Balances::free_balance(1), 0);
 		assert_eq!(Balances::free_balance(2), 20);
 	});
@@ -302,12 +316,13 @@ fn batch_with_signed_works() {
 #[test]
 fn batch_with_signed_filters() {
 	new_test_ext().execute_with(|| {
-		assert_ok!(
-			Utility::batch(Origin::signed(1), vec![
-				Call::Balances(pallet_balances::Call::transfer_keep_alive(2, 1))
-			]),
+		assert_ok!(Utility::batch(
+			Origin::signed(1),
+			vec![Call::Balances(pallet_balances::Call::transfer_keep_alive(2, 1))]
+		),);
+		System::assert_last_event(
+			utility::Event::BatchInterrupted(0, DispatchError::BadOrigin).into(),
 		);
-		System::assert_last_event(utility::Event::BatchInterrupted(0, DispatchError::BadOrigin).into());
 	});
 }
 
@@ -316,13 +331,14 @@ fn batch_early_exit_works() {
 	new_test_ext().execute_with(|| {
 		assert_eq!(Balances::free_balance(1), 10);
 		assert_eq!(Balances::free_balance(2), 10);
-		assert_ok!(
-			Utility::batch(Origin::signed(1), vec![
+		assert_ok!(Utility::batch(
+			Origin::signed(1),
+			vec![
 				Call::Balances(BalancesCall::transfer(2, 5)),
 				Call::Balances(BalancesCall::transfer(2, 10)),
 				Call::Balances(BalancesCall::transfer(2, 5)),
-			]),
-		);
+			]
+		),);
 		assert_eq!(Balances::free_balance(1), 5);
 		assert_eq!(Balances::free_balance(2), 15);
 	});
@@ -381,7 +397,9 @@ fn batch_handles_weight_refund() {
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(Origin::signed(1));
 		assert_ok!(result);
-		System::assert_last_event(utility::Event::BatchInterrupted(1, DispatchError::Other("")).into());
+		System::assert_last_event(
+			utility::Event::BatchInterrupted(1, DispatchError::Other("")).into(),
+		);
 		// No weight is refunded
 		assert_eq!(extract_actual_weight(&result, &info), info.weight);
 
@@ -394,7 +412,9 @@ fn batch_handles_weight_refund() {
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(Origin::signed(1));
 		assert_ok!(result);
-		System::assert_last_event(utility::Event::BatchInterrupted(1, DispatchError::Other("")).into());
+		System::assert_last_event(
+			utility::Event::BatchInterrupted(1, DispatchError::Other("")).into(),
+		);
 		assert_eq!(extract_actual_weight(&result, &info), info.weight - diff * batch_len);
 
 		// Partial batch completion
@@ -405,7 +425,9 @@ fn batch_handles_weight_refund() {
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(Origin::signed(1));
 		assert_ok!(result);
-		System::assert_last_event(utility::Event::BatchInterrupted(1, DispatchError::Other("")).into());
+		System::assert_last_event(
+			utility::Event::BatchInterrupted(1, DispatchError::Other("")).into(),
+		);
 		assert_eq!(
 			extract_actual_weight(&result, &info),
 			// Real weight is 2 calls at end_weight
@@ -419,12 +441,13 @@ fn batch_all_works() {
 	new_test_ext().execute_with(|| {
 		assert_eq!(Balances::free_balance(1), 10);
 		assert_eq!(Balances::free_balance(2), 10);
-		assert_ok!(
-			Utility::batch_all(Origin::signed(1), vec![
+		assert_ok!(Utility::batch_all(
+			Origin::signed(1),
+			vec![
 				Call::Balances(BalancesCall::transfer(2, 5)),
 				Call::Balances(BalancesCall::transfer(2, 5))
-			]),
-		);
+			]
+		),);
 		assert_eq!(Balances::free_balance(1), 0);
 		assert_eq!(Balances::free_balance(2), 20);
 	});
@@ -439,14 +462,19 @@ fn batch_all_revert() {
 		assert_eq!(Balances::free_balance(1), 10);
 		assert_eq!(Balances::free_balance(2), 10);
 		assert_noop!(
-			Utility::batch_all(Origin::signed(1), vec![
-				Call::Balances(BalancesCall::transfer(2, 5)),
-				Call::Balances(BalancesCall::transfer(2, 10)),
-				Call::Balances(BalancesCall::transfer(2, 5)),
-			]),
+			Utility::batch_all(
+				Origin::signed(1),
+				vec![
+					Call::Balances(BalancesCall::transfer(2, 5)),
+					Call::Balances(BalancesCall::transfer(2, 10)),
+					Call::Balances(BalancesCall::transfer(2, 5)),
+				]
+			),
 			DispatchErrorWithPostInfo {
 				post_info: PostDispatchInfo {
-					actual_weight: Some(<Test as Config>::WeightInfo::batch_all(2) + info.weight * 2),
+					actual_weight: Some(
+						<Test as Config>::WeightInfo::batch_all(2) + info.weight * 2
+					),
 					pays_fee: Pays::Yes
 				},
 				error: pallet_balances::Error::<Test, _>::InsufficientBalance.into()
@@ -525,15 +553,11 @@ fn batch_all_handles_weight_refund() {
 #[test]
 fn batch_all_does_not_nest() {
 	new_test_ext().execute_with(|| {
-		let batch_all = Call::Utility(
-			UtilityCall::batch_all(
-				vec![
-					Call::Balances(BalancesCall::transfer(2, 1)),
-					Call::Balances(BalancesCall::transfer(2, 1)),
-					Call::Balances(BalancesCall::transfer(2, 1)),
-				]
-			)
-		);
+		let batch_all = Call::Utility(UtilityCall::batch_all(vec![
+			Call::Balances(BalancesCall::transfer(2, 1)),
+			Call::Balances(BalancesCall::transfer(2, 1)),
+			Call::Balances(BalancesCall::transfer(2, 1)),
+		]));
 
 		let info = batch_all.get_dispatch_info();
 
@@ -557,7 +581,9 @@ fn batch_all_does_not_nest() {
 		// Batch will end with `Ok`, but does not actually execute as we can see from the event
 		// and balances.
 		assert_ok!(Utility::batch_all(Origin::signed(1), vec![batch_nested]));
-		System::assert_has_event(utility::Event::BatchInterrupted(0, DispatchError::BadOrigin).into());
+		System::assert_has_event(
+			utility::Event::BatchInterrupted(0, DispatchError::BadOrigin).into(),
+		);
 		assert_eq!(Balances::free_balance(1), 10);
 		assert_eq!(Balances::free_balance(2), 10);
 	});
diff --git a/frame/utility/src/weights.rs b/frame/utility/src/weights.rs
index 0bab97201008..e098bf2b8a9e 100644
--- a/frame/utility/src/weights.rs
+++ b/frame/utility/src/weights.rs
@@ -36,6 +36,7 @@
 // --template=./.maintain/frame-weight-template.hbs
 
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
diff --git a/frame/vesting/src/benchmarking.rs b/frame/vesting/src/benchmarking.rs
index 6fd27e187722..fba4369dba9d 100644
--- a/frame/vesting/src/benchmarking.rs
+++ b/frame/vesting/src/benchmarking.rs
@@ -21,15 +21,16 @@
 
 use super::*;
 
-use frame_system::{RawOrigin, Pallet as System};
-use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
+use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, whitelisted_caller};
+use frame_system::{Pallet as System, RawOrigin};
 use sp_runtime::traits::Bounded;
 
 use crate::Pallet as Vesting;
 
 const SEED: u32 = 0;
 
-type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+type BalanceOf<T> =
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 
 fn add_locks<T: Config>(who: &T::AccountId, n: u8) {
 	for id in 0..n {
diff --git a/frame/vesting/src/lib.rs b/frame/vesting/src/lib.rs
index b53262840f44..8a2651a84c64 100644
--- a/frame/vesting/src/lib.rs
+++ b/frame/vesting/src/lib.rs
@@ -88,14 +88,14 @@ pub struct VestingInfo<Balance, BlockNumber> {
 	pub starting_block: BlockNumber,
 }
 
-impl<
-	Balance: AtLeast32BitUnsigned + Copy,
-	BlockNumber: AtLeast32BitUnsigned + Copy,
-> VestingInfo<Balance, BlockNumber> {
+impl<Balance: AtLeast32BitUnsigned + Copy, BlockNumber: AtLeast32BitUnsigned + Copy>
+	VestingInfo<Balance, BlockNumber>
+{
 	/// Amount locked at block `n`.
-	pub fn locked_at<
-		BlockNumberToBalance: Convert<BlockNumber, Balance>
-	>(&self, n: BlockNumber) -> Balance {
+	pub fn locked_at<BlockNumberToBalance: Convert<BlockNumber, Balance>>(
+		&self,
+		n: BlockNumber,
+	) -> Balance {
 		// Number of blocks that count toward vesting
 		// Saturating to 0 when n < starting_block
 		let vested_block_count = n.saturating_sub(self.starting_block);
@@ -136,12 +136,8 @@ pub mod pallet {
 	/// Information regarding the vesting of a given account.
 	#[pallet::storage]
 	#[pallet::getter(fn vesting)]
-	pub type Vesting<T: Config> = StorageMap<
-		_,
-		Blake2_128Concat,
-		T::AccountId,
-		VestingInfo<BalanceOf<T>, T::BlockNumber>,
-	>;
+	pub type Vesting<T: Config> =
+		StorageMap<_, Blake2_128Concat, T::AccountId, VestingInfo<BalanceOf<T>, T::BlockNumber>>;
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
@@ -155,9 +151,7 @@ pub mod pallet {
 	#[cfg(feature = "std")]
 	impl<T: Config> Default for GenesisConfig<T> {
 		fn default() -> Self {
-			GenesisConfig {
-				vesting: Default::default(),
-			}
+			GenesisConfig { vesting: Default::default() }
 		}
 	}
 
@@ -179,11 +173,7 @@ pub mod pallet {
 				let length_as_balance = T::BlockNumberToBalance::convert(length);
 				let per_block = locked / length_as_balance.max(sp_runtime::traits::One::one());
 
-				Vesting::<T>::insert(who, VestingInfo {
-					locked: locked,
-					per_block: per_block,
-					starting_block: begin
-				});
+				Vesting::<T>::insert(who, VestingInfo { locked, per_block, starting_block: begin });
 				let reasons = WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE;
 				T::Currency::set_lock(VESTING_ID, who, locked, reasons);
 			}
@@ -254,7 +244,10 @@ pub mod pallet {
 		#[pallet::weight(T::WeightInfo::vest_other_locked(MaxLocksOf::<T>::get())
 			.max(T::WeightInfo::vest_other_unlocked(MaxLocksOf::<T>::get()))
 		)]
-		pub fn vest_other(origin: OriginFor<T>, target: <T::Lookup as StaticLookup>::Source) -> DispatchResult {
+		pub fn vest_other(
+			origin: OriginFor<T>,
+			target: <T::Lookup as StaticLookup>::Source,
+		) -> DispatchResult {
 			ensure_signed(origin)?;
 			Self::update_lock(T::Lookup::lookup(target)?)
 		}
@@ -287,10 +280,20 @@ pub mod pallet {
 			let who = T::Lookup::lookup(target)?;
 			ensure!(!Vesting::<T>::contains_key(&who), Error::<T>::ExistingVestingSchedule);
 
-			T::Currency::transfer(&transactor, &who, schedule.locked, ExistenceRequirement::AllowDeath)?;
-
-			Self::add_vesting_schedule(&who, schedule.locked, schedule.per_block, schedule.starting_block)
-				.expect("user does not have an existing vesting schedule; q.e.d.");
+			T::Currency::transfer(
+				&transactor,
+				&who,
+				schedule.locked,
+				ExistenceRequirement::AllowDeath,
+			)?;
+
+			Self::add_vesting_schedule(
+				&who,
+				schedule.locked,
+				schedule.per_block,
+				schedule.starting_block,
+			)
+			.expect("user does not have an existing vesting schedule; q.e.d.");
 
 			Ok(())
 		}
@@ -326,10 +329,20 @@ pub mod pallet {
 			let source = T::Lookup::lookup(source)?;
 			ensure!(!Vesting::<T>::contains_key(&target), Error::<T>::ExistingVestingSchedule);
 
-			T::Currency::transfer(&source, &target, schedule.locked, ExistenceRequirement::AllowDeath)?;
-
-			Self::add_vesting_schedule(&target, schedule.locked, schedule.per_block, schedule.starting_block)
-				.expect("user does not have an existing vesting schedule; q.e.d.");
+			T::Currency::transfer(
+				&source,
+				&target,
+				schedule.locked,
+				ExistenceRequirement::AllowDeath,
+			)?;
+
+			Self::add_vesting_schedule(
+				&target,
+				schedule.locked,
+				schedule.per_block,
+				schedule.starting_block,
+			)
+			.expect("user does not have an existing vesting schedule; q.e.d.");
 
 			Ok(())
 		}
@@ -357,8 +370,9 @@ impl<T: Config> Pallet<T> {
 	}
 }
 
-impl<T: Config> VestingSchedule<T::AccountId> for Pallet<T> where
-	BalanceOf<T>: MaybeSerializeDeserialize + Debug
+impl<T: Config> VestingSchedule<T::AccountId> for Pallet<T>
+where
+	BalanceOf<T>: MaybeSerializeDeserialize + Debug,
 {
 	type Moment = T::BlockNumber;
 	type Currency = T::Currency;
@@ -388,17 +402,15 @@ impl<T: Config> VestingSchedule<T::AccountId> for Pallet<T> where
 		who: &T::AccountId,
 		locked: BalanceOf<T>,
 		per_block: BalanceOf<T>,
-		starting_block: T::BlockNumber
+		starting_block: T::BlockNumber,
 	) -> DispatchResult {
-		if locked.is_zero() { return Ok(()) }
+		if locked.is_zero() {
+			return Ok(())
+		}
 		if Vesting::<T>::contains_key(who) {
 			Err(Error::<T>::ExistingVestingSchedule)?
 		}
-		let vesting_schedule = VestingInfo {
-			locked,
-			per_block,
-			starting_block
-		};
+		let vesting_schedule = VestingInfo { locked, per_block, starting_block };
 		Vesting::<T>::insert(who, vesting_schedule);
 		// it can't fail, but even if somehow it did, we don't really care.
 		let res = Self::update_lock(who.clone());
diff --git a/frame/vesting/src/tests.rs b/frame/vesting/src/tests.rs
index 7c59a61081d3..2ee0e83933cb 100644
--- a/frame/vesting/src/tests.rs
+++ b/frame/vesting/src/tests.rs
@@ -24,336 +24,312 @@ use crate::mock::{Balances, ExtBuilder, System, Test, Vesting};
 
 #[test]
 fn check_vesting_status() {
-	ExtBuilder::default()
-		.existential_deposit(256)
-		.build()
-		.execute_with(|| {
-			let user1_free_balance = Balances::free_balance(&1);
-			let user2_free_balance = Balances::free_balance(&2);
-			let user12_free_balance = Balances::free_balance(&12);
-			assert_eq!(user1_free_balance, 256 * 10); // Account 1 has free balance
-			assert_eq!(user2_free_balance, 256 * 20); // Account 2 has free balance
-			assert_eq!(user12_free_balance, 256 * 10); // Account 12 has free balance
-			let user1_vesting_schedule = VestingInfo {
-				locked: 256 * 5,
-				per_block: 128, // Vesting over 10 blocks
-				starting_block: 0,
-			};
-			let user2_vesting_schedule = VestingInfo {
-				locked: 256 * 20,
-				per_block: 256, // Vesting over 20 blocks
-				starting_block: 10,
-			};
-			let user12_vesting_schedule = VestingInfo {
-				locked: 256 * 5,
-				per_block: 64, // Vesting over 20 blocks
-				starting_block: 10,
-			};
-			assert_eq!(Vesting::vesting(&1), Some(user1_vesting_schedule)); // Account 1 has a vesting schedule
-			assert_eq!(Vesting::vesting(&2), Some(user2_vesting_schedule)); // Account 2 has a vesting schedule
-			assert_eq!(Vesting::vesting(&12), Some(user12_vesting_schedule)); // Account 12 has a vesting schedule
-
-			// Account 1 has only 128 units vested from their illiquid 256 * 5 units at block 1
-			assert_eq!(Vesting::vesting_balance(&1), Some(128 * 9));
-			// Account 2 has their full balance locked
-			assert_eq!(Vesting::vesting_balance(&2), Some(user2_free_balance));
-			// Account 12 has only their illiquid funds locked
-			assert_eq!(Vesting::vesting_balance(&12), Some(user12_free_balance - 256 * 5));
-
-			System::set_block_number(10);
-			assert_eq!(System::block_number(), 10);
-
-			// Account 1 has fully vested by block 10
-			assert_eq!(Vesting::vesting_balance(&1), Some(0));
-			// Account 2 has started vesting by block 10
-			assert_eq!(Vesting::vesting_balance(&2), Some(user2_free_balance));
-			// Account 12 has started vesting by block 10
-			assert_eq!(Vesting::vesting_balance(&12), Some(user12_free_balance - 256 * 5));
-
-			System::set_block_number(30);
-			assert_eq!(System::block_number(), 30);
-
-			assert_eq!(Vesting::vesting_balance(&1), Some(0)); // Account 1 is still fully vested, and not negative
-			assert_eq!(Vesting::vesting_balance(&2), Some(0)); // Account 2 has fully vested by block 30
-			assert_eq!(Vesting::vesting_balance(&12), Some(0)); // Account 2 has fully vested by block 30
-
-		});
+	ExtBuilder::default().existential_deposit(256).build().execute_with(|| {
+		let user1_free_balance = Balances::free_balance(&1);
+		let user2_free_balance = Balances::free_balance(&2);
+		let user12_free_balance = Balances::free_balance(&12);
+		assert_eq!(user1_free_balance, 256 * 10); // Account 1 has free balance
+		assert_eq!(user2_free_balance, 256 * 20); // Account 2 has free balance
+		assert_eq!(user12_free_balance, 256 * 10); // Account 12 has free balance
+		let user1_vesting_schedule = VestingInfo {
+			locked: 256 * 5,
+			per_block: 128, // Vesting over 10 blocks
+			starting_block: 0,
+		};
+		let user2_vesting_schedule = VestingInfo {
+			locked: 256 * 20,
+			per_block: 256, // Vesting over 20 blocks
+			starting_block: 10,
+		};
+		let user12_vesting_schedule = VestingInfo {
+			locked: 256 * 5,
+			per_block: 64, // Vesting over 20 blocks
+			starting_block: 10,
+		};
+		assert_eq!(Vesting::vesting(&1), Some(user1_vesting_schedule)); // Account 1 has a vesting schedule
+		assert_eq!(Vesting::vesting(&2), Some(user2_vesting_schedule)); // Account 2 has a vesting schedule
+		assert_eq!(Vesting::vesting(&12), Some(user12_vesting_schedule)); // Account 12 has a vesting schedule
+
+		// Account 1 has only 128 units vested from their illiquid 256 * 5 units at block 1
+		assert_eq!(Vesting::vesting_balance(&1), Some(128 * 9));
+		// Account 2 has their full balance locked
+		assert_eq!(Vesting::vesting_balance(&2), Some(user2_free_balance));
+		// Account 12 has only their illiquid funds locked
+		assert_eq!(Vesting::vesting_balance(&12), Some(user12_free_balance - 256 * 5));
+
+		System::set_block_number(10);
+		assert_eq!(System::block_number(), 10);
+
+		// Account 1 has fully vested by block 10
+		assert_eq!(Vesting::vesting_balance(&1), Some(0));
+		// Account 2 has started vesting by block 10
+		assert_eq!(Vesting::vesting_balance(&2), Some(user2_free_balance));
+		// Account 12 has started vesting by block 10
+		assert_eq!(Vesting::vesting_balance(&12), Some(user12_free_balance - 256 * 5));
+
+		System::set_block_number(30);
+		assert_eq!(System::block_number(), 30);
+
+		assert_eq!(Vesting::vesting_balance(&1), Some(0)); // Account 1 is still fully vested, and not negative
+		assert_eq!(Vesting::vesting_balance(&2), Some(0)); // Account 2 has fully vested by block 30
+		assert_eq!(Vesting::vesting_balance(&12), Some(0)); // Account 2 has fully vested by block 30
+	});
 }
 
 #[test]
 fn unvested_balance_should_not_transfer() {
-	ExtBuilder::default()
-		.existential_deposit(10)
-		.build()
-		.execute_with(|| {
-			let user1_free_balance = Balances::free_balance(&1);
-			assert_eq!(user1_free_balance, 100); // Account 1 has free balance
-			// Account 1 has only 5 units vested at block 1 (plus 50 unvested)
-			assert_eq!(Vesting::vesting_balance(&1), Some(45));
-			assert_noop!(
-				Balances::transfer(Some(1).into(), 2, 56),
-				pallet_balances::Error::<Test, _>::LiquidityRestrictions,
-			); // Account 1 cannot send more than vested amount
-		});
+	ExtBuilder::default().existential_deposit(10).build().execute_with(|| {
+		let user1_free_balance = Balances::free_balance(&1);
+		assert_eq!(user1_free_balance, 100); // Account 1 has free balance
+									 // Account 1 has only 5 units vested at block 1 (plus 50 unvested)
+		assert_eq!(Vesting::vesting_balance(&1), Some(45));
+		assert_noop!(
+			Balances::transfer(Some(1).into(), 2, 56),
+			pallet_balances::Error::<Test, _>::LiquidityRestrictions,
+		); // Account 1 cannot send more than vested amount
+	});
 }
 
 #[test]
 fn vested_balance_should_transfer() {
-	ExtBuilder::default()
-		.existential_deposit(10)
-		.build()
-		.execute_with(|| {
-			let user1_free_balance = Balances::free_balance(&1);
-			assert_eq!(user1_free_balance, 100); // Account 1 has free balance
-			// Account 1 has only 5 units vested at block 1 (plus 50 unvested)
-			assert_eq!(Vesting::vesting_balance(&1), Some(45));
-			assert_ok!(Vesting::vest(Some(1).into()));
-			assert_ok!(Balances::transfer(Some(1).into(), 2, 55));
-		});
+	ExtBuilder::default().existential_deposit(10).build().execute_with(|| {
+		let user1_free_balance = Balances::free_balance(&1);
+		assert_eq!(user1_free_balance, 100); // Account 1 has free balance
+									 // Account 1 has only 5 units vested at block 1 (plus 50 unvested)
+		assert_eq!(Vesting::vesting_balance(&1), Some(45));
+		assert_ok!(Vesting::vest(Some(1).into()));
+		assert_ok!(Balances::transfer(Some(1).into(), 2, 55));
+	});
 }
 
 #[test]
 fn vested_balance_should_transfer_using_vest_other() {
-	ExtBuilder::default()
-		.existential_deposit(10)
-		.build()
-		.execute_with(|| {
-			let user1_free_balance = Balances::free_balance(&1);
-			assert_eq!(user1_free_balance, 100); // Account 1 has free balance
-			// Account 1 has only 5 units vested at block 1 (plus 50 unvested)
-			assert_eq!(Vesting::vesting_balance(&1), Some(45));
-			assert_ok!(Vesting::vest_other(Some(2).into(), 1));
-			assert_ok!(Balances::transfer(Some(1).into(), 2, 55));
-		});
+	ExtBuilder::default().existential_deposit(10).build().execute_with(|| {
+		let user1_free_balance = Balances::free_balance(&1);
+		assert_eq!(user1_free_balance, 100); // Account 1 has free balance
+									 // Account 1 has only 5 units vested at block 1 (plus 50 unvested)
+		assert_eq!(Vesting::vesting_balance(&1), Some(45));
+		assert_ok!(Vesting::vest_other(Some(2).into(), 1));
+		assert_ok!(Balances::transfer(Some(1).into(), 2, 55));
+	});
 }
 
 #[test]
 fn extra_balance_should_transfer() {
-	ExtBuilder::default()
-		.existential_deposit(10)
-		.build()
-		.execute_with(|| {
-			assert_ok!(Balances::transfer(Some(3).into(), 1, 100));
-			assert_ok!(Balances::transfer(Some(3).into(), 2, 100));
-
-			let user1_free_balance = Balances::free_balance(&1);
-			assert_eq!(user1_free_balance, 200); // Account 1 has 100 more free balance than normal
-
-			let user2_free_balance = Balances::free_balance(&2);
-			assert_eq!(user2_free_balance, 300); // Account 2 has 100 more free balance than normal
-
-			// Account 1 has only 5 units vested at block 1 (plus 150 unvested)
-			assert_eq!(Vesting::vesting_balance(&1), Some(45));
-			assert_ok!(Vesting::vest(Some(1).into()));
-			assert_ok!(Balances::transfer(Some(1).into(), 3, 155)); // Account 1 can send extra units gained
-
-			// Account 2 has no units vested at block 1, but gained 100
-			assert_eq!(Vesting::vesting_balance(&2), Some(200));
-			assert_ok!(Vesting::vest(Some(2).into()));
-			assert_ok!(Balances::transfer(Some(2).into(), 3, 100)); // Account 2 can send extra units gained
-		});
+	ExtBuilder::default().existential_deposit(10).build().execute_with(|| {
+		assert_ok!(Balances::transfer(Some(3).into(), 1, 100));
+		assert_ok!(Balances::transfer(Some(3).into(), 2, 100));
+
+		let user1_free_balance = Balances::free_balance(&1);
+		assert_eq!(user1_free_balance, 200); // Account 1 has 100 more free balance than normal
+
+		let user2_free_balance = Balances::free_balance(&2);
+		assert_eq!(user2_free_balance, 300); // Account 2 has 100 more free balance than normal
+
+		// Account 1 has only 5 units vested at block 1 (plus 150 unvested)
+		assert_eq!(Vesting::vesting_balance(&1), Some(45));
+		assert_ok!(Vesting::vest(Some(1).into()));
+		assert_ok!(Balances::transfer(Some(1).into(), 3, 155)); // Account 1 can send extra units gained
+
+		// Account 2 has no units vested at block 1, but gained 100
+		assert_eq!(Vesting::vesting_balance(&2), Some(200));
+		assert_ok!(Vesting::vest(Some(2).into()));
+		assert_ok!(Balances::transfer(Some(2).into(), 3, 100)); // Account 2 can send extra units gained
+	});
 }
 
 #[test]
 fn liquid_funds_should_transfer_with_delayed_vesting() {
-	ExtBuilder::default()
-		.existential_deposit(256)
-		.build()
-		.execute_with(|| {
-			let user12_free_balance = Balances::free_balance(&12);
-
-			assert_eq!(user12_free_balance, 2560); // Account 12 has free balance
-			// Account 12 has liquid funds
-			assert_eq!(Vesting::vesting_balance(&12), Some(user12_free_balance - 256 * 5));
-
-			// Account 12 has delayed vesting
-			let user12_vesting_schedule = VestingInfo {
-				locked: 256 * 5,
-				per_block: 64, // Vesting over 20 blocks
-				starting_block: 10,
-			};
-			assert_eq!(Vesting::vesting(&12), Some(user12_vesting_schedule));
-
-			// Account 12 can still send liquid funds
-			assert_ok!(Balances::transfer(Some(12).into(), 3, 256 * 5));
-		});
+	ExtBuilder::default().existential_deposit(256).build().execute_with(|| {
+		let user12_free_balance = Balances::free_balance(&12);
+
+		assert_eq!(user12_free_balance, 2560); // Account 12 has free balance
+									   // Account 12 has liquid funds
+		assert_eq!(Vesting::vesting_balance(&12), Some(user12_free_balance - 256 * 5));
+
+		// Account 12 has delayed vesting
+		let user12_vesting_schedule = VestingInfo {
+			locked: 256 * 5,
+			per_block: 64, // Vesting over 20 blocks
+			starting_block: 10,
+		};
+		assert_eq!(Vesting::vesting(&12), Some(user12_vesting_schedule));
+
+		// Account 12 can still send liquid funds
+		assert_ok!(Balances::transfer(Some(12).into(), 3, 256 * 5));
+	});
 }
 
 #[test]
 fn vested_transfer_works() {
-	ExtBuilder::default()
-		.existential_deposit(256)
-		.build()
-		.execute_with(|| {
-			let user3_free_balance = Balances::free_balance(&3);
-			let user4_free_balance = Balances::free_balance(&4);
-			assert_eq!(user3_free_balance, 256 * 30);
-			assert_eq!(user4_free_balance, 256 * 40);
-			// Account 4 should not have any vesting yet.
-			assert_eq!(Vesting::vesting(&4), None);
-			// Make the schedule for the new transfer.
-			let new_vesting_schedule = VestingInfo {
-				locked: 256 * 5,
-				per_block: 64, // Vesting over 20 blocks
-				starting_block: 10,
-			};
-			assert_ok!(Vesting::vested_transfer(Some(3).into(), 4, new_vesting_schedule));
-			// Now account 4 should have vesting.
-			assert_eq!(Vesting::vesting(&4), Some(new_vesting_schedule));
-			// Ensure the transfer happened correctly.
-			let user3_free_balance_updated = Balances::free_balance(&3);
-			assert_eq!(user3_free_balance_updated, 256 * 25);
-			let user4_free_balance_updated = Balances::free_balance(&4);
-			assert_eq!(user4_free_balance_updated, 256 * 45);
-			// Account 4 has 5 * 256 locked.
-			assert_eq!(Vesting::vesting_balance(&4), Some(256 * 5));
-
-			System::set_block_number(20);
-			assert_eq!(System::block_number(), 20);
-
-			// Account 4 has 5 * 64 units vested by block 20.
-			assert_eq!(Vesting::vesting_balance(&4), Some(10 * 64));
-
-			System::set_block_number(30);
-			assert_eq!(System::block_number(), 30);
-
-			// Account 4 has fully vested.
-			assert_eq!(Vesting::vesting_balance(&4), Some(0));
-		});
+	ExtBuilder::default().existential_deposit(256).build().execute_with(|| {
+		let user3_free_balance = Balances::free_balance(&3);
+		let user4_free_balance = Balances::free_balance(&4);
+		assert_eq!(user3_free_balance, 256 * 30);
+		assert_eq!(user4_free_balance, 256 * 40);
+		// Account 4 should not have any vesting yet.
+		assert_eq!(Vesting::vesting(&4), None);
+		// Make the schedule for the new transfer.
+		let new_vesting_schedule = VestingInfo {
+			locked: 256 * 5,
+			per_block: 64, // Vesting over 20 blocks
+			starting_block: 10,
+		};
+		assert_ok!(Vesting::vested_transfer(Some(3).into(), 4, new_vesting_schedule));
+		// Now account 4 should have vesting.
+		assert_eq!(Vesting::vesting(&4), Some(new_vesting_schedule));
+		// Ensure the transfer happened correctly.
+		let user3_free_balance_updated = Balances::free_balance(&3);
+		assert_eq!(user3_free_balance_updated, 256 * 25);
+		let user4_free_balance_updated = Balances::free_balance(&4);
+		assert_eq!(user4_free_balance_updated, 256 * 45);
+		// Account 4 has 5 * 256 locked.
+		assert_eq!(Vesting::vesting_balance(&4), Some(256 * 5));
+
+		System::set_block_number(20);
+		assert_eq!(System::block_number(), 20);
+
+		// Account 4 has 5 * 64 units vested by block 20.
+		assert_eq!(Vesting::vesting_balance(&4), Some(10 * 64));
+
+		System::set_block_number(30);
+		assert_eq!(System::block_number(), 30);
+
+		// Account 4 has fully vested.
+		assert_eq!(Vesting::vesting_balance(&4), Some(0));
+	});
 }
 
 #[test]
 fn vested_transfer_correctly_fails() {
-	ExtBuilder::default()
-		.existential_deposit(256)
-		.build()
-		.execute_with(|| {
-			let user2_free_balance = Balances::free_balance(&2);
-			let user4_free_balance = Balances::free_balance(&4);
-			assert_eq!(user2_free_balance, 256 * 20);
-			assert_eq!(user4_free_balance, 256 * 40);
-			// Account 2 should already have a vesting schedule.
-			let user2_vesting_schedule = VestingInfo {
-				locked: 256 * 20,
-				per_block: 256, // Vesting over 20 blocks
-				starting_block: 10,
-			};
-			assert_eq!(Vesting::vesting(&2), Some(user2_vesting_schedule));
-
-			// The vesting schedule we will try to create, fails due to pre-existence of schedule.
-			let new_vesting_schedule = VestingInfo {
-				locked: 256 * 5,
-				per_block: 64, // Vesting over 20 blocks
-				starting_block: 10,
-			};
-			assert_noop!(
-				Vesting::vested_transfer(Some(4).into(), 2, new_vesting_schedule),
-				Error::<Test>::ExistingVestingSchedule,
-			);
-
-			// Fails due to too low transfer amount.
-			let new_vesting_schedule_too_low = VestingInfo {
-				locked: 256 * 1,
-				per_block: 64,
-				starting_block: 10,
-			};
-			assert_noop!(
-				Vesting::vested_transfer(Some(3).into(), 4, new_vesting_schedule_too_low),
-				Error::<Test>::AmountLow,
-			);
-
-			// Verify no currency transfer happened.
-			assert_eq!(user2_free_balance, 256 * 20);
-			assert_eq!(user4_free_balance, 256 * 40);
-		});
+	ExtBuilder::default().existential_deposit(256).build().execute_with(|| {
+		let user2_free_balance = Balances::free_balance(&2);
+		let user4_free_balance = Balances::free_balance(&4);
+		assert_eq!(user2_free_balance, 256 * 20);
+		assert_eq!(user4_free_balance, 256 * 40);
+		// Account 2 should already have a vesting schedule.
+		let user2_vesting_schedule = VestingInfo {
+			locked: 256 * 20,
+			per_block: 256, // Vesting over 20 blocks
+			starting_block: 10,
+		};
+		assert_eq!(Vesting::vesting(&2), Some(user2_vesting_schedule));
+
+		// The vesting schedule we will try to create, fails due to pre-existence of schedule.
+		let new_vesting_schedule = VestingInfo {
+			locked: 256 * 5,
+			per_block: 64, // Vesting over 20 blocks
+			starting_block: 10,
+		};
+		assert_noop!(
+			Vesting::vested_transfer(Some(4).into(), 2, new_vesting_schedule),
+			Error::<Test>::ExistingVestingSchedule,
+		);
+
+		// Fails due to too low transfer amount.
+		let new_vesting_schedule_too_low =
+			VestingInfo { locked: 256 * 1, per_block: 64, starting_block: 10 };
+		assert_noop!(
+			Vesting::vested_transfer(Some(3).into(), 4, new_vesting_schedule_too_low),
+			Error::<Test>::AmountLow,
+		);
+
+		// Verify no currency transfer happened.
+		assert_eq!(user2_free_balance, 256 * 20);
+		assert_eq!(user4_free_balance, 256 * 40);
+	});
 }
 
 #[test]
 fn force_vested_transfer_works() {
-	ExtBuilder::default()
-		.existential_deposit(256)
-		.build()
-		.execute_with(|| {
-			let user3_free_balance = Balances::free_balance(&3);
-			let user4_free_balance = Balances::free_balance(&4);
-			assert_eq!(user3_free_balance, 256 * 30);
-			assert_eq!(user4_free_balance, 256 * 40);
-			// Account 4 should not have any vesting yet.
-			assert_eq!(Vesting::vesting(&4), None);
-			// Make the schedule for the new transfer.
-			let new_vesting_schedule = VestingInfo {
-				locked: 256 * 5,
-				per_block: 64, // Vesting over 20 blocks
-				starting_block: 10,
-			};
-			assert_noop!(Vesting::force_vested_transfer(Some(4).into(), 3, 4, new_vesting_schedule), BadOrigin);
-			assert_ok!(Vesting::force_vested_transfer(RawOrigin::Root.into(), 3, 4, new_vesting_schedule));
-			// Now account 4 should have vesting.
-			assert_eq!(Vesting::vesting(&4), Some(new_vesting_schedule));
-			// Ensure the transfer happened correctly.
-			let user3_free_balance_updated = Balances::free_balance(&3);
-			assert_eq!(user3_free_balance_updated, 256 * 25);
-			let user4_free_balance_updated = Balances::free_balance(&4);
-			assert_eq!(user4_free_balance_updated, 256 * 45);
-			// Account 4 has 5 * 256 locked.
-			assert_eq!(Vesting::vesting_balance(&4), Some(256 * 5));
-
-			System::set_block_number(20);
-			assert_eq!(System::block_number(), 20);
-
-			// Account 4 has 5 * 64 units vested by block 20.
-			assert_eq!(Vesting::vesting_balance(&4), Some(10 * 64));
-
-			System::set_block_number(30);
-			assert_eq!(System::block_number(), 30);
-
-			// Account 4 has fully vested.
-			assert_eq!(Vesting::vesting_balance(&4), Some(0));
-		});
+	ExtBuilder::default().existential_deposit(256).build().execute_with(|| {
+		let user3_free_balance = Balances::free_balance(&3);
+		let user4_free_balance = Balances::free_balance(&4);
+		assert_eq!(user3_free_balance, 256 * 30);
+		assert_eq!(user4_free_balance, 256 * 40);
+		// Account 4 should not have any vesting yet.
+		assert_eq!(Vesting::vesting(&4), None);
+		// Make the schedule for the new transfer.
+		let new_vesting_schedule = VestingInfo {
+			locked: 256 * 5,
+			per_block: 64, // Vesting over 20 blocks
+			starting_block: 10,
+		};
+		assert_noop!(
+			Vesting::force_vested_transfer(Some(4).into(), 3, 4, new_vesting_schedule),
+			BadOrigin
+		);
+		assert_ok!(Vesting::force_vested_transfer(
+			RawOrigin::Root.into(),
+			3,
+			4,
+			new_vesting_schedule
+		));
+		// Now account 4 should have vesting.
+		assert_eq!(Vesting::vesting(&4), Some(new_vesting_schedule));
+		// Ensure the transfer happened correctly.
+		let user3_free_balance_updated = Balances::free_balance(&3);
+		assert_eq!(user3_free_balance_updated, 256 * 25);
+		let user4_free_balance_updated = Balances::free_balance(&4);
+		assert_eq!(user4_free_balance_updated, 256 * 45);
+		// Account 4 has 5 * 256 locked.
+		assert_eq!(Vesting::vesting_balance(&4), Some(256 * 5));
+
+		System::set_block_number(20);
+		assert_eq!(System::block_number(), 20);
+
+		// Account 4 has 5 * 64 units vested by block 20.
+		assert_eq!(Vesting::vesting_balance(&4), Some(10 * 64));
+
+		System::set_block_number(30);
+		assert_eq!(System::block_number(), 30);
+
+		// Account 4 has fully vested.
+		assert_eq!(Vesting::vesting_balance(&4), Some(0));
+	});
 }
 
 #[test]
 fn force_vested_transfer_correctly_fails() {
-	ExtBuilder::default()
-		.existential_deposit(256)
-		.build()
-		.execute_with(|| {
-			let user2_free_balance = Balances::free_balance(&2);
-			let user4_free_balance = Balances::free_balance(&4);
-			assert_eq!(user2_free_balance, 256 * 20);
-			assert_eq!(user4_free_balance, 256 * 40);
-			// Account 2 should already have a vesting schedule.
-			let user2_vesting_schedule = VestingInfo {
-				locked: 256 * 20,
-				per_block: 256, // Vesting over 20 blocks
-				starting_block: 10,
-			};
-			assert_eq!(Vesting::vesting(&2), Some(user2_vesting_schedule));
-
-			// The vesting schedule we will try to create, fails due to pre-existence of schedule.
-			let new_vesting_schedule = VestingInfo {
-				locked: 256 * 5,
-				per_block: 64, // Vesting over 20 blocks
-				starting_block: 10,
-			};
-			assert_noop!(
-				Vesting::force_vested_transfer(RawOrigin::Root.into(), 4, 2, new_vesting_schedule),
-				Error::<Test>::ExistingVestingSchedule,
-			);
-
-			// Fails due to too low transfer amount.
-			let new_vesting_schedule_too_low = VestingInfo {
-				locked: 256 * 1,
-				per_block: 64,
-				starting_block: 10,
-			};
-			assert_noop!(
-				Vesting::force_vested_transfer(RawOrigin::Root.into(), 3, 4, new_vesting_schedule_too_low),
-				Error::<Test>::AmountLow,
-			);
-
-			// Verify no currency transfer happened.
-			assert_eq!(user2_free_balance, 256 * 20);
-			assert_eq!(user4_free_balance, 256 * 40);
-		});
+	ExtBuilder::default().existential_deposit(256).build().execute_with(|| {
+		let user2_free_balance = Balances::free_balance(&2);
+		let user4_free_balance = Balances::free_balance(&4);
+		assert_eq!(user2_free_balance, 256 * 20);
+		assert_eq!(user4_free_balance, 256 * 40);
+		// Account 2 should already have a vesting schedule.
+		let user2_vesting_schedule = VestingInfo {
+			locked: 256 * 20,
+			per_block: 256, // Vesting over 20 blocks
+			starting_block: 10,
+		};
+		assert_eq!(Vesting::vesting(&2), Some(user2_vesting_schedule));
+
+		// The vesting schedule we will try to create, fails due to pre-existence of schedule.
+		let new_vesting_schedule = VestingInfo {
+			locked: 256 * 5,
+			per_block: 64, // Vesting over 20 blocks
+			starting_block: 10,
+		};
+		assert_noop!(
+			Vesting::force_vested_transfer(RawOrigin::Root.into(), 4, 2, new_vesting_schedule),
+			Error::<Test>::ExistingVestingSchedule,
+		);
+
+		// Fails due to too low transfer amount.
+		let new_vesting_schedule_too_low =
+			VestingInfo { locked: 256 * 1, per_block: 64, starting_block: 10 };
+		assert_noop!(
+			Vesting::force_vested_transfer(
+				RawOrigin::Root.into(),
+				3,
+				4,
+				new_vesting_schedule_too_low
+			),
+			Error::<Test>::AmountLow,
+		);
+
+		// Verify no currency transfer happened.
+		assert_eq!(user2_free_balance, 256 * 20);
+		assert_eq!(user4_free_balance, 256 * 40);
+	});
 }
diff --git a/frame/vesting/src/weights.rs b/frame/vesting/src/weights.rs
index 053453d757f3..d180e6828c59 100644
--- a/frame/vesting/src/weights.rs
+++ b/frame/vesting/src/weights.rs
@@ -36,6 +36,7 @@
 // --template=./.maintain/frame-weight-template.hbs
 
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
diff --git a/primitives/api/proc-macro/src/decl_runtime_apis.rs b/primitives/api/proc-macro/src/decl_runtime_apis.rs
index 4a8b49049e76..bae7a40f8639 100644
--- a/primitives/api/proc-macro/src/decl_runtime_apis.rs
+++ b/primitives/api/proc-macro/src/decl_runtime_apis.rs
@@ -16,21 +16,25 @@
 // limitations under the License.
 
 use crate::utils::{
-	generate_crate_access, generate_hidden_includes, generate_runtime_mod_name_for_trait,
-	fold_fn_decl_for_client_side, extract_parameter_names_types_and_borrows,
-	generate_native_call_generator_fn_name, return_type_extract_type,
-	generate_method_runtime_api_impl_name, generate_call_api_at_fn_name, prefix_function_with_trait,
-	replace_wild_card_parameter_names, AllowSelfRefInParameters,
+	extract_parameter_names_types_and_borrows, fold_fn_decl_for_client_side,
+	generate_call_api_at_fn_name, generate_crate_access, generate_hidden_includes,
+	generate_method_runtime_api_impl_name, generate_native_call_generator_fn_name,
+	generate_runtime_mod_name_for_trait, prefix_function_with_trait,
+	replace_wild_card_parameter_names, return_type_extract_type, AllowSelfRefInParameters,
 };
 
-use proc_macro2::{TokenStream, Span};
+use proc_macro2::{Span, TokenStream};
 
 use quote::quote;
 
 use syn::{
-	spanned::Spanned, parse_macro_input, parse::{Parse, ParseStream, Result, Error}, ReturnType,
-	fold::{self, Fold}, parse_quote, ItemTrait, Generics, GenericParam, Attribute, FnArg, Type,
-	visit::{Visit, self}, TraitBound, Meta, NestedMeta, Lit, TraitItem, Ident, TraitItemMethod,
+	fold::{self, Fold},
+	parse::{Error, Parse, ParseStream, Result},
+	parse_macro_input, parse_quote,
+	spanned::Spanned,
+	visit::{self, Visit},
+	Attribute, FnArg, GenericParam, Generics, Ident, ItemTrait, Lit, Meta, NestedMeta, ReturnType,
+	TraitBound, TraitItem, TraitItemMethod, Type,
 };
 
 use std::collections::HashMap;
@@ -59,9 +63,8 @@ const CHANGED_IN_ATTRIBUTE: &str = "changed_in";
 /// Is used when a trait method was renamed.
 const RENAMED_ATTRIBUTE: &str = "renamed";
 /// All attributes that we support in the declaration of a runtime api trait.
-const SUPPORTED_ATTRIBUTE_NAMES: &[&str] = &[
-	CORE_TRAIT_ATTRIBUTE, API_VERSION_ATTRIBUTE, CHANGED_IN_ATTRIBUTE, RENAMED_ATTRIBUTE,
-];
+const SUPPORTED_ATTRIBUTE_NAMES: &[&str] =
+	&[CORE_TRAIT_ATTRIBUTE, API_VERSION_ATTRIBUTE, CHANGED_IN_ATTRIBUTE, RENAMED_ATTRIBUTE];
 
 /// The structure used for parsing the runtime api declarations.
 struct RuntimeApiDecls {
@@ -94,14 +97,12 @@ fn extend_generics_with_block(generics: &mut Generics) {
 /// attribute body as `TokenStream`.
 fn remove_supported_attributes(attrs: &mut Vec<Attribute>) -> HashMap<&'static str, Attribute> {
 	let mut result = HashMap::new();
-	attrs.retain(|v| {
-		match SUPPORTED_ATTRIBUTE_NAMES.iter().find(|a| v.path.is_ident(a)) {
-			Some(attribute) => {
-				result.insert(*attribute, v.clone());
-				false
-			},
-			None => true,
-		}
+	attrs.retain(|v| match SUPPORTED_ATTRIBUTE_NAMES.iter().find(|a| v.path.is_ident(a)) {
+		Some(attribute) => {
+			result.insert(*attribute, v.clone());
+			false
+		},
+		None => true,
 	});
 
 	result
@@ -226,16 +227,17 @@ fn generate_native_call_generators(decl: &ItemTrait) -> Result<TokenStream> {
 				)
 			)
 		} else {
-			quote!( Ok(res) )
+			quote!(Ok(res))
 		};
 
 		let input_names = params.iter().map(|v| &v.0);
 		// If the type is using the block generic type, we will encode/decode it to make it
 		// compatible. To ensure that we forward it by ref/value, we use the value given by the
 		// the user. Otherwise if it is not using the block, we don't need to add anything.
-		let input_borrows = params
-			.iter()
-			.map(|v| if type_is_using_block(&v.1) { v.2.clone() } else { None });
+		let input_borrows =
+			params
+				.iter()
+				.map(|v| if type_is_using_block(&v.1) { v.2.clone() } else { None });
 
 		// Replace all `Block` with `NodeBlock`, add `'a` lifetime to references and collect
 		// all the function inputs.
@@ -304,28 +306,23 @@ fn parse_renamed_attribute(renamed: &Attribute) -> Result<(String, u32)> {
 	);
 
 	match meta {
-		Meta::List(list) => {
+		Meta::List(list) =>
 			if list.nested.len() > 2 && list.nested.is_empty() {
 				err
 			} else {
 				let mut itr = list.nested.iter();
 				let old_name = match itr.next() {
-					Some(NestedMeta::Lit(Lit::Str(i))) => {
-						i.value()
-					},
+					Some(NestedMeta::Lit(Lit::Str(i))) => i.value(),
 					_ => return err,
 				};
 
 				let version = match itr.next() {
-					Some(NestedMeta::Lit(Lit::Int(i))) => {
-						i.base10_parse()?
-					},
+					Some(NestedMeta::Lit(Lit::Int(i))) => i.base10_parse()?,
 					_ => return err,
 				};
 
 				Ok((old_name, version))
-			}
-		},
+			},
 		_ => err,
 	}
 }
@@ -353,23 +350,19 @@ fn generate_call_api_at_calls(decl: &ItemTrait) -> Result<TokenStream> {
 				fn_.span(),
 				format!(
 					"`{}` and `{}` are not supported at once.",
-					RENAMED_ATTRIBUTE,
-					CHANGED_IN_ATTRIBUTE
-				)
-			));
+					RENAMED_ATTRIBUTE, CHANGED_IN_ATTRIBUTE
+				),
+			))
 		}
 
 		// We do not need to generate this function for a method that signature was changed.
 		if attrs.contains_key(CHANGED_IN_ATTRIBUTE) {
-			continue;
+			continue
 		}
 
 		// Parse the renamed attributes.
 		let mut renames = Vec::new();
-		if let Some((_, a)) = attrs
-			.iter()
-			.find(|a| a.0 == &RENAMED_ATTRIBUTE)
-		{
+		if let Some((_, a)) = attrs.iter().find(|a| a.0 == &RENAMED_ATTRIBUTE) {
 			let (old_name, version) = parse_renamed_attribute(a)?;
 			renames.push((version, prefix_function_with_trait(&trait_name, &old_name)));
 		}
@@ -381,7 +374,7 @@ fn generate_call_api_at_calls(decl: &ItemTrait) -> Result<TokenStream> {
 				versions.push(version);
 				old_names.push(old_name);
 				(versions, old_names)
-			}
+			},
 		);
 
 		// Generate the generator function
@@ -456,27 +449,32 @@ fn generate_runtime_decls(decls: &[ItemTrait]) -> Result<TokenStream> {
 		extend_generics_with_block(&mut decl.generics);
 		let mod_name = generate_runtime_mod_name_for_trait(&decl.ident);
 		let found_attributes = remove_supported_attributes(&mut decl.attrs);
-		let api_version = get_api_version(&found_attributes).map(|v| {
-			generate_runtime_api_version(v as u32)
-		})?;
+		let api_version =
+			get_api_version(&found_attributes).map(|v| generate_runtime_api_version(v as u32))?;
 		let id = generate_runtime_api_id(&decl.ident.to_string());
 
 		let call_api_at_calls = generate_call_api_at_calls(&decl)?;
 
 		// Remove methods that have the `changed_in` attribute as they are not required for the
 		// runtime anymore.
-		decl.items = decl.items.iter_mut().filter_map(|i| match i {
-			TraitItem::Method(ref mut method) => {
-				if remove_supported_attributes(&mut method.attrs).contains_key(CHANGED_IN_ATTRIBUTE) {
-					None
-				} else {
-					// Make sure we replace all the wild card parameter names.
-					replace_wild_card_parameter_names(&mut method.sig);
-					Some(TraitItem::Method(method.clone()))
-				}
-			}
-			r => Some(r.clone()),
-		}).collect();
+		decl.items = decl
+			.items
+			.iter_mut()
+			.filter_map(|i| match i {
+				TraitItem::Method(ref mut method) => {
+					if remove_supported_attributes(&mut method.attrs)
+						.contains_key(CHANGED_IN_ATTRIBUTE)
+					{
+						None
+					} else {
+						// Make sure we replace all the wild card parameter names.
+						replace_wild_card_parameter_names(&mut method.sig);
+						Some(TraitItem::Method(method.clone()))
+					}
+				},
+				r => Some(r.clone()),
+			})
+			.collect();
 
 		let native_call_generators = generate_native_call_generators(&decl)?;
 
@@ -533,8 +531,10 @@ impl<'a> ToClientSideDecl<'a> {
 		result
 	}
 
-	fn fold_trait_item_method(&mut self, method: TraitItemMethod)
-		-> (TraitItemMethod, Option<TraitItemMethod>, TraitItemMethod) {
+	fn fold_trait_item_method(
+		&mut self,
+		method: TraitItemMethod,
+	) -> (TraitItemMethod, Option<TraitItemMethod>, TraitItemMethod) {
 		let crate_ = self.crate_;
 		let context = quote!( #crate_::ExecutionContext::OffchainCall(None) );
 		let fn_impl = self.create_method_runtime_api_impl(method.clone());
@@ -547,8 +547,9 @@ impl<'a> ToClientSideDecl<'a> {
 	fn create_method_decl_with_context(&mut self, method: TraitItemMethod) -> TraitItemMethod {
 		let crate_ = self.crate_;
 		let context_arg: syn::FnArg = parse_quote!( context: #crate_::ExecutionContext );
-		let mut fn_decl_ctx = self.create_method_decl(method, quote!( context ));
-		fn_decl_ctx.sig.ident = Ident::new(&format!("{}_with_context", &fn_decl_ctx.sig.ident), Span::call_site());
+		let mut fn_decl_ctx = self.create_method_decl(method, quote!(context));
+		fn_decl_ctx.sig.ident =
+			Ident::new(&format!("{}_with_context", &fn_decl_ctx.sig.ident), Span::call_site());
 		fn_decl_ctx.sig.inputs.insert(2, context_arg);
 
 		fn_decl_ctx
@@ -556,9 +557,12 @@ impl<'a> ToClientSideDecl<'a> {
 
 	/// Takes the given method and creates a `method_runtime_api_impl` method that will be
 	/// implemented in the runtime for the client side.
-	fn create_method_runtime_api_impl(&mut self, mut method: TraitItemMethod) -> Option<TraitItemMethod> {
+	fn create_method_runtime_api_impl(
+		&mut self,
+		mut method: TraitItemMethod,
+	) -> Option<TraitItemMethod> {
 		if remove_supported_attributes(&mut method.attrs).contains_key(CHANGED_IN_ATTRIBUTE) {
-			return None;
+			return None
 		}
 
 		let fn_sig = &method.sig;
@@ -566,36 +570,35 @@ impl<'a> ToClientSideDecl<'a> {
 
 		// Get types and if the value is borrowed from all parameters.
 		// If there is an error, we push it as the block to the user.
-		let param_types = match extract_parameter_names_types_and_borrows(
-			fn_sig,
-			AllowSelfRefInParameters::No,
-		) {
-			Ok(res) => res.into_iter().map(|v| {
-				let ty = v.1;
-				let borrow = v.2;
-				quote!( #borrow #ty )
-			}).collect::<Vec<_>>(),
-			Err(e) => {
-				self.errors.push(e.to_compile_error());
-				Vec::new()
-			}
-		};
+		let param_types =
+			match extract_parameter_names_types_and_borrows(fn_sig, AllowSelfRefInParameters::No) {
+				Ok(res) => res
+					.into_iter()
+					.map(|v| {
+						let ty = v.1;
+						let borrow = v.2;
+						quote!( #borrow #ty )
+					})
+					.collect::<Vec<_>>(),
+				Err(e) => {
+					self.errors.push(e.to_compile_error());
+					Vec::new()
+				},
+			};
 		let name = generate_method_runtime_api_impl_name(&self.trait_, &method.sig.ident);
 		let block_id = self.block_id;
 		let crate_ = self.crate_;
 
-		Some(
-			parse_quote!{
-				#[doc(hidden)]
-				fn #name(
-					&self,
-					at: &#block_id,
-					context: #crate_::ExecutionContext,
-					params: Option<( #( #param_types ),* )>,
-					params_encoded: Vec<u8>,
-				) -> std::result::Result<#crate_::NativeOrEncoded<#ret_type>, #crate_::ApiError>;
-			}
-		)
+		Some(parse_quote! {
+			#[doc(hidden)]
+			fn #name(
+				&self,
+				at: &#block_id,
+				context: #crate_::ExecutionContext,
+				params: Option<( #( #param_types ),* )>,
+				params_encoded: Vec<u8>,
+			) -> std::result::Result<#crate_::NativeOrEncoded<#ret_type>, #crate_::ApiError>;
+		})
 	}
 
 	/// Takes the method declared by the user and creates the declaration we require for the runtime
@@ -614,7 +617,7 @@ impl<'a> ToClientSideDecl<'a> {
 			Err(e) => {
 				self.errors.push(e.to_compile_error());
 				Vec::new()
-			}
+			},
 		};
 		let params2 = params.clone();
 		let ret_type = return_type_extract_type(&method.sig.output);
@@ -635,7 +638,8 @@ impl<'a> ToClientSideDecl<'a> {
 						Error::new(
 							method.span(),
 							"`changed_in` version can not be greater than the `api_version`",
-						).to_compile_error()
+						)
+						.to_compile_error(),
 					);
 				}
 
@@ -646,49 +650,48 @@ impl<'a> ToClientSideDecl<'a> {
 				method.sig.ident = ident;
 				method.attrs.push(parse_quote!( #[deprecated] ));
 
-				let panic = format!("Calling `{}` should not return a native value!", method.sig.ident);
-				(quote!( panic!(#panic) ), quote!( None ))
+				let panic =
+					format!("Calling `{}` should not return a native value!", method.sig.ident);
+				(quote!(panic!(#panic)), quote!(None))
 			},
-			Ok(None) => (quote!( Ok(n) ), quote!( Some(( #( #params2 ),* )) )),
+			Ok(None) => (quote!(Ok(n)), quote!( Some(( #( #params2 ),* )) )),
 			Err(e) => {
 				self.errors.push(e.to_compile_error());
-				(quote!( unimplemented!() ), quote!( None ))
-			}
+				(quote!(unimplemented!()), quote!(None))
+			},
 		};
 
 		let function_name = method.sig.ident.to_string();
 
 		// Generate the default implementation that calls the `method_runtime_api_impl` method.
-		method.default = Some(
-			parse_quote! {
-				{
-					let runtime_api_impl_params_encoded =
-						#crate_::Encode::encode(&( #( &#params ),* ));
-
-					self.#name_impl(
-						__runtime_api_at_param__,
-						#context,
-						#param_tuple,
-						runtime_api_impl_params_encoded,
-					).and_then(|r|
-						match r {
-							#crate_::NativeOrEncoded::Native(n) => {
-								#native_handling
-							},
-							#crate_::NativeOrEncoded::Encoded(r) => {
-								<#ret_type as #crate_::Decode>::decode(&mut &r[..])
-									.map_err(|err|
-										#crate_::ApiError::FailedToDecodeReturnValue {
-											function: #function_name,
-											error: err,
-										}
-									)
-							}
+		method.default = Some(parse_quote! {
+			{
+				let runtime_api_impl_params_encoded =
+					#crate_::Encode::encode(&( #( &#params ),* ));
+
+				self.#name_impl(
+					__runtime_api_at_param__,
+					#context,
+					#param_tuple,
+					runtime_api_impl_params_encoded,
+				).and_then(|r|
+					match r {
+						#crate_::NativeOrEncoded::Native(n) => {
+							#native_handling
+						},
+						#crate_::NativeOrEncoded::Encoded(r) => {
+							<#ret_type as #crate_::Decode>::decode(&mut &r[..])
+								.map_err(|err|
+									#crate_::ApiError::FailedToDecodeReturnValue {
+										function: #function_name,
+										error: err,
+									}
+								)
 						}
-					)
-				}
+					}
+				)
 			}
-		);
+		});
 
 		method
 	}
@@ -705,11 +708,7 @@ impl<'a> Fold for ToClientSideDecl<'a> {
 
 		if is_core_trait {
 			// Add all the supertraits we want to have for `Core`.
-			input.supertraits = parse_quote!(
-				'static
-				+ Send
-				+ Sync
-			);
+			input.supertraits = parse_quote!('static + Send + Sync);
 		} else {
 			// Add the `Core` runtime api as super trait.
 			let crate_ = &self.crate_;
@@ -729,24 +728,22 @@ fn parse_runtime_api_version(version: &Attribute) -> Result<u64> {
 	let meta = version.parse_meta()?;
 
 	let err = Err(Error::new(
-			meta.span(),
-			&format!(
-				"Unexpected `{api_version}` attribute. The supported format is `{api_version}(1)`",
-				api_version = API_VERSION_ATTRIBUTE
-			)
-		)
-	);
+		meta.span(),
+		&format!(
+			"Unexpected `{api_version}` attribute. The supported format is `{api_version}(1)`",
+			api_version = API_VERSION_ATTRIBUTE
+		),
+	));
 
 	match meta {
-		Meta::List(list) => {
+		Meta::List(list) =>
 			if list.nested.len() != 1 {
 				err
 			} else if let Some(NestedMeta::Lit(Lit::Int(i))) = list.nested.first() {
 				i.base10_parse()
 			} else {
 				err
-			}
-		},
+			},
 		_ => err,
 	}
 }
@@ -798,14 +795,18 @@ fn generate_runtime_info_impl(trait_: &ItemTrait, version: u64) -> TokenStream {
 
 /// Get changed in version from the user given attribute or `Ok(None)`, if no attribute was given.
 fn get_changed_in(found_attributes: &HashMap<&'static str, Attribute>) -> Result<Option<u64>> {
-	found_attributes.get(&CHANGED_IN_ATTRIBUTE)
+	found_attributes
+		.get(&CHANGED_IN_ATTRIBUTE)
 		.map(|v| parse_runtime_api_version(v).map(Some))
 		.unwrap_or(Ok(None))
 }
 
 /// Get the api version from the user given attribute or `Ok(1)`, if no attribute was given.
 fn get_api_version(found_attributes: &HashMap<&'static str, Attribute>) -> Result<u64> {
-	found_attributes.get(&API_VERSION_ATTRIBUTE).map(parse_runtime_api_version).unwrap_or(Ok(1))
+	found_attributes
+		.get(&API_VERSION_ATTRIBUTE)
+		.map(parse_runtime_api_version)
+		.unwrap_or(Ok(1))
 }
 
 /// Generate the declaration of the trait for the client side.
@@ -863,7 +864,10 @@ impl CheckTraitDecl {
 	/// Check that the given method declarations are correct.
 	///
 	/// Any error is stored in `self.errors`.
-	fn check_method_declarations<'a>(&mut self, methods: impl Iterator<Item = &'a TraitItemMethod>) {
+	fn check_method_declarations<'a>(
+		&mut self,
+		methods: impl Iterator<Item = &'a TraitItemMethod>,
+	) {
 		let mut method_to_signature_changed = HashMap::<Ident, Vec<Option<u64>>>::new();
 
 		methods.into_iter().for_each(|method| {
@@ -871,7 +875,10 @@ impl CheckTraitDecl {
 
 			let changed_in = match get_changed_in(&attributes) {
 				Ok(r) => r,
-				Err(e) => { self.errors.push(e); return; },
+				Err(e) => {
+					self.errors.push(e);
+					return
+				},
 			};
 
 			method_to_signature_changed
@@ -912,16 +919,13 @@ impl<'ast> Visit<'ast> for CheckTraitDecl {
 
 	fn visit_generic_param(&mut self, input: &'ast GenericParam) {
 		match input {
-			GenericParam::Type(ty) if ty.ident == BLOCK_GENERIC_IDENT => {
-				self.errors.push(
-					Error::new(
-						input.span(),
-						"`Block: BlockT` generic parameter will be added automatically by the \
-						`decl_runtime_apis!` macro!"
-					)
-				)
-			},
-			_ => {}
+			GenericParam::Type(ty) if ty.ident == BLOCK_GENERIC_IDENT =>
+				self.errors.push(Error::new(
+					input.span(),
+					"`Block: BlockT` generic parameter will be added automatically by the \
+						`decl_runtime_apis!` macro!",
+				)),
+			_ => {},
 		}
 
 		visit::visit_generic_param(self, input);
@@ -930,14 +934,12 @@ impl<'ast> Visit<'ast> for CheckTraitDecl {
 	fn visit_trait_bound(&mut self, input: &'ast TraitBound) {
 		if let Some(last_ident) = input.path.segments.last().map(|v| &v.ident) {
 			if last_ident == "BlockT" || last_ident == BLOCK_GENERIC_IDENT {
-				self.errors.push(
-					Error::new(
-						input.span(),
-						"`Block: BlockT` generic parameter will be added automatically by the \
+				self.errors.push(Error::new(
+					input.span(),
+					"`Block: BlockT` generic parameter will be added automatically by the \
 						`decl_runtime_apis!` macro! If you try to use a different trait than the \
-						substrate `Block` trait, please rename it locally."
-					)
-				)
+						substrate `Block` trait, please rename it locally.",
+				))
 			}
 		}
 
@@ -965,7 +967,9 @@ pub fn decl_runtime_apis_impl(input: proc_macro::TokenStream) -> proc_macro::Tok
 	// Parse all trait declarations
 	let RuntimeApiDecls { decls: api_decls } = parse_macro_input!(input as RuntimeApiDecls);
 
-	decl_runtime_apis_impl_inner(&api_decls).unwrap_or_else(|e| e.to_compile_error()).into()
+	decl_runtime_apis_impl_inner(&api_decls)
+		.unwrap_or_else(|e| e.to_compile_error())
+		.into()
 }
 
 fn decl_runtime_apis_impl_inner(api_decls: &[ItemTrait]) -> Result<TokenStream> {
@@ -975,13 +979,11 @@ fn decl_runtime_apis_impl_inner(api_decls: &[ItemTrait]) -> Result<TokenStream>
 	let runtime_decls = generate_runtime_decls(api_decls)?;
 	let client_side_decls = generate_client_side_decls(api_decls)?;
 
-	Ok(
-		quote!(
-			#hidden_includes
+	Ok(quote!(
+		#hidden_includes
 
-			#runtime_decls
+		#runtime_decls
 
-			#client_side_decls
-		)
-	)
+		#client_side_decls
+	))
 }
diff --git a/primitives/api/proc-macro/src/impl_runtime_apis.rs b/primitives/api/proc-macro/src/impl_runtime_apis.rs
index e81c52bbb0b1..bc0f027e1efa 100644
--- a/primitives/api/proc-macro/src/impl_runtime_apis.rs
+++ b/primitives/api/proc-macro/src/impl_runtime_apis.rs
@@ -16,12 +16,12 @@
 // limitations under the License.
 
 use crate::utils::{
-	generate_crate_access, generate_hidden_includes,
-	generate_runtime_mod_name_for_trait, generate_method_runtime_api_impl_name,
-	extract_parameter_names_types_and_borrows, generate_native_call_generator_fn_name,
-	return_type_extract_type, generate_call_api_at_fn_name, prefix_function_with_trait,
 	extract_all_signature_types, extract_block_type_from_trait_path, extract_impl_trait,
-	AllowSelfRefInParameters, RequireQualifiedTraitPath,
+	extract_parameter_names_types_and_borrows, generate_call_api_at_fn_name, generate_crate_access,
+	generate_hidden_includes, generate_method_runtime_api_impl_name,
+	generate_native_call_generator_fn_name, generate_runtime_mod_name_for_trait,
+	prefix_function_with_trait, return_type_extract_type, AllowSelfRefInParameters,
+	RequireQualifiedTraitPath,
 };
 
 use proc_macro2::{Span, TokenStream};
@@ -29,9 +29,12 @@ use proc_macro2::{Span, TokenStream};
 use quote::quote;
 
 use syn::{
-	spanned::Spanned, parse_macro_input, Ident, Type, ItemImpl, Path, Signature, Attribute,
-	ImplItem, parse::{Parse, ParseStream, Result, Error}, PathArguments, GenericArgument, TypePath,
-	fold::{self, Fold}, parse_quote,
+	fold::{self, Fold},
+	parse::{Error, Parse, ParseStream, Result},
+	parse_macro_input, parse_quote,
+	spanned::Spanned,
+	Attribute, GenericArgument, Ident, ImplItem, ItemImpl, Path, PathArguments, Signature, Type,
+	TypePath,
 };
 
 use std::collections::HashSet;
@@ -66,9 +69,10 @@ fn generate_impl_call(
 	signature: &Signature,
 	runtime: &Type,
 	input: &Ident,
-	impl_trait: &Path
+	impl_trait: &Path,
 ) -> Result<TokenStream> {
-	let params = extract_parameter_names_types_and_borrows(signature, AllowSelfRefInParameters::No)?;
+	let params =
+		extract_parameter_names_types_and_borrows(signature, AllowSelfRefInParameters::No)?;
 
 	let c = generate_crate_access(HIDDEN_INCLUDES_ID);
 	let fn_name = &signature.ident;
@@ -78,27 +82,25 @@ fn generate_impl_call(
 	let ptypes = params.iter().map(|v| &v.1);
 	let pborrow = params.iter().map(|v| &v.2);
 
-	Ok(
-		quote!(
-			let (#( #pnames ),*) : ( #( #ptypes ),* ) =
-				match #c::DecodeLimit::decode_all_with_depth_limit(
-					#c::MAX_EXTRINSIC_DEPTH,
-					&#input,
-				) {
-					Ok(res) => res,
-					Err(e) => panic!("Bad input data provided to {}: {}", #fn_name_str, e),
-				};
-
-			#[allow(deprecated)]
-			<#runtime as #impl_trait>::#fn_name(#( #pborrow #pnames2 ),*)
-		)
-	)
+	Ok(quote!(
+		let (#( #pnames ),*) : ( #( #ptypes ),* ) =
+			match #c::DecodeLimit::decode_all_with_depth_limit(
+				#c::MAX_EXTRINSIC_DEPTH,
+				&#input,
+			) {
+				Ok(res) => res,
+				Err(e) => panic!("Bad input data provided to {}: {}", #fn_name_str, e),
+			};
+
+		#[allow(deprecated)]
+		<#runtime as #impl_trait>::#fn_name(#( #pborrow #pnames2 ),*)
+	))
 }
 
 /// Generate all the implementation calls for the given functions.
 fn generate_impl_calls(
 	impls: &[ItemImpl],
-	input: &Ident
+	input: &Ident,
 ) -> Result<Vec<(Ident, Ident, TokenStream, Vec<Attribute>)>> {
 	let mut impl_calls = Vec::new();
 
@@ -113,12 +115,8 @@ fn generate_impl_calls(
 
 		for item in &impl_.items {
 			if let ImplItem::Method(method) = item {
-				let impl_call = generate_impl_call(
-					&method.sig,
-					&impl_.self_ty,
-					input,
-					&impl_trait
-				)?;
+				let impl_call =
+					generate_impl_call(&method.sig, &impl_.self_ty, input, &impl_trait)?;
 
 				impl_calls.push((
 					impl_trait_ident.clone(),
@@ -137,15 +135,16 @@ fn generate_impl_calls(
 fn generate_dispatch_function(impls: &[ItemImpl]) -> Result<TokenStream> {
 	let data = Ident::new("__sp_api__input_data", Span::call_site());
 	let c = generate_crate_access(HIDDEN_INCLUDES_ID);
-	let impl_calls = generate_impl_calls(impls, &data)?
-		.into_iter()
-		.map(|(trait_, fn_name, impl_, attrs)| {
-			let name = prefix_function_with_trait(&trait_, &fn_name);
-			quote!(
-				#( #attrs )*
-				#name => Some(#c::Encode::encode(&{ #impl_ })),
-			)
-		});
+	let impl_calls =
+		generate_impl_calls(impls, &data)?
+			.into_iter()
+			.map(|(trait_, fn_name, impl_, attrs)| {
+				let name = prefix_function_with_trait(&trait_, &fn_name);
+				quote!(
+					#( #attrs )*
+					#name => Some(#c::Encode::encode(&{ #impl_ })),
+				)
+			});
 
 	Ok(quote!(
 		#[cfg(feature = "std")]
@@ -163,34 +162,33 @@ fn generate_wasm_interface(impls: &[ItemImpl]) -> Result<TokenStream> {
 	let input = Ident::new("input", Span::call_site());
 	let c = generate_crate_access(HIDDEN_INCLUDES_ID);
 
-	let impl_calls = generate_impl_calls(impls, &input)?
-		.into_iter()
-		.map(|(trait_, fn_name, impl_, attrs)| {
-			let fn_name = Ident::new(
-				&prefix_function_with_trait(&trait_, &fn_name),
-				Span::call_site()
-			);
-
-			quote!(
-				#( #attrs )*
-				#[cfg(not(feature = "std"))]
-				#[no_mangle]
-				pub unsafe fn #fn_name(input_data: *mut u8, input_len: usize) -> u64 {
-					let mut #input = if input_len == 0 {
-						&[0u8; 0]
-					} else {
-						unsafe {
-							#c::slice::from_raw_parts(input_data, input_len)
-						}
-					};
-
-					#c::init_runtime_logger();
-
-					let output = (move || { #impl_ })();
-					#c::to_substrate_wasm_fn_return_value(&output)
-				}
-			)
-		});
+	let impl_calls =
+		generate_impl_calls(impls, &input)?
+			.into_iter()
+			.map(|(trait_, fn_name, impl_, attrs)| {
+				let fn_name =
+					Ident::new(&prefix_function_with_trait(&trait_, &fn_name), Span::call_site());
+
+				quote!(
+					#( #attrs )*
+					#[cfg(not(feature = "std"))]
+					#[no_mangle]
+					pub unsafe fn #fn_name(input_data: *mut u8, input_len: usize) -> u64 {
+						let mut #input = if input_len == 0 {
+							&[0u8; 0]
+						} else {
+							unsafe {
+								#c::slice::from_raw_parts(input_data, input_len)
+							}
+						};
+
+						#c::init_runtime_logger();
+
+						let output = (move || { #impl_ })();
+						#c::to_substrate_wasm_fn_return_value(&output)
+					}
+				)
+			});
 
 	Ok(quote!( #( #impl_calls )* ))
 }
@@ -414,7 +412,6 @@ fn generate_api_impl_for_runtime(impls: &[ItemImpl]) -> Result<TokenStream> {
 	Ok(quote!( #( #impls_prepared )* ))
 }
 
-
 /// Auxiliary data structure that is used to convert `impl Api for Runtime` to
 /// `impl Api for RuntimeApi`.
 /// This requires us to replace the runtime `Block` with the node `Block`,
@@ -430,11 +427,8 @@ struct ApiRuntimeImplToApiRuntimeApiImpl<'a> {
 
 impl<'a> Fold for ApiRuntimeImplToApiRuntimeApiImpl<'a> {
 	fn fold_type_path(&mut self, input: TypePath) -> TypePath {
-		let new_ty_path = if input == *self.runtime_block {
-			parse_quote!( __SR_API_BLOCK__ )
-		} else {
-			input
-		};
+		let new_ty_path =
+			if input == *self.runtime_block { parse_quote!(__SR_API_BLOCK__) } else { input };
 
 		fold::fold_type_path(self, new_ty_path)
 	}
@@ -451,12 +445,18 @@ impl<'a> Fold for ApiRuntimeImplToApiRuntimeApiImpl<'a> {
 
 			// Generate the access to the native parameters
 			let param_tuple_access = if input.sig.inputs.len() == 1 {
-				vec![ quote!( p ) ]
+				vec![quote!(p)]
 			} else {
-				input.sig.inputs.iter().enumerate().map(|(i, _)| {
-					let i = syn::Index::from(i);
-					quote!( p.#i )
-				}).collect::<Vec<_>>()
+				input
+					.sig
+					.inputs
+					.iter()
+					.enumerate()
+					.map(|(i, _)| {
+						let i = syn::Index::from(i);
+						quote!( p.#i )
+					})
+					.collect::<Vec<_>>()
 			};
 
 			let (param_types, error) = match extract_parameter_names_types_and_borrows(
@@ -464,12 +464,14 @@ impl<'a> Fold for ApiRuntimeImplToApiRuntimeApiImpl<'a> {
 				AllowSelfRefInParameters::No,
 			) {
 				Ok(res) => (
-					res.into_iter().map(|v| {
-						let ty = v.1;
-						let borrow = v.2;
-						quote!( #borrow #ty )
-					}).collect::<Vec<_>>(),
-					None
+					res.into_iter()
+						.map(|v| {
+							let ty = v.1;
+							let borrow = v.2;
+							quote!( #borrow #ty )
+						})
+						.collect::<Vec<_>>(),
+					None,
 				),
 				Err(e) => (Vec::new(), Some(e.to_compile_error())),
 			};
@@ -483,10 +485,8 @@ impl<'a> Fold for ApiRuntimeImplToApiRuntimeApiImpl<'a> {
 				params_encoded: Vec<u8>,
 			};
 
-			input.sig.ident = generate_method_runtime_api_impl_name(
-				&self.impl_trait,
-				&input.sig.ident,
-			);
+			input.sig.ident =
+				generate_method_runtime_api_impl_name(&self.impl_trait, &input.sig.ident);
 			let ret_type = return_type_extract_type(&input.sig.output);
 
 			// Generate the correct return type.
@@ -544,43 +544,34 @@ impl<'a> Fold for ApiRuntimeImplToApiRuntimeApiImpl<'a> {
 		let crate_ = generate_crate_access(HIDDEN_INCLUDES_ID);
 
 		// Implement the trait for the `RuntimeApiImpl`
-		input.self_ty = Box::new(
-			parse_quote!( RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall> )
-		);
+		input.self_ty =
+			Box::new(parse_quote!( RuntimeApiImpl<__SR_API_BLOCK__, RuntimeApiImplCall> ));
 
+		input.generics.params.push(parse_quote!(
+			__SR_API_BLOCK__: #crate_::BlockT + std::panic::UnwindSafe +
+				std::panic::RefUnwindSafe
+		));
 		input.generics.params.push(
-			parse_quote!(
-				__SR_API_BLOCK__: #crate_::BlockT + std::panic::UnwindSafe +
-					std::panic::RefUnwindSafe
-			)
-		);
-		input.generics.params.push(
-			parse_quote!( RuntimeApiImplCall: #crate_::CallApiAt<__SR_API_BLOCK__> + 'static )
+			parse_quote!( RuntimeApiImplCall: #crate_::CallApiAt<__SR_API_BLOCK__> + 'static ),
 		);
 
 		let where_clause = input.generics.make_where_clause();
 
-		where_clause.predicates.push(
-			parse_quote! {
-				RuntimeApiImplCall::StateBackend:
-					#crate_::StateBackend<#crate_::HashFor<__SR_API_BLOCK__>>
-			}
-		);
+		where_clause.predicates.push(parse_quote! {
+			RuntimeApiImplCall::StateBackend:
+				#crate_::StateBackend<#crate_::HashFor<__SR_API_BLOCK__>>
+		});
 
 		// Require that all types used in the function signatures are unwind safe.
 		extract_all_signature_types(&input.items).iter().for_each(|i| {
-			where_clause.predicates.push(
-				parse_quote! {
-					#i: std::panic::UnwindSafe + std::panic::RefUnwindSafe
-				}
-			);
+			where_clause.predicates.push(parse_quote! {
+				#i: std::panic::UnwindSafe + std::panic::RefUnwindSafe
+			});
 		});
 
-		where_clause.predicates.push(
-			parse_quote! {
-				__SR_API_BLOCK__::Header: std::panic::UnwindSafe + std::panic::RefUnwindSafe
-			}
-		);
+		where_clause.predicates.push(parse_quote! {
+			__SR_API_BLOCK__::Header: std::panic::UnwindSafe + std::panic::RefUnwindSafe
+		});
 
 		input.attrs = filter_cfg_attrs(&input.attrs);
 
@@ -650,14 +641,12 @@ fn generate_runtime_api_versions(impls: &[ItemImpl]) -> Result<TokenStream> {
 
 		let span = trait_.span();
 		if !processed_traits.insert(trait_) {
-			return Err(
-				Error::new(
-					span,
-					"Two traits with the same name detected! \
+			return Err(Error::new(
+				span,
+				"Two traits with the same name detected! \
 					The trait name is used to generate its ID. \
-					Please rename one trait at the declaration!"
-				)
-			)
+					Please rename one trait at the declaration!",
+			))
 		}
 
 		let id: Path = parse_quote!( #path ID );
@@ -692,7 +681,9 @@ pub fn impl_runtime_apis_impl(input: proc_macro::TokenStream) -> proc_macro::Tok
 	// Parse all impl blocks
 	let RuntimeApiImpls { impls: api_impls } = parse_macro_input!(input as RuntimeApiImpls);
 
-	impl_runtime_apis_impl_inner(&api_impls).unwrap_or_else(|e| e.to_compile_error()).into()
+	impl_runtime_apis_impl_inner(&api_impls)
+		.unwrap_or_else(|e| e.to_compile_error())
+		.into()
 }
 
 fn impl_runtime_apis_impl_inner(api_impls: &[ItemImpl]) -> Result<TokenStream> {
@@ -704,27 +695,25 @@ fn impl_runtime_apis_impl_inner(api_impls: &[ItemImpl]) -> Result<TokenStream> {
 	let wasm_interface = generate_wasm_interface(api_impls)?;
 	let api_impls_for_runtime_api = generate_api_impl_for_runtime_api(api_impls)?;
 
-	Ok(
-		quote!(
-			#hidden_includes
+	Ok(quote!(
+		#hidden_includes
 
-			#base_runtime_api
+		#base_runtime_api
 
-			#api_impls_for_runtime
+		#api_impls_for_runtime
 
-			#api_impls_for_runtime_api
+		#api_impls_for_runtime_api
 
-			#runtime_api_versions
+		#runtime_api_versions
 
-			pub mod api {
-				use super::*;
+		pub mod api {
+			use super::*;
 
-				#dispatch_impl
+			#dispatch_impl
 
-				#wasm_interface
-			}
-		)
-	)
+			#wasm_interface
+		}
+	))
 }
 
 // Filters all attributes except the cfg ones.
diff --git a/primitives/api/proc-macro/src/lib.rs b/primitives/api/proc-macro/src/lib.rs
index 30767efd41c1..b8731d70ca3c 100644
--- a/primitives/api/proc-macro/src/lib.rs
+++ b/primitives/api/proc-macro/src/lib.rs
@@ -21,9 +21,9 @@
 
 use proc_macro::TokenStream;
 
+mod decl_runtime_apis;
 mod impl_runtime_apis;
 mod mock_impl_runtime_apis;
-mod decl_runtime_apis;
 mod utils;
 
 #[proc_macro]
diff --git a/primitives/api/proc-macro/src/mock_impl_runtime_apis.rs b/primitives/api/proc-macro/src/mock_impl_runtime_apis.rs
index 738420615b62..77f8a07f85c4 100644
--- a/primitives/api/proc-macro/src/mock_impl_runtime_apis.rs
+++ b/primitives/api/proc-macro/src/mock_impl_runtime_apis.rs
@@ -16,10 +16,10 @@
 // limitations under the License.
 
 use crate::utils::{
-	generate_crate_access, generate_hidden_includes,
-	generate_method_runtime_api_impl_name, extract_parameter_names_types_and_borrows,
-	return_type_extract_type, extract_block_type_from_trait_path, extract_impl_trait,
-	AllowSelfRefInParameters, RequireQualifiedTraitPath,
+	extract_block_type_from_trait_path, extract_impl_trait,
+	extract_parameter_names_types_and_borrows, generate_crate_access, generate_hidden_includes,
+	generate_method_runtime_api_impl_name, return_type_extract_type, AllowSelfRefInParameters,
+	RequireQualifiedTraitPath,
 };
 
 use proc_macro2::{Span, TokenStream};
@@ -27,8 +27,11 @@ use proc_macro2::{Span, TokenStream};
 use quote::{quote, quote_spanned};
 
 use syn::{
-	spanned::Spanned, parse_macro_input, Ident, Type, ItemImpl, TypePath, parse_quote,
-	parse::{Parse, ParseStream, Result, Error}, fold::{self, Fold}, Attribute, Pat,
+	fold::{self, Fold},
+	parse::{Error, Parse, ParseStream, Result},
+	parse_macro_input, parse_quote,
+	spanned::Spanned,
+	Attribute, Ident, ItemImpl, Pat, Type, TypePath,
 };
 
 /// Unique identifier used to make the hidden includes unique for this macro.
@@ -62,10 +65,7 @@ impl Parse for RuntimeApiImpls {
 }
 
 /// Implement the `ApiExt` trait and the `Core` runtime api.
-fn implement_common_api_traits(
-	block_type: TypePath,
-	self_ty: Type,
-) -> Result<TokenStream> {
+fn implement_common_api_traits(block_type: TypePath, self_ty: Type) -> Result<TokenStream> {
 	let crate_ = generate_crate_access(HIDDEN_INCLUDES_ID);
 
 	Ok(quote!(
@@ -168,11 +168,13 @@ fn implement_common_api_traits(
 /// If the attribute was found, it will be automatically removed from the vec.
 fn has_advanced_attribute(attributes: &mut Vec<Attribute>) -> bool {
 	let mut found = false;
-	attributes.retain(|attr| if attr.path.is_ident(ADVANCED_ATTRIBUTE) {
-		found = true;
-		false
-	} else {
-		true
+	attributes.retain(|attr| {
+		if attr.path.is_ident(ADVANCED_ATTRIBUTE) {
+			found = true;
+			false
+		} else {
+			true
+		}
 	});
 
 	found
@@ -214,7 +216,7 @@ fn get_at_param_name(
 		let name = param_names.remove(0);
 		Ok((quote!( #name ), ptype_and_borrows.0))
 	} else {
-		Ok((quote!( _ ), default_block_id_type.clone()))
+		Ok((quote!(_), default_block_id_type.clone()))
 	}
 }
 
@@ -235,24 +237,27 @@ impl<'a> Fold for FoldRuntimeApiImpl<'a> {
 			let is_advanced = has_advanced_attribute(&mut input.attrs);
 			let mut errors = Vec::new();
 
-			let (mut param_names, mut param_types_and_borrows) = match extract_parameter_names_types_and_borrows(
-				&input.sig,
-				AllowSelfRefInParameters::YesButIgnore,
-			) {
-				Ok(res) => (
-					res.iter().map(|v| v.0.clone()).collect::<Vec<_>>(),
-					res.iter().map(|v| {
-						let ty = &v.1;
-						let borrow = &v.2;
-						(quote_spanned!(ty.span() => #borrow #ty ), v.2.is_some())
-					}).collect::<Vec<_>>(),
-				),
-				Err(e) => {
-					errors.push(e.to_compile_error());
-
-					(Default::default(), Default::default())
-				}
-			};
+			let (mut param_names, mut param_types_and_borrows) =
+				match extract_parameter_names_types_and_borrows(
+					&input.sig,
+					AllowSelfRefInParameters::YesButIgnore,
+				) {
+					Ok(res) => (
+						res.iter().map(|v| v.0.clone()).collect::<Vec<_>>(),
+						res.iter()
+							.map(|v| {
+								let ty = &v.1;
+								let borrow = &v.2;
+								(quote_spanned!(ty.span() => #borrow #ty ), v.2.is_some())
+							})
+							.collect::<Vec<_>>(),
+					),
+					Err(e) => {
+						errors.push(e.to_compile_error());
+
+						(Default::default(), Default::default())
+					},
+				};
 
 			let block_type = &self.block_type;
 			let block_id_type = quote!( &#crate_::BlockId<#block_type> );
@@ -267,8 +272,8 @@ impl<'a> Fold for FoldRuntimeApiImpl<'a> {
 				Ok(res) => res,
 				Err(e) => {
 					errors.push(e.to_compile_error());
-					(quote!( _ ), block_id_type)
-				}
+					(quote!(_), block_id_type)
+				},
 			};
 
 			let param_types = param_types_and_borrows.iter().map(|v| &v.0);
@@ -281,10 +286,8 @@ impl<'a> Fold for FoldRuntimeApiImpl<'a> {
 				_: Vec<u8>,
 			};
 
-			input.sig.ident = generate_method_runtime_api_impl_name(
-				&self.impl_trait,
-				&input.sig.ident,
-			);
+			input.sig.ident =
+				generate_method_runtime_api_impl_name(&self.impl_trait, &input.sig.ident);
 
 			// When using advanced, the user needs to declare the correct return type on its own,
 			// otherwise do it for the user.
@@ -360,28 +363,24 @@ fn generate_runtime_api_impls(impls: &[ItemImpl]) -> Result<GeneratedRuntimeApiI
 		let block_type = extract_block_type_from_trait_path(impl_trait_path)?;
 
 		self_ty = match self_ty.take() {
-			Some(self_ty) => {
+			Some(self_ty) =>
 				if self_ty == impl_.self_ty {
 					Some(self_ty)
 				} else {
-					let mut error =Error::new(
+					let mut error = Error::new(
 						impl_.self_ty.span(),
 						"Self type should not change between runtime apis",
 					);
 
-					error.combine(Error::new(
-						self_ty.span(),
-						"First self type found here",
-					));
+					error.combine(Error::new(self_ty.span(), "First self type found here"));
 
 					return Err(error)
-				}
-			},
+				},
 			None => Some(impl_.self_ty.clone()),
 		};
 
 		global_block_type = match global_block_type.take() {
-			Some(global_block_type) => {
+			Some(global_block_type) =>
 				if global_block_type == *block_type {
 					Some(global_block_type)
 				} else {
@@ -396,15 +395,11 @@ fn generate_runtime_api_impls(impls: &[ItemImpl]) -> Result<GeneratedRuntimeApiI
 					));
 
 					return Err(error)
-				}
-			},
+				},
 			None => Some(block_type.clone()),
 		};
 
-		let mut visitor = FoldRuntimeApiImpl {
-			block_type,
-			impl_trait: &impl_trait.ident,
-		};
+		let mut visitor = FoldRuntimeApiImpl { block_type, impl_trait: &impl_trait.ident };
 
 		result.push(visitor.fold_item_impl(impl_.clone()));
 	}
@@ -421,7 +416,9 @@ pub fn mock_impl_runtime_apis_impl(input: proc_macro::TokenStream) -> proc_macro
 	// Parse all impl blocks
 	let RuntimeApiImpls { impls: api_impls } = parse_macro_input!(input as RuntimeApiImpls);
 
-	mock_impl_runtime_apis_impl_inner(&api_impls).unwrap_or_else(|e| e.to_compile_error()).into()
+	mock_impl_runtime_apis_impl_inner(&api_impls)
+		.unwrap_or_else(|e| e.to_compile_error())
+		.into()
 }
 
 fn mock_impl_runtime_apis_impl_inner(api_impls: &[ItemImpl]) -> Result<TokenStream> {
diff --git a/primitives/api/proc-macro/src/utils.rs b/primitives/api/proc-macro/src/utils.rs
index aa3c69d46a29..a3f21638751e 100644
--- a/primitives/api/proc-macro/src/utils.rs
+++ b/primitives/api/proc-macro/src/utils.rs
@@ -15,11 +15,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use proc_macro2::{TokenStream, Span};
+use proc_macro2::{Span, TokenStream};
 
 use syn::{
-	Result, Ident, Signature, parse_quote, Type, Pat, spanned::Spanned, FnArg, Error, token::And,
-	ImplItem, ReturnType, PathArguments, Path, GenericArgument, TypePath, ItemImpl,
+	parse_quote, spanned::Spanned, token::And, Error, FnArg, GenericArgument, Ident, ImplItem,
+	ItemImpl, Pat, Path, PathArguments, Result, ReturnType, Signature, Type, TypePath,
 };
 
 use quote::quote;
@@ -49,18 +49,19 @@ pub fn generate_hidden_includes(unique_id: &'static str) -> TokenStream {
 		Err(e) => {
 			let err = Error::new(Span::call_site(), e).to_compile_error();
 			quote!( #err )
-		}
+		},
 	}
 }
 
 /// Generates the access to the `sc_client` crate.
 pub fn generate_crate_access(unique_id: &'static str) -> TokenStream {
 	if env::var("CARGO_PKG_NAME").unwrap() == "sp-api" {
-		quote!( sp_api )
+		quote!(sp_api)
 	} else {
 		let mod_name = generate_hidden_includes_mod_name(unique_id);
 		quote!( self::#mod_name::sp_api )
-	}.into()
+	}
+	.into()
 }
 
 /// Generates the name of the module that contains the trait declaration for the runtime.
@@ -76,7 +77,7 @@ pub fn generate_method_runtime_api_impl_name(trait_: &Ident, method: &Ident) ->
 /// Get the type of a `syn::ReturnType`.
 pub fn return_type_extract_type(rt: &ReturnType) -> Type {
 	match rt {
-		ReturnType::Default => parse_quote!( () ),
+		ReturnType::Default => parse_quote!(()),
 		ReturnType::Type(_, ref ty) => *ty.clone(),
 	}
 }
@@ -84,10 +85,13 @@ pub fn return_type_extract_type(rt: &ReturnType) -> Type {
 /// Replace the `_` (wild card) parameter names in the given signature with unique identifiers.
 pub fn replace_wild_card_parameter_names(input: &mut Signature) {
 	let mut generated_pattern_counter = 0;
-	input.inputs.iter_mut().for_each(|arg| if let FnArg::Typed(arg) = arg {
-		arg.pat = Box::new(
-			generate_unique_pattern((*arg.pat).clone(), &mut generated_pattern_counter),
-		);
+	input.inputs.iter_mut().for_each(|arg| {
+		if let FnArg::Typed(arg) = arg {
+			arg.pat = Box::new(generate_unique_pattern(
+				(*arg.pat).clone(),
+				&mut generated_pattern_counter,
+			));
+		}
 	});
 }
 
@@ -101,7 +105,7 @@ pub fn fold_fn_decl_for_client_side(
 
 	// Add `&self, at:& BlockId` as parameters to each function at the beginning.
 	input.inputs.insert(0, parse_quote!( __runtime_api_at_param__: &#block_id ));
-	input.inputs.insert(0, parse_quote!( &self ));
+	input.inputs.insert(0, parse_quote!(&self));
 
 	// Wrap the output in a `Result`
 	input.output = {
@@ -114,10 +118,8 @@ pub fn fold_fn_decl_for_client_side(
 pub fn generate_unique_pattern(pat: Pat, counter: &mut u32) -> Pat {
 	match pat {
 		Pat::Wild(_) => {
-			let generated_name = Ident::new(
-				&format!("__runtime_api_generated_name_{}__", counter),
-				pat.span(),
-			);
+			let generated_name =
+				Ident::new(&format!("__runtime_api_generated_name_{}__", counter), pat.span());
 			*counter += 1;
 
 			parse_quote!( #generated_name )
@@ -145,26 +147,20 @@ pub fn extract_parameter_names_types_and_borrows(
 		match input {
 			FnArg::Typed(arg) => {
 				let (ty, borrow) = match &*arg.ty {
-					Type::Reference(t) => {
-						((*t.elem).clone(), Some(t.and_token))
-					},
-					t => { (t.clone(), None) },
+					Type::Reference(t) => ((*t.elem).clone(), Some(t.and_token)),
+					t => (t.clone(), None),
 				};
 
-				let name = generate_unique_pattern(
-					(*arg.pat).clone(),
-					&mut generated_pattern_counter,
-				);
+				let name =
+					generate_unique_pattern((*arg.pat).clone(), &mut generated_pattern_counter);
 				result.push((name, ty, borrow));
 			},
-			FnArg::Receiver(_) if matches!(allow_self, AllowSelfRefInParameters::No) => {
-				return Err(Error::new(input.span(), "`self` parameter not supported!"))
-			},
-			FnArg::Receiver(recv) => {
+			FnArg::Receiver(_) if matches!(allow_self, AllowSelfRefInParameters::No) =>
+				return Err(Error::new(input.span(), "`self` parameter not supported!")),
+			FnArg::Receiver(recv) =>
 				if recv.mutability.is_some() || recv.reference.is_none() {
 					return Err(Error::new(recv.span(), "Only `&self` is supported!"))
-				}
-			},
+				},
 		}
 	}
 
@@ -190,7 +186,8 @@ pub fn prefix_function_with_trait<F: ToString>(trait_: &Ident, function: &F) ->
 ///
 /// If a type is a reference, the inner type is extracted (without the reference).
 pub fn extract_all_signature_types(items: &[ImplItem]) -> Vec<Type> {
-	items.iter()
+	items
+		.iter()
 		.filter_map(|i| match i {
 			ImplItem::Method(method) => Some(&method.sig),
 			_ => None,
@@ -201,13 +198,17 @@ pub fn extract_all_signature_types(items: &[ImplItem]) -> Vec<Type> {
 				ReturnType::Type(_, ty) => Some((**ty).clone()),
 			};
 
-			sig.inputs.iter().filter_map(|i| match i {
-				FnArg::Typed(arg) => Some(&arg.ty),
-				_ => None,
-			}).map(|ty| match &**ty {
-				Type::Reference(t) => (*t.elem).clone(),
-				_ => (**ty).clone(),
-			}).chain(ret_ty)
+			sig.inputs
+				.iter()
+				.filter_map(|i| match i {
+					FnArg::Typed(arg) => Some(&arg.ty),
+					_ => None,
+				})
+				.map(|ty| match &**ty {
+					Type::Reference(t) => (*t.elem).clone(),
+					_ => (**ty).clone(),
+				})
+				.chain(ret_ty)
 		})
 		.collect()
 }
@@ -223,19 +224,20 @@ pub fn extract_block_type_from_trait_path(trait_: &Path) -> Result<&TypePath> {
 		.ok_or_else(|| Error::new(span, "Empty path not supported"))?;
 
 	match &generics.arguments {
-		PathArguments::AngleBracketed(ref args) => {
-			args.args.first().and_then(|v| match v {
+		PathArguments::AngleBracketed(ref args) => args
+			.args
+			.first()
+			.and_then(|v| match v {
 				GenericArgument::Type(Type::Path(ref block)) => Some(block),
-				_ => None
-			}).ok_or_else(|| Error::new(args.span(), "Missing `Block` generic parameter."))
-		},
+				_ => None,
+			})
+			.ok_or_else(|| Error::new(args.span(), "Missing `Block` generic parameter.")),
 		PathArguments::None => {
 			let span = trait_.segments.last().as_ref().unwrap().span();
 			Err(Error::new(span, "Missing `Block` generic parameter."))
 		},
-		PathArguments::Parenthesized(_) => {
-			Err(Error::new(generics.arguments.span(), "Unexpected parentheses in path!"))
-		},
+		PathArguments::Parenthesized(_) =>
+			Err(Error::new(generics.arguments.span(), "Unexpected parentheses in path!")),
 	}
 }
 
@@ -252,19 +254,20 @@ pub fn extract_impl_trait<'a>(
 	impl_: &'a ItemImpl,
 	require: RequireQualifiedTraitPath,
 ) -> Result<&'a Path> {
-	impl_.trait_.as_ref().map(|v| &v.1).ok_or_else(
-		|| Error::new(impl_.span(), "Only implementation of traits are supported!")
-	).and_then(|p| {
-		if p.segments.len() > 1 || matches!(require, RequireQualifiedTraitPath::No) {
-			Ok(p)
-		} else {
-			Err(
-				Error::new(
+	impl_
+		.trait_
+		.as_ref()
+		.map(|v| &v.1)
+		.ok_or_else(|| Error::new(impl_.span(), "Only implementation of traits are supported!"))
+		.and_then(|p| {
+			if p.segments.len() > 1 || matches!(require, RequireQualifiedTraitPath::No) {
+				Ok(p)
+			} else {
+				Err(Error::new(
 					p.span(),
 					"The implemented trait has to be referenced with a path, \
-					e.g. `impl client::Core for Runtime`."
-				)
-			)
-		}
-	})
+					e.g. `impl client::Core for Runtime`.",
+				))
+			}
+		})
 }
diff --git a/primitives/api/src/lib.rs b/primitives/api/src/lib.rs
index ea023677adf3..0ec1c5aeadbb 100644
--- a/primitives/api/src/lib.rs
+++ b/primitives/api/src/lib.rs
@@ -70,13 +70,7 @@
 extern crate self as sp_api;
 
 #[doc(hidden)]
-#[cfg(feature = "std")]
-pub use sp_state_machine::{
-	OverlayedChanges, StorageProof, Backend as StateBackend, ChangesTrieState, InMemoryBackend,
-};
-#[doc(hidden)]
-#[cfg(feature = "std")]
-pub use sp_core::NativeOrEncoded;
+pub use codec::{self, Decode, DecodeLimit, Encode};
 #[doc(hidden)]
 #[cfg(feature = "std")]
 pub use hash_db::Hasher;
@@ -84,27 +78,34 @@ pub use hash_db::Hasher;
 #[cfg(not(feature = "std"))]
 pub use sp_core::to_substrate_wasm_fn_return_value;
 #[doc(hidden)]
+#[cfg(feature = "std")]
+pub use sp_core::NativeOrEncoded;
+use sp_core::OpaqueMetadata;
+#[doc(hidden)]
+pub use sp_core::{offchain, ExecutionContext};
+#[doc(hidden)]
 pub use sp_runtime::{
+	generic::BlockId,
 	traits::{
-		Block as BlockT, GetNodeBlockType, GetRuntimeBlockType, HashFor, NumberFor,
-		Header as HeaderT, Hash as HashT,
+		Block as BlockT, GetNodeBlockType, GetRuntimeBlockType, Hash as HashT, HashFor,
+		Header as HeaderT, NumberFor,
 	},
-	generic::BlockId, transaction_validity::TransactionValidity, RuntimeString, TransactionOutcome,
+	transaction_validity::TransactionValidity,
+	RuntimeString, TransactionOutcome,
 };
 #[doc(hidden)]
-pub use sp_core::{offchain, ExecutionContext};
-#[doc(hidden)]
-pub use sp_version::{ApiId, RuntimeVersion, ApisVec, create_apis_vec};
-#[doc(hidden)]
-pub use sp_std::{slice, mem};
+#[cfg(feature = "std")]
+pub use sp_state_machine::{
+	Backend as StateBackend, ChangesTrieState, InMemoryBackend, OverlayedChanges, StorageProof,
+};
 #[cfg(feature = "std")]
 use sp_std::result;
 #[doc(hidden)]
-pub use codec::{Encode, Decode, DecodeLimit, self};
-use sp_core::OpaqueMetadata;
+pub use sp_std::{mem, slice};
+#[doc(hidden)]
+pub use sp_version::{create_apis_vec, ApiId, ApisVec, RuntimeVersion};
 #[cfg(feature = "std")]
-use std::{panic::UnwindSafe, cell::RefCell};
-
+use std::{cell::RefCell, panic::UnwindSafe};
 
 /// Maximum nesting level for extrinsics.
 pub const MAX_EXTRINSIC_DEPTH: u32 = 256;
@@ -386,18 +387,18 @@ pub type ProofRecorder<B> = sp_state_machine::ProofRecorder<<B as BlockT>::Hash>
 
 /// A type that is used as cache for the storage transactions.
 #[cfg(feature = "std")]
-pub type StorageTransactionCache<Block, Backend> =
-	sp_state_machine::StorageTransactionCache<
-		<Backend as StateBackend<HashFor<Block>>>::Transaction, HashFor<Block>, NumberFor<Block>
-	>;
+pub type StorageTransactionCache<Block, Backend> = sp_state_machine::StorageTransactionCache<
+	<Backend as StateBackend<HashFor<Block>>>::Transaction,
+	HashFor<Block>,
+	NumberFor<Block>,
+>;
 
 #[cfg(feature = "std")]
-pub type StorageChanges<SBackend, Block> =
-	sp_state_machine::StorageChanges<
-		<SBackend as StateBackend<HashFor<Block>>>::Transaction,
-		HashFor<Block>,
-		NumberFor<Block>
-	>;
+pub type StorageChanges<SBackend, Block> = sp_state_machine::StorageChanges<
+	<SBackend as StateBackend<HashFor<Block>>>::Transaction,
+	HashFor<Block>,
+	NumberFor<Block>,
+>;
 
 /// Extract the state backend type for a type that implements `ProvideRuntimeApi`.
 #[cfg(feature = "std")]
@@ -463,29 +464,31 @@ pub trait ApiExt<Block: BlockT> {
 	/// Depending on the outcome of the closure, the transaction is committed or rolled-back.
 	///
 	/// The internal result of the closure is returned afterwards.
-	fn execute_in_transaction<F: FnOnce(&Self) -> TransactionOutcome<R>, R>(
-		&self,
-		call: F,
-	) -> R where Self: Sized;
+	fn execute_in_transaction<F: FnOnce(&Self) -> TransactionOutcome<R>, R>(&self, call: F) -> R
+	where
+		Self: Sized;
 
 	/// Checks if the given api is implemented and versions match.
-	fn has_api<A: RuntimeApiInfo + ?Sized>(
-		&self,
-		at: &BlockId<Block>,
-	) -> Result<bool, ApiError> where Self: Sized;
+	fn has_api<A: RuntimeApiInfo + ?Sized>(&self, at: &BlockId<Block>) -> Result<bool, ApiError>
+	where
+		Self: Sized;
 
 	/// Check if the given api is implemented and the version passes a predicate.
 	fn has_api_with<A: RuntimeApiInfo + ?Sized, P: Fn(u32) -> bool>(
 		&self,
 		at: &BlockId<Block>,
 		pred: P,
-	) -> Result<bool, ApiError> where Self: Sized;
+	) -> Result<bool, ApiError>
+	where
+		Self: Sized;
 
 	/// Returns the version of the given api.
 	fn api_version<A: RuntimeApiInfo + ?Sized>(
 		&self,
 		at: &BlockId<Block>,
-	) -> Result<Option<u32>, ApiError> where Self: Sized;
+	) -> Result<Option<u32>, ApiError>
+	where
+		Self: Sized;
 
 	/// Start recording all accessed trie nodes for generating proofs.
 	fn record_proof(&mut self);
@@ -509,10 +512,9 @@ pub trait ApiExt<Block: BlockT> {
 		backend: &Self::StateBackend,
 		changes_trie_state: Option<&ChangesTrieState<HashFor<Block>, NumberFor<Block>>>,
 		parent_hash: Block::Hash,
-	) -> Result<
-		StorageChanges<Self::StateBackend, Block>,
-		String
-	> where Self: Sized;
+	) -> Result<StorageChanges<Self::StateBackend, Block>, String>
+	where
+		Self: Sized;
 }
 
 /// Parameters for [`CallApiAt::call_api_at`].
@@ -557,10 +559,7 @@ pub trait CallApiAt<Block: BlockT> {
 	) -> Result<NativeOrEncoded<R>, ApiError>;
 
 	/// Returns the runtime version at the given block.
-	fn runtime_version_at(
-		&self,
-		at: &BlockId<Block>,
-	) -> Result<RuntimeVersion, ApiError>;
+	fn runtime_version_at(&self, at: &BlockId<Block>) -> Result<RuntimeVersion, ApiError>;
 }
 
 /// Auxiliary wrapper that holds an api instance and binds it to the given lifetime.
diff --git a/primitives/api/test/benches/bench.rs b/primitives/api/test/benches/bench.rs
index 20ddbbe7116d..b3d96a2db6a5 100644
--- a/primitives/api/test/benches/bench.rs
+++ b/primitives/api/test/benches/bench.rs
@@ -15,14 +15,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use criterion::{Criterion, criterion_group, criterion_main};
-use substrate_test_runtime_client::{
-	DefaultTestClientBuilderExt, TestClientBuilder,
-	TestClientBuilderExt, runtime::TestAPI,
-};
+use criterion::{criterion_group, criterion_main, Criterion};
+use sp_api::ProvideRuntimeApi;
 use sp_runtime::generic::BlockId;
 use sp_state_machine::ExecutionStrategy;
-use sp_api::ProvideRuntimeApi;
+use substrate_test_runtime_client::{
+	runtime::TestAPI, DefaultTestClientBuilderExt, TestClientBuilder, TestClientBuilderExt,
+};
 
 fn sp_api_benchmark(c: &mut Criterion) {
 	c.bench_function("add one with same runtime api", |b| {
@@ -58,13 +57,17 @@ fn sp_api_benchmark(c: &mut Criterion) {
 	});
 
 	c.bench_function("calling function by function pointer in wasm", |b| {
-		let client = TestClientBuilder::new().set_execution_strategy(ExecutionStrategy::AlwaysWasm).build();
+		let client = TestClientBuilder::new()
+			.set_execution_strategy(ExecutionStrategy::AlwaysWasm)
+			.build();
 		let block_id = BlockId::Number(client.chain_info().best_number);
 		b.iter(|| client.runtime_api().benchmark_indirect_call(&block_id).unwrap())
 	});
 
 	c.bench_function("calling function in wasm", |b| {
-		let client = TestClientBuilder::new().set_execution_strategy(ExecutionStrategy::AlwaysWasm).build();
+		let client = TestClientBuilder::new()
+			.set_execution_strategy(ExecutionStrategy::AlwaysWasm)
+			.build();
 		let block_id = BlockId::Number(client.chain_info().best_number);
 		b.iter(|| client.runtime_api().benchmark_direct_call(&block_id).unwrap())
 	});
diff --git a/primitives/api/test/tests/decl_and_impl.rs b/primitives/api/test/tests/decl_and_impl.rs
index 54fb37133f46..5eeb2a6a771e 100644
--- a/primitives/api/test/tests/decl_and_impl.rs
+++ b/primitives/api/test/tests/decl_and_impl.rs
@@ -16,12 +16,13 @@
 // limitations under the License.
 
 use sp_api::{
-	RuntimeApiInfo, decl_runtime_apis, impl_runtime_apis, mock_impl_runtime_apis,
-	ApiError,
-	ApiExt,
+	decl_runtime_apis, impl_runtime_apis, mock_impl_runtime_apis, ApiError, ApiExt, RuntimeApiInfo,
 };
-use sp_runtime::{traits::{GetNodeBlockType, Block as BlockT}, generic::BlockId};
 use sp_core::NativeOrEncoded;
+use sp_runtime::{
+	generic::BlockId,
+	traits::{Block as BlockT, GetNodeBlockType},
+};
 use substrate_test_runtime_client::runtime::Block;
 
 /// The declaration of the `Runtime` type and the implementation of the `GetNodeBlockType`
@@ -142,16 +143,22 @@ type TestClient = substrate_test_runtime_client::client::Client<
 
 #[test]
 fn test_client_side_function_signature() {
-	let _test: fn(&RuntimeApiImpl<Block, TestClient>, &BlockId<Block>, u64) -> Result<(), ApiError> =
-		RuntimeApiImpl::<Block, TestClient>::test;
-	let _something_with_block:
-		fn(&RuntimeApiImpl<Block, TestClient>, &BlockId<Block>, Block) -> Result<Block, ApiError> =
-			RuntimeApiImpl::<Block, TestClient>::something_with_block;
+	let _test: fn(
+		&RuntimeApiImpl<Block, TestClient>,
+		&BlockId<Block>,
+		u64,
+	) -> Result<(), ApiError> = RuntimeApiImpl::<Block, TestClient>::test;
+	let _something_with_block: fn(
+		&RuntimeApiImpl<Block, TestClient>,
+		&BlockId<Block>,
+		Block,
+	) -> Result<Block, ApiError> = RuntimeApiImpl::<Block, TestClient>::something_with_block;
 
 	#[allow(deprecated)]
-	let _same_name_before_version_2:
-		fn(&RuntimeApiImpl<Block, TestClient>, &BlockId<Block>) -> Result<String, ApiError> =
-			RuntimeApiImpl::<Block, TestClient>::same_name_before_version_2;
+	let _same_name_before_version_2: fn(
+		&RuntimeApiImpl<Block, TestClient>,
+		&BlockId<Block>,
+	) -> Result<String, ApiError> = RuntimeApiImpl::<Block, TestClient>::same_name_before_version_2;
 }
 
 #[test]
@@ -186,9 +193,7 @@ fn check_runtime_api_versions() {
 fn mock_runtime_api_has_api() {
 	let mock = MockApi { block: None };
 
-	assert!(
-		mock.has_api::<dyn ApiWithCustomVersion<Block>>(&BlockId::Number(0)).unwrap(),
-	);
+	assert!(mock.has_api::<dyn ApiWithCustomVersion<Block>>(&BlockId::Number(0)).unwrap(),);
 	assert!(mock.has_api::<dyn Api<Block>>(&BlockId::Number(0)).unwrap());
 }
 
diff --git a/primitives/api/test/tests/runtime_calls.rs b/primitives/api/test/tests/runtime_calls.rs
index b60c7a09cb61..b0b14ec1e944 100644
--- a/primitives/api/test/tests/runtime_calls.rs
+++ b/primitives/api/test/tests/runtime_calls.rs
@@ -15,21 +15,23 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use sp_api::{ProvideRuntimeApi, Core};
+use sp_api::{Core, ProvideRuntimeApi};
+use sp_runtime::{
+	generic::BlockId,
+	traits::{HashFor, Header as HeaderT},
+};
+use sp_state_machine::{
+	create_proof_check_backend, execution_proof_check_on_trie_backend, ExecutionStrategy,
+};
 use substrate_test_runtime_client::{
 	prelude::*,
+	runtime::{Block, DecodeFails, Header, TestAPI, Transfer},
 	DefaultTestClientBuilderExt, TestClientBuilder,
-	runtime::{TestAPI, DecodeFails, Transfer, Block, Header},
-};
-use sp_runtime::{generic::BlockId, traits::{Header as HeaderT, HashFor}};
-use sp_state_machine::{
-	ExecutionStrategy, create_proof_check_backend,
-	execution_proof_check_on_trie_backend,
 };
 
-use sp_consensus::SelectChain;
 use codec::Encode;
 use sc_block_builder::BlockBuilderProvider;
+use sp_consensus::SelectChain;
 
 fn calling_function_with_strat(strat: ExecutionStrategy) {
 	let client = TestClientBuilder::new().set_execution_strategy(strat).build();
@@ -52,7 +54,9 @@ fn calling_wasm_runtime_function() {
 #[test]
 #[should_panic(expected = "FailedToConvertParameter { function: \"fail_convert_parameter\"")]
 fn calling_native_runtime_function_with_non_decodable_parameter() {
-	let client = TestClientBuilder::new().set_execution_strategy(ExecutionStrategy::NativeWhenPossible).build();
+	let client = TestClientBuilder::new()
+		.set_execution_strategy(ExecutionStrategy::NativeWhenPossible)
+		.build();
 	let runtime_api = client.runtime_api();
 	let block_id = BlockId::Number(client.chain_info().best_number);
 	runtime_api.fail_convert_parameter(&block_id, DecodeFails::new()).unwrap();
@@ -61,7 +65,9 @@ fn calling_native_runtime_function_with_non_decodable_parameter() {
 #[test]
 #[should_panic(expected = "FailedToConvertReturnValue { function: \"fail_convert_return_value\"")]
 fn calling_native_runtime_function_with_non_decodable_return_value() {
-	let client = TestClientBuilder::new().set_execution_strategy(ExecutionStrategy::NativeWhenPossible).build();
+	let client = TestClientBuilder::new()
+		.set_execution_strategy(ExecutionStrategy::NativeWhenPossible)
+		.build();
 	let runtime_api = client.runtime_api();
 	let block_id = BlockId::Number(client.chain_info().best_number);
 	runtime_api.fail_convert_return_value(&block_id).unwrap();
@@ -69,7 +75,9 @@ fn calling_native_runtime_function_with_non_decodable_return_value() {
 
 #[test]
 fn calling_native_runtime_signature_changed_function() {
-	let client = TestClientBuilder::new().set_execution_strategy(ExecutionStrategy::NativeWhenPossible).build();
+	let client = TestClientBuilder::new()
+		.set_execution_strategy(ExecutionStrategy::NativeWhenPossible)
+		.build();
 	let runtime_api = client.runtime_api();
 	let block_id = BlockId::Number(client.chain_info().best_number);
 
@@ -78,7 +86,9 @@ fn calling_native_runtime_signature_changed_function() {
 
 #[test]
 fn calling_wasm_runtime_signature_changed_old_function() {
-	let client = TestClientBuilder::new().set_execution_strategy(ExecutionStrategy::AlwaysWasm).build();
+	let client = TestClientBuilder::new()
+		.set_execution_strategy(ExecutionStrategy::AlwaysWasm)
+		.build();
 	let runtime_api = client.runtime_api();
 	let block_id = BlockId::Number(client.chain_info().best_number);
 
@@ -103,10 +113,11 @@ fn calling_with_both_strategy_and_fail_on_native_should_work() {
 	assert_eq!(runtime_api.fail_on_native(&block_id).unwrap(), 1);
 }
 
-
 #[test]
 fn calling_with_native_else_wasm_and_fail_on_wasm_should_work() {
-	let client = TestClientBuilder::new().set_execution_strategy(ExecutionStrategy::NativeElseWasm).build();
+	let client = TestClientBuilder::new()
+		.set_execution_strategy(ExecutionStrategy::NativeElseWasm)
+		.build();
 	let runtime_api = client.runtime_api();
 	let block_id = BlockId::Number(client.chain_info().best_number);
 	assert_eq!(runtime_api.fail_on_wasm(&block_id).unwrap(), 1);
@@ -114,7 +125,9 @@ fn calling_with_native_else_wasm_and_fail_on_wasm_should_work() {
 
 #[test]
 fn calling_with_native_else_wasm_and_fail_on_native_should_work() {
-	let client = TestClientBuilder::new().set_execution_strategy(ExecutionStrategy::NativeElseWasm).build();
+	let client = TestClientBuilder::new()
+		.set_execution_strategy(ExecutionStrategy::NativeElseWasm)
+		.build();
 	let runtime_api = client.runtime_api();
 	let block_id = BlockId::Number(client.chain_info().best_number);
 	assert_eq!(runtime_api.fail_on_native(&block_id).unwrap(), 1);
@@ -122,7 +135,9 @@ fn calling_with_native_else_wasm_and_fail_on_native_should_work() {
 
 #[test]
 fn use_trie_function() {
-	let client = TestClientBuilder::new().set_execution_strategy(ExecutionStrategy::AlwaysWasm).build();
+	let client = TestClientBuilder::new()
+		.set_execution_strategy(ExecutionStrategy::AlwaysWasm)
+		.build();
 	let runtime_api = client.runtime_api();
 	let block_id = BlockId::Number(client.chain_info().best_number);
 	assert_eq!(runtime_api.use_trie(&block_id).unwrap(), 2);
@@ -133,10 +148,18 @@ fn initialize_block_works() {
 	let client = TestClientBuilder::new().set_execution_strategy(ExecutionStrategy::Both).build();
 	let runtime_api = client.runtime_api();
 	let block_id = BlockId::Number(client.chain_info().best_number);
-	runtime_api.initialize_block(
-		&block_id,
-		&Header::new(1, Default::default(), Default::default(), Default::default(), Default::default()),
-	).unwrap();
+	runtime_api
+		.initialize_block(
+			&block_id,
+			&Header::new(
+				1,
+				Default::default(),
+				Default::default(),
+				Default::default(),
+				Default::default(),
+			),
+		)
+		.unwrap();
 	assert_eq!(runtime_api.get_block_number(&block_id).unwrap(), 1);
 }
 
@@ -165,7 +188,8 @@ fn record_proof_works() {
 		nonce: 0,
 		from: AccountKeyring::Alice.into(),
 		to: Default::default(),
-	}.into_signed_tx();
+	}
+	.into_signed_tx();
 
 	// Build the block and record proof
 	let mut builder = client
@@ -177,15 +201,12 @@ fn record_proof_works() {
 	let backend = create_proof_check_backend::<HashFor<Block>>(
 		storage_root,
 		proof.expect("Proof was generated"),
-	).expect("Creates proof backend.");
+	)
+	.expect("Creates proof backend.");
 
 	// Use the proof backend to execute `execute_block`.
 	let mut overlay = Default::default();
-	let executor = NativeExecutor::<LocalExecutor>::new(
-		WasmExecutionMethod::Interpreted,
-		None,
-		8,
-	);
+	let executor = NativeExecutor::<LocalExecutor>::new(WasmExecutionMethod::Interpreted, None, 8);
 	execution_proof_check_on_trie_backend::<_, u64, _, _>(
 		&backend,
 		&mut overlay,
@@ -194,7 +215,8 @@ fn record_proof_works() {
 		"Core_execute_block",
 		&block.encode(),
 		&runtime_code,
-	).expect("Executes block while using the proof backend");
+	)
+	.expect("Executes block while using the proof backend");
 }
 
 #[test]
@@ -203,7 +225,8 @@ fn call_runtime_api_with_multiple_arguments() {
 
 	let data = vec![1, 2, 4, 5, 6, 7, 8, 8, 10, 12];
 	let block_id = BlockId::Number(client.chain_info().best_number);
-	client.runtime_api()
+	client
+		.runtime_api()
 		.test_multiple_arguments(&block_id, data.clone(), data.clone(), data.len() as u32)
 		.unwrap();
 }
@@ -213,8 +236,8 @@ fn disable_logging_works() {
 	if std::env::var("RUN_TEST").is_ok() {
 		sp_tracing::try_init_simple();
 
-		let mut builder = TestClientBuilder::new()
-			.set_execution_strategy(ExecutionStrategy::AlwaysWasm);
+		let mut builder =
+			TestClientBuilder::new().set_execution_strategy(ExecutionStrategy::AlwaysWasm);
 		builder.genesis_init_mut().set_wasm_code(
 			substrate_test_runtime_client::runtime::wasm_binary_logging_disabled_unwrap().to_vec(),
 		);
diff --git a/primitives/application-crypto/src/ecdsa.rs b/primitives/application-crypto/src/ecdsa.rs
index fe54dab39eef..915e16ba3b1a 100644
--- a/primitives/application-crypto/src/ecdsa.rs
+++ b/primitives/application-crypto/src/ecdsa.rs
@@ -17,7 +17,7 @@
 
 //! Ecdsa crypto types.
 
-use crate::{RuntimePublic, KeyTypeId};
+use crate::{KeyTypeId, RuntimePublic};
 
 use sp_std::vec::Vec;
 
@@ -33,9 +33,9 @@ mod app {
 	}
 }
 
-pub use app::{Public as AppPublic, Signature as AppSignature};
 #[cfg(feature = "full_crypto")]
 pub use app::Pair as AppPair;
+pub use app::{Public as AppPublic, Signature as AppSignature};
 
 impl RuntimePublic for Public {
 	type Signature = Signature;
diff --git a/primitives/application-crypto/src/ed25519.rs b/primitives/application-crypto/src/ed25519.rs
index 98eb4727df63..09ce48fcb274 100644
--- a/primitives/application-crypto/src/ed25519.rs
+++ b/primitives/application-crypto/src/ed25519.rs
@@ -17,7 +17,7 @@
 
 //! Ed25519 crypto types.
 
-use crate::{RuntimePublic, KeyTypeId};
+use crate::{KeyTypeId, RuntimePublic};
 
 use sp_std::vec::Vec;
 
@@ -33,9 +33,9 @@ mod app {
 	}
 }
 
-pub use app::{Public as AppPublic, Signature as AppSignature};
 #[cfg(feature = "full_crypto")]
 pub use app::Pair as AppPair;
+pub use app::{Public as AppPublic, Signature as AppSignature};
 
 impl RuntimePublic for Public {
 	type Signature = Signature;
diff --git a/primitives/application-crypto/src/lib.rs b/primitives/application-crypto/src/lib.rs
index ca175ddbed91..95b8c1f11f80 100644
--- a/primitives/application-crypto/src/lib.rs
+++ b/primitives/application-crypto/src/lib.rs
@@ -18,15 +18,18 @@
 //! Traits and macros for constructing application specific strongly typed crypto wrappers.
 
 #![warn(missing_docs)]
-
 #![cfg_attr(not(feature = "std"), no_std)]
 
-#[doc(hidden)]
-pub use sp_core::{self, crypto::{CryptoType, CryptoTypePublicPair, Public, Derive, IsWrappedBy, Wraps}, RuntimeDebug};
+pub use sp_core::crypto::{key_types, CryptoTypeId, KeyTypeId};
 #[doc(hidden)]
 #[cfg(feature = "full_crypto")]
-pub use sp_core::crypto::{SecretStringError, DeriveJunction, Ss58Codec, Pair};
-pub use sp_core::crypto::{KeyTypeId, CryptoTypeId, key_types};
+pub use sp_core::crypto::{DeriveJunction, Pair, SecretStringError, Ss58Codec};
+#[doc(hidden)]
+pub use sp_core::{
+	self,
+	crypto::{CryptoType, CryptoTypePublicPair, Derive, IsWrappedBy, Public, Wraps},
+	RuntimeDebug,
+};
 
 #[doc(hidden)]
 pub use codec;
@@ -34,15 +37,11 @@ pub use codec;
 #[cfg(feature = "std")]
 pub use serde;
 #[doc(hidden)]
-pub use sp_std::{
-	convert::TryFrom,
-	ops::Deref,
-	vec::Vec,
-};
+pub use sp_std::{convert::TryFrom, ops::Deref, vec::Vec};
 
+pub mod ecdsa;
 pub mod ed25519;
 pub mod sr25519;
-pub mod ecdsa;
 mod traits;
 
 pub use traits::*;
@@ -51,7 +50,7 @@ pub use traits::*;
 /// Application-specific types whose identifier is `$key_type`.
 ///
 /// ```rust
-///# use sp_application_crypto::{app_crypto, wrap, ed25519, KeyTypeId};
+/// # use sp_application_crypto::{app_crypto, wrap, ed25519, KeyTypeId};
 /// // Declare a new set of crypto types using Ed25519 logic that identifies as `KeyTypeId`
 /// // of value `b"fuba"`.
 /// app_crypto!(ed25519, KeyTypeId(*b"_uba"));
@@ -61,8 +60,17 @@ pub use traits::*;
 macro_rules! app_crypto {
 	($module:ident, $key_type:expr) => {
 		$crate::app_crypto_public_full_crypto!($module::Public, $key_type, $module::CRYPTO_ID);
-		$crate::app_crypto_public_common!($module::Public, $module::Signature, $key_type, $module::CRYPTO_ID);
-		$crate::app_crypto_signature_full_crypto!($module::Signature, $key_type, $module::CRYPTO_ID);
+		$crate::app_crypto_public_common!(
+			$module::Public,
+			$module::Signature,
+			$key_type,
+			$module::CRYPTO_ID
+		);
+		$crate::app_crypto_signature_full_crypto!(
+			$module::Signature,
+			$key_type,
+			$module::CRYPTO_ID
+		);
 		$crate::app_crypto_signature_common!($module::Signature, $key_type);
 		$crate::app_crypto_pair!($module::Pair, $key_type, $module::CRYPTO_ID);
 	};
@@ -72,7 +80,7 @@ macro_rules! app_crypto {
 /// Application-specific types whose identifier is `$key_type`.
 ///
 /// ```rust
-///# use sp_application_crypto::{app_crypto, wrap, ed25519, KeyTypeId};
+/// # use sp_application_crypto::{app_crypto, wrap, ed25519, KeyTypeId};
 /// // Declare a new set of crypto types using Ed25519 logic that identifies as `KeyTypeId`
 /// // of value `b"fuba"`.
 /// app_crypto!(ed25519, KeyTypeId(*b"_uba"));
@@ -82,8 +90,17 @@ macro_rules! app_crypto {
 macro_rules! app_crypto {
 	($module:ident, $key_type:expr) => {
 		$crate::app_crypto_public_not_full_crypto!($module::Public, $key_type, $module::CRYPTO_ID);
-		$crate::app_crypto_public_common!($module::Public, $module::Signature, $key_type, $module::CRYPTO_ID);
-		$crate::app_crypto_signature_not_full_crypto!($module::Signature, $key_type, $module::CRYPTO_ID);
+		$crate::app_crypto_public_common!(
+			$module::Public,
+			$module::Signature,
+			$key_type,
+			$module::CRYPTO_ID
+		);
+		$crate::app_crypto_signature_not_full_crypto!(
+			$module::Signature,
+			$key_type,
+			$module::CRYPTO_ID
+		);
 		$crate::app_crypto_signature_common!($module::Signature, $key_type);
 	};
 }
@@ -93,7 +110,7 @@ macro_rules! app_crypto {
 #[macro_export]
 macro_rules! app_crypto_pair {
 	($pair:ty, $key_type:expr, $crypto_type:expr) => {
-		$crate::wrap!{
+		$crate::wrap! {
 			/// A generic `AppPublic` wrapper type over $pair crypto; this has no specific App.
 			#[derive(Clone)]
 			pub struct Pair($pair);
@@ -111,12 +128,16 @@ macro_rules! app_crypto_pair {
 
 			$crate::app_crypto_pair_functions_if_std!($pair);
 
-			fn derive<
-				Iter: Iterator<Item=$crate::DeriveJunction>
-			>(&self, path: Iter, seed: Option<Self::Seed>) -> Result<(Self, Option<Self::Seed>), Self::DeriveError> {
+			fn derive<Iter: Iterator<Item = $crate::DeriveJunction>>(
+				&self,
+				path: Iter,
+				seed: Option<Self::Seed>,
+			) -> Result<(Self, Option<Self::Seed>), Self::DeriveError> {
 				self.0.derive(path, seed).map(|x| (Self(x.0), x.1))
 			}
-			fn from_seed(seed: &Self::Seed) -> Self { Self(<$pair>::from_seed(seed)) }
+			fn from_seed(seed: &Self::Seed) -> Self {
+				Self(<$pair>::from_seed(seed))
+			}
 			fn from_seed_slice(seed: &[u8]) -> Result<Self, $crate::SecretStringError> {
 				<$pair>::from_seed_slice(seed).map(Self)
 			}
@@ -137,8 +158,12 @@ macro_rules! app_crypto_pair {
 			) -> bool {
 				<$pair>::verify_weak(sig, message, pubkey)
 			}
-			fn public(&self) -> Self::Public { Public(self.0.public()) }
-			fn to_raw_vec(&self) -> $crate::Vec<u8> { self.0.to_raw_vec() }
+			fn public(&self) -> Self::Public {
+				Public(self.0.public())
+			}
+			fn to_raw_vec(&self) -> $crate::Vec<u8> {
+				self.0.to_raw_vec()
+			}
 		}
 
 		impl $crate::AppKey for Pair {
@@ -167,22 +192,22 @@ macro_rules! app_crypto_pair_functions_if_std {
 			(Self(r.0), r.1, r.2)
 		}
 
-		fn from_phrase(phrase: &str, password: Option<&str>)
-			-> Result<(Self, Self::Seed), $crate::SecretStringError>
-		{
+		fn from_phrase(
+			phrase: &str,
+			password: Option<&str>,
+		) -> Result<(Self, Self::Seed), $crate::SecretStringError> {
 			<$pair>::from_phrase(phrase, password).map(|r| (Self(r.0), r.1))
 		}
-	}
+	};
 }
 
 #[doc(hidden)]
 #[cfg(not(feature = "std"))]
 #[macro_export]
 macro_rules! app_crypto_pair_functions_if_std {
-	($pair:ty) => {}
+	($pair:ty) => {};
 }
 
-
 /// Declares Public type which is functionally equivalent to `$public`, but is new
 /// Application-specific type whose identifier is `$key_type`.
 /// can only be used together with `full_crypto` feature
@@ -191,7 +216,7 @@ macro_rules! app_crypto_pair_functions_if_std {
 #[macro_export]
 macro_rules! app_crypto_public_full_crypto {
 	($public:ty, $key_type:expr, $crypto_type:expr) => {
-		$crate::wrap!{
+		$crate::wrap! {
 			/// A generic `AppPublic` wrapper type over $public crypto; this has no specific App.
 			#[derive(
 				Clone, Default, Eq, Hash, PartialEq, PartialOrd, Ord,
@@ -216,7 +241,7 @@ macro_rules! app_crypto_public_full_crypto {
 			const ID: $crate::KeyTypeId = $key_type;
 			const CRYPTO_ID: $crate::CryptoTypeId = $crypto_type;
 		}
-	}
+	};
 }
 
 /// Declares Public type which is functionally equivalent to `$public`, but is new
@@ -227,7 +252,7 @@ macro_rules! app_crypto_public_full_crypto {
 #[macro_export]
 macro_rules! app_crypto_public_not_full_crypto {
 	($public:ty, $key_type:expr, $crypto_type:expr) => {
-		$crate::wrap!{
+		$crate::wrap! {
 			/// A generic `AppPublic` wrapper type over $public crypto; this has no specific App.
 			#[derive(
 				Clone, Default, Eq, PartialEq, Ord, PartialOrd,
@@ -247,7 +272,7 @@ macro_rules! app_crypto_public_not_full_crypto {
 			const ID: $crate::KeyTypeId = $key_type;
 			const CRYPTO_ID: $crate::CryptoTypeId = $crypto_type;
 		}
-	}
+	};
 }
 
 /// Declares Public type which is functionally equivalent to `$public`, but is new
@@ -260,15 +285,21 @@ macro_rules! app_crypto_public_common {
 		$crate::app_crypto_public_common_if_std!();
 
 		impl AsRef<[u8]> for Public {
-			fn as_ref(&self) -> &[u8] { self.0.as_ref() }
+			fn as_ref(&self) -> &[u8] {
+				self.0.as_ref()
+			}
 		}
 
 		impl AsMut<[u8]> for Public {
-			fn as_mut(&mut self) -> &mut [u8] { self.0.as_mut() }
+			fn as_mut(&mut self) -> &mut [u8] {
+				self.0.as_mut()
+			}
 		}
 
 		impl $crate::Public for Public {
-			fn from_slice(x: &[u8]) -> Self { Self(<$public>::from_slice(x)) }
+			fn from_slice(x: &[u8]) -> Self {
+				Self(<$public>::from_slice(x))
+			}
 
 			fn to_public_crypto_pair(&self) -> $crate::CryptoTypePublicPair {
 				$crate::CryptoTypePublicPair($crypto_type, self.to_raw_vec())
@@ -279,14 +310,20 @@ macro_rules! app_crypto_public_common {
 			type Generic = $public;
 		}
 
-		impl $crate::RuntimeAppPublic for Public where $public: $crate::RuntimePublic<Signature=$sig> {
+		impl $crate::RuntimeAppPublic for Public
+		where
+			$public: $crate::RuntimePublic<Signature = $sig>,
+		{
 			const ID: $crate::KeyTypeId = $key_type;
 			const CRYPTO_ID: $crate::CryptoTypeId = $crypto_type;
 
 			type Signature = Signature;
 
 			fn all() -> $crate::Vec<Self> {
-				<$public as $crate::RuntimePublic>::all($key_type).into_iter().map(Self).collect()
+				<$public as $crate::RuntimePublic>::all($key_type)
+					.into_iter()
+					.map(Self)
+					.collect()
 			}
 
 			fn generate_pair(seed: Option<$crate::Vec<u8>>) -> Self {
@@ -294,11 +331,8 @@ macro_rules! app_crypto_public_common {
 			}
 
 			fn sign<M: AsRef<[u8]>>(&self, msg: &M) -> Option<Self::Signature> {
-				<$public as $crate::RuntimePublic>::sign(
-					self.as_ref(),
-					$key_type,
-					msg,
-				).map(Signature)
+				<$public as $crate::RuntimePublic>::sign(self.as_ref(), $key_type, msg)
+					.map(Signature)
 			}
 
 			fn verify<M: AsRef<[u8]>>(&self, msg: &M, signature: &Self::Signature) -> bool {
@@ -318,10 +352,7 @@ macro_rules! app_crypto_public_common {
 
 		impl From<&Public> for $crate::CryptoTypePublicPair {
 			fn from(key: &Public) -> Self {
-				$crate::CryptoTypePublicPair(
-					$crypto_type,
-					$crate::Public::to_raw_vec(key),
-				)
+				$crate::CryptoTypePublicPair($crypto_type, $crate::Public::to_raw_vec(key))
 			}
 		}
 
@@ -332,7 +363,7 @@ macro_rules! app_crypto_public_common {
 				<$public>::try_from(data).map(Into::into)
 			}
 		}
-	}
+	};
 }
 
 /// Implements traits for the public key type if `feature = "std"` is enabled.
@@ -342,8 +373,9 @@ macro_rules! app_crypto_public_common {
 macro_rules! app_crypto_public_common_if_std {
 	() => {
 		impl $crate::Derive for Public {
-			fn derive<Iter: Iterator<Item=$crate::DeriveJunction>>(&self,
-				path: Iter
+			fn derive<Iter: Iterator<Item = $crate::DeriveJunction>>(
+				&self,
+				path: Iter,
 			) -> Option<Self> {
 				self.0.derive(path).map(Self)
 			}
@@ -357,8 +389,9 @@ macro_rules! app_crypto_public_common_if_std {
 		}
 
 		impl $crate::serde::Serialize for Public {
-			fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error> where
-				S: $crate::serde::Serializer
+			fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
+			where
+				S: $crate::serde::Serializer,
 			{
 				use $crate::Ss58Codec;
 				serializer.serialize_str(&self.to_ss58check())
@@ -366,15 +399,16 @@ macro_rules! app_crypto_public_common_if_std {
 		}
 
 		impl<'de> $crate::serde::Deserialize<'de> for Public {
-			fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error> where
-				D: $crate::serde::Deserializer<'de>
+			fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
+			where
+				D: $crate::serde::Deserializer<'de>,
 			{
 				use $crate::Ss58Codec;
 				Public::from_ss58check(&String::deserialize(deserializer)?)
 					.map_err(|e| $crate::serde::de::Error::custom(format!("{:?}", e)))
 			}
 		}
-	}
+	};
 }
 
 #[cfg(not(feature = "std"))]
@@ -383,10 +417,9 @@ macro_rules! app_crypto_public_common_if_std {
 macro_rules! app_crypto_public_common_if_std {
 	() => {
 		impl $crate::Derive for Public {}
-	}
+	};
 }
 
-
 /// Declares Signature type which is functionally equivalent to `$sig`, but is new
 /// Application-specific type whose identifier is `$key_type`.
 /// can only be used together with `full_crypto` feature
@@ -418,7 +451,7 @@ macro_rules! app_crypto_signature_full_crypto {
 			const ID: $crate::KeyTypeId = $key_type;
 			const CRYPTO_ID: $crate::CryptoTypeId = $crypto_type;
 		}
-	}
+	};
 }
 
 /// Declares Signature type which is functionally equivalent to `$sig`, but is new
@@ -448,7 +481,7 @@ macro_rules! app_crypto_signature_not_full_crypto {
 			const ID: $crate::KeyTypeId = $key_type;
 			const CRYPTO_ID: $crate::CryptoTypeId = $crypto_type;
 		}
-	}
+	};
 }
 
 /// Declares Signature type which is functionally equivalent to `$sig`, but is new
@@ -461,11 +494,15 @@ macro_rules! app_crypto_signature_common {
 		impl $crate::Deref for Signature {
 			type Target = [u8];
 
-			fn deref(&self) -> &Self::Target { self.0.as_ref() }
+			fn deref(&self) -> &Self::Target {
+				self.0.as_ref()
+			}
 		}
 
 		impl AsRef<[u8]> for Signature {
-			fn as_ref(&self) -> &[u8] { self.0.as_ref() }
+			fn as_ref(&self) -> &[u8] {
+				self.0.as_ref()
+			}
 		}
 
 		impl $crate::AppSignature for Signature {
@@ -479,7 +516,7 @@ macro_rules! app_crypto_signature_common {
 				Ok(<$sig>::try_from(data.as_slice())?.into())
 			}
 		}
-	}
+	};
 }
 
 /// Implement bidirectional `From` and on-way `AsRef`/`AsMut` for two types, `$inner` and `$outer`.
@@ -547,10 +584,9 @@ macro_rules! with_pair {
 	}
 }
 
-
 #[doc(hidden)]
 #[macro_export]
 #[cfg(all(not(feature = "std"), not(feature = "full_crypto")))]
 macro_rules! with_pair {
-	( $( $def:tt )* ) => {}
+	( $( $def:tt )* ) => {};
 }
diff --git a/primitives/application-crypto/src/sr25519.rs b/primitives/application-crypto/src/sr25519.rs
index f3ce86785833..f51236f2ab38 100644
--- a/primitives/application-crypto/src/sr25519.rs
+++ b/primitives/application-crypto/src/sr25519.rs
@@ -17,7 +17,7 @@
 
 //! Sr25519 crypto types.
 
-use crate::{RuntimePublic, KeyTypeId};
+use crate::{KeyTypeId, RuntimePublic};
 
 use sp_std::vec::Vec;
 
@@ -33,9 +33,9 @@ mod app {
 	}
 }
 
-pub use app::{Public as AppPublic, Signature as AppSignature};
 #[cfg(feature = "full_crypto")]
 pub use app::Pair as AppPair;
+pub use app::{Public as AppPublic, Signature as AppSignature};
 
 impl RuntimePublic for Public {
 	type Signature = Signature;
diff --git a/primitives/application-crypto/src/traits.rs b/primitives/application-crypto/src/traits.rs
index 8daa866af63e..2f7fd139c018 100644
--- a/primitives/application-crypto/src/traits.rs
+++ b/primitives/application-crypto/src/traits.rs
@@ -19,7 +19,7 @@
 use sp_core::crypto::Pair;
 
 use codec::Codec;
-use sp_core::crypto::{KeyTypeId, CryptoType, CryptoTypeId, IsWrappedBy, Public};
+use sp_core::crypto::{CryptoType, CryptoTypeId, IsWrappedBy, KeyTypeId, Public};
 use sp_std::{fmt::Debug, vec::Vec};
 
 /// An application-specific key.
@@ -57,7 +57,7 @@ impl<T> MaybeHash for T {}
 
 /// Type which implements Debug and Hash in std, not when no-std (no-std variant with crypto).
 #[cfg(all(not(feature = "std"), feature = "full_crypto"))]
-pub trait MaybeDebugHash: sp_std::hash::Hash  {}
+pub trait MaybeDebugHash: sp_std::hash::Hash {}
 #[cfg(all(not(feature = "std"), feature = "full_crypto"))]
 impl<T: sp_std::hash::Hash> MaybeDebugHash for T {}
 
@@ -66,15 +66,23 @@ pub trait AppPublic:
 	AppKey + Public + Ord + PartialOrd + Eq + PartialEq + Debug + MaybeHash + codec::Codec
 {
 	/// The wrapped type which is just a plain instance of `Public`.
-	type Generic:
-		IsWrappedBy<Self> + Public + Ord + PartialOrd + Eq + PartialEq + Debug + MaybeHash + codec::Codec;
+	type Generic: IsWrappedBy<Self>
+		+ Public
+		+ Ord
+		+ PartialOrd
+		+ Eq
+		+ PartialEq
+		+ Debug
+		+ MaybeHash
+		+ codec::Codec;
 }
 
 /// A application's key pair.
 #[cfg(feature = "full_crypto")]
-pub trait AppPair: AppKey + Pair<Public=<Self as AppKey>::Public> {
+pub trait AppPair: AppKey + Pair<Public = <Self as AppKey>::Public> {
 	/// The wrapped type which is just a plain instance of `Pair`.
-	type Generic: IsWrappedBy<Self> + Pair<Public = <<Self as AppKey>::Public as AppPublic>::Generic>;
+	type Generic: IsWrappedBy<Self>
+		+ Pair<Public = <<Self as AppKey>::Public as AppPublic>::Generic>;
 }
 
 /// A application's signature.
diff --git a/primitives/application-crypto/test/src/ecdsa.rs b/primitives/application-crypto/test/src/ecdsa.rs
index 5ad10e79ef96..c4aa6a2afbd6 100644
--- a/primitives/application-crypto/test/src/ecdsa.rs
+++ b/primitives/application-crypto/test/src/ecdsa.rs
@@ -16,28 +16,22 @@
 // limitations under the License.
 
 //! Integration tests for ecdsa
-use std::sync::Arc;
+use sp_api::ProvideRuntimeApi;
+use sp_application_crypto::ecdsa::{AppPair, AppPublic};
+use sp_core::{crypto::Pair, testing::ECDSA};
+use sp_keystore::{testing::KeyStore, SyncCryptoStore};
 use sp_runtime::generic::BlockId;
-use sp_core::{
-	crypto::Pair,
-	testing::ECDSA,
-};
-use sp_keystore::{
-	SyncCryptoStore,
-	testing::KeyStore,
-};
+use std::sync::Arc;
 use substrate_test_runtime_client::{
-	TestClientBuilder, DefaultTestClientBuilderExt, TestClientBuilderExt,
-	runtime::TestAPI,
+	runtime::TestAPI, DefaultTestClientBuilderExt, TestClientBuilder, TestClientBuilderExt,
 };
-use sp_api::ProvideRuntimeApi;
-use sp_application_crypto::ecdsa::{AppPair, AppPublic};
 
 #[test]
 fn ecdsa_works_in_runtime() {
 	let keystore = Arc::new(KeyStore::new());
 	let test_client = TestClientBuilder::new().set_keystore(keystore.clone()).build();
-	let (signature, public) = test_client.runtime_api()
+	let (signature, public) = test_client
+		.runtime_api()
 		.test_ecdsa_crypto(&BlockId::Number(0))
 		.expect("Tests `ecdsa` crypto.");
 
diff --git a/primitives/application-crypto/test/src/ed25519.rs b/primitives/application-crypto/test/src/ed25519.rs
index 06b962f1902b..7cfd801388c7 100644
--- a/primitives/application-crypto/test/src/ed25519.rs
+++ b/primitives/application-crypto/test/src/ed25519.rs
@@ -17,28 +17,22 @@
 
 //! Integration tests for ed25519
 
-use std::sync::Arc;
+use sp_api::ProvideRuntimeApi;
+use sp_application_crypto::ed25519::{AppPair, AppPublic};
+use sp_core::{crypto::Pair, testing::ED25519};
+use sp_keystore::{testing::KeyStore, SyncCryptoStore};
 use sp_runtime::generic::BlockId;
-use sp_core::{
-	crypto::Pair,
-	testing::ED25519,
-};
-use sp_keystore::{
-	SyncCryptoStore,
-	testing::KeyStore,
-};
+use std::sync::Arc;
 use substrate_test_runtime_client::{
-	TestClientBuilder, DefaultTestClientBuilderExt, TestClientBuilderExt,
-	runtime::TestAPI,
+	runtime::TestAPI, DefaultTestClientBuilderExt, TestClientBuilder, TestClientBuilderExt,
 };
-use sp_api::ProvideRuntimeApi;
-use sp_application_crypto::ed25519::{AppPair, AppPublic};
 
 #[test]
 fn ed25519_works_in_runtime() {
 	let keystore = Arc::new(KeyStore::new());
 	let test_client = TestClientBuilder::new().set_keystore(keystore.clone()).build();
-	let (signature, public) = test_client.runtime_api()
+	let (signature, public) = test_client
+		.runtime_api()
 		.test_ed25519_crypto(&BlockId::Number(0))
 		.expect("Tests `ed25519` crypto.");
 
diff --git a/primitives/application-crypto/test/src/lib.rs b/primitives/application-crypto/test/src/lib.rs
index bee926f8dd8c..6b7734764e79 100644
--- a/primitives/application-crypto/test/src/lib.rs
+++ b/primitives/application-crypto/test/src/lib.rs
@@ -17,9 +17,9 @@
 
 //! Integration tests for application crypto
 
+#[cfg(test)]
+mod ecdsa;
 #[cfg(test)]
 mod ed25519;
 #[cfg(test)]
 mod sr25519;
-#[cfg(test)]
-mod ecdsa;
diff --git a/primitives/application-crypto/test/src/sr25519.rs b/primitives/application-crypto/test/src/sr25519.rs
index 889f662b6814..12dfbc609fb0 100644
--- a/primitives/application-crypto/test/src/sr25519.rs
+++ b/primitives/application-crypto/test/src/sr25519.rs
@@ -17,28 +17,22 @@
 
 //! Integration tests for sr25519
 
-use std::sync::Arc;
+use sp_api::ProvideRuntimeApi;
+use sp_application_crypto::sr25519::{AppPair, AppPublic};
+use sp_core::{crypto::Pair, testing::SR25519};
+use sp_keystore::{testing::KeyStore, SyncCryptoStore};
 use sp_runtime::generic::BlockId;
-use sp_core::{
-	crypto::Pair,
-	testing::SR25519,
-};
-use sp_keystore::{
-	SyncCryptoStore,
-	testing::KeyStore,
-};
+use std::sync::Arc;
 use substrate_test_runtime_client::{
-	TestClientBuilder, DefaultTestClientBuilderExt, TestClientBuilderExt,
-	runtime::TestAPI,
+	runtime::TestAPI, DefaultTestClientBuilderExt, TestClientBuilder, TestClientBuilderExt,
 };
-use sp_api::ProvideRuntimeApi;
-use sp_application_crypto::sr25519::{AppPair, AppPublic};
 
 #[test]
 fn sr25519_works_in_runtime() {
 	let keystore = Arc::new(KeyStore::new());
 	let test_client = TestClientBuilder::new().set_keystore(keystore.clone()).build();
-	let (signature, public) = test_client.runtime_api()
+	let (signature, public) = test_client
+		.runtime_api()
 		.test_sr25519_crypto(&BlockId::Number(0))
 		.expect("Tests `sr25519` crypto.");
 
diff --git a/primitives/arithmetic/benches/bench.rs b/primitives/arithmetic/benches/bench.rs
index fd535c1d2d0f..02db00aa0bf8 100644
--- a/primitives/arithmetic/benches/bench.rs
+++ b/primitives/arithmetic/benches/bench.rs
@@ -15,9 +15,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use criterion::{Criterion, Throughput, BenchmarkId, criterion_group, criterion_main};
-use sp_arithmetic::biguint::{BigUint, Single};
+use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
 use rand::Rng;
+use sp_arithmetic::biguint::{BigUint, Single};
 
 fn random_big_uint(size: usize) -> BigUint {
 	let mut rng = rand::thread_rng();
@@ -73,7 +73,7 @@ fn bench_division(c: &mut Criterion) {
 	}
 }
 
-criterion_group!{
+criterion_group! {
 	name = benches;
 	config = Criterion::default();
 	targets = bench_addition, bench_subtraction, bench_multiplication, bench_division
diff --git a/primitives/arithmetic/fuzzer/src/biguint.rs b/primitives/arithmetic/fuzzer/src/biguint.rs
index 57be7f534204..ca5b8379afff 100644
--- a/primitives/arithmetic/fuzzer/src/biguint.rs
+++ b/primitives/arithmetic/fuzzer/src/biguint.rs
@@ -60,8 +60,13 @@ fn main() {
 				let expected = ue.unwrap() + ve.unwrap();
 				let t = u.clone().add(&v);
 				assert_eq!(
-					u128::try_from(t.clone()).unwrap(), expected,
-					"{:?} + {:?} ===> {:?} != {:?}", u, v, t, expected,
+					u128::try_from(t.clone()).unwrap(),
+					expected,
+					"{:?} + {:?} ===> {:?} != {:?}",
+					u,
+					v,
+					t,
+					expected,
 				);
 			}
 
@@ -74,8 +79,13 @@ fn main() {
 					let t = t.unwrap();
 					let expected = expected.unwrap();
 					assert_eq!(
-						u128::try_from(t.clone()).unwrap(), expected,
-						"{:?} - {:?} ===> {:?} != {:?}", u, v, t, expected,
+						u128::try_from(t.clone()).unwrap(),
+						expected,
+						"{:?} - {:?} ===> {:?} != {:?}",
+						u,
+						v,
+						t,
+						expected,
 					);
 				}
 			}
@@ -84,31 +94,51 @@ fn main() {
 				let expected = ue.unwrap() * ve.unwrap();
 				let t = u.clone().mul(&v);
 				assert_eq!(
-					u128::try_from(t.clone()).unwrap(), expected,
-					"{:?} * {:?} ===> {:?} != {:?}", u, v, t, expected,
+					u128::try_from(t.clone()).unwrap(),
+					expected,
+					"{:?} * {:?} ===> {:?} != {:?}",
+					u,
+					v,
+					t,
+					expected,
 				);
 			}
 
 			if check_digit_lengths(&u, &v, 4) {
 				let (ue, ve) = (ue.unwrap(), ve.unwrap());
 				if ve == 0 {
-					return;
+					return
 				}
 				let (q, r) = (ue / ve, ue % ve);
 				if let Some((qq, rr)) = u.clone().div(&v, true) {
 					assert_eq!(
-						u128::try_from(qq.clone()).unwrap(), q,
-						"{:?} / {:?} ===> {:?} != {:?}", u, v, qq, q,
+						u128::try_from(qq.clone()).unwrap(),
+						q,
+						"{:?} / {:?} ===> {:?} != {:?}",
+						u,
+						v,
+						qq,
+						q,
 					);
 					assert_eq!(
-						u128::try_from(rr.clone()).unwrap(), r,
-						"{:?} % {:?} ===> {:?} != {:?}", u, v, rr, r,
+						u128::try_from(rr.clone()).unwrap(),
+						r,
+						"{:?} % {:?} ===> {:?} != {:?}",
+						u,
+						v,
+						rr,
+						r,
 					);
 				} else if v.len() == 1 {
 					let qq = u.clone().div_unit(ve as Single);
 					assert_eq!(
-						u128::try_from(qq.clone()).unwrap(), q,
-						"[single] {:?} / {:?} ===> {:?} != {:?}", u, v, qq, q,
+						u128::try_from(qq.clone()).unwrap(),
+						q,
+						"[single] {:?} / {:?} ===> {:?} != {:?}",
+						u,
+						v,
+						qq,
+						q,
 					);
 				} else if v.msb() != 0 && u.msb() != 0 && u.len() > v.len() {
 					panic!("div returned none for an unexpected reason");
@@ -175,7 +205,7 @@ fn assert_biguints_eq(a: &BigUint, b: &num_bigint::BigUint) {
 
 	// `num_bigint::BigUint` doesn't expose it's internals, so we need to convert into that to
 	// compare.
-	let limbs = (0 .. a.len()).map(|i| a.get(i)).collect();
+	let limbs = (0..a.len()).map(|i| a.get(i)).collect();
 	let num_a = num_bigint::BigUint::new(limbs);
 
 	assert!(&num_a == b, "\narithmetic: {:?}\nnum-bigint: {:?}", a, b);
diff --git a/primitives/arithmetic/fuzzer/src/fixed_point.rs b/primitives/arithmetic/fuzzer/src/fixed_point.rs
index db415ecb84c7..d8f058ae51e2 100644
--- a/primitives/arithmetic/fuzzer/src/fixed_point.rs
+++ b/primitives/arithmetic/fuzzer/src/fixed_point.rs
@@ -28,7 +28,7 @@
 //! [here](https://docs.rs/honggfuzz/).
 
 use honggfuzz::fuzz;
-use sp_arithmetic::{FixedPointNumber, FixedI64, traits::Saturating};
+use sp_arithmetic::{traits::Saturating, FixedI64, FixedPointNumber};
 
 fn main() {
 	loop {
@@ -38,7 +38,8 @@ fn main() {
 
 			// Check `from_rational` and division are consistent.
 			if y != 0 {
-				let f1 = FixedI64::saturating_from_integer(x) / FixedI64::saturating_from_integer(y);
+				let f1 =
+					FixedI64::saturating_from_integer(x) / FixedI64::saturating_from_integer(y);
 				let f2 = FixedI64::saturating_from_rational(x, y);
 				assert_eq!(f1.into_inner(), f2.into_inner());
 			}
@@ -75,7 +76,8 @@ fn main() {
 			let a = FixedI64::saturating_from_rational(2, 5);
 			let b = a.saturating_mul_acc_int(x);
 			let xx = FixedI64::saturating_from_integer(x);
-			let d = a.saturating_mul(xx).saturating_add(xx).into_inner() as i128 / FixedI64::accuracy() as i128;
+			let d = a.saturating_mul(xx).saturating_add(xx).into_inner() as i128 /
+				FixedI64::accuracy() as i128;
 			assert_eq!(b, d);
 		});
 	}
diff --git a/primitives/arithmetic/fuzzer/src/multiply_by_rational.rs b/primitives/arithmetic/fuzzer/src/multiply_by_rational.rs
index a1689716b56c..d829a93ad4bb 100644
--- a/primitives/arithmetic/fuzzer/src/multiply_by_rational.rs
+++ b/primitives/arithmetic/fuzzer/src/multiply_by_rational.rs
@@ -60,7 +60,7 @@ fn main() {
 fn mul_div(a: u128, b: u128, c: u128) -> u128 {
 	use primitive_types::U256;
 	if a.is_zero() {
-		return Zero::zero();
+		return Zero::zero()
 	}
 	let c = c.max(1);
 
diff --git a/primitives/arithmetic/fuzzer/src/normalize.rs b/primitives/arithmetic/fuzzer/src/normalize.rs
index 48d52ba71bab..7f9f8cb3c79e 100644
--- a/primitives/arithmetic/fuzzer/src/normalize.rs
+++ b/primitives/arithmetic/fuzzer/src/normalize.rs
@@ -15,7 +15,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-
 //! # Running
 //! Running this fuzzer can be done with `cargo hfuzz run normalize`. `honggfuzz` CLI options can
 //! be used by setting `HFUZZ_RUN_ARGS`, such as `-n 4` to use 4 threads.
@@ -37,7 +36,9 @@ fn main() {
 	loop {
 		fuzz!(|data: (Vec<Ty>, Ty)| {
 			let (data, norm) = data;
-			if data.len() == 0 { return; }
+			if data.len() == 0 {
+				return
+			}
 			let pre_sum: u128 = data.iter().map(|x| *x as u128).sum();
 
 			let normalized = data.normalize(norm);
@@ -50,13 +51,7 @@ fn main() {
 					let sum: u128 = normalized.iter().map(|x| *x as u128).sum();
 
 					// if this function returns Ok(), then it will ALWAYS be accurate.
-					assert_eq!(
-						sum,
-						norm as u128,
-						"sums don't match {:?}, {}",
-						normalized,
-						norm,
-					);
+					assert_eq!(sum, norm as u128, "sums don't match {:?}, {}", normalized, norm,);
 				} else {
 					panic!("Should have returned Ok for input = {:?}, target = {:?}", data, norm);
 				}
diff --git a/primitives/arithmetic/fuzzer/src/per_thing_rational.rs b/primitives/arithmetic/fuzzer/src/per_thing_rational.rs
index 47ba5a480305..c7f6a14c5f79 100644
--- a/primitives/arithmetic/fuzzer/src/per_thing_rational.rs
+++ b/primitives/arithmetic/fuzzer/src/per_thing_rational.rs
@@ -24,16 +24,11 @@
 //! `cargo hfuzz run-debug per_thing_rational hfuzz_workspace/per_thing_rational/*.fuzz`.
 
 use honggfuzz::fuzz;
-use sp_arithmetic::{
-	PerThing, PerU16, Percent, Perbill, Perquintill, traits::SaturatedConversion,
-};
+use sp_arithmetic::{traits::SaturatedConversion, PerThing, PerU16, Perbill, Percent, Perquintill};
 
 fn main() {
 	loop {
-		fuzz!(|
-			data: ((u16, u16), (u32, u32), (u64, u64))
-		| {
-
+		fuzz!(|data: ((u16, u16), (u32, u32), (u64, u64))| {
 			let (u16_pair, u32_pair, u64_pair) = data;
 
 			// peru16
@@ -109,7 +104,6 @@ fn main() {
 				Perquintill::from_float(smaller as f64 / bigger.max(1) as f64),
 				1000,
 			);
-
 		})
 	}
 }
diff --git a/primitives/arithmetic/src/biguint.rs b/primitives/arithmetic/src/biguint.rs
index 859cf829246f..2360151dafad 100644
--- a/primitives/arithmetic/src/biguint.rs
+++ b/primitives/arithmetic/src/biguint.rs
@@ -7,7 +7,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//	http://www.apache.org/licenses/LICENSE-2.0
+// 	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,9 +17,9 @@
 
 //! Infinite precision unsigned integer for substrate runtime.
 
-use num_traits::{Zero, One};
-use sp_std::{cmp::Ordering, ops, prelude::*, vec, cell::RefCell, convert::TryFrom};
-use codec::{Encode, Decode};
+use codec::{Decode, Encode};
+use num_traits::{One, Zero};
+use sp_std::{cell::RefCell, cmp::Ordering, convert::TryFrom, ops, prelude::*, vec};
 
 // A sensible value for this would be half of the dword size of the host machine. Since the
 // runtime is compiled to 32bit webassembly, using 32 and 64 for single and double respectively
@@ -105,7 +105,9 @@ impl BigUint {
 	}
 
 	/// Number of limbs.
-	pub fn len(&self) -> usize { self.digits.len() }
+	pub fn len(&self) -> usize {
+		self.digits.len()
+	}
 
 	/// A naive getter for limb at `index`. Note that the order is lsb -> msb.
 	///
@@ -156,7 +158,9 @@ impl BigUint {
 		// by definition, a big-int number should never have leading zero limbs. This function
 		// has the ability to cause this. There is nothing to do if the number already has 1
 		// limb only. call it a day and return.
-		if self.len().is_zero() { return; }
+		if self.len().is_zero() {
+			return
+		}
 		let index = self.digits.iter().position(|&elem| elem != 0).unwrap_or(self.len() - 1);
 
 		if index > 0 {
@@ -168,7 +172,9 @@ impl BigUint {
 	/// is already bigger than `size` limbs.
 	pub fn lpad(&mut self, size: usize) {
 		let n = self.len();
-		if n >= size { return; }
+		if n >= size {
+			return
+		}
 		let pad = size - n;
 		let mut new_digits = (0..pad).map(|_| 0).collect::<Vec<Single>>();
 		new_digits.extend(self.digits.iter());
@@ -260,15 +266,15 @@ impl BigUint {
 			if self.get(j) == 0 {
 				// Note: `with_capacity` allocates with 0. Explicitly set j + m to zero if
 				// otherwise.
-				continue;
+				continue
 			}
 
 			let mut k = 0;
 			for i in 0..m {
 				// PROOF: (B−1) × (B−1) + (B−1) + (B−1) = B^2 −1 < B^2. addition is safe.
-				let t = mul_single(self.get(j), other.get(i))
-					+ Double::from(w.get(i + j))
-					+ Double::from(k);
+				let t = mul_single(self.get(j), other.get(i)) +
+					Double::from(w.get(i + j)) +
+					Double::from(k);
 				w.set(i + j, (t % B) as Single);
 				// PROOF: (B^2 - 1) / B < B. conversion is safe.
 				k = (t / B) as Single;
@@ -288,9 +294,9 @@ impl BigUint {
 		let mut out = Self::with_capacity(n);
 		let mut r: Single = 0;
 		// PROOF: (B-1) * B + (B-1) still fits in double
-		let with_r = |x: Single, r: Single| { Double::from(r) * B + Double::from(x) };
+		let with_r = |x: Single, r: Single| Double::from(r) * B + Double::from(x);
 		for d in (0..n).rev() {
-			let (q, rr) = div_single(with_r(self.get(d), r), other) ;
+			let (q, rr) = div_single(with_r(self.get(d), r), other);
 			out.set(d, q as Single);
 			r = rr;
 		}
@@ -311,11 +317,7 @@ impl BigUint {
 	///
 	/// Taken from "The Art of Computer Programming" by D.E. Knuth, vol 2, chapter 4.
 	pub fn div(self, other: &Self, rem: bool) -> Option<(Self, Self)> {
-		if other.len() <= 1
-			|| other.msb() == 0
-			|| self.msb() == 0
-			|| self.len() <= other.len()
-		{
+		if other.len() <= 1 || other.msb() == 0 || self.msb() == 0 || self.len() <= other.len() {
 			return None
 		}
 		let n = other.len();
@@ -344,9 +346,7 @@ impl BigUint {
 				// PROOF: this always fits into `Double`. In the context of Single = u8, and
 				// Double = u16, think of 255 * 256 + 255 which is just u16::MAX.
 				let dividend =
-					Double::from(self_norm.get(j + n))
-						* B
-						+ Double::from(self_norm.get(j + n - 1));
+					Double::from(self_norm.get(j + n)) * B + Double::from(self_norm.get(j + n - 1));
 				let divisor = other_norm.get(n - 1);
 				div_single(dividend, divisor)
 			};
@@ -377,23 +377,30 @@ impl BigUint {
 
 			test();
 			while (*rhat.borrow() as Double) < B {
-				if !test() { break; }
+				if !test() {
+					break
+				}
 			}
 
 			let qhat = qhat.into_inner();
 			// we don't need rhat anymore. just let it go out of scope when it does.
 
 			// step D4
-			let lhs = Self { digits: (j..=j+n).rev().map(|d| self_norm.get(d)).collect() };
+			let lhs = Self { digits: (j..=j + n).rev().map(|d| self_norm.get(d)).collect() };
 			let rhs = other_norm.clone().mul(&Self::from(qhat));
 
 			let maybe_sub = lhs.sub(&rhs);
 			let mut negative = false;
 			let sub = match maybe_sub {
 				Ok(t) => t,
-				Err(t) => { negative = true; t }
+				Err(t) => {
+					negative = true;
+					t
+				},
 			};
-			(j..=j+n).for_each(|d| { self_norm.set(d, sub.get(d - j)); });
+			(j..=j + n).for_each(|d| {
+				self_norm.set(d, sub.get(d - j));
+			});
 
 			// step D5
 			// PROOF: the `test()` specifically decreases qhat until it is below `B`. conversion
@@ -403,9 +410,11 @@ impl BigUint {
 			// step D6: add back if negative happened.
 			if negative {
 				q.set(j, q.get(j) - 1);
-				let u = Self { digits: (j..=j+n).rev().map(|d| self_norm.get(d)).collect() };
+				let u = Self { digits: (j..=j + n).rev().map(|d| self_norm.get(d)).collect() };
 				let r = other_norm.clone().add(&u);
-				(j..=j+n).rev().for_each(|d| { self_norm.set(d, r.get(d - j)); })
+				(j..=j + n).rev().for_each(|d| {
+					self_norm.set(d, r.get(d - j));
+				})
 			}
 		}
 
@@ -415,9 +424,8 @@ impl BigUint {
 			if normalizer_bits > 0 {
 				let s = SHIFT as u32;
 				let nb = normalizer_bits;
-				for d in 0..n-1 {
-					let v = self_norm.get(d) >> nb
-						| self_norm.get(d + 1).overflowing_shl(s - nb).0;
+				for d in 0..n - 1 {
+					let v = self_norm.get(d) >> nb | self_norm.get(d + 1).overflowing_shl(s - nb).0;
 					r.set(d, v);
 				}
 				r.set(n - 1, self_norm.get(n - 1) >> normalizer_bits);
@@ -445,7 +453,6 @@ impl sp_std::fmt::Debug for BigUint {
 	fn fmt(&self, _: &mut sp_std::fmt::Formatter<'_>) -> sp_std::fmt::Result {
 		Ok(())
 	}
-
 }
 
 impl PartialEq for BigUint {
@@ -475,7 +482,7 @@ impl Ord for BigUint {
 					Ordering::Equal => lhs.cmp(rhs),
 					_ => len_cmp,
 				}
-			}
+			},
 		}
 	}
 }
@@ -632,18 +639,9 @@ pub mod tests {
 
 	#[test]
 	fn equality_works() {
-		assert_eq!(
-			BigUint { digits: vec![1, 2, 3] } == BigUint { digits: vec![1, 2, 3] },
-			true,
-		);
-		assert_eq!(
-			BigUint { digits: vec![3, 2, 3] } == BigUint { digits: vec![1, 2, 3] },
-			false,
-		);
-		assert_eq!(
-			BigUint { digits: vec![0, 1, 2, 3] } == BigUint { digits: vec![1, 2, 3] },
-			true,
-		);
+		assert_eq!(BigUint { digits: vec![1, 2, 3] } == BigUint { digits: vec![1, 2, 3] }, true,);
+		assert_eq!(BigUint { digits: vec![3, 2, 3] } == BigUint { digits: vec![1, 2, 3] }, false,);
+		assert_eq!(BigUint { digits: vec![0, 1, 2, 3] } == BigUint { digits: vec![1, 2, 3] }, true,);
 	}
 
 	#[test]
@@ -669,14 +667,8 @@ pub mod tests {
 		use sp_std::convert::TryFrom;
 		assert_eq!(u64::try_from(with_limbs(1)).unwrap(), 1);
 		assert_eq!(u64::try_from(with_limbs(2)).unwrap(), u32::MAX as u64 + 2);
-		assert_eq!(
-			u64::try_from(with_limbs(3)).unwrap_err(),
-			"cannot fit a number into u64",
-		);
-		assert_eq!(
-			u128::try_from(with_limbs(3)).unwrap(),
-			u32::MAX as u128 + u64::MAX as u128 + 3
-		);
+		assert_eq!(u64::try_from(with_limbs(3)).unwrap_err(), "cannot fit a number into u64",);
+		assert_eq!(u128::try_from(with_limbs(3)).unwrap(), u32::MAX as u128 + u64::MAX as u128 + 3);
 	}
 
 	#[test]
diff --git a/primitives/arithmetic/src/fixed_point.rs b/primitives/arithmetic/src/fixed_point.rs
index 9c5078ca66f0..1515573b4674 100644
--- a/primitives/arithmetic/src/fixed_point.rs
+++ b/primitives/arithmetic/src/fixed_point.rs
@@ -17,22 +17,38 @@
 
 //! Decimal Fixed Point implementations for Substrate runtime.
 
-use sp_std::{ops::{self, Add, Sub, Mul, Div}, fmt::Debug, prelude::*, convert::{TryInto, TryFrom}};
-use codec::{Encode, Decode, CompactAs};
 use crate::{
-	helpers_128bit::multiply_by_rational, PerThing,
+	helpers_128bit::multiply_by_rational,
 	traits::{
-		SaturatedConversion, CheckedSub, CheckedAdd, CheckedMul, CheckedDiv, CheckedNeg,
-		Bounded, Saturating, UniqueSaturatedInto, Zero, One
+		Bounded, CheckedAdd, CheckedDiv, CheckedMul, CheckedNeg, CheckedSub, One,
+		SaturatedConversion, Saturating, UniqueSaturatedInto, Zero,
 	},
+	PerThing,
+};
+use codec::{CompactAs, Decode, Encode};
+use sp_std::{
+	convert::{TryFrom, TryInto},
+	fmt::Debug,
+	ops::{self, Add, Div, Mul, Sub},
+	prelude::*,
 };
 
 #[cfg(feature = "std")]
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 
 /// Integer types that can be used to interact with `FixedPointNumber` implementations.
-pub trait FixedPointOperand: Copy + Clone + Bounded + Zero + Saturating
-	+ PartialOrd + UniqueSaturatedInto<u128> + TryFrom<u128> + CheckedNeg {}
+pub trait FixedPointOperand:
+	Copy
+	+ Clone
+	+ Bounded
+	+ Zero
+	+ Saturating
+	+ PartialOrd
+	+ UniqueSaturatedInto<u128>
+	+ TryFrom<u128>
+	+ CheckedNeg
+{
+}
 
 impl FixedPointOperand for i128 {}
 impl FixedPointOperand for u128 {}
@@ -53,11 +69,26 @@ impl FixedPointOperand for u8 {}
 /// to `Self::Inner::max_value() / Self::DIV`.
 /// This is also referred to as the _accuracy_ of the type in the documentation.
 pub trait FixedPointNumber:
-	Sized + Copy + Default + Debug
-	+ Saturating + Bounded
-	+ Eq + PartialEq + Ord + PartialOrd
-	+ CheckedSub + CheckedAdd + CheckedMul + CheckedDiv
-	+ Add + Sub + Div + Mul + Zero + One
+	Sized
+	+ Copy
+	+ Default
+	+ Debug
+	+ Saturating
+	+ Bounded
+	+ Eq
+	+ PartialEq
+	+ Ord
+	+ PartialOrd
+	+ CheckedSub
+	+ CheckedAdd
+	+ CheckedMul
+	+ CheckedDiv
+	+ Add
+	+ Sub
+	+ Div
+	+ Mul
+	+ Zero
+	+ One
 {
 	/// The underlying data type used for this fixed point number.
 	type Inner: Debug + One + CheckedMul + CheckedDiv + FixedPointOperand;
@@ -108,7 +139,10 @@ pub trait FixedPointNumber:
 	/// Creates `self` from a rational number. Equal to `n / d`.
 	///
 	/// Returns `None` if `d == 0` or `n / d` exceeds accuracy.
-	fn checked_from_rational<N: FixedPointOperand, D: FixedPointOperand>(n: N, d: D) -> Option<Self> {
+	fn checked_from_rational<N: FixedPointOperand, D: FixedPointOperand>(
+		n: N,
+		d: D,
+	) -> Option<Self> {
 		if d == D::zero() {
 			return None
 		}
@@ -117,7 +151,8 @@ pub trait FixedPointNumber:
 		let d: I129 = d.into();
 		let negative = n.negative != d.negative;
 
-		multiply_by_rational(n.value, Self::DIV.unique_saturated_into(), d.value).ok()
+		multiply_by_rational(n.value, Self::DIV.unique_saturated_into(), d.value)
+			.ok()
 			.and_then(|value| from_i129(I129 { value, negative }))
 			.map(Self::from_inner)
 	}
@@ -130,7 +165,8 @@ pub trait FixedPointNumber:
 		let rhs: I129 = n.into();
 		let negative = lhs.negative != rhs.negative;
 
-		multiply_by_rational(lhs.value, rhs.value, Self::DIV.unique_saturated_into()).ok()
+		multiply_by_rational(lhs.value, rhs.value, Self::DIV.unique_saturated_into())
+			.ok()
 			.and_then(|value| from_i129(I129 { value, negative }))
 	}
 
@@ -149,7 +185,8 @@ pub trait FixedPointNumber:
 		let rhs: I129 = d.into();
 		let negative = lhs.negative != rhs.negative;
 
-		lhs.value.checked_div(rhs.value)
+		lhs.value
+			.checked_div(rhs.value)
 			.and_then(|n| n.checked_div(Self::DIV.unique_saturated_into()))
 			.and_then(|value| from_i129(I129 { value, negative }))
 	}
@@ -212,7 +249,8 @@ pub trait FixedPointNumber:
 
 	/// Returns the integer part.
 	fn trunc(self) -> Self {
-		self.into_inner().checked_div(&Self::DIV)
+		self.into_inner()
+			.checked_div(&Self::DIV)
 			.expect("panics only if DIV is zero, DIV is not zero; qed")
 			.checked_mul(&Self::DIV)
 			.map(Self::from_inner)
@@ -281,7 +319,8 @@ struct I129 {
 impl<N: FixedPointOperand> From<N> for I129 {
 	fn from(n: N) -> I129 {
 		if n < N::zero() {
-			let value: u128 = n.checked_neg()
+			let value: u128 = n
+				.checked_neg()
 				.map(|n| n.unique_saturated_into())
 				.unwrap_or_else(|| N::max_value().unique_saturated_into().saturating_add(1));
 			I129 { value, negative: true }
@@ -322,9 +361,10 @@ macro_rules! implement_fixed {
 		$title:expr $(,)?
 	) => {
 		/// A fixed point number representation in the range.
-		///
 		#[doc = $title]
-		#[derive(Encode, Decode, CompactAs, Default, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
+		#[derive(
+			Encode, Decode, CompactAs, Default, Copy, Clone, PartialEq, Eq, PartialOrd, Ord,
+		)]
 		pub struct $name($inner_type);
 
 		impl From<$inner_type> for $name {
@@ -386,7 +426,7 @@ macro_rules! implement_fixed {
 
 			fn saturating_pow(self, exp: usize) -> Self {
 				if exp == 0 {
-					return Self::saturating_from_integer(1);
+					return Self::saturating_from_integer(1)
 				}
 
 				let exp = exp as u32;
@@ -471,7 +511,8 @@ macro_rules! implement_fixed {
 				let rhs: I129 = other.0.into();
 				let negative = lhs.negative != rhs.negative;
 
-				multiply_by_rational(lhs.value, Self::DIV as u128, rhs.value).ok()
+				multiply_by_rational(lhs.value, Self::DIV as u128, rhs.value)
+					.ok()
 					.and_then(|value| from_i129(I129 { value, negative }))
 					.map(Self)
 			}
@@ -483,7 +524,8 @@ macro_rules! implement_fixed {
 				let rhs: I129 = other.0.into();
 				let negative = lhs.negative != rhs.negative;
 
-				multiply_by_rational(lhs.value, rhs.value, Self::DIV as u128).ok()
+				multiply_by_rational(lhs.value, rhs.value, Self::DIV as u128)
+					.ok()
 					.and_then(|value| from_i129(I129 { value, negative }))
 					.map(Self)
 			}
@@ -524,7 +566,11 @@ macro_rules! implement_fixed {
 					format!("{}{}", signum_for_zero, int)
 				};
 				let precision = (Self::accuracy() as f64).log10() as usize;
-				let fractional = format!("{:0>weight$}", ((self.0 % Self::accuracy()) as i128).abs(), weight=precision);
+				let fractional = format!(
+					"{:0>weight$}",
+					((self.0 % Self::accuracy()) as i128).abs(),
+					weight = precision
+				);
 				write!(f, "{}({}.{})", stringify!($name), integral, fractional)
 			}
 
@@ -534,7 +580,10 @@ macro_rules! implement_fixed {
 			}
 		}
 
-		impl<P: PerThing> From<P> for $name where P::Inner: FixedPointOperand {
+		impl<P: PerThing> From<P> for $name
+		where
+			P::Inner: FixedPointOperand,
+		{
 			fn from(p: P) -> Self {
 				let accuracy = P::ACCURACY;
 				let value = p.deconstruct();
@@ -554,8 +603,8 @@ macro_rules! implement_fixed {
 			type Err = &'static str;
 
 			fn from_str(s: &str) -> Result<Self, Self::Err> {
-				let inner: <Self as FixedPointNumber>::Inner = s.parse()
-					.map_err(|_| "invalid string input for fixed point number")?;
+				let inner: <Self as FixedPointNumber>::Inner =
+					s.parse().map_err(|_| "invalid string input for fixed point number")?;
 				Ok(Self::from_inner(inner))
 			}
 		}
@@ -610,50 +659,32 @@ macro_rules! implement_fixed {
 
 			#[test]
 			fn from_i129_works() {
-				let a = I129 {
-					value: 1,
-					negative: true,
-				};
+				let a = I129 { value: 1, negative: true };
 
 				// Can't convert negative number to unsigned.
 				assert_eq!(from_i129::<u128>(a), None);
 
-				let a = I129 {
-					value: u128::MAX - 1,
-					negative: false,
-				};
+				let a = I129 { value: u128::MAX - 1, negative: false };
 
 				// Max - 1 value fits.
 				assert_eq!(from_i129::<u128>(a), Some(u128::MAX - 1));
 
-				let a = I129 {
-					value: u128::MAX,
-					negative: false,
-				};
+				let a = I129 { value: u128::MAX, negative: false };
 
 				// Max value fits.
 				assert_eq!(from_i129::<u128>(a), Some(u128::MAX));
 
-				let a = I129 {
-					value: i128::MAX as u128 + 1,
-					negative: true,
-				};
+				let a = I129 { value: i128::MAX as u128 + 1, negative: true };
 
 				// Min value fits.
 				assert_eq!(from_i129::<i128>(a), Some(i128::MIN));
 
-				let a = I129 {
-					value: i128::MAX as u128 + 1,
-					negative: false,
-				};
+				let a = I129 { value: i128::MAX as u128 + 1, negative: false };
 
 				// Max + 1 does not fit.
 				assert_eq!(from_i129::<i128>(a), None);
 
-				let a = I129 {
-					value: i128::MAX as u128,
-					negative: false,
-				};
+				let a = I129 { value: i128::MAX as u128, negative: false };
 
 				// Max value fits.
 				assert_eq!(from_i129::<i128>(a), Some(i128::MAX));
@@ -724,7 +755,6 @@ macro_rules! implement_fixed {
 
 					// Min.
 					assert_eq!($name::max_value(), b);
-
 				}
 			}
 
@@ -849,8 +879,7 @@ macro_rules! implement_fixed {
 				let accuracy = $name::accuracy();
 
 				// Case where integer fits.
-				let a = $name::checked_from_integer(42)
-					.expect("42 * accuracy <= inner_max; qed");
+				let a = $name::checked_from_integer(42).expect("42 * accuracy <= inner_max; qed");
 				assert_eq!(a.into_inner(), 42 * accuracy);
 
 				// Max integer that fit.
@@ -928,7 +957,7 @@ macro_rules! implement_fixed {
 				if $name::SIGNED {
 					// Negative case: -2.5
 					let a = $name::saturating_from_rational(-5, 2);
-					assert_eq!(a.into_inner(),  0 - 25 * accuracy / 10);
+					assert_eq!(a.into_inner(), 0 - 25 * accuracy / 10);
 
 					// Other negative case: -2.5
 					let a = $name::saturating_from_rational(5, -2);
@@ -1048,7 +1077,10 @@ macro_rules! implement_fixed {
 
 				if $name::SIGNED {
 					// Min - 1 => Underflow => None.
-					let a = $name::checked_from_rational(inner_max as u128 + 2, 0.saturating_sub(accuracy));
+					let a = $name::checked_from_rational(
+						inner_max as u128 + 2,
+						0.saturating_sub(accuracy),
+					);
 					assert_eq!(a, None);
 
 					let a = $name::checked_from_rational(inner_max, 0 - 3 * accuracy).unwrap();
@@ -1163,15 +1195,15 @@ macro_rules! implement_fixed {
 
 				// Max - 1.
 				let b = $name::from_inner(inner_max - 1);
-				assert_eq!(a.checked_mul(&(b/2.into())), Some(b));
+				assert_eq!(a.checked_mul(&(b / 2.into())), Some(b));
 
 				// Max.
 				let c = $name::from_inner(inner_max);
-				assert_eq!(a.checked_mul(&(c/2.into())), Some(b));
+				assert_eq!(a.checked_mul(&(c / 2.into())), Some(b));
 
 				// Max + 1 => None.
 				let e = $name::from_inner(1);
-				assert_eq!(a.checked_mul(&(c/2.into()+e)), None);
+				assert_eq!(a.checked_mul(&(c / 2.into() + e)), None);
 
 				if $name::SIGNED {
 					// Min + 1.
@@ -1192,8 +1224,14 @@ macro_rules! implement_fixed {
 					let b = $name::saturating_from_rational(1, -2);
 
 					assert_eq!(b.checked_mul(&42.into()), Some(0.saturating_sub(21).into()));
-					assert_eq!(b.checked_mul(&$name::max_value()), $name::max_value().checked_div(&0.saturating_sub(2).into()));
-					assert_eq!(b.checked_mul(&$name::min_value()), $name::min_value().checked_div(&0.saturating_sub(2).into()));
+					assert_eq!(
+						b.checked_mul(&$name::max_value()),
+						$name::max_value().checked_div(&0.saturating_sub(2).into())
+					);
+					assert_eq!(
+						b.checked_mul(&$name::min_value()),
+						$name::min_value().checked_div(&0.saturating_sub(2).into())
+					);
 					assert_eq!(c.checked_mul(&$name::min_value()), None);
 				}
 
@@ -1203,8 +1241,14 @@ macro_rules! implement_fixed {
 				assert_eq!(a.checked_mul(&42.into()), Some(21.into()));
 				assert_eq!(c.checked_mul(&2.into()), Some(510.into()));
 				assert_eq!(c.checked_mul(&$name::max_value()), None);
-				assert_eq!(a.checked_mul(&$name::max_value()), $name::max_value().checked_div(&2.into()));
-				assert_eq!(a.checked_mul(&$name::min_value()), $name::min_value().checked_div(&2.into()));
+				assert_eq!(
+					a.checked_mul(&$name::max_value()),
+					$name::max_value().checked_div(&2.into())
+				);
+				assert_eq!(
+					a.checked_mul(&$name::min_value()),
+					$name::min_value().checked_div(&2.into())
+				);
 			}
 
 			#[test]
@@ -1230,13 +1274,25 @@ macro_rules! implement_fixed {
 
 				if b < c {
 					// Not executed by unsigned inners.
-					assert_eq!(a.checked_div_int(0.saturating_sub(2)), Some(0.saturating_sub(inner_max / (2 * accuracy))));
-					assert_eq!(a.checked_div_int(0.saturating_sub(inner_max / accuracy)), Some(0.saturating_sub(1)));
+					assert_eq!(
+						a.checked_div_int(0.saturating_sub(2)),
+						Some(0.saturating_sub(inner_max / (2 * accuracy)))
+					);
+					assert_eq!(
+						a.checked_div_int(0.saturating_sub(inner_max / accuracy)),
+						Some(0.saturating_sub(1))
+					);
 					assert_eq!(b.checked_div_int(i128::MIN), Some(0));
 					assert_eq!(b.checked_div_int(inner_min / accuracy), Some(1));
 					assert_eq!(b.checked_div_int(1i8), None);
-					assert_eq!(b.checked_div_int(0.saturating_sub(2)), Some(0.saturating_sub(inner_min / (2 * accuracy))));
-					assert_eq!(b.checked_div_int(0.saturating_sub(inner_min / accuracy)), Some(0.saturating_sub(1)));
+					assert_eq!(
+						b.checked_div_int(0.saturating_sub(2)),
+						Some(0.saturating_sub(inner_min / (2 * accuracy)))
+					);
+					assert_eq!(
+						b.checked_div_int(0.saturating_sub(inner_min / accuracy)),
+						Some(0.saturating_sub(1))
+					);
 					assert_eq!(c.checked_div_int(i128::MIN), Some(0));
 					assert_eq!(d.checked_div_int(i32::MIN), Some(0));
 				}
@@ -1294,7 +1350,10 @@ macro_rules! implement_fixed {
 
 				if $name::SIGNED {
 					assert_eq!($name::from_inner(inner_min).saturating_abs(), $name::max_value());
-					assert_eq!($name::saturating_from_rational(-1, 2).saturating_abs(), (1, 2).into());
+					assert_eq!(
+						$name::saturating_from_rational(-1, 2).saturating_abs(),
+						(1, 2).into()
+					);
 				}
 			}
 
@@ -1319,31 +1378,72 @@ macro_rules! implement_fixed {
 
 			#[test]
 			fn saturating_pow_should_work() {
-				assert_eq!($name::saturating_from_integer(2).saturating_pow(0), $name::saturating_from_integer(1));
-				assert_eq!($name::saturating_from_integer(2).saturating_pow(1), $name::saturating_from_integer(2));
-				assert_eq!($name::saturating_from_integer(2).saturating_pow(2), $name::saturating_from_integer(4));
-				assert_eq!($name::saturating_from_integer(2).saturating_pow(3), $name::saturating_from_integer(8));
-				assert_eq!($name::saturating_from_integer(2).saturating_pow(50),
-					$name::saturating_from_integer(1125899906842624i64));
+				assert_eq!(
+					$name::saturating_from_integer(2).saturating_pow(0),
+					$name::saturating_from_integer(1)
+				);
+				assert_eq!(
+					$name::saturating_from_integer(2).saturating_pow(1),
+					$name::saturating_from_integer(2)
+				);
+				assert_eq!(
+					$name::saturating_from_integer(2).saturating_pow(2),
+					$name::saturating_from_integer(4)
+				);
+				assert_eq!(
+					$name::saturating_from_integer(2).saturating_pow(3),
+					$name::saturating_from_integer(8)
+				);
+				assert_eq!(
+					$name::saturating_from_integer(2).saturating_pow(50),
+					$name::saturating_from_integer(1125899906842624i64)
+				);
 
 				assert_eq!($name::saturating_from_integer(1).saturating_pow(1000), (1).into());
-				assert_eq!($name::saturating_from_integer(1).saturating_pow(usize::MAX), (1).into());
+				assert_eq!(
+					$name::saturating_from_integer(1).saturating_pow(usize::MAX),
+					(1).into()
+				);
 
 				if $name::SIGNED {
 					// Saturating.
-					assert_eq!($name::saturating_from_integer(2).saturating_pow(68), $name::max_value());
+					assert_eq!(
+						$name::saturating_from_integer(2).saturating_pow(68),
+						$name::max_value()
+					);
 
 					assert_eq!($name::saturating_from_integer(-1).saturating_pow(1000), (1).into());
-					assert_eq!($name::saturating_from_integer(-1).saturating_pow(1001), 0.saturating_sub(1).into());
-					assert_eq!($name::saturating_from_integer(-1).saturating_pow(usize::MAX), 0.saturating_sub(1).into());
-					assert_eq!($name::saturating_from_integer(-1).saturating_pow(usize::MAX - 1), (1).into());
+					assert_eq!(
+						$name::saturating_from_integer(-1).saturating_pow(1001),
+						0.saturating_sub(1).into()
+					);
+					assert_eq!(
+						$name::saturating_from_integer(-1).saturating_pow(usize::MAX),
+						0.saturating_sub(1).into()
+					);
+					assert_eq!(
+						$name::saturating_from_integer(-1).saturating_pow(usize::MAX - 1),
+						(1).into()
+					);
 				}
 
-				assert_eq!($name::saturating_from_integer(114209).saturating_pow(5), $name::max_value());
-
-				assert_eq!($name::saturating_from_integer(1).saturating_pow(usize::MAX), (1).into());
-				assert_eq!($name::saturating_from_integer(0).saturating_pow(usize::MAX), (0).into());
-				assert_eq!($name::saturating_from_integer(2).saturating_pow(usize::MAX), $name::max_value());
+				assert_eq!(
+					$name::saturating_from_integer(114209).saturating_pow(5),
+					$name::max_value()
+				);
+
+				assert_eq!(
+					$name::saturating_from_integer(1).saturating_pow(usize::MAX),
+					(1).into()
+				);
+				assert_eq!(
+					$name::saturating_from_integer(0).saturating_pow(usize::MAX),
+					(0).into()
+				);
+				assert_eq!(
+					$name::saturating_from_integer(2).saturating_pow(usize::MAX),
+					$name::max_value()
+				);
 			}
 
 			#[test]
@@ -1368,9 +1468,18 @@ macro_rules! implement_fixed {
 
 				if b < c {
 					// Not executed by unsigned inners.
-					assert_eq!(a.checked_div(&0.saturating_sub(2).into()), Some($name::from_inner(0.saturating_sub(inner_max / 2))));
-					assert_eq!(a.checked_div(&-$name::max_value()), Some(0.saturating_sub(1).into()));
-					assert_eq!(b.checked_div(&0.saturating_sub(2).into()), Some($name::from_inner(0.saturating_sub(inner_min / 2))));
+					assert_eq!(
+						a.checked_div(&0.saturating_sub(2).into()),
+						Some($name::from_inner(0.saturating_sub(inner_max / 2)))
+					);
+					assert_eq!(
+						a.checked_div(&-$name::max_value()),
+						Some(0.saturating_sub(1).into())
+					);
+					assert_eq!(
+						b.checked_div(&0.saturating_sub(2).into()),
+						Some($name::from_inner(0.saturating_sub(inner_min / 2)))
+					);
 					assert_eq!(c.checked_div(&$name::max_value()), Some(0.into()));
 					assert_eq!(b.checked_div(&b), Some($name::one()));
 				}
@@ -1427,14 +1536,10 @@ macro_rules! implement_fixed {
 
 				assert_eq!(n, i + f);
 
-				let n = $name::saturating_from_rational(5, 2)
-					.frac()
-					.saturating_mul(10.into());
+				let n = $name::saturating_from_rational(5, 2).frac().saturating_mul(10.into());
 				assert_eq!(n, 5.into());
 
-				let n = $name::saturating_from_rational(1, 2)
-					.frac()
-					.saturating_mul(10.into());
+				let n = $name::saturating_from_rational(1, 2).frac().saturating_mul(10.into());
 				assert_eq!(n, 5.into());
 
 				if $name::SIGNED {
@@ -1444,14 +1549,10 @@ macro_rules! implement_fixed {
 					assert_eq!(n, i - f);
 
 					// The sign is attached to the integer part unless it is zero.
-					let n = $name::saturating_from_rational(-5, 2)
-						.frac()
-						.saturating_mul(10.into());
+					let n = $name::saturating_from_rational(-5, 2).frac().saturating_mul(10.into());
 					assert_eq!(n, 5.into());
 
-					let n = $name::saturating_from_rational(-1, 2)
-						.frac()
-						.saturating_mul(10.into());
+					let n = $name::saturating_from_rational(-1, 2).frac().saturating_mul(10.into());
 					assert_eq!(n, 0.saturating_sub(5).into());
 				}
 			}
@@ -1564,30 +1665,51 @@ macro_rules! implement_fixed {
 			#[test]
 			fn fmt_should_work() {
 				let zero = $name::zero();
-				assert_eq!(format!("{:?}", zero), format!("{}(0.{:0>weight$})", stringify!($name), 0, weight=precision()));
+				assert_eq!(
+					format!("{:?}", zero),
+					format!("{}(0.{:0>weight$})", stringify!($name), 0, weight = precision())
+				);
 
 				let one = $name::one();
-				assert_eq!(format!("{:?}", one), format!("{}(1.{:0>weight$})", stringify!($name), 0, weight=precision()));
+				assert_eq!(
+					format!("{:?}", one),
+					format!("{}(1.{:0>weight$})", stringify!($name), 0, weight = precision())
+				);
 
 				let frac = $name::saturating_from_rational(1, 2);
-				assert_eq!(format!("{:?}", frac), format!("{}(0.{:0<weight$})", stringify!($name), 5, weight=precision()));
+				assert_eq!(
+					format!("{:?}", frac),
+					format!("{}(0.{:0<weight$})", stringify!($name), 5, weight = precision())
+				);
 
 				let frac = $name::saturating_from_rational(5, 2);
-				assert_eq!(format!("{:?}", frac), format!("{}(2.{:0<weight$})", stringify!($name), 5, weight=precision()));
+				assert_eq!(
+					format!("{:?}", frac),
+					format!("{}(2.{:0<weight$})", stringify!($name), 5, weight = precision())
+				);
 
 				let frac = $name::saturating_from_rational(314, 100);
-				assert_eq!(format!("{:?}", frac), format!("{}(3.{:0<weight$})", stringify!($name), 14, weight=precision()));
+				assert_eq!(
+					format!("{:?}", frac),
+					format!("{}(3.{:0<weight$})", stringify!($name), 14, weight = precision())
+				);
 
 				if $name::SIGNED {
 					let neg = -$name::one();
-					assert_eq!(format!("{:?}", neg), format!("{}(-1.{:0>weight$})", stringify!($name), 0, weight=precision()));
+					assert_eq!(
+						format!("{:?}", neg),
+						format!("{}(-1.{:0>weight$})", stringify!($name), 0, weight = precision())
+					);
 
 					let frac = $name::saturating_from_rational(-314, 100);
-					assert_eq!(format!("{:?}", frac), format!("{}(-3.{:0<weight$})", stringify!($name), 14, weight=precision()));
+					assert_eq!(
+						format!("{:?}", frac),
+						format!("{}(-3.{:0<weight$})", stringify!($name), 14, weight = precision())
+					);
 				}
 			}
 		}
-	}
+	};
 }
 
 implement_fixed!(
diff --git a/primitives/arithmetic/src/helpers_128bit.rs b/primitives/arithmetic/src/helpers_128bit.rs
index a979b6a48aa2..8784136c804a 100644
--- a/primitives/arithmetic/src/helpers_128bit.rs
+++ b/primitives/arithmetic/src/helpers_128bit.rs
@@ -22,7 +22,11 @@
 
 use crate::biguint;
 use num_traits::Zero;
-use sp_std::{cmp::{min, max}, convert::TryInto, mem};
+use sp_std::{
+	cmp::{max, min},
+	convert::TryInto,
+	mem,
+};
 
 /// Helper gcd function used in Rational128 implementation.
 pub fn gcd(a: u128, b: u128) -> u128 {
@@ -63,7 +67,9 @@ pub fn to_big_uint(x: u128) -> biguint::BigUint {
 ///
 /// Invariant: c must be greater than or equal to 1.
 pub fn multiply_by_rational(mut a: u128, mut b: u128, mut c: u128) -> Result<u128, &'static str> {
-	if a.is_zero() || b.is_zero() { return Ok(Zero::zero()); }
+	if a.is_zero() || b.is_zero() {
+		return Ok(Zero::zero())
+	}
 	c = c.max(1);
 
 	// a and b are interchangeable by definition in this function. It always helps to assume the
@@ -102,9 +108,10 @@ pub fn multiply_by_rational(mut a: u128, mut b: u128, mut c: u128) -> Result<u12
 			// bigger than c. In this case, returning zero is defensive-only and div should
 			// always return Some.
 			let (mut q, r) = ab.div(&c_num, true).unwrap_or((Zero::zero(), Zero::zero()));
-			let r: u128 = r.try_into()
-				.expect("reminder of div by c is always less than c; qed");
-			if r > (c / 2) { q = q.add(&to_big_uint(1)); }
+			let r: u128 = r.try_into().expect("reminder of div by c is always less than c; qed");
+			if r > (c / 2) {
+				q = q.add(&to_big_uint(1));
+			}
 			q
 		};
 		q.lstrip();
diff --git a/primitives/arithmetic/src/lib.rs b/primitives/arithmetic/src/lib.rs
index 110e5c072803..cf2e8a1a6064 100644
--- a/primitives/arithmetic/src/lib.rs
+++ b/primitives/arithmetic/src/lib.rs
@@ -34,18 +34,18 @@ macro_rules! assert_eq_error_rate {
 }
 
 pub mod biguint;
+pub mod fixed_point;
 pub mod helpers_128bit;
-pub mod traits;
 pub mod per_things;
-pub mod fixed_point;
 pub mod rational;
+pub mod traits;
 
-pub use fixed_point::{FixedPointNumber, FixedPointOperand, FixedI64, FixedI128, FixedU128};
-pub use per_things::{PerThing, InnerOf, UpperOf, Percent, PerU16, Permill, Perbill, Perquintill};
+pub use fixed_point::{FixedI128, FixedI64, FixedPointNumber, FixedPointOperand, FixedU128};
+pub use per_things::{InnerOf, PerThing, PerU16, Perbill, Percent, Permill, Perquintill, UpperOf};
 pub use rational::{Rational128, RationalInfinite};
 
-use sp_std::{prelude::*, cmp::Ordering, fmt::Debug, convert::TryInto};
-use traits::{BaseArithmetic, One, Zero, SaturatedConversion, Unsigned};
+use sp_std::{cmp::Ordering, convert::TryInto, fmt::Debug, prelude::*};
+use traits::{BaseArithmetic, One, SaturatedConversion, Unsigned, Zero};
 
 /// Trait for comparing two numbers with an threshold.
 ///
@@ -82,7 +82,6 @@ where
 				_ => Ordering::Equal,
 			}
 		}
-
 	}
 }
 
@@ -114,8 +113,10 @@ impl_normalize_for_numeric!(u8, u16, u32, u64, u128);
 
 impl<P: PerThing> Normalizable<P> for Vec<P> {
 	fn normalize(&self, targeted_sum: P) -> Result<Vec<P>, &'static str> {
-		let uppers =
-			self.iter().map(|p| <UpperOf<P>>::from(p.clone().deconstruct())).collect::<Vec<_>>();
+		let uppers = self
+			.iter()
+			.map(|p| <UpperOf<P>>::from(p.clone().deconstruct()))
+			.collect::<Vec<_>>();
 
 		let normalized =
 			normalize(uppers.as_ref(), <UpperOf<P>>::from(targeted_sum.deconstruct()))?;
@@ -157,7 +158,8 @@ impl<P: PerThing> Normalizable<P> for Vec<P> {
 ///
 /// * This proof is used in the implementation as well.
 pub fn normalize<T>(input: &[T], targeted_sum: T) -> Result<Vec<T>, &'static str>
-	where T: Clone + Copy + Ord + BaseArithmetic + Unsigned + Debug,
+where
+	T: Clone + Copy + Ord + BaseArithmetic + Unsigned + Debug,
 {
 	// compute sum and return error if failed.
 	let mut sum = T::zero();
@@ -171,12 +173,12 @@ pub fn normalize<T>(input: &[T], targeted_sum: T) -> Result<Vec<T>, &'static str
 
 	// Nothing to do here.
 	if count.is_zero() {
-		return Ok(Vec::<T>::new());
+		return Ok(Vec::<T>::new())
 	}
 
 	let diff = targeted_sum.max(sum) - targeted_sum.min(sum);
 	if diff.is_zero() {
-		return Ok(input.to_vec());
+		return Ok(input.to_vec())
 	}
 
 	let needs_bump = targeted_sum > sum;
@@ -198,7 +200,8 @@ pub fn normalize<T>(input: &[T], targeted_sum: T) -> Result<Vec<T>, &'static str
 
 		if !per_round.is_zero() {
 			for _ in 0..count {
-				output_with_idx[min_index].1 = output_with_idx[min_index].1
+				output_with_idx[min_index].1 = output_with_idx[min_index]
+					.1
 					.checked_add(&per_round)
 					.expect("Proof provided in the module doc; qed.");
 				if output_with_idx[min_index].1 >= threshold {
@@ -210,7 +213,8 @@ pub fn normalize<T>(input: &[T], targeted_sum: T) -> Result<Vec<T>, &'static str
 
 		// continue with the previous min_index
 		while !leftover.is_zero() {
-			output_with_idx[min_index].1 = output_with_idx[min_index].1
+			output_with_idx[min_index].1 = output_with_idx[min_index]
+				.1
 				.checked_add(&T::one())
 				.expect("Proof provided in the module doc; qed.");
 			if output_with_idx[min_index].1 >= threshold {
@@ -232,9 +236,8 @@ pub fn normalize<T>(input: &[T], targeted_sum: T) -> Result<Vec<T>, &'static str
 
 		if !per_round.is_zero() {
 			for _ in 0..count {
-				output_with_idx[max_index].1 = output_with_idx[max_index].1
-					.checked_sub(&per_round)
-					.unwrap_or_else(|| {
+				output_with_idx[max_index].1 =
+					output_with_idx[max_index].1.checked_sub(&per_round).unwrap_or_else(|| {
 						let remainder = per_round - output_with_idx[max_index].1;
 						leftover += remainder;
 						output_with_idx[max_index].1.saturating_sub(per_round)
@@ -284,7 +287,7 @@ mod normalize_tests {
 					normalize(vec![8 as $type, 9, 7, 10].as_ref(), 40).unwrap(),
 					vec![10, 10, 10, 10],
 				);
-			}
+			};
 		}
 		// it should work for all types as long as the length of vector can be converted to T.
 		test_for!(u128);
@@ -297,22 +300,13 @@ mod normalize_tests {
 	#[test]
 	fn fails_on_if_input_sum_large() {
 		assert!(normalize(vec![1u8; 255].as_ref(), 10).is_ok());
-		assert_eq!(
-			normalize(vec![1u8; 256].as_ref(), 10),
-			Err("sum of input cannot fit in `T`"),
-		);
+		assert_eq!(normalize(vec![1u8; 256].as_ref(), 10), Err("sum of input cannot fit in `T`"),);
 	}
 
 	#[test]
 	fn does_not_fail_on_subtraction_overflow() {
-		assert_eq!(
-			normalize(vec![1u8, 100, 100].as_ref(), 10).unwrap(),
-			vec![1, 9, 0],
-		);
-		assert_eq!(
-			normalize(vec![1u8, 8, 9].as_ref(), 1).unwrap(),
-			vec![0, 1, 0],
-		);
+		assert_eq!(normalize(vec![1u8, 100, 100].as_ref(), 10).unwrap(), vec![1, 9, 0],);
+		assert_eq!(normalize(vec![1u8, 8, 9].as_ref(), 1).unwrap(), vec![0, 1, 0],);
 	}
 
 	#[test]
@@ -323,11 +317,9 @@ mod normalize_tests {
 	#[test]
 	fn works_for_per_thing() {
 		assert_eq!(
-			vec![
-				Perbill::from_percent(33),
-				Perbill::from_percent(33),
-				Perbill::from_percent(33)
-			].normalize(Perbill::one()).unwrap(),
+			vec![Perbill::from_percent(33), Perbill::from_percent(33), Perbill::from_percent(33)]
+				.normalize(Perbill::one())
+				.unwrap(),
 			vec![
 				Perbill::from_parts(333333334),
 				Perbill::from_parts(333333333),
@@ -336,11 +328,9 @@ mod normalize_tests {
 		);
 
 		assert_eq!(
-			vec![
-				Perbill::from_percent(20),
-				Perbill::from_percent(15),
-				Perbill::from_percent(30)
-			].normalize(Perbill::one()).unwrap(),
+			vec![Perbill::from_percent(20), Perbill::from_percent(15), Perbill::from_percent(30)]
+				.normalize(Perbill::one())
+				.unwrap(),
 			vec![
 				Perbill::from_parts(316666668),
 				Perbill::from_parts(383333332),
@@ -355,11 +345,9 @@ mod normalize_tests {
 		// could have a situation where the sum cannot be calculated in the inner type. Calculating
 		// using the upper type of the per_thing should assure this to be okay.
 		assert_eq!(
-			vec![
-				PerU16::from_percent(40),
-				PerU16::from_percent(40),
-				PerU16::from_percent(40),
-			].normalize(PerU16::one()).unwrap(),
+			vec![PerU16::from_percent(40), PerU16::from_percent(40), PerU16::from_percent(40),]
+				.normalize(PerU16::one())
+				.unwrap(),
 			vec![
 				PerU16::from_parts(21845), // 33%
 				PerU16::from_parts(21845), // 33%
@@ -370,82 +358,40 @@ mod normalize_tests {
 
 	#[test]
 	fn normalize_works_all_le() {
-		assert_eq!(
-			normalize(vec![8u32, 9, 7, 10].as_ref(), 40).unwrap(),
-			vec![10, 10, 10, 10],
-		);
+		assert_eq!(normalize(vec![8u32, 9, 7, 10].as_ref(), 40).unwrap(), vec![10, 10, 10, 10],);
 
-		assert_eq!(
-			normalize(vec![7u32, 7, 7, 7].as_ref(), 40).unwrap(),
-			vec![10, 10, 10, 10],
-		);
+		assert_eq!(normalize(vec![7u32, 7, 7, 7].as_ref(), 40).unwrap(), vec![10, 10, 10, 10],);
 
-		assert_eq!(
-			normalize(vec![7u32, 7, 7, 10].as_ref(), 40).unwrap(),
-			vec![11, 11, 8, 10],
-		);
+		assert_eq!(normalize(vec![7u32, 7, 7, 10].as_ref(), 40).unwrap(), vec![11, 11, 8, 10],);
 
-		assert_eq!(
-			normalize(vec![7u32, 8, 7, 10].as_ref(), 40).unwrap(),
-			vec![11, 8, 11, 10],
-		);
+		assert_eq!(normalize(vec![7u32, 8, 7, 10].as_ref(), 40).unwrap(), vec![11, 8, 11, 10],);
 
-		assert_eq!(
-			normalize(vec![7u32, 7, 8, 10].as_ref(), 40).unwrap(),
-			vec![11, 11, 8, 10],
-		);
+		assert_eq!(normalize(vec![7u32, 7, 8, 10].as_ref(), 40).unwrap(), vec![11, 11, 8, 10],);
 	}
 
 	#[test]
 	fn normalize_works_some_ge() {
-		assert_eq!(
-			normalize(vec![8u32, 11, 9, 10].as_ref(), 40).unwrap(),
-			vec![10, 11, 9, 10],
-		);
+		assert_eq!(normalize(vec![8u32, 11, 9, 10].as_ref(), 40).unwrap(), vec![10, 11, 9, 10],);
 	}
 
 	#[test]
 	fn always_inc_min() {
-		assert_eq!(
-			normalize(vec![10u32, 7, 10, 10].as_ref(), 40).unwrap(),
-			vec![10, 10, 10, 10],
-		);
-		assert_eq!(
-			normalize(vec![10u32, 10, 7, 10].as_ref(), 40).unwrap(),
-			vec![10, 10, 10, 10],
-		);
-		assert_eq!(
-			normalize(vec![10u32, 10, 10, 7].as_ref(), 40).unwrap(),
-			vec![10, 10, 10, 10],
-		);
+		assert_eq!(normalize(vec![10u32, 7, 10, 10].as_ref(), 40).unwrap(), vec![10, 10, 10, 10],);
+		assert_eq!(normalize(vec![10u32, 10, 7, 10].as_ref(), 40).unwrap(), vec![10, 10, 10, 10],);
+		assert_eq!(normalize(vec![10u32, 10, 10, 7].as_ref(), 40).unwrap(), vec![10, 10, 10, 10],);
 	}
 
 	#[test]
 	fn normalize_works_all_ge() {
-		assert_eq!(
-			normalize(vec![12u32, 11, 13, 10].as_ref(), 40).unwrap(),
-			vec![10, 10, 10, 10],
-		);
+		assert_eq!(normalize(vec![12u32, 11, 13, 10].as_ref(), 40).unwrap(), vec![10, 10, 10, 10],);
 
-		assert_eq!(
-			normalize(vec![13u32, 13, 13, 13].as_ref(), 40).unwrap(),
-			vec![10, 10, 10, 10],
-		);
+		assert_eq!(normalize(vec![13u32, 13, 13, 13].as_ref(), 40).unwrap(), vec![10, 10, 10, 10],);
 
-		assert_eq!(
-			normalize(vec![13u32, 13, 13, 10].as_ref(), 40).unwrap(),
-			vec![12, 9, 9, 10],
-		);
+		assert_eq!(normalize(vec![13u32, 13, 13, 10].as_ref(), 40).unwrap(), vec![12, 9, 9, 10],);
 
-		assert_eq!(
-			normalize(vec![13u32, 12, 13, 10].as_ref(), 40).unwrap(),
-			vec![9, 12, 9, 10],
-		);
+		assert_eq!(normalize(vec![13u32, 12, 13, 10].as_ref(), 40).unwrap(), vec![9, 12, 9, 10],);
 
-		assert_eq!(
-			normalize(vec![13u32, 13, 12, 10].as_ref(), 40).unwrap(),
-			vec![9, 9, 12, 10],
-		);
+		assert_eq!(normalize(vec![13u32, 13, 12, 10].as_ref(), 40).unwrap(), vec![9, 9, 12, 10],);
 	}
 }
 
diff --git a/primitives/arithmetic/src/per_things.rs b/primitives/arithmetic/src/per_things.rs
index 80d556486d56..b114c4a96788 100644
--- a/primitives/arithmetic/src/per_things.rs
+++ b/primitives/arithmetic/src/per_things.rs
@@ -16,16 +16,20 @@
 // limitations under the License.
 
 #[cfg(feature = "std")]
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
-use sp_std::{ops, fmt, prelude::*, convert::{TryFrom, TryInto}};
-use codec::{Encode, CompactAs};
-use num_traits::Pow;
 use crate::traits::{
-	SaturatedConversion, UniqueSaturatedInto, Saturating, BaseArithmetic, Bounded, Zero, Unsigned,
-	One,
+	BaseArithmetic, Bounded, One, SaturatedConversion, Saturating, UniqueSaturatedInto, Unsigned,
+	Zero,
 };
+use codec::{CompactAs, Encode};
+use num_traits::Pow;
 use sp_debug_derive::RuntimeDebug;
+use sp_std::{
+	convert::{TryFrom, TryInto},
+	fmt, ops,
+	prelude::*,
+};
 
 /// Get the inner type of a `PerThing`.
 pub type InnerOf<P> = <P as PerThing>::Inner;
@@ -36,8 +40,19 @@ pub type UpperOf<P> = <P as PerThing>::Upper;
 /// Something that implements a fixed point ration with an arbitrary granularity `X`, as _parts per
 /// `X`_.
 pub trait PerThing:
-	Sized + Saturating + Copy + Default + Eq + PartialEq + Ord + PartialOrd + Bounded + fmt::Debug
-	+ ops::Div<Output=Self> + ops::Mul<Output=Self> + Pow<usize, Output=Self>
+	Sized
+	+ Saturating
+	+ Copy
+	+ Default
+	+ Eq
+	+ PartialEq
+	+ Ord
+	+ PartialOrd
+	+ Bounded
+	+ fmt::Debug
+	+ ops::Div<Output = Self>
+	+ ops::Mul<Output = Self>
+	+ Pow<usize, Output = Self>
 {
 	/// The data type used to build this per-thingy.
 	type Inner: BaseArithmetic + Unsigned + Copy + Into<u128> + fmt::Debug;
@@ -56,16 +71,24 @@ pub trait PerThing:
 	const ACCURACY: Self::Inner;
 
 	/// Equivalent to `Self::from_parts(0)`.
-	fn zero() -> Self { Self::from_parts(Self::Inner::zero()) }
+	fn zero() -> Self {
+		Self::from_parts(Self::Inner::zero())
+	}
 
 	/// Return `true` if this is nothing.
-	fn is_zero(&self) -> bool { self.deconstruct() == Self::Inner::zero() }
+	fn is_zero(&self) -> bool {
+		self.deconstruct() == Self::Inner::zero()
+	}
 
 	/// Equivalent to `Self::from_parts(Self::ACCURACY)`.
-	fn one() -> Self { Self::from_parts(Self::ACCURACY) }
+	fn one() -> Self {
+		Self::from_parts(Self::ACCURACY)
+	}
 
 	/// Return `true` if this is one.
-	fn is_one(&self) -> bool { self.deconstruct() == Self::ACCURACY }
+	fn is_one(&self) -> bool {
+		self.deconstruct() == Self::ACCURACY
+	}
 
 	/// Build this type from a percent. Equivalent to `Self::from_parts(x * Self::ACCURACY / 100)`
 	/// but more accurate and can cope with potential type overflows.
@@ -104,8 +127,13 @@ pub trait PerThing:
 	/// ```
 	fn mul_floor<N>(self, b: N) -> N
 	where
-		N: Clone + UniqueSaturatedInto<Self::Inner> + ops::Rem<N, Output=N> +
-			ops::Div<N, Output=N> + ops::Mul<N, Output=N> + ops::Add<N, Output=N> + Unsigned,
+		N: Clone
+			+ UniqueSaturatedInto<Self::Inner>
+			+ ops::Rem<N, Output = N>
+			+ ops::Div<N, Output = N>
+			+ ops::Mul<N, Output = N>
+			+ ops::Add<N, Output = N>
+			+ Unsigned,
 		Self::Inner: Into<N>,
 	{
 		overflow_prune_mul::<N, Self>(b, self.deconstruct(), Rounding::Down)
@@ -128,9 +156,14 @@ pub trait PerThing:
 	/// ```
 	fn mul_ceil<N>(self, b: N) -> N
 	where
-		N: Clone + UniqueSaturatedInto<Self::Inner> + ops::Rem<N, Output=N> +
-			ops::Div<N, Output=N> + ops::Mul<N, Output=N> + ops::Add<N, Output=N> + Unsigned,
-		Self::Inner: Into<N>
+		N: Clone
+			+ UniqueSaturatedInto<Self::Inner>
+			+ ops::Rem<N, Output = N>
+			+ ops::Div<N, Output = N>
+			+ ops::Mul<N, Output = N>
+			+ ops::Add<N, Output = N>
+			+ Unsigned,
+		Self::Inner: Into<N>,
 	{
 		overflow_prune_mul::<N, Self>(b, self.deconstruct(), Rounding::Up)
 	}
@@ -146,9 +179,14 @@ pub trait PerThing:
 	/// ```
 	fn saturating_reciprocal_mul<N>(self, b: N) -> N
 	where
-		N: Clone + UniqueSaturatedInto<Self::Inner> + ops::Rem<N, Output=N> +
-			ops::Div<N, Output=N> + ops::Mul<N, Output=N> + ops::Add<N, Output=N> + Saturating +
-			Unsigned,
+		N: Clone
+			+ UniqueSaturatedInto<Self::Inner>
+			+ ops::Rem<N, Output = N>
+			+ ops::Div<N, Output = N>
+			+ ops::Mul<N, Output = N>
+			+ ops::Add<N, Output = N>
+			+ Saturating
+			+ Unsigned,
 		Self::Inner: Into<N>,
 	{
 		saturating_reciprocal_mul::<N, Self>(b, self.deconstruct(), Rounding::Nearest)
@@ -168,9 +206,14 @@ pub trait PerThing:
 	/// ```
 	fn saturating_reciprocal_mul_floor<N>(self, b: N) -> N
 	where
-		N: Clone + UniqueSaturatedInto<Self::Inner> + ops::Rem<N, Output=N> +
-			ops::Div<N, Output=N> + ops::Mul<N, Output=N> + ops::Add<N, Output=N> + Saturating +
-			Unsigned,
+		N: Clone
+			+ UniqueSaturatedInto<Self::Inner>
+			+ ops::Rem<N, Output = N>
+			+ ops::Div<N, Output = N>
+			+ ops::Mul<N, Output = N>
+			+ ops::Add<N, Output = N>
+			+ Saturating
+			+ Unsigned,
 		Self::Inner: Into<N>,
 	{
 		saturating_reciprocal_mul::<N, Self>(b, self.deconstruct(), Rounding::Down)
@@ -190,9 +233,14 @@ pub trait PerThing:
 	/// ```
 	fn saturating_reciprocal_mul_ceil<N>(self, b: N) -> N
 	where
-		N: Clone + UniqueSaturatedInto<Self::Inner> + ops::Rem<N, Output=N> +
-			ops::Div<N, Output=N> + ops::Mul<N, Output=N> + ops::Add<N, Output=N> + Saturating +
-			Unsigned,
+		N: Clone
+			+ UniqueSaturatedInto<Self::Inner>
+			+ ops::Rem<N, Output = N>
+			+ ops::Div<N, Output = N>
+			+ ops::Mul<N, Output = N>
+			+ ops::Add<N, Output = N>
+			+ Saturating
+			+ Unsigned,
 		Self::Inner: Into<N>,
 	{
 		saturating_reciprocal_mul::<N, Self>(b, self.deconstruct(), Rounding::Up)
@@ -211,7 +259,9 @@ pub trait PerThing:
 	/// Same as `Self::from_float`.
 	#[deprecated = "Use from_float instead"]
 	#[cfg(feature = "std")]
-	fn from_fraction(x: f64) -> Self { Self::from_float(x) }
+	fn from_fraction(x: f64) -> Self {
+		Self::from_float(x)
+	}
 
 	/// Approximate the fraction `p/q` into a per-thing fraction. This will never overflow.
 	///
@@ -233,18 +283,31 @@ pub trait PerThing:
 	/// ```
 	fn from_rational<N>(p: N, q: N) -> Self
 	where
-		N: Clone + Ord + TryInto<Self::Inner> + TryInto<Self::Upper> +
-			ops::Div<N, Output=N> + ops::Rem<N, Output=N> + ops::Add<N, Output=N> + Unsigned,
+		N: Clone
+			+ Ord
+			+ TryInto<Self::Inner>
+			+ TryInto<Self::Upper>
+			+ ops::Div<N, Output = N>
+			+ ops::Rem<N, Output = N>
+			+ ops::Add<N, Output = N>
+			+ Unsigned,
 		Self::Inner: Into<N>;
 
 	/// Same as `Self::from_rational`.
 	#[deprecated = "Use from_rational instead"]
 	fn from_rational_approximation<N>(p: N, q: N) -> Self
-		where
-			N: Clone + Ord + TryInto<Self::Inner> + TryInto<Self::Upper>
-			+ ops::Div<N, Output=N> + ops::Rem<N, Output=N> + ops::Add<N, Output=N> + Unsigned
-			+ Zero + One,
-			Self::Inner: Into<N>,
+	where
+		N: Clone
+			+ Ord
+			+ TryInto<Self::Inner>
+			+ TryInto<Self::Upper>
+			+ ops::Div<N, Output = N>
+			+ ops::Rem<N, Output = N>
+			+ ops::Add<N, Output = N>
+			+ Unsigned
+			+ Zero
+			+ One,
+		Self::Inner: Into<N>,
 	{
 		Self::from_rational(p, q)
 	}
@@ -264,37 +327,38 @@ enum Rounding {
 /// bounds instead of overflowing.
 fn saturating_reciprocal_mul<N, P>(x: N, part: P::Inner, rounding: Rounding) -> N
 where
-	N: Clone + UniqueSaturatedInto<P::Inner> + ops::Div<N, Output=N> + ops::Mul<N,
-	Output=N> + ops::Add<N, Output=N> + ops::Rem<N, Output=N> + Saturating + Unsigned,
+	N: Clone
+		+ UniqueSaturatedInto<P::Inner>
+		+ ops::Div<N, Output = N>
+		+ ops::Mul<N, Output = N>
+		+ ops::Add<N, Output = N>
+		+ ops::Rem<N, Output = N>
+		+ Saturating
+		+ Unsigned,
 	P: PerThing,
 	P::Inner: Into<N>,
 {
 	let maximum: N = P::ACCURACY.into();
-	let c = rational_mul_correction::<N, P>(
-		x.clone(),
-		P::ACCURACY,
-		part,
-		rounding,
-	);
+	let c = rational_mul_correction::<N, P>(x.clone(), P::ACCURACY, part, rounding);
 	(x / part.into()).saturating_mul(maximum).saturating_add(c)
 }
 
 /// Overflow-prune multiplication. Accurately multiply a value by `self` without overflowing.
 fn overflow_prune_mul<N, P>(x: N, part: P::Inner, rounding: Rounding) -> N
 where
-	N: Clone + UniqueSaturatedInto<P::Inner> + ops::Div<N, Output=N> + ops::Mul<N,
-	Output=N> + ops::Add<N, Output=N> + ops::Rem<N, Output=N> + Unsigned,
+	N: Clone
+		+ UniqueSaturatedInto<P::Inner>
+		+ ops::Div<N, Output = N>
+		+ ops::Mul<N, Output = N>
+		+ ops::Add<N, Output = N>
+		+ ops::Rem<N, Output = N>
+		+ Unsigned,
 	P: PerThing,
 	P::Inner: Into<N>,
 {
 	let maximum: N = P::ACCURACY.into();
 	let part_n: N = part.into();
-	let c = rational_mul_correction::<N, P>(
-		x.clone(),
-		part,
-		P::ACCURACY,
-		rounding,
-	);
+	let c = rational_mul_correction::<N, P>(x.clone(), part, P::ACCURACY, rounding);
 	(x / maximum) * part_n + c
 }
 
@@ -304,10 +368,14 @@ where
 /// to `x / denom * numer` for an accurate result.
 fn rational_mul_correction<N, P>(x: N, numer: P::Inner, denom: P::Inner, rounding: Rounding) -> N
 where
-	N: UniqueSaturatedInto<P::Inner> + ops::Div<N, Output=N> + ops::Mul<N,
-	Output=N> + ops::Add<N, Output=N> + ops::Rem<N, Output=N> + Unsigned,
+	N: UniqueSaturatedInto<P::Inner>
+		+ ops::Div<N, Output = N>
+		+ ops::Mul<N, Output = N>
+		+ ops::Add<N, Output = N>
+		+ ops::Rem<N, Output = N>
+		+ Unsigned,
 	P: PerThing,
-	P::Inner: Into<N>
+	P::Inner: Into<N>,
 {
 	let numer_upper = P::Upper::from(numer);
 	let denom_n: N = denom.into();
@@ -324,16 +392,18 @@ where
 		// Already rounded down
 		Rounding::Down => {},
 		// Round up if the fractional part of the result is non-zero.
-		Rounding::Up => if rem_mul_upper % denom_upper > 0.into() {
-			// `rem * numer / denom` is less than `numer`, so this will not overflow.
-			rem_mul_div_inner += 1.into();
-		},
+		Rounding::Up =>
+			if rem_mul_upper % denom_upper > 0.into() {
+				// `rem * numer / denom` is less than `numer`, so this will not overflow.
+				rem_mul_div_inner += 1.into();
+			},
 		// Round up if the fractional part of the result is greater than a half. An exact half is
 		// rounded down.
-		Rounding::Nearest => if rem_mul_upper % denom_upper > denom_upper / 2.into() {
-			// `rem * numer / denom` is less than `numer`, so this will not overflow.
-			rem_mul_div_inner += 1.into();
-		},
+		Rounding::Nearest =>
+			if rem_mul_upper % denom_upper > denom_upper / 2.into() {
+				// `rem * numer / denom` is less than `numer`, so this will not overflow.
+				rem_mul_div_inner += 1.into();
+			},
 	}
 	rem_mul_div_inner.into()
 }
@@ -1331,15 +1401,7 @@ macro_rules! implement_per_thing_with_perthousand {
 	}
 }
 
-implement_per_thing!(
-	Percent,
-	test_per_cent,
-	[u32, u64, u128],
-	100u8,
-	u8,
-	u16,
-	"_Percent_",
-);
+implement_per_thing!(Percent, test_per_cent, [u32, u64, u128], 100u8, u8, u16, "_Percent_",);
 implement_per_thing_with_perthousand!(
 	PerU16,
 	test_peru16,
diff --git a/primitives/arithmetic/src/rational.rs b/primitives/arithmetic/src/rational.rs
index feb81eb57206..a15f5ac8c165 100644
--- a/primitives/arithmetic/src/rational.rs
+++ b/primitives/arithmetic/src/rational.rs
@@ -15,10 +15,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use crate::{biguint::BigUint, helpers_128bit};
+use num_traits::{Bounded, One, Zero};
 use sp_std::{cmp::Ordering, prelude::*};
-use crate::helpers_128bit;
-use num_traits::{Zero, One, Bounded};
-use crate::biguint::BigUint;
 
 /// A wrapper for any rational number with infinitely large numerator and denominator.
 ///
@@ -160,9 +159,11 @@ impl Rational128 {
 	/// accurately calculated.
 	pub fn lcm(&self, other: &Self) -> Result<u128, &'static str> {
 		// this should be tested better: two large numbers that are almost the same.
-		if self.1 == other.1 { return Ok(self.1) }
+		if self.1 == other.1 {
+			return Ok(self.1)
+		}
 		let g = helpers_128bit::gcd(self.1, other.1);
-		helpers_128bit::multiply_by_rational(self.1 , other.1, g)
+		helpers_128bit::multiply_by_rational(self.1, other.1, g)
 	}
 
 	/// A saturating add that assumes `self` and `other` have the same denominator.
@@ -170,7 +171,7 @@ impl Rational128 {
 		if other.is_zero() {
 			self
 		} else {
-			Self(self.0.saturating_add(other.0) ,self.1)
+			Self(self.0.saturating_add(other.0), self.1)
 		}
 	}
 
@@ -179,7 +180,7 @@ impl Rational128 {
 		if other.is_zero() {
 			self
 		} else {
-			Self(self.0.saturating_sub(other.0) ,self.1)
+			Self(self.0.saturating_sub(other.0), self.1)
 		}
 	}
 
@@ -190,7 +191,9 @@ impl Rational128 {
 		let lcm = self.lcm(&other).map_err(|_| "failed to scale to denominator")?;
 		let self_scaled = self.to_den(lcm).map_err(|_| "failed to scale to denominator")?;
 		let other_scaled = other.to_den(lcm).map_err(|_| "failed to scale to denominator")?;
-		let n = self_scaled.0.checked_add(other_scaled.0)
+		let n = self_scaled
+			.0
+			.checked_add(other_scaled.0)
 			.ok_or("overflow while adding numerators")?;
 		Ok(Self(n, self_scaled.1))
 	}
@@ -203,7 +206,9 @@ impl Rational128 {
 		let self_scaled = self.to_den(lcm).map_err(|_| "failed to scale to denominator")?;
 		let other_scaled = other.to_den(lcm).map_err(|_| "failed to scale to denominator")?;
 
-		let n = self_scaled.0.checked_sub(other_scaled.0)
+		let n = self_scaled
+			.0
+			.checked_sub(other_scaled.0)
 			.ok_or("overflow while subtracting numerators")?;
 		Ok(Self(n, self_scaled.1))
 	}
@@ -243,7 +248,8 @@ impl Ord for Rational128 {
 		} else {
 			// Don't even compute gcd.
 			let self_n = helpers_128bit::to_big_uint(self.0) * helpers_128bit::to_big_uint(other.1);
-			let other_n = helpers_128bit::to_big_uint(other.0) * helpers_128bit::to_big_uint(self.1);
+			let other_n =
+				helpers_128bit::to_big_uint(other.0) * helpers_128bit::to_big_uint(self.1);
 			self_n.cmp(&other_n)
 		}
 	}
@@ -256,7 +262,8 @@ impl PartialEq for Rational128 {
 			self.0.eq(&other.0)
 		} else {
 			let self_n = helpers_128bit::to_big_uint(self.0) * helpers_128bit::to_big_uint(other.1);
-			let other_n = helpers_128bit::to_big_uint(other.0) * helpers_128bit::to_big_uint(self.1);
+			let other_n =
+				helpers_128bit::to_big_uint(other.0) * helpers_128bit::to_big_uint(self.1);
 			self_n.eq(&other_n)
 		}
 	}
@@ -264,8 +271,7 @@ impl PartialEq for Rational128 {
 
 #[cfg(test)]
 mod tests {
-	use super::*;
-	use super::helpers_128bit::*;
+	use super::{helpers_128bit::*, *};
 
 	const MAX128: u128 = u128::MAX;
 	const MAX64: u128 = u64::MAX as u128;
@@ -277,7 +283,9 @@ mod tests {
 
 	fn mul_div(a: u128, b: u128, c: u128) -> u128 {
 		use primitive_types::U256;
-		if a.is_zero() { return Zero::zero(); }
+		if a.is_zero() {
+			return Zero::zero()
+		}
 		let c = c.max(1);
 
 		// e for extended
@@ -295,14 +303,8 @@ mod tests {
 
 	#[test]
 	fn truth_value_function_works() {
-		assert_eq!(
-			mul_div(2u128.pow(100), 8, 4),
-			2u128.pow(101)
-		);
-		assert_eq!(
-			mul_div(2u128.pow(100), 4, 8),
-			2u128.pow(99)
-		);
+		assert_eq!(mul_div(2u128.pow(100), 8, 4), 2u128.pow(101));
+		assert_eq!(mul_div(2u128.pow(100), 4, 8), 2u128.pow(99));
 
 		// and it returns a if result cannot fit
 		assert_eq!(mul_div(MAX128 - 10, 2, 1), MAX128 - 10);
@@ -319,13 +321,10 @@ mod tests {
 		assert_eq!(r(MAX128 / 2, MAX128).to_den(10), Ok(r(5, 10)));
 
 		// large to perbill. This is very well needed for npos-elections.
-		assert_eq!(
-			r(MAX128 / 2, MAX128).to_den(1000_000_000),
-			Ok(r(500_000_000, 1000_000_000))
-		);
+		assert_eq!(r(MAX128 / 2, MAX128).to_den(1000_000_000), Ok(r(500_000_000, 1000_000_000)));
 
 		// large to large
-		assert_eq!(r(MAX128 / 2, MAX128).to_den(MAX128/2), Ok(r(MAX128/4, MAX128/2)));
+		assert_eq!(r(MAX128 / 2, MAX128).to_den(MAX128 / 2), Ok(r(MAX128 / 4, MAX128 / 2)));
 	}
 
 	#[test]
@@ -343,11 +342,11 @@ mod tests {
 
 		// large numbers
 		assert_eq!(
-			r(1_000_000_000, MAX128).lcm(&r(7_000_000_000, MAX128-1)),
+			r(1_000_000_000, MAX128).lcm(&r(7_000_000_000, MAX128 - 1)),
 			Err("result cannot fit in u128"),
 		);
 		assert_eq!(
-			r(1_000_000_000, MAX64).lcm(&r(7_000_000_000, MAX64-1)),
+			r(1_000_000_000, MAX64).lcm(&r(7_000_000_000, MAX64 - 1)),
 			Ok(340282366920938463408034375210639556610),
 		);
 		assert!(340282366920938463408034375210639556610 < MAX128);
@@ -362,7 +361,7 @@ mod tests {
 
 		// errors
 		assert_eq!(
-			r(1, MAX128).checked_add(r(1, MAX128-1)),
+			r(1, MAX128).checked_add(r(1, MAX128 - 1)),
 			Err("failed to scale to denominator"),
 		);
 		assert_eq!(
@@ -383,17 +382,14 @@ mod tests {
 
 		// errors
 		assert_eq!(
-			r(2, MAX128).checked_sub(r(1, MAX128-1)),
+			r(2, MAX128).checked_sub(r(1, MAX128 - 1)),
 			Err("failed to scale to denominator"),
 		);
 		assert_eq!(
 			r(7, MAX128).checked_sub(r(MAX128, MAX128)),
 			Err("overflow while subtracting numerators"),
 		);
-		assert_eq!(
-			r(1, 10).checked_sub(r(2,10)),
-			Err("overflow while subtracting numerators"),
-		);
+		assert_eq!(r(1, 10).checked_sub(r(2, 10)), Err("overflow while subtracting numerators"),);
 	}
 
 	#[test]
@@ -428,7 +424,7 @@ mod tests {
 		);
 		assert_eq!(
 			// MAX128 % 7 == 3
-			multiply_by_rational(MAX128, 11 , 13).unwrap(),
+			multiply_by_rational(MAX128, 11, 13).unwrap(),
 			(MAX128 / 13 * 11) + (8 * 11 / 13),
 		);
 		assert_eq!(
@@ -437,14 +433,8 @@ mod tests {
 			(MAX128 / 1000 * 555) + (455 * 555 / 1000),
 		);
 
-		assert_eq!(
-			multiply_by_rational(2 * MAX64 - 1, MAX64, MAX64).unwrap(),
-			2 * MAX64 - 1,
-		);
-		assert_eq!(
-			multiply_by_rational(2 * MAX64 - 1, MAX64 - 1, MAX64).unwrap(),
-			2 * MAX64 - 3,
-		);
+		assert_eq!(multiply_by_rational(2 * MAX64 - 1, MAX64, MAX64).unwrap(), 2 * MAX64 - 1,);
+		assert_eq!(multiply_by_rational(2 * MAX64 - 1, MAX64 - 1, MAX64).unwrap(), 2 * MAX64 - 3,);
 
 		assert_eq!(
 			multiply_by_rational(MAX64 + 100, MAX64_2, MAX64_2 / 2).unwrap(),
@@ -459,31 +449,23 @@ mod tests {
 			multiply_by_rational(2u128.pow(66) - 1, 2u128.pow(65) - 1, 2u128.pow(65)).unwrap(),
 			73786976294838206461,
 		);
-		assert_eq!(
-			multiply_by_rational(1_000_000_000, MAX128 / 8, MAX128 / 2).unwrap(),
-			250000000,
-		);
+		assert_eq!(multiply_by_rational(1_000_000_000, MAX128 / 8, MAX128 / 2).unwrap(), 250000000,);
 
 		assert_eq!(
 			multiply_by_rational(
 				29459999999999999988000u128,
 				1000000000000000000u128,
 				10000000000000000000u128
-			).unwrap(),
+			)
+			.unwrap(),
 			2945999999999999998800u128
 		);
 	}
 
 	#[test]
 	fn multiply_by_rational_a_b_are_interchangeable() {
-		assert_eq!(
-			multiply_by_rational(10, MAX128, MAX128 / 2),
-			Ok(20),
-		);
-		assert_eq!(
-			multiply_by_rational(MAX128, 10, MAX128 / 2),
-			Ok(20),
-		);
+		assert_eq!(multiply_by_rational(10, MAX128, MAX128 / 2), Ok(20),);
+		assert_eq!(multiply_by_rational(MAX128, 10, MAX128 / 2), Ok(20),);
 	}
 
 	#[test]
diff --git a/primitives/arithmetic/src/traits.rs b/primitives/arithmetic/src/traits.rs
index d0ce921d9d34..a441a0dcbc08 100644
--- a/primitives/arithmetic/src/traits.rs
+++ b/primitives/arithmetic/src/traits.rs
@@ -17,58 +17,129 @@
 
 //! Primitive traits for the runtime arithmetic.
 
-use sp_std::{self, convert::{TryFrom, TryInto}};
 use codec::HasCompact;
 pub use integer_sqrt::IntegerSquareRoot;
 pub use num_traits::{
-	Zero, One, Bounded, CheckedAdd, CheckedSub, CheckedMul, CheckedDiv, CheckedNeg,
-	CheckedShl, CheckedShr, checked_pow, Signed, Unsigned,
+	checked_pow, Bounded, CheckedAdd, CheckedDiv, CheckedMul, CheckedNeg, CheckedShl, CheckedShr,
+	CheckedSub, One, Signed, Unsigned, Zero,
 };
-use sp_std::ops::{
-	Add, Sub, Mul, Div, Rem, AddAssign, SubAssign, MulAssign, DivAssign,
-	RemAssign, Shl, Shr
+use sp_std::{
+	self,
+	convert::{TryFrom, TryInto},
+	ops::{
+		Add, AddAssign, Div, DivAssign, Mul, MulAssign, Rem, RemAssign, Shl, Shr, Sub, SubAssign,
+	},
 };
 
 /// A meta trait for arithmetic type operations, regardless of any limitation on size.
 pub trait BaseArithmetic:
-	From<u8> +
-	Zero + One + IntegerSquareRoot +
-	Add<Self, Output = Self> + AddAssign<Self> +
-	Sub<Self, Output = Self> + SubAssign<Self> +
-	Mul<Self, Output = Self> + MulAssign<Self> +
-	Div<Self, Output = Self> + DivAssign<Self> +
-	Rem<Self, Output = Self> + RemAssign<Self> +
-	Shl<u32, Output = Self> + Shr<u32, Output = Self> +
-	CheckedShl + CheckedShr + CheckedAdd + CheckedSub + CheckedMul + CheckedDiv + Saturating +
-	PartialOrd<Self> + Ord + Bounded + HasCompact + Sized +
-	TryFrom<u8> + TryInto<u8> + TryFrom<u16> + TryInto<u16> + TryFrom<u32> + TryInto<u32> +
-	TryFrom<u64> + TryInto<u64> + TryFrom<u128> + TryInto<u128> + TryFrom<usize> + TryInto<usize> +
-	UniqueSaturatedFrom<u8> + UniqueSaturatedInto<u8> +
-	UniqueSaturatedFrom<u16> + UniqueSaturatedInto<u16> +
-	UniqueSaturatedFrom<u32> + UniqueSaturatedInto<u32> +
-	UniqueSaturatedFrom<u64> + UniqueSaturatedInto<u64> +
-	UniqueSaturatedFrom<u128> + UniqueSaturatedInto<u128>
-{}
-
-impl<T:
-	From<u8> +
-	Zero + One + IntegerSquareRoot +
-	Add<Self, Output = Self> + AddAssign<Self> +
-	Sub<Self, Output = Self> + SubAssign<Self> +
-	Mul<Self, Output = Self> + MulAssign<Self> +
-	Div<Self, Output = Self> + DivAssign<Self> +
-	Rem<Self, Output = Self> + RemAssign<Self> +
-	Shl<u32, Output = Self> + Shr<u32, Output = Self> +
-	CheckedShl + CheckedShr + CheckedAdd + CheckedSub + CheckedMul + CheckedDiv + Saturating +
-	PartialOrd<Self> + Ord + Bounded + HasCompact + Sized +
-	TryFrom<u8> + TryInto<u8> + TryFrom<u16> + TryInto<u16> + TryFrom<u32> + TryInto<u32> +
-	TryFrom<u64> + TryInto<u64> + TryFrom<u128> + TryInto<u128> + TryFrom<usize> + TryInto<usize> +
-	UniqueSaturatedFrom<u8> + UniqueSaturatedInto<u8> +
-	UniqueSaturatedFrom<u16> + UniqueSaturatedInto<u16> +
-	UniqueSaturatedFrom<u32> + UniqueSaturatedInto<u32> +
-	UniqueSaturatedFrom<u64> + UniqueSaturatedInto<u64> +
-	UniqueSaturatedFrom<u128> + UniqueSaturatedInto<u128>
-> BaseArithmetic for T {}
+	From<u8>
+	+ Zero
+	+ One
+	+ IntegerSquareRoot
+	+ Add<Self, Output = Self>
+	+ AddAssign<Self>
+	+ Sub<Self, Output = Self>
+	+ SubAssign<Self>
+	+ Mul<Self, Output = Self>
+	+ MulAssign<Self>
+	+ Div<Self, Output = Self>
+	+ DivAssign<Self>
+	+ Rem<Self, Output = Self>
+	+ RemAssign<Self>
+	+ Shl<u32, Output = Self>
+	+ Shr<u32, Output = Self>
+	+ CheckedShl
+	+ CheckedShr
+	+ CheckedAdd
+	+ CheckedSub
+	+ CheckedMul
+	+ CheckedDiv
+	+ Saturating
+	+ PartialOrd<Self>
+	+ Ord
+	+ Bounded
+	+ HasCompact
+	+ Sized
+	+ TryFrom<u8>
+	+ TryInto<u8>
+	+ TryFrom<u16>
+	+ TryInto<u16>
+	+ TryFrom<u32>
+	+ TryInto<u32>
+	+ TryFrom<u64>
+	+ TryInto<u64>
+	+ TryFrom<u128>
+	+ TryInto<u128>
+	+ TryFrom<usize>
+	+ TryInto<usize>
+	+ UniqueSaturatedFrom<u8>
+	+ UniqueSaturatedInto<u8>
+	+ UniqueSaturatedFrom<u16>
+	+ UniqueSaturatedInto<u16>
+	+ UniqueSaturatedFrom<u32>
+	+ UniqueSaturatedInto<u32>
+	+ UniqueSaturatedFrom<u64>
+	+ UniqueSaturatedInto<u64>
+	+ UniqueSaturatedFrom<u128>
+	+ UniqueSaturatedInto<u128>
+{
+}
+
+impl<
+		T: From<u8>
+			+ Zero
+			+ One
+			+ IntegerSquareRoot
+			+ Add<Self, Output = Self>
+			+ AddAssign<Self>
+			+ Sub<Self, Output = Self>
+			+ SubAssign<Self>
+			+ Mul<Self, Output = Self>
+			+ MulAssign<Self>
+			+ Div<Self, Output = Self>
+			+ DivAssign<Self>
+			+ Rem<Self, Output = Self>
+			+ RemAssign<Self>
+			+ Shl<u32, Output = Self>
+			+ Shr<u32, Output = Self>
+			+ CheckedShl
+			+ CheckedShr
+			+ CheckedAdd
+			+ CheckedSub
+			+ CheckedMul
+			+ CheckedDiv
+			+ Saturating
+			+ PartialOrd<Self>
+			+ Ord
+			+ Bounded
+			+ HasCompact
+			+ Sized
+			+ TryFrom<u8>
+			+ TryInto<u8>
+			+ TryFrom<u16>
+			+ TryInto<u16>
+			+ TryFrom<u32>
+			+ TryInto<u32>
+			+ TryFrom<u64>
+			+ TryInto<u64>
+			+ TryFrom<u128>
+			+ TryInto<u128>
+			+ TryFrom<usize>
+			+ TryInto<usize>
+			+ UniqueSaturatedFrom<u8>
+			+ UniqueSaturatedInto<u8>
+			+ UniqueSaturatedFrom<u16>
+			+ UniqueSaturatedInto<u16>
+			+ UniqueSaturatedFrom<u32>
+			+ UniqueSaturatedInto<u32>
+			+ UniqueSaturatedFrom<u64>
+			+ UniqueSaturatedInto<u64>
+			+ UniqueSaturatedFrom<u128>
+			+ UniqueSaturatedInto<u128>,
+	> BaseArithmetic for T
+{
+}
 
 /// A meta trait for arithmetic.
 ///
@@ -129,35 +200,49 @@ pub trait Saturating {
 	fn saturating_pow(self, exp: usize) -> Self;
 
 	/// Increment self by one, saturating.
-	fn saturating_inc(&mut self) where Self: One {
+	fn saturating_inc(&mut self)
+	where
+		Self: One,
+	{
 		let mut o = Self::one();
 		sp_std::mem::swap(&mut o, self);
 		*self = o.saturating_add(One::one());
 	}
 
 	/// Decrement self by one, saturating at zero.
-	fn saturating_dec(&mut self) where Self: One {
+	fn saturating_dec(&mut self)
+	where
+		Self: One,
+	{
 		let mut o = Self::one();
 		sp_std::mem::swap(&mut o, self);
 		*self = o.saturating_sub(One::one());
 	}
 
 	/// Increment self by some `amount`, saturating.
-	fn saturating_accrue(&mut self, amount: Self) where Self: One {
+	fn saturating_accrue(&mut self, amount: Self)
+	where
+		Self: One,
+	{
 		let mut o = Self::one();
 		sp_std::mem::swap(&mut o, self);
 		*self = o.saturating_add(amount);
 	}
 
 	/// Decrement self by some `amount`, saturating at zero.
-	fn saturating_reduce(&mut self, amount: Self) where Self: One {
+	fn saturating_reduce(&mut self, amount: Self)
+	where
+		Self: One,
+	{
 		let mut o = Self::one();
 		sp_std::mem::swap(&mut o, self);
 		*self = o.saturating_sub(amount);
 	}
 }
 
-impl<T: Clone + Zero + One + PartialOrd + CheckedMul + Bounded + num_traits::Saturating> Saturating for T {
+impl<T: Clone + Zero + One + PartialOrd + CheckedMul + Bounded + num_traits::Saturating> Saturating
+	for T
+{
 	fn saturating_add(self, o: Self) -> Self {
 		<Self as num_traits::Saturating>::saturating_add(self, o)
 	}
@@ -167,26 +252,24 @@ impl<T: Clone + Zero + One + PartialOrd + CheckedMul + Bounded + num_traits::Sat
 	}
 
 	fn saturating_mul(self, o: Self) -> Self {
-		self.checked_mul(&o)
-			.unwrap_or_else(||
-				if (self < T::zero()) != (o < T::zero()) {
-					Bounded::min_value()
-				} else {
-					Bounded::max_value()
-				}
-			)
+		self.checked_mul(&o).unwrap_or_else(|| {
+			if (self < T::zero()) != (o < T::zero()) {
+				Bounded::min_value()
+			} else {
+				Bounded::max_value()
+			}
+		})
 	}
 
 	fn saturating_pow(self, exp: usize) -> Self {
 		let neg = self < T::zero() && exp % 2 != 0;
-		checked_pow(self, exp)
-			.unwrap_or_else(||
-				if neg {
-					Bounded::min_value()
-				} else {
-					Bounded::max_value()
-				}
-			)
+		checked_pow(self, exp).unwrap_or_else(|| {
+			if neg {
+				Bounded::min_value()
+			} else {
+				Bounded::max_value()
+			}
+		})
 	}
 }
 
@@ -199,7 +282,10 @@ pub trait SaturatedConversion {
 	/// This just uses `UniqueSaturatedFrom` internally but with this
 	/// variant you can provide the destination type using turbofish syntax
 	/// in case Rust happens not to assume the correct type.
-	fn saturated_from<T>(t: T) -> Self where Self: UniqueSaturatedFrom<T> {
+	fn saturated_from<T>(t: T) -> Self
+	where
+		Self: UniqueSaturatedFrom<T>,
+	{
 		<Self as UniqueSaturatedFrom<T>>::unique_saturated_from(t)
 	}
 
@@ -208,7 +294,10 @@ pub trait SaturatedConversion {
 	/// This just uses `UniqueSaturatedInto` internally but with this
 	/// variant you can provide the destination type using turbofish syntax
 	/// in case Rust happens not to assume the correct type.
-	fn saturated_into<T>(self) -> T where Self: UniqueSaturatedInto<T> {
+	fn saturated_into<T>(self) -> T
+	where
+		Self: UniqueSaturatedInto<T>,
+	{
 		<Self as UniqueSaturatedInto<T>>::unique_saturated_into(self)
 	}
 }
diff --git a/primitives/authority-discovery/src/lib.rs b/primitives/authority-discovery/src/lib.rs
index b04ce43a2c74..871a35e6bf48 100644
--- a/primitives/authority-discovery/src/lib.rs
+++ b/primitives/authority-discovery/src/lib.rs
@@ -22,11 +22,7 @@
 use sp_std::vec::Vec;
 
 mod app {
-	use sp_application_crypto::{
-		key_types::AUTHORITY_DISCOVERY,
-		app_crypto,
-		sr25519,
-	};
+	use sp_application_crypto::{app_crypto, key_types::AUTHORITY_DISCOVERY, sr25519};
 	app_crypto!(sr25519, AUTHORITY_DISCOVERY);
 }
 
diff --git a/primitives/authorship/src/lib.rs b/primitives/authorship/src/lib.rs
index 1350fa17ff30..254078b8445a 100644
--- a/primitives/authorship/src/lib.rs
+++ b/primitives/authorship/src/lib.rs
@@ -19,11 +19,11 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use sp_std::{result::Result, prelude::*};
+use sp_std::{prelude::*, result::Result};
 
-use codec::{Encode, Decode};
-use sp_inherents::{Error, InherentIdentifier, InherentData, IsFatalError};
-use sp_runtime::{RuntimeString, traits::Header as HeaderT};
+use codec::{Decode, Encode};
+use sp_inherents::{Error, InherentData, InherentIdentifier, IsFatalError};
+use sp_runtime::{traits::Header as HeaderT, RuntimeString};
 
 /// The identifier for the `uncles` inherent.
 pub const INHERENT_IDENTIFIER: InherentIdentifier = *b"uncles00";
diff --git a/primitives/blockchain/src/backend.rs b/primitives/blockchain/src/backend.rs
index dbce364ce798..642e7c5b9528 100644
--- a/primitives/blockchain/src/backend.rs
+++ b/primitives/blockchain/src/backend.rs
@@ -19,11 +19,13 @@
 
 use std::sync::Arc;
 
-use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor};
-use sp_runtime::generic::BlockId;
-use sp_runtime::Justifications;
 use log::warn;
 use parking_lot::RwLock;
+use sp_runtime::{
+	generic::BlockId,
+	traits::{Block as BlockT, Header as HeaderT, NumberFor},
+	Justifications,
+};
 
 use crate::header_metadata::HeaderMetadata;
 
@@ -38,7 +40,10 @@ pub trait HeaderBackend<Block: BlockT>: Send + Sync {
 	/// Get block status.
 	fn status(&self, id: BlockId<Block>) -> Result<BlockStatus>;
 	/// Get block number by hash. Returns `None` if the header is not in the chain.
-	fn number(&self, hash: Block::Hash) -> Result<Option<<<Block as BlockT>::Header as HeaderT>::Number>>;
+	fn number(
+		&self,
+		hash: Block::Hash,
+	) -> Result<Option<<<Block as BlockT>::Header as HeaderT>::Number>>;
 	/// Get block hash by number. Returns `None` if the header is not in the chain.
 	fn hash(&self, number: NumberFor<Block>) -> Result<Option<Block::Hash>>;
 
@@ -60,28 +65,29 @@ pub trait HeaderBackend<Block: BlockT>: Send + Sync {
 
 	/// Get block header. Returns `UnknownBlock` error if block is not found.
 	fn expect_header(&self, id: BlockId<Block>) -> Result<Block::Header> {
-		self.header(id)?.ok_or_else(|| Error::UnknownBlock(format!("Expect header: {}", id)))
+		self.header(id)?
+			.ok_or_else(|| Error::UnknownBlock(format!("Expect header: {}", id)))
 	}
 
 	/// Convert an arbitrary block ID into a block number. Returns `UnknownBlock` error if block is not found.
 	fn expect_block_number_from_id(&self, id: &BlockId<Block>) -> Result<NumberFor<Block>> {
-		self.block_number_from_id(id)
-			.and_then(|n| n.ok_or_else(||
-				Error::UnknownBlock(format!("Expect block number from id: {}", id))
-			))
+		self.block_number_from_id(id).and_then(|n| {
+			n.ok_or_else(|| Error::UnknownBlock(format!("Expect block number from id: {}", id)))
+		})
 	}
 
 	/// Convert an arbitrary block ID into a block hash. Returns `UnknownBlock` error if block is not found.
 	fn expect_block_hash_from_id(&self, id: &BlockId<Block>) -> Result<Block::Hash> {
-		self.block_hash_from_id(id)
-			.and_then(|n| n.ok_or_else(||
-				Error::UnknownBlock(format!("Expect block hash from id: {}", id))
-			))
+		self.block_hash_from_id(id).and_then(|n| {
+			n.ok_or_else(|| Error::UnknownBlock(format!("Expect block hash from id: {}", id)))
+		})
 	}
 }
 
 /// Blockchain database backend. Does not perform any validation.
-pub trait Backend<Block: BlockT>: HeaderBackend<Block> + HeaderMetadata<Block, Error=Error> {
+pub trait Backend<Block: BlockT>:
+	HeaderBackend<Block> + HeaderMetadata<Block, Error = Error>
+{
 	/// Get block body. Returns `None` if block is not found.
 	fn body(&self, id: BlockId<Block>) -> Result<Option<Vec<<Block as BlockT>::Extrinsic>>>;
 	/// Get block justifications. Returns `None` if no justification exists.
@@ -120,14 +126,14 @@ pub trait Backend<Block: BlockT>: HeaderBackend<Block> + HeaderMetadata<Block, E
 			match self.header(BlockId::Hash(target_hash))? {
 				Some(x) => x,
 				// target not in blockchain
-				None => { return Ok(None); },
+				None => return Ok(None),
 			}
 		};
 
 		if let Some(max_number) = maybe_max_number {
 			// target outside search range
 			if target_header.number() > &max_number {
-				return Ok(None);
+				return Ok(None)
 			}
 		}
 
@@ -148,12 +154,12 @@ pub trait Backend<Block: BlockT>: HeaderBackend<Block> + HeaderMetadata<Block, E
 				// provided, we continue to search from all leaves below.
 				if let Some(max_number) = maybe_max_number {
 					if let Some(header) = self.hash(max_number)? {
-						return Ok(Some(header));
+						return Ok(Some(header))
 					}
 				}
 			} else if info.finalized_number >= *target_header.number() {
 				// header is on a dead fork.
-				return Ok(None);
+				return Ok(None)
 			}
 
 			self.leaves()?
@@ -171,12 +177,13 @@ pub trait Backend<Block: BlockT>: HeaderBackend<Block> + HeaderMetadata<Block, E
 			// waiting until we are <= max_number
 			if let Some(max_number) = maybe_max_number {
 				loop {
-					let current_header = self.header(BlockId::Hash(current_hash.clone()))?
+					let current_header = self
+						.header(BlockId::Hash(current_hash.clone()))?
 						.ok_or_else(|| Error::MissingHeader(current_hash.to_string()))?;
 
 					if current_header.number() <= &max_number {
 						best_hash = current_header.hash();
-						break;
+						break
 					}
 
 					current_hash = *current_header.parent_hash();
@@ -187,15 +194,16 @@ pub trait Backend<Block: BlockT>: HeaderBackend<Block> + HeaderMetadata<Block, E
 			loop {
 				// until we find target
 				if current_hash == target_hash {
-					return Ok(Some(best_hash));
+					return Ok(Some(best_hash))
 				}
 
-				let current_header = self.header(BlockId::Hash(current_hash.clone()))?
+				let current_header = self
+					.header(BlockId::Hash(current_hash.clone()))?
 					.ok_or_else(|| Error::MissingHeader(current_hash.to_string()))?;
 
 				// stop search in this chain once we go below the target's block number
 				if current_header.number() < target_header.number() {
-					break;
+					break
 				}
 
 				current_hash = *current_header.parent_hash();
@@ -209,8 +217,7 @@ pub trait Backend<Block: BlockT>: HeaderBackend<Block> + HeaderMetadata<Block, E
 		warn!(
 			"Block {:?} exists in chain but not found when following all \
 			leaves backwards. Number limit = {:?}",
-			target_hash,
-			maybe_max_number,
+			target_hash, maybe_max_number,
 		);
 
 		Ok(None)
@@ -218,10 +225,7 @@ pub trait Backend<Block: BlockT>: HeaderBackend<Block> + HeaderMetadata<Block, E
 
 	/// Get single indexed transaction by content hash. Note that this will only fetch transactions
 	/// that are indexed by the runtime with `storage_index_transaction`.
-	fn indexed_transaction(
-		&self,
-		hash: &Block::Hash,
-	) -> Result<Option<Vec<u8>>>;
+	fn indexed_transaction(&self, hash: &Block::Hash) -> Result<Option<Vec<u8>>>;
 
 	/// Check if indexed transaction exists.
 	fn has_indexed_transaction(&self, hash: &Block::Hash) -> Result<bool> {
@@ -253,7 +257,9 @@ pub trait Cache<Block: BlockT>: Send + Sync {
 		&self,
 		key: &well_known_cache_keys::Id,
 		block: &BlockId<Block>,
-	) -> Result<Option<((NumberFor<Block>, Block::Hash), Option<(NumberFor<Block>, Block::Hash)>, Vec<u8>)>>;
+	) -> Result<
+		Option<((NumberFor<Block>, Block::Hash), Option<(NumberFor<Block>, Block::Hash)>, Vec<u8>)>,
+	>;
 }
 
 /// Blockchain info
@@ -272,7 +278,7 @@ pub struct Info<Block: BlockT> {
 	/// Last finalized state.
 	pub finalized_state: Option<(Block::Hash, <<Block as BlockT>::Header as HeaderT>::Number)>,
 	/// Number of concurrent leave forks.
-	pub number_leaves: usize
+	pub number_leaves: usize,
 }
 
 /// Block status.
diff --git a/primitives/blockchain/src/error.rs b/primitives/blockchain/src/error.rs
index 0d6ac10a8800..bc27c36401e8 100644
--- a/primitives/blockchain/src/error.rs
+++ b/primitives/blockchain/src/error.rs
@@ -17,12 +17,12 @@
 
 //! Substrate client possible errors.
 
-use std::{self, result};
-use sp_state_machine;
-use sp_runtime::transaction_validity::TransactionValidityError;
-use sp_consensus;
 use codec::Error as CodecError;
 use sp_api::ApiError;
+use sp_consensus;
+use sp_runtime::transaction_validity::TransactionValidityError;
+use sp_state_machine;
+use std::{self, result};
 
 /// Client Result type alias
 pub type Result<T> = result::Result<T, Error>;
@@ -205,7 +205,10 @@ impl Error {
 	/// Construct from a state db error.
 	// Can not be done directly, since that would make cargo run out of stack if
 	// `sc-state-db` is lib is added as dependency.
-	pub fn from_state_db<E>(e: E) -> Self where E: std::fmt::Debug {
+	pub fn from_state_db<E>(e: E) -> Self
+	where
+		E: std::fmt::Debug,
+	{
 		Error::StateDatabase(format!("{:?}", e))
 	}
 }
diff --git a/primitives/blockchain/src/header_metadata.rs b/primitives/blockchain/src/header_metadata.rs
index 87d0057f32c2..928409963bcd 100644
--- a/primitives/blockchain/src/header_metadata.rs
+++ b/primitives/blockchain/src/header_metadata.rs
@@ -18,9 +18,9 @@
 //! Implements tree backend, cached header metadata and algorithms
 //! to compute routes efficiently over the tree of headers.
 
-use sp_runtime::traits::{Block as BlockT, NumberFor, Header};
-use parking_lot::RwLock;
 use lru::LruCache;
+use parking_lot::RwLock;
+use sp_runtime::traits::{Block as BlockT, Header, NumberFor};
 
 /// Set to the expected max difference between `best` and `finalized` blocks at sync.
 const LRU_CACHE_SIZE: usize = 5_000;
@@ -86,10 +86,7 @@ pub fn lowest_common_ancestor<Block: BlockT, T: HeaderMetadata<Block> + ?Sized>(
 		backend.insert_header_metadata(orig_header_two.hash, orig_header_two);
 	}
 
-	Ok(HashAndNumber {
-		hash: header_one.hash,
-		number: header_one.number,
-	})
+	Ok(HashAndNumber { hash: header_one.hash, number: header_one.number })
 }
 
 /// Compute a tree-route between two blocks. See tree-route docs for more details.
@@ -105,51 +102,33 @@ pub fn tree_route<Block: BlockT, T: HeaderMetadata<Block>>(
 	let mut to_branch = Vec::new();
 
 	while to.number > from.number {
-		to_branch.push(HashAndNumber {
-			number: to.number,
-			hash: to.hash,
-		});
+		to_branch.push(HashAndNumber { number: to.number, hash: to.hash });
 
 		to = backend.header_metadata(to.parent)?;
 	}
 
 	while from.number > to.number {
-		from_branch.push(HashAndNumber {
-			number: from.number,
-			hash: from.hash,
-		});
+		from_branch.push(HashAndNumber { number: from.number, hash: from.hash });
 		from = backend.header_metadata(from.parent)?;
 	}
 
 	// numbers are equal now. walk backwards until the block is the same
 
 	while to.hash != from.hash {
-		to_branch.push(HashAndNumber {
-			number: to.number,
-			hash: to.hash,
-		});
+		to_branch.push(HashAndNumber { number: to.number, hash: to.hash });
 		to = backend.header_metadata(to.parent)?;
 
-		from_branch.push(HashAndNumber {
-			number: from.number,
-			hash: from.hash,
-		});
+		from_branch.push(HashAndNumber { number: from.number, hash: from.hash });
 		from = backend.header_metadata(from.parent)?;
 	}
 
 	// add the pivot block. and append the reversed to-branch
 	// (note that it's reverse order originals)
 	let pivot = from_branch.len();
-	from_branch.push(HashAndNumber {
-		number: to.number,
-		hash: to.hash,
-	});
+	from_branch.push(HashAndNumber { number: to.number, hash: to.hash });
 	from_branch.extend(to_branch.into_iter().rev());
 
-	Ok(TreeRoute {
-		route: from_branch,
-		pivot,
-	})
+	Ok(TreeRoute { route: from_branch, pivot })
 }
 
 /// Hash and number of a block.
@@ -204,14 +183,16 @@ impl<Block: BlockT> TreeRoute<Block> {
 	/// Get the common ancestor block. This might be one of the two blocks of the
 	/// route.
 	pub fn common_block(&self) -> &HashAndNumber<Block> {
-		self.route.get(self.pivot).expect("tree-routes are computed between blocks; \
+		self.route.get(self.pivot).expect(
+			"tree-routes are computed between blocks; \
 			which are included in the route; \
-			thus it is never empty; qed")
+			thus it is never empty; qed",
+		)
 	}
 
 	/// Get a slice of enacted blocks (descendents of the common ancestor)
 	pub fn enacted(&self) -> &[HashAndNumber<Block>] {
-		&self.route[self.pivot + 1 ..]
+		&self.route[self.pivot + 1..]
 	}
 }
 
@@ -240,17 +221,13 @@ pub struct HeaderMetadataCache<Block: BlockT> {
 impl<Block: BlockT> HeaderMetadataCache<Block> {
 	/// Creates a new LRU header metadata cache with `capacity`.
 	pub fn new(capacity: usize) -> Self {
-		HeaderMetadataCache {
-			cache: RwLock::new(LruCache::new(capacity)),
-		}
+		HeaderMetadataCache { cache: RwLock::new(LruCache::new(capacity)) }
 	}
 }
 
 impl<Block: BlockT> Default for HeaderMetadataCache<Block> {
 	fn default() -> Self {
-		HeaderMetadataCache {
-			cache: RwLock::new(LruCache::new(LRU_CACHE_SIZE)),
-		}
+		HeaderMetadataCache { cache: RwLock::new(LruCache::new(LRU_CACHE_SIZE)) }
 	}
 }
 
diff --git a/primitives/blockchain/src/lib.rs b/primitives/blockchain/src/lib.rs
index 696050f57ac8..cd36cabe1551 100644
--- a/primitives/blockchain/src/lib.rs
+++ b/primitives/blockchain/src/lib.rs
@@ -18,9 +18,9 @@
 //! Substrate blockchain traits and primitives.
 
 mod backend;
-mod header_metadata;
 mod error;
+mod header_metadata;
 
-pub use error::*;
 pub use backend::*;
+pub use error::*;
 pub use header_metadata::*;
diff --git a/primitives/consensus/aura/src/digests.rs b/primitives/consensus/aura/src/digests.rs
index e93214eeb4ba..eaa29036d98a 100644
--- a/primitives/consensus/aura/src/digests.rs
+++ b/primitives/consensus/aura/src/digests.rs
@@ -22,9 +22,9 @@
 //! `CompatibleDigestItem` trait to appear in public interfaces.
 
 use crate::AURA_ENGINE_ID;
-use sp_runtime::generic::DigestItem;
+use codec::{Codec, Encode};
 use sp_consensus_slots::Slot;
-use codec::{Encode, Codec};
+use sp_runtime::generic::DigestItem;
 use sp_std::fmt::Debug;
 
 /// A digest item which is usable with aura consensus.
@@ -42,9 +42,10 @@ pub trait CompatibleDigestItem<Signature>: Sized {
 	fn as_aura_pre_digest(&self) -> Option<Slot>;
 }
 
-impl<Signature, Hash> CompatibleDigestItem<Signature> for DigestItem<Hash> where
+impl<Signature, Hash> CompatibleDigestItem<Signature> for DigestItem<Hash>
+where
 	Signature: Codec,
-	Hash: Debug + Send + Sync + Eq + Clone + Codec + 'static
+	Hash: Debug + Send + Sync + Eq + Clone + Codec + 'static,
 {
 	fn aura_seal(signature: Signature) -> Self {
 		DigestItem::Seal(AURA_ENGINE_ID, signature.encode())
diff --git a/primitives/consensus/aura/src/inherents.rs b/primitives/consensus/aura/src/inherents.rs
index 294f544f6725..2a797b5d3f39 100644
--- a/primitives/consensus/aura/src/inherents.rs
+++ b/primitives/consensus/aura/src/inherents.rs
@@ -16,8 +16,7 @@
 // limitations under the License.
 
 /// Contains the inherents for the AURA module
-
-use sp_inherents::{InherentIdentifier, InherentData, Error};
+use sp_inherents::{Error, InherentData, InherentIdentifier};
 
 /// The Aura inherent identifier.
 pub const INHERENT_IDENTIFIER: InherentIdentifier = *b"auraslot";
@@ -28,13 +27,13 @@ pub type InherentType = sp_consensus_slots::Slot;
 /// Auxiliary trait to extract Aura inherent data.
 pub trait AuraInherentData {
 	/// Get aura inherent data.
-	fn aura_inherent_data(&self) ->Result<Option<InherentType>, Error>;
+	fn aura_inherent_data(&self) -> Result<Option<InherentType>, Error>;
 	/// Replace aura inherent data.
 	fn aura_replace_inherent_data(&mut self, new: InherentType);
 }
 
 impl AuraInherentData for InherentData {
-	fn aura_inherent_data(&self) ->Result<Option<InherentType>, Error> {
+	fn aura_inherent_data(&self) -> Result<Option<InherentType>, Error> {
 		self.get_data(&INHERENT_IDENTIFIER)
 	}
 
@@ -54,9 +53,7 @@ pub struct InherentDataProvider {
 impl InherentDataProvider {
 	/// Create a new instance with the given slot.
 	pub fn new(slot: InherentType) -> Self {
-		Self {
-			slot,
-		}
+		Self { slot }
 	}
 
 	/// Creates the inherent data provider by calculating the slot from the given
@@ -65,13 +62,10 @@ impl InherentDataProvider {
 		timestamp: sp_timestamp::Timestamp,
 		duration: std::time::Duration,
 	) -> Self {
-		let slot = InherentType::from(
-			(timestamp.as_duration().as_millis() / duration.as_millis()) as u64
-		);
+		let slot =
+			InherentType::from((timestamp.as_duration().as_millis() / duration.as_millis()) as u64);
 
-		Self {
-			slot,
-		}
+		Self { slot }
 	}
 }
 
@@ -87,10 +81,7 @@ impl sp_std::ops::Deref for InherentDataProvider {
 #[cfg(feature = "std")]
 #[async_trait::async_trait]
 impl sp_inherents::InherentDataProvider for InherentDataProvider {
-	fn provide_inherent_data(
-		&self,
-		inherent_data: &mut InherentData,
-	) ->Result<(), Error> {
+	fn provide_inherent_data(&self, inherent_data: &mut InherentData) -> Result<(), Error> {
 		inherent_data.put_data(INHERENT_IDENTIFIER, &self.slot)
 	}
 
diff --git a/primitives/consensus/aura/src/lib.rs b/primitives/consensus/aura/src/lib.rs
index a28e681fda27..e6a319c1d159 100644
--- a/primitives/consensus/aura/src/lib.rs
+++ b/primitives/consensus/aura/src/lib.rs
@@ -19,9 +19,9 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use codec::{Encode, Decode, Codec};
-use sp_std::vec::Vec;
+use codec::{Codec, Decode, Encode};
 use sp_runtime::ConsensusEngineId;
+use sp_std::vec::Vec;
 
 pub mod digests;
 pub mod inherents;
@@ -46,7 +46,7 @@ pub mod sr25519 {
 
 pub mod ed25519 {
 	mod app_ed25519 {
-		use sp_application_crypto::{app_crypto, key_types::AURA, ed25519};
+		use sp_application_crypto::{app_crypto, ed25519, key_types::AURA};
 		app_crypto!(ed25519, AURA);
 	}
 
diff --git a/primitives/consensus/babe/src/digests.rs b/primitives/consensus/babe/src/digests.rs
index f34a38bc8b01..682894f5837b 100644
--- a/primitives/consensus/babe/src/digests.rs
+++ b/primitives/consensus/babe/src/digests.rs
@@ -22,8 +22,8 @@ use super::{
 	BabeEpochConfiguration, Slot, BABE_ENGINE_ID,
 };
 use codec::{Codec, Decode, Encode};
-use sp_std::vec::Vec;
 use sp_runtime::{DigestItem, RuntimeDebug};
+use sp_std::vec::Vec;
 
 use sp_consensus_vrf::schnorrkel::{Randomness, VRFOutput, VRFProof};
 
@@ -143,14 +143,13 @@ pub enum NextConfigDescriptor {
 		c: (u64, u64),
 		/// Value of `allowed_slots` in `BabeEpochConfiguration`.
 		allowed_slots: AllowedSlots,
-	}
+	},
 }
 
 impl From<NextConfigDescriptor> for BabeEpochConfiguration {
 	fn from(desc: NextConfigDescriptor) -> Self {
 		match desc {
-			NextConfigDescriptor::V1 { c, allowed_slots } =>
-				Self { c, allowed_slots },
+			NextConfigDescriptor::V1 { c, allowed_slots } => Self { c, allowed_slots },
 		}
 	}
 }
@@ -176,8 +175,9 @@ pub trait CompatibleDigestItem: Sized {
 	fn as_next_config_descriptor(&self) -> Option<NextConfigDescriptor>;
 }
 
-impl<Hash> CompatibleDigestItem for DigestItem<Hash> where
-	Hash: Send + Sync + Eq + Clone + Codec + 'static
+impl<Hash> CompatibleDigestItem for DigestItem<Hash>
+where
+	Hash: Send + Sync + Eq + Clone + Codec + 'static,
 {
 	fn babe_pre_digest(digest: PreDigest) -> Self {
 		DigestItem::PreRuntime(BABE_ENGINE_ID, digest.encode())
diff --git a/primitives/consensus/babe/src/inherents.rs b/primitives/consensus/babe/src/inherents.rs
index e160ca8644bc..cecd61998a4d 100644
--- a/primitives/consensus/babe/src/inherents.rs
+++ b/primitives/consensus/babe/src/inherents.rs
@@ -17,7 +17,7 @@
 
 //! Inherents for BABE
 
-use sp_inherents::{InherentData, InherentIdentifier, Error};
+use sp_inherents::{Error, InherentData, InherentIdentifier};
 
 use sp_std::result::Result;
 
@@ -64,13 +64,10 @@ impl InherentDataProvider {
 		timestamp: sp_timestamp::Timestamp,
 		duration: std::time::Duration,
 	) -> Self {
-		let slot = InherentType::from(
-			(timestamp.as_duration().as_millis() / duration.as_millis()) as u64
-		);
+		let slot =
+			InherentType::from((timestamp.as_duration().as_millis() / duration.as_millis()) as u64);
 
-		Self {
-			slot,
-		}
+		Self { slot }
 	}
 
 	/// Returns the `slot` of this inherent data provider.
diff --git a/primitives/consensus/babe/src/lib.rs b/primitives/consensus/babe/src/lib.rs
index 3609a0b8ce32..3f2fc7e1f5e6 100644
--- a/primitives/consensus/babe/src/lib.rs
+++ b/primitives/consensus/babe/src/lib.rs
@@ -30,7 +30,7 @@ pub use sp_consensus_vrf::schnorrkel::{
 
 use codec::{Decode, Encode};
 #[cfg(feature = "std")]
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 #[cfg(feature = "std")]
 use sp_keystore::vrf::{VRFTranscriptData, VRFTranscriptValue};
 use sp_runtime::{traits::Header, ConsensusEngineId, RuntimeDebug};
@@ -96,11 +96,7 @@ pub type BabeAuthorityWeight = u64;
 pub type BabeBlockWeight = u32;
 
 /// Make a VRF transcript from given randomness, slot number and epoch.
-pub fn make_transcript(
-	randomness: &Randomness,
-	slot: Slot,
-	epoch: u64,
-) -> Transcript {
+pub fn make_transcript(randomness: &Randomness, slot: Slot, epoch: u64) -> Transcript {
 	let mut transcript = Transcript::new(&BABE_ENGINE_ID);
 	transcript.append_u64(b"slot number", *slot);
 	transcript.append_u64(b"current epoch", epoch);
@@ -110,18 +106,14 @@ pub fn make_transcript(
 
 /// Make a VRF transcript data container
 #[cfg(feature = "std")]
-pub fn make_transcript_data(
-	randomness: &Randomness,
-	slot: Slot,
-	epoch: u64,
-) -> VRFTranscriptData {
+pub fn make_transcript_data(randomness: &Randomness, slot: Slot, epoch: u64) -> VRFTranscriptData {
 	VRFTranscriptData {
 		label: &BABE_ENGINE_ID,
 		items: vec![
 			("slot number", VRFTranscriptValue::U64(*slot)),
 			("current epoch", VRFTranscriptValue::U64(epoch)),
 			("chain randomness", VRFTranscriptValue::Bytes(randomness.to_vec())),
-		]
+		],
 	}
 }
 
@@ -280,20 +272,15 @@ where
 	use digests::*;
 	use sp_application_crypto::RuntimeAppPublic;
 
-	let find_pre_digest = |header: &H| {
-		header
-			.digest()
-			.logs()
-			.iter()
-			.find_map(|log| log.as_babe_pre_digest())
-	};
+	let find_pre_digest =
+		|header: &H| header.digest().logs().iter().find_map(|log| log.as_babe_pre_digest());
 
 	let verify_seal_signature = |mut header: H, offender: &AuthorityId| {
 		let seal = header.digest_mut().pop()?.as_babe_seal()?;
 		let pre_hash = header.hash();
 
 		if !offender.verify(&pre_hash.as_ref(), &seal) {
-			return None;
+			return None
 		}
 
 		Some(())
@@ -302,7 +289,7 @@ where
 	let verify_proof = || {
 		// we must have different headers for the equivocation to be valid
 		if proof.first_header.hash() == proof.second_header.hash() {
-			return None;
+			return None
 		}
 
 		let first_pre_digest = find_pre_digest(&proof.first_header)?;
@@ -313,12 +300,12 @@ where
 		if proof.slot != first_pre_digest.slot() ||
 			first_pre_digest.slot() != second_pre_digest.slot()
 		{
-			return None;
+			return None
 		}
 
 		// both headers must have been authored by the same authority
 		if first_pre_digest.authority_index() != second_pre_digest.authority_index() {
-			return None;
+			return None
 		}
 
 		// we finally verify that the expected authority has signed both headers and
diff --git a/primitives/consensus/common/src/block_import.rs b/primitives/consensus/common/src/block_import.rs
index a444e15095ef..c742e24a0cc0 100644
--- a/primitives/consensus/common/src/block_import.rs
+++ b/primitives/consensus/common/src/block_import.rs
@@ -17,16 +17,14 @@
 
 //! Block import helpers.
 
-use sp_runtime::traits::{Block as BlockT, DigestItemFor, Header as HeaderT, NumberFor, HashFor};
-use sp_runtime::{Justification, Justifications};
-use serde::{Serialize, Deserialize};
-use std::borrow::Cow;
-use std::collections::HashMap;
-use std::sync::Arc;
-use std::any::Any;
+use serde::{Deserialize, Serialize};
+use sp_runtime::{
+	traits::{Block as BlockT, DigestItemFor, HashFor, Header as HeaderT, NumberFor},
+	Justification, Justifications,
+};
+use std::{any::Any, borrow::Cow, collections::HashMap, sync::Arc};
 
-use crate::Error;
-use crate::import_queue::CacheKeyId;
+use crate::{import_queue::CacheKeyId, Error};
 
 /// Block import result.
 #[derive(Debug, PartialEq, Eq)]
@@ -88,8 +86,8 @@ impl ImportResult {
 				if aux.needs_justification {
 					justification_sync_link.request_justification(hash, number);
 				}
-			}
-			_ => {}
+			},
+			_ => {},
 		}
 	}
 }
@@ -154,9 +152,7 @@ pub struct ImportedState<B: BlockT> {
 
 impl<B: BlockT> std::fmt::Debug for ImportedState<B> {
 	fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {
-		fmt.debug_struct("ImportedState")
-			.field("block", &self.block)
-			.finish()
+		fmt.debug_struct("ImportedState").field("block", &self.block).finish()
 	}
 }
 
@@ -226,12 +222,10 @@ pub struct BlockImportParams<Block: BlockT, Transaction> {
 
 impl<Block: BlockT, Transaction> BlockImportParams<Block, Transaction> {
 	/// Create a new block import params.
-	pub fn new(
-		origin: BlockOrigin,
-		header: Block::Header,
-	) -> Self {
+	pub fn new(origin: BlockOrigin, header: Block::Header) -> Self {
 		Self {
-			origin, header,
+			origin,
+			header,
 			justifications: None,
 			post_digests: Vec::new(),
 			body: None,
@@ -273,7 +267,9 @@ impl<Block: BlockT, Transaction> BlockImportParams<Block, Transaction> {
 	///
 	/// Actually this just sets `StorageChanges::Changes` to `None` and makes rustc think that `Self` now
 	/// uses a different transaction type.
-	pub fn clear_storage_changes_and_mutate<Transaction2>(self) -> BlockImportParams<Block, Transaction2> {
+	pub fn clear_storage_changes_and_mutate<Transaction2>(
+		self,
+	) -> BlockImportParams<Block, Transaction2> {
 		// Preserve imported state.
 		let state_action = match self.state_action {
 			StateAction::ApplyChanges(StorageChanges::Import(state)) =>
@@ -305,14 +301,15 @@ impl<Block: BlockT, Transaction> BlockImportParams<Block, Transaction> {
 		let (k, v) = self.intermediates.remove_entry(key).ok_or(Error::NoIntermediate)?;
 
 		v.downcast::<T>().or_else(|v| {
-				self.intermediates.insert(k, v);
-				Err(Error::InvalidIntermediate)
+			self.intermediates.insert(k, v);
+			Err(Error::InvalidIntermediate)
 		})
 	}
 
 	/// Get a reference to a given intermediate.
 	pub fn intermediate<T: 'static>(&self, key: &[u8]) -> Result<&T, Error> {
-		self.intermediates.get(key)
+		self.intermediates
+			.get(key)
 			.ok_or(Error::NoIntermediate)?
 			.downcast_ref::<T>()
 			.ok_or(Error::InvalidIntermediate)
@@ -320,7 +317,8 @@ impl<Block: BlockT, Transaction> BlockImportParams<Block, Transaction> {
 
 	/// Get a mutable reference to a given intermediate.
 	pub fn intermediate_mut<T: 'static>(&mut self, key: &[u8]) -> Result<&mut T, Error> {
-		self.intermediates.get_mut(key)
+		self.intermediates
+			.get_mut(key)
 			.ok_or(Error::NoIntermediate)?
 			.downcast_mut::<T>()
 			.ok_or(Error::InvalidIntermediate)
@@ -353,8 +351,8 @@ pub trait BlockImport<B: BlockT> {
 
 #[async_trait::async_trait]
 impl<B: BlockT, Transaction> BlockImport<B> for crate::import_queue::BoxBlockImport<B, Transaction>
-	where
-		Transaction: Send + 'static,
+where
+	Transaction: Send + 'static,
 {
 	type Error = crate::error::Error;
 	type Transaction = Transaction;
@@ -381,10 +379,10 @@ impl<B: BlockT, Transaction> BlockImport<B> for crate::import_queue::BoxBlockImp
 
 #[async_trait::async_trait]
 impl<B: BlockT, T, E: std::error::Error + Send + 'static, Transaction> BlockImport<B> for Arc<T>
-	where
-		for<'r> &'r T: BlockImport<B, Error = E, Transaction = Transaction>,
-		T: Send + Sync,
-		Transaction: Send + 'static,
+where
+	for<'r> &'r T: BlockImport<B, Error = E, Transaction = Transaction>,
+	T: Send + Sync,
+	Transaction: Send + 'static,
 {
 	type Error = E;
 	type Transaction = Transaction;
diff --git a/primitives/consensus/common/src/block_validation.rs b/primitives/consensus/common/src/block_validation.rs
index fb0846fe9901..9a9f21394f9a 100644
--- a/primitives/consensus/common/src/block_validation.rs
+++ b/primitives/consensus/common/src/block_validation.rs
@@ -18,9 +18,9 @@
 //! Block announcement validation.
 
 use crate::BlockStatus;
+use futures::FutureExt as _;
 use sp_runtime::{generic::BlockId, traits::Block};
 use std::{error::Error, future::Future, pin::Pin, sync::Arc};
-use futures::FutureExt as _;
 
 /// A type which provides access to chain information.
 pub trait Chain<B: Block> {
@@ -92,6 +92,7 @@ impl<B: Block> BlockAnnounceValidator<B> for DefaultBlockAnnounceValidator {
 			} else {
 				Ok(Validation::Success { is_new_best: false })
 			}
-		}.boxed()
+		}
+		.boxed()
 	}
 }
diff --git a/primitives/consensus/common/src/error.rs b/primitives/consensus/common/src/error.rs
index d7461fe92032..546f30d3e820 100644
--- a/primitives/consensus/common/src/error.rs
+++ b/primitives/consensus/common/src/error.rs
@@ -16,8 +16,8 @@
 // limitations under the License.
 
 //! Error types in Consensus
-use sp_version::RuntimeVersion;
 use sp_core::ed25519::Public;
+use sp_version::RuntimeVersion;
 use std::error;
 
 /// Result type alias.
@@ -58,8 +58,10 @@ pub enum Error {
 	#[error("Message sender {0:?} is not a valid authority")]
 	InvalidAuthority(Public),
 	/// Authoring interface does not match the runtime.
-	#[error("Authoring for current \
-				runtime is not supported. Native ({native}) cannot author for on-chain ({on_chain}).")]
+	#[error(
+		"Authoring for current \
+				runtime is not supported. Native ({native}) cannot author for on-chain ({on_chain})."
+	)]
 	IncompatibleAuthoringRuntime { native: RuntimeVersion, on_chain: RuntimeVersion },
 	/// Authoring interface does not match the runtime.
 	#[error("Authoring for current runtime is not supported since it has no version.")]
@@ -81,7 +83,7 @@ pub enum Error {
 	ChainLookup(String),
 	/// Signing failed
 	#[error("Failed to sign using key: {0:?}. Reason: {1}")]
-	CannotSign(Vec<u8>, String)
+	CannotSign(Vec<u8>, String),
 }
 
 impl core::convert::From<Public> for Error {
diff --git a/primitives/consensus/common/src/evaluation.rs b/primitives/consensus/common/src/evaluation.rs
index c18c8b127f99..19be5e552634 100644
--- a/primitives/consensus/common/src/evaluation.rs
+++ b/primitives/consensus/common/src/evaluation.rs
@@ -18,7 +18,7 @@
 //! Block evaluation and evaluation errors.
 
 use codec::Encode;
-use sp_runtime::traits::{Block as BlockT, Header as HeaderT, One, CheckedConversion};
+use sp_runtime::traits::{Block as BlockT, CheckedConversion, Header as HeaderT, One};
 
 // This is just a best effort to encode the number. None indicated that it's too big to encode
 // in a u128.
@@ -48,15 +48,13 @@ pub fn evaluate_initial<Block: BlockT>(
 	parent_hash: &<Block as BlockT>::Hash,
 	parent_number: <<Block as BlockT>::Header as HeaderT>::Number,
 ) -> Result<()> {
-
 	let encoded = Encode::encode(proposal);
-	let proposal = Block::decode(&mut &encoded[..])
-		.map_err(|e| Error::BadProposalFormat(e))?;
+	let proposal = Block::decode(&mut &encoded[..]).map_err(|e| Error::BadProposalFormat(e))?;
 
 	if *parent_hash != *proposal.header().parent_hash() {
 		return Err(Error::WrongParentHash {
 			expected: format!("{:?}", *parent_hash),
-			got: format!("{:?}", proposal.header().parent_hash())
+			got: format!("{:?}", proposal.header().parent_hash()),
 		})
 	}
 
diff --git a/primitives/consensus/common/src/import_queue.rs b/primitives/consensus/common/src/import_queue.rs
index 6cac6b1ff920..6eb8d0a750a2 100644
--- a/primitives/consensus/common/src/import_queue.rs
+++ b/primitives/consensus/common/src/import_queue.rs
@@ -28,14 +28,17 @@
 
 use std::collections::HashMap;
 
-use sp_runtime::{Justifications, traits::{Block as BlockT, Header as _, NumberFor}};
+use sp_runtime::{
+	traits::{Block as BlockT, Header as _, NumberFor},
+	Justifications,
+};
 
 use crate::{
-	error::Error as ConsensusError,
 	block_import::{
-		BlockImport, BlockOrigin, BlockImportParams, ImportedAux, JustificationImport, ImportResult,
-		BlockCheckParams, ImportedState, StateAction,
+		BlockCheckParams, BlockImport, BlockImportParams, BlockOrigin, ImportResult, ImportedAux,
+		ImportedState, JustificationImport, StateAction,
 	},
+	error::Error as ConsensusError,
 	metrics::Metrics,
 };
 pub use basic_queue::BasicQueue;
@@ -43,18 +46,19 @@ pub use basic_queue::BasicQueue;
 /// A commonly-used Import Queue type.
 ///
 /// This defines the transaction type of the `BasicQueue` to be the transaction type for a client.
-pub type DefaultImportQueue<Block, Client> = BasicQueue<Block, sp_api::TransactionFor<Client, Block>>;
+pub type DefaultImportQueue<Block, Client> =
+	BasicQueue<Block, sp_api::TransactionFor<Client, Block>>;
 
 mod basic_queue;
 pub mod buffered_link;
 
 /// Shared block import struct used by the queue.
-pub type BoxBlockImport<B, Transaction> = Box<
-	dyn BlockImport<B, Error = ConsensusError, Transaction = Transaction> + Send + Sync
->;
+pub type BoxBlockImport<B, Transaction> =
+	Box<dyn BlockImport<B, Error = ConsensusError, Transaction = Transaction> + Send + Sync>;
 
 /// Shared justification import struct used by the queue.
-pub type BoxJustificationImport<B> = Box<dyn JustificationImport<B, Error=ConsensusError> + Send + Sync>;
+pub type BoxJustificationImport<B> =
+	Box<dyn JustificationImport<B, Error = ConsensusError> + Send + Sync>;
 
 /// Maps to the Origin used by the network.
 pub type Origin = libp2p::PeerId;
@@ -115,7 +119,7 @@ pub trait ImportQueue<B: BlockT>: Send {
 		who: Origin,
 		hash: B::Hash,
 		number: NumberFor<B>,
-		justifications: Justifications
+		justifications: Justifications,
 	);
 	/// Polls for actions to perform on the network.
 	///
@@ -133,10 +137,18 @@ pub trait Link<B: BlockT>: Send {
 		&mut self,
 		_imported: usize,
 		_count: usize,
-		_results: Vec<(Result<BlockImportResult<NumberFor<B>>, BlockImportError>, B::Hash)>
-	) {}
+		_results: Vec<(Result<BlockImportResult<NumberFor<B>>, BlockImportError>, B::Hash)>,
+	) {
+	}
 	/// Justification import result.
-	fn justification_imported(&mut self, _who: Origin, _hash: &B::Hash, _number: NumberFor<B>, _success: bool) {}
+	fn justification_imported(
+		&mut self,
+		_who: Origin,
+		_hash: &B::Hash,
+		_number: NumberFor<B>,
+		_success: bool,
+	) {
+	}
 	/// Request a justification for the given block.
 	fn request_justification(&mut self, _hash: &B::Hash, _number: NumberFor<B>) {}
 }
@@ -180,7 +192,11 @@ pub async fn import_single_block<B: BlockT, V: Verifier<B>, Transaction: Send +
 }
 
 /// Single block import function with metering.
-pub(crate) async fn import_single_block_metered<B: BlockT, V: Verifier<B>, Transaction: Send + 'static>(
+pub(crate) async fn import_single_block_metered<
+	B: BlockT,
+	V: Verifier<B>,
+	Transaction: Send + 'static,
+>(
 	import_handle: &mut impl BlockImport<B, Transaction = Transaction, Error = ConsensusError>,
 	block_origin: BlockOrigin,
 	block: IncomingBlock<B>,
@@ -207,60 +223,61 @@ pub(crate) async fn import_single_block_metered<B: BlockT, V: Verifier<B>, Trans
 	let hash = header.hash();
 	let parent_hash = header.parent_hash().clone();
 
-	let import_handler = |import| {
-		match import {
-			Ok(ImportResult::AlreadyInChain) => {
-				trace!(target: "sync", "Block already in chain {}: {:?}", number, hash);
-				Ok(BlockImportResult::ImportedKnown(number, peer.clone()))
-			},
-			Ok(ImportResult::Imported(aux)) => Ok(BlockImportResult::ImportedUnknown(number, aux, peer.clone())),
-			Ok(ImportResult::MissingState) => {
-				debug!(target: "sync", "Parent state is missing for {}: {:?}, parent: {:?}", number, hash, parent_hash);
-				Err(BlockImportError::MissingState)
-			},
-			Ok(ImportResult::UnknownParent) => {
-				debug!(target: "sync", "Block with unknown parent {}: {:?}, parent: {:?}", number, hash, parent_hash);
-				Err(BlockImportError::UnknownParent)
-			},
-			Ok(ImportResult::KnownBad) => {
-				debug!(target: "sync", "Peer gave us a bad block {}: {:?}", number, hash);
-				Err(BlockImportError::BadBlock(peer.clone()))
-			},
-			Err(e) => {
-				debug!(target: "sync", "Error importing block {}: {:?}: {:?}", number, hash, e);
-				Err(BlockImportError::Other(e))
-			}
-		}
+	let import_handler = |import| match import {
+		Ok(ImportResult::AlreadyInChain) => {
+			trace!(target: "sync", "Block already in chain {}: {:?}", number, hash);
+			Ok(BlockImportResult::ImportedKnown(number, peer.clone()))
+		},
+		Ok(ImportResult::Imported(aux)) =>
+			Ok(BlockImportResult::ImportedUnknown(number, aux, peer.clone())),
+		Ok(ImportResult::MissingState) => {
+			debug!(target: "sync", "Parent state is missing for {}: {:?}, parent: {:?}", number, hash, parent_hash);
+			Err(BlockImportError::MissingState)
+		},
+		Ok(ImportResult::UnknownParent) => {
+			debug!(target: "sync", "Block with unknown parent {}: {:?}, parent: {:?}", number, hash, parent_hash);
+			Err(BlockImportError::UnknownParent)
+		},
+		Ok(ImportResult::KnownBad) => {
+			debug!(target: "sync", "Peer gave us a bad block {}: {:?}", number, hash);
+			Err(BlockImportError::BadBlock(peer.clone()))
+		},
+		Err(e) => {
+			debug!(target: "sync", "Error importing block {}: {:?}: {:?}", number, hash, e);
+			Err(BlockImportError::Other(e))
+		},
 	};
 
-	match import_handler(import_handle.check_block(BlockCheckParams {
-		hash,
-		number,
-		parent_hash,
-		allow_missing_state: block.allow_missing_state,
-		import_existing: block.import_existing,
-	}).await)? {
+	match import_handler(
+		import_handle
+			.check_block(BlockCheckParams {
+				hash,
+				number,
+				parent_hash,
+				allow_missing_state: block.allow_missing_state,
+				import_existing: block.import_existing,
+			})
+			.await,
+	)? {
 		BlockImportResult::ImportedUnknown { .. } => (),
 		r => return Ok(r), // Any other successful result means that the block is already imported.
 	}
 
 	let started = wasm_timer::Instant::now();
-	let (mut import_block, maybe_keys) = verifier.verify(
-		block_origin,
-		header,
-		justifications,
-		block.body
-	).await.map_err(|msg| {
-		if let Some(ref peer) = peer {
-			trace!(target: "sync", "Verifying {}({}) from {} failed: {}", number, hash, peer, msg);
-		} else {
-			trace!(target: "sync", "Verifying {}({}) failed: {}", number, hash, msg);
-		}
-		if let Some(metrics) = metrics.as_ref() {
-			metrics.report_verification(false, started.elapsed());
-		}
-		BlockImportError::VerificationFailed(peer.clone(), msg)
-	})?;
+	let (mut import_block, maybe_keys) = verifier
+		.verify(block_origin, header, justifications, block.body)
+		.await
+		.map_err(|msg| {
+			if let Some(ref peer) = peer {
+				trace!(target: "sync", "Verifying {}({}) from {} failed: {}", number, hash, peer, msg);
+			} else {
+				trace!(target: "sync", "Verifying {}({}) failed: {}", number, hash, msg);
+			}
+			if let Some(metrics) = metrics.as_ref() {
+				metrics.report_verification(false, started.elapsed());
+			}
+			BlockImportError::VerificationFailed(peer.clone(), msg)
+		})?;
 
 	if let Some(metrics) = metrics.as_ref() {
 		metrics.report_verification(true, started.elapsed());
diff --git a/primitives/consensus/common/src/import_queue/basic_queue.rs b/primitives/consensus/common/src/import_queue/basic_queue.rs
index 8dd40d84df30..2610a92ad83e 100644
--- a/primitives/consensus/common/src/import_queue/basic_queue.rs
+++ b/primitives/consensus/common/src/import_queue/basic_queue.rs
@@ -15,20 +15,25 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::{pin::Pin, time::Duration, marker::PhantomData};
-use futures::{prelude::*, task::Context, task::Poll};
+use futures::{
+	prelude::*,
+	task::{Context, Poll},
+};
 use futures_timer::Delay;
-use sp_runtime::{Justification, Justifications, traits::{Block as BlockT, Header as HeaderT, NumberFor}};
-use sp_utils::mpsc::{TracingUnboundedSender, tracing_unbounded, TracingUnboundedReceiver};
 use prometheus_endpoint::Registry;
+use sp_runtime::{
+	traits::{Block as BlockT, Header as HeaderT, NumberFor},
+	Justification, Justifications,
+};
+use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
+use std::{marker::PhantomData, pin::Pin, time::Duration};
 
 use crate::{
 	block_import::BlockOrigin,
 	import_queue::{
-		BlockImportResult, BlockImportError, Verifier, BoxBlockImport,
-		BoxJustificationImport, ImportQueue, Link, Origin,
-		IncomingBlock, import_single_block_metered,
-		buffered_link::{self, BufferedLinkSender, BufferedLinkReceiver},
+		buffered_link::{self, BufferedLinkReceiver, BufferedLinkSender},
+		import_single_block_metered, BlockImportError, BlockImportResult, BoxBlockImport,
+		BoxJustificationImport, ImportQueue, IncomingBlock, Link, Origin, Verifier,
 	},
 	metrics::Metrics,
 };
@@ -85,24 +90,20 @@ impl<B: BlockT, Transaction: Send + 'static> BasicQueue<B, Transaction> {
 
 		spawner.spawn_essential_blocking("basic-block-import-worker", future.boxed());
 
-		Self {
-			justification_sender,
-			block_import_sender,
-			result_port,
-			_phantom: PhantomData,
-		}
+		Self { justification_sender, block_import_sender, result_port, _phantom: PhantomData }
 	}
 }
 
 impl<B: BlockT, Transaction: Send> ImportQueue<B> for BasicQueue<B, Transaction> {
 	fn import_blocks(&mut self, origin: BlockOrigin, blocks: Vec<IncomingBlock<B>>) {
 		if blocks.is_empty() {
-			return;
+			return
 		}
 
 		trace!(target: "sync", "Scheduling {} blocks for import", blocks.len());
-		let res =
-			self.block_import_sender.unbounded_send(worker_messages::ImportBlocks(origin, blocks));
+		let res = self
+			.block_import_sender
+			.unbounded_send(worker_messages::ImportBlocks(origin, blocks));
 
 		if res.is_err() {
 			log::error!(
@@ -145,7 +146,12 @@ mod worker_messages {
 	use super::*;
 
 	pub struct ImportBlocks<B: BlockT>(pub BlockOrigin, pub Vec<IncomingBlock<B>>);
-	pub struct ImportJustification<B: BlockT>(pub Origin, pub B::Hash, pub NumberFor<B>, pub Justification);
+	pub struct ImportJustification<B: BlockT>(
+		pub Origin,
+		pub B::Hash,
+		pub NumberFor<B>,
+		pub Justification,
+	);
 }
 
 /// The process of importing blocks.
@@ -164,7 +170,8 @@ async fn block_import_process<B: BlockT, Transaction: Send + 'static>(
 	delay_between_blocks: Duration,
 ) {
 	loop {
-		let worker_messages::ImportBlocks(origin, blocks) = match block_import_receiver.next().await {
+		let worker_messages::ImportBlocks(origin, blocks) = match block_import_receiver.next().await
+		{
 			Some(blocks) => blocks,
 			None => {
 				log::debug!(
@@ -182,7 +189,8 @@ async fn block_import_process<B: BlockT, Transaction: Send + 'static>(
 			&mut verifier,
 			delay_between_blocks,
 			metrics.clone(),
-		).await;
+		)
+		.await;
 
 		result_sender.blocks_processed(res.imported, res.block_count, res.results);
 	}
@@ -214,11 +222,7 @@ impl<B: BlockT> BlockImportWorker<B> {
 		let (block_import_sender, block_import_port) =
 			tracing_unbounded("mpsc_import_queue_worker_blocks");
 
-		let mut worker = BlockImportWorker {
-			result_sender,
-			justification_import,
-			metrics,
-		};
+		let mut worker = BlockImportWorker { result_sender, justification_import, metrics };
 
 		let delay_between_blocks = Duration::default();
 
@@ -248,29 +252,26 @@ impl<B: BlockT> BlockImportWorker<B> {
 						target: "block-import",
 						"Stopping block import because result channel was closed!",
 					);
-					return;
+					return
 				}
 
 				// Make sure to first process all justifications
 				while let Poll::Ready(justification) = futures::poll!(justification_port.next()) {
 					match justification {
-						Some(ImportJustification(who, hash, number, justification)) => {
-							worker
-								.import_justification(who, hash, number, justification)
-								.await
-						}
+						Some(ImportJustification(who, hash, number, justification)) =>
+							worker.import_justification(who, hash, number, justification).await,
 						None => {
 							log::debug!(
 								target: "block-import",
 								"Stopping block import because justification channel was closed!",
 							);
-							return;
-						}
+							return
+						},
 					}
 				}
 
 				if let Poll::Ready(()) = futures::poll!(&mut block_import_process) {
-					return;
+					return
 				}
 
 				// All futures that we polled are now pending.
@@ -310,13 +311,10 @@ impl<B: BlockT> BlockImportWorker<B> {
 		};
 
 		if let Some(metrics) = self.metrics.as_ref() {
-			metrics
-				.justification_import_time
-				.observe(started.elapsed().as_secs_f64());
+			metrics.justification_import_time.observe(started.elapsed().as_secs_f64());
 		}
 
-		self.result_sender
-			.justification_imported(who, &hash, number, success);
+		self.result_sender.justification_imported(who, &hash, number, success);
 	}
 }
 
@@ -382,7 +380,8 @@ async fn import_many_blocks<B: BlockT, V: Verifier<B>, Transaction: Send + 'stat
 				block,
 				verifier,
 				metrics.clone(),
-			).await
+			)
+			.await
 		};
 
 		if let Some(metrics) = metrics.as_ref() {
@@ -604,7 +603,7 @@ mod tests {
 		block_on(futures::future::poll_fn(|cx| {
 			while link.events.len() < 9 {
 				match Future::poll(Pin::new(&mut worker), cx) {
-					Poll::Pending => {}
+					Poll::Pending => {},
 					Poll::Ready(()) => panic!("import queue worker should not conclude."),
 				}
 
diff --git a/primitives/consensus/common/src/import_queue/buffered_link.rs b/primitives/consensus/common/src/import_queue/buffered_link.rs
index 0295f704c4ef..8d146dfbe461 100644
--- a/primitives/consensus/common/src/import_queue/buffered_link.rs
+++ b/primitives/consensus/common/src/import_queue/buffered_link.rs
@@ -36,13 +36,15 @@
 //! 	std::task::Poll::Pending::<()>
 //! });
 //! ```
-//!
 
+use crate::import_queue::{BlockImportError, BlockImportResult, Link, Origin};
 use futures::prelude::*;
 use sp_runtime::traits::{Block as BlockT, NumberFor};
-use sp_utils::mpsc::{TracingUnboundedSender, TracingUnboundedReceiver, tracing_unbounded};
-use std::{pin::Pin, task::Context, task::Poll};
-use crate::import_queue::{Origin, Link, BlockImportResult, BlockImportError};
+use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
+use std::{
+	pin::Pin,
+	task::{Context, Poll},
+};
 
 /// Wraps around an unbounded channel from the `futures` crate. The sender implements `Link` and
 /// can be used to buffer commands, and the receiver can be used to poll said commands and transfer
@@ -70,15 +72,17 @@ impl<B: BlockT> BufferedLinkSender<B> {
 
 impl<B: BlockT> Clone for BufferedLinkSender<B> {
 	fn clone(&self) -> Self {
-		BufferedLinkSender {
-			tx: self.tx.clone(),
-		}
+		BufferedLinkSender { tx: self.tx.clone() }
 	}
 }
 
 /// Internal buffered message.
 enum BlockImportWorkerMsg<B: BlockT> {
-	BlocksProcessed(usize, usize, Vec<(Result<BlockImportResult<NumberFor<B>>, BlockImportError>, B::Hash)>),
+	BlocksProcessed(
+		usize,
+		usize,
+		Vec<(Result<BlockImportResult<NumberFor<B>>, BlockImportError>, B::Hash)>,
+	),
 	JustificationImported(Origin, B::Hash, NumberFor<B>, bool),
 	RequestJustification(B::Hash, NumberFor<B>),
 }
@@ -88,9 +92,11 @@ impl<B: BlockT> Link<B> for BufferedLinkSender<B> {
 		&mut self,
 		imported: usize,
 		count: usize,
-		results: Vec<(Result<BlockImportResult<NumberFor<B>>, BlockImportError>, B::Hash)>
+		results: Vec<(Result<BlockImportResult<NumberFor<B>>, BlockImportError>, B::Hash)>,
 	) {
-		let _ = self.tx.unbounded_send(BlockImportWorkerMsg::BlocksProcessed(imported, count, results));
+		let _ = self
+			.tx
+			.unbounded_send(BlockImportWorkerMsg::BlocksProcessed(imported, count, results));
 	}
 
 	fn justification_imported(
@@ -98,14 +104,16 @@ impl<B: BlockT> Link<B> for BufferedLinkSender<B> {
 		who: Origin,
 		hash: &B::Hash,
 		number: NumberFor<B>,
-		success: bool
+		success: bool,
 	) {
 		let msg = BlockImportWorkerMsg::JustificationImported(who, hash.clone(), number, success);
 		let _ = self.tx.unbounded_send(msg);
 	}
 
 	fn request_justification(&mut self, hash: &B::Hash, number: NumberFor<B>) {
-		let _ = self.tx.unbounded_send(BlockImportWorkerMsg::RequestJustification(hash.clone(), number));
+		let _ = self
+			.tx
+			.unbounded_send(BlockImportWorkerMsg::RequestJustification(hash.clone(), number));
 	}
 }
 
diff --git a/primitives/consensus/common/src/lib.rs b/primitives/consensus/common/src/lib.rs
index 51b2a96e1775..eb524422a6e2 100644
--- a/primitives/consensus/common/src/lib.rs
+++ b/primitives/consensus/common/src/lib.rs
@@ -23,28 +23,28 @@
 
 // This provides "unused" building blocks to other crates
 #![allow(dead_code)]
-
 // our error-chain could potentially blow up otherwise
-#![recursion_limit="128"]
+#![recursion_limit = "128"]
 
-#[macro_use] extern crate log;
+#[macro_use]
+extern crate log;
 
-use std::sync::Arc;
-use std::time::Duration;
+use std::{sync::Arc, time::Duration};
 
+use futures::prelude::*;
 use sp_runtime::{
-	generic::BlockId, traits::{Block as BlockT, DigestFor, NumberFor, HashFor},
+	generic::BlockId,
+	traits::{Block as BlockT, DigestFor, HashFor, NumberFor},
 };
-use futures::prelude::*;
 use sp_state_machine::StorageProof;
 
+pub mod block_import;
 pub mod block_validation;
 pub mod error;
-pub mod block_import;
-mod select_chain;
-pub mod import_queue;
 pub mod evaluation;
+pub mod import_queue;
 mod metrics;
+mod select_chain;
 
 pub use self::error::Error;
 pub use block_import::{
@@ -52,10 +52,10 @@ pub use block_import::{
 	ImportResult, ImportedAux, ImportedState, JustificationImport, JustificationSyncLink,
 	StateAction, StorageChanges,
 };
-pub use select_chain::SelectChain;
-pub use sp_state_machine::Backend as StateBackend;
 pub use import_queue::DefaultImportQueue;
+pub use select_chain::SelectChain;
 pub use sp_inherents::InherentData;
+pub use sp_state_machine::Backend as StateBackend;
 
 /// Block status.
 #[derive(Debug, PartialEq, Eq)]
@@ -80,7 +80,9 @@ pub trait Environment<B: BlockT> {
 	type Proposer: Proposer<B> + Send + 'static;
 	/// A future that resolves to the proposer.
 	type CreateProposer: Future<Output = Result<Self::Proposer, Self::Error>>
-		+ Send + Unpin + 'static;
+		+ Send
+		+ Unpin
+		+ 'static;
 	/// Error which can occur upon creation.
 	type Error: From<Error> + std::fmt::Debug + 'static;
 
@@ -96,7 +98,8 @@ pub struct Proposal<Block: BlockT, Transaction, Proof> {
 	/// Proof that was recorded while building the block.
 	pub proof: Proof,
 	/// The storage changes while building this block.
-	pub storage_changes: sp_state_machine::StorageChanges<Transaction, HashFor<Block>, NumberFor<Block>>,
+	pub storage_changes:
+		sp_state_machine::StorageChanges<Transaction, HashFor<Block>, NumberFor<Block>>,
 }
 
 /// Error that is returned when [`ProofRecording`] requested to record a proof,
@@ -179,8 +182,7 @@ pub trait Proposer<B: BlockT> {
 	/// The transaction type used by the backend.
 	type Transaction: Default + Send + 'static;
 	/// Future that resolves to a committed proposal with an optional proof.
-	type Proposal:
-		Future<Output = Result<Proposal<B, Self::Transaction, Self::Proof>, Self::Error>>
+	type Proposal: Future<Output = Result<Proposal<B, Self::Transaction, Self::Proof>, Self::Error>>
 		+ Send
 		+ Unpin
 		+ 'static;
@@ -233,11 +235,19 @@ pub trait SyncOracle {
 pub struct NoNetwork;
 
 impl SyncOracle for NoNetwork {
-	fn is_major_syncing(&mut self) -> bool { false }
-	fn is_offline(&mut self) -> bool { false }
+	fn is_major_syncing(&mut self) -> bool {
+		false
+	}
+	fn is_offline(&mut self) -> bool {
+		false
+	}
 }
 
-impl<T> SyncOracle for Arc<T> where T: ?Sized, for<'r> &'r T: SyncOracle {
+impl<T> SyncOracle for Arc<T>
+where
+	T: ?Sized,
+	for<'r> &'r T: SyncOracle,
+{
 	fn is_major_syncing(&mut self) -> bool {
 		<&T>::is_major_syncing(&mut &**self)
 	}
@@ -277,13 +287,10 @@ impl<T: sp_version::GetRuntimeVersion<Block>, Block: BlockT> CanAuthorWith<Block
 	fn can_author_with(&self, at: &BlockId<Block>) -> Result<(), String> {
 		match self.0.runtime_version(at) {
 			Ok(version) => self.0.native_version().can_author_with(&version),
-			Err(e) => {
-				Err(format!(
-					"Failed to get runtime version at `{}` and will disable authoring. Error: {}",
-					at,
-					e,
-				))
-			}
+			Err(e) => Err(format!(
+				"Failed to get runtime version at `{}` and will disable authoring. Error: {}",
+				at, e,
+			)),
 		}
 	}
 }
diff --git a/primitives/consensus/common/src/metrics.rs b/primitives/consensus/common/src/metrics.rs
index 29d39436cbef..c56f68625b6a 100644
--- a/primitives/consensus/common/src/metrics.rs
+++ b/primitives/consensus/common/src/metrics.rs
@@ -18,12 +18,13 @@
 //! Metering tools for consensus
 
 use prometheus_endpoint::{
-	register, U64, Registry, PrometheusError, Opts, CounterVec, Histogram, HistogramVec, HistogramOpts
+	register, CounterVec, Histogram, HistogramOpts, HistogramVec, Opts, PrometheusError, Registry,
+	U64,
 };
 
 use sp_runtime::traits::{Block as BlockT, NumberFor};
 
-use crate::import_queue::{BlockImportResult, BlockImportError};
+use crate::import_queue::{BlockImportError, BlockImportResult};
 
 /// Generic Prometheus metrics for common consensus functionality.
 #[derive(Clone)]
@@ -40,36 +41,29 @@ impl Metrics {
 			import_queue_processed: register(
 				CounterVec::new(
 					Opts::new("import_queue_processed_total", "Blocks processed by import queue"),
-					&["result"] // 'success or failure
+					&["result"], // 'success or failure
 				)?,
 				registry,
 			)?,
 			block_verification_time: register(
 				HistogramVec::new(
-					HistogramOpts::new(
-						"block_verification_time",
-						"Time taken to verify blocks",
-					),
+					HistogramOpts::new("block_verification_time", "Time taken to verify blocks"),
 					&["result"],
 				)?,
 				registry,
 			)?,
 			block_verification_and_import_time: register(
-				Histogram::with_opts(
-					HistogramOpts::new(
-						"block_verification_and_import_time",
-						"Time taken to verify and import blocks",
-					),
-				)?,
+				Histogram::with_opts(HistogramOpts::new(
+					"block_verification_and_import_time",
+					"Time taken to verify and import blocks",
+				))?,
 				registry,
 			)?,
 			justification_import_time: register(
-				Histogram::with_opts(
-					HistogramOpts::new(
-						"justification_import_time",
-						"Time taken to import justifications",
-					),
-				)?,
+				Histogram::with_opts(HistogramOpts::new(
+					"justification_import_time",
+					"Time taken to import justifications",
+				))?,
 				registry,
 			)?,
 		})
@@ -82,7 +76,7 @@ impl Metrics {
 		let label = match result {
 			Ok(_) => "success",
 			Err(BlockImportError::IncompleteHeader(_)) => "incomplete_header",
-			Err(BlockImportError::VerificationFailed(_,_)) => "verification_failed",
+			Err(BlockImportError::VerificationFailed(_, _)) => "verification_failed",
 			Err(BlockImportError::BadBlock(_)) => "bad_block",
 			Err(BlockImportError::MissingState) => "missing_state",
 			Err(BlockImportError::UnknownParent) => "unknown_parent",
@@ -90,15 +84,13 @@ impl Metrics {
 			Err(BlockImportError::Other(_)) => "failed",
 		};
 
-		self.import_queue_processed.with_label_values(
-			&[label]
-		).inc();
+		self.import_queue_processed.with_label_values(&[label]).inc();
 	}
 
 	pub fn report_verification(&self, success: bool, time: std::time::Duration) {
-		self.block_verification_time.with_label_values(
-			&[if success { "success" } else { "verification_failed" }]
-		).observe(time.as_secs_f64());
+		self.block_verification_time
+			.with_label_values(&[if success { "success" } else { "verification_failed" }])
+			.observe(time.as_secs_f64());
 	}
 
 	pub fn report_verification_and_import(&self, time: std::time::Duration) {
diff --git a/primitives/consensus/common/src/select_chain.rs b/primitives/consensus/common/src/select_chain.rs
index e99a6756175d..5408fc86b7bd 100644
--- a/primitives/consensus/common/src/select_chain.rs
+++ b/primitives/consensus/common/src/select_chain.rs
@@ -18,7 +18,6 @@
 use crate::error::Error;
 use sp_runtime::traits::{Block as BlockT, NumberFor};
 
-
 /// The SelectChain trait defines the strategy upon which the head is chosen
 /// if multiple forks are present for an opaque definition of "best" in the
 /// specific chain build.
diff --git a/primitives/consensus/pow/src/lib.rs b/primitives/consensus/pow/src/lib.rs
index 12d3440ea9d5..ac8bc589c136 100644
--- a/primitives/consensus/pow/src/lib.rs
+++ b/primitives/consensus/pow/src/lib.rs
@@ -19,9 +19,9 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use sp_std::vec::Vec;
-use sp_runtime::ConsensusEngineId;
 use codec::Decode;
+use sp_runtime::ConsensusEngineId;
+use sp_std::vec::Vec;
 
 /// The `ConsensusEngineId` of PoW.
 pub const POW_ENGINE_ID: ConsensusEngineId = [b'p', b'o', b'w', b'_'];
diff --git a/primitives/consensus/vrf/src/schnorrkel.rs b/primitives/consensus/vrf/src/schnorrkel.rs
index 400bdb2f5808..687e0bd23182 100644
--- a/primitives/consensus/vrf/src/schnorrkel.rs
+++ b/primitives/consensus/vrf/src/schnorrkel.rs
@@ -17,13 +17,19 @@
 
 //! Schnorrkel-based VRF.
 
-use codec::{Encode, Decode, EncodeLike};
-use sp_std::{convert::TryFrom, prelude::*};
-use sp_core::U512;
-use sp_std::ops::{Deref, DerefMut};
+use codec::{Decode, Encode, EncodeLike};
 use schnorrkel::errors::MultiSignatureStage;
+use sp_core::U512;
+use sp_std::{
+	convert::TryFrom,
+	ops::{Deref, DerefMut},
+	prelude::*,
+};
 
-pub use schnorrkel::{SignatureError, PublicKey, vrf::{VRF_PROOF_LENGTH, VRF_OUTPUT_LENGTH}};
+pub use schnorrkel::{
+	vrf::{VRF_OUTPUT_LENGTH, VRF_PROOF_LENGTH},
+	PublicKey, SignatureError,
+};
 
 /// The length of the Randomness.
 pub const RANDOMNESS_LENGTH: usize = VRF_OUTPUT_LENGTH;
@@ -34,11 +40,15 @@ pub struct VRFOutput(pub schnorrkel::vrf::VRFOutput);
 
 impl Deref for VRFOutput {
 	type Target = schnorrkel::vrf::VRFOutput;
-	fn deref(&self) -> &Self::Target { &self.0 }
+	fn deref(&self) -> &Self::Target {
+		&self.0
+	}
 }
 
 impl DerefMut for VRFOutput {
-	fn deref_mut(&mut self) -> &mut Self::Target { &mut self.0 }
+	fn deref_mut(&mut self) -> &mut Self::Target {
+		&mut self.0
+	}
 }
 
 impl Encode for VRFOutput {
@@ -47,7 +57,7 @@ impl Encode for VRFOutput {
 	}
 }
 
-impl EncodeLike for VRFOutput { }
+impl EncodeLike for VRFOutput {}
 
 impl Decode for VRFOutput {
 	fn decode<R: codec::Input>(i: &mut R) -> Result<Self, codec::Error> {
@@ -82,11 +92,15 @@ impl Ord for VRFProof {
 
 impl Deref for VRFProof {
 	type Target = schnorrkel::vrf::VRFProof;
-	fn deref(&self) -> &Self::Target { &self.0 }
+	fn deref(&self) -> &Self::Target {
+		&self.0
+	}
 }
 
 impl DerefMut for VRFProof {
-	fn deref_mut(&mut self) -> &mut Self::Target { &mut self.0 }
+	fn deref_mut(&mut self) -> &mut Self::Target {
+		&mut self.0
+	}
 }
 
 impl Encode for VRFProof {
@@ -95,7 +109,7 @@ impl Encode for VRFProof {
 	}
 }
 
-impl EncodeLike for VRFProof { }
+impl EncodeLike for VRFProof {}
 
 impl Decode for VRFProof {
 	fn decode<R: codec::Input>(i: &mut R) -> Result<Self, codec::Error> {
@@ -113,8 +127,8 @@ impl TryFrom<[u8; VRF_PROOF_LENGTH]> for VRFProof {
 }
 
 fn convert_error(e: SignatureError) -> codec::Error {
-	use SignatureError::*;
 	use MultiSignatureStage::*;
+	use SignatureError::*;
 	match e {
 		EquationFalse => "Signature error: `EquationFalse`".into(),
 		PointDecompressionError => "Signature error: `PointDecompressionError`".into(),
diff --git a/primitives/core/benches/bench.rs b/primitives/core/benches/bench.rs
index 77680d53be6c..44bcd657ba3f 100644
--- a/primitives/core/benches/bench.rs
+++ b/primitives/core/benches/bench.rs
@@ -15,22 +15,21 @@
 #[macro_use]
 extern crate criterion;
 
-use criterion::{Criterion, black_box, Bencher, BenchmarkId};
-use sp_core::crypto::Pair as _;
-use sp_core::hashing::{twox_128, blake2_128};
+use criterion::{black_box, Bencher, BenchmarkId, Criterion};
+use sp_core::{
+	crypto::Pair as _,
+	hashing::{blake2_128, twox_128},
+};
 
 const MAX_KEY_SIZE: u32 = 32;
 
 fn get_key(key_size: u32) -> Vec<u8> {
-	use rand::SeedableRng;
-	use rand::Rng;
+	use rand::{Rng, SeedableRng};
 
 	let rnd: [u8; 32] = rand::rngs::StdRng::seed_from_u64(12).gen();
 	let mut rnd = rnd.iter().cycle();
 
-	(0..key_size)
-		.map(|_| *rnd.next().unwrap())
-		.collect()
+	(0..key_size).map(|_| *rnd.next().unwrap()).collect()
 }
 
 fn bench_blake2_128(b: &mut Bencher, key: &Vec<u8>) {
@@ -81,27 +80,21 @@ fn bench_ed25519(c: &mut Criterion) {
 	let mut group = c.benchmark_group("ed25519");
 
 	for msg_size in vec![32, 1024, 1024 * 1024] {
-		let msg = (0..msg_size)
-			.map(|_| rand::random::<u8>())
-			.collect::<Vec<_>>();
+		let msg = (0..msg_size).map(|_| rand::random::<u8>()).collect::<Vec<_>>();
 		let key = sp_core::ed25519::Pair::generate().0;
-		group.bench_function(
-			BenchmarkId::new("signing", format!("{}", msg_size)),
-			|b| b.iter(|| key.sign(&msg)),
-		);
+		group.bench_function(BenchmarkId::new("signing", format!("{}", msg_size)), |b| {
+			b.iter(|| key.sign(&msg))
+		});
 	}
 
 	for msg_size in vec![32, 1024, 1024 * 1024] {
-		let msg = (0..msg_size)
-			.map(|_| rand::random::<u8>())
-			.collect::<Vec<_>>();
+		let msg = (0..msg_size).map(|_| rand::random::<u8>()).collect::<Vec<_>>();
 		let key = sp_core::ed25519::Pair::generate().0;
 		let sig = key.sign(&msg);
 		let public = key.public();
-		group.bench_function(
-			BenchmarkId::new("verifying", format!("{}", msg_size)),
-			|b| b.iter(|| sp_core::ed25519::Pair::verify(&sig, &msg, &public)),
-		);
+		group.bench_function(BenchmarkId::new("verifying", format!("{}", msg_size)), |b| {
+			b.iter(|| sp_core::ed25519::Pair::verify(&sig, &msg, &public))
+		});
 	}
 
 	group.finish();
@@ -111,27 +104,21 @@ fn bench_sr25519(c: &mut Criterion) {
 	let mut group = c.benchmark_group("sr25519");
 
 	for msg_size in vec![32, 1024, 1024 * 1024] {
-		let msg = (0..msg_size)
-			.map(|_| rand::random::<u8>())
-			.collect::<Vec<_>>();
+		let msg = (0..msg_size).map(|_| rand::random::<u8>()).collect::<Vec<_>>();
 		let key = sp_core::sr25519::Pair::generate().0;
-		group.bench_function(
-			BenchmarkId::new("signing", format!("{}", msg_size)),
-			|b| b.iter(|| key.sign(&msg)),
-		);
+		group.bench_function(BenchmarkId::new("signing", format!("{}", msg_size)), |b| {
+			b.iter(|| key.sign(&msg))
+		});
 	}
 
 	for msg_size in vec![32, 1024, 1024 * 1024] {
-		let msg = (0..msg_size)
-			.map(|_| rand::random::<u8>())
-			.collect::<Vec<_>>();
+		let msg = (0..msg_size).map(|_| rand::random::<u8>()).collect::<Vec<_>>();
 		let key = sp_core::sr25519::Pair::generate().0;
 		let sig = key.sign(&msg);
 		let public = key.public();
-		group.bench_function(
-			BenchmarkId::new("verifying", format!("{}", msg_size)),
-			|b| b.iter(|| sp_core::sr25519::Pair::verify(&sig, &msg, &public)),
-		);
+		group.bench_function(BenchmarkId::new("verifying", format!("{}", msg_size)), |b| {
+			b.iter(|| sp_core::sr25519::Pair::verify(&sig, &msg, &public))
+		});
 	}
 
 	group.finish();
@@ -141,27 +128,21 @@ fn bench_ecdsa(c: &mut Criterion) {
 	let mut group = c.benchmark_group("ecdsa");
 
 	for msg_size in vec![32, 1024, 1024 * 1024] {
-		let msg = (0..msg_size)
-			.map(|_| rand::random::<u8>())
-			.collect::<Vec<_>>();
+		let msg = (0..msg_size).map(|_| rand::random::<u8>()).collect::<Vec<_>>();
 		let key = sp_core::ecdsa::Pair::generate().0;
-		group.bench_function(
-			BenchmarkId::new("signing", format!("{}", msg_size)),
-			|b| b.iter(|| key.sign(&msg)),
-		);
+		group.bench_function(BenchmarkId::new("signing", format!("{}", msg_size)), |b| {
+			b.iter(|| key.sign(&msg))
+		});
 	}
 
 	for msg_size in vec![32, 1024, 1024 * 1024] {
-		let msg = (0..msg_size)
-			.map(|_| rand::random::<u8>())
-			.collect::<Vec<_>>();
+		let msg = (0..msg_size).map(|_| rand::random::<u8>()).collect::<Vec<_>>();
 		let key = sp_core::ecdsa::Pair::generate().0;
 		let sig = key.sign(&msg);
 		let public = key.public();
-		group.bench_function(
-			BenchmarkId::new("verifying", format!("{}", msg_size)),
-			|b| b.iter(|| sp_core::ecdsa::Pair::verify(&sig, &msg, &public)),
-		);
+		group.bench_function(BenchmarkId::new("verifying", format!("{}", msg_size)), |b| {
+			b.iter(|| sp_core::ecdsa::Pair::verify(&sig, &msg, &public))
+		});
 	}
 
 	group.finish();
diff --git a/primitives/core/src/changes_trie.rs b/primitives/core/src/changes_trie.rs
index 7b886244a064..dd99a5f769ce 100644
--- a/primitives/core/src/changes_trie.rs
+++ b/primitives/core/src/changes_trie.rs
@@ -17,13 +17,16 @@
 
 //! Substrate changes trie configuration.
 
-#[cfg(any(feature = "std", test))]
-use serde::{Serialize, Deserialize};
-use codec::{Encode, Decode};
+use codec::{Decode, Encode};
 use num_traits::Zero;
+#[cfg(any(feature = "std", test))]
+use serde::{Deserialize, Serialize};
 
 /// Substrate changes trie configuration.
-#[cfg_attr(any(feature = "std", test), derive(Serialize, Deserialize, parity_util_mem::MallocSizeOf))]
+#[cfg_attr(
+	any(feature = "std", test),
+	derive(Serialize, Deserialize, parity_util_mem::MallocSizeOf)
+)]
 #[derive(Debug, Clone, PartialEq, Eq, Default, Encode, Decode)]
 pub struct ChangesTrieConfiguration {
 	/// Interval (in blocks) at which level1-digests are created. Digests are not
@@ -62,32 +65,31 @@ impl ChangesTrieConfiguration {
 	}
 
 	/// Do we need to build digest at given block?
-	pub fn is_digest_build_required_at_block<Number>(
-		&self,
-		zero: Number,
-		block: Number,
-	) -> bool
-		where
-			Number: From<u32> + PartialEq +
-			::sp_std::ops::Rem<Output=Number> + ::sp_std::ops::Sub<Output=Number> +
-			::sp_std::cmp::PartialOrd + Zero,
+	pub fn is_digest_build_required_at_block<Number>(&self, zero: Number, block: Number) -> bool
+	where
+		Number: From<u32>
+			+ PartialEq
+			+ ::sp_std::ops::Rem<Output = Number>
+			+ ::sp_std::ops::Sub<Output = Number>
+			+ ::sp_std::cmp::PartialOrd
+			+ Zero,
 	{
-		block > zero
-			&& self.is_digest_build_enabled()
-			&& ((block - zero) % self.digest_interval.into()).is_zero()
+		block > zero &&
+			self.is_digest_build_enabled() &&
+			((block - zero) % self.digest_interval.into()).is_zero()
 	}
 
 	/// Returns max digest interval. One if digests are not created at all.
 	pub fn max_digest_interval(&self) -> u32 {
 		if !self.is_digest_build_enabled() {
-			return 1;
+			return 1
 		}
 
 		// we'll get >1 loop iteration only when bad configuration parameters are selected
 		let mut current_level = self.digest_levels;
 		loop {
 			if let Some(max_digest_interval) = self.digest_interval.checked_pow(current_level) {
-				return max_digest_interval;
+				return max_digest_interval
 			}
 
 			current_level -= 1;
@@ -97,25 +99,28 @@ impl ChangesTrieConfiguration {
 	/// Returns max level digest block number that has been created at block <= passed block number.
 	///
 	/// Returns None if digests are not created at all.
-	pub fn prev_max_level_digest_block<Number>(
-		&self,
-		zero: Number,
-		block: Number,
-	) -> Option<Number>
-		where
-			Number: Clone + From<u32> + PartialOrd + PartialEq +
-			::sp_std::ops::Add<Output=Number> + ::sp_std::ops::Sub<Output=Number> +
-			::sp_std::ops::Div<Output=Number> + ::sp_std::ops::Mul<Output=Number> + Zero,
+	pub fn prev_max_level_digest_block<Number>(&self, zero: Number, block: Number) -> Option<Number>
+	where
+		Number: Clone
+			+ From<u32>
+			+ PartialOrd
+			+ PartialEq
+			+ ::sp_std::ops::Add<Output = Number>
+			+ ::sp_std::ops::Sub<Output = Number>
+			+ ::sp_std::ops::Div<Output = Number>
+			+ ::sp_std::ops::Mul<Output = Number>
+			+ Zero,
 	{
 		if block <= zero {
-			return None;
+			return None
 		}
 
-		let (next_begin, next_end) = self.next_max_level_digest_range(zero.clone(), block.clone())?;
+		let (next_begin, next_end) =
+			self.next_max_level_digest_range(zero.clone(), block.clone())?;
 
 		// if 'next' digest includes our block, then it is a also a previous digest
 		if next_end == block {
-			return Some(block);
+			return Some(block)
 		}
 
 		// if previous digest ends at zero block, then there are no previous digest
@@ -136,13 +141,18 @@ impl ChangesTrieConfiguration {
 		zero: Number,
 		mut block: Number,
 	) -> Option<(Number, Number)>
-		where
-			Number: Clone + From<u32> + PartialOrd + PartialEq +
-			::sp_std::ops::Add<Output=Number> + ::sp_std::ops::Sub<Output=Number> +
-			::sp_std::ops::Div<Output=Number> + ::sp_std::ops::Mul<Output=Number>,
+	where
+		Number: Clone
+			+ From<u32>
+			+ PartialOrd
+			+ PartialEq
+			+ ::sp_std::ops::Add<Output = Number>
+			+ ::sp_std::ops::Sub<Output = Number>
+			+ ::sp_std::ops::Div<Output = Number>
+			+ ::sp_std::ops::Mul<Output = Number>,
 	{
 		if !self.is_digest_build_enabled() {
-			return None;
+			return None
 		}
 
 		if block <= zero {
@@ -152,7 +162,7 @@ impl ChangesTrieConfiguration {
 		let max_digest_interval: Number = self.max_digest_interval().into();
 		let max_digests_since_zero = (block.clone() - zero.clone()) / max_digest_interval.clone();
 		if max_digests_since_zero == 0.into() {
-			return Some((zero.clone() + 1.into(), zero + max_digest_interval));
+			return Some((zero.clone() + 1.into(), zero + max_digest_interval))
 		}
 		let last_max_digest_block = zero + max_digests_since_zero * max_digest_interval.clone();
 		Some(if block == last_max_digest_block {
@@ -169,14 +179,22 @@ impl ChangesTrieConfiguration {
 	///  digest interval (in blocks)
 	///  step between blocks we're interested in when digest is built
 	/// )
-	pub fn digest_level_at_block<Number>(&self, zero: Number, block: Number) -> Option<(u32, u32, u32)>
-		where
-			Number: Clone + From<u32> + PartialEq +
-			::sp_std::ops::Rem<Output=Number> + ::sp_std::ops::Sub<Output=Number> +
-			::sp_std::cmp::PartialOrd + Zero,
+	pub fn digest_level_at_block<Number>(
+		&self,
+		zero: Number,
+		block: Number,
+	) -> Option<(u32, u32, u32)>
+	where
+		Number: Clone
+			+ From<u32>
+			+ PartialEq
+			+ ::sp_std::ops::Rem<Output = Number>
+			+ ::sp_std::ops::Sub<Output = Number>
+			+ ::sp_std::cmp::PartialOrd
+			+ Zero,
 	{
 		if !self.is_digest_build_required_at_block(zero.clone(), block.clone()) {
-			return None;
+			return None
 		}
 
 		let relative_block = block - zero;
@@ -185,8 +203,9 @@ impl ChangesTrieConfiguration {
 		let mut digest_step = 1u32;
 		while current_level < self.digest_levels {
 			let new_digest_interval = match digest_interval.checked_mul(self.digest_interval) {
-				Some(new_digest_interval) if (relative_block.clone() % new_digest_interval.into()).is_zero()
-					=> new_digest_interval,
+				Some(new_digest_interval)
+					if (relative_block.clone() % new_digest_interval.into()).is_zero() =>
+					new_digest_interval,
 				_ => break,
 			};
 
@@ -195,11 +214,7 @@ impl ChangesTrieConfiguration {
 			current_level += 1;
 		}
 
-		Some((
-			current_level,
-			digest_interval,
-			digest_step,
-		))
+		Some((current_level, digest_interval, digest_step))
 	}
 }
 
@@ -208,10 +223,7 @@ mod tests {
 	use super::ChangesTrieConfiguration;
 
 	fn config(interval: u32, levels: u32) -> ChangesTrieConfiguration {
-		ChangesTrieConfiguration {
-			digest_interval: interval,
-			digest_levels: levels,
-		}
+		ChangesTrieConfiguration { digest_interval: interval, digest_levels: levels }
 	}
 
 	#[test]
@@ -255,7 +267,10 @@ mod tests {
 			assert_eq!(config(8, 4).digest_level_at_block(zero, zero + 8u64), Some((1, 8, 1)));
 			assert_eq!(config(8, 4).digest_level_at_block(zero, zero + 64u64), Some((2, 64, 8)));
 			assert_eq!(config(8, 4).digest_level_at_block(zero, zero + 512u64), Some((3, 512, 64)));
-			assert_eq!(config(8, 4).digest_level_at_block(zero, zero + 4096u64), Some((4, 4096, 512)));
+			assert_eq!(
+				config(8, 4).digest_level_at_block(zero, zero + 4096u64),
+				Some((4, 4096, 512))
+			);
 			assert_eq!(config(8, 4).digest_level_at_block(zero, zero + 4112u64), Some((1, 8, 1)));
 		}
 
diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index 7f8aecebbc6d..fcf5c65c0a61 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -19,37 +19,35 @@
 //! Cryptographic utilities.
 // end::description[]
 
-use crate::{sr25519, ed25519};
-use sp_std::hash::Hash;
-use sp_std::vec::Vec;
-use sp_std::str;
 #[cfg(feature = "std")]
-use sp_std::convert::TryInto;
-use sp_std::convert::TryFrom;
+use crate::hexdisplay::HexDisplay;
+use crate::{ed25519, sr25519};
+#[cfg(feature = "std")]
+use base58::{FromBase58, ToBase58};
+use codec::{Decode, Encode, MaxEncodedLen};
 #[cfg(feature = "std")]
 use parking_lot::Mutex;
 #[cfg(feature = "std")]
-use rand::{RngCore, rngs::OsRng};
-use codec::{Encode, Decode, MaxEncodedLen};
+use rand::{rngs::OsRng, RngCore};
 #[cfg(feature = "std")]
 use regex::Regex;
+/// Trait for accessing reference to `SecretString`.
+pub use secrecy::ExposeSecret;
+/// A store for sensitive data.
 #[cfg(feature = "std")]
-use base58::{FromBase58, ToBase58};
+pub use secrecy::SecretString;
+use sp_runtime_interface::pass_by::PassByInner;
 #[cfg(feature = "std")]
-use crate::hexdisplay::HexDisplay;
+use sp_std::convert::TryInto;
 #[doc(hidden)]
 pub use sp_std::ops::Deref;
-use sp_runtime_interface::pass_by::PassByInner;
+use sp_std::{convert::TryFrom, hash::Hash, str, vec::Vec};
 /// Trait to zeroize a memory buffer.
 pub use zeroize::Zeroize;
-/// Trait for accessing reference to `SecretString`.
-pub use secrecy::ExposeSecret;
-/// A store for sensitive data.
-#[cfg(feature = "std")]
-pub use secrecy::SecretString;
 
 /// The root phrase for our publicly known keys.
-pub const DEV_PHRASE: &str = "bottom drive obey lake curtain smoke basket hold race lonely fit walk";
+pub const DEV_PHRASE: &str =
+	"bottom drive obey lake curtain smoke basket hold race lonely fit walk";
 
 /// The address of the associated root phrase for our publicly known keys.
 pub const DEV_ADDRESS: &str = "5DfhGyQdFobKM8NsWvEeAKk5EQQgYe9AydgJ7rMB6E1EqRzV";
@@ -118,22 +116,28 @@ pub enum DeriveJunction {
 #[cfg(feature = "full_crypto")]
 impl DeriveJunction {
 	/// Consume self to return a soft derive junction with the same chain code.
-	pub fn soften(self) -> Self { DeriveJunction::Soft(self.unwrap_inner()) }
+	pub fn soften(self) -> Self {
+		DeriveJunction::Soft(self.unwrap_inner())
+	}
 
 	/// Consume self to return a hard derive junction with the same chain code.
-	pub fn harden(self) -> Self { DeriveJunction::Hard(self.unwrap_inner()) }
+	pub fn harden(self) -> Self {
+		DeriveJunction::Hard(self.unwrap_inner())
+	}
 
 	/// Create a new soft (vanilla) DeriveJunction from a given, encodable, value.
 	///
 	/// If you need a hard junction, use `hard()`.
 	pub fn soft<T: Encode>(index: T) -> Self {
 		let mut cc: [u8; JUNCTION_ID_LEN] = Default::default();
-		index.using_encoded(|data| if data.len() > JUNCTION_ID_LEN {
-			let hash_result = blake2_rfc::blake2b::blake2b(JUNCTION_ID_LEN, &[], data);
-			let hash = hash_result.as_bytes();
-			cc.copy_from_slice(hash);
-		} else {
-			cc[0..data.len()].copy_from_slice(data);
+		index.using_encoded(|data| {
+			if data.len() > JUNCTION_ID_LEN {
+				let hash_result = blake2_rfc::blake2b::blake2b(JUNCTION_ID_LEN, &[], data);
+				let hash = hash_result.as_bytes();
+				cc.copy_from_slice(hash);
+			} else {
+				cc[0..data.len()].copy_from_slice(data);
+			}
 		});
 		DeriveJunction::Soft(cc)
 	}
@@ -174,11 +178,8 @@ impl DeriveJunction {
 impl<T: AsRef<str>> From<T> for DeriveJunction {
 	fn from(j: T) -> DeriveJunction {
 		let j = j.as_ref();
-		let (code, hard) = if let Some(stripped) = j.strip_prefix('/') {
-			(stripped, true)
-		} else {
-			(j, false)
-		};
+		let (code, hard) =
+			if let Some(stripped) = j.strip_prefix('/') { (stripped, true) } else { (j, false) };
 
 		let res = if let Ok(n) = str::parse::<u64>(code) {
 			// number
@@ -231,12 +232,11 @@ pub trait Ss58Codec: Sized + AsMut<[u8]> + AsRef<[u8]> + Default {
 	/// Some if the string is a properly encoded SS58Check address.
 	#[cfg(feature = "std")]
 	fn from_ss58check(s: &str) -> Result<Self, PublicError> {
-		Self::from_ss58check_with_version(s)
-			.and_then(|(r, v)| match v {
-				v if !v.is_custom() => Ok(r),
-				v if v == *DEFAULT_VERSION.lock() => Ok(r),
-				_ => Err(PublicError::UnknownVersion),
-			})
+		Self::from_ss58check_with_version(s).and_then(|(r, v)| match v {
+			v if !v.is_custom() => Ok(r),
+			v if v == *DEFAULT_VERSION.lock() => Ok(r),
+			_ => Err(PublicError::UnknownVersion),
+		})
 	}
 
 	/// Some if the string is a properly encoded SS58Check address.
@@ -249,7 +249,9 @@ pub trait Ss58Codec: Sized + AsMut<[u8]> + AsRef<[u8]> + Default {
 		let body_len = res.as_mut().len();
 
 		let data = s.from_base58().map_err(|_| PublicError::BadBase58)?;
-		if data.len() < 2 { return Err(PublicError::BadLength); }
+		if data.len() < 2 {
+			return Err(PublicError::BadLength)
+		}
 		let (prefix_len, ident) = match data[0] {
 			0..=63 => (1, data[0] as u16),
 			64..=127 => {
@@ -261,18 +263,22 @@ pub trait Ss58Codec: Sized + AsMut<[u8]> + AsRef<[u8]> + Default {
 				let lower = (data[0] << 2) | (data[1] >> 6);
 				let upper = data[1] & 0b00111111;
 				(2, (lower as u16) | ((upper as u16) << 8))
-			}
+			},
 			_ => return Err(PublicError::UnknownVersion),
 		};
-		if data.len() != prefix_len + body_len + CHECKSUM_LEN { return Err(PublicError::BadLength) }
+		if data.len() != prefix_len + body_len + CHECKSUM_LEN {
+			return Err(PublicError::BadLength)
+		}
 		let format = ident.try_into().map_err(|_: ()| PublicError::UnknownVersion)?;
-		if !Self::format_is_allowed(format) { return Err(PublicError::FormatNotAllowed) }
+		if !Self::format_is_allowed(format) {
+			return Err(PublicError::FormatNotAllowed)
+		}
 
 		let hash = ss58hash(&data[0..body_len + prefix_len]);
 		let checksum = &hash.as_bytes()[0..CHECKSUM_LEN];
 		if data[body_len + prefix_len..body_len + prefix_len + CHECKSUM_LEN] != *checksum {
 			// Invalid checksum.
-			return Err(PublicError::InvalidChecksum);
+			return Err(PublicError::InvalidChecksum)
 		}
 		res.as_mut().copy_from_slice(&data[prefix_len..body_len + prefix_len]);
 		Ok((res, format))
@@ -282,12 +288,11 @@ pub trait Ss58Codec: Sized + AsMut<[u8]> + AsRef<[u8]> + Default {
 	/// a derivation path following.
 	#[cfg(feature = "std")]
 	fn from_string(s: &str) -> Result<Self, PublicError> {
-		Self::from_string_with_version(s)
-			.and_then(|(r, v)| match v {
-				v if !v.is_custom() => Ok(r),
-				v if v == *DEFAULT_VERSION.lock() => Ok(r),
-				_ => Err(PublicError::UnknownVersion),
-			})
+		Self::from_string_with_version(s).and_then(|(r, v)| match v {
+			v if !v.is_custom() => Ok(r),
+			v if v == *DEFAULT_VERSION.lock() => Ok(r),
+			_ => Err(PublicError::UnknownVersion),
+		})
 	}
 
 	/// Return the ss58-check string for this key.
@@ -304,7 +309,7 @@ pub trait Ss58Codec: Sized + AsMut<[u8]> + AsRef<[u8]> + Default {
 				// lower bits of the upper byte in the low pos
 				let second = ((ident >> 8) as u8) | ((ident & 0b0000_0000_0000_0011) as u8) << 6;
 				vec![first | 0b01000000, second]
-			}
+			},
 			_ => unreachable!("masked out the upper two bits; qed"),
 		};
 		v.extend(self.as_ref());
@@ -315,7 +320,9 @@ pub trait Ss58Codec: Sized + AsMut<[u8]> + AsRef<[u8]> + Default {
 
 	/// Return the ss58-check string for this key.
 	#[cfg(feature = "std")]
-	fn to_ss58check(&self) -> String { self.to_ss58check_with_version(*DEFAULT_VERSION.lock()) }
+	fn to_ss58check(&self) -> String {
+		self.to_ss58check_with_version(*DEFAULT_VERSION.lock())
+	}
 
 	/// Some if the string is a properly encoded SS58Check address, optionally with
 	/// a derivation path following.
@@ -331,7 +338,7 @@ pub trait Derive: Sized {
 	///
 	/// Will be `None` for public keys if there are any hard junctions in there.
 	#[cfg(feature = "std")]
-	fn derive<Iter: Iterator<Item=DeriveJunction>>(&self, _path: Iter) -> Option<Self> {
+	fn derive<Iter: Iterator<Item = DeriveJunction>>(&self, _path: Iter) -> Option<Self> {
 		None
 	}
 }
@@ -629,9 +636,7 @@ lazy_static::lazy_static! {
 impl<T: Sized + AsMut<[u8]> + AsRef<[u8]> + Default + Derive> Ss58Codec for T {
 	fn from_string(s: &str) -> Result<Self, PublicError> {
 		let cap = SS58_REGEX.captures(s).ok_or(PublicError::InvalidFormat)?;
-		let s = cap.name("ss58")
-			.map(|r| r.as_str())
-			.unwrap_or(DEV_ADDRESS);
+		let s = cap.name("ss58").map(|r| r.as_str()).unwrap_or(DEV_ADDRESS);
 		let addr = if let Some(stripped) = s.strip_prefix("0x") {
 			let d = hex::decode(stripped).map_err(|_| PublicError::InvalidFormat)?;
 			let mut r = Self::default();
@@ -647,28 +652,23 @@ impl<T: Sized + AsMut<[u8]> + AsRef<[u8]> + Default + Derive> Ss58Codec for T {
 		if cap["path"].is_empty() {
 			Ok(addr)
 		} else {
-			let path = JUNCTION_REGEX.captures_iter(&cap["path"])
-				.map(|f| DeriveJunction::from(&f[1]));
-			addr.derive(path)
-				.ok_or(PublicError::InvalidPath)
+			let path =
+				JUNCTION_REGEX.captures_iter(&cap["path"]).map(|f| DeriveJunction::from(&f[1]));
+			addr.derive(path).ok_or(PublicError::InvalidPath)
 		}
 	}
 
 	fn from_string_with_version(s: &str) -> Result<(Self, Ss58AddressFormat), PublicError> {
 		let cap = SS58_REGEX.captures(s).ok_or(PublicError::InvalidFormat)?;
 		let (addr, v) = Self::from_ss58check_with_version(
-			cap.name("ss58")
-				.map(|r| r.as_str())
-				.unwrap_or(DEV_ADDRESS)
+			cap.name("ss58").map(|r| r.as_str()).unwrap_or(DEV_ADDRESS),
 		)?;
 		if cap["path"].is_empty() {
 			Ok((addr, v))
 		} else {
-			let path = JUNCTION_REGEX.captures_iter(&cap["path"])
-				.map(|f| DeriveJunction::from(&f[1]));
-			addr.derive(path)
-				.ok_or(PublicError::InvalidPath)
-				.map(|a| (a, v))
+			let path =
+				JUNCTION_REGEX.captures_iter(&cap["path"]).map(|f| DeriveJunction::from(&f[1]));
+			addr.derive(path).ok_or(PublicError::InvalidPath).map(|a| (a, v))
 		}
 	}
 }
@@ -694,10 +694,14 @@ pub trait Public:
 	fn from_slice(data: &[u8]) -> Self;
 
 	/// Return a `Vec<u8>` filled with raw data.
-	fn to_raw_vec(&self) -> Vec<u8> { self.as_slice().to_vec() }
+	fn to_raw_vec(&self) -> Vec<u8> {
+		self.as_slice().to_vec()
+	}
 
 	/// Return a slice filled with raw data.
-	fn as_slice(&self) -> &[u8] { self.as_ref() }
+	fn as_slice(&self) -> &[u8] {
+		self.as_ref()
+	}
 	/// Return `CryptoTypePublicPair` from public key.
 	fn to_public_crypto_pair(&self) -> CryptoTypePublicPair;
 }
@@ -809,14 +813,20 @@ impl sp_std::fmt::Debug for AccountId32 {
 
 #[cfg(feature = "std")]
 impl serde::Serialize for AccountId32 {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: serde::Serializer {
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+	where
+		S: serde::Serializer,
+	{
 		serializer.serialize_str(&self.to_ss58check())
 	}
 }
 
 #[cfg(feature = "std")]
 impl<'de> serde::Deserialize<'de> for AccountId32 {
-	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: serde::Deserializer<'de> {
+	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+	where
+		D: serde::Deserializer<'de>,
+	{
 		Ss58Codec::from_ss58check(&String::deserialize(deserializer)?)
 			.map_err(|e| serde::de::Error::custom(format!("{:?}", e)))
 	}
@@ -851,11 +861,13 @@ mod dummy {
 	pub struct Dummy;
 
 	impl AsRef<[u8]> for Dummy {
-		fn as_ref(&self) -> &[u8] { &b""[..] }
+		fn as_ref(&self) -> &[u8] {
+			&b""[..]
+		}
 	}
 
 	impl AsMut<[u8]> for Dummy {
-		fn as_mut(&mut self) -> &mut[u8] {
+		fn as_mut(&mut self) -> &mut [u8] {
 			unsafe {
 				#[allow(mutable_transmutes)]
 				sp_std::mem::transmute::<_, &'static mut [u8]>(&b""[..])
@@ -878,14 +890,18 @@ mod dummy {
 	impl Derive for Dummy {}
 
 	impl Public for Dummy {
-		fn from_slice(_: &[u8]) -> Self { Self }
+		fn from_slice(_: &[u8]) -> Self {
+			Self
+		}
 		#[cfg(feature = "std")]
-		fn to_raw_vec(&self) -> Vec<u8> { vec![] }
-		fn as_slice(&self) -> &[u8] { b"" }
+		fn to_raw_vec(&self) -> Vec<u8> {
+			vec![]
+		}
+		fn as_slice(&self) -> &[u8] {
+			b""
+		}
 		fn to_public_crypto_pair(&self) -> CryptoTypePublicPair {
-			CryptoTypePublicPair(
-				CryptoTypeId(*b"dumm"), Public::to_raw_vec(self)
-			)
+			CryptoTypePublicPair(CryptoTypeId(*b"dumm"), Public::to_raw_vec(self))
 		}
 	}
 
@@ -895,23 +911,41 @@ mod dummy {
 		type Signature = Dummy;
 		type DeriveError = ();
 		#[cfg(feature = "std")]
-		fn generate_with_phrase(_: Option<&str>) -> (Self, String, Self::Seed) { Default::default() }
+		fn generate_with_phrase(_: Option<&str>) -> (Self, String, Self::Seed) {
+			Default::default()
+		}
 		#[cfg(feature = "std")]
-		fn from_phrase(_: &str, _: Option<&str>)
-			-> Result<(Self, Self::Seed), SecretStringError>
-		{
+		fn from_phrase(_: &str, _: Option<&str>) -> Result<(Self, Self::Seed), SecretStringError> {
 			Ok(Default::default())
 		}
-		fn derive<
-			Iter: Iterator<Item=DeriveJunction>,
-		>(&self, _: Iter, _: Option<Dummy>) -> Result<(Self, Option<Dummy>), Self::DeriveError> { Ok((Self, None)) }
-		fn from_seed(_: &Self::Seed) -> Self { Self }
-		fn from_seed_slice(_: &[u8]) -> Result<Self, SecretStringError> { Ok(Self) }
-		fn sign(&self, _: &[u8]) -> Self::Signature { Self }
-		fn verify<M: AsRef<[u8]>>(_: &Self::Signature, _: M, _: &Self::Public) -> bool { true }
-		fn verify_weak<P: AsRef<[u8]>, M: AsRef<[u8]>>(_: &[u8], _: M, _: P) -> bool { true }
-		fn public(&self) -> Self::Public { Self }
-		fn to_raw_vec(&self) -> Vec<u8> { vec![] }
+		fn derive<Iter: Iterator<Item = DeriveJunction>>(
+			&self,
+			_: Iter,
+			_: Option<Dummy>,
+		) -> Result<(Self, Option<Dummy>), Self::DeriveError> {
+			Ok((Self, None))
+		}
+		fn from_seed(_: &Self::Seed) -> Self {
+			Self
+		}
+		fn from_seed_slice(_: &[u8]) -> Result<Self, SecretStringError> {
+			Ok(Self)
+		}
+		fn sign(&self, _: &[u8]) -> Self::Signature {
+			Self
+		}
+		fn verify<M: AsRef<[u8]>>(_: &Self::Signature, _: M, _: &Self::Public) -> bool {
+			true
+		}
+		fn verify_weak<P: AsRef<[u8]>, M: AsRef<[u8]>>(_: &[u8], _: M, _: P) -> bool {
+			true
+		}
+		fn public(&self) -> Self::Public {
+			Self
+		}
+		fn to_raw_vec(&self) -> Vec<u8> {
+			vec![]
+		}
 	}
 }
 
@@ -956,10 +990,14 @@ pub trait Pair: CryptoType + Sized + Clone + Send + Sync + 'static {
 
 	/// Returns the KeyPair from the English BIP39 seed `phrase`, or `None` if it's invalid.
 	#[cfg(feature = "std")]
-	fn from_phrase(phrase: &str, password: Option<&str>) -> Result<(Self, Self::Seed), SecretStringError>;
+	fn from_phrase(
+		phrase: &str,
+		password: Option<&str>,
+	) -> Result<(Self, Self::Seed), SecretStringError>;
 
 	/// Derive a child key from a series of given junctions.
-	fn derive<Iter: Iterator<Item=DeriveJunction>>(&self,
+	fn derive<Iter: Iterator<Item = DeriveJunction>>(
+		&self,
 		path: Iter,
 		seed: Option<Self::Seed>,
 	) -> Result<(Self, Option<Self::Seed>), Self::DeriveError>;
@@ -1018,19 +1056,20 @@ pub trait Pair: CryptoType + Sized + Clone + Send + Sync + 'static {
 	///
 	/// `None` is returned if no matches are found.
 	#[cfg(feature = "std")]
-	fn from_string_with_seed(s: &str, password_override: Option<&str>)
-		-> Result<(Self, Option<Self::Seed>), SecretStringError>
-	{
+	fn from_string_with_seed(
+		s: &str,
+		password_override: Option<&str>,
+	) -> Result<(Self, Option<Self::Seed>), SecretStringError> {
 		let cap = SECRET_PHRASE_REGEX.captures(s).ok_or(SecretStringError::InvalidFormat)?;
 
-		let path = JUNCTION_REGEX.captures_iter(&cap["path"])
-			.map(|f| DeriveJunction::from(&f[1]));
+		let path = JUNCTION_REGEX.captures_iter(&cap["path"]).map(|f| DeriveJunction::from(&f[1]));
 
 		let phrase = cap.name("phrase").map(|r| r.as_str()).unwrap_or(DEV_PHRASE);
 		let password = password_override.or_else(|| cap.name("password").map(|m| m.as_str()));
 
 		let (root, seed) = if let Some(stripped) = phrase.strip_prefix("0x") {
-			hex::decode(stripped).ok()
+			hex::decode(stripped)
+				.ok()
 				.and_then(|seed_vec| {
 					let mut seed = Self::Seed::default();
 					if seed.as_ref().len() == seed_vec.len() {
@@ -1042,8 +1081,7 @@ pub trait Pair: CryptoType + Sized + Clone + Send + Sync + 'static {
 				})
 				.ok_or(SecretStringError::InvalidSeed)?
 		} else {
-			Self::from_phrase(phrase, password)
-				.map_err(|_| SecretStringError::InvalidPhrase)?
+			Self::from_phrase(phrase, password).map_err(|_| SecretStringError::InvalidPhrase)?
 		};
 		root.derive(path, Some(seed)).map_err(|_| SecretStringError::InvalidPath)
 	}
@@ -1074,19 +1112,25 @@ pub trait Wraps: Sized {
 	type Inner: IsWrappedBy<Self>;
 }
 
-impl<T, Outer> IsWrappedBy<Outer> for T where
+impl<T, Outer> IsWrappedBy<Outer> for T
+where
 	Outer: AsRef<Self> + AsMut<Self> + From<Self>,
 	T: From<Outer>,
 {
 	/// Get a reference to the inner from the outer.
-	fn from_ref(outer: &Outer) -> &Self { outer.as_ref() }
+	fn from_ref(outer: &Outer) -> &Self {
+		outer.as_ref()
+	}
 
 	/// Get a mutable reference to the inner from the outer.
-	fn from_mut(outer: &mut Outer) -> &mut Self { outer.as_mut() }
+	fn from_mut(outer: &mut Outer) -> &mut Self {
+		outer.as_mut()
+	}
 }
 
-impl<Inner, Outer, T> UncheckedFrom<T> for Outer where
-	Outer: Wraps<Inner=Inner>,
+impl<Inner, Outer, T> UncheckedFrom<T> for Outer
+where
+	Outer: Wraps<Inner = Inner>,
 	Inner: IsWrappedBy<Outer> + UncheckedFrom<T>,
 {
 	fn unchecked_from(t: T) -> Self {
@@ -1110,8 +1154,18 @@ pub trait CryptoType {
 /// Values whose first character is `_` are reserved for private use and won't conflict with any
 /// public modules.
 #[derive(
-	Copy, Clone, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Encode, Decode, PassByInner,
-	crate::RuntimeDebug
+	Copy,
+	Clone,
+	Default,
+	PartialEq,
+	Eq,
+	PartialOrd,
+	Ord,
+	Hash,
+	Encode,
+	Decode,
+	PassByInner,
+	crate::RuntimeDebug,
 )]
 #[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
 pub struct KeyTypeId(pub [u8; 4]);
@@ -1134,7 +1188,7 @@ impl<'a> TryFrom<&'a str> for KeyTypeId {
 	fn try_from(x: &'a str) -> Result<Self, ()> {
 		let b = x.as_bytes();
 		if b.len() != 4 {
-			return Err(());
+			return Err(())
 		}
 		let mut res = KeyTypeId::default();
 		res.0.copy_from_slice(&b[0..4]);
@@ -1159,7 +1213,7 @@ impl sp_std::fmt::Display for CryptoTypePublicPair {
 			Ok(id) => id.to_string(),
 			Err(_) => {
 				format!("{:#?}", self.0)
-			}
+			},
 		};
 		write!(f, "{}-{}", id, HexDisplay::from(&self.1))
 	}
@@ -1195,16 +1249,16 @@ pub mod key_types {
 
 #[cfg(test)]
 mod tests {
+	use super::*;
 	use crate::DeriveJunction;
 	use hex_literal::hex;
-	use super::*;
 
 	#[derive(Clone, Eq, PartialEq, Debug)]
 	enum TestPair {
 		Generated,
 		GeneratedWithPhrase,
-		GeneratedFromPhrase{phrase: String, password: Option<String>},
-		Standard{phrase: String, password: Option<String>, path: Vec<DeriveJunction>},
+		GeneratedFromPhrase { phrase: String, password: Option<String> },
+		Standard { phrase: String, password: Option<String>, path: Vec<DeriveJunction> },
 		Seed(Vec<u8>),
 	}
 	impl Default for TestPair {
@@ -1250,9 +1304,7 @@ mod tests {
 			vec![]
 		}
 		fn to_public_crypto_pair(&self) -> CryptoTypePublicPair {
-			CryptoTypePublicPair(
-				CryptoTypeId(*b"dumm"), self.to_raw_vec(),
-			)
+			CryptoTypePublicPair(CryptoTypeId(*b"dumm"), self.to_raw_vec())
 		}
 	}
 	impl Pair for TestPair {
@@ -1261,41 +1313,68 @@ mod tests {
 		type Signature = [u8; 0];
 		type DeriveError = ();
 
-		fn generate() -> (Self, <Self as Pair>::Seed) { (TestPair::Generated, [0u8; 8]) }
+		fn generate() -> (Self, <Self as Pair>::Seed) {
+			(TestPair::Generated, [0u8; 8])
+		}
 		fn generate_with_phrase(_password: Option<&str>) -> (Self, String, <Self as Pair>::Seed) {
 			(TestPair::GeneratedWithPhrase, "".into(), [0u8; 8])
 		}
-		fn from_phrase(phrase: &str, password: Option<&str>)
-			-> Result<(Self, <Self as Pair>::Seed), SecretStringError>
-		{
-			Ok((TestPair::GeneratedFromPhrase {
-				phrase: phrase.to_owned(),
-				password: password.map(Into::into)
-			}, [0u8; 8]))
+		fn from_phrase(
+			phrase: &str,
+			password: Option<&str>,
+		) -> Result<(Self, <Self as Pair>::Seed), SecretStringError> {
+			Ok((
+				TestPair::GeneratedFromPhrase {
+					phrase: phrase.to_owned(),
+					password: password.map(Into::into),
+				},
+				[0u8; 8],
+			))
+		}
+		fn derive<Iter: Iterator<Item = DeriveJunction>>(
+			&self,
+			path_iter: Iter,
+			_: Option<[u8; 8]>,
+		) -> Result<(Self, Option<[u8; 8]>), Self::DeriveError> {
+			Ok((
+				match self.clone() {
+					TestPair::Standard { phrase, password, path } => TestPair::Standard {
+						phrase,
+						password,
+						path: path.into_iter().chain(path_iter).collect(),
+					},
+					TestPair::GeneratedFromPhrase { phrase, password } =>
+						TestPair::Standard { phrase, password, path: path_iter.collect() },
+					x =>
+						if path_iter.count() == 0 {
+							x
+						} else {
+							return Err(())
+						},
+				},
+				None,
+			))
+		}
+		fn from_seed(_seed: &<TestPair as Pair>::Seed) -> Self {
+			TestPair::Seed(_seed.as_ref().to_owned())
 		}
-		fn derive<Iter: Iterator<Item=DeriveJunction>>(&self, path_iter: Iter, _: Option<[u8; 8]>)
-			-> Result<(Self, Option<[u8; 8]>), Self::DeriveError>
-		{
-			Ok((match self.clone() {
-				TestPair::Standard {phrase, password, path} =>
-					TestPair::Standard { phrase, password, path: path.into_iter().chain(path_iter).collect() },
-				TestPair::GeneratedFromPhrase {phrase, password} =>
-					TestPair::Standard { phrase, password, path: path_iter.collect() },
-				x => if path_iter.count() == 0 { x } else { return Err(()) },
-			}, None))
+		fn sign(&self, _message: &[u8]) -> Self::Signature {
+			[]
+		}
+		fn verify<M: AsRef<[u8]>>(_: &Self::Signature, _: M, _: &Self::Public) -> bool {
+			true
 		}
-		fn from_seed(_seed: &<TestPair as Pair>::Seed) -> Self { TestPair::Seed(_seed.as_ref().to_owned()) }
-		fn sign(&self, _message: &[u8]) -> Self::Signature { [] }
-		fn verify<M: AsRef<[u8]>>(_: &Self::Signature, _: M, _: &Self::Public) -> bool { true }
 		fn verify_weak<P: AsRef<[u8]>, M: AsRef<[u8]>>(
 			_sig: &[u8],
 			_message: M,
-			_pubkey: P
-		) -> bool { true }
-		fn public(&self) -> Self::Public { TestPublic }
-		fn from_seed_slice(seed: &[u8])
-			-> Result<Self, SecretStringError>
-		{
+			_pubkey: P,
+		) -> bool {
+			true
+		}
+		fn public(&self) -> Self::Public {
+			TestPublic
+		}
+		fn from_seed_slice(seed: &[u8]) -> Result<Self, SecretStringError> {
 			Ok(TestPair::Seed(seed.to_owned()))
 		}
 		fn to_raw_vec(&self) -> Vec<u8> {
@@ -1327,43 +1406,83 @@ mod tests {
 	fn interpret_std_secret_string_should_work() {
 		assert_eq!(
 			TestPair::from_string("hello world", None),
-			Ok(TestPair::Standard{phrase: "hello world".to_owned(), password: None, path: vec![]})
+			Ok(TestPair::Standard {
+				phrase: "hello world".to_owned(),
+				password: None,
+				path: vec![]
+			})
 		);
 		assert_eq!(
 			TestPair::from_string("hello world/1", None),
-			Ok(TestPair::Standard{phrase: "hello world".to_owned(), password: None, path: vec![DeriveJunction::soft(1)]})
+			Ok(TestPair::Standard {
+				phrase: "hello world".to_owned(),
+				password: None,
+				path: vec![DeriveJunction::soft(1)]
+			})
 		);
 		assert_eq!(
 			TestPair::from_string("hello world/DOT", None),
-			Ok(TestPair::Standard{phrase: "hello world".to_owned(), password: None, path: vec![DeriveJunction::soft("DOT")]})
+			Ok(TestPair::Standard {
+				phrase: "hello world".to_owned(),
+				password: None,
+				path: vec![DeriveJunction::soft("DOT")]
+			})
 		);
 		assert_eq!(
 			TestPair::from_string("hello world//1", None),
-			Ok(TestPair::Standard{phrase: "hello world".to_owned(), password: None, path: vec![DeriveJunction::hard(1)]})
+			Ok(TestPair::Standard {
+				phrase: "hello world".to_owned(),
+				password: None,
+				path: vec![DeriveJunction::hard(1)]
+			})
 		);
 		assert_eq!(
 			TestPair::from_string("hello world//DOT", None),
-			Ok(TestPair::Standard{phrase: "hello world".to_owned(), password: None, path: vec![DeriveJunction::hard("DOT")]})
+			Ok(TestPair::Standard {
+				phrase: "hello world".to_owned(),
+				password: None,
+				path: vec![DeriveJunction::hard("DOT")]
+			})
 		);
 		assert_eq!(
 			TestPair::from_string("hello world//1/DOT", None),
-			Ok(TestPair::Standard{phrase: "hello world".to_owned(), password: None, path: vec![DeriveJunction::hard(1), DeriveJunction::soft("DOT")]})
+			Ok(TestPair::Standard {
+				phrase: "hello world".to_owned(),
+				password: None,
+				path: vec![DeriveJunction::hard(1), DeriveJunction::soft("DOT")]
+			})
 		);
 		assert_eq!(
 			TestPair::from_string("hello world//DOT/1", None),
-			Ok(TestPair::Standard{phrase: "hello world".to_owned(), password: None, path: vec![DeriveJunction::hard("DOT"), DeriveJunction::soft(1)]})
+			Ok(TestPair::Standard {
+				phrase: "hello world".to_owned(),
+				password: None,
+				path: vec![DeriveJunction::hard("DOT"), DeriveJunction::soft(1)]
+			})
 		);
 		assert_eq!(
 			TestPair::from_string("hello world///password", None),
-			Ok(TestPair::Standard{phrase: "hello world".to_owned(), password: Some("password".to_owned()), path: vec![]})
+			Ok(TestPair::Standard {
+				phrase: "hello world".to_owned(),
+				password: Some("password".to_owned()),
+				path: vec![]
+			})
 		);
 		assert_eq!(
 			TestPair::from_string("hello world//1/DOT///password", None),
-			Ok(TestPair::Standard{phrase: "hello world".to_owned(), password: Some("password".to_owned()), path: vec![DeriveJunction::hard(1), DeriveJunction::soft("DOT")]})
+			Ok(TestPair::Standard {
+				phrase: "hello world".to_owned(),
+				password: Some("password".to_owned()),
+				path: vec![DeriveJunction::hard(1), DeriveJunction::soft("DOT")]
+			})
 		);
 		assert_eq!(
 			TestPair::from_string("hello world/1//DOT///password", None),
-			Ok(TestPair::Standard{phrase: "hello world".to_owned(), password: Some("password".to_owned()), path: vec![DeriveJunction::soft(1), DeriveJunction::hard("DOT")]})
+			Ok(TestPair::Standard {
+				phrase: "hello world".to_owned(),
+				password: Some("password".to_owned()),
+				path: vec![DeriveJunction::soft(1), DeriveJunction::hard("DOT")]
+			})
 		);
 	}
 
@@ -1371,25 +1490,40 @@ mod tests {
 	fn accountid_32_from_str_works() {
 		use std::str::FromStr;
 		assert!(AccountId32::from_str("5G9VdMwXvzza9pS8qE8ZHJk3CheHW9uucBn9ngW4C1gmmzpv").is_ok());
-		assert!(AccountId32::from_str("5c55177d67b064bb5d189a3e1ddad9bc6646e02e64d6e308f5acbb1533ac430d").is_ok());
-		assert!(AccountId32::from_str("0x5c55177d67b064bb5d189a3e1ddad9bc6646e02e64d6e308f5acbb1533ac430d").is_ok());
+		assert!(AccountId32::from_str(
+			"5c55177d67b064bb5d189a3e1ddad9bc6646e02e64d6e308f5acbb1533ac430d"
+		)
+		.is_ok());
+		assert!(AccountId32::from_str(
+			"0x5c55177d67b064bb5d189a3e1ddad9bc6646e02e64d6e308f5acbb1533ac430d"
+		)
+		.is_ok());
 
 		assert_eq!(
 			AccountId32::from_str("99G9VdMwXvzza9pS8qE8ZHJk3CheHW9uucBn9ngW4C1gmmzpv").unwrap_err(),
 			"invalid ss58 address.",
 		);
 		assert_eq!(
-			AccountId32::from_str("gc55177d67b064bb5d189a3e1ddad9bc6646e02e64d6e308f5acbb1533ac430d").unwrap_err(),
+			AccountId32::from_str(
+				"gc55177d67b064bb5d189a3e1ddad9bc6646e02e64d6e308f5acbb1533ac430d"
+			)
+			.unwrap_err(),
 			"invalid hex address.",
 		);
 		assert_eq!(
-			AccountId32::from_str("0xgc55177d67b064bb5d189a3e1ddad9bc6646e02e64d6e308f5acbb1533ac430d").unwrap_err(),
+			AccountId32::from_str(
+				"0xgc55177d67b064bb5d189a3e1ddad9bc6646e02e64d6e308f5acbb1533ac430d"
+			)
+			.unwrap_err(),
 			"invalid hex address.",
 		);
 
 		// valid hex but invalid length will be treated as ss58.
 		assert_eq!(
-			AccountId32::from_str("55c55177d67b064bb5d189a3e1ddad9bc6646e02e64d6e308f5acbb1533ac430d").unwrap_err(),
+			AccountId32::from_str(
+				"55c55177d67b064bb5d189a3e1ddad9bc6646e02e64d6e308f5acbb1533ac430d"
+			)
+			.unwrap_err(),
 			"invalid ss58 address.",
 		);
 	}
diff --git a/primitives/core/src/ecdsa.rs b/primitives/core/src/ecdsa.rs
index ffdb5f5c4c99..b4c4bda17acb 100644
--- a/primitives/core/src/ecdsa.rs
+++ b/primitives/core/src/ecdsa.rs
@@ -22,25 +22,30 @@
 #[cfg(feature = "full_crypto")]
 use sp_std::vec::Vec;
 
+use codec::{Decode, Encode, MaxEncodedLen};
 use sp_std::cmp::Ordering;
-use codec::{Encode, Decode, MaxEncodedLen};
 
-#[cfg(feature = "full_crypto")]
-use core::convert::{TryFrom, TryInto};
-#[cfg(feature = "std")]
-use substrate_bip39::seed_from_entropy;
-#[cfg(feature = "std")]
-use bip39::{Mnemonic, Language, MnemonicType};
-#[cfg(feature = "full_crypto")]
-use crate::{hashing::blake2_256, crypto::{Pair as TraitPair, DeriveJunction, SecretStringError}};
 #[cfg(feature = "std")]
 use crate::crypto::Ss58Codec;
+use crate::crypto::{
+	CryptoType, CryptoTypeId, CryptoTypePublicPair, Derive, Public as TraitPublic, UncheckedFrom,
+};
+#[cfg(feature = "full_crypto")]
+use crate::{
+	crypto::{DeriveJunction, Pair as TraitPair, SecretStringError},
+	hashing::blake2_256,
+};
 #[cfg(feature = "std")]
-use serde::{de, Serializer, Serialize, Deserializer, Deserialize};
-use crate::crypto::{Public as TraitPublic, CryptoTypePublicPair, UncheckedFrom, CryptoType, Derive, CryptoTypeId};
-use sp_runtime_interface::pass_by::PassByInner;
+use bip39::{Language, Mnemonic, MnemonicType};
+#[cfg(feature = "full_crypto")]
+use core::convert::{TryFrom, TryInto};
 #[cfg(feature = "full_crypto")]
 use secp256k1::{PublicKey, SecretKey};
+#[cfg(feature = "std")]
+use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
+use sp_runtime_interface::pass_by::PassByInner;
+#[cfg(feature = "std")]
+use substrate_bip39::seed_from_entropy;
 
 /// An identifier used to match public keys against ecdsa keys
 pub const CRYPTO_ID: CryptoTypeId = CryptoTypeId(*b"ecds");
@@ -165,7 +170,6 @@ impl sp_std::convert::TryFrom<&[u8]> for Public {
 		if data.len() == 33 {
 			Ok(Self::from_slice(data))
 		} else {
-
 			Err(())
 		}
 	}
@@ -206,14 +210,20 @@ impl sp_std::fmt::Debug for Public {
 
 #[cfg(feature = "std")]
 impl Serialize for Public {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer {
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+	where
+		S: Serializer,
+	{
 		serializer.serialize_str(&self.to_ss58check())
 	}
 }
 
 #[cfg(feature = "std")]
 impl<'de> Deserialize<'de> for Public {
-	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
+	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+	where
+		D: Deserializer<'de>,
+	{
 		Public::from_ss58check(&String::deserialize(deserializer)?)
 			.map_err(|e| de::Error::custom(format!("{:?}", e)))
 	}
@@ -246,14 +256,20 @@ impl sp_std::convert::TryFrom<&[u8]> for Signature {
 
 #[cfg(feature = "std")]
 impl Serialize for Signature {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer {
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+	where
+		S: Serializer,
+	{
 		serializer.serialize_str(&hex::encode(self))
 	}
 }
 
 #[cfg(feature = "std")]
 impl<'de> Deserialize<'de> for Signature {
-	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
+	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+	where
+		D: Deserializer<'de>,
+	{
 		let signature_hex = hex::decode(&String::deserialize(deserializer)?)
 			.map_err(|e| de::Error::custom(format!("{:?}", e)))?;
 		Signature::try_from(signature_hex.as_ref())
@@ -359,7 +375,7 @@ impl Signature {
 	#[cfg(feature = "full_crypto")]
 	pub fn recover_prehashed(&self, message: &[u8; 32]) -> Option<Public> {
 		let message = secp256k1::Message::parse(message);
-		
+
 		let sig: (_, _) = self.try_into().ok()?;
 
 		secp256k1::recover(&message, &sig.0, &sig.1)
@@ -381,7 +397,9 @@ impl From<(secp256k1::Signature, secp256k1::RecoveryId)> for Signature {
 #[cfg(feature = "full_crypto")]
 impl<'a> TryFrom<&'a Signature> for (secp256k1::Signature, secp256k1::RecoveryId) {
 	type Error = ();
-	fn try_from(x: &'a Signature) -> Result<(secp256k1::Signature, secp256k1::RecoveryId), Self::Error> {
+	fn try_from(
+		x: &'a Signature,
+	) -> Result<(secp256k1::Signature, secp256k1::RecoveryId), Self::Error> {
 		Ok((
 			secp256k1::Signature::parse_slice(&x.0[0..64]).expect("hardcoded to 64 bytes; qed"),
 			secp256k1::RecoveryId::parse(x.0[64]).map_err(|_| ())?,
@@ -430,21 +448,22 @@ impl TraitPair for Pair {
 		let phrase = mnemonic.phrase();
 		let (pair, seed) = Self::from_phrase(phrase, password)
 			.expect("All phrases generated by Mnemonic are valid; qed");
-		(
-			pair,
-			phrase.to_owned(),
-			seed,
-		)
+		(pair, phrase.to_owned(), seed)
 	}
 
 	/// Generate key pair from given recovery phrase and password.
 	#[cfg(feature = "std")]
-	fn from_phrase(phrase: &str, password: Option<&str>) -> Result<(Pair, Seed), SecretStringError> {
+	fn from_phrase(
+		phrase: &str,
+		password: Option<&str>,
+	) -> Result<(Pair, Seed), SecretStringError> {
 		let big_seed = seed_from_entropy(
 			Mnemonic::from_phrase(phrase, Language::English)
-				.map_err(|_| SecretStringError::InvalidPhrase)?.entropy(),
+				.map_err(|_| SecretStringError::InvalidPhrase)?
+				.entropy(),
 			password.unwrap_or(""),
-		).map_err(|_| SecretStringError::InvalidSeed)?;
+		)
+		.map_err(|_| SecretStringError::InvalidSeed)?;
 		let mut seed = Seed::default();
 		seed.copy_from_slice(&big_seed[0..32]);
 		Self::from_seed_slice(&big_seed[0..32]).map(|x| (x, seed))
@@ -462,16 +481,17 @@ impl TraitPair for Pair {
 	///
 	/// You should never need to use this; generate(), generate_with_phrase
 	fn from_seed_slice(seed_slice: &[u8]) -> Result<Pair, SecretStringError> {
-		let secret = SecretKey::parse_slice(seed_slice)
-			.map_err(|_| SecretStringError::InvalidSeedLength)?;
+		let secret =
+			SecretKey::parse_slice(seed_slice).map_err(|_| SecretStringError::InvalidSeedLength)?;
 		let public = PublicKey::from_secret_key(&secret);
-		Ok(Pair{ public, secret })
+		Ok(Pair { public, secret })
 	}
 
 	/// Derive a child key from a series of given junctions.
-	fn derive<Iter: Iterator<Item=DeriveJunction>>(&self,
+	fn derive<Iter: Iterator<Item = DeriveJunction>>(
+		&self,
 		path: Iter,
-		_seed: Option<Seed>
+		_seed: Option<Seed>,
 	) -> Result<(Pair, Option<Seed>), DeriveError> {
 		let mut acc = self.secret.serialize();
 		for j in path {
@@ -497,7 +517,10 @@ impl TraitPair for Pair {
 	/// Verify a signature on a message. Returns true if the signature is good.
 	fn verify<M: AsRef<[u8]>>(sig: &Self::Signature, message: M, pubkey: &Self::Public) -> bool {
 		let message = secp256k1::Message::parse(&blake2_256(message.as_ref()));
-		let sig: (_, _) = match sig.try_into() { Ok(x) => x, _ => return false };
+		let sig: (_, _) = match sig.try_into() {
+			Ok(x) => x,
+			_ => return false,
+		};
 		match secp256k1::recover(&message, &sig.0, &sig.1) {
 			Ok(actual) => pubkey.0[..] == actual.serialize_compressed()[..],
 			_ => false,
@@ -510,9 +533,17 @@ impl TraitPair for Pair {
 	/// size. Use it only if you're coming from byte buffers and need the speed.
 	fn verify_weak<P: AsRef<[u8]>, M: AsRef<[u8]>>(sig: &[u8], message: M, pubkey: P) -> bool {
 		let message = secp256k1::Message::parse(&blake2_256(message.as_ref()));
-		if sig.len() != 65 { return false }
-		let ri = match secp256k1::RecoveryId::parse(sig[64]) { Ok(x) => x, _ => return false };
-		let sig = match secp256k1::Signature::parse_slice(&sig[0..64]) { Ok(x) => x, _ => return false };
+		if sig.len() != 65 {
+			return false
+		}
+		let ri = match secp256k1::RecoveryId::parse(sig[64]) {
+			Ok(x) => x,
+			_ => return false,
+		};
+		let sig = match secp256k1::Signature::parse_slice(&sig[0..64]) {
+			Ok(x) => x,
+			_ => return false,
+		};
 		match secp256k1::recover(&message, &sig, &ri) {
 			Ok(actual) => pubkey.as_ref() == &actual.serialize()[1..],
 			_ => false,
@@ -554,30 +585,30 @@ impl Pair {
 	/// and thus matches the given `public` key.
 	pub fn verify_prehashed(sig: &Signature, message: &[u8; 32], public: &Public) -> bool {
 		let message = secp256k1::Message::parse(message);
-	
+
 		let sig: (_, _) = match sig.try_into() {
 			Ok(x) => x,
 			_ => return false,
 		};
-	
+
 		match secp256k1::recover(&message, &sig.0, &sig.1) {
 			Ok(actual) => public.0[..] == actual.serialize_compressed()[..],
 			_ => false,
 		}
-	}	
+	}
 }
 
 impl CryptoType for Public {
-	#[cfg(feature="full_crypto")]
+	#[cfg(feature = "full_crypto")]
 	type Pair = Pair;
 }
 
 impl CryptoType for Signature {
-	#[cfg(feature="full_crypto")]
+	#[cfg(feature = "full_crypto")]
 	type Pair = Pair;
 }
 
-#[cfg(feature="full_crypto")]
+#[cfg(feature = "full_crypto")]
 impl CryptoType for Pair {
 	type Pair = Pair;
 }
@@ -585,16 +616,20 @@ impl CryptoType for Pair {
 #[cfg(test)]
 mod test {
 	use super::*;
+	use crate::{
+		crypto::{set_default_ss58_version, PublicError, DEV_PHRASE},
+		keccak_256,
+	};
 	use hex_literal::hex;
-	use crate::{crypto::{DEV_PHRASE, set_default_ss58_version}, keccak_256};
 	use serde_json;
-	use crate::crypto::PublicError;
 
 	#[test]
 	fn default_phrase_should_be_used() {
 		assert_eq!(
 			Pair::from_string("//Alice///password", None).unwrap().public(),
-			Pair::from_string(&format!("{}//Alice", DEV_PHRASE), Some("password")).unwrap().public(),
+			Pair::from_string(&format!("{}//Alice", DEV_PHRASE), Some("password"))
+				.unwrap()
+				.public(),
 		);
 	}
 
@@ -613,9 +648,9 @@ mod test {
 
 	#[test]
 	fn test_vector_should_work() {
-		let pair = Pair::from_seed(
-			&hex!("9d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f60")
-		);
+		let pair = Pair::from_seed(&hex!(
+			"9d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f60"
+		));
 		let public = pair.public();
 		assert_eq!(
 			public,
@@ -634,8 +669,9 @@ mod test {
 	fn test_vector_by_string_should_work() {
 		let pair = Pair::from_string(
 			"0x9d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f60",
-			None
-		).unwrap();
+			None,
+		)
+		.unwrap();
 		let public = pair.public();
 		assert_eq!(
 			public,
@@ -803,7 +839,8 @@ mod test {
 		// `msg` shouldn't be mangled
 		let msg = [0u8; 32];
 		let sig1 = pair.sign_prehashed(&msg);
-		let sig2: Signature = secp256k1::sign(&secp256k1::Message::parse(&msg), &pair.secret).into();
+		let sig2: Signature =
+			secp256k1::sign(&secp256k1::Message::parse(&msg), &pair.secret).into();
 
 		assert_eq!(sig1, sig2);
 
@@ -815,15 +852,16 @@ mod test {
 		// using pre-hashed `msg` works
 		let msg = keccak_256(b"this should be hashed");
 		let sig1 = pair.sign_prehashed(&msg);
-		let sig2: Signature = secp256k1::sign(&secp256k1::Message::parse(&msg), &pair.secret).into();
+		let sig2: Signature =
+			secp256k1::sign(&secp256k1::Message::parse(&msg), &pair.secret).into();
 
-		assert_eq!(sig1, sig2);		
+		assert_eq!(sig1, sig2);
 	}
 
 	#[test]
 	fn verify_prehashed_works() {
 		let (pair, _, _) = Pair::generate_with_phrase(Some("password"));
-		
+
 		// `msg` and `sig` match
 		let msg = keccak_256(b"this should be hashed");
 		let sig = pair.sign_prehashed(&msg);
diff --git a/primitives/core/src/ed25519.rs b/primitives/core/src/ed25519.rs
index 13ee4d8cdfbc..be70da31e641 100644
--- a/primitives/core/src/ed25519.rs
+++ b/primitives/core/src/ed25519.rs
@@ -22,26 +22,28 @@
 #[cfg(feature = "full_crypto")]
 use sp_std::vec::Vec;
 
-use crate::{hash::H256, hash::H512};
-use codec::{Encode, Decode, MaxEncodedLen};
+use crate::hash::{H256, H512};
+use codec::{Decode, Encode, MaxEncodedLen};
 
+#[cfg(feature = "std")]
+use crate::crypto::Ss58Codec;
+use crate::crypto::{
+	CryptoType, CryptoTypeId, CryptoTypePublicPair, Derive, Public as TraitPublic, UncheckedFrom,
+};
+#[cfg(feature = "full_crypto")]
+use crate::crypto::{DeriveJunction, Pair as TraitPair, SecretStringError};
+#[cfg(feature = "std")]
+use bip39::{Language, Mnemonic, MnemonicType};
 #[cfg(feature = "full_crypto")]
 use core::convert::TryFrom;
 #[cfg(feature = "full_crypto")]
 use ed25519_dalek::{Signer as _, Verifier as _};
 #[cfg(feature = "std")]
-use substrate_bip39::seed_from_entropy;
-#[cfg(feature = "std")]
-use bip39::{Mnemonic, Language, MnemonicType};
-#[cfg(feature = "full_crypto")]
-use crate::crypto::{Pair as TraitPair, DeriveJunction, SecretStringError};
-#[cfg(feature = "std")]
-use crate::crypto::Ss58Codec;
-#[cfg(feature = "std")]
-use serde::{de, Serializer, Serialize, Deserializer, Deserialize};
-use crate::crypto::{Public as TraitPublic, CryptoTypePublicPair, UncheckedFrom, CryptoType, Derive, CryptoTypeId};
+use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 use sp_runtime_interface::pass_by::PassByInner;
 use sp_std::ops::Deref;
+#[cfg(feature = "std")]
+use substrate_bip39::seed_from_entropy;
 
 /// An identifier used to match public keys against ed25519 keys
 pub const CRYPTO_ID: CryptoTypeId = CryptoTypeId(*b"ed25");
@@ -55,8 +57,7 @@ type Seed = [u8; 32];
 /// A public key.
 #[cfg_attr(feature = "full_crypto", derive(Hash))]
 #[derive(
-	PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Encode, Decode, Default, PassByInner,
-	MaxEncodedLen,
+	PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Encode, Decode, Default, PassByInner, MaxEncodedLen,
 )]
 pub struct Public(pub [u8; 32]);
 
@@ -70,7 +71,7 @@ impl Clone for Pair {
 		Pair(ed25519_dalek::Keypair {
 			public: self.0.public,
 			secret: ed25519_dalek::SecretKey::from_bytes(self.0.secret.as_bytes())
-				.expect("key is always the correct size; qed")
+				.expect("key is always the correct size; qed"),
 		})
 	}
 }
@@ -177,14 +178,20 @@ impl sp_std::fmt::Debug for Public {
 
 #[cfg(feature = "std")]
 impl Serialize for Public {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer {
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+	where
+		S: Serializer,
+	{
 		serializer.serialize_str(&self.to_ss58check())
 	}
 }
 
 #[cfg(feature = "std")]
 impl<'de> Deserialize<'de> for Public {
-	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
+	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+	where
+		D: Deserializer<'de>,
+	{
 		Public::from_ss58check(&String::deserialize(deserializer)?)
 			.map_err(|e| de::Error::custom(format!("{:?}", e)))
 	}
@@ -210,14 +217,20 @@ impl sp_std::convert::TryFrom<&[u8]> for Signature {
 
 #[cfg(feature = "std")]
 impl Serialize for Signature {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer {
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+	where
+		S: Serializer,
+	{
 		serializer.serialize_str(&hex::encode(self))
 	}
 }
 
 #[cfg(feature = "std")]
 impl<'de> Deserialize<'de> for Signature {
-	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
+	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+	where
+		D: Deserializer<'de>,
+	{
 		let signature_hex = hex::decode(&String::deserialize(deserializer)?)
 			.map_err(|e| de::Error::custom(format!("{:?}", e)))?;
 		Signature::try_from(signature_hex.as_ref())
@@ -438,21 +451,22 @@ impl TraitPair for Pair {
 		let phrase = mnemonic.phrase();
 		let (pair, seed) = Self::from_phrase(phrase, password)
 			.expect("All phrases generated by Mnemonic are valid; qed");
-		(
-			pair,
-			phrase.to_owned(),
-			seed,
-		)
+		(pair, phrase.to_owned(), seed)
 	}
 
 	/// Generate key pair from given recovery phrase and password.
 	#[cfg(feature = "std")]
-	fn from_phrase(phrase: &str, password: Option<&str>) -> Result<(Pair, Seed), SecretStringError> {
+	fn from_phrase(
+		phrase: &str,
+		password: Option<&str>,
+	) -> Result<(Pair, Seed), SecretStringError> {
 		let big_seed = seed_from_entropy(
 			Mnemonic::from_phrase(phrase, Language::English)
-				.map_err(|_| SecretStringError::InvalidPhrase)?.entropy(),
+				.map_err(|_| SecretStringError::InvalidPhrase)?
+				.entropy(),
 			password.unwrap_or(""),
-		).map_err(|_| SecretStringError::InvalidSeed)?;
+		)
+		.map_err(|_| SecretStringError::InvalidSeed)?;
 		let mut seed = Seed::default();
 		seed.copy_from_slice(&big_seed[0..32]);
 		Self::from_seed_slice(&big_seed[0..32]).map(|x| (x, seed))
@@ -477,7 +491,8 @@ impl TraitPair for Pair {
 	}
 
 	/// Derive a child key from a series of given junctions.
-	fn derive<Iter: Iterator<Item=DeriveJunction>>(&self,
+	fn derive<Iter: Iterator<Item = DeriveJunction>>(
+		&self,
 		path: Iter,
 		_seed: Option<Seed>,
 	) -> Result<(Pair, Option<Seed>), DeriveError> {
@@ -522,7 +537,7 @@ impl TraitPair for Pair {
 
 		let sig = match ed25519_dalek::Signature::try_from(sig) {
 			Ok(s) => s,
-			Err(_) => return false
+			Err(_) => return false,
 		};
 
 		public_key.verify(message.as_ref(), &sig).is_ok()
@@ -572,15 +587,17 @@ impl CryptoType for Pair {
 #[cfg(test)]
 mod test {
 	use super::*;
-	use hex_literal::hex;
 	use crate::crypto::DEV_PHRASE;
+	use hex_literal::hex;
 	use serde_json;
 
 	#[test]
 	fn default_phrase_should_be_used() {
 		assert_eq!(
 			Pair::from_string("//Alice///password", None).unwrap().public(),
-			Pair::from_string(&format!("{}//Alice", DEV_PHRASE), Some("password")).unwrap().public(),
+			Pair::from_string(&format!("{}//Alice", DEV_PHRASE), Some("password"))
+				.unwrap()
+				.public(),
 		);
 	}
 
@@ -599,13 +616,16 @@ mod test {
 
 	#[test]
 	fn test_vector_should_work() {
-		let pair = Pair::from_seed(
-			&hex!("9d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f60")
-		);
-		let public = pair.public();
-		assert_eq!(public, Public::from_raw(
-			hex!("d75a980182b10ab7d54bfed3c964073a0ee172f3daa62325af021a68f707511a")
+		let pair = Pair::from_seed(&hex!(
+			"9d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f60"
 		));
+		let public = pair.public();
+		assert_eq!(
+			public,
+			Public::from_raw(hex!(
+				"d75a980182b10ab7d54bfed3c964073a0ee172f3daa62325af021a68f707511a"
+			))
+		);
 		let message = b"";
 		let signature = hex!("e5564300c360ac729086e2cc806e828a84877f1eb8e5d974d873e065224901555fb8821590a33bacc61e39701cf9b46bd25bf5f0595bbe24655141438e7a100b");
 		let signature = Signature::from_raw(signature);
@@ -617,12 +637,16 @@ mod test {
 	fn test_vector_by_string_should_work() {
 		let pair = Pair::from_string(
 			"0x9d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f60",
-			None
-		).unwrap();
+			None,
+		)
+		.unwrap();
 		let public = pair.public();
-		assert_eq!(public, Public::from_raw(
-			hex!("d75a980182b10ab7d54bfed3c964073a0ee172f3daa62325af021a68f707511a")
-		));
+		assert_eq!(
+			public,
+			Public::from_raw(hex!(
+				"d75a980182b10ab7d54bfed3c964073a0ee172f3daa62325af021a68f707511a"
+			))
+		);
 		let message = b"";
 		let signature = hex!("e5564300c360ac729086e2cc806e828a84877f1eb8e5d974d873e065224901555fb8821590a33bacc61e39701cf9b46bd25bf5f0595bbe24655141438e7a100b");
 		let signature = Signature::from_raw(signature);
@@ -644,9 +668,12 @@ mod test {
 	fn seeded_pair_should_work() {
 		let pair = Pair::from_seed(b"12345678901234567890123456789012");
 		let public = pair.public();
-		assert_eq!(public, Public::from_raw(
-			hex!("2f8c6129d816cf51c374bc7f08c3e63ed156cf78aefb4a6550d97b87997977ee")
-		));
+		assert_eq!(
+			public,
+			Public::from_raw(hex!(
+				"2f8c6129d816cf51c374bc7f08c3e63ed156cf78aefb4a6550d97b87997977ee"
+			))
+		);
 		let message = hex!("2f8c6129d816cf51c374bc7f08c3e63ed156cf78aefb4a6550d97b87997977ee00000000000000000200d75a980182b10ab7d54bfed3c964073a0ee172f3daa62325af021a68f707511a4500000000000000");
 		let signature = pair.sign(&message[..]);
 		println!("Correct signature: {:?}", signature);
diff --git a/primitives/core/src/hash.rs b/primitives/core/src/hash.rs
index 6ef1827a1ba0..55a9664c9dad 100644
--- a/primitives/core/src/hash.rs
+++ b/primitives/core/src/hash.rs
@@ -55,13 +55,34 @@ mod tests {
 	#[test]
 	fn test_h256() {
 		let tests = vec![
-			(Default::default(), "0x0000000000000000000000000000000000000000000000000000000000000000"),
-			(H256::from_low_u64_be(2), "0x0000000000000000000000000000000000000000000000000000000000000002"),
-			(H256::from_low_u64_be(15), "0x000000000000000000000000000000000000000000000000000000000000000f"),
-			(H256::from_low_u64_be(16), "0x0000000000000000000000000000000000000000000000000000000000000010"),
-			(H256::from_low_u64_be(1_000), "0x00000000000000000000000000000000000000000000000000000000000003e8"),
-			(H256::from_low_u64_be(100_000), "0x00000000000000000000000000000000000000000000000000000000000186a0"),
-			(H256::from_low_u64_be(u64::MAX), "0x000000000000000000000000000000000000000000000000ffffffffffffffff"),
+			(
+				Default::default(),
+				"0x0000000000000000000000000000000000000000000000000000000000000000",
+			),
+			(
+				H256::from_low_u64_be(2),
+				"0x0000000000000000000000000000000000000000000000000000000000000002",
+			),
+			(
+				H256::from_low_u64_be(15),
+				"0x000000000000000000000000000000000000000000000000000000000000000f",
+			),
+			(
+				H256::from_low_u64_be(16),
+				"0x0000000000000000000000000000000000000000000000000000000000000010",
+			),
+			(
+				H256::from_low_u64_be(1_000),
+				"0x00000000000000000000000000000000000000000000000000000000000003e8",
+			),
+			(
+				H256::from_low_u64_be(100_000),
+				"0x00000000000000000000000000000000000000000000000000000000000186a0",
+			),
+			(
+				H256::from_low_u64_be(u64::MAX),
+				"0x000000000000000000000000000000000000000000000000ffffffffffffffff",
+			),
 		];
 
 		for (number, expected) in tests {
@@ -72,9 +93,21 @@ mod tests {
 
 	#[test]
 	fn test_invalid() {
-		assert!(ser::from_str::<H256>("\"0x000000000000000000000000000000000000000000000000000000000000000\"").unwrap_err().is_data());
-		assert!(ser::from_str::<H256>("\"0x000000000000000000000000000000000000000000000000000000000000000g\"").unwrap_err().is_data());
-		assert!(ser::from_str::<H256>("\"0x00000000000000000000000000000000000000000000000000000000000000000\"").unwrap_err().is_data());
+		assert!(ser::from_str::<H256>(
+			"\"0x000000000000000000000000000000000000000000000000000000000000000\""
+		)
+		.unwrap_err()
+		.is_data());
+		assert!(ser::from_str::<H256>(
+			"\"0x000000000000000000000000000000000000000000000000000000000000000g\""
+		)
+		.unwrap_err()
+		.is_data());
+		assert!(ser::from_str::<H256>(
+			"\"0x00000000000000000000000000000000000000000000000000000000000000000\""
+		)
+		.unwrap_err()
+		.is_data());
 		assert!(ser::from_str::<H256>("\"\"").unwrap_err().is_data());
 		assert!(ser::from_str::<H256>("\"0\"").unwrap_err().is_data());
 		assert!(ser::from_str::<H256>("\"10\"").unwrap_err().is_data());
diff --git a/primitives/core/src/hasher.rs b/primitives/core/src/hasher.rs
index 13a168c70f93..01680de08376 100644
--- a/primitives/core/src/hasher.rs
+++ b/primitives/core/src/hasher.rs
@@ -18,9 +18,9 @@
 //! Substrate Blake2b Hasher implementation
 
 pub mod blake2 {
-	use hash_db::Hasher;
-	use hash256_std_hasher::Hash256StdHasher;
 	use crate::hash::H256;
+	use hash256_std_hasher::Hash256StdHasher;
+	use hash_db::Hasher;
 
 	/// Concrete implementation of Hasher using Blake2b 256-bit hashes
 	#[derive(Debug)]
@@ -38,9 +38,9 @@ pub mod blake2 {
 }
 
 pub mod keccak {
-	use hash_db::Hasher;
-	use hash256_std_hasher::Hash256StdHasher;
 	use crate::hash::H256;
+	use hash256_std_hasher::Hash256StdHasher;
+	use hash_db::Hasher;
 
 	/// Concrete implementation of Hasher using Keccak 256-bit hashes
 	#[derive(Debug)]
diff --git a/primitives/core/src/hexdisplay.rs b/primitives/core/src/hexdisplay.rs
index e590eec0e5ae..4d91db156792 100644
--- a/primitives/core/src/hexdisplay.rs
+++ b/primitives/core/src/hexdisplay.rs
@@ -22,7 +22,9 @@ pub struct HexDisplay<'a>(&'a [u8]);
 
 impl<'a> HexDisplay<'a> {
 	/// Create new instance that will display `d` as a hex string when displayed.
-	pub fn from<R: AsBytesRef>(d: &'a R) -> Self { HexDisplay(d.as_bytes_ref()) }
+	pub fn from<R: AsBytesRef>(d: &'a R) -> Self {
+		HexDisplay(d.as_bytes_ref())
+	}
 }
 
 impl<'a> sp_std::fmt::Display for HexDisplay<'a> {
@@ -60,15 +62,21 @@ pub trait AsBytesRef {
 }
 
 impl AsBytesRef for &[u8] {
-	fn as_bytes_ref(&self) -> &[u8] { self }
+	fn as_bytes_ref(&self) -> &[u8] {
+		self
+	}
 }
 
 impl AsBytesRef for [u8] {
-	fn as_bytes_ref(&self) -> &[u8] { &self }
+	fn as_bytes_ref(&self) -> &[u8] {
+		&self
+	}
 }
 
 impl AsBytesRef for sp_std::vec::Vec<u8> {
-	fn as_bytes_ref(&self) -> &[u8] { &self }
+	fn as_bytes_ref(&self) -> &[u8] {
+		&self
+	}
 }
 
 impl AsBytesRef for sp_storage::StorageKey {
@@ -85,9 +93,11 @@ macro_rules! impl_non_endians {
 	)* }
 }
 
-impl_non_endians!([u8; 1], [u8; 2], [u8; 3], [u8; 4], [u8; 5], [u8; 6], [u8; 7], [u8; 8],
-	[u8; 10], [u8; 12], [u8; 14], [u8; 16], [u8; 20], [u8; 24], [u8; 28], [u8; 32], [u8; 40],
-	[u8; 48], [u8; 56], [u8; 64], [u8; 65], [u8; 80], [u8; 96], [u8; 112], [u8; 128]);
+impl_non_endians!(
+	[u8; 1], [u8; 2], [u8; 3], [u8; 4], [u8; 5], [u8; 6], [u8; 7], [u8; 8], [u8; 10], [u8; 12],
+	[u8; 14], [u8; 16], [u8; 20], [u8; 24], [u8; 28], [u8; 32], [u8; 40], [u8; 48], [u8; 56],
+	[u8; 64], [u8; 65], [u8; 80], [u8; 96], [u8; 112], [u8; 128]
+);
 
 /// Format into ASCII + # + hex, suitable for storage key preimages.
 #[cfg(feature = "std")]
@@ -103,7 +113,7 @@ pub fn ascii_format(asciish: &[u8]) -> String {
 					latch = true;
 				}
 				r.push_str(&format!("{:02x}", *c));
-			}
+			},
 		}
 	}
 	r
diff --git a/primitives/core/src/lib.rs b/primitives/core/src/lib.rs
index 1ca97e7c3ffc..8bc189b5c371 100644
--- a/primitives/core/src/lib.rs
+++ b/primitives/core/src/lib.rs
@@ -18,7 +18,6 @@
 //! Shareable Substrate types.
 
 #![warn(missing_docs)]
-
 #![cfg_attr(not(feature = "std"), no_std)]
 
 /// Initialize a key-value collection from array.
@@ -32,17 +31,16 @@ macro_rules! map {
 	);
 }
 
-use sp_runtime_interface::pass_by::{PassByEnum, PassByInner};
-use sp_std::prelude::*;
-use sp_std::ops::Deref;
+#[doc(hidden)]
+pub use codec::{Decode, Encode};
 #[cfg(feature = "std")]
-use std::borrow::Cow;
+pub use serde;
 #[cfg(feature = "std")]
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
+use sp_runtime_interface::pass_by::{PassByEnum, PassByInner};
+use sp_std::{ops::Deref, prelude::*};
 #[cfg(feature = "std")]
-pub use serde;
-#[doc(hidden)]
-pub use codec::{Encode, Decode};
+use std::borrow::Cow;
 
 pub use sp_debug_derive::RuntimeDebug;
 
@@ -53,37 +51,39 @@ pub use impl_serde::serialize as bytes;
 pub mod hashing;
 
 #[cfg(feature = "full_crypto")]
-pub use hashing::{blake2_128, blake2_256, twox_64, twox_128, twox_256, keccak_256};
-pub mod hexdisplay;
+pub use hashing::{blake2_128, blake2_256, keccak_256, twox_128, twox_256, twox_64};
 pub mod crypto;
+pub mod hexdisplay;
 
 pub mod u32_trait;
 
-pub mod ed25519;
-pub mod sr25519;
+mod changes_trie;
 pub mod ecdsa;
+pub mod ed25519;
 pub mod hash;
 #[cfg(feature = "std")]
 mod hasher;
 pub mod offchain;
 pub mod sandbox;
-pub mod uint;
-mod changes_trie;
+pub mod sr25519;
+pub mod testing;
 #[cfg(feature = "std")]
 pub mod traits;
-pub mod testing;
+pub mod uint;
 
-pub use self::hash::{H160, H256, H512, convert_hash};
-pub use self::uint::{U256, U512};
+pub use self::{
+	hash::{convert_hash, H160, H256, H512},
+	uint::{U256, U512},
+};
 pub use changes_trie::{ChangesTrieConfiguration, ChangesTrieConfigurationRange};
 #[cfg(feature = "full_crypto")]
 pub use crypto::{DeriveJunction, Pair, Public};
 
-pub use hash_db::Hasher;
 #[cfg(feature = "std")]
 pub use self::hasher::blake2::Blake2Hasher;
 #[cfg(feature = "std")]
 pub use self::hasher::keccak::KeccakHasher;
+pub use hash_db::Hasher;
 
 pub use sp_storage as storage;
 
@@ -117,14 +117,14 @@ impl ExecutionContext {
 		use ExecutionContext::*;
 
 		match self {
-			Importing | Syncing | BlockConstruction =>
-				offchain::Capabilities::none(),
+			Importing | Syncing | BlockConstruction => offchain::Capabilities::none(),
 			// Enable keystore, transaction pool and Offchain DB reads by default for offchain calls.
 			OffchainCall(None) => [
 				offchain::Capability::Keystore,
 				offchain::Capability::OffchainDbRead,
 				offchain::Capability::TransactionPool,
-			][..].into(),
+			][..]
+				.into(),
 			OffchainCall(Some((_, capabilities))) => *capabilities,
 		}
 	}
@@ -133,19 +133,25 @@ impl ExecutionContext {
 /// Hex-serialized shim for `Vec<u8>`.
 #[derive(PartialEq, Eq, Clone, RuntimeDebug)]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize, Hash, PartialOrd, Ord))]
-pub struct Bytes(#[cfg_attr(feature = "std", serde(with="bytes"))] pub Vec<u8>);
+pub struct Bytes(#[cfg_attr(feature = "std", serde(with = "bytes"))] pub Vec<u8>);
 
 impl From<Vec<u8>> for Bytes {
-	fn from(s: Vec<u8>) -> Self { Bytes(s) }
+	fn from(s: Vec<u8>) -> Self {
+		Bytes(s)
+	}
 }
 
 impl From<OpaqueMetadata> for Bytes {
-	fn from(s: OpaqueMetadata) -> Self { Bytes(s.0) }
+	fn from(s: OpaqueMetadata) -> Self {
+		Bytes(s.0)
+	}
 }
 
 impl Deref for Bytes {
 	type Target = [u8];
-	fn deref(&self) -> &[u8] { &self.0[..] }
+	fn deref(&self) -> &[u8] {
+		&self.0[..]
+	}
 }
 
 impl codec::WrapperTypeEncode for Bytes {}
@@ -183,7 +189,9 @@ impl sp_std::ops::Deref for OpaqueMetadata {
 }
 
 /// Simple blob to hold a `PeerId` without committing to its format.
-#[derive(Default, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, RuntimeDebug, PassByInner)]
+#[derive(
+	Default, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, RuntimeDebug, PassByInner,
+)]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 pub struct OpaquePeerId(pub Vec<u8>);
 
@@ -200,7 +208,7 @@ pub enum NativeOrEncoded<R> {
 	/// The native representation.
 	Native(R),
 	/// The encoded representation.
-	Encoded(Vec<u8>)
+	Encoded(Vec<u8>),
 }
 
 #[cfg(feature = "std")]
diff --git a/primitives/core/src/offchain/mod.rs b/primitives/core/src/offchain/mod.rs
index d3d2356b6ee8..d4e27fc64348 100644
--- a/primitives/core/src/offchain/mod.rs
+++ b/primitives/core/src/offchain/mod.rs
@@ -17,10 +17,13 @@
 
 //! Offchain workers types
 
-use codec::{Encode, Decode};
-use sp_std::{prelude::{Vec, Box}, convert::TryFrom};
 use crate::{OpaquePeerId, RuntimeDebug};
-use sp_runtime_interface::pass_by::{PassByCodec, PassByInner, PassByEnum};
+use codec::{Decode, Encode};
+use sp_runtime_interface::pass_by::{PassByCodec, PassByEnum, PassByInner};
+use sp_std::{
+	convert::TryFrom,
+	prelude::{Box, Vec},
+};
 
 pub use crate::crypto::KeyTypeId;
 
@@ -30,7 +33,7 @@ pub mod storage;
 pub mod testing;
 
 /// Persistent storage prefix used by the Offchain Worker API when creating a DB key.
-pub const STORAGE_PREFIX : &[u8] = b"storage";
+pub const STORAGE_PREFIX: &[u8] = b"storage";
 
 /// Offchain DB persistent (non-fork-aware) storage.
 pub trait OffchainStorage: Clone + Send + Sync {
@@ -93,7 +96,9 @@ impl From<StorageKind> for u32 {
 }
 
 /// Opaque type for offchain http requests.
-#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, RuntimeDebug, Encode, Decode, PassByInner)]
+#[derive(
+	Clone, Copy, PartialEq, Eq, PartialOrd, Ord, RuntimeDebug, Encode, Decode, PassByInner,
+)]
 #[cfg_attr(feature = "std", derive(Hash))]
 pub struct HttpRequestId(pub u16);
 
@@ -123,7 +128,7 @@ impl TryFrom<u32> for HttpError {
 			e if e == HttpError::DeadlineReached as u8 as u32 => Ok(HttpError::DeadlineReached),
 			e if e == HttpError::IoError as u8 as u32 => Ok(HttpError::IoError),
 			e if e == HttpError::Invalid as u8 as u32 => Ok(HttpError::Invalid),
-			_ => Err(())
+			_ => Err(()),
 		}
 	}
 }
@@ -202,11 +207,15 @@ impl OpaqueMultiaddr {
 }
 
 /// Opaque timestamp type
-#[derive(Clone, Copy, PartialEq, Eq, Ord, PartialOrd, Default, RuntimeDebug, PassByInner, Encode, Decode)]
+#[derive(
+	Clone, Copy, PartialEq, Eq, Ord, PartialOrd, Default, RuntimeDebug, PassByInner, Encode, Decode,
+)]
 pub struct Timestamp(u64);
 
 /// Duration type
-#[derive(Clone, Copy, PartialEq, Eq, Ord, PartialOrd, Default, RuntimeDebug, PassByInner, Encode, Decode)]
+#[derive(
+	Clone, Copy, PartialEq, Eq, Ord, PartialOrd, Default, RuntimeDebug, PassByInner, Encode, Decode,
+)]
 pub struct Duration(u64);
 
 impl Duration {
@@ -290,11 +299,7 @@ impl Capabilities {
 	/// Those calls should be allowed to sign and submit transactions
 	/// and access offchain workers database (but read only!).
 	pub fn rich_offchain_call() -> Self {
-		[
-			Capability::TransactionPool,
-			Capability::Keystore,
-			Capability::OffchainDbRead,
-		][..].into()
+		[Capability::TransactionPool, Capability::Keystore, Capability::OffchainDbRead][..].into()
 	}
 
 	/// Check if particular capability is enabled.
@@ -345,12 +350,11 @@ pub trait Externalities: Send {
 	/// Returns an error if:
 	/// - No new request identifier could be allocated.
 	/// - The method or URI contain invalid characters.
-	///
 	fn http_request_start(
 		&mut self,
 		method: &str,
 		uri: &str,
-		meta: &[u8]
+		meta: &[u8],
 	) -> Result<HttpRequestId, ()>;
 
 	/// Append header to the request.
@@ -365,12 +369,11 @@ pub trait Externalities: Send {
 	///
 	/// An error doesn't poison the request, and you can continue as if the call had never been
 	/// made.
-	///
 	fn http_request_add_header(
 		&mut self,
 		request_id: HttpRequestId,
 		name: &str,
-		value: &str
+		value: &str,
 	) -> Result<(), ()>;
 
 	/// Write a chunk of request body.
@@ -387,12 +390,11 @@ pub trait Externalities: Send {
 	/// - The deadline is reached.
 	/// - An I/O error has happened, for example the remote has closed our
 	///   request. The request is then considered invalid.
-	///
 	fn http_request_write_body(
 		&mut self,
 		request_id: HttpRequestId,
 		chunk: &[u8],
-		deadline: Option<Timestamp>
+		deadline: Option<Timestamp>,
 	) -> Result<(), HttpError>;
 
 	/// Block and wait for the responses for given requests.
@@ -408,7 +410,7 @@ pub trait Externalities: Send {
 	fn http_response_wait(
 		&mut self,
 		ids: &[HttpRequestId],
-		deadline: Option<Timestamp>
+		deadline: Option<Timestamp>,
 	) -> Vec<HttpRequestStatus>;
 
 	/// Read all response headers.
@@ -420,10 +422,7 @@ pub trait Externalities: Send {
 	///
 	/// Returns an empty list if the identifier is unknown/invalid, hasn't
 	/// received a response, or has finished.
-	fn http_response_headers(
-		&mut self,
-		request_id: HttpRequestId
-	) -> Vec<(Vec<u8>, Vec<u8>)>;
+	fn http_response_headers(&mut self, request_id: HttpRequestId) -> Vec<(Vec<u8>, Vec<u8>)>;
 
 	/// Read a chunk of body response to given buffer.
 	///
@@ -443,12 +442,11 @@ pub trait Externalities: Send {
 	/// - The deadline is reached.
 	/// - An I/O error has happened, for example the remote has closed our
 	///   request. The request is then considered invalid.
-	///
 	fn http_response_read_body(
 		&mut self,
 		request_id: HttpRequestId,
 		buffer: &mut [u8],
-		deadline: Option<Timestamp>
+		deadline: Option<Timestamp>,
 	) -> Result<usize, HttpError>;
 
 	/// Set the authorized nodes from runtime.
@@ -466,11 +464,11 @@ pub trait Externalities: Send {
 
 impl<T: Externalities + ?Sized> Externalities for Box<T> {
 	fn is_validator(&self) -> bool {
-		(& **self).is_validator()
+		(&**self).is_validator()
 	}
 
 	fn network_state(&self) -> Result<OpaqueNetworkState, ()> {
-		(& **self).network_state()
+		(&**self).network_state()
 	}
 
 	fn timestamp(&mut self) -> Timestamp {
@@ -485,11 +483,21 @@ impl<T: Externalities + ?Sized> Externalities for Box<T> {
 		(&mut **self).random_seed()
 	}
 
-	fn http_request_start(&mut self, method: &str, uri: &str, meta: &[u8]) -> Result<HttpRequestId, ()> {
+	fn http_request_start(
+		&mut self,
+		method: &str,
+		uri: &str,
+		meta: &[u8],
+	) -> Result<HttpRequestId, ()> {
 		(&mut **self).http_request_start(method, uri, meta)
 	}
 
-	fn http_request_add_header(&mut self, request_id: HttpRequestId, name: &str, value: &str) -> Result<(), ()> {
+	fn http_request_add_header(
+		&mut self,
+		request_id: HttpRequestId,
+		name: &str,
+		value: &str,
+	) -> Result<(), ()> {
 		(&mut **self).http_request_add_header(request_id, name, value)
 	}
 
@@ -497,12 +505,16 @@ impl<T: Externalities + ?Sized> Externalities for Box<T> {
 		&mut self,
 		request_id: HttpRequestId,
 		chunk: &[u8],
-		deadline: Option<Timestamp>
+		deadline: Option<Timestamp>,
 	) -> Result<(), HttpError> {
 		(&mut **self).http_request_write_body(request_id, chunk, deadline)
 	}
 
-	fn http_response_wait(&mut self, ids: &[HttpRequestId], deadline: Option<Timestamp>) -> Vec<HttpRequestStatus> {
+	fn http_response_wait(
+		&mut self,
+		ids: &[HttpRequestId],
+		deadline: Option<Timestamp>,
+	) -> Vec<HttpRequestStatus> {
 		(&mut **self).http_response_wait(ids, deadline)
 	}
 
@@ -514,7 +526,7 @@ impl<T: Externalities + ?Sized> Externalities for Box<T> {
 		&mut self,
 		request_id: HttpRequestId,
 		buffer: &mut [u8],
-		deadline: Option<Timestamp>
+		deadline: Option<Timestamp>,
 	) -> Result<usize, HttpError> {
 		(&mut **self).http_response_read_body(request_id, buffer, deadline)
 	}
@@ -533,10 +545,7 @@ pub struct LimitedExternalities<T> {
 impl<T> LimitedExternalities<T> {
 	/// Create new externalities limited to given `capabilities`.
 	pub fn new(capabilities: Capabilities, externalities: T) -> Self {
-		Self {
-			capabilities,
-			externalities,
-		}
+		Self { capabilities, externalities }
 	}
 
 	/// Check if given capability is allowed.
@@ -575,12 +584,22 @@ impl<T: Externalities> Externalities for LimitedExternalities<T> {
 		self.externalities.random_seed()
 	}
 
-	fn http_request_start(&mut self, method: &str, uri: &str, meta: &[u8]) -> Result<HttpRequestId, ()> {
+	fn http_request_start(
+		&mut self,
+		method: &str,
+		uri: &str,
+		meta: &[u8],
+	) -> Result<HttpRequestId, ()> {
 		self.check(Capability::Http, "http_request_start");
 		self.externalities.http_request_start(method, uri, meta)
 	}
 
-	fn http_request_add_header(&mut self, request_id: HttpRequestId, name: &str, value: &str) -> Result<(), ()> {
+	fn http_request_add_header(
+		&mut self,
+		request_id: HttpRequestId,
+		name: &str,
+		value: &str,
+	) -> Result<(), ()> {
 		self.check(Capability::Http, "http_request_add_header");
 		self.externalities.http_request_add_header(request_id, name, value)
 	}
@@ -589,13 +608,17 @@ impl<T: Externalities> Externalities for LimitedExternalities<T> {
 		&mut self,
 		request_id: HttpRequestId,
 		chunk: &[u8],
-		deadline: Option<Timestamp>
+		deadline: Option<Timestamp>,
 	) -> Result<(), HttpError> {
 		self.check(Capability::Http, "http_request_write_body");
 		self.externalities.http_request_write_body(request_id, chunk, deadline)
 	}
 
-	fn http_response_wait(&mut self, ids: &[HttpRequestId], deadline: Option<Timestamp>) -> Vec<HttpRequestStatus> {
+	fn http_response_wait(
+		&mut self,
+		ids: &[HttpRequestId],
+		deadline: Option<Timestamp>,
+	) -> Vec<HttpRequestStatus> {
 		self.check(Capability::Http, "http_response_wait");
 		self.externalities.http_response_wait(ids, deadline)
 	}
@@ -609,7 +632,7 @@ impl<T: Externalities> Externalities for LimitedExternalities<T> {
 		&mut self,
 		request_id: HttpRequestId,
 		buffer: &mut [u8],
-		deadline: Option<Timestamp>
+		deadline: Option<Timestamp>,
 	) -> Result<usize, HttpError> {
 		self.check(Capability::Http, "http_response_read_body");
 		self.externalities.http_response_read_body(request_id, buffer, deadline)
@@ -717,7 +740,8 @@ impl<T: DbExternalities> DbExternalities for LimitedExternalities<T> {
 		new_value: &[u8],
 	) -> bool {
 		self.check(Capability::OffchainDbWrite, "local_storage_compare_and_set");
-		self.externalities.local_storage_compare_and_set(kind, key, old_value, new_value)
+		self.externalities
+			.local_storage_compare_and_set(kind, key, old_value, new_value)
 	}
 
 	fn local_storage_get(&mut self, kind: StorageKind, key: &[u8]) -> Option<Vec<u8>> {
diff --git a/primitives/core/src/offchain/storage.rs b/primitives/core/src/offchain/storage.rs
index 4463c58ede5d..ff72006cffd6 100644
--- a/primitives/core/src/offchain/storage.rs
+++ b/primitives/core/src/offchain/storage.rs
@@ -17,9 +17,11 @@
 
 //! In-memory implementation of offchain workers database.
 
-use std::collections::hash_map::{HashMap, Entry};
 use crate::offchain::OffchainStorage;
-use std::iter::Iterator;
+use std::{
+	collections::hash_map::{Entry, HashMap},
+	iter::Iterator,
+};
 
 /// In-memory storage for offchain workers.
 #[derive(Debug, Clone, Default)]
@@ -29,12 +31,12 @@ pub struct InMemOffchainStorage {
 
 impl InMemOffchainStorage {
 	/// Consume the offchain storage and iterate over all key value pairs.
-	pub fn into_iter(self) -> impl Iterator<Item=(Vec<u8>,Vec<u8>)> {
+	pub fn into_iter(self) -> impl Iterator<Item = (Vec<u8>, Vec<u8>)> {
 		self.storage.into_iter()
 	}
 
 	/// Iterate over all key value pairs by reference.
-	pub fn iter(&self) -> impl Iterator<Item=(&Vec<u8>,&Vec<u8>)> {
+	pub fn iter(&self) -> impl Iterator<Item = (&Vec<u8>, &Vec<u8>)> {
 		self.storage.iter()
 	}
 
@@ -71,10 +73,13 @@ impl OffchainStorage for InMemOffchainStorage {
 		let key = prefix.iter().chain(key).cloned().collect();
 
 		match self.storage.entry(key) {
-			Entry::Vacant(entry) => if old_value.is_none() {
-				entry.insert(new_value.to_vec());
-				true
-			} else { false },
+			Entry::Vacant(entry) =>
+				if old_value.is_none() {
+					entry.insert(new_value.to_vec());
+					true
+				} else {
+					false
+				},
 			Entry::Occupied(ref mut entry) if Some(entry.get().as_slice()) == old_value => {
 				entry.insert(new_value.to_vec());
 				true
diff --git a/primitives/core/src/offchain/testing.rs b/primitives/core/src/offchain/testing.rs
index 76c81d4b9bc6..ce88ece07da1 100644
--- a/primitives/core/src/offchain/testing.rs
+++ b/primitives/core/src/offchain/testing.rs
@@ -20,24 +20,18 @@
 //! Namely all ExecutionExtensions that allow mocking
 //! the extra APIs.
 
+use crate::{
+	offchain::{
+		self, storage::InMemOffchainStorage, HttpError, HttpRequestId as RequestId,
+		HttpRequestStatus as RequestStatus, OffchainOverlayedChange, OffchainStorage,
+		OpaqueNetworkState, StorageKind, Timestamp, TransactionPool,
+	},
+	OpaquePeerId,
+};
 use std::{
 	collections::{BTreeMap, VecDeque},
 	sync::Arc,
 };
-use crate::OpaquePeerId;
-use crate::offchain::{
-	self,
-	OffchainOverlayedChange,
-	storage::InMemOffchainStorage,
-	HttpError,
-	HttpRequestId as RequestId,
-	HttpRequestStatus as RequestStatus,
-	Timestamp,
-	StorageKind,
-	OpaqueNetworkState,
-	TransactionPool,
-	OffchainStorage,
-};
 
 use parking_lot::RwLock;
 
@@ -75,9 +69,7 @@ impl TestPersistentOffchainDB {
 
 	/// Create a new and empty offchain storage db for persistent items
 	pub fn new() -> Self {
-		Self {
-			persistent: Arc::new(RwLock::new(InMemOffchainStorage::default()))
-		}
+		Self { persistent: Arc::new(RwLock::new(InMemOffchainStorage::default())) }
 	}
 
 	/// Apply a set of off-chain changes directly to the test backend
@@ -88,7 +80,8 @@ impl TestPersistentOffchainDB {
 		let mut me = self.persistent.write();
 		for ((_prefix, key), value_operation) in changes {
 			match value_operation {
-				OffchainOverlayedChange::SetValue(val) => me.set(Self::PREFIX, key.as_slice(), val.as_slice()),
+				OffchainOverlayedChange::SetValue(val) =>
+					me.set(Self::PREFIX, key.as_slice(), val.as_slice()),
 				OffchainOverlayedChange::Remove => me.remove(Self::PREFIX, key.as_slice()),
 			}
 		}
@@ -124,7 +117,6 @@ impl OffchainStorage for TestPersistentOffchainDB {
 	}
 }
 
-
 /// Internal state of the externalities.
 ///
 /// This can be used in tests to respond or assert stuff about interactions.
@@ -151,20 +143,17 @@ impl OffchainState {
 		id: u16,
 		expected: PendingRequest,
 		response: impl Into<Vec<u8>>,
-		response_headers: impl IntoIterator<Item=(String, String)>,
+		response_headers: impl IntoIterator<Item = (String, String)>,
 	) {
 		match self.requests.get_mut(&RequestId(id)) {
 			None => {
 				panic!("Missing pending request: {:?}.\n\nAll: {:?}", id, self.requests);
-			}
+			},
 			Some(req) => {
-				assert_eq!(
-					*req,
-					expected,
-				);
+				assert_eq!(*req, expected,);
 				req.response = Some(response.into());
 				req.response_headers = response_headers.into_iter().collect();
-			}
+			},
 		}
 	}
 
@@ -213,7 +202,9 @@ impl TestOffchainExt {
 	}
 
 	/// Create new `TestOffchainExt` and a reference to the internal state.
-	pub fn with_offchain_db(offchain_db: TestPersistentOffchainDB) -> (Self, Arc<RwLock<OffchainState>>) {
+	pub fn with_offchain_db(
+		offchain_db: TestPersistentOffchainDB,
+	) -> (Self, Arc<RwLock<OffchainState>>) {
 		let (ext, state) = Self::new();
 		ext.0.write().persistent_storage = offchain_db;
 		(ext, state)
@@ -226,10 +217,7 @@ impl offchain::Externalities for TestOffchainExt {
 	}
 
 	fn network_state(&self) -> Result<OpaqueNetworkState, ()> {
-		Ok(OpaqueNetworkState {
-			peer_id: Default::default(),
-			external_addresses: vec![],
-		})
+		Ok(OpaqueNetworkState { peer_id: Default::default(), external_addresses: vec![] })
 	}
 
 	fn timestamp(&mut self) -> Timestamp {
@@ -244,15 +232,23 @@ impl offchain::Externalities for TestOffchainExt {
 		self.0.read().seed
 	}
 
-	fn http_request_start(&mut self, method: &str, uri: &str, meta: &[u8]) -> Result<RequestId, ()> {
+	fn http_request_start(
+		&mut self,
+		method: &str,
+		uri: &str,
+		meta: &[u8],
+	) -> Result<RequestId, ()> {
 		let mut state = self.0.write();
 		let id = RequestId(state.requests.len() as u16);
-		state.requests.insert(id, PendingRequest {
-			method: method.into(),
-			uri: uri.into(),
-			meta: meta.into(),
-			..Default::default()
-		});
+		state.requests.insert(
+			id,
+			PendingRequest {
+				method: method.into(),
+				uri: uri.into(),
+				meta: meta.into(),
+				..Default::default()
+			},
+		);
 		Ok(id)
 	}
 
@@ -275,7 +271,7 @@ impl offchain::Externalities for TestOffchainExt {
 		&mut self,
 		request_id: RequestId,
 		chunk: &[u8],
-		_deadline: Option<Timestamp>
+		_deadline: Option<Timestamp>,
 	) -> Result<(), HttpError> {
 		let mut state = self.0.write();
 
@@ -302,12 +298,14 @@ impl offchain::Externalities for TestOffchainExt {
 	) -> Vec<RequestStatus> {
 		let state = self.0.read();
 
-		ids.iter().map(|id| match state.requests.get(id) {
-			Some(req) if req.response.is_none() =>
-				panic!("No `response` provided for request with id: {:?}", id),
-			None => RequestStatus::Invalid,
-			_ => RequestStatus::Finished(200),
-		}).collect()
+		ids.iter()
+			.map(|id| match state.requests.get(id) {
+				Some(req) if req.response.is_none() =>
+					panic!("No `response` provided for request with id: {:?}", id),
+				None => RequestStatus::Invalid,
+				_ => RequestStatus::Finished(200),
+			})
+			.collect()
 	}
 
 	fn http_response_headers(&mut self, request_id: RequestId) -> Vec<(Vec<u8>, Vec<u8>)> {
@@ -327,11 +325,12 @@ impl offchain::Externalities for TestOffchainExt {
 		&mut self,
 		request_id: RequestId,
 		buffer: &mut [u8],
-		_deadline: Option<Timestamp>
+		_deadline: Option<Timestamp>,
 	) -> Result<usize, HttpError> {
 		let mut state = self.0.write();
 		if let Some(req) = state.requests.get_mut(&request_id) {
-			let response = req.response
+			let response = req
+				.response
 				.as_mut()
 				.unwrap_or_else(|| panic!("No response provided for request: {:?}", request_id));
 
@@ -377,14 +376,14 @@ impl offchain::DbExternalities for TestOffchainExt {
 		kind: StorageKind,
 		key: &[u8],
 		old_value: Option<&[u8]>,
-		new_value: &[u8]
+		new_value: &[u8],
 	) -> bool {
 		let mut state = self.0.write();
 		match kind {
-			StorageKind::LOCAL => state.local_storage
-				.compare_and_set(b"", key, old_value, new_value),
-			StorageKind::PERSISTENT => state.persistent_storage
-				.compare_and_set(b"", key, old_value, new_value),
+			StorageKind::LOCAL =>
+				state.local_storage.compare_and_set(b"", key, old_value, new_value),
+			StorageKind::PERSISTENT =>
+				state.persistent_storage.compare_and_set(b"", key, old_value, new_value),
 		}
 	}
 
diff --git a/primitives/core/src/sandbox.rs b/primitives/core/src/sandbox.rs
index a15a7af41831..acc3fda5e9b1 100644
--- a/primitives/core/src/sandbox.rs
+++ b/primitives/core/src/sandbox.rs
@@ -17,17 +17,15 @@
 
 //! Definition of a sandbox environment.
 
-use codec::{Encode, Decode};
+use codec::{Decode, Encode};
 use sp_std::vec::Vec;
 
 /// Error error that can be returned from host function.
-#[derive(Encode, Decode)]
-#[derive(crate::RuntimeDebug)]
+#[derive(Encode, Decode, crate::RuntimeDebug)]
 pub struct HostError;
 
 /// Describes an entity to define or import into the environment.
-#[derive(Clone, PartialEq, Eq, Encode, Decode)]
-#[derive(crate::RuntimeDebug)]
+#[derive(Clone, PartialEq, Eq, Encode, Decode, crate::RuntimeDebug)]
 pub enum ExternEntity {
 	/// Function that is specified by an index in a default table of
 	/// a module that creates the sandbox.
@@ -44,8 +42,7 @@ pub enum ExternEntity {
 ///
 /// Each entry has a two-level name and description of an entity
 /// being defined.
-#[derive(Clone, PartialEq, Eq, Encode, Decode)]
-#[derive(crate::RuntimeDebug)]
+#[derive(Clone, PartialEq, Eq, Encode, Decode, crate::RuntimeDebug)]
 pub struct Entry {
 	/// Module name of which corresponding entity being defined.
 	pub module_name: Vec<u8>,
@@ -56,8 +53,7 @@ pub struct Entry {
 }
 
 /// Definition of runtime that could be used by sandboxed code.
-#[derive(Clone, PartialEq, Eq, Encode, Decode)]
-#[derive(crate::RuntimeDebug)]
+#[derive(Clone, PartialEq, Eq, Encode, Decode, crate::RuntimeDebug)]
 pub struct EnvironmentDefinition {
 	/// Vector of all entries in the environment definition.
 	pub entries: Vec<Entry>,
@@ -91,8 +87,8 @@ pub const ERR_EXECUTION: u32 = -3i32 as u32;
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use std::fmt;
 	use codec::Codec;
+	use std::fmt;
 
 	fn roundtrip<S: Codec + PartialEq + fmt::Debug>(s: S) {
 		let encoded = s.encode();
@@ -101,28 +97,22 @@ mod tests {
 
 	#[test]
 	fn env_def_roundtrip() {
-		roundtrip(EnvironmentDefinition {
-			entries: vec![],
-		});
+		roundtrip(EnvironmentDefinition { entries: vec![] });
 
 		roundtrip(EnvironmentDefinition {
-			entries: vec![
-				Entry {
-					module_name: b"kernel"[..].into(),
-					field_name: b"memory"[..].into(),
-					entity: ExternEntity::Memory(1337),
-				},
-			],
+			entries: vec![Entry {
+				module_name: b"kernel"[..].into(),
+				field_name: b"memory"[..].into(),
+				entity: ExternEntity::Memory(1337),
+			}],
 		});
 
 		roundtrip(EnvironmentDefinition {
-			entries: vec![
-				Entry {
-					module_name: b"env"[..].into(),
-					field_name: b"abort"[..].into(),
-					entity: ExternEntity::Function(228),
-				},
-			],
+			entries: vec![Entry {
+				module_name: b"env"[..].into(),
+				field_name: b"abort"[..].into(),
+				entity: ExternEntity::Function(228),
+			}],
 		});
 	}
 }
diff --git a/primitives/core/src/sr25519.rs b/primitives/core/src/sr25519.rs
index dbfb8ba1d26f..7e98bee96d83 100644
--- a/primitives/core/src/sr25519.rs
+++ b/primitives/core/src/sr25519.rs
@@ -21,34 +21,38 @@
 //! Note: `CHAIN_CODE_LENGTH` must be equal to `crate::crypto::JUNCTION_ID_LEN`
 //! for this to work.
 // end::description[]
+#[cfg(feature = "std")]
+use crate::crypto::Ss58Codec;
 #[cfg(feature = "full_crypto")]
-use sp_std::vec::Vec;
+use crate::crypto::{DeriveJunction, Infallible, Pair as TraitPair, SecretStringError};
+#[cfg(feature = "std")]
+use bip39::{Language, Mnemonic, MnemonicType};
 #[cfg(feature = "full_crypto")]
-use schnorrkel::{signing_context, ExpansionMode, Keypair, SecretKey, MiniSecretKey, PublicKey,
-	derive::{Derivation, ChainCode, CHAIN_CODE_LENGTH}
+use schnorrkel::{
+	derive::{ChainCode, Derivation, CHAIN_CODE_LENGTH},
+	signing_context, ExpansionMode, Keypair, MiniSecretKey, PublicKey, SecretKey,
 };
+#[cfg(feature = "full_crypto")]
+use sp_std::vec::Vec;
 #[cfg(feature = "std")]
 use std::convert::TryFrom;
 #[cfg(feature = "std")]
 use substrate_bip39::mini_secret_from_entropy;
-#[cfg(feature = "std")]
-use bip39::{Mnemonic, Language, MnemonicType};
-#[cfg(feature = "full_crypto")]
-use crate::crypto::{
-	Pair as TraitPair, DeriveJunction, Infallible, SecretStringError
-};
-#[cfg(feature = "std")]
-use crate::crypto::Ss58Codec;
 
-use crate::crypto::{Public as TraitPublic, CryptoTypePublicPair, UncheckedFrom, CryptoType, Derive, CryptoTypeId};
-use crate::hash::{H256, H512};
-use codec::{Encode, Decode, MaxEncodedLen};
+use crate::{
+	crypto::{
+		CryptoType, CryptoTypeId, CryptoTypePublicPair, Derive, Public as TraitPublic,
+		UncheckedFrom,
+	},
+	hash::{H256, H512},
+};
+use codec::{Decode, Encode, MaxEncodedLen};
 use sp_std::ops::Deref;
 
-#[cfg(feature = "std")]
-use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 #[cfg(feature = "full_crypto")]
 use schnorrkel::keys::{MINI_SECRET_KEY_LENGTH, SECRET_KEY_LENGTH};
+#[cfg(feature = "std")]
+use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 use sp_runtime_interface::pass_by::PassByInner;
 
 // signing context
@@ -61,8 +65,7 @@ pub const CRYPTO_ID: CryptoTypeId = CryptoTypeId(*b"sr25");
 /// An Schnorrkel/Ristretto x25519 ("sr25519") public key.
 #[cfg_attr(feature = "full_crypto", derive(Hash))]
 #[derive(
-	PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Encode, Decode, Default, PassByInner,
-	MaxEncodedLen,
+	PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Encode, Decode, Default, PassByInner, MaxEncodedLen,
 )]
 pub struct Public(pub [u8; 32]);
 
@@ -76,7 +79,7 @@ impl Clone for Pair {
 		Pair(schnorrkel::Keypair {
 			public: self.0.public,
 			secret: schnorrkel::SecretKey::from_bytes(&self.0.secret.to_bytes()[..])
-				.expect("key is always the correct size; qed")
+				.expect("key is always the correct size; qed"),
 		})
 	}
 }
@@ -176,14 +179,20 @@ impl sp_std::fmt::Debug for Public {
 
 #[cfg(feature = "std")]
 impl Serialize for Public {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer {
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+	where
+		S: Serializer,
+	{
 		serializer.serialize_str(&self.to_ss58check())
 	}
 }
 
 #[cfg(feature = "std")]
 impl<'de> Deserialize<'de> for Public {
-	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
+	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+	where
+		D: Deserializer<'de>,
+	{
 		Public::from_ss58check(&String::deserialize(deserializer)?)
 			.map_err(|e| de::Error::custom(format!("{:?}", e)))
 	}
@@ -211,14 +220,20 @@ impl sp_std::convert::TryFrom<&[u8]> for Signature {
 
 #[cfg(feature = "std")]
 impl Serialize for Signature {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer {
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+	where
+		S: Serializer,
+	{
 		serializer.serialize_str(&hex::encode(self))
 	}
 }
 
 #[cfg(feature = "std")]
 impl<'de> Deserialize<'de> for Signature {
-	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
+	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+	where
+		D: Deserializer<'de>,
+	{
 		let signature_hex = hex::decode(&String::deserialize(deserializer)?)
 			.map_err(|e| de::Error::custom(format!("{:?}", e)))?;
 		Signature::try_from(signature_hex.as_ref())
@@ -350,7 +365,7 @@ impl Derive for Public {
 	///
 	/// `None` if there are any hard junctions in there.
 	#[cfg(feature = "std")]
-	fn derive<Iter: Iterator<Item=DeriveJunction>>(&self, path: Iter) -> Option<Public> {
+	fn derive<Iter: Iterator<Item = DeriveJunction>>(&self, path: Iter) -> Option<Public> {
 		let mut acc = PublicKey::from_bytes(self.as_ref()).ok()?;
 		for j in path {
 			match j {
@@ -471,8 +486,7 @@ impl TraitPair for Pair {
 	///
 	/// A MiniSecretKey is literally what Ed25519 calls a SecretKey, which is just 32 random bytes.
 	fn from_seed(seed: &Seed) -> Pair {
-		Self::from_seed_slice(&seed[..])
-			.expect("32 bytes can always build a key; qed")
+		Self::from_seed_slice(&seed[..]).expect("32 bytes can always build a key; qed")
 	}
 
 	/// Get the public key.
@@ -488,21 +502,17 @@ impl TraitPair for Pair {
 	/// You should never need to use this; generate(), generate_with_phrase(), from_phrase()
 	fn from_seed_slice(seed: &[u8]) -> Result<Pair, SecretStringError> {
 		match seed.len() {
-			MINI_SECRET_KEY_LENGTH => {
-				Ok(Pair(
-					MiniSecretKey::from_bytes(seed)
-						.map_err(|_| SecretStringError::InvalidSeed)?
-						.expand_to_keypair(ExpansionMode::Ed25519)
-				))
-			}
-			SECRET_KEY_LENGTH => {
-				Ok(Pair(
-					SecretKey::from_bytes(seed)
-						.map_err(|_| SecretStringError::InvalidSeed)?
-						.to_keypair()
-				))
-			}
-			_ => Err(SecretStringError::InvalidSeedLength)
+			MINI_SECRET_KEY_LENGTH => Ok(Pair(
+				MiniSecretKey::from_bytes(seed)
+					.map_err(|_| SecretStringError::InvalidSeed)?
+					.expand_to_keypair(ExpansionMode::Ed25519),
+			)),
+			SECRET_KEY_LENGTH => Ok(Pair(
+				SecretKey::from_bytes(seed)
+					.map_err(|_| SecretStringError::InvalidSeed)?
+					.to_keypair(),
+			)),
+			_ => Err(SecretStringError::InvalidSeedLength),
 		}
 	}
 	#[cfg(feature = "std")]
@@ -511,20 +521,20 @@ impl TraitPair for Pair {
 		let phrase = mnemonic.phrase();
 		let (pair, seed) = Self::from_phrase(phrase, password)
 			.expect("All phrases generated by Mnemonic are valid; qed");
-		(
-			pair,
-			phrase.to_owned(),
-			seed,
-		)
+		(pair, phrase.to_owned(), seed)
 	}
 	#[cfg(feature = "std")]
-	fn from_phrase(phrase: &str, password: Option<&str>) -> Result<(Pair, Seed), SecretStringError> {
+	fn from_phrase(
+		phrase: &str,
+		password: Option<&str>,
+	) -> Result<(Pair, Seed), SecretStringError> {
 		Mnemonic::from_phrase(phrase, Language::English)
 			.map_err(|_| SecretStringError::InvalidPhrase)
 			.map(|m| Self::from_entropy(m.entropy(), password))
 	}
 
-	fn derive<Iter: Iterator<Item=DeriveJunction>>(&self,
+	fn derive<Iter: Iterator<Item = DeriveJunction>>(
+		&self,
 		path: Iter,
 		seed: Option<Seed>,
 	) -> Result<(Pair, Option<Seed>), Self::DeriveError> {
@@ -532,17 +542,22 @@ impl TraitPair for Pair {
 			if let Ok(msk) = MiniSecretKey::from_bytes(&s) {
 				if msk.expand(ExpansionMode::Ed25519) == self.0.secret {
 					Some(msk)
-				} else { None }
-			} else { None }
-		} else { None };
+				} else {
+					None
+				}
+			} else {
+				None
+			}
+		} else {
+			None
+		};
 		let init = self.0.secret.clone();
 		let (result, seed) = path.fold((init, seed), |(acc, acc_seed), j| match (j, acc_seed) {
-			(DeriveJunction::Soft(cc), _) =>
-				(acc.derived_key_simple(ChainCode(cc), &[]).0, None),
+			(DeriveJunction::Soft(cc), _) => (acc.derived_key_simple(ChainCode(cc), &[]).0, None),
 			(DeriveJunction::Hard(cc), maybe_seed) => {
 				let seed = derive_hard_junction(&acc, &cc);
 				(seed.expand(ExpansionMode::Ed25519), maybe_seed.map(|_| seed))
-			}
+			},
 		});
 		Ok((Self(result.into()), seed.map(|s| MiniSecretKey::to_bytes(&s))))
 	}
@@ -596,9 +611,9 @@ impl Pair {
 		// Match both schnorrkel 0.1.1 and 0.8.0+ signatures, supporting both wallets
 		// that have not been upgraded and those that have.
 		match PublicKey::from_bytes(pubkey.as_ref()) {
-			Ok(pk) => pk.verify_simple_preaudit_deprecated(
-				SIGNING_CTX, message.as_ref(), &sig.0[..],
-			).is_ok(),
+			Ok(pk) => pk
+				.verify_simple_preaudit_deprecated(SIGNING_CTX, message.as_ref(), &sig.0[..])
+				.is_ok(),
 			Err(_) => false,
 		}
 	}
@@ -642,20 +657,16 @@ pub fn verify_batch(
 	for signature in signatures {
 		match schnorrkel::Signature::from_bytes(signature.as_ref()) {
 			Ok(s) => sr_signatures.push(s),
-			Err(_) => return false
+			Err(_) => return false,
 		};
 	}
 
-	let mut messages: Vec<merlin::Transcript> = messages.into_iter().map(
-		|msg| signing_context(SIGNING_CTX).bytes(msg)
-	).collect();
+	let mut messages: Vec<merlin::Transcript> = messages
+		.into_iter()
+		.map(|msg| signing_context(SIGNING_CTX).bytes(msg))
+		.collect();
 
-	schnorrkel::verify_batch(
-		&mut messages,
-		&sr_signatures,
-		&sr_pub_keys,
-		true,
-	).is_ok()
+	schnorrkel::verify_batch(&mut messages, &sr_signatures, &sr_pub_keys, true).is_ok()
 }
 
 #[cfg(test)]
@@ -685,7 +696,9 @@ mod compatibility_test {
 
 	#[test]
 	fn verify_known_old_message_should_work() {
-		let public = Public::from_raw(hex!("b4bfa1f7a5166695eb75299fd1c4c03ea212871c342f2c5dfea0902b2c246918"));
+		let public = Public::from_raw(hex!(
+			"b4bfa1f7a5166695eb75299fd1c4c03ea212871c342f2c5dfea0902b2c246918"
+		));
 		// signature generated by the 1.1 version with the same ^^ public key.
 		let signature = Signature::from_raw(hex!(
 			"5a9755f069939f45d96aaf125cf5ce7ba1db998686f87f2fb3cbdea922078741a73891ba265f70c31436e18a9acd14d189d73c12317ab6c313285cd938453202"
@@ -699,7 +712,7 @@ mod compatibility_test {
 #[cfg(test)]
 mod test {
 	use super::*;
-	use crate::crypto::{Ss58Codec, DEV_PHRASE, DEV_ADDRESS};
+	use crate::crypto::{Ss58Codec, DEV_ADDRESS, DEV_PHRASE};
 	use hex_literal::hex;
 	use serde_json;
 
@@ -707,10 +720,14 @@ mod test {
 	fn default_phrase_should_be_used() {
 		assert_eq!(
 			Pair::from_string("//Alice///password", None).unwrap().public(),
-			Pair::from_string(&format!("{}//Alice", DEV_PHRASE), Some("password")).unwrap().public(),
+			Pair::from_string(&format!("{}//Alice", DEV_PHRASE), Some("password"))
+				.unwrap()
+				.public(),
 		);
 		assert_eq!(
-			Pair::from_string(&format!("{}/Alice", DEV_PHRASE), None).as_ref().map(Pair::public),
+			Pair::from_string(&format!("{}/Alice", DEV_PHRASE), None)
+				.as_ref()
+				.map(Pair::public),
 			Pair::from_string("/Alice", None).as_ref().map(Pair::public)
 		);
 	}
@@ -856,9 +873,9 @@ mod test {
 		// The values in this test case are compared to the output of `node-test.js` in schnorrkel-js.
 		//
 		// This is to make sure that the wasm library is compatible.
-		let pk = Pair::from_seed(
-			&hex!("0000000000000000000000000000000000000000000000000000000000000000")
-		);
+		let pk = Pair::from_seed(&hex!(
+			"0000000000000000000000000000000000000000000000000000000000000000"
+		));
 		let public = pk.public();
 		let js_signature = Signature::from_raw(hex!(
 			"28a854d54903e056f89581c691c1f7d2ff39f8f896c9e9c22475e60902cc2b3547199e0e91fa32902028f2ca2355e8cdd16cfe19ba5e8b658c94aa80f3b81a00"
diff --git a/primitives/core/src/testing.rs b/primitives/core/src/testing.rs
index be1a83f17009..865a03714a89 100644
--- a/primitives/core/src/testing.rs
+++ b/primitives/core/src/testing.rs
@@ -162,7 +162,11 @@ impl crate::traits::SpawnNamed for TaskExecutor {
 
 #[cfg(feature = "std")]
 impl crate::traits::SpawnEssentialNamed for TaskExecutor {
-	fn spawn_essential_blocking(&self, _: &'static str, future: futures::future::BoxFuture<'static, ()>) {
+	fn spawn_essential_blocking(
+		&self,
+		_: &'static str,
+		future: futures::future::BoxFuture<'static, ()>,
+	) {
 		self.0.spawn_ok(future);
 	}
 	fn spawn_essential(&self, _: &'static str, future: futures::future::BoxFuture<'static, ()>) {
diff --git a/primitives/core/src/traits.rs b/primitives/core/src/traits.rs
index d6503cb86a05..dfa61f606cb9 100644
--- a/primitives/core/src/traits.rs
+++ b/primitives/core/src/traits.rs
@@ -99,11 +99,7 @@ impl<'a> RuntimeCode<'a> {
 	///
 	/// This is only useful for tests that don't want to execute any code.
 	pub fn empty() -> Self {
-		Self {
-			code_fetcher: &NoneFetchRuntimeCode,
-			hash: Vec::new(),
-			heap_pages: None,
-		}
+		Self { code_fetcher: &NoneFetchRuntimeCode, hash: Vec::new(), heap_pages: None }
 	}
 }
 
@@ -225,7 +221,11 @@ pub trait SpawnEssentialNamed: Clone + Send + Sync {
 	/// Spawn the given blocking future.
 	///
 	/// The given `name` is used to identify the future in tracing.
-	fn spawn_essential_blocking(&self, name: &'static str, future: futures::future::BoxFuture<'static, ()>);
+	fn spawn_essential_blocking(
+		&self,
+		name: &'static str,
+		future: futures::future::BoxFuture<'static, ()>,
+	);
 	/// Spawn the given non-blocking future.
 	///
 	/// The given `name` is used to identify the future in tracing.
@@ -233,7 +233,11 @@ pub trait SpawnEssentialNamed: Clone + Send + Sync {
 }
 
 impl SpawnEssentialNamed for Box<dyn SpawnEssentialNamed> {
-	fn spawn_essential_blocking(&self, name: &'static str, future: futures::future::BoxFuture<'static, ()>) {
+	fn spawn_essential_blocking(
+		&self,
+		name: &'static str,
+		future: futures::future::BoxFuture<'static, ()>,
+	) {
 		(**self).spawn_essential_blocking(name, future)
 	}
 
diff --git a/primitives/core/src/u32_trait.rs b/primitives/core/src/u32_trait.rs
index 07f9bb003283..37837e7c0548 100644
--- a/primitives/core/src/u32_trait.rs
+++ b/primitives/core/src/u32_trait.rs
@@ -24,221 +24,547 @@ pub trait Value {
 }
 
 /// Type representing the value 0 for the `Value` trait.
-pub struct _0; impl Value for _0 { const VALUE: u32 = 0; }
+pub struct _0;
+impl Value for _0 {
+	const VALUE: u32 = 0;
+}
 /// Type representing the value 1 for the `Value` trait.
-pub struct _1; impl Value for _1 { const VALUE: u32 = 1; }
+pub struct _1;
+impl Value for _1 {
+	const VALUE: u32 = 1;
+}
 /// Type representing the value 2 for the `Value` trait.
-pub struct _2; impl Value for _2 { const VALUE: u32 = 2; }
+pub struct _2;
+impl Value for _2 {
+	const VALUE: u32 = 2;
+}
 /// Type representing the value 3 for the `Value` trait.
-pub struct _3; impl Value for _3 { const VALUE: u32 = 3; }
+pub struct _3;
+impl Value for _3 {
+	const VALUE: u32 = 3;
+}
 /// Type representing the value 4 for the `Value` trait.
-pub struct _4; impl Value for _4 { const VALUE: u32 = 4; }
+pub struct _4;
+impl Value for _4 {
+	const VALUE: u32 = 4;
+}
 /// Type representing the value 5 for the `Value` trait.
-pub struct _5; impl Value for _5 { const VALUE: u32 = 5; }
+pub struct _5;
+impl Value for _5 {
+	const VALUE: u32 = 5;
+}
 /// Type representing the value 6 for the `Value` trait.
-pub struct _6; impl Value for _6 { const VALUE: u32 = 6; }
+pub struct _6;
+impl Value for _6 {
+	const VALUE: u32 = 6;
+}
 /// Type representing the value 7 for the `Value` trait.
-pub struct _7; impl Value for _7 { const VALUE: u32 = 7; }
+pub struct _7;
+impl Value for _7 {
+	const VALUE: u32 = 7;
+}
 /// Type representing the value 8 for the `Value` trait.
-pub struct _8; impl Value for _8 { const VALUE: u32 = 8; }
+pub struct _8;
+impl Value for _8 {
+	const VALUE: u32 = 8;
+}
 /// Type representing the value 9 for the `Value` trait.
-pub struct _9; impl Value for _9 { const VALUE: u32 = 9; }
+pub struct _9;
+impl Value for _9 {
+	const VALUE: u32 = 9;
+}
 /// Type representing the value 10 for the `Value` trait.
-pub struct _10; impl Value for _10 { const VALUE: u32 = 10; }
+pub struct _10;
+impl Value for _10 {
+	const VALUE: u32 = 10;
+}
 /// Type representing the value 11 for the `Value` trait.
-pub struct _11; impl Value for _11 { const VALUE: u32 = 11; }
+pub struct _11;
+impl Value for _11 {
+	const VALUE: u32 = 11;
+}
 /// Type representing the value 12 for the `Value` trait.
-pub struct _12; impl Value for _12 { const VALUE: u32 = 12; }
+pub struct _12;
+impl Value for _12 {
+	const VALUE: u32 = 12;
+}
 /// Type representing the value 13 for the `Value` trait.
-pub struct _13; impl Value for _13 { const VALUE: u32 = 13; }
+pub struct _13;
+impl Value for _13 {
+	const VALUE: u32 = 13;
+}
 /// Type representing the value 14 for the `Value` trait.
-pub struct _14; impl Value for _14 { const VALUE: u32 = 14; }
+pub struct _14;
+impl Value for _14 {
+	const VALUE: u32 = 14;
+}
 /// Type representing the value 15 for the `Value` trait.
-pub struct _15; impl Value for _15 { const VALUE: u32 = 15; }
+pub struct _15;
+impl Value for _15 {
+	const VALUE: u32 = 15;
+}
 /// Type representing the value 16 for the `Value` trait.
-pub struct _16; impl Value for _16 { const VALUE: u32 = 16; }
+pub struct _16;
+impl Value for _16 {
+	const VALUE: u32 = 16;
+}
 /// Type representing the value 17 for the `Value` trait.
-pub struct _17; impl Value for _17 { const VALUE: u32 = 17; }
+pub struct _17;
+impl Value for _17 {
+	const VALUE: u32 = 17;
+}
 /// Type representing the value 18 for the `Value` trait.
-pub struct _18; impl Value for _18 { const VALUE: u32 = 18; }
+pub struct _18;
+impl Value for _18 {
+	const VALUE: u32 = 18;
+}
 /// Type representing the value 19 for the `Value` trait.
-pub struct _19; impl Value for _19 { const VALUE: u32 = 19; }
+pub struct _19;
+impl Value for _19 {
+	const VALUE: u32 = 19;
+}
 /// Type representing the value 20 for the `Value` trait.
-pub struct _20; impl Value for _20 { const VALUE: u32 = 20; }
+pub struct _20;
+impl Value for _20 {
+	const VALUE: u32 = 20;
+}
 /// Type representing the value 21 for the `Value` trait.
-pub struct _21; impl Value for _21 { const VALUE: u32 = 21; }
+pub struct _21;
+impl Value for _21 {
+	const VALUE: u32 = 21;
+}
 /// Type representing the value 22 for the `Value` trait.
-pub struct _22; impl Value for _22 { const VALUE: u32 = 22; }
+pub struct _22;
+impl Value for _22 {
+	const VALUE: u32 = 22;
+}
 /// Type representing the value 23 for the `Value` trait.
-pub struct _23; impl Value for _23 { const VALUE: u32 = 23; }
+pub struct _23;
+impl Value for _23 {
+	const VALUE: u32 = 23;
+}
 /// Type representing the value 24 for the `Value` trait.
-pub struct _24; impl Value for _24 { const VALUE: u32 = 24; }
+pub struct _24;
+impl Value for _24 {
+	const VALUE: u32 = 24;
+}
 /// Type representing the value 25 for the `Value` trait.
-pub struct _25; impl Value for _25 { const VALUE: u32 = 25; }
+pub struct _25;
+impl Value for _25 {
+	const VALUE: u32 = 25;
+}
 /// Type representing the value 26 for the `Value` trait.
-pub struct _26; impl Value for _26 { const VALUE: u32 = 26; }
+pub struct _26;
+impl Value for _26 {
+	const VALUE: u32 = 26;
+}
 /// Type representing the value 27 for the `Value` trait.
-pub struct _27; impl Value for _27 { const VALUE: u32 = 27; }
+pub struct _27;
+impl Value for _27 {
+	const VALUE: u32 = 27;
+}
 /// Type representing the value 28 for the `Value` trait.
-pub struct _28; impl Value for _28 { const VALUE: u32 = 28; }
+pub struct _28;
+impl Value for _28 {
+	const VALUE: u32 = 28;
+}
 /// Type representing the value 29 for the `Value` trait.
-pub struct _29; impl Value for _29 { const VALUE: u32 = 29; }
+pub struct _29;
+impl Value for _29 {
+	const VALUE: u32 = 29;
+}
 /// Type representing the value 30 for the `Value` trait.
-pub struct _30; impl Value for _30 { const VALUE: u32 = 30; }
+pub struct _30;
+impl Value for _30 {
+	const VALUE: u32 = 30;
+}
 /// Type representing the value 31 for the `Value` trait.
-pub struct _31; impl Value for _31 { const VALUE: u32 = 31; }
+pub struct _31;
+impl Value for _31 {
+	const VALUE: u32 = 31;
+}
 /// Type representing the value 32 for the `Value` trait.
-pub struct _32; impl Value for _32 { const VALUE: u32 = 32; }
+pub struct _32;
+impl Value for _32 {
+	const VALUE: u32 = 32;
+}
 /// Type representing the value 33 for the `Value` trait.
-pub struct _33; impl Value for _33 { const VALUE: u32 = 33; }
+pub struct _33;
+impl Value for _33 {
+	const VALUE: u32 = 33;
+}
 /// Type representing the value 34 for the `Value` trait.
-pub struct _34; impl Value for _34 { const VALUE: u32 = 34; }
+pub struct _34;
+impl Value for _34 {
+	const VALUE: u32 = 34;
+}
 /// Type representing the value 35 for the `Value` trait.
-pub struct _35; impl Value for _35 { const VALUE: u32 = 35; }
+pub struct _35;
+impl Value for _35 {
+	const VALUE: u32 = 35;
+}
 /// Type representing the value 36 for the `Value` trait.
-pub struct _36; impl Value for _36 { const VALUE: u32 = 36; }
+pub struct _36;
+impl Value for _36 {
+	const VALUE: u32 = 36;
+}
 /// Type representing the value 37 for the `Value` trait.
-pub struct _37; impl Value for _37 { const VALUE: u32 = 37; }
+pub struct _37;
+impl Value for _37 {
+	const VALUE: u32 = 37;
+}
 /// Type representing the value 38 for the `Value` trait.
-pub struct _38; impl Value for _38 { const VALUE: u32 = 38; }
+pub struct _38;
+impl Value for _38 {
+	const VALUE: u32 = 38;
+}
 /// Type representing the value 39 for the `Value` trait.
-pub struct _39; impl Value for _39 { const VALUE: u32 = 39; }
+pub struct _39;
+impl Value for _39 {
+	const VALUE: u32 = 39;
+}
 /// Type representing the value 40 for the `Value` trait.
-pub struct _40; impl Value for _40 { const VALUE: u32 = 40; }
+pub struct _40;
+impl Value for _40 {
+	const VALUE: u32 = 40;
+}
 /// Type representing the value 41 for the `Value` trait.
-pub struct _41; impl Value for _41 { const VALUE: u32 = 41; }
+pub struct _41;
+impl Value for _41 {
+	const VALUE: u32 = 41;
+}
 /// Type representing the value 42 for the `Value` trait.
-pub struct _42; impl Value for _42 { const VALUE: u32 = 42; }
+pub struct _42;
+impl Value for _42 {
+	const VALUE: u32 = 42;
+}
 /// Type representing the value 43 for the `Value` trait.
-pub struct _43; impl Value for _43 { const VALUE: u32 = 43; }
+pub struct _43;
+impl Value for _43 {
+	const VALUE: u32 = 43;
+}
 /// Type representing the value 44 for the `Value` trait.
-pub struct _44; impl Value for _44 { const VALUE: u32 = 44; }
+pub struct _44;
+impl Value for _44 {
+	const VALUE: u32 = 44;
+}
 /// Type representing the value 45 for the `Value` trait.
-pub struct _45; impl Value for _45 { const VALUE: u32 = 45; }
+pub struct _45;
+impl Value for _45 {
+	const VALUE: u32 = 45;
+}
 /// Type representing the value 46 for the `Value` trait.
-pub struct _46; impl Value for _46 { const VALUE: u32 = 46; }
+pub struct _46;
+impl Value for _46 {
+	const VALUE: u32 = 46;
+}
 /// Type representing the value 47 for the `Value` trait.
-pub struct _47; impl Value for _47 { const VALUE: u32 = 47; }
+pub struct _47;
+impl Value for _47 {
+	const VALUE: u32 = 47;
+}
 /// Type representing the value 48 for the `Value` trait.
-pub struct _48; impl Value for _48 { const VALUE: u32 = 48; }
+pub struct _48;
+impl Value for _48 {
+	const VALUE: u32 = 48;
+}
 /// Type representing the value 49 for the `Value` trait.
-pub struct _49; impl Value for _49 { const VALUE: u32 = 49; }
+pub struct _49;
+impl Value for _49 {
+	const VALUE: u32 = 49;
+}
 /// Type representing the value 50 for the `Value` trait.
-pub struct _50; impl Value for _50 { const VALUE: u32 = 50; }
+pub struct _50;
+impl Value for _50 {
+	const VALUE: u32 = 50;
+}
 /// Type representing the value 51 for the `Value` trait.
-pub struct _51; impl Value for _51 { const VALUE: u32 = 51; }
+pub struct _51;
+impl Value for _51 {
+	const VALUE: u32 = 51;
+}
 /// Type representing the value 52 for the `Value` trait.
-pub struct _52; impl Value for _52 { const VALUE: u32 = 52; }
+pub struct _52;
+impl Value for _52 {
+	const VALUE: u32 = 52;
+}
 /// Type representing the value 53 for the `Value` trait.
-pub struct _53; impl Value for _53 { const VALUE: u32 = 53; }
+pub struct _53;
+impl Value for _53 {
+	const VALUE: u32 = 53;
+}
 /// Type representing the value 54 for the `Value` trait.
-pub struct _54; impl Value for _54 { const VALUE: u32 = 54; }
+pub struct _54;
+impl Value for _54 {
+	const VALUE: u32 = 54;
+}
 /// Type representing the value 55 for the `Value` trait.
-pub struct _55; impl Value for _55 { const VALUE: u32 = 55; }
+pub struct _55;
+impl Value for _55 {
+	const VALUE: u32 = 55;
+}
 /// Type representing the value 56 for the `Value` trait.
-pub struct _56; impl Value for _56 { const VALUE: u32 = 56; }
+pub struct _56;
+impl Value for _56 {
+	const VALUE: u32 = 56;
+}
 /// Type representing the value 57 for the `Value` trait.
-pub struct _57; impl Value for _57 { const VALUE: u32 = 57; }
+pub struct _57;
+impl Value for _57 {
+	const VALUE: u32 = 57;
+}
 /// Type representing the value 58 for the `Value` trait.
-pub struct _58; impl Value for _58 { const VALUE: u32 = 58; }
+pub struct _58;
+impl Value for _58 {
+	const VALUE: u32 = 58;
+}
 /// Type representing the value 59 for the `Value` trait.
-pub struct _59; impl Value for _59 { const VALUE: u32 = 59; }
+pub struct _59;
+impl Value for _59 {
+	const VALUE: u32 = 59;
+}
 /// Type representing the value 60 for the `Value` trait.
-pub struct _60; impl Value for _60 { const VALUE: u32 = 60; }
+pub struct _60;
+impl Value for _60 {
+	const VALUE: u32 = 60;
+}
 /// Type representing the value 61 for the `Value` trait.
-pub struct _61; impl Value for _61 { const VALUE: u32 = 61; }
+pub struct _61;
+impl Value for _61 {
+	const VALUE: u32 = 61;
+}
 /// Type representing the value 62 for the `Value` trait.
-pub struct _62; impl Value for _62 { const VALUE: u32 = 62; }
+pub struct _62;
+impl Value for _62 {
+	const VALUE: u32 = 62;
+}
 /// Type representing the value 63 for the `Value` trait.
-pub struct _63; impl Value for _63 { const VALUE: u32 = 63; }
+pub struct _63;
+impl Value for _63 {
+	const VALUE: u32 = 63;
+}
 /// Type representing the value 64 for the `Value` trait.
-pub struct _64; impl Value for _64 { const VALUE: u32 = 64; }
+pub struct _64;
+impl Value for _64 {
+	const VALUE: u32 = 64;
+}
 /// Type representing the value 65 for the `Value` trait.
-pub struct _65; impl Value for _65 { const VALUE: u32 = 65; }
+pub struct _65;
+impl Value for _65 {
+	const VALUE: u32 = 65;
+}
 /// Type representing the value 66 for the `Value` trait.
-pub struct _66; impl Value for _66 { const VALUE: u32 = 66; }
+pub struct _66;
+impl Value for _66 {
+	const VALUE: u32 = 66;
+}
 /// Type representing the value 67 for the `Value` trait.
-pub struct _67; impl Value for _67 { const VALUE: u32 = 67; }
+pub struct _67;
+impl Value for _67 {
+	const VALUE: u32 = 67;
+}
 /// Type representing the value 68 for the `Value` trait.
-pub struct _68; impl Value for _68 { const VALUE: u32 = 68; }
+pub struct _68;
+impl Value for _68 {
+	const VALUE: u32 = 68;
+}
 /// Type representing the value 69 for the `Value` trait.
-pub struct _69; impl Value for _69 { const VALUE: u32 = 69; }
+pub struct _69;
+impl Value for _69 {
+	const VALUE: u32 = 69;
+}
 /// Type representing the value 70 for the `Value` trait.
-pub struct _70; impl Value for _70 { const VALUE: u32 = 70; }
+pub struct _70;
+impl Value for _70 {
+	const VALUE: u32 = 70;
+}
 /// Type representing the value 71 for the `Value` trait.
-pub struct _71; impl Value for _71 { const VALUE: u32 = 71; }
+pub struct _71;
+impl Value for _71 {
+	const VALUE: u32 = 71;
+}
 /// Type representing the value 72 for the `Value` trait.
-pub struct _72; impl Value for _72 { const VALUE: u32 = 72; }
+pub struct _72;
+impl Value for _72 {
+	const VALUE: u32 = 72;
+}
 /// Type representing the value 73 for the `Value` trait.
-pub struct _73; impl Value for _73 { const VALUE: u32 = 73; }
+pub struct _73;
+impl Value for _73 {
+	const VALUE: u32 = 73;
+}
 /// Type representing the value 74 for the `Value` trait.
-pub struct _74; impl Value for _74 { const VALUE: u32 = 74; }
+pub struct _74;
+impl Value for _74 {
+	const VALUE: u32 = 74;
+}
 /// Type representing the value 75 for the `Value` trait.
-pub struct _75; impl Value for _75 { const VALUE: u32 = 75; }
+pub struct _75;
+impl Value for _75 {
+	const VALUE: u32 = 75;
+}
 /// Type representing the value 76 for the `Value` trait.
-pub struct _76; impl Value for _76 { const VALUE: u32 = 76; }
+pub struct _76;
+impl Value for _76 {
+	const VALUE: u32 = 76;
+}
 /// Type representing the value 77 for the `Value` trait.
-pub struct _77; impl Value for _77 { const VALUE: u32 = 77; }
+pub struct _77;
+impl Value for _77 {
+	const VALUE: u32 = 77;
+}
 /// Type representing the value 78 for the `Value` trait.
-pub struct _78; impl Value for _78 { const VALUE: u32 = 78; }
+pub struct _78;
+impl Value for _78 {
+	const VALUE: u32 = 78;
+}
 /// Type representing the value 79 for the `Value` trait.
-pub struct _79; impl Value for _79 { const VALUE: u32 = 79; }
+pub struct _79;
+impl Value for _79 {
+	const VALUE: u32 = 79;
+}
 /// Type representing the value 80 for the `Value` trait.
-pub struct _80; impl Value for _80 { const VALUE: u32 = 80; }
+pub struct _80;
+impl Value for _80 {
+	const VALUE: u32 = 80;
+}
 /// Type representing the value 81 for the `Value` trait.
-pub struct _81; impl Value for _81 { const VALUE: u32 = 81; }
+pub struct _81;
+impl Value for _81 {
+	const VALUE: u32 = 81;
+}
 /// Type representing the value 82 for the `Value` trait.
-pub struct _82; impl Value for _82 { const VALUE: u32 = 82; }
+pub struct _82;
+impl Value for _82 {
+	const VALUE: u32 = 82;
+}
 /// Type representing the value 83 for the `Value` trait.
-pub struct _83; impl Value for _83 { const VALUE: u32 = 83; }
+pub struct _83;
+impl Value for _83 {
+	const VALUE: u32 = 83;
+}
 /// Type representing the value 84 for the `Value` trait.
-pub struct _84; impl Value for _84 { const VALUE: u32 = 84; }
+pub struct _84;
+impl Value for _84 {
+	const VALUE: u32 = 84;
+}
 /// Type representing the value 85 for the `Value` trait.
-pub struct _85; impl Value for _85 { const VALUE: u32 = 85; }
+pub struct _85;
+impl Value for _85 {
+	const VALUE: u32 = 85;
+}
 /// Type representing the value 86 for the `Value` trait.
-pub struct _86; impl Value for _86 { const VALUE: u32 = 86; }
+pub struct _86;
+impl Value for _86 {
+	const VALUE: u32 = 86;
+}
 /// Type representing the value 87 for the `Value` trait.
-pub struct _87; impl Value for _87 { const VALUE: u32 = 87; }
+pub struct _87;
+impl Value for _87 {
+	const VALUE: u32 = 87;
+}
 /// Type representing the value 88 for the `Value` trait.
-pub struct _88; impl Value for _88 { const VALUE: u32 = 88; }
+pub struct _88;
+impl Value for _88 {
+	const VALUE: u32 = 88;
+}
 /// Type representing the value 89 for the `Value` trait.
-pub struct _89; impl Value for _89 { const VALUE: u32 = 89; }
+pub struct _89;
+impl Value for _89 {
+	const VALUE: u32 = 89;
+}
 /// Type representing the value 90 for the `Value` trait.
-pub struct _90; impl Value for _90 { const VALUE: u32 = 90; }
+pub struct _90;
+impl Value for _90 {
+	const VALUE: u32 = 90;
+}
 /// Type representing the value 91 for the `Value` trait.
-pub struct _91; impl Value for _91 { const VALUE: u32 = 91; }
+pub struct _91;
+impl Value for _91 {
+	const VALUE: u32 = 91;
+}
 /// Type representing the value 92 for the `Value` trait.
-pub struct _92; impl Value for _92 { const VALUE: u32 = 92; }
+pub struct _92;
+impl Value for _92 {
+	const VALUE: u32 = 92;
+}
 /// Type representing the value 93 for the `Value` trait.
-pub struct _93; impl Value for _93 { const VALUE: u32 = 93; }
+pub struct _93;
+impl Value for _93 {
+	const VALUE: u32 = 93;
+}
 /// Type representing the value 94 for the `Value` trait.
-pub struct _94; impl Value for _94 { const VALUE: u32 = 94; }
+pub struct _94;
+impl Value for _94 {
+	const VALUE: u32 = 94;
+}
 /// Type representing the value 95 for the `Value` trait.
-pub struct _95; impl Value for _95 { const VALUE: u32 = 95; }
+pub struct _95;
+impl Value for _95 {
+	const VALUE: u32 = 95;
+}
 /// Type representing the value 96 for the `Value` trait.
-pub struct _96; impl Value for _96 { const VALUE: u32 = 96; }
+pub struct _96;
+impl Value for _96 {
+	const VALUE: u32 = 96;
+}
 /// Type representing the value 97 for the `Value` trait.
-pub struct _97; impl Value for _97 { const VALUE: u32 = 97; }
+pub struct _97;
+impl Value for _97 {
+	const VALUE: u32 = 97;
+}
 /// Type representing the value 98 for the `Value` trait.
-pub struct _98; impl Value for _98 { const VALUE: u32 = 98; }
+pub struct _98;
+impl Value for _98 {
+	const VALUE: u32 = 98;
+}
 /// Type representing the value 99 for the `Value` trait.
-pub struct _99; impl Value for _99 { const VALUE: u32 = 99; }
+pub struct _99;
+impl Value for _99 {
+	const VALUE: u32 = 99;
+}
 /// Type representing the value 100 for the `Value` trait.
-pub struct _100; impl Value for _100 { const VALUE: u32 = 100; }
+pub struct _100;
+impl Value for _100 {
+	const VALUE: u32 = 100;
+}
 /// Type representing the value 112 for the `Value` trait.
-pub struct _112; impl Value for _112 { const VALUE: u32 = 112; }
+pub struct _112;
+impl Value for _112 {
+	const VALUE: u32 = 112;
+}
 /// Type representing the value 128 for the `Value` trait.
-pub struct _128; impl Value for _128 { const VALUE: u32 = 128; }
+pub struct _128;
+impl Value for _128 {
+	const VALUE: u32 = 128;
+}
 /// Type representing the value 160 for the `Value` trait.
-pub struct _160; impl Value for _160 { const VALUE: u32 = 160; }
+pub struct _160;
+impl Value for _160 {
+	const VALUE: u32 = 160;
+}
 /// Type representing the value 192 for the `Value` trait.
-pub struct _192; impl Value for _192 { const VALUE: u32 = 192; }
+pub struct _192;
+impl Value for _192 {
+	const VALUE: u32 = 192;
+}
 /// Type representing the value 224 for the `Value` trait.
-pub struct _224; impl Value for _224 { const VALUE: u32 = 224; }
+pub struct _224;
+impl Value for _224 {
+	const VALUE: u32 = 224;
+}
 /// Type representing the value 256 for the `Value` trait.
-pub struct _256; impl Value for _256 { const VALUE: u32 = 256; }
+pub struct _256;
+impl Value for _256 {
+	const VALUE: u32 = 256;
+}
 /// Type representing the value 384 for the `Value` trait.
-pub struct _384; impl Value for _384 { const VALUE: u32 = 384; }
+pub struct _384;
+impl Value for _384 {
+	const VALUE: u32 = 384;
+}
 /// Type representing the value 512 for the `Value` trait.
-pub struct _512; impl Value for _512 { const VALUE: u32 = 512; }
-
+pub struct _512;
+impl Value for _512 {
+	const VALUE: u32 = 512;
+}
diff --git a/primitives/core/src/uint.rs b/primitives/core/src/uint.rs
index ff45ad6ecf0d..a74980332ad2 100644
--- a/primitives/core/src/uint.rs
+++ b/primitives/core/src/uint.rs
@@ -22,7 +22,7 @@ pub use primitive_types::{U256, U512};
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use codec::{Encode, Decode};
+	use codec::{Decode, Encode};
 	use sp_serializer as ser;
 
 	macro_rules! test {
@@ -55,34 +55,27 @@ mod tests {
 				assert!(ser::from_str::<$name>("\"10\"").unwrap_err().is_data());
 				assert!(ser::from_str::<$name>("\"0\"").unwrap_err().is_data());
 			}
-		}
+		};
 	}
 
 	test!(U256, test_u256);
 
 	#[test]
 	fn test_u256_codec() {
-		let res1 = vec![120, 0, 0, 0, 0, 0, 0, 0,
-						0, 0, 0, 0, 0, 0, 0, 0,
-						0, 0, 0, 0, 0, 0, 0, 0,
-						0, 0, 0, 0, 0, 0, 0, 0];
-		let res2 = vec![0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-						0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-						0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-						0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff];
+		let res1 = vec![
+			120, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 0, 0,
+		];
+		let res2 = vec![
+			0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+			0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+			0xff, 0xff, 0xff, 0xff,
+		];
 
-		assert_eq!(
-			U256::from(120).encode(),
-			res1);
-		assert_eq!(
-			U256::max_value().encode(),
-			res2);
-		assert_eq!(
-			U256::decode(&mut &res1[..]),
-			Ok(U256::from(120)));
-		assert_eq!(
-			U256::decode(&mut &res2[..]),
-			Ok(U256::max_value()));
+		assert_eq!(U256::from(120).encode(), res1);
+		assert_eq!(U256::max_value().encode(), res2);
+		assert_eq!(U256::decode(&mut &res1[..]), Ok(U256::from(120)));
+		assert_eq!(U256::decode(&mut &res2[..]), Ok(U256::max_value()));
 	}
 
 	#[test]
@@ -91,10 +84,10 @@ mod tests {
 			ser::to_string_pretty(&!U256::zero()),
 			"\"0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\""
 		);
-		assert!(
-			ser::from_str::<U256>("\"0x1ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\"")
-			.unwrap_err()
-			.is_data()
-		);
+		assert!(ser::from_str::<U256>(
+			"\"0x1ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\""
+		)
+		.unwrap_err()
+		.is_data());
 	}
 }
diff --git a/primitives/database/src/kvdb.rs b/primitives/database/src/kvdb.rs
index d99fe6360ef7..1a2b0513dc28 100644
--- a/primitives/database/src/kvdb.rs
+++ b/primitives/database/src/kvdb.rs
@@ -16,30 +16,31 @@
 // limitations under the License.
 
 /// A wrapper around `kvdb::Database` that implements `sp_database::Database` trait
-
 use ::kvdb::{DBTransaction, KeyValueDB};
 
-use crate::{Database, Change, ColumnId, Transaction, error};
+use crate::{error, Change, ColumnId, Database, Transaction};
 
 struct DbAdapter<D: KeyValueDB + 'static>(D);
 
 fn handle_err<T>(result: std::io::Result<T>) -> T {
 	match result {
 		Ok(r) => r,
-		Err(e) =>  {
+		Err(e) => {
 			panic!("Critical database error: {:?}", e);
-		}
+		},
 	}
 }
 
 /// Wrap RocksDb database into a trait object that implements `sp_database::Database`
 pub fn as_database<D, H>(db: D) -> std::sync::Arc<dyn Database<H>>
-	where D: KeyValueDB + 'static, H: Clone + AsRef<[u8]>
+where
+	D: KeyValueDB + 'static,
+	H: Clone + AsRef<[u8]>,
 {
 	std::sync::Arc::new(DbAdapter(db))
 }
 
-impl <D: KeyValueDB> DbAdapter<D> {
+impl<D: KeyValueDB> DbAdapter<D> {
 	// Returns counter key and counter value if it exists.
 	fn read_counter(&self, col: ColumnId, key: &[u8]) -> error::Result<(Vec<u8>, Option<u32>)> {
 		// Add a key suffix for the counter
@@ -49,16 +50,16 @@ impl <D: KeyValueDB> DbAdapter<D> {
 			Some(data) => {
 				let mut counter_data = [0; 4];
 				if data.len() != 4 {
-					return Err(error::DatabaseError(Box::new(
-								std::io::Error::new(std::io::ErrorKind::Other,
-									format!("Unexpected counter len {}", data.len())))
-					))
+					return Err(error::DatabaseError(Box::new(std::io::Error::new(
+						std::io::ErrorKind::Other,
+						format!("Unexpected counter len {}", data.len()),
+					))))
 				}
 				counter_data.copy_from_slice(&data);
 				let counter = u32::from_le_bytes(counter_data);
 				(counter_key, Some(counter))
 			},
-			None => (counter_key, None)
+			None => (counter_key, None),
 		})
 	}
 }
@@ -70,27 +71,29 @@ impl<D: KeyValueDB, H: Clone + AsRef<[u8]>> Database<H> for DbAdapter<D> {
 			match change {
 				Change::Set(col, key, value) => tx.put_vec(col, &key, value),
 				Change::Remove(col, key) => tx.delete(col, &key),
-				Change::Store(col, key, value) => {
-					match self.read_counter(col, key.as_ref())? {
-						(counter_key, Some(mut counter)) => {
-							counter += 1;
-							tx.put(col, &counter_key, &counter.to_le_bytes());
-						},
-						(counter_key, None) => {
-							let d = 1u32.to_le_bytes();
-							tx.put(col, &counter_key, &d);
-							tx.put_vec(col, key.as_ref(), value);
-						},
-					}
-				}
+				Change::Store(col, key, value) => match self.read_counter(col, key.as_ref())? {
+					(counter_key, Some(mut counter)) => {
+						counter += 1;
+						tx.put(col, &counter_key, &counter.to_le_bytes());
+					},
+					(counter_key, None) => {
+						let d = 1u32.to_le_bytes();
+						tx.put(col, &counter_key, &d);
+						tx.put_vec(col, key.as_ref(), value);
+					},
+				},
 				Change::Reference(col, key) => {
-					if let (counter_key, Some(mut counter)) = self.read_counter(col, key.as_ref())? {
+					if let (counter_key, Some(mut counter)) =
+						self.read_counter(col, key.as_ref())?
+					{
 						counter += 1;
 						tx.put(col, &counter_key, &counter.to_le_bytes());
 					}
-				}
+				},
 				Change::Release(col, key) => {
-					if let (counter_key, Some(mut counter)) = self.read_counter(col, key.as_ref())? {
+					if let (counter_key, Some(mut counter)) =
+						self.read_counter(col, key.as_ref())?
+					{
 						counter -= 1;
 						if counter == 0 {
 							tx.delete(col, &counter_key);
@@ -99,7 +102,7 @@ impl<D: KeyValueDB, H: Clone + AsRef<[u8]>> Database<H> for DbAdapter<D> {
 							tx.put(col, &counter_key, &counter.to_le_bytes());
 						}
 					}
-				}
+				},
 			}
 		}
 		self.0.write(tx).map_err(|e| error::DatabaseError(Box::new(e)))
diff --git a/primitives/database/src/lib.rs b/primitives/database/src/lib.rs
index 1fa0c8e49b01..ed5d93ed5b9c 100644
--- a/primitives/database/src/lib.rs
+++ b/primitives/database/src/lib.rs
@@ -18,11 +18,11 @@
 //! The main database trait, allowing Substrate to store data persistently.
 
 pub mod error;
-mod mem;
 mod kvdb;
+mod mem;
 
-pub use mem::MemDb;
 pub use crate::kvdb::as_database;
+pub use mem::MemDb;
 
 /// An identifier for a column.
 pub type ColumnId = u32;
@@ -118,10 +118,13 @@ impl<H> std::fmt::Debug for dyn Database<H> {
 pub fn with_get<R, H: Clone + AsRef<[u8]>>(
 	db: &dyn Database<H>,
 	col: ColumnId,
-	key: &[u8], mut f: impl FnMut(&[u8]) -> R
+	key: &[u8],
+	mut f: impl FnMut(&[u8]) -> R,
 ) -> Option<R> {
 	let mut result: Option<R> = None;
-	let mut adapter = |k: &_| { result = Some(f(k)); };
+	let mut adapter = |k: &_| {
+		result = Some(f(k));
+	};
 	db.with_get(col, key, &mut adapter);
 	result
 }
diff --git a/primitives/database/src/mem.rs b/primitives/database/src/mem.rs
index 24ddf0331971..d1b1861e98fd 100644
--- a/primitives/database/src/mem.rs
+++ b/primitives/database/src/mem.rs
@@ -17,41 +17,52 @@
 
 //! In-memory implementation of `Database`
 
-use std::collections::{HashMap, hash_map::Entry};
-use crate::{Database, Change, ColumnId, Transaction, error};
+use crate::{error, Change, ColumnId, Database, Transaction};
 use parking_lot::RwLock;
+use std::collections::{hash_map::Entry, HashMap};
 
 #[derive(Default)]
 /// This implements `Database` as an in-memory hash map. `commit` is not atomic.
 pub struct MemDb(RwLock<HashMap<ColumnId, HashMap<Vec<u8>, (u32, Vec<u8>)>>>);
 
 impl<H> Database<H> for MemDb
-	where H: Clone + AsRef<[u8]>
+where
+	H: Clone + AsRef<[u8]>,
 {
 	fn commit(&self, transaction: Transaction<H>) -> error::Result<()> {
 		let mut s = self.0.write();
 		for change in transaction.0.into_iter() {
 			match change {
-				Change::Set(col, key, value) => { s.entry(col).or_default().insert(key, (1, value)); },
-				Change::Remove(col, key) => { s.entry(col).or_default().remove(&key); },
+				Change::Set(col, key, value) => {
+					s.entry(col).or_default().insert(key, (1, value));
+				},
+				Change::Remove(col, key) => {
+					s.entry(col).or_default().remove(&key);
+				},
 				Change::Store(col, hash, value) => {
-					s.entry(col).or_default().entry(hash.as_ref().to_vec())
+					s.entry(col)
+						.or_default()
+						.entry(hash.as_ref().to_vec())
 						.and_modify(|(c, _)| *c += 1)
 						.or_insert_with(|| (1, value));
 				},
 				Change::Reference(col, hash) => {
-					if let Entry::Occupied(mut entry) = s.entry(col).or_default().entry(hash.as_ref().to_vec()) {
+					if let Entry::Occupied(mut entry) =
+						s.entry(col).or_default().entry(hash.as_ref().to_vec())
+					{
 						entry.get_mut().0 += 1;
 					}
-				}
+				},
 				Change::Release(col, hash) => {
-					if let Entry::Occupied(mut entry) = s.entry(col).or_default().entry(hash.as_ref().to_vec()) {
+					if let Entry::Occupied(mut entry) =
+						s.entry(col).or_default().entry(hash.as_ref().to_vec())
+					{
 						entry.get_mut().0 -= 1;
 						if entry.get().0 == 0 {
 							entry.remove();
 						}
 					}
-				}
+				},
 			}
 		}
 
@@ -76,4 +87,3 @@ impl MemDb {
 		s.get(&col).map(|c| c.len()).unwrap_or(0)
 	}
 }
-
diff --git a/primitives/debug-derive/src/impls.rs b/primitives/debug-derive/src/impls.rs
index 898e4eef5d06..4d79ee988016 100644
--- a/primitives/debug-derive/src/impls.rs
+++ b/primitives/debug-derive/src/impls.rs
@@ -15,9 +15,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use quote::quote;
 use proc_macro2::TokenStream;
-use syn::{Data, DeriveInput, parse_quote};
+use quote::quote;
+use syn::{parse_quote, Data, DeriveInput};
 
 pub fn debug_derive(ast: DeriveInput) -> proc_macro::TokenStream {
 	let name_str = ast.ident.to_string();
@@ -28,11 +28,11 @@ pub fn debug_derive(ast: DeriveInput) -> proc_macro::TokenStream {
 		let wh = generics.make_where_clause();
 		for t in ast.generics.type_params() {
 			let name = &t.ident;
-			wh.predicates.push(parse_quote!{ #name : core::fmt::Debug });
+			wh.predicates.push(parse_quote! { #name : core::fmt::Debug });
 		}
 		generics.split_for_impl()
 	};
-	let gen = quote!{
+	let gen = quote! {
 		impl #impl_generics core::fmt::Debug for #name #ty_generics #where_clause {
 			fn fmt(&self, fmt: &mut core::fmt::Formatter) -> core::fmt::Result {
 				#implementation
@@ -62,32 +62,26 @@ mod implementation {
 mod implementation {
 	use super::*;
 	use proc_macro2::Span;
-	use syn::{Ident, Index, token::SelfValue};
+	use syn::{token::SelfValue, Ident, Index};
 
 	/// Derive the inner implementation of `Debug::fmt` function.
 	pub fn derive(name_str: &str, data: &Data) -> TokenStream {
 		match *data {
 			Data::Struct(ref s) => derive_struct(&name_str, &s.fields),
-			Data::Union(ref u) => derive_fields(&name_str, Fields::new(u.fields.named.iter(), None)),
+			Data::Union(ref u) =>
+				derive_fields(&name_str, Fields::new(u.fields.named.iter(), None)),
 			Data::Enum(ref e) => derive_enum(&name_str, &e),
 		}
 	}
 
 	enum Fields {
-		Indexed {
-			indices: Vec<Index>,
-		},
-		Unnamed {
-			vars: Vec<Ident>,
-		},
-		Named {
-			names: Vec<Ident>,
-			this: Option<SelfValue>,
-		},
+		Indexed { indices: Vec<Index> },
+		Unnamed { vars: Vec<Ident> },
+		Named { names: Vec<Ident>, this: Option<SelfValue> },
 	}
 
 	impl Fields {
-		fn new<'a>(fields: impl Iterator<Item=&'a syn::Field>, this: Option<SelfValue>) -> Self {
+		fn new<'a>(fields: impl Iterator<Item = &'a syn::Field>, this: Option<SelfValue>) -> Self {
 			let mut indices = vec![];
 			let mut names = vec![];
 
@@ -100,27 +94,17 @@ mod implementation {
 			}
 
 			if names.is_empty() {
-				Self::Indexed {
-					indices,
-				}
+				Self::Indexed { indices }
 			} else {
-				Self::Named {
-					names,
-					this,
-				}
+				Self::Named { names, this }
 			}
 		}
 	}
 
-	fn derive_fields<'a>(
-		name_str: &str,
-		fields: Fields,
-	) -> TokenStream {
+	fn derive_fields<'a>(name_str: &str, fields: Fields) -> TokenStream {
 		match fields {
 			Fields::Named { names, this } => {
-				let names_str: Vec<_> = names.iter()
-					.map(|x| x.to_string())
-					.collect();
+				let names_str: Vec<_> = names.iter().map(|x| x.to_string()).collect();
 
 				let fields = match this {
 					None => quote! { #( .field(#names_str, #names) )* },
@@ -132,16 +116,15 @@ mod implementation {
 						#fields
 						.finish()
 				}
-
 			},
-			Fields::Indexed { indices }  => {
+			Fields::Indexed { indices } => {
 				quote! {
 					fmt.debug_tuple(#name_str)
 						#( .field(&self.#indices) )*
 						.finish()
 				}
 			},
-			Fields::Unnamed { vars }  => {
+			Fields::Unnamed { vars } => {
 				quote! {
 					fmt.debug_tuple(#name_str)
 						#( .field(#vars) )*
@@ -151,38 +134,33 @@ mod implementation {
 		}
 	}
 
-	fn derive_enum(
-		name: &str,
-		e: &syn::DataEnum,
-	) -> TokenStream {
-		let v = e.variants
-			.iter()
-			.map(|v| {
-				let name = format!("{}::{}", name, v.ident);
-				let ident = &v.ident;
-				match v.fields {
-					syn::Fields::Named(ref f) => {
-						let names: Vec<_> = f.named.iter().flat_map(|f| f.ident.clone()).collect();
-						let fields_impl = derive_fields(&name, Fields::Named {
-							names: names.clone(),
-							this: None,
-						});
-						(ident, (quote!{ { #( ref #names ),* } }, fields_impl))
-					},
-					syn::Fields::Unnamed(ref f) => {
-						let names = f.unnamed.iter()
-							.enumerate()
-							.map(|(id, _)| Ident::new(&format!("a{}", id), Span::call_site()))
-							.collect::<Vec<_>>();
-						let fields_impl = derive_fields(&name, Fields::Unnamed { vars: names.clone() });
-						(ident, (quote! { ( #( ref #names ),* ) }, fields_impl))
-					},
-					syn::Fields::Unit => {
-						let fields_impl = derive_fields(&name, Fields::Indexed { indices: vec![] });
-						(ident, (quote! { }, fields_impl))
-					},
-				}
-			});
+	fn derive_enum(name: &str, e: &syn::DataEnum) -> TokenStream {
+		let v = e.variants.iter().map(|v| {
+			let name = format!("{}::{}", name, v.ident);
+			let ident = &v.ident;
+			match v.fields {
+				syn::Fields::Named(ref f) => {
+					let names: Vec<_> = f.named.iter().flat_map(|f| f.ident.clone()).collect();
+					let fields_impl =
+						derive_fields(&name, Fields::Named { names: names.clone(), this: None });
+					(ident, (quote! { { #( ref #names ),* } }, fields_impl))
+				},
+				syn::Fields::Unnamed(ref f) => {
+					let names = f
+						.unnamed
+						.iter()
+						.enumerate()
+						.map(|(id, _)| Ident::new(&format!("a{}", id), Span::call_site()))
+						.collect::<Vec<_>>();
+					let fields_impl = derive_fields(&name, Fields::Unnamed { vars: names.clone() });
+					(ident, (quote! { ( #( ref #names ),* ) }, fields_impl))
+				},
+				syn::Fields::Unit => {
+					let fields_impl = derive_fields(&name, Fields::Indexed { indices: vec![] });
+					(ident, (quote! {}, fields_impl))
+				},
+			}
+		});
 
 		type Vecs<A, B> = (Vec<A>, Vec<B>);
 		let (variants, others): Vecs<_, _> = v.unzip();
@@ -196,23 +174,15 @@ mod implementation {
 		}
 	}
 
-	fn derive_struct(
-		name_str: &str,
-		fields: &syn::Fields,
-	) -> TokenStream {
+	fn derive_struct(name_str: &str, fields: &syn::Fields) -> TokenStream {
 		match *fields {
 			syn::Fields::Named(ref f) => derive_fields(
 				name_str,
 				Fields::new(f.named.iter(), Some(syn::Token!(self)(Span::call_site()))),
 			),
-			syn::Fields::Unnamed(ref f) => derive_fields(
-				name_str,
-				Fields::new(f.unnamed.iter(), None),
-			),
-			syn::Fields::Unit => derive_fields(
-				name_str,
-				Fields::Indexed { indices: vec![] },
-			),
+			syn::Fields::Unnamed(ref f) =>
+				derive_fields(name_str, Fields::new(f.unnamed.iter(), None)),
+			syn::Fields::Unit => derive_fields(name_str, Fields::Indexed { indices: vec![] }),
 		}
 	}
 }
diff --git a/primitives/debug-derive/src/lib.rs b/primitives/debug-derive/src/lib.rs
index ebfbd614d9c8..7eaa3a0020e9 100644
--- a/primitives/debug-derive/src/lib.rs
+++ b/primitives/debug-derive/src/lib.rs
@@ -38,6 +38,5 @@ use proc_macro::TokenStream;
 
 #[proc_macro_derive(RuntimeDebug)]
 pub fn debug_derive(input: TokenStream) -> TokenStream {
-   impls::debug_derive(syn::parse_macro_input!(input))
+	impls::debug_derive(syn::parse_macro_input!(input))
 }
-
diff --git a/primitives/debug-derive/tests/tests.rs b/primitives/debug-derive/tests/tests.rs
index d51d6a05bf21..4f4c7f4caabc 100644
--- a/primitives/debug-derive/tests/tests.rs
+++ b/primitives/debug-derive/tests/tests.rs
@@ -30,33 +30,17 @@ struct Named {
 enum EnumLongName<A> {
 	A,
 	B(A, String),
-	VariantLongName {
-		a: A,
-		b: String,
-	},
+	VariantLongName { a: A, b: String },
 }
 
-
 #[test]
 fn should_display_proper_debug() {
 	use self::EnumLongName as Enum;
 
-	assert_eq!(
-		format!("{:?}", Unnamed(1, "abc".into())),
-		"Unnamed(1, \"abc\")"
-	);
-	assert_eq!(
-		format!("{:?}", Named { a: 1, b: "abc".into() }),
-		"Named { a: 1, b: \"abc\" }"
-	);
-	assert_eq!(
-		format!("{:?}", Enum::<u64>::A),
-		"EnumLongName::A"
-	);
-	assert_eq!(
-		format!("{:?}", Enum::B(1, "abc".into())),
-		"EnumLongName::B(1, \"abc\")"
-	);
+	assert_eq!(format!("{:?}", Unnamed(1, "abc".into())), "Unnamed(1, \"abc\")");
+	assert_eq!(format!("{:?}", Named { a: 1, b: "abc".into() }), "Named { a: 1, b: \"abc\" }");
+	assert_eq!(format!("{:?}", Enum::<u64>::A), "EnumLongName::A");
+	assert_eq!(format!("{:?}", Enum::B(1, "abc".into())), "EnumLongName::B(1, \"abc\")");
 	assert_eq!(
 		format!("{:?}", Enum::VariantLongName { a: 1, b: "abc".into() }),
 		"EnumLongName::VariantLongName { a: 1, b: \"abc\" }"
diff --git a/primitives/externalities/src/extensions.rs b/primitives/externalities/src/extensions.rs
index 69c6c09be448..55b69fde0890 100644
--- a/primitives/externalities/src/extensions.rs
+++ b/primitives/externalities/src/extensions.rs
@@ -22,10 +22,13 @@
 //!
 //! It is required that each extension implements the [`Extension`] trait.
 
+use crate::Error;
 use sp_std::{
-	collections::btree_map::{BTreeMap, Entry}, any::{Any, TypeId}, ops::DerefMut, boxed::Box,
+	any::{Any, TypeId},
+	boxed::Box,
+	collections::btree_map::{BTreeMap, Entry},
+	ops::DerefMut,
 };
-use crate::Error;
 
 /// Marker trait for types that should be registered as [`Externalities`](crate::Externalities) extension.
 ///
@@ -101,7 +104,11 @@ pub trait ExtensionStore {
 	/// Register extension `extension` with specified `type_id`.
 	///
 	/// It should return error if extension is already registered.
-	fn register_extension_with_type_id(&mut self, type_id: TypeId, extension: Box<dyn Extension>) -> Result<(), Error>;
+	fn register_extension_with_type_id(
+		&mut self,
+		type_id: TypeId,
+		extension: Box<dyn Extension>,
+	) -> Result<(), Error>;
 
 	/// Deregister extension with speicifed 'type_id' and drop it.
 	///
@@ -129,10 +136,7 @@ impl Extensions {
 	}
 
 	/// Register the given extension.
-	pub fn register<E: Extension>(
-		&mut self,
-		ext: E,
-	) {
+	pub fn register<E: Extension>(&mut self, ext: E) {
 		let type_id = ext.type_id();
 		self.extensions.insert(type_id, Box::new(ext));
 	}
@@ -154,7 +158,10 @@ impl Extensions {
 
 	/// Return a mutable reference to the requested extension.
 	pub fn get_mut(&mut self, ext_type_id: TypeId) -> Option<&mut dyn Any> {
-		self.extensions.get_mut(&ext_type_id).map(DerefMut::deref_mut).map(Extension::as_mut_any)
+		self.extensions
+			.get_mut(&ext_type_id)
+			.map(DerefMut::deref_mut)
+			.map(Extension::as_mut_any)
 	}
 
 	/// Deregister extension for the given `type_id`.
@@ -165,7 +172,9 @@ impl Extensions {
 	}
 
 	/// Returns a mutable iterator over all extensions.
-	pub fn iter_mut<'a>(&'a mut self) -> impl Iterator<Item = (&'a TypeId, &'a mut Box<dyn Extension>)> {
+	pub fn iter_mut<'a>(
+		&'a mut self,
+	) -> impl Iterator<Item = (&'a TypeId, &'a mut Box<dyn Extension>)> {
 		self.extensions.iter_mut()
 	}
 }
diff --git a/primitives/externalities/src/lib.rs b/primitives/externalities/src/lib.rs
index 80bb5b99f315..b0ec16213b2c 100644
--- a/primitives/externalities/src/lib.rs
+++ b/primitives/externalities/src/lib.rs
@@ -25,12 +25,16 @@
 //!
 //! This crate exposes the main [`Externalities`] trait.
 
-use sp_std::{any::{Any, TypeId}, vec::Vec, boxed::Box};
+use sp_std::{
+	any::{Any, TypeId},
+	boxed::Box,
+	vec::Vec,
+};
 
 use sp_storage::{ChildInfo, TrackedStorageKey};
 
+pub use extensions::{Extension, ExtensionStore, Extensions};
 pub use scope_limited::{set_and_run_with_externalities, with_externalities};
-pub use extensions::{Extension, Extensions, ExtensionStore};
 
 mod extensions;
 mod scope_limited;
@@ -68,20 +72,12 @@ pub trait Externalities: ExtensionStore {
 	/// This may be optimized for large values.
 	///
 	/// Returns an `Option` that holds the SCALE encoded hash.
-	fn child_storage_hash(
-		&self,
-		child_info: &ChildInfo,
-		key: &[u8],
-	) -> Option<Vec<u8>>;
+	fn child_storage_hash(&self, child_info: &ChildInfo, key: &[u8]) -> Option<Vec<u8>>;
 
 	/// Read child runtime storage.
 	///
 	/// Returns an `Option` that holds the SCALE encoded hash.
-	fn child_storage(
-		&self,
-		child_info: &ChildInfo,
-		key: &[u8],
-	) -> Option<Vec<u8>>;
+	fn child_storage(&self, child_info: &ChildInfo, key: &[u8]) -> Option<Vec<u8>>;
 
 	/// Set storage entry `key` of current contract being called (effective immediately).
 	fn set_storage(&mut self, key: Vec<u8>, value: Vec<u8>) {
@@ -89,12 +85,7 @@ pub trait Externalities: ExtensionStore {
 	}
 
 	/// Set child storage entry `key` of current contract being called (effective immediately).
-	fn set_child_storage(
-		&mut self,
-		child_info: &ChildInfo,
-		key: Vec<u8>,
-		value: Vec<u8>,
-	) {
+	fn set_child_storage(&mut self, child_info: &ChildInfo, key: Vec<u8>, value: Vec<u8>) {
 		self.place_child_storage(child_info, key, Some(value))
 	}
 
@@ -104,11 +95,7 @@ pub trait Externalities: ExtensionStore {
 	}
 
 	/// Clear a child storage entry (`key`) of current contract being called (effective immediately).
-	fn clear_child_storage(
-		&mut self,
-		child_info: &ChildInfo,
-		key: &[u8],
-	) {
+	fn clear_child_storage(&mut self, child_info: &ChildInfo, key: &[u8]) {
 		self.place_child_storage(child_info, key.to_vec(), None)
 	}
 
@@ -118,11 +105,7 @@ pub trait Externalities: ExtensionStore {
 	}
 
 	/// Whether a child storage entry exists.
-	fn exists_child_storage(
-		&self,
-		child_info: &ChildInfo,
-		key: &[u8],
-	) -> bool {
+	fn exists_child_storage(&self, child_info: &ChildInfo, key: &[u8]) -> bool {
 		self.child_storage(child_info, key).is_some()
 	}
 
@@ -130,11 +113,7 @@ pub trait Externalities: ExtensionStore {
 	fn next_storage_key(&self, key: &[u8]) -> Option<Vec<u8>>;
 
 	/// Returns the key immediately following the given key, if it exists, in child storage.
-	fn next_child_storage_key(
-		&self,
-		child_info: &ChildInfo,
-		key: &[u8],
-	) -> Option<Vec<u8>>;
+	fn next_child_storage_key(&self, child_info: &ChildInfo, key: &[u8]) -> Option<Vec<u8>>;
 
 	/// Clear an entire child storage.
 	///
@@ -169,12 +148,7 @@ pub trait Externalities: ExtensionStore {
 	fn place_storage(&mut self, key: Vec<u8>, value: Option<Vec<u8>>);
 
 	/// Set or clear a child storage entry.
-	fn place_child_storage(
-		&mut self,
-		child_info: &ChildInfo,
-		key: Vec<u8>,
-		value: Option<Vec<u8>>,
-	);
+	fn place_child_storage(&mut self, child_info: &ChildInfo, key: Vec<u8>, value: Option<Vec<u8>>);
 
 	/// Get the trie root of the current storage map.
 	///
@@ -189,19 +163,12 @@ pub trait Externalities: ExtensionStore {
 	///
 	/// If the storage root equals the default hash as defined by the trie, the key in the top-level
 	/// storage map will be removed.
-	fn child_storage_root(
-		&mut self,
-		child_info: &ChildInfo,
-	) -> Vec<u8>;
+	fn child_storage_root(&mut self, child_info: &ChildInfo) -> Vec<u8>;
 
 	/// Append storage item.
 	///
 	/// This assumes specific format of the storage item. Also there is no way to undo this operation.
-	fn storage_append(
-		&mut self,
-		key: Vec<u8>,
-		value: Vec<u8>,
-	);
+	fn storage_append(&mut self, key: Vec<u8>, value: Vec<u8>);
 
 	/// Get the changes trie root of the current storage overlay at a block with given `parent`.
 	///
diff --git a/primitives/externalities/src/scope_limited.rs b/primitives/externalities/src/scope_limited.rs
index 3b5013ba8e7f..ab8be1f3fc81 100644
--- a/primitives/externalities/src/scope_limited.rs
+++ b/primitives/externalities/src/scope_limited.rs
@@ -25,7 +25,8 @@ environmental::environmental!(ext: trait Externalities);
 /// while executing the given closure [`with_externalities`] grants access to them. The externalities
 /// are only set for the same thread this function was called from.
 pub fn set_and_run_with_externalities<F, R>(ext: &mut dyn Externalities, f: F) -> R
-	where F: FnOnce() -> R
+where
+	F: FnOnce() -> R,
 {
 	ext::using(ext, f)
 }
diff --git a/primitives/finality-grandpa/src/lib.rs b/primitives/finality-grandpa/src/lib.rs
index 5b393bd1d80e..a083796d659c 100644
--- a/primitives/finality-grandpa/src/lib.rs
+++ b/primitives/finality-grandpa/src/lib.rs
@@ -25,12 +25,11 @@ extern crate alloc;
 #[cfg(feature = "std")]
 use serde::Serialize;
 
-use codec::{Encode, Decode, Input, Codec};
-use sp_runtime::{ConsensusEngineId, RuntimeDebug, traits::NumberFor};
-use sp_std::borrow::Cow;
-use sp_std::vec::Vec;
+use codec::{Codec, Decode, Encode, Input};
 #[cfg(feature = "std")]
-use sp_keystore::{SyncCryptoStorePtr, SyncCryptoStore};
+use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr};
+use sp_runtime::{traits::NumberFor, ConsensusEngineId, RuntimeDebug};
+use sp_std::{borrow::Cow, vec::Vec};
 
 #[cfg(feature = "std")]
 use log::debug;
@@ -39,7 +38,7 @@ use log::debug;
 pub const KEY_TYPE: sp_core::crypto::KeyTypeId = sp_application_crypto::key_types::GRANDPA;
 
 mod app {
-	use sp_application_crypto::{app_crypto, key_types::GRANDPA, ed25519};
+	use sp_application_crypto::{app_crypto, ed25519, key_types::GRANDPA};
 	app_crypto!(ed25519, GRANDPA);
 }
 
@@ -181,10 +180,7 @@ impl<H, N> EquivocationProof<H, N> {
 	/// Create a new `EquivocationProof` for the given set id and using the
 	/// given equivocation as proof.
 	pub fn new(set_id: SetId, equivocation: Equivocation<H, N>) -> Self {
-		EquivocationProof {
-			set_id,
-			equivocation,
-		}
+		EquivocationProof { set_id, equivocation }
 	}
 
 	/// Returns the set id at which the equivocation occurred.
@@ -277,7 +273,7 @@ where
 			if $equivocation.first.0.target_hash == $equivocation.second.0.target_hash &&
 				$equivocation.first.0.target_number == $equivocation.second.0.target_number
 			{
-				return false;
+				return false
 			}
 
 			// check signatures on both votes are valid
@@ -297,17 +293,17 @@ where
 				report.set_id,
 			);
 
-			return valid_first && valid_second;
+			return valid_first && valid_second
 		};
 	}
 
 	match report.equivocation {
 		Equivocation::Prevote(equivocation) => {
 			check!(equivocation, grandpa::Message::Prevote);
-		}
+		},
 		Equivocation::Precommit(equivocation) => {
 			check!(equivocation, grandpa::Message::Precommit);
-		}
+		},
 	}
 }
 
@@ -390,8 +386,8 @@ where
 	H: Encode,
 	N: Encode,
 {
-	use sp_core::crypto::Public;
 	use sp_application_crypto::AppKey;
+	use sp_core::crypto::Public;
 	use sp_std::convert::TryInto;
 
 	let encoded = localized_payload(round, set_id, &message);
@@ -400,13 +396,13 @@ where
 		AuthorityId::ID,
 		&public.to_public_crypto_pair(),
 		&encoded[..],
-	).ok().flatten()?.try_into().ok()?;
+	)
+	.ok()
+	.flatten()?
+	.try_into()
+	.ok()?;
 
-	Some(grandpa::SignedMessage {
-		message,
-		signature,
-		id: public,
-	})
+	Some(grandpa::SignedMessage { message, signature, id: public })
 }
 
 /// WASM function call to check for pending changes.
@@ -457,7 +453,7 @@ impl<'a> Decode for VersionedAuthorityList<'a> {
 	fn decode<I: Input>(value: &mut I) -> Result<Self, codec::Error> {
 		let (version, authorities): (u8, AuthorityList) = Decode::decode(value)?;
 		if version != AUTHORITIES_VERSION {
-			return Err("unknown Grandpa authorities version".into());
+			return Err("unknown Grandpa authorities version".into())
 		}
 		Ok(authorities.into())
 	}
diff --git a/primitives/inherents/src/client_side.rs b/primitives/inherents/src/client_side.rs
index 38639c5de322..18877cae5f34 100644
--- a/primitives/inherents/src/client_side.rs
+++ b/primitives/inherents/src/client_side.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::{InherentData, Error, InherentIdentifier};
+use crate::{Error, InherentData, InherentIdentifier};
 use sp_runtime::traits::Block as BlockT;
 
 /// Something that can create inherent data providers.
@@ -44,7 +44,9 @@ impl<F, Block, IDP, ExtraArgs, Fut> CreateInherentDataProviders<Block, ExtraArgs
 where
 	Block: BlockT,
 	F: Fn(Block::Hash, ExtraArgs) -> Fut + Sync + Send,
-	Fut: std::future::Future<Output = Result<IDP, Box<dyn std::error::Error + Send + Sync>>> + Send + 'static,
+	Fut: std::future::Future<Output = Result<IDP, Box<dyn std::error::Error + Send + Sync>>>
+		+ Send
+		+ 'static,
 	IDP: InherentDataProvider + 'static,
 	ExtraArgs: Send + 'static,
 {
diff --git a/primitives/inherents/src/lib.rs b/primitives/inherents/src/lib.rs
index f0b5fdc940a9..922d5d194327 100644
--- a/primitives/inherents/src/lib.rs
+++ b/primitives/inherents/src/lib.rs
@@ -140,7 +140,7 @@
 //! 	let block_production = if is_validator {
 //! 		// For block production we want to provide our inherent data provider
 //! 		cool_consensus_block_production(|_parent, ()| async {
-//!			Ok(InherentDataProvider)
+//! 			Ok(InherentDataProvider)
 //! 		}).boxed()
 //! 	} else {
 //! 		futures::future::pending().boxed()
@@ -162,9 +162,12 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 #![warn(missing_docs)]
 
-use codec::{Encode, Decode};
+use codec::{Decode, Encode};
 
-use sp_std::{collections::btree_map::{BTreeMap, IntoIter, Entry}, vec::Vec};
+use sp_std::{
+	collections::btree_map::{BTreeMap, Entry, IntoIter},
+	vec::Vec,
+};
 
 #[cfg(feature = "std")]
 mod client_side;
@@ -204,7 +207,7 @@ pub type InherentIdentifier = [u8; 8];
 #[derive(Clone, Default, Encode, Decode)]
 pub struct InherentData {
 	/// All inherent data encoded with parity-scale-codec and an identifier.
-	data: BTreeMap<InherentIdentifier, Vec<u8>>
+	data: BTreeMap<InherentIdentifier, Vec<u8>>,
 }
 
 impl InherentData {
@@ -231,20 +234,14 @@ impl InherentData {
 				entry.insert(inherent.encode());
 				Ok(())
 			},
-			Entry::Occupied(_) => {
-				Err(Error::InherentDataExists(identifier))
-			}
+			Entry::Occupied(_) => Err(Error::InherentDataExists(identifier)),
 		}
 	}
 
 	/// Replace the data for an inherent.
 	///
 	/// If it does not exist, the data is just inserted.
-	pub fn replace_data<I: codec::Encode>(
-		&mut self,
-		identifier: InherentIdentifier,
-		inherent: &I,
-	) {
+	pub fn replace_data<I: codec::Encode>(&mut self, identifier: InherentIdentifier, inherent: &I) {
 		self.data.insert(identifier, inherent.encode());
 	}
 
@@ -260,11 +257,10 @@ impl InherentData {
 		identifier: &InherentIdentifier,
 	) -> Result<Option<I>, Error> {
 		match self.data.get(identifier) {
-			Some(inherent) =>
-				I::decode(&mut &inherent[..])
-					.map_err(|e| Error::DecodingFailed(e, *identifier))
-					.map(Some),
-			None => Ok(None)
+			Some(inherent) => I::decode(&mut &inherent[..])
+				.map_err(|e| Error::DecodingFailed(e, *identifier))
+				.map(Some),
+			None => Ok(None),
 		}
 	}
 
@@ -292,11 +288,7 @@ pub struct CheckInherentsResult {
 
 impl Default for CheckInherentsResult {
 	fn default() -> Self {
-		Self {
-			okay: true,
-			errors: InherentData::new(),
-			fatal_error: false,
-		}
+		Self { okay: true, errors: InherentData::new(), fatal_error: false }
 	}
 }
 
@@ -370,8 +362,8 @@ impl CheckInherentsResult {
 impl PartialEq for CheckInherentsResult {
 	fn eq(&self, other: &Self) -> bool {
 		self.fatal_error == other.fatal_error &&
-		self.okay == other.okay &&
-		self.errors.data == other.errors.data
+			self.okay == other.okay &&
+			self.errors.data == other.errors.data
 	}
 }
 
@@ -407,7 +399,7 @@ impl<E: codec::Encode> IsFatalError for MakeFatalError<E> {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use codec::{Encode, Decode};
+	use codec::{Decode, Encode};
 
 	const TEST_INHERENT_0: InherentIdentifier = *b"testinh0";
 	const TEST_INHERENT_1: InherentIdentifier = *b"testinh1";
@@ -470,10 +462,7 @@ mod tests {
 
 		let inherent_data = provider.create_inherent_data().unwrap();
 
-		assert_eq!(
-			inherent_data.get_data::<u32>(&TEST_INHERENT_0).unwrap().unwrap(),
-			42u32,
-		);
+		assert_eq!(inherent_data.get_data::<u32>(&TEST_INHERENT_0).unwrap().unwrap(), 42u32,);
 	}
 
 	#[test]
diff --git a/primitives/io/src/batch_verifier.rs b/primitives/io/src/batch_verifier.rs
index 341df36c5564..b6da1d85907b 100644
--- a/primitives/io/src/batch_verifier.rs
+++ b/primitives/io/src/batch_verifier.rs
@@ -17,9 +17,12 @@
 
 //! Batch/parallel verification.
 
-use sp_core::{ed25519, sr25519, ecdsa, crypto::Pair, traits::SpawnNamed};
-use std::sync::{Arc, atomic::{AtomicBool, Ordering as AtomicOrdering}};
-use futures::{future::FutureExt, channel::oneshot};
+use futures::{channel::oneshot, future::FutureExt};
+use sp_core::{crypto::Pair, ecdsa, ed25519, sr25519, traits::SpawnNamed};
+use std::sync::{
+	atomic::{AtomicBool, Ordering as AtomicOrdering},
+	Arc,
+};
 
 #[derive(Debug, Clone)]
 struct Sr25519BatchItem {
@@ -61,7 +64,9 @@ impl BatchVerifier {
 		name: &'static str,
 	) -> bool {
 		// there is already invalid transaction encountered
-		if self.invalid.load(AtomicOrdering::Relaxed) { return false; }
+		if self.invalid.load(AtomicOrdering::Relaxed) {
+			return false
+		}
 
 		let invalid_clone = self.invalid.clone();
 		let (sender, receiver) = oneshot::channel();
@@ -78,7 +83,8 @@ impl BatchVerifier {
 					log::warn!("Verification halted while result was pending");
 					invalid_clone.store(true, AtomicOrdering::Relaxed);
 				}
-			}.boxed(),
+			}
+			.boxed(),
 		);
 
 		true
@@ -110,7 +116,9 @@ impl BatchVerifier {
 		pub_key: sr25519::Public,
 		message: Vec<u8>,
 	) -> bool {
-		if self.invalid.load(AtomicOrdering::Relaxed) { return false; }
+		if self.invalid.load(AtomicOrdering::Relaxed) {
+			return false
+		}
 		self.sr25519_items.push(Sr25519BatchItem { signature, pub_key, message });
 
 		if self.sr25519_items.len() >= 128 {
@@ -163,7 +171,7 @@ impl BatchVerifier {
 		);
 
 		if !Self::verify_sr25519_batch(std::mem::take(&mut self.sr25519_items)) {
-			return false;
+			return false
 		}
 
 		if pending.len() > 0 {
@@ -172,10 +180,12 @@ impl BatchVerifier {
 				"substrate_batch_verify_join",
 				async move {
 					futures::future::join_all(pending).await;
-					sender.send(())
-						  .expect("Channel never panics if receiver is live. \
-								Receiver is always live until received this data; qed. ");
-				}.boxed(),
+					sender.send(()).expect(
+						"Channel never panics if receiver is live. \
+								Receiver is always live until received this data; qed. ",
+					);
+				}
+				.boxed(),
 			);
 
 			if receiver.recv().is_err() {
@@ -184,7 +194,7 @@ impl BatchVerifier {
 					"Haven't received async result from verification task. Returning false.",
 				);
 
-				return false;
+				return false
 			}
 		}
 
diff --git a/primitives/io/src/lib.rs b/primitives/io/src/lib.rs
index 6fb25df3d02a..d1aa9c489491 100644
--- a/primitives/io/src/lib.rs
+++ b/primitives/io/src/lib.rs
@@ -18,14 +18,16 @@
 //! I/O host interface for substrate runtime.
 
 #![warn(missing_docs)]
-
 #![cfg_attr(not(feature = "std"), no_std)]
 #![cfg_attr(not(feature = "std"), feature(alloc_error_handler))]
-
-#![cfg_attr(feature = "std",
-   doc = "Substrate runtime standard library as compiled when linked with Rust's standard library.")]
-#![cfg_attr(not(feature = "std"),
-   doc = "Substrate's runtime standard library as compiled without Rust's standard library.")]
+#![cfg_attr(
+	feature = "std",
+	doc = "Substrate runtime standard library as compiled when linked with Rust's standard library."
+)]
+#![cfg_attr(
+	not(feature = "std"),
+	doc = "Substrate's runtime standard library as compiled without Rust's standard library."
+)]
 
 use sp_std::vec::Vec;
 
@@ -35,31 +37,35 @@ use tracing;
 #[cfg(feature = "std")]
 use sp_core::{
 	crypto::Pair,
-	traits::{TaskExecutorExt, RuntimeSpawnExt},
-	offchain::{OffchainDbExt, OffchainWorkerExt, TransactionPoolExt},
 	hexdisplay::HexDisplay,
+	offchain::{OffchainDbExt, OffchainWorkerExt, TransactionPoolExt},
 	storage::ChildInfo,
+	traits::{RuntimeSpawnExt, TaskExecutorExt},
 };
 #[cfg(feature = "std")]
 use sp_keystore::{KeystoreExt, SyncCryptoStore};
 
 use sp_core::{
-	OpaquePeerId, crypto::KeyTypeId, ed25519, sr25519, ecdsa, H256, LogLevel, LogLevelFilter,
+	crypto::KeyTypeId,
+	ecdsa, ed25519,
 	offchain::{
-		Timestamp, HttpRequestId, HttpRequestStatus, HttpError, StorageKind, OpaqueNetworkState,
+		HttpError, HttpRequestId, HttpRequestStatus, OpaqueNetworkState, StorageKind, Timestamp,
 	},
+	sr25519, LogLevel, LogLevelFilter, OpaquePeerId, H256,
 };
 
 #[cfg(feature = "std")]
-use sp_trie::{TrieConfiguration, trie_types::Layout};
+use sp_trie::{trie_types::Layout, TrieConfiguration};
 
-use sp_runtime_interface::{runtime_interface, Pointer};
-use sp_runtime_interface::pass_by::{PassBy, PassByCodec};
+use sp_runtime_interface::{
+	pass_by::{PassBy, PassByCodec},
+	runtime_interface, Pointer,
+};
 
-use codec::{Encode, Decode};
+use codec::{Decode, Encode};
 
 #[cfg(feature = "std")]
-use sp_externalities::{ExternalitiesExt, Externalities};
+use sp_externalities::{Externalities, ExternalitiesExt};
 
 #[cfg(feature = "std")]
 mod batch_verifier;
@@ -167,7 +173,6 @@ pub trait Storage {
 		}
 	}
 
-
 	/// Append the encoded `value` to the storage item at `key`.
 	///
 	/// The storage item needs to implement [`EncodeAppend`](codec::EncodeAppend).
@@ -255,11 +260,7 @@ pub trait DefaultChildStorage {
 	///
 	/// Parameter `storage_key` is the unprefixed location of the root of the child trie in the parent trie.
 	/// Result is `None` if the value for `key` in the child storage can not be found.
-	fn get(
-		&self,
-		storage_key: &[u8],
-		key: &[u8],
-	) -> Option<Vec<u8>> {
+	fn get(&self, storage_key: &[u8], key: &[u8]) -> Option<Vec<u8>> {
 		let child_info = ChildInfo::new_default(storage_key);
 		self.child_storage(&child_info, key).map(|s| s.to_vec())
 	}
@@ -279,25 +280,19 @@ pub trait DefaultChildStorage {
 		value_offset: u32,
 	) -> Option<u32> {
 		let child_info = ChildInfo::new_default(storage_key);
-		self.child_storage(&child_info, key)
-			.map(|value| {
-				let value_offset = value_offset as usize;
-				let data = &value[value_offset.min(value.len())..];
-				let written = std::cmp::min(data.len(), value_out.len());
-				value_out[..written].copy_from_slice(&data[..written]);
-				data.len() as u32
-			})
+		self.child_storage(&child_info, key).map(|value| {
+			let value_offset = value_offset as usize;
+			let data = &value[value_offset.min(value.len())..];
+			let written = std::cmp::min(data.len(), value_out.len());
+			value_out[..written].copy_from_slice(&data[..written]);
+			data.len() as u32
+		})
 	}
 
 	/// Set a child storage value.
 	///
 	/// Set `key` to `value` in the child storage denoted by `storage_key`.
-	fn set(
-		&mut self,
-		storage_key: &[u8],
-		key: &[u8],
-		value: &[u8],
-	) {
+	fn set(&mut self, storage_key: &[u8], key: &[u8], value: &[u8]) {
 		let child_info = ChildInfo::new_default(storage_key);
 		self.set_child_storage(&child_info, key.to_vec(), value.to_vec());
 	}
@@ -305,11 +300,7 @@ pub trait DefaultChildStorage {
 	/// Clear a child storage key.
 	///
 	/// For the default child storage at `storage_key`, clear value at `key`.
-	fn clear(
-		&mut self,
-		storage_key: &[u8],
-		key: &[u8],
-	) {
+	fn clear(&mut self, storage_key: &[u8], key: &[u8]) {
 		let child_info = ChildInfo::new_default(storage_key);
 		self.clear_child_storage(&child_info, key);
 	}
@@ -318,10 +309,7 @@ pub trait DefaultChildStorage {
 	///
 	/// If it exists, the child storage for `storage_key`
 	/// is removed.
-	fn storage_kill(
-		&mut self,
-		storage_key: &[u8],
-	) {
+	fn storage_kill(&mut self, storage_key: &[u8]) {
 		let child_info = ChildInfo::new_default(storage_key);
 		self.kill_child_storage(&child_info, None);
 	}
@@ -352,11 +340,7 @@ pub trait DefaultChildStorage {
 	/// Check a child storage key.
 	///
 	/// Check whether the given `key` exists in default child defined at `storage_key`.
-	fn exists(
-		&self,
-		storage_key: &[u8],
-		key: &[u8],
-	) -> bool {
+	fn exists(&self, storage_key: &[u8], key: &[u8]) -> bool {
 		let child_info = ChildInfo::new_default(storage_key);
 		self.exists_child_storage(&child_info, key)
 	}
@@ -364,11 +348,7 @@ pub trait DefaultChildStorage {
 	/// Clear child default key by prefix.
 	///
 	/// Clear the child storage of each key-value pair where the key starts with the given `prefix`.
-	fn clear_prefix(
-		&mut self,
-		storage_key: &[u8],
-		prefix: &[u8],
-	) {
+	fn clear_prefix(&mut self, storage_key: &[u8], prefix: &[u8]) {
 		let child_info = ChildInfo::new_default(storage_key);
 		let _ = self.clear_child_prefix(&child_info, prefix, None);
 	}
@@ -397,10 +377,7 @@ pub trait DefaultChildStorage {
 	/// The hashing algorithm is defined by the `Block`.
 	///
 	/// Returns a `Vec<u8>` that holds the SCALE encoded hash.
-	fn root(
-		&mut self,
-		storage_key: &[u8],
-	) -> Vec<u8> {
+	fn root(&mut self, storage_key: &[u8]) -> Vec<u8> {
 		let child_info = ChildInfo::new_default(storage_key);
 		self.child_storage_root(&child_info)
 	}
@@ -408,11 +385,7 @@ pub trait DefaultChildStorage {
 	/// Child storage key iteration.
 	///
 	/// Get the next key in storage after the given one in lexicographic order in child storage.
-	fn next_key(
-		&mut self,
-		storage_key: &[u8],
-		key: &[u8],
-	) -> Option<Vec<u8>> {
+	fn next_key(&mut self, storage_key: &[u8], key: &[u8]) -> Option<Vec<u8>> {
 		let child_info = ChildInfo::new_default(storage_key);
 		self.next_child_storage_key(&child_info, key)
 	}
@@ -447,7 +420,8 @@ pub trait Trie {
 			&root,
 			proof,
 			&[(key, Some(value))],
-		).is_ok()
+		)
+		.is_ok()
 	}
 
 	/// Verify trie proof
@@ -456,7 +430,8 @@ pub trait Trie {
 			&root,
 			proof,
 			&[(key, Some(value))],
-		).is_ok()
+		)
+		.is_ok()
 	}
 }
 
@@ -516,7 +491,7 @@ pub trait Misc {
 					err,
 				);
 				None
-			}
+			},
 		}
 	}
 }
@@ -526,7 +501,8 @@ pub trait Misc {
 pub trait Crypto {
 	/// Returns all `ed25519` public keys for the given key id from the keystore.
 	fn ed25519_public_keys(&mut self, id: KeyTypeId) -> Vec<ed25519::Public> {
-		let keystore = &***self.extension::<KeystoreExt>()
+		let keystore = &***self
+			.extension::<KeystoreExt>()
 			.expect("No `keystore` associated for the current context!");
 		SyncCryptoStore::ed25519_public_keys(keystore, id)
 	}
@@ -539,7 +515,8 @@ pub trait Crypto {
 	/// Returns the public key.
 	fn ed25519_generate(&mut self, id: KeyTypeId, seed: Option<Vec<u8>>) -> ed25519::Public {
 		let seed = seed.as_ref().map(|s| std::str::from_utf8(&s).expect("Seed is valid utf8!"));
-		let keystore = &***self.extension::<KeystoreExt>()
+		let keystore = &***self
+			.extension::<KeystoreExt>()
 			.expect("No `keystore` associated for the current context!");
 		SyncCryptoStore::ed25519_generate_new(keystore, id, seed)
 			.expect("`ed25519_generate` failed")
@@ -555,7 +532,8 @@ pub trait Crypto {
 		pub_key: &ed25519::Public,
 		msg: &[u8],
 	) -> Option<ed25519::Signature> {
-		let keystore = &***self.extension::<KeystoreExt>()
+		let keystore = &***self
+			.extension::<KeystoreExt>()
 			.expect("No `keystore` associated for the current context!");
 		SyncCryptoStore::sign_with(keystore, id, &pub_key.into(), msg)
 			.ok()
@@ -566,11 +544,7 @@ pub trait Crypto {
 	/// Verify `ed25519` signature.
 	///
 	/// Returns `true` when the verification was successful.
-	fn ed25519_verify(
-		sig: &ed25519::Signature,
-		msg: &[u8],
-		pub_key: &ed25519::Public,
-	) -> bool {
+	fn ed25519_verify(sig: &ed25519::Signature, msg: &[u8], pub_key: &ed25519::Public) -> bool {
 		ed25519::Pair::verify(sig, msg, pub_key)
 	}
 
@@ -588,20 +562,16 @@ pub trait Crypto {
 		msg: &[u8],
 		pub_key: &ed25519::Public,
 	) -> bool {
-		self.extension::<VerificationExt>().map(
-			|extension| extension.push_ed25519(sig.clone(), pub_key.clone(), msg.to_vec())
-		).unwrap_or_else(|| ed25519_verify(sig, msg, pub_key))
+		self.extension::<VerificationExt>()
+			.map(|extension| extension.push_ed25519(sig.clone(), pub_key.clone(), msg.to_vec()))
+			.unwrap_or_else(|| ed25519_verify(sig, msg, pub_key))
 	}
 
 	/// Verify `sr25519` signature.
 	///
 	/// Returns `true` when the verification was successful.
 	#[version(2)]
-	fn sr25519_verify(
-		sig: &sr25519::Signature,
-		msg: &[u8],
-		pub_key: &sr25519::Public,
-	) -> bool {
+	fn sr25519_verify(sig: &sr25519::Signature, msg: &[u8], pub_key: &sr25519::Public) -> bool {
 		sr25519::Pair::verify(sig, msg, pub_key)
 	}
 
@@ -619,14 +589,15 @@ pub trait Crypto {
 		msg: &[u8],
 		pub_key: &sr25519::Public,
 	) -> bool {
-		self.extension::<VerificationExt>().map(
-			|extension| extension.push_sr25519(sig.clone(), pub_key.clone(), msg.to_vec())
-		).unwrap_or_else(|| sr25519_verify(sig, msg, pub_key))
+		self.extension::<VerificationExt>()
+			.map(|extension| extension.push_sr25519(sig.clone(), pub_key.clone(), msg.to_vec()))
+			.unwrap_or_else(|| sr25519_verify(sig, msg, pub_key))
 	}
 
 	/// Start verification extension.
 	fn start_batch_verify(&mut self) {
-		let scheduler = self.extension::<TaskExecutorExt>()
+		let scheduler = self
+			.extension::<TaskExecutorExt>()
 			.expect("No task executor associated with the current context!")
 			.clone();
 
@@ -641,7 +612,8 @@ pub trait Crypto {
 	///
 	/// Will panic if no `VerificationExt` is registered (`start_batch_verify` was not called).
 	fn finish_batch_verify(&mut self) -> bool {
-		let result = self.extension::<VerificationExt>()
+		let result = self
+			.extension::<VerificationExt>()
 			.expect("`finish_batch_verify` should only be called after `start_batch_verify`")
 			.verify_and_clear();
 
@@ -653,7 +625,8 @@ pub trait Crypto {
 
 	/// Returns all `sr25519` public keys for the given key id from the keystore.
 	fn sr25519_public_keys(&mut self, id: KeyTypeId) -> Vec<sr25519::Public> {
-		let keystore = &*** self.extension::<KeystoreExt>()
+		let keystore = &***self
+			.extension::<KeystoreExt>()
 			.expect("No `keystore` associated for the current context!");
 		SyncCryptoStore::sr25519_public_keys(keystore, id)
 	}
@@ -666,7 +639,8 @@ pub trait Crypto {
 	/// Returns the public key.
 	fn sr25519_generate(&mut self, id: KeyTypeId, seed: Option<Vec<u8>>) -> sr25519::Public {
 		let seed = seed.as_ref().map(|s| std::str::from_utf8(&s).expect("Seed is valid utf8!"));
-		let keystore = &***self.extension::<KeystoreExt>()
+		let keystore = &***self
+			.extension::<KeystoreExt>()
 			.expect("No `keystore` associated for the current context!");
 		SyncCryptoStore::sr25519_generate_new(keystore, id, seed)
 			.expect("`sr25519_generate` failed")
@@ -682,7 +656,8 @@ pub trait Crypto {
 		pub_key: &sr25519::Public,
 		msg: &[u8],
 	) -> Option<sr25519::Signature> {
-		let keystore = &***self.extension::<KeystoreExt>()
+		let keystore = &***self
+			.extension::<KeystoreExt>()
 			.expect("No `keystore` associated for the current context!");
 		SyncCryptoStore::sign_with(keystore, id, &pub_key.into(), msg)
 			.ok()
@@ -700,7 +675,8 @@ pub trait Crypto {
 
 	/// Returns all `ecdsa` public keys for the given key id from the keystore.
 	fn ecdsa_public_keys(&mut self, id: KeyTypeId) -> Vec<ecdsa::Public> {
-		let keystore = &***self.extension::<KeystoreExt>()
+		let keystore = &***self
+			.extension::<KeystoreExt>()
 			.expect("No `keystore` associated for the current context!");
 		SyncCryptoStore::ecdsa_public_keys(keystore, id)
 	}
@@ -713,10 +689,10 @@ pub trait Crypto {
 	/// Returns the public key.
 	fn ecdsa_generate(&mut self, id: KeyTypeId, seed: Option<Vec<u8>>) -> ecdsa::Public {
 		let seed = seed.as_ref().map(|s| std::str::from_utf8(&s).expect("Seed is valid utf8!"));
-		let keystore = &***self.extension::<KeystoreExt>()
+		let keystore = &***self
+			.extension::<KeystoreExt>()
 			.expect("No `keystore` associated for the current context!");
-		SyncCryptoStore::ecdsa_generate_new(keystore, id, seed)
-			.expect("`ecdsa_generate` failed")
+		SyncCryptoStore::ecdsa_generate_new(keystore, id, seed).expect("`ecdsa_generate` failed")
 	}
 
 	/// Sign the given `msg` with the `ecdsa` key that corresponds to the given public key and
@@ -729,7 +705,8 @@ pub trait Crypto {
 		pub_key: &ecdsa::Public,
 		msg: &[u8],
 	) -> Option<ecdsa::Signature> {
-		let keystore = &***self.extension::<KeystoreExt>()
+		let keystore = &***self
+			.extension::<KeystoreExt>()
 			.expect("No `keystore` associated for the current context!");
 		SyncCryptoStore::sign_with(keystore, id, &pub_key.into(), msg)
 			.ok()
@@ -740,11 +717,7 @@ pub trait Crypto {
 	/// Verify `ecdsa` signature.
 	///
 	/// Returns `true` when the verification was successful.
-	fn ecdsa_verify(
-		sig: &ecdsa::Signature,
-		msg: &[u8],
-		pub_key: &ecdsa::Public,
-	) -> bool {
+	fn ecdsa_verify(sig: &ecdsa::Signature, msg: &[u8], pub_key: &ecdsa::Public) -> bool {
 		ecdsa::Pair::verify(sig, msg, pub_key)
 	}
 
@@ -762,9 +735,9 @@ pub trait Crypto {
 		msg: &[u8],
 		pub_key: &ecdsa::Public,
 	) -> bool {
-		self.extension::<VerificationExt>().map(
-			|extension| extension.push_ecdsa(sig.clone(), pub_key.clone(), msg.to_vec())
-		).unwrap_or_else(|| ecdsa_verify(sig, msg, pub_key))
+		self.extension::<VerificationExt>()
+			.map(|extension| extension.push_ecdsa(sig.clone(), pub_key.clone(), msg.to_vec()))
+			.unwrap_or_else(|| ecdsa_verify(sig, msg, pub_key))
 	}
 
 	/// Verify and recover a SECP256k1 ECDSA signature.
@@ -778,10 +751,11 @@ pub trait Crypto {
 		sig: &[u8; 65],
 		msg: &[u8; 32],
 	) -> Result<[u8; 64], EcdsaVerifyError> {
-		let rs = secp256k1::Signature::parse_slice(&sig[0..64])
-			.map_err(|_| EcdsaVerifyError::BadRS)?;
-		let v = secp256k1::RecoveryId::parse(if sig[64] > 26 { sig[64] - 27 } else { sig[64] } as u8)
-			.map_err(|_| EcdsaVerifyError::BadV)?;
+		let rs =
+			secp256k1::Signature::parse_slice(&sig[0..64]).map_err(|_| EcdsaVerifyError::BadRS)?;
+		let v =
+			secp256k1::RecoveryId::parse(if sig[64] > 26 { sig[64] - 27 } else { sig[64] } as u8)
+				.map_err(|_| EcdsaVerifyError::BadV)?;
 		let pubkey = secp256k1::recover(&secp256k1::Message::parse(msg), &rs, &v)
 			.map_err(|_| EcdsaVerifyError::BadSignature)?;
 		let mut res = [0u8; 64];
@@ -799,10 +773,11 @@ pub trait Crypto {
 		sig: &[u8; 65],
 		msg: &[u8; 32],
 	) -> Result<[u8; 33], EcdsaVerifyError> {
-		let rs = secp256k1::Signature::parse_slice(&sig[0..64])
-			.map_err(|_| EcdsaVerifyError::BadRS)?;
-		let v = secp256k1::RecoveryId::parse(if sig[64] > 26 { sig[64] - 27 } else { sig[64] } as u8)
-			.map_err(|_| EcdsaVerifyError::BadV)?;
+		let rs =
+			secp256k1::Signature::parse_slice(&sig[0..64]).map_err(|_| EcdsaVerifyError::BadRS)?;
+		let v =
+			secp256k1::RecoveryId::parse(if sig[64] > 26 { sig[64] - 27 } else { sig[64] } as u8)
+				.map_err(|_| EcdsaVerifyError::BadV)?;
 		let pubkey = secp256k1::recover(&secp256k1::Message::parse(msg), &rs, &v)
 			.map_err(|_| EcdsaVerifyError::BadSignature)?;
 		Ok(pubkey.serialize_compressed())
@@ -907,8 +882,10 @@ pub trait Offchain {
 	/// The transaction will end up in the pool.
 	fn submit_transaction(&mut self, data: Vec<u8>) -> Result<(), ()> {
 		self.extension::<TransactionPoolExt>()
-			.expect("submit_transaction can be called only in the offchain call context with
-				TransactionPool capabilities enabled")
+			.expect(
+				"submit_transaction can be called only in the offchain call context with
+				TransactionPool capabilities enabled",
+			)
 			.submit_transaction(data)
 	}
 
@@ -949,8 +926,10 @@ pub trait Offchain {
 	/// offchain worker tasks running on the same machine. It IS persisted between runs.
 	fn local_storage_set(&mut self, kind: StorageKind, key: &[u8], value: &[u8]) {
 		self.extension::<OffchainDbExt>()
-			.expect("local_storage_set can be called only in the offchain call context with
-				OffchainDb extension")
+			.expect(
+				"local_storage_set can be called only in the offchain call context with
+				OffchainDb extension",
+			)
 			.local_storage_set(kind, key, value)
 	}
 
@@ -960,8 +939,10 @@ pub trait Offchain {
 	/// offchain worker tasks running on the same machine. It IS persisted between runs.
 	fn local_storage_clear(&mut self, kind: StorageKind, key: &[u8]) {
 		self.extension::<OffchainDbExt>()
-			.expect("local_storage_clear can be called only in the offchain call context with
-				OffchainDb extension")
+			.expect(
+				"local_storage_clear can be called only in the offchain call context with
+				OffchainDb extension",
+			)
 			.local_storage_clear(kind, key)
 	}
 
@@ -982,14 +963,11 @@ pub trait Offchain {
 		new_value: &[u8],
 	) -> bool {
 		self.extension::<OffchainDbExt>()
-			.expect("local_storage_compare_and_set can be called only in the offchain call context
-				with OffchainDb extension")
-			.local_storage_compare_and_set(
-				kind,
-				key,
-				old_value.as_deref(),
-				new_value,
+			.expect(
+				"local_storage_compare_and_set can be called only in the offchain call context
+				with OffchainDb extension",
 			)
+			.local_storage_compare_and_set(kind, key, old_value.as_deref(), new_value)
 	}
 
 	/// Gets a value from the local storage.
@@ -999,8 +977,10 @@ pub trait Offchain {
 	/// offchain worker tasks running on the same machine. It IS persisted between runs.
 	fn local_storage_get(&mut self, kind: StorageKind, key: &[u8]) -> Option<Vec<u8>> {
 		self.extension::<OffchainDbExt>()
-			.expect("local_storage_get can be called only in the offchain call context with
-				OffchainDb extension")
+			.expect(
+				"local_storage_get can be called only in the offchain call context with
+				OffchainDb extension",
+			)
 			.local_storage_get(kind, key)
 	}
 
@@ -1128,12 +1108,7 @@ pub trait Logging {
 	/// Instead of using directly, prefer setting up `RuntimeLogger` and using `log` macros.
 	fn log(level: LogLevel, target: &str, message: &[u8]) {
 		if let Ok(message) = std::str::from_utf8(message) {
-			log::log!(
-				target: target,
-				log::Level::from(level),
-				"{}",
-				message,
-			)
+			log::log!(target: target, log::Level::from(level), "{}", message,)
 		}
 	}
 
@@ -1153,7 +1128,6 @@ impl<T: Encode + Decode> PassBy for Crossing<T> {
 }
 
 impl<T: Encode + Decode> Crossing<T> {
-
 	/// Convert into the inner type
 	pub fn into_inner(self) -> T {
 		self.0
@@ -1162,12 +1136,12 @@ impl<T: Encode + Decode> Crossing<T> {
 
 // useful for testing
 impl<T> core::default::Default for Crossing<T>
-	where T: core::default::Default + Encode + Decode
+where
+	T: core::default::Default + Encode + Decode,
 {
 	fn default() -> Self {
 		Self(Default::default())
 	}
-
 }
 
 /// Interface to provide tracing facilities for wasm. Modelled after tokios `tracing`-crate
@@ -1184,9 +1158,7 @@ pub trait WasmTracing {
 	/// chose to cache the result for the execution of the entire block.
 	fn enabled(&mut self, metadata: Crossing<sp_tracing::WasmMetadata>) -> bool {
 		let metadata: &tracing_core::metadata::Metadata<'static> = (&metadata.into_inner()).into();
-		tracing::dispatcher::get_default(|d| {
-			d.enabled(metadata)
-		})
+		tracing::dispatcher::get_default(|d| d.enabled(metadata))
 	}
 
 	/// Open a new span with the given attributes. Return the u64 Id of the span.
@@ -1205,9 +1177,7 @@ pub trait WasmTracing {
 				d.enter(&final_id);
 				final_id.into_u64()
 			}),
-			_ => {
-				0
-			}
+			_ => 0,
 		}
 	}
 
@@ -1226,19 +1196,18 @@ pub trait WasmTracing {
 	}
 }
 
-#[cfg(all(not(feature="std"), feature="with-tracing"))]
+#[cfg(all(not(feature = "std"), feature = "with-tracing"))]
 mod tracing_setup {
+	use super::{wasm_tracing, Crossing};
 	use core::sync::atomic::{AtomicBool, Ordering};
 	use tracing_core::{
-		dispatcher::{Dispatch, set_global_default},
-		span::{Id, Record, Attributes},
-		Metadata, Event,
+		dispatcher::{set_global_default, Dispatch},
+		span::{Attributes, Id, Record},
+		Event, Metadata,
 	};
-	use super::{wasm_tracing, Crossing};
 
 	static TRACING_SET: AtomicBool = AtomicBool::new(false);
 
-
 	/// The PassingTracingSubscriber implements `tracing_core::Subscriber`
 	/// and pushes the information across the runtime interface to the host
 	struct PassingTracingSubsciber;
@@ -1256,12 +1225,12 @@ mod tracing_setup {
 		/// Not implemented! We do not support recording values later
 		/// Will panic when used.
 		fn record(&self, span: &Id, values: &Record<'_>) {
-			unimplemented!{} // this usage is not supported
+			unimplemented! {} // this usage is not supported
 		}
 		/// Not implemented! We do not support recording values later
 		/// Will panic when used.
 		fn record_follows_from(&self, span: &Id, follows: &Id) {
-			unimplemented!{ } // this usage is not supported
+			unimplemented! {} // this usage is not supported
 		}
 		fn event(&self, event: &Event<'_>) {
 			wasm_tracing::event(Crossing(event.into()))
@@ -1271,7 +1240,6 @@ mod tracing_setup {
 		}
 	}
 
-
 	/// Initialize tracing of sp_tracing on wasm with `with-tracing` enabled.
 	/// Can be called multiple times from within the same process and will only
 	/// set the global bridging subscriber once.
@@ -1284,11 +1252,11 @@ mod tracing_setup {
 	}
 }
 
-#[cfg(not(all(not(feature="std"), feature="with-tracing")))]
+#[cfg(not(all(not(feature = "std"), feature = "with-tracing")))]
 mod tracing_setup {
 	/// Initialize tracing of sp_tracing not necessary – noop. To enable build
 	/// without std and with the `with-tracing`-feature.
-	pub fn init_tracing() { }
+	pub fn init_tracing() {}
 }
 
 pub use tracing_setup::init_tracing;
@@ -1319,14 +1287,16 @@ pub trait Sandbox {
 		return_val_len: u32,
 		state_ptr: Pointer<u8>,
 	) -> u32 {
-		self.sandbox().invoke(
-			instance_idx,
-			&function,
-			&args,
-			return_val_ptr,
-			return_val_len,
-			state_ptr.into(),
-		).expect("Failed to invoke function with sandbox")
+		self.sandbox()
+			.invoke(
+				instance_idx,
+				&function,
+				&args,
+				return_val_ptr,
+				return_val_len,
+				state_ptr.into(),
+			)
+			.expect("Failed to invoke function with sandbox")
 	}
 
 	/// Create a new memory instance with the given `initial` and `maximum` size.
@@ -1364,20 +1334,30 @@ pub trait Sandbox {
 
 	/// Teardown the memory instance with the given `memory_idx`.
 	fn memory_teardown(&mut self, memory_idx: u32) {
-		self.sandbox().memory_teardown(memory_idx).expect("Failed to teardown memory with sandbox")
+		self.sandbox()
+			.memory_teardown(memory_idx)
+			.expect("Failed to teardown memory with sandbox")
 	}
 
 	/// Teardown the sandbox instance with the given `instance_idx`.
 	fn instance_teardown(&mut self, instance_idx: u32) {
-		self.sandbox().instance_teardown(instance_idx).expect("Failed to teardown sandbox instance")
+		self.sandbox()
+			.instance_teardown(instance_idx)
+			.expect("Failed to teardown sandbox instance")
 	}
 
 	/// Get the value from a global with the given `name`. The sandbox is determined by the given
 	/// `instance_idx`.
 	///
 	/// Returns `Some(_)` when the requested global variable could be found.
-	fn get_global_val(&mut self, instance_idx: u32, name: &str) -> Option<sp_wasm_interface::Value> {
-		self.sandbox().get_global_val(instance_idx, name).expect("Failed to get global from sandbox")
+	fn get_global_val(
+		&mut self,
+		instance_idx: u32,
+		name: &str,
+	) -> Option<sp_wasm_interface::Value> {
+		self.sandbox()
+			.get_global_val(instance_idx, name)
+			.expect("Failed to get global from sandbox")
 	}
 }
 
@@ -1390,11 +1370,13 @@ pub trait RuntimeTasks {
 	///
 	/// This should not be used directly. Use `sp_tasks::spawn` instead.
 	fn spawn(dispatcher_ref: u32, entry: u32, payload: Vec<u8>) -> u64 {
-		sp_externalities::with_externalities(|mut ext|{
-			let runtime_spawn = ext.extension::<RuntimeSpawnExt>()
+		sp_externalities::with_externalities(|mut ext| {
+			let runtime_spawn = ext
+				.extension::<RuntimeSpawnExt>()
 				.expect("Cannot spawn without dynamic runtime dispatcher (RuntimeSpawnExt)");
 			runtime_spawn.spawn_call(dispatcher_ref, entry, payload)
-		}).expect("`RuntimeTasks::spawn`: called outside of externalities context")
+		})
+		.expect("`RuntimeTasks::spawn`: called outside of externalities context")
 	}
 
 	/// Wasm host function for joining a task.
@@ -1402,12 +1384,14 @@ pub trait RuntimeTasks {
 	/// This should not be used directly. Use `join` of `sp_tasks::spawn` result instead.
 	fn join(handle: u64) -> Vec<u8> {
 		sp_externalities::with_externalities(|mut ext| {
-			let runtime_spawn = ext.extension::<RuntimeSpawnExt>()
+			let runtime_spawn = ext
+				.extension::<RuntimeSpawnExt>()
 				.expect("Cannot join without dynamic runtime dispatcher (RuntimeSpawnExt)");
 			runtime_spawn.join(handle)
-		}).expect("`RuntimeTasks::join`: called outside of externalities context")
+		})
+		.expect("`RuntimeTasks::join`: called outside of externalities context")
 	}
- }
+}
 
 /// Allocator used by Substrate when executing the Wasm runtime.
 #[cfg(not(feature = "std"))]
@@ -1483,10 +1467,8 @@ pub type SubstrateHostFunctions = (
 #[cfg(test)]
 mod tests {
 	use super::*;
+	use sp_core::{map, storage::Storage, testing::TaskExecutor, traits::TaskExecutorExt};
 	use sp_state_machine::BasicExternalities;
-	use sp_core::{
-		storage::Storage, map, traits::TaskExecutorExt, testing::TaskExecutor,
-	};
 	use std::any::TypeId;
 
 	#[test]
@@ -1542,7 +1524,10 @@ mod tests {
 		});
 
 		t.execute_with(|| {
-			assert!(matches!(storage::clear_prefix(b":abc", None), KillStorageResult::AllRemoved(2)));
+			assert!(matches!(
+				storage::clear_prefix(b":abc", None),
+				KillStorageResult::AllRemoved(2)
+			));
 
 			assert!(storage::get(b":a").is_some());
 			assert!(storage::get(b":abdd").is_some());
@@ -1583,11 +1568,7 @@ mod tests {
 			}
 
 			// push invlaid
-			crypto::sr25519_batch_verify(
-				&Default::default(),
-				&Vec::new(),
-				&Default::default(),
-			);
+			crypto::sr25519_batch_verify(&Default::default(), &Vec::new(), &Default::default());
 			assert!(!crypto::finish_batch_verify());
 
 			crypto::start_batch_verify();
@@ -1607,11 +1588,7 @@ mod tests {
 		ext.execute_with(|| {
 			// invalid ed25519 signature
 			crypto::start_batch_verify();
-			crypto::ed25519_batch_verify(
-				&Default::default(),
-				&Vec::new(),
-				&Default::default(),
-			);
+			crypto::ed25519_batch_verify(&Default::default(), &Vec::new(), &Default::default());
 			assert!(!crypto::finish_batch_verify());
 
 			// 2 valid ed25519 signatures
@@ -1637,11 +1614,7 @@ mod tests {
 			let signature = pair.sign(msg);
 			crypto::ed25519_batch_verify(&signature, msg, &pair.public());
 
-			crypto::ed25519_batch_verify(
-				&Default::default(),
-				&Vec::new(),
-				&Default::default(),
-			);
+			crypto::ed25519_batch_verify(&Default::default(), &Vec::new(), &Default::default());
 
 			assert!(!crypto::finish_batch_verify());
 
@@ -1673,11 +1646,7 @@ mod tests {
 			let signature = pair.sign(msg);
 			crypto::sr25519_batch_verify(&signature, msg, &pair.public());
 
-			crypto::sr25519_batch_verify(
-				&Default::default(),
-				&Vec::new(),
-				&Default::default(),
-			);
+			crypto::sr25519_batch_verify(&Default::default(), &Vec::new(), &Default::default());
 
 			assert!(!crypto::finish_batch_verify());
 		});
diff --git a/primitives/keyring/src/ed25519.rs b/primitives/keyring/src/ed25519.rs
index c9dd70d63d5c..65341a360579 100644
--- a/primitives/keyring/src/ed25519.rs
+++ b/primitives/keyring/src/ed25519.rs
@@ -17,11 +17,14 @@
 
 //! Support code for the runtime. A set of test accounts.
 
-use std::{collections::HashMap, ops::Deref};
 use lazy_static::lazy_static;
-use sp_core::{ed25519::{Pair, Public, Signature}, Pair as PairT, Public as PublicT, H256};
 pub use sp_core::ed25519;
+use sp_core::{
+	ed25519::{Pair, Public, Signature},
+	Pair as PairT, Public as PublicT, H256,
+};
 use sp_runtime::AccountId32;
+use std::{collections::HashMap, ops::Deref};
 
 /// Set of test accounts.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, strum::Display, strum::EnumIter)]
@@ -79,7 +82,7 @@ impl Keyring {
 	}
 
 	/// Returns an iterator over all test accounts.
-	pub fn iter() -> impl Iterator<Item=Keyring> {
+	pub fn iter() -> impl Iterator<Item = Keyring> {
 		<Self as strum::IntoEnumIterator>::iter()
 	}
 
@@ -114,13 +117,10 @@ impl From<Keyring> for sp_runtime::MultiSigner {
 }
 
 lazy_static! {
-	static ref PRIVATE_KEYS: HashMap<Keyring, Pair> = {
-		Keyring::iter().map(|i| (i, i.pair())).collect()
-	};
-
-	static ref PUBLIC_KEYS: HashMap<Keyring, Public> = {
-		PRIVATE_KEYS.iter().map(|(&name, pair)| (name, pair.public())).collect()
-	};
+	static ref PRIVATE_KEYS: HashMap<Keyring, Pair> =
+		Keyring::iter().map(|i| (i, i.pair())).collect();
+	static ref PUBLIC_KEYS: HashMap<Keyring, Public> =
+		PRIVATE_KEYS.iter().map(|(&name, pair)| (name, pair.public())).collect();
 }
 
 impl From<Keyring> for Public {
@@ -185,26 +185,20 @@ mod tests {
 
 	#[test]
 	fn should_work() {
-		assert!(
-			Pair::verify(
-				&Keyring::Alice.sign(b"I am Alice!"),
-				b"I am Alice!",
-				&Keyring::Alice.public(),
-			)
-		);
-		assert!(
-			!Pair::verify(
-				&Keyring::Alice.sign(b"I am Alice!"),
-				b"I am Bob!",
-				&Keyring::Alice.public(),
-			)
-		);
-		assert!(
-			!Pair::verify(
-				&Keyring::Alice.sign(b"I am Alice!"),
-				b"I am Alice!",
-				&Keyring::Bob.public(),
-			)
-		);
+		assert!(Pair::verify(
+			&Keyring::Alice.sign(b"I am Alice!"),
+			b"I am Alice!",
+			&Keyring::Alice.public(),
+		));
+		assert!(!Pair::verify(
+			&Keyring::Alice.sign(b"I am Alice!"),
+			b"I am Bob!",
+			&Keyring::Alice.public(),
+		));
+		assert!(!Pair::verify(
+			&Keyring::Alice.sign(b"I am Alice!"),
+			b"I am Alice!",
+			&Keyring::Bob.public(),
+		));
 	}
 }
diff --git a/primitives/keyring/src/sr25519.rs b/primitives/keyring/src/sr25519.rs
index a4f43be07f07..6a7aa3635a43 100644
--- a/primitives/keyring/src/sr25519.rs
+++ b/primitives/keyring/src/sr25519.rs
@@ -17,12 +17,14 @@
 
 //! Support code for the runtime. A set of test accounts.
 
-use std::collections::HashMap;
-use std::ops::Deref;
 use lazy_static::lazy_static;
-use sp_core::{sr25519::{Pair, Public, Signature}, Pair as PairT, Public as PublicT, H256};
 pub use sp_core::sr25519;
+use sp_core::{
+	sr25519::{Pair, Public, Signature},
+	Pair as PairT, Public as PublicT, H256,
+};
 use sp_runtime::AccountId32;
+use std::{collections::HashMap, ops::Deref};
 
 /// Set of test accounts.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, strum::Display, strum::EnumIter)]
@@ -80,7 +82,7 @@ impl Keyring {
 	}
 
 	/// Returns an iterator over all test accounts.
-	pub fn iter() -> impl Iterator<Item=Keyring> {
+	pub fn iter() -> impl Iterator<Item = Keyring> {
 		<Self as strum::IntoEnumIterator>::iter()
 	}
 
@@ -135,19 +137,16 @@ impl std::str::FromStr for Keyring {
 			"ferdie" => Ok(Keyring::Ferdie),
 			"one" => Ok(Keyring::One),
 			"two" => Ok(Keyring::Two),
-			_ => Err(ParseKeyringError)
+			_ => Err(ParseKeyringError),
 		}
 	}
 }
 
 lazy_static! {
-	static ref PRIVATE_KEYS: HashMap<Keyring, Pair> = {
-		Keyring::iter().map(|i| (i, i.pair())).collect()
-	};
-
-	static ref PUBLIC_KEYS: HashMap<Keyring, Public> = {
-		PRIVATE_KEYS.iter().map(|(&name, pair)| (name, pair.public())).collect()
-	};
+	static ref PRIVATE_KEYS: HashMap<Keyring, Pair> =
+		Keyring::iter().map(|i| (i, i.pair())).collect();
+	static ref PUBLIC_KEYS: HashMap<Keyring, Public> =
+		PRIVATE_KEYS.iter().map(|(&name, pair)| (name, pair.public())).collect();
 }
 
 impl From<Keyring> for AccountId32 {
@@ -212,26 +211,20 @@ mod tests {
 
 	#[test]
 	fn should_work() {
-		assert!(
-			Pair::verify(
-				&Keyring::Alice.sign(b"I am Alice!"),
-				b"I am Alice!",
-				&Keyring::Alice.public(),
-			)
-		);
-		assert!(
-			!Pair::verify(
-				&Keyring::Alice.sign(b"I am Alice!"),
-				b"I am Bob!",
-				&Keyring::Alice.public(),
-			)
-		);
-		assert!(
-			!Pair::verify(
-				&Keyring::Alice.sign(b"I am Alice!"),
-				b"I am Alice!",
-				&Keyring::Bob.public(),
-			)
-		);
+		assert!(Pair::verify(
+			&Keyring::Alice.sign(b"I am Alice!"),
+			b"I am Alice!",
+			&Keyring::Alice.public(),
+		));
+		assert!(!Pair::verify(
+			&Keyring::Alice.sign(b"I am Alice!"),
+			b"I am Bob!",
+			&Keyring::Alice.public(),
+		));
+		assert!(!Pair::verify(
+			&Keyring::Alice.sign(b"I am Alice!"),
+			b"I am Alice!",
+			&Keyring::Bob.public(),
+		));
 	}
 }
diff --git a/primitives/keystore/src/lib.rs b/primitives/keystore/src/lib.rs
index cccb390d34ba..c45e8a6f5d2b 100644
--- a/primitives/keystore/src/lib.rs
+++ b/primitives/keystore/src/lib.rs
@@ -19,30 +19,30 @@
 pub mod testing;
 pub mod vrf;
 
-use std::sync::Arc;
+use crate::vrf::{VRFSignature, VRFTranscriptData};
 use async_trait::async_trait;
 use futures::{executor::block_on, future::join_all};
 use sp_core::{
-	crypto::{KeyTypeId, CryptoTypePublicPair},
-	ed25519, sr25519, ecdsa,
+	crypto::{CryptoTypePublicPair, KeyTypeId},
+	ecdsa, ed25519, sr25519,
 };
-use crate::vrf::{VRFTranscriptData, VRFSignature};
+use std::sync::Arc;
 
 /// CryptoStore error
 #[derive(Debug, derive_more::Display)]
 pub enum Error {
 	/// Public key type is not supported
-	#[display(fmt="Key not supported: {:?}", _0)]
+	#[display(fmt = "Key not supported: {:?}", _0)]
 	KeyNotSupported(KeyTypeId),
 	/// Validation error
-	#[display(fmt="Validation error: {}", _0)]
+	#[display(fmt = "Validation error: {}", _0)]
 	ValidationError(String),
 	/// Keystore unavailable
-	#[display(fmt="Keystore unavailable")]
+	#[display(fmt = "Keystore unavailable")]
 	Unavailable,
 	/// Programming errors
-	#[display(fmt="An unknown keystore error occurred: {}", _0)]
-	Other(String)
+	#[display(fmt = "An unknown keystore error occurred: {}", _0)]
+	Other(String),
 }
 
 /// Something that generates, stores and provides access to keys.
@@ -91,12 +91,7 @@ pub trait CryptoStore: Send + Sync {
 	/// Places it into the file system store.
 	///
 	/// `Err` if there's some sort of weird filesystem error, but should generally be `Ok`.
-	async fn insert_unknown(
-		&self,
-		id: KeyTypeId,
-		suri: &str,
-		public: &[u8]
-	) -> Result<(), ()>;
+	async fn insert_unknown(&self, id: KeyTypeId, suri: &str, public: &[u8]) -> Result<(), ()>;
 
 	/// Find intersection between provided keys and supported keys
 	///
@@ -105,7 +100,7 @@ pub trait CryptoStore: Send + Sync {
 	async fn supported_keys(
 		&self,
 		id: KeyTypeId,
-		keys: Vec<CryptoTypePublicPair>
+		keys: Vec<CryptoTypePublicPair>,
 	) -> Result<Vec<CryptoTypePublicPair>, Error>;
 	/// List all supported keys
 	///
@@ -142,14 +137,14 @@ pub trait CryptoStore: Send + Sync {
 		&self,
 		id: KeyTypeId,
 		keys: Vec<CryptoTypePublicPair>,
-		msg: &[u8]
+		msg: &[u8],
 	) -> Result<Option<(CryptoTypePublicPair, Vec<u8>)>, Error> {
 		if keys.len() == 1 {
-			return Ok(self.sign_with(id, &keys[0], msg).await?.map(|s| (keys[0].clone(), s)));
+			return Ok(self.sign_with(id, &keys[0], msg).await?.map(|s| (keys[0].clone(), s)))
 		} else {
 			for k in self.supported_keys(id, keys).await? {
 				if let Ok(Some(sign)) = self.sign_with(id, &k, msg).await {
-					return Ok(Some((k, sign)));
+					return Ok(Some((k, sign)))
 				}
 			}
 		}
@@ -170,8 +165,7 @@ pub trait CryptoStore: Send + Sync {
 		keys: Vec<CryptoTypePublicPair>,
 		msg: &[u8],
 	) -> Result<Vec<Result<Option<Vec<u8>>, Error>>, ()> {
-		let futs = keys.iter()
-			.map(|k| self.sign_with(id, k, msg));
+		let futs = keys.iter().map(|k| self.sign_with(id, k, msg));
 
 		Ok(join_all(futs).await)
 	}
@@ -202,8 +196,8 @@ pub trait CryptoStore: Send + Sync {
 	/// in turn, used for signing the provided pre-hashed message.
 	///
 	/// The `msg` argument provided should be a hashed message for which an
-	/// ECDSA signature should be generated. 
-	/// 
+	/// ECDSA signature should be generated.
+	///
 	/// Returns an [`ecdsa::Signature`] or `None` in case the given `id` and
 	/// `public` combination doesn't exist in the keystore. An `Err` will be
 	/// returned if generating the signature itself failed.
@@ -260,11 +254,8 @@ pub trait SyncCryptoStore: CryptoStore + Send + Sync {
 	/// If the given seed is `Some(_)`, the key pair will only be stored in memory.
 	///
 	/// Returns the public key of the generated key pair.
-	fn ecdsa_generate_new(
-		&self,
-		id: KeyTypeId,
-		seed: Option<&str>,
-	) -> Result<ecdsa::Public, Error>;
+	fn ecdsa_generate_new(&self, id: KeyTypeId, seed: Option<&str>)
+		-> Result<ecdsa::Public, Error>;
 
 	/// Insert a new key. This doesn't require any known of the crypto; but a public key must be
 	/// manually provided.
@@ -281,7 +272,7 @@ pub trait SyncCryptoStore: CryptoStore + Send + Sync {
 	fn supported_keys(
 		&self,
 		id: KeyTypeId,
-		keys: Vec<CryptoTypePublicPair>
+		keys: Vec<CryptoTypePublicPair>,
 	) -> Result<Vec<CryptoTypePublicPair>, Error>;
 
 	/// List all supported keys
@@ -321,16 +312,16 @@ pub trait SyncCryptoStore: CryptoStore + Send + Sync {
 		&self,
 		id: KeyTypeId,
 		keys: Vec<CryptoTypePublicPair>,
-		msg: &[u8]
+		msg: &[u8],
 	) -> Result<Option<(CryptoTypePublicPair, Vec<u8>)>, Error> {
 		if keys.len() == 1 {
 			return Ok(
-				SyncCryptoStore::sign_with(self, id, &keys[0], msg)?.map(|s| (keys[0].clone(), s)),
+				SyncCryptoStore::sign_with(self, id, &keys[0], msg)?.map(|s| (keys[0].clone(), s))
 			)
 		} else {
 			for k in SyncCryptoStore::supported_keys(self, id, keys)? {
 				if let Ok(Some(sign)) = SyncCryptoStore::sign_with(self, id, &k, msg) {
-					return Ok(Some((k, sign)));
+					return Ok(Some((k, sign)))
 				}
 			}
 		}
@@ -380,8 +371,8 @@ pub trait SyncCryptoStore: CryptoStore + Send + Sync {
 	/// in turn, used for signing the provided pre-hashed message.
 	///
 	/// The `msg` argument provided should be a hashed message for which an
-	/// ECDSA signature should be generated. 
-	/// 
+	/// ECDSA signature should be generated.
+	///
 	/// Returns an [`ecdsa::Signature`] or `None` in case the given `id` and
 	/// `public` combination doesn't exist in the keystore. An `Err` will be
 	/// returned if generating the signature itself failed.
diff --git a/primitives/keystore/src/testing.rs b/primitives/keystore/src/testing.rs
index 9cc8b8fc64b1..718ba798dc0f 100644
--- a/primitives/keystore/src/testing.rs
+++ b/primitives/keystore/src/testing.rs
@@ -17,19 +17,21 @@
 
 //! Types that should only be used for testing!
 
-use sp_core::crypto::KeyTypeId;
 use sp_core::{
-	crypto::{Pair, Public, CryptoTypePublicPair},
-	ed25519, sr25519, ecdsa,
+	crypto::{CryptoTypePublicPair, KeyTypeId, Pair, Public},
+	ecdsa, ed25519, sr25519,
 };
 
 use crate::{
-	{CryptoStore, SyncCryptoStorePtr, Error, SyncCryptoStore},
-	vrf::{VRFTranscriptData, VRFSignature, make_transcript},
+	vrf::{make_transcript, VRFSignature, VRFTranscriptData},
+	CryptoStore, Error, SyncCryptoStore, SyncCryptoStorePtr,
 };
-use std::{collections::{HashMap, HashSet}, sync::Arc};
-use parking_lot::RwLock;
 use async_trait::async_trait;
+use parking_lot::RwLock;
+use std::{
+	collections::{HashMap, HashSet},
+	sync::Arc,
+};
 
 /// A keystore implementation usable in tests.
 #[derive(Default)]
@@ -45,29 +47,28 @@ impl KeyStore {
 	}
 
 	fn sr25519_key_pair(&self, id: KeyTypeId, pub_key: &sr25519::Public) -> Option<sr25519::Pair> {
-		self.keys.read().get(&id)
-			.and_then(|inner|
-				inner.get(pub_key.as_slice())
-					.map(|s| sr25519::Pair::from_string(s, None).expect("`sr25519` seed slice is valid"))
-			)
+		self.keys.read().get(&id).and_then(|inner| {
+			inner.get(pub_key.as_slice()).map(|s| {
+				sr25519::Pair::from_string(s, None).expect("`sr25519` seed slice is valid")
+			})
+		})
 	}
 
 	fn ed25519_key_pair(&self, id: KeyTypeId, pub_key: &ed25519::Public) -> Option<ed25519::Pair> {
-		self.keys.read().get(&id)
-			.and_then(|inner|
-				inner.get(pub_key.as_slice())
-					.map(|s| ed25519::Pair::from_string(s, None).expect("`ed25519` seed slice is valid"))
-			)
+		self.keys.read().get(&id).and_then(|inner| {
+			inner.get(pub_key.as_slice()).map(|s| {
+				ed25519::Pair::from_string(s, None).expect("`ed25519` seed slice is valid")
+			})
+		})
 	}
 
 	fn ecdsa_key_pair(&self, id: KeyTypeId, pub_key: &ecdsa::Public) -> Option<ecdsa::Pair> {
-		self.keys.read().get(&id)
-			.and_then(|inner|
-				inner.get(pub_key.as_slice())
-					.map(|s| ecdsa::Pair::from_string(s, None).expect("`ecdsa` seed slice is valid"))
-			)
+		self.keys.read().get(&id).and_then(|inner| {
+			inner
+				.get(pub_key.as_slice())
+				.map(|s| ecdsa::Pair::from_string(s, None).expect("`ecdsa` seed slice is valid"))
+		})
 	}
-
 }
 
 #[async_trait]
@@ -158,28 +159,32 @@ impl CryptoStore for KeyStore {
 
 impl SyncCryptoStore for KeyStore {
 	fn keys(&self, id: KeyTypeId) -> Result<Vec<CryptoTypePublicPair>, Error> {
-		self.keys.read()
+		self.keys
+			.read()
 			.get(&id)
 			.map(|map| {
-				Ok(map.keys()
-					.fold(Vec::new(), |mut v, k| {
-						v.push(CryptoTypePublicPair(sr25519::CRYPTO_ID, k.clone()));
-						v.push(CryptoTypePublicPair(ed25519::CRYPTO_ID, k.clone()));
-						v.push(CryptoTypePublicPair(ecdsa::CRYPTO_ID, k.clone()));
-						v
-					}))
+				Ok(map.keys().fold(Vec::new(), |mut v, k| {
+					v.push(CryptoTypePublicPair(sr25519::CRYPTO_ID, k.clone()));
+					v.push(CryptoTypePublicPair(ed25519::CRYPTO_ID, k.clone()));
+					v.push(CryptoTypePublicPair(ecdsa::CRYPTO_ID, k.clone()));
+					v
+				}))
 			})
 			.unwrap_or_else(|| Ok(vec![]))
 	}
 
 	fn sr25519_public_keys(&self, id: KeyTypeId) -> Vec<sr25519::Public> {
-		self.keys.read().get(&id)
-			.map(|keys|
+		self.keys
+			.read()
+			.get(&id)
+			.map(|keys| {
 				keys.values()
-					.map(|s| sr25519::Pair::from_string(s, None).expect("`sr25519` seed slice is valid"))
+					.map(|s| {
+						sr25519::Pair::from_string(s, None).expect("`sr25519` seed slice is valid")
+					})
 					.map(|p| p.public())
 					.collect()
-			)
+			})
 			.unwrap_or_default()
 	}
 
@@ -190,27 +195,40 @@ impl SyncCryptoStore for KeyStore {
 	) -> Result<sr25519::Public, Error> {
 		match seed {
 			Some(seed) => {
-				let pair = sr25519::Pair::from_string(seed, None)
-					.map_err(|_| Error::ValidationError("Generates an `sr25519` pair.".to_owned()))?;
-				self.keys.write().entry(id).or_default().insert(pair.public().to_raw_vec(), seed.into());
+				let pair = sr25519::Pair::from_string(seed, None).map_err(|_| {
+					Error::ValidationError("Generates an `sr25519` pair.".to_owned())
+				})?;
+				self.keys
+					.write()
+					.entry(id)
+					.or_default()
+					.insert(pair.public().to_raw_vec(), seed.into());
 				Ok(pair.public())
 			},
 			None => {
 				let (pair, phrase, _) = sr25519::Pair::generate_with_phrase(None);
-				self.keys.write().entry(id).or_default().insert(pair.public().to_raw_vec(), phrase);
+				self.keys
+					.write()
+					.entry(id)
+					.or_default()
+					.insert(pair.public().to_raw_vec(), phrase);
 				Ok(pair.public())
-			}
+			},
 		}
 	}
 
 	fn ed25519_public_keys(&self, id: KeyTypeId) -> Vec<ed25519::Public> {
-		self.keys.read().get(&id)
-			.map(|keys|
+		self.keys
+			.read()
+			.get(&id)
+			.map(|keys| {
 				keys.values()
-					.map(|s| ed25519::Pair::from_string(s, None).expect("`ed25519` seed slice is valid"))
+					.map(|s| {
+						ed25519::Pair::from_string(s, None).expect("`ed25519` seed slice is valid")
+					})
 					.map(|p| p.public())
 					.collect()
-			)
+			})
 			.unwrap_or_default()
 	}
 
@@ -221,27 +239,40 @@ impl SyncCryptoStore for KeyStore {
 	) -> Result<ed25519::Public, Error> {
 		match seed {
 			Some(seed) => {
-				let pair = ed25519::Pair::from_string(seed, None)
-					.map_err(|_| Error::ValidationError("Generates an `ed25519` pair.".to_owned()))?;
-				self.keys.write().entry(id).or_default().insert(pair.public().to_raw_vec(), seed.into());
+				let pair = ed25519::Pair::from_string(seed, None).map_err(|_| {
+					Error::ValidationError("Generates an `ed25519` pair.".to_owned())
+				})?;
+				self.keys
+					.write()
+					.entry(id)
+					.or_default()
+					.insert(pair.public().to_raw_vec(), seed.into());
 				Ok(pair.public())
 			},
 			None => {
 				let (pair, phrase, _) = ed25519::Pair::generate_with_phrase(None);
-				self.keys.write().entry(id).or_default().insert(pair.public().to_raw_vec(), phrase);
+				self.keys
+					.write()
+					.entry(id)
+					.or_default()
+					.insert(pair.public().to_raw_vec(), phrase);
 				Ok(pair.public())
-			}
+			},
 		}
 	}
 
 	fn ecdsa_public_keys(&self, id: KeyTypeId) -> Vec<ecdsa::Public> {
-		self.keys.read().get(&id)
-			.map(|keys|
+		self.keys
+			.read()
+			.get(&id)
+			.map(|keys| {
 				keys.values()
-					.map(|s| ecdsa::Pair::from_string(s, None).expect("`ecdsa` seed slice is valid"))
+					.map(|s| {
+						ecdsa::Pair::from_string(s, None).expect("`ecdsa` seed slice is valid")
+					})
 					.map(|p| p.public())
 					.collect()
-			)
+			})
 			.unwrap_or_default()
 	}
 
@@ -254,24 +285,38 @@ impl SyncCryptoStore for KeyStore {
 			Some(seed) => {
 				let pair = ecdsa::Pair::from_string(seed, None)
 					.map_err(|_| Error::ValidationError("Generates an `ecdsa` pair.".to_owned()))?;
-				self.keys.write().entry(id).or_default().insert(pair.public().to_raw_vec(), seed.into());
+				self.keys
+					.write()
+					.entry(id)
+					.or_default()
+					.insert(pair.public().to_raw_vec(), seed.into());
 				Ok(pair.public())
 			},
 			None => {
 				let (pair, phrase, _) = ecdsa::Pair::generate_with_phrase(None);
-				self.keys.write().entry(id).or_default().insert(pair.public().to_raw_vec(), phrase);
+				self.keys
+					.write()
+					.entry(id)
+					.or_default()
+					.insert(pair.public().to_raw_vec(), phrase);
 				Ok(pair.public())
-			}
+			},
 		}
 	}
 
 	fn insert_unknown(&self, id: KeyTypeId, suri: &str, public: &[u8]) -> Result<(), ()> {
-		self.keys.write().entry(id).or_default().insert(public.to_owned(), suri.to_string());
+		self.keys
+			.write()
+			.entry(id)
+			.or_default()
+			.insert(public.to_owned(), suri.to_string());
 		Ok(())
 	}
 
 	fn has_keys(&self, public_keys: &[(Vec<u8>, KeyTypeId)]) -> bool {
-		public_keys.iter().all(|(k, t)| self.keys.read().get(&t).and_then(|s| s.get(k)).is_some())
+		public_keys
+			.iter()
+			.all(|(k, t)| self.keys.read().get(&t).and_then(|s| s.get(k)).is_some())
 	}
 
 	fn supported_keys(
@@ -295,24 +340,24 @@ impl SyncCryptoStore for KeyStore {
 
 		match key.0 {
 			ed25519::CRYPTO_ID => {
-				let key_pair = self
-					.ed25519_key_pair(id, &ed25519::Public::from_slice(key.1.as_slice()));
+				let key_pair =
+					self.ed25519_key_pair(id, &ed25519::Public::from_slice(key.1.as_slice()));
 
 				key_pair.map(|k| k.sign(msg).encode()).map(Ok).transpose()
-			}
+			},
 			sr25519::CRYPTO_ID => {
-				let key_pair = self
-					.sr25519_key_pair(id, &sr25519::Public::from_slice(key.1.as_slice()));
+				let key_pair =
+					self.sr25519_key_pair(id, &sr25519::Public::from_slice(key.1.as_slice()));
 
 				key_pair.map(|k| k.sign(msg).encode()).map(Ok).transpose()
-			}
+			},
 			ecdsa::CRYPTO_ID => {
-				let key_pair = self
-					.ecdsa_key_pair(id, &ecdsa::Public::from_slice(key.1.as_slice()));
+				let key_pair =
+					self.ecdsa_key_pair(id, &ecdsa::Public::from_slice(key.1.as_slice()));
 
 				key_pair.map(|k| k.sign(msg).encode()).map(Ok).transpose()
-			}
-			_ => Err(Error::KeyNotSupported(id))
+			},
+			_ => Err(Error::KeyNotSupported(id)),
 		}
 	}
 
@@ -323,17 +368,11 @@ impl SyncCryptoStore for KeyStore {
 		transcript_data: VRFTranscriptData,
 	) -> Result<Option<VRFSignature>, Error> {
 		let transcript = make_transcript(transcript_data);
-		let pair = if let Some(k) = self.sr25519_key_pair(key_type, public) {
-			k
-		} else {
-			return Ok(None)
-		};
+		let pair =
+			if let Some(k) = self.sr25519_key_pair(key_type, public) { k } else { return Ok(None) };
 
 		let (inout, proof, _) = pair.as_ref().vrf_sign(transcript);
-		Ok(Some(VRFSignature {
-			output: inout.to_output(),
-			proof,
-		}))
+		Ok(Some(VRFSignature { output: inout.to_output(), proof }))
 	}
 
 	fn ecdsa_sign_prehashed(
@@ -362,15 +401,18 @@ impl Into<Arc<dyn CryptoStore>> for KeyStore {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use sp_core::{sr25519, testing::{ED25519, SR25519, ECDSA}};
-	use crate::{SyncCryptoStore, vrf::VRFTranscriptValue};
+	use crate::{vrf::VRFTranscriptValue, SyncCryptoStore};
+	use sp_core::{
+		sr25519,
+		testing::{ECDSA, ED25519, SR25519},
+	};
 
 	#[test]
 	fn store_key_and_extract() {
 		let store = KeyStore::new();
 
-		let public = SyncCryptoStore::ed25519_generate_new(&store, ED25519, None)
-			.expect("Generates key");
+		let public =
+			SyncCryptoStore::ed25519_generate_new(&store, ED25519, None).expect("Generates key");
 
 		let public_keys = SyncCryptoStore::keys(&store, ED25519).unwrap();
 
@@ -384,12 +426,8 @@ mod tests {
 		let secret_uri = "//Alice";
 		let key_pair = sr25519::Pair::from_string(secret_uri, None).expect("Generates key pair");
 
-		SyncCryptoStore::insert_unknown(
-			&store,
-			SR25519,
-			secret_uri,
-			key_pair.public().as_ref(),
-		).expect("Inserts unknown key");
+		SyncCryptoStore::insert_unknown(&store, SR25519, secret_uri, key_pair.public().as_ref())
+			.expect("Inserts unknown key");
 
 		let public_keys = SyncCryptoStore::keys(&store, SR25519).unwrap();
 
@@ -409,7 +447,7 @@ mod tests {
 				("one", VRFTranscriptValue::U64(1)),
 				("two", VRFTranscriptValue::U64(2)),
 				("three", VRFTranscriptValue::Bytes("test".as_bytes().to_vec())),
-			]
+			],
 		};
 
 		let result = SyncCryptoStore::sr25519_vrf_sign(
@@ -420,19 +458,11 @@ mod tests {
 		);
 		assert!(result.unwrap().is_none());
 
-		SyncCryptoStore::insert_unknown(
-			&store,
-			SR25519,
-			secret_uri,
-			key_pair.public().as_ref(),
-		).expect("Inserts unknown key");
+		SyncCryptoStore::insert_unknown(&store, SR25519, secret_uri, key_pair.public().as_ref())
+			.expect("Inserts unknown key");
 
-		let result = SyncCryptoStore::sr25519_vrf_sign(
-			&store,
-			SR25519,
-			&key_pair.public(),
-			transcript_data,
-		);
+		let result =
+			SyncCryptoStore::sr25519_vrf_sign(&store, SR25519, &key_pair.public(), transcript_data);
 
 		assert!(result.unwrap().is_some());
 	}
@@ -445,16 +475,19 @@ mod tests {
 		let pair = ecdsa::Pair::from_string(suri, None).unwrap();
 
 		let msg = sp_core::keccak_256(b"this should be a hashed message");
-		
+
 		// no key in key store
-		let res = SyncCryptoStore::ecdsa_sign_prehashed(&store, ECDSA, &pair.public(), &msg).unwrap();
+		let res =
+			SyncCryptoStore::ecdsa_sign_prehashed(&store, ECDSA, &pair.public(), &msg).unwrap();
 		assert!(res.is_none());
 
 		// insert key, sign again
-		let res = SyncCryptoStore::insert_unknown(&store, ECDSA, suri, pair.public().as_ref()).unwrap();
+		let res =
+			SyncCryptoStore::insert_unknown(&store, ECDSA, suri, pair.public().as_ref()).unwrap();
 		assert_eq!((), res);
 
-		let res = SyncCryptoStore::ecdsa_sign_prehashed(&store, ECDSA, &pair.public(), &msg).unwrap();
-		assert!(res.is_some());		
+		let res =
+			SyncCryptoStore::ecdsa_sign_prehashed(&store, ECDSA, &pair.public(), &msg).unwrap();
+		assert!(res.is_some());
 	}
 }
diff --git a/primitives/keystore/src/vrf.rs b/primitives/keystore/src/vrf.rs
index 04286eea8276..383abb77e17c 100644
--- a/primitives/keystore/src/vrf.rs
+++ b/primitives/keystore/src/vrf.rs
@@ -59,21 +59,17 @@ pub fn make_transcript(data: VRFTranscriptData) -> Transcript {
 			},
 			VRFTranscriptValue::U64(val) => {
 				transcript.append_u64(label.as_bytes(), val);
-			}
+			},
 		}
 	}
 	transcript
 }
 
-
 #[cfg(test)]
 mod tests {
 	use super::*;
 	use rand::RngCore;
-	use rand_chacha::{
-		rand_core::SeedableRng,
-		ChaChaRng,
-	};
+	use rand_chacha::{rand_core::SeedableRng, ChaChaRng};
 
 	#[test]
 	fn transcript_creation_matches() {
@@ -90,9 +86,7 @@ mod tests {
 		});
 		let test = |t: Transcript| -> [u8; 16] {
 			let mut b = [0u8; 16];
-			t.build_rng()
-				.finalize(&mut ChaChaRng::from_seed([0u8;32]))
-				.fill_bytes(&mut b);
+			t.build_rng().finalize(&mut ChaChaRng::from_seed([0u8; 32])).fill_bytes(&mut b);
 			b
 		};
 		debug_assert!(test(orig_transcript) == test(new_transcript));
diff --git a/primitives/maybe-compressed-blob/src/lib.rs b/primitives/maybe-compressed-blob/src/lib.rs
index acd283e747f9..4e4a3da0a82c 100644
--- a/primitives/maybe-compressed-blob/src/lib.rs
+++ b/primitives/maybe-compressed-blob/src/lib.rs
@@ -18,8 +18,7 @@
 //! Handling of blobs that may be compressed, based on an 8-byte magic identifier
 //! at the head.
 
-use std::borrow::Cow;
-use std::io::Read;
+use std::{borrow::Cow, io::Read};
 
 // An arbitrary prefix, that indicates a blob beginning with should be decompressed with
 // Zstd compression.
@@ -52,7 +51,7 @@ impl std::fmt::Display for Error {
 	}
 }
 
-impl std::error::Error for Error { }
+impl std::error::Error for Error {}
 
 fn read_from_decoder(
 	decoder: impl Read,
@@ -81,8 +80,8 @@ fn decompress_zstd(blob: &[u8], bomb_limit: usize) -> Result<Vec<u8>, Error> {
 #[cfg(target_os = "unknown")]
 fn decompress_zstd(mut blob: &[u8], bomb_limit: usize) -> Result<Vec<u8>, Error> {
 	let blob_len = blob.len();
-	let decoder = ruzstd::streaming_decoder::StreamingDecoder::new(&mut blob)
-		.map_err(|_| Error::Invalid)?;
+	let decoder =
+		ruzstd::streaming_decoder::StreamingDecoder::new(&mut blob).map_err(|_| Error::Invalid)?;
 
 	read_from_decoder(decoder, blob_len, bomb_limit)
 }
@@ -105,7 +104,7 @@ pub fn compress(blob: &[u8], bomb_limit: usize) -> Option<Vec<u8>> {
 	use std::io::Write;
 
 	if blob.len() > bomb_limit {
-		return None;
+		return None
 	}
 
 	let mut buf = ZSTD_PREFIX.to_vec();
diff --git a/primitives/npos-elections/benches/phragmen.rs b/primitives/npos-elections/benches/phragmen.rs
index d48c24655884..784825924935 100644
--- a/primitives/npos-elections/benches/phragmen.rs
+++ b/primitives/npos-elections/benches/phragmen.rs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-
 //! Benchmarks of the phragmen election algorithm.
 //! Note that execution times will not be accurate in an absolute scale, since
 //! - Everything is executed in the context of `TestExternalities`
@@ -27,13 +26,12 @@ use test::Bencher;
 use rand::{self, Rng};
 use sp_npos_elections::{ElectionResult, VoteWeight};
 
-use std::collections::BTreeMap;
-use sp_runtime::{Perbill, PerThing, traits::Zero};
 use sp_npos_elections::{
-	balance_solution, assignment_ratio_to_staked, to_support_map, to_without_backing, VoteWeight,
-	ExtendedBalance, Assignment, StakedAssignment, IdentifierT, assignment_ratio_to_staked,
-	seq_phragmen,
+	assignment_ratio_to_staked, balance_solution, seq_phragmen, to_support_map, to_without_backing,
+	Assignment, ExtendedBalance, IdentifierT, StakedAssignment, VoteWeight,
 };
+use sp_runtime::{traits::Zero, PerThing, Perbill};
+use std::collections::BTreeMap;
 
 // default params. Each will be scaled by the benchmarks individually.
 const VALIDATORS: u64 = 100;
@@ -69,15 +67,13 @@ mod bench_closure_and_slice {
 		ratio
 			.into_iter()
 			.zip(stakes.into_iter().map(|x| *x as ExtendedBalance))
-			.map(|(a, stake)| {
-				a.into_staked(stake.into(), true)
-			})
+			.map(|(a, stake)| a.into_staked(stake.into(), true))
 			.collect()
 	}
 
 	#[bench]
 	fn closure(b: &mut Bencher) {
-		let assignments = (0..1000).map(|_| random_assignment()).collect::<Vec<Assignment<_ ,_>>>();
+		let assignments = (0..1000).map(|_| random_assignment()).collect::<Vec<Assignment<_, _>>>();
 		let stake_of = |x: &u32| -> VoteWeight { (x * 2 + 100).into() };
 
 		// each have one clone of assignments
@@ -86,7 +82,7 @@ mod bench_closure_and_slice {
 
 	#[bench]
 	fn slice(b: &mut Bencher) {
-		let assignments = (0..1000).map(|_| random_assignment()).collect::<Vec<Assignment<_ ,_>>>();
+		let assignments = (0..1000).map(|_| random_assignment()).collect::<Vec<Assignment<_, _>>>();
 		let stake_of = |x: &u32| -> VoteWeight { (x * 2 + 100).into() };
 
 		b.iter(|| {
@@ -112,20 +108,19 @@ fn do_phragmen(
 	let mut candidates = Vec::with_capacity(num_validators as usize);
 	let mut stake_of_tree: BTreeMap<AccountId, VoteWeight> = BTreeMap::new();
 
-	(1 ..= num_validators).for_each(|acc| {
+	(1..=num_validators).for_each(|acc| {
 		candidates.push(acc);
 		stake_of_tree.insert(acc, STAKE + rr(10, 1000));
 	});
 
 	let mut voters = Vec::with_capacity(num_nominators as usize);
-	(PREFIX ..= (PREFIX + num_nominators)).for_each(|acc| {
+	(PREFIX..=(PREFIX + num_nominators)).for_each(|acc| {
 		// all possible targets
 		let mut all_targets = candidates.clone();
 		// we remove and pop into `targets` `edge_per_voter` times.
-		let targets = (0 .. edge_per_voter).map(|_| {
-			all_targets.remove(rr(0, all_targets.len()) as usize)
-		})
-		.collect::<Vec<AccountId>>();
+		let targets = (0..edge_per_voter)
+			.map(|_| all_targets.remove(rr(0, all_targets.len()) as usize))
+			.collect::<Vec<AccountId>>();
 
 		let stake = STAKE + rr(10, 1000);
 		stake_of_tree.insert(acc, stake);
@@ -138,20 +133,16 @@ fn do_phragmen(
 			Zero::zero(),
 			candidates.clone(),
 			voters.clone(),
-		).unwrap();
+		)
+		.unwrap();
 
-		let stake_of = |who: &AccountId| -> VoteWeight {
-			*stake_of_tree.get(who).unwrap()
-		};
+		let stake_of = |who: &AccountId| -> VoteWeight { *stake_of_tree.get(who).unwrap() };
 
 		// Do the benchmarking with balancing.
 		if eq_iters > 0 {
 			let staked = assignment_ratio_to_staked(assignments, &stake_of);
 			let winners = to_without_backing(winners);
-			let mut support = to_support_map(
-				winners.as_ref(),
-				staked.as_ref(),
-			).unwrap();
+			let mut support = to_support_map(winners.as_ref(), staked.as_ref()).unwrap();
 
 			balance_solution(
 				staked.into_iter().map(|a| (a.clone(), stake_of(&a.who))).collect(),
diff --git a/primitives/npos-elections/compact/src/assignment.rs b/primitives/npos-elections/compact/src/assignment.rs
index 2c8edefbfb37..bd5b1bf0c154 100644
--- a/primitives/npos-elections/compact/src/assignment.rs
+++ b/primitives/npos-elections/compact/src/assignment.rs
@@ -46,25 +46,29 @@ pub(crate) fn from_impl(count: usize) -> TokenStream2 {
 		),)
 	};
 
-	let from_impl_rest = (3..=count).map(|c| {
-		let inner = (0..c-1).map(|i|
-			quote!((index_of_target(&distribution[#i].0).or_invalid_index()?, distribution[#i].1),)
-		).collect::<TokenStream2>();
-
-		let field_name = field_name_for(c);
-		let last_index = c - 1;
-		let last = quote!(index_of_target(&distribution[#last_index].0).or_invalid_index()?);
-
-		quote!(
-			#c => compact.#field_name.push(
-				(
-					index_of_voter(&who).or_invalid_index()?,
-					[#inner],
-					#last,
+	let from_impl_rest = (3..=count)
+		.map(|c| {
+			let inner = (0..c - 1)
+				.map(
+					|i| quote!((index_of_target(&distribution[#i].0).or_invalid_index()?, distribution[#i].1),),
 				)
-			),
-		)
-	}).collect::<TokenStream2>();
+				.collect::<TokenStream2>();
+
+			let field_name = field_name_for(c);
+			let last_index = c - 1;
+			let last = quote!(index_of_target(&distribution[#last_index].0).or_invalid_index()?);
+
+			quote!(
+				#c => compact.#field_name.push(
+					(
+						index_of_voter(&who).or_invalid_index()?,
+						[#inner],
+						#last,
+					)
+				),
+			)
+		})
+		.collect::<TokenStream2>();
 
 	quote!(
 		#from_impl_single
@@ -113,39 +117,41 @@ pub(crate) fn into_impl(count: usize, per_thing: syn::Type) -> TokenStream2 {
 		)
 	};
 
-	let into_impl_rest = (3..=count).map(|c| {
-		let name = field_name_for(c);
-		quote!(
-			for (voter_index, inners, t_last_idx) in self.#name {
-				let mut sum = #per_thing::zero();
-				let mut inners_parsed = inners
-					.iter()
-					.map(|(ref t_idx, p)| {
-						sum = _npos::sp_arithmetic::traits::Saturating::saturating_add(sum, *p);
-						let target = target_at(*t_idx).or_invalid_index()?;
-						Ok((target, *p))
-					})
-					.collect::<Result<_npos::sp_std::prelude::Vec<(A, #per_thing)>, _npos::Error>>()?;
-
-				if sum >= #per_thing::one() {
-					return Err(_npos::Error::CompactStakeOverflow);
+	let into_impl_rest = (3..=count)
+		.map(|c| {
+			let name = field_name_for(c);
+			quote!(
+				for (voter_index, inners, t_last_idx) in self.#name {
+					let mut sum = #per_thing::zero();
+					let mut inners_parsed = inners
+						.iter()
+						.map(|(ref t_idx, p)| {
+							sum = _npos::sp_arithmetic::traits::Saturating::saturating_add(sum, *p);
+							let target = target_at(*t_idx).or_invalid_index()?;
+							Ok((target, *p))
+						})
+						.collect::<Result<_npos::sp_std::prelude::Vec<(A, #per_thing)>, _npos::Error>>()?;
+
+					if sum >= #per_thing::one() {
+						return Err(_npos::Error::CompactStakeOverflow);
+					}
+
+					// defensive only. Since Percent doesn't have `Sub`.
+					let p_last = _npos::sp_arithmetic::traits::Saturating::saturating_sub(
+						#per_thing::one(),
+						sum,
+					);
+
+					inners_parsed.push((target_at(t_last_idx).or_invalid_index()?, p_last));
+
+					assignments.push(_npos::Assignment {
+						who: voter_at(voter_index).or_invalid_index()?,
+						distribution: inners_parsed,
+					});
 				}
-
-				// defensive only. Since Percent doesn't have `Sub`.
-				let p_last = _npos::sp_arithmetic::traits::Saturating::saturating_sub(
-					#per_thing::one(),
-					sum,
-				);
-
-				inners_parsed.push((target_at(t_last_idx).or_invalid_index()?, p_last));
-
-				assignments.push(_npos::Assignment {
-					who: voter_at(voter_index).or_invalid_index()?,
-					distribution: inners_parsed,
-				});
-			}
-		)
-	}).collect::<TokenStream2>();
+			)
+		})
+		.collect::<TokenStream2>();
 
 	quote!(
 		#into_impl_single
diff --git a/primitives/npos-elections/compact/src/codec.rs b/primitives/npos-elections/compact/src/codec.rs
index f75f99682711..6d59e11f041b 100644
--- a/primitives/npos-elections/compact/src/codec.rs
+++ b/primitives/npos-elections/compact/src/codec.rs
@@ -80,39 +80,42 @@ fn decode_impl(
 		}
 	};
 
-	let decode_impl_rest = (3..=count).map(|c| {
-		let name = field_name_for(c);
-
-		let inner_impl = (0..c-1).map(|i|
-			quote! { ( (inner[#i].0).0, (inner[#i].1).0 ), }
-		).collect::<TokenStream2>();
-
-		quote! {
-			let #name =
-			<
-				_npos::sp_std::prelude::Vec<(
-					_npos::codec::Compact<#voter_type>,
-					[(_npos::codec::Compact<#target_type>, _npos::codec::Compact<#weight_type>); #c-1],
-					_npos::codec::Compact<#target_type>,
-				)>
-				as _npos::codec::Decode
-			>::decode(value)?;
-			let #name = #name
-				.into_iter()
-				.map(|(v, inner, t_last)| (
-					v.0,
-					[ #inner_impl ],
-					t_last.0,
-				))
-				.collect::<_npos::sp_std::prelude::Vec<_>>();
-		}
-	}).collect::<TokenStream2>();
-
+	let decode_impl_rest = (3..=count)
+		.map(|c| {
+			let name = field_name_for(c);
+
+			let inner_impl = (0..c - 1)
+				.map(|i| quote! { ( (inner[#i].0).0, (inner[#i].1).0 ), })
+				.collect::<TokenStream2>();
+
+			quote! {
+				let #name =
+				<
+					_npos::sp_std::prelude::Vec<(
+						_npos::codec::Compact<#voter_type>,
+						[(_npos::codec::Compact<#target_type>, _npos::codec::Compact<#weight_type>); #c-1],
+						_npos::codec::Compact<#target_type>,
+					)>
+					as _npos::codec::Decode
+				>::decode(value)?;
+				let #name = #name
+					.into_iter()
+					.map(|(v, inner, t_last)| (
+						v.0,
+						[ #inner_impl ],
+						t_last.0,
+					))
+					.collect::<_npos::sp_std::prelude::Vec<_>>();
+			}
+		})
+		.collect::<TokenStream2>();
 
-	let all_field_names = (1..=count).map(|c| {
-		let name = field_name_for(c);
-		quote! { #name, }
-	}).collect::<TokenStream2>();
+	let all_field_names = (1..=count)
+		.map(|c| {
+			let name = field_name_for(c);
+			quote! { #name, }
+		})
+		.collect::<TokenStream2>();
 
 	quote!(
 		impl _npos::codec::Decode for #ident {
@@ -165,29 +168,33 @@ fn encode_impl(ident: syn::Ident, count: usize) -> TokenStream2 {
 		}
 	};
 
-	let encode_impl_rest = (3..=count).map(|c| {
-		let name = field_name_for(c);
-
-		// we use the knowledge of the length to avoid copy_from_slice.
-		let inners_compact_array = (0..c-1).map(|i|
-			quote!{(
-				_npos::codec::Compact(inner[#i].0.clone()),
-				_npos::codec::Compact(inner[#i].1.clone()),
-			),}
-		).collect::<TokenStream2>();
-
-		quote! {
-			let #name = self.#name
-				.iter()
-				.map(|(v, inner, t_last)| (
-					_npos::codec::Compact(v.clone()),
-					[ #inners_compact_array ],
-					_npos::codec::Compact(t_last.clone()),
-				))
-				.collect::<_npos::sp_std::prelude::Vec<_>>();
-			#name.encode_to(&mut r);
-		}
-	}).collect::<TokenStream2>();
+	let encode_impl_rest = (3..=count)
+		.map(|c| {
+			let name = field_name_for(c);
+
+			// we use the knowledge of the length to avoid copy_from_slice.
+			let inners_compact_array = (0..c - 1)
+				.map(|i| {
+					quote! {(
+						_npos::codec::Compact(inner[#i].0.clone()),
+						_npos::codec::Compact(inner[#i].1.clone()),
+					),}
+				})
+				.collect::<TokenStream2>();
+
+			quote! {
+				let #name = self.#name
+					.iter()
+					.map(|(v, inner, t_last)| (
+						_npos::codec::Compact(v.clone()),
+						[ #inners_compact_array ],
+						_npos::codec::Compact(t_last.clone()),
+					))
+					.collect::<_npos::sp_std::prelude::Vec<_>>();
+				#name.encode_to(&mut r);
+			}
+		})
+		.collect::<TokenStream2>();
 
 	quote!(
 		impl _npos::codec::Encode for #ident {
diff --git a/primitives/npos-elections/compact/src/index_assignment.rs b/primitives/npos-elections/compact/src/index_assignment.rs
index 6aeef1442236..347be7d19984 100644
--- a/primitives/npos-elections/compact/src/index_assignment.rs
+++ b/primitives/npos-elections/compact/src/index_assignment.rs
@@ -65,7 +65,7 @@ pub(crate) fn from_impl(count: usize) -> TokenStream2 {
 					)
 				),
 			)
-	})
+		})
 		.collect::<TokenStream2>();
 
 	quote!(
diff --git a/primitives/npos-elections/compact/src/lib.rs b/primitives/npos-elections/compact/src/lib.rs
index 0e9fbb34eea1..4bf8e8a4de40 100644
--- a/primitives/npos-elections/compact/src/lib.rs
+++ b/primitives/npos-elections/compact/src/lib.rs
@@ -18,7 +18,7 @@
 //! Proc macro for a npos compact assignment.
 
 use proc_macro::TokenStream;
-use proc_macro2::{TokenStream as TokenStream2, Span, Ident};
+use proc_macro2::{Ident, Span, TokenStream as TokenStream2};
 use proc_macro_crate::{crate_name, FoundCrate};
 use quote::quote;
 use syn::parse::{Parse, ParseStream, Result};
@@ -82,15 +82,8 @@ pub(crate) fn syn_err(message: &'static str) -> syn::Error {
 /// ```
 #[proc_macro]
 pub fn generate_solution_type(item: TokenStream) -> TokenStream {
-	let SolutionDef {
-		vis,
-		ident,
-		count,
-		voter_type,
-		target_type,
-		weight_type,
-		compact_encoding,
-	} = syn::parse_macro_input!(item as SolutionDef);
+	let SolutionDef { vis, ident, count, voter_type, target_type, weight_type, compact_encoding } =
+		syn::parse_macro_input!(item as SolutionDef);
 
 	let imports = imports().unwrap_or_else(|e| e.to_compile_error());
 
@@ -102,7 +95,8 @@ pub fn generate_solution_type(item: TokenStream) -> TokenStream {
 		target_type.clone(),
 		weight_type.clone(),
 		compact_encoding,
-	).unwrap_or_else(|e| e.to_compile_error());
+	)
+	.unwrap_or_else(|e| e.to_compile_error());
 
 	quote!(
 		#imports
@@ -167,7 +161,7 @@ fn struct_def(
 			weight_type.clone(),
 			count,
 		);
-		quote!{
+		quote! {
 			#compact_impl
 			#[derive(Default, PartialEq, Eq, Clone, Debug, PartialOrd, Ord)]
 		}
@@ -321,23 +315,27 @@ fn remove_voter_impl(count: usize) -> TokenStream2 {
 }
 
 fn len_impl(count: usize) -> TokenStream2 {
-	(1..=count).map(|c| {
-		let field_name = field_name_for(c);
-		quote!(
-			all_len = all_len.saturating_add(self.#field_name.len());
-		)
-	}).collect::<TokenStream2>()
+	(1..=count)
+		.map(|c| {
+			let field_name = field_name_for(c);
+			quote!(
+				all_len = all_len.saturating_add(self.#field_name.len());
+			)
+		})
+		.collect::<TokenStream2>()
 }
 
 fn edge_count_impl(count: usize) -> TokenStream2 {
-	(1..=count).map(|c| {
-		let field_name = field_name_for(c);
-		quote!(
-			all_edges = all_edges.saturating_add(
-				self.#field_name.len().saturating_mul(#c as usize)
-			);
-		)
-	}).collect::<TokenStream2>()
+	(1..=count)
+		.map(|c| {
+			let field_name = field_name_for(c);
+			quote!(
+				all_edges = all_edges.saturating_add(
+					self.#field_name.len().saturating_mul(#c as usize)
+				);
+			)
+		})
+		.collect::<TokenStream2>()
 }
 
 fn unique_targets_impl(count: usize) -> TokenStream2 {
@@ -360,17 +358,19 @@ fn unique_targets_impl(count: usize) -> TokenStream2 {
 		}
 	};
 
-	let unique_targets_impl_rest = (3..=count).map(|c| {
-		let field_name = field_name_for(c);
-		quote! {
-			self.#field_name.iter().for_each(|(_, inners, t_last)| {
-				inners.iter().for_each(|(t, _)| {
-					maybe_insert_target(*t);
+	let unique_targets_impl_rest = (3..=count)
+		.map(|c| {
+			let field_name = field_name_for(c);
+			quote! {
+				self.#field_name.iter().for_each(|(_, inners, t_last)| {
+					inners.iter().for_each(|(t, _)| {
+						maybe_insert_target(*t);
+					});
+					maybe_insert_target(*t_last);
 				});
-				maybe_insert_target(*t_last);
-			});
-		}
-	}).collect::<TokenStream2>();
+			}
+		})
+		.collect::<TokenStream2>();
 
 	quote! {
 		#unique_targets_impl_single
@@ -440,23 +440,29 @@ impl Parse for SolutionDef {
 
 		let expected_types = ["VoterIndex", "TargetIndex", "Accuracy"];
 
-		let mut types: Vec<syn::Type> = generics.args.iter().zip(expected_types.iter()).map(|(t, expected)|
-			match t {
+		let mut types: Vec<syn::Type> = generics
+			.args
+			.iter()
+			.zip(expected_types.iter())
+			.map(|(t, expected)| match t {
 				syn::GenericArgument::Type(ty) => {
 					// this is now an error
-					Err(syn::Error::new_spanned(ty, format!("Expected binding: `{} = ...`", expected)))
+					Err(syn::Error::new_spanned(
+						ty,
+						format!("Expected binding: `{} = ...`", expected),
+					))
 				},
-				syn::GenericArgument::Binding(syn::Binding{ident, ty, ..}) => {
+				syn::GenericArgument::Binding(syn::Binding { ident, ty, .. }) => {
 					// check that we have the right keyword for this position in the argument list
 					if ident == expected {
 						Ok(ty.clone())
 					} else {
 						Err(syn::Error::new_spanned(ident, format!("Expected `{}`", expected)))
 					}
-				}
+				},
 				_ => Err(syn_err("Wrong type of generic provided. Must be a `type`.")),
-			}
-		).collect::<Result<_>>()?;
+			})
+			.collect::<Result<_>>()?;
 
 		let weight_type = types.pop().expect("Vector of length 3 can be popped; qed");
 		let target_type = types.pop().expect("Vector of length 2 can be popped; qed");
@@ -467,15 +473,15 @@ impl Parse for SolutionDef {
 		let expr = count_expr.expr;
 		let expr_lit = match *expr {
 			syn::Expr::Lit(count_lit) => count_lit.lit,
-			_ => return Err(syn_err("Count must be literal."))
+			_ => return Err(syn_err("Count must be literal.")),
 		};
 		let int_lit = match expr_lit {
 			syn::Lit::Int(int_lit) => int_lit,
-			_ => return Err(syn_err("Count must be int literal."))
+			_ => return Err(syn_err("Count must be int literal.")),
 		};
 		let count = int_lit.base10_parse::<usize>()?;
 
-		Ok(Self { vis, ident, voter_type, target_type, weight_type, count, compact_encoding } )
+		Ok(Self { vis, ident, voter_type, target_type, weight_type, count, compact_encoding })
 	}
 }
 
diff --git a/primitives/npos-elections/fuzzer/src/common.rs b/primitives/npos-elections/fuzzer/src/common.rs
index fe237c930de1..e97f7f7df8b1 100644
--- a/primitives/npos-elections/fuzzer/src/common.rs
+++ b/primitives/npos-elections/fuzzer/src/common.rs
@@ -62,11 +62,7 @@ pub fn generate_random_npos_inputs(
 	candidate_count: usize,
 	voter_count: usize,
 	mut rng: impl Rng,
-) -> (
-	usize,
-	Vec<AccountId>,
-	Vec<(AccountId, VoteWeight, Vec<AccountId>)>,
-) {
+) -> (usize, Vec<AccountId>, Vec<(AccountId, VoteWeight, Vec<AccountId>)>) {
 	// cache for fast generation of unique candidate and voter ids
 	let mut used_ids = HashSet::with_capacity(candidate_count + voter_count);
 
diff --git a/primitives/npos-elections/fuzzer/src/compact.rs b/primitives/npos-elections/fuzzer/src/compact.rs
index a49f6a535e5f..b171765e783f 100644
--- a/primitives/npos-elections/fuzzer/src/compact.rs
+++ b/primitives/npos-elections/fuzzer/src/compact.rs
@@ -1,6 +1,5 @@
 use honggfuzz::fuzz;
-use sp_npos_elections::generate_solution_type;
-use sp_npos_elections::sp_arithmetic::Percent;
+use sp_npos_elections::{generate_solution_type, sp_arithmetic::Percent};
 use sp_runtime::codec::{Encode, Error};
 
 fn main() {
@@ -26,9 +25,8 @@ fn main() {
 				// The reencoded value should definitely be decodable (if unwrap() fails that is a valid
 				// panic/finding for the fuzzer):
 				let decoded2: InnerTestSolutionCompact =
-					<InnerTestSolutionCompact as codec::Decode>::decode(
-						&mut reencoded.as_slice(),
-					).unwrap();
+					<InnerTestSolutionCompact as codec::Decode>::decode(&mut reencoded.as_slice())
+						.unwrap();
 				// And it should be equal to the original decoded object (resulting from directly
 				// decoding fuzzer_data):
 				assert_eq!(decoded, decoded2);
diff --git a/primitives/npos-elections/fuzzer/src/phragmen_balancing.rs b/primitives/npos-elections/fuzzer/src/phragmen_balancing.rs
index 4ff18e95d1ef..04ff60683f9c 100644
--- a/primitives/npos-elections/fuzzer/src/phragmen_balancing.rs
+++ b/primitives/npos-elections/fuzzer/src/phragmen_balancing.rs
@@ -21,23 +21,17 @@ mod common;
 
 use common::*;
 use honggfuzz::fuzz;
+use rand::{self, SeedableRng};
 use sp_npos_elections::{
 	assignment_ratio_to_staked_normalized, is_score_better, seq_phragmen, to_supports,
 	to_without_backing, EvaluateSupport, VoteWeight,
 };
 use sp_runtime::Perbill;
-use rand::{self, SeedableRng};
 
 fn main() {
 	loop {
 		fuzz!(|data: (usize, usize, usize, usize, u64)| {
-			let (
-				mut target_count,
-				mut voter_count,
-				mut iterations,
-				mut to_elect,
-				seed,
-			) = data;
+			let (mut target_count, mut voter_count, mut iterations, mut to_elect, seed) = data;
 			let rng = rand::rngs::SmallRng::seed_from_u64(seed);
 			target_count = to_range(target_count, 100, 200);
 			voter_count = to_range(voter_count, 100, 200);
@@ -48,12 +42,7 @@ fn main() {
 				"++ [voter_count: {} / target_count:{} / to_elect:{} / iterations:{}]",
 				voter_count, target_count, to_elect, iterations,
 			);
-			let (
-				unbalanced,
-				candidates,
-				voters,
-				stake_of_tree,
-			) = generate_random_npos_result(
+			let (unbalanced, candidates, voters, stake_of_tree) = generate_random_npos_result(
 				voter_count as u64,
 				target_count as u64,
 				to_elect,
@@ -61,9 +50,7 @@ fn main() {
 				ElectionType::Phragmen(None),
 			);
 
-			let stake_of = |who: &AccountId| -> VoteWeight {
-				*stake_of_tree.get(who).unwrap()
-			};
+			let stake_of = |who: &AccountId| -> VoteWeight { *stake_of_tree.get(who).unwrap() };
 
 			let unbalanced_score = {
 				let staked = assignment_ratio_to_staked_normalized(
@@ -76,7 +63,7 @@ fn main() {
 
 				if score[0] == 0 {
 					// such cases cannot be improved by balancing.
-					return;
+					return
 				}
 				score
 			};
@@ -87,34 +74,32 @@ fn main() {
 					candidates,
 					voters,
 					Some((iterations, 0)),
-				).unwrap();
+				)
+				.unwrap();
 
 				let balanced_score = {
 					let staked = assignment_ratio_to_staked_normalized(
 						balanced.assignments.clone(),
 						&stake_of,
-					).unwrap();
+					)
+					.unwrap();
 					let winners = to_without_backing(balanced.winners);
 					to_supports(winners.as_ref(), staked.as_ref()).unwrap().evaluate()
-
 				};
 
 				let enhance = is_score_better(balanced_score, unbalanced_score, Perbill::zero());
 
 				println!(
 					"iter = {} // {:?} -> {:?} [{}]",
-					iterations,
-					unbalanced_score,
-					balanced_score,
-					enhance,
+					iterations, unbalanced_score, balanced_score, enhance,
 				);
 
 				// The only guarantee of balancing is such that the first and third element of the score
 				// cannot decrease.
 				assert!(
 					balanced_score[0] >= unbalanced_score[0] &&
-					balanced_score[1] == unbalanced_score[1] &&
-					balanced_score[2] <= unbalanced_score[2]
+						balanced_score[1] == unbalanced_score[1] &&
+						balanced_score[2] <= unbalanced_score[2]
 				);
 			}
 		});
diff --git a/primitives/npos-elections/fuzzer/src/phragmen_pjr.rs b/primitives/npos-elections/fuzzer/src/phragmen_pjr.rs
index 49794f21fb25..6efc17f24f93 100644
--- a/primitives/npos-elections/fuzzer/src/phragmen_pjr.rs
+++ b/primitives/npos-elections/fuzzer/src/phragmen_pjr.rs
@@ -37,7 +37,6 @@
 //!
 //! Once a panic is found, it can be debugged with
 //! `HFUZZ_RUN_ARGS="-t 10" cargo hfuzz run-debug phragmen_pjr hfuzz_workspace/phragmen_pjr/*.fuzz`.
-//!
 
 #[cfg(fuzzing)]
 use honggfuzz::fuzz;
diff --git a/primitives/npos-elections/fuzzer/src/phragmms_balancing.rs b/primitives/npos-elections/fuzzer/src/phragmms_balancing.rs
index 8ce7e7d415fa..0d8a07489d31 100644
--- a/primitives/npos-elections/fuzzer/src/phragmms_balancing.rs
+++ b/primitives/npos-elections/fuzzer/src/phragmms_balancing.rs
@@ -21,23 +21,17 @@ mod common;
 
 use common::*;
 use honggfuzz::fuzz;
+use rand::{self, SeedableRng};
 use sp_npos_elections::{
 	assignment_ratio_to_staked_normalized, is_score_better, phragmms, to_supports,
 	to_without_backing, EvaluateSupport, VoteWeight,
 };
 use sp_runtime::Perbill;
-use rand::{self, SeedableRng};
 
 fn main() {
 	loop {
 		fuzz!(|data: (usize, usize, usize, usize, u64)| {
-			let (
-				mut target_count,
-				mut voter_count,
-				mut iterations,
-				mut to_elect,
-				seed,
-			) = data;
+			let (mut target_count, mut voter_count, mut iterations, mut to_elect, seed) = data;
 			let rng = rand::rngs::SmallRng::seed_from_u64(seed);
 			target_count = to_range(target_count, 100, 200);
 			voter_count = to_range(voter_count, 100, 200);
@@ -48,12 +42,7 @@ fn main() {
 				"++ [voter_count: {} / target_count:{} / to_elect:{} / iterations:{}]",
 				voter_count, target_count, to_elect, iterations,
 			);
-			let (
-				unbalanced,
-				candidates,
-				voters,
-				stake_of_tree,
-			) = generate_random_npos_result(
+			let (unbalanced, candidates, voters, stake_of_tree) = generate_random_npos_result(
 				voter_count as u64,
 				target_count as u64,
 				to_elect,
@@ -61,9 +50,7 @@ fn main() {
 				ElectionType::Phragmms(None),
 			);
 
-			let stake_of = |who: &AccountId| -> VoteWeight {
-				*stake_of_tree.get(who).unwrap()
-			};
+			let stake_of = |who: &AccountId| -> VoteWeight { *stake_of_tree.get(who).unwrap() };
 
 			let unbalanced_score = {
 				let staked = assignment_ratio_to_staked_normalized(
@@ -76,7 +63,7 @@ fn main() {
 
 				if score[0] == 0 {
 					// such cases cannot be improved by balancing.
-					return;
+					return
 				}
 				score
 			};
@@ -86,34 +73,30 @@ fn main() {
 				candidates,
 				voters,
 				Some((iterations, 0)),
-			).unwrap();
+			)
+			.unwrap();
 
 			let balanced_score = {
 				let staked =
 					assignment_ratio_to_staked_normalized(balanced.assignments.clone(), &stake_of)
 						.unwrap();
 				let winners = to_without_backing(balanced.winners);
-				to_supports(winners.as_ref(), staked.as_ref())
-					.unwrap()
-					.evaluate()
+				to_supports(winners.as_ref(), staked.as_ref()).unwrap().evaluate()
 			};
 
 			let enhance = is_score_better(balanced_score, unbalanced_score, Perbill::zero());
 
 			println!(
 				"iter = {} // {:?} -> {:?} [{}]",
-				iterations,
-				unbalanced_score,
-				balanced_score,
-				enhance,
+				iterations, unbalanced_score, balanced_score, enhance,
 			);
 
 			// The only guarantee of balancing is such that the first and third element of the score
 			// cannot decrease.
 			assert!(
 				balanced_score[0] >= unbalanced_score[0] &&
-				balanced_score[1] == unbalanced_score[1] &&
-				balanced_score[2] <= unbalanced_score[2]
+					balanced_score[1] == unbalanced_score[1] &&
+					balanced_score[2] <= unbalanced_score[2]
 			);
 		});
 	}
diff --git a/primitives/npos-elections/fuzzer/src/reduce.rs b/primitives/npos-elections/fuzzer/src/reduce.rs
index 4ee2468d9d14..a7e77fdd516a 100644
--- a/primitives/npos-elections/fuzzer/src/reduce.rs
+++ b/primitives/npos-elections/fuzzer/src/reduce.rs
@@ -34,8 +34,8 @@ use honggfuzz::fuzz;
 
 mod common;
 use common::to_range;
-use sp_npos_elections::{reduce, to_support_map, ExtendedBalance, StakedAssignment};
 use rand::{self, Rng, RngCore, SeedableRng};
+use sp_npos_elections::{reduce, to_support_map, ExtendedBalance, StakedAssignment};
 
 type Balance = u128;
 type AccountId = u64;
@@ -50,13 +50,8 @@ fn main() {
 			let rng = rand::rngs::SmallRng::seed_from_u64(seed);
 			target_count = to_range(target_count, 100, 1000);
 			voter_count = to_range(voter_count, 100, 2000);
-			let (assignments, winners) = generate_random_phragmen_assignment(
-				voter_count,
-				target_count,
-				8,
-				8,
-				rng
-			);
+			let (assignments, winners) =
+				generate_random_phragmen_assignment(voter_count, target_count, 8, 8, rng);
 			reduce_and_compare(&assignments, &winners);
 		});
 	}
@@ -82,23 +77,27 @@ fn generate_random_phragmen_assignment(
 
 	(1..=voter_count).for_each(|acc| {
 		let mut targets_to_chose_from = all_targets.clone();
-		let targets_to_chose = if edge_per_voter_var > 0 { rng.gen_range(
-			avg_edge_per_voter - edge_per_voter_var,
-			avg_edge_per_voter + edge_per_voter_var,
-		) } else { avg_edge_per_voter };
-
-		let distribution = (0..targets_to_chose).map(|_| {
-			let target = targets_to_chose_from.remove(rng.gen_range(0, targets_to_chose_from.len()));
-			if winners.iter().find(|w| **w == target).is_none() {
-				winners.push(target.clone());
-			}
-			(target, rng.gen_range(1 * KSM, 100 * KSM))
-		}).collect::<Vec<(AccountId, ExtendedBalance)>>();
-
-		assignments.push(StakedAssignment {
-			who: (acc as AccountId),
-			distribution,
-		});
+		let targets_to_chose = if edge_per_voter_var > 0 {
+			rng.gen_range(
+				avg_edge_per_voter - edge_per_voter_var,
+				avg_edge_per_voter + edge_per_voter_var,
+			)
+		} else {
+			avg_edge_per_voter
+		};
+
+		let distribution = (0..targets_to_chose)
+			.map(|_| {
+				let target =
+					targets_to_chose_from.remove(rng.gen_range(0, targets_to_chose_from.len()));
+				if winners.iter().find(|w| **w == target).is_none() {
+					winners.push(target.clone());
+				}
+				(target, rng.gen_range(1 * KSM, 100 * KSM))
+			})
+			.collect::<Vec<(AccountId, ExtendedBalance)>>();
+
+		assignments.push(StakedAssignment { who: (acc as AccountId), distribution });
 	});
 
 	(assignments, winners)
@@ -117,10 +116,7 @@ fn assert_assignments_equal(
 	}
 }
 
-fn reduce_and_compare(
-	assignment: &Vec<StakedAssignment<AccountId>>,
-	winners: &Vec<AccountId>,
-) {
+fn reduce_and_compare(assignment: &Vec<StakedAssignment<AccountId>>, winners: &Vec<AccountId>) {
 	let mut altered_assignment = assignment.clone();
 	let n = assignment.len() as u32;
 	let m = winners.len() as u32;
@@ -138,15 +134,13 @@ fn reduce_and_compare(
 		num_changed,
 	);
 
-	assert_assignments_equal(
-		winners,
-		&assignment,
-		&altered_assignment,
-	);
+	assert_assignments_equal(winners, &assignment, &altered_assignment);
 }
 
 fn assignment_len(assignments: &[StakedAssignment<AccountId>]) -> u32 {
 	let mut counter = 0;
-	assignments.iter().for_each(|x| x.distribution.iter().for_each(|_| counter += 1));
+	assignments
+		.iter()
+		.for_each(|x| x.distribution.iter().for_each(|_| counter += 1));
 	counter
 }
diff --git a/primitives/npos-elections/src/assignments.rs b/primitives/npos-elections/src/assignments.rs
index aacd01a03069..b0dd29dc1904 100644
--- a/primitives/npos-elections/src/assignments.rs
+++ b/primitives/npos-elections/src/assignments.rs
@@ -18,8 +18,11 @@
 //! Structs and helpers for distributing a voter's stake among various winners.
 
 use crate::{Error, ExtendedBalance, IdentifierT, PerThing128, __OrInvalidIndex};
-use codec::{Encode, Decode};
-use sp_arithmetic::{traits::{Bounded, Zero}, Normalizable, PerThing};
+use codec::{Decode, Encode};
+use sp_arithmetic::{
+	traits::{Bounded, Zero},
+	Normalizable, PerThing,
+};
 use sp_core::RuntimeDebug;
 use sp_std::vec::Vec;
 
@@ -61,10 +64,7 @@ impl<AccountId: IdentifierT, P: PerThing128> Assignment<AccountId, P> {
 			})
 			.collect::<Vec<(AccountId, ExtendedBalance)>>();
 
-		StakedAssignment {
-			who: self.who,
-			distribution,
-		}
+		StakedAssignment { who: self.who, distribution }
 	}
 
 	/// Try and normalize this assignment.
@@ -83,12 +83,13 @@ impl<AccountId: IdentifierT, P: PerThing128> Assignment<AccountId, P> {
 			.map(|(_, p)| *p)
 			.collect::<Vec<_>>()
 			.normalize(P::one())
-			.map(|normalized_ratios|
-				self.distribution
-					.iter_mut()
-					.zip(normalized_ratios)
-					.for_each(|((_, old), corrected)| { *old = corrected; })
-			)
+			.map(|normalized_ratios| {
+				self.distribution.iter_mut().zip(normalized_ratios).for_each(
+					|((_, old), corrected)| {
+						*old = corrected;
+					},
+				)
+			})
 	}
 }
 
@@ -118,7 +119,8 @@ impl<AccountId> StakedAssignment<AccountId> {
 		AccountId: IdentifierT,
 	{
 		let stake = self.total();
-		let distribution = self.distribution
+		let distribution = self
+			.distribution
 			.into_iter()
 			.filter_map(|(target, w)| {
 				let per_thing = P::from_rational(w, stake);
@@ -130,10 +132,7 @@ impl<AccountId> StakedAssignment<AccountId> {
 			})
 			.collect::<Vec<(AccountId, P)>>();
 
-		Assignment {
-			who: self.who,
-			distribution,
-		}
+		Assignment { who: self.who, distribution }
 	}
 
 	/// Try and normalize this assignment.
@@ -152,12 +151,13 @@ impl<AccountId> StakedAssignment<AccountId> {
 			.map(|(_, ref weight)| *weight)
 			.collect::<Vec<_>>()
 			.normalize(stake)
-			.map(|normalized_weights|
-				self.distribution
-					.iter_mut()
-					.zip(normalized_weights.into_iter())
-					.for_each(|((_, weight), corrected)| { *weight = corrected; })
-			)
+			.map(|normalized_weights| {
+				self.distribution.iter_mut().zip(normalized_weights.into_iter()).for_each(
+					|((_, weight), corrected)| {
+						*weight = corrected;
+					},
+				)
+			})
 	}
 
 	/// Get the total stake of this assignment (aka voter budget).
diff --git a/primitives/npos-elections/src/balancing.rs b/primitives/npos-elections/src/balancing.rs
index 48cb980d78c3..378ebe8e84fd 100644
--- a/primitives/npos-elections/src/balancing.rs
+++ b/primitives/npos-elections/src/balancing.rs
@@ -26,7 +26,7 @@
 //!
 //! See [`balance`] for more information.
 
-use crate::{IdentifierT, Voter, ExtendedBalance, Edge};
+use crate::{Edge, ExtendedBalance, IdentifierT, Voter};
 use sp_arithmetic::traits::Zero;
 use sp_std::prelude::*;
 
@@ -57,19 +57,23 @@ pub fn balance<AccountId: IdentifierT>(
 	iterations: usize,
 	tolerance: ExtendedBalance,
 ) -> usize {
-	if iterations == 0 { return 0; }
+	if iterations == 0 {
+		return 0
+	}
 
 	let mut iter = 0;
 	loop {
 		let mut max_diff = 0;
 		for voter in voters.iter_mut() {
 			let diff = balance_voter(voter, tolerance);
-			if diff > max_diff { max_diff = diff; }
+			if diff > max_diff {
+				max_diff = diff;
+			}
 		}
 
 		iter += 1;
 		if max_diff <= tolerance || iter >= iterations {
-			break iter;
+			break iter
 		}
 	}
 }
@@ -80,7 +84,8 @@ pub(crate) fn balance_voter<AccountId: IdentifierT>(
 	tolerance: ExtendedBalance,
 ) -> ExtendedBalance {
 	// create a shallow copy of the elected ones. The original one will not be used henceforth.
-	let mut elected_edges = voter.edges
+	let mut elected_edges = voter
+		.edges
 		.iter_mut()
 		.filter(|e| e.candidate.borrow().elected)
 		.collect::<Vec<&mut Edge<AccountId>>>();
@@ -91,9 +96,8 @@ pub(crate) fn balance_voter<AccountId: IdentifierT>(
 	}
 
 	// amount of stake from this voter that is used in edges.
-	let stake_used = elected_edges
-		.iter()
-		.fold(0, |a: ExtendedBalance, e| a.saturating_add(e.weight));
+	let stake_used =
+		elected_edges.iter().fold(0, |a: ExtendedBalance, e| a.saturating_add(e.weight));
 
 	// backed stake of each of the elected edges.
 	let backed_stakes = elected_edges
@@ -104,13 +108,7 @@ pub(crate) fn balance_voter<AccountId: IdentifierT>(
 	// backed stake of all the edges for whom we've spent some stake.
 	let backing_backed_stake = elected_edges
 		.iter()
-		.filter_map(|e|
-			if e.weight > 0 {
-				Some(e.candidate.borrow().backed_stake)
-			} else {
-				None
-			}
-		)
+		.filter_map(|e| if e.weight > 0 { Some(e.candidate.borrow().backed_stake) } else { None })
 		.collect::<Vec<_>>();
 
 	let difference = if backing_backed_stake.len() > 0 {
@@ -125,7 +123,7 @@ pub(crate) fn balance_voter<AccountId: IdentifierT>(
 		let mut difference = max_stake.saturating_sub(*min_stake);
 		difference = difference.saturating_add(voter.budget.saturating_sub(stake_used));
 		if difference < tolerance {
-			return difference;
+			return difference
 		}
 		difference
 	} else {
@@ -156,12 +154,18 @@ pub(crate) fn balance_voter<AccountId: IdentifierT>(
 		cumulative_backed_stake = cumulative_backed_stake.saturating_add(backed_stake);
 	}
 
-	let last_stake = elected_edges.get(last_index).expect(
-		"length of elected_edges is greater than or equal 2; last_index index is at \
-		the minimum elected_edges.len() - 1; index is within range; qed"
-	).candidate.borrow().backed_stake;
+	let last_stake = elected_edges
+		.get(last_index)
+		.expect(
+			"length of elected_edges is greater than or equal 2; last_index index is at \
+		the minimum elected_edges.len() - 1; index is within range; qed",
+		)
+		.candidate
+		.borrow()
+		.backed_stake;
 	let ways_to_split = last_index + 1;
-	let excess = voter.budget
+	let excess = voter
+		.budget
 		.saturating_add(cumulative_backed_stake)
 		.saturating_sub(last_stake.saturating_mul(ways_to_split as ExtendedBalance));
 
diff --git a/primitives/npos-elections/src/helpers.rs b/primitives/npos-elections/src/helpers.rs
index 9fdf76118f89..5b02eaf2ad2e 100644
--- a/primitives/npos-elections/src/helpers.rs
+++ b/primitives/npos-elections/src/helpers.rs
@@ -17,7 +17,9 @@
 
 //! Helper methods for npos-elections.
 
-use crate::{Assignment, Error, IdentifierT, PerThing128, StakedAssignment, VoteWeight, WithApprovalOf};
+use crate::{
+	Assignment, Error, IdentifierT, PerThing128, StakedAssignment, VoteWeight, WithApprovalOf,
+};
 use sp_arithmetic::PerThing;
 use sp_std::prelude::*;
 
@@ -52,7 +54,8 @@ where
 	staked
 		.iter_mut()
 		.map(|a| {
-			a.try_normalize(stake_of(&a.who).into()).map_err(|err| Error::ArithmeticError(err))
+			a.try_normalize(stake_of(&a.who).into())
+				.map_err(|err| Error::ArithmeticError(err))
 		})
 		.collect::<Result<_, _>>()?;
 	Ok(staked)
@@ -113,14 +116,8 @@ mod tests {
 		assert_eq!(
 			staked,
 			vec![
-				StakedAssignment {
-					who: 1u32,
-					distribution: vec![(10u32, 50), (20, 50),]
-				},
-				StakedAssignment {
-					who: 2u32,
-					distribution: vec![(10u32, 33), (20, 67),]
-				}
+				StakedAssignment { who: 1u32, distribution: vec![(10u32, 50), (20, 50),] },
+				StakedAssignment { who: 2u32, distribution: vec![(10u32, 33), (20, 67),] }
 			]
 		);
 	}
diff --git a/primitives/npos-elections/src/lib.rs b/primitives/npos-elections/src/lib.rs
index c1cf41a40f2b..ece5be33b114 100644
--- a/primitives/npos-elections/src/lib.rs
+++ b/primitives/npos-elections/src/lib.rs
@@ -78,6 +78,7 @@ use sp_arithmetic::{
 	traits::{Bounded, UniqueSaturatedInto, Zero},
 	Normalizable, PerThing, Rational128, ThresholdOrd,
 };
+use sp_core::RuntimeDebug;
 use sp_std::{
 	cell::RefCell,
 	cmp::Ordering,
@@ -88,7 +89,6 @@ use sp_std::{
 	prelude::*,
 	rc::Rc,
 };
-use sp_core::RuntimeDebug;
 
 use codec::{Decode, Encode};
 #[cfg(feature = "std")]
@@ -100,21 +100,21 @@ mod mock;
 mod tests;
 
 mod assignments;
-pub mod phragmen;
 pub mod balancing;
-pub mod phragmms;
-pub mod node;
-pub mod reduce;
 pub mod helpers;
+pub mod node;
+pub mod phragmen;
+pub mod phragmms;
 pub mod pjr;
+pub mod reduce;
 
-pub use assignments::{Assignment, IndexAssignment, StakedAssignment, IndexAssignmentOf};
-pub use reduce::reduce;
+pub use assignments::{Assignment, IndexAssignment, IndexAssignmentOf, StakedAssignment};
+pub use balancing::*;
 pub use helpers::*;
 pub use phragmen::*;
 pub use phragmms::*;
-pub use balancing::*;
 pub use pjr::*;
+pub use reduce::reduce;
 
 // re-export the compact macro, with the dependencies of the macro.
 #[doc(hidden)]
@@ -206,9 +206,7 @@ where
 
 	/// Get the average edge count.
 	fn average_edge_count(&self) -> usize {
-		self.edge_count()
-			.checked_div(self.voter_count())
-			.unwrap_or(0)
+		self.edge_count().checked_div(self.voter_count()).unwrap_or(0)
 	}
 
 	/// Remove a certain voter.
@@ -379,9 +377,14 @@ impl<AccountId: IdentifierT> Voter<AccountId> {
 			.into_iter()
 			.filter_map(|e| {
 				let per_thing = P::from_rational(e.weight, budget);
-			// trim zero edges.
-			if per_thing.is_zero() { None } else { Some((e.who, per_thing)) }
-		}).collect::<Vec<_>>();
+				// trim zero edges.
+				if per_thing.is_zero() {
+					None
+				} else {
+					Some((e.who, per_thing))
+				}
+			})
+			.collect::<Vec<_>>();
 
 		if distribution.len() > 0 {
 			Some(Assignment { who, distribution })
@@ -611,10 +614,7 @@ pub fn is_score_better<P: PerThing>(this: ElectionScore, that: ElectionScore, ep
 	match this
 		.iter()
 		.zip(that.iter())
-		.map(|(thi, tha)| (
-			thi.ge(&tha),
-			thi.tcmp(&tha, epsilon.mul_ceil(*tha)),
-		))
+		.map(|(thi, tha)| (thi.ge(&tha), thi.tcmp(&tha, epsilon.mul_ceil(*tha))))
 		.collect::<Vec<(bool, Ordering)>>()
 		.as_slice()
 	{
@@ -653,40 +653,34 @@ pub fn setup_inputs<AccountId: IdentifierT>(
 		})
 		.collect::<Vec<CandidatePtr<AccountId>>>();
 
-	let voters = initial_voters.into_iter().filter_map(|(who, voter_stake, votes)| {
-		let mut edges: Vec<Edge<AccountId>> = Vec::with_capacity(votes.len());
-		for v in votes {
-			if edges.iter().any(|e| e.who == v) {
-				// duplicate edge.
-				continue;
-			}
-			if let Some(idx) = c_idx_cache.get(&v) {
-				// This candidate is valid + already cached.
-				let mut candidate = candidates[*idx].borrow_mut();
-				candidate.approval_stake =
-					candidate.approval_stake.saturating_add(voter_stake.into());
-				edges.push(
-					Edge {
+	let voters = initial_voters
+		.into_iter()
+		.filter_map(|(who, voter_stake, votes)| {
+			let mut edges: Vec<Edge<AccountId>> = Vec::with_capacity(votes.len());
+			for v in votes {
+				if edges.iter().any(|e| e.who == v) {
+					// duplicate edge.
+					continue
+				}
+				if let Some(idx) = c_idx_cache.get(&v) {
+					// This candidate is valid + already cached.
+					let mut candidate = candidates[*idx].borrow_mut();
+					candidate.approval_stake =
+						candidate.approval_stake.saturating_add(voter_stake.into());
+					edges.push(Edge {
 						who: v.clone(),
 						candidate: Rc::clone(&candidates[*idx]),
 						..Default::default()
-					}
-				);
-			} // else {} would be wrong votes. We don't really care about it.
-		}
-		if edges.is_empty() {
-			None
-		}
-		else {
-			Some(Voter {
-				who,
-				edges: edges,
-				budget: voter_stake.into(),
-				load: Rational128::zero(),
-			})
-		}
-
-	}).collect::<Vec<_>>();
+					});
+				} // else {} would be wrong votes. We don't really care about it.
+			}
+			if edges.is_empty() {
+				None
+			} else {
+				Some(Voter { who, edges, budget: voter_stake.into(), load: Rational128::zero() })
+			}
+		})
+		.collect::<Vec<_>>();
 
-	(candidates, voters,)
+	(candidates, voters)
 }
diff --git a/primitives/npos-elections/src/mock.rs b/primitives/npos-elections/src/mock.rs
index 363550ed8efc..1be591e4ea6f 100644
--- a/primitives/npos-elections/src/mock.rs
+++ b/primitives/npos-elections/src/mock.rs
@@ -20,12 +20,12 @@
 #![cfg(any(test, mocks))]
 
 use std::{
-	collections::{HashSet, HashMap},
+	collections::{HashMap, HashSet},
 	convert::TryInto,
 	hash::Hash,
 };
 
-use rand::{self, Rng, seq::SliceRandom};
+use rand::{self, seq::SliceRandom, Rng};
 use sp_arithmetic::{
 	traits::{One, SaturatedConversion, Zero},
 	PerThing,
@@ -33,7 +33,7 @@ use sp_arithmetic::{
 use sp_runtime::assert_eq_error_rate;
 use sp_std::collections::btree_map::BTreeMap;
 
-use crate::{Assignment, ElectionResult, ExtendedBalance, PerThing128, VoteWeight, seq_phragmen};
+use crate::{seq_phragmen, Assignment, ElectionResult, ExtendedBalance, PerThing128, VoteWeight};
 
 sp_npos_elections_compact::generate_solution_type!(
 	#[compact]
@@ -87,7 +87,7 @@ pub(crate) type _SupportMap<A> = BTreeMap<A, _Support<A>>;
 #[derive(Debug, Clone)]
 pub(crate) struct _ElectionResult<A: Clone> {
 	pub winners: Vec<(A, ExtendedBalance)>,
-	pub assignments: Vec<(A, Vec<_Assignment<A>>)>
+	pub assignments: Vec<(A, Vec<_Assignment<A>>)>,
 }
 
 pub(crate) fn auto_generate_self_voters<A: Clone>(candidates: &[A]) -> Vec<(A, Vec<A>)> {
@@ -99,7 +99,8 @@ pub(crate) fn elect_float<A>(
 	initial_candidates: Vec<A>,
 	initial_voters: Vec<(A, Vec<A>)>,
 	stake_of: impl Fn(&A) -> VoteWeight,
-) -> Option<_ElectionResult<A>> where
+) -> Option<_ElectionResult<A>>
+where
 	A: Default + Ord + Copy,
 {
 	let mut elected_candidates: Vec<(A, ExtendedBalance)>;
@@ -123,17 +124,10 @@ pub(crate) fn elect_float<A>(
 		for v in votes {
 			if let Some(idx) = c_idx_cache.get(&v) {
 				candidates[*idx].approval_stake = candidates[*idx].approval_stake + voter_stake;
-				edges.push(
-					_Edge { who: v.clone(), candidate_index: *idx, ..Default::default() }
-				);
+				edges.push(_Edge { who: v.clone(), candidate_index: *idx, ..Default::default() });
 			}
 		}
-		_Voter {
-			who,
-			edges: edges,
-			budget: voter_stake,
-			load: 0f64,
-		}
+		_Voter { who, edges, budget: voter_stake, load: 0f64 }
 	}));
 
 	let to_elect = candidate_count.min(candidates.len());
@@ -179,7 +173,9 @@ pub(crate) fn elect_float<A>(
 	for n in &mut voters {
 		let mut assignment = (n.who.clone(), vec![]);
 		for e in &mut n.edges {
-			if let Some(c) = elected_candidates.iter().cloned().map(|(c, _)| c).find(|c| *c == e.who) {
+			if let Some(c) =
+				elected_candidates.iter().cloned().map(|(c, _)| c).find(|c| *c == e.who)
+			{
 				if c != n.who {
 					let ratio = e.load / n.load;
 					assignment.1.push((e.who.clone(), ratio));
@@ -191,10 +187,7 @@ pub(crate) fn elect_float<A>(
 		}
 	}
 
-	Some(_ElectionResult {
-		winners: elected_candidates,
-		assignments: assigned,
-	})
+	Some(_ElectionResult { winners: elected_candidates, assignments: assigned })
 }
 
 pub(crate) fn equalize_float<A, FS>(
@@ -211,18 +204,14 @@ pub(crate) fn equalize_float<A, FS>(
 		let mut max_diff = 0.0;
 		for (voter, assignment) in assignments.iter_mut() {
 			let voter_budget = stake_of(&voter);
-			let diff = do_equalize_float(
-				voter,
-				voter_budget,
-				assignment,
-				supports,
-				tolerance,
-			);
-			if diff > max_diff { max_diff = diff; }
+			let diff = do_equalize_float(voter, voter_budget, assignment, supports, tolerance);
+			if diff > max_diff {
+				max_diff = diff;
+			}
 		}
 
 		if max_diff < tolerance {
-			break;
+			break
 		}
 	}
 }
@@ -232,21 +221,20 @@ pub(crate) fn do_equalize_float<A>(
 	budget_balance: VoteWeight,
 	elected_edges: &mut Vec<_Assignment<A>>,
 	support_map: &mut _SupportMap<A>,
-	tolerance: f64
-) -> f64 where
+	tolerance: f64,
+) -> f64
+where
 	A: Ord + Clone,
 {
 	let budget = budget_balance as f64;
-	if elected_edges.is_empty() { return 0.0; }
+	if elected_edges.is_empty() {
+		return 0.0
+	}
 
-	let stake_used = elected_edges
-		.iter()
-		.fold(0.0, |s, e| s + e.1);
+	let stake_used = elected_edges.iter().fold(0.0, |s, e| s + e.1);
 
-	let backed_stakes_iter = elected_edges
-		.iter()
-		.filter_map(|e| support_map.get(&e.0))
-		.map(|e| e.total);
+	let backed_stakes_iter =
+		elected_edges.iter().filter_map(|e| support_map.get(&e.0)).map(|e| e.total);
 
 	let backing_backed_stake = elected_edges
 		.iter()
@@ -268,7 +256,7 @@ pub(crate) fn do_equalize_float<A>(
 		difference = max_stake - min_stake;
 		difference = difference + budget - stake_used;
 		if difference < tolerance {
-			return difference;
+			return difference
 		}
 	} else {
 		difference = budget;
@@ -283,11 +271,12 @@ pub(crate) fn do_equalize_float<A>(
 		e.1 = 0.0;
 	});
 
-	elected_edges.sort_by(|x, y|
-		support_map.get(&x.0)
+	elected_edges.sort_by(|x, y| {
+		support_map
+			.get(&x.0)
 			.and_then(|x| support_map.get(&y.0).and_then(|y| x.total.partial_cmp(&y.total)))
 			.unwrap_or(sp_std::cmp::Ordering::Equal)
-	);
+	});
 
 	let mut cumulative_stake = 0.0;
 	let mut last_index = elected_edges.len() - 1;
@@ -318,20 +307,22 @@ pub(crate) fn do_equalize_float<A>(
 	difference
 }
 
-
-pub(crate) fn create_stake_of(stakes: &[(AccountId, VoteWeight)])
-	-> impl Fn(&AccountId) -> VoteWeight
-{
+pub(crate) fn create_stake_of(
+	stakes: &[(AccountId, VoteWeight)],
+) -> impl Fn(&AccountId) -> VoteWeight {
 	let mut storage = BTreeMap::<AccountId, VoteWeight>::new();
-	stakes.iter().for_each(|s| { storage.insert(s.0, s.1); });
+	stakes.iter().for_each(|s| {
+		storage.insert(s.0, s.1);
+	});
 	move |who: &AccountId| -> VoteWeight { storage.get(who).unwrap().to_owned() }
 }
 
-
 pub fn check_assignments_sum<T: PerThing>(assignments: &[Assignment<AccountId, T>]) {
 	for Assignment { distribution, .. } in assignments {
 		let mut sum: u128 = Zero::zero();
-		distribution.iter().for_each(|(_, p)| sum += p.deconstruct().saturated_into::<u128>());
+		distribution
+			.iter()
+			.for_each(|(_, p)| sum += p.deconstruct().saturated_into::<u128>());
 		assert_eq!(sum, T::ACCURACY.saturated_into(), "Assignment ratio sum is not 100%");
 	}
 }
@@ -341,8 +332,7 @@ pub(crate) fn run_and_compare<Output: PerThing128, FS>(
 	voters: Vec<(AccountId, Vec<AccountId>)>,
 	stake_of: FS,
 	to_elect: usize,
-)
-where
+) where
 	Output: PerThing128,
 	FS: Fn(&AccountId) -> VoteWeight,
 {
@@ -350,24 +340,28 @@ where
 	let ElectionResult { winners, assignments } = seq_phragmen::<_, Output>(
 		to_elect,
 		candidates.clone(),
-		voters.iter().map(|(ref v, ref vs)| (v.clone(), stake_of(v), vs.clone())).collect::<Vec<_>>(),
-		None
-	).unwrap();
+		voters
+			.iter()
+			.map(|(ref v, ref vs)| (v.clone(), stake_of(v), vs.clone()))
+			.collect::<Vec<_>>(),
+		None,
+	)
+	.unwrap();
 
 	// run float poc code.
-	let truth_value = elect_float(
-		to_elect,
-		candidates,
-		voters,
-		&stake_of,
-	).unwrap();
+	let truth_value = elect_float(to_elect, candidates, voters, &stake_of).unwrap();
 
-	assert_eq!(winners.iter().map(|(x, _)| x).collect::<Vec<_>>(), truth_value.winners.iter().map(|(x, _)| x).collect::<Vec<_>>());
+	assert_eq!(
+		winners.iter().map(|(x, _)| x).collect::<Vec<_>>(),
+		truth_value.winners.iter().map(|(x, _)| x).collect::<Vec<_>>()
+	);
 
 	for Assignment { who, distribution } in assignments.iter() {
 		if let Some(float_assignments) = truth_value.assignments.iter().find(|x| x.0 == *who) {
 			for (candidate, per_thingy) in distribution {
-				if let Some(float_assignment) = float_assignments.1.iter().find(|x| x.0 == *candidate ) {
+				if let Some(float_assignment) =
+					float_assignments.1.iter().find(|x| x.0 == *candidate)
+				{
 					assert_eq_error_rate!(
 						Output::from_float(float_assignment.1).deconstruct(),
 						per_thingy.deconstruct(),
@@ -376,8 +370,7 @@ where
 				} else {
 					panic!(
 						"candidate mismatch. This should never happen. could not find ({:?}, {:?})",
-						candidate,
-						per_thingy,
+						candidate, per_thingy,
 					)
 				}
 			}
@@ -394,13 +387,10 @@ pub(crate) fn build_support_map_float(
 	stake_of: impl Fn(&AccountId) -> VoteWeight,
 ) -> _SupportMap<AccountId> {
 	let mut supports = <_SupportMap<AccountId>>::new();
-	result.winners
-		.iter()
-		.map(|(e, _)| (e, stake_of(e) as f64))
-		.for_each(|(e, s)| {
-			let item = _Support { own: s, total: s, ..Default::default() };
-			supports.insert(e.clone(), item);
-		});
+	result.winners.iter().map(|(e, _)| (e, stake_of(e) as f64)).for_each(|(e, s)| {
+		let item = _Support { own: s, total: s, ..Default::default() };
+		supports.insert(e.clone(), item);
+	});
 
 	for (n, assignment) in result.assignments.iter_mut() {
 		for (c, r) in assignment.iter_mut() {
diff --git a/primitives/npos-elections/src/node.rs b/primitives/npos-elections/src/node.rs
index ae65318ff046..ac03f547d2cb 100644
--- a/primitives/npos-elections/src/node.rs
+++ b/primitives/npos-elections/src/node.rs
@@ -55,11 +55,7 @@ impl<A: fmt::Debug> sp_std::fmt::Debug for NodeId<A> {
 			f,
 			"Node({:?}, {:?})",
 			self.who,
-			if self.role == NodeRole::Voter {
-				"V"
-			} else {
-				"T"
-			}
+			if self.role == NodeRole::Voter { "V" } else { "T" }
 		)
 	}
 }
@@ -84,12 +80,7 @@ impl<A: PartialEq> Eq for Node<A> {}
 #[cfg(feature = "std")]
 impl<A: fmt::Debug + Clone> fmt::Debug for Node<A> {
 	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-		write!(
-			f,
-			"({:?} --> {:?})",
-			self.id,
-			self.parent.as_ref().map(|p| p.borrow().id.clone())
-		)
+		write!(f, "({:?} --> {:?})", self.id, self.parent.as_ref().map(|p| p.borrow().id.clone()))
 	}
 }
 
@@ -102,7 +93,7 @@ impl<A: PartialEq + Eq + Clone + fmt::Debug> Node<A> {
 	/// Returns true if `other` is the parent of `who`.
 	pub fn is_parent_of(who: &NodeRef<A>, other: &NodeRef<A>) -> bool {
 		if who.borrow().parent.is_none() {
-			return false;
+			return false
 		}
 		who.borrow().parent.as_ref() == Some(other)
 	}
@@ -136,7 +127,7 @@ impl<A: PartialEq + Eq + Clone + fmt::Debug> Node<A> {
 
 		while let Some(ref next_parent) = current.clone().borrow().parent {
 			if visited.contains(next_parent) {
-				break;
+				break
 			}
 			parent_path.push(next_parent.clone());
 			current = next_parent.clone();
@@ -164,16 +155,7 @@ mod tests {
 	#[test]
 	fn basic_create_works() {
 		let node = Node::new(id(10));
-		assert_eq!(
-			node,
-			Node {
-				id: NodeId {
-					who: 10,
-					role: NodeRole::Target
-				},
-				parent: None
-			}
-		);
+		assert_eq!(node, Node { id: NodeId { who: 10, role: NodeRole::Target }, parent: None });
 	}
 
 	#[test]
@@ -194,9 +176,9 @@ mod tests {
 
 	#[test]
 	fn get_root_works() {
-		//	D <-- A <-- B <-- C
-		//			\
-		//			 <-- E
+		// 	D <-- A <-- B <-- C
+		// 			\
+		// 			 <-- E
 		let a = Node::new(id(1)).into_ref();
 		let b = Node::new(id(2)).into_ref();
 		let c = Node::new(id(3)).into_ref();
@@ -209,29 +191,20 @@ mod tests {
 		Node::set_parent_of(&e, &a);
 		Node::set_parent_of(&a, &d);
 
-		assert_eq!(
-			Node::root(&e),
-			(d.clone(), vec![e.clone(), a.clone(), d.clone()]),
-		);
+		assert_eq!(Node::root(&e), (d.clone(), vec![e.clone(), a.clone(), d.clone()]),);
 
 		assert_eq!(Node::root(&a), (d.clone(), vec![a.clone(), d.clone()]),);
 
-		assert_eq!(
-			Node::root(&c),
-			(d.clone(), vec![c.clone(), b.clone(), a.clone(), d.clone()]),
-		);
+		assert_eq!(Node::root(&c), (d.clone(), vec![c.clone(), b.clone(), a.clone(), d.clone()]),);
 
-		//	D 	    A <-- B <-- C
-		//	F <-- /	\
-		//			 <-- E
+		// 	D 	    A <-- B <-- C
+		// 	F <-- /	\
+		// 			 <-- E
 		Node::set_parent_of(&a, &f);
 
 		assert_eq!(Node::root(&a), (f.clone(), vec![a.clone(), f.clone()]),);
 
-		assert_eq!(
-			Node::root(&c),
-			(f.clone(), vec![c.clone(), b.clone(), a.clone(), f.clone()]),
-		);
+		assert_eq!(Node::root(&c), (f.clone(), vec![c.clone(), b.clone(), a.clone(), f.clone()]),);
 	}
 
 	#[test]
diff --git a/primitives/npos-elections/src/phragmen.rs b/primitives/npos-elections/src/phragmen.rs
index bbead91c938f..0f9b14491976 100644
--- a/primitives/npos-elections/src/phragmen.rs
+++ b/primitives/npos-elections/src/phragmen.rs
@@ -75,11 +75,7 @@ pub fn seq_phragmen<AccountId: IdentifierT, P: PerThing128>(
 ) -> Result<ElectionResult<AccountId, P>, crate::Error> {
 	let (candidates, voters) = setup_inputs(initial_candidates, initial_voters);
 
-	let (candidates, mut voters) = seq_phragmen_core::<AccountId>(
-		rounds,
-		candidates,
-		voters,
-	)?;
+	let (candidates, mut voters) = seq_phragmen_core::<AccountId>(rounds, candidates, voters)?;
 
 	if let Some((iterations, tolerance)) = balance {
 		// NOTE: might create zero-edges, but we will strip them again when we convert voter into
@@ -152,7 +148,8 @@ pub fn seq_phragmen_core<AccountId: IdentifierT>(
 						voter.load.n(),
 						voter.budget,
 						candidate.approval_stake,
-					).unwrap_or(Bounded::max_value());
+					)
+					.unwrap_or(Bounded::max_value());
 					let temp_d = voter.load.d();
 					let temp = Rational128::from(temp_n, temp_d);
 					candidate.score = candidate.score.lazy_saturating_add(temp);
@@ -188,13 +185,9 @@ pub fn seq_phragmen_core<AccountId: IdentifierT>(
 		for edge in &mut voter.edges {
 			if edge.candidate.borrow().elected {
 				// update internal state.
-				edge.weight = multiply_by_rational(
-					voter.budget,
-					edge.load.n(),
-					voter.load.n(),
-				)
-				// If result cannot fit in u128. Not much we can do about it.
-				.unwrap_or(Bounded::max_value());
+				edge.weight = multiply_by_rational(voter.budget, edge.load.n(), voter.load.n())
+					// If result cannot fit in u128. Not much we can do about it.
+					.unwrap_or(Bounded::max_value());
 			} else {
 				edge.weight = 0
 			}
diff --git a/primitives/npos-elections/src/phragmms.rs b/primitives/npos-elections/src/phragmms.rs
index 2a643d3673a5..95551d9761fc 100644
--- a/primitives/npos-elections/src/phragmms.rs
+++ b/primitives/npos-elections/src/phragmms.rs
@@ -1,4 +1,4 @@
- // This file is part of Substrate.
+// This file is part of Substrate.
 
 // Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
@@ -22,10 +22,10 @@
 //! MMS algorithm.
 
 use crate::{
-	IdentifierT, ElectionResult, ExtendedBalance, setup_inputs, VoteWeight, Voter, CandidatePtr,
-	balance, PerThing128,
+	balance, setup_inputs, CandidatePtr, ElectionResult, ExtendedBalance, IdentifierT, PerThing128,
+	VoteWeight, Voter,
 };
-use sp_arithmetic::{PerThing, Rational128, traits::Bounded};
+use sp_arithmetic::{traits::Bounded, PerThing, Rational128};
 use sp_std::{prelude::*, rc::Rc};
 
 /// Execute the phragmms method.
@@ -62,15 +62,17 @@ pub fn phragmms<AccountId: IdentifierT, P: PerThing128>(
 				balance(&mut voters, iterations, tolerance);
 			}
 		} else {
-			break;
+			break
 		}
 	}
 
-	let mut assignments = voters.into_iter().filter_map(|v| v.into_assignment()).collect::<Vec<_>>();
+	let mut assignments =
+		voters.into_iter().filter_map(|v| v.into_assignment()).collect::<Vec<_>>();
 	let _ = assignments.iter_mut().map(|a| a.try_normalize()).collect::<Result<(), _>>()?;
-	let winners = winners.into_iter().map(|w_ptr|
-		(w_ptr.borrow().who.clone(), w_ptr.borrow().backed_stake)
-	).collect();
+	let winners = winners
+		.into_iter()
+		.map(|w_ptr| (w_ptr.borrow().who.clone(), w_ptr.borrow().backed_stake))
+		.collect();
 
 	Ok(ElectionResult { winners, assignments })
 }
@@ -101,10 +103,8 @@ pub(crate) fn calculate_max_score<AccountId: IdentifierT, P: PerThing>(
 		for edge in voter.edges.iter() {
 			let edge_candidate = edge.candidate.borrow();
 			if edge_candidate.elected {
-				let edge_contribution: ExtendedBalance = P::from_rational(
-					edge.weight,
-					edge_candidate.backed_stake,
-				).deconstruct().into();
+				let edge_contribution: ExtendedBalance =
+					P::from_rational(edge.weight, edge_candidate.backed_stake).deconstruct().into();
 				denominator_contribution += edge_contribution;
 			}
 		}
@@ -125,7 +125,7 @@ pub(crate) fn calculate_max_score<AccountId: IdentifierT, P: PerThing>(
 
 	for c_ptr in candidates.iter() {
 		let mut candidate = c_ptr.borrow_mut();
-		if candidate.approval_stake > 0  {
+		if candidate.approval_stake > 0 {
 			// finalise the score value.
 			let score_d = candidate.score.d();
 			let one: ExtendedBalance = P::ACCURACY.into();
@@ -153,7 +153,10 @@ pub(crate) fn calculate_max_score<AccountId: IdentifierT, P: PerThing>(
 			// `RationalInfinite` as the score type does not introduce significant overhead. Then we
 			// can switch the score type to `RationalInfinite` and ensure compatibility with any
 			// crazy token scale.
-			let score_n = candidate.approval_stake.checked_mul(one).unwrap_or_else(|| Bounded::max_value());
+			let score_n = candidate
+				.approval_stake
+				.checked_mul(one)
+				.unwrap_or_else(|| Bounded::max_value());
 			candidate.score = Rational128::from(score_n, score_d);
 
 			// check if we have a new winner.
@@ -180,7 +183,10 @@ pub(crate) fn apply_elected<AccountId: IdentifierT>(
 	elected_ptr: CandidatePtr<AccountId>,
 ) {
 	let elected_who = elected_ptr.borrow().who.clone();
-	let cutoff = elected_ptr.borrow().score.to_den(1)
+	let cutoff = elected_ptr
+		.borrow()
+		.score
+		.to_den(1)
 		.expect("(n / d) < u128::MAX and (n' / 1) == (n / d), thus n' < u128::MAX'; qed.")
 		.n();
 
@@ -193,18 +199,19 @@ pub(crate) fn apply_elected<AccountId: IdentifierT>(
 			elected_backed_stake = elected_backed_stake.saturating_add(new_edge_weight);
 
 			// Iterate over all other edges.
-			for (_, edge) in voter.edges
-				.iter_mut()
-				.enumerate()
-				.filter(|(edge_index, edge_inner)| *edge_index != new_edge_index && edge_inner.weight > 0)
-			{
+			for (_, edge) in
+				voter.edges.iter_mut().enumerate().filter(|(edge_index, edge_inner)| {
+					*edge_index != new_edge_index && edge_inner.weight > 0
+				}) {
 				let mut edge_candidate = edge.candidate.borrow_mut();
 				if edge_candidate.backed_stake > cutoff {
-					let stake_to_take = edge.weight.saturating_mul(cutoff) / edge_candidate.backed_stake.max(1);
+					let stake_to_take =
+						edge.weight.saturating_mul(cutoff) / edge_candidate.backed_stake.max(1);
 
 					// subtract this amount from this edge.
 					edge.weight = edge.weight.saturating_sub(stake_to_take);
-					edge_candidate.backed_stake = edge_candidate.backed_stake.saturating_sub(stake_to_take);
+					edge_candidate.backed_stake =
+						edge_candidate.backed_stake.saturating_sub(stake_to_take);
 
 					// inject it into the outer loop's edge.
 					elected_backed_stake = elected_backed_stake.saturating_add(stake_to_take);
@@ -223,7 +230,7 @@ pub(crate) fn apply_elected<AccountId: IdentifierT>(
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use crate::{ElectionResult, Assignment};
+	use crate::{Assignment, ElectionResult};
 	use sp_runtime::{Perbill, Percent};
 	use sp_std::rc::Rc;
 
@@ -232,32 +239,31 @@ mod tests {
 		//! Manually run the internal steps of phragmms. In each round we select a new winner by
 		//! `max_score`, then apply this change by `apply_elected`, and finally do a `balance` round.
 		let candidates = vec![1, 2, 3];
-		let voters = vec![
-			(10, 10, vec![1, 2]),
-			(20, 20, vec![1, 3]),
-			(30, 30, vec![2, 3]),
-		];
+		let voters = vec![(10, 10, vec![1, 2]), (20, 20, vec![1, 3]), (30, 30, vec![2, 3])];
 
 		let (candidates, mut voters) = setup_inputs(candidates, voters);
 
 		// Round 1
-		let winner = calculate_max_score::<u32, Percent>(candidates.as_ref(), voters.as_ref()).unwrap();
+		let winner =
+			calculate_max_score::<u32, Percent>(candidates.as_ref(), voters.as_ref()).unwrap();
 		assert_eq!(winner.borrow().who, 3);
 		assert_eq!(winner.borrow().score, 50u32.into());
 
 		apply_elected(&mut voters, Rc::clone(&winner));
 		assert_eq!(
-			voters.iter().find(|x| x.who == 30).map(|v| (
-				v.who,
-				v.edges.iter().map(|e| (e.who, e.weight)).collect::<Vec<_>>()
-			)).unwrap(),
+			voters
+				.iter()
+				.find(|x| x.who == 30)
+				.map(|v| (v.who, v.edges.iter().map(|e| (e.who, e.weight)).collect::<Vec<_>>()))
+				.unwrap(),
 			(30, vec![(2, 0), (3, 30)]),
 		);
 		assert_eq!(
-			voters.iter().find(|x| x.who == 20).map(|v| (
-				v.who,
-				v.edges.iter().map(|e| (e.who, e.weight)).collect::<Vec<_>>()
-			)).unwrap(),
+			voters
+				.iter()
+				.find(|x| x.who == 20)
+				.map(|v| (v.who, v.edges.iter().map(|e| (e.who, e.weight)).collect::<Vec<_>>()))
+				.unwrap(),
 			(20, vec![(1, 0), (3, 20)]),
 		);
 
@@ -270,30 +276,34 @@ mod tests {
 		balance(&mut voters, 10, 0);
 
 		// round 2
-		let winner = calculate_max_score::<u32, Percent>(candidates.as_ref(), voters.as_ref()).unwrap();
+		let winner =
+			calculate_max_score::<u32, Percent>(candidates.as_ref(), voters.as_ref()).unwrap();
 		assert_eq!(winner.borrow().who, 2);
 		assert_eq!(winner.borrow().score, 25u32.into());
 
 		apply_elected(&mut voters, Rc::clone(&winner));
 		assert_eq!(
-			voters.iter().find(|x| x.who == 30).map(|v| (
-				v.who,
-				v.edges.iter().map(|e| (e.who, e.weight)).collect::<Vec<_>>()
-			)).unwrap(),
+			voters
+				.iter()
+				.find(|x| x.who == 30)
+				.map(|v| (v.who, v.edges.iter().map(|e| (e.who, e.weight)).collect::<Vec<_>>()))
+				.unwrap(),
 			(30, vec![(2, 15), (3, 15)]),
 		);
 		assert_eq!(
-			voters.iter().find(|x| x.who == 20).map(|v| (
-				v.who,
-				v.edges.iter().map(|e| (e.who, e.weight)).collect::<Vec<_>>()
-			)).unwrap(),
+			voters
+				.iter()
+				.find(|x| x.who == 20)
+				.map(|v| (v.who, v.edges.iter().map(|e| (e.who, e.weight)).collect::<Vec<_>>()))
+				.unwrap(),
 			(20, vec![(1, 0), (3, 20)]),
 		);
 		assert_eq!(
-			voters.iter().find(|x| x.who == 10).map(|v| (
-				v.who,
-				v.edges.iter().map(|e| (e.who, e.weight)).collect::<Vec<_>>()
-			)).unwrap(),
+			voters
+				.iter()
+				.find(|x| x.who == 10)
+				.map(|v| (v.who, v.edges.iter().map(|e| (e.who, e.weight)).collect::<Vec<_>>()))
+				.unwrap(),
 			(10, vec![(1, 0), (2, 10)]),
 		);
 
@@ -306,24 +316,27 @@ mod tests {
 		balance(&mut voters, 10, 0);
 
 		assert_eq!(
-			voters.iter().find(|x| x.who == 30).map(|v| (
-				v.who,
-				v.edges.iter().map(|e| (e.who, e.weight)).collect::<Vec<_>>()
-			)).unwrap(),
+			voters
+				.iter()
+				.find(|x| x.who == 30)
+				.map(|v| (v.who, v.edges.iter().map(|e| (e.who, e.weight)).collect::<Vec<_>>()))
+				.unwrap(),
 			(30, vec![(2, 20), (3, 10)]),
 		);
 		assert_eq!(
-			voters.iter().find(|x| x.who == 20).map(|v| (
-				v.who,
-				v.edges.iter().map(|e| (e.who, e.weight)).collect::<Vec<_>>()
-			)).unwrap(),
+			voters
+				.iter()
+				.find(|x| x.who == 20)
+				.map(|v| (v.who, v.edges.iter().map(|e| (e.who, e.weight)).collect::<Vec<_>>()))
+				.unwrap(),
 			(20, vec![(1, 0), (3, 20)]),
 		);
 		assert_eq!(
-			voters.iter().find(|x| x.who == 10).map(|v| (
-				v.who,
-				v.edges.iter().map(|e| (e.who, e.weight)).collect::<Vec<_>>()
-			)).unwrap(),
+			voters
+				.iter()
+				.find(|x| x.who == 10)
+				.map(|v| (v.who, v.edges.iter().map(|e| (e.who, e.weight)).collect::<Vec<_>>()))
+				.unwrap(),
 			(10, vec![(1, 0), (2, 10)]),
 		);
 	}
@@ -331,25 +344,16 @@ mod tests {
 	#[test]
 	fn basic_election_works() {
 		let candidates = vec![1, 2, 3];
-		let voters = vec![
-			(10, 10, vec![1, 2]),
-			(20, 20, vec![1, 3]),
-			(30, 30, vec![2, 3]),
-		];
+		let voters = vec![(10, 10, vec![1, 2]), (20, 20, vec![1, 3]), (30, 30, vec![2, 3])];
 
-		let ElectionResult { winners, assignments } = phragmms::<_, Perbill>(2, candidates, voters, Some((2, 0))).unwrap();
+		let ElectionResult { winners, assignments } =
+			phragmms::<_, Perbill>(2, candidates, voters, Some((2, 0))).unwrap();
 		assert_eq!(winners, vec![(3, 30), (2, 30)]);
 		assert_eq!(
 			assignments,
 			vec![
-				Assignment {
-					who: 10u64,
-					distribution: vec![(2, Perbill::one())],
-				},
-				Assignment {
-					who: 20,
-					distribution: vec![(3, Perbill::one())],
-				},
+				Assignment { who: 10u64, distribution: vec![(2, Perbill::one())] },
+				Assignment { who: 20, distribution: vec![(3, Perbill::one())] },
 				Assignment {
 					who: 30,
 					distribution: vec![
@@ -374,13 +378,9 @@ mod tests {
 			(130, 1000, vec![61, 71]),
 		];
 
-		let ElectionResult { winners, assignments: _ } = phragmms::<_, Perbill>(4, candidates, voters, Some((2, 0))).unwrap();
-		assert_eq!(winners, vec![
-			(11, 3000),
-			(31, 2000),
-			(51, 1500),
-			(61, 1500),
-		]);
+		let ElectionResult { winners, assignments: _ } =
+			phragmms::<_, Perbill>(4, candidates, voters, Some((2, 0))).unwrap();
+		assert_eq!(winners, vec![(11, 3000), (31, 2000), (51, 1500), (61, 1500),]);
 	}
 
 	#[test]
@@ -391,7 +391,8 @@ mod tests {
 		// give a bit more to 1 and 3.
 		voters.push((2, u64::MAX, vec![1, 3]));
 
-		let ElectionResult { winners, assignments: _ } = phragmms::<_, Perbill>(2, candidates, voters, Some((2, 0))).unwrap();
+		let ElectionResult { winners, assignments: _ } =
+			phragmms::<_, Perbill>(2, candidates, voters, Some((2, 0))).unwrap();
 		assert_eq!(winners.into_iter().map(|(w, _)| w).collect::<Vec<_>>(), vec![1u32, 3]);
 	}
 }
diff --git a/primitives/npos-elections/src/pjr.rs b/primitives/npos-elections/src/pjr.rs
index 290110b14e65..3cc99b33aa57 100644
--- a/primitives/npos-elections/src/pjr.rs
+++ b/primitives/npos-elections/src/pjr.rs
@@ -1,4 +1,4 @@
- // This file is part of Substrate.
+// This file is part of Substrate.
 
 // Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
@@ -23,20 +23,11 @@
 //! See [`pjr_check`] which is the main entry point of the module.
 
 use crate::{
-	Candidate,
-	CandidatePtr,
-	Edge,
-	ExtendedBalance,
-	IdentifierT,
-	Support,
-	SupportMap,
-	Supports,
-	Voter,
-	VoteWeight,
+	Candidate, CandidatePtr, Edge, ExtendedBalance, IdentifierT, Support, SupportMap, Supports,
+	VoteWeight, Voter,
 };
-use sp_std::{rc::Rc, vec::Vec};
-use sp_std::collections::btree_map::BTreeMap;
 use sp_arithmetic::{traits::Zero, Perbill};
+use sp_std::{collections::btree_map::BTreeMap, rc::Rc, vec::Vec};
 /// The type used as the threshold.
 ///
 /// Just some reading sugar; Must always be same as [`ExtendedBalance`];
@@ -60,10 +51,8 @@ pub fn standard_threshold(
 ) -> Threshold {
 	weights
 		.into_iter()
-		.fold(Threshold::zero(), |acc, elem| {
-			acc.saturating_add(elem)
-		})
-	/ committee_size.max(1) as Threshold
+		.fold(Threshold::zero(), |acc, elem| acc.saturating_add(elem)) /
+		committee_size.max(1) as Threshold
 }
 
 /// Check a solution to be PJR.
@@ -74,7 +63,10 @@ pub fn pjr_check<AccountId: IdentifierT>(
 	all_candidates: Vec<AccountId>,
 	all_voters: Vec<(AccountId, VoteWeight, Vec<AccountId>)>,
 ) -> Result<(), AccountId> {
-	let t = standard_threshold(supports.len(), all_voters.iter().map(|voter| voter.1 as ExtendedBalance));
+	let t = standard_threshold(
+		supports.len(),
+		all_voters.iter().map(|voter| voter.1 as ExtendedBalance),
+	);
 	t_pjr_check(supports, all_candidates, all_voters, t)
 }
 
@@ -101,7 +93,6 @@ pub fn pjr_check<AccountId: IdentifierT>(
 /// needs to inspect un-elected candidates and edges, thus `all_candidates` and `all_voters`.
 ///
 /// [NPoS]: https://arxiv.org/pdf/2004.12990v1.pdf
-//
 // ### Implementation Notes
 //
 // The paper uses mathematical notation, which priorities single-symbol names. For programmer ease,
@@ -120,11 +111,7 @@ pub fn t_pjr_check<AccountId: IdentifierT>(
 	t: Threshold,
 ) -> Result<(), AccountId> {
 	// First order of business: derive `(candidates, voters)` from `supports`.
-	let (candidates, voters) = prepare_pjr_input(
-		supports,
-		all_candidates,
-		all_voters,
-	);
+	let (candidates, voters) = prepare_pjr_input(supports, all_candidates, all_voters);
 	// compute with threshold t.
 	pjr_check_core(candidates.as_ref(), voters.as_ref(), t)
 }
@@ -141,7 +128,9 @@ pub fn pjr_check_core<AccountId: IdentifierT>(
 	t: Threshold,
 ) -> Result<(), AccountId> {
 	let unelected = candidates.iter().filter(|c| !c.borrow().elected);
-	let maybe_max_pre_score = unelected.map(|c| (pre_score(Rc::clone(c), voters, t), c.borrow().who.clone())).max();
+	let maybe_max_pre_score = unelected
+		.map(|c| (pre_score(Rc::clone(c), voters, t), c.borrow().who.clone()))
+		.max();
 	// if unelected is empty then the solution is indeed PJR.
 	match maybe_max_pre_score {
 		Some((max_pre_score, counter_example)) if max_pre_score >= t => Err(counter_example),
@@ -165,7 +154,10 @@ pub fn validate_pjr_challenge<AccountId: IdentifierT>(
 	all_candidates: Vec<AccountId>,
 	all_voters: Vec<(AccountId, VoteWeight, Vec<AccountId>)>,
 ) -> bool {
-	let threshold = standard_threshold(supports.len(), all_voters.iter().map(|voter| voter.1 as ExtendedBalance));
+	let threshold = standard_threshold(
+		supports.len(),
+		all_voters.iter().map(|voter| voter.1 as ExtendedBalance),
+	);
 	validate_t_pjr_challenge(counter_example, supports, all_candidates, all_voters, threshold)
 }
 
@@ -186,11 +178,7 @@ pub fn validate_t_pjr_challenge<AccountId: IdentifierT>(
 	all_voters: Vec<(AccountId, VoteWeight, Vec<AccountId>)>,
 	threshold: Threshold,
 ) -> bool {
-	let (candidates, voters) = prepare_pjr_input(
-		supports,
-		all_candidates,
-		all_voters,
-	);
+	let (candidates, voters) = prepare_pjr_input(supports, all_candidates, all_voters);
 	validate_pjr_challenge_core(counter_example, &candidates, &voters, threshold)
 }
 
@@ -219,10 +207,11 @@ fn validate_pjr_challenge_core<AccountId: IdentifierT>(
 	//   unsafe code leveraging the existing `candidates_index`: allocate an uninitialized vector of
 	//   appropriate length, then copy in all the elements. We'd really prefer to avoid unsafe code
 	//   in the runtime, though.
-	let candidate = match candidates.iter().find(|candidate| candidate.borrow().who == counter_example) {
-		None => return false,
-		Some(candidate) => candidate.clone(),
-	};
+	let candidate =
+		match candidates.iter().find(|candidate| candidate.borrow().who == counter_example) {
+			None => return false,
+			Some(candidate) => candidate.clone(),
+		};
 	pre_score(candidate, &voters, threshold) >= threshold
 }
 
@@ -261,10 +250,14 @@ fn prepare_pjr_input<AccountId: IdentifierT>(
 	let mut candidates_index: BTreeMap<AccountId, usize> = BTreeMap::new();
 
 	// dump the staked assignments in a voter-major map for faster access down the road.
-	let mut assignment_map: BTreeMap<AccountId, Vec<(AccountId, ExtendedBalance)>> = BTreeMap::new();
+	let mut assignment_map: BTreeMap<AccountId, Vec<(AccountId, ExtendedBalance)>> =
+		BTreeMap::new();
 	for (winner_id, Support { voters, .. }) in supports.iter() {
 		for (voter_id, support) in voters.iter() {
-			assignment_map.entry(voter_id.clone()).or_default().push((winner_id.clone(), *support));
+			assignment_map
+				.entry(voter_id.clone())
+				.or_default()
+				.push((winner_id.clone(), *support));
 		}
 	}
 
@@ -282,47 +275,56 @@ fn prepare_pjr_input<AccountId: IdentifierT>(
 	let supports: SupportMap<AccountId> = supports.iter().cloned().collect();
 
 	// collect all candidates and winners into a unified `Vec<CandidatePtr>`.
-	let candidates = all_candidates.into_iter().enumerate().map(|(i, c)| {
-		candidates_index.insert(c.clone(), i);
+	let candidates = all_candidates
+		.into_iter()
+		.enumerate()
+		.map(|(i, c)| {
+			candidates_index.insert(c.clone(), i);
 
-		// set the backing value and elected flag if the candidate is among the winners.
-		let who = c;
-		let maybe_support = supports.get(&who);
-		let elected = maybe_support.is_some();
-		let backed_stake = maybe_support.map(|support| support.total).unwrap_or_default();
+			// set the backing value and elected flag if the candidate is among the winners.
+			let who = c;
+			let maybe_support = supports.get(&who);
+			let elected = maybe_support.is_some();
+			let backed_stake = maybe_support.map(|support| support.total).unwrap_or_default();
 
-		Candidate { who, elected, backed_stake, ..Default::default() }.to_ptr()
-	}).collect::<Vec<_>>();
+			Candidate { who, elected, backed_stake, ..Default::default() }.to_ptr()
+		})
+		.collect::<Vec<_>>();
 
 	// collect all voters into a unified Vec<Voters>.
-	let voters = all_voters.into_iter().map(|(v, w, ts)| {
-		let mut edges: Vec<Edge<AccountId>> = Vec::with_capacity(ts.len());
-		for t in ts {
-			if edges.iter().any(|e| e.who == t) {
-				// duplicate edge.
-				continue;
-			}
-
-			if let Some(idx) = candidates_index.get(&t) {
-				// if this edge is among the assignments, set the weight as well.
-				let weight = assignment_map
-					.get(&v)
-					.and_then(|d| d.iter().find_map(|(x, y)| if x == &t { Some(y) } else { None }))
-					.cloned()
-					.unwrap_or_default();
-				edges.push(Edge {
-					who: t,
-					candidate: Rc::clone(&candidates[*idx]),
-					weight,
-					..Default::default()
-				});
+	let voters = all_voters
+		.into_iter()
+		.map(|(v, w, ts)| {
+			let mut edges: Vec<Edge<AccountId>> = Vec::with_capacity(ts.len());
+			for t in ts {
+				if edges.iter().any(|e| e.who == t) {
+					// duplicate edge.
+					continue
+				}
+
+				if let Some(idx) = candidates_index.get(&t) {
+					// if this edge is among the assignments, set the weight as well.
+					let weight = assignment_map
+						.get(&v)
+						.and_then(|d| {
+							d.iter().find_map(|(x, y)| if x == &t { Some(y) } else { None })
+						})
+						.cloned()
+						.unwrap_or_default();
+					edges.push(Edge {
+						who: t,
+						candidate: Rc::clone(&candidates[*idx]),
+						weight,
+						..Default::default()
+					});
+				}
 			}
-		}
 
-		let who = v;
-		let budget: ExtendedBalance = w.into();
-		Voter { who, budget, edges, ..Default::default() }
-	}).collect::<Vec<_>>();
+			let who = v;
+			let budget: ExtendedBalance = w.into();
+			Voter { who, budget, edges, ..Default::default() }
+		})
+		.collect::<Vec<_>>();
 
 	(candidates, voters)
 }
@@ -345,7 +347,6 @@ fn pre_score<AccountId: IdentifierT>(
 		.fold(Zero::zero(), |acc: ExtendedBalance, voter| acc.saturating_add(slack(voter, t)))
 }
 
-
 /// The slack of a voter at a given state.
 ///
 /// The slack of each voter, with threshold `t` is the total amount of stake that this voter can
@@ -363,8 +364,7 @@ fn slack<AccountId: IdentifierT>(voter: &Voter<AccountId>, t: Threshold) -> Exte
 		let candidate = edge.candidate.borrow();
 		if candidate.elected {
 			let extra =
-				Perbill::one().min(Perbill::from_rational(t, candidate.backed_stake))
-				* edge.weight;
+				Perbill::one().min(Perbill::from_rational(t, candidate.backed_stake)) * edge.weight;
 			acc.saturating_add(extra)
 		} else {
 			// No slack generated here.
@@ -383,13 +383,22 @@ mod tests {
 	fn setup_voter(who: u32, votes: Vec<(u32, u128, bool)>) -> Voter<u32> {
 		let mut voter = Voter::new(who);
 		let mut budget = 0u128;
-		let candidates = votes.into_iter().map(|(t, w, e)| {
-			budget += w;
-			Candidate { who: t, elected: e, backed_stake: w, ..Default::default() }
-		}).collect::<Vec<_>>();
-		let edges = candidates.into_iter().map(|c|
-			Edge { who: c.who, weight: c.backed_stake, candidate: c.to_ptr(), ..Default::default() }
-		).collect::<Vec<_>>();
+		let candidates = votes
+			.into_iter()
+			.map(|(t, w, e)| {
+				budget += w;
+				Candidate { who: t, elected: e, backed_stake: w, ..Default::default() }
+			})
+			.collect::<Vec<_>>();
+		let edges = candidates
+			.into_iter()
+			.map(|c| Edge {
+				who: c.who,
+				weight: c.backed_stake,
+				candidate: c.to_ptr(),
+				..Default::default()
+			})
+			.collect::<Vec<_>>();
 		voter.edges = edges;
 		voter.budget = budget;
 		voter
@@ -412,7 +421,6 @@ mod tests {
 		assert_eq!(slack(&voter, 17), 3);
 		assert_eq!(slack(&voter, 10), 10);
 		assert_eq!(slack(&voter, 5), 20);
-
 	}
 
 	#[test]
@@ -440,15 +448,11 @@ mod tests {
 		];
 		// tuples in voters vector are (AccountId, Balance)
 		let supports: Supports<u32> = vec![
-			(20, Support { total: 15, voters: vec![(1, 5), (2, 10)]}),
-			(40, Support { total: 15, voters: vec![(1, 5), (2, 10)]}),
+			(20, Support { total: 15, voters: vec![(1, 5), (2, 10)] }),
+			(40, Support { total: 15, voters: vec![(1, 5), (2, 10)] }),
 		];
 
-		let (candidates, voters) = prepare_pjr_input(
-			&supports,
-			all_candidates,
-			all_voters,
-		);
+		let (candidates, voters) = prepare_pjr_input(&supports, all_candidates, all_voters);
 
 		// elected flag and backing must be set correctly
 		assert_eq!(
@@ -467,7 +471,8 @@ mod tests {
 					v.who,
 					v.budget,
 					v.edges.iter().map(|e| (e.who, e.weight)).collect::<Vec<_>>(),
-				)).collect::<Vec<_>>(),
+				))
+				.collect::<Vec<_>>(),
 			vec![
 				(1, 10, vec![(10, 0), (20, 5), (30, 0), (40, 5)]),
 				(2, 20, vec![(10, 0), (20, 10), (30, 0), (40, 10)]),
@@ -498,15 +503,11 @@ mod tests {
 		];
 		// tuples in voters vector are (AccountId, Balance)
 		let supports: Supports<u32> = vec![
-			(20, Support { total: 15, voters: vec![(1, 5), (2, 10)]}),
-			(40, Support { total: 15, voters: vec![(1, 5), (2, 10)]}),
+			(20, Support { total: 15, voters: vec![(1, 5), (2, 10)] }),
+			(40, Support { total: 15, voters: vec![(1, 5), (2, 10)] }),
 		];
 
-		let (candidates, voters) = prepare_pjr_input(
-			&supports,
-			all_candidates,
-			all_voters,
-		);
+		let (candidates, voters) = prepare_pjr_input(&supports, all_candidates, all_voters);
 
 		find_threshold_phase_change_for_scenario(candidates, voters);
 	}
@@ -521,15 +522,11 @@ mod tests {
 		];
 		// tuples in voters vector are (AccountId, Balance)
 		let supports: Supports<u32> = vec![
-			(20, Support { total: 15, voters: vec![(1, 5), (2, 10)]}),
-			(40, Support { total: 15, voters: vec![(1, 5), (2, 10)]}),
+			(20, Support { total: 15, voters: vec![(1, 5), (2, 10)] }),
+			(40, Support { total: 15, voters: vec![(1, 5), (2, 10)] }),
 		];
 
-		let (candidates, voters) = prepare_pjr_input(
-			&supports,
-			all_candidates,
-			all_voters,
-		);
+		let (candidates, voters) = prepare_pjr_input(&supports, all_candidates, all_voters);
 
 		find_threshold_phase_change_for_scenario(candidates, voters);
 	}
@@ -544,22 +541,18 @@ mod tests {
 		];
 		// tuples in voters vector are (AccountId, Balance)
 		let supports: Supports<u32> = vec![
-			(20, Support { total: 15, voters: vec![(1, 5), (2, 10)]}),
-			(40, Support { total: 15, voters: vec![(1, 5), (2, 10)]}),
+			(20, Support { total: 15, voters: vec![(1, 5), (2, 10)] }),
+			(40, Support { total: 15, voters: vec![(1, 5), (2, 10)] }),
 		];
 
-		let (candidates, voters) = prepare_pjr_input(
-			&supports,
-			all_candidates,
-			all_voters,
-		);
+		let (candidates, voters) = prepare_pjr_input(&supports, all_candidates, all_voters);
 
 		find_threshold_phase_change_for_scenario(candidates, voters);
 	}
 
 	fn find_threshold_phase_change_for_scenario<AccountId: IdentifierT>(
 		candidates: Vec<CandidatePtr<AccountId>>,
-		voters: Vec<Voter<AccountId>>
+		voters: Vec<Voter<AccountId>>,
 	) -> Threshold {
 		let mut threshold = 1;
 		let mut prev_threshold = 0;
@@ -567,7 +560,9 @@ mod tests {
 		// find the binary range containing the threshold beyond which the PJR check succeeds
 		while pjr_check_core(&candidates, &voters, threshold).is_err() {
 			prev_threshold = threshold;
-			threshold = threshold.checked_mul(2).expect("pjr check must fail before we run out of capacity in u128");
+			threshold = threshold
+				.checked_mul(2)
+				.expect("pjr check must fail before we run out of capacity in u128");
 		}
 
 		// now binary search within that range to find the phase threshold
@@ -595,7 +590,7 @@ mod tests {
 				unexpected_successes.push(t);
 			}
 		}
-		for t in high_bound..(high_bound*2) {
+		for t in high_bound..(high_bound * 2) {
 			if pjr_check_core(&candidates, &voters, t).is_err() {
 				unexpected_failures.push(t);
 			}
diff --git a/primitives/npos-elections/src/reduce.rs b/primitives/npos-elections/src/reduce.rs
index a34f1612ca1a..4290743832a5 100644
--- a/primitives/npos-elections/src/reduce.rs
+++ b/primitives/npos-elections/src/reduce.rs
@@ -47,13 +47,15 @@
 //!
 //! 1. <https://hackmd.io/JOn9x98iS0e0DPWQ87zGWg?view>
 
-use crate::node::{Node, NodeId, NodeRef, NodeRole};
-use crate::{ExtendedBalance, IdentifierT, StakedAssignment};
+use crate::{
+	node::{Node, NodeId, NodeRef, NodeRole},
+	ExtendedBalance, IdentifierT, StakedAssignment,
+};
 use sp_arithmetic::traits::{Bounded, Zero};
 use sp_std::{
 	collections::btree_map::{BTreeMap, Entry::*},
-	vec,
 	prelude::*,
+	vec,
 };
 
 /// Map type used for reduce_4. Can be easily swapped with HashMap.
@@ -63,7 +65,7 @@ type Map<A> = BTreeMap<(A, A), A>;
 fn combinations_2<T: Clone>(input: &[T]) -> Vec<(T, T)> {
 	let n = input.len();
 	if n < 2 {
-		return Default::default();
+		return Default::default()
 	}
 
 	let mut comb = Vec::with_capacity(n * (n - 1) / 2);
@@ -126,7 +128,7 @@ fn reduce_4<A: IdentifierT>(assignments: &mut Vec<StakedAssignment<A>>) -> u32 {
 			match combination_map.entry((v1.clone(), v2.clone())) {
 				Vacant(entry) => {
 					entry.insert(who.clone());
-				}
+				},
 				Occupied(mut entry) => {
 					let other_who = entry.get_mut();
 
@@ -141,29 +143,30 @@ fn reduce_4<A: IdentifierT>(assignments: &mut Vec<StakedAssignment<A>>) -> u32 {
 						.filter(|(t, _)| *t == v1 || *t == v2)
 						.count() != 2
 					{
-						continue;
+						continue
 					}
 
 					// check if other_who voted for the same pair v1, v2.
 					let maybe_other_assignments = assignments.iter().find(|a| a.who == *other_who);
 					if maybe_other_assignments.is_none() {
-						continue;
+						continue
 					}
 					let other_assignment =
 						maybe_other_assignments.expect("value is checked to be 'Some'");
 
 					// Collect potential cycle votes
-					let mut other_cycle_votes = other_assignment
-						.distribution
-						.iter()
-						.filter_map(|(t, w)| {
-							if *t == v1 || *t == v2 {
-								Some((t.clone(), *w))
-							} else {
-								None
-							}
-						})
-						.collect::<Vec<(A, ExtendedBalance)>>();
+					let mut other_cycle_votes =
+						other_assignment
+							.distribution
+							.iter()
+							.filter_map(|(t, w)| {
+								if *t == v1 || *t == v2 {
+									Some((t.clone(), *w))
+								} else {
+									None
+								}
+							})
+							.collect::<Vec<(A, ExtendedBalance)>>();
 
 					let other_votes_count = other_cycle_votes.len();
 
@@ -175,21 +178,18 @@ fn reduce_4<A: IdentifierT>(assignments: &mut Vec<StakedAssignment<A>>) -> u32 {
 					if other_votes_count < 2 {
 						// This is not a cycle. Replace and continue.
 						*other_who = who.clone();
-						continue;
+						continue
 					} else if other_votes_count == 2 {
 						// This is a cycle.
 						let mut who_cycle_votes: Vec<(A, ExtendedBalance)> = Vec::with_capacity(2);
-						assignments[assignment_index]
-							.distribution
-							.iter()
-							.for_each(|(t, w)| {
-								if *t == v1 || *t == v2 {
-									who_cycle_votes.push((t.clone(), *w));
-								}
-							});
+						assignments[assignment_index].distribution.iter().for_each(|(t, w)| {
+							if *t == v1 || *t == v2 {
+								who_cycle_votes.push((t.clone(), *w));
+							}
+						});
 
 						if who_cycle_votes.len() != 2 {
-							continue;
+							continue
 						}
 
 						// Align the targets similarly. This helps with the circulation below.
@@ -240,53 +240,39 @@ fn reduce_4<A: IdentifierT>(assignments: &mut Vec<StakedAssignment<A>>) -> u32 {
 						// apply changes
 						let mut remove_indices: Vec<usize> = Vec::with_capacity(1);
 						increase_indices.into_iter().for_each(|i| {
-							let voter = if i < 2 {
-								who.clone()
-							} else {
-								other_who.clone()
-							};
+							let voter = if i < 2 { who.clone() } else { other_who.clone() };
 							// Note: so this is pretty ambiguous. We should only look for one
 							// assignment that meets this criteria and if we find multiple then that
 							// is a corrupt input. Same goes for the next block.
-							assignments
-								.iter_mut()
-								.filter(|a| a.who == voter)
-								.for_each(|ass| {
-									ass.distribution
-										.iter_mut()
-										.position(|(t, _)| *t == cycle[i].0)
-										.map(|idx| {
-											let next_value =
-												ass.distribution[idx].1.saturating_add(min_value);
-											ass.distribution[idx].1 = next_value;
-										});
-								});
+							assignments.iter_mut().filter(|a| a.who == voter).for_each(|ass| {
+								ass.distribution
+									.iter_mut()
+									.position(|(t, _)| *t == cycle[i].0)
+									.map(|idx| {
+										let next_value =
+											ass.distribution[idx].1.saturating_add(min_value);
+										ass.distribution[idx].1 = next_value;
+									});
+							});
 						});
 						decrease_indices.into_iter().for_each(|i| {
-							let voter = if i < 2 {
-								who.clone()
-							} else {
-								other_who.clone()
-							};
-							assignments
-								.iter_mut()
-								.filter(|a| a.who == voter)
-								.for_each(|ass| {
-									ass.distribution
-										.iter_mut()
-										.position(|(t, _)| *t == cycle[i].0)
-										.map(|idx| {
-											let next_value =
-												ass.distribution[idx].1.saturating_sub(min_value);
-											if next_value.is_zero() {
-												ass.distribution.remove(idx);
-												remove_indices.push(i);
-												num_changed += 1;
-											} else {
-												ass.distribution[idx].1 = next_value;
-											}
-										});
-								});
+							let voter = if i < 2 { who.clone() } else { other_who.clone() };
+							assignments.iter_mut().filter(|a| a.who == voter).for_each(|ass| {
+								ass.distribution
+									.iter_mut()
+									.position(|(t, _)| *t == cycle[i].0)
+									.map(|idx| {
+										let next_value =
+											ass.distribution[idx].1.saturating_sub(min_value);
+										if next_value.is_zero() {
+											ass.distribution.remove(idx);
+											remove_indices.push(i);
+											num_changed += 1;
+										} else {
+											ass.distribution[idx].1 = next_value;
+										}
+									});
+							});
 						});
 
 						// remove either one of them.
@@ -297,21 +283,21 @@ fn reduce_4<A: IdentifierT>(assignments: &mut Vec<StakedAssignment<A>>) -> u32 {
 						match (who_removed, other_removed) {
 							(false, true) => {
 								*other_who = who.clone();
-							}
+							},
 							(true, false) => {
 								// nothing, other_who can stay there.
-							}
+							},
 							(true, true) => {
 								// remove and don't replace
 								entry.remove();
-							}
+							},
 							(false, false) => {
 								// Neither of the edges was removed? impossible.
 								panic!("Duplicate voter (or other corrupt input).");
-							}
+							},
 						}
 					}
-				}
+				},
 			}
 		}
 	}
@@ -350,7 +336,7 @@ fn reduce_all<A: IdentifierT>(assignments: &mut Vec<StakedAssignment<A>>) -> u32
 			let maybe_dist = assignments[assignment_index].distribution.get(dist_index);
 			if maybe_dist.is_none() {
 				// The rest of this loop is moot.
-				break;
+				break
 			}
 			let (target, _) = maybe_dist.expect("Value checked to be some").clone();
 
@@ -377,19 +363,19 @@ fn reduce_all<A: IdentifierT>(assignments: &mut Vec<StakedAssignment<A>>) -> u32
 				(false, false) => {
 					Node::set_parent_of(&target_node, &voter_node);
 					dist_index += 1;
-					continue;
-				}
+					continue
+				},
 				(false, true) => {
 					Node::set_parent_of(&voter_node, &target_node);
 					dist_index += 1;
-					continue;
-				}
+					continue
+				},
 				(true, false) => {
 					Node::set_parent_of(&target_node, &voter_node);
 					dist_index += 1;
-					continue;
-				}
-				(true, true) => { /* don't continue and execute the rest */ }
+					continue
+				},
+				(true, true) => { /* don't continue and execute the rest */ },
 			};
 
 			let (voter_root, voter_root_path) = Node::root(&voter_node);
@@ -405,10 +391,7 @@ fn reduce_all<A: IdentifierT>(assignments: &mut Vec<StakedAssignment<A>>) -> u32
 
 				// because roots are the same.
 				#[cfg(feature = "std")]
-				debug_assert_eq!(
-					target_root_path.last().unwrap(),
-					voter_root_path.last().unwrap()
-				);
+				debug_assert_eq!(target_root_path.last().unwrap(), voter_root_path.last().unwrap());
 				debug_assert!(common_count > 0);
 
 				// cycle part of each path will be `path[path.len() - common_count - 1 : 0]`
@@ -602,7 +585,7 @@ fn reduce_all<A: IdentifierT>(assignments: &mut Vec<StakedAssignment<A>>) -> u32
 							let current = voter_root_path[i].clone().borrow().id.who.clone();
 							let next = voter_root_path[i + 1].clone().borrow().id.who.clone();
 							if min_edge.contains(&current) && min_edge.contains(&next) {
-								break;
+								break
 							}
 							Node::set_parent_of(&voter_root_path[i + 1], &voter_root_path[i]);
 						}
@@ -613,7 +596,7 @@ fn reduce_all<A: IdentifierT>(assignments: &mut Vec<StakedAssignment<A>>) -> u32
 							let current = target_root_path[i].clone().borrow().id.who.clone();
 							let next = target_root_path[i + 1].clone().borrow().id.who.clone();
 							if min_edge.contains(&current) && min_edge.contains(&next) {
-								break;
+								break
 							}
 							Node::set_parent_of(&target_root_path[i + 1], &target_root_path[i]);
 						}
@@ -663,9 +646,9 @@ mod tests {
 
 	#[test]
 	fn merging_works() {
-		//	D <-- A <-- B <-- C
+		// 	D <-- A <-- B <-- C
 		//
-		//		F <-- E
+		// 		F <-- E
 		let d = Node::new(NodeId::from(1, NodeRole::Target)).into_ref();
 		let a = Node::new(NodeId::from(2, NodeRole::Target)).into_ref();
 		let b = Node::new(NodeId::from(3, NodeRole::Target)).into_ref();
@@ -682,17 +665,17 @@ mod tests {
 		let path2 = vec![e.clone(), f.clone()];
 
 		merge(path1, path2);
-		//	D <-- A <-- B <-- C
-		//					  |
-		//		F --> E --> -->
+		// 	D <-- A <-- B <-- C
+		// 					  |
+		// 		F --> E --> -->
 		assert_eq!(e.borrow().clone().parent.unwrap().borrow().id.who, 4u32); // c
 	}
 
 	#[test]
 	fn merge_with_len_one() {
-		//	D <-- A <-- B <-- C
+		// 	D <-- A <-- B <-- C
 		//
-		//		F <-- E
+		// 		F <-- E
 		let d = Node::new(NodeId::from(1, NodeRole::Target)).into_ref();
 		let a = Node::new(NodeId::from(2, NodeRole::Target)).into_ref();
 		let b = Node::new(NodeId::from(3, NodeRole::Target)).into_ref();
@@ -707,9 +690,9 @@ mod tests {
 		let path2 = vec![f.clone()];
 
 		merge(path1, path2);
-		//	D <-- A <-- B <-- C
-		//					  |
-		//			F -->  -->
+		// 	D <-- A <-- B <-- C
+		// 					  |
+		// 			F -->  -->
 		assert_eq!(f.borrow().clone().parent.unwrap().borrow().id.who, 4u32); // c
 	}
 
@@ -718,14 +701,8 @@ mod tests {
 		use super::*;
 
 		let assignments = vec![
-			StakedAssignment {
-				who: 1,
-				distribution: vec![(10, 25), (20, 75)],
-			},
-			StakedAssignment {
-				who: 2,
-				distribution: vec![(10, 50), (20, 50)],
-			},
+			StakedAssignment { who: 1, distribution: vec![(10, 25), (20, 75)] },
+			StakedAssignment { who: 2, distribution: vec![(10, 50), (20, 50)] },
 		];
 
 		let mut new_assignments = assignments.clone();
@@ -735,14 +712,8 @@ mod tests {
 		assert_eq!(
 			new_assignments,
 			vec![
-				StakedAssignment {
-					who: 1,
-					distribution: vec![(20, 100),],
-				},
-				StakedAssignment {
-					who: 2,
-					distribution: vec![(10, 75), (20, 25),],
-				},
+				StakedAssignment { who: 1, distribution: vec![(20, 100),] },
+				StakedAssignment { who: 2, distribution: vec![(10, 75), (20, 25),] },
 			],
 		);
 	}
@@ -750,26 +721,11 @@ mod tests {
 	#[test]
 	fn basic_reduce_all_cycles_works() {
 		let mut assignments = vec![
-			StakedAssignment {
-				who: 1,
-				distribution: vec![(10, 10)],
-			},
-			StakedAssignment {
-				who: 2,
-				distribution: vec![(10, 15), (20, 5)],
-			},
-			StakedAssignment {
-				who: 3,
-				distribution: vec![(20, 15), (40, 15)],
-			},
-			StakedAssignment {
-				who: 4,
-				distribution: vec![(20, 10), (30, 10), (40, 20)],
-			},
-			StakedAssignment {
-				who: 5,
-				distribution: vec![(20, 20), (30, 10), (40, 20)],
-			},
+			StakedAssignment { who: 1, distribution: vec![(10, 10)] },
+			StakedAssignment { who: 2, distribution: vec![(10, 15), (20, 5)] },
+			StakedAssignment { who: 3, distribution: vec![(20, 15), (40, 15)] },
+			StakedAssignment { who: 4, distribution: vec![(20, 10), (30, 10), (40, 20)] },
+			StakedAssignment { who: 5, distribution: vec![(20, 20), (30, 10), (40, 20)] },
 		];
 
 		assert_eq!(3, reduce_all(&mut assignments));
@@ -777,26 +733,11 @@ mod tests {
 		assert_eq!(
 			assignments,
 			vec![
-				StakedAssignment {
-					who: 1,
-					distribution: vec![(10, 10),]
-				},
-				StakedAssignment {
-					who: 2,
-					distribution: vec![(10, 15), (20, 5),],
-				},
-				StakedAssignment {
-					who: 3,
-					distribution: vec![(20, 30),],
-				},
-				StakedAssignment {
-					who: 4,
-					distribution: vec![(40, 40),]
-				},
-				StakedAssignment {
-					who: 5,
-					distribution: vec![(20, 15), (30, 20), (40, 15),],
-				},
+				StakedAssignment { who: 1, distribution: vec![(10, 10),] },
+				StakedAssignment { who: 2, distribution: vec![(10, 15), (20, 5),] },
+				StakedAssignment { who: 3, distribution: vec![(20, 30),] },
+				StakedAssignment { who: 4, distribution: vec![(40, 40),] },
+				StakedAssignment { who: 5, distribution: vec![(20, 15), (30, 20), (40, 15),] },
 			],
 		)
 	}
@@ -804,26 +745,11 @@ mod tests {
 	#[test]
 	fn basic_reduce_works() {
 		let mut assignments = vec![
-			StakedAssignment {
-				who: 1,
-				distribution: vec![(10, 10)],
-			},
-			StakedAssignment {
-				who: 2,
-				distribution: vec![(10, 15), (20, 5)],
-			},
-			StakedAssignment {
-				who: 3,
-				distribution: vec![(20, 15), (40, 15)],
-			},
-			StakedAssignment {
-				who: 4,
-				distribution: vec![(20, 10), (30, 10), (40, 20)],
-			},
-			StakedAssignment {
-				who: 5,
-				distribution: vec![(20, 20), (30, 10), (40, 20)],
-			},
+			StakedAssignment { who: 1, distribution: vec![(10, 10)] },
+			StakedAssignment { who: 2, distribution: vec![(10, 15), (20, 5)] },
+			StakedAssignment { who: 3, distribution: vec![(20, 15), (40, 15)] },
+			StakedAssignment { who: 4, distribution: vec![(20, 10), (30, 10), (40, 20)] },
+			StakedAssignment { who: 5, distribution: vec![(20, 20), (30, 10), (40, 20)] },
 		];
 
 		assert_eq!(3, reduce(&mut assignments));
@@ -831,26 +757,11 @@ mod tests {
 		assert_eq!(
 			assignments,
 			vec![
-				StakedAssignment {
-					who: 1,
-					distribution: vec![(10, 10),]
-				},
-				StakedAssignment {
-					who: 2,
-					distribution: vec![(10, 15), (20, 5),],
-				},
-				StakedAssignment {
-					who: 3,
-					distribution: vec![(20, 30),],
-				},
-				StakedAssignment {
-					who: 4,
-					distribution: vec![(40, 40),]
-				},
-				StakedAssignment {
-					who: 5,
-					distribution: vec![(20, 15), (30, 20), (40, 15),],
-				},
+				StakedAssignment { who: 1, distribution: vec![(10, 10),] },
+				StakedAssignment { who: 2, distribution: vec![(10, 15), (20, 5),] },
+				StakedAssignment { who: 3, distribution: vec![(20, 30),] },
+				StakedAssignment { who: 4, distribution: vec![(40, 40),] },
+				StakedAssignment { who: 5, distribution: vec![(20, 15), (30, 20), (40, 15),] },
 			],
 		)
 	}
@@ -858,35 +769,14 @@ mod tests {
 	#[test]
 	fn should_deal_with_self_vote() {
 		let mut assignments = vec![
-			StakedAssignment {
-				who: 1,
-				distribution: vec![(10, 10)],
-			},
-			StakedAssignment {
-				who: 2,
-				distribution: vec![(10, 15), (20, 5)],
-			},
-			StakedAssignment {
-				who: 3,
-				distribution: vec![(20, 15), (40, 15)],
-			},
-			StakedAssignment {
-				who: 4,
-				distribution: vec![(20, 10), (30, 10), (40, 20)],
-			},
-			StakedAssignment {
-				who: 5,
-				distribution: vec![(20, 20), (30, 10), (40, 20)],
-			},
+			StakedAssignment { who: 1, distribution: vec![(10, 10)] },
+			StakedAssignment { who: 2, distribution: vec![(10, 15), (20, 5)] },
+			StakedAssignment { who: 3, distribution: vec![(20, 15), (40, 15)] },
+			StakedAssignment { who: 4, distribution: vec![(20, 10), (30, 10), (40, 20)] },
+			StakedAssignment { who: 5, distribution: vec![(20, 20), (30, 10), (40, 20)] },
 			// self vote from 10 and 20 to itself.
-			StakedAssignment {
-				who: 10,
-				distribution: vec![(10, 100)],
-			},
-			StakedAssignment {
-				who: 20,
-				distribution: vec![(20, 200)],
-			},
+			StakedAssignment { who: 10, distribution: vec![(10, 100)] },
+			StakedAssignment { who: 20, distribution: vec![(20, 200)] },
 		];
 
 		assert_eq!(3, reduce(&mut assignments));
@@ -894,35 +784,14 @@ mod tests {
 		assert_eq!(
 			assignments,
 			vec![
-				StakedAssignment {
-					who: 1,
-					distribution: vec![(10, 10),]
-				},
-				StakedAssignment {
-					who: 2,
-					distribution: vec![(10, 15), (20, 5),],
-				},
-				StakedAssignment {
-					who: 3,
-					distribution: vec![(20, 30),],
-				},
-				StakedAssignment {
-					who: 4,
-					distribution: vec![(40, 40),]
-				},
-				StakedAssignment {
-					who: 5,
-					distribution: vec![(20, 15), (30, 20), (40, 15),],
-				},
+				StakedAssignment { who: 1, distribution: vec![(10, 10),] },
+				StakedAssignment { who: 2, distribution: vec![(10, 15), (20, 5),] },
+				StakedAssignment { who: 3, distribution: vec![(20, 30),] },
+				StakedAssignment { who: 4, distribution: vec![(40, 40),] },
+				StakedAssignment { who: 5, distribution: vec![(20, 15), (30, 20), (40, 15),] },
 				// should stay untouched.
-				StakedAssignment {
-					who: 10,
-					distribution: vec![(10, 100)]
-				},
-				StakedAssignment {
-					who: 20,
-					distribution: vec![(20, 200)]
-				},
+				StakedAssignment { who: 10, distribution: vec![(10, 100)] },
+				StakedAssignment { who: 20, distribution: vec![(20, 200)] },
 			],
 		)
 	}
@@ -930,55 +799,23 @@ mod tests {
 	#[test]
 	fn reduce_3_common_votes_same_weight() {
 		let mut assignments = vec![
-				StakedAssignment {
-					who: 4,
-					distribution: vec![
-						(
-							1000000,
-							100,
-						),
-						(
-							1000002,
-							100,
-						),
-						(
-							1000004,
-							100,
-						),
-					],
-				},
-				StakedAssignment {
-					who: 5,
-					distribution: vec![
-						(
-							1000000,
-							100,
-						),
-						(
-							1000002,
-							100,
-						),
-						(
-							1000004,
-							100,
-						),
-					],
-				},
-			];
+			StakedAssignment {
+				who: 4,
+				distribution: vec![(1000000, 100), (1000002, 100), (1000004, 100)],
+			},
+			StakedAssignment {
+				who: 5,
+				distribution: vec![(1000000, 100), (1000002, 100), (1000004, 100)],
+			},
+		];
 
 		reduce_4(&mut assignments);
 
 		assert_eq!(
 			assignments,
 			vec![
-				StakedAssignment {
-					who: 4,
-					distribution: vec![(1000000, 200,), (1000004, 100,),],
-				},
-				StakedAssignment {
-					who: 5,
-					distribution: vec![(1000002, 200,), (1000004, 100,),],
-				},
+				StakedAssignment { who: 4, distribution: vec![(1000000, 200,), (1000004, 100,),] },
+				StakedAssignment { who: 5, distribution: vec![(1000002, 200,), (1000004, 100,),] },
 			],
 		)
 	}
@@ -987,18 +824,9 @@ mod tests {
 	#[should_panic]
 	fn reduce_panics_on_duplicate_voter() {
 		let mut assignments = vec![
-			StakedAssignment {
-				who: 1,
-				distribution: vec![(10, 10), (20, 10)],
-			},
-			StakedAssignment {
-				who: 1,
-				distribution: vec![(10, 15), (20, 5)],
-			},
-			StakedAssignment {
-				who: 2,
-				distribution: vec![(10, 15), (20, 15)],
-			},
+			StakedAssignment { who: 1, distribution: vec![(10, 10), (20, 10)] },
+			StakedAssignment { who: 1, distribution: vec![(10, 15), (20, 5)] },
+			StakedAssignment { who: 2, distribution: vec![(10, 15), (20, 15)] },
 		];
 
 		reduce(&mut assignments);
@@ -1007,10 +835,7 @@ mod tests {
 	#[test]
 	fn should_deal_with_duplicates_target() {
 		let mut assignments = vec![
-			StakedAssignment {
-				who: 1,
-				distribution: vec![(10, 15), (20, 5)],
-			},
+			StakedAssignment { who: 1, distribution: vec![(10, 15), (20, 5)] },
 			StakedAssignment {
 				who: 2,
 				distribution: vec![
@@ -1029,10 +854,7 @@ mod tests {
 		assert_eq!(
 			assignments,
 			vec![
-				StakedAssignment {
-					who: 1,
-					distribution: vec![(10, 20),],
-				},
+				StakedAssignment { who: 1, distribution: vec![(10, 20),] },
 				StakedAssignment {
 					who: 2,
 					distribution: vec![
diff --git a/primitives/npos-elections/src/tests.rs b/primitives/npos-elections/src/tests.rs
index 8cadff949b6f..ee67095307c2 100644
--- a/primitives/npos-elections/src/tests.rs
+++ b/primitives/npos-elections/src/tests.rs
@@ -19,22 +19,18 @@
 
 use crate::{
 	balancing, helpers::*, is_score_better, mock::*, seq_phragmen, seq_phragmen_core, setup_inputs,
-	to_support_map, to_supports, Assignment, CompactSolution, ElectionResult, ExtendedBalance,
-	IndexAssignment, StakedAssignment, Support, Voter, EvaluateSupport,
+	to_support_map, to_supports, Assignment, CompactSolution, ElectionResult, EvaluateSupport,
+	ExtendedBalance, IndexAssignment, StakedAssignment, Support, Voter,
 };
 use rand::{self, SeedableRng};
 use sp_arithmetic::{PerU16, Perbill, Percent, Permill};
-use substrate_test_utils::assert_eq_uvec;
 use std::convert::TryInto;
+use substrate_test_utils::assert_eq_uvec;
 
 #[test]
 fn float_phragmen_poc_works() {
 	let candidates = vec![1, 2, 3];
-	let voters = vec![
-		(10, vec![1, 2]),
-		(20, vec![1, 3]),
-		(30, vec![2, 3]),
-	];
+	let voters = vec![(10, vec![1, 2]), (20, vec![1, 3]), (30, vec![2, 3])];
 	let stake_of = create_stake_of(&[(10, 10), (20, 20), (30, 30), (1, 0), (2, 0), (3, 0)]);
 	let mut phragmen_result = elect_float(2, candidates, voters, &stake_of).unwrap();
 	let winners = phragmen_result.clone().winners;
@@ -43,11 +39,7 @@ fn float_phragmen_poc_works() {
 	assert_eq_uvec!(winners, vec![(2, 40), (3, 50)]);
 	assert_eq_uvec!(
 		assignments,
-		vec![
-			(10, vec![(2, 1.0)]),
-			(20, vec![(3, 1.0)]),
-			(30, vec![(2, 0.5), (3, 0.5)]),
-		]
+		vec![(10, vec![(2, 1.0)]), (20, vec![(3, 1.0)]), (30, vec![(2, 0.5), (3, 0.5)]),]
 	);
 
 	let mut support_map = build_support_map_float(&mut phragmen_result, &stake_of);
@@ -76,11 +68,7 @@ fn float_phragmen_poc_works() {
 #[test]
 fn phragmen_core_test_without_edges() {
 	let candidates = vec![1, 2, 3];
-	let voters = vec![
-		(10, 10, vec![]),
-		(20, 20, vec![]),
-		(30, 30, vec![]),
-	];
+	let voters = vec![(10, 10, vec![]), (20, 20, vec![]), (30, 30, vec![])];
 
 	let (candidates, voters) = setup_inputs(candidates, voters);
 
@@ -104,23 +92,16 @@ fn phragmen_core_test_without_edges() {
 				c_ptr.borrow().elected,
 				c_ptr.borrow().round,
 				c_ptr.borrow().backed_stake,
-			)).collect::<Vec<_>>(),
-		vec![
-			(1, false, 0, 0),
-			(2, false, 0, 0),
-			(3, false, 0, 0),
-		]
+			))
+			.collect::<Vec<_>>(),
+		vec![(1, false, 0, 0), (2, false, 0, 0), (3, false, 0, 0),]
 	);
 }
 
 #[test]
 fn phragmen_core_poc_works() {
 	let candidates = vec![1, 2, 3];
-	let voters = vec![
-		(10, 10, vec![1, 2]),
-		(20, 20, vec![1, 3]),
-		(30, 30, vec![2, 3]),
-	];
+	let voters = vec![(10, 10, vec![1, 2]), (20, 20, vec![1, 3]), (30, 30, vec![2, 3])];
 
 	let (candidates, voters) = setup_inputs(candidates, voters);
 	let (candidates, voters) = seq_phragmen_core(2, candidates, voters).unwrap();
@@ -134,11 +115,7 @@ fn phragmen_core_poc_works() {
 				(v.edges.iter().map(|e| (e.who, e.weight)).collect::<Vec<_>>()),
 			))
 			.collect::<Vec<_>>(),
-		vec![
-			(10, 10, vec![(2, 10)]),
-			(20, 20, vec![(3, 20)]),
-			(30, 30, vec![(2, 15), (3, 15)]),
-		]
+		vec![(10, 10, vec![(2, 10)]), (20, 20, vec![(3, 20)]), (30, 30, vec![(2, 15), (3, 15)]),]
 	);
 
 	assert_eq!(
@@ -149,12 +126,9 @@ fn phragmen_core_poc_works() {
 				c_ptr.borrow().elected,
 				c_ptr.borrow().round,
 				c_ptr.borrow().backed_stake,
-			)).collect::<Vec<_>>(),
-		vec![
-			(1, false, 0, 0),
-			(2, true, 1, 25),
-			(3, true, 0, 35),
-		]
+			))
+			.collect::<Vec<_>>(),
+		vec![(1, false, 0, 0), (2, true, 1, 25), (3, true, 0, 35),]
 	);
 }
 
@@ -203,7 +177,8 @@ fn balancing_core_works() {
 				c_ptr.borrow().elected,
 				c_ptr.borrow().round,
 				c_ptr.borrow().backed_stake,
-			)).collect::<Vec<_>>(),
+			))
+			.collect::<Vec<_>>(),
 		vec![
 			(1, true, 1, 37),
 			(2, true, 2, 38),
@@ -220,40 +195,30 @@ fn voter_normalize_ops_works() {
 	use sp_std::{cell::RefCell, rc::Rc};
 	// normalize
 	{
-		let c1 = Candidate { who: 10, elected: false ,..Default::default() };
-		let c2 = Candidate { who: 20, elected: false ,..Default::default() };
-		let c3 = Candidate { who: 30, elected: false ,..Default::default() };
+		let c1 = Candidate { who: 10, elected: false, ..Default::default() };
+		let c2 = Candidate { who: 20, elected: false, ..Default::default() };
+		let c3 = Candidate { who: 30, elected: false, ..Default::default() };
 
 		let e1 = Edge { candidate: Rc::new(RefCell::new(c1)), weight: 30, ..Default::default() };
 		let e2 = Edge { candidate: Rc::new(RefCell::new(c2)), weight: 33, ..Default::default() };
 		let e3 = Edge { candidate: Rc::new(RefCell::new(c3)), weight: 30, ..Default::default() };
 
-		let mut v = Voter {
-			who: 1,
-			budget: 100,
-			edges: vec![e1, e2, e3],
-			..Default::default()
-		};
+		let mut v = Voter { who: 1, budget: 100, edges: vec![e1, e2, e3], ..Default::default() };
 
 		v.try_normalize().unwrap();
 		assert_eq!(v.edges.iter().map(|e| e.weight).collect::<Vec<_>>(), vec![34, 33, 33]);
 	}
 	// // normalize_elected
 	{
-		let c1 = Candidate { who: 10, elected: false ,..Default::default() };
-		let c2 = Candidate { who: 20, elected: true ,..Default::default() };
-		let c3 = Candidate { who: 30, elected: true ,..Default::default() };
+		let c1 = Candidate { who: 10, elected: false, ..Default::default() };
+		let c2 = Candidate { who: 20, elected: true, ..Default::default() };
+		let c3 = Candidate { who: 30, elected: true, ..Default::default() };
 
 		let e1 = Edge { candidate: Rc::new(RefCell::new(c1)), weight: 30, ..Default::default() };
 		let e2 = Edge { candidate: Rc::new(RefCell::new(c2)), weight: 33, ..Default::default() };
 		let e3 = Edge { candidate: Rc::new(RefCell::new(c3)), weight: 30, ..Default::default() };
 
-		let mut v = Voter {
-			who: 1,
-			budget: 100,
-			edges: vec![e1, e2, e3],
-			..Default::default()
-		};
+		let mut v = Voter { who: 1, budget: 100, edges: vec![e1, e2, e3], ..Default::default() };
 
 		v.try_normalize_elected().unwrap();
 		assert_eq!(v.edges.iter().map(|e| e.weight).collect::<Vec<_>>(), vec![30, 34, 66]);
@@ -263,37 +228,31 @@ fn voter_normalize_ops_works() {
 #[test]
 fn phragmen_poc_works() {
 	let candidates = vec![1, 2, 3];
-	let voters = vec![
-		(10, vec![1, 2]),
-		(20, vec![1, 3]),
-		(30, vec![2, 3]),
-	];
+	let voters = vec![(10, vec![1, 2]), (20, vec![1, 3]), (30, vec![2, 3])];
 
 	let stake_of = create_stake_of(&[(10, 10), (20, 20), (30, 30)]);
 	let ElectionResult { winners, assignments } = seq_phragmen::<_, Perbill>(
 		2,
 		candidates,
-		voters.iter().map(|(ref v, ref vs)| (v.clone(), stake_of(v), vs.clone())).collect::<Vec<_>>(),
+		voters
+			.iter()
+			.map(|(ref v, ref vs)| (v.clone(), stake_of(v), vs.clone()))
+			.collect::<Vec<_>>(),
 		None,
-	).unwrap();
+	)
+	.unwrap();
 
 	assert_eq_uvec!(winners, vec![(2, 25), (3, 35)]);
 	assert_eq_uvec!(
 		assignments,
 		vec![
-			Assignment {
-				who: 10u64,
-				distribution: vec![(2, Perbill::from_percent(100))],
-			},
-			Assignment {
-				who: 20,
-				distribution: vec![(3, Perbill::from_percent(100))],
-			},
+			Assignment { who: 10u64, distribution: vec![(2, Perbill::from_percent(100))] },
+			Assignment { who: 20, distribution: vec![(3, Perbill::from_percent(100))] },
 			Assignment {
 				who: 30,
 				distribution: vec![
-					(2, Perbill::from_percent(100/2)),
-					(3, Perbill::from_percent(100/2)),
+					(2, Perbill::from_percent(100 / 2)),
+					(3, Perbill::from_percent(100 / 2)),
 				],
 			},
 		]
@@ -306,21 +265,9 @@ fn phragmen_poc_works() {
 	assert_eq_uvec!(
 		staked,
 		vec![
-			StakedAssignment {
-				who: 10u64,
-				distribution: vec![(2, 10)],
-			},
-			StakedAssignment {
-				who: 20,
-				distribution: vec![(3, 20)],
-			},
-			StakedAssignment {
-				who: 30,
-				distribution: vec![
-					(2, 15),
-					(3, 15),
-				],
-			},
+			StakedAssignment { who: 10u64, distribution: vec![(2, 10)] },
+			StakedAssignment { who: 20, distribution: vec![(3, 20)] },
+			StakedAssignment { who: 30, distribution: vec![(2, 15), (3, 15),] },
 		]
 	);
 
@@ -337,32 +284,26 @@ fn phragmen_poc_works() {
 #[test]
 fn phragmen_poc_works_with_balancing() {
 	let candidates = vec![1, 2, 3];
-	let voters = vec![
-		(10, vec![1, 2]),
-		(20, vec![1, 3]),
-		(30, vec![2, 3]),
-	];
+	let voters = vec![(10, vec![1, 2]), (20, vec![1, 3]), (30, vec![2, 3])];
 
 	let stake_of = create_stake_of(&[(10, 10), (20, 20), (30, 30)]);
 	let ElectionResult { winners, assignments } = seq_phragmen::<_, Perbill>(
 		2,
 		candidates,
-		voters.iter().map(|(ref v, ref vs)| (v.clone(), stake_of(v), vs.clone())).collect::<Vec<_>>(),
+		voters
+			.iter()
+			.map(|(ref v, ref vs)| (v.clone(), stake_of(v), vs.clone()))
+			.collect::<Vec<_>>(),
 		Some((4, 0)),
-	).unwrap();
+	)
+	.unwrap();
 
 	assert_eq_uvec!(winners, vec![(2, 30), (3, 30)]);
 	assert_eq_uvec!(
 		assignments,
 		vec![
-			Assignment {
-				who: 10u64,
-				distribution: vec![(2, Perbill::from_percent(100))],
-			},
-			Assignment {
-				who: 20,
-				distribution: vec![(3, Perbill::from_percent(100))],
-			},
+			Assignment { who: 10u64, distribution: vec![(2, Perbill::from_percent(100))] },
+			Assignment { who: 20, distribution: vec![(3, Perbill::from_percent(100))] },
 			Assignment {
 				who: 30,
 				distribution: vec![
@@ -380,21 +321,9 @@ fn phragmen_poc_works_with_balancing() {
 	assert_eq_uvec!(
 		staked,
 		vec![
-			StakedAssignment {
-				who: 10u64,
-				distribution: vec![(2, 10)],
-			},
-			StakedAssignment {
-				who: 20,
-				distribution: vec![(3, 20)],
-			},
-			StakedAssignment {
-				who: 30,
-				distribution: vec![
-					(2, 20),
-					(3, 10),
-				],
-			},
+			StakedAssignment { who: 10u64, distribution: vec![(2, 10)] },
+			StakedAssignment { who: 20, distribution: vec![(3, 20)] },
+			StakedAssignment { who: 30, distribution: vec![(2, 20), (3, 10),] },
 		]
 	);
 
@@ -408,22 +337,12 @@ fn phragmen_poc_works_with_balancing() {
 	);
 }
 
-
 #[test]
 fn phragmen_poc_2_works() {
 	let candidates = vec![10, 20, 30];
-	let voters = vec![
-		(2, vec![10, 20, 30]),
-		(4, vec![10, 20, 40]),
-	];
-	let stake_of = create_stake_of(&[
-		(10, 1000),
-		(20, 1000),
-		(30, 1000),
-		(40, 1000),
-		(2, 500),
-		(4, 500),
-	]);
+	let voters = vec![(2, vec![10, 20, 30]), (4, vec![10, 20, 40])];
+	let stake_of =
+		create_stake_of(&[(10, 1000), (20, 1000), (30, 1000), (40, 1000), (2, 500), (4, 500)]);
 
 	run_and_compare::<Perbill, _>(candidates.clone(), voters.clone(), &stake_of, 2);
 	run_and_compare::<Permill, _>(candidates.clone(), voters.clone(), &stake_of, 2);
@@ -434,17 +353,8 @@ fn phragmen_poc_2_works() {
 #[test]
 fn phragmen_poc_3_works() {
 	let candidates = vec![10, 20, 30];
-	let voters = vec![
-		(2, vec![10, 20, 30]),
-		(4, vec![10, 20, 40]),
-	];
-	let stake_of = create_stake_of(&[
-		(10, 1000),
-		(20, 1000),
-		(30, 1000),
-		(2, 50),
-		(4, 1000),
-	]);
+	let voters = vec![(2, vec![10, 20, 30]), (4, vec![10, 20, 40])];
+	let stake_of = create_stake_of(&[(10, 1000), (20, 1000), (30, 1000), (2, 50), (4, 1000)]);
 
 	run_and_compare::<Perbill, _>(candidates.clone(), voters.clone(), &stake_of, 2);
 	run_and_compare::<Permill, _>(candidates.clone(), voters.clone(), &stake_of, 2);
@@ -473,7 +383,8 @@ fn phragmen_accuracy_on_large_scale_only_candidates() {
 			.map(|(ref v, ref vs)| (v.clone(), stake_of(v), vs.clone()))
 			.collect::<Vec<_>>(),
 		None,
-	).unwrap();
+	)
+	.unwrap();
 
 	assert_eq_uvec!(winners, vec![(1, 18446744073709551614u128), (5, 18446744073709551613u128)]);
 	assert_eq!(assignments.len(), 2);
@@ -483,17 +394,14 @@ fn phragmen_accuracy_on_large_scale_only_candidates() {
 #[test]
 fn phragmen_accuracy_on_large_scale_voters_and_candidates() {
 	let candidates = vec![1, 2, 3, 4, 5];
-	let mut voters = vec![
-		(13, vec![1, 3, 5]),
-		(14, vec![2, 4]),
-	];
+	let mut voters = vec![(13, vec![1, 3, 5]), (14, vec![2, 4])];
 	voters.extend(auto_generate_self_voters(&candidates));
 	let stake_of = create_stake_of(&[
-		(1,  (u64::MAX - 1).into()),
-		(2,  (u64::MAX - 4).into()),
-		(3,  (u64::MAX - 5).into()),
-		(4,  (u64::MAX - 3).into()),
-		(5,  (u64::MAX - 2).into()),
+		(1, (u64::MAX - 1).into()),
+		(2, (u64::MAX - 4).into()),
+		(3, (u64::MAX - 5).into()),
+		(4, (u64::MAX - 3).into()),
+		(5, (u64::MAX - 2).into()),
 		(13, (u64::MAX - 10).into()),
 		(14, u64::MAX.into()),
 	]);
@@ -501,31 +409,23 @@ fn phragmen_accuracy_on_large_scale_voters_and_candidates() {
 	let ElectionResult { winners, assignments } = seq_phragmen::<_, Perbill>(
 		2,
 		candidates,
-		voters.iter().map(|(ref v, ref vs)| (v.clone(), stake_of(v), vs.clone())).collect::<Vec<_>>(),
+		voters
+			.iter()
+			.map(|(ref v, ref vs)| (v.clone(), stake_of(v), vs.clone()))
+			.collect::<Vec<_>>(),
 		None,
-	).unwrap();
+	)
+	.unwrap();
 
 	assert_eq_uvec!(winners, vec![(2, 36893488147419103226u128), (1, 36893488147419103219u128)]);
 
 	assert_eq!(
 		assignments,
 		vec![
-			Assignment {
-				who: 13u64,
-				distribution: vec![(1, Perbill::one())],
-			},
-			Assignment {
-				who: 14,
-				distribution: vec![(2, Perbill::one())],
-			},
-			Assignment {
-				who: 1,
-				distribution: vec![(1, Perbill::one())],
-			},
-			Assignment {
-				who: 2,
-				distribution: vec![(2, Perbill::one())],
-			},
+			Assignment { who: 13u64, distribution: vec![(1, Perbill::one())] },
+			Assignment { who: 14, distribution: vec![(2, Perbill::one())] },
+			Assignment { who: 1, distribution: vec![(1, Perbill::one())] },
+			Assignment { who: 2, distribution: vec![(2, Perbill::one())] },
 		]
 	);
 
@@ -536,19 +436,18 @@ fn phragmen_accuracy_on_large_scale_voters_and_candidates() {
 fn phragmen_accuracy_on_small_scale_self_vote() {
 	let candidates = vec![40, 10, 20, 30];
 	let voters = auto_generate_self_voters(&candidates);
-	let stake_of = create_stake_of(&[
-		(40, 0),
-		(10, 1),
-		(20, 2),
-		(30, 1),
-	]);
+	let stake_of = create_stake_of(&[(40, 0), (10, 1), (20, 2), (30, 1)]);
 
 	let ElectionResult { winners, assignments } = seq_phragmen::<_, Perbill>(
 		3,
 		candidates,
-		voters.iter().map(|(ref v, ref vs)| (v.clone(), stake_of(v), vs.clone())).collect::<Vec<_>>(),
+		voters
+			.iter()
+			.map(|(ref v, ref vs)| (v.clone(), stake_of(v), vs.clone()))
+			.collect::<Vec<_>>(),
 		None,
-	).unwrap();
+	)
+	.unwrap();
 
 	assert_eq_uvec!(winners, vec![(20, 2), (10, 1), (30, 1)]);
 	check_assignments_sum(&assignments);
@@ -557,12 +456,7 @@ fn phragmen_accuracy_on_small_scale_self_vote() {
 #[test]
 fn phragmen_accuracy_on_small_scale_no_self_vote() {
 	let candidates = vec![40, 10, 20, 30];
-	let voters = vec![
-		(1, vec![10]),
-		(2, vec![20]),
-		(3, vec![30]),
-		(4, vec![40]),
-	];
+	let voters = vec![(1, vec![10]), (2, vec![20]), (3, vec![30]), (4, vec![40])];
 	let stake_of = create_stake_of(&[
 		(40, 1000), // don't care
 		(10, 1000), // don't care
@@ -577,27 +471,28 @@ fn phragmen_accuracy_on_small_scale_no_self_vote() {
 	let ElectionResult { winners, assignments } = seq_phragmen::<_, Perbill>(
 		3,
 		candidates,
-		voters.iter().map(|(ref v, ref vs)| (v.clone(), stake_of(v), vs.clone())).collect::<Vec<_>>(),
+		voters
+			.iter()
+			.map(|(ref v, ref vs)| (v.clone(), stake_of(v), vs.clone()))
+			.collect::<Vec<_>>(),
 		None,
-	).unwrap();
+	)
+	.unwrap();
 
 	assert_eq_uvec!(winners, vec![(20, 2), (10, 1), (30, 1)]);
 	check_assignments_sum(&assignments);
-
 }
 
 #[test]
 fn phragmen_large_scale_test() {
-	let candidates = vec![2, 4, 6, 8, 10, 12, 14, 16 ,18, 20, 22, 24];
-	let mut voters = vec![
-		(50, vec![2, 4, 6, 8, 10, 12, 14, 16 ,18, 20, 22, 24]),
-	];
+	let candidates = vec![2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24];
+	let mut voters = vec![(50, vec![2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24])];
 	voters.extend(auto_generate_self_voters(&candidates));
 	let stake_of = create_stake_of(&[
-		(2,  1),
-		(4,  100),
-		(6,  1000000),
-		(8,  100000000001000),
+		(2, 1),
+		(4, 100),
+		(6, 1000000),
+		(8, 100000000001000),
 		(10, 100000000002000),
 		(12, 100000000003000),
 		(14, 400000000000000),
@@ -612,9 +507,13 @@ fn phragmen_large_scale_test() {
 	let ElectionResult { winners, assignments } = seq_phragmen::<_, Perbill>(
 		2,
 		candidates,
-		voters.iter().map(|(ref v, ref vs)| (v.clone(), stake_of(v), vs.clone())).collect::<Vec<_>>(),
+		voters
+			.iter()
+			.map(|(ref v, ref vs)| (v.clone(), stake_of(v), vs.clone()))
+			.collect::<Vec<_>>(),
 		None,
-	).unwrap();
+	)
+	.unwrap();
 
 	assert_eq_uvec!(to_without_backing(winners.clone()), vec![24, 22]);
 	check_assignments_sum(&assignments);
@@ -629,18 +528,19 @@ fn phragmen_large_scale_test_2() {
 	let mut voters = vec![(50, vec![2, 4])];
 	voters.extend(auto_generate_self_voters(&candidates));
 
-	let stake_of = create_stake_of(&[
-		(2,  c_budget.into()),
-		(4,  c_budget.into()),
-		(50, nom_budget.into()),
-	]);
+	let stake_of =
+		create_stake_of(&[(2, c_budget.into()), (4, c_budget.into()), (50, nom_budget.into())]);
 
 	let ElectionResult { winners, assignments } = seq_phragmen::<_, Perbill>(
 		2,
 		candidates,
-		voters.iter().map(|(ref v, ref vs)| (v.clone(), stake_of(v), vs.clone())).collect::<Vec<_>>(),
+		voters
+			.iter()
+			.map(|(ref v, ref vs)| (v.clone(), stake_of(v), vs.clone()))
+			.collect::<Vec<_>>(),
 		None,
-	).unwrap();
+	)
+	.unwrap();
 
 	assert_eq_uvec!(winners, vec![(2, 500000000005000000u128), (4, 500000000003000000)]);
 
@@ -654,14 +554,8 @@ fn phragmen_large_scale_test_2() {
 					(4, Perbill::from_parts(500000000)),
 				],
 			},
-			Assignment {
-				who: 2,
-				distribution: vec![(2, Perbill::one())],
-			},
-			Assignment {
-				who: 4,
-				distribution: vec![(4, Perbill::one())],
-			},
+			Assignment { who: 2, distribution: vec![(2, Perbill::one())] },
+			Assignment { who: 4, distribution: vec![(4, Perbill::one())] },
 		],
 	);
 
@@ -688,7 +582,6 @@ fn phragmen_linear_equalize() {
 		(51, 1000),
 		(61, 1000),
 		(71, 1000),
-
 		(2, 2000),
 		(4, 1000),
 		(6, 1000),
@@ -704,58 +597,48 @@ fn phragmen_linear_equalize() {
 #[test]
 fn elect_has_no_entry_barrier() {
 	let candidates = vec![10, 20, 30];
-	let voters = vec![
-		(1, vec![10]),
-		(2, vec![20]),
-	];
-	let stake_of = create_stake_of(&[
-		(1, 10),
-		(2, 10),
-	]);
+	let voters = vec![(1, vec![10]), (2, vec![20])];
+	let stake_of = create_stake_of(&[(1, 10), (2, 10)]);
 
 	let ElectionResult { winners, assignments: _ } = seq_phragmen::<_, Perbill>(
 		3,
 		candidates,
-		voters.iter().map(|(ref v, ref vs)| (v.clone(), stake_of(v), vs.clone())).collect::<Vec<_>>(),
+		voters
+			.iter()
+			.map(|(ref v, ref vs)| (v.clone(), stake_of(v), vs.clone()))
+			.collect::<Vec<_>>(),
 		None,
-	).unwrap();
+	)
+	.unwrap();
 
 	// 30 is elected with stake 0. The caller is responsible for stripping this.
-	assert_eq_uvec!(winners, vec![
-		(10, 10),
-		(20, 10),
-		(30, 0),
-	]);
+	assert_eq_uvec!(winners, vec![(10, 10), (20, 10), (30, 0),]);
 }
 
 #[test]
 fn phragmen_self_votes_should_be_kept() {
 	let candidates = vec![5, 10, 20, 30];
-	let voters = vec![
-		(5, vec![5]),
-		(10, vec![10]),
-		(20, vec![20]),
-		(1, vec![10, 20])
-	];
-	let stake_of = create_stake_of(&[
-		(5, 5),
-		(10, 10),
-		(20, 20),
-		(1, 8),
-	]);
+	let voters = vec![(5, vec![5]), (10, vec![10]), (20, vec![20]), (1, vec![10, 20])];
+	let stake_of = create_stake_of(&[(5, 5), (10, 10), (20, 20), (1, 8)]);
 
 	let result = seq_phragmen::<_, Perbill>(
 		2,
 		candidates,
-		voters.iter().map(|(ref v, ref vs)| (v.clone(), stake_of(v), vs.clone())).collect::<Vec<_>>(),
+		voters
+			.iter()
+			.map(|(ref v, ref vs)| (v.clone(), stake_of(v), vs.clone()))
+			.collect::<Vec<_>>(),
 		None,
-	).unwrap();
+	)
+	.unwrap();
 
 	assert_eq!(result.winners, vec![(20, 24), (10, 14)]);
 	assert_eq_uvec!(
 		result.assignments,
 		vec![
-			Assignment { who: 1, distribution: vec![
+			Assignment {
+				who: 1,
+				distribution: vec![
 					(10, Perbill::from_percent(50)),
 					(20, Perbill::from_percent(50)),
 				]
@@ -783,18 +666,10 @@ fn phragmen_self_votes_should_be_kept() {
 #[test]
 fn duplicate_target_is_ignored() {
 	let candidates = vec![1, 2, 3];
-	let voters = vec![
-		(10, 100, vec![1, 1, 2, 3]),
-		(20, 100, vec![2, 3]),
-		(30, 50, vec![1, 1, 2]),
-	];
+	let voters = vec![(10, 100, vec![1, 1, 2, 3]), (20, 100, vec![2, 3]), (30, 50, vec![1, 1, 2])];
 
-	let ElectionResult { winners, assignments } = seq_phragmen::<_, Perbill>(
-		2,
-		candidates,
-		voters,
-		None,
-	).unwrap();
+	let ElectionResult { winners, assignments } =
+		seq_phragmen::<_, Perbill>(2, candidates, voters, None).unwrap();
 	let winners = to_without_backing(winners);
 
 	assert_eq!(winners, vec![(2), (3)]);
@@ -803,28 +678,17 @@ fn duplicate_target_is_ignored() {
 			.into_iter()
 			.map(|x| (x.who, x.distribution.into_iter().map(|(w, _)| w).collect::<Vec<_>>()))
 			.collect::<Vec<_>>(),
-		vec![
-			(10, vec![2, 3]),
-			(20, vec![2, 3]),
-			(30, vec![2]),
-		],
+		vec![(10, vec![2, 3]), (20, vec![2, 3]), (30, vec![2]),],
 	);
 }
 
 #[test]
 fn duplicate_target_is_ignored_when_winner() {
 	let candidates = vec![1, 2, 3];
-	let voters = vec![
-		(10, 100, vec![1, 1, 2, 3]),
-		(20, 100, vec![1, 2]),
-	];
+	let voters = vec![(10, 100, vec![1, 1, 2, 3]), (20, 100, vec![1, 2])];
 
-	let ElectionResult { winners, assignments } = seq_phragmen::<_, Perbill>(
-		2,
-		candidates,
-		voters,
-		None,
-	).unwrap();
+	let ElectionResult { winners, assignments } =
+		seq_phragmen::<_, Perbill>(2, candidates, voters, None).unwrap();
 	let winners = to_without_backing(winners);
 
 	assert_eq!(winners, vec![1, 2]);
@@ -833,10 +697,7 @@ fn duplicate_target_is_ignored_when_winner() {
 			.into_iter()
 			.map(|x| (x.who, x.distribution.into_iter().map(|(w, _)| w).collect::<Vec<_>>()))
 			.collect::<Vec<_>>(),
-		vec![
-			(10, vec![1, 2]),
-			(20, vec![1, 2]),
-		],
+		vec![(10, vec![1, 2]), (20, vec![1, 2]),],
 	);
 }
 
@@ -846,10 +707,7 @@ fn support_map_and_vec_can_be_evaluated() {
 	let voters = vec![(10, vec![1, 2]), (20, vec![1, 3]), (30, vec![2, 3])];
 
 	let stake_of = create_stake_of(&[(10, 10), (20, 20), (30, 30)]);
-	let ElectionResult {
-		winners,
-		assignments,
-	} = seq_phragmen::<_, Perbill>(
+	let ElectionResult { winners, assignments } = seq_phragmen::<_, Perbill>(
 		2,
 		candidates,
 		voters
@@ -874,10 +732,7 @@ mod assignment_convert_normalize {
 	fn assignment_convert_works() {
 		let staked = StakedAssignment {
 			who: 1 as AccountId,
-			distribution: vec![
-				(20, 100 as ExtendedBalance),
-				(30, 25),
-			],
+			distribution: vec![(20, 100 as ExtendedBalance), (30, 25)],
 		};
 
 		let assignment = staked.clone().into_assignment();
@@ -892,10 +747,7 @@ mod assignment_convert_normalize {
 			}
 		);
 
-		assert_eq!(
-			assignment.into_staked(125),
-			staked,
-		);
+		assert_eq!(assignment.into_staked(125), staked,);
 	}
 
 	#[test]
@@ -903,11 +755,9 @@ mod assignment_convert_normalize {
 		assert_eq!(
 			Assignment {
 				who: 1,
-				distribution: vec![
-					(2, Perbill::from_percent(33)),
-					(3, Perbill::from_percent(66)),
-				]
-			}.into_staked(100),
+				distribution: vec![(2, Perbill::from_percent(33)), (3, Perbill::from_percent(66)),]
+			}
+			.into_staked(100),
 			StakedAssignment {
 				who: 1,
 				distribution: vec![
@@ -926,7 +776,8 @@ mod assignment_convert_normalize {
 					(3, 333_333_333_333_333),
 					(4, 666_666_666_666_333),
 				],
-			}.into_assignment(),
+			}
+			.into_assignment(),
 			Assignment {
 				who: 1,
 				distribution: vec![
@@ -947,7 +798,7 @@ mod assignment_convert_normalize {
 				(2, Perbill::from_parts(330000000)),
 				(3, Perbill::from_parts(660000000)),
 				// sum is not 100%!
-			]
+			],
 		};
 		a.try_normalize().unwrap();
 		assert_eq!(
@@ -964,24 +815,9 @@ mod assignment_convert_normalize {
 
 	#[test]
 	fn staked_assignment_can_normalize() {
-		let mut a = StakedAssignment {
-			who: 1,
-			distribution: vec![
-				(2, 33),
-				(3, 66),
-			]
-		};
+		let mut a = StakedAssignment { who: 1, distribution: vec![(2, 33), (3, 66)] };
 		a.try_normalize(100).unwrap();
-		assert_eq!(
-			a,
-			StakedAssignment {
-				who: 1,
-				distribution: vec![
-					(2, 34),
-					(3, 66),
-				]
-			},
-		);
+		assert_eq!(a, StakedAssignment { who: 1, distribution: vec![(2, 34), (3, 66),] },);
 	}
 }
 
@@ -991,28 +827,16 @@ mod score {
 	fn score_comparison_is_lexicographical_no_epsilon() {
 		let epsilon = Perbill::zero();
 		// only better in the fist parameter, worse in the other two ✅
-		assert_eq!(
-			is_score_better([12, 10, 35], [10, 20, 30], epsilon),
-			true,
-		);
+		assert_eq!(is_score_better([12, 10, 35], [10, 20, 30], epsilon), true,);
 
 		// worse in the first, better in the other two ❌
-		assert_eq!(
-			is_score_better([9, 30, 10], [10, 20, 30], epsilon),
-			false,
-		);
+		assert_eq!(is_score_better([9, 30, 10], [10, 20, 30], epsilon), false,);
 
 		// equal in the first, the second one dictates.
-		assert_eq!(
-			is_score_better([10, 25, 40], [10, 20, 30], epsilon),
-			true,
-		);
+		assert_eq!(is_score_better([10, 25, 40], [10, 20, 30], epsilon), true,);
 
 		// equal in the first two, the last one dictates.
-		assert_eq!(
-			is_score_better([10, 20, 40], [10, 20, 30], epsilon),
-			false,
-		);
+		assert_eq!(is_score_better([10, 20, 40], [10, 20, 30], epsilon), false,);
 	}
 
 	#[test]
@@ -1021,120 +845,72 @@ mod score {
 
 		{
 			// no more than 1 percent (10) better in the first param.
-			assert_eq!(
-				is_score_better([1009, 5000, 100000], [1000, 5000, 100000], epsilon),
-				false,
-			);
+			assert_eq!(is_score_better([1009, 5000, 100000], [1000, 5000, 100000], epsilon), false,);
 
 			// now equal, still not better.
-			assert_eq!(
-				is_score_better([1010, 5000, 100000], [1000, 5000, 100000], epsilon),
-				false,
-			);
+			assert_eq!(is_score_better([1010, 5000, 100000], [1000, 5000, 100000], epsilon), false,);
 
 			// now it is.
-			assert_eq!(
-				is_score_better([1011, 5000, 100000], [1000, 5000, 100000], epsilon),
-				true,
-			);
+			assert_eq!(is_score_better([1011, 5000, 100000], [1000, 5000, 100000], epsilon), true,);
 		}
 
 		{
 			// First score score is epsilon better, but first score is no longer `ge`. Then this is
 			// still not a good solution.
-			assert_eq!(
-				is_score_better([999, 6000, 100000], [1000, 5000, 100000], epsilon),
-				false,
-			);
+			assert_eq!(is_score_better([999, 6000, 100000], [1000, 5000, 100000], epsilon), false,);
 		}
 
 		{
 			// first score is equal or better, but not epsilon. Then second one is the determinant.
-			assert_eq!(
-				is_score_better([1005, 5000, 100000], [1000, 5000, 100000], epsilon),
-				false,
-			);
-
-			assert_eq!(
-				is_score_better([1005, 5050, 100000], [1000, 5000, 100000], epsilon),
-				false,
-			);
-
-			assert_eq!(
-				is_score_better([1005, 5051, 100000], [1000, 5000, 100000], epsilon),
-				true,
-			);
+			assert_eq!(is_score_better([1005, 5000, 100000], [1000, 5000, 100000], epsilon), false,);
+
+			assert_eq!(is_score_better([1005, 5050, 100000], [1000, 5000, 100000], epsilon), false,);
+
+			assert_eq!(is_score_better([1005, 5051, 100000], [1000, 5000, 100000], epsilon), true,);
 		}
 
 		{
 			// first score and second are equal or less than epsilon more, third is determinant.
-			assert_eq!(
-				is_score_better([1005, 5025, 100000], [1000, 5000, 100000], epsilon),
-				false,
-			);
-
-			assert_eq!(
-				is_score_better([1005, 5025, 99_000], [1000, 5000, 100000], epsilon),
-				false,
-			);
-
-			assert_eq!(
-				is_score_better([1005, 5025, 98_999], [1000, 5000, 100000], epsilon),
-				true,
-			);
+			assert_eq!(is_score_better([1005, 5025, 100000], [1000, 5000, 100000], epsilon), false,);
+
+			assert_eq!(is_score_better([1005, 5025, 99_000], [1000, 5000, 100000], epsilon), false,);
+
+			assert_eq!(is_score_better([1005, 5025, 98_999], [1000, 5000, 100000], epsilon), true,);
 		}
 	}
 
 	#[test]
 	fn score_comparison_large_value() {
 		// some random value taken from eras in kusama.
-		let initial = [12488167277027543u128, 5559266368032409496, 118749283262079244270992278287436446];
+		let initial =
+			[12488167277027543u128, 5559266368032409496, 118749283262079244270992278287436446];
 		// this claim is 0.04090% better in the third component. It should be accepted as better if
 		// epsilon is smaller than 5/10_0000
-		let claim = [12488167277027543u128, 5559266368032409496, 118700736389524721358337889258988054];
+		let claim =
+			[12488167277027543u128, 5559266368032409496, 118700736389524721358337889258988054];
 
 		assert_eq!(
-			is_score_better(
-				claim.clone(),
-				initial.clone(),
-				Perbill::from_rational(1u32, 10_000),
-			),
+			is_score_better(claim.clone(), initial.clone(), Perbill::from_rational(1u32, 10_000),),
 			true,
 		);
 
 		assert_eq!(
-			is_score_better(
-				claim.clone(),
-				initial.clone(),
-				Perbill::from_rational(2u32, 10_000),
-			),
+			is_score_better(claim.clone(), initial.clone(), Perbill::from_rational(2u32, 10_000),),
 			true,
 		);
 
 		assert_eq!(
-			is_score_better(
-				claim.clone(),
-				initial.clone(),
-				Perbill::from_rational(3u32, 10_000),
-			),
+			is_score_better(claim.clone(), initial.clone(), Perbill::from_rational(3u32, 10_000),),
 			true,
 		);
 
 		assert_eq!(
-			is_score_better(
-				claim.clone(),
-				initial.clone(),
-				Perbill::from_rational(4u32, 10_000),
-			),
+			is_score_better(claim.clone(), initial.clone(), Perbill::from_rational(4u32, 10_000),),
 			true,
 		);
 
 		assert_eq!(
-			is_score_better(
-				claim.clone(),
-				initial.clone(),
-				Perbill::from_rational(5u32, 10_000),
-			),
+			is_score_better(claim.clone(), initial.clone(), Perbill::from_rational(5u32, 10_000),),
 			false,
 		);
 	}
@@ -1223,10 +999,7 @@ mod solution_type {
 
 		let encoded = compact.encode();
 
-		assert_eq!(
-			compact,
-			Decode::decode(&mut &encoded[..]).unwrap(),
-		);
+		assert_eq!(compact, Decode::decode(&mut &encoded[..]).unwrap(),);
 		assert_eq!(compact.voter_count(), 4);
 		assert_eq!(compact.edge_count(), 2 + 4);
 		assert_eq!(compact.unique_targets(), vec![10, 11, 20, 40, 50, 51]);
@@ -1240,13 +1013,11 @@ mod solution_type {
 				(2, (0, TestAccuracy::from_percent(80)), 1),
 				(3, (7, TestAccuracy::from_percent(85)), 8),
 			],
-			votes3: vec![
-				(
-					4,
-					[(3, TestAccuracy::from_percent(50)), (4, TestAccuracy::from_percent(25))],
-					5,
-				),
-			],
+			votes3: vec![(
+				4,
+				[(3, TestAccuracy::from_percent(50)), (4, TestAccuracy::from_percent(25))],
+				5,
+			)],
 			..Default::default()
 		};
 
@@ -1256,16 +1027,12 @@ mod solution_type {
 			compact,
 			TestSolutionCompact {
 				votes1: vec![(0, 2), (1, 6)],
-				votes2: vec![
-					(3, (7, TestAccuracy::from_percent(85)), 8),
-				],
-				votes3: vec![
-					(
-						4,
-						[(3, TestAccuracy::from_percent(50)), (4, TestAccuracy::from_percent(25))],
-						5,
-					),
-				],
+				votes2: vec![(3, (7, TestAccuracy::from_percent(85)), 8),],
+				votes3: vec![(
+					4,
+					[(3, TestAccuracy::from_percent(50)), (4, TestAccuracy::from_percent(25))],
+					5,
+				),],
 				..Default::default()
 			},
 		);
@@ -1275,9 +1042,7 @@ mod solution_type {
 			compact,
 			TestSolutionCompact {
 				votes1: vec![(0, 2), (1, 6)],
-				votes2: vec![
-					(3, (7, TestAccuracy::from_percent(85)), 8),
-				],
+				votes2: vec![(3, (7, TestAccuracy::from_percent(85)), 8),],
 				..Default::default()
 			},
 		);
@@ -1287,9 +1052,7 @@ mod solution_type {
 			compact,
 			TestSolutionCompact {
 				votes1: vec![(0, 2)],
-				votes2: vec![
-					(3, (7, TestAccuracy::from_percent(85)), 8),
-				],
+				votes2: vec![(3, (7, TestAccuracy::from_percent(85)), 8),],
 				..Default::default()
 			},
 		);
@@ -1297,13 +1060,7 @@ mod solution_type {
 
 	#[test]
 	fn basic_from_and_into_compact_works_assignments() {
-		let voters = vec![
-			2 as AccountId,
-			4,
-			1,
-			5,
-			3,
-		];
+		let voters = vec![2 as AccountId, 4, 1, 5, 3];
 		let targets = vec![
 			10 as AccountId,
 			11,
@@ -1319,17 +1076,14 @@ mod solution_type {
 		let assignments = vec![
 			Assignment {
 				who: 2 as AccountId,
-				distribution: vec![(20u64, TestAccuracy::from_percent(100))]
-			},
-			Assignment {
-				who: 4,
-				distribution: vec![(40, TestAccuracy::from_percent(100))],
+				distribution: vec![(20u64, TestAccuracy::from_percent(100))],
 			},
+			Assignment { who: 4, distribution: vec![(40, TestAccuracy::from_percent(100))] },
 			Assignment {
 				who: 1,
 				distribution: vec![
 					(10, TestAccuracy::from_percent(80)),
-					(11, TestAccuracy::from_percent(20))
+					(11, TestAccuracy::from_percent(20)),
 				],
 			},
 			Assignment {
@@ -1337,7 +1091,7 @@ mod solution_type {
 				distribution: vec![
 					(50, TestAccuracy::from_percent(85)),
 					(51, TestAccuracy::from_percent(15)),
-				]
+				],
 			},
 			Assignment {
 				who: 3,
@@ -1356,11 +1110,8 @@ mod solution_type {
 			targets.iter().position(|x| x == a).map(TryInto::try_into).unwrap().ok()
 		};
 
-		let compacted = TestSolutionCompact::from_assignment(
-			&assignments,
-			voter_index,
-			target_index,
-		).unwrap();
+		let compacted =
+			TestSolutionCompact::from_assignment(&assignments, voter_index, target_index).unwrap();
 
 		// basically number of assignments that it is encoding.
 		assert_eq!(compacted.voter_count(), assignments.len());
@@ -1377,21 +1128,16 @@ mod solution_type {
 					(2, (0, TestAccuracy::from_percent(80)), 1),
 					(3, (7, TestAccuracy::from_percent(85)), 8),
 				],
-				votes3: vec![
-					(
-						4,
-						[(3, TestAccuracy::from_percent(50)), (4, TestAccuracy::from_percent(25))],
-						5,
-					),
-				],
+				votes3: vec![(
+					4,
+					[(3, TestAccuracy::from_percent(50)), (4, TestAccuracy::from_percent(25))],
+					5,
+				),],
 				..Default::default()
 			}
 		);
 
-		assert_eq!(
-			compacted.unique_targets(),
-			vec![0, 1, 2, 3, 4, 5, 6, 7, 8],
-		);
+		assert_eq!(compacted.unique_targets(), vec![0, 1, 2, 3, 4, 5, 6, 7, 8],);
 
 		let voter_at = |a: u32| -> Option<AccountId> {
 			voters.get(<u32 as TryInto<usize>>::try_into(a).unwrap()).cloned()
@@ -1400,10 +1146,7 @@ mod solution_type {
 			targets.get(<u8 as TryInto<usize>>::try_into(a).unwrap()).cloned()
 		};
 
-		assert_eq!(
-			compacted.into_assignment(voter_at, target_at).unwrap(),
-			assignments,
-		);
+		assert_eq!(compacted.into_assignment(voter_at, target_at).unwrap(), assignments,);
 	}
 
 	#[test]
@@ -1413,57 +1156,42 @@ mod solution_type {
 		// we don't really care about voters here so all duplicates. This is not invalid per se.
 		let compact = TestSolutionCompact {
 			votes1: vec![(99, 1), (99, 2)],
-			votes2: vec![
-				(99, (3, ACC.clone()), 7),
-				(99, (4, ACC.clone()), 8),
-			],
-			votes3: vec![
-				(99, [(11, ACC.clone()), (12, ACC.clone())], 13),
-			],
+			votes2: vec![(99, (3, ACC.clone()), 7), (99, (4, ACC.clone()), 8)],
+			votes3: vec![(99, [(11, ACC.clone()), (12, ACC.clone())], 13)],
 			// ensure the last one is also counted.
-			votes16: vec![
-				(
-					99,
-					[
-						(66, ACC.clone()),
-						(66, ACC.clone()),
-						(66, ACC.clone()),
-						(66, ACC.clone()),
-						(66, ACC.clone()),
-						(66, ACC.clone()),
-						(66, ACC.clone()),
-						(66, ACC.clone()),
-						(66, ACC.clone()),
-						(66, ACC.clone()),
-						(66, ACC.clone()),
-						(66, ACC.clone()),
-						(66, ACC.clone()),
-						(66, ACC.clone()),
-						(66, ACC.clone()),
-					],
-					67,
-				)
-			],
+			votes16: vec![(
+				99,
+				[
+					(66, ACC.clone()),
+					(66, ACC.clone()),
+					(66, ACC.clone()),
+					(66, ACC.clone()),
+					(66, ACC.clone()),
+					(66, ACC.clone()),
+					(66, ACC.clone()),
+					(66, ACC.clone()),
+					(66, ACC.clone()),
+					(66, ACC.clone()),
+					(66, ACC.clone()),
+					(66, ACC.clone()),
+					(66, ACC.clone()),
+					(66, ACC.clone()),
+					(66, ACC.clone()),
+				],
+				67,
+			)],
 			..Default::default()
 		};
 
-		assert_eq!(
-			compact.unique_targets(),
-			vec![1, 2, 3, 4, 7, 8, 11, 12, 13, 66, 67]
-		);
+		assert_eq!(compact.unique_targets(), vec![1, 2, 3, 4, 7, 8, 11, 12, 13, 66, 67]);
 		assert_eq!(compact.edge_count(), 2 + (2 * 2) + 3 + 16);
 		assert_eq!(compact.voter_count(), 6);
 
 		// this one has some duplicates.
 		let compact = TestSolutionCompact {
 			votes1: vec![(99, 1), (99, 1)],
-			votes2: vec![
-				(99, (3, ACC.clone()), 7),
-				(99, (4, ACC.clone()), 8),
-			],
-			votes3: vec![
-				(99, [(11, ACC.clone()), (11, ACC.clone())], 13),
-			],
+			votes2: vec![(99, (3, ACC.clone()), 7), (99, (4, ACC.clone()), 8)],
+			votes3: vec![(99, [(11, ACC.clone()), (11, ACC.clone())], 13)],
 			..Default::default()
 		};
 
@@ -1484,7 +1212,6 @@ mod solution_type {
 		let voter_at = |a: u32| -> Option<AccountId> { Some(a as AccountId) };
 		let target_at = |a: u8| -> Option<AccountId> { Some(a as AccountId) };
 
-
 		assert_eq!(
 			compact.into_assignment(&voter_at, &target_at).unwrap_err(),
 			PhragmenError::CompactStakeOverflow,
@@ -1494,7 +1221,11 @@ mod solution_type {
 		let compact = TestSolutionCompact {
 			votes1: Default::default(),
 			votes2: Default::default(),
-			votes3: vec![(0, [(1, TestAccuracy::from_percent(70)), (2, TestAccuracy::from_percent(80))], 3)],
+			votes3: vec![(
+				0,
+				[(1, TestAccuracy::from_percent(70)), (2, TestAccuracy::from_percent(80))],
+				3,
+			)],
 			..Default::default()
 		};
 
@@ -1509,21 +1240,15 @@ mod solution_type {
 		let voter_index = |a: &AccountId| -> Option<u32> { Some(*a as u32) };
 		let target_index = |a: &AccountId| -> Option<u8> { Some(*a as u8) };
 
-		let assignments = vec![
-			Assignment {
-				who: 1 as AccountId,
-				distribution:
-					(10..27)
-					.map(|i| (i as AccountId, Percent::from_parts(i as u8)))
-					.collect::<Vec<_>>(),
-			},
-		];
+		let assignments = vec![Assignment {
+			who: 1 as AccountId,
+			distribution: (10..27)
+				.map(|i| (i as AccountId, Percent::from_parts(i as u8)))
+				.collect::<Vec<_>>(),
+		}];
 
-		let compacted = TestSolutionCompact::from_assignment(
-			&assignments,
-			voter_index,
-			target_index,
-		);
+		let compacted =
+			TestSolutionCompact::from_assignment(&assignments, voter_index, target_index);
 		assert_eq!(compacted.unwrap_err(), PhragmenError::CompactTargetOverflow);
 	}
 
@@ -1535,12 +1260,12 @@ mod solution_type {
 		let assignments = vec![
 			Assignment {
 				who: 1 as AccountId,
-				distribution: vec![(10, Percent::from_percent(50)), (11, Percent::from_percent(50))],
-			},
-			Assignment {
-				who: 2,
-				distribution: vec![],
+				distribution: vec![
+					(10, Percent::from_percent(50)),
+					(11, Percent::from_percent(50)),
+				],
 			},
+			Assignment { who: 2, distribution: vec![] },
 		];
 
 		let voter_index = |a: &AccountId| -> Option<u32> {
@@ -1550,11 +1275,8 @@ mod solution_type {
 			targets.iter().position(|x| x == a).map(TryInto::try_into).unwrap().ok()
 		};
 
-		let compacted = TestSolutionCompact::from_assignment(
-			&assignments,
-			voter_index,
-			target_index,
-		).unwrap();
+		let compacted =
+			TestSolutionCompact::from_assignment(&assignments, voter_index, target_index).unwrap();
 
 		assert_eq!(
 			compacted,
diff --git a/primitives/panic-handler/src/lib.rs b/primitives/panic-handler/src/lib.rs
index 150ce5297680..1c72f224071c 100644
--- a/primitives/panic-handler/src/lib.rs
+++ b/primitives/panic-handler/src/lib.rs
@@ -25,11 +25,13 @@
 //! temporarily be disabled by using an [`AbortGuard`].
 
 use backtrace::Backtrace;
-use std::io::{self, Write};
-use std::marker::PhantomData;
-use std::panic::{self, PanicInfo};
-use std::cell::Cell;
-use std::thread;
+use std::{
+	cell::Cell,
+	io::{self, Write},
+	marker::PhantomData,
+	panic::{self, PanicInfo},
+	thread,
+};
 
 thread_local! {
 	static ON_PANIC: Cell<OnPanic> = Cell::new(OnPanic::Abort);
@@ -56,18 +58,19 @@ pub fn set(bug_url: &str, version: &str) {
 	panic::set_hook(Box::new({
 		let version = version.to_string();
 		let bug_url = bug_url.to_string();
-		move |c| {
-			panic_hook(c, &bug_url, &version)
-		}
+		move |c| panic_hook(c, &bug_url, &version)
 	}));
 }
 
 macro_rules! ABOUT_PANIC {
-	() => ("
+	() => {
+		"
 This is a bug. Please report it at:
 
 	{}
-")}
+"
+	};
+}
 
 /// Set aborting flag. Returns previous value of the flag.
 fn set_abort(on_panic: OnPanic) -> OnPanic {
@@ -92,35 +95,26 @@ pub struct AbortGuard {
 	/// Value that was in `ABORT` before we created this guard.
 	previous_val: OnPanic,
 	/// Marker so that `AbortGuard` doesn't implement `Send`.
-	_not_send: PhantomData<std::rc::Rc<()>>
+	_not_send: PhantomData<std::rc::Rc<()>>,
 }
 
 impl AbortGuard {
 	/// Create a new guard. While the guard is alive, panics that happen in the current thread will
 	/// unwind the stack (unless another guard is created afterwards).
 	pub fn force_unwind() -> AbortGuard {
-		AbortGuard {
-			previous_val: set_abort(OnPanic::Unwind),
-			_not_send: PhantomData
-		}
+		AbortGuard { previous_val: set_abort(OnPanic::Unwind), _not_send: PhantomData }
 	}
 
 	/// Create a new guard. While the guard is alive, panics that happen in the current thread will
 	/// abort the process (unless another guard is created afterwards).
 	pub fn force_abort() -> AbortGuard {
-		AbortGuard {
-			previous_val: set_abort(OnPanic::Abort),
-			_not_send: PhantomData
-		}
+		AbortGuard { previous_val: set_abort(OnPanic::Abort), _not_send: PhantomData }
 	}
 
 	/// Create a new guard. While the guard is alive, panics that happen in the current thread will
 	/// **never** abort the process (even if `AbortGuard::force_abort()` guard will be created afterwards).
 	pub fn never_abort() -> AbortGuard {
-		AbortGuard {
-			previous_val: set_abort(OnPanic::NeverAbort),
-			_not_send: PhantomData
-		}
+		AbortGuard { previous_val: set_abort(OnPanic::NeverAbort), _not_send: PhantomData }
 	}
 }
 
@@ -141,7 +135,7 @@ fn panic_hook(info: &PanicInfo, report_url: &str, version: &str) {
 		None => match info.payload().downcast_ref::<String>() {
 			Some(s) => &s[..],
 			None => "Box<Any>",
-		}
+		},
 	};
 
 	let thread = thread::current();
@@ -158,11 +152,7 @@ fn panic_hook(info: &PanicInfo, report_url: &str, version: &str) {
 	let _ = writeln!(stderr, "");
 	let _ = writeln!(stderr, "{:?}", backtrace);
 	let _ = writeln!(stderr, "");
-	let _ = writeln!(
-		stderr,
-		"Thread '{}' panicked at '{}', {}:{}",
-		name, msg, file, line
-	);
+	let _ = writeln!(stderr, "Thread '{}' panicked at '{}', {}:{}", name, msg, file, line);
 
 	let _ = writeln!(stderr, ABOUT_PANIC!(), report_url);
 	ON_PANIC.with(|val| {
diff --git a/primitives/rpc/src/lib.rs b/primitives/rpc/src/lib.rs
index ea7118479943..0d716d5a07c1 100644
--- a/primitives/rpc/src/lib.rs
+++ b/primitives/rpc/src/lib.rs
@@ -19,22 +19,16 @@
 
 #![warn(missing_docs)]
 
-pub mod number;
 pub mod list;
+pub mod number;
 pub mod tracing;
 
 /// A util function to assert the result of serialization and deserialization is the same.
 #[cfg(test)]
-pub(crate) fn assert_deser<T>(s: &str, expected: T) where
-	T: std::fmt::Debug + serde::ser::Serialize + serde::de::DeserializeOwned + PartialEq
+pub(crate) fn assert_deser<T>(s: &str, expected: T)
+where
+	T: std::fmt::Debug + serde::ser::Serialize + serde::de::DeserializeOwned + PartialEq,
 {
-	assert_eq!(
-		serde_json::from_str::<T>(s).unwrap(),
-		expected
-	);
-	assert_eq!(
-		serde_json::to_string(&expected).unwrap(),
-		s
-	);
+	assert_eq!(serde_json::from_str::<T>(s).unwrap(), expected);
+	assert_eq!(serde_json::to_string(&expected).unwrap(), s);
 }
-
diff --git a/primitives/rpc/src/list.rs b/primitives/rpc/src/list.rs
index 1f4c6ff098c4..b3d0a4f546e9 100644
--- a/primitives/rpc/src/list.rs
+++ b/primitives/rpc/src/list.rs
@@ -17,7 +17,7 @@
 
 //! RPC a lenient list or value type.
 
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 /// RPC list or value wrapper.
 ///
diff --git a/primitives/rpc/src/number.rs b/primitives/rpc/src/number.rs
index ad19b7f5b436..916f2c3d8326 100644
--- a/primitives/rpc/src/number.rs
+++ b/primitives/rpc/src/number.rs
@@ -18,9 +18,12 @@
 //! A number type that can be serialized both as a number or a string that encodes a number in a
 //! string.
 
-use std::{convert::{TryFrom, TryInto}, fmt::Debug};
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 use sp_core::U256;
+use std::{
+	convert::{TryFrom, TryInto},
+	fmt::Debug,
+};
 
 /// A number type that can be serialized both as a number or a string that encodes a number in a
 /// string.
diff --git a/primitives/rpc/src/tracing.rs b/primitives/rpc/src/tracing.rs
index 1062ec1d9ebe..7e05cd84a7dd 100644
--- a/primitives/rpc/src/tracing.rs
+++ b/primitives/rpc/src/tracing.rs
@@ -17,7 +17,7 @@
 
 //! Types for working with tracing data
 
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 use rustc_hash::FxHashMap;
 
@@ -84,7 +84,7 @@ pub struct Data {
 #[serde(rename_all = "camelCase")]
 pub struct TraceError {
 	/// Error message
-    pub error: String,
+	pub error: String,
 }
 
 /// Response for the `state_traceBlock` RPC.
@@ -94,5 +94,5 @@ pub enum TraceBlockResponse {
 	/// Error block tracing response
 	TraceError(TraceError),
 	/// Successful block tracing response
-	BlockTrace(BlockTrace)
+	BlockTrace(BlockTrace),
 }
diff --git a/primitives/runtime-interface/proc-macro/src/lib.rs b/primitives/runtime-interface/proc-macro/src/lib.rs
index 53df4e084d27..502130f1b410 100644
--- a/primitives/runtime-interface/proc-macro/src/lib.rs
+++ b/primitives/runtime-interface/proc-macro/src/lib.rs
@@ -26,8 +26,10 @@
 //! 3. The [`PassByEnum`](derive.PassByInner.html) derive macro for implementing `PassBy` with `Enum`.
 //! 4. The [`PassByInner`](derive.PassByInner.html) derive macro for implementing `PassBy` with `Inner`.
 
-use syn::{parse_macro_input, ItemTrait, DeriveInput, Result, Token};
-use syn::parse::{Parse, ParseStream};
+use syn::{
+	parse::{Parse, ParseStream},
+	parse_macro_input, DeriveInput, ItemTrait, Result, Token,
+};
 
 mod pass_by;
 mod runtime_interface;
@@ -35,7 +37,7 @@ mod utils;
 
 struct Options {
 	wasm_only: bool,
-	tracing: bool
+	tracing: bool,
 }
 
 impl Options {
@@ -86,17 +88,21 @@ pub fn runtime_interface(
 #[proc_macro_derive(PassByCodec)]
 pub fn pass_by_codec(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
 	let input = parse_macro_input!(input as DeriveInput);
-	pass_by::codec_derive_impl(input).unwrap_or_else(|e| e.to_compile_error()).into()
+	pass_by::codec_derive_impl(input)
+		.unwrap_or_else(|e| e.to_compile_error())
+		.into()
 }
 
 #[proc_macro_derive(PassByInner)]
 pub fn pass_by_inner(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
 	let input = parse_macro_input!(input as DeriveInput);
-	pass_by::inner_derive_impl(input).unwrap_or_else(|e| e.to_compile_error()).into()
+	pass_by::inner_derive_impl(input)
+		.unwrap_or_else(|e| e.to_compile_error())
+		.into()
 }
 
 #[proc_macro_derive(PassByEnum)]
 pub fn pass_by_enum(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
 	let input = parse_macro_input!(input as DeriveInput);
 	pass_by::enum_derive_impl(input).unwrap_or_else(|e| e.to_compile_error()).into()
-}
\ No newline at end of file
+}
diff --git a/primitives/runtime-interface/proc-macro/src/pass_by/codec.rs b/primitives/runtime-interface/proc-macro/src/pass_by/codec.rs
index 1e6b72f88233..2be455d17a47 100644
--- a/primitives/runtime-interface/proc-macro/src/pass_by/codec.rs
+++ b/primitives/runtime-interface/proc-macro/src/pass_by/codec.rs
@@ -22,7 +22,7 @@
 
 use crate::utils::{generate_crate_access, generate_runtime_interface_include};
 
-use syn::{DeriveInput, Result, Generics, parse_quote};
+use syn::{parse_quote, DeriveInput, Generics, Result};
 
 use quote::quote;
 
@@ -53,7 +53,7 @@ pub fn derive_impl(mut input: DeriveInput) -> Result<TokenStream> {
 fn add_trait_bounds(generics: &mut Generics) {
 	let crate_ = generate_crate_access();
 
-	generics.type_params_mut()
+	generics
+		.type_params_mut()
 		.for_each(|type_param| type_param.bounds.push(parse_quote!(#crate_::codec::Codec)));
 }
-
diff --git a/primitives/runtime-interface/proc-macro/src/pass_by/enum_.rs b/primitives/runtime-interface/proc-macro/src/pass_by/enum_.rs
index cc0428fc9b56..f614e4d9f294 100644
--- a/primitives/runtime-interface/proc-macro/src/pass_by/enum_.rs
+++ b/primitives/runtime-interface/proc-macro/src/pass_by/enum_.rs
@@ -21,11 +21,11 @@
 
 use crate::utils::{generate_crate_access, generate_runtime_interface_include};
 
-use syn::{DeriveInput, Result, Data, Fields, Error, Ident};
+use syn::{Data, DeriveInput, Error, Fields, Ident, Result};
 
 use quote::quote;
 
-use proc_macro2::{TokenStream, Span};
+use proc_macro2::{Span, TokenStream};
 
 /// The derive implementation for `PassBy` with `Enum`.
 pub fn derive_impl(input: DeriveInput) -> Result<TokenStream> {
@@ -81,22 +81,21 @@ pub fn derive_impl(input: DeriveInput) -> Result<TokenStream> {
 /// enum or a variant is not an unit.
 fn get_enum_field_idents<'a>(data: &'a Data) -> Result<impl Iterator<Item = Result<&'a Ident>>> {
 	match data {
-		Data::Enum(d) => {
+		Data::Enum(d) =>
 			if d.variants.len() <= 256 {
-				Ok(
-					d.variants.iter().map(|v| if let Fields::Unit = v.fields {
+				Ok(d.variants.iter().map(|v| {
+					if let Fields::Unit = v.fields {
 						Ok(&v.ident)
 					} else {
 						Err(Error::new(
 							Span::call_site(),
 							"`PassByEnum` only supports unit variants.",
 						))
-					})
-				)
+					}
+				}))
 			} else {
 				Err(Error::new(Span::call_site(), "`PassByEnum` only supports `256` variants."))
-			}
-		},
-		_ => Err(Error::new(Span::call_site(), "`PassByEnum` only supports enums as input type."))
+			},
+		_ => Err(Error::new(Span::call_site(), "`PassByEnum` only supports enums as input type.")),
 	}
 }
diff --git a/primitives/runtime-interface/proc-macro/src/pass_by/inner.rs b/primitives/runtime-interface/proc-macro/src/pass_by/inner.rs
index 7fe0d1734c36..6eaa689d6293 100644
--- a/primitives/runtime-interface/proc-macro/src/pass_by/inner.rs
+++ b/primitives/runtime-interface/proc-macro/src/pass_by/inner.rs
@@ -22,11 +22,11 @@
 
 use crate::utils::{generate_crate_access, generate_runtime_interface_include};
 
-use syn::{DeriveInput, Result, Generics, parse_quote, Type, Data, Error, Fields, Ident};
+use syn::{parse_quote, Data, DeriveInput, Error, Fields, Generics, Ident, Result, Type};
 
 use quote::quote;
 
-use proc_macro2::{TokenStream, Span};
+use proc_macro2::{Span, TokenStream};
 
 /// The derive implementation for `PassBy` with `Inner` and `PassByInner`.
 pub fn derive_impl(mut input: DeriveInput) -> Result<TokenStream> {
@@ -80,7 +80,8 @@ pub fn derive_impl(mut input: DeriveInput) -> Result<TokenStream> {
 fn add_trait_bounds(generics: &mut Generics) {
 	let crate_ = generate_crate_access();
 
-	generics.type_params_mut()
+	generics
+		.type_params_mut()
 		.for_each(|type_param| type_param.bounds.push(parse_quote!(#crate_::RIType)));
 }
 
@@ -97,15 +98,13 @@ fn extract_inner_ty_and_name(data: &Data) -> Result<(Type, Option<Ident>)> {
 			Fields::Unnamed(ref unnamed) if unnamed.unnamed.len() == 1 => {
 				let field = &unnamed.unnamed[0];
 				return Ok((field.ty.clone(), field.ident.clone()))
-			}
+			},
 			_ => {},
 		}
 	}
 
-	Err(
-		Error::new(
-			Span::call_site(),
-			"Only newtype/one field structs are supported by `PassByInner`!",
-		)
-	)
+	Err(Error::new(
+		Span::call_site(),
+		"Only newtype/one field structs are supported by `PassByInner`!",
+	))
 }
diff --git a/primitives/runtime-interface/proc-macro/src/runtime_interface/bare_function_interface.rs b/primitives/runtime-interface/proc-macro/src/runtime_interface/bare_function_interface.rs
index d17067d990c3..1943acbb214d 100644
--- a/primitives/runtime-interface/proc-macro/src/runtime_interface/bare_function_interface.rs
+++ b/primitives/runtime-interface/proc-macro/src/runtime_interface/bare_function_interface.rs
@@ -30,15 +30,16 @@
 //! are feature-gated, so that one is compiled for the native and the other for the wasm side.
 
 use crate::utils::{
-	generate_crate_access, create_exchangeable_host_function_ident, get_function_arguments,
-	get_function_argument_names, get_runtime_interface, create_function_ident_with_version,
+	create_exchangeable_host_function_ident, create_function_ident_with_version,
+	generate_crate_access, get_function_argument_names, get_function_arguments,
+	get_runtime_interface,
 };
 
 use syn::{
-	Ident, ItemTrait, TraitItemMethod, FnArg, Signature, Result, spanned::Spanned, parse_quote,
+	parse_quote, spanned::Spanned, FnArg, Ident, ItemTrait, Result, Signature, TraitItemMethod,
 };
 
-use proc_macro2::{TokenStream, Span};
+use proc_macro2::{Span, TokenStream};
 
 use quote::{quote, quote_spanned};
 
@@ -51,21 +52,22 @@ pub fn generate(trait_def: &ItemTrait, is_wasm_only: bool, tracing: bool) -> Res
 	let runtime_interface = get_runtime_interface(trait_def)?;
 
 	// latest version dispatch
-	let token_stream: Result<TokenStream> = runtime_interface.latest_versions()
-		.try_fold(
-			TokenStream::new(),
-			|mut t, (latest_version, method)| {
-				t.extend(function_for_method(method, latest_version, is_wasm_only)?);
-				Ok(t)
-			}
-		);
+	let token_stream: Result<TokenStream> = runtime_interface.latest_versions().try_fold(
+		TokenStream::new(),
+		|mut t, (latest_version, method)| {
+			t.extend(function_for_method(method, latest_version, is_wasm_only)?);
+			Ok(t)
+		},
+	);
 
 	// earlier versions compatibility dispatch (only std variant)
-	let result: Result<TokenStream> = runtime_interface.all_versions().try_fold(token_stream?, |mut t, (version, method)|
-	{
-		t.extend(function_std_impl(trait_name, method, version, is_wasm_only, tracing)?);
-		Ok(t)
-	});
+	let result: Result<TokenStream> =
+		runtime_interface
+			.all_versions()
+			.try_fold(token_stream?, |mut t, (version, method)| {
+				t.extend(function_std_impl(trait_name, method, version, is_wasm_only, tracing)?);
+				Ok(t)
+			});
 
 	result
 }
@@ -76,21 +78,16 @@ fn function_for_method(
 	latest_version: u32,
 	is_wasm_only: bool,
 ) -> Result<TokenStream> {
-	let std_impl = if !is_wasm_only {
-		function_std_latest_impl(method, latest_version)?
-	} else {
-		quote!()
-	};
+	let std_impl =
+		if !is_wasm_only { function_std_latest_impl(method, latest_version)? } else { quote!() };
 
 	let no_std_impl = function_no_std_impl(method)?;
 
-	Ok(
-		quote! {
-			#std_impl
+	Ok(quote! {
+		#std_impl
 
-			#no_std_impl
-		}
-	)
+		#no_std_impl
+	})
 }
 
 /// Generates the bare function implementation for `cfg(not(feature = "std"))`.
@@ -102,31 +99,27 @@ fn function_no_std_impl(method: &TraitItemMethod) -> Result<TokenStream> {
 	let return_value = &method.sig.output;
 	let attrs = method.attrs.iter().filter(|a| !a.path.is_ident("version"));
 
-	Ok(
-		quote! {
-			#[cfg(not(feature = "std"))]
-			#( #attrs )*
-			pub fn #function_name( #( #args, )* ) #return_value {
-				// Call the host function
-				#host_function_name.get()( #( #arg_names, )* )
-			}
+	Ok(quote! {
+		#[cfg(not(feature = "std"))]
+		#( #attrs )*
+		pub fn #function_name( #( #args, )* ) #return_value {
+			// Call the host function
+			#host_function_name.get()( #( #arg_names, )* )
 		}
-	)
+	})
 }
 
 /// Generate call to latest function version for `cfg((feature = "std")`
 ///
 /// This should generate simple `fn func(..) { func_version_<latest_version>(..) }`.
-fn function_std_latest_impl(
-	method: &TraitItemMethod,
-	latest_version: u32,
-) -> Result<TokenStream> {
+fn function_std_latest_impl(method: &TraitItemMethod, latest_version: u32) -> Result<TokenStream> {
 	let function_name = &method.sig.ident;
 	let args = get_function_arguments(&method.sig).map(FnArg::Typed);
 	let arg_names = get_function_argument_names(&method.sig).collect::<Vec<_>>();
 	let return_value = &method.sig.output;
 	let attrs = method.attrs.iter().filter(|a| !a.path.is_ident("version"));
-	let latest_function_name = create_function_ident_with_version(&method.sig.ident, latest_version);
+	let latest_function_name =
+		create_function_ident_with_version(&method.sig.ident, latest_version);
 
 	Ok(quote_spanned! { method.span() =>
 		#[cfg(feature = "std")]
@@ -153,17 +146,16 @@ fn function_std_impl(
 	let crate_ = generate_crate_access();
 	let args = get_function_arguments(&method.sig).map(FnArg::Typed).chain(
 		// Add the function context as last parameter when this is a wasm only interface.
-		iter::from_fn(||
+		iter::from_fn(|| {
 			if is_wasm_only {
-				Some(
-					parse_quote!(
-						mut __function_context__: &mut dyn #crate_::sp_wasm_interface::FunctionContext
-					)
-				)
+				Some(parse_quote!(
+					mut __function_context__: &mut dyn #crate_::sp_wasm_interface::FunctionContext
+				))
 			} else {
 				None
 			}
-		).take(1),
+		})
+		.take(1),
 	);
 	let return_value = &method.sig.output;
 	let attrs = method.attrs.iter().filter(|a| !a.path.is_ident("version"));
@@ -179,15 +171,13 @@ fn function_std_impl(
 		)
 	};
 
-	Ok(
-		quote_spanned! { method.span() =>
-			#[cfg(feature = "std")]
-			#( #attrs )*
-			fn #function_name( #( #args, )* ) #return_value {
-				#call_to_trait
-			}
+	Ok(quote_spanned! { method.span() =>
+		#[cfg(feature = "std")]
+		#( #attrs )*
+		fn #function_name( #( #args, )* ) #return_value {
+			#call_to_trait
 		}
-	)
+	})
 }
 
 /// Generate the call to the interface trait.
@@ -199,10 +189,8 @@ fn generate_call_to_trait(
 ) -> TokenStream {
 	let crate_ = generate_crate_access();
 	let method_name = create_function_ident_with_version(&method.sig.ident, version);
-	let expect_msg = format!(
-		"`{}` called outside of an Externalities-provided environment.",
-		method_name,
-	);
+	let expect_msg =
+		format!("`{}` called outside of an Externalities-provided environment.", method_name,);
 	let arg_names = get_function_argument_names(&method.sig);
 
 	if takes_self_argument(&method.sig) {
diff --git a/primitives/runtime-interface/proc-macro/src/runtime_interface/host_function_interface.rs b/primitives/runtime-interface/proc-macro/src/runtime_interface/host_function_interface.rs
index fb127b194153..ab84c04e3a72 100644
--- a/primitives/runtime-interface/proc-macro/src/runtime_interface/host_function_interface.rs
+++ b/primitives/runtime-interface/proc-macro/src/runtime_interface/host_function_interface.rs
@@ -22,35 +22,36 @@
 //! executor. These implementations call the bare function interface.
 
 use crate::utils::{
-	generate_crate_access, create_host_function_ident, get_function_argument_names,
-	get_function_argument_types_without_ref, get_function_argument_types_ref_and_mut,
-	get_function_argument_names_and_types_without_ref, get_function_arguments,
-	get_function_argument_types, create_exchangeable_host_function_ident, get_runtime_interface,
-	create_function_ident_with_version,
+	create_exchangeable_host_function_ident, create_function_ident_with_version,
+	create_host_function_ident, generate_crate_access, get_function_argument_names,
+	get_function_argument_names_and_types_without_ref, get_function_argument_types,
+	get_function_argument_types_ref_and_mut, get_function_argument_types_without_ref,
+	get_function_arguments, get_runtime_interface,
 };
 
 use syn::{
-	ItemTrait, TraitItemMethod, Result, ReturnType, Ident, Pat, Error, Signature, spanned::Spanned,
+	spanned::Spanned, Error, Ident, ItemTrait, Pat, Result, ReturnType, Signature, TraitItemMethod,
 };
 
-use proc_macro2::{TokenStream, Span};
+use proc_macro2::{Span, TokenStream};
 
 use quote::{quote, ToTokens};
 
 use inflector::Inflector;
 
-use std::iter::{Iterator, self};
+use std::iter::{self, Iterator};
 
 /// Generate the extern host functions for wasm and the `HostFunctions` struct that provides the
 /// implementations for the host functions on the host.
 pub fn generate(trait_def: &ItemTrait, is_wasm_only: bool) -> Result<TokenStream> {
 	let trait_name = &trait_def.ident;
-	let extern_host_function_impls = get_runtime_interface(trait_def)?
-		.latest_versions()
-		.try_fold(TokenStream::new(), |mut t, (version, method)| {
+	let extern_host_function_impls = get_runtime_interface(trait_def)?.latest_versions().try_fold(
+		TokenStream::new(),
+		|mut t, (version, method)| {
 			t.extend(generate_extern_host_function(method, version, trait_name)?);
 			Ok::<_, Error>(t)
-		})?;
+		},
+	)?;
 	let exchangeable_host_functions = get_runtime_interface(trait_def)?
 		.latest_versions()
 		.try_fold(TokenStream::new(), |mut t, (_, m)| {
@@ -59,27 +60,29 @@ pub fn generate(trait_def: &ItemTrait, is_wasm_only: bool) -> Result<TokenStream
 		})?;
 	let host_functions_struct = generate_host_functions_struct(trait_def, is_wasm_only)?;
 
-	Ok(
-		quote! {
-			/// The implementations of the extern host functions. This special implementation module
-			/// is required to change the extern host functions signature to
-			/// `unsafe fn name(args) -> ret` to make the function implementations exchangeable.
-			#[cfg(not(feature = "std"))]
-			mod extern_host_function_impls {
-				use super::*;
-
-				#extern_host_function_impls
-			}
-
-			#exchangeable_host_functions
+	Ok(quote! {
+		/// The implementations of the extern host functions. This special implementation module
+		/// is required to change the extern host functions signature to
+		/// `unsafe fn name(args) -> ret` to make the function implementations exchangeable.
+		#[cfg(not(feature = "std"))]
+		mod extern_host_function_impls {
+			use super::*;
 
-			#host_functions_struct
+			#extern_host_function_impls
 		}
-	)
+
+		#exchangeable_host_functions
+
+		#host_functions_struct
+	})
 }
 
 /// Generate the extern host function for the given method.
-fn generate_extern_host_function(method: &TraitItemMethod, version: u32, trait_name: &Ident) -> Result<TokenStream> {
+fn generate_extern_host_function(
+	method: &TraitItemMethod,
+	version: u32,
+	trait_name: &Ident,
+) -> Result<TokenStream> {
 	let crate_ = generate_crate_access();
 	let args = get_function_arguments(&method.sig);
 	let arg_types = get_function_argument_types_without_ref(&method.sig);
@@ -106,33 +109,31 @@ fn generate_extern_host_function(method: &TraitItemMethod, version: u32, trait_n
 		ReturnType::Default => quote!(),
 		ReturnType::Type(_, ref ty) => quote! {
 			<#ty as #crate_::wasm::FromFFIValue>::from_ffi_value(result)
-		}
+		},
 	};
 
-	Ok(
-		quote! {
-			#[doc = #doc_string]
-			pub fn #function ( #( #args ),* ) #return_value {
-				extern "C" {
-					/// The extern function.
-					pub fn #ext_function (
-						#( #arg_names: <#arg_types as #crate_::RIType>::FFIType ),*
-					) #ffi_return_value;
-				}
+	Ok(quote! {
+		#[doc = #doc_string]
+		pub fn #function ( #( #args ),* ) #return_value {
+			extern "C" {
+				/// The extern function.
+				pub fn #ext_function (
+					#( #arg_names: <#arg_types as #crate_::RIType>::FFIType ),*
+				) #ffi_return_value;
+			}
 
-				// Generate all wrapped ffi values.
-				#(
-					let #arg_names2 = <#arg_types2 as #crate_::wasm::IntoFFIValue>::into_ffi_value(
-						&#arg_names2,
-					);
-				)*
+			// Generate all wrapped ffi values.
+			#(
+				let #arg_names2 = <#arg_types2 as #crate_::wasm::IntoFFIValue>::into_ffi_value(
+					&#arg_names2,
+				);
+			)*
 
-				let result = unsafe { #ext_function( #( #arg_names3.get() ),* ) };
+			let result = unsafe { #ext_function( #( #arg_names3.get() ),* ) };
 
-				#convert_return_value
-			}
+			#convert_return_value
 		}
-	)
+	})
 }
 
 /// Generate the host exchangeable function for the given method.
@@ -144,44 +145,43 @@ fn generate_exchangeable_host_function(method: &TraitItemMethod) -> Result<Token
 	let doc_string = format!(" Exchangeable host function used by [`{}`].", method.sig.ident);
 	let output = &method.sig.output;
 
-	Ok(
-		quote! {
-			#[cfg(not(feature = "std"))]
-			#[allow(non_upper_case_globals)]
-			#[doc = #doc_string]
-			pub static #exchangeable_function : #crate_::wasm::ExchangeableFunction<
-				fn ( #( #arg_types ),* ) #output
-			> = #crate_::wasm::ExchangeableFunction::new(extern_host_function_impls::#function);
-		}
-	)
+	Ok(quote! {
+		#[cfg(not(feature = "std"))]
+		#[allow(non_upper_case_globals)]
+		#[doc = #doc_string]
+		pub static #exchangeable_function : #crate_::wasm::ExchangeableFunction<
+			fn ( #( #arg_types ),* ) #output
+		> = #crate_::wasm::ExchangeableFunction::new(extern_host_function_impls::#function);
+	})
 }
 
 /// Generate the `HostFunctions` struct that implements `wasm-interface::HostFunctions` to provide
 /// implementations for the extern host functions.
-fn generate_host_functions_struct(trait_def: &ItemTrait, is_wasm_only: bool) -> Result<TokenStream> {
+fn generate_host_functions_struct(
+	trait_def: &ItemTrait,
+	is_wasm_only: bool,
+) -> Result<TokenStream> {
 	let crate_ = generate_crate_access();
 
 	let host_functions = get_runtime_interface(trait_def)?
 		.all_versions()
-		.map(|(version, method)|
+		.map(|(version, method)| {
 			generate_host_function_implementation(&trait_def.ident, method, version, is_wasm_only)
-		)
+		})
 		.collect::<Result<Vec<_>>>()?;
 
-	Ok(
-		quote! {
-			/// Provides implementations for the extern host functions.
-			#[cfg(feature = "std")]
-			pub struct HostFunctions;
-
-			#[cfg(feature = "std")]
-			impl #crate_::sp_wasm_interface::HostFunctions for HostFunctions {
-				fn host_functions() -> Vec<&'static dyn #crate_::sp_wasm_interface::Function> {
-					vec![ #( #host_functions ),* ]
-				}
+	Ok(quote! {
+		/// Provides implementations for the extern host functions.
+		#[cfg(feature = "std")]
+		pub struct HostFunctions;
+
+		#[cfg(feature = "std")]
+		impl #crate_::sp_wasm_interface::HostFunctions for HostFunctions {
+			fn host_functions() -> Vec<&'static dyn #crate_::sp_wasm_interface::Function> {
+				vec![ #( #host_functions ),* ]
 			}
 		}
-	)
+	})
 }
 
 /// Generates the host function struct that implements `wasm_interface::Function` and returns a static
@@ -199,71 +199,65 @@ fn generate_host_function_implementation(
 	let struct_name = Ident::new(&name.to_pascal_case(), Span::call_site());
 	let crate_ = generate_crate_access();
 	let signature = generate_wasm_interface_signature_for_host_function(&method.sig)?;
-	let wasm_to_ffi_values = generate_wasm_to_ffi_values(
-		&method.sig,
-		trait_name,
-	).collect::<Result<Vec<_>>>()?;
+	let wasm_to_ffi_values =
+		generate_wasm_to_ffi_values(&method.sig, trait_name).collect::<Result<Vec<_>>>()?;
 	let ffi_to_host_values = generate_ffi_to_host_value(&method.sig).collect::<Result<Vec<_>>>()?;
 	let host_function_call = generate_host_function_call(&method.sig, version, is_wasm_only);
 	let into_preallocated_ffi_value = generate_into_preallocated_ffi_value(&method.sig)?;
 	let convert_return_value = generate_return_value_into_wasm_value(&method.sig);
 
-	Ok(
-		quote! {
-			{
-				struct #struct_name;
-
-				impl #crate_::sp_wasm_interface::Function for #struct_name {
-					fn name(&self) -> &str {
-						#name
-					}
-
-					fn signature(&self) -> #crate_::sp_wasm_interface::Signature {
-						#signature
-					}
-
-					fn execute(
-						&self,
-						__function_context__: &mut dyn #crate_::sp_wasm_interface::FunctionContext,
-						args: &mut dyn Iterator<Item = #crate_::sp_wasm_interface::Value>,
-					) -> std::result::Result<Option<#crate_::sp_wasm_interface::Value>, String> {
-						#( #wasm_to_ffi_values )*
-						#( #ffi_to_host_values )*
-						#host_function_call
-						#into_preallocated_ffi_value
-						#convert_return_value
-					}
+	Ok(quote! {
+		{
+			struct #struct_name;
+
+			impl #crate_::sp_wasm_interface::Function for #struct_name {
+				fn name(&self) -> &str {
+					#name
+				}
+
+				fn signature(&self) -> #crate_::sp_wasm_interface::Signature {
+					#signature
 				}
 
-				&#struct_name as &dyn #crate_::sp_wasm_interface::Function
+				fn execute(
+					&self,
+					__function_context__: &mut dyn #crate_::sp_wasm_interface::FunctionContext,
+					args: &mut dyn Iterator<Item = #crate_::sp_wasm_interface::Value>,
+				) -> std::result::Result<Option<#crate_::sp_wasm_interface::Value>, String> {
+					#( #wasm_to_ffi_values )*
+					#( #ffi_to_host_values )*
+					#host_function_call
+					#into_preallocated_ffi_value
+					#convert_return_value
+				}
 			}
+
+			&#struct_name as &dyn #crate_::sp_wasm_interface::Function
 		}
-	)
+	})
 }
 
 /// Generate the `wasm_interface::Signature` for the given host function `sig`.
 fn generate_wasm_interface_signature_for_host_function(sig: &Signature) -> Result<TokenStream> {
 	let crate_ = generate_crate_access();
 	let return_value = match &sig.output {
-		ReturnType::Type(_, ty) =>
-			quote! {
-				Some( <<#ty as #crate_::RIType>::FFIType as #crate_::sp_wasm_interface::IntoValue>::VALUE_TYPE )
-			},
-		ReturnType::Default => quote!( None ),
+		ReturnType::Type(_, ty) => quote! {
+			Some( <<#ty as #crate_::RIType>::FFIType as #crate_::sp_wasm_interface::IntoValue>::VALUE_TYPE )
+		},
+		ReturnType::Default => quote!(None),
 	};
-	let arg_types = get_function_argument_types_without_ref(sig)
-		.map(|ty| quote! {
+	let arg_types = get_function_argument_types_without_ref(sig).map(|ty| {
+		quote! {
 			<<#ty as #crate_::RIType>::FFIType as #crate_::sp_wasm_interface::IntoValue>::VALUE_TYPE
-		});
+		}
+	});
 
-	Ok(
-		quote! {
-			#crate_::sp_wasm_interface::Signature {
-				args: std::borrow::Cow::Borrowed(&[ #( #arg_types ),* ][..]),
-				return_value: #return_value,
-			}
+	Ok(quote! {
+		#crate_::sp_wasm_interface::Signature {
+			args: std::borrow::Cow::Borrowed(&[ #( #arg_types ),* ][..]),
+			return_value: #return_value,
 		}
-	)
+	})
 }
 
 /// Generate the code that converts the wasm values given to `HostFunctions::execute` into the FFI
@@ -279,24 +273,23 @@ fn generate_wasm_to_ffi_values<'a>(
 		function_name,
 	);
 
-	get_function_argument_names_and_types_without_ref(sig)
-		.map(move |(name, ty)| {
-			let try_from_error = format!(
-				"Could not instantiate `{}` from wasm value while executing `{}` from interface `{}`!",
-				name.to_token_stream(),
-				function_name,
-				trait_name,
-			);
+	get_function_argument_names_and_types_without_ref(sig).map(move |(name, ty)| {
+		let try_from_error = format!(
+			"Could not instantiate `{}` from wasm value while executing `{}` from interface `{}`!",
+			name.to_token_stream(),
+			function_name,
+			trait_name,
+		);
 
-			let var_name = generate_ffi_value_var_name(&name)?;
+		let var_name = generate_ffi_value_var_name(&name)?;
 
-			Ok(quote! {
-				let val = args.next().ok_or_else(|| #error_message)?;
-				let #var_name = <
-					<#ty as #crate_::RIType>::FFIType as #crate_::sp_wasm_interface::TryFromValue
-				>::try_from_value(val).ok_or_else(|| #try_from_error)?;
-			})
+		Ok(quote! {
+			let val = args.next().ok_or_else(|| #error_message)?;
+			let #var_name = <
+				<#ty as #crate_::RIType>::FFIType as #crate_::sp_wasm_interface::TryFromValue
+			>::try_from_value(val).ok_or_else(|| #try_from_error)?;
 		})
+	})
 }
 
 /// Generate the code to convert the ffi values on the host to the host values using `FromFFIValue`.
@@ -311,14 +304,12 @@ fn generate_ffi_to_host_value<'a>(
 		.map(move |((name, ty), mut_access)| {
 			let ffi_value_var_name = generate_ffi_value_var_name(&name)?;
 
-			Ok(
-				quote! {
-					let #mut_access #name = <#ty as #crate_::host::FromFFIValue>::from_ffi_value(
-						__function_context__,
-						#ffi_value_var_name,
-					)?;
-				}
-			)
+			Ok(quote! {
+				let #mut_access #name = <#ty as #crate_::host::FromFFIValue>::from_ffi_value(
+					__function_context__,
+					#ffi_value_var_name,
+				)?;
+			})
 		})
 }
 
@@ -326,19 +317,17 @@ fn generate_ffi_to_host_value<'a>(
 fn generate_host_function_call(sig: &Signature, version: u32, is_wasm_only: bool) -> TokenStream {
 	let host_function_name = create_function_ident_with_version(&sig.ident, version);
 	let result_var_name = generate_host_function_result_var_name(&sig.ident);
-	let ref_and_mut = get_function_argument_types_ref_and_mut(sig).map(|ram|
-		ram.map(|(vr, vm)| quote!(#vr #vm))
-	);
+	let ref_and_mut =
+		get_function_argument_types_ref_and_mut(sig).map(|ram| ram.map(|(vr, vm)| quote!(#vr #vm)));
 	let names = get_function_argument_names(sig);
 
-	let var_access = names.zip(ref_and_mut)
-		.map(|(n, ref_and_mut)| {
-			quote!( #ref_and_mut #n )
-		})
+	let var_access = names
+		.zip(ref_and_mut)
+		.map(|(n, ref_and_mut)| quote!( #ref_and_mut #n ))
 		// If this is a wasm only interface, we add the function context as last parameter.
 		.chain(
 			iter::from_fn(|| if is_wasm_only { Some(quote!(__function_context__)) } else { None })
-				.take(1)
+				.take(1),
 		);
 
 	quote! {
@@ -354,16 +343,15 @@ fn generate_host_function_result_var_name(name: &Ident) -> Ident {
 /// Generate the variable name that stores the FFI value.
 fn generate_ffi_value_var_name(pat: &Pat) -> Result<Ident> {
 	match pat {
-		Pat::Ident(pat_ident) => {
+		Pat::Ident(pat_ident) =>
 			if let Some(by_ref) = pat_ident.by_ref {
 				Err(Error::new(by_ref.span(), "`ref` not supported!"))
 			} else if let Some(sub_pattern) = &pat_ident.subpat {
 				Err(Error::new(sub_pattern.0.span(), "Not supported!"))
 			} else {
 				Ok(Ident::new(&format!("{}_ffi_value", pat_ident.ident), Span::call_site()))
-			}
-		}
-		_ => Err(Error::new(pat.span(), "Not supported as variable name!"))
+			},
+		_ => Err(Error::new(pat.span(), "Not supported as variable name!")),
 	}
 }
 
@@ -373,25 +361,23 @@ fn generate_ffi_value_var_name(pat: &Pat) -> Result<Ident> {
 /// that the type implements `IntoPreAllocatedFFIValue`.
 fn generate_into_preallocated_ffi_value(sig: &Signature) -> Result<TokenStream> {
 	let crate_ = generate_crate_access();
-	let ref_and_mut = get_function_argument_types_ref_and_mut(sig).map(|ram|
-		ram.and_then(|(vr, vm)| vm.map(|v| (vr, v)))
-	);
+	let ref_and_mut = get_function_argument_types_ref_and_mut(sig)
+		.map(|ram| ram.and_then(|(vr, vm)| vm.map(|v| (vr, v))));
 	let names_and_types = get_function_argument_names_and_types_without_ref(sig);
 
-	ref_and_mut.zip(names_and_types)
+	ref_and_mut
+		.zip(names_and_types)
 		.filter_map(|(ram, (name, ty))| ram.map(|_| (name, ty)))
 		.map(|(name, ty)| {
 			let ffi_var_name = generate_ffi_value_var_name(&name)?;
 
-			Ok(
-				quote! {
-					<#ty as #crate_::host::IntoPreallocatedFFIValue>::into_preallocated_ffi_value(
-						#name,
-						__function_context__,
-						#ffi_var_name,
-					)?;
-				}
-			)
+			Ok(quote! {
+				<#ty as #crate_::host::IntoPreallocatedFFIValue>::into_preallocated_ffi_value(
+					#name,
+					__function_context__,
+					#ffi_var_name,
+				)?;
+			})
 		})
 		.collect()
 }
@@ -401,7 +387,7 @@ fn generate_return_value_into_wasm_value(sig: &Signature) -> TokenStream {
 	let crate_ = generate_crate_access();
 
 	match &sig.output {
-		ReturnType::Default => quote!( Ok(None) ),
+		ReturnType::Default => quote!(Ok(None)),
 		ReturnType::Type(_, ty) => {
 			let result_var_name = generate_host_function_result_var_name(&sig.ident);
 
@@ -411,6 +397,6 @@ fn generate_return_value_into_wasm_value(sig: &Signature) -> TokenStream {
 					__function_context__,
 				).map(#crate_::sp_wasm_interface::IntoValue::into_value).map(Some)
 			}
-		}
+		},
 	}
 }
diff --git a/primitives/runtime-interface/proc-macro/src/runtime_interface/trait_decl_impl.rs b/primitives/runtime-interface/proc-macro/src/runtime_interface/trait_decl_impl.rs
index 0e392b1a02fb..c62e3ba87ccd 100644
--- a/primitives/runtime-interface/proc-macro/src/runtime_interface/trait_decl_impl.rs
+++ b/primitives/runtime-interface/proc-macro/src/runtime_interface/trait_decl_impl.rs
@@ -19,15 +19,14 @@
 //! default implementations and implements the trait for `&mut dyn Externalities`.
 
 use crate::utils::{
-	generate_crate_access,
-	get_function_argument_types_without_ref,
-	get_runtime_interface,
-	create_function_ident_with_version,
+	create_function_ident_with_version, generate_crate_access,
+	get_function_argument_types_without_ref, get_runtime_interface,
 };
 
 use syn::{
-	ItemTrait, TraitItemMethod, Result, Error, fold::{self, Fold}, spanned::Spanned,
-	Visibility, Receiver, Type, Generics,
+	fold::{self, Fold},
+	spanned::Spanned,
+	Error, Generics, ItemTrait, Receiver, Result, TraitItemMethod, Type, Visibility,
 };
 
 use proc_macro2::TokenStream;
@@ -40,13 +39,11 @@ pub fn process(trait_def: &ItemTrait, is_wasm_only: bool) -> Result<TokenStream>
 	let impl_trait = impl_trait_for_externalities(trait_def, is_wasm_only)?;
 	let essential_trait_def = declare_essential_trait(trait_def)?;
 
-	Ok(
-		quote! {
-			#impl_trait
+	Ok(quote! {
+		#impl_trait
 
-			#essential_trait_def
-		}
-	)
+		#essential_trait_def
+	})
 }
 
 /// Converts the given trait definition into the essential trait definition without method
@@ -66,12 +63,10 @@ impl ToEssentialTraitDef {
 		let mut errors = self.errors;
 		let methods = self.methods;
 		if let Some(first_error) = errors.pop() {
-			Err(
-				errors.into_iter().fold(first_error, |mut o, n| {
-					o.combine(n);
-					o
-				})
-			)
+			Err(errors.into_iter().fold(first_error, |mut o, n| {
+				o.combine(n);
+				o
+			}))
 		} else {
 			Ok(methods)
 		}
@@ -101,12 +96,12 @@ impl Fold for ToEssentialTraitDef {
 		}
 
 		let arg_types = get_function_argument_types_without_ref(&method.sig);
-		arg_types.filter_map(|ty|
-			match *ty {
+		arg_types
+			.filter_map(|ty| match *ty {
 				Type::ImplTrait(impl_trait) => Some(impl_trait),
-				_ => None
-			}
-		).for_each(|invalid| self.push_error(&invalid, "`impl Trait` syntax not supported."));
+				_ => None,
+			})
+			.for_each(|invalid| self.push_error(&invalid, "`impl Trait` syntax not supported."));
 
 		self.error_on_generic_parameters(&method.sig.generics);
 
@@ -145,13 +140,11 @@ fn declare_essential_trait(trait_def: &ItemTrait) -> Result<TokenStream> {
 	}
 	let methods = folder.into_methods()?;
 
-	Ok(
-		quote! {
-			trait #trait_ {
-				#( #methods )*
-			}
+	Ok(quote! {
+		trait #trait_ {
+			#( #methods )*
 		}
-	)
+	})
 }
 
 /// Implements the given trait definition for `dyn Externalities`.
@@ -172,12 +165,10 @@ fn impl_trait_for_externalities(trait_def: &ItemTrait, is_wasm_only: bool) -> Re
 		quote!( &mut dyn #crate_::Externalities )
 	};
 
-	Ok(
-		quote! {
-			#[cfg(feature = "std")]
-			impl #trait_ for #impl_type {
-				#( #methods )*
-			}
+	Ok(quote! {
+		#[cfg(feature = "std")]
+		impl #trait_ for #impl_type {
+			#( #methods )*
 		}
-	)
+	})
 }
diff --git a/primitives/runtime-interface/proc-macro/src/utils.rs b/primitives/runtime-interface/proc-macro/src/utils.rs
index d2d9dd7e3997..02b5d23fbcac 100644
--- a/primitives/runtime-interface/proc-macro/src/utils.rs
+++ b/primitives/runtime-interface/proc-macro/src/utils.rs
@@ -17,16 +17,19 @@
 
 //! Util function used by this crate.
 
-use proc_macro2::{TokenStream, Span};
+use proc_macro2::{Span, TokenStream};
 
 use syn::{
-	Ident, Error, Signature, Pat, PatType, FnArg, Type, token, TraitItemMethod, ItemTrait,
-	TraitItem, parse_quote, spanned::Spanned, Result, Meta, NestedMeta, Lit, Attribute,
+	parse_quote, spanned::Spanned, token, Attribute, Error, FnArg, Ident, ItemTrait, Lit, Meta,
+	NestedMeta, Pat, PatType, Result, Signature, TraitItem, TraitItemMethod, Type,
 };
 
 use proc_macro_crate::{crate_name, FoundCrate};
 
-use std::{env, collections::{BTreeMap, btree_map::Entry}};
+use std::{
+	collections::{btree_map::Entry, BTreeMap},
+	env,
+};
 
 use quote::quote;
 
@@ -53,8 +56,9 @@ impl<'a> RuntimeInterfaceFunction<'a> {
 	pub fn latest_version(&self) -> (u32, &TraitItemMethod) {
 		(
 			self.latest_version,
-			self.versions.get(&self.latest_version)
-				.expect("If latest_version has a value, the key with this value is in the versions; qed")
+			self.versions.get(&self.latest_version).expect(
+				"If latest_version has a value, the key with this value is in the versions; qed",
+			),
 		)
 	}
 }
@@ -70,9 +74,12 @@ impl<'a> RuntimeInterface<'a> {
 	}
 
 	pub fn all_versions(&self) -> impl Iterator<Item = (u32, &TraitItemMethod)> {
-		self.items.iter().flat_map(|(_, item)| item.versions.iter()).map(|(v, i)| (*v, *i))
+		self.items
+			.iter()
+			.flat_map(|(_, item)| item.versions.iter())
+			.map(|(v, i)| (*v, *i))
 	}
- }
+}
 
 /// Generates the include for the runtime-interface crate.
 pub fn generate_runtime_interface_include() -> TokenStream {
@@ -88,16 +95,16 @@ pub fn generate_runtime_interface_include() -> TokenStream {
 		Err(e) => {
 			let err = Error::new(Span::call_site(), e).to_compile_error();
 			quote!( #err )
-		}
+		},
 	}
 }
 
 /// Generates the access to the `sp-runtime-interface` crate.
 pub fn generate_crate_access() -> TokenStream {
 	if env::var("CARGO_PKG_NAME").unwrap() == "sp-runtime-interface" {
-		quote!( sp_runtime_interface )
+		quote!(sp_runtime_interface)
 	} else {
-		quote!( proc_macro_runtime_interface )
+		quote!(proc_macro_runtime_interface)
 	}
 }
 
@@ -109,26 +116,14 @@ pub fn create_exchangeable_host_function_ident(name: &Ident) -> Ident {
 /// Create the host function identifier for the given function name.
 pub fn create_host_function_ident(name: &Ident, version: u32, trait_name: &Ident) -> Ident {
 	Ident::new(
-		&format!(
-			"ext_{}_{}_version_{}",
-			trait_name.to_string().to_snake_case(),
-			name,
-			version,
-		),
+		&format!("ext_{}_{}_version_{}", trait_name.to_string().to_snake_case(), name, version,),
 		Span::call_site(),
 	)
 }
 
 /// Create the host function identifier for the given function name.
 pub fn create_function_ident_with_version(name: &Ident, version: u32) -> Ident {
-	Ident::new(
-		&format!(
-			"{}_version_{}",
-			name,
-			version,
-		),
-		Span::call_site(),
-	)
+	Ident::new(&format!("{}_version_{}", name, version,), Span::call_site())
 }
 
 /// Returns the function arguments of the given `Signature`, minus any `self` arguments.
@@ -143,10 +138,8 @@ pub fn get_function_arguments<'a>(sig: &'a Signature) -> impl Iterator<Item = Pa
 		.map(|(i, arg)| {
 			let mut res = arg.clone();
 			if let Pat::Wild(wild) = &*arg.pat {
-				let ident = Ident::new(
-					&format!("__runtime_interface_generated_{}_", i),
-					wild.span(),
-				);
+				let ident =
+					Ident::new(&format!("__runtime_interface_generated_{}_", i), wild.span());
 
 				res.pat = Box::new(parse_quote!( #ident ))
 			}
@@ -170,12 +163,10 @@ pub fn get_function_argument_types<'a>(sig: &'a Signature) -> impl Iterator<Item
 pub fn get_function_argument_types_without_ref<'a>(
 	sig: &'a Signature,
 ) -> impl Iterator<Item = Box<Type>> + 'a {
-	get_function_arguments(sig)
-		.map(|pt| pt.ty)
-		.map(|ty| match *ty {
-			Type::Reference(type_ref) => type_ref.elem,
-			_ => ty,
-		})
+	get_function_arguments(sig).map(|pt| pt.ty).map(|ty| match *ty {
+		Type::Reference(type_ref) => type_ref.elem,
+		_ => ty,
+	})
 }
 
 /// Returns the function argument names and types, minus any `self`. If any of the arguments
@@ -183,11 +174,10 @@ pub fn get_function_argument_types_without_ref<'a>(
 pub fn get_function_argument_names_and_types_without_ref<'a>(
 	sig: &'a Signature,
 ) -> impl Iterator<Item = (Box<Pat>, Box<Type>)> + 'a {
-	get_function_arguments(sig)
-		.map(|pt| match *pt.ty {
-			Type::Reference(type_ref) => (pt.pat, type_ref.elem),
-			_ => (pt.pat, pt.ty),
-		})
+	get_function_arguments(sig).map(|pt| match *pt.ty {
+		Type::Reference(type_ref) => (pt.pat, type_ref.elem),
+		_ => (pt.pat, pt.ty),
+	})
 }
 
 /// Returns the `&`/`&mut` for all function argument types, minus the `self` arg. If a function
@@ -195,23 +185,18 @@ pub fn get_function_argument_names_and_types_without_ref<'a>(
 pub fn get_function_argument_types_ref_and_mut<'a>(
 	sig: &'a Signature,
 ) -> impl Iterator<Item = Option<(token::And, Option<token::Mut>)>> + 'a {
-	get_function_arguments(sig)
-		.map(|pt| pt.ty)
-		.map(|ty| match *ty {
-			Type::Reference(type_ref) => Some((type_ref.and_token, type_ref.mutability)),
-			_ => None,
-		})
+	get_function_arguments(sig).map(|pt| pt.ty).map(|ty| match *ty {
+		Type::Reference(type_ref) => Some((type_ref.and_token, type_ref.mutability)),
+		_ => None,
+	})
 }
 
 /// Returns an iterator over all trait methods for the given trait definition.
 fn get_trait_methods<'a>(trait_def: &'a ItemTrait) -> impl Iterator<Item = &'a TraitItemMethod> {
-	trait_def
-		.items
-		.iter()
-		.filter_map(|i| match i {
-			TraitItem::Method(ref method) => Some(method),
-			_ => None,
-		})
+	trait_def.items.iter().filter_map(|i| match i {
+		TraitItem::Method(ref method) => Some(method),
+		_ => None,
+	})
 }
 
 /// Parse version attribute.
@@ -221,36 +206,34 @@ fn parse_version_attribute(version: &Attribute) -> Result<u32> {
 	let meta = version.parse_meta()?;
 
 	let err = Err(Error::new(
-			meta.span(),
-			"Unexpected `version` attribute. The supported format is `#[version(1)]`",
-		)
-	);
+		meta.span(),
+		"Unexpected `version` attribute. The supported format is `#[version(1)]`",
+	));
 
 	match meta {
-		Meta::List(list) => {
+		Meta::List(list) =>
 			if list.nested.len() != 1 {
 				err
 			} else if let Some(NestedMeta::Lit(Lit::Int(i))) = list.nested.first() {
 				i.base10_parse()
 			} else {
 				err
-			}
-		},
+			},
 		_ => err,
 	}
 }
 
 /// Return item version (`#[version(X)]`) attribute, if present.
 fn get_item_version(item: &TraitItemMethod) -> Result<Option<u32>> {
-	item.attrs.iter().find(|attr| attr.path.is_ident("version"))
+	item.attrs
+		.iter()
+		.find(|attr| attr.path.is_ident("version"))
 		.map(|attr| parse_version_attribute(attr))
 		.transpose()
 }
 
 /// Returns all runtime interface members, with versions.
-pub fn get_runtime_interface<'a>(trait_def: &'a ItemTrait)
-	-> Result<RuntimeInterface<'a>>
-{
+pub fn get_runtime_interface<'a>(trait_def: &'a ItemTrait) -> Result<RuntimeInterface<'a>> {
 	let mut functions: BTreeMap<syn::Ident, RuntimeInterfaceFunction<'a>> = BTreeMap::new();
 
 	for item in get_trait_methods(trait_def) {
@@ -258,25 +241,26 @@ pub fn get_runtime_interface<'a>(trait_def: &'a ItemTrait)
 		let version = get_item_version(item)?.unwrap_or(1);
 
 		match functions.entry(name.clone()) {
-			Entry::Vacant(entry) => { entry.insert(RuntimeInterfaceFunction::new(version, item)); },
+			Entry::Vacant(entry) => {
+				entry.insert(RuntimeInterfaceFunction::new(version, item));
+			},
 			Entry::Occupied(mut entry) => {
 				if let Some(existing_item) = entry.get().versions.get(&version) {
-					let mut err = Error::new(
-						item.span(),
-						"Duplicated version attribute",
-					);
+					let mut err = Error::new(item.span(), "Duplicated version attribute");
 					err.combine(Error::new(
 						existing_item.span(),
 						"Previous version with the same number defined here",
 					));
 
-					return Err(err);
+					return Err(err)
 				}
 
 				let interface_item = entry.get_mut();
-				if interface_item.latest_version < version { interface_item.latest_version = version; }
+				if interface_item.latest_version < version {
+					interface_item.latest_version = version;
+				}
 				interface_item.versions.insert(version, item);
-			}
+			},
 		}
 	}
 
@@ -286,8 +270,11 @@ pub fn get_runtime_interface<'a>(trait_def: &'a ItemTrait)
 			if next_expected != *version {
 				return Err(Error::new(
 					item.span(),
-					format!("Unexpected version attribute: missing version '{}' for this function", next_expected),
-				));
+					format!(
+						"Unexpected version attribute: missing version '{}' for this function",
+						next_expected
+					),
+				))
 			}
 			next_expected += 1;
 		}
diff --git a/primitives/runtime-interface/src/impls.rs b/primitives/runtime-interface/src/impls.rs
index 4dd79aeccb39..40f8e90479f9 100644
--- a/primitives/runtime-interface/src/impls.rs
+++ b/primitives/runtime-interface/src/impls.rs
@@ -17,14 +17,15 @@
 
 //! Provides implementations for the runtime interface traits.
 
-use crate::{
-	RIType, Pointer, pass_by::{PassBy, Codec, Inner, PassByInner, Enum},
-	util::{unpack_ptr_and_len, pack_ptr_and_len},
-};
 #[cfg(feature = "std")]
 use crate::host::*;
 #[cfg(not(feature = "std"))]
 use crate::wasm::*;
+use crate::{
+	pass_by::{Codec, Enum, Inner, PassBy, PassByInner},
+	util::{pack_ptr_and_len, unpack_ptr_and_len},
+	Pointer, RIType,
+};
 
 #[cfg(all(not(feature = "std"), not(feature = "disable_target_static_assertions")))]
 use static_assertions::assert_eq_size;
@@ -32,7 +33,7 @@ use static_assertions::assert_eq_size;
 #[cfg(feature = "std")]
 use sp_wasm_interface::{FunctionContext, Result};
 
-use codec::{Encode, Decode};
+use codec::{Decode, Encode};
 
 use sp_std::{any::TypeId, mem, vec::Vec};
 
@@ -195,7 +196,7 @@ impl<T: 'static + Decode> FromFFIValue for Vec<T> {
 		let len = len as usize;
 
 		if len == 0 {
-			return Vec::new();
+			return Vec::new()
 		}
 
 		let data = unsafe { Vec::from_raw_parts(ptr as *mut u8, len, len) };
@@ -230,7 +231,8 @@ impl<T: 'static + Decode> FromFFIValue for [T] {
 		if TypeId::of::<T>() == TypeId::of::<u8>() {
 			Ok(unsafe { mem::transmute(vec) })
 		} else {
-			Ok(Vec::<T>::decode(&mut &vec[..]).expect("Wasm to host values are encoded correctly; qed"))
+			Ok(Vec::<T>::decode(&mut &vec[..])
+				.expect("Wasm to host values are encoded correctly; qed"))
 		}
 	}
 }
@@ -247,13 +249,11 @@ impl IntoPreallocatedFFIValue for [u8] {
 		let (ptr, len) = unpack_ptr_and_len(allocated);
 
 		if (len as usize) < self_instance.len() {
-			Err(
-				format!(
-					"Preallocated buffer is not big enough (given {} vs needed {})!",
-					len,
-					self_instance.len()
-				)
-			)
+			Err(format!(
+				"Preallocated buffer is not big enough (given {} vs needed {})!",
+				len,
+				self_instance.len()
+			))
 		} else {
 			context.write_memory(Pointer::new(ptr), &self_instance)
 		}
@@ -367,7 +367,10 @@ impl<T: codec::Codec> PassBy for Option<T> {
 
 #[impl_trait_for_tuples::impl_for_tuples(30)]
 #[tuple_types_no_default_trait_bound]
-impl PassBy for Tuple where Self: codec::Codec {
+impl PassBy for Tuple
+where
+	Self: codec::Codec,
+{
 	type PassBy = Codec<Self>;
 }
 
@@ -511,7 +514,8 @@ macro_rules! for_u128_i128 {
 			type SelfInstance = $type;
 
 			fn from_ffi_value(context: &mut dyn FunctionContext, arg: u32) -> Result<$type> {
-				let data = context.read_memory(Pointer::new(arg), mem::size_of::<$type>() as u32)?;
+				let data =
+					context.read_memory(Pointer::new(arg), mem::size_of::<$type>() as u32)?;
 				let mut res = [0u8; mem::size_of::<$type>()];
 				res.copy_from_slice(&data);
 				Ok(<$type>::from_le_bytes(res))
@@ -526,7 +530,7 @@ macro_rules! for_u128_i128 {
 				Ok(addr.into())
 			}
 		}
-	}
+	};
 }
 
 for_u128_i128!(u128);
diff --git a/primitives/runtime-interface/src/lib.rs b/primitives/runtime-interface/src/lib.rs
index 93b4a8db87e9..53b4270fe8a6 100644
--- a/primitives/runtime-interface/src/lib.rs
+++ b/primitives/runtime-interface/src/lib.rs
@@ -292,28 +292,28 @@ pub use sp_std;
 /// the case when that would create a circular dependency. You usually _do not_ want to add this
 /// flag, as tracing doesn't cost you anything by default anyways (it is added as a no-op) but is
 /// super useful for debugging later.
-///
 pub use sp_runtime_interface_proc_macro::runtime_interface;
 
 #[doc(hidden)]
 #[cfg(feature = "std")]
 pub use sp_externalities::{
-	set_and_run_with_externalities, with_externalities, Externalities, ExternalitiesExt, ExtensionStore,
+	set_and_run_with_externalities, with_externalities, ExtensionStore, Externalities,
+	ExternalitiesExt,
 };
 
 #[doc(hidden)]
 pub use codec;
 
-pub(crate) mod impls;
 #[cfg(feature = "std")]
 pub mod host;
+pub(crate) mod impls;
+pub mod pass_by;
 #[cfg(any(not(feature = "std"), doc))]
 pub mod wasm;
-pub mod pass_by;
 
 mod util;
 
-pub use util::{unpack_ptr_and_len, pack_ptr_and_len};
+pub use util::{pack_ptr_and_len, unpack_ptr_and_len};
 
 /// Something that can be used by the runtime interface as type to communicate between wasm and the
 /// host.
diff --git a/primitives/runtime-interface/src/pass_by.rs b/primitives/runtime-interface/src/pass_by.rs
index 69485a1a2873..0535d1ca8d7f 100644
--- a/primitives/runtime-interface/src/pass_by.rs
+++ b/primitives/runtime-interface/src/pass_by.rs
@@ -20,7 +20,10 @@
 //!
 //! [`Codec`], [`Inner`] and [`Enum`] are the provided strategy implementations.
 
-use crate::{RIType, util::{unpack_ptr_and_len, pack_ptr_and_len}};
+use crate::{
+	util::{pack_ptr_and_len, unpack_ptr_and_len},
+	RIType,
+};
 
 #[cfg(feature = "std")]
 use crate::host::*;
@@ -30,7 +33,7 @@ use crate::wasm::*;
 #[cfg(feature = "std")]
 use sp_wasm_interface::{FunctionContext, Pointer, Result};
 
-use sp_std::{marker::PhantomData, convert::TryFrom};
+use sp_std::{convert::TryFrom, marker::PhantomData};
 
 #[cfg(not(feature = "std"))]
 use sp_std::vec::Vec;
@@ -119,18 +122,12 @@ pub trait PassByImpl<T>: RIType {
 	/// Convert the given instance to the ffi value.
 	///
 	/// For more information see: [`crate::host::IntoFFIValue::into_ffi_value`]
-	fn into_ffi_value(
-		instance: T,
-		context: &mut dyn FunctionContext,
-	) -> Result<Self::FFIType>;
+	fn into_ffi_value(instance: T, context: &mut dyn FunctionContext) -> Result<Self::FFIType>;
 
 	/// Create `T` from the given ffi value.
 	///
 	/// For more information see: [`crate::host::FromFFIValue::from_ffi_value`]
-	fn from_ffi_value(
-		context: &mut dyn FunctionContext,
-		arg: Self::FFIType,
-	) -> Result<T>;
+	fn from_ffi_value(context: &mut dyn FunctionContext, arg: Self::FFIType) -> Result<T>;
 }
 
 /// Something that provides a strategy for passing a type between wasm and the host.
@@ -220,10 +217,7 @@ pub struct Codec<T: codec::Codec>(PhantomData<T>);
 
 #[cfg(feature = "std")]
 impl<T: codec::Codec> PassByImpl<T> for Codec<T> {
-	fn into_ffi_value(
-		instance: T,
-		context: &mut dyn FunctionContext,
-	) -> Result<Self::FFIType> {
+	fn into_ffi_value(instance: T, context: &mut dyn FunctionContext) -> Result<Self::FFIType> {
 		let vec = instance.encode();
 		let ptr = context.allocate_memory(vec.len() as u32)?;
 		context.write_memory(ptr, &vec)?;
@@ -231,14 +225,10 @@ impl<T: codec::Codec> PassByImpl<T> for Codec<T> {
 		Ok(pack_ptr_and_len(ptr.into(), vec.len() as u32))
 	}
 
-	fn from_ffi_value(
-		context: &mut dyn FunctionContext,
-		arg: Self::FFIType,
-	) -> Result<T> {
+	fn from_ffi_value(context: &mut dyn FunctionContext, arg: Self::FFIType) -> Result<T> {
 		let (ptr, len) = unpack_ptr_and_len(arg);
 		let vec = context.read_memory(Pointer::new(ptr), len)?;
-		T::decode(&mut &vec[..])
-			.map_err(|e| format!("Could not decode value from wasm: {}", e))
+		T::decode(&mut &vec[..]).map_err(|e| format!("Could not decode value from wasm: {}", e))
 	}
 }
 
@@ -330,35 +320,31 @@ pub struct Inner<T: PassByInner<Inner = I>, I: RIType>(PhantomData<(T, I)>);
 
 #[cfg(feature = "std")]
 impl<T: PassByInner<Inner = I>, I: RIType> PassByImpl<T> for Inner<T, I>
-	where I: IntoFFIValue + FromFFIValue<SelfInstance=I>
+where
+	I: IntoFFIValue + FromFFIValue<SelfInstance = I>,
 {
-	fn into_ffi_value(
-		instance: T,
-		context: &mut dyn FunctionContext,
-	) -> Result<Self::FFIType> {
+	fn into_ffi_value(instance: T, context: &mut dyn FunctionContext) -> Result<Self::FFIType> {
 		instance.into_inner().into_ffi_value(context)
 	}
 
-	fn from_ffi_value(
-		context: &mut dyn FunctionContext,
-		arg: Self::FFIType,
-	) -> Result<T> {
+	fn from_ffi_value(context: &mut dyn FunctionContext, arg: Self::FFIType) -> Result<T> {
 		I::from_ffi_value(context, arg).map(T::from_inner)
 	}
 }
 
 #[cfg(not(feature = "std"))]
 impl<T: PassByInner<Inner = I>, I: RIType> PassByImpl<T> for Inner<T, I>
-	where I: IntoFFIValue + FromFFIValue
+where
+	I: IntoFFIValue + FromFFIValue,
 {
 	type Owned = I::Owned;
 
 	fn into_ffi_value(instance: &T) -> WrappedFFIValue<Self::FFIType, Self::Owned> {
- 		instance.inner().into_ffi_value()
+		instance.inner().into_ffi_value()
 	}
 
 	fn from_ffi_value(arg: Self::FFIType) -> T {
- 		T::from_inner(I::from_ffi_value(arg))
+		T::from_inner(I::from_ffi_value(arg))
 	}
 }
 
@@ -415,17 +401,11 @@ pub struct Enum<T: Copy + Into<u8> + TryFrom<u8>>(PhantomData<T>);
 
 #[cfg(feature = "std")]
 impl<T: Copy + Into<u8> + TryFrom<u8>> PassByImpl<T> for Enum<T> {
-	fn into_ffi_value(
-		instance: T,
-		_: &mut dyn FunctionContext,
-	) -> Result<Self::FFIType> {
+	fn into_ffi_value(instance: T, _: &mut dyn FunctionContext) -> Result<Self::FFIType> {
 		Ok(instance.into())
 	}
 
-	fn from_ffi_value(
-		_: &mut dyn FunctionContext,
-		arg: Self::FFIType,
-	) -> Result<T> {
+	fn from_ffi_value(_: &mut dyn FunctionContext, arg: Self::FFIType) -> Result<T> {
 		T::try_from(arg).map_err(|_| format!("Invalid enum discriminant: {}", arg))
 	}
 }
diff --git a/primitives/runtime-interface/src/wasm.rs b/primitives/runtime-interface/src/wasm.rs
index 387d6901e2f2..28613f81a68b 100644
--- a/primitives/runtime-interface/src/wasm.rs
+++ b/primitives/runtime-interface/src/wasm.rs
@@ -108,7 +108,7 @@ impl<T: Copy> ExchangeableFunction<T> {
 	/// # Returns
 	///
 	/// Returns the original implementation wrapped in [`RestoreImplementation`].
-	pub fn replace_implementation(&'static self, new_impl: T)  -> RestoreImplementation<T> {
+	pub fn replace_implementation(&'static self, new_impl: T) -> RestoreImplementation<T> {
 		if let ExchangeableFunctionState::Replaced = self.0.get().1 {
 			panic!("Trying to replace an already replaced implementation!")
 		}
@@ -139,6 +139,7 @@ pub struct RestoreImplementation<T: 'static + Copy>(&'static ExchangeableFunctio
 
 impl<T: Copy> Drop for RestoreImplementation<T> {
 	fn drop(&mut self) {
-		self.0.restore_orig_implementation(self.1.take().expect("Value is only taken on drop; qed"));
+		self.0
+			.restore_orig_implementation(self.1.take().expect("Value is only taken on drop; qed"));
 	}
 }
diff --git a/primitives/runtime-interface/test-wasm-deprecated/src/lib.rs b/primitives/runtime-interface/test-wasm-deprecated/src/lib.rs
index 0a7e2b49bbbb..8c864fc90e03 100644
--- a/primitives/runtime-interface/test-wasm-deprecated/src/lib.rs
+++ b/primitives/runtime-interface/test-wasm-deprecated/src/lib.rs
@@ -29,8 +29,10 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 /// Wasm binary unwrapped. If built with `SKIP_WASM_BUILD`, the function panics.
 #[cfg(feature = "std")]
 pub fn wasm_binary_unwrap() -> &'static [u8] {
-	WASM_BINARY.expect("Development wasm binary is not available. Testing is only \
-						supported with the flag disabled.")
+	WASM_BINARY.expect(
+		"Development wasm binary is not available. Testing is only \
+						supported with the flag disabled.",
+	)
 }
 
 /// This function is not used, but we require it for the compiler to include `sp-io`.
diff --git a/primitives/runtime-interface/test-wasm/src/lib.rs b/primitives/runtime-interface/test-wasm/src/lib.rs
index 65a0e5c5ca44..72acdd4ff8d6 100644
--- a/primitives/runtime-interface/test-wasm/src/lib.rs
+++ b/primitives/runtime-interface/test-wasm/src/lib.rs
@@ -22,7 +22,7 @@
 use sp_runtime_interface::runtime_interface;
 
 #[cfg(not(feature = "std"))]
-use sp_std::{prelude::*, mem, convert::TryFrom};
+use sp_std::{convert::TryFrom, mem, prelude::*};
 
 use sp_core::{sr25519::Public, wasm_export_functions};
 
@@ -33,8 +33,10 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 /// Wasm binary unwrapped. If built with `SKIP_WASM_BUILD`, the function panics.
 #[cfg(feature = "std")]
 pub fn wasm_binary_unwrap() -> &'static [u8] {
-	WASM_BINARY.expect("Development wasm binary is not available. Testing is only \
-						supported with the flag disabled.")
+	WASM_BINARY.expect(
+		"Development wasm binary is not available. Testing is only \
+						supported with the flag disabled.",
+	)
 }
 
 /// Used in the `test_array_as_mutable_reference` test.
diff --git a/primitives/runtime-interface/test/src/lib.rs b/primitives/runtime-interface/test/src/lib.rs
index a021a93939a1..82c50fffeb8d 100644
--- a/primitives/runtime-interface/test/src/lib.rs
+++ b/primitives/runtime-interface/test/src/lib.rs
@@ -20,13 +20,16 @@
 
 use sp_runtime_interface::*;
 
-use sp_runtime_interface_test_wasm::{wasm_binary_unwrap, test_api::HostFunctions};
+use sp_runtime_interface_test_wasm::{test_api::HostFunctions, wasm_binary_unwrap};
 use sp_runtime_interface_test_wasm_deprecated::wasm_binary_unwrap as wasm_binary_deprecated_unwrap;
 
-use sp_wasm_interface::HostFunctions as HostFunctionsT;
 use sc_executor_common::runtime_blob::RuntimeBlob;
+use sp_wasm_interface::HostFunctions as HostFunctionsT;
 
-use std::{collections::HashSet, sync::{Arc, Mutex}};
+use std::{
+	collections::HashSet,
+	sync::{Arc, Mutex},
+};
 
 type TestExternalities = sp_state_machine::TestExternalities<sp_runtime::traits::BlakeTwo256, u64>;
 
@@ -82,7 +85,10 @@ fn test_set_storage() {
 
 #[test]
 fn test_return_value_into_mutable_reference() {
-	call_wasm_method::<HostFunctions>(&wasm_binary_unwrap()[..], "test_return_value_into_mutable_reference");
+	call_wasm_method::<HostFunctions>(
+		&wasm_binary_unwrap()[..],
+		"test_return_value_into_mutable_reference",
+	);
 }
 
 #[test]
@@ -102,7 +108,8 @@ fn test_return_input_public_key() {
 
 #[test]
 fn host_function_not_found() {
-	let err = call_wasm_method_with_result::<()>(&wasm_binary_unwrap()[..], "test_return_data").unwrap_err();
+	let err = call_wasm_method_with_result::<()>(&wasm_binary_unwrap()[..], "test_return_data")
+		.unwrap_err();
 
 	assert!(err.contains("Instantiation: Export "));
 	assert!(err.contains(" not found"));
@@ -111,41 +118,56 @@ fn host_function_not_found() {
 #[test]
 #[should_panic(expected = "Invalid utf8 data provided")]
 fn test_invalid_utf8_data_should_return_an_error() {
-	call_wasm_method::<HostFunctions>(&wasm_binary_unwrap()[..], "test_invalid_utf8_data_should_return_an_error");
+	call_wasm_method::<HostFunctions>(
+		&wasm_binary_unwrap()[..],
+		"test_invalid_utf8_data_should_return_an_error",
+	);
 }
 
 #[test]
 fn test_overwrite_native_function_implementation() {
-	call_wasm_method::<HostFunctions>(&wasm_binary_unwrap()[..], "test_overwrite_native_function_implementation");
+	call_wasm_method::<HostFunctions>(
+		&wasm_binary_unwrap()[..],
+		"test_overwrite_native_function_implementation",
+	);
 }
 
 #[test]
 fn test_u128_i128_as_parameter_and_return_value() {
-	call_wasm_method::<HostFunctions>(&wasm_binary_unwrap()[..], "test_u128_i128_as_parameter_and_return_value");
+	call_wasm_method::<HostFunctions>(
+		&wasm_binary_unwrap()[..],
+		"test_u128_i128_as_parameter_and_return_value",
+	);
 }
 
 #[test]
 fn test_vec_return_value_memory_is_freed() {
-	call_wasm_method::<HostFunctions>(&wasm_binary_unwrap()[..], "test_vec_return_value_memory_is_freed");
+	call_wasm_method::<HostFunctions>(
+		&wasm_binary_unwrap()[..],
+		"test_vec_return_value_memory_is_freed",
+	);
 }
 
 #[test]
 fn test_encoded_return_value_memory_is_freed() {
-	call_wasm_method::<HostFunctions>(&wasm_binary_unwrap()[..], "test_encoded_return_value_memory_is_freed");
+	call_wasm_method::<HostFunctions>(
+		&wasm_binary_unwrap()[..],
+		"test_encoded_return_value_memory_is_freed",
+	);
 }
 
 #[test]
 fn test_array_return_value_memory_is_freed() {
-	call_wasm_method::<HostFunctions>(&wasm_binary_unwrap()[..], "test_array_return_value_memory_is_freed");
+	call_wasm_method::<HostFunctions>(
+		&wasm_binary_unwrap()[..],
+		"test_array_return_value_memory_is_freed",
+	);
 }
 
 #[test]
 fn test_versionining_with_new_host_works() {
 	// We call to the new wasm binary with new host function.
-	call_wasm_method::<HostFunctions>(
-		&wasm_binary_unwrap()[..],
-		"test_versionning_works",
-	);
+	call_wasm_method::<HostFunctions>(&wasm_binary_unwrap()[..], "test_versionning_works");
 
 	// we call to the old wasm binary with a new host functions
 	// old versions of host functions should be called and test should be ok!
@@ -158,7 +180,7 @@ fn test_versionining_with_new_host_works() {
 #[test]
 fn test_tracing() {
 	use std::fmt;
-	use tracing::{span::Id as SpanId};
+	use tracing::span::Id as SpanId;
 	use tracing_core::field::{Field, Visit};
 
 	#[derive(Clone)]
@@ -166,9 +188,8 @@ fn test_tracing() {
 
 	struct FieldConsumer(&'static str, Option<String>);
 	impl Visit for FieldConsumer {
-
 		fn record_debug(&mut self, field: &Field, value: &dyn fmt::Debug) {
-			if  field.name() == self.0 {
+			if field.name() == self.0 {
 				self.1 = Some(format!("{:?}", value))
 			}
 		}
@@ -180,14 +201,16 @@ fn test_tracing() {
 	}
 
 	impl tracing::subscriber::Subscriber for TracingSubscriber {
-		fn enabled(&self, _: &tracing::Metadata) -> bool { true }
+		fn enabled(&self, _: &tracing::Metadata) -> bool {
+			true
+		}
 
 		fn new_span(&self, span: &tracing::span::Attributes) -> tracing::Id {
 			let mut inner = self.0.lock().unwrap();
 			let id = SpanId::from_u64((inner.spans.len() + 1) as _);
 			let mut f = FieldConsumer("name", None);
 			span.record(&mut f);
-			inner.spans.insert(f.1.unwrap_or_else(||span.metadata().name().to_owned()));
+			inner.spans.insert(f.1.unwrap_or_else(|| span.metadata().name().to_owned()));
 			id
 		}
 
diff --git a/primitives/runtime/src/curve.rs b/primitives/runtime/src/curve.rs
index 326ababcf5d4..72d64cf4b8e1 100644
--- a/primitives/runtime/src/curve.rs
+++ b/primitives/runtime/src/curve.rs
@@ -17,7 +17,10 @@
 
 //! Provides some utilities to define a piecewise linear function.
 
-use crate::{Perbill, traits::{AtLeast32BitUnsigned, SaturatedConversion}};
+use crate::{
+	traits::{AtLeast32BitUnsigned, SaturatedConversion},
+	Perbill,
+};
 use core::ops::Sub;
 
 /// Piecewise Linear function in [0, 1] -> [0, 1].
@@ -29,14 +32,15 @@ pub struct PiecewiseLinear<'a> {
 	pub maximum: Perbill,
 }
 
-fn abs_sub<N: Ord + Sub<Output=N> + Clone>(a: N, b: N) -> N where {
+fn abs_sub<N: Ord + Sub<Output = N> + Clone>(a: N, b: N) -> N where {
 	a.clone().max(b.clone()) - a.min(b)
 }
 
 impl<'a> PiecewiseLinear<'a> {
 	/// Compute `f(n/d)*d` with `n <= d`. This is useful to avoid loss of precision.
-	pub fn calculate_for_fraction_times_denominator<N>(&self, n: N, d: N) -> N where
-		N: AtLeast32BitUnsigned + Clone
+	pub fn calculate_for_fraction_times_denominator<N>(&self, n: N, d: N) -> N
+	where
+		N: AtLeast32BitUnsigned + Clone,
 	{
 		let n = n.min(d.clone());
 
@@ -44,8 +48,7 @@ impl<'a> PiecewiseLinear<'a> {
 			return N::zero()
 		}
 
-		let next_point_index = self.points.iter()
-			.position(|p| n < p.0 * d.clone());
+		let next_point_index = self.points.iter().position(|p| n < p.0 * d.clone());
 
 		let (prev, next) = if let Some(next_point_index) = next_point_index {
 			if let Some(previous_point_index) = next_point_index.checked_sub(1) {
@@ -80,7 +83,8 @@ impl<'a> PiecewiseLinear<'a> {
 // This is guaranteed not to overflow on whatever values nor lose precision.
 // `q` must be superior to zero.
 fn multiply_by_rational_saturating<N>(value: N, p: u32, q: u32) -> N
-	where N: AtLeast32BitUnsigned + Clone
+where
+	N: AtLeast32BitUnsigned + Clone,
 {
 	let q = q.max(1);
 
@@ -112,17 +116,14 @@ fn test_multiply_by_rational_saturating() {
 	for value in 0..=div {
 		for p in 0..=div {
 			for q in 1..=div {
-				let value: u64 = (value as u128 * u64::MAX as u128 / div as u128)
-					.try_into().unwrap();
-				let p = (p as u64 * u32::MAX as u64 / div as u64)
-					.try_into().unwrap();
-				let q = (q as u64 * u32::MAX as u64 / div as u64)
-					.try_into().unwrap();
+				let value: u64 =
+					(value as u128 * u64::MAX as u128 / div as u128).try_into().unwrap();
+				let p = (p as u64 * u32::MAX as u64 / div as u64).try_into().unwrap();
+				let q = (q as u64 * u32::MAX as u64 / div as u64).try_into().unwrap();
 
 				assert_eq!(
 					multiply_by_rational_saturating(value, p, q),
-					(value as u128 * p as u128 / q as u128)
-						.try_into().unwrap_or(u64::MAX)
+					(value as u128 * p as u128 / q as u128).try_into().unwrap_or(u64::MAX)
 				);
 			}
 		}
@@ -153,10 +154,8 @@ fn test_calculate_for_fraction_times_denominator() {
 	let div = 100u32;
 	for d in 0..=div {
 		for n in 0..=d {
-			let d: u64 = (d as u128 * u64::MAX as u128 / div as u128)
-				.try_into().unwrap();
-			let n: u64 = (n as u128 * u64::MAX as u128 / div as u128)
-				.try_into().unwrap();
+			let d: u64 = (d as u128 * u64::MAX as u128 / div as u128).try_into().unwrap();
+			let n: u64 = (n as u128 * u64::MAX as u128 / div as u128).try_into().unwrap();
 
 			let res = curve.calculate_for_fraction_times_denominator(n, d);
 			let expected = formal_calculate_for_fraction_times_denominator(n, d);
diff --git a/primitives/runtime/src/generic/block.rs b/primitives/runtime/src/generic/block.rs
index af4f9e4521e3..21a01933bc69 100644
--- a/primitives/runtime/src/generic/block.rs
+++ b/primitives/runtime/src/generic/block.rs
@@ -23,14 +23,16 @@ use std::fmt;
 #[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 
-use sp_std::prelude::*;
-use sp_core::RuntimeDebug;
-use crate::codec::{Codec, Encode, Decode};
-use crate::traits::{
-	self, Member, Block as BlockT, Header as HeaderT, MaybeSerialize, MaybeMallocSizeOf,
-	NumberFor,
+use crate::{
+	codec::{Codec, Decode, Encode},
+	traits::{
+		self, Block as BlockT, Header as HeaderT, MaybeMallocSizeOf, MaybeSerialize, Member,
+		NumberFor,
+	},
+	Justifications,
 };
-use crate::Justifications;
+use sp_core::RuntimeDebug;
+use sp_std::prelude::*;
 
 /// Something to identify a block.
 #[derive(PartialEq, Eq, Clone, RuntimeDebug)]
diff --git a/primitives/runtime/src/generic/checked_extrinsic.rs b/primitives/runtime/src/generic/checked_extrinsic.rs
index 2c3392a13379..b2044a6cf74f 100644
--- a/primitives/runtime/src/generic/checked_extrinsic.rs
+++ b/primitives/runtime/src/generic/checked_extrinsic.rs
@@ -18,11 +18,13 @@
 //! Generic implementation of an extrinsic that has passed the verification
 //! stage.
 
-use crate::traits::{
-	self, Member, MaybeDisplay, SignedExtension, Dispatchable, DispatchInfoOf, PostDispatchInfoOf,
-	ValidateUnsigned,
+use crate::{
+	traits::{
+		self, DispatchInfoOf, Dispatchable, MaybeDisplay, Member, PostDispatchInfoOf,
+		SignedExtension, ValidateUnsigned,
+	},
+	transaction_validity::{TransactionSource, TransactionValidity},
 };
-use crate::transaction_validity::{TransactionValidity, TransactionSource};
 
 /// Definition of something that the external world might want to say; its
 /// existence implies that it has been checked and is good, particularly with
@@ -37,12 +39,11 @@ pub struct CheckedExtrinsic<AccountId, Call, Extra> {
 	pub function: Call,
 }
 
-impl<AccountId, Call, Extra, Origin> traits::Applyable for
-	CheckedExtrinsic<AccountId, Call, Extra>
+impl<AccountId, Call, Extra, Origin> traits::Applyable for CheckedExtrinsic<AccountId, Call, Extra>
 where
 	AccountId: Member + MaybeDisplay,
-	Call: Member + Dispatchable<Origin=Origin>,
-	Extra: SignedExtension<AccountId=AccountId, Call=Call>,
+	Call: Member + Dispatchable<Origin = Origin>,
+	Extra: SignedExtension<AccountId = AccountId, Call = Call>,
 	Origin: From<Option<AccountId>>,
 {
 	type Call = Call;
@@ -64,7 +65,7 @@ where
 		}
 	}
 
-	fn apply<U: ValidateUnsigned<Call=Self::Call>>(
+	fn apply<U: ValidateUnsigned<Call = Self::Call>>(
 		self,
 		info: &DispatchInfoOf<Self::Call>,
 		len: usize,
diff --git a/primitives/runtime/src/generic/digest.rs b/primitives/runtime/src/generic/digest.rs
index 8594393c7cde..195bf1cbe5da 100644
--- a/primitives/runtime/src/generic/digest.rs
+++ b/primitives/runtime/src/generic/digest.rs
@@ -22,8 +22,10 @@ use serde::{Deserialize, Serialize};
 
 use sp_std::prelude::*;
 
-use crate::ConsensusEngineId;
-use crate::codec::{Decode, Encode, Input, Error};
+use crate::{
+	codec::{Decode, Encode, Error, Input},
+	ConsensusEngineId,
+};
 use sp_core::{ChangesTrieConfiguration, RuntimeDebug};
 
 /// Generic header digest.
@@ -40,7 +42,7 @@ pub struct Digest<Hash> {
 
 impl<Item> Default for Digest<Item> {
 	fn default() -> Self {
-		Self { logs: Vec::new(), }
+		Self { logs: Vec::new() }
 	}
 }
 
@@ -61,12 +63,18 @@ impl<Hash> Digest<Hash> {
 	}
 
 	/// Get reference to the first digest item that matches the passed predicate.
-	pub fn log<T: ?Sized, F: Fn(&DigestItem<Hash>) -> Option<&T>>(&self, predicate: F) -> Option<&T> {
+	pub fn log<T: ?Sized, F: Fn(&DigestItem<Hash>) -> Option<&T>>(
+		&self,
+		predicate: F,
+	) -> Option<&T> {
 		self.logs().iter().find_map(predicate)
 	}
 
 	/// Get a conversion of the first digest item that successfully converts using the function.
-	pub fn convert_first<T, F: Fn(&DigestItem<Hash>) -> Option<T>>(&self, predicate: F) -> Option<T> {
+	pub fn convert_first<T, F: Fn(&DigestItem<Hash>) -> Option<T>>(
+		&self,
+		predicate: F,
+	) -> Option<T> {
 		self.logs().iter().find_map(predicate)
 	}
 }
@@ -132,16 +140,18 @@ pub enum ChangesTrieSignal {
 
 #[cfg(feature = "std")]
 impl<Hash: Encode> serde::Serialize for DigestItem<Hash> {
-	fn serialize<S>(&self, seq: S) -> Result<S::Ok, S::Error> where S: serde::Serializer {
-		self.using_encoded(|bytes| {
-			sp_core::bytes::serialize(bytes, seq)
-		})
+	fn serialize<S>(&self, seq: S) -> Result<S::Ok, S::Error>
+	where
+		S: serde::Serializer,
+	{
+		self.using_encoded(|bytes| sp_core::bytes::serialize(bytes, seq))
 	}
 }
 
 #[cfg(feature = "std")]
 impl<'a, Hash: Decode> serde::Deserialize<'a> for DigestItem<Hash> {
-	fn deserialize<D>(de: D) -> Result<Self, D::Error> where
+	fn deserialize<D>(de: D) -> Result<Self, D::Error>
+	where
 		D: serde::Deserializer<'a>,
 	{
 		let r = sp_core::bytes::deserialize(de)?;
@@ -297,9 +307,7 @@ impl<Hash: Decode> Decode for DigestItem<Hash> {
 	fn decode<I: Input>(input: &mut I) -> Result<Self, Error> {
 		let item_type: DigestItemType = Decode::decode(input)?;
 		match item_type {
-			DigestItemType::ChangesTrieRoot => Ok(Self::ChangesTrieRoot(
-				Decode::decode(input)?,
-			)),
+			DigestItemType::ChangesTrieRoot => Ok(Self::ChangesTrieRoot(Decode::decode(input)?)),
 			DigestItemType::PreRuntime => {
 				let vals: (ConsensusEngineId, Vec<u8>) = Decode::decode(input)?;
 				Ok(Self::PreRuntime(vals.0, vals.1))
@@ -307,17 +315,14 @@ impl<Hash: Decode> Decode for DigestItem<Hash> {
 			DigestItemType::Consensus => {
 				let vals: (ConsensusEngineId, Vec<u8>) = Decode::decode(input)?;
 				Ok(Self::Consensus(vals.0, vals.1))
-			}
+			},
 			DigestItemType::Seal => {
 				let vals: (ConsensusEngineId, Vec<u8>) = Decode::decode(input)?;
 				Ok(Self::Seal(vals.0, vals.1))
 			},
-			DigestItemType::ChangesTrieSignal => Ok(Self::ChangesTrieSignal(
-				Decode::decode(input)?,
-			)),
-			DigestItemType::Other => Ok(Self::Other(
-				Decode::decode(input)?,
-			)),
+			DigestItemType::ChangesTrieSignal =>
+				Ok(Self::ChangesTrieSignal(Decode::decode(input)?)),
+			DigestItemType::Other => Ok(Self::Other(Decode::decode(input)?)),
 		}
 	}
 }
@@ -376,9 +381,10 @@ impl<'a, Hash> DigestItemRef<'a, Hash> {
 	pub fn try_as_raw(&self, id: OpaqueDigestItemId) -> Option<&'a [u8]> {
 		match (id, self) {
 			(OpaqueDigestItemId::Consensus(w), &Self::Consensus(v, s)) |
-				(OpaqueDigestItemId::Seal(w), &Self::Seal(v, s)) |
-				(OpaqueDigestItemId::PreRuntime(w), &Self::PreRuntime(v, s))
-				if v == w => Some(&s[..]),
+			(OpaqueDigestItemId::Seal(w), &Self::Seal(v, s)) |
+			(OpaqueDigestItemId::PreRuntime(w), &Self::PreRuntime(v, s))
+				if v == w =>
+				Some(&s[..]),
 			(OpaqueDigestItemId::Other, &Self::Other(s)) => Some(&s[..]),
 			_ => None,
 		}
@@ -395,8 +401,7 @@ impl<'a, Hash> DigestItemRef<'a, Hash> {
 	/// Returns `None` if this isn't a seal item, the `id` doesn't match or when the decoding fails.
 	pub fn seal_try_to<T: Decode>(&self, id: &ConsensusEngineId) -> Option<T> {
 		match self {
-			Self::Seal(v, s) if *v == id =>
-				Decode::decode(&mut &s[..]).ok(),
+			Self::Seal(v, s) if *v == id => Decode::decode(&mut &s[..]).ok(),
 			_ => None,
 		}
 	}
@@ -407,8 +412,7 @@ impl<'a, Hash> DigestItemRef<'a, Hash> {
 	/// when the decoding fails.
 	pub fn consensus_try_to<T: Decode>(&self, id: &ConsensusEngineId) -> Option<T> {
 		match self {
-			Self::Consensus(v, s) if *v == id =>
-				Decode::decode(&mut &s[..]).ok(),
+			Self::Consensus(v, s) if *v == id => Decode::decode(&mut &s[..]).ok(),
 			_ => None,
 		}
 	}
@@ -419,8 +423,7 @@ impl<'a, Hash> DigestItemRef<'a, Hash> {
 	/// when the decoding fails.
 	pub fn pre_runtime_try_to<T: Decode>(&self, id: &ConsensusEngineId) -> Option<T> {
 		match self {
-			Self::PreRuntime(v, s) if *v == id =>
-				Decode::decode(&mut &s[..]).ok(),
+			Self::PreRuntime(v, s) if *v == id => Decode::decode(&mut &s[..]).ok(),
 			_ => None,
 		}
 	}
@@ -482,7 +485,7 @@ mod tests {
 			logs: vec![
 				DigestItem::ChangesTrieRoot(4),
 				DigestItem::Other(vec![1, 2, 3]),
-				DigestItem::Seal(*b"test", vec![1, 2, 3])
+				DigestItem::Seal(*b"test", vec![1, 2, 3]),
 			],
 		};
 
diff --git a/primitives/runtime/src/generic/era.rs b/primitives/runtime/src/generic/era.rs
index 83a9f22afe5d..80ac46125b36 100644
--- a/primitives/runtime/src/generic/era.rs
+++ b/primitives/runtime/src/generic/era.rs
@@ -18,9 +18,9 @@
 //! Generic implementation of an unchecked (pre-verification) extrinsic.
 
 #[cfg(feature = "std")]
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
-use crate::codec::{Decode, Encode, Input, Output, Error};
+use crate::codec::{Decode, Encode, Error, Input, Output};
 
 /// Era period
 pub type Period = u64;
@@ -47,15 +47,13 @@ pub enum Era {
 	Mortal(Period, Phase),
 }
 
-/*
- * E.g. with period == 4:
- * 0         10        20        30        40
- * 0123456789012345678901234567890123456789012
- *              |...|
- *    authored -/   \- expiry
- * phase = 1
- * n = Q(current - phase, period) + phase
- */
+// E.g. with period == 4:
+// 0         10        20        30        40
+// 0123456789012345678901234567890123456789012
+//              |...|
+//    authored -/   \- expiry
+// phase = 1
+// n = Q(current - phase, period) + phase
 impl Era {
 	/// Create a new era based on a period (which should be a power of two between 4 and 65536 inclusive)
 	/// and a block number on which it should start (or, for long periods, be shortly after the start).
@@ -64,10 +62,7 @@ impl Era {
 	/// does not exceed `BlockHashCount` parameter passed to `system` module, since that
 	/// prunes old blocks and renders transactions immediately invalid.
 	pub fn mortal(period: u64, current: u64) -> Self {
-		let period = period.checked_next_power_of_two()
-			.unwrap_or(1 << 16)
-			.max(4)
-			.min(1 << 16);
+		let period = period.checked_next_power_of_two().unwrap_or(1 << 16).max(4).min(1 << 16);
 		let phase = current % period;
 		let quantize_factor = (period >> 12).max(1);
 		let quantized_phase = phase / quantize_factor * quantize_factor;
@@ -109,9 +104,10 @@ impl Encode for Era {
 			Self::Immortal => output.push_byte(0),
 			Self::Mortal(period, phase) => {
 				let quantize_factor = (*period as u64 >> 12).max(1);
-				let encoded = (period.trailing_zeros() - 1).max(1).min(15) as u16 | ((phase / quantize_factor) << 4) as u16;
+				let encoded = (period.trailing_zeros() - 1).max(1).min(15) as u16 |
+					((phase / quantize_factor) << 4) as u16;
 				encoded.encode_to(output);
-			}
+			},
 		}
 	}
 }
@@ -153,7 +149,7 @@ mod tests {
 		assert!(e.is_immortal());
 
 		assert_eq!(e.encode(), vec![0u8]);
-		assert_eq!(e, Era::decode(&mut&[0u8][..]).unwrap());
+		assert_eq!(e, Era::decode(&mut &[0u8][..]).unwrap());
 	}
 
 	#[test]
@@ -163,7 +159,7 @@ mod tests {
 
 		let expected = vec![5 + 42 % 16 * 16, 42 / 16];
 		assert_eq!(e.encode(), expected);
-		assert_eq!(e, Era::decode(&mut&expected[..]).unwrap());
+		assert_eq!(e, Era::decode(&mut &expected[..]).unwrap());
 	}
 
 	#[test]
@@ -172,7 +168,7 @@ mod tests {
 
 		let expected = vec![(14 + 2500 % 16 * 16) as u8, (2500 / 16) as u8];
 		assert_eq!(e.encode(), expected);
-		assert_eq!(e, Era::decode(&mut&expected[..]).unwrap());
+		assert_eq!(e, Era::decode(&mut &expected[..]).unwrap());
 	}
 
 	#[test]
diff --git a/primitives/runtime/src/generic/header.rs b/primitives/runtime/src/generic/header.rs
index def761b201ce..07b70337076b 100644
--- a/primitives/runtime/src/generic/header.rs
+++ b/primitives/runtime/src/generic/header.rs
@@ -17,20 +17,18 @@
 
 //! Generic implementation of a block header.
 
+use crate::{
+	codec::{Codec, Decode, Encode, EncodeAsRef, Error, HasCompact, Input, Output},
+	generic::Digest,
+	traits::{
+		self, AtLeast32BitUnsigned, Hash as HashT, MaybeDisplay, MaybeMallocSizeOf, MaybeSerialize,
+		MaybeSerializeDeserialize, Member, SimpleBitOps,
+	},
+};
 #[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
-use crate::codec::{Decode, Encode, Codec, Input, Output, HasCompact, EncodeAsRef, Error};
-use crate::traits::{
-	self, Member, AtLeast32BitUnsigned, SimpleBitOps, Hash as HashT,
-	MaybeSerializeDeserialize, MaybeSerialize, MaybeDisplay,
-	MaybeMallocSizeOf,
-};
-use crate::generic::Digest;
 use sp_core::U256;
-use sp_std::{
-	convert::TryFrom,
-	fmt::Debug,
-};
+use sp_std::{convert::TryFrom, fmt::Debug};
 
 /// Abstraction over a block header for a substrate chain.
 #[derive(PartialEq, Eq, Clone, sp_core::RuntimeDebug)]
@@ -41,9 +39,10 @@ pub struct Header<Number: Copy + Into<U256> + TryFrom<U256>, Hash: HashT> {
 	/// The parent hash.
 	pub parent_hash: Hash::Output,
 	/// The block number.
-	#[cfg_attr(feature = "std", serde(
-		serialize_with = "serialize_number",
-		deserialize_with = "deserialize_number"))]
+	#[cfg_attr(
+		feature = "std",
+		serde(serialize_with = "serialize_number", deserialize_with = "deserialize_number")
+	)]
 	pub number: Number,
 	/// The state trie merkle root
 	pub state_root: Hash::Output,
@@ -71,21 +70,27 @@ where
 
 #[cfg(feature = "std")]
 pub fn serialize_number<S, T: Copy + Into<U256> + TryFrom<U256>>(
-	val: &T, s: S,
-) -> Result<S::Ok, S::Error> where S: serde::Serializer {
+	val: &T,
+	s: S,
+) -> Result<S::Ok, S::Error>
+where
+	S: serde::Serializer,
+{
 	let u256: U256 = (*val).into();
 	serde::Serialize::serialize(&u256, s)
 }
 
 #[cfg(feature = "std")]
-pub fn deserialize_number<'a, D, T: Copy + Into<U256> + TryFrom<U256>>(
-	d: D,
-) -> Result<T, D::Error> where D: serde::Deserializer<'a> {
+pub fn deserialize_number<'a, D, T: Copy + Into<U256> + TryFrom<U256>>(d: D) -> Result<T, D::Error>
+where
+	D: serde::Deserializer<'a>,
+{
 	let u256: U256 = serde::Deserialize::deserialize(d)?;
 	TryFrom::try_from(u256).map_err(|_| serde::de::Error::custom("Try from failed"))
 }
 
-impl<Number, Hash> Decode for Header<Number, Hash> where
+impl<Number, Hash> Decode for Header<Number, Hash>
+where
 	Number: HasCompact + Copy + Into<U256> + TryFrom<U256>,
 	Hash: HashT,
 	Hash::Output: Decode,
@@ -101,51 +106,92 @@ impl<Number, Hash> Decode for Header<Number, Hash> where
 	}
 }
 
-impl<Number, Hash> Encode for Header<Number, Hash> where
+impl<Number, Hash> Encode for Header<Number, Hash>
+where
 	Number: HasCompact + Copy + Into<U256> + TryFrom<U256>,
 	Hash: HashT,
 	Hash::Output: Encode,
 {
 	fn encode_to<T: Output + ?Sized>(&self, dest: &mut T) {
 		self.parent_hash.encode_to(dest);
-		<<<Number as HasCompact>::Type as EncodeAsRef<_>>::RefType>::from(&self.number).encode_to(dest);
+		<<<Number as HasCompact>::Type as EncodeAsRef<_>>::RefType>::from(&self.number)
+			.encode_to(dest);
 		self.state_root.encode_to(dest);
 		self.extrinsics_root.encode_to(dest);
 		self.digest.encode_to(dest);
 	}
 }
 
-impl<Number, Hash> codec::EncodeLike for Header<Number, Hash> where
+impl<Number, Hash> codec::EncodeLike for Header<Number, Hash>
+where
 	Number: HasCompact + Copy + Into<U256> + TryFrom<U256>,
 	Hash: HashT,
 	Hash::Output: Encode,
-{}
+{
+}
 
-impl<Number, Hash> traits::Header for Header<Number, Hash> where
-	Number: Member + MaybeSerializeDeserialize + Debug + sp_std::hash::Hash + MaybeDisplay +
-		AtLeast32BitUnsigned + Codec + Copy + Into<U256> + TryFrom<U256> + sp_std::str::FromStr +
-		MaybeMallocSizeOf,
+impl<Number, Hash> traits::Header for Header<Number, Hash>
+where
+	Number: Member
+		+ MaybeSerializeDeserialize
+		+ Debug
+		+ sp_std::hash::Hash
+		+ MaybeDisplay
+		+ AtLeast32BitUnsigned
+		+ Codec
+		+ Copy
+		+ Into<U256>
+		+ TryFrom<U256>
+		+ sp_std::str::FromStr
+		+ MaybeMallocSizeOf,
 	Hash: HashT,
-	Hash::Output: Default + sp_std::hash::Hash + Copy + Member + Ord +
-		MaybeSerialize + Debug + MaybeDisplay + SimpleBitOps + Codec + MaybeMallocSizeOf,
+	Hash::Output: Default
+		+ sp_std::hash::Hash
+		+ Copy
+		+ Member
+		+ Ord
+		+ MaybeSerialize
+		+ Debug
+		+ MaybeDisplay
+		+ SimpleBitOps
+		+ Codec
+		+ MaybeMallocSizeOf,
 {
 	type Number = Number;
 	type Hash = <Hash as HashT>::Output;
 	type Hashing = Hash;
 
-	fn number(&self) -> &Self::Number { &self.number }
-	fn set_number(&mut self, num: Self::Number) { self.number = num }
+	fn number(&self) -> &Self::Number {
+		&self.number
+	}
+	fn set_number(&mut self, num: Self::Number) {
+		self.number = num
+	}
 
-	fn extrinsics_root(&self) -> &Self::Hash { &self.extrinsics_root }
-	fn set_extrinsics_root(&mut self, root: Self::Hash) { self.extrinsics_root = root }
+	fn extrinsics_root(&self) -> &Self::Hash {
+		&self.extrinsics_root
+	}
+	fn set_extrinsics_root(&mut self, root: Self::Hash) {
+		self.extrinsics_root = root
+	}
 
-	fn state_root(&self) -> &Self::Hash { &self.state_root }
-	fn set_state_root(&mut self, root: Self::Hash) { self.state_root = root }
+	fn state_root(&self) -> &Self::Hash {
+		&self.state_root
+	}
+	fn set_state_root(&mut self, root: Self::Hash) {
+		self.state_root = root
+	}
 
-	fn parent_hash(&self) -> &Self::Hash { &self.parent_hash }
-	fn set_parent_hash(&mut self, hash: Self::Hash) { self.parent_hash = hash }
+	fn parent_hash(&self) -> &Self::Hash {
+		&self.parent_hash
+	}
+	fn set_parent_hash(&mut self, hash: Self::Hash) {
+		self.parent_hash = hash
+	}
 
-	fn digest(&self) -> &Digest<Self::Hash> { &self.digest }
+	fn digest(&self) -> &Digest<Self::Hash> {
+		&self.digest
+	}
 
 	fn digest_mut(&mut self) -> &mut Digest<Self::Hash> {
 		#[cfg(feature = "std")]
@@ -160,22 +206,24 @@ impl<Number, Hash> traits::Header for Header<Number, Hash> where
 		parent_hash: Self::Hash,
 		digest: Digest<Self::Hash>,
 	) -> Self {
-		Self {
-			number,
-			extrinsics_root,
-			state_root,
-			parent_hash,
-			digest,
-		}
+		Self { number, extrinsics_root, state_root, parent_hash, digest }
 	}
 }
 
-impl<Number, Hash> Header<Number, Hash> where
-	Number: Member + sp_std::hash::Hash + Copy + MaybeDisplay + AtLeast32BitUnsigned + Codec +
-		Into<U256> + TryFrom<U256>,
+impl<Number, Hash> Header<Number, Hash>
+where
+	Number: Member
+		+ sp_std::hash::Hash
+		+ Copy
+		+ MaybeDisplay
+		+ AtLeast32BitUnsigned
+		+ Codec
+		+ Into<U256>
+		+ TryFrom<U256>,
 	Hash: HashT,
-	Hash::Output: Default + sp_std::hash::Hash + Copy + Member + MaybeDisplay + SimpleBitOps + Codec,
- {
+	Hash::Output:
+		Default + sp_std::hash::Hash + Copy + Member + MaybeDisplay + SimpleBitOps + Codec,
+{
 	/// Convenience helper for computing the hash of the header without having
 	/// to import the trait.
 	pub fn hash(&self) -> Hash::Output {
diff --git a/primitives/runtime/src/generic/mod.rs b/primitives/runtime/src/generic/mod.rs
index c4b28a06c901..deaecd65e478 100644
--- a/primitives/runtime/src/generic/mod.rs
+++ b/primitives/runtime/src/generic/mod.rs
@@ -19,22 +19,22 @@
 //! Generic implementations of Extrinsic/Header/Block.
 // end::description[]
 
-mod unchecked_extrinsic;
-mod era;
-mod checked_extrinsic;
-mod header;
 mod block;
+mod checked_extrinsic;
 mod digest;
+mod era;
+mod header;
 #[cfg(test)]
 mod tests;
+mod unchecked_extrinsic;
 
-pub use self::unchecked_extrinsic::{UncheckedExtrinsic, SignedPayload};
-pub use self::era::{Era, Phase};
-pub use self::checked_extrinsic::CheckedExtrinsic;
-pub use self::header::Header;
-pub use self::block::{Block, SignedBlock, BlockId};
-pub use self::digest::{
-	Digest, DigestItem, DigestItemRef, OpaqueDigestItemId, ChangesTrieSignal,
+pub use self::{
+	block::{Block, BlockId, SignedBlock},
+	checked_extrinsic::CheckedExtrinsic,
+	digest::{ChangesTrieSignal, Digest, DigestItem, DigestItemRef, OpaqueDigestItemId},
+	era::{Era, Phase},
+	header::Header,
+	unchecked_extrinsic::{SignedPayload, UncheckedExtrinsic},
 };
 
 use crate::codec::Encode;
diff --git a/primitives/runtime/src/generic/tests.rs b/primitives/runtime/src/generic/tests.rs
index ec31e7de4852..095bcb717bb1 100644
--- a/primitives/runtime/src/generic/tests.rs
+++ b/primitives/runtime/src/generic/tests.rs
@@ -17,27 +17,23 @@
 
 //! Tests for the generic implementations of Extrinsic/Header/Block.
 
+use super::DigestItem;
 use crate::codec::{Decode, Encode};
 use sp_core::H256;
-use super::DigestItem;
 
 #[test]
 fn system_digest_item_encoding() {
 	let item = DigestItem::ChangesTrieRoot::<H256>(H256::default());
 	let encoded = item.encode();
-	assert_eq!(encoded, vec![
-		// type = DigestItemType::ChangesTrieRoot
-		2,
-		// trie root
-		0, 0, 0, 0,
-		0, 0, 0, 0,
-		0, 0, 0, 0,
-		0, 0, 0, 0,
-		0, 0, 0, 0,
-		0, 0, 0, 0,
-		0, 0, 0, 0,
-		0, 0, 0, 0,
-	]);
+	assert_eq!(
+		encoded,
+		vec![
+			// type = DigestItemType::ChangesTrieRoot
+			2, // trie root
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 0,
+		]
+	);
 
 	let decoded: DigestItem<H256> = Decode::decode(&mut &encoded[..]).unwrap();
 	assert_eq!(item, decoded);
@@ -47,14 +43,15 @@ fn system_digest_item_encoding() {
 fn non_system_digest_item_encoding() {
 	let item = DigestItem::Other::<H256>(vec![10, 20, 30]);
 	let encoded = item.encode();
-	assert_eq!(encoded, vec![
-		// type = DigestItemType::Other
-		0,
-		// length of other data
-		12,
-		// authorities
-		10, 20, 30,
-	]);
+	assert_eq!(
+		encoded,
+		vec![
+			// type = DigestItemType::Other
+			0,  // length of other data
+			12, // authorities
+			10, 20, 30,
+		]
+	);
 
 	let decoded: DigestItem<H256> = Decode::decode(&mut &encoded[..]).unwrap();
 	assert_eq!(item, decoded);
diff --git a/primitives/runtime/src/generic/unchecked_extrinsic.rs b/primitives/runtime/src/generic/unchecked_extrinsic.rs
index d6164d0b51cc..68ab8447cfbc 100644
--- a/primitives/runtime/src/generic/unchecked_extrinsic.rs
+++ b/primitives/runtime/src/generic/unchecked_extrinsic.rs
@@ -17,18 +17,18 @@
 
 //! Generic implementation of an unchecked (pre-verification) extrinsic.
 
-use sp_std::{fmt, prelude::*};
-use sp_io::hashing::blake2_256;
-use codec::{Decode, Encode, EncodeLike, Input, Error};
 use crate::{
+	generic::CheckedExtrinsic,
 	traits::{
-		self, Member, MaybeDisplay, SignedExtension, Checkable, Extrinsic, ExtrinsicMetadata,
-		IdentifyAccount,
+		self, Checkable, Extrinsic, ExtrinsicMetadata, IdentifyAccount, MaybeDisplay, Member,
+		SignedExtension,
 	},
-	generic::CheckedExtrinsic,
-	transaction_validity::{TransactionValidityError, InvalidTransaction},
+	transaction_validity::{InvalidTransaction, TransactionValidityError},
 	OpaqueExtrinsic,
 };
+use codec::{Decode, Encode, EncodeLike, Error, Input};
+use sp_io::hashing::blake2_256;
+use sp_std::{fmt, prelude::*};
 
 /// Current version of the [`UncheckedExtrinsic`] format.
 const EXTRINSIC_VERSION: u8 = 4;
@@ -38,7 +38,7 @@ const EXTRINSIC_VERSION: u8 = 4;
 #[derive(PartialEq, Eq, Clone)]
 pub struct UncheckedExtrinsic<Address, Call, Signature, Extra>
 where
-	Extra: SignedExtension
+	Extra: SignedExtension,
 {
 	/// The signature, address, number of extrinsics have come before from
 	/// the same signer and an era describing the longevity of this transaction,
@@ -52,7 +52,7 @@ where
 impl<Address, Call, Signature, Extra> parity_util_mem::MallocSizeOf
 	for UncheckedExtrinsic<Address, Call, Signature, Extra>
 where
-	Extra: SignedExtension
+	Extra: SignedExtension,
 {
 	fn size_of(&self, _ops: &mut parity_util_mem::MallocSizeOfOps) -> usize {
 		// Instantiated only in runtime.
@@ -64,24 +64,13 @@ impl<Address, Call, Signature, Extra: SignedExtension>
 	UncheckedExtrinsic<Address, Call, Signature, Extra>
 {
 	/// New instance of a signed extrinsic aka "transaction".
-	pub fn new_signed(
-		function: Call,
-		signed: Address,
-		signature: Signature,
-		extra: Extra
-	) -> Self {
-		Self {
-			signature: Some((signed, signature, extra)),
-			function,
-		}
+	pub fn new_signed(function: Call, signed: Address, signature: Signature, extra: Extra) -> Self {
+		Self { signature: Some((signed, signature, extra)), function }
 	}
 
 	/// New instance of an unsigned extrinsic aka "inherent".
 	pub fn new_unsigned(function: Call) -> Self {
-		Self {
-			signature: None,
-			function,
-		}
+		Self { signature: None, function }
 	}
 }
 
@@ -90,11 +79,7 @@ impl<Address, Call, Signature, Extra: SignedExtension> Extrinsic
 {
 	type Call = Call;
 
-	type SignaturePayload = (
-		Address,
-		Signature,
-		Extra,
-	);
+	type SignaturePayload = (Address, Signature, Extra);
 
 	fn is_signed(&self) -> Option<bool> {
 		Some(self.signature.is_some())
@@ -109,18 +94,16 @@ impl<Address, Call, Signature, Extra: SignedExtension> Extrinsic
 	}
 }
 
-impl<Address, AccountId, Call, Signature, Extra, Lookup>
-	Checkable<Lookup>
-for
-	UncheckedExtrinsic<Address, Call, Signature, Extra>
+impl<Address, AccountId, Call, Signature, Extra, Lookup> Checkable<Lookup>
+	for UncheckedExtrinsic<Address, Call, Signature, Extra>
 where
 	Address: Member + MaybeDisplay,
 	Call: Encode + Member,
 	Signature: Member + traits::Verify,
-	<Signature as traits::Verify>::Signer: IdentifyAccount<AccountId=AccountId>,
-	Extra: SignedExtension<AccountId=AccountId>,
+	<Signature as traits::Verify>::Signer: IdentifyAccount<AccountId = AccountId>,
+	Extra: SignedExtension<AccountId = AccountId>,
 	AccountId: Member + MaybeDisplay,
-	Lookup: traits::Lookup<Source=Address, Target=AccountId>,
+	Lookup: traits::Lookup<Source = Address, Target = AccountId>,
 {
 	type Checked = CheckedExtrinsic<AccountId, Call, Extra>;
 
@@ -134,23 +117,17 @@ where
 				}
 
 				let (function, extra, _) = raw_payload.deconstruct();
-				CheckedExtrinsic {
-					signed: Some((signed, extra)),
-					function,
-				}
-			}
-			None => CheckedExtrinsic {
-				signed: None,
-				function: self.function,
+				CheckedExtrinsic { signed: Some((signed, extra)), function }
 			},
+			None => CheckedExtrinsic { signed: None, function: self.function },
 		})
 	}
 }
 
 impl<Address, Call, Signature, Extra> ExtrinsicMetadata
 	for UncheckedExtrinsic<Address, Call, Signature, Extra>
-		where
-			Extra: SignedExtension,
+where
+	Extra: SignedExtension,
 {
 	const VERSION: u8 = EXTRINSIC_VERSION;
 	type SignedExtensions = Extra;
@@ -161,13 +138,10 @@ impl<Address, Call, Signature, Extra> ExtrinsicMetadata
 /// Note that the payload that we sign to produce unchecked extrinsic signature
 /// is going to be different than the `SignaturePayload` - so the thing the extrinsic
 /// actually contains.
-pub struct SignedPayload<Call, Extra: SignedExtension>((
-	Call,
-	Extra,
-	Extra::AdditionalSigned,
-));
+pub struct SignedPayload<Call, Extra: SignedExtension>((Call, Extra, Extra::AdditionalSigned));
 
-impl<Call, Extra> SignedPayload<Call, Extra> where
+impl<Call, Extra> SignedPayload<Call, Extra>
+where
 	Call: Encode,
 	Extra: SignedExtension,
 {
@@ -191,7 +165,8 @@ impl<Call, Extra> SignedPayload<Call, Extra> where
 	}
 }
 
-impl<Call, Extra> Encode for SignedPayload<Call, Extra> where
+impl<Call, Extra> Encode for SignedPayload<Call, Extra>
+where
 	Call: Encode,
 	Extra: SignedExtension,
 {
@@ -213,10 +188,10 @@ impl<Call, Extra> EncodeLike for SignedPayload<Call, Extra>
 where
 	Call: Encode,
 	Extra: SignedExtension,
-{}
+{
+}
 
-impl<Address, Call, Signature, Extra> Decode
-	for UncheckedExtrinsic<Address, Call, Signature, Extra>
+impl<Address, Call, Signature, Extra> Decode for UncheckedExtrinsic<Address, Call, Signature, Extra>
 where
 	Address: Decode,
 	Signature: Decode,
@@ -235,7 +210,7 @@ where
 		let is_signed = version & 0b1000_0000 != 0;
 		let version = version & 0b0111_1111;
 		if version != EXTRINSIC_VERSION {
-			return Err("Invalid transaction version".into());
+			return Err("Invalid transaction version".into())
 		}
 
 		Ok(Self {
@@ -245,8 +220,7 @@ where
 	}
 }
 
-impl<Address, Call, Signature, Extra> Encode
-	for UncheckedExtrinsic<Address, Call, Signature, Extra>
+impl<Address, Call, Signature, Extra> Encode for UncheckedExtrinsic<Address, Call, Signature, Extra>
 where
 	Address: Encode,
 	Signature: Encode,
@@ -260,10 +234,10 @@ where
 				Some(s) => {
 					v.push(EXTRINSIC_VERSION | 0b1000_0000);
 					s.encode_to(v);
-				}
+				},
 				None => {
 					v.push(EXTRINSIC_VERSION & 0b0111_1111);
-				}
+				},
 			}
 			self.function.encode_to(v);
 		})
@@ -277,22 +251,27 @@ where
 	Signature: Encode,
 	Call: Encode,
 	Extra: SignedExtension,
-{}
+{
+}
 
 #[cfg(feature = "std")]
 impl<Address: Encode, Signature: Encode, Call: Encode, Extra: SignedExtension> serde::Serialize
 	for UncheckedExtrinsic<Address, Call, Signature, Extra>
 {
-	fn serialize<S>(&self, seq: S) -> Result<S::Ok, S::Error> where S: ::serde::Serializer {
+	fn serialize<S>(&self, seq: S) -> Result<S::Ok, S::Error>
+	where
+		S: ::serde::Serializer,
+	{
 		self.using_encoded(|bytes| seq.serialize_bytes(bytes))
 	}
 }
 
 #[cfg(feature = "std")]
-impl<'a, Address: Decode, Signature: Decode, Call: Decode, Extra: SignedExtension> serde::Deserialize<'a>
-	for UncheckedExtrinsic<Address, Call, Signature, Extra>
+impl<'a, Address: Decode, Signature: Decode, Call: Decode, Extra: SignedExtension>
+	serde::Deserialize<'a> for UncheckedExtrinsic<Address, Call, Signature, Extra>
 {
-	fn deserialize<D>(de: D) -> Result<Self, D::Error> where
+	fn deserialize<D>(de: D) -> Result<Self, D::Error>
+	where
 		D: serde::Deserializer<'a>,
 	{
 		let r = sp_core::bytes::deserialize(de)?;
@@ -327,21 +306,22 @@ where
 	Extra: SignedExtension,
 {
 	fn from(extrinsic: UncheckedExtrinsic<Address, Call, Signature, Extra>) -> Self {
-		Self::from_bytes(extrinsic.encode().as_slice())
-			.expect(
-				"both OpaqueExtrinsic and UncheckedExtrinsic have encoding that is compatible with \
-				raw Vec<u8> encoding; qed"
-			)
+		Self::from_bytes(extrinsic.encode().as_slice()).expect(
+			"both OpaqueExtrinsic and UncheckedExtrinsic have encoding that is compatible with \
+				raw Vec<u8> encoding; qed",
+		)
 	}
 }
 
 #[cfg(test)]
 mod tests {
 	use super::*;
+	use crate::{
+		codec::{Decode, Encode},
+		testing::TestSignature as TestSig,
+		traits::{IdentityLookup, SignedExtension},
+	};
 	use sp_io::hashing::blake2_256;
-	use crate::codec::{Encode, Decode};
-	use crate::traits::{SignedExtension, IdentityLookup};
-	use crate::testing::TestSignature as TestSig;
 
 	type TestContext = IdentityLookup<u64>;
 	type TestAccountId = u64;
@@ -359,7 +339,9 @@ mod tests {
 		type AdditionalSigned = ();
 		type Pre = ();
 
-		fn additional_signed(&self) -> sp_std::result::Result<(), TransactionValidityError> { Ok(()) }
+		fn additional_signed(&self) -> sp_std::result::Result<(), TransactionValidityError> {
+			Ok(())
+		}
 	}
 
 	type Ex = UncheckedExtrinsic<TestAccountId, TestCall, TestSig, TestExtra>;
@@ -378,7 +360,7 @@ mod tests {
 			vec![0u8; 0],
 			TEST_ACCOUNT,
 			TestSig(TEST_ACCOUNT, (vec![0u8; 0], TestExtra).encode()),
-			TestExtra
+			TestExtra,
 		);
 		let encoded = ux.encode();
 		assert_eq!(Ex::decode(&mut &encoded[..]), Ok(ux));
@@ -389,9 +371,11 @@ mod tests {
 		let ux = Ex::new_signed(
 			vec![0u8; 0],
 			TEST_ACCOUNT,
-			TestSig(TEST_ACCOUNT, (vec![0u8; 257], TestExtra)
-				.using_encoded(blake2_256)[..].to_owned()),
-			TestExtra
+			TestSig(
+				TEST_ACCOUNT,
+				(vec![0u8; 257], TestExtra).using_encoded(blake2_256)[..].to_owned(),
+			),
+			TestExtra,
 		);
 		let encoded = ux.encode();
 		assert_eq!(Ex::decode(&mut &encoded[..]), Ok(ux));
diff --git a/primitives/runtime/src/lib.rs b/primitives/runtime/src/lib.rs
index 6ad721079fb7..1baab238d8cc 100644
--- a/primitives/runtime/src/lib.rs
+++ b/primitives/runtime/src/lib.rs
@@ -19,10 +19,10 @@
 
 #![warn(missing_docs)]
 #![cfg_attr(not(feature = "std"), no_std)]
-
 // to allow benchmarking
 #![cfg_attr(feature = "bench", feature(test))]
-#[cfg(feature = "bench")] extern crate test;
+#[cfg(feature = "bench")]
+extern crate test;
 
 #[doc(hidden)]
 pub use codec;
@@ -41,22 +41,26 @@ pub use sp_application_crypto as app_crypto;
 #[cfg(feature = "std")]
 pub use sp_core::storage::{Storage, StorageChild};
 
-use sp_std::prelude::*;
-use sp_std::convert::TryFrom;
-use sp_core::{crypto::{self, Public}, ed25519, sr25519, ecdsa, hash::{H256, H512}};
+use sp_core::{
+	crypto::{self, Public},
+	ecdsa, ed25519,
+	hash::{H256, H512},
+	sr25519,
+};
+use sp_std::{convert::TryFrom, prelude::*};
 
-use codec::{Encode, Decode};
+use codec::{Decode, Encode};
 
 pub mod curve;
 pub mod generic;
+mod multiaddress;
 pub mod offchain;
+pub mod runtime_logger;
+mod runtime_string;
 #[cfg(feature = "std")]
 pub mod testing;
 pub mod traits;
 pub mod transaction_validity;
-mod runtime_string;
-mod multiaddress;
-pub mod runtime_logger;
 
 pub use crate::runtime_string::*;
 
@@ -64,25 +68,28 @@ pub use crate::runtime_string::*;
 pub use multiaddress::MultiAddress;
 
 /// Re-export these since they're only "kind of" generic.
-pub use generic::{DigestItem, Digest};
+pub use generic::{Digest, DigestItem};
 
+pub use sp_application_crypto::{BoundToRuntimeAppPublic, RuntimeAppPublic};
 /// Re-export this since it's part of the API of this crate.
-pub use sp_core::{TypeId, crypto::{key_types, KeyTypeId, CryptoType, CryptoTypeId, AccountId32}};
-pub use sp_application_crypto::{RuntimeAppPublic, BoundToRuntimeAppPublic};
+pub use sp_core::{
+	crypto::{key_types, AccountId32, CryptoType, CryptoTypeId, KeyTypeId},
+	TypeId,
+};
 
 /// Re-export `RuntimeDebug`, to avoid dependency clutter.
 pub use sp_core::RuntimeDebug;
 
+/// Re-export big_uint stuff.
+pub use sp_arithmetic::biguint;
+/// Re-export 128 bit helpers.
+pub use sp_arithmetic::helpers_128bit;
 /// Re-export top-level arithmetic stuff.
 pub use sp_arithmetic::{
-	PerThing, Perquintill, Perbill, Permill, Percent, PerU16, InnerOf, UpperOf,
-	Rational128, FixedI64, FixedI128, FixedU128, FixedPointNumber, FixedPointOperand,
-	traits::SaturatedConversion,
+	traits::SaturatedConversion, FixedI128, FixedI64, FixedPointNumber, FixedPointOperand,
+	FixedU128, InnerOf, PerThing, PerU16, Perbill, Percent, Permill, Perquintill, Rational128,
+	UpperOf,
 };
-/// Re-export 128 bit helpers.
-pub use sp_arithmetic::helpers_128bit;
-/// Re-export big_uint stuff.
-pub use sp_arithmetic::biguint;
 
 pub use either::Either;
 
@@ -119,7 +126,7 @@ impl Justifications {
 	/// not inserted.
 	pub fn append(&mut self, justification: Justification) -> bool {
 		if self.get(justification.0).is_some() {
-			return false;
+			return false
 		}
 		self.0.push(justification);
 		true
@@ -153,11 +160,11 @@ impl From<Justification> for Justifications {
 	}
 }
 
-use traits::{Verify, Lazy};
+use traits::{Lazy, Verify};
 
-#[cfg(feature = "std")]
-pub use serde::{Serialize, Deserialize, de::DeserializeOwned};
 use crate::traits::IdentifyAccount;
+#[cfg(feature = "std")]
+pub use serde::{de::DeserializeOwned, Deserialize, Serialize};
 
 /// Complex storage builder stuff.
 #[cfg(feature = "std")]
@@ -169,10 +176,7 @@ pub trait BuildStorage {
 		Ok(storage)
 	}
 	/// Assimilate the storage for this module into pre-existing overlays.
-	fn assimilate_storage(
-		&self,
-		storage: &mut sp_core::storage::Storage,
-	) -> Result<(), String>;
+	fn assimilate_storage(&self, storage: &mut sp_core::storage::Storage) -> Result<(), String>;
 }
 
 /// Something that can build the genesis storage of a module.
@@ -187,17 +191,14 @@ pub trait BuildModuleGenesisStorage<T, I>: Sized {
 
 #[cfg(feature = "std")]
 impl BuildStorage for sp_core::storage::Storage {
-	fn assimilate_storage(
-		&self,
-		storage: &mut sp_core::storage::Storage,
-	)-> Result<(), String> {
+	fn assimilate_storage(&self, storage: &mut sp_core::storage::Storage) -> Result<(), String> {
 		storage.top.extend(self.top.iter().map(|(k, v)| (k.clone(), v.clone())));
 		for (k, other_map) in self.children_default.iter() {
 			let k = k.clone();
 			if let Some(map) = storage.children_default.get_mut(&k) {
 				map.data.extend(other_map.data.iter().map(|(k, v)| (k.clone(), v.clone())));
 				if !map.child_info.try_update(&other_map.child_info) {
-					return Err("Incompatible child info update".to_string());
+					return Err("Incompatible child info update".to_string())
 				}
 			} else {
 				storage.children_default.insert(k, other_map.clone());
@@ -209,10 +210,7 @@ impl BuildStorage for sp_core::storage::Storage {
 
 #[cfg(feature = "std")]
 impl BuildStorage for () {
-	fn assimilate_storage(
-		&self,
-		_: &mut sp_core::storage::Storage,
-	) -> Result<(), String> {
+	fn assimilate_storage(&self, _: &mut sp_core::storage::Storage) -> Result<(), String> {
 		Err("`assimilate_storage` not implemented for `()`".into())
 	}
 }
@@ -241,7 +239,11 @@ impl From<ed25519::Signature> for MultiSignature {
 impl TryFrom<MultiSignature> for ed25519::Signature {
 	type Error = ();
 	fn try_from(m: MultiSignature) -> Result<Self, Self::Error> {
-		if let MultiSignature::Ed25519(x) = m { Ok(x) } else { Err(()) }
+		if let MultiSignature::Ed25519(x) = m {
+			Ok(x)
+		} else {
+			Err(())
+		}
 	}
 }
 
@@ -254,7 +256,11 @@ impl From<sr25519::Signature> for MultiSignature {
 impl TryFrom<MultiSignature> for sr25519::Signature {
 	type Error = ();
 	fn try_from(m: MultiSignature) -> Result<Self, Self::Error> {
-		if let MultiSignature::Sr25519(x) = m { Ok(x) } else { Err(()) }
+		if let MultiSignature::Sr25519(x) = m {
+			Ok(x)
+		} else {
+			Err(())
+		}
 	}
 }
 
@@ -267,7 +273,11 @@ impl From<ecdsa::Signature> for MultiSignature {
 impl TryFrom<MultiSignature> for ecdsa::Signature {
 	type Error = ();
 	fn try_from(m: MultiSignature) -> Result<Self, Self::Error> {
-		if let MultiSignature::Ecdsa(x) = m { Ok(x) } else { Err(()) }
+		if let MultiSignature::Ecdsa(x) = m {
+			Ok(x)
+		} else {
+			Err(())
+		}
 	}
 }
 
@@ -333,7 +343,11 @@ impl From<ed25519::Public> for MultiSigner {
 impl TryFrom<MultiSigner> for ed25519::Public {
 	type Error = ();
 	fn try_from(m: MultiSigner) -> Result<Self, Self::Error> {
-		if let MultiSigner::Ed25519(x) = m { Ok(x) } else { Err(()) }
+		if let MultiSigner::Ed25519(x) = m {
+			Ok(x)
+		} else {
+			Err(())
+		}
 	}
 }
 
@@ -346,7 +360,11 @@ impl From<sr25519::Public> for MultiSigner {
 impl TryFrom<MultiSigner> for sr25519::Public {
 	type Error = ();
 	fn try_from(m: MultiSigner) -> Result<Self, Self::Error> {
-		if let MultiSigner::Sr25519(x) = m { Ok(x) } else { Err(()) }
+		if let MultiSigner::Sr25519(x) = m {
+			Ok(x)
+		} else {
+			Err(())
+		}
 	}
 }
 
@@ -359,7 +377,11 @@ impl From<ecdsa::Public> for MultiSigner {
 impl TryFrom<MultiSigner> for ecdsa::Public {
 	type Error = ();
 	fn try_from(m: MultiSigner) -> Result<Self, Self::Error> {
-		if let MultiSigner::Ecdsa(x) = m { Ok(x) } else { Err(()) }
+		if let MultiSigner::Ecdsa(x) = m {
+			Ok(x)
+		} else {
+			Err(())
+		}
 	}
 }
 
@@ -378,17 +400,19 @@ impl Verify for MultiSignature {
 	type Signer = MultiSigner;
 	fn verify<L: Lazy<[u8]>>(&self, mut msg: L, signer: &AccountId32) -> bool {
 		match (self, signer) {
-			(Self::Ed25519(ref sig), who) => sig.verify(msg, &ed25519::Public::from_slice(who.as_ref())),
-			(Self::Sr25519(ref sig), who) => sig.verify(msg, &sr25519::Public::from_slice(who.as_ref())),
+			(Self::Ed25519(ref sig), who) =>
+				sig.verify(msg, &ed25519::Public::from_slice(who.as_ref())),
+			(Self::Sr25519(ref sig), who) =>
+				sig.verify(msg, &sr25519::Public::from_slice(who.as_ref())),
 			(Self::Ecdsa(ref sig), who) => {
 				let m = sp_io::hashing::blake2_256(msg.get());
 				match sp_io::crypto::secp256k1_ecdsa_recover_compressed(sig.as_ref(), &m) {
 					Ok(pubkey) =>
-						&sp_io::hashing::blake2_256(pubkey.as_ref())
-							== <dyn AsRef<[u8; 32]>>::as_ref(who),
+						&sp_io::hashing::blake2_256(pubkey.as_ref()) ==
+							<dyn AsRef<[u8; 32]>>::as_ref(who),
 					_ => false,
 				}
-			}
+			},
 		}
 	}
 }
@@ -404,10 +428,10 @@ impl Verify for AnySignature {
 		let msg = msg.get();
 		sr25519::Signature::try_from(self.0.as_fixed_bytes().as_ref())
 			.map(|s| s.verify(msg, signer))
-			.unwrap_or(false)
-		|| ed25519::Signature::try_from(self.0.as_fixed_bytes().as_ref())
-			.map(|s| s.verify(msg, &ed25519::Public::from_slice(signer.as_ref())))
-			.unwrap_or(false)
+			.unwrap_or(false) ||
+			ed25519::Signature::try_from(self.0.as_fixed_bytes().as_ref())
+				.map(|s| s.verify(msg, &ed25519::Public::from_slice(signer.as_ref())))
+				.unwrap_or(false)
 	}
 }
 
@@ -443,7 +467,11 @@ pub type DispatchResultWithInfo<T> = sp_std::result::Result<T, DispatchErrorWith
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 pub enum DispatchError {
 	/// Some error occurred.
-	Other(#[codec(skip)] #[cfg_attr(feature = "std", serde(skip_deserializing))] &'static str),
+	Other(
+		#[codec(skip)]
+		#[cfg_attr(feature = "std", serde(skip_deserializing))]
+		&'static str,
+	),
 	/// Failed to lookup some data.
 	CannotLookup,
 	/// A bad origin.
@@ -472,8 +500,9 @@ pub enum DispatchError {
 /// Result of a `Dispatchable` which contains the `DispatchResult` and additional information about
 /// the `Dispatchable` that is only known post dispatch.
 #[derive(Eq, PartialEq, Clone, Copy, Encode, Decode, RuntimeDebug)]
-pub struct DispatchErrorWithPostInfo<Info> where
-	Info: Eq + PartialEq + Clone + Copy + Encode + Decode + traits::Printable
+pub struct DispatchErrorWithPostInfo<Info>
+where
+	Info: Eq + PartialEq + Clone + Copy + Encode + Decode + traits::Printable,
 {
 	/// Additional information about the `Dispatchable` which is only known post dispatch.
 	pub post_info: Info,
@@ -485,22 +514,20 @@ impl DispatchError {
 	/// Return the same error but without the attached message.
 	pub fn stripped(self) -> Self {
 		match self {
-			DispatchError::Module { index, error, message: Some(_) }
-				=> DispatchError::Module { index, error, message: None },
+			DispatchError::Module { index, error, message: Some(_) } =>
+				DispatchError::Module { index, error, message: None },
 			m => m,
 		}
 	}
 }
 
-impl<T, E> From<E> for DispatchErrorWithPostInfo<T> where
+impl<T, E> From<E> for DispatchErrorWithPostInfo<T>
+where
 	T: Eq + PartialEq + Clone + Copy + Encode + Decode + traits::Printable + Default,
-	E: Into<DispatchError>
+	E: Into<DispatchError>,
 {
 	fn from(error: E) -> Self {
-		Self {
-			post_info: Default::default(),
-			error: error.into(),
-		}
+		Self { post_info: Default::default(), error: error.into() }
 	}
 }
 
@@ -605,8 +632,9 @@ impl From<DispatchError> for &'static str {
 	}
 }
 
-impl<T> From<DispatchErrorWithPostInfo<T>> for &'static str where
-	T: Eq + PartialEq + Clone + Copy + Encode + Decode + traits::Printable
+impl<T> From<DispatchErrorWithPostInfo<T>> for &'static str
+where
+	T: Eq + PartialEq + Clone + Copy + Encode + Decode + traits::Printable,
 {
 	fn from(err: DispatchErrorWithPostInfo<T>) -> &'static str {
 		err.error.into()
@@ -626,7 +654,7 @@ impl traits::Printable for DispatchError {
 				if let Some(msg) = message {
 					msg.print();
 				}
-			}
+			},
 			Self::ConsumerRemaining => "Consumer remaining".print(),
 			Self::NoProviders => "No providers".print(),
 			Self::Token(e) => {
@@ -636,13 +664,14 @@ impl traits::Printable for DispatchError {
 			Self::Arithmetic(e) => {
 				"Arithmetic error: ".print();
 				<&'static str>::from(*e).print();
-			}
+			},
 		}
 	}
 }
 
-impl<T> traits::Printable for DispatchErrorWithPostInfo<T> where
-	T: Eq + PartialEq + Clone + Copy + Encode + Decode + traits::Printable
+impl<T> traits::Printable for DispatchErrorWithPostInfo<T>
+where
+	T: Eq + PartialEq + Clone + Copy + Encode + Decode + traits::Printable,
 {
 	fn print(&self) {
 		self.error.print();
@@ -704,7 +733,8 @@ pub type DispatchOutcome = Result<(), DispatchError>;
 /// - The sender doesn't have enough funds to pay the transaction inclusion fee. Including such
 ///   a transaction in the block doesn't make sense.
 /// - The extrinsic supplied a bad signature. This transaction won't become valid ever.
-pub type ApplyExtrinsicResult = Result<DispatchOutcome, transaction_validity::TransactionValidityError>;
+pub type ApplyExtrinsicResult =
+	Result<DispatchOutcome, transaction_validity::TransactionValidityError>;
 
 /// Same as `ApplyExtrinsicResult` but augmented with `PostDispatchInfo` on success.
 pub type ApplyExtrinsicResultWithInfo<T> =
@@ -715,7 +745,7 @@ pub type ApplyExtrinsicResultWithInfo<T> =
 pub fn verify_encoded_lazy<V: Verify, T: codec::Encode>(
 	sig: &V,
 	item: &T,
-	signer: &<V::Signer as IdentifyAccount>::AccountId
+	signer: &<V::Signer as IdentifyAccount>::AccountId,
 ) -> bool {
 	// The `Lazy<T>` trait expresses something like `X: FnMut<Output = for<'a> &'a T>`.
 	// unfortunately this is a lifetime relationship that can't
@@ -732,10 +762,7 @@ pub fn verify_encoded_lazy<V: Verify, T: codec::Encode>(
 		}
 	}
 
-	sig.verify(
-		LazyEncode { inner: || item.encode(), encoded: None },
-		signer,
-	)
+	sig.verify(LazyEncode { inner: || item.encode(), encoded: None }, signer)
 }
 
 /// Checks that `$x` is equal to `$y` with an error rate of `$error`.
@@ -802,14 +829,20 @@ impl sp_std::fmt::Debug for OpaqueExtrinsic {
 
 #[cfg(feature = "std")]
 impl ::serde::Serialize for OpaqueExtrinsic {
-	fn serialize<S>(&self, seq: S) -> Result<S::Ok, S::Error> where S: ::serde::Serializer {
+	fn serialize<S>(&self, seq: S) -> Result<S::Ok, S::Error>
+	where
+		S: ::serde::Serializer,
+	{
 		codec::Encode::using_encoded(&self.0, |bytes| ::sp_core::bytes::serialize(bytes, seq))
 	}
 }
 
 #[cfg(feature = "std")]
 impl<'a> ::serde::Deserialize<'a> for OpaqueExtrinsic {
-	fn deserialize<D>(de: D) -> Result<Self, D::Error> where D: ::serde::Deserializer<'a> {
+	fn deserialize<D>(de: D) -> Result<Self, D::Error>
+	where
+		D: ::serde::Deserializer<'a>,
+	{
 		let r = ::sp_core::bytes::deserialize(de)?;
 		Decode::decode(&mut &r[..])
 			.map_err(|e| ::serde::de::Error::custom(format!("Decode error: {}", e)))
@@ -881,7 +914,7 @@ impl<R> TransactionOutcome<R> {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use codec::{Encode, Decode};
+	use codec::{Decode, Encode};
 	use sp_core::crypto::Pair;
 
 	#[test]
@@ -892,22 +925,11 @@ mod tests {
 
 	#[test]
 	fn dispatch_error_encoding() {
-		let error = DispatchError::Module {
-			index: 1,
-			error: 2,
-			message: Some("error message"),
-		};
+		let error = DispatchError::Module { index: 1, error: 2, message: Some("error message") };
 		let encoded = error.encode();
 		let decoded = DispatchError::decode(&mut &encoded[..]).unwrap();
 		assert_eq!(encoded, vec![3, 1, 2]);
-		assert_eq!(
-			decoded,
-			DispatchError::Module {
-				index: 1,
-				error: 2,
-				message: None,
-			},
-		);
+		assert_eq!(decoded, DispatchError::Module { index: 1, error: 2, message: None },);
 	}
 
 	#[test]
@@ -947,7 +969,7 @@ mod tests {
 		// Ignores `message` field in `Module` variant.
 		assert_eq!(
 			Module { index: 1, error: 1, message: Some("foo") },
-			Module { index: 1, error: 1, message: None},
+			Module { index: 1, error: 1, message: None },
 		);
 	}
 
@@ -971,17 +993,13 @@ mod tests {
 	#[should_panic(expected = "Signature verification has not been called")]
 	fn batching_still_finishes_when_not_called_directly() {
 		let mut ext = sp_state_machine::BasicExternalities::default();
-		ext.register_extension(
-			sp_core::traits::TaskExecutorExt::new(sp_core::testing::TaskExecutor::new()),
-		);
+		ext.register_extension(sp_core::traits::TaskExecutorExt::new(
+			sp_core::testing::TaskExecutor::new(),
+		));
 
 		ext.execute_with(|| {
 			let _batching = SignatureBatching::start();
-			sp_io::crypto::sr25519_verify(
-				&Default::default(),
-				&Vec::new(),
-				&Default::default(),
-			);
+			sp_io::crypto::sr25519_verify(&Default::default(), &Vec::new(), &Default::default());
 		});
 	}
 
@@ -989,9 +1007,9 @@ mod tests {
 	#[should_panic(expected = "Hey, I'm an error")]
 	fn batching_does_not_panic_while_thread_is_already_panicking() {
 		let mut ext = sp_state_machine::BasicExternalities::default();
-		ext.register_extension(
-			sp_core::traits::TaskExecutorExt::new(sp_core::testing::TaskExecutor::new()),
-		);
+		ext.register_extension(sp_core::traits::TaskExecutorExt::new(
+			sp_core::testing::TaskExecutor::new(),
+		));
 
 		ext.execute_with(|| {
 			let _batching = SignatureBatching::start();
diff --git a/primitives/runtime/src/multiaddress.rs b/primitives/runtime/src/multiaddress.rs
index e1a4c81a5f9a..8c866b98ed85 100644
--- a/primitives/runtime/src/multiaddress.rs
+++ b/primitives/runtime/src/multiaddress.rs
@@ -17,7 +17,7 @@
 
 //! MultiAddress type is a wrapper for multiple downstream account formats.
 
-use codec::{Encode, Decode};
+use codec::{Decode, Encode};
 use sp_std::vec::Vec;
 
 /// A multi-format address wrapper for on-chain accounts.
@@ -46,8 +46,10 @@ where
 		use sp_core::hexdisplay::HexDisplay;
 		match self {
 			Self::Raw(inner) => write!(f, "MultiAddress::Raw({})", HexDisplay::from(inner)),
-			Self::Address32(inner) => write!(f, "MultiAddress::Address32({})", HexDisplay::from(inner)),
-			Self::Address20(inner) => write!(f, "MultiAddress::Address20({})", HexDisplay::from(inner)),
+			Self::Address32(inner) =>
+				write!(f, "MultiAddress::Address32({})", HexDisplay::from(inner)),
+			Self::Address20(inner) =>
+				write!(f, "MultiAddress::Address20({})", HexDisplay::from(inner)),
 			_ => write!(f, "{:?}", self),
 		}
 	}
diff --git a/primitives/runtime/src/offchain/http.rs b/primitives/runtime/src/offchain/http.rs
index a346460897d5..7b305ebd9ccb 100644
--- a/primitives/runtime/src/offchain/http.rs
+++ b/primitives/runtime/src/offchain/http.rs
@@ -48,17 +48,15 @@
 //! assert_eq!(body.error(), &None);
 //! ```
 
-use sp_std::str;
-use sp_std::prelude::Vec;
+use sp_core::{
+	offchain::{
+		HttpError, HttpRequestId as RequestId, HttpRequestStatus as RequestStatus, Timestamp,
+	},
+	RuntimeDebug,
+};
 #[cfg(not(feature = "std"))]
 use sp_std::prelude::vec;
-use sp_core::RuntimeDebug;
-use sp_core::offchain::{
-	Timestamp,
-	HttpRequestId as RequestId,
-	HttpRequestStatus as RequestStatus,
-	HttpError,
-};
+use sp_std::{prelude::Vec, str};
 
 /// Request method (HTTP verb)
 #[derive(Clone, PartialEq, Eq, RuntimeDebug)]
@@ -103,10 +101,7 @@ mod header {
 	impl Header {
 		/// Creates new header given it's name and value.
 		pub fn new(name: &str, value: &str) -> Self {
-			Header {
-				name: name.as_bytes().to_vec(),
-				value: value.as_bytes().to_vec(),
-			}
+			Header { name: name.as_bytes().to_vec(), value: value.as_bytes().to_vec() }
 		}
 
 		/// Returns the name of this header.
@@ -166,13 +161,7 @@ impl<'a, T> Request<'a, T> {
 	pub fn post(url: &'a str, body: T) -> Self {
 		let req: Request = Request::default();
 
-		Request {
-			url,
-			body,
-			method: Method::Post,
-			headers: req.headers,
-			deadline: req.deadline,
-		}
+		Request { url, body, method: Method::Post, headers: req.headers, deadline: req.deadline }
 	}
 }
 
@@ -213,7 +202,7 @@ impl<'a, T: Default> Request<'a, T> {
 	}
 }
 
-impl<'a, I: AsRef<[u8]>, T: IntoIterator<Item=I>> Request<'a, T> {
+impl<'a, I: AsRef<[u8]>, T: IntoIterator<Item = I>> Request<'a, T> {
 	/// Send the request and return a handle.
 	///
 	/// Err is returned in case the deadline is reached
@@ -222,19 +211,13 @@ impl<'a, I: AsRef<[u8]>, T: IntoIterator<Item=I>> Request<'a, T> {
 		let meta = &[];
 
 		// start an http request.
-		let id = sp_io::offchain::http_request_start(
-			self.method.as_ref(),
-			self.url,
-			meta,
-		).map_err(|_| HttpError::IoError)?;
+		let id = sp_io::offchain::http_request_start(self.method.as_ref(), self.url, meta)
+			.map_err(|_| HttpError::IoError)?;
 
 		// add custom headers
 		for header in &self.headers {
-			sp_io::offchain::http_request_add_header(
-				id,
-				header.name(),
-				header.value(),
-			).map_err(|_| HttpError::IoError)?
+			sp_io::offchain::http_request_add_header(id, header.name(), header.value())
+				.map_err(|_| HttpError::IoError)?
 		}
 
 		// write body
@@ -245,9 +228,7 @@ impl<'a, I: AsRef<[u8]>, T: IntoIterator<Item=I>> Request<'a, T> {
 		// finalize the request
 		sp_io::offchain::http_request_write_body(id, &[], self.deadline)?;
 
-		Ok(PendingRequest {
-			id,
-		})
+		Ok(PendingRequest { id })
 	}
 }
 
@@ -285,8 +266,13 @@ impl PendingRequest {
 
 	/// Attempts to wait for the request to finish,
 	/// but will return `Err` in case the deadline is reached.
-	pub fn try_wait(self, deadline: impl Into<Option<Timestamp>>) -> Result<HttpResult, PendingRequest> {
-		Self::try_wait_all(vec![self], deadline).pop().expect("One request passed, one status received; qed")
+	pub fn try_wait(
+		self,
+		deadline: impl Into<Option<Timestamp>>,
+	) -> Result<HttpResult, PendingRequest> {
+		Self::try_wait_all(vec![self], deadline)
+			.pop()
+			.expect("One request passed, one status received; qed")
 	}
 
 	/// Wait for all provided requests.
@@ -305,7 +291,7 @@ impl PendingRequest {
 	/// Requests that are complete will resolve to an `Ok` others will return a `DeadlineReached` error.
 	pub fn try_wait_all(
 		requests: Vec<PendingRequest>,
-		deadline: impl Into<Option<Timestamp>>
+		deadline: impl Into<Option<Timestamp>>,
 	) -> Vec<Result<HttpResult, PendingRequest>> {
 		let ids = requests.iter().map(|r| r.id).collect::<Vec<_>>();
 		let statuses = sp_io::offchain::http_response_wait(&ids, deadline.into());
@@ -336,19 +322,13 @@ pub struct Response {
 
 impl Response {
 	fn new(id: RequestId, code: u16) -> Self {
-		Self {
-			id,
-			code,
-			headers: None,
-		}
+		Self { id, code, headers: None }
 	}
 
 	/// Retrieve the headers for this response.
 	pub fn headers(&mut self) -> &Headers {
 		if self.headers.is_none() {
-			self.headers = Some(
-				Headers { raw: sp_io::offchain::http_response_headers(self.id) },
-			);
+			self.headers = Some(Headers { raw: sp_io::offchain::http_response_headers(self.id) });
 		}
 		self.headers.as_ref().expect("Headers were just set; qed")
 	}
@@ -363,7 +343,7 @@ impl Response {
 ///
 /// Note that reading the body may return `None` in following cases:
 /// 1. Either the deadline you've set is reached (check via `#error`;
-///	   In such case you can resume the reader by setting a new deadline)
+/// 	   In such case you can resume the reader by setting a new deadline)
 /// 2. Or because of IOError. In such case the reader is not resumable and will keep
 ///    returning `None`.
 /// 3. The body has been returned. The reader will keep returning `None`.
@@ -423,32 +403,28 @@ impl Iterator for ResponseBody {
 
 	fn next(&mut self) -> Option<Self::Item> {
 		if self.error.is_some() {
-			return None;
+			return None
 		}
 
 		if self.filled_up_to.is_none() {
-			let result = sp_io::offchain::http_response_read_body(
-				self.id,
-				&mut self.buffer,
-				self.deadline);
+			let result =
+				sp_io::offchain::http_response_read_body(self.id, &mut self.buffer, self.deadline);
 			match result {
 				Err(e) => {
 					self.error = Some(e);
-					return None;
-				}
-				Ok(0) => {
-					return None;
-				}
+					return None
+				},
+				Ok(0) => return None,
 				Ok(size) => {
 					self.position = 0;
 					self.filled_up_to = Some(size as usize);
-				}
+				},
 			}
 		}
 
 		if Some(self.position) == self.filled_up_to {
 			self.filled_up_to = None;
-			return self.next();
+			return self.next()
 		}
 
 		let result = self.buffer[self.position];
@@ -508,7 +484,8 @@ impl<'a> HeadersIterator<'a> {
 	///
 	/// Note that you have to call `next` prior to calling this
 	pub fn current(&self) -> Option<(&str, &str)> {
-		self.collection.get(self.index?)
+		self.collection
+			.get(self.index?)
 			.map(|val| (str::from_utf8(&val.0).unwrap_or(""), str::from_utf8(&val.1).unwrap_or("")))
 	}
 }
@@ -516,11 +493,8 @@ impl<'a> HeadersIterator<'a> {
 #[cfg(test)]
 mod tests {
 	use super::*;
+	use sp_core::offchain::{testing, OffchainWorkerExt};
 	use sp_io::TestExternalities;
-	use sp_core::offchain::{
-		OffchainWorkerExt,
-		testing,
-	};
 
 	#[test]
 	fn should_send_a_basic_request_and_get_response() {
@@ -530,10 +504,7 @@ mod tests {
 
 		t.execute_with(|| {
 			let request: Request = Request::get("http://localhost:1234");
-			let pending = request
-				.add_header("X-Auth", "hunter2")
-				.send()
-				.unwrap();
+			let pending = request.add_header("X-Auth", "hunter2").send().unwrap();
 			// make sure it's sent correctly
 			state.write().fulfill_pending_request(
 				0,
diff --git a/primitives/runtime/src/offchain/storage.rs b/primitives/runtime/src/offchain/storage.rs
index c6ed10c5be26..3bc5b10f161f 100644
--- a/primitives/runtime/src/offchain/storage.rs
+++ b/primitives/runtime/src/offchain/storage.rs
@@ -44,7 +44,7 @@ pub enum MutateStorageError<T, E> {
 	/// The function given to us to create the value to be stored failed.
 	/// May be used to signal that having looked at the existing value,
 	/// they don't want to mutate it.
-	ValueFunctionFailed(E)
+	ValueFunctionFailed(E),
 }
 
 impl<'a> StorageValueRef<'a> {
@@ -64,9 +64,7 @@ impl<'a> StorageValueRef<'a> {
 	/// if you happen to write a `get-check-set` pattern you should most likely
 	/// be using `mutate` instead.
 	pub fn set(&self, value: &impl codec::Encode) {
-		value.using_encoded(|val| {
-			sp_io::offchain::local_storage_set(self.kind, self.key, val)
-		})
+		value.using_encoded(|val| sp_io::offchain::local_storage_set(self.kind, self.key, val))
 	}
 
 	/// Remove the associated value from the storage.
@@ -83,8 +81,7 @@ impl<'a> StorageValueRef<'a> {
 	/// Returns an error if the value could not be decoded.
 	pub fn get<T: codec::Decode>(&self) -> Result<Option<T>, StorageRetrievalError> {
 		sp_io::offchain::local_storage_get(self.kind, self.key)
-			.map(|val| T::decode(&mut &*val)
-			.map_err(|_| StorageRetrievalError::Undecodable))
+			.map(|val| T::decode(&mut &*val).map_err(|_| StorageRetrievalError::Undecodable))
 			.transpose()
 	}
 
@@ -98,26 +95,22 @@ impl<'a> StorageValueRef<'a> {
 	/// 2. `Err(MutateStorageError::ConcurrentModification(T))` in case the value was calculated
 	/// by the passed closure `mutate_val`, but it could not be stored.
 	/// 3. `Err(MutateStorageError::ValueFunctionFailed(_))` in case `mutate_val` returns an error.
-	pub fn mutate<T, E, F>(&self, mutate_val: F) -> Result<T, MutateStorageError<T,E>> where
+	pub fn mutate<T, E, F>(&self, mutate_val: F) -> Result<T, MutateStorageError<T, E>>
+	where
 		T: codec::Codec,
-		F: FnOnce(Result<Option<T>, StorageRetrievalError>) -> Result<T, E>
+		F: FnOnce(Result<Option<T>, StorageRetrievalError>) -> Result<T, E>,
 	{
 		let value = sp_io::offchain::local_storage_get(self.kind, self.key);
-		let decoded = value.as_deref()
-			.map(|mut bytes| {
-				T::decode(&mut bytes)
-					.map_err(|_| StorageRetrievalError::Undecodable)
-			}).transpose();
+		let decoded = value
+			.as_deref()
+			.map(|mut bytes| T::decode(&mut bytes).map_err(|_| StorageRetrievalError::Undecodable))
+			.transpose();
 
-		let val = mutate_val(decoded).map_err(|err| MutateStorageError::ValueFunctionFailed(err))?;
+		let val =
+			mutate_val(decoded).map_err(|err| MutateStorageError::ValueFunctionFailed(err))?;
 
 		let set = val.using_encoded(|new_val| {
-			sp_io::offchain::local_storage_compare_and_set(
-				self.kind,
-				self.key,
-				value,
-				new_val,
-			)
+			sp_io::offchain::local_storage_compare_and_set(self.kind, self.key, value, new_val)
 		});
 		if set {
 			Ok(val)
@@ -130,11 +123,8 @@ impl<'a> StorageValueRef<'a> {
 #[cfg(test)]
 mod tests {
 	use super::*;
+	use sp_core::offchain::{testing, OffchainDbExt};
 	use sp_io::TestExternalities;
-	use sp_core::offchain::{
-		OffchainDbExt,
-		testing,
-	};
 
 	#[test]
 	fn should_set_and_get() {
@@ -151,10 +141,7 @@ mod tests {
 
 			assert_eq!(val.get::<u32>(), Ok(Some(15_u32)));
 			assert_eq!(val.get::<Vec<u8>>(), Err(StorageRetrievalError::Undecodable));
-			assert_eq!(
-				state.read().persistent_storage.get(b"testval"),
-				Some(vec![15_u8, 0, 0, 0])
-			);
+			assert_eq!(state.read().persistent_storage.get(b"testval"), Some(vec![15_u8, 0, 0, 0]));
 		})
 	}
 
@@ -174,10 +161,7 @@ mod tests {
 			});
 			assert_eq!(result, Ok(16_u32));
 			assert_eq!(val.get::<u32>(), Ok(Some(16_u32)));
-			assert_eq!(
-				state.read().persistent_storage.get(b"testval"),
-				Some(vec![16_u8, 0, 0, 0])
-			);
+			assert_eq!(state.read().persistent_storage.get(b"testval"), Some(vec![16_u8, 0, 0, 0]));
 
 			// mutate again, but this time early-exit.
 			let res = val.mutate::<u32, (), _>(|val| {
diff --git a/primitives/runtime/src/offchain/storage_lock.rs b/primitives/runtime/src/offchain/storage_lock.rs
index 7ea52775c5e0..b4833bf345fc 100644
--- a/primitives/runtime/src/offchain/storage_lock.rs
+++ b/primitives/runtime/src/offchain/storage_lock.rs
@@ -38,8 +38,8 @@
 //! # use codec::{Decode, Encode, Codec};
 //! // in your off-chain worker code
 //! use sp_runtime::offchain::{
-//!		storage::StorageValueRef,
-//!		storage_lock::{StorageLock, Time},
+//! 		storage::StorageValueRef,
+//! 		storage_lock::{StorageLock, Time},
 //! };
 //!
 //! fn append_to_in_storage_vec<'a, T>(key: &'a [u8], _: T) where T: Codec {
@@ -61,8 +61,10 @@
 //! }
 //! ```
 
-use crate::offchain::storage::{StorageRetrievalError, MutateStorageError, StorageValueRef};
-use crate::traits::BlockNumberProvider;
+use crate::{
+	offchain::storage::{MutateStorageError, StorageRetrievalError, StorageValueRef},
+	traits::BlockNumberProvider,
+};
 use codec::{Codec, Decode, Encode};
 use sp_core::offchain::{Duration, Timestamp};
 use sp_io::offchain;
@@ -115,9 +117,7 @@ pub struct Time {
 
 impl Default for Time {
 	fn default() -> Self {
-		Self {
-			expiration_duration: STORAGE_LOCK_DEFAULT_EXPIRY_DURATION,
-		}
+		Self { expiration_duration: STORAGE_LOCK_DEFAULT_EXPIRY_DURATION }
 	}
 }
 
@@ -157,10 +157,7 @@ pub struct BlockAndTimeDeadline<B: BlockNumberProvider> {
 
 impl<B: BlockNumberProvider> Clone for BlockAndTimeDeadline<B> {
 	fn clone(&self) -> Self {
-		Self {
-			block_number: self.block_number.clone(),
-			timestamp: self.timestamp,
-		}
+		Self { block_number: self.block_number.clone(), timestamp: self.timestamp }
 	}
 }
 
@@ -175,7 +172,8 @@ impl<B: BlockNumberProvider> Default for BlockAndTimeDeadline<B> {
 }
 
 impl<B: BlockNumberProvider> fmt::Debug for BlockAndTimeDeadline<B>
-	where <B as BlockNumberProvider>::BlockNumber: fmt::Debug
+where
+	<B as BlockNumberProvider>::BlockNumber: fmt::Debug,
 {
 	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 		f.debug_struct("BlockAndTimeDeadline")
@@ -225,8 +223,8 @@ impl<B: BlockNumberProvider> Lockable for BlockAndTime<B> {
 	type Deadline = BlockAndTimeDeadline<B>;
 
 	fn deadline(&self) -> Self::Deadline {
-		let block_number = <B as BlockNumberProvider>::current_block_number()
-			+ self.expiration_block_number_offset.into();
+		let block_number = <B as BlockNumberProvider>::current_block_number() +
+			self.expiration_block_number_offset.into();
 		BlockAndTimeDeadline {
 			timestamp: offchain::timestamp().add(self.expiration_duration),
 			block_number,
@@ -234,8 +232,8 @@ impl<B: BlockNumberProvider> Lockable for BlockAndTime<B> {
 	}
 
 	fn has_expired(deadline: &Self::Deadline) -> bool {
-		offchain::timestamp() > deadline.timestamp
-			&& <B as BlockNumberProvider>::current_block_number() > deadline.block_number
+		offchain::timestamp() > deadline.timestamp &&
+			<B as BlockNumberProvider>::current_block_number() > deadline.block_number
 	}
 
 	fn snooze(deadline: &Self::Deadline) {
@@ -271,10 +269,7 @@ impl<'a, L: Lockable + Default> StorageLock<'a, L> {
 impl<'a, L: Lockable> StorageLock<'a, L> {
 	/// Create a new storage lock with an explicit instance of a lockable `L`.
 	pub fn with_lockable(key: &'a [u8], lockable: L) -> Self {
-		Self {
-			value_ref: StorageValueRef::<'a>::persistent(key),
-			lockable,
-		}
+		Self { value_ref: StorageValueRef::<'a>::persistent(key), lockable }
 	}
 
 	/// Extend active lock's deadline
@@ -398,9 +393,7 @@ impl<'a> StorageLock<'a, Time> {
 	pub fn with_deadline(key: &'a [u8], expiration_duration: Duration) -> Self {
 		Self {
 			value_ref: StorageValueRef::<'a>::persistent(key),
-			lockable: Time {
-				expiration_duration,
-			},
+			lockable: Time { expiration_duration },
 		}
 	}
 }
@@ -443,7 +436,7 @@ where
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use sp_core::offchain::{testing, OffchainWorkerExt, OffchainDbExt};
+	use sp_core::offchain::{testing, OffchainDbExt, OffchainWorkerExt};
 	use sp_io::TestExternalities;
 
 	const VAL_1: u32 = 0u32;
diff --git a/primitives/runtime/src/runtime_logger.rs b/primitives/runtime/src/runtime_logger.rs
index f74704390174..ff0e531ed814 100644
--- a/primitives/runtime/src/runtime_logger.rs
+++ b/primitives/runtime/src/runtime_logger.rs
@@ -57,11 +57,7 @@ impl log::Log for RuntimeLogger {
 		let mut w = sp_std::Writer::default();
 		let _ = ::core::write!(&mut w, "{}", record.args());
 
-		sp_io::logging::log(
-			record.level().into(),
-			record.target(),
-			w.inner(),
-		);
+		sp_io::logging::log(record.level().into(), record.target(), w.inner());
 	}
 
 	fn flush(&self) {}
@@ -69,12 +65,12 @@ impl log::Log for RuntimeLogger {
 
 #[cfg(test)]
 mod tests {
+	use sp_api::{BlockId, ProvideRuntimeApi};
+	use std::{env, str::FromStr};
 	use substrate_test_runtime_client::{
-		ExecutionStrategy, TestClientBuilderExt, DefaultTestClientBuilderExt,
-		TestClientBuilder, runtime::TestAPI,
+		runtime::TestAPI, DefaultTestClientBuilderExt, ExecutionStrategy, TestClientBuilder,
+		TestClientBuilderExt,
 	};
-	use sp_api::{ProvideRuntimeApi, BlockId};
-	use std::{env, str::FromStr};
 
 	#[test]
 	fn ensure_runtime_logger_respects_host_max_log_level() {
@@ -83,7 +79,8 @@ mod tests {
 			log::set_max_level(log::LevelFilter::from_str(&env::var("RUST_LOG").unwrap()).unwrap());
 
 			let client = TestClientBuilder::new()
-				.set_execution_strategy(ExecutionStrategy::AlwaysWasm).build();
+				.set_execution_strategy(ExecutionStrategy::AlwaysWasm)
+				.build();
 			let runtime_api = client.runtime_api();
 			let block_id = BlockId::Number(0);
 			runtime_api.do_trace_log(&block_id).expect("Logging should not fail");
diff --git a/primitives/runtime/src/runtime_string.rs b/primitives/runtime/src/runtime_string.rs
index e315de430c12..273a22e98f33 100644
--- a/primitives/runtime/src/runtime_string.rs
+++ b/primitives/runtime/src/runtime_string.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use codec::{Encode, Decode};
+use codec::{Decode, Encode};
 use sp_core::RuntimeDebug;
 use sp_std::vec::Vec;
 
@@ -47,7 +47,6 @@ macro_rules! format_runtime_string {
 	}};
 }
 
-
 impl From<&'static str> for RuntimeString {
 	fn from(data: &'static str) -> Self {
 		Self::Borrowed(data)
@@ -130,5 +129,7 @@ impl<'de> serde::Deserialize<'de> for RuntimeString {
 /// Create a const [`RuntimeString`].
 #[macro_export]
 macro_rules! create_runtime_str {
-	( $y:expr ) => {{ $crate::RuntimeString::Borrowed($y) }}
+	( $y:expr ) => {{
+		$crate::RuntimeString::Borrowed($y)
+	}};
 }
diff --git a/primitives/runtime/src/testing.rs b/primitives/runtime/src/testing.rs
index f473dc7028f4..60dc54e09534 100644
--- a/primitives/runtime/src/testing.rs
+++ b/primitives/runtime/src/testing.rs
@@ -17,18 +17,27 @@
 
 //! Testing utilities.
 
-use serde::{Serialize, Serializer, Deserialize, de::Error as DeError, Deserializer};
-use std::{fmt::{self, Debug}, ops::Deref, cell::RefCell};
-use crate::codec::{Codec, Encode, Decode};
-use crate::traits::{
-	self, Checkable, Applyable, BlakeTwo256, OpaqueKeys,
-	SignedExtension, Dispatchable, DispatchInfoOf, PostDispatchInfoOf,
+use crate::{
+	codec::{Codec, Decode, Encode},
+	generic,
+	traits::{
+		self, Applyable, BlakeTwo256, Checkable, DispatchInfoOf, Dispatchable, OpaqueKeys,
+		PostDispatchInfoOf, SignedExtension, ValidateUnsigned,
+	},
+	transaction_validity::{TransactionSource, TransactionValidity, TransactionValidityError},
+	ApplyExtrinsicResultWithInfo, CryptoTypeId, KeyTypeId,
+};
+use serde::{de::Error as DeError, Deserialize, Deserializer, Serialize, Serializer};
+use sp_core::{
+	crypto::{key_types, CryptoType, Dummy, Public},
+	U256,
+};
+pub use sp_core::{sr25519, H256};
+use std::{
+	cell::RefCell,
+	fmt::{self, Debug},
+	ops::Deref,
 };
-use crate::traits::ValidateUnsigned;
-use crate::{generic, KeyTypeId, CryptoTypeId, ApplyExtrinsicResultWithInfo};
-pub use sp_core::{H256, sr25519};
-use sp_core::{crypto::{CryptoType, Dummy, key_types, Public}, U256};
-use crate::transaction_validity::{TransactionValidity, TransactionValidityError, TransactionSource};
 
 /// A dummy type which can be used instead of regular cryptographic primitives.
 ///
@@ -36,7 +45,20 @@ use crate::transaction_validity::{TransactionValidity, TransactionValidityError,
 /// 2. Can be converted to any `Public` key.
 /// 3. Implements `RuntimeAppPublic` so it can be used instead of regular application-specific
 ///    crypto.
-#[derive(Default, PartialEq, Eq, Clone, Encode, Decode, Debug, Hash, Serialize, Deserialize, PartialOrd, Ord)]
+#[derive(
+	Default,
+	PartialEq,
+	Eq,
+	Clone,
+	Encode,
+	Decode,
+	Debug,
+	Hash,
+	Serialize,
+	Deserialize,
+	PartialOrd,
+	Ord,
+)]
 pub struct UintAuthorityId(pub u64);
 
 impl From<u64> for UintAuthorityId {
@@ -68,7 +90,10 @@ impl AsRef<[u8]> for UintAuthorityId {
 		// Unsafe, i know, but it's test code and it's just there because it's really convenient to
 		// keep `UintAuthorityId` as a u64 under the hood.
 		unsafe {
-			std::slice::from_raw_parts(&self.0 as *const u64 as *const _, std::mem::size_of::<u64>())
+			std::slice::from_raw_parts(
+				&self.0 as *const u64 as *const _,
+				std::mem::size_of::<u64>(),
+			)
 		}
 	}
 }
@@ -80,7 +105,7 @@ thread_local! {
 
 impl UintAuthorityId {
 	/// Set the list of keys returned by the runtime call for all keys of that type.
-	pub fn set_all_keys<T: Into<UintAuthorityId>>(keys: impl IntoIterator<Item=T>) {
+	pub fn set_all_keys<T: Into<UintAuthorityId>>(keys: impl IntoIterator<Item = T>) {
 		ALL_KEYS.with(|l| *l.borrow_mut() = keys.into_iter().map(Into::into).collect())
 	}
 }
@@ -180,7 +205,8 @@ impl Header {
 pub struct ExtrinsicWrapper<Xt>(Xt);
 
 impl<Xt> traits::Extrinsic for ExtrinsicWrapper<Xt>
-where Xt: parity_util_mem::MallocSizeOf
+where
+	Xt: parity_util_mem::MallocSizeOf,
 {
 	type Call = ();
 	type SignaturePayload = ();
@@ -191,7 +217,10 @@ where Xt: parity_util_mem::MallocSizeOf
 }
 
 impl<Xt: Encode> serde::Serialize for ExtrinsicWrapper<Xt> {
-	fn serialize<S>(&self, seq: S) -> Result<S::Ok, S::Error> where S: ::serde::Serializer {
+	fn serialize<S>(&self, seq: S) -> Result<S::Ok, S::Error>
+	where
+		S: ::serde::Serializer,
+	{
 		self.using_encoded(|bytes| seq.serialize_bytes(bytes))
 	}
 }
@@ -219,8 +248,9 @@ pub struct Block<Xt> {
 	pub extrinsics: Vec<Xt>,
 }
 
-impl<Xt: 'static + Codec + Sized + Send + Sync + Serialize + Clone + Eq + Debug + traits::Extrinsic> traits::Block
-	for Block<Xt>
+impl<
+		Xt: 'static + Codec + Sized + Send + Sync + Serialize + Clone + Eq + Debug + traits::Extrinsic,
+	> traits::Block for Block<Xt>
 {
 	type Extrinsic = Xt;
 	type Header = Header;
@@ -243,7 +273,10 @@ impl<Xt: 'static + Codec + Sized + Send + Sync + Serialize + Clone + Eq + Debug
 	}
 }
 
-impl<'a, Xt> Deserialize<'a> for Block<Xt> where Block<Xt>: Decode {
+impl<'a, Xt> Deserialize<'a> for Block<Xt>
+where
+	Block<Xt>: Decode,
+{
 	fn deserialize<D: Deserializer<'a>>(de: D) -> Result<Self, D::Error> {
 		let r = <Vec<u8>>::deserialize(de)?;
 		Decode::decode(&mut &r[..])
@@ -273,8 +306,14 @@ impl<Call, Extra> TestXt<Call, Extra> {
 // Non-opaque extrinsics always 0.
 parity_util_mem::malloc_size_of_is_0!(any: TestXt<Call, Extra>);
 
-impl<Call, Extra> Serialize for TestXt<Call, Extra> where TestXt<Call, Extra>: Encode {
-	fn serialize<S>(&self, seq: S) -> Result<S::Ok, S::Error> where S: Serializer {
+impl<Call, Extra> Serialize for TestXt<Call, Extra>
+where
+	TestXt<Call, Extra>: Encode,
+{
+	fn serialize<S>(&self, seq: S) -> Result<S::Ok, S::Error>
+	where
+		S: Serializer,
+	{
 		self.using_encoded(|bytes| seq.serialize_bytes(bytes))
 	}
 }
@@ -287,7 +326,9 @@ impl<Call, Extra> Debug for TestXt<Call, Extra> {
 
 impl<Call: Codec + Sync + Send, Context, Extra> Checkable<Context> for TestXt<Call, Extra> {
 	type Checked = Self;
-	fn check(self, _: &Context) -> Result<Self::Checked, TransactionValidityError> { Ok(self) }
+	fn check(self, _: &Context) -> Result<Self::Checked, TransactionValidityError> {
+		Ok(self)
+	}
 }
 
 impl<Call: Codec + Sync + Send, Extra> traits::Extrinsic for TestXt<Call, Extra> {
@@ -303,23 +344,26 @@ impl<Call: Codec + Sync + Send, Extra> traits::Extrinsic for TestXt<Call, Extra>
 	}
 }
 
-impl<Call, Extra> traits::ExtrinsicMetadata for TestXt<Call, Extra> where
+impl<Call, Extra> traits::ExtrinsicMetadata for TestXt<Call, Extra>
+where
 	Call: Codec + Sync + Send,
-	Extra: SignedExtension<AccountId=u64, Call=Call>,
+	Extra: SignedExtension<AccountId = u64, Call = Call>,
 {
 	type SignedExtensions = Extra;
 	const VERSION: u8 = 0u8;
 }
 
-impl<Origin, Call, Extra> Applyable for TestXt<Call, Extra> where
-	Call: 'static + Sized + Send + Sync + Clone + Eq + Codec + Debug + Dispatchable<Origin=Origin>,
-	Extra: SignedExtension<AccountId=u64, Call=Call>,
+impl<Origin, Call, Extra> Applyable for TestXt<Call, Extra>
+where
+	Call:
+		'static + Sized + Send + Sync + Clone + Eq + Codec + Debug + Dispatchable<Origin = Origin>,
+	Extra: SignedExtension<AccountId = u64, Call = Call>,
 	Origin: From<Option<u64>>,
 {
 	type Call = Call;
 
 	/// Checks to see if this is a valid *transaction*. It returns information on it if so.
-	fn validate<U: ValidateUnsigned<Call=Self::Call>>(
+	fn validate<U: ValidateUnsigned<Call = Self::Call>>(
 		&self,
 		source: TransactionSource,
 		info: &DispatchInfoOf<Self::Call>,
@@ -336,7 +380,7 @@ impl<Origin, Call, Extra> Applyable for TestXt<Call, Extra> where
 
 	/// Executes all necessary logic needed prior to dispatch and deconstructs into function call,
 	/// index and sender.
-	fn apply<U: ValidateUnsigned<Call=Self::Call>>(
+	fn apply<U: ValidateUnsigned<Call = Self::Call>>(
 		self,
 		info: &DispatchInfoOf<Self::Call>,
 		len: usize,
diff --git a/primitives/runtime/src/traits.rs b/primitives/runtime/src/traits.rs
index 4396c9759823..3baf7c6655b9 100644
--- a/primitives/runtime/src/traits.rs
+++ b/primitives/runtime/src/traits.rs
@@ -17,29 +17,36 @@
 
 //! Primitives for the runtime modules.
 
-use sp_std::prelude::*;
-use sp_std::{self, marker::PhantomData, convert::{TryFrom, TryInto}, fmt::Debug};
+use crate::{
+	codec::{Codec, Decode, Encode, MaxEncodedLen},
+	generic::{Digest, DigestItem},
+	transaction_validity::{
+		TransactionSource, TransactionValidity, TransactionValidityError, UnknownTransaction,
+		ValidTransaction,
+	},
+	DispatchResult,
+};
+use impl_trait_for_tuples::impl_for_tuples;
+#[cfg(feature = "std")]
+use serde::{de::DeserializeOwned, Deserialize, Serialize};
+use sp_application_crypto::AppKey;
+pub use sp_arithmetic::traits::{
+	AtLeast32Bit, AtLeast32BitUnsigned, Bounded, CheckedAdd, CheckedDiv, CheckedMul, CheckedShl,
+	CheckedShr, CheckedSub, IntegerSquareRoot, One, SaturatedConversion, Saturating,
+	UniqueSaturatedFrom, UniqueSaturatedInto, Zero,
+};
+use sp_core::{self, Hasher, RuntimeDebug, TypeId};
+use sp_std::{
+	self,
+	convert::{TryFrom, TryInto},
+	fmt::Debug,
+	marker::PhantomData,
+	prelude::*,
+};
 #[cfg(feature = "std")]
 use std::fmt::Display;
 #[cfg(feature = "std")]
 use std::str::FromStr;
-#[cfg(feature = "std")]
-use serde::{Serialize, Deserialize, de::DeserializeOwned};
-use sp_core::{self, Hasher, TypeId, RuntimeDebug};
-use crate::codec::{Codec, Encode, Decode, MaxEncodedLen};
-use crate::transaction_validity::{
-	ValidTransaction, TransactionSource, TransactionValidity, TransactionValidityError,
-	UnknownTransaction,
-};
-use crate::generic::{Digest, DigestItem};
-pub use sp_arithmetic::traits::{
-	AtLeast32Bit, AtLeast32BitUnsigned, UniqueSaturatedInto, UniqueSaturatedFrom, Saturating,
-	SaturatedConversion, Zero, One, Bounded, CheckedAdd, CheckedSub, CheckedMul, CheckedDiv,
-	CheckedShl, CheckedShr, IntegerSquareRoot
-};
-use sp_application_crypto::AppKey;
-use impl_trait_for_tuples::impl_for_tuples;
-use crate::DispatchResult;
 
 /// A lazy value.
 pub trait Lazy<T: ?Sized> {
@@ -50,7 +57,9 @@ pub trait Lazy<T: ?Sized> {
 }
 
 impl<'a> Lazy<[u8]> for &'a [u8] {
-	fn get(&mut self) -> &[u8] { &**self }
+	fn get(&mut self) -> &[u8] {
+		&**self
+	}
 }
 
 /// Some type that is able to be collapsed into an account ID. It is not possible to recreate the
@@ -64,17 +73,23 @@ pub trait IdentifyAccount {
 
 impl IdentifyAccount for sp_core::ed25519::Public {
 	type AccountId = Self;
-	fn into_account(self) -> Self { self }
+	fn into_account(self) -> Self {
+		self
+	}
 }
 
 impl IdentifyAccount for sp_core::sr25519::Public {
 	type AccountId = Self;
-	fn into_account(self) -> Self { self }
+	fn into_account(self) -> Self {
+		self
+	}
 }
 
 impl IdentifyAccount for sp_core::ecdsa::Public {
 	type AccountId = Self;
-	fn into_account(self) -> Self { self }
+	fn into_account(self) -> Self {
+		self
+	}
 }
 
 /// Means of signature verification.
@@ -84,7 +99,11 @@ pub trait Verify {
 	/// Verify a signature.
 	///
 	/// Return `true` if signature is valid for the value.
-	fn verify<L: Lazy<[u8]>>(&self, msg: L, signer: &<Self::Signer as IdentifyAccount>::AccountId) -> bool;
+	fn verify<L: Lazy<[u8]>>(
+		&self,
+		msg: L,
+		signer: &<Self::Signer as IdentifyAccount>::AccountId,
+	) -> bool;
 }
 
 impl Verify for sp_core::ed25519::Signature {
@@ -125,19 +144,27 @@ pub trait AppVerify {
 }
 
 impl<
-	S: Verify<Signer = <<T as AppKey>::Public as sp_application_crypto::AppPublic>::Generic> + From<T>,
-	T: sp_application_crypto::Wraps<Inner=S> + sp_application_crypto::AppKey + sp_application_crypto::AppSignature +
-		AsRef<S> + AsMut<S> + From<S>,
-> AppVerify for T where
+		S: Verify<Signer = <<T as AppKey>::Public as sp_application_crypto::AppPublic>::Generic>
+			+ From<T>,
+		T: sp_application_crypto::Wraps<Inner = S>
+			+ sp_application_crypto::AppKey
+			+ sp_application_crypto::AppSignature
+			+ AsRef<S>
+			+ AsMut<S>
+			+ From<S>,
+	> AppVerify for T
+where
 	<S as Verify>::Signer: IdentifyAccount<AccountId = <S as Verify>::Signer>,
-	<<T as AppKey>::Public as sp_application_crypto::AppPublic>::Generic:
-		IdentifyAccount<AccountId = <<T as AppKey>::Public as sp_application_crypto::AppPublic>::Generic>,
+	<<T as AppKey>::Public as sp_application_crypto::AppPublic>::Generic: IdentifyAccount<
+		AccountId = <<T as AppKey>::Public as sp_application_crypto::AppPublic>::Generic,
+	>,
 {
 	type AccountId = <T as AppKey>::Public;
 	fn verify<L: Lazy<[u8]>>(&self, msg: L, signer: &<T as AppKey>::Public) -> bool {
 		use sp_application_crypto::IsWrappedBy;
 		let inner: &S = self.as_ref();
-		let inner_pubkey = <<T as AppKey>::Public as sp_application_crypto::AppPublic>::Generic::from_ref(&signer);
+		let inner_pubkey =
+			<<T as AppKey>::Public as sp_application_crypto::AppPublic>::Generic::from_ref(&signer);
 		Verify::verify(inner, msg, inner_pubkey)
 	}
 }
@@ -198,14 +225,20 @@ pub struct IdentityLookup<T>(PhantomData<T>);
 impl<T: Codec + Clone + PartialEq + Debug> StaticLookup for IdentityLookup<T> {
 	type Source = T;
 	type Target = T;
-	fn lookup(x: T) -> Result<T, LookupError> { Ok(x) }
-	fn unlookup(x: T) -> T { x }
+	fn lookup(x: T) -> Result<T, LookupError> {
+		Ok(x)
+	}
+	fn unlookup(x: T) -> T {
+		x
+	}
 }
 
 impl<T> Lookup for IdentityLookup<T> {
 	type Source = T;
 	type Target = T;
-	fn lookup(&self, x: T) -> Result<T, LookupError> { Ok(x) }
+	fn lookup(&self, x: T) -> Result<T, LookupError> {
+		Ok(x)
+	}
 }
 
 /// A lookup implementation returning the `AccountId` from a `MultiAddress`.
@@ -253,19 +286,25 @@ pub trait Convert<A, B> {
 }
 
 impl<A, B: Default> Convert<A, B> for () {
-	fn convert(_: A) -> B { Default::default() }
+	fn convert(_: A) -> B {
+		Default::default()
+	}
 }
 
 /// A structure that performs identity conversion.
 pub struct Identity;
 impl<T> Convert<T, T> for Identity {
-	fn convert(a: T) -> T { a }
+	fn convert(a: T) -> T {
+		a
+	}
 }
 
 /// A structure that performs standard conversion using the standard Rust conversion traits.
 pub struct ConvertInto;
 impl<A, B: From<A>> Convert<A, B> for ConvertInto {
-	fn convert(a: A) -> B { a.into() }
+	fn convert(a: A) -> B {
+		a.into()
+	}
 }
 
 /// Convenience type to work around the highly unergonomic syntax needed
@@ -277,7 +316,10 @@ pub trait CheckedConversion {
 	/// This just uses `TryFrom` internally but with this
 	/// variant you can provide the destination type using turbofish syntax
 	/// in case Rust happens not to assume the correct type.
-	fn checked_from<T>(t: T) -> Option<Self> where Self: TryFrom<T> {
+	fn checked_from<T>(t: T) -> Option<Self>
+	where
+		Self: TryFrom<T>,
+	{
 		<Self as TryFrom<T>>::try_from(t).ok()
 	}
 	/// Consume self to return `Some` equivalent value of `Option<T>`.
@@ -285,7 +327,10 @@ pub trait CheckedConversion {
 	/// This just uses `TryInto` internally but with this
 	/// variant you can provide the destination type using turbofish syntax
 	/// in case Rust happens not to assume the correct type.
-	fn checked_into<T>(self) -> Option<T> where Self: TryInto<T> {
+	fn checked_into<T>(self) -> Option<T>
+	where
+		Self: TryInto<T>,
+	{
 		<Self as TryInto<T>>::try_into(self).ok()
 	}
 }
@@ -310,11 +355,17 @@ macro_rules! impl_scale {
 	($self:ty, $other:ty) => {
 		impl Scale<$other> for $self {
 			type Output = Self;
-			fn mul(self, other: $other) -> Self::Output { self * (other as Self) }
-			fn div(self, other: $other) -> Self::Output { self / (other as Self) }
-			fn rem(self, other: $other) -> Self::Output { self % (other as Self) }
+			fn mul(self, other: $other) -> Self::Output {
+				self * (other as Self)
+			}
+			fn div(self, other: $other) -> Self::Output {
+				self / (other as Self)
+			}
+			fn rem(self, other: $other) -> Self::Output {
+				self % (other as Self)
+			}
 		}
-	}
+	};
 }
 impl_scale!(u128, u128);
 impl_scale!(u128, u64);
@@ -343,31 +394,57 @@ pub trait Clear {
 }
 
 impl<T: Default + Eq + PartialEq> Clear for T {
-	fn is_clear(&self) -> bool { *self == Self::clear() }
-	fn clear() -> Self { Default::default() }
+	fn is_clear(&self) -> bool {
+		*self == Self::clear()
+	}
+	fn clear() -> Self {
+		Default::default()
+	}
 }
 
 /// A meta trait for all bit ops.
 pub trait SimpleBitOps:
-	Sized + Clear +
-	sp_std::ops::BitOr<Self, Output = Self> +
-	sp_std::ops::BitXor<Self, Output = Self> +
-	sp_std::ops::BitAnd<Self, Output = Self>
-{}
-impl<T:
-	Sized + Clear +
-	sp_std::ops::BitOr<Self, Output = Self> +
-	sp_std::ops::BitXor<Self, Output = Self> +
-	sp_std::ops::BitAnd<Self, Output = Self>
-> SimpleBitOps for T {}
+	Sized
+	+ Clear
+	+ sp_std::ops::BitOr<Self, Output = Self>
+	+ sp_std::ops::BitXor<Self, Output = Self>
+	+ sp_std::ops::BitAnd<Self, Output = Self>
+{
+}
+impl<
+		T: Sized
+			+ Clear
+			+ sp_std::ops::BitOr<Self, Output = Self>
+			+ sp_std::ops::BitXor<Self, Output = Self>
+			+ sp_std::ops::BitAnd<Self, Output = Self>,
+	> SimpleBitOps for T
+{
+}
 
 /// Abstraction around hashing
 // Stupid bug in the Rust compiler believes derived
 // traits must be fulfilled by all type parameters.
-pub trait Hash: 'static + MaybeSerializeDeserialize + Debug + Clone + Eq + PartialEq + Hasher<Out = <Self as Hash>::Output> {
+pub trait Hash:
+	'static
+	+ MaybeSerializeDeserialize
+	+ Debug
+	+ Clone
+	+ Eq
+	+ PartialEq
+	+ Hasher<Out = <Self as Hash>::Output>
+{
 	/// The hash type produced.
-	type Output: Member + MaybeSerializeDeserialize + Debug + sp_std::hash::Hash
-		+ AsRef<[u8]> + AsMut<[u8]> + Copy + Default + Encode + Decode + MaxEncodedLen;
+	type Output: Member
+		+ MaybeSerializeDeserialize
+		+ Debug
+		+ sp_std::hash::Hash
+		+ AsRef<[u8]>
+		+ AsMut<[u8]>
+		+ Copy
+		+ Default
+		+ Encode
+		+ Decode
+		+ MaxEncodedLen;
 
 	/// Produce the hash of some byte-slice.
 	fn hash(s: &[u8]) -> Self::Output {
@@ -469,7 +546,10 @@ impl CheckEqual for sp_core::H256 {
 	}
 }
 
-impl<H: PartialEq + Eq + Debug> CheckEqual for super::generic::DigestItem<H> where H: Encode {
+impl<H: PartialEq + Eq + Debug> CheckEqual for super::generic::DigestItem<H>
+where
+	H: Encode,
+{
 	#[cfg(feature = "std")]
 	fn check_equal(&self, other: &Self) {
 		if self != other {
@@ -523,16 +603,33 @@ pub trait IsMember<MemberId> {
 ///
 /// You can also create a `new` one from those fields.
 pub trait Header:
-	Clone + Send + Sync + Codec + Eq + MaybeSerialize + Debug +
-	MaybeMallocSizeOf + 'static
+	Clone + Send + Sync + Codec + Eq + MaybeSerialize + Debug + MaybeMallocSizeOf + 'static
 {
 	/// Header number.
-	type Number: Member + MaybeSerializeDeserialize + Debug + sp_std::hash::Hash + Copy +
-		MaybeDisplay + AtLeast32BitUnsigned + Codec + sp_std::str::FromStr + MaybeMallocSizeOf;
+	type Number: Member
+		+ MaybeSerializeDeserialize
+		+ Debug
+		+ sp_std::hash::Hash
+		+ Copy
+		+ MaybeDisplay
+		+ AtLeast32BitUnsigned
+		+ Codec
+		+ sp_std::str::FromStr
+		+ MaybeMallocSizeOf;
 	/// Header hash type
-	type Hash: Member + MaybeSerializeDeserialize + Debug + sp_std::hash::Hash + Ord
-		+ Copy + MaybeDisplay + Default + SimpleBitOps + Codec + AsRef<[u8]>
-		+ AsMut<[u8]> + MaybeMallocSizeOf;
+	type Hash: Member
+		+ MaybeSerializeDeserialize
+		+ Debug
+		+ sp_std::hash::Hash
+		+ Ord
+		+ Copy
+		+ MaybeDisplay
+		+ Default
+		+ SimpleBitOps
+		+ Codec
+		+ AsRef<[u8]>
+		+ AsMut<[u8]>
+		+ MaybeMallocSizeOf;
 	/// Hashing algorithm
 	type Hashing: Hash<Output = Self::Hash>;
 
@@ -580,14 +677,26 @@ pub trait Header:
 /// `Extrinsic` pieces of information as well as a `Header`.
 ///
 /// You can get an iterator over each of the `extrinsics` and retrieve the `header`.
-pub trait Block: Clone + Send + Sync + Codec + Eq + MaybeSerialize + Debug + MaybeMallocSizeOf + 'static {
+pub trait Block:
+	Clone + Send + Sync + Codec + Eq + MaybeSerialize + Debug + MaybeMallocSizeOf + 'static
+{
 	/// Type for extrinsics.
 	type Extrinsic: Member + Codec + Extrinsic + MaybeSerialize + MaybeMallocSizeOf;
 	/// Header type.
-	type Header: Header<Hash=Self::Hash> + MaybeMallocSizeOf;
+	type Header: Header<Hash = Self::Hash> + MaybeMallocSizeOf;
 	/// Block hash type.
-	type Hash: Member + MaybeSerializeDeserialize + Debug + sp_std::hash::Hash + Ord
-		+ Copy + MaybeDisplay + Default + SimpleBitOps + Codec + AsRef<[u8]> + AsMut<[u8]>
+	type Hash: Member
+		+ MaybeSerializeDeserialize
+		+ Debug
+		+ sp_std::hash::Hash
+		+ Ord
+		+ Copy
+		+ MaybeDisplay
+		+ Default
+		+ SimpleBitOps
+		+ Codec
+		+ AsRef<[u8]>
+		+ AsMut<[u8]>
 		+ MaybeMallocSizeOf;
 
 	/// Returns a reference to the header.
@@ -607,7 +716,6 @@ pub trait Block: Clone + Send + Sync + Codec + Eq + MaybeSerialize + Debug + May
 	fn encode_from(header: &Self::Header, extrinsics: &[Self::Extrinsic]) -> Vec<u8>;
 }
 
-
 /// Something that acts like an `Extrinsic`.
 pub trait Extrinsic: Sized + MaybeMallocSizeOf {
 	/// The function call.
@@ -622,7 +730,9 @@ pub trait Extrinsic: Sized + MaybeMallocSizeOf {
 
 	/// Is this `Extrinsic` signed?
 	/// If no information are available about signed/unsigned, `None` should be returned.
-	fn is_signed(&self) -> Option<bool> { None }
+	fn is_signed(&self) -> Option<bool> {
+		None
+	}
 
 	/// Create new instance of the extrinsic.
 	///
@@ -630,7 +740,9 @@ pub trait Extrinsic: Sized + MaybeMallocSizeOf {
 	/// 1. Inherents (no signature; created by validators during block production)
 	/// 2. Unsigned Transactions (no signature; represent "system calls" or other special kinds of calls)
 	/// 3. Signed Transactions (with signature; a regular transactions with known origin)
-	fn new(_call: Self::Call, _signed_data: Option<Self::SignaturePayload>) -> Option<Self> { None }
+	fn new(_call: Self::Call, _signed_data: Option<Self::SignaturePayload>) -> Option<Self> {
+		None
+	}
 }
 
 /// Implementor is an [`Extrinsic`] and provides metadata about this extrinsic.
@@ -878,9 +990,13 @@ impl<AccountId, Call: Dispatchable> SignedExtension for Tuple {
 		Ok(valid)
 	}
 
-	fn pre_dispatch(self, who: &Self::AccountId, call: &Self::Call, info: &DispatchInfoOf<Self::Call>, len: usize)
-		-> Result<Self::Pre, TransactionValidityError>
-	{
+	fn pre_dispatch(
+		self,
+		who: &Self::AccountId,
+		call: &Self::Call,
+		info: &DispatchInfoOf<Self::Call>,
+		len: usize,
+	) -> Result<Self::Pre, TransactionValidityError> {
 		Ok(for_tuples!( ( #( Tuple.pre_dispatch(who, call, info, len)? ),* ) ))
 	}
 
@@ -928,7 +1044,9 @@ impl SignedExtension for () {
 	type Call = ();
 	type Pre = ();
 	const IDENTIFIER: &'static str = "UnitSignedExtension";
-	fn additional_signed(&self) -> sp_std::result::Result<(), TransactionValidityError> { Ok(()) }
+	fn additional_signed(&self) -> sp_std::result::Result<(), TransactionValidityError> {
+		Ok(())
+	}
 }
 
 /// An "executable" piece of information, used by the standard Substrate Executive in order to
@@ -942,7 +1060,7 @@ pub trait Applyable: Sized + Send + Sync {
 	type Call: Dispatchable;
 
 	/// Checks to see if this is a valid *transaction*. It returns information on it if so.
-	fn validate<V: ValidateUnsigned<Call=Self::Call>>(
+	fn validate<V: ValidateUnsigned<Call = Self::Call>>(
 		&self,
 		source: TransactionSource,
 		info: &DispatchInfoOf<Self::Call>,
@@ -951,7 +1069,7 @@ pub trait Applyable: Sized + Send + Sync {
 
 	/// Executes all necessary logic needed prior to dispatch and deconstructs into function call,
 	/// index and sender.
-	fn apply<V: ValidateUnsigned<Call=Self::Call>>(
+	fn apply<V: ValidateUnsigned<Call = Self::Call>>(
 		self,
 		info: &DispatchInfoOf<Self::Call>,
 		len: usize,
@@ -1020,7 +1138,9 @@ pub trait OpaqueKeys: Clone {
 		T::decode(&mut self.get_raw(i)).ok()
 	}
 	/// Verify a proof of ownership for the keys.
-	fn ownership_proof_is_valid(&self, _proof: &[u8]) -> bool { true }
+	fn ownership_proof_is_valid(&self, _proof: &[u8]) -> bool {
+		true
+	}
 }
 
 /// Input that adds infinite number of zero after wrapped input.
@@ -1056,7 +1176,7 @@ impl<'a, T: codec::Input> codec::Input for AppendZerosInput<'a, T> {
 					into[i] = b;
 					i += 1;
 				} else {
-					break;
+					break
 				}
 			}
 			i
@@ -1099,7 +1219,9 @@ impl<'a> codec::Input for TrailingZeroInput<'a> {
 /// This type can be converted into and possibly from an AccountId (which itself is generic).
 pub trait AccountIdConversion<AccountId>: Sized {
 	/// Convert into an account ID. This is infallible.
-	fn into_account(&self) -> AccountId { self.into_sub_account(&()) }
+	fn into_account(&self) -> AccountId {
+		self.into_sub_account(&())
+	}
 
 	/// Try to convert an account ID into this type. Might not succeed.
 	fn try_from_account(a: &AccountId) -> Option<Self> {
@@ -1125,14 +1247,16 @@ pub trait AccountIdConversion<AccountId>: Sized {
 /// fill AccountId.
 impl<T: Encode + Decode + Default, Id: Encode + Decode + TypeId> AccountIdConversion<T> for Id {
 	fn into_sub_account<S: Encode>(&self, sub: S) -> T {
-		(Id::TYPE_ID, self, sub).using_encoded(|b|
-			T::decode(&mut TrailingZeroInput(b))
-		).unwrap_or_default()
+		(Id::TYPE_ID, self, sub)
+			.using_encoded(|b| T::decode(&mut TrailingZeroInput(b)))
+			.unwrap_or_default()
 	}
 
 	fn try_from_sub_account<S: Decode>(x: &T) -> Option<(Self, S)> {
 		x.using_encoded(|d| {
-			if &d[0..4] != Id::TYPE_ID { return None }
+			if &d[0..4] != Id::TYPE_ID {
+				return None
+			}
 			let mut cursor = &d[4..];
 			let result = Decode::decode(&mut cursor).ok()?;
 			if cursor.iter().all(|x| *x == 0) {
@@ -1466,19 +1590,19 @@ pub trait BlockNumberProvider {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use crate::codec::{Encode, Decode, Input};
+	use crate::codec::{Decode, Encode, Input};
 	use sp_core::{crypto::Pair, ecdsa};
 
 	mod t {
-		use sp_core::crypto::KeyTypeId;
 		use sp_application_crypto::{app_crypto, sr25519};
+		use sp_core::crypto::KeyTypeId;
 		app_crypto!(sr25519, KeyTypeId(*b"test"));
 	}
 
 	#[test]
 	fn app_verify_works() {
-		use t::*;
 		use super::AppVerify;
+		use t::*;
 
 		let s = Signature::default();
 		let _ = s.verify(&[0u8; 100][..], &Public::default());
diff --git a/primitives/runtime/src/transaction_validity.rs b/primitives/runtime/src/transaction_validity.rs
index 1768c27d6f5a..939452384f75 100644
--- a/primitives/runtime/src/transaction_validity.rs
+++ b/primitives/runtime/src/transaction_validity.rs
@@ -17,9 +17,11 @@
 
 //! Transaction validity interface.
 
+use crate::{
+	codec::{Decode, Encode},
+	RuntimeDebug,
+};
 use sp_std::prelude::*;
-use crate::codec::{Encode, Decode};
-use crate::RuntimeDebug;
 
 /// Priority for a transaction. Additive. Higher is better.
 pub type TransactionPriority = u64;
@@ -98,8 +100,7 @@ impl From<InvalidTransaction> for &'static str {
 			InvalidTransaction::Stale => "Transaction is outdated",
 			InvalidTransaction::BadProof => "Transaction has a bad signature",
 			InvalidTransaction::AncientBirthBlock => "Transaction has an ancient birth block",
-			InvalidTransaction::ExhaustsResources =>
-				"Transaction would exhaust the block limits",
+			InvalidTransaction::ExhaustsResources => "Transaction would exhaust the block limits",
 			InvalidTransaction::Payment =>
 				"Inability to pay some fees (e.g. account balance too low)",
 			InvalidTransaction::BadMandatory =>
@@ -220,7 +221,9 @@ impl From<UnknownTransaction> for TransactionValidity {
 /// Depending on the source we might apply different validation schemes.
 /// For instance we can disallow specific kinds of transactions if they were not produced
 /// by our local node (for instance off-chain workers).
-#[derive(Copy, Clone, PartialEq, Eq, Encode, Decode, RuntimeDebug, parity_util_mem::MallocSizeOf)]
+#[derive(
+	Copy, Clone, PartialEq, Eq, Encode, Decode, RuntimeDebug, parity_util_mem::MallocSizeOf,
+)]
 pub enum TransactionSource {
 	/// Transaction is already included in block.
 	///
@@ -295,10 +298,7 @@ impl ValidTransaction {
 	/// To avoid conflicts between different parts in runtime it's recommended to build `requires`
 	/// and `provides` tags with a unique prefix.
 	pub fn with_tag_prefix(prefix: &'static str) -> ValidTransactionBuilder {
-		ValidTransactionBuilder {
-			prefix: Some(prefix),
-			validity: Default::default(),
-		}
+		ValidTransactionBuilder { prefix: Some(prefix), validity: Default::default() }
 	}
 
 	/// Combine two instances into one, as a best effort. This will take the superset of each of the
@@ -307,8 +307,14 @@ impl ValidTransaction {
 	pub fn combine_with(mut self, mut other: ValidTransaction) -> Self {
 		Self {
 			priority: self.priority.saturating_add(other.priority),
-			requires: { self.requires.append(&mut other.requires); self.requires },
-			provides: { self.provides.append(&mut other.provides); self.provides },
+			requires: {
+				self.requires.append(&mut other.requires);
+				self.requires
+			},
+			provides: {
+				self.provides.append(&mut other.provides);
+				self.provides
+			},
 			longevity: self.longevity.min(other.longevity),
 			propagate: self.propagate && other.propagate,
 		}
@@ -412,7 +418,6 @@ impl From<ValidTransactionBuilder> for ValidTransaction {
 	}
 }
 
-
 #[cfg(test)]
 mod tests {
 	use super::*;
@@ -430,7 +435,10 @@ mod tests {
 		let encoded = v.encode();
 		assert_eq!(
 			encoded,
-			vec![0, 5, 0, 0, 0, 0, 0, 0, 0, 4, 16, 1, 2, 3, 4, 4, 12, 4, 5, 6, 42, 0, 0, 0, 0, 0, 0, 0, 0]
+			vec![
+				0, 5, 0, 0, 0, 0, 0, 0, 0, 4, 16, 1, 2, 3, 4, 4, 12, 4, 5, 6, 42, 0, 0, 0, 0, 0, 0,
+				0, 0
+			]
 		);
 
 		// decode back
@@ -450,12 +458,15 @@ mod tests {
 			.priority(3)
 			.priority(6)
 			.into();
-		assert_eq!(a, ValidTransaction {
-			propagate: false,
-			longevity: 5,
-			priority: 6,
-			requires: vec![(PREFIX, 1).encode(), (PREFIX, 2).encode()],
-			provides: vec![(PREFIX, 3).encode(), (PREFIX, 4).encode()],
-		});
+		assert_eq!(
+			a,
+			ValidTransaction {
+				propagate: false,
+				longevity: 5,
+				priority: 6,
+				requires: vec![(PREFIX, 1).encode(), (PREFIX, 2).encode()],
+				provides: vec![(PREFIX, 3).encode(), (PREFIX, 4).encode()],
+			}
+		);
 	}
 }
diff --git a/primitives/sandbox/src/lib.rs b/primitives/sandbox/src/lib.rs
index 22e68439958d..a433d57c3b51 100755
--- a/primitives/sandbox/src/lib.rs
+++ b/primitives/sandbox/src/lib.rs
@@ -41,7 +41,7 @@
 use sp_std::prelude::*;
 
 pub use sp_core::sandbox::HostError;
-pub use sp_wasm_interface::{Value, ReturnValue};
+pub use sp_wasm_interface::{ReturnValue, Value};
 
 mod imp {
 	#[cfg(feature = "std")]
@@ -100,9 +100,7 @@ impl Memory {
 	///
 	/// Allocated memory is always zeroed.
 	pub fn new(initial: u32, maximum: Option<u32>) -> Result<Memory, Error> {
-		Ok(Memory {
-			inner: imp::Memory::new(initial, maximum)?,
-		})
+		Ok(Memory { inner: imp::Memory::new(initial, maximum)? })
 	}
 
 	/// Read a memory area at the address `ptr` with the size of the provided slice `buf`.
@@ -131,9 +129,7 @@ pub struct EnvironmentDefinitionBuilder<T> {
 impl<T> EnvironmentDefinitionBuilder<T> {
 	/// Construct a new `EnvironmentDefinitionBuilder`.
 	pub fn new() -> EnvironmentDefinitionBuilder<T> {
-		EnvironmentDefinitionBuilder {
-			inner: imp::EnvironmentDefinitionBuilder::new(),
-		}
+		EnvironmentDefinitionBuilder { inner: imp::EnvironmentDefinitionBuilder::new() }
 	}
 
 	/// Register a host function in this environment definition.
@@ -176,12 +172,12 @@ impl<T> Instance<T> {
 	/// be returned.
 	///
 	/// [`EnvironmentDefinitionBuilder`]: struct.EnvironmentDefinitionBuilder.html
-	pub fn new(code: &[u8], env_def_builder: &EnvironmentDefinitionBuilder<T>, state: &mut T)
-		-> Result<Instance<T>, Error>
-	{
-		Ok(Instance {
-			inner: imp::Instance::new(code, &env_def_builder.inner, state)?,
-		})
+	pub fn new(
+		code: &[u8],
+		env_def_builder: &EnvironmentDefinitionBuilder<T>,
+		state: &mut T,
+	) -> Result<Instance<T>, Error> {
+		Ok(Instance { inner: imp::Instance::new(code, &env_def_builder.inner, state)? })
 	}
 
 	/// Invoke an exported function with the given name.
diff --git a/primitives/serializer/src/lib.rs b/primitives/serializer/src/lib.rs
index 3aef9ef5a387..ccdbbf27f179 100644
--- a/primitives/serializer/src/lib.rs
+++ b/primitives/serializer/src/lib.rs
@@ -22,7 +22,7 @@
 
 #![warn(missing_docs)]
 
-pub use serde_json::{from_str, from_slice, from_reader, Result, Error};
+pub use serde_json::{from_reader, from_slice, from_str, Error, Result};
 
 const PROOF: &str = "Serializers are infallible; qed";
 
@@ -37,6 +37,9 @@ pub fn encode<T: serde::Serialize + ?Sized>(value: &T) -> Vec<u8> {
 }
 
 /// Serialize the given data structure as JSON into the IO stream.
-pub fn to_writer<W: ::std::io::Write, T: serde::Serialize + ?Sized>(writer: W, value: &T) -> Result<()> {
+pub fn to_writer<W: ::std::io::Write, T: serde::Serialize + ?Sized>(
+	writer: W,
+	value: &T,
+) -> Result<()> {
 	serde_json::to_writer(writer, value)
 }
diff --git a/primitives/session/src/lib.rs b/primitives/session/src/lib.rs
index 9f63d64d414b..22d6b0b4a592 100644
--- a/primitives/session/src/lib.rs
+++ b/primitives/session/src/lib.rs
@@ -19,15 +19,14 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use codec::{Encode, Decode};
+use codec::{Decode, Encode};
 
-#[cfg(feature = "std")]
-use sp_runtime::{generic::BlockId, traits::Block as BlockT};
 #[cfg(feature = "std")]
 use sp_api::ProvideRuntimeApi;
+#[cfg(feature = "std")]
+use sp_runtime::{generic::BlockId, traits::Block as BlockT};
 
-use sp_core::RuntimeDebug;
-use sp_core::crypto::KeyTypeId;
+use sp_core::{crypto::KeyTypeId, RuntimeDebug};
 use sp_staking::SessionIndex;
 use sp_std::vec::Vec;
 
diff --git a/primitives/staking/src/offence.rs b/primitives/staking/src/offence.rs
index ab72ecda042c..b9afda41c5e7 100644
--- a/primitives/staking/src/offence.rs
+++ b/primitives/staking/src/offence.rs
@@ -20,7 +20,7 @@
 
 use sp_std::vec::Vec;
 
-use codec::{Encode, Decode};
+use codec::{Decode, Encode};
 use sp_runtime::Perbill;
 
 use crate::SessionIndex;
@@ -84,10 +84,7 @@ pub trait Offence<Offender> {
 	///
 	/// `offenders_count` - the count of unique offending authorities. It is >0.
 	/// `validator_set_count` - the cardinality of the validator set at the time of offence.
-	fn slash_fraction(
-		offenders_count: u32,
-		validator_set_count: u32,
-	) -> Perbill;
+	fn slash_fraction(offenders_count: u32, validator_set_count: u32) -> Perbill;
 }
 
 /// Errors that may happen on offence reports.
@@ -108,7 +105,7 @@ impl sp_runtime::traits::Printable for OffenceError {
 			Self::Other(e) => {
 				"Other".print();
 				e.print();
-			}
+			},
 		}
 	}
 }
diff --git a/primitives/state-machine/src/backend.rs b/primitives/state-machine/src/backend.rs
index 0dc054ed5039..de4ff33b51fe 100644
--- a/primitives/state-machine/src/backend.rs
+++ b/primitives/state-machine/src/backend.rs
@@ -17,19 +17,16 @@
 
 //! State machine backends. These manage the code and storage of contracts.
 
-use hash_db::Hasher;
-use codec::{Decode, Encode};
-use sp_core::{
-	storage::{ChildInfo, well_known_keys, TrackedStorageKey}
-};
 use crate::{
-	trie_backend::TrieBackend,
-	trie_backend_essence::TrieBackendStorage,
-	UsageInfo, StorageKey, StorageValue, StorageCollection, ChildStorageCollection,
+	trie_backend::TrieBackend, trie_backend_essence::TrieBackendStorage, ChildStorageCollection,
+	StorageCollection, StorageKey, StorageValue, UsageInfo,
 };
-use sp_std::vec::Vec;
+use codec::{Decode, Encode};
+use hash_db::Hasher;
+use sp_core::storage::{well_known_keys, ChildInfo, TrackedStorageKey};
 #[cfg(feature = "std")]
 use sp_core::traits::RuntimeCode;
+use sp_std::vec::Vec;
 
 /// A state backend is used to read state data and can have changes committed
 /// to it.
@@ -90,7 +87,7 @@ pub trait Backend<H: Hasher>: sp_std::fmt::Debug {
 	fn next_child_storage_key(
 		&self,
 		child_info: &ChildInfo,
-		key: &[u8]
+		key: &[u8],
 	) -> Result<Option<StorageKey>, Self::Error>;
 
 	/// Iterate over storage starting at key, for a given prefix and child trie.
@@ -128,7 +125,6 @@ pub trait Backend<H: Hasher>: sp_std::fmt::Debug {
 	/// call `f` for each of those keys.
 	fn for_key_values_with_prefix<F: FnMut(&[u8], &[u8])>(&self, prefix: &[u8], f: F);
 
-
 	/// Retrieve all child entries keys which start with the given prefix and
 	/// call `f` for each of those keys.
 	fn for_child_keys_with_prefix<F: FnMut(&[u8])>(
@@ -143,8 +139,10 @@ pub trait Backend<H: Hasher>: sp_std::fmt::Debug {
 	/// Does not include child storage updates.
 	fn storage_root<'a>(
 		&self,
-		delta: impl Iterator<Item=(&'a [u8], Option<&'a [u8]>)>,
-	) -> (H::Out, Self::Transaction) where H::Out: Ord;
+		delta: impl Iterator<Item = (&'a [u8], Option<&'a [u8]>)>,
+	) -> (H::Out, Self::Transaction)
+	where
+		H::Out: Ord;
 
 	/// Calculate the child storage root, with given delta over what is already stored in
 	/// the backend, and produce a "transaction" that can be used to commit. The second argument
@@ -152,8 +150,10 @@ pub trait Backend<H: Hasher>: sp_std::fmt::Debug {
 	fn child_storage_root<'a>(
 		&self,
 		child_info: &ChildInfo,
-		delta: impl Iterator<Item=(&'a [u8], Option<&'a [u8]>)>,
-	) -> (H::Out, bool, Self::Transaction) where H::Out: Ord;
+		delta: impl Iterator<Item = (&'a [u8], Option<&'a [u8]>)>,
+	) -> (H::Out, bool, Self::Transaction)
+	where
+		H::Out: Ord;
 
 	/// Get all key/value pairs into a Vec.
 	fn pairs(&self) -> Vec<(StorageKey, StorageValue)>;
@@ -166,11 +166,7 @@ pub trait Backend<H: Hasher>: sp_std::fmt::Debug {
 	}
 
 	/// Get all keys of child storage with given prefix
-	fn child_keys(
-		&self,
-		child_info: &ChildInfo,
-		prefix: &[u8],
-	) -> Vec<StorageKey> {
+	fn child_keys(&self, child_info: &ChildInfo, prefix: &[u8]) -> Vec<StorageKey> {
 		let mut all = Vec::new();
 		self.for_child_keys_with_prefix(child_info, prefix, |k| all.push(k.to_vec()));
 		all
@@ -186,18 +182,19 @@ pub trait Backend<H: Hasher>: sp_std::fmt::Debug {
 	/// Does include child storage updates.
 	fn full_storage_root<'a>(
 		&self,
-		delta: impl Iterator<Item=(&'a [u8], Option<&'a [u8]>)>,
-		child_deltas: impl Iterator<Item = (
-			&'a ChildInfo,
-			impl Iterator<Item=(&'a [u8], Option<&'a [u8]>)>,
-		)>,
-	) -> (H::Out, Self::Transaction) where H::Out: Ord + Encode {
+		delta: impl Iterator<Item = (&'a [u8], Option<&'a [u8]>)>,
+		child_deltas: impl Iterator<
+			Item = (&'a ChildInfo, impl Iterator<Item = (&'a [u8], Option<&'a [u8]>)>),
+		>,
+	) -> (H::Out, Self::Transaction)
+	where
+		H::Out: Ord + Encode,
+	{
 		let mut txs: Self::Transaction = Default::default();
 		let mut child_roots: Vec<_> = Default::default();
 		// child first
 		for (child_info, child_delta) in child_deltas {
-			let (child_root, empty, child_txs) =
-				self.child_storage_root(&child_info, child_delta);
+			let (child_root, empty, child_txs) = self.child_storage_root(&child_info, child_delta);
 			let prefixed_storage_key = child_info.prefixed_storage_key();
 			txs.consolidate(child_txs);
 			if empty {
@@ -206,13 +203,10 @@ pub trait Backend<H: Hasher>: sp_std::fmt::Debug {
 				child_roots.push((prefixed_storage_key.into_inner(), Some(child_root.encode())));
 			}
 		}
-		let (root, parent_txs) = self.storage_root(delta
-			.map(|(k, v)| (k, v.as_ref().map(|v| &v[..])))
-			.chain(
-				child_roots
-					.iter()
-					.map(|(k, v)| (&k[..], v.as_ref().map(|v| &v[..])))
-			)
+		let (root, parent_txs) = self.storage_root(
+			delta
+				.map(|(k, v)| (k, v.as_ref().map(|v| &v[..])))
+				.chain(child_roots.iter().map(|(k, v)| (&k[..], v.as_ref().map(|v| &v[..])))),
 		);
 		txs.consolidate(parent_txs);
 		(root, txs)
@@ -286,10 +280,7 @@ impl Consolidate for () {
 	}
 }
 
-impl Consolidate for Vec<(
-		Option<ChildInfo>,
-		StorageCollection,
-	)> {
+impl Consolidate for Vec<(Option<ChildInfo>, StorageCollection)> {
 	fn consolidate(&mut self, mut other: Self) {
 		self.append(&mut other);
 	}
@@ -303,12 +294,15 @@ impl<H: Hasher, KF: sp_trie::KeyFunction<H>> Consolidate for sp_trie::GenericMem
 
 /// Insert input pairs into memory db.
 #[cfg(test)]
-pub(crate) fn insert_into_memory_db<H, I>(mdb: &mut sp_trie::MemoryDB<H>, input: I) -> Option<H::Out>
-	where
-		H: Hasher,
-		I: IntoIterator<Item=(StorageKey, StorageValue)>,
+pub(crate) fn insert_into_memory_db<H, I>(
+	mdb: &mut sp_trie::MemoryDB<H>,
+	input: I,
+) -> Option<H::Out>
+where
+	H: Hasher,
+	I: IntoIterator<Item = (StorageKey, StorageValue)>,
 {
-	use sp_trie::{TrieMut, trie_types::TrieDBMut};
+	use sp_trie::{trie_types::TrieDBMut, TrieMut};
 
 	let mut root = <H as Hasher>::Out::default();
 	{
@@ -316,7 +310,7 @@ pub(crate) fn insert_into_memory_db<H, I>(mdb: &mut sp_trie::MemoryDB<H>, input:
 		for (key, value) in input {
 			if let Err(e) = trie.insert(&key, &value) {
 				log::warn!(target: "trie", "Failed to write to trie: {}", e);
-				return None;
+				return None
 			}
 		}
 	}
@@ -332,8 +326,8 @@ pub struct BackendRuntimeCode<'a, B, H> {
 }
 
 #[cfg(feature = "std")]
-impl<'a, B: Backend<H>, H: Hasher> sp_core::traits::FetchRuntimeCode for
-	BackendRuntimeCode<'a, B, H>
+impl<'a, B: Backend<H>, H: Hasher> sp_core::traits::FetchRuntimeCode
+	for BackendRuntimeCode<'a, B, H>
 {
 	fn fetch_runtime_code<'b>(&'b self) -> Option<std::borrow::Cow<'b, [u8]>> {
 		self.backend.storage(well_known_keys::CODE).ok().flatten().map(Into::into)
@@ -341,23 +335,27 @@ impl<'a, B: Backend<H>, H: Hasher> sp_core::traits::FetchRuntimeCode for
 }
 
 #[cfg(feature = "std")]
-impl<'a, B: Backend<H>, H: Hasher> BackendRuntimeCode<'a, B, H> where H::Out: Encode {
+impl<'a, B: Backend<H>, H: Hasher> BackendRuntimeCode<'a, B, H>
+where
+	H::Out: Encode,
+{
 	/// Create a new instance.
 	pub fn new(backend: &'a B) -> Self {
-		Self {
-			backend,
-			_marker: std::marker::PhantomData,
-		}
+		Self { backend, _marker: std::marker::PhantomData }
 	}
 
 	/// Return the [`RuntimeCode`] build from the wrapped `backend`.
 	pub fn runtime_code(&self) -> Result<RuntimeCode, &'static str> {
-		let hash = self.backend.storage_hash(well_known_keys::CODE)
+		let hash = self
+			.backend
+			.storage_hash(well_known_keys::CODE)
 			.ok()
 			.flatten()
 			.ok_or("`:code` hash not found")?
 			.encode();
-		let heap_pages = self.backend.storage(well_known_keys::HEAP_PAGES)
+		let heap_pages = self
+			.backend
+			.storage(well_known_keys::HEAP_PAGES)
 			.ok()
 			.flatten()
 			.and_then(|d| Decode::decode(&mut &d[..]).ok());
diff --git a/primitives/state-machine/src/basic.rs b/primitives/state-machine/src/basic.rs
index 75b0c1c922e4..0bbd2d0a8e8e 100644
--- a/primitives/state-machine/src/basic.rs
+++ b/primitives/state-machine/src/basic.rs
@@ -17,23 +17,25 @@
 
 //! Basic implementation for Externalities.
 
-use std::{
-	collections::BTreeMap, any::{TypeId, Any}, iter::FromIterator, ops::Bound,
-};
 use crate::{Backend, StorageKey, StorageValue};
+use codec::Encode;
 use hash_db::Hasher;
-use sp_trie::{TrieConfiguration, empty_child_trie_root};
-use sp_trie::trie_types::Layout;
+use log::warn;
 use sp_core::{
 	storage::{
-		well_known_keys::is_child_storage_key, Storage,
-		ChildInfo, StorageChild, TrackedStorageKey,
+		well_known_keys::is_child_storage_key, ChildInfo, Storage, StorageChild, TrackedStorageKey,
 	},
-	traits::Externalities, Blake2Hasher,
+	traits::Externalities,
+	Blake2Hasher,
+};
+use sp_externalities::{Extension, Extensions};
+use sp_trie::{empty_child_trie_root, trie_types::Layout, TrieConfiguration};
+use std::{
+	any::{Any, TypeId},
+	collections::BTreeMap,
+	iter::FromIterator,
+	ops::Bound,
 };
-use log::warn;
-use codec::Encode;
-use sp_externalities::{Extensions, Extension};
 
 /// Simple Map-based Externalities impl.
 #[derive(Debug)]
@@ -105,13 +107,13 @@ impl BasicExternalities {
 
 impl PartialEq for BasicExternalities {
 	fn eq(&self, other: &BasicExternalities) -> bool {
-		self.inner.top.eq(&other.inner.top)
-			&& self.inner.children_default.eq(&other.inner.children_default)
+		self.inner.top.eq(&other.inner.top) &&
+			self.inner.children_default.eq(&other.inner.children_default)
 	}
 }
 
 impl FromIterator<(StorageKey, StorageValue)> for BasicExternalities {
-	fn from_iter<I: IntoIterator<Item=(StorageKey, StorageValue)>>(iter: I) -> Self {
+	fn from_iter<I: IntoIterator<Item = (StorageKey, StorageValue)>>(iter: I) -> Self {
 		let mut t = Self::default();
 		t.inner.top.extend(iter);
 		t
@@ -119,16 +121,15 @@ impl FromIterator<(StorageKey, StorageValue)> for BasicExternalities {
 }
 
 impl Default for BasicExternalities {
-	fn default() -> Self { Self::new(Default::default()) }
+	fn default() -> Self {
+		Self::new(Default::default())
+	}
 }
 
 impl From<BTreeMap<StorageKey, StorageValue>> for BasicExternalities {
 	fn from(hashmap: BTreeMap<StorageKey, StorageValue>) -> Self {
 		BasicExternalities {
-			inner: Storage {
-				top: hashmap,
-				children_default: Default::default(),
-			},
+			inner: Storage { top: hashmap, children_default: Default::default() },
 			extensions: Default::default(),
 		}
 	}
@@ -145,20 +146,15 @@ impl Externalities for BasicExternalities {
 		self.storage(key).map(|v| Blake2Hasher::hash(&v).encode())
 	}
 
-	fn child_storage(
-		&self,
-		child_info: &ChildInfo,
-		key: &[u8],
-	) -> Option<StorageValue> {
-		self.inner.children_default.get(child_info.storage_key())
-			.and_then(|child| child.data.get(key)).cloned()
+	fn child_storage(&self, child_info: &ChildInfo, key: &[u8]) -> Option<StorageValue> {
+		self.inner
+			.children_default
+			.get(child_info.storage_key())
+			.and_then(|child| child.data.get(key))
+			.cloned()
 	}
 
-	fn child_storage_hash(
-		&self,
-		child_info: &ChildInfo,
-		key: &[u8],
-	) -> Option<Vec<u8>> {
+	fn child_storage_hash(&self, child_info: &ChildInfo, key: &[u8]) -> Option<Vec<u8>> {
 		self.child_storage(child_info, key).map(|v| Blake2Hasher::hash(&v).encode())
 	}
 
@@ -167,25 +163,27 @@ impl Externalities for BasicExternalities {
 		self.inner.top.range::<[u8], _>(range).next().map(|(k, _)| k).cloned()
 	}
 
-	fn next_child_storage_key(
-		&self,
-		child_info: &ChildInfo,
-		key: &[u8],
-	) -> Option<StorageKey> {
+	fn next_child_storage_key(&self, child_info: &ChildInfo, key: &[u8]) -> Option<StorageKey> {
 		let range = (Bound::Excluded(key), Bound::Unbounded);
-		self.inner.children_default.get(child_info.storage_key())
+		self.inner
+			.children_default
+			.get(child_info.storage_key())
 			.and_then(|child| child.data.range::<[u8], _>(range).next().map(|(k, _)| k).cloned())
 	}
 
 	fn place_storage(&mut self, key: StorageKey, maybe_value: Option<StorageValue>) {
 		if is_child_storage_key(&key) {
 			warn!(target: "trie", "Refuse to set child storage key via main storage");
-			return;
+			return
 		}
 
 		match maybe_value {
-			Some(value) => { self.inner.top.insert(key, value); }
-			None => { self.inner.top.remove(&key); }
+			Some(value) => {
+				self.inner.top.insert(key, value);
+			},
+			None => {
+				self.inner.top.remove(&key);
+			},
 		}
 	}
 
@@ -195,7 +193,10 @@ impl Externalities for BasicExternalities {
 		key: StorageKey,
 		value: Option<StorageValue>,
 	) {
-		let child_map = self.inner.children_default.entry(child_info.storage_key().to_vec())
+		let child_map = self
+			.inner
+			.children_default
+			.entry(child_info.storage_key().to_vec())
 			.or_insert_with(|| StorageChild {
 				data: Default::default(),
 				child_info: child_info.to_owned(),
@@ -207,12 +208,13 @@ impl Externalities for BasicExternalities {
 		}
 	}
 
-	fn kill_child_storage(
-		&mut self,
-		child_info: &ChildInfo,
-		_limit: Option<u32>,
-	) -> (bool, u32) {
-		let num_removed = self.inner.children_default.remove(child_info.storage_key()).map(|c| c.data.len()).unwrap_or(0);
+	fn kill_child_storage(&mut self, child_info: &ChildInfo, _limit: Option<u32>) -> (bool, u32) {
+		let num_removed = self
+			.inner
+			.children_default
+			.remove(child_info.storage_key())
+			.map(|c| c.data.len())
+			.unwrap_or(0);
 		(true, num_removed as u32)
 	}
 
@@ -222,10 +224,13 @@ impl Externalities for BasicExternalities {
 				target: "trie",
 				"Refuse to clear prefix that is part of child storage key via main storage"
 			);
-			return (false, 0);
+			return (false, 0)
 		}
 
-		let to_remove = self.inner.top.range::<[u8], _>((Bound::Included(prefix), Bound::Unbounded))
+		let to_remove = self
+			.inner
+			.top
+			.range::<[u8], _>((Bound::Included(prefix), Bound::Unbounded))
 			.map(|(k, _)| k)
 			.take_while(|k| k.starts_with(prefix))
 			.cloned()
@@ -245,7 +250,9 @@ impl Externalities for BasicExternalities {
 		_limit: Option<u32>,
 	) -> (bool, u32) {
 		if let Some(child) = self.inner.children_default.get_mut(child_info.storage_key()) {
-			let to_remove = child.data.range::<[u8], _>((Bound::Included(prefix), Bound::Unbounded))
+			let to_remove = child
+				.data
+				.range::<[u8], _>((Bound::Included(prefix), Bound::Unbounded))
 				.map(|(k, _)| k)
 				.take_while(|k| k.starts_with(prefix))
 				.cloned()
@@ -261,20 +268,19 @@ impl Externalities for BasicExternalities {
 		}
 	}
 
-	fn storage_append(
-		&mut self,
-		key: Vec<u8>,
-		value: Vec<u8>,
-	) {
+	fn storage_append(&mut self, key: Vec<u8>, value: Vec<u8>) {
 		let current = self.inner.top.entry(key).or_default();
 		crate::ext::StorageAppend::new(current).append(value);
 	}
 
 	fn storage_root(&mut self) -> Vec<u8> {
 		let mut top = self.inner.top.clone();
-		let prefixed_keys: Vec<_> = self.inner.children_default.iter().map(|(_k, v)| {
-			(v.child_info.prefixed_storage_key(), v.child_info.clone())
-		}).collect();
+		let prefixed_keys: Vec<_> = self
+			.inner
+			.children_default
+			.iter()
+			.map(|(_k, v)| (v.child_info.prefixed_storage_key(), v.child_info.clone()))
+			.collect();
 		// Single child trie implementation currently allows using the same child
 		// empty root for all child trie. Using null storage key until multiple
 		// type of child trie support.
@@ -291,17 +297,16 @@ impl Externalities for BasicExternalities {
 		Layout::<Blake2Hasher>::trie_root(self.inner.top.clone()).as_ref().into()
 	}
 
-	fn child_storage_root(
-		&mut self,
-		child_info: &ChildInfo,
-	) -> Vec<u8> {
+	fn child_storage_root(&mut self, child_info: &ChildInfo) -> Vec<u8> {
 		if let Some(child) = self.inner.children_default.get(child_info.storage_key()) {
 			let delta = child.data.iter().map(|(k, v)| (k.as_ref(), Some(v.as_ref())));
 			crate::in_memory_backend::new_in_mem::<Blake2Hasher>()
-				.child_storage_root(&child.child_info, delta).0
+				.child_storage_root(&child.child_info, delta)
+				.0
 		} else {
 			empty_child_trie_root::<Layout<Blake2Hasher>>()
-		}.encode()
+		}
+		.encode()
 	}
 
 	fn storage_changes_root(&mut self, _parent: &[u8]) -> Result<Option<Vec<u8>>, ()> {
@@ -358,7 +363,10 @@ impl sp_externalities::ExtensionStore for BasicExternalities {
 		self.extensions.register_with_type_id(type_id, extension)
 	}
 
-	fn deregister_extension_by_type_id(&mut self, type_id: TypeId) -> Result<(), sp_externalities::Error> {
+	fn deregister_extension_by_type_id(
+		&mut self,
+		type_id: TypeId,
+	) -> Result<(), sp_externalities::Error> {
 		if self.extensions.deregister(type_id) {
 			Ok(())
 		} else {
@@ -370,10 +378,11 @@ impl sp_externalities::ExtensionStore for BasicExternalities {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use sp_core::map;
-	use sp_core::storage::{Storage, StorageChild};
-	use sp_core::storage::well_known_keys::CODE;
 	use hex_literal::hex;
+	use sp_core::{
+		map,
+		storage::{well_known_keys::CODE, Storage, StorageChild},
+	};
 
 	#[test]
 	fn commit_should_work() {
@@ -381,7 +390,8 @@ mod tests {
 		ext.set_storage(b"doe".to_vec(), b"reindeer".to_vec());
 		ext.set_storage(b"dog".to_vec(), b"puppy".to_vec());
 		ext.set_storage(b"dogglesworth".to_vec(), b"cat".to_vec());
-		const ROOT: [u8; 32] = hex!("39245109cef3758c2eed2ccba8d9b370a917850af3824bc8348d505df2c298fa");
+		const ROOT: [u8; 32] =
+			hex!("39245109cef3758c2eed2ccba8d9b370a917850af3824bc8348d505df2c298fa");
 
 		assert_eq!(&ext.storage_root()[..], &ROOT);
 	}
@@ -407,7 +417,7 @@ mod tests {
 					data: map![	b"doe".to_vec() => b"reindeer".to_vec()	],
 					child_info: child_info.to_owned(),
 				}
-			]
+			],
 		});
 
 		assert_eq!(ext.child_storage(child_info, b"doe"), Some(b"reindeer".to_vec()));
@@ -437,10 +447,9 @@ mod tests {
 					],
 					child_info: child_info.to_owned(),
 				}
-			]
+			],
 		});
 
-
 		let res = ext.kill_child_storage(child_info, None);
 		assert_eq!(res, (true, 3));
 	}
diff --git a/primitives/state-machine/src/changes_trie/build.rs b/primitives/state-machine/src/changes_trie/build.rs
index 38d1ab714e7f..2c75ac236bf3 100644
--- a/primitives/state-machine/src/changes_trie/build.rs
+++ b/primitives/state-machine/src/changes_trie/build.rs
@@ -17,23 +17,22 @@
 
 //! Structures and functions required to build changes trie for given block.
 
-use std::collections::BTreeMap;
-use std::collections::btree_map::Entry;
-use codec::{Decode, Encode};
-use hash_db::Hasher;
-use num_traits::One;
 use crate::{
-	StorageKey,
 	backend::Backend,
-	overlayed_changes::{OverlayedChanges, OverlayedValue},
-	trie_backend_essence::TrieBackendEssence,
 	changes_trie::{
-		AnchorBlockId, ConfigurationRange, Storage, BlockNumber,
 		build_iterator::digest_build_iterator,
-		input::{InputKey, InputPair, DigestIndex, ExtrinsicIndex, ChildIndex},
+		input::{ChildIndex, DigestIndex, ExtrinsicIndex, InputKey, InputPair},
+		AnchorBlockId, BlockNumber, ConfigurationRange, Storage,
 	},
+	overlayed_changes::{OverlayedChanges, OverlayedValue},
+	trie_backend_essence::TrieBackendEssence,
+	StorageKey,
 };
+use codec::{Decode, Encode};
+use hash_db::Hasher;
+use num_traits::One;
 use sp_core::storage::{ChildInfo, PrefixedStorageKey};
+use std::collections::{btree_map::Entry, BTreeMap};
 
 /// Prepare input pairs for building a changes trie of given block.
 ///
@@ -45,66 +44,59 @@ pub(crate) fn prepare_input<'a, B, H, Number>(
 	config: ConfigurationRange<'a, Number>,
 	overlay: &'a OverlayedChanges,
 	parent: &'a AnchorBlockId<H::Out, Number>,
-) -> Result<(
-		impl Iterator<Item=InputPair<Number>> + 'a,
-		Vec<(ChildIndex<Number>, impl Iterator<Item=InputPair<Number>> + 'a)>,
+) -> Result<
+	(
+		impl Iterator<Item = InputPair<Number>> + 'a,
+		Vec<(ChildIndex<Number>, impl Iterator<Item = InputPair<Number>> + 'a)>,
 		Vec<Number>,
-	), String>
-	where
-		B: Backend<H>,
-		H: Hasher + 'a,
-		H::Out: Encode,
-		Number: BlockNumber,
+	),
+	String,
+>
+where
+	B: Backend<H>,
+	H: Hasher + 'a,
+	H::Out: Encode,
+	Number: BlockNumber,
 {
 	let number = parent.number.clone() + One::one();
-	let (extrinsics_input, children_extrinsics_input) = prepare_extrinsics_input(
-		backend,
-		&number,
-		overlay,
-	)?;
-	let (digest_input, mut children_digest_input, digest_input_blocks) = prepare_digest_input::<H, Number>(
-		parent,
-		config,
-		number,
-		storage,
-	)?;
+	let (extrinsics_input, children_extrinsics_input) =
+		prepare_extrinsics_input(backend, &number, overlay)?;
+	let (digest_input, mut children_digest_input, digest_input_blocks) =
+		prepare_digest_input::<H, Number>(parent, config, number, storage)?;
 
 	let mut children_digest = Vec::with_capacity(children_extrinsics_input.len());
 	for (child_index, ext_iter) in children_extrinsics_input.into_iter() {
 		let dig_iter = children_digest_input.remove(&child_index);
 		children_digest.push((
 			child_index,
-			Some(ext_iter).into_iter().flatten()
-				.chain(dig_iter.into_iter().flatten()),
+			Some(ext_iter).into_iter().flatten().chain(dig_iter.into_iter().flatten()),
 		));
 	}
 	for (child_index, dig_iter) in children_digest_input.into_iter() {
 		children_digest.push((
 			child_index,
-			None.into_iter().flatten()
-				.chain(Some(dig_iter).into_iter().flatten()),
+			None.into_iter().flatten().chain(Some(dig_iter).into_iter().flatten()),
 		));
 	}
 
-	Ok((
-		extrinsics_input.chain(digest_input),
-		children_digest,
-		digest_input_blocks,
-	))
+	Ok((extrinsics_input.chain(digest_input), children_digest, digest_input_blocks))
 }
 /// Prepare ExtrinsicIndex input pairs.
 fn prepare_extrinsics_input<'a, B, H, Number>(
 	backend: &'a B,
 	block: &Number,
 	overlay: &'a OverlayedChanges,
-) -> Result<(
-		impl Iterator<Item=InputPair<Number>> + 'a,
-		BTreeMap<ChildIndex<Number>, impl Iterator<Item=InputPair<Number>> + 'a>,
-	), String>
-	where
-		B: Backend<H>,
-		H: Hasher + 'a,
-		Number: BlockNumber,
+) -> Result<
+	(
+		impl Iterator<Item = InputPair<Number>> + 'a,
+		BTreeMap<ChildIndex<Number>, impl Iterator<Item = InputPair<Number>> + 'a>,
+	),
+	String,
+>
+where
+	B: Backend<H>,
+	H: Hasher + 'a,
+	Number: BlockNumber,
 {
 	let mut children_result = BTreeMap::new();
 
@@ -115,7 +107,9 @@ fn prepare_extrinsics_input<'a, B, H, Number>(
 		};
 
 		let iter = prepare_extrinsics_input_inner(
-			backend, block, overlay,
+			backend,
+			block,
+			overlay,
 			Some(child_info.clone()),
 			child_changes,
 		)?;
@@ -132,12 +126,12 @@ fn prepare_extrinsics_input_inner<'a, B, H, Number>(
 	block: &Number,
 	overlay: &'a OverlayedChanges,
 	child_info: Option<ChildInfo>,
-	changes: impl Iterator<Item=(&'a StorageKey, &'a OverlayedValue)>
-) -> Result<impl Iterator<Item=InputPair<Number>> + 'a, String>
-	where
-		B: Backend<H>,
-		H: Hasher,
-		Number: BlockNumber,
+	changes: impl Iterator<Item = (&'a StorageKey, &'a OverlayedValue)>,
+) -> Result<impl Iterator<Item = InputPair<Number>> + 'a, String>
+where
+	B: Backend<H>,
+	H: Hasher,
+	Number: BlockNumber,
 {
 	changes
 		.filter_map(|(k, v)| {
@@ -148,68 +142,79 @@ fn prepare_extrinsics_input_inner<'a, B, H, Number>(
 				None
 			}
 		})
-		.try_fold(BTreeMap::new(), |mut map: BTreeMap<&[u8], (ExtrinsicIndex<Number>, Vec<u32>)>, (k, extrinsics)| {
-			match map.entry(k) {
-				Entry::Vacant(entry) => {
-					// ignore temporary values (values that have null value at the end of operation
-					// AND are not in storage at the beginning of operation
-					if let Some(child_info) = child_info.as_ref() {
-						if !overlay.child_storage(child_info, k).map(|v| v.is_some()).unwrap_or_default() {
-							if !backend.exists_child_storage(&child_info, k)
-								.map_err(|e| format!("{}", e))? {
-								return Ok(map);
+		.try_fold(
+			BTreeMap::new(),
+			|mut map: BTreeMap<&[u8], (ExtrinsicIndex<Number>, Vec<u32>)>, (k, extrinsics)| {
+				match map.entry(k) {
+					Entry::Vacant(entry) => {
+						// ignore temporary values (values that have null value at the end of operation
+						// AND are not in storage at the beginning of operation
+						if let Some(child_info) = child_info.as_ref() {
+							if !overlay
+								.child_storage(child_info, k)
+								.map(|v| v.is_some())
+								.unwrap_or_default()
+							{
+								if !backend
+									.exists_child_storage(&child_info, k)
+									.map_err(|e| format!("{}", e))?
+								{
+									return Ok(map)
+								}
 							}
-						}
-					} else {
-						if !overlay.storage(k).map(|v| v.is_some()).unwrap_or_default() {
-							if !backend.exists_storage(k).map_err(|e| format!("{}", e))? {
-								return Ok(map);
+						} else {
+							if !overlay.storage(k).map(|v| v.is_some()).unwrap_or_default() {
+								if !backend.exists_storage(k).map_err(|e| format!("{}", e))? {
+									return Ok(map)
+								}
 							}
-						}
-					};
-
-					let extrinsics = extrinsics.into_iter().collect();
-					entry.insert((ExtrinsicIndex {
-						block: block.clone(),
-						key: k.to_vec(),
-					}, extrinsics));
-				},
-				Entry::Occupied(mut entry) => {
-					// we do not need to check for temporary values here, because entry is Occupied
-					// AND we are checking it before insertion
-					let entry_extrinsics = &mut entry.get_mut().1;
-					entry_extrinsics.extend(
-						extrinsics.into_iter()
-					);
-					entry_extrinsics.sort();
-				},
-			}
+						};
 
-			Ok(map)
-		})
+						let extrinsics = extrinsics.into_iter().collect();
+						entry.insert((
+							ExtrinsicIndex { block: block.clone(), key: k.to_vec() },
+							extrinsics,
+						));
+					},
+					Entry::Occupied(mut entry) => {
+						// we do not need to check for temporary values here, because entry is Occupied
+						// AND we are checking it before insertion
+						let entry_extrinsics = &mut entry.get_mut().1;
+						entry_extrinsics.extend(extrinsics.into_iter());
+						entry_extrinsics.sort();
+					},
+				}
+
+				Ok(map)
+			},
+		)
 		.map(|pairs| pairs.into_iter().map(|(_, (k, v))| InputPair::ExtrinsicIndex(k, v)))
 }
 
-
 /// Prepare DigestIndex input pairs.
 fn prepare_digest_input<'a, H, Number>(
 	parent: &'a AnchorBlockId<H::Out, Number>,
 	config: ConfigurationRange<Number>,
 	block: Number,
 	storage: &'a dyn Storage<H, Number>,
-) -> Result<(
-		impl Iterator<Item=InputPair<Number>> + 'a,
-		BTreeMap<ChildIndex<Number>, impl Iterator<Item=InputPair<Number>> + 'a>,
+) -> Result<
+	(
+		impl Iterator<Item = InputPair<Number>> + 'a,
+		BTreeMap<ChildIndex<Number>, impl Iterator<Item = InputPair<Number>> + 'a>,
 		Vec<Number>,
-	), String>
-	where
-		H: Hasher,
-		H::Out: 'a + Encode,
-		Number: BlockNumber,
+	),
+	String,
+>
+where
+	H: Hasher,
+	H::Out: 'a + Encode,
+	Number: BlockNumber,
 {
 	let build_skewed_digest = config.end.as_ref() == Some(&block);
 	let block_for_digest = if build_skewed_digest {
-		config.config.next_max_level_digest_range(config.zero.clone(), block.clone())
+		config
+			.config
+			.next_max_level_digest_range(config.zero.clone(), block.clone())
 			.map(|(_, end)| end)
 			.unwrap_or_else(|| block.clone())
 	} else {
@@ -217,128 +222,158 @@ fn prepare_digest_input<'a, H, Number>(
 	};
 
 	let digest_input_blocks = digest_build_iterator(config, block_for_digest).collect::<Vec<_>>();
-	digest_input_blocks.clone().into_iter()
+	digest_input_blocks
+		.clone()
+		.into_iter()
 		.try_fold(
-			(BTreeMap::new(), BTreeMap::new()), move |(mut map, mut child_map), digest_build_block| {
-			let extrinsic_prefix = ExtrinsicIndex::key_neutral_prefix(digest_build_block.clone());
-			let digest_prefix = DigestIndex::key_neutral_prefix(digest_build_block.clone());
-			let child_prefix = ChildIndex::key_neutral_prefix(digest_build_block.clone());
-			let trie_root = storage.root(parent, digest_build_block.clone())?;
-			let trie_root = trie_root.ok_or_else(|| format!("No changes trie root for block {}", digest_build_block.clone()))?;
-
-			let insert_to_map = |map: &mut BTreeMap<_,_>, key: StorageKey| {
-				match map.entry(key.clone()) {
-					Entry::Vacant(entry) => {
-						entry.insert((DigestIndex {
-							block: block.clone(),
-							key,
-						}, vec![digest_build_block.clone()]));
-					},
-					Entry::Occupied(mut entry) => {
-						// DigestIndexValue must be sorted. Here we are relying on the fact that digest_build_iterator()
-						// returns blocks in ascending order => we only need to check for duplicates
-						//
-						// is_dup_block could be true when key has been changed in both digest block
-						// AND other blocks that it covers
-						let is_dup_block = entry.get().1.last() == Some(&digest_build_block);
-						if !is_dup_block {
-							entry.get_mut().1.push(digest_build_block.clone());
-						}
-					},
-				}
-			};
-
-			// try to get all updated keys from cache
-			let populated_from_cache = storage.with_cached_changed_keys(
-				&trie_root,
-				&mut |changed_keys| {
-					for (storage_key, changed_keys) in changed_keys {
-						let map = match storage_key {
-							Some(storage_key) => child_map
-								.entry(ChildIndex::<Number> {
-									block: block.clone(),
-									storage_key: storage_key.clone(),
-								})
-								.or_default(),
-							None => &mut map,
-						};
-						for changed_key in changed_keys.iter().cloned() {
-							insert_to_map(map, changed_key);
-						}
+			(BTreeMap::new(), BTreeMap::new()),
+			move |(mut map, mut child_map), digest_build_block| {
+				let extrinsic_prefix =
+					ExtrinsicIndex::key_neutral_prefix(digest_build_block.clone());
+				let digest_prefix = DigestIndex::key_neutral_prefix(digest_build_block.clone());
+				let child_prefix = ChildIndex::key_neutral_prefix(digest_build_block.clone());
+				let trie_root = storage.root(parent, digest_build_block.clone())?;
+				let trie_root = trie_root.ok_or_else(|| {
+					format!("No changes trie root for block {}", digest_build_block.clone())
+				})?;
+
+				let insert_to_map = |map: &mut BTreeMap<_, _>, key: StorageKey| {
+					match map.entry(key.clone()) {
+						Entry::Vacant(entry) => {
+							entry.insert((
+								DigestIndex { block: block.clone(), key },
+								vec![digest_build_block.clone()],
+							));
+						},
+						Entry::Occupied(mut entry) => {
+							// DigestIndexValue must be sorted. Here we are relying on the fact that digest_build_iterator()
+							// returns blocks in ascending order => we only need to check for duplicates
+							//
+							// is_dup_block could be true when key has been changed in both digest block
+							// AND other blocks that it covers
+							let is_dup_block = entry.get().1.last() == Some(&digest_build_block);
+							if !is_dup_block {
+								entry.get_mut().1.push(digest_build_block.clone());
+							}
+						},
 					}
+				};
+
+				// try to get all updated keys from cache
+				let populated_from_cache =
+					storage.with_cached_changed_keys(&trie_root, &mut |changed_keys| {
+						for (storage_key, changed_keys) in changed_keys {
+							let map = match storage_key {
+								Some(storage_key) => child_map
+									.entry(ChildIndex::<Number> {
+										block: block.clone(),
+										storage_key: storage_key.clone(),
+									})
+									.or_default(),
+								None => &mut map,
+							};
+							for changed_key in changed_keys.iter().cloned() {
+								insert_to_map(map, changed_key);
+							}
+						}
+					});
+				if populated_from_cache {
+					return Ok((map, child_map))
 				}
-			);
-			if populated_from_cache {
-				return Ok((map, child_map));
-			}
 
-			let mut children_roots = BTreeMap::<PrefixedStorageKey, _>::new();
-			{
-				let trie_storage = TrieBackendEssence::<_, H>::new(
-					crate::changes_trie::TrieBackendStorageAdapter(storage),
-					trie_root,
-				);
-
-				trie_storage.for_key_values_with_prefix(&child_prefix, |mut key, mut value|
-					if let Ok(InputKey::ChildIndex::<Number>(trie_key)) = Decode::decode(&mut key) {
-						if let Ok(value) = <Vec<u8>>::decode(&mut value) {
-							let mut trie_root = <H as Hasher>::Out::default();
-							trie_root.as_mut().copy_from_slice(&value[..]);
-							children_roots.insert(trie_key.storage_key, trie_root);
+				let mut children_roots = BTreeMap::<PrefixedStorageKey, _>::new();
+				{
+					let trie_storage = TrieBackendEssence::<_, H>::new(
+						crate::changes_trie::TrieBackendStorageAdapter(storage),
+						trie_root,
+					);
+
+					trie_storage.for_key_values_with_prefix(&child_prefix, |mut key, mut value| {
+						if let Ok(InputKey::ChildIndex::<Number>(trie_key)) =
+							Decode::decode(&mut key)
+						{
+							if let Ok(value) = <Vec<u8>>::decode(&mut value) {
+								let mut trie_root = <H as Hasher>::Out::default();
+								trie_root.as_mut().copy_from_slice(&value[..]);
+								children_roots.insert(trie_key.storage_key, trie_root);
+							}
 						}
 					});
 
-				trie_storage.for_keys_with_prefix(&extrinsic_prefix, |mut key|
-					if let Ok(InputKey::ExtrinsicIndex::<Number>(trie_key)) = Decode::decode(&mut key) {
-						insert_to_map(&mut map, trie_key.key);
+					trie_storage.for_keys_with_prefix(&extrinsic_prefix, |mut key| {
+						if let Ok(InputKey::ExtrinsicIndex::<Number>(trie_key)) =
+							Decode::decode(&mut key)
+						{
+							insert_to_map(&mut map, trie_key.key);
+						}
 					});
 
-				trie_storage.for_keys_with_prefix(&digest_prefix, |mut key|
-					if let Ok(InputKey::DigestIndex::<Number>(trie_key)) = Decode::decode(&mut key) {
-						insert_to_map(&mut map, trie_key.key);
+					trie_storage.for_keys_with_prefix(&digest_prefix, |mut key| {
+						if let Ok(InputKey::DigestIndex::<Number>(trie_key)) =
+							Decode::decode(&mut key)
+						{
+							insert_to_map(&mut map, trie_key.key);
+						}
 					});
-			}
+				}
 
-			for (storage_key, trie_root) in children_roots.into_iter() {
-				let child_index = ChildIndex::<Number> {
-					block: block.clone(),
-					storage_key,
-				};
+				for (storage_key, trie_root) in children_roots.into_iter() {
+					let child_index = ChildIndex::<Number> { block: block.clone(), storage_key };
 
-				let mut map = child_map.entry(child_index).or_default();
-				let trie_storage = TrieBackendEssence::<_, H>::new(
-					crate::changes_trie::TrieBackendStorageAdapter(storage),
-					trie_root,
-				);
-				trie_storage.for_keys_with_prefix(&extrinsic_prefix, |mut key|
-					if let Ok(InputKey::ExtrinsicIndex::<Number>(trie_key)) = Decode::decode(&mut key) {
-						insert_to_map(&mut map, trie_key.key);
+					let mut map = child_map.entry(child_index).or_default();
+					let trie_storage = TrieBackendEssence::<_, H>::new(
+						crate::changes_trie::TrieBackendStorageAdapter(storage),
+						trie_root,
+					);
+					trie_storage.for_keys_with_prefix(&extrinsic_prefix, |mut key| {
+						if let Ok(InputKey::ExtrinsicIndex::<Number>(trie_key)) =
+							Decode::decode(&mut key)
+						{
+							insert_to_map(&mut map, trie_key.key);
+						}
 					});
 
-				trie_storage.for_keys_with_prefix(&digest_prefix, |mut key|
-					if let Ok(InputKey::DigestIndex::<Number>(trie_key)) = Decode::decode(&mut key) {
-						insert_to_map(&mut map, trie_key.key);
+					trie_storage.for_keys_with_prefix(&digest_prefix, |mut key| {
+						if let Ok(InputKey::DigestIndex::<Number>(trie_key)) =
+							Decode::decode(&mut key)
+						{
+							insert_to_map(&mut map, trie_key.key);
+						}
 					});
-			}
-			Ok((map, child_map))
+				}
+				Ok((map, child_map))
+			},
+		)
+		.map(|(pairs, child_pairs)| {
+			(
+				pairs.into_iter().map(|(_, (k, v))| InputPair::DigestIndex(k, v)),
+				child_pairs
+					.into_iter()
+					.map(|(sk, pairs)| {
+						(sk, pairs.into_iter().map(|(_, (k, v))| InputPair::DigestIndex(k, v)))
+					})
+					.collect(),
+				digest_input_blocks,
+			)
 		})
-		.map(|(pairs, child_pairs)| (
-			pairs.into_iter().map(|(_, (k, v))| InputPair::DigestIndex(k, v)),
-			child_pairs.into_iter().map(|(sk, pairs)|
-				(sk, pairs.into_iter().map(|(_, (k, v))| InputPair::DigestIndex(k, v)))).collect(),
-			digest_input_blocks,
-		))
 }
 
 #[cfg(test)]
 mod test {
-	use sp_core::Blake2Hasher;
-	use crate::InMemoryBackend;
-	use crate::changes_trie::{RootsStorage, Configuration, storage::InMemoryStorage};
-	use crate::changes_trie::build_cache::{IncompleteCacheAction, IncompleteCachedBuildData};
 	use super::*;
+	use crate::{
+		changes_trie::{
+			build_cache::{IncompleteCacheAction, IncompleteCachedBuildData},
+			storage::InMemoryStorage,
+			Configuration, RootsStorage,
+		},
+		InMemoryBackend,
+	};
+	use sp_core::Blake2Hasher;
 
-	fn prepare_for_build(zero: u64) -> (
+	fn prepare_for_build(
+		zero: u64,
+	) -> (
 		InMemoryBackend<Blake2Hasher>,
 		InMemoryStorage<Blake2Hasher, u64>,
 		OverlayedChanges,
@@ -353,57 +388,150 @@ mod test {
 			(vec![103], vec![255]),
 			(vec![104], vec![255]),
 			(vec![105], vec![255]),
-		].into_iter().collect::<std::collections::BTreeMap<_, _>>().into();
+		]
+		.into_iter()
+		.collect::<std::collections::BTreeMap<_, _>>()
+		.into();
 		let prefixed_child_trie_key1 = child_info_1.prefixed_storage_key();
-		let storage = InMemoryStorage::with_inputs(vec![
-			(zero + 1, vec![
-				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 1, key: vec![100] }, vec![1, 3]),
-				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 1, key: vec![101] }, vec![0, 2]),
-				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 1, key: vec![105] }, vec![0, 2, 4]),
-			]),
-			(zero + 2, vec![
-				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 2, key: vec![102] }, vec![0]),
-			]),
-			(zero + 3, vec![
-				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 3, key: vec![100] }, vec![0]),
-				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 3, key: vec![105] }, vec![1]),
-			]),
-			(zero + 4, vec![
-				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 4, key: vec![100] }, vec![0, 2, 3]),
-				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 4, key: vec![101] }, vec![1]),
-				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 4, key: vec![103] }, vec![0, 1]),
-
-				InputPair::DigestIndex(DigestIndex { block: zero + 4, key: vec![100] }, vec![zero + 1, zero + 3]),
-				InputPair::DigestIndex(DigestIndex { block: zero + 4, key: vec![101] }, vec![zero + 1]),
-				InputPair::DigestIndex(DigestIndex { block: zero + 4, key: vec![102] }, vec![zero + 2]),
-				InputPair::DigestIndex(DigestIndex { block: zero + 4, key: vec![105] }, vec![zero + 1, zero + 3]),
-			]),
-			(zero + 5, Vec::new()),
-			(zero + 6, vec![
-				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 6, key: vec![105] }, vec![2]),
-			]),
-			(zero + 7, Vec::new()),
-			(zero + 8, vec![
-				InputPair::DigestIndex(DigestIndex { block: zero + 8, key: vec![105] }, vec![zero + 6]),
-			]),
-			(zero + 9, Vec::new()), (zero + 10, Vec::new()), (zero + 11, Vec::new()), (zero + 12, Vec::new()),
-			(zero + 13, Vec::new()), (zero + 14, Vec::new()), (zero + 15, Vec::new()),
-		], vec![(prefixed_child_trie_key1.clone(), vec![
-				(zero + 1, vec![
-					InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 1, key: vec![100] }, vec![1, 3]),
-					InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 1, key: vec![101] }, vec![0, 2]),
-					InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 1, key: vec![105] }, vec![0, 2, 4]),
-				]),
-				(zero + 2, vec![
-					InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 2, key: vec![102] }, vec![0]),
-				]),
-				(zero + 4, vec![
-					InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 2, key: vec![102] }, vec![0, 3]),
-
-					InputPair::DigestIndex(DigestIndex { block: zero + 4, key: vec![102] }, vec![zero + 2]),
-				]),
-			]),
-		]);
+		let storage = InMemoryStorage::with_inputs(
+			vec![
+				(
+					zero + 1,
+					vec![
+						InputPair::ExtrinsicIndex(
+							ExtrinsicIndex { block: zero + 1, key: vec![100] },
+							vec![1, 3],
+						),
+						InputPair::ExtrinsicIndex(
+							ExtrinsicIndex { block: zero + 1, key: vec![101] },
+							vec![0, 2],
+						),
+						InputPair::ExtrinsicIndex(
+							ExtrinsicIndex { block: zero + 1, key: vec![105] },
+							vec![0, 2, 4],
+						),
+					],
+				),
+				(
+					zero + 2,
+					vec![InputPair::ExtrinsicIndex(
+						ExtrinsicIndex { block: zero + 2, key: vec![102] },
+						vec![0],
+					)],
+				),
+				(
+					zero + 3,
+					vec![
+						InputPair::ExtrinsicIndex(
+							ExtrinsicIndex { block: zero + 3, key: vec![100] },
+							vec![0],
+						),
+						InputPair::ExtrinsicIndex(
+							ExtrinsicIndex { block: zero + 3, key: vec![105] },
+							vec![1],
+						),
+					],
+				),
+				(
+					zero + 4,
+					vec![
+						InputPair::ExtrinsicIndex(
+							ExtrinsicIndex { block: zero + 4, key: vec![100] },
+							vec![0, 2, 3],
+						),
+						InputPair::ExtrinsicIndex(
+							ExtrinsicIndex { block: zero + 4, key: vec![101] },
+							vec![1],
+						),
+						InputPair::ExtrinsicIndex(
+							ExtrinsicIndex { block: zero + 4, key: vec![103] },
+							vec![0, 1],
+						),
+						InputPair::DigestIndex(
+							DigestIndex { block: zero + 4, key: vec![100] },
+							vec![zero + 1, zero + 3],
+						),
+						InputPair::DigestIndex(
+							DigestIndex { block: zero + 4, key: vec![101] },
+							vec![zero + 1],
+						),
+						InputPair::DigestIndex(
+							DigestIndex { block: zero + 4, key: vec![102] },
+							vec![zero + 2],
+						),
+						InputPair::DigestIndex(
+							DigestIndex { block: zero + 4, key: vec![105] },
+							vec![zero + 1, zero + 3],
+						),
+					],
+				),
+				(zero + 5, Vec::new()),
+				(
+					zero + 6,
+					vec![InputPair::ExtrinsicIndex(
+						ExtrinsicIndex { block: zero + 6, key: vec![105] },
+						vec![2],
+					)],
+				),
+				(zero + 7, Vec::new()),
+				(
+					zero + 8,
+					vec![InputPair::DigestIndex(
+						DigestIndex { block: zero + 8, key: vec![105] },
+						vec![zero + 6],
+					)],
+				),
+				(zero + 9, Vec::new()),
+				(zero + 10, Vec::new()),
+				(zero + 11, Vec::new()),
+				(zero + 12, Vec::new()),
+				(zero + 13, Vec::new()),
+				(zero + 14, Vec::new()),
+				(zero + 15, Vec::new()),
+			],
+			vec![(
+				prefixed_child_trie_key1.clone(),
+				vec![
+					(
+						zero + 1,
+						vec![
+							InputPair::ExtrinsicIndex(
+								ExtrinsicIndex { block: zero + 1, key: vec![100] },
+								vec![1, 3],
+							),
+							InputPair::ExtrinsicIndex(
+								ExtrinsicIndex { block: zero + 1, key: vec![101] },
+								vec![0, 2],
+							),
+							InputPair::ExtrinsicIndex(
+								ExtrinsicIndex { block: zero + 1, key: vec![105] },
+								vec![0, 2, 4],
+							),
+						],
+					),
+					(
+						zero + 2,
+						vec![InputPair::ExtrinsicIndex(
+							ExtrinsicIndex { block: zero + 2, key: vec![102] },
+							vec![0],
+						)],
+					),
+					(
+						zero + 4,
+						vec![
+							InputPair::ExtrinsicIndex(
+								ExtrinsicIndex { block: zero + 2, key: vec![102] },
+								vec![0, 3],
+							),
+							InputPair::DigestIndex(
+								DigestIndex { block: zero + 4, key: vec![102] },
+								vec![zero + 2],
+							),
+						],
+					),
+				],
+			)],
+		);
 
 		let mut changes = OverlayedChanges::default();
 		changes.set_collect_extrinsics(true);
@@ -446,12 +574,11 @@ mod test {
 		(backend, storage, changes, config)
 	}
 
-	fn configuration_range<'a>(config: &'a Configuration, zero: u64) -> ConfigurationRange<'a, u64> {
-		ConfigurationRange {
-			config,
-			zero,
-			end: None,
-		}
+	fn configuration_range<'a>(
+		config: &'a Configuration,
+		zero: u64,
+	) -> ConfigurationRange<'a, u64> {
+		ConfigurationRange { config, zero, end: None }
 	}
 
 	#[test]
@@ -467,24 +594,48 @@ mod test {
 				configuration_range(&config, zero),
 				&changes,
 				&parent,
-			).unwrap();
-			assert_eq!(changes_trie_nodes.0.collect::<Vec<InputPair<u64>>>(), vec![
-				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 5, key: vec![100] }, vec![0, 2, 3]),
-				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 5, key: vec![101] }, vec![1]),
-				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 5, key: vec![103] }, vec![0, 1]),
-			]);
-			assert_eq!(changes_trie_nodes.1.into_iter()
-				.map(|(k,v)| (k, v.collect::<Vec<_>>())).collect::<Vec<_>>(), vec![
-				(ChildIndex { block: zero + 5u64, storage_key: child_trie_key1 },
-					vec![
-						InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 5u64, key: vec![100] }, vec![0, 2, 3]),
-					]),
-				(ChildIndex { block: zero + 5, storage_key: child_trie_key2 },
-					vec![
-						InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 5, key: vec![100] }, vec![0, 2]),
-					]),
-			]);
-
+			)
+			.unwrap();
+			assert_eq!(
+				changes_trie_nodes.0.collect::<Vec<InputPair<u64>>>(),
+				vec![
+					InputPair::ExtrinsicIndex(
+						ExtrinsicIndex { block: zero + 5, key: vec![100] },
+						vec![0, 2, 3]
+					),
+					InputPair::ExtrinsicIndex(
+						ExtrinsicIndex { block: zero + 5, key: vec![101] },
+						vec![1]
+					),
+					InputPair::ExtrinsicIndex(
+						ExtrinsicIndex { block: zero + 5, key: vec![103] },
+						vec![0, 1]
+					),
+				]
+			);
+			assert_eq!(
+				changes_trie_nodes
+					.1
+					.into_iter()
+					.map(|(k, v)| (k, v.collect::<Vec<_>>()))
+					.collect::<Vec<_>>(),
+				vec![
+					(
+						ChildIndex { block: zero + 5u64, storage_key: child_trie_key1 },
+						vec![InputPair::ExtrinsicIndex(
+							ExtrinsicIndex { block: zero + 5u64, key: vec![100] },
+							vec![0, 2, 3]
+						),]
+					),
+					(
+						ChildIndex { block: zero + 5, storage_key: child_trie_key2 },
+						vec![InputPair::ExtrinsicIndex(
+							ExtrinsicIndex { block: zero + 5, key: vec![100] },
+							vec![0, 2]
+						),]
+					),
+				]
+			);
 		}
 
 		test_with_zero(0);
@@ -505,33 +656,82 @@ mod test {
 				configuration_range(&config, zero),
 				&changes,
 				&parent,
-			).unwrap();
-			assert_eq!(changes_trie_nodes.0.collect::<Vec<InputPair<u64>>>(), vec![
-				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 4, key: vec![100] }, vec![0, 2, 3]),
-				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 4, key: vec![101] }, vec![1]),
-				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 4, key: vec![103] }, vec![0, 1]),
-
-				InputPair::DigestIndex(DigestIndex { block: zero + 4, key: vec![100] }, vec![zero + 1, zero + 3]),
-				InputPair::DigestIndex(DigestIndex { block: zero + 4, key: vec![101] }, vec![zero + 1]),
-				InputPair::DigestIndex(DigestIndex { block: zero + 4, key: vec![102] }, vec![zero + 2]),
-				InputPair::DigestIndex(DigestIndex { block: zero + 4, key: vec![105] }, vec![zero + 1, zero + 3]),
-			]);
-			assert_eq!(changes_trie_nodes.1.into_iter()
-				.map(|(k,v)| (k, v.collect::<Vec<_>>())).collect::<Vec<_>>(), vec![
-				(ChildIndex { block: zero + 4u64, storage_key: child_trie_key1.clone() },
-					vec![
-						InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 4u64, key: vec![100] }, vec![0, 2, 3]),
-
-						InputPair::DigestIndex(DigestIndex { block: zero + 4, key: vec![100] }, vec![zero + 1]),
-						InputPair::DigestIndex(DigestIndex { block: zero + 4, key: vec![101] }, vec![zero + 1]),
-						InputPair::DigestIndex(DigestIndex { block: zero + 4, key: vec![102] }, vec![zero + 2]),
-						InputPair::DigestIndex(DigestIndex { block: zero + 4, key: vec![105] }, vec![zero + 1]),
-					]),
-				(ChildIndex { block: zero + 4, storage_key: child_trie_key2.clone() },
-					vec![
-						InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 4, key: vec![100] }, vec![0, 2]),
-					]),
-			]);
+			)
+			.unwrap();
+			assert_eq!(
+				changes_trie_nodes.0.collect::<Vec<InputPair<u64>>>(),
+				vec![
+					InputPair::ExtrinsicIndex(
+						ExtrinsicIndex { block: zero + 4, key: vec![100] },
+						vec![0, 2, 3]
+					),
+					InputPair::ExtrinsicIndex(
+						ExtrinsicIndex { block: zero + 4, key: vec![101] },
+						vec![1]
+					),
+					InputPair::ExtrinsicIndex(
+						ExtrinsicIndex { block: zero + 4, key: vec![103] },
+						vec![0, 1]
+					),
+					InputPair::DigestIndex(
+						DigestIndex { block: zero + 4, key: vec![100] },
+						vec![zero + 1, zero + 3]
+					),
+					InputPair::DigestIndex(
+						DigestIndex { block: zero + 4, key: vec![101] },
+						vec![zero + 1]
+					),
+					InputPair::DigestIndex(
+						DigestIndex { block: zero + 4, key: vec![102] },
+						vec![zero + 2]
+					),
+					InputPair::DigestIndex(
+						DigestIndex { block: zero + 4, key: vec![105] },
+						vec![zero + 1, zero + 3]
+					),
+				]
+			);
+			assert_eq!(
+				changes_trie_nodes
+					.1
+					.into_iter()
+					.map(|(k, v)| (k, v.collect::<Vec<_>>()))
+					.collect::<Vec<_>>(),
+				vec![
+					(
+						ChildIndex { block: zero + 4u64, storage_key: child_trie_key1.clone() },
+						vec![
+							InputPair::ExtrinsicIndex(
+								ExtrinsicIndex { block: zero + 4u64, key: vec![100] },
+								vec![0, 2, 3]
+							),
+							InputPair::DigestIndex(
+								DigestIndex { block: zero + 4, key: vec![100] },
+								vec![zero + 1]
+							),
+							InputPair::DigestIndex(
+								DigestIndex { block: zero + 4, key: vec![101] },
+								vec![zero + 1]
+							),
+							InputPair::DigestIndex(
+								DigestIndex { block: zero + 4, key: vec![102] },
+								vec![zero + 2]
+							),
+							InputPair::DigestIndex(
+								DigestIndex { block: zero + 4, key: vec![105] },
+								vec![zero + 1]
+							),
+						]
+					),
+					(
+						ChildIndex { block: zero + 4, storage_key: child_trie_key2.clone() },
+						vec![InputPair::ExtrinsicIndex(
+							ExtrinsicIndex { block: zero + 4, key: vec![100] },
+							vec![0, 2]
+						),]
+					),
+				]
+			);
 		}
 
 		test_with_zero(0);
@@ -552,31 +752,74 @@ mod test {
 				configuration_range(&config, zero),
 				&changes,
 				&parent,
-			).unwrap();
-			assert_eq!(changes_trie_nodes.0.collect::<Vec<InputPair<u64>>>(), vec![
-				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 16, key: vec![100] }, vec![0, 2, 3]),
-				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 16, key: vec![101] }, vec![1]),
-				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 16, key: vec![103] }, vec![0, 1]),
-
-				InputPair::DigestIndex(DigestIndex { block: zero + 16, key: vec![100] }, vec![zero + 4]),
-				InputPair::DigestIndex(DigestIndex { block: zero + 16, key: vec![101] }, vec![zero + 4]),
-				InputPair::DigestIndex(DigestIndex { block: zero + 16, key: vec![102] }, vec![zero + 4]),
-				InputPair::DigestIndex(DigestIndex { block: zero + 16, key: vec![103] }, vec![zero + 4]),
-				InputPair::DigestIndex(DigestIndex { block: zero + 16, key: vec![105] }, vec![zero + 4, zero + 8]),
-			]);
-			assert_eq!(changes_trie_nodes.1.into_iter()
-				.map(|(k,v)| (k, v.collect::<Vec<_>>())).collect::<Vec<_>>(), vec![
-				(ChildIndex { block: zero + 16u64, storage_key: child_trie_key1.clone() },
-					vec![
-						InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 16u64, key: vec![100] }, vec![0, 2, 3]),
-
-						InputPair::DigestIndex(DigestIndex { block: zero + 16, key: vec![102] }, vec![zero + 4]),
-					]),
-				(ChildIndex { block: zero + 16, storage_key: child_trie_key2.clone() },
-					vec![
-						InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 16, key: vec![100] }, vec![0, 2]),
-					]),
-			]);
+			)
+			.unwrap();
+			assert_eq!(
+				changes_trie_nodes.0.collect::<Vec<InputPair<u64>>>(),
+				vec![
+					InputPair::ExtrinsicIndex(
+						ExtrinsicIndex { block: zero + 16, key: vec![100] },
+						vec![0, 2, 3]
+					),
+					InputPair::ExtrinsicIndex(
+						ExtrinsicIndex { block: zero + 16, key: vec![101] },
+						vec![1]
+					),
+					InputPair::ExtrinsicIndex(
+						ExtrinsicIndex { block: zero + 16, key: vec![103] },
+						vec![0, 1]
+					),
+					InputPair::DigestIndex(
+						DigestIndex { block: zero + 16, key: vec![100] },
+						vec![zero + 4]
+					),
+					InputPair::DigestIndex(
+						DigestIndex { block: zero + 16, key: vec![101] },
+						vec![zero + 4]
+					),
+					InputPair::DigestIndex(
+						DigestIndex { block: zero + 16, key: vec![102] },
+						vec![zero + 4]
+					),
+					InputPair::DigestIndex(
+						DigestIndex { block: zero + 16, key: vec![103] },
+						vec![zero + 4]
+					),
+					InputPair::DigestIndex(
+						DigestIndex { block: zero + 16, key: vec![105] },
+						vec![zero + 4, zero + 8]
+					),
+				]
+			);
+			assert_eq!(
+				changes_trie_nodes
+					.1
+					.into_iter()
+					.map(|(k, v)| (k, v.collect::<Vec<_>>()))
+					.collect::<Vec<_>>(),
+				vec![
+					(
+						ChildIndex { block: zero + 16u64, storage_key: child_trie_key1.clone() },
+						vec![
+							InputPair::ExtrinsicIndex(
+								ExtrinsicIndex { block: zero + 16u64, key: vec![100] },
+								vec![0, 2, 3]
+							),
+							InputPair::DigestIndex(
+								DigestIndex { block: zero + 16, key: vec![102] },
+								vec![zero + 4]
+							),
+						]
+					),
+					(
+						ChildIndex { block: zero + 16, storage_key: child_trie_key2.clone() },
+						vec![InputPair::ExtrinsicIndex(
+							ExtrinsicIndex { block: zero + 16, key: vec![100] },
+							vec![0, 2]
+						),]
+					),
+				]
+			);
 		}
 
 		test_with_zero(0);
@@ -591,38 +834,67 @@ mod test {
 			let parent = AnchorBlockId { hash: Default::default(), number: zero + 10 };
 
 			let mut configuration_range = configuration_range(&config, zero);
-			let changes_trie_nodes = prepare_input(
-				&backend,
-				&storage,
-				configuration_range.clone(),
-				&changes,
-				&parent,
-			).unwrap();
-			assert_eq!(changes_trie_nodes.0.collect::<Vec<InputPair<u64>>>(), vec![
-				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 11, key: vec![100] }, vec![0, 2, 3]),
-				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 11, key: vec![101] }, vec![1]),
-				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 11, key: vec![103] }, vec![0, 1]),
-			]);
+			let changes_trie_nodes =
+				prepare_input(&backend, &storage, configuration_range.clone(), &changes, &parent)
+					.unwrap();
+			assert_eq!(
+				changes_trie_nodes.0.collect::<Vec<InputPair<u64>>>(),
+				vec![
+					InputPair::ExtrinsicIndex(
+						ExtrinsicIndex { block: zero + 11, key: vec![100] },
+						vec![0, 2, 3]
+					),
+					InputPair::ExtrinsicIndex(
+						ExtrinsicIndex { block: zero + 11, key: vec![101] },
+						vec![1]
+					),
+					InputPair::ExtrinsicIndex(
+						ExtrinsicIndex { block: zero + 11, key: vec![103] },
+						vec![0, 1]
+					),
+				]
+			);
 
 			configuration_range.end = Some(zero + 11);
-			let changes_trie_nodes = prepare_input(
-				&backend,
-				&storage,
-				configuration_range,
-				&changes,
-				&parent,
-			).unwrap();
-			assert_eq!(changes_trie_nodes.0.collect::<Vec<InputPair<u64>>>(), vec![
-				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 11, key: vec![100] }, vec![0, 2, 3]),
-				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 11, key: vec![101] }, vec![1]),
-				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 11, key: vec![103] }, vec![0, 1]),
-
-				InputPair::DigestIndex(DigestIndex { block: zero + 11, key: vec![100] }, vec![zero + 4]),
-				InputPair::DigestIndex(DigestIndex { block: zero + 11, key: vec![101] }, vec![zero + 4]),
-				InputPair::DigestIndex(DigestIndex { block: zero + 11, key: vec![102] }, vec![zero + 4]),
-				InputPair::DigestIndex(DigestIndex { block: zero + 11, key: vec![103] }, vec![zero + 4]),
-				InputPair::DigestIndex(DigestIndex { block: zero + 11, key: vec![105] }, vec![zero + 4, zero + 8]),
-			]);
+			let changes_trie_nodes =
+				prepare_input(&backend, &storage, configuration_range, &changes, &parent).unwrap();
+			assert_eq!(
+				changes_trie_nodes.0.collect::<Vec<InputPair<u64>>>(),
+				vec![
+					InputPair::ExtrinsicIndex(
+						ExtrinsicIndex { block: zero + 11, key: vec![100] },
+						vec![0, 2, 3]
+					),
+					InputPair::ExtrinsicIndex(
+						ExtrinsicIndex { block: zero + 11, key: vec![101] },
+						vec![1]
+					),
+					InputPair::ExtrinsicIndex(
+						ExtrinsicIndex { block: zero + 11, key: vec![103] },
+						vec![0, 1]
+					),
+					InputPair::DigestIndex(
+						DigestIndex { block: zero + 11, key: vec![100] },
+						vec![zero + 4]
+					),
+					InputPair::DigestIndex(
+						DigestIndex { block: zero + 11, key: vec![101] },
+						vec![zero + 4]
+					),
+					InputPair::DigestIndex(
+						DigestIndex { block: zero + 11, key: vec![102] },
+						vec![zero + 4]
+					),
+					InputPair::DigestIndex(
+						DigestIndex { block: zero + 11, key: vec![103] },
+						vec![zero + 4]
+					),
+					InputPair::DigestIndex(
+						DigestIndex { block: zero + 11, key: vec![105] },
+						vec![zero + 4, zero + 8]
+					),
+				]
+			);
 		}
 
 		test_with_zero(0);
@@ -647,34 +919,82 @@ mod test {
 				configuration_range(&config, zero),
 				&changes,
 				&parent,
-			).unwrap();
-			assert_eq!(changes_trie_nodes.0.collect::<Vec<InputPair<u64>>>(), vec![
-				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 4, key: vec![100] }, vec![0, 2, 3]),
-				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 4, key: vec![101] }, vec![1]),
-				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 4, key: vec![103] }, vec![0, 1]),
-
-				InputPair::DigestIndex(DigestIndex { block: zero + 4, key: vec![100] }, vec![zero + 1, zero + 3]),
-				InputPair::DigestIndex(DigestIndex { block: zero + 4, key: vec![101] }, vec![zero + 1]),
-				InputPair::DigestIndex(DigestIndex { block: zero + 4, key: vec![102] }, vec![zero + 2]),
-				InputPair::DigestIndex(DigestIndex { block: zero + 4, key: vec![105] }, vec![zero + 1, zero + 3]),
-			]);
-			assert_eq!(changes_trie_nodes.1.into_iter()
-				.map(|(k,v)| (k, v.collect::<Vec<_>>())).collect::<Vec<_>>(), vec![
-				(ChildIndex { block: zero + 4u64, storage_key: child_trie_key1.clone() },
-					vec![
-						InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 4u64, key: vec![100] }, vec![0, 2, 3]),
-
-						InputPair::DigestIndex(DigestIndex { block: zero + 4, key: vec![100] }, vec![zero + 1]),
-						InputPair::DigestIndex(DigestIndex { block: zero + 4, key: vec![101] }, vec![zero + 1]),
-						InputPair::DigestIndex(DigestIndex { block: zero + 4, key: vec![102] }, vec![zero + 2]),
-						InputPair::DigestIndex(DigestIndex { block: zero + 4, key: vec![105] }, vec![zero + 1]),
-					]),
-				(ChildIndex { block: zero + 4, storage_key: child_trie_key2.clone() },
-					vec![
-						InputPair::ExtrinsicIndex(ExtrinsicIndex { block: zero + 4, key: vec![100] }, vec![0, 2]),
-					]),
-			]);
-
+			)
+			.unwrap();
+			assert_eq!(
+				changes_trie_nodes.0.collect::<Vec<InputPair<u64>>>(),
+				vec![
+					InputPair::ExtrinsicIndex(
+						ExtrinsicIndex { block: zero + 4, key: vec![100] },
+						vec![0, 2, 3]
+					),
+					InputPair::ExtrinsicIndex(
+						ExtrinsicIndex { block: zero + 4, key: vec![101] },
+						vec![1]
+					),
+					InputPair::ExtrinsicIndex(
+						ExtrinsicIndex { block: zero + 4, key: vec![103] },
+						vec![0, 1]
+					),
+					InputPair::DigestIndex(
+						DigestIndex { block: zero + 4, key: vec![100] },
+						vec![zero + 1, zero + 3]
+					),
+					InputPair::DigestIndex(
+						DigestIndex { block: zero + 4, key: vec![101] },
+						vec![zero + 1]
+					),
+					InputPair::DigestIndex(
+						DigestIndex { block: zero + 4, key: vec![102] },
+						vec![zero + 2]
+					),
+					InputPair::DigestIndex(
+						DigestIndex { block: zero + 4, key: vec![105] },
+						vec![zero + 1, zero + 3]
+					),
+				]
+			);
+			assert_eq!(
+				changes_trie_nodes
+					.1
+					.into_iter()
+					.map(|(k, v)| (k, v.collect::<Vec<_>>()))
+					.collect::<Vec<_>>(),
+				vec![
+					(
+						ChildIndex { block: zero + 4u64, storage_key: child_trie_key1.clone() },
+						vec![
+							InputPair::ExtrinsicIndex(
+								ExtrinsicIndex { block: zero + 4u64, key: vec![100] },
+								vec![0, 2, 3]
+							),
+							InputPair::DigestIndex(
+								DigestIndex { block: zero + 4, key: vec![100] },
+								vec![zero + 1]
+							),
+							InputPair::DigestIndex(
+								DigestIndex { block: zero + 4, key: vec![101] },
+								vec![zero + 1]
+							),
+							InputPair::DigestIndex(
+								DigestIndex { block: zero + 4, key: vec![102] },
+								vec![zero + 2]
+							),
+							InputPair::DigestIndex(
+								DigestIndex { block: zero + 4, key: vec![105] },
+								vec![zero + 1]
+							),
+						]
+					),
+					(
+						ChildIndex { block: zero + 4, storage_key: child_trie_key2.clone() },
+						vec![InputPair::ExtrinsicIndex(
+							ExtrinsicIndex { block: zero + 4, key: vec![100] },
+							vec![0, 2]
+						),]
+					),
+				]
+			);
 		}
 
 		test_with_zero(0);
@@ -710,44 +1030,50 @@ mod test {
 			.complete(4, &trie_root4);
 		storage.cache_mut().perform(cached_data4);
 
-		let (root_changes_trie_nodes, child_changes_tries_nodes, _) = prepare_input(
-			&backend,
-			&storage,
-			configuration_range(&config, 0),
-			&changes,
-			&parent,
-		).unwrap();
-		assert_eq!(root_changes_trie_nodes.collect::<Vec<InputPair<u64>>>(), vec![
-			InputPair::ExtrinsicIndex(ExtrinsicIndex { block: 16, key: vec![100] }, vec![0, 2, 3]),
-			InputPair::ExtrinsicIndex(ExtrinsicIndex { block: 16, key: vec![101] }, vec![1]),
-			InputPair::ExtrinsicIndex(ExtrinsicIndex { block: 16, key: vec![103] }, vec![0, 1]),
-
-			InputPair::DigestIndex(DigestIndex { block: 16, key: vec![100] }, vec![4]),
-			InputPair::DigestIndex(DigestIndex { block: 16, key: vec![102] }, vec![4]),
-			InputPair::DigestIndex(DigestIndex { block: 16, key: vec![105] }, vec![8]),
-		]);
+		let (root_changes_trie_nodes, child_changes_tries_nodes, _) =
+			prepare_input(&backend, &storage, configuration_range(&config, 0), &changes, &parent)
+				.unwrap();
+		assert_eq!(
+			root_changes_trie_nodes.collect::<Vec<InputPair<u64>>>(),
+			vec![
+				InputPair::ExtrinsicIndex(
+					ExtrinsicIndex { block: 16, key: vec![100] },
+					vec![0, 2, 3]
+				),
+				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: 16, key: vec![101] }, vec![1]),
+				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: 16, key: vec![103] }, vec![0, 1]),
+				InputPair::DigestIndex(DigestIndex { block: 16, key: vec![100] }, vec![4]),
+				InputPair::DigestIndex(DigestIndex { block: 16, key: vec![102] }, vec![4]),
+				InputPair::DigestIndex(DigestIndex { block: 16, key: vec![105] }, vec![8]),
+			]
+		);
 
 		let child_changes_tries_nodes = child_changes_tries_nodes
 			.into_iter()
 			.map(|(k, i)| (k, i.collect::<Vec<_>>()))
 			.collect::<BTreeMap<_, _>>();
 		assert_eq!(
-			child_changes_tries_nodes.get(&ChildIndex {
-				block: 16u64,
-				storage_key: child_trie_key1.clone(),
-			}).unwrap(),
+			child_changes_tries_nodes
+				.get(&ChildIndex { block: 16u64, storage_key: child_trie_key1.clone() })
+				.unwrap(),
 			&vec![
-				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: 16u64, key: vec![100] }, vec![0, 2, 3]),
-
+				InputPair::ExtrinsicIndex(
+					ExtrinsicIndex { block: 16u64, key: vec![100] },
+					vec![0, 2, 3]
+				),
 				InputPair::DigestIndex(DigestIndex { block: 16u64, key: vec![103] }, vec![4]),
 				InputPair::DigestIndex(DigestIndex { block: 16u64, key: vec![104] }, vec![4]),
 			],
 		);
 		assert_eq!(
-			child_changes_tries_nodes.get(&ChildIndex { block: 16u64, storage_key: child_trie_key2.clone() }).unwrap(),
+			child_changes_tries_nodes
+				.get(&ChildIndex { block: 16u64, storage_key: child_trie_key2.clone() })
+				.unwrap(),
 			&vec![
-				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: 16u64, key: vec![100] }, vec![0, 2]),
-
+				InputPair::ExtrinsicIndex(
+					ExtrinsicIndex { block: 16u64, key: vec![100] },
+					vec![0, 2]
+				),
 				InputPair::DigestIndex(DigestIndex { block: 16u64, key: vec![105] }, vec![4]),
 				InputPair::DigestIndex(DigestIndex { block: 16u64, key: vec![106] }, vec![4]),
 			],
diff --git a/primitives/state-machine/src/changes_trie/build_cache.rs b/primitives/state-machine/src/changes_trie/build_cache.rs
index 9b2190ae1951..67098d4d7204 100644
--- a/primitives/state-machine/src/changes_trie/build_cache.rs
+++ b/primitives/state-machine/src/changes_trie/build_cache.rs
@@ -78,20 +78,20 @@ pub(crate) struct IncompleteCachedBuildData<N> {
 }
 
 impl<H, N> BuildCache<H, N>
-	where
-		N: Eq + ::std::hash::Hash,
-		H: Eq + ::std::hash::Hash + Clone,
+where
+	N: Eq + ::std::hash::Hash,
+	H: Eq + ::std::hash::Hash + Clone,
 {
 	/// Create new changes trie build cache.
 	pub fn new() -> Self {
-		BuildCache {
-			roots_by_number: HashMap::new(),
-			changed_keys: HashMap::new(),
-		}
+		BuildCache { roots_by_number: HashMap::new(), changed_keys: HashMap::new() }
 	}
 
 	/// Get cached changed keys for changes trie with given root.
-	pub fn get(&self, root: &H) -> Option<&HashMap<Option<PrefixedStorageKey>, HashSet<StorageKey>>> {
+	pub fn get(
+		&self,
+		root: &H,
+	) -> Option<&HashMap<Option<PrefixedStorageKey>, HashSet<StorageKey>>> {
 		self.changed_keys.get(&root)
 	}
 
@@ -158,7 +158,9 @@ impl<N> IncompleteCacheAction<N> {
 	pub(crate) fn set_digest_input_blocks(self, digest_input_blocks: Vec<N>) -> Self {
 		match self {
 			IncompleteCacheAction::CacheBuildData(build_data) =>
-				IncompleteCacheAction::CacheBuildData(build_data.set_digest_input_blocks(digest_input_blocks)),
+				IncompleteCacheAction::CacheBuildData(
+					build_data.set_digest_input_blocks(digest_input_blocks),
+				),
 			IncompleteCacheAction::Clear => IncompleteCacheAction::Clear,
 		}
 	}
@@ -180,10 +182,7 @@ impl<N> IncompleteCacheAction<N> {
 impl<N> IncompleteCachedBuildData<N> {
 	/// Create new cached data.
 	pub(crate) fn new() -> Self {
-		IncompleteCachedBuildData {
-			digest_input_blocks: Vec::new(),
-			changed_keys: HashMap::new(),
-		}
+		IncompleteCachedBuildData { digest_input_blocks: Vec::new(), changed_keys: HashMap::new() }
 	}
 
 	fn complete<H>(self, block: N, trie_root: H) -> CachedBuildData<H, N> {
@@ -232,30 +231,42 @@ mod tests {
 	#[test]
 	fn obsolete_entries_are_purged_when_new_ct_is_built() {
 		let mut cache = BuildCache::<u32, u32>::new();
-		cache.perform(CacheAction::CacheBuildData(IncompleteCachedBuildData::new()
-			.insert(None, vec![vec![1]].into_iter().collect())
-			.complete(1, 1)));
-		cache.perform(CacheAction::CacheBuildData(IncompleteCachedBuildData::new()
-			.insert(None, vec![vec![2]].into_iter().collect())
-			.complete(2, 2)));
-		cache.perform(CacheAction::CacheBuildData(IncompleteCachedBuildData::new()
-			.insert(None, vec![vec![3]].into_iter().collect())
-			.complete(3, 3)));
+		cache.perform(CacheAction::CacheBuildData(
+			IncompleteCachedBuildData::new()
+				.insert(None, vec![vec![1]].into_iter().collect())
+				.complete(1, 1),
+		));
+		cache.perform(CacheAction::CacheBuildData(
+			IncompleteCachedBuildData::new()
+				.insert(None, vec![vec![2]].into_iter().collect())
+				.complete(2, 2),
+		));
+		cache.perform(CacheAction::CacheBuildData(
+			IncompleteCachedBuildData::new()
+				.insert(None, vec![vec![3]].into_iter().collect())
+				.complete(3, 3),
+		));
 
 		assert_eq!(cache.changed_keys.len(), 3);
 
-		cache.perform(CacheAction::CacheBuildData(IncompleteCachedBuildData::new()
-			.set_digest_input_blocks(vec![1, 2, 3])
-			.complete(4, 4)));
+		cache.perform(CacheAction::CacheBuildData(
+			IncompleteCachedBuildData::new()
+				.set_digest_input_blocks(vec![1, 2, 3])
+				.complete(4, 4),
+		));
 
 		assert_eq!(cache.changed_keys.len(), 1);
 
-		cache.perform(CacheAction::CacheBuildData(IncompleteCachedBuildData::new()
-			.insert(None, vec![vec![8]].into_iter().collect())
-			.complete(8, 8)));
-		cache.perform(CacheAction::CacheBuildData(IncompleteCachedBuildData::new()
-			.insert(None, vec![vec![12]].into_iter().collect())
-			.complete(12, 12)));
+		cache.perform(CacheAction::CacheBuildData(
+			IncompleteCachedBuildData::new()
+				.insert(None, vec![vec![8]].into_iter().collect())
+				.complete(8, 8),
+		));
+		cache.perform(CacheAction::CacheBuildData(
+			IncompleteCachedBuildData::new()
+				.insert(None, vec![vec![12]].into_iter().collect())
+				.complete(12, 12),
+		));
 
 		assert_eq!(cache.changed_keys.len(), 3);
 
diff --git a/primitives/state-machine/src/changes_trie/build_iterator.rs b/primitives/state-machine/src/changes_trie/build_iterator.rs
index 43089d819b66..d4adc99d109f 100644
--- a/primitives/state-machine/src/changes_trie/build_iterator.rs
+++ b/primitives/state-machine/src/changes_trie/build_iterator.rs
@@ -18,8 +18,8 @@
 //! Structures and functions to return blocks whose changes are to be included
 //! in given block's changes trie.
 
+use crate::changes_trie::{BlockNumber, ConfigurationRange};
 use num_traits::Zero;
-use crate::changes_trie::{ConfigurationRange, BlockNumber};
 
 /// Returns iterator of OTHER blocks that are required for inclusion into
 /// changes trie of given block. Blocks are guaranteed to be returned in
@@ -31,13 +31,19 @@ pub fn digest_build_iterator<'a, Number: BlockNumber>(
 	block: Number,
 ) -> DigestBuildIterator<Number> {
 	// prepare digest build parameters
-	let (_, _, digest_step) = match config.config.digest_level_at_block(config.zero, block.clone()) {
+	let (_, _, digest_step) = match config.config.digest_level_at_block(config.zero, block.clone())
+	{
 		Some((current_level, digest_interval, digest_step)) =>
 			(current_level, digest_interval, digest_step),
 		None => return DigestBuildIterator::empty(),
 	};
 
-	DigestBuildIterator::new(block.clone(), config.end.unwrap_or(block), config.config.digest_interval, digest_step)
+	DigestBuildIterator::new(
+		block.clone(),
+		config.end.unwrap_or(block),
+		config.config.digest_interval,
+		digest_step,
+	)
 }
 
 /// Changes trie build iterator that returns numbers of OTHER blocks that are
@@ -56,7 +62,6 @@ pub struct DigestBuildIterator<Number: BlockNumber> {
 	max_step: u32,
 
 	// Mutable data below:
-
 	/// Step of current blocks range.
 	current_step: u32,
 	/// Reverse step of current blocks range.
@@ -98,7 +103,7 @@ impl<Number: BlockNumber> Iterator for DigestBuildIterator<Number> {
 			if let Some(next) = self.current_range.as_mut().and_then(|iter| iter.next()) {
 				if next < self.end {
 					self.last_block = Some(next.clone());
-					return Some(next);
+					return Some(next)
 				}
 			}
 
@@ -112,14 +117,16 @@ impl<Number: BlockNumber> Iterator for DigestBuildIterator<Number> {
 				self.current_step_reverse * self.digest_interval
 			};
 			if next_step_reverse > self.max_step {
-				return None;
+				return None
 			}
 
 			self.current_step_reverse = next_step_reverse;
 			self.current_range = Some(BlocksRange::new(
 				match self.last_block.clone() {
 					Some(last_block) => last_block + self.current_step.into(),
-					None => self.block.clone() - (self.current_step * self.digest_interval - self.current_step).into(),
+					None =>
+						self.block.clone() -
+							(self.current_step * self.digest_interval - self.current_step).into(),
 				},
 				self.block.clone(),
 				self.current_step.into(),
@@ -143,11 +150,7 @@ struct BlocksRange<Number: BlockNumber> {
 
 impl<Number: BlockNumber> BlocksRange<Number> {
 	pub fn new(begin: Number, end: Number, step: Number) -> Self {
-		BlocksRange {
-			current: begin,
-			end,
-			step,
-		}
+		BlocksRange { current: begin, end, step }
 	}
 }
 
@@ -156,7 +159,7 @@ impl<Number: BlockNumber> Iterator for BlocksRange<Number> {
 
 	fn next(&mut self) -> Option<Self::Item> {
 		if self.current >= self.end {
-			return None;
+			return None
 		}
 
 		let current = Some(self.current.clone());
@@ -167,8 +170,8 @@ impl<Number: BlockNumber> Iterator for BlocksRange<Number> {
 
 #[cfg(test)]
 mod tests {
-	use crate::changes_trie::Configuration;
 	use super::*;
+	use crate::changes_trie::Configuration;
 
 	fn digest_build_iterator(
 		digest_interval: u32,
@@ -179,10 +182,7 @@ mod tests {
 	) -> DigestBuildIterator<u64> {
 		super::digest_build_iterator(
 			ConfigurationRange {
-				config: &Configuration {
-					digest_interval,
-					digest_levels,
-				},
+				config: &Configuration { digest_interval, digest_levels },
 				zero,
 				end,
 			},
@@ -215,9 +215,21 @@ mod tests {
 		fn test_with_zero(zero: u64) {
 			let empty = (0, 0, 0);
 			assert_eq!(digest_build_iterator_basic(4, 16, zero, zero + 0), empty, "block is 0");
-			assert_eq!(digest_build_iterator_basic(0, 16, zero, zero + 64), empty, "digest_interval is 0");
-			assert_eq!(digest_build_iterator_basic(1, 16, zero, zero + 64), empty, "digest_interval is 1");
-			assert_eq!(digest_build_iterator_basic(4, 0, zero, zero + 64), empty, "digest_levels is 0");
+			assert_eq!(
+				digest_build_iterator_basic(0, 16, zero, zero + 64),
+				empty,
+				"digest_interval is 0"
+			);
+			assert_eq!(
+				digest_build_iterator_basic(1, 16, zero, zero + 64),
+				empty,
+				"digest_interval is 1"
+			);
+			assert_eq!(
+				digest_build_iterator_basic(4, 0, zero, zero + 64),
+				empty,
+				"digest_levels is 0"
+			);
 			assert_eq!(
 				digest_build_iterator_basic(4, 16, zero, zero + 1),
 				empty,
@@ -238,12 +250,11 @@ mod tests {
 				empty,
 				"digest is not required for this block",
 			);
-			assert_eq!(digest_build_iterator_basic(
-				::std::u32::MAX / 2 + 1,
-				16,
-				zero,
-				::std::u64::MAX,
-			), empty, "digest_interval * 2 is greater than u64::MAX");
+			assert_eq!(
+				digest_build_iterator_basic(::std::u32::MAX / 2 + 1, 16, zero, ::std::u64::MAX,),
+				empty,
+				"digest_interval * 2 is greater than u64::MAX"
+			);
 		}
 
 		test_with_zero(0);
@@ -326,18 +337,37 @@ mod tests {
 	#[test]
 	fn digest_iterator_returns_level1_blocks() {
 		fn test_with_zero(zero: u64) {
-			assert_eq!(digest_build_iterator_blocks(16, 1, zero, zero + 16, None),
+			assert_eq!(
+				digest_build_iterator_blocks(16, 1, zero, zero + 16, None),
 				[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-					.iter().map(|item| zero + item).collect::<Vec<_>>());
-			assert_eq!(digest_build_iterator_blocks(16, 1, zero, zero + 256, None),
+					.iter()
+					.map(|item| zero + item)
+					.collect::<Vec<_>>()
+			);
+			assert_eq!(
+				digest_build_iterator_blocks(16, 1, zero, zero + 256, None),
 				[241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255]
-					.iter().map(|item| zero + item).collect::<Vec<_>>());
-			assert_eq!(digest_build_iterator_blocks(16, 2, zero, zero + 32, None),
+					.iter()
+					.map(|item| zero + item)
+					.collect::<Vec<_>>()
+			);
+			assert_eq!(
+				digest_build_iterator_blocks(16, 2, zero, zero + 32, None),
 				[17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31]
-					.iter().map(|item| zero + item).collect::<Vec<_>>());
-			assert_eq!(digest_build_iterator_blocks(16, 3, zero, zero + 4080, None),
-				[4065, 4066, 4067, 4068, 4069, 4070, 4071, 4072, 4073, 4074, 4075, 4076, 4077, 4078, 4079]
-					.iter().map(|item| zero + item).collect::<Vec<_>>());
+					.iter()
+					.map(|item| zero + item)
+					.collect::<Vec<_>>()
+			);
+			assert_eq!(
+				digest_build_iterator_blocks(16, 3, zero, zero + 4080, None),
+				[
+					4065, 4066, 4067, 4068, 4069, 4070, 4071, 4072, 4073, 4074, 4075, 4076, 4077,
+					4078, 4079
+				]
+				.iter()
+				.map(|item| zero + item)
+				.collect::<Vec<_>>()
+			);
 		}
 
 		test_with_zero(0);
@@ -348,21 +378,30 @@ mod tests {
 	#[test]
 	fn digest_iterator_returns_level1_and_level2_blocks() {
 		fn test_with_zero(zero: u64) {
-			assert_eq!(digest_build_iterator_blocks(16, 2, zero, zero + 256, None),
+			assert_eq!(
+				digest_build_iterator_blocks(16, 2, zero, zero + 256, None),
 				[
 					// level2 points to previous 16-1 level1 digests:
 					16, 32, 48, 64, 80, 96, 112, 128, 144, 160, 176, 192, 208, 224, 240,
 					// level2 is a level1 digest of 16-1 previous blocks:
 					241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255,
-				].iter().map(|item| zero + item).collect::<Vec<_>>(),
+				]
+				.iter()
+				.map(|item| zero + item)
+				.collect::<Vec<_>>(),
 			);
-			assert_eq!(digest_build_iterator_blocks(16, 2, zero, zero + 4096, None),
+			assert_eq!(
+				digest_build_iterator_blocks(16, 2, zero, zero + 4096, None),
 				[
 					// level2 points to previous 16-1 level1 digests:
-					3856, 3872, 3888, 3904, 3920, 3936, 3952, 3968, 3984, 4000, 4016, 4032, 4048, 4064, 4080,
-					// level2 is a level1 digest of 16-1 previous blocks:
-					4081, 4082, 4083, 4084, 4085, 4086, 4087, 4088, 4089, 4090, 4091, 4092, 4093, 4094, 4095,
-				].iter().map(|item| zero + item).collect::<Vec<_>>(),
+					3856, 3872, 3888, 3904, 3920, 3936, 3952, 3968, 3984, 4000, 4016, 4032, 4048,
+					4064, 4080, // level2 is a level1 digest of 16-1 previous blocks:
+					4081, 4082, 4083, 4084, 4085, 4086, 4087, 4088, 4089, 4090, 4091, 4092, 4093,
+					4094, 4095,
+				]
+				.iter()
+				.map(|item| zero + item)
+				.collect::<Vec<_>>(),
 			);
 		}
 
@@ -374,15 +413,20 @@ mod tests {
 	#[test]
 	fn digest_iterator_returns_level1_and_level2_and_level3_blocks() {
 		fn test_with_zero(zero: u64) {
-			assert_eq!(digest_build_iterator_blocks(16, 3, zero, zero + 4096, None),
+			assert_eq!(
+				digest_build_iterator_blocks(16, 3, zero, zero + 4096, None),
 				[
 					// level3 points to previous 16-1 level2 digests:
-					256, 512, 768, 1024, 1280, 1536, 1792, 2048, 2304, 2560, 2816, 3072, 3328, 3584, 3840,
-					// level3 points to previous 16-1 level1 digests:
-					3856, 3872, 3888, 3904, 3920, 3936, 3952, 3968, 3984, 4000, 4016, 4032, 4048, 4064, 4080,
-					// level3 is a level1 digest of 16-1 previous blocks:
-					4081, 4082, 4083, 4084, 4085, 4086, 4087, 4088, 4089, 4090, 4091, 4092, 4093, 4094, 4095,
-				].iter().map(|item| zero + item).collect::<Vec<_>>(),
+					256, 512, 768, 1024, 1280, 1536, 1792, 2048, 2304, 2560, 2816, 3072, 3328, 3584,
+					3840, // level3 points to previous 16-1 level1 digests:
+					3856, 3872, 3888, 3904, 3920, 3936, 3952, 3968, 3984, 4000, 4016, 4032, 4048,
+					4064, 4080, // level3 is a level1 digest of 16-1 previous blocks:
+					4081, 4082, 4083, 4084, 4085, 4086, 4087, 4088, 4089, 4090, 4091, 4092, 4093,
+					4094, 4095,
+				]
+				.iter()
+				.map(|item| zero + item)
+				.collect::<Vec<_>>(),
 			);
 		}
 
@@ -394,7 +438,8 @@ mod tests {
 	#[test]
 	fn digest_iterator_returns_skewed_digest_blocks() {
 		fn test_with_zero(zero: u64) {
-			assert_eq!(digest_build_iterator_blocks(16, 3, zero, zero + 4096, Some(zero + 1338)),
+			assert_eq!(
+				digest_build_iterator_blocks(16, 3, zero, zero + 4096, Some(zero + 1338)),
 				[
 					// level3 MUST point to previous 16-1 level2 digests, BUT there are only 5:
 					256, 512, 768, 1024, 1280,
@@ -402,7 +447,10 @@ mod tests {
 					1296, 1312, 1328,
 					// level3 MUST be a level1 digest of 16-1 previous blocks, BUT there are only 9:
 					1329, 1330, 1331, 1332, 1333, 1334, 1335, 1336, 1337,
-				].iter().map(|item| zero + item).collect::<Vec<_>>(),
+				]
+				.iter()
+				.map(|item| zero + item)
+				.collect::<Vec<_>>(),
 			);
 		}
 
@@ -414,14 +462,18 @@ mod tests {
 	#[test]
 	fn digest_iterator_returns_skewed_digest_blocks_skipping_level() {
 		fn test_with_zero(zero: u64) {
-			assert_eq!(digest_build_iterator_blocks(16, 3, zero, zero + 4096, Some(zero + 1284)),
+			assert_eq!(
+				digest_build_iterator_blocks(16, 3, zero, zero + 4096, Some(zero + 1284)),
 				[
 					// level3 MUST point to previous 16-1 level2 digests, BUT there are only 5:
 					256, 512, 768, 1024, 1280,
 					// level3 MUST point to previous 16-1 level1 digests, BUT there are NO ANY L1-digests:
 					// level3 MUST be a level1 digest of 16-1 previous blocks, BUT there are only 3:
 					1281, 1282, 1283,
-				].iter().map(|item| zero + item).collect::<Vec<_>>(),
+				]
+				.iter()
+				.map(|item| zero + item)
+				.collect::<Vec<_>>(),
 			);
 		}
 
diff --git a/primitives/state-machine/src/changes_trie/changes_iterator.rs b/primitives/state-machine/src/changes_trie/changes_iterator.rs
index be35581e7514..8b7d7c578109 100644
--- a/primitives/state-machine/src/changes_trie/changes_iterator.rs
+++ b/primitives/state-machine/src/changes_trie/changes_iterator.rs
@@ -18,20 +18,22 @@
 //! Functions + iterator that traverses changes tries and returns all
 //! (block, extrinsic) pairs where given key has been changed.
 
-use std::cell::RefCell;
-use std::collections::VecDeque;
-use codec::{Decode, Encode, Codec};
+use crate::{
+	changes_trie::{
+		input::{ChildIndex, DigestIndex, DigestIndexValue, ExtrinsicIndex, ExtrinsicIndexValue},
+		storage::{InMemoryStorage, TrieBackendAdapter},
+		surface_iterator::{surface_iterator, SurfaceIterator},
+		AnchorBlockId, BlockNumber, ConfigurationRange, RootsStorage, Storage,
+	},
+	proving_backend::ProvingBackendRecorder,
+	trie_backend_essence::TrieBackendEssence,
+};
+use codec::{Codec, Decode, Encode};
 use hash_db::Hasher;
 use num_traits::Zero;
 use sp_core::storage::PrefixedStorageKey;
 use sp_trie::Recorder;
-use crate::changes_trie::{AnchorBlockId, ConfigurationRange, RootsStorage, Storage, BlockNumber};
-use crate::changes_trie::input::{DigestIndex, ExtrinsicIndex, DigestIndexValue, ExtrinsicIndexValue};
-use crate::changes_trie::storage::{TrieBackendAdapter, InMemoryStorage};
-use crate::changes_trie::input::ChildIndex;
-use crate::changes_trie::surface_iterator::{surface_iterator, SurfaceIterator};
-use crate::proving_backend::ProvingBackendRecorder;
-use crate::trie_backend_essence::{TrieBackendEssence};
+use std::{cell::RefCell, collections::VecDeque};
 
 /// Return changes of given key at given blocks range.
 /// `max` is the number of best known block.
@@ -57,12 +59,7 @@ pub fn key_changes<'a, H: Hasher, Number: BlockNumber>(
 			begin: begin.clone(),
 			end,
 			config: config.clone(),
-			surface: surface_iterator(
-				config,
-				max,
-				begin,
-				end.number.clone(),
-			)?,
+			surface: surface_iterator(config, max, begin, end.number.clone())?,
 
 			extrinsics: Default::default(),
 			blocks: Default::default(),
@@ -72,7 +69,6 @@ pub fn key_changes<'a, H: Hasher, Number: BlockNumber>(
 	})
 }
 
-
 /// Returns proof of changes of given key at given blocks range.
 /// `max` is the number of best known block.
 pub fn key_changes_proof<'a, H: Hasher, Number: BlockNumber>(
@@ -83,7 +79,10 @@ pub fn key_changes_proof<'a, H: Hasher, Number: BlockNumber>(
 	max: Number,
 	storage_key: Option<&PrefixedStorageKey>,
 	key: &[u8],
-) -> Result<Vec<Vec<u8>>, String> where H::Out: Codec {
+) -> Result<Vec<Vec<u8>>, String>
+where
+	H::Out: Codec,
+{
 	// we can't query any roots before root
 	let max = std::cmp::min(max, end.number.clone());
 
@@ -96,12 +95,7 @@ pub fn key_changes_proof<'a, H: Hasher, Number: BlockNumber>(
 			begin: begin.clone(),
 			end,
 			config: config.clone(),
-			surface: surface_iterator(
-				config,
-				max,
-				begin,
-				end.number.clone(),
-			)?,
+			surface: surface_iterator(config, max, begin, end.number.clone())?,
 
 			extrinsics: Default::default(),
 			blocks: Default::default(),
@@ -130,8 +124,11 @@ pub fn key_changes_proof_check<'a, H: Hasher, Number: BlockNumber>(
 	end: &AnchorBlockId<H::Out, Number>,
 	max: Number,
 	storage_key: Option<&PrefixedStorageKey>,
-	key: &[u8]
-) -> Result<Vec<(Number, u32)>, String> where H::Out: Encode {
+	key: &[u8],
+) -> Result<Vec<(Number, u32)>, String>
+where
+	H::Out: Encode,
+{
 	key_changes_proof_check_with_db(
 		config,
 		roots_storage,
@@ -153,8 +150,11 @@ pub fn key_changes_proof_check_with_db<'a, H: Hasher, Number: BlockNumber>(
 	end: &AnchorBlockId<H::Out, Number>,
 	max: Number,
 	storage_key: Option<&PrefixedStorageKey>,
-	key: &[u8]
-) -> Result<Vec<(Number, u32)>, String> where H::Out: Encode {
+	key: &[u8],
+) -> Result<Vec<(Number, u32)>, String>
+where
+	H::Out: Encode,
+{
 	// we can't query any roots before root
 	let max = std::cmp::min(max, end.number.clone());
 
@@ -167,28 +167,24 @@ pub fn key_changes_proof_check_with_db<'a, H: Hasher, Number: BlockNumber>(
 			begin: begin.clone(),
 			end,
 			config: config.clone(),
-			surface: surface_iterator(
-				config,
-				max,
-				begin,
-				end.number.clone(),
-			)?,
+			surface: surface_iterator(config, max, begin, end.number.clone())?,
 
 			extrinsics: Default::default(),
 			blocks: Default::default(),
 
 			_hasher: ::std::marker::PhantomData::<H>::default(),
 		},
-	}.collect()
+	}
+	.collect()
 }
 
 /// Drilldown iterator - receives 'digest points' from surface iterator and explores
 /// every point until extrinsic is found.
 pub struct DrilldownIteratorEssence<'a, H, Number>
-	where
-		H: Hasher,
-		Number: BlockNumber,
-		H::Out: 'a,
+where
+	H: Hasher,
+	Number: BlockNumber,
+	H::Out: 'a,
 {
 	storage_key: Option<&'a PrefixedStorageKey>,
 	key: &'a [u8],
@@ -206,14 +202,14 @@ pub struct DrilldownIteratorEssence<'a, H, Number>
 }
 
 impl<'a, H, Number> DrilldownIteratorEssence<'a, H, Number>
-	where
-		H: Hasher,
-		Number: BlockNumber,
-		H::Out: 'a,
+where
+	H: Hasher,
+	Number: BlockNumber,
+	H::Out: 'a,
 {
 	pub fn next<F>(&mut self, trie_reader: F) -> Option<Result<(Number, u32), String>>
-		where
-			F: FnMut(&dyn Storage<H, Number>, H::Out, &[u8]) -> Result<Option<Vec<u8>>, String>,
+	where
+		F: FnMut(&dyn Storage<H, Number>, H::Out, &[u8]) -> Result<Option<Vec<u8>>, String>,
 	{
 		match self.do_next(trie_reader) {
 			Ok(Some(res)) => Some(Ok(res)),
@@ -223,25 +219,26 @@ impl<'a, H, Number> DrilldownIteratorEssence<'a, H, Number>
 	}
 
 	fn do_next<F>(&mut self, mut trie_reader: F) -> Result<Option<(Number, u32)>, String>
-		where
-			F: FnMut(&dyn Storage<H, Number>, H::Out, &[u8]) -> Result<Option<Vec<u8>>, String>,
+	where
+		F: FnMut(&dyn Storage<H, Number>, H::Out, &[u8]) -> Result<Option<Vec<u8>>, String>,
 	{
 		loop {
 			if let Some((block, extrinsic)) = self.extrinsics.pop_front() {
-				return Ok(Some((block, extrinsic)));
+				return Ok(Some((block, extrinsic)))
 			}
 
 			if let Some((block, level)) = self.blocks.pop_front() {
 				// not having a changes trie root is an error because:
 				// we never query roots for future blocks
 				// AND trie roots for old blocks are known (both on full + light node)
-				let trie_root = self.roots_storage.root(&self.end, block.clone())?
-					.ok_or_else(|| format!("Changes trie root for block {} is not found", block.clone()))?;
+				let trie_root =
+					self.roots_storage.root(&self.end, block.clone())?.ok_or_else(|| {
+						format!("Changes trie root for block {} is not found", block.clone())
+					})?;
 				let trie_root = if let Some(storage_key) = self.storage_key {
-					let child_key = ChildIndex {
-						block: block.clone(),
-						storage_key: storage_key.clone(),
-					}.encode();
+					let child_key =
+						ChildIndex { block: block.clone(), storage_key: storage_key.clone() }
+							.encode();
 					if let Some(trie_root) = trie_reader(self.storage, trie_root, &child_key)?
 						.and_then(|v| <Vec<u8>>::decode(&mut &v[..]).ok())
 						.map(|v| {
@@ -251,7 +248,7 @@ impl<'a, H, Number> DrilldownIteratorEssence<'a, H, Number>
 						}) {
 						trie_root
 					} else {
-						continue;
+						continue
 					}
 				} else {
 					trie_root
@@ -260,18 +257,24 @@ impl<'a, H, Number> DrilldownIteratorEssence<'a, H, Number>
 				// only return extrinsics for blocks before self.max
 				// most of blocks will be filtered out before pushing to `self.blocks`
 				// here we just throwing away changes at digest blocks we're processing
-				debug_assert!(block >= self.begin, "We shall not touch digests earlier than a range' begin");
+				debug_assert!(
+					block >= self.begin,
+					"We shall not touch digests earlier than a range' begin"
+				);
 				if block <= self.end.number {
-					let extrinsics_key = ExtrinsicIndex { block: block.clone(), key: self.key.to_vec() }.encode();
+					let extrinsics_key =
+						ExtrinsicIndex { block: block.clone(), key: self.key.to_vec() }.encode();
 					let extrinsics = trie_reader(self.storage, trie_root, &extrinsics_key);
 					if let Some(extrinsics) = extrinsics? {
 						if let Ok(extrinsics) = ExtrinsicIndexValue::decode(&mut &extrinsics[..]) {
-							self.extrinsics.extend(extrinsics.into_iter().rev().map(|e| (block.clone(), e)));
+							self.extrinsics
+								.extend(extrinsics.into_iter().rev().map(|e| (block.clone(), e)));
 						}
 					}
 				}
 
-				let blocks_key = DigestIndex { block: block.clone(), key: self.key.to_vec() }.encode();
+				let blocks_key =
+					DigestIndex { block: block.clone(), key: self.key.to_vec() }.encode();
 				let blocks = trie_reader(self.storage, trie_root, &blocks_key);
 				if let Some(blocks) = blocks? {
 					if let Ok(blocks) = <DigestIndexValue<Number>>::decode(&mut &blocks[..]) {
@@ -280,23 +283,35 @@ impl<'a, H, Number> DrilldownIteratorEssence<'a, H, Number>
 						let begin = self.begin.clone();
 						let end = self.end.number.clone();
 						let config = self.config.clone();
-						self.blocks.extend(blocks.into_iter()
-							.rev()
-							.filter(|b| level.map(|level| level > 1).unwrap_or(true) || (*b >= begin && *b <= end))
-							.map(|b| {
-								let prev_level = level
-									.map(|level| Some(level - 1))
-									.unwrap_or_else(||
-										Some(config.config.digest_level_at_block(config.zero.clone(), b.clone())
-											.map(|(level, _, _)| level)
-											.unwrap_or_else(|| Zero::zero())));
-								(b, prev_level)
-							})
+						self.blocks.extend(
+							blocks
+								.into_iter()
+								.rev()
+								.filter(|b| {
+									level.map(|level| level > 1).unwrap_or(true) ||
+										(*b >= begin && *b <= end)
+								})
+								.map(|b| {
+									let prev_level =
+										level.map(|level| Some(level - 1)).unwrap_or_else(|| {
+											Some(
+												config
+													.config
+													.digest_level_at_block(
+														config.zero.clone(),
+														b.clone(),
+													)
+													.map(|(level, _, _)| level)
+													.unwrap_or_else(|| Zero::zero()),
+											)
+										});
+									(b, prev_level)
+								}),
 						);
 					}
 				}
 
-				continue;
+				continue
 			}
 
 			match self.surface.next() {
@@ -310,46 +325,50 @@ impl<'a, H, Number> DrilldownIteratorEssence<'a, H, Number>
 
 /// Exploring drilldown operator.
 pub struct DrilldownIterator<'a, H, Number>
-	where
-		Number: BlockNumber,
-		H: Hasher,
-		H::Out: 'a,
+where
+	Number: BlockNumber,
+	H: Hasher,
+	H::Out: 'a,
 {
 	essence: DrilldownIteratorEssence<'a, H, Number>,
 }
 
 impl<'a, H: Hasher, Number: BlockNumber> Iterator for DrilldownIterator<'a, H, Number>
-	where H::Out: Encode
+where
+	H::Out: Encode,
 {
 	type Item = Result<(Number, u32), String>;
 
 	fn next(&mut self) -> Option<Self::Item> {
-		self.essence.next(|storage, root, key|
-			TrieBackendEssence::<_, H>::new(TrieBackendAdapter::new(storage), root).storage(key))
+		self.essence.next(|storage, root, key| {
+			TrieBackendEssence::<_, H>::new(TrieBackendAdapter::new(storage), root).storage(key)
+		})
 	}
 }
 
 /// Proving drilldown iterator.
 struct ProvingDrilldownIterator<'a, H, Number>
-	where
-		Number: BlockNumber,
-		H: Hasher,
-		H::Out: 'a,
+where
+	Number: BlockNumber,
+	H: Hasher,
+	H::Out: 'a,
 {
 	essence: DrilldownIteratorEssence<'a, H, Number>,
 	proof_recorder: RefCell<Recorder<H::Out>>,
 }
 
 impl<'a, H, Number> ProvingDrilldownIterator<'a, H, Number>
-	where
-		Number: BlockNumber,
-		H: Hasher,
-		H::Out: 'a,
+where
+	Number: BlockNumber,
+	H: Hasher,
+	H::Out: 'a,
 {
 	/// Consume the iterator, extracting the gathered proof in lexicographical order
 	/// by value.
 	pub fn extract_proof(self) -> Vec<Vec<u8>> {
-		self.proof_recorder.into_inner().drain()
+		self.proof_recorder
+			.into_inner()
+			.drain()
 			.into_iter()
 			.map(|n| n.data.to_vec())
 			.collect()
@@ -357,32 +376,34 @@ impl<'a, H, Number> ProvingDrilldownIterator<'a, H, Number>
 }
 
 impl<'a, H, Number> Iterator for ProvingDrilldownIterator<'a, H, Number>
-	where
-		Number: BlockNumber,
-		H: Hasher,
-		H::Out: 'a + Codec,
+where
+	Number: BlockNumber,
+	H: Hasher,
+	H::Out: 'a + Codec,
 {
 	type Item = Result<(Number, u32), String>;
 
 	fn next(&mut self) -> Option<Self::Item> {
-		let proof_recorder = &mut *self.proof_recorder.try_borrow_mut()
+		let proof_recorder = &mut *self
+			.proof_recorder
+			.try_borrow_mut()
 			.expect("only fails when already borrowed; storage() is non-reentrant; qed");
-		self.essence.next(|storage, root, key|
+		self.essence.next(|storage, root, key| {
 			ProvingBackendRecorder::<_, H> {
 				backend: &TrieBackendEssence::new(TrieBackendAdapter::new(storage), root),
 				proof_recorder,
-			}.storage(key))
+			}
+			.storage(key)
+		})
 	}
 }
 
 #[cfg(test)]
 mod tests {
-	use std::iter::FromIterator;
-	use crate::changes_trie::Configuration;
-	use crate::changes_trie::input::InputPair;
-	use crate::changes_trie::storage::InMemoryStorage;
-	use sp_runtime::traits::BlakeTwo256;
 	use super::*;
+	use crate::changes_trie::{input::InputPair, storage::InMemoryStorage, Configuration};
+	use sp_runtime::traits::BlakeTwo256;
+	use std::iter::FromIterator;
 
 	fn child_key() -> PrefixedStorageKey {
 		let child_info = sp_core::storage::ChildInfo::new_default(&b"1"[..]);
@@ -391,64 +412,98 @@ mod tests {
 
 	fn prepare_for_drilldown() -> (Configuration, InMemoryStorage<BlakeTwo256, u64>) {
 		let config = Configuration { digest_interval: 4, digest_levels: 2 };
-		let backend = InMemoryStorage::with_inputs(vec![
-			// digest: 1..4 => [(3, 0)]
-			(1, vec![
-			]),
-			(2, vec![
-			]),
-			(3, vec![
-				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: 3, key: vec![42] }, vec![0]),
-			]),
-			(4, vec![
-				InputPair::DigestIndex(DigestIndex { block: 4, key: vec![42] }, vec![3]),
-			]),
-			// digest: 5..8 => [(6, 3), (8, 1+2)]
-			(5, vec![]),
-			(6, vec![
-				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: 6, key: vec![42] }, vec![3]),
-			]),
-			(7, vec![]),
-			(8, vec![
-				InputPair::ExtrinsicIndex(ExtrinsicIndex { block: 8, key: vec![42] }, vec![1, 2]),
-				InputPair::DigestIndex(DigestIndex { block: 8, key: vec![42] }, vec![6]),
-			]),
-			// digest: 9..12 => []
-			(9, vec![]),
-			(10, vec![]),
-			(11, vec![]),
-			(12, vec![]),
-			// digest: 0..16 => [4, 8]
-			(13, vec![]),
-			(14, vec![]),
-			(15, vec![]),
-			(16, vec![
-				InputPair::DigestIndex(DigestIndex { block: 16, key: vec![42] }, vec![4, 8]),
-			]),
-		], vec![(child_key(), vec![
-				(1, vec![
-					InputPair::ExtrinsicIndex(ExtrinsicIndex { block: 1, key: vec![42] }, vec![0]),
-				]),
-				(2, vec![
-					InputPair::ExtrinsicIndex(ExtrinsicIndex { block: 2, key: vec![42] }, vec![3]),
-				]),
-				(16, vec![
-					InputPair::ExtrinsicIndex(ExtrinsicIndex { block: 16, key: vec![42] }, vec![5]),
-
-					InputPair::DigestIndex(DigestIndex { block: 16, key: vec![42] }, vec![2]),
-				]),
-			]),
-		]);
+		let backend = InMemoryStorage::with_inputs(
+			vec![
+				// digest: 1..4 => [(3, 0)]
+				(1, vec![]),
+				(2, vec![]),
+				(
+					3,
+					vec![InputPair::ExtrinsicIndex(
+						ExtrinsicIndex { block: 3, key: vec![42] },
+						vec![0],
+					)],
+				),
+				(4, vec![InputPair::DigestIndex(DigestIndex { block: 4, key: vec![42] }, vec![3])]),
+				// digest: 5..8 => [(6, 3), (8, 1+2)]
+				(5, vec![]),
+				(
+					6,
+					vec![InputPair::ExtrinsicIndex(
+						ExtrinsicIndex { block: 6, key: vec![42] },
+						vec![3],
+					)],
+				),
+				(7, vec![]),
+				(
+					8,
+					vec![
+						InputPair::ExtrinsicIndex(
+							ExtrinsicIndex { block: 8, key: vec![42] },
+							vec![1, 2],
+						),
+						InputPair::DigestIndex(DigestIndex { block: 8, key: vec![42] }, vec![6]),
+					],
+				),
+				// digest: 9..12 => []
+				(9, vec![]),
+				(10, vec![]),
+				(11, vec![]),
+				(12, vec![]),
+				// digest: 0..16 => [4, 8]
+				(13, vec![]),
+				(14, vec![]),
+				(15, vec![]),
+				(
+					16,
+					vec![InputPair::DigestIndex(
+						DigestIndex { block: 16, key: vec![42] },
+						vec![4, 8],
+					)],
+				),
+			],
+			vec![(
+				child_key(),
+				vec![
+					(
+						1,
+						vec![InputPair::ExtrinsicIndex(
+							ExtrinsicIndex { block: 1, key: vec![42] },
+							vec![0],
+						)],
+					),
+					(
+						2,
+						vec![InputPair::ExtrinsicIndex(
+							ExtrinsicIndex { block: 2, key: vec![42] },
+							vec![3],
+						)],
+					),
+					(
+						16,
+						vec![
+							InputPair::ExtrinsicIndex(
+								ExtrinsicIndex { block: 16, key: vec![42] },
+								vec![5],
+							),
+							InputPair::DigestIndex(
+								DigestIndex { block: 16, key: vec![42] },
+								vec![2],
+							),
+						],
+					),
+				],
+			)],
+		);
 
 		(config, backend)
 	}
 
-	fn configuration_range<'a>(config: &'a Configuration, zero: u64) -> ConfigurationRange<'a, u64> {
-		ConfigurationRange {
-			config,
-			zero,
-			end: None,
-		}
+	fn configuration_range<'a>(
+		config: &'a Configuration,
+		zero: u64,
+	) -> ConfigurationRange<'a, u64> {
+		ConfigurationRange { config, zero, end: None }
 	}
 
 	#[test]
@@ -462,7 +517,8 @@ mod tests {
 			16,
 			None,
 			&[42],
-		).and_then(Result::from_iter);
+		)
+		.and_then(Result::from_iter);
 		assert_eq!(drilldown_result, Ok(vec![(8, 2), (8, 1), (6, 3), (3, 0)]));
 
 		let drilldown_result = key_changes::<BlakeTwo256, u64>(
@@ -473,7 +529,8 @@ mod tests {
 			4,
 			None,
 			&[42],
-		).and_then(Result::from_iter);
+		)
+		.and_then(Result::from_iter);
 		assert_eq!(drilldown_result, Ok(vec![]));
 
 		let drilldown_result = key_changes::<BlakeTwo256, u64>(
@@ -484,7 +541,8 @@ mod tests {
 			4,
 			None,
 			&[42],
-		).and_then(Result::from_iter);
+		)
+		.and_then(Result::from_iter);
 		assert_eq!(drilldown_result, Ok(vec![(3, 0)]));
 
 		let drilldown_result = key_changes::<BlakeTwo256, u64>(
@@ -495,7 +553,8 @@ mod tests {
 			7,
 			None,
 			&[42],
-		).and_then(Result::from_iter);
+		)
+		.and_then(Result::from_iter);
 		assert_eq!(drilldown_result, Ok(vec![(6, 3), (3, 0)]));
 
 		let drilldown_result = key_changes::<BlakeTwo256, u64>(
@@ -506,7 +565,8 @@ mod tests {
 			8,
 			None,
 			&[42],
-		).and_then(Result::from_iter);
+		)
+		.and_then(Result::from_iter);
 		assert_eq!(drilldown_result, Ok(vec![(8, 2), (8, 1)]));
 
 		let drilldown_result = key_changes::<BlakeTwo256, u64>(
@@ -517,7 +577,8 @@ mod tests {
 			8,
 			None,
 			&[42],
-		).and_then(Result::from_iter);
+		)
+		.and_then(Result::from_iter);
 		assert_eq!(drilldown_result, Ok(vec![(6, 3)]));
 	}
 
@@ -534,7 +595,9 @@ mod tests {
 			1000,
 			None,
 			&[42],
-		).and_then(|i| i.collect::<Result<Vec<_>, _>>()).is_err());
+		)
+		.and_then(|i| i.collect::<Result<Vec<_>, _>>())
+		.is_err());
 
 		assert!(key_changes::<BlakeTwo256, u64>(
 			configuration_range(&config, 0),
@@ -544,7 +607,9 @@ mod tests {
 			1000,
 			Some(&child_key()),
 			&[42],
-		).and_then(|i| i.collect::<Result<Vec<_>, _>>()).is_err());
+		)
+		.and_then(|i| i.collect::<Result<Vec<_>, _>>())
+		.is_err());
 	}
 
 	#[test]
@@ -558,7 +623,8 @@ mod tests {
 			50,
 			None,
 			&[42],
-		).is_err());
+		)
+		.is_err());
 		assert!(key_changes::<BlakeTwo256, u64>(
 			configuration_range(&config, 0),
 			&storage,
@@ -567,10 +633,10 @@ mod tests {
 			100,
 			None,
 			&[42],
-		).is_err());
+		)
+		.is_err());
 	}
 
-
 	#[test]
 	fn proving_drilldown_iterator_works() {
 		// happens on remote full node:
@@ -578,13 +644,27 @@ mod tests {
 		// create drilldown iterator that records all trie nodes during drilldown
 		let (remote_config, remote_storage) = prepare_for_drilldown();
 		let remote_proof = key_changes_proof::<BlakeTwo256, u64>(
-			configuration_range(&remote_config, 0), &remote_storage, 1,
-			&AnchorBlockId { hash: Default::default(), number: 16 }, 16, None, &[42]).unwrap();
+			configuration_range(&remote_config, 0),
+			&remote_storage,
+			1,
+			&AnchorBlockId { hash: Default::default(), number: 16 },
+			16,
+			None,
+			&[42],
+		)
+		.unwrap();
 
 		let (remote_config, remote_storage) = prepare_for_drilldown();
 		let remote_proof_child = key_changes_proof::<BlakeTwo256, u64>(
-			configuration_range(&remote_config, 0), &remote_storage, 1,
-			&AnchorBlockId { hash: Default::default(), number: 16 }, 16, Some(&child_key()), &[42]).unwrap();
+			configuration_range(&remote_config, 0),
+			&remote_storage,
+			1,
+			&AnchorBlockId { hash: Default::default(), number: 16 },
+			16,
+			Some(&child_key()),
+			&[42],
+		)
+		.unwrap();
 
 		// happens on local light node:
 
@@ -592,14 +672,28 @@ mod tests {
 		let (local_config, local_storage) = prepare_for_drilldown();
 		local_storage.clear_storage();
 		let local_result = key_changes_proof_check::<BlakeTwo256, u64>(
-			configuration_range(&local_config, 0), &local_storage, remote_proof, 1,
-			&AnchorBlockId { hash: Default::default(), number: 16 }, 16, None, &[42]);
+			configuration_range(&local_config, 0),
+			&local_storage,
+			remote_proof,
+			1,
+			&AnchorBlockId { hash: Default::default(), number: 16 },
+			16,
+			None,
+			&[42],
+		);
 
 		let (local_config, local_storage) = prepare_for_drilldown();
 		local_storage.clear_storage();
 		let local_result_child = key_changes_proof_check::<BlakeTwo256, u64>(
-			configuration_range(&local_config, 0), &local_storage, remote_proof_child, 1,
-			&AnchorBlockId { hash: Default::default(), number: 16 }, 16, Some(&child_key()), &[42]);
+			configuration_range(&local_config, 0),
+			&local_storage,
+			remote_proof_child,
+			1,
+			&AnchorBlockId { hash: Default::default(), number: 16 },
+			16,
+			Some(&child_key()),
+			&[42],
+		);
 
 		// check that drilldown result is the same as if it was happening at the full node
 		assert_eq!(local_result, Ok(vec![(8, 2), (8, 1), (6, 3), (3, 0)]));
@@ -620,12 +714,22 @@ mod tests {
 		// regular blocks: 89, 90, 91
 		let mut input = (1u64..92u64).map(|b| (b, vec![])).collect::<Vec<_>>();
 		// changed at block#63 and covered by L3 digest at block#64
-		input[63 - 1].1.push(InputPair::ExtrinsicIndex(ExtrinsicIndex { block: 63, key: vec![42] }, vec![0]));
-		input[64 - 1].1.push(InputPair::DigestIndex(DigestIndex { block: 64, key: vec![42] }, vec![63]));
+		input[63 - 1]
+			.1
+			.push(InputPair::ExtrinsicIndex(ExtrinsicIndex { block: 63, key: vec![42] }, vec![0]));
+		input[64 - 1]
+			.1
+			.push(InputPair::DigestIndex(DigestIndex { block: 64, key: vec![42] }, vec![63]));
 		// changed at block#79 and covered by L2 digest at block#80 + skewed digest at block#91
-		input[79 - 1].1.push(InputPair::ExtrinsicIndex(ExtrinsicIndex { block: 79, key: vec![42] }, vec![1]));
-		input[80 - 1].1.push(InputPair::DigestIndex(DigestIndex { block: 80, key: vec![42] }, vec![79]));
-		input[91 - 1].1.push(InputPair::DigestIndex(DigestIndex { block: 91, key: vec![42] }, vec![80]));
+		input[79 - 1]
+			.1
+			.push(InputPair::ExtrinsicIndex(ExtrinsicIndex { block: 79, key: vec![42] }, vec![1]));
+		input[80 - 1]
+			.1
+			.push(InputPair::DigestIndex(DigestIndex { block: 80, key: vec![42] }, vec![79]));
+		input[91 - 1]
+			.1
+			.push(InputPair::DigestIndex(DigestIndex { block: 91, key: vec![42] }, vec![80]));
 		let storage = InMemoryStorage::with_inputs(input, vec![]);
 
 		let drilldown_result = key_changes::<BlakeTwo256, u64>(
@@ -636,7 +740,8 @@ mod tests {
 			100_000u64,
 			None,
 			&[42],
-		).and_then(Result::from_iter);
+		)
+		.and_then(Result::from_iter);
 		assert_eq!(drilldown_result, Ok(vec![(79, 1), (63, 0)]));
 	}
 }
diff --git a/primitives/state-machine/src/changes_trie/input.rs b/primitives/state-machine/src/changes_trie/input.rs
index 85a8de0b78d8..426104295611 100644
--- a/primitives/state-machine/src/changes_trie/input.rs
+++ b/primitives/state-machine/src/changes_trie/input.rs
@@ -17,11 +17,8 @@
 
 //! Different types of changes trie input pairs.
 
-use codec::{Decode, Encode, Input, Output, Error};
-use crate::{
-	StorageKey, StorageValue,
-	changes_trie::BlockNumber
-};
+use crate::{changes_trie::BlockNumber, StorageKey, StorageValue};
+use codec::{Decode, Encode, Error, Input, Output};
 use sp_core::storage::PrefixedStorageKey;
 
 /// Key of { changed key => set of extrinsic indices } mapping.
@@ -140,7 +137,6 @@ impl<Number: BlockNumber> DigestIndex<Number> {
 	}
 }
 
-
 impl<Number: BlockNumber> Encode for DigestIndex<Number> {
 	fn encode_to<W: Output + ?Sized>(&self, dest: &mut W) {
 		dest.push_byte(2);
diff --git a/primitives/state-machine/src/changes_trie/mod.rs b/primitives/state-machine/src/changes_trie/mod.rs
index 105f3d7de6d3..7fedff1f1e2b 100644
--- a/primitives/state-machine/src/changes_trie/mod.rs
+++ b/primitives/state-machine/src/changes_trie/mod.rs
@@ -58,63 +58,86 @@ mod prune;
 mod storage;
 mod surface_iterator;
 
-pub use self::build_cache::{BuildCache, CachedBuildData, CacheAction};
-pub use self::storage::InMemoryStorage;
-pub use self::changes_iterator::{
-	key_changes, key_changes_proof,
-	key_changes_proof_check, key_changes_proof_check_with_db,
+pub use self::{
+	build_cache::{BuildCache, CacheAction, CachedBuildData},
+	changes_iterator::{
+		key_changes, key_changes_proof, key_changes_proof_check, key_changes_proof_check_with_db,
+	},
+	prune::prune,
+	storage::InMemoryStorage,
 };
-pub use self::prune::prune;
 
-use std::collections::{HashMap, HashSet};
-use std::convert::TryInto;
-use hash_db::{Hasher, Prefix};
-use num_traits::{One, Zero};
-use codec::{Decode, Encode};
-use sp_core;
-use sp_core::storage::PrefixedStorageKey;
-use sp_trie::{MemoryDB, DBValue, TrieMut};
-use sp_trie::trie_types::TrieDBMut;
 use crate::{
-	StorageKey,
 	backend::Backend,
-	overlayed_changes::OverlayedChanges,
 	changes_trie::{
 		build::prepare_input,
-		build_cache::{IncompleteCachedBuildData, IncompleteCacheAction},
+		build_cache::{IncompleteCacheAction, IncompleteCachedBuildData},
 	},
+	overlayed_changes::OverlayedChanges,
+	StorageKey,
+};
+use codec::{Decode, Encode};
+use hash_db::{Hasher, Prefix};
+use num_traits::{One, Zero};
+use sp_core::{self, storage::PrefixedStorageKey};
+use sp_trie::{trie_types::TrieDBMut, DBValue, MemoryDB, TrieMut};
+use std::{
+	collections::{HashMap, HashSet},
+	convert::TryInto,
 };
 
 /// Requirements for block number that can be used with changes tries.
 pub trait BlockNumber:
-	Send + Sync + 'static +
-	std::fmt::Display +
-	Clone +
-	From<u32> + TryInto<u32> + One + Zero +
-	PartialEq + Ord +
-	std::hash::Hash +
-	std::ops::Add<Self, Output=Self> + ::std::ops::Sub<Self, Output=Self> +
-	std::ops::Mul<Self, Output=Self> + ::std::ops::Div<Self, Output=Self> +
-	std::ops::Rem<Self, Output=Self> +
-	std::ops::AddAssign<Self> +
-	num_traits::CheckedMul + num_traits::CheckedSub +
-	Decode + Encode
-{}
-
-impl<T> BlockNumber for T where T:
-	Send + Sync + 'static +
-	std::fmt::Display +
-	Clone +
-	From<u32> + TryInto<u32> + One + Zero +
-	PartialEq + Ord +
-	std::hash::Hash +
-	std::ops::Add<Self, Output=Self> + ::std::ops::Sub<Self, Output=Self> +
-	std::ops::Mul<Self, Output=Self> + ::std::ops::Div<Self, Output=Self> +
-	std::ops::Rem<Self, Output=Self> +
-	std::ops::AddAssign<Self> +
-	num_traits::CheckedMul + num_traits::CheckedSub +
-	Decode + Encode,
-{}
+	Send
+	+ Sync
+	+ 'static
+	+ std::fmt::Display
+	+ Clone
+	+ From<u32>
+	+ TryInto<u32>
+	+ One
+	+ Zero
+	+ PartialEq
+	+ Ord
+	+ std::hash::Hash
+	+ std::ops::Add<Self, Output = Self>
+	+ ::std::ops::Sub<Self, Output = Self>
+	+ std::ops::Mul<Self, Output = Self>
+	+ ::std::ops::Div<Self, Output = Self>
+	+ std::ops::Rem<Self, Output = Self>
+	+ std::ops::AddAssign<Self>
+	+ num_traits::CheckedMul
+	+ num_traits::CheckedSub
+	+ Decode
+	+ Encode
+{
+}
+
+impl<T> BlockNumber for T where
+	T: Send
+		+ Sync
+		+ 'static
+		+ std::fmt::Display
+		+ Clone
+		+ From<u32>
+		+ TryInto<u32>
+		+ One
+		+ Zero
+		+ PartialEq
+		+ Ord
+		+ std::hash::Hash
+		+ std::ops::Add<Self, Output = Self>
+		+ ::std::ops::Sub<Self, Output = Self>
+		+ std::ops::Mul<Self, Output = Self>
+		+ ::std::ops::Div<Self, Output = Self>
+		+ std::ops::Rem<Self, Output = Self>
+		+ std::ops::AddAssign<Self>
+		+ num_traits::CheckedMul
+		+ num_traits::CheckedSub
+		+ Decode
+		+ Encode
+{
+}
 
 /// Block identifier that could be used to determine fork of this block.
 #[derive(Debug)]
@@ -143,7 +166,11 @@ pub trait RootsStorage<H: Hasher, Number: BlockNumber>: Send + Sync {
 	fn build_anchor(&self, hash: H::Out) -> Result<AnchorBlockId<H::Out, Number>, String>;
 	/// Get changes trie root for the block with given number which is an ancestor (or the block
 	/// itself) of the anchor_block (i.e. anchor_block.number >= block).
-	fn root(&self, anchor: &AnchorBlockId<H::Out, Number>, block: Number) -> Result<Option<H::Out>, String>;
+	fn root(
+		&self,
+		anchor: &AnchorBlockId<H::Out, Number>,
+		block: Number,
+	) -> Result<Option<H::Out>, String>;
 }
 
 /// Changes trie storage. Provides access to trie roots and trie nodes.
@@ -162,9 +189,13 @@ pub trait Storage<H: Hasher, Number: BlockNumber>: RootsStorage<H, Number> {
 }
 
 /// Changes trie storage -> trie backend essence adapter.
-pub struct TrieBackendStorageAdapter<'a, H: Hasher, Number: BlockNumber>(pub &'a dyn Storage<H, Number>);
+pub struct TrieBackendStorageAdapter<'a, H: Hasher, Number: BlockNumber>(
+	pub &'a dyn Storage<H, Number>,
+);
 
-impl<'a, H: Hasher, N: BlockNumber> crate::TrieBackendStorage<H> for TrieBackendStorageAdapter<'a, H, N> {
+impl<'a, H: Hasher, N: BlockNumber> crate::TrieBackendStorage<H>
+	for TrieBackendStorageAdapter<'a, H, N>
+{
 	type Overlay = sp_trie::MemoryDB<H>;
 
 	fn get(&self, key: &H::Out, prefix: Prefix) -> Result<Option<DBValue>, String> {
@@ -188,26 +219,14 @@ pub struct ConfigurationRange<'a, N> {
 
 impl<'a, H, Number> State<'a, H, Number> {
 	/// Create state with given config and storage.
-	pub fn new(
-		config: Configuration,
-		zero: Number,
-		storage: &'a dyn Storage<H, Number>,
-	) -> Self {
-		Self {
-			config,
-			zero,
-			storage,
-		}
+	pub fn new(config: Configuration, zero: Number, storage: &'a dyn Storage<H, Number>) -> Self {
+		Self { config, zero, storage }
 	}
 }
 
 impl<'a, H, Number: Clone> Clone for State<'a, H, Number> {
 	fn clone(&self) -> Self {
-		State {
-			config: self.config.clone(),
-			zero: self.zero.clone(),
-			storage: self.storage,
-		}
+		State { config: self.config.clone(), zero: self.zero.clone(), storage: self.storage }
 	}
 }
 
@@ -227,20 +246,24 @@ pub fn build_changes_trie<'a, B: Backend<H>, H: Hasher, Number: BlockNumber>(
 	parent_hash: H::Out,
 	panic_on_storage_error: bool,
 ) -> Result<Option<(MemoryDB<H>, H::Out, CacheAction<H::Out, Number>)>, ()>
-	where
-		H::Out: Ord + 'static + Encode,
+where
+	H::Out: Ord + 'static + Encode,
 {
 	/// Panics when `res.is_err() && panic`, otherwise it returns `Err(())` on an error.
 	fn maybe_panic<R, E: std::fmt::Debug>(
 		res: std::result::Result<R, E>,
 		panic: bool,
 	) -> std::result::Result<R, ()> {
-		res.map(Ok)
-			.unwrap_or_else(|e| if panic {
-				panic!("changes trie: storage access is not allowed to fail within runtime: {:?}", e)
+		res.map(Ok).unwrap_or_else(|e| {
+			if panic {
+				panic!(
+					"changes trie: storage access is not allowed to fail within runtime: {:?}",
+					e
+				)
 			} else {
 				Err(())
-			})
+			}
+		})
 	}
 
 	// when storage isn't provided, changes tries aren't created
@@ -255,11 +278,12 @@ pub fn build_changes_trie<'a, B: Backend<H>, H: Hasher, Number: BlockNumber>(
 
 	// prepare configuration range - we already know zero block. Current block may be the end block if configuration
 	// has been changed in this block
-	let is_config_changed = match changes.storage(sp_core::storage::well_known_keys::CHANGES_TRIE_CONFIG) {
-		Some(Some(new_config)) => new_config != &state.config.encode()[..],
-		Some(None) => true,
-		None => false,
-	};
+	let is_config_changed =
+		match changes.storage(sp_core::storage::well_known_keys::CHANGES_TRIE_CONFIG) {
+			Some(Some(new_config)) => new_config != &state.config.encode()[..],
+			Some(None) => true,
+			None => false,
+		};
 	let config_range = ConfigurationRange {
 		config: &state.config,
 		zero: state.zero.clone(),
@@ -303,10 +327,8 @@ pub fn build_changes_trie<'a, B: Backend<H>, H: Hasher, Number: BlockNumber>(
 				maybe_panic(trie.insert(&key, &value), panic_on_storage_error)?;
 			}
 
-			cache_action = cache_action.insert(
-				Some(child_index.storage_key.clone()),
-				storage_changed_keys,
-			);
+			cache_action =
+				cache_action.insert(Some(child_index.storage_key.clone()), storage_changed_keys);
 		}
 		if not_empty {
 			child_roots.push(input::InputPair::ChildIndex(child_index, root.as_ref().to_vec()));
@@ -331,10 +353,7 @@ pub fn build_changes_trie<'a, B: Backend<H>, H: Hasher, Number: BlockNumber>(
 			maybe_panic(trie.insert(&key, &value), panic_on_storage_error)?;
 		}
 
-		cache_action = cache_action.insert(
-			None,
-			storage_changed_keys,
-		);
+		cache_action = cache_action.insert(None, storage_changed_keys);
 	}
 
 	let cache_action = cache_action.complete(block, &root);
@@ -350,20 +369,21 @@ fn prepare_cached_build_data<Number: BlockNumber>(
 	// because it'll never be used again for building other tries
 	// => let's clear the cache
 	if !config.config.is_digest_build_enabled() {
-		return IncompleteCacheAction::Clear;
+		return IncompleteCacheAction::Clear
 	}
 
 	// when this is the last block where current configuration is active
 	// => let's clear the cache
 	if config.end.as_ref() == Some(&block) {
-		return IncompleteCacheAction::Clear;
+		return IncompleteCacheAction::Clear
 	}
 
 	// we do not need to cache anything when top-level digest trie is created, because
 	// it'll never be used again for building other tries
 	// => let's clear the cache
 	match config.config.digest_level_at_block(config.zero.clone(), block) {
-		Some((digest_level, _, _)) if digest_level == config.config.digest_levels => IncompleteCacheAction::Clear,
+		Some((digest_level, _, _)) if digest_level == config.config.digest_levels =>
+			IncompleteCacheAction::Clear,
 		_ => IncompleteCacheAction::CacheBuildData(IncompleteCachedBuildData::new()),
 	}
 }
@@ -399,6 +419,9 @@ mod tests {
 	fn cache_is_cleared_when_end_block_of_configuration_is_built() {
 		let config = Configuration { digest_interval: 8, digest_levels: 2 };
 		let config_range = ConfigurationRange { zero: 0, end: Some(4u32), config: &config };
-		assert_eq!(prepare_cached_build_data(config_range.clone(), 4u32), IncompleteCacheAction::Clear);
+		assert_eq!(
+			prepare_cached_build_data(config_range.clone(), 4u32),
+			IncompleteCacheAction::Clear
+		);
 	}
 }
diff --git a/primitives/state-machine/src/changes_trie/prune.rs b/primitives/state-machine/src/changes_trie/prune.rs
index 754e3893f966..2ca540562b47 100644
--- a/primitives/state-machine/src/changes_trie/prune.rs
+++ b/primitives/state-machine/src/changes_trie/prune.rs
@@ -17,16 +17,20 @@
 
 //! Changes trie pruning-related functions.
 
+use crate::{
+	changes_trie::{
+		input::{ChildIndex, InputKey},
+		storage::TrieBackendAdapter,
+		AnchorBlockId, BlockNumber, Storage,
+	},
+	proving_backend::ProvingBackendRecorder,
+	trie_backend_essence::TrieBackendEssence,
+};
+use codec::{Codec, Decode};
 use hash_db::Hasher;
-use sp_trie::Recorder;
 use log::warn;
 use num_traits::One;
-use crate::proving_backend::ProvingBackendRecorder;
-use crate::trie_backend_essence::TrieBackendEssence;
-use crate::changes_trie::{AnchorBlockId, Storage, BlockNumber};
-use crate::changes_trie::storage::TrieBackendAdapter;
-use crate::changes_trie::input::{ChildIndex, InputKey};
-use codec::{Decode, Codec};
+use sp_trie::Recorder;
 
 /// Prune obsolete changes tries. Pruning happens at the same block, where highest
 /// level digest is created. Pruning guarantees to save changes tries for last
@@ -38,12 +42,14 @@ pub fn prune<H: Hasher, Number: BlockNumber, F: FnMut(H::Out)>(
 	last: Number,
 	current_block: &AnchorBlockId<H::Out, Number>,
 	mut remove_trie_node: F,
-) where H::Out: Codec {
+) where
+	H::Out: Codec,
+{
 	// delete changes trie for every block in range
 	let mut block = first;
 	loop {
 		if block >= last.clone() + One::one() {
-			break;
+			break
 		}
 
 		let prev_block = block.clone();
@@ -56,7 +62,7 @@ pub fn prune<H: Hasher, Number: BlockNumber, F: FnMut(H::Out)>(
 			Err(error) => {
 				// try to delete other tries
 				warn!(target: "trie", "Failed to read changes trie root from DB: {}", error);
-				continue;
+				continue
 			},
 		};
 		let children_roots = {
@@ -91,8 +97,9 @@ fn prune_trie<H: Hasher, Number: BlockNumber, F: FnMut(H::Out)>(
 	storage: &dyn Storage<H, Number>,
 	root: H::Out,
 	remove_trie_node: &mut F,
-) where H::Out: Codec {
-
+) where
+	H::Out: Codec,
+{
 	// enumerate all changes trie' keys, recording all nodes that have been 'touched'
 	// (effectively - all changes trie nodes)
 	let mut proof_recorder: Recorder<H::Out> = Default::default();
@@ -113,14 +120,13 @@ fn prune_trie<H: Hasher, Number: BlockNumber, F: FnMut(H::Out)>(
 
 #[cfg(test)]
 mod tests {
-	use std::collections::HashSet;
-	use sp_trie::MemoryDB;
-	use sp_core::H256;
-	use crate::backend::insert_into_memory_db;
-	use crate::changes_trie::storage::InMemoryStorage;
+	use super::*;
+	use crate::{backend::insert_into_memory_db, changes_trie::storage::InMemoryStorage};
 	use codec::Encode;
+	use sp_core::H256;
 	use sp_runtime::traits::BlakeTwo256;
-	use super::*;
+	use sp_trie::MemoryDB;
+	use std::collections::HashSet;
 
 	fn prune_by_collect(
 		storage: &dyn Storage<BlakeTwo256, u64>,
@@ -130,8 +136,9 @@ mod tests {
 	) -> HashSet<H256> {
 		let mut pruned_trie_nodes = HashSet::new();
 		let anchor = AnchorBlockId { hash: Default::default(), number: current_block };
-		prune(storage, first, last, &anchor,
-			|node| { pruned_trie_nodes.insert(node); });
+		prune(storage, first, last, &anchor, |node| {
+			pruned_trie_nodes.insert(node);
+		});
 		pruned_trie_nodes
 	}
 
@@ -139,28 +146,36 @@ mod tests {
 	fn prune_works() {
 		fn prepare_storage() -> InMemoryStorage<BlakeTwo256, u64> {
 			let child_info = sp_core::storage::ChildInfo::new_default(&b"1"[..]);
-			let child_key = ChildIndex { block: 67u64, storage_key: child_info.prefixed_storage_key() }.encode();
+			let child_key =
+				ChildIndex { block: 67u64, storage_key: child_info.prefixed_storage_key() }
+					.encode();
 			let mut mdb1 = MemoryDB::<BlakeTwo256>::default();
-			let root1 = insert_into_memory_db::<BlakeTwo256, _>(
-				&mut mdb1, vec![(vec![10], vec![20])]).unwrap();
+			let root1 =
+				insert_into_memory_db::<BlakeTwo256, _>(&mut mdb1, vec![(vec![10], vec![20])])
+					.unwrap();
 			let mut mdb2 = MemoryDB::<BlakeTwo256>::default();
 			let root2 = insert_into_memory_db::<BlakeTwo256, _>(
 				&mut mdb2,
 				vec![(vec![11], vec![21]), (vec![12], vec![22])],
-			).unwrap();
+			)
+			.unwrap();
 			let mut mdb3 = MemoryDB::<BlakeTwo256>::default();
-			let ch_root3 = insert_into_memory_db::<BlakeTwo256, _>(
-				&mut mdb3, vec![(vec![110], vec![120])]).unwrap();
-			let root3 = insert_into_memory_db::<BlakeTwo256, _>(&mut mdb3, vec![
-				(vec![13], vec![23]),
-				(vec![14], vec![24]),
-				(child_key, ch_root3.as_ref().encode()),
-			]).unwrap();
+			let ch_root3 =
+				insert_into_memory_db::<BlakeTwo256, _>(&mut mdb3, vec![(vec![110], vec![120])])
+					.unwrap();
+			let root3 = insert_into_memory_db::<BlakeTwo256, _>(
+				&mut mdb3,
+				vec![
+					(vec![13], vec![23]),
+					(vec![14], vec![24]),
+					(child_key, ch_root3.as_ref().encode()),
+				],
+			)
+			.unwrap();
 			let mut mdb4 = MemoryDB::<BlakeTwo256>::default();
-			let root4 = insert_into_memory_db::<BlakeTwo256, _>(
-				&mut mdb4,
-				vec![(vec![15], vec![25])],
-			).unwrap();
+			let root4 =
+				insert_into_memory_db::<BlakeTwo256, _>(&mut mdb4, vec![(vec![15], vec![25])])
+					.unwrap();
 			let storage = InMemoryStorage::new();
 			storage.insert(65, root1, mdb1);
 			storage.insert(66, root2, mdb2);
diff --git a/primitives/state-machine/src/changes_trie/storage.rs b/primitives/state-machine/src/changes_trie/storage.rs
index e08fe36126c7..bd5e3a32b565 100644
--- a/primitives/state-machine/src/changes_trie/storage.rs
+++ b/primitives/state-machine/src/changes_trie/storage.rs
@@ -17,22 +17,21 @@
 
 //! Changes trie storage utilities.
 
-use std::collections::{BTreeMap, HashSet, HashMap};
-use hash_db::{Hasher, Prefix, EMPTY_PREFIX};
-use sp_core::storage::PrefixedStorageKey;
-use sp_trie::DBValue;
-use sp_trie::MemoryDB;
-use parking_lot::RwLock;
 use crate::{
-	StorageKey,
+	changes_trie::{AnchorBlockId, BlockNumber, BuildCache, RootsStorage, Storage},
 	trie_backend_essence::TrieBackendStorage,
-	changes_trie::{BuildCache, RootsStorage, Storage, AnchorBlockId, BlockNumber},
+	StorageKey,
 };
+use hash_db::{Hasher, Prefix, EMPTY_PREFIX};
+use parking_lot::RwLock;
+use sp_core::storage::PrefixedStorageKey;
+use sp_trie::{DBValue, MemoryDB};
+use std::collections::{BTreeMap, HashMap, HashSet};
 
 #[cfg(test)]
 use crate::backend::insert_into_memory_db;
 #[cfg(test)]
-use crate::changes_trie::input::{InputPair, ChildIndex};
+use crate::changes_trie::input::{ChildIndex, InputPair};
 
 /// In-memory implementation of changes trie storage.
 pub struct InMemoryStorage<H: Hasher, Number: BlockNumber> {
@@ -55,10 +54,7 @@ impl<H: Hasher, Number: BlockNumber> InMemoryStorage<H, Number> {
 	/// Creates storage from given in-memory database.
 	pub fn with_db(mdb: MemoryDB<H>) -> Self {
 		Self {
-			data: RwLock::new(InMemoryStorageData {
-				roots: BTreeMap::new(),
-				mdb,
-			}),
+			data: RwLock::new(InMemoryStorageData { roots: BTreeMap::new(), mdb }),
 			cache: BuildCache::new(),
 		}
 	}
@@ -72,7 +68,7 @@ impl<H: Hasher, Number: BlockNumber> InMemoryStorage<H, Number> {
 	pub fn with_proof(proof: Vec<Vec<u8>>) -> Self {
 		use hash_db::HashDB;
 
- 		let mut proof_db = MemoryDB::<H>::default();
+		let mut proof_db = MemoryDB::<H>::default();
 		for item in proof {
 			proof_db.insert(EMPTY_PREFIX, &item);
 		}
@@ -104,7 +100,8 @@ impl<H: Hasher, Number: BlockNumber> InMemoryStorage<H, Number> {
 		let mut roots = BTreeMap::new();
 		for (storage_key, child_input) in children_inputs {
 			for (block, pairs) in child_input {
-				let root = insert_into_memory_db::<H, _>(&mut mdb, pairs.into_iter().map(Into::into));
+				let root =
+					insert_into_memory_db::<H, _>(&mut mdb, pairs.into_iter().map(Into::into));
 
 				if let Some(root) = root {
 					let ix = if let Some(ix) = top_inputs.iter().position(|v| v.0 == block) {
@@ -129,17 +126,14 @@ impl<H: Hasher, Number: BlockNumber> InMemoryStorage<H, Number> {
 		}
 
 		InMemoryStorage {
-			data: RwLock::new(InMemoryStorageData {
-				roots,
-				mdb,
-			}),
+			data: RwLock::new(InMemoryStorageData { roots, mdb }),
 			cache: BuildCache::new(),
 		}
 	}
 
 	#[cfg(test)]
 	pub fn clear_storage(&self) {
-		self.data.write().mdb = MemoryDB::default();	// use new to be more correct
+		self.data.write().mdb = MemoryDB::default(); // use new to be more correct
 	}
 
 	#[cfg(test)]
@@ -165,13 +159,20 @@ impl<H: Hasher, Number: BlockNumber> InMemoryStorage<H, Number> {
 
 impl<H: Hasher, Number: BlockNumber> RootsStorage<H, Number> for InMemoryStorage<H, Number> {
 	fn build_anchor(&self, parent_hash: H::Out) -> Result<AnchorBlockId<H::Out, Number>, String> {
-		self.data.read().roots.iter()
+		self.data
+			.read()
+			.roots
+			.iter()
 			.find(|(_, v)| **v == parent_hash)
 			.map(|(k, _)| AnchorBlockId { hash: parent_hash, number: k.clone() })
 			.ok_or_else(|| format!("Can't find associated number for block {:?}", parent_hash))
 	}
 
-	fn root(&self, _anchor_block: &AnchorBlockId<H::Out, Number>, block: Number) -> Result<Option<H::Out>, String> {
+	fn root(
+		&self,
+		_anchor_block: &AnchorBlockId<H::Out, Number>,
+		block: Number,
+	) -> Result<Option<H::Out>, String> {
 		Ok(self.data.read().roots.get(&block).cloned())
 	}
 }
@@ -201,9 +202,9 @@ impl<'a, H: Hasher, Number: BlockNumber> TrieBackendAdapter<'a, H, Number> {
 }
 
 impl<'a, H, Number> TrieBackendStorage<H> for TrieBackendAdapter<'a, H, Number>
-	where
-		Number: BlockNumber,
-		H: Hasher,
+where
+	Number: BlockNumber,
+	H: Hasher,
 {
 	type Overlay = MemoryDB<H>;
 
diff --git a/primitives/state-machine/src/changes_trie/surface_iterator.rs b/primitives/state-machine/src/changes_trie/surface_iterator.rs
index 13da8511f3f9..509c02ee379f 100644
--- a/primitives/state-machine/src/changes_trie/surface_iterator.rs
+++ b/primitives/state-machine/src/changes_trie/surface_iterator.rs
@@ -21,8 +21,8 @@
 //! of points at the terrain (mountains and valleys) inside this range that have to be drilled down to
 //! search for gems.
 
+use crate::changes_trie::{BlockNumber, ConfigurationRange};
 use num_traits::One;
-use crate::changes_trie::{ConfigurationRange, BlockNumber};
 
 /// Returns surface iterator for given range of blocks.
 ///
@@ -34,12 +34,8 @@ pub fn surface_iterator<'a, Number: BlockNumber>(
 	begin: Number,
 	end: Number,
 ) -> Result<SurfaceIterator<'a, Number>, String> {
-	let (current, current_begin, digest_step, digest_level) = lower_bound_max_digest(
-		config.clone(),
-		max.clone(),
-		begin.clone(),
-		end,
-	)?;
+	let (current, current_begin, digest_step, digest_level) =
+		lower_bound_max_digest(config.clone(), max.clone(), begin.clone(), end)?;
 	Ok(SurfaceIterator {
 		config,
 		begin,
@@ -89,7 +85,8 @@ impl<'a, Number: BlockNumber> Iterator for SurfaceIterator<'a, Number> {
 					self.begin.clone(),
 					next,
 				);
-				let (current, current_begin, digest_step, digest_level) = match max_digest_interval {
+				let (current, current_begin, digest_step, digest_level) = match max_digest_interval
+				{
 					Err(err) => return Some(Err(err)),
 					Ok(range) => range,
 				};
@@ -114,14 +111,21 @@ fn lower_bound_max_digest<'a, Number: BlockNumber>(
 	end: Number,
 ) -> Result<(Number, Number, u32, Option<u32>), String> {
 	if end > max || begin > end {
-		return Err(format!("invalid changes range: {}..{}/{}", begin, end, max));
+		return Err(format!("invalid changes range: {}..{}/{}", begin, end, max))
 	}
-	if begin <= config.zero || config.end.as_ref().map(|config_end| end > *config_end).unwrap_or(false) {
-		return Err(format!("changes trie range is not covered by configuration: {}..{}/{}..{}",
-			begin, end, config.zero, match config.end.as_ref() {
+	if begin <= config.zero ||
+		config.end.as_ref().map(|config_end| end > *config_end).unwrap_or(false)
+	{
+		return Err(format!(
+			"changes trie range is not covered by configuration: {}..{}/{}..{}",
+			begin,
+			end,
+			config.zero,
+			match config.end.as_ref() {
 				Some(config_end) => format!("{}", config_end),
 				None => "None".into(),
-			}));
+			}
+		))
 	}
 
 	let mut digest_level = 0u32;
@@ -135,10 +139,16 @@ fn lower_bound_max_digest<'a, Number: BlockNumber>(
 			let new_digest_level = digest_level + 1;
 			let new_digest_step = digest_step * config.config.digest_interval;
 			let new_digest_interval = config.config.digest_interval * {
-				if digest_interval == 0 { 1 } else { digest_interval }
+				if digest_interval == 0 {
+					1
+				} else {
+					digest_interval
+				}
 			};
-			let new_digest_begin = config.zero.clone() + ((current.clone() - One::one() - config.zero.clone())
-				/ new_digest_interval.into()) * new_digest_interval.into();
+			let new_digest_begin = config.zero.clone() +
+				((current.clone() - One::one() - config.zero.clone()) /
+					new_digest_interval.into()) *
+					new_digest_interval.into();
 			let new_digest_end = new_digest_begin.clone() + new_digest_interval.into();
 			let new_current = new_digest_begin.clone() + new_digest_interval.into();
 
@@ -150,16 +160,20 @@ fn lower_bound_max_digest<'a, Number: BlockNumber>(
 						skewed_digest_end.clone(),
 					);
 					if let Some(skewed_digest_start) = skewed_digest_start {
-						let skewed_digest_range = (skewed_digest_end.clone() - skewed_digest_start.clone())
-							.try_into().ok()
-							.expect("skewed digest range is always <= max level digest range;\
-								max level digest range always fits u32; qed");
+						let skewed_digest_range = (skewed_digest_end.clone() -
+							skewed_digest_start.clone())
+						.try_into()
+						.ok()
+						.expect(
+							"skewed digest range is always <= max level digest range;\
+								max level digest range always fits u32; qed",
+						);
 						return Ok((
 							skewed_digest_end.clone(),
 							skewed_digest_start,
 							skewed_digest_range,
 							None,
-						));
+						))
 					}
 				}
 			}
@@ -169,7 +183,7 @@ fn lower_bound_max_digest<'a, Number: BlockNumber>(
 				if begin < new_digest_begin {
 					current_begin = new_digest_begin;
 				}
-				break;
+				break
 			}
 
 			// we can (and will) use this digest
@@ -181,30 +195,24 @@ fn lower_bound_max_digest<'a, Number: BlockNumber>(
 
 			// if current digest covers the whole range => no need to use next level digest
 			if current_begin <= begin && new_digest_end >= end {
-				break;
+				break
 			}
 		}
 	}
 
-	Ok((
-		current,
-		current_begin,
-		digest_step,
-		Some(digest_level),
-	))
+	Ok((current, current_begin, digest_step, Some(digest_level)))
 }
 
 #[cfg(test)]
 mod tests {
-	use crate::changes_trie::{Configuration};
 	use super::*;
+	use crate::changes_trie::Configuration;
 
-	fn configuration_range<'a>(config: &'a Configuration, zero: u64) -> ConfigurationRange<'a, u64> {
-		ConfigurationRange {
-			config,
-			zero,
-			end: None,
-		}
+	fn configuration_range<'a>(
+		config: &'a Configuration,
+		zero: u64,
+	) -> ConfigurationRange<'a, u64> {
+		ConfigurationRange { config, zero, end: None }
 	}
 
 	#[test]
@@ -213,13 +221,15 @@ mod tests {
 
 		// when config activates at 0
 		assert_eq!(
-			lower_bound_max_digest(configuration_range(&config, 0u64), 100_000u64, 20u64, 180u64).unwrap(),
+			lower_bound_max_digest(configuration_range(&config, 0u64), 100_000u64, 20u64, 180u64)
+				.unwrap(),
 			(192, 176, 16, Some(2)),
 		);
 
 		// when config activates at 30
 		assert_eq!(
-			lower_bound_max_digest(configuration_range(&config, 30u64), 100_000u64, 50u64, 210u64).unwrap(),
+			lower_bound_max_digest(configuration_range(&config, 30u64), 100_000u64, 50u64, 210u64)
+				.unwrap(),
 			(222, 206, 16, Some(2)),
 		);
 	}
@@ -230,40 +240,61 @@ mod tests {
 
 		// when config activates at 0
 		assert_eq!(
-			surface_iterator(
-				configuration_range(&config, 0u64),
-				100_000u64,
-				40u64,
-				180u64,
-			).unwrap().collect::<Vec<_>>(),
+			surface_iterator(configuration_range(&config, 0u64), 100_000u64, 40u64, 180u64,)
+				.unwrap()
+				.collect::<Vec<_>>(),
 			vec![
-				Ok((192, Some(2))), Ok((176, Some(2))), Ok((160, Some(2))), Ok((144, Some(2))),
-				Ok((128, Some(2))), Ok((112, Some(2))), Ok((96, Some(2))), Ok((80, Some(2))),
-				Ok((64, Some(2))), Ok((48, Some(2))),
+				Ok((192, Some(2))),
+				Ok((176, Some(2))),
+				Ok((160, Some(2))),
+				Ok((144, Some(2))),
+				Ok((128, Some(2))),
+				Ok((112, Some(2))),
+				Ok((96, Some(2))),
+				Ok((80, Some(2))),
+				Ok((64, Some(2))),
+				Ok((48, Some(2))),
 			],
 		);
 
 		// when config activates at 30
 		assert_eq!(
-			surface_iterator(
-				configuration_range(&config, 30u64),
-				100_000u64,
-				40u64,
-				180u64,
-			).unwrap().collect::<Vec<_>>(),
+			surface_iterator(configuration_range(&config, 30u64), 100_000u64, 40u64, 180u64,)
+				.unwrap()
+				.collect::<Vec<_>>(),
 			vec![
-				Ok((190, Some(2))), Ok((174, Some(2))), Ok((158, Some(2))), Ok((142, Some(2))), Ok((126, Some(2))),
-				Ok((110, Some(2))), Ok((94, Some(2))), Ok((78, Some(2))), Ok((62, Some(2))), Ok((46, Some(2))),
+				Ok((190, Some(2))),
+				Ok((174, Some(2))),
+				Ok((158, Some(2))),
+				Ok((142, Some(2))),
+				Ok((126, Some(2))),
+				Ok((110, Some(2))),
+				Ok((94, Some(2))),
+				Ok((78, Some(2))),
+				Ok((62, Some(2))),
+				Ok((46, Some(2))),
 			],
 		);
 
 		// when config activates at 0 AND max block is before next digest
 		assert_eq!(
-			surface_iterator(configuration_range(&config, 0u64), 183u64, 40u64, 183u64).unwrap().collect::<Vec<_>>(),
+			surface_iterator(configuration_range(&config, 0u64), 183u64, 40u64, 183u64)
+				.unwrap()
+				.collect::<Vec<_>>(),
 			vec![
-				Ok((183, Some(0))), Ok((182, Some(0))), Ok((181, Some(0))), Ok((180, Some(1))),
-				Ok((176, Some(2))), Ok((160, Some(2))), Ok((144, Some(2))), Ok((128, Some(2))), Ok((112, Some(2))),
-				Ok((96, Some(2))), Ok((80, Some(2))), Ok((64, Some(2))), Ok((48, Some(2))),
+				Ok((183, Some(0))),
+				Ok((182, Some(0))),
+				Ok((181, Some(0))),
+				Ok((180, Some(1))),
+				Ok((176, Some(2))),
+				Ok((160, Some(2))),
+				Ok((144, Some(2))),
+				Ok((128, Some(2))),
+				Ok((112, Some(2))),
+				Ok((96, Some(2))),
+				Ok((80, Some(2))),
+				Ok((64, Some(2))),
+				Ok((48, Some(2))),
 			],
 		);
 	}
@@ -276,10 +307,19 @@ mod tests {
 		// when config activates at 0 AND ends at 170
 		config_range.end = Some(170);
 		assert_eq!(
-			surface_iterator(config_range, 100_000u64, 40u64, 170u64).unwrap().collect::<Vec<_>>(),
+			surface_iterator(config_range, 100_000u64, 40u64, 170u64)
+				.unwrap()
+				.collect::<Vec<_>>(),
 			vec![
-				Ok((170, None)), Ok((160, Some(2))), Ok((144, Some(2))), Ok((128, Some(2))), Ok((112, Some(2))),
-				Ok((96, Some(2))), Ok((80, Some(2))), Ok((64, Some(2))), Ok((48, Some(2))),
+				Ok((170, None)),
+				Ok((160, Some(2))),
+				Ok((144, Some(2))),
+				Ok((128, Some(2))),
+				Ok((112, Some(2))),
+				Ok((96, Some(2))),
+				Ok((80, Some(2))),
+				Ok((64, Some(2))),
+				Ok((48, Some(2))),
 			],
 		);
 	}
diff --git a/primitives/state-machine/src/error.rs b/primitives/state-machine/src/error.rs
index 2705e4623a78..acc5b6080c7a 100644
--- a/primitives/state-machine/src/error.rs
+++ b/primitives/state-machine/src/error.rs
@@ -16,7 +16,6 @@
 // limitations under the License.
 
 /// State Machine Errors
-
 use sp_std::fmt;
 
 /// State Machine Error bound.
diff --git a/primitives/state-machine/src/ext.rs b/primitives/state-machine/src/ext.rs
index d7d65b905f49..cf7cbd413b1f 100644
--- a/primitives/state-machine/src/ext.rs
+++ b/primitives/state-machine/src/ext.rs
@@ -18,25 +18,28 @@
 //! Concrete externalities implementation.
 
 use crate::{
-	StorageKey, StorageValue, OverlayedChanges, IndexOperation,
-	backend::Backend, overlayed_changes::OverlayedExtensions,
+	backend::Backend, overlayed_changes::OverlayedExtensions, IndexOperation, OverlayedChanges,
+	StorageKey, StorageValue,
 };
+use codec::{Decode, Encode, EncodeAppend};
 use hash_db::Hasher;
 use sp_core::{
-	storage::{well_known_keys::is_child_storage_key, ChildInfo, TrackedStorageKey},
 	hexdisplay::HexDisplay,
+	storage::{well_known_keys::is_child_storage_key, ChildInfo, TrackedStorageKey},
 };
-use sp_trie::{trie_types::Layout, empty_child_trie_root};
-use sp_externalities::{
-	Externalities, Extensions, Extension, ExtensionStore,
-};
-use codec::{Decode, Encode, EncodeAppend};
+use sp_externalities::{Extension, ExtensionStore, Extensions, Externalities};
+use sp_trie::{empty_child_trie_root, trie_types::Layout};
 
-use sp_std::{fmt, any::{Any, TypeId}, vec::Vec, vec, boxed::Box, cmp::Ordering};
-use crate::{warn, trace, log_error};
 #[cfg(feature = "std")]
 use crate::changes_trie::State as ChangesTrieState;
-use crate::StorageTransactionCache;
+use crate::{log_error, trace, warn, StorageTransactionCache};
+use sp_std::{
+	any::{Any, TypeId},
+	boxed::Box,
+	cmp::Ordering,
+	fmt, vec,
+	vec::Vec,
+};
 #[cfg(feature = "std")]
 use std::error;
 
@@ -46,7 +49,6 @@ const BENCHMARKING_FN: &str = "\
 	For that reason client started transactions before calling into runtime are not allowed.
 	Without client transactions the loop condition garantuees the success of the tx close.";
 
-
 #[cfg(feature = "std")]
 fn guard() -> sp_panic_handler::AbortGuard {
 	sp_panic_handler::AbortGuard::force_abort()
@@ -91,10 +93,10 @@ impl<B: error::Error, E: error::Error> error::Error for Error<B, E> {
 
 /// Wraps a read-only backend, call executor, and current overlayed changes.
 pub struct Ext<'a, H, N, B>
-	where
-		H: Hasher,
-		B: 'a + Backend<H>,
-		N: crate::changes_trie::BlockNumber,
+where
+	H: Hasher,
+	B: 'a + Backend<H>,
+	N: crate::changes_trie::BlockNumber,
 {
 	/// The overlayed changes to write to.
 	overlay: &'a mut OverlayedChanges,
@@ -114,12 +116,11 @@ pub struct Ext<'a, H, N, B>
 	extensions: Option<OverlayedExtensions<'a>>,
 }
 
-
 impl<'a, H, N, B> Ext<'a, H, N, B>
-	where
-		H: Hasher,
-		B: Backend<H>,
-		N: crate::changes_trie::BlockNumber,
+where
+	H: Hasher,
+	B: Backend<H>,
+	N: crate::changes_trie::BlockNumber,
 {
 	/// Create a new `Ext`.
 	#[cfg(not(feature = "std"))]
@@ -128,13 +129,7 @@ impl<'a, H, N, B> Ext<'a, H, N, B>
 		storage_transaction_cache: &'a mut StorageTransactionCache<B::Transaction, H, N>,
 		backend: &'a B,
 	) -> Self {
-		Ext {
-			overlay,
-			backend,
-			id: 0,
-			storage_transaction_cache,
-			_phantom: Default::default(),
-		}
+		Ext { overlay, backend, id: 0, storage_transaction_cache, _phantom: Default::default() }
 	}
 
 	/// Create a new `Ext` from overlayed changes and read-only backend
@@ -176,7 +171,9 @@ where
 	pub fn storage_pairs(&self) -> Vec<(StorageKey, StorageValue)> {
 		use std::collections::HashMap;
 
-		self.backend.pairs().iter()
+		self.backend
+			.pairs()
+			.iter()
 			.map(|&(ref k, ref v)| (k.to_vec(), Some(v.to_vec())))
 			.chain(self.overlay.changes().map(|(k, v)| (k.clone(), v.value().cloned())))
 			.collect::<HashMap<_, _>>()
@@ -199,8 +196,11 @@ where
 
 	fn storage(&self, key: &[u8]) -> Option<StorageValue> {
 		let _guard = guard();
-		let result = self.overlay.storage(key).map(|x| x.map(|x| x.to_vec())).unwrap_or_else(||
-			self.backend.storage(key).expect(EXT_NOT_ALLOWED_TO_FAIL));
+		let result = self
+			.overlay
+			.storage(key)
+			.map(|x| x.map(|x| x.to_vec()))
+			.unwrap_or_else(|| self.backend.storage(key).expect(EXT_NOT_ALLOWED_TO_FAIL));
 
 		// NOTE: be careful about touching the key names – used outside substrate!
 		trace!(
@@ -222,7 +222,8 @@ where
 
 	fn storage_hash(&self, key: &[u8]) -> Option<Vec<u8>> {
 		let _guard = guard();
-		let result = self.overlay
+		let result = self
+			.overlay
 			.storage(key)
 			.map(|x| x.map(|x| H::hash(x)))
 			.unwrap_or_else(|| self.backend.storage_hash(key).expect(EXT_NOT_ALLOWED_TO_FAIL));
@@ -235,19 +236,15 @@ where
 		result.map(|r| r.encode())
 	}
 
-	fn child_storage(
-		&self,
-		child_info: &ChildInfo,
-		key: &[u8],
-	) -> Option<StorageValue> {
+	fn child_storage(&self, child_info: &ChildInfo, key: &[u8]) -> Option<StorageValue> {
 		let _guard = guard();
-		let result = self.overlay
+		let result = self
+			.overlay
 			.child_storage(child_info, key)
 			.map(|x| x.map(|x| x.to_vec()))
-			.unwrap_or_else(||
-				self.backend.child_storage(child_info, key)
-					.expect(EXT_NOT_ALLOWED_TO_FAIL)
-			);
+			.unwrap_or_else(|| {
+				self.backend.child_storage(child_info, key).expect(EXT_NOT_ALLOWED_TO_FAIL)
+			});
 
 		trace!(target: "state", "{:04x}: GetChild({}) {}={:?}",
 			self.id,
@@ -259,19 +256,15 @@ where
 		result
 	}
 
-	fn child_storage_hash(
-		&self,
-		child_info: &ChildInfo,
-		key: &[u8],
-	) -> Option<Vec<u8>> {
+	fn child_storage_hash(&self, child_info: &ChildInfo, key: &[u8]) -> Option<Vec<u8>> {
 		let _guard = guard();
-		let result = self.overlay
+		let result = self
+			.overlay
 			.child_storage(child_info, key)
 			.map(|x| x.map(|x| H::hash(x)))
-			.unwrap_or_else(||
-				self.backend.child_storage_hash(child_info, key)
-					.expect(EXT_NOT_ALLOWED_TO_FAIL)
-			);
+			.unwrap_or_else(|| {
+				self.backend.child_storage_hash(child_info, key).expect(EXT_NOT_ALLOWED_TO_FAIL)
+			});
 
 		trace!(target: "state", "{:04x}: ChildHash({}) {}={:?}",
 			self.id,
@@ -299,16 +292,13 @@ where
 		result
 	}
 
-	fn exists_child_storage(
-		&self,
-		child_info: &ChildInfo,
-		key: &[u8],
-	) -> bool {
+	fn exists_child_storage(&self, child_info: &ChildInfo, key: &[u8]) -> bool {
 		let _guard = guard();
 
 		let result = match self.overlay.child_storage(child_info, key) {
 			Some(x) => x.is_some(),
-			_ => self.backend
+			_ => self
+				.backend
 				.exists_child_storage(child_info, key)
 				.expect(EXT_NOT_ALLOWED_TO_FAIL),
 		};
@@ -323,7 +313,8 @@ where
 	}
 
 	fn next_storage_key(&self, key: &[u8]) -> Option<StorageKey> {
-		let mut next_backend_key = self.backend.next_storage_key(key).expect(EXT_NOT_ALLOWED_TO_FAIL);
+		let mut next_backend_key =
+			self.backend.next_storage_key(key).expect(EXT_NOT_ALLOWED_TO_FAIL);
 		let mut overlay_changes = self.overlay.iter_after(key).peekable();
 
 		match (&next_backend_key, overlay_changes.peek()) {
@@ -343,9 +334,10 @@ where
 						// If the `backend_key` and `overlay_key` are equal, it means that we need
 						// to search for the next backend key, because the overlay has overwritten
 						// this key.
-						next_backend_key = self.backend.next_storage_key(
-							&overlay_key.0,
-						).expect(EXT_NOT_ALLOWED_TO_FAIL);
+						next_backend_key = self
+							.backend
+							.next_storage_key(&overlay_key.0)
+							.expect(EXT_NOT_ALLOWED_TO_FAIL);
 					}
 				}
 
@@ -358,18 +350,13 @@ where
 		}
 	}
 
-	fn next_child_storage_key(
-		&self,
-		child_info: &ChildInfo,
-		key: &[u8],
-	) -> Option<StorageKey> {
-		let mut next_backend_key = self.backend
+	fn next_child_storage_key(&self, child_info: &ChildInfo, key: &[u8]) -> Option<StorageKey> {
+		let mut next_backend_key = self
+			.backend
 			.next_child_storage_key(child_info, key)
 			.expect(EXT_NOT_ALLOWED_TO_FAIL);
-		let mut overlay_changes = self.overlay.child_iter_after(
-			child_info.storage_key(),
-			key
-		).peekable();
+		let mut overlay_changes =
+			self.overlay.child_iter_after(child_info.storage_key(), key).peekable();
 
 		match (&next_backend_key, overlay_changes.peek()) {
 			(_, None) => next_backend_key,
@@ -388,10 +375,10 @@ where
 						// If the `backend_key` and `overlay_key` are equal, it means that we need
 						// to search for the next backend key, because the overlay has overwritten
 						// this key.
-						next_backend_key = self.backend.next_child_storage_key(
-							child_info,
-							&overlay_key.0,
-						).expect(EXT_NOT_ALLOWED_TO_FAIL);
+						next_backend_key = self
+							.backend
+							.next_child_storage_key(child_info, &overlay_key.0)
+							.expect(EXT_NOT_ALLOWED_TO_FAIL);
 					}
 				}
 
@@ -408,7 +395,7 @@ where
 		let _guard = guard();
 		if is_child_storage_key(&key) {
 			warn!(target: "trie", "Refuse to directly set child storage key");
-			return;
+			return
 		}
 
 		// NOTE: be careful about touching the key names – used outside substrate!
@@ -448,11 +435,7 @@ where
 		self.overlay.set_child_storage(child_info, key, value);
 	}
 
-	fn kill_child_storage(
-		&mut self,
-		child_info: &ChildInfo,
-		limit: Option<u32>,
-	) -> (bool, u32) {
+	fn kill_child_storage(&mut self, child_info: &ChildInfo, limit: Option<u32>) -> (bool, u32) {
 		trace!(target: "state", "{:04x}: KillChild({})",
 			self.id,
 			HexDisplay::from(&child_info.storage_key()),
@@ -472,7 +455,7 @@ where
 
 		if sp_core::storage::well_known_keys::starts_with_child_storage_key(prefix) {
 			warn!(target: "trie", "Refuse to directly clear prefix that is part or contains of child storage key");
-			return (false, 0);
+			return (false, 0)
 		}
 
 		self.mark_dirty();
@@ -498,11 +481,7 @@ where
 		self.limit_remove_from_backend(Some(child_info), Some(prefix), limit)
 	}
 
-	fn storage_append(
-		&mut self,
-		key: Vec<u8>,
-		value: Vec<u8>,
-	) {
+	fn storage_append(&mut self, key: Vec<u8>, value: Vec<u8>) {
 		trace!(target: "state", "{:04x}: Append {}={}",
 			self.id,
 			HexDisplay::from(&key),
@@ -513,10 +492,9 @@ where
 		self.mark_dirty();
 
 		let backend = &mut self.backend;
-		let current_value = self.overlay.value_mut_or_insert_with(
-			&key,
-			|| backend.storage(&key).expect(EXT_NOT_ALLOWED_TO_FAIL).unwrap_or_default()
-		);
+		let current_value = self.overlay.value_mut_or_insert_with(&key, || {
+			backend.storage(&key).expect(EXT_NOT_ALLOWED_TO_FAIL).unwrap_or_default()
+		});
 		StorageAppend::new(current_value).append(value);
 	}
 
@@ -527,7 +505,7 @@ where
 				self.id,
 				HexDisplay::from(&root.as_ref()),
 			);
-			return root.encode();
+			return root.encode()
 		}
 
 		let root = self.overlay.storage_root(self.backend, self.storage_transaction_cache);
@@ -535,10 +513,7 @@ where
 		root.encode()
 	}
 
-	fn child_storage_root(
-		&mut self,
-		child_info: &ChildInfo,
-	) -> Vec<u8> {
+	fn child_storage_root(&mut self, child_info: &ChildInfo) -> Vec<u8> {
 		let _guard = guard();
 		let storage_key = child_info.storage_key();
 		let prefixed_storage_key = child_info.prefixed_storage_key();
@@ -546,9 +521,7 @@ where
 			let root = self
 				.storage(prefixed_storage_key.as_slice())
 				.and_then(|k| Decode::decode(&mut &k[..]).ok())
-				.unwrap_or_else(
-					|| empty_child_trie_root::<Layout<H>>()
-				);
+				.unwrap_or_else(|| empty_child_trie_root::<Layout<H>>());
 			trace!(target: "state", "{:04x}: ChildRoot({})(cached) {}",
 				self.id,
 				HexDisplay::from(&storage_key),
@@ -587,9 +560,7 @@ where
 				let root = self
 					.storage(prefixed_storage_key.as_slice())
 					.and_then(|k| Decode::decode(&mut &k[..]).ok())
-					.unwrap_or_else(
-						|| empty_child_trie_root::<Layout<H>>()
-					);
+					.unwrap_or_else(|| empty_child_trie_root::<Layout<H>>());
 				trace!(target: "state", "{:04x}: ChildRoot({})(no_change) {}",
 					self.id,
 					HexDisplay::from(&storage_key.as_ref()),
@@ -625,10 +596,8 @@ where
 			index,
 			HexDisplay::from(&hash),
 		);
-		self.overlay.add_transaction_index(IndexOperation::Renew {
-			extrinsic: index,
-			hash: hash.to_vec(),
-		});
+		self.overlay
+			.add_transaction_index(IndexOperation::Renew { extrinsic: index, hash: hash.to_vec() });
 	}
 
 	#[cfg(not(feature = "std"))]
@@ -639,7 +608,8 @@ where
 	#[cfg(feature = "std")]
 	fn storage_changes_root(&mut self, mut parent_hash: &[u8]) -> Result<Option<Vec<u8>>, ()> {
 		let _guard = guard();
-		if let Some(ref root) = self.storage_transaction_cache.changes_trie_transaction_storage_root {
+		if let Some(ref root) = self.storage_transaction_cache.changes_trie_transaction_storage_root
+		{
 			trace!(
 				target: "state",
 				"{:04x}: ChangesRoot({})(cached) {:?}",
@@ -653,13 +623,13 @@ where
 			let root = self.overlay.changes_trie_root(
 				self.backend,
 				self.changes_trie_state.as_ref(),
-				Decode::decode(&mut parent_hash).map_err(|e|
+				Decode::decode(&mut parent_hash).map_err(|e| {
 					trace!(
 						target: "state",
 						"Failed to decode changes root parent hash: {}",
 						e,
 					)
-				)?,
+				})?,
 				true,
 				self.storage_transaction_cache,
 			);
@@ -693,13 +663,15 @@ where
 		for _ in 0..self.overlay.transaction_depth() {
 			self.overlay.rollback_transaction().expect(BENCHMARKING_FN);
 		}
-		self.overlay.drain_storage_changes(
-			self.backend,
-			#[cfg(feature = "std")]
-			None,
-			Default::default(),
-			self.storage_transaction_cache,
-		).expect(EXT_NOT_ALLOWED_TO_FAIL);
+		self.overlay
+			.drain_storage_changes(
+				self.backend,
+				#[cfg(feature = "std")]
+				None,
+				Default::default(),
+				self.storage_transaction_cache,
+			)
+			.expect(EXT_NOT_ALLOWED_TO_FAIL);
 		self.backend.wipe().expect(EXT_NOT_ALLOWED_TO_FAIL);
 		self.mark_dirty();
 		self.overlay
@@ -711,19 +683,24 @@ where
 		for _ in 0..self.overlay.transaction_depth() {
 			self.overlay.commit_transaction().expect(BENCHMARKING_FN);
 		}
-		let changes = self.overlay.drain_storage_changes(
-			self.backend,
-			#[cfg(feature = "std")]
-			None,
-			Default::default(),
-			self.storage_transaction_cache,
-		).expect(EXT_NOT_ALLOWED_TO_FAIL);
-		self.backend.commit(
-			changes.transaction_storage_root,
-			changes.transaction,
-			changes.main_storage_changes,
-			changes.child_storage_changes,
-		).expect(EXT_NOT_ALLOWED_TO_FAIL);
+		let changes = self
+			.overlay
+			.drain_storage_changes(
+				self.backend,
+				#[cfg(feature = "std")]
+				None,
+				Default::default(),
+				self.storage_transaction_cache,
+			)
+			.expect(EXT_NOT_ALLOWED_TO_FAIL);
+		self.backend
+			.commit(
+				changes.transaction_storage_root,
+				changes.transaction,
+				changes.main_storage_changes,
+				changes.child_storage_changes,
+			)
+			.expect(EXT_NOT_ALLOWED_TO_FAIL);
 		self.mark_dirty();
 		self.overlay
 			.enter_runtime()
@@ -775,13 +752,13 @@ where
 			self.backend.apply_to_keys_while(child_info, prefix, |key| {
 				if num_deleted == limit {
 					all_deleted = false;
-					return false;
+					return false
 				}
 				if let Some(num) = num_deleted.checked_add(1) {
 					num_deleted = num;
 				} else {
 					all_deleted = false;
-					return false;
+					return false
 				}
 				if let Some(child_info) = child_info {
 					self.overlay.set_child_storage(child_info, key.to_vec(), None);
@@ -840,7 +817,7 @@ impl<'a> StorageAppend<'a> {
 					"Failed to append value, resetting storage item to `[value]`.",
 				);
 				value.encode()
-			}
+			},
 		};
 	}
 }
@@ -896,7 +873,10 @@ where
 		}
 	}
 
-	fn deregister_extension_by_type_id(&mut self, type_id: TypeId) -> Result<(), sp_externalities::Error> {
+	fn deregister_extension_by_type_id(
+		&mut self,
+		type_id: TypeId,
+	) -> Result<(), sp_externalities::Error> {
 		if let Some(ref mut extensions) = self.extensions {
 			if extensions.deregister(type_id) {
 				Ok(())
@@ -912,24 +892,19 @@ where
 #[cfg(test)]
 mod tests {
 	use super::*;
+	use crate::{
+		changes_trie::{
+			Configuration as ChangesTrieConfiguration, InMemoryStorage as TestChangesTrieStorage,
+		},
+		InMemoryBackend,
+	};
+	use codec::Encode;
 	use hex_literal::hex;
 	use num_traits::Zero;
-	use codec::Encode;
 	use sp_core::{
-		H256,
-		Blake2Hasher,
 		map,
-		storage::{
-			Storage,
-			StorageChild,
-			well_known_keys::EXTRINSIC_INDEX,
-		},
-	};
-	use crate::{
-		changes_trie::{
-			Configuration as ChangesTrieConfiguration,
-			InMemoryStorage as TestChangesTrieStorage,
-		}, InMemoryBackend,
+		storage::{well_known_keys::EXTRINSIC_INDEX, Storage, StorageChild},
+		Blake2Hasher, H256,
 	};
 
 	type TestBackend = InMemoryBackend<Blake2Hasher>;
@@ -947,10 +922,7 @@ mod tests {
 	}
 
 	fn changes_trie_config() -> ChangesTrieConfiguration {
-		ChangesTrieConfiguration {
-			digest_interval: 0,
-			digest_levels: 0,
-		}
+		ChangesTrieConfiguration { digest_interval: 0, digest_levels: 0 }
 	}
 
 	#[test]
@@ -1013,8 +985,9 @@ mod tests {
 				vec![20] => vec![20],
 				vec![40] => vec![40]
 			],
-			children_default: map![]
-		}.into();
+			children_default: map![],
+		}
+		.into();
 
 		let ext = TestExt::new(&mut overlay, &mut cache, &backend, None, None);
 
@@ -1056,8 +1029,9 @@ mod tests {
 			top: map![
 				vec![30] => vec![30]
 			],
-			children_default: map![]
-		}.into();
+			children_default: map![],
+		}
+		.into();
 
 		let ext = TestExt::new(&mut overlay, &mut cache, &backend, None, None);
 
@@ -1087,7 +1061,8 @@ mod tests {
 					child_info: child_info.to_owned(),
 				}
 			],
-		}.into();
+		}
+		.into();
 
 		let ext = TestExt::new(&mut overlay, &mut cache, &backend, None, None);
 
@@ -1131,7 +1106,8 @@ mod tests {
 					child_info: child_info.to_owned(),
 				}
 			],
-		}.into();
+		}
+		.into();
 
 		let ext = TestExt::new(&mut overlay, &mut cache, &backend, None, None);
 
@@ -1142,10 +1118,7 @@ mod tests {
 		);
 
 		assert_eq!(ext.child_storage(child_info, &[20]), None);
-		assert_eq!(
-			ext.child_storage_hash(child_info, &[20]),
-			None,
-		);
+		assert_eq!(ext.child_storage_hash(child_info, &[20]), None,);
 
 		assert_eq!(ext.child_storage(child_info, &[30]), Some(vec![31]));
 		assert_eq!(
@@ -1170,7 +1143,8 @@ mod tests {
 					child_info: child_info.to_owned(),
 				}
 			],
-		}.into();
+		}
+		.into();
 
 		let ext = TestExt::new(&mut overlay, &mut cache, &backend, None, None);
 
diff --git a/primitives/state-machine/src/in_memory_backend.rs b/primitives/state-machine/src/in_memory_backend.rs
index 4ee16dfd2f8a..4daf1004a85f 100644
--- a/primitives/state-machine/src/in_memory_backend.rs
+++ b/primitives/state-machine/src/in_memory_backend.rs
@@ -18,13 +18,13 @@
 //! State machine in memory backend.
 
 use crate::{
-	StorageKey, StorageValue, StorageCollection, trie_backend::TrieBackend, backend::Backend,
+	backend::Backend, trie_backend::TrieBackend, StorageCollection, StorageKey, StorageValue,
 };
-use std::collections::{BTreeMap, HashMap};
-use hash_db::Hasher;
-use sp_trie::{MemoryDB, empty_trie_root, Layout};
 use codec::Codec;
+use hash_db::Hasher;
 use sp_core::storage::{ChildInfo, Storage};
+use sp_trie::{empty_trie_root, Layout, MemoryDB};
+use std::collections::{BTreeMap, HashMap};
 
 /// Create a new empty instance of in-memory backend.
 pub fn new_in_mem<H: Hasher>() -> TrieBackend<MemoryDB<H>, H>
@@ -40,9 +40,7 @@ where
 	H::Out: Codec + Ord,
 {
 	/// Copy the state, with applied updates
-	pub fn update<
-		T: IntoIterator<Item = (Option<ChildInfo>, StorageCollection)>
-	>(
+	pub fn update<T: IntoIterator<Item = (Option<ChildInfo>, StorageCollection)>>(
 		&self,
 		changes: T,
 	) -> Self {
@@ -52,19 +50,16 @@ where
 	}
 
 	/// Insert values into backend trie.
-	pub fn insert<
-		T: IntoIterator<Item = (Option<ChildInfo>, StorageCollection)>
-	>(
+	pub fn insert<T: IntoIterator<Item = (Option<ChildInfo>, StorageCollection)>>(
 		&mut self,
 		changes: T,
 	) {
 		let (top, child) = changes.into_iter().partition::<Vec<_>, _>(|v| v.0.is_none());
 		let (root, transaction) = self.full_storage_root(
 			top.iter().map(|(_, v)| v).flatten().map(|(k, v)| (&k[..], v.as_deref())),
-			child.iter()
-				.filter_map(|v|
-					v.0.as_ref().map(|c| (c, v.1.iter().map(|(k, v)| (&k[..], v.as_deref()))))
-				),
+			child.iter().filter_map(|v| {
+				v.0.as_ref().map(|c| (c, v.1.iter().map(|(k, v)| (&k[..], v.as_deref()))))
+			}),
 		);
 
 		self.apply_transaction(root, transaction);
@@ -115,7 +110,9 @@ where
 	fn from(inner: HashMap<Option<ChildInfo>, BTreeMap<StorageKey, StorageValue>>) -> Self {
 		let mut backend = new_in_mem();
 		backend.insert(
-			inner.into_iter().map(|(k, m)| (k, m.into_iter().map(|(k, v)| (k, Some(v))).collect())),
+			inner
+				.into_iter()
+				.map(|(k, m)| (k, m.into_iter().map(|(k, v)| (k, Some(v))).collect())),
 		);
 		backend
 	}
@@ -126,8 +123,11 @@ where
 	H::Out: Codec + Ord,
 {
 	fn from(inners: Storage) -> Self {
-		let mut inner: HashMap<Option<ChildInfo>, BTreeMap<StorageKey, StorageValue>>
-			= inners.children_default.into_iter().map(|(_k, c)| (Some(c.child_info), c.data)).collect();
+		let mut inner: HashMap<Option<ChildInfo>, BTreeMap<StorageKey, StorageValue>> = inners
+			.children_default
+			.into_iter()
+			.map(|(_k, c)| (Some(c.child_info), c.data))
+			.collect();
 		inner.insert(None, inners.top);
 		inner.into()
 	}
@@ -144,16 +144,13 @@ where
 	}
 }
 
-impl<H: Hasher> From<Vec<(Option<ChildInfo>, StorageCollection)>>
-	for TrieBackend<MemoryDB<H>, H>
+impl<H: Hasher> From<Vec<(Option<ChildInfo>, StorageCollection)>> for TrieBackend<MemoryDB<H>, H>
 where
 	H::Out: Codec + Ord,
 {
-	fn from(
-		inner: Vec<(Option<ChildInfo>, StorageCollection)>,
-	) -> Self {
-		let mut expanded: HashMap<Option<ChildInfo>, BTreeMap<StorageKey, StorageValue>>
-			= HashMap::new();
+	fn from(inner: Vec<(Option<ChildInfo>, StorageCollection)>) -> Self {
+		let mut expanded: HashMap<Option<ChildInfo>, BTreeMap<StorageKey, StorageValue>> =
+			HashMap::new();
 		for (child_info, key_values) in inner {
 			let entry = expanded.entry(child_info).or_default();
 			for (key, value) in key_values {
@@ -169,8 +166,8 @@ where
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use sp_runtime::traits::BlakeTwo256;
 	use crate::backend::Backend;
+	use sp_runtime::traits::BlakeTwo256;
 
 	/// Assert in memory backend with only child trie keys works as trie backend.
 	#[test]
@@ -178,15 +175,10 @@ mod tests {
 		let storage = new_in_mem::<BlakeTwo256>();
 		let child_info = ChildInfo::new_default(b"1");
 		let child_info = &child_info;
-		let mut storage = storage.update(
-			vec![(
-				Some(child_info.clone()),
-				vec![(b"2".to_vec(), Some(b"3".to_vec()))]
-			)]
-		);
+		let mut storage = storage
+			.update(vec![(Some(child_info.clone()), vec![(b"2".to_vec(), Some(b"3".to_vec()))])]);
 		let trie_backend = storage.as_trie_backend().unwrap();
-		assert_eq!(trie_backend.child_storage(child_info, b"2").unwrap(),
-			Some(b"3".to_vec()));
+		assert_eq!(trie_backend.child_storage(child_info, b"2").unwrap(), Some(b"3".to_vec()));
 		let storage_key = child_info.prefixed_storage_key();
 		assert!(trie_backend.storage(storage_key.as_slice()).unwrap().is_some());
 	}
@@ -196,8 +188,10 @@ mod tests {
 		let mut storage = new_in_mem::<BlakeTwo256>();
 		let child_info = ChildInfo::new_default(b"1");
 
-		storage.insert(vec![(Some(child_info.clone()), vec![(b"2".to_vec(), Some(b"3".to_vec()))])]);
-		storage.insert(vec![(Some(child_info.clone()), vec![(b"1".to_vec(), Some(b"3".to_vec()))])]);
+		storage
+			.insert(vec![(Some(child_info.clone()), vec![(b"2".to_vec(), Some(b"3".to_vec()))])]);
+		storage
+			.insert(vec![(Some(child_info.clone()), vec![(b"1".to_vec(), Some(b"3".to_vec()))])]);
 
 		assert_eq!(storage.child_storage(&child_info, &b"2"[..]), Ok(Some(b"3".to_vec())));
 		assert_eq!(storage.child_storage(&child_info, &b"1"[..]), Ok(Some(b"3".to_vec())));
diff --git a/primitives/state-machine/src/lib.rs b/primitives/state-machine/src/lib.rs
index bc5b48f02db4..e2162df5cfd1 100644
--- a/primitives/state-machine/src/lib.rs
+++ b/primitives/state-machine/src/lib.rs
@@ -22,23 +22,23 @@
 
 pub mod backend;
 #[cfg(feature = "std")]
-mod in_memory_backend;
+mod basic;
 #[cfg(feature = "std")]
 mod changes_trie;
 mod error;
 mod ext;
 #[cfg(feature = "std")]
-mod testing;
-#[cfg(feature = "std")]
-mod basic;
+mod in_memory_backend;
 pub(crate) mod overlayed_changes;
 #[cfg(feature = "std")]
 mod proving_backend;
-mod trie_backend;
-mod trie_backend_essence;
-mod stats;
 #[cfg(feature = "std")]
 mod read_only;
+mod stats;
+#[cfg(feature = "std")]
+mod testing;
+mod trie_backend;
+mod trie_backend_essence;
 
 #[cfg(feature = "std")]
 pub use std_reexport::*;
@@ -46,7 +46,7 @@ pub use std_reexport::*;
 #[cfg(feature = "std")]
 pub use execution::*;
 #[cfg(feature = "std")]
-pub use log::{debug, warn, error as log_error};
+pub use log::{debug, error as log_error, warn};
 #[cfg(feature = "std")]
 pub use tracing::trace;
 
@@ -55,12 +55,12 @@ pub use tracing::trace;
 #[cfg(not(feature = "std"))]
 #[macro_export]
 macro_rules! warn {
-	(target: $target:expr, $($arg:tt)+) => (
+	(target: $target:expr, $($arg:tt)+) => {
 		()
-	);
-	($($arg:tt)+) => (
+	};
+	($($arg:tt)+) => {
 		()
-	);
+	};
 }
 
 /// In no_std we skip logs for state_machine, this macro
@@ -68,12 +68,12 @@ macro_rules! warn {
 #[cfg(not(feature = "std"))]
 #[macro_export]
 macro_rules! debug {
-	(target: $target:expr, $($arg:tt)+) => (
+	(target: $target:expr, $($arg:tt)+) => {
 		()
-	);
-	($($arg:tt)+) => (
+	};
+	($($arg:tt)+) => {
 		()
-	);
+	};
 }
 
 /// In no_std we skip logs for state_machine, this macro
@@ -81,12 +81,12 @@ macro_rules! debug {
 #[cfg(not(feature = "std"))]
 #[macro_export]
 macro_rules! trace {
-	(target: $target:expr, $($arg:tt)+) => (
+	(target: $target:expr, $($arg:tt)+) => {
 		()
-	);
-	($($arg:tt)+) => (
+	};
+	($($arg:tt)+) => {
 		()
-	);
+	};
 }
 
 /// In no_std we skip logs for state_machine, this macro
@@ -94,12 +94,12 @@ macro_rules! trace {
 #[cfg(not(feature = "std"))]
 #[macro_export]
 macro_rules! log_error {
-	(target: $target:expr, $($arg:tt)+) => (
+	(target: $target:expr, $($arg:tt)+) => {
 		()
-	);
-	($($arg:tt)+) => (
+	};
+	($($arg:tt)+) => {
 		()
-	);
+	};
 }
 
 /// Default error type to use with state machine trie backend.
@@ -117,20 +117,19 @@ impl sp_std::fmt::Display for DefaultError {
 	}
 }
 
-pub use crate::overlayed_changes::{
-	OverlayedChanges, StorageKey, StorageValue,
-	StorageCollection, ChildStorageCollection,
-	StorageChanges, StorageTransactionCache,
-	OffchainChangesCollection,
-	OffchainOverlayedChanges,
-	IndexOperation,
+pub use crate::{
+	backend::Backend,
+	ext::Ext,
+	overlayed_changes::{
+		ChildStorageCollection, IndexOperation, OffchainChangesCollection,
+		OffchainOverlayedChanges, OverlayedChanges, StorageChanges, StorageCollection, StorageKey,
+		StorageTransactionCache, StorageValue,
+	},
+	stats::{StateMachineStats, UsageInfo, UsageUnit},
+	trie_backend::TrieBackend,
+	trie_backend_essence::{Storage, TrieBackendStorage},
 };
-pub use crate::backend::Backend;
-pub use crate::trie_backend_essence::{TrieBackendStorage, Storage};
-pub use crate::trie_backend::TrieBackend;
-pub use crate::stats::{UsageInfo, UsageUnit, StateMachineStats};
 pub use error::{Error, ExecutionError};
-pub use crate::ext::Ext;
 
 #[cfg(not(feature = "std"))]
 mod changes_trie {
@@ -143,45 +142,45 @@ mod changes_trie {
 
 #[cfg(feature = "std")]
 mod std_reexport {
-	pub use sp_trie::{trie_types::{Layout, TrieDBMut}, StorageProof, TrieMut, DBValue, MemoryDB};
-	pub use crate::testing::TestExternalities;
-	pub use crate::basic::BasicExternalities;
-	pub use crate::read_only::{ReadOnlyExternalities, InspectState};
-	pub use crate::changes_trie::{
-		AnchorBlockId as ChangesTrieAnchorBlockId,
-		State as ChangesTrieState,
-		Storage as ChangesTrieStorage,
-		RootsStorage as ChangesTrieRootsStorage,
-		InMemoryStorage as InMemoryChangesTrieStorage,
-		BuildCache as ChangesTrieBuildCache,
-		CacheAction as ChangesTrieCacheAction,
-		ConfigurationRange as ChangesTrieConfigurationRange,
-		key_changes, key_changes_proof,
-		key_changes_proof_check, key_changes_proof_check_with_db,
-		prune as prune_changes_tries,
-		disabled_state as disabled_changes_trie_state,
-		BlockNumber as ChangesTrieBlockNumber,
+	pub use crate::{
+		basic::BasicExternalities,
+		changes_trie::{
+			disabled_state as disabled_changes_trie_state, key_changes, key_changes_proof,
+			key_changes_proof_check, key_changes_proof_check_with_db, prune as prune_changes_tries,
+			AnchorBlockId as ChangesTrieAnchorBlockId, BlockNumber as ChangesTrieBlockNumber,
+			BuildCache as ChangesTrieBuildCache, CacheAction as ChangesTrieCacheAction,
+			ConfigurationRange as ChangesTrieConfigurationRange,
+			InMemoryStorage as InMemoryChangesTrieStorage, RootsStorage as ChangesTrieRootsStorage,
+			State as ChangesTrieState, Storage as ChangesTrieStorage,
+		},
+		error::{Error, ExecutionError},
+		in_memory_backend::new_in_mem,
+		proving_backend::{
+			create_proof_check_backend, ProofRecorder, ProvingBackend, ProvingBackendRecorder,
+		},
+		read_only::{InspectState, ReadOnlyExternalities},
+		testing::TestExternalities,
 	};
-	pub use crate::proving_backend::{
-		create_proof_check_backend, ProofRecorder, ProvingBackend, ProvingBackendRecorder,
+	pub use sp_trie::{
+		trie_types::{Layout, TrieDBMut},
+		DBValue, MemoryDB, StorageProof, TrieMut,
 	};
-	pub use crate::error::{Error, ExecutionError};
-	pub use crate::in_memory_backend::new_in_mem;
 }
 
 #[cfg(feature = "std")]
 mod execution {
 	use super::*;
-	use std::{fmt, result, collections::HashMap, panic::UnwindSafe};
-	use log::{warn, trace};
+	use codec::{Codec, Decode, Encode};
 	use hash_db::Hasher;
-	use codec::{Decode, Encode, Codec};
+	use log::{trace, warn};
 	use sp_core::{
-		storage::ChildInfo, NativeOrEncoded, NeverNativeValue, hexdisplay::HexDisplay,
+		hexdisplay::HexDisplay,
+		storage::ChildInfo,
 		traits::{CodeExecutor, ReadRuntimeVersionExt, RuntimeCode, SpawnNamed},
+		NativeOrEncoded, NeverNativeValue,
 	};
 	use sp_externalities::Extensions;
-
+	use std::{collections::HashMap, fmt, panic::UnwindSafe, result};
 
 	const PROOF_CLOSE_TRANSACTION: &str = "\
 		Closing a transaction that was started in this function. Client initiated transactions
@@ -193,10 +192,8 @@ mod execution {
 	pub type DefaultHandler<R, E> = fn(CallResult<R, E>, CallResult<R, E>) -> CallResult<R, E>;
 
 	/// Type of changes trie transaction.
-	pub type ChangesTrieTransaction<H, N> = (
-		MemoryDB<H>,
-		ChangesTrieCacheAction<<H as Hasher>::Out, N>,
-	);
+	pub type ChangesTrieTransaction<H, N> =
+		(MemoryDB<H>, ChangesTrieCacheAction<<H as Hasher>::Out, N>);
 
 	/// Trie backend with in-memory storage.
 	pub type InMemoryBackend<H> = TrieBackend<MemoryDB<H>, H>;
@@ -259,14 +256,14 @@ mod execution {
 			self,
 		) -> ExecutionManager<DefaultHandler<R, E>> {
 			match self {
-				ExecutionStrategy::AlwaysWasm => ExecutionManager::AlwaysWasm(BackendTrustLevel::Trusted),
+				ExecutionStrategy::AlwaysWasm =>
+					ExecutionManager::AlwaysWasm(BackendTrustLevel::Trusted),
 				ExecutionStrategy::NativeWhenPossible => ExecutionManager::NativeWhenPossible,
 				ExecutionStrategy::NativeElseWasm => ExecutionManager::NativeElseWasm,
 				ExecutionStrategy::Both => ExecutionManager::Both(|wasm_result, native_result| {
 					warn!(
 						"Consensus error between wasm {:?} and native {:?}. Using wasm.",
-						wasm_result,
-						native_result,
+						wasm_result, native_result,
 					);
 					warn!("   Native result {:?}", native_result);
 					warn!("   Wasm result {:?}", wasm_result);
@@ -293,10 +290,10 @@ mod execution {
 
 	/// The substrate state machine.
 	pub struct StateMachine<'a, B, H, N, Exec>
-		where
-			H: Hasher,
-			B: Backend<H>,
-			N: ChangesTrieBlockNumber,
+	where
+		H: Hasher,
+		B: Backend<H>,
+		N: ChangesTrieBlockNumber,
 	{
 		backend: &'a B,
 		exec: &'a Exec,
@@ -310,7 +307,8 @@ mod execution {
 		stats: StateMachineStats,
 	}
 
-	impl<'a, B, H, N, Exec> Drop for StateMachine<'a, B, H, N, Exec> where
+	impl<'a, B, H, N, Exec> Drop for StateMachine<'a, B, H, N, Exec>
+	where
 		H: Hasher,
 		B: Backend<H>,
 		N: ChangesTrieBlockNumber,
@@ -320,7 +318,8 @@ mod execution {
 		}
 	}
 
-	impl<'a, B, H, N, Exec> StateMachine<'a, B, H, N, Exec> where
+	impl<'a, B, H, N, Exec> StateMachine<'a, B, H, N, Exec>
+	where
 		H: Hasher,
 		H::Out: Ord + 'static + codec::Codec,
 		Exec: CodeExecutor + Clone + 'static,
@@ -383,19 +382,19 @@ mod execution {
 			self.execute_using_consensus_failure_handler::<_, NeverNativeValue, fn() -> _>(
 				strategy.get_manager(),
 				None,
-			).map(NativeOrEncoded::into_encoded)
+			)
+			.map(NativeOrEncoded::into_encoded)
 		}
 
 		fn execute_aux<R, NC>(
 			&mut self,
 			use_native: bool,
 			native_call: Option<NC>,
-		) -> (
-			CallResult<R, Exec::Error>,
-			bool,
-		) where
+		) -> (CallResult<R, Exec::Error>, bool)
+		where
 			R: Decode + Encode + PartialEq,
-			NC: FnOnce() -> result::Result<R, Box<dyn std::error::Error + Send + Sync>> + UnwindSafe,
+			NC: FnOnce() -> result::Result<R, Box<dyn std::error::Error + Send + Sync>>
+				+ UnwindSafe,
 		{
 			let mut cache = StorageTransactionCache::default();
 
@@ -404,7 +403,9 @@ mod execution {
 				None => &mut cache,
 			};
 
-			self.overlay.enter_runtime().expect("StateMachine is never called from the runtime; qed");
+			self.overlay
+				.enter_runtime()
+				.expect("StateMachine is never called from the runtime; qed");
 
 			let mut ext = Ext::new(
 				self.overlay,
@@ -432,7 +433,8 @@ mod execution {
 				native_call,
 			);
 
-			self.overlay.exit_runtime()
+			self.overlay
+				.exit_runtime()
 				.expect("Runtime is not able to call this function in the overlay; qed");
 
 			trace!(
@@ -450,27 +452,25 @@ mod execution {
 			mut native_call: Option<NC>,
 			on_consensus_failure: Handler,
 		) -> CallResult<R, Exec::Error>
-			where
-				R: Decode + Encode + PartialEq,
-				NC: FnOnce() -> result::Result<R, Box<dyn std::error::Error + Send + Sync>> + UnwindSafe,
-				Handler: FnOnce(
-					CallResult<R, Exec::Error>,
-					CallResult<R, Exec::Error>,
-				) -> CallResult<R, Exec::Error>
+		where
+			R: Decode + Encode + PartialEq,
+			NC: FnOnce() -> result::Result<R, Box<dyn std::error::Error + Send + Sync>>
+				+ UnwindSafe,
+			Handler: FnOnce(
+				CallResult<R, Exec::Error>,
+				CallResult<R, Exec::Error>,
+			) -> CallResult<R, Exec::Error>,
 		{
 			self.overlay.start_transaction();
 			let (result, was_native) = self.execute_aux(true, native_call.take());
 
 			if was_native {
 				self.overlay.rollback_transaction().expect(PROOF_CLOSE_TRANSACTION);
-				let (wasm_result, _) = self.execute_aux(
-					false,
-					native_call,
-				);
+				let (wasm_result, _) = self.execute_aux(false, native_call);
 
-				if (result.is_ok() && wasm_result.is_ok()
-					&& result.as_ref().ok() == wasm_result.as_ref().ok())
-					|| result.is_err() && wasm_result.is_err()
+				if (result.is_ok() &&
+					wasm_result.is_ok() && result.as_ref().ok() == wasm_result.as_ref().ok()) ||
+					result.is_err() && wasm_result.is_err()
 				{
 					result
 				} else {
@@ -486,25 +486,20 @@ mod execution {
 			&mut self,
 			mut native_call: Option<NC>,
 		) -> CallResult<R, Exec::Error>
-			where
-				R: Decode + Encode + PartialEq,
-				NC: FnOnce() -> result::Result<R, Box<dyn std::error::Error + Send + Sync>> + UnwindSafe,
+		where
+			R: Decode + Encode + PartialEq,
+			NC: FnOnce() -> result::Result<R, Box<dyn std::error::Error + Send + Sync>>
+				+ UnwindSafe,
 		{
 			self.overlay.start_transaction();
-			let (result, was_native) = self.execute_aux(
-				true,
-				native_call.take(),
-			);
+			let (result, was_native) = self.execute_aux(true, native_call.take());
 
 			if !was_native || result.is_ok() {
 				self.overlay.commit_transaction().expect(PROOF_CLOSE_TRANSACTION);
 				result
 			} else {
 				self.overlay.rollback_transaction().expect(PROOF_CLOSE_TRANSACTION);
-				let (wasm_result, _) = self.execute_aux(
-					false,
-					native_call,
-				);
+				let (wasm_result, _) = self.execute_aux(false, native_call);
 				wasm_result
 			}
 		}
@@ -523,40 +518,33 @@ mod execution {
 			manager: ExecutionManager<Handler>,
 			mut native_call: Option<NC>,
 		) -> Result<NativeOrEncoded<R>, Box<dyn Error>>
-			where
-				R: Decode + Encode + PartialEq,
-				NC: FnOnce() -> result::Result<R, Box<dyn std::error::Error + Send + Sync>> + UnwindSafe,
-				Handler: FnOnce(
-					CallResult<R, Exec::Error>,
-					CallResult<R, Exec::Error>,
-				) -> CallResult<R, Exec::Error>
+		where
+			R: Decode + Encode + PartialEq,
+			NC: FnOnce() -> result::Result<R, Box<dyn std::error::Error + Send + Sync>>
+				+ UnwindSafe,
+			Handler: FnOnce(
+				CallResult<R, Exec::Error>,
+				CallResult<R, Exec::Error>,
+			) -> CallResult<R, Exec::Error>,
 		{
 			let changes_tries_enabled = self.changes_trie_state.is_some();
 			self.overlay.set_collect_extrinsics(changes_tries_enabled);
 
 			let result = {
 				match manager {
-					ExecutionManager::Both(on_consensus_failure) => {
-						self.execute_call_with_both_strategy(
-							native_call.take(),
-							on_consensus_failure,
-						)
-					},
-					ExecutionManager::NativeElseWasm => {
-						self.execute_call_with_native_else_wasm_strategy(
-							native_call.take(),
-						)
-					},
+					ExecutionManager::Both(on_consensus_failure) => self
+						.execute_call_with_both_strategy(native_call.take(), on_consensus_failure),
+					ExecutionManager::NativeElseWasm =>
+						self.execute_call_with_native_else_wasm_strategy(native_call.take()),
 					ExecutionManager::AlwaysWasm(trust_level) => {
 						let _abort_guard = match trust_level {
 							BackendTrustLevel::Trusted => None,
-							BackendTrustLevel::Untrusted => Some(sp_panic_handler::AbortGuard::never_abort()),
+							BackendTrustLevel::Untrusted =>
+								Some(sp_panic_handler::AbortGuard::never_abort()),
 						};
 						self.execute_aux(false, native_call).0
 					},
-					ExecutionManager::NativeWhenPossible => {
-						self.execute_aux(true, native_call).0
-					},
+					ExecutionManager::NativeWhenPossible => self.execute_aux(true, native_call).0,
 				}
 			};
 
@@ -582,7 +570,8 @@ mod execution {
 		N: crate::changes_trie::BlockNumber,
 		Spawn: SpawnNamed + Send + 'static,
 	{
-		let trie_backend = backend.as_trie_backend()
+		let trie_backend = backend
+			.as_trie_backend()
 			.ok_or_else(|| Box::new(ExecutionError::UnableToGenerateProof) as Box<dyn Error>)?;
 		prove_execution_on_trie_backend::<_, _, N, _, _>(
 			trie_backend,
@@ -704,14 +693,12 @@ mod execution {
 		sm.execute_using_consensus_failure_handler::<_, NeverNativeValue, fn() -> _>(
 			always_untrusted_wasm(),
 			None,
-		).map(NativeOrEncoded::into_encoded)
+		)
+		.map(NativeOrEncoded::into_encoded)
 	}
 
 	/// Generate storage read proof.
-	pub fn prove_read<B, H, I>(
-		mut backend: B,
-		keys: I,
-	) -> Result<StorageProof, Box<dyn Error>>
+	pub fn prove_read<B, H, I>(mut backend: B, keys: I) -> Result<StorageProof, Box<dyn Error>>
 	where
 		B: Backend<H>,
 		H: Hasher,
@@ -719,10 +706,9 @@ mod execution {
 		I: IntoIterator,
 		I::Item: AsRef<[u8]>,
 	{
-		let trie_backend = backend.as_trie_backend()
-			.ok_or_else(
-				|| Box::new(ExecutionError::UnableToGenerateProof) as Box<dyn Error>
-			)?;
+		let trie_backend = backend
+			.as_trie_backend()
+			.ok_or_else(|| Box::new(ExecutionError::UnableToGenerateProof) as Box<dyn Error>)?;
 		prove_read_on_trie_backend(trie_backend, keys)
 	}
 
@@ -739,9 +725,16 @@ mod execution {
 		H: Hasher,
 		H::Out: Ord + Codec,
 	{
-		let trie_backend = backend.as_trie_backend()
+		let trie_backend = backend
+			.as_trie_backend()
 			.ok_or_else(|| Box::new(ExecutionError::UnableToGenerateProof) as Box<dyn Error>)?;
-		prove_range_read_with_size_on_trie_backend(trie_backend, child_info, prefix, size_limit, start_at)
+		prove_range_read_with_size_on_trie_backend(
+			trie_backend,
+			child_info,
+			prefix,
+			size_limit,
+			start_at,
+		)
 	}
 
 	/// Generate range storage read proof on an existing trie backend.
@@ -759,14 +752,22 @@ mod execution {
 	{
 		let proving_backend = proving_backend::ProvingBackend::<S, H>::new(trie_backend);
 		let mut count = 0;
-		proving_backend.apply_to_key_values_while(child_info, prefix, start_at, |_key, _value| {
-			if count == 0 || proving_backend.estimate_encoded_size() <= size_limit {
-				count += 1;
-				true
-			} else {
-				false
-			}
-		}, false).map_err(|e| Box::new(e) as Box<dyn Error>)?;
+		proving_backend
+			.apply_to_key_values_while(
+				child_info,
+				prefix,
+				start_at,
+				|_key, _value| {
+					if count == 0 || proving_backend.estimate_encoded_size() <= size_limit {
+						count += 1;
+						true
+					} else {
+						false
+					}
+				},
+				false,
+			)
+			.map_err(|e| Box::new(e) as Box<dyn Error>)?;
 		Ok((proving_backend.extract_proof(), count))
 	}
 
@@ -783,7 +784,8 @@ mod execution {
 		I: IntoIterator,
 		I::Item: AsRef<[u8]>,
 	{
-		let trie_backend = backend.as_trie_backend()
+		let trie_backend = backend
+			.as_trie_backend()
 			.ok_or_else(|| Box::new(ExecutionError::UnableToGenerateProof) as Box<dyn Error>)?;
 		prove_child_read_on_trie_backend(trie_backend, child_info, keys)
 	}
@@ -923,7 +925,8 @@ mod execution {
 		H: Hasher,
 		H::Out: Ord + Codec,
 	{
-		proving_backend.child_storage(child_info, key)
+		proving_backend
+			.child_storage(child_info, key)
 			.map_err(|e| Box::new(e) as Box<dyn Error>)
 	}
 
@@ -943,10 +946,16 @@ mod execution {
 		H::Out: Ord + Codec,
 	{
 		let mut values = Vec::new();
-		let result = proving_backend.apply_to_key_values_while(child_info, prefix, start_at, |key, value| {
-			values.push((key.to_vec(), value.to_vec()));
-			count.as_ref().map_or(true, |c| (values.len() as u32) < *c)
-		}, true);
+		let result = proving_backend.apply_to_key_values_while(
+			child_info,
+			prefix,
+			start_at,
+			|key, value| {
+				values.push((key.to_vec(), value.to_vec()));
+				count.as_ref().map_or(true, |c| (values.len() as u32) < *c)
+			},
+			true,
+		);
 		match result {
 			Ok(completed) => Ok((values, completed)),
 			Err(e) => Err(Box::new(e) as Box<dyn Error>),
@@ -956,23 +965,22 @@ mod execution {
 
 #[cfg(test)]
 mod tests {
-	use std::collections::BTreeMap;
-	use codec::Encode;
-	use super::*;
-	use super::ext::Ext;
-	use super::changes_trie::Configuration as ChangesTrieConfig;
+	use super::{changes_trie::Configuration as ChangesTrieConfig, ext::Ext, *};
+	use crate::execution::CallResult;
+	use codec::{Decode, Encode};
 	use sp_core::{
-		map, traits::{Externalities, RuntimeCode}, testing::TaskExecutor,
+		map,
+		storage::ChildInfo,
+		testing::TaskExecutor,
+		traits::{CodeExecutor, Externalities, RuntimeCode},
+		NativeOrEncoded, NeverNativeValue,
 	};
 	use sp_runtime::traits::BlakeTwo256;
-	use std::{result, collections::HashMap, panic::UnwindSafe};
-	use codec::Decode;
-	use sp_core::{
-		storage::ChildInfo, NativeOrEncoded, NeverNativeValue,
-		traits::CodeExecutor,
+	use std::{
+		collections::{BTreeMap, HashMap},
+		panic::UnwindSafe,
+		result,
 	};
-	use crate::execution::CallResult;
-
 
 	#[derive(Clone)]
 	struct DummyCodeExecutor {
@@ -1000,12 +1008,7 @@ mod tests {
 			if self.change_changes_trie_config {
 				ext.place_storage(
 					sp_core::storage::well_known_keys::CHANGES_TRIE_CONFIG.to_vec(),
-					Some(
-						ChangesTrieConfig {
-							digest_interval: 777,
-							digest_levels: 333,
-						}.encode()
-					)
+					Some(ChangesTrieConfig { digest_interval: 777, digest_levels: 333 }.encode()),
 				);
 			}
 
@@ -1013,24 +1016,14 @@ mod tests {
 			match (using_native, self.native_succeeds, self.fallback_succeeds, native_call) {
 				(true, true, _, Some(call)) => {
 					let res = sp_externalities::set_and_run_with_externalities(ext, || call());
-					(
-						res.map(NativeOrEncoded::Native).map_err(|_| 0),
-						true
-					)
-				},
-				(true, true, _, None) | (false, _, true, None) => {
-					(
-						Ok(
-							NativeOrEncoded::Encoded(
-								vec![
-									ext.storage(b"value1").unwrap()[0] +
-									ext.storage(b"value2").unwrap()[0]
-								]
-							)
-						),
-						using_native
-					)
+					(res.map(NativeOrEncoded::Native).map_err(|_| 0), true)
 				},
+				(true, true, _, None) | (false, _, true, None) => (
+					Ok(NativeOrEncoded::Encoded(vec![
+						ext.storage(b"value1").unwrap()[0] + ext.storage(b"value2").unwrap()[0],
+					])),
+					using_native,
+				),
 				_ => (Err(0), using_native),
 			}
 		}
@@ -1069,13 +1062,9 @@ mod tests {
 			TaskExecutor::new(),
 		);
 
-		assert_eq!(
-			state_machine.execute(ExecutionStrategy::NativeWhenPossible).unwrap(),
-			vec![66],
-		);
+		assert_eq!(state_machine.execute(ExecutionStrategy::NativeWhenPossible).unwrap(), vec![66],);
 	}
 
-
 	#[test]
 	fn execute_works_with_native_else_wasm() {
 		let backend = trie_backend::tests::test_trie();
@@ -1126,15 +1115,15 @@ mod tests {
 			TaskExecutor::new(),
 		);
 
-		assert!(
-			state_machine.execute_using_consensus_failure_handler::<_, NeverNativeValue, fn() -> _>(
+		assert!(state_machine
+			.execute_using_consensus_failure_handler::<_, NeverNativeValue, fn() -> _>(
 				ExecutionManager::Both(|we, _ne| {
 					consensus_failed = true;
 					we
 				}),
 				None,
-			).is_err()
-		);
+			)
+			.is_err());
 		assert!(consensus_failed);
 	}
 
@@ -1158,7 +1147,8 @@ mod tests {
 			"test",
 			&[],
 			&RuntimeCode::empty(),
-		).unwrap();
+		)
+		.unwrap();
 
 		// check proof locally
 		let local_result = execution_proof_check::<BlakeTwo256, u64, _, _>(
@@ -1170,7 +1160,8 @@ mod tests {
 			"test",
 			&[],
 			&RuntimeCode::empty(),
-		).unwrap();
+		)
+		.unwrap();
 
 		// check that both results are correct
 		assert_eq!(remote_result, vec![66]);
@@ -1210,7 +1201,9 @@ mod tests {
 		overlay.commit_transaction().unwrap();
 
 		assert_eq!(
-			overlay.changes().map(|(k, v)| (k.clone(), v.value().cloned()))
+			overlay
+				.changes()
+				.map(|(k, v)| (k.clone(), v.value().cloned()))
 				.collect::<HashMap<_, _>>(),
 			map![
 				b"abc".to_vec() => None.into(),
@@ -1238,7 +1231,9 @@ mod tests {
 		overlay.commit_transaction().unwrap();
 
 		assert_eq!(
-			overlay.changes().map(|(k, v)| (k.clone(), v.value().cloned()))
+			overlay
+				.changes()
+				.map(|(k, v)| (k.clone(), v.value().cloned()))
 				.collect::<HashMap<_, _>>(),
 			map![
 				b"abb".to_vec() => None.into(),
@@ -1283,7 +1278,8 @@ mod tests {
 		}
 
 		assert_eq!(
-			overlay.children()
+			overlay
+				.children()
 				.flat_map(|(iter, _child_info)| iter)
 				.map(|(k, v)| (k.clone(), v.value().clone()))
 				.collect::<BTreeMap<_, _>>(),
@@ -1345,39 +1341,15 @@ mod tests {
 			None,
 		);
 
-		ext.set_child_storage(
-			child_info,
-			b"abc".to_vec(),
-			b"def".to_vec()
-		);
-		assert_eq!(
-			ext.child_storage(
-				child_info,
-				b"abc"
-			),
-			Some(b"def".to_vec())
-		);
-		ext.kill_child_storage(
-			child_info,
-			None,
-		);
-		assert_eq!(
-			ext.child_storage(
-				child_info,
-				b"abc"
-			),
-			None
-		);
+		ext.set_child_storage(child_info, b"abc".to_vec(), b"def".to_vec());
+		assert_eq!(ext.child_storage(child_info, b"abc"), Some(b"def".to_vec()));
+		ext.kill_child_storage(child_info, None);
+		assert_eq!(ext.child_storage(child_info, b"abc"), None);
 	}
 
 	#[test]
 	fn append_storage_works() {
-		let reference_data = vec![
-			b"data1".to_vec(),
-			b"2".to_vec(),
-			b"D3".to_vec(),
-			b"d4".to_vec(),
-		];
+		let reference_data = vec![b"data1".to_vec(), b"2".to_vec(), b"D3".to_vec(), b"d4".to_vec()];
 		let key = b"key".to_vec();
 		let mut state = new_in_mem::<BlakeTwo256>();
 		let backend = state.as_trie_backend().unwrap();
@@ -1393,10 +1365,7 @@ mod tests {
 			);
 
 			ext.storage_append(key.clone(), reference_data[0].encode());
-			assert_eq!(
-				ext.storage(key.as_slice()),
-				Some(vec![reference_data[0].clone()].encode()),
-			);
+			assert_eq!(ext.storage(key.as_slice()), Some(vec![reference_data[0].clone()].encode()),);
 		}
 		overlay.start_transaction();
 		{
@@ -1411,10 +1380,7 @@ mod tests {
 			for i in reference_data.iter().skip(1) {
 				ext.storage_append(key.clone(), i.encode());
 			}
-			assert_eq!(
-				ext.storage(key.as_slice()),
-				Some(reference_data.encode()),
-			);
+			assert_eq!(ext.storage(key.as_slice()), Some(reference_data.encode()),);
 		}
 		overlay.rollback_transaction().unwrap();
 		{
@@ -1425,18 +1391,18 @@ mod tests {
 				changes_trie::disabled_state::<_, u64>(),
 				None,
 			);
-			assert_eq!(
-				ext.storage(key.as_slice()),
-				Some(vec![reference_data[0].clone()].encode()),
-			);
+			assert_eq!(ext.storage(key.as_slice()), Some(vec![reference_data[0].clone()].encode()),);
 		}
 	}
 
 	#[test]
 	fn remove_with_append_then_rollback_appended_then_append_again() {
-
 		#[derive(codec::Encode, codec::Decode)]
-		enum Item { InitializationItem, DiscardedItem, CommitedItem }
+		enum Item {
+			InitializationItem,
+			DiscardedItem,
+			CommitedItem,
+		}
 
 		let key = b"events".to_vec();
 		let mut cache = StorageTransactionCache::default();
@@ -1468,10 +1434,7 @@ mod tests {
 				None,
 			);
 
-			assert_eq!(
-				ext.storage(key.as_slice()),
-				Some(vec![Item::InitializationItem].encode()),
-			);
+			assert_eq!(ext.storage(key.as_slice()), Some(vec![Item::InitializationItem].encode()),);
 
 			ext.storage_append(key.clone(), Item::DiscardedItem.encode());
 
@@ -1492,10 +1455,7 @@ mod tests {
 				None,
 			);
 
-			assert_eq!(
-				ext.storage(key.as_slice()),
-				Some(vec![Item::InitializationItem].encode()),
-			);
+			assert_eq!(ext.storage(key.as_slice()), Some(vec![Item::InitializationItem].encode()),);
 
 			ext.storage_append(key.clone(), Item::CommitedItem.encode());
 
@@ -1503,7 +1463,6 @@ mod tests {
 				ext.storage(key.as_slice()),
 				Some(vec![Item::InitializationItem, Item::CommitedItem].encode()),
 			);
-
 		}
 		overlay.start_transaction();
 
@@ -1524,10 +1483,12 @@ mod tests {
 	}
 
 	fn test_compact(remote_proof: StorageProof, remote_root: &sp_core::H256) -> StorageProof {
-		let compact_remote_proof = remote_proof.into_compact_proof::<BlakeTwo256>(
-			remote_root.clone(),
-		).unwrap();
-		compact_remote_proof.to_storage_proof::<BlakeTwo256>(Some(remote_root)).unwrap().0
+		let compact_remote_proof =
+			remote_proof.into_compact_proof::<BlakeTwo256>(remote_root.clone()).unwrap();
+		compact_remote_proof
+			.to_storage_proof::<BlakeTwo256>(Some(remote_root))
+			.unwrap()
+			.0
 	}
 
 	#[test]
@@ -1539,17 +1500,13 @@ mod tests {
 		let remote_root = remote_backend.storage_root(std::iter::empty()).0;
 		let remote_proof = prove_read(remote_backend, &[b"value2"]).unwrap();
 		let remote_proof = test_compact(remote_proof, &remote_root);
- 		// check proof locally
-		let local_result1 = read_proof_check::<BlakeTwo256, _>(
-			remote_root,
-			remote_proof.clone(),
-			&[b"value2"],
-		).unwrap();
-		let local_result2 = read_proof_check::<BlakeTwo256, _>(
-			remote_root,
-			remote_proof.clone(),
-			&[&[0xff]],
-		).is_ok();
+		// check proof locally
+		let local_result1 =
+			read_proof_check::<BlakeTwo256, _>(remote_root, remote_proof.clone(), &[b"value2"])
+				.unwrap();
+		let local_result2 =
+			read_proof_check::<BlakeTwo256, _>(remote_root, remote_proof.clone(), &[&[0xff]])
+				.is_ok();
 		// check that results are correct
 		assert_eq!(
 			local_result1.into_iter().collect::<Vec<_>>(),
@@ -1559,45 +1516,42 @@ mod tests {
 		// on child trie
 		let remote_backend = trie_backend::tests::test_trie();
 		let remote_root = remote_backend.storage_root(std::iter::empty()).0;
-		let remote_proof = prove_child_read(
-			remote_backend,
-			child_info,
-			&[b"value3"],
-		).unwrap();
+		let remote_proof = prove_child_read(remote_backend, child_info, &[b"value3"]).unwrap();
 		let remote_proof = test_compact(remote_proof, &remote_root);
 		let local_result1 = read_child_proof_check::<BlakeTwo256, _>(
 			remote_root,
 			remote_proof.clone(),
 			child_info,
 			&[b"value3"],
-		).unwrap();
+		)
+		.unwrap();
 		let local_result2 = read_child_proof_check::<BlakeTwo256, _>(
 			remote_root,
 			remote_proof.clone(),
 			child_info,
 			&[b"value2"],
-		).unwrap();
+		)
+		.unwrap();
 		assert_eq!(
 			local_result1.into_iter().collect::<Vec<_>>(),
 			vec![(b"value3".to_vec(), Some(vec![142]))],
 		);
-		assert_eq!(
-			local_result2.into_iter().collect::<Vec<_>>(),
-			vec![(b"value2".to_vec(), None)],
-		);
+		assert_eq!(local_result2.into_iter().collect::<Vec<_>>(), vec![(b"value2".to_vec(), None)],);
 	}
 
 	#[test]
 	fn prove_read_with_size_limit_works() {
 		let remote_backend = trie_backend::tests::test_trie();
 		let remote_root = remote_backend.storage_root(::std::iter::empty()).0;
-		let (proof, count) = prove_range_read_with_size(remote_backend, None, None, 0, None).unwrap();
+		let (proof, count) =
+			prove_range_read_with_size(remote_backend, None, None, 0, None).unwrap();
 		// Alwasys contains at least some nodes.
 		assert_eq!(proof.into_memory_db::<BlakeTwo256>().drain().len(), 3);
 		assert_eq!(count, 1);
 
 		let remote_backend = trie_backend::tests::test_trie();
-		let (proof, count) = prove_range_read_with_size(remote_backend, None, None, 800, Some(&[])).unwrap();
+		let (proof, count) =
+			prove_range_read_with_size(remote_backend, None, None, 800, Some(&[])).unwrap();
 		assert_eq!(proof.clone().into_memory_db::<BlakeTwo256>().drain().len(), 9);
 		assert_eq!(count, 85);
 		let (results, completed) = read_range_proof_check::<BlakeTwo256>(
@@ -1607,23 +1561,20 @@ mod tests {
 			None,
 			Some(count),
 			None,
-		).unwrap();
+		)
+		.unwrap();
 		assert_eq!(results.len() as u32, count);
 		assert_eq!(completed, false);
 		// When checking without count limit, proof may actually contain extra values.
-		let (results, completed) = read_range_proof_check::<BlakeTwo256>(
-			remote_root,
-			proof,
-			None,
-			None,
-			None,
-			None,
-		).unwrap();
+		let (results, completed) =
+			read_range_proof_check::<BlakeTwo256>(remote_root, proof, None, None, None, None)
+				.unwrap();
 		assert_eq!(results.len() as u32, 101);
 		assert_eq!(completed, false);
 
 		let remote_backend = trie_backend::tests::test_trie();
-		let (proof, count) = prove_range_read_with_size(remote_backend, None, None, 50000, Some(&[])).unwrap();
+		let (proof, count) =
+			prove_range_read_with_size(remote_backend, None, None, 50000, Some(&[])).unwrap();
 		assert_eq!(proof.clone().into_memory_db::<BlakeTwo256>().drain().len(), 11);
 		assert_eq!(count, 132);
 		let (results, completed) = read_range_proof_check::<BlakeTwo256>(
@@ -1633,7 +1584,8 @@ mod tests {
 			None,
 			None,
 			None,
-		).unwrap();
+		)
+		.unwrap();
 		assert_eq!(results.len() as u32, count);
 		assert_eq!(completed, true);
 	}
@@ -1650,41 +1602,41 @@ mod tests {
 		let (remote_root, transaction) = remote_backend.full_storage_root(
 			std::iter::empty(),
 			vec![
-				(&child_info1, vec![
-					(&b"key1"[..], Some(&b"val2"[..])),
-					(&b"key2"[..], Some(&b"val3"[..])),
-				].into_iter()),
-				(&child_info2, vec![
-					(&b"key3"[..], Some(&b"val4"[..])),
-					(&b"key4"[..], Some(&b"val5"[..])),
-				].into_iter()),
-				(&child_info3, vec![
-					(&b"key5"[..], Some(&b"val6"[..])),
-					(&b"key6"[..], Some(&b"val7"[..])),
-				].into_iter()),
-			].into_iter(),
+				(
+					&child_info1,
+					vec![(&b"key1"[..], Some(&b"val2"[..])), (&b"key2"[..], Some(&b"val3"[..]))]
+						.into_iter(),
+				),
+				(
+					&child_info2,
+					vec![(&b"key3"[..], Some(&b"val4"[..])), (&b"key4"[..], Some(&b"val5"[..]))]
+						.into_iter(),
+				),
+				(
+					&child_info3,
+					vec![(&b"key5"[..], Some(&b"val6"[..])), (&b"key6"[..], Some(&b"val7"[..]))]
+						.into_iter(),
+				),
+			]
+			.into_iter(),
 		);
 		remote_backend.backend_storage_mut().consolidate(transaction);
 		remote_backend.essence.set_root(remote_root.clone());
-		let remote_proof = prove_child_read(
-			remote_backend,
-			&child_info1,
-			&[b"key1"],
-		).unwrap();
+		let remote_proof = prove_child_read(remote_backend, &child_info1, &[b"key1"]).unwrap();
 		let remote_proof = test_compact(remote_proof, &remote_root);
 		let local_result1 = read_child_proof_check::<BlakeTwo256, _>(
 			remote_root,
 			remote_proof.clone(),
 			&child_info1,
 			&[b"key1"],
-		).unwrap();
+		)
+		.unwrap();
 		assert_eq!(local_result1.len(), 1);
 		assert_eq!(local_result1.get(&b"key1"[..]), Some(&Some(b"val2".to_vec())));
 	}
 
 	#[test]
 	fn child_storage_uuid() {
-
 		let child_info_1 = ChildInfo::new_default(b"sub_test1");
 		let child_info_2 = ChildInfo::new_default(b"sub_test2");
 
@@ -1782,16 +1734,19 @@ mod tests {
 		);
 
 		let run_state_machine = |state_machine: &mut StateMachine<_, _, _, _>| {
-			state_machine.execute_using_consensus_failure_handler::<fn(_, _) -> _, _, _>(
-				ExecutionManager::NativeWhenPossible,
-				Some(|| {
-					sp_externalities::with_externalities(|mut ext| {
-						ext.register_extension(DummyExt(2)).unwrap();
-					}).unwrap();
-
-					Ok(())
-				}),
-			).unwrap();
+			state_machine
+				.execute_using_consensus_failure_handler::<fn(_, _) -> _, _, _>(
+					ExecutionManager::NativeWhenPossible,
+					Some(|| {
+						sp_externalities::with_externalities(|mut ext| {
+							ext.register_extension(DummyExt(2)).unwrap();
+						})
+						.unwrap();
+
+						Ok(())
+					}),
+				)
+				.unwrap();
 		};
 
 		run_state_machine(&mut state_machine);
diff --git a/primitives/state-machine/src/overlayed_changes/changeset.rs b/primitives/state-machine/src/overlayed_changes/changeset.rs
index ae9584990e5f..1ffd569e2828 100644
--- a/primitives/state-machine/src/overlayed_changes/changeset.rs
+++ b/primitives/state-machine/src/overlayed_changes/changeset.rs
@@ -17,17 +17,19 @@
 
 //! Houses the code that implements the transactional overlay storage.
 
-use super::{StorageKey, StorageValue, Extrinsics};
+use super::{Extrinsics, StorageKey, StorageValue};
 
-#[cfg(feature = "std")]
-use std::collections::HashSet as Set;
 #[cfg(not(feature = "std"))]
 use sp_std::collections::btree_set::BTreeSet as Set;
+#[cfg(feature = "std")]
+use std::collections::HashSet as Set;
 
-use sp_std::collections::{btree_map::BTreeMap, btree_set::BTreeSet};
-use sp_std::hash::Hash;
-use smallvec::SmallVec;
 use crate::warn;
+use smallvec::SmallVec;
+use sp_std::{
+	collections::{btree_map::BTreeMap, btree_set::BTreeSet},
+	hash::Hash,
+};
 
 const PROOF_OVERLAY_NON_EMPTY: &str = "\
 	An OverlayValue is always created with at least one transaction and dropped as soon
@@ -82,9 +84,7 @@ pub struct OverlayedEntry<V> {
 
 impl<V> Default for OverlayedEntry<V> {
 	fn default() -> Self {
-		Self {
-			transactions: SmallVec::new(),
-		}
+		Self { transactions: SmallVec::new() }
 	}
 }
 
@@ -142,7 +142,9 @@ impl<V> OverlayedEntry<V> {
 	/// Unique list of extrinsic indices which modified the value.
 	pub fn extrinsics(&self) -> BTreeSet<u32> {
 		let mut set = BTreeSet::new();
-		self.transactions.iter().for_each(|t| t.extrinsics.copy_extrinsics_into(&mut set));
+		self.transactions
+			.iter()
+			.for_each(|t| t.extrinsics.copy_extrinsics_into(&mut set));
 		set
 	}
 
@@ -165,17 +167,9 @@ impl<V> OverlayedEntry<V> {
 	///
 	/// This makes sure that the old version is not overwritten and can be properly
 	/// rolled back when required.
-	fn set(
-		&mut self,
-		value: V,
-		first_write_in_tx: bool,
-		at_extrinsic: Option<u32>,
-	) {
+	fn set(&mut self, value: V, first_write_in_tx: bool, at_extrinsic: Option<u32>) {
 		if first_write_in_tx || self.transactions.is_empty() {
-			self.transactions.push(InnerValue {
-				value,
-				extrinsics: Default::default(),
-			});
+			self.transactions.push(InnerValue { value, extrinsics: Default::default() });
 		} else {
 			*self.value_mut() = value;
 		}
@@ -223,9 +217,9 @@ impl<K: Ord + Hash + Clone, V> OverlayedMap<K, V> {
 
 	/// Get an optional reference to the value stored for the specified key.
 	pub fn get<Q>(&self, key: &Q) -> Option<&OverlayedEntry<V>>
-		where
-			K: sp_std::borrow::Borrow<Q>,
-			Q: Ord + ?Sized, 
+	where
+		K: sp_std::borrow::Borrow<Q>,
+		Q: Ord + ?Sized,
 	{
 		self.changes.get(key)
 	}
@@ -233,24 +227,19 @@ impl<K: Ord + Hash + Clone, V> OverlayedMap<K, V> {
 	/// Set a new value for the specified key.
 	///
 	/// Can be rolled back or committed when called inside a transaction.
-	pub fn set(
-		&mut self,
-		key: K,
-		value: V,
-		at_extrinsic: Option<u32>,
-	) {
+	pub fn set(&mut self, key: K, value: V, at_extrinsic: Option<u32>) {
 		let overlayed = self.changes.entry(key.clone()).or_default();
 		overlayed.set(value, insert_dirty(&mut self.dirty_keys, key), at_extrinsic);
 	}
 
 	/// Get a list of all changes as seen by current transaction.
-	pub fn changes(&self) -> impl Iterator<Item=(&K, &OverlayedEntry<V>)> {
+	pub fn changes(&self) -> impl Iterator<Item = (&K, &OverlayedEntry<V>)> {
 		self.changes.iter()
 	}
 
 	/// Get a list of all changes as seen by current transaction, consumes
 	/// the overlay.
-	pub fn into_changes(self) -> impl Iterator<Item=(K, OverlayedEntry<V>)> {
+	pub fn into_changes(self) -> impl Iterator<Item = (K, OverlayedEntry<V>)> {
 		self.changes.into_iter()
 	}
 
@@ -258,7 +247,7 @@ impl<K: Ord + Hash + Clone, V> OverlayedMap<K, V> {
 	///
 	/// Panics:
 	/// Panics if there are open transactions: `transaction_depth() > 0`
-	pub fn drain_commited(self) -> impl Iterator<Item=(K, V)> {
+	pub fn drain_commited(self) -> impl Iterator<Item = (K, V)> {
 		assert!(self.transaction_depth() == 0, "Drain is not allowed with open transactions.");
 		self.changes.into_iter().map(|(k, mut v)| (k, v.pop_transaction().value))
 	}
@@ -276,7 +265,7 @@ impl<K: Ord + Hash + Clone, V> OverlayedMap<K, V> {
 	/// Calling this while already inside the runtime will return an error.
 	pub fn enter_runtime(&mut self) -> Result<(), AlreadyInRuntime> {
 		if let ExecutionMode::Runtime = self.execution_mode {
-			return Err(AlreadyInRuntime);
+			return Err(AlreadyInRuntime)
 		}
 		self.execution_mode = ExecutionMode::Runtime;
 		self.num_client_transactions = self.transaction_depth();
@@ -289,7 +278,7 @@ impl<K: Ord + Hash + Clone, V> OverlayedMap<K, V> {
 	/// Calling this while already outside the runtime will return an error.
 	pub fn exit_runtime(&mut self) -> Result<(), NotInRuntime> {
 		if let ExecutionMode::Client = self.execution_mode {
-			return Err(NotInRuntime);
+			return Err(NotInRuntime)
 		}
 		self.execution_mode = ExecutionMode::Client;
 		if self.has_open_runtime_transactions() {
@@ -341,11 +330,13 @@ impl<K: Ord + Hash + Clone, V> OverlayedMap<K, V> {
 		}
 
 		for key in self.dirty_keys.pop().ok_or(NoOpenTransaction)? {
-			let overlayed = self.changes.get_mut(&key).expect("\
+			let overlayed = self.changes.get_mut(&key).expect(
+				"\
 				A write to an OverlayedValue is recorded in the dirty key set. Before an
 				OverlayedValue is removed, its containing dirty set is removed. This
 				function is only called for keys that are in the dirty set. qed\
-			");
+			",
+			);
 
 			if rollback {
 				overlayed.pop_transaction();
@@ -443,9 +434,12 @@ mod test {
 	type Drained<'a> = Vec<(&'a [u8], Option<&'a [u8]>)>;
 
 	fn assert_changes(is: &OverlayedChangeSet, expected: &Changes) {
-		let is: Changes = is.changes().map(|(k, v)| {
-			(k.as_ref(), (v.value().map(AsRef::as_ref), v.extrinsics().into_iter().collect()))
-		}).collect();
+		let is: Changes = is
+			.changes()
+			.map(|(k, v)| {
+				(k.as_ref(), (v.value().map(AsRef::as_ref), v.extrinsics().into_iter().collect()))
+			})
+			.collect();
 		assert_eq!(&is, expected);
 	}
 
@@ -453,7 +447,8 @@ mod test {
 		let is = is.drain_commited().collect::<Vec<_>>();
 		let expected = expected
 			.iter()
-			.map(|(k, v)| (k.to_vec(), v.0.map(From::from))).collect::<Vec<_>>();
+			.map(|(k, v)| (k.to_vec(), v.0.map(From::from)))
+			.collect::<Vec<_>>();
 		assert_eq!(is, expected);
 	}
 
@@ -461,7 +456,8 @@ mod test {
 		let is = is.drain_commited().collect::<Vec<_>>();
 		let expected = expected
 			.iter()
-			.map(|(k, v)| (k.to_vec(), v.map(From::from))).collect::<Vec<_>>();
+			.map(|(k, v)| (k.to_vec(), v.map(From::from)))
+			.collect::<Vec<_>>();
 		assert_eq!(is, expected);
 	}
 
@@ -474,10 +470,7 @@ mod test {
 		changeset.set(b"key1".to_vec(), Some(b"val1".to_vec()), Some(2));
 		changeset.set(b"key0".to_vec(), Some(b"val0-1".to_vec()), Some(9));
 
-		assert_drained(changeset, vec![
-			(b"key0", Some(b"val0-1")),
-			(b"key1", Some(b"val1")),
-		]);
+		assert_drained(changeset, vec![(b"key0", Some(b"val0-1")), (b"key1", Some(b"val1"))]);
 	}
 
 	#[test]
@@ -599,10 +592,8 @@ mod test {
 		changeset.rollback_transaction().unwrap();
 		assert_eq!(changeset.transaction_depth(), 0);
 
-		let rolled_back: Changes = vec![
-			(b"key0", (Some(b"val0-1"), vec![1, 10])),
-			(b"key1", (Some(b"val1"), vec![1])),
-		];
+		let rolled_back: Changes =
+			vec![(b"key0", (Some(b"val0-1"), vec![1, 10])), (b"key1", (Some(b"val1"), vec![1]))];
 		assert_changes(&changeset, &rolled_back);
 
 		assert_drained_changes(changeset, rolled_back);
@@ -676,21 +667,27 @@ mod test {
 
 		changeset.clear_where(|k, _| k.starts_with(b"del"), Some(5));
 
-		assert_changes(&changeset, &vec![
-			(b"del1", (None, vec![3, 5])),
-			(b"del2", (None, vec![4, 5])),
-			(b"key0", (Some(b"val0"), vec![1])),
-			(b"key1", (Some(b"val1"), vec![2])),
-		]);
+		assert_changes(
+			&changeset,
+			&vec![
+				(b"del1", (None, vec![3, 5])),
+				(b"del2", (None, vec![4, 5])),
+				(b"key0", (Some(b"val0"), vec![1])),
+				(b"key1", (Some(b"val1"), vec![2])),
+			],
+		);
 
 		changeset.rollback_transaction().unwrap();
 
-		assert_changes(&changeset, &vec![
-			(b"del1", (Some(b"delval1"), vec![3])),
-			(b"del2", (Some(b"delval2"), vec![4])),
-			(b"key0", (Some(b"val0"), vec![1])),
-			(b"key1", (Some(b"val1"), vec![2])),
-		]);
+		assert_changes(
+			&changeset,
+			&vec![
+				(b"del1", (Some(b"delval1"), vec![3])),
+				(b"del2", (Some(b"delval2"), vec![4])),
+				(b"key0", (Some(b"val0"), vec![1])),
+				(b"key1", (Some(b"val1"), vec![2])),
+			],
+		);
 	}
 
 	#[test]
@@ -708,29 +705,52 @@ mod test {
 		changeset.set(b"key11".to_vec(), Some(b"val11".to_vec()), Some(11));
 
 		assert_eq!(changeset.changes_after(b"key0").next().unwrap().0, b"key1");
-		assert_eq!(changeset.changes_after(b"key0").next().unwrap().1.value(), Some(&b"val1".to_vec()));
+		assert_eq!(
+			changeset.changes_after(b"key0").next().unwrap().1.value(),
+			Some(&b"val1".to_vec())
+		);
 		assert_eq!(changeset.changes_after(b"key1").next().unwrap().0, b"key11");
-		assert_eq!(changeset.changes_after(b"key1").next().unwrap().1.value(), Some(&b"val11".to_vec()));
+		assert_eq!(
+			changeset.changes_after(b"key1").next().unwrap().1.value(),
+			Some(&b"val11".to_vec())
+		);
 		assert_eq!(changeset.changes_after(b"key11").next().unwrap().0, b"key2");
-		assert_eq!(changeset.changes_after(b"key11").next().unwrap().1.value(), Some(&b"val2".to_vec()));
+		assert_eq!(
+			changeset.changes_after(b"key11").next().unwrap().1.value(),
+			Some(&b"val2".to_vec())
+		);
 		assert_eq!(changeset.changes_after(b"key2").next().unwrap().0, b"key3");
-		assert_eq!(changeset.changes_after(b"key2").next().unwrap().1.value(), Some(&b"val3".to_vec()));
+		assert_eq!(
+			changeset.changes_after(b"key2").next().unwrap().1.value(),
+			Some(&b"val3".to_vec())
+		);
 		assert_eq!(changeset.changes_after(b"key3").next().unwrap().0, b"key4");
-		assert_eq!(changeset.changes_after(b"key3").next().unwrap().1.value(), Some(&b"val4".to_vec()));
+		assert_eq!(
+			changeset.changes_after(b"key3").next().unwrap().1.value(),
+			Some(&b"val4".to_vec())
+		);
 		assert_eq!(changeset.changes_after(b"key4").next(), None);
 
 		changeset.rollback_transaction().unwrap();
 
 		assert_eq!(changeset.changes_after(b"key0").next().unwrap().0, b"key1");
-		assert_eq!(changeset.changes_after(b"key0").next().unwrap().1.value(), Some(&b"val1".to_vec()));
+		assert_eq!(
+			changeset.changes_after(b"key0").next().unwrap().1.value(),
+			Some(&b"val1".to_vec())
+		);
 		assert_eq!(changeset.changes_after(b"key1").next().unwrap().0, b"key2");
-		assert_eq!(changeset.changes_after(b"key1").next().unwrap().1.value(), Some(&b"val2".to_vec()));
+		assert_eq!(
+			changeset.changes_after(b"key1").next().unwrap().1.value(),
+			Some(&b"val2".to_vec())
+		);
 		assert_eq!(changeset.changes_after(b"key11").next().unwrap().0, b"key2");
-		assert_eq!(changeset.changes_after(b"key11").next().unwrap().1.value(), Some(&b"val2".to_vec()));
+		assert_eq!(
+			changeset.changes_after(b"key11").next().unwrap().1.value(),
+			Some(&b"val2".to_vec())
+		);
 		assert_eq!(changeset.changes_after(b"key2").next(), None);
 		assert_eq!(changeset.changes_after(b"key3").next(), None);
 		assert_eq!(changeset.changes_after(b"key4").next(), None);
-
 	}
 
 	#[test]
@@ -790,9 +810,7 @@ mod test {
 		changeset.commit_transaction().unwrap();
 		assert_eq!(changeset.transaction_depth(), 0);
 
-		assert_drained(changeset, vec![
-			(b"key0", Some(b"val0")),
-		]);
+		assert_drained(changeset, vec![(b"key0", Some(b"val0"))]);
 	}
 
 	#[test]
diff --git a/primitives/state-machine/src/overlayed_changes/mod.rs b/primitives/state-machine/src/overlayed_changes/mod.rs
index a261e084eeda..a0558e06a380 100644
--- a/primitives/state-machine/src/overlayed_changes/mod.rs
+++ b/primitives/state-machine/src/overlayed_changes/mod.rs
@@ -20,36 +20,35 @@
 mod changeset;
 mod offchain;
 
+use self::changeset::OverlayedChangeSet;
+use crate::{backend::Backend, stats::StateMachineStats};
 pub use offchain::OffchainOverlayedChanges;
-use crate::{
-	backend::Backend,
-	stats::StateMachineStats,
+use sp_std::{
+	any::{Any, TypeId},
+	boxed::Box,
+	vec::Vec,
 };
-use sp_std::{vec::Vec, any::{TypeId, Any}, boxed::Box};
-use self::changeset::OverlayedChangeSet;
 
+use crate::{changes_trie::BlockNumber, DefaultError};
 #[cfg(feature = "std")]
 use crate::{
+	changes_trie::{build_changes_trie, State as ChangesTrieState},
 	ChangesTrieTransaction,
-	changes_trie::{
-		build_changes_trie,
-		State as ChangesTrieState,
-	},
 };
-use crate::changes_trie::BlockNumber;
-#[cfg(feature = "std")]
-use std::collections::{HashMap as Map, hash_map::Entry as MapEntry};
+use codec::{Decode, Encode};
+use hash_db::Hasher;
+use sp_core::{
+	offchain::OffchainOverlayedChange,
+	storage::{well_known_keys::EXTRINSIC_INDEX, ChildInfo},
+};
+use sp_externalities::{Extension, Extensions};
 #[cfg(not(feature = "std"))]
 use sp_std::collections::btree_map::{BTreeMap as Map, Entry as MapEntry};
 use sp_std::collections::btree_set::BTreeSet;
-use codec::{Decode, Encode};
-use sp_core::storage::{well_known_keys::EXTRINSIC_INDEX, ChildInfo};
-use sp_core::offchain::OffchainOverlayedChange;
-use hash_db::Hasher;
-use crate::DefaultError;
-use sp_externalities::{Extensions, Extension};
+#[cfg(feature = "std")]
+use std::collections::{hash_map::Entry as MapEntry, HashMap as Map};
 
-pub use self::changeset::{OverlayedValue, NoOpenTransaction, AlreadyInRuntime, NotInRuntime};
+pub use self::changeset::{AlreadyInRuntime, NoOpenTransaction, NotInRuntime, OverlayedValue};
 
 /// Changes that are made outside of extrinsics are marked with this index;
 pub const NO_EXTRINSIC_INDEX: u32 = 0xffffffff;
@@ -129,7 +128,7 @@ pub enum IndexOperation {
 		extrinsic: u32,
 		/// Referenced index hash.
 		hash: Vec<u8>,
-	}
+	},
 }
 
 /// A storage changes structure that can be generated by the data collected in [`OverlayedChanges`].
@@ -169,7 +168,9 @@ pub struct StorageChanges<Transaction, H: Hasher, N: BlockNumber> {
 #[cfg(feature = "std")]
 impl<Transaction, H: Hasher, N: BlockNumber> StorageChanges<Transaction, H, N> {
 	/// Deconstruct into the inner values
-	pub fn into_inner(self) -> (
+	pub fn into_inner(
+		self,
+	) -> (
 		StorageCollection,
 		ChildStorageCollection,
 		OffchainChangesCollection,
@@ -216,7 +217,9 @@ impl<Transaction, H: Hasher, N: BlockNumber> StorageTransactionCache<Transaction
 	}
 }
 
-impl<Transaction, H: Hasher, N: BlockNumber> Default for StorageTransactionCache<Transaction, H, N> {
+impl<Transaction, H: Hasher, N: BlockNumber> Default
+	for StorageTransactionCache<Transaction, H, N>
+{
 	fn default() -> Self {
 		Self {
 			transaction: None,
@@ -231,7 +234,9 @@ impl<Transaction, H: Hasher, N: BlockNumber> Default for StorageTransactionCache
 	}
 }
 
-impl<Transaction: Default, H: Hasher, N: BlockNumber> Default for StorageChanges<Transaction, H, N> {
+impl<Transaction: Default, H: Hasher, N: BlockNumber> Default
+	for StorageChanges<Transaction, H, N>
+{
 	fn default() -> Self {
 		Self {
 			main_storage_changes: Default::default(),
@@ -325,12 +330,10 @@ impl OverlayedChanges {
 		self.stats.tally_write_overlay(size_write);
 		let storage_key = child_info.storage_key().to_vec();
 		let top = &self.top;
-		let (changeset, info) = self.children.entry(storage_key).or_insert_with(||
-			(
-				top.spawn_child(),
-				child_info.clone()
-			)
-		);
+		let (changeset, info) = self
+			.children
+			.entry(storage_key)
+			.or_insert_with(|| (top.spawn_child(), child_info.clone()));
 		let updatable = info.try_update(child_info);
 		debug_assert!(updatable);
 		changeset.set(key, val, extrinsic_index);
@@ -339,19 +342,14 @@ impl OverlayedChanges {
 	/// Clear child storage of given storage key.
 	///
 	/// Can be rolled back or committed when called inside a transaction.
-	pub(crate) fn clear_child_storage(
-		&mut self,
-		child_info: &ChildInfo,
-	) {
+	pub(crate) fn clear_child_storage(&mut self, child_info: &ChildInfo) {
 		let extrinsic_index = self.extrinsic_index();
 		let storage_key = child_info.storage_key().to_vec();
 		let top = &self.top;
-		let (changeset, info) = self.children.entry(storage_key).or_insert_with(||
-			(
-				top.spawn_child(),
-				child_info.clone()
-			)
-		);
+		let (changeset, info) = self
+			.children
+			.entry(storage_key)
+			.or_insert_with(|| (top.spawn_child(), child_info.clone()));
 		let updatable = info.try_update(child_info);
 		debug_assert!(updatable);
 		changeset.clear_where(|_, _| true, extrinsic_index);
@@ -367,20 +365,14 @@ impl OverlayedChanges {
 	/// Removes all key-value pairs which keys share the given prefix.
 	///
 	/// Can be rolled back or committed when called inside a transaction
-	pub(crate) fn clear_child_prefix(
-		&mut self,
-		child_info: &ChildInfo,
-		prefix: &[u8],
-	) {
+	pub(crate) fn clear_child_prefix(&mut self, child_info: &ChildInfo, prefix: &[u8]) {
 		let extrinsic_index = self.extrinsic_index();
 		let storage_key = child_info.storage_key().to_vec();
 		let top = &self.top;
-		let (changeset, info) = self.children.entry(storage_key).or_insert_with(||
-			(
-				top.spawn_child(),
-				child_info.clone()
-			)
-		);
+		let (changeset, info) = self
+			.children
+			.entry(storage_key)
+			.or_insert_with(|| (top.spawn_child(), child_info.clone()));
 		let updatable = info.try_update(child_info);
 		debug_assert!(updatable);
 		changeset.clear_where(|key, _| key.starts_with(prefix), extrinsic_index);
@@ -417,11 +409,14 @@ impl OverlayedChanges {
 	pub fn rollback_transaction(&mut self) -> Result<(), NoOpenTransaction> {
 		self.top.rollback_transaction()?;
 		retain_map(&mut self.children, |_, (changeset, _)| {
-			changeset.rollback_transaction()
+			changeset
+				.rollback_transaction()
 				.expect("Top and children changesets are started in lockstep; qed");
 			!changeset.is_empty()
 		});
-		self.offchain.overlay_mut().rollback_transaction()
+		self.offchain
+			.overlay_mut()
+			.rollback_transaction()
 			.expect("Top and offchain changesets are started in lockstep; qed");
 		Ok(())
 	}
@@ -433,10 +428,13 @@ impl OverlayedChanges {
 	pub fn commit_transaction(&mut self) -> Result<(), NoOpenTransaction> {
 		self.top.commit_transaction()?;
 		for (_, (changeset, _)) in self.children.iter_mut() {
-			changeset.commit_transaction()
+			changeset
+				.commit_transaction()
 				.expect("Top and children changesets are started in lockstep; qed");
 		}
-		self.offchain.overlay_mut().commit_transaction()
+		self.offchain
+			.overlay_mut()
+			.commit_transaction()
 			.expect("Top and offchain changesets are started in lockstep; qed");
 		Ok(())
 	}
@@ -448,10 +446,13 @@ impl OverlayedChanges {
 	pub fn enter_runtime(&mut self) -> Result<(), AlreadyInRuntime> {
 		self.top.enter_runtime()?;
 		for (_, (changeset, _)) in self.children.iter_mut() {
-			changeset.enter_runtime()
+			changeset
+				.enter_runtime()
 				.expect("Top and children changesets are entering runtime in lockstep; qed")
 		}
-		self.offchain.overlay_mut().enter_runtime()
+		self.offchain
+			.overlay_mut()
+			.enter_runtime()
 			.expect("Top and offchain changesets are started in lockstep; qed");
 		Ok(())
 	}
@@ -463,10 +464,13 @@ impl OverlayedChanges {
 	pub fn exit_runtime(&mut self) -> Result<(), NotInRuntime> {
 		self.top.exit_runtime()?;
 		for (_, (changeset, _)) in self.children.iter_mut() {
-			changeset.exit_runtime()
+			changeset
+				.exit_runtime()
 				.expect("Top and children changesets are entering runtime in lockstep; qed");
 		}
-		self.offchain.overlay_mut().exit_runtime()
+		self.offchain
+			.overlay_mut()
+			.exit_runtime()
 			.expect("Top and offchain changesets are started in lockstep; qed");
 		Ok(())
 	}
@@ -477,19 +481,23 @@ impl OverlayedChanges {
 	///
 	/// Panics:
 	/// Panics if `transaction_depth() > 0`
-	fn drain_committed(&mut self) -> (
-		impl Iterator<Item=(StorageKey, Option<StorageValue>)>,
-		impl Iterator<Item=(StorageKey, (impl Iterator<Item=(StorageKey, Option<StorageValue>)>, ChildInfo))>,
+	fn drain_committed(
+		&mut self,
+	) -> (
+		impl Iterator<Item = (StorageKey, Option<StorageValue>)>,
+		impl Iterator<
+			Item = (
+				StorageKey,
+				(impl Iterator<Item = (StorageKey, Option<StorageValue>)>, ChildInfo),
+			),
+		>,
 	) {
 		use sp_std::mem::take;
 		(
 			take(&mut self.top).drain_commited(),
-			take(&mut self.children).into_iter()
-				.map(|(key, (val, info))| (
-						key,
-						(val.drain_commited(), info)
-					)
-				),
+			take(&mut self.children)
+				.into_iter()
+				.map(|(key, (val, info))| (key, (val.drain_commited(), info))),
 		)
 	}
 
@@ -499,24 +507,29 @@ impl OverlayedChanges {
 	///
 	/// Panics:
 	/// Panics if `transaction_depth() > 0`
-	pub fn offchain_drain_committed(&mut self) -> impl Iterator<Item=((StorageKey, StorageKey), OffchainOverlayedChange)> {
+	pub fn offchain_drain_committed(
+		&mut self,
+	) -> impl Iterator<Item = ((StorageKey, StorageKey), OffchainOverlayedChange)> {
 		self.offchain.drain()
 	}
 
 	/// Get an iterator over all child changes as seen by the current transaction.
-	pub fn children(&self)
-		-> impl Iterator<Item=(impl Iterator<Item=(&StorageKey, &OverlayedValue)>, &ChildInfo)> {
+	pub fn children(
+		&self,
+	) -> impl Iterator<Item = (impl Iterator<Item = (&StorageKey, &OverlayedValue)>, &ChildInfo)> {
 		self.children.iter().map(|(_, v)| (v.0.changes(), &v.1))
 	}
 
 	/// Get an iterator over all top changes as been by the current transaction.
-	pub fn changes(&self) -> impl Iterator<Item=(&StorageKey, &OverlayedValue)> {
+	pub fn changes(&self) -> impl Iterator<Item = (&StorageKey, &OverlayedValue)> {
 		self.top.changes()
 	}
 
 	/// Get an optional iterator over all child changes stored under the supplied key.
-	pub fn child_changes(&self, key: &[u8])
-		-> Option<(impl Iterator<Item=(&StorageKey, &OverlayedValue)>, &ChildInfo)> {
+	pub fn child_changes(
+		&self,
+		key: &[u8],
+	) -> Option<(impl Iterator<Item = (&StorageKey, &OverlayedValue)>, &ChildInfo)> {
 		self.children.get(key).map(|(overlay, info)| (overlay.changes(), info))
 	}
 
@@ -527,16 +540,16 @@ impl OverlayedChanges {
 
 	/// Convert this instance with all changes into a [`StorageChanges`] instance.
 	#[cfg(feature = "std")]
-	pub fn into_storage_changes<
-		B: Backend<H>, H: Hasher, N: BlockNumber
-	>(
+	pub fn into_storage_changes<B: Backend<H>, H: Hasher, N: BlockNumber>(
 		mut self,
 		backend: &B,
 		changes_trie_state: Option<&ChangesTrieState<H, N>>,
 		parent_hash: H::Out,
 		mut cache: StorageTransactionCache<B::Transaction, H, N>,
 	) -> Result<StorageChanges<B::Transaction, H, N>, DefaultError>
-		where H::Out: Ord + Encode + 'static {
+	where
+		H::Out: Ord + Encode + 'static,
+	{
 		self.drain_storage_changes(backend, changes_trie_state, parent_hash, &mut cache)
 	}
 
@@ -544,35 +557,34 @@ impl OverlayedChanges {
 	pub fn drain_storage_changes<B: Backend<H>, H: Hasher, N: BlockNumber>(
 		&mut self,
 		backend: &B,
-		#[cfg(feature = "std")]
-		changes_trie_state: Option<&ChangesTrieState<H, N>>,
+		#[cfg(feature = "std")] changes_trie_state: Option<&ChangesTrieState<H, N>>,
 		parent_hash: H::Out,
 		mut cache: &mut StorageTransactionCache<B::Transaction, H, N>,
 	) -> Result<StorageChanges<B::Transaction, H, N>, DefaultError>
-		where H::Out: Ord + Encode + 'static {
+	where
+		H::Out: Ord + Encode + 'static,
+	{
 		// If the transaction does not exist, we generate it.
 		if cache.transaction.is_none() {
 			self.storage_root(backend, &mut cache);
 		}
 
-		let (transaction, transaction_storage_root) = cache.transaction.take()
+		let (transaction, transaction_storage_root) = cache
+			.transaction
+			.take()
 			.and_then(|t| cache.transaction_storage_root.take().map(|tr| (t, tr)))
 			.expect("Transaction was be generated as part of `storage_root`; qed");
 
 		// If the transaction does not exist, we generate it.
 		#[cfg(feature = "std")]
 		if cache.changes_trie_transaction.is_none() {
-			self.changes_trie_root(
-				backend,
-				changes_trie_state,
-				parent_hash,
-				false,
-				&mut cache,
-			).map_err(|_| "Failed to generate changes trie transaction")?;
+			self.changes_trie_root(backend, changes_trie_state, parent_hash, false, &mut cache)
+				.map_err(|_| "Failed to generate changes trie transaction")?;
 		}
 
 		#[cfg(feature = "std")]
-		let changes_trie_transaction = cache.changes_trie_transaction
+		let changes_trie_transaction = cache
+			.changes_trie_transaction
 			.take()
 			.expect("Changes trie transaction was generated by `changes_trie_root`; qed");
 
@@ -584,7 +596,9 @@ impl OverlayedChanges {
 
 		Ok(StorageChanges {
 			main_storage_changes: main_storage_changes.collect(),
-			child_storage_changes: child_storage_changes.map(|(sk, it)| (sk, it.0.collect())).collect(),
+			child_storage_changes: child_storage_changes
+				.map(|(sk, it)| (sk, it.0.collect()))
+				.collect(),
 			offchain_storage_changes,
 			transaction,
 			transaction_storage_root,
@@ -614,7 +628,8 @@ impl OverlayedChanges {
 			true => Some(
 				self.storage(EXTRINSIC_INDEX)
 					.and_then(|idx| idx.and_then(|idx| Decode::decode(&mut &*idx).ok()))
-					.unwrap_or(NO_EXTRINSIC_INDEX)),
+					.unwrap_or(NO_EXTRINSIC_INDEX),
+			),
 			false => None,
 		}
 	}
@@ -628,13 +643,13 @@ impl OverlayedChanges {
 		backend: &B,
 		cache: &mut StorageTransactionCache<B::Transaction, H, N>,
 	) -> H::Out
-		where H::Out: Ord + Encode,
+	where
+		H::Out: Ord + Encode,
 	{
 		let delta = self.changes().map(|(k, v)| (&k[..], v.value().map(|v| &v[..])));
-		let child_delta = self.children()
-			.map(|(changes, info)| (info, changes.map(
-				|(k, v)| (&k[..], v.value().map(|v| &v[..]))
-			)));
+		let child_delta = self.children().map(|(changes, info)| {
+			(info, changes.map(|(k, v)| (&k[..], v.value().map(|v| &v[..]))))
+		});
 
 		let (root, transaction) = backend.full_storage_root(delta, child_delta);
 
@@ -659,14 +674,18 @@ impl OverlayedChanges {
 		parent_hash: H::Out,
 		panic_on_storage_error: bool,
 		cache: &mut StorageTransactionCache<B::Transaction, H, N>,
-	) -> Result<Option<H::Out>, ()> where H::Out: Ord + Encode + 'static {
+	) -> Result<Option<H::Out>, ()>
+	where
+		H::Out: Ord + Encode + 'static,
+	{
 		build_changes_trie::<_, H, N>(
 			backend,
 			changes_trie_state,
 			self,
 			parent_hash,
 			panic_on_storage_error,
-		).map(|r| {
+		)
+		.map(|r| {
 			let root = r.as_ref().map(|r| r.1).clone();
 			cache.changes_trie_transaction = Some(r.map(|(db, _, cache)| (db, cache)));
 			cache.changes_trie_transaction_storage_root = Some(root);
@@ -685,7 +704,7 @@ impl OverlayedChanges {
 	pub fn child_iter_after(
 		&self,
 		storage_key: &[u8],
-		key: &[u8]
+		key: &[u8],
 	) -> impl Iterator<Item = (&[u8], &OverlayedValue)> {
 		self.children
 			.get(storage_key)
@@ -716,18 +735,18 @@ impl OverlayedChanges {
 
 #[cfg(feature = "std")]
 fn retain_map<K, V, F>(map: &mut Map<K, V>, f: F)
-	where
-		K: std::cmp::Eq + std::hash::Hash,
-		F: FnMut(&K, &mut V) -> bool,
+where
+	K: std::cmp::Eq + std::hash::Hash,
+	F: FnMut(&K, &mut V) -> bool,
 {
 	map.retain(f);
 }
 
 #[cfg(not(feature = "std"))]
 fn retain_map<K, V, F>(map: &mut Map<K, V>, mut f: F)
-	where
-		K: Ord,
-		F: FnMut(&K, &mut V) -> bool,
+where
+	K: Ord,
+	F: FnMut(&K, &mut V) -> bool,
 {
 	let old = sp_std::mem::replace(map, Map::default());
 	for (k, mut v) in old.into_iter() {
@@ -799,18 +818,13 @@ impl<'a> OverlayedExtensions<'a> {
 
 #[cfg(test)]
 mod tests {
-	use hex_literal::hex;
-	use sp_core::{Blake2Hasher, traits::Externalities};
-	use crate::InMemoryBackend;
-	use crate::ext::Ext;
 	use super::*;
+	use crate::{ext::Ext, InMemoryBackend};
+	use hex_literal::hex;
+	use sp_core::{traits::Externalities, Blake2Hasher};
 	use std::collections::BTreeMap;
 
-	fn assert_extrinsics(
-		overlay: &OverlayedChangeSet,
-		key: impl AsRef<[u8]>,
-		expected: Vec<u32>,
-	) {
+	fn assert_extrinsics(overlay: &OverlayedChangeSet, key: impl AsRef<[u8]>, expected: Vec<u32>) {
 		assert_eq!(
 			overlay.get(key.as_ref()).unwrap().extrinsics().into_iter().collect::<Vec<_>>(),
 			expected
@@ -863,13 +877,16 @@ mod tests {
 				state.commit_transaction().unwrap();
 			}
 			let offchain_data: Vec<_> = state.offchain_drain_committed().collect();
-			let expected: Vec<_> = expected.into_iter().map(|(key, value)| {
-				let change = match value {
-					Some(value) => OffchainOverlayedChange::SetValue(value),
-					None => OffchainOverlayedChange::Remove,
-				};
-				((STORAGE_PREFIX.to_vec(), key), change)
-			}).collect();
+			let expected: Vec<_> = expected
+				.into_iter()
+				.map(|(key, value)| {
+					let change = match value {
+						Some(value) => OffchainOverlayedChange::SetValue(value),
+						None => OffchainOverlayedChange::Remove,
+					};
+					((STORAGE_PREFIX.to_vec(), key), change)
+				})
+				.collect();
 			assert_eq!(offchain_data, expected);
 		}
 
@@ -904,7 +921,6 @@ mod tests {
 		check_offchain_content(&overlayed, 0, vec![(key.clone(), None)]);
 	}
 
-
 	#[test]
 	fn overlayed_storage_root_works() {
 		let initial: BTreeMap<_, _> = vec![
@@ -912,7 +928,9 @@ mod tests {
 			(b"dog".to_vec(), b"puppyXXX".to_vec()),
 			(b"dogglesworth".to_vec(), b"catXXX".to_vec()),
 			(b"doug".to_vec(), b"notadog".to_vec()),
-		].into_iter().collect();
+		]
+		.into_iter()
+		.collect();
 		let backend = InMemoryBackend::<Blake2Hasher>::from(initial);
 		let mut overlay = OverlayedChanges::default();
 		overlay.set_collect_extrinsics(false);
@@ -935,7 +953,8 @@ mod tests {
 			crate::changes_trie::disabled_state::<_, u64>(),
 			None,
 		);
-		const ROOT: [u8; 32] = hex!("39245109cef3758c2eed2ccba8d9b370a917850af3824bc8348d505df2c298fa");
+		const ROOT: [u8; 32] =
+			hex!("39245109cef3758c2eed2ccba8d9b370a917850af3824bc8348d505df2c298fa");
 
 		assert_eq!(&ext.storage_root()[..], &ROOT);
 	}
diff --git a/primitives/state-machine/src/overlayed_changes/offchain.rs b/primitives/state-machine/src/overlayed_changes/offchain.rs
index 4128be24bc54..9603426fa551 100644
--- a/primitives/state-machine/src/overlayed_changes/offchain.rs
+++ b/primitives/state-machine/src/overlayed_changes/offchain.rs
@@ -17,9 +17,9 @@
 
 //! Overlayed changes for offchain indexing.
 
+use super::changeset::OverlayedMap;
 use sp_core::offchain::OffchainOverlayedChange;
 use sp_std::prelude::Vec;
-use super::changeset::OverlayedMap;
 
 /// In-memory storage for offchain workers recoding changes for the actual offchain storage implementation.
 #[derive(Debug, Clone, Default)]
@@ -52,11 +52,9 @@ impl OffchainOverlayedChanges {
 
 	/// Remove a key and its associated value from the offchain database.
 	pub fn remove(&mut self, prefix: &[u8], key: &[u8]) {
-		let _ = self.0.set(
-			(prefix.to_vec(), key.to_vec()),
-			OffchainOverlayedChange::Remove,
-			None,
-		);
+		let _ = self
+			.0
+			.set((prefix.to_vec(), key.to_vec()), OffchainOverlayedChange::Remove, None);
 	}
 
 	/// Set the value associated with a key under a prefix to the value provided.
@@ -80,7 +78,9 @@ impl OffchainOverlayedChanges {
 	}
 
 	/// Mutable reference to inner change set.
-	pub fn overlay_mut(&mut self) -> &mut OverlayedMap<(Vec<u8>, Vec<u8>), OffchainOverlayedChange> {
+	pub fn overlay_mut(
+		&mut self,
+	) -> &mut OverlayedMap<(Vec<u8>, Vec<u8>), OffchainOverlayedChange> {
 		&mut self.0
 	}
 }
@@ -120,10 +120,10 @@ mod test {
 		let mut iter = ooc.into_iter();
 		assert_eq!(
 			iter.next(),
-			Some(
-				((STORAGE_PREFIX.to_vec(), b"ppp".to_vec()),
-				OffchainOverlayedChange::SetValue(b"rrr".to_vec()))
-			)
+			Some((
+				(STORAGE_PREFIX.to_vec(), b"ppp".to_vec()),
+				OffchainOverlayedChange::SetValue(b"rrr".to_vec())
+			))
 		);
 		assert_eq!(iter.next(), None);
 	}
diff --git a/primitives/state-machine/src/proving_backend.rs b/primitives/state-machine/src/proving_backend.rs
index 5275aa82521c..3a242313a65c 100644
--- a/primitives/state-machine/src/proving_backend.rs
+++ b/primitives/state-machine/src/proving_backend.rs
@@ -17,20 +17,28 @@
 
 //! Proving state machine backend.
 
-use std::{sync::Arc, collections::{HashMap, hash_map::Entry}};
-use parking_lot::RwLock;
-use codec::{Decode, Codec, Encode};
+use crate::{
+	trie_backend::TrieBackend,
+	trie_backend_essence::{Ephemeral, TrieBackendEssence, TrieBackendStorage},
+	Backend, DBValue, Error, ExecutionError,
+};
+use codec::{Codec, Decode, Encode};
+use hash_db::{HashDB, Hasher, Prefix, EMPTY_PREFIX};
 use log::debug;
-use hash_db::{Hasher, HashDB, EMPTY_PREFIX, Prefix};
+use parking_lot::RwLock;
+use sp_core::storage::ChildInfo;
 use sp_trie::{
-	MemoryDB, empty_child_trie_root, read_trie_value_with, read_child_trie_value_with,
-	record_all_keys, StorageProof,
+	empty_child_trie_root, read_child_trie_value_with, read_trie_value_with, record_all_keys,
+	MemoryDB, StorageProof,
+};
+pub use sp_trie::{
+	trie_types::{Layout, TrieError},
+	Recorder,
+};
+use std::{
+	collections::{hash_map::Entry, HashMap},
+	sync::Arc,
 };
-pub use sp_trie::{Recorder, trie_types::{Layout, TrieError}};
-use crate::trie_backend::TrieBackend;
-use crate::trie_backend_essence::{Ephemeral, TrieBackendEssence, TrieBackendStorage};
-use crate::{Error, ExecutionError, Backend, DBValue};
-use sp_core::storage::ChildInfo;
 
 /// Patricia trie-based backend specialized in get value proofs.
 pub struct ProvingBackendRecorder<'a, S: 'a + TrieBackendStorage<H>, H: 'a + Hasher> {
@@ -39,18 +47,15 @@ pub struct ProvingBackendRecorder<'a, S: 'a + TrieBackendStorage<H>, H: 'a + Has
 }
 
 impl<'a, S, H> ProvingBackendRecorder<'a, S, H>
-	where
-		S: TrieBackendStorage<H>,
-		H: Hasher,
-		H::Out: Codec,
+where
+	S: TrieBackendStorage<H>,
+	H: Hasher,
+	H::Out: Codec,
 {
 	/// Produce proof for a key query.
 	pub fn storage(&mut self, key: &[u8]) -> Result<Option<Vec<u8>>, String> {
 		let mut read_overlay = S::Overlay::default();
-		let eph = Ephemeral::new(
-			self.backend.backend_storage(),
-			&mut read_overlay,
-		);
+		let eph = Ephemeral::new(self.backend.backend_storage(), &mut read_overlay);
 
 		let map_e = |e| format!("Trie lookup error: {}", e);
 
@@ -59,25 +64,24 @@ impl<'a, S, H> ProvingBackendRecorder<'a, S, H>
 			self.backend.root(),
 			key,
 			&mut *self.proof_recorder,
-		).map_err(map_e)
+		)
+		.map_err(map_e)
 	}
 
 	/// Produce proof for a child key query.
 	pub fn child_storage(
 		&mut self,
 		child_info: &ChildInfo,
-		key: &[u8]
+		key: &[u8],
 	) -> Result<Option<Vec<u8>>, String> {
 		let storage_key = child_info.storage_key();
-		let root = self.storage(storage_key)?
+		let root = self
+			.storage(storage_key)?
 			.and_then(|r| Decode::decode(&mut &r[..]).ok())
 			.unwrap_or_else(|| empty_child_trie_root::<Layout<H>>());
 
 		let mut read_overlay = S::Overlay::default();
-		let eph = Ephemeral::new(
-			self.backend.backend_storage(),
-			&mut read_overlay,
-		);
+		let eph = Ephemeral::new(self.backend.backend_storage(), &mut read_overlay);
 
 		let map_e = |e| format!("Trie lookup error: {}", e);
 
@@ -86,17 +90,15 @@ impl<'a, S, H> ProvingBackendRecorder<'a, S, H>
 			&eph,
 			&root.as_ref(),
 			key,
-			&mut *self.proof_recorder
-		).map_err(map_e)
+			&mut *self.proof_recorder,
+		)
+		.map_err(map_e)
 	}
 
 	/// Produce proof for the whole backend.
 	pub fn record_all_keys(&mut self) {
 		let mut read_overlay = S::Overlay::default();
-		let eph = Ephemeral::new(
-			self.backend.backend_storage(),
-			&mut read_overlay,
-		);
+		let eph = Ephemeral::new(self.backend.backend_storage(), &mut read_overlay);
 
 		let mut iter = move || -> Result<(), Box<TrieError<H::Out>>> {
 			let root = self.backend.root();
@@ -150,13 +152,14 @@ impl<Hash: std::hash::Hash + Eq> ProofRecorder<Hash> {
 	/// encoded proof.
 	pub fn estimate_encoded_size(&self) -> usize {
 		let inner = self.inner.read();
-		inner.encoded_size
-			+ codec::Compact(inner.records.len() as u32).encoded_size()
+		inner.encoded_size + codec::Compact(inner.records.len() as u32).encoded_size()
 	}
 
 	/// Convert into a [`StorageProof`].
 	pub fn to_storage_proof(&self) -> StorageProof {
-		let trie_nodes = self.inner.read()
+		let trie_nodes = self
+			.inner
+			.read()
 			.records
 			.iter()
 			.filter_map(|(_k, v)| v.as_ref().map(|v| v.to_vec()))
@@ -175,7 +178,7 @@ impl<Hash: std::hash::Hash + Eq> ProofRecorder<Hash> {
 
 /// Patricia trie-based backend which also tracks all touched storage trie values.
 /// These can be sent to remote node and used as a proof of execution.
-pub struct ProvingBackend<'a, S: 'a + TrieBackendStorage<H>, H: 'a + Hasher> (
+pub struct ProvingBackend<'a, S: 'a + TrieBackendStorage<H>, H: 'a + Hasher>(
 	TrieBackend<ProofRecorderBackend<'a, S, H>, H>,
 );
 
@@ -186,7 +189,8 @@ pub struct ProofRecorderBackend<'a, S: 'a + TrieBackendStorage<H>, H: 'a + Hashe
 }
 
 impl<'a, S: 'a + TrieBackendStorage<H>, H: 'a + Hasher> ProvingBackend<'a, S, H>
-	where H::Out: Codec
+where
+	H::Out: Codec,
 {
 	/// Create new proving backend.
 	pub fn new(backend: &'a TrieBackend<S, H>) -> Self {
@@ -201,10 +205,7 @@ impl<'a, S: 'a + TrieBackendStorage<H>, H: 'a + Hasher> ProvingBackend<'a, S, H>
 	) -> Self {
 		let essence = backend.essence();
 		let root = essence.root().clone();
-		let recorder = ProofRecorderBackend {
-			backend: essence.backend_storage(),
-			proof_recorder,
-		};
+		let recorder = ProofRecorderBackend { backend: essence.backend_storage(), proof_recorder };
 		ProvingBackend(TrieBackend::new(recorder, root))
 	}
 
@@ -229,7 +230,7 @@ impl<'a, S: 'a + TrieBackendStorage<H>, H: 'a + Hasher> TrieBackendStorage<H>
 
 	fn get(&self, key: &H::Out, prefix: Prefix) -> Result<Option<DBValue>, String> {
 		if let Some(v) = self.proof_recorder.get(key) {
-			return Ok(v);
+			return Ok(v)
 		}
 
 		let backend_value = self.backend.get(key, prefix)?;
@@ -247,10 +248,10 @@ impl<'a, S: 'a + TrieBackendStorage<H>, H: 'a + Hasher> std::fmt::Debug
 }
 
 impl<'a, S, H> Backend<H> for ProvingBackend<'a, S, H>
-	where
-		S: 'a + TrieBackendStorage<H>,
-		H: 'a + Hasher,
-		H::Out: Ord + Codec,
+where
+	S: 'a + TrieBackendStorage<H>,
+	H: 'a + Hasher,
+	H::Out: Ord + Codec,
 {
 	type Error = String;
 	type Transaction = S::Overlay;
@@ -314,7 +315,7 @@ impl<'a, S, H> Backend<H> for ProvingBackend<'a, S, H>
 		prefix: &[u8],
 		f: F,
 	) {
-		self.0.for_child_keys_with_prefix( child_info, prefix, f)
+		self.0.for_child_keys_with_prefix(child_info, prefix, f)
 	}
 
 	fn pairs(&self) -> Vec<(Vec<u8>, Vec<u8>)> {
@@ -325,30 +326,32 @@ impl<'a, S, H> Backend<H> for ProvingBackend<'a, S, H>
 		self.0.keys(prefix)
 	}
 
-	fn child_keys(
-		&self,
-		child_info: &ChildInfo,
-		prefix: &[u8],
-	) -> Vec<Vec<u8>> {
+	fn child_keys(&self, child_info: &ChildInfo, prefix: &[u8]) -> Vec<Vec<u8>> {
 		self.0.child_keys(child_info, prefix)
 	}
 
 	fn storage_root<'b>(
 		&self,
-		delta: impl Iterator<Item=(&'b [u8], Option<&'b [u8]>)>,
-	) -> (H::Out, Self::Transaction) where H::Out: Ord {
+		delta: impl Iterator<Item = (&'b [u8], Option<&'b [u8]>)>,
+	) -> (H::Out, Self::Transaction)
+	where
+		H::Out: Ord,
+	{
 		self.0.storage_root(delta)
 	}
 
 	fn child_storage_root<'b>(
 		&self,
 		child_info: &ChildInfo,
-		delta: impl Iterator<Item=(&'b [u8], Option<&'b [u8]>)>,
-	) -> (H::Out, bool, Self::Transaction) where H::Out: Ord {
+		delta: impl Iterator<Item = (&'b [u8], Option<&'b [u8]>)>,
+	) -> (H::Out, bool, Self::Transaction)
+	where
+		H::Out: Ord,
+	{
 		self.0.child_storage_root(child_info, delta)
 	}
 
-	fn register_overlay_stats(&self, _stats: &crate::stats::StateMachineStats) { }
+	fn register_overlay_stats(&self, _stats: &crate::stats::StateMachineStats) {}
 
 	fn usage_info(&self) -> crate::stats::UsageInfo {
 		self.0.usage_info()
@@ -375,15 +378,16 @@ where
 
 #[cfg(test)]
 mod tests {
-	use crate::InMemoryBackend;
-	use crate::trie_backend::tests::test_trie;
 	use super::*;
-	use crate::proving_backend::create_proof_check_backend;
-	use sp_trie::PrefixedMemoryDB;
+	use crate::{
+		proving_backend::create_proof_check_backend, trie_backend::tests::test_trie,
+		InMemoryBackend,
+	};
 	use sp_runtime::traits::BlakeTwo256;
+	use sp_trie::PrefixedMemoryDB;
 
 	fn test_proving<'a>(
-		trie_backend: &'a TrieBackend<PrefixedMemoryDB<BlakeTwo256>,BlakeTwo256>,
+		trie_backend: &'a TrieBackend<PrefixedMemoryDB<BlakeTwo256>, BlakeTwo256>,
 	) -> ProvingBackend<'a, PrefixedMemoryDB<BlakeTwo256>, BlakeTwo256> {
 		ProvingBackend::new(trie_backend)
 	}
@@ -407,7 +411,7 @@ mod tests {
 		use sp_core::H256;
 		let result = create_proof_check_backend::<BlakeTwo256>(
 			H256::from_low_u64_be(1),
-			StorageProof::empty()
+			StorageProof::empty(),
 		);
 		assert!(result.is_err());
 	}
@@ -443,7 +447,8 @@ mod tests {
 
 		let proof = proving.extract_proof();
 
-		let proof_check = create_proof_check_backend::<BlakeTwo256>(in_memory_root.into(), proof).unwrap();
+		let proof_check =
+			create_proof_check_backend::<BlakeTwo256>(in_memory_root.into(), proof).unwrap();
 		assert_eq!(proof_check.storage(&[42]).unwrap().unwrap(), vec![42]);
 	}
 
@@ -455,48 +460,38 @@ mod tests {
 		let child_info_2 = &child_info_2;
 		let contents = vec![
 			(None, (0..64).map(|i| (vec![i], Some(vec![i]))).collect()),
-			(Some(child_info_1.clone()),
-				(28..65).map(|i| (vec![i], Some(vec![i]))).collect()),
-			(Some(child_info_2.clone()),
-				(10..15).map(|i| (vec![i], Some(vec![i]))).collect()),
+			(Some(child_info_1.clone()), (28..65).map(|i| (vec![i], Some(vec![i]))).collect()),
+			(Some(child_info_2.clone()), (10..15).map(|i| (vec![i], Some(vec![i]))).collect()),
 		];
 		let in_memory = InMemoryBackend::<BlakeTwo256>::default();
 		let mut in_memory = in_memory.update(contents);
 		let child_storage_keys = vec![child_info_1.to_owned(), child_info_2.to_owned()];
-		let in_memory_root = in_memory.full_storage_root(
-			std::iter::empty(),
-			child_storage_keys.iter().map(|k|(k, std::iter::empty()))
-		).0;
-		(0..64).for_each(|i| assert_eq!(
-			in_memory.storage(&[i]).unwrap().unwrap(),
-			vec![i]
-		));
-		(28..65).for_each(|i| assert_eq!(
-			in_memory.child_storage(child_info_1, &[i]).unwrap().unwrap(),
-			vec![i]
-		));
-		(10..15).for_each(|i| assert_eq!(
-			in_memory.child_storage(child_info_2, &[i]).unwrap().unwrap(),
-			vec![i]
-		));
+		let in_memory_root = in_memory
+			.full_storage_root(
+				std::iter::empty(),
+				child_storage_keys.iter().map(|k| (k, std::iter::empty())),
+			)
+			.0;
+		(0..64).for_each(|i| assert_eq!(in_memory.storage(&[i]).unwrap().unwrap(), vec![i]));
+		(28..65).for_each(|i| {
+			assert_eq!(in_memory.child_storage(child_info_1, &[i]).unwrap().unwrap(), vec![i])
+		});
+		(10..15).for_each(|i| {
+			assert_eq!(in_memory.child_storage(child_info_2, &[i]).unwrap().unwrap(), vec![i])
+		});
 
 		let trie = in_memory.as_trie_backend().unwrap();
 		let trie_root = trie.storage_root(std::iter::empty()).0;
 		assert_eq!(in_memory_root, trie_root);
-		(0..64).for_each(|i| assert_eq!(
-			trie.storage(&[i]).unwrap().unwrap(),
-			vec![i]
-		));
+		(0..64).for_each(|i| assert_eq!(trie.storage(&[i]).unwrap().unwrap(), vec![i]));
 
 		let proving = ProvingBackend::new(trie);
 		assert_eq!(proving.storage(&[42]).unwrap().unwrap(), vec![42]);
 
 		let proof = proving.extract_proof();
 
-		let proof_check = create_proof_check_backend::<BlakeTwo256>(
-			in_memory_root.into(),
-			proof
-		).unwrap();
+		let proof_check =
+			create_proof_check_backend::<BlakeTwo256>(in_memory_root.into(), proof).unwrap();
 		assert!(proof_check.storage(&[0]).is_err());
 		assert_eq!(proof_check.storage(&[42]).unwrap().unwrap(), vec![42]);
 		// note that it is include in root because proof close
@@ -507,14 +502,9 @@ mod tests {
 		assert_eq!(proving.child_storage(child_info_1, &[64]), Ok(Some(vec![64])));
 
 		let proof = proving.extract_proof();
-		let proof_check = create_proof_check_backend::<BlakeTwo256>(
-			in_memory_root.into(),
-			proof
-		).unwrap();
-		assert_eq!(
-			proof_check.child_storage(child_info_1, &[64]).unwrap().unwrap(),
-			vec![64]
-		);
+		let proof_check =
+			create_proof_check_backend::<BlakeTwo256>(in_memory_root.into(), proof).unwrap();
+		assert_eq!(proof_check.child_storage(child_info_1, &[64]).unwrap().unwrap(), vec![64]);
 	}
 
 	#[test]
@@ -522,15 +512,14 @@ mod tests {
 		let trie_backend = test_trie();
 		let backend = test_proving(&trie_backend);
 
-		let check_estimation = |backend: &ProvingBackend<'_, PrefixedMemoryDB<BlakeTwo256>, BlakeTwo256>| {
-			let storage_proof = backend.extract_proof();
-			let estimation = backend.0.essence()
-				.backend_storage()
-				.proof_recorder
-				.estimate_encoded_size();
+		let check_estimation =
+			|backend: &ProvingBackend<'_, PrefixedMemoryDB<BlakeTwo256>, BlakeTwo256>| {
+				let storage_proof = backend.extract_proof();
+				let estimation =
+					backend.0.essence().backend_storage().proof_recorder.estimate_encoded_size();
 
-			assert_eq!(storage_proof.encoded_size(), estimation);
-		};
+				assert_eq!(storage_proof.encoded_size(), estimation);
+			};
 
 		assert_eq!(backend.storage(b"key").unwrap(), Some(b"value".to_vec()));
 		check_estimation(&backend);
diff --git a/primitives/state-machine/src/read_only.rs b/primitives/state-machine/src/read_only.rs
index 01e1fb6b5b2f..5b7d568b0311 100644
--- a/primitives/state-machine/src/read_only.rs
+++ b/primitives/state-machine/src/read_only.rs
@@ -17,17 +17,18 @@
 
 //! Read-only version of Externalities.
 
-use std::{
-	any::{TypeId, Any},
-	marker::PhantomData,
-};
 use crate::{Backend, StorageKey, StorageValue};
+use codec::Encode;
 use hash_db::Hasher;
 use sp_core::{
 	storage::{ChildInfo, TrackedStorageKey},
-	traits::Externalities, Blake2Hasher,
+	traits::Externalities,
+	Blake2Hasher,
+};
+use std::{
+	any::{Any, TypeId},
+	marker::PhantomData,
 };
-use codec::Encode;
 
 /// Trait for inspecting state in any backend.
 ///
@@ -79,39 +80,34 @@ impl<'a, H: Hasher, B: 'a + Backend<H>> Externalities for ReadOnlyExternalities<
 	}
 
 	fn storage(&self, key: &[u8]) -> Option<StorageValue> {
-		self.backend.storage(key).expect("Backed failed for storage in ReadOnlyExternalities")
+		self.backend
+			.storage(key)
+			.expect("Backed failed for storage in ReadOnlyExternalities")
 	}
 
 	fn storage_hash(&self, key: &[u8]) -> Option<Vec<u8>> {
 		self.storage(key).map(|v| Blake2Hasher::hash(&v).encode())
 	}
 
-	fn child_storage(
-		&self,
-		child_info: &ChildInfo,
-		key: &[u8],
-	) -> Option<StorageValue> {
-		self.backend.child_storage(child_info, key).expect("Backed failed for child_storage in ReadOnlyExternalities")
+	fn child_storage(&self, child_info: &ChildInfo, key: &[u8]) -> Option<StorageValue> {
+		self.backend
+			.child_storage(child_info, key)
+			.expect("Backed failed for child_storage in ReadOnlyExternalities")
 	}
 
-	fn child_storage_hash(
-		&self,
-		child_info: &ChildInfo,
-		key: &[u8],
-	) -> Option<Vec<u8>> {
+	fn child_storage_hash(&self, child_info: &ChildInfo, key: &[u8]) -> Option<Vec<u8>> {
 		self.child_storage(child_info, key).map(|v| Blake2Hasher::hash(&v).encode())
 	}
 
 	fn next_storage_key(&self, key: &[u8]) -> Option<StorageKey> {
-		self.backend.next_storage_key(key).expect("Backed failed for next_storage_key in ReadOnlyExternalities")
+		self.backend
+			.next_storage_key(key)
+			.expect("Backed failed for next_storage_key in ReadOnlyExternalities")
 	}
 
-	fn next_child_storage_key(
-		&self,
-		child_info: &ChildInfo,
-		key: &[u8],
-	) -> Option<StorageKey> {
-		self.backend.next_child_storage_key(child_info, key)
+	fn next_child_storage_key(&self, child_info: &ChildInfo, key: &[u8]) -> Option<StorageKey> {
+		self.backend
+			.next_child_storage_key(child_info, key)
 			.expect("Backed failed for next_child_storage_key in ReadOnlyExternalities")
 	}
 
@@ -128,11 +124,7 @@ impl<'a, H: Hasher, B: 'a + Backend<H>> Externalities for ReadOnlyExternalities<
 		unimplemented!("place_child_storage not supported in ReadOnlyExternalities")
 	}
 
-	fn kill_child_storage(
-		&mut self,
-		_child_info: &ChildInfo,
-		_limit: Option<u32>,
-	) -> (bool, u32) {
+	fn kill_child_storage(&mut self, _child_info: &ChildInfo, _limit: Option<u32>) -> (bool, u32) {
 		unimplemented!("kill_child_storage is not supported in ReadOnlyExternalities")
 	}
 
@@ -149,11 +141,7 @@ impl<'a, H: Hasher, B: 'a + Backend<H>> Externalities for ReadOnlyExternalities<
 		unimplemented!("clear_child_prefix is not supported in ReadOnlyExternalities")
 	}
 
-	fn storage_append(
-		&mut self,
-		_key: Vec<u8>,
-		_value: Vec<u8>,
-	) {
+	fn storage_append(&mut self, _key: Vec<u8>, _value: Vec<u8>) {
 		unimplemented!("storage_append is not supported in ReadOnlyExternalities")
 	}
 
@@ -161,10 +149,7 @@ impl<'a, H: Hasher, B: 'a + Backend<H>> Externalities for ReadOnlyExternalities<
 		unimplemented!("storage_root is not supported in ReadOnlyExternalities")
 	}
 
-	fn child_storage_root(
-		&mut self,
-		_child_info: &ChildInfo,
-	) -> Vec<u8> {
+	fn child_storage_root(&mut self, _child_info: &ChildInfo) -> Vec<u8> {
 		unimplemented!("child_storage_root is not supported in ReadOnlyExternalities")
 	}
 
@@ -209,7 +194,9 @@ impl<'a, H: Hasher, B: 'a + Backend<H>> Externalities for ReadOnlyExternalities<
 	}
 }
 
-impl<'a, H: Hasher, B: 'a + Backend<H>> sp_externalities::ExtensionStore for ReadOnlyExternalities<'a, H, B> {
+impl<'a, H: Hasher, B: 'a + Backend<H>> sp_externalities::ExtensionStore
+	for ReadOnlyExternalities<'a, H, B>
+{
 	fn extension_by_type_id(&mut self, _type_id: TypeId) -> Option<&mut dyn Any> {
 		unimplemented!("extension_by_type_id is not supported in ReadOnlyExternalities")
 	}
@@ -222,7 +209,10 @@ impl<'a, H: Hasher, B: 'a + Backend<H>> sp_externalities::ExtensionStore for Rea
 		unimplemented!("register_extension_with_type_id is not supported in ReadOnlyExternalities")
 	}
 
-	fn deregister_extension_by_type_id(&mut self, _type_id: TypeId) -> Result<(), sp_externalities::Error> {
+	fn deregister_extension_by_type_id(
+		&mut self,
+		_type_id: TypeId,
+	) -> Result<(), sp_externalities::Error> {
 		unimplemented!("deregister_extension_by_type_id is not supported in ReadOnlyExternalities")
 	}
 }
diff --git a/primitives/state-machine/src/stats.rs b/primitives/state-machine/src/stats.rs
index 9d4ac27e5e94..affd71f9d2e5 100644
--- a/primitives/state-machine/src/stats.rs
+++ b/primitives/state-machine/src/stats.rs
@@ -17,9 +17,9 @@
 
 //! Usage statistics for state db
 
-#[cfg(feature = "std")]
-use std::time::{Instant, Duration};
 use sp_std::cell::RefCell;
+#[cfg(feature = "std")]
+use std::time::{Duration, Instant};
 
 /// Measured count of operations and total bytes.
 #[derive(Clone, Debug, Default)]
diff --git a/primitives/state-machine/src/testing.rs b/primitives/state-machine/src/testing.rs
index 363d543da086..ec1772ba8666 100644
--- a/primitives/state-machine/src/testing.rs
+++ b/primitives/state-machine/src/testing.rs
@@ -17,17 +17,19 @@
 
 //! Test implementation for Externalities.
 
-use std::{any::{Any, TypeId}, panic::{AssertUnwindSafe, UnwindSafe}};
+use std::{
+	any::{Any, TypeId},
+	panic::{AssertUnwindSafe, UnwindSafe},
+};
 
 use crate::{
-	backend::Backend, OverlayedChanges, StorageTransactionCache, ext::Ext, InMemoryBackend,
-	StorageKey, StorageValue,
+	backend::Backend,
 	changes_trie::{
-		Configuration as ChangesTrieConfiguration,
-		InMemoryStorage as ChangesTrieInMemoryStorage,
-		BlockNumber as ChangesTrieBlockNumber,
-		State as ChangesTrieState,
+		BlockNumber as ChangesTrieBlockNumber, Configuration as ChangesTrieConfiguration,
+		InMemoryStorage as ChangesTrieInMemoryStorage, State as ChangesTrieState,
 	},
+	ext::Ext,
+	InMemoryBackend, OverlayedChanges, StorageKey, StorageTransactionCache, StorageValue,
 };
 
 use codec::Decode;
@@ -35,13 +37,13 @@ use hash_db::Hasher;
 use sp_core::{
 	offchain::testing::TestPersistentOffchainDB,
 	storage::{
-		well_known_keys::{CHANGES_TRIE_CONFIG, CODE, is_child_storage_key},
+		well_known_keys::{is_child_storage_key, CHANGES_TRIE_CONFIG, CODE},
 		Storage,
 	},
-	traits::TaskExecutorExt,
 	testing::TaskExecutor,
+	traits::TaskExecutorExt,
 };
-use sp_externalities::{Extensions, Extension, ExtensionStore};
+use sp_externalities::{Extension, ExtensionStore, Extensions};
 
 /// Simple HashMap-based Externalities impl.
 pub struct TestExternalities<H: Hasher, N: ChangesTrieBlockNumber = u64>
@@ -96,7 +98,9 @@ where
 	/// Create a new instance of `TestExternalities` with code and storage.
 	pub fn new_with_code(code: &[u8], mut storage: Storage) -> Self {
 		let mut overlay = OverlayedChanges::default();
-		let changes_trie_config = storage.top.get(CHANGES_TRIE_CONFIG)
+		let changes_trie_config = storage
+			.top
+			.get(CHANGES_TRIE_CONFIG)
 			.and_then(|v| Decode::decode(&mut &v[..]).ok());
 		overlay.set_collect_extrinsics(changes_trie_config.is_some());
 
@@ -156,17 +160,14 @@ where
 	/// In contrast to [`commit_all`](Self::commit_all) this will not panic if there are open
 	/// transactions.
 	fn as_backend(&self) -> InMemoryBackend<H> {
-		let top: Vec<_> = self.overlay.changes()
-			.map(|(k, v)| (k.clone(), v.value().cloned()))
-			.collect();
+		let top: Vec<_> =
+			self.overlay.changes().map(|(k, v)| (k.clone(), v.value().cloned())).collect();
 		let mut transaction = vec![(None, top)];
 
 		for (child_changes, child_info) in self.overlay.children() {
 			transaction.push((
 				Some(child_info.clone()),
-				child_changes
-					.map(|(k, v)| (k.clone(), v.value().cloned()))
-					.collect(),
+				child_changes.map(|(k, v)| (k.clone(), v.value().cloned())).collect(),
 			))
 		}
 
@@ -186,7 +187,8 @@ where
 			&mut Default::default(),
 		)?;
 
-		self.backend.apply_transaction(changes.transaction_storage_root, changes.transaction);
+		self.backend
+			.apply_transaction(changes.transaction_storage_root, changes.transaction);
 		Ok(())
 	}
 
@@ -202,18 +204,21 @@ where
 	///
 	/// Returns the result of the given closure, if no panics occured.
 	/// Otherwise, returns `Err`.
-	pub fn execute_with_safe<R>(&mut self, f: impl FnOnce() -> R + UnwindSafe) -> Result<R, String> {
+	pub fn execute_with_safe<R>(
+		&mut self,
+		f: impl FnOnce() -> R + UnwindSafe,
+	) -> Result<R, String> {
 		let mut ext = AssertUnwindSafe(self.ext());
-		std::panic::catch_unwind(move ||
+		std::panic::catch_unwind(move || {
 			sp_externalities::set_and_run_with_externalities(&mut *ext, f)
-		).map_err(|e| {
-			format!("Closure panicked: {:?}", e)
 		})
+		.map_err(|e| format!("Closure panicked: {:?}", e))
 	}
 }
 
 impl<H: Hasher, N: ChangesTrieBlockNumber> std::fmt::Debug for TestExternalities<H, N>
-	where H::Out: Ord + codec::Codec,
+where
+	H::Out: Ord + codec::Codec,
 {
 	fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
 		write!(f, "overlay: {:?}\nbackend: {:?}", self.overlay, self.backend.pairs())
@@ -221,8 +226,8 @@ impl<H: Hasher, N: ChangesTrieBlockNumber> std::fmt::Debug for TestExternalities
 }
 
 impl<H: Hasher, N: ChangesTrieBlockNumber> PartialEq for TestExternalities<H, N>
-	where
-		H::Out: Ord + 'static + codec::Codec
+where
+	H::Out: Ord + 'static + codec::Codec,
 {
 	/// This doesn't test if they are in the same state, only if they contains the
 	/// same data at this state
@@ -232,22 +237,25 @@ impl<H: Hasher, N: ChangesTrieBlockNumber> PartialEq for TestExternalities<H, N>
 }
 
 impl<H: Hasher, N: ChangesTrieBlockNumber> Default for TestExternalities<H, N>
-	where
-		H::Out: Ord + 'static + codec::Codec,
+where
+	H::Out: Ord + 'static + codec::Codec,
 {
-	fn default() -> Self { Self::new(Default::default()) }
+	fn default() -> Self {
+		Self::new(Default::default())
+	}
 }
 
 impl<H: Hasher, N: ChangesTrieBlockNumber> From<Storage> for TestExternalities<H, N>
-	where
-		H::Out: Ord + 'static + codec::Codec,
+where
+	H::Out: Ord + 'static + codec::Codec,
 {
 	fn from(storage: Storage) -> Self {
 		Self::new(storage)
 	}
 }
 
-impl<H, N> sp_externalities::ExtensionStore for TestExternalities<H, N> where
+impl<H, N> sp_externalities::ExtensionStore for TestExternalities<H, N>
+where
 	H: Hasher,
 	H::Out: Ord + codec::Codec,
 	N: ChangesTrieBlockNumber,
@@ -264,7 +272,10 @@ impl<H, N> sp_externalities::ExtensionStore for TestExternalities<H, N> where
 		self.extensions.register_with_type_id(type_id, extension)
 	}
 
-	fn deregister_extension_by_type_id(&mut self, type_id: TypeId) -> Result<(), sp_externalities::Error> {
+	fn deregister_extension_by_type_id(
+		&mut self,
+		type_id: TypeId,
+	) -> Result<(), sp_externalities::Error> {
 		if self.extensions.deregister(type_id) {
 			Ok(())
 		} else {
@@ -274,14 +285,13 @@ impl<H, N> sp_externalities::ExtensionStore for TestExternalities<H, N> where
 }
 
 impl<H, N> sp_externalities::ExternalitiesExt for TestExternalities<H, N>
-	where
-		H: Hasher,
-		H::Out: Ord + codec::Codec,
-		N: ChangesTrieBlockNumber,
+where
+	H: Hasher,
+	H::Out: Ord + codec::Codec,
+	N: ChangesTrieBlockNumber,
 {
 	fn extension<T: Any + Extension>(&mut self) -> Option<&mut T> {
-		self.extension_by_type_id(TypeId::of::<T>())
-			.and_then(<dyn Any>::downcast_mut)
+		self.extension_by_type_id(TypeId::of::<T>()).and_then(<dyn Any>::downcast_mut)
 	}
 
 	fn register_extension<T: Extension>(&mut self, ext: T) -> Result<(), sp_externalities::Error> {
@@ -296,9 +306,9 @@ impl<H, N> sp_externalities::ExternalitiesExt for TestExternalities<H, N>
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use sp_core::{H256, traits::Externalities, storage::ChildInfo};
-	use sp_runtime::traits::BlakeTwo256;
 	use hex_literal::hex;
+	use sp_core::{storage::ChildInfo, traits::Externalities, H256};
+	use sp_runtime::traits::BlakeTwo256;
 
 	#[test]
 	fn commit_should_work() {
@@ -307,7 +317,8 @@ mod tests {
 		ext.set_storage(b"doe".to_vec(), b"reindeer".to_vec());
 		ext.set_storage(b"dog".to_vec(), b"puppy".to_vec());
 		ext.set_storage(b"dogglesworth".to_vec(), b"cat".to_vec());
-		let root = H256::from(hex!("ed4d8c799d996add422395a6abd7545491d40bd838d738afafa1b8a4de625489"));
+		let root =
+			H256::from(hex!("ed4d8c799d996add422395a6abd7545491d40bd838d738afafa1b8a4de625489"));
 		assert_eq!(H256::from_slice(ext.storage_root().as_slice()), root);
 	}
 
@@ -325,7 +336,7 @@ mod tests {
 	#[test]
 	fn check_send() {
 		fn assert_send<T: Send>() {}
-		assert_send::<TestExternalities::<BlakeTwo256, u64>>();
+		assert_send::<TestExternalities<BlakeTwo256, u64>>();
 	}
 
 	#[test]
diff --git a/primitives/state-machine/src/trie_backend.rs b/primitives/state-machine/src/trie_backend.rs
index 6162a9866a46..e8c9fa475cff 100644
--- a/primitives/state-machine/src/trie_backend.rs
+++ b/primitives/state-machine/src/trie_backend.rs
@@ -17,29 +17,33 @@
 
 //! Trie-based state machine backend.
 
-use crate::{warn, debug};
-use hash_db::Hasher;
-use sp_trie::{Trie, delta_trie_root, empty_child_trie_root, child_delta_trie_root};
-use sp_trie::trie_types::{TrieDB, TrieError, Layout};
-use sp_core::storage::{ChildInfo, ChildType};
-use codec::{Codec, Decode};
 use crate::{
-	StorageKey, StorageValue, Backend,
-	trie_backend_essence::{TrieBackendEssence, TrieBackendStorage, Ephemeral},
+	debug,
+	trie_backend_essence::{Ephemeral, TrieBackendEssence, TrieBackendStorage},
+	warn, Backend, StorageKey, StorageValue,
 };
+use codec::{Codec, Decode};
+use hash_db::Hasher;
+use sp_core::storage::{ChildInfo, ChildType};
 use sp_std::{boxed::Box, vec::Vec};
+use sp_trie::{
+	child_delta_trie_root, delta_trie_root, empty_child_trie_root,
+	trie_types::{Layout, TrieDB, TrieError},
+	Trie,
+};
 
 /// Patricia trie-based backend. Transaction type is an overlay of changes to commit.
 pub struct TrieBackend<S: TrieBackendStorage<H>, H: Hasher> {
-	pub (crate) essence: TrieBackendEssence<S, H>,
+	pub(crate) essence: TrieBackendEssence<S, H>,
 }
 
-impl<S: TrieBackendStorage<H>, H: Hasher> TrieBackend<S, H> where H::Out: Codec {
+impl<S: TrieBackendStorage<H>, H: Hasher> TrieBackend<S, H>
+where
+	H::Out: Codec,
+{
 	/// Create new trie-based backend.
 	pub fn new(storage: S, root: H::Out) -> Self {
-		TrieBackend {
-			essence: TrieBackendEssence::new(storage, root),
-		}
+		TrieBackend { essence: TrieBackendEssence::new(storage, root) }
 	}
 
 	/// Get backend essence reference.
@@ -74,7 +78,8 @@ impl<S: TrieBackendStorage<H>, H: Hasher> sp_std::fmt::Debug for TrieBackend<S,
 	}
 }
 
-impl<S: TrieBackendStorage<H>, H: Hasher> Backend<H> for TrieBackend<S, H> where
+impl<S: TrieBackendStorage<H>, H: Hasher> Backend<H> for TrieBackend<S, H>
+where
 	H::Out: Ord + Codec,
 {
 	type Error = crate::DefaultError;
@@ -121,7 +126,8 @@ impl<S: TrieBackendStorage<H>, H: Hasher> Backend<H> for TrieBackend<S, H> where
 		f: F,
 		allow_missing: bool,
 	) -> Result<bool, Self::Error> {
-		self.essence.apply_to_key_values_while(child_info, prefix, start_at, f, allow_missing)
+		self.essence
+			.apply_to_key_values_while(child_info, prefix, start_at, f, allow_missing)
 	}
 
 	fn apply_to_keys_while<F: FnMut(&[u8]) -> bool>(
@@ -159,7 +165,7 @@ impl<S: TrieBackendStorage<H>, H: Hasher> Backend<H> for TrieBackend<S, H> where
 			Err(e) => {
 				debug!(target: "trie", "Error extracting trie values: {}", e);
 				Vec::new()
-			}
+			},
 		}
 	}
 
@@ -177,21 +183,23 @@ impl<S: TrieBackendStorage<H>, H: Hasher> Backend<H> for TrieBackend<S, H> where
 			Ok(v)
 		};
 
-		collect_all().map_err(|e| debug!(target: "trie", "Error extracting trie keys: {}", e)).unwrap_or_default()
+		collect_all()
+			.map_err(|e| debug!(target: "trie", "Error extracting trie keys: {}", e))
+			.unwrap_or_default()
 	}
 
 	fn storage_root<'a>(
 		&self,
-		delta: impl Iterator<Item=(&'a [u8], Option<&'a [u8]>)>,
-	) -> (H::Out, Self::Transaction) where H::Out: Ord {
+		delta: impl Iterator<Item = (&'a [u8], Option<&'a [u8]>)>,
+	) -> (H::Out, Self::Transaction)
+	where
+		H::Out: Ord,
+	{
 		let mut write_overlay = S::Overlay::default();
 		let mut root = *self.essence.root();
 
 		{
-			let mut eph = Ephemeral::new(
-				self.essence.backend_storage(),
-				&mut write_overlay,
-			);
+			let mut eph = Ephemeral::new(self.essence.backend_storage(), &mut write_overlay);
 
 			match delta_trie_root::<Layout<H>, _, _, _, _, _>(&mut eph, root, delta) {
 				Ok(ret) => root = ret,
@@ -205,17 +213,21 @@ impl<S: TrieBackendStorage<H>, H: Hasher> Backend<H> for TrieBackend<S, H> where
 	fn child_storage_root<'a>(
 		&self,
 		child_info: &ChildInfo,
-		delta: impl Iterator<Item=(&'a [u8], Option<&'a [u8]>)>,
-	) -> (H::Out, bool, Self::Transaction) where H::Out: Ord {
+		delta: impl Iterator<Item = (&'a [u8], Option<&'a [u8]>)>,
+	) -> (H::Out, bool, Self::Transaction)
+	where
+		H::Out: Ord,
+	{
 		let default_root = match child_info.child_type() {
-			ChildType::ParentKeyId => empty_child_trie_root::<Layout<H>>()
+			ChildType::ParentKeyId => empty_child_trie_root::<Layout<H>>(),
 		};
 
 		let mut write_overlay = S::Overlay::default();
 		let prefixed_storage_key = child_info.prefixed_storage_key();
 		let mut root = match self.storage(prefixed_storage_key.as_slice()) {
-			Ok(value) =>
-				value.and_then(|r| Decode::decode(&mut &r[..]).ok()).unwrap_or_else(|| default_root.clone()),
+			Ok(value) => value
+				.and_then(|r| Decode::decode(&mut &r[..]).ok())
+				.unwrap_or_else(|| default_root.clone()),
 			Err(e) => {
 				warn!(target: "trie", "Failed to read child storage root: {}", e);
 				default_root.clone()
@@ -223,10 +235,7 @@ impl<S: TrieBackendStorage<H>, H: Hasher> Backend<H> for TrieBackend<S, H> where
 		};
 
 		{
-			let mut eph = Ephemeral::new(
-				self.essence.backend_storage(),
-				&mut write_overlay,
-			);
+			let mut eph = Ephemeral::new(self.essence.backend_storage(), &mut write_overlay);
 
 			match child_delta_trie_root::<Layout<H>, _, _, _, _, _, _>(
 				child_info.keyspace(),
@@ -248,7 +257,7 @@ impl<S: TrieBackendStorage<H>, H: Hasher> Backend<H> for TrieBackend<S, H> where
 		Some(self)
 	}
 
-	fn register_overlay_stats(&self, _stats: &crate::stats::StateMachineStats) { }
+	fn register_overlay_stats(&self, _stats: &crate::stats::StateMachineStats) {}
 
 	fn usage_info(&self) -> crate::UsageInfo {
 		crate::UsageInfo::empty()
@@ -261,12 +270,12 @@ impl<S: TrieBackendStorage<H>, H: Hasher> Backend<H> for TrieBackend<S, H> where
 
 #[cfg(test)]
 pub mod tests {
-	use std::{collections::HashSet, iter};
-	use sp_core::H256;
+	use super::*;
 	use codec::Encode;
-	use sp_trie::{TrieMut, PrefixedMemoryDB, trie_types::TrieDBMut, KeySpacedDBMut};
+	use sp_core::H256;
 	use sp_runtime::traits::BlakeTwo256;
-	use super::*;
+	use sp_trie::{trie_types::TrieDBMut, KeySpacedDBMut, PrefixedMemoryDB, TrieMut};
+	use std::{collections::HashSet, iter};
 
 	const CHILD_KEY_1: &[u8] = b"sub1";
 
@@ -312,7 +321,9 @@ pub mod tests {
 	fn read_from_child_storage_returns_some() {
 		let test_trie = test_trie();
 		assert_eq!(
-			test_trie.child_storage(&ChildInfo::new_default(CHILD_KEY_1), b"value3").unwrap(),
+			test_trie
+				.child_storage(&ChildInfo::new_default(CHILD_KEY_1), b"value3")
+				.unwrap(),
 			Some(vec![142u8]),
 		);
 	}
@@ -332,7 +343,9 @@ pub mod tests {
 		assert!(TrieBackend::<PrefixedMemoryDB<BlakeTwo256>, BlakeTwo256>::new(
 			PrefixedMemoryDB::default(),
 			Default::default(),
-		).pairs().is_empty());
+		)
+		.pairs()
+		.is_empty());
 	}
 
 	#[test]
@@ -347,9 +360,8 @@ pub mod tests {
 
 	#[test]
 	fn storage_root_transaction_is_non_empty() {
-		let (new_root, mut tx) = test_trie().storage_root(
-			iter::once((&b"new-key"[..], Some(&b"new-value"[..]))),
-		);
+		let (new_root, mut tx) =
+			test_trie().storage_root(iter::once((&b"new-key"[..], Some(&b"new-value"[..]))));
 		assert!(!tx.drain().is_empty());
 		assert!(new_root != test_trie().storage_root(iter::empty()).0);
 	}
diff --git a/primitives/state-machine/src/trie_backend_essence.rs b/primitives/state-machine/src/trie_backend_essence.rs
index 54124e6754a5..06a99f938803 100644
--- a/primitives/state-machine/src/trie_backend_essence.rs
+++ b/primitives/state-machine/src/trie_backend_essence.rs
@@ -18,24 +18,24 @@
 //! Trie-based state machine backend essence used to read values
 //! from storage.
 
-#[cfg(feature = "std")]
-use std::sync::Arc;
-use sp_std::{ops::Deref, boxed::Box, vec::Vec};
-use crate::{warn, debug};
+use crate::{backend::Consolidate, debug, warn, StorageKey, StorageValue};
+use codec::Encode;
 use hash_db::{self, Hasher, Prefix};
-use sp_trie::{Trie, MemoryDB, PrefixedMemoryDB, DBValue,
-	empty_child_trie_root, read_trie_value, read_child_trie_value,
-	KeySpacedDB, TrieDBIterator};
-use sp_trie::trie_types::{TrieDB, TrieError, Layout};
-use crate::{backend::Consolidate, StorageKey, StorageValue};
 use sp_core::storage::ChildInfo;
-use codec::Encode;
+use sp_std::{boxed::Box, ops::Deref, vec::Vec};
+use sp_trie::{
+	empty_child_trie_root, read_child_trie_value, read_trie_value,
+	trie_types::{Layout, TrieDB, TrieError},
+	DBValue, KeySpacedDB, MemoryDB, PrefixedMemoryDB, Trie, TrieDBIterator,
+};
+#[cfg(feature = "std")]
+use std::sync::Arc;
 
 #[cfg(not(feature = "std"))]
 macro_rules! format {
-	($($arg:tt)+) => (
+	($($arg:tt)+) => {
 		crate::DefaultError
-	);
+	};
 }
 
 type Result<V> = sp_std::result::Result<V, crate::DefaultError>;
@@ -53,14 +53,13 @@ pub struct TrieBackendEssence<S: TrieBackendStorage<H>, H: Hasher> {
 	empty: H::Out,
 }
 
-impl<S: TrieBackendStorage<H>, H: Hasher> TrieBackendEssence<S, H> where H::Out: Encode {
+impl<S: TrieBackendStorage<H>, H: Hasher> TrieBackendEssence<S, H>
+where
+	H::Out: Encode,
+{
 	/// Create new trie-based backend.
 	pub fn new(storage: S, root: H::Out) -> Self {
-		TrieBackendEssence {
-			storage,
-			root,
-			empty: H::hash(&[0u8]),
-		}
+		TrieBackendEssence { storage, root, empty: H::hash(&[0u8]) }
 	}
 
 	/// Get backend storage reference.
@@ -114,7 +113,7 @@ impl<S: TrieBackendStorage<H>, H: Hasher> TrieBackendEssence<S, H> where H::Out:
 		let mut hash = H::Out::default();
 
 		if child_root.len() != hash.as_ref().len() {
-			return Err(format!("Invalid child storage hash at {:?}", child_info.storage_key()));
+			return Err(format!("Invalid child storage hash at {:?}", child_info.storage_key()))
 		}
 		// note: child_root and hash must be same size, panics otherwise.
 		hash.as_mut().copy_from_slice(&child_root[..]);
@@ -138,10 +137,9 @@ impl<S: TrieBackendStorage<H>, H: Hasher> TrieBackendEssence<S, H> where H::Out:
 			dyn_eph = self;
 		}
 
-		let trie = TrieDB::<H>::new(dyn_eph, root)
-			.map_err(|e| format!("TrieDB creation error: {}", e))?;
-		let mut iter = trie.iter()
-			.map_err(|e| format!("TrieDB iteration error: {}", e))?;
+		let trie =
+			TrieDB::<H>::new(dyn_eph, root).map_err(|e| format!("TrieDB creation error: {}", e))?;
+		let mut iter = trie.iter().map_err(|e| format!("TrieDB iteration error: {}", e))?;
 
 		// The key just after the one given in input, basically `key++0`.
 		// Note: We are sure this is the next key if:
@@ -157,8 +155,8 @@ impl<S: TrieBackendStorage<H>, H: Hasher> TrieBackendEssence<S, H> where H::Out:
 		let next_element = iter.next();
 
 		let next_key = if let Some(next_element) = next_element {
-			let (next_key, _) = next_element
-				.map_err(|e| format!("TrieDB iterator next error: {}", e))?;
+			let (next_key, _) =
+				next_element.map_err(|e| format!("TrieDB iterator next error: {}", e))?;
 			Some(next_key)
 		} else {
 			None
@@ -180,7 +178,8 @@ impl<S: TrieBackendStorage<H>, H: Hasher> TrieBackendEssence<S, H> where H::Out:
 		child_info: &ChildInfo,
 		key: &[u8],
 	) -> Result<Option<StorageValue>> {
-		let root = self.child_root(child_info)?
+		let root = self
+			.child_root(child_info)?
 			.unwrap_or_else(|| empty_child_trie_root::<Layout<H>>().encode());
 
 		let map_e = |e| format!("Trie lookup error: {}", e);
@@ -210,20 +209,13 @@ impl<S: TrieBackendStorage<H>, H: Hasher> TrieBackendEssence<S, H> where H::Out:
 
 				&child_root
 			} else {
-				return Ok(true);
+				return Ok(true)
 			}
 		} else {
 			&self.root
 		};
 
-		self.trie_iter_inner(
-			&root,
-			prefix,
-			f,
-			child_info,
-			start_at,
-			allow_missing_nodes,
-		)
+		self.trie_iter_inner(&root, prefix, f, child_info, start_at, allow_missing_nodes)
 	}
 
 	/// Retrieve all entries keys of a storage and call `f` for each of those keys.
@@ -240,8 +232,8 @@ impl<S: TrieBackendStorage<H>, H: Hasher> TrieBackendEssence<S, H> where H::Out:
 				Ok(v) => v.unwrap_or_else(|| empty_child_trie_root::<Layout<H>>().encode()),
 				Err(e) => {
 					debug!(target: "trie", "Error while iterating child storage: {}", e);
-					return;
-				}
+					return
+				},
 			};
 			child_root.as_mut().copy_from_slice(&root_vec);
 			&child_root
@@ -249,7 +241,17 @@ impl<S: TrieBackendStorage<H>, H: Hasher> TrieBackendEssence<S, H> where H::Out:
 			&self.root
 		};
 
-		let _ = self.trie_iter_inner(root, prefix, |k, _v| { f(&k); true}, child_info, None, false);
+		let _ = self.trie_iter_inner(
+			root,
+			prefix,
+			|k, _v| {
+				f(&k);
+				true
+			},
+			child_info,
+			None,
+			false,
+		);
 	}
 
 	/// Execute given closure for all keys starting with prefix.
@@ -263,17 +265,37 @@ impl<S: TrieBackendStorage<H>, H: Hasher> TrieBackendEssence<S, H> where H::Out:
 			Ok(v) => v.unwrap_or_else(|| empty_child_trie_root::<Layout<H>>().encode()),
 			Err(e) => {
 				debug!(target: "trie", "Error while iterating child storage: {}", e);
-				return;
-			}
+				return
+			},
 		};
 		let mut root = H::Out::default();
 		root.as_mut().copy_from_slice(&root_vec);
-		let _ = self.trie_iter_inner(&root, Some(prefix), |k, _v| { f(&k); true }, Some(child_info), None, false);
+		let _ = self.trie_iter_inner(
+			&root,
+			Some(prefix),
+			|k, _v| {
+				f(&k);
+				true
+			},
+			Some(child_info),
+			None,
+			false,
+		);
 	}
 
 	/// Execute given closure for all keys starting with prefix.
 	pub fn for_keys_with_prefix<F: FnMut(&[u8])>(&self, prefix: &[u8], mut f: F) {
-		let _ = self.trie_iter_inner(&self.root, Some(prefix), |k, _v| { f(&k); true }, None, None, false);
+		let _ = self.trie_iter_inner(
+			&self.root,
+			Some(prefix),
+			|k, _v| {
+				f(&k);
+				true
+			},
+			None,
+			None,
+			false,
+		);
 	}
 
 	fn trie_iter_inner<F: FnMut(Vec<u8>, Vec<u8>) -> bool>(
@@ -315,14 +337,25 @@ impl<S: TrieBackendStorage<H>, H: Hasher> TrieBackendEssence<S, H> where H::Out:
 		};
 		match result {
 			Ok(completed) => Ok(completed),
-			Err(e) if matches!(*e, TrieError::IncompleteDatabase(_)) && allow_missing_nodes => Ok(false),
+			Err(e) if matches!(*e, TrieError::IncompleteDatabase(_)) && allow_missing_nodes =>
+				Ok(false),
 			Err(e) => Err(format!("TrieDB iteration error: {}", e)),
 		}
 	}
 
 	/// Execute given closure for all key and values starting with prefix.
 	pub fn for_key_values_with_prefix<F: FnMut(&[u8], &[u8])>(&self, prefix: &[u8], mut f: F) {
-		let _ = self.trie_iter_inner(&self.root, Some(prefix), |k, v| {f(&k, &v); true}, None, None, false);
+		let _ = self.trie_iter_inner(
+			&self.root,
+			Some(prefix),
+			|k, v| {
+				f(&k, &v);
+				true
+			},
+			None,
+			None,
+			false,
+		);
 	}
 }
 
@@ -334,16 +367,17 @@ pub(crate) struct Ephemeral<'a, S: 'a + TrieBackendStorage<H>, H: 'a + Hasher> {
 impl<'a, S: 'a + TrieBackendStorage<H>, H: 'a + Hasher> hash_db::AsHashDB<H, DBValue>
 	for Ephemeral<'a, S, H>
 {
-	fn as_hash_db<'b>(&'b self) -> &'b (dyn hash_db::HashDB<H, DBValue> + 'b) { self }
-	fn as_hash_db_mut<'b>(&'b mut self) -> &'b mut (dyn hash_db::HashDB<H, DBValue> + 'b) { self }
+	fn as_hash_db<'b>(&'b self) -> &'b (dyn hash_db::HashDB<H, DBValue> + 'b) {
+		self
+	}
+	fn as_hash_db_mut<'b>(&'b mut self) -> &'b mut (dyn hash_db::HashDB<H, DBValue> + 'b) {
+		self
+	}
 }
 
 impl<'a, S: TrieBackendStorage<H>, H: Hasher> Ephemeral<'a, S, H> {
 	pub fn new(storage: &'a S, overlay: &'a mut S::Overlay) -> Self {
-		Ephemeral {
-			storage,
-			overlay,
-		}
+		Ephemeral { storage, overlay }
 	}
 }
 
@@ -431,13 +465,15 @@ impl<H: Hasher> TrieBackendStorage<H> for MemoryDB<H> {
 impl<S: TrieBackendStorage<H>, H: Hasher> hash_db::AsHashDB<H, DBValue>
 	for TrieBackendEssence<S, H>
 {
-	fn as_hash_db<'b>(&'b self) -> &'b (dyn hash_db::HashDB<H, DBValue> + 'b) { self }
-	fn as_hash_db_mut<'b>(&'b mut self) -> &'b mut (dyn hash_db::HashDB<H, DBValue> + 'b) { self }
+	fn as_hash_db<'b>(&'b self) -> &'b (dyn hash_db::HashDB<H, DBValue> + 'b) {
+		self
+	}
+	fn as_hash_db_mut<'b>(&'b mut self) -> &'b mut (dyn hash_db::HashDB<H, DBValue> + 'b) {
+		self
+	}
 }
 
-impl<S: TrieBackendStorage<H>, H: Hasher> hash_db::HashDB<H, DBValue>
-	for TrieBackendEssence<S, H>
-{
+impl<S: TrieBackendStorage<H>, H: Hasher> hash_db::HashDB<H, DBValue> for TrieBackendEssence<S, H> {
 	fn get(&self, key: &H::Out, prefix: Prefix) -> Option<DBValue> {
 		if *key == self.empty {
 			return Some([0u8].to_vec())
@@ -480,12 +516,11 @@ impl<S: TrieBackendStorage<H>, H: Hasher> hash_db::HashDBRef<H, DBValue>
 	}
 }
 
-
 #[cfg(test)]
 mod test {
-	use sp_core::{Blake2Hasher, H256};
-	use sp_trie::{TrieMut, PrefixedMemoryDB, trie_types::TrieDBMut, KeySpacedDBMut};
 	use super::*;
+	use sp_core::{Blake2Hasher, H256};
+	use sp_trie::{trie_types::TrieDBMut, KeySpacedDBMut, PrefixedMemoryDB, TrieMut};
 
 	#[test]
 	fn next_storage_key_and_next_child_storage_key_work() {
@@ -529,20 +564,10 @@ mod test {
 		let mdb = essence_1.into_storage();
 		let essence_2 = TrieBackendEssence::new(mdb, root_2);
 
-		assert_eq!(
-			essence_2.next_child_storage_key(child_info, b"2"), Ok(Some(b"3".to_vec()))
-		);
-		assert_eq!(
-			essence_2.next_child_storage_key(child_info, b"3"), Ok(Some(b"4".to_vec()))
-		);
-		assert_eq!(
-			essence_2.next_child_storage_key(child_info, b"4"), Ok(Some(b"6".to_vec()))
-		);
-		assert_eq!(
-			essence_2.next_child_storage_key(child_info, b"5"), Ok(Some(b"6".to_vec()))
-		);
-		assert_eq!(
-			essence_2.next_child_storage_key(child_info, b"6"), Ok(None)
-		);
+		assert_eq!(essence_2.next_child_storage_key(child_info, b"2"), Ok(Some(b"3".to_vec())));
+		assert_eq!(essence_2.next_child_storage_key(child_info, b"3"), Ok(Some(b"4".to_vec())));
+		assert_eq!(essence_2.next_child_storage_key(child_info, b"4"), Ok(Some(b"6".to_vec())));
+		assert_eq!(essence_2.next_child_storage_key(child_info, b"5"), Ok(Some(b"6".to_vec())));
+		assert_eq!(essence_2.next_child_storage_key(child_info, b"6"), Ok(None));
 	}
 }
diff --git a/primitives/std/src/lib.rs b/primitives/std/src/lib.rs
index 6acf4b75967a..3af4d07ac629 100644
--- a/primitives/std/src/lib.rs
+++ b/primitives/std/src/lib.rs
@@ -19,11 +19,14 @@
 //! or client/alloc to be used with any code that depends on the runtime.
 
 #![cfg_attr(not(feature = "std"), no_std)]
-
-#![cfg_attr(feature = "std",
-   doc = "Substrate runtime standard library as compiled when linked with Rust's standard library.")]
-#![cfg_attr(not(feature = "std"),
-   doc = "Substrate's runtime standard library as compiled without Rust's standard library.")]
+#![cfg_attr(
+	feature = "std",
+	doc = "Substrate runtime standard library as compiled when linked with Rust's standard library."
+)]
+#![cfg_attr(
+	not(feature = "std"),
+	doc = "Substrate's runtime standard library as compiled without Rust's standard library."
+)]
 
 #[macro_export]
 macro_rules! map {
@@ -55,7 +58,7 @@ macro_rules! if_std {
 #[cfg(not(feature = "std"))]
 #[macro_export]
 macro_rules! if_std {
-	( $( $code:tt )* ) => {}
+	( $( $code:tt )* ) => {};
 }
 
 #[cfg(feature = "std")]
@@ -64,7 +67,6 @@ include!("../with_std.rs");
 #[cfg(not(feature = "std"))]
 include!("../without_std.rs");
 
-
 /// A target for `core::write!` macro - constructs a string in memory.
 #[derive(Default)]
 pub struct Writer(vec::Vec<u8>);
@@ -92,10 +94,12 @@ impl Writer {
 ///
 /// This should include only things which are in the normal std prelude.
 pub mod prelude {
-	pub use crate::vec::Vec;
-	pub use crate::boxed::Box;
-	pub use crate::cmp::{Eq, PartialEq, Reverse};
-	pub use crate::clone::Clone;
+	pub use crate::{
+		boxed::Box,
+		clone::Clone,
+		cmp::{Eq, PartialEq, Reverse},
+		vec::Vec,
+	};
 
 	// Re-export `vec!` macro here, but not in `std` mode, since
 	// std's prelude already brings `vec!` into the scope.
diff --git a/primitives/storage/src/lib.rs b/primitives/storage/src/lib.rs
index 87c10f770a8a..45474a44693a 100644
--- a/primitives/storage/src/lib.rs
+++ b/primitives/storage/src/lib.rs
@@ -20,16 +20,22 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 #[cfg(feature = "std")]
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 use sp_debug_derive::RuntimeDebug;
 
-use sp_std::{vec::Vec, ops::{Deref, DerefMut}};
+use codec::{Decode, Encode};
 use ref_cast::RefCast;
-use codec::{Encode, Decode};
+use sp_std::{
+	ops::{Deref, DerefMut},
+	vec::Vec,
+};
 
 /// Storage key.
 #[derive(PartialEq, Eq, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Hash, PartialOrd, Ord, Clone, Encode, Decode))]
+#[cfg_attr(
+	feature = "std",
+	derive(Serialize, Deserialize, Hash, PartialOrd, Ord, Clone, Encode, Decode)
+)]
 pub struct StorageKey(
 	#[cfg_attr(feature = "std", serde(with = "impl_serde::serialize"))] pub Vec<u8>,
 );
@@ -53,12 +59,7 @@ pub struct TrackedStorageKey {
 impl TrackedStorageKey {
 	/// Create a default `TrackedStorageKey`
 	pub fn new(key: Vec<u8>) -> Self {
-		Self {
-			key,
-			reads: 0,
-			writes: 0,
-			whitelisted: false,
-		}
+		Self { key, reads: 0, writes: 0, whitelisted: false }
 	}
 	/// Check if this key has been "read", i.e. it exists in the memory overlay.
 	///
@@ -90,12 +91,7 @@ impl TrackedStorageKey {
 // Easily convert a key to a `TrackedStorageKey` that has been whitelisted.
 impl From<Vec<u8>> for TrackedStorageKey {
 	fn from(key: Vec<u8>) -> Self {
-		Self {
-			key: key,
-			reads: 0,
-			writes: 0,
-			whitelisted: true,
-		}
+		Self { key, reads: 0, writes: 0, whitelisted: true }
 	}
 }
 
@@ -105,8 +101,7 @@ impl From<Vec<u8>> for TrackedStorageKey {
 #[repr(transparent)]
 #[derive(RefCast)]
 pub struct PrefixedStorageKey(
-	#[cfg_attr(feature = "std", serde(with="impl_serde::serialize"))]
-	Vec<u8>,
+	#[cfg_attr(feature = "std", serde(with = "impl_serde::serialize"))] Vec<u8>,
 );
 
 impl Deref for PrefixedStorageKey {
@@ -235,7 +230,6 @@ pub mod well_known_keys {
 			CHILD_STORAGE_KEY_PREFIX.starts_with(key)
 		}
 	}
-
 }
 
 /// Information related to a child state.
@@ -257,9 +251,7 @@ impl ChildInfo {
 
 	/// Same as `new_default` but with `Vec<u8>` as input.
 	pub fn new_default_from_vec(storage_key: Vec<u8>) -> Self {
-		ChildInfo::ParentKeyId(ChildTrieParentKeyId {
-			data: storage_key,
-		})
+		ChildInfo::ParentKeyId(ChildTrieParentKeyId { data: storage_key })
 	}
 
 	/// Try to update with another instance, return false if both instance
@@ -284,9 +276,7 @@ impl ChildInfo {
 	/// child trie.
 	pub fn storage_key(&self) -> &[u8] {
 		match self {
-			ChildInfo::ParentKeyId(ChildTrieParentKeyId {
-				data,
-			}) => &data[..],
+			ChildInfo::ParentKeyId(ChildTrieParentKeyId { data }) => &data[..],
 		}
 	}
 
@@ -294,9 +284,8 @@ impl ChildInfo {
 	/// this trie.
 	pub fn prefixed_storage_key(&self) -> PrefixedStorageKey {
 		match self {
-			ChildInfo::ParentKeyId(ChildTrieParentKeyId {
-				data,
-			}) => ChildType::ParentKeyId.new_prefixed_key(data.as_slice()),
+			ChildInfo::ParentKeyId(ChildTrieParentKeyId { data }) =>
+				ChildType::ParentKeyId.new_prefixed_key(data.as_slice()),
 		}
 	}
 
@@ -304,9 +293,7 @@ impl ChildInfo {
 	/// this trie.
 	pub fn into_prefixed_storage_key(self) -> PrefixedStorageKey {
 		match self {
-			ChildInfo::ParentKeyId(ChildTrieParentKeyId {
-				mut data,
-			}) => {
+			ChildInfo::ParentKeyId(ChildTrieParentKeyId { mut data }) => {
 				ChildType::ParentKeyId.do_prefix_key(&mut data);
 				PrefixedStorageKey(data)
 			},
diff --git a/primitives/tasks/src/async_externalities.rs b/primitives/tasks/src/async_externalities.rs
index 8402246cb4e2..975a81af4f53 100644
--- a/primitives/tasks/src/async_externalities.rs
+++ b/primitives/tasks/src/async_externalities.rs
@@ -18,12 +18,12 @@
 
 //! Async externalities.
 
-use std::any::{TypeId, Any};
 use sp_core::{
 	storage::{ChildInfo, TrackedStorageKey},
-	traits::{Externalities, SpawnNamed, TaskExecutorExt, RuntimeSpawnExt, RuntimeSpawn},
+	traits::{Externalities, RuntimeSpawn, RuntimeSpawnExt, SpawnNamed, TaskExecutorExt},
 };
 use sp_externalities::{Extensions, ExternalitiesExt as _};
+use std::any::{Any, TypeId};
 
 /// Simple state-less externalities for use in async context.
 ///
@@ -34,7 +34,9 @@ pub struct AsyncExternalities {
 }
 
 /// New Async externalities.
-pub fn new_async_externalities(scheduler: Box<dyn SpawnNamed>) -> Result<AsyncExternalities, &'static str> {
+pub fn new_async_externalities(
+	scheduler: Box<dyn SpawnNamed>,
+) -> Result<AsyncExternalities, &'static str> {
 	let mut res = AsyncExternalities { extensions: Default::default() };
 	let mut ext = &mut res as &mut dyn Externalities;
 	ext.register_extension::<TaskExecutorExt>(TaskExecutorExt(scheduler.clone()))
@@ -74,19 +76,11 @@ impl Externalities for AsyncExternalities {
 		panic!("`storage_hash`: should not be used in async externalities!")
 	}
 
-	fn child_storage(
-		&self,
-		_child_info: &ChildInfo,
-		_key: &[u8],
-	) -> Option<StorageValue> {
+	fn child_storage(&self, _child_info: &ChildInfo, _key: &[u8]) -> Option<StorageValue> {
 		panic!("`child_storage`: should not be used in async externalities!")
 	}
 
-	fn child_storage_hash(
-		&self,
-		_child_info: &ChildInfo,
-		_key: &[u8],
-	) -> Option<Vec<u8>> {
+	fn child_storage_hash(&self, _child_info: &ChildInfo, _key: &[u8]) -> Option<Vec<u8>> {
 		panic!("`child_storage_hash`: should not be used in async externalities!")
 	}
 
@@ -94,11 +88,7 @@ impl Externalities for AsyncExternalities {
 		panic!("`next_storage_key`: should not be used in async externalities!")
 	}
 
-	fn next_child_storage_key(
-		&self,
-		_child_info: &ChildInfo,
-		_key: &[u8],
-	) -> Option<StorageKey> {
+	fn next_child_storage_key(&self, _child_info: &ChildInfo, _key: &[u8]) -> Option<StorageKey> {
 		panic!("`next_child_storage_key`: should not be used in async externalities!")
 	}
 
@@ -115,11 +105,7 @@ impl Externalities for AsyncExternalities {
 		panic!("`place_child_storage`: should not be used in async externalities!")
 	}
 
-	fn kill_child_storage(
-		&mut self,
-		_child_info: &ChildInfo,
-		_limit: Option<u32>,
-	) -> (bool, u32) {
+	fn kill_child_storage(&mut self, _child_info: &ChildInfo, _limit: Option<u32>) -> (bool, u32) {
 		panic!("`kill_child_storage`: should not be used in async externalities!")
 	}
 
@@ -136,11 +122,7 @@ impl Externalities for AsyncExternalities {
 		panic!("`clear_child_prefix`: should not be used in async externalities!")
 	}
 
-	fn storage_append(
-		&mut self,
-		_key: Vec<u8>,
-		_value: Vec<u8>,
-	) {
+	fn storage_append(&mut self, _key: Vec<u8>, _value: Vec<u8>) {
 		panic!("`storage_append`: should not be used in async externalities!")
 	}
 
@@ -148,10 +130,7 @@ impl Externalities for AsyncExternalities {
 		panic!("`storage_root`: should not be used in async externalities!")
 	}
 
-	fn child_storage_root(
-		&mut self,
-		_child_info: &ChildInfo,
-	) -> Vec<u8> {
+	fn child_storage_root(&mut self, _child_info: &ChildInfo) -> Vec<u8> {
 		panic!("`child_storage_root`: should not be used in async externalities!")
 	}
 
@@ -209,7 +188,10 @@ impl sp_externalities::ExtensionStore for AsyncExternalities {
 		self.extensions.register_with_type_id(type_id, extension)
 	}
 
-	fn deregister_extension_by_type_id(&mut self, type_id: TypeId) -> Result<(), sp_externalities::Error> {
+	fn deregister_extension_by_type_id(
+		&mut self,
+		type_id: TypeId,
+	) -> Result<(), sp_externalities::Error> {
 		if self.extensions.deregister(type_id) {
 			Ok(())
 		} else {
diff --git a/primitives/tasks/src/lib.rs b/primitives/tasks/src/lib.rs
index 96aca0e1cef6..e9c80ae5ff4c 100644
--- a/primitives/tasks/src/lib.rs
+++ b/primitives/tasks/src/lib.rs
@@ -49,7 +49,6 @@
 //!
 //! When allowing unbounded parallelism, malicious transactions can exploit it and partition
 //! network consensus based on how much resources nodes have.
-//!
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
@@ -61,9 +60,9 @@ pub use async_externalities::{new_async_externalities, AsyncExternalities};
 
 #[cfg(feature = "std")]
 mod inner {
-	use std::{panic::AssertUnwindSafe, sync::mpsc};
-	use sp_externalities::ExternalitiesExt as _;
 	use sp_core::traits::TaskExecutorExt;
+	use sp_externalities::ExternalitiesExt as _;
+	use std::{panic::AssertUnwindSafe, sync::mpsc};
 
 	/// Task handle (wasm).
 	///
@@ -77,55 +76,62 @@ mod inner {
 	impl DataJoinHandle {
 		/// Join handle returned by `spawn` function
 		pub fn join(self) -> Vec<u8> {
-			self.receiver.recv().expect("Spawned runtime task terminated before sending result.")
+			self.receiver
+				.recv()
+				.expect("Spawned runtime task terminated before sending result.")
 		}
 	}
 
 	/// Spawn new runtime task (native).
 	pub fn spawn(entry_point: fn(Vec<u8>) -> Vec<u8>, data: Vec<u8>) -> DataJoinHandle {
-		let scheduler = sp_externalities::with_externalities(|mut ext| ext.extension::<TaskExecutorExt>()
-			.expect("No task executor associated with the current context!")
-			.clone()
-		).expect("Spawn called outside of externalities context!");
+		let scheduler = sp_externalities::with_externalities(|mut ext| {
+			ext.extension::<TaskExecutorExt>()
+				.expect("No task executor associated with the current context!")
+				.clone()
+		})
+		.expect("Spawn called outside of externalities context!");
 
 		let (sender, receiver) = mpsc::channel();
 		let extra_scheduler = scheduler.clone();
-		scheduler.spawn("parallel-runtime-spawn", Box::pin(async move {
-			let result = match crate::new_async_externalities(extra_scheduler) {
-				Ok(mut ext) => {
-					let mut ext = AssertUnwindSafe(&mut ext);
-					match std::panic::catch_unwind(move || {
-						sp_externalities::set_and_run_with_externalities(
-							&mut **ext,
-							move || entry_point(data),
-						)
-					}) {
-						Ok(result) => result,
-						Err(panic) => {
-							log::error!(
-								target: "runtime",
-								"Spawned task panicked: {:?}",
-								panic,
-							);
-
-							// This will drop sender without sending anything.
-							return;
+		scheduler.spawn(
+			"parallel-runtime-spawn",
+			Box::pin(async move {
+				let result = match crate::new_async_externalities(extra_scheduler) {
+					Ok(mut ext) => {
+						let mut ext = AssertUnwindSafe(&mut ext);
+						match std::panic::catch_unwind(move || {
+							sp_externalities::set_and_run_with_externalities(
+								&mut **ext,
+								move || entry_point(data),
+							)
+						}) {
+							Ok(result) => result,
+							Err(panic) => {
+								log::error!(
+									target: "runtime",
+									"Spawned task panicked: {:?}",
+									panic,
+								);
+
+								// This will drop sender without sending anything.
+								return
+							},
 						}
-					}
-				},
-				Err(e) => {
-					log::error!(
-						target: "runtime",
-						"Unable to run async task: {}",
-						e,
-					);
-
-					return;
-				},
-			};
-
-			let _ = sender.send(result);
-		}));
+					},
+					Err(e) => {
+						log::error!(
+							target: "runtime",
+							"Unable to run async task: {}",
+							e,
+						);
+
+						return
+					},
+				};
+
+				let _ = sender.send(result);
+			}),
+		);
 
 		DataJoinHandle { receiver }
 	}
@@ -146,7 +152,11 @@ mod inner {
 	///
 	/// NOTE: Since this dynamic dispatch function and the invoked function are compiled with
 	/// the same compiler, there should be no problem with ABI incompatibility.
-	extern "C" fn dispatch_wrapper(func_ref: *const u8, payload_ptr: *mut u8, payload_len: u32) -> u64 {
+	extern "C" fn dispatch_wrapper(
+		func_ref: *const u8,
+		payload_ptr: *mut u8,
+		payload_len: u32,
+	) -> u64 {
 		let payload_len = payload_len as usize;
 		let output = unsafe {
 			let payload = Vec::from_raw_parts(payload_ptr, payload_len, payload_len);
@@ -160,11 +170,8 @@ mod inner {
 	pub fn spawn(entry_point: fn(Vec<u8>) -> Vec<u8>, payload: Vec<u8>) -> DataJoinHandle {
 		let func_ptr: usize = unsafe { mem::transmute(entry_point) };
 
-		let handle = sp_io::runtime_tasks::spawn(
-			dispatch_wrapper as usize as _,
-			func_ptr as u32,
-			payload,
-		);
+		let handle =
+			sp_io::runtime_tasks::spawn(dispatch_wrapper as usize as _, func_ptr as u32, payload);
 		DataJoinHandle { handle }
 	}
 
@@ -185,7 +192,7 @@ mod inner {
 	}
 }
 
-pub use inner::{DataJoinHandle, spawn};
+pub use inner::{spawn, DataJoinHandle};
 
 #[cfg(test)]
 mod tests {
@@ -211,7 +218,7 @@ mod tests {
 
 	#[test]
 	fn panicking() {
-		let res = sp_io::TestExternalities::default().execute_with_safe(||{
+		let res = sp_io::TestExternalities::default().execute_with_safe(|| {
 			spawn(async_panicker, vec![5, 2, 1]).join();
 		});
 
@@ -220,28 +227,30 @@ mod tests {
 
 	#[test]
 	fn many_joins() {
-		sp_io::TestExternalities::default().execute_with_safe(|| {
-			// converges to 1 only after 1000+ steps
-			let mut running_val = 9780657630u64;
-			let mut data = vec![];
-			let handles = (0..1024).map(
-				|_| {
-					running_val = if running_val % 2 == 0 {
-						running_val / 2
-					} else {
-						3 * running_val + 1
-					};
-					data.push(running_val as u8);
-					(spawn(async_runner, data.clone()), data.clone())
+		sp_io::TestExternalities::default()
+			.execute_with_safe(|| {
+				// converges to 1 only after 1000+ steps
+				let mut running_val = 9780657630u64;
+				let mut data = vec![];
+				let handles = (0..1024)
+					.map(|_| {
+						running_val = if running_val % 2 == 0 {
+							running_val / 2
+						} else {
+							3 * running_val + 1
+						};
+						data.push(running_val as u8);
+						(spawn(async_runner, data.clone()), data.clone())
+					})
+					.collect::<Vec<_>>();
+
+				for (handle, mut data) in handles {
+					let result = handle.join();
+					data.sort();
+
+					assert_eq!(result, data);
 				}
-			).collect::<Vec<_>>();
-
-			for (handle, mut data) in handles {
-				let result = handle.join();
-				data.sort();
-
-				assert_eq!(result, data);
-			}
-		}).expect("Failed to run with externalities");
+			})
+			.expect("Failed to run with externalities");
 	}
 }
diff --git a/primitives/test-primitives/src/lib.rs b/primitives/test-primitives/src/lib.rs
index ed408f338e49..d988160b1dc7 100644
--- a/primitives/test-primitives/src/lib.rs
+++ b/primitives/test-primitives/src/lib.rs
@@ -19,13 +19,13 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use codec::{Encode, Decode};
+use codec::{Decode, Encode};
 
-use sp_application_crypto::sr25519;
 pub use sp_application_crypto;
+use sp_application_crypto::sr25519;
 
 pub use sp_core::{hash::H256, RuntimeDebug};
-use sp_runtime::traits::{BlakeTwo256, Verify, Extrinsic as ExtrinsicT,};
+use sp_runtime::traits::{BlakeTwo256, Extrinsic as ExtrinsicT, Verify};
 
 /// Extrinsic for test-runtime.
 #[derive(Clone, PartialEq, Eq, Encode, Decode, RuntimeDebug)]
@@ -37,7 +37,10 @@ pub enum Extrinsic {
 
 #[cfg(feature = "std")]
 impl serde::Serialize for Extrinsic {
-	fn serialize<S>(&self, seq: S) -> Result<S::Ok, S::Error> where S: ::serde::Serializer {
+	fn serialize<S>(&self, seq: S) -> Result<S::Ok, S::Error>
+	where
+		S: ::serde::Serializer,
+	{
 		self.using_encoded(|bytes| seq.serialize_bytes(bytes))
 	}
 }
@@ -80,8 +83,5 @@ pub type Header = sp_runtime::generic::Header<BlockNumber, BlakeTwo256>;
 
 /// Changes trie configuration (optionally) used in tests.
 pub fn changes_trie_config() -> sp_core::ChangesTrieConfiguration {
-	sp_core::ChangesTrieConfiguration {
-		digest_interval: 4,
-		digest_levels: 2,
-	}
+	sp_core::ChangesTrieConfiguration { digest_interval: 4, digest_levels: 2 }
 }
diff --git a/primitives/timestamp/src/lib.rs b/primitives/timestamp/src/lib.rs
index 542522c9b850..892d359d8e88 100644
--- a/primitives/timestamp/src/lib.rs
+++ b/primitives/timestamp/src/lib.rs
@@ -19,8 +19,8 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use codec::{Encode, Decode};
-use sp_inherents::{InherentIdentifier, IsFatalError, InherentData};
+use codec::{Decode, Encode};
+use sp_inherents::{InherentData, InherentIdentifier, IsFatalError};
 use sp_std::time::Duration;
 
 /// The identifier for the `timestamp` inherent.
@@ -190,10 +190,7 @@ impl InherentDataProvider {
 
 	/// Create `Self` using the given `timestamp`.
 	pub fn new(timestamp: InherentType) -> Self {
-		Self {
-			max_drift: std::time::Duration::from_secs(60).into(),
-			timestamp,
-		}
+		Self { max_drift: std::time::Duration::from_secs(60).into(), timestamp }
 	}
 
 	/// With the given maximum drift.
@@ -249,9 +246,9 @@ impl sp_inherents::InherentDataProvider for InherentDataProvider {
 				// halt import until timestamp is valid.
 				// reject when too far ahead.
 				if valid > timestamp + max_drift {
-					return Some(Err(
-						sp_inherents::Error::Application(Box::from(InherentError::TooFarInFuture))
-					))
+					return Some(Err(sp_inherents::Error::Application(Box::from(
+						InherentError::TooFarInFuture,
+					))))
 				}
 
 				let diff = valid.checked_sub(timestamp).unwrap_or_default();
@@ -269,4 +266,3 @@ impl sp_inherents::InherentDataProvider for InherentDataProvider {
 		}
 	}
 }
-
diff --git a/primitives/tracing/src/lib.rs b/primitives/tracing/src/lib.rs
index 95eb4d056670..9522e6df633a 100644
--- a/primitives/tracing/src/lib.rs
+++ b/primitives/tracing/src/lib.rs
@@ -40,18 +40,16 @@
 #[cfg(feature = "std")]
 use tracing;
 pub use tracing::{
-    debug, debug_span, error, error_span, event, info, info_span, Level, span, Span,
-    trace, trace_span, warn, warn_span,
+	debug, debug_span, error, error_span, event, info, info_span, span, trace, trace_span, warn,
+	warn_span, Level, Span,
 };
 
 pub use crate::types::{
-    WasmEntryAttributes, WasmFieldName, WasmFields, WasmLevel, WasmMetadata, WasmValue,
-	WasmValuesSet
+	WasmEntryAttributes, WasmFieldName, WasmFields, WasmLevel, WasmMetadata, WasmValue,
+	WasmValuesSet,
 };
 #[cfg(feature = "std")]
-pub use crate::types::{
-    WASM_NAME_KEY, WASM_TARGET_KEY, WASM_TRACE_IDENTIFIER
-};
+pub use crate::types::{WASM_NAME_KEY, WASM_TARGET_KEY, WASM_TRACE_IDENTIFIER};
 
 /// Tracing facilities and helpers.
 ///
@@ -78,19 +76,18 @@ pub use crate::types::{
 /// ```rust
 /// sp_tracing::enter_span!(sp_tracing::Level::TRACE, "fn wide span");
 /// {
-///		sp_tracing::enter_span!(sp_tracing::trace_span!("outer-span"));
-///		{
-///			sp_tracing::enter_span!(sp_tracing::Level::TRACE, "inner-span");
-///			// ..
-///		}  // inner span exists here
-///	} // outer span exists here
+/// 		sp_tracing::enter_span!(sp_tracing::trace_span!("outer-span"));
+/// 		{
+/// 			sp_tracing::enter_span!(sp_tracing::Level::TRACE, "inner-span");
+/// 			// ..
+/// 		}  // inner span exists here
+/// 	} // outer span exists here
 ///
 /// sp_tracing::within_span! {
-///		sp_tracing::debug_span!("debug-span", you_can_pass="any params");
+/// 		sp_tracing::debug_span!("debug-span", you_can_pass="any params");
 ///     1 + 1;
 ///     // some other complex code
 /// } // debug span ends here
-///
 /// ```
 ///
 ///
@@ -108,7 +105,6 @@ pub use crate::types::{
 /// and call `set_tracing_subscriber` at the very beginning of your execution –
 /// the default subscriber is doing nothing, so any spans or events happening before
 /// will not be recorded!
-
 mod types;
 
 /// Try to init a simple tracing subscriber with log compatibility layer.
@@ -117,7 +113,8 @@ mod types;
 pub fn try_init_simple() {
 	let _ = tracing_subscriber::fmt()
 		.with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
-		.with_writer(std::io::stderr).try_init();
+		.with_writer(std::io::stderr)
+		.try_init();
 }
 
 /// Runs given code within a tracing span, measuring it's execution time.
@@ -129,20 +126,20 @@ pub fn try_init_simple() {
 ///
 /// ```
 /// sp_tracing::within_span! {
-///		sp_tracing::Level::TRACE,
+/// 		sp_tracing::Level::TRACE,
 ///     "test-span";
 ///     1 + 1;
 ///     // some other complex code
 /// }
 ///
 /// sp_tracing::within_span! {
-///		sp_tracing::span!(sp_tracing::Level::WARN, "warn-span", you_can_pass="any params");
+/// 		sp_tracing::span!(sp_tracing::Level::WARN, "warn-span", you_can_pass="any params");
 ///     1 + 1;
 ///     // some other complex code
 /// }
 ///
 /// sp_tracing::within_span! {
-///		sp_tracing::debug_span!("debug-span", you_can_pass="any params");
+/// 		sp_tracing::debug_span!("debug-span", you_can_pass="any params");
 ///     1 + 1;
 ///     // some other complex code
 /// }
@@ -189,13 +186,12 @@ macro_rules! within_span {
 	};
 }
 
-
 /// Enter a span - noop for `no_std` without `with-tracing`
 #[cfg(all(not(feature = "std"), not(feature = "with-tracing")))]
 #[macro_export]
 macro_rules! enter_span {
-	( $lvl:expr, $name:expr ) => ( );
-	( $name:expr ) => ( ) // no-op
+	( $lvl:expr, $name:expr ) => {};
+	( $name:expr ) => {}; // no-op
 }
 
 /// Enter a span.
@@ -217,13 +213,12 @@ macro_rules! enter_span {
 /// sp_tracing::enter_span!(sp_tracing::info_span!("info-span",  params="value"));
 ///
 /// {
-///		sp_tracing::enter_span!(sp_tracing::Level::TRACE, "outer-span");
-///		{
-///			sp_tracing::enter_span!(sp_tracing::Level::TRACE, "inner-span");
-///			// ..
-///		}  // inner span exists here
-///	} // outer span exists here
-///
+/// 		sp_tracing::enter_span!(sp_tracing::Level::TRACE, "outer-span");
+/// 		{
+/// 			sp_tracing::enter_span!(sp_tracing::Level::TRACE, "inner-span");
+/// 			// ..
+/// 		}  // inner span exists here
+/// 	} // outer span exists here
 /// ```
 #[cfg(any(feature = "std", feature = "with-tracing"))]
 #[macro_export]
diff --git a/primitives/tracing/src/types.rs b/primitives/tracing/src/types.rs
index 9fdcdfb52639..355e2fa451db 100644
--- a/primitives/tracing/src/types.rs
+++ b/primitives/tracing/src/types.rs
@@ -15,15 +15,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use codec::{Decode, Encode};
 /// Types for wasm based tracing. Loosly inspired by `tracing-core` but
 /// optimised for the specific use case.
-
-use core::{format_args, fmt::Debug};
-use sp_std::{
-	vec, vec::Vec,
-};
-use sp_std::Writer;
-use codec::{Encode, Decode};
+use core::{fmt::Debug, format_args};
+use sp_std::{vec, vec::Vec, Writer};
 
 /// The Tracing Level – the user can filter by this
 #[derive(Clone, Encode, Decode, Debug)]
@@ -37,10 +33,9 @@ pub enum WasmLevel {
 	/// Further information for debugging purposes
 	DEBUG,
 	/// The lowest level, keeping track of minute detail
-	TRACE
+	TRACE,
 }
 
-
 impl From<&tracing_core::Level> for WasmLevel {
 	fn from(l: &tracing_core::Level) -> WasmLevel {
 		match *l {
@@ -80,41 +75,27 @@ pub enum WasmValue {
 impl core::fmt::Debug for WasmValue {
 	fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
 		match self {
-			WasmValue::U8(ref i) => {
-				f.write_fmt(format_args!("{}_u8", i))
-			}
-			WasmValue::I8(ref i) => {
-				f.write_fmt(format_args!("{}_i8", i))
-			}
-			WasmValue::U32(ref i) => {
-				f.write_fmt(format_args!("{}_u32", i))
-			}
-			WasmValue::I32(ref i) => {
-				f.write_fmt(format_args!("{}_i32", i))
-			}
-			WasmValue::I64(ref i) => {
-				f.write_fmt(format_args!("{}_i64", i))
-			}
-			WasmValue::U64(ref i) => {
-				f.write_fmt(format_args!("{}_u64", i))
-			}
-			WasmValue::Bool(ref i) => {
-				f.write_fmt(format_args!("{}_bool", i))
-			}
+			WasmValue::U8(ref i) => f.write_fmt(format_args!("{}_u8", i)),
+			WasmValue::I8(ref i) => f.write_fmt(format_args!("{}_i8", i)),
+			WasmValue::U32(ref i) => f.write_fmt(format_args!("{}_u32", i)),
+			WasmValue::I32(ref i) => f.write_fmt(format_args!("{}_i32", i)),
+			WasmValue::I64(ref i) => f.write_fmt(format_args!("{}_i64", i)),
+			WasmValue::U64(ref i) => f.write_fmt(format_args!("{}_u64", i)),
+			WasmValue::Bool(ref i) => f.write_fmt(format_args!("{}_bool", i)),
 			WasmValue::Formatted(ref i) | WasmValue::Str(ref i) => {
 				if let Ok(v) = core::str::from_utf8(i) {
 					f.write_fmt(format_args!("{}", v))
 				} else {
 					f.write_fmt(format_args!("{:?}", i))
 				}
-			}
+			},
 			WasmValue::Encoded(ref v) => {
 				f.write_str("Scale(")?;
-					for byte in v {
-						f.write_fmt(format_args!("{:02x}", byte))?;
-					}
+				for byte in v {
+					f.write_fmt(format_args!("{:02x}", byte))?;
+				}
 				f.write_str(")")
-			}
+			},
 		}
 	}
 }
@@ -297,7 +278,6 @@ impl core::fmt::Debug for WasmValuesSet {
 	}
 }
 
-
 impl From<Vec<(WasmFieldName, Option<WasmValue>)>> for WasmValuesSet {
 	fn from(v: Vec<(WasmFieldName, Option<WasmValue>)>) -> Self {
 		WasmValuesSet(v)
@@ -324,34 +304,20 @@ impl WasmValuesSet {
 
 impl tracing_core::field::Visit for WasmValuesSet {
 	fn record_debug(&mut self, field: &tracing_core::field::Field, value: &dyn Debug) {
-		self.0.push( (
-			field.name().into(),
-			Some(WasmValue::from(format_args!("{:?}", value)))
-		))
+		self.0
+			.push((field.name().into(), Some(WasmValue::from(format_args!("{:?}", value)))))
 	}
 	fn record_i64(&mut self, field: &tracing_core::field::Field, value: i64) {
-		self.0.push( (
-			field.name().into(),
-			Some(WasmValue::from(value))
-		))
+		self.0.push((field.name().into(), Some(WasmValue::from(value))))
 	}
 	fn record_u64(&mut self, field: &tracing_core::field::Field, value: u64) {
-		self.0.push( (
-			field.name().into(),
-			Some(WasmValue::from(value))
-		))
+		self.0.push((field.name().into(), Some(WasmValue::from(value))))
 	}
 	fn record_bool(&mut self, field: &tracing_core::field::Field, value: bool) {
-		self.0.push( (
-			field.name().into(),
-			Some(WasmValue::from(value))
-		))
+		self.0.push((field.name().into(), Some(WasmValue::from(value))))
 	}
 	fn record_str(&mut self, field: &tracing_core::field::Field, value: &str) {
-		self.0.push( (
-			field.name().into(),
-			Some(WasmValue::from(value))
-		))
+		self.0.push((field.name().into(), Some(WasmValue::from(value))))
 	}
 }
 /// Metadata provides generic information about the specifc location of the
@@ -386,7 +352,7 @@ impl From<&tracing_core::Metadata<'_>> for WasmMetadata {
 			line: wm.line().unwrap_or_default(),
 			module_path: wm.module_path().map(|m| m.as_bytes().to_vec()).unwrap_or_default(),
 			is_span: wm.is_span(),
-			fields: wm.fields().into()
+			fields: wm.fields().into(),
 		}
 	}
 }
@@ -417,12 +383,11 @@ impl core::default::Default for WasmMetadata {
 			line: Default::default(),
 			module_path: Default::default(),
 			is_span: true,
-			fields: WasmFields::empty()
+			fields: WasmFields::empty(),
 		}
 	}
 }
 
-
 fn decode_field(field: &[u8]) -> &str {
 	core::str::from_utf8(field).unwrap_or_default()
 }
@@ -445,7 +410,7 @@ impl From<&tracing_core::Event<'_>> for WasmEntryAttributes {
 		WasmEntryAttributes {
 			parent_id: evt.parent().map(|id| id.into_u64()),
 			metadata: evt.metadata().into(),
-			fields
+			fields,
 		}
 	}
 }
@@ -457,7 +422,7 @@ impl From<&tracing_core::span::Attributes<'_>> for WasmEntryAttributes {
 		WasmEntryAttributes {
 			parent_id: attrs.parent().map(|id| id.into_u64()),
 			metadata: attrs.metadata().into(),
-			fields
+			fields,
 		}
 	}
 }
@@ -480,10 +445,14 @@ mod std_features {
 	/// Static entry use for wasm-originated metadata.
 	pub struct WasmCallsite;
 	impl callsite::Callsite for WasmCallsite {
-		fn set_interest(&self, _: tracing_core::Interest) { unimplemented!() }
-		fn metadata(&self) -> &tracing_core::Metadata { unimplemented!() }
+		fn set_interest(&self, _: tracing_core::Interest) {
+			unimplemented!()
+		}
+		fn metadata(&self) -> &tracing_core::Metadata {
+			unimplemented!()
+		}
 	}
-	static CALLSITE: WasmCallsite =  WasmCallsite;
+	static CALLSITE: WasmCallsite = WasmCallsite;
 	/// The identifier we are using to inject the wasm events in the generic `tracing` system
 	pub static WASM_TRACE_IDENTIFIER: &str = "wasm_tracing";
 	/// The fieldname for the wasm-originated name
@@ -491,8 +460,8 @@ mod std_features {
 	/// The fieldname for the wasm-originated target
 	pub static WASM_TARGET_KEY: &str = "target";
 	/// The the list of all static field names we construct from the given metadata
-	pub static GENERIC_FIELDS: &[&str] = &[WASM_TARGET_KEY, WASM_NAME_KEY,
-		"file", "line", "module_path", "params"];
+	pub static GENERIC_FIELDS: &[&str] =
+		&[WASM_TARGET_KEY, WASM_NAME_KEY, "file", "line", "module_path", "params"];
 
 	// Implementation Note:
 	// the original `tracing` crate generates these static metadata entries at every `span!` and
@@ -500,67 +469,147 @@ mod std_features {
 	// of wasm events we need these static metadata entries to inject into that system. We then provide
 	// generic `From`-implementations picking the right metadata to refer to.
 
-	static SPAN_ERROR_METADATA : tracing_core::Metadata<'static> = tracing::Metadata::new(
-		WASM_TRACE_IDENTIFIER, WASM_TRACE_IDENTIFIER, tracing::Level::ERROR, None, None, None,
-		tracing_core::field::FieldSet::new(GENERIC_FIELDS, tracing_core::identify_callsite!(&CALLSITE)),
-		tracing_core::metadata::Kind::SPAN
+	static SPAN_ERROR_METADATA: tracing_core::Metadata<'static> = tracing::Metadata::new(
+		WASM_TRACE_IDENTIFIER,
+		WASM_TRACE_IDENTIFIER,
+		tracing::Level::ERROR,
+		None,
+		None,
+		None,
+		tracing_core::field::FieldSet::new(
+			GENERIC_FIELDS,
+			tracing_core::identify_callsite!(&CALLSITE),
+		),
+		tracing_core::metadata::Kind::SPAN,
 	);
 
-	static SPAN_WARN_METADATA : tracing_core::Metadata<'static> = tracing::Metadata::new(
-		WASM_TRACE_IDENTIFIER, WASM_TRACE_IDENTIFIER, tracing::Level::WARN, None, None, None,
-		tracing_core::field::FieldSet::new(GENERIC_FIELDS, tracing_core::identify_callsite!(&CALLSITE)),
-		tracing_core::metadata::Kind::SPAN
+	static SPAN_WARN_METADATA: tracing_core::Metadata<'static> = tracing::Metadata::new(
+		WASM_TRACE_IDENTIFIER,
+		WASM_TRACE_IDENTIFIER,
+		tracing::Level::WARN,
+		None,
+		None,
+		None,
+		tracing_core::field::FieldSet::new(
+			GENERIC_FIELDS,
+			tracing_core::identify_callsite!(&CALLSITE),
+		),
+		tracing_core::metadata::Kind::SPAN,
 	);
-	static SPAN_INFO_METADATA : tracing_core::Metadata<'static> = tracing::Metadata::new(
-		WASM_TRACE_IDENTIFIER, WASM_TRACE_IDENTIFIER, tracing::Level::INFO, None, None, None,
-		tracing_core::field::FieldSet::new(GENERIC_FIELDS, tracing_core::identify_callsite!(&CALLSITE)),
-		tracing_core::metadata::Kind::SPAN
+	static SPAN_INFO_METADATA: tracing_core::Metadata<'static> = tracing::Metadata::new(
+		WASM_TRACE_IDENTIFIER,
+		WASM_TRACE_IDENTIFIER,
+		tracing::Level::INFO,
+		None,
+		None,
+		None,
+		tracing_core::field::FieldSet::new(
+			GENERIC_FIELDS,
+			tracing_core::identify_callsite!(&CALLSITE),
+		),
+		tracing_core::metadata::Kind::SPAN,
 	);
 
-	static SPAN_DEBUG_METADATA : tracing_core::Metadata<'static> = tracing::Metadata::new(
-		WASM_TRACE_IDENTIFIER, WASM_TRACE_IDENTIFIER, tracing::Level::DEBUG, None, None, None,
-		tracing_core::field::FieldSet::new(GENERIC_FIELDS, tracing_core::identify_callsite!(&CALLSITE)),
-		tracing_core::metadata::Kind::SPAN
+	static SPAN_DEBUG_METADATA: tracing_core::Metadata<'static> = tracing::Metadata::new(
+		WASM_TRACE_IDENTIFIER,
+		WASM_TRACE_IDENTIFIER,
+		tracing::Level::DEBUG,
+		None,
+		None,
+		None,
+		tracing_core::field::FieldSet::new(
+			GENERIC_FIELDS,
+			tracing_core::identify_callsite!(&CALLSITE),
+		),
+		tracing_core::metadata::Kind::SPAN,
 	);
 
-	static SPAN_TRACE_METADATA : tracing_core::Metadata<'static> = tracing::Metadata::new(
-		WASM_TRACE_IDENTIFIER, WASM_TRACE_IDENTIFIER, tracing::Level::TRACE, None, None, None,
-		tracing_core::field::FieldSet::new(GENERIC_FIELDS, tracing_core::identify_callsite!(&CALLSITE)),
-		tracing_core::metadata::Kind::SPAN
+	static SPAN_TRACE_METADATA: tracing_core::Metadata<'static> = tracing::Metadata::new(
+		WASM_TRACE_IDENTIFIER,
+		WASM_TRACE_IDENTIFIER,
+		tracing::Level::TRACE,
+		None,
+		None,
+		None,
+		tracing_core::field::FieldSet::new(
+			GENERIC_FIELDS,
+			tracing_core::identify_callsite!(&CALLSITE),
+		),
+		tracing_core::metadata::Kind::SPAN,
 	);
 
-	static EVENT_ERROR_METADATA : tracing_core::Metadata<'static> = tracing::Metadata::new(
-		WASM_TRACE_IDENTIFIER, WASM_TRACE_IDENTIFIER, tracing::Level::ERROR, None, None, None,
-		tracing_core::field::FieldSet::new(GENERIC_FIELDS, tracing_core::identify_callsite!(&CALLSITE)),
-		tracing_core::metadata::Kind::EVENT
+	static EVENT_ERROR_METADATA: tracing_core::Metadata<'static> = tracing::Metadata::new(
+		WASM_TRACE_IDENTIFIER,
+		WASM_TRACE_IDENTIFIER,
+		tracing::Level::ERROR,
+		None,
+		None,
+		None,
+		tracing_core::field::FieldSet::new(
+			GENERIC_FIELDS,
+			tracing_core::identify_callsite!(&CALLSITE),
+		),
+		tracing_core::metadata::Kind::EVENT,
 	);
 
-	static EVENT_WARN_METADATA : tracing_core::Metadata<'static> = tracing::Metadata::new(
-		WASM_TRACE_IDENTIFIER, WASM_TRACE_IDENTIFIER, tracing::Level::WARN, None, None, None,
-		tracing_core::field::FieldSet::new(GENERIC_FIELDS, tracing_core::identify_callsite!(&CALLSITE)),
-		tracing_core::metadata::Kind::EVENT
+	static EVENT_WARN_METADATA: tracing_core::Metadata<'static> = tracing::Metadata::new(
+		WASM_TRACE_IDENTIFIER,
+		WASM_TRACE_IDENTIFIER,
+		tracing::Level::WARN,
+		None,
+		None,
+		None,
+		tracing_core::field::FieldSet::new(
+			GENERIC_FIELDS,
+			tracing_core::identify_callsite!(&CALLSITE),
+		),
+		tracing_core::metadata::Kind::EVENT,
 	);
 
-	static EVENT_INFO_METADATA : tracing_core::Metadata<'static> = tracing::Metadata::new(
-		WASM_TRACE_IDENTIFIER, WASM_TRACE_IDENTIFIER, tracing::Level::INFO, None, None, None,
-		tracing_core::field::FieldSet::new(GENERIC_FIELDS, tracing_core::identify_callsite!(&CALLSITE)),
-		tracing_core::metadata::Kind::EVENT
+	static EVENT_INFO_METADATA: tracing_core::Metadata<'static> = tracing::Metadata::new(
+		WASM_TRACE_IDENTIFIER,
+		WASM_TRACE_IDENTIFIER,
+		tracing::Level::INFO,
+		None,
+		None,
+		None,
+		tracing_core::field::FieldSet::new(
+			GENERIC_FIELDS,
+			tracing_core::identify_callsite!(&CALLSITE),
+		),
+		tracing_core::metadata::Kind::EVENT,
 	);
 
-	static EVENT_DEBUG_METADATA : tracing_core::Metadata<'static> = tracing::Metadata::new(
-		WASM_TRACE_IDENTIFIER, WASM_TRACE_IDENTIFIER, tracing::Level::DEBUG, None, None, None,
-		tracing_core::field::FieldSet::new(GENERIC_FIELDS, tracing_core::identify_callsite!(&CALLSITE)),
-		tracing_core::metadata::Kind::EVENT
+	static EVENT_DEBUG_METADATA: tracing_core::Metadata<'static> = tracing::Metadata::new(
+		WASM_TRACE_IDENTIFIER,
+		WASM_TRACE_IDENTIFIER,
+		tracing::Level::DEBUG,
+		None,
+		None,
+		None,
+		tracing_core::field::FieldSet::new(
+			GENERIC_FIELDS,
+			tracing_core::identify_callsite!(&CALLSITE),
+		),
+		tracing_core::metadata::Kind::EVENT,
 	);
 
-	static EVENT_TRACE_METADATA : tracing_core::Metadata<'static> = tracing::Metadata::new(
-		WASM_TRACE_IDENTIFIER, WASM_TRACE_IDENTIFIER, tracing::Level::TRACE, None, None, None,
-		tracing_core::field::FieldSet::new(GENERIC_FIELDS, tracing_core::identify_callsite!(&CALLSITE)),
-		tracing_core::metadata::Kind::EVENT
+	static EVENT_TRACE_METADATA: tracing_core::Metadata<'static> = tracing::Metadata::new(
+		WASM_TRACE_IDENTIFIER,
+		WASM_TRACE_IDENTIFIER,
+		tracing::Level::TRACE,
+		None,
+		None,
+		None,
+		tracing_core::field::FieldSet::new(
+			GENERIC_FIELDS,
+			tracing_core::identify_callsite!(&CALLSITE),
+		),
+		tracing_core::metadata::Kind::EVENT,
 	);
 
 	// FIXME: this could be done a lot in 0.2 if they opt for using `Cow<str,'static>` instead
-	//			https://github.com/paritytech/substrate/issues/7134
+	// 			https://github.com/paritytech/substrate/issues/7134
 	impl From<&crate::WasmMetadata> for &'static tracing_core::Metadata<'static> {
 		fn from(wm: &crate::WasmMetadata) -> &'static tracing_core::Metadata<'static> {
 			match (&wm.level, wm.is_span) {
@@ -586,12 +635,12 @@ mod std_features {
 			let line = a.metadata.line;
 			let module_path = std::str::from_utf8(&a.metadata.module_path).unwrap_or_default();
 			let params = a.fields;
-			let metadata : &tracing_core::metadata::Metadata<'static> = (&a.metadata).into();
+			let metadata: &tracing_core::metadata::Metadata<'static> = (&a.metadata).into();
 
 			tracing::span::Span::child_of(
 				a.parent_id.map(tracing_core::span::Id::from_u64),
 				&metadata,
-				&tracing::valueset!{ metadata.fields(), target, name, file, line, module_path, ?params }
+				&tracing::valueset! { metadata.fields(), target, name, file, line, module_path, ?params },
 			)
 		}
 	}
@@ -605,12 +654,12 @@ mod std_features {
 			let line = self.metadata.line;
 			let module_path = std::str::from_utf8(&self.metadata.module_path).unwrap_or_default();
 			let params = self.fields;
-			let metadata : &tracing_core::metadata::Metadata<'static> = (&self.metadata).into();
+			let metadata: &tracing_core::metadata::Metadata<'static> = (&self.metadata).into();
 
 			tracing_core::Event::child_of(
 				self.parent_id.map(tracing_core::span::Id::from_u64),
 				&metadata,
-				&tracing::valueset!{ metadata.fields(), target, name, file, line, module_path, ?params }
+				&tracing::valueset! { metadata.fields(), target, name, file, line, module_path, ?params },
 			)
 		}
 	}
diff --git a/primitives/transaction-pool/src/runtime_api.rs b/primitives/transaction-pool/src/runtime_api.rs
index 42542d9f3c8b..be631ee03b9d 100644
--- a/primitives/transaction-pool/src/runtime_api.rs
+++ b/primitives/transaction-pool/src/runtime_api.rs
@@ -17,8 +17,10 @@
 
 //! Tagged Transaction Queue Runtime API.
 
-use sp_runtime::transaction_validity::{TransactionValidity, TransactionSource};
-use sp_runtime::traits::Block as BlockT;
+use sp_runtime::{
+	traits::Block as BlockT,
+	transaction_validity::{TransactionSource, TransactionValidity},
+};
 
 sp_api::decl_runtime_apis! {
 	/// The `TaggedTransactionQueue` api trait for interfering with the transaction queue.
diff --git a/primitives/transaction-storage-proof/src/lib.rs b/primitives/transaction-storage-proof/src/lib.rs
index 0deee8691ff8..864d6d4084a8 100644
--- a/primitives/transaction-storage-proof/src/lib.rs
+++ b/primitives/transaction-storage-proof/src/lib.rs
@@ -20,11 +20,11 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use sp_std::{result::Result, prelude::*};
+use sp_std::{prelude::*, result::Result};
 
-use codec::{Encode, Decode};
-use sp_inherents::{InherentIdentifier, InherentData, IsFatalError};
-use sp_runtime::{traits::{Block as BlockT, NumberFor}};
+use codec::{Decode, Encode};
+use sp_inherents::{InherentData, InherentIdentifier, IsFatalError};
+use sp_runtime::traits::{Block as BlockT, NumberFor};
 
 pub use sp_inherents::Error;
 
@@ -40,7 +40,7 @@ pub const CHUNK_SIZE: usize = 256;
 #[cfg_attr(feature = "std", derive(Decode))]
 pub enum InherentError {
 	InvalidProof,
-	TrieError
+	TrieError,
 }
 
 impl IsFatalError for InherentError {
@@ -130,26 +130,20 @@ pub trait IndexedBody<B: BlockT> {
 	///
 	/// Note that this will only fetch transactions
 	/// that are indexed by the runtime with `storage_index_transaction`.
-	fn block_indexed_body(
-		&self,
-		number: NumberFor<B>,
-	) -> Result<Option<Vec<Vec<u8>>>, Error>;
+	fn block_indexed_body(&self, number: NumberFor<B>) -> Result<Option<Vec<Vec<u8>>>, Error>;
 
 	/// Get block number for a block hash.
-	fn number(
-		&self,
-		hash: B::Hash,
-	) -> Result<Option<NumberFor<B>>, Error>;
+	fn number(&self, hash: B::Hash) -> Result<Option<NumberFor<B>>, Error>;
 }
 
 #[cfg(feature = "std")]
 pub mod registration {
-	use sp_runtime::{traits::{Block as BlockT, Saturating, Zero, One}};
-	use sp_trie::TrieMut;
 	use super::*;
+	use sp_runtime::traits::{Block as BlockT, One, Saturating, Zero};
+	use sp_trie::TrieMut;
 
 	type Hasher = sp_core::Blake2Hasher;
-	type TrieLayout = sp_trie::Layout::<Hasher>;
+	type TrieLayout = sp_trie::Layout<Hasher>;
 
 	/// Create a new inherent data provider instance for a given parent block hash.
 	pub fn new_data_provider<B, C>(
@@ -166,25 +160,24 @@ pub mod registration {
 			.saturating_sub(DEFAULT_STORAGE_PERIOD.into());
 		if number.is_zero() {
 			// Too early to collect proofs.
-			return Ok(InherentDataProvider::new(None));
+			return Ok(InherentDataProvider::new(None))
 		}
 
 		let proof = match client.block_indexed_body(number)? {
-			Some(transactions) => {
-				Some(build_proof(parent.as_ref(), transactions)?)
-			},
+			Some(transactions) => Some(build_proof(parent.as_ref(), transactions)?),
 			None => {
 				// Nothing was indexed in that block.
 				None
-			}
+			},
 		};
 		Ok(InherentDataProvider::new(proof))
 	}
 
 	/// Build a proof for a given source of randomness and indexed transactions.
-	pub fn build_proof(random_hash: &[u8], transactions: Vec<Vec<u8>>)
-		-> Result<TransactionStorageProof, Error>
-	{
+	pub fn build_proof(
+		random_hash: &[u8],
+		transactions: Vec<Vec<u8>>,
+	) -> Result<TransactionStorageProof, Error> {
 		let mut db = sp_trie::MemoryDB::<Hasher>::default();
 
 		let mut target_chunk = None;
@@ -192,22 +185,25 @@ pub mod registration {
 		let mut target_chunk_key = Default::default();
 		let mut chunk_proof = Default::default();
 
-		let total_chunks: u64 = transactions.iter().map(|t| ((t.len() + CHUNK_SIZE - 1) / CHUNK_SIZE) as u64).sum();
+		let total_chunks: u64 = transactions
+			.iter()
+			.map(|t| ((t.len() + CHUNK_SIZE - 1) / CHUNK_SIZE) as u64)
+			.sum();
 		let mut buf = [0u8; 8];
 		buf.copy_from_slice(&random_hash[0..8]);
 		let random_u64 = u64::from_be_bytes(buf);
 		let target_chunk_index = random_u64 % total_chunks;
-		//Generate tries for each transaction.
+		// Generate tries for each transaction.
 		let mut chunk_index = 0;
 		for transaction in transactions {
 			let mut transaction_root = sp_trie::empty_trie_root::<TrieLayout>();
 			{
-				let mut trie = sp_trie::TrieDBMut::<TrieLayout>::new(&mut db, &mut transaction_root);
+				let mut trie =
+					sp_trie::TrieDBMut::<TrieLayout>::new(&mut db, &mut transaction_root);
 				let chunks = transaction.chunks(CHUNK_SIZE).map(|c| c.to_vec());
 				for (index, chunk) in chunks.enumerate() {
 					let index = encode_index(index as u32);
-					trie.insert(&index, &chunk)
-						.map_err(|e| Error::Application(Box::new(e)))?;
+					trie.insert(&index, &chunk).map_err(|e| Error::Application(Box::new(e)))?;
 					if chunk_index == target_chunk_index {
 						target_chunk = Some(chunk);
 						target_chunk_key = index;
@@ -221,15 +217,13 @@ pub mod registration {
 				chunk_proof = sp_trie::generate_trie_proof::<TrieLayout, _, _, _>(
 					&db,
 					transaction_root.clone(),
-					&[target_chunk_key.clone()]
-				).map_err(|e| Error::Application(Box::new(e)))?;
+					&[target_chunk_key.clone()],
+				)
+				.map_err(|e| Error::Application(Box::new(e)))?;
 			}
-		};
+		}
 
-		Ok(TransactionStorageProof {
-			proof: chunk_proof,
-			chunk: target_chunk.unwrap(),
-		})
+		Ok(TransactionStorageProof { proof: chunk_proof, chunk: target_chunk.unwrap() })
 	}
 
 	#[test]
@@ -237,11 +231,15 @@ pub mod registration {
 		use std::str::FromStr;
 		let random = [0u8; 32];
 		let proof = build_proof(&random, vec![vec![42]]).unwrap();
-		let root = sp_core::H256::from_str("0xff8611a4d212fc161dae19dd57f0f1ba9309f45d6207da13f2d3eab4c6839e91").unwrap();
+		let root = sp_core::H256::from_str(
+			"0xff8611a4d212fc161dae19dd57f0f1ba9309f45d6207da13f2d3eab4c6839e91",
+		)
+		.unwrap();
 		sp_trie::verify_trie_proof::<TrieLayout, _, _, _>(
 			&root,
 			&proof.proof,
 			&[(encode_index(0), Some(proof.chunk))],
-		).unwrap();
+		)
+		.unwrap();
 	}
 }
diff --git a/primitives/trie/benches/bench.rs b/primitives/trie/benches/bench.rs
index c2ccb31328aa..8c84c6354f2c 100644
--- a/primitives/trie/benches/bench.rs
+++ b/primitives/trie/benches/bench.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use criterion::{Criterion, criterion_group, criterion_main};
+use criterion::{criterion_group, criterion_main, Criterion};
 criterion_group!(benches, benchmark);
 criterion_main!(benches);
 
diff --git a/primitives/trie/src/error.rs b/primitives/trie/src/error.rs
index bdaa49b1156f..30a164c61475 100644
--- a/primitives/trie/src/error.rs
+++ b/primitives/trie/src/error.rs
@@ -15,10 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(feature="std")]
-use std::fmt;
-#[cfg(feature="std")]
+#[cfg(feature = "std")]
 use std::error::Error as StdError;
+#[cfg(feature = "std")]
+use std::fmt;
 
 #[derive(Debug, PartialEq, Eq, Clone)]
 /// Error for trie node decoding.
@@ -35,7 +35,7 @@ impl From<codec::Error> for Error {
 	}
 }
 
-#[cfg(feature="std")]
+#[cfg(feature = "std")]
 impl StdError for Error {
 	fn description(&self) -> &str {
 		match self {
@@ -45,7 +45,7 @@ impl StdError for Error {
 	}
 }
 
-#[cfg(feature="std")]
+#[cfg(feature = "std")]
 impl fmt::Display for Error {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		match self {
diff --git a/primitives/trie/src/lib.rs b/primitives/trie/src/lib.rs
index a496245637a5..8ba13284d379 100644
--- a/primitives/trie/src/lib.rs
+++ b/primitives/trie/src/lib.rs
@@ -20,35 +20,36 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 mod error;
-mod node_header;
 mod node_codec;
+mod node_header;
 mod storage_proof;
 mod trie_codec;
 mod trie_stream;
 
-use sp_std::{boxed::Box, marker::PhantomData, vec::Vec, borrow::Borrow};
-use hash_db::{Hasher, Prefix};
-use trie_db::proof::{generate_proof, verify_proof};
-pub use trie_db::proof::VerifyError;
 /// Our `NodeCodec`-specific error.
 pub use error::Error;
-/// The Substrate format implementation of `TrieStream`.
-pub use trie_stream::TrieStream;
-/// The Substrate format implementation of `NodeCodec`.
-pub use node_codec::NodeCodec;
-pub use storage_proof::{StorageProof, CompactProof};
-/// Various re-exports from the `trie-db` crate.
-pub use trie_db::{
-	Trie, TrieMut, DBValue, Recorder, CError, Query, TrieLayout, TrieConfiguration, nibble_ops, TrieDBIterator,
-};
-/// Various re-exports from the `memory-db` crate.
-pub use memory_db::KeyFunction;
-pub use memory_db::prefixed_key;
 /// Various re-exports from the `hash-db` crate.
 pub use hash_db::{HashDB as HashDBT, EMPTY_PREFIX};
+use hash_db::{Hasher, Prefix};
+pub use memory_db::prefixed_key;
+/// Various re-exports from the `memory-db` crate.
+pub use memory_db::KeyFunction;
+/// The Substrate format implementation of `NodeCodec`.
+pub use node_codec::NodeCodec;
+use sp_std::{borrow::Borrow, boxed::Box, marker::PhantomData, vec::Vec};
+pub use storage_proof::{CompactProof, StorageProof};
 /// Trie codec reexport, mainly child trie support
 /// for trie compact proof.
 pub use trie_codec::{decode_compact, encode_compact, Error as CompactProofError};
+pub use trie_db::proof::VerifyError;
+use trie_db::proof::{generate_proof, verify_proof};
+/// Various re-exports from the `trie-db` crate.
+pub use trie_db::{
+	nibble_ops, CError, DBValue, Query, Recorder, Trie, TrieConfiguration, TrieDBIterator,
+	TrieLayout, TrieMut,
+};
+/// The Substrate format implementation of `TrieStream`.
+pub use trie_stream::TrieStream;
 
 #[derive(Default)]
 /// substrate trie layout
@@ -62,7 +63,8 @@ impl<H: Hasher> TrieLayout for Layout<H> {
 }
 
 impl<H: Hasher> TrieConfiguration for Layout<H> {
-	fn trie_root<I, A, B>(input: I) -> <Self::Hash as Hasher>::Out where
+	fn trie_root<I, A, B>(input: I) -> <Self::Hash as Hasher>::Out
+	where
 		I: IntoIterator<Item = (A, B)>,
 		A: AsRef<[u8]> + Ord,
 		B: AsRef<[u8]>,
@@ -70,7 +72,8 @@ impl<H: Hasher> TrieConfiguration for Layout<H> {
 		trie_root::trie_root_no_extension::<H, TrieStream, _, _, _>(input)
 	}
 
-	fn trie_root_unhashed<I, A, B>(input: I) -> Vec<u8> where
+	fn trie_root_unhashed<I, A, B>(input: I) -> Vec<u8>
+	where
 		I: IntoIterator<Item = (A, B)>,
 		A: AsRef<[u8]> + Ord,
 		B: AsRef<[u8]>,
@@ -98,19 +101,14 @@ pub type HashDB<'a, H> = dyn hash_db::HashDB<H, trie_db::DBValue> + 'a;
 /// Reexport from `hash_db`, with genericity set for `Hasher` trait.
 /// This uses a `KeyFunction` for prefixing keys internally (avoiding
 /// key conflict for non random keys).
-pub type PrefixedMemoryDB<H> = memory_db::MemoryDB<
-	H, memory_db::PrefixedKey<H>, trie_db::DBValue, MemTracker
->;
+pub type PrefixedMemoryDB<H> =
+	memory_db::MemoryDB<H, memory_db::PrefixedKey<H>, trie_db::DBValue, MemTracker>;
 /// Reexport from `hash_db`, with genericity set for `Hasher` trait.
 /// This uses a noops `KeyFunction` (key addressing must be hashed or using
 /// an encoding scheme that avoid key conflict).
-pub type MemoryDB<H> = memory_db::MemoryDB<
-	H, memory_db::HashKey<H>, trie_db::DBValue, MemTracker,
->;
+pub type MemoryDB<H> = memory_db::MemoryDB<H, memory_db::HashKey<H>, trie_db::DBValue, MemTracker>;
 /// Reexport from `hash_db`, with genericity set for `Hasher` trait.
-pub type GenericMemoryDB<H, KF> = memory_db::MemoryDB<
-	H, KF, trie_db::DBValue, MemTracker
->;
+pub type GenericMemoryDB<H, KF> = memory_db::MemoryDB<H, KF, trie_db::DBValue, MemTracker>;
 
 /// Persistent trie database read-access interface for the a given hasher.
 pub type TrieDB<'a, L> = trie_db::TrieDB<'a, L>;
@@ -147,8 +145,9 @@ pub fn generate_trie_proof<'a, L: TrieConfiguration, I, K, DB>(
 	db: &DB,
 	root: TrieHash<L>,
 	keys: I,
-) -> Result<Vec<Vec<u8>>, Box<TrieError<L>>> where
-	I: IntoIterator<Item=&'a K>,
+) -> Result<Vec<Vec<u8>>, Box<TrieError<L>>>
+where
+	I: IntoIterator<Item = &'a K>,
 	K: 'a + AsRef<[u8]>,
 	DB: hash_db::HashDBRef<L::Hash, trie_db::DBValue>,
 {
@@ -168,8 +167,9 @@ pub fn verify_trie_proof<'a, L: TrieConfiguration, I, K, V>(
 	root: &TrieHash<L>,
 	proof: &[Vec<u8>],
 	items: I,
-) -> Result<(), VerifyError<TrieHash<L>, error::Error>> where
-	I: IntoIterator<Item=&'a (K, Option<V>)>,
+) -> Result<(), VerifyError<TrieHash<L>, error::Error>>
+where
+	I: IntoIterator<Item = &'a (K, Option<V>)>,
 	K: 'a + AsRef<[u8]>,
 	V: 'a + AsRef<[u8]>,
 {
@@ -180,8 +180,9 @@ pub fn verify_trie_proof<'a, L: TrieConfiguration, I, K, V>(
 pub fn delta_trie_root<L: TrieConfiguration, I, A, B, DB, V>(
 	db: &mut DB,
 	mut root: TrieHash<L>,
-	delta: I
-) -> Result<TrieHash<L>, Box<TrieError<L>>> where
+	delta: I,
+) -> Result<TrieHash<L>, Box<TrieError<L>>>
+where
 	I: IntoIterator<Item = (A, B)>,
 	A: Borrow<[u8]>,
 	B: Borrow<Option<V>>,
@@ -209,7 +210,7 @@ pub fn delta_trie_root<L: TrieConfiguration, I, A, B, DB, V>(
 pub fn read_trie_value<L: TrieConfiguration, DB: hash_db::HashDBRef<L::Hash, trie_db::DBValue>>(
 	db: &DB,
 	root: &TrieHash<L>,
-	key: &[u8]
+	key: &[u8],
 ) -> Result<Option<Vec<u8>>, Box<TrieError<L>>> {
 	TrieDB::<L>::new(&*db, root)?.get(key).map(|x| x.map(|val| val.to_vec()))
 }
@@ -217,15 +218,17 @@ pub fn read_trie_value<L: TrieConfiguration, DB: hash_db::HashDBRef<L::Hash, tri
 /// Read a value from the trie with given Query.
 pub fn read_trie_value_with<
 	L: TrieConfiguration,
-	Q: Query<L::Hash, Item=DBValue>,
-	DB: hash_db::HashDBRef<L::Hash, trie_db::DBValue>
+	Q: Query<L::Hash, Item = DBValue>,
+	DB: hash_db::HashDBRef<L::Hash, trie_db::DBValue>,
 >(
 	db: &DB,
 	root: &TrieHash<L>,
 	key: &[u8],
-	query: Q
+	query: Q,
 ) -> Result<Option<Vec<u8>>, Box<TrieError<L>>> {
-	TrieDB::<L>::new(&*db, root)?.get_with(key, query).map(|x| x.map(|val| val.to_vec()))
+	TrieDB::<L>::new(&*db, root)?
+		.get_with(key, query)
+		.map(|x| x.map(|val| val.to_vec()))
 }
 
 /// Determine the empty trie root.
@@ -240,13 +243,11 @@ pub fn empty_child_trie_root<L: TrieConfiguration>() -> <L::Hash as Hasher>::Out
 
 /// Determine a child trie root given its ordered contents, closed form. H is the default hasher,
 /// but a generic implementation may ignore this type parameter and use other hashers.
-pub fn child_trie_root<L: TrieConfiguration, I, A, B>(
-	input: I,
-) -> <L::Hash as Hasher>::Out
-	where
-		I: IntoIterator<Item = (A, B)>,
-		A: AsRef<[u8]> + Ord,
-		B: AsRef<[u8]>,
+pub fn child_trie_root<L: TrieConfiguration, I, A, B>(input: I) -> <L::Hash as Hasher>::Out
+where
+	I: IntoIterator<Item = (A, B)>,
+	A: AsRef<[u8]> + Ord,
+	B: AsRef<[u8]>,
 {
 	L::trie_root(input)
 }
@@ -259,33 +260,30 @@ pub fn child_delta_trie_root<L: TrieConfiguration, I, A, B, DB, RD, V>(
 	root_data: RD,
 	delta: I,
 ) -> Result<<L::Hash as Hasher>::Out, Box<TrieError<L>>>
-	where
-		I: IntoIterator<Item = (A, B)>,
-		A: Borrow<[u8]>,
-		B: Borrow<Option<V>>,
-		V: Borrow<[u8]>,
-		RD: AsRef<[u8]>,
-		DB: hash_db::HashDB<L::Hash, trie_db::DBValue>
+where
+	I: IntoIterator<Item = (A, B)>,
+	A: Borrow<[u8]>,
+	B: Borrow<Option<V>>,
+	V: Borrow<[u8]>,
+	RD: AsRef<[u8]>,
+	DB: hash_db::HashDB<L::Hash, trie_db::DBValue>,
 {
 	let mut root = TrieHash::<L>::default();
 	// root is fetched from DB, not writable by runtime, so it's always valid.
 	root.as_mut().copy_from_slice(root_data.as_ref());
 
 	let mut db = KeySpacedDBMut::new(&mut *db, keyspace);
-	delta_trie_root::<L, _, _, _, _, _>(
-		&mut db,
-		root,
-		delta,
-	)
+	delta_trie_root::<L, _, _, _, _, _>(&mut db, root, delta)
 }
 
 /// Record all keys for a given root.
 pub fn record_all_keys<L: TrieConfiguration, DB>(
 	db: &DB,
 	root: &TrieHash<L>,
-	recorder: &mut Recorder<TrieHash<L>>
-) -> Result<(), Box<TrieError<L>>> where
-	DB: hash_db::HashDBRef<L::Hash, trie_db::DBValue>
+	recorder: &mut Recorder<TrieHash<L>>,
+) -> Result<(), Box<TrieError<L>>>
+where
+	DB: hash_db::HashDBRef<L::Hash, trie_db::DBValue>,
 {
 	let trie = TrieDB::<L>::new(&*db, root)?;
 	let iter = trie.iter()?;
@@ -307,10 +305,10 @@ pub fn read_child_trie_value<L: TrieConfiguration, DB>(
 	keyspace: &[u8],
 	db: &DB,
 	root_slice: &[u8],
-	key: &[u8]
+	key: &[u8],
 ) -> Result<Option<Vec<u8>>, Box<TrieError<L>>>
-	where
-		DB: hash_db::HashDBRef<L::Hash, trie_db::DBValue>
+where
+	DB: hash_db::HashDBRef<L::Hash, trie_db::DBValue>,
 {
 	let mut root = TrieHash::<L>::default();
 	// root is fetched from DB, not writable by runtime, so it's always valid.
@@ -321,22 +319,24 @@ pub fn read_child_trie_value<L: TrieConfiguration, DB>(
 }
 
 /// Read a value from the child trie with given query.
-pub fn read_child_trie_value_with<L: TrieConfiguration, Q: Query<L::Hash, Item=DBValue>, DB>(
+pub fn read_child_trie_value_with<L: TrieConfiguration, Q: Query<L::Hash, Item = DBValue>, DB>(
 	keyspace: &[u8],
 	db: &DB,
 	root_slice: &[u8],
 	key: &[u8],
-	query: Q
+	query: Q,
 ) -> Result<Option<Vec<u8>>, Box<TrieError<L>>>
-	where
-		DB: hash_db::HashDBRef<L::Hash, trie_db::DBValue>
+where
+	DB: hash_db::HashDBRef<L::Hash, trie_db::DBValue>,
 {
 	let mut root = TrieHash::<L>::default();
 	// root is fetched from DB, not writable by runtime, so it's always valid.
 	root.as_mut().copy_from_slice(root_slice);
 
 	let db = KeySpacedDB::new(&*db, keyspace);
-	TrieDB::<L>::new(&db, &root)?.get_with(key, query).map(|x| x.map(|val| val.to_vec()))
+	TrieDB::<L>::new(&db, &root)?
+		.get_with(key, query)
+		.map(|x| x.map(|val| val.to_vec()))
 }
 
 /// `HashDB` implementation that append a encoded prefix (unique id bytes) in addition to the
@@ -358,7 +358,8 @@ fn keyspace_as_prefix_alloc(ks: &[u8], prefix: Prefix) -> (Vec<u8>, Option<u8>)
 	(result, prefix.1)
 }
 
-impl<'a, DB, H> KeySpacedDB<'a, DB, H> where
+impl<'a, DB, H> KeySpacedDB<'a, DB, H>
+where
 	H: Hasher,
 {
 	/// instantiate new keyspaced db
@@ -367,7 +368,8 @@ impl<'a, DB, H> KeySpacedDB<'a, DB, H> where
 	}
 }
 
-impl<'a, DB, H> KeySpacedDBMut<'a, DB, H> where
+impl<'a, DB, H> KeySpacedDBMut<'a, DB, H>
+where
 	H: Hasher,
 {
 	/// instantiate new keyspaced db
@@ -376,7 +378,8 @@ impl<'a, DB, H> KeySpacedDBMut<'a, DB, H> where
 	}
 }
 
-impl<'a, DB, H, T> hash_db::HashDBRef<H, T> for KeySpacedDB<'a, DB, H> where
+impl<'a, DB, H, T> hash_db::HashDBRef<H, T> for KeySpacedDB<'a, DB, H>
+where
 	DB: hash_db::HashDBRef<H, T>,
 	H: Hasher,
 	T: From<&'static [u8]>,
@@ -392,7 +395,8 @@ impl<'a, DB, H, T> hash_db::HashDBRef<H, T> for KeySpacedDB<'a, DB, H> where
 	}
 }
 
-impl<'a, DB, H, T> hash_db::HashDB<H, T> for KeySpacedDBMut<'a, DB, H> where
+impl<'a, DB, H, T> hash_db::HashDB<H, T> for KeySpacedDBMut<'a, DB, H>
+where
 	DB: hash_db::HashDB<H, T>,
 	H: Hasher,
 	T: Default + PartialEq<T> + for<'b> From<&'b [u8]> + Clone + Send + Sync,
@@ -423,12 +427,15 @@ impl<'a, DB, H, T> hash_db::HashDB<H, T> for KeySpacedDBMut<'a, DB, H> where
 	}
 }
 
-impl<'a, DB, H, T> hash_db::AsHashDB<H, T> for KeySpacedDBMut<'a, DB, H> where
+impl<'a, DB, H, T> hash_db::AsHashDB<H, T> for KeySpacedDBMut<'a, DB, H>
+where
 	DB: hash_db::HashDB<H, T>,
 	H: Hasher,
 	T: Default + PartialEq<T> + for<'b> From<&'b [u8]> + Clone + Send + Sync,
 {
-	fn as_hash_db(&self) -> &dyn hash_db::HashDB<H, T> { &*self }
+	fn as_hash_db(&self) -> &dyn hash_db::HashDB<H, T> {
+		&*self
+	}
 
 	fn as_hash_db_mut<'b>(&'b mut self) -> &'b mut (dyn hash_db::HashDB<H, T> + 'b) {
 		&mut *self
@@ -447,12 +454,12 @@ mod trie_constants {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use codec::{Encode, Decode, Compact};
-	use sp_core::Blake2Hasher;
+	use codec::{Compact, Decode, Encode};
 	use hash_db::{HashDB, Hasher};
-	use trie_db::{DBValue, TrieMut, Trie, NodeCodec as NodeCodecT};
-	use trie_standardmap::{Alphabet, ValueMode, StandardMap};
 	use hex_literal::hex;
+	use sp_core::Blake2Hasher;
+	use trie_db::{DBValue, NodeCodec as NodeCodecT, Trie, TrieMut};
+	use trie_standardmap::{Alphabet, StandardMap, ValueMode};
 
 	type Layout = super::Layout<Blake2Hasher>;
 
@@ -491,7 +498,8 @@ mod tests {
 			let t = TrieDB::<T>::new(&mut memdb, &root).unwrap();
 			assert_eq!(
 				input.iter().map(|(i, j)| (i.to_vec(), j.to_vec())).collect::<Vec<_>>(),
-				t.iter().unwrap()
+				t.iter()
+					.unwrap()
 					.map(|x| x.map(|y| (y.0, y.1.to_vec())).unwrap())
 					.collect::<Vec<_>>()
 			);
@@ -505,9 +513,11 @@ mod tests {
 		let mut empty = TrieDBMut::<Layout>::new(&mut db, &mut root);
 		empty.commit();
 		let root1 = empty.root().as_ref().to_vec();
-		let root2: Vec<u8> = Layout::trie_root::<_, Vec<u8>, Vec<u8>>(
-			std::iter::empty(),
-		).as_ref().iter().cloned().collect();
+		let root2: Vec<u8> = Layout::trie_root::<_, Vec<u8>, Vec<u8>>(std::iter::empty())
+			.as_ref()
+			.iter()
+			.cloned()
+			.collect();
 
 		assert_eq!(root1, root2);
 	}
@@ -528,20 +538,16 @@ mod tests {
 
 	#[test]
 	fn branch_is_equivalent() {
-		let input: Vec<(&[u8], &[u8])> = vec![
-			(&[0xaa][..], &[0x10][..]),
-			(&[0xba][..], &[0x11][..]),
-		];
+		let input: Vec<(&[u8], &[u8])> =
+			vec![(&[0xaa][..], &[0x10][..]), (&[0xba][..], &[0x11][..])];
 		check_equivalent::<Layout>(&input);
 		check_iteration::<Layout>(&input);
 	}
 
 	#[test]
 	fn extension_and_branch_is_equivalent() {
-		let input: Vec<(&[u8], &[u8])> = vec![
-			(&[0xaa][..], &[0x10][..]),
-			(&[0xab][..], &[0x11][..]),
-		];
+		let input: Vec<(&[u8], &[u8])> =
+			vec![(&[0xaa][..], &[0x10][..]), (&[0xab][..], &[0x11][..])];
 		check_equivalent::<Layout>(&input);
 		check_iteration::<Layout>(&input);
 	}
@@ -567,7 +573,7 @@ mod tests {
 		let input: Vec<(&[u8], &[u8])> = vec![
 			(&[0xaa][..], &[0xa0][..]),
 			(&[0xaa, 0xaa][..], &[0xaa][..]),
-			(&[0xaa, 0xbb][..], &[0xab][..])
+			(&[0xaa, 0xbb][..], &[0xab][..]),
 		];
 		check_equivalent::<Layout>(&input);
 		check_iteration::<Layout>(&input);
@@ -590,7 +596,10 @@ mod tests {
 	#[test]
 	fn single_long_leaf_is_equivalent() {
 		let input: Vec<(&[u8], &[u8])> = vec![
-			(&[0xaa][..], &b"ABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABC"[..]),
+			(
+				&[0xaa][..],
+				&b"ABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABC"[..],
+			),
 			(&[0xba][..], &[0x11][..]),
 		];
 		check_equivalent::<Layout>(&input);
@@ -600,8 +609,14 @@ mod tests {
 	#[test]
 	fn two_long_leaves_is_equivalent() {
 		let input: Vec<(&[u8], &[u8])> = vec![
-			(&[0xaa][..], &b"ABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABC"[..]),
-			(&[0xba][..], &b"ABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABC"[..])
+			(
+				&[0xaa][..],
+				&b"ABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABC"[..],
+			),
+			(
+				&[0xba][..],
+				&b"ABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABCABC"[..],
+			),
 		];
 		check_equivalent::<Layout>(&input);
 		check_iteration::<Layout>(&input);
@@ -610,11 +625,11 @@ mod tests {
 	fn populate_trie<'db, T: TrieConfiguration>(
 		db: &'db mut dyn HashDB<T::Hash, DBValue>,
 		root: &'db mut TrieHash<T>,
-		v: &[(Vec<u8>, Vec<u8>)]
+		v: &[(Vec<u8>, Vec<u8>)],
 	) -> TrieDBMut<'db, T> {
 		let mut t = TrieDBMut::<T>::new(db, root);
 		for i in 0..v.len() {
-			let key: &[u8]= &v[i].0;
+			let key: &[u8] = &v[i].0;
 			let val: &[u8] = &v[i].1;
 			t.insert(key, val).unwrap();
 		}
@@ -626,7 +641,7 @@ mod tests {
 		v: &[(Vec<u8>, Vec<u8>)],
 	) {
 		for i in v {
-			let key: &[u8]= &i.0;
+			let key: &[u8] = &i.0;
 			t.remove(key).unwrap();
 		}
 	}
@@ -644,7 +659,8 @@ mod tests {
 				journal_key: 0,
 				value_mode: ValueMode::Index,
 				count: 100,
-			}.make_with(seed.as_fixed_bytes_mut());
+			}
+			.make_with(seed.as_fixed_bytes_mut());
 
 			let real = Layout::trie_root(x.clone());
 			let mut memdb = MemoryDB::default();
@@ -690,17 +706,18 @@ mod tests {
 
 	#[test]
 	fn codec_trie_single_tuple() {
-		let input = vec![
-			(vec![0xaa], vec![0xbb])
-		];
+		let input = vec![(vec![0xaa], vec![0xbb])];
 		let trie = Layout::trie_root_unhashed::<_, _, _>(input);
 		println!("trie: {:#x?}", trie);
-		assert_eq!(trie, vec![
-			0x42,					// leaf 0x40 (2^6) with (+) key of 2 nibbles (0x02)
-			0xaa,					// key data
-			to_compact(1),			// length of value in bytes as Compact
-			0xbb					// value data
-		]);
+		assert_eq!(
+			trie,
+			vec![
+				0x42,          // leaf 0x40 (2^6) with (+) key of 2 nibbles (0x02)
+				0xaa,          // key data
+				to_compact(1), // length of value in bytes as Compact
+				0xbb           // value data
+			]
+		);
 	}
 
 	#[test]
@@ -709,21 +726,21 @@ mod tests {
 		let trie = Layout::trie_root_unhashed::<_, _, _>(input);
 		println!("trie: {:#x?}", trie);
 		let mut ex = Vec::<u8>::new();
-		ex.push(0x80);									// branch, no value (0b_10..) no nibble
-		ex.push(0x12);									// slots 1 & 4 are taken from 0-7
-		ex.push(0x00);									// no slots from 8-15
-		ex.push(to_compact(0x05));						// first slot: LEAF, 5 bytes long.
-		ex.push(0x43);									// leaf 0x40 with 3 nibbles
-		ex.push(0x03);									// first nibble
-		ex.push(0x14);									// second & third nibble
-		ex.push(to_compact(0x01));						// 1 byte data
-		ex.push(0xff);									// value data
-		ex.push(to_compact(0x05));						// second slot: LEAF, 5 bytes long.
-		ex.push(0x43);									// leaf with 3 nibbles
-		ex.push(0x08);									// first nibble
-		ex.push(0x19);									// second & third nibble
-		ex.push(to_compact(0x01));						// 1 byte data
-		ex.push(0xfe);									// value data
+		ex.push(0x80); // branch, no value (0b_10..) no nibble
+		ex.push(0x12); // slots 1 & 4 are taken from 0-7
+		ex.push(0x00); // no slots from 8-15
+		ex.push(to_compact(0x05)); // first slot: LEAF, 5 bytes long.
+		ex.push(0x43); // leaf 0x40 with 3 nibbles
+		ex.push(0x03); // first nibble
+		ex.push(0x14); // second & third nibble
+		ex.push(to_compact(0x01)); // 1 byte data
+		ex.push(0xff); // value data
+		ex.push(to_compact(0x05)); // second slot: LEAF, 5 bytes long.
+		ex.push(0x43); // leaf with 3 nibbles
+		ex.push(0x08); // first nibble
+		ex.push(0x19); // second & third nibble
+		ex.push(to_compact(0x01)); // 1 byte data
+		ex.push(0xfe); // value data
 
 		assert_eq!(trie, ex);
 	}
@@ -763,27 +780,25 @@ mod tests {
 		populate_trie::<Layout>(&mut memdb, &mut root, &pairs);
 
 		let non_included_key: Vec<u8> = hex!("0909").to_vec();
-		let proof = generate_trie_proof::<Layout, _, _, _>(
-			&memdb,
-			root,
-			&[non_included_key.clone()]
-		).unwrap();
+		let proof =
+			generate_trie_proof::<Layout, _, _, _>(&memdb, root, &[non_included_key.clone()])
+				.unwrap();
 
 		// Verifying that the K was not included into the trie should work.
 		assert!(verify_trie_proof::<Layout, _, _, Vec<u8>>(
-				&root,
-				&proof,
-				&[(non_included_key.clone(), None)],
-			).is_ok()
-		);
+			&root,
+			&proof,
+			&[(non_included_key.clone(), None)],
+		)
+		.is_ok());
 
 		// Verifying that the K was included into the trie should fail.
 		assert!(verify_trie_proof::<Layout, _, _, Vec<u8>>(
-				&root,
-				&proof,
-				&[(non_included_key, Some(hex!("1010").to_vec()))],
-			).is_err()
-		);
+			&root,
+			&proof,
+			&[(non_included_key, Some(hex!("1010").to_vec()))],
+		)
+		.is_err());
 	}
 
 	#[test]
@@ -797,71 +812,71 @@ mod tests {
 		let mut root = Default::default();
 		populate_trie::<Layout>(&mut memdb, &mut root, &pairs);
 
-		let proof = generate_trie_proof::<Layout, _, _, _>(
-			&memdb,
-			root,
-			&[pairs[0].0.clone()]
-		).unwrap();
+		let proof =
+			generate_trie_proof::<Layout, _, _, _>(&memdb, root, &[pairs[0].0.clone()]).unwrap();
 
 		// Check that a K, V included into the proof are verified.
 		assert!(verify_trie_proof::<Layout, _, _, _>(
-				&root,
-				&proof,
-				&[(pairs[0].0.clone(), Some(pairs[0].1.clone()))]
-			).is_ok()
-		);
+			&root,
+			&proof,
+			&[(pairs[0].0.clone(), Some(pairs[0].1.clone()))]
+		)
+		.is_ok());
 
 		// Absence of the V is not verified with the proof that has K, V included.
 		assert!(verify_trie_proof::<Layout, _, _, Vec<u8>>(
-				&root,
-				&proof,
-				&[(pairs[0].0.clone(), None)]
-			).is_err()
-		);
+			&root,
+			&proof,
+			&[(pairs[0].0.clone(), None)]
+		)
+		.is_err());
 
 		// K not included into the trie is not verified.
 		assert!(verify_trie_proof::<Layout, _, _, _>(
-				&root,
-				&proof,
-				&[(hex!("4242").to_vec(), Some(pairs[0].1.clone()))]
-			).is_err()
-		);
+			&root,
+			&proof,
+			&[(hex!("4242").to_vec(), Some(pairs[0].1.clone()))]
+		)
+		.is_err());
 
 		// K included into the trie but not included into the proof is not verified.
 		assert!(verify_trie_proof::<Layout, _, _, _>(
-				&root,
-				&proof,
-				&[(pairs[1].0.clone(), Some(pairs[1].1.clone()))]
-			).is_err()
-		);
+			&root,
+			&proof,
+			&[(pairs[1].0.clone(), Some(pairs[1].1.clone()))]
+		)
+		.is_err());
 	}
 
 	#[test]
 	fn generate_storage_root_with_proof_works_independently_from_the_delta_order() {
 		let proof = StorageProof::decode(&mut &include_bytes!("../test-res/proof")[..]).unwrap();
-		let storage_root = sp_core::H256::decode(
-			&mut &include_bytes!("../test-res/storage_root")[..],
-		).unwrap();
+		let storage_root =
+			sp_core::H256::decode(&mut &include_bytes!("../test-res/storage_root")[..]).unwrap();
 		// Delta order that is "invalid" so that it would require a different proof.
 		let invalid_delta = Vec::<(Vec<u8>, Option<Vec<u8>>)>::decode(
 			&mut &include_bytes!("../test-res/invalid-delta-order")[..],
-		).unwrap();
+		)
+		.unwrap();
 		// Delta order that is "valid"
 		let valid_delta = Vec::<(Vec<u8>, Option<Vec<u8>>)>::decode(
 			&mut &include_bytes!("../test-res/valid-delta-order")[..],
-		).unwrap();
+		)
+		.unwrap();
 
 		let proof_db = proof.into_memory_db::<Blake2Hasher>();
 		let first_storage_root = delta_trie_root::<Layout, _, _, _, _, _>(
 			&mut proof_db.clone(),
 			storage_root,
 			valid_delta,
-		).unwrap();
+		)
+		.unwrap();
 		let second_storage_root = delta_trie_root::<Layout, _, _, _, _, _>(
 			&mut proof_db.clone(),
 			storage_root,
 			invalid_delta,
-		).unwrap();
+		)
+		.unwrap();
 
 		assert_eq!(first_storage_root, second_storage_root);
 	}
diff --git a/primitives/trie/src/node_codec.rs b/primitives/trie/src/node_codec.rs
index 296f03972c79..d5ffb3219cf6 100644
--- a/primitives/trie/src/node_codec.rs
+++ b/primitives/trie/src/node_codec.rs
@@ -17,17 +17,16 @@
 
 //! `NodeCodec` implementation for Substrate's trie format.
 
-use sp_std::marker::PhantomData;
-use sp_std::ops::Range;
-use sp_std::vec::Vec;
-use sp_std::borrow::Borrow;
-use codec::{Encode, Decode, Input, Compact};
+use super::node_header::{NodeHeader, NodeKind};
+use crate::{error::Error, trie_constants};
+use codec::{Compact, Decode, Encode, Input};
 use hash_db::Hasher;
-use trie_db::{self, node::{NibbleSlicePlan, NodePlan, NodeHandlePlan}, ChildReference,
-	nibble_ops, Partial, NodeCodec as NodeCodecT};
-use crate::error::Error;
-use crate::trie_constants;
-use super::{node_header::{NodeHeader, NodeKind}};
+use sp_std::{borrow::Borrow, marker::PhantomData, ops::Range, vec::Vec};
+use trie_db::{
+	self, nibble_ops,
+	node::{NibbleSlicePlan, NodeHandlePlan, NodePlan},
+	ChildReference, NodeCodec as NodeCodecT, Partial,
+};
 
 /// Helper struct for trie node decoder. This implements `codec::Input` on a byte slice, while
 /// tracking the absolute position. This is similar to `std::io::Cursor` but does not implement
@@ -39,15 +38,12 @@ struct ByteSliceInput<'a> {
 
 impl<'a> ByteSliceInput<'a> {
 	fn new(data: &'a [u8]) -> Self {
-		ByteSliceInput {
-			data,
-			offset: 0,
-		}
+		ByteSliceInput { data, offset: 0 }
 	}
 
 	fn take(&mut self, count: usize) -> Result<Range<usize>, codec::Error> {
 		if self.offset + count > self.data.len() {
-			return Err("out of data".into());
+			return Err("out of data".into())
 		}
 
 		let range = self.offset..(self.offset + count);
@@ -58,11 +54,8 @@ impl<'a> ByteSliceInput<'a> {
 
 impl<'a> Input for ByteSliceInput<'a> {
 	fn remaining_len(&mut self) -> Result<Option<usize>, codec::Error> {
-		let remaining = if self.offset <= self.data.len() {
-			Some(self.data.len() - self.offset)
-		} else {
-			None
-		};
+		let remaining =
+			if self.offset <= self.data.len() { Some(self.data.len() - self.offset) } else { None };
 		Ok(remaining)
 	}
 
@@ -74,7 +67,7 @@ impl<'a> Input for ByteSliceInput<'a> {
 
 	fn read_byte(&mut self) -> Result<u8, codec::Error> {
 		if self.offset + 1 > self.data.len() {
-			return Err("out of data".into());
+			return Err("out of data".into())
 		}
 
 		let byte = self.data[self.offset];
@@ -103,10 +96,11 @@ impl<H: Hasher> NodeCodecT for NodeCodec<H> {
 				let padding = nibble_count % nibble_ops::NIBBLE_PER_BYTE != 0;
 				// check that the padding is valid (if any)
 				if padding && nibble_ops::pad_left(data[input.offset]) != 0 {
-					return Err(Error::BadFormat);
+					return Err(Error::BadFormat)
 				}
 				let partial = input.take(
-					(nibble_count + (nibble_ops::NIBBLE_PER_BYTE - 1)) / nibble_ops::NIBBLE_PER_BYTE,
+					(nibble_count + (nibble_ops::NIBBLE_PER_BYTE - 1)) /
+						nibble_ops::NIBBLE_PER_BYTE,
 				)?;
 				let partial_padding = nibble_ops::number_padding(nibble_count);
 				let bitmap_range = input.take(BITMAP_LENGTH)?;
@@ -118,8 +112,8 @@ impl<H: Hasher> NodeCodecT for NodeCodec<H> {
 					None
 				};
 				let mut children = [
-					None, None, None, None, None, None, None, None,
-					None, None, None, None, None, None, None, None,
+					None, None, None, None, None, None, None, None, None, None, None, None, None,
+					None, None, None,
 				];
 				for i in 0..nibble_ops::NIBBLE_LENGTH {
 					if bitmap.value_at(i) {
@@ -137,15 +131,16 @@ impl<H: Hasher> NodeCodecT for NodeCodec<H> {
 					value,
 					children,
 				})
-			}
+			},
 			NodeHeader::Leaf(nibble_count) => {
 				let padding = nibble_count % nibble_ops::NIBBLE_PER_BYTE != 0;
 				// check that the padding is valid (if any)
 				if padding && nibble_ops::pad_left(data[input.offset]) != 0 {
-					return Err(Error::BadFormat);
+					return Err(Error::BadFormat)
 				}
 				let partial = input.take(
-					(nibble_count + (nibble_ops::NIBBLE_PER_BYTE - 1)) / nibble_ops::NIBBLE_PER_BYTE,
+					(nibble_count + (nibble_ops::NIBBLE_PER_BYTE - 1)) /
+						nibble_ops::NIBBLE_PER_BYTE,
 				)?;
 				let partial_padding = nibble_ops::number_padding(nibble_count);
 				let count = <Compact<u32>>::decode(&mut input)?.0 as usize;
@@ -153,7 +148,7 @@ impl<H: Hasher> NodeCodecT for NodeCodec<H> {
 					partial: NibbleSlicePlan::new(partial, partial_padding),
 					value: input.take(count)?,
 				})
-			}
+			},
 		}
 	}
 
@@ -199,26 +194,28 @@ impl<H: Hasher> NodeCodecT for NodeCodec<H> {
 		};
 		let bitmap_index = output.len();
 		let mut bitmap: [u8; BITMAP_LENGTH] = [0; BITMAP_LENGTH];
-		(0..BITMAP_LENGTH).for_each(|_|output.push(0));
+		(0..BITMAP_LENGTH).for_each(|_| output.push(0));
 		if let Some(value) = maybe_value {
 			value.encode_to(&mut output);
 		};
-		Bitmap::encode(children.map(|maybe_child| match maybe_child.borrow() {
-			Some(ChildReference::Hash(h)) => {
-				h.as_ref().encode_to(&mut output);
-				true
-			}
-			&Some(ChildReference::Inline(inline_data, len)) => {
-				inline_data.as_ref()[..len].encode_to(&mut output);
-				true
-			}
-			None => false,
-		}), bitmap.as_mut());
+		Bitmap::encode(
+			children.map(|maybe_child| match maybe_child.borrow() {
+				Some(ChildReference::Hash(h)) => {
+					h.as_ref().encode_to(&mut output);
+					true
+				},
+				&Some(ChildReference::Inline(inline_data, len)) => {
+					inline_data.as_ref()[..len].encode_to(&mut output);
+					true
+				},
+				None => false,
+			}),
+			bitmap.as_mut(),
+		);
 		output[bitmap_index..bitmap_index + BITMAP_LENGTH]
 			.copy_from_slice(&bitmap[..BITMAP_LENGTH]);
 		output
 	}
-
 }
 
 // utils
@@ -280,11 +277,13 @@ impl Bitmap {
 		self.0 & (1u16 << i) != 0
 	}
 
-	pub fn encode<I: Iterator<Item = bool>>(has_children: I , dest: &mut [u8]) {
+	pub fn encode<I: Iterator<Item = bool>>(has_children: I, dest: &mut [u8]) {
 		let mut bitmap: u16 = 0;
 		let mut cursor: u16 = 1;
 		for v in has_children {
-			if v { bitmap |= cursor }
+			if v {
+				bitmap |= cursor
+			}
 			cursor <<= 1;
 		}
 		dest[0] = (bitmap % 256) as u8;
diff --git a/primitives/trie/src/node_header.rs b/primitives/trie/src/node_header.rs
index 0fdf6fefbd0b..9f05113a3593 100644
--- a/primitives/trie/src/node_header.rs
+++ b/primitives/trie/src/node_header.rs
@@ -18,12 +18,11 @@
 //! The node header.
 
 use crate::trie_constants;
-use codec::{Encode, Decode, Input, Output};
+use codec::{Decode, Encode, Input, Output};
 use sp_std::iter::once;
 
 /// A node header
-#[derive(Copy, Clone, PartialEq, Eq)]
-#[derive(sp_core::RuntimeDebug)]
+#[derive(Copy, Clone, PartialEq, Eq, sp_core::RuntimeDebug)]
 pub(crate) enum NodeHeader {
 	Null,
 	Branch(bool, usize),
@@ -41,7 +40,7 @@ impl Encode for NodeHeader {
 	fn encode_to<T: Output + ?Sized>(&self, output: &mut T) {
 		match self {
 			NodeHeader::Null => output.push_byte(trie_constants::EMPTY_TRIE),
-			NodeHeader::Branch(true, nibble_count)	=>
+			NodeHeader::Branch(true, nibble_count) =>
 				encode_size_and_prefix(*nibble_count, trie_constants::BRANCH_WITH_MASK, output),
 			NodeHeader::Branch(false, nibble_count) =>
 				encode_size_and_prefix(*nibble_count, trie_constants::BRANCH_WITHOUT_MASK, output),
@@ -57,12 +56,14 @@ impl Decode for NodeHeader {
 	fn decode<I: Input>(input: &mut I) -> Result<Self, codec::Error> {
 		let i = input.read_byte()?;
 		if i == trie_constants::EMPTY_TRIE {
-			return Ok(NodeHeader::Null);
+			return Ok(NodeHeader::Null)
 		}
 		match i & (0b11 << 6) {
 			trie_constants::LEAF_PREFIX_MASK => Ok(NodeHeader::Leaf(decode_size(i, input)?)),
-			trie_constants::BRANCH_WITHOUT_MASK => Ok(NodeHeader::Branch(false, decode_size(i, input)?)),
-			trie_constants::BRANCH_WITH_MASK => Ok(NodeHeader::Branch(true, decode_size(i, input)?)),
+			trie_constants::BRANCH_WITHOUT_MASK =>
+				Ok(NodeHeader::Branch(false, decode_size(i, input)?)),
+			trie_constants::BRANCH_WITH_MASK =>
+				Ok(NodeHeader::Branch(true, decode_size(i, input)?)),
 			// do not allow any special encoding
 			_ => Err("Unallowed encoding".into()),
 		}
@@ -76,11 +77,8 @@ pub(crate) fn size_and_prefix_iterator(size: usize, prefix: u8) -> impl Iterator
 	let size = sp_std::cmp::min(trie_constants::NIBBLE_SIZE_BOUND, size);
 
 	let l1 = sp_std::cmp::min(62, size);
-	let (first_byte, mut rem) = if size == l1 {
-		(once(prefix + l1 as u8), 0)
-	} else {
-		(once(prefix + 63), size - l1)
-	};
+	let (first_byte, mut rem) =
+		if size == l1 { (once(prefix + l1 as u8), 0) } else { (once(prefix + 63), size - l1) };
 	let next_bytes = move || {
 		if rem > 0 {
 			if rem < 256 {
@@ -109,13 +107,13 @@ fn encode_size_and_prefix<W: Output + ?Sized>(size: usize, prefix: u8, out: &mut
 fn decode_size(first: u8, input: &mut impl Input) -> Result<usize, codec::Error> {
 	let mut result = (first & 255u8 >> 2) as usize;
 	if result < 63 {
-		return Ok(result);
+		return Ok(result)
 	}
 	result -= 1;
 	while result <= trie_constants::NIBBLE_SIZE_BOUND {
 		let n = input.read_byte()? as usize;
 		if n < 255 {
-			return Ok(result + n + 1);
+			return Ok(result + n + 1)
 		}
 		result += 255;
 	}
diff --git a/primitives/trie/src/storage_proof.rs b/primitives/trie/src/storage_proof.rs
index 03668920509b..b4e4b393a71a 100644
--- a/primitives/trie/src/storage_proof.rs
+++ b/primitives/trie/src/storage_proof.rs
@@ -15,9 +15,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use codec::{Decode, Encode};
+use hash_db::{HashDB, Hasher};
 use sp_std::vec::Vec;
-use codec::{Encode, Decode};
-use hash_db::{Hasher, HashDB};
 
 /// A proof that some set of key-value pairs are included in the storage trie. The proof contains
 /// the storage values so that the partial storage backend can be reconstructed by a verifier that
@@ -48,9 +48,7 @@ impl StorageProof {
 	/// An empty proof is capable of only proving trivial statements (ie. that an empty set of
 	/// key-value pairs exist in storage).
 	pub fn empty() -> Self {
-		StorageProof {
-			trie_nodes: Vec::new(),
-		}
+		StorageProof { trie_nodes: Vec::new() }
 	}
 
 	/// Returns whether this is an empty proof.
@@ -76,8 +74,12 @@ impl StorageProof {
 	/// Merges multiple storage proofs covering potentially different sets of keys into one proof
 	/// covering all keys. The merged proof output may be smaller than the aggregate size of the input
 	/// proofs due to deduplication of trie nodes.
-	pub fn merge<I>(proofs: I) -> Self where I: IntoIterator<Item=Self> {
-		let trie_nodes = proofs.into_iter()
+	pub fn merge<I>(proofs: I) -> Self
+	where
+		I: IntoIterator<Item = Self>,
+	{
+		let trie_nodes = proofs
+			.into_iter()
 			.flat_map(|proof| proof.iter_nodes())
 			.collect::<sp_std::collections::btree_set::BTreeSet<_>>()
 			.into_iter()
@@ -94,7 +96,7 @@ impl StorageProof {
 	) -> Result<CompactProof, crate::CompactProofError<crate::Layout<H>>> {
 		crate::encode_compact::<crate::Layout<H>>(self, root)
 	}
-	
+
 	/// Returns the estimated encoded size of the compact proof.
 	///
 	/// Runing this operation is a slow operation (build the whole compact proof) and should only be
@@ -104,7 +106,6 @@ impl StorageProof {
 		let compact_proof = self.into_compact_proof::<H>(root);
 		compact_proof.ok().map(|p| p.encoded_size())
 	}
-
 }
 
 impl CompactProof {
@@ -127,13 +128,15 @@ impl CompactProof {
 			self.iter_compact_encoded_nodes(),
 			expected_root,
 		)?;
-		Ok((StorageProof::new(db.drain().into_iter().filter_map(|kv|
-			if (kv.1).1 > 0 {
-				Some((kv.1).0)
-			} else {
-				None
-			}
-		).collect()), root))
+		Ok((
+			StorageProof::new(
+				db.drain()
+					.into_iter()
+					.filter_map(|kv| if (kv.1).1 > 0 { Some((kv.1).0) } else { None })
+					.collect(),
+			),
+			root,
+		))
 	}
 }
 
@@ -145,9 +148,7 @@ pub struct StorageProofNodeIterator {
 
 impl StorageProofNodeIterator {
 	fn new(proof: StorageProof) -> Self {
-		StorageProofNodeIterator {
-			inner: proof.trie_nodes.into_iter(),
-		}
+		StorageProofNodeIterator { inner: proof.trie_nodes.into_iter() }
 	}
 }
 
diff --git a/primitives/trie/src/trie_codec.rs b/primitives/trie/src/trie_codec.rs
index efe3223580f3..ed5724e0455d 100644
--- a/primitives/trie/src/trie_codec.rs
+++ b/primitives/trie/src/trie_codec.rs
@@ -21,17 +21,14 @@
 //! it to substrate specific layout and child trie system.
 
 use crate::{
-	EMPTY_PREFIX, HashDBT, TrieHash, TrieError, TrieConfiguration,
-	CompactProof, StorageProof,
+	CompactProof, HashDBT, StorageProof, TrieConfiguration, TrieError, TrieHash, EMPTY_PREFIX,
 };
-use sp_std::boxed::Box;
-use sp_std::vec::Vec;
-use trie_db::Trie;
-#[cfg(feature="std")]
-use std::fmt;
-#[cfg(feature="std")]
+use sp_std::{boxed::Box, vec::Vec};
+#[cfg(feature = "std")]
 use std::error::Error as StdError;
-
+#[cfg(feature = "std")]
+use std::fmt;
+use trie_db::Trie;
 
 /// Error for trie node decoding.
 pub enum Error<L: TrieConfiguration> {
@@ -55,7 +52,7 @@ impl<L: TrieConfiguration> From<Box<TrieError<L>>> for Error<L> {
 	}
 }
 
-#[cfg(feature="std")]
+#[cfg(feature = "std")]
 impl<L: TrieConfiguration> StdError for Error<L> {
 	fn description(&self) -> &str {
 		match self {
@@ -69,14 +66,14 @@ impl<L: TrieConfiguration> StdError for Error<L> {
 	}
 }
 
-#[cfg(feature="std")]
+#[cfg(feature = "std")]
 impl<L: TrieConfiguration> fmt::Debug for Error<L> {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		<Self as fmt::Display>::fmt(&self, f)
 	}
 }
 
-#[cfg(feature="std")]
+#[cfg(feature = "std")]
 impl<L: TrieConfiguration> fmt::Display for Error<L> {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		match self {
@@ -84,7 +81,8 @@ impl<L: TrieConfiguration> fmt::Display for Error<L> {
 			Error::TrieError(e) => write!(f, "Trie error: {}", e),
 			Error::IncompleteProof => write!(f, "Incomplete proof"),
 			Error::ExtraneousChildNode => write!(f, "Child node content with no root in proof"),
-			Error::ExtraneousChildProof(root) => write!(f, "Proof of child trie {:x?} not in parent proof", root.as_ref()),
+			Error::ExtraneousChildProof(root) =>
+				write!(f, "Proof of child trie {:x?} not in parent proof", root.as_ref()),
 			Error::RootMismatch(root, expected) => write!(
 				f,
 				"Verification error, root is {:x?}, expected: {:x?}",
@@ -107,21 +105,19 @@ pub fn decode_compact<'a, L, DB, I>(
 	encoded: I,
 	expected_root: Option<&TrieHash<L>>,
 ) -> Result<TrieHash<L>, Error<L>>
-	where
-		L: TrieConfiguration,
-		DB: HashDBT<L::Hash, trie_db::DBValue> + hash_db::HashDBRef<L::Hash, trie_db::DBValue>,
-		I: IntoIterator<Item = &'a [u8]>,
+where
+	L: TrieConfiguration,
+	DB: HashDBT<L::Hash, trie_db::DBValue> + hash_db::HashDBRef<L::Hash, trie_db::DBValue>,
+	I: IntoIterator<Item = &'a [u8]>,
 {
 	let mut nodes_iter = encoded.into_iter();
-	let (top_root, _nb_used) = trie_db::decode_compact_from_iter::<L, _, _, _>(
-		db,
-		&mut nodes_iter,
-	)?;
+	let (top_root, _nb_used) =
+		trie_db::decode_compact_from_iter::<L, _, _, _>(db, &mut nodes_iter)?;
 
 	// Only check root if expected root is passed as argument.
 	if let Some(expected_root) = expected_root {
 		if expected_root != &top_root {
-			return Err(Error::RootMismatch(top_root.clone(), expected_root.clone()));
+			return Err(Error::RootMismatch(top_root.clone(), expected_root.clone()))
 		}
 	}
 
@@ -142,7 +138,7 @@ pub fn decode_compact<'a, L, DB, I>(
 						let mut root = TrieHash::<L>::default();
 						// still in a proof so prevent panic
 						if root.as_mut().len() != value.as_slice().len() {
-							return Err(Error::InvalidChildRoot(key, value));
+							return Err(Error::InvalidChildRoot(key, value))
 						}
 						root.as_mut().copy_from_slice(value.as_ref());
 						child_tries.push(root);
@@ -160,16 +156,14 @@ pub fn decode_compact<'a, L, DB, I>(
 	}
 
 	if !HashDBT::<L::Hash, _>::contains(db, &top_root, EMPTY_PREFIX) {
-		return Err(Error::IncompleteProof);
+		return Err(Error::IncompleteProof)
 	}
 
 	let mut previous_extracted_child_trie = None;
 	for child_root in child_tries.into_iter() {
 		if previous_extracted_child_trie.is_none() {
-			let (top_root, _) = trie_db::decode_compact_from_iter::<L, _, _, _>(
-				db,
-				&mut nodes_iter,
-			)?;
+			let (top_root, _) =
+				trie_db::decode_compact_from_iter::<L, _, _, _>(db, &mut nodes_iter)?;
 			previous_extracted_child_trie = Some(top_root);
 		}
 
@@ -184,11 +178,11 @@ pub fn decode_compact<'a, L, DB, I>(
 	if let Some(child_root) = previous_extracted_child_trie {
 		// A child root was read from proof but is not present
 		// in top trie.
-		return Err(Error::ExtraneousChildProof(child_root));
+		return Err(Error::ExtraneousChildProof(child_root))
 	}
 
 	if nodes_iter.next().is_some() {
-		return Err(Error::ExtraneousChildNode);
+		return Err(Error::ExtraneousChildNode)
 	}
 
 	Ok(top_root)
@@ -201,12 +195,9 @@ pub fn decode_compact<'a, L, DB, I>(
 /// Then parse all child trie root and compress main trie content first
 /// then all child trie contents.
 /// Child trie are ordered by the order of their roots in the top trie.
-pub fn encode_compact<L>(
-	proof: StorageProof,
-	root: TrieHash<L>,
-) -> Result<CompactProof, Error<L>>
-	where
-		L: TrieConfiguration,
+pub fn encode_compact<L>(proof: StorageProof, root: TrieHash<L>) -> Result<CompactProof, Error<L>>
+where
+	L: TrieConfiguration,
 {
 	let mut child_tries = Vec::new();
 	let partial_db = proof.into_memory_db();
@@ -223,7 +214,7 @@ pub fn encode_compact<L>(
 						let mut root = TrieHash::<L>::default();
 						if root.as_mut().len() != value.as_slice().len() {
 							// some child trie root in top trie are not an encoded hash.
-							return Err(Error::InvalidChildRoot(key.to_vec(), value.to_vec()));
+							return Err(Error::InvalidChildRoot(key.to_vec(), value.to_vec()))
 						}
 						root.as_mut().copy_from_slice(value.as_ref());
 						child_tries.push(root);
@@ -246,7 +237,7 @@ pub fn encode_compact<L>(
 		if !HashDBT::<L::Hash, _>::contains(&partial_db, &child_root, EMPTY_PREFIX) {
 			// child proof are allowed to be missing (unused root can be included
 			// due to trie structure modification).
-			continue;
+			continue
 		}
 
 		let trie = crate::TrieDB::<L>::new(&partial_db, &child_root)?;
diff --git a/primitives/trie/src/trie_stream.rs b/primitives/trie/src/trie_stream.rs
index 3a65c5a9190b..e0e26fea67c2 100644
--- a/primitives/trie/src/trie_stream.rs
+++ b/primitives/trie/src/trie_stream.rs
@@ -17,13 +17,15 @@
 
 //! `TrieStream` implementation for Substrate's trie format.
 
-use hash_db::Hasher;
-use trie_root;
+use crate::{
+	node_codec::Bitmap,
+	node_header::{size_and_prefix_iterator, NodeKind},
+	trie_constants,
+};
 use codec::Encode;
+use hash_db::Hasher;
 use sp_std::vec::Vec;
-use crate::trie_constants;
-use crate::node_header::{NodeKind, size_and_prefix_iterator};
-use crate::node_codec::Bitmap;
+use trie_root;
 
 const BRANCH_NODE_NO_VALUE: u8 = 254;
 const BRANCH_NODE_WITH_VALUE: u8 = 255;
@@ -36,41 +38,42 @@ pub struct TrieStream {
 
 impl TrieStream {
 	// useful for debugging but not used otherwise
-	pub fn as_raw(&self) -> &[u8] { &self.buffer }
+	pub fn as_raw(&self) -> &[u8] {
+		&self.buffer
+	}
 }
 
 fn branch_node_bit_mask(has_children: impl Iterator<Item = bool>) -> (u8, u8) {
 	let mut bitmap: u16 = 0;
 	let mut cursor: u16 = 1;
 	for v in has_children {
-		if v { bitmap |= cursor }
+		if v {
+			bitmap |= cursor
+		}
 		cursor <<= 1;
 	}
-	((bitmap % 256 ) as u8, (bitmap / 256 ) as u8)
+	((bitmap % 256) as u8, (bitmap / 256) as u8)
 }
 
-
 /// Create a leaf/branch node, encoding a number of nibbles.
 fn fuse_nibbles_node<'a>(nibbles: &'a [u8], kind: NodeKind) -> impl Iterator<Item = u8> + 'a {
 	let size = sp_std::cmp::min(trie_constants::NIBBLE_SIZE_BOUND, nibbles.len());
 
 	let iter_start = match kind {
 		NodeKind::Leaf => size_and_prefix_iterator(size, trie_constants::LEAF_PREFIX_MASK),
-		NodeKind::BranchNoValue => size_and_prefix_iterator(size, trie_constants::BRANCH_WITHOUT_MASK),
-		NodeKind::BranchWithValue => size_and_prefix_iterator(size, trie_constants::BRANCH_WITH_MASK),
+		NodeKind::BranchNoValue =>
+			size_and_prefix_iterator(size, trie_constants::BRANCH_WITHOUT_MASK),
+		NodeKind::BranchWithValue =>
+			size_and_prefix_iterator(size, trie_constants::BRANCH_WITH_MASK),
 	};
 	iter_start
 		.chain(if nibbles.len() % 2 == 1 { Some(nibbles[0]) } else { None })
 		.chain(nibbles[nibbles.len() % 2..].chunks(2).map(|ch| ch[0] << 4 | ch[1]))
 }
 
-
 impl trie_root::TrieStream for TrieStream {
-
 	fn new() -> Self {
-		TrieStream {
-			buffer: Vec::new()
-		}
+		TrieStream { buffer: Vec::new() }
 	}
 
 	fn append_empty_data(&mut self) {
@@ -95,7 +98,7 @@ impl trie_root::TrieStream for TrieStream {
 				self.buffer.extend(fuse_nibbles_node(partial, NodeKind::BranchNoValue));
 			}
 			let bm = branch_node_bit_mask(has_children);
-			self.buffer.extend([bm.0,bm.1].iter());
+			self.buffer.extend([bm.0, bm.1].iter());
 		} else {
 			debug_assert!(false, "trie stream codec only for no extension trie");
 			self.buffer.extend(&branch_node(maybe_value.is_some(), has_children));
@@ -117,7 +120,9 @@ impl trie_root::TrieStream for TrieStream {
 		}
 	}
 
-	fn out(self) -> Vec<u8> { self.buffer }
+	fn out(self) -> Vec<u8> {
+		self.buffer
+	}
 }
 
 fn branch_node(has_value: bool, has_children: impl Iterator<Item = bool>) -> [u8; 3] {
@@ -126,15 +131,11 @@ fn branch_node(has_value: bool, has_children: impl Iterator<Item = bool>) -> [u8
 	result
 }
 
-fn branch_node_buffered<I>(has_value: bool, has_children: I, output: &mut[u8])
-	where
-		I: Iterator<Item = bool>,
+fn branch_node_buffered<I>(has_value: bool, has_children: I, output: &mut [u8])
+where
+	I: Iterator<Item = bool>,
 {
-	let first = if has_value {
-		BRANCH_NODE_WITH_VALUE
-	} else {
-		BRANCH_NODE_NO_VALUE
-	};
+	let first = if has_value { BRANCH_NODE_WITH_VALUE } else { BRANCH_NODE_NO_VALUE };
 	output[0] = first;
 	Bitmap::encode(has_children, &mut output[1..]);
 }
diff --git a/primitives/utils/src/metrics.rs b/primitives/utils/src/metrics.rs
index 45d68ae4e6f7..45d8b3b7311d 100644
--- a/primitives/utils/src/metrics.rs
+++ b/primitives/utils/src/metrics.rs
@@ -19,22 +19,20 @@
 
 use lazy_static::lazy_static;
 use prometheus::{
-	Registry, Error as PrometheusError,
-	core::{ AtomicU64, GenericGauge, GenericCounter },
+	core::{AtomicU64, GenericCounter, GenericGauge},
+	Error as PrometheusError, Registry,
 };
 
 #[cfg(feature = "metered")]
 use prometheus::{core::GenericCounterVec, Opts};
 
-
 lazy_static! {
-	pub static ref TOKIO_THREADS_TOTAL: GenericCounter<AtomicU64> = GenericCounter::new(
-		"tokio_threads_total", "Total number of threads created"
-	).expect("Creating of statics doesn't fail. qed");
-
-	pub static ref TOKIO_THREADS_ALIVE: GenericGauge<AtomicU64> = GenericGauge::new(
-		"tokio_threads_alive", "Number of threads alive right now"
-	).expect("Creating of statics doesn't fail. qed");
+	pub static ref TOKIO_THREADS_TOTAL: GenericCounter<AtomicU64> =
+		GenericCounter::new("tokio_threads_total", "Total number of threads created")
+			.expect("Creating of statics doesn't fail. qed");
+	pub static ref TOKIO_THREADS_ALIVE: GenericGauge<AtomicU64> =
+		GenericGauge::new("tokio_threads_alive", "Number of threads alive right now")
+			.expect("Creating of statics doesn't fail. qed");
 }
 
 #[cfg(feature = "metered")]
@@ -46,7 +44,6 @@ lazy_static! {
 
 }
 
-
 /// Register the statics to report to registry
 pub fn register_globals(registry: &Registry) -> Result<(), PrometheusError> {
 	registry.register(Box::new(TOKIO_THREADS_ALIVE.clone()))?;
diff --git a/primitives/utils/src/mpsc.rs b/primitives/utils/src/mpsc.rs
index b033a5527d84..72dcd94c39e0 100644
--- a/primitives/utils/src/mpsc.rs
+++ b/primitives/utils/src/mpsc.rs
@@ -25,22 +25,26 @@ mod inner {
 	pub type TracingUnboundedReceiver<T> = UnboundedReceiver<T>;
 
 	/// Alias `mpsc::unbounded`
-	pub fn tracing_unbounded<T>(_key: &'static str) ->(TracingUnboundedSender<T>, TracingUnboundedReceiver<T>) {
+	pub fn tracing_unbounded<T>(
+		_key: &'static str,
+	) -> (TracingUnboundedSender<T>, TracingUnboundedReceiver<T>) {
 		mpsc::unbounded()
 	}
 }
 
-
 #[cfg(feature = "metered")]
 mod inner {
-	//tracing implementation
-	use futures::channel::mpsc::{self,
-		UnboundedReceiver, UnboundedSender,
-		TryRecvError, TrySendError, SendError
+	// tracing implementation
+	use crate::metrics::UNBOUNDED_CHANNELS_COUNTER;
+	use futures::{
+		channel::mpsc::{
+			self, SendError, TryRecvError, TrySendError, UnboundedReceiver, UnboundedSender,
+		},
+		sink::Sink,
+		stream::{FusedStream, Stream},
+		task::{Context, Poll},
 	};
-	use futures::{sink::Sink, task::{Poll, Context}, stream::{Stream, FusedStream}};
 	use std::pin::Pin;
-	use crate::metrics::UNBOUNDED_CHANNELS_COUNTER;
 
 	/// Wrapper Type around `UnboundedSender` that increases the global
 	/// measure when a message is added
@@ -61,9 +65,11 @@ mod inner {
 
 	/// Wrapper around `mpsc::unbounded` that tracks the in- and outflow via
 	/// `UNBOUNDED_CHANNELS_COUNTER`
-	pub fn tracing_unbounded<T>(key: &'static str) ->(TracingUnboundedSender<T>, TracingUnboundedReceiver<T>) {
+	pub fn tracing_unbounded<T>(
+		key: &'static str,
+	) -> (TracingUnboundedSender<T>, TracingUnboundedReceiver<T>) {
 		let (s, r) = mpsc::unbounded();
-		(TracingUnboundedSender(key, s), TracingUnboundedReceiver(key,r))
+		(TracingUnboundedSender(key, s), TracingUnboundedReceiver(key, r))
 	}
 
 	impl<T> TracingUnboundedSender<T> {
@@ -94,7 +100,7 @@ mod inner {
 
 		/// Proxy function to mpsc::UnboundedSender
 		pub fn unbounded_send(&self, msg: T) -> Result<(), TrySendError<T>> {
-			self.1.unbounded_send(msg).map(|s|{
+			self.1.unbounded_send(msg).map(|s| {
 				UNBOUNDED_CHANNELS_COUNTER.with_label_values(&[self.0, &"send"]).inc();
 				s
 			})
@@ -107,25 +113,25 @@ mod inner {
 	}
 
 	impl<T> TracingUnboundedReceiver<T> {
-
 		fn consume(&mut self) {
 			// consume all items, make sure to reflect the updated count
 			let mut count = 0;
 			loop {
 				if self.1.is_terminated() {
-					break;
+					break
 				}
 
 				match self.try_next() {
 					Ok(Some(..)) => count += 1,
-					_ => break
+					_ => break,
 				}
 			}
 			// and discount the messages
 			if count > 0 {
-				UNBOUNDED_CHANNELS_COUNTER.with_label_values(&[self.0, &"dropped"]).inc_by(count);
+				UNBOUNDED_CHANNELS_COUNTER
+					.with_label_values(&[self.0, &"dropped"])
+					.inc_by(count);
 			}
-
 		}
 
 		/// Proxy function to mpsc::UnboundedReceiver
@@ -158,21 +164,16 @@ mod inner {
 	impl<T> Stream for TracingUnboundedReceiver<T> {
 		type Item = T;
 
-		fn poll_next(
-			self: Pin<&mut Self>,
-			cx: &mut Context<'_>,
-		) -> Poll<Option<T>> {
+		fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<T>> {
 			let s = self.get_mut();
 			match Pin::new(&mut s.1).poll_next(cx) {
 				Poll::Ready(msg) => {
 					if msg.is_some() {
 						UNBOUNDED_CHANNELS_COUNTER.with_label_values(&[s.0, "received"]).inc();
-				   	}
+					}
 					Poll::Ready(msg)
-				}
-				Poll::Pending => {
-					Poll::Pending
-				}
+				},
+				Poll::Pending => Poll::Pending,
 			}
 		}
 	}
@@ -186,24 +187,15 @@ mod inner {
 	impl<T> Sink<T> for TracingUnboundedSender<T> {
 		type Error = SendError;
 
-		fn poll_ready(
-			self: Pin<&mut Self>,
-			cx: &mut Context<'_>,
-		) -> Poll<Result<(), Self::Error>> {
+		fn poll_ready(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
 			TracingUnboundedSender::poll_ready(&*self, cx)
 		}
 
-		fn start_send(
-			mut self: Pin<&mut Self>,
-			msg: T,
-		) -> Result<(), Self::Error> {
+		fn start_send(mut self: Pin<&mut Self>, msg: T) -> Result<(), Self::Error> {
 			TracingUnboundedSender::start_send(&mut *self, msg)
 		}
 
-		fn poll_flush(
-			self: Pin<&mut Self>,
-			_: &mut Context<'_>,
-		) -> Poll<Result<(), Self::Error>> {
+		fn poll_flush(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
 			Poll::Ready(Ok(()))
 		}
 
@@ -219,33 +211,23 @@ mod inner {
 	impl<T> Sink<T> for &TracingUnboundedSender<T> {
 		type Error = SendError;
 
-		fn poll_ready(
-			self: Pin<&mut Self>,
-			cx: &mut Context<'_>,
-		) -> Poll<Result<(), Self::Error>> {
+		fn poll_ready(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
 			TracingUnboundedSender::poll_ready(*self, cx)
 		}
 
 		fn start_send(self: Pin<&mut Self>, msg: T) -> Result<(), Self::Error> {
-			self.unbounded_send(msg)
-				.map_err(TrySendError::into_send_error)
+			self.unbounded_send(msg).map_err(TrySendError::into_send_error)
 		}
 
-		fn poll_flush(
-			self: Pin<&mut Self>,
-			_: &mut Context<'_>,
-		) -> Poll<Result<(), Self::Error>> {
+		fn poll_flush(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
 			Poll::Ready(Ok(()))
 		}
 
-		fn poll_close(
-			self: Pin<&mut Self>,
-			_: &mut Context<'_>,
-		) -> Poll<Result<(), Self::Error>> {
+		fn poll_close(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
 			self.close_channel();
 			Poll::Ready(Ok(()))
 		}
 	}
 }
 
-pub use inner::{tracing_unbounded, TracingUnboundedSender, TracingUnboundedReceiver};
+pub use inner::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
diff --git a/primitives/utils/src/status_sinks.rs b/primitives/utils/src/status_sinks.rs
index dc8115670de1..0870ab119299 100644
--- a/primitives/utils/src/status_sinks.rs
+++ b/primitives/utils/src/status_sinks.rs
@@ -16,9 +16,13 @@
 // limitations under the License.
 
 use crate::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
-use futures::{prelude::*, lock::Mutex};
+use futures::{lock::Mutex, prelude::*};
 use futures_timer::Delay;
-use std::{pin::Pin, task::{Poll, Context}, time::Duration};
+use std::{
+	pin::Pin,
+	task::{Context, Poll},
+	time::Duration,
+};
 
 /// Holds a list of `UnboundedSender`s, each associated with a certain time period. Every time the
 /// period elapses, we push an element on the sender.
@@ -44,7 +48,7 @@ struct YieldAfter<T> {
 	sender: Option<TracingUnboundedSender<T>>,
 }
 
-impl <T> Default for StatusSinks<T> {
+impl<T> Default for StatusSinks<T> {
 	fn default() -> Self {
 		Self::new()
 	}
@@ -56,10 +60,7 @@ impl<T> StatusSinks<T> {
 		let (entries_tx, entries_rx) = tracing_unbounded("status-sinks-entries");
 
 		StatusSinks {
-			inner: Mutex::new(Inner {
-				entries: stream::FuturesUnordered::new(),
-				entries_rx,
-			}),
+			inner: Mutex::new(Inner { entries: stream::FuturesUnordered::new(), entries_rx }),
 			entries_tx,
 		}
 	}
@@ -100,7 +101,7 @@ impl<T> StatusSinks<T> {
 				}
 			};
 
-			futures::select!{
+			futures::select! {
 				new_entry = inner.entries_rx.next() => {
 					if let Some(new_entry) = new_entry {
 						inner.entries.push(new_entry);
@@ -149,7 +150,7 @@ impl<'a, T> Drop for ReadySinkEvent<'a, T> {
 	fn drop(&mut self) {
 		if let Some(sender) = self.sender.take() {
 			if sender.is_closed() {
-				return;
+				return
 			}
 
 			let _ = self.sinks.entries_tx.unbounded_send(YieldAfter {
@@ -170,18 +171,20 @@ impl<T> futures::Future for YieldAfter<T> {
 		match Pin::new(&mut this.delay).poll(cx) {
 			Poll::Pending => Poll::Pending,
 			Poll::Ready(()) => {
-				let sender = this.sender.take()
+				let sender = this
+					.sender
+					.take()
 					.expect("sender is always Some unless the future is finished; qed");
 				Poll::Ready((sender, this.interval))
-			}
+			},
 		}
 	}
 }
 
 #[cfg(test)]
 mod tests {
-	use crate::mpsc::tracing_unbounded;
 	use super::StatusSinks;
+	use crate::mpsc::tracing_unbounded;
 	use futures::prelude::*;
 	use std::time::Duration;
 
@@ -208,7 +211,7 @@ mod tests {
 			Box::pin(async {
 				let items: Vec<i32> = rx.take(3).collect().await;
 				assert_eq!(items, [6, 7, 8]);
-			})
+			}),
 		));
 	}
 }
diff --git a/primitives/version/proc-macro/src/decl_runtime_version.rs b/primitives/version/proc-macro/src/decl_runtime_version.rs
index 22803f07d811..cdf244f72ce8 100644
--- a/primitives/version/proc-macro/src/decl_runtime_version.rs
+++ b/primitives/version/proc-macro/src/decl_runtime_version.rs
@@ -16,14 +16,14 @@
 // limitations under the License.
 
 use codec::Encode;
+use proc_macro2::{Span, TokenStream};
+use quote::quote;
 use syn::{
-	Expr, ExprLit, FieldValue, ItemConst, Lit,
-	parse::{Result, Error},
+	parse::{Error, Result},
 	parse_macro_input,
 	spanned::Spanned as _,
+	Expr, ExprLit, FieldValue, ItemConst, Lit,
 };
-use quote::quote;
-use proc_macro2::{TokenStream, Span};
 
 /// This macro accepts a `const` item that has a struct initializer expression of `RuntimeVersion`-like type.
 /// The macro will pass through this declaration and append an item declaration that will
@@ -78,12 +78,8 @@ impl ParseRuntimeVersion {
 	fn parse_expr(init_expr: &Expr) -> Result<ParseRuntimeVersion> {
 		let init_expr = match init_expr {
 			Expr::Struct(ref e) => e,
-			_ => {
-				return Err(Error::new(
-					init_expr.span(),
-					"expected a struct initializer expression",
-				));
-			}
+			_ =>
+				return Err(Error::new(init_expr.span(), "expected a struct initializer expression")),
 		};
 
 		let mut parsed = ParseRuntimeVersion::default();
@@ -96,12 +92,8 @@ impl ParseRuntimeVersion {
 	fn parse_field_value(&mut self, field_value: &FieldValue) -> Result<()> {
 		let field_name = match field_value.member {
 			syn::Member::Named(ref ident) => ident,
-			syn::Member::Unnamed(_) => {
-				return Err(Error::new(
-					field_value.span(),
-					"only named members must be used",
-				));
-			}
+			syn::Member::Unnamed(_) =>
+				return Err(Error::new(field_value.span(), "only named members must be used")),
 		};
 
 		fn parse_once<T>(
@@ -110,10 +102,7 @@ impl ParseRuntimeVersion {
 			parser: impl FnOnce(&Expr) -> Result<T>,
 		) -> Result<()> {
 			if value.is_some() {
-				return Err(Error::new(
-					field.span(),
-					"field is already initialized before",
-				));
+				return Err(Error::new(field.span(), "field is already initialized before"))
 			} else {
 				*value = Some(parser(&field.expr)?);
 				Ok(())
@@ -125,21 +114,13 @@ impl ParseRuntimeVersion {
 		} else if field_name == "impl_name" {
 			parse_once(&mut self.impl_name, field_value, Self::parse_str_literal)?;
 		} else if field_name == "authoring_version" {
-			parse_once(
-				&mut self.authoring_version,
-				field_value,
-				Self::parse_num_literal,
-			)?;
+			parse_once(&mut self.authoring_version, field_value, Self::parse_num_literal)?;
 		} else if field_name == "spec_version" {
 			parse_once(&mut self.spec_version, field_value, Self::parse_num_literal)?;
 		} else if field_name == "impl_version" {
 			parse_once(&mut self.impl_version, field_value, Self::parse_num_literal)?;
 		} else if field_name == "transaction_version" {
-			parse_once(
-				&mut self.transaction_version,
-				field_value,
-				Self::parse_num_literal,
-			)?;
+			parse_once(&mut self.transaction_version, field_value, Self::parse_num_literal)?;
 		} else if field_name == "apis" {
 			// Intentionally ignored
 			//
@@ -147,7 +128,7 @@ impl ParseRuntimeVersion {
 			// the "runtime_version" custom section. `impl_runtime_apis` is responsible for generating
 			// a custom section with the supported runtime apis descriptor.
 		} else {
-			return Err(Error::new(field_name.span(), "unknown field"));
+			return Err(Error::new(field_name.span(), "unknown field"))
 		}
 
 		Ok(())
@@ -155,16 +136,12 @@ impl ParseRuntimeVersion {
 
 	fn parse_num_literal(expr: &Expr) -> Result<u32> {
 		let lit = match *expr {
-			Expr::Lit(ExprLit {
-				lit: Lit::Int(ref lit),
-				..
-			}) => lit,
-			_ => {
+			Expr::Lit(ExprLit { lit: Lit::Int(ref lit), .. }) => lit,
+			_ =>
 				return Err(Error::new(
 					expr.span(),
 					"only numeric literals (e.g. `10`) are supported here",
-				));
-			}
+				)),
 		};
 		lit.base10_parse::<u32>()
 	}
@@ -172,44 +149,28 @@ impl ParseRuntimeVersion {
 	fn parse_str_literal(expr: &Expr) -> Result<String> {
 		let mac = match *expr {
 			Expr::Macro(syn::ExprMacro { ref mac, .. }) => mac,
-			_ => {
-				return Err(Error::new(
-					expr.span(),
-					"a macro expression is expected here",
-				));
-			}
+			_ => return Err(Error::new(expr.span(), "a macro expression is expected here")),
 		};
 
 		let lit: ExprLit = mac.parse_body().map_err(|e| {
 			Error::new(
 				e.span(),
-				format!(
-					"a single literal argument is expected, but parsing is failed: {}",
-					e
-				),
+				format!("a single literal argument is expected, but parsing is failed: {}", e),
 			)
 		})?;
 
 		match lit.lit {
 			Lit::Str(ref lit) => Ok(lit.value()),
-			_ => Err(Error::new(
-				lit.span(),
-				"only string literals are supported here",
-			)),
+			_ => Err(Error::new(lit.span(), "only string literals are supported here")),
 		}
 	}
 
 	fn build(self, span: Span) -> Result<RuntimeVersion> {
 		macro_rules! required {
 			($e:expr) => {
-				$e.ok_or_else(||
-					{
-						Error::new(
-							span,
-							format!("required field '{}' is missing", stringify!($e)),
-						)
-					}
-				)?
+				$e.ok_or_else(|| {
+					Error::new(span, format!("required field '{}' is missing", stringify!($e)))
+				})?
 			};
 		}
 
diff --git a/primitives/version/src/embed.rs b/primitives/version/src/embed.rs
index f32bc73d883a..452762dcf687 100644
--- a/primitives/version/src/embed.rs
+++ b/primitives/version/src/embed.rs
@@ -19,7 +19,7 @@
 //! into a WASM file.
 
 use codec::Encode;
-use parity_wasm::elements::{Module, deserialize_buffer, serialize};
+use parity_wasm::elements::{deserialize_buffer, serialize, Module};
 
 #[derive(Clone, Copy, Eq, PartialEq, Debug, thiserror::Error)]
 pub enum Error {
@@ -40,7 +40,8 @@ pub fn embed_runtime_version(
 ) -> Result<Vec<u8>, Error> {
 	let mut module: Module = deserialize_buffer(wasm).map_err(|_| Error::Deserialize)?;
 
-	let apis = version.apis
+	let apis = version
+		.apis
 		.iter()
 		.map(Encode::encode)
 		.map(|v| v.into_iter())
diff --git a/primitives/version/src/lib.rs b/primitives/version/src/lib.rs
index aa7ae3da89d5..b3ddb7d7fecc 100644
--- a/primitives/version/src/lib.rs
+++ b/primitives/version/src/lib.rs
@@ -20,20 +20,20 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 #[cfg(feature = "std")]
-use serde::{Serialize, Deserialize};
-#[cfg(feature = "std")]
-use std::fmt;
+use serde::{Deserialize, Serialize};
 #[cfg(feature = "std")]
 use std::collections::HashSet;
+#[cfg(feature = "std")]
+use std::fmt;
 
-use codec::{Encode, Decode};
-use sp_runtime::RuntimeString;
+use codec::{Decode, Encode};
 pub use sp_runtime::create_runtime_str;
+use sp_runtime::RuntimeString;
 #[doc(hidden)]
 pub use sp_std;
 
 #[cfg(feature = "std")]
-use sp_runtime::{traits::Block as BlockT, generic::BlockId};
+use sp_runtime::{generic::BlockId, traits::Block as BlockT};
 
 #[cfg(feature = "std")]
 pub mod embed;
@@ -106,7 +106,9 @@ pub type ApisVec = sp_std::borrow::Cow<'static, [(ApiId, u32)]>;
 /// Create a vector of Api declarations.
 #[macro_export]
 macro_rules! create_apis_vec {
-	( $y:expr ) => { $crate::sp_std::borrow::Cow::Borrowed(& $y) }
+	( $y:expr ) => {
+		$crate::sp_std::borrow::Cow::Borrowed(&$y)
+	};
 }
 
 /// Runtime version.
@@ -172,7 +174,9 @@ pub struct RuntimeVersion {
 #[cfg(feature = "std")]
 impl fmt::Display for RuntimeVersion {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		write!(f, "{}-{} ({}-{}.tx{}.au{})",
+		write!(
+			f,
+			"{}-{} ({}-{}.tx{}.au{})",
 			self.spec_name,
 			self.spec_version,
 			self.impl_name,
@@ -188,17 +192,13 @@ impl RuntimeVersion {
 	/// Check if this version matches other version for calling into runtime.
 	pub fn can_call_with(&self, other: &RuntimeVersion) -> bool {
 		self.spec_version == other.spec_version &&
-		self.spec_name == other.spec_name &&
-		self.authoring_version == other.authoring_version
+			self.spec_name == other.spec_name &&
+			self.authoring_version == other.authoring_version
 	}
 
 	/// Check if the given api with `api_id` is implemented and the version passes the given
 	/// `predicate`.
-	pub fn has_api_with<P: Fn(u32) -> bool>(
-		&self,
-		id: &ApiId,
-		predicate: P,
-	) -> bool {
+	pub fn has_api_with<P: Fn(u32) -> bool>(&self, id: &ApiId, predicate: P) -> bool {
 		self.apis.iter().any(|(s, v)| s == id && predicate(*v))
 	}
 
@@ -229,11 +229,10 @@ impl NativeVersion {
 		if self.runtime_version.spec_name != other.spec_name {
 			Err(format!(
 				"`spec_name` does not match `{}` vs `{}`",
-				self.runtime_version.spec_name,
-				other.spec_name,
+				self.runtime_version.spec_name, other.spec_name,
 			))
-		} else if self.runtime_version.authoring_version != other.authoring_version
-			&& !self.can_author_with.contains(&other.authoring_version)
+		} else if self.runtime_version.authoring_version != other.authoring_version &&
+			!self.can_author_with.contains(&other.authoring_version)
 		{
 			Err(format!(
 				"`authoring_version` does not match `{version}` vs `{other_version}` and \
@@ -272,15 +271,13 @@ impl<T: GetRuntimeVersion<Block>, Block: BlockT> GetRuntimeVersion<Block> for st
 mod apis_serialize {
 	use super::*;
 	use impl_serde::serialize as bytes;
-	use serde::{Serializer, de, ser::SerializeTuple};
+	use serde::{de, ser::SerializeTuple, Serializer};
 
 	#[derive(Serialize)]
-	struct ApiId<'a>(
-		#[serde(serialize_with="serialize_bytesref")] &'a super::ApiId,
-		&'a u32,
-	);
+	struct ApiId<'a>(#[serde(serialize_with = "serialize_bytesref")] &'a super::ApiId, &'a u32);
 
-	pub fn serialize<S>(apis: &ApisVec, ser: S) -> Result<S::Ok, S::Error> where
+	pub fn serialize<S>(apis: &ApisVec, ser: S) -> Result<S::Ok, S::Error>
+	where
 		S: Serializer,
 	{
 		let len = apis.len();
@@ -291,20 +288,18 @@ mod apis_serialize {
 		seq.end()
 	}
 
-	pub fn serialize_bytesref<S>(&apis: &&super::ApiId, ser: S) -> Result<S::Ok, S::Error> where
+	pub fn serialize_bytesref<S>(&apis: &&super::ApiId, ser: S) -> Result<S::Ok, S::Error>
+	where
 		S: Serializer,
 	{
 		bytes::serialize(apis, ser)
 	}
 
 	#[derive(Deserialize)]
-	struct ApiIdOwned(
-		#[serde(deserialize_with="deserialize_bytes")]
-		super::ApiId,
-		u32,
-	);
+	struct ApiIdOwned(#[serde(deserialize_with = "deserialize_bytes")] super::ApiId, u32);
 
-	pub fn deserialize<'de, D>(deserializer: D) -> Result<ApisVec, D::Error> where
+	pub fn deserialize<'de, D>(deserializer: D) -> Result<ApisVec, D::Error>
+	where
 		D: de::Deserializer<'de>,
 	{
 		struct Visitor;
@@ -315,7 +310,8 @@ mod apis_serialize {
 				formatter.write_str("a sequence of api id and version tuples")
 			}
 
-			fn visit_seq<V>(self, mut visitor: V) -> Result<Self::Value, V::Error> where
+			fn visit_seq<V>(self, mut visitor: V) -> Result<Self::Value, V::Error>
+			where
 				V: de::SeqAccess<'de>,
 			{
 				let mut apis = Vec::new();
@@ -328,8 +324,9 @@ mod apis_serialize {
 		deserializer.deserialize_seq(Visitor)
 	}
 
-	pub fn deserialize_bytes<'de, D>(d: D) -> Result<super::ApiId, D::Error> where
-		D: de::Deserializer<'de>
+	pub fn deserialize_bytes<'de, D>(d: D) -> Result<super::ApiId, D::Error>
+	where
+		D: de::Deserializer<'de>,
 	{
 		let mut arr = [0; 8];
 		bytes::deserialize_check_len(d, bytes::ExpectedLen::Exact(&mut arr[..]))?;
diff --git a/primitives/wasm-interface/src/lib.rs b/primitives/wasm-interface/src/lib.rs
index fd200268473b..3f1f1c171403 100644
--- a/primitives/wasm-interface/src/lib.rs
+++ b/primitives/wasm-interface/src/lib.rs
@@ -19,10 +19,7 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use sp_std::{
-	vec,
-	borrow::Cow, marker::PhantomData, mem, iter::Iterator, result, vec::Vec,
-};
+use sp_std::{borrow::Cow, iter::Iterator, marker::PhantomData, mem, result, vec, vec::Vec};
 
 #[cfg(feature = "std")]
 mod wasmi_impl;
@@ -141,10 +138,7 @@ pub struct Pointer<T: PointerType> {
 impl<T: PointerType> Pointer<T> {
 	/// Create a new instance of `Self`.
 	pub fn new(ptr: u32) -> Self {
-		Self {
-			ptr,
-			_marker: Default::default(),
-		}
+		Self { ptr, _marker: Default::default() }
 	}
 
 	/// Calculate the offset from this pointer.
@@ -153,12 +147,10 @@ impl<T: PointerType> Pointer<T> {
 	///
 	/// Returns an `Option` to respect that the pointer could probably overflow.
 	pub fn offset(self, offset: u32) -> Option<Self> {
-		offset.checked_mul(T::SIZE).and_then(|o| self.ptr.checked_add(o)).map(|ptr| {
-			Self {
-				ptr,
-				_marker: Default::default(),
-			}
-		})
+		offset
+			.checked_mul(T::SIZE)
+			.and_then(|o| self.ptr.checked_add(o))
+			.map(|ptr| Self { ptr, _marker: Default::default() })
 	}
 
 	/// Create a null pointer.
@@ -198,7 +190,9 @@ impl<T: PointerType> From<Pointer<T>> for usize {
 
 impl<T: PointerType> IntoValue for Pointer<T> {
 	const VALUE_TYPE: ValueType = ValueType::I32;
-	fn into_value(self) -> Value { Value::I32(self.ptr as _) }
+	fn into_value(self) -> Value {
+		Value::I32(self.ptr as _)
+	}
 }
 
 impl<T: PointerType> TryFromValue for Pointer<T> {
@@ -224,19 +218,16 @@ pub struct Signature {
 
 impl Signature {
 	/// Create a new instance of `Signature`.
-	pub fn new<T: Into<Cow<'static, [ValueType]>>>(args: T, return_value: Option<ValueType>) -> Self {
-		Self {
-			args: args.into(),
-			return_value,
-		}
+	pub fn new<T: Into<Cow<'static, [ValueType]>>>(
+		args: T,
+		return_value: Option<ValueType>,
+	) -> Self {
+		Self { args: args.into(), return_value }
 	}
 
 	/// Create a new instance of `Signature` with the given `args` and without any return value.
 	pub fn new_with_args<T: Into<Cow<'static, [ValueType]>>>(args: T) -> Self {
-		Self {
-			args: args.into(),
-			return_value: None,
-		}
+		Self { args: args.into(), return_value: None }
 	}
 }
 
@@ -500,7 +491,6 @@ mod tests {
 		assert_eq!(ptr.offset(32).unwrap(), Pointer::new(256));
 	}
 
-
 	#[test]
 	fn return_value_encoded_max_size() {
 		let encoded = ReturnValue::Value(Value::I64(-1)).encode();
diff --git a/primitives/wasm-interface/src/wasmi_impl.rs b/primitives/wasm-interface/src/wasmi_impl.rs
index 79110487ffca..f7e0ec6f16d4 100644
--- a/primitives/wasm-interface/src/wasmi_impl.rs
+++ b/primitives/wasm-interface/src/wasmi_impl.rs
@@ -17,7 +17,7 @@
 
 //! Implementation of conversions between Substrate and wasmi types.
 
-use crate::{Value, ValueType, Signature};
+use crate::{Signature, Value, ValueType};
 
 impl From<Value> for wasmi::RuntimeValue {
 	fn from(value: Value) -> Self {
diff --git a/rustfmt.toml b/rustfmt.toml
index 1c9ebe03c02e..15e9bdcdf10f 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -7,8 +7,6 @@ imports_granularity = "Crate"
 reorder_imports = true
 # Consistency
 newline_style = "Unix"
-normalize_comments = true
-normalize_doc_attributes = true
 # Misc
 chain_width = 80
 spaces_around_ranges = false
diff --git a/test-utils/client/src/client_ext.rs b/test-utils/client/src/client_ext.rs
index edba96d760fc..ef778ca96805 100644
--- a/test-utils/client/src/client_ext.rs
+++ b/test-utils/client/src/client_ext.rs
@@ -17,17 +17,13 @@
 
 //! Client extension for tests.
 
+use codec::alloc::collections::hash_map::HashMap;
+use sc_client_api::{backend::Finalizer, client::BlockBackend};
 use sc_service::client::Client;
-use sc_client_api::backend::Finalizer;
-use sc_client_api::client::BlockBackend;
 use sp_consensus::{
-	BlockImportParams, BlockImport, BlockOrigin, Error as ConsensusError,
-	ForkChoiceStrategy,
+	BlockImport, BlockImportParams, BlockOrigin, Error as ConsensusError, ForkChoiceStrategy,
 };
-use sp_runtime::{Justification, Justifications};
-use sp_runtime::traits::{Block as BlockT};
-use sp_runtime::generic::BlockId;
-use codec::alloc::collections::hash_map::HashMap;
+use sp_runtime::{generic::BlockId, traits::Block as BlockT, Justification, Justifications};
 
 /// Extension trait for a test client.
 pub trait ClientExt<Block: BlockT>: Sized {
@@ -49,11 +45,18 @@ pub trait ClientBlockImportExt<Block: BlockT>: Sized {
 	async fn import(&mut self, origin: BlockOrigin, block: Block) -> Result<(), ConsensusError>;
 
 	/// Import a block and make it our best block if possible.
-	async fn import_as_best(&mut self, origin: BlockOrigin, block: Block) -> Result<(), ConsensusError>;
+	async fn import_as_best(
+		&mut self,
+		origin: BlockOrigin,
+		block: Block,
+	) -> Result<(), ConsensusError>;
 
 	/// Import a block and finalize it.
-	async fn import_as_final(&mut self, origin: BlockOrigin, block: Block)
-		-> Result<(), ConsensusError>;
+	async fn import_as_final(
+		&mut self,
+		origin: BlockOrigin,
+		block: Block,
+	) -> Result<(), ConsensusError>;
 
 	/// Import block with justification(s), finalizes block.
 	async fn import_justified(
@@ -65,11 +68,11 @@ pub trait ClientBlockImportExt<Block: BlockT>: Sized {
 }
 
 impl<B, E, RA, Block> ClientExt<Block> for Client<B, E, Block, RA>
-	where
-		B: sc_client_api::backend::Backend<Block>,
-		E: sc_client_api::CallExecutor<Block> + 'static,
-		Self: BlockImport<Block, Error = ConsensusError>,
-		Block: BlockT,
+where
+	B: sc_client_api::backend::Backend<Block>,
+	E: sc_client_api::CallExecutor<Block> + 'static,
+	Self: BlockImport<Block, Error = ConsensusError>,
+	Block: BlockT,
 {
 	fn finalize_block(
 		&self,
@@ -87,16 +90,12 @@ impl<B, E, RA, Block> ClientExt<Block> for Client<B, E, Block, RA>
 /// This implementation is required, because of the weird api requirements around `BlockImport`.
 #[async_trait::async_trait]
 impl<Block: BlockT, T, Transaction> ClientBlockImportExt<Block> for std::sync::Arc<T>
-	where
-		for<'r> &'r T: BlockImport<Block, Error = ConsensusError, Transaction = Transaction>,
-		Transaction: Send + 'static,
-		T: Send + Sync,
+where
+	for<'r> &'r T: BlockImport<Block, Error = ConsensusError, Transaction = Transaction>,
+	Transaction: Send + 'static,
+	T: Send + Sync,
 {
-	async fn import(
-		&mut self,
-		origin: BlockOrigin,
-		block: Block,
-	) -> Result<(), ConsensusError> {
+	async fn import(&mut self, origin: BlockOrigin, block: Block) -> Result<(), ConsensusError> {
 		let (header, extrinsics) = block.deconstruct();
 		let mut import = BlockImportParams::new(origin, header);
 		import.body = Some(extrinsics);
@@ -151,18 +150,14 @@ impl<Block: BlockT, T, Transaction> ClientBlockImportExt<Block> for std::sync::A
 
 #[async_trait::async_trait]
 impl<B, E, RA, Block: BlockT> ClientBlockImportExt<Block> for Client<B, E, Block, RA>
-	where
-		Self: BlockImport<Block, Error = ConsensusError>,
-		RA: Send,
-		B: Send + Sync,
-		E: Send,
-		<Self as BlockImport<Block>>::Transaction: Send,
+where
+	Self: BlockImport<Block, Error = ConsensusError>,
+	RA: Send,
+	B: Send + Sync,
+	E: Send,
+	<Self as BlockImport<Block>>::Transaction: Send,
 {
-	async fn import(
-		&mut self,
-		origin: BlockOrigin,
-		block: Block,
-	) -> Result<(), ConsensusError> {
+	async fn import(&mut self, origin: BlockOrigin, block: Block) -> Result<(), ConsensusError> {
 		let (header, extrinsics) = block.deconstruct();
 		let mut import = BlockImportParams::new(origin, header);
 		import.body = Some(extrinsics);
diff --git a/test-utils/client/src/lib.rs b/test-utils/client/src/lib.rs
index 0971c00d7842..d08a01a4decb 100644
--- a/test-utils/client/src/lib.rs
+++ b/test-utils/client/src/lib.rs
@@ -21,39 +21,44 @@
 
 pub mod client_ext;
 
+pub use self::client_ext::{ClientBlockImportExt, ClientExt};
 pub use sc_client_api::{
-	execution_extensions::{ExecutionStrategies, ExecutionExtensions},
-	ForkBlocks, BadBlocks,
+	execution_extensions::{ExecutionExtensions, ExecutionStrategies},
+	BadBlocks, ForkBlocks,
 };
-pub use sc_client_db::{Backend, self};
+pub use sc_client_db::{self, Backend};
+pub use sc_executor::{self, NativeExecutor, WasmExecutionMethod};
+pub use sc_service::{client, RpcHandlers, RpcSession};
 pub use sp_consensus;
-pub use sc_executor::{NativeExecutor, WasmExecutionMethod, self};
 pub use sp_keyring::{
-	AccountKeyring,
-	ed25519::Keyring as Ed25519Keyring,
-	sr25519::Keyring as Sr25519Keyring,
+	ed25519::Keyring as Ed25519Keyring, sr25519::Keyring as Sr25519Keyring, AccountKeyring,
 };
-pub use sp_keystore::{SyncCryptoStorePtr, SyncCryptoStore};
+pub use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr};
 pub use sp_runtime::{Storage, StorageChild};
 pub use sp_state_machine::ExecutionStrategy;
-pub use sc_service::{RpcHandlers, RpcSession, client};
-pub use self::client_ext::{ClientExt, ClientBlockImportExt};
 
-use std::pin::Pin;
-use std::sync::Arc;
-use std::collections::{HashSet, HashMap};
-use futures::{future::{Future, FutureExt}, stream::StreamExt};
+use futures::{
+	future::{Future, FutureExt},
+	stream::StreamExt,
+};
+use sc_client_api::BlockchainEvents;
+use sc_service::client::{ClientConfig, LocalCallExecutor};
 use serde::Deserialize;
 use sp_core::storage::ChildInfo;
-use sp_runtime::{OpaqueExtrinsic, codec::Encode, traits::{Block as BlockT, BlakeTwo256}};
-use sc_service::client::{LocalCallExecutor, ClientConfig};
-use sc_client_api::BlockchainEvents;
+use sp_runtime::{
+	codec::Encode,
+	traits::{BlakeTwo256, Block as BlockT},
+	OpaqueExtrinsic,
+};
+use std::{
+	collections::{HashMap, HashSet},
+	pin::Pin,
+	sync::Arc,
+};
 
 /// Test client light database backend.
-pub type LightBackend<Block> = sc_light::Backend<
-	sc_client_db::light::LightStorage<Block>,
-	BlakeTwo256,
->;
+pub type LightBackend<Block> =
+	sc_light::Backend<sc_client_db::light::LightStorage<Block>, BlakeTwo256>;
 
 /// A genesis storage initialization trait.
 pub trait GenesisInit: Default {
@@ -84,13 +89,16 @@ pub struct TestClientBuilder<Block: BlockT, Executor, Backend, G: GenesisInit> {
 }
 
 impl<Block: BlockT, Executor, G: GenesisInit> Default
-	for TestClientBuilder<Block, Executor, Backend<Block>, G> {
+	for TestClientBuilder<Block, Executor, Backend<Block>, G>
+{
 	fn default() -> Self {
 		Self::with_default_backend()
 	}
 }
 
-impl<Block: BlockT, Executor, G: GenesisInit> TestClientBuilder<Block, Executor, Backend<Block>, G> {
+impl<Block: BlockT, Executor, G: GenesisInit>
+	TestClientBuilder<Block, Executor, Backend<Block>, G>
+{
 	/// Create new `TestClientBuilder` with default backend.
 	pub fn with_default_backend() -> Self {
 		let backend = Arc::new(Backend::new_test(std::u32::MAX, std::u64::MAX));
@@ -114,7 +122,9 @@ impl<Block: BlockT, Executor, G: GenesisInit> TestClientBuilder<Block, Executor,
 	}
 }
 
-impl<Block: BlockT, Executor, Backend, G: GenesisInit> TestClientBuilder<Block, Executor, Backend, G> {
+impl<Block: BlockT, Executor, Backend, G: GenesisInit>
+	TestClientBuilder<Block, Executor, Backend, G>
+{
 	/// Create a new instance of the test client builder.
 	pub fn with_backend(backend: Arc<Backend>) -> Self {
 		TestClientBuilder {
@@ -155,20 +165,15 @@ impl<Block: BlockT, Executor, Backend, G: GenesisInit> TestClientBuilder<Block,
 		value: impl AsRef<[u8]>,
 	) -> Self {
 		let storage_key = child_info.storage_key();
-		let entry = self.child_storage_extension.entry(storage_key.to_vec())
-			.or_insert_with(|| StorageChild {
-				data: Default::default(),
-				child_info: child_info.clone(),
-			});
+		let entry = self.child_storage_extension.entry(storage_key.to_vec()).or_insert_with(|| {
+			StorageChild { data: Default::default(), child_info: child_info.clone() }
+		});
 		entry.data.insert(key.as_ref().to_vec(), value.as_ref().to_vec());
 		self
 	}
 
 	/// Set the execution strategy that should be used by all contexts.
-	pub fn set_execution_strategy(
-		mut self,
-		execution_strategy: ExecutionStrategy
-	) -> Self {
+	pub fn set_execution_strategy(mut self, execution_strategy: ExecutionStrategy) -> Self {
 		self.execution_strategies = ExecutionStrategies {
 			syncing: execution_strategy,
 			importing: execution_strategy,
@@ -180,7 +185,8 @@ impl<Block: BlockT, Executor, Backend, G: GenesisInit> TestClientBuilder<Block,
 	}
 
 	/// Sets custom block rules.
-	pub fn set_block_rules(mut self,
+	pub fn set_block_rules(
+		mut self,
 		fork_blocks: ForkBlocks<Block>,
 		bad_blocks: BadBlocks<Block>,
 	) -> Self {
@@ -206,14 +212,10 @@ impl<Block: BlockT, Executor, Backend, G: GenesisInit> TestClientBuilder<Block,
 		self,
 		executor: Executor,
 	) -> (
-		client::Client<
-			Backend,
-			Executor,
-			Block,
-			RuntimeApi,
-		>,
+		client::Client<Backend, Executor, Block, RuntimeApi>,
 		sc_consensus::LongestChain<Backend, Block>,
-	) where
+	)
+	where
 		Executor: sc_client_api::CallExecutor<Block> + 'static,
 		Backend: sc_client_api::backend::Backend<Block>,
 		<Backend as sc_client_api::backend::Backend<Block>>::OffchainStorage: 'static,
@@ -253,7 +255,8 @@ impl<Block: BlockT, Executor, Backend, G: GenesisInit> TestClientBuilder<Block,
 				no_genesis: self.no_genesis,
 				..Default::default()
 			},
-		).expect("Creates new client");
+		)
+		.expect("Creates new client");
 
 		let longest_chain = sc_consensus::LongestChain::new(self.backend);
 
@@ -261,12 +264,9 @@ impl<Block: BlockT, Executor, Backend, G: GenesisInit> TestClientBuilder<Block,
 	}
 }
 
-impl<Block: BlockT, E, Backend, G: GenesisInit> TestClientBuilder<
-	Block,
-	client::LocalCallExecutor<Block, Backend, NativeExecutor<E>>,
-	Backend,
-	G,
-> {
+impl<Block: BlockT, E, Backend, G: GenesisInit>
+	TestClientBuilder<Block, client::LocalCallExecutor<Block, Backend, NativeExecutor<E>>, Backend, G>
+{
 	/// Build the test client with the given native executor.
 	pub fn build_with_native_executor<RuntimeApi, I>(
 		self,
@@ -276,23 +276,25 @@ impl<Block: BlockT, E, Backend, G: GenesisInit> TestClientBuilder<
 			Backend,
 			client::LocalCallExecutor<Block, Backend, NativeExecutor<E>>,
 			Block,
-			RuntimeApi
+			RuntimeApi,
 		>,
 		sc_consensus::LongestChain<Backend, Block>,
-	) where
+	)
+	where
 		I: Into<Option<NativeExecutor<E>>>,
 		E: sc_executor::NativeExecutionDispatch + 'static,
 		Backend: sc_client_api::backend::Backend<Block> + 'static,
 	{
-		let executor = executor.into().unwrap_or_else(||
-			NativeExecutor::new(WasmExecutionMethod::Interpreted, None, 8)
-		);
+		let executor = executor
+			.into()
+			.unwrap_or_else(|| NativeExecutor::new(WasmExecutionMethod::Interpreted, None, 8));
 		let executor = LocalCallExecutor::new(
 			self.backend.clone(),
 			executor,
 			Box::new(sp_core::testing::TaskExecutor::new()),
 			Default::default(),
-		).expect("Creates LocalCallExecutor");
+		)
+		.expect("Creates LocalCallExecutor");
 
 		self.build_with_executor(executor)
 	}
@@ -347,8 +349,8 @@ impl RpcHandlersExt for RpcHandlers {
 	) -> Pin<Box<dyn Future<Output = Result<RpcTransactionOutput, RpcTransactionError>> + Send>> {
 		let (tx, rx) = futures01::sync::mpsc::channel(0);
 		let mem = RpcSession::new(tx.into());
-		Box::pin(self
-			.rpc_query(
+		Box::pin(
+			self.rpc_query(
 				&mem,
 				&format!(
 					r#"{{
@@ -360,7 +362,7 @@ impl RpcHandlersExt for RpcHandlers {
 					hex::encode(extrinsic.encode())
 				),
 			)
-			.map(move |result| parse_rpc_result(result, mem, rx))
+			.map(move |result| parse_rpc_result(result, mem, rx)),
 		)
 	}
 }
@@ -371,26 +373,17 @@ pub(crate) fn parse_rpc_result(
 	receiver: futures01::sync::mpsc::Receiver<String>,
 ) -> Result<RpcTransactionOutput, RpcTransactionError> {
 	if let Some(ref result) = result {
-		let json: serde_json::Value = serde_json::from_str(result)
-			.expect("the result can only be a JSONRPC string; qed");
-		let error = json
-			.as_object()
-			.expect("JSON result is always an object; qed")
-			.get("error");
+		let json: serde_json::Value =
+			serde_json::from_str(result).expect("the result can only be a JSONRPC string; qed");
+		let error = json.as_object().expect("JSON result is always an object; qed").get("error");
 
 		if let Some(error) = error {
-			return Err(
-				serde_json::from_value(error.clone())
-					.expect("the JSONRPC result's error is always valid; qed")
-			)
+			return Err(serde_json::from_value(error.clone())
+				.expect("the JSONRPC result's error is always valid; qed"))
 		}
 	}
 
-	Ok(RpcTransactionOutput {
-		result,
-		session,
-		receiver,
-	})
+	Ok(RpcTransactionOutput { result, session, receiver })
 }
 
 /// An extension trait for `BlockchainEvents`.
@@ -420,7 +413,7 @@ where
 				if notification.is_new_best {
 					blocks.insert(notification.hash);
 					if blocks.len() == count {
-						break;
+						break
 					}
 				}
 			}
@@ -445,31 +438,45 @@ mod tests {
 		assert!(super::parse_rpc_result(None, mem, rx).is_ok());
 
 		let (mem, rx) = create_session_and_receiver();
-		assert!(
-			super::parse_rpc_result(Some(r#"{
+		assert!(super::parse_rpc_result(
+			Some(
+				r#"{
 				"jsonrpc": "2.0",
 				"result": 19,
 				"id": 1
-			}"#.to_string()), mem, rx)
-			.is_ok(),
-		);
+			}"#
+				.to_string()
+			),
+			mem,
+			rx
+		)
+		.is_ok(),);
 
 		let (mem, rx) = create_session_and_receiver();
-		let error = super::parse_rpc_result(Some(r#"{
+		let error = super::parse_rpc_result(
+			Some(
+				r#"{
 				"jsonrpc": "2.0",
 				"error": {
 					"code": -32601,
 					"message": "Method not found"
 				},
 				"id": 1
-			}"#.to_string()), mem, rx)
-			.unwrap_err();
+			}"#
+				.to_string(),
+			),
+			mem,
+			rx,
+		)
+		.unwrap_err();
 		assert_eq!(error.code, -32601);
 		assert_eq!(error.message, "Method not found");
 		assert!(error.data.is_none());
 
 		let (mem, rx) = create_session_and_receiver();
-		let error = super::parse_rpc_result(Some(r#"{
+		let error = super::parse_rpc_result(
+			Some(
+				r#"{
 				"jsonrpc": "2.0",
 				"error": {
 					"code": -32601,
@@ -477,8 +484,13 @@ mod tests {
 					"data": 42
 				},
 				"id": 1
-			}"#.to_string()), mem, rx)
-			.unwrap_err();
+			}"#
+				.to_string(),
+			),
+			mem,
+			rx,
+		)
+		.unwrap_err();
 		assert_eq!(error.code, -32601);
 		assert_eq!(error.message, "Method not found");
 		assert!(error.data.is_some());
diff --git a/test-utils/derive/src/lib.rs b/test-utils/derive/src/lib.rs
index fb1cb24cae40..877792f82de6 100644
--- a/test-utils/derive/src/lib.rs
+++ b/test-utils/derive/src/lib.rs
@@ -43,15 +43,15 @@ fn parse_knobs(
 
 	if sig.inputs.len() != 1 {
 		let msg = "the test function accepts only one argument of type sc_service::TaskExecutor";
-		return Err(syn::Error::new_spanned(&sig, msg));
+		return Err(syn::Error::new_spanned(&sig, msg))
 	}
 	let (task_executor_name, task_executor_type) = match sig.inputs.pop().map(|x| x.into_value()) {
 		Some(syn::FnArg::Typed(x)) => (x.pat, x.ty),
 		_ => {
 			let msg =
 				"the test function accepts only one argument of type sc_service::TaskExecutor";
-			return Err(syn::Error::new_spanned(&sig, msg));
-		}
+			return Err(syn::Error::new_spanned(&sig, msg))
+		},
 	};
 
 	let crate_name = match crate_name("substrate-test-utils") {
diff --git a/test-utils/runtime/client/src/block_builder_ext.rs b/test-utils/runtime/client/src/block_builder_ext.rs
index 0d3211fa05a9..e8c1d2ac5cd4 100644
--- a/test-utils/runtime/client/src/block_builder_ext.rs
+++ b/test-utils/runtime/client/src/block_builder_ext.rs
@@ -17,16 +17,19 @@
 
 //! Block Builder extensions for tests.
 
+use sc_client_api::backend;
 use sp_api::{ApiExt, ProvideRuntimeApi};
 use sp_core::ChangesTrieConfiguration;
-use sc_client_api::backend;
 
 use sc_block_builder::BlockBuilderApi;
 
 /// Extension trait for test block builder.
 pub trait BlockBuilderExt {
 	/// Add transfer extrinsic to the block.
-	fn push_transfer(&mut self, transfer: substrate_test_runtime::Transfer) -> Result<(), sp_blockchain::Error>;
+	fn push_transfer(
+		&mut self,
+		transfer: substrate_test_runtime::Transfer,
+	) -> Result<(), sp_blockchain::Error>;
 	/// Add storage change extrinsic to the block.
 	fn push_storage_change(
 		&mut self,
@@ -40,16 +43,21 @@ pub trait BlockBuilderExt {
 	) -> Result<(), sp_blockchain::Error>;
 }
 
-impl<'a, A, B> BlockBuilderExt for sc_block_builder::BlockBuilder<'a, substrate_test_runtime::Block, A, B> where
+impl<'a, A, B> BlockBuilderExt
+	for sc_block_builder::BlockBuilder<'a, substrate_test_runtime::Block, A, B>
+where
 	A: ProvideRuntimeApi<substrate_test_runtime::Block> + 'a,
-	A::Api: BlockBuilderApi<substrate_test_runtime::Block> +
-		ApiExt<
+	A::Api: BlockBuilderApi<substrate_test_runtime::Block>
+		+ ApiExt<
 			substrate_test_runtime::Block,
-			StateBackend = backend::StateBackendFor<B, substrate_test_runtime::Block>
+			StateBackend = backend::StateBackendFor<B, substrate_test_runtime::Block>,
 		>,
 	B: backend::Backend<substrate_test_runtime::Block>,
 {
-	fn push_transfer(&mut self, transfer: substrate_test_runtime::Transfer) -> Result<(), sp_blockchain::Error> {
+	fn push_transfer(
+		&mut self,
+		transfer: substrate_test_runtime::Transfer,
+	) -> Result<(), sp_blockchain::Error> {
 		self.push(transfer.into_signed_tx())
 	}
 
diff --git a/test-utils/runtime/client/src/lib.rs b/test-utils/runtime/client/src/lib.rs
index a9ff26a5adf8..3db433968c9f 100644
--- a/test-utils/runtime/client/src/lib.rs
+++ b/test-utils/runtime/client/src/lib.rs
@@ -23,34 +23,36 @@ pub mod trait_tests;
 
 mod block_builder_ext;
 
-use std::sync::Arc;
-use std::collections::HashMap;
+pub use sc_consensus::LongestChain;
+use std::{collections::HashMap, sync::Arc};
 pub use substrate_test_client::*;
 pub use substrate_test_runtime as runtime;
-pub use sc_consensus::LongestChain;
 
 pub use self::block_builder_ext::BlockBuilderExt;
 
-use sp_core::{sr25519, ChangesTrieConfiguration};
-use sp_core::storage::{ChildInfo, Storage, StorageChild};
-use substrate_test_runtime::genesismap::{GenesisConfig, additional_storage_with_genesis};
-use sp_runtime::traits::{Block as BlockT, Header as HeaderT, Hash as HashT, NumberFor, HashFor};
 use sc_client_api::light::{
-	RemoteCallRequest, RemoteChangesRequest, RemoteBodyRequest,
-	Fetcher, RemoteHeaderRequest, RemoteReadRequest, RemoteReadChildRequest,
+	Fetcher, RemoteBodyRequest, RemoteCallRequest, RemoteChangesRequest, RemoteHeaderRequest,
+	RemoteReadChildRequest, RemoteReadRequest,
 };
+use sp_core::{
+	sr25519,
+	storage::{ChildInfo, Storage, StorageChild},
+	ChangesTrieConfiguration,
+};
+use sp_runtime::traits::{Block as BlockT, Hash as HashT, HashFor, Header as HeaderT, NumberFor};
+use substrate_test_runtime::genesismap::{additional_storage_with_genesis, GenesisConfig};
 
 /// A prelude to import in tests.
 pub mod prelude {
 	// Trait extensions
 	pub use super::{
-		BlockBuilderExt, DefaultTestClientBuilderExt, TestClientBuilderExt, ClientExt,
-		ClientBlockImportExt,
+		BlockBuilderExt, ClientBlockImportExt, ClientExt, DefaultTestClientBuilderExt,
+		TestClientBuilderExt,
 	};
 	// Client structs
 	pub use super::{
-		TestClient, TestClientBuilder, Backend, LightBackend,
-		Executor, LightExecutor, LocalExecutor, NativeExecutor, WasmExecutionMethod,
+		Backend, Executor, LightBackend, LightExecutor, LocalExecutor, NativeExecutor, TestClient,
+		TestClientBuilder, WasmExecutionMethod,
 	};
 	// Keyring
 	pub use super::{AccountKeyring, Sr25519Keyring};
@@ -82,10 +84,10 @@ pub type LightExecutor = sc_light::GenesisCallExecutor<
 		substrate_test_runtime::Block,
 		sc_light::Backend<
 			sc_client_db::light::LightStorage<substrate_test_runtime::Block>,
-			HashFor<substrate_test_runtime::Block>
+			HashFor<substrate_test_runtime::Block>,
 		>,
-		NativeExecutor<LocalExecutor>
-	>
+		NativeExecutor<LocalExecutor>,
+	>,
 >;
 
 /// Parameters of test-client builder with test-runtime.
@@ -130,19 +132,23 @@ impl substrate_test_client::GenesisInit for GenesisParameters {
 		let mut storage = self.genesis_config().genesis_map();
 
 		if let Some(ref code) = self.wasm_code {
-			storage.top.insert(sp_core::storage::well_known_keys::CODE.to_vec(), code.clone());
+			storage
+				.top
+				.insert(sp_core::storage::well_known_keys::CODE.to_vec(), code.clone());
 		}
 
 		let child_roots = storage.children_default.iter().map(|(_sk, child_content)| {
-			let state_root = <<<runtime::Block as BlockT>::Header as HeaderT>::Hashing as HashT>::trie_root(
-				child_content.data.clone().into_iter().collect()
-			);
+			let state_root =
+				<<<runtime::Block as BlockT>::Header as HeaderT>::Hashing as HashT>::trie_root(
+					child_content.data.clone().into_iter().collect(),
+				);
 			let prefixed_storage_key = child_content.child_info.prefixed_storage_key();
 			(prefixed_storage_key.into_inner(), state_root.encode())
 		});
-		let state_root = <<<runtime::Block as BlockT>::Header as HeaderT>::Hashing as HashT>::trie_root(
-			storage.top.clone().into_iter().chain(child_roots).collect()
-		);
+		let state_root =
+			<<<runtime::Block as BlockT>::Header as HeaderT>::Hashing as HashT>::trie_root(
+				storage.top.clone().into_iter().chain(child_roots).collect(),
+			);
 		let block: runtime::Block = client::genesis::construct_genesis_block(state_root);
 		storage.top.extend(additional_storage_with_genesis(&block));
 
@@ -164,7 +170,7 @@ pub type Client<B> = client::Client<
 	client::LocalCallExecutor<
 		substrate_test_runtime::Block,
 		B,
-		sc_executor::NativeExecutor<LocalExecutor>
+		sc_executor::NativeExecutor<LocalExecutor>,
 	>,
 	substrate_test_runtime::Block,
 	substrate_test_runtime::RuntimeApi,
@@ -217,12 +223,16 @@ pub trait TestClientBuilderExt<B>: Sized {
 		let key = key.into();
 		assert!(!storage_key.is_empty());
 		assert!(!key.is_empty());
-		self.genesis_init_mut().extra_storage.children_default
+		self.genesis_init_mut()
+			.extra_storage
+			.children_default
 			.entry(storage_key)
 			.or_insert_with(|| StorageChild {
 				data: Default::default(),
 				child_info: child_info.clone(),
-			}).data.insert(key, value.into());
+			})
+			.data
+			.insert(key, value.into());
 		self
 	}
 
@@ -244,27 +254,32 @@ pub trait TestClientBuilderExt<B>: Sized {
 	}
 
 	/// Build the test client and longest chain selector.
-	fn build_with_longest_chain(self) -> (Client<B>, sc_consensus::LongestChain<B, substrate_test_runtime::Block>);
+	fn build_with_longest_chain(
+		self,
+	) -> (Client<B>, sc_consensus::LongestChain<B, substrate_test_runtime::Block>);
 
 	/// Build the test client and the backend.
 	fn build_with_backend(self) -> (Client<B>, Arc<B>);
 }
 
-impl<B> TestClientBuilderExt<B> for TestClientBuilder<
-	client::LocalCallExecutor<
-		substrate_test_runtime::Block,
+impl<B> TestClientBuilderExt<B>
+	for TestClientBuilder<
+		client::LocalCallExecutor<
+			substrate_test_runtime::Block,
+			B,
+			sc_executor::NativeExecutor<LocalExecutor>,
+		>,
 		B,
-		sc_executor::NativeExecutor<LocalExecutor>
-	>,
-	B
-> where
+	> where
 	B: sc_client_api::backend::Backend<substrate_test_runtime::Block> + 'static,
 {
 	fn genesis_init_mut(&mut self) -> &mut GenesisParameters {
 		Self::genesis_init_mut(self)
 	}
 
-	fn build_with_longest_chain(self) -> (Client<B>, sc_consensus::LongestChain<B, substrate_test_runtime::Block>) {
+	fn build_with_longest_chain(
+		self,
+	) -> (Client<B>, sc_consensus::LongestChain<B, substrate_test_runtime::Block>) {
 		self.build_with_native_executor(None)
 	}
 
@@ -275,7 +290,8 @@ impl<B> TestClientBuilderExt<B> for TestClientBuilder<
 }
 
 /// Type of optional fetch callback.
-type MaybeFetcherCallback<Req, Resp> = Option<Box<dyn Fn(Req) -> Result<Resp, sp_blockchain::Error> + Send + Sync>>;
+type MaybeFetcherCallback<Req, Resp> =
+	Option<Box<dyn Fn(Req) -> Result<Resp, sp_blockchain::Error> + Send + Sync>>;
 
 /// Type of fetcher future result.
 type FetcherFutureResult<Resp> = futures::future::Ready<Result<Resp, sp_blockchain::Error>>;
@@ -284,7 +300,10 @@ type FetcherFutureResult<Resp> = futures::future::Ready<Result<Resp, sp_blockcha
 #[derive(Default)]
 pub struct LightFetcher {
 	call: MaybeFetcherCallback<RemoteCallRequest<substrate_test_runtime::Header>, Vec<u8>>,
-	body: MaybeFetcherCallback<RemoteBodyRequest<substrate_test_runtime::Header>, Vec<substrate_test_runtime::Extrinsic>>,
+	body: MaybeFetcherCallback<
+		RemoteBodyRequest<substrate_test_runtime::Header>,
+		Vec<substrate_test_runtime::Extrinsic>,
+	>,
 }
 
 impl LightFetcher {
@@ -293,21 +312,18 @@ impl LightFetcher {
 		self,
 		call: MaybeFetcherCallback<RemoteCallRequest<substrate_test_runtime::Header>, Vec<u8>>,
 	) -> Self {
-		LightFetcher {
-			call,
-			body: self.body,
-		}
+		LightFetcher { call, body: self.body }
 	}
 
 	/// Sets remote body callback.
 	pub fn with_remote_body(
 		self,
-		body: MaybeFetcherCallback<RemoteBodyRequest<substrate_test_runtime::Header>, Vec<substrate_test_runtime::Extrinsic>>,
+		body: MaybeFetcherCallback<
+			RemoteBodyRequest<substrate_test_runtime::Header>,
+			Vec<substrate_test_runtime::Extrinsic>,
+		>,
 	) -> Self {
-		LightFetcher {
-			call: self.call,
-			body,
-		}
+		LightFetcher { call: self.call, body }
 	}
 }
 
@@ -315,14 +331,21 @@ impl Fetcher<substrate_test_runtime::Block> for LightFetcher {
 	type RemoteHeaderResult = FetcherFutureResult<substrate_test_runtime::Header>;
 	type RemoteReadResult = FetcherFutureResult<HashMap<Vec<u8>, Option<Vec<u8>>>>;
 	type RemoteCallResult = FetcherFutureResult<Vec<u8>>;
-	type RemoteChangesResult = FetcherFutureResult<Vec<(NumberFor<substrate_test_runtime::Block>, u32)>>;
+	type RemoteChangesResult =
+		FetcherFutureResult<Vec<(NumberFor<substrate_test_runtime::Block>, u32)>>;
 	type RemoteBodyResult = FetcherFutureResult<Vec<substrate_test_runtime::Extrinsic>>;
 
-	fn remote_header(&self, _: RemoteHeaderRequest<substrate_test_runtime::Header>) -> Self::RemoteHeaderResult {
+	fn remote_header(
+		&self,
+		_: RemoteHeaderRequest<substrate_test_runtime::Header>,
+	) -> Self::RemoteHeaderResult {
 		unimplemented!()
 	}
 
-	fn remote_read(&self, _: RemoteReadRequest<substrate_test_runtime::Header>) -> Self::RemoteReadResult {
+	fn remote_read(
+		&self,
+		_: RemoteReadRequest<substrate_test_runtime::Header>,
+	) -> Self::RemoteReadResult {
 		unimplemented!()
 	}
 
@@ -333,18 +356,27 @@ impl Fetcher<substrate_test_runtime::Block> for LightFetcher {
 		unimplemented!()
 	}
 
-	fn remote_call(&self, req: RemoteCallRequest<substrate_test_runtime::Header>) -> Self::RemoteCallResult {
+	fn remote_call(
+		&self,
+		req: RemoteCallRequest<substrate_test_runtime::Header>,
+	) -> Self::RemoteCallResult {
 		match self.call {
 			Some(ref call) => futures::future::ready(call(req)),
 			None => unimplemented!(),
 		}
 	}
 
-	fn remote_changes(&self, _: RemoteChangesRequest<substrate_test_runtime::Header>) -> Self::RemoteChangesResult {
+	fn remote_changes(
+		&self,
+		_: RemoteChangesRequest<substrate_test_runtime::Header>,
+	) -> Self::RemoteChangesResult {
 		unimplemented!()
 	}
 
-	fn remote_body(&self, req: RemoteBodyRequest<substrate_test_runtime::Header>) -> Self::RemoteBodyResult {
+	fn remote_body(
+		&self,
+		req: RemoteBodyRequest<substrate_test_runtime::Header>,
+	) -> Self::RemoteBodyResult {
 		match self.body {
 			Some(ref body) => futures::future::ready(body(req)),
 			None => unimplemented!(),
@@ -359,10 +391,14 @@ pub fn new() -> Client<Backend> {
 
 /// Creates new light client instance used for tests.
 pub fn new_light() -> (
-	client::Client<LightBackend, LightExecutor, substrate_test_runtime::Block, substrate_test_runtime::RuntimeApi>,
+	client::Client<
+		LightBackend,
+		LightExecutor,
+		substrate_test_runtime::Block,
+		substrate_test_runtime::RuntimeApi,
+	>,
 	Arc<LightBackend>,
 ) {
-
 	let storage = sc_client_db::light::LightStorage::new_test();
 	let blockchain = Arc::new(sc_light::Blockchain::new(storage));
 	let backend = Arc::new(LightBackend::new(blockchain));
@@ -372,11 +408,9 @@ pub fn new_light() -> (
 		executor,
 		Box::new(sp_core::testing::TaskExecutor::new()),
 		Default::default(),
-	).expect("Creates LocalCallExecutor");
-	let call_executor = LightExecutor::new(
-		backend.clone(),
-		local_call_executor,
-	);
+	)
+	.expect("Creates LocalCallExecutor");
+	let call_executor = LightExecutor::new(backend.clone(), local_call_executor);
 
 	(
 		TestClientBuilder::with_backend(backend.clone())
diff --git a/test-utils/runtime/client/src/trait_tests.rs b/test-utils/runtime/client/src/trait_tests.rs
index 797c7ec089bd..ef3555f704a6 100644
--- a/test-utils/runtime/client/src/trait_tests.rs
+++ b/test-utils/runtime/client/src/trait_tests.rs
@@ -23,192 +23,169 @@
 use std::sync::Arc;
 
 use crate::{
-	AccountKeyring, ClientBlockImportExt, BlockBuilderExt, TestClientBuilder, TestClientBuilderExt,
+	AccountKeyring, BlockBuilderExt, ClientBlockImportExt, TestClientBuilder, TestClientBuilderExt,
+};
+use futures::executor::block_on;
+use sc_block_builder::BlockBuilderProvider;
+use sc_client_api::{
+	backend,
+	blockchain::{Backend as BlockChainBackendT, HeaderBackend},
 };
-use sc_client_api::backend;
-use sc_client_api::blockchain::{Backend as BlockChainBackendT, HeaderBackend};
 use sp_consensus::BlockOrigin;
+use sp_runtime::{generic::BlockId, traits::Block as BlockT};
 use substrate_test_runtime::{self, Transfer};
-use sp_runtime::generic::BlockId;
-use sp_runtime::traits::Block as BlockT;
-use sc_block_builder::BlockBuilderProvider;
-use futures::executor::block_on;
 
 /// helper to test the `leaves` implementation for various backends
-pub fn test_leaves_for_backend<B: 'static>(backend: Arc<B>) where
+pub fn test_leaves_for_backend<B: 'static>(backend: Arc<B>)
+where
 	B: backend::Backend<substrate_test_runtime::Block>,
 {
 	// block tree:
 	// G -> A1 -> A2 -> A3 -> A4 -> A5
-	//		A1 -> B2 -> B3 -> B4
-	//			  B2 -> C3
-	//		A1 -> D2
+	// 		A1 -> B2 -> B3 -> B4
+	// 			  B2 -> C3
+	// 		A1 -> D2
 
 	let mut client = TestClientBuilder::with_backend(backend.clone()).build();
 	let blockchain = backend.blockchain();
 
 	let genesis_hash = client.chain_info().genesis_hash;
 
-	assert_eq!(
-		blockchain.leaves().unwrap(),
-		vec![genesis_hash]);
+	assert_eq!(blockchain.leaves().unwrap(), vec![genesis_hash]);
 
 	// G -> A1
 	let a1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
-	assert_eq!(
-		blockchain.leaves().unwrap(),
-		vec![a1.hash()],
-	);
+	assert_eq!(blockchain.leaves().unwrap(), vec![a1.hash()],);
 
 	// A1 -> A2
-	let a2 = client.new_block_at(
-		&BlockId::Hash(a1.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let a2 = client
+		.new_block_at(&BlockId::Hash(a1.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
 	#[allow(deprecated)]
-	assert_eq!(
-		blockchain.leaves().unwrap(),
-		vec![a2.hash()],
-	);
+	assert_eq!(blockchain.leaves().unwrap(), vec![a2.hash()],);
 
 	// A2 -> A3
-	let a3 = client.new_block_at(
-		&BlockId::Hash(a2.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let a3 = client
+		.new_block_at(&BlockId::Hash(a2.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a3.clone())).unwrap();
 
-	assert_eq!(
-		blockchain.leaves().unwrap(),
-		vec![a3.hash()],
-	);
+	assert_eq!(blockchain.leaves().unwrap(), vec![a3.hash()],);
 
 	// A3 -> A4
-	let a4 = client.new_block_at(
-		&BlockId::Hash(a3.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let a4 = client
+		.new_block_at(&BlockId::Hash(a3.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a4.clone())).unwrap();
-	assert_eq!(
-		blockchain.leaves().unwrap(),
-		vec![a4.hash()],
-	);
+	assert_eq!(blockchain.leaves().unwrap(), vec![a4.hash()],);
 
 	// A4 -> A5
-	let a5 = client.new_block_at(
-		&BlockId::Hash(a4.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let a5 = client
+		.new_block_at(&BlockId::Hash(a4.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 
 	block_on(client.import(BlockOrigin::Own, a5.clone())).unwrap();
-	assert_eq!(
-		blockchain.leaves().unwrap(),
-		vec![a5.hash()],
-	);
+	assert_eq!(blockchain.leaves().unwrap(), vec![a5.hash()],);
 
 	// A1 -> B2
-	let mut builder = client.new_block_at(
-		&BlockId::Hash(a1.hash()),
-		Default::default(),
-		false,
-	).unwrap();
+	let mut builder = client
+		.new_block_at(&BlockId::Hash(a1.hash()), Default::default(), false)
+		.unwrap();
 
 	// this push is required as otherwise B2 has the same hash as A2 and won't get imported
-	builder.push_transfer(Transfer {
-		from: AccountKeyring::Alice.into(),
-		to: AccountKeyring::Ferdie.into(),
-		amount: 41,
-		nonce: 0,
-	}).unwrap();
+	builder
+		.push_transfer(Transfer {
+			from: AccountKeyring::Alice.into(),
+			to: AccountKeyring::Ferdie.into(),
+			amount: 41,
+			nonce: 0,
+		})
+		.unwrap();
 	let b2 = builder.build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, b2.clone())).unwrap();
-	assert_eq!(
-		blockchain.leaves().unwrap(),
-		vec![a5.hash(), b2.hash()],
-	);
+	assert_eq!(blockchain.leaves().unwrap(), vec![a5.hash(), b2.hash()],);
 
 	// B2 -> B3
-	let b3 = client.new_block_at(
-		&BlockId::Hash(b2.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let b3 = client
+		.new_block_at(&BlockId::Hash(b2.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 
 	block_on(client.import(BlockOrigin::Own, b3.clone())).unwrap();
-	assert_eq!(
-		blockchain.leaves().unwrap(),
-		vec![a5.hash(), b3.hash()],
-	);
+	assert_eq!(blockchain.leaves().unwrap(), vec![a5.hash(), b3.hash()],);
 
 	// B3 -> B4
-	let b4 = client.new_block_at(
-		&BlockId::Hash(b3.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let b4 = client
+		.new_block_at(&BlockId::Hash(b3.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, b4.clone())).unwrap();
-	assert_eq!(
-		blockchain.leaves().unwrap(),
-		vec![a5.hash(), b4.hash()],
-	);
+	assert_eq!(blockchain.leaves().unwrap(), vec![a5.hash(), b4.hash()],);
 
 	// // B2 -> C3
-	let mut builder = client.new_block_at(
-		&BlockId::Hash(b2.hash()),
-		Default::default(),
-		false,
-	).unwrap();
+	let mut builder = client
+		.new_block_at(&BlockId::Hash(b2.hash()), Default::default(), false)
+		.unwrap();
 	// this push is required as otherwise C3 has the same hash as B3 and won't get imported
-	builder.push_transfer(Transfer {
-		from: AccountKeyring::Alice.into(),
-		to: AccountKeyring::Ferdie.into(),
-		amount: 1,
-		nonce: 1,
-	}).unwrap();
+	builder
+		.push_transfer(Transfer {
+			from: AccountKeyring::Alice.into(),
+			to: AccountKeyring::Ferdie.into(),
+			amount: 1,
+			nonce: 1,
+		})
+		.unwrap();
 	let c3 = builder.build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, c3.clone())).unwrap();
-	assert_eq!(
-		blockchain.leaves().unwrap(),
-		vec![a5.hash(), b4.hash(), c3.hash()],
-	);
+	assert_eq!(blockchain.leaves().unwrap(), vec![a5.hash(), b4.hash(), c3.hash()],);
 
 	// A1 -> D2
-	let mut builder = client.new_block_at(
-		&BlockId::Hash(a1.hash()),
-		Default::default(),
-		false,
-	).unwrap();
+	let mut builder = client
+		.new_block_at(&BlockId::Hash(a1.hash()), Default::default(), false)
+		.unwrap();
 	// this push is required as otherwise D2 has the same hash as B2 and won't get imported
-	builder.push_transfer(Transfer {
-		from: AccountKeyring::Alice.into(),
-		to: AccountKeyring::Ferdie.into(),
-		amount: 1,
-		nonce: 0,
-	}).unwrap();
+	builder
+		.push_transfer(Transfer {
+			from: AccountKeyring::Alice.into(),
+			to: AccountKeyring::Ferdie.into(),
+			amount: 1,
+			nonce: 0,
+		})
+		.unwrap();
 	let d2 = builder.build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, d2.clone())).unwrap();
-	assert_eq!(
-		blockchain.leaves().unwrap(),
-		vec![a5.hash(), b4.hash(), c3.hash(), d2.hash()],
-	);
+	assert_eq!(blockchain.leaves().unwrap(), vec![a5.hash(), b4.hash(), c3.hash(), d2.hash()],);
 }
 
 /// helper to test the `children` implementation for various backends
-pub fn test_children_for_backend<B: 'static>(backend: Arc<B>) where
+pub fn test_children_for_backend<B: 'static>(backend: Arc<B>)
+where
 	B: backend::LocalBackend<substrate_test_runtime::Block>,
 {
 	// block tree:
 	// G -> A1 -> A2 -> A3 -> A4 -> A5
-	//		A1 -> B2 -> B3 -> B4
-	//			  B2 -> C3
-	//		A1 -> D2
+	// 		A1 -> B2 -> B3 -> B4
+	// 			  B2 -> C3
+	// 		A1 -> D2
 
 	let mut client = TestClientBuilder::with_backend(backend.clone()).build();
 	let blockchain = backend.blockchain();
@@ -218,98 +195,104 @@ pub fn test_children_for_backend<B: 'static>(backend: Arc<B>) where
 	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
 	// A1 -> A2
-	let a2 = client.new_block_at(
-		&BlockId::Hash(a1.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let a2 = client
+		.new_block_at(&BlockId::Hash(a1.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
 	// A2 -> A3
-	let a3 = client.new_block_at(
-		&BlockId::Hash(a2.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let a3 = client
+		.new_block_at(&BlockId::Hash(a2.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a3.clone())).unwrap();
 
 	// A3 -> A4
-	let a4 = client.new_block_at(
-		&BlockId::Hash(a3.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let a4 = client
+		.new_block_at(&BlockId::Hash(a3.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a4.clone())).unwrap();
 
 	// A4 -> A5
-	let a5 = client.new_block_at(
-		&BlockId::Hash(a4.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let a5 = client
+		.new_block_at(&BlockId::Hash(a4.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a5.clone())).unwrap();
 
 	// A1 -> B2
-	let mut builder = client.new_block_at(
-		&BlockId::Hash(a1.hash()),
-		Default::default(),
-		false,
-	).unwrap();
+	let mut builder = client
+		.new_block_at(&BlockId::Hash(a1.hash()), Default::default(), false)
+		.unwrap();
 	// this push is required as otherwise B2 has the same hash as A2 and won't get imported
-	builder.push_transfer(Transfer {
-		from: AccountKeyring::Alice.into(),
-		to: AccountKeyring::Ferdie.into(),
-		amount: 41,
-		nonce: 0,
-	}).unwrap();
+	builder
+		.push_transfer(Transfer {
+			from: AccountKeyring::Alice.into(),
+			to: AccountKeyring::Ferdie.into(),
+			amount: 41,
+			nonce: 0,
+		})
+		.unwrap();
 	let b2 = builder.build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, b2.clone())).unwrap();
 
 	// B2 -> B3
-	let b3 = client.new_block_at(
-		&BlockId::Hash(b2.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let b3 = client
+		.new_block_at(&BlockId::Hash(b2.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, b3.clone())).unwrap();
 
 	// B3 -> B4
-	let b4 = client.new_block_at(
-		&BlockId::Hash(b3.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let b4 = client
+		.new_block_at(&BlockId::Hash(b3.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, b4)).unwrap();
 
 	// // B2 -> C3
-	let mut builder = client.new_block_at(
-		&BlockId::Hash(b2.hash()),
-		Default::default(),
-		false,
-	).unwrap();
+	let mut builder = client
+		.new_block_at(&BlockId::Hash(b2.hash()), Default::default(), false)
+		.unwrap();
 	// this push is required as otherwise C3 has the same hash as B3 and won't get imported
-	builder.push_transfer(Transfer {
-		from: AccountKeyring::Alice.into(),
-		to: AccountKeyring::Ferdie.into(),
-		amount: 1,
-		nonce: 1,
-	}).unwrap();
+	builder
+		.push_transfer(Transfer {
+			from: AccountKeyring::Alice.into(),
+			to: AccountKeyring::Ferdie.into(),
+			amount: 1,
+			nonce: 1,
+		})
+		.unwrap();
 	let c3 = builder.build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, c3.clone())).unwrap();
 
 	// A1 -> D2
-	let mut builder = client.new_block_at(
-		&BlockId::Hash(a1.hash()),
-		Default::default(),
-		false,
-	).unwrap();
+	let mut builder = client
+		.new_block_at(&BlockId::Hash(a1.hash()), Default::default(), false)
+		.unwrap();
 	// this push is required as otherwise D2 has the same hash as B2 and won't get imported
-	builder.push_transfer(Transfer {
-		from: AccountKeyring::Alice.into(),
-		to: AccountKeyring::Ferdie.into(),
-		amount: 1,
-		nonce: 0,
-	}).unwrap();
+	builder
+		.push_transfer(Transfer {
+			from: AccountKeyring::Alice.into(),
+			to: AccountKeyring::Ferdie.into(),
+			amount: 1,
+			nonce: 0,
+		})
+		.unwrap();
 	let d2 = builder.build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, d2.clone())).unwrap();
 
@@ -334,9 +317,9 @@ where
 {
 	// block tree:
 	// G -> A1 -> A2 -> A3 -> A4 -> A5
-	//		A1 -> B2 -> B3 -> B4
-	//			  B2 -> C3
-	//		A1 -> D2
+	// 		A1 -> B2 -> B3 -> B4
+	// 			  B2 -> C3
+	// 		A1 -> D2
 	let mut client = TestClientBuilder::with_backend(backend.clone()).build();
 	let blockchain = backend.blockchain();
 
@@ -345,98 +328,104 @@ where
 	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
 	// A1 -> A2
-	let a2 = client.new_block_at(
-		&BlockId::Hash(a1.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let a2 = client
+		.new_block_at(&BlockId::Hash(a1.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
 	// A2 -> A3
-	let a3 = client.new_block_at(
-		&BlockId::Hash(a2.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let a3 = client
+		.new_block_at(&BlockId::Hash(a2.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a3.clone())).unwrap();
 
 	// A3 -> A4
-	let a4 = client.new_block_at(
-		&BlockId::Hash(a3.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let a4 = client
+		.new_block_at(&BlockId::Hash(a3.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a4.clone())).unwrap();
 
 	// A4 -> A5
-	let a5 = client.new_block_at(
-		&BlockId::Hash(a4.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let a5 = client
+		.new_block_at(&BlockId::Hash(a4.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a5.clone())).unwrap();
 
 	// A1 -> B2
-	let mut builder = client.new_block_at(
-		&BlockId::Hash(a1.hash()),
-		Default::default(),
-		false,
-	).unwrap();
+	let mut builder = client
+		.new_block_at(&BlockId::Hash(a1.hash()), Default::default(), false)
+		.unwrap();
 	// this push is required as otherwise B2 has the same hash as A2 and won't get imported
-	builder.push_transfer(Transfer {
-		from: AccountKeyring::Alice.into(),
-		to: AccountKeyring::Ferdie.into(),
-		amount: 41,
-		nonce: 0,
-	}).unwrap();
+	builder
+		.push_transfer(Transfer {
+			from: AccountKeyring::Alice.into(),
+			to: AccountKeyring::Ferdie.into(),
+			amount: 41,
+			nonce: 0,
+		})
+		.unwrap();
 	let b2 = builder.build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, b2.clone())).unwrap();
 
 	// B2 -> B3
-	let b3 = client.new_block_at(
-		&BlockId::Hash(b2.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let b3 = client
+		.new_block_at(&BlockId::Hash(b2.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, b3.clone())).unwrap();
 
 	// B3 -> B4
-	let b4 = client.new_block_at(
-		&BlockId::Hash(b3.hash()),
-		Default::default(),
-		false,
-	).unwrap().build().unwrap().block;
+	let b4 = client
+		.new_block_at(&BlockId::Hash(b3.hash()), Default::default(), false)
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, b4)).unwrap();
 
 	// // B2 -> C3
-	let mut builder = client.new_block_at(
-		&BlockId::Hash(b2.hash()),
-		Default::default(),
-		false,
-	).unwrap();
+	let mut builder = client
+		.new_block_at(&BlockId::Hash(b2.hash()), Default::default(), false)
+		.unwrap();
 	// this push is required as otherwise C3 has the same hash as B3 and won't get imported
-	builder.push_transfer(Transfer {
-		from: AccountKeyring::Alice.into(),
-		to: AccountKeyring::Ferdie.into(),
-		amount: 1,
-		nonce: 1,
-	}).unwrap();
+	builder
+		.push_transfer(Transfer {
+			from: AccountKeyring::Alice.into(),
+			to: AccountKeyring::Ferdie.into(),
+			amount: 1,
+			nonce: 1,
+		})
+		.unwrap();
 	let c3 = builder.build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, c3)).unwrap();
 
 	// A1 -> D2
-	let mut builder = client.new_block_at(
-		&BlockId::Hash(a1.hash()),
-		Default::default(),
-		false,
-	).unwrap();
+	let mut builder = client
+		.new_block_at(&BlockId::Hash(a1.hash()), Default::default(), false)
+		.unwrap();
 	// this push is required as otherwise D2 has the same hash as B2 and won't get imported
-	builder.push_transfer(Transfer {
-		from: AccountKeyring::Alice.into(),
-		to: AccountKeyring::Ferdie.into(),
-		amount: 1,
-		nonce: 0,
-	}).unwrap();
+	builder
+		.push_transfer(Transfer {
+			from: AccountKeyring::Alice.into(),
+			to: AccountKeyring::Ferdie.into(),
+			amount: 1,
+			nonce: 0,
+		})
+		.unwrap();
 	let d2 = builder.build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, d2)).unwrap();
 
diff --git a/test-utils/runtime/src/genesismap.rs b/test-utils/runtime/src/genesismap.rs
index 63c4bab55ec4..a8801b8519df 100644
--- a/test-utils/runtime/src/genesismap.rs
+++ b/test-utils/runtime/src/genesismap.rs
@@ -17,14 +17,17 @@
 
 //! Tool for creating the genesis block.
 
-use std::collections::BTreeMap;
+use super::{system, wasm_binary_unwrap, AccountId, AuthorityId};
+use codec::{Encode, Joiner, KeyedVec};
+use sc_service::client::genesis;
+use sp_core::{
+	map,
+	storage::{well_known_keys, Storage},
+	ChangesTrieConfiguration,
+};
 use sp_io::hashing::{blake2_256, twox_128};
-use super::{AuthorityId, AccountId, wasm_binary_unwrap, system};
-use codec::{Encode, KeyedVec, Joiner};
-use sp_core::{ChangesTrieConfiguration, map};
-use sp_core::storage::{well_known_keys, Storage};
 use sp_runtime::traits::{Block as BlockT, Hash as HashT, Header as HeaderT};
-use sc_service::client::genesis;
+use std::collections::BTreeMap;
 
 /// Configuration of a general Substrate test genesis block.
 pub struct GenesisConfig {
@@ -47,7 +50,7 @@ impl GenesisConfig {
 	) -> Self {
 		GenesisConfig {
 			changes_trie_config,
-			authorities: authorities,
+			authorities,
 			balances: endowed_accounts.into_iter().map(|a| (a, balance)).collect(),
 			heap_pages_override,
 			extra_storage,
@@ -56,16 +59,23 @@ impl GenesisConfig {
 
 	pub fn genesis_map(&self) -> Storage {
 		let wasm_runtime = wasm_binary_unwrap().to_vec();
-		let mut map: BTreeMap<Vec<u8>, Vec<u8>> = self.balances.iter()
-			.map(|&(ref account, balance)| (account.to_keyed_vec(b"balance:"), vec![].and(&balance)))
+		let mut map: BTreeMap<Vec<u8>, Vec<u8>> = self
+			.balances
+			.iter()
+			.map(|&(ref account, balance)| {
+				(account.to_keyed_vec(b"balance:"), vec![].and(&balance))
+			})
 			.map(|(k, v)| (blake2_256(&k[..])[..].to_vec(), v.to_vec()))
-			.chain(vec![
-				(well_known_keys::CODE.into(), wasm_runtime),
-				(
-					well_known_keys::HEAP_PAGES.into(),
-					vec![].and(&(self.heap_pages_override.unwrap_or(16 as u64))),
-				),
-			].into_iter())
+			.chain(
+				vec![
+					(well_known_keys::CODE.into(), wasm_runtime),
+					(
+						well_known_keys::HEAP_PAGES.into(),
+						vec![].and(&(self.heap_pages_override.unwrap_or(16 as u64))),
+					),
+				]
+				.into_iter(),
+			)
 			.collect();
 		if let Some(ref changes_trie_config) = self.changes_trie_config {
 			map.insert(well_known_keys::CHANGES_TRIE_CONFIG.to_vec(), changes_trie_config.encode());
@@ -75,28 +85,30 @@ impl GenesisConfig {
 		map.extend(self.extra_storage.top.clone().into_iter());
 
 		// Assimilate the system genesis config.
-		let mut storage = Storage { top: map, children_default: self.extra_storage.children_default.clone()};
+		let mut storage =
+			Storage { top: map, children_default: self.extra_storage.children_default.clone() };
 		let mut config = system::GenesisConfig::default();
 		config.authorities = self.authorities.clone();
-		config.assimilate_storage(&mut storage).expect("Adding `system::GensisConfig` to the genesis");
+		config
+			.assimilate_storage(&mut storage)
+			.expect("Adding `system::GensisConfig` to the genesis");
 
 		storage
 	}
 }
 
-pub fn insert_genesis_block(
-	storage: &mut Storage,
-) -> sp_core::hash::H256 {
+pub fn insert_genesis_block(storage: &mut Storage) -> sp_core::hash::H256 {
 	let child_roots = storage.children_default.iter().map(|(sk, child_content)| {
-		let state_root = <<<crate::Block as BlockT>::Header as HeaderT>::Hashing as HashT>::trie_root(
-			child_content.data.clone().into_iter().collect(),
-		);
+		let state_root =
+			<<<crate::Block as BlockT>::Header as HeaderT>::Hashing as HashT>::trie_root(
+				child_content.data.clone().into_iter().collect(),
+			);
 		(sk.clone(), state_root.encode())
 	});
 	// add child roots to storage
 	storage.top.extend(child_roots);
 	let state_root = <<<crate::Block as BlockT>::Header as HeaderT>::Hashing as HashT>::trie_root(
-		storage.top.clone().into_iter().collect()
+		storage.top.clone().into_iter().collect(),
 	);
 	let block: crate::Block = genesis::construct_genesis_block(state_root);
 	let genesis_hash = block.header.hash();
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index f4c722ab12c2..62aa28d4260a 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -23,45 +23,43 @@
 pub mod genesismap;
 pub mod system;
 
-use sp_std::{prelude::*, marker::PhantomData};
-use codec::{Encode, Decode, Input, Error};
+use codec::{Decode, Encode, Error, Input};
+use sp_std::{marker::PhantomData, prelude::*};
 
+use sp_application_crypto::{ecdsa, ed25519, sr25519, RuntimeAppPublic};
 use sp_core::{offchain::KeyTypeId, ChangesTrieConfiguration, OpaqueMetadata, RuntimeDebug};
-use sp_application_crypto::{ed25519, sr25519, ecdsa, RuntimeAppPublic};
-use trie_db::{TrieMut, Trie};
-use sp_trie::{PrefixedMemoryDB, StorageProof};
-use sp_trie::trie_types::{TrieDB, TrieDBMut};
+use sp_trie::{
+	trie_types::{TrieDB, TrieDBMut},
+	PrefixedMemoryDB, StorageProof,
+};
+use trie_db::{Trie, TrieMut};
 
+use cfg_if::cfg_if;
+use frame_support::{parameter_types, traits::KeyOwnerProofSystem, weights::RuntimeDbWeight};
+use frame_system::limits::{BlockLength, BlockWeights};
 use sp_api::{decl_runtime_apis, impl_runtime_apis};
+pub use sp_core::hash::H256;
+use sp_inherents::{CheckInherentsResult, InherentData};
+#[cfg(feature = "std")]
+use sp_runtime::traits::NumberFor;
 use sp_runtime::{
 	create_runtime_str, impl_opaque_keys,
-	ApplyExtrinsicResult, Perbill,
-	transaction_validity::{
-		TransactionValidity, ValidTransaction, TransactionValidityError, InvalidTransaction,
-		TransactionSource,
-	},
 	traits::{
-		BlindCheckable, BlakeTwo256, Block as BlockT, Extrinsic as ExtrinsicT,
-		GetNodeBlockType, GetRuntimeBlockType, Verify, IdentityLookup,
+		BlakeTwo256, BlindCheckable, Block as BlockT, Extrinsic as ExtrinsicT, GetNodeBlockType,
+		GetRuntimeBlockType, IdentityLookup, Verify,
 	},
+	transaction_validity::{
+		InvalidTransaction, TransactionSource, TransactionValidity, TransactionValidityError,
+		ValidTransaction,
+	},
+	ApplyExtrinsicResult, Perbill,
 };
-#[cfg(feature = "std")]
-use sp_runtime::traits::NumberFor;
-use sp_version::RuntimeVersion;
-pub use sp_core::hash::H256;
 #[cfg(any(feature = "std", test))]
 use sp_version::NativeVersion;
-use frame_support::{
-	parameter_types,
-	traits::KeyOwnerProofSystem,
-	weights::RuntimeDbWeight,
-};
-use frame_system::limits::{BlockWeights, BlockLength};
-use sp_inherents::{CheckInherentsResult, InherentData};
-use cfg_if::cfg_if;
+use sp_version::RuntimeVersion;
 
 // Ensure Babe and Aura use the same crypto to simplify things a bit.
-pub use sp_consensus_babe::{AuthorityId, Slot, AllowedSlots};
+pub use sp_consensus_babe::{AllowedSlots, AuthorityId, Slot};
 
 pub type AuraId = sp_consensus_aura::sr25519::AuthorityId;
 
@@ -77,18 +75,19 @@ pub mod wasm_binary_logging_disabled {
 /// Wasm binary unwrapped. If built with `SKIP_WASM_BUILD`, the function panics.
 #[cfg(feature = "std")]
 pub fn wasm_binary_unwrap() -> &'static [u8] {
-	WASM_BINARY.expect("Development wasm binary is not available. Testing is only \
-						supported with the flag disabled.")
+	WASM_BINARY.expect(
+		"Development wasm binary is not available. Testing is only \
+						supported with the flag disabled.",
+	)
 }
 
 /// Wasm binary unwrapped. If built with `SKIP_WASM_BUILD`, the function panics.
 #[cfg(feature = "std")]
 pub fn wasm_binary_logging_disabled_unwrap() -> &'static [u8] {
-	wasm_binary_logging_disabled::WASM_BINARY
-		.expect(
-			"Development wasm binary is not available. Testing is only supported with the flag \
-			disabled."
-		)
+	wasm_binary_logging_disabled::WASM_BINARY.expect(
+		"Development wasm binary is not available. Testing is only supported with the flag \
+			disabled.",
+	)
 }
 
 /// Test runtime version.
@@ -110,10 +109,7 @@ fn version() -> RuntimeVersion {
 /// Native version.
 #[cfg(any(feature = "std", test))]
 pub fn native_version() -> NativeVersion {
-	NativeVersion {
-		runtime_version: VERSION,
-		can_author_with: Default::default(),
-	}
+	NativeVersion { runtime_version: VERSION, can_author_with: Default::default() }
 }
 
 /// Calls in transactions.
@@ -130,12 +126,10 @@ impl Transfer {
 	#[cfg(feature = "std")]
 	pub fn into_signed_tx(self) -> Extrinsic {
 		let signature = sp_keyring::AccountKeyring::from_public(&self.from)
-			.expect("Creates keyring from public key.").sign(&self.encode()).into();
-		Extrinsic::Transfer {
-			transfer: self,
-			signature,
-			exhaust_resources_when_not_first: false,
-		}
+			.expect("Creates keyring from public key.")
+			.sign(&self.encode())
+			.into();
+		Extrinsic::Transfer { transfer: self, signature, exhaust_resources_when_not_first: false }
 	}
 
 	/// Convert into a signed extrinsic, which will only end up included in the block
@@ -144,12 +138,10 @@ impl Transfer {
 	#[cfg(feature = "std")]
 	pub fn into_resources_exhausting_tx(self) -> Extrinsic {
 		let signature = sp_keyring::AccountKeyring::from_public(&self.from)
-			.expect("Creates keyring from public key.").sign(&self.encode()).into();
-		Extrinsic::Transfer {
-			transfer: self,
-			signature,
-			exhaust_resources_when_not_first: true,
-		}
+			.expect("Creates keyring from public key.")
+			.sign(&self.encode())
+			.into();
+		Extrinsic::Transfer { transfer: self, signature, exhaust_resources_when_not_first: true }
 	}
 }
 
@@ -174,7 +166,10 @@ parity_util_mem::malloc_size_of_is_0!(Extrinsic); // non-opaque extrinsic does n
 
 #[cfg(feature = "std")]
 impl serde::Serialize for Extrinsic {
-	fn serialize<S>(&self, seq: S) -> Result<S::Ok, S::Error> where S: ::serde::Serializer {
+	fn serialize<S>(&self, seq: S) -> Result<S::Ok, S::Error>
+	where
+		S: ::serde::Serializer,
+	{
 		self.using_encoded(|bytes| seq.serialize_bytes(bytes))
 	}
 }
@@ -185,21 +180,22 @@ impl BlindCheckable for Extrinsic {
 	fn check(self) -> Result<Self, TransactionValidityError> {
 		match self {
 			Extrinsic::AuthoritiesChange(new_auth) => Ok(Extrinsic::AuthoritiesChange(new_auth)),
-			Extrinsic::Transfer { transfer, signature, exhaust_resources_when_not_first } => {
+			Extrinsic::Transfer { transfer, signature, exhaust_resources_when_not_first } =>
 				if sp_runtime::verify_encoded_lazy(&signature, &transfer, &transfer.from) {
-					Ok(Extrinsic::Transfer { transfer, signature, exhaust_resources_when_not_first })
+					Ok(Extrinsic::Transfer {
+						transfer,
+						signature,
+						exhaust_resources_when_not_first,
+					})
 				} else {
 					Err(InvalidTransaction::BadProof.into())
-				}
-			},
+				},
 			Extrinsic::IncludeData(v) => Ok(Extrinsic::IncludeData(v)),
 			Extrinsic::StorageChange(key, value) => Ok(Extrinsic::StorageChange(key, value)),
 			Extrinsic::ChangesTrieConfigUpdate(new_config) =>
 				Ok(Extrinsic::ChangesTrieConfigUpdate(new_config)),
-			Extrinsic::OffchainIndexSet(key, value) =>
-				Ok(Extrinsic::OffchainIndexSet(key, value)),
-			Extrinsic::OffchainIndexClear(key) =>
-				Ok(Extrinsic::OffchainIndexClear(key)),
+			Extrinsic::OffchainIndexSet(key, value) => Ok(Extrinsic::OffchainIndexSet(key, value)),
+			Extrinsic::OffchainIndexClear(key) => Ok(Extrinsic::OffchainIndexClear(key)),
 			Extrinsic::Store(data) => Ok(Extrinsic::Store(data)),
 		}
 	}
@@ -301,9 +297,7 @@ impl<B: BlockT> codec::EncodeLike for DecodeFails<B> {}
 impl<B: BlockT> DecodeFails<B> {
 	/// Create a new instance.
 	pub fn new() -> DecodeFails<B> {
-		DecodeFails {
-			_phantom: Default::default(),
-		}
+		DecodeFails { _phantom: Default::default() }
 	}
 }
 
@@ -619,7 +613,8 @@ fn code_using_trie() -> u64 {
 	let pairs = [
 		(b"0103000000000000000464".to_vec(), b"0400000000".to_vec()),
 		(b"0103000000000000000469".to_vec(), b"0401000000".to_vec()),
-	].to_vec();
+	]
+	.to_vec();
 
 	let mut mdb = PrefixedMemoryDB::default();
 	let mut root = sp_std::default::Default::default();
@@ -627,10 +622,10 @@ fn code_using_trie() -> u64 {
 		let v = &pairs;
 		let mut t = TrieDBMut::<Hashing>::new(&mut mdb, &mut root);
 		for i in 0..v.len() {
-			let key: &[u8]= &v[i].0;
+			let key: &[u8] = &v[i].0;
 			let val: &[u8] = &v[i].1;
 			if !t.insert(key, val).is_ok() {
-				return 101;
+				return 101
 			}
 		}
 		t
@@ -645,8 +640,12 @@ fn code_using_trie() -> u64 {
 				}
 			}
 			iter_pairs.len() as u64
-		} else { 102 }
-	} else { 103 }
+		} else {
+			102
+		}
+	} else {
+		103
+	}
 }
 
 impl_opaque_keys! {
@@ -1206,29 +1205,15 @@ fn test_read_storage() {
 fn test_read_child_storage() {
 	const STORAGE_KEY: &[u8] = b"unique_id_1";
 	const KEY: &[u8] = b":read_child_storage";
-	sp_io::default_child_storage::set(
-		STORAGE_KEY,
-		KEY,
-		b"test",
-	);
+	sp_io::default_child_storage::set(STORAGE_KEY, KEY, b"test");
 
 	let mut v = [0u8; 4];
-	let r = sp_io::default_child_storage::read(
-		STORAGE_KEY,
-		KEY,
-		&mut v,
-		0,
-	);
+	let r = sp_io::default_child_storage::read(STORAGE_KEY, KEY, &mut v, 0);
 	assert_eq!(r, Some(4));
 	assert_eq!(&v, b"test");
 
 	let mut v = [0u8; 4];
-	let r = sp_io::default_child_storage::read(
-		STORAGE_KEY,
-		KEY,
-		&mut v,
-		8,
-	);
+	let r = sp_io::default_child_storage::read(STORAGE_KEY, KEY, &mut v, 8);
 	assert_eq!(r, Some(0));
 	assert_eq!(&v, &[0, 0, 0, 0]);
 }
@@ -1236,10 +1221,7 @@ fn test_read_child_storage() {
 fn test_witness(proof: StorageProof, root: crate::Hash) {
 	use sp_externalities::Externalities;
 	let db: sp_trie::MemoryDB<crate::Hashing> = proof.into_memory_db();
-	let backend = sp_state_machine::TrieBackend::<_, crate::Hashing>::new(
-		db,
-		root,
-	);
+	let backend = sp_state_machine::TrieBackend::<_, crate::Hashing>::new(db, root);
 	let mut overlay = sp_state_machine::OverlayedChanges::default();
 	let mut cache = sp_state_machine::StorageTransactionCache::<_, _, BlockNumber>::default();
 	let mut ext = sp_state_machine::Ext::new(
@@ -1259,18 +1241,16 @@ fn test_witness(proof: StorageProof, root: crate::Hash) {
 
 #[cfg(test)]
 mod tests {
-	use substrate_test_runtime_client::{
-		prelude::*,
-		sp_consensus::BlockOrigin,
-		DefaultTestClientBuilderExt, TestClientBuilder,
-		runtime::TestAPI,
-	};
+	use codec::Encode;
+	use sc_block_builder::BlockBuilderProvider;
 	use sp_api::ProvideRuntimeApi;
-	use sp_runtime::generic::BlockId;
 	use sp_core::storage::well_known_keys::HEAP_PAGES;
+	use sp_runtime::generic::BlockId;
 	use sp_state_machine::ExecutionStrategy;
-	use codec::Encode;
-	use sc_block_builder::BlockBuilderProvider;
+	use substrate_test_runtime_client::{
+		prelude::*, runtime::TestAPI, sp_consensus::BlockOrigin, DefaultTestClientBuilderExt,
+		TestClientBuilder,
+	};
 
 	#[test]
 	fn heap_pages_is_respected() {
@@ -1307,9 +1287,8 @@ mod tests {
 
 	#[test]
 	fn test_storage() {
-		let client = TestClientBuilder::new()
-			.set_execution_strategy(ExecutionStrategy::Both)
-			.build();
+		let client =
+			TestClientBuilder::new().set_execution_strategy(ExecutionStrategy::Both).build();
 		let runtime_api = client.runtime_api();
 		let block_id = BlockId::Number(client.chain_info().best_number);
 
@@ -1331,14 +1310,10 @@ mod tests {
 	#[test]
 	fn witness_backend_works() {
 		let (db, root) = witness_backend();
-		let backend = sp_state_machine::TrieBackend::<_, crate::Hashing>::new(
-			db,
-			root,
-		);
+		let backend = sp_state_machine::TrieBackend::<_, crate::Hashing>::new(db, root);
 		let proof = sp_state_machine::prove_read(backend, vec![b"value3"]).unwrap();
-		let client = TestClientBuilder::new()
-			.set_execution_strategy(ExecutionStrategy::Both)
-			.build();
+		let client =
+			TestClientBuilder::new().set_execution_strategy(ExecutionStrategy::Both).build();
 		let runtime_api = client.runtime_api();
 		let block_id = BlockId::Number(client.chain_info().best_number);
 
diff --git a/test-utils/runtime/src/system.rs b/test-utils/runtime/src/system.rs
index c4b88c09e8d2..316a553ed027 100644
--- a/test-utils/runtime/src/system.rs
+++ b/test-utils/runtime/src/system.rs
@@ -18,25 +18,27 @@
 //! System manager: Handles all of the top-level stuff; executing block/transaction, setting code
 //! and depositing logs.
 
-use sp_std::prelude::*;
+use crate::{
+	AccountId, AuthorityId, Block, BlockNumber, Digest, Extrinsic, Header, Transfer, H256 as Hash,
+};
+use codec::{Decode, Encode, KeyedVec};
+use frame_support::{decl_module, decl_storage, storage};
+use frame_system::Config;
+use sp_core::{storage::well_known_keys, ChangesTrieConfiguration};
 use sp_io::{
-	storage::root as storage_root, storage::changes_root as storage_changes_root,
-	hashing::blake2_256, trie,
+	hashing::blake2_256,
+	storage::{changes_root as storage_changes_root, root as storage_root},
+	trie,
 };
-use frame_support::storage;
-use frame_support::{decl_storage, decl_module};
 use sp_runtime::{
-	traits::Header as _, generic, ApplyExtrinsicResult,
+	generic,
+	traits::Header as _,
 	transaction_validity::{
-		TransactionValidity, ValidTransaction, InvalidTransaction, TransactionValidityError,
+		InvalidTransaction, TransactionValidity, TransactionValidityError, ValidTransaction,
 	},
+	ApplyExtrinsicResult,
 };
-use codec::{KeyedVec, Encode, Decode};
-use frame_system::Config;
-use crate::{
-	AccountId, BlockNumber, Extrinsic, Transfer, H256 as Hash, Block, Header, Digest, AuthorityId
-};
-use sp_core::{storage::well_known_keys, ChangesTrieConfiguration};
+use sp_std::prelude::*;
 
 const NONCE_OF: &[u8] = b"nonce:";
 const BALANCE_OF: &[u8] = b"balance:";
@@ -159,17 +161,17 @@ impl frame_support::traits::ExecuteBlock<Block> for BlockExecutor {
 /// This doesn't attempt to validate anything regarding the block.
 pub fn validate_transaction(utx: Extrinsic) -> TransactionValidity {
 	if check_signature(&utx).is_err() {
-		return InvalidTransaction::BadProof.into();
+		return InvalidTransaction::BadProof.into()
 	}
 
 	let tx = utx.transfer();
 	let nonce_key = tx.from.to_keyed_vec(NONCE_OF);
 	let expected_nonce: u64 = storage::hashed::get_or(&blake2_256, &nonce_key, 0);
 	if tx.nonce < expected_nonce {
-		return InvalidTransaction::Stale.into();
+		return InvalidTransaction::Stale.into()
 	}
 	if tx.nonce > expected_nonce + 64 {
-		return InvalidTransaction::Future.into();
+		return InvalidTransaction::Future.into()
 	}
 
 	let encode = |from: &AccountId, nonce: u64| (from, nonce).encode();
@@ -181,20 +183,14 @@ pub fn validate_transaction(utx: Extrinsic) -> TransactionValidity {
 
 	let provides = vec![encode(&tx.from, tx.nonce)];
 
-	Ok(ValidTransaction {
-		priority: tx.amount,
-		requires,
-		provides,
-		longevity: 64,
-		propagate: true,
-	})
+	Ok(ValidTransaction { priority: tx.amount, requires, provides, longevity: 64, propagate: true })
 }
 
 /// Execute a transaction outside of the block execution function.
 /// This doesn't attempt to validate anything regarding the block.
 pub fn execute_transaction(utx: Extrinsic) -> ApplyExtrinsicResult {
-	let extrinsic_index: u32 = storage::unhashed::get(well_known_keys::EXTRINSIC_INDEX)
-		.unwrap_or_default();
+	let extrinsic_index: u32 =
+		storage::unhashed::get(well_known_keys::EXTRINSIC_INDEX).unwrap_or_default();
 	let result = execute_transaction_backend(&utx, extrinsic_index);
 	ExtrinsicData::insert(extrinsic_index, utx.encode());
 	storage::unhashed::put(well_known_keys::EXTRINSIC_INDEX, &(extrinsic_index + 1));
@@ -215,8 +211,8 @@ pub fn finalize_block() -> Header {
 
 	// This MUST come after all changes to storage are done. Otherwise we will fail the
 	// “Storage root does not match that calculated” assertion.
-	let storage_root = Hash::decode(&mut &storage_root()[..])
-		.expect("`storage_root` is a valid hash");
+	let storage_root =
+		Hash::decode(&mut &storage_root()[..]).expect("`storage_root` is a valid hash");
 	let storage_changes_root = storage_changes_root(&parent_hash.encode())
 		.map(|r| Hash::decode(&mut &r[..]).expect("`storage_changes_root` is a valid hash"));
 
@@ -231,17 +227,11 @@ pub fn finalize_block() -> Header {
 
 	if let Some(new_config) = new_changes_trie_config {
 		digest.push(generic::DigestItem::ChangesTrieSignal(
-			generic::ChangesTrieSignal::NewConfiguration(new_config)
+			generic::ChangesTrieSignal::NewConfiguration(new_config),
 		));
 	}
 
-	Header {
-		number,
-		extrinsics_root,
-		state_root: storage_root,
-		parent_hash,
-		digest,
-	}
+	Header { number, extrinsics_root, state_root: storage_root, parent_hash, digest }
 }
 
 #[inline(always)]
@@ -253,12 +243,11 @@ fn check_signature(utx: &Extrinsic) -> Result<(), TransactionValidityError> {
 fn execute_transaction_backend(utx: &Extrinsic, extrinsic_index: u32) -> ApplyExtrinsicResult {
 	check_signature(utx)?;
 	match utx {
-		Extrinsic::Transfer { exhaust_resources_when_not_first: true, .. } if extrinsic_index != 0 =>
+		Extrinsic::Transfer { exhaust_resources_when_not_first: true, .. }
+			if extrinsic_index != 0 =>
 			Err(InvalidTransaction::ExhaustsResources.into()),
-		Extrinsic::Transfer { ref transfer, .. } =>
-			execute_transfer_backend(transfer),
-		Extrinsic::AuthoritiesChange(ref new_auth) =>
-			execute_new_authorities_backend(new_auth),
+		Extrinsic::Transfer { ref transfer, .. } => execute_transfer_backend(transfer),
+		Extrinsic::AuthoritiesChange(ref new_auth) => execute_new_authorities_backend(new_auth),
 		Extrinsic::IncludeData(_) => Ok(Ok(())),
 		Extrinsic::StorageChange(key, value) =>
 			execute_storage_change(key, value.as_ref().map(|v| &**v)),
@@ -271,9 +260,8 @@ fn execute_transaction_backend(utx: &Extrinsic, extrinsic_index: u32) -> ApplyEx
 		Extrinsic::OffchainIndexClear(key) => {
 			sp_io::offchain_index::clear(&key);
 			Ok(Ok(()))
-		}
-		Extrinsic::Store(data) =>
-			execute_store(data.clone()),
+		},
+		Extrinsic::Store(data) => execute_store(data.clone()),
 	}
 }
 
@@ -282,7 +270,7 @@ fn execute_transfer_backend(tx: &Transfer) -> ApplyExtrinsicResult {
 	let nonce_key = tx.from.to_keyed_vec(NONCE_OF);
 	let expected_nonce: u64 = storage::hashed::get_or(&blake2_256, &nonce_key, 0);
 	if !(tx.nonce == expected_nonce) {
-		return Err(InvalidTransaction::Stale.into());
+		return Err(InvalidTransaction::Stale.into())
 	}
 
 	// increment nonce in storage
@@ -294,7 +282,7 @@ fn execute_transfer_backend(tx: &Transfer) -> ApplyExtrinsicResult {
 
 	// enact transfer
 	if !(tx.amount <= from_balance) {
-		return Err(InvalidTransaction::Payment.into());
+		return Err(InvalidTransaction::Payment.into())
 	}
 	let to_balance_key = tx.to.to_keyed_vec(BALANCE_OF);
 	let to_balance: u64 = storage::hashed::get_or(&blake2_256, &to_balance_key, 0);
@@ -323,12 +311,12 @@ fn execute_storage_change(key: &[u8], value: Option<&[u8]>) -> ApplyExtrinsicRes
 	Ok(Ok(()))
 }
 
-fn execute_changes_trie_config_update(new_config: Option<ChangesTrieConfiguration>) -> ApplyExtrinsicResult {
+fn execute_changes_trie_config_update(
+	new_config: Option<ChangesTrieConfiguration>,
+) -> ApplyExtrinsicResult {
 	match new_config.clone() {
-		Some(new_config) => storage::unhashed::put_raw(
-			well_known_keys::CHANGES_TRIE_CONFIG,
-			&new_config.encode(),
-		),
+		Some(new_config) =>
+			storage::unhashed::put_raw(well_known_keys::CHANGES_TRIE_CONFIG, &new_config.encode()),
 		None => storage::unhashed::kill(well_known_keys::CHANGES_TRIE_CONFIG),
 	}
 	<NewChangesTrieConfig>::put(new_config);
@@ -360,19 +348,18 @@ fn info_expect_equal_hash(given: &Hash, expected: &Hash) {
 mod tests {
 	use super::*;
 
-	use sp_io::TestExternalities;
+	use crate::{wasm_binary_unwrap, Header, Transfer};
+	use sc_executor::{native_executor_instance, NativeExecutor, WasmExecutionMethod};
+	use sp_core::{
+		map,
+		traits::{CodeExecutor, RuntimeCode},
+		NeverNativeValue,
+	};
+	use sp_io::{hashing::twox_128, TestExternalities};
 	use substrate_test_runtime_client::{AccountKeyring, Sr25519Keyring};
-	use crate::{Header, Transfer, wasm_binary_unwrap};
-	use sp_core::{NeverNativeValue, map, traits::{CodeExecutor, RuntimeCode}};
-	use sc_executor::{NativeExecutor, WasmExecutionMethod, native_executor_instance};
-	use sp_io::hashing::twox_128;
 
 	// Declare an instance of the native executor dispatch for the test runtime.
-	native_executor_instance!(
-		NativeDispatch,
-		crate::api::dispatch,
-		crate::native_version
-	);
+	native_executor_instance!(NativeDispatch, crate::api::dispatch, crate::native_version);
 
 	fn executor() -> NativeExecutor<NativeDispatch> {
 		NativeExecutor::new(WasmExecutionMethod::Interpreted, None, 8)
@@ -382,7 +369,7 @@ mod tests {
 		let authorities = vec![
 			Sr25519Keyring::Alice.to_raw_public(),
 			Sr25519Keyring::Bob.to_raw_public(),
-			Sr25519Keyring::Charlie.to_raw_public()
+			Sr25519Keyring::Charlie.to_raw_public(),
 		];
 		TestExternalities::new_with_code(
 			wasm_binary_unwrap(),
@@ -399,7 +386,10 @@ mod tests {
 		)
 	}
 
-	fn block_import_works<F>(block_executor: F) where F: Fn(Block, &mut TestExternalities) {
+	fn block_import_works<F>(block_executor: F)
+	where
+		F: Fn(Block, &mut TestExternalities),
+	{
 		let h = Header {
 			parent_hash: [69u8; 32].into(),
 			number: 1,
@@ -407,10 +397,7 @@ mod tests {
 			extrinsics_root: Default::default(),
 			digest: Default::default(),
 		};
-		let mut b = Block {
-			header: h,
-			extrinsics: vec![],
-		};
+		let mut b = Block { header: h, extrinsics: vec![] };
 
 		new_test_ext().execute_with(|| polish_block(&mut b));
 
@@ -419,7 +406,11 @@ mod tests {
 
 	#[test]
 	fn block_import_works_native() {
-		block_import_works(|b, ext| ext.execute_with(|| { execute_block(b); }));
+		block_import_works(|b, ext| {
+			ext.execute_with(|| {
+				execute_block(b);
+			})
+		});
 	}
 
 	#[test]
@@ -432,19 +423,23 @@ mod tests {
 				heap_pages: None,
 			};
 
-			executor().call::<NeverNativeValue, fn() -> _>(
-				&mut ext,
-				&runtime_code,
-				"Core_execute_block",
-				&b.encode(),
-				false,
-				None,
-			).0.unwrap();
+			executor()
+				.call::<NeverNativeValue, fn() -> _>(
+					&mut ext,
+					&runtime_code,
+					"Core_execute_block",
+					&b.encode(),
+					false,
+					None,
+				)
+				.0
+				.unwrap();
 		})
 	}
 
 	fn block_import_with_transaction_works<F>(block_executor: F)
-		where F: Fn(Block, &mut TestExternalities)
+	where
+		F: Fn(Block, &mut TestExternalities),
 	{
 		let mut b1 = Block {
 			header: Header {
@@ -454,14 +449,13 @@ mod tests {
 				extrinsics_root: Default::default(),
 				digest: Default::default(),
 			},
-			extrinsics: vec![
-				Transfer {
-					from: AccountKeyring::Alice.into(),
-					to: AccountKeyring::Bob.into(),
-					amount: 69,
-					nonce: 0,
-				}.into_signed_tx()
-			],
+			extrinsics: vec![Transfer {
+				from: AccountKeyring::Alice.into(),
+				to: AccountKeyring::Bob.into(),
+				amount: 69,
+				nonce: 0,
+			}
+			.into_signed_tx()],
 		};
 
 		let mut dummy_ext = new_test_ext();
@@ -481,13 +475,15 @@ mod tests {
 					to: AccountKeyring::Alice.into(),
 					amount: 27,
 					nonce: 0,
-				}.into_signed_tx(),
+				}
+				.into_signed_tx(),
 				Transfer {
 					from: AccountKeyring::Alice.into(),
 					to: AccountKeyring::Charlie.into(),
 					amount: 69,
 					nonce: 1,
-				}.into_signed_tx(),
+				}
+				.into_signed_tx(),
 			],
 		};
 
@@ -519,7 +515,11 @@ mod tests {
 
 	#[test]
 	fn block_import_with_transaction_works_native() {
-		block_import_with_transaction_works(|b, ext| ext.execute_with(|| { execute_block(b); }));
+		block_import_with_transaction_works(|b, ext| {
+			ext.execute_with(|| {
+				execute_block(b);
+			})
+		});
 	}
 
 	#[test]
@@ -532,14 +532,17 @@ mod tests {
 				heap_pages: None,
 			};
 
-			executor().call::<NeverNativeValue, fn() -> _>(
-				&mut ext,
-				&runtime_code,
-				"Core_execute_block",
-				&b.encode(),
-				false,
-				None,
-			).0.unwrap();
+			executor()
+				.call::<NeverNativeValue, fn() -> _>(
+					&mut ext,
+					&runtime_code,
+					"Core_execute_block",
+					&b.encode(),
+					false,
+					None,
+				)
+				.0
+				.unwrap();
 		})
 	}
 }
diff --git a/test-utils/runtime/transaction-pool/src/lib.rs b/test-utils/runtime/transaction-pool/src/lib.rs
index b3717d22a8be..d0cd50394c53 100644
--- a/test-utils/runtime/transaction-pool/src/lib.rs
+++ b/test-utils/runtime/transaction-pool/src/lib.rs
@@ -20,22 +20,22 @@
 //! See [`TestApi`] for more information.
 
 use codec::Encode;
+use futures::future::ready;
 use parking_lot::RwLock;
+use sp_blockchain::CachedHeaderMetadata;
 use sp_runtime::{
 	generic::{self, BlockId},
-	traits::{BlakeTwo256, Hash as HashT, Block as BlockT, Header as _},
+	traits::{BlakeTwo256, Block as BlockT, Hash as HashT, Header as _},
 	transaction_validity::{
-		TransactionValidity, ValidTransaction, TransactionValidityError, InvalidTransaction,
-		TransactionSource,
+		InvalidTransaction, TransactionSource, TransactionValidity, TransactionValidityError,
+		ValidTransaction,
 	},
 };
-use std::collections::{HashSet, HashMap, BTreeMap};
+use std::collections::{BTreeMap, HashMap, HashSet};
 use substrate_test_runtime_client::{
-	runtime::{Index, AccountId, Block, BlockNumber, Extrinsic, Hash, Header, Transfer},
+	runtime::{AccountId, Block, BlockNumber, Extrinsic, Hash, Header, Index, Transfer},
 	AccountKeyring::{self, *},
 };
-use sp_blockchain::CachedHeaderMetadata;
-use futures::future::ready;
 
 /// Error type used by [`TestApi`].
 #[derive(Debug, derive_more::From, derive_more::Display)]
@@ -130,12 +130,9 @@ impl TestApi {
 			block_number
 				.checked_sub(1)
 				.and_then(|num| {
-					chain.block_by_number
-						.get(&num)
-						.map(|blocks| {
-							blocks[0].0.header.hash()
-						})
-				}).unwrap_or_default()
+					chain.block_by_number.get(&num).map(|blocks| blocks[0].0.header.hash())
+				})
+				.unwrap_or_default()
 		};
 
 		self.push_block_with_parent(parent_hash, xts, is_best_block)
@@ -154,7 +151,9 @@ impl TestApi {
 		let block_number = if parent == Hash::default() {
 			0
 		} else {
-			*self.chain.read()
+			*self
+				.chain
+				.read()
 				.block_by_hash
 				.get(&parent)
 				.expect("`parent` exists")
@@ -182,7 +181,11 @@ impl TestApi {
 
 		let mut chain = self.chain.write();
 		chain.block_by_hash.insert(hash, block.clone());
-		chain.block_by_number.entry(block_number).or_default().push((block, is_best_block.into()));
+		chain
+			.block_by_number
+			.entry(block_number)
+			.or_default()
+			.push((block, is_best_block.into()));
 	}
 
 	fn hash_and_length_inner(ex: &Extrinsic) -> (Hash, usize) {
@@ -195,9 +198,7 @@ impl TestApi {
 	/// Next time transaction pool will try to validate this
 	/// extrinsic, api will return invalid result.
 	pub fn add_invalid(&self, xts: &Extrinsic) {
-		self.chain.write().invalid_hashes.insert(
-			Self::hash_and_length_inner(xts).0
-		);
+		self.chain.write().invalid_hashes.insert(Self::hash_and_length_inner(xts).0);
 	}
 
 	/// Query validation requests received.
@@ -242,7 +243,8 @@ impl sc_transaction_pool::test_helpers::ChainApi for TestApi {
 
 		match self.block_id_to_number(at) {
 			Ok(Some(number)) => {
-				let found_best = self.chain
+				let found_best = self
+					.chain
 					.read()
 					.block_by_number
 					.get(&number)
@@ -253,24 +255,24 @@ impl sc_transaction_pool::test_helpers::ChainApi for TestApi {
 				// the transaction. (This is not required for this test function, but in real
 				// environment it would fail because of this).
 				if !found_best {
-					return ready(Ok(
-						Err(TransactionValidityError::Invalid(InvalidTransaction::Custom(1)).into())
-					))
+					return ready(Ok(Err(TransactionValidityError::Invalid(
+						InvalidTransaction::Custom(1),
+					)
+					.into())))
 				}
 			},
-			Ok(None) => return ready(Ok(
-				Err(TransactionValidityError::Invalid(InvalidTransaction::Custom(2)).into())
-			)),
+			Ok(None) =>
+				return ready(Ok(Err(TransactionValidityError::Invalid(
+					InvalidTransaction::Custom(2),
+				)
+				.into()))),
 			Err(e) => return ready(Err(e)),
 		}
 
 		let (requires, provides) = if let Some(transfer) = uxt.try_transfer() {
 			let chain_nonce = self.chain.read().nonces.get(&transfer.from).cloned().unwrap_or(0);
-			let requires = if chain_nonce == transfer.nonce {
-				vec![]
-			} else {
-				vec![vec![chain_nonce as u8]]
-			};
+			let requires =
+				if chain_nonce == transfer.nonce { vec![] } else { vec![vec![chain_nonce as u8]] };
 			let provides = vec![vec![transfer.nonce as u8]];
 
 			(requires, provides)
@@ -279,18 +281,13 @@ impl sc_transaction_pool::test_helpers::ChainApi for TestApi {
 		};
 
 		if self.chain.read().invalid_hashes.contains(&self.hash_and_length(&uxt).0) {
-			return ready(Ok(
-				Err(TransactionValidityError::Invalid(InvalidTransaction::Custom(0)).into())
-			))
+			return ready(Ok(Err(
+				TransactionValidityError::Invalid(InvalidTransaction::Custom(0)).into()
+			)))
 		}
 
-		let mut validity = ValidTransaction {
-			priority: 1,
-			requires,
-			provides,
-			longevity: 64,
-			propagate: true,
-		};
+		let mut validity =
+			ValidTransaction { priority: 1, requires, provides, longevity: 64, propagate: true };
 
 		(self.valid_modifier.read())(&mut validity);
 
@@ -302,11 +299,8 @@ impl sc_transaction_pool::test_helpers::ChainApi for TestApi {
 		at: &BlockId<Self::Block>,
 	) -> Result<Option<sc_transaction_pool::test_helpers::NumberFor<Self>>, Error> {
 		Ok(match at {
-			generic::BlockId::Hash(x) => self.chain
-				.read()
-				.block_by_hash
-				.get(x)
-				.map(|b| *b.header.number()),
+			generic::BlockId::Hash(x) =>
+				self.chain.read().block_by_hash.get(x).map(|b| *b.header.number()),
 			generic::BlockId::Number(num) => Some(*num),
 		})
 	}
@@ -317,11 +311,10 @@ impl sc_transaction_pool::test_helpers::ChainApi for TestApi {
 	) -> Result<Option<sc_transaction_pool::test_helpers::BlockHash<Self>>, Error> {
 		Ok(match at {
 			generic::BlockId::Hash(x) => Some(x.clone()),
-			generic::BlockId::Number(num) => self.chain
-				.read()
-				.block_by_number
-				.get(num)
-				.and_then(|blocks| blocks.iter().find(|b| b.1.is_best()).map(|b| b.0.header().hash())),
+			generic::BlockId::Number(num) =>
+				self.chain.read().block_by_number.get(num).and_then(|blocks| {
+					blocks.iter().find(|b| b.1.is_best()).map(|b| b.0.header().hash())
+				}),
 		})
 	}
 
@@ -334,16 +327,10 @@ impl sc_transaction_pool::test_helpers::ChainApi for TestApi {
 
 	fn block_body(&self, id: &BlockId<Self::Block>) -> Self::BodyFuture {
 		futures::future::ready(Ok(match id {
-			BlockId::Number(num) => self.chain
-				.read()
-				.block_by_number
-				.get(num)
-				.map(|b| b[0].0.extrinsics().to_vec()),
-			BlockId::Hash(hash) => self.chain
-				.read()
-				.block_by_hash
-				.get(hash)
-				.map(|b| b.extrinsics().to_vec()),
+			BlockId::Number(num) =>
+				self.chain.read().block_by_number.get(num).map(|b| b[0].0.extrinsics().to_vec()),
+			BlockId::Hash(hash) =>
+				self.chain.read().block_by_hash.get(hash).map(|b| b.extrinsics().to_vec()),
 		}))
 	}
 
@@ -352,16 +339,10 @@ impl sc_transaction_pool::test_helpers::ChainApi for TestApi {
 		at: &BlockId<Self::Block>,
 	) -> Result<Option<<Self::Block as BlockT>::Header>, Self::Error> {
 		Ok(match at {
-			BlockId::Number(num) => self.chain
-				.read()
-				.block_by_number
-				.get(num)
-				.map(|b| b[0].0.header().clone()),
-			BlockId::Hash(hash) => self.chain
-				.read()
-				.block_by_hash
-				.get(hash)
-				.map(|b| b.header().clone()),
+			BlockId::Number(num) =>
+				self.chain.read().block_by_number.get(num).map(|b| b[0].0.header().clone()),
+			BlockId::Hash(hash) =>
+				self.chain.read().block_by_hash.get(hash).map(|b| b.header().clone()),
 		})
 	}
 }
@@ -369,21 +350,14 @@ impl sc_transaction_pool::test_helpers::ChainApi for TestApi {
 impl sp_blockchain::HeaderMetadata<Block> for TestApi {
 	type Error = Error;
 
-	fn header_metadata(
-		&self,
-		hash: Hash,
-	) -> Result<CachedHeaderMetadata<Block>, Self::Error> {
+	fn header_metadata(&self, hash: Hash) -> Result<CachedHeaderMetadata<Block>, Self::Error> {
 		let chain = self.chain.read();
 		let block = chain.block_by_hash.get(&hash).expect("Hash exists");
 
 		Ok(block.header().into())
 	}
 
-	fn insert_header_metadata(
-		&self,
-		_: Hash,
-		_: CachedHeaderMetadata<Block>,
-	) {
+	fn insert_header_metadata(&self, _: Hash, _: CachedHeaderMetadata<Block>) {
 		unimplemented!("Not implemented for tests")
 	}
 
@@ -396,12 +370,7 @@ impl sp_blockchain::HeaderMetadata<Block> for TestApi {
 ///
 /// Part of the test api.
 pub fn uxt(who: AccountKeyring, nonce: Index) -> Extrinsic {
-	let transfer = Transfer {
-		from: who.into(),
-		to: AccountId::default(),
-		nonce,
-		amount: 1,
-	};
+	let transfer = Transfer { from: who.into(), to: AccountId::default(), nonce, amount: 1 };
 	let signature = transfer.using_encoded(|e| who.sign(e)).into();
 	Extrinsic::Transfer { transfer, signature, exhaust_resources_when_not_first: false }
 }
diff --git a/test-utils/src/lib.rs b/test-utils/src/lib.rs
index b3a0f322a639..eef87a29ca07 100644
--- a/test-utils/src/lib.rs
+++ b/test-utils/src/lib.rs
@@ -24,7 +24,7 @@ pub use futures;
 ///
 /// # Requirements
 ///
-///	You must have tokio in the `[dev-dependencies]` of your crate to use this macro.
+/// You must have tokio in the `[dev-dependencies]` of your crate to use this macro.
 ///
 /// # Example
 ///
@@ -64,7 +64,7 @@ macro_rules! assert_eq_uvec {
 	( $x:expr, $y:expr $(,)? ) => {
 		$crate::__assert_eq_uvec!($x, $y);
 		$crate::__assert_eq_uvec!($y, $x);
-	}
+	};
 }
 
 #[macro_export]
@@ -72,7 +72,9 @@ macro_rules! assert_eq_uvec {
 macro_rules! __assert_eq_uvec {
 	( $x:expr, $y:expr ) => {
 		$x.iter().for_each(|e| {
-			if !$y.contains(e) { panic!("vectors not equal: {:?} != {:?}", $x, $y); }
+			if !$y.contains(e) {
+				panic!("vectors not equal: {:?} != {:?}", $x, $y);
+			}
 		});
-	}
+	};
 }
diff --git a/test-utils/test-runner/src/client.rs b/test-utils/test-runner/src/client.rs
index 4cadfe58c605..71a156b8bc0d 100644
--- a/test-utils/test-runner/src/client.rs
+++ b/test-utils/test-runner/src/client.rs
@@ -16,204 +16,218 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 //! Client parts
-use sp_transaction_pool::runtime_api::TaggedTransactionQueue;
-use sp_consensus_babe::BabeApi;
-use crate::{ChainInfo, default_config};
-use manual_seal::consensus::babe::{BabeConsensusDataProvider, SlotTimestampProvider};
-use sp_keyring::sr25519::Keyring::Alice;
-use std::str::FromStr;
-use sp_runtime::traits::Header;
+use crate::{default_config, ChainInfo};
 use futures::channel::mpsc;
 use jsonrpc_core::MetaIoHandler;
-use manual_seal::{run_manual_seal, EngineCommand, ManualSealParams, import_queue, rpc::{ManualSeal, ManualSealApi}};
+use manual_seal::{
+	consensus::babe::{BabeConsensusDataProvider, SlotTimestampProvider},
+	import_queue,
+	rpc::{ManualSeal, ManualSealApi},
+	run_manual_seal, EngineCommand, ManualSealParams,
+};
 use sc_client_api::backend::Backend;
 use sc_service::{
-    build_network, spawn_tasks, BuildNetworkParams, SpawnTasksParams, TFullBackend,
-    TFullClient, TaskManager, new_full_parts, Configuration, ChainSpec, TaskExecutor,
+	build_network, new_full_parts, spawn_tasks, BuildNetworkParams, ChainSpec, Configuration,
+	SpawnTasksParams, TFullBackend, TFullClient, TaskExecutor, TaskManager,
 };
 use sc_transaction_pool::BasicPool;
 use sc_transaction_pool_api::TransactionPool;
 use sp_api::{ApiExt, ConstructRuntimeApi, Core, Metadata};
 use sp_block_builder::BlockBuilder;
-use sp_runtime::traits::Block as BlockT;
-use sp_session::SessionKeys;
+use sp_consensus_babe::BabeApi;
+use sp_keyring::sr25519::Keyring::Alice;
 use sp_offchain::OffchainWorkerApi;
-use std::sync::Arc;
+use sp_runtime::traits::{Block as BlockT, Header};
+use sp_session::SessionKeys;
+use sp_transaction_pool::runtime_api::TaggedTransactionQueue;
+use std::{str::FromStr, sync::Arc};
 
 type ClientParts<T> = (
-    Arc<MetaIoHandler<sc_rpc::Metadata, sc_rpc_server::RpcMiddleware>>,
-    TaskManager,
-    Arc<TFullClient<<T as ChainInfo>::Block, <T as ChainInfo>::RuntimeApi, <T as ChainInfo>::Executor>>,
-    Arc<dyn TransactionPool<
-        Block = <T as ChainInfo>::Block,
-        Hash = <<T as ChainInfo>::Block as BlockT>::Hash,
-        Error = sc_transaction_pool::error::Error,
-        InPoolTransaction = sc_transaction_pool::Transaction<
-            <<T as ChainInfo>::Block as BlockT>::Hash,
-            <<T as ChainInfo>::Block as BlockT>::Extrinsic,
-        >,
-    >>,
-    mpsc::Sender<EngineCommand<<<T as ChainInfo>::Block as BlockT>::Hash>>,
-    Arc<TFullBackend<<T as ChainInfo>::Block>>,
+	Arc<MetaIoHandler<sc_rpc::Metadata, sc_rpc_server::RpcMiddleware>>,
+	TaskManager,
+	Arc<
+		TFullClient<
+			<T as ChainInfo>::Block,
+			<T as ChainInfo>::RuntimeApi,
+			<T as ChainInfo>::Executor,
+		>,
+	>,
+	Arc<
+		dyn TransactionPool<
+			Block = <T as ChainInfo>::Block,
+			Hash = <<T as ChainInfo>::Block as BlockT>::Hash,
+			Error = sc_transaction_pool::error::Error,
+			InPoolTransaction = sc_transaction_pool::Transaction<
+				<<T as ChainInfo>::Block as BlockT>::Hash,
+				<<T as ChainInfo>::Block as BlockT>::Extrinsic,
+			>,
+		>,
+	>,
+	mpsc::Sender<EngineCommand<<<T as ChainInfo>::Block as BlockT>::Hash>>,
+	Arc<TFullBackend<<T as ChainInfo>::Block>>,
 );
 
 /// Provide the config or chain spec for a given chain
 pub enum ConfigOrChainSpec {
-    /// Configuration object
-    Config(Configuration),
-    /// Chain spec object
-    ChainSpec(Box<dyn ChainSpec>, TaskExecutor)
+	/// Configuration object
+	Config(Configuration),
+	/// Chain spec object
+	ChainSpec(Box<dyn ChainSpec>, TaskExecutor),
 }
 /// Creates all the client parts you need for [`Node`](crate::node::Node)
-pub fn client_parts<T>(config_or_chain_spec: ConfigOrChainSpec) -> Result<ClientParts<T>, sc_service::Error>
-    where
-        T: ChainInfo + 'static,
-        <T::RuntimeApi as ConstructRuntimeApi<T::Block, TFullClient<T::Block, T::RuntimeApi, T::Executor>>>::RuntimeApi:
-        Core<T::Block> + Metadata<T::Block> + OffchainWorkerApi<T::Block> + SessionKeys<T::Block>
-        + TaggedTransactionQueue<T::Block> + BlockBuilder<T::Block> + BabeApi<T::Block>
-        + ApiExt<T::Block, StateBackend = <TFullBackend<T::Block> as Backend<T::Block>>::State>,
-        <T::Runtime as frame_system::Config>::Call: From<frame_system::Call<T::Runtime>>,
-        <<T as ChainInfo>::Block as BlockT>::Hash: FromStr,
-        <<<T as ChainInfo>::Block as BlockT>::Header as Header>::Number: num_traits::cast::AsPrimitive<usize>,
+pub fn client_parts<T>(
+	config_or_chain_spec: ConfigOrChainSpec,
+) -> Result<ClientParts<T>, sc_service::Error>
+where
+	T: ChainInfo + 'static,
+	<T::RuntimeApi as ConstructRuntimeApi<
+		T::Block,
+		TFullClient<T::Block, T::RuntimeApi, T::Executor>,
+	>>::RuntimeApi: Core<T::Block>
+		+ Metadata<T::Block>
+		+ OffchainWorkerApi<T::Block>
+		+ SessionKeys<T::Block>
+		+ TaggedTransactionQueue<T::Block>
+		+ BlockBuilder<T::Block>
+		+ BabeApi<T::Block>
+		+ ApiExt<T::Block, StateBackend = <TFullBackend<T::Block> as Backend<T::Block>>::State>,
+	<T::Runtime as frame_system::Config>::Call: From<frame_system::Call<T::Runtime>>,
+	<<T as ChainInfo>::Block as BlockT>::Hash: FromStr,
+	<<<T as ChainInfo>::Block as BlockT>::Header as Header>::Number:
+		num_traits::cast::AsPrimitive<usize>,
 {
-    use sp_consensus_babe::AuthorityId;
-    let config = match config_or_chain_spec {
-        ConfigOrChainSpec::Config(config) => config,
-        ConfigOrChainSpec::ChainSpec(chain_spec, task_executor) => {
-            default_config(task_executor, chain_spec)
-        },
-    };
-
-    let (client, backend, keystore, mut task_manager) =
-        new_full_parts::<T::Block, T::RuntimeApi, T::Executor>(&config, None)?;
-    let client = Arc::new(client);
-
-    let select_chain = sc_consensus::LongestChain::new(backend.clone());
-
-    let (grandpa_block_import, ..) =
-        grandpa::block_import(client.clone(), &(client.clone() as Arc<_>), select_chain.clone(), None)?;
-
-    let slot_duration = sc_consensus_babe::Config::get_or_compute(&*client)?;
-    let (block_import, babe_link) = sc_consensus_babe::block_import(
-        slot_duration.clone(),
-        grandpa_block_import,
-        client.clone(),
-    )?;
-
-    let consensus_data_provider = BabeConsensusDataProvider::new(
-        client.clone(),
-        keystore.sync_keystore(),
-        babe_link.epoch_changes().clone(),
-        vec![(AuthorityId::from(Alice.public()), 1000)],
-    )
-        .expect("failed to create ConsensusDataProvider");
-
-    let import_queue =
-        import_queue(Box::new(block_import.clone()), &task_manager.spawn_essential_handle(), None);
-
-    let transaction_pool = BasicPool::new_full(
-        config.transaction_pool.clone(),
-        true.into(),
-        config.prometheus_registry(),
-        task_manager.spawn_essential_handle(),
-        client.clone(),
-    );
-
-    let (network, system_rpc_tx, network_starter) = {
-        let params = BuildNetworkParams {
-            config: &config,
-            client: client.clone(),
-            transaction_pool: transaction_pool.clone(),
-            spawn_handle: task_manager.spawn_handle(),
-            import_queue,
-            on_demand: None,
-            block_announce_validator_builder: None,
-        };
-        build_network(params)?
-    };
-
-    // offchain workers
-    sc_service::build_offchain_workers(
-        &config,
-        task_manager.spawn_handle(),
-        client.clone(),
-        network.clone(),
-    );
-
-    // Proposer object for block authorship.
-    let env = sc_basic_authorship::ProposerFactory::new(
-        task_manager.spawn_handle(),
-        client.clone(),
-        transaction_pool.clone(),
-        config.prometheus_registry(),
-        None
-    );
-
-    // Channel for the rpc handler to communicate with the authorship task.
-    let (command_sink, commands_stream) = mpsc::channel(10);
-
-    let rpc_sink = command_sink.clone();
-
-    let rpc_handlers = {
-        let params = SpawnTasksParams {
-            config,
-            client: client.clone(),
-            backend: backend.clone(),
-            task_manager: &mut task_manager,
-            keystore: keystore.sync_keystore(),
-            on_demand: None,
-            transaction_pool: transaction_pool.clone(),
-            rpc_extensions_builder: Box::new(move |_, _| {
-                let mut io = jsonrpc_core::IoHandler::default();
-                io.extend_with(
-                    ManualSealApi::to_delegate(ManualSeal::new(rpc_sink.clone()))
-                );
-                io
-            }),
-            remote_blockchain: None,
-            network,
-            system_rpc_tx,
-            telemetry: None
-        };
-        spawn_tasks(params)?
-    };
-
-    let cloned_client = client.clone();
-    let create_inherent_data_providers = Box::new(move |_, _| {
-        let client = cloned_client.clone();
-        async move {
-            let timestamp = SlotTimestampProvider::new(client.clone()).map_err(|err| format!("{:?}", err))?;
-            let babe = sp_consensus_babe::inherents::InherentDataProvider::new(timestamp.slot().into());
-            Ok((timestamp, babe))
-        }
-    });
-
-    // Background authorship future.
-    let authorship_future = run_manual_seal(ManualSealParams {
-        block_import,
-        env,
-        client: client.clone(),
-        pool: transaction_pool.clone(),
-        commands_stream,
-        select_chain,
-        consensus_data_provider: Some(Box::new(consensus_data_provider)),
-        create_inherent_data_providers,
-    });
-
-    // spawn the authorship task as an essential task.
-    task_manager
-        .spawn_essential_handle()
-        .spawn("manual-seal", authorship_future);
-
-    network_starter.start_network();
-    let rpc_handler = rpc_handlers.io_handler();
-
-    Ok((
-        rpc_handler,
-        task_manager,
-        client,
-        transaction_pool,
-        command_sink,
-        backend,
-    ))
+	use sp_consensus_babe::AuthorityId;
+	let config = match config_or_chain_spec {
+		ConfigOrChainSpec::Config(config) => config,
+		ConfigOrChainSpec::ChainSpec(chain_spec, task_executor) =>
+			default_config(task_executor, chain_spec),
+	};
+
+	let (client, backend, keystore, mut task_manager) =
+		new_full_parts::<T::Block, T::RuntimeApi, T::Executor>(&config, None)?;
+	let client = Arc::new(client);
+
+	let select_chain = sc_consensus::LongestChain::new(backend.clone());
+
+	let (grandpa_block_import, ..) = grandpa::block_import(
+		client.clone(),
+		&(client.clone() as Arc<_>),
+		select_chain.clone(),
+		None,
+	)?;
+
+	let slot_duration = sc_consensus_babe::Config::get_or_compute(&*client)?;
+	let (block_import, babe_link) = sc_consensus_babe::block_import(
+		slot_duration.clone(),
+		grandpa_block_import,
+		client.clone(),
+	)?;
+
+	let consensus_data_provider = BabeConsensusDataProvider::new(
+		client.clone(),
+		keystore.sync_keystore(),
+		babe_link.epoch_changes().clone(),
+		vec![(AuthorityId::from(Alice.public()), 1000)],
+	)
+	.expect("failed to create ConsensusDataProvider");
+
+	let import_queue =
+		import_queue(Box::new(block_import.clone()), &task_manager.spawn_essential_handle(), None);
+
+	let transaction_pool = BasicPool::new_full(
+		config.transaction_pool.clone(),
+		true.into(),
+		config.prometheus_registry(),
+		task_manager.spawn_essential_handle(),
+		client.clone(),
+	);
+
+	let (network, system_rpc_tx, network_starter) = {
+		let params = BuildNetworkParams {
+			config: &config,
+			client: client.clone(),
+			transaction_pool: transaction_pool.clone(),
+			spawn_handle: task_manager.spawn_handle(),
+			import_queue,
+			on_demand: None,
+			block_announce_validator_builder: None,
+		};
+		build_network(params)?
+	};
+
+	// offchain workers
+	sc_service::build_offchain_workers(
+		&config,
+		task_manager.spawn_handle(),
+		client.clone(),
+		network.clone(),
+	);
+
+	// Proposer object for block authorship.
+	let env = sc_basic_authorship::ProposerFactory::new(
+		task_manager.spawn_handle(),
+		client.clone(),
+		transaction_pool.clone(),
+		config.prometheus_registry(),
+		None,
+	);
+
+	// Channel for the rpc handler to communicate with the authorship task.
+	let (command_sink, commands_stream) = mpsc::channel(10);
+
+	let rpc_sink = command_sink.clone();
+
+	let rpc_handlers = {
+		let params = SpawnTasksParams {
+			config,
+			client: client.clone(),
+			backend: backend.clone(),
+			task_manager: &mut task_manager,
+			keystore: keystore.sync_keystore(),
+			on_demand: None,
+			transaction_pool: transaction_pool.clone(),
+			rpc_extensions_builder: Box::new(move |_, _| {
+				let mut io = jsonrpc_core::IoHandler::default();
+				io.extend_with(ManualSealApi::to_delegate(ManualSeal::new(rpc_sink.clone())));
+				io
+			}),
+			remote_blockchain: None,
+			network,
+			system_rpc_tx,
+			telemetry: None,
+		};
+		spawn_tasks(params)?
+	};
+
+	let cloned_client = client.clone();
+	let create_inherent_data_providers = Box::new(move |_, _| {
+		let client = cloned_client.clone();
+		async move {
+			let timestamp =
+				SlotTimestampProvider::new(client.clone()).map_err(|err| format!("{:?}", err))?;
+			let babe =
+				sp_consensus_babe::inherents::InherentDataProvider::new(timestamp.slot().into());
+			Ok((timestamp, babe))
+		}
+	});
+
+	// Background authorship future.
+	let authorship_future = run_manual_seal(ManualSealParams {
+		block_import,
+		env,
+		client: client.clone(),
+		pool: transaction_pool.clone(),
+		commands_stream,
+		select_chain,
+		consensus_data_provider: Some(Box::new(consensus_data_provider)),
+		create_inherent_data_providers,
+	});
+
+	// spawn the authorship task as an essential task.
+	task_manager.spawn_essential_handle().spawn("manual-seal", authorship_future);
+
+	network_starter.start_network();
+	let rpc_handler = rpc_handlers.io_handler();
+
+	Ok((rpc_handler, task_manager, client, transaction_pool, command_sink, backend))
 }
diff --git a/test-utils/test-runner/src/host_functions.rs b/test-utils/test-runner/src/host_functions.rs
index 534d4a23fdcc..6bd91929256a 100644
--- a/test-utils/test-runner/src/host_functions.rs
+++ b/test-utils/test-runner/src/host_functions.rs
@@ -73,12 +73,16 @@ macro_rules! override_host_functions {
 pub struct SignatureVerificationOverride;
 
 impl sp_wasm_interface::HostFunctions for SignatureVerificationOverride {
-    fn host_functions() -> Vec<&'static dyn sp_wasm_interface::Function> {
-        override_host_functions!(
-            "ext_crypto_ecdsa_verify_version_1", EcdsaVerify,
-            "ext_crypto_ed25519_verify_version_1", Ed25519Verify,
-            "ext_crypto_sr25519_verify_version_1", Sr25519Verify,
-            "ext_crypto_sr25519_verify_version_2", Sr25519VerifyV2,
-        )
-    }
+	fn host_functions() -> Vec<&'static dyn sp_wasm_interface::Function> {
+		override_host_functions!(
+			"ext_crypto_ecdsa_verify_version_1",
+			EcdsaVerify,
+			"ext_crypto_ed25519_verify_version_1",
+			Ed25519Verify,
+			"ext_crypto_sr25519_verify_version_1",
+			Sr25519Verify,
+			"ext_crypto_sr25519_verify_version_2",
+			Sr25519VerifyV2,
+		)
+	}
 }
diff --git a/test-utils/test-runner/src/lib.rs b/test-utils/test-runner/src/lib.rs
index 1976d132b7c5..c73ead9eb59a 100644
--- a/test-utils/test-runner/src/lib.rs
+++ b/test-utils/test-runner/src/lib.rs
@@ -187,12 +187,12 @@
 //! fn simple_balances_test() {
 //! 	// given
 //! 	let config = NodeConfig {
-//!			execution_strategies: ExecutionStrategies {
-//!				syncing: sc_client_api::ExecutionStrategy::NativeWhenPossible,
-//!				importing: sc_client_api::ExecutionStrategy::NativeWhenPossible,
-//!				block_construction: sc_client_api::ExecutionStrategy::NativeWhenPossible,
-//!				offchain_worker: sc_client_api::ExecutionStrategy::NativeWhenPossible,
-//!				other: sc_client_api::ExecutionStrategy::NativeWhenPossible,
+//! 			execution_strategies: ExecutionStrategies {
+//! 				syncing: sc_client_api::ExecutionStrategy::NativeWhenPossible,
+//! 				importing: sc_client_api::ExecutionStrategy::NativeWhenPossible,
+//! 				block_construction: sc_client_api::ExecutionStrategy::NativeWhenPossible,
+//! 				offchain_worker: sc_client_api::ExecutionStrategy::NativeWhenPossible,
+//! 				other: sc_client_api::ExecutionStrategy::NativeWhenPossible,
 //! 		},
 //! 		chain_spec: Box::new(development_config()),
 //! 		log_targets: vec![],
@@ -235,14 +235,14 @@ use sp_inherents::InherentDataProvider;
 use sp_runtime::traits::{Block as BlockT, SignedExtension};
 
 mod client;
+mod host_functions;
 mod node;
 mod utils;
-mod host_functions;
 
+pub use client::*;
 pub use host_functions::*;
 pub use node::*;
 pub use utils::*;
-pub use client::*;
 
 /// Wrapper trait for concrete type required by this testing framework.
 pub trait ChainInfo: Sized {
@@ -271,7 +271,10 @@ pub trait ChainInfo: Sized {
 		+ BlockImport<
 			Self::Block,
 			Error = sp_consensus::Error,
-			Transaction = TransactionFor<TFullClient<Self::Block, Self::RuntimeApi, Self::Executor>, Self::Block>,
+			Transaction = TransactionFor<
+				TFullClient<Self::Block, Self::RuntimeApi, Self::Executor>,
+				Self::Block,
+			>,
 		> + 'static;
 
 	/// The signed extras required by the runtime
@@ -281,5 +284,7 @@ pub trait ChainInfo: Sized {
 	type InherentDataProviders: InherentDataProvider + 'static;
 
 	/// Signed extras, this function is caled in an externalities provided environment.
-	fn signed_extras(from: <Self::Runtime as frame_system::Config>::AccountId) -> Self::SignedExtras;
+	fn signed_extras(
+		from: <Self::Runtime as frame_system::Config>::AccountId,
+	) -> Self::SignedExtras;
 }
diff --git a/test-utils/test-runner/src/node.rs b/test-utils/test-runner/src/node.rs
index b1e5854798ee..83fc23681345 100644
--- a/test-utils/test-runner/src/node.rs
+++ b/test-utils/test-runner/src/node.rs
@@ -18,21 +18,28 @@
 
 use std::sync::Arc;
 
-use futures::{FutureExt, SinkExt, channel::{mpsc, oneshot}};
+use crate::ChainInfo;
+use futures::{
+	channel::{mpsc, oneshot},
+	FutureExt, SinkExt,
+};
 use jsonrpc_core::MetaIoHandler;
 use manual_seal::EngineCommand;
-use sc_client_api::{backend::{self, Backend}, CallExecutor, ExecutorProvider};
+use sc_client_api::{
+	backend::{self, Backend},
+	CallExecutor, ExecutorProvider,
+};
 use sc_service::{TFullBackend, TFullCallExecutor, TFullClient, TaskManager};
+use sc_transaction_pool_api::TransactionPool;
 use sp_api::{OverlayedChanges, StorageTransactionCache};
 use sp_blockchain::HeaderBackend;
 use sp_core::ExecutionContext;
 use sp_runtime::{
 	generic::{BlockId, UncheckedExtrinsic},
-	traits::{Block as BlockT, Header, Extrinsic, NumberFor},
-	transaction_validity::TransactionSource, MultiSignature, MultiAddress
+	traits::{Block as BlockT, Extrinsic, Header, NumberFor},
+	transaction_validity::TransactionSource,
+	MultiAddress, MultiSignature,
 };
-use crate::ChainInfo;
-use sc_transaction_pool_api::TransactionPool;
 use sp_state_machine::Ext;
 
 /// This holds a reference to a running node on another thread,
@@ -46,44 +53,51 @@ pub struct Node<T: ChainInfo> {
 	/// client instance
 	client: Arc<TFullClient<T::Block, T::RuntimeApi, T::Executor>>,
 	/// transaction pool
-	pool: Arc<dyn TransactionPool<
-		Block = <T as ChainInfo>::Block,
-		Hash = <<T as ChainInfo>::Block as BlockT>::Hash,
-		Error = sc_transaction_pool::error::Error,
-		InPoolTransaction = sc_transaction_pool::Transaction<
-			<<T as ChainInfo>::Block as BlockT>::Hash,
-			<<T as ChainInfo>::Block as BlockT>::Extrinsic,
+	pool: Arc<
+		dyn TransactionPool<
+			Block = <T as ChainInfo>::Block,
+			Hash = <<T as ChainInfo>::Block as BlockT>::Hash,
+			Error = sc_transaction_pool::error::Error,
+			InPoolTransaction = sc_transaction_pool::Transaction<
+				<<T as ChainInfo>::Block as BlockT>::Hash,
+				<<T as ChainInfo>::Block as BlockT>::Extrinsic,
+			>,
 		>,
-	>>,
+	>,
 	/// channel to communicate with manual seal on.
 	manual_seal_command_sink: mpsc::Sender<EngineCommand<<T::Block as BlockT>::Hash>>,
 	/// backend type.
 	backend: Arc<TFullBackend<T::Block>>,
 	/// Block number at initialization of this Node.
-	initial_block_number: NumberFor<T::Block>
+	initial_block_number: NumberFor<T::Block>,
 }
 
-type EventRecord<T> = frame_system::EventRecord<<T as frame_system::Config>::Event, <T as frame_system::Config>::Hash>;
+type EventRecord<T> = frame_system::EventRecord<
+	<T as frame_system::Config>::Event,
+	<T as frame_system::Config>::Hash,
+>;
 
 impl<T> Node<T>
-	where
-		T: ChainInfo,
-		<<T::Block as BlockT>::Header as Header>::Number: From<u32>,
+where
+	T: ChainInfo,
+	<<T::Block as BlockT>::Header as Header>::Number: From<u32>,
 {
 	/// Creates a new node.
 	pub fn new(
 		rpc_handler: Arc<MetaIoHandler<sc_rpc::Metadata, sc_rpc_server::RpcMiddleware>>,
 		task_manager: TaskManager,
 		client: Arc<TFullClient<T::Block, T::RuntimeApi, T::Executor>>,
-		pool: Arc<dyn TransactionPool<
-			Block = <T as ChainInfo>::Block,
-			Hash = <<T as ChainInfo>::Block as BlockT>::Hash,
-			Error = sc_transaction_pool::error::Error,
-			InPoolTransaction = sc_transaction_pool::Transaction<
-				<<T as ChainInfo>::Block as BlockT>::Hash,
-				<<T as ChainInfo>::Block as BlockT>::Extrinsic,
+		pool: Arc<
+			dyn TransactionPool<
+				Block = <T as ChainInfo>::Block,
+				Hash = <<T as ChainInfo>::Block as BlockT>::Hash,
+				Error = sc_transaction_pool::error::Error,
+				InPoolTransaction = sc_transaction_pool::Transaction<
+					<<T as ChainInfo>::Block as BlockT>::Hash,
+					<<T as ChainInfo>::Block as BlockT>::Extrinsic,
+				>,
 			>,
-		>>,
+		>,
 		command_sink: mpsc::Sender<EngineCommand<<T::Block as BlockT>::Hash>>,
 		backend: Arc<TFullBackend<T::Block>>,
 	) -> Self {
@@ -102,10 +116,12 @@ impl<T> Node<T>
 	/// eg
 	/// ```ignore
 	/// 	let request = r#"{"jsonrpc":"2.0","method":"engine_createBlock","params": [true, true],"id":1}"#;
-	///		let response = node.rpc_handler()
+	/// 		let response = node.rpc_handler()
 	/// 		.handle_request_sync(request, Default::default());
 	/// ```
-	pub fn rpc_handler(&self) -> Arc<MetaIoHandler<sc_rpc::Metadata, sc_rpc_server::RpcMiddleware>> {
+	pub fn rpc_handler(
+		&self,
+	) -> Arc<MetaIoHandler<sc_rpc::Metadata, sc_rpc_server::RpcMiddleware>> {
 		self.rpc_handler.clone()
 	}
 
@@ -117,13 +133,18 @@ impl<T> Node<T>
 	/// Executes closure in an externalities provided environment.
 	pub fn with_state<R>(&self, closure: impl FnOnce() -> R) -> R
 	where
-		<TFullCallExecutor<T::Block, T::Executor> as CallExecutor<T::Block>>::Error: std::fmt::Debug,
+		<TFullCallExecutor<T::Block, T::Executor> as CallExecutor<T::Block>>::Error:
+			std::fmt::Debug,
 	{
 		let id = BlockId::Hash(self.client.info().best_hash);
 		let mut overlay = OverlayedChanges::default();
-		let changes_trie = backend::changes_tries_state_at_block(&id, self.backend.changes_trie_storage()).unwrap();
-		let mut cache =
-			StorageTransactionCache::<T::Block, <TFullBackend<T::Block> as Backend<T::Block>>::State>::default();
+		let changes_trie =
+			backend::changes_tries_state_at_block(&id, self.backend.changes_trie_storage())
+				.unwrap();
+		let mut cache = StorageTransactionCache::<
+			T::Block,
+			<TFullBackend<T::Block> as Backend<T::Block>>::State,
+		>::default();
 		let mut extensions = self
 			.client
 			.execution_extensions()
@@ -176,7 +197,9 @@ impl<T> Node<T>
 		.expect("UncheckedExtrinsic::new() always returns Some");
 		let at = self.client.info().best_hash;
 
-		self.pool.submit_one(&BlockId::Hash(at), TransactionSource::Local, ext.into()).await
+		self.pool
+			.submit_one(&BlockId::Hash(at), TransactionSource::Local, ext.into())
+			.await
 	}
 
 	/// Get the events of the most recently produced block
@@ -186,7 +209,7 @@ impl<T> Node<T>
 
 	/// Instructs manual seal to seal new, possibly empty blocks.
 	pub async fn seal_blocks(&self, num: usize) {
-		let mut sink =  self.manual_seal_command_sink.clone();
+		let mut sink = self.manual_seal_command_sink.clone();
 
 		for count in 0..num {
 			let (sender, future_block) = oneshot::channel();
@@ -201,8 +224,10 @@ impl<T> Node<T>
 			future.await.expect(ERROR);
 
 			match future_block.await.expect(ERROR) {
-				Ok(block) => log::info!("sealed {} (hash: {}) of {} blocks", count + 1, block.hash, num),
-				Err(err) => log::error!("failed to seal block {} of {}, error: {:?}", count + 1, num, err),
+				Ok(block) =>
+					log::info!("sealed {} (hash: {}) of {} blocks", count + 1, block.hash, num),
+				Err(err) =>
+					log::error!("failed to seal block {} of {}, error: {:?}", count + 1, num, err),
 			}
 		}
 	}
diff --git a/test-utils/test-runner/src/utils.rs b/test-utils/test-runner/src/utils.rs
index 9e722bcc510a..e0176fcb6cc2 100644
--- a/test-utils/test-runner/src/utils.rs
+++ b/test-utils/test-runner/src/utils.rs
@@ -16,18 +16,20 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+use futures::FutureExt;
+use sc_client_api::execution_extensions::ExecutionStrategies;
+use sc_executor::WasmExecutionMethod;
+use sc_informant::OutputFormat;
+use sc_network::{
+	config::{NetworkConfiguration, Role, TransportConfig},
+	multiaddr,
+};
 use sc_service::{
-	BasePath, ChainSpec, Configuration, TaskExecutor,
-	DatabaseConfig, KeepBlocks, TransactionStorageMode, TaskType,
+	config::KeystoreConfig, BasePath, ChainSpec, Configuration, DatabaseConfig, KeepBlocks,
+	TaskExecutor, TaskType, TransactionStorageMode,
 };
 use sp_keyring::sr25519::Keyring::Alice;
-use sc_network::{multiaddr, config::{NetworkConfiguration, TransportConfig, Role}};
-use sc_informant::OutputFormat;
-use sc_service::config::KeystoreConfig;
-use sc_executor::WasmExecutionMethod;
-use sc_client_api::execution_extensions::ExecutionStrategies;
 use tokio::runtime::Handle;
-use futures::FutureExt;
 
 pub use sc_cli::build_runtime;
 
@@ -41,7 +43,10 @@ pub fn base_path() -> BasePath {
 }
 
 /// Produces a default configuration object, suitable for use with most set ups.
-pub fn default_config(task_executor: TaskExecutor, mut chain_spec: Box<dyn ChainSpec>) -> Configuration {
+pub fn default_config(
+	task_executor: TaskExecutor,
+	mut chain_spec: Box<dyn ChainSpec>,
+) -> Configuration {
 	let base_path = base_path();
 	let root_path = base_path.path().to_path_buf().join("chains").join(chain_spec.id());
 
@@ -62,9 +67,7 @@ pub fn default_config(task_executor: TaskExecutor, mut chain_spec: Box<dyn Chain
 	let informant_output_format = OutputFormat { enable_color: false };
 	network_config.allow_non_globals_in_dht = true;
 
-	network_config
-		.listen_addresses
-		.push(multiaddr::Protocol::Memory(0).into());
+	network_config.listen_addresses.push(multiaddr::Protocol::Memory(0).into());
 
 	network_config.transport = TransportConfig::MemoryOnly;
 
@@ -75,14 +78,8 @@ pub fn default_config(task_executor: TaskExecutor, mut chain_spec: Box<dyn Chain
 		task_executor: task_executor.into(),
 		transaction_pool: Default::default(),
 		network: network_config,
-		keystore: KeystoreConfig::Path {
-			path: root_path.join("key"),
-			password: None,
-		},
-		database: DatabaseConfig::RocksDb {
-			path: root_path.join("db"),
-			cache_size: 128,
-		},
+		keystore: KeystoreConfig::Path { path: root_path.join("key"), password: None },
+		database: DatabaseConfig::RocksDb { path: root_path.join("db"), cache_size: 128 },
 		state_cache_size: 16777216,
 		state_cache_child_ratio: None,
 		chain_spec,
@@ -129,7 +126,8 @@ pub fn default_config(task_executor: TaskExecutor, mut chain_spec: Box<dyn Chain
 pub fn task_executor(handle: Handle) -> TaskExecutor {
 	let task_executor = move |fut, task_type| match task_type {
 		TaskType::Async => handle.spawn(fut).map(drop),
-		TaskType::Blocking => handle.spawn_blocking(move || futures::executor::block_on(fut)).map(drop),
+		TaskType::Blocking =>
+			handle.spawn_blocking(move || futures::executor::block_on(fut)).map(drop),
 	};
 
 	task_executor.into()
diff --git a/utils/browser/src/lib.rs b/utils/browser/src/lib.rs
index 0d4937ceeee4..0870ea84296c 100644
--- a/utils/browser/src/lib.rs
+++ b/utils/browser/src/lib.rs
@@ -15,23 +15,25 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use futures::{
+	channel::{mpsc, oneshot},
+	compat::*,
+	future::{ok, ready, select},
+	prelude::*,
+};
 use futures01::sync::mpsc as mpsc01;
+use libp2p_wasm_ext::{ffi, ExtTransport};
 use log::{debug, info};
+use sc_chain_spec::Extension;
 use sc_network::config::TransportConfig;
 use sc_service::{
-	RpcSession, Role, Configuration, TaskManager, RpcHandlers,
 	config::{DatabaseConfig, KeystoreConfig, NetworkConfiguration},
-	GenericChainSpec, RuntimeGenesis,
-	KeepBlocks, TransactionStorageMode,
+	Configuration, GenericChainSpec, KeepBlocks, Role, RpcHandlers, RpcSession, RuntimeGenesis,
+	TaskManager, TransactionStorageMode,
 };
 use sc_tracing::logging::LoggerBuilder;
-use wasm_bindgen::prelude::*;
-use futures::{
-	prelude::*, channel::{oneshot, mpsc}, compat::*, future::{ready, ok, select}
-};
 use std::pin::Pin;
-use sc_chain_spec::Extension;
-use libp2p_wasm_ext::{ExtTransport, ffi};
+use wasm_bindgen::prelude::*;
 
 pub use console_error_panic_hook::set_once as set_console_error_panic_hook;
 
@@ -73,7 +75,8 @@ where
 		task_executor: (|fut, _| {
 			wasm_bindgen_futures::spawn_local(fut);
 			async {}
-		}).into(),
+		})
+		.into(),
 		telemetry_external_transport: Some(transport),
 		role: Role::Light,
 		database: {
@@ -114,9 +117,7 @@ where
 		max_runtime_instances: 8,
 		announce_block: true,
 		base_path: None,
-		informant_output_format: sc_informant::OutputFormat {
-			enable_color: false,
-		},
+		informant_output_format: sc_informant::OutputFormat { enable_color: false },
 		disable_log_reloading: false,
 	};
 
@@ -153,12 +154,11 @@ pub fn start_client(mut task_manager: TaskManager, rpc_handlers: RpcHandlers) ->
 			Box::pin(async move {
 				let _ = task_manager.future().await;
 			}),
-		).map(drop)
+		)
+		.map(drop),
 	);
 
-	Client {
-		rpc_send_tx,
-	}
+	Client { rpc_send_tx }
 }
 
 #[wasm_bindgen]
@@ -175,12 +175,8 @@ impl Client {
 		});
 		wasm_bindgen_futures::future_to_promise(async {
 			match rx.await {
-				Ok(fut) => {
-					fut.await
-						.map(|s| JsValue::from_str(&s))
-						.ok_or_else(|| JsValue::NULL)
-				},
-				Err(_) => Err(JsValue::NULL)
+				Ok(fut) => fut.await.map(|s| JsValue::from_str(&s)).ok_or_else(|| JsValue::NULL),
+				Err(_) => Err(JsValue::NULL),
 			}
 		})
 	}
@@ -203,7 +199,8 @@ impl Client {
 		});
 
 		wasm_bindgen_futures::spawn_local(async move {
-			let _ = rx.compat()
+			let _ = rx
+				.compat()
 				.try_for_each(|s| {
 					let _ = callback.call1(&callback, &JsValue::from_str(&s));
 					ok(())
diff --git a/utils/build-script-utils/src/git.rs b/utils/build-script-utils/src/git.rs
index d01343634bc9..66a15737f84c 100644
--- a/utils/build-script-utils/src/git.rs
+++ b/utils/build-script-utils/src/git.rs
@@ -33,16 +33,16 @@ pub fn rerun_if_git_head_changed() {
 			Err(err) => {
 				eprintln!("cargo:warning=Unable to read the Git repository: {}", err);
 
-				return;
-			}
-			Ok(None) => {}
+				return
+			},
+			Ok(None) => {},
 			Ok(Some(paths)) => {
 				for p in paths {
 					println!("cargo:rerun-if-changed={}", p.display());
 				}
 
-				return;
-			}
+				return
+			},
 		}
 
 		manifest_dir.pop();
diff --git a/utils/build-script-utils/src/lib.rs b/utils/build-script-utils/src/lib.rs
index 8eb17a7de61f..0c45c4b34ebe 100644
--- a/utils/build-script-utils/src/lib.rs
+++ b/utils/build-script-utils/src/lib.rs
@@ -17,8 +17,8 @@
 
 //! Crate with utility functions for `build.rs` scripts.
 
-mod version;
 mod git;
+mod version;
 
 pub use git::*;
 pub use version::*;
diff --git a/utils/build-script-utils/src/version.rs b/utils/build-script-utils/src/version.rs
index f92c637c78cc..52336eb0b6a2 100644
--- a/utils/build-script-utils/src/version.rs
+++ b/utils/build-script-utils/src/version.rs
@@ -20,15 +20,13 @@ use std::{borrow::Cow, process::Command};
 
 /// Generate the `cargo:` key output
 pub fn generate_cargo_keys() {
-	let output = Command::new("git")
-		.args(&["rev-parse", "--short", "HEAD"])
-		.output();
+	let output = Command::new("git").args(&["rev-parse", "--short", "HEAD"]).output();
 
 	let commit = match output {
 		Ok(o) if o.status.success() => {
 			let sha = String::from_utf8_lossy(&o.stdout).trim().to_owned();
 			Cow::from(sha)
-		}
+		},
 		Ok(o) => {
 			println!("cargo:warning=Git command failed with status: {}", o.status);
 			Cow::from("unknown")
diff --git a/utils/fork-tree/src/lib.rs b/utils/fork-tree/src/lib.rs
index d1ec67d37b95..f22d54d3d1a4 100644
--- a/utils/fork-tree/src/lib.rs
+++ b/utils/fork-tree/src/lib.rs
@@ -20,9 +20,8 @@
 
 #![warn(missing_docs)]
 
-use std::cmp::Reverse;
-use std::fmt;
 use codec::{Decode, Encode};
+use std::{cmp::Reverse, fmt};
 
 /// Error occurred when iterating with the tree.
 #[derive(Clone, Debug, PartialEq)]
@@ -83,7 +82,8 @@ pub struct ForkTree<H, N, V> {
 	best_finalized_number: Option<N>,
 }
 
-impl<H, N, V> ForkTree<H, N, V> where
+impl<H, N, V> ForkTree<H, N, V>
+where
 	H: PartialEq + Clone,
 	N: Ord + Clone,
 	V: Clone,
@@ -102,17 +102,14 @@ impl<H, N, V> ForkTree<H, N, V> where
 		number: &N,
 		is_descendent_of: &F,
 		predicate: &P,
-	) -> Result<impl Iterator<Item=(H, N, V)>, Error<E>>
-		where E: std::error::Error,
-			  F: Fn(&H, &H) -> Result<bool, E>,
-			  P: Fn(&V) -> bool,
+	) -> Result<impl Iterator<Item = (H, N, V)>, Error<E>>
+	where
+		E: std::error::Error,
+		F: Fn(&H, &H) -> Result<bool, E>,
+		P: Fn(&V) -> bool,
 	{
-		let new_root_index = self.find_node_index_where(
-			hash,
-			number,
-			is_descendent_of,
-			predicate,
-		)?;
+		let new_root_index =
+			self.find_node_index_where(hash, number, is_descendent_of, predicate)?;
 
 		let removed = if let Some(mut root_index) = new_root_index {
 			let mut old_roots = std::mem::take(&mut self.roots);
@@ -130,9 +127,10 @@ impl<H, N, V> ForkTree<H, N, V> where
 				}
 			}
 
-			let mut root = root
-				.expect("find_node_index_where will return array with at least one index; \
-						 this results in at least one item in removed; qed");
+			let mut root = root.expect(
+				"find_node_index_where will return array with at least one index; \
+						 this results in at least one item in removed; qed",
+			);
 
 			let mut removed = old_roots;
 
@@ -144,7 +142,7 @@ impl<H, N, V> ForkTree<H, N, V> where
 			for child in root_children {
 				if is_first &&
 					(child.number == *number && child.hash == *hash ||
-					 child.number < *number && is_descendent_of(&child.hash, hash)?)
+						child.number < *number && is_descendent_of(&child.hash, hash)?)
 				{
 					root.children.push(child);
 					// assuming that the tree is well formed only one child should pass this requirement
@@ -168,16 +166,14 @@ impl<H, N, V> ForkTree<H, N, V> where
 	}
 }
 
-impl<H, N, V> ForkTree<H, N, V> where
+impl<H, N, V> ForkTree<H, N, V>
+where
 	H: PartialEq,
 	N: Ord,
 {
 	/// Create a new empty tree.
 	pub fn new() -> ForkTree<H, N, V> {
-		ForkTree {
-			roots: Vec::new(),
-			best_finalized_number: None,
-		}
+		ForkTree { roots: Vec::new(), best_finalized_number: None }
 	}
 
 	/// Rebalance the tree, i.e. sort child nodes by max branch depth
@@ -209,18 +205,19 @@ impl<H, N, V> ForkTree<H, N, V> where
 		mut data: V,
 		is_descendent_of: &F,
 	) -> Result<bool, Error<E>>
-		where E: std::error::Error,
-			  F: Fn(&H, &H) -> Result<bool, E>,
+	where
+		E: std::error::Error,
+		F: Fn(&H, &H) -> Result<bool, E>,
 	{
 		if let Some(ref best_finalized_number) = self.best_finalized_number {
 			if number <= *best_finalized_number {
-				return Err(Error::Revert);
+				return Err(Error::Revert)
 			}
 		}
 
 		for root in self.roots.iter_mut() {
 			if root.hash == hash {
-				return Err(Error::Duplicate);
+				return Err(Error::Duplicate)
 			}
 
 			match root.import(hash, number, data, is_descendent_of)? {
@@ -231,17 +228,12 @@ impl<H, N, V> ForkTree<H, N, V> where
 				},
 				None => {
 					self.rebalance();
-					return Ok(false);
+					return Ok(false)
 				},
 			}
 		}
 
-		self.roots.push(Node {
-			data,
-			hash: hash,
-			number: number,
-			children: Vec::new(),
-		});
+		self.roots.push(Node { data, hash, number, children: Vec::new() });
 
 		self.rebalance();
 
@@ -249,18 +241,18 @@ impl<H, N, V> ForkTree<H, N, V> where
 	}
 
 	/// Iterates over the existing roots in the tree.
-	pub fn roots(&self) -> impl Iterator<Item=(&H, &N, &V)> {
+	pub fn roots(&self) -> impl Iterator<Item = (&H, &N, &V)> {
 		self.roots.iter().map(|node| (&node.hash, &node.number, &node.data))
 	}
 
-	fn node_iter(&self) -> impl Iterator<Item=&Node<H, N, V>> {
+	fn node_iter(&self) -> impl Iterator<Item = &Node<H, N, V>> {
 		// we need to reverse the order of roots to maintain the expected
 		// ordering since the iterator uses a stack to track state.
 		ForkTreeIterator { stack: self.roots.iter().rev().collect() }
 	}
 
 	/// Iterates the nodes in the tree in pre-order.
-	pub fn iter(&self) -> impl Iterator<Item=(&H, &N, &V)> {
+	pub fn iter(&self) -> impl Iterator<Item = (&H, &N, &V)> {
 		self.node_iter().map(|node| (&node.hash, &node.number, &node.data))
 	}
 
@@ -274,7 +266,8 @@ impl<H, N, V> ForkTree<H, N, V> where
 		number: &N,
 		is_descendent_of: &F,
 		predicate: &P,
-	) -> Result<Option<&Node<H, N, V>>, Error<E>> where
+	) -> Result<Option<&Node<H, N, V>>, Error<E>>
+	where
 		E: std::error::Error,
 		F: Fn(&H, &H) -> Result<bool, E>,
 		P: Fn(&V) -> bool,
@@ -285,7 +278,7 @@ impl<H, N, V> ForkTree<H, N, V> where
 
 			// found the node, early exit
 			if let FindOutcome::Found(node) = node {
-				return Ok(Some(node));
+				return Ok(Some(node))
 			}
 		}
 
@@ -293,23 +286,13 @@ impl<H, N, V> ForkTree<H, N, V> where
 	}
 
 	/// Map fork tree into values of new types.
-	pub fn map<VT, F>(
-		self,
-		f: &mut F,
-	) -> ForkTree<H, N, VT> where
+	pub fn map<VT, F>(self, f: &mut F) -> ForkTree<H, N, VT>
+	where
 		F: FnMut(&H, &N, V) -> VT,
 	{
-		let roots = self.roots
-			.into_iter()
-			.map(|root| {
-				root.map(f)
-			})
-			.collect();
-
-		ForkTree {
-			roots,
-			best_finalized_number: self.best_finalized_number,
-		}
+		let roots = self.roots.into_iter().map(|root| root.map(f)).collect();
+
+		ForkTree { roots, best_finalized_number: self.best_finalized_number }
 	}
 
 	/// Same as [`find_node_where`](ForkTree::find_node_where), but returns mutable reference.
@@ -319,7 +302,8 @@ impl<H, N, V> ForkTree<H, N, V> where
 		number: &N,
 		is_descendent_of: &F,
 		predicate: &P,
-	) -> Result<Option<&mut Node<H, N, V>>, Error<E>> where
+	) -> Result<Option<&mut Node<H, N, V>>, Error<E>>
+	where
 		E: std::error::Error,
 		F: Fn(&H, &H) -> Result<bool, E>,
 		P: Fn(&V) -> bool,
@@ -330,7 +314,7 @@ impl<H, N, V> ForkTree<H, N, V> where
 
 			// found the node, early exit
 			if let FindOutcome::Found(node) = node {
-				return Ok(Some(node));
+				return Ok(Some(node))
 			}
 		}
 
@@ -344,7 +328,8 @@ impl<H, N, V> ForkTree<H, N, V> where
 		number: &N,
 		is_descendent_of: &F,
 		predicate: &P,
-	) -> Result<Option<Vec<usize>>, Error<E>> where
+	) -> Result<Option<Vec<usize>>, Error<E>>
+	where
 		E: std::error::Error,
 		F: Fn(&H, &H) -> Result<bool, E>,
 		P: Fn(&V) -> bool,
@@ -356,7 +341,7 @@ impl<H, N, V> ForkTree<H, N, V> where
 			// found the node, early exit
 			if let FindOutcome::Found(mut node) = node {
 				node.push(index);
-				return Ok(Some(node));
+				return Ok(Some(node))
 			}
 		}
 
@@ -367,7 +352,9 @@ impl<H, N, V> ForkTree<H, N, V> where
 	/// with the given hash exists. All other roots are pruned, and the children
 	/// of the finalized node become the new roots.
 	pub fn finalize_root(&mut self, hash: &H) -> Option<V> {
-		self.roots.iter().position(|node| node.hash == *hash)
+		self.roots
+			.iter()
+			.position(|node| node.hash == *hash)
 			.map(|position| self.finalize_root_at(position))
 	}
 
@@ -376,7 +363,7 @@ impl<H, N, V> ForkTree<H, N, V> where
 		let node = self.roots.swap_remove(position);
 		self.roots = node.children;
 		self.best_finalized_number = Some(node.number);
-		return node.data;
+		return node.data
 	}
 
 	/// Finalize a node in the tree. This method will make sure that the node
@@ -390,24 +377,25 @@ impl<H, N, V> ForkTree<H, N, V> where
 		number: N,
 		is_descendent_of: &F,
 	) -> Result<FinalizationResult<V>, Error<E>>
-		where E: std::error::Error,
-			  F: Fn(&H, &H) -> Result<bool, E>
+	where
+		E: std::error::Error,
+		F: Fn(&H, &H) -> Result<bool, E>,
 	{
 		if let Some(ref best_finalized_number) = self.best_finalized_number {
 			if number <= *best_finalized_number {
-				return Err(Error::Revert);
+				return Err(Error::Revert)
 			}
 		}
 
 		// check if one of the current roots is being finalized
 		if let Some(root) = self.finalize_root(hash) {
-			return Ok(FinalizationResult::Changed(Some(root)));
+			return Ok(FinalizationResult::Changed(Some(root)))
 		}
 
 		// make sure we're not finalizing a descendent of any root
 		for root in self.roots.iter() {
 			if number > root.number && is_descendent_of(&root.hash, hash)? {
-				return Err(Error::UnfinalizedAncestor);
+				return Err(Error::UnfinalizedAncestor)
 			}
 		}
 
@@ -443,18 +431,19 @@ impl<H, N, V> ForkTree<H, N, V> where
 		number: N,
 		is_descendent_of: &F,
 	) -> Result<FinalizationResult<V>, Error<E>>
-		where E: std::error::Error,
-				F: Fn(&H, &H) -> Result<bool, E>
+	where
+		E: std::error::Error,
+		F: Fn(&H, &H) -> Result<bool, E>,
 	{
 		if let Some(ref best_finalized_number) = self.best_finalized_number {
 			if number <= *best_finalized_number {
-				return Err(Error::Revert);
+				return Err(Error::Revert)
 			}
 		}
 
 		// check if one of the current roots is being finalized
 		if let Some(root) = self.finalize_root(hash) {
-			return Ok(FinalizationResult::Changed(Some(root)));
+			return Ok(FinalizationResult::Changed(Some(root)))
 		}
 
 		// we need to:
@@ -469,23 +458,21 @@ impl<H, N, V> ForkTree<H, N, V> where
 				let is_finalized = root.hash == *hash;
 				let is_descendant =
 					!is_finalized && root.number > number && is_descendent_of(hash, &root.hash)?;
-				let is_ancestor = !is_finalized
-					&& !is_descendant && root.number < number
-					&& is_descendent_of(&root.hash, hash)?;
+				let is_ancestor = !is_finalized &&
+					!is_descendant && root.number < number &&
+					is_descendent_of(&root.hash, hash)?;
 				(is_finalized, is_descendant, is_ancestor)
 			};
 
 			// if we have met finalized root - open it and return
 			if is_finalized {
-				return Ok(FinalizationResult::Changed(Some(
-					self.finalize_root_at(idx),
-				)));
+				return Ok(FinalizationResult::Changed(Some(self.finalize_root_at(idx))))
 			}
 
 			// if node is descendant of finalized block - just leave it as is
 			if is_descendant {
 				idx += 1;
-				continue;
+				continue
 			}
 
 			// if node is ancestor of finalized block - remove it and continue with children
@@ -493,7 +480,7 @@ impl<H, N, V> ForkTree<H, N, V> where
 				let root = self.roots.swap_remove(idx);
 				self.roots.extend(root.children);
 				changed = true;
-				continue;
+				continue
 			}
 
 			// if node is neither ancestor, nor descendant of the finalized block - remove it
@@ -526,13 +513,14 @@ impl<H, N, V> ForkTree<H, N, V> where
 		is_descendent_of: &F,
 		predicate: P,
 	) -> Result<Option<bool>, Error<E>>
-		where E: std::error::Error,
-			  F: Fn(&H, &H) -> Result<bool, E>,
-			  P: Fn(&V) -> bool,
+	where
+		E: std::error::Error,
+		F: Fn(&H, &H) -> Result<bool, E>,
+		P: Fn(&V) -> bool,
 	{
 		if let Some(ref best_finalized_number) = self.best_finalized_number {
 			if number <= *best_finalized_number {
-				return Err(Error::Revert);
+				return Err(Error::Revert)
 			}
 		}
 
@@ -544,11 +532,11 @@ impl<H, N, V> ForkTree<H, N, V> where
 				if node.hash == *hash || is_descendent_of(&node.hash, hash)? {
 					for node in node.children.iter() {
 						if node.number <= number && is_descendent_of(&node.hash, &hash)? {
-							return Err(Error::UnfinalizedAncestor);
+							return Err(Error::UnfinalizedAncestor)
 						}
 					}
 
-					return Ok(Some(self.roots.iter().any(|root| root.hash == node.hash)));
+					return Ok(Some(self.roots.iter().any(|root| root.hash == node.hash)))
 				}
 			}
 		}
@@ -570,13 +558,14 @@ impl<H, N, V> ForkTree<H, N, V> where
 		is_descendent_of: &F,
 		predicate: P,
 	) -> Result<FinalizationResult<V>, Error<E>>
-		where E: std::error::Error,
-			  F: Fn(&H, &H) -> Result<bool, E>,
-			  P: Fn(&V) -> bool,
+	where
+		E: std::error::Error,
+		F: Fn(&H, &H) -> Result<bool, E>,
+		P: Fn(&V) -> bool,
 	{
 		if let Some(ref best_finalized_number) = self.best_finalized_number {
 			if number <= *best_finalized_number {
-				return Err(Error::Revert);
+				return Err(Error::Revert)
 			}
 		}
 
@@ -589,12 +578,12 @@ impl<H, N, V> ForkTree<H, N, V> where
 				if root.hash == *hash || is_descendent_of(&root.hash, hash)? {
 					for node in root.children.iter() {
 						if node.number <= number && is_descendent_of(&node.hash, &hash)? {
-							return Err(Error::UnfinalizedAncestor);
+							return Err(Error::UnfinalizedAncestor)
 						}
 					}
 
 					position = Some(i);
-					break;
+					break
 				}
 			}
 		}
@@ -616,9 +605,9 @@ impl<H, N, V> ForkTree<H, N, V> where
 		let roots = std::mem::take(&mut self.roots);
 
 		for root in roots {
-			let retain = root.number > number && is_descendent_of(hash, &root.hash)?
-				|| root.number == number && root.hash == *hash
-				|| is_descendent_of(&root.hash, hash)?;
+			let retain = root.number > number && is_descendent_of(hash, &root.hash)? ||
+				root.number == number && root.hash == *hash ||
+				is_descendent_of(&root.hash, hash)?;
 
 			if retain {
 				self.roots.push(root);
@@ -681,26 +670,14 @@ mod node_implementation {
 		}
 
 		/// Map node data into values of new types.
-		pub fn map<VT, F>(
-			self,
-			f: &mut F,
-		) -> Node<H, N, VT> where
+		pub fn map<VT, F>(self, f: &mut F) -> Node<H, N, VT>
+		where
 			F: FnMut(&H, &N, V) -> VT,
 		{
-			let children = self.children
-				.into_iter()
-				.map(|node| {
-					node.map(f)
-				})
-				.collect();
+			let children = self.children.into_iter().map(|node| node.map(f)).collect();
 
 			let vt = f(&self.hash, &self.number, self.data);
-			Node {
-				hash: self.hash,
-				number: self.number,
-				data: vt,
-				children,
-			}
+			Node { hash: self.hash, number: self.number, data: vt, children }
 		}
 
 		pub fn import<F, E: std::error::Error>(
@@ -710,14 +687,17 @@ mod node_implementation {
 			mut data: V,
 			is_descendent_of: &F,
 		) -> Result<Option<(H, N, V)>, Error<E>>
-			where E: fmt::Debug,
-				  F: Fn(&H, &H) -> Result<bool, E>,
+		where
+			E: fmt::Debug,
+			F: Fn(&H, &H) -> Result<bool, E>,
 		{
 			if self.hash == hash {
-				return Err(Error::Duplicate);
+				return Err(Error::Duplicate)
 			};
 
-			if number <= self.number { return Ok(Some((hash, number, data))); }
+			if number <= self.number {
+				return Ok(Some((hash, number, data)))
+			}
 
 			for node in self.children.iter_mut() {
 				match node.import(hash, number, data, is_descendent_of)? {
@@ -731,12 +711,7 @@ mod node_implementation {
 			}
 
 			if is_descendent_of(&self.hash, &hash)? {
-				self.children.push(Node {
-					data,
-					hash: hash,
-					number: number,
-					children: Vec::new(),
-				});
+				self.children.push(Node { data, hash, number, children: Vec::new() });
 
 				Ok(None)
 			} else {
@@ -760,13 +735,14 @@ mod node_implementation {
 			is_descendent_of: &F,
 			predicate: &P,
 		) -> Result<FindOutcome<Vec<usize>>, Error<E>>
-			where E: std::error::Error,
-				  F: Fn(&H, &H) -> Result<bool, E>,
-				  P: Fn(&V) -> bool,
+		where
+			E: std::error::Error,
+			F: Fn(&H, &H) -> Result<bool, E>,
+			P: Fn(&V) -> bool,
 		{
 			// stop searching this branch
 			if *number < self.number {
-				return Ok(FindOutcome::Failure(false));
+				return Ok(FindOutcome::Failure(false))
 			}
 
 			let mut known_descendent_of = false;
@@ -785,7 +761,7 @@ mod node_implementation {
 						// then it cannot be a descendent of any others,
 						// so we don't search them.
 						known_descendent_of = true;
-						break;
+						break
 					},
 					FindOutcome::Failure(false) => {},
 				}
@@ -799,7 +775,7 @@ mod node_implementation {
 			if is_descendent_of {
 				// if the predicate passes we return the node
 				if predicate(&self.data) {
-					return Ok(FindOutcome::Found(Vec::new()));
+					return Ok(FindOutcome::Found(Vec::new()))
 				}
 			}
 
@@ -820,9 +796,10 @@ mod node_implementation {
 			is_descendent_of: &F,
 			predicate: &P,
 		) -> Result<FindOutcome<&Node<H, N, V>>, Error<E>>
-			where E: std::error::Error,
-				  F: Fn(&H, &H) -> Result<bool, E>,
-				  P: Fn(&V) -> bool,
+		where
+			E: std::error::Error,
+			F: Fn(&H, &H) -> Result<bool, E>,
+			P: Fn(&V) -> bool,
 		{
 			let outcome = self.find_node_index_where(hash, number, is_descendent_of, predicate)?;
 
@@ -852,9 +829,10 @@ mod node_implementation {
 			is_descendent_of: &F,
 			predicate: &P,
 		) -> Result<FindOutcome<&mut Node<H, N, V>>, Error<E>>
-			where E: std::error::Error,
-				  F: Fn(&H, &H) -> Result<bool, E>,
-				  P: Fn(&V) -> bool,
+		where
+			E: std::error::Error,
+			F: Fn(&H, &H) -> Result<bool, E>,
+			P: Fn(&V) -> bool,
 		{
 			let outcome = self.find_node_index_where(hash, number, is_descendent_of, predicate)?;
 
@@ -875,7 +853,7 @@ mod node_implementation {
 }
 
 // Workaround for: https://github.com/rust-lang/rust/issues/34537
-use node_implementation::{Node, FindOutcome};
+use node_implementation::{FindOutcome, Node};
 
 struct ForkTreeIterator<'a, H, N, V> {
 	stack: Vec<&'a Node<H, N, V>>,
@@ -917,7 +895,7 @@ impl<H, N, V> Iterator for RemovedIterator<H, N, V> {
 
 #[cfg(test)]
 mod test {
-	use super::{FinalizationResult, ForkTree, Error};
+	use super::{Error, FinalizationResult, ForkTree};
 
 	#[derive(Debug, PartialEq)]
 	struct TestError;
@@ -930,10 +908,10 @@ mod test {
 
 	impl std::error::Error for TestError {}
 
-	fn test_fork_tree<'a>() -> (ForkTree<&'a str, u64, ()>, impl Fn(&&str, &&str) -> Result<bool, TestError>)  {
+	fn test_fork_tree<'a>(
+	) -> (ForkTree<&'a str, u64, ()>, impl Fn(&&str, &&str) -> Result<bool, TestError>) {
 		let mut tree = ForkTree::new();
 
-		//
 		//     - B - C - D - E
 		//    /
 		//   /   - G
@@ -959,7 +937,8 @@ mod test {
 				("C", b) => Ok(b == "D" || b == "E"),
 				("D", b) => Ok(b == "E"),
 				("E", _) => Ok(false),
-				("F", b) => Ok(b == "G" || b == "H" || b == "I" || b == "L" || b == "M" || b == "O"),
+				("F", b) =>
+					Ok(b == "G" || b == "H" || b == "I" || b == "L" || b == "M" || b == "O"),
 				("G", _) => Ok(false),
 				("H", b) => Ok(b == "I" || b == "L" || b == "M" || b == "O"),
 				("I", _) => Ok(false),
@@ -1001,40 +980,22 @@ mod test {
 
 		tree.finalize_root(&"A");
 
-		assert_eq!(
-			tree.best_finalized_number,
-			Some(1),
-		);
+		assert_eq!(tree.best_finalized_number, Some(1),);
 
-		assert_eq!(
-			tree.import("A", 1, (), &is_descendent_of),
-			Err(Error::Revert),
-		);
+		assert_eq!(tree.import("A", 1, (), &is_descendent_of), Err(Error::Revert),);
 	}
 
 	#[test]
 	fn import_doesnt_add_duplicates() {
 		let (mut tree, is_descendent_of) = test_fork_tree();
 
-		assert_eq!(
-			tree.import("A", 1, (), &is_descendent_of),
-			Err(Error::Duplicate),
-		);
+		assert_eq!(tree.import("A", 1, (), &is_descendent_of), Err(Error::Duplicate),);
 
-		assert_eq!(
-			tree.import("I", 4, (), &is_descendent_of),
-			Err(Error::Duplicate),
-		);
+		assert_eq!(tree.import("I", 4, (), &is_descendent_of), Err(Error::Duplicate),);
 
-		assert_eq!(
-			tree.import("G", 3, (), &is_descendent_of),
-			Err(Error::Duplicate),
-		);
+		assert_eq!(tree.import("G", 3, (), &is_descendent_of), Err(Error::Duplicate),);
 
-		assert_eq!(
-			tree.import("K", 3, (), &is_descendent_of),
-			Err(Error::Duplicate),
-		);
+		assert_eq!(tree.import("K", 3, (), &is_descendent_of), Err(Error::Duplicate),);
 	}
 
 	#[test]
@@ -1096,10 +1057,7 @@ mod test {
 		let original_roots = tree.roots.clone();
 
 		// finalizing a block prior to any in the node doesn't change the tree
-		assert_eq!(
-			tree.finalize(&"0", 0, &is_descendent_of),
-			Ok(FinalizationResult::Unchanged),
-		);
+		assert_eq!(tree.finalize(&"0", 0, &is_descendent_of), Ok(FinalizationResult::Unchanged),);
 
 		assert_eq!(tree.roots, original_roots);
 
@@ -1115,21 +1073,12 @@ mod test {
 		);
 
 		// finalizing anything lower than what we observed will fail
-		assert_eq!(
-			tree.best_finalized_number,
-			Some(1),
-		);
+		assert_eq!(tree.best_finalized_number, Some(1),);
 
-		assert_eq!(
-			tree.finalize(&"Z", 1, &is_descendent_of),
-			Err(Error::Revert),
-		);
+		assert_eq!(tree.finalize(&"Z", 1, &is_descendent_of), Err(Error::Revert),);
 
 		// trying to finalize a node without finalizing its ancestors first will fail
-		assert_eq!(
-			tree.finalize(&"H", 3, &is_descendent_of),
-			Err(Error::UnfinalizedAncestor),
-		);
+		assert_eq!(tree.finalize(&"H", 3, &is_descendent_of), Err(Error::UnfinalizedAncestor),);
 
 		// after finalizing "F" we can finalize "H"
 		assert_eq!(
@@ -1195,10 +1144,7 @@ mod test {
 			vec![("L", 4), ("I", 4)],
 		);
 
-		assert_eq!(
-			tree.best_finalized_number,
-			Some(3),
-		);
+		assert_eq!(tree.best_finalized_number, Some(3),);
 
 		// finalizing N (which is not a part of the tree):
 		// 1) removes roots that are not ancestors/descendants of N (I)
@@ -1215,23 +1161,20 @@ mod test {
 			vec![],
 		);
 
-		assert_eq!(
-			tree.best_finalized_number,
-			Some(6),
-		);
+		assert_eq!(tree.best_finalized_number, Some(6),);
 	}
 
 	#[test]
 	fn finalize_with_descendent_works() {
 		#[derive(Debug, PartialEq)]
-		struct Change { effective: u64 }
+		struct Change {
+			effective: u64,
+		}
 
 		let (mut tree, is_descendent_of) = {
 			let mut tree = ForkTree::new();
 
 			let is_descendent_of = |base: &&str, block: &&str| -> Result<bool, TestError> {
-
-				//
 				// A0 #1 - (B #2) - (C #5) - D #10 - E #15 - (F #100)
 				//                            \
 				//                             - (G #100)
@@ -1270,24 +1213,15 @@ mod test {
 		// finalizing "D" will finalize a block from the tree, but it can't be applied yet
 		// since it is not a root change
 		assert_eq!(
-			tree.finalizes_any_with_descendent_if(
-				&"D",
-				10,
-				&is_descendent_of,
-				|c| c.effective == 10,
-			),
+			tree.finalizes_any_with_descendent_if(&"D", 10, &is_descendent_of, |c| c.effective ==
+				10,),
 			Ok(Some(false)),
 		);
 
 		// finalizing "B" doesn't finalize "A0" since the predicate doesn't pass,
 		// although it will clear out "A1" from the tree
 		assert_eq!(
-			tree.finalize_with_descendent_if(
-				&"B",
-				2,
-				&is_descendent_of,
-				|c| c.effective <= 2,
-			),
+			tree.finalize_with_descendent_if(&"B", 2, &is_descendent_of, |c| c.effective <= 2,),
 			Ok(FinalizationResult::Changed(None)),
 		);
 
@@ -1308,12 +1242,7 @@ mod test {
 		);
 
 		assert_eq!(
-			tree.finalize_with_descendent_if(
-				&"C",
-				5,
-				&is_descendent_of,
-				|c| c.effective <= 5,
-			),
+			tree.finalize_with_descendent_if(&"C", 5, &is_descendent_of, |c| c.effective <= 5,),
 			Ok(FinalizationResult::Changed(Some(Change { effective: 5 }))),
 		);
 
@@ -1324,33 +1253,20 @@ mod test {
 
 		// finalizing "F" will fail since it would finalize past "E" without finalizing "D" first
 		assert_eq!(
-			tree.finalizes_any_with_descendent_if(
-				&"F",
-				100,
-				&is_descendent_of,
-				|c| c.effective <= 100,
-			),
+			tree.finalizes_any_with_descendent_if(&"F", 100, &is_descendent_of, |c| c.effective <=
+				100,),
 			Err(Error::UnfinalizedAncestor),
 		);
 
 		// it will work with "G" though since it is not in the same branch as "E"
 		assert_eq!(
-			tree.finalizes_any_with_descendent_if(
-				&"G",
-				100,
-				&is_descendent_of,
-				|c| c.effective <= 100,
-			),
+			tree.finalizes_any_with_descendent_if(&"G", 100, &is_descendent_of, |c| c.effective <=
+				100,),
 			Ok(Some(true)),
 		);
 
 		assert_eq!(
-			tree.finalize_with_descendent_if(
-				&"G",
-				100,
-				&is_descendent_of,
-				|c| c.effective <= 100,
-			),
+			tree.finalize_with_descendent_if(&"G", 100, &is_descendent_of, |c| c.effective <= 100,),
 			Ok(FinalizationResult::Changed(Some(Change { effective: 10 }))),
 		);
 
@@ -1365,12 +1281,19 @@ mod test {
 			tree.iter().map(|(h, n, _)| (h.clone(), n.clone())).collect::<Vec<_>>(),
 			vec![
 				("A", 1),
-				("B", 2), ("C", 3), ("D", 4), ("E", 5),
-				("F", 2), ("H", 3), ("L", 4), ("M", 5),
+				("B", 2),
+				("C", 3),
+				("D", 4),
+				("E", 5),
+				("F", 2),
+				("H", 3),
+				("L", 4),
+				("M", 5),
 				("O", 5),
 				("I", 4),
 				("G", 3),
-				("J", 2), ("K", 3),
+				("J", 2),
+				("K", 3),
 			],
 		);
 	}
@@ -1400,19 +1323,11 @@ mod test {
 			// "L" is a descendent of "K", but the predicate will only pass for "K",
 			// therefore only one call to `is_descendent_of` should be made
 			assert_eq!(
-				tree.finalizes_any_with_descendent_if(
-					&"L",
-					11,
-					&is_descendent_of,
-					|i| *i == 10,
-				),
+				tree.finalizes_any_with_descendent_if(&"L", 11, &is_descendent_of, |i| *i == 10,),
 				Ok(Some(false)),
 			);
 
-			assert_eq!(
-				n_is_descendent_of_calls.load(Ordering::SeqCst),
-				1,
-			);
+			assert_eq!(n_is_descendent_of_calls.load(Ordering::SeqCst), 1,);
 		}
 
 		n_is_descendent_of_calls.store(0, Ordering::SeqCst);
@@ -1431,19 +1346,11 @@ mod test {
 			// "L" is a descendent of "K", but the predicate will only pass for "K",
 			// therefore only one call to `is_descendent_of` should be made
 			assert_eq!(
-				tree.finalize_with_descendent_if(
-					&"L",
-					11,
-					&is_descendent_of,
-					|i| *i == 10,
-				),
+				tree.finalize_with_descendent_if(&"L", 11, &is_descendent_of, |i| *i == 10,),
 				Ok(FinalizationResult::Changed(Some(10))),
 			);
 
-			assert_eq!(
-				n_is_descendent_of_calls.load(Ordering::SeqCst),
-				1,
-			);
+			assert_eq!(n_is_descendent_of_calls.load(Ordering::SeqCst), 1,);
 		}
 	}
 
@@ -1451,12 +1358,7 @@ mod test {
 	fn find_node_works() {
 		let (tree, is_descendent_of) = test_fork_tree();
 
-		let node = tree.find_node_where(
-			&"D",
-			&4,
-			&is_descendent_of,
-			&|_| true,
-		).unwrap().unwrap();
+		let node = tree.find_node_where(&"D", &4, &is_descendent_of, &|_| true).unwrap().unwrap();
 
 		assert_eq!(node.hash, "C");
 		assert_eq!(node.number, 3);
@@ -1473,17 +1375,9 @@ mod test {
 	fn prune_works() {
 		let (mut tree, is_descendent_of) = test_fork_tree();
 
-		let removed = tree.prune(
-			&"C",
-			&3,
-			&is_descendent_of,
-			&|_| true,
-		).unwrap();
+		let removed = tree.prune(&"C", &3, &is_descendent_of, &|_| true).unwrap();
 
-		assert_eq!(
-			tree.roots.iter().map(|node| node.hash).collect::<Vec<_>>(),
-			vec!["B"],
-		);
+		assert_eq!(tree.roots.iter().map(|node| node.hash).collect::<Vec<_>>(), vec!["B"],);
 
 		assert_eq!(
 			tree.iter().map(|(hash, _, _)| *hash).collect::<Vec<_>>(),
@@ -1495,34 +1389,19 @@ mod test {
 			vec!["A", "F", "H", "L", "M", "O", "I", "G", "J", "K"]
 		);
 
-		let removed = tree.prune(
-			&"E",
-			&5,
-			&is_descendent_of,
-			&|_| true,
-		).unwrap();
+		let removed = tree.prune(&"E", &5, &is_descendent_of, &|_| true).unwrap();
 
-		assert_eq!(
-			tree.roots.iter().map(|node| node.hash).collect::<Vec<_>>(),
-			vec!["D"],
-		);
+		assert_eq!(tree.roots.iter().map(|node| node.hash).collect::<Vec<_>>(), vec!["D"],);
 
-		assert_eq!(
-			tree.iter().map(|(hash, _, _)| *hash).collect::<Vec<_>>(),
-			vec!["D", "E"],
-		);
+		assert_eq!(tree.iter().map(|(hash, _, _)| *hash).collect::<Vec<_>>(), vec!["D", "E"],);
 
-		assert_eq!(
-			removed.map(|(hash, _, _)| hash).collect::<Vec<_>>(),
-			vec!["B", "C"]
-		);
+		assert_eq!(removed.map(|(hash, _, _)| hash).collect::<Vec<_>>(), vec!["B", "C"]);
 	}
 
 	#[test]
 	fn find_node_backtracks_after_finding_highest_descending_node() {
 		let mut tree = ForkTree::new();
 
-		//
 		// A - B
 		//  \
 		//   — C
@@ -1543,12 +1422,7 @@ mod test {
 		// when searching the tree we reach node `C`, but the
 		// predicate doesn't pass. we should backtrack to `B`, but not to `A`,
 		// since "B" fulfills the predicate.
-		let node = tree.find_node_where(
-			&"D",
-			&3,
-			&is_descendent_of,
-			&|data| *data < 3,
-		).unwrap();
+		let node = tree.find_node_where(&"D", &3, &is_descendent_of, &|data| *data < 3).unwrap();
 
 		assert_eq!(node.unwrap().hash, "B");
 	}
diff --git a/utils/frame/benchmarking-cli/src/command.rs b/utils/frame/benchmarking-cli/src/command.rs
index 3bfb639dd9eb..2ef9f3914a5d 100644
--- a/utils/frame/benchmarking-cli/src/command.rs
+++ b/utils/frame/benchmarking-cli/src/command.rs
@@ -19,7 +19,7 @@ use crate::BenchmarkCmd;
 use codec::{Decode, Encode};
 use frame_benchmarking::{Analysis, BenchmarkBatch, BenchmarkSelector};
 use frame_support::traits::StorageInfo;
-use sc_cli::{SharedParams, CliConfiguration, ExecutionStrategy, Result};
+use sc_cli::{CliConfiguration, ExecutionStrategy, Result, SharedParams};
 use sc_client_db::BenchmarkingState;
 use sc_executor::NativeExecutor;
 use sc_service::{Configuration, NativeExecutionDispatch};
@@ -49,11 +49,15 @@ impl BenchmarkCmd {
 		}
 
 		if let Some(header_file) = &self.header {
-			if !header_file.is_file() { return Err("Header file is invalid!".into()) };
+			if !header_file.is_file() {
+				return Err("Header file is invalid!".into())
+			};
 		}
 
 		if let Some(handlebars_template_file) = &self.template {
-			if !handlebars_template_file.is_file() { return Err("Handlebars template file is invalid!".into()) };
+			if !handlebars_template_file.is_file() {
+				return Err("Handlebars template file is invalid!".into())
+			};
 		}
 
 		let spec = config.chain_spec;
@@ -93,7 +97,8 @@ impl BenchmarkCmd {
 				self.repeat,
 				!self.no_verify,
 				self.extra,
-			).encode(),
+			)
+				.encode(),
 			extensions,
 			&sp_state_machine::backend::BackendRuntimeCode::new(&state).runtime_code()?,
 			sp_core::testing::TaskExecutor::new(),
@@ -126,20 +131,25 @@ impl BenchmarkCmd {
 					);
 
 					// Skip raw data + analysis if there are no results
-					if batch.results.is_empty() { continue }
+					if batch.results.is_empty() {
+						continue
+					}
 
 					if self.raw_data {
 						// Print the table header
-						batch.results[0].components.iter().for_each(|param| print!("{:?},", param.0));
+						batch.results[0]
+							.components
+							.iter()
+							.for_each(|param| print!("{:?},", param.0));
 
 						print!("extrinsic_time_ns,storage_root_time_ns,reads,repeat_reads,writes,repeat_writes,proof_size_bytes\n");
 						// Print the values
 						batch.results.iter().for_each(|result| {
-
 							let parameters = &result.components;
 							parameters.iter().for_each(|param| print!("{:?},", param.1));
 							// Print extrinsic time and storage root time
-							print!("{:?},{:?},{:?},{:?},{:?},{:?},{:?}\n",
+							print!(
+								"{:?},{:?},{:?},{:?},{:?},{:?},{:?}\n",
 								result.extrinsic_time,
 								result.storage_root_time,
 								result.reads,
@@ -156,25 +166,39 @@ impl BenchmarkCmd {
 					// Conduct analysis.
 					if !self.no_median_slopes {
 						println!("Median Slopes Analysis\n========");
-						if let Some(analysis) = Analysis::median_slopes(&batch.results, BenchmarkSelector::ExtrinsicTime) {
+						if let Some(analysis) = Analysis::median_slopes(
+							&batch.results,
+							BenchmarkSelector::ExtrinsicTime,
+						) {
 							println!("-- Extrinsic Time --\n{}", analysis);
 						}
-						if let Some(analysis) = Analysis::median_slopes(&batch.results, BenchmarkSelector::Reads) {
+						if let Some(analysis) =
+							Analysis::median_slopes(&batch.results, BenchmarkSelector::Reads)
+						{
 							println!("Reads = {:?}", analysis);
 						}
-						if let Some(analysis) = Analysis::median_slopes(&batch.results, BenchmarkSelector::Writes) {
+						if let Some(analysis) =
+							Analysis::median_slopes(&batch.results, BenchmarkSelector::Writes)
+						{
 							println!("Writes = {:?}", analysis);
 						}
 					}
 					if !self.no_min_squares {
 						println!("Min Squares Analysis\n========");
-						if let Some(analysis) = Analysis::min_squares_iqr(&batch.results, BenchmarkSelector::ExtrinsicTime) {
+						if let Some(analysis) = Analysis::min_squares_iqr(
+							&batch.results,
+							BenchmarkSelector::ExtrinsicTime,
+						) {
 							println!("-- Extrinsic Time --\n{}", analysis);
 						}
-						if let Some(analysis) = Analysis::min_squares_iqr(&batch.results, BenchmarkSelector::Reads) {
+						if let Some(analysis) =
+							Analysis::min_squares_iqr(&batch.results, BenchmarkSelector::Reads)
+						{
 							println!("Reads = {:?}", analysis);
 						}
-						if let Some(analysis) = Analysis::min_squares_iqr(&batch.results, BenchmarkSelector::Writes) {
+						if let Some(analysis) =
+							Analysis::min_squares_iqr(&batch.results, BenchmarkSelector::Writes)
+						{
 							println!("Writes = {:?}", analysis);
 						}
 					}
diff --git a/utils/frame/benchmarking-cli/src/writer.rs b/utils/frame/benchmarking-cli/src/writer.rs
index 64a4ea62f0d4..16c93081ac6e 100644
--- a/utils/frame/benchmarking-cli/src/writer.rs
+++ b/utils/frame/benchmarking-cli/src/writer.rs
@@ -17,21 +17,23 @@
 
 // Outputs benchmark results to Rust files that can be ingested by the runtime.
 
-use std::collections::{HashMap, HashSet};
-use std::fs;
-use std::path::PathBuf;
 use core::convert::TryInto;
+use std::{
+	collections::{HashMap, HashSet},
+	fs,
+	path::PathBuf,
+};
 
-use serde::Serialize;
 use inflector::Inflector;
+use serde::Serialize;
 
 use crate::BenchmarkCmd;
 use frame_benchmarking::{
-	BenchmarkBatch, BenchmarkSelector, Analysis, AnalysisChoice, RegressionModel, BenchmarkResults,
+	Analysis, AnalysisChoice, BenchmarkBatch, BenchmarkResults, BenchmarkSelector, RegressionModel,
 };
+use frame_support::traits::StorageInfo;
 use sp_core::hexdisplay::HexDisplay;
 use sp_runtime::traits::Zero;
-use frame_support::traits::StorageInfo;
 
 const VERSION: &'static str = env!("CARGO_PKG_VERSION");
 const TEMPLATE: &str = include_str!("./template.hbs");
@@ -117,7 +119,9 @@ fn map_results(
 	analysis_choice: &AnalysisChoice,
 ) -> Result<HashMap<(String, String), Vec<BenchmarkData>>, std::io::Error> {
 	// Skip if batches is empty.
-	if batches.is_empty() { return Err(io_error("empty batches")) }
+	if batches.is_empty() {
+		return Err(io_error("empty batches"))
+	}
 
 	let mut all_benchmarks = HashMap::new();
 	let mut pallet_benchmarks = Vec::new();
@@ -125,7 +129,9 @@ fn map_results(
 	let mut batches_iter = batches.iter().peekable();
 	while let Some(batch) = batches_iter.next() {
 		// Skip if there are no results
-		if batch.results.is_empty() { continue }
+		if batch.results.is_empty() {
+			continue
+		}
 
 		let pallet_string = String::from_utf8(batch.pallet.clone()).unwrap();
 		let instance_string = String::from_utf8(batch.instance.clone()).unwrap();
@@ -150,13 +156,11 @@ fn map_results(
 }
 
 // Get an iterator of errors from a model. If the model is `None` all errors are zero.
-fn extract_errors(model: &Option<RegressionModel>) -> impl Iterator<Item=u128> + '_ {
+fn extract_errors(model: &Option<RegressionModel>) -> impl Iterator<Item = u128> + '_ {
 	let mut errors = model.as_ref().map(|m| m.se.regressor_values.iter());
-	std::iter::from_fn(move || {
-		match &mut errors {
-			Some(model) => model.next().map(|val| *val as u128),
-			_ => Some(0),
-		}
+	std::iter::from_fn(move || match &mut errors {
+		Some(model) => model.next().map(|val| *val as u128),
+		_ => Some(0),
 	})
 }
 
@@ -189,12 +193,16 @@ fn get_benchmark_data(
 	let mut used_reads = Vec::new();
 	let mut used_writes = Vec::new();
 
-	extrinsic_time.slopes.into_iter()
+	extrinsic_time
+		.slopes
+		.into_iter()
 		.zip(extrinsic_time.names.iter())
 		.zip(extract_errors(&extrinsic_time.model))
 		.for_each(|((slope, name), error)| {
 			if !slope.is_zero() {
-				if !used_components.contains(&name) { used_components.push(name); }
+				if !used_components.contains(&name) {
+					used_components.push(name);
+				}
 				used_extrinsic_time.push(ComponentSlope {
 					name: name.clone(),
 					slope: slope.saturating_mul(1000),
@@ -202,35 +210,36 @@ fn get_benchmark_data(
 				});
 			}
 		});
-	reads.slopes.into_iter()
+	reads
+		.slopes
+		.into_iter()
 		.zip(reads.names.iter())
 		.zip(extract_errors(&reads.model))
 		.for_each(|((slope, name), error)| {
 			if !slope.is_zero() {
-				if !used_components.contains(&name) { used_components.push(name); }
-				used_reads.push(ComponentSlope {
-					name: name.clone(),
-					slope,
-					error,
-				});
+				if !used_components.contains(&name) {
+					used_components.push(name);
+				}
+				used_reads.push(ComponentSlope { name: name.clone(), slope, error });
 			}
 		});
-	writes.slopes.into_iter()
+	writes
+		.slopes
+		.into_iter()
 		.zip(writes.names.iter())
 		.zip(extract_errors(&writes.model))
 		.for_each(|((slope, name), error)| {
 			if !slope.is_zero() {
-				if !used_components.contains(&name) { used_components.push(name); }
-				used_writes.push(ComponentSlope {
-					name: name.clone(),
-					slope,
-					error,
-				});
+				if !used_components.contains(&name) {
+					used_components.push(name);
+				}
+				used_writes.push(ComponentSlope { name: name.clone(), slope, error });
 			}
 		});
 
 	// This puts a marker on any component which is entirely unused in the weight formula.
-	let components = batch.results[0].components
+	let components = batch.results[0]
+		.components
 		.iter()
 		.map(|(name, _)| -> Component {
 			let name_string = name.to_string();
@@ -264,12 +273,8 @@ pub fn write_results(
 ) -> Result<(), std::io::Error> {
 	// Use custom template if provided.
 	let template: String = match &cmd.template {
-		Some(template_file) => {
-			fs::read_to_string(template_file)?
-		},
-		None => {
-			TEMPLATE.to_string()
-		},
+		Some(template_file) => fs::read_to_string(template_file)?,
+		None => TEMPLATE.to_string(),
 	};
 
 	// Use header if provided
@@ -288,9 +293,8 @@ pub fn write_results(
 	let args = std::env::args().collect::<Vec<String>>();
 
 	// Which analysis function should be used when outputting benchmarks
-	let analysis_choice: AnalysisChoice = cmd.output_analysis.clone()
-		.try_into()
-		.map_err(|e| io_error(e))?;
+	let analysis_choice: AnalysisChoice =
+		cmd.output_analysis.clone().try_into().map_err(|e| io_error(e))?;
 
 	// Capture individual args
 	let cmd_data = CmdData {
@@ -341,7 +345,8 @@ pub fn write_results(
 		};
 
 		let mut output_file = fs::File::create(file_path)?;
-		handlebars.render_template_to_write(&template, &hbs_data, &mut output_file)
+		handlebars
+			.render_template_to_write(&template, &hbs_data, &mut output_file)
 			.map_err(|e| io_error(&e.to_string()))?;
 	}
 	Ok(())
@@ -355,7 +360,9 @@ fn add_storage_comments(
 	results: &[BenchmarkResults],
 	storage_info: &[StorageInfo],
 ) {
-	let storage_info_map = storage_info.iter().map(|info| (info.prefix.clone(), info))
+	let storage_info_map = storage_info
+		.iter()
+		.map(|info| (info.prefix.clone(), info))
 		.collect::<HashMap<_, _>>();
 	// This tracks the keys we already identified, so we only generate a single comment.
 	let mut identified = HashSet::<Vec<u8>>::new();
@@ -363,12 +370,14 @@ fn add_storage_comments(
 	for result in results.clone() {
 		for (key, reads, writes, whitelisted) in &result.keys {
 			// skip keys which are whitelisted
-			if *whitelisted { continue; }
+			if *whitelisted {
+				continue
+			}
 			let prefix_length = key.len().min(32);
 			let prefix = key[0..prefix_length].to_vec();
 			if identified.contains(&prefix) {
 				// skip adding comments for keys we already identified
-				continue;
+				continue
 			} else {
 				// track newly identified keys
 				identified.insert(prefix.clone());
@@ -377,8 +386,10 @@ fn add_storage_comments(
 				Some(key_info) => {
 					let comment = format!(
 						"Storage: {} {} (r:{} w:{})",
-						String::from_utf8(key_info.pallet_name.clone()).expect("encoded from string"),
-						String::from_utf8(key_info.storage_name.clone()).expect("encoded from string"),
+						String::from_utf8(key_info.pallet_name.clone())
+							.expect("encoded from string"),
+						String::from_utf8(key_info.storage_name.clone())
+							.expect("encoded from string"),
 						reads,
 						writes,
 					);
@@ -392,7 +403,7 @@ fn add_storage_comments(
 						writes,
 					);
 					comments.push(comment)
-				}
+				},
 			}
 		}
 	}
@@ -400,7 +411,8 @@ fn add_storage_comments(
 
 // Add an underscore after every 3rd character, i.e. a separator for large numbers.
 fn underscore<Number>(i: Number) -> String
-	where Number: std::string::ToString
+where
+	Number: std::string::ToString,
 {
 	let mut s = String::new();
 	let i_str = i.to_string();
@@ -420,11 +432,12 @@ fn underscore<Number>(i: Number) -> String
 struct UnderscoreHelper;
 impl handlebars::HelperDef for UnderscoreHelper {
 	fn call<'reg: 'rc, 'rc>(
-		&self, h: &handlebars::Helper,
+		&self,
+		h: &handlebars::Helper,
 		_: &handlebars::Handlebars,
 		_: &handlebars::Context,
 		_rc: &mut handlebars::RenderContext,
-		out: &mut dyn handlebars::Output
+		out: &mut dyn handlebars::Output,
 	) -> handlebars::HelperResult {
 		use handlebars::JsonRender;
 		let param = h.param(0).unwrap();
@@ -439,17 +452,20 @@ impl handlebars::HelperDef for UnderscoreHelper {
 struct JoinHelper;
 impl handlebars::HelperDef for JoinHelper {
 	fn call<'reg: 'rc, 'rc>(
-		&self, h: &handlebars::Helper,
+		&self,
+		h: &handlebars::Helper,
 		_: &handlebars::Handlebars,
 		_: &handlebars::Context,
 		_rc: &mut handlebars::RenderContext,
-		out: &mut dyn handlebars::Output
+		out: &mut dyn handlebars::Output,
 	) -> handlebars::HelperResult {
 		use handlebars::JsonRender;
 		let param = h.param(0).unwrap();
 		let value = param.value();
 		let joined = if value.is_array() {
-			value.as_array().unwrap()
+			value
+				.as_array()
+				.unwrap()
 				.iter()
 				.map(|v| v.render())
 				.collect::<Vec<String>>()
@@ -465,9 +481,9 @@ impl handlebars::HelperDef for JoinHelper {
 // u128 does not serialize well into JSON for `handlebars`, so we represent it as a string.
 fn string_serialize<S>(x: &u128, s: S) -> Result<S::Ok, S::Error>
 where
-    S: serde::Serializer,
+	S: serde::Serializer,
 {
-    s.serialize_str(&x.to_string())
+	s.serialize_str(&x.to_string())
 }
 
 #[cfg(test)]
@@ -475,22 +491,26 @@ mod test {
 	use super::*;
 	use frame_benchmarking::{BenchmarkBatch, BenchmarkParameter, BenchmarkResults};
 
-	fn test_data(pallet: &[u8], benchmark: &[u8], param: BenchmarkParameter, base: u32, slope: u32) -> BenchmarkBatch {
+	fn test_data(
+		pallet: &[u8],
+		benchmark: &[u8],
+		param: BenchmarkParameter,
+		base: u32,
+		slope: u32,
+	) -> BenchmarkBatch {
 		let mut results = Vec::new();
-		for i in 0 .. 5 {
-			results.push(
-				BenchmarkResults {
-					components: vec![(param, i), (BenchmarkParameter::z, 0)],
-					extrinsic_time: (base + slope * i).into(),
-					storage_root_time: (base + slope * i).into(),
-					reads: (base + slope * i).into(),
-					repeat_reads: 0,
-					writes: (base + slope * i).into(),
-					repeat_writes: 0,
-					proof_size: 0,
-					keys: vec![],
-				}
-			)
+		for i in 0..5 {
+			results.push(BenchmarkResults {
+				components: vec![(param, i), (BenchmarkParameter::z, 0)],
+				extrinsic_time: (base + slope * i).into(),
+				storage_root_time: (base + slope * i).into(),
+				reads: (base + slope * i).into(),
+				repeat_reads: 0,
+				writes: (base + slope * i).into(),
+				repeat_writes: 0,
+				proof_size: 0,
+				keys: vec![],
+			})
 		}
 
 		return BenchmarkBatch {
@@ -506,37 +526,25 @@ mod test {
 			benchmark.components,
 			vec![
 				Component { name: component.to_string(), is_used: true },
-				Component { name: "z".to_string(), is_used: false},
+				Component { name: "z".to_string(), is_used: false },
 			],
 		);
 		// Weights multiplied by 1,000
 		assert_eq!(benchmark.base_weight, base * 1_000);
 		assert_eq!(
 			benchmark.component_weight,
-			vec![ComponentSlope {
-				name: component.to_string(),
-				slope: slope * 1_000,
-				error: 0,
-			}]
+			vec![ComponentSlope { name: component.to_string(), slope: slope * 1_000, error: 0 }]
 		);
 		// DB Reads/Writes are untouched
 		assert_eq!(benchmark.base_reads, base);
 		assert_eq!(
 			benchmark.component_reads,
-			vec![ComponentSlope {
-				name: component.to_string(),
-				slope,
-				error: 0,
-			}]
+			vec![ComponentSlope { name: component.to_string(), slope, error: 0 }]
 		);
 		assert_eq!(benchmark.base_writes, base);
 		assert_eq!(
 			benchmark.component_writes,
-			vec![ComponentSlope {
-				name: component.to_string(),
-				slope,
-				error: 0,
-			}]
+			vec![ComponentSlope { name: component.to_string(), slope, error: 0 }]
 		);
 	}
 
@@ -550,23 +558,24 @@ mod test {
 			],
 			&[],
 			&AnalysisChoice::default(),
-		).unwrap();
+		)
+		.unwrap();
 
-		let first_benchmark = &mapped_results.get(
-			&("first_pallet".to_string(), "instance".to_string())
-		).unwrap()[0];
+		let first_benchmark = &mapped_results
+			.get(&("first_pallet".to_string(), "instance".to_string()))
+			.unwrap()[0];
 		assert_eq!(first_benchmark.name, "first_benchmark");
 		check_data(first_benchmark, "a", 10, 3);
 
-		let second_benchmark = &mapped_results.get(
-			&("first_pallet".to_string(), "instance".to_string())
-		).unwrap()[1];
+		let second_benchmark = &mapped_results
+			.get(&("first_pallet".to_string(), "instance".to_string()))
+			.unwrap()[1];
 		assert_eq!(second_benchmark.name, "second_benchmark");
 		check_data(second_benchmark, "b", 9, 2);
 
-		let second_pallet_benchmark = &mapped_results.get(
-			&("second_pallet".to_string(), "instance".to_string())
-		).unwrap()[0];
+		let second_pallet_benchmark = &mapped_results
+			.get(&("second_pallet".to_string(), "instance".to_string()))
+			.unwrap()[0];
 		assert_eq!(second_pallet_benchmark.name, "first_benchmark");
 		check_data(second_pallet_benchmark, "c", 3, 4);
 	}
diff --git a/utils/frame/frame-utilities-cli/src/lib.rs b/utils/frame/frame-utilities-cli/src/lib.rs
index 83f3e9ea00d4..4f5b1da5766a 100644
--- a/utils/frame/frame-utilities-cli/src/lib.rs
+++ b/utils/frame/frame-utilities-cli/src/lib.rs
@@ -20,4 +20,3 @@
 mod pallet_id;
 
 pub use pallet_id::PalletIdCmd;
-
diff --git a/utils/frame/frame-utilities-cli/src/pallet_id.rs b/utils/frame/frame-utilities-cli/src/pallet_id.rs
index 09304979cb09..2caac7db588a 100644
--- a/utils/frame/frame-utilities-cli/src/pallet_id.rs
+++ b/utils/frame/frame-utilities-cli/src/pallet_id.rs
@@ -17,22 +17,19 @@
 
 //! Implementation of the `palletid` subcommand
 
+use frame_support::PalletId;
 use sc_cli::{
-	Error, utils::print_from_uri, CryptoSchemeFlag,
-	OutputTypeFlag, KeystoreParams, with_crypto_scheme,
+	utils::print_from_uri, with_crypto_scheme, CryptoSchemeFlag, Error, KeystoreParams,
+	OutputTypeFlag,
 };
+use sp_core::crypto::{Ss58AddressFormat, Ss58Codec};
 use sp_runtime::traits::AccountIdConversion;
-use sp_core::crypto::{Ss58Codec, Ss58AddressFormat};
-use std::convert::{TryInto, TryFrom};
+use std::convert::{TryFrom, TryInto};
 use structopt::StructOpt;
-use frame_support::PalletId;
 
 /// The `palletid` command
 #[derive(Debug, StructOpt)]
-#[structopt(
-	name = "palletid",
-	about = "Inspect a module ID address"
-)]
+#[structopt(name = "palletid", about = "Inspect a module ID address")]
 pub struct PalletIdCmd {
 	/// The module ID used to derive the account
 	id: String,
@@ -63,18 +60,18 @@ pub struct PalletIdCmd {
 impl PalletIdCmd {
 	/// runs the command
 	pub fn run<R>(&self) -> Result<(), Error>
-		where
-			R: frame_system::Config,
-			R::AccountId: Ss58Codec,
+	where
+		R: frame_system::Config,
+		R::AccountId: Ss58Codec,
 	{
 		if self.id.len() != 8 {
 			Err("a module id must be a string of 8 characters")?
 		}
 		let password = self.keystore_params.read_password()?;
 
-		let id_fixed_array: [u8; 8] = self.id.as_bytes()
-			.try_into()
-			.map_err(|_| "Cannot convert argument to palletid: argument should be 8-character string")?;
+		let id_fixed_array: [u8; 8] = self.id.as_bytes().try_into().map_err(|_| {
+			"Cannot convert argument to palletid: argument should be 8-character string"
+		})?;
 
 		let account_id: R::AccountId = PalletId(id_fixed_array).into_account();
 
@@ -91,4 +88,3 @@ impl PalletIdCmd {
 		Ok(())
 	}
 }
-
diff --git a/utils/frame/remote-externalities/src/lib.rs b/utils/frame/remote-externalities/src/lib.rs
index 4c1aeccf5041..0ad6ae578b06 100644
--- a/utils/frame/remote-externalities/src/lib.rs
+++ b/utils/frame/remote-externalities/src/lib.rs
@@ -20,21 +20,19 @@
 //! An equivalent of `sp_io::TestExternalities` that can load its state from a remote substrate
 //! based chain, or a local state snapshot file.
 
-use std::{
-	fs,
-	path::{Path, PathBuf},
-};
+use codec::{Decode, Encode};
+use jsonrpsee_ws_client::{types::v2::params::JsonRpcParams, WsClient, WsClientBuilder};
 use log::*;
-use sp_core::hashing::twox_128;
-pub use sp_io::TestExternalities;
 use sp_core::{
+	hashing::twox_128,
 	hexdisplay::HexDisplay,
-	storage::{StorageKey, StorageData},
+	storage::{StorageData, StorageKey},
 };
-use codec::{Encode, Decode};
+pub use sp_io::TestExternalities;
 use sp_runtime::traits::Block as BlockT;
-use jsonrpsee_ws_client::{
-	WsClientBuilder, WsClient, types::v2::params::JsonRpcParams,
+use std::{
+	fs,
+	path::{Path, PathBuf},
 };
 
 pub mod rpc_api;
@@ -122,7 +120,10 @@ pub struct OnlineConfig<B: BlockT> {
 impl<B: BlockT> OnlineConfig<B> {
 	/// Return rpc (ws) client.
 	fn rpc_client(&self) -> &WsClient {
-		self.transport.client.as_ref().expect("ws client must have been initialized by now; qed.")
+		self.transport
+			.client
+			.as_ref()
+			.expect("ws client must have been initialized by now; qed.")
 	}
 }
 
@@ -137,7 +138,6 @@ impl<B: BlockT> Default for OnlineConfig<B> {
 	}
 }
 
-
 /// Configuration of the state snapshot.
 #[derive(Clone)]
 pub struct SnapshotConfig {
@@ -208,10 +208,12 @@ impl<B: BlockT> Builder<B> {
 		maybe_at: Option<B::Hash>,
 	) -> Result<StorageData, &'static str> {
 		trace!(target: LOG_TARGET, "rpc: get_storage");
-		RpcApi::<B>::get_storage(self.as_online().rpc_client(), key, maybe_at).await.map_err(|e| {
-			error!("Error = {:?}", e);
-			"rpc get_storage failed."
-		})
+		RpcApi::<B>::get_storage(self.as_online().rpc_client(), key, maybe_at)
+			.await
+			.map_err(|e| {
+				error!("Error = {:?}", e);
+				"rpc get_storage failed."
+			})
 	}
 	/// Get the latest finalized head.
 	async fn rpc_get_head(&self) -> Result<B::Hash, &'static str> {
@@ -249,7 +251,7 @@ impl<B: BlockT> Builder<B> {
 
 			if page_len < PAGE as usize {
 				debug!(target: LOG_TARGET, "last page received: {}", page_len);
-				break all_keys;
+				break all_keys
 			} else {
 				let new_last_key =
 					all_keys.last().expect("all_keys is populated; has .last(); qed");
@@ -290,21 +292,22 @@ impl<B: BlockT> Builder<B> {
 				.map(|key| {
 					(
 						"state_getStorage",
-						JsonRpcParams::Array(
-							vec![
-								to_value(key).expect("json serialization will work; qed."),
-								to_value(at).expect("json serialization will work; qed."),
-							]
-						),
+						JsonRpcParams::Array(vec![
+							to_value(key).expect("json serialization will work; qed."),
+							to_value(at).expect("json serialization will work; qed."),
+						]),
 					)
 				})
 				.collect::<Vec<_>>();
-			let values = client.batch_request::<Option<StorageData>>(batch)
-				.await
-				.map_err(|e| {
-					log::error!(target: LOG_TARGET, "failed to execute batch: {:?}. Error: {:?}", chunk_keys, e);
-					"batch failed."
-				})?;
+			let values = client.batch_request::<Option<StorageData>>(batch).await.map_err(|e| {
+				log::error!(
+					target: LOG_TARGET,
+					"failed to execute batch: {:?}. Error: {:?}",
+					chunk_keys,
+					e
+				);
+				"batch failed."
+			})?;
 			assert_eq!(chunk_keys.len(), values.len());
 			for (idx, key) in chunk_keys.into_iter().enumerate() {
 				let maybe_value = values[idx].clone();
@@ -428,7 +431,7 @@ impl<B: BlockT> Builder<B> {
 					self.save_state_snapshot(&kp, &c.path)?;
 				}
 				kp
-			}
+			},
 		};
 
 		info!(
@@ -497,7 +500,7 @@ impl<B: BlockT> Builder<B> {
 #[cfg(test)]
 mod test_prelude {
 	pub(crate) use super::*;
-	pub(crate) use sp_runtime::testing::{H256 as Hash, Block as RawBlock, ExtrinsicWrapper};
+	pub(crate) use sp_runtime::testing::{Block as RawBlock, ExtrinsicWrapper, H256 as Hash};
 
 	pub(crate) type Block = RawBlock<ExtrinsicWrapper<Hash>>;
 
@@ -551,7 +554,11 @@ mod remote_tests {
 		init_logger();
 		Builder::<Block>::new()
 			.mode(Mode::Online(OnlineConfig {
-				modules: vec!["Proxy".to_owned(), "Multisig".to_owned(), "PhragmenElection".to_owned()],
+				modules: vec![
+					"Proxy".to_owned(),
+					"Multisig".to_owned(),
+					"PhragmenElection".to_owned(),
+				],
 				..Default::default()
 			}))
 			.build()
diff --git a/utils/frame/remote-externalities/src/rpc_api.rs b/utils/frame/remote-externalities/src/rpc_api.rs
index 59d6bba8dd86..be77cd949919 100644
--- a/utils/frame/remote-externalities/src/rpc_api.rs
+++ b/utils/frame/remote-externalities/src/rpc_api.rs
@@ -18,14 +18,13 @@
 //! WS RPC API for one off RPC calls to a substrate node.
 // TODO: Consolidate one off RPC calls https://github.com/paritytech/substrate/issues/8988
 
-use sp_runtime::{generic::SignedBlock, traits::{Block as BlockT, Header as HeaderT}};
 use jsonrpsee_ws_client::{
-	WsClientBuilder,
-	WsClient,
-	types::{
-		v2::params::JsonRpcParams,
-		traits::Client
-	},
+	types::{traits::Client, v2::params::JsonRpcParams},
+	WsClient, WsClientBuilder,
+};
+use sp_runtime::{
+	generic::SignedBlock,
+	traits::{Block as BlockT, Header as HeaderT},
 };
 
 /// Get the header of the block identified by `at`
@@ -38,7 +37,8 @@ where
 	let params = vec![hash_to_json::<Block>(at)?];
 	let client = build_client(from).await?;
 
-	client.request::<Block::Header>("chain_getHeader", JsonRpcParams::Array(params))
+	client
+		.request::<Block::Header>("chain_getHeader", JsonRpcParams::Array(params))
 		.await
 		.map_err(|e| format!("chain_getHeader request failed: {:?}", e))
 }
@@ -51,7 +51,8 @@ where
 {
 	let client = build_client(from).await?;
 
-	client.request::<Block::Hash>("chain_getFinalizedHead", JsonRpcParams::NoParams)
+	client
+		.request::<Block::Hash>("chain_getFinalizedHead", JsonRpcParams::NoParams)
 		.await
 		.map_err(|e| format!("chain_getFinalizedHead request failed: {:?}", e))
 }
@@ -81,7 +82,7 @@ fn hash_to_json<Block: BlockT>(hash: Block::Hash) -> Result<serde_json::Value, S
 
 /// Build a website client that connects to `from`.
 async fn build_client<S: AsRef<str>>(from: S) -> Result<WsClient, String> {
-	 WsClientBuilder::default()
+	WsClientBuilder::default()
 		.max_request_body_size(u32::MAX)
 		.build(from.as_ref())
 		.await
diff --git a/utils/frame/rpc/support/src/lib.rs b/utils/frame/rpc/support/src/lib.rs
index 417f2bfc22ac..37d85f41825d 100644
--- a/utils/frame/rpc/support/src/lib.rs
+++ b/utils/frame/rpc/support/src/lib.rs
@@ -20,16 +20,14 @@
 
 #![warn(missing_docs)]
 
+use codec::{DecodeAll, FullCodec, FullEncode};
 use core::marker::PhantomData;
+use frame_support::storage::generator::{StorageDoubleMap, StorageMap, StorageValue};
 use futures::compat::Future01CompatExt;
 use jsonrpc_client_transports::RpcError;
-use codec::{DecodeAll, FullCodec, FullEncode};
+use sc_rpc_api::state::StateClient;
 use serde::{de::DeserializeOwned, Serialize};
-use frame_support::storage::generator::{
-	StorageDoubleMap, StorageMap, StorageValue
-};
 use sp_storage::{StorageData, StorageKey};
-use sc_rpc_api::state::StateClient;
 
 /// A typed query on chain state usable from an RPC client.
 ///
@@ -54,7 +52,7 @@ use sc_rpc_api::state::StateClient;
 /// # struct TestRuntime;
 /// #
 /// # decl_module! {
-///	#     pub struct Module<T: Config> for enum Call where origin: T::Origin {}
+/// 	#     pub struct Module<T: Config> for enum Call where origin: T::Origin {}
 /// # }
 /// #
 /// pub type Loc = (i64, i64, i64);
@@ -98,18 +96,12 @@ pub struct StorageQuery<V> {
 impl<V: FullCodec> StorageQuery<V> {
 	/// Create a storage query for a StorageValue.
 	pub fn value<St: StorageValue<V>>() -> Self {
-		Self {
-			key: StorageKey(St::storage_value_final_key().to_vec()),
-			_spook: PhantomData,
-		}
+		Self { key: StorageKey(St::storage_value_final_key().to_vec()), _spook: PhantomData }
 	}
 
 	/// Create a storage query for a value in a StorageMap.
 	pub fn map<St: StorageMap<K, V>, K: FullEncode>(key: K) -> Self {
-		Self {
-			key: StorageKey(St::storage_map_final_key(key)),
-			_spook: PhantomData,
-		}
+		Self { key: StorageKey(St::storage_map_final_key(key)), _spook: PhantomData }
 	}
 
 	/// Create a storage query for a value in a StorageDoubleMap.
@@ -117,10 +109,7 @@ impl<V: FullCodec> StorageQuery<V> {
 		key1: K1,
 		key2: K2,
 	) -> Self {
-		Self {
-			key: StorageKey(St::storage_double_map_final_key(key1, key2)),
-			_spook: PhantomData,
-		}
+		Self { key: StorageKey(St::storage_double_map_final_key(key1, key2)), _spook: PhantomData }
 	}
 
 	/// Send this query over RPC, await the typed result.
diff --git a/utils/frame/rpc/system/src/lib.rs b/utils/frame/rpc/system/src/lib.rs
index e80d457de98d..64c25157dbe2 100644
--- a/utils/frame/rpc/system/src/lib.rs
+++ b/utils/frame/rpc/system/src/lib.rs
@@ -20,28 +20,22 @@
 use std::sync::Arc;
 
 use codec::{self, Codec, Decode, Encode};
-use sc_client_api::light::{future_header, RemoteBlockchain, Fetcher, RemoteCallRequest};
+use futures::future::{ready, TryFutureExt};
 use jsonrpc_core::{
+	futures::future::{self as rpc_future, result, Future},
 	Error as RpcError, ErrorCode,
-	futures::future::{self as rpc_future,result, Future},
 };
 use jsonrpc_derive::rpc;
-use futures::future::{ready, TryFutureExt};
-use sp_blockchain::{
-	HeaderBackend,
-	Error as ClientError
-};
-use sp_runtime::{
-	generic::BlockId,
-	traits,
-};
-use sp_core::{hexdisplay::HexDisplay, Bytes};
-use sc_transaction_pool_api::{TransactionPool, InPoolTransaction};
-use sp_block_builder::BlockBuilder;
+use sc_client_api::light::{future_header, Fetcher, RemoteBlockchain, RemoteCallRequest};
 use sc_rpc_api::DenyUnsafe;
+use sc_transaction_pool_api::{InPoolTransaction, TransactionPool};
+use sp_block_builder::BlockBuilder;
+use sp_blockchain::{Error as ClientError, HeaderBackend};
+use sp_core::{hexdisplay::HexDisplay, Bytes};
+use sp_runtime::{generic::BlockId, traits};
 
-pub use frame_system_rpc_runtime_api::AccountNonceApi;
 pub use self::gen_client::Client as SystemClient;
+pub use frame_system_rpc_runtime_api::AccountNonceApi;
 
 /// Future that resolves to account nonce.
 pub type FutureResult<T> = Box<dyn Future<Item = T, Error = RpcError> + Send>;
@@ -89,13 +83,8 @@ pub struct FullSystem<P: TransactionPool, C, B> {
 
 impl<P: TransactionPool, C, B> FullSystem<P, C, B> {
 	/// Create new `FullSystem` given client and transaction pool.
-	pub fn new(client: Arc<C>, pool: Arc<P>, deny_unsafe: DenyUnsafe,) -> Self {
-		FullSystem {
-			client,
-			pool,
-			deny_unsafe,
-			_marker: Default::default(),
-		}
+	pub fn new(client: Arc<C>, pool: Arc<P>, deny_unsafe: DenyUnsafe) -> Self {
+		FullSystem { client, pool, deny_unsafe, _marker: Default::default() }
 	}
 }
 
@@ -130,35 +119,37 @@ where
 		Box::new(result(get_nonce()))
 	}
 
-	fn dry_run(&self, extrinsic: Bytes, at: Option<<Block as traits::Block>::Hash>) -> FutureResult<Bytes> {
+	fn dry_run(
+		&self,
+		extrinsic: Bytes,
+		at: Option<<Block as traits::Block>::Hash>,
+	) -> FutureResult<Bytes> {
 		if let Err(err) = self.deny_unsafe.check_if_safe() {
-			return Box::new(rpc_future::err(err.into()));
+			return Box::new(rpc_future::err(err.into()))
 		}
 
 		let dry_run = || {
 			let api = self.client.runtime_api();
 			let at = BlockId::<Block>::hash(at.unwrap_or_else(||
 				// If the block hash is not supplied assume the best block.
-				self.client.info().best_hash
-			));
-
-			let uxt: <Block as traits::Block>::Extrinsic = Decode::decode(&mut &*extrinsic).map_err(|e| RpcError {
-				code: ErrorCode::ServerError(Error::DecodeError.into()),
-				message: "Unable to dry run extrinsic.".into(),
-				data: Some(format!("{:?}", e).into()),
-			})?;
+				self.client.info().best_hash));
 
-			let result = api.apply_extrinsic(&at, uxt)
+			let uxt: <Block as traits::Block>::Extrinsic = Decode::decode(&mut &*extrinsic)
 				.map_err(|e| RpcError {
-					code: ErrorCode::ServerError(Error::RuntimeError.into()),
+					code: ErrorCode::ServerError(Error::DecodeError.into()),
 					message: "Unable to dry run extrinsic.".into(),
 					data: Some(format!("{:?}", e).into()),
 				})?;
 
+			let result = api.apply_extrinsic(&at, uxt).map_err(|e| RpcError {
+				code: ErrorCode::ServerError(Error::RuntimeError.into()),
+				message: "Unable to dry run extrinsic.".into(),
+				data: Some(format!("{:?}", e).into()),
+			})?;
+
 			Ok(Encode::encode(&result).into())
 		};
 
-
 		Box::new(result(dry_run()))
 	}
 }
@@ -179,12 +170,7 @@ impl<P: TransactionPool, C, F, Block> LightSystem<P, C, F, Block> {
 		fetcher: Arc<F>,
 		pool: Arc<P>,
 	) -> Self {
-		LightSystem {
-			client,
-			remote_blockchain,
-			fetcher,
-			pool,
-		}
+		LightSystem { client, remote_blockchain, fetcher, pool }
 	}
 }
 
@@ -205,21 +191,27 @@ where
 		let future_best_header = future_header(&*self.remote_blockchain, &*self.fetcher, best_id);
 		let fetcher = self.fetcher.clone();
 		let call_data = account.encode();
-		let future_best_header = future_best_header
-			.and_then(move |maybe_best_header| ready(
-				maybe_best_header.ok_or_else(|| { ClientError::UnknownBlock(format!("{}", best_hash)) })
-			));
-		let future_nonce = future_best_header.and_then(move |best_header|
-			fetcher.remote_call(RemoteCallRequest {
-				block: best_hash,
-				header: best_header,
-				method: "AccountNonceApi_account_nonce".into(),
-				call_data,
-				retry_count: None,
+		let future_best_header = future_best_header.and_then(move |maybe_best_header| {
+			ready(
+				maybe_best_header
+					.ok_or_else(|| ClientError::UnknownBlock(format!("{}", best_hash))),
+			)
+		});
+		let future_nonce = future_best_header
+			.and_then(move |best_header| {
+				fetcher.remote_call(RemoteCallRequest {
+					block: best_hash,
+					header: best_header,
+					method: "AccountNonceApi_account_nonce".into(),
+					call_data,
+					retry_count: None,
+				})
 			})
-		).compat();
-		let future_nonce = future_nonce.and_then(|nonce| Decode::decode(&mut &nonce[..])
-			.map_err(|e| ClientError::CallResultDecode("Cannot decode account nonce", e)));
+			.compat();
+		let future_nonce = future_nonce.and_then(|nonce| {
+			Decode::decode(&mut &nonce[..])
+				.map_err(|e| ClientError::CallResultDecode("Cannot decode account nonce", e))
+		});
 		let future_nonce = future_nonce.map_err(|e| RpcError {
 			code: ErrorCode::ServerError(Error::RuntimeError.into()),
 			message: "Unable to query nonce.".into(),
@@ -232,7 +224,11 @@ where
 		Box::new(future_nonce)
 	}
 
-	fn dry_run(&self, _extrinsic: Bytes, _at: Option<<Block as traits::Block>::Hash>) -> FutureResult<Bytes> {
+	fn dry_run(
+		&self,
+		_extrinsic: Bytes,
+		_at: Option<<Block as traits::Block>::Hash>,
+	) -> FutureResult<Bytes> {
 		Box::new(result(Err(RpcError {
 			code: ErrorCode::MethodNotFound,
 			message: "Unable to dry run extrinsic.".into(),
@@ -243,11 +239,8 @@ where
 
 /// Adjust account nonce from state, so that tx with the nonce will be
 /// placed after all ready txpool transactions.
-fn adjust_nonce<P, AccountId, Index>(
-	pool: &P,
-	account: AccountId,
-	nonce: Index,
-) -> Index where
+fn adjust_nonce<P, AccountId, Index>(pool: &P, account: AccountId, nonce: Index) -> Index
+where
 	P: TransactionPool,
 	AccountId: Clone + std::fmt::Display + Encode,
 	Index: Clone + std::fmt::Display + Encode + traits::AtLeast32Bit + 'static,
@@ -285,9 +278,12 @@ mod tests {
 	use super::*;
 
 	use futures::executor::block_on;
-	use substrate_test_runtime_client::{runtime::Transfer, AccountKeyring};
 	use sc_transaction_pool::BasicPool;
-	use sp_runtime::{ApplyExtrinsicResult, transaction_validity::{TransactionValidityError, InvalidTransaction}};
+	use sp_runtime::{
+		transaction_validity::{InvalidTransaction, TransactionValidityError},
+		ApplyExtrinsicResult,
+	};
+	use substrate_test_runtime_client::{runtime::Transfer, AccountKeyring};
 
 	#[test]
 	fn should_return_next_nonce_for_some_account() {
@@ -296,13 +292,8 @@ mod tests {
 		// given
 		let client = Arc::new(substrate_test_runtime_client::new());
 		let spawner = sp_core::testing::TaskExecutor::new();
-		let pool = BasicPool::new_full(
-			Default::default(),
-			true.into(),
-			None,
-			spawner,
-			client.clone(),
-		);
+		let pool =
+			BasicPool::new_full(Default::default(), true.into(), None, spawner, client.clone());
 
 		let source = sp_runtime::transaction_validity::TransactionSource::External;
 		let new_transaction = |nonce: u64| {
@@ -336,13 +327,8 @@ mod tests {
 		// given
 		let client = Arc::new(substrate_test_runtime_client::new());
 		let spawner = sp_core::testing::TaskExecutor::new();
-		let pool = BasicPool::new_full(
-			Default::default(),
-			true.into(),
-			None,
-			spawner,
-			client.clone(),
-		);
+		let pool =
+			BasicPool::new_full(Default::default(), true.into(), None, spawner, client.clone());
 
 		let accounts = FullSystem::new(client, pool, DenyUnsafe::Yes);
 
@@ -360,13 +346,8 @@ mod tests {
 		// given
 		let client = Arc::new(substrate_test_runtime_client::new());
 		let spawner = sp_core::testing::TaskExecutor::new();
-		let pool = BasicPool::new_full(
-			Default::default(),
-			true.into(),
-			None,
-			spawner,
-			client.clone(),
-		);
+		let pool =
+			BasicPool::new_full(Default::default(), true.into(), None, spawner, client.clone());
 
 		let accounts = FullSystem::new(client, pool, DenyUnsafe::No);
 
@@ -375,7 +356,8 @@ mod tests {
 			to: AccountKeyring::Bob.into(),
 			amount: 5,
 			nonce: 0,
-		}.into_signed_tx();
+		}
+		.into_signed_tx();
 
 		// when
 		let res = accounts.dry_run(tx.encode().into(), None);
@@ -393,13 +375,8 @@ mod tests {
 		// given
 		let client = Arc::new(substrate_test_runtime_client::new());
 		let spawner = sp_core::testing::TaskExecutor::new();
-		let pool = BasicPool::new_full(
-			Default::default(),
-			true.into(),
-			None,
-			spawner,
-			client.clone(),
-		);
+		let pool =
+			BasicPool::new_full(Default::default(), true.into(), None, spawner, client.clone());
 
 		let accounts = FullSystem::new(client, pool, DenyUnsafe::No);
 
@@ -408,7 +385,8 @@ mod tests {
 			to: AccountKeyring::Bob.into(),
 			amount: 5,
 			nonce: 100,
-		}.into_signed_tx();
+		}
+		.into_signed_tx();
 
 		// when
 		let res = accounts.dry_run(tx.encode().into(), None);
diff --git a/utils/frame/try-runtime/cli/src/lib.rs b/utils/frame/try-runtime/cli/src/lib.rs
index e0d09ff7fbcf..4f31bd741b3a 100644
--- a/utils/frame/try-runtime/cli/src/lib.rs
+++ b/utils/frame/try-runtime/cli/src/lib.rs
@@ -18,24 +18,23 @@
 //! `Structopt`-ready structs for `try-runtime`.
 
 use parity_scale_codec::{Decode, Encode};
-use std::{fmt::Debug, path::PathBuf, str::FromStr, sync::Arc};
-use sc_service::Configuration;
+use remote_externalities::{rpc_api, Builder, Mode, OfflineConfig, OnlineConfig, SnapshotConfig};
+use sc_chain_spec::ChainSpec;
 use sc_cli::{CliConfiguration, ExecutionStrategy, WasmExecutionMethod};
 use sc_executor::NativeExecutor;
-use sc_service::NativeExecutionDispatch;
-use sc_chain_spec::ChainSpec;
-use sp_state_machine::StateMachine;
-use sp_runtime::traits::{Block as BlockT, NumberFor, Header as HeaderT};
+use sc_service::{Configuration, NativeExecutionDispatch};
 use sp_core::{
+	hashing::twox_128,
 	offchain::{
-		OffchainWorkerExt, OffchainDbExt, TransactionPoolExt,
 		testing::{TestOffchainExt, TestTransactionPoolExt},
+		OffchainDbExt, OffchainWorkerExt, TransactionPoolExt,
 	},
-	storage::{StorageData, StorageKey, well_known_keys},
-	hashing::twox_128,
+	storage::{well_known_keys, StorageData, StorageKey},
 };
-use sp_keystore::{KeystoreExt, testing::KeyStore};
-use remote_externalities::{Builder, Mode, SnapshotConfig, OfflineConfig, OnlineConfig, rpc_api};
+use sp_keystore::{testing::KeyStore, KeystoreExt};
+use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor};
+use sp_state_machine::StateMachine;
+use std::{fmt::Debug, path::PathBuf, str::FromStr, sync::Arc};
 
 mod parse;
 
@@ -170,7 +169,7 @@ pub enum State {
 		/// The modules to scrape. If empty, entire chain state will be scraped.
 		#[structopt(short, long, require_delimiter = true)]
 		modules: Option<Vec<String>>,
-	}
+	},
 }
 
 async fn on_runtime_upgrade<Block, ExecDispatch>(
@@ -192,36 +191,31 @@ where
 
 	let mut changes = Default::default();
 	let max_runtime_instances = config.max_runtime_instances;
-	let executor = NativeExecutor::<ExecDispatch>::new(
-		wasm_method.into(),
-		heap_pages,
-		max_runtime_instances,
-	);
+	let executor =
+		NativeExecutor::<ExecDispatch>::new(wasm_method.into(), heap_pages, max_runtime_instances);
 
 	let ext = {
 		let builder = match command.state {
-			State::Snap { snapshot_path } => {
+			State::Snap { snapshot_path } =>
 				Builder::<Block>::new().mode(Mode::Offline(OfflineConfig {
 					state_snapshot: SnapshotConfig::new(snapshot_path),
-				}))
-			},
-			State::Live {
-				snapshot_path,
-				modules
-			} => Builder::<Block>::new().mode(Mode::Online(OnlineConfig {
-				transport: shared.url.to_owned().into(),
-				state_snapshot: snapshot_path.as_ref().map(SnapshotConfig::new),
-				modules: modules.to_owned().unwrap_or_default(),
-				at: Some(shared.block_at::<Block>()?),
-				..Default::default()
-			})),
+				})),
+			State::Live { snapshot_path, modules } =>
+				Builder::<Block>::new().mode(Mode::Online(OnlineConfig {
+					transport: shared.url.to_owned().into(),
+					state_snapshot: snapshot_path.as_ref().map(SnapshotConfig::new),
+					modules: modules.to_owned().unwrap_or_default(),
+					at: Some(shared.block_at::<Block>()?),
+					..Default::default()
+				})),
 		};
 
 		let (code_key, code) = extract_code(config.chain_spec)?;
 		builder
 			.inject_key_value(&[(code_key, code)])
 			.inject_hashed_key(&[twox_128(b"System"), twox_128(b"LastRuntimeUpgrade")].concat())
-			.build().await?
+			.build()
+			.await?
 	};
 
 	let encoded_result = StateMachine::<_, _, NumberFor<Block>, _>::new(
@@ -232,8 +226,7 @@ where
 		"TryRuntime_on_runtime_upgrade",
 		&[],
 		ext.extensions,
-		&sp_state_machine::backend::BackendRuntimeCode::new(&ext.backend)
-			.runtime_code()?,
+		&sp_state_machine::backend::BackendRuntimeCode::new(&ext.backend).runtime_code()?,
 		sp_core::testing::TaskExecutor::new(),
 	)
 	.execute(execution.into())
@@ -271,35 +264,28 @@ where
 
 	let mut changes = Default::default();
 	let max_runtime_instances = config.max_runtime_instances;
-	let executor = NativeExecutor::<ExecDispatch>::new(
-		wasm_method.into(),
-		heap_pages,
-		max_runtime_instances,
-	);
+	let executor =
+		NativeExecutor::<ExecDispatch>::new(wasm_method.into(), heap_pages, max_runtime_instances);
 
 	let mode = match command.state {
-			State::Live {
-				snapshot_path,
-				modules
-			} => {
-				let at = shared.block_at::<Block>()?;
-				let online_config = OnlineConfig {
-					transport: shared.url.to_owned().into(),
-					state_snapshot: snapshot_path.as_ref().map(SnapshotConfig::new),
-					modules: modules.to_owned().unwrap_or_default(),
-					at: Some(at),
-					..Default::default()
-				};
+		State::Live { snapshot_path, modules } => {
+			let at = shared.block_at::<Block>()?;
+			let online_config = OnlineConfig {
+				transport: shared.url.to_owned().into(),
+				state_snapshot: snapshot_path.as_ref().map(SnapshotConfig::new),
+				modules: modules.to_owned().unwrap_or_default(),
+				at: Some(at),
+				..Default::default()
+			};
 
-				Mode::Online(online_config)
-			},
-			State::Snap { snapshot_path } => {
-				let mode = Mode::Offline(OfflineConfig {
-					state_snapshot: SnapshotConfig::new(snapshot_path),
-				});
+			Mode::Online(online_config)
+		},
+		State::Snap { snapshot_path } => {
+			let mode =
+				Mode::Offline(OfflineConfig { state_snapshot: SnapshotConfig::new(snapshot_path) });
 
-				mode
-			}
+			mode
+		},
 	};
 	let builder = Builder::<Block>::new()
 		.mode(mode)
@@ -308,10 +294,7 @@ where
 		let (code_key, code) = extract_code(config.chain_spec)?;
 		builder.inject_key_value(&[(code_key, code)]).build().await?
 	} else {
-		builder
-			.inject_hashed_key(well_known_keys::CODE)
-			.build()
-			.await?
+		builder.inject_hashed_key(well_known_keys::CODE).build().await?
 	};
 
 	let (offchain, _offchain_state) = TestOffchainExt::new();
@@ -332,8 +315,7 @@ where
 		"OffchainWorkerApi_offchain_worker",
 		header.encode().as_ref(),
 		ext.extensions,
-		&sp_state_machine::backend::BackendRuntimeCode::new(&ext.backend)
-			.runtime_code()?,
+		&sp_state_machine::backend::BackendRuntimeCode::new(&ext.backend).runtime_code()?,
 		sp_core::testing::TaskExecutor::new(),
 	)
 	.execute(execution.into())
@@ -363,20 +345,16 @@ where
 
 	let mut changes = Default::default();
 	let max_runtime_instances = config.max_runtime_instances;
-	let executor = NativeExecutor::<ExecDispatch>::new(
-		wasm_method.into(),
-		heap_pages,
-		max_runtime_instances,
-	);
+	let executor =
+		NativeExecutor::<ExecDispatch>::new(wasm_method.into(), heap_pages, max_runtime_instances);
 
 	let block_hash = shared.block_at::<Block>()?;
 	let block: Block = rpc_api::get_block::<Block, _>(shared.url.clone(), block_hash).await?;
 
 	let mode = match command.state {
 		State::Snap { snapshot_path } => {
-			let mode = Mode::Offline(OfflineConfig {
-				state_snapshot: SnapshotConfig::new(snapshot_path),
-			});
+			let mode =
+				Mode::Offline(OfflineConfig { state_snapshot: SnapshotConfig::new(snapshot_path) });
 
 			mode
 		},
@@ -392,7 +370,7 @@ where
 			});
 
 			mode
-		}
+		},
 	};
 
 	let ext = {
@@ -403,10 +381,7 @@ where
 			let (code_key, code) = extract_code(config.chain_spec)?;
 			builder.inject_key_value(&[(code_key, code)]).build().await?
 		} else {
-			builder
-				.inject_hashed_key(well_known_keys::CODE)
-				.build()
-				.await?
+			builder.inject_hashed_key(well_known_keys::CODE).build().await?
 		};
 
 		// register externality extensions in order to provide host interface for OCW to the
@@ -459,15 +434,14 @@ impl TryRuntimeCmd {
 		ExecDispatch: NativeExecutionDispatch + 'static,
 	{
 		match &self.command {
-			Command::OnRuntimeUpgrade(ref cmd) => {
-				on_runtime_upgrade::<Block, ExecDispatch>(self.shared.clone(), cmd.clone(), config).await
-			}
-			Command::OffchainWorker(cmd) => {
-				offchain_worker::<Block, ExecDispatch>(self.shared.clone(), cmd.clone(), config).await
-			}
-			Command::ExecuteBlock(cmd) => {
-				execute_block::<Block, ExecDispatch>(self.shared.clone(), cmd.clone(), config).await
-			}
+			Command::OnRuntimeUpgrade(ref cmd) =>
+				on_runtime_upgrade::<Block, ExecDispatch>(self.shared.clone(), cmd.clone(), config)
+					.await,
+			Command::OffchainWorker(cmd) =>
+				offchain_worker::<Block, ExecDispatch>(self.shared.clone(), cmd.clone(), config)
+					.await,
+			Command::ExecuteBlock(cmd) =>
+				execute_block::<Block, ExecDispatch>(self.shared.clone(), cmd.clone(), config).await,
 		}
 	}
 }
diff --git a/utils/frame/try-runtime/cli/src/parse.rs b/utils/frame/try-runtime/cli/src/parse.rs
index beb9a6508fed..7f205fbacd31 100644
--- a/utils/frame/try-runtime/cli/src/parse.rs
+++ b/utils/frame/try-runtime/cli/src/parse.rs
@@ -18,11 +18,8 @@
 //! Utils for parsing user input
 
 pub(crate) fn hash(block_hash: &str) -> Result<String, String> {
-	let (block_hash, offset) = if block_hash.starts_with("0x") {
-		(&block_hash[2..], 2)
-	} else {
-		(block_hash, 0)
-	};
+	let (block_hash, offset) =
+		if block_hash.starts_with("0x") { (&block_hash[2..], 2) } else { (block_hash, 0) };
 
 	if let Some(pos) = block_hash.chars().position(|c| !c.is_ascii_hexdigit()) {
 		Err(format!(
diff --git a/utils/prometheus/src/lib.rs b/utils/prometheus/src/lib.rs
index 93a56d084fd0..96407b006235 100644
--- a/utils/prometheus/src/lib.rs
+++ b/utils/prometheus/src/lib.rs
@@ -15,33 +15,34 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use futures_util::{FutureExt, future::Future};
+use futures_util::{future::Future, FutureExt};
 pub use prometheus::{
 	self,
-	Registry, Error as PrometheusError, Opts,
-	Histogram, HistogramOpts, HistogramVec,
-	exponential_buckets,
 	core::{
-		GenericGauge as Gauge, GenericCounter as Counter,
-		GenericGaugeVec as GaugeVec, GenericCounterVec as CounterVec,
-		AtomicF64 as F64, AtomicI64 as I64, AtomicU64 as U64,
-	}
+		AtomicF64 as F64, AtomicI64 as I64, AtomicU64 as U64, GenericCounter as Counter,
+		GenericCounterVec as CounterVec, GenericGauge as Gauge, GenericGaugeVec as GaugeVec,
+	},
+	exponential_buckets, Error as PrometheusError, Histogram, HistogramOpts, HistogramVec, Opts,
+	Registry,
 };
-use prometheus::{Encoder, TextEncoder, core::Collector};
+use prometheus::{core::Collector, Encoder, TextEncoder};
 use std::net::SocketAddr;
 
 #[cfg(not(target_os = "unknown"))]
 mod networking;
 mod sourced;
 
-pub use sourced::{SourcedCounter, SourcedGauge, MetricSource, SourcedMetric};
+pub use sourced::{MetricSource, SourcedCounter, SourcedGauge, SourcedMetric};
 
-#[cfg(target_os = "unknown")]
-pub use unknown_os::init_prometheus;
 #[cfg(not(target_os = "unknown"))]
 pub use known_os::init_prometheus;
+#[cfg(target_os = "unknown")]
+pub use unknown_os::init_prometheus;
 
-pub fn register<T: Clone + Collector + 'static>(metric: T, registry: &Registry) -> Result<T, PrometheusError> {
+pub fn register<T: Clone + Collector + 'static>(
+	metric: T,
+	registry: &Registry,
+) -> Result<T, PrometheusError> {
 	registry.register(Box::new(metric.clone()))?;
 	Ok(metric)
 }
@@ -61,8 +62,11 @@ mod unknown_os {
 #[cfg(not(target_os = "unknown"))]
 mod known_os {
 	use super::*;
-	use hyper::http::StatusCode;
-	use hyper::{Server, Body, Request, Response, service::{service_fn, make_service_fn}};
+	use hyper::{
+		http::StatusCode,
+		service::{make_service_fn, service_fn},
+		Body, Request, Response, Server,
+	};
 
 	#[derive(Debug, derive_more::Display, derive_more::From)]
 	pub enum Error {
@@ -73,7 +77,7 @@ mod known_os {
 		/// i/o error.
 		Io(std::io::Error),
 		#[display(fmt = "Prometheus port {} already in use.", _0)]
-		PortInUse(SocketAddr)
+		PortInUse(SocketAddr),
 	}
 
 	impl std::error::Error for Error {
@@ -82,28 +86,32 @@ mod known_os {
 				Error::Hyper(error) => Some(error),
 				Error::Http(error) => Some(error),
 				Error::Io(error) => Some(error),
-				Error::PortInUse(_) => None
+				Error::PortInUse(_) => None,
 			}
 		}
 	}
 
-	async fn request_metrics(req: Request<Body>, registry: Registry) -> Result<Response<Body>, Error> {
+	async fn request_metrics(
+		req: Request<Body>,
+		registry: Registry,
+	) -> Result<Response<Body>, Error> {
 		if req.uri().path() == "/metrics" {
 			let metric_families = registry.gather();
 			let mut buffer = vec![];
 			let encoder = TextEncoder::new();
 			encoder.encode(&metric_families, &mut buffer).unwrap();
 
-			Response::builder().status(StatusCode::OK)
+			Response::builder()
+				.status(StatusCode::OK)
 				.header("Content-Type", encoder.format_type())
 				.body(Body::from(buffer))
 				.map_err(Error::Http)
 		} else {
-			Response::builder().status(StatusCode::NOT_FOUND)
+			Response::builder()
+				.status(StatusCode::NOT_FOUND)
 				.body(Body::from("Not found."))
 				.map_err(Error::Http)
 		}
-
 	}
 
 	#[derive(Clone)]
@@ -121,7 +129,10 @@ mod known_os {
 
 	/// Initializes the metrics context, and starts an HTTP server
 	/// to serve metrics.
-	pub async fn init_prometheus(prometheus_addr: SocketAddr, registry: Registry) -> Result<(), Error>{
+	pub async fn init_prometheus(
+		prometheus_addr: SocketAddr,
+		registry: Registry,
+	) -> Result<(), Error> {
 		use networking::Incoming;
 		let listener = async_std::net::TcpListener::bind(&prometheus_addr)
 			.await
diff --git a/utils/prometheus/src/networking.rs b/utils/prometheus/src/networking.rs
index 48ae8a23297c..e04ac99a5694 100644
--- a/utils/prometheus/src/networking.rs
+++ b/utils/prometheus/src/networking.rs
@@ -16,8 +16,11 @@
 // limitations under the License.
 
 use async_std::pin::Pin;
-use std::task::{Poll, Context};
-use futures_util::{stream::Stream, io::{AsyncRead, AsyncWrite}};
+use futures_util::{
+	io::{AsyncRead, AsyncWrite},
+	stream::Stream,
+};
+use std::task::{Context, Poll};
 
 pub struct Incoming<'a>(pub async_std::net::Incoming<'a>);
 
@@ -25,7 +28,10 @@ impl hyper::server::accept::Accept for Incoming<'_> {
 	type Conn = TcpStream;
 	type Error = async_std::io::Error;
 
-	fn poll_accept(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Option<Result<Self::Conn, Self::Error>>> {
+	fn poll_accept(
+		self: Pin<&mut Self>,
+		cx: &mut Context,
+	) -> Poll<Option<Result<Self::Conn, Self::Error>>> {
 		Pin::new(&mut Pin::into_inner(self).0)
 			.poll_next(cx)
 			.map(|opt| opt.map(|res| res.map(TcpStream)))
@@ -38,10 +44,9 @@ impl tokio::io::AsyncRead for TcpStream {
 	fn poll_read(
 		self: Pin<&mut Self>,
 		cx: &mut Context,
-		buf: &mut [u8]
+		buf: &mut [u8],
 	) -> Poll<Result<usize, std::io::Error>> {
-		Pin::new(&mut Pin::into_inner(self).0)
-			.poll_read(cx, buf)
+		Pin::new(&mut Pin::into_inner(self).0).poll_read(cx, buf)
 	}
 }
 
@@ -49,19 +54,16 @@ impl tokio::io::AsyncWrite for TcpStream {
 	fn poll_write(
 		self: Pin<&mut Self>,
 		cx: &mut Context,
-		buf: &[u8]
+		buf: &[u8],
 	) -> Poll<Result<usize, std::io::Error>> {
-		Pin::new(&mut Pin::into_inner(self).0)
-			.poll_write(cx, buf)
+		Pin::new(&mut Pin::into_inner(self).0).poll_write(cx, buf)
 	}
 
 	fn poll_flush(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Result<(), std::io::Error>> {
-		Pin::new(&mut Pin::into_inner(self).0)
-			.poll_flush(cx)
+		Pin::new(&mut Pin::into_inner(self).0).poll_flush(cx)
 	}
 
 	fn poll_shutdown(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Result<(), std::io::Error>> {
-		Pin::new(&mut Pin::into_inner(self).0)
-			.poll_close(cx)
+		Pin::new(&mut Pin::into_inner(self).0).poll_close(cx)
 	}
 }
diff --git a/utils/prometheus/src/sourced.rs b/utils/prometheus/src/sourced.rs
index 014bdb30f8ab..78853a6ef354 100644
--- a/utils/prometheus/src/sourced.rs
+++ b/utils/prometheus/src/sourced.rs
@@ -17,8 +17,10 @@
 
 //! Metrics that are collected from existing sources.
 
-use prometheus::core::{Collector, Desc, Describer, Number, Opts};
-use prometheus::proto;
+use prometheus::{
+	core::{Collector, Desc, Describer, Number, Opts},
+	proto,
+};
 use std::{cmp::Ordering, marker::PhantomData};
 
 /// A counter whose values are obtained from an existing source.
@@ -80,15 +82,15 @@ impl<T: SourcedType, S: MetricSource> Collector for SourcedMetric<T, S> {
 					let mut c = proto::Counter::default();
 					c.set_value(value.into_f64());
 					m.set_counter(c);
-				}
+				},
 				proto::MetricType::GAUGE => {
 					let mut g = proto::Gauge::default();
 					g.set_value(value.into_f64());
 					m.set_gauge(g);
-				}
+				},
 				t => {
 					log::error!("Unsupported sourced metric type: {:?}", t);
-				}
+				},
 			}
 
 			debug_assert_eq!(self.desc.variable_labels.len(), label_values.len());
@@ -97,18 +99,23 @@ impl<T: SourcedType, S: MetricSource> Collector for SourcedMetric<T, S> {
 					log::warn!("Missing label values for sourced metric {}", self.desc.fq_name),
 				Ordering::Less =>
 					log::warn!("Too many label values for sourced metric {}", self.desc.fq_name),
-				Ordering::Equal => {}
+				Ordering::Equal => {},
 			}
 
-			m.set_label(self.desc.variable_labels.iter().zip(label_values)
-				.map(|(l_name, l_value)| {
-					let mut l = proto::LabelPair::default();
-					l.set_name(l_name.to_string());
-					l.set_value(l_value.to_string());
-					l
-				})
-				.chain(self.desc.const_label_pairs.iter().cloned())
-				.collect::<Vec<_>>());
+			m.set_label(
+				self.desc
+					.variable_labels
+					.iter()
+					.zip(label_values)
+					.map(|(l_name, l_value)| {
+						let mut l = proto::LabelPair::default();
+						l.set_name(l_name.to_string());
+						l.set_value(l_value.to_string());
+						l
+					})
+					.chain(self.desc.const_label_pairs.iter().cloned())
+					.collect::<Vec<_>>(),
+			);
 
 			counters.push(m);
 		});
@@ -130,11 +137,15 @@ pub trait SourcedType: private::Sealed + Sync + Send {
 }
 
 impl SourcedType for Counter {
-	fn proto() -> proto::MetricType { proto::MetricType::COUNTER }
+	fn proto() -> proto::MetricType {
+		proto::MetricType::COUNTER
+	}
 }
 
 impl SourcedType for Gauge {
-	fn proto() -> proto::MetricType { proto::MetricType::GAUGE }
+	fn proto() -> proto::MetricType {
+		proto::MetricType::GAUGE
+	}
 }
 
 mod private {
diff --git a/utils/wasm-builder/src/builder.rs b/utils/wasm-builder/src/builder.rs
index 9e8216f04fed..20f33583b892 100644
--- a/utils/wasm-builder/src/builder.rs
+++ b/utils/wasm-builder/src/builder.rs
@@ -15,7 +15,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::{env, path::{PathBuf, Path}, process};
+use std::{
+	env,
+	path::{Path, PathBuf},
+	process,
+};
 
 /// Returns the manifest dir from the `CARGO_MANIFEST_DIR` env.
 fn get_manifest_dir() -> PathBuf {
@@ -50,10 +54,7 @@ impl WasmBuilderSelectProject {
 	/// Use the given `path` as project for building the WASM binary.
 	///
 	/// Returns an error if the given `path` does not points to a `Cargo.toml`.
-	pub fn with_project(
-		self,
-		path: impl Into<PathBuf>,
-	) -> Result<WasmBuilder, &'static str> {
+	pub fn with_project(self, path: impl Into<PathBuf>) -> Result<WasmBuilder, &'static str> {
 		let path = path.into();
 
 		if path.ends_with("Cargo.toml") && path.exists() {
@@ -97,9 +98,7 @@ pub struct WasmBuilder {
 impl WasmBuilder {
 	/// Create a new instance of the builder.
 	pub fn new() -> WasmBuilderSelectProject {
-		WasmBuilderSelectProject {
-			_ignore: (),
-		}
+		WasmBuilderSelectProject { _ignore: () }
 	}
 
 	/// Enable exporting `__heap_base` as global variable in the WASM binary.
@@ -147,9 +146,8 @@ impl WasmBuilder {
 	/// Build the WASM binary.
 	pub fn build(self) {
 		let out_dir = PathBuf::from(env::var("OUT_DIR").expect("`OUT_DIR` is set by cargo!"));
-		let file_path = out_dir.join(
-			self.file_name.clone().unwrap_or_else(|| "wasm_binary.rs".into()),
-		);
+		let file_path =
+			out_dir.join(self.file_name.clone().unwrap_or_else(|| "wasm_binary.rs".into()));
 
 		if check_skip_build() {
 			// If we skip the build, we still want to make sure to be called when an env variable
@@ -158,7 +156,7 @@ impl WasmBuilder {
 
 			provide_dummy_wasm_binary_if_not_exist(&file_path);
 
-			return;
+			return
 		}
 
 		build_project(
@@ -179,13 +177,17 @@ impl WasmBuilder {
 fn generate_crate_skip_build_env_name() -> String {
 	format!(
 		"SKIP_{}_WASM_BUILD",
-		env::var("CARGO_PKG_NAME").expect("Package name is set").to_uppercase().replace('-', "_"),
+		env::var("CARGO_PKG_NAME")
+			.expect("Package name is set")
+			.to_uppercase()
+			.replace('-', "_"),
 	)
 }
 
 /// Checks if the build of the WASM binary should be skipped.
 fn check_skip_build() -> bool {
-	env::var(crate::SKIP_BUILD_ENV).is_ok() || env::var(generate_crate_skip_build_env_name()).is_ok()
+	env::var(crate::SKIP_BUILD_ENV).is_ok() ||
+		env::var(generate_crate_skip_build_env_name()).is_ok()
 }
 
 /// Provide a dummy WASM binary if there doesn't exist one.
@@ -243,15 +245,9 @@ fn build_project(
 	);
 
 	let (wasm_binary, wasm_binary_bloaty) = if let Some(wasm_binary) = wasm_binary {
-		(
-			wasm_binary.wasm_binary_path_escaped(),
-			bloaty.wasm_binary_bloaty_path_escaped(),
-		)
+		(wasm_binary.wasm_binary_path_escaped(), bloaty.wasm_binary_bloaty_path_escaped())
 	} else {
-		(
-			bloaty.wasm_binary_bloaty_path_escaped(),
-			bloaty.wasm_binary_bloaty_path_escaped(),
-		)
+		(bloaty.wasm_binary_bloaty_path_escaped(), bloaty.wasm_binary_bloaty_path_escaped())
 	};
 
 	crate::write_file_if_changed(
diff --git a/utils/wasm-builder/src/lib.rs b/utils/wasm-builder/src/lib.rs
index 0a3c856344dc..0bfd4e755014 100644
--- a/utils/wasm-builder/src/lib.rs
+++ b/utils/wasm-builder/src/lib.rs
@@ -96,7 +96,12 @@
 //! as well. For example if installing the rust nightly from 20.02.2020 using `rustup install nightly-2020-02-20`,
 //! the wasm target needs to be installed as well `rustup target add wasm32-unknown-unknown --toolchain nightly-2020-02-20`.
 
-use std::{env, fs, path::{PathBuf, Path}, process::Command, io::BufRead};
+use std::{
+	env, fs,
+	io::BufRead,
+	path::{Path, PathBuf},
+	process::Command,
+};
 
 mod builder;
 mod prerequisites;
@@ -144,18 +149,16 @@ fn copy_file_if_changed(src: PathBuf, dst: PathBuf) {
 	let dst_file = fs::read_to_string(&dst).ok();
 
 	if src_file != dst_file {
-		fs::copy(&src, &dst)
-			.unwrap_or_else(
-				|_| panic!("Copying `{}` to `{}` can not fail; qed", src.display(), dst.display())
-			);
+		fs::copy(&src, &dst).unwrap_or_else(|_| {
+			panic!("Copying `{}` to `{}` can not fail; qed", src.display(), dst.display())
+		});
 	}
 }
 
 /// Get a cargo command that compiles with nightly
 fn get_nightly_cargo() -> CargoCommand {
-	let env_cargo = CargoCommand::new(
-		&env::var("CARGO").expect("`CARGO` env variable is always set by cargo"),
-	);
+	let env_cargo =
+		CargoCommand::new(&env::var("CARGO").expect("`CARGO` env variable is always set by cargo"));
 	let default_cargo = CargoCommand::new("cargo");
 	let rustup_run_nightly = CargoCommand::new_with_args("rustup", &["run", "nightly", "cargo"]);
 	let wasm_toolchain = env::var(WASM_BUILD_TOOLCHAIN).ok();
@@ -197,7 +200,7 @@ fn get_rustup_nightly(selected: Option<String>) -> Option<CargoCommand> {
 			}
 
 			latest_nightly?.trim_end_matches(&host).into()
-		}
+		},
 	};
 
 	Some(CargoCommand::new_with_args("rustup", &["run", &version, "cargo"]))
@@ -253,10 +256,7 @@ struct CargoCommandVersioned {
 
 impl CargoCommandVersioned {
 	fn new(command: CargoCommand, version: String) -> Self {
-		Self {
-			command,
-			version,
-		}
+		Self { command, version }
 	}
 
 	/// Returns the `rustc` version.
diff --git a/utils/wasm-builder/src/prerequisites.rs b/utils/wasm-builder/src/prerequisites.rs
index dbbd9c0a5622..0dad8b781ae5 100644
--- a/utils/wasm-builder/src/prerequisites.rs
+++ b/utils/wasm-builder/src/prerequisites.rs
@@ -15,12 +15,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::{CargoCommandVersioned, CargoCommand, write_file_if_changed};
+use crate::{write_file_if_changed, CargoCommand, CargoCommandVersioned};
 
 use std::{fs, path::Path};
 
-use tempfile::tempdir;
 use ansi_term::Color;
+use tempfile::tempdir;
 
 /// Print an error message.
 fn print_error_message(message: &str) -> String {
@@ -95,7 +95,7 @@ fn create_check_toolchain_project(project_dir: &Path) {
 					rustc_version.unwrap_or_else(|| "unknown rustc version".into()),
 				);
 			}
-		"#
+		"#,
 	);
 	// Just prints the `RURSTC_VERSION` environment variable that is being created by the
 	// `build.rs` script.
@@ -105,7 +105,7 @@ fn create_check_toolchain_project(project_dir: &Path) {
 			fn main() {
 				println!("{}", env!("RUSTC_VERSION"));
 			}
-		"#
+		"#,
 	);
 }
 
@@ -120,7 +120,12 @@ fn check_wasm_toolchain_installed(
 	let manifest_path = temp.path().join("Cargo.toml").display().to_string();
 
 	let mut build_cmd = cargo_command.command();
-	build_cmd.args(&["build", "--target=wasm32-unknown-unknown", "--manifest-path", &manifest_path]);
+	build_cmd.args(&[
+		"build",
+		"--target=wasm32-unknown-unknown",
+		"--manifest-path",
+		&manifest_path,
+	]);
 
 	if super::color_output_enabled() {
 		build_cmd.arg("--color=always");
@@ -133,33 +138,27 @@ fn check_wasm_toolchain_installed(
 	build_cmd.env_remove("CARGO_TARGET_DIR");
 	run_cmd.env_remove("CARGO_TARGET_DIR");
 
-	build_cmd
-		.output()
-		.map_err(|_| err_msg.clone())
-		.and_then(|s|
-			if s.status.success() {
-				let version = run_cmd.output().ok().and_then(|o| String::from_utf8(o.stdout).ok());
-				Ok(CargoCommandVersioned::new(
-					cargo_command,
-					version.unwrap_or_else(|| "unknown rustc version".into()),
-				))
-			} else {
-				match String::from_utf8(s.stderr) {
-					Ok(ref err) if err.contains("linker `rust-lld` not found") => {
-						Err(print_error_message("`rust-lld` not found, please install it!"))
-					},
-					Ok(ref err) => Err(
-						format!(
-							"{}\n\n{}\n{}\n{}{}\n",
-							err_msg,
-							Color::Yellow.bold().paint("Further error information:"),
-							Color::Yellow.bold().paint("-".repeat(60)),
-							err,
-							Color::Yellow.bold().paint("-".repeat(60)),
-						)
-					),
-					Err(_) => Err(err_msg),
-				}
+	build_cmd.output().map_err(|_| err_msg.clone()).and_then(|s| {
+		if s.status.success() {
+			let version = run_cmd.output().ok().and_then(|o| String::from_utf8(o.stdout).ok());
+			Ok(CargoCommandVersioned::new(
+				cargo_command,
+				version.unwrap_or_else(|| "unknown rustc version".into()),
+			))
+		} else {
+			match String::from_utf8(s.stderr) {
+				Ok(ref err) if err.contains("linker `rust-lld` not found") =>
+					Err(print_error_message("`rust-lld` not found, please install it!")),
+				Ok(ref err) => Err(format!(
+					"{}\n\n{}\n{}\n{}{}\n",
+					err_msg,
+					Color::Yellow.bold().paint("Further error information:"),
+					Color::Yellow.bold().paint("-".repeat(60)),
+					err,
+					Color::Yellow.bold().paint("-".repeat(60)),
+				)),
+				Err(_) => Err(err_msg),
 			}
-		)
+		}
+	})
 }
diff --git a/utils/wasm-builder/src/wasm_project.rs b/utils/wasm-builder/src/wasm_project.rs
index 466c2145e6ce..60b0d76fd0c9 100644
--- a/utils/wasm-builder/src/wasm_project.rs
+++ b/utils/wasm-builder/src/wasm_project.rs
@@ -18,15 +18,20 @@
 use crate::{write_file_if_changed, CargoCommandVersioned};
 
 use std::{
-	fs, path::{Path, PathBuf}, borrow::ToOwned, process, env, collections::HashSet,
-	hash::{Hash, Hasher}, ops::Deref,
+	borrow::ToOwned,
+	collections::HashSet,
+	env, fs,
+	hash::{Hash, Hasher},
+	ops::Deref,
+	path::{Path, PathBuf},
+	process,
 };
 
 use toml::value::Table;
 
 use build_helper::rerun_if_changed;
 
-use cargo_metadata::{MetadataCommand, Metadata};
+use cargo_metadata::{Metadata, MetadataCommand};
 
 use walkdir::WalkDir;
 
@@ -114,19 +119,16 @@ pub(crate) fn create_and_compile(
 	);
 
 	build_project(&project, default_rustflags, cargo_cmd);
-	let (wasm_binary, wasm_binary_compressed, bloaty) = compact_wasm_file(
-		&project,
-		project_cargo_toml,
-		wasm_binary_name,
-	);
+	let (wasm_binary, wasm_binary_compressed, bloaty) =
+		compact_wasm_file(&project, project_cargo_toml, wasm_binary_name);
 
-	wasm_binary.as_ref().map(|wasm_binary|
-		copy_wasm_to_target_directory(project_cargo_toml, wasm_binary)
-	);
+	wasm_binary
+		.as_ref()
+		.map(|wasm_binary| copy_wasm_to_target_directory(project_cargo_toml, wasm_binary));
 
-	wasm_binary_compressed.as_ref().map(|wasm_binary_compressed|
+	wasm_binary_compressed.as_ref().map(|wasm_binary_compressed| {
 		copy_wasm_to_target_directory(project_cargo_toml, wasm_binary_compressed)
-	);
+	});
 
 	generate_rerun_if_changed_instructions(project_cargo_toml, &project, &wasm_workspace);
 
@@ -144,17 +146,17 @@ fn find_cargo_lock(cargo_manifest: &Path) -> Option<PathBuf> {
 			}
 
 			if !path.pop() {
-				return None;
+				return None
 			}
 		}
 	}
 
 	if let Some(path) = find_impl(build_helper::out_dir()) {
-		return Some(path);
+		return Some(path)
 	}
 
 	if let Some(path) = find_impl(cargo_manifest.to_path_buf()) {
-		return Some(path);
+		return Some(path)
 	}
 
 	build_helper::warning!(
@@ -169,15 +171,20 @@ fn find_cargo_lock(cargo_manifest: &Path) -> Option<PathBuf> {
 /// Extract the crate name from the given `Cargo.toml`.
 fn get_crate_name(cargo_manifest: &Path) -> String {
 	let cargo_toml: Table = toml::from_str(
-		&fs::read_to_string(cargo_manifest).expect("File exists as checked before; qed")
-	).expect("Cargo manifest is a valid toml file; qed");
+		&fs::read_to_string(cargo_manifest).expect("File exists as checked before; qed"),
+	)
+	.expect("Cargo manifest is a valid toml file; qed");
 
 	let package = cargo_toml
 		.get("package")
 		.and_then(|t| t.as_table())
 		.expect("`package` key exists in valid `Cargo.toml`; qed");
 
-	package.get("name").and_then(|p| p.as_str()).map(ToOwned::to_owned).expect("Package name exists; qed")
+	package
+		.get("name")
+		.and_then(|p| p.as_str())
+		.map(ToOwned::to_owned)
+		.expect("Package name exists; qed")
 }
 
 /// Returns the name for the wasm binary.
@@ -192,9 +199,10 @@ fn get_wasm_workspace_root() -> PathBuf {
 	loop {
 		match out_dir.parent() {
 			Some(parent) if out_dir.ends_with("build") => return parent.to_path_buf(),
-			_ => if !out_dir.pop() {
-				break;
-			}
+			_ =>
+				if !out_dir.pop() {
+					break
+				},
 		}
 	}
 
@@ -210,10 +218,10 @@ fn create_project_cargo_toml(
 	enabled_features: impl Iterator<Item = String>,
 ) {
 	let mut workspace_toml: Table = toml::from_str(
-		&fs::read_to_string(
-			workspace_root_path.join("Cargo.toml"),
-		).expect("Workspace root `Cargo.toml` exists; qed")
-	).expect("Workspace root `Cargo.toml` is a valid toml file; qed");
+		&fs::read_to_string(workspace_root_path.join("Cargo.toml"))
+			.expect("Workspace root `Cargo.toml` exists; qed"),
+	)
+	.expect("Workspace root `Cargo.toml` is a valid toml file; qed");
 
 	let mut wasm_workspace_toml = Table::new();
 
@@ -232,25 +240,25 @@ fn create_project_cargo_toml(
 	wasm_workspace_toml.insert("profile".into(), profile.into());
 
 	// Add patch section from the project root `Cargo.toml`
-	while let Some(mut patch) = workspace_toml.remove("patch")
-		.and_then(|p| p.try_into::<Table>().ok()) {
+	while let Some(mut patch) =
+		workspace_toml.remove("patch").and_then(|p| p.try_into::<Table>().ok())
+	{
 		// Iterate over all patches and make the patch path absolute from the workspace root path.
-		patch.iter_mut()
-			.filter_map(|p|
+		patch
+			.iter_mut()
+			.filter_map(|p| {
 				p.1.as_table_mut().map(|t| t.iter_mut().filter_map(|t| t.1.as_table_mut()))
-			)
+			})
 			.flatten()
-			.for_each(|p|
-				p.iter_mut()
-					.filter(|(k, _)| k == &"path")
-					.for_each(|(_, v)| {
-						if let Some(path) = v.as_str().map(PathBuf::from) {
-							if path.is_relative() {
-								*v = workspace_root_path.join(path).display().to_string().into();
-							}
+			.for_each(|p| {
+				p.iter_mut().filter(|(k, _)| k == &"path").for_each(|(_, v)| {
+					if let Some(path) = v.as_str().map(PathBuf::from) {
+						if path.is_relative() {
+							*v = workspace_root_path.join(path).display().to_string().into();
 						}
-					})
-			);
+					}
+				})
+			});
 
 		wasm_workspace_toml.insert("patch".into(), patch.into());
 	}
@@ -296,7 +304,8 @@ fn find_package_by_manifest_path<'a>(
 	manifest_path: &Path,
 	crate_metadata: &'a cargo_metadata::Metadata,
 ) -> &'a cargo_metadata::Package {
-	crate_metadata.packages
+	crate_metadata
+		.packages
 		.iter()
 		.find(|p| p.manifest_path == manifest_path)
 		.expect("Wasm project exists in its own metadata; qed")
@@ -309,18 +318,19 @@ fn project_enabled_features(
 ) -> Vec<String> {
 	let package = find_package_by_manifest_path(cargo_manifest, crate_metadata);
 
-	let mut enabled_features = package.features.keys()
+	let mut enabled_features = package
+		.features
+		.keys()
 		.filter(|f| {
 			let mut feature_env = f.replace("-", "_");
 			feature_env.make_ascii_uppercase();
 
 			// We don't want to enable the `std`/`default` feature for the wasm build and
 			// we need to check if the feature is enabled by checking the env variable.
-			*f != "std"
-				&& *f != "default"
-				&& env::var(format!("CARGO_FEATURE_{}", feature_env))
-					.map(|v| v == "1")
-					.unwrap_or_default()
+			*f != "std" &&
+				*f != "default" && env::var(format!("CARGO_FEATURE_{}", feature_env))
+				.map(|v| v == "1")
+				.unwrap_or_default()
 		})
 		.cloned()
 		.collect::<Vec<_>>();
@@ -418,7 +428,8 @@ fn build_project(project: &Path, default_rustflags: &str, cargo_cmd: CargoComman
 		env::var(crate::WASM_BUILD_RUSTFLAGS_ENV).unwrap_or_default(),
 	);
 
-	build_cmd.args(&["rustc", "--target=wasm32-unknown-unknown"])
+	build_cmd
+		.args(&["rustc", "--target=wasm32-unknown-unknown"])
 		.arg(format!("--manifest-path={}", manifest_path.display()))
 		.env("RUSTFLAGS", rustflags)
 		// Unset the `CARGO_TARGET_DIR` to prevent a cargo deadlock (cargo locks a target dir exclusive).
@@ -456,17 +467,16 @@ fn compact_wasm_file(
 	let is_release_build = is_release_build();
 	let target = if is_release_build { "release" } else { "debug" };
 	let default_wasm_binary_name = get_wasm_binary_name(cargo_manifest);
-	let wasm_file = project.join("target/wasm32-unknown-unknown")
+	let wasm_file = project
+		.join("target/wasm32-unknown-unknown")
 		.join(target)
 		.join(format!("{}.wasm", default_wasm_binary_name));
 
 	let wasm_compact_file = if is_release_build {
-		let wasm_compact_file = project.join(
-			format!(
-				"{}.compact.wasm",
-				wasm_binary_name.clone().unwrap_or_else(|| default_wasm_binary_name.clone()),
-			)
-		);
+		let wasm_compact_file = project.join(format!(
+			"{}.compact.wasm",
+			wasm_binary_name.clone().unwrap_or_else(|| default_wasm_binary_name.clone()),
+		));
 		wasm_gc::garbage_collect_file(&wasm_file, &wasm_compact_file)
 			.expect("Failed to compact generated WASM binary.");
 		Some(WasmBinary(wasm_compact_file))
@@ -474,24 +484,19 @@ fn compact_wasm_file(
 		None
 	};
 
-	let wasm_compact_compressed_file = wasm_compact_file.as_ref()
-		.and_then(|compact_binary| {
-			let file_name = wasm_binary_name.clone()
-				.unwrap_or_else(|| default_wasm_binary_name.clone());
-
-			let wasm_compact_compressed_file = project.join(
-				format!(
-					"{}.compact.compressed.wasm",
-					file_name,
-				)
-			);
-
-			if compress_wasm(&compact_binary.0, &wasm_compact_compressed_file) {
-				Some(WasmBinary(wasm_compact_compressed_file))
-			} else {
-				None
-			}
-		});
+	let wasm_compact_compressed_file = wasm_compact_file.as_ref().and_then(|compact_binary| {
+		let file_name =
+			wasm_binary_name.clone().unwrap_or_else(|| default_wasm_binary_name.clone());
+
+		let wasm_compact_compressed_file =
+			project.join(format!("{}.compact.compressed.wasm", file_name,));
+
+		if compress_wasm(&compact_binary.0, &wasm_compact_compressed_file) {
+			Some(WasmBinary(wasm_compact_compressed_file))
+		} else {
+			None
+		}
+	});
 
 	let bloaty_file_name = if let Some(name) = wasm_binary_name {
 		format!("{}.wasm", name)
@@ -502,24 +507,14 @@ fn compact_wasm_file(
 	let bloaty_file = project.join(bloaty_file_name);
 	fs::copy(wasm_file, &bloaty_file).expect("Copying the bloaty file to the project dir.");
 
-	(
-		wasm_compact_file,
-		wasm_compact_compressed_file,
-		WasmBinaryBloaty(bloaty_file),
-	)
+	(wasm_compact_file, wasm_compact_compressed_file, WasmBinaryBloaty(bloaty_file))
 }
 
-fn compress_wasm(
-	wasm_binary_path: &Path,
-	compressed_binary_out_path: &Path,
-) -> bool {
+fn compress_wasm(wasm_binary_path: &Path, compressed_binary_out_path: &Path) -> bool {
 	use sp_maybe_compressed_blob::CODE_BLOB_BOMB_LIMIT;
 
 	let data = fs::read(wasm_binary_path).expect("Failed to read WASM binary");
-	if let Some(compressed) = sp_maybe_compressed_blob::compress(
-		&data,
-		CODE_BLOB_BOMB_LIMIT,
-	) {
+	if let Some(compressed) = sp_maybe_compressed_blob::compress(&data, CODE_BLOB_BOMB_LIMIT) {
 		fs::write(compressed_binary_out_path, &compressed[..])
 			.expect("Failed to write WASM binary");
 
@@ -590,7 +585,8 @@ fn generate_rerun_if_changed_instructions(
 		.exec()
 		.expect("`cargo metadata` can not fail!");
 
-	let package = metadata.packages
+	let package = metadata
+		.packages
 		.iter()
 		.find(|p| p.manifest_path == cargo_manifest)
 		.expect("The crate package is contained in its own metadata; qed");
@@ -603,12 +599,11 @@ fn generate_rerun_if_changed_instructions(
 	packages.insert(DeduplicatePackage::from(package));
 
 	while let Some(dependency) = dependencies.pop() {
-		let path_or_git_dep = dependency.source
-			.as_ref()
-			.map(|s| s.starts_with("git+"))
-			.unwrap_or(true);
+		let path_or_git_dep =
+			dependency.source.as_ref().map(|s| s.starts_with("git+")).unwrap_or(true);
 
-		let package = metadata.packages
+		let package = metadata
+			.packages
 			.iter()
 			.filter(|p| !p.manifest_path.starts_with(wasm_workspace))
 			.find(|p| {
@@ -649,9 +644,7 @@ fn package_rerun_if_changed(package: &DeduplicatePackage) {
 			// Ignore this entry if it is a directory that contains a `Cargo.toml` that is not the
 			// `Cargo.toml` related to the current package. This is done to ignore sub-crates of a crate.
 			// If such a sub-crate is a dependency, it will be processed independently anyway.
-			p.path() == manifest_path
-				|| !p.path().is_dir()
-				|| !p.path().join("Cargo.toml").exists()
+			p.path() == manifest_path || !p.path().is_dir() || !p.path().join("Cargo.toml").exists()
 		})
 		.filter_map(|p| p.ok().map(|p| p.into_path()))
 		.filter(|p| {
@@ -681,5 +674,6 @@ fn copy_wasm_to_target_directory(cargo_manifest: &Path, wasm_binary: &WasmBinary
 	fs::copy(
 		wasm_binary.wasm_binary_path(),
 		target_dir.join(format!("{}.wasm", get_wasm_binary_name(cargo_manifest))),
-	).expect("Copies WASM binary to `WASM_TARGET_DIRECTORY`.");
+	)
+	.expect("Copies WASM binary to `WASM_TARGET_DIRECTORY`.");
 }

From b52ddaa4b28c51b419e22bee89f250d443197820 Mon Sep 17 00:00:00 2001
From: Zeke Mostov <32168567+emostov@users.noreply.github.com>
Date: Wed, 21 Jul 2021 13:35:24 -0700
Subject: [PATCH 1008/1194] Run cargo +nightly fmt (#9406)

---
 frame/executive/src/lib.rs | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index 65512998252a..3e2cdd241f6d 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -1226,9 +1226,9 @@ mod tests {
 
 		let header = new_test_ext(1).execute_with(|| {
 			// Make sure `on_runtime_upgrade` is called.
-			RUNTIME_VERSION.with(|v| *v.borrow_mut() = sp_version::RuntimeVersion {
-				spec_version: 1,
-				..Default::default()
+			RUNTIME_VERSION.with(|v| {
+				*v.borrow_mut() =
+					sp_version::RuntimeVersion { spec_version: 1, ..Default::default() }
 			});
 
 			// Let's build some fake block.
@@ -1246,16 +1246,15 @@ mod tests {
 		});
 
 		// Reset to get the correct new genesis below.
-		RUNTIME_VERSION.with(|v| *v.borrow_mut() = sp_version::RuntimeVersion {
-			spec_version: 0,
-			..Default::default()
+		RUNTIME_VERSION.with(|v| {
+			*v.borrow_mut() = sp_version::RuntimeVersion { spec_version: 0, ..Default::default() }
 		});
 
 		new_test_ext(1).execute_with(|| {
 			// Make sure `on_runtime_upgrade` is called.
-			RUNTIME_VERSION.with(|v| *v.borrow_mut() = sp_version::RuntimeVersion {
-				spec_version: 1,
-				..Default::default()
+			RUNTIME_VERSION.with(|v| {
+				*v.borrow_mut() =
+					sp_version::RuntimeVersion { spec_version: 1, ..Default::default() }
 			});
 
 			<Executive as ExecuteBlock<Block<TestXt>>>::execute_block(Block::new(header, vec![xt]));

From 7960c9eba8c1a73e8792c200594544d65b1333bd Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Wed, 21 Jul 2021 22:35:58 +0200
Subject: [PATCH 1009/1194] Fix db metadata updates for existing headers
 (#9403)

* Fix metadata updates on existing headers

* Fail set_head on ancient blocks

* Fmt unrelated code
---
 client/db/src/lib.rs               | 166 +++++++++++++++++++----------
 primitives/blockchain/src/error.rs |   3 +
 2 files changed, 110 insertions(+), 59 deletions(-)

diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index 3369b5fad055..455ec1ef6b9d 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -1199,8 +1199,17 @@ impl<Block: BlockT> Backend<Block> {
 		let mut enacted = Vec::default();
 		let mut retracted = Vec::default();
 
+		let (best_number, best_hash) = best_to;
+
 		let meta = self.blockchain.meta.read();
 
+		if meta.best_number > best_number &&
+			(meta.best_number - best_number).saturated_into::<u64>() >
+				self.canonicalization_delay
+		{
+			return Err(sp_blockchain::Error::SetHeadTooOld.into())
+		}
+
 		// cannot find tree route with empty DB.
 		if meta.best_hash != Default::default() {
 			let tree_route = sp_blockchain::tree_route(&self.blockchain, meta.best_hash, route_to)?;
@@ -1233,13 +1242,13 @@ impl<Block: BlockT> Backend<Block> {
 			}
 		}
 
-		let lookup_key = utils::number_and_hash_to_lookup_key(best_to.0, &best_to.1)?;
+		let lookup_key = utils::number_and_hash_to_lookup_key(best_number, &best_hash)?;
 		transaction.set_from_vec(columns::META, meta_keys::BEST_BLOCK, lookup_key);
 		utils::insert_number_to_key_mapping(
 			transaction,
 			columns::KEY_LOOKUP,
-			best_to.0,
-			best_to.1,
+			best_number,
+			best_hash,
 		)?;
 
 		Ok((enacted, retracted))
@@ -1534,6 +1543,27 @@ impl<Block: BlockT> Backend<Block> {
 				hash, number, is_best, operation.commit_state, existing_header,
 			);
 
+			self.state_usage.merge_sm(operation.old_state.usage_info());
+			// release state reference so that it can be finalized
+			let cache = operation.old_state.into_cache_changes();
+
+			if finalized {
+				// TODO: ensure best chain contains this block.
+				self.ensure_sequential_finalization(header, Some(last_finalized_hash))?;
+				self.note_finalized(
+					&mut transaction,
+					true,
+					header,
+					hash,
+					&mut changes_trie_cache_ops,
+					&mut finalization_displaced_leaves,
+					operation.commit_state,
+				)?;
+			} else {
+				// canonicalize blocks which are old enough, regardless of finality.
+				self.force_delayed_canonicalize(&mut transaction, hash, *header.number())?
+			}
+
 			if !existing_header {
 				let changes_trie_config_update = operation.changes_trie_config_update;
 				changes_trie_cache_ops = Some(self.changes_tries_storage.commit(
@@ -1550,37 +1580,14 @@ impl<Block: BlockT> Backend<Block> {
 					changes_trie_cache_ops,
 				)?);
 
-				self.state_usage.merge_sm(operation.old_state.usage_info());
-				// release state reference so that it can be finalized
-				let cache = operation.old_state.into_cache_changes();
-
-				if finalized {
-					// TODO: ensure best chain contains this block.
-					self.ensure_sequential_finalization(header, Some(last_finalized_hash))?;
-					self.note_finalized(
-						&mut transaction,
-						true,
-						header,
-						hash,
-						&mut changes_trie_cache_ops,
-						&mut finalization_displaced_leaves,
-						operation.commit_state,
-					)?;
-				} else {
-					// canonicalize blocks which are old enough, regardless of finality.
-					self.force_delayed_canonicalize(&mut transaction, hash, *header.number())?
-				}
-
-				let displaced_leaf = {
+				{
 					let mut leaves = self.blockchain.leaves.write();
-					let displaced_leaf = leaves.import(hash, number, parent_hash);
+					leaves.import(hash, number, parent_hash);
 					leaves.prepare_transaction(
 						&mut transaction,
 						columns::META,
 						meta_keys::LEAF_PREFIX,
 					);
-
-					displaced_leaf
 				};
 
 				let mut children = children::read_children(
@@ -1599,28 +1606,17 @@ impl<Block: BlockT> Backend<Block> {
 					parent_hash,
 					children,
 				);
+			}
 
-				meta_updates.push(MetaUpdate {
-					hash,
-					number,
-					is_best: pending_block.leaf_state.is_best(),
-					is_finalized: finalized,
-					with_state: operation.commit_state,
-				});
+			meta_updates.push(MetaUpdate {
+				hash,
+				number,
+				is_best: pending_block.leaf_state.is_best(),
+				is_finalized: finalized,
+				with_state: operation.commit_state,
+			});
 
-				Some((
-					pending_block.header,
-					number,
-					hash,
-					enacted,
-					retracted,
-					displaced_leaf,
-					is_best,
-					cache,
-				))
-			} else {
-				None
-			}
+			Some((pending_block.header, number, hash, enacted, retracted, is_best, cache))
 		} else {
 			None
 		};
@@ -1660,17 +1656,7 @@ impl<Block: BlockT> Backend<Block> {
 		// Apply all in-memory state changes.
 		// Code beyond this point can't fail.
 
-		if let Some((
-			header,
-			number,
-			hash,
-			enacted,
-			retracted,
-			_displaced_leaf,
-			is_best,
-			mut cache,
-		)) = imported
-		{
+		if let Some((header, number, hash, enacted, retracted, is_best, mut cache)) = imported {
 			trace!(target: "db", "DB Commit done {:?}", hash);
 			let header_metadata = CachedHeaderMetadata::from(&header);
 			self.blockchain.insert_header_metadata(header_metadata.hash, header_metadata);
@@ -3390,4 +3376,66 @@ pub(crate) mod tests {
 		assert_eq!(None, backend.blockchain().header(BlockId::hash(prev_hash.clone())).unwrap());
 		assert!(!backend.have_state_at(&prev_hash, 1));
 	}
+
+	#[test]
+	fn test_import_existing_block_as_new_head() {
+		let backend: Backend<Block> = Backend::new_test(10, 3);
+		let block0 = insert_header(&backend, 0, Default::default(), None, Default::default());
+		let block1 = insert_header(&backend, 1, block0, None, Default::default());
+		let block2 = insert_header(&backend, 2, block1, None, Default::default());
+		let block3 = insert_header(&backend, 3, block2, None, Default::default());
+		let block4 = insert_header(&backend, 4, block3, None, Default::default());
+		let block5 = insert_header(&backend, 5, block4, None, Default::default());
+		assert_eq!(backend.blockchain().info().best_hash, block5);
+
+		// Insert 1 as best again. This should fail because canonicalization_delay == 3 and best == 5
+		let header = Header {
+			number: 1,
+			parent_hash: block0,
+			state_root: BlakeTwo256::trie_root(Vec::new()),
+			digest: Default::default(),
+			extrinsics_root: Default::default(),
+		};
+		let mut op = backend.begin_operation().unwrap();
+		op.set_block_data(header, None, None, None, NewBlockState::Best).unwrap();
+		assert!(matches!(backend.commit_operation(op), Err(sp_blockchain::Error::SetHeadTooOld)));
+
+		// Insert 2 as best again.
+		let header = Header {
+			number: 2,
+			parent_hash: block1,
+			state_root: BlakeTwo256::trie_root(Vec::new()),
+			digest: Default::default(),
+			extrinsics_root: Default::default(),
+		};
+		let mut op = backend.begin_operation().unwrap();
+		op.set_block_data(header, None, None, None, NewBlockState::Best).unwrap();
+		backend.commit_operation(op).unwrap();
+		assert_eq!(backend.blockchain().info().best_hash, block2);
+	}
+
+	#[test]
+	fn test_import_existing_block_as_final() {
+		let backend: Backend<Block> = Backend::new_test(10, 10);
+		let block0 = insert_header(&backend, 0, Default::default(), None, Default::default());
+		let block1 = insert_header(&backend, 1, block0, None, Default::default());
+		let _block2 = insert_header(&backend, 2, block1, None, Default::default());
+		// Genesis is auto finalized, the rest are not.
+		assert_eq!(backend.blockchain().info().finalized_hash, block0);
+
+		// Insert 1 as final again.
+		let header = Header {
+			number: 1,
+			parent_hash: block0,
+			state_root: BlakeTwo256::trie_root(Vec::new()),
+			digest: Default::default(),
+			extrinsics_root: Default::default(),
+		};
+
+		let mut op = backend.begin_operation().unwrap();
+		op.set_block_data(header, None, None, None, NewBlockState::Final).unwrap();
+		backend.commit_operation(op).unwrap();
+
+		assert_eq!(backend.blockchain().info().finalized_hash, block1);
+	}
 }
diff --git a/primitives/blockchain/src/error.rs b/primitives/blockchain/src/error.rs
index bc27c36401e8..ef3afa5bce94 100644
--- a/primitives/blockchain/src/error.rs
+++ b/primitives/blockchain/src/error.rs
@@ -156,6 +156,9 @@ pub enum Error {
 	#[error("State Database error: {0}")]
 	StateDatabase(String),
 
+	#[error("Failed to set the chain head to a block that's too old.")]
+	SetHeadTooOld,
+
 	#[error(transparent)]
 	Application(#[from] Box<dyn std::error::Error + Send + Sync + 'static>),
 

From fced2978aedac84a6da97bdcac818b765515cdac Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Thu, 22 Jul 2021 11:29:44 +0200
Subject: [PATCH 1010/1194] Benchmarking also benchmark for decoding the call
 (#9343)

* benchmark for decoding of call

* better names

* fix benchmarks

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_lottery --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/lottery/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_utility --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/utility/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=frame_system --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/system/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Update frame/system/src/weights.rs

Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 frame/benchmarking/src/lib.rs           | 17 ++++++--
 frame/contracts/src/benchmarking/mod.rs |  2 +-
 frame/lottery/src/weights.rs            | 36 ++++++++---------
 frame/system/src/weights.rs             | 52 +++++++++++++------------
 frame/utility/src/weights.rs            | 32 +++++++--------
 5 files changed, 76 insertions(+), 63 deletions(-)

diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
index ebf8a209860d..a0aa78f722f7 100644
--- a/frame/benchmarking/src/lib.rs
+++ b/frame/benchmarking/src/lib.rs
@@ -302,12 +302,21 @@ macro_rules! benchmarks_iter {
 			{ $( $where_clause )* }
 			( $( $names )* )
 			( $( $names_extra )* )
-			$name { $( $code )* }: {
+			$name {
+				$( $code )*
+				let __benchmarked_call_encoded = $crate::frame_support::codec::Encode::encode(
+					&<Call<T $(, $instance )?>>::$dispatch($( $arg ),*)
+				);
+			}: {
+				let call_decoded = <
+					Call<T $(, $instance )?>
+					as $crate::frame_support::codec::Decode
+				>::decode(&mut &__benchmarked_call_encoded[..])
+					.expect("call is encoded above, encoding must be correct");
+
 				<
 					Call<T $(, $instance)? > as $crate::frame_support::traits::UnfilteredDispatchable
-				>::dispatch_bypass_filter(
-					Call::<T $(, $instance)? >::$dispatch($($arg),*), $origin.into()
-				)?;
+				>::dispatch_bypass_filter(call_decoded, $origin.into())?;
 			}
 			verify $postcode
 			$( $rest )*
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index 83c18f8f79e0..683a575826a3 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -727,7 +727,7 @@ benchmarks! {
 		let origin = RawOrigin::Signed(instance.caller.clone());
 		assert_eq!(T::Currency::total_balance(&beneficiary), 0u32.into());
 		assert_eq!(T::Currency::total_balance(&instance.account_id), Endow::max::<T>());
-	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
+	}: call(origin, instance.addr.clone(), 0u32.into(), Weight::max_value(), vec![])
 	verify {
 		if r > 0 {
 			assert_eq!(T::Currency::total_balance(&instance.account_id), 0u32.into());
diff --git a/frame/lottery/src/weights.rs b/frame/lottery/src/weights.rs
index 1b191ef53459..038050c0fb40 100644
--- a/frame/lottery/src/weights.rs
+++ b/frame/lottery/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_lottery
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2021-07-14, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -57,33 +57,33 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn buy_ticket() -> Weight {
-		(71_604_000 as Weight)
+		(74_856_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn set_calls(n: u32, ) -> Weight {
-		(15_015_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((301_000 as Weight).saturating_mul(n as Weight))
+		(15_549_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((281_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn start_lottery() -> Weight {
-		(58_855_000 as Weight)
+		(58_904_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn stop_repeat() -> Weight {
-		(7_524_000 as Weight)
+		(7_714_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn on_initialize_end() -> Weight {
-		(114_766_000 as Weight)
+		(117_420_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn on_initialize_repeat() -> Weight {
-		(119_402_000 as Weight)
+		(123_035_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
@@ -92,33 +92,33 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn buy_ticket() -> Weight {
-		(71_604_000 as Weight)
+		(74_856_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn set_calls(n: u32, ) -> Weight {
-		(15_015_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((301_000 as Weight).saturating_mul(n as Weight))
+		(15_549_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((281_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn start_lottery() -> Weight {
-		(58_855_000 as Weight)
+		(58_904_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn stop_repeat() -> Weight {
-		(7_524_000 as Weight)
+		(7_714_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn on_initialize_end() -> Weight {
-		(114_766_000 as Weight)
+		(117_420_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn on_initialize_repeat() -> Weight {
-		(119_402_000 as Weight)
+		(123_035_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}
diff --git a/frame/system/src/weights.rs b/frame/system/src/weights.rs
index 89fc63fab844..e5821739d0ec 100644
--- a/frame/system/src/weights.rs
+++ b/frame/system/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for frame_system
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2021-07-20, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -57,78 +57,82 @@ pub trait WeightInfo {
 /// Weights for frame_system using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: crate::Config> WeightInfo for SubstrateWeight<T> {
-	fn remark(_b: u32, ) -> Weight {
-		(1_038_000 as Weight)
+	fn remark(b: u32, ) -> Weight {
+		(0 as Weight)
+			// Standard Error: 0
+			.saturating_add((1_000 as Weight).saturating_mul(b as Weight))
 	}
 	fn remark_with_event(b: u32, ) -> Weight {
-		(5_246_000 as Weight)
+		(16_569_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((1_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
 	}
 	fn set_heap_pages() -> Weight {
-		(1_586_000 as Weight)
+		(1_783_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_changes_trie_config() -> Weight {
-		(7_181_000 as Weight)
+		(7_727_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn set_storage(i: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 0
-			.saturating_add((568_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((875_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	fn kill_storage(i: u32, ) -> Weight {
-		(2_278_000 as Weight)
+		(4_216_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((423_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((555_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	fn kill_prefix(p: u32, ) -> Weight {
-		(8_243_000 as Weight)
+		(14_558_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((795_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((781_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
 	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
-	fn remark(_b: u32, ) -> Weight {
-		(1_038_000 as Weight)
+	fn remark(b: u32, ) -> Weight {
+		(0 as Weight)
+			// Standard Error: 0
+			.saturating_add((1_000 as Weight).saturating_mul(b as Weight))
 	}
 	fn remark_with_event(b: u32, ) -> Weight {
-		(5_246_000 as Weight)
+		(16_569_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((1_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
 	}
 	fn set_heap_pages() -> Weight {
-		(1_586_000 as Weight)
+		(1_783_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_changes_trie_config() -> Weight {
-		(7_181_000 as Weight)
+		(7_727_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn set_storage(i: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 0
-			.saturating_add((568_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((875_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	fn kill_storage(i: u32, ) -> Weight {
-		(2_278_000 as Weight)
+		(4_216_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((423_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((555_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	fn kill_prefix(p: u32, ) -> Weight {
-		(8_243_000 as Weight)
+		(14_558_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((795_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((781_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
 	}
 }
diff --git a/frame/utility/src/weights.rs b/frame/utility/src/weights.rs
index e098bf2b8a9e..b676ca5cdbcf 100644
--- a/frame/utility/src/weights.rs
+++ b/frame/utility/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_utility
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2021-07-14, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -54,33 +54,33 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn batch(c: u32, ) -> Weight {
-		(14_618_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((610_000 as Weight).saturating_mul(c as Weight))
+		(20_779_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_080_000 as Weight).saturating_mul(c as Weight))
 	}
 	fn as_derivative() -> Weight {
-		(3_175_000 as Weight)
+		(3_994_000 as Weight)
 	}
 	fn batch_all(c: u32, ) -> Weight {
-		(14_561_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((1_013_000 as Weight).saturating_mul(c as Weight))
+		(22_183_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_506_000 as Weight).saturating_mul(c as Weight))
 	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn batch(c: u32, ) -> Weight {
-		(14_618_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((610_000 as Weight).saturating_mul(c as Weight))
+		(20_779_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_080_000 as Weight).saturating_mul(c as Weight))
 	}
 	fn as_derivative() -> Weight {
-		(3_175_000 as Weight)
+		(3_994_000 as Weight)
 	}
 	fn batch_all(c: u32, ) -> Weight {
-		(14_561_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((1_013_000 as Weight).saturating_mul(c as Weight))
+		(22_183_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_506_000 as Weight).saturating_mul(c as Weight))
 	}
 }

From 7dcc77b982f59eaf6cec19499d981164b04a255d Mon Sep 17 00:00:00 2001
From: Squirrel <gilescope@gmail.com>
Date: Thu, 22 Jul 2021 11:06:17 +0100
Subject: [PATCH 1011/1194] Remove extra commas made redundent after rustfmt
 (#9404)

* Remove extra commas made redundent after rustfmt
---
 bin/node/executor/tests/basic.rs              |  4 +-
 bin/utils/chain-spec-builder/src/main.rs      |  4 +-
 client/authority-discovery/src/worker.rs      |  6 +--
 client/cli/src/params/mod.rs                  |  2 +-
 client/cli/src/runner.rs                      |  2 +-
 client/consensus/babe/src/aux_schema.rs       |  4 +-
 client/consensus/babe/src/tests.rs            |  4 +-
 client/consensus/slots/src/aux_schema.rs      |  8 ++--
 client/consensus/slots/src/lib.rs             |  6 +--
 client/consensus/slots/src/slots.rs           |  2 +-
 client/db/src/light.rs                        | 16 ++++----
 .../executor/src/integration_tests/sandbox.rs |  6 +--
 client/executor/src/native_executor.rs        |  2 +-
 .../executor/wasmtime/src/instance_wrapper.rs |  2 +-
 client/finality-grandpa/src/authorities.rs    | 20 +++++-----
 client/finality-grandpa/src/aux_schema.rs     | 12 +++---
 .../src/communication/gossip.rs               |  6 +--
 .../src/communication/tests.rs                |  2 +-
 client/finality-grandpa/src/environment.rs    |  2 +-
 client/finality-grandpa/src/finality_proof.rs |  2 +-
 client/finality-grandpa/src/tests.rs          |  2 +-
 client/finality-grandpa/src/until_imported.rs |  8 ++--
 client/keystore/src/local.rs                  |  2 +-
 client/network-gossip/src/bridge.rs           |  4 +-
 client/network/src/bitswap.rs                 |  2 +-
 .../src/light_client_requests/sender.rs       |  2 +-
 client/network/src/protocol/sync.rs           |  4 +-
 client/rpc/src/state/tests.rs                 |  2 +-
 client/rpc/src/system/tests.rs                | 10 ++---
 client/service/src/client/client.rs           |  2 +-
 client/service/test/src/client/mod.rs         | 28 +++++++-------
 client/tracing/src/block/mod.rs               |  2 +-
 client/tracing/src/logging/mod.rs             |  4 +-
 frame/atomic-swap/src/lib.rs                  |  4 +-
 frame/babe/src/tests.rs                       |  2 +-
 frame/bounties/src/benchmarking.rs            |  2 +-
 frame/collective/src/benchmarking.rs          |  2 +-
 frame/contracts/src/exec.rs                   |  2 +-
 frame/contracts/src/tests.rs                  | 34 ++++++++---------
 frame/contracts/src/wasm/env_def/macros.rs    |  2 +-
 frame/contracts/src/wasm/mod.rs               | 30 +++++++--------
 frame/democracy/src/benchmarking.rs           |  2 +-
 frame/elections-phragmen/src/lib.rs           | 12 +++---
 frame/elections/src/lib.rs                    |  8 ++--
 frame/gilt/src/benchmarking.rs                |  2 +-
 frame/grandpa/src/tests.rs                    | 10 ++---
 frame/identity/src/benchmarking.rs            |  2 +-
 frame/im-online/src/benchmarking.rs           |  2 +-
 frame/im-online/src/tests.rs                  |  8 ++--
 frame/indices/src/benchmarking.rs             |  2 +-
 frame/lottery/src/benchmarking.rs             |  2 +-
 frame/lottery/src/tests.rs                    |  2 +-
 frame/membership/src/lib.rs                   |  2 +-
 .../primitives/src/lib.rs                     |  2 +-
 .../merkle-mountain-range/src/benchmarking.rs |  2 +-
 frame/merkle-mountain-range/src/mmr/utils.rs  |  2 +-
 frame/multisig/src/benchmarking.rs            |  2 +-
 frame/offences/benchmarking/src/lib.rs        |  2 +-
 frame/proxy/src/benchmarking.rs               |  2 +-
 frame/scheduler/src/benchmarking.rs           |  2 +-
 frame/session/benchmarking/src/lib.rs         |  2 +-
 frame/session/src/tests.rs                    |  2 +-
 frame/staking/src/lib.rs                      |  2 +-
 frame/staking/src/mock.rs                     |  4 +-
 frame/staking/src/tests.rs                    | 26 ++++++-------
 frame/support/procedural/src/storage/parse.rs |  2 +-
 .../src/storage/generator/double_map.rs       |  6 +--
 frame/support/src/storage/generator/nmap.rs   |  8 ++--
 frame/support/src/storage/mod.rs              |  2 +-
 frame/support/test/src/pallet_version.rs      |  2 +-
 frame/support/test/tests/derive_no_bound.rs   |  8 ++--
 frame/support/test/tests/pallet_instance.rs   |  2 +-
 frame/system/benchmarking/src/lib.rs          |  2 +-
 frame/system/src/extensions/check_weight.rs   |  2 +-
 frame/system/src/tests.rs                     | 10 ++---
 frame/timestamp/src/benchmarking.rs           |  2 +-
 frame/tips/src/benchmarking.rs                |  2 +-
 frame/tips/src/tests.rs                       |  2 +-
 frame/transaction-storage/src/benchmarking.rs |  2 +-
 frame/treasury/src/benchmarking.rs            |  2 +-
 frame/utility/src/benchmarking.rs             |  2 +-
 primitives/api/test/tests/decl_and_impl.rs    |  2 +-
 primitives/arithmetic/fuzzer/src/normalize.rs |  2 +-
 primitives/arithmetic/src/biguint.rs          |  8 ++--
 primitives/arithmetic/src/lib.rs              | 34 ++++++++---------
 primitives/arithmetic/src/rational.rs         | 12 +++---
 primitives/core/src/offchain/testing.rs       |  2 +-
 primitives/inherents/src/lib.rs               |  2 +-
 primitives/io/src/lib.rs                      |  2 +-
 primitives/npos-elections/src/node.rs         | 10 ++---
 primitives/npos-elections/src/tests.rs        | 38 +++++++++----------
 .../bare_function_interface.rs                |  2 +-
 .../runtime-interface/proc-macro/src/utils.rs |  4 +-
 primitives/runtime/src/lib.rs                 |  2 +-
 primitives/sandbox/without_std.rs             |  2 +-
 primitives/state-machine/src/ext.rs           |  2 +-
 primitives/state-machine/src/lib.rs           | 14 +++----
 test-utils/runtime/client/src/trait_tests.rs  | 20 +++++-----
 utils/fork-tree/src/lib.rs                    | 34 ++++++++---------
 utils/frame/remote-externalities/src/lib.rs   |  2 +-
 utils/wasm-builder/src/wasm_project.rs        |  2 +-
 101 files changed, 309 insertions(+), 309 deletions(-)

diff --git a/bin/node/executor/tests/basic.rs b/bin/node/executor/tests/basic.rs
index f3beb93f598b..062e9f7b5a7b 100644
--- a/bin/node/executor/tests/basic.rs
+++ b/bin/node/executor/tests/basic.rs
@@ -427,7 +427,7 @@ fn full_native_block_import_works() {
 			Balances::total_balance(&alice()),
 			alice_last_known_balance - 10 * DOLLARS - fees,
 		);
-		assert_eq!(Balances::total_balance(&bob()), 179 * DOLLARS - fees,);
+		assert_eq!(Balances::total_balance(&bob()), 179 * DOLLARS - fees);
 		let events = vec![
 			EventRecord {
 				phase: Phase::ApplyExtrinsic(0),
@@ -529,7 +529,7 @@ fn full_wasm_block_import_works() {
 			Balances::total_balance(&alice()),
 			alice_last_known_balance - 10 * DOLLARS - fees,
 		);
-		assert_eq!(Balances::total_balance(&bob()), 179 * DOLLARS - 1 * fees,);
+		assert_eq!(Balances::total_balance(&bob()), 179 * DOLLARS - 1 * fees);
 	});
 }
 
diff --git a/bin/utils/chain-spec-builder/src/main.rs b/bin/utils/chain-spec-builder/src/main.rs
index 60d46dcfeee5..bf5f1a149578 100644
--- a/bin/utils/chain-spec-builder/src/main.rs
+++ b/bin/utils/chain-spec-builder/src/main.rs
@@ -203,7 +203,7 @@ fn print_seeds(
 	println!("{}", header.paint("Authority seeds"));
 
 	for (n, seed) in authority_seeds.iter().enumerate() {
-		println!("{} //{}", entry.paint(format!("auth-{}:", n)), seed,);
+		println!("{} //{}", entry.paint(format!("auth-{}:", n)), seed);
 	}
 
 	println!("{}", header.paint("Nominator seeds"));
@@ -217,7 +217,7 @@ fn print_seeds(
 	if !endowed_seeds.is_empty() {
 		println!("{}", header.paint("Endowed seeds"));
 		for (n, seed) in endowed_seeds.iter().enumerate() {
-			println!("{} //{}", entry.paint(format!("endowed-{}:", n)), seed,);
+			println!("{} //{}", entry.paint(format!("endowed-{}:", n)), seed);
 		}
 
 		println!();
diff --git a/client/authority-discovery/src/worker.rs b/client/authority-discovery/src/worker.rs
index 905d17c72c04..dccaf10d0684 100644
--- a/client/authority-discovery/src/worker.rs
+++ b/client/authority-discovery/src/worker.rs
@@ -421,7 +421,7 @@ where
 
 				if log_enabled!(log::Level::Debug) {
 					let hashes: Vec<_> = v.iter().map(|(hash, _value)| hash.clone()).collect();
-					debug!(target: LOG_TARGET, "Value for hash '{:?}' found on Dht.", hashes,);
+					debug!(target: LOG_TARGET, "Value for hash '{:?}' found on Dht.", hashes);
 				}
 
 				if let Err(e) = self.handle_dht_value_found_event(v) {
@@ -429,7 +429,7 @@ where
 						metrics.handle_value_found_event_failure.inc();
 					}
 
-					debug!(target: LOG_TARGET, "Failed to handle Dht value found event: {:?}", e,);
+					debug!(target: LOG_TARGET, "Failed to handle Dht value found event: {:?}", e);
 				}
 			},
 			DhtEvent::ValueNotFound(hash) => {
@@ -456,7 +456,7 @@ where
 					metrics.dht_event_received.with_label_values(&["value_put"]).inc();
 				}
 
-				debug!(target: LOG_TARGET, "Successfully put hash '{:?}' on Dht.", hash,)
+				debug!(target: LOG_TARGET, "Successfully put hash '{:?}' on Dht.", hash)
 			},
 			DhtEvent::ValuePutFailed(hash) => {
 				if let Some(metrics) = &self.metrics {
diff --git a/client/cli/src/params/mod.rs b/client/cli/src/params/mod.rs
index 431e1750b2b8..6e55f607aed5 100644
--- a/client/cli/src/params/mod.rs
+++ b/client/cli/src/params/mod.rs
@@ -49,7 +49,7 @@ impl FromStr for GenericNumber {
 
 	fn from_str(block_number: &str) -> Result<Self, Self::Err> {
 		if let Some(pos) = block_number.chars().position(|d| !d.is_digit(10)) {
-			Err(format!("Expected block number, found illegal digit at position: {}", pos,))
+			Err(format!("Expected block number, found illegal digit at position: {}", pos))
 		} else {
 			Ok(Self(block_number.to_owned()))
 		}
diff --git a/client/cli/src/runner.rs b/client/cli/src/runner.rs
index f305f8cbbeaf..9c5d160c37aa 100644
--- a/client/cli/src/runner.rs
+++ b/client/cli/src/runner.rs
@@ -206,7 +206,7 @@ impl<C: SubstrateCli> Runner<C> {
 pub fn print_node_infos<C: SubstrateCli>(config: &Configuration) {
 	info!("{}", C::impl_name());
 	info!("✌️  version {}", C::impl_version());
-	info!("❤️  by {}, {}-{}", C::author(), C::copyright_start_year(), Local::today().year(),);
+	info!("❤️  by {}, {}-{}", C::author(), C::copyright_start_year(), Local::today().year());
 	info!("📋 Chain specification: {}", config.chain_spec.name());
 	info!("🏷 Node name: {}", config.network.node_name);
 	info!("👤 Role: {}", config.display_role());
diff --git a/client/consensus/babe/src/aux_schema.rs b/client/consensus/babe/src/aux_schema.rs
index 4be7dff3eedc..b18220c3e360 100644
--- a/client/consensus/babe/src/aux_schema.rs
+++ b/client/consensus/babe/src/aux_schema.rs
@@ -170,7 +170,7 @@ mod test {
 			)
 			.unwrap();
 
-		assert_eq!(load_decode::<_, u32>(&client, BABE_EPOCH_CHANGES_VERSION).unwrap(), None,);
+		assert_eq!(load_decode::<_, u32>(&client, BABE_EPOCH_CHANGES_VERSION).unwrap(), None);
 
 		let epoch_changes = load_epoch_changes::<TestBlock, _>(
 			&client,
@@ -202,6 +202,6 @@ mod test {
 			client.insert_aux(values, &[]).unwrap();
 		});
 
-		assert_eq!(load_decode::<_, u32>(&client, BABE_EPOCH_CHANGES_VERSION).unwrap(), Some(2),);
+		assert_eq!(load_decode::<_, u32>(&client, BABE_EPOCH_CHANGES_VERSION).unwrap(), Some(2));
 	}
 }
diff --git a/client/consensus/babe/src/tests.rs b/client/consensus/babe/src/tests.rs
index 18c016bbf103..fa42df356a09 100644
--- a/client/consensus/babe/src/tests.rs
+++ b/client/consensus/babe/src/tests.rs
@@ -780,10 +780,10 @@ fn importing_epoch_change_block_prunes_tree() {
 	let fork_3 = propose_and_import_blocks(BlockId::Hash(canon_hashes[18]), 10);
 
 	// We should be tracking a total of 9 epochs in the fork tree
-	assert_eq!(epoch_changes.shared_data().tree().iter().count(), 9,);
+	assert_eq!(epoch_changes.shared_data().tree().iter().count(), 9);
 
 	// And only one root
-	assert_eq!(epoch_changes.shared_data().tree().roots().count(), 1,);
+	assert_eq!(epoch_changes.shared_data().tree().roots().count(), 1);
 
 	// We finalize block #13 from the canon chain, so on the next epoch
 	// change the tree should be pruned, to not contain F (#7).
diff --git a/client/consensus/slots/src/aux_schema.rs b/client/consensus/slots/src/aux_schema.rs
index af92a3a0d60f..c2fe3f6f4e6b 100644
--- a/client/consensus/slots/src/aux_schema.rs
+++ b/client/consensus/slots/src/aux_schema.rs
@@ -169,21 +169,21 @@ mod test {
 		let header6 = create_header(3); // @ slot 4
 
 		// It's ok to sign same headers.
-		assert!(check_equivocation(&client, 2.into(), 2.into(), &header1, &public,)
+		assert!(check_equivocation(&client, 2.into(), 2.into(), &header1, &public)
 			.unwrap()
 			.is_none(),);
 
-		assert!(check_equivocation(&client, 3.into(), 2.into(), &header1, &public,)
+		assert!(check_equivocation(&client, 3.into(), 2.into(), &header1, &public)
 			.unwrap()
 			.is_none(),);
 
 		// But not two different headers at the same slot.
-		assert!(check_equivocation(&client, 4.into(), 2.into(), &header2, &public,)
+		assert!(check_equivocation(&client, 4.into(), 2.into(), &header2, &public)
 			.unwrap()
 			.is_some(),);
 
 		// Different slot is ok.
-		assert!(check_equivocation(&client, 5.into(), 4.into(), &header3, &public,)
+		assert!(check_equivocation(&client, 5.into(), 4.into(), &header3, &public)
 			.unwrap()
 			.is_none(),);
 
diff --git a/client/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs
index b9b337c7edef..1a4f29ff8cb0 100644
--- a/client/consensus/slots/src/lib.rs
+++ b/client/consensus/slots/src/lib.rs
@@ -318,7 +318,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 		let proposal = match futures::future::select(proposing, proposing_remaining).await {
 			Either::Left((Ok(p), _)) => p,
 			Either::Left((Err(err), _)) => {
-				warn!(target: logging_target, "Proposing failed: {:?}", err,);
+				warn!(target: logging_target, "Proposing failed: {:?}", err);
 
 				return None
 			},
@@ -363,7 +363,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 		) {
 			Ok(bi) => bi,
 			Err(err) => {
-				warn!(target: logging_target, "Failed to create block import params: {:?}", err,);
+				warn!(target: logging_target, "Failed to create block import params: {:?}", err);
 
 				return None
 			},
@@ -922,7 +922,7 @@ mod test {
 		}
 
 		// but we cap it to a maximum of 20 slots
-		assert_eq!(super::slot_lenience_linear(1u64.into(), &slot(23)), Some(SLOT_DURATION * 20),);
+		assert_eq!(super::slot_lenience_linear(1u64.into(), &slot(23)), Some(SLOT_DURATION * 20));
 	}
 
 	#[test]
diff --git a/client/consensus/slots/src/slots.rs b/client/consensus/slots/src/slots.rs
index d994aff1fc61..c2ed986e1e7f 100644
--- a/client/consensus/slots/src/slots.rs
+++ b/client/consensus/slots/src/slots.rs
@@ -33,7 +33,7 @@ pub fn duration_now() -> Duration {
 	use std::time::SystemTime;
 	let now = SystemTime::now();
 	now.duration_since(SystemTime::UNIX_EPOCH).unwrap_or_else(|e| {
-		panic!("Current time {:?} is before unix epoch. Something is wrong: {:?}", now, e,)
+		panic!("Current time {:?} is before unix epoch. Something is wrong: {:?}", now, e)
 	})
 }
 
diff --git a/client/db/src/light.rs b/client/db/src/light.rs
index ded5e598fc68..b1fff4f29066 100644
--- a/client/db/src/light.rs
+++ b/client/db/src/light.rs
@@ -1155,23 +1155,23 @@ pub(crate) mod tests {
 
 			let hash7 =
 				insert_block(&db, make_authorities(vec![auth3()]), || default_header(&hash6, 7));
-			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6)), Some(vec![auth1(), auth2()]),);
+			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6)), Some(vec![auth1(), auth2()]));
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash7)), Some(vec![auth3()]));
 			let hash8 =
 				insert_block(&db, make_authorities(vec![auth3()]), || default_header(&hash7, 8));
-			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6)), Some(vec![auth1(), auth2()]),);
+			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6)), Some(vec![auth1(), auth2()]));
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash7)), Some(vec![auth3()]));
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash8)), Some(vec![auth3()]));
 			let hash6_1 =
 				insert_block(&db, make_authorities(vec![auth4()]), || default_header(&hash6, 7));
-			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6)), Some(vec![auth1(), auth2()]),);
+			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6)), Some(vec![auth1(), auth2()]));
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash7)), Some(vec![auth3()]));
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash8)), Some(vec![auth3()]));
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6_1)), Some(vec![auth4()]));
 			let hash6_1_1 = insert_non_best_block(&db, make_authorities(vec![auth5()]), || {
 				default_header(&hash6_1, 8)
 			});
-			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6)), Some(vec![auth1(), auth2()]),);
+			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6)), Some(vec![auth1(), auth2()]));
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash7)), Some(vec![auth3()]));
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash8)), Some(vec![auth3()]));
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6_1)), Some(vec![auth4()]));
@@ -1179,7 +1179,7 @@ pub(crate) mod tests {
 			let hash6_1_2 = insert_non_best_block(&db, make_authorities(vec![auth6()]), || {
 				default_header(&hash6_1, 8)
 			});
-			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6)), Some(vec![auth1(), auth2()]),);
+			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6)), Some(vec![auth1(), auth2()]));
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash7)), Some(vec![auth3()]));
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash8)), Some(vec![auth3()]));
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6_1)), Some(vec![auth4()]));
@@ -1187,7 +1187,7 @@ pub(crate) mod tests {
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6_1_2)), Some(vec![auth6()]));
 			let hash6_2 =
 				insert_block(&db, make_authorities(vec![auth4()]), || default_header(&hash6_1, 8));
-			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6)), Some(vec![auth1(), auth2()]),);
+			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6)), Some(vec![auth1(), auth2()]));
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash7)), Some(vec![auth3()]));
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash8)), Some(vec![auth3()]));
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6_1)), Some(vec![auth4()]));
@@ -1201,7 +1201,7 @@ pub(crate) mod tests {
 		{
 			// finalize block hash6_1
 			db.finalize_header(BlockId::Hash(hash6_1)).unwrap();
-			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6)), Some(vec![auth1(), auth2()]),);
+			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6)), Some(vec![auth1(), auth2()]));
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash7)), None);
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash8)), None);
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6_1)), Some(vec![auth4()]));
@@ -1210,7 +1210,7 @@ pub(crate) mod tests {
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6_2)), Some(vec![auth4()]));
 			// finalize block hash6_2
 			db.finalize_header(BlockId::Hash(hash6_2)).unwrap();
-			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6)), Some(vec![auth1(), auth2()]),);
+			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6)), Some(vec![auth1(), auth2()]));
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash7)), None);
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash8)), None);
 			assert_eq!(authorities(db.cache(), BlockId::Hash(hash6_1)), Some(vec![auth4()]));
diff --git a/client/executor/src/integration_tests/sandbox.rs b/client/executor/src/integration_tests/sandbox.rs
index ee3b295ae8a8..aacd493297cc 100644
--- a/client/executor/src/integration_tests/sandbox.rs
+++ b/client/executor/src/integration_tests/sandbox.rs
@@ -51,7 +51,7 @@ fn sandbox_should_work(wasm_method: WasmExecutionMethod) {
 	.unwrap()
 	.encode();
 
-	assert_eq!(call_in_wasm("test_sandbox", &code, wasm_method, &mut ext,).unwrap(), true.encode(),);
+	assert_eq!(call_in_wasm("test_sandbox", &code, wasm_method, &mut ext).unwrap(), true.encode());
 }
 
 test_wasm_execution!(sandbox_trap);
@@ -72,7 +72,7 @@ fn sandbox_trap(wasm_method: WasmExecutionMethod) {
 	)
 	.unwrap();
 
-	assert_eq!(call_in_wasm("test_sandbox", &code, wasm_method, &mut ext,).unwrap(), vec![0],);
+	assert_eq!(call_in_wasm("test_sandbox", &code, wasm_method, &mut ext).unwrap(), vec![0]);
 }
 
 test_wasm_execution!(start_called);
@@ -111,7 +111,7 @@ fn start_called(wasm_method: WasmExecutionMethod) {
 	.unwrap()
 	.encode();
 
-	assert_eq!(call_in_wasm("test_sandbox", &code, wasm_method, &mut ext,).unwrap(), true.encode(),);
+	assert_eq!(call_in_wasm("test_sandbox", &code, wasm_method, &mut ext).unwrap(), true.encode());
 }
 
 test_wasm_execution!(invoke_args);
diff --git a/client/executor/src/native_executor.rs b/client/executor/src/native_executor.rs
index e54803d2d074..8222e00b1761 100644
--- a/client/executor/src/native_executor.rs
+++ b/client/executor/src/native_executor.rs
@@ -658,7 +658,7 @@ mod tests {
 	fn native_executor_registers_custom_interface() {
 		let executor = NativeExecutor::<MyExecutor>::new(WasmExecutionMethod::Interpreted, None, 8);
 		my_interface::HostFunctions::host_functions().iter().for_each(|function| {
-			assert_eq!(executor.wasm.host_functions.iter().filter(|f| f == &function).count(), 2,);
+			assert_eq!(executor.wasm.host_functions.iter().filter(|f| f == &function).count(), 2);
 		});
 
 		my_interface::say_hello_world("hey");
diff --git a/client/executor/wasmtime/src/instance_wrapper.rs b/client/executor/wasmtime/src/instance_wrapper.rs
index 80cf2b60f492..797fe30690c2 100644
--- a/client/executor/wasmtime/src/instance_wrapper.rs
+++ b/client/executor/wasmtime/src/instance_wrapper.rs
@@ -176,7 +176,7 @@ impl InstanceWrapper {
 					.ok_or_else(|| Error::from(format!("Export {} is not a function", method)))?
 					.clone();
 				EntryPoint::direct(func).map_err(|_| {
-					Error::from(format!("Exported function '{}' has invalid signature.", method,))
+					Error::from(format!("Exported function '{}' has invalid signature.", method))
 				})?
 			},
 			InvokeMethod::Table(func_ref) => {
diff --git a/client/finality-grandpa/src/authorities.rs b/client/finality-grandpa/src/authorities.rs
index 60a347acc35b..6f958bef0ad9 100644
--- a/client/finality-grandpa/src/authorities.rs
+++ b/client/finality-grandpa/src/authorities.rs
@@ -780,13 +780,13 @@ mod tests {
 		authorities.add_pending_change(change(1), &is_descendent_of).unwrap();
 		authorities.add_pending_change(change(2), &is_descendent_of).unwrap();
 
-		assert_eq!(authorities.current_limit(0), Some(1),);
+		assert_eq!(authorities.current_limit(0), Some(1));
 
-		assert_eq!(authorities.current_limit(1), Some(1),);
+		assert_eq!(authorities.current_limit(1), Some(1));
 
-		assert_eq!(authorities.current_limit(2), Some(2),);
+		assert_eq!(authorities.current_limit(2), Some(2));
 
-		assert_eq!(authorities.current_limit(3), None,);
+		assert_eq!(authorities.current_limit(3), None);
 	}
 
 	#[test]
@@ -910,7 +910,7 @@ mod tests {
 			.add_pending_change(change_b.clone(), &static_is_descendent_of(true))
 			.unwrap();
 
-		assert_eq!(authorities.pending_changes().collect::<Vec<_>>(), vec![&change_a, &change_b],);
+		assert_eq!(authorities.pending_changes().collect::<Vec<_>>(), vec![&change_a, &change_b]);
 
 		// finalizing "hash_c" won't enact the change signaled at "hash_a" but it will prune out "hash_b"
 		let status = authorities
@@ -929,7 +929,7 @@ mod tests {
 
 		assert!(status.changed);
 		assert_eq!(status.new_set_block, None);
-		assert_eq!(authorities.pending_changes().collect::<Vec<_>>(), vec![&change_a],);
+		assert_eq!(authorities.pending_changes().collect::<Vec<_>>(), vec![&change_a]);
 		assert_eq!(authorities.authority_set_changes, AuthoritySetChanges::empty());
 
 		// finalizing "hash_d" will enact the change signaled at "hash_a"
@@ -1444,7 +1444,7 @@ mod tests {
 		);
 
 		// there's no longer any pending change at `best_b` fork
-		assert_eq!(authorities.next_change(&"best_b", &is_descendent_of).unwrap(), None,);
+		assert_eq!(authorities.next_change(&"best_b", &is_descendent_of).unwrap(), None);
 
 		// we a forced change at A10 (#8)
 		let change_a10 = PendingChange {
@@ -1666,7 +1666,7 @@ mod tests {
 		authority_set_changes.append(2, 81);
 
 		// we are missing the data for the first set, therefore we should return `None`
-		assert_eq!(None, authority_set_changes.iter_from(40).map(|it| it.collect::<Vec<_>>()),);
+		assert_eq!(None, authority_set_changes.iter_from(40).map(|it| it.collect::<Vec<_>>()));
 
 		// after adding the data for the first set the same query should work
 		let mut authority_set_changes = AuthoritySetChanges::empty();
@@ -1685,8 +1685,8 @@ mod tests {
 			authority_set_changes.iter_from(41).map(|it| it.cloned().collect::<Vec<_>>()),
 		);
 
-		assert_eq!(0, authority_set_changes.iter_from(121).unwrap().count(),);
+		assert_eq!(0, authority_set_changes.iter_from(121).unwrap().count());
 
-		assert_eq!(0, authority_set_changes.iter_from(200).unwrap().count(),);
+		assert_eq!(0, authority_set_changes.iter_from(200).unwrap().count());
 	}
 }
diff --git a/client/finality-grandpa/src/aux_schema.rs b/client/finality-grandpa/src/aux_schema.rs
index 179e8876e66d..bad01e6dfc62 100644
--- a/client/finality-grandpa/src/aux_schema.rs
+++ b/client/finality-grandpa/src/aux_schema.rs
@@ -536,7 +536,7 @@ mod test {
 				.unwrap();
 		}
 
-		assert_eq!(load_decode::<_, u32>(&client, VERSION_KEY).unwrap(), None,);
+		assert_eq!(load_decode::<_, u32>(&client, VERSION_KEY).unwrap(), None);
 
 		// should perform the migration
 		load_persistent::<substrate_test_runtime_client::runtime::Block, _, _>(
@@ -547,7 +547,7 @@ mod test {
 		)
 		.unwrap();
 
-		assert_eq!(load_decode::<_, u32>(&client, VERSION_KEY).unwrap(), Some(3),);
+		assert_eq!(load_decode::<_, u32>(&client, VERSION_KEY).unwrap(), Some(3));
 
 		let PersistentData { authority_set, set_state, .. } =
 			load_persistent::<substrate_test_runtime_client::runtime::Block, _, _>(
@@ -629,7 +629,7 @@ mod test {
 				.unwrap();
 		}
 
-		assert_eq!(load_decode::<_, u32>(&client, VERSION_KEY).unwrap(), Some(1),);
+		assert_eq!(load_decode::<_, u32>(&client, VERSION_KEY).unwrap(), Some(1));
 
 		// should perform the migration
 		load_persistent::<substrate_test_runtime_client::runtime::Block, _, _>(
@@ -640,7 +640,7 @@ mod test {
 		)
 		.unwrap();
 
-		assert_eq!(load_decode::<_, u32>(&client, VERSION_KEY).unwrap(), Some(3),);
+		assert_eq!(load_decode::<_, u32>(&client, VERSION_KEY).unwrap(), Some(3));
 
 		let PersistentData { authority_set, set_state, .. } =
 			load_persistent::<substrate_test_runtime_client::runtime::Block, _, _>(
@@ -719,7 +719,7 @@ mod test {
 				.unwrap();
 		}
 
-		assert_eq!(load_decode::<_, u32>(&client, VERSION_KEY).unwrap(), Some(2),);
+		assert_eq!(load_decode::<_, u32>(&client, VERSION_KEY).unwrap(), Some(2));
 
 		// should perform the migration
 		load_persistent::<substrate_test_runtime_client::runtime::Block, _, _>(
@@ -730,7 +730,7 @@ mod test {
 		)
 		.unwrap();
 
-		assert_eq!(load_decode::<_, u32>(&client, VERSION_KEY).unwrap(), Some(3),);
+		assert_eq!(load_decode::<_, u32>(&client, VERSION_KEY).unwrap(), Some(3));
 
 		let PersistentData { authority_set, .. } = load_persistent::<
 			substrate_test_runtime_client::runtime::Block,
diff --git a/client/finality-grandpa/src/communication/gossip.rs b/client/finality-grandpa/src/communication/gossip.rs
index 60a9cde904d8..c3b385209bda 100644
--- a/client/finality-grandpa/src/communication/gossip.rs
+++ b/client/finality-grandpa/src/communication/gossip.rs
@@ -2258,7 +2258,7 @@ mod tests {
 		// we accept messages from rounds 9, 10 and 11
 		// therefore neither of those should be considered expired
 		for round in &[9, 10, 11] {
-			assert!(!is_expired(crate::communication::round_topic::<Block>(*round, 1), &[],))
+			assert!(!is_expired(crate::communication::round_topic::<Block>(*round, 1), &[]))
 		}
 	}
 
@@ -2533,10 +2533,10 @@ mod tests {
 		);
 
 		// it should be expired if it is for a lower block
-		assert!(message_expired(crate::communication::global_topic::<Block>(1), &commit(1, 1, 1),));
+		assert!(message_expired(crate::communication::global_topic::<Block>(1), &commit(1, 1, 1)));
 
 		// or the same block height but from the previous round
-		assert!(message_expired(crate::communication::global_topic::<Block>(1), &commit(0, 1, 2),));
+		assert!(message_expired(crate::communication::global_topic::<Block>(1), &commit(0, 1, 2)));
 	}
 
 	#[test]
diff --git a/client/finality-grandpa/src/communication/tests.rs b/client/finality-grandpa/src/communication/tests.rs
index 868186bbf0fd..ab72494ee853 100644
--- a/client/finality-grandpa/src/communication/tests.rs
+++ b/client/finality-grandpa/src/communication/tests.rs
@@ -512,7 +512,7 @@ fn peer_with_higher_view_leads_to_catch_up_request() {
 			tester
 				.filter_network_events(move |event| match event {
 					Event::WriteNotification(peer, message) => {
-						assert_eq!(peer, id,);
+						assert_eq!(peer, id);
 
 						assert_eq!(
 							message,
diff --git a/client/finality-grandpa/src/environment.rs b/client/finality-grandpa/src/environment.rs
index c39453b1c8be..9cfd49eeb796 100644
--- a/client/finality-grandpa/src/environment.rs
+++ b/client/finality-grandpa/src/environment.rs
@@ -1376,7 +1376,7 @@ where
 					set_ref.len(),
 				);
 			} else {
-				afg_log!(initial_sync, "👴 Applying GRANDPA set change to new set {:?}", set_ref,);
+				afg_log!(initial_sync, "👴 Applying GRANDPA set change to new set {:?}", set_ref);
 			}
 
 			telemetry!(
diff --git a/client/finality-grandpa/src/finality_proof.rs b/client/finality-grandpa/src/finality_proof.rs
index 56533704af80..1e20c2edc3a6 100644
--- a/client/finality-grandpa/src/finality_proof.rs
+++ b/client/finality-grandpa/src/finality_proof.rs
@@ -512,7 +512,7 @@ pub(crate) mod tests {
 		let mut authority_set_changes = AuthoritySetChanges::empty();
 		authority_set_changes.append(0, 5);
 
-		assert!(matches!(prove_finality(&*backend, authority_set_changes, 6), Ok(None),));
+		assert!(matches!(prove_finality(&*backend, authority_set_changes, 6), Ok(None)));
 	}
 
 	#[test]
diff --git a/client/finality-grandpa/src/tests.rs b/client/finality-grandpa/src/tests.rs
index 6243b1752c7c..526451696b8b 100644
--- a/client/finality-grandpa/src/tests.rs
+++ b/client/finality-grandpa/src/tests.rs
@@ -1631,7 +1631,7 @@ fn imports_justification_for_regular_blocks_on_import() {
 	);
 
 	// the justification should be imported and available from the client
-	assert!(client.justifications(&BlockId::Hash(block_hash)).unwrap().is_some(),);
+	assert!(client.justifications(&BlockId::Hash(block_hash)).unwrap().is_some());
 }
 
 #[test]
diff --git a/client/finality-grandpa/src/until_imported.rs b/client/finality-grandpa/src/until_imported.rs
index ccab843316d2..4063a3d484cf 100644
--- a/client/finality-grandpa/src/until_imported.rs
+++ b/client/finality-grandpa/src/until_imported.rs
@@ -759,7 +759,7 @@ mod tests {
 			chain_state.import_header(h3);
 		});
 
-		assert_eq!(unapply_commit(res), unapply_commit(unknown_commit()),);
+		assert_eq!(unapply_commit(res), unapply_commit(unknown_commit()));
 	}
 
 	#[test]
@@ -787,7 +787,7 @@ mod tests {
 			chain_state.import_header(h3);
 		});
 
-		assert_eq!(unapply_commit(res), unapply_commit(known_commit()),);
+		assert_eq!(unapply_commit(res), unapply_commit(known_commit()));
 	}
 
 	#[test]
@@ -835,7 +835,7 @@ mod tests {
 			chain_state.import_header(h3);
 		});
 
-		assert_eq!(unapply_catch_up(res), unapply_catch_up(unknown_catch_up()),);
+		assert_eq!(unapply_catch_up(res), unapply_catch_up(unknown_catch_up()));
 	}
 
 	#[test]
@@ -883,7 +883,7 @@ mod tests {
 			chain_state.import_header(h3);
 		});
 
-		assert_eq!(unapply_catch_up(res), unapply_catch_up(unknown_catch_up()),);
+		assert_eq!(unapply_catch_up(res), unapply_catch_up(unknown_catch_up()));
 	}
 
 	#[test]
diff --git a/client/keystore/src/local.rs b/client/keystore/src/local.rs
index 53f4785fb691..a86812a9f984 100644
--- a/client/keystore/src/local.rs
+++ b/client/keystore/src/local.rs
@@ -709,7 +709,7 @@ mod tests {
 		let file_name = temp_dir.path().join(hex::encode(&SR25519.0[..2]));
 		fs::write(file_name, "test").expect("Invalid file is written");
 
-		assert!(SyncCryptoStore::sr25519_public_keys(&store, SR25519).is_empty(),);
+		assert!(SyncCryptoStore::sr25519_public_keys(&store, SR25519).is_empty());
 	}
 
 	#[test]
diff --git a/client/network-gossip/src/bridge.rs b/client/network-gossip/src/bridge.rs
index 9871b7efb39a..9ef5e0caee3d 100644
--- a/client/network-gossip/src/bridge.rs
+++ b/client/network-gossip/src/bridge.rs
@@ -264,7 +264,7 @@ impl<B: BlockT> Future for GossipEngine<B> {
 						match sink.start_send(notification.clone()) {
 							Ok(()) => {},
 							Err(e) if e.is_full() =>
-								unreachable!("Previously ensured that all sinks are ready; qed.",),
+								unreachable!("Previously ensured that all sinks are ready; qed."),
 							// Receiver got dropped. Will be removed in next iteration (See (1)).
 							Err(_) => {},
 						}
@@ -624,7 +624,7 @@ mod tests {
 									.or_insert(1);
 							},
 							Poll::Ready(None) =>
-								unreachable!("Sender side of channel is never dropped",),
+								unreachable!("Sender side of channel is never dropped"),
 							Poll::Pending => {},
 						}
 					}
diff --git a/client/network/src/bitswap.rs b/client/network/src/bitswap.rs
index 3a10367c64a4..8f5739c73704 100644
--- a/client/network/src/bitswap.rs
+++ b/client/network/src/bitswap.rs
@@ -230,7 +230,7 @@ impl<B: BlockT> NetworkBehaviour for Bitswap<B> {
 		let wantlist = match request.wantlist {
 			Some(wantlist) => wantlist,
 			None => {
-				debug!(target: LOG_TARGET, "Unexpected bitswap message from {}", peer,);
+				debug!(target: LOG_TARGET, "Unexpected bitswap message from {}", peer);
 				return
 			},
 		};
diff --git a/client/network/src/light_client_requests/sender.rs b/client/network/src/light_client_requests/sender.rs
index 2320d3bcb678..0c12c9a3f85a 100644
--- a/client/network/src/light_client_requests/sender.rs
+++ b/client/network/src/light_client_requests/sender.rs
@@ -902,7 +902,7 @@ mod tests {
 
 		let OutEvent::SendRequest { target, pending_response, .. } =
 			block_on(sender.next()).unwrap();
-		assert!(target == peer0 || target == peer1, "Expect request to originate from known peer.",);
+		assert!(target == peer0 || target == peer1, "Expect request to originate from known peer.");
 
 		// And we should have one busy peer.
 		assert!({
diff --git a/client/network/src/protocol/sync.rs b/client/network/src/protocol/sync.rs
index 0ed1bb13256a..3e49a90e9387 100644
--- a/client/network/src/protocol/sync.rs
+++ b/client/network/src/protocol/sync.rs
@@ -2272,7 +2272,7 @@ mod test {
 			.any(|(who, request)| { who == peer_id && request.from == FromBlock::Hash(a1_hash) }));
 
 		// there are no extra pending requests
-		assert_eq!(sync.extra_justifications.pending_requests().count(), 0,);
+		assert_eq!(sync.extra_justifications.pending_requests().count(), 0);
 
 		// there's one in-flight extra request to the expected peer
 		assert!(sync.extra_justifications.active_requests().any(|(who, (hash, number))| {
@@ -2290,7 +2290,7 @@ mod test {
 		);
 
 		// there should be no in-flight requests
-		assert_eq!(sync.extra_justifications.active_requests().count(), 0,);
+		assert_eq!(sync.extra_justifications.active_requests().count(), 0);
 
 		// and the request should now be pending again, waiting for reschedule
 		assert!(sync
diff --git a/client/rpc/src/state/tests.rs b/client/rpc/src/state/tests.rs
index 2a73ae31f357..dd99360bafba 100644
--- a/client/rpc/src/state/tests.rs
+++ b/client/rpc/src/state/tests.rs
@@ -127,7 +127,7 @@ fn should_return_child_storage() {
 			.map(|x| x.is_some()),
 		Ok(true)
 	);
-	assert_matches!(child.storage_size(child_key.clone(), key.clone(), None,).wait(), Ok(Some(1)));
+	assert_matches!(child.storage_size(child_key.clone(), key.clone(), None).wait(), Ok(Some(1)));
 }
 
 #[test]
diff --git a/client/rpc/src/system/tests.rs b/client/rpc/src/system/tests.rs
index 906bd60229d1..a29859e3e9f9 100644
--- a/client/rpc/src/system/tests.rs
+++ b/client/rpc/src/system/tests.rs
@@ -145,27 +145,27 @@ fn wait_receiver<T>(rx: Receiver<T>) -> T {
 
 #[test]
 fn system_name_works() {
-	assert_eq!(api(None).system_name().unwrap(), "testclient".to_owned(),);
+	assert_eq!(api(None).system_name().unwrap(), "testclient".to_owned());
 }
 
 #[test]
 fn system_version_works() {
-	assert_eq!(api(None).system_version().unwrap(), "0.2.0".to_owned(),);
+	assert_eq!(api(None).system_version().unwrap(), "0.2.0".to_owned());
 }
 
 #[test]
 fn system_chain_works() {
-	assert_eq!(api(None).system_chain().unwrap(), "testchain".to_owned(),);
+	assert_eq!(api(None).system_chain().unwrap(), "testchain".to_owned());
 }
 
 #[test]
 fn system_properties_works() {
-	assert_eq!(api(None).system_properties().unwrap(), serde_json::map::Map::new(),);
+	assert_eq!(api(None).system_properties().unwrap(), serde_json::map::Map::new());
 }
 
 #[test]
 fn system_type_works() {
-	assert_eq!(api(None).system_type().unwrap(), Default::default(),);
+	assert_eq!(api(None).system_type().unwrap(), Default::default());
 }
 
 #[test]
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index e21536c0a09d..1e5e28416191 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -1913,7 +1913,7 @@ where
 		// (i.e. fork blocks and bad blocks respectively)
 		match self.block_rules.lookup(number, &hash) {
 			BlockLookupResult::KnownBad => {
-				trace!("Rejecting known bad block: #{} {:?}", number, hash,);
+				trace!("Rejecting known bad block: #{} {:?}", number, hash);
 				return Ok(ImportResult::KnownBad)
 			},
 			BlockLookupResult::Expected(expected_hash) => {
diff --git a/client/service/test/src/client/mod.rs b/client/service/test/src/client/mod.rs
index 9e89dc932b7f..d6a506ab63d7 100644
--- a/client/service/test/src/client/mod.rs
+++ b/client/service/test/src/client/mod.rs
@@ -1220,13 +1220,13 @@ fn import_with_justification() {
 		.block;
 	block_on(client.import_justified(BlockOrigin::Own, a3.clone(), justification.clone())).unwrap();
 
-	assert_eq!(client.chain_info().finalized_hash, a3.hash(),);
+	assert_eq!(client.chain_info().finalized_hash, a3.hash());
 
-	assert_eq!(client.justifications(&BlockId::Hash(a3.hash())).unwrap(), Some(justification),);
+	assert_eq!(client.justifications(&BlockId::Hash(a3.hash())).unwrap(), Some(justification));
 
-	assert_eq!(client.justifications(&BlockId::Hash(a1.hash())).unwrap(), None,);
+	assert_eq!(client.justifications(&BlockId::Hash(a1.hash())).unwrap(), None);
 
-	assert_eq!(client.justifications(&BlockId::Hash(a2.hash())).unwrap(), None,);
+	assert_eq!(client.justifications(&BlockId::Hash(a2.hash())).unwrap(), None);
 }
 
 #[test]
@@ -1265,15 +1265,15 @@ fn importing_diverged_finalized_block_should_trigger_reorg() {
 	let b1 = b1.build().unwrap().block;
 
 	// A2 is the current best since it's the longest chain
-	assert_eq!(client.chain_info().best_hash, a2.hash(),);
+	assert_eq!(client.chain_info().best_hash, a2.hash());
 
 	// importing B1 as finalized should trigger a re-org and set it as new best
 	let justification = Justifications::from((TEST_ENGINE_ID, vec![1, 2, 3]));
 	block_on(client.import_justified(BlockOrigin::Own, b1.clone(), justification)).unwrap();
 
-	assert_eq!(client.chain_info().best_hash, b1.hash(),);
+	assert_eq!(client.chain_info().best_hash, b1.hash());
 
-	assert_eq!(client.chain_info().finalized_hash, b1.hash(),);
+	assert_eq!(client.chain_info().finalized_hash, b1.hash());
 }
 
 #[test]
@@ -1320,21 +1320,21 @@ fn finalizing_diverged_block_should_trigger_reorg() {
 	block_on(client.import(BlockOrigin::Own, b2.clone())).unwrap();
 
 	// A2 is the current best since it's the longest chain
-	assert_eq!(client.chain_info().best_hash, a2.hash(),);
+	assert_eq!(client.chain_info().best_hash, a2.hash());
 
 	// we finalize block B1 which is on a different branch from current best
 	// which should trigger a re-org.
 	ClientExt::finalize_block(&client, BlockId::Hash(b1.hash()), None).unwrap();
 
 	// B1 should now be the latest finalized
-	assert_eq!(client.chain_info().finalized_hash, b1.hash(),);
+	assert_eq!(client.chain_info().finalized_hash, b1.hash());
 
 	// and B1 should be the new best block (`finalize_block` as no way of
 	// knowing about B2)
-	assert_eq!(client.chain_info().best_hash, b1.hash(),);
+	assert_eq!(client.chain_info().best_hash, b1.hash());
 
 	// `SelectChain` should report B2 as best block though
-	assert_eq!(block_on(select_chain.best_chain()).unwrap().hash(), b2.hash(),);
+	assert_eq!(block_on(select_chain.best_chain()).unwrap().hash(), b2.hash());
 
 	// after we build B3 on top of B2 and import it
 	// it should be the new best block,
@@ -1346,7 +1346,7 @@ fn finalizing_diverged_block_should_trigger_reorg() {
 		.block;
 	block_on(client.import(BlockOrigin::Own, b3.clone())).unwrap();
 
-	assert_eq!(client.chain_info().best_hash, b3.hash(),);
+	assert_eq!(client.chain_info().best_hash, b3.hash());
 }
 
 #[test]
@@ -1505,7 +1505,7 @@ fn doesnt_import_blocks_that_revert_finality() {
 		.to_string(),
 	);
 
-	assert_eq!(import_err.to_string(), expected_err.to_string(),);
+	assert_eq!(import_err.to_string(), expected_err.to_string());
 
 	// adding a C1 block which is lower than the last finalized should also
 	// fail (with a cheaper check that doesn't require checking ancestry).
@@ -1525,7 +1525,7 @@ fn doesnt_import_blocks_that_revert_finality() {
 	let expected_err =
 		ConsensusError::ClientImport(sp_blockchain::Error::NotInFinalizedChain.to_string());
 
-	assert_eq!(import_err.to_string(), expected_err.to_string(),);
+	assert_eq!(import_err.to_string(), expected_err.to_string());
 }
 
 #[test]
diff --git a/client/tracing/src/block/mod.rs b/client/tracing/src/block/mod.rs
index 57d648619fbe..d439e70f8a0a 100644
--- a/client/tracing/src/block/mod.rs
+++ b/client/tracing/src/block/mod.rs
@@ -246,7 +246,7 @@ where
 			);
 			let _guard = dispatcher_span.enter();
 			if let Err(e) = dispatcher::with_default(&dispatch, || {
-				let span = tracing::info_span!(target: TRACE_TARGET, "trace_block",);
+				let span = tracing::info_span!(target: TRACE_TARGET, "trace_block");
 				let _enter = span.enter();
 				self.client.runtime_api().execute_block(&parent_id, block)
 			}) {
diff --git a/client/tracing/src/logging/mod.rs b/client/tracing/src/logging/mod.rs
index 3d3b40a14d9f..32a1f9250cd9 100644
--- a/client/tracing/src/logging/mod.rs
+++ b/client/tracing/src/logging/mod.rs
@@ -403,7 +403,7 @@ mod tests {
 			.unwrap();
 
 		let output = String::from_utf8(output.stderr).unwrap();
-		assert!(re.is_match(output.trim()), "Expected:\n{}\nGot:\n{}", re, output,);
+		assert!(re.is_match(output.trim()), "Expected:\n{}\nGot:\n{}", re, output);
 	}
 
 	/// This is not an actual test, it is used by the `prefix_in_log_lines` test.
@@ -448,7 +448,7 @@ mod tests {
 			.unwrap();
 
 		let output = String::from_utf8(output.stderr).unwrap();
-		assert!(re.is_match(output.trim()), "Expected:\n{}\nGot:\n{}", re, output,);
+		assert!(re.is_match(output.trim()), "Expected:\n{}\nGot:\n{}", re, output);
 	}
 
 	#[test]
diff --git a/frame/atomic-swap/src/lib.rs b/frame/atomic-swap/src/lib.rs
index 164513136979..ac78024a10dc 100644
--- a/frame/atomic-swap/src/lib.rs
+++ b/frame/atomic-swap/src/lib.rs
@@ -289,7 +289,7 @@ pub mod pallet {
 			proof: Vec<u8>,
 			action: T::SwapAction,
 		) -> DispatchResult {
-			ensure!(proof.len() <= T::ProofLimit::get() as usize, Error::<T>::ProofTooLarge,);
+			ensure!(proof.len() <= T::ProofLimit::get() as usize, Error::<T>::ProofTooLarge);
 
 			let target = ensure_signed(origin)?;
 			let hashed_proof = blake2_256(&proof);
@@ -322,7 +322,7 @@ pub mod pallet {
 			let source = ensure_signed(origin)?;
 
 			let swap = PendingSwaps::<T>::get(&target, hashed_proof).ok_or(Error::<T>::NotExist)?;
-			ensure!(swap.source == source, Error::<T>::SourceMismatch,);
+			ensure!(swap.source == source, Error::<T>::SourceMismatch);
 			ensure!(
 				frame_system::Pallet::<T>::block_number() >= swap.end_block,
 				Error::<T>::DurationNotPassed,
diff --git a/frame/babe/src/tests.rs b/frame/babe/src/tests.rs
index 00ffc7b4edac..5e72e14877a4 100644
--- a/frame/babe/src/tests.rs
+++ b/frame/babe/src/tests.rs
@@ -323,7 +323,7 @@ fn can_fetch_current_and_next_epoch_data() {
 		});
 
 		// genesis authorities should be used for the first and second epoch
-		assert_eq!(Babe::current_epoch().authorities, Babe::next_epoch().authorities,);
+		assert_eq!(Babe::current_epoch().authorities, Babe::next_epoch().authorities);
 		// 1 era = 3 epochs
 		// 1 epoch = 3 slots
 		// Eras start from 0.
diff --git a/frame/bounties/src/benchmarking.rs b/frame/bounties/src/benchmarking.rs
index c95c13649b6a..832c053f024d 100644
--- a/frame/bounties/src/benchmarking.rs
+++ b/frame/bounties/src/benchmarking.rs
@@ -211,4 +211,4 @@ benchmarks! {
 	}
 }
 
-impl_benchmark_test_suite!(Bounties, crate::tests::new_test_ext(), crate::tests::Test,);
+impl_benchmark_test_suite!(Bounties, crate::tests::new_test_ext(), crate::tests::Test);
diff --git a/frame/collective/src/benchmarking.rs b/frame/collective/src/benchmarking.rs
index 2862c830959c..ccc20356fbf4 100644
--- a/frame/collective/src/benchmarking.rs
+++ b/frame/collective/src/benchmarking.rs
@@ -635,4 +635,4 @@ benchmarks_instance! {
 	}
 }
 
-impl_benchmark_test_suite!(Collective, crate::tests::new_test_ext(), crate::tests::Test,);
+impl_benchmark_test_suite!(Collective, crate::tests::new_test_ext(), crate::tests::Test);
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index 2967e4fa418a..a862a98802e4 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -2468,7 +2468,7 @@ mod tests {
 			let forbidden_call = Call::Balances(BalanceCall::transfer(CHARLIE, 22));
 
 			// simple cases: direct call
-			assert_err!(ctx.ext.call_runtime(forbidden_call.clone()), BadOrigin,);
+			assert_err!(ctx.ext.call_runtime(forbidden_call.clone()), BadOrigin);
 
 			// as part of a patch: return is OK (but it interrupted the batch)
 			assert_ok!(ctx.ext.call_runtime(Call::Utility(UtilCall::batch(vec![
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index f8528c3dbe7c..30340eaead19 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -639,7 +639,7 @@ fn storage_size() {
 		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 		let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
 		assert_eq!(bob_contract.storage_size, 4);
-		assert_eq!(bob_contract.pair_count, 1,);
+		assert_eq!(bob_contract.pair_count, 1);
 
 		assert_ok!(Contracts::call(
 			Origin::signed(ALICE),
@@ -650,7 +650,7 @@ fn storage_size() {
 		));
 		let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
 		assert_eq!(bob_contract.storage_size, 4 + 4);
-		assert_eq!(bob_contract.pair_count, 2,);
+		assert_eq!(bob_contract.pair_count, 2);
 
 		assert_ok!(Contracts::call(
 			Origin::signed(ALICE),
@@ -661,7 +661,7 @@ fn storage_size() {
 		));
 		let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
 		assert_eq!(bob_contract.storage_size, 4);
-		assert_eq!(bob_contract.pair_count, 1,);
+		assert_eq!(bob_contract.pair_count, 1);
 	});
 }
 
@@ -682,8 +682,8 @@ fn empty_kv_pairs() {
 		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 		let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
 
-		assert_eq!(bob_contract.storage_size, 0,);
-		assert_eq!(bob_contract.pair_count, 1,);
+		assert_eq!(bob_contract.storage_size, 0);
+		assert_eq!(bob_contract.pair_count, 1);
 	});
 }
 
@@ -993,7 +993,7 @@ fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
 			ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap().rent_allowance,
 			allowance,
 		);
-		assert_eq!(Balances::free_balance(&addr), balance,);
+		assert_eq!(Balances::free_balance(&addr), balance);
 
 		// Make contract have exactly the subsistence threshold
 		Balances::make_free_balance_be(&addr, subsistence_threshold);
@@ -1357,14 +1357,14 @@ fn restoration(
 			assert_eq!(django_contract.storage_size, 8);
 			assert_eq!(django_contract.trie_id, django_trie_id);
 			assert_eq!(django_contract.deduct_block, System::block_number());
-			assert_eq!(Storage::<Test>::read(&django_trie_id, &delta_key), Some(vec![40, 0, 0, 0]),);
+			assert_eq!(Storage::<Test>::read(&django_trie_id, &delta_key), Some(vec![40, 0, 0, 0]));
 			match (test_different_storage, test_restore_to_with_dirty_storage, test_code_evicted) {
 				(true, false, false) => {
-					assert_err_ignore_postinfo!(result, Error::<Test>::InvalidTombstone,);
+					assert_err_ignore_postinfo!(result, Error::<Test>::InvalidTombstone);
 					assert_eq!(System::events(), vec![]);
 				},
 				(_, true, false) => {
-					assert_err_ignore_postinfo!(result, Error::<Test>::InvalidContractOrigin,);
+					assert_err_ignore_postinfo!(result, Error::<Test>::InvalidContractOrigin);
 					assert_eq!(
 						System::events(),
 						vec![
@@ -1428,7 +1428,7 @@ fn restoration(
 					);
 				},
 				(false, false, true) => {
-					assert_err_ignore_postinfo!(result, Error::<Test>::CodeNotFound,);
+					assert_err_ignore_postinfo!(result, Error::<Test>::CodeNotFound);
 					assert_refcount!(set_rent_code_hash, 0);
 					assert_eq!(System::events(), vec![]);
 				},
@@ -1576,7 +1576,7 @@ fn cannot_self_destruct_through_draning() {
 
 		// Call BOB which makes it send all funds to the zero address
 		// The contract code asserts that the correct error value is returned.
-		assert_ok!(Contracts::call(Origin::signed(ALICE), addr, 0, GAS_LIMIT, vec![],));
+		assert_ok!(Contracts::call(Origin::signed(ALICE), addr, 0, GAS_LIMIT, vec![]));
 	});
 }
 
@@ -2155,7 +2155,7 @@ fn lazy_removal_works() {
 		child::put(trie, &[99], &42);
 
 		// Terminate the contract
-		assert_ok!(Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, vec![],));
+		assert_ok!(Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, vec![]));
 
 		// Contract info should be gone
 		assert!(!<ContractInfoOf::<Test>>::contains_key(&addr));
@@ -2209,7 +2209,7 @@ fn lazy_removal_partial_remove_works() {
 		<ContractInfoOf<Test>>::insert(&addr, ContractInfo::Alive(info.clone()));
 
 		// Terminate the contract
-		assert_ok!(Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, vec![],));
+		assert_ok!(Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, vec![]));
 
 		// Contract info should be gone
 		assert!(!<ContractInfoOf::<Test>>::contains_key(&addr));
@@ -2286,7 +2286,7 @@ fn lazy_removal_does_no_run_on_full_block() {
 		<ContractInfoOf<Test>>::insert(&addr, ContractInfo::Alive(info.clone()));
 
 		// Terminate the contract
-		assert_ok!(Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, vec![],));
+		assert_ok!(Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, vec![]));
 
 		// Contract info should be gone
 		assert!(!<ContractInfoOf::<Test>>::contains_key(&addr));
@@ -2359,7 +2359,7 @@ fn lazy_removal_does_not_use_all_weight() {
 		<ContractInfoOf<Test>>::insert(&addr, ContractInfo::Alive(info.clone()));
 
 		// Terminate the contract
-		assert_ok!(Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, vec![],));
+		assert_ok!(Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, vec![]));
 
 		// Contract info should be gone
 		assert!(!<ContractInfoOf::<Test>>::contains_key(&addr));
@@ -2543,7 +2543,7 @@ fn refcounter() {
 		let addr2 = Contracts::contract_address(&ALICE, &code_hash, &[2]);
 
 		// Terminating one contract should decrement the refcount
-		assert_ok!(Contracts::call(Origin::signed(ALICE), addr0, 0, GAS_LIMIT, vec![],));
+		assert_ok!(Contracts::call(Origin::signed(ALICE), addr0, 0, GAS_LIMIT, vec![]));
 		assert_refcount!(code_hash, 2);
 
 		// make remaining contracts eligible for eviction
@@ -2657,7 +2657,7 @@ fn debug_message_logging_disabled() {
 		let result = Contracts::bare_call(ALICE, addr.clone(), 0, GAS_LIMIT, vec![], false);
 		assert_matches!(result.result, Ok(_));
 		// the dispatchables always run without debugging
-		assert_ok!(Contracts::call(Origin::signed(ALICE), addr, 0, GAS_LIMIT, vec![],));
+		assert_ok!(Contracts::call(Origin::signed(ALICE), addr, 0, GAS_LIMIT, vec![]));
 		assert!(result.debug_message.is_empty());
 	});
 }
diff --git a/frame/contracts/src/wasm/env_def/macros.rs b/frame/contracts/src/wasm/env_def/macros.rs
index 8d316794c639..ea7f51da7526 100644
--- a/frame/contracts/src/wasm/env_def/macros.rs
+++ b/frame/contracts/src/wasm/env_def/macros.rs
@@ -341,7 +341,7 @@ mod tests {
 
 	#[test]
 	fn macro_gen_signature() {
-		assert_eq!(gen_signature!((i32)), FunctionType::new(vec![ValueType::I32], vec![]),);
+		assert_eq!(gen_signature!((i32)), FunctionType::new(vec![ValueType::I32], vec![]));
 
 		assert_eq!(
 			gen_signature!( (i32, u32) -> u32 ),
diff --git a/frame/contracts/src/wasm/mod.rs b/frame/contracts/src/wasm/mod.rs
index 8ef11c8f4c87..0486a67e07ec 100644
--- a/frame/contracts/src/wasm/mod.rs
+++ b/frame/contracts/src/wasm/mod.rs
@@ -507,7 +507,7 @@ mod tests {
 	#[test]
 	fn contract_transfer() {
 		let mut mock_ext = MockExt::default();
-		assert_ok!(execute(CODE_TRANSFER, vec![], &mut mock_ext,));
+		assert_ok!(execute(CODE_TRANSFER, vec![], &mut mock_ext));
 
 		assert_eq!(&mock_ext.transfers, &[TransferEntry { to: ALICE, value: 153 }]);
 	}
@@ -561,7 +561,7 @@ mod tests {
 	#[test]
 	fn contract_call() {
 		let mut mock_ext = MockExt::default();
-		assert_ok!(execute(CODE_CALL, vec![], &mut mock_ext,));
+		assert_ok!(execute(CODE_CALL, vec![], &mut mock_ext));
 
 		assert_eq!(
 			&mock_ext.calls,
@@ -787,7 +787,7 @@ mod tests {
 	#[test]
 	fn contract_instantiate() {
 		let mut mock_ext = MockExt::default();
-		assert_ok!(execute(CODE_INSTANTIATE, vec![], &mut mock_ext,));
+		assert_ok!(execute(CODE_INSTANTIATE, vec![], &mut mock_ext));
 
 		assert_matches!(
 			&mock_ext.instantiates[..],
@@ -884,7 +884,7 @@ mod tests {
 	#[test]
 	fn contract_call_limited_gas() {
 		let mut mock_ext = MockExt::default();
-		assert_ok!(execute(&CODE_TRANSFER_LIMITED_GAS, vec![], &mut mock_ext,));
+		assert_ok!(execute(&CODE_TRANSFER_LIMITED_GAS, vec![], &mut mock_ext));
 
 		assert_eq!(
 			&mock_ext.calls,
@@ -1014,7 +1014,7 @@ mod tests {
 
 	#[test]
 	fn caller() {
-		assert_ok!(execute(CODE_CALLER, vec![], MockExt::default(),));
+		assert_ok!(execute(CODE_CALLER, vec![], MockExt::default()));
 	}
 
 	/// calls `seal_address` and compares the result with the constant 69.
@@ -1062,7 +1062,7 @@ mod tests {
 
 	#[test]
 	fn address() {
-		assert_ok!(execute(CODE_ADDRESS, vec![], MockExt::default(),));
+		assert_ok!(execute(CODE_ADDRESS, vec![], MockExt::default()));
 	}
 
 	const CODE_BALANCE: &str = r#"
@@ -1108,7 +1108,7 @@ mod tests {
 
 	#[test]
 	fn balance() {
-		assert_ok!(execute(CODE_BALANCE, vec![], MockExt::default(),));
+		assert_ok!(execute(CODE_BALANCE, vec![], MockExt::default()));
 	}
 
 	const CODE_GAS_PRICE: &str = r#"
@@ -1154,7 +1154,7 @@ mod tests {
 
 	#[test]
 	fn gas_price() {
-		assert_ok!(execute(CODE_GAS_PRICE, vec![], MockExt::default(),));
+		assert_ok!(execute(CODE_GAS_PRICE, vec![], MockExt::default()));
 	}
 
 	const CODE_GAS_LEFT: &str = r#"
@@ -1252,7 +1252,7 @@ mod tests {
 
 	#[test]
 	fn value_transferred() {
-		assert_ok!(execute(CODE_VALUE_TRANSFERRED, vec![], MockExt::default(),));
+		assert_ok!(execute(CODE_VALUE_TRANSFERRED, vec![], MockExt::default()));
 	}
 
 	const CODE_RETURN_FROM_START_FN: &str = r#"
@@ -1332,7 +1332,7 @@ mod tests {
 
 	#[test]
 	fn now() {
-		assert_ok!(execute(CODE_TIMESTAMP_NOW, vec![], MockExt::default(),));
+		assert_ok!(execute(CODE_TIMESTAMP_NOW, vec![], MockExt::default()));
 	}
 
 	const CODE_MINIMUM_BALANCE: &str = r#"
@@ -1377,7 +1377,7 @@ mod tests {
 
 	#[test]
 	fn minimum_balance() {
-		assert_ok!(execute(CODE_MINIMUM_BALANCE, vec![], MockExt::default(),));
+		assert_ok!(execute(CODE_MINIMUM_BALANCE, vec![], MockExt::default()));
 	}
 
 	const CODE_TOMBSTONE_DEPOSIT: &str = r#"
@@ -1422,7 +1422,7 @@ mod tests {
 
 	#[test]
 	fn tombstone_deposit() {
-		assert_ok!(execute(CODE_TOMBSTONE_DEPOSIT, vec![], MockExt::default(),));
+		assert_ok!(execute(CODE_TOMBSTONE_DEPOSIT, vec![], MockExt::default()));
 	}
 
 	const CODE_RANDOM: &str = r#"
@@ -1596,7 +1596,7 @@ mod tests {
 	#[test]
 	fn deposit_event() {
 		let mut mock_ext = MockExt::default();
-		assert_ok!(execute(CODE_DEPOSIT_EVENT, vec![], &mut mock_ext,));
+		assert_ok!(execute(CODE_DEPOSIT_EVENT, vec![], &mut mock_ext));
 
 		assert_eq!(
 			mock_ext.events,
@@ -2033,7 +2033,7 @@ mod tests {
 		let call = Call::System(frame_system::Call::remark(b"Hello World".to_vec()));
 		let mut ext = MockExt::default();
 		let result = execute(CODE_CALL_RUNTIME, call.encode(), &mut ext).unwrap();
-		assert_eq!(*ext.runtime_calls.borrow(), vec![call],);
+		assert_eq!(*ext.runtime_calls.borrow(), vec![call]);
 		// 0 = ReturnCode::Success
 		assert_eq!(u32::from_le_bytes(result.data.0.try_into().unwrap()), 0);
 	}
@@ -2050,6 +2050,6 @@ mod tests {
 				origin: ErrorOrigin::Caller,
 			})
 		);
-		assert_eq!(*ext.runtime_calls.borrow(), vec![],);
+		assert_eq!(*ext.runtime_calls.borrow(), vec![]);
 	}
 }
diff --git a/frame/democracy/src/benchmarking.rs b/frame/democracy/src/benchmarking.rs
index 1c506461408d..ddc3de590659 100644
--- a/frame/democracy/src/benchmarking.rs
+++ b/frame/democracy/src/benchmarking.rs
@@ -778,4 +778,4 @@ benchmarks! {
 	}
 }
 
-impl_benchmark_test_suite!(Democracy, crate::tests::new_test_ext(), crate::tests::Test,);
+impl_benchmark_test_suite!(Democracy, crate::tests::new_test_ext(), crate::tests::Test);
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index 97147692fd6d..4b6dbc3f365d 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -374,7 +374,7 @@ pub mod pallet {
 			let who = ensure_signed(origin)?;
 
 			let actual_count = <Candidates<T>>::decode_len().unwrap_or(0);
-			ensure!(actual_count as u32 <= candidate_count, Error::<T>::InvalidWitnessData,);
+			ensure!(actual_count as u32 <= candidate_count, Error::<T>::InvalidWitnessData);
 
 			let index = Self::is_candidate(&who).err().ok_or(Error::<T>::DuplicatedCandidate)?;
 
@@ -1677,7 +1677,7 @@ mod tests {
 			assert_eq!(candidate_ids(), Vec::<u64>::new());
 			assert_ok!(submit_candidacy(Origin::signed(1)));
 			assert_eq!(candidate_ids(), vec![1]);
-			assert_noop!(submit_candidacy(Origin::signed(1)), Error::<Test>::DuplicatedCandidate,);
+			assert_noop!(submit_candidacy(Origin::signed(1)), Error::<Test>::DuplicatedCandidate);
 		});
 	}
 
@@ -1695,7 +1695,7 @@ mod tests {
 			assert!(Elections::runners_up().is_empty());
 			assert!(candidate_ids().is_empty());
 
-			assert_noop!(submit_candidacy(Origin::signed(5)), Error::<Test>::MemberSubmit,);
+			assert_noop!(submit_candidacy(Origin::signed(5)), Error::<Test>::MemberSubmit);
 		});
 	}
 
@@ -1715,7 +1715,7 @@ mod tests {
 			assert_eq!(members_ids(), vec![4, 5]);
 			assert_eq!(runners_up_ids(), vec![3]);
 
-			assert_noop!(submit_candidacy(Origin::signed(3)), Error::<Test>::RunnerUpSubmit,);
+			assert_noop!(submit_candidacy(Origin::signed(3)), Error::<Test>::RunnerUpSubmit);
 		});
 	}
 
@@ -1850,7 +1850,7 @@ mod tests {
 	#[test]
 	fn cannot_vote_for_no_candidate() {
 		ExtBuilder::default().build_and_execute(|| {
-			assert_noop!(vote(Origin::signed(2), vec![], 20), Error::<Test>::NoVotes,);
+			assert_noop!(vote(Origin::signed(2), vec![], 20), Error::<Test>::NoVotes);
 		});
 	}
 
@@ -2004,7 +2004,7 @@ mod tests {
 			assert_ok!(submit_candidacy(Origin::signed(5)));
 			assert_ok!(submit_candidacy(Origin::signed(4)));
 
-			assert_noop!(vote(Origin::signed(2), vec![4], 1), Error::<Test>::LowBalance,);
+			assert_noop!(vote(Origin::signed(2), vec![4], 1), Error::<Test>::LowBalance);
 		})
 	}
 
diff --git a/frame/elections/src/lib.rs b/frame/elections/src/lib.rs
index e51733a79db9..c4c88e434966 100644
--- a/frame/elections/src/lib.rs
+++ b/frame/elections/src/lib.rs
@@ -694,7 +694,7 @@ pub mod pallet {
 			#[pallet::compact] index: VoteIndex,
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
-			ensure!(!total.is_zero(), Error::<T>::ZeroDeposit,);
+			ensure!(!total.is_zero(), Error::<T>::ZeroDeposit);
 
 			let candidate = T::Lookup::lookup(candidate)?;
 			ensure!(index == Self::vote_index(), Error::<T>::InvalidVoteIndex);
@@ -711,7 +711,7 @@ pub mod pallet {
 			ensure!(total > leaderboard[0].0, Error::<T>::UnworthyCandidate);
 
 			if let Some(p) = Self::members().iter().position(|&(ref c, _)| c == &candidate) {
-				ensure!(p < expiring.len(), Error::<T>::DuplicatedCandidate,);
+				ensure!(p < expiring.len(), Error::<T>::DuplicatedCandidate);
 			}
 
 			let voters = Self::all_voters();
@@ -916,12 +916,12 @@ impl<T: Config> Pallet<T> {
 
 		ensure!(!Self::presentation_active(), Error::<T>::ApprovalPresentation);
 		ensure!(index == Self::vote_index(), Error::<T>::InvalidVoteIndex);
-		ensure!(!candidates_len.is_zero(), Error::<T>::ZeroCandidates,);
+		ensure!(!candidates_len.is_zero(), Error::<T>::ZeroCandidates);
 		// Prevent a vote from voters that provide a list of votes that exceeds the candidates
 		// length since otherwise an attacker may be able to submit a very long list of `votes` that
 		// far exceeds the amount of candidates and waste more computation than a reasonable voting
 		// bond would cover.
-		ensure!(candidates_len >= votes.len(), Error::<T>::TooManyVotes,);
+		ensure!(candidates_len >= votes.len(), Error::<T>::TooManyVotes);
 		ensure!(value >= T::MinimumVotingLock::get(), Error::<T>::InsufficientLockedValue);
 
 		// Amount to be locked up.
diff --git a/frame/gilt/src/benchmarking.rs b/frame/gilt/src/benchmarking.rs
index 73e1c9a901cb..befa373e6e7f 100644
--- a/frame/gilt/src/benchmarking.rs
+++ b/frame/gilt/src/benchmarking.rs
@@ -133,4 +133,4 @@ benchmarks! {
 	}: { Gilt::<T>::pursue_target(q) }
 }
 
-impl_benchmark_test_suite!(Gilt, crate::mock::new_test_ext(), crate::mock::Test,);
+impl_benchmark_test_suite!(Gilt, crate::mock::new_test_ext(), crate::mock::Test);
diff --git a/frame/grandpa/src/tests.rs b/frame/grandpa/src/tests.rs
index 8337876d88bc..2439c8c81957 100644
--- a/frame/grandpa/src/tests.rs
+++ b/frame/grandpa/src/tests.rs
@@ -234,7 +234,7 @@ fn schedule_pause_only_when_live() {
 		Grandpa::schedule_pause(1).unwrap();
 
 		// we've switched to the pending pause state
-		assert_eq!(Grandpa::state(), StoredState::PendingPause { scheduled_at: 1u64, delay: 1 },);
+		assert_eq!(Grandpa::state(), StoredState::PendingPause { scheduled_at: 1u64, delay: 1 });
 
 		Grandpa::on_finalize(1);
 		let _ = System::finalize();
@@ -248,7 +248,7 @@ fn schedule_pause_only_when_live() {
 		let _ = System::finalize();
 
 		// after finalizing block 2 the set should have switched to paused state
-		assert_eq!(Grandpa::state(), StoredState::Paused,);
+		assert_eq!(Grandpa::state(), StoredState::Paused);
 	});
 }
 
@@ -260,14 +260,14 @@ fn schedule_resume_only_when_paused() {
 		// the set is currently live, resuming it is an error
 		assert_noop!(Grandpa::schedule_resume(1), Error::<Test>::ResumeFailed);
 
-		assert_eq!(Grandpa::state(), StoredState::Live,);
+		assert_eq!(Grandpa::state(), StoredState::Live);
 
 		// we schedule a pause to be applied instantly
 		Grandpa::schedule_pause(0).unwrap();
 		Grandpa::on_finalize(1);
 		let _ = System::finalize();
 
-		assert_eq!(Grandpa::state(), StoredState::Paused,);
+		assert_eq!(Grandpa::state(), StoredState::Paused);
 
 		// we schedule the set to go back live in 2 blocks
 		initialize_block(2, Default::default());
@@ -284,7 +284,7 @@ fn schedule_resume_only_when_paused() {
 		let _ = System::finalize();
 
 		// it should be live at block 4
-		assert_eq!(Grandpa::state(), StoredState::Live,);
+		assert_eq!(Grandpa::state(), StoredState::Live);
 	});
 }
 
diff --git a/frame/identity/src/benchmarking.rs b/frame/identity/src/benchmarking.rs
index 5cae65818145..77b64c68fd7c 100644
--- a/frame/identity/src/benchmarking.rs
+++ b/frame/identity/src/benchmarking.rs
@@ -413,4 +413,4 @@ benchmarks! {
 
 }
 
-impl_benchmark_test_suite!(Identity, crate::tests::new_test_ext(), crate::tests::Test,);
+impl_benchmark_test_suite!(Identity, crate::tests::new_test_ext(), crate::tests::Test);
diff --git a/frame/im-online/src/benchmarking.rs b/frame/im-online/src/benchmarking.rs
index ec53ec534850..46552cda68c0 100644
--- a/frame/im-online/src/benchmarking.rs
+++ b/frame/im-online/src/benchmarking.rs
@@ -96,4 +96,4 @@ benchmarks! {
 	}
 }
 
-impl_benchmark_test_suite!(ImOnline, crate::mock::new_test_ext(), crate::mock::Runtime,);
+impl_benchmark_test_suite!(ImOnline, crate::mock::new_test_ext(), crate::mock::Runtime);
diff --git a/frame/im-online/src/tests.rs b/frame/im-online/src/tests.rs
index 30af2d31fda3..2492e46ef18a 100644
--- a/frame/im-online/src/tests.rs
+++ b/frame/im-online/src/tests.rs
@@ -37,7 +37,7 @@ use sp_runtime::{
 #[test]
 fn test_unresponsiveness_slash_fraction() {
 	// A single case of unresponsiveness is not slashed.
-	assert_eq!(UnresponsivenessOffence::<()>::slash_fraction(1, 50), Perbill::zero(),);
+	assert_eq!(UnresponsivenessOffence::<()>::slash_fraction(1, 50), Perbill::zero());
 
 	assert_eq!(
 		UnresponsivenessOffence::<()>::slash_fraction(5, 50),
@@ -435,7 +435,7 @@ fn should_handle_non_linear_session_progress() {
 		// if we don't have valid results for the current session progres then
 		// we'll fallback to `HeartbeatAfter` and only heartbeat on block 5.
 		MOCK_CURRENT_SESSION_PROGRESS.with(|p| *p.borrow_mut() = Some(None));
-		assert_eq!(ImOnline::send_heartbeats(2).err(), Some(OffchainErr::TooEarly),);
+		assert_eq!(ImOnline::send_heartbeats(2).err(), Some(OffchainErr::TooEarly));
 
 		MOCK_CURRENT_SESSION_PROGRESS.with(|p| *p.borrow_mut() = Some(None));
 		assert!(ImOnline::send_heartbeats(5).ok().is_some());
@@ -463,7 +463,7 @@ fn test_does_not_heartbeat_early_in_the_session() {
 		// heartbeating after 10% of the session has elapsed.
 		MOCK_CURRENT_SESSION_PROGRESS
 			.with(|p| *p.borrow_mut() = Some(Some(Permill::from_float(0.05))));
-		assert_eq!(ImOnline::send_heartbeats(2).err(), Some(OffchainErr::TooEarly),);
+		assert_eq!(ImOnline::send_heartbeats(2).err(), Some(OffchainErr::TooEarly));
 	});
 }
 
@@ -492,7 +492,7 @@ fn test_probability_of_heartbeating_increases_with_session_progress() {
 
 		let assert_too_early = |progress, random| {
 			set_test(progress, random);
-			assert_eq!(ImOnline::send_heartbeats(2).err(), Some(OffchainErr::TooEarly),);
+			assert_eq!(ImOnline::send_heartbeats(2).err(), Some(OffchainErr::TooEarly));
 		};
 
 		let assert_heartbeat_ok = |progress, random| {
diff --git a/frame/indices/src/benchmarking.rs b/frame/indices/src/benchmarking.rs
index 6829a6605160..ba0152008c41 100644
--- a/frame/indices/src/benchmarking.rs
+++ b/frame/indices/src/benchmarking.rs
@@ -93,4 +93,4 @@ benchmarks! {
 	// TODO in another PR: lookup and unlookup trait weights (not critical)
 }
 
-impl_benchmark_test_suite!(Indices, crate::mock::new_test_ext(), crate::mock::Test,);
+impl_benchmark_test_suite!(Indices, crate::mock::new_test_ext(), crate::mock::Test);
diff --git a/frame/lottery/src/benchmarking.rs b/frame/lottery/src/benchmarking.rs
index cf58a5f81b10..706561471ee5 100644
--- a/frame/lottery/src/benchmarking.rs
+++ b/frame/lottery/src/benchmarking.rs
@@ -170,4 +170,4 @@ benchmarks! {
 	}
 }
 
-impl_benchmark_test_suite!(Lottery, crate::mock::new_test_ext(), crate::mock::Test,);
+impl_benchmark_test_suite!(Lottery, crate::mock::new_test_ext(), crate::mock::Test);
diff --git a/frame/lottery/src/tests.rs b/frame/lottery/src/tests.rs
index 800ae223d973..9cc4c582943e 100644
--- a/frame/lottery/src/tests.rs
+++ b/frame/lottery/src/tests.rs
@@ -177,7 +177,7 @@ fn buy_ticket_works_as_simple_passthrough() {
 		);
 
 		let bad_origin_call = Box::new(Call::Balances(BalancesCall::force_transfer(0, 0, 0)));
-		assert_noop!(Lottery::buy_ticket(Origin::signed(1), bad_origin_call), BadOrigin,);
+		assert_noop!(Lottery::buy_ticket(Origin::signed(1), bad_origin_call), BadOrigin);
 
 		// User can call other txs, but doesn't get a ticket
 		let remark_call = Box::new(Call::System(SystemCall::remark(b"hello, world!".to_vec())));
diff --git a/frame/membership/src/lib.rs b/frame/membership/src/lib.rs
index ed0c78f82d26..f43c056658f3 100644
--- a/frame/membership/src/lib.rs
+++ b/frame/membership/src/lib.rs
@@ -459,7 +459,7 @@ mod benchmark {
 		}
 	}
 
-	impl_benchmark_test_suite!(Membership, crate::tests::new_bench_ext(), crate::tests::Test,);
+	impl_benchmark_test_suite!(Membership, crate::tests::new_bench_ext(), crate::tests::Test);
 }
 
 #[cfg(test)]
diff --git a/frame/merkle-mountain-range/primitives/src/lib.rs b/frame/merkle-mountain-range/primitives/src/lib.rs
index c556583a9dd1..dac57bd42cd3 100644
--- a/frame/merkle-mountain-range/primitives/src/lib.rs
+++ b/frame/merkle-mountain-range/primitives/src/lib.rs
@@ -569,7 +569,7 @@ mod tests {
 		let opaque = cases.iter().map(OpaqueLeaf::from_leaf).collect::<Vec<_>>();
 
 		// then
-		assert_eq!(encoded_compact, opaque,);
+		assert_eq!(encoded_compact, opaque);
 	}
 
 	#[test]
diff --git a/frame/merkle-mountain-range/src/benchmarking.rs b/frame/merkle-mountain-range/src/benchmarking.rs
index 97a880b222ec..2680b3d03006 100644
--- a/frame/merkle-mountain-range/src/benchmarking.rs
+++ b/frame/merkle-mountain-range/src/benchmarking.rs
@@ -37,4 +37,4 @@ benchmarks_instance_pallet! {
 	}
 }
 
-impl_benchmark_test_suite!(Pallet, crate::tests::new_test_ext(), crate::mock::Test,);
+impl_benchmark_test_suite!(Pallet, crate::tests::new_test_ext(), crate::mock::Test);
diff --git a/frame/merkle-mountain-range/src/mmr/utils.rs b/frame/merkle-mountain-range/src/mmr/utils.rs
index 4f103fa3b8c0..8fc725f11e72 100644
--- a/frame/merkle-mountain-range/src/mmr/utils.rs
+++ b/frame/merkle-mountain-range/src/mmr/utils.rs
@@ -121,6 +121,6 @@ mod tests {
 				actual_sizes.push(mmr.size());
 			})
 		}
-		assert_eq!(sizes[1..], actual_sizes[..],);
+		assert_eq!(sizes[1..], actual_sizes[..]);
 	}
 }
diff --git a/frame/multisig/src/benchmarking.rs b/frame/multisig/src/benchmarking.rs
index 393e15292e6b..6847036ce471 100644
--- a/frame/multisig/src/benchmarking.rs
+++ b/frame/multisig/src/benchmarking.rs
@@ -296,4 +296,4 @@ benchmarks! {
 	}
 }
 
-impl_benchmark_test_suite!(Multisig, crate::tests::new_test_ext(), crate::tests::Test,);
+impl_benchmark_test_suite!(Multisig, crate::tests::new_test_ext(), crate::tests::Test);
diff --git a/frame/offences/benchmarking/src/lib.rs b/frame/offences/benchmarking/src/lib.rs
index 0332272cf2df..d68e29047a7c 100644
--- a/frame/offences/benchmarking/src/lib.rs
+++ b/frame/offences/benchmarking/src/lib.rs
@@ -401,4 +401,4 @@ benchmarks! {
 	}
 }
 
-impl_benchmark_test_suite!(Pallet, crate::mock::new_test_ext(), crate::mock::Test,);
+impl_benchmark_test_suite!(Pallet, crate::mock::new_test_ext(), crate::mock::Test);
diff --git a/frame/proxy/src/benchmarking.rs b/frame/proxy/src/benchmarking.rs
index a06c22a3ed8f..77cdff11de9c 100644
--- a/frame/proxy/src/benchmarking.rs
+++ b/frame/proxy/src/benchmarking.rs
@@ -247,4 +247,4 @@ benchmarks! {
 	}
 }
 
-impl_benchmark_test_suite!(Proxy, crate::tests::new_test_ext(), crate::tests::Test,);
+impl_benchmark_test_suite!(Proxy, crate::tests::new_test_ext(), crate::tests::Test);
diff --git a/frame/scheduler/src/benchmarking.rs b/frame/scheduler/src/benchmarking.rs
index f6909160c5ee..c122bed71b1f 100644
--- a/frame/scheduler/src/benchmarking.rs
+++ b/frame/scheduler/src/benchmarking.rs
@@ -141,4 +141,4 @@ benchmarks! {
 	}
 }
 
-impl_benchmark_test_suite!(Scheduler, crate::tests::new_test_ext(), crate::tests::Test,);
+impl_benchmark_test_suite!(Scheduler, crate::tests::new_test_ext(), crate::tests::Test);
diff --git a/frame/session/benchmarking/src/lib.rs b/frame/session/benchmarking/src/lib.rs
index 117ef07d60a2..8b84145c1acf 100644
--- a/frame/session/benchmarking/src/lib.rs
+++ b/frame/session/benchmarking/src/lib.rs
@@ -162,4 +162,4 @@ fn check_membership_proof_setup<T: Config>(
 	(key, Historical::<T>::prove(key).unwrap())
 }
 
-impl_benchmark_test_suite!(Pallet, crate::mock::new_test_ext(), crate::mock::Test, extra = false,);
+impl_benchmark_test_suite!(Pallet, crate::mock::new_test_ext(), crate::mock::Test, extra = false);
diff --git a/frame/session/src/tests.rs b/frame/session/src/tests.rs
index cb1a21bbd647..23e1c6a99342 100644
--- a/frame/session/src/tests.rs
+++ b/frame/session/src/tests.rs
@@ -293,7 +293,7 @@ fn periodic_session_works() {
 	// 1/10 of progress.
 	assert!(P::should_end_session(3u64));
 	assert_eq!(P::estimate_next_session_rotation(3u64).0.unwrap(), 3);
-	assert_eq!(P::estimate_current_session_progress(3u64).0.unwrap(), Permill::from_percent(10),);
+	assert_eq!(P::estimate_current_session_progress(3u64).0.unwrap(), Permill::from_percent(10));
 
 	for i in (1u64..10).map(|i| 3 + i) {
 		assert!(!P::should_end_session(i));
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 594773f658ec..4cf0596ddc1b 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -1569,7 +1569,7 @@ pub mod pallet {
 		) -> DispatchResult {
 			let controller = ensure_signed(origin)?;
 			let mut ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
-			ensure!(ledger.unlocking.len() < MAX_UNLOCKING_CHUNKS, Error::<T>::NoMoreChunks,);
+			ensure!(ledger.unlocking.len() < MAX_UNLOCKING_CHUNKS, Error::<T>::NoMoreChunks);
 
 			let mut value = value.min(ledger.active);
 
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index d17076f4c36f..19fce6e94698 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -593,7 +593,7 @@ pub(crate) fn current_era() -> EraIndex {
 pub(crate) fn bond_validator(stash: AccountId, ctrl: AccountId, val: Balance) {
 	let _ = Balances::make_free_balance_be(&stash, val);
 	let _ = Balances::make_free_balance_be(&ctrl, val);
-	assert_ok!(Staking::bond(Origin::signed(stash), ctrl, val, RewardDestination::Controller,));
+	assert_ok!(Staking::bond(Origin::signed(stash), ctrl, val, RewardDestination::Controller));
 	assert_ok!(Staking::validate(Origin::signed(ctrl), ValidatorPrefs::default()));
 }
 
@@ -605,7 +605,7 @@ pub(crate) fn bond_nominator(
 ) {
 	let _ = Balances::make_free_balance_be(&stash, val);
 	let _ = Balances::make_free_balance_be(&ctrl, val);
-	assert_ok!(Staking::bond(Origin::signed(stash), ctrl, val, RewardDestination::Controller,));
+	assert_ok!(Staking::bond(Origin::signed(stash), ctrl, val, RewardDestination::Controller));
 	assert_ok!(Staking::nominate(Origin::signed(ctrl), target));
 }
 
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index 9aae4cb15768..e4fc2afc096c 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -259,13 +259,13 @@ fn rewards_should_work() {
 			init_balance_10 + part_for_10 * total_payout_0 * 2 / 3,
 			2,
 		);
-		assert_eq_error_rate!(Balances::total_balance(&11), init_balance_11, 2,);
+		assert_eq_error_rate!(Balances::total_balance(&11), init_balance_11, 2);
 		assert_eq_error_rate!(
 			Balances::total_balance(&20),
 			init_balance_20 + part_for_20 * total_payout_0 * 1 / 3,
 			2,
 		);
-		assert_eq_error_rate!(Balances::total_balance(&21), init_balance_21, 2,);
+		assert_eq_error_rate!(Balances::total_balance(&21), init_balance_21, 2);
 		assert_eq_error_rate!(
 			Balances::total_balance(&100),
 			init_balance_100 +
@@ -297,13 +297,13 @@ fn rewards_should_work() {
 			init_balance_10 + part_for_10 * (total_payout_0 * 2 / 3 + total_payout_1),
 			2,
 		);
-		assert_eq_error_rate!(Balances::total_balance(&11), init_balance_11, 2,);
+		assert_eq_error_rate!(Balances::total_balance(&11), init_balance_11, 2);
 		assert_eq_error_rate!(
 			Balances::total_balance(&20),
 			init_balance_20 + part_for_20 * total_payout_0 * 1 / 3,
 			2,
 		);
-		assert_eq_error_rate!(Balances::total_balance(&21), init_balance_21, 2,);
+		assert_eq_error_rate!(Balances::total_balance(&21), init_balance_21, 2);
 		assert_eq_error_rate!(
 			Balances::total_balance(&100),
 			init_balance_100 +
@@ -468,7 +468,7 @@ fn no_candidate_emergency_condition() {
 
 			// try trigger new era
 			mock::run_to_block(20);
-			assert_eq!(*staking_events().last().unwrap(), Event::StakingElectionFailed,);
+			assert_eq!(*staking_events().last().unwrap(), Event::StakingElectionFailed);
 			// No new era is created
 			assert_eq!(current_era, CurrentEra::<Test>::get());
 
@@ -607,7 +607,7 @@ fn nominators_also_get_slashed_pro_rata() {
 		let slash_percent = Perbill::from_percent(5);
 		let initial_exposure = Staking::eras_stakers(active_era(), 11);
 		// 101 is a nominator for 11
-		assert_eq!(initial_exposure.others.first().unwrap().who, 101,);
+		assert_eq!(initial_exposure.others.first().unwrap().who, 101);
 
 		// staked values;
 		let nominator_stake = Staking::ledger(100).unwrap().active;
@@ -639,8 +639,8 @@ fn nominators_also_get_slashed_pro_rata() {
 		assert!(nominator_share > 0);
 
 		// both stakes must have been decreased pro-rata.
-		assert_eq!(Staking::ledger(100).unwrap().active, nominator_stake - nominator_share,);
-		assert_eq!(Staking::ledger(10).unwrap().active, validator_stake - validator_share,);
+		assert_eq!(Staking::ledger(100).unwrap().active, nominator_stake - nominator_share);
+		assert_eq!(Staking::ledger(10).unwrap().active, validator_stake - validator_share);
 		assert_eq!(
 			balances(&101).0, // free balance
 			nominator_balance - nominator_share,
@@ -905,7 +905,7 @@ fn cannot_reserve_staked_balance() {
 		// Confirm account 11 (via controller 10) is totally staked
 		assert_eq!(Staking::eras_stakers(Staking::active_era().unwrap().index, 11).own, 1000);
 		// Confirm account 11 cannot reserve as a result
-		assert_noop!(Balances::reserve(&11, 1), BalancesError::<Test, _>::LiquidityRestrictions,);
+		assert_noop!(Balances::reserve(&11, 1), BalancesError::<Test, _>::LiquidityRestrictions);
 
 		// Give account 11 extra free balance
 		let _ = Balances::make_free_balance_be(&11, 10000);
@@ -1312,7 +1312,7 @@ fn rebond_works() {
 		assert_eq!(Staking::active_era().unwrap().index, 2);
 
 		// Try to rebond some funds. We get an error since no fund is unbonded.
-		assert_noop!(Staking::rebond(Origin::signed(10), 500), Error::<Test>::NoUnlockChunk,);
+		assert_noop!(Staking::rebond(Origin::signed(10), 500), Error::<Test>::NoUnlockChunk);
 
 		// Unbond almost all of the funds in stash.
 		Staking::unbond(Origin::signed(10), 900).unwrap();
@@ -2606,9 +2606,9 @@ fn slashing_nominators_by_span_max() {
 
 		let get_span = |account| <Staking as crate::Store>::SlashingSpans::get(&account).unwrap();
 
-		assert_eq!(get_span(11).iter().collect::<Vec<_>>(), expected_spans,);
+		assert_eq!(get_span(11).iter().collect::<Vec<_>>(), expected_spans);
 
-		assert_eq!(get_span(101).iter().collect::<Vec<_>>(), expected_spans,);
+		assert_eq!(get_span(101).iter().collect::<Vec<_>>(), expected_spans);
 
 		// second slash: higher era, higher value, same span.
 		on_offence_in_era(
@@ -3724,7 +3724,7 @@ fn cannot_rebond_to_lower_than_ed() {
 			);
 
 			// now bond a wee bit more
-			assert_noop!(Staking::rebond(Origin::signed(20), 5), Error::<Test>::InsufficientBond,);
+			assert_noop!(Staking::rebond(Origin::signed(20), 5), Error::<Test>::InsufficientBond);
 		})
 }
 
diff --git a/frame/support/procedural/src/storage/parse.rs b/frame/support/procedural/src/storage/parse.rs
index d3b73843da17..3a11846181a8 100644
--- a/frame/support/procedural/src/storage/parse.rs
+++ b/frame/support/procedural/src/storage/parse.rs
@@ -380,7 +380,7 @@ fn get_module_instance(
 		(None, None, None) => Ok(None),
 		(Some(instance), None, _) => Err(syn::Error::new(
 			instance.span(),
-			format!("Expect instantiable trait bound for instance: {}. {}", instance, right_syntax,),
+			format!("Expect instantiable trait bound for instance: {}. {}", instance, right_syntax),
 		)),
 		(None, Some(instantiable), _) => Err(syn::Error::new(
 			instantiable.span(),
diff --git a/frame/support/src/storage/generator/double_map.rs b/frame/support/src/storage/generator/double_map.rs
index 3a68fe740ab0..5a775b50b6f5 100644
--- a/frame/support/src/storage/generator/double_map.rs
+++ b/frame/support/src/storage/generator/double_map.rs
@@ -532,7 +532,7 @@ mod test_iterators {
 				vec![(3, 3), (0, 0), (2, 2), (1, 1)],
 			);
 
-			assert_eq!(DoubleMap::iter_values().collect::<Vec<_>>(), vec![3, 0, 2, 1],);
+			assert_eq!(DoubleMap::iter_values().collect::<Vec<_>>(), vec![3, 0, 2, 1]);
 
 			assert_eq!(
 				DoubleMap::drain().collect::<Vec<_>>(),
@@ -559,9 +559,9 @@ mod test_iterators {
 				vec![(1, 1), (2, 2), (0, 0), (3, 3)],
 			);
 
-			assert_eq!(DoubleMap::iter_key_prefix(k1).collect::<Vec<_>>(), vec![1, 2, 0, 3],);
+			assert_eq!(DoubleMap::iter_key_prefix(k1).collect::<Vec<_>>(), vec![1, 2, 0, 3]);
 
-			assert_eq!(DoubleMap::iter_prefix_values(k1).collect::<Vec<_>>(), vec![1, 2, 0, 3],);
+			assert_eq!(DoubleMap::iter_prefix_values(k1).collect::<Vec<_>>(), vec![1, 2, 0, 3]);
 
 			assert_eq!(
 				DoubleMap::drain_prefix(k1).collect::<Vec<_>>(),
diff --git a/frame/support/src/storage/generator/nmap.rs b/frame/support/src/storage/generator/nmap.rs
index 54824c62048c..595c21caf22e 100755
--- a/frame/support/src/storage/generator/nmap.rs
+++ b/frame/support/src/storage/generator/nmap.rs
@@ -495,9 +495,9 @@ mod test_iterators {
 				vec![((3, 3), 3), ((0, 0), 0), ((2, 2), 2), ((1, 1), 1)],
 			);
 
-			assert_eq!(NMap::iter_keys().collect::<Vec<_>>(), vec![(3, 3), (0, 0), (2, 2), (1, 1)],);
+			assert_eq!(NMap::iter_keys().collect::<Vec<_>>(), vec![(3, 3), (0, 0), (2, 2), (1, 1)]);
 
-			assert_eq!(NMap::iter_values().collect::<Vec<_>>(), vec![3, 0, 2, 1],);
+			assert_eq!(NMap::iter_values().collect::<Vec<_>>(), vec![3, 0, 2, 1]);
 
 			assert_eq!(
 				NMap::drain().collect::<Vec<_>>(),
@@ -524,9 +524,9 @@ mod test_iterators {
 				vec![(1, 1), (2, 2), (0, 0), (3, 3)],
 			);
 
-			assert_eq!(NMap::iter_key_prefix((k1,)).collect::<Vec<_>>(), vec![1, 2, 0, 3],);
+			assert_eq!(NMap::iter_key_prefix((k1,)).collect::<Vec<_>>(), vec![1, 2, 0, 3]);
 
-			assert_eq!(NMap::iter_prefix_values((k1,)).collect::<Vec<_>>(), vec![1, 2, 0, 3],);
+			assert_eq!(NMap::iter_prefix_values((k1,)).collect::<Vec<_>>(), vec![1, 2, 0, 3]);
 
 			assert_eq!(
 				NMap::drain_prefix((k1,)).collect::<Vec<_>>(),
diff --git a/frame/support/src/storage/mod.rs b/frame/support/src/storage/mod.rs
index 867935003080..88c8b5a22e78 100644
--- a/frame/support/src/storage/mod.rs
+++ b/frame/support/src/storage/mod.rs
@@ -1030,7 +1030,7 @@ pub trait StoragePrefixedMap<Value: FullCodec> {
 					None => unhashed::kill(&previous_key),
 				},
 				None => {
-					log::error!("old key failed to decode at {:?}", previous_key,);
+					log::error!("old key failed to decode at {:?}", previous_key);
 					continue
 				},
 			}
diff --git a/frame/support/test/src/pallet_version.rs b/frame/support/test/src/pallet_version.rs
index 882c0b78b733..bdea3859d65c 100644
--- a/frame/support/test/src/pallet_version.rs
+++ b/frame/support/test/src/pallet_version.rs
@@ -25,5 +25,5 @@ fn ensure_that_current_pallet_version_is_correct() {
 		patch: env!("CARGO_PKG_VERSION_PATCH").parse().unwrap(),
 	};
 
-	assert_eq!(expected, crate_to_pallet_version!(),)
+	assert_eq!(expected, crate_to_pallet_version!())
 }
diff --git a/frame/support/test/tests/derive_no_bound.rs b/frame/support/test/tests/derive_no_bound.rs
index 457ece8b8590..1827844664fa 100644
--- a/frame/support/test/tests/derive_no_bound.rs
+++ b/frame/support/test/tests/derive_no_bound.rs
@@ -153,8 +153,8 @@ fn test_enum() {
 		TestEnum::VariantUnnamed(0, 0, 0, Default::default())
 	);
 
-	assert_eq!(Enum2::<Runtime>::default(), Enum2::<Runtime>::VariantNamed { a: 0, b: 0, c: 0 },);
-	assert_eq!(Enum3::<Runtime>::default(), Enum3::<Runtime>::VariantUnit,);
+	assert_eq!(Enum2::<Runtime>::default(), Enum2::<Runtime>::VariantNamed { a: 0, b: 0, c: 0 });
+	assert_eq!(Enum3::<Runtime>::default(), Enum3::<Runtime>::VariantUnit);
 
 	assert!(variant_0 != variant_0_bis);
 	assert!(variant_1 != variant_1_bis);
@@ -184,6 +184,6 @@ fn test_enum() {
 		format!("{:?}", variant_1),
 		String::from("Enum::VariantNamed { a: 1, b: 2, c: 3, phantom: PhantomData }"),
 	);
-	assert_eq!(format!("{:?}", variant_2), String::from("Enum::VariantUnit"),);
-	assert_eq!(format!("{:?}", variant_3), String::from("Enum::VariantUnit2"),);
+	assert_eq!(format!("{:?}", variant_2), String::from("Enum::VariantUnit"));
+	assert_eq!(format!("{:?}", variant_3), String::from("Enum::VariantUnit2"));
 }
diff --git a/frame/support/test/tests/pallet_instance.rs b/frame/support/test/tests/pallet_instance.rs
index 3181f54f06a9..e3146f698e69 100644
--- a/frame/support/test/tests/pallet_instance.rs
+++ b/frame/support/test/tests/pallet_instance.rs
@@ -314,7 +314,7 @@ fn call_expand() {
 		DispatchInfo { weight: 3, class: DispatchClass::Normal, pays_fee: Pays::Yes }
 	);
 	assert_eq!(call_foo.get_call_name(), "foo");
-	assert_eq!(pallet::Call::<Runtime>::get_call_names(), &["foo", "foo_transactional"],);
+	assert_eq!(pallet::Call::<Runtime>::get_call_names(), &["foo", "foo_transactional"]);
 
 	let call_foo = pallet::Call::<Runtime, pallet::Instance1>::foo(3);
 	assert_eq!(
diff --git a/frame/system/benchmarking/src/lib.rs b/frame/system/benchmarking/src/lib.rs
index 4b25dcd06a63..3211d391d336 100644
--- a/frame/system/benchmarking/src/lib.rs
+++ b/frame/system/benchmarking/src/lib.rs
@@ -139,4 +139,4 @@ benchmarks! {
 	}
 }
 
-impl_benchmark_test_suite!(Pallet, crate::mock::new_test_ext(), crate::mock::Test,);
+impl_benchmark_test_suite!(Pallet, crate::mock::new_test_ext(), crate::mock::Test);
diff --git a/frame/system/src/extensions/check_weight.rs b/frame/system/src/extensions/check_weight.rs
index 40be222c2f87..fae973ac18be 100644
--- a/frame/system/src/extensions/check_weight.rs
+++ b/frame/system/src/extensions/check_weight.rs
@@ -606,7 +606,7 @@ mod tests {
 			assert_eq!(BlockWeight::<Test>::get().total(), info.weight + 256);
 
 			assert_ok!(CheckWeight::<Test>::post_dispatch(pre, &info, &post_info, len, &Ok(())));
-			assert_eq!(BlockWeight::<Test>::get().total(), post_info.actual_weight.unwrap() + 256,);
+			assert_eq!(BlockWeight::<Test>::get().total(), post_info.actual_weight.unwrap() + 256);
 		})
 	}
 
diff --git a/frame/system/src/tests.rs b/frame/system/src/tests.rs
index f171fe661f69..f0a6a96ccc1e 100644
--- a/frame/system/src/tests.rs
+++ b/frame/system/src/tests.rs
@@ -314,9 +314,9 @@ fn deposit_event_topics() {
 
 		// Check that the topic-events mapping reflects the deposited topics.
 		// Note that these are indexes of the events.
-		assert_eq!(System::event_topics(&topics[0]), vec![(BLOCK_NUMBER, 0), (BLOCK_NUMBER, 1)],);
-		assert_eq!(System::event_topics(&topics[1]), vec![(BLOCK_NUMBER, 0), (BLOCK_NUMBER, 2)],);
-		assert_eq!(System::event_topics(&topics[2]), vec![(BLOCK_NUMBER, 0)],);
+		assert_eq!(System::event_topics(&topics[0]), vec![(BLOCK_NUMBER, 0), (BLOCK_NUMBER, 1)]);
+		assert_eq!(System::event_topics(&topics[1]), vec![(BLOCK_NUMBER, 0), (BLOCK_NUMBER, 2)]);
+		assert_eq!(System::event_topics(&topics[2]), vec![(BLOCK_NUMBER, 0)]);
 	});
 }
 
@@ -343,12 +343,12 @@ fn prunes_block_hash_mappings() {
 
 		// first 5 block hashes are pruned
 		for n in 0..5 {
-			assert_eq!(System::block_hash(n), H256::zero(),);
+			assert_eq!(System::block_hash(n), H256::zero());
 		}
 
 		// the remaining 10 are kept
 		for n in 5..15 {
-			assert_eq!(System::block_hash(n), [n as u8; 32].into(),);
+			assert_eq!(System::block_hash(n), [n as u8; 32].into());
 		}
 	})
 }
diff --git a/frame/timestamp/src/benchmarking.rs b/frame/timestamp/src/benchmarking.rs
index 84391380da83..97ddd4cddd63 100644
--- a/frame/timestamp/src/benchmarking.rs
+++ b/frame/timestamp/src/benchmarking.rs
@@ -57,4 +57,4 @@ benchmarks! {
 	}
 }
 
-impl_benchmark_test_suite!(Timestamp, crate::tests::new_test_ext(), crate::tests::Test,);
+impl_benchmark_test_suite!(Timestamp, crate::tests::new_test_ext(), crate::tests::Test);
diff --git a/frame/tips/src/benchmarking.rs b/frame/tips/src/benchmarking.rs
index 794a6815b3a3..2c51f6394a52 100644
--- a/frame/tips/src/benchmarking.rs
+++ b/frame/tips/src/benchmarking.rs
@@ -192,4 +192,4 @@ benchmarks! {
 	}: _(RawOrigin::Root, hash)
 }
 
-impl_benchmark_test_suite!(TipsMod, crate::tests::new_test_ext(), crate::tests::Test,);
+impl_benchmark_test_suite!(TipsMod, crate::tests::new_test_ext(), crate::tests::Test);
diff --git a/frame/tips/src/tests.rs b/frame/tips/src/tests.rs
index eb52acf8026b..ac5793256381 100644
--- a/frame/tips/src/tests.rs
+++ b/frame/tips/src/tests.rs
@@ -314,7 +314,7 @@ fn slash_tip_works() {
 		assert_eq!(last_event(), RawEvent::NewTip(h));
 
 		// can't remove from any origin
-		assert_noop!(TipsModTestInst::slash_tip(Origin::signed(0), h.clone()), BadOrigin,);
+		assert_noop!(TipsModTestInst::slash_tip(Origin::signed(0), h.clone()), BadOrigin);
 
 		// can remove from root.
 		assert_ok!(TipsModTestInst::slash_tip(Origin::root(), h.clone()));
diff --git a/frame/transaction-storage/src/benchmarking.rs b/frame/transaction-storage/src/benchmarking.rs
index 64081c3202c0..d5da6a42b46f 100644
--- a/frame/transaction-storage/src/benchmarking.rs
+++ b/frame/transaction-storage/src/benchmarking.rs
@@ -145,4 +145,4 @@ benchmarks! {
 	}
 }
 
-impl_benchmark_test_suite!(TransactionStorage, crate::mock::new_test_ext(), crate::mock::Test,);
+impl_benchmark_test_suite!(TransactionStorage, crate::mock::new_test_ext(), crate::mock::Test);
diff --git a/frame/treasury/src/benchmarking.rs b/frame/treasury/src/benchmarking.rs
index 98fed2c6a536..2fe0bad704f2 100644
--- a/frame/treasury/src/benchmarking.rs
+++ b/frame/treasury/src/benchmarking.rs
@@ -96,4 +96,4 @@ benchmarks_instance_pallet! {
 	}
 }
 
-impl_benchmark_test_suite!(Treasury, crate::tests::new_test_ext(), crate::tests::Test,);
+impl_benchmark_test_suite!(Treasury, crate::tests::new_test_ext(), crate::tests::Test);
diff --git a/frame/utility/src/benchmarking.rs b/frame/utility/src/benchmarking.rs
index ae4eb68661ea..9fd0184b8fa3 100644
--- a/frame/utility/src/benchmarking.rs
+++ b/frame/utility/src/benchmarking.rs
@@ -65,4 +65,4 @@ benchmarks! {
 	}
 }
 
-impl_benchmark_test_suite!(Pallet, crate::tests::new_test_ext(), crate::tests::Test,);
+impl_benchmark_test_suite!(Pallet, crate::tests::new_test_ext(), crate::tests::Test);
diff --git a/primitives/api/test/tests/decl_and_impl.rs b/primitives/api/test/tests/decl_and_impl.rs
index 5eeb2a6a771e..ae24ed1cb8fe 100644
--- a/primitives/api/test/tests/decl_and_impl.rs
+++ b/primitives/api/test/tests/decl_and_impl.rs
@@ -193,7 +193,7 @@ fn check_runtime_api_versions() {
 fn mock_runtime_api_has_api() {
 	let mock = MockApi { block: None };
 
-	assert!(mock.has_api::<dyn ApiWithCustomVersion<Block>>(&BlockId::Number(0)).unwrap(),);
+	assert!(mock.has_api::<dyn ApiWithCustomVersion<Block>>(&BlockId::Number(0)).unwrap());
 	assert!(mock.has_api::<dyn Api<Block>>(&BlockId::Number(0)).unwrap());
 }
 
diff --git a/primitives/arithmetic/fuzzer/src/normalize.rs b/primitives/arithmetic/fuzzer/src/normalize.rs
index 7f9f8cb3c79e..2662565106e6 100644
--- a/primitives/arithmetic/fuzzer/src/normalize.rs
+++ b/primitives/arithmetic/fuzzer/src/normalize.rs
@@ -51,7 +51,7 @@ fn main() {
 					let sum: u128 = normalized.iter().map(|x| *x as u128).sum();
 
 					// if this function returns Ok(), then it will ALWAYS be accurate.
-					assert_eq!(sum, norm as u128, "sums don't match {:?}, {}", normalized, norm,);
+					assert_eq!(sum, norm as u128, "sums don't match {:?}, {}", normalized, norm);
 				} else {
 					panic!("Should have returned Ok for input = {:?}, target = {:?}", data, norm);
 				}
diff --git a/primitives/arithmetic/src/biguint.rs b/primitives/arithmetic/src/biguint.rs
index 2360151dafad..17ed323dc0ce 100644
--- a/primitives/arithmetic/src/biguint.rs
+++ b/primitives/arithmetic/src/biguint.rs
@@ -639,9 +639,9 @@ pub mod tests {
 
 	#[test]
 	fn equality_works() {
-		assert_eq!(BigUint { digits: vec![1, 2, 3] } == BigUint { digits: vec![1, 2, 3] }, true,);
-		assert_eq!(BigUint { digits: vec![3, 2, 3] } == BigUint { digits: vec![1, 2, 3] }, false,);
-		assert_eq!(BigUint { digits: vec![0, 1, 2, 3] } == BigUint { digits: vec![1, 2, 3] }, true,);
+		assert_eq!(BigUint { digits: vec![1, 2, 3] } == BigUint { digits: vec![1, 2, 3] }, true);
+		assert_eq!(BigUint { digits: vec![3, 2, 3] } == BigUint { digits: vec![1, 2, 3] }, false);
+		assert_eq!(BigUint { digits: vec![0, 1, 2, 3] } == BigUint { digits: vec![1, 2, 3] }, true);
 	}
 
 	#[test]
@@ -667,7 +667,7 @@ pub mod tests {
 		use sp_std::convert::TryFrom;
 		assert_eq!(u64::try_from(with_limbs(1)).unwrap(), 1);
 		assert_eq!(u64::try_from(with_limbs(2)).unwrap(), u32::MAX as u64 + 2);
-		assert_eq!(u64::try_from(with_limbs(3)).unwrap_err(), "cannot fit a number into u64",);
+		assert_eq!(u64::try_from(with_limbs(3)).unwrap_err(), "cannot fit a number into u64");
 		assert_eq!(u128::try_from(with_limbs(3)).unwrap(), u32::MAX as u128 + u64::MAX as u128 + 3);
 	}
 
diff --git a/primitives/arithmetic/src/lib.rs b/primitives/arithmetic/src/lib.rs
index cf2e8a1a6064..8671ceb0396e 100644
--- a/primitives/arithmetic/src/lib.rs
+++ b/primitives/arithmetic/src/lib.rs
@@ -300,13 +300,13 @@ mod normalize_tests {
 	#[test]
 	fn fails_on_if_input_sum_large() {
 		assert!(normalize(vec![1u8; 255].as_ref(), 10).is_ok());
-		assert_eq!(normalize(vec![1u8; 256].as_ref(), 10), Err("sum of input cannot fit in `T`"),);
+		assert_eq!(normalize(vec![1u8; 256].as_ref(), 10), Err("sum of input cannot fit in `T`"));
 	}
 
 	#[test]
 	fn does_not_fail_on_subtraction_overflow() {
-		assert_eq!(normalize(vec![1u8, 100, 100].as_ref(), 10).unwrap(), vec![1, 9, 0],);
-		assert_eq!(normalize(vec![1u8, 8, 9].as_ref(), 1).unwrap(), vec![0, 1, 0],);
+		assert_eq!(normalize(vec![1u8, 100, 100].as_ref(), 10).unwrap(), vec![1, 9, 0]);
+		assert_eq!(normalize(vec![1u8, 8, 9].as_ref(), 1).unwrap(), vec![0, 1, 0]);
 	}
 
 	#[test]
@@ -358,40 +358,40 @@ mod normalize_tests {
 
 	#[test]
 	fn normalize_works_all_le() {
-		assert_eq!(normalize(vec![8u32, 9, 7, 10].as_ref(), 40).unwrap(), vec![10, 10, 10, 10],);
+		assert_eq!(normalize(vec![8u32, 9, 7, 10].as_ref(), 40).unwrap(), vec![10, 10, 10, 10]);
 
-		assert_eq!(normalize(vec![7u32, 7, 7, 7].as_ref(), 40).unwrap(), vec![10, 10, 10, 10],);
+		assert_eq!(normalize(vec![7u32, 7, 7, 7].as_ref(), 40).unwrap(), vec![10, 10, 10, 10]);
 
-		assert_eq!(normalize(vec![7u32, 7, 7, 10].as_ref(), 40).unwrap(), vec![11, 11, 8, 10],);
+		assert_eq!(normalize(vec![7u32, 7, 7, 10].as_ref(), 40).unwrap(), vec![11, 11, 8, 10]);
 
-		assert_eq!(normalize(vec![7u32, 8, 7, 10].as_ref(), 40).unwrap(), vec![11, 8, 11, 10],);
+		assert_eq!(normalize(vec![7u32, 8, 7, 10].as_ref(), 40).unwrap(), vec![11, 8, 11, 10]);
 
-		assert_eq!(normalize(vec![7u32, 7, 8, 10].as_ref(), 40).unwrap(), vec![11, 11, 8, 10],);
+		assert_eq!(normalize(vec![7u32, 7, 8, 10].as_ref(), 40).unwrap(), vec![11, 11, 8, 10]);
 	}
 
 	#[test]
 	fn normalize_works_some_ge() {
-		assert_eq!(normalize(vec![8u32, 11, 9, 10].as_ref(), 40).unwrap(), vec![10, 11, 9, 10],);
+		assert_eq!(normalize(vec![8u32, 11, 9, 10].as_ref(), 40).unwrap(), vec![10, 11, 9, 10]);
 	}
 
 	#[test]
 	fn always_inc_min() {
-		assert_eq!(normalize(vec![10u32, 7, 10, 10].as_ref(), 40).unwrap(), vec![10, 10, 10, 10],);
-		assert_eq!(normalize(vec![10u32, 10, 7, 10].as_ref(), 40).unwrap(), vec![10, 10, 10, 10],);
-		assert_eq!(normalize(vec![10u32, 10, 10, 7].as_ref(), 40).unwrap(), vec![10, 10, 10, 10],);
+		assert_eq!(normalize(vec![10u32, 7, 10, 10].as_ref(), 40).unwrap(), vec![10, 10, 10, 10]);
+		assert_eq!(normalize(vec![10u32, 10, 7, 10].as_ref(), 40).unwrap(), vec![10, 10, 10, 10]);
+		assert_eq!(normalize(vec![10u32, 10, 10, 7].as_ref(), 40).unwrap(), vec![10, 10, 10, 10]);
 	}
 
 	#[test]
 	fn normalize_works_all_ge() {
-		assert_eq!(normalize(vec![12u32, 11, 13, 10].as_ref(), 40).unwrap(), vec![10, 10, 10, 10],);
+		assert_eq!(normalize(vec![12u32, 11, 13, 10].as_ref(), 40).unwrap(), vec![10, 10, 10, 10]);
 
-		assert_eq!(normalize(vec![13u32, 13, 13, 13].as_ref(), 40).unwrap(), vec![10, 10, 10, 10],);
+		assert_eq!(normalize(vec![13u32, 13, 13, 13].as_ref(), 40).unwrap(), vec![10, 10, 10, 10]);
 
-		assert_eq!(normalize(vec![13u32, 13, 13, 10].as_ref(), 40).unwrap(), vec![12, 9, 9, 10],);
+		assert_eq!(normalize(vec![13u32, 13, 13, 10].as_ref(), 40).unwrap(), vec![12, 9, 9, 10]);
 
-		assert_eq!(normalize(vec![13u32, 12, 13, 10].as_ref(), 40).unwrap(), vec![9, 12, 9, 10],);
+		assert_eq!(normalize(vec![13u32, 12, 13, 10].as_ref(), 40).unwrap(), vec![9, 12, 9, 10]);
 
-		assert_eq!(normalize(vec![13u32, 13, 12, 10].as_ref(), 40).unwrap(), vec![9, 9, 12, 10],);
+		assert_eq!(normalize(vec![13u32, 13, 12, 10].as_ref(), 40).unwrap(), vec![9, 9, 12, 10]);
 	}
 }
 
diff --git a/primitives/arithmetic/src/rational.rs b/primitives/arithmetic/src/rational.rs
index a15f5ac8c165..225e1d952182 100644
--- a/primitives/arithmetic/src/rational.rs
+++ b/primitives/arithmetic/src/rational.rs
@@ -389,7 +389,7 @@ mod tests {
 			r(7, MAX128).checked_sub(r(MAX128, MAX128)),
 			Err("overflow while subtracting numerators"),
 		);
-		assert_eq!(r(1, 10).checked_sub(r(2, 10)), Err("overflow while subtracting numerators"),);
+		assert_eq!(r(1, 10).checked_sub(r(2, 10)), Err("overflow while subtracting numerators"));
 	}
 
 	#[test]
@@ -433,8 +433,8 @@ mod tests {
 			(MAX128 / 1000 * 555) + (455 * 555 / 1000),
 		);
 
-		assert_eq!(multiply_by_rational(2 * MAX64 - 1, MAX64, MAX64).unwrap(), 2 * MAX64 - 1,);
-		assert_eq!(multiply_by_rational(2 * MAX64 - 1, MAX64 - 1, MAX64).unwrap(), 2 * MAX64 - 3,);
+		assert_eq!(multiply_by_rational(2 * MAX64 - 1, MAX64, MAX64).unwrap(), 2 * MAX64 - 1);
+		assert_eq!(multiply_by_rational(2 * MAX64 - 1, MAX64 - 1, MAX64).unwrap(), 2 * MAX64 - 3);
 
 		assert_eq!(
 			multiply_by_rational(MAX64 + 100, MAX64_2, MAX64_2 / 2).unwrap(),
@@ -449,7 +449,7 @@ mod tests {
 			multiply_by_rational(2u128.pow(66) - 1, 2u128.pow(65) - 1, 2u128.pow(65)).unwrap(),
 			73786976294838206461,
 		);
-		assert_eq!(multiply_by_rational(1_000_000_000, MAX128 / 8, MAX128 / 2).unwrap(), 250000000,);
+		assert_eq!(multiply_by_rational(1_000_000_000, MAX128 / 8, MAX128 / 2).unwrap(), 250000000);
 
 		assert_eq!(
 			multiply_by_rational(
@@ -464,8 +464,8 @@ mod tests {
 
 	#[test]
 	fn multiply_by_rational_a_b_are_interchangeable() {
-		assert_eq!(multiply_by_rational(10, MAX128, MAX128 / 2), Ok(20),);
-		assert_eq!(multiply_by_rational(MAX128, 10, MAX128 / 2), Ok(20),);
+		assert_eq!(multiply_by_rational(10, MAX128, MAX128 / 2), Ok(20));
+		assert_eq!(multiply_by_rational(MAX128, 10, MAX128 / 2), Ok(20));
 	}
 
 	#[test]
diff --git a/primitives/core/src/offchain/testing.rs b/primitives/core/src/offchain/testing.rs
index ce88ece07da1..30150918313f 100644
--- a/primitives/core/src/offchain/testing.rs
+++ b/primitives/core/src/offchain/testing.rs
@@ -150,7 +150,7 @@ impl OffchainState {
 				panic!("Missing pending request: {:?}.\n\nAll: {:?}", id, self.requests);
 			},
 			Some(req) => {
-				assert_eq!(*req, expected,);
+				assert_eq!(*req, expected);
 				req.response = Some(response.into());
 				req.response_headers = response_headers.into_iter().collect();
 			},
diff --git a/primitives/inherents/src/lib.rs b/primitives/inherents/src/lib.rs
index 922d5d194327..a2b533641b5a 100644
--- a/primitives/inherents/src/lib.rs
+++ b/primitives/inherents/src/lib.rs
@@ -462,7 +462,7 @@ mod tests {
 
 		let inherent_data = provider.create_inherent_data().unwrap();
 
-		assert_eq!(inherent_data.get_data::<u32>(&TEST_INHERENT_0).unwrap().unwrap(), 42u32,);
+		assert_eq!(inherent_data.get_data::<u32>(&TEST_INHERENT_0).unwrap().unwrap(), 42u32);
 	}
 
 	#[test]
diff --git a/primitives/io/src/lib.rs b/primitives/io/src/lib.rs
index d1aa9c489491..8ecbd1722017 100644
--- a/primitives/io/src/lib.rs
+++ b/primitives/io/src/lib.rs
@@ -1108,7 +1108,7 @@ pub trait Logging {
 	/// Instead of using directly, prefer setting up `RuntimeLogger` and using `log` macros.
 	fn log(level: LogLevel, target: &str, message: &[u8]) {
 		if let Ok(message) = std::str::from_utf8(message) {
-			log::log!(target: target, log::Level::from(level), "{}", message,)
+			log::log!(target: target, log::Level::from(level), "{}", message)
 		}
 	}
 
diff --git a/primitives/npos-elections/src/node.rs b/primitives/npos-elections/src/node.rs
index ac03f547d2cb..62b728d52258 100644
--- a/primitives/npos-elections/src/node.rs
+++ b/primitives/npos-elections/src/node.rs
@@ -191,20 +191,20 @@ mod tests {
 		Node::set_parent_of(&e, &a);
 		Node::set_parent_of(&a, &d);
 
-		assert_eq!(Node::root(&e), (d.clone(), vec![e.clone(), a.clone(), d.clone()]),);
+		assert_eq!(Node::root(&e), (d.clone(), vec![e.clone(), a.clone(), d.clone()]));
 
-		assert_eq!(Node::root(&a), (d.clone(), vec![a.clone(), d.clone()]),);
+		assert_eq!(Node::root(&a), (d.clone(), vec![a.clone(), d.clone()]));
 
-		assert_eq!(Node::root(&c), (d.clone(), vec![c.clone(), b.clone(), a.clone(), d.clone()]),);
+		assert_eq!(Node::root(&c), (d.clone(), vec![c.clone(), b.clone(), a.clone(), d.clone()]));
 
 		// 	D 	    A <-- B <-- C
 		// 	F <-- /	\
 		// 			 <-- E
 		Node::set_parent_of(&a, &f);
 
-		assert_eq!(Node::root(&a), (f.clone(), vec![a.clone(), f.clone()]),);
+		assert_eq!(Node::root(&a), (f.clone(), vec![a.clone(), f.clone()]));
 
-		assert_eq!(Node::root(&c), (f.clone(), vec![c.clone(), b.clone(), a.clone(), f.clone()]),);
+		assert_eq!(Node::root(&c), (f.clone(), vec![c.clone(), b.clone(), a.clone(), f.clone()]));
 	}
 
 	#[test]
diff --git a/primitives/npos-elections/src/tests.rs b/primitives/npos-elections/src/tests.rs
index ee67095307c2..da6b417b613e 100644
--- a/primitives/npos-elections/src/tests.rs
+++ b/primitives/npos-elections/src/tests.rs
@@ -747,7 +747,7 @@ mod assignment_convert_normalize {
 			}
 		);
 
-		assert_eq!(assignment.into_staked(125), staked,);
+		assert_eq!(assignment.into_staked(125), staked);
 	}
 
 	#[test]
@@ -817,7 +817,7 @@ mod assignment_convert_normalize {
 	fn staked_assignment_can_normalize() {
 		let mut a = StakedAssignment { who: 1, distribution: vec![(2, 33), (3, 66)] };
 		a.try_normalize(100).unwrap();
-		assert_eq!(a, StakedAssignment { who: 1, distribution: vec![(2, 34), (3, 66),] },);
+		assert_eq!(a, StakedAssignment { who: 1, distribution: vec![(2, 34), (3, 66),] });
 	}
 }
 
@@ -827,16 +827,16 @@ mod score {
 	fn score_comparison_is_lexicographical_no_epsilon() {
 		let epsilon = Perbill::zero();
 		// only better in the fist parameter, worse in the other two ✅
-		assert_eq!(is_score_better([12, 10, 35], [10, 20, 30], epsilon), true,);
+		assert_eq!(is_score_better([12, 10, 35], [10, 20, 30], epsilon), true);
 
 		// worse in the first, better in the other two ❌
-		assert_eq!(is_score_better([9, 30, 10], [10, 20, 30], epsilon), false,);
+		assert_eq!(is_score_better([9, 30, 10], [10, 20, 30], epsilon), false);
 
 		// equal in the first, the second one dictates.
-		assert_eq!(is_score_better([10, 25, 40], [10, 20, 30], epsilon), true,);
+		assert_eq!(is_score_better([10, 25, 40], [10, 20, 30], epsilon), true);
 
 		// equal in the first two, the last one dictates.
-		assert_eq!(is_score_better([10, 20, 40], [10, 20, 30], epsilon), false,);
+		assert_eq!(is_score_better([10, 20, 40], [10, 20, 30], epsilon), false);
 	}
 
 	#[test]
@@ -845,37 +845,37 @@ mod score {
 
 		{
 			// no more than 1 percent (10) better in the first param.
-			assert_eq!(is_score_better([1009, 5000, 100000], [1000, 5000, 100000], epsilon), false,);
+			assert_eq!(is_score_better([1009, 5000, 100000], [1000, 5000, 100000], epsilon), false);
 
 			// now equal, still not better.
-			assert_eq!(is_score_better([1010, 5000, 100000], [1000, 5000, 100000], epsilon), false,);
+			assert_eq!(is_score_better([1010, 5000, 100000], [1000, 5000, 100000], epsilon), false);
 
 			// now it is.
-			assert_eq!(is_score_better([1011, 5000, 100000], [1000, 5000, 100000], epsilon), true,);
+			assert_eq!(is_score_better([1011, 5000, 100000], [1000, 5000, 100000], epsilon), true);
 		}
 
 		{
 			// First score score is epsilon better, but first score is no longer `ge`. Then this is
 			// still not a good solution.
-			assert_eq!(is_score_better([999, 6000, 100000], [1000, 5000, 100000], epsilon), false,);
+			assert_eq!(is_score_better([999, 6000, 100000], [1000, 5000, 100000], epsilon), false);
 		}
 
 		{
 			// first score is equal or better, but not epsilon. Then second one is the determinant.
-			assert_eq!(is_score_better([1005, 5000, 100000], [1000, 5000, 100000], epsilon), false,);
+			assert_eq!(is_score_better([1005, 5000, 100000], [1000, 5000, 100000], epsilon), false);
 
-			assert_eq!(is_score_better([1005, 5050, 100000], [1000, 5000, 100000], epsilon), false,);
+			assert_eq!(is_score_better([1005, 5050, 100000], [1000, 5000, 100000], epsilon), false);
 
-			assert_eq!(is_score_better([1005, 5051, 100000], [1000, 5000, 100000], epsilon), true,);
+			assert_eq!(is_score_better([1005, 5051, 100000], [1000, 5000, 100000], epsilon), true);
 		}
 
 		{
 			// first score and second are equal or less than epsilon more, third is determinant.
-			assert_eq!(is_score_better([1005, 5025, 100000], [1000, 5000, 100000], epsilon), false,);
+			assert_eq!(is_score_better([1005, 5025, 100000], [1000, 5000, 100000], epsilon), false);
 
-			assert_eq!(is_score_better([1005, 5025, 99_000], [1000, 5000, 100000], epsilon), false,);
+			assert_eq!(is_score_better([1005, 5025, 99_000], [1000, 5000, 100000], epsilon), false);
 
-			assert_eq!(is_score_better([1005, 5025, 98_999], [1000, 5000, 100000], epsilon), true,);
+			assert_eq!(is_score_better([1005, 5025, 98_999], [1000, 5000, 100000], epsilon), true);
 		}
 	}
 
@@ -999,7 +999,7 @@ mod solution_type {
 
 		let encoded = compact.encode();
 
-		assert_eq!(compact, Decode::decode(&mut &encoded[..]).unwrap(),);
+		assert_eq!(compact, Decode::decode(&mut &encoded[..]).unwrap());
 		assert_eq!(compact.voter_count(), 4);
 		assert_eq!(compact.edge_count(), 2 + 4);
 		assert_eq!(compact.unique_targets(), vec![10, 11, 20, 40, 50, 51]);
@@ -1137,7 +1137,7 @@ mod solution_type {
 			}
 		);
 
-		assert_eq!(compacted.unique_targets(), vec![0, 1, 2, 3, 4, 5, 6, 7, 8],);
+		assert_eq!(compacted.unique_targets(), vec![0, 1, 2, 3, 4, 5, 6, 7, 8]);
 
 		let voter_at = |a: u32| -> Option<AccountId> {
 			voters.get(<u32 as TryInto<usize>>::try_into(a).unwrap()).cloned()
@@ -1146,7 +1146,7 @@ mod solution_type {
 			targets.get(<u8 as TryInto<usize>>::try_into(a).unwrap()).cloned()
 		};
 
-		assert_eq!(compacted.into_assignment(voter_at, target_at).unwrap(), assignments,);
+		assert_eq!(compacted.into_assignment(voter_at, target_at).unwrap(), assignments);
 	}
 
 	#[test]
diff --git a/primitives/runtime-interface/proc-macro/src/runtime_interface/bare_function_interface.rs b/primitives/runtime-interface/proc-macro/src/runtime_interface/bare_function_interface.rs
index 1943acbb214d..c951dedb6771 100644
--- a/primitives/runtime-interface/proc-macro/src/runtime_interface/bare_function_interface.rs
+++ b/primitives/runtime-interface/proc-macro/src/runtime_interface/bare_function_interface.rs
@@ -190,7 +190,7 @@ fn generate_call_to_trait(
 	let crate_ = generate_crate_access();
 	let method_name = create_function_ident_with_version(&method.sig.ident, version);
 	let expect_msg =
-		format!("`{}` called outside of an Externalities-provided environment.", method_name,);
+		format!("`{}` called outside of an Externalities-provided environment.", method_name);
 	let arg_names = get_function_argument_names(&method.sig);
 
 	if takes_self_argument(&method.sig) {
diff --git a/primitives/runtime-interface/proc-macro/src/utils.rs b/primitives/runtime-interface/proc-macro/src/utils.rs
index 02b5d23fbcac..42ce09c57393 100644
--- a/primitives/runtime-interface/proc-macro/src/utils.rs
+++ b/primitives/runtime-interface/proc-macro/src/utils.rs
@@ -116,14 +116,14 @@ pub fn create_exchangeable_host_function_ident(name: &Ident) -> Ident {
 /// Create the host function identifier for the given function name.
 pub fn create_host_function_ident(name: &Ident, version: u32, trait_name: &Ident) -> Ident {
 	Ident::new(
-		&format!("ext_{}_{}_version_{}", trait_name.to_string().to_snake_case(), name, version,),
+		&format!("ext_{}_{}_version_{}", trait_name.to_string().to_snake_case(), name, version),
 		Span::call_site(),
 	)
 }
 
 /// Create the host function identifier for the given function name.
 pub fn create_function_ident_with_version(name: &Ident, version: u32) -> Ident {
-	Ident::new(&format!("{}_version_{}", name, version,), Span::call_site())
+	Ident::new(&format!("{}_version_{}", name, version), Span::call_site())
 }
 
 /// Returns the function arguments of the given `Signature`, minus any `self` arguments.
diff --git a/primitives/runtime/src/lib.rs b/primitives/runtime/src/lib.rs
index 1baab238d8cc..ce24848792e3 100644
--- a/primitives/runtime/src/lib.rs
+++ b/primitives/runtime/src/lib.rs
@@ -929,7 +929,7 @@ mod tests {
 		let encoded = error.encode();
 		let decoded = DispatchError::decode(&mut &encoded[..]).unwrap();
 		assert_eq!(encoded, vec![3, 1, 2]);
-		assert_eq!(decoded, DispatchError::Module { index: 1, error: 2, message: None },);
+		assert_eq!(decoded, DispatchError::Module { index: 1, error: 2, message: None });
 	}
 
 	#[test]
diff --git a/primitives/sandbox/without_std.rs b/primitives/sandbox/without_std.rs
index 5897462629c4..d2836e2ffd1e 100755
--- a/primitives/sandbox/without_std.rs
+++ b/primitives/sandbox/without_std.rs
@@ -39,7 +39,7 @@ mod ffi {
 		// We need to ensure that sizes of a callable function pointer and host function index is
 		// indeed equal.
 		// We can't use `static_assertions` create because it makes compiler panic, fallback to runtime assert.
-		// const_assert!(mem::size_of::<HostFuncIndex>() == mem::size_of::<HostFuncType<T>>(),);
+		// const_assert!(mem::size_of::<HostFuncIndex>() == mem::size_of::<HostFuncType<T>>());
 		assert!(mem::size_of::<HostFuncIndex>() == mem::size_of::<HostFuncType<T>>());
 		mem::transmute::<HostFuncIndex, HostFuncType<T>>(idx)
 	}
diff --git a/primitives/state-machine/src/ext.rs b/primitives/state-machine/src/ext.rs
index cf7cbd413b1f..e5dee790918b 100644
--- a/primitives/state-machine/src/ext.rs
+++ b/primitives/state-machine/src/ext.rs
@@ -1118,7 +1118,7 @@ mod tests {
 		);
 
 		assert_eq!(ext.child_storage(child_info, &[20]), None);
-		assert_eq!(ext.child_storage_hash(child_info, &[20]), None,);
+		assert_eq!(ext.child_storage_hash(child_info, &[20]), None);
 
 		assert_eq!(ext.child_storage(child_info, &[30]), Some(vec![31]));
 		assert_eq!(
diff --git a/primitives/state-machine/src/lib.rs b/primitives/state-machine/src/lib.rs
index e2162df5cfd1..924ceaf9d872 100644
--- a/primitives/state-machine/src/lib.rs
+++ b/primitives/state-machine/src/lib.rs
@@ -1062,7 +1062,7 @@ mod tests {
 			TaskExecutor::new(),
 		);
 
-		assert_eq!(state_machine.execute(ExecutionStrategy::NativeWhenPossible).unwrap(), vec![66],);
+		assert_eq!(state_machine.execute(ExecutionStrategy::NativeWhenPossible).unwrap(), vec![66]);
 	}
 
 	#[test]
@@ -1365,7 +1365,7 @@ mod tests {
 			);
 
 			ext.storage_append(key.clone(), reference_data[0].encode());
-			assert_eq!(ext.storage(key.as_slice()), Some(vec![reference_data[0].clone()].encode()),);
+			assert_eq!(ext.storage(key.as_slice()), Some(vec![reference_data[0].clone()].encode()));
 		}
 		overlay.start_transaction();
 		{
@@ -1380,7 +1380,7 @@ mod tests {
 			for i in reference_data.iter().skip(1) {
 				ext.storage_append(key.clone(), i.encode());
 			}
-			assert_eq!(ext.storage(key.as_slice()), Some(reference_data.encode()),);
+			assert_eq!(ext.storage(key.as_slice()), Some(reference_data.encode()));
 		}
 		overlay.rollback_transaction().unwrap();
 		{
@@ -1391,7 +1391,7 @@ mod tests {
 				changes_trie::disabled_state::<_, u64>(),
 				None,
 			);
-			assert_eq!(ext.storage(key.as_slice()), Some(vec![reference_data[0].clone()].encode()),);
+			assert_eq!(ext.storage(key.as_slice()), Some(vec![reference_data[0].clone()].encode()));
 		}
 	}
 
@@ -1434,7 +1434,7 @@ mod tests {
 				None,
 			);
 
-			assert_eq!(ext.storage(key.as_slice()), Some(vec![Item::InitializationItem].encode()),);
+			assert_eq!(ext.storage(key.as_slice()), Some(vec![Item::InitializationItem].encode()));
 
 			ext.storage_append(key.clone(), Item::DiscardedItem.encode());
 
@@ -1455,7 +1455,7 @@ mod tests {
 				None,
 			);
 
-			assert_eq!(ext.storage(key.as_slice()), Some(vec![Item::InitializationItem].encode()),);
+			assert_eq!(ext.storage(key.as_slice()), Some(vec![Item::InitializationItem].encode()));
 
 			ext.storage_append(key.clone(), Item::CommitedItem.encode());
 
@@ -1536,7 +1536,7 @@ mod tests {
 			local_result1.into_iter().collect::<Vec<_>>(),
 			vec![(b"value3".to_vec(), Some(vec![142]))],
 		);
-		assert_eq!(local_result2.into_iter().collect::<Vec<_>>(), vec![(b"value2".to_vec(), None)],);
+		assert_eq!(local_result2.into_iter().collect::<Vec<_>>(), vec![(b"value2".to_vec(), None)]);
 	}
 
 	#[test]
diff --git a/test-utils/runtime/client/src/trait_tests.rs b/test-utils/runtime/client/src/trait_tests.rs
index ef3555f704a6..c5e0ba49fcf5 100644
--- a/test-utils/runtime/client/src/trait_tests.rs
+++ b/test-utils/runtime/client/src/trait_tests.rs
@@ -56,7 +56,7 @@ where
 	// G -> A1
 	let a1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
-	assert_eq!(blockchain.leaves().unwrap(), vec![a1.hash()],);
+	assert_eq!(blockchain.leaves().unwrap(), vec![a1.hash()]);
 
 	// A1 -> A2
 	let a2 = client
@@ -68,7 +68,7 @@ where
 	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
 	#[allow(deprecated)]
-	assert_eq!(blockchain.leaves().unwrap(), vec![a2.hash()],);
+	assert_eq!(blockchain.leaves().unwrap(), vec![a2.hash()]);
 
 	// A2 -> A3
 	let a3 = client
@@ -79,7 +79,7 @@ where
 		.block;
 	block_on(client.import(BlockOrigin::Own, a3.clone())).unwrap();
 
-	assert_eq!(blockchain.leaves().unwrap(), vec![a3.hash()],);
+	assert_eq!(blockchain.leaves().unwrap(), vec![a3.hash()]);
 
 	// A3 -> A4
 	let a4 = client
@@ -89,7 +89,7 @@ where
 		.unwrap()
 		.block;
 	block_on(client.import(BlockOrigin::Own, a4.clone())).unwrap();
-	assert_eq!(blockchain.leaves().unwrap(), vec![a4.hash()],);
+	assert_eq!(blockchain.leaves().unwrap(), vec![a4.hash()]);
 
 	// A4 -> A5
 	let a5 = client
@@ -100,7 +100,7 @@ where
 		.block;
 
 	block_on(client.import(BlockOrigin::Own, a5.clone())).unwrap();
-	assert_eq!(blockchain.leaves().unwrap(), vec![a5.hash()],);
+	assert_eq!(blockchain.leaves().unwrap(), vec![a5.hash()]);
 
 	// A1 -> B2
 	let mut builder = client
@@ -118,7 +118,7 @@ where
 		.unwrap();
 	let b2 = builder.build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, b2.clone())).unwrap();
-	assert_eq!(blockchain.leaves().unwrap(), vec![a5.hash(), b2.hash()],);
+	assert_eq!(blockchain.leaves().unwrap(), vec![a5.hash(), b2.hash()]);
 
 	// B2 -> B3
 	let b3 = client
@@ -129,7 +129,7 @@ where
 		.block;
 
 	block_on(client.import(BlockOrigin::Own, b3.clone())).unwrap();
-	assert_eq!(blockchain.leaves().unwrap(), vec![a5.hash(), b3.hash()],);
+	assert_eq!(blockchain.leaves().unwrap(), vec![a5.hash(), b3.hash()]);
 
 	// B3 -> B4
 	let b4 = client
@@ -139,7 +139,7 @@ where
 		.unwrap()
 		.block;
 	block_on(client.import(BlockOrigin::Own, b4.clone())).unwrap();
-	assert_eq!(blockchain.leaves().unwrap(), vec![a5.hash(), b4.hash()],);
+	assert_eq!(blockchain.leaves().unwrap(), vec![a5.hash(), b4.hash()]);
 
 	// // B2 -> C3
 	let mut builder = client
@@ -156,7 +156,7 @@ where
 		.unwrap();
 	let c3 = builder.build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, c3.clone())).unwrap();
-	assert_eq!(blockchain.leaves().unwrap(), vec![a5.hash(), b4.hash(), c3.hash()],);
+	assert_eq!(blockchain.leaves().unwrap(), vec![a5.hash(), b4.hash(), c3.hash()]);
 
 	// A1 -> D2
 	let mut builder = client
@@ -173,7 +173,7 @@ where
 		.unwrap();
 	let d2 = builder.build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, d2.clone())).unwrap();
-	assert_eq!(blockchain.leaves().unwrap(), vec![a5.hash(), b4.hash(), c3.hash(), d2.hash()],);
+	assert_eq!(blockchain.leaves().unwrap(), vec![a5.hash(), b4.hash(), c3.hash(), d2.hash()]);
 }
 
 /// helper to test the `children` implementation for various backends
diff --git a/utils/fork-tree/src/lib.rs b/utils/fork-tree/src/lib.rs
index f22d54d3d1a4..bbcea262d467 100644
--- a/utils/fork-tree/src/lib.rs
+++ b/utils/fork-tree/src/lib.rs
@@ -980,22 +980,22 @@ mod test {
 
 		tree.finalize_root(&"A");
 
-		assert_eq!(tree.best_finalized_number, Some(1),);
+		assert_eq!(tree.best_finalized_number, Some(1));
 
-		assert_eq!(tree.import("A", 1, (), &is_descendent_of), Err(Error::Revert),);
+		assert_eq!(tree.import("A", 1, (), &is_descendent_of), Err(Error::Revert));
 	}
 
 	#[test]
 	fn import_doesnt_add_duplicates() {
 		let (mut tree, is_descendent_of) = test_fork_tree();
 
-		assert_eq!(tree.import("A", 1, (), &is_descendent_of), Err(Error::Duplicate),);
+		assert_eq!(tree.import("A", 1, (), &is_descendent_of), Err(Error::Duplicate));
 
-		assert_eq!(tree.import("I", 4, (), &is_descendent_of), Err(Error::Duplicate),);
+		assert_eq!(tree.import("I", 4, (), &is_descendent_of), Err(Error::Duplicate));
 
-		assert_eq!(tree.import("G", 3, (), &is_descendent_of), Err(Error::Duplicate),);
+		assert_eq!(tree.import("G", 3, (), &is_descendent_of), Err(Error::Duplicate));
 
-		assert_eq!(tree.import("K", 3, (), &is_descendent_of), Err(Error::Duplicate),);
+		assert_eq!(tree.import("K", 3, (), &is_descendent_of), Err(Error::Duplicate));
 	}
 
 	#[test]
@@ -1057,7 +1057,7 @@ mod test {
 		let original_roots = tree.roots.clone();
 
 		// finalizing a block prior to any in the node doesn't change the tree
-		assert_eq!(tree.finalize(&"0", 0, &is_descendent_of), Ok(FinalizationResult::Unchanged),);
+		assert_eq!(tree.finalize(&"0", 0, &is_descendent_of), Ok(FinalizationResult::Unchanged));
 
 		assert_eq!(tree.roots, original_roots);
 
@@ -1073,12 +1073,12 @@ mod test {
 		);
 
 		// finalizing anything lower than what we observed will fail
-		assert_eq!(tree.best_finalized_number, Some(1),);
+		assert_eq!(tree.best_finalized_number, Some(1));
 
-		assert_eq!(tree.finalize(&"Z", 1, &is_descendent_of), Err(Error::Revert),);
+		assert_eq!(tree.finalize(&"Z", 1, &is_descendent_of), Err(Error::Revert));
 
 		// trying to finalize a node without finalizing its ancestors first will fail
-		assert_eq!(tree.finalize(&"H", 3, &is_descendent_of), Err(Error::UnfinalizedAncestor),);
+		assert_eq!(tree.finalize(&"H", 3, &is_descendent_of), Err(Error::UnfinalizedAncestor));
 
 		// after finalizing "F" we can finalize "H"
 		assert_eq!(
@@ -1144,7 +1144,7 @@ mod test {
 			vec![("L", 4), ("I", 4)],
 		);
 
-		assert_eq!(tree.best_finalized_number, Some(3),);
+		assert_eq!(tree.best_finalized_number, Some(3));
 
 		// finalizing N (which is not a part of the tree):
 		// 1) removes roots that are not ancestors/descendants of N (I)
@@ -1161,7 +1161,7 @@ mod test {
 			vec![],
 		);
 
-		assert_eq!(tree.best_finalized_number, Some(6),);
+		assert_eq!(tree.best_finalized_number, Some(6));
 	}
 
 	#[test]
@@ -1327,7 +1327,7 @@ mod test {
 				Ok(Some(false)),
 			);
 
-			assert_eq!(n_is_descendent_of_calls.load(Ordering::SeqCst), 1,);
+			assert_eq!(n_is_descendent_of_calls.load(Ordering::SeqCst), 1);
 		}
 
 		n_is_descendent_of_calls.store(0, Ordering::SeqCst);
@@ -1350,7 +1350,7 @@ mod test {
 				Ok(FinalizationResult::Changed(Some(10))),
 			);
 
-			assert_eq!(n_is_descendent_of_calls.load(Ordering::SeqCst), 1,);
+			assert_eq!(n_is_descendent_of_calls.load(Ordering::SeqCst), 1);
 		}
 	}
 
@@ -1377,7 +1377,7 @@ mod test {
 
 		let removed = tree.prune(&"C", &3, &is_descendent_of, &|_| true).unwrap();
 
-		assert_eq!(tree.roots.iter().map(|node| node.hash).collect::<Vec<_>>(), vec!["B"],);
+		assert_eq!(tree.roots.iter().map(|node| node.hash).collect::<Vec<_>>(), vec!["B"]);
 
 		assert_eq!(
 			tree.iter().map(|(hash, _, _)| *hash).collect::<Vec<_>>(),
@@ -1391,9 +1391,9 @@ mod test {
 
 		let removed = tree.prune(&"E", &5, &is_descendent_of, &|_| true).unwrap();
 
-		assert_eq!(tree.roots.iter().map(|node| node.hash).collect::<Vec<_>>(), vec!["D"],);
+		assert_eq!(tree.roots.iter().map(|node| node.hash).collect::<Vec<_>>(), vec!["D"]);
 
-		assert_eq!(tree.iter().map(|(hash, _, _)| *hash).collect::<Vec<_>>(), vec!["D", "E"],);
+		assert_eq!(tree.iter().map(|(hash, _, _)| *hash).collect::<Vec<_>>(), vec!["D", "E"]);
 
 		assert_eq!(removed.map(|(hash, _, _)| hash).collect::<Vec<_>>(), vec!["B", "C"]);
 	}
diff --git a/utils/frame/remote-externalities/src/lib.rs b/utils/frame/remote-externalities/src/lib.rs
index 0ad6ae578b06..53c44780a682 100644
--- a/utils/frame/remote-externalities/src/lib.rs
+++ b/utils/frame/remote-externalities/src/lib.rs
@@ -344,7 +344,7 @@ impl<B: BlockT> Builder<B> {
 
 	/// initialize `Self` from state snapshot. Panics if the file does not exist.
 	fn load_state_snapshot(&self, path: &Path) -> Result<Vec<KeyPair>, &'static str> {
-		info!(target: LOG_TARGET, "scraping key-pairs from state snapshot {:?}", path,);
+		info!(target: LOG_TARGET, "scraping key-pairs from state snapshot {:?}", path);
 		let bytes = fs::read(path).map_err(|_| "fs::read failed.")?;
 		Decode::decode(&mut &*bytes).map_err(|_| "decode failed")
 	}
diff --git a/utils/wasm-builder/src/wasm_project.rs b/utils/wasm-builder/src/wasm_project.rs
index 60b0d76fd0c9..4824991aca39 100644
--- a/utils/wasm-builder/src/wasm_project.rs
+++ b/utils/wasm-builder/src/wasm_project.rs
@@ -489,7 +489,7 @@ fn compact_wasm_file(
 			wasm_binary_name.clone().unwrap_or_else(|| default_wasm_binary_name.clone());
 
 		let wasm_compact_compressed_file =
-			project.join(format!("{}.compact.compressed.wasm", file_name,));
+			project.join(format!("{}.compact.compressed.wasm", file_name));
 
 		if compress_wasm(&compact_binary.0, &wasm_compact_compressed_file) {
 			Some(WasmBinary(wasm_compact_compressed_file))

From 5b55e01046cc78e0fd2dec962f73aabce676e8c4 Mon Sep 17 00:00:00 2001
From: Xiliang Chen <xlchen1291@gmail.com>
Date: Fri, 23 Jul 2021 00:59:23 +1200
Subject: [PATCH 1012/1194] add CheckedRem (#9412)

* add CheckedRem

* fix
---
 primitives/arithmetic/src/traits.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/primitives/arithmetic/src/traits.rs b/primitives/arithmetic/src/traits.rs
index a441a0dcbc08..53341117b1fe 100644
--- a/primitives/arithmetic/src/traits.rs
+++ b/primitives/arithmetic/src/traits.rs
@@ -20,8 +20,8 @@
 use codec::HasCompact;
 pub use integer_sqrt::IntegerSquareRoot;
 pub use num_traits::{
-	checked_pow, Bounded, CheckedAdd, CheckedDiv, CheckedMul, CheckedNeg, CheckedShl, CheckedShr,
-	CheckedSub, One, Signed, Unsigned, Zero,
+	checked_pow, Bounded, CheckedAdd, CheckedDiv, CheckedMul, CheckedNeg, CheckedRem, CheckedShl,
+	CheckedShr, CheckedSub, One, Signed, Unsigned, Zero,
 };
 use sp_std::{
 	self,
@@ -55,6 +55,7 @@ pub trait BaseArithmetic:
 	+ CheckedSub
 	+ CheckedMul
 	+ CheckedDiv
+	+ CheckedRem
 	+ Saturating
 	+ PartialOrd<Self>
 	+ Ord
@@ -109,6 +110,7 @@ impl<
 			+ CheckedSub
 			+ CheckedMul
 			+ CheckedDiv
+			+ CheckedRem
 			+ Saturating
 			+ PartialOrd<Self>
 			+ Ord

From e0d13b58e1281514866e93a04a7232c05f79da45 Mon Sep 17 00:00:00 2001
From: Logan Saether <x@logansaether.com>
Date: Fri, 23 Jul 2021 02:53:57 +0200
Subject: [PATCH 1013/1194] Add Zeitgeist ss58 prefix 73 reservation (#8509)

---
 primitives/core/src/crypto.rs | 2 ++
 ss58-registry.json            | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index fcf5c65c0a61..a9f41956841a 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -586,6 +586,8 @@ ss58_address_format!(
 		(67, "equilibrium", "Equilibrium Network, standard account (*25519).")
 	SoraAccount =>
 		(69, "sora", "SORA Network, standard account (*25519).")
+  ZeitgeistAccount =>
+		(73, "zeitgeist", "Zeitgeist network, standard account (*25519).")
 	MantaAccount =>
 		(77, "manta", "Manta Network, standard account (*25519).")
 	CalamariAccount =>
diff --git a/ss58-registry.json b/ss58-registry.json
index e46d097e25db..23aab7ea0c71 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -486,6 +486,15 @@
 			"decimals": [18],
 			"standardAccount": "*25519",
 			"website": "https://sora.org"
+    },
+    {
+      "prefix": 73,
+			"network": "zeitgeist",
+			"displayName": "Zeitgeist",
+			"symbols": ["ZTG"],
+			"decimals": [10],
+			"standardAccount": "*25519",
+			"website": "https://zeitgeist.pm"
 		},
 		{
 			"prefix": 77,

From 0ae6aac3b0f8bea55bf91737a179fa01cd50f13f Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Fri, 23 Jul 2021 10:53:32 +0200
Subject: [PATCH 1014/1194] Estimate call fee (#9395)

* Estimate call fee

* More fix

* Fix

* Update frame/support/src/traits/misc.rs

Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com>

* try and fix fmt stuff

* fmt aain

Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com>
---
 bin/node/runtime/src/lib.rs                   |  1 +
 client/network/src/request_responses.rs       |  2 +-
 .../election-provider-multi-phase/src/lib.rs  | 15 +++++++++---
 .../election-provider-multi-phase/src/mock.rs |  2 +-
 .../src/signed.rs                             | 12 +++++-----
 frame/support/src/traits.rs                   |  6 ++---
 frame/support/src/traits/misc.rs              | 24 ++++++++++++++++---
 frame/transaction-payment/src/lib.rs          | 17 +++++++++++--
 8 files changed, 60 insertions(+), 19 deletions(-)

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 82e3a9f7e084..621de954c734 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -573,6 +573,7 @@ impl pallet_election_provider_multi_phase::BenchmarkingConfig for BenchmarkConfi
 impl pallet_election_provider_multi_phase::Config for Runtime {
 	type Event = Event;
 	type Currency = Balances;
+	type EstimateCallFee = TransactionPayment;
 	type SignedPhase = SignedPhase;
 	type UnsignedPhase = UnsignedPhase;
 	type SolutionImprovementThreshold = SolutionImprovementThreshold;
diff --git a/client/network/src/request_responses.rs b/client/network/src/request_responses.rs
index 226e1c546d6c..f51055af5524 100644
--- a/client/network/src/request_responses.rs
+++ b/client/network/src/request_responses.rs
@@ -788,7 +788,7 @@ pub enum ResponseFailure {
 /// Implements the libp2p [`RequestResponseCodec`] trait. Defines how streams of bytes are turned
 /// into requests and responses and vice-versa.
 #[derive(Debug, Clone)]
-#[doc(hidden)] // Needs to be public in order to satisfy the Rust compiler.
+#[doc(hidden)]// Needs to be public in order to satisfy the Rust compiler.
 pub struct GenericCodec {
 	max_request_size: u64,
 	max_response_size: u64,
diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index 905492d6ca04..48504b607395 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -237,7 +237,7 @@ use frame_support::{
 };
 use frame_system::{ensure_none, offchain::SendTransactionTypes};
 use sp_arithmetic::{
-	traits::{CheckedAdd, Zero},
+	traits::{CheckedAdd, Saturating, Zero},
 	UpperOf,
 };
 use sp_npos_elections::{
@@ -554,7 +554,7 @@ pub use pallet::*;
 #[frame_support::pallet]
 pub mod pallet {
 	use super::*;
-	use frame_support::pallet_prelude::*;
+	use frame_support::{pallet_prelude::*, traits::EstimateCallFee};
 	use frame_system::pallet_prelude::*;
 
 	#[pallet::config]
@@ -566,6 +566,9 @@ pub mod pallet {
 		/// Currency type.
 		type Currency: ReservableCurrency<Self::AccountId> + Currency<Self::AccountId>;
 
+		/// Something that can predict the fee of a call. Used to sensibly distribute rewards.
+		type EstimateCallFee: EstimateCallFee<Call<Self>, BalanceOf<Self>>;
+
 		/// Duration of the unsigned phase.
 		#[pallet::constant]
 		type UnsignedPhase: Get<Self::BlockNumber>;
@@ -973,7 +976,13 @@ pub mod pallet {
 
 			// create the submission
 			let deposit = Self::deposit_for(&solution, size);
-			let submission = SignedSubmission { who: who.clone(), deposit, solution };
+			let reward = {
+				let call = Call::submit(solution.clone(), num_signed_submissions);
+				let call_fee = T::EstimateCallFee::estimate_call_fee(&call, None.into());
+				T::SignedRewardBase::get().saturating_add(call_fee)
+			};
+
+			let submission = SignedSubmission { who: who.clone(), deposit, solution, reward };
 
 			// insert the submission if the queue has space or it's better than the weakest
 			// eject the weakest if the queue was full
diff --git a/frame/election-provider-multi-phase/src/mock.rs b/frame/election-provider-multi-phase/src/mock.rs
index c5007733c1e3..56007f15f84a 100644
--- a/frame/election-provider-multi-phase/src/mock.rs
+++ b/frame/election-provider-multi-phase/src/mock.rs
@@ -261,7 +261,6 @@ parameter_types! {
 	pub static SignedDepositByte: Balance = 0;
 	pub static SignedDepositWeight: Balance = 0;
 	pub static SignedRewardBase: Balance = 7;
-	pub static SignedRewardMax: Balance = 10;
 	pub static SignedMaxWeight: Weight = BlockWeights::get().max_block;
 	pub static MinerMaxIterations: u32 = 5;
 	pub static MinerTxPriority: u64 = 100;
@@ -356,6 +355,7 @@ impl multi_phase::weights::WeightInfo for DualMockWeightInfo {
 impl crate::Config for Runtime {
 	type Event = Event;
 	type Currency = Balances;
+	type EstimateCallFee = frame_support::traits::ConstU32<8>;
 	type SignedPhase = SignedPhase;
 	type UnsignedPhase = UnsignedPhase;
 	type SolutionImprovementThreshold = SolutionImprovementThreshold;
diff --git a/frame/election-provider-multi-phase/src/signed.rs b/frame/election-provider-multi-phase/src/signed.rs
index c91c923d93e9..40dee8bb7870 100644
--- a/frame/election-provider-multi-phase/src/signed.rs
+++ b/frame/election-provider-multi-phase/src/signed.rs
@@ -51,6 +51,8 @@ pub struct SignedSubmission<AccountId, Balance: HasCompact, CompactSolution> {
 	pub deposit: Balance,
 	/// The raw solution itself.
 	pub solution: RawSolution<CompactSolution>,
+	/// The reward that should potentially be paid for this solution, if accepted.
+	pub reward: Balance,
 }
 
 impl<AccountId, Balance, CompactSolution> Ord
@@ -351,10 +353,8 @@ impl<T: Config> Pallet<T> {
 		let SolutionOrSnapshotSize { voters, targets } =
 			Self::snapshot_metadata().unwrap_or_default();
 
-		let reward = T::SignedRewardBase::get();
-
 		while let Some(best) = all_submissions.pop_last() {
-			let SignedSubmission { solution, who, deposit } = best;
+			let SignedSubmission { solution, who, deposit, reward } = best;
 			let active_voters = solution.compact.voter_count() as u32;
 			let feasibility_weight = {
 				// defensive only: at the end of signed phase, snapshot will exits.
@@ -567,7 +567,7 @@ mod tests {
 			assert_eq!(balances(&99), (95, 5));
 
 			assert!(MultiPhase::finalize_signed_phase().0);
-			assert_eq!(balances(&99), (100 + 7, 0));
+			assert_eq!(balances(&99), (100 + 7 + 8, 0));
 		})
 	}
 
@@ -616,7 +616,7 @@ mod tests {
 			assert!(MultiPhase::finalize_signed_phase().0);
 
 			// 99 is rewarded.
-			assert_eq!(balances(&99), (100 + 7, 0));
+			assert_eq!(balances(&99), (100 + 7 + 8, 0));
 			// 999 gets everything back.
 			assert_eq!(balances(&999), (100, 0));
 		})
@@ -807,7 +807,7 @@ mod tests {
 			assert!(MultiPhase::finalize_signed_phase().0);
 
 			// 99 is rewarded.
-			assert_eq!(balances(&99), (100 + 7, 0));
+			assert_eq!(balances(&99), (100 + 7 + 8, 0));
 			// 999 is slashed.
 			assert_eq!(balances(&999), (95, 0));
 			// 9999 gets everything back.
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index fcc3305c409c..4c674e1f9662 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -51,9 +51,9 @@ pub use filter::{
 
 mod misc;
 pub use misc::{
-	Backing, ConstU32, EnsureInherentsAreFirst, ExecuteBlock, ExtrinsicCall, Get, GetBacking,
-	GetDefault, HandleLifetime, IsSubType, IsType, Len, OffchainWorker, OnKilledAccount,
-	OnNewAccount, SameOrOther, Time, TryDrop, UnixTime,
+	Backing, ConstU32, EnsureInherentsAreFirst, EstimateCallFee, ExecuteBlock, ExtrinsicCall, Get,
+	GetBacking, GetDefault, HandleLifetime, IsSubType, IsType, Len, OffchainWorker,
+	OnKilledAccount, OnNewAccount, SameOrOther, Time, TryDrop, UnixTime,
 };
 
 mod stored_map;
diff --git a/frame/support/src/traits/misc.rs b/frame/support/src/traits/misc.rs
index d6eb8331cdb5..382c5ebf5713 100644
--- a/frame/support/src/traits/misc.rs
+++ b/frame/support/src/traits/misc.rs
@@ -18,7 +18,6 @@
 //! Smaller traits used in FRAME which don't need their own file.
 
 use crate::dispatch::Parameter;
-use sp_arithmetic::traits::AtLeast32Bit;
 use sp_runtime::{traits::Block as BlockT, DispatchError};
 
 /// Anything that can have a `::len()` method.
@@ -181,7 +180,7 @@ pub trait HandleLifetime<T> {
 impl<T> HandleLifetime<T> for () {}
 
 pub trait Time {
-	type Moment: AtLeast32Bit + Parameter + Default + Copy;
+	type Moment: sp_arithmetic::traits::AtLeast32Bit + Parameter + Default + Copy;
 
 	fn now() -> Self::Moment;
 }
@@ -307,7 +306,7 @@ pub trait OffchainWorker<BlockNumber> {
 	fn offchain_worker(_n: BlockNumber) {}
 }
 
-/// Some amount of backing from a group. The precise defintion of what it means to "back" something
+/// Some amount of backing from a group. The precise definition of what it means to "back" something
 /// is left flexible.
 pub struct Backing {
 	/// The number of members of the group that back some motion.
@@ -358,3 +357,22 @@ where
 		&self.function
 	}
 }
+
+/// Something that can estimate the fee of a (frame-based) call.
+///
+/// Typically, the same pallet that will charge transaction fees will implement this.
+pub trait EstimateCallFee<Call, Balance> {
+	/// Estimate the fee of this call.
+	///
+	/// The dispatch info and the length is deduced from the call. The post info can optionally be
+	/// provided.
+	fn estimate_call_fee(call: &Call, post_info: crate::weights::PostDispatchInfo) -> Balance;
+}
+
+// Useful for building mocks.
+#[cfg(feature = "std")]
+impl<Call, Balance: From<u32>, const T: u32> EstimateCallFee<Call, Balance> for ConstU32<T> {
+	fn estimate_call_fee(_: &Call, _: crate::weights::PostDispatchInfo) -> Balance {
+		T.into()
+	}
+}
diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
index 882f37dceedf..61de183dac1b 100644
--- a/frame/transaction-payment/src/lib.rs
+++ b/frame/transaction-payment/src/lib.rs
@@ -52,7 +52,7 @@ use codec::{Decode, Encode};
 use sp_runtime::{
 	traits::{
 		Convert, DispatchInfoOf, Dispatchable, PostDispatchInfoOf, SaturatedConversion, Saturating,
-		SignedExtension,
+		SignedExtension, Zero,
 	},
 	transaction_validity::{
 		TransactionPriority, TransactionValidity, TransactionValidityError, ValidTransaction,
@@ -63,7 +63,7 @@ use sp_std::prelude::*;
 
 use frame_support::{
 	dispatch::DispatchResult,
-	traits::Get,
+	traits::{EstimateCallFee, Get},
 	weights::{
 		DispatchClass, DispatchInfo, GetDispatchInfo, Pays, PostDispatchInfo, Weight,
 		WeightToFeeCoefficient, WeightToFeePolynomial,
@@ -656,6 +656,19 @@ where
 	}
 }
 
+impl<T: Config, AnyCall: GetDispatchInfo + Encode> EstimateCallFee<AnyCall, BalanceOf<T>>
+	for Pallet<T>
+where
+	BalanceOf<T>: FixedPointOperand,
+	T::Call: Dispatchable<Info = DispatchInfo, PostInfo = PostDispatchInfo>,
+{
+	fn estimate_call_fee(call: &AnyCall, post_info: PostDispatchInfo) -> BalanceOf<T> {
+		let len = call.encoded_size() as u32;
+		let info = call.get_dispatch_info();
+		Self::compute_actual_fee(len, &info, &post_info, Zero::zero())
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;

From cae555e32f2ae9eee8efcce98d6848327c5bf847 Mon Sep 17 00:00:00 2001
From: Squirrel <gilescope@gmail.com>
Date: Fri, 23 Jul 2021 10:15:39 +0100
Subject: [PATCH 1015/1194] example typo (#9416)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Think these types should be switched reading the doc.

* Update frame/support/procedural/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 frame/support/procedural/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frame/support/procedural/src/lib.rs b/frame/support/procedural/src/lib.rs
index ab9ea1563479..a59ae67851e6 100644
--- a/frame/support/procedural/src/lib.rs
+++ b/frame/support/procedural/src/lib.rs
@@ -289,7 +289,7 @@ pub fn decl_storage(input: TokenStream) -> TokenStream {
 /// construct_runtime!(
 ///     pub enum Runtime where
 ///         Block = Block,
-///         NodeBlock = runtime::Block,
+///         NodeBlock = node::Block,
 ///         UncheckedExtrinsic = UncheckedExtrinsic
 ///     {
 ///         System: system::{Pallet, Call, Event<T>, Config<T>} = 0,

From feb37c024ef33a6f903b25421528b2be7009e268 Mon Sep 17 00:00:00 2001
From: Alex Pozhylenkov <alex_pozhilenkov@adoriasoft.com>
Date: Fri, 23 Jul 2021 14:06:18 +0300
Subject: [PATCH 1016/1194] Staking refactor. Change *_or() to *_or_else() 
 (#9400)

* update

* update

* update

* fix fmt
---
 frame/staking/src/lib.rs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 4cf0596ddc1b..eb0817c2e5df 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -2346,10 +2346,10 @@ impl<T: Config> Pallet<T> {
 		era: EraIndex,
 	) -> DispatchResultWithPostInfo {
 		// Validate input data
-		let current_era = CurrentEra::<T>::get().ok_or(
+		let current_era = CurrentEra::<T>::get().ok_or_else(|| {
 			Error::<T>::InvalidEraToReward
-				.with_weight(T::WeightInfo::payout_stakers_alive_staked(0)),
-		)?;
+				.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
+		})?;
 		let history_depth = Self::history_depth();
 		ensure!(
 			era <= current_era && era >= current_era.saturating_sub(history_depth),
@@ -2364,10 +2364,11 @@ impl<T: Config> Pallet<T> {
 				.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
 		})?;
 
-		let controller = Self::bonded(&validator_stash).ok_or(
-			Error::<T>::NotStash.with_weight(T::WeightInfo::payout_stakers_alive_staked(0)),
-		)?;
-		let mut ledger = <Ledger<T>>::get(&controller).ok_or_else(|| Error::<T>::NotController)?;
+		let controller = Self::bonded(&validator_stash).ok_or_else(|| {
+			Error::<T>::NotStash
+				.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
+		})?;
+		let mut ledger = <Ledger<T>>::get(&controller).ok_or(Error::<T>::NotController)?;
 
 		ledger
 			.claimed_rewards
@@ -3127,7 +3128,7 @@ impl<T: Config> frame_election_provider_support::ElectionDataProvider<T::Account
 		targets.into_iter().for_each(|v| {
 			let stake: BalanceOf<T> = target_stake
 				.and_then(|w| <BalanceOf<T>>::try_from(w).ok())
-				.unwrap_or(MinNominatorBond::<T>::get() * 100u32.into());
+				.unwrap_or_else(|| MinNominatorBond::<T>::get() * 100u32.into());
 			<Bonded<T>>::insert(v.clone(), v.clone());
 			<Ledger<T>>::insert(
 				v.clone(),

From b09156bbe1705da09f05ba20c974ce156b75cd33 Mon Sep 17 00:00:00 2001
From: cheme <emericchevalier.pro@gmail.com>
Date: Fri, 23 Jul 2021 13:30:00 +0200
Subject: [PATCH 1017/1194] State machine local child root cache. (#9107)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* cache root for child api.

* minimal testing

* Reset cache on test 'set_root'.

* Update primitives/state-machine/src/trie_backend_essence.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update primitives/state-machine/src/trie_backend_essence.rs

* Update primitives/state-machine/src/trie_backend_essence.rs

* Renaming to 'reset_cache'.

* correct rust fmt

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 primitives/state-machine/src/trie_backend.rs  | 16 ++++++
 .../state-machine/src/trie_backend_essence.rs | 56 ++++++++++++++++++-
 2 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/primitives/state-machine/src/trie_backend.rs b/primitives/state-machine/src/trie_backend.rs
index e8c9fa475cff..95007653321c 100644
--- a/primitives/state-machine/src/trie_backend.rs
+++ b/primitives/state-machine/src/trie_backend.rs
@@ -326,6 +326,22 @@ pub mod tests {
 				.unwrap(),
 			Some(vec![142u8]),
 		);
+		// Change cache entry to check that caching is active.
+		test_trie
+			.essence
+			.cache
+			.write()
+			.child_root
+			.entry(b"sub1".to_vec())
+			.and_modify(|value| {
+				*value = None;
+			});
+		assert_eq!(
+			test_trie
+				.child_storage(&ChildInfo::new_default(CHILD_KEY_1), b"value3")
+				.unwrap(),
+			None,
+		);
 	}
 
 	#[test]
diff --git a/primitives/state-machine/src/trie_backend_essence.rs b/primitives/state-machine/src/trie_backend_essence.rs
index 06a99f938803..052c61bd6eee 100644
--- a/primitives/state-machine/src/trie_backend_essence.rs
+++ b/primitives/state-machine/src/trie_backend_essence.rs
@@ -21,6 +21,8 @@
 use crate::{backend::Consolidate, debug, warn, StorageKey, StorageValue};
 use codec::Encode;
 use hash_db::{self, Hasher, Prefix};
+#[cfg(feature = "std")]
+use parking_lot::RwLock;
 use sp_core::storage::ChildInfo;
 use sp_std::{boxed::Box, ops::Deref, vec::Vec};
 use sp_trie::{
@@ -29,6 +31,8 @@ use sp_trie::{
 	DBValue, KeySpacedDB, MemoryDB, PrefixedMemoryDB, Trie, TrieDBIterator,
 };
 #[cfg(feature = "std")]
+use std::collections::HashMap;
+#[cfg(feature = "std")]
 use std::sync::Arc;
 
 #[cfg(not(feature = "std"))]
@@ -46,11 +50,26 @@ pub trait Storage<H: Hasher>: Send + Sync {
 	fn get(&self, key: &H::Out, prefix: Prefix) -> Result<Option<DBValue>>;
 }
 
+/// Local cache for child root.
+#[cfg(feature = "std")]
+pub(crate) struct Cache {
+	pub child_root: HashMap<Vec<u8>, Option<Vec<u8>>>,
+}
+
+#[cfg(feature = "std")]
+impl Cache {
+	fn new() -> Self {
+		Cache { child_root: HashMap::new() }
+	}
+}
+
 /// Patricia trie-based pairs storage essence.
 pub struct TrieBackendEssence<S: TrieBackendStorage<H>, H: Hasher> {
 	storage: S,
 	root: H::Out,
 	empty: H::Out,
+	#[cfg(feature = "std")]
+	pub(crate) cache: Arc<RwLock<Cache>>,
 }
 
 impl<S: TrieBackendStorage<H>, H: Hasher> TrieBackendEssence<S, H>
@@ -59,7 +78,13 @@ where
 {
 	/// Create new trie-based backend.
 	pub fn new(storage: S, root: H::Out) -> Self {
-		TrieBackendEssence { storage, root, empty: H::hash(&[0u8]) }
+		TrieBackendEssence {
+			storage,
+			root,
+			empty: H::hash(&[0u8]),
+			#[cfg(feature = "std")]
+			cache: Arc::new(RwLock::new(Cache::new())),
+		}
 	}
 
 	/// Get backend storage reference.
@@ -79,9 +104,19 @@ where
 
 	/// Set trie root. This is useful for testing.
 	pub fn set_root(&mut self, root: H::Out) {
+		// If root did change so can have cached content.
+		self.reset_cache();
 		self.root = root;
 	}
 
+	#[cfg(feature = "std")]
+	fn reset_cache(&mut self) {
+		self.cache = Arc::new(RwLock::new(Cache::new()));
+	}
+
+	#[cfg(not(feature = "std"))]
+	fn reset_cache(&mut self) {}
+
 	/// Consumes self and returns underlying storage.
 	pub fn into_storage(self) -> S {
 		self.storage
@@ -95,7 +130,24 @@ where
 
 	/// Access the root of the child storage in its parent trie
 	fn child_root(&self, child_info: &ChildInfo) -> Result<Option<StorageValue>> {
-		self.storage(child_info.prefixed_storage_key().as_slice())
+		#[cfg(feature = "std")]
+		{
+			if let Some(result) = self.cache.read().child_root.get(child_info.storage_key()) {
+				return Ok(result.clone())
+			}
+		}
+
+		let result = self.storage(child_info.prefixed_storage_key().as_slice())?;
+
+		#[cfg(feature = "std")]
+		{
+			self.cache
+				.write()
+				.child_root
+				.insert(child_info.storage_key().to_vec(), result.clone());
+		}
+
+		Ok(result)
 	}
 
 	/// Return the next key in the child trie i.e. the minimum key that is strictly superior to

From 8bbad73f5462028f82b5d72311a5743781230ce3 Mon Sep 17 00:00:00 2001
From: asymmetric <lorenzo@mailbox.org>
Date: Fri, 23 Jul 2021 22:00:08 +0200
Subject: [PATCH 1018/1194] Clarify Prometheus exporter options (#9427)

The 'data source' term does not represent a Prometheus concept. What we are exposing here is an exporter.
---
 client/cli/src/commands/run_cmd.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/cli/src/commands/run_cmd.rs b/client/cli/src/commands/run_cmd.rs
index 2b5a3632543b..8d4f72a5cc59 100644
--- a/client/cli/src/commands/run_cmd.rs
+++ b/client/cli/src/commands/run_cmd.rs
@@ -105,7 +105,7 @@ pub struct RunCmd {
 	#[structopt(long = "rpc-max-payload")]
 	pub rpc_max_payload: Option<usize>,
 
-	/// Listen to all Prometheus data source interfaces.
+	/// Expose Prometheus exporter on all interfaces.
 	///
 	/// Default is local.
 	#[structopt(long = "prometheus-external")]
@@ -140,11 +140,11 @@ pub struct RunCmd {
 	#[structopt(long = "rpc-cors", value_name = "ORIGINS", parse(try_from_str = parse_cors))]
 	pub rpc_cors: Option<Cors>,
 
-	/// Specify Prometheus data source server TCP Port.
+	/// Specify Prometheus exporter TCP Port.
 	#[structopt(long = "prometheus-port", value_name = "PORT")]
 	pub prometheus_port: Option<u16>,
 
-	/// Do not expose a Prometheus metric endpoint.
+	/// Do not expose a Prometheus exporter endpoint.
 	///
 	/// Prometheus metric endpoint is enabled by default.
 	#[structopt(long = "no-prometheus")]

From d22349207ac6bb84c34e57e111f2b04895a82c0b Mon Sep 17 00:00:00 2001
From: Falco Hirschenberger <falco.hirschenberger@gmail.com>
Date: Sat, 24 Jul 2021 20:00:29 +0200
Subject: [PATCH 1019/1194] Don't return misleading result with PostInfo in
 proxy-pallet (#9426)

also autoformatting two unrelated files

fixes #9421
---
 client/network/src/request_responses.rs |  2 +-
 frame/proxy/src/lib.rs                  | 28 ++++++++++++-------------
 frame/staking/src/lib.rs                |  3 +--
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/client/network/src/request_responses.rs b/client/network/src/request_responses.rs
index f51055af5524..226e1c546d6c 100644
--- a/client/network/src/request_responses.rs
+++ b/client/network/src/request_responses.rs
@@ -788,7 +788,7 @@ pub enum ResponseFailure {
 /// Implements the libp2p [`RequestResponseCodec`] trait. Defines how streams of bytes are turned
 /// into requests and responses and vice-versa.
 #[derive(Debug, Clone)]
-#[doc(hidden)]// Needs to be public in order to satisfy the Rust compiler.
+#[doc(hidden)] // Needs to be public in order to satisfy the Rust compiler.
 pub struct GenericCodec {
 	max_request_size: u64,
 	max_response_size: u64,
diff --git a/frame/proxy/src/lib.rs b/frame/proxy/src/lib.rs
index 56932669ed8c..a5338118eaaa 100644
--- a/frame/proxy/src/lib.rs
+++ b/frame/proxy/src/lib.rs
@@ -35,7 +35,7 @@ pub mod weights;
 
 use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::{
-	dispatch::{DispatchError, DispatchResultWithPostInfo, PostDispatchInfo},
+	dispatch::DispatchError,
 	ensure,
 	traits::{Currency, Get, InstanceFilter, IsSubType, IsType, OriginTrait, ReservableCurrency},
 	weights::GetDispatchInfo,
@@ -102,7 +102,7 @@ pub mod pallet {
 
 		/// The overarching call type.
 		type Call: Parameter
-			+ Dispatchable<Origin = Self::Origin, PostInfo = PostDispatchInfo>
+			+ Dispatchable<Origin = Self::Origin>
 			+ GetDispatchInfo
 			+ From<frame_system::Call<Self>>
 			+ IsSubType<Call<Self>>
@@ -196,7 +196,7 @@ pub mod pallet {
 			real: T::AccountId,
 			force_proxy_type: Option<T::ProxyType>,
 			call: Box<<T as Config>::Call>,
-		) -> DispatchResultWithPostInfo {
+		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			let def = Self::find_proxy(&real, &who, force_proxy_type)?;
 			ensure!(def.delay.is_zero(), Error::<T>::Unannounced);
@@ -225,7 +225,7 @@ pub mod pallet {
 			delegate: T::AccountId,
 			proxy_type: T::ProxyType,
 			delay: T::BlockNumber,
-		) -> DispatchResultWithPostInfo {
+		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			Self::add_proxy_delegate(&who, delegate, proxy_type, delay)
 		}
@@ -247,7 +247,7 @@ pub mod pallet {
 			delegate: T::AccountId,
 			proxy_type: T::ProxyType,
 			delay: T::BlockNumber,
-		) -> DispatchResultWithPostInfo {
+		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			Self::remove_proxy_delegate(&who, delegate, proxy_type, delay)
 		}
@@ -263,7 +263,7 @@ pub mod pallet {
 		/// Weight is a function of the number of proxies the user has (P).
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::remove_proxies(T::MaxProxies::get().into()))]
-		pub fn remove_proxies(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
+		pub fn remove_proxies(origin: OriginFor<T>) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			let (_, old_deposit) = Proxies::<T>::take(&who);
 			T::Currency::unreserve(&who, old_deposit);
@@ -300,7 +300,7 @@ pub mod pallet {
 			proxy_type: T::ProxyType,
 			delay: T::BlockNumber,
 			index: u16,
-		) -> DispatchResultWithPostInfo {
+		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 
 			let anonymous = Self::anonymous_account(&who, &proxy_type, index, None);
@@ -348,7 +348,7 @@ pub mod pallet {
 			index: u16,
 			#[pallet::compact] height: T::BlockNumber,
 			#[pallet::compact] ext_index: u32,
-		) -> DispatchResultWithPostInfo {
+		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 
 			let when = (height, ext_index);
@@ -387,7 +387,7 @@ pub mod pallet {
 			origin: OriginFor<T>,
 			real: T::AccountId,
 			call_hash: CallHashOf<T>,
-		) -> DispatchResultWithPostInfo {
+		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			Proxies::<T>::get(&real)
 				.0
@@ -443,7 +443,7 @@ pub mod pallet {
 			origin: OriginFor<T>,
 			real: T::AccountId,
 			call_hash: CallHashOf<T>,
-		) -> DispatchResultWithPostInfo {
+		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			Self::edit_announcements(&who, |ann| ann.real != real || ann.call_hash != call_hash)?;
 
@@ -473,7 +473,7 @@ pub mod pallet {
 			origin: OriginFor<T>,
 			delegate: T::AccountId,
 			call_hash: CallHashOf<T>,
-		) -> DispatchResultWithPostInfo {
+		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			Self::edit_announcements(&delegate, |ann| {
 				ann.real != who || ann.call_hash != call_hash
@@ -513,7 +513,7 @@ pub mod pallet {
 			real: T::AccountId,
 			force_proxy_type: Option<T::ProxyType>,
 			call: Box<<T as Config>::Call>,
-		) -> DispatchResultWithPostInfo {
+		) -> DispatchResult {
 			ensure_signed(origin)?;
 			let def = Self::find_proxy(&real, &delegate, force_proxy_type)?;
 
@@ -641,7 +641,7 @@ impl<T: Config> Pallet<T> {
 		delegatee: T::AccountId,
 		proxy_type: T::ProxyType,
 		delay: T::BlockNumber,
-	) -> DispatchResultWithPostInfo {
+	) -> DispatchResult {
 		ensure!(delegator != &delegatee, Error::<T>::NoSelfProxy);
 		Proxies::<T>::try_mutate(delegator, |(ref mut proxies, ref mut deposit)| {
 			let proxy_def = ProxyDefinition { delegate: delegatee, proxy_type, delay };
@@ -671,7 +671,7 @@ impl<T: Config> Pallet<T> {
 		delegatee: T::AccountId,
 		proxy_type: T::ProxyType,
 		delay: T::BlockNumber,
-	) -> DispatchResultWithPostInfo {
+	) -> DispatchResult {
 		Proxies::<T>::try_mutate_exists(delegator, |x| {
 			let (mut proxies, old_deposit) = x.take().ok_or(Error::<T>::NotFound)?;
 			let proxy_def = ProxyDefinition { delegate: delegatee, proxy_type, delay };
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index eb0817c2e5df..64cdfcca75b4 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -2365,8 +2365,7 @@ impl<T: Config> Pallet<T> {
 		})?;
 
 		let controller = Self::bonded(&validator_stash).ok_or_else(|| {
-			Error::<T>::NotStash
-				.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
+			Error::<T>::NotStash.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
 		})?;
 		let mut ledger = <Ledger<T>>::get(&controller).ok_or(Error::<T>::NotController)?;
 

From 37d4bce3f478cab6903401a9089449a27eb24a38 Mon Sep 17 00:00:00 2001
From: Falco Hirschenberger <falco.hirschenberger@gmail.com>
Date: Mon, 26 Jul 2021 10:31:07 +0200
Subject: [PATCH 1020/1194] Simplify returnvalue creation (#9429)

---
 frame/proxy/src/lib.rs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/frame/proxy/src/lib.rs b/frame/proxy/src/lib.rs
index a5338118eaaa..3647ead700fd 100644
--- a/frame/proxy/src/lib.rs
+++ b/frame/proxy/src/lib.rs
@@ -203,7 +203,7 @@ pub mod pallet {
 
 			Self::do_proxy(def, real, *call);
 
-			Ok(().into())
+			Ok(())
 		}
 
 		/// Register a proxy account for the sender that is able to make calls on its behalf.
@@ -268,7 +268,7 @@ pub mod pallet {
 			let (_, old_deposit) = Proxies::<T>::take(&who);
 			T::Currency::unreserve(&who, old_deposit);
 
-			Ok(().into())
+			Ok(())
 		}
 
 		/// Spawn a fresh new account that is guaranteed to be otherwise inaccessible, and
@@ -317,7 +317,7 @@ pub mod pallet {
 			Proxies::<T>::insert(&anonymous, (bounded_proxies, deposit));
 			Self::deposit_event(Event::AnonymousCreated(anonymous, who, proxy_type, index));
 
-			Ok(().into())
+			Ok(())
 		}
 
 		/// Removes a previously spawned anonymous proxy.
@@ -358,7 +358,7 @@ pub mod pallet {
 			let (_, deposit) = Proxies::<T>::take(&who);
 			T::Currency::unreserve(&spawner, deposit);
 
-			Ok(().into())
+			Ok(())
 		}
 
 		/// Publish the hash of a proxy-call that will be made in the future.
@@ -417,7 +417,7 @@ pub mod pallet {
 			})?;
 			Self::deposit_event(Event::Announced(real, who, call_hash));
 
-			Ok(().into())
+			Ok(())
 		}
 
 		/// Remove a given announcement.
@@ -447,7 +447,7 @@ pub mod pallet {
 			let who = ensure_signed(origin)?;
 			Self::edit_announcements(&who, |ann| ann.real != real || ann.call_hash != call_hash)?;
 
-			Ok(().into())
+			Ok(())
 		}
 
 		/// Remove the given announcement of a delegate.
@@ -479,7 +479,7 @@ pub mod pallet {
 				ann.real != who || ann.call_hash != call_hash
 			})?;
 
-			Ok(().into())
+			Ok(())
 		}
 
 		/// Dispatch the given `call` from an account that the sender is authorized for through
@@ -528,7 +528,7 @@ pub mod pallet {
 
 			Self::do_proxy(def, real, *call);
 
-			Ok(().into())
+			Ok(())
 		}
 	}
 
@@ -654,7 +654,7 @@ impl<T: Config> Pallet<T> {
 				T::Currency::unreserve(delegator, *deposit - new_deposit);
 			}
 			*deposit = new_deposit;
-			Ok(().into())
+			Ok(())
 		})
 	}
 
@@ -686,7 +686,7 @@ impl<T: Config> Pallet<T> {
 			if !proxies.is_empty() {
 				*x = Some((proxies, new_deposit))
 			}
-			Ok(().into())
+			Ok(())
 		})
 	}
 

From bcd628c58f8ab23aec084779bbbee8598e5c8f49 Mon Sep 17 00:00:00 2001
From: Squirrel <gilescope@gmail.com>
Date: Mon, 26 Jul 2021 14:12:18 +0100
Subject: [PATCH 1021/1194] clippy fixes (#9173)

---
 client/chain-spec/derive/src/impls.rs        |  4 +-
 frame/staking/reward-curve/src/lib.rs        | 43 +++++++++-----------
 frame/staking/reward-curve/src/log.rs        |  6 +--
 primitives/npos-elections/compact/src/lib.rs |  2 +-
 primitives/utils/src/mpsc.rs                 |  8 ++--
 5 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/client/chain-spec/derive/src/impls.rs b/client/chain-spec/derive/src/impls.rs
index 73634dcca42e..23415903b464 100644
--- a/client/chain-spec/derive/src/impls.rs
+++ b/client/chain-spec/derive/src/impls.rs
@@ -76,7 +76,7 @@ pub fn group_derive(ast: &DeriveInput) -> proc_macro::TokenStream {
 		let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
 		let fork_name = Ident::new(&format!("{}Fork", name), Span::call_site());
 
-		let fork_fields = generate_fork_fields(&crate_name, &field_names, &field_types);
+		let fork_fields = generate_fork_fields(crate_name, &field_names, &field_types);
 		let to_fork = generate_base_to_fork(&fork_name, &field_names);
 		let combine_with = generate_combine_with(&field_names);
 		let to_base = generate_fork_to_base(name, &field_names);
@@ -88,7 +88,7 @@ pub fn group_derive(ast: &DeriveInput) -> proc_macro::TokenStream {
 					Error::new(Span::call_site(), &format!("Could not find `serde` crate: {}", e))
 						.to_compile_error();
 
-				return quote!( #err ).into()
+				return quote!( #err )
 			},
 		};
 
diff --git a/frame/staking/reward-curve/src/lib.rs b/frame/staking/reward-curve/src/lib.rs
index c225c9045783..076c3682ab41 100644
--- a/frame/staking/reward-curve/src/lib.rs
+++ b/frame/staking/reward-curve/src/lib.rs
@@ -62,14 +62,14 @@ use syn::parse::{Parse, ParseStream};
 /// use sp_runtime::curve::PiecewiseLinear;
 ///
 /// pallet_staking_reward_curve::build! {
-/// 	const I_NPOS: PiecewiseLinear<'static> = curve!(
-/// 		min_inflation: 0_025_000,
-/// 		max_inflation: 0_100_000,
-/// 		ideal_stake: 0_500_000,
-/// 		falloff: 0_050_000,
-/// 		max_piece_count: 40,
-/// 		test_precision: 0_005_000,
-/// 	);
+///     const I_NPOS: PiecewiseLinear<'static> = curve!(
+///         min_inflation: 0_025_000,
+///         max_inflation: 0_100_000,
+///         ideal_stake: 0_500_000,
+///         falloff: 0_050_000,
+///         max_piece_count: 40,
+///         test_precision: 0_005_000,
+///     );
 /// }
 /// ```
 #[proc_macro]
@@ -163,9 +163,9 @@ fn parse_field<Token: Parse + Default + ToTokens>(
 	input: ParseStream,
 	bounds: Bounds,
 ) -> syn::Result<u32> {
-	<Token>::parse(&input)?;
-	<syn::Token![:]>::parse(&input)?;
-	let value_lit = syn::LitInt::parse(&input)?;
+	<Token>::parse(input)?;
+	<syn::Token![:]>::parse(input)?;
+	let value_lit = syn::LitInt::parse(input)?;
 	let value: u32 = value_lit.base10_parse()?;
 	if !bounds.check(value) {
 		return Err(syn::Error::new(
@@ -186,15 +186,15 @@ impl Parse for INposInput {
 	fn parse(input: ParseStream) -> syn::Result<Self> {
 		let args_input;
 
-		<syn::Token![const]>::parse(&input)?;
-		let ident = <syn::Ident>::parse(&input)?;
-		<syn::Token![:]>::parse(&input)?;
-		let typ = <syn::Type>::parse(&input)?;
-		<syn::Token![=]>::parse(&input)?;
-		<keyword::curve>::parse(&input)?;
-		<syn::Token![!]>::parse(&input)?;
+		<syn::Token![const]>::parse(input)?;
+		let ident = <syn::Ident>::parse(input)?;
+		<syn::Token![:]>::parse(input)?;
+		let typ = <syn::Type>::parse(input)?;
+		<syn::Token![=]>::parse(input)?;
+		<keyword::curve>::parse(input)?;
+		<syn::Token![!]>::parse(input)?;
 		syn::parenthesized!(args_input in input);
-		<syn::Token![;]>::parse(&input)?;
+		<syn::Token![;]>::parse(input)?;
 
 		if !input.is_empty() {
 			return Err(input.error("expected end of input stream, no token expected"))
@@ -288,9 +288,7 @@ impl INPoS {
 fn compute_points(input: &INposInput) -> Vec<(u32, u32)> {
 	let inpos = INPoS::from_input(input);
 
-	let mut points = vec![];
-	points.push((0, inpos.i_0));
-	points.push((inpos.x_ideal, inpos.i_ideal_times_x_ideal));
+	let mut points = vec![(0, inpos.i_0), (inpos.x_ideal, inpos.i_ideal_times_x_ideal)];
 
 	// For each point p: (next_p.0 - p.0) < segment_length && (next_p.1 - p.1) < segment_length.
 	// This ensures that the total number of segment doesn't overflow max_piece_count.
@@ -445,5 +443,4 @@ fn generate_test_module(input: &INposInput) -> TokenStream2 {
 			}
 		}
 	)
-	.into()
 }
diff --git a/frame/staking/reward-curve/src/log.rs b/frame/staking/reward-curve/src/log.rs
index 06d2000619b5..c196aaaa31a9 100644
--- a/frame/staking/reward-curve/src/log.rs
+++ b/frame/staking/reward-curve/src/log.rs
@@ -46,14 +46,14 @@ pub fn log2(p: u32, q: u32) -> u32 {
 
 	// find the power of 2 where q * 2^n <= p < q * 2^(n+1)
 	let mut n = 0u32;
-	while !(p >= pow2!(n) * q) || !(p < pow2!(n + 1) * q) {
+	while (p < pow2!(n) * q) || (p >= pow2!(n + 1) * q) {
 		n += 1;
 		assert!(n < 32); // cannot represent 2^32 in u32
 	}
 	assert!(p < pow2!(n + 1) * q);
 
-	let y_num: u32 = (p - pow2!(n) * q).try_into().unwrap();
-	let y_den: u32 = (p + pow2!(n) * q).try_into().unwrap();
+	let y_num: u32 = p - pow2!(n) * q;
+	let y_den: u32 = p + pow2!(n) * q;
 
 	// Loop through each Taylor series coefficient until it reaches 10^-6
 	let mut res = n * 1_000_000u32;
diff --git a/primitives/npos-elections/compact/src/lib.rs b/primitives/npos-elections/compact/src/lib.rs
index 4bf8e8a4de40..5897e607cfa6 100644
--- a/primitives/npos-elections/compact/src/lib.rs
+++ b/primitives/npos-elections/compact/src/lib.rs
@@ -89,7 +89,7 @@ pub fn generate_solution_type(item: TokenStream) -> TokenStream {
 
 	let solution_struct = struct_def(
 		vis,
-		ident.clone(),
+		ident,
 		count,
 		voter_type.clone(),
 		target_type.clone(),
diff --git a/primitives/utils/src/mpsc.rs b/primitives/utils/src/mpsc.rs
index 72dcd94c39e0..27e15cbe2ef2 100644
--- a/primitives/utils/src/mpsc.rs
+++ b/primitives/utils/src/mpsc.rs
@@ -101,7 +101,7 @@ mod inner {
 		/// Proxy function to mpsc::UnboundedSender
 		pub fn unbounded_send(&self, msg: T) -> Result<(), TrySendError<T>> {
 			self.1.unbounded_send(msg).map(|s| {
-				UNBOUNDED_CHANNELS_COUNTER.with_label_values(&[self.0, &"send"]).inc();
+				UNBOUNDED_CHANNELS_COUNTER.with_label_values(&[self.0, "send"]).inc();
 				s
 			})
 		}
@@ -128,9 +128,7 @@ mod inner {
 			}
 			// and discount the messages
 			if count > 0 {
-				UNBOUNDED_CHANNELS_COUNTER
-					.with_label_values(&[self.0, &"dropped"])
-					.inc_by(count);
+				UNBOUNDED_CHANNELS_COUNTER.with_label_values(&[self.0, "dropped"]).inc_by(count);
 			}
 		}
 
@@ -146,7 +144,7 @@ mod inner {
 		pub fn try_next(&mut self) -> Result<Option<T>, TryRecvError> {
 			self.1.try_next().map(|s| {
 				if s.is_some() {
-					UNBOUNDED_CHANNELS_COUNTER.with_label_values(&[self.0, &"received"]).inc();
+					UNBOUNDED_CHANNELS_COUNTER.with_label_values(&[self.0, "received"]).inc();
 				}
 				s
 			})

From d94bf34cb3305f2876045543771544fa548ed7a0 Mon Sep 17 00:00:00 2001
From: Squirrel <gilescope@gmail.com>
Date: Mon, 26 Jul 2021 14:18:27 +0100
Subject: [PATCH 1022/1194] post rustfmt whitespace fixup (#9436)

Taking best bits of rustfmt's format_strings

Co-authored-by: Alexander Popiak <alexander.popiak@gmail.com>
---
 bin/node-template/node/src/command.rs             |  4 ++--
 bin/node/executor/benches/bench.rs                |  4 ++--
 bin/node/executor/tests/common.rs                 |  4 ++--
 bin/node/runtime/src/lib.rs                       |  6 +++---
 client/cli/src/commands/run_cmd.rs                |  9 ++++-----
 client/consensus/aura/src/lib.rs                  |  3 +--
 client/consensus/babe/src/lib.rs                  | 15 +++++----------
 client/db/src/changes_tries_storage.rs            |  4 ++--
 client/db/src/light.rs                            |  8 ++++----
 client/executor/runtime-test/src/lib.rs           |  4 ++--
 client/finality-grandpa/src/lib.rs                |  7 +++----
 client/network/src/discovery.rs                   |  9 ++++-----
 client/network/src/request_responses.rs           |  4 ++--
 client/service/src/client/client.rs               |  8 ++++----
 frame/staking/reward-curve/src/lib.rs             |  4 ++--
 primitives/npos-elections/src/balancing.rs        |  4 ++--
 .../test-wasm-deprecated/src/lib.rs               |  4 ++--
 test-utils/runtime/src/lib.rs                     |  6 +++---
 18 files changed, 49 insertions(+), 58 deletions(-)

diff --git a/bin/node-template/node/src/command.rs b/bin/node-template/node/src/command.rs
index d3a04e0ae91e..b4f0a1804f66 100644
--- a/bin/node-template/node/src/command.rs
+++ b/bin/node-template/node/src/command.rs
@@ -121,8 +121,8 @@ pub fn run() -> sc_cli::Result<()> {
 
 				runner.sync_run(|config| cmd.run::<Block, service::Executor>(config))
 			} else {
-				Err("Benchmarking wasn't enabled when building the node. \
-				You can enable it with `--features runtime-benchmarks`."
+				Err("Benchmarking wasn't enabled when building the node. You can enable it with \
+				     `--features runtime-benchmarks`."
 					.into())
 			},
 		None => {
diff --git a/bin/node/executor/benches/bench.rs b/bin/node/executor/benches/bench.rs
index 8ac4b9015080..cd201cfc9598 100644
--- a/bin/node/executor/benches/bench.rs
+++ b/bin/node/executor/benches/bench.rs
@@ -40,8 +40,8 @@ criterion_main!(benches);
 /// The wasm runtime code.
 pub fn compact_code_unwrap() -> &'static [u8] {
 	node_runtime::WASM_BINARY.expect(
-		"Development wasm binary is not available. \
-									  Testing is only supported with the flag disabled.",
+		"Development wasm binary is not available. Testing is only supported with the flag \
+		 disabled.",
 	)
 }
 
diff --git a/bin/node/executor/tests/common.rs b/bin/node/executor/tests/common.rs
index 414b335406be..f7cf8db003c0 100644
--- a/bin/node/executor/tests/common.rs
+++ b/bin/node/executor/tests/common.rs
@@ -71,8 +71,8 @@ impl AppCrypto<MultiSigner, MultiSignature> for TestAuthorityId {
 /// runtime.
 pub fn compact_code_unwrap() -> &'static [u8] {
 	node_runtime::WASM_BINARY.expect(
-		"Development wasm binary is not available. \
-									  Testing is only supported with the flag disabled.",
+		"Development wasm binary is not available. Testing is only supported with the flag \
+		 disabled.",
 	)
 }
 
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 621de954c734..90bd11d484b2 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -101,9 +101,9 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 #[cfg(feature = "std")]
 pub fn wasm_binary_unwrap() -> &'static [u8] {
 	WASM_BINARY.expect(
-		"Development wasm binary is not available. This means the client is \
-						built with `SKIP_WASM_BUILD` flag and it is only usable for \
-						production chains. Please rebuild with the flag disabled.",
+		"Development wasm binary is not available. This means the client is built with \
+		 `SKIP_WASM_BUILD` flag and it is only usable for production chains. Please rebuild with \
+		 the flag disabled.",
 	)
 }
 
diff --git a/client/cli/src/commands/run_cmd.rs b/client/cli/src/commands/run_cmd.rs
index 8d4f72a5cc59..fcc486297b21 100644
--- a/client/cli/src/commands/run_cmd.rs
+++ b/client/cli/src/commands/run_cmd.rs
@@ -487,10 +487,9 @@ fn rpc_interface(
 ) -> Result<IpAddr> {
 	if is_external && is_validator && rpc_methods != RpcMethods::Unsafe {
 		return Err(Error::Input(
-			"--rpc-external and --ws-external options shouldn't be \
-		used if the node is running as a validator. Use `--unsafe-rpc-external` \
-		or `--rpc-methods=unsafe` if you understand the risks. See the options \
-		description for more information."
+			"--rpc-external and --ws-external options shouldn't be used if the node is running as \
+			 a validator. Use `--unsafe-rpc-external` or `--rpc-methods=unsafe` if you understand \
+			 the risks. See the options description for more information."
 				.to_owned(),
 		))
 	}
@@ -499,7 +498,7 @@ fn rpc_interface(
 		if rpc_methods == RpcMethods::Unsafe {
 			log::warn!(
 				"It isn't safe to expose RPC publicly without a proxy server that filters \
-			available set of RPC methods."
+				 available set of RPC methods."
 			);
 		}
 
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index 341b0ed25cc4..8efd39aa612e 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -108,8 +108,7 @@ fn slot_author<P: Pair>(slot: Slot, authorities: &[AuthorityId<P>]) -> Option<&A
 	);
 
 	let current_author = authorities.get(idx as usize).expect(
-		"authorities not empty; index constrained to list length;\
-				this is a valid index; qed",
+		"authorities not empty; index constrained to list length;this is a valid index; qed",
 	);
 
 	Some(current_author)
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index 315bd4e9921a..a8258e2c8352 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -1340,8 +1340,7 @@ where
 		}
 
 		let pre_digest = find_pre_digest::<Block>(&block.header).expect(
-			"valid babe headers must contain a predigest; \
-					 header has been already verified; qed",
+			"valid babe headers must contain a predigest; header has been already verified; qed",
 		);
 		let slot = pre_digest.slot();
 
@@ -1357,8 +1356,8 @@ where
 			})?;
 
 		let parent_slot = find_pre_digest::<Block>(&parent_header).map(|d| d.slot()).expect(
-			"parent is non-genesis; valid BABE headers contain a pre-digest; \
-					header has already been verified; qed",
+			"parent is non-genesis; valid BABE headers contain a pre-digest; header has already \
+			 been verified; qed",
 		);
 
 		// make sure that slot number is strictly increasing
@@ -1581,15 +1580,11 @@ where
 			.header(BlockId::Hash(info.finalized_hash))
 			.map_err(|e| ConsensusError::ClientImport(format!("{:?}", e)))?
 			.expect(
-				"best finalized hash was given by client; \
-				 finalized headers must exist in db; qed",
+				"best finalized hash was given by client; finalized headers must exist in db; qed",
 			);
 
 		find_pre_digest::<Block>(&finalized_header)
-			.expect(
-				"finalized header must be valid; \
-					 valid blocks have a pre-digest; qed",
-			)
+			.expect("finalized header must be valid; valid blocks have a pre-digest; qed")
 			.slot()
 	};
 
diff --git a/client/db/src/changes_tries_storage.rs b/client/db/src/changes_tries_storage.rs
index 6b948a2d2c5c..a02e1cf7add9 100644
--- a/client/db/src/changes_tries_storage.rs
+++ b/client/db/src/changes_tries_storage.rs
@@ -284,8 +284,8 @@ impl<Block: BlockT> DbChangesTrieStorage<Block> {
 	pub fn post_commit(&self, tx: Option<DbChangesTrieStorageTransaction<Block>>) {
 		if let Some(tx) = tx {
 			self.cache.0.write().commit(tx.cache_ops).expect(
-				"only fails if cache with given name isn't loaded yet;\
-						cache is already loaded because there is tx; qed",
+				"only fails if cache with given name isn't loaded yet; cache is already loaded \
+				 because there is tx; qed",
 			);
 		}
 	}
diff --git a/client/db/src/light.rs b/client/db/src/light.rs
index b1fff4f29066..0ad8224f0261 100644
--- a/client/db/src/light.rs
+++ b/client/db/src/light.rs
@@ -518,8 +518,8 @@ where
 
 			self.db.commit(transaction)?;
 			cache.commit(cache_ops).expect(
-				"only fails if cache with given name isn't loaded yet;\
-						cache is already loaded because there are cache_ops; qed",
+				"only fails if cache with given name isn't loaded yet; cache is already loaded \
+				 because there are cache_ops; qed",
 			);
 		}
 
@@ -569,8 +569,8 @@ where
 
 				self.db.commit(transaction)?;
 				cache.commit(cache_ops).expect(
-					"only fails if cache with given name isn't loaded yet;\
-							cache is already loaded because there are cache_ops; qed",
+					"only fails if cache with given name isn't loaded yet; cache is already loaded \
+					 because there are cache_ops; qed",
 				);
 			}
 			self.update_meta(hash, header.number().clone(), false, true);
diff --git a/client/executor/runtime-test/src/lib.rs b/client/executor/runtime-test/src/lib.rs
index 11771b183e3c..c9f7d6b1e297 100644
--- a/client/executor/runtime-test/src/lib.rs
+++ b/client/executor/runtime-test/src/lib.rs
@@ -8,8 +8,8 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 #[cfg(feature = "std")]
 pub fn wasm_binary_unwrap() -> &'static [u8] {
 	WASM_BINARY.expect(
-		"Development wasm binary is not available. Testing is only \
-						supported with the flag disabled.",
+		"Development wasm binary is not available. Testing is only supported with the flag \
+		 disabled.",
 	)
 }
 
diff --git a/client/finality-grandpa/src/lib.rs b/client/finality-grandpa/src/lib.rs
index 58e7ba1493e8..1e34202ef8f9 100644
--- a/client/finality-grandpa/src/lib.rs
+++ b/client/finality-grandpa/src/lib.rs
@@ -1016,10 +1016,9 @@ where
 				})?;
 
 				let voters = Arc::new(VoterSet::new(new.authorities.into_iter()).expect(
-					"new authorities come from pending change; \
-						 pending change comes from `AuthoritySet`; \
-						 `AuthoritySet` validates authorities is non-empty and weights are non-zero; \
-						 qed.",
+					"new authorities come from pending change; pending change comes from \
+					 `AuthoritySet`; `AuthoritySet` validates authorities is non-empty and \
+					 weights are non-zero; qed.",
 				));
 
 				self.env = Arc::new(Environment {
diff --git a/client/network/src/discovery.rs b/client/network/src/discovery.rs
index da50ded077d5..6ca01cd89219 100644
--- a/client/network/src/discovery.rs
+++ b/client/network/src/discovery.rs
@@ -485,11 +485,10 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 			.map(|(p, k)| (p.clone(), NetworkBehaviour::new_handler(k)));
 
 		IntoMultiHandler::try_from_iter(iter).expect(
-			"There can be at most one handler per `ProtocolId` and \
-				protocol names contain the `ProtocolId` so no two protocol \
-				names in `self.kademlias` can be equal which is the only error \
-				`try_from_iter` can return, therefore this call is guaranteed \
-				to succeed; qed",
+			"There can be at most one handler per `ProtocolId` and protocol names contain the \
+			 `ProtocolId` so no two protocol names in `self.kademlias` can be equal which is the \
+			 only error `try_from_iter` can return, therefore this call is guaranteed to succeed; \
+			 qed",
 		)
 	}
 
diff --git a/client/network/src/request_responses.rs b/client/network/src/request_responses.rs
index 226e1c546d6c..bd20f1610d1a 100644
--- a/client/network/src/request_responses.rs
+++ b/client/network/src/request_responses.rs
@@ -364,8 +364,8 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 			.map(|(p, (r, _))| (p.to_string(), NetworkBehaviour::new_handler(r)));
 
 		MultiHandler::try_from_iter(iter).expect(
-			"Protocols are in a HashMap and there can be at most one handler per \
-						  protocol name, which is the only possible error; qed",
+			"Protocols are in a HashMap and there can be at most one handler per protocol name, \
+			 which is the only possible error; qed",
 		)
 	}
 
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index 1e5e28416191..901321f395bf 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -1072,8 +1072,8 @@ where
 		// telemetry once about the finalized block.
 		if let Some(last) = notify_finalized.last() {
 			let header = self.header(&BlockId::Hash(*last))?.expect(
-				"Header already known to exist in DB because it is \
-					indicated in the tree route; qed",
+				"Header already known to exist in DB because it is indicated in the tree route; \
+				 qed",
 			);
 
 			telemetry!(
@@ -1087,8 +1087,8 @@ where
 
 		for finalized_hash in notify_finalized {
 			let header = self.header(&BlockId::Hash(finalized_hash))?.expect(
-				"Header already known to exist in DB because it is \
-					indicated in the tree route; qed",
+				"Header already known to exist in DB because it is indicated in the tree route; \
+				 qed",
 			);
 
 			let notification = FinalityNotification { header, hash: finalized_hash };
diff --git a/frame/staking/reward-curve/src/lib.rs b/frame/staking/reward-curve/src/lib.rs
index 076c3682ab41..22ddc817091c 100644
--- a/frame/staking/reward-curve/src/lib.rs
+++ b/frame/staking/reward-curve/src/lib.rs
@@ -353,8 +353,8 @@ fn generate_piecewise_linear(points: Vec<(u32, u32)>) -> TokenStream2 {
 	for (x, y) in points {
 		let error = || {
 			panic!(
-				"Generated reward curve approximation doesn't fit into [0, 1] -> [0, 1] \
-			because of point:
+				"Generated reward curve approximation doesn't fit into [0, 1] -> [0, 1] because \
+				 of point:
 			x = {:07} per million
 			y = {:07} per million",
 				x, y
diff --git a/primitives/npos-elections/src/balancing.rs b/primitives/npos-elections/src/balancing.rs
index 378ebe8e84fd..63164049e526 100644
--- a/primitives/npos-elections/src/balancing.rs
+++ b/primitives/npos-elections/src/balancing.rs
@@ -157,8 +157,8 @@ pub(crate) fn balance_voter<AccountId: IdentifierT>(
 	let last_stake = elected_edges
 		.get(last_index)
 		.expect(
-			"length of elected_edges is greater than or equal 2; last_index index is at \
-		the minimum elected_edges.len() - 1; index is within range; qed",
+			"length of elected_edges is greater than or equal 2; last_index index is at the \
+			 minimum elected_edges.len() - 1; index is within range; qed",
 		)
 		.candidate
 		.borrow()
diff --git a/primitives/runtime-interface/test-wasm-deprecated/src/lib.rs b/primitives/runtime-interface/test-wasm-deprecated/src/lib.rs
index 8c864fc90e03..4a59e4fe8aa5 100644
--- a/primitives/runtime-interface/test-wasm-deprecated/src/lib.rs
+++ b/primitives/runtime-interface/test-wasm-deprecated/src/lib.rs
@@ -30,8 +30,8 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 #[cfg(feature = "std")]
 pub fn wasm_binary_unwrap() -> &'static [u8] {
 	WASM_BINARY.expect(
-		"Development wasm binary is not available. Testing is only \
-						supported with the flag disabled.",
+		"Development wasm binary is not available. Testing is only supported with the flag \
+		 disabled.",
 	)
 }
 
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index 62aa28d4260a..8da8f5c5db4e 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -76,8 +76,8 @@ pub mod wasm_binary_logging_disabled {
 #[cfg(feature = "std")]
 pub fn wasm_binary_unwrap() -> &'static [u8] {
 	WASM_BINARY.expect(
-		"Development wasm binary is not available. Testing is only \
-						supported with the flag disabled.",
+		"Development wasm binary is not available. Testing is only supported with the flag \
+		 disabled.",
 	)
 }
 
@@ -86,7 +86,7 @@ pub fn wasm_binary_unwrap() -> &'static [u8] {
 pub fn wasm_binary_logging_disabled_unwrap() -> &'static [u8] {
 	wasm_binary_logging_disabled::WASM_BINARY.expect(
 		"Development wasm binary is not available. Testing is only supported with the flag \
-			disabled.",
+		 disabled.",
 	)
 }
 

From 54c0a3084a946aa5c3e80c5f52d6f0569224cdab Mon Sep 17 00:00:00 2001
From: Keith Yeung <kungfukeith11@gmail.com>
Date: Mon, 26 Jul 2021 17:43:15 -0700
Subject: [PATCH 1023/1194] Add methods to PrefixIterator to support iterating
 from a specific key (#9313)

* Add methods to PrefixIterator to support iterating from a specific key

* Expose the decode functions used in iterators for storage maps

* Use associated decode function in tests

* Revert "Expose the decode functions used in iterators for storage maps"

This reverts commit 34f57d92db89646d0c98ea1880df58d58e523b09.

* Fix documentation for next_key

* Add API for iterating from a specified key for all storage map types

* Enhance pagination test

* Add API methods to storage map types

* Rename next_key to last_key

* Rename last_key to last_raw_key

* Specify that iteration starts after starting_raw_key

* Update documentation on iteration ordering

* Rename next_key to previous_key

* Enhance pagination unit test

* Create unit tests for all kinds of iter_from methods

* Define iter_from in terms of iter rather than vice versa

* Cargo fmt
---
 frame/support/src/lib.rs                      |   2 +-
 .../src/storage/generator/double_map.rs       |  66 +++++
 frame/support/src/storage/generator/map.rs    |  36 +++
 frame/support/src/storage/generator/mod.rs    |   2 +-
 frame/support/src/storage/generator/nmap.rs   |  80 +++++-
 frame/support/src/storage/mod.rs              | 269 +++++++++++++++---
 frame/support/src/storage/types/double_map.rs |  54 ++++
 frame/support/src/storage/types/map.rs        |  16 ++
 frame/support/src/storage/types/nmap.rs       |  56 +++-
 9 files changed, 535 insertions(+), 46 deletions(-)

diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 0cdaadbdae3a..52b3907f64ce 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -163,7 +163,7 @@ macro_rules! generate_storage_alias {
 			>;
 		}
 	};
-	($pallet:ident, $name:ident => NMap<$(($key:ty, $hasher:ty),)+ $value:ty>) => {
+	($pallet:ident, $name:ident => NMap<Key<$(($key:ty, $hasher:ty)),+>, $value:ty>) => {
 		$crate::paste::paste! {
 			$crate::generate_storage_alias!(@GENERATE_INSTANCE_STRUCT $pallet, $name);
 			type $name = $crate::storage::types::StorageNMap<
diff --git a/frame/support/src/storage/generator/double_map.rs b/frame/support/src/storage/generator/double_map.rs
index 5a775b50b6f5..cec5bf57e50c 100644
--- a/frame/support/src/storage/generator/double_map.rs
+++ b/frame/support/src/storage/generator/double_map.rs
@@ -369,6 +369,15 @@ where
 		}
 	}
 
+	fn iter_prefix_from(
+		k1: impl EncodeLike<K1>,
+		starting_raw_key: Vec<u8>,
+	) -> Self::PrefixIterator {
+		let mut iter = Self::iter_prefix(k1);
+		iter.set_last_raw_key(starting_raw_key);
+		iter
+	}
+
 	fn iter_key_prefix(k1: impl EncodeLike<K1>) -> Self::PartialKeyIterator {
 		let prefix = G::storage_double_map_final_key1(k1);
 		Self::PartialKeyIterator {
@@ -382,6 +391,15 @@ where
 		}
 	}
 
+	fn iter_key_prefix_from(
+		k1: impl EncodeLike<K1>,
+		starting_raw_key: Vec<u8>,
+	) -> Self::PartialKeyIterator {
+		let mut iter = Self::iter_key_prefix(k1);
+		iter.set_last_raw_key(starting_raw_key);
+		iter
+	}
+
 	fn drain_prefix(k1: impl EncodeLike<K1>) -> Self::PrefixIterator {
 		let mut iterator = Self::iter_prefix(k1);
 		iterator.drain = true;
@@ -404,6 +422,12 @@ where
 		}
 	}
 
+	fn iter_from(starting_raw_key: Vec<u8>) -> Self::Iterator {
+		let mut iter = Self::iter();
+		iter.set_last_raw_key(starting_raw_key);
+		iter
+	}
+
 	fn iter_keys() -> Self::FullKeyIterator {
 		let prefix = G::prefix_hash();
 		Self::FullKeyIterator {
@@ -420,6 +444,12 @@ where
 		}
 	}
 
+	fn iter_keys_from(starting_raw_key: Vec<u8>) -> Self::FullKeyIterator {
+		let mut iter = Self::iter_keys();
+		iter.set_last_raw_key(starting_raw_key);
+		iter
+	}
+
 	fn drain() -> Self::Iterator {
 		let mut iterator = Self::iter();
 		iterator.drain = true;
@@ -509,6 +539,42 @@ mod test_iterators {
 		prefix
 	}
 
+	#[test]
+	fn double_map_iter_from() {
+		sp_io::TestExternalities::default().execute_with(|| {
+			use crate::hash::Identity;
+			crate::generate_storage_alias!(
+				MyModule,
+				MyDoubleMap => DoubleMap<(u64, Identity), (u64, Identity), u64>
+			);
+
+			MyDoubleMap::insert(1, 10, 100);
+			MyDoubleMap::insert(1, 21, 201);
+			MyDoubleMap::insert(1, 31, 301);
+			MyDoubleMap::insert(1, 41, 401);
+			MyDoubleMap::insert(2, 20, 200);
+			MyDoubleMap::insert(3, 30, 300);
+			MyDoubleMap::insert(4, 40, 400);
+			MyDoubleMap::insert(5, 50, 500);
+
+			let starting_raw_key = MyDoubleMap::storage_double_map_final_key(1, 21);
+			let iter = MyDoubleMap::iter_key_prefix_from(1, starting_raw_key);
+			assert_eq!(iter.collect::<Vec<_>>(), vec![31, 41]);
+
+			let starting_raw_key = MyDoubleMap::storage_double_map_final_key(1, 31);
+			let iter = MyDoubleMap::iter_prefix_from(1, starting_raw_key);
+			assert_eq!(iter.collect::<Vec<_>>(), vec![(41, 401)]);
+
+			let starting_raw_key = MyDoubleMap::storage_double_map_final_key(2, 20);
+			let iter = MyDoubleMap::iter_keys_from(starting_raw_key);
+			assert_eq!(iter.collect::<Vec<_>>(), vec![(3, 30), (4, 40), (5, 50)]);
+
+			let starting_raw_key = MyDoubleMap::storage_double_map_final_key(3, 30);
+			let iter = MyDoubleMap::iter_from(starting_raw_key);
+			assert_eq!(iter.collect::<Vec<_>>(), vec![(4, 40, 400), (5, 50, 500)]);
+		});
+	}
+
 	#[test]
 	fn double_map_reversible_reversible_iteration() {
 		sp_io::TestExternalities::default().execute_with(|| {
diff --git a/frame/support/src/storage/generator/map.rs b/frame/support/src/storage/generator/map.rs
index 48593dba17bd..b78e9f96496f 100644
--- a/frame/support/src/storage/generator/map.rs
+++ b/frame/support/src/storage/generator/map.rs
@@ -153,6 +153,13 @@ where
 		}
 	}
 
+	/// Enumerate all elements in the map after a given key.
+	fn iter_from(starting_raw_key: Vec<u8>) -> Self::Iterator {
+		let mut iter = Self::iter();
+		iter.set_last_raw_key(starting_raw_key);
+		iter
+	}
+
 	/// Enumerate all keys in the map.
 	fn iter_keys() -> Self::KeyIterator {
 		let prefix = G::prefix_hash();
@@ -167,6 +174,13 @@ where
 		}
 	}
 
+	/// Enumerate all keys in the map after a given key.
+	fn iter_keys_from(starting_raw_key: Vec<u8>) -> Self::KeyIterator {
+		let mut iter = Self::iter_keys();
+		iter.set_last_raw_key(starting_raw_key);
+		iter
+	}
+
 	/// Enumerate all elements in the map.
 	fn drain() -> Self::Iterator {
 		let mut iterator = Self::iter();
@@ -382,6 +396,28 @@ mod test_iterators {
 		prefix
 	}
 
+	#[test]
+	fn map_iter_from() {
+		sp_io::TestExternalities::default().execute_with(|| {
+			use crate::hash::Identity;
+			crate::generate_storage_alias!(MyModule, MyMap => Map<(u64, Identity), u64>);
+
+			MyMap::insert(1, 10);
+			MyMap::insert(2, 20);
+			MyMap::insert(3, 30);
+			MyMap::insert(4, 40);
+			MyMap::insert(5, 50);
+
+			let starting_raw_key = MyMap::storage_map_final_key(3);
+			let iter = MyMap::iter_from(starting_raw_key);
+			assert_eq!(iter.collect::<Vec<_>>(), vec![(4, 40), (5, 50)]);
+
+			let starting_raw_key = MyMap::storage_map_final_key(2);
+			let iter = MyMap::iter_keys_from(starting_raw_key);
+			assert_eq!(iter.collect::<Vec<_>>(), vec![3, 4, 5]);
+		});
+	}
+
 	#[test]
 	fn map_reversible_reversible_iteration() {
 		sp_io::TestExternalities::default().execute_with(|| {
diff --git a/frame/support/src/storage/generator/mod.rs b/frame/support/src/storage/generator/mod.rs
index 86129091b7ef..576bada2e262 100644
--- a/frame/support/src/storage/generator/mod.rs
+++ b/frame/support/src/storage/generator/mod.rs
@@ -25,7 +25,7 @@
 //! This is internal api and is subject to change.
 
 mod double_map;
-mod map;
+pub(crate) mod map;
 mod nmap;
 mod value;
 
diff --git a/frame/support/src/storage/generator/nmap.rs b/frame/support/src/storage/generator/nmap.rs
index 595c21caf22e..2ea401f44e96 100755
--- a/frame/support/src/storage/generator/nmap.rs
+++ b/frame/support/src/storage/generator/nmap.rs
@@ -329,6 +329,18 @@ impl<K: ReversibleKeyGenerator, V: FullCodec, G: StorageNMap<K, V>>
 		}
 	}
 
+	fn iter_prefix_from<KP>(
+		kp: KP,
+		starting_raw_key: Vec<u8>,
+	) -> PrefixIterator<(<K as HasKeyPrefix<KP>>::Suffix, V)>
+	where
+		K: HasReversibleKeyPrefix<KP>,
+	{
+		let mut iter = Self::iter_prefix(kp);
+		iter.set_last_raw_key(starting_raw_key);
+		iter
+	}
+
 	fn iter_key_prefix<KP>(kp: KP) -> KeyPrefixIterator<<K as HasKeyPrefix<KP>>::Suffix>
 	where
 		K: HasReversibleKeyPrefix<KP>,
@@ -342,6 +354,18 @@ impl<K: ReversibleKeyGenerator, V: FullCodec, G: StorageNMap<K, V>>
 		}
 	}
 
+	fn iter_key_prefix_from<KP>(
+		kp: KP,
+		starting_raw_key: Vec<u8>,
+	) -> KeyPrefixIterator<<K as HasKeyPrefix<KP>>::Suffix>
+	where
+		K: HasReversibleKeyPrefix<KP>,
+	{
+		let mut iter = Self::iter_key_prefix(kp);
+		iter.set_last_raw_key(starting_raw_key);
+		iter
+	}
+
 	fn drain_prefix<KP>(kp: KP) -> PrefixIterator<(<K as HasKeyPrefix<KP>>::Suffix, V)>
 	where
 		K: HasReversibleKeyPrefix<KP>,
@@ -352,10 +376,14 @@ impl<K: ReversibleKeyGenerator, V: FullCodec, G: StorageNMap<K, V>>
 	}
 
 	fn iter() -> Self::Iterator {
+		Self::iter_from(G::prefix_hash())
+	}
+
+	fn iter_from(starting_raw_key: Vec<u8>) -> Self::Iterator {
 		let prefix = G::prefix_hash();
 		Self::Iterator {
-			prefix: prefix.clone(),
-			previous_key: prefix,
+			prefix,
+			previous_key: starting_raw_key,
 			drain: false,
 			closure: |raw_key_without_prefix, mut raw_value| {
 				let (final_key, _) = K::decode_final_key(raw_key_without_prefix)?;
@@ -365,10 +393,14 @@ impl<K: ReversibleKeyGenerator, V: FullCodec, G: StorageNMap<K, V>>
 	}
 
 	fn iter_keys() -> Self::KeyIterator {
+		Self::iter_keys_from(G::prefix_hash())
+	}
+
+	fn iter_keys_from(starting_raw_key: Vec<u8>) -> Self::KeyIterator {
 		let prefix = G::prefix_hash();
 		Self::KeyIterator {
-			prefix: prefix.clone(),
-			previous_key: prefix,
+			prefix,
+			previous_key: starting_raw_key,
 			drain: false,
 			closure: |raw_key_without_prefix| {
 				let (final_key, _) = K::decode_final_key(raw_key_without_prefix)?;
@@ -457,6 +489,46 @@ mod test_iterators {
 		prefix
 	}
 
+	#[test]
+	fn n_map_iter_from() {
+		sp_io::TestExternalities::default().execute_with(|| {
+			use crate::{hash::Identity, storage::Key as NMapKey};
+			crate::generate_storage_alias!(
+				MyModule,
+				MyNMap => NMap<Key<(u64, Identity), (u64, Identity), (u64, Identity)>, u64>
+			);
+
+			MyNMap::insert((1, 1, 1), 11);
+			MyNMap::insert((1, 1, 2), 21);
+			MyNMap::insert((1, 1, 3), 31);
+			MyNMap::insert((1, 2, 1), 12);
+			MyNMap::insert((1, 2, 2), 22);
+			MyNMap::insert((1, 2, 3), 32);
+			MyNMap::insert((1, 3, 1), 13);
+			MyNMap::insert((1, 3, 2), 23);
+			MyNMap::insert((1, 3, 3), 33);
+			MyNMap::insert((2, 0, 0), 200);
+
+			type Key = (NMapKey<Identity, u64>, NMapKey<Identity, u64>, NMapKey<Identity, u64>);
+
+			let starting_raw_key = MyNMap::storage_n_map_final_key::<Key, _>((1, 2, 2));
+			let iter = MyNMap::iter_key_prefix_from((1,), starting_raw_key);
+			assert_eq!(iter.collect::<Vec<_>>(), vec![(2, 3), (3, 1), (3, 2), (3, 3)]);
+
+			let starting_raw_key = MyNMap::storage_n_map_final_key::<Key, _>((1, 3, 1));
+			let iter = MyNMap::iter_prefix_from((1, 3), starting_raw_key);
+			assert_eq!(iter.collect::<Vec<_>>(), vec![(2, 23), (3, 33)]);
+
+			let starting_raw_key = MyNMap::storage_n_map_final_key::<Key, _>((1, 3, 2));
+			let iter = MyNMap::iter_keys_from(starting_raw_key);
+			assert_eq!(iter.collect::<Vec<_>>(), vec![(1, 3, 3), (2, 0, 0)]);
+
+			let starting_raw_key = MyNMap::storage_n_map_final_key::<Key, _>((1, 3, 3));
+			let iter = MyNMap::iter_from(starting_raw_key);
+			assert_eq!(iter.collect::<Vec<_>>(), vec![((2, 0, 0), 200)]);
+		});
+	}
+
 	#[test]
 	fn n_map_double_map_identical_key() {
 		sp_io::TestExternalities::default().execute_with(|| {
diff --git a/frame/support/src/storage/mod.rs b/frame/support/src/storage/mod.rs
index 88c8b5a22e78..57cbc6e31da1 100644
--- a/frame/support/src/storage/mod.rs
+++ b/frame/support/src/storage/mod.rs
@@ -328,19 +328,29 @@ pub trait IterableStorageMap<K: FullEncode, V: FullCodec>: StorageMap<K, V> {
 	/// The type that itereates over all `key`s.
 	type KeyIterator: Iterator<Item = K>;
 
-	/// Enumerate all elements in the map in no particular order. If you alter the map while doing
-	/// this, you'll get undefined results.
+	/// Enumerate all elements in the map in lexicographical order of the encoded key. If you
+	/// alter the map while doing this, you'll get undefined results.
 	fn iter() -> Self::Iterator;
 
-	/// Enumerate all keys in the map in no particular order, skipping over the elements. If you
-	/// alter the map while doing this, you'll get undefined results.
+	/// Enumerate all elements in the map after a specified `starting_raw_key` in lexicographical
+	/// order of the encoded key. If you alter the map while doing this, you'll get undefined
+	/// results.
+	fn iter_from(starting_raw_key: Vec<u8>) -> Self::Iterator;
+
+	/// Enumerate all keys in the map in lexicographical order of the encoded key, skipping over
+	/// the elements. If you alter the map while doing this, you'll get undefined results.
 	fn iter_keys() -> Self::KeyIterator;
 
-	/// Remove all elements from the map and iterate through them in no particular order. If you
-	/// add elements to the map while doing this, you'll get undefined results.
+	/// Enumerate all keys in the map after a specified `starting_raw_key` in lexicographical order
+	/// of the encoded key. If you alter the map while doing this, you'll get undefined results.
+	fn iter_keys_from(starting_raw_key: Vec<u8>) -> Self::KeyIterator;
+
+	/// Remove all elements from the map and iterate through them in lexicographical order of the
+	/// encoded key. If you add elements to the map while doing this, you'll get undefined results.
 	fn drain() -> Self::Iterator;
 
-	/// Translate the values of all elements by a function `f`, in the map in no particular order.
+	/// Translate the values of all elements by a function `f`, in the map in lexicographical order
+	/// of the encoded key.
 	/// By returning `None` from `f` for an element, you'll remove it from the map.
 	///
 	/// NOTE: If a value fail to decode because storage is corrupted then it is skipped.
@@ -363,34 +373,59 @@ pub trait IterableStorageDoubleMap<K1: FullCodec, K2: FullCodec, V: FullCodec>:
 	/// The type that iterates over all `(key1, key2, value)`.
 	type Iterator: Iterator<Item = (K1, K2, V)>;
 
-	/// Enumerate all elements in the map with first key `k1` in no particular order. If you add or
-	/// remove values whose first key is `k1` to the map while doing this, you'll get undefined
-	/// results.
+	/// Enumerate all elements in the map with first key `k1` in lexicographical order of the
+	/// encoded key. If you add or remove values whose first key is `k1` to the map while doing
+	/// this, you'll get undefined results.
 	fn iter_prefix(k1: impl EncodeLike<K1>) -> Self::PrefixIterator;
 
-	/// Enumerate all second keys `k2` in the map with the same first key `k1` in no particular
-	/// order. If you add or remove values whose first key is `k1` to the map while doing this,
-	/// you'll get undefined results.
+	/// Enumerate all elements in the map with first key `k1` after a specified `starting_raw_key`
+	/// in lexicographical order of the encoded key. If you add or remove values whose first key is
+	/// `k1` to the map while doing this, you'll get undefined results.
+	fn iter_prefix_from(k1: impl EncodeLike<K1>, starting_raw_key: Vec<u8>)
+		-> Self::PrefixIterator;
+
+	/// Enumerate all second keys `k2` in the map with the same first key `k1` in lexicographical
+	/// order of the encoded key. If you add or remove values whose first key is `k1` to the map
+	/// while doing this, you'll get undefined results.
 	fn iter_key_prefix(k1: impl EncodeLike<K1>) -> Self::PartialKeyIterator;
 
-	/// Remove all elements from the map with first key `k1` and iterate through them in no
-	/// particular order. If you add elements with first key `k1` to the map while doing this,
-	/// you'll get undefined results.
+	/// Enumerate all second keys `k2` in the map with the same first key `k1` after a specified
+	/// `starting_raw_key` in lexicographical order of the encoded key. If you add or remove values
+	/// whose first key is `k1` to the map while doing this, you'll get undefined results.
+	fn iter_key_prefix_from(
+		k1: impl EncodeLike<K1>,
+		starting_raw_key: Vec<u8>,
+	) -> Self::PartialKeyIterator;
+
+	/// Remove all elements from the map with first key `k1` and iterate through them in
+	/// lexicographical order of the encoded key. If you add elements with first key `k1` to the
+	/// map while doing this, you'll get undefined results.
 	fn drain_prefix(k1: impl EncodeLike<K1>) -> Self::PrefixIterator;
 
-	/// Enumerate all elements in the map in no particular order. If you add or remove values to
-	/// the map while doing this, you'll get undefined results.
+	/// Enumerate all elements in the map in lexicographical order of the encoded key. If you add
+	/// or remove values to the map while doing this, you'll get undefined results.
 	fn iter() -> Self::Iterator;
 
-	/// Enumerate all keys `k1` and `k2` in the map in no particular order. If you add or remove
-	/// values to the map while doing this, you'll get undefined results.
+	/// Enumerate all elements in the map after a specified `starting_raw_key` in lexicographical
+	/// order of the encoded key. If you add or remove values to the map while doing this, you'll
+	/// get undefined results.
+	fn iter_from(starting_raw_key: Vec<u8>) -> Self::Iterator;
+
+	/// Enumerate all keys `k1` and `k2` in the map in lexicographical order of the encoded key. If
+	/// you add or remove values to the map while doing this, you'll get undefined results.
 	fn iter_keys() -> Self::FullKeyIterator;
 
-	/// Remove all elements from the map and iterate through them in no particular order. If you
-	/// add elements to the map while doing this, you'll get undefined results.
+	/// Enumerate all keys `k1` and `k2` in the map after a specified `starting_raw_key` in
+	/// lexicographical order of the encoded key. If you add or remove values to the map while
+	/// doing this, you'll get undefined results.
+	fn iter_keys_from(starting_raw_key: Vec<u8>) -> Self::FullKeyIterator;
+
+	/// Remove all elements from the map and iterate through them in lexicographical order of the
+	/// encoded key. If you add elements to the map while doing this, you'll get undefined results.
 	fn drain() -> Self::Iterator;
 
-	/// Translate the values of all elements by a function `f`, in the map in no particular order.
+	/// Translate the values of all elements by a function `f`, in the map in lexicographical order
+	/// of the encoded key.
 	/// By returning `None` from `f` for an element, you'll remove it from the map.
 	///
 	/// NOTE: If a value fail to decode because storage is corrupted then it is skipped.
@@ -406,40 +441,71 @@ pub trait IterableStorageNMap<K: ReversibleKeyGenerator, V: FullCodec>: StorageN
 	/// The type that iterates over all `(key1, key2, key3, ... keyN), value)` tuples.
 	type Iterator: Iterator<Item = (K::Key, V)>;
 
-	/// Enumerate all elements in the map with prefix key `kp` in no particular order. If you add or
-	/// remove values whose prefix is `kp` to the map while doing this, you'll get undefined
-	/// results.
+	/// Enumerate all elements in the map with prefix key `kp` in lexicographical order of the
+	/// encoded key. If you add or remove values whose prefix is `kp` to the map while doing this,
+	/// you'll get undefined results.
 	fn iter_prefix<KP>(kp: KP) -> PrefixIterator<(<K as HasKeyPrefix<KP>>::Suffix, V)>
 	where
 		K: HasReversibleKeyPrefix<KP>;
 
-	/// Enumerate all suffix keys in the map with prefix key `kp` in no particular order. If you
-	/// add or remove values whose prefix is `kp` to the map while doing this, you'll get undefined
-	/// results.
-	fn iter_key_prefix<KP>(kp: KP) -> KeyPrefixIterator<<K as HasKeyPrefix<KP>>::Suffix>
+	/// Enumerate all elements in the map with prefix key `kp` after a specified `starting_raw_key`
+	/// in lexicographical order of the encoded key. If you add or remove values whose prefix is
+	/// `kp` to the map while doing this, you'll get undefined results.
+	fn iter_prefix_from<KP>(
+		kp: KP,
+		starting_raw_key: Vec<u8>,
+	) -> PrefixIterator<(<K as HasKeyPrefix<KP>>::Suffix, V)>
 	where
 		K: HasReversibleKeyPrefix<KP>;
 
-	/// Remove all elements from the map with prefix key `kp` and iterate through them in no
-	/// particular order. If you add elements with prefix key `kp` to the map while doing this,
+	/// Enumerate all suffix keys in the map with prefix key `kp` in lexicographical order of the
+	/// encoded key. If you add or remove values whose prefix is `kp` to the map while doing this,
 	/// you'll get undefined results.
+	fn iter_key_prefix<KP>(kp: KP) -> KeyPrefixIterator<<K as HasKeyPrefix<KP>>::Suffix>
+	where
+		K: HasReversibleKeyPrefix<KP>;
+
+	/// Enumerate all suffix keys in the map with prefix key `kp` after a specified
+	/// `starting_raw_key` in lexicographical order of the encoded key. If you add or remove values
+	/// whose prefix is `kp` to the map while doing this, you'll get undefined results.
+	fn iter_key_prefix_from<KP>(
+		kp: KP,
+		starting_raw_key: Vec<u8>,
+	) -> KeyPrefixIterator<<K as HasKeyPrefix<KP>>::Suffix>
+	where
+		K: HasReversibleKeyPrefix<KP>;
+
+	/// Remove all elements from the map with prefix key `kp` and iterate through them in
+	/// lexicographical order of the encoded key. If you add elements with prefix key `kp` to the
+	/// map while doing this, you'll get undefined results.
 	fn drain_prefix<KP>(kp: KP) -> PrefixIterator<(<K as HasKeyPrefix<KP>>::Suffix, V)>
 	where
 		K: HasReversibleKeyPrefix<KP>;
 
-	/// Enumerate all elements in the map in no particular order. If you add or remove values to
-	/// the map while doing this, you'll get undefined results.
+	/// Enumerate all elements in the map in lexicographical order of the encoded key. If you add
+	/// or remove values to the map while doing this, you'll get undefined results.
 	fn iter() -> Self::Iterator;
 
-	/// Enumerate all keys in the map in no particular order. If you add or remove values to the
-	/// map while doing this, you'll get undefined results.
+	/// Enumerate all elements in the map after a specified `starting_raw_key` in lexicographical
+	/// order of the encoded key. If you add or remove values to the map while doing this, you'll
+	/// get undefined results.
+	fn iter_from(starting_raw_key: Vec<u8>) -> Self::Iterator;
+
+	/// Enumerate all keys in the map in lexicographical order of the encoded key. If you add or
+	/// remove values to the map while doing this, you'll get undefined results.
 	fn iter_keys() -> Self::KeyIterator;
 
-	/// Remove all elements from the map and iterate through them in no particular order. If you
-	/// add elements to the map while doing this, you'll get undefined results.
+	/// Enumerate all keys in the map after `starting_raw_key` in lexicographical order of the
+	/// encoded key. If you add or remove values to the map while doing this, you'll get undefined
+	/// results.
+	fn iter_keys_from(starting_raw_key: Vec<u8>) -> Self::KeyIterator;
+
+	/// Remove all elements from the map and iterate through them in lexicographical order of the
+	/// encoded key. If you add elements to the map while doing this, you'll get undefined results.
 	fn drain() -> Self::Iterator;
 
-	/// Translate the values of all elements by a function `f`, in the map in no particular order.
+	/// Translate the values of all elements by a function `f`, in the map in lexicographical order
+	/// of the encoded key.
 	/// By returning `None` from `f` for an element, you'll remove it from the map.
 	///
 	/// NOTE: If a value fail to decode because storage is corrupted then it is skipped.
@@ -733,6 +799,37 @@ pub struct PrefixIterator<T> {
 }
 
 impl<T> PrefixIterator<T> {
+	/// Creates a new `PrefixIterator`, iterating after `previous_key` and filtering out keys that
+	/// are not prefixed with `prefix`.
+	///
+	/// A `decode_fn` function must also be supplied, and it takes in two `&[u8]` parameters,
+	/// returning a `Result` containing the decoded type `T` if successful, and a `codec::Error` on
+	/// failure. The first `&[u8]` argument represents the raw, undecoded key without the prefix of
+	/// the current item, while the second `&[u8]` argument denotes the corresponding raw,
+	/// undecoded value.
+	pub fn new(
+		prefix: Vec<u8>,
+		previous_key: Vec<u8>,
+		decode_fn: fn(&[u8], &[u8]) -> Result<T, codec::Error>,
+	) -> Self {
+		PrefixIterator { prefix, previous_key, drain: false, closure: decode_fn }
+	}
+
+	/// Get the last key that has been iterated upon and return it.
+	pub fn last_raw_key(&self) -> &[u8] {
+		&self.previous_key
+	}
+
+	/// Get the prefix that is being iterated upon for this iterator and return it.
+	pub fn prefix(&self) -> &[u8] {
+		&self.prefix
+	}
+
+	/// Set the key that the iterator should start iterating after.
+	pub fn set_last_raw_key(&mut self, previous_key: Vec<u8>) {
+		self.previous_key = previous_key;
+	}
+
 	/// Mutate this iterator into a draining iterator; items iterated are removed from storage.
 	pub fn drain(mut self) -> Self {
 		self.drain = true;
@@ -798,6 +895,36 @@ pub struct KeyPrefixIterator<T> {
 }
 
 impl<T> KeyPrefixIterator<T> {
+	/// Creates a new `KeyPrefixIterator`, iterating after `previous_key` and filtering out keys
+	/// that are not prefixed with `prefix`.
+	///
+	/// A `decode_fn` function must also be supplied, and it takes in a `&[u8]` parameter, returning
+	/// a `Result` containing the decoded key type `T` if successful, and a `codec::Error` on
+	/// failure. The `&[u8]` argument represents the raw, undecoded key without the prefix of the
+	/// current item.
+	pub fn new(
+		prefix: Vec<u8>,
+		previous_key: Vec<u8>,
+		decode_fn: fn(&[u8]) -> Result<T, codec::Error>,
+	) -> Self {
+		KeyPrefixIterator { prefix, previous_key, drain: false, closure: decode_fn }
+	}
+
+	/// Get the last key that has been iterated upon and return it.
+	pub fn last_raw_key(&self) -> &[u8] {
+		&self.previous_key
+	}
+
+	/// Get the prefix that is being iterated upon for this iterator and return it.
+	pub fn prefix(&self) -> &[u8] {
+		&self.prefix
+	}
+
+	/// Set the key that the iterator should start iterating after.
+	pub fn set_last_raw_key(&mut self, previous_key: Vec<u8>) {
+		self.previous_key = previous_key;
+	}
+
 	/// Mutate this iterator into a draining iterator; items iterated are removed from storage.
 	pub fn drain(mut self) -> Self {
 		self.drain = true;
@@ -1429,6 +1556,70 @@ mod test {
 		});
 	}
 
+	#[test]
+	fn prefix_iterator_pagination_works() {
+		TestExternalities::default().execute_with(|| {
+			use crate::{hash::Identity, storage::generator::map::StorageMap};
+			crate::generate_storage_alias! {
+				MyModule,
+				MyStorageMap => Map<(u64, Identity), u64>
+			}
+
+			MyStorageMap::insert(1, 10);
+			MyStorageMap::insert(2, 20);
+			MyStorageMap::insert(3, 30);
+			MyStorageMap::insert(4, 40);
+			MyStorageMap::insert(5, 50);
+			MyStorageMap::insert(6, 60);
+			MyStorageMap::insert(7, 70);
+			MyStorageMap::insert(8, 80);
+			MyStorageMap::insert(9, 90);
+			MyStorageMap::insert(10, 100);
+
+			let op = |(_, v)| v / 10;
+			let mut final_vec = vec![];
+			let mut iter = MyStorageMap::iter();
+
+			let elem = iter.next().unwrap();
+			assert_eq!(elem, (1, 10));
+			final_vec.push(op(elem));
+
+			let elem = iter.next().unwrap();
+			assert_eq!(elem, (2, 20));
+			final_vec.push(op(elem));
+
+			let stored_key = iter.last_raw_key().to_owned();
+			assert_eq!(stored_key, MyStorageMap::storage_map_final_key(2));
+
+			let mut iter = MyStorageMap::iter_from(stored_key.clone());
+
+			final_vec.push(op(iter.next().unwrap()));
+			final_vec.push(op(iter.next().unwrap()));
+			final_vec.push(op(iter.next().unwrap()));
+
+			assert_eq!(final_vec, vec![1, 2, 3, 4, 5]);
+
+			let mut iter = PrefixIterator::new(
+				iter.prefix().to_vec(),
+				stored_key,
+				|mut raw_key_without_prefix, mut raw_value| {
+					let key = u64::decode(&mut raw_key_without_prefix)?;
+					Ok((key, u64::decode(&mut raw_value)?))
+				},
+			);
+			let previous_key = MyStorageMap::storage_map_final_key(5);
+			iter.set_last_raw_key(previous_key);
+
+			let remaining = iter.map(op).collect::<Vec<_>>();
+			assert_eq!(remaining.len(), 5);
+			assert_eq!(remaining, vec![6, 7, 8, 9, 10]);
+
+			final_vec.extend_from_slice(&remaining);
+
+			assert_eq!(final_vec, vec![1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
+		});
+	}
+
 	#[test]
 	fn child_trie_prefixed_map_works() {
 		TestExternalities::default().execute_with(|| {
diff --git a/frame/support/src/storage/types/double_map.rs b/frame/support/src/storage/types/double_map.rs
index 1704f8a647cb..2db8a845c568 100644
--- a/frame/support/src/storage/types/double_map.rs
+++ b/frame/support/src/storage/types/double_map.rs
@@ -406,6 +406,21 @@ where
 		<Self as crate::storage::IterableStorageDoubleMap<Key1, Key2, Value>>::iter_prefix(k1)
 	}
 
+	/// Enumerate all elements in the map with first key `k1` after a specified `starting_raw_key`
+	/// in no particular order.
+	///
+	/// If you add or remove values whose first key is `k1` to the map while doing this, you'll get
+	/// undefined results.
+	pub fn iter_prefix_from(
+		k1: impl EncodeLike<Key1>,
+		starting_raw_key: Vec<u8>,
+	) -> crate::storage::PrefixIterator<(Key2, Value)> {
+		<Self as crate::storage::IterableStorageDoubleMap<Key1, Key2, Value>>::iter_prefix_from(
+			k1,
+			starting_raw_key,
+		)
+	}
+
 	/// Enumerate all second keys `k2` in the map with the same first key `k1` in no particular
 	/// order.
 	///
@@ -415,6 +430,21 @@ where
 		<Self as crate::storage::IterableStorageDoubleMap<Key1, Key2, Value>>::iter_key_prefix(k1)
 	}
 
+	/// Enumerate all second keys `k2` in the map with the same first key `k1` after a specified
+	/// `starting_raw_key` in no particular order.
+	///
+	/// If you add or remove values whose first key is `k1` to the map while doing this, you'll get
+	/// undefined results.
+	pub fn iter_key_prefix_from(
+		k1: impl EncodeLike<Key1>,
+		starting_raw_key: Vec<u8>,
+	) -> crate::storage::KeyPrefixIterator<Key2> {
+		<Self as crate::storage::IterableStorageDoubleMap<Key1, Key2, Value>>::iter_key_prefix_from(
+			k1,
+			starting_raw_key,
+		)
+	}
+
 	/// Remove all elements from the map with first key `k1` and iterate through them in no
 	/// particular order.
 	///
@@ -433,6 +463,18 @@ where
 		<Self as crate::storage::IterableStorageDoubleMap<Key1, Key2, Value>>::iter()
 	}
 
+	/// Enumerate all elements in the map after a specified `starting_raw_key` in no particular
+	/// order.
+	///
+	/// If you add or remove values to the map while doing this, you'll get undefined results.
+	pub fn iter_from(
+		starting_raw_key: Vec<u8>,
+	) -> crate::storage::PrefixIterator<(Key1, Key2, Value)> {
+		<Self as crate::storage::IterableStorageDoubleMap<Key1, Key2, Value>>::iter_from(
+			starting_raw_key,
+		)
+	}
+
 	/// Enumerate all keys `k1` and `k2` in the map in no particular order.
 	///
 	/// If you add or remove values to the map while doing this, you'll get undefined results.
@@ -440,6 +482,18 @@ where
 		<Self as crate::storage::IterableStorageDoubleMap<Key1, Key2, Value>>::iter_keys()
 	}
 
+	/// Enumerate all keys `k1` and `k2` in the map after a specified `starting_raw_key` in no
+	/// particular order.
+	///
+	/// If you add or remove values to the map while doing this, you'll get undefined results.
+	pub fn iter_keys_from(
+		starting_raw_key: Vec<u8>,
+	) -> crate::storage::KeyPrefixIterator<(Key1, Key2)> {
+		<Self as crate::storage::IterableStorageDoubleMap<Key1, Key2, Value>>::iter_keys_from(
+			starting_raw_key,
+		)
+	}
+
 	/// Remove all elements from the map and iterate through them in no particular order.
 	///
 	/// If you add elements to the map while doing this, you'll get undefined results.
diff --git a/frame/support/src/storage/types/map.rs b/frame/support/src/storage/types/map.rs
index 00fa3a3b8b40..6b3cfe64eaec 100644
--- a/frame/support/src/storage/types/map.rs
+++ b/frame/support/src/storage/types/map.rs
@@ -296,6 +296,14 @@ where
 		<Self as crate::storage::IterableStorageMap<Key, Value>>::iter()
 	}
 
+	/// Enumerate all elements in the map after a specified `starting_raw_key` in no
+	/// particular order.
+	///
+	/// If you alter the map while doing this, you'll get undefined results.
+	pub fn iter_from(starting_raw_key: Vec<u8>) -> crate::storage::PrefixIterator<(Key, Value)> {
+		<Self as crate::storage::IterableStorageMap<Key, Value>>::iter_from(starting_raw_key)
+	}
+
 	/// Enumerate all keys in the map in no particular order.
 	///
 	/// If you alter the map while doing this, you'll get undefined results.
@@ -303,6 +311,14 @@ where
 		<Self as crate::storage::IterableStorageMap<Key, Value>>::iter_keys()
 	}
 
+	/// Enumerate all keys in the map after a specified `starting_raw_key` in no particular
+	/// order.
+	///
+	/// If you alter the map while doing this, you'll get undefined results.
+	pub fn iter_keys_from(starting_raw_key: Vec<u8>) -> crate::storage::KeyPrefixIterator<Key> {
+		<Self as crate::storage::IterableStorageMap<Key, Value>>::iter_keys_from(starting_raw_key)
+	}
+
 	/// Remove all elements from the map and iterate through them in no particular order.
 	///
 	/// If you add elements to the map while doing this, you'll get undefined results.
diff --git a/frame/support/src/storage/types/nmap.rs b/frame/support/src/storage/types/nmap.rs
index f62cd1435a2d..149872ccba9a 100755
--- a/frame/support/src/storage/types/nmap.rs
+++ b/frame/support/src/storage/types/nmap.rs
@@ -328,6 +328,24 @@ where
 		<Self as crate::storage::IterableStorageNMap<Key, Value>>::iter_prefix(kp)
 	}
 
+	/// Enumerate all elements in the map with prefix key `kp` after a specified `starting_raw_key`
+	/// in no particular order.
+	///
+	/// If you add or remove values whose prefix key is `kp` to the map while doing this, you'll get
+	/// undefined results.
+	pub fn iter_prefix_from<KP>(
+		kp: KP,
+		starting_raw_key: Vec<u8>,
+	) -> crate::storage::PrefixIterator<(<Key as HasKeyPrefix<KP>>::Suffix, Value)>
+	where
+		Key: HasReversibleKeyPrefix<KP>,
+	{
+		<Self as crate::storage::IterableStorageNMap<Key, Value>>::iter_prefix_from(
+			kp,
+			starting_raw_key,
+		)
+	}
+
 	/// Enumerate all suffix keys in the map with prefix key `kp` in no particular order.
 	///
 	/// If you add or remove values whose prefix key is `kp` to the map while doing this, you'll get
@@ -341,6 +359,24 @@ where
 		<Self as crate::storage::IterableStorageNMap<Key, Value>>::iter_key_prefix(kp)
 	}
 
+	/// Enumerate all suffix keys in the map with prefix key `kp` after a specified
+	/// `starting_raw_key` in no particular order.
+	///
+	/// If you add or remove values whose prefix key is `kp` to the map while doing this, you'll get
+	/// undefined results.
+	pub fn iter_key_prefix_from<KP>(
+		kp: KP,
+		starting_raw_key: Vec<u8>,
+	) -> crate::storage::KeyPrefixIterator<<Key as HasKeyPrefix<KP>>::Suffix>
+	where
+		Key: HasReversibleKeyPrefix<KP>,
+	{
+		<Self as crate::storage::IterableStorageNMap<Key, Value>>::iter_key_prefix_from(
+			kp,
+			starting_raw_key,
+		)
+	}
+
 	/// Remove all elements from the map with prefix key `kp` and iterate through them in no
 	/// particular order.
 	///
@@ -362,6 +398,15 @@ where
 		<Self as crate::storage::IterableStorageNMap<Key, Value>>::iter()
 	}
 
+	/// Enumerate all elements in the map after a specified `starting_key` in no particular order.
+	///
+	/// If you add or remove values to the map while doing this, you'll get undefined results.
+	pub fn iter_from(
+		starting_raw_key: Vec<u8>,
+	) -> crate::storage::PrefixIterator<(Key::Key, Value)> {
+		<Self as crate::storage::IterableStorageNMap<Key, Value>>::iter_from(starting_raw_key)
+	}
+
 	/// Enumerate all keys in the map in no particular order.
 	///
 	/// If you add or remove values to the map while doing this, you'll get undefined results.
@@ -369,6 +414,15 @@ where
 		<Self as crate::storage::IterableStorageNMap<Key, Value>>::iter_keys()
 	}
 
+	/// Enumerate all keys in the map after a specified `starting_raw_key` in no particular order.
+	///
+	/// If you add or remove values to the map while doing this, you'll get undefined results.
+	pub fn iter_keys_from(
+		starting_raw_key: Vec<u8>,
+	) -> crate::storage::KeyPrefixIterator<Key::Key> {
+		<Self as crate::storage::IterableStorageNMap<Key, Value>>::iter_keys_from(starting_raw_key)
+	}
+
 	/// Remove all elements from the map and iterate through them in no particular order.
 	///
 	/// If you add elements to the map while doing this, you'll get undefined results.
@@ -511,7 +565,7 @@ mod test {
 
 			{
 				crate::generate_storage_alias!(test, Foo => NMap<
-					(u16, Blake2_128Concat),
+					Key<(u16, Blake2_128Concat)>,
 					u32
 				>);
 

From 8cc7d9dc71cb608e7a9ba085087a6d6ff4e16763 Mon Sep 17 00:00:00 2001
From: Liu-Cheng Xu <xuliuchengxlc@gmail.com>
Date: Tue, 27 Jul 2021 16:43:27 +0800
Subject: [PATCH 1024/1194] More readable help for --sync option (#9441)

---
 client/cli/src/params/network_params.rs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/client/cli/src/params/network_params.rs b/client/cli/src/params/network_params.rs
index 185a93f66b3d..dd2e09e4a8c3 100644
--- a/client/cli/src/params/network_params.rs
+++ b/client/cli/src/params/network_params.rs
@@ -128,10 +128,13 @@ pub struct NetworkParams {
 	pub ipfs_server: bool,
 
 	/// Blockchain syncing mode.
-	/// Full - Download and validate full blockchain history (Default).
-	/// Fast - Download blocks and the latest state only.
-	/// FastUnsafe - Same as Fast, but do skips downloading state proofs.
-	#[structopt(long, default_value = "Full")]
+	///
+	/// - `Full`: Download and validate full blockchain history.
+	///
+	/// - `Fast`: Download blocks and the latest state only.
+	///
+	/// - `FastUnsafe`: Same as `Fast`, but skip downloading state proofs.
+	#[structopt(long, value_name = "SYNC_MODE", default_value = "Full")]
 	pub sync: SyncMode,
 }
 

From 6360780056d4cc885b8b066492c03ce7109ebe1d Mon Sep 17 00:00:00 2001
From: Squirrel <gilescope@gmail.com>
Date: Tue, 27 Jul 2021 11:00:06 +0100
Subject: [PATCH 1025/1194] IDEs like rust-src (#9443)

Co-authored-by: Giles Cope <giles.cope@gmail.com>
---
 shell.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/shell.nix b/shell.nix
index 73453fc66da6..03c95f56fc5d 100644
--- a/shell.nix
+++ b/shell.nix
@@ -7,6 +7,7 @@ let
     });
   nixpkgs = import <nixpkgs> { overlays = [ mozillaOverlay ]; };
   rust-nightly = with nixpkgs; ((rustChannelOf { date = "2021-07-06"; channel = "nightly"; }).rust.override {
+    extensions = [ "rust-src" ];
     targets = [ "wasm32-unknown-unknown" ];
   });
 in
@@ -19,6 +20,7 @@ with nixpkgs; pkgs.mkShell {
     darwin.apple_sdk.frameworks.Security
   ];
 
+  RUST_SRC_PATH="${rust-nightly}/lib/rustlib/src/rust/src";
   LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
   PROTOC = "${protobuf}/bin/protoc";
   ROCKSDB_LIB_DIR = "${rocksdb}/lib";

From e76e4c6fca3f37de9a9980f03d224c255e674615 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 27 Jul 2021 13:01:28 +0200
Subject: [PATCH 1026/1194] Update trybuild to get better normalization (#9444)

The old `trybuild` version didn't normalized cargo registry paths, but
this is now done :)
---
 Cargo.lock                                                | 4 ++--
 frame/support/test/Cargo.toml                             | 2 +-
 .../tests/pallet_ui/call_argument_invalid_bound_2.stderr  | 8 ++++----
 primitives/api/test/Cargo.toml                            | 2 +-
 primitives/npos-elections/compact/Cargo.toml              | 2 +-
 primitives/runtime-interface/Cargo.toml                   | 2 +-
 test-utils/Cargo.toml                                     | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bd6bcff83fd5..b7e22d9d2cf3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10672,9 +10672,9 @@ dependencies = [
 
 [[package]]
 name = "trybuild"
-version = "1.0.42"
+version = "1.0.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1768998d9a3b179411618e377dbb134c58a88cda284b0aa71c42c40660127d46"
+checksum = "c02c413315329fc96167f922b46fd0caa3a43f4697b7a7896b183c7142635832"
 dependencies = [
  "dissimilar",
  "glob",
diff --git a/frame/support/test/Cargo.toml b/frame/support/test/Cargo.toml
index bfd5b6ec62ff..c8f746c7cb9d 100644
--- a/frame/support/test/Cargo.toml
+++ b/frame/support/test/Cargo.toml
@@ -20,7 +20,7 @@ frame-support = { version = "4.0.0-dev", default-features = false, path = "../"
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/runtime" }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/core" }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/std" }
-trybuild = "1.0.42"
+trybuild = "1.0.43"
 pretty_assertions = "0.6.1"
 rustversion = "1.0.0"
 frame-metadata = { version = "14.0.0-dev", default-features = false, path = "../../metadata" }
diff --git a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr
index 1ba613c66d49..0e1ebbf52525 100644
--- a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr
+++ b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr
@@ -33,9 +33,9 @@ error[E0277]: the trait bound `<T as pallet::Config>::Bar: WrapperTypeEncode` is
 20  |         pub fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
     |                                               ^ the trait `WrapperTypeEncode` is not implemented for `<T as pallet::Config>::Bar`
     |
-   ::: /usr/local/cargo/registry/src/github.com-1ecc6299db9ec823/parity-scale-codec-2.2.0/src/codec.rs:223:21
+   ::: $CARGO/parity-scale-codec-2.2.0/src/codec.rs
     |
-223 |     fn encode_to<T: Output + ?Sized>(&self, dest: &mut T) {
+    |     fn encode_to<T: Output + ?Sized>(&self, dest: &mut T) {
     |                     ------ required by this bound in `encode_to`
     |
     = note: required because of the requirements on the impl of `pallet::_::_parity_scale_codec::Encode` for `<T as pallet::Config>::Bar`
@@ -46,9 +46,9 @@ error[E0277]: the trait bound `<T as pallet::Config>::Bar: WrapperTypeDecode` is
 20  |         pub fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
     |                                               ^ the trait `WrapperTypeDecode` is not implemented for `<T as pallet::Config>::Bar`
     |
-   ::: /usr/local/cargo/registry/src/github.com-1ecc6299db9ec823/parity-scale-codec-2.2.0/src/codec.rs:284:18
+   ::: $CARGO/parity-scale-codec-2.2.0/src/codec.rs
     |
-284 |     fn decode<I: Input>(input: &mut I) -> Result<Self, Error>;
+    |     fn decode<I: Input>(input: &mut I) -> Result<Self, Error>;
     |                  ----- required by this bound in `pallet::_::_parity_scale_codec::Decode::decode`
     |
     = note: required because of the requirements on the impl of `Decode` for `<T as pallet::Config>::Bar`
diff --git a/primitives/api/test/Cargo.toml b/primitives/api/test/Cargo.toml
index 5c2250a2ad4c..a43db55c39db 100644
--- a/primitives/api/test/Cargo.toml
+++ b/primitives/api/test/Cargo.toml
@@ -22,7 +22,7 @@ sp-consensus = { version = "0.10.0-dev", path = "../../consensus/common" }
 sc-block-builder = { version = "0.10.0-dev", path = "../../../client/block-builder" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 sp-state-machine = { version = "0.10.0-dev", path = "../../state-machine" }
-trybuild = "1.0.42"
+trybuild = "1.0.43"
 rustversion = "1.0.0"
 
 [dev-dependencies]
diff --git a/primitives/npos-elections/compact/Cargo.toml b/primitives/npos-elections/compact/Cargo.toml
index 7188128ad29d..2e8bd0e953d0 100644
--- a/primitives/npos-elections/compact/Cargo.toml
+++ b/primitives/npos-elections/compact/Cargo.toml
@@ -24,4 +24,4 @@ proc-macro-crate = "1.0.0"
 parity-scale-codec = "2.0.1"
 sp-arithmetic = { path = "../../arithmetic" , version = "4.0.0-dev"}
 sp-npos-elections = { path = ".." , version = "4.0.0-dev"}
-trybuild = "1.0.42"
+trybuild = "1.0.43"
diff --git a/primitives/runtime-interface/Cargo.toml b/primitives/runtime-interface/Cargo.toml
index 9b51af705051..22ce22e8160a 100644
--- a/primitives/runtime-interface/Cargo.toml
+++ b/primitives/runtime-interface/Cargo.toml
@@ -31,7 +31,7 @@ sp-state-machine = { version = "0.10.0-dev", path = "../state-machine" }
 sp-core = { version = "4.0.0-dev", path = "../core" }
 sp-io = { version = "4.0.0-dev", path = "../io" }
 rustversion = "1.0.0"
-trybuild = "1.0.42"
+trybuild = "1.0.43"
 
 [features]
 default = [ "std" ]
diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml
index 983574915f2b..e59d0556522f 100644
--- a/test-utils/Cargo.toml
+++ b/test-utils/Cargo.toml
@@ -18,4 +18,4 @@ tokio = { version = "0.2.13", features = ["macros"] }
 
 [dev-dependencies]
 sc-service = { version = "0.10.0-dev", path = "../client/service" }
-trybuild = { version = "1.0.42", features = [ "diff" ] }
+trybuild = { version = "1.0.43", features = [ "diff" ] }

From 4b3eac11876533b7b3af525bdae176752aa39cca Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Tue, 27 Jul 2021 15:04:11 +0200
Subject: [PATCH 1027/1194] Make allocator limit available for the runtime
 (#9393)

* make allocator limit available

* better inner doc

* move const

* fmt

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 client/allocator/src/freeing_bump.rs | 14 +++++++++++---
 primitives/core/src/lib.rs           |  5 +++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/client/allocator/src/freeing_bump.rs b/client/allocator/src/freeing_bump.rs
index 105ef954ddf1..c5c97feae826 100644
--- a/client/allocator/src/freeing_bump.rs
+++ b/client/allocator/src/freeing_bump.rs
@@ -68,6 +68,7 @@
 //!   sizes.
 
 use crate::Error;
+pub use sp_core::MAX_POSSIBLE_ALLOCATION;
 use sp_wasm_interface::{Pointer, WordSize};
 use std::{
 	convert::{TryFrom, TryInto},
@@ -95,15 +96,13 @@ const LOG_TARGET: &'static str = "wasm-heap";
 // The minimum possible allocation size is chosen to be 8 bytes because in that case we would have
 // easier time to provide the guaranteed alignment of 8.
 //
-// The maximum possible allocation size was chosen rather arbitrary. 32 MiB should be enough for
-// everybody.
+// The maximum possible allocation size is set in the primitives to 32MiB.
 //
 // N_ORDERS - represents the number of orders supported.
 //
 // This number corresponds to the number of powers between the minimum possible allocation and
 // maximum possible allocation, or: 2^3...2^25 (both ends inclusive, hence 23).
 const N_ORDERS: usize = 23;
-const MAX_POSSIBLE_ALLOCATION: u32 = 33554432; // 2^25 bytes, 32 MiB
 const MIN_POSSIBLE_ALLOCATION: u32 = 8; // 2^3 bytes, 8 bytes
 
 /// The exponent for the power of two sized block adjusted to the minimum size.
@@ -922,4 +921,13 @@ mod tests {
 		assert!(heap.poisoned);
 		assert!(heap.deallocate(mem.as_mut(), alloc_ptr).is_err());
 	}
+
+	#[test]
+	fn test_n_orders() {
+		// Test that N_ORDERS is consistent with min and max possible allocation.
+		assert_eq!(
+			MIN_POSSIBLE_ALLOCATION * 2u32.pow(N_ORDERS as u32 - 1),
+			MAX_POSSIBLE_ALLOCATION
+		);
+	}
 }
diff --git a/primitives/core/src/lib.rs b/primitives/core/src/lib.rs
index 8bc189b5c371..83a7518358a9 100644
--- a/primitives/core/src/lib.rs
+++ b/primitives/core/src/lib.rs
@@ -455,3 +455,8 @@ macro_rules! impl_maybe_marker {
 		)+
 	}
 }
+
+/// The maximum number of bytes that can be allocated at one time.
+// The maximum possible allocation size was chosen rather arbitrary, 32 MiB should be enough for
+// everybody.
+pub const MAX_POSSIBLE_ALLOCATION: u32 = 33554432; // 2^25 bytes, 32 MiB

From 1b4b05d2c61b9da648a9124d9d52c82b012e6013 Mon Sep 17 00:00:00 2001
From: wangjj9219 <183318287@qq.com>
Date: Wed, 28 Jul 2021 00:59:34 +0800
Subject: [PATCH 1028/1194] check can_dec_provider when transfer allow death
 (#9411)

---
 frame/balances/src/lib.rs   |  2 +-
 frame/balances/src/tests.rs | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index e0f4e1003bbf..c955d917a643 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -1484,7 +1484,7 @@ where
 						//   may not even be a provider.
 						let allow_death = existence_requirement == ExistenceRequirement::AllowDeath;
 						let allow_death =
-							allow_death && !system::Pallet::<T>::is_provider_required(transactor);
+							allow_death && system::Pallet::<T>::can_dec_provider(transactor);
 						ensure!(
 							allow_death || from_account.total() >= ed,
 							Error::<T, I>::KeepAlive
diff --git a/frame/balances/src/tests.rs b/frame/balances/src/tests.rs
index 624c2de61890..fd57371b3a16 100644
--- a/frame/balances/src/tests.rs
+++ b/frame/balances/src/tests.rs
@@ -76,6 +76,30 @@ macro_rules! decl_tests {
 			});
 		}
 
+		#[test]
+		fn reap_failed_due_to_provider_and_consumer() {
+			<$ext_builder>::default().existential_deposit(1).monied(true).build().execute_with(|| {
+				// SCENARIO: only one provider and there are remaining consumers.
+				assert_ok!(System::inc_consumers(&1));
+				assert!(!System::can_dec_provider(&1));
+				assert_noop!(
+					<Balances as Currency<_>>::transfer(&1, &2, 10, AllowDeath),
+					Error::<$test, _>::KeepAlive
+				);
+				assert!(System::account_exists(&1));
+				assert_eq!(Balances::free_balance(1), 10);
+
+				// SCENARIO: more than one provider, but will not kill account due to other provider.
+				assert_eq!(System::inc_providers(&1), frame_system::IncRefStatus::Existed);
+				assert_eq!(System::providers(&1), 2);
+				assert!(System::can_dec_provider(&1));
+				assert_ok!(<Balances as Currency<_>>::transfer(&1, &2, 10, AllowDeath));
+				assert_eq!(System::providers(&1), 1);
+				assert!(System::account_exists(&1));
+				assert_eq!(Balances::free_balance(1), 0);
+			});
+		}
+
 		#[test]
 		fn partial_locking_should_work() {
 			<$ext_builder>::default().existential_deposit(1).monied(true).build().execute_with(|| {

From 7be311a6b6cc9d75e661ae6f61312991bad0beb6 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Tue, 27 Jul 2021 23:02:55 +0200
Subject: [PATCH 1029/1194] fix codec (#9445)

---
 frame/identity/src/types.rs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/frame/identity/src/types.rs b/frame/identity/src/types.rs
index 38bd6458a488..86e461c644d1 100644
--- a/frame/identity/src/types.rs
+++ b/frame/identity/src/types.rs
@@ -152,7 +152,7 @@ impl<Balance: Encode + Decode + MaxEncodedLen + Copy + Clone + Debug + Eq + Part
 /// The fields that we use to identify the owner of an account with. Each corresponds to a field
 /// in the `IdentityInfo` struct.
 #[repr(u64)]
-#[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, BitFlags, RuntimeDebug)]
+#[derive(Clone, Copy, PartialEq, Eq, BitFlags, RuntimeDebug)]
 pub enum IdentityField {
 	Display = 0b0000000000000000000000000000000000000000000000000000000000000001,
 	Legal = 0b0000000000000000000000000000000000000000000000000000000000000010,
@@ -164,19 +164,13 @@ pub enum IdentityField {
 	Twitter = 0b0000000000000000000000000000000000000000000000000000000010000000,
 }
 
-impl MaxEncodedLen for IdentityField {
-	fn max_encoded_len() -> usize {
-		u64::max_encoded_len()
-	}
-}
-
 /// Wrapper type for `BitFlags<IdentityField>` that implements `Codec`.
 #[derive(Clone, Copy, PartialEq, Default, RuntimeDebug)]
 pub struct IdentityFields(pub(crate) BitFlags<IdentityField>);
 
 impl MaxEncodedLen for IdentityFields {
 	fn max_encoded_len() -> usize {
-		IdentityField::max_encoded_len()
+		u64::max_encoded_len()
 	}
 }
 

From 97131a900b954b1f1dd0a826d3889348f1f02b66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 27 Jul 2021 23:21:27 +0200
Subject: [PATCH 1030/1194] Move `PalletVersion` away from the crate version
 (#9165)

* Move `PalletVersion` away from the crate version

Before this pr, `PalletVersion` was referring to the crate version that
hosted the pallet. This pr introduces a custom `package.metadata.frame`
section in the `Cargo.toml` that can contain a `pallet-version` key
value pair. While the value is expected to be a valid u16. If this
key/value pair isn't given, the version is set to 1.

It also changes the `PalletVersion` declaration. We now only have one
`u16` that represents the version. Not a major/minor/patch version. As
the old `PalletVersion` was starting with the `u16` major, decoding the
old values will work.

* Overhaul the entire implementation

- Drop PalletVersion
- Introduce StorageVersion
- StorageVersion needs to be set in the crate and set for the macros
- Added migration

* Fix migrations

* Review feedback

* Remove unneeded dep

* remove pub consts

* Brings back logging and implements `GetStorageVersion`

* Return weight from migration

* Fmt and remove unused import

* Update frame/support/src/dispatch.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Update frame/support/src/traits/metadata.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
---
 frame/contracts/src/lib.rs                    |   6 +-
 frame/contracts/src/migration.rs              |  17 +-
 frame/elections-phragmen/src/lib.rs           |   6 +-
 frame/elections-phragmen/src/migrations/v3.rs |  45 +--
 frame/elections-phragmen/src/migrations/v4.rs |  52 ++--
 frame/grandpa/src/lib.rs                      |   6 +-
 frame/grandpa/src/migrations.rs               |   4 +-
 .../grandpa/src/migrations/{v3_1.rs => v4.rs} |  49 ++--
 frame/offences/src/migration.rs               |   2 +-
 frame/support/procedural/src/lib.rs           |   8 -
 .../procedural/src/pallet/expand/hooks.rs     |  22 +-
 .../src/pallet/expand/pallet_struct.rs        |  28 +-
 .../src/pallet/parse/pallet_struct.rs         |  30 +-
 .../support/procedural/src/pallet_version.rs  |  64 ----
 frame/support/src/dispatch.rs                 | 232 +++++++++++----
 frame/support/src/lib.rs                      |  33 +--
 frame/support/src/migrations.rs               |  73 +++++
 frame/support/src/traits.rs                   |   4 +-
 frame/support/src/traits/hooks.rs             |  15 -
 frame/support/src/traits/metadata.rs          | 140 +++++----
 frame/support/test/src/lib.rs                 |   3 -
 frame/support/test/tests/pallet.rs            |  66 ++++-
 frame/support/test/tests/pallet_instance.rs   |  24 +-
 frame/support/test/tests/pallet_version.rs    | 274 ------------------
 24 files changed, 548 insertions(+), 655 deletions(-)
 rename frame/grandpa/src/migrations/{v3_1.rs => v4.rs} (73%)
 delete mode 100644 frame/support/procedural/src/pallet_version.rs
 create mode 100644 frame/support/src/migrations.rs
 delete mode 100644 frame/support/test/tests/pallet_version.rs

diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index a3a3311fa9be..74ab6578f797 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -111,7 +111,7 @@ use crate::{
 };
 use frame_support::{
 	dispatch::Dispatchable,
-	traits::{Currency, Filter, Get, OnUnbalanced, Randomness, Time},
+	traits::{Currency, Filter, Get, OnUnbalanced, Randomness, StorageVersion, Time},
 	weights::{GetDispatchInfo, PostDispatchInfo, Weight, WithPostDispatchInfo},
 };
 use frame_system::Pallet as System;
@@ -134,6 +134,9 @@ type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<
 	<T as frame_system::Config>::AccountId,
 >>::NegativeImbalance;
 
+/// The current storage version.
+const STORAGE_VERSION: StorageVersion = StorageVersion::new(4);
+
 #[frame_support::pallet]
 pub mod pallet {
 	use super::*;
@@ -273,6 +276,7 @@ pub mod pallet {
 	}
 
 	#[pallet::pallet]
+	#[pallet::storage_version(STORAGE_VERSION)]
 	pub struct Pallet<T>(PhantomData<T>);
 
 	#[pallet::hooks]
diff --git a/frame/contracts/src/migration.rs b/frame/contracts/src/migration.rs
index a28cb87bb60b..fbf5b59e9e8a 100644
--- a/frame/contracts/src/migration.rs
+++ b/frame/contracts/src/migration.rs
@@ -18,22 +18,17 @@
 use crate::{Config, Pallet, Weight};
 use frame_support::{
 	storage::migration,
-	traits::{Get, GetPalletVersion, PalletInfoAccess, PalletVersion},
+	traits::{Get, PalletInfoAccess, StorageVersion},
 };
 
 pub fn migrate<T: Config>() -> Weight {
 	let mut weight: Weight = 0;
 
-	match <Pallet<T>>::storage_version() {
-		Some(version) if version == PalletVersion::new(3, 0, 0) => {
-			weight = weight.saturating_add(T::DbWeight::get().writes(1));
-			migration::remove_storage_prefix(
-				<Pallet<T>>::name().as_bytes(),
-				b"CurrentSchedule",
-				b"",
-			);
-		},
-		_ => (),
+	if StorageVersion::get::<Pallet<T>>() == 3 {
+		weight = weight.saturating_add(T::DbWeight::get().writes(1));
+		migration::remove_storage_prefix(<Pallet<T>>::name().as_bytes(), b"CurrentSchedule", b"");
+
+		StorageVersion::new(4).put::<Pallet<T>>();
 	}
 
 	weight
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index 4b6dbc3f365d..144997c60c2e 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -104,7 +104,7 @@ use frame_support::{
 	traits::{
 		ChangeMembers, Contains, ContainsLengthBound, Currency, CurrencyToVote, Get,
 		InitializeMembers, LockIdentifier, LockableCurrency, OnUnbalanced, ReservableCurrency,
-		SortedMembers, WithdrawReasons,
+		SortedMembers, StorageVersion, WithdrawReasons,
 	},
 	weights::Weight,
 };
@@ -122,6 +122,9 @@ pub use weights::WeightInfo;
 /// All migrations.
 pub mod migrations;
 
+/// The current storage version.
+const STORAGE_VERSION: StorageVersion = StorageVersion::new(4);
+
 /// The maximum votes allowed per voter.
 pub const MAXIMUM_VOTE: usize = 16;
 
@@ -239,6 +242,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::storage_version(STORAGE_VERSION)]
 	pub struct Pallet<T>(PhantomData<T>);
 
 	#[pallet::hooks]
diff --git a/frame/elections-phragmen/src/migrations/v3.rs b/frame/elections-phragmen/src/migrations/v3.rs
index b19146a9e28e..fae191373fa1 100644
--- a/frame/elections-phragmen/src/migrations/v3.rs
+++ b/frame/elections-phragmen/src/migrations/v3.rs
@@ -19,7 +19,7 @@
 
 use codec::{Decode, Encode, FullCodec};
 use frame_support::{
-	traits::{GetPalletVersion, PalletVersion},
+	traits::{PalletInfoAccess, StorageVersion},
 	weights::Weight,
 	RuntimeDebug, Twox64Concat,
 };
@@ -41,8 +41,8 @@ struct Voter<AccountId, Balance> {
 
 /// Trait to implement to give information about types used for migration
 pub trait V2ToV3 {
-	/// elections-phragmen module, used to check storage version.
-	type Module: GetPalletVersion;
+	/// The elections-phragmen pallet.
+	type Pallet: 'static + PalletInfoAccess;
 
 	/// System config account id
 	type AccountId: 'static + FullCodec;
@@ -67,7 +67,7 @@ frame_support::generate_storage_alias!(
 	>
 );
 
-/// Apply all of the migrations from 2_0_0 to 3_0_0.
+/// Apply all of the migrations from 2 to 3.
 ///
 /// ### Warning
 ///
@@ -77,28 +77,29 @@ frame_support::generate_storage_alias!(
 /// Be aware that this migration is intended to be used only for the mentioned versions. Use
 /// with care and run at your own risk.
 pub fn apply<T: V2ToV3>(old_voter_bond: T::Balance, old_candidacy_bond: T::Balance) -> Weight {
-	let maybe_storage_version = <T::Module as GetPalletVersion>::storage_version();
+	let storage_version = StorageVersion::get::<T::Pallet>();
 	log::info!(
 		target: "runtime::elections-phragmen",
 		"Running migration for elections-phragmen with storage version {:?}",
-		maybe_storage_version,
+		storage_version,
 	);
-	match maybe_storage_version {
-		Some(storage_version) if storage_version <= PalletVersion::new(2, 0, 0) => {
-			migrate_voters_to_recorded_deposit::<T>(old_voter_bond);
-			migrate_candidates_to_recorded_deposit::<T>(old_candidacy_bond);
-			migrate_runners_up_to_recorded_deposit::<T>(old_candidacy_bond);
-			migrate_members_to_recorded_deposit::<T>(old_candidacy_bond);
-			Weight::max_value()
-		},
-		_ => {
-			log::warn!(
-				target: "runtime::elections-phragmen",
-				"Attempted to apply migration to V3 but failed because storage version is {:?}",
-				maybe_storage_version,
-			);
-			0
-		},
+
+	if storage_version <= 2 {
+		migrate_voters_to_recorded_deposit::<T>(old_voter_bond);
+		migrate_candidates_to_recorded_deposit::<T>(old_candidacy_bond);
+		migrate_runners_up_to_recorded_deposit::<T>(old_candidacy_bond);
+		migrate_members_to_recorded_deposit::<T>(old_candidacy_bond);
+
+		StorageVersion::new(3).put::<T::Pallet>();
+
+		Weight::max_value()
+	} else {
+		log::warn!(
+			target: "runtime::elections-phragmen",
+			"Attempted to apply migration to V3 but failed because storage version is {:?}",
+			storage_version,
+		);
+		0
 	}
 }
 
diff --git a/frame/elections-phragmen/src/migrations/v4.rs b/frame/elections-phragmen/src/migrations/v4.rs
index fde9a768f335..9acc1297294d 100644
--- a/frame/elections-phragmen/src/migrations/v4.rs
+++ b/frame/elections-phragmen/src/migrations/v4.rs
@@ -18,7 +18,7 @@
 //! Migrations to version [`4.0.0`], as denoted by the changelog.
 
 use frame_support::{
-	traits::{Get, GetPalletVersion, PalletVersion},
+	traits::{Get, StorageVersion},
 	weights::Weight,
 };
 
@@ -32,9 +32,7 @@ pub const OLD_PREFIX: &[u8] = b"PhragmenElection";
 /// `<Runtime as frame_system::Config>::PalletInfo::name::<ElectionsPhragmenPallet>`.
 ///
 /// The old storage prefix, `PhragmenElection` is hardcoded in the migration code.
-pub fn migrate<T: frame_system::Config, P: GetPalletVersion, N: AsRef<str>>(
-	new_pallet_name: N,
-) -> Weight {
+pub fn migrate<T: crate::Config, N: AsRef<str>>(new_pallet_name: N) -> Weight {
 	if new_pallet_name.as_ref().as_bytes() == OLD_PREFIX {
 		log::info!(
 			target: "runtime::elections-phragmen",
@@ -42,30 +40,30 @@ pub fn migrate<T: frame_system::Config, P: GetPalletVersion, N: AsRef<str>>(
 		);
 		return 0
 	}
-	let maybe_storage_version = <P as GetPalletVersion>::storage_version();
+	let storage_version = StorageVersion::get::<crate::Pallet<T>>();
 	log::info!(
 		target: "runtime::elections-phragmen",
 		"Running migration to v4 for elections-phragmen with storage version {:?}",
-		maybe_storage_version,
+		storage_version,
 	);
 
-	match maybe_storage_version {
-		Some(storage_version) if storage_version <= PalletVersion::new(3, 0, 0) => {
-			log::info!("new prefix: {}", new_pallet_name.as_ref());
-			frame_support::storage::migration::move_pallet(
-				OLD_PREFIX,
-				new_pallet_name.as_ref().as_bytes(),
-			);
-			<T as frame_system::Config>::BlockWeights::get().max_block
-		},
-		_ => {
-			log::warn!(
-				target: "runtime::elections-phragmen",
-				"Attempted to apply migration to v4 but failed because storage version is {:?}",
-				maybe_storage_version,
-			);
-			0
-		},
+	if storage_version <= 3 {
+		log::info!("new prefix: {}", new_pallet_name.as_ref());
+		frame_support::storage::migration::move_pallet(
+			OLD_PREFIX,
+			new_pallet_name.as_ref().as_bytes(),
+		);
+
+		StorageVersion::new(4).put::<crate::Pallet<T>>();
+
+		<T as frame_system::Config>::BlockWeights::get().max_block
+	} else {
+		log::warn!(
+			target: "runtime::elections-phragmen",
+			"Attempted to apply migration to v4 but failed because storage version is {:?}",
+			storage_version,
+		);
+		0
 	}
 }
 
@@ -73,7 +71,7 @@ pub fn migrate<T: frame_system::Config, P: GetPalletVersion, N: AsRef<str>>(
 /// [`frame_support::traits::OnRuntimeUpgrade::pre_upgrade`] for further testing.
 ///
 /// Panics if anything goes wrong.
-pub fn pre_migration<P: GetPalletVersion, N: AsRef<str>>(new: N) {
+pub fn pre_migration<T: crate::Config, N: AsRef<str>>(new: N) {
 	let new = new.as_ref();
 	log::info!("pre-migration elections-phragmen test with new = {}", new);
 
@@ -94,15 +92,15 @@ pub fn pre_migration<P: GetPalletVersion, N: AsRef<str>>(new: N) {
 		sp_core::hexdisplay::HexDisplay::from(&sp_io::storage::next_key(new.as_bytes()).unwrap())
 	);
 	// ensure storage version is 3.
-	assert!(<P as GetPalletVersion>::storage_version().unwrap().major == 3);
+	assert_eq!(StorageVersion::get::<crate::Pallet<T>>(), 3);
 }
 
 /// Some checks for after migration. This can be linked to
 /// [`frame_support::traits::OnRuntimeUpgrade::post_upgrade`] for further testing.
 ///
 /// Panics if anything goes wrong.
-pub fn post_migration<P: GetPalletVersion>() {
+pub fn post_migration<T: crate::Config>() {
 	log::info!("post-migration elections-phragmen");
 	// ensure we've been updated to v4 by the automatic write of crate version -> storage version.
-	assert!(<P as GetPalletVersion>::storage_version().unwrap().major == 4);
+	assert_eq!(StorageVersion::get::<crate::Pallet<T>>(), 4);
 }
diff --git a/frame/grandpa/src/lib.rs b/frame/grandpa/src/lib.rs
index 184ab4960874..fe9973fcf9ba 100644
--- a/frame/grandpa/src/lib.rs
+++ b/frame/grandpa/src/lib.rs
@@ -42,7 +42,7 @@ use fg_primitives::{
 use frame_support::{
 	dispatch::DispatchResultWithPostInfo,
 	storage,
-	traits::{KeyOwnerProofSystem, OneSessionHandler},
+	traits::{KeyOwnerProofSystem, OneSessionHandler, StorageVersion},
 	weights::{Pays, Weight},
 };
 use sp_runtime::{generic::DigestItem, traits::Zero, DispatchResult, KeyTypeId};
@@ -67,6 +67,9 @@ pub use equivocation::{
 
 pub use pallet::*;
 
+/// The current storage version.
+const STORAGE_VERSION: StorageVersion = StorageVersion::new(4);
+
 #[frame_support::pallet]
 pub mod pallet {
 	use super::*;
@@ -75,6 +78,7 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::storage_version(STORAGE_VERSION)]
 	pub struct Pallet<T>(_);
 
 	#[pallet::config]
diff --git a/frame/grandpa/src/migrations.rs b/frame/grandpa/src/migrations.rs
index b0c8578c33e0..05c24e11b393 100644
--- a/frame/grandpa/src/migrations.rs
+++ b/frame/grandpa/src/migrations.rs
@@ -15,5 +15,5 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-/// Version 3.1.
-pub mod v3_1;
+/// Version 4.
+pub mod v4;
diff --git a/frame/grandpa/src/migrations/v3_1.rs b/frame/grandpa/src/migrations/v4.rs
similarity index 73%
rename from frame/grandpa/src/migrations/v3_1.rs
rename to frame/grandpa/src/migrations/v4.rs
index c2ab9d3b7f66..094f276efef3 100644
--- a/frame/grandpa/src/migrations/v3_1.rs
+++ b/frame/grandpa/src/migrations/v4.rs
@@ -16,7 +16,7 @@
 // limitations under the License.
 
 use frame_support::{
-	traits::{Get, GetPalletVersion, PalletVersion},
+	traits::{Get, StorageVersion},
 	weights::Weight,
 };
 use sp_io::hashing::twox_128;
@@ -31,9 +31,7 @@ pub const OLD_PREFIX: &[u8] = b"GrandpaFinality";
 /// `<Runtime as frame_system::Config>::PalletInfo::name::<GrandpaPallet>`.
 ///
 /// The old storage prefix, `GrandpaFinality` is hardcoded in the migration code.
-pub fn migrate<T: frame_system::Config, P: GetPalletVersion, N: AsRef<str>>(
-	new_pallet_name: N,
-) -> Weight {
+pub fn migrate<T: crate::Config, N: AsRef<str>>(new_pallet_name: N) -> Weight {
 	if new_pallet_name.as_ref().as_bytes() == OLD_PREFIX {
 		log::info!(
 			target: "runtime::afg",
@@ -41,30 +39,25 @@ pub fn migrate<T: frame_system::Config, P: GetPalletVersion, N: AsRef<str>>(
 		);
 		return 0
 	}
-	let maybe_storage_version = <P as GetPalletVersion>::storage_version();
+	let storage_version = StorageVersion::get::<crate::Pallet<T>>();
 	log::info!(
 		target: "runtime::afg",
 		"Running migration to v3.1 for grandpa with storage version {:?}",
-		maybe_storage_version,
+		storage_version,
 	);
 
-	match maybe_storage_version {
-		Some(storage_version) if storage_version <= PalletVersion::new(3, 0, 0) => {
-			log::info!("new prefix: {}", new_pallet_name.as_ref());
-			frame_support::storage::migration::move_pallet(
-				OLD_PREFIX,
-				new_pallet_name.as_ref().as_bytes(),
-			);
-			<T as frame_system::Config>::BlockWeights::get().max_block
-		},
-		_ => {
-			log::warn!(
-				target: "runtime::afg",
-				"Attempted to apply migration to v3.1 but cancelled because storage version is {:?}",
-				maybe_storage_version,
-			);
-			0
-		},
+	if storage_version <= 3 {
+		log::info!("new prefix: {}", new_pallet_name.as_ref());
+		frame_support::storage::migration::move_pallet(
+			OLD_PREFIX,
+			new_pallet_name.as_ref().as_bytes(),
+		);
+
+		StorageVersion::new(4).put::<crate::Pallet<T>>();
+
+		<T as frame_system::Config>::BlockWeights::get().max_block
+	} else {
+		0
 	}
 }
 
@@ -72,9 +65,7 @@ pub fn migrate<T: frame_system::Config, P: GetPalletVersion, N: AsRef<str>>(
 /// [`frame_support::traits::OnRuntimeUpgrade::pre_upgrade`] for further testing.
 ///
 /// Panics if anything goes wrong.
-pub fn pre_migration<T: frame_system::Config, P: GetPalletVersion + 'static, N: AsRef<str>>(
-	new: N,
-) {
+pub fn pre_migration<T: crate::Config, N: AsRef<str>>(new: N) {
 	let new = new.as_ref();
 	log::info!("pre-migration grandpa test with new = {}", new);
 
@@ -83,7 +74,7 @@ pub fn pre_migration<T: frame_system::Config, P: GetPalletVersion + 'static, N:
 	assert!(next_key.starts_with(&twox_128(OLD_PREFIX)));
 
 	// The pallet version is already stored using the pallet name
-	let storage_key = PalletVersion::storage_key::<T::PalletInfo, P>().unwrap();
+	let storage_key = StorageVersion::storage_key::<crate::Pallet<T>>();
 
 	// ensure nothing is stored in the new prefix.
 	assert!(
@@ -103,14 +94,14 @@ pub fn pre_migration<T: frame_system::Config, P: GetPalletVersion + 'static, N:
 		),
 	);
 	// ensure storage version is 3.
-	assert!(<P as GetPalletVersion>::storage_version().unwrap().major == 3);
+	assert_eq!(StorageVersion::get::<crate::Pallet<T>>(), 3);
 }
 
 /// Some checks for after migration. This can be linked to
 /// [`frame_support::traits::OnRuntimeUpgrade::post_upgrade`] for further testing.
 ///
 /// Panics if anything goes wrong.
-pub fn post_migration<P: GetPalletVersion>() {
+pub fn post_migration() {
 	log::info!("post-migration grandpa");
 
 	// Assert that nothing remains at the old prefix
diff --git a/frame/offences/src/migration.rs b/frame/offences/src/migration.rs
index cb5c520392c9..ee95d111a22b 100644
--- a/frame/offences/src/migration.rs
+++ b/frame/offences/src/migration.rs
@@ -81,7 +81,7 @@ mod test {
 			// when
 			assert_eq!(
 				Offences::on_runtime_upgrade(),
-				<T as frame_system::Config>::DbWeight::get().reads_writes(1, 2),
+				<T as frame_system::Config>::DbWeight::get().reads_writes(1, 1),
 			);
 
 			// then
diff --git a/frame/support/procedural/src/lib.rs b/frame/support/procedural/src/lib.rs
index a59ae67851e6..483d7c31c062 100644
--- a/frame/support/procedural/src/lib.rs
+++ b/frame/support/procedural/src/lib.rs
@@ -26,7 +26,6 @@ mod default_no_bound;
 mod dummy_part_checker;
 mod key_prefix;
 mod pallet;
-mod pallet_version;
 mod partial_eq_no_bound;
 mod storage;
 mod transactional;
@@ -461,13 +460,6 @@ pub fn require_transactional(attr: TokenStream, input: TokenStream) -> TokenStre
 		.unwrap_or_else(|e| e.to_compile_error().into())
 }
 
-#[proc_macro]
-pub fn crate_to_pallet_version(input: TokenStream) -> TokenStream {
-	pallet_version::crate_to_pallet_version(input)
-		.unwrap_or_else(|e| e.to_compile_error())
-		.into()
-}
-
 /// The number of module instances supported by the runtime, starting at index 1,
 /// and up to `NUMBER_OF_INSTANCE`.
 pub(crate) const NUMBER_OF_INSTANCE: u8 = 16;
diff --git a/frame/support/procedural/src/pallet/expand/hooks.rs b/frame/support/procedural/src/pallet/expand/hooks.rs
index c279a83d3daa..314f982c5aad 100644
--- a/frame/support/procedural/src/pallet/expand/hooks.rs
+++ b/frame/support/procedural/src/pallet/expand/hooks.rs
@@ -40,9 +40,11 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 		quote::quote! {
 			#frame_support::log::info!(
 				target: #frame_support::LOG_TARGET,
-				"⚠️ {} declares internal migrations (which *might* execute), setting storage version to {:?}",
+				"⚠️ {} declares internal migrations (which *might* execute). \
+				 On-chain `{:?}` vs current storage version `{:?}`",
 				pallet_name,
-				new_storage_version,
+				<Self as #frame_support::traits::GetStorageVersion>::on_chain_storage_version(),
+				<Self as #frame_support::traits::GetStorageVersion>::current_storage_version(),
 			);
 		}
 	} else {
@@ -50,9 +52,8 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 		quote::quote! {
 			#frame_support::log::info!(
 				target: #frame_support::LOG_TARGET,
-				"✅ no migration for {}, setting storage version to {:?}",
+				"✅ no migration for {}",
 				pallet_name,
-				new_storage_version,
 			);
 		}
 	};
@@ -131,7 +132,6 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 				);
 
 				// log info about the upgrade.
-				let new_storage_version = #frame_support::crate_to_pallet_version!();
 				let pallet_name = <
 					<T as #frame_system::Config>::PalletInfo
 					as
@@ -139,19 +139,11 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 				>::name::<Self>().unwrap_or("<unknown pallet name>");
 				#log_runtime_upgrade
 
-				let result = <
+				<
 					Self as #frame_support::traits::Hooks<
 						<T as #frame_system::Config>::BlockNumber
 					>
-				>::on_runtime_upgrade();
-
-				new_storage_version.put_into_storage::<<T as #frame_system::Config>::PalletInfo, Self>();
-
-				let additional_write = <
-					<T as #frame_system::Config>::DbWeight as #frame_support::traits::Get<_>
-				>::get().writes(1);
-
-				result.saturating_add(additional_write)
+				>::on_runtime_upgrade()
 			}
 
 			#[cfg(feature = "try-runtime")]
diff --git a/frame/support/procedural/src/pallet/expand/pallet_struct.rs b/frame/support/procedural/src/pallet/expand/pallet_struct.rs
index 8be933fc3cf9..ccc6fee5c2ba 100644
--- a/frame/support/procedural/src/pallet/expand/pallet_struct.rs
+++ b/frame/support/procedural/src/pallet/expand/pallet_struct.rs
@@ -18,7 +18,7 @@
 use crate::pallet::{expand::merge_where_clauses, parse::helper::get_doc_literals, Def};
 
 /// * Add derive trait on Pallet
-/// * Implement GetPalletVersion on Pallet
+/// * Implement GetStorageVersion on Pallet
 /// * Implement OnGenesis on Pallet
 /// * Implement ModuleErrorMetadata on Pallet
 /// * declare Module type alias for construct_runtime
@@ -151,6 +151,12 @@ pub fn expand_pallet_struct(def: &mut Def) -> proc_macro2::TokenStream {
 		}
 	);
 
+	let storage_version = if let Some(v) = def.pallet_struct.storage_version.as_ref() {
+		quote::quote! { #v }
+	} else {
+		quote::quote! { #frame_support::traits::StorageVersion::default() }
+	};
+
 	quote::quote_spanned!(def.pallet_struct.attr_span =>
 		#module_error_metadata
 
@@ -161,21 +167,17 @@ pub fn expand_pallet_struct(def: &mut Def) -> proc_macro2::TokenStream {
 		#[allow(dead_code)]
 		pub type Module<#type_decl_gen> = #pallet_ident<#type_use_gen>;
 
-		// Implement `GetPalletVersion` for `Pallet`
-		impl<#type_impl_gen> #frame_support::traits::GetPalletVersion
+		// Implement `GetStorageVersion` for `Pallet`
+		impl<#type_impl_gen> #frame_support::traits::GetStorageVersion
 			for #pallet_ident<#type_use_gen>
 			#config_where_clause
 		{
-			fn current_version() -> #frame_support::traits::PalletVersion {
-				#frame_support::crate_to_pallet_version!()
+			fn current_storage_version() -> #frame_support::traits::StorageVersion {
+				#storage_version
 			}
 
-			fn storage_version() -> Option<#frame_support::traits::PalletVersion> {
-				let key = #frame_support::traits::PalletVersion::storage_key::<
-						<T as #frame_system::Config>::PalletInfo, Self
-					>().expect("Every active pallet has a name in the runtime; qed");
-
-				#frame_support::storage::unhashed::get(&key)
+			fn on_chain_storage_version() -> #frame_support::traits::StorageVersion {
+				#frame_support::traits::StorageVersion::get::<Self>()
 			}
 		}
 
@@ -185,8 +187,8 @@ pub fn expand_pallet_struct(def: &mut Def) -> proc_macro2::TokenStream {
 			#config_where_clause
 		{
 			fn on_genesis() {
-				#frame_support::crate_to_pallet_version!()
-					.put_into_storage::<<T as #frame_system::Config>::PalletInfo, Self>();
+				let storage_version = #storage_version;
+				storage_version.put::<Self>();
 			}
 		}
 
diff --git a/frame/support/procedural/src/pallet/parse/pallet_struct.rs b/frame/support/procedural/src/pallet/parse/pallet_struct.rs
index 088b647fad7d..278f46e13818 100644
--- a/frame/support/procedural/src/pallet/parse/pallet_struct.rs
+++ b/frame/support/procedural/src/pallet/parse/pallet_struct.rs
@@ -25,6 +25,7 @@ mod keyword {
 	syn::custom_keyword!(Pallet);
 	syn::custom_keyword!(generate_store);
 	syn::custom_keyword!(generate_storage_info);
+	syn::custom_keyword!(storage_version);
 	syn::custom_keyword!(Store);
 }
 
@@ -43,14 +44,18 @@ pub struct PalletStructDef {
 	/// Whether to specify the storages max encoded len when implementing `StorageInfoTrait`.
 	/// Contains the span of the attribute.
 	pub generate_storage_info: Option<proc_macro2::Span>,
+	/// The current storage version of the pallet.
+	pub storage_version: Option<syn::Path>,
 }
 
 /// Parse for one variant of:
 /// * `#[pallet::generate_store($vis trait Store)]`
 /// * `#[pallet::generate_storage_info]`
+/// * `#[pallet::storage_version(STORAGE_VERSION)]`
 pub enum PalletStructAttr {
 	GenerateStore { span: proc_macro2::Span, vis: syn::Visibility, keyword: keyword::Store },
 	GenerateStorageInfoTrait(proc_macro2::Span),
+	StorageVersion { storage_version: syn::Path, span: proc_macro2::Span },
 }
 
 impl PalletStructAttr {
@@ -58,6 +63,7 @@ impl PalletStructAttr {
 		match self {
 			Self::GenerateStore { span, .. } => *span,
 			Self::GenerateStorageInfoTrait(span) => *span,
+			Self::StorageVersion { span, .. } => *span,
 		}
 	}
 }
@@ -83,6 +89,14 @@ impl syn::parse::Parse for PalletStructAttr {
 		} else if lookahead.peek(keyword::generate_storage_info) {
 			let span = content.parse::<keyword::generate_storage_info>()?.span();
 			Ok(Self::GenerateStorageInfoTrait(span))
+		} else if lookahead.peek(keyword::storage_version) {
+			let span = content.parse::<keyword::storage_version>()?.span();
+
+			let version_content;
+			syn::parenthesized!(version_content in content);
+			let storage_version = version_content.parse::<syn::Path>()?;
+
+			Ok(Self::StorageVersion { storage_version, span })
 		} else {
 			Err(lookahead.error())
 		}
@@ -104,6 +118,7 @@ impl PalletStructDef {
 
 		let mut store = None;
 		let mut generate_storage_info = None;
+		let mut storage_version_found = None;
 
 		let struct_attrs: Vec<PalletStructAttr> = helper::take_item_pallet_attrs(&mut item.attrs)?;
 		for attr in struct_attrs {
@@ -116,6 +131,11 @@ impl PalletStructDef {
 				{
 					generate_storage_info = Some(span);
 				}
+				PalletStructAttr::StorageVersion { storage_version, .. }
+					if storage_version_found.is_none() =>
+				{
+					storage_version_found = Some(storage_version);
+				}
 				attr => {
 					let msg = "Unexpected duplicated attribute";
 					return Err(syn::Error::new(attr.span(), msg))
@@ -138,6 +158,14 @@ impl PalletStructDef {
 		let mut instances = vec![];
 		instances.push(helper::check_type_def_gen_no_bounds(&item.generics, item.ident.span())?);
 
-		Ok(Self { index, instances, pallet, store, attr_span, generate_storage_info })
+		Ok(Self {
+			index,
+			instances,
+			pallet,
+			store,
+			attr_span,
+			generate_storage_info,
+			storage_version: storage_version_found,
+		})
 	}
 }
diff --git a/frame/support/procedural/src/pallet_version.rs b/frame/support/procedural/src/pallet_version.rs
deleted file mode 100644
index f0821f343c03..000000000000
--- a/frame/support/procedural/src/pallet_version.rs
+++ /dev/null
@@ -1,64 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Implementation of macros related to pallet versioning.
-
-use frame_support_procedural_tools::generate_crate_access_2018;
-use proc_macro2::{Span, TokenStream};
-use std::{env, str::FromStr};
-use syn::{Error, Result};
-
-/// Get the version from the given version environment variable.
-///
-/// The version is parsed into the requested destination type.
-fn get_version<T: FromStr>(version_env: &str) -> std::result::Result<T, ()> {
-	let version = env::var(version_env)
-		.unwrap_or_else(|_| panic!("`{}` is always set by cargo; qed", version_env));
-
-	T::from_str(&version).map_err(drop)
-}
-
-/// Create an error that will be shown by rustc at the call site of the macro.
-fn create_error(message: &str) -> Error {
-	Error::new(Span::call_site(), message)
-}
-
-/// Implementation of the `crate_to_pallet_version!` macro.
-pub fn crate_to_pallet_version(input: proc_macro::TokenStream) -> Result<TokenStream> {
-	if !input.is_empty() {
-		return Err(create_error("No arguments expected!"))
-	}
-
-	let major_version = get_version::<u16>("CARGO_PKG_VERSION_MAJOR")
-		.map_err(|_| create_error("Major version needs to fit into `u16`"))?;
-
-	let minor_version = get_version::<u8>("CARGO_PKG_VERSION_MINOR")
-		.map_err(|_| create_error("Minor version needs to fit into `u8`"))?;
-
-	let patch_version = get_version::<u8>("CARGO_PKG_VERSION_PATCH")
-		.map_err(|_| create_error("Patch version needs to fit into `u8`"))?;
-
-	let crate_ = generate_crate_access_2018("frame-support")?;
-
-	Ok(quote::quote! {
-		#crate_::traits::PalletVersion {
-			major: #major_version,
-			minor: #minor_version,
-			patch: #patch_version,
-		}
-	})
-}
diff --git a/frame/support/src/dispatch.rs b/frame/support/src/dispatch.rs
index d962f6e00d70..da9d6adff6f3 100644
--- a/frame/support/src/dispatch.rs
+++ b/frame/support/src/dispatch.rs
@@ -26,7 +26,7 @@ pub use crate::{
 		result,
 	},
 	traits::{
-		CallMetadata, GetCallMetadata, GetCallName, GetPalletVersion, UnfilteredDispatchable,
+		CallMetadata, GetCallMetadata, GetCallName, GetStorageVersion, UnfilteredDispatchable,
 	},
 	weights::{
 		ClassifyDispatch, DispatchInfo, GetDispatchInfo, PaysFee, PostDispatchInfo,
@@ -352,6 +352,7 @@ macro_rules! decl_module {
 			{}
 			{}
 			{}
+			{}
 			[]
 			$($t)*
 		);
@@ -388,6 +389,7 @@ macro_rules! decl_module {
 			{}
 			{}
 			{}
+			{}
 			[]
 			$($t)*
 		);
@@ -408,6 +410,7 @@ macro_rules! decl_module {
 		{ $( $constants:tt )* }
 		{ $( $error_type:tt )* }
 		{ $( $integrity_test:tt )* }
+		{ $( $storage_version:tt )* }
 		[ $( $dispatchables:tt )* ]
 		$(#[doc = $doc_attr:tt])*
 		$vis:vis fn deposit_event() = default;
@@ -426,7 +429,8 @@ macro_rules! decl_module {
 			{ $( $offchain )* }
 			{ $( $constants )* }
 			{ $( $error_type )* }
-			{ $( $integrity_test)* }
+			{ $( $integrity_test )* }
+			{ $( $storage_version )* }
 			[ $( $dispatchables )* ]
 			$($rest)*
 		);
@@ -445,6 +449,7 @@ macro_rules! decl_module {
 		{ $( $constants:tt )* }
 		{ $( $error_type:tt )* }
 		{ $( $integrity_test:tt )* }
+		{ $( $storage_version:tt )* }
 		[ $( $dispatchables:tt )* ]
 		$(#[doc = $doc_attr:tt])*
 		$vis:vis fn deposit_event
@@ -471,6 +476,7 @@ macro_rules! decl_module {
 		{ $( $constants:tt )* }
 		{ $( $error_type:tt )* }
 		{ $( $integrity_test:tt )* }
+		{ $( $storage_version:tt )* }
 		[ $( $dispatchables:tt )* ]
 		$(#[doc = $doc_attr:tt])*
 		$vis:vis fn deposit_event() = default;
@@ -493,6 +499,7 @@ macro_rules! decl_module {
 		{ $( $constants:tt )* }
 		{ $( $error_type:tt )* }
 		{ $( $integrity_test:tt )* }
+		{ $( $storage_version:tt )* }
 		[ $( $dispatchables:tt )* ]
 		$(#[doc = $doc_attr:tt])*
 		fn on_finalize( $( $param_name:ident : $param:ty ),* $(,)? ) { $( $impl:tt )* }
@@ -513,7 +520,8 @@ macro_rules! decl_module {
 			{ $( $offchain )* }
 			{ $( $constants )* }
 			{ $( $error_type )* }
-			{ $( $integrity_test)* }
+			{ $( $integrity_test )* }
+			{ $( $storage_version )* }
 			[ $( $dispatchables )* ]
 			$($rest)*
 		);
@@ -533,6 +541,7 @@ macro_rules! decl_module {
 		{ $( $constants:tt )* }
 		{ $( $error_type:tt )* }
 		{ $( $integrity_test:tt )* }
+		{ $( $storage_version:tt )* }
 		[ $( $dispatchables:tt )* ]
 		$(#[doc = $doc_attr:tt])*
 		#[weight = $weight:expr]
@@ -561,6 +570,7 @@ macro_rules! decl_module {
 		{ $( $constants:tt )* }
 		{ $( $error_type:tt )* }
 		{ $( $integrity_test:tt )* }
+		{ $( $storage_version:tt )* }
 		[ $( $dispatchables:tt )* ]
 		$(#[doc = $doc_attr:tt])*
 		#[weight = $weight:expr]
@@ -585,6 +595,7 @@ macro_rules! decl_module {
 		{ $( $constants:tt )* }
 		{ $( $error_type:tt )* }
 		{ $( $integrity_test:tt )* }
+		{ $( $storage_version:tt )* }
 		[ $( $dispatchables:tt )* ]
 		$(#[doc = $doc_attr:tt])*
 		fn on_idle($param_name1:ident : $param1:ty, $param_name2:ident: $param2:ty $(,)? ) -> $return:ty { $( $impl:tt )* }
@@ -605,7 +616,8 @@ macro_rules! decl_module {
 			{ $( $offchain )* }
 			{ $( $constants )* }
 			{ $( $error_type )* }
-			{ $( $integrity_test)* }
+			{ $( $integrity_test )* }
+			{ $( $storage_version )* }
 			[ $( $dispatchables )* ]
 			$($rest)*
 		);
@@ -626,6 +638,7 @@ macro_rules! decl_module {
 		{ $( $constants:tt )* }
 		{ $( $error_type:tt )* }
 		{ $( $integrity_test:tt )* }
+		{ $( $storage_version:tt )* }
 		[ $( $dispatchables:tt )* ]
 		$(#[doc = $doc_attr:tt])*
 		$(#[weight = $weight:expr])?
@@ -652,6 +665,7 @@ macro_rules! decl_module {
 		{ $( $constants:tt )* }
 		{ $( $error_type:tt )* }
 		{ $( $integrity_test:tt )* }
+		{ $( $storage_version:tt )* }
 		[ $( $dispatchables:tt )* ]
 		$(#[doc = $doc_attr:tt])*
 		fn on_runtime_upgrade( $( $param_name:ident : $param:ty ),* $(,)? ) { $( $impl:tt )* }
@@ -678,6 +692,7 @@ macro_rules! decl_module {
 		{ $( $constants:tt )* }
 		{ $( $error_type:tt )* }
 		{ $( $integrity_test:tt )* }
+		{ $( $storage_version:tt )* }
 		[ $( $dispatchables:tt )* ]
 		$(#[doc = $doc_attr:tt])*
 		#[weight = $weight:expr]
@@ -706,6 +721,7 @@ macro_rules! decl_module {
 		{ $( $constants:tt )* }
 		{ $( $error_type:tt )* }
 		{ $( $integrity_test:tt )* }
+		{ $( $storage_version:tt )* }
 		[ $( $dispatchables:tt )* ]
 		$(#[doc = $doc_attr:tt])*
 		fn on_runtime_upgrade( $( $param_name:ident : $param:ty ),* $(,)? ) -> $return:ty { $( $impl:tt )* }
@@ -726,7 +742,8 @@ macro_rules! decl_module {
 			{ $( $offchain )* }
 			{ $( $constants )* }
 			{ $( $error_type )* }
-			{ $( $integrity_test)* }
+			{ $( $integrity_test )* }
+			{ $( $storage_version )* }
 			[ $( $dispatchables )* ]
 			$($rest)*
 		);
@@ -748,6 +765,7 @@ macro_rules! decl_module {
 		{ $( $constants:tt )* }
 		{ $( $error_type:tt )* }
 		{ $( $integrity_test:tt )* }
+		{ $( $storage_version:tt )* }
 		[ $( $dispatchables:tt )* ]
 		$(#[doc = $doc_attr:tt])*
 		fn on_runtime_upgrade( $( $param_name:ident : $param:ty ),* $(,)? ) -> $return:ty { $( $impl:tt )* }
@@ -772,6 +790,7 @@ macro_rules! decl_module {
 		{ $( $constants:tt )* }
 		{ $( $error_type:tt )* }
 		{}
+		{ $( $storage_version:tt )* }
 		[ $( $dispatchables:tt )* ]
 		$(#[doc = $doc_attr:tt])*
 		fn integrity_test() { $( $impl:tt )* }
@@ -794,6 +813,7 @@ macro_rules! decl_module {
 				$(#[doc = $doc_attr])*
 				fn integrity_test() { $( $impl)* }
 			}
+			{ $( $storage_version )* }
 			[ $( $dispatchables )* ]
 			$($rest)*
 		);
@@ -815,6 +835,7 @@ macro_rules! decl_module {
 		{ $( $constants:tt )* }
 		{ $( $error_type:tt )* }
 		{ $( $integrity_test:tt )+ }
+		{ $( $storage_version:tt )* }
 		[ $( $dispatchables:tt )* ]
 		$(#[doc = $doc_attr:tt])*
 		fn integrity_test() { $( $impl:tt )* }
@@ -839,6 +860,7 @@ macro_rules! decl_module {
 		{ $( $constants:tt )* }
 		{ $( $error_type:tt )* }
 		{ $( $integrity_test:tt )* }
+		{ $( $storage_version:tt )* }
 		[ $( $dispatchables:tt )* ]
 		$(#[doc = $doc_attr:tt])*
 		fn on_initialize( $( $param_name:ident : $param:ty ),* $(,)? ) { $( $impl:tt )* }
@@ -865,6 +887,7 @@ macro_rules! decl_module {
 		{ $( $constants:tt )* }
 		{ $( $error_type:tt )* }
 		{ $( $integrity_test:tt )* }
+		{ $( $storage_version:tt )* }
 		[ $( $dispatchables:tt )* ]
 		$(#[doc = $doc_attr:tt])*
 		#[weight = $weight:expr]
@@ -893,6 +916,7 @@ macro_rules! decl_module {
 		{ $( $constants:tt )* }
 		{ $( $error_type:tt )* }
 		{ $( $integrity_test:tt )* }
+		{ $( $storage_version:tt )* }
 		[ $( $dispatchables:tt )* ]
 		$(#[doc = $doc_attr:tt])*
 		fn on_initialize( $( $param_name:ident : $param:ty ),* $(,)? ) -> $return:ty { $( $impl:tt )* }
@@ -913,7 +937,8 @@ macro_rules! decl_module {
 			{ $( $offchain )* }
 			{ $( $constants )* }
 			{ $( $error_type )* }
-			{ $( $integrity_test)* }
+			{ $( $integrity_test )* }
+			{ $( $storage_version )* }
 			[ $( $dispatchables )* ]
 			$($rest)*
 		);
@@ -935,6 +960,7 @@ macro_rules! decl_module {
 		{ $( $constants:tt )* }
 		{ $( $error_type:tt )* }
 		{ $( $integrity_test:tt )* }
+		{ $( $storage_version:tt )* }
 		[ $( $dispatchables:tt )* ]
 		$(#[doc = $doc_attr:tt])*
 		fn on_initialize( $( $param_name:ident : $param:ty ),* $(,)? ) -> $return:ty { $( $impl:tt )* }
@@ -959,6 +985,7 @@ macro_rules! decl_module {
 		{ $( $constants:tt )* }
 		{ $( $error_type:tt )* }
 		{ $( $integrity_test:tt )* }
+		{ $( $storage_version:tt )* }
 		[ $( $dispatchables:tt )* ]
 		$(#[doc = $doc_attr:tt])*
 		fn offchain_worker( $( $param_name:ident : $param:ty ),* $(,)? ) { $( $impl:tt )* }
@@ -979,7 +1006,8 @@ macro_rules! decl_module {
 			{ fn offchain_worker( $( $param_name : $param ),* ) { $( $impl )* } }
 			{ $( $constants )* }
 			{ $( $error_type )* }
-			{ $( $integrity_test)* }
+			{ $( $integrity_test )* }
+			{ $( $storage_version )* }
 			[ $( $dispatchables )* ]
 			$($rest)*
 		);
@@ -1001,6 +1029,7 @@ macro_rules! decl_module {
 		{ $( $constants:tt )* }
 		{ $( $error_type:tt )* }
 		{ $( $integrity_test:tt )* }
+		{ $( $storage_version:tt )* }
 		[ $( $dispatchables:tt )* ]
 		$(#[doc = $doc_attr:tt])*
 		fn offchain_worker( $( $param_name:ident : $param:ty ),* $(,)? ) -> $return:ty { $( $impl:tt )* }
@@ -1026,6 +1055,7 @@ macro_rules! decl_module {
 		{ $( $constants:tt )* }
 		{ $( $error_type:tt )* }
 		{ $( $integrity_test:tt )* }
+		{ $( $storage_version:tt )* }
 		[ $( $dispatchables:tt )* ]
 		$( #[doc = $doc_attr:tt] )*
 		const $name:ident: $ty:ty = $value:expr;
@@ -1051,7 +1081,8 @@ macro_rules! decl_module {
 				$name: $ty = $value;
 			}
 			{ $( $error_type )* }
-			{ $( $integrity_test)* }
+			{ $( $integrity_test )* }
+			{ $( $storage_version )* }
 			[ $( $dispatchables )* ]
 			$($rest)*
 		);
@@ -1075,6 +1106,7 @@ macro_rules! decl_module {
 		{ $( $constants:tt )* }
 		{ }
 		{ $( $integrity_test:tt )* }
+		{ $( $storage_version:tt )* }
 		[ $( $dispatchables:tt )* ]
 		$(#[doc = $doc_attr:tt])*
 		type Error = $error_type:ty;
@@ -1095,7 +1127,8 @@ macro_rules! decl_module {
 			{ $( $offchain )* }
 			{ $( $constants )* }
 			{ $error_type }
-			{ $( $integrity_test)* }
+			{ $( $integrity_test )* }
+			{ $( $storage_version )* }
 			[ $( $dispatchables )* ]
 			$($rest)*
 		);
@@ -1118,6 +1151,7 @@ macro_rules! decl_module {
 		{ $( $constants:tt )* }
 		{ }
 		{ $( $integrity_test:tt )* }
+		{ $( $storage_version:tt )* }
 		[ $($t:tt)* ]
 		$($rest:tt)*
 	) => {
@@ -1136,12 +1170,59 @@ macro_rules! decl_module {
 			{ $( $offchain )* }
 			{ $( $constants )* }
 			{ &'static str }
-			{ $( $integrity_test)* }
+			{ $( $integrity_test )* }
+			{ $( $storage_version )* }
 			[ $($t)* ]
 			$($rest)*
 		);
 	};
 
+	// Parse storage version
+	(@normalize
+		$(#[$attr:meta])*
+		pub struct $mod_type:ident<
+			$trait_instance:ident:
+				$trait_name:ident$(<I>, $instance:ident: $instantiable:path $(= $module_default_instance:path)?)?
+			>
+		for enum $call_type:ident where origin: $origin_type:ty, system = $system:ident
+		{ $( $other_where_bounds:tt )* }
+		{ $( $deposit_event:tt )* }
+		{ $( $on_initialize:tt )* }
+		{ $( $on_runtime_upgrade:tt )* }
+		{ $( $on_idle:tt )* }
+		{ $( $on_finalize:tt )* }
+		{ $( $offchain:tt )* }
+		{ $( $constants:tt )* }
+		{ $( $error_type:tt )* }
+		{ $( $integrity_test:tt )* }
+		{ }
+		[ $( $dispatchables:tt )* ]
+		$(#[doc = $doc_attr:tt])*
+		type StorageVersion = $storage_version:path;
+		$($rest:tt)*
+	) => {
+		$crate::decl_module!(@normalize
+			$(#[$attr])*
+			pub struct $mod_type<
+				$trait_instance: $trait_name$(<I>, $instance: $instantiable $(= $module_default_instance)?)?
+			>
+			for enum $call_type where origin: $origin_type, system = $system
+			{ $( $other_where_bounds )* }
+			{ $( $deposit_event )* }
+			{ $( $on_initialize )* }
+			{ $( $on_runtime_upgrade )* }
+			{ $( $on_idle )* }
+			{ $( $on_finalize )* }
+			{ $( $offchain )* }
+			{ $( $constants )* }
+			{ $( $error_type )* }
+			{ $( $integrity_test)* }
+			{ $storage_version }
+			[ $( $dispatchables )* ]
+			$($rest)*
+		);
+	};
+
 	// This puts the function statement into the [], decreasing `$rest` and moving toward finishing the parse.
 	(@normalize
 		$(#[$attr:meta])*
@@ -1160,6 +1241,7 @@ macro_rules! decl_module {
 		{ $( $constants:tt )* }
 		{ $error_type:ty }
 		{ $( $integrity_test:tt )* }
+		{ $( $storage_version:tt )* }
 		[ $( $dispatchables:tt )* ]
 		$(#[doc = $doc_attr:tt])*
 		#[weight = $weight:expr]
@@ -1184,7 +1266,8 @@ macro_rules! decl_module {
 			{ $( $offchain )* }
 			{ $( $constants )* }
 			{ $error_type }
-			{ $( $integrity_test)* }
+			{ $( $integrity_test )* }
+			{ $( $storage_version )* }
 			[
 				$( $dispatchables )*
 				$(#[doc = $doc_attr])*
@@ -1216,6 +1299,7 @@ macro_rules! decl_module {
 		{ $( $constants:tt )* }
 		{ $( $error_type:tt )* }
 		{ $( $integrity_test:tt )* }
+		{ $( $storage_version:tt )* }
 		[ $( $dispatchables:tt )* ]
 		$(#[doc = $doc_attr:tt])*
 		$(#[$fn_attr:meta])*
@@ -1245,6 +1329,7 @@ macro_rules! decl_module {
 		{ $( $constants:tt )* }
 		{ $( $error_type:tt )* }
 		{ $( $integrity_test:tt )* }
+		{ $( $storage_version:tt )* }
 		[ $( $dispatchables:tt )* ]
 		$(#[doc = $doc_attr:tt])*
 		$(#[weight = $weight:expr])?
@@ -1274,6 +1359,7 @@ macro_rules! decl_module {
 		{ $( $constants:tt )* }
 		{ $( $error_type:tt )* }
 		{ $( $integrity_test:tt )* }
+		{ $( $storage_version:tt )* }
 		[ $( $dispatchables:tt )* ]
 		$(#[doc = $doc_attr:tt])*
 		$(#[weight = $weight:expr])?
@@ -1303,6 +1389,7 @@ macro_rules! decl_module {
 		{ $( $constants:tt )* }
 		{ $( $error_type:tt )* }
 		{ $( $integrity_test:tt )* }
+		{ $( $storage_version:tt )* }
 		[ $( $dispatchables:tt )* ]
 		$(#[doc = $doc_attr:tt])*
 		$(#[weight = $weight:expr])?
@@ -1333,6 +1420,7 @@ macro_rules! decl_module {
 		{ $( $constants:tt )* }
 		{ $( $error_type:tt )* }
 		{ $( $integrity_test:tt )* }
+		{ $( $storage_version:tt )* }
 		[ $( $dispatchables:tt )* ]
 	) => {
 		$crate::decl_module!(@imp
@@ -1350,7 +1438,8 @@ macro_rules! decl_module {
 			{ $( $offchain )* }
 			{ $( $constants )* }
 			{ $( $error_type )* }
-			{ $( $integrity_test)* }
+			{ $( $integrity_test )* }
+			{ $( $storage_version )* }
 		);
 	};
 
@@ -1451,25 +1540,17 @@ macro_rules! decl_module {
 					as
 					$system::Config
 				>::PalletInfo as $crate::traits::PalletInfo>::name::<Self>().unwrap_or("<unknown pallet name>");
-				let new_storage_version = $crate::crate_to_pallet_version!();
 
 				$crate::log::info!(
 					target: $crate::LOG_TARGET,
-					"⚠️ {} declares internal migrations (which *might* execute), setting storage version to {:?}",
+					"⚠️ {} declares internal migrations (which *might* execute). \
+					 On-chain `{:?}` vs current storage version `{:?}`",
 					pallet_name,
-					new_storage_version,
+					<Self as $crate::traits::GetStorageVersion>::on_chain_storage_version(),
+					<Self as $crate::traits::GetStorageVersion>::current_storage_version(),
 				);
 
-				let result: $return = (|| { $( $impl )* })();
-
-				new_storage_version
-					.put_into_storage::<<$trait_instance as $system::Config>::PalletInfo, Self>();
-
-				let additional_write = <
-					<$trait_instance as $system::Config>::DbWeight as $crate::traits::Get<_>
-				>::get().writes(1);
-
-				result.saturating_add(additional_write)
+				(|| { $( $impl )* })()
 			}
 
 			#[cfg(feature = "try-runtime")]
@@ -1500,19 +1581,14 @@ macro_rules! decl_module {
 					as
 					$system::Config
 				>::PalletInfo as $crate::traits::PalletInfo>::name::<Self>().unwrap_or("<unknown pallet name>");
-				let new_storage_version = $crate::crate_to_pallet_version!();
 
 				$crate::log::info!(
 					target: $crate::LOG_TARGET,
-					"✅ no migration for {}, setting storage version to {:?}",
+					"✅ no migration for {}",
 					pallet_name,
-					new_storage_version,
 				);
 
-				new_storage_version
-					.put_into_storage::<<$trait_instance as $system::Config>::PalletInfo, Self>();
-
-				<<$trait_instance as $system::Config>::DbWeight as $crate::traits::Get<_>>::get().writes(1)
+				0
 			}
 
 			#[cfg(feature = "try-runtime")]
@@ -1823,6 +1899,45 @@ macro_rules! decl_module {
 		}
 	};
 
+	// Implementation for `GetStorageVersion`.
+	(@impl_get_storage_version
+		$module:ident<$trait_instance:ident: $trait_name:ident$(<I>, $instance:ident: $instantiable:path)?>;
+		{ $( $other_where_bounds:tt )* }
+		$( $storage_version:tt )+
+	) => {
+		// Implement `GetStorageVersion` for `Pallet`
+		impl<$trait_instance: $trait_name $(<I>, $instance: $instantiable)?> $crate::traits::GetStorageVersion
+			for $module<$trait_instance $(, $instance)?> where $( $other_where_bounds )*
+		{
+			fn current_storage_version() -> $crate::traits::StorageVersion {
+				$( $storage_version )*
+			}
+
+			fn on_chain_storage_version() -> $crate::traits::StorageVersion {
+				$crate::traits::StorageVersion::get::<Self>()
+			}
+		}
+	};
+
+	// Implementation for `GetStorageVersion` when no storage version is passed.
+	(@impl_get_storage_version
+		$module:ident<$trait_instance:ident: $trait_name:ident$(<I>, $instance:ident: $instantiable:path)?>;
+		{ $( $other_where_bounds:tt )* }
+	) => {
+		// Implement `GetStorageVersion` for `Pallet`
+		impl<$trait_instance: $trait_name $(<I>, $instance: $instantiable)?> $crate::traits::GetStorageVersion
+			for $module<$trait_instance $(, $instance)?> where $( $other_where_bounds )*
+		{
+			fn current_storage_version() -> $crate::traits::StorageVersion {
+				Default::default()
+			}
+
+			fn on_chain_storage_version() -> $crate::traits::StorageVersion {
+				$crate::traits::StorageVersion::get::<Self>()
+			}
+		}
+	};
+
 	// The main macro expansion that actually renders the module code.
 
 	(@imp
@@ -1852,6 +1967,7 @@ macro_rules! decl_module {
 		{ $( $constants:tt )* }
 		{ $error_type:ty }
 		{ $( $integrity_test:tt )* }
+		{ $( $storage_version:tt )* }
 	) => {
 		$crate::__check_reserved_fn_name! { $( $fn_name )* }
 
@@ -1908,6 +2024,7 @@ macro_rules! decl_module {
 			{ $( $other_where_bounds )* }
 			$( $offchain )*
 		}
+
 		$crate::decl_module! {
 			@impl_deposit_event
 			$mod_type<$trait_instance: $trait_name $(<I>, $instance: $instantiable)?>;
@@ -1964,6 +2081,13 @@ macro_rules! decl_module {
 			)*
 		}
 
+		$crate::decl_module! {
+			@impl_get_storage_version
+			$mod_type<$trait_instance: $trait_name $(<I>, $instance: $instantiable)?>;
+			{ $( $other_where_bounds )* }
+			$( $storage_version )*
+		}
+
 		// Implement weight calculation function for Call
 		impl<$trait_instance: $trait_name $(<I>, $instance: $instantiable)?> $crate::dispatch::GetDispatchInfo
 			for $call_type<$trait_instance $(, $instance)?> where $( $other_where_bounds )*
@@ -1997,6 +2121,27 @@ macro_rules! decl_module {
 			}
 		}
 
+		// Implement PalletInfoAccess for the module.
+		impl<$trait_instance: $trait_name $(<I>, $instance: $instantiable)?> $crate::traits::PalletInfoAccess
+			for $mod_type<$trait_instance $(, $instance)?> where $( $other_where_bounds )*
+		{
+			fn index() -> usize {
+				<
+					<$trait_instance as $system::Config>::PalletInfo as $crate::traits::PalletInfo
+				>::index::<Self>()
+					.expect("Pallet is part of the runtime because pallet `Config` trait is \
+						implemented by the runtime")
+			}
+
+			fn name() -> &'static str {
+				<
+					<$trait_instance as $system::Config>::PalletInfo as $crate::traits::PalletInfo
+				>::name::<Self>()
+					.expect("Pallet is part of the runtime because pallet `Config` trait is \
+						implemented by the runtime")
+			}
+		}
+
 		// Implement GetCallName for the Call.
 		impl<$trait_instance: $trait_name $(<I>, $instance: $instantiable)?> $crate::dispatch::GetCallName
 			for $call_type<$trait_instance $(, $instance)?> where $( $other_where_bounds )*
@@ -2023,32 +2168,13 @@ macro_rules! decl_module {
 			}
 		}
 
-		// Bring `GetPalletVersion` into scope to make it easily usable.
-		pub use $crate::traits::GetPalletVersion as _;
-		// Implement `GetPalletVersion` for `Module`
-		impl<$trait_instance: $trait_name $(<I>, $instance: $instantiable)?> $crate::traits::GetPalletVersion
-			for $mod_type<$trait_instance $(, $instance)?> where $( $other_where_bounds )*
-		{
-			fn current_version() -> $crate::traits::PalletVersion {
-				$crate::crate_to_pallet_version!()
-			}
-
-			fn storage_version() -> Option<$crate::traits::PalletVersion> {
-				let key = $crate::traits::PalletVersion::storage_key::<
-						<$trait_instance as $system::Config>::PalletInfo, Self
-					>().expect("Every active pallet has a name in the runtime; qed");
-
-				$crate::storage::unhashed::get(&key)
-			}
-		}
-
 		// Implement `OnGenesis` for `Module`
 		impl<$trait_instance: $trait_name $(<I>, $instance: $instantiable)?> $crate::traits::OnGenesis
 			for $mod_type<$trait_instance $(, $instance)?> where $( $other_where_bounds )*
 		{
 			fn on_genesis() {
-				$crate::crate_to_pallet_version!()
-					.put_into_storage::<<$trait_instance as $system::Config>::PalletInfo, Self>();
+				let storage_version = <Self as $crate::traits::GetStorageVersion>::current_storage_version();
+				storage_version.put::<Self>();
 			}
 		}
 
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 52b3907f64ce..a9cbe94d4fb7 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -59,6 +59,7 @@ pub mod inherent;
 #[macro_use]
 pub mod error;
 pub mod instances;
+pub mod migrations;
 pub mod traits;
 pub mod weights;
 
@@ -667,21 +668,6 @@ pub use frame_support_procedural::DefaultNoBound;
 /// ```
 pub use frame_support_procedural::require_transactional;
 
-/// Convert the current crate version into a [`PalletVersion`](crate::traits::PalletVersion).
-///
-/// It uses the `CARGO_PKG_VERSION_MAJOR`, `CARGO_PKG_VERSION_MINOR` and
-/// `CARGO_PKG_VERSION_PATCH` environment variables to fetch the crate version.
-/// This means that the [`PalletVersion`](crate::traits::PalletVersion)
-/// object will correspond to the version of the crate the macro is called in!
-///
-/// # Example
-///
-/// ```
-/// # use frame_support::{traits::PalletVersion, crate_to_pallet_version};
-/// const Version: PalletVersion = crate_to_pallet_version!();
-/// ```
-pub use frame_support_procedural::crate_to_pallet_version;
-
 /// Return Err of the expression: `return Err($expression);`.
 ///
 /// Used as `fail!(expression)`.
@@ -1301,7 +1287,7 @@ pub mod pallet_prelude {
 			},
 		},
 		traits::{
-			ConstU32, EnsureOrigin, Get, GetDefault, GetPalletVersion, Hooks, IsType,
+			ConstU32, EnsureOrigin, Get, GetDefault, GetStorageVersion, Hooks, IsType,
 			PalletInfoAccess, StorageInfoTrait,
 		},
 		weights::{DispatchClass, Pays, Weight},
@@ -1422,6 +1408,19 @@ pub mod pallet_prelude {
 /// This require all storage to implement the trait [`traits::StorageInfoTrait`], thus all keys
 /// and value types must bound [`pallet_prelude::MaxEncodedLen`].
 ///
+/// As the macro implements [`traits::GetStorageVersion`], the current storage version needs to be
+/// communicated to the macro. This can be done by using the `storage_version` attribute:
+///
+/// ```ignore
+/// const STORAGE_VERSION: StorageVersion = StorageVersion::new(5);
+///
+/// #[pallet::pallet]
+/// #[pallet::storage_version(STORAGE_VERSION)]
+/// pub struct Pallet<T>(_);
+/// ```
+///
+/// If not present, the current storage version is set to the default value.
+///
 /// ### Macro expansion:
 ///
 /// The macro add this attribute to the struct definition:
@@ -1436,7 +1435,7 @@ pub mod pallet_prelude {
 /// and replace the type `_` by `PhantomData<T>`.
 ///
 /// It implements on pallet:
-/// * [`traits::GetPalletVersion`]
+/// * [`traits::GetStorageVersion`]
 /// * [`traits::OnGenesis`]: contains some logic to write pallet version into storage.
 /// * `ModuleErrorMetadata`: using error declared or no metadata.
 ///
diff --git a/frame/support/src/migrations.rs b/frame/support/src/migrations.rs
new file mode 100644
index 000000000000..cf1ba8198242
--- /dev/null
+++ b/frame/support/src/migrations.rs
@@ -0,0 +1,73 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::{
+	traits::{GetStorageVersion, PalletInfoAccess},
+	weights::{RuntimeDbWeight, Weight},
+};
+
+/// Trait used by [`migrate_from_pallet_version_to_storage_version`] to do the actual migration.
+pub trait PalletVersionToStorageVersionHelper {
+	fn migrate(db_weight: &RuntimeDbWeight) -> Weight;
+}
+
+impl<T: GetStorageVersion + PalletInfoAccess> PalletVersionToStorageVersionHelper for T {
+	fn migrate(db_weight: &RuntimeDbWeight) -> Weight {
+		const PALLET_VERSION_STORAGE_KEY_POSTFIX: &[u8] = b":__PALLET_VERSION__:";
+
+		fn pallet_version_key(name: &str) -> [u8; 32] {
+			let pallet_name = sp_io::hashing::twox_128(name.as_bytes());
+			let postfix = sp_io::hashing::twox_128(PALLET_VERSION_STORAGE_KEY_POSTFIX);
+
+			let mut final_key = [0u8; 32];
+			final_key[..16].copy_from_slice(&pallet_name);
+			final_key[16..].copy_from_slice(&postfix);
+
+			final_key
+		}
+
+		sp_io::storage::clear(&pallet_version_key(<T as PalletInfoAccess>::name()));
+
+		let version = <T as GetStorageVersion>::current_storage_version();
+		version.put::<T>();
+
+		db_weight.writes(2)
+	}
+}
+
+#[impl_trait_for_tuples::impl_for_tuples(30)]
+impl PalletVersionToStorageVersionHelper for T {
+	fn migrate(db_weight: &RuntimeDbWeight) -> Weight {
+		let mut weight: Weight = 0;
+
+		for_tuples!( #( weight = weight.saturating_add(T::migrate(db_weight)); )* );
+
+		weight
+	}
+}
+
+/// Migrate from the `PalletVersion` struct to the new
+/// [`StorageVersion`](crate::traits::StorageVersion) struct.
+///
+/// This will remove all `PalletVersion's` from the state and insert the current storage version.
+pub fn migrate_from_pallet_version_to_storage_version<
+	AllPallets: PalletVersionToStorageVersionHelper,
+>(
+	db_weight: &RuntimeDbWeight,
+) -> Weight {
+	AllPallets::migrate(db_weight)
+}
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index 4c674e1f9662..024e7e6c698e 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -63,8 +63,8 @@ pub use randomness::Randomness;
 
 mod metadata;
 pub use metadata::{
-	CallMetadata, GetCallMetadata, GetCallName, GetPalletVersion, PalletInfo, PalletInfoAccess,
-	PalletVersion, PALLET_VERSION_STORAGE_KEY_POSTFIX,
+	CallMetadata, GetCallMetadata, GetCallName, GetStorageVersion, PalletInfo, PalletInfoAccess,
+	StorageVersion, STORAGE_VERSION_STORAGE_KEY_POSTFIX,
 };
 
 mod hooks;
diff --git a/frame/support/src/traits/hooks.rs b/frame/support/src/traits/hooks.rs
index 37b07c311301..45212c565039 100644
--- a/frame/support/src/traits/hooks.rs
+++ b/frame/support/src/traits/hooks.rs
@@ -323,7 +323,6 @@ pub trait OnTimestampSet<Moment> {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use crate::traits::metadata::PalletVersion;
 
 	#[test]
 	fn on_initialize_and_on_runtime_upgrade_weight_merge_works() {
@@ -342,18 +341,4 @@ mod tests {
 		assert_eq!(<(Test, Test)>::on_initialize(0), 20);
 		assert_eq!(<(Test, Test)>::on_runtime_upgrade(), 40);
 	}
-
-	#[test]
-	fn check_pallet_version_ordering() {
-		let version = PalletVersion::new(1, 0, 0);
-		assert!(version > PalletVersion::new(0, 1, 2));
-		assert!(version == PalletVersion::new(1, 0, 0));
-		assert!(version < PalletVersion::new(1, 0, 1));
-		assert!(version < PalletVersion::new(1, 1, 0));
-
-		let version = PalletVersion::new(2, 50, 50);
-		assert!(version < PalletVersion::new(2, 50, 51));
-		assert!(version > PalletVersion::new(2, 49, 51));
-		assert!(version < PalletVersion::new(3, 49, 51));
-	}
 }
diff --git a/frame/support/src/traits/metadata.rs b/frame/support/src/traits/metadata.rs
index ba2630563844..8b1707855f7b 100644
--- a/frame/support/src/traits/metadata.rs
+++ b/frame/support/src/traits/metadata.rs
@@ -68,52 +68,42 @@ pub trait GetCallMetadata {
 	fn get_call_metadata(&self) -> CallMetadata;
 }
 
-/// The storage key postfix that is used to store the [`PalletVersion`] per pallet.
+/// The storage key postfix that is used to store the [`StorageVersion`] per pallet.
 ///
 /// The full storage key is built by using:
-/// Twox128([`PalletInfo::name`]) ++ Twox128([`PALLET_VERSION_STORAGE_KEY_POSTFIX`])
-pub const PALLET_VERSION_STORAGE_KEY_POSTFIX: &[u8] = b":__PALLET_VERSION__:";
+/// Twox128([`PalletInfo::name`]) ++ Twox128([`STORAGE_VERSION_STORAGE_KEY_POSTFIX`])
+pub const STORAGE_VERSION_STORAGE_KEY_POSTFIX: &[u8] = b":__STORAGE_VERSION__:";
 
-/// The version of a pallet.
+/// The storage version of a pallet.
 ///
-/// Each pallet version is stored in the state under a fixed key. See
-/// [`PALLET_VERSION_STORAGE_KEY_POSTFIX`] for how this key is built.
-#[derive(RuntimeDebug, Eq, PartialEq, Encode, Decode, Ord, Clone, Copy)]
-pub struct PalletVersion {
-	/// The major version of the pallet.
-	pub major: u16,
-	/// The minor version of the pallet.
-	pub minor: u8,
-	/// The patch version of the pallet.
-	pub patch: u8,
-}
+/// Each storage version of a pallet is stored in the state under a fixed key. See
+/// [`STORAGE_VERSION_STORAGE_KEY_POSTFIX`] for how this key is built.
+#[derive(RuntimeDebug, Eq, PartialEq, Encode, Decode, Ord, Clone, Copy, PartialOrd, Default)]
+pub struct StorageVersion(u16);
 
-impl PalletVersion {
+impl StorageVersion {
 	/// Creates a new instance of `Self`.
-	pub fn new(major: u16, minor: u8, patch: u8) -> Self {
-		Self { major, minor, patch }
+	pub const fn new(version: u16) -> Self {
+		Self(version)
 	}
 
-	/// Returns the storage key for a pallet version.
-	///
-	/// See [`PALLET_VERSION_STORAGE_KEY_POSTFIX`] on how this key is built.
+	/// Returns the storage key for a storage version.
 	///
-	/// Returns `None` if the given `PI` returned a `None` as name for the given
-	/// `Pallet`.
-	pub fn storage_key<PI: PalletInfo, Pallet: 'static>() -> Option<[u8; 32]> {
-		let pallet_name = PI::name::<Pallet>()?;
+	/// See [`STORAGE_VERSION_STORAGE_KEY_POSTFIX`] on how this key is built.
+	pub fn storage_key<P: PalletInfoAccess>() -> [u8; 32] {
+		let pallet_name = P::name();
 
 		let pallet_name = sp_io::hashing::twox_128(pallet_name.as_bytes());
-		let postfix = sp_io::hashing::twox_128(PALLET_VERSION_STORAGE_KEY_POSTFIX);
+		let postfix = sp_io::hashing::twox_128(STORAGE_VERSION_STORAGE_KEY_POSTFIX);
 
 		let mut final_key = [0u8; 32];
 		final_key[..16].copy_from_slice(&pallet_name);
 		final_key[16..].copy_from_slice(&postfix);
 
-		Some(final_key)
+		final_key
 	}
 
-	/// Put this pallet version into the storage.
+	/// Put this storage version for the given pallet into the storage.
 	///
 	/// It will use the storage key that is associated with the given `Pallet`.
 	///
@@ -125,47 +115,75 @@ impl PalletVersion {
 	///
 	/// It will also panic if this function isn't executed in an externalities
 	/// provided environment.
-	pub fn put_into_storage<PI: PalletInfo, Pallet: 'static>(&self) {
-		let key = Self::storage_key::<PI, Pallet>()
-			.expect("Every active pallet has a name in the runtime; qed");
+	pub fn put<P: PalletInfoAccess>(&self) {
+		let key = Self::storage_key::<P>();
 
 		crate::storage::unhashed::put(&key, self);
 	}
+
+	/// Get the storage version of the given pallet from the storage.
+	///
+	/// It will use the storage key that is associated with the given `Pallet`.
+	///
+	/// # Panics
+	///
+	/// This function will panic iff `Pallet` can not be found by `PalletInfo`.
+	/// In a runtime that is put together using
+	/// [`construct_runtime!`](crate::construct_runtime) this should never happen.
+	///
+	/// It will also panic if this function isn't executed in an externalities
+	/// provided environment.
+	pub fn get<P: PalletInfoAccess>() -> Self {
+		let key = Self::storage_key::<P>();
+
+		crate::storage::unhashed::get_or_default(&key)
+	}
 }
 
-impl sp_std::cmp::PartialOrd for PalletVersion {
-	fn partial_cmp(&self, other: &Self) -> Option<sp_std::cmp::Ordering> {
-		let res = self
-			.major
-			.cmp(&other.major)
-			.then_with(|| self.minor.cmp(&other.minor).then_with(|| self.patch.cmp(&other.patch)));
+impl PartialEq<u16> for StorageVersion {
+	fn eq(&self, other: &u16) -> bool {
+		self.0 == *other
+	}
+}
 
-		Some(res)
+impl PartialOrd<u16> for StorageVersion {
+	fn partial_cmp(&self, other: &u16) -> Option<sp_std::cmp::Ordering> {
+		Some(self.0.cmp(other))
 	}
 }
 
-/// Provides version information about a pallet.
+/// Provides information about the storage version of a pallet.
 ///
-/// This trait provides two functions for returning the version of a
-/// pallet. There is a state where both functions can return distinct versions.
-/// See [`GetPalletVersion::storage_version`] for more information about this.
-pub trait GetPalletVersion {
-	/// Returns the current version of the pallet.
-	fn current_version() -> PalletVersion;
-
-	/// Returns the version of the pallet that is stored in storage.
-	///
-	/// Most of the time this will return the exact same version as
-	/// [`GetPalletVersion::current_version`]. Only when being in
-	/// a state after a runtime upgrade happened and the pallet did
-	/// not yet updated its version in storage, this will return a
-	/// different(the previous, seen from the time of calling) version.
-	///
-	/// See [`PalletVersion`] for more information.
-	///
-	/// # Note
-	///
-	/// If there was no previous version of the pallet stored in the state,
-	/// this function returns `None`.
-	fn storage_version() -> Option<PalletVersion>;
+/// It differentiates between current and on-chain storage version. Both should be only out of sync
+/// when a new runtime upgrade was applied and the runtime migrations did not yet executed.
+/// Otherwise it means that the pallet works with an unsupported storage version and unforeseen
+/// stuff can happen.
+///
+/// The current storage version is the version of the pallet as supported at runtime. The active
+/// storage version is the version of the pallet in the storage.
+///
+/// It is required to update the on-chain storage version manually when a migration was applied.
+pub trait GetStorageVersion {
+	/// Returns the current storage version as supported by the pallet.
+	fn current_storage_version() -> StorageVersion;
+	/// Returns the on-chain storage version of the pallet as stored in the storage.
+	fn on_chain_storage_version() -> StorageVersion;
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+
+	#[test]
+	fn check_storage_version_ordering() {
+		let version = StorageVersion::new(1);
+		assert!(version == StorageVersion::new(1));
+		assert!(version < StorageVersion::new(2));
+		assert!(version < StorageVersion::new(3));
+
+		let version = StorageVersion::new(2);
+		assert!(version < StorageVersion::new(3));
+		assert!(version > StorageVersion::new(1));
+		assert!(version < StorageVersion::new(5));
+	}
 }
diff --git a/frame/support/test/src/lib.rs b/frame/support/test/src/lib.rs
index d40031c149d9..ffda500f96ad 100644
--- a/frame/support/test/src/lib.rs
+++ b/frame/support/test/src/lib.rs
@@ -22,9 +22,6 @@
 #![warn(missing_docs)]
 #![deny(warnings)]
 
-#[cfg(test)]
-mod pallet_version;
-
 /// The configuration trait
 pub trait Config: 'static {
 	/// The runtime origin type.
diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index 7385eeb6ad74..c21808dfa8f2 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -19,9 +19,10 @@ use frame_support::{
 	dispatch::{Parameter, UnfilteredDispatchable},
 	storage::unhashed,
 	traits::{
-		GetCallName, GetPalletVersion, OnFinalize, OnGenesis, OnInitialize, OnRuntimeUpgrade,
+		GetCallName, GetStorageVersion, OnFinalize, OnGenesis, OnInitialize, OnRuntimeUpgrade,
+		PalletInfoAccess, StorageVersion,
 	},
-	weights::{DispatchClass, DispatchInfo, GetDispatchInfo, Pays},
+	weights::{DispatchClass, DispatchInfo, GetDispatchInfo, Pays, RuntimeDbWeight},
 };
 use sp_io::{
 	hashing::{blake2_128, twox_128, twox_64},
@@ -96,13 +97,15 @@ impl SomeAssociation2 for u64 {
 pub mod pallet {
 	use super::{
 		SomeAssociation1, SomeAssociation2, SomeType1, SomeType2, SomeType3, SomeType4, SomeType5,
-		SomeType6, SomeType7,
+		SomeType6, SomeType7, StorageVersion,
 	};
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
 
 	type BalanceOf<T> = <T as Config>::Balance;
 
+	pub(crate) const STORAGE_VERSION: StorageVersion = StorageVersion::new(10);
+
 	#[pallet::config]
 	pub trait Config: frame_system::Config
 	where
@@ -146,6 +149,7 @@ pub mod pallet {
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(crate) trait Store)]
 	#[pallet::generate_storage_info]
+	#[pallet::storage_version(STORAGE_VERSION)]
 	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
@@ -896,12 +900,7 @@ fn pallet_hooks_expand() {
 		assert_eq!(AllPallets::on_initialize(1), 10);
 		AllPallets::on_finalize(1);
 
-		assert_eq!(pallet::Pallet::<Runtime>::storage_version(), None);
 		assert_eq!(AllPallets::on_runtime_upgrade(), 30);
-		assert_eq!(
-			pallet::Pallet::<Runtime>::storage_version(),
-			Some(pallet::Pallet::<Runtime>::current_version()),
-		);
 
 		assert_eq!(
 			frame_system::Pallet::<Runtime>::events()[0].event,
@@ -921,15 +920,60 @@ fn pallet_hooks_expand() {
 #[test]
 fn pallet_on_genesis() {
 	TestExternalities::default().execute_with(|| {
-		assert_eq!(pallet::Pallet::<Runtime>::storage_version(), None);
+		assert_eq!(pallet::Pallet::<Runtime>::on_chain_storage_version(), StorageVersion::new(0));
 		pallet::Pallet::<Runtime>::on_genesis();
 		assert_eq!(
-			pallet::Pallet::<Runtime>::storage_version(),
-			Some(pallet::Pallet::<Runtime>::current_version()),
+			pallet::Pallet::<Runtime>::current_storage_version(),
+			pallet::Pallet::<Runtime>::on_chain_storage_version(),
 		);
 	})
 }
 
+#[test]
+fn migrate_from_pallet_version_to_storage_version() {
+	const PALLET_VERSION_STORAGE_KEY_POSTFIX: &[u8] = b":__PALLET_VERSION__:";
+
+	fn pallet_version_key(name: &str) -> [u8; 32] {
+		let pallet_name = sp_io::hashing::twox_128(name.as_bytes());
+		let postfix = sp_io::hashing::twox_128(PALLET_VERSION_STORAGE_KEY_POSTFIX);
+
+		let mut final_key = [0u8; 32];
+		final_key[..16].copy_from_slice(&pallet_name);
+		final_key[16..].copy_from_slice(&postfix);
+
+		final_key
+	}
+
+	TestExternalities::default().execute_with(|| {
+		// Insert some fake pallet versions
+		sp_io::storage::set(&pallet_version_key(Example::name()), &[1, 2, 3]);
+		sp_io::storage::set(&pallet_version_key(Example2::name()), &[1, 2, 3]);
+		sp_io::storage::set(&pallet_version_key(System::name()), &[1, 2, 3]);
+
+		// Check that everyone currently is at version 0
+		assert_eq!(Example::on_chain_storage_version(), StorageVersion::new(0));
+		assert_eq!(Example2::on_chain_storage_version(), StorageVersion::new(0));
+		assert_eq!(System::on_chain_storage_version(), StorageVersion::new(0));
+
+		let db_weight = RuntimeDbWeight { read: 0, write: 5 };
+		let weight = frame_support::migrations::migrate_from_pallet_version_to_storage_version::<
+			AllPalletsWithSystem,
+		>(&db_weight);
+
+		// 3 pallets, 2 writes and every write costs 5 weight.
+		assert_eq!(3 * 2 * 5, weight);
+
+		// All pallet versions should be removed
+		assert!(sp_io::storage::get(&pallet_version_key(Example::name())).is_none());
+		assert!(sp_io::storage::get(&pallet_version_key(Example2::name())).is_none());
+		assert!(sp_io::storage::get(&pallet_version_key(System::name())).is_none());
+
+		assert_eq!(Example::on_chain_storage_version(), pallet::STORAGE_VERSION);
+		assert_eq!(Example2::on_chain_storage_version(), StorageVersion::new(0));
+		assert_eq!(System::on_chain_storage_version(), StorageVersion::new(0));
+	});
+}
+
 #[test]
 fn metadata() {
 	use codec::{Decode, Encode};
diff --git a/frame/support/test/tests/pallet_instance.rs b/frame/support/test/tests/pallet_instance.rs
index e3146f698e69..2c6c2a7a6646 100644
--- a/frame/support/test/tests/pallet_instance.rs
+++ b/frame/support/test/tests/pallet_instance.rs
@@ -18,9 +18,7 @@
 use frame_support::{
 	dispatch::UnfilteredDispatchable,
 	storage::unhashed,
-	traits::{
-		GetCallName, GetPalletVersion, OnFinalize, OnGenesis, OnInitialize, OnRuntimeUpgrade,
-	},
+	traits::{GetCallName, OnFinalize, OnGenesis, OnInitialize, OnRuntimeUpgrade},
 	weights::{DispatchClass, DispatchInfo, GetDispatchInfo, Pays},
 };
 use sp_io::{
@@ -505,17 +503,7 @@ fn pallet_hooks_expand() {
 		assert_eq!(AllPallets::on_initialize(1), 21);
 		AllPallets::on_finalize(1);
 
-		assert_eq!(pallet::Pallet::<Runtime>::storage_version(), None);
-		assert_eq!(pallet::Pallet::<Runtime, pallet::Instance1>::storage_version(), None);
 		assert_eq!(AllPallets::on_runtime_upgrade(), 61);
-		assert_eq!(
-			pallet::Pallet::<Runtime>::storage_version(),
-			Some(pallet::Pallet::<Runtime>::current_version()),
-		);
-		assert_eq!(
-			pallet::Pallet::<Runtime, pallet::Instance1>::storage_version(),
-			Some(pallet::Pallet::<Runtime, pallet::Instance1>::current_version()),
-		);
 
 		// The order is indeed reversed due to https://github.com/paritytech/substrate/issues/6280
 		assert_eq!(
@@ -548,19 +536,9 @@ fn pallet_hooks_expand() {
 #[test]
 fn pallet_on_genesis() {
 	TestExternalities::default().execute_with(|| {
-		assert_eq!(pallet::Pallet::<Runtime>::storage_version(), None);
 		pallet::Pallet::<Runtime>::on_genesis();
-		assert_eq!(
-			pallet::Pallet::<Runtime>::storage_version(),
-			Some(pallet::Pallet::<Runtime>::current_version()),
-		);
 
-		assert_eq!(pallet::Pallet::<Runtime, pallet::Instance1>::storage_version(), None);
 		pallet::Pallet::<Runtime, pallet::Instance1>::on_genesis();
-		assert_eq!(
-			pallet::Pallet::<Runtime, pallet::Instance1>::storage_version(),
-			Some(pallet::Pallet::<Runtime, pallet::Instance1>::current_version()),
-		);
 	})
 }
 
diff --git a/frame/support/test/tests/pallet_version.rs b/frame/support/test/tests/pallet_version.rs
deleted file mode 100644
index 5048f47f6752..000000000000
--- a/frame/support/test/tests/pallet_version.rs
+++ /dev/null
@@ -1,274 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Tests related to the pallet version.
-
-#![recursion_limit = "128"]
-
-use codec::{Decode, Encode};
-use frame_support::{
-	crate_to_pallet_version,
-	traits::{
-		GetPalletVersion, OnRuntimeUpgrade, PalletVersion, PALLET_VERSION_STORAGE_KEY_POSTFIX,
-	},
-	weights::Weight,
-};
-use sp_core::{sr25519, H256};
-use sp_runtime::{
-	generic,
-	traits::{BlakeTwo256, Verify},
-	BuildStorage,
-};
-
-/// A version that we will check for in the tests
-const SOME_TEST_VERSION: PalletVersion = PalletVersion { major: 3000, minor: 30, patch: 13 };
-
-/// Checks that `on_runtime_upgrade` sets the latest pallet version when being called without
-/// being provided by the user.
-mod module1 {
-	pub trait Config: frame_system::Config {}
-
-	frame_support::decl_module! {
-		pub struct Module<T: Config> for enum Call where
-			origin: <T as frame_system::Config>::Origin,
-		{}
-	}
-}
-
-/// Checks that `on_runtime_upgrade` sets the latest pallet version when being called and also
-/// being provided by the user.
-mod module2 {
-	use super::*;
-
-	pub trait Config<I = DefaultInstance>: frame_system::Config {}
-
-	frame_support::decl_module! {
-		pub struct Module<T: Config<I>, I: Instance=DefaultInstance> for enum Call where
-			origin: <T as frame_system::Config>::Origin,
-		{
-			fn on_runtime_upgrade() -> Weight {
-				assert_eq!(crate_to_pallet_version!(), Self::current_version());
-
-				let version_key = PalletVersion::storage_key::<T::PalletInfo, Self>().unwrap();
-				let version_value = sp_io::storage::get(&version_key);
-
-				if version_value.is_some() {
-					assert_eq!(SOME_TEST_VERSION, Self::storage_version().unwrap());
-				} else {
-					// As the storage version does not exist yet, it should be `None`.
-					assert!(Self::storage_version().is_none());
-				}
-
-				0
-			}
-		}
-	}
-
-	frame_support::decl_storage! {
-		trait Store for Module<T: Config<I>, I: Instance=DefaultInstance> as Module2 {}
-	}
-}
-
-#[frame_support::pallet]
-mod pallet3 {
-	use frame_support::pallet_prelude::*;
-	use frame_system::pallet_prelude::*;
-
-	#[pallet::config]
-	pub trait Config: frame_system::Config {}
-
-	#[pallet::pallet]
-	pub struct Pallet<T>(_);
-
-	#[pallet::hooks]
-	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
-		fn on_runtime_upgrade() -> Weight {
-			return 3
-		}
-	}
-
-	#[pallet::call]
-	impl<T: Config> Pallet<T> {}
-}
-
-#[frame_support::pallet]
-mod pallet4 {
-	use frame_support::pallet_prelude::*;
-	use frame_system::pallet_prelude::*;
-
-	#[pallet::config]
-	pub trait Config<I: 'static = ()>: frame_system::Config {}
-
-	#[pallet::pallet]
-	pub struct Pallet<T, I = ()>(PhantomData<(T, I)>);
-
-	#[pallet::hooks]
-	impl<T: Config<I>, I: 'static> Hooks<BlockNumberFor<T>> for Pallet<T, I> {
-		fn on_runtime_upgrade() -> Weight {
-			return 3
-		}
-	}
-
-	#[pallet::call]
-	impl<T: Config<I>, I: 'static> Pallet<T, I> {}
-}
-
-impl module1::Config for Runtime {}
-impl module2::Config for Runtime {}
-impl module2::Config<module2::Instance1> for Runtime {}
-impl module2::Config<module2::Instance2> for Runtime {}
-
-impl pallet3::Config for Runtime {}
-impl pallet4::Config for Runtime {}
-impl pallet4::Config<pallet4::Instance1> for Runtime {}
-impl pallet4::Config<pallet4::Instance2> for Runtime {}
-
-pub type Signature = sr25519::Signature;
-pub type AccountId = <Signature as Verify>::Signer;
-pub type BlockNumber = u64;
-pub type Index = u64;
-
-frame_support::parameter_types!(
-	pub const BlockHashCount: u32 = 250;
-);
-
-impl frame_system::Config for Runtime {
-	type BaseCallFilter = frame_support::traits::AllowAll;
-	type Origin = Origin;
-	type Index = u64;
-	type BlockNumber = BlockNumber;
-	type Call = Call;
-	type Hash = H256;
-	type Hashing = sp_runtime::traits::BlakeTwo256;
-	type AccountId = AccountId;
-	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-	type Header = Header;
-	type Event = Event;
-	type BlockHashCount = BlockHashCount;
-	type BlockWeights = ();
-	type BlockLength = ();
-	type DbWeight = ();
-	type Version = ();
-	type PalletInfo = PalletInfo;
-	type AccountData = ();
-	type OnNewAccount = ();
-	type OnKilledAccount = ();
-	type SystemWeightInfo = ();
-	type SS58Prefix = ();
-	type OnSetCode = ();
-}
-
-frame_support::construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
-	{
-		System: frame_system::{Pallet, Call, Event<T>},
-		Module1: module1::{Pallet, Call},
-		Module2: module2::{Pallet, Call},
-		Module2_1: module2::<Instance1>::{Pallet, Call},
-		Module2_2: module2::<Instance2>::{Pallet, Call},
-		Pallet3: pallet3::{Pallet, Call},
-		Pallet4: pallet4::{Pallet, Call},
-		Pallet4_1: pallet4::<Instance1>::{Pallet, Call},
-		Pallet4_2: pallet4::<Instance2>::{Pallet, Call},
-	}
-);
-
-pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
-pub type Block = generic::Block<Header, UncheckedExtrinsic>;
-pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, Call, Signature, ()>;
-
-/// Returns the storage key for `PalletVersion` for the given `pallet`.
-fn get_pallet_version_storage_key_for_pallet(pallet: &str) -> [u8; 32] {
-	let pallet_name = sp_io::hashing::twox_128(pallet.as_bytes());
-	let postfix = sp_io::hashing::twox_128(PALLET_VERSION_STORAGE_KEY_POSTFIX);
-
-	let mut final_key = [0u8; 32];
-	final_key[..16].copy_from_slice(&pallet_name);
-	final_key[16..].copy_from_slice(&postfix);
-
-	final_key
-}
-
-/// Checks the version of the given `pallet`.
-///
-/// It is expected that the pallet version can be found in the storage and equals the
-/// current crate version.
-fn check_pallet_version(pallet: &str) {
-	let key = get_pallet_version_storage_key_for_pallet(pallet);
-	let value = sp_io::storage::get(&key).expect("Pallet version exists");
-	let version =
-		PalletVersion::decode(&mut &value[..]).expect("Pallet version is encoded correctly");
-
-	assert_eq!(crate_to_pallet_version!(), version);
-}
-
-#[test]
-fn on_runtime_upgrade_sets_the_pallet_versions_in_storage() {
-	sp_io::TestExternalities::new_empty().execute_with(|| {
-		AllPallets::on_runtime_upgrade();
-
-		check_pallet_version("Module1");
-		check_pallet_version("Module2");
-		check_pallet_version("Module2_1");
-		check_pallet_version("Module2_2");
-		check_pallet_version("Pallet3");
-		check_pallet_version("Pallet4");
-		check_pallet_version("Pallet4_1");
-		check_pallet_version("Pallet4_2");
-	});
-}
-
-#[test]
-fn on_runtime_upgrade_overwrites_old_version() {
-	sp_io::TestExternalities::new_empty().execute_with(|| {
-		let key = get_pallet_version_storage_key_for_pallet("Module2");
-		sp_io::storage::set(&key, &SOME_TEST_VERSION.encode());
-
-		AllPallets::on_runtime_upgrade();
-
-		check_pallet_version("Module1");
-		check_pallet_version("Module2");
-		check_pallet_version("Module2_1");
-		check_pallet_version("Module2_2");
-		check_pallet_version("Pallet3");
-		check_pallet_version("Pallet4");
-		check_pallet_version("Pallet4_1");
-		check_pallet_version("Pallet4_2");
-	});
-}
-
-#[test]
-fn genesis_init_puts_pallet_version_into_storage() {
-	let storage = GenesisConfig::default().build_storage().expect("Builds genesis storage");
-
-	sp_io::TestExternalities::new(storage).execute_with(|| {
-		check_pallet_version("Module1");
-		check_pallet_version("Module2");
-		check_pallet_version("Module2_1");
-		check_pallet_version("Module2_2");
-		check_pallet_version("Pallet3");
-		check_pallet_version("Pallet4");
-		check_pallet_version("Pallet4_1");
-		check_pallet_version("Pallet4_2");
-
-		let system_version = System::storage_version().expect("System version should be set");
-		assert_eq!(System::current_version(), system_version);
-	});
-}

From a019b577163ec354d2776178fbdb922b0e77dea9 Mon Sep 17 00:00:00 2001
From: Zeke Mostov <32168567+emostov@users.noreply.github.com>
Date: Tue, 27 Jul 2021 16:23:01 -0700
Subject: [PATCH 1031/1194] pallet-staking: Reorg migration, pallet and pallet
 impls (#9410)

* Reorg migration and pallet and pallet impls

* Fix imports in untouched modules

* Add file headers

* Add header for migrations

* Improve comment

* Move OnOffenceHandler impl for Pallet to impl.rs

* fmt
---
 frame/staking/src/benchmarking.rs  |   13 +-
 frame/staking/src/lib.rs           | 2766 +---------------------------
 frame/staking/src/migrations.rs    |   86 +
 frame/staking/src/mock.rs          |    5 +-
 frame/staking/src/pallet/impls.rs  | 1122 +++++++++++
 frame/staking/src/pallet/mod.rs    | 1544 ++++++++++++++++
 frame/staking/src/slashing.rs      |    2 +-
 frame/staking/src/testing_utils.rs |    4 +
 frame/staking/src/tests.rs         |   13 +-
 9 files changed, 2835 insertions(+), 2720 deletions(-)
 create mode 100644 frame/staking/src/migrations.rs
 create mode 100644 frame/staking/src/pallet/impls.rs
 create mode 100644 frame/staking/src/pallet/mod.rs

diff --git a/frame/staking/src/benchmarking.rs b/frame/staking/src/benchmarking.rs
index 15a20dfb937c..bdc3d81f3c29 100644
--- a/frame/staking/src/benchmarking.rs
+++ b/frame/staking/src/benchmarking.rs
@@ -21,11 +21,22 @@ use super::*;
 use crate::Pallet as Staking;
 use testing_utils::*;
 
+use frame_support::{
+	pallet_prelude::*,
+	traits::{Currency, Get, Imbalance},
+};
+use sp_runtime::{
+	traits::{StaticLookup, Zero},
+	Perbill, Percent,
+};
+use sp_staking::SessionIndex;
+use sp_std::prelude::*;
+
 pub use frame_benchmarking::{
 	account, benchmarks, impl_benchmark_test_suite, whitelist_account, whitelisted_caller,
 };
 use frame_system::RawOrigin;
-use sp_runtime::traits::One;
+use sp_runtime::traits::{Bounded, One};
 
 const SEED: u32 = 0;
 const MAX_SPANS: u32 = 100;
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 64cdfcca75b4..7f8774b94efb 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -277,41 +277,31 @@ pub mod testing_utils;
 mod tests;
 
 pub mod inflation;
+pub mod migrations;
 pub mod slashing;
 pub mod weights;
 
+mod pallet;
+
 use codec::{Decode, Encode, HasCompact};
-use frame_election_provider_support::{data_provider, ElectionProvider, Supports, VoteWeight};
 use frame_support::{
-	pallet_prelude::*,
-	traits::{
-		Currency, CurrencyToVote, EnsureOrigin, EstimateNextNewSession, Get, Imbalance,
-		LockIdentifier, LockableCurrency, OnUnbalanced, UnixTime, WithdrawReasons,
-	},
-	weights::{
-		constants::{WEIGHT_PER_MICROS, WEIGHT_PER_NANOS},
-		Weight, WithPostDispatchInfo,
-	},
+	traits::{Currency, Get},
+	weights::Weight,
 };
-use frame_system::{ensure_root, ensure_signed, offchain::SendTransactionTypes, pallet_prelude::*};
-pub use pallet::*;
-use pallet_session::historical;
 use sp_runtime::{
 	curve::PiecewiseLinear,
-	traits::{
-		AtLeast32BitUnsigned, Bounded, CheckedSub, Convert, SaturatedConversion, Saturating,
-		StaticLookup, Zero,
-	},
-	DispatchError, Perbill, Percent, RuntimeDebug,
+	traits::{AtLeast32BitUnsigned, Convert, Saturating, Zero},
+	Perbill, RuntimeDebug,
 };
 use sp_staking::{
-	offence::{Offence, OffenceDetails, OffenceError, OnOffenceHandler, ReportOffence},
+	offence::{Offence, OffenceError, ReportOffence},
 	SessionIndex,
 };
-use sp_std::{collections::btree_map::BTreeMap, convert::From, prelude::*, result};
+use sp_std::{collections::btree_map::BTreeMap, convert::From, prelude::*};
 pub use weights::WeightInfo;
 
-const STAKING_ID: LockIdentifier = *b"staking ";
+pub use pallet::{pallet::*, *};
+
 pub(crate) const LOG_TARGET: &'static str = "runtime::staking";
 
 // syntactic sugar for logging.
@@ -325,8 +315,6 @@ macro_rules! log {
 	};
 }
 
-pub const MAX_UNLOCKING_CHUNKS: usize = 32;
-
 /// Counter for the number of eras that have passed.
 pub type EraIndex = u32;
 
@@ -744,2708 +732,58 @@ impl Default for Releases {
 	}
 }
 
-pub mod migrations {
-	use super::*;
-
-	pub mod v7 {
-		use super::*;
-
-		pub fn pre_migrate<T: Config>() -> Result<(), &'static str> {
-			assert!(
-				CounterForValidators::<T>::get().is_zero(),
-				"CounterForValidators already set."
-			);
-			assert!(
-				CounterForNominators::<T>::get().is_zero(),
-				"CounterForNominators already set."
-			);
-			assert!(StorageVersion::<T>::get() == Releases::V6_0_0);
-			Ok(())
-		}
-
-		pub fn migrate<T: Config>() -> Weight {
-			log!(info, "Migrating staking to Releases::V7_0_0");
-			let validator_count = Validators::<T>::iter().count() as u32;
-			let nominator_count = Nominators::<T>::iter().count() as u32;
-
-			CounterForValidators::<T>::put(validator_count);
-			CounterForNominators::<T>::put(nominator_count);
-
-			StorageVersion::<T>::put(Releases::V7_0_0);
-			log!(info, "Completed staking migration to Releases::V7_0_0");
-
-			T::DbWeight::get()
-				.reads_writes(validator_count.saturating_add(nominator_count).into(), 2)
-		}
-	}
-
-	pub mod v6 {
-		use super::*;
-		use frame_support::{generate_storage_alias, traits::Get, weights::Weight};
-
-		// NOTE: value type doesn't matter, we just set it to () here.
-		generate_storage_alias!(Staking, SnapshotValidators => Value<()>);
-		generate_storage_alias!(Staking, SnapshotNominators => Value<()>);
-		generate_storage_alias!(Staking, QueuedElected => Value<()>);
-		generate_storage_alias!(Staking, QueuedScore => Value<()>);
-		generate_storage_alias!(Staking, EraElectionStatus => Value<()>);
-		generate_storage_alias!(Staking, IsCurrentSessionFinal => Value<()>);
-
-		/// check to execute prior to migration.
-		pub fn pre_migrate<T: Config>() -> Result<(), &'static str> {
-			// these may or may not exist.
-			log!(info, "SnapshotValidators.exits()? {:?}", SnapshotValidators::exists());
-			log!(info, "SnapshotNominators.exits()? {:?}", SnapshotNominators::exists());
-			log!(info, "QueuedElected.exits()? {:?}", QueuedElected::exists());
-			log!(info, "QueuedScore.exits()? {:?}", QueuedScore::exists());
-			// these must exist.
-			assert!(
-				IsCurrentSessionFinal::exists(),
-				"IsCurrentSessionFinal storage item not found!"
-			);
-			assert!(EraElectionStatus::exists(), "EraElectionStatus storage item not found!");
-			Ok(())
-		}
-
-		/// Migrate storage to v6.
-		pub fn migrate<T: Config>() -> Weight {
-			log!(info, "Migrating staking to Releases::V6_0_0");
-
-			SnapshotValidators::kill();
-			SnapshotNominators::kill();
-			QueuedElected::kill();
-			QueuedScore::kill();
-			EraElectionStatus::kill();
-			IsCurrentSessionFinal::kill();
+/// A `Convert` implementation that finds the stash of the given controller account,
+/// if any.
+pub struct StashOf<T>(sp_std::marker::PhantomData<T>);
 
-			StorageVersion::<T>::put(Releases::V6_0_0);
-			log!(info, "Done.");
-			T::DbWeight::get().writes(6 + 1)
-		}
+impl<T: Config> Convert<T::AccountId, Option<T::AccountId>> for StashOf<T> {
+	fn convert(controller: T::AccountId) -> Option<T::AccountId> {
+		<Pallet<T>>::ledger(&controller).map(|l| l.stash)
 	}
 }
 
-#[frame_support::pallet]
-pub mod pallet {
-	use super::*;
-
-	#[pallet::pallet]
-	#[pallet::generate_store(pub(super) trait Store)]
-	pub struct Pallet<T>(_);
-
-	#[pallet::config]
-	pub trait Config: frame_system::Config + SendTransactionTypes<Call<Self>> {
-		/// The staking balance.
-		type Currency: LockableCurrency<Self::AccountId, Moment = Self::BlockNumber>;
-
-		/// Time used for computing era duration.
-		///
-		/// It is guaranteed to start being called from the first `on_finalize`. Thus value at genesis
-		/// is not used.
-		type UnixTime: UnixTime;
-
-		/// Convert a balance into a number used for election calculation. This must fit into a `u64`
-		/// but is allowed to be sensibly lossy. The `u64` is used to communicate with the
-		/// [`sp_npos_elections`] crate which accepts u64 numbers and does operations in 128.
-		/// Consequently, the backward convert is used convert the u128s from sp-elections back to a
-		/// [`BalanceOf`].
-		type CurrencyToVote: CurrencyToVote<BalanceOf<Self>>;
-
-		/// Something that provides the election functionality.
-		type ElectionProvider: frame_election_provider_support::ElectionProvider<
-			Self::AccountId,
-			Self::BlockNumber,
-			// we only accept an election provider that has staking as data provider.
-			DataProvider = Pallet<Self>,
-		>;
-
-		/// Something that provides the election functionality at genesis.
-		type GenesisElectionProvider: frame_election_provider_support::ElectionProvider<
-			Self::AccountId,
-			Self::BlockNumber,
-			DataProvider = Pallet<Self>,
-		>;
-
-		/// Maximum number of nominations per nominator.
-		const MAX_NOMINATIONS: u32;
-
-		/// Tokens have been minted and are unused for validator-reward.
-		/// See [Era payout](./index.html#era-payout).
-		type RewardRemainder: OnUnbalanced<NegativeImbalanceOf<Self>>;
-
-		/// The overarching event type.
-		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
-
-		/// Handler for the unbalanced reduction when slashing a staker.
-		type Slash: OnUnbalanced<NegativeImbalanceOf<Self>>;
-
-		/// Handler for the unbalanced increment when rewarding a staker.
-		type Reward: OnUnbalanced<PositiveImbalanceOf<Self>>;
-
-		/// Number of sessions per era.
-		#[pallet::constant]
-		type SessionsPerEra: Get<SessionIndex>;
-
-		/// Number of eras that staked funds must remain bonded for.
-		#[pallet::constant]
-		type BondingDuration: Get<EraIndex>;
-
-		/// Number of eras that slashes are deferred by, after computation.
-		///
-		/// This should be less than the bonding duration. Set to 0 if slashes
-		/// should be applied immediately, without opportunity for intervention.
-		#[pallet::constant]
-		type SlashDeferDuration: Get<EraIndex>;
-
-		/// The origin which can cancel a deferred slash. Root can always do this.
-		type SlashCancelOrigin: EnsureOrigin<Self::Origin>;
-
-		/// Interface for interacting with a session pallet.
-		type SessionInterface: self::SessionInterface<Self::AccountId>;
-
-		/// The payout for validators and the system for the current era.
-		/// See [Era payout](./index.html#era-payout).
-		type EraPayout: EraPayout<BalanceOf<Self>>;
-
-		/// Something that can estimate the next session change, accurately or as a best effort guess.
-		type NextNewSession: EstimateNextNewSession<Self::BlockNumber>;
-
-		/// The maximum number of nominators rewarded for each validator.
-		///
-		/// For each validator only the `$MaxNominatorRewardedPerValidator` biggest stakers can claim
-		/// their reward. This used to limit the i/o cost for the nominator payout.
-		#[pallet::constant]
-		type MaxNominatorRewardedPerValidator: Get<u32>;
-
-		/// Weight information for extrinsics in this pallet.
-		type WeightInfo: WeightInfo;
-	}
-
-	#[pallet::extra_constants]
-	impl<T: Config> Pallet<T> {
-		// TODO: rename to snake case after https://github.com/paritytech/substrate/issues/8826 fixed.
-		#[allow(non_snake_case)]
-		fn MaxNominations() -> u32 {
-			T::MAX_NOMINATIONS
-		}
-	}
-
-	#[pallet::type_value]
-	pub(crate) fn HistoryDepthOnEmpty() -> u32 {
-		84u32
-	}
-
-	/// Number of eras to keep in history.
-	///
-	/// Information is kept for eras in `[current_era - history_depth; current_era]`.
-	///
-	/// Must be more than the number of eras delayed by session otherwise. I.e. active era must
-	/// always be in history. I.e. `active_era > current_era - history_depth` must be
-	/// guaranteed.
-	#[pallet::storage]
-	#[pallet::getter(fn history_depth)]
-	pub(crate) type HistoryDepth<T> = StorageValue<_, u32, ValueQuery, HistoryDepthOnEmpty>;
-
-	/// The ideal number of staking participants.
-	#[pallet::storage]
-	#[pallet::getter(fn validator_count)]
-	pub type ValidatorCount<T> = StorageValue<_, u32, ValueQuery>;
-
-	/// Minimum number of staking participants before emergency conditions are imposed.
-	#[pallet::storage]
-	#[pallet::getter(fn minimum_validator_count)]
-	pub type MinimumValidatorCount<T> = StorageValue<_, u32, ValueQuery>;
-
-	/// Any validators that may never be slashed or forcibly kicked. It's a Vec since they're
-	/// easy to initialize and the performance hit is minimal (we expect no more than four
-	/// invulnerables) and restricted to testnets.
-	#[pallet::storage]
-	#[pallet::getter(fn invulnerables)]
-	pub type Invulnerables<T: Config> = StorageValue<_, Vec<T::AccountId>, ValueQuery>;
-
-	/// Map from all locked "stash" accounts to the controller account.
-	#[pallet::storage]
-	#[pallet::getter(fn bonded)]
-	pub type Bonded<T: Config> = StorageMap<_, Twox64Concat, T::AccountId, T::AccountId>;
-
-	/// The minimum active bond to become and maintain the role of a nominator.
-	#[pallet::storage]
-	pub type MinNominatorBond<T: Config> = StorageValue<_, BalanceOf<T>, ValueQuery>;
-
-	/// The minimum active bond to become and maintain the role of a validator.
-	#[pallet::storage]
-	pub type MinValidatorBond<T: Config> = StorageValue<_, BalanceOf<T>, ValueQuery>;
-
-	/// Map from all (unlocked) "controller" accounts to the info regarding the staking.
-	#[pallet::storage]
-	#[pallet::getter(fn ledger)]
-	pub type Ledger<T: Config> =
-		StorageMap<_, Blake2_128Concat, T::AccountId, StakingLedger<T::AccountId, BalanceOf<T>>>;
-
-	/// Where the reward payment should be made. Keyed by stash.
-	#[pallet::storage]
-	#[pallet::getter(fn payee)]
-	pub type Payee<T: Config> =
-		StorageMap<_, Twox64Concat, T::AccountId, RewardDestination<T::AccountId>, ValueQuery>;
-
-	/// The map from (wannabe) validator stash key to the preferences of that validator.
-	///
-	/// When updating this storage item, you must also update the `CounterForValidators`.
-	#[pallet::storage]
-	#[pallet::getter(fn validators)]
-	pub type Validators<T: Config> =
-		StorageMap<_, Twox64Concat, T::AccountId, ValidatorPrefs, ValueQuery>;
-
-	/// A tracker to keep count of the number of items in the `Validators` map.
-	#[pallet::storage]
-	pub type CounterForValidators<T> = StorageValue<_, u32, ValueQuery>;
-
-	/// The maximum validator count before we stop allowing new validators to join.
-	///
-	/// When this value is not set, no limits are enforced.
-	#[pallet::storage]
-	pub type MaxValidatorsCount<T> = StorageValue<_, u32, OptionQuery>;
-
-	/// The map from nominator stash key to the set of stash keys of all validators to nominate.
-	///
-	/// When updating this storage item, you must also update the `CounterForNominators`.
-	#[pallet::storage]
-	#[pallet::getter(fn nominators)]
-	pub type Nominators<T: Config> =
-		StorageMap<_, Twox64Concat, T::AccountId, Nominations<T::AccountId>>;
-
-	/// A tracker to keep count of the number of items in the `Nominators` map.
-	#[pallet::storage]
-	pub type CounterForNominators<T> = StorageValue<_, u32, ValueQuery>;
-
-	/// The maximum nominator count before we stop allowing new validators to join.
-	///
-	/// When this value is not set, no limits are enforced.
-	#[pallet::storage]
-	pub type MaxNominatorsCount<T> = StorageValue<_, u32, OptionQuery>;
-
-	/// The current era index.
-	///
-	/// This is the latest planned era, depending on how the Session pallet queues the validator
-	/// set, it might be active or not.
-	#[pallet::storage]
-	#[pallet::getter(fn current_era)]
-	pub type CurrentEra<T> = StorageValue<_, EraIndex>;
-
-	/// The active era information, it holds index and start.
-	///
-	/// The active era is the era being currently rewarded. Validator set of this era must be
-	/// equal to [`SessionInterface::validators`].
-	#[pallet::storage]
-	#[pallet::getter(fn active_era)]
-	pub type ActiveEra<T> = StorageValue<_, ActiveEraInfo>;
-
-	/// The session index at which the era start for the last `HISTORY_DEPTH` eras.
-	///
-	/// Note: This tracks the starting session (i.e. session index when era start being active)
-	/// for the eras in `[CurrentEra - HISTORY_DEPTH, CurrentEra]`.
-	#[pallet::storage]
-	#[pallet::getter(fn eras_start_session_index)]
-	pub type ErasStartSessionIndex<T> = StorageMap<_, Twox64Concat, EraIndex, SessionIndex>;
-
-	/// Exposure of validator at era.
-	///
-	/// This is keyed first by the era index to allow bulk deletion and then the stash account.
-	///
-	/// Is it removed after `HISTORY_DEPTH` eras.
-	/// If stakers hasn't been set or has been removed then empty exposure is returned.
-	#[pallet::storage]
-	#[pallet::getter(fn eras_stakers)]
-	pub type ErasStakers<T: Config> = StorageDoubleMap<
-		_,
-		Twox64Concat,
-		EraIndex,
-		Twox64Concat,
-		T::AccountId,
-		Exposure<T::AccountId, BalanceOf<T>>,
-		ValueQuery,
-	>;
-
-	/// Clipped Exposure of validator at era.
-	///
-	/// This is similar to [`ErasStakers`] but number of nominators exposed is reduced to the
-	/// `T::MaxNominatorRewardedPerValidator` biggest stakers.
-	/// (Note: the field `total` and `own` of the exposure remains unchanged).
-	/// This is used to limit the i/o cost for the nominator payout.
-	///
-	/// This is keyed fist by the era index to allow bulk deletion and then the stash account.
-	///
-	/// Is it removed after `HISTORY_DEPTH` eras.
-	/// If stakers hasn't been set or has been removed then empty exposure is returned.
-	#[pallet::storage]
-	#[pallet::getter(fn eras_stakers_clipped)]
-	pub type ErasStakersClipped<T: Config> = StorageDoubleMap<
-		_,
-		Twox64Concat,
-		EraIndex,
-		Twox64Concat,
-		T::AccountId,
-		Exposure<T::AccountId, BalanceOf<T>>,
-		ValueQuery,
-	>;
-
-	/// Similar to `ErasStakers`, this holds the preferences of validators.
-	///
-	/// This is keyed first by the era index to allow bulk deletion and then the stash account.
-	///
-	/// Is it removed after `HISTORY_DEPTH` eras.
-	// If prefs hasn't been set or has been removed then 0 commission is returned.
-	#[pallet::storage]
-	#[pallet::getter(fn eras_validator_prefs)]
-	pub type ErasValidatorPrefs<T: Config> = StorageDoubleMap<
-		_,
-		Twox64Concat,
-		EraIndex,
-		Twox64Concat,
-		T::AccountId,
-		ValidatorPrefs,
-		ValueQuery,
-	>;
-
-	/// The total validator era payout for the last `HISTORY_DEPTH` eras.
-	///
-	/// Eras that haven't finished yet or has been removed doesn't have reward.
-	#[pallet::storage]
-	#[pallet::getter(fn eras_validator_reward)]
-	pub type ErasValidatorReward<T: Config> = StorageMap<_, Twox64Concat, EraIndex, BalanceOf<T>>;
-
-	/// Rewards for the last `HISTORY_DEPTH` eras.
-	/// If reward hasn't been set or has been removed then 0 reward is returned.
-	#[pallet::storage]
-	#[pallet::getter(fn eras_reward_points)]
-	pub type ErasRewardPoints<T: Config> =
-		StorageMap<_, Twox64Concat, EraIndex, EraRewardPoints<T::AccountId>, ValueQuery>;
-
-	/// The total amount staked for the last `HISTORY_DEPTH` eras.
-	/// If total hasn't been set or has been removed then 0 stake is returned.
-	#[pallet::storage]
-	#[pallet::getter(fn eras_total_stake)]
-	pub type ErasTotalStake<T: Config> =
-		StorageMap<_, Twox64Concat, EraIndex, BalanceOf<T>, ValueQuery>;
-
-	/// Mode of era forcing.
-	#[pallet::storage]
-	#[pallet::getter(fn force_era)]
-	pub type ForceEra<T> = StorageValue<_, Forcing, ValueQuery>;
-
-	/// The percentage of the slash that is distributed to reporters.
-	///
-	/// The rest of the slashed value is handled by the `Slash`.
-	#[pallet::storage]
-	#[pallet::getter(fn slash_reward_fraction)]
-	pub type SlashRewardFraction<T> = StorageValue<_, Perbill, ValueQuery>;
-
-	/// The amount of currency given to reporters of a slash event which was
-	/// canceled by extraordinary circumstances (e.g. governance).
-	#[pallet::storage]
-	#[pallet::getter(fn canceled_payout)]
-	pub type CanceledSlashPayout<T: Config> = StorageValue<_, BalanceOf<T>, ValueQuery>;
-
-	/// All unapplied slashes that are queued for later.
-	#[pallet::storage]
-	pub type UnappliedSlashes<T: Config> = StorageMap<
-		_,
-		Twox64Concat,
-		EraIndex,
-		Vec<UnappliedSlash<T::AccountId, BalanceOf<T>>>,
-		ValueQuery,
-	>;
-
-	/// A mapping from still-bonded eras to the first session index of that era.
-	///
-	/// Must contains information for eras for the range:
-	/// `[active_era - bounding_duration; active_era]`
-	#[pallet::storage]
-	pub(crate) type BondedEras<T: Config> =
-		StorageValue<_, Vec<(EraIndex, SessionIndex)>, ValueQuery>;
-
-	/// All slashing events on validators, mapped by era to the highest slash proportion
-	/// and slash value of the era.
-	#[pallet::storage]
-	pub(crate) type ValidatorSlashInEra<T: Config> = StorageDoubleMap<
-		_,
-		Twox64Concat,
-		EraIndex,
-		Twox64Concat,
-		T::AccountId,
-		(Perbill, BalanceOf<T>),
-	>;
-
-	/// All slashing events on nominators, mapped by era to the highest slash value of the era.
-	#[pallet::storage]
-	pub(crate) type NominatorSlashInEra<T: Config> =
-		StorageDoubleMap<_, Twox64Concat, EraIndex, Twox64Concat, T::AccountId, BalanceOf<T>>;
-
-	/// Slashing spans for stash accounts.
-	#[pallet::storage]
-	pub(crate) type SlashingSpans<T: Config> =
-		StorageMap<_, Twox64Concat, T::AccountId, slashing::SlashingSpans>;
-
-	/// Records information about the maximum slash of a stash within a slashing span,
-	/// as well as how much reward has been paid out.
-	#[pallet::storage]
-	pub(crate) type SpanSlash<T: Config> = StorageMap<
-		_,
-		Twox64Concat,
-		(T::AccountId, slashing::SpanIndex),
-		slashing::SpanRecord<BalanceOf<T>>,
-		ValueQuery,
-	>;
-
-	/// The earliest era for which we have a pending, unapplied slash.
-	#[pallet::storage]
-	pub(crate) type EarliestUnappliedSlash<T> = StorageValue<_, EraIndex>;
-
-	/// The last planned session scheduled by the session pallet.
-	///
-	/// This is basically in sync with the call to [`pallet_session::SessionManager::new_session`].
-	#[pallet::storage]
-	#[pallet::getter(fn current_planned_session)]
-	pub type CurrentPlannedSession<T> = StorageValue<_, SessionIndex, ValueQuery>;
-
-	/// True if network has been upgraded to this version.
-	/// Storage version of the pallet.
-	///
-	/// This is set to v7.0.0 for new networks.
-	#[pallet::storage]
-	pub(crate) type StorageVersion<T: Config> = StorageValue<_, Releases, ValueQuery>;
-
-	/// The threshold for when users can start calling `chill_other` for other validators / nominators.
-	/// The threshold is compared to the actual number of validators / nominators (`CountFor*`) in
-	/// the system compared to the configured max (`Max*Count`).
-	#[pallet::storage]
-	pub(crate) type ChillThreshold<T: Config> = StorageValue<_, Percent, OptionQuery>;
+/// A typed conversion from stash account ID to the active exposure of nominators
+/// on that account.
+///
+/// Active exposure is the exposure of the validator set currently validating, i.e. in
+/// `active_era`. It can differ from the latest planned exposure in `current_era`.
+pub struct ExposureOf<T>(sp_std::marker::PhantomData<T>);
 
-	#[pallet::genesis_config]
-	pub struct GenesisConfig<T: Config> {
-		pub history_depth: u32,
-		pub validator_count: u32,
-		pub minimum_validator_count: u32,
-		pub invulnerables: Vec<T::AccountId>,
-		pub force_era: Forcing,
-		pub slash_reward_fraction: Perbill,
-		pub canceled_payout: BalanceOf<T>,
-		pub stakers: Vec<(T::AccountId, T::AccountId, BalanceOf<T>, StakerStatus<T::AccountId>)>,
-		pub min_nominator_bond: BalanceOf<T>,
-		pub min_validator_bond: BalanceOf<T>,
+impl<T: Config> Convert<T::AccountId, Option<Exposure<T::AccountId, BalanceOf<T>>>>
+	for ExposureOf<T>
+{
+	fn convert(validator: T::AccountId) -> Option<Exposure<T::AccountId, BalanceOf<T>>> {
+		<Pallet<T>>::active_era()
+			.map(|active_era| <Pallet<T>>::eras_stakers(active_era.index, &validator))
 	}
+}
 
-	#[cfg(feature = "std")]
-	impl<T: Config> Default for GenesisConfig<T> {
-		fn default() -> Self {
-			GenesisConfig {
-				history_depth: 84u32,
-				validator_count: Default::default(),
-				minimum_validator_count: Default::default(),
-				invulnerables: Default::default(),
-				force_era: Default::default(),
-				slash_reward_fraction: Default::default(),
-				canceled_payout: Default::default(),
-				stakers: Default::default(),
-				min_nominator_bond: Default::default(),
-				min_validator_bond: Default::default(),
-			}
-		}
-	}
+/// Filter historical offences out and only allow those from the bonding period.
+pub struct FilterHistoricalOffences<T, R> {
+	_inner: sp_std::marker::PhantomData<(T, R)>,
+}
 
-	#[pallet::genesis_build]
-	impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
-		fn build(&self) {
-			HistoryDepth::<T>::put(self.history_depth);
-			ValidatorCount::<T>::put(self.validator_count);
-			MinimumValidatorCount::<T>::put(self.minimum_validator_count);
-			Invulnerables::<T>::put(&self.invulnerables);
-			ForceEra::<T>::put(self.force_era);
-			CanceledSlashPayout::<T>::put(self.canceled_payout);
-			SlashRewardFraction::<T>::put(self.slash_reward_fraction);
-			StorageVersion::<T>::put(Releases::V7_0_0);
-			MinNominatorBond::<T>::put(self.min_nominator_bond);
-			MinValidatorBond::<T>::put(self.min_validator_bond);
+impl<T, Reporter, Offender, R, O> ReportOffence<Reporter, Offender, O>
+	for FilterHistoricalOffences<Pallet<T>, R>
+where
+	T: Config,
+	R: ReportOffence<Reporter, Offender, O>,
+	O: Offence<Offender>,
+{
+	fn report_offence(reporters: Vec<Reporter>, offence: O) -> Result<(), OffenceError> {
+		// Disallow any slashing from before the current bonding period.
+		let offence_session = offence.session_index();
+		let bonded_eras = BondedEras::<T>::get();
 
-			for &(ref stash, ref controller, balance, ref status) in &self.stakers {
-				assert!(
-					T::Currency::free_balance(&stash) >= balance,
-					"Stash does not have enough balance to bond."
-				);
-				let _ = <Pallet<T>>::bond(
-					T::Origin::from(Some(stash.clone()).into()),
-					T::Lookup::unlookup(controller.clone()),
-					balance,
-					RewardDestination::Staked,
-				);
-				let _ = match status {
-					StakerStatus::Validator => <Pallet<T>>::validate(
-						T::Origin::from(Some(controller.clone()).into()),
-						Default::default(),
-					),
-					StakerStatus::Nominator(votes) => <Pallet<T>>::nominate(
-						T::Origin::from(Some(controller.clone()).into()),
-						votes.iter().map(|l| T::Lookup::unlookup(l.clone())).collect(),
-					),
-					_ => Ok(()),
-				};
-			}
+		if bonded_eras.first().filter(|(_, start)| offence_session >= *start).is_some() {
+			R::report_offence(reporters, offence)
+		} else {
+			<Pallet<T>>::deposit_event(Event::<T>::OldSlashingReportDiscarded(offence_session));
+			Ok(())
 		}
 	}
 
-	#[pallet::event]
-	#[pallet::generate_deposit(pub(super) fn deposit_event)]
-	#[pallet::metadata(T::AccountId = "AccountId", BalanceOf<T> = "Balance")]
-	pub enum Event<T: Config> {
-		/// The era payout has been set; the first balance is the validator-payout; the second is
-		/// the remainder from the maximum amount of reward.
-		/// \[era_index, validator_payout, remainder\]
-		EraPayout(EraIndex, BalanceOf<T>, BalanceOf<T>),
-		/// The staker has been rewarded by this amount. \[stash, amount\]
-		Reward(T::AccountId, BalanceOf<T>),
-		/// One validator (and its nominators) has been slashed by the given amount.
-		/// \[validator, amount\]
-		Slash(T::AccountId, BalanceOf<T>),
-		/// An old slashing report from a prior era was discarded because it could
-		/// not be processed. \[session_index\]
-		OldSlashingReportDiscarded(SessionIndex),
-		/// A new set of stakers was elected.
-		StakingElection,
-		/// An account has bonded this amount. \[stash, amount\]
-		///
-		/// NOTE: This event is only emitted when funds are bonded via a dispatchable. Notably,
-		/// it will not be emitted for staking rewards when they are added to stake.
-		Bonded(T::AccountId, BalanceOf<T>),
-		/// An account has unbonded this amount. \[stash, amount\]
-		Unbonded(T::AccountId, BalanceOf<T>),
-		/// An account has called `withdraw_unbonded` and removed unbonding chunks worth `Balance`
-		/// from the unlocking queue. \[stash, amount\]
-		Withdrawn(T::AccountId, BalanceOf<T>),
-		/// A nominator has been kicked from a validator. \[nominator, stash\]
-		Kicked(T::AccountId, T::AccountId),
-		/// The election failed. No new era is planned.
-		StakingElectionFailed,
-		/// An account has stopped participating as either a validator or nominator.
-		/// \[stash\]
-		Chilled(T::AccountId),
-	}
-
-	#[pallet::error]
-	pub enum Error<T> {
-		/// Not a controller account.
-		NotController,
-		/// Not a stash account.
-		NotStash,
-		/// Stash is already bonded.
-		AlreadyBonded,
-		/// Controller is already paired.
-		AlreadyPaired,
-		/// Targets cannot be empty.
-		EmptyTargets,
-		/// Duplicate index.
-		DuplicateIndex,
-		/// Slash record index out of bounds.
-		InvalidSlashIndex,
-		/// Can not bond with value less than minimum required.
-		InsufficientBond,
-		/// Can not schedule more unlock chunks.
-		NoMoreChunks,
-		/// Can not rebond without unlocking chunks.
-		NoUnlockChunk,
-		/// Attempting to target a stash that still has funds.
-		FundedTarget,
-		/// Invalid era to reward.
-		InvalidEraToReward,
-		/// Invalid number of nominations.
-		InvalidNumberOfNominations,
-		/// Items are not sorted and unique.
-		NotSortedAndUnique,
-		/// Rewards for this era have already been claimed for this validator.
-		AlreadyClaimed,
-		/// Incorrect previous history depth input provided.
-		IncorrectHistoryDepth,
-		/// Incorrect number of slashing spans provided.
-		IncorrectSlashingSpans,
-		/// Internal state has become somehow corrupted and the operation cannot continue.
-		BadState,
-		/// Too many nomination targets supplied.
-		TooManyTargets,
-		/// A nomination target was supplied that was blocked or otherwise not a validator.
-		BadTarget,
-		/// The user has enough bond and thus cannot be chilled forcefully by an external person.
-		CannotChillOther,
-		/// There are too many nominators in the system. Governance needs to adjust the staking settings
-		/// to keep things safe for the runtime.
-		TooManyNominators,
-		/// There are too many validators in the system. Governance needs to adjust the staking settings
-		/// to keep things safe for the runtime.
-		TooManyValidators,
-	}
-
-	#[pallet::hooks]
-	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
-		fn on_runtime_upgrade() -> Weight {
-			if StorageVersion::<T>::get() == Releases::V6_0_0 {
-				migrations::v7::migrate::<T>()
-			} else {
-				T::DbWeight::get().reads(1)
-			}
-		}
-
-		#[cfg(feature = "try-runtime")]
-		fn pre_upgrade() -> Result<(), &'static str> {
-			if StorageVersion::<T>::get() == Releases::V6_0_0 {
-				migrations::v7::pre_migrate::<T>()
-			} else {
-				Ok(())
-			}
-		}
-
-		fn on_initialize(_now: BlockNumberFor<T>) -> Weight {
-			// just return the weight of the on_finalize.
-			T::DbWeight::get().reads(1)
-		}
-
-		fn on_finalize(_n: BlockNumberFor<T>) {
-			// Set the start of the first era.
-			if let Some(mut active_era) = Self::active_era() {
-				if active_era.start.is_none() {
-					let now_as_millis_u64 = T::UnixTime::now().as_millis().saturated_into::<u64>();
-					active_era.start = Some(now_as_millis_u64);
-					// This write only ever happens once, we don't include it in the weight in general
-					ActiveEra::<T>::put(active_era);
-				}
-			}
-			// `on_finalize` weight is tracked in `on_initialize`
-		}
-
-		fn integrity_test() {
-			sp_std::if_std! {
-				sp_io::TestExternalities::new_empty().execute_with(||
-					assert!(
-						T::SlashDeferDuration::get() < T::BondingDuration::get() || T::BondingDuration::get() == 0,
-						"As per documentation, slash defer duration ({}) should be less than bonding duration ({}).",
-						T::SlashDeferDuration::get(),
-						T::BondingDuration::get(),
-					)
-				);
-			}
-		}
+	fn is_known_offence(offenders: &[Offender], time_slot: &O::TimeSlot) -> bool {
+		R::is_known_offence(offenders, time_slot)
 	}
-
-	#[pallet::call]
-	impl<T: Config> Pallet<T> {
-		/// Take the origin account as a stash and lock up `value` of its balance. `controller` will
-		/// be the account that controls it.
-		///
-		/// `value` must be more than the `minimum_balance` specified by `T::Currency`.
-		///
-		/// The dispatch origin for this call must be _Signed_ by the stash account.
-		///
-		/// Emits `Bonded`.
-		/// # <weight>
-		/// - Independent of the arguments. Moderate complexity.
-		/// - O(1).
-		/// - Three extra DB entries.
-		///
-		/// NOTE: Two of the storage writes (`Self::bonded`, `Self::payee`) are _never_ cleaned
-		/// unless the `origin` falls below _existential deposit_ and gets removed as dust.
-		/// ------------------
-		/// # </weight>
-		#[pallet::weight(T::WeightInfo::bond())]
-		pub fn bond(
-			origin: OriginFor<T>,
-			controller: <T::Lookup as StaticLookup>::Source,
-			#[pallet::compact] value: BalanceOf<T>,
-			payee: RewardDestination<T::AccountId>,
-		) -> DispatchResult {
-			let stash = ensure_signed(origin)?;
-
-			if <Bonded<T>>::contains_key(&stash) {
-				Err(Error::<T>::AlreadyBonded)?
-			}
-
-			let controller = T::Lookup::lookup(controller)?;
-
-			if <Ledger<T>>::contains_key(&controller) {
-				Err(Error::<T>::AlreadyPaired)?
-			}
-
-			// Reject a bond which is considered to be _dust_.
-			if value < T::Currency::minimum_balance() {
-				Err(Error::<T>::InsufficientBond)?
-			}
-
-			frame_system::Pallet::<T>::inc_consumers(&stash).map_err(|_| Error::<T>::BadState)?;
-
-			// You're auto-bonded forever, here. We might improve this by only bonding when
-			// you actually validate/nominate and remove once you unbond __everything__.
-			<Bonded<T>>::insert(&stash, &controller);
-			<Payee<T>>::insert(&stash, payee);
-
-			let current_era = CurrentEra::<T>::get().unwrap_or(0);
-			let history_depth = Self::history_depth();
-			let last_reward_era = current_era.saturating_sub(history_depth);
-
-			let stash_balance = T::Currency::free_balance(&stash);
-			let value = value.min(stash_balance);
-			Self::deposit_event(Event::<T>::Bonded(stash.clone(), value));
-			let item = StakingLedger {
-				stash,
-				total: value,
-				active: value,
-				unlocking: vec![],
-				claimed_rewards: (last_reward_era..current_era).collect(),
-			};
-			Self::update_ledger(&controller, &item);
-			Ok(())
-		}
-
-		/// Add some extra amount that have appeared in the stash `free_balance` into the balance up
-		/// for staking.
-		///
-		/// The dispatch origin for this call must be _Signed_ by the stash, not the controller.
-		///
-		/// Use this if there are additional funds in your stash account that you wish to bond.
-		/// Unlike [`bond`](Self::bond) or [`unbond`](Self::unbond) this function does not impose any limitation
-		/// on the amount that can be added.
-		///
-		/// Emits `Bonded`.
-		///
-		/// # <weight>
-		/// - Independent of the arguments. Insignificant complexity.
-		/// - O(1).
-		/// # </weight>
-		#[pallet::weight(T::WeightInfo::bond_extra())]
-		pub fn bond_extra(
-			origin: OriginFor<T>,
-			#[pallet::compact] max_additional: BalanceOf<T>,
-		) -> DispatchResult {
-			let stash = ensure_signed(origin)?;
-
-			let controller = Self::bonded(&stash).ok_or(Error::<T>::NotStash)?;
-			let mut ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
-
-			let stash_balance = T::Currency::free_balance(&stash);
-			if let Some(extra) = stash_balance.checked_sub(&ledger.total) {
-				let extra = extra.min(max_additional);
-				ledger.total += extra;
-				ledger.active += extra;
-				// Last check: the new active amount of ledger must be more than ED.
-				ensure!(
-					ledger.active >= T::Currency::minimum_balance(),
-					Error::<T>::InsufficientBond
-				);
-
-				Self::deposit_event(Event::<T>::Bonded(stash, extra));
-				Self::update_ledger(&controller, &ledger);
-			}
-			Ok(())
-		}
-
-		/// Schedule a portion of the stash to be unlocked ready for transfer out after the bond
-		/// period ends. If this leaves an amount actively bonded less than
-		/// T::Currency::minimum_balance(), then it is increased to the full amount.
-		///
-		/// The dispatch origin for this call must be _Signed_ by the controller, not the stash.
-		///
-		/// Once the unlock period is done, you can call `withdraw_unbonded` to actually move
-		/// the funds out of management ready for transfer.
-		///
-		/// No more than a limited number of unlocking chunks (see `MAX_UNLOCKING_CHUNKS`)
-		/// can co-exists at the same time. In that case, [`Call::withdraw_unbonded`] need
-		/// to be called first to remove some of the chunks (if possible).
-		///
-		/// If a user encounters the `InsufficientBond` error when calling this extrinsic,
-		/// they should call `chill` first in order to free up their bonded funds.
-		///
-		/// Emits `Unbonded`.
-		///
-		/// See also [`Call::withdraw_unbonded`].
-		#[pallet::weight(T::WeightInfo::unbond())]
-		pub fn unbond(
-			origin: OriginFor<T>,
-			#[pallet::compact] value: BalanceOf<T>,
-		) -> DispatchResult {
-			let controller = ensure_signed(origin)?;
-			let mut ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
-			ensure!(ledger.unlocking.len() < MAX_UNLOCKING_CHUNKS, Error::<T>::NoMoreChunks);
-
-			let mut value = value.min(ledger.active);
-
-			if !value.is_zero() {
-				ledger.active -= value;
-
-				// Avoid there being a dust balance left in the staking system.
-				if ledger.active < T::Currency::minimum_balance() {
-					value += ledger.active;
-					ledger.active = Zero::zero();
-				}
-
-				let min_active_bond = if Nominators::<T>::contains_key(&ledger.stash) {
-					MinNominatorBond::<T>::get()
-				} else if Validators::<T>::contains_key(&ledger.stash) {
-					MinValidatorBond::<T>::get()
-				} else {
-					Zero::zero()
-				};
-
-				// Make sure that the user maintains enough active bond for their role.
-				// If a user runs into this error, they should chill first.
-				ensure!(ledger.active >= min_active_bond, Error::<T>::InsufficientBond);
-
-				// Note: in case there is no current era it is fine to bond one era more.
-				let era = Self::current_era().unwrap_or(0) + T::BondingDuration::get();
-				ledger.unlocking.push(UnlockChunk { value, era });
-				Self::update_ledger(&controller, &ledger);
-				Self::deposit_event(Event::<T>::Unbonded(ledger.stash, value));
-			}
-			Ok(())
-		}
-
-		/// Remove any unlocked chunks from the `unlocking` queue from our management.
-		///
-		/// This essentially frees up that balance to be used by the stash account to do
-		/// whatever it wants.
-		///
-		/// The dispatch origin for this call must be _Signed_ by the controller.
-		///
-		/// Emits `Withdrawn`.
-		///
-		/// See also [`Call::unbond`].
-		///
-		/// # <weight>
-		/// Complexity O(S) where S is the number of slashing spans to remove
-		/// NOTE: Weight annotation is the kill scenario, we refund otherwise.
-		/// # </weight>
-		#[pallet::weight(T::WeightInfo::withdraw_unbonded_kill(*num_slashing_spans))]
-		pub fn withdraw_unbonded(
-			origin: OriginFor<T>,
-			num_slashing_spans: u32,
-		) -> DispatchResultWithPostInfo {
-			let controller = ensure_signed(origin)?;
-			let mut ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
-			let (stash, old_total) = (ledger.stash.clone(), ledger.total);
-			if let Some(current_era) = Self::current_era() {
-				ledger = ledger.consolidate_unlocked(current_era)
-			}
-
-			let post_info_weight =
-				if ledger.unlocking.is_empty() && ledger.active < T::Currency::minimum_balance() {
-					// This account must have called `unbond()` with some value that caused the active
-					// portion to fall below existential deposit + will have no more unlocking chunks
-					// left. We can now safely remove all staking-related information.
-					Self::kill_stash(&stash, num_slashing_spans)?;
-					// Remove the lock.
-					T::Currency::remove_lock(STAKING_ID, &stash);
-					// This is worst case scenario, so we use the full weight and return None
-					None
-				} else {
-					// This was the consequence of a partial unbond. just update the ledger and move on.
-					Self::update_ledger(&controller, &ledger);
-
-					// This is only an update, so we use less overall weight.
-					Some(T::WeightInfo::withdraw_unbonded_update(num_slashing_spans))
-				};
-
-			// `old_total` should never be less than the new total because
-			// `consolidate_unlocked` strictly subtracts balance.
-			if ledger.total < old_total {
-				// Already checked that this won't overflow by entry condition.
-				let value = old_total - ledger.total;
-				Self::deposit_event(Event::<T>::Withdrawn(stash, value));
-			}
-
-			Ok(post_info_weight.into())
-		}
-
-		/// Declare the desire to validate for the origin controller.
-		///
-		/// Effects will be felt at the beginning of the next era.
-		///
-		/// The dispatch origin for this call must be _Signed_ by the controller, not the stash.
-		#[pallet::weight(T::WeightInfo::validate())]
-		pub fn validate(origin: OriginFor<T>, prefs: ValidatorPrefs) -> DispatchResult {
-			let controller = ensure_signed(origin)?;
-
-			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
-			ensure!(ledger.active >= MinValidatorBond::<T>::get(), Error::<T>::InsufficientBond);
-			let stash = &ledger.stash;
-
-			// Only check limits if they are not already a validator.
-			if !Validators::<T>::contains_key(stash) {
-				// If this error is reached, we need to adjust the `MinValidatorBond` and start calling `chill_other`.
-				// Until then, we explicitly block new validators to protect the runtime.
-				if let Some(max_validators) = MaxValidatorsCount::<T>::get() {
-					ensure!(
-						CounterForValidators::<T>::get() < max_validators,
-						Error::<T>::TooManyValidators
-					);
-				}
-			}
-
-			Self::do_remove_nominator(stash);
-			Self::do_add_validator(stash, prefs);
-			Ok(())
-		}
-
-		/// Declare the desire to nominate `targets` for the origin controller.
-		///
-		/// Effects will be felt at the beginning of the next era.
-		///
-		/// The dispatch origin for this call must be _Signed_ by the controller, not the stash.
-		///
-		/// # <weight>
-		/// - The transaction's complexity is proportional to the size of `targets` (N)
-		/// which is capped at CompactAssignments::LIMIT (MAX_NOMINATIONS).
-		/// - Both the reads and writes follow a similar pattern.
-		/// # </weight>
-		#[pallet::weight(T::WeightInfo::nominate(targets.len() as u32))]
-		pub fn nominate(
-			origin: OriginFor<T>,
-			targets: Vec<<T::Lookup as StaticLookup>::Source>,
-		) -> DispatchResult {
-			let controller = ensure_signed(origin)?;
-
-			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
-			ensure!(ledger.active >= MinNominatorBond::<T>::get(), Error::<T>::InsufficientBond);
-			let stash = &ledger.stash;
-
-			// Only check limits if they are not already a nominator.
-			if !Nominators::<T>::contains_key(stash) {
-				// If this error is reached, we need to adjust the `MinNominatorBond` and start calling `chill_other`.
-				// Until then, we explicitly block new nominators to protect the runtime.
-				if let Some(max_nominators) = MaxNominatorsCount::<T>::get() {
-					ensure!(
-						CounterForNominators::<T>::get() < max_nominators,
-						Error::<T>::TooManyNominators
-					);
-				}
-			}
-
-			ensure!(!targets.is_empty(), Error::<T>::EmptyTargets);
-			ensure!(targets.len() <= T::MAX_NOMINATIONS as usize, Error::<T>::TooManyTargets);
-
-			let old = Nominators::<T>::get(stash).map_or_else(Vec::new, |x| x.targets);
-
-			let targets = targets
-				.into_iter()
-				.map(|t| T::Lookup::lookup(t).map_err(DispatchError::from))
-				.map(|n| {
-					n.and_then(|n| {
-						if old.contains(&n) || !Validators::<T>::get(&n).blocked {
-							Ok(n)
-						} else {
-							Err(Error::<T>::BadTarget.into())
-						}
-					})
-				})
-				.collect::<result::Result<Vec<T::AccountId>, _>>()?;
-
-			let nominations = Nominations {
-				targets,
-				// Initial nominations are considered submitted at era 0. See `Nominations` doc
-				submitted_in: Self::current_era().unwrap_or(0),
-				suppressed: false,
-			};
-
-			Self::do_remove_validator(stash);
-			Self::do_add_nominator(stash, nominations);
-			Ok(())
-		}
-
-		/// Declare no desire to either validate or nominate.
-		///
-		/// Effects will be felt at the beginning of the next era.
-		///
-		/// The dispatch origin for this call must be _Signed_ by the controller, not the stash.
-		///
-		/// # <weight>
-		/// - Independent of the arguments. Insignificant complexity.
-		/// - Contains one read.
-		/// - Writes are limited to the `origin` account key.
-		/// # </weight>
-		#[pallet::weight(T::WeightInfo::chill())]
-		pub fn chill(origin: OriginFor<T>) -> DispatchResult {
-			let controller = ensure_signed(origin)?;
-			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
-			Self::chill_stash(&ledger.stash);
-			Ok(())
-		}
-
-		/// (Re-)set the payment target for a controller.
-		///
-		/// Effects will be felt at the beginning of the next era.
-		///
-		/// The dispatch origin for this call must be _Signed_ by the controller, not the stash.
-		///
-		/// # <weight>
-		/// - Independent of the arguments. Insignificant complexity.
-		/// - Contains a limited number of reads.
-		/// - Writes are limited to the `origin` account key.
-		/// ---------
-		/// - Weight: O(1)
-		/// - DB Weight:
-		///     - Read: Ledger
-		///     - Write: Payee
-		/// # </weight>
-		#[pallet::weight(T::WeightInfo::set_payee())]
-		pub fn set_payee(
-			origin: OriginFor<T>,
-			payee: RewardDestination<T::AccountId>,
-		) -> DispatchResult {
-			let controller = ensure_signed(origin)?;
-			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
-			let stash = &ledger.stash;
-			<Payee<T>>::insert(stash, payee);
-			Ok(())
-		}
-
-		/// (Re-)set the controller of a stash.
-		///
-		/// Effects will be felt at the beginning of the next era.
-		///
-		/// The dispatch origin for this call must be _Signed_ by the stash, not the controller.
-		///
-		/// # <weight>
-		/// - Independent of the arguments. Insignificant complexity.
-		/// - Contains a limited number of reads.
-		/// - Writes are limited to the `origin` account key.
-		/// ----------
-		/// Weight: O(1)
-		/// DB Weight:
-		/// - Read: Bonded, Ledger New Controller, Ledger Old Controller
-		/// - Write: Bonded, Ledger New Controller, Ledger Old Controller
-		/// # </weight>
-		#[pallet::weight(T::WeightInfo::set_controller())]
-		pub fn set_controller(
-			origin: OriginFor<T>,
-			controller: <T::Lookup as StaticLookup>::Source,
-		) -> DispatchResult {
-			let stash = ensure_signed(origin)?;
-			let old_controller = Self::bonded(&stash).ok_or(Error::<T>::NotStash)?;
-			let controller = T::Lookup::lookup(controller)?;
-			if <Ledger<T>>::contains_key(&controller) {
-				Err(Error::<T>::AlreadyPaired)?
-			}
-			if controller != old_controller {
-				<Bonded<T>>::insert(&stash, &controller);
-				if let Some(l) = <Ledger<T>>::take(&old_controller) {
-					<Ledger<T>>::insert(&controller, l);
-				}
-			}
-			Ok(())
-		}
-
-		/// Sets the ideal number of validators.
-		///
-		/// The dispatch origin must be Root.
-		///
-		/// # <weight>
-		/// Weight: O(1)
-		/// Write: Validator Count
-		/// # </weight>
-		#[pallet::weight(T::WeightInfo::set_validator_count())]
-		pub fn set_validator_count(
-			origin: OriginFor<T>,
-			#[pallet::compact] new: u32,
-		) -> DispatchResult {
-			ensure_root(origin)?;
-			ValidatorCount::<T>::put(new);
-			Ok(())
-		}
-
-		/// Increments the ideal number of validators.
-		///
-		/// The dispatch origin must be Root.
-		///
-		/// # <weight>
-		/// Same as [`Self::set_validator_count`].
-		/// # </weight>
-		#[pallet::weight(T::WeightInfo::set_validator_count())]
-		pub fn increase_validator_count(
-			origin: OriginFor<T>,
-			#[pallet::compact] additional: u32,
-		) -> DispatchResult {
-			ensure_root(origin)?;
-			ValidatorCount::<T>::mutate(|n| *n += additional);
-			Ok(())
-		}
-
-		/// Scale up the ideal number of validators by a factor.
-		///
-		/// The dispatch origin must be Root.
-		///
-		/// # <weight>
-		/// Same as [`Self::set_validator_count`].
-		/// # </weight>
-		#[pallet::weight(T::WeightInfo::set_validator_count())]
-		pub fn scale_validator_count(origin: OriginFor<T>, factor: Percent) -> DispatchResult {
-			ensure_root(origin)?;
-			ValidatorCount::<T>::mutate(|n| *n += factor * *n);
-			Ok(())
-		}
-
-		/// Force there to be no new eras indefinitely.
-		///
-		/// The dispatch origin must be Root.
-		///
-		/// # Warning
-		///
-		/// The election process starts multiple blocks before the end of the era.
-		/// Thus the election process may be ongoing when this is called. In this case the
-		/// election will continue until the next era is triggered.
-		///
-		/// # <weight>
-		/// - No arguments.
-		/// - Weight: O(1)
-		/// - Write: ForceEra
-		/// # </weight>
-		#[pallet::weight(T::WeightInfo::force_no_eras())]
-		pub fn force_no_eras(origin: OriginFor<T>) -> DispatchResult {
-			ensure_root(origin)?;
-			ForceEra::<T>::put(Forcing::ForceNone);
-			Ok(())
-		}
-
-		/// Force there to be a new era at the end of the next session. After this, it will be
-		/// reset to normal (non-forced) behaviour.
-		///
-		/// The dispatch origin must be Root.
-		///
-		/// # Warning
-		///
-		/// The election process starts multiple blocks before the end of the era.
-		/// If this is called just before a new era is triggered, the election process may not
-		/// have enough blocks to get a result.
-		///
-		/// # <weight>
-		/// - No arguments.
-		/// - Weight: O(1)
-		/// - Write ForceEra
-		/// # </weight>
-		#[pallet::weight(T::WeightInfo::force_new_era())]
-		pub fn force_new_era(origin: OriginFor<T>) -> DispatchResult {
-			ensure_root(origin)?;
-			ForceEra::<T>::put(Forcing::ForceNew);
-			Ok(())
-		}
-
-		/// Set the validators who cannot be slashed (if any).
-		///
-		/// The dispatch origin must be Root.
-		///
-		/// # <weight>
-		/// - O(V)
-		/// - Write: Invulnerables
-		/// # </weight>
-		#[pallet::weight(T::WeightInfo::set_invulnerables(invulnerables.len() as u32))]
-		pub fn set_invulnerables(
-			origin: OriginFor<T>,
-			invulnerables: Vec<T::AccountId>,
-		) -> DispatchResult {
-			ensure_root(origin)?;
-			<Invulnerables<T>>::put(invulnerables);
-			Ok(())
-		}
-
-		/// Force a current staker to become completely unstaked, immediately.
-		///
-		/// The dispatch origin must be Root.
-		///
-		/// # <weight>
-		/// O(S) where S is the number of slashing spans to be removed
-		/// Reads: Bonded, Slashing Spans, Account, Locks
-		/// Writes: Bonded, Slashing Spans (if S > 0), Ledger, Payee, Validators, Nominators, Account, Locks
-		/// Writes Each: SpanSlash * S
-		/// # </weight>
-		#[pallet::weight(T::WeightInfo::force_unstake(*num_slashing_spans))]
-		pub fn force_unstake(
-			origin: OriginFor<T>,
-			stash: T::AccountId,
-			num_slashing_spans: u32,
-		) -> DispatchResult {
-			ensure_root(origin)?;
-
-			// Remove all staking-related information.
-			Self::kill_stash(&stash, num_slashing_spans)?;
-
-			// Remove the lock.
-			T::Currency::remove_lock(STAKING_ID, &stash);
-			Ok(())
-		}
-
-		/// Force there to be a new era at the end of sessions indefinitely.
-		///
-		/// The dispatch origin must be Root.
-		///
-		/// # Warning
-		///
-		/// The election process starts multiple blocks before the end of the era.
-		/// If this is called just before a new era is triggered, the election process may not
-		/// have enough blocks to get a result.
-		///
-		/// # <weight>
-		/// - Weight: O(1)
-		/// - Write: ForceEra
-		/// # </weight>
-		#[pallet::weight(T::WeightInfo::force_new_era_always())]
-		pub fn force_new_era_always(origin: OriginFor<T>) -> DispatchResult {
-			ensure_root(origin)?;
-			ForceEra::<T>::put(Forcing::ForceAlways);
-			Ok(())
-		}
-
-		/// Cancel enactment of a deferred slash.
-		///
-		/// Can be called by the `T::SlashCancelOrigin`.
-		///
-		/// Parameters: era and indices of the slashes for that era to kill.
-		///
-		/// # <weight>
-		/// Complexity: O(U + S)
-		/// with U unapplied slashes weighted with U=1000
-		/// and S is the number of slash indices to be canceled.
-		/// - Read: Unapplied Slashes
-		/// - Write: Unapplied Slashes
-		/// # </weight>
-		#[pallet::weight(T::WeightInfo::cancel_deferred_slash(slash_indices.len() as u32))]
-		pub fn cancel_deferred_slash(
-			origin: OriginFor<T>,
-			era: EraIndex,
-			slash_indices: Vec<u32>,
-		) -> DispatchResult {
-			T::SlashCancelOrigin::ensure_origin(origin)?;
-
-			ensure!(!slash_indices.is_empty(), Error::<T>::EmptyTargets);
-			ensure!(is_sorted_and_unique(&slash_indices), Error::<T>::NotSortedAndUnique);
-
-			let mut unapplied = <Self as Store>::UnappliedSlashes::get(&era);
-			let last_item = slash_indices[slash_indices.len() - 1];
-			ensure!((last_item as usize) < unapplied.len(), Error::<T>::InvalidSlashIndex);
-
-			for (removed, index) in slash_indices.into_iter().enumerate() {
-				let index = (index as usize) - removed;
-				unapplied.remove(index);
-			}
-
-			<Self as Store>::UnappliedSlashes::insert(&era, &unapplied);
-			Ok(())
-		}
-
-		/// Pay out all the stakers behind a single validator for a single era.
-		///
-		/// - `validator_stash` is the stash account of the validator. Their nominators, up to
-		///   `T::MaxNominatorRewardedPerValidator`, will also receive their rewards.
-		/// - `era` may be any era between `[current_era - history_depth; current_era]`.
-		///
-		/// The origin of this call must be _Signed_. Any account can call this function, even if
-		/// it is not one of the stakers.
-		///
-		/// # <weight>
-		/// - Time complexity: at most O(MaxNominatorRewardedPerValidator).
-		/// - Contains a limited number of reads and writes.
-		/// -----------
-		/// N is the Number of payouts for the validator (including the validator)
-		/// Weight:
-		/// - Reward Destination Staked: O(N)
-		/// - Reward Destination Controller (Creating): O(N)
-		///
-		///   NOTE: weights are assuming that payouts are made to alive stash account (Staked).
-		///   Paying even a dead controller is cheaper weight-wise. We don't do any refunds here.
-		/// # </weight>
-		#[pallet::weight(T::WeightInfo::payout_stakers_alive_staked(
-			T::MaxNominatorRewardedPerValidator::get()
-		))]
-		pub fn payout_stakers(
-			origin: OriginFor<T>,
-			validator_stash: T::AccountId,
-			era: EraIndex,
-		) -> DispatchResultWithPostInfo {
-			ensure_signed(origin)?;
-			Self::do_payout_stakers(validator_stash, era)
-		}
-
-		/// Rebond a portion of the stash scheduled to be unlocked.
-		///
-		/// The dispatch origin must be signed by the controller.
-		///
-		/// # <weight>
-		/// - Time complexity: O(L), where L is unlocking chunks
-		/// - Bounded by `MAX_UNLOCKING_CHUNKS`.
-		/// - Storage changes: Can't increase storage, only decrease it.
-		/// # </weight>
-		#[pallet::weight(T::WeightInfo::rebond(MAX_UNLOCKING_CHUNKS as u32))]
-		pub fn rebond(
-			origin: OriginFor<T>,
-			#[pallet::compact] value: BalanceOf<T>,
-		) -> DispatchResultWithPostInfo {
-			let controller = ensure_signed(origin)?;
-			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
-			ensure!(!ledger.unlocking.is_empty(), Error::<T>::NoUnlockChunk);
-
-			let ledger = ledger.rebond(value);
-			// Last check: the new active amount of ledger must be more than ED.
-			ensure!(ledger.active >= T::Currency::minimum_balance(), Error::<T>::InsufficientBond);
-
-			Self::deposit_event(Event::<T>::Bonded(ledger.stash.clone(), value));
-			Self::update_ledger(&controller, &ledger);
-			Ok(Some(
-				35 * WEIGHT_PER_MICROS +
-					50 * WEIGHT_PER_NANOS * (ledger.unlocking.len() as Weight) +
-					T::DbWeight::get().reads_writes(3, 2),
-			)
-			.into())
-		}
-
-		/// Set `HistoryDepth` value. This function will delete any history information
-		/// when `HistoryDepth` is reduced.
-		///
-		/// Parameters:
-		/// - `new_history_depth`: The new history depth you would like to set.
-		/// - `era_items_deleted`: The number of items that will be deleted by this dispatch.
-		///    This should report all the storage items that will be deleted by clearing old
-		///    era history. Needed to report an accurate weight for the dispatch. Trusted by
-		///    `Root` to report an accurate number.
-		///
-		/// Origin must be root.
-		///
-		/// # <weight>
-		/// - E: Number of history depths removed, i.e. 10 -> 7 = 3
-		/// - Weight: O(E)
-		/// - DB Weight:
-		///     - Reads: Current Era, History Depth
-		///     - Writes: History Depth
-		///     - Clear Prefix Each: Era Stakers, EraStakersClipped, ErasValidatorPrefs
-		///     - Writes Each: ErasValidatorReward, ErasRewardPoints, ErasTotalStake, ErasStartSessionIndex
-		/// # </weight>
-		#[pallet::weight(T::WeightInfo::set_history_depth(*_era_items_deleted))]
-		pub fn set_history_depth(
-			origin: OriginFor<T>,
-			#[pallet::compact] new_history_depth: EraIndex,
-			#[pallet::compact] _era_items_deleted: u32,
-		) -> DispatchResult {
-			ensure_root(origin)?;
-			if let Some(current_era) = Self::current_era() {
-				HistoryDepth::<T>::mutate(|history_depth| {
-					let last_kept = current_era.checked_sub(*history_depth).unwrap_or(0);
-					let new_last_kept = current_era.checked_sub(new_history_depth).unwrap_or(0);
-					for era_index in last_kept..new_last_kept {
-						Self::clear_era_information(era_index);
-					}
-					*history_depth = new_history_depth
-				})
-			}
-			Ok(())
-		}
-
-		/// Remove all data structure concerning a staker/stash once its balance is at the minimum.
-		/// This is essentially equivalent to `withdraw_unbonded` except it can be called by anyone
-		/// and the target `stash` must have no funds left beyond the ED.
-		///
-		/// This can be called from any origin.
-		///
-		/// - `stash`: The stash account to reap. Its balance must be zero.
-		///
-		/// # <weight>
-		/// Complexity: O(S) where S is the number of slashing spans on the account.
-		/// DB Weight:
-		/// - Reads: Stash Account, Bonded, Slashing Spans, Locks
-		/// - Writes: Bonded, Slashing Spans (if S > 0), Ledger, Payee, Validators, Nominators, Stash Account, Locks
-		/// - Writes Each: SpanSlash * S
-		/// # </weight>
-		#[pallet::weight(T::WeightInfo::reap_stash(*num_slashing_spans))]
-		pub fn reap_stash(
-			_origin: OriginFor<T>,
-			stash: T::AccountId,
-			num_slashing_spans: u32,
-		) -> DispatchResult {
-			let at_minimum = T::Currency::total_balance(&stash) == T::Currency::minimum_balance();
-			ensure!(at_minimum, Error::<T>::FundedTarget);
-			Self::kill_stash(&stash, num_slashing_spans)?;
-			T::Currency::remove_lock(STAKING_ID, &stash);
-			Ok(())
-		}
-
-		/// Remove the given nominations from the calling validator.
-		///
-		/// Effects will be felt at the beginning of the next era.
-		///
-		/// The dispatch origin for this call must be _Signed_ by the controller, not the stash.
-		///
-		/// - `who`: A list of nominator stash accounts who are nominating this validator which
-		///   should no longer be nominating this validator.
-		///
-		/// Note: Making this call only makes sense if you first set the validator preferences to
-		/// block any further nominations.
-		#[pallet::weight(T::WeightInfo::kick(who.len() as u32))]
-		pub fn kick(
-			origin: OriginFor<T>,
-			who: Vec<<T::Lookup as StaticLookup>::Source>,
-		) -> DispatchResult {
-			let controller = ensure_signed(origin)?;
-			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
-			let stash = &ledger.stash;
-
-			for nom_stash in who
-				.into_iter()
-				.map(T::Lookup::lookup)
-				.collect::<Result<Vec<T::AccountId>, _>>()?
-				.into_iter()
-			{
-				Nominators::<T>::mutate(&nom_stash, |maybe_nom| {
-					if let Some(ref mut nom) = maybe_nom {
-						if let Some(pos) = nom.targets.iter().position(|v| v == stash) {
-							nom.targets.swap_remove(pos);
-							Self::deposit_event(Event::<T>::Kicked(
-								nom_stash.clone(),
-								stash.clone(),
-							));
-						}
-					}
-				});
-			}
-
-			Ok(())
-		}
-
-		/// Update the various staking limits this pallet.
-		///
-		/// * `min_nominator_bond`: The minimum active bond needed to be a nominator.
-		/// * `min_validator_bond`: The minimum active bond needed to be a validator.
-		/// * `max_nominator_count`: The max number of users who can be a nominator at once.
-		///   When set to `None`, no limit is enforced.
-		/// * `max_validator_count`: The max number of users who can be a validator at once.
-		///   When set to `None`, no limit is enforced.
-		///
-		/// Origin must be Root to call this function.
-		///
-		/// NOTE: Existing nominators and validators will not be affected by this update.
-		/// to kick people under the new limits, `chill_other` should be called.
-		#[pallet::weight(T::WeightInfo::set_staking_limits())]
-		pub fn set_staking_limits(
-			origin: OriginFor<T>,
-			min_nominator_bond: BalanceOf<T>,
-			min_validator_bond: BalanceOf<T>,
-			max_nominator_count: Option<u32>,
-			max_validator_count: Option<u32>,
-			threshold: Option<Percent>,
-		) -> DispatchResult {
-			ensure_root(origin)?;
-			MinNominatorBond::<T>::set(min_nominator_bond);
-			MinValidatorBond::<T>::set(min_validator_bond);
-			MaxNominatorsCount::<T>::set(max_nominator_count);
-			MaxValidatorsCount::<T>::set(max_validator_count);
-			ChillThreshold::<T>::set(threshold);
-			Ok(())
-		}
-
-		/// Declare a `controller` to stop participating as either a validator or nominator.
-		///
-		/// Effects will be felt at the beginning of the next era.
-		///
-		/// The dispatch origin for this call must be _Signed_, but can be called by anyone.
-		///
-		/// If the caller is the same as the controller being targeted, then no further checks are
-		/// enforced, and this function behaves just like `chill`.
-		///
-		/// If the caller is different than the controller being targeted, the following conditions
-		/// must be met:
-		/// * A `ChillThreshold` must be set and checked which defines how close to the max
-		///   nominators or validators we must reach before users can start chilling one-another.
-		/// * A `MaxNominatorCount` and `MaxValidatorCount` must be set which is used to determine
-		///   how close we are to the threshold.
-		/// * A `MinNominatorBond` and `MinValidatorBond` must be set and checked, which determines
-		///   if this is a person that should be chilled because they have not met the threshold
-		///   bond required.
-		///
-		/// This can be helpful if bond requirements are updated, and we need to remove old users
-		/// who do not satisfy these requirements.
-		// TODO: Maybe we can deprecate `chill` in the future.
-		// https://github.com/paritytech/substrate/issues/9111
-		#[pallet::weight(T::WeightInfo::chill_other())]
-		pub fn chill_other(origin: OriginFor<T>, controller: T::AccountId) -> DispatchResult {
-			// Anyone can call this function.
-			let caller = ensure_signed(origin)?;
-			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
-			let stash = ledger.stash;
-
-			// In order for one user to chill another user, the following conditions must be met:
-			// * A `ChillThreshold` is set which defines how close to the max nominators or
-			//   validators we must reach before users can start chilling one-another.
-			// * A `MaxNominatorCount` and `MaxValidatorCount` which is used to determine how close
-			//   we are to the threshold.
-			// * A `MinNominatorBond` and `MinValidatorBond` which is the final condition checked to
-			//   determine this is a person that should be chilled because they have not met the
-			//   threshold bond required.
-			//
-			// Otherwise, if caller is the same as the controller, this is just like `chill`.
-			if caller != controller {
-				let threshold = ChillThreshold::<T>::get().ok_or(Error::<T>::CannotChillOther)?;
-				let min_active_bond = if Nominators::<T>::contains_key(&stash) {
-					let max_nominator_count =
-						MaxNominatorsCount::<T>::get().ok_or(Error::<T>::CannotChillOther)?;
-					let current_nominator_count = CounterForNominators::<T>::get();
-					ensure!(
-						threshold * max_nominator_count < current_nominator_count,
-						Error::<T>::CannotChillOther
-					);
-					MinNominatorBond::<T>::get()
-				} else if Validators::<T>::contains_key(&stash) {
-					let max_validator_count =
-						MaxValidatorsCount::<T>::get().ok_or(Error::<T>::CannotChillOther)?;
-					let current_validator_count = CounterForValidators::<T>::get();
-					ensure!(
-						threshold * max_validator_count < current_validator_count,
-						Error::<T>::CannotChillOther
-					);
-					MinValidatorBond::<T>::get()
-				} else {
-					Zero::zero()
-				};
-
-				ensure!(ledger.active < min_active_bond, Error::<T>::CannotChillOther);
-			}
-
-			Self::chill_stash(&stash);
-			Ok(())
-		}
-	}
-}
-
-impl<T: Config> Pallet<T> {
-	/// The total balance that can be slashed from a stash account as of right now.
-	pub fn slashable_balance_of(stash: &T::AccountId) -> BalanceOf<T> {
-		// Weight note: consider making the stake accessible through stash.
-		Self::bonded(stash).and_then(Self::ledger).map(|l| l.active).unwrap_or_default()
-	}
-
-	/// Internal impl of [`Self::slashable_balance_of`] that returns [`VoteWeight`].
-	pub fn slashable_balance_of_vote_weight(
-		stash: &T::AccountId,
-		issuance: BalanceOf<T>,
-	) -> VoteWeight {
-		T::CurrencyToVote::to_vote(Self::slashable_balance_of(stash), issuance)
-	}
-
-	/// Returns a closure around `slashable_balance_of_vote_weight` that can be passed around.
-	///
-	/// This prevents call sites from repeatedly requesting `total_issuance` from backend. But it is
-	/// important to be only used while the total issuance is not changing.
-	pub fn slashable_balance_of_fn() -> Box<dyn Fn(&T::AccountId) -> VoteWeight> {
-		// NOTE: changing this to unboxed `impl Fn(..)` return type and the pallet will still
-		// compile, while some types in mock fail to resolve.
-		let issuance = T::Currency::total_issuance();
-		Box::new(move |who: &T::AccountId| -> VoteWeight {
-			Self::slashable_balance_of_vote_weight(who, issuance)
-		})
-	}
-
-	fn do_payout_stakers(
-		validator_stash: T::AccountId,
-		era: EraIndex,
-	) -> DispatchResultWithPostInfo {
-		// Validate input data
-		let current_era = CurrentEra::<T>::get().ok_or_else(|| {
-			Error::<T>::InvalidEraToReward
-				.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
-		})?;
-		let history_depth = Self::history_depth();
-		ensure!(
-			era <= current_era && era >= current_era.saturating_sub(history_depth),
-			Error::<T>::InvalidEraToReward
-				.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
-		);
-
-		// Note: if era has no reward to be claimed, era may be future. better not to update
-		// `ledger.claimed_rewards` in this case.
-		let era_payout = <ErasValidatorReward<T>>::get(&era).ok_or_else(|| {
-			Error::<T>::InvalidEraToReward
-				.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
-		})?;
-
-		let controller = Self::bonded(&validator_stash).ok_or_else(|| {
-			Error::<T>::NotStash.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
-		})?;
-		let mut ledger = <Ledger<T>>::get(&controller).ok_or(Error::<T>::NotController)?;
-
-		ledger
-			.claimed_rewards
-			.retain(|&x| x >= current_era.saturating_sub(history_depth));
-		match ledger.claimed_rewards.binary_search(&era) {
-			Ok(_) => Err(Error::<T>::AlreadyClaimed
-				.with_weight(T::WeightInfo::payout_stakers_alive_staked(0)))?,
-			Err(pos) => ledger.claimed_rewards.insert(pos, era),
-		}
-
-		let exposure = <ErasStakersClipped<T>>::get(&era, &ledger.stash);
-
-		// Input data seems good, no errors allowed after this point
-
-		<Ledger<T>>::insert(&controller, &ledger);
-
-		// Get Era reward points. It has TOTAL and INDIVIDUAL
-		// Find the fraction of the era reward that belongs to the validator
-		// Take that fraction of the eras rewards to split to nominator and validator
-		//
-		// Then look at the validator, figure out the proportion of their reward
-		// which goes to them and each of their nominators.
-
-		let era_reward_points = <ErasRewardPoints<T>>::get(&era);
-		let total_reward_points = era_reward_points.total;
-		let validator_reward_points = era_reward_points
-			.individual
-			.get(&ledger.stash)
-			.map(|points| *points)
-			.unwrap_or_else(|| Zero::zero());
-
-		// Nothing to do if they have no reward points.
-		if validator_reward_points.is_zero() {
-			return Ok(Some(T::WeightInfo::payout_stakers_alive_staked(0)).into())
-		}
-
-		// This is the fraction of the total reward that the validator and the
-		// nominators will get.
-		let validator_total_reward_part =
-			Perbill::from_rational(validator_reward_points, total_reward_points);
-
-		// This is how much validator + nominators are entitled to.
-		let validator_total_payout = validator_total_reward_part * era_payout;
-
-		let validator_prefs = Self::eras_validator_prefs(&era, &validator_stash);
-		// Validator first gets a cut off the top.
-		let validator_commission = validator_prefs.commission;
-		let validator_commission_payout = validator_commission * validator_total_payout;
-
-		let validator_leftover_payout = validator_total_payout - validator_commission_payout;
-		// Now let's calculate how this is split to the validator.
-		let validator_exposure_part = Perbill::from_rational(exposure.own, exposure.total);
-		let validator_staking_payout = validator_exposure_part * validator_leftover_payout;
-
-		// We can now make total validator payout:
-		if let Some(imbalance) =
-			Self::make_payout(&ledger.stash, validator_staking_payout + validator_commission_payout)
-		{
-			Self::deposit_event(Event::<T>::Reward(ledger.stash, imbalance.peek()));
-		}
-
-		// Track the number of payout ops to nominators. Note: `WeightInfo::payout_stakers_alive_staked`
-		// always assumes at least a validator is paid out, so we do not need to count their payout op.
-		let mut nominator_payout_count: u32 = 0;
-
-		// Lets now calculate how this is split to the nominators.
-		// Reward only the clipped exposures. Note this is not necessarily sorted.
-		for nominator in exposure.others.iter() {
-			let nominator_exposure_part = Perbill::from_rational(nominator.value, exposure.total);
-
-			let nominator_reward: BalanceOf<T> =
-				nominator_exposure_part * validator_leftover_payout;
-			// We can now make nominator payout:
-			if let Some(imbalance) = Self::make_payout(&nominator.who, nominator_reward) {
-				// Note: this logic does not count payouts for `RewardDestination::None`.
-				nominator_payout_count += 1;
-				Self::deposit_event(Event::<T>::Reward(nominator.who.clone(), imbalance.peek()));
-			}
-		}
-
-		debug_assert!(nominator_payout_count <= T::MaxNominatorRewardedPerValidator::get());
-		Ok(Some(T::WeightInfo::payout_stakers_alive_staked(nominator_payout_count)).into())
-	}
-
-	/// Update the ledger for a controller.
-	///
-	/// This will also update the stash lock.
-	fn update_ledger(
-		controller: &T::AccountId,
-		ledger: &StakingLedger<T::AccountId, BalanceOf<T>>,
-	) {
-		T::Currency::set_lock(STAKING_ID, &ledger.stash, ledger.total, WithdrawReasons::all());
-		<Ledger<T>>::insert(controller, ledger);
-	}
-
-	/// Chill a stash account.
-	fn chill_stash(stash: &T::AccountId) {
-		let chilled_as_validator = Self::do_remove_validator(stash);
-		let chilled_as_nominator = Self::do_remove_nominator(stash);
-		if chilled_as_validator || chilled_as_nominator {
-			Self::deposit_event(Event::<T>::Chilled(stash.clone()));
-		}
-	}
-
-	/// Actually make a payment to a staker. This uses the currency's reward function
-	/// to pay the right payee for the given staker account.
-	fn make_payout(stash: &T::AccountId, amount: BalanceOf<T>) -> Option<PositiveImbalanceOf<T>> {
-		let dest = Self::payee(stash);
-		match dest {
-			RewardDestination::Controller => Self::bonded(stash)
-				.and_then(|controller| Some(T::Currency::deposit_creating(&controller, amount))),
-			RewardDestination::Stash => T::Currency::deposit_into_existing(stash, amount).ok(),
-			RewardDestination::Staked => Self::bonded(stash)
-				.and_then(|c| Self::ledger(&c).map(|l| (c, l)))
-				.and_then(|(controller, mut l)| {
-					l.active += amount;
-					l.total += amount;
-					let r = T::Currency::deposit_into_existing(stash, amount).ok();
-					Self::update_ledger(&controller, &l);
-					r
-				}),
-			RewardDestination::Account(dest_account) =>
-				Some(T::Currency::deposit_creating(&dest_account, amount)),
-			RewardDestination::None => None,
-		}
-	}
-
-	/// Plan a new session potentially trigger a new era.
-	fn new_session(session_index: SessionIndex, is_genesis: bool) -> Option<Vec<T::AccountId>> {
-		if let Some(current_era) = Self::current_era() {
-			// Initial era has been set.
-			let current_era_start_session_index = Self::eras_start_session_index(current_era)
-				.unwrap_or_else(|| {
-					frame_support::print("Error: start_session_index must be set for current_era");
-					0
-				});
-
-			let era_length =
-				session_index.checked_sub(current_era_start_session_index).unwrap_or(0); // Must never happen.
-
-			match ForceEra::<T>::get() {
-				// Will be set to `NotForcing` again if a new era has been triggered.
-				Forcing::ForceNew => (),
-				// Short circuit to `try_trigger_new_era`.
-				Forcing::ForceAlways => (),
-				// Only go to `try_trigger_new_era` if deadline reached.
-				Forcing::NotForcing if era_length >= T::SessionsPerEra::get() => (),
-				_ => {
-					// Either `Forcing::ForceNone`,
-					// or `Forcing::NotForcing if era_length >= T::SessionsPerEra::get()`.
-					return None
-				},
-			}
-
-			// New era.
-			let maybe_new_era_validators = Self::try_trigger_new_era(session_index, is_genesis);
-			if maybe_new_era_validators.is_some() &&
-				matches!(ForceEra::<T>::get(), Forcing::ForceNew)
-			{
-				ForceEra::<T>::put(Forcing::NotForcing);
-			}
-
-			maybe_new_era_validators
-		} else {
-			// Set initial era.
-			log!(debug, "Starting the first era.");
-			Self::try_trigger_new_era(session_index, is_genesis)
-		}
-	}
-
-	/// Start a session potentially starting an era.
-	fn start_session(start_session: SessionIndex) {
-		let next_active_era = Self::active_era().map(|e| e.index + 1).unwrap_or(0);
-		// This is only `Some` when current era has already progressed to the next era, while the
-		// active era is one behind (i.e. in the *last session of the active era*, or *first session
-		// of the new current era*, depending on how you look at it).
-		if let Some(next_active_era_start_session_index) =
-			Self::eras_start_session_index(next_active_era)
-		{
-			if next_active_era_start_session_index == start_session {
-				Self::start_era(start_session);
-			} else if next_active_era_start_session_index < start_session {
-				// This arm should never happen, but better handle it than to stall the staking
-				// pallet.
-				frame_support::print("Warning: A session appears to have been skipped.");
-				Self::start_era(start_session);
-			}
-		}
-	}
-
-	/// End a session potentially ending an era.
-	fn end_session(session_index: SessionIndex) {
-		if let Some(active_era) = Self::active_era() {
-			if let Some(next_active_era_start_session_index) =
-				Self::eras_start_session_index(active_era.index + 1)
-			{
-				if next_active_era_start_session_index == session_index + 1 {
-					Self::end_era(active_era, session_index);
-				}
-			}
-		}
-	}
-
-	/// * Increment `active_era.index`,
-	/// * reset `active_era.start`,
-	/// * update `BondedEras` and apply slashes.
-	fn start_era(start_session: SessionIndex) {
-		let active_era = ActiveEra::<T>::mutate(|active_era| {
-			let new_index = active_era.as_ref().map(|info| info.index + 1).unwrap_or(0);
-			*active_era = Some(ActiveEraInfo {
-				index: new_index,
-				// Set new active era start in next `on_finalize`. To guarantee usage of `Time`
-				start: None,
-			});
-			new_index
-		});
-
-		let bonding_duration = T::BondingDuration::get();
-
-		BondedEras::<T>::mutate(|bonded| {
-			bonded.push((active_era, start_session));
-
-			if active_era > bonding_duration {
-				let first_kept = active_era - bonding_duration;
-
-				// Prune out everything that's from before the first-kept index.
-				let n_to_prune =
-					bonded.iter().take_while(|&&(era_idx, _)| era_idx < first_kept).count();
-
-				// Kill slashing metadata.
-				for (pruned_era, _) in bonded.drain(..n_to_prune) {
-					slashing::clear_era_metadata::<T>(pruned_era);
-				}
-
-				if let Some(&(_, first_session)) = bonded.first() {
-					T::SessionInterface::prune_historical_up_to(first_session);
-				}
-			}
-		});
-
-		Self::apply_unapplied_slashes(active_era);
-	}
-
-	/// Compute payout for era.
-	fn end_era(active_era: ActiveEraInfo, _session_index: SessionIndex) {
-		// Note: active_era_start can be None if end era is called during genesis config.
-		if let Some(active_era_start) = active_era.start {
-			let now_as_millis_u64 = T::UnixTime::now().as_millis().saturated_into::<u64>();
-
-			let era_duration = (now_as_millis_u64 - active_era_start).saturated_into::<u64>();
-			let staked = Self::eras_total_stake(&active_era.index);
-			let issuance = T::Currency::total_issuance();
-			let (validator_payout, rest) = T::EraPayout::era_payout(staked, issuance, era_duration);
-
-			Self::deposit_event(Event::<T>::EraPayout(active_era.index, validator_payout, rest));
-
-			// Set ending era reward.
-			<ErasValidatorReward<T>>::insert(&active_era.index, validator_payout);
-			T::RewardRemainder::on_unbalanced(T::Currency::issue(rest));
-		}
-	}
-
-	/// Plan a new era.
-	///
-	/// * Bump the current era storage (which holds the latest planned era).
-	/// * Store start session index for the new planned era.
-	/// * Clean old era information.
-	/// * Store staking information for the new planned era
-	///
-	/// Returns the new validator set.
-	pub fn trigger_new_era(
-		start_session_index: SessionIndex,
-		exposures: Vec<(T::AccountId, Exposure<T::AccountId, BalanceOf<T>>)>,
-	) -> Vec<T::AccountId> {
-		// Increment or set current era.
-		let new_planned_era = CurrentEra::<T>::mutate(|s| {
-			*s = Some(s.map(|s| s + 1).unwrap_or(0));
-			s.unwrap()
-		});
-		ErasStartSessionIndex::<T>::insert(&new_planned_era, &start_session_index);
-
-		// Clean old era information.
-		if let Some(old_era) = new_planned_era.checked_sub(Self::history_depth() + 1) {
-			Self::clear_era_information(old_era);
-		}
-
-		// Set staking information for the new era.
-		Self::store_stakers_info(exposures, new_planned_era)
-	}
-
-	/// Potentially plan a new era.
-	///
-	/// Get election result from `T::ElectionProvider`.
-	/// In case election result has more than [`MinimumValidatorCount`] validator trigger a new era.
-	///
-	/// In case a new era is planned, the new validator set is returned.
-	fn try_trigger_new_era(
-		start_session_index: SessionIndex,
-		is_genesis: bool,
-	) -> Option<Vec<T::AccountId>> {
-		let (election_result, weight) = if is_genesis {
-			T::GenesisElectionProvider::elect().map_err(|e| {
-				log!(warn, "genesis election provider failed due to {:?}", e);
-				Self::deposit_event(Event::StakingElectionFailed);
-			})
-		} else {
-			T::ElectionProvider::elect().map_err(|e| {
-				log!(warn, "election provider failed due to {:?}", e);
-				Self::deposit_event(Event::StakingElectionFailed);
-			})
-		}
-		.ok()?;
-
-		<frame_system::Pallet<T>>::register_extra_weight_unchecked(
-			weight,
-			frame_support::weights::DispatchClass::Mandatory,
-		);
-
-		let exposures = Self::collect_exposures(election_result);
-
-		if (exposures.len() as u32) < Self::minimum_validator_count().max(1) {
-			// Session will panic if we ever return an empty validator set, thus max(1) ^^.
-			match CurrentEra::<T>::get() {
-				Some(current_era) if current_era > 0 => log!(
-					warn,
-					"chain does not have enough staking candidates to operate for era {:?} ({} \
-					elected, minimum is {})",
-					CurrentEra::<T>::get().unwrap_or(0),
-					exposures.len(),
-					Self::minimum_validator_count(),
-				),
-				None => {
-					// The initial era is allowed to have no exposures.
-					// In this case the SessionManager is expected to choose a sensible validator
-					// set.
-					// TODO: this should be simplified #8911
-					CurrentEra::<T>::put(0);
-					ErasStartSessionIndex::<T>::insert(&0, &start_session_index);
-				},
-				_ => (),
-			}
-
-			Self::deposit_event(Event::StakingElectionFailed);
-			return None
-		}
-
-		Self::deposit_event(Event::StakingElection);
-		Some(Self::trigger_new_era(start_session_index, exposures))
-	}
-
-	/// Process the output of the election.
-	///
-	/// Store staking information for the new planned era
-	pub fn store_stakers_info(
-		exposures: Vec<(T::AccountId, Exposure<T::AccountId, BalanceOf<T>>)>,
-		new_planned_era: EraIndex,
-	) -> Vec<T::AccountId> {
-		let elected_stashes = exposures.iter().cloned().map(|(x, _)| x).collect::<Vec<_>>();
-
-		// Populate stakers, exposures, and the snapshot of validator prefs.
-		let mut total_stake: BalanceOf<T> = Zero::zero();
-		exposures.into_iter().for_each(|(stash, exposure)| {
-			total_stake = total_stake.saturating_add(exposure.total);
-			<ErasStakers<T>>::insert(new_planned_era, &stash, &exposure);
-
-			let mut exposure_clipped = exposure;
-			let clipped_max_len = T::MaxNominatorRewardedPerValidator::get() as usize;
-			if exposure_clipped.others.len() > clipped_max_len {
-				exposure_clipped.others.sort_by(|a, b| a.value.cmp(&b.value).reverse());
-				exposure_clipped.others.truncate(clipped_max_len);
-			}
-			<ErasStakersClipped<T>>::insert(&new_planned_era, &stash, exposure_clipped);
-		});
-
-		// Insert current era staking information
-		<ErasTotalStake<T>>::insert(&new_planned_era, total_stake);
-
-		// Collect the pref of all winners.
-		for stash in &elected_stashes {
-			let pref = Self::validators(stash);
-			<ErasValidatorPrefs<T>>::insert(&new_planned_era, stash, pref);
-		}
-
-		if new_planned_era > 0 {
-			log!(
-				info,
-				"new validator set of size {:?} has been processed for era {:?}",
-				elected_stashes.len(),
-				new_planned_era,
-			);
-		}
-
-		elected_stashes
-	}
-
-	/// Consume a set of [`Supports`] from [`sp_npos_elections`] and collect them into a
-	/// [`Exposure`].
-	fn collect_exposures(
-		supports: Supports<T::AccountId>,
-	) -> Vec<(T::AccountId, Exposure<T::AccountId, BalanceOf<T>>)> {
-		let total_issuance = T::Currency::total_issuance();
-		let to_currency = |e: frame_election_provider_support::ExtendedBalance| {
-			T::CurrencyToVote::to_currency(e, total_issuance)
-		};
-
-		supports
-			.into_iter()
-			.map(|(validator, support)| {
-				// Build `struct exposure` from `support`.
-				let mut others = Vec::with_capacity(support.voters.len());
-				let mut own: BalanceOf<T> = Zero::zero();
-				let mut total: BalanceOf<T> = Zero::zero();
-				support
-					.voters
-					.into_iter()
-					.map(|(nominator, weight)| (nominator, to_currency(weight)))
-					.for_each(|(nominator, stake)| {
-						if nominator == validator {
-							own = own.saturating_add(stake);
-						} else {
-							others.push(IndividualExposure { who: nominator, value: stake });
-						}
-						total = total.saturating_add(stake);
-					});
-
-				let exposure = Exposure { own, others, total };
-				(validator, exposure)
-			})
-			.collect::<Vec<(T::AccountId, Exposure<_, _>)>>()
-	}
-
-	/// Remove all associated data of a stash account from the staking system.
-	///
-	/// Assumes storage is upgraded before calling.
-	///
-	/// This is called:
-	/// - after a `withdraw_unbonded()` call that frees all of a stash's bonded balance.
-	/// - through `reap_stash()` if the balance has fallen to zero (through slashing).
-	fn kill_stash(stash: &T::AccountId, num_slashing_spans: u32) -> DispatchResult {
-		let controller = <Bonded<T>>::get(stash).ok_or(Error::<T>::NotStash)?;
-
-		slashing::clear_stash_metadata::<T>(stash, num_slashing_spans)?;
-
-		<Bonded<T>>::remove(stash);
-		<Ledger<T>>::remove(&controller);
-
-		<Payee<T>>::remove(stash);
-		Self::do_remove_validator(stash);
-		Self::do_remove_nominator(stash);
-
-		frame_system::Pallet::<T>::dec_consumers(stash);
-
-		Ok(())
-	}
-
-	/// Clear all era information for given era.
-	fn clear_era_information(era_index: EraIndex) {
-		<ErasStakers<T>>::remove_prefix(era_index, None);
-		<ErasStakersClipped<T>>::remove_prefix(era_index, None);
-		<ErasValidatorPrefs<T>>::remove_prefix(era_index, None);
-		<ErasValidatorReward<T>>::remove(era_index);
-		<ErasRewardPoints<T>>::remove(era_index);
-		<ErasTotalStake<T>>::remove(era_index);
-		ErasStartSessionIndex::<T>::remove(era_index);
-	}
-
-	/// Apply previously-unapplied slashes on the beginning of a new era, after a delay.
-	fn apply_unapplied_slashes(active_era: EraIndex) {
-		let slash_defer_duration = T::SlashDeferDuration::get();
-		<Self as Store>::EarliestUnappliedSlash::mutate(|earliest| {
-			if let Some(ref mut earliest) = earliest {
-				let keep_from = active_era.saturating_sub(slash_defer_duration);
-				for era in (*earliest)..keep_from {
-					let era_slashes = <Self as Store>::UnappliedSlashes::take(&era);
-					for slash in era_slashes {
-						slashing::apply_slash::<T>(slash);
-					}
-				}
-
-				*earliest = (*earliest).max(keep_from)
-			}
-		})
-	}
-
-	/// Add reward points to validators using their stash account ID.
-	///
-	/// Validators are keyed by stash account ID and must be in the current elected set.
-	///
-	/// For each element in the iterator the given number of points in u32 is added to the
-	/// validator, thus duplicates are handled.
-	///
-	/// At the end of the era each the total payout will be distributed among validator
-	/// relatively to their points.
-	///
-	/// COMPLEXITY: Complexity is `number_of_validator_to_reward x current_elected_len`.
-	pub fn reward_by_ids(validators_points: impl IntoIterator<Item = (T::AccountId, u32)>) {
-		if let Some(active_era) = Self::active_era() {
-			<ErasRewardPoints<T>>::mutate(active_era.index, |era_rewards| {
-				for (validator, points) in validators_points.into_iter() {
-					*era_rewards.individual.entry(validator).or_default() += points;
-					era_rewards.total += points;
-				}
-			});
-		}
-	}
-
-	/// Ensures that at the end of the current session there will be a new era.
-	fn ensure_new_era() {
-		match ForceEra::<T>::get() {
-			Forcing::ForceAlways | Forcing::ForceNew => (),
-			_ => ForceEra::<T>::put(Forcing::ForceNew),
-		}
-	}
-
-	#[cfg(feature = "runtime-benchmarks")]
-	pub fn add_era_stakers(
-		current_era: EraIndex,
-		controller: T::AccountId,
-		exposure: Exposure<T::AccountId, BalanceOf<T>>,
-	) {
-		<ErasStakers<T>>::insert(&current_era, &controller, &exposure);
-	}
-
-	#[cfg(feature = "runtime-benchmarks")]
-	pub fn set_slash_reward_fraction(fraction: Perbill) {
-		SlashRewardFraction::<T>::put(fraction);
-	}
-
-	/// Get all of the voters that are eligible for the npos election.
-	///
-	/// This will use all on-chain nominators, and all the validators will inject a self vote.
-	///
-	/// ### Slashing
-	///
-	/// All nominations that have been submitted before the last non-zero slash of the validator are
-	/// auto-chilled.
-	///
-	/// Note that this is VERY expensive. Use with care.
-	pub fn get_npos_voters() -> Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)> {
-		let weight_of = Self::slashable_balance_of_fn();
-		let mut all_voters = Vec::new();
-
-		for (validator, _) in <Validators<T>>::iter() {
-			// Append self vote.
-			let self_vote = (validator.clone(), weight_of(&validator), vec![validator.clone()]);
-			all_voters.push(self_vote);
-		}
-
-		// Collect all slashing spans into a BTreeMap for further queries.
-		let slashing_spans = <SlashingSpans<T>>::iter().collect::<BTreeMap<_, _>>();
-
-		for (nominator, nominations) in Nominators::<T>::iter() {
-			let Nominations { submitted_in, mut targets, suppressed: _ } = nominations;
-
-			// Filter out nomination targets which were nominated before the most recent
-			// slashing span.
-			targets.retain(|stash| {
-				slashing_spans
-					.get(stash)
-					.map_or(true, |spans| submitted_in >= spans.last_nonzero_slash())
-			});
-
-			if !targets.is_empty() {
-				let vote_weight = weight_of(&nominator);
-				all_voters.push((nominator, vote_weight, targets))
-			}
-		}
-
-		all_voters
-	}
-
-	/// This is a very expensive function and result should be cached versus being called multiple times.
-	pub fn get_npos_targets() -> Vec<T::AccountId> {
-		Validators::<T>::iter().map(|(v, _)| v).collect::<Vec<_>>()
-	}
-
-	/// This function will add a nominator to the `Nominators` storage map,
-	/// and keep track of the `CounterForNominators`.
-	///
-	/// If the nominator already exists, their nominations will be updated.
-	pub fn do_add_nominator(who: &T::AccountId, nominations: Nominations<T::AccountId>) {
-		if !Nominators::<T>::contains_key(who) {
-			CounterForNominators::<T>::mutate(|x| x.saturating_inc())
-		}
-		Nominators::<T>::insert(who, nominations);
-	}
-
-	/// This function will remove a nominator from the `Nominators` storage map,
-	/// and keep track of the `CounterForNominators`.
-	///
-	/// Returns true if `who` was removed from `Nominators`, otherwise false.
-	pub fn do_remove_nominator(who: &T::AccountId) -> bool {
-		if Nominators::<T>::contains_key(who) {
-			Nominators::<T>::remove(who);
-			CounterForNominators::<T>::mutate(|x| x.saturating_dec());
-			true
-		} else {
-			false
-		}
-	}
-
-	/// This function will add a validator to the `Validators` storage map,
-	/// and keep track of the `CounterForValidators`.
-	///
-	/// If the validator already exists, their preferences will be updated.
-	pub fn do_add_validator(who: &T::AccountId, prefs: ValidatorPrefs) {
-		if !Validators::<T>::contains_key(who) {
-			CounterForValidators::<T>::mutate(|x| x.saturating_inc())
-		}
-		Validators::<T>::insert(who, prefs);
-	}
-
-	/// This function will remove a validator from the `Validators` storage map,
-	/// and keep track of the `CounterForValidators`.
-	///
-	/// Returns true if `who` was removed from `Validators`, otherwise false.
-	pub fn do_remove_validator(who: &T::AccountId) -> bool {
-		if Validators::<T>::contains_key(who) {
-			Validators::<T>::remove(who);
-			CounterForValidators::<T>::mutate(|x| x.saturating_dec());
-			true
-		} else {
-			false
-		}
-	}
-}
-
-impl<T: Config> frame_election_provider_support::ElectionDataProvider<T::AccountId, T::BlockNumber>
-	for Pallet<T>
-{
-	const MAXIMUM_VOTES_PER_VOTER: u32 = T::MAX_NOMINATIONS;
-	fn desired_targets() -> data_provider::Result<(u32, Weight)> {
-		Ok((Self::validator_count(), <T as frame_system::Config>::DbWeight::get().reads(1)))
-	}
-
-	fn voters(
-		maybe_max_len: Option<usize>,
-	) -> data_provider::Result<(Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)>, Weight)> {
-		let nominator_count = CounterForNominators::<T>::get();
-		let validator_count = CounterForValidators::<T>::get();
-		let voter_count = nominator_count.saturating_add(validator_count) as usize;
-		debug_assert!(<Nominators<T>>::iter().count() as u32 == CounterForNominators::<T>::get());
-		debug_assert!(<Validators<T>>::iter().count() as u32 == CounterForValidators::<T>::get());
-
-		if maybe_max_len.map_or(false, |max_len| voter_count > max_len) {
-			return Err("Voter snapshot too big")
-		}
-
-		let slashing_span_count = <SlashingSpans<T>>::iter().count();
-		let weight = T::WeightInfo::get_npos_voters(
-			nominator_count,
-			validator_count,
-			slashing_span_count as u32,
-		);
-		Ok((Self::get_npos_voters(), weight))
-	}
-
-	fn targets(maybe_max_len: Option<usize>) -> data_provider::Result<(Vec<T::AccountId>, Weight)> {
-		let target_count = CounterForValidators::<T>::get() as usize;
-
-		if maybe_max_len.map_or(false, |max_len| target_count > max_len) {
-			return Err("Target snapshot too big")
-		}
-
-		let weight = <T as frame_system::Config>::DbWeight::get().reads(target_count as u64);
-		Ok((Self::get_npos_targets(), weight))
-	}
-
-	fn next_election_prediction(now: T::BlockNumber) -> T::BlockNumber {
-		let current_era = Self::current_era().unwrap_or(0);
-		let current_session = Self::current_planned_session();
-		let current_era_start_session_index =
-			Self::eras_start_session_index(current_era).unwrap_or(0);
-		// Number of session in the current era or the maximum session per era if reached.
-		let era_progress = current_session
-			.saturating_sub(current_era_start_session_index)
-			.min(T::SessionsPerEra::get());
-
-		let until_this_session_end = T::NextNewSession::estimate_next_new_session(now)
-			.0
-			.unwrap_or_default()
-			.saturating_sub(now);
-
-		let session_length = T::NextNewSession::average_session_length();
-
-		let sessions_left: T::BlockNumber = match ForceEra::<T>::get() {
-			Forcing::ForceNone => Bounded::max_value(),
-			Forcing::ForceNew | Forcing::ForceAlways => Zero::zero(),
-			Forcing::NotForcing if era_progress >= T::SessionsPerEra::get() => Zero::zero(),
-			Forcing::NotForcing => T::SessionsPerEra::get()
-				.saturating_sub(era_progress)
-				// One session is computed in this_session_end.
-				.saturating_sub(1)
-				.into(),
-		};
-
-		now.saturating_add(
-			until_this_session_end.saturating_add(sessions_left.saturating_mul(session_length)),
-		)
-	}
-
-	#[cfg(any(feature = "runtime-benchmarks", test))]
-	fn add_voter(voter: T::AccountId, weight: VoteWeight, targets: Vec<T::AccountId>) {
-		use sp_std::convert::TryFrom;
-		let stake = <BalanceOf<T>>::try_from(weight).unwrap_or_else(|_| {
-			panic!("cannot convert a VoteWeight into BalanceOf, benchmark needs reconfiguring.")
-		});
-		<Bonded<T>>::insert(voter.clone(), voter.clone());
-		<Ledger<T>>::insert(
-			voter.clone(),
-			StakingLedger {
-				stash: voter.clone(),
-				active: stake,
-				total: stake,
-				unlocking: vec![],
-				claimed_rewards: vec![],
-			},
-		);
-		Self::do_add_nominator(&voter, Nominations { targets, submitted_in: 0, suppressed: false });
-	}
-
-	#[cfg(any(feature = "runtime-benchmarks", test))]
-	fn add_target(target: T::AccountId) {
-		let stake = MinValidatorBond::<T>::get() * 100u32.into();
-		<Bonded<T>>::insert(target.clone(), target.clone());
-		<Ledger<T>>::insert(
-			target.clone(),
-			StakingLedger {
-				stash: target.clone(),
-				active: stake,
-				total: stake,
-				unlocking: vec![],
-				claimed_rewards: vec![],
-			},
-		);
-		Self::do_add_validator(
-			&target,
-			ValidatorPrefs { commission: Perbill::zero(), blocked: false },
-		);
-	}
-
-	#[cfg(any(feature = "runtime-benchmarks", test))]
-	fn clear() {
-		<Bonded<T>>::remove_all(None);
-		<Ledger<T>>::remove_all(None);
-		<Validators<T>>::remove_all(None);
-		<Nominators<T>>::remove_all(None);
-	}
-
-	#[cfg(any(feature = "runtime-benchmarks", test))]
-	fn put_snapshot(
-		voters: Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)>,
-		targets: Vec<T::AccountId>,
-		target_stake: Option<VoteWeight>,
-	) {
-		use sp_std::convert::TryFrom;
-		targets.into_iter().for_each(|v| {
-			let stake: BalanceOf<T> = target_stake
-				.and_then(|w| <BalanceOf<T>>::try_from(w).ok())
-				.unwrap_or_else(|| MinNominatorBond::<T>::get() * 100u32.into());
-			<Bonded<T>>::insert(v.clone(), v.clone());
-			<Ledger<T>>::insert(
-				v.clone(),
-				StakingLedger {
-					stash: v.clone(),
-					active: stake,
-					total: stake,
-					unlocking: vec![],
-					claimed_rewards: vec![],
-				},
-			);
-			Self::do_add_validator(
-				&v,
-				ValidatorPrefs { commission: Perbill::zero(), blocked: false },
-			);
-		});
-
-		voters.into_iter().for_each(|(v, s, t)| {
-			let stake = <BalanceOf<T>>::try_from(s).unwrap_or_else(|_| {
-				panic!("cannot convert a VoteWeight into BalanceOf, benchmark needs reconfiguring.")
-			});
-			<Bonded<T>>::insert(v.clone(), v.clone());
-			<Ledger<T>>::insert(
-				v.clone(),
-				StakingLedger {
-					stash: v.clone(),
-					active: stake,
-					total: stake,
-					unlocking: vec![],
-					claimed_rewards: vec![],
-				},
-			);
-			Self::do_add_nominator(
-				&v,
-				Nominations { targets: t, submitted_in: 0, suppressed: false },
-			);
-		});
-	}
-}
-
-/// In this implementation `new_session(session)` must be called before `end_session(session-1)`
-/// i.e. the new session must be planned before the ending of the previous session.
-///
-/// Once the first new_session is planned, all session must start and then end in order, though
-/// some session can lag in between the newest session planned and the latest session started.
-impl<T: Config> pallet_session::SessionManager<T::AccountId> for Pallet<T> {
-	fn new_session(new_index: SessionIndex) -> Option<Vec<T::AccountId>> {
-		log!(trace, "planning new session {}", new_index);
-		CurrentPlannedSession::<T>::put(new_index);
-		Self::new_session(new_index, false)
-	}
-	fn new_session_genesis(new_index: SessionIndex) -> Option<Vec<T::AccountId>> {
-		log!(trace, "planning new session {} at genesis", new_index);
-		CurrentPlannedSession::<T>::put(new_index);
-		Self::new_session(new_index, true)
-	}
-	fn start_session(start_index: SessionIndex) {
-		log!(trace, "starting session {}", start_index);
-		Self::start_session(start_index)
-	}
-	fn end_session(end_index: SessionIndex) {
-		log!(trace, "ending session {}", end_index);
-		Self::end_session(end_index)
-	}
-}
-
-impl<T: Config> historical::SessionManager<T::AccountId, Exposure<T::AccountId, BalanceOf<T>>>
-	for Pallet<T>
-{
-	fn new_session(
-		new_index: SessionIndex,
-	) -> Option<Vec<(T::AccountId, Exposure<T::AccountId, BalanceOf<T>>)>> {
-		<Self as pallet_session::SessionManager<_>>::new_session(new_index).map(|validators| {
-			let current_era = Self::current_era()
-				// Must be some as a new era has been created.
-				.unwrap_or(0);
-
-			validators
-				.into_iter()
-				.map(|v| {
-					let exposure = Self::eras_stakers(current_era, &v);
-					(v, exposure)
-				})
-				.collect()
-		})
-	}
-	fn new_session_genesis(
-		new_index: SessionIndex,
-	) -> Option<Vec<(T::AccountId, Exposure<T::AccountId, BalanceOf<T>>)>> {
-		<Self as pallet_session::SessionManager<_>>::new_session_genesis(new_index).map(
-			|validators| {
-				let current_era = Self::current_era()
-					// Must be some as a new era has been created.
-					.unwrap_or(0);
-
-				validators
-					.into_iter()
-					.map(|v| {
-						let exposure = Self::eras_stakers(current_era, &v);
-						(v, exposure)
-					})
-					.collect()
-			},
-		)
-	}
-	fn start_session(start_index: SessionIndex) {
-		<Self as pallet_session::SessionManager<_>>::start_session(start_index)
-	}
-	fn end_session(end_index: SessionIndex) {
-		<Self as pallet_session::SessionManager<_>>::end_session(end_index)
-	}
-}
-
-/// Add reward points to block authors:
-/// * 20 points to the block producer for producing a (non-uncle) block in the relay chain,
-/// * 2 points to the block producer for each reference to a previously unreferenced uncle, and
-/// * 1 point to the producer of each referenced uncle block.
-impl<T> pallet_authorship::EventHandler<T::AccountId, T::BlockNumber> for Pallet<T>
-where
-	T: Config + pallet_authorship::Config + pallet_session::Config,
-{
-	fn note_author(author: T::AccountId) {
-		Self::reward_by_ids(vec![(author, 20)])
-	}
-	fn note_uncle(author: T::AccountId, _age: T::BlockNumber) {
-		Self::reward_by_ids(vec![(<pallet_authorship::Pallet<T>>::author(), 2), (author, 1)])
-	}
-}
-
-/// A `Convert` implementation that finds the stash of the given controller account,
-/// if any.
-pub struct StashOf<T>(sp_std::marker::PhantomData<T>);
-
-impl<T: Config> Convert<T::AccountId, Option<T::AccountId>> for StashOf<T> {
-	fn convert(controller: T::AccountId) -> Option<T::AccountId> {
-		<Pallet<T>>::ledger(&controller).map(|l| l.stash)
-	}
-}
-
-/// A typed conversion from stash account ID to the active exposure of nominators
-/// on that account.
-///
-/// Active exposure is the exposure of the validator set currently validating, i.e. in
-/// `active_era`. It can differ from the latest planned exposure in `current_era`.
-pub struct ExposureOf<T>(sp_std::marker::PhantomData<T>);
-
-impl<T: Config> Convert<T::AccountId, Option<Exposure<T::AccountId, BalanceOf<T>>>>
-	for ExposureOf<T>
-{
-	fn convert(validator: T::AccountId) -> Option<Exposure<T::AccountId, BalanceOf<T>>> {
-		<Pallet<T>>::active_era()
-			.map(|active_era| <Pallet<T>>::eras_stakers(active_era.index, &validator))
-	}
-}
-
-/// This is intended to be used with `FilterHistoricalOffences`.
-impl<T: Config>
-	OnOffenceHandler<T::AccountId, pallet_session::historical::IdentificationTuple<T>, Weight>
-	for Pallet<T>
-where
-	T: pallet_session::Config<ValidatorId = <T as frame_system::Config>::AccountId>,
-	T: pallet_session::historical::Config<
-		FullIdentification = Exposure<<T as frame_system::Config>::AccountId, BalanceOf<T>>,
-		FullIdentificationOf = ExposureOf<T>,
-	>,
-	T::SessionHandler: pallet_session::SessionHandler<<T as frame_system::Config>::AccountId>,
-	T::SessionManager: pallet_session::SessionManager<<T as frame_system::Config>::AccountId>,
-	T::ValidatorIdOf: Convert<
-		<T as frame_system::Config>::AccountId,
-		Option<<T as frame_system::Config>::AccountId>,
-	>,
-{
-	fn on_offence(
-		offenders: &[OffenceDetails<
-			T::AccountId,
-			pallet_session::historical::IdentificationTuple<T>,
-		>],
-		slash_fraction: &[Perbill],
-		slash_session: SessionIndex,
-	) -> Weight {
-		let reward_proportion = SlashRewardFraction::<T>::get();
-		let mut consumed_weight: Weight = 0;
-		let mut add_db_reads_writes = |reads, writes| {
-			consumed_weight += T::DbWeight::get().reads_writes(reads, writes);
-		};
-
-		let active_era = {
-			let active_era = Self::active_era();
-			add_db_reads_writes(1, 0);
-			if active_era.is_none() {
-				// This offence need not be re-submitted.
-				return consumed_weight
-			}
-			active_era.expect("value checked not to be `None`; qed").index
-		};
-		let active_era_start_session_index = Self::eras_start_session_index(active_era)
-			.unwrap_or_else(|| {
-				frame_support::print("Error: start_session_index must be set for current_era");
-				0
-			});
-		add_db_reads_writes(1, 0);
-
-		let window_start = active_era.saturating_sub(T::BondingDuration::get());
-
-		// Fast path for active-era report - most likely.
-		// `slash_session` cannot be in a future active era. It must be in `active_era` or before.
-		let slash_era = if slash_session >= active_era_start_session_index {
-			active_era
-		} else {
-			let eras = BondedEras::<T>::get();
-			add_db_reads_writes(1, 0);
-
-			// Reverse because it's more likely to find reports from recent eras.
-			match eras.iter().rev().filter(|&&(_, ref sesh)| sesh <= &slash_session).next() {
-				Some(&(ref slash_era, _)) => *slash_era,
-				// Before bonding period. defensive - should be filtered out.
-				None => return consumed_weight,
-			}
-		};
-
-		<Self as Store>::EarliestUnappliedSlash::mutate(|earliest| {
-			if earliest.is_none() {
-				*earliest = Some(active_era)
-			}
-		});
-		add_db_reads_writes(1, 1);
-
-		let slash_defer_duration = T::SlashDeferDuration::get();
-
-		let invulnerables = Self::invulnerables();
-		add_db_reads_writes(1, 0);
-
-		for (details, slash_fraction) in offenders.iter().zip(slash_fraction) {
-			let (stash, exposure) = &details.offender;
-
-			// Skip if the validator is invulnerable.
-			if invulnerables.contains(stash) {
-				continue
-			}
-
-			let unapplied = slashing::compute_slash::<T>(slashing::SlashParams {
-				stash,
-				slash: *slash_fraction,
-				exposure,
-				slash_era,
-				window_start,
-				now: active_era,
-				reward_proportion,
-			});
-
-			if let Some(mut unapplied) = unapplied {
-				let nominators_len = unapplied.others.len() as u64;
-				let reporters_len = details.reporters.len() as u64;
-
-				{
-					let upper_bound = 1 /* Validator/NominatorSlashInEra */ + 2 /* fetch_spans */;
-					let rw = upper_bound + nominators_len * upper_bound;
-					add_db_reads_writes(rw, rw);
-				}
-				unapplied.reporters = details.reporters.clone();
-				if slash_defer_duration == 0 {
-					// Apply right away.
-					slashing::apply_slash::<T>(unapplied);
-					{
-						let slash_cost = (6, 5);
-						let reward_cost = (2, 2);
-						add_db_reads_writes(
-							(1 + nominators_len) * slash_cost.0 + reward_cost.0 * reporters_len,
-							(1 + nominators_len) * slash_cost.1 + reward_cost.1 * reporters_len,
-						);
-					}
-				} else {
-					// Defer to end of some `slash_defer_duration` from now.
-					<Self as Store>::UnappliedSlashes::mutate(active_era, move |for_later| {
-						for_later.push(unapplied)
-					});
-					add_db_reads_writes(1, 1);
-				}
-			} else {
-				add_db_reads_writes(4 /* fetch_spans */, 5 /* kick_out_if_recent */)
-			}
-		}
-
-		consumed_weight
-	}
-}
-
-/// Filter historical offences out and only allow those from the bonding period.
-pub struct FilterHistoricalOffences<T, R> {
-	_inner: sp_std::marker::PhantomData<(T, R)>,
-}
-
-impl<T, Reporter, Offender, R, O> ReportOffence<Reporter, Offender, O>
-	for FilterHistoricalOffences<Pallet<T>, R>
-where
-	T: Config,
-	R: ReportOffence<Reporter, Offender, O>,
-	O: Offence<Offender>,
-{
-	fn report_offence(reporters: Vec<Reporter>, offence: O) -> Result<(), OffenceError> {
-		// Disallow any slashing from before the current bonding period.
-		let offence_session = offence.session_index();
-		let bonded_eras = BondedEras::<T>::get();
-
-		if bonded_eras.first().filter(|(_, start)| offence_session >= *start).is_some() {
-			R::report_offence(reporters, offence)
-		} else {
-			<Pallet<T>>::deposit_event(Event::<T>::OldSlashingReportDiscarded(offence_session));
-			Ok(())
-		}
-	}
-
-	fn is_known_offence(offenders: &[Offender], time_slot: &O::TimeSlot) -> bool {
-		R::is_known_offence(offenders, time_slot)
-	}
-}
-
-/// Check that list is sorted and has no duplicates.
-fn is_sorted_and_unique(list: &[u32]) -> bool {
-	list.windows(2).all(|w| w[0] < w[1])
 }
diff --git a/frame/staking/src/migrations.rs b/frame/staking/src/migrations.rs
new file mode 100644
index 000000000000..d7fa2afc6308
--- /dev/null
+++ b/frame/staking/src/migrations.rs
@@ -0,0 +1,86 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+
+//! Storage migrations for the Staking pallet.
+
+use super::*;
+
+pub mod v7 {
+	use super::*;
+
+	pub fn pre_migrate<T: Config>() -> Result<(), &'static str> {
+		assert!(CounterForValidators::<T>::get().is_zero(), "CounterForValidators already set.");
+		assert!(CounterForNominators::<T>::get().is_zero(), "CounterForNominators already set.");
+		assert!(StorageVersion::<T>::get() == Releases::V6_0_0);
+		Ok(())
+	}
+
+	pub fn migrate<T: Config>() -> Weight {
+		log!(info, "Migrating staking to Releases::V7_0_0");
+		let validator_count = Validators::<T>::iter().count() as u32;
+		let nominator_count = Nominators::<T>::iter().count() as u32;
+
+		CounterForValidators::<T>::put(validator_count);
+		CounterForNominators::<T>::put(nominator_count);
+
+		StorageVersion::<T>::put(Releases::V7_0_0);
+		log!(info, "Completed staking migration to Releases::V7_0_0");
+
+		T::DbWeight::get().reads_writes(validator_count.saturating_add(nominator_count).into(), 2)
+	}
+}
+
+pub mod v6 {
+	use super::*;
+	use frame_support::{generate_storage_alias, traits::Get, weights::Weight};
+
+	// NOTE: value type doesn't matter, we just set it to () here.
+	generate_storage_alias!(Staking, SnapshotValidators => Value<()>);
+	generate_storage_alias!(Staking, SnapshotNominators => Value<()>);
+	generate_storage_alias!(Staking, QueuedElected => Value<()>);
+	generate_storage_alias!(Staking, QueuedScore => Value<()>);
+	generate_storage_alias!(Staking, EraElectionStatus => Value<()>);
+	generate_storage_alias!(Staking, IsCurrentSessionFinal => Value<()>);
+
+	/// check to execute prior to migration.
+	pub fn pre_migrate<T: Config>() -> Result<(), &'static str> {
+		// these may or may not exist.
+		log!(info, "SnapshotValidators.exits()? {:?}", SnapshotValidators::exists());
+		log!(info, "SnapshotNominators.exits()? {:?}", SnapshotNominators::exists());
+		log!(info, "QueuedElected.exits()? {:?}", QueuedElected::exists());
+		log!(info, "QueuedScore.exits()? {:?}", QueuedScore::exists());
+		// these must exist.
+		assert!(IsCurrentSessionFinal::exists(), "IsCurrentSessionFinal storage item not found!");
+		assert!(EraElectionStatus::exists(), "EraElectionStatus storage item not found!");
+		Ok(())
+	}
+
+	/// Migrate storage to v6.
+	pub fn migrate<T: Config>() -> Weight {
+		log!(info, "Migrating staking to Releases::V6_0_0");
+
+		SnapshotValidators::kill();
+		SnapshotNominators::kill();
+		QueuedElected::kill();
+		QueuedScore::kill();
+		EraElectionStatus::kill();
+		IsCurrentSessionFinal::kill();
+
+		StorageVersion::<T>::put(Releases::V6_0_0);
+		log!(info, "Done.");
+		T::DbWeight::get().writes(6 + 1)
+	}
+}
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index 19fce6e94698..9d50a43754e7 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -22,7 +22,10 @@ use crate::*;
 use frame_election_provider_support::onchain;
 use frame_support::{
 	assert_ok, parameter_types,
-	traits::{Currency, FindAuthor, Get, OnInitialize, OneSessionHandler},
+	traits::{
+		Currency, FindAuthor, GenesisBuild, Get, Hooks, Imbalance, OnInitialize, OnUnbalanced,
+		OneSessionHandler,
+	},
 	weights::constants::RocksDbWeight,
 };
 use sp_core::H256;
diff --git a/frame/staking/src/pallet/impls.rs b/frame/staking/src/pallet/impls.rs
new file mode 100644
index 000000000000..b42ab4551602
--- /dev/null
+++ b/frame/staking/src/pallet/impls.rs
@@ -0,0 +1,1122 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Implementations for the Staking FRAME Pallet.
+
+use frame_election_provider_support::{data_provider, ElectionProvider, Supports, VoteWeight};
+use frame_support::{
+	pallet_prelude::*,
+	traits::{
+		Currency, CurrencyToVote, EstimateNextNewSession, Get, Imbalance, LockableCurrency,
+		OnUnbalanced, UnixTime, WithdrawReasons,
+	},
+	weights::{Weight, WithPostDispatchInfo},
+};
+use pallet_session::historical;
+use sp_runtime::{
+	traits::{Bounded, Convert, SaturatedConversion, Saturating, Zero},
+	Perbill,
+};
+use sp_staking::{
+	offence::{OffenceDetails, OnOffenceHandler},
+	SessionIndex,
+};
+use sp_std::{collections::btree_map::BTreeMap, prelude::*};
+
+use crate::{
+	log, slashing, weights::WeightInfo, ActiveEraInfo, BalanceOf, EraIndex, EraPayout, Exposure,
+	ExposureOf, Forcing, IndividualExposure, Nominations, PositiveImbalanceOf, RewardDestination,
+	SessionInterface, StakingLedger, ValidatorPrefs,
+};
+
+use super::{pallet::*, STAKING_ID};
+
+impl<T: Config> Pallet<T> {
+	/// The total balance that can be slashed from a stash account as of right now.
+	pub fn slashable_balance_of(stash: &T::AccountId) -> BalanceOf<T> {
+		// Weight note: consider making the stake accessible through stash.
+		Self::bonded(stash).and_then(Self::ledger).map(|l| l.active).unwrap_or_default()
+	}
+
+	/// Internal impl of [`Self::slashable_balance_of`] that returns [`VoteWeight`].
+	pub fn slashable_balance_of_vote_weight(
+		stash: &T::AccountId,
+		issuance: BalanceOf<T>,
+	) -> VoteWeight {
+		T::CurrencyToVote::to_vote(Self::slashable_balance_of(stash), issuance)
+	}
+
+	/// Returns a closure around `slashable_balance_of_vote_weight` that can be passed around.
+	///
+	/// This prevents call sites from repeatedly requesting `total_issuance` from backend. But it is
+	/// important to be only used while the total issuance is not changing.
+	pub fn slashable_balance_of_fn() -> Box<dyn Fn(&T::AccountId) -> VoteWeight> {
+		// NOTE: changing this to unboxed `impl Fn(..)` return type and the pallet will still
+		// compile, while some types in mock fail to resolve.
+		let issuance = T::Currency::total_issuance();
+		Box::new(move |who: &T::AccountId| -> VoteWeight {
+			Self::slashable_balance_of_vote_weight(who, issuance)
+		})
+	}
+
+	pub(super) fn do_payout_stakers(
+		validator_stash: T::AccountId,
+		era: EraIndex,
+	) -> DispatchResultWithPostInfo {
+		// Validate input data
+		let current_era = CurrentEra::<T>::get().ok_or(
+			Error::<T>::InvalidEraToReward
+				.with_weight(T::WeightInfo::payout_stakers_alive_staked(0)),
+		)?;
+		let history_depth = Self::history_depth();
+		ensure!(
+			era <= current_era && era >= current_era.saturating_sub(history_depth),
+			Error::<T>::InvalidEraToReward
+				.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
+		);
+
+		// Note: if era has no reward to be claimed, era may be future. better not to update
+		// `ledger.claimed_rewards` in this case.
+		let era_payout = <ErasValidatorReward<T>>::get(&era).ok_or_else(|| {
+			Error::<T>::InvalidEraToReward
+				.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
+		})?;
+
+		let controller = Self::bonded(&validator_stash).ok_or(
+			Error::<T>::NotStash.with_weight(T::WeightInfo::payout_stakers_alive_staked(0)),
+		)?;
+		let mut ledger = <Ledger<T>>::get(&controller).ok_or_else(|| Error::<T>::NotController)?;
+
+		ledger
+			.claimed_rewards
+			.retain(|&x| x >= current_era.saturating_sub(history_depth));
+		match ledger.claimed_rewards.binary_search(&era) {
+			Ok(_) => Err(Error::<T>::AlreadyClaimed
+				.with_weight(T::WeightInfo::payout_stakers_alive_staked(0)))?,
+			Err(pos) => ledger.claimed_rewards.insert(pos, era),
+		}
+
+		let exposure = <ErasStakersClipped<T>>::get(&era, &ledger.stash);
+
+		// Input data seems good, no errors allowed after this point
+
+		<Ledger<T>>::insert(&controller, &ledger);
+
+		// Get Era reward points. It has TOTAL and INDIVIDUAL
+		// Find the fraction of the era reward that belongs to the validator
+		// Take that fraction of the eras rewards to split to nominator and validator
+		//
+		// Then look at the validator, figure out the proportion of their reward
+		// which goes to them and each of their nominators.
+
+		let era_reward_points = <ErasRewardPoints<T>>::get(&era);
+		let total_reward_points = era_reward_points.total;
+		let validator_reward_points = era_reward_points
+			.individual
+			.get(&ledger.stash)
+			.map(|points| *points)
+			.unwrap_or_else(|| Zero::zero());
+
+		// Nothing to do if they have no reward points.
+		if validator_reward_points.is_zero() {
+			return Ok(Some(T::WeightInfo::payout_stakers_alive_staked(0)).into())
+		}
+
+		// This is the fraction of the total reward that the validator and the
+		// nominators will get.
+		let validator_total_reward_part =
+			Perbill::from_rational(validator_reward_points, total_reward_points);
+
+		// This is how much validator + nominators are entitled to.
+		let validator_total_payout = validator_total_reward_part * era_payout;
+
+		let validator_prefs = Self::eras_validator_prefs(&era, &validator_stash);
+		// Validator first gets a cut off the top.
+		let validator_commission = validator_prefs.commission;
+		let validator_commission_payout = validator_commission * validator_total_payout;
+
+		let validator_leftover_payout = validator_total_payout - validator_commission_payout;
+		// Now let's calculate how this is split to the validator.
+		let validator_exposure_part = Perbill::from_rational(exposure.own, exposure.total);
+		let validator_staking_payout = validator_exposure_part * validator_leftover_payout;
+
+		// We can now make total validator payout:
+		if let Some(imbalance) =
+			Self::make_payout(&ledger.stash, validator_staking_payout + validator_commission_payout)
+		{
+			Self::deposit_event(Event::<T>::Reward(ledger.stash, imbalance.peek()));
+		}
+
+		// Track the number of payout ops to nominators. Note: `WeightInfo::payout_stakers_alive_staked`
+		// always assumes at least a validator is paid out, so we do not need to count their payout op.
+		let mut nominator_payout_count: u32 = 0;
+
+		// Lets now calculate how this is split to the nominators.
+		// Reward only the clipped exposures. Note this is not necessarily sorted.
+		for nominator in exposure.others.iter() {
+			let nominator_exposure_part = Perbill::from_rational(nominator.value, exposure.total);
+
+			let nominator_reward: BalanceOf<T> =
+				nominator_exposure_part * validator_leftover_payout;
+			// We can now make nominator payout:
+			if let Some(imbalance) = Self::make_payout(&nominator.who, nominator_reward) {
+				// Note: this logic does not count payouts for `RewardDestination::None`.
+				nominator_payout_count += 1;
+				Self::deposit_event(Event::<T>::Reward(nominator.who.clone(), imbalance.peek()));
+			}
+		}
+
+		debug_assert!(nominator_payout_count <= T::MaxNominatorRewardedPerValidator::get());
+		Ok(Some(T::WeightInfo::payout_stakers_alive_staked(nominator_payout_count)).into())
+	}
+
+	/// Update the ledger for a controller.
+	///
+	/// This will also update the stash lock.
+	pub(crate) fn update_ledger(
+		controller: &T::AccountId,
+		ledger: &StakingLedger<T::AccountId, BalanceOf<T>>,
+	) {
+		T::Currency::set_lock(STAKING_ID, &ledger.stash, ledger.total, WithdrawReasons::all());
+		<Ledger<T>>::insert(controller, ledger);
+	}
+
+	/// Chill a stash account.
+	pub(crate) fn chill_stash(stash: &T::AccountId) {
+		let chilled_as_validator = Self::do_remove_validator(stash);
+		let chilled_as_nominator = Self::do_remove_nominator(stash);
+		if chilled_as_validator || chilled_as_nominator {
+			Self::deposit_event(Event::<T>::Chilled(stash.clone()));
+		}
+	}
+
+	/// Actually make a payment to a staker. This uses the currency's reward function
+	/// to pay the right payee for the given staker account.
+	fn make_payout(stash: &T::AccountId, amount: BalanceOf<T>) -> Option<PositiveImbalanceOf<T>> {
+		let dest = Self::payee(stash);
+		match dest {
+			RewardDestination::Controller => Self::bonded(stash)
+				.and_then(|controller| Some(T::Currency::deposit_creating(&controller, amount))),
+			RewardDestination::Stash => T::Currency::deposit_into_existing(stash, amount).ok(),
+			RewardDestination::Staked => Self::bonded(stash)
+				.and_then(|c| Self::ledger(&c).map(|l| (c, l)))
+				.and_then(|(controller, mut l)| {
+					l.active += amount;
+					l.total += amount;
+					let r = T::Currency::deposit_into_existing(stash, amount).ok();
+					Self::update_ledger(&controller, &l);
+					r
+				}),
+			RewardDestination::Account(dest_account) =>
+				Some(T::Currency::deposit_creating(&dest_account, amount)),
+			RewardDestination::None => None,
+		}
+	}
+
+	/// Plan a new session potentially trigger a new era.
+	fn new_session(session_index: SessionIndex, is_genesis: bool) -> Option<Vec<T::AccountId>> {
+		if let Some(current_era) = Self::current_era() {
+			// Initial era has been set.
+			let current_era_start_session_index = Self::eras_start_session_index(current_era)
+				.unwrap_or_else(|| {
+					frame_support::print("Error: start_session_index must be set for current_era");
+					0
+				});
+
+			let era_length =
+				session_index.checked_sub(current_era_start_session_index).unwrap_or(0); // Must never happen.
+
+			match ForceEra::<T>::get() {
+				// Will be set to `NotForcing` again if a new era has been triggered.
+				Forcing::ForceNew => (),
+				// Short circuit to `try_trigger_new_era`.
+				Forcing::ForceAlways => (),
+				// Only go to `try_trigger_new_era` if deadline reached.
+				Forcing::NotForcing if era_length >= T::SessionsPerEra::get() => (),
+				_ => {
+					// Either `Forcing::ForceNone`,
+					// or `Forcing::NotForcing if era_length >= T::SessionsPerEra::get()`.
+					return None
+				},
+			}
+
+			// New era.
+			let maybe_new_era_validators = Self::try_trigger_new_era(session_index, is_genesis);
+			if maybe_new_era_validators.is_some() &&
+				matches!(ForceEra::<T>::get(), Forcing::ForceNew)
+			{
+				ForceEra::<T>::put(Forcing::NotForcing);
+			}
+
+			maybe_new_era_validators
+		} else {
+			// Set initial era.
+			log!(debug, "Starting the first era.");
+			Self::try_trigger_new_era(session_index, is_genesis)
+		}
+	}
+
+	/// Start a session potentially starting an era.
+	fn start_session(start_session: SessionIndex) {
+		let next_active_era = Self::active_era().map(|e| e.index + 1).unwrap_or(0);
+		// This is only `Some` when current era has already progressed to the next era, while the
+		// active era is one behind (i.e. in the *last session of the active era*, or *first session
+		// of the new current era*, depending on how you look at it).
+		if let Some(next_active_era_start_session_index) =
+			Self::eras_start_session_index(next_active_era)
+		{
+			if next_active_era_start_session_index == start_session {
+				Self::start_era(start_session);
+			} else if next_active_era_start_session_index < start_session {
+				// This arm should never happen, but better handle it than to stall the staking
+				// pallet.
+				frame_support::print("Warning: A session appears to have been skipped.");
+				Self::start_era(start_session);
+			}
+		}
+	}
+
+	/// End a session potentially ending an era.
+	fn end_session(session_index: SessionIndex) {
+		if let Some(active_era) = Self::active_era() {
+			if let Some(next_active_era_start_session_index) =
+				Self::eras_start_session_index(active_era.index + 1)
+			{
+				if next_active_era_start_session_index == session_index + 1 {
+					Self::end_era(active_era, session_index);
+				}
+			}
+		}
+	}
+
+	/// * Increment `active_era.index`,
+	/// * reset `active_era.start`,
+	/// * update `BondedEras` and apply slashes.
+	fn start_era(start_session: SessionIndex) {
+		let active_era = ActiveEra::<T>::mutate(|active_era| {
+			let new_index = active_era.as_ref().map(|info| info.index + 1).unwrap_or(0);
+			*active_era = Some(ActiveEraInfo {
+				index: new_index,
+				// Set new active era start in next `on_finalize`. To guarantee usage of `Time`
+				start: None,
+			});
+			new_index
+		});
+
+		let bonding_duration = T::BondingDuration::get();
+
+		BondedEras::<T>::mutate(|bonded| {
+			bonded.push((active_era, start_session));
+
+			if active_era > bonding_duration {
+				let first_kept = active_era - bonding_duration;
+
+				// Prune out everything that's from before the first-kept index.
+				let n_to_prune =
+					bonded.iter().take_while(|&&(era_idx, _)| era_idx < first_kept).count();
+
+				// Kill slashing metadata.
+				for (pruned_era, _) in bonded.drain(..n_to_prune) {
+					slashing::clear_era_metadata::<T>(pruned_era);
+				}
+
+				if let Some(&(_, first_session)) = bonded.first() {
+					T::SessionInterface::prune_historical_up_to(first_session);
+				}
+			}
+		});
+
+		Self::apply_unapplied_slashes(active_era);
+	}
+
+	/// Compute payout for era.
+	fn end_era(active_era: ActiveEraInfo, _session_index: SessionIndex) {
+		// Note: active_era_start can be None if end era is called during genesis config.
+		if let Some(active_era_start) = active_era.start {
+			let now_as_millis_u64 = T::UnixTime::now().as_millis().saturated_into::<u64>();
+
+			let era_duration = (now_as_millis_u64 - active_era_start).saturated_into::<u64>();
+			let staked = Self::eras_total_stake(&active_era.index);
+			let issuance = T::Currency::total_issuance();
+			let (validator_payout, rest) = T::EraPayout::era_payout(staked, issuance, era_duration);
+
+			Self::deposit_event(Event::<T>::EraPayout(active_era.index, validator_payout, rest));
+
+			// Set ending era reward.
+			<ErasValidatorReward<T>>::insert(&active_era.index, validator_payout);
+			T::RewardRemainder::on_unbalanced(T::Currency::issue(rest));
+		}
+	}
+
+	/// Plan a new era.
+	///
+	/// * Bump the current era storage (which holds the latest planned era).
+	/// * Store start session index for the new planned era.
+	/// * Clean old era information.
+	/// * Store staking information for the new planned era
+	///
+	/// Returns the new validator set.
+	pub fn trigger_new_era(
+		start_session_index: SessionIndex,
+		exposures: Vec<(T::AccountId, Exposure<T::AccountId, BalanceOf<T>>)>,
+	) -> Vec<T::AccountId> {
+		// Increment or set current era.
+		let new_planned_era = CurrentEra::<T>::mutate(|s| {
+			*s = Some(s.map(|s| s + 1).unwrap_or(0));
+			s.unwrap()
+		});
+		ErasStartSessionIndex::<T>::insert(&new_planned_era, &start_session_index);
+
+		// Clean old era information.
+		if let Some(old_era) = new_planned_era.checked_sub(Self::history_depth() + 1) {
+			Self::clear_era_information(old_era);
+		}
+
+		// Set staking information for the new era.
+		Self::store_stakers_info(exposures, new_planned_era)
+	}
+
+	/// Potentially plan a new era.
+	///
+	/// Get election result from `T::ElectionProvider`.
+	/// In case election result has more than [`MinimumValidatorCount`] validator trigger a new era.
+	///
+	/// In case a new era is planned, the new validator set is returned.
+	pub(crate) fn try_trigger_new_era(
+		start_session_index: SessionIndex,
+		is_genesis: bool,
+	) -> Option<Vec<T::AccountId>> {
+		let (election_result, weight) = if is_genesis {
+			T::GenesisElectionProvider::elect().map_err(|e| {
+				log!(warn, "genesis election provider failed due to {:?}", e);
+				Self::deposit_event(Event::StakingElectionFailed);
+			})
+		} else {
+			T::ElectionProvider::elect().map_err(|e| {
+				log!(warn, "election provider failed due to {:?}", e);
+				Self::deposit_event(Event::StakingElectionFailed);
+			})
+		}
+		.ok()?;
+
+		<frame_system::Pallet<T>>::register_extra_weight_unchecked(
+			weight,
+			frame_support::weights::DispatchClass::Mandatory,
+		);
+
+		let exposures = Self::collect_exposures(election_result);
+
+		if (exposures.len() as u32) < Self::minimum_validator_count().max(1) {
+			// Session will panic if we ever return an empty validator set, thus max(1) ^^.
+			match CurrentEra::<T>::get() {
+				Some(current_era) if current_era > 0 => log!(
+					warn,
+					"chain does not have enough staking candidates to operate for era {:?} ({} \
+					elected, minimum is {})",
+					CurrentEra::<T>::get().unwrap_or(0),
+					exposures.len(),
+					Self::minimum_validator_count(),
+				),
+				None => {
+					// The initial era is allowed to have no exposures.
+					// In this case the SessionManager is expected to choose a sensible validator
+					// set.
+					// TODO: this should be simplified #8911
+					CurrentEra::<T>::put(0);
+					ErasStartSessionIndex::<T>::insert(&0, &start_session_index);
+				},
+				_ => (),
+			}
+
+			Self::deposit_event(Event::StakingElectionFailed);
+			return None
+		}
+
+		Self::deposit_event(Event::StakingElection);
+		Some(Self::trigger_new_era(start_session_index, exposures))
+	}
+
+	/// Process the output of the election.
+	///
+	/// Store staking information for the new planned era
+	pub fn store_stakers_info(
+		exposures: Vec<(T::AccountId, Exposure<T::AccountId, BalanceOf<T>>)>,
+		new_planned_era: EraIndex,
+	) -> Vec<T::AccountId> {
+		let elected_stashes = exposures.iter().cloned().map(|(x, _)| x).collect::<Vec<_>>();
+
+		// Populate stakers, exposures, and the snapshot of validator prefs.
+		let mut total_stake: BalanceOf<T> = Zero::zero();
+		exposures.into_iter().for_each(|(stash, exposure)| {
+			total_stake = total_stake.saturating_add(exposure.total);
+			<ErasStakers<T>>::insert(new_planned_era, &stash, &exposure);
+
+			let mut exposure_clipped = exposure;
+			let clipped_max_len = T::MaxNominatorRewardedPerValidator::get() as usize;
+			if exposure_clipped.others.len() > clipped_max_len {
+				exposure_clipped.others.sort_by(|a, b| a.value.cmp(&b.value).reverse());
+				exposure_clipped.others.truncate(clipped_max_len);
+			}
+			<ErasStakersClipped<T>>::insert(&new_planned_era, &stash, exposure_clipped);
+		});
+
+		// Insert current era staking information
+		<ErasTotalStake<T>>::insert(&new_planned_era, total_stake);
+
+		// Collect the pref of all winners.
+		for stash in &elected_stashes {
+			let pref = Self::validators(stash);
+			<ErasValidatorPrefs<T>>::insert(&new_planned_era, stash, pref);
+		}
+
+		if new_planned_era > 0 {
+			log!(
+				info,
+				"new validator set of size {:?} has been processed for era {:?}",
+				elected_stashes.len(),
+				new_planned_era,
+			);
+		}
+
+		elected_stashes
+	}
+
+	/// Consume a set of [`Supports`] from [`sp_npos_elections`] and collect them into a
+	/// [`Exposure`].
+	fn collect_exposures(
+		supports: Supports<T::AccountId>,
+	) -> Vec<(T::AccountId, Exposure<T::AccountId, BalanceOf<T>>)> {
+		let total_issuance = T::Currency::total_issuance();
+		let to_currency = |e: frame_election_provider_support::ExtendedBalance| {
+			T::CurrencyToVote::to_currency(e, total_issuance)
+		};
+
+		supports
+			.into_iter()
+			.map(|(validator, support)| {
+				// Build `struct exposure` from `support`.
+				let mut others = Vec::with_capacity(support.voters.len());
+				let mut own: BalanceOf<T> = Zero::zero();
+				let mut total: BalanceOf<T> = Zero::zero();
+				support
+					.voters
+					.into_iter()
+					.map(|(nominator, weight)| (nominator, to_currency(weight)))
+					.for_each(|(nominator, stake)| {
+						if nominator == validator {
+							own = own.saturating_add(stake);
+						} else {
+							others.push(IndividualExposure { who: nominator, value: stake });
+						}
+						total = total.saturating_add(stake);
+					});
+
+				let exposure = Exposure { own, others, total };
+				(validator, exposure)
+			})
+			.collect::<Vec<(T::AccountId, Exposure<_, _>)>>()
+	}
+
+	/// Remove all associated data of a stash account from the staking system.
+	///
+	/// Assumes storage is upgraded before calling.
+	///
+	/// This is called:
+	/// - after a `withdraw_unbonded()` call that frees all of a stash's bonded balance.
+	/// - through `reap_stash()` if the balance has fallen to zero (through slashing).
+	pub(crate) fn kill_stash(stash: &T::AccountId, num_slashing_spans: u32) -> DispatchResult {
+		let controller = <Bonded<T>>::get(stash).ok_or(Error::<T>::NotStash)?;
+
+		slashing::clear_stash_metadata::<T>(stash, num_slashing_spans)?;
+
+		<Bonded<T>>::remove(stash);
+		<Ledger<T>>::remove(&controller);
+
+		<Payee<T>>::remove(stash);
+		Self::do_remove_validator(stash);
+		Self::do_remove_nominator(stash);
+
+		frame_system::Pallet::<T>::dec_consumers(stash);
+
+		Ok(())
+	}
+
+	/// Clear all era information for given era.
+	pub(crate) fn clear_era_information(era_index: EraIndex) {
+		<ErasStakers<T>>::remove_prefix(era_index, None);
+		<ErasStakersClipped<T>>::remove_prefix(era_index, None);
+		<ErasValidatorPrefs<T>>::remove_prefix(era_index, None);
+		<ErasValidatorReward<T>>::remove(era_index);
+		<ErasRewardPoints<T>>::remove(era_index);
+		<ErasTotalStake<T>>::remove(era_index);
+		ErasStartSessionIndex::<T>::remove(era_index);
+	}
+
+	/// Apply previously-unapplied slashes on the beginning of a new era, after a delay.
+	fn apply_unapplied_slashes(active_era: EraIndex) {
+		let slash_defer_duration = T::SlashDeferDuration::get();
+		<Self as Store>::EarliestUnappliedSlash::mutate(|earliest| {
+			if let Some(ref mut earliest) = earliest {
+				let keep_from = active_era.saturating_sub(slash_defer_duration);
+				for era in (*earliest)..keep_from {
+					let era_slashes = <Self as Store>::UnappliedSlashes::take(&era);
+					for slash in era_slashes {
+						slashing::apply_slash::<T>(slash);
+					}
+				}
+
+				*earliest = (*earliest).max(keep_from)
+			}
+		})
+	}
+
+	/// Add reward points to validators using their stash account ID.
+	///
+	/// Validators are keyed by stash account ID and must be in the current elected set.
+	///
+	/// For each element in the iterator the given number of points in u32 is added to the
+	/// validator, thus duplicates are handled.
+	///
+	/// At the end of the era each the total payout will be distributed among validator
+	/// relatively to their points.
+	///
+	/// COMPLEXITY: Complexity is `number_of_validator_to_reward x current_elected_len`.
+	pub fn reward_by_ids(validators_points: impl IntoIterator<Item = (T::AccountId, u32)>) {
+		if let Some(active_era) = Self::active_era() {
+			<ErasRewardPoints<T>>::mutate(active_era.index, |era_rewards| {
+				for (validator, points) in validators_points.into_iter() {
+					*era_rewards.individual.entry(validator).or_default() += points;
+					era_rewards.total += points;
+				}
+			});
+		}
+	}
+
+	/// Ensures that at the end of the current session there will be a new era.
+	pub(crate) fn ensure_new_era() {
+		match ForceEra::<T>::get() {
+			Forcing::ForceAlways | Forcing::ForceNew => (),
+			_ => ForceEra::<T>::put(Forcing::ForceNew),
+		}
+	}
+
+	#[cfg(feature = "runtime-benchmarks")]
+	pub fn add_era_stakers(
+		current_era: EraIndex,
+		controller: T::AccountId,
+		exposure: Exposure<T::AccountId, BalanceOf<T>>,
+	) {
+		<ErasStakers<T>>::insert(&current_era, &controller, &exposure);
+	}
+
+	#[cfg(feature = "runtime-benchmarks")]
+	pub fn set_slash_reward_fraction(fraction: Perbill) {
+		SlashRewardFraction::<T>::put(fraction);
+	}
+
+	/// Get all of the voters that are eligible for the npos election.
+	///
+	/// This will use all on-chain nominators, and all the validators will inject a self vote.
+	///
+	/// ### Slashing
+	///
+	/// All nominations that have been submitted before the last non-zero slash of the validator are
+	/// auto-chilled.
+	///
+	/// Note that this is VERY expensive. Use with care.
+	pub fn get_npos_voters() -> Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)> {
+		let weight_of = Self::slashable_balance_of_fn();
+		let mut all_voters = Vec::new();
+
+		for (validator, _) in <Validators<T>>::iter() {
+			// Append self vote.
+			let self_vote = (validator.clone(), weight_of(&validator), vec![validator.clone()]);
+			all_voters.push(self_vote);
+		}
+
+		// Collect all slashing spans into a BTreeMap for further queries.
+		let slashing_spans = <SlashingSpans<T>>::iter().collect::<BTreeMap<_, _>>();
+
+		for (nominator, nominations) in Nominators::<T>::iter() {
+			let Nominations { submitted_in, mut targets, suppressed: _ } = nominations;
+
+			// Filter out nomination targets which were nominated before the most recent
+			// slashing span.
+			targets.retain(|stash| {
+				slashing_spans
+					.get(stash)
+					.map_or(true, |spans| submitted_in >= spans.last_nonzero_slash())
+			});
+
+			if !targets.is_empty() {
+				let vote_weight = weight_of(&nominator);
+				all_voters.push((nominator, vote_weight, targets))
+			}
+		}
+
+		all_voters
+	}
+
+	/// This is a very expensive function and result should be cached versus being called multiple times.
+	pub fn get_npos_targets() -> Vec<T::AccountId> {
+		Validators::<T>::iter().map(|(v, _)| v).collect::<Vec<_>>()
+	}
+
+	/// This function will add a nominator to the `Nominators` storage map,
+	/// and keep track of the `CounterForNominators`.
+	///
+	/// If the nominator already exists, their nominations will be updated.
+	pub fn do_add_nominator(who: &T::AccountId, nominations: Nominations<T::AccountId>) {
+		if !Nominators::<T>::contains_key(who) {
+			CounterForNominators::<T>::mutate(|x| x.saturating_inc())
+		}
+		Nominators::<T>::insert(who, nominations);
+	}
+
+	/// This function will remove a nominator from the `Nominators` storage map,
+	/// and keep track of the `CounterForNominators`.
+	///
+	/// Returns true if `who` was removed from `Nominators`, otherwise false.
+	pub fn do_remove_nominator(who: &T::AccountId) -> bool {
+		if Nominators::<T>::contains_key(who) {
+			Nominators::<T>::remove(who);
+			CounterForNominators::<T>::mutate(|x| x.saturating_dec());
+			true
+		} else {
+			false
+		}
+	}
+
+	/// This function will add a validator to the `Validators` storage map,
+	/// and keep track of the `CounterForValidators`.
+	///
+	/// If the validator already exists, their preferences will be updated.
+	pub fn do_add_validator(who: &T::AccountId, prefs: ValidatorPrefs) {
+		if !Validators::<T>::contains_key(who) {
+			CounterForValidators::<T>::mutate(|x| x.saturating_inc())
+		}
+		Validators::<T>::insert(who, prefs);
+	}
+
+	/// This function will remove a validator from the `Validators` storage map,
+	/// and keep track of the `CounterForValidators`.
+	///
+	/// Returns true if `who` was removed from `Validators`, otherwise false.
+	pub fn do_remove_validator(who: &T::AccountId) -> bool {
+		if Validators::<T>::contains_key(who) {
+			Validators::<T>::remove(who);
+			CounterForValidators::<T>::mutate(|x| x.saturating_dec());
+			true
+		} else {
+			false
+		}
+	}
+}
+
+impl<T: Config> frame_election_provider_support::ElectionDataProvider<T::AccountId, T::BlockNumber>
+	for Pallet<T>
+{
+	const MAXIMUM_VOTES_PER_VOTER: u32 = T::MAX_NOMINATIONS;
+	fn desired_targets() -> data_provider::Result<(u32, Weight)> {
+		Ok((Self::validator_count(), <T as frame_system::Config>::DbWeight::get().reads(1)))
+	}
+
+	fn voters(
+		maybe_max_len: Option<usize>,
+	) -> data_provider::Result<(Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)>, Weight)> {
+		let nominator_count = CounterForNominators::<T>::get();
+		let validator_count = CounterForValidators::<T>::get();
+		let voter_count = nominator_count.saturating_add(validator_count) as usize;
+		debug_assert!(<Nominators<T>>::iter().count() as u32 == CounterForNominators::<T>::get());
+		debug_assert!(<Validators<T>>::iter().count() as u32 == CounterForValidators::<T>::get());
+
+		if maybe_max_len.map_or(false, |max_len| voter_count > max_len) {
+			return Err("Voter snapshot too big")
+		}
+
+		let slashing_span_count = <SlashingSpans<T>>::iter().count();
+		let weight = T::WeightInfo::get_npos_voters(
+			nominator_count,
+			validator_count,
+			slashing_span_count as u32,
+		);
+		Ok((Self::get_npos_voters(), weight))
+	}
+
+	fn targets(maybe_max_len: Option<usize>) -> data_provider::Result<(Vec<T::AccountId>, Weight)> {
+		let target_count = CounterForValidators::<T>::get() as usize;
+
+		if maybe_max_len.map_or(false, |max_len| target_count > max_len) {
+			return Err("Target snapshot too big")
+		}
+
+		let weight = <T as frame_system::Config>::DbWeight::get().reads(target_count as u64);
+		Ok((Self::get_npos_targets(), weight))
+	}
+
+	fn next_election_prediction(now: T::BlockNumber) -> T::BlockNumber {
+		let current_era = Self::current_era().unwrap_or(0);
+		let current_session = Self::current_planned_session();
+		let current_era_start_session_index =
+			Self::eras_start_session_index(current_era).unwrap_or(0);
+		// Number of session in the current era or the maximum session per era if reached.
+		let era_progress = current_session
+			.saturating_sub(current_era_start_session_index)
+			.min(T::SessionsPerEra::get());
+
+		let until_this_session_end = T::NextNewSession::estimate_next_new_session(now)
+			.0
+			.unwrap_or_default()
+			.saturating_sub(now);
+
+		let session_length = T::NextNewSession::average_session_length();
+
+		let sessions_left: T::BlockNumber = match ForceEra::<T>::get() {
+			Forcing::ForceNone => Bounded::max_value(),
+			Forcing::ForceNew | Forcing::ForceAlways => Zero::zero(),
+			Forcing::NotForcing if era_progress >= T::SessionsPerEra::get() => Zero::zero(),
+			Forcing::NotForcing => T::SessionsPerEra::get()
+				.saturating_sub(era_progress)
+				// One session is computed in this_session_end.
+				.saturating_sub(1)
+				.into(),
+		};
+
+		now.saturating_add(
+			until_this_session_end.saturating_add(sessions_left.saturating_mul(session_length)),
+		)
+	}
+
+	#[cfg(any(feature = "runtime-benchmarks", test))]
+	fn add_voter(voter: T::AccountId, weight: VoteWeight, targets: Vec<T::AccountId>) {
+		use sp_std::convert::TryFrom;
+		let stake = <BalanceOf<T>>::try_from(weight).unwrap_or_else(|_| {
+			panic!("cannot convert a VoteWeight into BalanceOf, benchmark needs reconfiguring.")
+		});
+		<Bonded<T>>::insert(voter.clone(), voter.clone());
+		<Ledger<T>>::insert(
+			voter.clone(),
+			StakingLedger {
+				stash: voter.clone(),
+				active: stake,
+				total: stake,
+				unlocking: vec![],
+				claimed_rewards: vec![],
+			},
+		);
+		Self::do_add_nominator(&voter, Nominations { targets, submitted_in: 0, suppressed: false });
+	}
+
+	#[cfg(any(feature = "runtime-benchmarks", test))]
+	fn add_target(target: T::AccountId) {
+		let stake = MinValidatorBond::<T>::get() * 100u32.into();
+		<Bonded<T>>::insert(target.clone(), target.clone());
+		<Ledger<T>>::insert(
+			target.clone(),
+			StakingLedger {
+				stash: target.clone(),
+				active: stake,
+				total: stake,
+				unlocking: vec![],
+				claimed_rewards: vec![],
+			},
+		);
+		Self::do_add_validator(
+			&target,
+			ValidatorPrefs { commission: Perbill::zero(), blocked: false },
+		);
+	}
+
+	#[cfg(any(feature = "runtime-benchmarks", test))]
+	fn clear() {
+		<Bonded<T>>::remove_all(None);
+		<Ledger<T>>::remove_all(None);
+		<Validators<T>>::remove_all(None);
+		<Nominators<T>>::remove_all(None);
+	}
+
+	#[cfg(any(feature = "runtime-benchmarks", test))]
+	fn put_snapshot(
+		voters: Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)>,
+		targets: Vec<T::AccountId>,
+		target_stake: Option<VoteWeight>,
+	) {
+		use sp_std::convert::TryFrom;
+		targets.into_iter().for_each(|v| {
+			let stake: BalanceOf<T> = target_stake
+				.and_then(|w| <BalanceOf<T>>::try_from(w).ok())
+				.unwrap_or(MinNominatorBond::<T>::get() * 100u32.into());
+			<Bonded<T>>::insert(v.clone(), v.clone());
+			<Ledger<T>>::insert(
+				v.clone(),
+				StakingLedger {
+					stash: v.clone(),
+					active: stake,
+					total: stake,
+					unlocking: vec![],
+					claimed_rewards: vec![],
+				},
+			);
+			Self::do_add_validator(
+				&v,
+				ValidatorPrefs { commission: Perbill::zero(), blocked: false },
+			);
+		});
+
+		voters.into_iter().for_each(|(v, s, t)| {
+			let stake = <BalanceOf<T>>::try_from(s).unwrap_or_else(|_| {
+				panic!("cannot convert a VoteWeight into BalanceOf, benchmark needs reconfiguring.")
+			});
+			<Bonded<T>>::insert(v.clone(), v.clone());
+			<Ledger<T>>::insert(
+				v.clone(),
+				StakingLedger {
+					stash: v.clone(),
+					active: stake,
+					total: stake,
+					unlocking: vec![],
+					claimed_rewards: vec![],
+				},
+			);
+			Self::do_add_nominator(
+				&v,
+				Nominations { targets: t, submitted_in: 0, suppressed: false },
+			);
+		});
+	}
+}
+
+/// In this implementation `new_session(session)` must be called before `end_session(session-1)`
+/// i.e. the new session must be planned before the ending of the previous session.
+///
+/// Once the first new_session is planned, all session must start and then end in order, though
+/// some session can lag in between the newest session planned and the latest session started.
+impl<T: Config> pallet_session::SessionManager<T::AccountId> for Pallet<T> {
+	fn new_session(new_index: SessionIndex) -> Option<Vec<T::AccountId>> {
+		log!(trace, "planning new session {}", new_index);
+		CurrentPlannedSession::<T>::put(new_index);
+		Self::new_session(new_index, false)
+	}
+	fn new_session_genesis(new_index: SessionIndex) -> Option<Vec<T::AccountId>> {
+		log!(trace, "planning new session {} at genesis", new_index);
+		CurrentPlannedSession::<T>::put(new_index);
+		Self::new_session(new_index, true)
+	}
+	fn start_session(start_index: SessionIndex) {
+		log!(trace, "starting session {}", start_index);
+		Self::start_session(start_index)
+	}
+	fn end_session(end_index: SessionIndex) {
+		log!(trace, "ending session {}", end_index);
+		Self::end_session(end_index)
+	}
+}
+
+impl<T: Config> historical::SessionManager<T::AccountId, Exposure<T::AccountId, BalanceOf<T>>>
+	for Pallet<T>
+{
+	fn new_session(
+		new_index: SessionIndex,
+	) -> Option<Vec<(T::AccountId, Exposure<T::AccountId, BalanceOf<T>>)>> {
+		<Self as pallet_session::SessionManager<_>>::new_session(new_index).map(|validators| {
+			let current_era = Self::current_era()
+				// Must be some as a new era has been created.
+				.unwrap_or(0);
+
+			validators
+				.into_iter()
+				.map(|v| {
+					let exposure = Self::eras_stakers(current_era, &v);
+					(v, exposure)
+				})
+				.collect()
+		})
+	}
+	fn new_session_genesis(
+		new_index: SessionIndex,
+	) -> Option<Vec<(T::AccountId, Exposure<T::AccountId, BalanceOf<T>>)>> {
+		<Self as pallet_session::SessionManager<_>>::new_session_genesis(new_index).map(
+			|validators| {
+				let current_era = Self::current_era()
+					// Must be some as a new era has been created.
+					.unwrap_or(0);
+
+				validators
+					.into_iter()
+					.map(|v| {
+						let exposure = Self::eras_stakers(current_era, &v);
+						(v, exposure)
+					})
+					.collect()
+			},
+		)
+	}
+	fn start_session(start_index: SessionIndex) {
+		<Self as pallet_session::SessionManager<_>>::start_session(start_index)
+	}
+	fn end_session(end_index: SessionIndex) {
+		<Self as pallet_session::SessionManager<_>>::end_session(end_index)
+	}
+}
+
+/// Add reward points to block authors:
+/// * 20 points to the block producer for producing a (non-uncle) block in the relay chain,
+/// * 2 points to the block producer for each reference to a previously unreferenced uncle, and
+/// * 1 point to the producer of each referenced uncle block.
+impl<T> pallet_authorship::EventHandler<T::AccountId, T::BlockNumber> for Pallet<T>
+where
+	T: Config + pallet_authorship::Config + pallet_session::Config,
+{
+	fn note_author(author: T::AccountId) {
+		Self::reward_by_ids(vec![(author, 20)])
+	}
+	fn note_uncle(author: T::AccountId, _age: T::BlockNumber) {
+		Self::reward_by_ids(vec![(<pallet_authorship::Pallet<T>>::author(), 2), (author, 1)])
+	}
+}
+
+/// This is intended to be used with `FilterHistoricalOffences`.
+impl<T: Config>
+	OnOffenceHandler<T::AccountId, pallet_session::historical::IdentificationTuple<T>, Weight>
+	for Pallet<T>
+where
+	T: pallet_session::Config<ValidatorId = <T as frame_system::Config>::AccountId>,
+	T: pallet_session::historical::Config<
+		FullIdentification = Exposure<<T as frame_system::Config>::AccountId, BalanceOf<T>>,
+		FullIdentificationOf = ExposureOf<T>,
+	>,
+	T::SessionHandler: pallet_session::SessionHandler<<T as frame_system::Config>::AccountId>,
+	T::SessionManager: pallet_session::SessionManager<<T as frame_system::Config>::AccountId>,
+	T::ValidatorIdOf: Convert<
+		<T as frame_system::Config>::AccountId,
+		Option<<T as frame_system::Config>::AccountId>,
+	>,
+{
+	fn on_offence(
+		offenders: &[OffenceDetails<
+			T::AccountId,
+			pallet_session::historical::IdentificationTuple<T>,
+		>],
+		slash_fraction: &[Perbill],
+		slash_session: SessionIndex,
+	) -> Weight {
+		let reward_proportion = SlashRewardFraction::<T>::get();
+		let mut consumed_weight: Weight = 0;
+		let mut add_db_reads_writes = |reads, writes| {
+			consumed_weight += T::DbWeight::get().reads_writes(reads, writes);
+		};
+
+		let active_era = {
+			let active_era = Self::active_era();
+			add_db_reads_writes(1, 0);
+			if active_era.is_none() {
+				// This offence need not be re-submitted.
+				return consumed_weight
+			}
+			active_era.expect("value checked not to be `None`; qed").index
+		};
+		let active_era_start_session_index = Self::eras_start_session_index(active_era)
+			.unwrap_or_else(|| {
+				frame_support::print("Error: start_session_index must be set for current_era");
+				0
+			});
+		add_db_reads_writes(1, 0);
+
+		let window_start = active_era.saturating_sub(T::BondingDuration::get());
+
+		// Fast path for active-era report - most likely.
+		// `slash_session` cannot be in a future active era. It must be in `active_era` or before.
+		let slash_era = if slash_session >= active_era_start_session_index {
+			active_era
+		} else {
+			let eras = BondedEras::<T>::get();
+			add_db_reads_writes(1, 0);
+
+			// Reverse because it's more likely to find reports from recent eras.
+			match eras.iter().rev().filter(|&&(_, ref sesh)| sesh <= &slash_session).next() {
+				Some(&(ref slash_era, _)) => *slash_era,
+				// Before bonding period. defensive - should be filtered out.
+				None => return consumed_weight,
+			}
+		};
+
+		<Self as Store>::EarliestUnappliedSlash::mutate(|earliest| {
+			if earliest.is_none() {
+				*earliest = Some(active_era)
+			}
+		});
+		add_db_reads_writes(1, 1);
+
+		let slash_defer_duration = T::SlashDeferDuration::get();
+
+		let invulnerables = Self::invulnerables();
+		add_db_reads_writes(1, 0);
+
+		for (details, slash_fraction) in offenders.iter().zip(slash_fraction) {
+			let (stash, exposure) = &details.offender;
+
+			// Skip if the validator is invulnerable.
+			if invulnerables.contains(stash) {
+				continue
+			}
+
+			let unapplied = slashing::compute_slash::<T>(slashing::SlashParams {
+				stash,
+				slash: *slash_fraction,
+				exposure,
+				slash_era,
+				window_start,
+				now: active_era,
+				reward_proportion,
+			});
+
+			if let Some(mut unapplied) = unapplied {
+				let nominators_len = unapplied.others.len() as u64;
+				let reporters_len = details.reporters.len() as u64;
+
+				{
+					let upper_bound = 1 /* Validator/NominatorSlashInEra */ + 2 /* fetch_spans */;
+					let rw = upper_bound + nominators_len * upper_bound;
+					add_db_reads_writes(rw, rw);
+				}
+				unapplied.reporters = details.reporters.clone();
+				if slash_defer_duration == 0 {
+					// Apply right away.
+					slashing::apply_slash::<T>(unapplied);
+					{
+						let slash_cost = (6, 5);
+						let reward_cost = (2, 2);
+						add_db_reads_writes(
+							(1 + nominators_len) * slash_cost.0 + reward_cost.0 * reporters_len,
+							(1 + nominators_len) * slash_cost.1 + reward_cost.1 * reporters_len,
+						);
+					}
+				} else {
+					// Defer to end of some `slash_defer_duration` from now.
+					<Self as Store>::UnappliedSlashes::mutate(active_era, move |for_later| {
+						for_later.push(unapplied)
+					});
+					add_db_reads_writes(1, 1);
+				}
+			} else {
+				add_db_reads_writes(4 /* fetch_spans */, 5 /* kick_out_if_recent */)
+			}
+		}
+
+		consumed_weight
+	}
+}
diff --git a/frame/staking/src/pallet/mod.rs b/frame/staking/src/pallet/mod.rs
new file mode 100644
index 000000000000..4e7f06ebab18
--- /dev/null
+++ b/frame/staking/src/pallet/mod.rs
@@ -0,0 +1,1544 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Staking FRAME Pallet.
+
+use frame_support::{
+	pallet_prelude::*,
+	traits::{
+		Currency, CurrencyToVote, EnsureOrigin, EstimateNextNewSession, Get, LockIdentifier,
+		LockableCurrency, OnUnbalanced, UnixTime,
+	},
+	weights::{
+		constants::{WEIGHT_PER_MICROS, WEIGHT_PER_NANOS},
+		Weight,
+	},
+};
+use frame_system::{ensure_root, ensure_signed, offchain::SendTransactionTypes, pallet_prelude::*};
+use sp_runtime::{
+	traits::{CheckedSub, SaturatedConversion, StaticLookup, Zero},
+	DispatchError, Perbill, Percent,
+};
+use sp_staking::SessionIndex;
+use sp_std::{convert::From, prelude::*, result};
+
+mod impls;
+
+pub use impls::*;
+
+use crate::{
+	migrations, slashing, weights::WeightInfo, ActiveEraInfo, BalanceOf, EraIndex, EraPayout,
+	EraRewardPoints, Exposure, Forcing, NegativeImbalanceOf, Nominations, PositiveImbalanceOf,
+	Releases, RewardDestination, SessionInterface, StakerStatus, StakingLedger, UnappliedSlash,
+	UnlockChunk, ValidatorPrefs,
+};
+
+pub const MAX_UNLOCKING_CHUNKS: usize = 32;
+const STAKING_ID: LockIdentifier = *b"staking ";
+
+#[frame_support::pallet]
+pub mod pallet {
+	use super::*;
+
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(crate) trait Store)]
+	pub struct Pallet<T>(_);
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config + SendTransactionTypes<Call<Self>> {
+		/// The staking balance.
+		type Currency: LockableCurrency<Self::AccountId, Moment = Self::BlockNumber>;
+
+		/// Time used for computing era duration.
+		///
+		/// It is guaranteed to start being called from the first `on_finalize`. Thus value at genesis
+		/// is not used.
+		type UnixTime: UnixTime;
+
+		/// Convert a balance into a number used for election calculation. This must fit into a `u64`
+		/// but is allowed to be sensibly lossy. The `u64` is used to communicate with the
+		/// [`sp_npos_elections`] crate which accepts u64 numbers and does operations in 128.
+		/// Consequently, the backward convert is used convert the u128s from sp-elections back to a
+		/// [`BalanceOf`].
+		type CurrencyToVote: CurrencyToVote<BalanceOf<Self>>;
+
+		/// Something that provides the election functionality.
+		type ElectionProvider: frame_election_provider_support::ElectionProvider<
+			Self::AccountId,
+			Self::BlockNumber,
+			// we only accept an election provider that has staking as data provider.
+			DataProvider = Pallet<Self>,
+		>;
+
+		/// Something that provides the election functionality at genesis.
+		type GenesisElectionProvider: frame_election_provider_support::ElectionProvider<
+			Self::AccountId,
+			Self::BlockNumber,
+			DataProvider = Pallet<Self>,
+		>;
+
+		/// Maximum number of nominations per nominator.
+		const MAX_NOMINATIONS: u32;
+
+		/// Tokens have been minted and are unused for validator-reward.
+		/// See [Era payout](./index.html#era-payout).
+		type RewardRemainder: OnUnbalanced<NegativeImbalanceOf<Self>>;
+
+		/// The overarching event type.
+		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
+
+		/// Handler for the unbalanced reduction when slashing a staker.
+		type Slash: OnUnbalanced<NegativeImbalanceOf<Self>>;
+
+		/// Handler for the unbalanced increment when rewarding a staker.
+		type Reward: OnUnbalanced<PositiveImbalanceOf<Self>>;
+
+		/// Number of sessions per era.
+		#[pallet::constant]
+		type SessionsPerEra: Get<SessionIndex>;
+
+		/// Number of eras that staked funds must remain bonded for.
+		#[pallet::constant]
+		type BondingDuration: Get<EraIndex>;
+
+		/// Number of eras that slashes are deferred by, after computation.
+		///
+		/// This should be less than the bonding duration. Set to 0 if slashes
+		/// should be applied immediately, without opportunity for intervention.
+		#[pallet::constant]
+		type SlashDeferDuration: Get<EraIndex>;
+
+		/// The origin which can cancel a deferred slash. Root can always do this.
+		type SlashCancelOrigin: EnsureOrigin<Self::Origin>;
+
+		/// Interface for interacting with a session pallet.
+		type SessionInterface: SessionInterface<Self::AccountId>;
+
+		/// The payout for validators and the system for the current era.
+		/// See [Era payout](./index.html#era-payout).
+		type EraPayout: EraPayout<BalanceOf<Self>>;
+
+		/// Something that can estimate the next session change, accurately or as a best effort guess.
+		type NextNewSession: EstimateNextNewSession<Self::BlockNumber>;
+
+		/// The maximum number of nominators rewarded for each validator.
+		///
+		/// For each validator only the `$MaxNominatorRewardedPerValidator` biggest stakers can claim
+		/// their reward. This used to limit the i/o cost for the nominator payout.
+		#[pallet::constant]
+		type MaxNominatorRewardedPerValidator: Get<u32>;
+
+		/// Weight information for extrinsics in this pallet.
+		type WeightInfo: WeightInfo;
+	}
+
+	#[pallet::extra_constants]
+	impl<T: Config> Pallet<T> {
+		// TODO: rename to snake case after https://github.com/paritytech/substrate/issues/8826 fixed.
+		#[allow(non_snake_case)]
+		fn MaxNominations() -> u32 {
+			T::MAX_NOMINATIONS
+		}
+	}
+
+	#[pallet::type_value]
+	pub(crate) fn HistoryDepthOnEmpty() -> u32 {
+		84u32
+	}
+
+	/// Number of eras to keep in history.
+	///
+	/// Information is kept for eras in `[current_era - history_depth; current_era]`.
+	///
+	/// Must be more than the number of eras delayed by session otherwise. I.e. active era must
+	/// always be in history. I.e. `active_era > current_era - history_depth` must be
+	/// guaranteed.
+	#[pallet::storage]
+	#[pallet::getter(fn history_depth)]
+	pub(crate) type HistoryDepth<T> = StorageValue<_, u32, ValueQuery, HistoryDepthOnEmpty>;
+
+	/// The ideal number of staking participants.
+	#[pallet::storage]
+	#[pallet::getter(fn validator_count)]
+	pub type ValidatorCount<T> = StorageValue<_, u32, ValueQuery>;
+
+	/// Minimum number of staking participants before emergency conditions are imposed.
+	#[pallet::storage]
+	#[pallet::getter(fn minimum_validator_count)]
+	pub type MinimumValidatorCount<T> = StorageValue<_, u32, ValueQuery>;
+
+	/// Any validators that may never be slashed or forcibly kicked. It's a Vec since they're
+	/// easy to initialize and the performance hit is minimal (we expect no more than four
+	/// invulnerables) and restricted to testnets.
+	#[pallet::storage]
+	#[pallet::getter(fn invulnerables)]
+	pub type Invulnerables<T: Config> = StorageValue<_, Vec<T::AccountId>, ValueQuery>;
+
+	/// Map from all locked "stash" accounts to the controller account.
+	#[pallet::storage]
+	#[pallet::getter(fn bonded)]
+	pub type Bonded<T: Config> = StorageMap<_, Twox64Concat, T::AccountId, T::AccountId>;
+
+	/// The minimum active bond to become and maintain the role of a nominator.
+	#[pallet::storage]
+	pub type MinNominatorBond<T: Config> = StorageValue<_, BalanceOf<T>, ValueQuery>;
+
+	/// The minimum active bond to become and maintain the role of a validator.
+	#[pallet::storage]
+	pub type MinValidatorBond<T: Config> = StorageValue<_, BalanceOf<T>, ValueQuery>;
+
+	/// Map from all (unlocked) "controller" accounts to the info regarding the staking.
+	#[pallet::storage]
+	#[pallet::getter(fn ledger)]
+	pub type Ledger<T: Config> =
+		StorageMap<_, Blake2_128Concat, T::AccountId, StakingLedger<T::AccountId, BalanceOf<T>>>;
+
+	/// Where the reward payment should be made. Keyed by stash.
+	#[pallet::storage]
+	#[pallet::getter(fn payee)]
+	pub type Payee<T: Config> =
+		StorageMap<_, Twox64Concat, T::AccountId, RewardDestination<T::AccountId>, ValueQuery>;
+
+	/// The map from (wannabe) validator stash key to the preferences of that validator.
+	///
+	/// When updating this storage item, you must also update the `CounterForValidators`.
+	#[pallet::storage]
+	#[pallet::getter(fn validators)]
+	pub type Validators<T: Config> =
+		StorageMap<_, Twox64Concat, T::AccountId, ValidatorPrefs, ValueQuery>;
+
+	/// A tracker to keep count of the number of items in the `Validators` map.
+	#[pallet::storage]
+	pub type CounterForValidators<T> = StorageValue<_, u32, ValueQuery>;
+
+	/// The maximum validator count before we stop allowing new validators to join.
+	///
+	/// When this value is not set, no limits are enforced.
+	#[pallet::storage]
+	pub type MaxValidatorsCount<T> = StorageValue<_, u32, OptionQuery>;
+
+	/// The map from nominator stash key to the set of stash keys of all validators to nominate.
+	///
+	/// When updating this storage item, you must also update the `CounterForNominators`.
+	#[pallet::storage]
+	#[pallet::getter(fn nominators)]
+	pub type Nominators<T: Config> =
+		StorageMap<_, Twox64Concat, T::AccountId, Nominations<T::AccountId>>;
+
+	/// A tracker to keep count of the number of items in the `Nominators` map.
+	#[pallet::storage]
+	pub type CounterForNominators<T> = StorageValue<_, u32, ValueQuery>;
+
+	/// The maximum nominator count before we stop allowing new validators to join.
+	///
+	/// When this value is not set, no limits are enforced.
+	#[pallet::storage]
+	pub type MaxNominatorsCount<T> = StorageValue<_, u32, OptionQuery>;
+
+	/// The current era index.
+	///
+	/// This is the latest planned era, depending on how the Session pallet queues the validator
+	/// set, it might be active or not.
+	#[pallet::storage]
+	#[pallet::getter(fn current_era)]
+	pub type CurrentEra<T> = StorageValue<_, EraIndex>;
+
+	/// The active era information, it holds index and start.
+	///
+	/// The active era is the era being currently rewarded. Validator set of this era must be
+	/// equal to [`SessionInterface::validators`].
+	#[pallet::storage]
+	#[pallet::getter(fn active_era)]
+	pub type ActiveEra<T> = StorageValue<_, ActiveEraInfo>;
+
+	/// The session index at which the era start for the last `HISTORY_DEPTH` eras.
+	///
+	/// Note: This tracks the starting session (i.e. session index when era start being active)
+	/// for the eras in `[CurrentEra - HISTORY_DEPTH, CurrentEra]`.
+	#[pallet::storage]
+	#[pallet::getter(fn eras_start_session_index)]
+	pub type ErasStartSessionIndex<T> = StorageMap<_, Twox64Concat, EraIndex, SessionIndex>;
+
+	/// Exposure of validator at era.
+	///
+	/// This is keyed first by the era index to allow bulk deletion and then the stash account.
+	///
+	/// Is it removed after `HISTORY_DEPTH` eras.
+	/// If stakers hasn't been set or has been removed then empty exposure is returned.
+	#[pallet::storage]
+	#[pallet::getter(fn eras_stakers)]
+	pub type ErasStakers<T: Config> = StorageDoubleMap<
+		_,
+		Twox64Concat,
+		EraIndex,
+		Twox64Concat,
+		T::AccountId,
+		Exposure<T::AccountId, BalanceOf<T>>,
+		ValueQuery,
+	>;
+
+	/// Clipped Exposure of validator at era.
+	///
+	/// This is similar to [`ErasStakers`] but number of nominators exposed is reduced to the
+	/// `T::MaxNominatorRewardedPerValidator` biggest stakers.
+	/// (Note: the field `total` and `own` of the exposure remains unchanged).
+	/// This is used to limit the i/o cost for the nominator payout.
+	///
+	/// This is keyed fist by the era index to allow bulk deletion and then the stash account.
+	///
+	/// Is it removed after `HISTORY_DEPTH` eras.
+	/// If stakers hasn't been set or has been removed then empty exposure is returned.
+	#[pallet::storage]
+	#[pallet::getter(fn eras_stakers_clipped)]
+	pub type ErasStakersClipped<T: Config> = StorageDoubleMap<
+		_,
+		Twox64Concat,
+		EraIndex,
+		Twox64Concat,
+		T::AccountId,
+		Exposure<T::AccountId, BalanceOf<T>>,
+		ValueQuery,
+	>;
+
+	/// Similar to `ErasStakers`, this holds the preferences of validators.
+	///
+	/// This is keyed first by the era index to allow bulk deletion and then the stash account.
+	///
+	/// Is it removed after `HISTORY_DEPTH` eras.
+	// If prefs hasn't been set or has been removed then 0 commission is returned.
+	#[pallet::storage]
+	#[pallet::getter(fn eras_validator_prefs)]
+	pub type ErasValidatorPrefs<T: Config> = StorageDoubleMap<
+		_,
+		Twox64Concat,
+		EraIndex,
+		Twox64Concat,
+		T::AccountId,
+		ValidatorPrefs,
+		ValueQuery,
+	>;
+
+	/// The total validator era payout for the last `HISTORY_DEPTH` eras.
+	///
+	/// Eras that haven't finished yet or has been removed doesn't have reward.
+	#[pallet::storage]
+	#[pallet::getter(fn eras_validator_reward)]
+	pub type ErasValidatorReward<T: Config> = StorageMap<_, Twox64Concat, EraIndex, BalanceOf<T>>;
+
+	/// Rewards for the last `HISTORY_DEPTH` eras.
+	/// If reward hasn't been set or has been removed then 0 reward is returned.
+	#[pallet::storage]
+	#[pallet::getter(fn eras_reward_points)]
+	pub type ErasRewardPoints<T: Config> =
+		StorageMap<_, Twox64Concat, EraIndex, EraRewardPoints<T::AccountId>, ValueQuery>;
+
+	/// The total amount staked for the last `HISTORY_DEPTH` eras.
+	/// If total hasn't been set or has been removed then 0 stake is returned.
+	#[pallet::storage]
+	#[pallet::getter(fn eras_total_stake)]
+	pub type ErasTotalStake<T: Config> =
+		StorageMap<_, Twox64Concat, EraIndex, BalanceOf<T>, ValueQuery>;
+
+	/// Mode of era forcing.
+	#[pallet::storage]
+	#[pallet::getter(fn force_era)]
+	pub type ForceEra<T> = StorageValue<_, Forcing, ValueQuery>;
+
+	/// The percentage of the slash that is distributed to reporters.
+	///
+	/// The rest of the slashed value is handled by the `Slash`.
+	#[pallet::storage]
+	#[pallet::getter(fn slash_reward_fraction)]
+	pub type SlashRewardFraction<T> = StorageValue<_, Perbill, ValueQuery>;
+
+	/// The amount of currency given to reporters of a slash event which was
+	/// canceled by extraordinary circumstances (e.g. governance).
+	#[pallet::storage]
+	#[pallet::getter(fn canceled_payout)]
+	pub type CanceledSlashPayout<T: Config> = StorageValue<_, BalanceOf<T>, ValueQuery>;
+
+	/// All unapplied slashes that are queued for later.
+	#[pallet::storage]
+	pub type UnappliedSlashes<T: Config> = StorageMap<
+		_,
+		Twox64Concat,
+		EraIndex,
+		Vec<UnappliedSlash<T::AccountId, BalanceOf<T>>>,
+		ValueQuery,
+	>;
+
+	/// A mapping from still-bonded eras to the first session index of that era.
+	///
+	/// Must contains information for eras for the range:
+	/// `[active_era - bounding_duration; active_era]`
+	#[pallet::storage]
+	pub(crate) type BondedEras<T: Config> =
+		StorageValue<_, Vec<(EraIndex, SessionIndex)>, ValueQuery>;
+
+	/// All slashing events on validators, mapped by era to the highest slash proportion
+	/// and slash value of the era.
+	#[pallet::storage]
+	pub(crate) type ValidatorSlashInEra<T: Config> = StorageDoubleMap<
+		_,
+		Twox64Concat,
+		EraIndex,
+		Twox64Concat,
+		T::AccountId,
+		(Perbill, BalanceOf<T>),
+	>;
+
+	/// All slashing events on nominators, mapped by era to the highest slash value of the era.
+	#[pallet::storage]
+	pub(crate) type NominatorSlashInEra<T: Config> =
+		StorageDoubleMap<_, Twox64Concat, EraIndex, Twox64Concat, T::AccountId, BalanceOf<T>>;
+
+	/// Slashing spans for stash accounts.
+	#[pallet::storage]
+	pub(crate) type SlashingSpans<T: Config> =
+		StorageMap<_, Twox64Concat, T::AccountId, slashing::SlashingSpans>;
+
+	/// Records information about the maximum slash of a stash within a slashing span,
+	/// as well as how much reward has been paid out.
+	#[pallet::storage]
+	pub(crate) type SpanSlash<T: Config> = StorageMap<
+		_,
+		Twox64Concat,
+		(T::AccountId, slashing::SpanIndex),
+		slashing::SpanRecord<BalanceOf<T>>,
+		ValueQuery,
+	>;
+
+	/// The earliest era for which we have a pending, unapplied slash.
+	#[pallet::storage]
+	pub(crate) type EarliestUnappliedSlash<T> = StorageValue<_, EraIndex>;
+
+	/// The last planned session scheduled by the session pallet.
+	///
+	/// This is basically in sync with the call to [`pallet_session::SessionManager::new_session`].
+	#[pallet::storage]
+	#[pallet::getter(fn current_planned_session)]
+	pub type CurrentPlannedSession<T> = StorageValue<_, SessionIndex, ValueQuery>;
+
+	/// True if network has been upgraded to this version.
+	/// Storage version of the pallet.
+	///
+	/// This is set to v7.0.0 for new networks.
+	#[pallet::storage]
+	pub(crate) type StorageVersion<T: Config> = StorageValue<_, Releases, ValueQuery>;
+
+	/// The threshold for when users can start calling `chill_other` for other validators / nominators.
+	/// The threshold is compared to the actual number of validators / nominators (`CountFor*`) in
+	/// the system compared to the configured max (`Max*Count`).
+	#[pallet::storage]
+	pub(crate) type ChillThreshold<T: Config> = StorageValue<_, Percent, OptionQuery>;
+
+	#[pallet::genesis_config]
+	pub struct GenesisConfig<T: Config> {
+		pub history_depth: u32,
+		pub validator_count: u32,
+		pub minimum_validator_count: u32,
+		pub invulnerables: Vec<T::AccountId>,
+		pub force_era: Forcing,
+		pub slash_reward_fraction: Perbill,
+		pub canceled_payout: BalanceOf<T>,
+		pub stakers: Vec<(T::AccountId, T::AccountId, BalanceOf<T>, StakerStatus<T::AccountId>)>,
+		pub min_nominator_bond: BalanceOf<T>,
+		pub min_validator_bond: BalanceOf<T>,
+	}
+
+	#[cfg(feature = "std")]
+	impl<T: Config> Default for GenesisConfig<T> {
+		fn default() -> Self {
+			GenesisConfig {
+				history_depth: 84u32,
+				validator_count: Default::default(),
+				minimum_validator_count: Default::default(),
+				invulnerables: Default::default(),
+				force_era: Default::default(),
+				slash_reward_fraction: Default::default(),
+				canceled_payout: Default::default(),
+				stakers: Default::default(),
+				min_nominator_bond: Default::default(),
+				min_validator_bond: Default::default(),
+			}
+		}
+	}
+
+	#[pallet::genesis_build]
+	impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+		fn build(&self) {
+			HistoryDepth::<T>::put(self.history_depth);
+			ValidatorCount::<T>::put(self.validator_count);
+			MinimumValidatorCount::<T>::put(self.minimum_validator_count);
+			Invulnerables::<T>::put(&self.invulnerables);
+			ForceEra::<T>::put(self.force_era);
+			CanceledSlashPayout::<T>::put(self.canceled_payout);
+			SlashRewardFraction::<T>::put(self.slash_reward_fraction);
+			StorageVersion::<T>::put(Releases::V7_0_0);
+			MinNominatorBond::<T>::put(self.min_nominator_bond);
+			MinValidatorBond::<T>::put(self.min_validator_bond);
+
+			for &(ref stash, ref controller, balance, ref status) in &self.stakers {
+				assert!(
+					T::Currency::free_balance(&stash) >= balance,
+					"Stash does not have enough balance to bond."
+				);
+				let _ = <Pallet<T>>::bond(
+					T::Origin::from(Some(stash.clone()).into()),
+					T::Lookup::unlookup(controller.clone()),
+					balance,
+					RewardDestination::Staked,
+				);
+				let _ = match status {
+					StakerStatus::Validator => <Pallet<T>>::validate(
+						T::Origin::from(Some(controller.clone()).into()),
+						Default::default(),
+					),
+					StakerStatus::Nominator(votes) => <Pallet<T>>::nominate(
+						T::Origin::from(Some(controller.clone()).into()),
+						votes.iter().map(|l| T::Lookup::unlookup(l.clone())).collect(),
+					),
+					_ => Ok(()),
+				};
+			}
+		}
+	}
+
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(crate) fn deposit_event)]
+	#[pallet::metadata(T::AccountId = "AccountId", BalanceOf<T> = "Balance")]
+	pub enum Event<T: Config> {
+		/// The era payout has been set; the first balance is the validator-payout; the second is
+		/// the remainder from the maximum amount of reward.
+		/// \[era_index, validator_payout, remainder\]
+		EraPayout(EraIndex, BalanceOf<T>, BalanceOf<T>),
+		/// The staker has been rewarded by this amount. \[stash, amount\]
+		Reward(T::AccountId, BalanceOf<T>),
+		/// One validator (and its nominators) has been slashed by the given amount.
+		/// \[validator, amount\]
+		Slash(T::AccountId, BalanceOf<T>),
+		/// An old slashing report from a prior era was discarded because it could
+		/// not be processed. \[session_index\]
+		OldSlashingReportDiscarded(SessionIndex),
+		/// A new set of stakers was elected.
+		StakingElection,
+		/// An account has bonded this amount. \[stash, amount\]
+		///
+		/// NOTE: This event is only emitted when funds are bonded via a dispatchable. Notably,
+		/// it will not be emitted for staking rewards when they are added to stake.
+		Bonded(T::AccountId, BalanceOf<T>),
+		/// An account has unbonded this amount. \[stash, amount\]
+		Unbonded(T::AccountId, BalanceOf<T>),
+		/// An account has called `withdraw_unbonded` and removed unbonding chunks worth `Balance`
+		/// from the unlocking queue. \[stash, amount\]
+		Withdrawn(T::AccountId, BalanceOf<T>),
+		/// A nominator has been kicked from a validator. \[nominator, stash\]
+		Kicked(T::AccountId, T::AccountId),
+		/// The election failed. No new era is planned.
+		StakingElectionFailed,
+		/// An account has stopped participating as either a validator or nominator.
+		/// \[stash\]
+		Chilled(T::AccountId),
+	}
+
+	#[pallet::error]
+	pub enum Error<T> {
+		/// Not a controller account.
+		NotController,
+		/// Not a stash account.
+		NotStash,
+		/// Stash is already bonded.
+		AlreadyBonded,
+		/// Controller is already paired.
+		AlreadyPaired,
+		/// Targets cannot be empty.
+		EmptyTargets,
+		/// Duplicate index.
+		DuplicateIndex,
+		/// Slash record index out of bounds.
+		InvalidSlashIndex,
+		/// Can not bond with value less than minimum required.
+		InsufficientBond,
+		/// Can not schedule more unlock chunks.
+		NoMoreChunks,
+		/// Can not rebond without unlocking chunks.
+		NoUnlockChunk,
+		/// Attempting to target a stash that still has funds.
+		FundedTarget,
+		/// Invalid era to reward.
+		InvalidEraToReward,
+		/// Invalid number of nominations.
+		InvalidNumberOfNominations,
+		/// Items are not sorted and unique.
+		NotSortedAndUnique,
+		/// Rewards for this era have already been claimed for this validator.
+		AlreadyClaimed,
+		/// Incorrect previous history depth input provided.
+		IncorrectHistoryDepth,
+		/// Incorrect number of slashing spans provided.
+		IncorrectSlashingSpans,
+		/// Internal state has become somehow corrupted and the operation cannot continue.
+		BadState,
+		/// Too many nomination targets supplied.
+		TooManyTargets,
+		/// A nomination target was supplied that was blocked or otherwise not a validator.
+		BadTarget,
+		/// The user has enough bond and thus cannot be chilled forcefully by an external person.
+		CannotChillOther,
+		/// There are too many nominators in the system. Governance needs to adjust the staking settings
+		/// to keep things safe for the runtime.
+		TooManyNominators,
+		/// There are too many validators in the system. Governance needs to adjust the staking settings
+		/// to keep things safe for the runtime.
+		TooManyValidators,
+	}
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+		fn on_runtime_upgrade() -> Weight {
+			if StorageVersion::<T>::get() == Releases::V6_0_0 {
+				migrations::v7::migrate::<T>()
+			} else {
+				T::DbWeight::get().reads(1)
+			}
+		}
+
+		#[cfg(feature = "try-runtime")]
+		fn pre_upgrade() -> Result<(), &'static str> {
+			if StorageVersion::<T>::get() == Releases::V6_0_0 {
+				migrations::v7::pre_migrate::<T>()
+			} else {
+				Ok(())
+			}
+		}
+
+		fn on_initialize(_now: BlockNumberFor<T>) -> Weight {
+			// just return the weight of the on_finalize.
+			T::DbWeight::get().reads(1)
+		}
+
+		fn on_finalize(_n: BlockNumberFor<T>) {
+			// Set the start of the first era.
+			if let Some(mut active_era) = Self::active_era() {
+				if active_era.start.is_none() {
+					let now_as_millis_u64 = T::UnixTime::now().as_millis().saturated_into::<u64>();
+					active_era.start = Some(now_as_millis_u64);
+					// This write only ever happens once, we don't include it in the weight in general
+					ActiveEra::<T>::put(active_era);
+				}
+			}
+			// `on_finalize` weight is tracked in `on_initialize`
+		}
+
+		fn integrity_test() {
+			sp_std::if_std! {
+				sp_io::TestExternalities::new_empty().execute_with(||
+					assert!(
+						T::SlashDeferDuration::get() < T::BondingDuration::get() || T::BondingDuration::get() == 0,
+						"As per documentation, slash defer duration ({}) should be less than bonding duration ({}).",
+						T::SlashDeferDuration::get(),
+						T::BondingDuration::get(),
+					)
+				);
+			}
+		}
+	}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		/// Take the origin account as a stash and lock up `value` of its balance. `controller` will
+		/// be the account that controls it.
+		///
+		/// `value` must be more than the `minimum_balance` specified by `T::Currency`.
+		///
+		/// The dispatch origin for this call must be _Signed_ by the stash account.
+		///
+		/// Emits `Bonded`.
+		/// # <weight>
+		/// - Independent of the arguments. Moderate complexity.
+		/// - O(1).
+		/// - Three extra DB entries.
+		///
+		/// NOTE: Two of the storage writes (`Self::bonded`, `Self::payee`) are _never_ cleaned
+		/// unless the `origin` falls below _existential deposit_ and gets removed as dust.
+		/// ------------------
+		/// # </weight>
+		#[pallet::weight(T::WeightInfo::bond())]
+		pub fn bond(
+			origin: OriginFor<T>,
+			controller: <T::Lookup as StaticLookup>::Source,
+			#[pallet::compact] value: BalanceOf<T>,
+			payee: RewardDestination<T::AccountId>,
+		) -> DispatchResult {
+			let stash = ensure_signed(origin)?;
+
+			if <Bonded<T>>::contains_key(&stash) {
+				Err(Error::<T>::AlreadyBonded)?
+			}
+
+			let controller = T::Lookup::lookup(controller)?;
+
+			if <Ledger<T>>::contains_key(&controller) {
+				Err(Error::<T>::AlreadyPaired)?
+			}
+
+			// Reject a bond which is considered to be _dust_.
+			if value < T::Currency::minimum_balance() {
+				Err(Error::<T>::InsufficientBond)?
+			}
+
+			frame_system::Pallet::<T>::inc_consumers(&stash).map_err(|_| Error::<T>::BadState)?;
+
+			// You're auto-bonded forever, here. We might improve this by only bonding when
+			// you actually validate/nominate and remove once you unbond __everything__.
+			<Bonded<T>>::insert(&stash, &controller);
+			<Payee<T>>::insert(&stash, payee);
+
+			let current_era = CurrentEra::<T>::get().unwrap_or(0);
+			let history_depth = Self::history_depth();
+			let last_reward_era = current_era.saturating_sub(history_depth);
+
+			let stash_balance = T::Currency::free_balance(&stash);
+			let value = value.min(stash_balance);
+			Self::deposit_event(Event::<T>::Bonded(stash.clone(), value));
+			let item = StakingLedger {
+				stash,
+				total: value,
+				active: value,
+				unlocking: vec![],
+				claimed_rewards: (last_reward_era..current_era).collect(),
+			};
+			Self::update_ledger(&controller, &item);
+			Ok(())
+		}
+
+		/// Add some extra amount that have appeared in the stash `free_balance` into the balance up
+		/// for staking.
+		///
+		/// The dispatch origin for this call must be _Signed_ by the stash, not the controller.
+		///
+		/// Use this if there are additional funds in your stash account that you wish to bond.
+		/// Unlike [`bond`](Self::bond) or [`unbond`](Self::unbond) this function does not impose any limitation
+		/// on the amount that can be added.
+		///
+		/// Emits `Bonded`.
+		///
+		/// # <weight>
+		/// - Independent of the arguments. Insignificant complexity.
+		/// - O(1).
+		/// # </weight>
+		#[pallet::weight(T::WeightInfo::bond_extra())]
+		pub fn bond_extra(
+			origin: OriginFor<T>,
+			#[pallet::compact] max_additional: BalanceOf<T>,
+		) -> DispatchResult {
+			let stash = ensure_signed(origin)?;
+
+			let controller = Self::bonded(&stash).ok_or(Error::<T>::NotStash)?;
+			let mut ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
+
+			let stash_balance = T::Currency::free_balance(&stash);
+			if let Some(extra) = stash_balance.checked_sub(&ledger.total) {
+				let extra = extra.min(max_additional);
+				ledger.total += extra;
+				ledger.active += extra;
+				// Last check: the new active amount of ledger must be more than ED.
+				ensure!(
+					ledger.active >= T::Currency::minimum_balance(),
+					Error::<T>::InsufficientBond
+				);
+
+				Self::deposit_event(Event::<T>::Bonded(stash, extra));
+				Self::update_ledger(&controller, &ledger);
+			}
+			Ok(())
+		}
+
+		/// Schedule a portion of the stash to be unlocked ready for transfer out after the bond
+		/// period ends. If this leaves an amount actively bonded less than
+		/// T::Currency::minimum_balance(), then it is increased to the full amount.
+		///
+		/// The dispatch origin for this call must be _Signed_ by the controller, not the stash.
+		///
+		/// Once the unlock period is done, you can call `withdraw_unbonded` to actually move
+		/// the funds out of management ready for transfer.
+		///
+		/// No more than a limited number of unlocking chunks (see `MAX_UNLOCKING_CHUNKS`)
+		/// can co-exists at the same time. In that case, [`Call::withdraw_unbonded`] need
+		/// to be called first to remove some of the chunks (if possible).
+		///
+		/// If a user encounters the `InsufficientBond` error when calling this extrinsic,
+		/// they should call `chill` first in order to free up their bonded funds.
+		///
+		/// Emits `Unbonded`.
+		///
+		/// See also [`Call::withdraw_unbonded`].
+		#[pallet::weight(T::WeightInfo::unbond())]
+		pub fn unbond(
+			origin: OriginFor<T>,
+			#[pallet::compact] value: BalanceOf<T>,
+		) -> DispatchResult {
+			let controller = ensure_signed(origin)?;
+			let mut ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
+			ensure!(ledger.unlocking.len() < MAX_UNLOCKING_CHUNKS, Error::<T>::NoMoreChunks,);
+
+			let mut value = value.min(ledger.active);
+
+			if !value.is_zero() {
+				ledger.active -= value;
+
+				// Avoid there being a dust balance left in the staking system.
+				if ledger.active < T::Currency::minimum_balance() {
+					value += ledger.active;
+					ledger.active = Zero::zero();
+				}
+
+				let min_active_bond = if Nominators::<T>::contains_key(&ledger.stash) {
+					MinNominatorBond::<T>::get()
+				} else if Validators::<T>::contains_key(&ledger.stash) {
+					MinValidatorBond::<T>::get()
+				} else {
+					Zero::zero()
+				};
+
+				// Make sure that the user maintains enough active bond for their role.
+				// If a user runs into this error, they should chill first.
+				ensure!(ledger.active >= min_active_bond, Error::<T>::InsufficientBond);
+
+				// Note: in case there is no current era it is fine to bond one era more.
+				let era = Self::current_era().unwrap_or(0) + T::BondingDuration::get();
+				ledger.unlocking.push(UnlockChunk { value, era });
+				Self::update_ledger(&controller, &ledger);
+				Self::deposit_event(Event::<T>::Unbonded(ledger.stash, value));
+			}
+			Ok(())
+		}
+
+		/// Remove any unlocked chunks from the `unlocking` queue from our management.
+		///
+		/// This essentially frees up that balance to be used by the stash account to do
+		/// whatever it wants.
+		///
+		/// The dispatch origin for this call must be _Signed_ by the controller.
+		///
+		/// Emits `Withdrawn`.
+		///
+		/// See also [`Call::unbond`].
+		///
+		/// # <weight>
+		/// Complexity O(S) where S is the number of slashing spans to remove
+		/// NOTE: Weight annotation is the kill scenario, we refund otherwise.
+		/// # </weight>
+		#[pallet::weight(T::WeightInfo::withdraw_unbonded_kill(*num_slashing_spans))]
+		pub fn withdraw_unbonded(
+			origin: OriginFor<T>,
+			num_slashing_spans: u32,
+		) -> DispatchResultWithPostInfo {
+			let controller = ensure_signed(origin)?;
+			let mut ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
+			let (stash, old_total) = (ledger.stash.clone(), ledger.total);
+			if let Some(current_era) = Self::current_era() {
+				ledger = ledger.consolidate_unlocked(current_era)
+			}
+
+			let post_info_weight =
+				if ledger.unlocking.is_empty() && ledger.active < T::Currency::minimum_balance() {
+					// This account must have called `unbond()` with some value that caused the active
+					// portion to fall below existential deposit + will have no more unlocking chunks
+					// left. We can now safely remove all staking-related information.
+					Self::kill_stash(&stash, num_slashing_spans)?;
+					// Remove the lock.
+					T::Currency::remove_lock(STAKING_ID, &stash);
+					// This is worst case scenario, so we use the full weight and return None
+					None
+				} else {
+					// This was the consequence of a partial unbond. just update the ledger and move on.
+					Self::update_ledger(&controller, &ledger);
+
+					// This is only an update, so we use less overall weight.
+					Some(T::WeightInfo::withdraw_unbonded_update(num_slashing_spans))
+				};
+
+			// `old_total` should never be less than the new total because
+			// `consolidate_unlocked` strictly subtracts balance.
+			if ledger.total < old_total {
+				// Already checked that this won't overflow by entry condition.
+				let value = old_total - ledger.total;
+				Self::deposit_event(Event::<T>::Withdrawn(stash, value));
+			}
+
+			Ok(post_info_weight.into())
+		}
+
+		/// Declare the desire to validate for the origin controller.
+		///
+		/// Effects will be felt at the beginning of the next era.
+		///
+		/// The dispatch origin for this call must be _Signed_ by the controller, not the stash.
+		#[pallet::weight(T::WeightInfo::validate())]
+		pub fn validate(origin: OriginFor<T>, prefs: ValidatorPrefs) -> DispatchResult {
+			let controller = ensure_signed(origin)?;
+
+			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
+			ensure!(ledger.active >= MinValidatorBond::<T>::get(), Error::<T>::InsufficientBond);
+			let stash = &ledger.stash;
+
+			// Only check limits if they are not already a validator.
+			if !Validators::<T>::contains_key(stash) {
+				// If this error is reached, we need to adjust the `MinValidatorBond` and start calling `chill_other`.
+				// Until then, we explicitly block new validators to protect the runtime.
+				if let Some(max_validators) = MaxValidatorsCount::<T>::get() {
+					ensure!(
+						CounterForValidators::<T>::get() < max_validators,
+						Error::<T>::TooManyValidators
+					);
+				}
+			}
+
+			Self::do_remove_nominator(stash);
+			Self::do_add_validator(stash, prefs);
+			Ok(())
+		}
+
+		/// Declare the desire to nominate `targets` for the origin controller.
+		///
+		/// Effects will be felt at the beginning of the next era.
+		///
+		/// The dispatch origin for this call must be _Signed_ by the controller, not the stash.
+		///
+		/// # <weight>
+		/// - The transaction's complexity is proportional to the size of `targets` (N)
+		/// which is capped at CompactAssignments::LIMIT (MAX_NOMINATIONS).
+		/// - Both the reads and writes follow a similar pattern.
+		/// # </weight>
+		#[pallet::weight(T::WeightInfo::nominate(targets.len() as u32))]
+		pub fn nominate(
+			origin: OriginFor<T>,
+			targets: Vec<<T::Lookup as StaticLookup>::Source>,
+		) -> DispatchResult {
+			let controller = ensure_signed(origin)?;
+
+			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
+			ensure!(ledger.active >= MinNominatorBond::<T>::get(), Error::<T>::InsufficientBond);
+			let stash = &ledger.stash;
+
+			// Only check limits if they are not already a nominator.
+			if !Nominators::<T>::contains_key(stash) {
+				// If this error is reached, we need to adjust the `MinNominatorBond` and start calling `chill_other`.
+				// Until then, we explicitly block new nominators to protect the runtime.
+				if let Some(max_nominators) = MaxNominatorsCount::<T>::get() {
+					ensure!(
+						CounterForNominators::<T>::get() < max_nominators,
+						Error::<T>::TooManyNominators
+					);
+				}
+			}
+
+			ensure!(!targets.is_empty(), Error::<T>::EmptyTargets);
+			ensure!(targets.len() <= T::MAX_NOMINATIONS as usize, Error::<T>::TooManyTargets);
+
+			let old = Nominators::<T>::get(stash).map_or_else(Vec::new, |x| x.targets);
+
+			let targets = targets
+				.into_iter()
+				.map(|t| T::Lookup::lookup(t).map_err(DispatchError::from))
+				.map(|n| {
+					n.and_then(|n| {
+						if old.contains(&n) || !Validators::<T>::get(&n).blocked {
+							Ok(n)
+						} else {
+							Err(Error::<T>::BadTarget.into())
+						}
+					})
+				})
+				.collect::<result::Result<Vec<T::AccountId>, _>>()?;
+
+			let nominations = Nominations {
+				targets,
+				// Initial nominations are considered submitted at era 0. See `Nominations` doc
+				submitted_in: Self::current_era().unwrap_or(0),
+				suppressed: false,
+			};
+
+			Self::do_remove_validator(stash);
+			Self::do_add_nominator(stash, nominations);
+			Ok(())
+		}
+
+		/// Declare no desire to either validate or nominate.
+		///
+		/// Effects will be felt at the beginning of the next era.
+		///
+		/// The dispatch origin for this call must be _Signed_ by the controller, not the stash.
+		///
+		/// # <weight>
+		/// - Independent of the arguments. Insignificant complexity.
+		/// - Contains one read.
+		/// - Writes are limited to the `origin` account key.
+		/// # </weight>
+		#[pallet::weight(T::WeightInfo::chill())]
+		pub fn chill(origin: OriginFor<T>) -> DispatchResult {
+			let controller = ensure_signed(origin)?;
+			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
+			Self::chill_stash(&ledger.stash);
+			Ok(())
+		}
+
+		/// (Re-)set the payment target for a controller.
+		///
+		/// Effects will be felt at the beginning of the next era.
+		///
+		/// The dispatch origin for this call must be _Signed_ by the controller, not the stash.
+		///
+		/// # <weight>
+		/// - Independent of the arguments. Insignificant complexity.
+		/// - Contains a limited number of reads.
+		/// - Writes are limited to the `origin` account key.
+		/// ---------
+		/// - Weight: O(1)
+		/// - DB Weight:
+		///     - Read: Ledger
+		///     - Write: Payee
+		/// # </weight>
+		#[pallet::weight(T::WeightInfo::set_payee())]
+		pub fn set_payee(
+			origin: OriginFor<T>,
+			payee: RewardDestination<T::AccountId>,
+		) -> DispatchResult {
+			let controller = ensure_signed(origin)?;
+			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
+			let stash = &ledger.stash;
+			<Payee<T>>::insert(stash, payee);
+			Ok(())
+		}
+
+		/// (Re-)set the controller of a stash.
+		///
+		/// Effects will be felt at the beginning of the next era.
+		///
+		/// The dispatch origin for this call must be _Signed_ by the stash, not the controller.
+		///
+		/// # <weight>
+		/// - Independent of the arguments. Insignificant complexity.
+		/// - Contains a limited number of reads.
+		/// - Writes are limited to the `origin` account key.
+		/// ----------
+		/// Weight: O(1)
+		/// DB Weight:
+		/// - Read: Bonded, Ledger New Controller, Ledger Old Controller
+		/// - Write: Bonded, Ledger New Controller, Ledger Old Controller
+		/// # </weight>
+		#[pallet::weight(T::WeightInfo::set_controller())]
+		pub fn set_controller(
+			origin: OriginFor<T>,
+			controller: <T::Lookup as StaticLookup>::Source,
+		) -> DispatchResult {
+			let stash = ensure_signed(origin)?;
+			let old_controller = Self::bonded(&stash).ok_or(Error::<T>::NotStash)?;
+			let controller = T::Lookup::lookup(controller)?;
+			if <Ledger<T>>::contains_key(&controller) {
+				Err(Error::<T>::AlreadyPaired)?
+			}
+			if controller != old_controller {
+				<Bonded<T>>::insert(&stash, &controller);
+				if let Some(l) = <Ledger<T>>::take(&old_controller) {
+					<Ledger<T>>::insert(&controller, l);
+				}
+			}
+			Ok(())
+		}
+
+		/// Sets the ideal number of validators.
+		///
+		/// The dispatch origin must be Root.
+		///
+		/// # <weight>
+		/// Weight: O(1)
+		/// Write: Validator Count
+		/// # </weight>
+		#[pallet::weight(T::WeightInfo::set_validator_count())]
+		pub fn set_validator_count(
+			origin: OriginFor<T>,
+			#[pallet::compact] new: u32,
+		) -> DispatchResult {
+			ensure_root(origin)?;
+			ValidatorCount::<T>::put(new);
+			Ok(())
+		}
+
+		/// Increments the ideal number of validators.
+		///
+		/// The dispatch origin must be Root.
+		///
+		/// # <weight>
+		/// Same as [`Self::set_validator_count`].
+		/// # </weight>
+		#[pallet::weight(T::WeightInfo::set_validator_count())]
+		pub fn increase_validator_count(
+			origin: OriginFor<T>,
+			#[pallet::compact] additional: u32,
+		) -> DispatchResult {
+			ensure_root(origin)?;
+			ValidatorCount::<T>::mutate(|n| *n += additional);
+			Ok(())
+		}
+
+		/// Scale up the ideal number of validators by a factor.
+		///
+		/// The dispatch origin must be Root.
+		///
+		/// # <weight>
+		/// Same as [`Self::set_validator_count`].
+		/// # </weight>
+		#[pallet::weight(T::WeightInfo::set_validator_count())]
+		pub fn scale_validator_count(origin: OriginFor<T>, factor: Percent) -> DispatchResult {
+			ensure_root(origin)?;
+			ValidatorCount::<T>::mutate(|n| *n += factor * *n);
+			Ok(())
+		}
+
+		/// Force there to be no new eras indefinitely.
+		///
+		/// The dispatch origin must be Root.
+		///
+		/// # Warning
+		///
+		/// The election process starts multiple blocks before the end of the era.
+		/// Thus the election process may be ongoing when this is called. In this case the
+		/// election will continue until the next era is triggered.
+		///
+		/// # <weight>
+		/// - No arguments.
+		/// - Weight: O(1)
+		/// - Write: ForceEra
+		/// # </weight>
+		#[pallet::weight(T::WeightInfo::force_no_eras())]
+		pub fn force_no_eras(origin: OriginFor<T>) -> DispatchResult {
+			ensure_root(origin)?;
+			ForceEra::<T>::put(Forcing::ForceNone);
+			Ok(())
+		}
+
+		/// Force there to be a new era at the end of the next session. After this, it will be
+		/// reset to normal (non-forced) behaviour.
+		///
+		/// The dispatch origin must be Root.
+		///
+		/// # Warning
+		///
+		/// The election process starts multiple blocks before the end of the era.
+		/// If this is called just before a new era is triggered, the election process may not
+		/// have enough blocks to get a result.
+		///
+		/// # <weight>
+		/// - No arguments.
+		/// - Weight: O(1)
+		/// - Write ForceEra
+		/// # </weight>
+		#[pallet::weight(T::WeightInfo::force_new_era())]
+		pub fn force_new_era(origin: OriginFor<T>) -> DispatchResult {
+			ensure_root(origin)?;
+			ForceEra::<T>::put(Forcing::ForceNew);
+			Ok(())
+		}
+
+		/// Set the validators who cannot be slashed (if any).
+		///
+		/// The dispatch origin must be Root.
+		///
+		/// # <weight>
+		/// - O(V)
+		/// - Write: Invulnerables
+		/// # </weight>
+		#[pallet::weight(T::WeightInfo::set_invulnerables(invulnerables.len() as u32))]
+		pub fn set_invulnerables(
+			origin: OriginFor<T>,
+			invulnerables: Vec<T::AccountId>,
+		) -> DispatchResult {
+			ensure_root(origin)?;
+			<Invulnerables<T>>::put(invulnerables);
+			Ok(())
+		}
+
+		/// Force a current staker to become completely unstaked, immediately.
+		///
+		/// The dispatch origin must be Root.
+		///
+		/// # <weight>
+		/// O(S) where S is the number of slashing spans to be removed
+		/// Reads: Bonded, Slashing Spans, Account, Locks
+		/// Writes: Bonded, Slashing Spans (if S > 0), Ledger, Payee, Validators, Nominators, Account, Locks
+		/// Writes Each: SpanSlash * S
+		/// # </weight>
+		#[pallet::weight(T::WeightInfo::force_unstake(*num_slashing_spans))]
+		pub fn force_unstake(
+			origin: OriginFor<T>,
+			stash: T::AccountId,
+			num_slashing_spans: u32,
+		) -> DispatchResult {
+			ensure_root(origin)?;
+
+			// Remove all staking-related information.
+			Self::kill_stash(&stash, num_slashing_spans)?;
+
+			// Remove the lock.
+			T::Currency::remove_lock(STAKING_ID, &stash);
+			Ok(())
+		}
+
+		/// Force there to be a new era at the end of sessions indefinitely.
+		///
+		/// The dispatch origin must be Root.
+		///
+		/// # Warning
+		///
+		/// The election process starts multiple blocks before the end of the era.
+		/// If this is called just before a new era is triggered, the election process may not
+		/// have enough blocks to get a result.
+		///
+		/// # <weight>
+		/// - Weight: O(1)
+		/// - Write: ForceEra
+		/// # </weight>
+		#[pallet::weight(T::WeightInfo::force_new_era_always())]
+		pub fn force_new_era_always(origin: OriginFor<T>) -> DispatchResult {
+			ensure_root(origin)?;
+			ForceEra::<T>::put(Forcing::ForceAlways);
+			Ok(())
+		}
+
+		/// Cancel enactment of a deferred slash.
+		///
+		/// Can be called by the `T::SlashCancelOrigin`.
+		///
+		/// Parameters: era and indices of the slashes for that era to kill.
+		///
+		/// # <weight>
+		/// Complexity: O(U + S)
+		/// with U unapplied slashes weighted with U=1000
+		/// and S is the number of slash indices to be canceled.
+		/// - Read: Unapplied Slashes
+		/// - Write: Unapplied Slashes
+		/// # </weight>
+		#[pallet::weight(T::WeightInfo::cancel_deferred_slash(slash_indices.len() as u32))]
+		pub fn cancel_deferred_slash(
+			origin: OriginFor<T>,
+			era: EraIndex,
+			slash_indices: Vec<u32>,
+		) -> DispatchResult {
+			T::SlashCancelOrigin::ensure_origin(origin)?;
+
+			ensure!(!slash_indices.is_empty(), Error::<T>::EmptyTargets);
+			ensure!(is_sorted_and_unique(&slash_indices), Error::<T>::NotSortedAndUnique);
+
+			let mut unapplied = <Self as Store>::UnappliedSlashes::get(&era);
+			let last_item = slash_indices[slash_indices.len() - 1];
+			ensure!((last_item as usize) < unapplied.len(), Error::<T>::InvalidSlashIndex);
+
+			for (removed, index) in slash_indices.into_iter().enumerate() {
+				let index = (index as usize) - removed;
+				unapplied.remove(index);
+			}
+
+			<Self as Store>::UnappliedSlashes::insert(&era, &unapplied);
+			Ok(())
+		}
+
+		/// Pay out all the stakers behind a single validator for a single era.
+		///
+		/// - `validator_stash` is the stash account of the validator. Their nominators, up to
+		///   `T::MaxNominatorRewardedPerValidator`, will also receive their rewards.
+		/// - `era` may be any era between `[current_era - history_depth; current_era]`.
+		///
+		/// The origin of this call must be _Signed_. Any account can call this function, even if
+		/// it is not one of the stakers.
+		///
+		/// # <weight>
+		/// - Time complexity: at most O(MaxNominatorRewardedPerValidator).
+		/// - Contains a limited number of reads and writes.
+		/// -----------
+		/// N is the Number of payouts for the validator (including the validator)
+		/// Weight:
+		/// - Reward Destination Staked: O(N)
+		/// - Reward Destination Controller (Creating): O(N)
+		///
+		///   NOTE: weights are assuming that payouts are made to alive stash account (Staked).
+		///   Paying even a dead controller is cheaper weight-wise. We don't do any refunds here.
+		/// # </weight>
+		#[pallet::weight(T::WeightInfo::payout_stakers_alive_staked(
+			T::MaxNominatorRewardedPerValidator::get()
+		))]
+		pub fn payout_stakers(
+			origin: OriginFor<T>,
+			validator_stash: T::AccountId,
+			era: EraIndex,
+		) -> DispatchResultWithPostInfo {
+			ensure_signed(origin)?;
+			Self::do_payout_stakers(validator_stash, era)
+		}
+
+		/// Rebond a portion of the stash scheduled to be unlocked.
+		///
+		/// The dispatch origin must be signed by the controller.
+		///
+		/// # <weight>
+		/// - Time complexity: O(L), where L is unlocking chunks
+		/// - Bounded by `MAX_UNLOCKING_CHUNKS`.
+		/// - Storage changes: Can't increase storage, only decrease it.
+		/// # </weight>
+		#[pallet::weight(T::WeightInfo::rebond(MAX_UNLOCKING_CHUNKS as u32))]
+		pub fn rebond(
+			origin: OriginFor<T>,
+			#[pallet::compact] value: BalanceOf<T>,
+		) -> DispatchResultWithPostInfo {
+			let controller = ensure_signed(origin)?;
+			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
+			ensure!(!ledger.unlocking.is_empty(), Error::<T>::NoUnlockChunk);
+
+			let ledger = ledger.rebond(value);
+			// Last check: the new active amount of ledger must be more than ED.
+			ensure!(ledger.active >= T::Currency::minimum_balance(), Error::<T>::InsufficientBond);
+
+			Self::deposit_event(Event::<T>::Bonded(ledger.stash.clone(), value));
+			Self::update_ledger(&controller, &ledger);
+			Ok(Some(
+				35 * WEIGHT_PER_MICROS +
+					50 * WEIGHT_PER_NANOS * (ledger.unlocking.len() as Weight) +
+					T::DbWeight::get().reads_writes(3, 2),
+			)
+			.into())
+		}
+
+		/// Set `HistoryDepth` value. This function will delete any history information
+		/// when `HistoryDepth` is reduced.
+		///
+		/// Parameters:
+		/// - `new_history_depth`: The new history depth you would like to set.
+		/// - `era_items_deleted`: The number of items that will be deleted by this dispatch.
+		///    This should report all the storage items that will be deleted by clearing old
+		///    era history. Needed to report an accurate weight for the dispatch. Trusted by
+		///    `Root` to report an accurate number.
+		///
+		/// Origin must be root.
+		///
+		/// # <weight>
+		/// - E: Number of history depths removed, i.e. 10 -> 7 = 3
+		/// - Weight: O(E)
+		/// - DB Weight:
+		///     - Reads: Current Era, History Depth
+		///     - Writes: History Depth
+		///     - Clear Prefix Each: Era Stakers, EraStakersClipped, ErasValidatorPrefs
+		///     - Writes Each: ErasValidatorReward, ErasRewardPoints, ErasTotalStake, ErasStartSessionIndex
+		/// # </weight>
+		#[pallet::weight(T::WeightInfo::set_history_depth(*_era_items_deleted))]
+		pub fn set_history_depth(
+			origin: OriginFor<T>,
+			#[pallet::compact] new_history_depth: EraIndex,
+			#[pallet::compact] _era_items_deleted: u32,
+		) -> DispatchResult {
+			ensure_root(origin)?;
+			if let Some(current_era) = Self::current_era() {
+				HistoryDepth::<T>::mutate(|history_depth| {
+					let last_kept = current_era.checked_sub(*history_depth).unwrap_or(0);
+					let new_last_kept = current_era.checked_sub(new_history_depth).unwrap_or(0);
+					for era_index in last_kept..new_last_kept {
+						Self::clear_era_information(era_index);
+					}
+					*history_depth = new_history_depth
+				})
+			}
+			Ok(())
+		}
+
+		/// Remove all data structure concerning a staker/stash once its balance is at the minimum.
+		/// This is essentially equivalent to `withdraw_unbonded` except it can be called by anyone
+		/// and the target `stash` must have no funds left beyond the ED.
+		///
+		/// This can be called from any origin.
+		///
+		/// - `stash`: The stash account to reap. Its balance must be zero.
+		///
+		/// # <weight>
+		/// Complexity: O(S) where S is the number of slashing spans on the account.
+		/// DB Weight:
+		/// - Reads: Stash Account, Bonded, Slashing Spans, Locks
+		/// - Writes: Bonded, Slashing Spans (if S > 0), Ledger, Payee, Validators, Nominators, Stash Account, Locks
+		/// - Writes Each: SpanSlash * S
+		/// # </weight>
+		#[pallet::weight(T::WeightInfo::reap_stash(*num_slashing_spans))]
+		pub fn reap_stash(
+			_origin: OriginFor<T>,
+			stash: T::AccountId,
+			num_slashing_spans: u32,
+		) -> DispatchResult {
+			let at_minimum = T::Currency::total_balance(&stash) == T::Currency::minimum_balance();
+			ensure!(at_minimum, Error::<T>::FundedTarget);
+			Self::kill_stash(&stash, num_slashing_spans)?;
+			T::Currency::remove_lock(STAKING_ID, &stash);
+			Ok(())
+		}
+
+		/// Remove the given nominations from the calling validator.
+		///
+		/// Effects will be felt at the beginning of the next era.
+		///
+		/// The dispatch origin for this call must be _Signed_ by the controller, not the stash.
+		///
+		/// - `who`: A list of nominator stash accounts who are nominating this validator which
+		///   should no longer be nominating this validator.
+		///
+		/// Note: Making this call only makes sense if you first set the validator preferences to
+		/// block any further nominations.
+		#[pallet::weight(T::WeightInfo::kick(who.len() as u32))]
+		pub fn kick(
+			origin: OriginFor<T>,
+			who: Vec<<T::Lookup as StaticLookup>::Source>,
+		) -> DispatchResult {
+			let controller = ensure_signed(origin)?;
+			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
+			let stash = &ledger.stash;
+
+			for nom_stash in who
+				.into_iter()
+				.map(T::Lookup::lookup)
+				.collect::<Result<Vec<T::AccountId>, _>>()?
+				.into_iter()
+			{
+				Nominators::<T>::mutate(&nom_stash, |maybe_nom| {
+					if let Some(ref mut nom) = maybe_nom {
+						if let Some(pos) = nom.targets.iter().position(|v| v == stash) {
+							nom.targets.swap_remove(pos);
+							Self::deposit_event(Event::<T>::Kicked(
+								nom_stash.clone(),
+								stash.clone(),
+							));
+						}
+					}
+				});
+			}
+
+			Ok(())
+		}
+
+		/// Update the various staking limits this pallet.
+		///
+		/// * `min_nominator_bond`: The minimum active bond needed to be a nominator.
+		/// * `min_validator_bond`: The minimum active bond needed to be a validator.
+		/// * `max_nominator_count`: The max number of users who can be a nominator at once.
+		///   When set to `None`, no limit is enforced.
+		/// * `max_validator_count`: The max number of users who can be a validator at once.
+		///   When set to `None`, no limit is enforced.
+		///
+		/// Origin must be Root to call this function.
+		///
+		/// NOTE: Existing nominators and validators will not be affected by this update.
+		/// to kick people under the new limits, `chill_other` should be called.
+		#[pallet::weight(T::WeightInfo::set_staking_limits())]
+		pub fn set_staking_limits(
+			origin: OriginFor<T>,
+			min_nominator_bond: BalanceOf<T>,
+			min_validator_bond: BalanceOf<T>,
+			max_nominator_count: Option<u32>,
+			max_validator_count: Option<u32>,
+			threshold: Option<Percent>,
+		) -> DispatchResult {
+			ensure_root(origin)?;
+			MinNominatorBond::<T>::set(min_nominator_bond);
+			MinValidatorBond::<T>::set(min_validator_bond);
+			MaxNominatorsCount::<T>::set(max_nominator_count);
+			MaxValidatorsCount::<T>::set(max_validator_count);
+			ChillThreshold::<T>::set(threshold);
+			Ok(())
+		}
+
+		/// Declare a `controller` to stop participating as either a validator or nominator.
+		///
+		/// Effects will be felt at the beginning of the next era.
+		///
+		/// The dispatch origin for this call must be _Signed_, but can be called by anyone.
+		///
+		/// If the caller is the same as the controller being targeted, then no further checks are
+		/// enforced, and this function behaves just like `chill`.
+		///
+		/// If the caller is different than the controller being targeted, the following conditions
+		/// must be met:
+		/// * A `ChillThreshold` must be set and checked which defines how close to the max
+		///   nominators or validators we must reach before users can start chilling one-another.
+		/// * A `MaxNominatorCount` and `MaxValidatorCount` must be set which is used to determine
+		///   how close we are to the threshold.
+		/// * A `MinNominatorBond` and `MinValidatorBond` must be set and checked, which determines
+		///   if this is a person that should be chilled because they have not met the threshold
+		///   bond required.
+		///
+		/// This can be helpful if bond requirements are updated, and we need to remove old users
+		/// who do not satisfy these requirements.
+		// TODO: Maybe we can deprecate `chill` in the future.
+		// https://github.com/paritytech/substrate/issues/9111
+		#[pallet::weight(T::WeightInfo::chill_other())]
+		pub fn chill_other(origin: OriginFor<T>, controller: T::AccountId) -> DispatchResult {
+			// Anyone can call this function.
+			let caller = ensure_signed(origin)?;
+			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
+			let stash = ledger.stash;
+
+			// In order for one user to chill another user, the following conditions must be met:
+			// * A `ChillThreshold` is set which defines how close to the max nominators or
+			//   validators we must reach before users can start chilling one-another.
+			// * A `MaxNominatorCount` and `MaxValidatorCount` which is used to determine how close
+			//   we are to the threshold.
+			// * A `MinNominatorBond` and `MinValidatorBond` which is the final condition checked to
+			//   determine this is a person that should be chilled because they have not met the
+			//   threshold bond required.
+			//
+			// Otherwise, if caller is the same as the controller, this is just like `chill`.
+			if caller != controller {
+				let threshold = ChillThreshold::<T>::get().ok_or(Error::<T>::CannotChillOther)?;
+				let min_active_bond = if Nominators::<T>::contains_key(&stash) {
+					let max_nominator_count =
+						MaxNominatorsCount::<T>::get().ok_or(Error::<T>::CannotChillOther)?;
+					let current_nominator_count = CounterForNominators::<T>::get();
+					ensure!(
+						threshold * max_nominator_count < current_nominator_count,
+						Error::<T>::CannotChillOther
+					);
+					MinNominatorBond::<T>::get()
+				} else if Validators::<T>::contains_key(&stash) {
+					let max_validator_count =
+						MaxValidatorsCount::<T>::get().ok_or(Error::<T>::CannotChillOther)?;
+					let current_validator_count = CounterForValidators::<T>::get();
+					ensure!(
+						threshold * max_validator_count < current_validator_count,
+						Error::<T>::CannotChillOther
+					);
+					MinValidatorBond::<T>::get()
+				} else {
+					Zero::zero()
+				};
+
+				ensure!(ledger.active < min_active_bond, Error::<T>::CannotChillOther);
+			}
+
+			Self::chill_stash(&stash);
+			Ok(())
+		}
+	}
+}
+
+/// Check that list is sorted and has no duplicates.
+fn is_sorted_and_unique(list: &[u32]) -> bool {
+	list.windows(2).all(|w| w[0] < w[1])
+}
diff --git a/frame/staking/src/slashing.rs b/frame/staking/src/slashing.rs
index 227043b656ee..332c9ffc3906 100644
--- a/frame/staking/src/slashing.rs
+++ b/frame/staking/src/slashing.rs
@@ -49,7 +49,7 @@
 //!
 //! Based on research at <https://w3f-research.readthedocs.io/en/latest/polkadot/slashing/npos.html>
 
-use super::{
+use crate::{
 	BalanceOf, Config, EraIndex, Error, Exposure, NegativeImbalanceOf, Pallet, Perbill,
 	SessionInterface, Store, UnappliedSlash,
 };
diff --git a/frame/staking/src/testing_utils.rs b/frame/staking/src/testing_utils.rs
index 0d9ae2c8e41a..795c066d09bb 100644
--- a/frame/staking/src/testing_utils.rs
+++ b/frame/staking/src/testing_utils.rs
@@ -27,6 +27,10 @@ use rand_chacha::{
 };
 use sp_io::hashing::blake2_256;
 
+use frame_support::{pallet_prelude::*, traits::Currency};
+use sp_runtime::{traits::StaticLookup, Perbill};
+use sp_std::prelude::*;
+
 const SEED: u32 = 0;
 
 /// This function removes all validators and nominators from storage.
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index e4fc2afc096c..69ce4e335f4b 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -18,10 +18,12 @@
 //! Tests for the module.
 
 use super::{Event, *};
-use frame_election_provider_support::Support;
+use frame_election_provider_support::{ElectionProvider, Support};
 use frame_support::{
 	assert_noop, assert_ok,
-	traits::{Currency, OnInitialize, ReservableCurrency},
+	dispatch::WithPostDispatchInfo,
+	pallet_prelude::*,
+	traits::{Currency, Get, OnInitialize, ReservableCurrency},
 	weights::{extract_actual_weight, GetDispatchInfo},
 };
 use mock::*;
@@ -29,8 +31,13 @@ use pallet_balances::Error as BalancesError;
 use sp_runtime::{
 	assert_eq_error_rate,
 	traits::{BadOrigin, Dispatchable},
+	Perbill, Percent,
 };
-use sp_staking::offence::OffenceDetails;
+use sp_staking::{
+	offence::{OffenceDetails, OnOffenceHandler},
+	SessionIndex,
+};
+use sp_std::prelude::*;
 use substrate_test_utils::assert_eq_uvec;
 
 #[test]

From 9454af80ae4a7d6877947ac76e2a944811a46d62 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Jul 2021 09:43:58 +0000
Subject: [PATCH 1032/1194] Bump proc-macro2 from 1.0.26 to 1.0.28 (#9451)

Bumps [proc-macro2](https://github.com/alexcrichton/proc-macro2) from 1.0.26 to 1.0.28.
- [Release notes](https://github.com/alexcrichton/proc-macro2/releases)
- [Commits](https://github.com/alexcrichton/proc-macro2/compare/1.0.26...1.0.28)

---
updated-dependencies:
- dependency-name: proc-macro2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                                         | 4 ++--
 client/chain-spec/derive/Cargo.toml                | 2 +-
 client/tracing/proc-macro/Cargo.toml               | 2 +-
 frame/staking/reward-curve/Cargo.toml              | 2 +-
 frame/support/procedural/Cargo.toml                | 2 +-
 frame/support/procedural/tools/Cargo.toml          | 2 +-
 frame/support/procedural/tools/derive/Cargo.toml   | 2 +-
 primitives/api/proc-macro/Cargo.toml               | 2 +-
 primitives/npos-elections/compact/Cargo.toml       | 2 +-
 primitives/runtime-interface/proc-macro/Cargo.toml | 2 +-
 primitives/version/proc-macro/Cargo.toml           | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b7e22d9d2cf3..10375d5024e6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6367,9 +6367,9 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.26"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec"
+checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612"
 dependencies = [
  "unicode-xid",
 ]
diff --git a/client/chain-spec/derive/Cargo.toml b/client/chain-spec/derive/Cargo.toml
index 6823c139dbe5..9fd4d34587fd 100644
--- a/client/chain-spec/derive/Cargo.toml
+++ b/client/chain-spec/derive/Cargo.toml
@@ -16,7 +16,7 @@ proc-macro = true
 
 [dependencies]
 proc-macro-crate = "1.0.0"
-proc-macro2 = "1.0.6"
+proc-macro2 = "1.0.28"
 quote = "1.0.3"
 syn = "1.0.58"
 
diff --git a/client/tracing/proc-macro/Cargo.toml b/client/tracing/proc-macro/Cargo.toml
index fbde99a1a217..f88baad132a7 100644
--- a/client/tracing/proc-macro/Cargo.toml
+++ b/client/tracing/proc-macro/Cargo.toml
@@ -16,6 +16,6 @@ proc-macro = true
 
 [dependencies]
 proc-macro-crate = "1.0.0"
-proc-macro2 = "1.0.6"
+proc-macro2 = "1.0.28"
 quote = { version = "1.0.3", features = ["proc-macro"] }
 syn = { version = "1.0.58", features = ["proc-macro", "full", "extra-traits", "parsing"] }
diff --git a/frame/staking/reward-curve/Cargo.toml b/frame/staking/reward-curve/Cargo.toml
index 3b4b9db452ba..035bc0a59c95 100644
--- a/frame/staking/reward-curve/Cargo.toml
+++ b/frame/staking/reward-curve/Cargo.toml
@@ -17,7 +17,7 @@ proc-macro = true
 [dependencies]
 syn = { version = "1.0.58", features = ["full", "visit"] }
 quote = "1.0.3"
-proc-macro2 = "1.0.6"
+proc-macro2 = "1.0.28"
 proc-macro-crate = "1.0.0"
 
 [dev-dependencies]
diff --git a/frame/support/procedural/Cargo.toml b/frame/support/procedural/Cargo.toml
index ba71a7d12c62..df57ccf2285b 100644
--- a/frame/support/procedural/Cargo.toml
+++ b/frame/support/procedural/Cargo.toml
@@ -16,7 +16,7 @@ proc-macro = true
 
 [dependencies]
 frame-support-procedural-tools = { version = "4.0.0-dev", path = "./tools" }
-proc-macro2 = "1.0.6"
+proc-macro2 = "1.0.28"
 quote = "1.0.3"
 Inflector = "0.11.4"
 syn = { version = "1.0.58", features = ["full"] }
diff --git a/frame/support/procedural/tools/Cargo.toml b/frame/support/procedural/tools/Cargo.toml
index 2ff49f96e4da..83b896acc8ec 100644
--- a/frame/support/procedural/tools/Cargo.toml
+++ b/frame/support/procedural/tools/Cargo.toml
@@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 frame-support-procedural-tools-derive = { version = "3.0.0", path = "./derive" }
-proc-macro2 = "1.0.6"
+proc-macro2 = "1.0.28"
 quote = "1.0.3"
 syn = { version = "1.0.58", features = ["full", "visit"] }
 proc-macro-crate = "1.0.0"
diff --git a/frame/support/procedural/tools/derive/Cargo.toml b/frame/support/procedural/tools/derive/Cargo.toml
index c377680af16f..349bbc8e8267 100644
--- a/frame/support/procedural/tools/derive/Cargo.toml
+++ b/frame/support/procedural/tools/derive/Cargo.toml
@@ -15,6 +15,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 proc-macro = true
 
 [dependencies]
-proc-macro2 = "1.0.6"
+proc-macro2 = "1.0.28"
 quote = { version = "1.0.3", features = ["proc-macro"] }
 syn = { version = "1.0.58", features = ["proc-macro" ,"full", "extra-traits", "parsing"] }
diff --git a/primitives/api/proc-macro/Cargo.toml b/primitives/api/proc-macro/Cargo.toml
index 2c47554aef42..045c848a2cdb 100644
--- a/primitives/api/proc-macro/Cargo.toml
+++ b/primitives/api/proc-macro/Cargo.toml
@@ -18,7 +18,7 @@ proc-macro = true
 [dependencies]
 quote = "1.0.3"
 syn = { version = "1.0.58", features = ["full", "fold", "extra-traits", "visit"] }
-proc-macro2 = "1.0.6"
+proc-macro2 = "1.0.28"
 blake2-rfc = { version = "0.2.18", default-features = false }
 proc-macro-crate = "1.0.0"
 
diff --git a/primitives/npos-elections/compact/Cargo.toml b/primitives/npos-elections/compact/Cargo.toml
index 2e8bd0e953d0..d90bdf373b4d 100644
--- a/primitives/npos-elections/compact/Cargo.toml
+++ b/primitives/npos-elections/compact/Cargo.toml
@@ -17,7 +17,7 @@ proc-macro = true
 [dependencies]
 syn = { version = "1.0.58", features = ["full", "visit"] }
 quote = "1.0"
-proc-macro2 = "1.0.6"
+proc-macro2 = "1.0.28"
 proc-macro-crate = "1.0.0"
 
 [dev-dependencies]
diff --git a/primitives/runtime-interface/proc-macro/Cargo.toml b/primitives/runtime-interface/proc-macro/Cargo.toml
index dcf8a4662b9c..869154e43f81 100644
--- a/primitives/runtime-interface/proc-macro/Cargo.toml
+++ b/primitives/runtime-interface/proc-macro/Cargo.toml
@@ -18,6 +18,6 @@ proc-macro = true
 [dependencies]
 syn = { version = "1.0.58", features = ["full", "visit", "fold", "extra-traits"] }
 quote = "1.0.3"
-proc-macro2 = "1.0.3"
+proc-macro2 = "1.0.28"
 Inflector = "0.11.4"
 proc-macro-crate = "1.0.0"
diff --git a/primitives/version/proc-macro/Cargo.toml b/primitives/version/proc-macro/Cargo.toml
index e394353e52a1..e27d26acc912 100644
--- a/primitives/version/proc-macro/Cargo.toml
+++ b/primitives/version/proc-macro/Cargo.toml
@@ -18,7 +18,7 @@ proc-macro = true
 [dependencies]
 quote = "1.0.3"
 syn = { version = "1.0.58", features = ["full", "fold", "extra-traits", "visit"] }
-proc-macro2 = "1.0.6"
+proc-macro2 = "1.0.28"
 proc-macro-crate = "1.0.0"
 codec = { package = "parity-scale-codec", version = "2.0.0", features = [ "derive" ] }
 

From ad48abf955fd84a9ed8de75feb0b0def7f957065 Mon Sep 17 00:00:00 2001
From: Alex Pozhylenkov <alex_pozhilenkov@adoriasoft.com>
Date: Wed, 28 Jul 2021 14:22:45 +0300
Subject: [PATCH 1033/1194] Round robin on_idle execution (#9432)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* update on_idle tuple implemenration

* add test

* fix

* fix fmt

* update

* update

* fix fmt

* Update frame/support/src/traits/hooks.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* update

* update

* fix pallet_ui tests

* Update frame/support/src/traits/hooks.rs

* fix

* Update frame/support/src/traits/hooks.rs

* update

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 frame/support/src/traits/hooks.rs             | 75 +++++++++++++++++--
 .../tests/pallet_ui/hooks_invalid_item.stderr |  4 +-
 2 files changed, 72 insertions(+), 7 deletions(-)

diff --git a/frame/support/src/traits/hooks.rs b/frame/support/src/traits/hooks.rs
index 45212c565039..965cce234288 100644
--- a/frame/support/src/traits/hooks.rs
+++ b/frame/support/src/traits/hooks.rs
@@ -19,7 +19,7 @@
 
 use impl_trait_for_tuples::impl_for_tuples;
 use sp_arithmetic::traits::Saturating;
-use sp_runtime::traits::MaybeSerializeDeserialize;
+use sp_runtime::traits::{AtLeast32BitUnsigned, MaybeSerializeDeserialize};
 
 /// The block initialization trait.
 ///
@@ -80,13 +80,22 @@ pub trait OnIdle<BlockNumber> {
 }
 
 #[impl_for_tuples(30)]
-impl<BlockNumber: Clone> OnIdle<BlockNumber> for Tuple {
+impl<BlockNumber: Copy + AtLeast32BitUnsigned> OnIdle<BlockNumber> for Tuple {
 	fn on_idle(n: BlockNumber, remaining_weight: crate::weights::Weight) -> crate::weights::Weight {
+		let on_idle_functions: &[fn(
+			BlockNumber,
+			crate::weights::Weight,
+		) -> crate::weights::Weight] = &[for_tuples!( #( Tuple::on_idle ),* )];
 		let mut weight = 0;
-		for_tuples!( #(
+		let len = on_idle_functions.len();
+		let start_index = n % (len as u32).into();
+		let start_index = start_index.try_into().ok().expect(
+			"`start_index % len` always fits into `usize`, because `len` can be in maximum `usize::MAX`; qed"
+		);
+		for on_idle in on_idle_functions.iter().cycle().skip(start_index).take(len) {
 			let adjusted_remaining_weight = remaining_weight.saturating_sub(weight);
-			weight = weight.saturating_add(Tuple::on_idle(n.clone(),  adjusted_remaining_weight));
-		)* );
+			weight = weight.saturating_add(on_idle(n, adjusted_remaining_weight));
+		}
 		weight
 	}
 }
@@ -341,4 +350,60 @@ mod tests {
 		assert_eq!(<(Test, Test)>::on_initialize(0), 20);
 		assert_eq!(<(Test, Test)>::on_runtime_upgrade(), 40);
 	}
+
+	#[test]
+	fn on_idle_round_robin_works() {
+		static mut ON_IDLE_INVOCATION_ORDER: sp_std::vec::Vec<&str> = sp_std::vec::Vec::new();
+
+		struct Test1;
+		struct Test2;
+		struct Test3;
+		type TestTuple = (Test1, Test2, Test3);
+		impl OnIdle<u32> for Test1 {
+			fn on_idle(_n: u32, _weight: crate::weights::Weight) -> crate::weights::Weight {
+				unsafe {
+					ON_IDLE_INVOCATION_ORDER.push("Test1");
+				}
+				0
+			}
+		}
+		impl OnIdle<u32> for Test2 {
+			fn on_idle(_n: u32, _weight: crate::weights::Weight) -> crate::weights::Weight {
+				unsafe {
+					ON_IDLE_INVOCATION_ORDER.push("Test2");
+				}
+				0
+			}
+		}
+		impl OnIdle<u32> for Test3 {
+			fn on_idle(_n: u32, _weight: crate::weights::Weight) -> crate::weights::Weight {
+				unsafe {
+					ON_IDLE_INVOCATION_ORDER.push("Test3");
+				}
+				0
+			}
+		}
+
+		unsafe {
+			TestTuple::on_idle(0, 0);
+			assert_eq!(ON_IDLE_INVOCATION_ORDER, ["Test1", "Test2", "Test3"].to_vec());
+			ON_IDLE_INVOCATION_ORDER.clear();
+
+			TestTuple::on_idle(1, 0);
+			assert_eq!(ON_IDLE_INVOCATION_ORDER, ["Test2", "Test3", "Test1"].to_vec());
+			ON_IDLE_INVOCATION_ORDER.clear();
+
+			TestTuple::on_idle(2, 0);
+			assert_eq!(ON_IDLE_INVOCATION_ORDER, ["Test3", "Test1", "Test2"].to_vec());
+			ON_IDLE_INVOCATION_ORDER.clear();
+
+			TestTuple::on_idle(3, 0);
+			assert_eq!(ON_IDLE_INVOCATION_ORDER, ["Test1", "Test2", "Test3"].to_vec());
+			ON_IDLE_INVOCATION_ORDER.clear();
+
+			TestTuple::on_idle(4, 0);
+			assert_eq!(ON_IDLE_INVOCATION_ORDER, ["Test2", "Test3", "Test1"].to_vec());
+			ON_IDLE_INVOCATION_ORDER.clear();
+		}
+	}
 }
diff --git a/frame/support/test/tests/pallet_ui/hooks_invalid_item.stderr b/frame/support/test/tests/pallet_ui/hooks_invalid_item.stderr
index 23651faa59d5..f3677113dabe 100644
--- a/frame/support/test/tests/pallet_ui/hooks_invalid_item.stderr
+++ b/frame/support/test/tests/pallet_ui/hooks_invalid_item.stderr
@@ -5,9 +5,9 @@ error[E0107]: missing generics for trait `Hooks`
     |                     ^^^^^ expected 1 type argument
     |
 note: trait defined here, with 1 type parameter: `BlockNumber`
-   --> $DIR/hooks.rs:212:11
+   --> $DIR/hooks.rs:221:11
     |
-212 | pub trait Hooks<BlockNumber> {
+221 | pub trait Hooks<BlockNumber> {
     |           ^^^^^ -----------
 help: use angle brackets to add missing type argument
     |

From a1a5cd345d6d54ba2da72f906c64c121df8fe2e2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Jul 2021 11:23:36 +0000
Subject: [PATCH 1034/1194] Bump walkdir from 2.3.1 to 2.3.2 (#9453)

Bumps [walkdir](https://github.com/BurntSushi/walkdir) from 2.3.1 to 2.3.2.
- [Release notes](https://github.com/BurntSushi/walkdir/releases)
- [Commits](https://github.com/BurntSushi/walkdir/compare/2.3.1...2.3.2)

---
updated-dependencies:
- dependency-name: walkdir
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                    | 4 ++--
 utils/wasm-builder/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 10375d5024e6..fd6b57918b31 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10890,9 +10890,9 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
 
 [[package]]
 name = "walkdir"
-version = "2.3.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
+checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
 dependencies = [
  "same-file",
  "winapi 0.3.9",
diff --git a/utils/wasm-builder/Cargo.toml b/utils/wasm-builder/Cargo.toml
index 0b0182b4302a..5c0c9c19dfac 100644
--- a/utils/wasm-builder/Cargo.toml
+++ b/utils/wasm-builder/Cargo.toml
@@ -17,7 +17,7 @@ build-helper = "0.1.1"
 cargo_metadata = "0.13.1"
 tempfile = "3.1.0"
 toml = "0.5.4"
-walkdir = "2.3.1"
+walkdir = "2.3.2"
 wasm-gc-api = "0.1.11"
 atty = "0.2.13"
 ansi_term = "0.12.1"

From 8313e30a1ce75794e102fead69fe817e9c1d3851 Mon Sep 17 00:00:00 2001
From: Dan Forbes <dan@danforbes.dev>
Date: Wed, 28 Jul 2021 06:39:04 -0700
Subject: [PATCH 1035/1194] Add nonfungibles::Create Trait & Implement for
 Uniques (#9438)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add nonfungibles::Create Trait & Implement for Uniques

Closes #9419

* Formatting

* Remove default implementation (`TokenError::Unsupported`) from `Create` trait

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Formatting

* Do not wrap parameters in Options

* Formatting

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 .../support/src/traits/tokens/nonfungibles.rs |  6 +++
 frame/uniques/src/functions.rs                | 32 +++++++++++
 frame/uniques/src/impl_nonfungibles.rs        | 23 +++++++-
 frame/uniques/src/lib.rs                      | 53 +++++--------------
 4 files changed, 74 insertions(+), 40 deletions(-)

diff --git a/frame/support/src/traits/tokens/nonfungibles.rs b/frame/support/src/traits/tokens/nonfungibles.rs
index 64bbf3a8edf7..452ee2212d62 100644
--- a/frame/support/src/traits/tokens/nonfungibles.rs
+++ b/frame/support/src/traits/tokens/nonfungibles.rs
@@ -117,6 +117,12 @@ pub trait InspectEnumerable<AccountId>: Inspect<AccountId> {
 	) -> Box<dyn Iterator<Item = Self::InstanceId>>;
 }
 
+/// Trait for providing the ability to create classes of nonfungible assets.
+pub trait Create<AccountId>: Inspect<AccountId> {
+	/// Create a `class` of nonfungible assets to be owned by `who` and managed by `admin`.
+	fn create_class(class: &Self::ClassId, who: &AccountId, admin: &AccountId) -> DispatchResult;
+}
+
 /// Trait for providing an interface for multiple classes of NFT-like assets which may be minted,
 /// burned and/or have attributes set on them.
 pub trait Mutate<AccountId>: Inspect<AccountId> {
diff --git a/frame/uniques/src/functions.rs b/frame/uniques/src/functions.rs
index 5d1e75735752..a878a4910f76 100644
--- a/frame/uniques/src/functions.rs
+++ b/frame/uniques/src/functions.rs
@@ -48,6 +48,38 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		Ok(())
 	}
 
+	pub(super) fn do_create_class(
+		class: T::ClassId,
+		owner: T::AccountId,
+		admin: T::AccountId,
+		deposit: DepositBalanceOf<T, I>,
+		free_holding: bool,
+		event: Event<T, I>,
+	) -> DispatchResult {
+		ensure!(!Class::<T, I>::contains_key(class), Error::<T, I>::InUse);
+
+		T::Currency::reserve(&owner, deposit)?;
+
+		Class::<T, I>::insert(
+			class,
+			ClassDetails {
+				owner: owner.clone(),
+				issuer: admin.clone(),
+				admin: admin.clone(),
+				freezer: admin.clone(),
+				total_deposit: deposit,
+				free_holding,
+				instances: 0,
+				instance_metadatas: 0,
+				attributes: 0,
+				is_frozen: false,
+			},
+		);
+
+		Self::deposit_event(event);
+		Ok(())
+	}
+
 	pub(super) fn do_mint(
 		class: T::ClassId,
 		instance: T::InstanceId,
diff --git a/frame/uniques/src/impl_nonfungibles.rs b/frame/uniques/src/impl_nonfungibles.rs
index fb1e28d4c77b..c5d5c6089f86 100644
--- a/frame/uniques/src/impl_nonfungibles.rs
+++ b/frame/uniques/src/impl_nonfungibles.rs
@@ -19,7 +19,10 @@
 
 use super::*;
 use frame_support::{
-	traits::tokens::nonfungibles::{Inspect, InspectEnumerable, Mutate, Transfer},
+	traits::{
+		tokens::nonfungibles::{Create, Inspect, InspectEnumerable, Mutate, Transfer},
+		Get,
+	},
 	BoundedSlice,
 };
 use sp_runtime::DispatchResult;
@@ -85,6 +88,24 @@ impl<T: Config<I>, I: 'static> Inspect<<T as SystemConfig>::AccountId> for Palle
 	}
 }
 
+impl<T: Config<I>, I: 'static> Create<<T as SystemConfig>::AccountId> for Pallet<T, I> {
+	/// Create a `class` of nonfungible assets to be owned by `who` and managed by `admin`.
+	fn create_class(
+		class: &Self::ClassId,
+		who: &T::AccountId,
+		admin: &T::AccountId,
+	) -> DispatchResult {
+		Self::do_create_class(
+			class.clone(),
+			who.clone(),
+			admin.clone(),
+			T::ClassDeposit::get(),
+			false,
+			Event::Created(class.clone(), who.clone(), admin.clone()),
+		)
+	}
+}
+
 impl<T: Config<I>, I: 'static> Mutate<<T as SystemConfig>::AccountId> for Pallet<T, I> {
 	fn mint_into(
 		class: &Self::ClassId,
diff --git a/frame/uniques/src/lib.rs b/frame/uniques/src/lib.rs
index d42b2ec55c96..ee052486b03a 100644
--- a/frame/uniques/src/lib.rs
+++ b/frame/uniques/src/lib.rs
@@ -316,28 +316,14 @@ pub mod pallet {
 			let owner = ensure_signed(origin)?;
 			let admin = T::Lookup::lookup(admin)?;
 
-			ensure!(!Class::<T, I>::contains_key(class), Error::<T, I>::InUse);
-
-			let deposit = T::ClassDeposit::get();
-			T::Currency::reserve(&owner, deposit)?;
-
-			Class::<T, I>::insert(
+			Self::do_create_class(
 				class,
-				ClassDetails {
-					owner: owner.clone(),
-					issuer: admin.clone(),
-					admin: admin.clone(),
-					freezer: admin.clone(),
-					total_deposit: deposit,
-					free_holding: false,
-					instances: 0,
-					instance_metadatas: 0,
-					attributes: 0,
-					is_frozen: false,
-				},
-			);
-			Self::deposit_event(Event::Created(class, owner, admin));
-			Ok(())
+				owner.clone(),
+				admin.clone(),
+				T::ClassDeposit::get(),
+				false,
+				Event::Created(class, owner, admin),
+			)
 		}
 
 		/// Issue a new class of non-fungible assets from a privileged origin.
@@ -366,25 +352,14 @@ pub mod pallet {
 			T::ForceOrigin::ensure_origin(origin)?;
 			let owner = T::Lookup::lookup(owner)?;
 
-			ensure!(!Class::<T, I>::contains_key(class), Error::<T, I>::InUse);
-
-			Class::<T, I>::insert(
+			Self::do_create_class(
 				class,
-				ClassDetails {
-					owner: owner.clone(),
-					issuer: owner.clone(),
-					admin: owner.clone(),
-					freezer: owner.clone(),
-					total_deposit: Zero::zero(),
-					free_holding,
-					instances: 0,
-					instance_metadatas: 0,
-					attributes: 0,
-					is_frozen: false,
-				},
-			);
-			Self::deposit_event(Event::ForceCreated(class, owner));
-			Ok(())
+				owner.clone(),
+				owner.clone(),
+				Zero::zero(),
+				free_holding,
+				Event::ForceCreated(class, owner),
+			)
 		}
 
 		/// Destroy a class of fungible assets.

From 22632d530b075c13a24fe92c57bcccc28075657b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Thu, 29 Jul 2021 11:43:03 +0200
Subject: [PATCH 1036/1194] Improve `state` related logs to use a more uniform
 format (#9452)

* Improve `state` related logs to use a more uniform format

The logging before wasn't that uniform and not that great to read/parse.
Now we are using a uniform format for all the logs. Besides these
changes, there are some minor changes around the code that calls the
state machine.

* Make CI happy

* Use HexDisplay for `ext_id`
---
 client/api/src/call_executor.rs            |  30 +--
 client/light/src/call_executor.rs          |  78 +++-----
 client/light/src/fetcher.rs                |  42 ++---
 client/light/src/lib.rs                    |   2 +-
 client/service/src/client/call_executor.rs |  50 +++--
 client/service/src/client/client.rs        |   6 +-
 client/service/test/src/client/light.rs    |  12 +-
 primitives/state-machine/src/ext.rs        | 208 +++++++++++++--------
 primitives/state-machine/src/lib.rs        |  44 +++--
 9 files changed, 249 insertions(+), 223 deletions(-)

diff --git a/client/api/src/call_executor.rs b/client/api/src/call_executor.rs
index 2d19c9fe3504..a19df7432606 100644
--- a/client/api/src/call_executor.rs
+++ b/client/api/src/call_executor.rs
@@ -22,10 +22,7 @@ use codec::{Decode, Encode};
 use sc_executor::{NativeVersion, RuntimeVersion};
 use sp_core::NativeOrEncoded;
 use sp_externalities::Extensions;
-use sp_runtime::{
-	generic::BlockId,
-	traits::{Block as BlockT, HashFor},
-};
+use sp_runtime::{generic::BlockId, traits::Block as BlockT};
 use sp_state_machine::{ExecutionManager, ExecutionStrategy, OverlayedChanges, StorageProof};
 use std::{cell::RefCell, panic::UnwindSafe, result};
 
@@ -100,31 +97,12 @@ pub trait CallExecutor<B: BlockT> {
 	/// No changes are made.
 	fn runtime_version(&self, id: &BlockId<B>) -> Result<RuntimeVersion, sp_blockchain::Error>;
 
-	/// Execute a call to a contract on top of given state, gathering execution proof.
+	/// Prove the execution of the given `method`.
 	///
 	/// No changes are made.
-	fn prove_at_state<S: sp_state_machine::Backend<HashFor<B>>>(
+	fn prove_execution(
 		&self,
-		mut state: S,
-		overlay: &mut OverlayedChanges,
-		method: &str,
-		call_data: &[u8],
-	) -> Result<(Vec<u8>, StorageProof), sp_blockchain::Error> {
-		let trie_state = state.as_trie_backend().ok_or_else(|| {
-			sp_blockchain::Error::from_state(Box::new(
-				sp_state_machine::ExecutionError::UnableToGenerateProof,
-			) as Box<_>)
-		})?;
-		self.prove_at_trie_state(trie_state, overlay, method, call_data)
-	}
-
-	/// Execute a call to a contract on top of given trie state, gathering execution proof.
-	///
-	/// No changes are made.
-	fn prove_at_trie_state<S: sp_state_machine::TrieBackendStorage<HashFor<B>>>(
-		&self,
-		trie_state: &sp_state_machine::TrieBackend<S, HashFor<B>>,
-		overlay: &mut OverlayedChanges,
+		at: &BlockId<B>,
 		method: &str,
 		call_data: &[u8],
 	) -> Result<(Vec<u8>, StorageProof), sp_blockchain::Error>;
diff --git a/client/light/src/call_executor.rs b/client/light/src/call_executor.rs
index f666d8363127..144e0cbf96dc 100644
--- a/client/light/src/call_executor.rs
+++ b/client/light/src/call_executor.rs
@@ -30,11 +30,11 @@ use sp_core::{
 use sp_externalities::Extensions;
 use sp_runtime::{
 	generic::BlockId,
-	traits::{Block as BlockT, HashFor, Header as HeaderT},
+	traits::{Block as BlockT, Header as HeaderT},
 };
 use sp_state_machine::{
-	self, create_proof_check_backend, execution_proof_check_on_trie_backend,
-	Backend as StateBackend, ExecutionManager, ExecutionStrategy, OverlayedChanges, StorageProof,
+	create_proof_check_backend, execution_proof_check_on_trie_backend, ExecutionManager,
+	ExecutionStrategy, OverlayedChanges, StorageProof,
 };
 
 use sp_api::{ProofRecorder, StorageTransactionCache};
@@ -85,9 +85,10 @@ where
 		strategy: ExecutionStrategy,
 		extensions: Option<Extensions>,
 	) -> ClientResult<Vec<u8>> {
-		match self.backend.is_local_state_available(id) {
-			true => self.local.call(id, method, call_data, strategy, extensions),
-			false => Err(ClientError::NotAvailableOnLightClient),
+		if self.backend.is_local_state_available(id) {
+			self.local.call(id, method, call_data, strategy, extensions)
+		} else {
+			Err(ClientError::NotAvailableOnLightClient)
 		}
 	}
 
@@ -116,8 +117,8 @@ where
 		// there's no actual way/need to specify native/wasm execution strategy on light node
 		// => we can safely ignore passed values
 
-		match self.backend.is_local_state_available(at) {
-			true => CallExecutor::contextual_call::<
+		if self.backend.is_local_state_available(at) {
+			CallExecutor::contextual_call::<
 				fn(
 					Result<NativeOrEncoded<R>, Local::Error>,
 					Result<NativeOrEncoded<R>, Local::Error>,
@@ -136,26 +137,30 @@ where
 				recorder,
 				extensions,
 			)
-			.map_err(|e| ClientError::Execution(Box::new(e.to_string()))),
-			false => Err(ClientError::NotAvailableOnLightClient),
+		} else {
+			Err(ClientError::NotAvailableOnLightClient)
 		}
 	}
 
-	fn runtime_version(&self, id: &BlockId<Block>) -> ClientResult<RuntimeVersion> {
-		match self.backend.is_local_state_available(id) {
-			true => self.local.runtime_version(id),
-			false => Err(ClientError::NotAvailableOnLightClient),
+	fn prove_execution(
+		&self,
+		at: &BlockId<Block>,
+		method: &str,
+		call_data: &[u8],
+	) -> ClientResult<(Vec<u8>, StorageProof)> {
+		if self.backend.is_local_state_available(at) {
+			self.local.prove_execution(at, method, call_data)
+		} else {
+			Err(ClientError::NotAvailableOnLightClient)
 		}
 	}
 
-	fn prove_at_trie_state<S: sp_state_machine::TrieBackendStorage<HashFor<Block>>>(
-		&self,
-		_state: &sp_state_machine::TrieBackend<S, HashFor<Block>>,
-		_changes: &mut OverlayedChanges,
-		_method: &str,
-		_call_data: &[u8],
-	) -> ClientResult<(Vec<u8>, StorageProof)> {
-		Err(ClientError::NotAvailableOnLightClient)
+	fn runtime_version(&self, id: &BlockId<Block>) -> ClientResult<RuntimeVersion> {
+		if self.backend.is_local_state_available(id) {
+			self.local.runtime_version(id)
+		} else {
+			Err(ClientError::NotAvailableOnLightClient)
+		}
 	}
 
 	fn native_runtime_version(&self) -> Option<&NativeVersion> {
@@ -163,33 +168,6 @@ where
 	}
 }
 
-/// Prove contextual execution using given block header in environment.
-///
-/// Method is executed using passed header as environment' current block.
-/// Proof includes both environment preparation proof and method execution proof.
-pub fn prove_execution<Block, S, E>(
-	mut state: S,
-	executor: &E,
-	method: &str,
-	call_data: &[u8],
-) -> ClientResult<(Vec<u8>, StorageProof)>
-where
-	Block: BlockT,
-	S: StateBackend<HashFor<Block>>,
-	E: CallExecutor<Block>,
-{
-	let trie_state = state.as_trie_backend().ok_or_else(|| {
-		Box::new(sp_state_machine::ExecutionError::UnableToGenerateProof)
-			as Box<dyn sp_state_machine::Error>
-	})?;
-
-	// execute method + record execution proof
-	let (result, exec_proof) =
-		executor.prove_at_trie_state(&trie_state, &mut Default::default(), method, call_data)?;
-
-	Ok((result, exec_proof))
-}
-
 /// Check remote contextual execution proof using given backend.
 ///
 /// Proof should include the method execution proof.
@@ -200,7 +178,7 @@ pub fn check_execution_proof<Header, E, H>(
 	remote_proof: StorageProof,
 ) -> ClientResult<Vec<u8>>
 where
-	Header: HeaderT,
+	Header: HeaderT<Hash = H::Out>,
 	E: CodeExecutor + Clone + 'static,
 	H: Hasher,
 	H::Out: Ord + codec::Codec + 'static,
diff --git a/client/light/src/fetcher.rs b/client/light/src/fetcher.rs
index fcdc7ad7ba59..5740e407a5e8 100644
--- a/client/light/src/fetcher.rs
+++ b/client/light/src/fetcher.rs
@@ -53,21 +53,21 @@ pub use sc_client_api::{
 };
 
 /// Remote data checker.
-pub struct LightDataChecker<E, H, B: BlockT, S: BlockchainStorage<B>> {
+pub struct LightDataChecker<E, B: BlockT, S: BlockchainStorage<B>> {
 	blockchain: Arc<Blockchain<S>>,
 	executor: E,
 	spawn_handle: Box<dyn SpawnNamed>,
-	_hasher: PhantomData<(B, H)>,
+	_marker: PhantomData<B>,
 }
 
-impl<E, H, B: BlockT, S: BlockchainStorage<B>> LightDataChecker<E, H, B, S> {
+impl<E, B: BlockT, S: BlockchainStorage<B>> LightDataChecker<E, B, S> {
 	/// Create new light data checker.
 	pub fn new(
 		blockchain: Arc<Blockchain<S>>,
 		executor: E,
 		spawn_handle: Box<dyn SpawnNamed>,
 	) -> Self {
-		Self { blockchain, executor, spawn_handle, _hasher: PhantomData }
+		Self { blockchain, executor, spawn_handle, _marker: PhantomData }
 	}
 
 	/// Check remote changes query proof assuming that CHT-s are of given size.
@@ -76,11 +76,7 @@ impl<E, H, B: BlockT, S: BlockchainStorage<B>> LightDataChecker<E, H, B, S> {
 		request: &RemoteChangesRequest<B::Header>,
 		remote_proof: ChangesProof<B::Header>,
 		cht_size: NumberFor<B>,
-	) -> ClientResult<Vec<(NumberFor<B>, u32)>>
-	where
-		H: Hasher,
-		H::Out: Ord + codec::Codec,
-	{
+	) -> ClientResult<Vec<(NumberFor<B>, u32)>> {
 		// since we need roots of all changes tries for the range begin..max
 		// => remote node can't use max block greater that one that we have passed
 		if remote_proof.max_block > request.max_block.0 ||
@@ -135,7 +131,7 @@ impl<E, H, B: BlockT, S: BlockchainStorage<B>> LightDataChecker<E, H, B, S> {
 		let mut result = Vec::new();
 		let proof_storage = InMemoryChangesTrieStorage::with_proof(remote_proof);
 		for config_range in &request.changes_trie_configs {
-			let result_range = key_changes_proof_check_with_db::<H, _>(
+			let result_range = key_changes_proof_check_with_db::<HashFor<B>, _>(
 				ChangesTrieConfigurationRange {
 					config: config_range
 						.config
@@ -171,11 +167,7 @@ impl<E, H, B: BlockT, S: BlockchainStorage<B>> LightDataChecker<E, H, B, S> {
 		cht_size: NumberFor<B>,
 		remote_roots: &BTreeMap<NumberFor<B>, B::Hash>,
 		remote_roots_proof: StorageProof,
-	) -> ClientResult<()>
-	where
-		H: Hasher,
-		H::Out: Ord + codec::Codec,
-	{
+	) -> ClientResult<()> {
 		// all the checks are sharing the same storage
 		let storage = remote_roots_proof.into_memory_db();
 
@@ -204,16 +196,14 @@ impl<E, H, B: BlockT, S: BlockchainStorage<B>> LightDataChecker<E, H, B, S> {
 					// check if the proofs storage contains the root
 					// normally this happens in when the proving backend is created, but since
 					// we share the storage for multiple checks, do it here
-					let mut cht_root = H::Out::default();
-					cht_root.as_mut().copy_from_slice(local_cht_root.as_ref());
-					if !storage.contains(&cht_root, EMPTY_PREFIX) {
+					if !storage.contains(&local_cht_root, EMPTY_PREFIX) {
 						return Err(ClientError::InvalidCHTProof.into())
 					}
 
 					// check proof for single changes trie root
-					let proving_backend = TrieBackend::new(storage, cht_root);
+					let proving_backend = TrieBackend::new(storage, local_cht_root);
 					let remote_changes_trie_root = remote_roots[&block];
-					cht::check_proof_on_proving_backend::<B::Header, H>(
+					cht::check_proof_on_proving_backend::<B::Header, HashFor<B>>(
 						local_cht_root,
 						block,
 						remote_changes_trie_root,
@@ -231,12 +221,10 @@ impl<E, H, B: BlockT, S: BlockchainStorage<B>> LightDataChecker<E, H, B, S> {
 	}
 }
 
-impl<E, Block, H, S> FetchChecker<Block> for LightDataChecker<E, H, Block, S>
+impl<E, Block, S> FetchChecker<Block> for LightDataChecker<E, Block, S>
 where
 	Block: BlockT,
 	E: CodeExecutor + Clone + 'static,
-	H: Hasher,
-	H::Out: Ord + codec::Codec + 'static,
 	S: BlockchainStorage<Block>,
 {
 	fn check_header_proof(
@@ -248,7 +236,7 @@ where
 		let remote_header =
 			remote_header.ok_or_else(|| ClientError::from(ClientError::InvalidCHTProof))?;
 		let remote_header_hash = remote_header.hash();
-		cht::check_proof::<Block::Header, H>(
+		cht::check_proof::<Block::Header, HashFor<Block>>(
 			request.cht_root,
 			request.block,
 			remote_header_hash,
@@ -262,7 +250,7 @@ where
 		request: &RemoteReadRequest<Block::Header>,
 		remote_proof: StorageProof,
 	) -> ClientResult<HashMap<Vec<u8>, Option<Vec<u8>>>> {
-		read_proof_check::<H, _>(
+		read_proof_check::<HashFor<Block>, _>(
 			convert_hash(request.header.state_root()),
 			remote_proof,
 			request.keys.iter(),
@@ -279,7 +267,7 @@ where
 			Some((ChildType::ParentKeyId, storage_key)) => ChildInfo::new_default(storage_key),
 			None => return Err(ClientError::InvalidChildType),
 		};
-		read_child_proof_check::<H, _>(
+		read_child_proof_check::<HashFor<Block>, _>(
 			convert_hash(request.header.state_root()),
 			remote_proof,
 			&child_info,
@@ -293,7 +281,7 @@ where
 		request: &RemoteCallRequest<Block::Header>,
 		remote_proof: StorageProof,
 	) -> ClientResult<Vec<u8>> {
-		check_execution_proof::<_, _, H>(
+		check_execution_proof::<_, _, HashFor<Block>>(
 			&self.executor,
 			self.spawn_handle.clone(),
 			request,
diff --git a/client/light/src/lib.rs b/client/light/src/lib.rs
index ed48c05258d0..0c874326ef2e 100644
--- a/client/light/src/lib.rs
+++ b/client/light/src/lib.rs
@@ -37,7 +37,7 @@ pub fn new_fetch_checker<E, B: BlockT, S: BlockchainStorage<B>>(
 	blockchain: Arc<Blockchain<S>>,
 	executor: E,
 	spawn_handle: Box<dyn SpawnNamed>,
-) -> LightDataChecker<E, HashFor<B>, B, S>
+) -> LightDataChecker<E, B, S>
 where
 	E: CodeExecutor,
 {
diff --git a/client/service/src/client/call_executor.rs b/client/service/src/client/call_executor.rs
index 6d4fe3c36013..2fae972d3472 100644
--- a/client/service/src/client/call_executor.rs
+++ b/client/service/src/client/call_executor.rs
@@ -18,7 +18,7 @@
 
 use super::{client::ClientConfig, wasm_override::WasmOverride, wasm_substitutes::WasmSubstitutes};
 use codec::{Decode, Encode};
-use sc_client_api::{backend, call_executor::CallExecutor};
+use sc_client_api::{backend, call_executor::CallExecutor, HeaderBackend};
 use sc_executor::{NativeVersion, RuntimeInfo, RuntimeVersion};
 use sp_api::{ProofRecorder, StorageTransactionCache};
 use sp_core::{
@@ -28,7 +28,7 @@ use sp_core::{
 use sp_externalities::Extensions;
 use sp_runtime::{
 	generic::BlockId,
-	traits::{Block as BlockT, HashFor, NumberFor},
+	traits::{Block as BlockT, NumberFor},
 };
 use sp_state_machine::{
 	self, backend::Backend as _, ExecutionManager, ExecutionStrategy, Ext, OverlayedChanges,
@@ -146,7 +146,7 @@ where
 
 	fn call(
 		&self,
-		id: &BlockId<Block>,
+		at: &BlockId<Block>,
 		method: &str,
 		call_data: &[u8],
 		strategy: ExecutionStrategy,
@@ -154,12 +154,17 @@ where
 	) -> sp_blockchain::Result<Vec<u8>> {
 		let mut changes = OverlayedChanges::default();
 		let changes_trie =
-			backend::changes_tries_state_at_block(id, self.backend.changes_trie_storage())?;
-		let state = self.backend.state_at(*id)?;
+			backend::changes_tries_state_at_block(at, self.backend.changes_trie_storage())?;
+		let state = self.backend.state_at(*at)?;
 		let state_runtime_code = sp_state_machine::backend::BackendRuntimeCode::new(&state);
 		let runtime_code =
 			state_runtime_code.runtime_code().map_err(sp_blockchain::Error::RuntimeCode)?;
-		let runtime_code = self.check_override(runtime_code, id)?;
+
+		let runtime_code = self.check_override(runtime_code, at)?;
+
+		let at_hash = self.backend.blockchain().block_hash_from_id(at)?.ok_or_else(|| {
+			sp_blockchain::Error::UnknownBlock(format!("Could not find block hash for {:?}", at))
+		})?;
 
 		let return_data = StateMachine::new(
 			&state,
@@ -172,6 +177,7 @@ where
 			&runtime_code,
 			self.spawn_handle.clone(),
 		)
+		.set_parent_hash(at_hash)
 		.execute_using_consensus_failure_handler::<_, NeverNativeValue, fn() -> _>(
 			strategy.get_manager(),
 			None,
@@ -210,6 +216,10 @@ where
 
 		let changes = &mut *changes.borrow_mut();
 
+		let at_hash = self.backend.blockchain().block_hash_from_id(at)?.ok_or_else(|| {
+			sp_blockchain::Error::UnknownBlock(format!("Could not find block hash for {:?}", at))
+		})?;
+
 		match recorder {
 			Some(recorder) => {
 				let trie_state = state.as_trie_backend().ok_or_else(|| {
@@ -240,7 +250,8 @@ where
 					extensions.unwrap_or_default(),
 					&runtime_code,
 					self.spawn_handle.clone(),
-				);
+				)
+				.set_parent_hash(at_hash);
 				// TODO: https://github.com/paritytech/substrate/issues/4455
 				// .with_storage_transaction_cache(storage_transaction_cache.as_mut().map(|c| &mut **c))
 				state_machine.execute_using_consensus_failure_handler(
@@ -267,7 +278,8 @@ where
 				)
 				.with_storage_transaction_cache(
 					storage_transaction_cache.as_mut().map(|c| &mut **c),
-				);
+				)
+				.set_parent_hash(at_hash);
 				state_machine.execute_using_consensus_failure_handler(
 					execution_manager,
 					native_call.map(|n| || (n)().map_err(|e| Box::new(e) as Box<_>)),
@@ -292,19 +304,27 @@ where
 			.map_err(|e| sp_blockchain::Error::VersionInvalid(format!("{:?}", e)).into())
 	}
 
-	fn prove_at_trie_state<S: sp_state_machine::TrieBackendStorage<HashFor<Block>>>(
+	fn prove_execution(
 		&self,
-		trie_state: &sp_state_machine::TrieBackend<S, HashFor<Block>>,
-		overlay: &mut OverlayedChanges,
+		at: &BlockId<Block>,
 		method: &str,
 		call_data: &[u8],
-	) -> Result<(Vec<u8>, StorageProof), sp_blockchain::Error> {
-		let state_runtime_code = sp_state_machine::backend::BackendRuntimeCode::new(trie_state);
+	) -> sp_blockchain::Result<(Vec<u8>, StorageProof)> {
+		let mut state = self.backend.state_at(*at)?;
+
+		let trie_backend = state.as_trie_backend().ok_or_else(|| {
+			Box::new(sp_state_machine::ExecutionError::UnableToGenerateProof)
+				as Box<dyn sp_state_machine::Error>
+		})?;
+
+		let state_runtime_code = sp_state_machine::backend::BackendRuntimeCode::new(trie_backend);
 		let runtime_code =
 			state_runtime_code.runtime_code().map_err(sp_blockchain::Error::RuntimeCode)?;
+		let runtime_code = self.check_override(runtime_code, at)?;
+
 		sp_state_machine::prove_execution_on_trie_backend::<_, _, NumberFor<Block>, _, _>(
-			trie_state,
-			overlay,
+			&trie_backend,
+			&mut Default::default(),
 			&self.executor,
 			self.spawn_handle.clone(),
 			method,
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index 901321f395bf..a0d294908c5f 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -46,7 +46,7 @@ use sc_client_api::{
 	CallExecutor, ExecutorProvider, KeyIterator, ProofProvider, UsageProvider,
 };
 use sc_executor::RuntimeVersion;
-use sc_light::{call_executor::prove_execution, fetcher::ChangesProof};
+use sc_light::fetcher::ChangesProof;
 use sc_telemetry::{telemetry, TelemetryHandle, SUBSTRATE_INFO};
 use sp_api::{
 	ApiExt, ApiRef, CallApiAt, CallApiAtParams, ConstructRuntimeApi, Core as CoreApi,
@@ -1312,8 +1312,8 @@ where
 			&mut [well_known_keys::CODE, well_known_keys::HEAP_PAGES].iter().map(|v| *v),
 		)?;
 
-		let state = self.state_at(id)?;
-		prove_execution(state, &self.executor, method, call_data)
+		self.executor
+			.prove_execution(id, method, call_data)
 			.map(|(r, p)| (r, StorageProof::merge(vec![p, code_proof])))
 	}
 
diff --git a/client/service/test/src/client/light.rs b/client/service/test/src/client/light.rs
index 8d1411214d34..90f87670c0ce 100644
--- a/client/service/test/src/client/light.rs
+++ b/client/service/test/src/client/light.rs
@@ -47,7 +47,7 @@ use sp_core::{testing::TaskExecutor, NativeOrEncoded, H256};
 use sp_externalities::Extensions;
 use sp_runtime::{
 	generic::BlockId,
-	traits::{BlakeTwo256, Block as _, HashFor, Header as HeaderT, NumberFor},
+	traits::{BlakeTwo256, Block as _, Header as HeaderT, NumberFor},
 	Digest, Justifications,
 };
 use sp_state_machine::{ExecutionManager, OverlayedChanges};
@@ -248,12 +248,11 @@ impl CallExecutor<Block> for DummyCallExecutor {
 		unreachable!()
 	}
 
-	fn prove_at_trie_state<S: sp_state_machine::TrieBackendStorage<HashFor<Block>>>(
+	fn prove_execution(
 		&self,
-		_trie_state: &sp_state_machine::TrieBackend<S, HashFor<Block>>,
-		_overlay: &mut OverlayedChanges,
-		_method: &str,
-		_call_data: &[u8],
+		_: &BlockId<Block>,
+		_: &str,
+		_: &[u8],
 	) -> Result<(Vec<u8>, StorageProof), ClientError> {
 		unreachable!()
 	}
@@ -452,7 +451,6 @@ fn code_is_executed_at_genesis_only() {
 
 type TestChecker = LightDataChecker<
 	NativeExecutor<substrate_test_runtime_client::LocalExecutor>,
-	BlakeTwo256,
 	Block,
 	DummyStorage,
 >;
diff --git a/primitives/state-machine/src/ext.rs b/primitives/state-machine/src/ext.rs
index e5dee790918b..5f22714d4da3 100644
--- a/primitives/state-machine/src/ext.rs
+++ b/primitives/state-machine/src/ext.rs
@@ -206,7 +206,7 @@ where
 		trace!(
 			target: "state",
 			method = "Get",
-			ext_id = self.id,
+			ext_id = %HexDisplay::from(&self.id.to_le_bytes()),
 			key = %HexDisplay::from(&key),
 			result = ?result.as_ref().map(HexDisplay::from),
 			result_encoded = %HexDisplay::from(
@@ -228,10 +228,12 @@ where
 			.map(|x| x.map(|x| H::hash(x)))
 			.unwrap_or_else(|| self.backend.storage_hash(key).expect(EXT_NOT_ALLOWED_TO_FAIL));
 
-		trace!(target: "state", "{:04x}: Hash {}={:?}",
-			self.id,
-			HexDisplay::from(&key),
-			result,
+		trace!(
+			target: "state",
+			method = "Hash",
+			ext_id = %HexDisplay::from(&self.id.to_le_bytes()),
+			key = %HexDisplay::from(&key),
+			?result,
 		);
 		result.map(|r| r.encode())
 	}
@@ -246,11 +248,13 @@ where
 				self.backend.child_storage(child_info, key).expect(EXT_NOT_ALLOWED_TO_FAIL)
 			});
 
-		trace!(target: "state", "{:04x}: GetChild({}) {}={:?}",
-			self.id,
-			HexDisplay::from(&child_info.storage_key()),
-			HexDisplay::from(&key),
-			result.as_ref().map(HexDisplay::from)
+		trace!(
+			target: "state",
+			method = "ChildGet",
+			ext_id = %HexDisplay::from(&self.id.to_le_bytes()),
+			child_info = %HexDisplay::from(&child_info.storage_key()),
+			key = %HexDisplay::from(&key),
+			result = ?result.as_ref().map(HexDisplay::from)
 		);
 
 		result
@@ -266,11 +270,13 @@ where
 				self.backend.child_storage_hash(child_info, key).expect(EXT_NOT_ALLOWED_TO_FAIL)
 			});
 
-		trace!(target: "state", "{:04x}: ChildHash({}) {}={:?}",
-			self.id,
-			HexDisplay::from(&child_info.storage_key()),
-			HexDisplay::from(&key),
-			result,
+		trace!(
+			target: "state",
+			method = "ChildHash",
+			ext_id = %HexDisplay::from(&self.id.to_le_bytes()),
+			child_info = %HexDisplay::from(&child_info.storage_key()),
+			key = %HexDisplay::from(&key),
+			?result,
 		);
 
 		result.map(|r| r.encode())
@@ -283,10 +289,12 @@ where
 			_ => self.backend.exists_storage(key).expect(EXT_NOT_ALLOWED_TO_FAIL),
 		};
 
-		trace!(target: "state", "{:04x}: Exists {}={:?}",
-			self.id,
-			HexDisplay::from(&key),
-			result,
+		trace!(
+			target: "state",
+			method = "Exists",
+			ext_id = %HexDisplay::from(&self.id.to_le_bytes()),
+			key = %HexDisplay::from(&key),
+			%result,
 		);
 
 		result
@@ -303,11 +311,13 @@ where
 				.expect(EXT_NOT_ALLOWED_TO_FAIL),
 		};
 
-		trace!(target: "state", "{:04x}: ChildExists({}) {}={:?}",
-			self.id,
-			HexDisplay::from(&child_info.storage_key()),
-			HexDisplay::from(&key),
-			result,
+		trace!(
+			target: "state",
+			method = "ChildExists",
+			ext_id = %HexDisplay::from(&self.id.to_le_bytes()),
+			child_info = %HexDisplay::from(&child_info.storage_key()),
+			key = %HexDisplay::from(&key),
+			%result,
 		);
 		result
 	}
@@ -402,7 +412,7 @@ where
 		trace!(
 			target: "state",
 			method = "Put",
-			ext_id = self.id,
+			ext_id = %HexDisplay::from(&self.id.to_le_bytes()),
 			key = %HexDisplay::from(&key),
 			value = ?value.as_ref().map(HexDisplay::from),
 			value_encoded = %HexDisplay::from(
@@ -423,11 +433,13 @@ where
 		key: StorageKey,
 		value: Option<StorageValue>,
 	) {
-		trace!(target: "state", "{:04x}: PutChild({}) {}={:?}",
-			self.id,
-			HexDisplay::from(&child_info.storage_key()),
-			HexDisplay::from(&key),
-			value.as_ref().map(HexDisplay::from)
+		trace!(
+			target: "state",
+			method = "ChildPut",
+			ext_id = %HexDisplay::from(&self.id.to_le_bytes()),
+			child_info = %HexDisplay::from(&child_info.storage_key()),
+			key = %HexDisplay::from(&key),
+			value = ?value.as_ref().map(HexDisplay::from),
 		);
 		let _guard = guard();
 
@@ -436,9 +448,11 @@ where
 	}
 
 	fn kill_child_storage(&mut self, child_info: &ChildInfo, limit: Option<u32>) -> (bool, u32) {
-		trace!(target: "state", "{:04x}: KillChild({})",
-			self.id,
-			HexDisplay::from(&child_info.storage_key()),
+		trace!(
+			target: "state",
+			method = "ChildKill",
+			ext_id = %HexDisplay::from(&self.id.to_le_bytes()),
+			child_info = %HexDisplay::from(&child_info.storage_key()),
 		);
 		let _guard = guard();
 		self.mark_dirty();
@@ -447,14 +461,19 @@ where
 	}
 
 	fn clear_prefix(&mut self, prefix: &[u8], limit: Option<u32>) -> (bool, u32) {
-		trace!(target: "state", "{:04x}: ClearPrefix {}",
-			self.id,
-			HexDisplay::from(&prefix),
+		trace!(
+			target: "state",
+			method = "ClearPrefix",
+			ext_id = %HexDisplay::from(&self.id.to_le_bytes()),
+			prefix = %HexDisplay::from(&prefix),
 		);
 		let _guard = guard();
 
 		if sp_core::storage::well_known_keys::starts_with_child_storage_key(prefix) {
-			warn!(target: "trie", "Refuse to directly clear prefix that is part or contains of child storage key");
+			warn!(
+				target: "trie",
+				"Refuse to directly clear prefix that is part or contains of child storage key",
+			);
 			return (false, 0)
 		}
 
@@ -469,10 +488,12 @@ where
 		prefix: &[u8],
 		limit: Option<u32>,
 	) -> (bool, u32) {
-		trace!(target: "state", "{:04x}: ClearChildPrefix({}) {}",
-			self.id,
-			HexDisplay::from(&child_info.storage_key()),
-			HexDisplay::from(&prefix),
+		trace!(
+			target: "state",
+			method = "ChildClearPrefix",
+			ext_id = %HexDisplay::from(&self.id.to_le_bytes()),
+			child_info = %HexDisplay::from(&child_info.storage_key()),
+			prefix = %HexDisplay::from(&prefix),
 		);
 		let _guard = guard();
 
@@ -482,10 +503,12 @@ where
 	}
 
 	fn storage_append(&mut self, key: Vec<u8>, value: Vec<u8>) {
-		trace!(target: "state", "{:04x}: Append {}={}",
-			self.id,
-			HexDisplay::from(&key),
-			HexDisplay::from(&value),
+		trace!(
+			target: "state",
+			method = "Append",
+			ext_id = %HexDisplay::from(&self.id.to_le_bytes()),
+			key = %HexDisplay::from(&key),
+			value = %HexDisplay::from(&value),
 		);
 
 		let _guard = guard();
@@ -501,15 +524,24 @@ where
 	fn storage_root(&mut self) -> Vec<u8> {
 		let _guard = guard();
 		if let Some(ref root) = self.storage_transaction_cache.transaction_storage_root {
-			trace!(target: "state", "{:04x}: Root(cached) {}",
-				self.id,
-				HexDisplay::from(&root.as_ref()),
+			trace!(
+				target: "state",
+				method = "StorageRoot",
+				ext_id = %HexDisplay::from(&self.id.to_le_bytes()),
+				storage_root = %HexDisplay::from(&root.as_ref()),
+				cached = true,
 			);
 			return root.encode()
 		}
 
 		let root = self.overlay.storage_root(self.backend, self.storage_transaction_cache);
-		trace!(target: "state", "{:04x}: Root {}", self.id, HexDisplay::from(&root.as_ref()));
+		trace!(
+			target: "state",
+			method = "StorageRoot",
+			ext_id = %HexDisplay::from(&self.id.to_le_bytes()),
+			storage_root = %HexDisplay::from(&root.as_ref()),
+			cached = false,
+		);
 		root.encode()
 	}
 
@@ -522,10 +554,13 @@ where
 				.storage(prefixed_storage_key.as_slice())
 				.and_then(|k| Decode::decode(&mut &k[..]).ok())
 				.unwrap_or_else(|| empty_child_trie_root::<Layout<H>>());
-			trace!(target: "state", "{:04x}: ChildRoot({})(cached) {}",
-				self.id,
-				HexDisplay::from(&storage_key),
-				HexDisplay::from(&root.as_ref()),
+			trace!(
+				target: "state",
+				method = "ChildStorageRoot",
+				ext_id = %HexDisplay::from(&self.id.to_le_bytes()),
+				child_info = %HexDisplay::from(&storage_key),
+				storage_root = %HexDisplay::from(&root.as_ref()),
+				cached = true,
 			);
 			root.encode()
 		} else {
@@ -549,11 +584,15 @@ where
 					self.overlay.set_storage(prefixed_storage_key.into_inner(), Some(root.clone()));
 				}
 
-				trace!(target: "state", "{:04x}: ChildRoot({}) {}",
-					self.id,
-					HexDisplay::from(&storage_key.as_ref()),
-					HexDisplay::from(&root.as_ref()),
+				trace!(
+					target: "state",
+					method = "ChildStorageRoot",
+					ext_id = %HexDisplay::from(&self.id.to_le_bytes()),
+					child_info = %HexDisplay::from(&storage_key.as_ref()),
+					storage_root = %HexDisplay::from(&root.as_ref()),
+					cached = false,
 				);
+
 				root
 			} else {
 				// empty overlay
@@ -561,11 +600,16 @@ where
 					.storage(prefixed_storage_key.as_slice())
 					.and_then(|k| Decode::decode(&mut &k[..]).ok())
 					.unwrap_or_else(|| empty_child_trie_root::<Layout<H>>());
-				trace!(target: "state", "{:04x}: ChildRoot({})(no_change) {}",
-					self.id,
-					HexDisplay::from(&storage_key.as_ref()),
-					HexDisplay::from(&root.as_ref()),
+
+				trace!(
+					target: "state",
+					method = "ChildStorageRoot",
+					ext_id = %HexDisplay::from(&self.id.to_le_bytes()),
+					child_info = %HexDisplay::from(&storage_key.as_ref()),
+					storage_root = %HexDisplay::from(&root.as_ref()),
+					cached = false,
 				);
+
 				root.encode()
 			}
 		}
@@ -574,12 +618,13 @@ where
 	fn storage_index_transaction(&mut self, index: u32, hash: &[u8], size: u32) {
 		trace!(
 			target: "state",
-			"{:04x}: IndexTransaction ({}): {}, {} bytes",
-			self.id,
-			index,
-			HexDisplay::from(&hash),
-			size,
+			method = "IndexTransaction",
+			ext_id = %HexDisplay::from(&self.id.to_le_bytes()),
+			%index,
+			tx_hash = %HexDisplay::from(&hash),
+			%size,
 		);
+
 		self.overlay.add_transaction_index(IndexOperation::Insert {
 			extrinsic: index,
 			hash: hash.to_vec(),
@@ -591,11 +636,12 @@ where
 	fn storage_renew_transaction_index(&mut self, index: u32, hash: &[u8]) {
 		trace!(
 			target: "state",
-			"{:04x}: RenewTransactionIndex ({}): {}",
-			self.id,
-			index,
-			HexDisplay::from(&hash),
+			method = "RenewTransactionIndex",
+			ext_id = %HexDisplay::from(&self.id.to_le_bytes()),
+			%index,
+			tx_hash = %HexDisplay::from(&hash),
 		);
+
 		self.overlay
 			.add_transaction_index(IndexOperation::Renew { extrinsic: index, hash: hash.to_vec() });
 	}
@@ -612,10 +658,11 @@ where
 		{
 			trace!(
 				target: "state",
-				"{:04x}: ChangesRoot({})(cached) {:?}",
-				self.id,
-				HexDisplay::from(&parent_hash),
-				root,
+				method = "ChangesRoot",
+				ext_id = %HexDisplay::from(&self.id.to_le_bytes()),
+				parent_hash = %HexDisplay::from(&parent_hash),
+				?root,
+				cached = true,
 			);
 
 			Ok(Some(root.encode()))
@@ -626,8 +673,8 @@ where
 				Decode::decode(&mut parent_hash).map_err(|e| {
 					trace!(
 						target: "state",
-						"Failed to decode changes root parent hash: {}",
-						e,
+						error = %e,
+						"Failed to decode changes root parent hash",
 					)
 				})?,
 				true,
@@ -636,10 +683,11 @@ where
 
 			trace!(
 				target: "state",
-				"{:04x}: ChangesRoot({}) {:?}",
-				self.id,
-				HexDisplay::from(&parent_hash),
-				root,
+				method = "ChangesRoot",
+				ext_id = %HexDisplay::from(&self.id.to_le_bytes()),
+				parent_hash = %HexDisplay::from(&parent_hash),
+				?root,
+				cached = false,
 			);
 
 			root.map(|r| r.map(|o| o.encode()))
diff --git a/primitives/state-machine/src/lib.rs b/primitives/state-machine/src/lib.rs
index 924ceaf9d872..1588a42f41fe 100644
--- a/primitives/state-machine/src/lib.rs
+++ b/primitives/state-machine/src/lib.rs
@@ -172,7 +172,6 @@ mod execution {
 	use super::*;
 	use codec::{Codec, Decode, Encode};
 	use hash_db::Hasher;
-	use log::{trace, warn};
 	use sp_core::{
 		hexdisplay::HexDisplay,
 		storage::ChildInfo,
@@ -181,6 +180,7 @@ mod execution {
 	};
 	use sp_externalities::Extensions;
 	use std::{collections::HashMap, fmt, panic::UnwindSafe, result};
+	use tracing::{trace, warn};
 
 	const PROOF_CLOSE_TRANSACTION: &str = "\
 		Closing a transaction that was started in this function. Client initiated transactions
@@ -305,6 +305,10 @@ mod execution {
 		storage_transaction_cache: Option<&'a mut StorageTransactionCache<B::Transaction, H, N>>,
 		runtime_code: &'a RuntimeCode<'a>,
 		stats: StateMachineStats,
+		/// The hash of the block the state machine will be executed on.
+		///
+		/// Used for logging.
+		parent_hash: Option<H::Out>,
 	}
 
 	impl<'a, B, H, N, Exec> Drop for StateMachine<'a, B, H, N, Exec>
@@ -352,6 +356,7 @@ mod execution {
 				storage_transaction_cache: None,
 				runtime_code,
 				stats: StateMachineStats::default(),
+				parent_hash: None,
 			}
 		}
 
@@ -368,6 +373,14 @@ mod execution {
 			self
 		}
 
+		/// Set the given `parent_hash` as the hash of the parent block.
+		///
+		/// This will be used for improved logging.
+		pub fn set_parent_hash(mut self, parent_hash: H::Out) -> Self {
+			self.parent_hash = Some(parent_hash);
+			self
+		}
+
 		/// Execute a call using the given state backend, overlayed changes, and call executor.
 		///
 		/// On an error, no prospective changes are written to the overlay.
@@ -415,13 +428,15 @@ mod execution {
 				Some(&mut self.extensions),
 			);
 
-			let id = ext.id;
+			let ext_id = ext.id;
+
 			trace!(
-				target: "state", "{:04x}: Call {} at {:?}. Input={:?}",
-				id,
-				self.method,
-				self.backend,
-				HexDisplay::from(&self.call_data),
+				target: "state",
+				ext_id = %HexDisplay::from(&ext_id.to_le_bytes()),
+				method = %self.method,
+				parent_hash = %self.parent_hash.map(|h| format!("{:?}", h)).unwrap_or_else(|| String::from("None")),
+				input = ?HexDisplay::from(&self.call_data),
+				"Call",
 			);
 
 			let (result, was_native) = self.exec.call(
@@ -438,10 +453,11 @@ mod execution {
 				.expect("Runtime is not able to call this function in the overlay; qed");
 
 			trace!(
-				target: "state", "{:04x}: Return. Native={:?}, Result={:?}",
-				id,
-				was_native,
-				result,
+				target: "state",
+				ext_id = %HexDisplay::from(&ext_id.to_le_bytes()),
+				?was_native,
+				?result,
+				"Return",
 			);
 
 			(result, was_native)
@@ -554,7 +570,7 @@ mod execution {
 
 	/// Prove execution using the given state backend, overlayed changes, and call executor.
 	pub fn prove_execution<B, H, N, Exec, Spawn>(
-		mut backend: B,
+		backend: &mut B,
 		overlay: &mut OverlayedChanges,
 		exec: &Exec,
 		spawn_handle: Spawn,
@@ -1137,10 +1153,10 @@ mod tests {
 		};
 
 		// fetch execution proof from 'remote' full node
-		let remote_backend = trie_backend::tests::test_trie();
+		let mut remote_backend = trie_backend::tests::test_trie();
 		let remote_root = remote_backend.storage_root(std::iter::empty()).0;
 		let (remote_result, remote_proof) = prove_execution::<_, _, u64, _, _>(
-			remote_backend,
+			&mut remote_backend,
 			&mut Default::default(),
 			&executor,
 			TaskExecutor::new(),

From 44d0c8f9df0c0a4e740cf6b9bcc94963b7f08fcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Thu, 29 Jul 2021 12:13:08 +0100
Subject: [PATCH 1037/1194] build: nix-shell: use mozilla/nixpkgs-mozilla repo
 (#9456)

---
 shell.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/shell.nix b/shell.nix
index 03c95f56fc5d..65a330bf33e1 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,9 +1,8 @@
 let
   mozillaOverlay =
     import (builtins.fetchGit {
-      # TODO: revert to upstream after https://github.com/mozilla/nixpkgs-mozilla/pull/250
-      url = "https://github.com/andresilva/nixpkgs-mozilla.git";
-      rev = "7626aca57c20f3f6ee28cce8657147d9b358ea18";
+      url = "https://github.com/mozilla/nixpkgs-mozilla.git";
+      rev = "4a07484cf0e49047f82d83fd119acffbad3b235f";
     });
   nixpkgs = import <nixpkgs> { overlays = [ mozillaOverlay ]; };
   rust-nightly = with nixpkgs; ((rustChannelOf { date = "2021-07-06"; channel = "nightly"; }).rust.override {
@@ -20,7 +19,7 @@ with nixpkgs; pkgs.mkShell {
     darwin.apple_sdk.frameworks.Security
   ];
 
-  RUST_SRC_PATH="${rust-nightly}/lib/rustlib/src/rust/src";
+  RUST_SRC_PATH = "${rust-nightly}/lib/rustlib/src/rust/src";
   LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
   PROTOC = "${protobuf}/bin/protoc";
   ROCKSDB_LIB_DIR = "${rocksdb}/lib";

From 9f7ce37d08437f7eab3f1eb6628e8f5707f58818 Mon Sep 17 00:00:00 2001
From: Squirrel <gilescope@gmail.com>
Date: Thu, 29 Jul 2021 13:19:26 +0100
Subject: [PATCH 1038/1194] Remove old benchmark (#9457)

Apparently this should be rewritten when we need it again.
---
 primitives/npos-elections/benches/phragmen.rs | 211 ------------------
 1 file changed, 211 deletions(-)
 delete mode 100644 primitives/npos-elections/benches/phragmen.rs

diff --git a/primitives/npos-elections/benches/phragmen.rs b/primitives/npos-elections/benches/phragmen.rs
deleted file mode 100644
index 784825924935..000000000000
--- a/primitives/npos-elections/benches/phragmen.rs
+++ /dev/null
@@ -1,211 +0,0 @@
-// Copyright 2019-2020 Parity Technologies
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Benchmarks of the phragmen election algorithm.
-//! Note that execution times will not be accurate in an absolute scale, since
-//! - Everything is executed in the context of `TestExternalities`
-//! - Everything is executed in native environment.
-
-#![cfg(feature = "bench")]
-#![feature(test)]
-
-extern crate test;
-use test::Bencher;
-
-use rand::{self, Rng};
-use sp_npos_elections::{ElectionResult, VoteWeight};
-
-use sp_npos_elections::{
-	assignment_ratio_to_staked, balance_solution, seq_phragmen, to_support_map, to_without_backing,
-	Assignment, ExtendedBalance, IdentifierT, StakedAssignment, VoteWeight,
-};
-use sp_runtime::{traits::Zero, PerThing, Perbill};
-use std::collections::BTreeMap;
-
-// default params. Each will be scaled by the benchmarks individually.
-const VALIDATORS: u64 = 100;
-const NOMINATORS: u64 = 1_000;
-const EDGES: u64 = 2;
-const TO_ELECT: usize = 10;
-const STAKE: VoteWeight = 1000;
-
-const PREFIX: AccountId = 1000_000;
-
-type AccountId = u64;
-
-mod bench_closure_and_slice {
-	use super::*;
-
-	fn random_assignment() -> Assignment<u32, Perbill> {
-		let mut rng = rand::thread_rng();
-		let who = rng.next_u32();
-		let distribution = (0..5)
-			.map(|x| (x + rng.next_u32(), Perbill::from_percent(rng.next_u32() % 100)))
-			.collect::<Vec<_>>();
-		Assignment { who, distribution }
-	}
-
-	/// Converts a vector of ratio assignments into ones with absolute budget value.
-	pub fn assignment_ratio_to_staked_slice<A: IdentifierT, P: PerThing>(
-		ratio: Vec<Assignment<A, P>>,
-		stakes: &[VoteWeight],
-	) -> Vec<StakedAssignment<A>>
-	where
-		T: sp_std::ops::Mul<ExtendedBalance, Output = ExtendedBalance>,
-	{
-		ratio
-			.into_iter()
-			.zip(stakes.into_iter().map(|x| *x as ExtendedBalance))
-			.map(|(a, stake)| a.into_staked(stake.into(), true))
-			.collect()
-	}
-
-	#[bench]
-	fn closure(b: &mut Bencher) {
-		let assignments = (0..1000).map(|_| random_assignment()).collect::<Vec<Assignment<_, _>>>();
-		let stake_of = |x: &u32| -> VoteWeight { (x * 2 + 100).into() };
-
-		// each have one clone of assignments
-		b.iter(|| assignment_ratio_to_staked(assignments.clone(), stake_of));
-	}
-
-	#[bench]
-	fn slice(b: &mut Bencher) {
-		let assignments = (0..1000).map(|_| random_assignment()).collect::<Vec<Assignment<_, _>>>();
-		let stake_of = |x: &u32| -> VoteWeight { (x * 2 + 100).into() };
-
-		b.iter(|| {
-			let local = assignments.clone();
-			let stakes = local.iter().map(|x| stake_of(&x.who)).collect::<Vec<_>>();
-			assignment_ratio_to_staked_slice(local, stakes.as_ref());
-		});
-	}
-}
-
-fn do_phragmen(
-	b: &mut Bencher,
-	num_validators: u64,
-	num_nominators: u64,
-	to_elect: usize,
-	edge_per_voter: u64,
-	eq_iters: usize,
-	eq_tolerance: u128,
-) {
-	assert!(num_validators > edge_per_voter);
-	let rr = |a, b| rand::thread_rng().gen_range(a as usize, b as usize) as VoteWeight;
-
-	let mut candidates = Vec::with_capacity(num_validators as usize);
-	let mut stake_of_tree: BTreeMap<AccountId, VoteWeight> = BTreeMap::new();
-
-	(1..=num_validators).for_each(|acc| {
-		candidates.push(acc);
-		stake_of_tree.insert(acc, STAKE + rr(10, 1000));
-	});
-
-	let mut voters = Vec::with_capacity(num_nominators as usize);
-	(PREFIX..=(PREFIX + num_nominators)).for_each(|acc| {
-		// all possible targets
-		let mut all_targets = candidates.clone();
-		// we remove and pop into `targets` `edge_per_voter` times.
-		let targets = (0..edge_per_voter)
-			.map(|_| all_targets.remove(rr(0, all_targets.len()) as usize))
-			.collect::<Vec<AccountId>>();
-
-		let stake = STAKE + rr(10, 1000);
-		stake_of_tree.insert(acc, stake);
-		voters.push((acc, stake, targets));
-	});
-
-	b.iter(|| {
-		let ElectionResult { winners, assignments } = seq_phragmen::<AccountId, Perbill>(
-			to_elect,
-			Zero::zero(),
-			candidates.clone(),
-			voters.clone(),
-		)
-		.unwrap();
-
-		let stake_of = |who: &AccountId| -> VoteWeight { *stake_of_tree.get(who).unwrap() };
-
-		// Do the benchmarking with balancing.
-		if eq_iters > 0 {
-			let staked = assignment_ratio_to_staked(assignments, &stake_of);
-			let winners = to_without_backing(winners);
-			let mut support = to_support_map(winners.as_ref(), staked.as_ref()).unwrap();
-
-			balance_solution(
-				staked.into_iter().map(|a| (a.clone(), stake_of(&a.who))).collect(),
-				&mut support,
-				eq_tolerance,
-				eq_iters,
-			);
-		}
-	})
-}
-
-macro_rules! phragmen_benches {
-	($($name:ident: $tup:expr,)*) => {
-	$(
-		#[bench]
-		fn $name(b: &mut Bencher) {
-			let (v, n, t, e, eq_iter, eq_tol) = $tup;
-			println!("----------------------");
-			println!(
-				"++ Benchmark: {} Validators // {} Nominators // {} Edges-per-nominator // {} \
-				total edges // electing {} // Equalize: {} iterations -- {} tolerance",
-				v, n, e, e * n, t, eq_iter, eq_tol,
-			);
-			do_phragmen(b, v, n, t, e, eq_iter, eq_tol);
-		}
-	)*
-	}
-}
-
-phragmen_benches! {
-	bench_1_1: (VALIDATORS, NOMINATORS, TO_ELECT, EDGES, 0, 0),
-	bench_1_2: (VALIDATORS * 2, NOMINATORS, TO_ELECT, EDGES, 0, 0),
-	bench_1_3: (VALIDATORS * 4, NOMINATORS, TO_ELECT, EDGES, 0, 0),
-	bench_1_4: (VALIDATORS * 8, NOMINATORS, TO_ELECT, EDGES, 0, 0),
-	bench_1_1_eq: (VALIDATORS, NOMINATORS, TO_ELECT, EDGES, 2, 0),
-	bench_1_2_eq: (VALIDATORS * 2, NOMINATORS, TO_ELECT, EDGES, 2, 0),
-	bench_1_3_eq: (VALIDATORS * 4, NOMINATORS, TO_ELECT, EDGES, 2, 0),
-	bench_1_4_eq: (VALIDATORS * 8, NOMINATORS, TO_ELECT, EDGES, 2, 0),
-
-	bench_0_1: (VALIDATORS, NOMINATORS, TO_ELECT, EDGES, 0, 0),
-	bench_0_2: (VALIDATORS, NOMINATORS, TO_ELECT * 4, EDGES, 0, 0),
-	bench_0_3: (VALIDATORS, NOMINATORS, TO_ELECT * 8, EDGES, 0, 0),
-	bench_0_4: (VALIDATORS, NOMINATORS, TO_ELECT * 16, EDGES , 0, 0),
-	bench_0_1_eq: (VALIDATORS, NOMINATORS, TO_ELECT, EDGES, 2, 0),
-	bench_0_2_eq: (VALIDATORS, NOMINATORS, TO_ELECT * 4, EDGES, 2, 0),
-	bench_0_3_eq: (VALIDATORS, NOMINATORS, TO_ELECT * 8, EDGES, 2, 0),
-	bench_0_4_eq: (VALIDATORS, NOMINATORS, TO_ELECT * 16, EDGES , 2, 0),
-
-	bench_2_1: (VALIDATORS, NOMINATORS, TO_ELECT, EDGES, 0, 0),
-	bench_2_2: (VALIDATORS, NOMINATORS * 2, TO_ELECT, EDGES, 0, 0),
-	bench_2_3: (VALIDATORS, NOMINATORS * 4, TO_ELECT, EDGES, 0, 0),
-	bench_2_4: (VALIDATORS, NOMINATORS * 8, TO_ELECT, EDGES, 0, 0),
-	bench_2_1_eq: (VALIDATORS, NOMINATORS, TO_ELECT, EDGES, 2, 0),
-	bench_2_2_eq: (VALIDATORS, NOMINATORS * 2, TO_ELECT, EDGES, 2, 0),
-	bench_2_3_eq: (VALIDATORS, NOMINATORS * 4, TO_ELECT, EDGES, 2, 0),
-	bench_2_4_eq: (VALIDATORS, NOMINATORS * 8, TO_ELECT, EDGES, 2, 0),
-
-	bench_3_1: (VALIDATORS, NOMINATORS, TO_ELECT, EDGES, 0, 0 ),
-	bench_3_2: (VALIDATORS, NOMINATORS, TO_ELECT, EDGES * 2, 0, 0),
-	bench_3_3: (VALIDATORS, NOMINATORS, TO_ELECT, EDGES * 4, 0, 0),
-	bench_3_4: (VALIDATORS, NOMINATORS, TO_ELECT, EDGES * 8, 0, 0),
-	bench_3_1_eq: (VALIDATORS, NOMINATORS, TO_ELECT, EDGES, 2, 0),
-	bench_3_2_eq: (VALIDATORS, NOMINATORS, TO_ELECT, EDGES * 2, 2, 0),
-	bench_3_3_eq: (VALIDATORS, NOMINATORS, TO_ELECT, EDGES * 4, 2, 0),
-	bench_3_4_eq: (VALIDATORS, NOMINATORS, TO_ELECT, EDGES * 8, 2, 0),
-}

From 3478e0f6b80bd43803d7b821d887527d86104a41 Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Thu, 29 Jul 2021 22:02:28 +0200
Subject: [PATCH 1039/1194] Add some important events to batch & staking to
 ensure ease of analysis (#9462)

* Add some important events to batch & staking to ensure ease of analysis

* Update frame/staking/src/pallet/mod.rs

Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com>

* Update lib.rs

* fix test

Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 frame/contracts/src/exec.rs            |  5 +++++
 frame/offences/benchmarking/src/lib.rs |  2 +-
 frame/staking/src/pallet/impls.rs      | 11 +++++++----
 frame/staking/src/pallet/mod.rs        | 12 +++++++-----
 frame/staking/src/slashing.rs          |  2 +-
 frame/staking/src/tests.rs             | 10 +++++-----
 frame/utility/src/lib.rs               |  4 ++++
 7 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index a862a98802e4..16c4886746d1 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -2506,6 +2506,11 @@ mod tests {
 						event: MetaEvent::System(frame_system::Event::Remarked(BOB, remark_hash)),
 						topics: vec![],
 					},
+					EventRecord {
+						phase: Phase::Initialization,
+						event: MetaEvent::Utility(pallet_utility::Event::ItemCompleted),
+						topics: vec![],
+					},
 					EventRecord {
 						phase: Phase::Initialization,
 						event: MetaEvent::Utility(pallet_utility::Event::BatchInterrupted(
diff --git a/frame/offences/benchmarking/src/lib.rs b/frame/offences/benchmarking/src/lib.rs
index d68e29047a7c..35e3c1aec940 100644
--- a/frame/offences/benchmarking/src/lib.rs
+++ b/frame/offences/benchmarking/src/lib.rs
@@ -289,7 +289,7 @@ benchmarks! {
 		let slash_amount = slash_fraction * bond_amount;
 		let reward_amount = slash_amount * (1 + n) / 2;
 		let slash = |id| core::iter::once(
-			<T as StakingConfig>::Event::from(StakingEvent::<T>::Slash(id, BalanceOf::<T>::from(slash_amount)))
+			<T as StakingConfig>::Event::from(StakingEvent::<T>::Slashed(id, BalanceOf::<T>::from(slash_amount)))
 		);
 		let chill = |id| core::iter::once(
 			<T as StakingConfig>::Event::from(StakingEvent::<T>::Chilled(id))
diff --git a/frame/staking/src/pallet/impls.rs b/frame/staking/src/pallet/impls.rs
index b42ab4551602..accd7a0cf02e 100644
--- a/frame/staking/src/pallet/impls.rs
+++ b/frame/staking/src/pallet/impls.rs
@@ -154,11 +154,13 @@ impl<T: Config> Pallet<T> {
 		let validator_exposure_part = Perbill::from_rational(exposure.own, exposure.total);
 		let validator_staking_payout = validator_exposure_part * validator_leftover_payout;
 
+		Self::deposit_event(Event::<T>::PayoutStarted(era, ledger.stash.clone()));
+
 		// We can now make total validator payout:
 		if let Some(imbalance) =
 			Self::make_payout(&ledger.stash, validator_staking_payout + validator_commission_payout)
 		{
-			Self::deposit_event(Event::<T>::Reward(ledger.stash, imbalance.peek()));
+			Self::deposit_event(Event::<T>::Rewarded(ledger.stash, imbalance.peek()));
 		}
 
 		// Track the number of payout ops to nominators. Note: `WeightInfo::payout_stakers_alive_staked`
@@ -176,7 +178,8 @@ impl<T: Config> Pallet<T> {
 			if let Some(imbalance) = Self::make_payout(&nominator.who, nominator_reward) {
 				// Note: this logic does not count payouts for `RewardDestination::None`.
 				nominator_payout_count += 1;
-				Self::deposit_event(Event::<T>::Reward(nominator.who.clone(), imbalance.peek()));
+				let e = Event::<T>::Rewarded(nominator.who.clone(), imbalance.peek());
+				Self::deposit_event(e);
 			}
 		}
 
@@ -354,7 +357,7 @@ impl<T: Config> Pallet<T> {
 			let issuance = T::Currency::total_issuance();
 			let (validator_payout, rest) = T::EraPayout::era_payout(staked, issuance, era_duration);
 
-			Self::deposit_event(Event::<T>::EraPayout(active_era.index, validator_payout, rest));
+			Self::deposit_event(Event::<T>::EraPaid(active_era.index, validator_payout, rest));
 
 			// Set ending era reward.
 			<ErasValidatorReward<T>>::insert(&active_era.index, validator_payout);
@@ -446,7 +449,7 @@ impl<T: Config> Pallet<T> {
 			return None
 		}
 
-		Self::deposit_event(Event::StakingElection);
+		Self::deposit_event(Event::StakersElected);
 		Some(Self::trigger_new_era(start_session_index, exposures))
 	}
 
diff --git a/frame/staking/src/pallet/mod.rs b/frame/staking/src/pallet/mod.rs
index 4e7f06ebab18..444768dbdccf 100644
--- a/frame/staking/src/pallet/mod.rs
+++ b/frame/staking/src/pallet/mod.rs
@@ -525,17 +525,17 @@ pub mod pallet {
 		/// The era payout has been set; the first balance is the validator-payout; the second is
 		/// the remainder from the maximum amount of reward.
 		/// \[era_index, validator_payout, remainder\]
-		EraPayout(EraIndex, BalanceOf<T>, BalanceOf<T>),
-		/// The staker has been rewarded by this amount. \[stash, amount\]
-		Reward(T::AccountId, BalanceOf<T>),
+		EraPaid(EraIndex, BalanceOf<T>, BalanceOf<T>),
+		/// The nominator has been rewarded by this amount. \[stash, amount\]
+		Rewarded(T::AccountId, BalanceOf<T>),
 		/// One validator (and its nominators) has been slashed by the given amount.
 		/// \[validator, amount\]
-		Slash(T::AccountId, BalanceOf<T>),
+		Slashed(T::AccountId, BalanceOf<T>),
 		/// An old slashing report from a prior era was discarded because it could
 		/// not be processed. \[session_index\]
 		OldSlashingReportDiscarded(SessionIndex),
 		/// A new set of stakers was elected.
-		StakingElection,
+		StakersElected,
 		/// An account has bonded this amount. \[stash, amount\]
 		///
 		/// NOTE: This event is only emitted when funds are bonded via a dispatchable. Notably,
@@ -553,6 +553,8 @@ pub mod pallet {
 		/// An account has stopped participating as either a validator or nominator.
 		/// \[stash\]
 		Chilled(T::AccountId),
+		/// The stakers' rewards are getting paid. \[era_index, validator_stash\]
+		PayoutStarted(EraIndex, T::AccountId),
 	}
 
 	#[pallet::error]
diff --git a/frame/staking/src/slashing.rs b/frame/staking/src/slashing.rs
index 332c9ffc3906..3da79924d0a0 100644
--- a/frame/staking/src/slashing.rs
+++ b/frame/staking/src/slashing.rs
@@ -584,7 +584,7 @@ pub fn do_slash<T: Config>(
 		<Pallet<T>>::update_ledger(&controller, &ledger);
 
 		// trigger the event
-		<Pallet<T>>::deposit_event(super::Event::<T>::Slash(stash.clone(), value));
+		<Pallet<T>>::deposit_event(super::Event::<T>::Slashed(stash.clone(), value));
 	}
 }
 
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index 69ce4e335f4b..3cb7a74e8982 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -257,7 +257,7 @@ fn rewards_should_work() {
 		);
 		assert_eq!(
 			*mock::staking_events().last().unwrap(),
-			Event::EraPayout(0, total_payout_0, maximum_payout - total_payout_0)
+			Event::EraPaid(0, total_payout_0, maximum_payout - total_payout_0)
 		);
 		mock::make_all_reward_payment(0);
 
@@ -295,7 +295,7 @@ fn rewards_should_work() {
 		);
 		assert_eq!(
 			*mock::staking_events().last().unwrap(),
-			Event::EraPayout(1, total_payout_1, maximum_payout - total_payout_1)
+			Event::EraPaid(1, total_payout_1, maximum_payout - total_payout_1)
 		);
 		mock::make_all_reward_payment(1);
 
@@ -3942,7 +3942,7 @@ mod election_data_provider {
 			run_to_block(20);
 			assert_eq!(Staking::next_election_prediction(System::block_number()), 45);
 			assert_eq!(staking_events().len(), 1);
-			assert_eq!(*staking_events().last().unwrap(), Event::StakingElection);
+			assert_eq!(*staking_events().last().unwrap(), Event::StakersElected);
 
 			for b in 21..45 {
 				run_to_block(b);
@@ -3953,7 +3953,7 @@ mod election_data_provider {
 			run_to_block(45);
 			assert_eq!(Staking::next_election_prediction(System::block_number()), 70);
 			assert_eq!(staking_events().len(), 3);
-			assert_eq!(*staking_events().last().unwrap(), Event::StakingElection);
+			assert_eq!(*staking_events().last().unwrap(), Event::StakersElected);
 
 			Staking::force_no_eras(Origin::root()).unwrap();
 			assert_eq!(Staking::next_election_prediction(System::block_number()), u64::MAX);
@@ -3976,7 +3976,7 @@ mod election_data_provider {
 			run_to_block(55);
 			assert_eq!(Staking::next_election_prediction(System::block_number()), 55 + 25);
 			assert_eq!(staking_events().len(), 6);
-			assert_eq!(*staking_events().last().unwrap(), Event::StakingElection);
+			assert_eq!(*staking_events().last().unwrap(), Event::StakersElected);
 			// The new era has been planned, forcing is changed from `ForceNew` to `NotForcing`.
 			assert_eq!(ForceEra::<Test>::get(), Forcing::NotForcing);
 		})
diff --git a/frame/utility/src/lib.rs b/frame/utility/src/lib.rs
index 1133bd869857..81cc3c65238b 100644
--- a/frame/utility/src/lib.rs
+++ b/frame/utility/src/lib.rs
@@ -108,6 +108,8 @@ pub mod pallet {
 		BatchInterrupted(u32, DispatchError),
 		/// Batch of dispatches completed fully with no error.
 		BatchCompleted,
+		/// A single item within a Batch of dispatches has completed with no error.
+		ItemCompleted,
 	}
 
 	#[pallet::call]
@@ -173,6 +175,7 @@ pub mod pallet {
 					// Return the actual used weight + base_weight of this call.
 					return Ok(Some(base_weight + weight).into())
 				}
+				Self::deposit_event(Event::ItemCompleted);
 			}
 			Self::deposit_event(Event::BatchCompleted);
 			let base_weight = T::WeightInfo::batch(calls_len as u32);
@@ -289,6 +292,7 @@ pub mod pallet {
 					err.post_info = Some(base_weight + weight).into();
 					err
 				})?;
+				Self::deposit_event(Event::ItemCompleted);
 			}
 			Self::deposit_event(Event::BatchCompleted);
 			let base_weight = T::WeightInfo::batch_all(calls_len as u32);

From 4d28ebeb8b027ca0227fe7779c5beb70a7b56467 Mon Sep 17 00:00:00 2001
From: Squirrel <gilescope@gmail.com>
Date: Fri, 30 Jul 2021 14:27:17 +0100
Subject: [PATCH 1040/1194] Move client consensus parts out of primitives and
 into client/consensus/api (#9319)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* moved client code out of primitives

* bump ci

* Fixup from merge.

* Removed unused deps thanks to review feedback

* Removing unneeded deps

* updating lock file

* note about rustfmt

* fixed typo to bump ci

* Move lonely CacheKeyId to parent

* cargo fmt

* updating import style

* Update docs/STYLE_GUIDE.md

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
---
 Cargo.lock                                    | 28 ++++++++--
 bin/node-template/node/src/service.rs         |  2 +-
 bin/node/cli/src/service.rs                   |  7 ++-
 bin/node/test-runner-example/Cargo.toml       |  1 -
 bin/node/testing/Cargo.toml                   |  1 +
 bin/node/testing/src/bench.rs                 |  5 +-
 client/api/src/backend.rs                     |  1 -
 client/consensus/aura/Cargo.toml              |  1 +
 client/consensus/aura/src/import_queue.rs     | 10 ++--
 client/consensus/aura/src/lib.rs              | 18 +++----
 client/consensus/babe/Cargo.toml              |  1 +
 client/consensus/babe/src/lib.rs              | 21 +++++---
 client/consensus/babe/src/tests.rs            |  6 +--
 client/consensus/common/Cargo.toml            | 19 ++++++-
 .../consensus/common/src/block_import.rs      | 21 +-------
 .../consensus/common/src/import_queue.rs      | 39 ++++++++------
 .../common/src/import_queue/basic_queue.rs    | 37 +++++++------
 .../common/src/import_queue/buffered_link.rs  | 16 +++---
 client/consensus/common/src/lib.rs            | 15 ++++++
 .../consensus/common/src/metrics.rs           |  4 +-
 client/consensus/manual-seal/Cargo.toml       |  1 +
 client/consensus/manual-seal/src/consensus.rs |  2 +-
 .../manual-seal/src/consensus/babe.rs         |  6 +--
 client/consensus/manual-seal/src/error.rs     |  3 +-
 client/consensus/manual-seal/src/lib.rs       | 12 ++---
 client/consensus/manual-seal/src/rpc.rs       |  2 +-
 .../consensus/manual-seal/src/seal_block.rs   |  8 ++-
 client/consensus/pow/Cargo.toml               |  1 +
 client/consensus/pow/src/lib.rs               | 14 ++---
 client/consensus/pow/src/worker.rs            | 10 ++--
 client/consensus/slots/Cargo.toml             |  1 +
 client/consensus/slots/src/lib.rs             |  7 ++-
 client/db/Cargo.toml                          |  1 -
 client/finality-grandpa-warp-sync/Cargo.toml  |  1 +
 client/finality-grandpa/src/import.rs         | 10 ++--
 client/finality-grandpa/src/lib.rs            |  3 +-
 client/finality-grandpa/src/tests.rs          |  9 ++--
 client/network/Cargo.toml                     |  1 +
 client/network/src/behaviour.rs               |  6 +--
 client/network/src/chain.rs                   |  3 +-
 client/network/src/config.rs                  |  3 +-
 client/network/src/gossip/tests.rs            | 10 ++--
 client/network/src/protocol.rs                |  9 ++--
 client/network/src/protocol/sync.rs           | 12 ++---
 client/network/src/service.rs                 |  6 +--
 client/network/src/service/tests.rs           | 10 ++--
 client/network/test/src/block_import.rs       | 13 +++--
 client/network/test/src/lib.rs                | 36 ++++++-------
 client/rpc/Cargo.toml                         |  1 +
 client/rpc/src/chain/tests.rs                 |  2 +-
 client/rpc/src/state/tests.rs                 |  3 +-
 client/service/Cargo.toml                     |  1 +
 client/service/src/builder.rs                 |  6 +--
 client/service/src/chain_ops/check_block.rs   |  2 +-
 client/service/src/chain_ops/import_blocks.rs | 20 +++----
 client/service/src/client/client.rs           | 54 ++++++++++---------
 client/service/src/lib.rs                     |  2 +-
 client/service/test/Cargo.toml                |  1 +
 client/service/test/src/client/mod.rs         |  8 +--
 docs/STYLE_GUIDE.md                           |  3 ++
 frame/support/src/dispatch.rs                 |  2 +-
 primitives/blockchain/src/backend.rs          |  2 +-
 primitives/consensus/common/Cargo.toml        | 10 ++--
 primitives/consensus/common/src/lib.rs        | 37 +++++++------
 test-utils/client/src/client_ext.rs           |  5 +-
 test-utils/runtime/Cargo.toml                 |  1 +
 test-utils/runtime/client/Cargo.toml          |  2 +-
 test-utils/runtime/src/lib.rs                 |  4 +-
 test-utils/test-runner/src/lib.rs             |  3 +-
 69 files changed, 339 insertions(+), 283 deletions(-)
 rename {primitives => client}/consensus/common/src/block_import.rs (96%)
 rename {primitives => client}/consensus/common/src/import_queue.rs (90%)
 rename {primitives => client}/consensus/common/src/import_queue/basic_queue.rs (94%)
 rename {primitives => client}/consensus/common/src/import_queue/buffered_link.rs (92%)
 rename {primitives => client}/consensus/common/src/metrics.rs (96%)

diff --git a/Cargo.lock b/Cargo.lock
index fd6b57918b31..6cfc2d19db81 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4542,6 +4542,7 @@ dependencies = [
  "sc-cli",
  "sc-client-api",
  "sc-client-db",
+ "sc-consensus",
  "sc-executor",
  "sc-service",
  "sp-api",
@@ -7242,7 +7243,6 @@ dependencies = [
  "sc-state-db",
  "sp-arithmetic",
  "sp-blockchain",
- "sp-consensus",
  "sp-core",
  "sp-database",
  "sp-keyring",
@@ -7260,11 +7260,24 @@ name = "sc-consensus"
 version = "0.10.0-dev"
 dependencies = [
  "async-trait",
+ "futures 0.3.15",
+ "futures-timer 3.0.2",
+ "libp2p",
+ "log",
  "parking_lot 0.11.1",
  "sc-client-api",
+ "serde",
+ "sp-api",
  "sp-blockchain",
  "sp-consensus",
+ "sp-core",
  "sp-runtime",
+ "sp-state-machine",
+ "sp-test-primitives",
+ "sp-utils",
+ "substrate-prometheus-endpoint",
+ "thiserror",
+ "wasm-timer",
 ]
 
 [[package]]
@@ -7281,6 +7294,7 @@ dependencies = [
  "parking_lot 0.11.1",
  "sc-block-builder",
  "sc-client-api",
+ "sc-consensus",
  "sc-consensus-slots",
  "sc-executor",
  "sc-keystore",
@@ -7331,6 +7345,7 @@ dependencies = [
  "retain_mut",
  "sc-block-builder",
  "sc-client-api",
+ "sc-consensus",
  "sc-consensus-epochs",
  "sc-consensus-slots",
  "sc-consensus-uncles",
@@ -7422,6 +7437,7 @@ dependencies = [
  "parking_lot 0.11.1",
  "sc-basic-authorship",
  "sc-client-api",
+ "sc-consensus",
  "sc-consensus-babe",
  "sc-consensus-epochs",
  "sc-transaction-pool",
@@ -7457,6 +7473,7 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.11.1",
  "sc-client-api",
+ "sc-consensus",
  "sp-api",
  "sp-block-builder",
  "sp-blockchain",
@@ -7479,6 +7496,7 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "sc-client-api",
+ "sc-consensus",
  "sc-telemetry",
  "sp-api",
  "sp-application-crypto",
@@ -7695,6 +7713,7 @@ dependencies = [
  "rand 0.8.3",
  "sc-block-builder",
  "sc-client-api",
+ "sc-consensus",
  "sc-finality-grandpa",
  "sc-network",
  "sc-service",
@@ -7797,6 +7816,7 @@ dependencies = [
  "rand 0.7.3",
  "sc-block-builder",
  "sc-client-api",
+ "sc-consensus",
  "sc-peerset",
  "serde",
  "serde_json",
@@ -7954,6 +7974,7 @@ dependencies = [
  "serde_json",
  "sp-api",
  "sp-blockchain",
+ "sp-consensus",
  "sp-core",
  "sp-io",
  "sp-keystore",
@@ -8048,6 +8069,7 @@ dependencies = [
  "sc-chain-spec",
  "sc-client-api",
  "sc-client-db",
+ "sc-consensus",
  "sc-executor",
  "sc-finality-grandpa",
  "sc-informant",
@@ -8110,6 +8132,7 @@ dependencies = [
  "sc-block-builder",
  "sc-client-api",
  "sc-client-db",
+ "sc-consensus",
  "sc-executor",
  "sc-light",
  "sc-network",
@@ -8847,7 +8870,6 @@ dependencies = [
  "async-trait",
  "futures 0.3.15",
  "futures-timer 3.0.2",
- "libp2p",
  "log",
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -9768,6 +9790,7 @@ dependencies = [
  "sp-api",
  "sp-application-crypto",
  "sp-block-builder",
+ "sp-consensus",
  "sp-consensus-aura",
  "sp-consensus-babe",
  "sp-core",
@@ -10024,7 +10047,6 @@ dependencies = [
  "sc-network",
  "sc-service",
  "sp-api",
- "sp-consensus",
  "sp-consensus-babe",
  "sp-inherents",
  "sp-keyring",
diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
index d97f29c00bca..dbdb3074d686 100644
--- a/bin/node-template/node/src/service.rs
+++ b/bin/node-template/node/src/service.rs
@@ -32,7 +32,7 @@ pub fn new_partial(
 		FullClient,
 		FullBackend,
 		FullSelectChain,
-		sp_consensus::DefaultImportQueue<Block, FullClient>,
+		sc_consensus::DefaultImportQueue<Block, FullClient>,
 		sc_transaction_pool::FullPool<Block, FullClient>,
 		(
 			sc_finality_grandpa::GrandpaBlockImport<
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index 47bc5f5b021f..e7181d3caec3 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -46,7 +46,7 @@ pub fn new_partial(
 		FullClient,
 		FullBackend,
 		FullSelectChain,
-		sp_consensus::DefaultImportQueue<Block, FullClient>,
+		sc_consensus::DefaultImportQueue<Block, FullClient>,
 		sc_transaction_pool::FullPool<Block, FullClient>,
 		(
 			impl Fn(node_rpc::DenyUnsafe, sc_rpc::SubscriptionTaskExecutor) -> node_rpc::IoHandler,
@@ -595,14 +595,13 @@ mod tests {
 		Address, BalancesCall, Call, UncheckedExtrinsic,
 	};
 	use sc_client_api::BlockBackend;
+	use sc_consensus::{BlockImport, BlockImportParams, ForkChoiceStrategy};
 	use sc_consensus_babe::{BabeIntermediate, CompatibleDigestItem, INTERMEDIATE_KEY};
 	use sc_consensus_epochs::descendent_query;
 	use sc_keystore::LocalKeystore;
 	use sc_service_test::TestNetNode;
 	use sc_transaction_pool_api::{ChainEvent, MaintainedTransactionPool};
-	use sp_consensus::{
-		BlockImport, BlockImportParams, BlockOrigin, Environment, ForkChoiceStrategy, Proposer,
-	};
+	use sp_consensus::{BlockOrigin, Environment, Proposer};
 	use sp_core::{crypto::Pair as CryptoPair, Public, H256};
 	use sp_inherents::InherentDataProvider;
 	use sp_keyring::AccountKeyring;
diff --git a/bin/node/test-runner-example/Cargo.toml b/bin/node/test-runner-example/Cargo.toml
index 3435a34c45c1..ef75731c38a6 100644
--- a/bin/node/test-runner-example/Cargo.toml
+++ b/bin/node/test-runner-example/Cargo.toml
@@ -31,7 +31,6 @@ sc-informant = { path = "../../../client/informant" }
 sc-consensus = { path = "../../../client/consensus/common" }
 
 sp-runtime = { path = "../../../primitives/runtime" }
-sp-consensus = { path = "../../../primitives/consensus/common" }
 sp-keyring = { path = "../../../primitives/keyring" }
 sp-timestamp = { path = "../../../primitives/timestamp" }
 sp-api = {  path = "../../../primitives/api" }
diff --git a/bin/node/testing/Cargo.toml b/bin/node/testing/Cargo.toml
index e2a4555e6797..656f9331c5af 100644
--- a/bin/node/testing/Cargo.toml
+++ b/bin/node/testing/Cargo.toml
@@ -17,6 +17,7 @@ pallet-balances = { version = "4.0.0-dev", path = "../../../frame/balances" }
 sc-service = { version = "0.10.0-dev", features = ["test-helpers", "db"],  path = "../../../client/service" }
 sc-client-db = { version = "0.10.0-dev", path = "../../../client/db/", features = ["kvdb-rocksdb", "parity-db"] }
 sc-client-api = { version = "4.0.0-dev", path = "../../../client/api/" }
+sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/common" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 pallet-contracts = { version = "4.0.0-dev", path = "../../../frame/contracts" }
 pallet-grandpa = { version = "4.0.0-dev", path = "../../../frame/grandpa" }
diff --git a/bin/node/testing/src/bench.rs b/bin/node/testing/src/bench.rs
index ceca493874dc..6aaaab04b627 100644
--- a/bin/node/testing/src/bench.rs
+++ b/bin/node/testing/src/bench.rs
@@ -45,12 +45,11 @@ use sc_client_api::{
 	BlockBackend, ExecutionStrategy,
 };
 use sc_client_db::PruningMode;
+use sc_consensus::{BlockImport, BlockImportParams, ForkChoiceStrategy, ImportResult, ImportedAux};
 use sc_executor::{NativeExecutor, WasmExecutionMethod};
 use sp_api::ProvideRuntimeApi;
 use sp_block_builder::BlockBuilder;
-use sp_consensus::{
-	BlockImport, BlockImportParams, BlockOrigin, ForkChoiceStrategy, ImportResult, ImportedAux,
-};
+use sp_consensus::BlockOrigin;
 use sp_core::{blake2_256, ed25519, sr25519, traits::SpawnNamed, ExecutionContext, Pair, Public};
 use sp_inherents::InherentData;
 use sp_runtime::{
diff --git a/client/api/src/backend.rs b/client/api/src/backend.rs
index 965e0151c3cb..0fcd85120c89 100644
--- a/client/api/src/backend.rs
+++ b/client/api/src/backend.rs
@@ -42,7 +42,6 @@ use std::{
 	sync::Arc,
 };
 
-pub use sp_consensus::ImportedState;
 pub use sp_state_machine::Backend as StateBackend;
 use std::marker::PhantomData;
 
diff --git a/client/consensus/aura/Cargo.toml b/client/consensus/aura/Cargo.toml
index f5a8aaf9dadb..c23ad5550576 100644
--- a/client/consensus/aura/Cargo.toml
+++ b/client/consensus/aura/Cargo.toml
@@ -20,6 +20,7 @@ sc-block-builder = { version = "0.10.0-dev", path = "../../block-builder" }
 sc-client-api = { version = "4.0.0-dev", path = "../../api" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
+sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/common" }
 sp-consensus-slots = { version = "0.10.0-dev", path = "../../../primitives/consensus/slots" }
 derive_more = "0.99.2"
 futures = "0.3.9"
diff --git a/client/consensus/aura/src/import_queue.rs b/client/consensus/aura/src/import_queue.rs
index a8036f28f164..96045fde43a9 100644
--- a/client/consensus/aura/src/import_queue.rs
+++ b/client/consensus/aura/src/import_queue.rs
@@ -23,6 +23,10 @@ use codec::{Codec, Decode, Encode};
 use log::{debug, info, trace};
 use prometheus_endpoint::Registry;
 use sc_client_api::{backend::AuxStore, BlockOf, UsageProvider};
+use sc_consensus::{
+	block_import::{BlockImport, BlockImportParams, ForkChoiceStrategy},
+	import_queue::{BasicQueue, BoxJustificationImport, DefaultImportQueue, Verifier},
+};
 use sc_consensus_slots::{check_equivocation, CheckedHeader, InherentDataProviderExt};
 use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_DEBUG, CONSENSUS_TRACE};
 use sp_api::{ApiExt, ProvideRuntimeApi};
@@ -31,11 +35,7 @@ use sp_blockchain::{
 	well_known_cache_keys::{self, Id as CacheKeyId},
 	HeaderBackend, ProvideCache,
 };
-use sp_consensus::{
-	import_queue::{BasicQueue, BoxJustificationImport, DefaultImportQueue, Verifier},
-	BlockImport, BlockImportParams, BlockOrigin, CanAuthorWith, Error as ConsensusError,
-	ForkChoiceStrategy,
-};
+use sp_consensus::{BlockOrigin, CanAuthorWith, Error as ConsensusError};
 use sp_consensus_aura::{
 	digests::CompatibleDigestItem, inherents::AuraInherentData, AuraApi, ConsensusLog,
 	AURA_ENGINE_ID,
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index 8efd39aa612e..d9c089b9561e 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -45,6 +45,7 @@ use log::{debug, trace};
 use codec::{Codec, Decode, Encode};
 
 use sc_client_api::{backend::AuxStore, BlockOf, UsageProvider};
+use sc_consensus::{BlockImport, BlockImportParams, ForkChoiceStrategy, StateAction};
 use sc_consensus_slots::{
 	BackoffAuthoringBlocksStrategy, InherentDataProviderExt, SlotInfo, StorageChanges,
 };
@@ -53,8 +54,7 @@ use sp_api::ProvideRuntimeApi;
 use sp_application_crypto::{AppKey, AppPublic};
 use sp_blockchain::{HeaderBackend, ProvideCache, Result as CResult};
 use sp_consensus::{
-	BlockImport, BlockImportParams, BlockOrigin, CanAuthorWith, Environment,
-	Error as ConsensusError, ForkChoiceStrategy, Proposer, SelectChain, StateAction,
+	BlockOrigin, CanAuthorWith, Environment, Error as ConsensusError, Proposer, SelectChain,
 };
 use sp_consensus_slots::Slot;
 use sp_core::crypto::{Pair, Public};
@@ -185,7 +185,7 @@ where
 	PF: Environment<B, Error = Error> + Send + Sync + 'static,
 	PF::Proposer: Proposer<B, Error = Error, Transaction = sp_api::TransactionFor<C, B>>,
 	SO: SyncOracle + Send + Sync + Clone,
-	L: sp_consensus::JustificationSyncLink<B>,
+	L: sc_consensus::JustificationSyncLink<B>,
 	CIDP: CreateInherentDataProviders<B, ()> + Send,
 	CIDP::InherentDataProviders: InherentDataProviderExt + Send,
 	BS: BackoffAuthoringBlocksStrategy<NumberFor<B>> + Send + 'static,
@@ -277,7 +277,7 @@ where
 	I: BlockImport<B, Transaction = sp_api::TransactionFor<C, B>> + Send + Sync + 'static,
 	Error: std::error::Error + Send + From<sp_consensus::Error> + 'static,
 	SO: SyncOracle + Send + Sync + Clone,
-	L: sp_consensus::JustificationSyncLink<B>,
+	L: sc_consensus::JustificationSyncLink<B>,
 	BS: BackoffAuthoringBlocksStrategy<NumberFor<B>> + Send + 'static,
 {
 	AuraWorker {
@@ -324,7 +324,7 @@ where
 	P::Public: AppPublic + Public + Member + Encode + Decode + Hash,
 	P::Signature: TryFrom<Vec<u8>> + Member + Encode + Decode + Hash + Debug,
 	SO: SyncOracle + Send + Clone,
-	L: sp_consensus::JustificationSyncLink<B>,
+	L: sc_consensus::JustificationSyncLink<B>,
 	BS: BackoffAuthoringBlocksStrategy<NumberFor<B>> + Send + 'static,
 	Error: std::error::Error + Send + From<sp_consensus::Error> + 'static,
 {
@@ -395,7 +395,7 @@ where
 				Self::Claim,
 				Self::EpochData,
 			) -> Result<
-				sp_consensus::BlockImportParams<B, sp_api::TransactionFor<C, B>>,
+				sc_consensus::BlockImportParams<B, sp_api::TransactionFor<C, B>>,
 				sp_consensus::Error,
 			> + Send
 			+ 'static,
@@ -431,7 +431,7 @@ where
 			import_block.post_digests.push(signature_digest_item);
 			import_block.body = Some(body);
 			import_block.state_action =
-				StateAction::ApplyChanges(sp_consensus::StorageChanges::Changes(storage_changes));
+				StateAction::ApplyChanges(sc_consensus::StorageChanges::Changes(storage_changes));
 			import_block.fork_choice = Some(ForkChoiceStrategy::LongestChain);
 
 			Ok(import_block)
@@ -560,14 +560,14 @@ mod tests {
 	use parking_lot::Mutex;
 	use sc_block_builder::BlockBuilderProvider;
 	use sc_client_api::BlockchainEvents;
+	use sc_consensus::BoxJustificationImport;
 	use sc_consensus_slots::{BackoffAuthoringOnFinalizedHeadLagging, SimpleSlotWorker};
 	use sc_keystore::LocalKeystore;
 	use sc_network::config::ProtocolConfig;
 	use sc_network_test::{Block as TestBlock, *};
 	use sp_application_crypto::key_types::AURA;
 	use sp_consensus::{
-		import_queue::BoxJustificationImport, AlwaysCanAuthor, DisableProofRecording,
-		NoNetwork as DummyOracle, Proposal, SlotData,
+		AlwaysCanAuthor, DisableProofRecording, NoNetwork as DummyOracle, Proposal, SlotData,
 	};
 	use sp_consensus_aura::sr25519::AuthorityPair;
 	use sp_inherents::InherentData;
diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml
index e76e293df5bb..e6538cb57aae 100644
--- a/client/consensus/babe/Cargo.toml
+++ b/client/consensus/babe/Cargo.toml
@@ -16,6 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 sp-consensus-babe = { version = "0.10.0-dev", path = "../../../primitives/consensus/babe" }
+sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/common" }
 sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
 sp-application-crypto = { version = "4.0.0-dev", path = "../../../primitives/application-crypto" }
 sp-keystore = { version = "0.10.0-dev", path = "../../../primitives/keystore" }
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index a8258e2c8352..b09cd6ad86b8 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -85,6 +85,13 @@ use retain_mut::RetainMut;
 use schnorrkel::SignatureError;
 
 use sc_client_api::{backend::AuxStore, BlockchainEvents, ProvideUncles, UsageProvider};
+use sc_consensus::{
+	block_import::{
+		BlockCheckParams, BlockImport, BlockImportParams, ForkChoiceStrategy, ImportResult,
+		StateAction,
+	},
+	import_queue::{BasicQueue, BoxJustificationImport, DefaultImportQueue, Verifier},
+};
 use sc_consensus_epochs::{
 	descendent_query, Epoch as EpochT, EpochChangesFor, SharedEpochChanges, ViableEpochDescriptor,
 };
@@ -100,10 +107,8 @@ use sp_blockchain::{
 	Error as ClientError, HeaderBackend, HeaderMetadata, ProvideCache, Result as ClientResult,
 };
 use sp_consensus::{
-	import_queue::{BasicQueue, BoxJustificationImport, CacheKeyId, DefaultImportQueue, Verifier},
-	BlockCheckParams, BlockImport, BlockImportParams, BlockOrigin, CanAuthorWith, Environment,
-	Error as ConsensusError, ForkChoiceStrategy, ImportResult, Proposer, SelectChain, SlotData,
-	StateAction,
+	BlockOrigin, CacheKeyId, CanAuthorWith, Environment, Error as ConsensusError, Proposer,
+	SelectChain, SlotData,
 };
 use sp_consensus_babe::inherents::BabeInherentData;
 use sp_consensus_slots::Slot;
@@ -465,7 +470,7 @@ where
 		+ Sync
 		+ 'static,
 	SO: SyncOracle + Send + Sync + Clone + 'static,
-	L: sp_consensus::JustificationSyncLink<B> + 'static,
+	L: sc_consensus::JustificationSyncLink<B> + 'static,
 	CIDP: CreateInherentDataProviders<B, ()> + Send + Sync + 'static,
 	CIDP::InherentDataProviders: InherentDataProviderExt + Send,
 	BS: BackoffAuthoringBlocksStrategy<NumberFor<B>> + Send + 'static,
@@ -668,7 +673,7 @@ where
 	E::Proposer: Proposer<B, Error = Error, Transaction = sp_api::TransactionFor<C, B>>,
 	I: BlockImport<B, Transaction = sp_api::TransactionFor<C, B>> + Send + Sync + 'static,
 	SO: SyncOracle + Send + Clone,
-	L: sp_consensus::JustificationSyncLink<B>,
+	L: sc_consensus::JustificationSyncLink<B>,
 	BS: BackoffAuthoringBlocksStrategy<NumberFor<B>>,
 	Error: std::error::Error + Send + From<ConsensusError> + From<I::Error> + 'static,
 {
@@ -774,7 +779,7 @@ where
 				StorageChanges<I::Transaction, B>,
 				Self::Claim,
 				Self::EpochData,
-			) -> Result<sp_consensus::BlockImportParams<B, I::Transaction>, sp_consensus::Error>
+			) -> Result<sc_consensus::BlockImportParams<B, I::Transaction>, sp_consensus::Error>
 			+ Send
 			+ 'static,
 	> {
@@ -809,7 +814,7 @@ where
 				import_block.post_digests.push(digest_item);
 				import_block.body = Some(body);
 				import_block.state_action = StateAction::ApplyChanges(
-					sp_consensus::StorageChanges::Changes(storage_changes),
+					sc_consensus::StorageChanges::Changes(storage_changes),
 				);
 				import_block.intermediates.insert(
 					Cow::from(INTERMEDIATE_KEY),
diff --git a/client/consensus/babe/src/tests.rs b/client/consensus/babe/src/tests.rs
index fa42df356a09..d21911a7fe50 100644
--- a/client/consensus/babe/src/tests.rs
+++ b/client/consensus/babe/src/tests.rs
@@ -29,15 +29,13 @@ use rand::RngCore;
 use rand_chacha::{rand_core::SeedableRng, ChaChaRng};
 use sc_block_builder::{BlockBuilder, BlockBuilderProvider};
 use sc_client_api::{backend::TransactionFor, BlockchainEvents};
+use sc_consensus::{BoxBlockImport, BoxJustificationImport};
 use sc_consensus_slots::BackoffAuthoringOnFinalizedHeadLagging;
 use sc_keystore::LocalKeystore;
 use sc_network::config::ProtocolConfig;
 use sc_network_test::{Block as TestBlock, *};
 use sp_application_crypto::key_types::BABE;
-use sp_consensus::{
-	import_queue::{BoxBlockImport, BoxJustificationImport},
-	AlwaysCanAuthor, DisableProofRecording, NoNetwork as DummyOracle, Proposal,
-};
+use sp_consensus::{AlwaysCanAuthor, DisableProofRecording, NoNetwork as DummyOracle, Proposal};
 use sp_consensus_babe::{
 	inherents::InherentDataProvider, make_transcript, make_transcript_data, AllowedSlots,
 	AuthorityPair, Slot,
diff --git a/client/consensus/common/Cargo.toml b/client/consensus/common/Cargo.toml
index c8d86b06115a..c34e5416f84b 100644
--- a/client/consensus/common/Cargo.toml
+++ b/client/consensus/common/Cargo.toml
@@ -13,9 +13,24 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-async-trait = "0.1"
+thiserror = "1.0.21"
+libp2p = { version = "0.37.1", default-features = false }
+log = "0.4.8"
+futures = { version = "0.3.1", features = ["thread-pool"] }
+futures-timer = "3.0.1"
 sc-client-api = { version = "4.0.0-dev", path = "../../api" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
+sp-core = { path = "../../../primitives/core", version = "4.0.0-dev"}
+sp-consensus = { path = "../../../primitives/consensus/common", version = "0.10.0-dev"}
+sp-state-machine = { version = "0.10.0-dev", path = "../../../primitives/state-machine" }
 sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
-sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
+sp-utils = { version = "4.0.0-dev", path = "../../../primitives/utils" }
+sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
 parking_lot = "0.11.1"
+serde = { version = "1.0", features = ["derive"] }
+prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0" }
+wasm-timer = "0.2.5"
+async-trait = "0.1.42"
+
+[dev-dependencies]
+sp-test-primitives = { version = "2.0.0", path = "../../../primitives/test-primitives" }
diff --git a/primitives/consensus/common/src/block_import.rs b/client/consensus/common/src/block_import.rs
similarity index 96%
rename from primitives/consensus/common/src/block_import.rs
rename to client/consensus/common/src/block_import.rs
index c742e24a0cc0..616378fc9b18 100644
--- a/primitives/consensus/common/src/block_import.rs
+++ b/client/consensus/common/src/block_import.rs
@@ -24,7 +24,7 @@ use sp_runtime::{
 };
 use std::{any::Any, borrow::Cow, collections::HashMap, sync::Arc};
 
-use crate::{import_queue::CacheKeyId, Error};
+use sp_consensus::{BlockOrigin, CacheKeyId, Error};
 
 /// Block import result.
 #[derive(Debug, PartialEq, Eq)]
@@ -92,23 +92,6 @@ impl ImportResult {
 	}
 }
 
-/// Block data origin.
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
-pub enum BlockOrigin {
-	/// Genesis block built into the client.
-	Genesis,
-	/// Block is part of the initial sync with the network.
-	NetworkInitialSync,
-	/// Block was broadcasted on the network.
-	NetworkBroadcast,
-	/// Block that was received from the network and validated in the consensus process.
-	ConsensusBroadcast,
-	/// Block that was collated by this node.
-	Own,
-	/// Block was imported from a file.
-	File,
-}
-
 /// Fork choice strategy.
 #[derive(Debug, PartialEq, Eq, Clone, Copy)]
 pub enum ForkChoiceStrategy {
@@ -354,7 +337,7 @@ impl<B: BlockT, Transaction> BlockImport<B> for crate::import_queue::BoxBlockImp
 where
 	Transaction: Send + 'static,
 {
-	type Error = crate::error::Error;
+	type Error = sp_consensus::error::Error;
 	type Transaction = Transaction;
 
 	/// Check block preconditions.
diff --git a/primitives/consensus/common/src/import_queue.rs b/client/consensus/common/src/import_queue.rs
similarity index 90%
rename from primitives/consensus/common/src/import_queue.rs
rename to client/consensus/common/src/import_queue.rs
index 6eb8d0a750a2..b1a24e5620d3 100644
--- a/primitives/consensus/common/src/import_queue.rs
+++ b/client/consensus/common/src/import_queue.rs
@@ -28,6 +28,7 @@
 
 use std::collections::HashMap;
 
+use log::{debug, trace};
 use sp_runtime::{
 	traits::{Block as BlockT, Header as _, NumberFor},
 	Justifications,
@@ -35,13 +36,13 @@ use sp_runtime::{
 
 use crate::{
 	block_import::{
-		BlockCheckParams, BlockImport, BlockImportParams, BlockOrigin, ImportResult, ImportedAux,
-		ImportedState, JustificationImport, StateAction,
+		BlockCheckParams, BlockImport, BlockImportParams, ImportResult, ImportedAux, ImportedState,
+		JustificationImport, StateAction,
 	},
-	error::Error as ConsensusError,
 	metrics::Metrics,
 };
 pub use basic_queue::BasicQueue;
+use sp_consensus::{error::Error as ConsensusError, BlockOrigin, CacheKeyId};
 
 /// A commonly-used Import Queue type.
 ///
@@ -80,7 +81,7 @@ pub struct IncomingBlock<B: BlockT> {
 	pub origin: Option<Origin>,
 	/// Allow importing the block skipping state verification if parent state is missing.
 	pub allow_missing_state: bool,
-	/// Skip block exection and state verification.
+	/// Skip block execution and state verification.
 	pub skip_execution: bool,
 	/// Re-validate existing block.
 	pub import_existing: bool,
@@ -88,9 +89,6 @@ pub struct IncomingBlock<B: BlockT> {
 	pub state: Option<ImportedState<B>>,
 }
 
-/// Type of keys in the blockchain cache that consensus module could use for its needs.
-pub type CacheKeyId = [u8; 4];
-
 /// Verify a justification of a block
 #[async_trait::async_trait]
 pub trait Verifier<B: BlockT>: Send + Sync {
@@ -137,9 +135,10 @@ pub trait Link<B: BlockT>: Send {
 		&mut self,
 		_imported: usize,
 		_count: usize,
-		_results: Vec<(Result<BlockImportResult<NumberFor<B>>, BlockImportError>, B::Hash)>,
+		_results: Vec<(BlockImportResult<B>, B::Hash)>,
 	) {
 	}
+
 	/// Justification import result.
 	fn justification_imported(
 		&mut self,
@@ -149,13 +148,14 @@ pub trait Link<B: BlockT>: Send {
 		_success: bool,
 	) {
 	}
+
 	/// Request a justification for the given block.
 	fn request_justification(&mut self, _hash: &B::Hash, _number: NumberFor<B>) {}
 }
 
 /// Block import successful result.
 #[derive(Debug, PartialEq)]
-pub enum BlockImportResult<N: std::fmt::Debug + PartialEq> {
+pub enum BlockImportStatus<N: std::fmt::Debug + PartialEq> {
 	/// Imported known block.
 	ImportedKnown(N, Option<Origin>),
 	/// Imported unknown block.
@@ -181,13 +181,15 @@ pub enum BlockImportError {
 	Other(ConsensusError),
 }
 
+type BlockImportResult<B> = Result<BlockImportStatus<NumberFor<B>>, BlockImportError>;
+
 /// Single block import function.
 pub async fn import_single_block<B: BlockT, V: Verifier<B>, Transaction: Send + 'static>(
 	import_handle: &mut impl BlockImport<B, Transaction = Transaction, Error = ConsensusError>,
 	block_origin: BlockOrigin,
 	block: IncomingBlock<B>,
 	verifier: &mut V,
-) -> Result<BlockImportResult<NumberFor<B>>, BlockImportError> {
+) -> BlockImportResult<B> {
 	import_single_block_metered(import_handle, block_origin, block, verifier, None).await
 }
 
@@ -202,7 +204,7 @@ pub(crate) async fn import_single_block_metered<
 	block: IncomingBlock<B>,
 	verifier: &mut V,
 	metrics: Option<Metrics>,
-) -> Result<BlockImportResult<NumberFor<B>>, BlockImportError> {
+) -> BlockImportResult<B> {
 	let peer = block.origin;
 
 	let (header, justifications) = match (block.header, block.justifications) {
@@ -226,16 +228,18 @@ pub(crate) async fn import_single_block_metered<
 	let import_handler = |import| match import {
 		Ok(ImportResult::AlreadyInChain) => {
 			trace!(target: "sync", "Block already in chain {}: {:?}", number, hash);
-			Ok(BlockImportResult::ImportedKnown(number, peer.clone()))
+			Ok(BlockImportStatus::ImportedKnown(number, peer.clone()))
 		},
 		Ok(ImportResult::Imported(aux)) =>
-			Ok(BlockImportResult::ImportedUnknown(number, aux, peer.clone())),
+			Ok(BlockImportStatus::ImportedUnknown(number, aux, peer.clone())),
 		Ok(ImportResult::MissingState) => {
-			debug!(target: "sync", "Parent state is missing for {}: {:?}, parent: {:?}", number, hash, parent_hash);
+			debug!(target: "sync", "Parent state is missing for {}: {:?}, parent: {:?}",
+					number, hash, parent_hash);
 			Err(BlockImportError::MissingState)
 		},
 		Ok(ImportResult::UnknownParent) => {
-			debug!(target: "sync", "Block with unknown parent {}: {:?}, parent: {:?}", number, hash, parent_hash);
+			debug!(target: "sync", "Block with unknown parent {}: {:?}, parent: {:?}",
+					number, hash, parent_hash);
 			Err(BlockImportError::UnknownParent)
 		},
 		Ok(ImportResult::KnownBad) => {
@@ -259,7 +263,7 @@ pub(crate) async fn import_single_block_metered<
 			})
 			.await,
 	)? {
-		BlockImportResult::ImportedUnknown { .. } => (),
+		BlockImportStatus::ImportedUnknown { .. } => (),
 		r => return Ok(r), // Any other successful result means that the block is already imported.
 	}
 
@@ -291,7 +295,8 @@ pub(crate) async fn import_single_block_metered<
 	import_block.indexed_body = block.indexed_body;
 	let mut import_block = import_block.clear_storage_changes_and_mutate();
 	if let Some(state) = block.state {
-		import_block.state_action = StateAction::ApplyChanges(crate::StorageChanges::Import(state));
+		let changes = crate::block_import::StorageChanges::Import(state);
+		import_block.state_action = StateAction::ApplyChanges(changes);
 	} else if block.skip_execution {
 		import_block.state_action = StateAction::Skip;
 	} else if block.allow_missing_state {
diff --git a/primitives/consensus/common/src/import_queue/basic_queue.rs b/client/consensus/common/src/import_queue/basic_queue.rs
similarity index 94%
rename from primitives/consensus/common/src/import_queue/basic_queue.rs
rename to client/consensus/common/src/import_queue/basic_queue.rs
index 2610a92ad83e..2de5f578a7a6 100644
--- a/primitives/consensus/common/src/import_queue/basic_queue.rs
+++ b/client/consensus/common/src/import_queue/basic_queue.rs
@@ -14,13 +14,14 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-
 use futures::{
 	prelude::*,
 	task::{Context, Poll},
 };
 use futures_timer::Delay;
+use log::{debug, trace};
 use prometheus_endpoint::Registry;
+use sp_consensus::BlockOrigin;
 use sp_runtime::{
 	traits::{Block as BlockT, Header as HeaderT, NumberFor},
 	Justification, Justifications,
@@ -29,10 +30,9 @@ use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnbound
 use std::{marker::PhantomData, pin::Pin, time::Duration};
 
 use crate::{
-	block_import::BlockOrigin,
 	import_queue::{
 		buffered_link::{self, BufferedLinkReceiver, BufferedLinkSender},
-		import_single_block_metered, BlockImportError, BlockImportResult, BoxBlockImport,
+		import_single_block_metered, BlockImportError, BlockImportStatus, BoxBlockImport,
 		BoxJustificationImport, ImportQueue, IncomingBlock, Link, Origin, Verifier,
 	},
 	metrics::Metrics,
@@ -41,7 +41,7 @@ use crate::{
 /// Interface to a basic block import queue that is importing blocks sequentially in a separate
 /// task, with plugable verification.
 pub struct BasicQueue<B: BlockT, Transaction> {
-	/// Channel to send justifcation import messages to the background task.
+	/// Channel to send justification import messages to the background task.
 	justification_sender: TracingUnboundedSender<worker_messages::ImportJustification<B>>,
 	/// Channel to send block import messages to the background task.
 	block_import_sender: TracingUnboundedSender<worker_messages::ImportBlocks<B>>,
@@ -156,9 +156,9 @@ mod worker_messages {
 
 /// The process of importing blocks.
 ///
-/// This polls the `block_import_receiver` for new blocks to import and than awaits on importing these blocks.
-/// After each block is imported, this async function yields once to give other futures the possibility
-/// to be run.
+/// This polls the `block_import_receiver` for new blocks to import and than awaits on
+/// importing these blocks. After each block is imported, this async function yields once
+/// to give other futures the possibility to be run.
 ///
 /// Returns when `block_import` ended.
 async fn block_import_process<B: BlockT, Transaction: Send + 'static>(
@@ -325,12 +325,13 @@ struct ImportManyBlocksResult<B: BlockT> {
 	/// The total number of blocks processed.
 	block_count: usize,
 	/// The import results for each block.
-	results: Vec<(Result<BlockImportResult<NumberFor<B>>, BlockImportError>, B::Hash)>,
+	results: Vec<(Result<BlockImportStatus<NumberFor<B>>, BlockImportError>, B::Hash)>,
 }
 
 /// Import several blocks at once, returning import result for each block.
 ///
-/// This will yield after each imported block once, to ensure that other futures can be called as well.
+/// This will yield after each imported block once, to ensure that other futures can
+/// be called as well.
 async fn import_many_blocks<B: BlockT, V: Verifier<B>, Transaction: Send + 'static>(
 	import_handle: &mut BoxBlockImport<B, Transaction>,
 	blocks_origin: BlockOrigin,
@@ -410,11 +411,11 @@ async fn import_many_blocks<B: BlockT, V: Verifier<B>, Transaction: Send + 'stat
 	}
 }
 
-/// A future that will always `yield` on the first call of `poll` but schedules the current task for
-/// re-execution.
+/// A future that will always `yield` on the first call of `poll` but schedules the
+/// current task for re-execution.
 ///
-/// This is done by getting the waker and calling `wake_by_ref` followed by returning `Pending`.
-/// The next time the `poll` is called, it will return `Ready`.
+/// This is done by getting the waker and calling `wake_by_ref` followed by returning
+/// `Pending`. The next time the `poll` is called, it will return `Ready`.
 struct Yield(bool);
 
 impl Yield {
@@ -441,8 +442,10 @@ impl Future for Yield {
 mod tests {
 	use super::*;
 	use crate::{
+		block_import::{
+			BlockCheckParams, BlockImport, BlockImportParams, ImportResult, JustificationImport,
+		},
 		import_queue::{CacheKeyId, Verifier},
-		BlockCheckParams, BlockImport, BlockImportParams, ImportResult, JustificationImport,
 	};
 	use futures::{executor::block_on, Future};
 	use sp_test_primitives::{Block, BlockNumber, Extrinsic, Hash, Header};
@@ -463,7 +466,7 @@ mod tests {
 
 	#[async_trait::async_trait]
 	impl BlockImport<Block> for () {
-		type Error = crate::Error;
+		type Error = sp_consensus::Error;
 		type Transaction = Extrinsic;
 
 		async fn check_block(
@@ -484,7 +487,7 @@ mod tests {
 
 	#[async_trait::async_trait]
 	impl JustificationImport<Block> for () {
-		type Error = crate::Error;
+		type Error = sp_consensus::Error;
 
 		async fn on_start(&mut self) -> Vec<(Hash, BlockNumber)> {
 			Vec::new()
@@ -516,7 +519,7 @@ mod tests {
 			&mut self,
 			_imported: usize,
 			_count: usize,
-			results: Vec<(Result<BlockImportResult<BlockNumber>, BlockImportError>, Hash)>,
+			results: Vec<(Result<BlockImportStatus<BlockNumber>, BlockImportError>, Hash)>,
 		) {
 			if let Some(hash) = results.into_iter().find_map(|(r, h)| r.ok().map(|_| h)) {
 				self.events.push(Event::BlockImported(hash));
diff --git a/primitives/consensus/common/src/import_queue/buffered_link.rs b/client/consensus/common/src/import_queue/buffered_link.rs
similarity index 92%
rename from primitives/consensus/common/src/import_queue/buffered_link.rs
rename to client/consensus/common/src/import_queue/buffered_link.rs
index 8d146dfbe461..45aaf706ee1b 100644
--- a/primitives/consensus/common/src/import_queue/buffered_link.rs
+++ b/client/consensus/common/src/import_queue/buffered_link.rs
@@ -22,8 +22,8 @@
 //! # Example
 //!
 //! ```
-//! use sp_consensus::import_queue::Link;
-//! # use sp_consensus::import_queue::buffered_link::buffered_link;
+//! use sc_consensus::import_queue::Link;
+//! # use sc_consensus::import_queue::buffered_link::buffered_link;
 //! # use sp_test_primitives::Block;
 //! # struct DummyLink; impl Link<Block> for DummyLink {}
 //! # let mut my_link = DummyLink;
@@ -37,7 +37,7 @@
 //! });
 //! ```
 
-use crate::import_queue::{BlockImportError, BlockImportResult, Link, Origin};
+use crate::import_queue::{Link, Origin};
 use futures::prelude::*;
 use sp_runtime::traits::{Block as BlockT, NumberFor};
 use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
@@ -46,6 +46,8 @@ use std::{
 	task::{Context, Poll},
 };
 
+use super::BlockImportResult;
+
 /// Wraps around an unbounded channel from the `futures` crate. The sender implements `Link` and
 /// can be used to buffer commands, and the receiver can be used to poll said commands and transfer
 /// them to another link.
@@ -78,11 +80,7 @@ impl<B: BlockT> Clone for BufferedLinkSender<B> {
 
 /// Internal buffered message.
 enum BlockImportWorkerMsg<B: BlockT> {
-	BlocksProcessed(
-		usize,
-		usize,
-		Vec<(Result<BlockImportResult<NumberFor<B>>, BlockImportError>, B::Hash)>,
-	),
+	BlocksProcessed(usize, usize, Vec<(BlockImportResult<B>, B::Hash)>),
 	JustificationImported(Origin, B::Hash, NumberFor<B>, bool),
 	RequestJustification(B::Hash, NumberFor<B>),
 }
@@ -92,7 +90,7 @@ impl<B: BlockT> Link<B> for BufferedLinkSender<B> {
 		&mut self,
 		imported: usize,
 		count: usize,
-		results: Vec<(Result<BlockImportResult<NumberFor<B>>, BlockImportError>, B::Hash)>,
+		results: Vec<(BlockImportResult<B>, B::Hash)>,
 	) {
 		let _ = self
 			.tx
diff --git a/client/consensus/common/src/lib.rs b/client/consensus/common/src/lib.rs
index 9b4d70576919..640bad237e88 100644
--- a/client/consensus/common/src/lib.rs
+++ b/client/consensus/common/src/lib.rs
@@ -18,7 +18,22 @@
 
 //! Collection of common consensus specific implementations
 
+pub mod block_import;
+pub mod import_queue;
+pub mod metrics;
+
+pub use block_import::{
+	BlockCheckParams, BlockImport, BlockImportParams, ForkChoiceStrategy, ImportResult,
+	ImportedAux, ImportedState, JustificationImport, JustificationSyncLink, StateAction,
+	StorageChanges,
+};
+pub use import_queue::{
+	import_single_block, BasicQueue, BlockImportError, BlockImportStatus, BoxBlockImport,
+	BoxJustificationImport, DefaultImportQueue, ImportQueue, IncomingBlock, Link, Verifier,
+};
+
 mod longest_chain;
+
 pub mod shared_data;
 
 pub use longest_chain::LongestChain;
diff --git a/primitives/consensus/common/src/metrics.rs b/client/consensus/common/src/metrics.rs
similarity index 96%
rename from primitives/consensus/common/src/metrics.rs
rename to client/consensus/common/src/metrics.rs
index c56f68625b6a..e9af41914a6e 100644
--- a/primitives/consensus/common/src/metrics.rs
+++ b/client/consensus/common/src/metrics.rs
@@ -24,7 +24,7 @@ use prometheus_endpoint::{
 
 use sp_runtime::traits::{Block as BlockT, NumberFor};
 
-use crate::import_queue::{BlockImportError, BlockImportResult};
+use crate::import_queue::{BlockImportError, BlockImportStatus};
 
 /// Generic Prometheus metrics for common consensus functionality.
 #[derive(Clone)]
@@ -71,7 +71,7 @@ impl Metrics {
 
 	pub fn report_import<B: BlockT>(
 		&self,
-		result: &Result<BlockImportResult<NumberFor<B>>, BlockImportError>,
+		result: &Result<BlockImportStatus<NumberFor<B>>, BlockImportError>,
 	) {
 		let label = match result {
 			Ok(_) => "success",
diff --git a/client/consensus/manual-seal/Cargo.toml b/client/consensus/manual-seal/Cargo.toml
index 8a236b0591b8..a0de596b005b 100644
--- a/client/consensus/manual-seal/Cargo.toml
+++ b/client/consensus/manual-seal/Cargo.toml
@@ -26,6 +26,7 @@ assert_matches = "1.3.0"
 async-trait = "0.1.50"
 
 sc-client-api = { path = "../../api", version = "4.0.0-dev"}
+sc-consensus = { version = "0.10.0-dev", path = "../../consensus/common" }
 sc-consensus-babe = { path = "../../consensus/babe", version = "0.10.0-dev"}
 sc-consensus-epochs = { path = "../../consensus/epochs", version = "0.10.0-dev"}
 sp-consensus-babe = { path = "../../../primitives/consensus/babe", version = "0.10.0-dev"}
diff --git a/client/consensus/manual-seal/src/consensus.rs b/client/consensus/manual-seal/src/consensus.rs
index 1f7ee413b71d..33a4c8616f6d 100644
--- a/client/consensus/manual-seal/src/consensus.rs
+++ b/client/consensus/manual-seal/src/consensus.rs
@@ -19,7 +19,7 @@
 //! Extensions for manual seal to produce blocks valid for any runtime.
 use super::Error;
 
-use sp_consensus::BlockImportParams;
+use sc_consensus::BlockImportParams;
 use sp_inherents::InherentData;
 use sp_runtime::traits::{Block as BlockT, DigestFor};
 
diff --git a/client/consensus/manual-seal/src/consensus/babe.rs b/client/consensus/manual-seal/src/consensus/babe.rs
index 3773c7c3cf12..9edcb8fd13a1 100644
--- a/client/consensus/manual-seal/src/consensus/babe.rs
+++ b/client/consensus/manual-seal/src/consensus/babe.rs
@@ -36,12 +36,10 @@ use std::{
 	time::SystemTime,
 };
 
+use sc_consensus::{BlockImportParams, ForkChoiceStrategy, Verifier};
 use sp_api::{ProvideRuntimeApi, TransactionFor};
 use sp_blockchain::{HeaderBackend, HeaderMetadata};
-use sp_consensus::{
-	import_queue::{CacheKeyId, Verifier},
-	BlockImportParams, BlockOrigin, ForkChoiceStrategy,
-};
+use sp_consensus::{BlockOrigin, CacheKeyId};
 use sp_consensus_babe::{
 	digests::{NextEpochDescriptor, PreDigest, SecondaryPlainPreDigest},
 	inherents::BabeInherentData,
diff --git a/client/consensus/manual-seal/src/error.rs b/client/consensus/manual-seal/src/error.rs
index cd7fc0ee73ce..8585e6a70d64 100644
--- a/client/consensus/manual-seal/src/error.rs
+++ b/client/consensus/manual-seal/src/error.rs
@@ -20,8 +20,9 @@
 //! This is suitable for a testing environment.
 
 use futures::channel::{mpsc::SendError, oneshot};
+use sc_consensus::ImportResult;
 use sp_blockchain::Error as BlockchainError;
-use sp_consensus::{Error as ConsensusError, ImportResult};
+use sp_consensus::Error as ConsensusError;
 use sp_inherents::Error as InherentsError;
 
 /// Error code for rpc
diff --git a/client/consensus/manual-seal/src/lib.rs b/client/consensus/manual-seal/src/lib.rs
index 1aacd22aa7bb..7d4dfefe50c6 100644
--- a/client/consensus/manual-seal/src/lib.rs
+++ b/client/consensus/manual-seal/src/lib.rs
@@ -22,12 +22,12 @@
 use futures::prelude::*;
 use prometheus_endpoint::Registry;
 use sc_client_api::backend::{Backend as ClientBackend, Finalizer};
-use sp_blockchain::HeaderBackend;
-use sp_consensus::{
-	import_queue::{BasicQueue, BoxBlockImport, CacheKeyId, Verifier},
-	BlockImport, BlockImportParams, BlockOrigin, Environment, ForkChoiceStrategy, Proposer,
-	SelectChain,
+use sc_consensus::{
+	block_import::{BlockImport, BlockImportParams, ForkChoiceStrategy},
+	import_queue::{BasicQueue, BoxBlockImport, Verifier},
 };
+use sp_blockchain::HeaderBackend;
+use sp_consensus::{BlockOrigin, CacheKeyId, Environment, Proposer, SelectChain};
 use sp_inherents::CreateInherentDataProviders;
 use sp_runtime::{traits::Block as BlockT, ConsensusEngineId, Justifications};
 use std::{marker::PhantomData, sync::Arc};
@@ -257,9 +257,9 @@ mod tests {
 	use super::*;
 	use sc_basic_authorship::ProposerFactory;
 	use sc_client_api::BlockBackend;
+	use sc_consensus::ImportedAux;
 	use sc_transaction_pool::{BasicPool, Options, RevalidationType};
 	use sc_transaction_pool_api::{MaintainedTransactionPool, TransactionPool, TransactionSource};
-	use sp_consensus::ImportedAux;
 	use sp_runtime::generic::BlockId;
 	use substrate_test_runtime_client::{
 		AccountKeyring::*, DefaultTestClientBuilderExt, TestClientBuilder, TestClientBuilderExt,
diff --git a/client/consensus/manual-seal/src/rpc.rs b/client/consensus/manual-seal/src/rpc.rs
index 0f686bc26e7d..699505b00c3c 100644
--- a/client/consensus/manual-seal/src/rpc.rs
+++ b/client/consensus/manual-seal/src/rpc.rs
@@ -25,8 +25,8 @@ use futures::{
 };
 use jsonrpc_core::Error;
 use jsonrpc_derive::rpc;
+use sc_consensus::ImportedAux;
 use serde::{Deserialize, Serialize};
-use sp_consensus::ImportedAux;
 use sp_runtime::EncodedJustification;
 
 /// Future's type for jsonrpc
diff --git a/client/consensus/manual-seal/src/seal_block.rs b/client/consensus/manual-seal/src/seal_block.rs
index be97e0ccc360..502705b41162 100644
--- a/client/consensus/manual-seal/src/seal_block.rs
+++ b/client/consensus/manual-seal/src/seal_block.rs
@@ -20,13 +20,11 @@
 
 use crate::{rpc, ConsensusDataProvider, CreatedBlock, Error};
 use futures::prelude::*;
+use sc_consensus::{BlockImport, BlockImportParams, ForkChoiceStrategy, ImportResult, StateAction};
 use sc_transaction_pool_api::TransactionPool;
 use sp_api::{ProvideRuntimeApi, TransactionFor};
 use sp_blockchain::HeaderBackend;
-use sp_consensus::{
-	self, BlockImport, BlockImportParams, BlockOrigin, Environment, ForkChoiceStrategy,
-	ImportResult, Proposer, SelectChain, StateAction,
-};
+use sp_consensus::{self, BlockOrigin, Environment, Proposer, SelectChain};
 use sp_inherents::{CreateInherentDataProviders, InherentDataProvider};
 use sp_runtime::{
 	generic::BlockId,
@@ -147,7 +145,7 @@ pub async fn seal_block<B, BI, SC, C, E, TP, CIDP>(
 		params.body = Some(body);
 		params.finalized = finalize;
 		params.fork_choice = Some(ForkChoiceStrategy::LongestChain);
-		params.state_action = StateAction::ApplyChanges(sp_consensus::StorageChanges::Changes(
+		params.state_action = StateAction::ApplyChanges(sc_consensus::StorageChanges::Changes(
 			proposal.storage_changes,
 		));
 
diff --git a/client/consensus/pow/Cargo.toml b/client/consensus/pow/Cargo.toml
index 77ed9ba04ce9..368005fafb13 100644
--- a/client/consensus/pow/Cargo.toml
+++ b/client/consensus/pow/Cargo.toml
@@ -23,6 +23,7 @@ sp-block-builder = { version = "4.0.0-dev", path = "../../../primitives/block-bu
 sp-inherents = { version = "4.0.0-dev", path = "../../../primitives/inherents" }
 sp-consensus-pow = { version = "0.10.0-dev", path = "../../../primitives/consensus/pow" }
 sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
+sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/common" }
 log = "0.4.8"
 futures = { version = "0.3.1", features = ["compat"] }
 futures-timer = "3.0.1"
diff --git a/client/consensus/pow/src/lib.rs b/client/consensus/pow/src/lib.rs
index 7e5b5a59c917..85a37e73535a 100644
--- a/client/consensus/pow/src/lib.rs
+++ b/client/consensus/pow/src/lib.rs
@@ -43,19 +43,23 @@ mod worker;
 
 pub use crate::worker::{MiningBuild, MiningMetadata, MiningWorker};
 
+use crate::worker::UntilImportedOrTimeout;
 use codec::{Decode, Encode};
 use futures::{Future, StreamExt};
 use log::*;
 use parking_lot::Mutex;
 use prometheus_endpoint::Registry;
 use sc_client_api::{self, backend::AuxStore, BlockOf, BlockchainEvents};
+use sc_consensus::{
+	BasicQueue, BlockCheckParams, BlockImport, BlockImportParams, BoxBlockImport,
+	BoxJustificationImport, ForkChoiceStrategy, ImportResult, Verifier,
+};
 use sp_api::ProvideRuntimeApi;
 use sp_block_builder::BlockBuilder as BlockBuilderApi;
 use sp_blockchain::{well_known_cache_keys::Id as CacheKeyId, HeaderBackend, ProvideCache};
 use sp_consensus::{
-	import_queue::{BasicQueue, BoxBlockImport, BoxJustificationImport, Verifier},
-	BlockCheckParams, BlockImport, BlockImportParams, BlockOrigin, CanAuthorWith, Environment,
-	Error as ConsensusError, ForkChoiceStrategy, ImportResult, Proposer, SelectChain, SyncOracle,
+	BlockOrigin, CanAuthorWith, Environment, Error as ConsensusError, Proposer, SelectChain,
+	SyncOracle,
 };
 use sp_consensus_pow::{Seal, TotalDifficulty, POW_ENGINE_ID};
 use sp_inherents::{CreateInherentDataProviders, InherentDataProvider};
@@ -69,8 +73,6 @@ use std::{
 	time::Duration,
 };
 
-use crate::worker::UntilImportedOrTimeout;
-
 #[derive(derive_more::Display, Debug)]
 pub enum Error<B: BlockT> {
 	#[display(fmt = "Header uses the wrong engine {:?}", _0)]
@@ -540,7 +542,7 @@ where
 	E::Error: std::fmt::Debug,
 	E::Proposer: Proposer<Block, Transaction = sp_api::TransactionFor<C, Block>>,
 	SO: SyncOracle + Clone + Send + Sync + 'static,
-	L: sp_consensus::JustificationSyncLink<Block>,
+	L: sc_consensus::JustificationSyncLink<Block>,
 	CIDP: CreateInherentDataProviders<Block, ()>,
 	CAW: CanAuthorWith<Block> + Clone + Send + 'static,
 {
diff --git a/client/consensus/pow/src/worker.rs b/client/consensus/pow/src/worker.rs
index 572ed364c8f8..c0ca16ccad3a 100644
--- a/client/consensus/pow/src/worker.rs
+++ b/client/consensus/pow/src/worker.rs
@@ -23,10 +23,8 @@ use futures::{
 use futures_timer::Delay;
 use log::*;
 use sc_client_api::ImportNotifications;
-use sp_consensus::{
-	import_queue::BoxBlockImport, BlockImportParams, BlockOrigin, Proposal, StateAction,
-	StorageChanges,
-};
+use sc_consensus::{BlockImportParams, BoxBlockImport, StateAction, StorageChanges};
+use sp_consensus::{BlockOrigin, Proposal};
 use sp_runtime::{
 	generic::BlockId,
 	traits::{Block as BlockT, Header as HeaderT},
@@ -67,7 +65,7 @@ pub struct MiningWorker<
 	Block: BlockT,
 	Algorithm: PowAlgorithm<Block>,
 	C: sp_api::ProvideRuntimeApi<Block>,
-	L: sp_consensus::JustificationSyncLink<Block>,
+	L: sc_consensus::JustificationSyncLink<Block>,
 	Proof,
 > {
 	pub(crate) build: Option<MiningBuild<Block, Algorithm, C, Proof>>,
@@ -82,7 +80,7 @@ where
 	C: sp_api::ProvideRuntimeApi<Block>,
 	Algorithm: PowAlgorithm<Block>,
 	Algorithm::Difficulty: 'static + Send,
-	L: sp_consensus::JustificationSyncLink<Block>,
+	L: sc_consensus::JustificationSyncLink<Block>,
 	sp_api::TransactionFor<C, Block>: Send + 'static,
 {
 	/// Get the current best hash. `None` if the worker has just started or the client is doing
diff --git a/client/consensus/slots/Cargo.toml b/client/consensus/slots/Cargo.toml
index 22697e94d358..4e027ccab772 100644
--- a/client/consensus/slots/Cargo.toml
+++ b/client/consensus/slots/Cargo.toml
@@ -21,6 +21,7 @@ sp-trie = { version = "4.0.0-dev", path = "../../../primitives/trie" }
 sp-application-crypto = { version = "4.0.0-dev", path = "../../../primitives/application-crypto" }
 sp-arithmetic = { version = "4.0.0-dev", path = "../../../primitives/arithmetic" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
+sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/common" }
 sp-consensus-slots = { version = "0.10.0-dev", path = "../../../primitives/consensus/slots" }
 sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
 sp-state-machine = { version = "0.10.0-dev", path = "../../../primitives/state-machine" }
diff --git a/client/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs
index 1a4f29ff8cb0..1aa8d984d3fa 100644
--- a/client/consensus/slots/src/lib.rs
+++ b/client/consensus/slots/src/lib.rs
@@ -36,12 +36,11 @@ use codec::{Decode, Encode};
 use futures::{future::Either, Future, TryFutureExt};
 use futures_timer::Delay;
 use log::{debug, error, info, warn};
+use sc_consensus::{BlockImport, JustificationSyncLink};
 use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_DEBUG, CONSENSUS_INFO, CONSENSUS_WARN};
 use sp_api::{ApiRef, ProvideRuntimeApi};
 use sp_arithmetic::traits::BaseArithmetic;
-use sp_consensus::{
-	BlockImport, CanAuthorWith, JustificationSyncLink, Proposer, SelectChain, SlotData, SyncOracle,
-};
+use sp_consensus::{CanAuthorWith, Proposer, SelectChain, SlotData, SyncOracle};
 use sp_consensus_slots::Slot;
 use sp_inherents::CreateInherentDataProviders;
 use sp_runtime::{
@@ -160,7 +159,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 				Self::Claim,
 				Self::EpochData,
 			) -> Result<
-				sp_consensus::BlockImportParams<
+				sc_consensus::BlockImportParams<
 					B,
 					<Self::BlockImport as BlockImport<B>>::Transaction,
 				>,
diff --git a/client/db/Cargo.toml b/client/db/Cargo.toml
index 5873883a11ee..856770c31f3e 100644
--- a/client/db/Cargo.toml
+++ b/client/db/Cargo.toml
@@ -32,7 +32,6 @@ sp-state-machine = { version = "0.10.0-dev", path = "../../primitives/state-mach
 sc-executor = { version = "0.10.0-dev", path = "../executor" }
 sc-state-db = { version = "0.10.0-dev", path = "../state-db" }
 sp-trie = { version = "4.0.0-dev", path = "../../primitives/trie" }
-sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
 sp-database = { version = "4.0.0-dev", path = "../../primitives/database" }
 parity-db = { version = "0.2.4", optional = true }
diff --git a/client/finality-grandpa-warp-sync/Cargo.toml b/client/finality-grandpa-warp-sync/Cargo.toml
index 43a7cc0565cd..62fe59608333 100644
--- a/client/finality-grandpa-warp-sync/Cargo.toml
+++ b/client/finality-grandpa-warp-sync/Cargo.toml
@@ -32,5 +32,6 @@ finality-grandpa = { version = "0.14.1" }
 rand = "0.8"
 sc-block-builder = { version = "0.10.0-dev", path = "../block-builder" }
 sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
+sc-consensus = { version = "0.10.0-dev", path = "../../client/consensus/common" }
 sp-keyring = { version = "4.0.0-dev", path = "../../primitives/keyring" }
 substrate-test-runtime-client = { version = "2.0.0",  path = "../../test-utils/runtime/client" }
diff --git a/client/finality-grandpa/src/import.rs b/client/finality-grandpa/src/import.rs
index 18e5e2c89d06..84e6fa9e1fba 100644
--- a/client/finality-grandpa/src/import.rs
+++ b/client/finality-grandpa/src/import.rs
@@ -22,14 +22,14 @@ use log::debug;
 use parity_scale_codec::Encode;
 
 use sc_client_api::{backend::Backend, utils::is_descendent_of};
-use sc_consensus::shared_data::{SharedDataLocked, SharedDataLockedUpgradable};
+use sc_consensus::{
+	shared_data::{SharedDataLocked, SharedDataLockedUpgradable},
+	BlockCheckParams, BlockImport, BlockImportParams, ImportResult, JustificationImport,
+};
 use sc_telemetry::TelemetryHandle;
 use sp_api::TransactionFor;
 use sp_blockchain::{well_known_cache_keys, BlockStatus};
-use sp_consensus::{
-	BlockCheckParams, BlockImport, BlockImportParams, BlockOrigin, Error as ConsensusError,
-	ImportResult, JustificationImport, SelectChain,
-};
+use sp_consensus::{BlockOrigin, Error as ConsensusError, SelectChain};
 use sp_finality_grandpa::{ConsensusLog, ScheduledChange, SetId, GRANDPA_ENGINE_ID};
 use sp_runtime::{
 	generic::{BlockId, OpaqueDigestItemId},
diff --git a/client/finality-grandpa/src/lib.rs b/client/finality-grandpa/src/lib.rs
index 1e34202ef8f9..8f8ce25b60a5 100644
--- a/client/finality-grandpa/src/lib.rs
+++ b/client/finality-grandpa/src/lib.rs
@@ -66,11 +66,12 @@ use sc_client_api::{
 	BlockchainEvents, CallExecutor, ExecutionStrategy, ExecutorProvider, Finalizer, LockImportRun,
 	TransactionFor,
 };
+use sc_consensus::BlockImport;
 use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_DEBUG, CONSENSUS_INFO};
 use sp_api::ProvideRuntimeApi;
 use sp_application_crypto::AppKey;
 use sp_blockchain::{Error as ClientError, HeaderBackend, HeaderMetadata};
-use sp_consensus::{BlockImport, SelectChain};
+use sp_consensus::SelectChain;
 use sp_core::crypto::Public;
 use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr};
 use sp_runtime::{
diff --git a/client/finality-grandpa/src/tests.rs b/client/finality-grandpa/src/tests.rs
index 526451696b8b..bf9faec70753 100644
--- a/client/finality-grandpa/src/tests.rs
+++ b/client/finality-grandpa/src/tests.rs
@@ -24,6 +24,10 @@ use environment::HasVoted;
 use futures::executor::block_on;
 use futures_timer::Delay;
 use parking_lot::{Mutex, RwLock};
+use sc_consensus::{
+	BlockImport, BlockImportParams, BoxJustificationImport, ForkChoiceStrategy, ImportResult,
+	ImportedAux,
+};
 use sc_network::config::{ProtocolConfig, Role};
 use sc_network_test::{
 	Block, BlockImportAdapter, FullPeerConfig, Hash, PassThroughVerifier, Peer, PeersClient,
@@ -31,10 +35,7 @@ use sc_network_test::{
 };
 use sp_api::{ApiRef, ProvideRuntimeApi};
 use sp_blockchain::Result;
-use sp_consensus::{
-	import_queue::BoxJustificationImport, BlockImport, BlockImportParams, BlockOrigin,
-	ForkChoiceStrategy, ImportResult, ImportedAux,
-};
+use sp_consensus::BlockOrigin;
 use sp_core::H256;
 use sp_finality_grandpa::{
 	AuthorityList, EquivocationProof, GrandpaApi, OpaqueKeyOwnershipProof, GRANDPA_ENGINE_ID,
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index 7ca98150f9dd..9c6b580fb9c6 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -53,6 +53,7 @@ smallvec = "1.5.0"
 sp-arithmetic = { version = "4.0.0-dev", path = "../../primitives/arithmetic" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
 sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
+sc-consensus = { version = "0.10.0-dev", path = "../consensus/common" }
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
 sp-utils = { version = "4.0.0-dev", path = "../../primitives/utils" }
diff --git a/client/network/src/behaviour.rs b/client/network/src/behaviour.rs
index 37dfc0cf99c2..73d5ec357b2c 100644
--- a/client/network/src/behaviour.rs
+++ b/client/network/src/behaviour.rs
@@ -36,10 +36,8 @@ use libp2p::{
 };
 use log::debug;
 use prost::Message;
-use sp_consensus::{
-	import_queue::{IncomingBlock, Origin},
-	BlockOrigin,
-};
+use sc_consensus::import_queue::{IncomingBlock, Origin};
+use sp_consensus::BlockOrigin;
 use sp_runtime::{
 	traits::{Block as BlockT, NumberFor},
 	Justifications,
diff --git a/client/network/src/chain.rs b/client/network/src/chain.rs
index 599e9d796c11..7c131dd75370 100644
--- a/client/network/src/chain.rs
+++ b/client/network/src/chain.rs
@@ -19,7 +19,8 @@
 //! Blockchain access trait
 
 use sc_client_api::{BlockBackend, ProofProvider};
-pub use sc_client_api::{ImportedState, StorageData, StorageKey};
+pub use sc_client_api::{StorageData, StorageKey};
+pub use sc_consensus::ImportedState;
 use sp_blockchain::{Error, HeaderBackend, HeaderMetadata};
 use sp_runtime::traits::{Block as BlockT, BlockIdTo};
 
diff --git a/client/network/src/config.rs b/client/network/src/config.rs
index cddc52352485..2581a08d4246 100644
--- a/client/network/src/config.rs
+++ b/client/network/src/config.rs
@@ -44,7 +44,8 @@ use libp2p::{
 	multiaddr, wasm_ext, Multiaddr, PeerId,
 };
 use prometheus_endpoint::Registry;
-use sp_consensus::{block_validation::BlockAnnounceValidator, import_queue::ImportQueue};
+use sc_consensus::ImportQueue;
+use sp_consensus::block_validation::BlockAnnounceValidator;
 use sp_runtime::traits::Block as BlockT;
 use std::{
 	borrow::Cow,
diff --git a/client/network/src/gossip/tests.rs b/client/network/src/gossip/tests.rs
index bdef28f9bebe..f4f96b863d62 100644
--- a/client/network/src/gossip/tests.rs
+++ b/client/network/src/gossip/tests.rs
@@ -50,7 +50,7 @@ fn build_test_full_node(network_config: config::NetworkConfiguration)
 	struct PassThroughVerifier(bool);
 
 	#[async_trait::async_trait]
-	impl<B: BlockT> sp_consensus::import_queue::Verifier<B> for PassThroughVerifier {
+	impl<B: BlockT> sc_consensus::Verifier<B> for PassThroughVerifier {
 		async fn verify(
 			&mut self,
 			origin: sp_consensus::BlockOrigin,
@@ -59,7 +59,7 @@ fn build_test_full_node(network_config: config::NetworkConfiguration)
 			body: Option<Vec<B::Extrinsic>>,
 		) -> Result<
 			(
-				sp_consensus::BlockImportParams<B, ()>,
+				sc_consensus::BlockImportParams<B, ()>,
 				Option<Vec<(sp_blockchain::well_known_cache_keys::Id, Vec<u8>)>>,
 			),
 			String,
@@ -79,16 +79,16 @@ fn build_test_full_node(network_config: config::NetworkConfiguration)
 					)]
 				});
 
-			let mut import = sp_consensus::BlockImportParams::new(origin, header);
+			let mut import = sc_consensus::BlockImportParams::new(origin, header);
 			import.body = body;
 			import.finalized = self.0;
 			import.justifications = justifications;
-			import.fork_choice = Some(sp_consensus::ForkChoiceStrategy::LongestChain);
+			import.fork_choice = Some(sc_consensus::ForkChoiceStrategy::LongestChain);
 			Ok((import, maybe_keys))
 		}
 	}
 
-	let import_queue = Box::new(sp_consensus::import_queue::BasicQueue::new(
+	let import_queue = Box::new(sc_consensus::BasicQueue::new(
 		PassThroughVerifier(false),
 		Box::new(client.clone()),
 		None,
diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index 0838657fae53..2af33cd1c5a1 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -48,12 +48,9 @@ use message::{
 use notifications::{Notifications, NotificationsOut};
 use prometheus_endpoint::{register, Gauge, GaugeVec, Opts, PrometheusError, Registry, U64};
 use prost::Message as _;
+use sc_consensus::import_queue::{BlockImportError, BlockImportStatus, IncomingBlock, Origin};
 use sp_arithmetic::traits::SaturatedConversion;
-use sp_consensus::{
-	block_validation::BlockAnnounceValidator,
-	import_queue::{BlockImportError, BlockImportResult, IncomingBlock, Origin},
-	BlockOrigin,
-};
+use sp_consensus::{block_validation::BlockAnnounceValidator, BlockOrigin};
 use sp_runtime::{
 	generic::BlockId,
 	traits::{Block as BlockT, CheckedSub, Header as HeaderT, NumberFor, Zero},
@@ -1048,7 +1045,7 @@ impl<B: BlockT> Protocol<B> {
 		&mut self,
 		imported: usize,
 		count: usize,
-		results: Vec<(Result<BlockImportResult<NumberFor<B>>, BlockImportError>, B::Hash)>,
+		results: Vec<(Result<BlockImportStatus<NumberFor<B>>, BlockImportError>, B::Hash)>,
 	) {
 		let results = self.sync.on_blocks_processed(imported, count, results);
 		for result in results {
diff --git a/client/network/src/protocol/sync.rs b/client/network/src/protocol/sync.rs
index 3e49a90e9387..8918d7adde09 100644
--- a/client/network/src/protocol/sync.rs
+++ b/client/network/src/protocol/sync.rs
@@ -39,11 +39,11 @@ use extra_requests::ExtraRequests;
 use futures::{stream::FuturesUnordered, task::Poll, Future, FutureExt, StreamExt};
 use libp2p::PeerId;
 use log::{debug, error, info, trace, warn};
+use sc_consensus::{BlockImportError, BlockImportStatus, IncomingBlock};
 use sp_arithmetic::traits::Saturating;
 use sp_blockchain::{Error as ClientError, HeaderMetadata};
 use sp_consensus::{
 	block_validation::{BlockAnnounceValidator, Validation},
-	import_queue::{BlockImportError, BlockImportResult, IncomingBlock},
 	BlockOrigin, BlockStatus,
 };
 use sp_runtime::{
@@ -1240,7 +1240,7 @@ impl<B: BlockT> ChainSync<B> {
 		&'a mut self,
 		imported: usize,
 		count: usize,
-		results: Vec<(Result<BlockImportResult<NumberFor<B>>, BlockImportError>, B::Hash)>,
+		results: Vec<(Result<BlockImportStatus<NumberFor<B>>, BlockImportError>, B::Hash)>,
 	) -> impl Iterator<Item = Result<(PeerId, BlockRequest<B>), BadPeer>> + 'a {
 		trace!(target: "sync", "Imported {} of {}", imported, count);
 
@@ -1260,12 +1260,12 @@ impl<B: BlockT> ChainSync<B> {
 			}
 
 			match result {
-				Ok(BlockImportResult::ImportedKnown(number, who)) => {
+				Ok(BlockImportStatus::ImportedKnown(number, who)) => {
 					if let Some(peer) = who.and_then(|p| self.peers.get_mut(&p)) {
 						peer.update_common_number(number);
 					}
 				},
-				Ok(BlockImportResult::ImportedUnknown(number, aux, who)) => {
+				Ok(BlockImportStatus::ImportedUnknown(number, aux, who)) => {
 					if aux.clear_justification_requests {
 						trace!(
 							target: "sync",
@@ -2454,7 +2454,7 @@ mod test {
 	///
 	/// The node is connected to multiple peers. Both of these peers are having a best block (1) that
 	/// is below our best block (3). Now peer 2 announces a fork of block 3 that we will
-	/// request from peer 2. After imporitng the fork, peer 2 and then peer 1 will announce block 4.
+	/// request from peer 2. After importing the fork, peer 2 and then peer 1 will announce block 4.
 	/// But as peer 1 in our view is still at block 1, we will request block 2 (which we already have)
 	/// from it. In the meanwhile peer 2 sends us block 4 and 3 and we send another request for block
 	/// 2 to peer 2. Peer 1 answers with block 2 and then peer 2. This will need to succeed, as we
@@ -2777,7 +2777,7 @@ mod test {
 					.rev()
 					.map(|b| {
 						(
-							Ok(BlockImportResult::ImportedUnknown(
+							Ok(BlockImportStatus::ImportedUnknown(
 								b.header().number().clone(),
 								Default::default(),
 								Some(peer_id1.clone()),
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 89685849f5bf..83cf2d675823 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -68,8 +68,8 @@ use libp2p::{
 use log::{debug, error, info, trace, warn};
 use metrics::{Histogram, HistogramVec, MetricSources, Metrics};
 use parking_lot::Mutex;
+use sc_consensus::{BlockImportError, BlockImportStatus, ImportQueue, Link};
 use sc_peerset::PeersetHandle;
-use sp_consensus::import_queue::{BlockImportError, BlockImportResult, ImportQueue, Link};
 use sp_runtime::traits::{Block as BlockT, NumberFor};
 use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use std::{
@@ -1265,7 +1265,7 @@ impl<'a, B: BlockT + 'static, H: ExHashT> sp_consensus::SyncOracle for &'a Netwo
 	}
 }
 
-impl<B: BlockT, H: ExHashT> sp_consensus::JustificationSyncLink<B> for NetworkService<B, H> {
+impl<B: BlockT, H: ExHashT> sc_consensus::JustificationSyncLink<B> for NetworkService<B, H> {
 	fn request_justification(&self, hash: &B::Hash, number: NumberFor<B>) {
 		NetworkService::request_justification(self, hash, number);
 	}
@@ -2104,7 +2104,7 @@ impl<'a, B: BlockT> Link<B> for NetworkLink<'a, B> {
 		&mut self,
 		imported: usize,
 		count: usize,
-		results: Vec<(Result<BlockImportResult<NumberFor<B>>, BlockImportError>, B::Hash)>,
+		results: Vec<(Result<BlockImportStatus<NumberFor<B>>, BlockImportError>, B::Hash)>,
 	) {
 		self.protocol
 			.behaviour_mut()
diff --git a/client/network/src/service/tests.rs b/client/network/src/service/tests.rs
index 7acfeadcae13..a149b09a22dd 100644
--- a/client/network/src/service/tests.rs
+++ b/client/network/src/service/tests.rs
@@ -47,7 +47,7 @@ fn build_test_full_node(
 	struct PassThroughVerifier(bool);
 
 	#[async_trait::async_trait]
-	impl<B: BlockT> sp_consensus::import_queue::Verifier<B> for PassThroughVerifier {
+	impl<B: BlockT> sc_consensus::Verifier<B> for PassThroughVerifier {
 		async fn verify(
 			&mut self,
 			origin: sp_consensus::BlockOrigin,
@@ -56,7 +56,7 @@ fn build_test_full_node(
 			body: Option<Vec<B::Extrinsic>>,
 		) -> Result<
 			(
-				sp_consensus::BlockImportParams<B, ()>,
+				sc_consensus::BlockImportParams<B, ()>,
 				Option<Vec<(sp_blockchain::well_known_cache_keys::Id, Vec<u8>)>>,
 			),
 			String,
@@ -75,16 +75,16 @@ fn build_test_full_node(
 					vec![(sp_blockchain::well_known_cache_keys::AUTHORITIES, blob.to_vec())]
 				});
 
-			let mut import = sp_consensus::BlockImportParams::new(origin, header);
+			let mut import = sc_consensus::BlockImportParams::new(origin, header);
 			import.body = body;
 			import.finalized = self.0;
 			import.justifications = justifications;
-			import.fork_choice = Some(sp_consensus::ForkChoiceStrategy::LongestChain);
+			import.fork_choice = Some(sc_consensus::ForkChoiceStrategy::LongestChain);
 			Ok((import, maybe_keys))
 		}
 	}
 
-	let import_queue = Box::new(sp_consensus::import_queue::BasicQueue::new(
+	let import_queue = Box::new(sc_consensus::BasicQueue::new(
 		PassThroughVerifier(false),
 		Box::new(client.clone()),
 		None,
diff --git a/client/network/test/src/block_import.rs b/client/network/test/src/block_import.rs
index 4593e06250d3..7b5804e0edb7 100644
--- a/client/network/test/src/block_import.rs
+++ b/client/network/test/src/block_import.rs
@@ -21,12 +21,11 @@
 use super::*;
 use futures::executor::block_on;
 use sc_block_builder::BlockBuilderProvider;
-use sp_consensus::{
-	import_queue::{
-		import_single_block, BasicQueue, BlockImportError, BlockImportResult, IncomingBlock,
-	},
-	ImportedAux,
+use sc_consensus::{
+	import_single_block, BasicQueue, BlockImportError, BlockImportStatus, ImportedAux,
+	IncomingBlock,
 };
+use sp_consensus::BlockOrigin;
 use sp_runtime::generic::BlockId;
 use substrate_test_runtime_client::{
 	self,
@@ -76,7 +75,7 @@ fn import_single_good_block_works() {
 		block,
 		&mut PassThroughVerifier::new(true),
 	)) {
-		Ok(BlockImportResult::ImportedUnknown(ref num, ref aux, ref org))
+		Ok(BlockImportStatus::ImportedUnknown(ref num, ref aux, ref org))
 			if *num == number && *aux == expected_aux && *org == Some(peer_id) => {},
 		r @ _ => panic!("{:?}", r),
 	}
@@ -91,7 +90,7 @@ fn import_single_good_known_block_is_ignored() {
 		block,
 		&mut PassThroughVerifier::new(true),
 	)) {
-		Ok(BlockImportResult::ImportedKnown(ref n, _)) if *n == number => {},
+		Ok(BlockImportStatus::ImportedKnown(ref n, _)) if *n == number => {},
 		_ => panic!(),
 	}
 }
diff --git a/client/network/test/src/lib.rs b/client/network/test/src/lib.rs
index 0bdaa0d14e4f..553353d77ac3 100644
--- a/client/network/test/src/lib.rs
+++ b/client/network/test/src/lib.rs
@@ -40,7 +40,10 @@ use sc_client_api::{
 	BlockBackend, BlockImportNotification, BlockchainEvents, FinalityNotification,
 	FinalityNotifications, ImportNotifications,
 };
-use sc_consensus::LongestChain;
+use sc_consensus::{
+	BasicQueue, BlockCheckParams, BlockImport, BlockImportParams, BoxJustificationImport,
+	ForkChoiceStrategy, ImportResult, JustificationImport, LongestChain, Verifier,
+};
 pub use sc_network::config::EmptyTransactionPool;
 use sc_network::{
 	block_request_handler::{self, BlockRequestHandler},
@@ -58,11 +61,8 @@ use sp_blockchain::{
 	HeaderBackend, Info as BlockchainInfo, Result as ClientResult,
 };
 use sp_consensus::{
-	block_import::{BlockImport, ImportResult},
 	block_validation::{BlockAnnounceValidator, DefaultBlockAnnounceValidator},
-	import_queue::{BasicQueue, BoxJustificationImport, Verifier},
-	BlockCheckParams, BlockImportParams, BlockOrigin, Error as ConsensusError, ForkChoiceStrategy,
-	JustificationImport,
+	BlockOrigin, Error as ConsensusError,
 };
 use sp_core::H256;
 use sp_runtime::{
@@ -152,7 +152,7 @@ pub enum PeersClient {
 impl PeersClient {
 	pub fn as_full(&self) -> Option<Arc<PeersFullClient>> {
 		match *self {
-			PeersClient::Full(ref client, ref _backend) => Some(client.clone()),
+			PeersClient::Full(ref client, _) => Some(client.clone()),
 			_ => None,
 		}
 	}
@@ -163,15 +163,15 @@ impl PeersClient {
 
 	pub fn get_aux(&self, key: &[u8]) -> ClientResult<Option<Vec<u8>>> {
 		match *self {
-			PeersClient::Full(ref client, ref _backend) => client.get_aux(key),
-			PeersClient::Light(ref client, ref _backend) => client.get_aux(key),
+			PeersClient::Full(ref client, _) => client.get_aux(key),
+			PeersClient::Light(ref client, _) => client.get_aux(key),
 		}
 	}
 
 	pub fn info(&self) -> BlockchainInfo<Block> {
 		match *self {
-			PeersClient::Full(ref client, ref _backend) => client.chain_info(),
-			PeersClient::Light(ref client, ref _backend) => client.chain_info(),
+			PeersClient::Full(ref client, _) => client.chain_info(),
+			PeersClient::Light(ref client, _) => client.chain_info(),
 		}
 	}
 
@@ -180,8 +180,8 @@ impl PeersClient {
 		block: &BlockId<Block>,
 	) -> ClientResult<Option<<Block as BlockT>::Header>> {
 		match *self {
-			PeersClient::Full(ref client, ref _backend) => client.header(block),
-			PeersClient::Light(ref client, ref _backend) => client.header(block),
+			PeersClient::Full(ref client, _) => client.header(block),
+			PeersClient::Light(ref client, _) => client.header(block),
 		}
 	}
 
@@ -200,22 +200,22 @@ impl PeersClient {
 
 	pub fn justifications(&self, block: &BlockId<Block>) -> ClientResult<Option<Justifications>> {
 		match *self {
-			PeersClient::Full(ref client, ref _backend) => client.justifications(block),
-			PeersClient::Light(ref client, ref _backend) => client.justifications(block),
+			PeersClient::Full(ref client, _) => client.justifications(block),
+			PeersClient::Light(ref client, _) => client.justifications(block),
 		}
 	}
 
 	pub fn finality_notification_stream(&self) -> FinalityNotifications<Block> {
 		match *self {
-			PeersClient::Full(ref client, ref _backend) => client.finality_notification_stream(),
-			PeersClient::Light(ref client, ref _backend) => client.finality_notification_stream(),
+			PeersClient::Full(ref client, _) => client.finality_notification_stream(),
+			PeersClient::Light(ref client, _) => client.finality_notification_stream(),
 		}
 	}
 
 	pub fn import_notification_stream(&self) -> ImportNotifications<Block> {
 		match *self {
-			PeersClient::Full(ref client, ref _backend) => client.import_notification_stream(),
-			PeersClient::Light(ref client, ref _backend) => client.import_notification_stream(),
+			PeersClient::Full(ref client, _) => client.import_notification_stream(),
+			PeersClient::Light(ref client, _) => client.import_notification_stream(),
 		}
 	}
 
diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml
index 67e78c8de8de..04eb8b8b3f78 100644
--- a/client/rpc/Cargo.toml
+++ b/client/rpc/Cargo.toml
@@ -53,6 +53,7 @@ substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/ru
 tokio = "0.1.22"
 sc-transaction-pool = { version = "4.0.0-dev", path = "../transaction-pool" }
 sc-cli = { version = "0.10.0-dev", path = "../cli" }
+sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
 
 [features]
 test-helpers = ["lazy_static"]
diff --git a/client/rpc/src/chain/tests.rs b/client/rpc/src/chain/tests.rs
index 9bd08a1796ad..bf682a57a341 100644
--- a/client/rpc/src/chain/tests.rs
+++ b/client/rpc/src/chain/tests.rs
@@ -24,11 +24,11 @@ use futures::{
 	executor,
 };
 use sc_block_builder::BlockBuilderProvider;
+use sp_consensus::BlockOrigin;
 use sp_rpc::list::ListOrValue;
 use substrate_test_runtime_client::{
 	prelude::*,
 	runtime::{Block, Header, H256},
-	sp_consensus::BlockOrigin,
 };
 
 #[test]
diff --git a/client/rpc/src/state/tests.rs b/client/rpc/src/state/tests.rs
index dd99360bafba..3990d6ea8ad3 100644
--- a/client/rpc/src/state/tests.rs
+++ b/client/rpc/src/state/tests.rs
@@ -25,11 +25,12 @@ use futures::{compat::Future01CompatExt, executor};
 use futures01::stream::Stream;
 use sc_block_builder::BlockBuilderProvider;
 use sc_rpc_api::DenyUnsafe;
+use sp_consensus::BlockOrigin;
 use sp_core::{hash::H256, storage::ChildInfo, ChangesTrieConfiguration};
 use sp_io::hashing::blake2_256;
 use sp_runtime::generic::BlockId;
 use std::sync::Arc;
-use substrate_test_runtime_client::{prelude::*, runtime, sp_consensus::BlockOrigin};
+use substrate_test_runtime_client::{prelude::*, runtime};
 
 const STORAGE_KEY: &[u8] = b"child";
 
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index 65393647f3ea..17aa41536388 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -54,6 +54,7 @@ sp-session = { version = "4.0.0-dev", path = "../../primitives/session" }
 sp-state-machine = { version = "0.10.0-dev", path = "../../primitives/state-machine" }
 sp-application-crypto = { version = "4.0.0-dev", path = "../../primitives/application-crypto" }
 sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
+sc-consensus = { version = "0.10.0-dev", path = "../../client/consensus/common" }
 sp-inherents = { version = "4.0.0-dev", path = "../../primitives/inherents" }
 sp-storage = { version = "4.0.0-dev", path = "../../primitives/storage" }
 sc-network = { version = "0.10.0-dev", path = "../network" }
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index 2885fb6deb54..1f54850059fb 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -36,6 +36,7 @@ use sc_client_api::{
 	ForkBlocks, StorageProvider, UsageProvider,
 };
 use sc_client_db::{Backend, DatabaseSettings};
+use sc_consensus::import_queue::ImportQueue;
 use sc_executor::{NativeExecutionDispatch, NativeExecutor, RuntimeInfo};
 use sc_keystore::LocalKeystore;
 use sc_network::{
@@ -49,9 +50,8 @@ use sc_telemetry::{telemetry, ConnectionMessage, Telemetry, TelemetryHandle, SUB
 use sc_transaction_pool_api::MaintainedTransactionPool;
 use sp_api::{CallApiAt, ProvideRuntimeApi};
 use sp_blockchain::{HeaderBackend, HeaderMetadata};
-use sp_consensus::{
-	block_validation::{BlockAnnounceValidator, Chain, DefaultBlockAnnounceValidator},
-	import_queue::ImportQueue,
+use sp_consensus::block_validation::{
+	BlockAnnounceValidator, Chain, DefaultBlockAnnounceValidator,
 };
 use sp_core::traits::{CodeExecutor, SpawnNamed};
 use sp_keystore::{CryptoStore, SyncCryptoStore, SyncCryptoStorePtr};
diff --git a/client/service/src/chain_ops/check_block.rs b/client/service/src/chain_ops/check_block.rs
index ab924a3f7d9d..4728e014540e 100644
--- a/client/service/src/chain_ops/check_block.rs
+++ b/client/service/src/chain_ops/check_block.rs
@@ -20,7 +20,7 @@ use crate::error::Error;
 use codec::Encode;
 use futures::{future, prelude::*};
 use sc_client_api::{BlockBackend, UsageProvider};
-use sp_consensus::import_queue::ImportQueue;
+use sc_consensus::import_queue::ImportQueue;
 use sp_runtime::{generic::BlockId, traits::Block as BlockT};
 
 use crate::chain_ops::import_blocks;
diff --git a/client/service/src/chain_ops/import_blocks.rs b/client/service/src/chain_ops/import_blocks.rs
index ecf028ffeb3f..396e5b80f280 100644
--- a/client/service/src/chain_ops/import_blocks.rs
+++ b/client/service/src/chain_ops/import_blocks.rs
@@ -19,21 +19,21 @@
 use crate::{error, error::Error};
 use codec::{Decode, IoReader as CodecIoReader};
 use futures::{future, prelude::*};
+use futures_timer::Delay;
 use log::{info, warn};
 use sc_chain_spec::ChainSpec;
-use sp_consensus::{
-	import_queue::{BlockImportError, BlockImportResult, ImportQueue, IncomingBlock, Link},
-	BlockOrigin,
+use sc_client_api::UsageProvider;
+use sc_consensus::import_queue::{
+	BlockImportError, BlockImportStatus, ImportQueue, IncomingBlock, Link,
 };
+use serde_json::{de::IoRead as JsonIoRead, Deserializer, StreamDeserializer};
+use sp_consensus::BlockOrigin;
 use sp_runtime::{
 	generic::SignedBlock,
-	traits::{Block as BlockT, Header, MaybeSerializeDeserialize, NumberFor, Zero},
+	traits::{
+		Block as BlockT, CheckedDiv, Header, MaybeSerializeDeserialize, NumberFor, Saturating, Zero,
+	},
 };
-
-use futures_timer::Delay;
-use sc_client_api::UsageProvider;
-use serde_json::{de::IoRead as JsonIoRead, Deserializer, StreamDeserializer};
-use sp_runtime::traits::{CheckedDiv, Saturating};
 use std::{
 	convert::{TryFrom, TryInto},
 	io::{Read, Seek},
@@ -316,7 +316,7 @@ where
 			&mut self,
 			imported: usize,
 			_num_expected_blocks: usize,
-			results: Vec<(Result<BlockImportResult<NumberFor<B>>, BlockImportError>, B::Hash)>,
+			results: Vec<(Result<BlockImportStatus<NumberFor<B>>, BlockImportError>, B::Hash)>,
 		) {
 			self.imported_blocks += imported as u64;
 
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index a0d294908c5f..553584b15c02 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -45,6 +45,9 @@ use sc_client_api::{
 	notifications::{StorageEventStream, StorageNotifications},
 	CallExecutor, ExecutorProvider, KeyIterator, ProofProvider, UsageProvider,
 };
+use sc_consensus::{
+	BlockCheckParams, BlockImportParams, ForkChoiceStrategy, ImportResult, StateAction,
+};
 use sc_executor::RuntimeVersion;
 use sc_light::fetcher::ChangesProof;
 use sc_telemetry::{telemetry, TelemetryHandle, SUBSTRATE_INFO};
@@ -56,10 +59,8 @@ use sp_blockchain::{
 	self as blockchain, well_known_cache_keys::Id as CacheKeyId, Backend as ChainBackend, Cache,
 	CachedHeaderMetadata, Error, HeaderBackend as ChainHeaderBackend, HeaderMetadata, ProvideCache,
 };
-use sp_consensus::{
-	BlockCheckParams, BlockImportParams, BlockOrigin, BlockStatus, Error as ConsensusError,
-	ForkChoiceStrategy, ImportResult, StateAction,
-};
+use sp_consensus::{BlockOrigin, BlockStatus, Error as ConsensusError};
+
 use sp_core::{
 	convert_hash,
 	storage::{well_known_keys, ChildInfo, PrefixedStorageKey, StorageData, StorageKey},
@@ -120,17 +121,18 @@ where
 	_phantom: PhantomData<RA>,
 }
 
-// used in importing a block, where additional changes are made after the runtime
-// executed.
+/// Used in importing a block, where additional changes are made after the runtime
+/// executed.
 enum PrePostHeader<H> {
-	// they are the same: no post-runtime digest items.
+	/// they are the same: no post-runtime digest items.
 	Same(H),
-	// different headers (pre, post).
+	/// different headers (pre, post).
 	Different(H, H),
 }
 
 impl<H> PrePostHeader<H> {
-	// get a reference to the "post-header" -- the header as it should be after all changes are applied.
+	/// get a reference to the "post-header" -- the header as it should be
+	/// after all changes are applied.
 	fn post(&self) -> &H {
 		match *self {
 			PrePostHeader::Same(ref h) => h,
@@ -138,7 +140,8 @@ impl<H> PrePostHeader<H> {
 		}
 	}
 
-	// convert to the "post-header" -- the header as it should be after all changes are applied.
+	/// convert to the "post-header" -- the header as it should be after
+	/// all changes are applied.
 	fn into_post(self) -> H {
 		match self {
 			PrePostHeader::Same(h) => h,
@@ -149,7 +152,7 @@ impl<H> PrePostHeader<H> {
 
 enum PrepareStorageChangesResult<B: backend::Backend<Block>, Block: BlockT> {
 	Discard(ImportResult),
-	Import(Option<sp_consensus::StorageChanges<Block, backend::TransactionFor<B, Block>>>),
+	Import(Option<sc_consensus::StorageChanges<Block, backend::TransactionFor<B, Block>>>),
 }
 
 /// Create an instance of in-memory client.
@@ -577,7 +580,8 @@ where
 		Ok(StorageProof::merge(proofs))
 	}
 
-	/// Generates CHT-based proof for roots of changes tries at given blocks (that are part of single CHT).
+	/// Generates CHT-based proof for roots of changes tries at given blocks
+	/// (that are part of single CHT).
 	fn changes_trie_roots_proof_at_cht(
 		&self,
 		cht_size: NumberFor<Block>,
@@ -603,11 +607,12 @@ where
 		Ok(proof)
 	}
 
-	/// Returns changes trie storage and all configurations that have been active in the range [first; last].
+	/// Returns changes trie storage and all configurations that have been active
+	/// in the range [first; last].
 	///
 	/// Configurations are returned in descending order (and obviously never overlap).
-	/// If fail_if_disabled is false, returns maximal consequent configurations ranges, starting from last and
-	/// stopping on either first, or when CT have been disabled.
+	/// If fail_if_disabled is false, returns maximal consequent configurations ranges,
+	/// starting from last and stopping on either first, or when CT have been disabled.
 	/// If fail_if_disabled is true, fails when there's a subrange where CT have been disabled
 	/// inside first..last blocks range.
 	fn require_changes_trie(
@@ -656,7 +661,7 @@ where
 		import_block: BlockImportParams<Block, backend::TransactionFor<B, Block>>,
 		new_cache: HashMap<CacheKeyId, Vec<u8>>,
 		storage_changes: Option<
-			sp_consensus::StorageChanges<Block, backend::TransactionFor<B, Block>>,
+			sc_consensus::StorageChanges<Block, backend::TransactionFor<B, Block>>,
 		>,
 	) -> sp_blockchain::Result<ImportResult>
 	where
@@ -749,7 +754,7 @@ where
 		body: Option<Vec<Block::Extrinsic>>,
 		indexed_body: Option<Vec<Vec<u8>>>,
 		storage_changes: Option<
-			sp_consensus::StorageChanges<Block, backend::TransactionFor<B, Block>>,
+			sc_consensus::StorageChanges<Block, backend::TransactionFor<B, Block>>,
 		>,
 		new_cache: HashMap<CacheKeyId, Vec<u8>>,
 		finalized: bool,
@@ -793,7 +798,7 @@ where
 		let storage_changes = match storage_changes {
 			Some(storage_changes) => {
 				let storage_changes = match storage_changes {
-					sp_consensus::StorageChanges::Changes(storage_changes) => {
+					sc_consensus::StorageChanges::Changes(storage_changes) => {
 						self.backend
 							.begin_state_operation(&mut operation.op, BlockId::Hash(parent_hash))?;
 						let (main_sc, child_sc, offchain_sc, tx, _, changes_trie_tx, tx_index) =
@@ -813,7 +818,7 @@ where
 
 						Some((main_sc, child_sc))
 					},
-					sp_consensus::StorageChanges::Import(changes) => {
+					sc_consensus::StorageChanges::Import(changes) => {
 						let storage = sp_storage::Storage {
 							top: changes.state.into_iter().collect(),
 							children_default: Default::default(),
@@ -889,7 +894,8 @@ where
 
 		operation.op.insert_aux(aux)?;
 
-		// we only notify when we are already synced to the tip of the chain or if this import triggers a re-org
+		// we only notify when we are already synced to the tip of the chain
+		// or if this import triggers a re-org
 		if make_notifications || tree_route.is_some() {
 			if finalized {
 				operation.notify_finalized.push(hash);
@@ -933,7 +939,7 @@ where
 			(_, StateAction::Skip) => (false, None),
 			(
 				BlockStatus::InChainPruned,
-				StateAction::ApplyChanges(sp_consensus::StorageChanges::Changes(_)),
+				StateAction::ApplyChanges(sc_consensus::StorageChanges::Changes(_)),
 			) => return Ok(PrepareStorageChangesResult::Discard(ImportResult::MissingState)),
 			(BlockStatus::InChainPruned, StateAction::Execute) =>
 				return Ok(PrepareStorageChangesResult::Discard(ImportResult::MissingState)),
@@ -975,7 +981,7 @@ where
 				{
 					return Err(Error::InvalidStateRoot)
 				}
-				Some(sp_consensus::StorageChanges::Changes(gen_storage_changes))
+				Some(sc_consensus::StorageChanges::Changes(gen_storage_changes))
 			},
 			// No block body, no storage changes
 			(true, None, None) => None,
@@ -1852,7 +1858,7 @@ where
 /// objects. Otherwise, importing blocks directly into the client would be bypassing
 /// important verification work.
 #[async_trait::async_trait]
-impl<B, E, Block, RA> sp_consensus::BlockImport<Block> for &Client<B, E, Block, RA>
+impl<B, E, Block, RA> sc_consensus::BlockImport<Block> for &Client<B, E, Block, RA>
 where
 	B: backend::Backend<Block>,
 	E: CallExecutor<Block> + Send + Sync,
@@ -1960,7 +1966,7 @@ where
 }
 
 #[async_trait::async_trait]
-impl<B, E, Block, RA> sp_consensus::BlockImport<Block> for Client<B, E, Block, RA>
+impl<B, E, Block, RA> sc_consensus::BlockImport<Block> for Client<B, E, Block, RA>
 where
 	B: backend::Backend<Block>,
 	E: CallExecutor<Block> + Send + Sync,
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index 5d7c490db6ab..a6cefcd5db62 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -67,6 +67,7 @@ pub use sc_chain_spec::{
 	Properties, RuntimeGenesis,
 };
 use sc_client_api::{blockchain::HeaderBackend, BlockchainEvents};
+pub use sc_consensus::ImportQueue;
 pub use sc_executor::NativeExecutionDispatch;
 #[doc(hidden)]
 pub use sc_network::config::{OnDemand, TransactionImport, TransactionImportFuture};
@@ -74,7 +75,6 @@ pub use sc_rpc::Metadata as RpcMetadata;
 pub use sc_tracing::TracingReceiver;
 pub use sc_transaction_pool::Options as TransactionPoolOptions;
 pub use sc_transaction_pool_api::{error::IntoPoolError, InPoolTransaction, TransactionPool};
-pub use sp_consensus::import_queue::ImportQueue;
 #[doc(hidden)]
 pub use std::{ops::Deref, result::Result, sync::Arc};
 pub use task_manager::{SpawnTaskHandle, TaskManager};
diff --git a/client/service/test/Cargo.toml b/client/service/test/Cargo.toml
index e7e627f919c1..d0081b324911 100644
--- a/client/service/test/Cargo.toml
+++ b/client/service/test/Cargo.toml
@@ -31,6 +31,7 @@ futures = { version = "0.3.1", features = ["compat"] }
 sc-service = { version = "0.10.0-dev", features = ["test-helpers"], path = "../../service" }
 sc-network = { version = "0.10.0-dev", path = "../../network" }
 sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
+sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/common" }
 sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
 sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
 sc-transaction-pool-api = { version = "4.0.0-dev", path = "../../../client/transaction-pool/api" }
diff --git a/client/service/test/src/client/mod.rs b/client/service/test/src/client/mod.rs
index d6a506ab63d7..dd0a33b7e858 100644
--- a/client/service/test/src/client/mod.rs
+++ b/client/service/test/src/client/mod.rs
@@ -24,13 +24,13 @@ use sc_client_api::{in_mem, BlockBackend, BlockchainEvents, StorageProvider};
 use sc_client_db::{
 	Backend, DatabaseSettings, DatabaseSettingsSrc, KeepBlocks, PruningMode, TransactionStorageMode,
 };
+use sc_consensus::{
+	BlockCheckParams, BlockImport, BlockImportParams, ForkChoiceStrategy, ImportResult,
+};
 use sc_executor::native_executor_instance;
 use sc_service::client::{self, new_in_mem, Client, LocalCallExecutor};
 use sp_api::ProvideRuntimeApi;
-use sp_consensus::{
-	BlockCheckParams, BlockImport, BlockImportParams, BlockOrigin, BlockStatus,
-	Error as ConsensusError, ForkChoiceStrategy, ImportResult, SelectChain,
-};
+use sp_consensus::{BlockOrigin, BlockStatus, Error as ConsensusError, SelectChain};
 use sp_core::{blake2_256, testing::TaskExecutor, ChangesTrieConfiguration, H256};
 use sp_runtime::{
 	generic::BlockId,
diff --git a/docs/STYLE_GUIDE.md b/docs/STYLE_GUIDE.md
index e6f217f2b485..ea070cdbc59f 100644
--- a/docs/STYLE_GUIDE.md
+++ b/docs/STYLE_GUIDE.md
@@ -2,6 +2,9 @@
 title: Style Guide for Rust in Substrate
 ---
 
+Where possible these styles are enforced by settings in `rustfmt.toml` so if you run `cargo fmt` 
+then you will adhere to most of these style guidelines automatically.
+
 # Formatting
 
 -   Indent using tabs.
diff --git a/frame/support/src/dispatch.rs b/frame/support/src/dispatch.rs
index da9d6adff6f3..4ee5154a6b0f 100644
--- a/frame/support/src/dispatch.rs
+++ b/frame/support/src/dispatch.rs
@@ -39,7 +39,7 @@ pub use frame_metadata::{
 };
 pub use sp_runtime::{traits::Dispatchable, DispatchError};
 
-/// The return typ of a `Dispatchable` in frame. When returned explicitly from
+/// The return type of a `Dispatchable` in frame. When returned explicitly from
 /// a dispatchable function it allows overriding the default `PostDispatchInfo`
 /// returned from a dispatch.
 pub type DispatchResultWithPostInfo =
diff --git a/primitives/blockchain/src/backend.rs b/primitives/blockchain/src/backend.rs
index 642e7c5b9528..fb0ef5b4d7a7 100644
--- a/primitives/blockchain/src/backend.rs
+++ b/primitives/blockchain/src/backend.rs
@@ -293,7 +293,7 @@ pub enum BlockStatus {
 /// A list of all well known keys in the blockchain cache.
 pub mod well_known_cache_keys {
 	/// The type representing cache keys.
-	pub type Id = sp_consensus::import_queue::CacheKeyId;
+	pub type Id = sp_consensus::CacheKeyId;
 
 	/// A list of authorities.
 	pub const AUTHORITIES: Id = *b"auth";
diff --git a/primitives/consensus/common/Cargo.toml b/primitives/consensus/common/Cargo.toml
index 5a9d1814bd63..ab4f5a24f5c5 100644
--- a/primitives/consensus/common/Cargo.toml
+++ b/primitives/consensus/common/Cargo.toml
@@ -13,15 +13,14 @@ readme = "README.md"
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
 
-
 [dependencies]
-thiserror = "1.0.21"
-libp2p = { version = "0.37.1", default-features = false }
+async-trait = "0.1.42"
+codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
+futures = { version = "0.3.1", features = ["thread-pool"] }
 log = "0.4.8"
 sp-core = { path= "../../core", version = "4.0.0-dev"}
 sp-inherents = { version = "4.0.0-dev", path = "../../inherents" }
 sp-state-machine = { version = "0.10.0-dev", path = "../../state-machine" }
-futures = { version = "0.3.1", features = ["thread-pool"] }
 futures-timer = "3.0.1"
 sp-std = { version = "4.0.0-dev", path = "../../std" }
 sp-version = { version = "4.0.0-dev", path = "../../version" }
@@ -29,12 +28,11 @@ sp-runtime = { version = "4.0.0-dev", path = "../../runtime" }
 sp-utils = { version = "4.0.0-dev", path = "../../utils" }
 sp-trie = { version = "4.0.0-dev", path = "../../trie" }
 sp-api = { version = "4.0.0-dev", path = "../../api" }
-codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 parking_lot = "0.11.1"
 serde = { version = "1.0", features = ["derive"] }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0"}
 wasm-timer = "0.2.5"
-async-trait = "0.1.50"
+thiserror = "1.0.21"
 
 [dev-dependencies]
 futures = "0.3.9"
diff --git a/primitives/consensus/common/src/lib.rs b/primitives/consensus/common/src/lib.rs
index eb524422a6e2..f6c1e028b945 100644
--- a/primitives/consensus/common/src/lib.rs
+++ b/primitives/consensus/common/src/lib.rs
@@ -21,14 +21,6 @@
 //! change. Implementors of traits should not rely on the interfaces to remain
 //! the same.
 
-// This provides "unused" building blocks to other crates
-#![allow(dead_code)]
-// our error-chain could potentially blow up otherwise
-#![recursion_limit = "128"]
-
-#[macro_use]
-extern crate log;
-
 use std::{sync::Arc, time::Duration};
 
 use futures::prelude::*;
@@ -38,25 +30,19 @@ use sp_runtime::{
 };
 use sp_state_machine::StorageProof;
 
-pub mod block_import;
 pub mod block_validation;
 pub mod error;
 pub mod evaluation;
-pub mod import_queue;
-mod metrics;
 mod select_chain;
 
 pub use self::error::Error;
-pub use block_import::{
-	BlockCheckParams, BlockImport, BlockImportParams, BlockOrigin, ForkChoiceStrategy,
-	ImportResult, ImportedAux, ImportedState, JustificationImport, JustificationSyncLink,
-	StateAction, StorageChanges,
-};
-pub use import_queue::DefaultImportQueue;
 pub use select_chain::SelectChain;
 pub use sp_inherents::InherentData;
 pub use sp_state_machine::Backend as StateBackend;
 
+/// Type of keys in the blockchain cache that consensus module could use for its needs.
+pub type CacheKeyId = [u8; 4];
+
 /// Block status.
 #[derive(Debug, PartialEq, Eq)]
 pub enum BlockStatus {
@@ -72,6 +58,23 @@ pub enum BlockStatus {
 	Unknown,
 }
 
+/// Block data origin.
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+pub enum BlockOrigin {
+	/// Genesis block built into the client.
+	Genesis,
+	/// Block is part of the initial sync with the network.
+	NetworkInitialSync,
+	/// Block was broadcasted on the network.
+	NetworkBroadcast,
+	/// Block that was received from the network and validated in the consensus process.
+	ConsensusBroadcast,
+	/// Block that was collated by this node.
+	Own,
+	/// Block was imported from a file.
+	File,
+}
+
 /// Environment for a Consensus instance.
 ///
 /// Creates proposer instance.
diff --git a/test-utils/client/src/client_ext.rs b/test-utils/client/src/client_ext.rs
index ef778ca96805..bf1c9898972c 100644
--- a/test-utils/client/src/client_ext.rs
+++ b/test-utils/client/src/client_ext.rs
@@ -19,10 +19,9 @@
 
 use codec::alloc::collections::hash_map::HashMap;
 use sc_client_api::{backend::Finalizer, client::BlockBackend};
+use sc_consensus::{BlockImport, BlockImportParams, ForkChoiceStrategy};
 use sc_service::client::Client;
-use sp_consensus::{
-	BlockImport, BlockImportParams, BlockOrigin, Error as ConsensusError, ForkChoiceStrategy,
-};
+use sp_consensus::{BlockOrigin, Error as ConsensusError};
 use sp_runtime::{generic::BlockId, traits::Block as BlockT, Justification, Justifications};
 
 /// Extension trait for a test client.
diff --git a/test-utils/runtime/Cargo.toml b/test-utils/runtime/Cargo.toml
index 2a4be6787dd7..cc57f12ea31a 100644
--- a/test-utils/runtime/Cargo.toml
+++ b/test-utils/runtime/Cargo.toml
@@ -52,6 +52,7 @@ serde = { version = "1.0.126", optional = true, features = ["derive"] }
 [dev-dependencies]
 sc-block-builder = { version = "0.10.0-dev", path = "../../client/block-builder" }
 sc-executor = { version = "0.10.0-dev", path = "../../client/executor" }
+sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
 substrate-test-runtime-client = { version = "2.0.0", path = "./client" }
 futures = "0.3.9"
 
diff --git a/test-utils/runtime/client/Cargo.toml b/test-utils/runtime/client/Cargo.toml
index 24e9f8af2944..9f1dc32a64ff 100644
--- a/test-utils/runtime/client/Cargo.toml
+++ b/test-utils/runtime/client/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 sc-light = { version = "4.0.0-dev", path = "../../../client/light" }
 sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
+sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/common" }
 sc-block-builder = { version = "0.10.0-dev", path = "../../../client/block-builder" }
 substrate-test-client = { version = "2.0.0", path = "../../client" }
 sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
@@ -23,6 +24,5 @@ sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 sc-client-api = { version = "4.0.0-dev", path = "../../../client/api" }
-sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/common" }
 sc-service = { version = "0.10.0-dev", default-features = false, path = "../../../client/service" }
 futures = "0.3.9"
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index 8da8f5c5db4e..bdf45ceae88b 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -1244,12 +1244,12 @@ mod tests {
 	use codec::Encode;
 	use sc_block_builder::BlockBuilderProvider;
 	use sp_api::ProvideRuntimeApi;
+	use sp_consensus::BlockOrigin;
 	use sp_core::storage::well_known_keys::HEAP_PAGES;
 	use sp_runtime::generic::BlockId;
 	use sp_state_machine::ExecutionStrategy;
 	use substrate_test_runtime_client::{
-		prelude::*, runtime::TestAPI, sp_consensus::BlockOrigin, DefaultTestClientBuilderExt,
-		TestClientBuilder,
+		prelude::*, runtime::TestAPI, DefaultTestClientBuilderExt, TestClientBuilder,
 	};
 
 	#[test]
diff --git a/test-utils/test-runner/src/lib.rs b/test-utils/test-runner/src/lib.rs
index c73ead9eb59a..9f0a8d5d6cb6 100644
--- a/test-utils/test-runner/src/lib.rs
+++ b/test-utils/test-runner/src/lib.rs
@@ -227,10 +227,11 @@
 //! }
 //! ```
 
+use sc_consensus::BlockImport;
 use sc_executor::NativeExecutionDispatch;
 use sc_service::TFullClient;
 use sp_api::{ConstructRuntimeApi, TransactionFor};
-use sp_consensus::{BlockImport, SelectChain};
+use sp_consensus::SelectChain;
 use sp_inherents::InherentDataProvider;
 use sp_runtime::traits::{Block as BlockT, SignedExtension};
 

From c1811602d725a9421a067f0bacfc3ceafc44ae18 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Sun, 1 Aug 2021 20:13:58 +0200
Subject: [PATCH 1041/1194] Refactor Benchmarks for Less Wasm Memory Usage
 (#9373)

* extract repeat out of benchmark

* remove r

* unused

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* use linked map to keep order

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Delete pallet_balances.rs

* Delete out

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* steps and repeat to tuple (current_*, total_*)

* idea for list command

* fmt

* use benchmark list in cli

* handle steps in cli

* move log update to cli

* fmt

* remove old todo

* line width

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* benchmark metadata function

* don't need this warm up

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* fix warnings

* fix node-template

* fix

* fmt

* line width

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* improve docs

* improve cli

* fix format

* fix bug?

* Revert "fix bug?"

This reverts commit 8051bf1bf9bae862ff28dfff386e7045cd3f045e.

* skip frame-metadata

* extract repeat out of benchmark

* remove r

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* use linked map to keep order

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Delete pallet_balances.rs

* Delete out

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* steps and repeat to tuple (current_*, total_*)

* idea for list command

* fmt

* use benchmark list in cli

* handle steps in cli

* move log update to cli

* remove old todo

* line width

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* benchmark metadata function

* don't need this warm up

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* fix warnings

* fix node-template

* fix

* fmt

* line width

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* improve docs

* improve cli

* fix format

* fix bug?

* Revert "fix bug?"

This reverts commit 8051bf1bf9bae862ff28dfff386e7045cd3f045e.

* skip frame-metadata

* Update .gitlab-ci.yml

* fix import

* Update .gitlab-ci.yml

Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
---
 .gitlab-ci.yml                              |   7 +-
 Cargo.lock                                  |   2 +
 bin/node-template/runtime/src/lib.rs        |  30 +-
 bin/node/runtime/src/lib.rs                 |  63 ++-
 frame/balances/src/weights.rs               |  40 +-
 frame/benchmarking/src/lib.rs               | 373 +++++++-------
 frame/benchmarking/src/utils.rs             |  43 +-
 frame/staking/src/weights.rs                | 524 +++++++++++++++-----
 utils/frame/benchmarking-cli/Cargo.toml     |   2 +
 utils/frame/benchmarking-cli/src/command.rs | 376 +++++++++-----
 utils/frame/benchmarking-cli/src/lib.rs     |  20 +-
 utils/frame/benchmarking-cli/src/writer.rs  |   2 +-
 12 files changed, 1001 insertions(+), 481 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2cef2d8badcc..f954ac23cba2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -273,7 +273,7 @@ node-bench-regression-guard:
     CI_IMAGE:                      "paritytech/node-bench-regression-guard:latest"
   before_script: [""]
   script:
-    - 'node-bench-regression-guard --reference artifacts/benches/master-* 
+    - 'node-bench-regression-guard --reference artifacts/benches/master-*
        --compare-with artifacts/benches/$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA'
 
 cargo-check-subkey:
@@ -343,6 +343,7 @@ unleash-check:
     - mkdir -p target/unleash
     - export CARGO_TARGET_DIR=target/unleash
     - cargo unleash check ${CARGO_UNLEASH_PKG_DEF}
+  allow_failure:                   true
 
 test-frame-examples-compile-to-wasm:
   # into one job
@@ -578,7 +579,7 @@ build-rust-doc:
     - buildah push --format=v2s2 "$IMAGE_NAME:latest"
   after_script:
     - buildah logout "$IMAGE_NAME"
-    # pass artifacts to the trigger-simnet job 
+    # pass artifacts to the trigger-simnet job
     - echo "IMAGE_NAME=${IMAGE_NAME}" | tee -a ./artifacts/$PRODUCT/build.env
     - IMAGE_TAG="$(cat ./artifacts/$PRODUCT/VERSION)"
     - echo "IMAGE_TAG=${IMAGE_TAG}"   | tee -a ./artifacts/$PRODUCT/build.env
@@ -713,7 +714,7 @@ trigger-simnet:
     - if: $CI_COMMIT_REF_NAME == "master"
   needs:
     - job:                         publish-docker-substrate
-  # `build.env` brings here `$IMAGE_NAME` and `$IMAGE_TAG` (`$VERSION` here, 
+  # `build.env` brings here `$IMAGE_NAME` and `$IMAGE_TAG` (`$VERSION` here,
   # i.e. `2643-0.8.29-5f689e0a-6b24dc54`).
   variables:
     TRGR_PROJECT:                  ${CI_PROJECT_NAME}
diff --git a/Cargo.lock b/Cargo.lock
index 6cfc2d19db81..3d22e0c0b6bd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1800,6 +1800,8 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "handlebars",
+ "linked-hash-map",
+ "log",
  "parity-scale-codec",
  "sc-cli",
  "sc-client-db",
diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index f9eaa96153eb..63da72102df3 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -446,14 +446,30 @@ impl_runtime_apis! {
 
 	#[cfg(feature = "runtime-benchmarks")]
 	impl frame_benchmarking::Benchmark<Block> for Runtime {
+		fn benchmark_metadata(extra: bool) -> (
+			Vec<frame_benchmarking::BenchmarkList>,
+			Vec<frame_support::traits::StorageInfo>,
+		) {
+			use frame_benchmarking::{list_benchmark, Benchmarking, BenchmarkList};
+			use frame_support::traits::StorageInfoTrait;
+			use frame_system_benchmarking::Pallet as SystemBench;
+
+			let mut list = Vec::<BenchmarkList>::new();
+
+			list_benchmark!(list, extra, frame_system, SystemBench::<Runtime>);
+			list_benchmark!(list, extra, pallet_balances, Balances);
+			list_benchmark!(list, extra, pallet_timestamp, Timestamp);
+			list_benchmark!(list, extra, pallet_template, TemplateModule);
+
+			let storage_info = AllPalletsWithSystem::storage_info();
+
+			return (list, storage_info)
+		}
+
 		fn dispatch_benchmark(
 			config: frame_benchmarking::BenchmarkConfig
-		) -> Result<
-			(Vec<frame_benchmarking::BenchmarkBatch>, Vec<StorageInfo>),
-			sp_runtime::RuntimeString,
-		> {
+		) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {
 			use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey};
-			use frame_support::traits::StorageInfoTrait;
 
 			use frame_system_benchmarking::Pallet as SystemBench;
 			impl frame_system_benchmarking::Config for Runtime {}
@@ -471,8 +487,6 @@ impl_runtime_apis! {
 				hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),
 			];
 
-			let storage_info = AllPalletsWithSystem::storage_info();
-
 			let mut batches = Vec::<BenchmarkBatch>::new();
 			let params = (&config, &whitelist);
 
@@ -482,7 +496,7 @@ impl_runtime_apis! {
 			add_benchmark!(params, batches, pallet_template, TemplateModule);
 
 			if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) }
-			Ok((batches, storage_info))
+			Ok(batches)
 		}
 	}
 }
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 90bd11d484b2..181f5fd42376 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -1534,14 +1534,63 @@ impl_runtime_apis! {
 
 	#[cfg(feature = "runtime-benchmarks")]
 	impl frame_benchmarking::Benchmark<Block> for Runtime {
+		fn benchmark_metadata(extra: bool) -> (
+			Vec<frame_benchmarking::BenchmarkList>,
+			Vec<frame_support::traits::StorageInfo>,
+		) {
+			use frame_benchmarking::{list_benchmark, Benchmarking, BenchmarkList};
+			use frame_support::traits::StorageInfoTrait;
+
+			// Trying to add benchmarks directly to the Session Pallet caused cyclic dependency
+			// issues. To get around that, we separated the Session benchmarks into its own crate,
+			// which is why we need these two lines below.
+			use pallet_session_benchmarking::Pallet as SessionBench;
+			use pallet_offences_benchmarking::Pallet as OffencesBench;
+			use frame_system_benchmarking::Pallet as SystemBench;
+
+			let mut list = Vec::<BenchmarkList>::new();
+
+			list_benchmark!(list, extra, pallet_assets, Assets);
+			list_benchmark!(list, extra, pallet_babe, Babe);
+			list_benchmark!(list, extra, pallet_balances, Balances);
+			list_benchmark!(list, extra, pallet_bounties, Bounties);
+			list_benchmark!(list, extra, pallet_collective, Council);
+			list_benchmark!(list, extra, pallet_contracts, Contracts);
+			list_benchmark!(list, extra, pallet_democracy, Democracy);
+			list_benchmark!(list, extra, pallet_election_provider_multi_phase, ElectionProviderMultiPhase);
+			list_benchmark!(list, extra, pallet_elections_phragmen, Elections);
+			list_benchmark!(list, extra, pallet_gilt, Gilt);
+			list_benchmark!(list, extra, pallet_grandpa, Grandpa);
+			list_benchmark!(list, extra, pallet_identity, Identity);
+			list_benchmark!(list, extra, pallet_im_online, ImOnline);
+			list_benchmark!(list, extra, pallet_indices, Indices);
+			list_benchmark!(list, extra, pallet_lottery, Lottery);
+			list_benchmark!(list, extra, pallet_membership, TechnicalMembership);
+			list_benchmark!(list, extra, pallet_mmr, Mmr);
+			list_benchmark!(list, extra, pallet_multisig, Multisig);
+			list_benchmark!(list, extra, pallet_offences, OffencesBench::<Runtime>);
+			list_benchmark!(list, extra, pallet_proxy, Proxy);
+			list_benchmark!(list, extra, pallet_scheduler, Scheduler);
+			list_benchmark!(list, extra, pallet_session, SessionBench::<Runtime>);
+			list_benchmark!(list, extra, pallet_staking, Staking);
+			list_benchmark!(list, extra, frame_system, SystemBench::<Runtime>);
+			list_benchmark!(list, extra, pallet_timestamp, Timestamp);
+			list_benchmark!(list, extra, pallet_tips, Tips);
+			list_benchmark!(list, extra, pallet_transaction_storage, TransactionStorage);
+			list_benchmark!(list, extra, pallet_treasury, Treasury);
+			list_benchmark!(list, extra, pallet_uniques, Uniques);
+			list_benchmark!(list, extra, pallet_utility, Utility);
+			list_benchmark!(list, extra, pallet_vesting, Vesting);
+
+			let storage_info = AllPalletsWithSystem::storage_info();
+
+			return (list, storage_info)
+		}
+
 		fn dispatch_benchmark(
 			config: frame_benchmarking::BenchmarkConfig
-		) -> Result<
-			(Vec<frame_benchmarking::BenchmarkBatch>, Vec<frame_support::traits::StorageInfo>),
-			sp_runtime::RuntimeString,
-		> {
+		) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {
 			use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey};
-			use frame_support::traits::StorageInfoTrait;
 
 			// Trying to add benchmarks directly to the Session Pallet caused cyclic dependency
 			// issues. To get around that, we separated the Session benchmarks into its own crate,
@@ -1569,8 +1618,6 @@ impl_runtime_apis! {
 				hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da95ecffd7b6c0f78751baa9d281e0bfa3a6d6f646c70792f74727372790000000000000000000000000000000000000000").to_vec().into(),
 			];
 
-			let storage_info = AllPalletsWithSystem::storage_info();
-
 			let mut batches = Vec::<BenchmarkBatch>::new();
 			let params = (&config, &whitelist);
 
@@ -1607,7 +1654,7 @@ impl_runtime_apis! {
 			add_benchmark!(params, batches, pallet_vesting, Vesting);
 
 			if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) }
-			Ok((batches, storage_info))
+			Ok(batches)
 		}
 	}
 }
diff --git a/frame/balances/src/weights.rs b/frame/balances/src/weights.rs
index d1e86ce45e4b..df609b74840d 100644
--- a/frame/balances/src/weights.rs
+++ b/frame/balances/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_balances
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2021-07-30, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -56,33 +56,39 @@ pub trait WeightInfo {
 /// Weights for pallet_balances using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	// Storage: System Account (r:1 w:1)
 	fn transfer() -> Weight {
-		(73_268_000 as Weight)
+		(78_358_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: System Account (r:1 w:1)
 	fn transfer_keep_alive() -> Weight {
-		(54_881_000 as Weight)
+		(59_001_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: System Account (r:1 w:1)
 	fn set_balance_creating() -> Weight {
-		(29_853_000 as Weight)
+		(32_698_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: System Account (r:1 w:1)
 	fn set_balance_killing() -> Weight {
-		(36_007_000 as Weight)
+		(38_746_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: System Account (r:2 w:2)
 	fn force_transfer() -> Weight {
-		(72_541_000 as Weight)
+		(77_622_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: System Account (r:1 w:1)
 	fn transfer_all() -> Weight {
-		(67_360_000 as Weight)
+		(72_020_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -90,33 +96,39 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
+	// Storage: System Account (r:1 w:1)
 	fn transfer() -> Weight {
-		(73_268_000 as Weight)
+		(78_358_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: System Account (r:1 w:1)
 	fn transfer_keep_alive() -> Weight {
-		(54_881_000 as Weight)
+		(59_001_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: System Account (r:1 w:1)
 	fn set_balance_creating() -> Weight {
-		(29_853_000 as Weight)
+		(32_698_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: System Account (r:1 w:1)
 	fn set_balance_killing() -> Weight {
-		(36_007_000 as Weight)
+		(38_746_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: System Account (r:2 w:2)
 	fn force_transfer() -> Weight {
-		(72_541_000 as Weight)
+		(77_622_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: System Account (r:1 w:1)
 	fn transfer_all() -> Weight {
-		(67_360_000 as Weight)
+		(72_020_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
index a0aa78f722f7..7149ddc82f59 100644
--- a/frame/benchmarking/src/lib.rs
+++ b/frame/benchmarking/src/lib.rs
@@ -711,8 +711,8 @@ macro_rules! impl_benchmark {
 				extrinsic: &[u8],
 				lowest_range_values: &[u32],
 				highest_range_values: &[u32],
-				steps: &[u32],
-				repeat: u32,
+				steps: (u32, u32),
+				_repeat: (u32, u32),
 				whitelist: &[$crate::TrackedStorageKey],
 				verify: bool,
 			) -> Result<$crate::Vec<$crate::BenchmarkResults>, &'static str> {
@@ -724,9 +724,6 @@ macro_rules! impl_benchmark {
 					_ => return Err("Could not find extrinsic."),
 				};
 				let mut results: $crate::Vec<$crate::BenchmarkResults> = $crate::Vec::new();
-				if repeat == 0 {
-					return Ok(results);
-				}
 
 				// Add whitelist to DB including whitelisted caller
 				let mut whitelist = whitelist.to_vec();
@@ -737,141 +734,110 @@ macro_rules! impl_benchmark {
 				whitelist.push(whitelisted_caller_key.into());
 				$crate::benchmarking::set_whitelist(whitelist);
 
-				// Warm up the DB
-				$crate::benchmarking::commit_db();
-				$crate::benchmarking::wipe_db();
-
 				let components = <
 					SelectedBenchmark as $crate::BenchmarkingSetup<T $(, $instance)?>
 				>::components(&selected_benchmark);
 
-				let mut progress = $crate::benchmarking::current_time();
-				// Default number of steps for a component.
-				let mut prev_steps = 10;
-
-				let mut repeat_benchmark = |
-					repeat: u32,
+				let do_benchmark = |
 					c: &[($crate::BenchmarkParameter, u32)],
 					results: &mut $crate::Vec<$crate::BenchmarkResults>,
 					verify: bool,
-					step: u32,
-					num_steps: u32,
 				| -> Result<(), &'static str> {
-					// Run the benchmark `repeat` times.
-					for r in 0..repeat {
-						// Set up the externalities environment for the setup we want to
-						// benchmark.
-						let closure_to_benchmark = <
-							SelectedBenchmark as $crate::BenchmarkingSetup<T $(, $instance)?>
-						>::instance(&selected_benchmark, c, verify)?;
-
-						// Set the block number to at least 1 so events are deposited.
-						if $crate::Zero::is_zero(&frame_system::Pallet::<T>::block_number()) {
-							frame_system::Pallet::<T>::set_block_number(1u32.into());
-						}
+					// Set up the externalities environment for the setup we want to
+					// benchmark.
+					let closure_to_benchmark = <
+						SelectedBenchmark as $crate::BenchmarkingSetup<T $(, $instance)?>
+					>::instance(&selected_benchmark, c, verify)?;
 
-						// Commit the externalities to the database, flushing the DB cache.
-						// This will enable worst case scenario for reading from the database.
-						$crate::benchmarking::commit_db();
+					// Set the block number to at least 1 so events are deposited.
+					if $crate::Zero::is_zero(&frame_system::Pallet::<T>::block_number()) {
+						frame_system::Pallet::<T>::set_block_number(1u32.into());
+					}
 
-						// Reset the read/write counter so we don't count operations in the setup process.
-						$crate::benchmarking::reset_read_write_count();
+					// Commit the externalities to the database, flushing the DB cache.
+					// This will enable worst case scenario for reading from the database.
+					$crate::benchmarking::commit_db();
 
-						if verify {
-							closure_to_benchmark()?;
-						} else {
-							// Time the extrinsic logic.
-							$crate::log::trace!(
-								target: "benchmark",
-								"Start Benchmark: {:?}", c
-							);
-
-							let start_pov = $crate::benchmarking::proof_size();
-							let start_extrinsic = $crate::benchmarking::current_time();
-
-							closure_to_benchmark()?;
-
-							let finish_extrinsic = $crate::benchmarking::current_time();
-							let end_pov = $crate::benchmarking::proof_size();
-
-							// Calculate the diff caused by the benchmark.
-							let elapsed_extrinsic = finish_extrinsic.saturating_sub(start_extrinsic);
-							let diff_pov = match (start_pov, end_pov) {
-								(Some(start), Some(end)) => end.saturating_sub(start),
-								_ => Default::default(),
-							};
-
-							// Commit the changes to get proper write count
-							$crate::benchmarking::commit_db();
-							$crate::log::trace!(
-								target: "benchmark",
-								"End Benchmark: {} ns", elapsed_extrinsic
-							);
-							let read_write_count = $crate::benchmarking::read_write_count();
-							$crate::log::trace!(
-								target: "benchmark",
-								"Read/Write Count {:?}", read_write_count
-							);
-
-							let time = $crate::benchmarking::current_time();
-							if time.saturating_sub(progress) > 5000000000 {
-								progress = $crate::benchmarking::current_time();
-								$crate::log::info!(
-									target: "benchmark",
-									"Benchmarking {} {}/{}, run {}/{}",
-									extrinsic,
-									step,
-									num_steps,
-									r,
-									repeat,
-								);
-							}
-
-							// Time the storage root recalculation.
-							let start_storage_root = $crate::benchmarking::current_time();
-							$crate::storage_root();
-							let finish_storage_root = $crate::benchmarking::current_time();
-							let elapsed_storage_root = finish_storage_root - start_storage_root;
-
-							// TODO: Fix memory allocation issue then re-enable
-							// let read_and_written_keys = $crate::benchmarking::get_read_and_written_keys();
-							let read_and_written_keys = Default::default();
-
-							results.push($crate::BenchmarkResults {
-								components: c.to_vec(),
-								extrinsic_time: elapsed_extrinsic,
-								storage_root_time: elapsed_storage_root,
-								reads: read_write_count.0,
-								repeat_reads: read_write_count.1,
-								writes: read_write_count.2,
-								repeat_writes: read_write_count.3,
-								proof_size: diff_pov,
-								keys: read_and_written_keys,
-							});
-						}
+					// Reset the read/write counter so we don't count operations in the setup process.
+					$crate::benchmarking::reset_read_write_count();
 
-						// Wipe the DB back to the genesis state.
-						$crate::benchmarking::wipe_db();
+					if verify {
+						closure_to_benchmark()?;
+					} else {
+						// Time the extrinsic logic.
+						$crate::log::trace!(
+							target: "benchmark",
+							"Start Benchmark: {:?}", c
+						);
+
+						let start_pov = $crate::benchmarking::proof_size();
+						let start_extrinsic = $crate::benchmarking::current_time();
+
+						closure_to_benchmark()?;
+
+						let finish_extrinsic = $crate::benchmarking::current_time();
+						let end_pov = $crate::benchmarking::proof_size();
+
+						// Calculate the diff caused by the benchmark.
+						let elapsed_extrinsic = finish_extrinsic.saturating_sub(start_extrinsic);
+						let diff_pov = match (start_pov, end_pov) {
+							(Some(start), Some(end)) => end.saturating_sub(start),
+							_ => Default::default(),
+						};
+
+						// Commit the changes to get proper write count
+						$crate::benchmarking::commit_db();
+						$crate::log::trace!(
+							target: "benchmark",
+							"End Benchmark: {} ns", elapsed_extrinsic
+						);
+						let read_write_count = $crate::benchmarking::read_write_count();
+						$crate::log::trace!(
+							target: "benchmark",
+							"Read/Write Count {:?}", read_write_count
+						);
+
+						// Time the storage root recalculation.
+						let start_storage_root = $crate::benchmarking::current_time();
+						$crate::storage_root();
+						let finish_storage_root = $crate::benchmarking::current_time();
+						let elapsed_storage_root = finish_storage_root - start_storage_root;
+
+						let read_and_written_keys = $crate::benchmarking::get_read_and_written_keys();
+
+						results.push($crate::BenchmarkResults {
+							components: c.to_vec(),
+							extrinsic_time: elapsed_extrinsic,
+							storage_root_time: elapsed_storage_root,
+							reads: read_write_count.0,
+							repeat_reads: read_write_count.1,
+							writes: read_write_count.2,
+							repeat_writes: read_write_count.3,
+							proof_size: diff_pov,
+							keys: read_and_written_keys,
+						});
 					}
 
+					// Wipe the DB back to the genesis state.
+					$crate::benchmarking::wipe_db();
+
 					Ok(())
 				};
 
+				let (current_step, total_steps) = steps;
+
 				if components.is_empty() {
-					if verify {
-						// If `--verify` is used, run the benchmark once to verify it would complete.
-						repeat_benchmark(1, Default::default(), &mut $crate::Vec::new(), true, 1, 1)?;
+					// The CLI could ask to do more steps than is sensible, so we skip those.
+					if current_step == 0 {
+						if verify {
+							// If `--verify` is used, run the benchmark once to verify it would complete.
+							do_benchmark(Default::default(), &mut $crate::Vec::new(), true)?;
+						}
+						do_benchmark(Default::default(), &mut results, false)?;
 					}
-					repeat_benchmark(repeat, Default::default(), &mut results, false, 1, 1)?;
 				} else {
 					// Select the component we will be benchmarking. Each component will be benchmarked.
 					for (idx, (name, low, high)) in components.iter().enumerate() {
-						// Get the number of steps for this component.
-						let steps = steps.get(idx).cloned().unwrap_or(prev_steps);
-						prev_steps = steps;
-
-						// Skip this loop if steps is zero
-						if steps == 0 { continue }
 
 						let lowest = lowest_range_values.get(idx).cloned().unwrap_or(*low);
 						let highest = highest_range_values.get(idx).cloned().unwrap_or(*high);
@@ -879,31 +845,34 @@ macro_rules! impl_benchmark {
 						let diff = highest - lowest;
 
 						// Create up to `STEPS` steps for that component between high and low.
-						let step_size = (diff / steps).max(1);
+						let step_size = (diff / total_steps).max(1);
 						let num_of_steps = diff / step_size + 1;
 
-						for s in 0..num_of_steps {
-							// This is the value we will be testing for component `name`
-							let component_value = lowest + step_size * s;
+						// The CLI could ask to do more steps than is sensible, so we just skip those.
+						if current_step >= num_of_steps {
+							continue;
+						}
 
-							// Select the max value for all the other components.
-							let c: $crate::Vec<($crate::BenchmarkParameter, u32)> = components.iter()
-								.enumerate()
-								.map(|(idx, (n, _, h))|
-									if n == name {
-										(*n, component_value)
-									} else {
-										(*n, *highest_range_values.get(idx).unwrap_or(h))
-									}
-								)
-								.collect();
+						// This is the value we will be testing for component `name`
+						let component_value = lowest + step_size * current_step;
+
+						// Select the max value for all the other components.
+						let c: $crate::Vec<($crate::BenchmarkParameter, u32)> = components.iter()
+							.enumerate()
+							.map(|(idx, (n, _, h))|
+								if n == name {
+									(*n, component_value)
+								} else {
+									(*n, *highest_range_values.get(idx).unwrap_or(h))
+								}
+							)
+							.collect();
 
-							if verify {
-								// If `--verify` is used, run the benchmark once to verify it would complete.
-								repeat_benchmark(1, &c, &mut $crate::Vec::new(), true, s, num_of_steps)?;
-							}
-							repeat_benchmark(repeat, &c, &mut results, false, s, num_of_steps)?;
+						if verify {
+							// If `--verify` is used, run the benchmark once to verify it would complete.
+							do_benchmark(&c, &mut $crate::Vec::new(), true)?;
 						}
+						do_benchmark(&c, &mut results, false)?;
 					}
 				}
 				return Ok(results);
@@ -1253,8 +1222,8 @@ pub fn show_benchmark_debug_info(
 	benchmark: &[u8],
 	lowest_range_values: &sp_std::prelude::Vec<u32>,
 	highest_range_values: &sp_std::prelude::Vec<u32>,
-	steps: &sp_std::prelude::Vec<u32>,
-	repeat: &u32,
+	steps: &(u32, u32),
+	repeat: &(u32, u32),
 	verify: &bool,
 	error_message: &str,
 ) -> sp_runtime::RuntimeString {
@@ -1273,8 +1242,8 @@ pub fn show_benchmark_debug_info(
 			.expect("it's all just strings ran through the wasm interface. qed"),
 		lowest_range_values,
 		highest_range_values,
-		steps,
-		repeat,
+		steps.1,
+		repeat.1,
 		verify,
 		error_message,
 	)
@@ -1359,62 +1328,70 @@ macro_rules! add_benchmark {
 			verify,
 			extra,
 		} = config;
-		if &pallet[..] == &name_string[..] || &pallet[..] == &b"*"[..] {
-			if &pallet[..] == &b"*"[..] || &benchmark[..] == &b"*"[..] {
-				for benchmark in $( $location )*::benchmarks(*extra).into_iter() {
-					$batches.push($crate::BenchmarkBatch {
-						pallet: name_string.to_vec(),
-						instance: instance_string.to_vec(),
-						benchmark: benchmark.to_vec(),
-						results: $( $location )*::run_benchmark(
-							benchmark,
-							&lowest_range_values[..],
-							&highest_range_values[..],
-							&steps[..],
-							*repeat,
-							whitelist,
-							*verify,
-						).map_err(|e| {
-							$crate::show_benchmark_debug_info(
-								instance_string,
-								benchmark,
-								lowest_range_values,
-								highest_range_values,
-								steps,
-								repeat,
-								verify,
-								e,
-							)
-						})?,
-					});
-				}
-			} else {
-				$batches.push($crate::BenchmarkBatch {
-					pallet: name_string.to_vec(),
-					instance: instance_string.to_vec(),
-					benchmark: benchmark.clone(),
-					results: $( $location )*::run_benchmark(
-						&benchmark[..],
-						&lowest_range_values[..],
-						&highest_range_values[..],
-						&steps[..],
-						*repeat,
-						whitelist,
-						*verify,
-					).map_err(|e| {
-						$crate::show_benchmark_debug_info(
-							instance_string,
-							benchmark,
-							lowest_range_values,
-							highest_range_values,
-							steps,
-							repeat,
-							verify,
-							e,
-						)
-					})?,
-				});
-			}
+		if &pallet[..] == &name_string[..] {
+			$batches.push($crate::BenchmarkBatch {
+				pallet: name_string.to_vec(),
+				instance: instance_string.to_vec(),
+				benchmark: benchmark.clone(),
+				results: $( $location )*::run_benchmark(
+					&benchmark[..],
+					&lowest_range_values[..],
+					&highest_range_values[..],
+					*steps,
+					*repeat,
+					whitelist,
+					*verify,
+				).map_err(|e| {
+					$crate::show_benchmark_debug_info(
+						instance_string,
+						benchmark,
+						lowest_range_values,
+						highest_range_values,
+						steps,
+						repeat,
+						verify,
+						e,
+					)
+				})?
+			});
 		}
 	)
 }
+
+/// This macro allows users to easily generate a list of benchmarks for the pallets configured
+/// in the runtime.
+///
+/// To use this macro, first create a an object to store the list:
+///
+/// ```ignore
+/// let mut list = Vec::<BenchmarkList>::new();
+/// ```
+///
+/// Then pass this `list` to the macro, along with the `extra` boolean, the pallet crate, and
+/// pallet struct:
+///
+/// ```ignore
+/// list_benchmark!(list, extra, pallet_balances, Balances);
+/// list_benchmark!(list, extra, pallet_session, SessionBench::<Runtime>);
+/// list_benchmark!(list, extra, frame_system, SystemBench::<Runtime>);
+/// ```
+///
+/// This should match what exists with the `add_benchmark!` macro.
+
+#[macro_export]
+macro_rules! list_benchmark {
+	( $list:ident, $extra:ident, $name:path, $( $location:tt )* ) => (
+		let pallet_string = stringify!($name).as_bytes();
+		let instance_string = stringify!( $( $location )* ).as_bytes();
+		let benchmarks = $( $location )*::benchmarks($extra)
+			.iter()
+			.map(|b| b.to_vec())
+			.collect::<Vec<_>>();
+		let pallet_benchmarks = BenchmarkList {
+			pallet: pallet_string.to_vec(),
+			instance: instance_string.to_vec(),
+			benchmarks: benchmarks.to_vec(),
+		};
+		$list.push(pallet_benchmarks)
+	)
+}
diff --git a/frame/benchmarking/src/utils.rs b/frame/benchmarking/src/utils.rs
index 33d479a0b54a..82c6e44796fa 100644
--- a/frame/benchmarking/src/utils.rs
+++ b/frame/benchmarking/src/utils.rs
@@ -103,22 +103,41 @@ pub struct BenchmarkConfig {
 	pub lowest_range_values: Vec<u32>,
 	/// An optional manual override to the highest values used in the `steps` range.
 	pub highest_range_values: Vec<u32>,
-	/// The number of samples to take across the range of values for components.
-	pub steps: Vec<u32>,
-	/// The number of times to repeat a benchmark.
-	pub repeat: u32,
+	/// The number of samples to take across the range of values for components. (current_step,
+	/// total_steps)
+	pub steps: (u32, u32),
+	/// The number times to repeat each benchmark to increase accuracy of results. (current_repeat,
+	/// total_repeat)
+	pub repeat: (u32, u32),
 	/// Enable an extra benchmark iteration which runs the verification logic for a benchmark.
 	pub verify: bool,
-	/// Enable benchmarking of "extra" extrinsics, i.e. those that are not directly used in a pallet.
+	/// Enable benchmarking of "extra" extrinsics, i.e. those that are not directly used in a
+	/// pallet.
 	pub extra: bool,
 }
 
+/// A list of benchmarks available for a particular pallet and instance.
+///
+/// All `Vec<u8>` must be valid utf8 strings.
+#[derive(Encode, Decode, Default, Clone, PartialEq, Debug)]
+pub struct BenchmarkList {
+	pub pallet: Vec<u8>,
+	pub instance: Vec<u8>,
+	pub benchmarks: Vec<Vec<u8>>,
+}
+
 sp_api::decl_runtime_apis! {
 	/// Runtime api for benchmarking a FRAME runtime.
 	pub trait Benchmark {
+		/// Get the benchmark metadata available for this runtime.
+		///
+		/// Parameters
+		/// - `extra`: Also list benchmarks marked "extra" which would otherwise not be
+		///            needed for weight calculation.
+		fn benchmark_metadata(extra: bool) -> (Vec<BenchmarkList>, Vec<StorageInfo>);
+
 		/// Dispatch the given benchmark.
-		fn dispatch_benchmark(config: BenchmarkConfig)
-			-> Result<(Vec<BenchmarkBatch>, Vec<StorageInfo>), sp_runtime::RuntimeString>;
+		fn dispatch_benchmark(config: BenchmarkConfig) -> Result<Vec<BenchmarkBatch>, sp_runtime::RuntimeString>;
 	}
 }
 
@@ -216,16 +235,18 @@ pub trait Benchmarking<T> {
 	/// Parameters
 	/// - `name`: The name of extrinsic function or benchmark you want to benchmark encoded as
 	///   bytes.
-	/// - `steps`: The number of sample points you want to take across the range of parameters.
 	/// - `lowest_range_values`: The lowest number for each range of parameters.
 	/// - `highest_range_values`: The highest number for each range of parameters.
-	/// - `repeat`: The number of times you want to repeat a benchmark.
+	/// - `steps`: The number of sample points you want to take across the range of parameters.
+	///   (current_step, total_steps)
+	/// - `repeat`: The total number times to repeat each benchmark to increase accuracy of results.
+	///   (current_repeat, total_repeats)
 	fn run_benchmark(
 		name: &[u8],
 		lowest_range_values: &[u32],
 		highest_range_values: &[u32],
-		steps: &[u32],
-		repeat: u32,
+		steps: (u32, u32),
+		repeat: (u32, u32),
 		whitelist: &[TrackedStorageKey],
 		verify: bool,
 	) -> Result<Vec<T>, &'static str>;
diff --git a/frame/staking/src/weights.rs b/frame/staking/src/weights.rs
index cba4e68b5f61..fb4ed160d832 100644
--- a/frame/staking/src/weights.rs
+++ b/frame/staking/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_staking
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2021-07-31, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -78,376 +78,664 @@ pub trait WeightInfo {
 /// Weights for pallet_staking using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	// Storage: Staking CurrentEra (r:1 w:0)
+	// Storage: Balances Locks (r:1 w:1)
+	// Storage: Staking Bonded (r:1 w:1)
+	// Storage: Staking HistoryDepth (r:1 w:0)
+	// Storage: Staking Ledger (r:1 w:1)
+	// Storage: Staking Payee (r:0 w:1)
 	fn bond() -> Weight {
-		(72_617_000 as Weight)
+		(77_492_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
+	// Storage: Staking Ledger (r:1 w:1)
+	// Storage: Staking Bonded (r:1 w:0)
+	// Storage: Balances Locks (r:1 w:1)
 	fn bond_extra() -> Weight {
-		(55_590_000 as Weight)
+		(59_476_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Staking CurrentEra (r:1 w:0)
+	// Storage: Staking Ledger (r:1 w:1)
+	// Storage: Staking Nominators (r:1 w:0)
+	// Storage: Balances Locks (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Staking Validators (r:1 w:0)
 	fn unbond() -> Weight {
-		(59_730_000 as Weight)
+		(63_655_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Balances Locks (r:1 w:1)
+	// Storage: Staking Ledger (r:1 w:1)
+	// Storage: Staking CurrentEra (r:1 w:0)
+	// Storage: System Account (r:1 w:1)
 	fn withdraw_unbonded_update(s: u32, ) -> Weight {
-		(52_279_000 as Weight)
+		(54_534_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((68_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((24_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Staking CurrentEra (r:1 w:0)
+	// Storage: Balances Locks (r:1 w:1)
+	// Storage: Staking Nominators (r:1 w:0)
+	// Storage: Staking Ledger (r:1 w:1)
+	// Storage: Staking Bonded (r:1 w:1)
+	// Storage: Staking Validators (r:1 w:0)
+	// Storage: Staking Payee (r:0 w:1)
+	// Storage: Staking SlashingSpans (r:1 w:0)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Staking SpanSlash (r:0 w:2)
 	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
-		(86_629_000 as Weight)
+		(89_850_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((2_379_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((2_396_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(8 as Weight))
 			.saturating_add(T::DbWeight::get().writes(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
+	// Storage: Staking MaxValidatorsCount (r:1 w:0)
+	// Storage: Staking MinValidatorBond (r:1 w:0)
+	// Storage: Staking Ledger (r:1 w:0)
+	// Storage: Staking Nominators (r:1 w:0)
+	// Storage: Staking Validators (r:1 w:1)
+	// Storage: Staking CounterForValidators (r:1 w:1)
 	fn validate() -> Weight {
-		(32_393_000 as Weight)
+		(36_726_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Staking Ledger (r:1 w:0)
+	// Storage: Staking Nominators (r:1 w:1)
 	fn kick(k: u32, ) -> Weight {
-		(36_986_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((16_574_000 as Weight).saturating_mul(k as Weight))
+		(19_497_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((17_057_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(k as Weight)))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
+	// Storage: Staking Ledger (r:1 w:0)
+	// Storage: Staking MinNominatorBond (r:1 w:0)
+	// Storage: Staking CounterForNominators (r:1 w:1)
+	// Storage: Staking CurrentEra (r:1 w:0)
+	// Storage: Staking Nominators (r:1 w:1)
+	// Storage: Staking Validators (r:2 w:0)
+	// Storage: Staking MaxNominatorsCount (r:1 w:0)
 	fn nominate(n: u32, ) -> Weight {
-		(43_228_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((5_119_000 as Weight).saturating_mul(n as Weight))
+		(45_146_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((5_527_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Staking Validators (r:1 w:0)
+	// Storage: Staking Ledger (r:1 w:0)
+	// Storage: Staking Nominators (r:1 w:0)
 	fn chill() -> Weight {
-		(17_800_000 as Weight)
+		(18_986_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 	}
+	// Storage: Staking Payee (r:0 w:1)
+	// Storage: Staking Ledger (r:1 w:0)
 	fn set_payee() -> Weight {
-		(12_612_000 as Weight)
+		(13_348_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Staking Bonded (r:1 w:1)
+	// Storage: Staking Ledger (r:2 w:2)
 	fn set_controller() -> Weight {
-		(27_503_000 as Weight)
+		(28_148_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Staking ValidatorCount (r:0 w:1)
 	fn set_validator_count() -> Weight {
-		(2_119_000 as Weight)
+		(2_909_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Staking ForceEra (r:0 w:1)
 	fn force_no_eras() -> Weight {
-		(2_320_000 as Weight)
+		(3_163_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Staking ForceEra (r:0 w:1)
 	fn force_new_era() -> Weight {
-		(2_269_000 as Weight)
+		(3_141_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Staking ForceEra (r:0 w:1)
 	fn force_new_era_always() -> Weight {
-		(2_334_000 as Weight)
+		(3_220_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Staking Invulnerables (r:0 w:1)
 	fn set_invulnerables(v: u32, ) -> Weight {
-		(2_354_000 as Weight)
+		(3_569_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((5_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((58_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Balances Locks (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Staking Nominators (r:1 w:0)
+	// Storage: Staking Payee (r:0 w:1)
+	// Storage: Staking Bonded (r:1 w:1)
+	// Storage: Staking Validators (r:1 w:0)
+	// Storage: Staking SlashingSpans (r:1 w:0)
+	// Storage: Staking Ledger (r:0 w:1)
+	// Storage: Staking SpanSlash (r:0 w:2)
 	fn force_unstake(s: u32, ) -> Weight {
-		(61_556_000 as Weight)
+		(65_753_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((2_377_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((2_420_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
+	// Storage: Staking UnappliedSlashes (r:1 w:1)
 	fn cancel_deferred_slash(s: u32, ) -> Weight {
-		(3_367_105_000 as Weight)
-			// Standard Error: 222_000
-			.saturating_add((19_817_000 as Weight).saturating_mul(s as Weight))
+		(3_056_514_000 as Weight)
+			// Standard Error: 218_000
+			.saturating_add((21_159_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Staking Bonded (r:2 w:0)
+	// Storage: Staking Ledger (r:1 w:1)
+	// Storage: Staking CurrentEra (r:1 w:0)
+	// Storage: Staking ErasRewardPoints (r:1 w:0)
+	// Storage: Staking ErasValidatorReward (r:1 w:0)
+	// Storage: Staking HistoryDepth (r:1 w:0)
+	// Storage: System Account (r:2 w:2)
+	// Storage: Staking Payee (r:2 w:0)
+	// Storage: Staking ErasStakersClipped (r:1 w:0)
+	// Storage: Staking ErasValidatorPrefs (r:1 w:0)
 	fn payout_stakers_dead_controller(n: u32, ) -> Weight {
-		(47_229_000 as Weight)
-			// Standard Error: 53_000
-			.saturating_add((48_365_000 as Weight).saturating_mul(n as Weight))
+		(121_794_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((49_467_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(10 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(n as Weight)))
 	}
+	// Storage: Staking ErasValidatorPrefs (r:1 w:0)
+	// Storage: Staking Ledger (r:2 w:2)
+	// Storage: Staking ErasValidatorReward (r:1 w:0)
+	// Storage: Balances Locks (r:2 w:2)
+	// Storage: Staking ErasRewardPoints (r:1 w:0)
+	// Storage: Staking CurrentEra (r:1 w:0)
+	// Storage: Staking HistoryDepth (r:1 w:0)
+	// Storage: System Account (r:2 w:2)
+	// Storage: Staking ErasStakersClipped (r:1 w:0)
+	// Storage: Staking Bonded (r:2 w:0)
+	// Storage: Staking Payee (r:2 w:0)
 	fn payout_stakers_alive_staked(n: u32, ) -> Weight {
-		(156_788_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((61_280_000 as Weight).saturating_mul(n as Weight))
+		(147_049_000 as Weight)
+			// Standard Error: 30_000
+			.saturating_add((64_428_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(11 as Weight))
 			.saturating_add(T::DbWeight::get().reads((5 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(n as Weight)))
 	}
+	// Storage: Balances Locks (r:1 w:1)
+	// Storage: Staking Ledger (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn rebond(l: u32, ) -> Weight {
-		(47_815_000 as Weight)
+		(52_184_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((65_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add((35_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Staking ErasStakersClipped (r:0 w:2)
+	// Storage: Staking ErasValidatorReward (r:0 w:1)
+	// Storage: Staking CurrentEra (r:1 w:0)
+	// Storage: Staking ErasValidatorPrefs (r:0 w:2)
+	// Storage: Staking ErasTotalStake (r:0 w:1)
+	// Storage: Staking ErasStakers (r:0 w:2)
+	// Storage: Staking ErasRewardPoints (r:0 w:1)
+	// Storage: Staking HistoryDepth (r:1 w:1)
+	// Storage: Staking ErasStartSessionIndex (r:0 w:1)
 	fn set_history_depth(e: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 74_000
-			.saturating_add((34_945_000 as Weight).saturating_mul(e as Weight))
+			// Standard Error: 57_000
+			.saturating_add((30_689_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes((7 as Weight).saturating_mul(e as Weight)))
 	}
+	// Storage: Staking Nominators (r:1 w:0)
+	// Storage: Staking SlashingSpans (r:1 w:1)
+	// Storage: Staking Validators (r:1 w:1)
+	// Storage: Staking SpanSlash (r:0 w:1)
+	// Storage: Staking CounterForValidators (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Staking Payee (r:0 w:1)
+	// Storage: Staking Ledger (r:0 w:1)
+	// Storage: Staking Bonded (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
 	fn reap_stash(s: u32, ) -> Weight {
-		(73_483_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((2_384_000 as Weight).saturating_mul(s as Weight))
+		(75_836_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((2_423_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes(8 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
+	// Storage: System BlockWeight (r:1 w:1)
+	// Storage: Staking ErasStakers (r:0 w:1)
+	// Storage: Staking ErasStakersClipped (r:0 w:1)
+	// Storage: Staking Nominators (r:101 w:0)
+	// Storage: Staking SlashingSpans (r:1 w:0)
+	// Storage: Staking ErasStartSessionIndex (r:0 w:1)
+	// Storage: Staking Ledger (r:101 w:0)
+	// Storage: Staking Validators (r:2 w:0)
+	// Storage: Staking Bonded (r:101 w:0)
+	// Storage: Staking CounterForNominators (r:1 w:0)
+	// Storage: Staking ValidatorCount (r:1 w:0)
+	// Storage: Staking HistoryDepth (r:1 w:0)
+	// Storage: Staking ErasValidatorPrefs (r:0 w:1)
+	// Storage: Staking CounterForValidators (r:1 w:0)
+	// Storage: Staking CurrentEra (r:1 w:1)
+	// Storage: Staking MinimumValidatorCount (r:1 w:0)
+	// Storage: Staking ErasTotalStake (r:0 w:1)
 	fn new_era(v: u32, n: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 846_000
-			.saturating_add((305_234_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 42_000
-			.saturating_add((48_280_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 1_492_000
+			.saturating_add((299_860_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 99_000
+			.saturating_add((47_937_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(10 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(v as Weight)))
 	}
+	// Storage: Staking Validators (r:501 w:0)
+	// Storage: Staking Bonded (r:1500 w:0)
+	// Storage: Staking Nominators (r:1001 w:0)
+	// Storage: Staking Ledger (r:1500 w:0)
+	// Storage: Staking SlashingSpans (r:21 w:0)
 	fn get_npos_voters(v: u32, n: u32, s: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 99_000
-			.saturating_add((25_735_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 99_000
-			.saturating_add((28_122_000 as Weight).saturating_mul(n as Weight))
-			// Standard Error: 3_388_000
-			.saturating_add((21_500_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 101_000
+			.saturating_add((27_304_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 101_000
+			.saturating_add((29_893_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 3_441_000
+			.saturating_add((91_111_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
 	}
+	// Storage: Staking Validators (r:501 w:0)
 	fn get_npos_targets(v: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 30_000
-			.saturating_add((11_065_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 32_000
+			.saturating_add((11_692_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(v as Weight)))
 	}
+	// Storage: Staking MaxNominatorsCount (r:0 w:1)
+	// Storage: Staking MaxValidatorsCount (r:0 w:1)
+	// Storage: Staking MinValidatorBond (r:0 w:1)
+	// Storage: Staking ChillThreshold (r:0 w:1)
+	// Storage: Staking MinNominatorBond (r:0 w:1)
 	fn set_staking_limits() -> Weight {
-		(5_028_000 as Weight)
-			.saturating_add(T::DbWeight::get().writes(4 as Weight))
-	}
+		(7_325_000 as Weight)
+			.saturating_add(T::DbWeight::get().writes(5 as Weight))
+	}
+	// Storage: Staking MinValidatorBond (r:1 w:0)
+	// Storage: Staking ChillThreshold (r:1 w:0)
+	// Storage: Staking Nominators (r:1 w:0)
+	// Storage: Staking Validators (r:1 w:1)
+	// Storage: Staking CounterForValidators (r:1 w:1)
+	// Storage: Staking MaxValidatorsCount (r:1 w:0)
+	// Storage: Staking Ledger (r:1 w:0)
 	fn chill_other() -> Weight {
-		(35_758_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(62_683_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
+	// Storage: Staking CurrentEra (r:1 w:0)
+	// Storage: Balances Locks (r:1 w:1)
+	// Storage: Staking Bonded (r:1 w:1)
+	// Storage: Staking HistoryDepth (r:1 w:0)
+	// Storage: Staking Ledger (r:1 w:1)
+	// Storage: Staking Payee (r:0 w:1)
 	fn bond() -> Weight {
-		(72_617_000 as Weight)
+		(77_492_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
+	// Storage: Staking Ledger (r:1 w:1)
+	// Storage: Staking Bonded (r:1 w:0)
+	// Storage: Balances Locks (r:1 w:1)
 	fn bond_extra() -> Weight {
-		(55_590_000 as Weight)
+		(59_476_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Staking CurrentEra (r:1 w:0)
+	// Storage: Staking Ledger (r:1 w:1)
+	// Storage: Staking Nominators (r:1 w:0)
+	// Storage: Balances Locks (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Staking Validators (r:1 w:0)
 	fn unbond() -> Weight {
-		(59_730_000 as Weight)
+		(63_655_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Balances Locks (r:1 w:1)
+	// Storage: Staking Ledger (r:1 w:1)
+	// Storage: Staking CurrentEra (r:1 w:0)
+	// Storage: System Account (r:1 w:1)
 	fn withdraw_unbonded_update(s: u32, ) -> Weight {
-		(52_279_000 as Weight)
+		(54_534_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((68_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((24_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Staking CurrentEra (r:1 w:0)
+	// Storage: Balances Locks (r:1 w:1)
+	// Storage: Staking Nominators (r:1 w:0)
+	// Storage: Staking Ledger (r:1 w:1)
+	// Storage: Staking Bonded (r:1 w:1)
+	// Storage: Staking Validators (r:1 w:0)
+	// Storage: Staking Payee (r:0 w:1)
+	// Storage: Staking SlashingSpans (r:1 w:0)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Staking SpanSlash (r:0 w:2)
 	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
-		(86_629_000 as Weight)
+		(89_850_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((2_379_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((2_396_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(8 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
+	// Storage: Staking MaxValidatorsCount (r:1 w:0)
+	// Storage: Staking MinValidatorBond (r:1 w:0)
+	// Storage: Staking Ledger (r:1 w:0)
+	// Storage: Staking Nominators (r:1 w:0)
+	// Storage: Staking Validators (r:1 w:1)
+	// Storage: Staking CounterForValidators (r:1 w:1)
 	fn validate() -> Weight {
-		(32_393_000 as Weight)
+		(36_726_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Staking Ledger (r:1 w:0)
+	// Storage: Staking Nominators (r:1 w:1)
 	fn kick(k: u32, ) -> Weight {
-		(36_986_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((16_574_000 as Weight).saturating_mul(k as Weight))
+		(19_497_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((17_057_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(k as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
+	// Storage: Staking Ledger (r:1 w:0)
+	// Storage: Staking MinNominatorBond (r:1 w:0)
+	// Storage: Staking CounterForNominators (r:1 w:1)
+	// Storage: Staking CurrentEra (r:1 w:0)
+	// Storage: Staking Nominators (r:1 w:1)
+	// Storage: Staking Validators (r:2 w:0)
+	// Storage: Staking MaxNominatorsCount (r:1 w:0)
 	fn nominate(n: u32, ) -> Weight {
-		(43_228_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((5_119_000 as Weight).saturating_mul(n as Weight))
+		(45_146_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((5_527_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Staking Validators (r:1 w:0)
+	// Storage: Staking Ledger (r:1 w:0)
+	// Storage: Staking Nominators (r:1 w:0)
 	fn chill() -> Weight {
-		(17_800_000 as Weight)
+		(18_986_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 	}
+	// Storage: Staking Payee (r:0 w:1)
+	// Storage: Staking Ledger (r:1 w:0)
 	fn set_payee() -> Weight {
-		(12_612_000 as Weight)
+		(13_348_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Staking Bonded (r:1 w:1)
+	// Storage: Staking Ledger (r:2 w:2)
 	fn set_controller() -> Weight {
-		(27_503_000 as Weight)
+		(28_148_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Staking ValidatorCount (r:0 w:1)
 	fn set_validator_count() -> Weight {
-		(2_119_000 as Weight)
+		(2_909_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Staking ForceEra (r:0 w:1)
 	fn force_no_eras() -> Weight {
-		(2_320_000 as Weight)
+		(3_163_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Staking ForceEra (r:0 w:1)
 	fn force_new_era() -> Weight {
-		(2_269_000 as Weight)
+		(3_141_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Staking ForceEra (r:0 w:1)
 	fn force_new_era_always() -> Weight {
-		(2_334_000 as Weight)
+		(3_220_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Staking Invulnerables (r:0 w:1)
 	fn set_invulnerables(v: u32, ) -> Weight {
-		(2_354_000 as Weight)
+		(3_569_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((5_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((58_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Balances Locks (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Staking Nominators (r:1 w:0)
+	// Storage: Staking Payee (r:0 w:1)
+	// Storage: Staking Bonded (r:1 w:1)
+	// Storage: Staking Validators (r:1 w:0)
+	// Storage: Staking SlashingSpans (r:1 w:0)
+	// Storage: Staking Ledger (r:0 w:1)
+	// Storage: Staking SpanSlash (r:0 w:2)
 	fn force_unstake(s: u32, ) -> Weight {
-		(61_556_000 as Weight)
+		(65_753_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((2_377_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((2_420_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
+	// Storage: Staking UnappliedSlashes (r:1 w:1)
 	fn cancel_deferred_slash(s: u32, ) -> Weight {
-		(3_367_105_000 as Weight)
-			// Standard Error: 222_000
-			.saturating_add((19_817_000 as Weight).saturating_mul(s as Weight))
+		(3_056_514_000 as Weight)
+			// Standard Error: 218_000
+			.saturating_add((21_159_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Staking Bonded (r:2 w:0)
+	// Storage: Staking Ledger (r:1 w:1)
+	// Storage: Staking CurrentEra (r:1 w:0)
+	// Storage: Staking ErasRewardPoints (r:1 w:0)
+	// Storage: Staking ErasValidatorReward (r:1 w:0)
+	// Storage: Staking HistoryDepth (r:1 w:0)
+	// Storage: System Account (r:2 w:2)
+	// Storage: Staking Payee (r:2 w:0)
+	// Storage: Staking ErasStakersClipped (r:1 w:0)
+	// Storage: Staking ErasValidatorPrefs (r:1 w:0)
 	fn payout_stakers_dead_controller(n: u32, ) -> Weight {
-		(47_229_000 as Weight)
-			// Standard Error: 53_000
-			.saturating_add((48_365_000 as Weight).saturating_mul(n as Weight))
+		(121_794_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((49_467_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(n as Weight)))
 	}
+	// Storage: Staking ErasValidatorPrefs (r:1 w:0)
+	// Storage: Staking Ledger (r:2 w:2)
+	// Storage: Staking ErasValidatorReward (r:1 w:0)
+	// Storage: Balances Locks (r:2 w:2)
+	// Storage: Staking ErasRewardPoints (r:1 w:0)
+	// Storage: Staking CurrentEra (r:1 w:0)
+	// Storage: Staking HistoryDepth (r:1 w:0)
+	// Storage: System Account (r:2 w:2)
+	// Storage: Staking ErasStakersClipped (r:1 w:0)
+	// Storage: Staking Bonded (r:2 w:0)
+	// Storage: Staking Payee (r:2 w:0)
 	fn payout_stakers_alive_staked(n: u32, ) -> Weight {
-		(156_788_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((61_280_000 as Weight).saturating_mul(n as Weight))
+		(147_049_000 as Weight)
+			// Standard Error: 30_000
+			.saturating_add((64_428_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(11 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((5 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(n as Weight)))
 	}
+	// Storage: Balances Locks (r:1 w:1)
+	// Storage: Staking Ledger (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn rebond(l: u32, ) -> Weight {
-		(47_815_000 as Weight)
+		(52_184_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((65_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add((35_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Staking ErasStakersClipped (r:0 w:2)
+	// Storage: Staking ErasValidatorReward (r:0 w:1)
+	// Storage: Staking CurrentEra (r:1 w:0)
+	// Storage: Staking ErasValidatorPrefs (r:0 w:2)
+	// Storage: Staking ErasTotalStake (r:0 w:1)
+	// Storage: Staking ErasStakers (r:0 w:2)
+	// Storage: Staking ErasRewardPoints (r:0 w:1)
+	// Storage: Staking HistoryDepth (r:1 w:1)
+	// Storage: Staking ErasStartSessionIndex (r:0 w:1)
 	fn set_history_depth(e: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 74_000
-			.saturating_add((34_945_000 as Weight).saturating_mul(e as Weight))
+			// Standard Error: 57_000
+			.saturating_add((30_689_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((7 as Weight).saturating_mul(e as Weight)))
 	}
+	// Storage: Staking Nominators (r:1 w:0)
+	// Storage: Staking SlashingSpans (r:1 w:1)
+	// Storage: Staking Validators (r:1 w:1)
+	// Storage: Staking SpanSlash (r:0 w:1)
+	// Storage: Staking CounterForValidators (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Staking Payee (r:0 w:1)
+	// Storage: Staking Ledger (r:0 w:1)
+	// Storage: Staking Bonded (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
 	fn reap_stash(s: u32, ) -> Weight {
-		(73_483_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((2_384_000 as Weight).saturating_mul(s as Weight))
+		(75_836_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((2_423_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
+	// Storage: System BlockWeight (r:1 w:1)
+	// Storage: Staking ErasStakers (r:0 w:1)
+	// Storage: Staking ErasStakersClipped (r:0 w:1)
+	// Storage: Staking Nominators (r:101 w:0)
+	// Storage: Staking SlashingSpans (r:1 w:0)
+	// Storage: Staking ErasStartSessionIndex (r:0 w:1)
+	// Storage: Staking Ledger (r:101 w:0)
+	// Storage: Staking Validators (r:2 w:0)
+	// Storage: Staking Bonded (r:101 w:0)
+	// Storage: Staking CounterForNominators (r:1 w:0)
+	// Storage: Staking ValidatorCount (r:1 w:0)
+	// Storage: Staking HistoryDepth (r:1 w:0)
+	// Storage: Staking ErasValidatorPrefs (r:0 w:1)
+	// Storage: Staking CounterForValidators (r:1 w:0)
+	// Storage: Staking CurrentEra (r:1 w:1)
+	// Storage: Staking MinimumValidatorCount (r:1 w:0)
+	// Storage: Staking ErasTotalStake (r:0 w:1)
 	fn new_era(v: u32, n: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 846_000
-			.saturating_add((305_234_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 42_000
-			.saturating_add((48_280_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 1_492_000
+			.saturating_add((299_860_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 99_000
+			.saturating_add((47_937_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(v as Weight)))
 	}
+	// Storage: Staking Validators (r:501 w:0)
+	// Storage: Staking Bonded (r:1500 w:0)
+	// Storage: Staking Nominators (r:1001 w:0)
+	// Storage: Staking Ledger (r:1500 w:0)
+	// Storage: Staking SlashingSpans (r:21 w:0)
 	fn get_npos_voters(v: u32, n: u32, s: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 99_000
-			.saturating_add((25_735_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 99_000
-			.saturating_add((28_122_000 as Weight).saturating_mul(n as Weight))
-			// Standard Error: 3_388_000
-			.saturating_add((21_500_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 101_000
+			.saturating_add((27_304_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 101_000
+			.saturating_add((29_893_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 3_441_000
+			.saturating_add((91_111_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
 	}
+	// Storage: Staking Validators (r:501 w:0)
 	fn get_npos_targets(v: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 30_000
-			.saturating_add((11_065_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 32_000
+			.saturating_add((11_692_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(v as Weight)))
 	}
+	// Storage: Staking MaxNominatorsCount (r:0 w:1)
+	// Storage: Staking MaxValidatorsCount (r:0 w:1)
+	// Storage: Staking MinValidatorBond (r:0 w:1)
+	// Storage: Staking ChillThreshold (r:0 w:1)
+	// Storage: Staking MinNominatorBond (r:0 w:1)
 	fn set_staking_limits() -> Weight {
-		(5_028_000 as Weight)
-			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
-	}
+		(7_325_000 as Weight)
+			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
+	}
+	// Storage: Staking MinValidatorBond (r:1 w:0)
+	// Storage: Staking ChillThreshold (r:1 w:0)
+	// Storage: Staking Nominators (r:1 w:0)
+	// Storage: Staking Validators (r:1 w:1)
+	// Storage: Staking CounterForValidators (r:1 w:1)
+	// Storage: Staking MaxValidatorsCount (r:1 w:0)
+	// Storage: Staking Ledger (r:1 w:0)
 	fn chill_other() -> Weight {
-		(35_758_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(62_683_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 }
diff --git a/utils/frame/benchmarking-cli/Cargo.toml b/utils/frame/benchmarking-cli/Cargo.toml
index 9bae97101977..93616b590f61 100644
--- a/utils/frame/benchmarking-cli/Cargo.toml
+++ b/utils/frame/benchmarking-cli/Cargo.toml
@@ -30,6 +30,8 @@ chrono = "0.4"
 serde = "1.0.126"
 handlebars = "3.5.0"
 Inflector = "0.11.4"
+linked-hash-map = "0.5.4"
+log = "0.4.8"
 
 [features]
 default = ["db"]
diff --git a/utils/frame/benchmarking-cli/src/command.rs b/utils/frame/benchmarking-cli/src/command.rs
index 2ef9f3914a5d..925cfd07d03e 100644
--- a/utils/frame/benchmarking-cli/src/command.rs
+++ b/utils/frame/benchmarking-cli/src/command.rs
@@ -17,8 +17,11 @@
 
 use crate::BenchmarkCmd;
 use codec::{Decode, Encode};
-use frame_benchmarking::{Analysis, BenchmarkBatch, BenchmarkSelector};
+use frame_benchmarking::{
+	Analysis, BenchmarkBatch, BenchmarkList, BenchmarkResults, BenchmarkSelector,
+};
 use frame_support::traits::StorageInfo;
+use linked_hash_map::LinkedHashMap;
 use sc_cli::{CliConfiguration, ExecutionStrategy, Result, SharedParams};
 use sc_client_db::BenchmarkingState;
 use sc_executor::NativeExecutor;
@@ -31,7 +34,43 @@ use sp_externalities::Extensions;
 use sp_keystore::{testing::KeyStore, KeystoreExt, SyncCryptoStorePtr};
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor};
 use sp_state_machine::StateMachine;
-use std::{fmt::Debug, sync::Arc};
+use std::{fmt::Debug, sync::Arc, time};
+
+// This takes multiple benchmark batches and combines all the results where the pallet, instance,
+// and benchmark are the same.
+fn combine_batches(batches: Vec<BenchmarkBatch>) -> Vec<BenchmarkBatch> {
+	if batches.is_empty() {
+		return batches
+	}
+
+	let mut all_benchmarks = LinkedHashMap::<_, Vec<BenchmarkResults>>::new();
+
+	batches
+		.into_iter()
+		.for_each(|BenchmarkBatch { pallet, instance, benchmark, results }| {
+			// We use this key to uniquely identify a benchmark among batches.
+			let key = (pallet, instance, benchmark);
+
+			match all_benchmarks.get_mut(&key) {
+				// We already have this benchmark, so we extend the results.
+				Some(x) => x.extend(results),
+				// New benchmark, so we add a new entry with the initial results.
+				None => {
+					all_benchmarks.insert(key, results);
+				},
+			}
+		});
+
+	all_benchmarks
+		.into_iter()
+		.map(|((pallet, instance, benchmark), results)| BenchmarkBatch {
+			pallet,
+			instance,
+			benchmark,
+			results,
+		})
+		.collect::<Vec<_>>()
+}
 
 impl BenchmarkCmd {
 	/// Runs the command and benchmarks the chain.
@@ -63,6 +102,10 @@ impl BenchmarkCmd {
 		let spec = config.chain_spec;
 		let wasm_method = self.wasm_method.into();
 		let strategy = self.execution.unwrap_or(ExecutionStrategy::Native);
+		let pallet = self.pallet.clone().unwrap_or_else(|| String::new());
+		let pallet = pallet.as_bytes();
+		let extrinsic = self.extrinsic.clone().unwrap_or_else(|| String::new());
+		let extrinsic = extrinsic.as_bytes();
 
 		let genesis_storage = spec.build_storage()?;
 		let mut changes = Default::default();
@@ -74,137 +117,204 @@ impl BenchmarkCmd {
 			2, // The runtime instances cache size.
 		);
 
-		let mut extensions = Extensions::default();
-		extensions.register(KeystoreExt(Arc::new(KeyStore::new()) as SyncCryptoStorePtr));
-		let (offchain, _) = TestOffchainExt::new();
-		let (pool, _) = TestTransactionPoolExt::new();
-		extensions.register(OffchainWorkerExt::new(offchain.clone()));
-		extensions.register(OffchainDbExt::new(offchain));
-		extensions.register(TransactionPoolExt::new(pool));
+		let extensions = || -> Extensions {
+			let mut extensions = Extensions::default();
+			extensions.register(KeystoreExt(Arc::new(KeyStore::new()) as SyncCryptoStorePtr));
+			let (offchain, _) = TestOffchainExt::new();
+			let (pool, _) = TestTransactionPoolExt::new();
+			extensions.register(OffchainWorkerExt::new(offchain.clone()));
+			extensions.register(OffchainDbExt::new(offchain));
+			extensions.register(TransactionPoolExt::new(pool));
+			return extensions
+		};
 
+		// Get Benchmark List
 		let result = StateMachine::<_, _, NumberFor<BB>, _>::new(
 			&state,
 			None,
 			&mut changes,
 			&executor,
-			"Benchmark_dispatch_benchmark",
-			&(
-				&self.pallet,
-				&self.extrinsic,
-				self.lowest_range_values.clone(),
-				self.highest_range_values.clone(),
-				self.steps.clone(),
-				self.repeat,
-				!self.no_verify,
-				self.extra,
-			)
-				.encode(),
-			extensions,
+			"Benchmark_benchmark_metadata",
+			&(self.extra).encode(),
+			extensions(),
 			&sp_state_machine::backend::BackendRuntimeCode::new(&state).runtime_code()?,
 			sp_core::testing::TaskExecutor::new(),
 		)
 		.execute(strategy.into())
-		.map_err(|e| format!("Error executing runtime benchmark: {:?}", e))?;
-
-		let results = <std::result::Result<
-				(Vec<BenchmarkBatch>, Vec<StorageInfo>),
-				String,
-			> as Decode>::decode(&mut &result[..])
-			.map_err(|e| format!("Failed to decode benchmark results: {:?}", e))?;
-
-		match results {
-			Ok((batches, storage_info)) => {
-				if let Some(output_path) = &self.output {
-					crate::writer::write_results(&batches, &storage_info, output_path, self)?;
-				}
+		.map_err(|e| format!("Error getting benchmark list: {:?}", e))?;
 
-				for batch in batches.into_iter() {
-					// Print benchmark metadata
-					println!(
-						"Pallet: {:?}, Extrinsic: {:?}, Lowest values: {:?}, Highest values: {:?}, Steps: {:?}, Repeat: {:?}",
-						String::from_utf8(batch.pallet).expect("Encoded from String; qed"),
-						String::from_utf8(batch.benchmark).expect("Encoded from String; qed"),
-						self.lowest_range_values,
-						self.highest_range_values,
-						self.steps,
-						self.repeat,
-					);
+		let (list, storage_info) =
+			<(Vec<BenchmarkList>, Vec<StorageInfo>) as Decode>::decode(&mut &result[..])
+				.map_err(|e| format!("Failed to decode benchmark metadata: {:?}", e))?;
+
+		if self.list {
+			list_benchmark(pallet, extrinsic, list);
+			return Ok(())
+		}
 
-					// Skip raw data + analysis if there are no results
-					if batch.results.is_empty() {
-						continue
+		// Use the benchmark list and the user input to determine the set of benchmarks to run.
+		let mut benchmarks_to_run = Vec::new();
+		for item in list {
+			if pallet == &item.pallet[..] || pallet == &b"*"[..] {
+				if &pallet[..] == &b"*"[..] || &extrinsic[..] == &b"*"[..] {
+					for benchmark in item.benchmarks {
+						benchmarks_to_run.push((item.pallet.clone(), benchmark));
 					}
+				} else {
+					benchmarks_to_run.push((pallet.to_vec(), extrinsic.to_vec()));
+				}
+			}
+		}
 
-					if self.raw_data {
-						// Print the table header
-						batch.results[0]
-							.components
-							.iter()
-							.for_each(|param| print!("{:?},", param.0));
-
-						print!("extrinsic_time_ns,storage_root_time_ns,reads,repeat_reads,writes,repeat_writes,proof_size_bytes\n");
-						// Print the values
-						batch.results.iter().for_each(|result| {
-							let parameters = &result.components;
-							parameters.iter().for_each(|param| print!("{:?},", param.1));
-							// Print extrinsic time and storage root time
-							print!(
-								"{:?},{:?},{:?},{:?},{:?},{:?},{:?}\n",
-								result.extrinsic_time,
-								result.storage_root_time,
-								result.reads,
-								result.repeat_reads,
-								result.writes,
-								result.repeat_writes,
-								result.proof_size,
-							);
-						});
+		// Run the benchmarks
+		let mut batches = Vec::new();
+		let mut timer = time::SystemTime::now();
+		for (pallet, extrinsic) in benchmarks_to_run {
+			for s in 0..self.steps {
+				for r in 0..self.repeat {
+					// This should run only a single instance of a benchmark for `pallet` and
+					// `extrinsic`. All loops happen above.
+					let result = StateMachine::<_, _, NumberFor<BB>, _>::new(
+						&state,
+						None,
+						&mut changes,
+						&executor,
+						"Benchmark_dispatch_benchmark",
+						&(
+							&pallet.clone(),
+							&extrinsic.clone(),
+							self.lowest_range_values.clone(),
+							self.highest_range_values.clone(),
+							(s, self.steps),
+							(r, self.repeat),
+							!self.no_verify,
+							self.extra,
+						)
+							.encode(),
+						extensions(),
+						&sp_state_machine::backend::BackendRuntimeCode::new(&state)
+							.runtime_code()?,
+						sp_core::testing::TaskExecutor::new(),
+					)
+					.execute(strategy.into())
+					.map_err(|e| format!("Error executing runtime benchmark: {:?}", e))?;
 
-						println!();
-					}
+					let batch =
+						<std::result::Result<Vec<BenchmarkBatch>, String> as Decode>::decode(
+							&mut &result[..],
+						)
+						.map_err(|e| format!("Failed to decode benchmark results: {:?}", e))??;
 
-					// Conduct analysis.
-					if !self.no_median_slopes {
-						println!("Median Slopes Analysis\n========");
-						if let Some(analysis) = Analysis::median_slopes(
-							&batch.results,
-							BenchmarkSelector::ExtrinsicTime,
-						) {
-							println!("-- Extrinsic Time --\n{}", analysis);
-						}
-						if let Some(analysis) =
-							Analysis::median_slopes(&batch.results, BenchmarkSelector::Reads)
-						{
-							println!("Reads = {:?}", analysis);
-						}
-						if let Some(analysis) =
-							Analysis::median_slopes(&batch.results, BenchmarkSelector::Writes)
-						{
-							println!("Writes = {:?}", analysis);
-						}
-					}
-					if !self.no_min_squares {
-						println!("Min Squares Analysis\n========");
-						if let Some(analysis) = Analysis::min_squares_iqr(
-							&batch.results,
-							BenchmarkSelector::ExtrinsicTime,
-						) {
-							println!("-- Extrinsic Time --\n{}", analysis);
-						}
-						if let Some(analysis) =
-							Analysis::min_squares_iqr(&batch.results, BenchmarkSelector::Reads)
-						{
-							println!("Reads = {:?}", analysis);
-						}
-						if let Some(analysis) =
-							Analysis::min_squares_iqr(&batch.results, BenchmarkSelector::Writes)
-						{
-							println!("Writes = {:?}", analysis);
+					batches.extend(batch);
+
+					// Show progress information
+					if let Some(elapsed) = timer.elapsed().ok() {
+						if elapsed >= time::Duration::from_secs(5) {
+							timer = time::SystemTime::now();
+							log::info!(
+								"Running Benchmark:\t{}\t{}\t{}/{}\t{}/{}",
+								String::from_utf8(pallet.clone())
+									.expect("Encoded from String; qed"),
+								String::from_utf8(extrinsic.clone())
+									.expect("Encoded from String; qed"),
+								s,
+								self.steps,
+								r,
+								self.repeat,
+							);
 						}
 					}
 				}
-			},
-			Err(error) => eprintln!("Error: {}", error),
+			}
+		}
+
+		// Combine all of the benchmark results, so that benchmarks of the same pallet/function
+		// are together.
+		let batches = combine_batches(batches);
+
+		if let Some(output_path) = &self.output {
+			crate::writer::write_results(&batches, &storage_info, output_path, self)?;
+		}
+
+		for batch in batches.into_iter() {
+			// Print benchmark metadata
+			println!(
+				"Pallet: {:?}, Extrinsic: {:?}, Lowest values: {:?}, Highest values: {:?}, Steps: {:?}, Repeat: {:?}",
+				String::from_utf8(batch.pallet).expect("Encoded from String; qed"),
+				String::from_utf8(batch.benchmark).expect("Encoded from String; qed"),
+				self.lowest_range_values,
+				self.highest_range_values,
+				self.steps,
+				self.repeat,
+			);
+
+			// Skip raw data + analysis if there are no results
+			if batch.results.is_empty() {
+				continue
+			}
+
+			if self.raw_data {
+				// Print the table header
+				batch.results[0].components.iter().for_each(|param| print!("{:?},", param.0));
+
+				print!("extrinsic_time_ns,storage_root_time_ns,reads,repeat_reads,writes,repeat_writes,proof_size_bytes\n");
+				// Print the values
+				batch.results.iter().for_each(|result| {
+					let parameters = &result.components;
+					parameters.iter().for_each(|param| print!("{:?},", param.1));
+					// Print extrinsic time and storage root time
+					print!(
+						"{:?},{:?},{:?},{:?},{:?},{:?},{:?}\n",
+						result.extrinsic_time,
+						result.storage_root_time,
+						result.reads,
+						result.repeat_reads,
+						result.writes,
+						result.repeat_writes,
+						result.proof_size,
+					);
+				});
+
+				println!();
+			}
+
+			// Conduct analysis.
+			if !self.no_median_slopes {
+				println!("Median Slopes Analysis\n========");
+				if let Some(analysis) =
+					Analysis::median_slopes(&batch.results, BenchmarkSelector::ExtrinsicTime)
+				{
+					println!("-- Extrinsic Time --\n{}", analysis);
+				}
+				if let Some(analysis) =
+					Analysis::median_slopes(&batch.results, BenchmarkSelector::Reads)
+				{
+					println!("Reads = {:?}", analysis);
+				}
+				if let Some(analysis) =
+					Analysis::median_slopes(&batch.results, BenchmarkSelector::Writes)
+				{
+					println!("Writes = {:?}", analysis);
+				}
+			}
+			if !self.no_min_squares {
+				println!("Min Squares Analysis\n========");
+				if let Some(analysis) =
+					Analysis::min_squares_iqr(&batch.results, BenchmarkSelector::ExtrinsicTime)
+				{
+					println!("-- Extrinsic Time --\n{}", analysis);
+				}
+				if let Some(analysis) =
+					Analysis::min_squares_iqr(&batch.results, BenchmarkSelector::Reads)
+				{
+					println!("Reads = {:?}", analysis);
+				}
+				if let Some(analysis) =
+					Analysis::min_squares_iqr(&batch.results, BenchmarkSelector::Writes)
+				{
+					println!("Writes = {:?}", analysis);
+				}
+			}
 		}
 
 		Ok(())
@@ -223,3 +333,41 @@ impl CliConfiguration for BenchmarkCmd {
 		})
 	}
 }
+
+/// List the benchmarks available in the runtime, in a CSV friendly format.
+///
+/// If `pallet_input` and `extrinsic_input` is empty, we list everything.
+///
+/// If `pallet_input` is present, we only list the benchmarks for that pallet.
+///
+/// If `extrinsic_input` is `*`, we will hide the individual benchmarks for each pallet, and just
+/// show a single line for each available pallet.
+fn list_benchmark(pallet_input: &[u8], extrinsic_input: &[u8], list: Vec<BenchmarkList>) {
+	let filtered_list = list
+		.into_iter()
+		.filter(|item| pallet_input.is_empty() || pallet_input == &item.pallet)
+		.collect::<Vec<_>>();
+
+	if filtered_list.is_empty() {
+		println!("Pallet not found.");
+		return
+	}
+
+	println!("pallet, benchmark");
+	for item in filtered_list {
+		let pallet_string =
+			String::from_utf8(item.pallet.clone()).expect("Encoded from String; qed");
+
+		if extrinsic_input == &b"*"[..] {
+			println!("{}, *", pallet_string)
+		} else {
+			for benchmark in item.benchmarks {
+				println!(
+					"{}, {}",
+					pallet_string,
+					String::from_utf8(benchmark).expect("Encoded from String; qed"),
+				);
+			}
+		}
+	}
+}
diff --git a/utils/frame/benchmarking-cli/src/lib.rs b/utils/frame/benchmarking-cli/src/lib.rs
index 0642ddabc137..41629a866f72 100644
--- a/utils/frame/benchmarking-cli/src/lib.rs
+++ b/utils/frame/benchmarking-cli/src/lib.rs
@@ -31,16 +31,16 @@ fn parse_pallet_name(pallet: &str) -> String {
 #[derive(Debug, structopt::StructOpt)]
 pub struct BenchmarkCmd {
 	/// Select a FRAME Pallet to benchmark, or `*` for all (in which case `extrinsic` must be `*`).
-	#[structopt(short, long, parse(from_str = parse_pallet_name))]
-	pub pallet: String,
+	#[structopt(short, long, parse(from_str = parse_pallet_name), required_unless = "list")]
+	pub pallet: Option<String>,
 
 	/// Select an extrinsic inside the pallet to benchmark, or `*` for all.
-	#[structopt(short, long)]
-	pub extrinsic: String,
+	#[structopt(short, long, required_unless = "list")]
+	pub extrinsic: Option<String>,
 
 	/// Select how many samples we should take across the variable components.
-	#[structopt(short, long, use_delimiter = true)]
-	pub steps: Vec<u32>,
+	#[structopt(short, long, default_value = "1")]
+	pub steps: u32,
 
 	/// Indicates lowest values for each of the component ranges.
 	#[structopt(long = "low", use_delimiter = true)]
@@ -129,4 +129,12 @@ pub struct BenchmarkCmd {
 	/// Limit the memory the database cache can use.
 	#[structopt(long = "db-cache", value_name = "MiB", default_value = "128")]
 	pub database_cache_size: u32,
+
+	/// List the benchmarks available.
+	///
+	/// * If nothing else is specified, all pallets and benchmarks will be listed.
+	/// * If the `pallet` argument is passed, then we will only list benchmarks for that pallet.
+	/// * If the `extrinsic` argument is set to `*`, we will hide the individual benchmarks.
+	#[structopt(long)]
+	pub list: bool,
 }
diff --git a/utils/frame/benchmarking-cli/src/writer.rs b/utils/frame/benchmarking-cli/src/writer.rs
index 16c93081ac6e..d80a17e1b2db 100644
--- a/utils/frame/benchmarking-cli/src/writer.rs
+++ b/utils/frame/benchmarking-cli/src/writer.rs
@@ -71,7 +71,7 @@ struct BenchmarkData {
 // This forwards some specific metadata from the `BenchmarkCmd`
 #[derive(Serialize, Default, Debug, Clone)]
 struct CmdData {
-	steps: Vec<u32>,
+	steps: u32,
 	repeat: u32,
 	lowest_range_values: Vec<u32>,
 	highest_range_values: Vec<u32>,

From c093de5d305cfa9871d03a2e651edfee5c28b5e3 Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Mon, 2 Aug 2021 10:27:18 +0200
Subject: [PATCH 1042/1194] Warp sync part I (#9227)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Started warp sync

* BABE & GRANDPA recovery

* Warp sync protocol

* Sync warp proofs first

* Added basic documentation

* Apply suggestions from code review

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Style changes

* Apply suggestions from code review

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* fmt

* Apply suggestions from code review

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Fixed chage trie pruning wrt missing blocks

* Restore parent finalization

* fmt

* fmt

* Revert pwasm-utils bump

* Change error type & check API version

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Build fix

* Fixed target block check

* Formatting

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 Cargo.lock                                    |  64 ++---
 Cargo.toml                                    |   1 -
 bin/node-template/node/src/service.rs         |  11 +
 bin/node-template/runtime/src/lib.rs          |   4 +
 bin/node/cli/Cargo.toml                       |   2 -
 bin/node/cli/src/service.rs                   |  21 +-
 bin/node/runtime/src/lib.rs                   |   4 +
 client/cli/src/arg_enums.rs                   |   3 +
 client/consensus/aura/src/import_queue.rs     |  36 ++-
 client/consensus/babe/src/lib.rs              | 143 ++++++++---
 client/consensus/babe/src/tests.rs            |  10 +-
 client/consensus/common/src/block_import.rs   |   7 +
 client/consensus/common/src/import_queue.rs   |  56 +++--
 .../common/src/import_queue/basic_queue.rs    |   7 +-
 client/consensus/epochs/src/lib.rs            |  27 ++-
 .../manual-seal/src/consensus/babe.rs         |  15 +-
 client/consensus/manual-seal/src/lib.rs       |  19 +-
 client/consensus/pow/src/lib.rs               |  27 +--
 client/db/src/cache/list_cache.rs             |   1 +
 client/db/src/changes_tries_storage.rs        |  13 +-
 client/db/src/lib.rs                          |  35 +--
 client/finality-grandpa/Cargo.toml            |   2 +-
 client/finality-grandpa/src/environment.rs    |   2 +-
 client/finality-grandpa/src/import.rs         | 103 +++++++-
 client/finality-grandpa/src/lib.rs            |   7 +-
 client/finality-grandpa/src/observer.rs       |   3 +-
 client/finality-grandpa/src/tests.rs          |   4 +
 .../src/warp_proof.rs}                        | 176 ++++++++++----
 client/informant/src/display.rs               |  46 ++--
 client/informant/src/lib.rs                   |   4 +-
 client/network/Cargo.toml                     |   1 +
 client/network/README.md                      |  63 +++++
 client/network/src/behaviour.rs               |  35 ++-
 client/network/src/config.rs                  |   7 +
 client/network/src/gossip/tests.rs            |  17 +-
 client/network/src/lib.rs                     |   6 +-
 client/network/src/protocol.rs                |  58 ++++-
 client/network/src/protocol/sync.rs           | 227 ++++++++++++++++--
 client/network/src/protocol/sync/warp.rs      | 181 ++++++++++++++
 client/network/src/service.rs                 |   9 +
 client/network/src/service/tests.rs           |  18 +-
 .../src/warp_request_handler.rs}              | 137 +++++------
 client/network/test/src/lib.rs                |  51 ++--
 client/rpc/src/state/tests.rs                 |  20 +-
 client/service/src/builder.rs                 |  21 +-
 client/service/src/client/client.rs           |  32 ++-
 client/service/test/src/client/mod.rs         |   9 +
 primitives/finality-grandpa/src/lib.rs        |   5 +-
 test-utils/runtime/src/lib.rs                 |   4 +
 test-utils/test-runner/Cargo.toml             |   1 +
 test-utils/test-runner/src/client.rs          |   5 +-
 51 files changed, 1310 insertions(+), 450 deletions(-)
 rename client/{finality-grandpa-warp-sync/src/proof.rs => finality-grandpa/src/warp_proof.rs} (68%)
 create mode 100644 client/network/src/protocol/sync/warp.rs
 rename client/{finality-grandpa-warp-sync/src/lib.rs => network/src/warp_request_handler.rs} (51%)

diff --git a/Cargo.lock b/Cargo.lock
index 3d22e0c0b6bd..11359c078140 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1714,7 +1714,7 @@ dependencies = [
  "num-traits",
  "parity-scale-codec",
  "parking_lot 0.11.1",
- "rand 0.8.3",
+ "rand 0.8.4",
 ]
 
 [[package]]
@@ -1724,7 +1724,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c"
 dependencies = [
  "byteorder",
- "rand 0.8.3",
+ "rand 0.8.4",
  "rustc-hex",
  "static_assertions",
 ]
@@ -3384,7 +3384,7 @@ dependencies = [
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "rand 0.8.3",
+ "rand 0.8.4",
  "smallvec 1.6.1",
  "socket2 0.4.0",
  "void",
@@ -4056,7 +4056,7 @@ dependencies = [
  "num-complex",
  "num-rational 0.4.0",
  "num-traits",
- "rand 0.8.3",
+ "rand 0.8.4",
  "rand_distr",
  "simba",
  "typenum",
@@ -4216,7 +4216,6 @@ dependencies = [
  "sc-consensus-slots",
  "sc-consensus-uncles",
  "sc-finality-grandpa",
- "sc-finality-grandpa-warp-sync",
  "sc-keystore",
  "sc-network",
  "sc-offchain",
@@ -4903,7 +4902,7 @@ dependencies = [
  "paste 1.0.4",
  "pretty_assertions 0.7.2",
  "pwasm-utils",
- "rand 0.8.3",
+ "rand 0.8.4",
  "rand_pcg 0.3.0",
  "serde",
  "smallvec 1.6.1",
@@ -5753,7 +5752,7 @@ dependencies = [
  "log",
  "memmap2",
  "parking_lot 0.11.1",
- "rand 0.8.3",
+ "rand 0.8.4",
 ]
 
 [[package]]
@@ -6482,7 +6481,7 @@ checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6"
 dependencies = [
  "env_logger 0.8.3",
  "log",
- "rand 0.8.3",
+ "rand 0.8.4",
 ]
 
 [[package]]
@@ -6550,9 +6549,9 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
+checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
 dependencies = [
  "libc",
  "rand_chacha 0.3.0",
@@ -6620,7 +6619,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "051b398806e42b9cd04ad9ec8f81e355d0a382c543ac6672c62f5a5b452ef142"
 dependencies = [
  "num-traits",
- "rand 0.8.3",
+ "rand 0.8.4",
 ]
 
 [[package]]
@@ -7638,7 +7637,7 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.11.1",
  "pin-project 1.0.5",
- "rand 0.7.3",
+ "rand 0.8.4",
  "sc-block-builder",
  "sc-client-api",
  "sc-consensus",
@@ -7700,33 +7699,6 @@ dependencies = [
  "substrate-test-runtime-client",
 ]
 
-[[package]]
-name = "sc-finality-grandpa-warp-sync"
-version = "0.10.0-dev"
-dependencies = [
- "derive_more",
- "finality-grandpa",
- "futures 0.3.15",
- "log",
- "num-traits",
- "parity-scale-codec",
- "parking_lot 0.11.1",
- "prost",
- "rand 0.8.3",
- "sc-block-builder",
- "sc-client-api",
- "sc-consensus",
- "sc-finality-grandpa",
- "sc-network",
- "sc-service",
- "sp-blockchain",
- "sp-consensus",
- "sp-finality-grandpa",
- "sp-keyring",
- "sp-runtime",
- "substrate-test-runtime-client",
-]
-
 [[package]]
 name = "sc-informant"
 version = "0.10.0-dev"
@@ -7827,6 +7799,7 @@ dependencies = [
  "sp-blockchain",
  "sp-consensus",
  "sp-core",
+ "sp-finality-grandpa",
  "sp-keyring",
  "sp-runtime",
  "sp-test-primitives",
@@ -8710,7 +8683,7 @@ dependencies = [
  "futures 0.3.15",
  "httparse",
  "log",
- "rand 0.8.3",
+ "rand 0.8.4",
  "sha-1 0.9.4",
 ]
 
@@ -9550,7 +9523,7 @@ dependencies = [
  "lazy_static",
  "nalgebra",
  "num-traits",
- "rand 0.8.3",
+ "rand 0.8.4",
 ]
 
 [[package]]
@@ -9966,7 +9939,7 @@ checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
- "rand 0.8.3",
+ "rand 0.8.4",
  "redox_syscall 0.2.5",
  "remove_dir_all",
  "winapi 0.3.9",
@@ -10012,6 +9985,7 @@ dependencies = [
  "sp-consensus-babe",
  "sp-core",
  "sp-externalities",
+ "sp-finality-grandpa",
  "sp-inherents",
  "sp-keyring",
  "sp-keystore",
@@ -10638,7 +10612,7 @@ dependencies = [
  "ipnet",
  "lazy_static",
  "log",
- "rand 0.8.3",
+ "rand 0.8.4",
  "smallvec 1.6.1",
  "thiserror",
  "tinyvec",
@@ -11287,7 +11261,7 @@ dependencies = [
  "mach",
  "memoffset 0.6.1",
  "more-asserts",
- "rand 0.8.3",
+ "rand 0.8.4",
  "region",
  "thiserror",
  "wasmtime-environ",
@@ -11455,7 +11429,7 @@ dependencies = [
  "log",
  "nohash-hasher",
  "parking_lot 0.11.1",
- "rand 0.8.3",
+ "rand 0.8.4",
  "static_assertions",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 03115fe5593f..2834344153a8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -40,7 +40,6 @@ members = [
 	"client/executor/wasmi",
 	"client/executor/wasmtime",
 	"client/finality-grandpa",
-	"client/finality-grandpa-warp-sync",
 	"client/informant",
 	"client/keystore",
 	"client/light",
diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
index dbdb3074d686..9eba1d0e9e05 100644
--- a/bin/node-template/node/src/service.rs
+++ b/bin/node-template/node/src/service.rs
@@ -162,6 +162,10 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 	}
 
 	config.network.extra_sets.push(sc_finality_grandpa::grandpa_peers_set_config());
+	let warp_sync = Arc::new(sc_finality_grandpa::warp_proof::NetworkProvider::new(
+		backend.clone(),
+		grandpa_link.shared_authority_set().clone(),
+	));
 
 	let (network, system_rpc_tx, network_starter) =
 		sc_service::build_network(sc_service::BuildNetworkParams {
@@ -172,6 +176,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 			import_queue,
 			on_demand: None,
 			block_announce_validator_builder: None,
+			warp_sync: Some(warp_sync),
 		})?;
 
 	if config.offchain_worker.enabled {
@@ -380,6 +385,11 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
 			telemetry: telemetry.as_ref().map(|x| x.handle()),
 		})?;
 
+	let warp_sync = Arc::new(sc_finality_grandpa::warp_proof::NetworkProvider::new(
+		backend.clone(),
+		grandpa_link.shared_authority_set().clone(),
+	));
+
 	let (network, system_rpc_tx, network_starter) =
 		sc_service::build_network(sc_service::BuildNetworkParams {
 			config: &config,
@@ -389,6 +399,7 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
 			import_queue,
 			on_demand: Some(on_demand.clone()),
 			block_announce_validator_builder: None,
+			warp_sync: Some(warp_sync),
 		})?;
 
 	if config.offchain_worker.enabled {
diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index 63da72102df3..908c5ea455cc 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -402,6 +402,10 @@ impl_runtime_apis! {
 			Grandpa::grandpa_authorities()
 		}
 
+		fn current_set_id() -> fg_primitives::SetId {
+			Grandpa::current_set_id()
+		}
+
 		fn submit_report_equivocation_unsigned_extrinsic(
 			_equivocation_proof: fg_primitives::EquivocationProof<
 				<Block as BlockT>::Hash,
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index 7c8c2d0e3d86..12a76cf323e4 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -77,7 +77,6 @@ sc-service = { version = "0.10.0-dev", default-features = false, path = "../../.
 sc-tracing = { version = "4.0.0-dev", path = "../../../client/tracing" }
 sc-telemetry = { version = "4.0.0-dev", path = "../../../client/telemetry" }
 sc-authority-discovery = { version = "0.10.0-dev",  path = "../../../client/authority-discovery" }
-sc-finality-grandpa-warp-sync = { version = "0.10.0-dev", path = "../../../client/finality-grandpa-warp-sync", optional = true }
 
 # frame dependencies
 pallet-indices = { version = "4.0.0-dev", path = "../../../frame/indices" }
@@ -161,7 +160,6 @@ cli = [
 	"frame-benchmarking-cli",
 	"substrate-frame-cli",
 	"sc-service/db",
-	"sc-finality-grandpa-warp-sync",
 	"structopt",
 	"substrate-build-script-utils",
 	"try-runtime-cli",
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index e7181d3caec3..301df01c55f8 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -228,16 +228,10 @@ pub fn new_full_base(
 	let auth_disc_publish_non_global_ips = config.network.allow_non_globals_in_dht;
 
 	config.network.extra_sets.push(grandpa::grandpa_peers_set_config());
-
-	#[cfg(feature = "cli")]
-	config.network.request_response_protocols.push(
-		sc_finality_grandpa_warp_sync::request_response_config_for_chain(
-			&config,
-			task_manager.spawn_handle(),
-			backend.clone(),
-			import_setup.1.shared_authority_set().clone(),
-		),
-	);
+	let warp_sync = Arc::new(grandpa::warp_proof::NetworkProvider::new(
+		backend.clone(),
+		import_setup.1.shared_authority_set().clone(),
+	));
 
 	let (network, system_rpc_tx, network_starter) =
 		sc_service::build_network(sc_service::BuildNetworkParams {
@@ -248,6 +242,7 @@ pub fn new_full_base(
 			import_queue,
 			on_demand: None,
 			block_announce_validator_builder: None,
+			warp_sync: Some(warp_sync),
 		})?;
 
 	if config.offchain_worker.enabled {
@@ -512,6 +507,11 @@ pub fn new_light_base(
 		telemetry.as_ref().map(|x| x.handle()),
 	)?;
 
+	let warp_sync = Arc::new(grandpa::warp_proof::NetworkProvider::new(
+		backend.clone(),
+		grandpa_link.shared_authority_set().clone(),
+	));
+
 	let (network, system_rpc_tx, network_starter) =
 		sc_service::build_network(sc_service::BuildNetworkParams {
 			config: &config,
@@ -521,6 +521,7 @@ pub fn new_light_base(
 			import_queue,
 			on_demand: Some(on_demand.clone()),
 			block_announce_validator_builder: None,
+			warp_sync: Some(warp_sync),
 		})?;
 
 	let enable_grandpa = !config.disable_grandpa;
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 181f5fd42376..37b4b24fa6a2 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -1336,6 +1336,10 @@ impl_runtime_apis! {
 			Grandpa::grandpa_authorities()
 		}
 
+		fn current_set_id() -> fg_primitives::SetId {
+			Grandpa::current_set_id()
+		}
+
 		fn submit_report_equivocation_unsigned_extrinsic(
 			equivocation_proof: fg_primitives::EquivocationProof<
 				<Block as BlockT>::Hash,
diff --git a/client/cli/src/arg_enums.rs b/client/cli/src/arg_enums.rs
index 83b1c57e071a..72741d7bea2b 100644
--- a/client/cli/src/arg_enums.rs
+++ b/client/cli/src/arg_enums.rs
@@ -242,6 +242,8 @@ arg_enum! {
 		Fast,
 		// Download blocks without executing them. Download latest state without proofs.
 		FastUnsafe,
+		// Prove finality and download the latest state.
+		Warp,
 	}
 }
 
@@ -253,6 +255,7 @@ impl Into<sc_network::config::SyncMode> for SyncMode {
 				sc_network::config::SyncMode::Fast { skip_proofs: false, storage_chain_mode: false },
 			SyncMode::FastUnsafe =>
 				sc_network::config::SyncMode::Fast { skip_proofs: true, storage_chain_mode: false },
+			SyncMode::Warp => sc_network::config::SyncMode::Warp,
 		}
 	}
 }
diff --git a/client/consensus/aura/src/import_queue.rs b/client/consensus/aura/src/import_queue.rs
index 96045fde43a9..a8b046270976 100644
--- a/client/consensus/aura/src/import_queue.rs
+++ b/client/consensus/aura/src/import_queue.rs
@@ -35,7 +35,7 @@ use sp_blockchain::{
 	well_known_cache_keys::{self, Id as CacheKeyId},
 	HeaderBackend, ProvideCache,
 };
-use sp_consensus::{BlockOrigin, CanAuthorWith, Error as ConsensusError};
+use sp_consensus::{CanAuthorWith, Error as ConsensusError};
 use sp_consensus_aura::{
 	digests::CompatibleDigestItem, inherents::AuraInherentData, AuraApi, ConsensusLog,
 	AURA_ENGINE_ID,
@@ -46,7 +46,6 @@ use sp_inherents::{CreateInherentDataProviders, InherentDataProvider as _};
 use sp_runtime::{
 	generic::{BlockId, OpaqueDigestItemId},
 	traits::{Block as BlockT, DigestItemFor, Header},
-	Justifications,
 };
 use std::{fmt::Debug, hash::Hash, marker::PhantomData, sync::Arc};
 
@@ -206,13 +205,10 @@ where
 {
 	async fn verify(
 		&mut self,
-		origin: BlockOrigin,
-		header: B::Header,
-		justifications: Option<Justifications>,
-		mut body: Option<Vec<B::Extrinsic>>,
+		mut block: BlockImportParams<B, ()>,
 	) -> Result<(BlockImportParams<B, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String> {
-		let hash = header.hash();
-		let parent_hash = *header.parent_hash();
+		let hash = block.header.hash();
+		let parent_hash = *block.header.parent_hash();
 		let authorities = authorities(self.client.as_ref(), &BlockId::Hash(parent_hash))
 			.map_err(|e| format!("Could not fetch authorities at {:?}: {:?}", parent_hash, e))?;
 
@@ -234,7 +230,7 @@ where
 		let checked_header = check_header::<C, B, P>(
 			&self.client,
 			slot_now + 1,
-			header,
+			block.header,
 			hash,
 			&authorities[..],
 			self.check_for_equivocation,
@@ -245,8 +241,8 @@ where
 				// if the body is passed through, we need to use the runtime
 				// to check that the internally-set timestamp in the inherents
 				// actually matches the slot set in the seal.
-				if let Some(inner_body) = body.take() {
-					let block = B::new(pre_header.clone(), inner_body);
+				if let Some(inner_body) = block.body.take() {
+					let new_block = B::new(pre_header.clone(), inner_body);
 
 					inherent_data.aura_replace_inherent_data(slot);
 
@@ -261,7 +257,7 @@ where
 						.map_err(|e| format!("{:?}", e))?
 					{
 						self.check_inherents(
-							block.clone(),
+							new_block.clone(),
 							BlockId::Hash(parent_hash),
 							inherent_data,
 							create_inherent_data_providers,
@@ -270,8 +266,8 @@ where
 						.map_err(|e| e.to_string())?;
 					}
 
-					let (_, inner_body) = block.deconstruct();
-					body = Some(inner_body);
+					let (_, inner_body) = new_block.deconstruct();
+					block.body = Some(inner_body);
 				}
 
 				trace!(target: "aura", "Checked {:?}; importing.", pre_header);
@@ -298,14 +294,12 @@ where
 						_ => None,
 					});
 
-				let mut import_block = BlockImportParams::new(origin, pre_header);
-				import_block.post_digests.push(seal);
-				import_block.body = body;
-				import_block.justifications = justifications;
-				import_block.fork_choice = Some(ForkChoiceStrategy::LongestChain);
-				import_block.post_hash = Some(hash);
+				block.header = pre_header;
+				block.post_digests.push(seal);
+				block.fork_choice = Some(ForkChoiceStrategy::LongestChain);
+				block.post_hash = Some(hash);
 
-				Ok((import_block, maybe_keys))
+				Ok((block, maybe_keys))
 			},
 			CheckedHeader::Deferred(a, b) => {
 				debug!(target: "aura", "Checking {:?} failed; {:?}, {:?}.", hash, a, b);
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index b09cd6ad86b8..172bad669daa 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -118,7 +118,6 @@ use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr};
 use sp_runtime::{
 	generic::{BlockId, OpaqueDigestItemId},
 	traits::{Block as BlockT, DigestItemFor, Header, Zero},
-	Justifications,
 };
 
 pub use sc_consensus_slots::SlotProportion;
@@ -187,6 +186,19 @@ impl EpochT for Epoch {
 	}
 }
 
+impl From<sp_consensus_babe::Epoch> for Epoch {
+	fn from(epoch: sp_consensus_babe::Epoch) -> Self {
+		Epoch {
+			epoch_index: epoch.epoch_index,
+			start_slot: epoch.start_slot,
+			duration: epoch.duration,
+			authorities: epoch.authorities,
+			randomness: epoch.randomness,
+			config: epoch.config,
+		}
+	}
+}
+
 impl Epoch {
 	/// Create the genesis epoch (epoch #0). This is defined to start at the slot of
 	/// the first block, so that has to be provided.
@@ -1128,24 +1140,29 @@ where
 {
 	async fn verify(
 		&mut self,
-		origin: BlockOrigin,
-		header: Block::Header,
-		justifications: Option<Justifications>,
-		mut body: Option<Vec<Block::Extrinsic>>,
+		mut block: BlockImportParams<Block, ()>,
 	) -> BlockVerificationResult<Block> {
 		trace!(
 			target: "babe",
 			"Verifying origin: {:?} header: {:?} justification(s): {:?} body: {:?}",
-			origin,
-			header,
-			justifications,
-			body,
+			block.origin,
+			block.header,
+			block.justifications,
+			block.body,
 		);
 
-		let hash = header.hash();
-		let parent_hash = *header.parent_hash();
+		let hash = block.header.hash();
+		let parent_hash = *block.header.parent_hash();
+
+		if block.with_state() {
+			// When importing whole state we don't calculate epoch descriptor, but rather
+			// read it from the state after import. We also skip all verifications
+			// because there's no parent state and we trust the sync module to verify
+			// that the state is correct and finalized.
+			return Ok((block, Default::default()))
+		}
 
-		debug!(target: "babe", "We have {:?} logs in this header", header.digest().logs().len());
+		debug!(target: "babe", "We have {:?} logs in this header", block.header.digest().logs().len());
 
 		let create_inherent_data_providers = self
 			.create_inherent_data_providers
@@ -1160,7 +1177,7 @@ where
 			.header_metadata(parent_hash)
 			.map_err(Error::<Block>::FetchParentHeader)?;
 
-		let pre_digest = find_pre_digest::<Block>(&header)?;
+		let pre_digest = find_pre_digest::<Block>(&block.header)?;
 		let (check_header, epoch_descriptor) = {
 			let epoch_changes = self.epoch_changes.shared_data();
 			let epoch_descriptor = epoch_changes
@@ -1179,7 +1196,7 @@ where
 			// We add one to the current slot to allow for some small drift.
 			// FIXME #1019 in the future, alter this queue to allow deferring of headers
 			let v_params = verification::VerificationParams {
-				header: header.clone(),
+				header: block.header.clone(),
 				pre_digest: Some(pre_digest),
 				slot_now: slot_now + 1,
 				epoch: viable_epoch.as_ref(),
@@ -1203,9 +1220,9 @@ where
 					.check_and_report_equivocation(
 						slot_now,
 						slot,
-						&header,
+						&block.header,
 						&verified_info.author,
-						&origin,
+						&block.origin,
 					)
 					.await
 				{
@@ -1215,23 +1232,23 @@ where
 				// if the body is passed through, we need to use the runtime
 				// to check that the internally-set timestamp in the inherents
 				// actually matches the slot set in the seal.
-				if let Some(inner_body) = body.take() {
+				if let Some(inner_body) = block.body {
 					let mut inherent_data = create_inherent_data_providers
 						.create_inherent_data()
 						.map_err(Error::<Block>::CreateInherents)?;
 					inherent_data.babe_replace_inherent_data(slot);
-					let block = Block::new(pre_header.clone(), inner_body);
+					let new_block = Block::new(pre_header.clone(), inner_body);
 
 					self.check_inherents(
-						block.clone(),
+						new_block.clone(),
 						BlockId::Hash(parent_hash),
 						inherent_data,
 						create_inherent_data_providers,
 					)
 					.await?;
 
-					let (_, inner_body) = block.deconstruct();
-					body = Some(inner_body);
+					let (_, inner_body) = new_block.deconstruct();
+					block.body = Some(inner_body);
 				}
 
 				trace!(target: "babe", "Checked {:?}; importing.", pre_header);
@@ -1242,17 +1259,15 @@ where
 					"pre_header" => ?pre_header,
 				);
 
-				let mut import_block = BlockImportParams::new(origin, pre_header);
-				import_block.post_digests.push(verified_info.seal);
-				import_block.body = body;
-				import_block.justifications = justifications;
-				import_block.intermediates.insert(
+				block.header = pre_header;
+				block.post_digests.push(verified_info.seal);
+				block.intermediates.insert(
 					Cow::from(INTERMEDIATE_KEY),
 					Box::new(BabeIntermediate::<Block> { epoch_descriptor }) as Box<_>,
 				);
-				import_block.post_hash = Some(hash);
+				block.post_hash = Some(hash);
 
-				Ok((import_block, Default::default()))
+				Ok((block, Default::default()))
 			},
 			CheckedHeader::Deferred(a, b) => {
 				debug!(target: "babe", "Checking {:?} failed; {:?}, {:?}.", hash, a, b);
@@ -1305,6 +1320,72 @@ impl<Block: BlockT, Client, I> BabeBlockImport<Block, Client, I> {
 	}
 }
 
+impl<Block, Client, Inner> BabeBlockImport<Block, Client, Inner>
+where
+	Block: BlockT,
+	Inner: BlockImport<Block, Transaction = sp_api::TransactionFor<Client, Block>> + Send + Sync,
+	Inner::Error: Into<ConsensusError>,
+	Client: HeaderBackend<Block>
+		+ HeaderMetadata<Block, Error = sp_blockchain::Error>
+		+ AuxStore
+		+ ProvideRuntimeApi<Block>
+		+ ProvideCache<Block>
+		+ Send
+		+ Sync,
+	Client::Api: BabeApi<Block> + ApiExt<Block>,
+{
+	/// Import whole state after warp sync.
+	// This function makes multiple transactions to the DB. If one of them fails we may
+	// end up in an inconsistent state and have to resync.
+	async fn import_state(
+		&mut self,
+		mut block: BlockImportParams<Block, sp_api::TransactionFor<Client, Block>>,
+		new_cache: HashMap<CacheKeyId, Vec<u8>>,
+	) -> Result<ImportResult, ConsensusError> {
+		let hash = block.post_hash();
+		let parent_hash = *block.header.parent_hash();
+		let number = *block.header.number();
+
+		block.fork_choice = Some(ForkChoiceStrategy::Custom(true));
+		// Reset block weight.
+		aux_schema::write_block_weight(hash, 0, |values| {
+			block
+				.auxiliary
+				.extend(values.iter().map(|(k, v)| (k.to_vec(), Some(v.to_vec()))))
+		});
+
+		// First make the client import the state.
+		let import_result = self.inner.import_block(block, new_cache).await;
+		let aux = match import_result {
+			Ok(ImportResult::Imported(aux)) => aux,
+			Ok(r) =>
+				return Err(ConsensusError::ClientImport(format!(
+					"Unexpected import result: {:?}",
+					r
+				))),
+			Err(r) => return Err(r.into()),
+		};
+
+		// Read epoch info from the imported state.
+		let block_id = BlockId::hash(hash);
+		let current_epoch = self.client.runtime_api().current_epoch(&block_id).map_err(|e| {
+			ConsensusError::ClientImport(babe_err::<Block>(Error::RuntimeApi(e)).into())
+		})?;
+		let next_epoch = self.client.runtime_api().next_epoch(&block_id).map_err(|e| {
+			ConsensusError::ClientImport(babe_err::<Block>(Error::RuntimeApi(e)).into())
+		})?;
+
+		let mut epoch_changes = self.epoch_changes.shared_data_locked();
+		epoch_changes.reset(parent_hash, hash, number, current_epoch.into(), next_epoch.into());
+		aux_schema::write_epoch_changes::<Block, _, _>(&*epoch_changes, |insert| {
+			self.client.insert_aux(insert, [])
+		})
+		.map_err(|e| ConsensusError::ClientImport(e.to_string()))?;
+
+		Ok(ImportResult::Imported(aux))
+	}
+}
+
 #[async_trait::async_trait]
 impl<Block, Client, Inner> BlockImport<Block> for BabeBlockImport<Block, Client, Inner>
 where
@@ -1336,7 +1417,7 @@ where
 		match self.client.status(BlockId::Hash(hash)) {
 			Ok(sp_blockchain::BlockStatus::InChain) => {
 				// When re-importing existing block strip away intermediates.
-				let _ = block.take_intermediate::<BabeIntermediate<Block>>(INTERMEDIATE_KEY)?;
+				let _ = block.take_intermediate::<BabeIntermediate<Block>>(INTERMEDIATE_KEY);
 				block.fork_choice = Some(ForkChoiceStrategy::Custom(false));
 				return self.inner.import_block(block, new_cache).await.map_err(Into::into)
 			},
@@ -1344,6 +1425,10 @@ where
 			Err(e) => return Err(ConsensusError::ClientImport(e.to_string())),
 		}
 
+		if block.with_state() {
+			return self.import_state(block, new_cache).await
+		}
+
 		let pre_digest = find_pre_digest::<Block>(&block.header).expect(
 			"valid babe headers must contain a predigest; header has been already verified; qed",
 		);
diff --git a/client/consensus/babe/src/tests.rs b/client/consensus/babe/src/tests.rs
index d21911a7fe50..4b4e0a9d0f3d 100644
--- a/client/consensus/babe/src/tests.rs
+++ b/client/consensus/babe/src/tests.rs
@@ -228,7 +228,6 @@ pub struct BabeTestNet {
 }
 
 type TestHeader = <TestBlock as BlockT>::Header;
-type TestExtrinsic = <TestBlock as BlockT>::Extrinsic;
 
 type TestSelectChain =
 	substrate_test_runtime_client::LongestChain<substrate_test_runtime_client::Backend, TestBlock>;
@@ -257,14 +256,11 @@ impl Verifier<TestBlock> for TestVerifier {
 	/// presented to the User in the logs.
 	async fn verify(
 		&mut self,
-		origin: BlockOrigin,
-		mut header: TestHeader,
-		justifications: Option<Justifications>,
-		body: Option<Vec<TestExtrinsic>>,
+		mut block: BlockImportParams<TestBlock, ()>,
 	) -> Result<(BlockImportParams<TestBlock, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String> {
 		// apply post-sealing mutations (i.e. stripping seal, if desired).
-		(self.mutator)(&mut header, Stage::PostSeal);
-		self.inner.verify(origin, header, justifications, body).await
+		(self.mutator)(&mut block.header, Stage::PostSeal);
+		self.inner.verify(block).await
 	}
 }
 
diff --git a/client/consensus/common/src/block_import.rs b/client/consensus/common/src/block_import.rs
index 616378fc9b18..83fb11834dae 100644
--- a/client/consensus/common/src/block_import.rs
+++ b/client/consensus/common/src/block_import.rs
@@ -112,6 +112,8 @@ pub struct BlockCheckParams<Block: BlockT> {
 	pub parent_hash: Block::Hash,
 	/// Allow importing the block skipping state verification if parent state is missing.
 	pub allow_missing_state: bool,
+	/// Allow importing the block if parent block is missing.
+	pub allow_missing_parent: bool,
 	/// Re-validate existing block.
 	pub import_existing: bool,
 }
@@ -306,6 +308,11 @@ impl<Block: BlockT, Transaction> BlockImportParams<Block, Transaction> {
 			.downcast_mut::<T>()
 			.ok_or(Error::InvalidIntermediate)
 	}
+
+	/// Check if this block contains state import action
+	pub fn with_state(&self) -> bool {
+		matches!(self.state_action, StateAction::ApplyChanges(StorageChanges::Import(_)))
+	}
 }
 
 /// Block import trait.
diff --git a/client/consensus/common/src/import_queue.rs b/client/consensus/common/src/import_queue.rs
index b1a24e5620d3..57d80cd41c64 100644
--- a/client/consensus/common/src/import_queue.rs
+++ b/client/consensus/common/src/import_queue.rs
@@ -26,7 +26,7 @@
 //! instantiated. The `BasicQueue` and `BasicVerifier` traits allow serial
 //! queues to be instantiated simply.
 
-use std::collections::HashMap;
+use std::{collections::HashMap, iter::FromIterator};
 
 use log::{debug, trace};
 use sp_runtime::{
@@ -97,10 +97,7 @@ pub trait Verifier<B: BlockT>: Send + Sync {
 	/// presented to the User in the logs.
 	async fn verify(
 		&mut self,
-		origin: BlockOrigin,
-		header: B::Header,
-		justifications: Option<Justifications>,
-		body: Option<Vec<B::Extrinsic>>,
+		block: BlockImportParams<B, ()>,
 	) -> Result<(BlockImportParams<B, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String>;
 }
 
@@ -222,7 +219,7 @@ pub(crate) async fn import_single_block_metered<
 	trace!(target: "sync", "Header {} has {:?} logs", block.hash, header.digest().logs().len());
 
 	let number = header.number().clone();
-	let hash = header.hash();
+	let hash = block.hash;
 	let parent_hash = header.parent_hash().clone();
 
 	let import_handler = |import| match import {
@@ -260,6 +257,7 @@ pub(crate) async fn import_single_block_metered<
 				parent_hash,
 				allow_missing_state: block.allow_missing_state,
 				import_existing: block.import_existing,
+				allow_missing_parent: block.state.is_some(),
 			})
 			.await,
 	)? {
@@ -268,32 +266,14 @@ pub(crate) async fn import_single_block_metered<
 	}
 
 	let started = wasm_timer::Instant::now();
-	let (mut import_block, maybe_keys) = verifier
-		.verify(block_origin, header, justifications, block.body)
-		.await
-		.map_err(|msg| {
-			if let Some(ref peer) = peer {
-				trace!(target: "sync", "Verifying {}({}) from {} failed: {}", number, hash, peer, msg);
-			} else {
-				trace!(target: "sync", "Verifying {}({}) failed: {}", number, hash, msg);
-			}
-			if let Some(metrics) = metrics.as_ref() {
-				metrics.report_verification(false, started.elapsed());
-			}
-			BlockImportError::VerificationFailed(peer.clone(), msg)
-		})?;
-
-	if let Some(metrics) = metrics.as_ref() {
-		metrics.report_verification(true, started.elapsed());
-	}
 
-	let mut cache = HashMap::new();
-	if let Some(keys) = maybe_keys {
-		cache.extend(keys.into_iter());
-	}
+	let mut import_block = BlockImportParams::new(block_origin, header);
+	import_block.body = block.body;
+	import_block.justifications = justifications;
+	import_block.post_hash = Some(hash);
 	import_block.import_existing = block.import_existing;
 	import_block.indexed_body = block.indexed_body;
-	let mut import_block = import_block.clear_storage_changes_and_mutate();
+
 	if let Some(state) = block.state {
 		let changes = crate::block_import::StorageChanges::Import(state);
 		import_block.state_action = StateAction::ApplyChanges(changes);
@@ -303,6 +283,24 @@ pub(crate) async fn import_single_block_metered<
 		import_block.state_action = StateAction::ExecuteIfPossible;
 	}
 
+	let (import_block, maybe_keys) = verifier.verify(import_block).await.map_err(|msg| {
+		if let Some(ref peer) = peer {
+			trace!(target: "sync", "Verifying {}({}) from {} failed: {}", number, hash, peer, msg);
+		} else {
+			trace!(target: "sync", "Verifying {}({}) failed: {}", number, hash, msg);
+		}
+		if let Some(metrics) = metrics.as_ref() {
+			metrics.report_verification(false, started.elapsed());
+		}
+		BlockImportError::VerificationFailed(peer.clone(), msg)
+	})?;
+
+	if let Some(metrics) = metrics.as_ref() {
+		metrics.report_verification(true, started.elapsed());
+	}
+
+	let cache = HashMap::from_iter(maybe_keys.unwrap_or_default());
+	let import_block = import_block.clear_storage_changes_and_mutate();
 	let imported = import_handle.import_block(import_block, cache).await;
 	if let Some(metrics) = metrics.as_ref() {
 		metrics.report_verification_and_import(started.elapsed());
diff --git a/client/consensus/common/src/import_queue/basic_queue.rs b/client/consensus/common/src/import_queue/basic_queue.rs
index 2de5f578a7a6..dbf779c074f2 100644
--- a/client/consensus/common/src/import_queue/basic_queue.rs
+++ b/client/consensus/common/src/import_queue/basic_queue.rs
@@ -455,12 +455,9 @@ mod tests {
 	impl Verifier<Block> for () {
 		async fn verify(
 			&mut self,
-			origin: BlockOrigin,
-			header: Header,
-			_justifications: Option<Justifications>,
-			_body: Option<Vec<Extrinsic>>,
+			block: BlockImportParams<Block, ()>,
 		) -> Result<(BlockImportParams<Block, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String> {
-			Ok((BlockImportParams::new(origin, header), None))
+			Ok((BlockImportParams::new(block.origin, block.header), None))
 		}
 	}
 
diff --git a/client/consensus/epochs/src/lib.rs b/client/consensus/epochs/src/lib.rs
index e93724e5895f..52327dbbf60e 100644
--- a/client/consensus/epochs/src/lib.rs
+++ b/client/consensus/epochs/src/lib.rs
@@ -28,7 +28,7 @@ use sp_runtime::traits::{Block as BlockT, NumberFor, One, Zero};
 use std::{
 	borrow::{Borrow, BorrowMut},
 	collections::BTreeMap,
-	ops::Add,
+	ops::{Add, Sub},
 };
 
 /// A builder for `is_descendent_of` functions.
@@ -228,7 +228,7 @@ impl<Hash, Number, E: Epoch> ViableEpochDescriptor<Hash, Number, E> {
 }
 
 /// Persisted epoch stored in EpochChanges.
-#[derive(Clone, Encode, Decode, Debug)]
+#[derive(Clone, Encode, Decode)]
 pub enum PersistedEpoch<E: Epoch> {
 	/// Genesis persisted epoch data. epoch_0, epoch_1.
 	Genesis(E, E),
@@ -322,7 +322,7 @@ where
 impl<Hash, Number, E: Epoch> EpochChanges<Hash, Number, E>
 where
 	Hash: PartialEq + Ord + AsRef<[u8]> + AsMut<[u8]> + Copy,
-	Number: Ord + One + Zero + Add<Output = Number> + Copy,
+	Number: Ord + One + Zero + Add<Output = Number> + Sub<Output = Number> + Copy,
 {
 	/// Create a new epoch change.
 	pub fn new() -> Self {
@@ -614,6 +614,25 @@ where
 	pub fn tree(&self) -> &ForkTree<Hash, Number, PersistedEpochHeader<E>> {
 		&self.inner
 	}
+
+	/// Reset to a specified pair of epochs, as if they were announced at blocks `parent_hash` and `hash`.
+	pub fn reset(&mut self, parent_hash: Hash, hash: Hash, number: Number, current: E, next: E) {
+		self.inner = ForkTree::new();
+		self.epochs.clear();
+		let persisted = PersistedEpoch::Regular(current);
+		let header = PersistedEpochHeader::from(&persisted);
+		let _res = self.inner.import(parent_hash, number - One::one(), header, &|_, _| {
+			Ok(false) as Result<bool, fork_tree::Error<ClientError>>
+		});
+		self.epochs.insert((parent_hash, number - One::one()), persisted);
+
+		let persisted = PersistedEpoch::Regular(next);
+		let header = PersistedEpochHeader::from(&persisted);
+		let _res = self.inner.import(hash, number, header, &|_, _| {
+			Ok(true) as Result<bool, fork_tree::Error<ClientError>>
+		});
+		self.epochs.insert((hash, number), persisted);
+	}
 }
 
 /// Type alias to produce the epoch-changes tree from a block type.
@@ -694,6 +713,7 @@ mod tests {
 
 	#[test]
 	fn genesis_epoch_is_created_but_not_imported() {
+		//
 		// A - B
 		//  \
 		//   — C
@@ -735,6 +755,7 @@ mod tests {
 
 	#[test]
 	fn epoch_changes_between_blocks() {
+		//
 		// A - B
 		//  \
 		//   — C
diff --git a/client/consensus/manual-seal/src/consensus/babe.rs b/client/consensus/manual-seal/src/consensus/babe.rs
index 9edcb8fd13a1..d18170e9a0d6 100644
--- a/client/consensus/manual-seal/src/consensus/babe.rs
+++ b/client/consensus/manual-seal/src/consensus/babe.rs
@@ -39,7 +39,7 @@ use std::{
 use sc_consensus::{BlockImportParams, ForkChoiceStrategy, Verifier};
 use sp_api::{ProvideRuntimeApi, TransactionFor};
 use sp_blockchain::{HeaderBackend, HeaderMetadata};
-use sp_consensus::{BlockOrigin, CacheKeyId};
+use sp_consensus::CacheKeyId;
 use sp_consensus_babe::{
 	digests::{NextEpochDescriptor, PreDigest, SecondaryPlainPreDigest},
 	inherents::BabeInherentData,
@@ -50,7 +50,6 @@ use sp_inherents::{InherentData, InherentDataProvider, InherentIdentifier};
 use sp_runtime::{
 	generic::{BlockId, Digest},
 	traits::{Block as BlockT, DigestFor, DigestItemFor, Header, Zero},
-	Justifications,
 };
 use sp_timestamp::{InherentType, TimestampInherentData, INHERENT_IDENTIFIER};
 
@@ -98,20 +97,14 @@ where
 {
 	async fn verify(
 		&mut self,
-		origin: BlockOrigin,
-		header: B::Header,
-		justifications: Option<Justifications>,
-		body: Option<Vec<B::Extrinsic>>,
+		mut import_params: BlockImportParams<B, ()>,
 	) -> Result<(BlockImportParams<B, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String> {
-		let mut import_params = BlockImportParams::new(origin, header.clone());
-		import_params.justifications = justifications;
-		import_params.body = body;
 		import_params.finalized = false;
 		import_params.fork_choice = Some(ForkChoiceStrategy::LongestChain);
 
-		let pre_digest = find_pre_digest::<B>(&header)?;
+		let pre_digest = find_pre_digest::<B>(&import_params.header)?;
 
-		let parent_hash = header.parent_hash();
+		let parent_hash = import_params.header.parent_hash();
 		let parent = self
 			.client
 			.header(BlockId::Hash(*parent_hash))
diff --git a/client/consensus/manual-seal/src/lib.rs b/client/consensus/manual-seal/src/lib.rs
index 7d4dfefe50c6..4f23bdcf6592 100644
--- a/client/consensus/manual-seal/src/lib.rs
+++ b/client/consensus/manual-seal/src/lib.rs
@@ -27,9 +27,9 @@ use sc_consensus::{
 	import_queue::{BasicQueue, BoxBlockImport, Verifier},
 };
 use sp_blockchain::HeaderBackend;
-use sp_consensus::{BlockOrigin, CacheKeyId, Environment, Proposer, SelectChain};
+use sp_consensus::{CacheKeyId, Environment, Proposer, SelectChain};
 use sp_inherents::CreateInherentDataProviders;
-use sp_runtime::{traits::Block as BlockT, ConsensusEngineId, Justifications};
+use sp_runtime::{traits::Block as BlockT, ConsensusEngineId};
 use std::{marker::PhantomData, sync::Arc};
 
 mod error;
@@ -59,18 +59,11 @@ struct ManualSealVerifier;
 impl<B: BlockT> Verifier<B> for ManualSealVerifier {
 	async fn verify(
 		&mut self,
-		origin: BlockOrigin,
-		header: B::Header,
-		justifications: Option<Justifications>,
-		body: Option<Vec<B::Extrinsic>>,
+		mut block: BlockImportParams<B, ()>,
 	) -> Result<(BlockImportParams<B, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String> {
-		let mut import_params = BlockImportParams::new(origin, header);
-		import_params.justifications = justifications;
-		import_params.body = body;
-		import_params.finalized = false;
-		import_params.fork_choice = Some(ForkChoiceStrategy::LongestChain);
-
-		Ok((import_params, None))
+		block.finalized = false;
+		block.fork_choice = Some(ForkChoiceStrategy::LongestChain);
+		Ok((block, None))
 	}
 }
 
diff --git a/client/consensus/pow/src/lib.rs b/client/consensus/pow/src/lib.rs
index 85a37e73535a..17bd02f6a565 100644
--- a/client/consensus/pow/src/lib.rs
+++ b/client/consensus/pow/src/lib.rs
@@ -58,15 +58,14 @@ use sp_api::ProvideRuntimeApi;
 use sp_block_builder::BlockBuilder as BlockBuilderApi;
 use sp_blockchain::{well_known_cache_keys::Id as CacheKeyId, HeaderBackend, ProvideCache};
 use sp_consensus::{
-	BlockOrigin, CanAuthorWith, Environment, Error as ConsensusError, Proposer, SelectChain,
-	SyncOracle,
+	CanAuthorWith, Environment, Error as ConsensusError, Proposer, SelectChain, SyncOracle,
 };
 use sp_consensus_pow::{Seal, TotalDifficulty, POW_ENGINE_ID};
 use sp_inherents::{CreateInherentDataProviders, InherentDataProvider};
 use sp_runtime::{
 	generic::{BlockId, Digest, DigestItem},
 	traits::{Block as BlockT, Header as HeaderT},
-	Justifications, RuntimeString,
+	RuntimeString,
 };
 use std::{
 	borrow::Cow, cmp::Ordering, collections::HashMap, marker::PhantomData, sync::Arc,
@@ -461,26 +460,20 @@ where
 {
 	async fn verify(
 		&mut self,
-		origin: BlockOrigin,
-		header: B::Header,
-		justifications: Option<Justifications>,
-		body: Option<Vec<B::Extrinsic>>,
+		mut block: BlockImportParams<B, ()>,
 	) -> Result<(BlockImportParams<B, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String> {
-		let hash = header.hash();
-		let (checked_header, seal) = self.check_header(header)?;
+		let hash = block.header.hash();
+		let (checked_header, seal) = self.check_header(block.header)?;
 
 		let intermediate = PowIntermediate::<Algorithm::Difficulty> { difficulty: None };
-
-		let mut import_block = BlockImportParams::new(origin, checked_header);
-		import_block.post_digests.push(seal);
-		import_block.body = body;
-		import_block.justifications = justifications;
-		import_block
+		block.header = checked_header;
+		block.post_digests.push(seal);
+		block
 			.intermediates
 			.insert(Cow::from(INTERMEDIATE_KEY), Box::new(intermediate) as Box<_>);
-		import_block.post_hash = Some(hash);
+		block.post_hash = Some(hash);
 
-		Ok((import_block, None))
+		Ok((block, None))
 	}
 }
 
diff --git a/client/db/src/cache/list_cache.rs b/client/db/src/cache/list_cache.rs
index 9499ae2a89f4..1808d431dd05 100644
--- a/client/db/src/cache/list_cache.rs
+++ b/client/db/src/cache/list_cache.rs
@@ -302,6 +302,7 @@ impl<Block: BlockT, T: CacheItemT, S: Storage<Block, T>> ListCache<Block, T, S>
 		let prev_operation = operations.operations.last();
 		debug_assert!(
 			entry_type != EntryType::Final ||
+				self.unfinalized.is_empty() ||
 				self.best_finalized_block.hash == parent.hash ||
 				match prev_operation {
 					Some(&CommitOperation::BlockFinalized(ref best_finalized_block, _, _)) =>
diff --git a/client/db/src/changes_tries_storage.rs b/client/db/src/changes_tries_storage.rs
index a02e1cf7add9..c0649853160f 100644
--- a/client/db/src/changes_tries_storage.rs
+++ b/client/db/src/changes_tries_storage.rs
@@ -358,18 +358,23 @@ impl<Block: BlockT> DbChangesTrieStorage<Block> {
 			let next_config = match cache_tx {
 				Some(cache_tx) if config_for_new_block && cache_tx.new_config.is_some() => {
 					let config = cache_tx.new_config.clone().expect("guarded by is_some(); qed");
-					ChangesTrieConfigurationRange {
+					Ok(ChangesTrieConfigurationRange {
 						zero: (block_num, block_hash),
 						end: None,
 						config,
-					}
+					})
 				},
 				_ if config_for_new_block => self.configuration_at(&BlockId::Hash(
 					*new_header
 						.expect("config_for_new_block is only true when new_header is passed; qed")
 						.parent_hash(),
-				))?,
-				_ => self.configuration_at(&BlockId::Hash(next_digest_range_start_hash))?,
+				)),
+				_ => self.configuration_at(&BlockId::Hash(next_digest_range_start_hash)),
+			};
+			let next_config = match next_config {
+				Ok(next_config) => next_config,
+				Err(ClientError::UnknownBlock(_)) => break, // No block means nothing to prune.
+				Err(e) => return Err(e),
 			};
 			if let Some(config) = next_config.config {
 				let mut oldest_digest_range = config
diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index 455ec1ef6b9d..dda469f4fd33 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -692,7 +692,10 @@ impl<Block: BlockT> HeaderMetadata<Block> for BlockchainDb<Block> {
 						header_metadata
 					})
 					.ok_or_else(|| {
-						ClientError::UnknownBlock(format!("header not found in db: {}", hash))
+						ClientError::UnknownBlock(format!(
+							"Header was not found in the database: {:?}",
+							hash
+						))
 					})
 			},
 			Ok,
@@ -1210,8 +1213,11 @@ impl<Block: BlockT> Backend<Block> {
 			return Err(sp_blockchain::Error::SetHeadTooOld.into())
 		}
 
-		// cannot find tree route with empty DB.
-		if meta.best_hash != Default::default() {
+		let parent_exists =
+			self.blockchain.status(BlockId::Hash(route_to))? == sp_blockchain::BlockStatus::InChain;
+
+		// Cannot find tree route with empty DB or when imported a detached block.
+		if meta.best_hash != Default::default() && parent_exists {
 			let tree_route = sp_blockchain::tree_route(&self.blockchain, meta.best_hash, route_to)?;
 
 			// uncanonicalize: check safety violations and ensure the numbers no longer
@@ -1261,8 +1267,10 @@ impl<Block: BlockT> Backend<Block> {
 	) -> ClientResult<()> {
 		let last_finalized =
 			last_finalized.unwrap_or_else(|| self.blockchain.meta.read().finalized_hash);
-		if *header.parent_hash() != last_finalized {
-			return Err(::sp_blockchain::Error::NonSequentialFinalization(format!(
+		if last_finalized != self.blockchain.meta.read().genesis_hash &&
+			*header.parent_hash() != last_finalized
+		{
+			return Err(sp_blockchain::Error::NonSequentialFinalization(format!(
 				"Last finalized {:?} not parent of {:?}",
 				last_finalized,
 				header.hash()
@@ -1588,7 +1596,7 @@ impl<Block: BlockT> Backend<Block> {
 						columns::META,
 						meta_keys::LEAF_PREFIX,
 					);
-				};
+				}
 
 				let mut children = children::read_children(
 					&*self.storage.db,
@@ -1598,14 +1606,14 @@ impl<Block: BlockT> Backend<Block> {
 				)?;
 				if !children.contains(&hash) {
 					children.push(hash);
+					children::write_children(
+						&mut transaction,
+						columns::META,
+						meta_keys::CHILDREN_PREFIX,
+						parent_hash,
+						children,
+					);
 				}
-				children::write_children(
-					&mut transaction,
-					columns::META,
-					meta_keys::CHILDREN_PREFIX,
-					parent_hash,
-					children,
-				);
 			}
 
 			meta_updates.push(MetaUpdate {
@@ -1615,7 +1623,6 @@ impl<Block: BlockT> Backend<Block> {
 				is_finalized: finalized,
 				with_state: operation.commit_state,
 			});
-
 			Some((pending_block.header, number, hash, enacted, retracted, is_best, cache))
 		} else {
 			None
diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml
index 706538e80724..66432a7aa51c 100644
--- a/client/finality-grandpa/Cargo.toml
+++ b/client/finality-grandpa/Cargo.toml
@@ -22,7 +22,7 @@ futures = "0.3.9"
 futures-timer = "3.0.1"
 log = "0.4.8"
 parking_lot = "0.11.1"
-rand = "0.7.2"
+rand = "0.8.4"
 parity-scale-codec = { version = "2.0.0", features = ["derive"] }
 sp-application-crypto = { version = "4.0.0-dev", path = "../../primitives/application-crypto" }
 sp-arithmetic = { version = "4.0.0-dev", path = "../../primitives/arithmetic" }
diff --git a/client/finality-grandpa/src/environment.rs b/client/finality-grandpa/src/environment.rs
index 9cfd49eeb796..f27a530ed2f4 100644
--- a/client/finality-grandpa/src/environment.rs
+++ b/client/finality-grandpa/src/environment.rs
@@ -1087,7 +1087,7 @@ where
 
 		// random between `[0, 2 * gossip_duration]` seconds.
 		let delay: u64 =
-			thread_rng().gen_range(0, 2 * self.config.gossip_duration.as_millis() as u64);
+			thread_rng().gen_range(0..2 * self.config.gossip_duration.as_millis() as u64);
 		Box::pin(Delay::new(Duration::from_millis(delay)).map(Ok))
 	}
 
diff --git a/client/finality-grandpa/src/import.rs b/client/finality-grandpa/src/import.rs
index 84e6fa9e1fba..a86421b4a0ef 100644
--- a/client/finality-grandpa/src/import.rs
+++ b/client/finality-grandpa/src/import.rs
@@ -19,7 +19,7 @@
 use std::{collections::HashMap, marker::PhantomData, sync::Arc};
 
 use log::debug;
-use parity_scale_codec::Encode;
+use parity_scale_codec::{Decode, Encode};
 
 use sc_client_api::{backend::Backend, utils::is_descendent_of};
 use sc_consensus::{
@@ -27,10 +27,11 @@ use sc_consensus::{
 	BlockCheckParams, BlockImport, BlockImportParams, ImportResult, JustificationImport,
 };
 use sc_telemetry::TelemetryHandle;
-use sp_api::TransactionFor;
+use sp_api::{Core, RuntimeApiInfo, TransactionFor};
 use sp_blockchain::{well_known_cache_keys, BlockStatus};
 use sp_consensus::{BlockOrigin, Error as ConsensusError, SelectChain};
-use sp_finality_grandpa::{ConsensusLog, ScheduledChange, SetId, GRANDPA_ENGINE_ID};
+use sp_core::hashing::twox_128;
+use sp_finality_grandpa::{ConsensusLog, GrandpaApi, ScheduledChange, SetId, GRANDPA_ENGINE_ID};
 use sp_runtime::{
 	generic::{BlockId, OpaqueDigestItemId},
 	traits::{Block as BlockT, DigestFor, Header as HeaderT, NumberFor, Zero},
@@ -43,7 +44,7 @@ use crate::{
 	environment::finalize_block,
 	justification::GrandpaJustification,
 	notification::GrandpaJustificationSender,
-	ClientForGrandpa, CommandOrError, Error, NewAuthoritySet, VoterCommand,
+	AuthoritySetChanges, ClientForGrandpa, CommandOrError, Error, NewAuthoritySet, VoterCommand,
 };
 
 /// A block-import handler for GRANDPA.
@@ -230,6 +231,10 @@ where
 	DigestFor<Block>: Encode,
 	BE: Backend<Block>,
 	Client: ClientForGrandpa<Block, BE>,
+	Client::Api: GrandpaApi<Block>,
+	for<'a> &'a Client:
+		BlockImport<Block, Error = ConsensusError, Transaction = TransactionFor<Client, Block>>,
+	TransactionFor<Client, Block>: 'static,
 {
 	// check for a new authority set change.
 	fn check_new_change(
@@ -418,6 +423,91 @@ where
 
 		Ok(PendingSetChanges { just_in_case, applied_changes, do_pause })
 	}
+
+	/// Read current set id form a given state.
+	fn current_set_id(&self, id: &BlockId<Block>) -> Result<SetId, ConsensusError> {
+		let runtime_version = self.inner.runtime_api().version(id).map_err(|e| {
+			ConsensusError::ClientImport(format!(
+				"Unable to retrieve current runtime version. {}",
+				e
+			))
+		})?;
+		if runtime_version
+			.api_version(&<dyn GrandpaApi<Block>>::ID)
+			.map_or(false, |v| v < 3)
+		{
+			// The new API is not supported in this runtime. Try reading directly from storage.
+			// This code may be removed once warp sync to an old runtime is no longer needed.
+			for prefix in ["GrandpaFinality", "Grandpa"] {
+				let k = [twox_128(prefix.as_bytes()), twox_128(b"CurrentSetId")].concat();
+				if let Ok(Some(id)) =
+					self.inner.storage(&id, &sc_client_api::StorageKey(k.to_vec()))
+				{
+					if let Ok(id) = SetId::decode(&mut id.0.as_ref()) {
+						return Ok(id)
+					}
+				}
+			}
+			Err(ConsensusError::ClientImport("Unable to retrieve current set id.".into()))
+		} else {
+			self.inner
+				.runtime_api()
+				.current_set_id(&id)
+				.map_err(|e| ConsensusError::ClientImport(e.to_string()))
+		}
+	}
+
+	/// Import whole new state and reset authority set.
+	async fn import_state(
+		&mut self,
+		mut block: BlockImportParams<Block, TransactionFor<Client, Block>>,
+		new_cache: HashMap<well_known_cache_keys::Id, Vec<u8>>,
+	) -> Result<ImportResult, ConsensusError> {
+		let hash = block.post_hash();
+		let number = *block.header.number();
+		// Force imported state finality.
+		block.finalized = true;
+		let import_result = (&*self.inner).import_block(block, new_cache).await;
+		match import_result {
+			Ok(ImportResult::Imported(aux)) => {
+				// We've just imported a new state. We trust the sync module has verified
+				// finality proofs and that the state is correct and final.
+				// So we can read the authority list and set id from the state.
+				self.authority_set_hard_forks.clear();
+				let block_id = BlockId::hash(hash);
+				let authorities = self
+					.inner
+					.runtime_api()
+					.grandpa_authorities(&block_id)
+					.map_err(|e| ConsensusError::ClientImport(e.to_string()))?;
+				let set_id = self.current_set_id(&block_id)?;
+				let authority_set = AuthoritySet::new(
+					authorities.clone(),
+					set_id,
+					fork_tree::ForkTree::new(),
+					Vec::new(),
+					AuthoritySetChanges::empty(),
+				)
+				.ok_or_else(|| ConsensusError::ClientImport("Invalid authority list".into()))?;
+				*self.authority_set.inner_locked() = authority_set.clone();
+
+				crate::aux_schema::update_authority_set::<Block, _, _>(
+					&authority_set,
+					None,
+					|insert| self.inner.insert_aux(insert, []),
+				)
+				.map_err(|e| ConsensusError::ClientImport(e.to_string()))?;
+				let new_set =
+					NewAuthoritySet { canon_number: number, canon_hash: hash, set_id, authorities };
+				let _ = self
+					.send_voter_commands
+					.unbounded_send(VoterCommand::ChangeAuthorities(new_set));
+				Ok(ImportResult::Imported(aux))
+			},
+			Ok(r) => Ok(r),
+			Err(e) => Err(ConsensusError::ClientImport(e.to_string())),
+		}
+	}
 }
 
 #[async_trait::async_trait]
@@ -427,6 +517,7 @@ where
 	DigestFor<Block>: Encode,
 	BE: Backend<Block>,
 	Client: ClientForGrandpa<Block, BE>,
+	Client::Api: GrandpaApi<Block>,
 	for<'a> &'a Client:
 		BlockImport<Block, Error = ConsensusError, Transaction = TransactionFor<Client, Block>>,
 	TransactionFor<Client, Block>: 'static,
@@ -455,6 +546,10 @@ where
 			Err(e) => return Err(ConsensusError::ClientImport(e.to_string())),
 		}
 
+		if block.with_state() {
+			return self.import_state(block, new_cache).await
+		}
+
 		// on initial sync we will restrict logging under info to avoid spam.
 		let initial_sync = block.origin == BlockOrigin::NetworkInitialSync;
 
diff --git a/client/finality-grandpa/src/lib.rs b/client/finality-grandpa/src/lib.rs
index 8f8ce25b60a5..2a10dfc0d50d 100644
--- a/client/finality-grandpa/src/lib.rs
+++ b/client/finality-grandpa/src/lib.rs
@@ -64,7 +64,7 @@ use prometheus_endpoint::{PrometheusError, Registry};
 use sc_client_api::{
 	backend::{AuxStore, Backend},
 	BlockchainEvents, CallExecutor, ExecutionStrategy, ExecutorProvider, Finalizer, LockImportRun,
-	TransactionFor,
+	StorageProvider, TransactionFor,
 };
 use sc_consensus::BlockImport;
 use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_DEBUG, CONSENSUS_INFO};
@@ -119,6 +119,7 @@ mod notification;
 mod observer;
 mod until_imported;
 mod voting_rule;
+pub mod warp_proof;
 
 pub use authorities::{AuthoritySet, AuthoritySetChanges, SharedAuthoritySet};
 pub use aux_schema::best_justification;
@@ -335,6 +336,7 @@ pub trait ClientForGrandpa<Block, BE>:
 	+ ProvideRuntimeApi<Block>
 	+ ExecutorProvider<Block>
 	+ BlockImport<Block, Transaction = TransactionFor<BE, Block>, Error = sp_consensus::Error>
+	+ StorageProvider<Block, BE>
 where
 	BE: Backend<Block>,
 	Block: BlockT,
@@ -353,7 +355,8 @@ where
 		+ BlockchainEvents<Block>
 		+ ProvideRuntimeApi<Block>
 		+ ExecutorProvider<Block>
-		+ BlockImport<Block, Transaction = TransactionFor<BE, Block>, Error = sp_consensus::Error>,
+		+ BlockImport<Block, Transaction = TransactionFor<BE, Block>, Error = sp_consensus::Error>
+		+ StorageProvider<Block, BE>,
 {
 }
 
diff --git a/client/finality-grandpa/src/observer.rs b/client/finality-grandpa/src/observer.rs
index cbea6c138c90..dd120fdd1450 100644
--- a/client/finality-grandpa/src/observer.rs
+++ b/client/finality-grandpa/src/observer.rs
@@ -177,12 +177,11 @@ where
 {
 	let LinkHalf {
 		client,
-		select_chain: _,
 		persistent_data,
 		voter_commands_rx,
 		justification_sender,
-		justification_stream: _,
 		telemetry,
+		..
 	} = link;
 
 	let network = NetworkBridge::new(
diff --git a/client/finality-grandpa/src/tests.rs b/client/finality-grandpa/src/tests.rs
index bf9faec70753..6b151f314b5c 100644
--- a/client/finality-grandpa/src/tests.rs
+++ b/client/finality-grandpa/src/tests.rs
@@ -203,6 +203,10 @@ sp_api::mock_impl_runtime_apis! {
 			self.inner.genesis_authorities.clone()
 		}
 
+		fn current_set_id(&self) -> SetId {
+			0
+		}
+
 		fn submit_report_equivocation_unsigned_extrinsic(
 			_equivocation_proof: EquivocationProof<Hash, BlockNumber>,
 			_key_owner_proof: OpaqueKeyOwnershipProof,
diff --git a/client/finality-grandpa-warp-sync/src/proof.rs b/client/finality-grandpa/src/warp_proof.rs
similarity index 68%
rename from client/finality-grandpa-warp-sync/src/proof.rs
rename to client/finality-grandpa/src/warp_proof.rs
index d2484a800e63..86b57c78a43e 100644
--- a/client/finality-grandpa-warp-sync/src/proof.rs
+++ b/client/finality-grandpa/src/warp_proof.rs
@@ -14,12 +14,16 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
-use codec::{Decode, Encode};
+//! Utilities for generating and verifying GRANDPA warp sync proofs.
 
-use sc_client_api::Backend as ClientBackend;
-use sc_finality_grandpa::{
-	find_scheduled_change, AuthoritySetChanges, BlockNumberOps, GrandpaJustification,
+use sp_runtime::codec::{self, Decode, Encode};
+
+use crate::{
+	best_justification, find_scheduled_change, AuthoritySetChanges, BlockNumberOps,
+	GrandpaJustification, SharedAuthoritySet,
 };
+use sc_client_api::Backend as ClientBackend;
+use sc_network::warp_request_handler::{EncodedProof, VerificationResult, WarpSyncProvider};
 use sp_blockchain::{Backend as BlockchainBackend, HeaderBackend};
 use sp_finality_grandpa::{AuthorityList, SetId, GRANDPA_ENGINE_ID};
 use sp_runtime::{
@@ -27,13 +31,34 @@ use sp_runtime::{
 	traits::{Block as BlockT, Header as HeaderT, NumberFor, One},
 };
 
-use crate::HandleRequestError;
+use std::sync::Arc;
+
+/// Warp proof processing error.
+#[derive(Debug, derive_more::Display, derive_more::From)]
+pub enum Error {
+	/// Decoding error.
+	#[display(fmt = "Failed to decode block hash: {}.", _0)]
+	DecodeScale(codec::Error),
+	/// Client backend error.
+	Client(sp_blockchain::Error),
+	/// Invalid request data.
+	#[from(ignore)]
+	InvalidRequest(String),
+	/// Invalid warp proof.
+	#[from(ignore)]
+	InvalidProof(String),
+	/// Missing header or authority set change data.
+	#[display(fmt = "Missing required data to be able to answer request.")]
+	MissingData,
+}
+
+impl std::error::Error for Error {}
 
 /// The maximum size in bytes of the `WarpSyncProof`.
-pub(super) const MAX_WARP_SYNC_PROOF_SIZE: usize = 16 * 1024 * 1024;
+pub(super) const MAX_WARP_SYNC_PROOF_SIZE: usize = 8 * 1024 * 1024;
 
 /// A proof of an authority set change.
-#[derive(Decode, Encode)]
+#[derive(Decode, Encode, Debug)]
 pub struct WarpSyncFragment<Block: BlockT> {
 	/// The last block that the given authority set finalized. This block should contain a digest
 	/// signaling an authority set change from which we can fetch the next authority set.
@@ -54,11 +79,11 @@ impl<Block: BlockT> WarpSyncProof<Block> {
 	/// Generates a warp sync proof starting at the given block. It will generate authority set
 	/// change proofs for all changes that happened from `begin` until the current authority set
 	/// (capped by MAX_WARP_SYNC_PROOF_SIZE).
-	pub fn generate<Backend>(
+	fn generate<Backend>(
 		backend: &Backend,
 		begin: Block::Hash,
 		set_changes: &AuthoritySetChanges<NumberFor<Block>>,
-	) -> Result<WarpSyncProof<Block>, HandleRequestError>
+	) -> Result<WarpSyncProof<Block>, Error>
 	where
 		Backend: ClientBackend<Block>,
 	{
@@ -67,12 +92,10 @@ impl<Block: BlockT> WarpSyncProof<Block> {
 
 		let begin_number = blockchain
 			.block_number_from_id(&BlockId::Hash(begin))?
-			.ok_or_else(|| HandleRequestError::InvalidRequest("Missing start block".to_string()))?;
+			.ok_or_else(|| Error::InvalidRequest("Missing start block".to_string()))?;
 
 		if begin_number > blockchain.info().finalized_number {
-			return Err(HandleRequestError::InvalidRequest(
-				"Start block is not finalized".to_string(),
-			))
+			return Err(Error::InvalidRequest("Start block is not finalized".to_string()))
 		}
 
 		let canon_hash = blockchain.hash(begin_number)?.expect(
@@ -82,7 +105,7 @@ impl<Block: BlockT> WarpSyncProof<Block> {
 		);
 
 		if canon_hash != begin {
-			return Err(HandleRequestError::InvalidRequest(
+			return Err(Error::InvalidRequest(
 				"Start block is not in the finalized chain".to_string(),
 			))
 		}
@@ -91,8 +114,7 @@ impl<Block: BlockT> WarpSyncProof<Block> {
 		let mut proofs_encoded_len = 0;
 		let mut proof_limit_reached = false;
 
-		let set_changes =
-			set_changes.iter_from(begin_number).ok_or(HandleRequestError::MissingData)?;
+		let set_changes = set_changes.iter_from(begin_number).ok_or(Error::MissingData)?;
 
 		for (_, last_block) in set_changes {
 			let header = blockchain.header(BlockId::Number(*last_block))?.expect(
@@ -137,19 +159,18 @@ impl<Block: BlockT> WarpSyncProof<Block> {
 		let is_finished = if proof_limit_reached {
 			false
 		} else {
-			let latest_justification =
-				sc_finality_grandpa::best_justification(backend)?.filter(|justification| {
-					// the existing best justification must be for a block higher than the
-					// last authority set change. if we didn't prove any authority set
-					// change then we fallback to make sure it's higher or equal to the
-					// initial warp sync block.
-					let limit = proofs
-						.last()
-						.map(|proof| proof.justification.target().0 + One::one())
-						.unwrap_or(begin_number);
-
-					justification.target().0 >= limit
-				});
+			let latest_justification = best_justification(backend)?.filter(|justification| {
+				// the existing best justification must be for a block higher than the
+				// last authority set change. if we didn't prove any authority set
+				// change then we fallback to make sure it's higher or equal to the
+				// initial warp sync block.
+				let limit = proofs
+					.last()
+					.map(|proof| proof.justification.target().0 + One::one())
+					.unwrap_or(begin_number);
+
+				justification.target().0 >= limit
+			});
 
 			if let Some(latest_justification) = latest_justification {
 				let header = blockchain.header(BlockId::Hash(latest_justification.target().1))?
@@ -167,12 +188,13 @@ impl<Block: BlockT> WarpSyncProof<Block> {
 	}
 
 	/// Verifies the warp sync proof starting at the given set id and with the given authorities.
+	/// Verification stops when either the proof is exhausted or finality for the target header can be proven.
 	/// If the proof is valid the new set id and authorities is returned.
-	pub fn verify(
+	fn verify(
 		&self,
 		set_id: SetId,
 		authorities: AuthorityList,
-	) -> Result<(SetId, AuthorityList), HandleRequestError>
+	) -> Result<(SetId, AuthorityList), Error>
 	where
 		NumberFor<Block>: BlockNumberOps,
 	{
@@ -183,37 +205,107 @@ impl<Block: BlockT> WarpSyncProof<Block> {
 			proof
 				.justification
 				.verify(current_set_id, &current_authorities)
-				.map_err(|err| HandleRequestError::InvalidProof(err.to_string()))?;
+				.map_err(|err| Error::InvalidProof(err.to_string()))?;
 
 			if proof.justification.target().1 != proof.header.hash() {
-				return Err(HandleRequestError::InvalidProof(
-					"mismatch between header and justification".to_owned(),
+				return Err(Error::InvalidProof(
+					"Mismatch between header and justification".to_owned(),
 				))
 			}
 
 			if let Some(scheduled_change) = find_scheduled_change::<Block>(&proof.header) {
 				current_authorities = scheduled_change.next_authorities;
 				current_set_id += 1;
-			} else if fragment_num != self.proofs.len() - 1 {
-				// Only the last fragment of the proof is allowed to be missing the authority
-				// set change.
-				return Err(HandleRequestError::InvalidProof(
+			} else if fragment_num != self.proofs.len() - 1 || !self.is_finished {
+				// Only the last fragment of the last proof message is allowed to be missing
+				// the authority set change.
+				return Err(Error::InvalidProof(
 					"Header is missing authority set change digest".to_string(),
 				))
 			}
 		}
-
 		Ok((current_set_id, current_authorities))
 	}
 }
 
+/// Implements network API for warp sync.
+pub struct NetworkProvider<Block: BlockT, Backend: ClientBackend<Block>>
+where
+	NumberFor<Block>: BlockNumberOps,
+{
+	backend: Arc<Backend>,
+	authority_set: SharedAuthoritySet<Block::Hash, NumberFor<Block>>,
+}
+
+impl<Block: BlockT, Backend: ClientBackend<Block>> NetworkProvider<Block, Backend>
+where
+	NumberFor<Block>: BlockNumberOps,
+{
+	/// Create a new istance for a given backend and authority set.
+	pub fn new(
+		backend: Arc<Backend>,
+		authority_set: SharedAuthoritySet<Block::Hash, NumberFor<Block>>,
+	) -> Self {
+		NetworkProvider { backend, authority_set }
+	}
+}
+
+impl<Block: BlockT, Backend: ClientBackend<Block>> WarpSyncProvider<Block>
+	for NetworkProvider<Block, Backend>
+where
+	NumberFor<Block>: BlockNumberOps,
+{
+	fn generate(
+		&self,
+		start: Block::Hash,
+	) -> Result<EncodedProof, Box<dyn std::error::Error + Send + Sync>> {
+		let proof = WarpSyncProof::<Block>::generate(
+			&*self.backend,
+			start,
+			&self.authority_set.authority_set_changes(),
+		)
+		.map_err(Box::new)?;
+		Ok(EncodedProof(proof.encode()))
+	}
+
+	fn verify(
+		&self,
+		proof: &EncodedProof,
+		set_id: SetId,
+		authorities: AuthorityList,
+	) -> Result<VerificationResult<Block>, Box<dyn std::error::Error + Send + Sync>> {
+		let EncodedProof(proof) = proof;
+		let proof = WarpSyncProof::<Block>::decode(&mut proof.as_slice())
+			.map_err(|e| format!("Proof decoding error: {:?}", e))?;
+		let last_header = proof
+			.proofs
+			.last()
+			.map(|p| p.header.clone())
+			.ok_or_else(|| "Empty proof".to_string())?;
+		let (next_set_id, next_authorities) =
+			proof.verify(set_id, authorities).map_err(Box::new)?;
+		if proof.is_finished {
+			Ok(VerificationResult::<Block>::Complete(next_set_id, next_authorities, last_header))
+		} else {
+			Ok(VerificationResult::<Block>::Partial(
+				next_set_id,
+				next_authorities,
+				last_header.hash(),
+			))
+		}
+	}
+
+	fn current_authorities(&self) -> AuthorityList {
+		self.authority_set.inner().current_authorities.clone()
+	}
+}
+
 #[cfg(test)]
 mod tests {
-	use crate::WarpSyncProof;
-	use codec::Encode;
+	use super::{codec::Encode, WarpSyncProof};
+	use crate::{AuthoritySetChanges, GrandpaJustification};
 	use rand::prelude::*;
 	use sc_block_builder::BlockBuilderProvider;
-	use sc_finality_grandpa::{AuthoritySetChanges, GrandpaJustification};
 	use sp_blockchain::HeaderBackend;
 	use sp_consensus::BlockOrigin;
 	use sp_finality_grandpa::GRANDPA_ENGINE_ID;
diff --git a/client/informant/src/display.rs b/client/informant/src/display.rs
index 4e91c22f9efd..76e21215c245 100644
--- a/client/informant/src/display.rs
+++ b/client/informant/src/display.rs
@@ -40,6 +40,7 @@ use wasm_timer::Instant;
 ///
 /// Call `InformantDisplay::new` to initialize the state, then regularly call `display` with the
 /// information to display.
+///
 pub struct InformantDisplay<B: BlockT> {
 	/// Head of chain block number from the last time `display` has been called.
 	/// `None` if `display` has never been called.
@@ -91,23 +92,36 @@ impl<B: BlockT> InformantDisplay<B> {
 			(diff_bytes_inbound, diff_bytes_outbound)
 		};
 
-		let (level, status, target) =
-			match (net_status.sync_state, net_status.best_seen_block, net_status.state_sync) {
-				(_, _, Some(state)) => (
-					"⚙️ ",
-					"Downloading state".into(),
-					format!(
-						", {}%, ({:.2}) Mib",
-						state.percentage,
-						(state.size as f32) / (1024f32 * 1024f32)
-					),
+		let (level, status, target) = match (
+			net_status.sync_state,
+			net_status.best_seen_block,
+			net_status.state_sync,
+			net_status.warp_sync,
+		) {
+			(_, _, _, Some(warp)) => (
+				"⏩",
+				"Warping".into(),
+				format!(
+					", {}, ({:.2}) Mib",
+					warp.phase,
+					(warp.total_bytes as f32) / (1024f32 * 1024f32)
+				),
+			),
+			(_, _, Some(state), _) => (
+				"⚙️ ",
+				"Downloading state".into(),
+				format!(
+					", {}%, ({:.2}) Mib",
+					state.percentage,
+					(state.size as f32) / (1024f32 * 1024f32)
 				),
-				(SyncState::Idle, _, _) => ("💤", "Idle".into(), "".into()),
-				(SyncState::Downloading, None, _) =>
-					("⚙️ ", format!("Preparing{}", speed), "".into()),
-				(SyncState::Downloading, Some(n), None) =>
-					("⚙️ ", format!("Syncing{}", speed), format!(", target=#{}", n)),
-			};
+			),
+			(SyncState::Idle, _, _, _) => ("💤", "Idle".into(), "".into()),
+			(SyncState::Downloading, None, _, _) =>
+				("⚙️ ", format!("Preparing{}", speed), "".into()),
+			(SyncState::Downloading, Some(n), None, _) =>
+				("⚙️ ", format!("Syncing{}", speed), format!(", target=#{}", n)),
+		};
 
 		if self.format.enable_color {
 			info!(
diff --git a/client/informant/src/lib.rs b/client/informant/src/lib.rs
index 6a91f583cd3d..c7c90a626a34 100644
--- a/client/informant/src/lib.rs
+++ b/client/informant/src/lib.rs
@@ -21,7 +21,7 @@
 use ansi_term::Colour;
 use futures::prelude::*;
 use futures_timer::Delay;
-use log::{info, trace, warn};
+use log::{debug, info, trace};
 use parity_util_mem::MallocSizeOf;
 use sc_client_api::{BlockchainEvents, UsageProvider};
 use sc_network::NetworkService;
@@ -143,7 +143,7 @@ where
 						ancestor.hash,
 					),
 					Ok(_) => {},
-					Err(e) => warn!("Error computing tree route: {}", e),
+					Err(e) => debug!("Error computing tree route: {}", e),
 				}
 			}
 		}
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index 9c6b580fb9c6..a24b8fe5310a 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -57,6 +57,7 @@ sc-consensus = { version = "0.10.0-dev", path = "../consensus/common" }
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
 sp-utils = { version = "4.0.0-dev", path = "../../primitives/utils" }
+sp-finality-grandpa = { version = "4.0.0-dev", path = "../../primitives/finality-grandpa" }
 thiserror = "1"
 unsigned-varint = { version = "0.6.0", features = ["futures", "asynchronous_codec"] }
 void = "1.0.2"
diff --git a/client/network/README.md b/client/network/README.md
index 914720f53e2a..c361bc9249f7 100644
--- a/client/network/README.md
+++ b/client/network/README.md
@@ -203,6 +203,69 @@ integer representing the role of the node:
 
 In the future, though, these restrictions will be removed.
 
+# Sync
+
+The crate implements a number of syncing algorithms. The main purpose of the syncing algorithm is
+get the chain to the latest state and keep it synced with the rest of the network by downloading and
+importing new data as soon as it becomes available. Once the node starts it catches up with the network
+with one of the initial sync methods listed below, and once it is completed uses a keep-up sync to
+download new blocks.
+
+## Full and light sync
+
+This is the default syncing method for the initial and keep-up sync. The algorithm starts with the
+current best block and downloads block data progressively from multiple peers if available. Once
+there's a sequence of blocks ready to be imported they are fed to the import queue. Full nodes download
+and execute full blocks, while light nodes only download and import headers. This continues until each peers
+has no more new blocks to give.
+
+For each peer the sync maintains the number of our common best block with that peer. This number is updates
+whenever peer announce new blocks or our best block advances. This allows to keep track of peers that have new
+block data and request new information as soon as it is announced. In keep-up mode, we also track peers that
+announce blocks on all branches and not just the best branch. The sync algorithm tries to be greedy and download
+All data that's announced.
+
+## Fast sync
+
+In this mode the initial downloads and verifies full header history. This allows to validate
+authority set transitions and arrive at a recent header. After header chain is verified and imported
+the node starts downloading a state snapshot using the state request protocol. Each `StateRequest`
+contains a starting storage key, which is empty for the first request.
+`StateResponse` contains a storage proof for a sequence of keys and values in the storage
+starting (but not including) from the key that is in the request. After iterating the proof trie against
+the storage root that is in the target header, the node issues The next `StateRequest` with set starting
+key set to the last key from the previous response. This continues until trie iteration reaches the end.
+The state is then imported into the database and the keep-up sync starts in normal full/light sync mode.
+
+## Warp sync
+
+This is similar to fast sync, but instead of downloading and verifying full header chain, the algorithm
+only downloads finalized authority set changes.
+
+### GRANDPA warp sync.
+
+GRANDPA keeps justifications for each finalized authority set change. Each change is signed by the
+authorities from the previous set. By downloading and verifying these signed hand-offs starting from genesis,
+we arrive at a recent header faster than downloading full header chain. Each `WarpSyncRequest` contains a block
+hash to a to start collecting proofs from. `WarpSyncResponse` contains a sequence of block headers and
+justifications. The proof downloader checks the justifications and continues requesting proofs from the last
+header hash, until it arrives at some recent header.
+
+Once the finality chain is proved for a header, the state matching the header is downloaded much like during
+the fast sync. The state is verified to match the header storage root. After the state is imported into the
+database it is queried for the information that allows GRANDPA and BABE to continue operating from that state.
+This includes BABE epoch information and GRANDPA authority set id.
+
+### Background block download.
+
+After the latest state has been imported the node is fully operational, but is still missing historic block
+data. I.e. it is unable to serve bock bodies and headers other than the most recent one. To make sure all
+nodes have block history available, a background sync process is started that downloads all the missing blocks.
+It is run in parallel with the keep-up sync and does not interfere with downloading of the recent blocks.
+During this download we also import GRANPA justifications for blocks with authority set changes, so that
+The warp-synced node has all the data to serve for other nodes nodes that might want to sync from it with
+any method.
+
 # Usage
 
 Using the `sc-network` crate is done through the [`NetworkWorker`] struct. Create this
diff --git a/client/network/src/behaviour.rs b/client/network/src/behaviour.rs
index 73d5ec357b2c..c181ee4e6339 100644
--- a/client/network/src/behaviour.rs
+++ b/client/network/src/behaviour.rs
@@ -26,6 +26,7 @@ use crate::{
 };
 
 use bytes::Bytes;
+use codec::Encode;
 use futures::{channel::oneshot, stream::StreamExt};
 use libp2p::{
 	core::{Multiaddr, PeerId, PublicKey},
@@ -87,6 +88,11 @@ pub struct Behaviour<B: BlockT> {
 	/// [`request_responses::RequestResponsesBehaviour`].
 	#[behaviour(ignore)]
 	state_request_protocol_name: String,
+
+	/// Protocol name used to send out warp sync requests via
+	/// [`request_responses::RequestResponsesBehaviour`].
+	#[behaviour(ignore)]
+	warp_sync_protocol_name: Option<String>,
 }
 
 /// Event generated by `Behaviour`.
@@ -195,6 +201,7 @@ impl<B: BlockT> Behaviour<B> {
 		disco_config: DiscoveryConfig,
 		block_request_protocol_config: request_responses::ProtocolConfig,
 		state_request_protocol_config: request_responses::ProtocolConfig,
+		warp_sync_protocol_config: Option<request_responses::ProtocolConfig>,
 		bitswap: Option<Bitswap<B>>,
 		light_client_request_protocol_config: request_responses::ProtocolConfig,
 		// All remaining request protocol configs.
@@ -203,9 +210,16 @@ impl<B: BlockT> Behaviour<B> {
 		// Extract protocol name and add to `request_response_protocols`.
 		let block_request_protocol_name = block_request_protocol_config.name.to_string();
 		let state_request_protocol_name = state_request_protocol_config.name.to_string();
+		let warp_sync_protocol_name = match warp_sync_protocol_config {
+			Some(config) => {
+				let name = config.name.to_string();
+				request_response_protocols.push(config);
+				Some(name)
+			},
+			None => None,
+		};
 		request_response_protocols.push(block_request_protocol_config);
 		request_response_protocols.push(state_request_protocol_config);
-
 		request_response_protocols.push(light_client_request_protocol_config);
 
 		Ok(Behaviour {
@@ -220,6 +234,7 @@ impl<B: BlockT> Behaviour<B> {
 			events: VecDeque::new(),
 			block_request_protocol_name,
 			state_request_protocol_name,
+			warp_sync_protocol_name,
 		})
 	}
 
@@ -368,6 +383,24 @@ impl<B: BlockT> NetworkBehaviourEventProcess<CustomMessageOutcome<B>> for Behavi
 					IfDisconnected::ImmediateError,
 				);
 			},
+			CustomMessageOutcome::WarpSyncRequest { target, request, pending_response } =>
+				match &self.warp_sync_protocol_name {
+					Some(name) => self.request_responses.send_request(
+						&target,
+						name,
+						request.encode(),
+						pending_response,
+						IfDisconnected::ImmediateError,
+					),
+					None => {
+						log::warn!(
+							target: "sync",
+							"Trying to send warp sync request when no protocol is configured {:?}",
+							request,
+						);
+						return
+					},
+				},
 			CustomMessageOutcome::NotificationStreamOpened {
 				remote,
 				protocol,
diff --git a/client/network/src/config.rs b/client/network/src/config.rs
index 2581a08d4246..dd60f329128f 100644
--- a/client/network/src/config.rs
+++ b/client/network/src/config.rs
@@ -27,6 +27,7 @@ pub use crate::{
 	request_responses::{
 		IncomingRequest, OutgoingResponse, ProtocolConfig as RequestResponseConfig,
 	},
+	warp_request_handler::WarpSyncProvider,
 };
 pub use libp2p::{build_multiaddr, core::PublicKey, identity, wasm_ext::ExtTransport};
 
@@ -137,6 +138,9 @@ pub struct Params<B: BlockT, H: ExHashT> {
 	/// [`crate::state_request_handler::StateRequestHandler::new`] allowing
 	/// both outgoing and incoming requests.
 	pub state_request_protocol_config: RequestResponseConfig,
+
+	/// Optional warp sync protocol support. Include protocol config and sync provider.
+	pub warp_sync: Option<(Arc<dyn WarpSyncProvider<B>>, RequestResponseConfig)>,
 }
 
 /// Role of the local node.
@@ -268,6 +272,7 @@ impl fmt::Debug for ProtocolId {
 /// assert_eq!(peer_id, "QmSk5HQbn6LhUwDiNMseVUjuRYhEtYj4aUZ6WfWoGURpdV".parse::<PeerId>().unwrap());
 /// assert_eq!(addr, "/ip4/198.51.100.19/tcp/30333".parse::<Multiaddr>().unwrap());
 /// ```
+///
 pub fn parse_str_addr(addr_str: &str) -> Result<(PeerId, Multiaddr), ParseErr> {
 	let addr: Multiaddr = addr_str.parse()?;
 	parse_addr(addr)
@@ -391,6 +396,8 @@ pub enum SyncMode {
 		/// Download indexed transactions for recent blocks.
 		storage_chain_mode: bool,
 	},
+	/// Warp sync - verify authority set transitions and the latest state.
+	Warp,
 }
 
 impl Default for SyncMode {
diff --git a/client/network/src/gossip/tests.rs b/client/network/src/gossip/tests.rs
index f4f96b863d62..88c4160bc506 100644
--- a/client/network/src/gossip/tests.rs
+++ b/client/network/src/gossip/tests.rs
@@ -53,10 +53,7 @@ fn build_test_full_node(network_config: config::NetworkConfiguration)
 	impl<B: BlockT> sc_consensus::Verifier<B> for PassThroughVerifier {
 		async fn verify(
 			&mut self,
-			origin: sp_consensus::BlockOrigin,
-			header: B::Header,
-			justifications: Option<sp_runtime::Justifications>,
-			body: Option<Vec<B::Extrinsic>>,
+			mut block: sp_consensus::BlockImportParams<B, ()>,
 		) -> Result<
 			(
 				sc_consensus::BlockImportParams<B, ()>,
@@ -64,7 +61,7 @@ fn build_test_full_node(network_config: config::NetworkConfiguration)
 			),
 			String,
 		> {
-			let maybe_keys = header
+			let maybe_keys = block.header
 				.digest()
 				.log(|l| {
 					l.try_as_raw(sp_runtime::generic::OpaqueDigestItemId::Consensus(b"aura"))
@@ -79,12 +76,9 @@ fn build_test_full_node(network_config: config::NetworkConfiguration)
 					)]
 				});
 
-			let mut import = sc_consensus::BlockImportParams::new(origin, header);
-			import.body = body;
-			import.finalized = self.0;
-			import.justifications = justifications;
-			import.fork_choice = Some(sc_consensus::ForkChoiceStrategy::LongestChain);
-			Ok((import, maybe_keys))
+			block.finalized = self.0;
+			block.fork_choice = Some(sc_consensus::ForkChoiceStrategy::LongestChain);
+			Ok((block, maybe_keys))
 		}
 	}
 
@@ -144,6 +138,7 @@ fn build_test_full_node(network_config: config::NetworkConfiguration)
 		block_request_protocol_config,
 		state_request_protocol_config,
 		light_client_request_protocol_config,
+		warp_sync: None,
 	})
 	.unwrap();
 
diff --git a/client/network/src/lib.rs b/client/network/src/lib.rs
index c812390ec6a6..633baaca47aa 100644
--- a/client/network/src/lib.rs
+++ b/client/network/src/lib.rs
@@ -243,6 +243,7 @@
 //! - Calling `trigger_repropagate` when a transaction is added to the pool.
 //!
 //! More precise usage details are still being worked on and will likely change in the future.
+//!
 
 mod behaviour;
 mod chain;
@@ -264,12 +265,13 @@ pub mod light_client_requests;
 pub mod network_state;
 pub mod state_request_handler;
 pub mod transactions;
+pub mod warp_request_handler;
 
 #[doc(inline)]
 pub use libp2p::{multiaddr, Multiaddr, PeerId};
 pub use protocol::{
 	event::{DhtEvent, Event, ObservedRole},
-	sync::{StateDownloadProgress, SyncState},
+	sync::{StateDownloadProgress, SyncState, WarpSyncPhase, WarpSyncProgress},
 	PeerInfo,
 };
 pub use service::{
@@ -326,4 +328,6 @@ pub struct NetworkStatus<B: BlockT> {
 	pub total_bytes_outbound: u64,
 	/// State sync in progress.
 	pub state_sync: Option<protocol::sync::StateDownloadProgress>,
+	/// Warp sync in progress.
+	pub warp_sync: Option<protocol::sync::WarpSyncProgress>,
 }
diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index 2af33cd1c5a1..a5675dbdc34d 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -18,11 +18,12 @@
 
 use crate::{
 	chain::Client,
-	config::{self, ProtocolId},
+	config::{self, ProtocolId, WarpSyncProvider},
 	error,
 	request_responses::RequestFailure,
 	schema::v1::StateResponse,
 	utils::{interval, LruHashSet},
+	warp_request_handler::EncodedProof,
 };
 
 use bytes::Bytes;
@@ -196,6 +197,7 @@ pub struct Protocol<B: BlockT> {
 enum PeerRequest<B: BlockT> {
 	Block(message::BlockRequest<B>),
 	State,
+	WarpProof,
 }
 
 /// Peer information
@@ -239,6 +241,7 @@ impl ProtocolConfig {
 				config::SyncMode::Full => sync::SyncMode::Full,
 				config::SyncMode::Fast { skip_proofs, storage_chain_mode } =>
 					sync::SyncMode::LightState { skip_proofs, storage_chain_mode },
+				config::SyncMode::Warp => sync::SyncMode::Warp,
 			}
 		}
 	}
@@ -293,6 +296,7 @@ impl<B: BlockT> Protocol<B> {
 		notifications_protocols_handshakes: Vec<Vec<u8>>,
 		block_announce_validator: Box<dyn BlockAnnounceValidator<B> + Send>,
 		metrics_registry: Option<&Registry>,
+		warp_sync_provider: Option<Arc<dyn WarpSyncProvider<B>>>,
 	) -> error::Result<(Protocol<B>, sc_peerset::PeersetHandle, Vec<(PeerId, Multiaddr)>)> {
 		let info = chain.info();
 		let sync = ChainSync::new(
@@ -300,6 +304,7 @@ impl<B: BlockT> Protocol<B> {
 			chain.clone(),
 			block_announce_validator,
 			config.max_parallel_downloads,
+			warp_sync_provider,
 		)
 		.map_err(Box::new)?;
 
@@ -724,6 +729,26 @@ impl<B: BlockT> Protocol<B> {
 		}
 	}
 
+	/// Must be called in response to a [`CustomMessageOutcome::WarpSyncRequest`] being emitted.
+	/// Must contain the same `PeerId` and request that have been emitted.
+	pub fn on_warp_sync_response(
+		&mut self,
+		peer_id: PeerId,
+		response: crate::warp_request_handler::EncodedProof,
+	) -> CustomMessageOutcome<B> {
+		match self.sync.on_warp_sync_data(&peer_id, response) {
+			Ok(sync::OnWarpSyncData::WarpProofRequest(peer, req)) =>
+				prepare_warp_sync_request::<B>(&mut self.peers, peer, req),
+			Ok(sync::OnWarpSyncData::StateRequest(peer, req)) =>
+				prepare_state_request::<B>(&mut self.peers, peer, req),
+			Err(sync::BadPeer(id, repu)) => {
+				self.behaviour.disconnect_peer(&id, HARDCODED_PEERSETS_SYNC);
+				self.peerset_handle.report_peer(id, repu);
+				CustomMessageOutcome::None
+			},
+		}
+	}
+
 	/// Perform time based maintenance.
 	///
 	/// > **Note**: This method normally doesn't have to be called except for testing purposes.
@@ -1248,6 +1273,19 @@ fn prepare_state_request<B: BlockT>(
 	CustomMessageOutcome::StateRequest { target: who, request, pending_response: tx }
 }
 
+fn prepare_warp_sync_request<B: BlockT>(
+	peers: &mut HashMap<PeerId, Peer<B>>,
+	who: PeerId,
+	request: crate::warp_request_handler::Request<B>,
+) -> CustomMessageOutcome<B> {
+	let (tx, rx) = oneshot::channel();
+
+	if let Some(ref mut peer) = peers.get_mut(&who) {
+		peer.request = Some((PeerRequest::WarpProof, rx));
+	}
+	CustomMessageOutcome::WarpSyncRequest { target: who, request, pending_response: tx }
+}
+
 /// Outcome of an incoming custom message.
 #[derive(Debug)]
 #[must_use]
@@ -1291,6 +1329,12 @@ pub enum CustomMessageOutcome<B: BlockT> {
 		request: crate::schema::v1::StateRequest,
 		pending_response: oneshot::Sender<Result<Vec<u8>, RequestFailure>>,
 	},
+	/// A new warp sync request must be emitted.
+	WarpSyncRequest {
+		target: PeerId,
+		request: crate::warp_request_handler::Request<B>,
+		pending_response: oneshot::Sender<Result<Vec<u8>, RequestFailure>>,
+	},
 	/// Peer has a reported a new head of chain.
 	PeerNewBest(PeerId, NumberFor<B>),
 	/// Now connected to a new peer for syncing purposes.
@@ -1364,6 +1408,7 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 		// Check for finished outgoing requests.
 		let mut finished_block_requests = Vec::new();
 		let mut finished_state_requests = Vec::new();
+		let mut finished_warp_sync_requests = Vec::new();
 		for (id, peer) in self.peers.iter_mut() {
 			if let Peer { request: Some((_, pending_response)), .. } = peer {
 				match pending_response.poll_unpin(cx) {
@@ -1412,6 +1457,9 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 
 								finished_state_requests.push((id.clone(), protobuf_response));
 							},
+							PeerRequest::WarpProof => {
+								finished_warp_sync_requests.push((id.clone(), resp));
+							},
 						}
 					},
 					Poll::Ready(Ok(Err(e))) => {
@@ -1474,6 +1522,10 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 			let ev = self.on_state_response(id, protobuf_response);
 			self.pending_messages.push_back(ev);
 		}
+		for (id, response) in finished_warp_sync_requests {
+			let ev = self.on_warp_sync_response(id, EncodedProof(response));
+			self.pending_messages.push_back(ev);
+		}
 
 		while let Poll::Ready(Some(())) = self.tick_timeout.poll_next_unpin(cx) {
 			self.tick();
@@ -1491,6 +1543,10 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 			let event = prepare_block_request(&mut self.peers, id, request);
 			self.pending_messages.push_back(event);
 		}
+		if let Some((id, request)) = self.sync.warp_sync_request() {
+			let event = prepare_warp_sync_request(&mut self.peers, id, request);
+			self.pending_messages.push_back(event);
+		}
 
 		// Check if there is any block announcement validation finished.
 		while let Poll::Ready(result) = self.sync.poll_block_announce_validation(cx) {
diff --git a/client/network/src/protocol/sync.rs b/client/network/src/protocol/sync.rs
index 8918d7adde09..e9bf14a623b6 100644
--- a/client/network/src/protocol/sync.rs
+++ b/client/network/src/protocol/sync.rs
@@ -27,6 +27,7 @@
 //! The `ChainSync` struct maintains the state of the block requests. Whenever something happens on
 //! the network, or whenever a block has been successfully verified, call the appropriate method in
 //! order to update it.
+//!
 
 use crate::{
 	protocol::message::{self, BlockAnnounce, BlockAttributes, BlockRequest, BlockResponse},
@@ -62,10 +63,12 @@ use std::{
 	pin::Pin,
 	sync::Arc,
 };
+use warp::{WarpProofRequest, WarpSync, WarpSyncProvider};
 
 mod blocks;
 mod extra_requests;
 mod state;
+mod warp;
 
 /// Maximum blocks to request in a single packet.
 const MAX_BLOCKS_TO_REQUEST: usize = 128;
@@ -101,6 +104,9 @@ const STATE_SYNC_FINALITY_THRESHOLD: u32 = 8;
 /// so far behind.
 const MAJOR_SYNC_BLOCKS: u8 = 5;
 
+/// Number of peers that need to be connected before warp sync is started.
+const MIN_PEERS_TO_START_WARP_SYNC: usize = 3;
+
 mod rep {
 	use sc_peerset::ReputationChange as Rep;
 	/// Reputation change when a peer sent us a message that led to a
@@ -217,6 +223,10 @@ pub struct ChainSync<B: BlockT> {
 	block_announce_validation_per_peer_stats: HashMap<PeerId, usize>,
 	/// State sync in progress, if any.
 	state_sync: Option<StateSync<B>>,
+	/// Warp sync in progress, if any.
+	warp_sync: Option<WarpSync<B>>,
+	/// Warp sync provider.
+	warp_sync_provider: Option<Arc<dyn WarpSyncProvider<B>>>,
 	/// Enable importing existing blocks. This is used used after the state download to
 	/// catch up to the latest state while re-importing blocks.
 	import_existing: bool,
@@ -290,6 +300,8 @@ pub enum PeerSyncState<B: BlockT> {
 	DownloadingJustification(B::Hash),
 	/// Downloading state.
 	DownloadingState,
+	/// Downloading warp proof.
+	DownloadingWarpProof,
 }
 
 impl<B: BlockT> PeerSyncState<B> {
@@ -316,6 +328,39 @@ pub struct StateDownloadProgress {
 	pub size: u64,
 }
 
+/// Reported warp sync phase.
+#[derive(Clone, Eq, PartialEq, Debug)]
+pub enum WarpSyncPhase {
+	/// Waiting for peers to connect.
+	AwaitingPeers,
+	/// Downloading and verifying grandpa warp proofs.
+	DownloadingWarpProofs,
+	/// Downloading state data.
+	DownloadingState,
+	/// Importing state.
+	ImportingState,
+}
+
+impl fmt::Display for WarpSyncPhase {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+		match self {
+			WarpSyncPhase::AwaitingPeers => write!(f, "Waiting for peers"),
+			WarpSyncPhase::DownloadingWarpProofs => write!(f, "Downloading finality proofs"),
+			WarpSyncPhase::DownloadingState => write!(f, "Downloading state"),
+			WarpSyncPhase::ImportingState => write!(f, "Importing state"),
+		}
+	}
+}
+
+/// Reported warp sync progress.
+#[derive(Clone, Eq, PartialEq, Debug)]
+pub struct WarpSyncProgress {
+	/// Estimated download percentage.
+	pub phase: WarpSyncPhase,
+	/// Total bytes downloaded so far.
+	pub total_bytes: u64,
+}
+
 /// Syncing status and statistics.
 #[derive(Clone)]
 pub struct Status<B: BlockT> {
@@ -329,6 +374,8 @@ pub struct Status<B: BlockT> {
 	pub queued_blocks: u32,
 	/// State sync status in progress, if any.
 	pub state_sync: Option<StateDownloadProgress>,
+	/// Warp sync in progress, if any.
+	pub warp_sync: Option<WarpSyncProgress>,
 }
 
 /// A peer did not behave as expected and should be reported.
@@ -373,6 +420,15 @@ pub enum OnStateData<B: BlockT> {
 	Request(PeerId, StateRequest),
 }
 
+/// Result of [`ChainSync::on_warp_sync_data`].
+#[derive(Debug)]
+pub enum OnWarpSyncData<B: BlockT> {
+	/// Warp proof request is issued.
+	WarpProofRequest(PeerId, warp::WarpProofRequest<B>),
+	/// A new state request needs to be made to the given peer.
+	StateRequest(PeerId, StateRequest),
+}
+
 /// Result of [`ChainSync::poll_block_announce_validation`].
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum PollBlockAnnounceValidation<H> {
@@ -460,6 +516,8 @@ pub enum SyncMode {
 	Full,
 	// Sync headers and the last finalied state
 	LightState { storage_chain_mode: bool, skip_proofs: bool },
+	// Warp sync mode.
+	Warp,
 }
 
 /// Result of [`ChainSync::has_slot_for_block_announce_validation`].
@@ -479,6 +537,7 @@ impl<B: BlockT> ChainSync<B> {
 		client: Arc<dyn crate::chain::Client<B>>,
 		block_announce_validator: Box<dyn BlockAnnounceValidator<B> + Send>,
 		max_parallel_downloads: u32,
+		warp_sync_provider: Option<Arc<dyn WarpSyncProvider<B>>>,
 	) -> Result<Self, ClientError> {
 		let mut sync = ChainSync {
 			client,
@@ -497,6 +556,8 @@ impl<B: BlockT> ChainSync<B> {
 			block_announce_validation: Default::default(),
 			block_announce_validation_per_peer_stats: Default::default(),
 			state_sync: None,
+			warp_sync: None,
+			warp_sync_provider,
 			import_existing: false,
 		};
 		sync.reset_sync_start_point()?;
@@ -508,7 +569,7 @@ impl<B: BlockT> ChainSync<B> {
 			SyncMode::Full =>
 				BlockAttributes::HEADER | BlockAttributes::JUSTIFICATION | BlockAttributes::BODY,
 			SyncMode::Light => BlockAttributes::HEADER | BlockAttributes::JUSTIFICATION,
-			SyncMode::LightState { storage_chain_mode: false, .. } =>
+			SyncMode::LightState { storage_chain_mode: false, .. } | SyncMode::Warp =>
 				BlockAttributes::HEADER | BlockAttributes::JUSTIFICATION | BlockAttributes::BODY,
 			SyncMode::LightState { storage_chain_mode: true, .. } =>
 				BlockAttributes::HEADER |
@@ -522,6 +583,7 @@ impl<B: BlockT> ChainSync<B> {
 			SyncMode::Full => false,
 			SyncMode::Light => true,
 			SyncMode::LightState { .. } => true,
+			SyncMode::Warp => true,
 		}
 	}
 
@@ -550,12 +612,20 @@ impl<B: BlockT> ChainSync<B> {
 			SyncState::Idle
 		};
 
+		let warp_sync_progress = match (&self.warp_sync, &self.mode) {
+			(None, SyncMode::Warp) =>
+				Some(WarpSyncProgress { phase: WarpSyncPhase::AwaitingPeers, total_bytes: 0 }),
+			(Some(sync), _) => Some(sync.progress()),
+			_ => None,
+		};
+
 		Status {
 			state: sync_state,
 			best_seen_block: best_seen,
 			num_peers: self.peers.len() as u32,
 			queued_blocks: self.queue_blocks.len() as u32,
 			state_sync: self.state_sync.as_ref().map(|s| s.progress()),
+			warp_sync: warp_sync_progress,
 		}
 	}
 
@@ -620,6 +690,17 @@ impl<B: BlockT> ChainSync<B> {
 					return Ok(None)
 				}
 
+				if let SyncMode::Warp = &self.mode {
+					if self.peers.len() >= MIN_PEERS_TO_START_WARP_SYNC && self.warp_sync.is_none()
+					{
+						log::debug!(target: "sync", "Starting warp state sync.");
+						if let Some(provider) = &self.warp_sync_provider {
+							self.warp_sync =
+								Some(WarpSync::new(self.client.clone(), provider.clone()));
+						}
+					}
+				}
+
 				// If we are at genesis, just start downloading.
 				let (state, req) = if self.best_queued_number.is_zero() {
 					debug!(
@@ -792,7 +873,8 @@ impl<B: BlockT> ChainSync<B> {
 
 	/// Get an iterator over all block requests of all peers.
 	pub fn block_requests(&mut self) -> impl Iterator<Item = (&PeerId, BlockRequest<B>)> + '_ {
-		if self.pending_requests.is_empty() || self.state_sync.is_some() {
+		if self.pending_requests.is_empty() || self.state_sync.is_some() || self.warp_sync.is_some()
+		{
 			return Either::Left(std::iter::empty())
 		}
 		if self.queue_blocks.len() > MAX_IMPORTING_BLOCKS {
@@ -876,16 +958,16 @@ impl<B: BlockT> ChainSync<B> {
 		Either::Right(iter)
 	}
 
-	/// Get a state request, if any
+	/// Get a state request, if any.
 	pub fn state_request(&mut self) -> Option<(PeerId, StateRequest)> {
+		if self.peers.iter().any(|(_, peer)| peer.state == PeerSyncState::DownloadingState) {
+			// Only one pending state request is allowed.
+			return None
+		}
 		if let Some(sync) = &self.state_sync {
 			if sync.is_complete() {
 				return None
 			}
-			if self.peers.iter().any(|(_, peer)| peer.state == PeerSyncState::DownloadingState) {
-				// Only one pending state request is allowed.
-				return None
-			}
 			for (id, peer) in self.peers.iter_mut() {
 				if peer.state.is_available() && peer.common_number >= sync.target_block_num() {
 					trace!(target: "sync", "New StateRequest for {}", id);
@@ -895,6 +977,55 @@ impl<B: BlockT> ChainSync<B> {
 				}
 			}
 		}
+		if let Some(sync) = &self.warp_sync {
+			if sync.is_complete() {
+				return None
+			}
+			if let (Some(request), Some(target)) =
+				(sync.next_state_request(), sync.target_block_number())
+			{
+				for (id, peer) in self.peers.iter_mut() {
+					if peer.state.is_available() && peer.best_number >= target {
+						trace!(target: "sync", "New StateRequest for {}", id);
+						peer.state = PeerSyncState::DownloadingState;
+						return Some((id.clone(), request))
+					}
+				}
+			}
+		}
+		None
+	}
+
+	/// Get a warp sync request, if any.
+	pub fn warp_sync_request(&mut self) -> Option<(PeerId, WarpProofRequest<B>)> {
+		if self
+			.peers
+			.iter()
+			.any(|(_, peer)| peer.state == PeerSyncState::DownloadingWarpProof)
+		{
+			// Only one pending state request is allowed.
+			return None
+		}
+		if let Some(sync) = &self.warp_sync {
+			if sync.is_complete() {
+				return None
+			}
+			if let Some(request) = sync.next_warp_poof_request() {
+				let mut targets: Vec<_> = self.peers.values().map(|p| p.best_number).collect();
+				if !targets.is_empty() {
+					targets.sort();
+					let median = targets[targets.len() / 2];
+					// Find a random peer that is synced as much as peer majority.
+					for (id, peer) in self.peers.iter_mut() {
+						if peer.state.is_available() && peer.best_number >= median {
+							trace!(target: "sync", "New WarpProofRequest for {}", id);
+							peer.state = PeerSyncState::DownloadingWarpProof;
+							return Some((id.clone(), request))
+						}
+					}
+				}
+			}
+		}
 		None
 	}
 
@@ -1055,7 +1186,8 @@ impl<B: BlockT> ChainSync<B> {
 					},
 					PeerSyncState::Available |
 					PeerSyncState::DownloadingJustification(..) |
-					PeerSyncState::DownloadingState => Vec::new(),
+					PeerSyncState::DownloadingState |
+					PeerSyncState::DownloadingWarpProof => Vec::new(),
 				}
 			} else {
 				// When request.is_none() this is a block announcement. Just accept blocks.
@@ -1105,6 +1237,15 @@ impl<B: BlockT> ChainSync<B> {
 				response.proof.len(),
 			);
 			sync.import(response)
+		} else if let Some(sync) = &mut self.warp_sync {
+			debug!(
+				target: "sync",
+				"Importing state data from {} with {} keys, {} proof nodes.",
+				who,
+				response.entries.len(),
+				response.proof.len(),
+			);
+			sync.import_state(response)
 		} else {
 			debug!(target: "sync", "Ignored obsolete state response from {}", who);
 			return Err(BadPeer(who.clone(), rep::NOT_REQUESTED))
@@ -1112,12 +1253,7 @@ impl<B: BlockT> ChainSync<B> {
 
 		match import_result {
 			state::ImportResult::Import(hash, header, state) => {
-				let origin = if self.status().state != SyncState::Downloading {
-					BlockOrigin::NetworkBroadcast
-				} else {
-					BlockOrigin::NetworkInitialSync
-				};
-
+				let origin = BlockOrigin::NetworkInitialSync;
 				let block = IncomingBlock {
 					hash,
 					header: Some(header),
@@ -1142,6 +1278,39 @@ impl<B: BlockT> ChainSync<B> {
 		}
 	}
 
+	/// Handle a response from the remote to a warp proof request that we made.
+	///
+	/// Returns next request.
+	pub fn on_warp_sync_data(
+		&mut self,
+		who: &PeerId,
+		response: warp::EncodedProof,
+	) -> Result<OnWarpSyncData<B>, BadPeer> {
+		let import_result = if let Some(sync) = &mut self.warp_sync {
+			debug!(
+				target: "sync",
+				"Importing warp proof data from {}, {} bytes.",
+				who,
+				response.0.len(),
+			);
+			sync.import_warp_proof(response)
+		} else {
+			debug!(target: "sync", "Ignored obsolete warp sync response from {}", who);
+			return Err(BadPeer(who.clone(), rep::NOT_REQUESTED))
+		};
+
+		match import_result {
+			warp::WarpProofImportResult::StateRequest(request) =>
+				Ok(OnWarpSyncData::StateRequest(who.clone(), request)),
+			warp::WarpProofImportResult::WarpProofRequest(request) =>
+				Ok(OnWarpSyncData::WarpProofRequest(who.clone(), request)),
+			warp::WarpProofImportResult::BadResponse => {
+				debug!(target: "sync", "Bad proof data received from {}", who);
+				Err(BadPeer(who.clone(), rep::BAD_BLOCK))
+			},
+		}
+	}
+
 	fn validate_and_queue_blocks(
 		&mut self,
 		mut new_blocks: Vec<IncomingBlock<B>>,
@@ -1308,6 +1477,20 @@ impl<B: BlockT> ChainSync<B> {
 						self.mode = SyncMode::Full;
 						output.extend(self.restart());
 					}
+					let warp_sync_complete = self
+						.warp_sync
+						.as_ref()
+						.map_or(false, |s| s.target_block_hash() == Some(hash));
+					if warp_sync_complete {
+						info!(
+							target: "sync",
+							"Warp sync is complete ({} MiB), restarting block sync.",
+							self.warp_sync.as_ref().map_or(0, |s| s.progress().total_bytes / (1024 * 1024)),
+						);
+						self.warp_sync = None;
+						self.mode = SyncMode::Full;
+						output.extend(self.restart());
+					}
 				},
 				Err(BlockImportError::IncompleteHeader(who)) =>
 					if let Some(peer) = who {
@@ -1349,6 +1532,7 @@ impl<B: BlockT> ChainSync<B> {
 				e @ Err(BlockImportError::UnknownParent) | e @ Err(BlockImportError::Other(_)) => {
 					warn!(target: "sync", "💔 Error importing block {:?}: {:?}", hash, e);
 					self.state_sync = None;
+					self.warp_sync = None;
 					output.extend(self.restart());
 				},
 				Err(BlockImportError::Cancelled) => {},
@@ -1828,6 +2012,13 @@ impl<B: BlockT> ChainSync<B> {
 			);
 			self.mode = SyncMode::Full;
 		}
+		if matches!(self.mode, SyncMode::Warp) && info.finalized_state.is_some() {
+			log::warn!(
+				target: "sync",
+				"Can't use warp sync mode with a partially synced database. Reverting to full sync mode."
+			);
+			self.mode = SyncMode::Full;
+		}
 		self.import_existing = false;
 		self.best_queued_hash = info.best_hash;
 		self.best_queued_number = info.best_number;
@@ -2253,7 +2444,8 @@ mod test {
 		let peer_id = PeerId::random();
 
 		let mut sync =
-			ChainSync::new(SyncMode::Full, client.clone(), block_announce_validator, 1).unwrap();
+			ChainSync::new(SyncMode::Full, client.clone(), block_announce_validator, 1, None)
+				.unwrap();
 
 		let (a1_hash, a1_number) = {
 			let a1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
@@ -2307,6 +2499,7 @@ mod test {
 			client.clone(),
 			Box::new(DefaultBlockAnnounceValidator),
 			1,
+			None,
 		)
 		.unwrap();
 
@@ -2470,6 +2663,7 @@ mod test {
 			client.clone(),
 			Box::new(DefaultBlockAnnounceValidator),
 			5,
+			None,
 		)
 		.unwrap();
 
@@ -2584,6 +2778,7 @@ mod test {
 			client.clone(),
 			Box::new(DefaultBlockAnnounceValidator),
 			5,
+			None,
 		)
 		.unwrap();
 
@@ -2707,6 +2902,7 @@ mod test {
 			client.clone(),
 			Box::new(DefaultBlockAnnounceValidator),
 			5,
+			None,
 		)
 		.unwrap();
 
@@ -2814,6 +3010,7 @@ mod test {
 			client.clone(),
 			Box::new(DefaultBlockAnnounceValidator),
 			1,
+			None,
 		)
 		.unwrap();
 
diff --git a/client/network/src/protocol/sync/warp.rs b/client/network/src/protocol/sync/warp.rs
new file mode 100644
index 000000000000..fae0e2f5452a
--- /dev/null
+++ b/client/network/src/protocol/sync/warp.rs
@@ -0,0 +1,181 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+///! Warp sync support.
+pub use super::state::ImportResult;
+use super::state::StateSync;
+pub use crate::warp_request_handler::{
+	EncodedProof, Request as WarpProofRequest, VerificationResult, WarpSyncProvider,
+};
+use crate::{
+	chain::Client,
+	schema::v1::{StateRequest, StateResponse},
+	WarpSyncPhase, WarpSyncProgress,
+};
+use sp_finality_grandpa::{AuthorityList, SetId};
+use sp_runtime::traits::{Block as BlockT, NumberFor, Zero};
+use std::sync::Arc;
+
+enum Phase<B: BlockT> {
+	WarpProof { set_id: SetId, authorities: AuthorityList, last_hash: B::Hash },
+	State(StateSync<B>),
+}
+
+/// Import warp proof result.
+pub enum WarpProofImportResult<B: BlockT> {
+	/// Start downloading state data.
+	StateRequest(StateRequest),
+	/// Continue dowloading warp sync proofs.
+	WarpProofRequest(WarpProofRequest<B>),
+	/// Bad proof.
+	BadResponse,
+}
+
+/// Warp sync state machine. Accumulates warp proofs and state.
+pub struct WarpSync<B: BlockT> {
+	phase: Phase<B>,
+	client: Arc<dyn Client<B>>,
+	warp_sync_provider: Arc<dyn WarpSyncProvider<B>>,
+	total_proof_bytes: u64,
+}
+
+impl<B: BlockT> WarpSync<B> {
+	///  Create a new instance.
+	pub fn new(
+		client: Arc<dyn Client<B>>,
+		warp_sync_provider: Arc<dyn WarpSyncProvider<B>>,
+	) -> Self {
+		let last_hash = client.hash(Zero::zero()).unwrap().expect("Genesis header always exists");
+		let phase = Phase::WarpProof {
+			set_id: 0,
+			authorities: warp_sync_provider.current_authorities(),
+			last_hash,
+		};
+		WarpSync { client, warp_sync_provider, phase, total_proof_bytes: 0 }
+	}
+
+	///  Validate and import a state reponse.
+	pub fn import_state(&mut self, response: StateResponse) -> ImportResult<B> {
+		match &mut self.phase {
+			Phase::WarpProof { .. } => {
+				log::debug!(target: "sync", "Unexpected state response");
+				return ImportResult::BadResponse
+			},
+			Phase::State(sync) => sync.import(response),
+		}
+	}
+
+	///  Validate and import a warp proof reponse.
+	pub fn import_warp_proof(&mut self, response: EncodedProof) -> WarpProofImportResult<B> {
+		match &mut self.phase {
+			Phase::State(_) => {
+				log::debug!(target: "sync", "Unexpected warp proof response");
+				WarpProofImportResult::BadResponse
+			},
+			Phase::WarpProof { set_id, authorities, last_hash } => {
+				match self.warp_sync_provider.verify(
+					&response,
+					*set_id,
+					std::mem::take(authorities),
+				) {
+					Err(e) => {
+						log::debug!(target: "sync", "Bad warp proof response: {:?}", e);
+						return WarpProofImportResult::BadResponse
+					},
+					Ok(VerificationResult::Partial(new_set_id, new_authorities, new_last_hash)) => {
+						log::debug!(target: "sync", "Verified partial proof, set_id={:?}", new_set_id);
+						*set_id = new_set_id;
+						*authorities = new_authorities;
+						*last_hash = new_last_hash.clone();
+						self.total_proof_bytes += response.0.len() as u64;
+						WarpProofImportResult::WarpProofRequest(WarpProofRequest {
+							begin: new_last_hash,
+						})
+					},
+					Ok(VerificationResult::Complete(new_set_id, _, header)) => {
+						log::debug!(target: "sync", "Verified complete proof, set_id={:?}", new_set_id);
+						self.total_proof_bytes += response.0.len() as u64;
+						let state_sync = StateSync::new(self.client.clone(), header, false);
+						let request = state_sync.next_request();
+						self.phase = Phase::State(state_sync);
+						WarpProofImportResult::StateRequest(request)
+					},
+				}
+			},
+		}
+	}
+
+	/// Produce next state request.
+	pub fn next_state_request(&self) -> Option<StateRequest> {
+		match &self.phase {
+			Phase::WarpProof { .. } => None,
+			Phase::State(sync) => Some(sync.next_request()),
+		}
+	}
+
+	/// Produce next warp proof request.
+	pub fn next_warp_poof_request(&self) -> Option<WarpProofRequest<B>> {
+		match &self.phase {
+			Phase::State(_) => None,
+			Phase::WarpProof { last_hash, .. } =>
+				Some(WarpProofRequest { begin: last_hash.clone() }),
+		}
+	}
+
+	/// Return target block hash if it is known.
+	pub fn target_block_hash(&self) -> Option<B::Hash> {
+		match &self.phase {
+			Phase::State(s) => Some(s.target()),
+			Phase::WarpProof { .. } => None,
+		}
+	}
+
+	/// Return target block number if it is known.
+	pub fn target_block_number(&self) -> Option<NumberFor<B>> {
+		match &self.phase {
+			Phase::State(s) => Some(s.target_block_num()),
+			Phase::WarpProof { .. } => None,
+		}
+	}
+
+	/// Check if the state is complete.
+	pub fn is_complete(&self) -> bool {
+		match &self.phase {
+			Phase::WarpProof { .. } => false,
+			Phase::State(sync) => sync.is_complete(),
+		}
+	}
+
+	/// Returns state sync estimated progress (percentage, bytes)
+	pub fn progress(&self) -> WarpSyncProgress {
+		match &self.phase {
+			Phase::WarpProof { .. } => WarpSyncProgress {
+				phase: WarpSyncPhase::DownloadingWarpProofs,
+				total_bytes: self.total_proof_bytes,
+			},
+			Phase::State(sync) => WarpSyncProgress {
+				phase: if self.is_complete() {
+					WarpSyncPhase::ImportingState
+				} else {
+					WarpSyncPhase::DownloadingState
+				},
+				total_bytes: self.total_proof_bytes + sync.progress().size,
+			},
+		}
+	}
+}
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 83cf2d675823..31d4488bc9aa 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -186,6 +186,12 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 		);
 
 		let default_notif_handshake_message = Roles::from(&params.role).encode();
+
+		let (warp_sync_provider, warp_sync_protocol_config) = match params.warp_sync {
+			Some((p, c)) => (Some(p), Some(c)),
+			None => (None, None),
+		};
+
 		let (protocol, peerset_handle, mut known_addresses) = Protocol::new(
 			protocol::ProtocolConfig {
 				roles: From::from(&params.role),
@@ -203,6 +209,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 				.collect(),
 			params.block_announce_validator,
 			params.metrics_registry.as_ref(),
+			warp_sync_provider,
 		)?;
 
 		// List of multiaddresses that we know in the network.
@@ -346,6 +353,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 					discovery_config,
 					params.block_request_protocol_config,
 					params.state_request_protocol_config,
+					warp_sync_protocol_config,
 					bitswap,
 					params.light_client_request_protocol_config,
 					params.network_config.request_response_protocols,
@@ -461,6 +469,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 			total_bytes_inbound: self.total_bytes_inbound(),
 			total_bytes_outbound: self.total_bytes_outbound(),
 			state_sync: status.state_sync,
+			warp_sync: status.warp_sync,
 		}
 	}
 
diff --git a/client/network/src/service/tests.rs b/client/network/src/service/tests.rs
index a149b09a22dd..8cad044636c2 100644
--- a/client/network/src/service/tests.rs
+++ b/client/network/src/service/tests.rs
@@ -50,10 +50,7 @@ fn build_test_full_node(
 	impl<B: BlockT> sc_consensus::Verifier<B> for PassThroughVerifier {
 		async fn verify(
 			&mut self,
-			origin: sp_consensus::BlockOrigin,
-			header: B::Header,
-			justifications: Option<sp_runtime::Justifications>,
-			body: Option<Vec<B::Extrinsic>>,
+			mut block: sc_consensus::BlockImportParams<B, ()>,
 		) -> Result<
 			(
 				sc_consensus::BlockImportParams<B, ()>,
@@ -61,7 +58,8 @@ fn build_test_full_node(
 			),
 			String,
 		> {
-			let maybe_keys = header
+			let maybe_keys = block
+				.header
 				.digest()
 				.log(|l| {
 					l.try_as_raw(sp_runtime::generic::OpaqueDigestItemId::Consensus(b"aura"))
@@ -75,12 +73,9 @@ fn build_test_full_node(
 					vec![(sp_blockchain::well_known_cache_keys::AUTHORITIES, blob.to_vec())]
 				});
 
-			let mut import = sc_consensus::BlockImportParams::new(origin, header);
-			import.body = body;
-			import.finalized = self.0;
-			import.justifications = justifications;
-			import.fork_choice = Some(sc_consensus::ForkChoiceStrategy::LongestChain);
-			Ok((import, maybe_keys))
+			block.finalized = self.0;
+			block.fork_choice = Some(sc_consensus::ForkChoiceStrategy::LongestChain);
+			Ok((block, maybe_keys))
 		}
 	}
 
@@ -132,6 +127,7 @@ fn build_test_full_node(
 		block_request_protocol_config,
 		state_request_protocol_config,
 		light_client_request_protocol_config,
+		warp_sync: None,
 	})
 	.unwrap();
 
diff --git a/client/finality-grandpa-warp-sync/src/lib.rs b/client/network/src/warp_request_handler.rs
similarity index 51%
rename from client/finality-grandpa-warp-sync/src/lib.rs
rename to client/network/src/warp_request_handler.rs
index c74c4d15f9f4..beb9d1ce528a 100644
--- a/client/finality-grandpa-warp-sync/src/lib.rs
+++ b/client/network/src/warp_request_handler.rs
@@ -16,58 +16,61 @@
 
 //! Helper for handling (i.e. answering) grandpa warp sync requests from a remote peer.
 
+use crate::config::{IncomingRequest, OutgoingResponse, ProtocolId, RequestResponseConfig};
 use codec::{Decode, Encode};
 use futures::{
 	channel::{mpsc, oneshot},
 	stream::StreamExt,
 };
 use log::debug;
-use sc_client_api::Backend;
-use sc_finality_grandpa::SharedAuthoritySet;
-use sc_network::config::{IncomingRequest, OutgoingResponse, ProtocolId, RequestResponseConfig};
-use sc_service::{
-	config::{Configuration, Role},
-	SpawnTaskHandle,
-};
-use sp_runtime::traits::{Block as BlockT, NumberFor};
+use sp_finality_grandpa::{AuthorityList, SetId};
+use sp_runtime::traits::Block as BlockT;
 use std::{sync::Arc, time::Duration};
 
-mod proof;
-
-pub use proof::{WarpSyncFragment, WarpSyncProof};
-
-/// Generates the appropriate [`RequestResponseConfig`] for a given chain configuration.
-pub fn request_response_config_for_chain<TBlock: BlockT, TBackend: Backend<TBlock> + 'static>(
-	config: &Configuration,
-	spawn_handle: SpawnTaskHandle,
-	backend: Arc<TBackend>,
-	authority_set: SharedAuthoritySet<TBlock::Hash, NumberFor<TBlock>>,
-) -> RequestResponseConfig
-where
-	NumberFor<TBlock>: sc_finality_grandpa::BlockNumberOps,
-{
-	let protocol_id = config.protocol_id();
-
-	if matches!(config.role, Role::Light) {
-		// Allow outgoing requests but deny incoming requests.
-		generate_request_response_config(protocol_id.clone())
-	} else {
-		// Allow both outgoing and incoming requests.
-		let (handler, request_response_config) =
-			GrandpaWarpSyncRequestHandler::new(protocol_id.clone(), backend.clone(), authority_set);
-		spawn_handle.spawn("grandpa-warp-sync", handler.run());
-		request_response_config
-	}
+/// Scale-encoded warp sync proof response.
+pub struct EncodedProof(pub Vec<u8>);
+
+/// Warp sync request
+#[derive(Encode, Decode, Debug)]
+pub struct Request<B: BlockT> {
+	/// Start collecting proofs from this block.
+	pub begin: B::Hash,
+}
+
+const MAX_RESPONSE_SIZE: u64 = 16 * 1024 * 1024;
+
+/// Proof verification result.
+pub enum VerificationResult<Block: BlockT> {
+	/// Proof is valid, but the target was not reached.
+	Partial(SetId, AuthorityList, Block::Hash),
+	/// Target finality is proved.
+	Complete(SetId, AuthorityList, Block::Header),
 }
 
-const LOG_TARGET: &str = "finality-grandpa-warp-sync-request-handler";
+/// Warp sync backend. Handles retrieveing and verifying warp sync proofs.
+pub trait WarpSyncProvider<B: BlockT>: Send + Sync {
+	/// Generate proof starting at given block hash. The proof is accumulated until maximum proof size is reached.
+	fn generate(
+		&self,
+		start: B::Hash,
+	) -> Result<EncodedProof, Box<dyn std::error::Error + Send + Sync>>;
+	/// Verify warp proof agains current set of authorities.
+	fn verify(
+		&self,
+		proof: &EncodedProof,
+		set_id: SetId,
+		authorities: AuthorityList,
+	) -> Result<VerificationResult<B>, Box<dyn std::error::Error + Send + Sync>>;
+	/// Get current list of authorities. This is supposed to be genesis authorities when starting sync.
+	fn current_authorities(&self) -> AuthorityList;
+}
 
 /// Generates a [`RequestResponseConfig`] for the grandpa warp sync request protocol, refusing incoming requests.
 pub fn generate_request_response_config(protocol_id: ProtocolId) -> RequestResponseConfig {
 	RequestResponseConfig {
 		name: generate_protocol_name(protocol_id).into(),
 		max_request_size: 32,
-		max_response_size: proof::MAX_WARP_SYNC_PROOF_SIZE as u64,
+		max_response_size: MAX_RESPONSE_SIZE,
 		request_timeout: Duration::from_secs(10),
 		inbound_queue: None,
 	}
@@ -82,76 +85,59 @@ fn generate_protocol_name(protocol_id: ProtocolId) -> String {
 	s
 }
 
-#[derive(Decode)]
-struct Request<B: BlockT> {
-	begin: B::Hash,
-}
-
 /// Handler for incoming grandpa warp sync requests from a remote peer.
-pub struct GrandpaWarpSyncRequestHandler<TBackend, TBlock: BlockT> {
-	backend: Arc<TBackend>,
-	authority_set: SharedAuthoritySet<TBlock::Hash, NumberFor<TBlock>>,
+pub struct RequestHandler<TBlock: BlockT> {
+	backend: Arc<dyn WarpSyncProvider<TBlock>>,
 	request_receiver: mpsc::Receiver<IncomingRequest>,
-	_phantom: std::marker::PhantomData<TBlock>,
 }
 
-impl<TBlock: BlockT, TBackend: Backend<TBlock>> GrandpaWarpSyncRequestHandler<TBackend, TBlock> {
-	/// Create a new [`GrandpaWarpSyncRequestHandler`].
+impl<TBlock: BlockT> RequestHandler<TBlock> {
+	/// Create a new [`RequestHandler`].
 	pub fn new(
 		protocol_id: ProtocolId,
-		backend: Arc<TBackend>,
-		authority_set: SharedAuthoritySet<TBlock::Hash, NumberFor<TBlock>>,
+		backend: Arc<dyn WarpSyncProvider<TBlock>>,
 	) -> (Self, RequestResponseConfig) {
 		let (tx, request_receiver) = mpsc::channel(20);
 
 		let mut request_response_config = generate_request_response_config(protocol_id);
 		request_response_config.inbound_queue = Some(tx);
 
-		(
-			Self { backend, request_receiver, _phantom: std::marker::PhantomData, authority_set },
-			request_response_config,
-		)
+		(Self { backend, request_receiver }, request_response_config)
 	}
 
 	fn handle_request(
 		&self,
 		payload: Vec<u8>,
 		pending_response: oneshot::Sender<OutgoingResponse>,
-	) -> Result<(), HandleRequestError>
-	where
-		NumberFor<TBlock>: sc_finality_grandpa::BlockNumberOps,
-	{
+	) -> Result<(), HandleRequestError> {
 		let request = Request::<TBlock>::decode(&mut &payload[..])?;
 
-		let proof = WarpSyncProof::generate(
-			&*self.backend,
-			request.begin,
-			&self.authority_set.authority_set_changes(),
-		)?;
+		let EncodedProof(proof) = self
+			.backend
+			.generate(request.begin)
+			.map_err(HandleRequestError::InvalidRequest)?;
 
 		pending_response
 			.send(OutgoingResponse {
-				result: Ok(proof.encode()),
+				result: Ok(proof),
 				reputation_changes: Vec::new(),
 				sent_feedback: None,
 			})
 			.map_err(|_| HandleRequestError::SendResponse)
 	}
 
-	/// Run [`GrandpaWarpSyncRequestHandler`].
-	pub async fn run(mut self)
-	where
-		NumberFor<TBlock>: sc_finality_grandpa::BlockNumberOps,
-	{
+	/// Run [`RequestHandler`].
+	pub async fn run(mut self) {
 		while let Some(request) = self.request_receiver.next().await {
 			let IncomingRequest { peer, payload, pending_response } = request;
 
 			match self.handle_request(payload, pending_response) {
 				Ok(()) =>
-					debug!(target: LOG_TARGET, "Handled grandpa warp sync request from {}.", peer),
+					debug!(target: "sync", "Handled grandpa warp sync request from {}.", peer),
 				Err(e) => debug!(
-					target: LOG_TARGET,
-					"Failed to handle grandpa warp sync request from {}: {}", peer, e,
+					target: "sync",
+					"Failed to handle grandpa warp sync request from {}: {}",
+					peer, e,
 				),
 			}
 		}
@@ -159,7 +145,7 @@ impl<TBlock: BlockT, TBackend: Backend<TBlock>> GrandpaWarpSyncRequestHandler<TB
 }
 
 #[derive(Debug, derive_more::Display, derive_more::From)]
-pub enum HandleRequestError {
+enum HandleRequestError {
 	#[display(fmt = "Failed to decode request: {}.", _0)]
 	DecodeProto(prost::DecodeError),
 	#[display(fmt = "Failed to encode response: {}.", _0)]
@@ -168,11 +154,8 @@ pub enum HandleRequestError {
 	DecodeScale(codec::Error),
 	Client(sp_blockchain::Error),
 	#[from(ignore)]
-	InvalidRequest(String),
-	#[from(ignore)]
-	InvalidProof(String),
+	#[display(fmt = "Invalid request {}.", _0)]
+	InvalidRequest(Box<dyn std::error::Error + Send + Sync>),
 	#[display(fmt = "Failed to send response.")]
 	SendResponse,
-	#[display(fmt = "Missing required data to be able to answer request.")]
-	MissingData,
 }
diff --git a/client/network/test/src/lib.rs b/client/network/test/src/lib.rs
index 553353d77ac3..7668aa8fd56e 100644
--- a/client/network/test/src/lib.rs
+++ b/client/network/test/src/lib.rs
@@ -108,25 +108,19 @@ impl PassThroughVerifier {
 impl<B: BlockT> Verifier<B> for PassThroughVerifier {
 	async fn verify(
 		&mut self,
-		origin: BlockOrigin,
-		header: B::Header,
-		justifications: Option<Justifications>,
-		body: Option<Vec<B::Extrinsic>>,
+		mut block: BlockImportParams<B, ()>,
 	) -> Result<(BlockImportParams<B, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String> {
-		let maybe_keys = header
+		let maybe_keys = block
+			.header
 			.digest()
 			.log(|l| {
 				l.try_as_raw(OpaqueDigestItemId::Consensus(b"aura"))
 					.or_else(|| l.try_as_raw(OpaqueDigestItemId::Consensus(b"babe")))
 			})
 			.map(|blob| vec![(well_known_cache_keys::AUTHORITIES, blob.to_vec())]);
-		let mut import = BlockImportParams::new(origin, header);
-		import.body = body;
-		import.finalized = self.finalized;
-		import.justifications = justifications;
-		import.fork_choice = Some(self.fork_choice.clone());
-
-		Ok((import, maybe_keys))
+		block.finalized = self.finalized;
+		block.fork_choice = Some(self.fork_choice.clone());
+		Ok((block, maybe_keys))
 	}
 }
 
@@ -389,13 +383,10 @@ where
 				block.header.parent_hash,
 			);
 			let header = block.header.clone();
-			let (import_block, cache) = futures::executor::block_on(self.verifier.verify(
-				origin,
-				header.clone(),
-				None,
-				if headers_only { None } else { Some(block.extrinsics) },
-			))
-			.unwrap();
+			let mut import_block = BlockImportParams::new(origin, header.clone());
+			import_block.body = if headers_only { None } else { Some(block.extrinsics) };
+			let (import_block, cache) =
+				futures::executor::block_on(self.verifier.verify(import_block)).unwrap();
 			let cache = if let Some(cache) = cache {
 				cache.into_iter().collect()
 			} else {
@@ -631,21 +622,13 @@ struct VerifierAdapter<B: BlockT> {
 impl<B: BlockT> Verifier<B> for VerifierAdapter<B> {
 	async fn verify(
 		&mut self,
-		origin: BlockOrigin,
-		header: B::Header,
-		justifications: Option<Justifications>,
-		body: Option<Vec<B::Extrinsic>>,
+		block: BlockImportParams<B, ()>,
 	) -> Result<(BlockImportParams<B, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String> {
-		let hash = header.hash();
-		self.verifier
-			.lock()
-			.await
-			.verify(origin, header, justifications, body)
-			.await
-			.map_err(|e| {
-				self.failed_verifications.lock().insert(hash, e.clone());
-				e
-			})
+		let hash = block.header.hash();
+		self.verifier.lock().await.verify(block).await.map_err(|e| {
+			self.failed_verifications.lock().insert(hash, e.clone());
+			e
+		})
 	}
 }
 
@@ -850,6 +833,7 @@ where
 			block_request_protocol_config,
 			state_request_protocol_config,
 			light_client_request_protocol_config,
+			warp_sync: None,
 		})
 		.unwrap();
 
@@ -939,6 +923,7 @@ where
 			block_request_protocol_config,
 			state_request_protocol_config,
 			light_client_request_protocol_config,
+			warp_sync: None,
 		})
 		.unwrap();
 
diff --git a/client/rpc/src/state/tests.rs b/client/rpc/src/state/tests.rs
index 3990d6ea8ad3..6754a68296a6 100644
--- a/client/rpc/src/state/tests.rs
+++ b/client/rpc/src/state/tests.rs
@@ -343,7 +343,10 @@ fn should_query_storage() {
 			Err(Error::InvalidBlockRange {
 				from: format!("{:?}", genesis_hash),
 				to: format!("{:?}", Some(random_hash1)),
-				details: format!("UnknownBlock: header not found in db: {}", random_hash1),
+				details: format!(
+					"UnknownBlock: Header was not found in the database: {:?}",
+					random_hash1
+				),
 			})
 			.map_err(|e| e.to_string())
 		);
@@ -356,7 +359,10 @@ fn should_query_storage() {
 			Err(Error::InvalidBlockRange {
 				from: format!("{:?}", random_hash1),
 				to: format!("{:?}", Some(genesis_hash)),
-				details: format!("UnknownBlock: header not found in db: {}", random_hash1),
+				details: format!(
+					"UnknownBlock: Header was not found in the database: {:?}",
+					random_hash1
+				),
 			})
 			.map_err(|e| e.to_string()),
 		);
@@ -369,7 +375,10 @@ fn should_query_storage() {
 			Err(Error::InvalidBlockRange {
 				from: format!("{:?}", random_hash1),
 				to: format!("{:?}", Some(block2_hash)), // Best block hash.
-				details: format!("UnknownBlock: header not found in db: {}", random_hash1),
+				details: format!(
+					"UnknownBlock: Header was not found in the database: {:?}",
+					random_hash1
+				),
 			})
 			.map_err(|e| e.to_string()),
 		);
@@ -382,7 +391,10 @@ fn should_query_storage() {
 			Err(Error::InvalidBlockRange {
 				from: format!("{:?}", random_hash1), // First hash not found.
 				to: format!("{:?}", Some(random_hash2)),
-				details: format!("UnknownBlock: header not found in db: {}", random_hash1),
+				details: format!(
+					"UnknownBlock: Header was not found in the database: {:?}",
+					random_hash1
+				),
 			})
 			.map_err(|e| e.to_string()),
 		);
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index 1f54850059fb..fb24a890133c 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -44,6 +44,7 @@ use sc_network::{
 	config::{OnDemand, Role, SyncMode},
 	light_client_requests::{self, handler::LightClientRequestHandler},
 	state_request_handler::{self, StateRequestHandler},
+	warp_request_handler::{self, RequestHandler as WarpSyncRequestHandler, WarpSyncProvider},
 	NetworkService,
 };
 use sc_telemetry::{telemetry, ConnectionMessage, Telemetry, TelemetryHandle, SUBSTRATE_INFO};
@@ -354,7 +355,7 @@ where
 				wasm_runtime_overrides: config.wasm_runtime_overrides.clone(),
 				no_genesis: matches!(
 					config.network.sync_mode,
-					sc_network::config::SyncMode::Fast { .. }
+					sc_network::config::SyncMode::Fast { .. } | sc_network::config::SyncMode::Warp
 				),
 				wasm_runtime_substitutes,
 			},
@@ -843,6 +844,8 @@ pub struct BuildNetworkParams<'a, TBl: BlockT, TExPool, TImpQu, TCl> {
 	/// A block announce validator builder.
 	pub block_announce_validator_builder:
 		Option<Box<dyn FnOnce(Arc<TCl>) -> Box<dyn BlockAnnounceValidator<TBl> + Send> + Send>>,
+	/// An optional warp sync provider.
+	pub warp_sync: Option<Arc<dyn WarpSyncProvider<TBl>>>,
 }
 
 /// Build the network service, the network status sinks and an RPC sender.
@@ -878,6 +881,7 @@ where
 		import_queue,
 		on_demand,
 		block_announce_validator_builder,
+		warp_sync,
 	} = params;
 
 	let transaction_pool_adapter = Arc::new(TransactionPoolAdapter {
@@ -928,6 +932,20 @@ where
 		}
 	};
 
+	let warp_sync_params = warp_sync.map(|provider| {
+		let protocol_config = if matches!(config.role, Role::Light) {
+			// Allow outgoing requests but deny incoming requests.
+			warp_request_handler::generate_request_response_config(protocol_id.clone())
+		} else {
+			// Allow both outgoing and incoming requests.
+			let (handler, protocol_config) =
+				WarpSyncRequestHandler::new(protocol_id.clone(), provider.clone());
+			spawn_handle.spawn("warp_sync_request_handler", handler.run());
+			protocol_config
+		};
+		(provider, protocol_config)
+	});
+
 	let light_client_request_protocol_config = {
 		if matches!(config.role, Role::Light) {
 			// Allow outgoing requests but deny incoming requests.
@@ -965,6 +983,7 @@ where
 		metrics_registry: config.prometheus_config.as_ref().map(|config| config.registry.clone()),
 		block_request_protocol_config,
 		state_request_protocol_config,
+		warp_sync: warp_sync_params,
 		light_client_request_protocol_config,
 	};
 
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index 553584b15c02..01688f0c8e70 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -769,6 +769,8 @@ where
 	{
 		let parent_hash = import_headers.post().parent_hash().clone();
 		let status = self.backend.blockchain().status(BlockId::Hash(hash))?;
+		let parent_exists = self.backend.blockchain().status(BlockId::Hash(parent_hash))? ==
+			blockchain::BlockStatus::InChain;
 		match (import_existing, status) {
 			(false, blockchain::BlockStatus::InChain) => return Ok(ImportResult::AlreadyInChain),
 			(false, blockchain::BlockStatus::Unknown) => {},
@@ -815,7 +817,6 @@ where
 						if let Some(changes_trie_transaction) = changes_trie_tx {
 							operation.op.update_changes_trie(changes_trie_transaction)?;
 						}
-
 						Some((main_sc, child_sc))
 					},
 					sc_consensus::StorageChanges::Import(changes) => {
@@ -834,10 +835,10 @@ where
 						None
 					},
 				};
-
-				// ensure parent block is finalized to maintain invariant that
-				// finality is called sequentially.
-				if finalized {
+				// Ensure parent chain is finalized to maintain invariant that
+				// finality is called sequentially. This will also send finality
+				// notifications for top 250 newly finalized blocks.
+				if finalized && parent_exists {
 					self.apply_finality_with_block_hash(
 						operation,
 						parent_hash,
@@ -868,7 +869,7 @@ where
 			NewBlockState::Normal
 		};
 
-		let tree_route = if is_new_best && info.best_hash != parent_hash {
+		let tree_route = if is_new_best && info.best_hash != parent_hash && parent_exists {
 			let route_from_best =
 				sp_blockchain::tree_route(self.backend.blockchain(), info.best_hash, parent_hash)?;
 			Some(route_from_best)
@@ -932,21 +933,21 @@ where
 		let at = BlockId::Hash(*parent_hash);
 		let state_action = std::mem::replace(&mut import_block.state_action, StateAction::Skip);
 		let (enact_state, storage_changes) = match (self.block_status(&at)?, state_action) {
-			(BlockStatus::Unknown, _) =>
-				return Ok(PrepareStorageChangesResult::Discard(ImportResult::UnknownParent)),
 			(BlockStatus::KnownBad, _) =>
 				return Ok(PrepareStorageChangesResult::Discard(ImportResult::KnownBad)),
-			(_, StateAction::Skip) => (false, None),
 			(
 				BlockStatus::InChainPruned,
 				StateAction::ApplyChanges(sc_consensus::StorageChanges::Changes(_)),
 			) => return Ok(PrepareStorageChangesResult::Discard(ImportResult::MissingState)),
+			(_, StateAction::ApplyChanges(changes)) => (true, Some(changes)),
+			(BlockStatus::Unknown, _) =>
+				return Ok(PrepareStorageChangesResult::Discard(ImportResult::UnknownParent)),
+			(_, StateAction::Skip) => (false, None),
 			(BlockStatus::InChainPruned, StateAction::Execute) =>
 				return Ok(PrepareStorageChangesResult::Discard(ImportResult::MissingState)),
 			(BlockStatus::InChainPruned, StateAction::ExecuteIfPossible) => (false, None),
 			(_, StateAction::Execute) => (true, None),
 			(_, StateAction::ExecuteIfPossible) => (true, None),
-			(_, StateAction::ApplyChanges(changes)) => (true, Some(changes)),
 		};
 
 		let storage_changes = match (enact_state, storage_changes, &import_block.body) {
@@ -1912,8 +1913,14 @@ where
 		&mut self,
 		block: BlockCheckParams<Block>,
 	) -> Result<ImportResult, Self::Error> {
-		let BlockCheckParams { hash, number, parent_hash, allow_missing_state, import_existing } =
-			block;
+		let BlockCheckParams {
+			hash,
+			number,
+			parent_hash,
+			allow_missing_state,
+			import_existing,
+			allow_missing_parent,
+		} = block;
 
 		// Check the block against white and black lists if any are defined
 		// (i.e. fork blocks and bad blocks respectively)
@@ -1955,6 +1962,7 @@ where
 			.map_err(|e| ConsensusError::ClientImport(e.to_string()))?
 		{
 			BlockStatus::InChainWithState | BlockStatus::Queued => {},
+			BlockStatus::Unknown if allow_missing_parent => {},
 			BlockStatus::Unknown => return Ok(ImportResult::UnknownParent),
 			BlockStatus::InChainPruned if allow_missing_state => {},
 			BlockStatus::InChainPruned => return Ok(ImportResult::MissingState),
diff --git a/client/service/test/src/client/mod.rs b/client/service/test/src/client/mod.rs
index dd0a33b7e858..6ac149677bc1 100644
--- a/client/service/test/src/client/mod.rs
+++ b/client/service/test/src/client/mod.rs
@@ -1209,6 +1209,7 @@ fn import_with_justification() {
 		.unwrap()
 		.block;
 	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
+	client.finalize_block(BlockId::hash(a2.hash()), None).unwrap();
 
 	// A2 -> A3
 	let justification = Justifications::from((TEST_ENGINE_ID, vec![1, 2, 3]));
@@ -1555,6 +1556,7 @@ fn respects_block_rules() {
 			number: 0,
 			parent_hash: block_ok.header().parent_hash().clone(),
 			allow_missing_state: false,
+			allow_missing_parent: false,
 			import_existing: false,
 		};
 		assert_eq!(block_on(client.check_block(params)).unwrap(), ImportResult::imported(false));
@@ -1570,6 +1572,7 @@ fn respects_block_rules() {
 			number: 0,
 			parent_hash: block_not_ok.header().parent_hash().clone(),
 			allow_missing_state: false,
+			allow_missing_parent: false,
 			import_existing: false,
 		};
 		if record_only {
@@ -1592,6 +1595,7 @@ fn respects_block_rules() {
 			number: 1,
 			parent_hash: block_ok.header().parent_hash().clone(),
 			allow_missing_state: false,
+			allow_missing_parent: false,
 			import_existing: false,
 		};
 		if record_only {
@@ -1610,6 +1614,7 @@ fn respects_block_rules() {
 			number: 1,
 			parent_hash: block_not_ok.header().parent_hash().clone(),
 			allow_missing_state: false,
+			allow_missing_parent: false,
 			import_existing: false,
 		};
 
@@ -1676,6 +1681,7 @@ fn returns_status_for_pruned_blocks() {
 		number: 0,
 		parent_hash: a1.header().parent_hash().clone(),
 		allow_missing_state: false,
+		allow_missing_parent: false,
 		import_existing: false,
 	};
 
@@ -1712,6 +1718,7 @@ fn returns_status_for_pruned_blocks() {
 		number: 1,
 		parent_hash: a1.header().parent_hash().clone(),
 		allow_missing_state: false,
+		allow_missing_parent: false,
 		import_existing: false,
 	};
 
@@ -1745,6 +1752,7 @@ fn returns_status_for_pruned_blocks() {
 		number: 2,
 		parent_hash: a2.header().parent_hash().clone(),
 		allow_missing_state: false,
+		allow_missing_parent: false,
 		import_existing: false,
 	};
 
@@ -1779,6 +1787,7 @@ fn returns_status_for_pruned_blocks() {
 		number: 0,
 		parent_hash: b1.header().parent_hash().clone(),
 		allow_missing_state: false,
+		allow_missing_parent: false,
 		import_existing: false,
 	};
 	assert_eq!(
diff --git a/primitives/finality-grandpa/src/lib.rs b/primitives/finality-grandpa/src/lib.rs
index a083796d659c..353a3cd07822 100644
--- a/primitives/finality-grandpa/src/lib.rs
+++ b/primitives/finality-grandpa/src/lib.rs
@@ -492,7 +492,7 @@ sp_api::decl_runtime_apis! {
 	/// applied in the runtime after those N blocks have passed.
 	///
 	/// The consensus protocol will coordinate the handoff externally.
-	#[api_version(2)]
+	#[api_version(3)]
 	pub trait GrandpaApi {
 		/// Get the current GRANDPA authorities and weights. This should not change except
 		/// for when changes are scheduled and the corresponding delay has passed.
@@ -530,5 +530,8 @@ sp_api::decl_runtime_apis! {
 			set_id: SetId,
 			authority_id: AuthorityId,
 		) -> Option<OpaqueKeyOwnershipProof>;
+
+		/// Get current GRANDPA authority set id.
+		fn current_set_id() -> SetId;
 	}
 }
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index bdf45ceae88b..a148ce5cb75a 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -883,6 +883,10 @@ cfg_if! {
 					Vec::new()
 				}
 
+				fn current_set_id() -> sp_finality_grandpa::SetId {
+					0
+				}
+
 				fn submit_report_equivocation_unsigned_extrinsic(
 					_equivocation_proof: sp_finality_grandpa::EquivocationProof<
 						<Block as BlockT>::Hash,
diff --git a/test-utils/test-runner/Cargo.toml b/test-utils/test-runner/Cargo.toml
index 0eb02d941712..06454ee24eae 100644
--- a/test-utils/test-runner/Cargo.toml
+++ b/test-utils/test-runner/Cargo.toml
@@ -16,6 +16,7 @@ sc-basic-authorship = { path = "../../client/basic-authorship" }
 sc-rpc = { path = "../../client/rpc" }
 sc-transaction-pool = { path = "../../client/transaction-pool" }
 grandpa = { package = "sc-finality-grandpa", path = "../../client/finality-grandpa" }
+sp-finality-grandpa = { path = "../../primitives/finality-grandpa" }
 sp-consensus-babe = { path = "../../primitives/consensus/babe" }
 sc-consensus-babe = { path = "../../client/consensus/babe" }
 sc-consensus = { path = "../../client/consensus/common" }
diff --git a/test-utils/test-runner/src/client.rs b/test-utils/test-runner/src/client.rs
index 71a156b8bc0d..d130993bff4c 100644
--- a/test-utils/test-runner/src/client.rs
+++ b/test-utils/test-runner/src/client.rs
@@ -35,6 +35,7 @@ use sc_transaction_pool_api::TransactionPool;
 use sp_api::{ApiExt, ConstructRuntimeApi, Core, Metadata};
 use sp_block_builder::BlockBuilder;
 use sp_consensus_babe::BabeApi;
+use sp_finality_grandpa::GrandpaApi;
 use sp_keyring::sr25519::Keyring::Alice;
 use sp_offchain::OffchainWorkerApi;
 use sp_runtime::traits::{Block as BlockT, Header};
@@ -90,7 +91,8 @@ where
 		+ TaggedTransactionQueue<T::Block>
 		+ BlockBuilder<T::Block>
 		+ BabeApi<T::Block>
-		+ ApiExt<T::Block, StateBackend = <TFullBackend<T::Block> as Backend<T::Block>>::State>,
+		+ ApiExt<T::Block, StateBackend = <TFullBackend<T::Block> as Backend<T::Block>>::State>
+		+ GrandpaApi<T::Block>,
 	<T::Runtime as frame_system::Config>::Call: From<frame_system::Call<T::Runtime>>,
 	<<T as ChainInfo>::Block as BlockT>::Hash: FromStr,
 	<<<T as ChainInfo>::Block as BlockT>::Header as Header>::Number:
@@ -151,6 +153,7 @@ where
 			import_queue,
 			on_demand: None,
 			block_announce_validator_builder: None,
+			warp_sync: None,
 		};
 		build_network(params)?
 	};

From a41578d5d27c56f2843d5e513d007e891d0b4129 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Mon, 2 Aug 2021 11:17:30 +0200
Subject: [PATCH 1043/1194] Add rustfmt skip to default frame benchmarking
 template (#9473)

This was missed in the introduction pr of rustfmt. There we only had
updated the Substrate local template.
---
 utils/frame/benchmarking-cli/src/template.hbs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/utils/frame/benchmarking-cli/src/template.hbs b/utils/frame/benchmarking-cli/src/template.hbs
index 2fcc50f82377..4acb8c7baa23 100644
--- a/utils/frame/benchmarking-cli/src/template.hbs
+++ b/utils/frame/benchmarking-cli/src/template.hbs
@@ -1,5 +1,5 @@
 {{header}}
-//! Autogenerated weights for {{pallet}}
+//! Autogenerated weights for `{{pallet}}`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION {{version}}
 //! DATE: {{date}}, STEPS: `{{cmd.steps}}`, REPEAT: {{cmd.repeat}}, LOW RANGE: `{{cmd.lowest_range_values}}`, HIGH RANGE: `{{cmd.highest_range_values}}`
@@ -10,6 +10,7 @@
 // {{arg}}
 {{/each}}
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 

From f00ec46a5fd4136d48b91a5f9122f2c1f41f6ad0 Mon Sep 17 00:00:00 2001
From: Denis Pisarev <denis.pisarev@parity.io>
Date: Mon, 2 Aug 2021 16:58:47 +0200
Subject: [PATCH 1044/1194] CI: stop publishing to crates.io until unleash is
 fixed (#9474)

* CI: stop publishing to crates.io until unleash is fixed; allow restarting k8s runners

* CI: fix CI if ci-release tag is pushed
---
 .gitlab-ci.yml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f954ac23cba2..9a9f725780da 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,9 +55,15 @@ default:
       - artifacts/
 
 .kubernetes-env:                   &kubernetes-env
+  retry:
+    max: 2
+    when:
+      - runner_system_failure
+      - unknown_failure
+      - api_failure
+  interruptible:                   true
   tags:
     - kubernetes-parity-build
-  interruptible:                   true
 
 .rust-info-script:                 &rust-info-script
   - rustup show
@@ -97,6 +103,7 @@ default:
     - if: $CI_COMMIT_REF_NAME == "master"
     - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
     - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
+    - if: $CI_COMMIT_REF_NAME =~ /^ci-release-.*$/
 
 .test-refs-no-trigger-prs-only:   &test-refs-no-trigger-prs-only
   rules:
@@ -343,6 +350,7 @@ unleash-check:
     - mkdir -p target/unleash
     - export CARGO_TARGET_DIR=target/unleash
     - cargo unleash check ${CARGO_UNLEASH_PKG_DEF}
+  # FIXME: this job must not fail, or unleash-to-crates-io will publish broken stuff
   allow_failure:                   true
 
 test-frame-examples-compile-to-wasm:
@@ -670,12 +678,14 @@ publish-draft-release:
     - ./.maintain/gitlab/publish_draft_release.sh
   allow_failure:                   true
 
-publish-to-crates-io:
+unleash-to-crates-io:
   stage:                           publish
   <<:                              *docker-env
   rules:
     - if: $CI_COMMIT_REF_NAME =~ /^ci-release-.*$/
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
+    # FIXME: wait until https://github.com/paritytech/cargo-unleash/issues/50 is fixed, also
+    # remove allow_failure: true on the check job
+    # - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
   script:
     - cargo install cargo-unleash ${CARGO_UNLEASH_INSTALL_PARAMS}
     - cargo unleash em-dragons --no-check --owner github:paritytech:core-devs ${CARGO_UNLEASH_PKG_DEF}

From be72e5df46de2fa5805049e3037d0db2c4c25635 Mon Sep 17 00:00:00 2001
From: Sergei Shulepov <sergei@parity.io>
Date: Mon, 2 Aug 2021 21:15:07 +0200
Subject: [PATCH 1045/1194] Limit the maximum number of wasm memory pages a
 runtime can have (#9308)

* Limit the maximum number of wasm memory pages a runtime can have

* Switch the argument order

* fmt
---
 client/executor/src/wasm_runtime.rs     |   1 +
 client/executor/wasmtime/src/runtime.rs |  29 ++++-
 client/executor/wasmtime/src/tests.rs   | 149 +++++++++++++++++++++++-
 3 files changed, 177 insertions(+), 2 deletions(-)

diff --git a/client/executor/src/wasm_runtime.rs b/client/executor/src/wasm_runtime.rs
index 8674e7239255..c55af60b70a9 100644
--- a/client/executor/src/wasm_runtime.rs
+++ b/client/executor/src/wasm_runtime.rs
@@ -321,6 +321,7 @@ pub fn create_wasm_runtime_with_code(
 			blob,
 			sc_executor_wasmtime::Config {
 				heap_pages: heap_pages as u32,
+				max_memory_pages: None,
 				allow_missing_func_imports,
 				cache_path: cache_path.map(ToOwned::to_owned),
 				semantics: sc_executor_wasmtime::Semantics {
diff --git a/client/executor/wasmtime/src/runtime.rs b/client/executor/wasmtime/src/runtime.rs
index b69eac6266bb..d4a2a28394b5 100644
--- a/client/executor/wasmtime/src/runtime.rs
+++ b/client/executor/wasmtime/src/runtime.rs
@@ -79,9 +79,22 @@ pub struct WasmtimeRuntime {
 	engine: Engine,
 }
 
+impl WasmtimeRuntime {
+	/// Creates the store respecting the set limits.
+	fn new_store(&self) -> Store {
+		match self.config.max_memory_pages {
+			Some(max_memory_pages) => Store::new_with_limits(
+				&self.engine,
+				wasmtime::StoreLimitsBuilder::new().memory_pages(max_memory_pages).build(),
+			),
+			None => Store::new(&self.engine),
+		}
+	}
+}
+
 impl WasmModule for WasmtimeRuntime {
 	fn new_instance(&self) -> Result<Box<dyn WasmInstance>> {
-		let store = Store::new(&self.engine);
+		let store = self.new_store();
 
 		// Scan all imports, find the matching host functions, and create stubs that adapt arguments
 		// and results.
@@ -353,6 +366,20 @@ pub struct Config {
 	/// The number of wasm pages to be mounted after instantiation.
 	pub heap_pages: u32,
 
+	/// The total number of wasm pages an instance can request.
+	///
+	/// If specified, the runtime will be able to allocate only that much of wasm memory pages. This
+	/// is the total number and therefore the [`heap_pages`] is accounted for.
+	///
+	/// That means that the initial number of pages of a linear memory plus the [`heap_pages`] should
+	/// be less or equal to `max_memory_pages`, otherwise the instance won't be created.
+	///
+	/// Moreover, `memory.grow` will fail (return -1) if the sum of the number of currently mounted
+	/// pages and the number of additional pages exceeds `max_memory_pages`.
+	///
+	/// The default is `None`.
+	pub max_memory_pages: Option<u32>,
+
 	/// The WebAssembly standard requires all imports of an instantiated module to be resolved,
 	/// othewise, the instantiation fails. If this option is set to `true`, then this behavior is
 	/// overriden and imports that are requested by the module and not provided by the host functions
diff --git a/client/executor/wasmtime/src/tests.rs b/client/executor/wasmtime/src/tests.rs
index 7933578b8049..366352d7f5c3 100644
--- a/client/executor/wasmtime/src/tests.rs
+++ b/client/executor/wasmtime/src/tests.rs
@@ -29,6 +29,7 @@ struct RuntimeBuilder {
 	canonicalize_nans: bool,
 	deterministic_stack: bool,
 	heap_pages: u32,
+	max_memory_pages: Option<u32>,
 }
 
 impl RuntimeBuilder {
@@ -41,6 +42,7 @@ impl RuntimeBuilder {
 			canonicalize_nans: false,
 			deterministic_stack: false,
 			heap_pages: 1024,
+			max_memory_pages: None,
 		}
 	}
 
@@ -56,6 +58,10 @@ impl RuntimeBuilder {
 		self.deterministic_stack = deterministic_stack;
 	}
 
+	fn max_memory_pages(&mut self, max_memory_pages: Option<u32>) {
+		self.max_memory_pages = max_memory_pages;
+	}
+
 	fn build(self) -> Arc<dyn WasmModule> {
 		let blob = {
 			let wasm: Vec<u8>;
@@ -63,7 +69,7 @@ impl RuntimeBuilder {
 			let wasm = match self.code {
 				None => wasm_binary_unwrap(),
 				Some(wat) => {
-					wasm = wat::parse_str(wat).unwrap();
+					wasm = wat::parse_str(wat).expect("wat parsing failed");
 					&wasm
 				},
 			};
@@ -76,6 +82,7 @@ impl RuntimeBuilder {
 			blob,
 			crate::Config {
 				heap_pages: self.heap_pages,
+				max_memory_pages: self.max_memory_pages,
 				allow_missing_func_imports: true,
 				cache_path: None,
 				semantics: crate::Semantics {
@@ -160,3 +167,143 @@ fn test_stack_depth_reaching() {
 		format!("{:?}", err).starts_with("Other(\"Wasm execution trapped: wasm trap: unreachable")
 	);
 }
+
+#[test]
+fn test_max_memory_pages() {
+	fn try_instantiate(
+		max_memory_pages: Option<u32>,
+		wat: &'static str,
+	) -> Result<(), Box<dyn std::error::Error>> {
+		let runtime = {
+			let mut builder = RuntimeBuilder::new_on_demand();
+			builder.use_wat(wat);
+			builder.max_memory_pages(max_memory_pages);
+			builder.build()
+		};
+		let instance = runtime.new_instance()?;
+		let _ = instance.call_export("main", &[])?;
+		Ok(())
+	}
+
+	// check the old behavior if preserved. That is, if no limit is set we allow 4 GiB of memory.
+	try_instantiate(
+		None,
+		r#"
+		(module
+			;; we want to allocate the maximum number of pages supported in wasm for this test.
+			;;
+			;; However, due to a bug in wasmtime (I think wasmi is also affected) it is only possible
+			;; to allocate 65536 - 1 pages.
+			;;
+			;; Then, during creation of the Substrate Runtime instance, 1024 (heap_pages) pages are
+			;; mounted.
+			;;
+			;; Thus 65535 = 64511 + 1024
+			(import "env" "memory" (memory 64511))
+
+			(global (export "__heap_base") i32 (i32.const 0))
+			(func (export "main")
+				(param i32 i32) (result i64)
+				(i64.const 0)
+			)
+		)
+		"#,
+	)
+	.unwrap();
+
+	// max is not specified, therefore it's implied to be 65536 pages (4 GiB).
+	//
+	// max_memory_pages = 1 (initial) + 1024 (heap_pages)
+	try_instantiate(
+		Some(1 + 1024),
+		r#"
+		(module
+
+			(import "env" "memory" (memory 1)) ;; <- 1 initial, max is not specified
+
+			(global (export "__heap_base") i32 (i32.const 0))
+			(func (export "main")
+				(param i32 i32) (result i64)
+				(i64.const 0)
+			)
+		)
+		"#,
+	)
+	.unwrap();
+
+	// max is specified explicitly to 2048 pages.
+	try_instantiate(
+		Some(1 + 1024),
+		r#"
+		(module
+
+			(import "env" "memory" (memory 1 2048)) ;; <- max is 2048
+
+			(global (export "__heap_base") i32 (i32.const 0))
+			(func (export "main")
+				(param i32 i32) (result i64)
+				(i64.const 0)
+			)
+		)
+		"#,
+	)
+	.unwrap();
+
+	// memory grow should work as long as it doesn't exceed 1025 pages in total.
+	try_instantiate(
+		Some(0 + 1024 + 25),
+		r#"
+		(module
+			(import "env" "memory" (memory 0)) ;; <- zero starting pages.
+
+			(global (export "__heap_base") i32 (i32.const 0))
+			(func (export "main")
+				(param i32 i32) (result i64)
+
+				;; assert(memory.grow returns != -1)
+				(if
+					(i32.eq
+						(memory.grow
+							(i32.const 25)
+						)
+						(i32.const -1)
+					)
+					(unreachable)
+				)
+
+				(i64.const 0)
+			)
+		)
+		"#,
+	)
+	.unwrap();
+
+	// We start with 1025 pages and try to grow at least one.
+	try_instantiate(
+		Some(1 + 1024),
+		r#"
+		(module
+			(import "env" "memory" (memory 1))  ;; <- initial=1, meaning after heap pages mount the
+												;; total will be already 1025
+			(global (export "__heap_base") i32 (i32.const 0))
+			(func (export "main")
+				(param i32 i32) (result i64)
+
+				;; assert(memory.grow returns == -1)
+				(if
+					(i32.ne
+						(memory.grow
+							(i32.const 1)
+						)
+						(i32.const -1)
+					)
+					(unreachable)
+				)
+
+				(i64.const 0)
+			)
+		)
+		"#,
+	)
+	.unwrap();
+}

From d3b4830728ec6e458654265db5372b0c583ba642 Mon Sep 17 00:00:00 2001
From: Eric Miller <ercmilla@gmail.com>
Date: Mon, 2 Aug 2021 17:46:53 -0400
Subject: [PATCH 1046/1194] #9386: copy rustfmt.toml to node-template (#9461)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* copying rustfmt from root to node-template build.
Also, running rustfmt on this.

* Update .maintain/node-template-release/src/main.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Add some important events to batch & staking to ensure ease of analysis (#9462)

* Add some important events to batch & staking to ensure ease of analysis

* Update frame/staking/src/pallet/mod.rs

Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com>

* Update lib.rs

* fix test

Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Move client consensus parts out of primitives and into client/consensus/api (#9319)

* moved client code out of primitives

* bump ci

* Fixup from merge.

* Removed unused deps thanks to review feedback

* Removing unneeded deps

* updating lock file

* note about rustfmt

* fixed typo to bump ci

* Move lonely CacheKeyId to parent

* cargo fmt

* updating import style

* Update docs/STYLE_GUIDE.md

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Refactor Benchmarks for Less Wasm Memory Usage (#9373)

* extract repeat out of benchmark

* remove r

* unused

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* use linked map to keep order

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Delete pallet_balances.rs

* Delete out

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* steps and repeat to tuple (current_*, total_*)

* idea for list command

* fmt

* use benchmark list in cli

* handle steps in cli

* move log update to cli

* fmt

* remove old todo

* line width

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* benchmark metadata function

* don't need this warm up

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* fix warnings

* fix node-template

* fix

* fmt

* line width

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* improve docs

* improve cli

* fix format

* fix bug?

* Revert "fix bug?"

This reverts commit 8051bf1bf9bae862ff28dfff386e7045cd3f045e.

* skip frame-metadata

* extract repeat out of benchmark

* remove r

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* use linked map to keep order

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Delete pallet_balances.rs

* Delete out

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* steps and repeat to tuple (current_*, total_*)

* idea for list command

* fmt

* use benchmark list in cli

* handle steps in cli

* move log update to cli

* remove old todo

* line width

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* benchmark metadata function

* don't need this warm up

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* fix warnings

* fix node-template

* fix

* fmt

* line width

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* improve docs

* improve cli

* fix format

* fix bug?

* Revert "fix bug?"

This reverts commit 8051bf1bf9bae862ff28dfff386e7045cd3f045e.

* skip frame-metadata

* Update .gitlab-ci.yml

* fix import

* Update .gitlab-ci.yml

Co-authored-by: Parity Benchmarking Bot <admin@parity.io>

* Warp sync part I (#9227)

* Started warp sync

* BABE & GRANDPA recovery

* Warp sync protocol

* Sync warp proofs first

* Added basic documentation

* Apply suggestions from code review

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Style changes

* Apply suggestions from code review

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* fmt

* Apply suggestions from code review

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Fixed chage trie pruning wrt missing blocks

* Restore parent finalization

* fmt

* fmt

* Revert pwasm-utils bump

* Change error type & check API version

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Build fix

* Fixed target block check

* Formatting

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Add rustfmt skip to default frame benchmarking template (#9473)

This was missed in the introduction pr of rustfmt. There we only had
updated the Substrate local template.

* CI: stop publishing to crates.io until unleash is fixed (#9474)

* CI: stop publishing to crates.io until unleash is fixed; allow restarting k8s runners

* CI: fix CI if ci-release tag is pushed

Co-authored-by: Eric Miller <emiller@lirio.co>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: Gavin Wood <gavin@parity.io>
Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Squirrel <gilescope@gmail.com>
Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
Co-authored-by: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Co-authored-by: Denis Pisarev <denis.pisarev@parity.io>
---
 .maintain/node-template-release/src/main.rs | 119 ++++++++++++--------
 1 file changed, 73 insertions(+), 46 deletions(-)

diff --git a/.maintain/node-template-release/src/main.rs b/.maintain/node-template-release/src/main.rs
index bf37797419bc..7dcb1f0f4d81 100644
--- a/.maintain/node-template-release/src/main.rs
+++ b/.maintain/node-template-release/src/main.rs
@@ -1,8 +1,11 @@
 use structopt::StructOpt;
 
 use std::{
-	path::{PathBuf, Path}, collections::HashMap, fs::{File, OpenOptions, self}, io::{Read, Write},
-	process::Command
+	collections::HashMap,
+	fs::{self, File, OpenOptions},
+	io::{Read, Write},
+	path::{Path, PathBuf},
+	process::Command,
 };
 
 use glob;
@@ -40,11 +43,9 @@ fn find_cargo_tomls(path: PathBuf) -> Vec<PathBuf> {
 	let glob = glob::glob(&path).expect("Generates globbing pattern");
 
 	let mut result = Vec::new();
-	glob.into_iter().for_each(|file| {
-		match file {
-			Ok(file) => result.push(file),
-			Err(e) => println!("{:?}", e),
-		}
+	glob.into_iter().for_each(|file| match file {
+		Ok(file) => result.push(file),
+		Err(e) => println!("{:?}", e),
 	});
 
 	if result.is_empty() {
@@ -78,30 +79,44 @@ fn get_git_commit_id(path: &Path) -> String {
 /// Parse the given `Cargo.toml` into a `HashMap`
 fn parse_cargo_toml(file: &Path) -> CargoToml {
 	let mut content = String::new();
-	File::open(file).expect("Cargo.toml exists").read_to_string(&mut content).expect("Reads file");
+	File::open(file)
+		.expect("Cargo.toml exists")
+		.read_to_string(&mut content)
+		.expect("Reads file");
 	toml::from_str(&content).expect("Cargo.toml is a valid toml file")
 }
 
 /// Replaces all substrate path dependencies with a git dependency.
-fn replace_path_dependencies_with_git(cargo_toml_path: &Path, commit_id: &str, cargo_toml: &mut CargoToml) {
+fn replace_path_dependencies_with_git(
+	cargo_toml_path: &Path,
+	commit_id: &str,
+	cargo_toml: &mut CargoToml,
+) {
 	let mut cargo_toml_path = cargo_toml_path.to_path_buf();
 	// remove `Cargo.toml`
 	cargo_toml_path.pop();
 
 	for &table in &["dependencies", "build-dependencies", "dev-dependencies"] {
-		let mut dependencies: toml::value::Table = match cargo_toml
-			.remove(table)
-			.and_then(|v| v.try_into().ok()) {
-			Some(deps) => deps,
-			None => continue,
-		};
+		let mut dependencies: toml::value::Table =
+			match cargo_toml.remove(table).and_then(|v| v.try_into().ok()) {
+				Some(deps) => deps,
+				None => continue,
+			};
 
 		let deps_rewritten = dependencies
 			.iter()
-			.filter_map(|(k, v)| v.clone().try_into::<toml::value::Table>().ok().map(move |v| (k, v)))
-			.filter(|t| t.1.contains_key("path") && {
-				// if the path does not exists, we need to add this as git dependency
-				t.1.get("path").unwrap().as_str().map(|path| !cargo_toml_path.join(path).exists()).unwrap_or(false)
+			.filter_map(|(k, v)| {
+				v.clone().try_into::<toml::value::Table>().ok().map(move |v| (k, v))
+			})
+			.filter(|t| {
+				t.1.contains_key("path") && {
+					// if the path does not exists, we need to add this as git dependency
+					t.1.get("path")
+						.unwrap()
+						.as_str()
+						.map(|path| !cargo_toml_path.join(path).exists())
+						.unwrap_or(false)
+				}
 			})
 			.map(|(k, mut v)| {
 				// remove `path` and add `git` and `rev`
@@ -110,7 +125,8 @@ fn replace_path_dependencies_with_git(cargo_toml_path: &Path, commit_id: &str, c
 				v.insert("rev".into(), commit_id.into());
 
 				(k.clone(), v.into())
-			}).collect::<HashMap<_, _>>();
+			})
+			.collect::<HashMap<_, _>>();
 
 		dependencies.extend(deps_rewritten.into_iter());
 
@@ -135,8 +151,9 @@ fn update_top_level_cargo_toml(
 
 	cargo_toml.insert("profile".into(), profile.into());
 
-	let members = workspace_members.iter()
-		.map(|p|
+	let members = workspace_members
+		.iter()
+		.map(|p| {
 			p.strip_prefix(node_template_path)
 				.expect("Workspace member is a child of the node template path!")
 				.parent()
@@ -145,7 +162,7 @@ fn update_top_level_cargo_toml(
 				.expect("The given path ends with `Cargo.toml` as file name!")
 				.display()
 				.to_string()
-		)
+		})
 		.collect::<Vec<_>>();
 
 	let mut members_section = toml::value::Table::new();
@@ -163,24 +180,20 @@ fn write_cargo_toml(path: &Path, cargo_toml: CargoToml) {
 /// Build and test the generated node-template
 fn build_and_test(path: &Path, cargo_tomls: &[PathBuf]) {
 	// Build node
-	assert!(
-		Command::new("cargo")
-			.args(&["build", "--all"])
-			.current_dir(path)
-			.status()
-			.expect("Compiles node")
-			.success()
-	);
+	assert!(Command::new("cargo")
+		.args(&["build", "--all"])
+		.current_dir(path)
+		.status()
+		.expect("Compiles node")
+		.success());
 
 	// Test node
-	assert!(
-		Command::new("cargo")
-			.args(&["test", "--all"])
-			.current_dir(path)
-			.status()
-			.expect("Tests node")
-			.success()
-	);
+	assert!(Command::new("cargo")
+		.args(&["test", "--all"])
+		.current_dir(path)
+		.status()
+		.expect("Tests node")
+		.success());
 
 	// Remove all `target` directories
 	for toml in cargo_tomls {
@@ -189,7 +202,8 @@ fn build_and_test(path: &Path, cargo_tomls: &[PathBuf]) {
 		target_path = target_path.join("target");
 
 		if target_path.exists() {
-			fs::remove_dir_all(&target_path).expect(&format!("Removes `{}`", target_path.display()));
+			fs::remove_dir_all(&target_path)
+				.expect(&format!("Removes `{}`", target_path.display()));
 		}
 	}
 }
@@ -219,7 +233,10 @@ fn main() {
 	// Check if top level Cargo.toml exists. If not, create one in the destination
 	if !cargo_tomls.contains(&top_level_cargo_toml_path) {
 		// create the top_level_cargo_toml
-		OpenOptions::new().create(true).write(true).open(top_level_cargo_toml_path.clone())
+		OpenOptions::new()
+			.create(true)
+			.write(true)
+			.open(top_level_cargo_toml_path.clone())
 			.expect("Create root level `Cargo.toml` failed.");
 
 		// push into our data structure
@@ -233,9 +250,8 @@ fn main() {
 		// Check if this is the top level `Cargo.toml`, as this requires some special treatments.
 		if top_level_cargo_toml_path == *t {
 			// All workspace member `Cargo.toml` file paths.
-			let workspace_members = cargo_tomls.iter()
-				.filter(|p| **p != top_level_cargo_toml_path)
-				.collect();
+			let workspace_members =
+				cargo_tomls.iter().filter(|p| **p != top_level_cargo_toml_path).collect();
 
 			update_top_level_cargo_toml(&mut cargo_toml, workspace_members, &node_template_path);
 		}
@@ -243,10 +259,21 @@ fn main() {
 		write_cargo_toml(&t, cargo_toml);
 	});
 
+	// adding root rustfmt to node template build path
+	let node_template_rustfmt_toml_path = node_template_path.join("rustfmt.toml");
+	let root_rustfmt_toml =
+		&options.node_template.join("../../rustfmt.toml");
+	if root_rustfmt_toml.exists() {
+		fs::copy(&root_rustfmt_toml, &node_template_rustfmt_toml_path)
+			.expect("Copying rustfmt.toml.");
+	}
+
 	build_and_test(&node_template_path, &cargo_tomls);
 
-	let output = GzEncoder::new(File::create(&options.output)
-		.expect("Creates output file"), Compression::default());
+	let output = GzEncoder::new(
+		File::create(&options.output).expect("Creates output file"),
+		Compression::default(),
+	);
 	let mut tar = tar::Builder::new(output);
 	tar.append_dir_all("substrate-node-template", node_template_path)
 		.expect("Writes substrate-node-template archive");

From 5e1aab8192cd84b653e023db5ee83abda856438c Mon Sep 17 00:00:00 2001
From: Dan Shields <35669742+NukeManDan@users.noreply.github.com>
Date: Mon, 2 Aug 2021 15:52:34 -0600
Subject: [PATCH 1047/1194] Add a matrix chat badge to the README (#9476)

* Add a matrix chat badge to the README

This is a fun addition for connecting users to our dedicated Substrate chat & to visualize the number of members there.
```
[![Matrix](https://img.shields.io/matrix/substrate-technical:matrix.org)](https://matrix.to/#/#substrate-technical:matrix.org)
```

https://img.shields.io/matrix/substrate-technical:matrix.org can be viewed directly to see the count before merging the PR here.

* Update README.md
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 94de8533be26..1ccebac90818 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Substrate &middot; [![GitHub license](https://img.shields.io/badge/license-GPL3%2FApache2-blue)](#LICENSE) [![GitLab Status](https://gitlab.parity.io/parity/substrate/badges/master/pipeline.svg)](https://gitlab.parity.io/parity/substrate/pipelines) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](docs/CONTRIBUTING.adoc)
+# Substrate &middot; [![GitHub license](https://img.shields.io/badge/license-GPL3%2FApache2-blue)](#LICENSE) [![GitLab Status](https://gitlab.parity.io/parity/substrate/badges/master/pipeline.svg)](https://gitlab.parity.io/parity/substrate/pipelines) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](docs/CONTRIBUTING.adoc) [![Matrix](https://img.shields.io/matrix/substrate-technical:matrix.org)](https://matrix.to/#/#substrate-technical:matrix.org)
 
 <p align="center">
   <img src="/docs/media/sub.gif">

From 471db4f2b6ef9e9871fd1e9af2a56050efb3beb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Tue, 3 Aug 2021 11:57:08 +0100
Subject: [PATCH 1048/1194] aura, babe: don't allow disabled validators to
 build blocks (#9414)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* frame-support: add trait for checking disabled validators

* pallet-session: implement DisabledValidators trait

* pallet-babe: check for disabled validators

* pallet-babe: add test for disabled validators

* pallet-aura: check for disabled validators

* pallet-aura: add test for disabled validators

* runtime: fix missing DisableValidator

* test-runtime: add missing DisabledValidators

* frame-support: clean up doc

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 bin/node-template/runtime/src/lib.rs   |  1 +
 bin/node/runtime/src/lib.rs            |  1 +
 frame/aura/src/lib.rs                  | 17 +++++++++++++-
 frame/aura/src/mock.rs                 | 32 ++++++++++++++++++++++++--
 frame/aura/src/tests.rs                | 28 +++++++++++++++++++++-
 frame/babe/src/lib.rs                  | 16 ++++++++++++-
 frame/babe/src/mock.rs                 |  1 +
 frame/babe/src/tests.rs                | 31 ++++++++++++++++++++++---
 frame/session/src/lib.rs               |  6 +++++
 frame/support/src/traits.rs            |  6 ++---
 frame/support/src/traits/validation.rs | 13 +++++++++++
 test-utils/runtime/src/lib.rs          |  1 +
 12 files changed, 142 insertions(+), 11 deletions(-)

diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index 908c5ea455cc..afd31b8f7b5b 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -197,6 +197,7 @@ impl pallet_randomness_collective_flip::Config for Runtime {}
 
 impl pallet_aura::Config for Runtime {
 	type AuthorityId = AuraId;
+	type DisabledValidators = ();
 }
 
 impl pallet_grandpa::Config for Runtime {
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 37b4b24fa6a2..0a8d258495a3 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -346,6 +346,7 @@ impl pallet_babe::Config for Runtime {
 	type EpochDuration = EpochDuration;
 	type ExpectedBlockTime = ExpectedBlockTime;
 	type EpochChangeTrigger = pallet_babe::ExternalTrigger;
+	type DisabledValidators = Session;
 
 	type KeyOwnerProofSystem = Historical;
 
diff --git a/frame/aura/src/lib.rs b/frame/aura/src/lib.rs
index 41fb69dfb545..ebb869194ad2 100644
--- a/frame/aura/src/lib.rs
+++ b/frame/aura/src/lib.rs
@@ -39,7 +39,7 @@
 
 use codec::{Decode, Encode};
 use frame_support::{
-	traits::{FindAuthor, Get, OnTimestampSet, OneSessionHandler},
+	traits::{DisabledValidators, FindAuthor, Get, OnTimestampSet, OneSessionHandler},
 	ConsensusEngineId, Parameter,
 };
 use sp_consensus_aura::{AuthorityIndex, ConsensusLog, Slot, AURA_ENGINE_ID};
@@ -70,6 +70,11 @@ pub mod pallet {
 			+ RuntimeAppPublic
 			+ Default
 			+ MaybeSerializeDeserialize;
+
+		/// A way to check whether a given validator is disabled and should not be authoring blocks.
+		/// Blocks authored by a disabled validator will lead to a panic as part of this module's
+		/// initialization.
+		type DisabledValidators: DisabledValidators;
 	}
 
 	#[pallet::pallet]
@@ -84,6 +89,16 @@ pub mod pallet {
 				assert!(current_slot < new_slot, "Slot must increase");
 				CurrentSlot::<T>::put(new_slot);
 
+				if let Some(n_authorities) = <Authorities<T>>::decode_len() {
+					let authority_index = *new_slot % n_authorities as u64;
+					if T::DisabledValidators::is_disabled(authority_index as u32) {
+						panic!(
+							"Validator with index {:?} is disabled and should not be attempting to author blocks.",
+							authority_index,
+						);
+					}
+				}
+
 				// TODO [#3398] Generate offence report for all authorities that skipped their slots.
 
 				T::DbWeight::get().reads_writes(2, 1)
diff --git a/frame/aura/src/mock.rs b/frame/aura/src/mock.rs
index 72d457165d3c..8d604e527c99 100644
--- a/frame/aura/src/mock.rs
+++ b/frame/aura/src/mock.rs
@@ -20,13 +20,17 @@
 #![cfg(test)]
 
 use crate as pallet_aura;
-use frame_support::{parameter_types, traits::GenesisBuild};
-use sp_consensus_aura::ed25519::AuthorityId;
+use frame_support::{
+	parameter_types,
+	traits::{DisabledValidators, GenesisBuild},
+};
+use sp_consensus_aura::{ed25519::AuthorityId, AuthorityIndex};
 use sp_core::H256;
 use sp_runtime::{
 	testing::{Header, UintAuthorityId},
 	traits::IdentityLookup,
 };
+use sp_std::cell::RefCell;
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -83,8 +87,32 @@ impl pallet_timestamp::Config for Test {
 	type WeightInfo = ();
 }
 
+thread_local! {
+	static DISABLED_VALIDATORS: RefCell<Vec<AuthorityIndex>> = RefCell::new(Default::default());
+}
+
+pub struct MockDisabledValidators;
+
+impl MockDisabledValidators {
+	pub fn disable_validator(index: AuthorityIndex) {
+		DISABLED_VALIDATORS.with(|v| {
+			let mut disabled = v.borrow_mut();
+			if let Err(i) = disabled.binary_search(&index) {
+				disabled.insert(i, index);
+			}
+		})
+	}
+}
+
+impl DisabledValidators for MockDisabledValidators {
+	fn is_disabled(index: AuthorityIndex) -> bool {
+		DISABLED_VALIDATORS.with(|v| v.borrow().binary_search(&index).is_ok())
+	}
+}
+
 impl pallet_aura::Config for Test {
 	type AuthorityId = AuthorityId;
+	type DisabledValidators = MockDisabledValidators;
 }
 
 pub fn new_test_ext(authorities: Vec<u64>) -> sp_io::TestExternalities {
diff --git a/frame/aura/src/tests.rs b/frame/aura/src/tests.rs
index 14e79ab54753..596858aac7c9 100644
--- a/frame/aura/src/tests.rs
+++ b/frame/aura/src/tests.rs
@@ -19,7 +19,12 @@
 
 #![cfg(test)]
 
-use crate::mock::{new_test_ext, Aura};
+use crate::mock::{new_test_ext, Aura, MockDisabledValidators, System};
+use codec::Encode;
+use frame_support::traits::OnInitialize;
+use frame_system::InitKind;
+use sp_consensus_aura::{Slot, AURA_ENGINE_ID};
+use sp_runtime::{Digest, DigestItem};
 
 #[test]
 fn initial_values() {
@@ -28,3 +33,24 @@ fn initial_values() {
 		assert_eq!(Aura::authorities().len(), 4);
 	});
 }
+
+#[test]
+#[should_panic(
+	expected = "Validator with index 1 is disabled and should not be attempting to author blocks."
+)]
+fn disabled_validators_cannot_author_blocks() {
+	new_test_ext(vec![0, 1, 2, 3]).execute_with(|| {
+		// slot 1 should be authored by validator at index 1
+		let slot = Slot::from(1);
+		let pre_digest =
+			Digest { logs: vec![DigestItem::PreRuntime(AURA_ENGINE_ID, slot.encode())] };
+
+		System::initialize(&42, &System::parent_hash(), &pre_digest, InitKind::Full);
+
+		// let's disable the validator
+		MockDisabledValidators::disable_validator(1);
+
+		// and we should not be able to initialize the block
+		Aura::on_initialize(42);
+	});
+}
diff --git a/frame/babe/src/lib.rs b/frame/babe/src/lib.rs
index 949f55720bbd..e9c5d2e8d922 100644
--- a/frame/babe/src/lib.rs
+++ b/frame/babe/src/lib.rs
@@ -24,7 +24,9 @@
 use codec::{Decode, Encode};
 use frame_support::{
 	dispatch::DispatchResultWithPostInfo,
-	traits::{FindAuthor, Get, KeyOwnerProofSystem, OnTimestampSet, OneSessionHandler},
+	traits::{
+		DisabledValidators, FindAuthor, Get, KeyOwnerProofSystem, OnTimestampSet, OneSessionHandler,
+	},
 	weights::{Pays, Weight},
 };
 use sp_application_crypto::Public;
@@ -137,6 +139,11 @@ pub mod pallet {
 		/// when no other module is responsible for changing authority set.
 		type EpochChangeTrigger: EpochChangeTrigger;
 
+		/// A way to check whether a given validator is disabled and should not be authoring blocks.
+		/// Blocks authored by a disabled validator will lead to a panic as part of this module's
+		/// initialization.
+		type DisabledValidators: DisabledValidators;
+
 		/// The proof of key ownership, used for validating equivocation reports.
 		/// The proof must include the session index and validator count of the
 		/// session at which the equivocation occurred.
@@ -678,6 +685,13 @@ impl<T: Config> Pallet<T> {
 
 			let authority_index = digest.authority_index();
 
+			if T::DisabledValidators::is_disabled(authority_index) {
+				panic!(
+					"Validator with index {:?} is disabled and should not be attempting to author blocks.",
+					authority_index,
+				);
+			}
+
 			// Extract out the VRF output if we have it
 			digest.vrf_output().and_then(|vrf_output| {
 				// Reconstruct the bytes of VRFInOut using the authority id.
diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index 795d51e5876f..a034360c3fec 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -238,6 +238,7 @@ impl Config for Test {
 	type EpochDuration = EpochDuration;
 	type ExpectedBlockTime = ExpectedBlockTime;
 	type EpochChangeTrigger = crate::ExternalTrigger;
+	type DisabledValidators = Session;
 
 	type KeyOwnerProofSystem = Historical;
 
diff --git a/frame/babe/src/tests.rs b/frame/babe/src/tests.rs
index 5e72e14877a4..1cf4b0aac150 100644
--- a/frame/babe/src/tests.rs
+++ b/frame/babe/src/tests.rs
@@ -373,6 +373,31 @@ fn tracks_block_numbers_when_current_and_previous_epoch_started() {
 	});
 }
 
+#[test]
+#[should_panic(
+	expected = "Validator with index 0 is disabled and should not be attempting to author blocks."
+)]
+fn disabled_validators_cannot_author_blocks() {
+	new_test_ext(4).execute_with(|| {
+		start_era(1);
+
+		// let's disable the validator at index 1
+		Session::disable_index(1);
+
+		// the mocking infrastructure always authors all blocks using authority index 0,
+		// so we should still be able to author blocks
+		start_era(2);
+
+		assert_eq!(Staking::current_era().unwrap(), 2);
+
+		// let's disable the validator at index 0
+		Session::disable_index(0);
+
+		// this should now panic as the validator authoring blocks is disabled
+		start_era(3);
+	});
+}
+
 #[test]
 fn report_equivocation_current_session_works() {
 	let (pairs, mut ext) = new_test_ext_with_pairs(3);
@@ -394,8 +419,8 @@ fn report_equivocation_current_session_works() {
 			);
 		}
 
-		// we will use the validator at index 0 as the offending authority
-		let offending_validator_index = 0;
+		// we will use the validator at index 1 as the offending authority
+		let offending_validator_index = 1;
 		let offending_validator_id = Session::validators()[offending_validator_index];
 		let offending_authority_pair = pairs
 			.into_iter()
@@ -456,7 +481,7 @@ fn report_equivocation_old_session_works() {
 		let authorities = Babe::authorities();
 
 		// we will use the validator at index 0 as the offending authority
-		let offending_validator_index = 0;
+		let offending_validator_index = 1;
 		let offending_validator_id = Session::validators()[offending_validator_index];
 		let offending_authority_pair = pairs
 			.into_iter()
diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs
index cdeceb1ef53d..5f6c05e650e2 100644
--- a/frame/session/src/lib.rs
+++ b/frame/session/src/lib.rs
@@ -892,3 +892,9 @@ impl<T: Config> EstimateNextNewSession<T::BlockNumber> for Module<T> {
 		T::NextSessionRotation::estimate_next_session_rotation(now)
 	}
 }
+
+impl<T: Config> frame_support::traits::DisabledValidators for Module<T> {
+	fn is_disabled(index: u32) -> bool {
+		<Module<T>>::disabled_validators().binary_search(&index).is_ok()
+	}
+}
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index 024e7e6c698e..fbb21de7ebb1 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -38,9 +38,9 @@ pub use members::{
 
 mod validation;
 pub use validation::{
-	EstimateNextNewSession, EstimateNextSessionRotation, FindAuthor, KeyOwnerProofSystem, Lateness,
-	OneSessionHandler, ValidatorRegistration, ValidatorSet, ValidatorSetWithIdentification,
-	VerifySeal,
+	DisabledValidators, EstimateNextNewSession, EstimateNextSessionRotation, FindAuthor,
+	KeyOwnerProofSystem, Lateness, OneSessionHandler, ValidatorRegistration, ValidatorSet,
+	ValidatorSetWithIdentification, VerifySeal,
 };
 
 mod filter;
diff --git a/frame/support/src/traits/validation.rs b/frame/support/src/traits/validation.rs
index 5a68f289df48..a473e332a83f 100644
--- a/frame/support/src/traits/validation.rs
+++ b/frame/support/src/traits/validation.rs
@@ -244,3 +244,16 @@ pub trait ValidatorRegistration<ValidatorId> {
 	/// module
 	fn is_registered(id: &ValidatorId) -> bool;
 }
+
+/// Trait used to check whether a given validator is currently disabled and should not be
+/// participating in consensus (e.g. because they equivocated).
+pub trait DisabledValidators {
+	/// Returns true if the given validator is disabled.
+	fn is_disabled(index: u32) -> bool;
+}
+
+impl DisabledValidators for () {
+	fn is_disabled(_index: u32) -> bool {
+		false
+	}
+}
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index a148ce5cb75a..e7f25ad33611 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -582,6 +582,7 @@ impl pallet_babe::Config for Runtime {
 	// are manually adding the digests. normally in this situation you'd use
 	// pallet_babe::SameAuthoritiesForever.
 	type EpochChangeTrigger = pallet_babe::ExternalTrigger;
+	type DisabledValidators = ();
 
 	type KeyOwnerProofSystem = ();
 

From f651d45ce5742bc60fe8ae518c035d1638ae83d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 3 Aug 2021 13:12:21 +0200
Subject: [PATCH 1049/1194] Use correct `ExecutionContext` for
 `check_inherents` (#9483)

Before we used the `other` context, while we are actually either in the
import or sync context.
---
 client/consensus/aura/src/import_queue.rs |  6 ++++--
 client/consensus/babe/src/lib.rs          |  6 ++++--
 client/consensus/pow/src/lib.rs           |  5 ++++-
 client/service/src/client/client.rs       |  8 ++------
 primitives/consensus/common/Cargo.toml    |  2 +-
 primitives/consensus/common/src/lib.rs    | 10 ++++++++++
 6 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/client/consensus/aura/src/import_queue.rs b/client/consensus/aura/src/import_queue.rs
index a8b046270976..a4dbe5012ea1 100644
--- a/client/consensus/aura/src/import_queue.rs
+++ b/client/consensus/aura/src/import_queue.rs
@@ -41,7 +41,7 @@ use sp_consensus_aura::{
 	AURA_ENGINE_ID,
 };
 use sp_consensus_slots::Slot;
-use sp_core::crypto::Pair;
+use sp_core::{crypto::Pair, ExecutionContext};
 use sp_inherents::{CreateInherentDataProviders, InherentDataProvider as _};
 use sp_runtime::{
 	generic::{BlockId, OpaqueDigestItemId},
@@ -149,6 +149,7 @@ where
 		block_id: BlockId<B>,
 		inherent_data: sp_inherents::InherentData,
 		create_inherent_data_providers: CIDP::InherentDataProviders,
+		execution_context: ExecutionContext,
 	) -> Result<(), Error<B>>
 	where
 		C: ProvideRuntimeApi<B>,
@@ -169,7 +170,7 @@ where
 		let inherent_res = self
 			.client
 			.runtime_api()
-			.check_inherents(&block_id, block, inherent_data)
+			.check_inherents_with_context(&block_id, execution_context, block, inherent_data)
 			.map_err(|e| Error::Client(e.into()))?;
 
 		if !inherent_res.ok() {
@@ -261,6 +262,7 @@ where
 							BlockId::Hash(parent_hash),
 							inherent_data,
 							create_inherent_data_providers,
+							block.origin.into(),
 						)
 						.await
 						.map_err(|e| e.to_string())?;
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index 172bad669daa..2828c345c459 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -112,7 +112,7 @@ use sp_consensus::{
 };
 use sp_consensus_babe::inherents::BabeInherentData;
 use sp_consensus_slots::Slot;
-use sp_core::crypto::Public;
+use sp_core::{crypto::Public, ExecutionContext};
 use sp_inherents::{CreateInherentDataProviders, InherentData, InherentDataProvider};
 use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr};
 use sp_runtime::{
@@ -1006,6 +1006,7 @@ where
 		block_id: BlockId<Block>,
 		inherent_data: InherentData,
 		create_inherent_data_providers: CIDP::InherentDataProviders,
+		execution_context: ExecutionContext,
 	) -> Result<(), Error<Block>> {
 		if let Err(e) = self.can_author_with.can_author_with(&block_id) {
 			debug!(
@@ -1020,7 +1021,7 @@ where
 		let inherent_res = self
 			.client
 			.runtime_api()
-			.check_inherents(&block_id, block, inherent_data)
+			.check_inherents_with_context(&block_id, execution_context, block, inherent_data)
 			.map_err(Error::RuntimeApi)?;
 
 		if !inherent_res.ok() {
@@ -1244,6 +1245,7 @@ where
 						BlockId::Hash(parent_hash),
 						inherent_data,
 						create_inherent_data_providers,
+						block.origin.into(),
 					)
 					.await?;
 
diff --git a/client/consensus/pow/src/lib.rs b/client/consensus/pow/src/lib.rs
index 17bd02f6a565..c2305180ca89 100644
--- a/client/consensus/pow/src/lib.rs
+++ b/client/consensus/pow/src/lib.rs
@@ -61,6 +61,7 @@ use sp_consensus::{
 	CanAuthorWith, Environment, Error as ConsensusError, Proposer, SelectChain, SyncOracle,
 };
 use sp_consensus_pow::{Seal, TotalDifficulty, POW_ENGINE_ID};
+use sp_core::ExecutionContext;
 use sp_inherents::{CreateInherentDataProviders, InherentDataProvider};
 use sp_runtime::{
 	generic::{BlockId, Digest, DigestItem},
@@ -272,6 +273,7 @@ where
 		block: B,
 		block_id: BlockId<B>,
 		inherent_data_providers: CIDP::InherentDataProviders,
+		execution_context: ExecutionContext,
 	) -> Result<(), Error<B>> {
 		if *block.header().number() < self.check_inherents_after {
 			return Ok(())
@@ -294,7 +296,7 @@ where
 		let inherent_res = self
 			.client
 			.runtime_api()
-			.check_inherents(&block_id, block, inherent_data)
+			.check_inherents_with_context(&block_id, execution_context, block, inherent_data)
 			.map_err(|e| Error::Client(e.into()))?;
 
 		if !inherent_res.ok() {
@@ -360,6 +362,7 @@ where
 				self.create_inherent_data_providers
 					.create_inherent_data_providers(parent_hash, ())
 					.await?,
+				block.origin.into(),
 			)
 			.await?;
 
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index 01688f0c8e70..17fbe6988dab 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -64,7 +64,7 @@ use sp_consensus::{BlockOrigin, BlockStatus, Error as ConsensusError};
 use sp_core::{
 	convert_hash,
 	storage::{well_known_keys, ChildInfo, PrefixedStorageKey, StorageData, StorageKey},
-	ChangesTrieConfiguration, ExecutionContext, NativeOrEncoded,
+	ChangesTrieConfiguration, NativeOrEncoded,
 };
 #[cfg(feature = "test-helpers")]
 use sp_keystore::SyncCryptoStorePtr;
@@ -958,11 +958,7 @@ where
 			// block.
 			(true, None, Some(ref body)) => {
 				let runtime_api = self.runtime_api();
-				let execution_context = if import_block.origin == BlockOrigin::NetworkInitialSync {
-					ExecutionContext::Syncing
-				} else {
-					ExecutionContext::Importing
-				};
+				let execution_context = import_block.origin.into();
 
 				runtime_api.execute_block_with_context(
 					&at,
diff --git a/primitives/consensus/common/Cargo.toml b/primitives/consensus/common/Cargo.toml
index ab4f5a24f5c5..d2bdc9cd7e28 100644
--- a/primitives/consensus/common/Cargo.toml
+++ b/primitives/consensus/common/Cargo.toml
@@ -18,7 +18,7 @@ async-trait = "0.1.42"
 codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 futures = { version = "0.3.1", features = ["thread-pool"] }
 log = "0.4.8"
-sp-core = { path= "../../core", version = "4.0.0-dev"}
+sp-core = { path = "../../core", version = "4.0.0-dev"}
 sp-inherents = { version = "4.0.0-dev", path = "../../inherents" }
 sp-state-machine = { version = "0.10.0-dev", path = "../../state-machine" }
 futures-timer = "3.0.1"
diff --git a/primitives/consensus/common/src/lib.rs b/primitives/consensus/common/src/lib.rs
index f6c1e028b945..c72024e112d4 100644
--- a/primitives/consensus/common/src/lib.rs
+++ b/primitives/consensus/common/src/lib.rs
@@ -75,6 +75,16 @@ pub enum BlockOrigin {
 	File,
 }
 
+impl From<BlockOrigin> for sp_core::ExecutionContext {
+	fn from(origin: BlockOrigin) -> Self {
+		if origin == BlockOrigin::NetworkInitialSync {
+			sp_core::ExecutionContext::Syncing
+		} else {
+			sp_core::ExecutionContext::Importing
+		}
+	}
+}
+
 /// Environment for a Consensus instance.
 ///
 /// Creates proposer instance.

From ff8026c757cffbc500660e4dc76e0df8e9cffa64 Mon Sep 17 00:00:00 2001
From: Sergei Shulepov <sergei@parity.io>
Date: Tue, 3 Aug 2021 16:22:01 +0200
Subject: [PATCH 1050/1194] Explicitly support memory size changing in between
 allocations (#9477)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bastian Köcher <info@kchr.de>
---
 client/allocator/src/error.rs        |  3 ++
 client/allocator/src/freeing_bump.rs | 58 ++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/client/allocator/src/error.rs b/client/allocator/src/error.rs
index 2b2cc127dcfb..9b9a55325f75 100644
--- a/client/allocator/src/error.rs
+++ b/client/allocator/src/error.rs
@@ -24,6 +24,9 @@ pub enum Error {
 	/// Allocator run out of space.
 	#[error("Allocator ran out of space")]
 	AllocatorOutOfSpace,
+	/// The client passed a memory instance which is smaller than previously observed.
+	#[error("Shrinking of the underlying memory is observed")]
+	MemoryShrinked,
 	/// Some other error occurred.
 	#[error("Other: {0}")]
 	Other(&'static str),
diff --git a/client/allocator/src/freeing_bump.rs b/client/allocator/src/freeing_bump.rs
index c5c97feae826..ef401deed63f 100644
--- a/client/allocator/src/freeing_bump.rs
+++ b/client/allocator/src/freeing_bump.rs
@@ -326,6 +326,7 @@ pub struct FreeingBumpHeapAllocator {
 	poisoned: bool,
 	max_total_size: u32,
 	max_bumper: u32,
+	last_observed_memory_size: u32,
 }
 
 impl Drop for FreeingBumpHeapAllocator {
@@ -355,6 +356,7 @@ impl FreeingBumpHeapAllocator {
 			poisoned: false,
 			max_total_size: 0,
 			max_bumper: aligned_heap_base,
+			last_observed_memory_size: 0,
 		}
 	}
 
@@ -364,6 +366,9 @@ impl FreeingBumpHeapAllocator {
 	/// this function is rounded to the next power of two. If the requested
 	/// size is below 8 bytes it will be rounded up to 8 bytes.
 	///
+	/// The identity or the type of the passed memory object does not matter. However, the size of
+	/// memory cannot shrink compared to the memory passed in previous invocations.
+	///
 	/// NOTE: Once the allocator has returned an error all subsequent requests will return an error.
 	///
 	/// # Arguments
@@ -380,6 +385,8 @@ impl FreeingBumpHeapAllocator {
 		}
 
 		let bomb = PoisonBomb { poisoned: &mut self.poisoned };
+
+		Self::observe_memory_size(&mut self.last_observed_memory_size, mem)?;
 		let order = Order::from_size(size)?;
 
 		let header_ptr: u32 = match self.free_lists[order] {
@@ -430,6 +437,9 @@ impl FreeingBumpHeapAllocator {
 
 	/// Deallocates the space which was allocated for a pointer.
 	///
+	/// The identity or the type of the passed memory object does not matter. However, the size of
+	/// memory cannot shrink compared to the memory passed in previous invocations.
+	///
 	/// NOTE: Once the allocator has returned an error all subsequent requests will return an error.
 	///
 	/// # Arguments
@@ -447,6 +457,8 @@ impl FreeingBumpHeapAllocator {
 
 		let bomb = PoisonBomb { poisoned: &mut self.poisoned };
 
+		Self::observe_memory_size(&mut self.last_observed_memory_size, mem)?;
+
 		let header_ptr = u32::from(ptr)
 			.checked_sub(HEADER_SIZE)
 			.ok_or_else(|| error("Invalid pointer for deallocation"))?;
@@ -493,6 +505,17 @@ impl FreeingBumpHeapAllocator {
 		*bumper += size;
 		Ok(res)
 	}
+
+	fn observe_memory_size<M: Memory + ?Sized>(
+		last_observed_memory_size: &mut u32,
+		mem: &mut M,
+	) -> Result<(), Error> {
+		if mem.size() < *last_observed_memory_size {
+			return Err(Error::MemoryShrinked)
+		}
+		*last_observed_memory_size = mem.size();
+		Ok(())
+	}
 }
 
 /// A trait for abstraction of accesses to a wasm linear memory. Used to read or modify the
@@ -930,4 +953,39 @@ mod tests {
 			MAX_POSSIBLE_ALLOCATION
 		);
 	}
+
+	#[test]
+	fn accepts_growing_memory() {
+		const ITEM_SIZE: u32 = 16;
+		const ITEM_ON_HEAP_SIZE: usize = 16 + HEADER_SIZE as usize;
+
+		let mut mem = vec![0u8; ITEM_ON_HEAP_SIZE * 2];
+		let mut heap = FreeingBumpHeapAllocator::new(0);
+
+		let _ = heap.allocate(&mut mem[..], ITEM_SIZE).unwrap();
+		let _ = heap.allocate(&mut mem[..], ITEM_SIZE).unwrap();
+
+		mem.extend_from_slice(&[0u8; ITEM_ON_HEAP_SIZE]);
+
+		let _ = heap.allocate(&mut mem[..], ITEM_SIZE).unwrap();
+	}
+
+	#[test]
+	fn doesnt_accept_shrinking_memory() {
+		const ITEM_SIZE: u32 = 16;
+		const ITEM_ON_HEAP_SIZE: usize = 16 + HEADER_SIZE as usize;
+
+		let initial_size = ITEM_ON_HEAP_SIZE * 3;
+		let mut mem = vec![0u8; initial_size];
+		let mut heap = FreeingBumpHeapAllocator::new(0);
+
+		let _ = heap.allocate(&mut mem[..], ITEM_SIZE).unwrap();
+
+		mem.truncate(initial_size - 1);
+
+		match heap.allocate(&mut mem[..], ITEM_SIZE).unwrap_err() {
+			Error::MemoryShrinked => (),
+			_ => panic!(),
+		}
+	}
 }

From a8faaf4e0b16d91a5377959018253944ab88bb7b Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Tue, 3 Aug 2021 17:03:06 +0200
Subject: [PATCH 1051/1194] Refactor codec implementation for header (#9489)

* add test

* refactor
---
 primitives/runtime/src/generic/header.rs | 108 ++++++++++++++---------
 1 file changed, 65 insertions(+), 43 deletions(-)

diff --git a/primitives/runtime/src/generic/header.rs b/primitives/runtime/src/generic/header.rs
index 07b70337076b..d28f663db003 100644
--- a/primitives/runtime/src/generic/header.rs
+++ b/primitives/runtime/src/generic/header.rs
@@ -18,7 +18,7 @@
 //! Generic implementation of a block header.
 
 use crate::{
-	codec::{Codec, Decode, Encode, EncodeAsRef, Error, HasCompact, Input, Output},
+	codec::{Codec, Decode, Encode},
 	generic::Digest,
 	traits::{
 		self, AtLeast32BitUnsigned, Hash as HashT, MaybeDisplay, MaybeMallocSizeOf, MaybeSerialize,
@@ -31,7 +31,7 @@ use sp_core::U256;
 use sp_std::{convert::TryFrom, fmt::Debug};
 
 /// Abstraction over a block header for a substrate chain.
-#[derive(PartialEq, Eq, Clone, sp_core::RuntimeDebug)]
+#[derive(Encode, Decode, PartialEq, Eq, Clone, sp_core::RuntimeDebug)]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
 #[cfg_attr(feature = "std", serde(deny_unknown_fields))]
@@ -43,6 +43,7 @@ pub struct Header<Number: Copy + Into<U256> + TryFrom<U256>, Hash: HashT> {
 		feature = "std",
 		serde(serialize_with = "serialize_number", deserialize_with = "deserialize_number")
 	)]
+	#[codec(compact)]
 	pub number: Number,
 	/// The state trie merkle root
 	pub state_root: Hash::Output,
@@ -89,47 +90,6 @@ where
 	TryFrom::try_from(u256).map_err(|_| serde::de::Error::custom("Try from failed"))
 }
 
-impl<Number, Hash> Decode for Header<Number, Hash>
-where
-	Number: HasCompact + Copy + Into<U256> + TryFrom<U256>,
-	Hash: HashT,
-	Hash::Output: Decode,
-{
-	fn decode<I: Input>(input: &mut I) -> Result<Self, Error> {
-		Ok(Self {
-			parent_hash: Decode::decode(input)?,
-			number: <<Number as HasCompact>::Type>::decode(input)?.into(),
-			state_root: Decode::decode(input)?,
-			extrinsics_root: Decode::decode(input)?,
-			digest: Decode::decode(input)?,
-		})
-	}
-}
-
-impl<Number, Hash> Encode for Header<Number, Hash>
-where
-	Number: HasCompact + Copy + Into<U256> + TryFrom<U256>,
-	Hash: HashT,
-	Hash::Output: Encode,
-{
-	fn encode_to<T: Output + ?Sized>(&self, dest: &mut T) {
-		self.parent_hash.encode_to(dest);
-		<<<Number as HasCompact>::Type as EncodeAsRef<_>>::RefType>::from(&self.number)
-			.encode_to(dest);
-		self.state_root.encode_to(dest);
-		self.extrinsics_root.encode_to(dest);
-		self.digest.encode_to(dest);
-	}
-}
-
-impl<Number, Hash> codec::EncodeLike for Header<Number, Hash>
-where
-	Number: HasCompact + Copy + Into<U256> + TryFrom<U256>,
-	Hash: HashT,
-	Hash::Output: Encode,
-{
-}
-
 impl<Number, Hash> traits::Header for Header<Number, Hash>
 where
 	Number: Member
@@ -234,6 +194,7 @@ where
 #[cfg(all(test, feature = "std"))]
 mod tests {
 	use super::*;
+	use crate::traits::BlakeTwo256;
 
 	#[test]
 	fn should_serialize_numbers() {
@@ -264,4 +225,65 @@ mod tests {
 		assert_eq!(deserialize("\"0xffffffffffffffff\""), u64::MAX as u128);
 		assert_eq!(deserialize("\"0x10000000000000000\""), u64::MAX as u128 + 1);
 	}
+
+	#[test]
+	fn ensure_format_is_unchanged() {
+		let header = Header::<u32, BlakeTwo256> {
+			parent_hash: BlakeTwo256::hash(b"1"),
+			number: 2,
+			state_root: BlakeTwo256::hash(b"3"),
+			extrinsics_root: BlakeTwo256::hash(b"4"),
+			digest: crate::generic::Digest {
+				logs: vec![
+					crate::generic::DigestItem::ChangesTrieRoot(BlakeTwo256::hash(b"5")),
+					crate::generic::DigestItem::Other(b"6".to_vec()),
+				],
+			},
+		};
+
+		let header_encoded = header.encode();
+		assert_eq!(
+			header_encoded,
+			vec![
+				146, 205, 245, 120, 196, 112, 133, 165, 153, 34, 86, 240, 220, 249, 125, 11, 25,
+				241, 241, 201, 222, 77, 95, 227, 12, 58, 206, 97, 145, 182, 229, 219, 8, 88, 19,
+				72, 51, 123, 15, 62, 20, 134, 32, 23, 61, 170, 165, 249, 77, 0, 216, 129, 112, 93,
+				203, 240, 170, 131, 239, 218, 186, 97, 210, 237, 225, 235, 134, 73, 33, 73, 151,
+				87, 78, 32, 196, 100, 56, 138, 23, 36, 32, 210, 84, 3, 104, 43, 187, 184, 12, 73,
+				104, 49, 200, 204, 31, 143, 13, 8, 2, 112, 178, 1, 53, 47, 36, 191, 28, 151, 112,
+				185, 159, 143, 113, 32, 24, 33, 65, 28, 244, 20, 55, 124, 155, 140, 45, 188, 238,
+				97, 219, 135, 214, 0, 4, 54
+			],
+		);
+		assert_eq!(header, Header::<u32, BlakeTwo256>::decode(&mut &header_encoded[..]).unwrap());
+
+		let header = Header::<u32, BlakeTwo256> {
+			parent_hash: BlakeTwo256::hash(b"1000"),
+			number: 2000,
+			state_root: BlakeTwo256::hash(b"3000"),
+			extrinsics_root: BlakeTwo256::hash(b"4000"),
+			digest: crate::generic::Digest {
+				logs: vec![
+					crate::generic::DigestItem::Other(b"5000".to_vec()),
+					crate::generic::DigestItem::ChangesTrieRoot(BlakeTwo256::hash(b"6000")),
+				],
+			},
+		};
+
+		let header_encoded = header.encode();
+		assert_eq!(
+			header_encoded,
+			vec![
+				197, 243, 254, 225, 31, 117, 21, 218, 179, 213, 92, 6, 247, 164, 230, 25, 47, 166,
+				140, 117, 142, 159, 195, 202, 67, 196, 238, 26, 44, 18, 33, 92, 65, 31, 219, 225,
+				47, 12, 107, 88, 153, 146, 55, 21, 226, 186, 110, 48, 167, 187, 67, 183, 228, 232,
+				118, 136, 30, 254, 11, 87, 48, 112, 7, 97, 31, 82, 146, 110, 96, 87, 152, 68, 98,
+				162, 227, 222, 78, 14, 244, 194, 120, 154, 112, 97, 222, 144, 174, 101, 220, 44,
+				111, 126, 54, 34, 155, 220, 253, 124, 8, 0, 16, 53, 48, 48, 48, 2, 42, 105, 109,
+				150, 206, 223, 24, 44, 164, 77, 27, 137, 177, 220, 25, 170, 140, 35, 156, 246, 233,
+				112, 26, 23, 192, 61, 226, 14, 84, 219, 144, 252
+			],
+		);
+		assert_eq!(header, Header::<u32, BlakeTwo256>::decode(&mut &header_encoded[..]).unwrap());
+	}
 }

From 2e5d0934f40c6223900bee453e4d6f0b99ca4cd3 Mon Sep 17 00:00:00 2001
From: Squirrel <gilescope@gmail.com>
Date: Tue, 3 Aug 2021 19:57:03 +0100
Subject: [PATCH 1052/1194] crate missing dependency when compiled on its own
 with std (#9487)

* Everything else in frame compiles in std.

This doesn't on its own as it needs Debug and that's
in the extra-traits syn feature.

* Incorporating feedback
---
 frame/support/procedural/tools/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frame/support/procedural/tools/Cargo.toml b/frame/support/procedural/tools/Cargo.toml
index 83b896acc8ec..4c21cf00b9f0 100644
--- a/frame/support/procedural/tools/Cargo.toml
+++ b/frame/support/procedural/tools/Cargo.toml
@@ -15,5 +15,5 @@ targets = ["x86_64-unknown-linux-gnu"]
 frame-support-procedural-tools-derive = { version = "3.0.0", path = "./derive" }
 proc-macro2 = "1.0.28"
 quote = "1.0.3"
-syn = { version = "1.0.58", features = ["full", "visit"] }
+syn = { version = "1.0.58", features = ["full", "visit", "extra-traits"] }
 proc-macro-crate = "1.0.0"

From fa69d5fa16ff17d2bd2a0a546c7aa69c557ecafd Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Wed, 4 Aug 2021 10:45:56 +0200
Subject: [PATCH 1053/1194] Fix benchmarking macro for pallet with instance and
 where clause (#9485)

* fix benchmarking instance with where clause

* fmt

* add tests

* remove unused import

* fix tests

* doc
---
 frame/babe/src/benchmarking.rs           |  12 +-
 frame/benchmarking/src/lib.rs            | 165 ++++++++++----------
 frame/benchmarking/src/tests.rs          |  14 +-
 frame/benchmarking/src/tests_instance.rs | 183 +++++++++++++++++++++++
 frame/grandpa/src/benchmarking.rs        |  13 +-
 5 files changed, 289 insertions(+), 98 deletions(-)
 create mode 100644 frame/benchmarking/src/tests_instance.rs

diff --git a/frame/babe/src/benchmarking.rs b/frame/babe/src/benchmarking.rs
index b8a85daf6e66..372dfa532a89 100644
--- a/frame/babe/src/benchmarking.rs
+++ b/frame/babe/src/benchmarking.rs
@@ -69,14 +69,12 @@ benchmarks! {
 mod tests {
 	use super::*;
 	use crate::mock::*;
-	use frame_support::assert_ok;
 
-	#[test]
-	fn test_benchmarks() {
-		new_test_ext(3).execute_with(|| {
-			assert_ok!(test_benchmark_check_equivocation_proof::<Test>());
-		})
-	}
+	frame_benchmarking::impl_benchmark_test_suite!(
+		Pallet,
+		crate::mock::new_test_ext(3),
+		crate::mock::Test,
+	);
 
 	#[test]
 	fn test_generate_equivocation_report_blob() {
diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
index 7149ddc82f59..26ef4873c230 100644
--- a/frame/benchmarking/src/lib.rs
+++ b/frame/benchmarking/src/lib.rs
@@ -21,7 +21,10 @@
 
 #[cfg(feature = "std")]
 mod analysis;
+#[cfg(test)]
 mod tests;
+#[cfg(test)]
+mod tests_instance;
 mod utils;
 
 #[cfg(feature = "std")]
@@ -140,8 +143,8 @@ macro_rules! whitelist {
 /// ```
 ///
 /// Test functions are automatically generated for each benchmark and are accessible to you when you
-/// run `cargo test`. All tests are named `test_benchmark_<benchmark_name>`, expect you to pass them
-/// the Runtime Config, and run them in a test externalities environment. The test function runs your
+/// run `cargo test`. All tests are named `test_benchmark_<benchmark_name>`, implemented on the
+/// Pallet struct, and run them in a test externalities environment. The test function runs your
 /// benchmark just like a regular benchmark, but only testing at the lowest and highest values for
 /// each component. The function will return `Ok(())` if the benchmarks return no errors.
 ///
@@ -170,10 +173,10 @@ macro_rules! whitelist {
 /// #[test]
 /// fn test_benchmarks() {
 ///   new_test_ext().execute_with(|| {
-///     assert_ok!(test_benchmark_dummy::<Test>());
-///     assert_err!(test_benchmark_other_name::<Test>(), "Bad origin");
-///     assert_ok!(test_benchmark_sort_vector::<Test>());
-///     assert_err!(test_benchmark_broken_benchmark::<Test>(), "You forgot to sort!");
+///     assert_ok!(Pallet::<Test>::test_benchmark_dummy());
+///     assert_err!(Pallet::<Test>::test_benchmark_other_name(), "Bad origin");
+///     assert_ok!(Pallet::<Test>::test_benchmark_sort_vector());
+///     assert_err!(Pallet::<Test>::test_benchmark_broken_benchmark(), "You forgot to sort!");
 ///   });
 /// }
 /// ```
@@ -879,28 +882,30 @@ macro_rules! impl_benchmark {
 			}
 		}
 
-		/// Test a particular benchmark by name.
-		///
-		/// This isn't called `test_benchmark_by_name` just in case some end-user eventually
-		/// writes a benchmark, itself called `by_name`; the function would be shadowed in
-		/// that case.
-		///
-		/// This is generally intended to be used by child test modules such as those created
-		/// by the `impl_benchmark_test_suite` macro. However, it is not an error if a pallet
-		/// author chooses not to implement benchmarks.
 		#[cfg(test)]
-		#[allow(unused)]
-		fn test_bench_by_name<T>(name: &[u8]) -> Result<(), &'static str>
-		where
-			T: Config + frame_system::Config, $( $where_clause )*
+		impl<T: Config $(<$instance>, $instance: $instance_bound )? >
+			Pallet<T $(, $instance)? >
+		where T: frame_system::Config, $( $where_clause )*
 		{
-			let name = $crate::sp_std::str::from_utf8(name)
-				.map_err(|_| "`name` is not a valid utf8 string!")?;
-			match name {
-				$( stringify!($name) => {
-					$crate::paste::paste! { [< test_benchmark_ $name >]::<T>() }
-				} )*
-				_ => Err("Could not find test for requested benchmark."),
+			/// Test a particular benchmark by name.
+			///
+			/// This isn't called `test_benchmark_by_name` just in case some end-user eventually
+			/// writes a benchmark, itself called `by_name`; the function would be shadowed in
+			/// that case.
+			///
+			/// This is generally intended to be used by child test modules such as those created
+			/// by the `impl_benchmark_test_suite` macro. However, it is not an error if a pallet
+			/// author chooses not to implement benchmarks.
+			#[allow(unused)]
+			fn test_bench_by_name(name: &[u8]) -> Result<(), &'static str> {
+				let name = $crate::sp_std::str::from_utf8(name)
+					.map_err(|_| "`name` is not a valid utf8 string!")?;
+				match name {
+					$( stringify!($name) => {
+						$crate::paste::paste! { Self::[< test_benchmark_ $name >]() }
+					} )*
+					_ => Err("Could not find test for requested benchmark."),
+				}
 			}
 		}
 	};
@@ -918,59 +923,66 @@ macro_rules! impl_benchmark_test {
 		$name:ident
 	) => {
 		$crate::paste::item! {
-			fn [<test_benchmark_ $name>] <T: Config > () -> Result<(), &'static str>
-				where T: frame_system::Config, $( $where_clause )*
+			#[cfg(test)]
+			impl<T: Config $(<$instance>, $instance: $instance_bound )? >
+				Pallet<T $(, $instance)? >
+			where T: frame_system::Config, $( $where_clause )*
 			{
-				let selected_benchmark = SelectedBenchmark::$name;
-				let components = <
-					SelectedBenchmark as $crate::BenchmarkingSetup<T, _>
-				>::components(&selected_benchmark);
-
-				let execute_benchmark = |
-					c: $crate::Vec<($crate::BenchmarkParameter, u32)>
-				| -> Result<(), &'static str> {
-					// Set up the benchmark, return execution + verification function.
-					let closure_to_verify = <
+				#[allow(unused)]
+				fn [<test_benchmark_ $name>] () -> Result<(), &'static str> {
+					let selected_benchmark = SelectedBenchmark::$name;
+					let components = <
 						SelectedBenchmark as $crate::BenchmarkingSetup<T, _>
-					>::instance(&selected_benchmark, &c, true)?;
-
-					// Set the block number to at least 1 so events are deposited.
-					if $crate::Zero::is_zero(&frame_system::Pallet::<T>::block_number()) {
-						frame_system::Pallet::<T>::set_block_number(1u32.into());
-					}
+					>::components(&selected_benchmark);
+
+					let execute_benchmark = |
+						c: $crate::Vec<($crate::BenchmarkParameter, u32)>
+					| -> Result<(), &'static str> {
+						// Set up the benchmark, return execution + verification function.
+						let closure_to_verify = <
+							SelectedBenchmark as $crate::BenchmarkingSetup<T, _>
+						>::instance(&selected_benchmark, &c, true)?;
+
+						// Set the block number to at least 1 so events are deposited.
+						if $crate::Zero::is_zero(&frame_system::Pallet::<T>::block_number()) {
+							frame_system::Pallet::<T>::set_block_number(1u32.into());
+						}
 
-					// Run execution + verification
-					closure_to_verify()?;
+						// Run execution + verification
+						closure_to_verify()?;
 
-					// Reset the state
-					$crate::benchmarking::wipe_db();
+						// Reset the state
+						$crate::benchmarking::wipe_db();
 
-					Ok(())
-				};
+						Ok(())
+					};
 
-				if components.is_empty() {
-					execute_benchmark(Default::default())?;
-				} else {
-					for (_, (name, low, high)) in components.iter().enumerate() {
-						// Test only the low and high value, assuming values in the middle won't break
-						for component_value in $crate::vec![low, high] {
-							// Select the max value for all the other components.
-							let c: $crate::Vec<($crate::BenchmarkParameter, u32)> = components.iter()
-								.enumerate()
-								.map(|(_, (n, _, h))|
-									if n == name {
-										(*n, *component_value)
-									} else {
-										(*n, *h)
-									}
-								)
-								.collect();
-
-							execute_benchmark(c)?;
+					if components.is_empty() {
+						execute_benchmark(Default::default())?;
+					} else {
+						for (_, (name, low, high)) in components.iter().enumerate() {
+							// Test only the low and high value, assuming values in the middle
+							// won't break
+							for component_value in $crate::vec![low, high] {
+								// Select the max value for all the other components.
+								let c: $crate::Vec<($crate::BenchmarkParameter, u32)> = components
+									.iter()
+									.enumerate()
+									.map(|(_, (n, _, h))|
+										if n == name {
+											(*n, *component_value)
+										} else {
+											(*n, *h)
+										}
+									)
+									.collect();
+
+								execute_benchmark(c)?;
+							}
 						}
 					}
+					Ok(())
 				}
-				Ok(())
 			}
 		}
 	};
@@ -1084,7 +1096,7 @@ macro_rules! impl_benchmark_test_suite {
 		$test:path
 		$(, $( $rest:tt )* )?
 	) => {
-		impl_benchmark_test_suite!(
+		$crate::impl_benchmark_test_suite!(
 			@selected:
 				$bench_module,
 				$new_test_ext,
@@ -1109,7 +1121,7 @@ macro_rules! impl_benchmark_test_suite {
 			benchmarks_path = $benchmarks_path:ident
 			$(, $( $rest:tt )* )?
 	) => {
-		impl_benchmark_test_suite!(
+		$crate::impl_benchmark_test_suite!(
 			@selected:
 				$bench_module,
 				$new_test_ext,
@@ -1134,7 +1146,7 @@ macro_rules! impl_benchmark_test_suite {
 			extra = $extra:expr
 			$(, $( $rest:tt )* )?
 	) => {
-		impl_benchmark_test_suite!(
+		$crate::impl_benchmark_test_suite!(
 			@selected:
 				$bench_module,
 				$new_test_ext,
@@ -1159,7 +1171,7 @@ macro_rules! impl_benchmark_test_suite {
 			exec_name = $exec_name:ident
 			$(, $( $rest:tt )* )?
 	) => {
-		impl_benchmark_test_suite!(
+		$crate::impl_benchmark_test_suite!(
 			@selected:
 				$bench_module,
 				$new_test_ext,
@@ -1185,7 +1197,6 @@ macro_rules! impl_benchmark_test_suite {
 	) => {
 		#[cfg(test)]
 		mod benchmark_tests {
-			use $path_to_benchmarks_invocation::test_bench_by_name;
 			use super::$bench_module;
 
 			#[test]
@@ -1196,7 +1207,9 @@ macro_rules! impl_benchmark_test_suite {
 					let mut anything_failed = false;
 					println!("failing benchmark tests:");
 					for benchmark_name in $bench_module::<$test>::benchmarks($extra) {
-						match std::panic::catch_unwind(|| test_bench_by_name::<$test>(benchmark_name)) {
+						match std::panic::catch_unwind(|| {
+							$bench_module::<$test>::test_bench_by_name(benchmark_name)
+						}) {
 							Err(err) => {
 								println!("{}: {:?}", String::from_utf8_lossy(benchmark_name), err);
 								anything_failed = true;
diff --git a/frame/benchmarking/src/tests.rs b/frame/benchmarking/src/tests.rs
index 7bb1f9d7d62c..aabdb7815c55 100644
--- a/frame/benchmarking/src/tests.rs
+++ b/frame/benchmarking/src/tests.rs
@@ -291,13 +291,13 @@ mod benchmarks {
 	#[test]
 	fn benchmarks_generate_unit_tests() {
 		new_test_ext().execute_with(|| {
-			assert_ok!(test_benchmark_set_value::<Test>());
-			assert_ok!(test_benchmark_other_name::<Test>());
-			assert_ok!(test_benchmark_sort_vector::<Test>());
-			assert_err!(test_benchmark_bad_origin::<Test>(), "Bad origin");
-			assert_err!(test_benchmark_bad_verify::<Test>(), "You forgot to sort!");
-			assert_ok!(test_benchmark_no_components::<Test>());
-			assert_ok!(test_benchmark_variable_components::<Test>());
+			assert_ok!(Pallet::<Test>::test_benchmark_set_value());
+			assert_ok!(Pallet::<Test>::test_benchmark_other_name());
+			assert_ok!(Pallet::<Test>::test_benchmark_sort_vector());
+			assert_err!(Pallet::<Test>::test_benchmark_bad_origin(), "Bad origin");
+			assert_err!(Pallet::<Test>::test_benchmark_bad_verify(), "You forgot to sort!");
+			assert_ok!(Pallet::<Test>::test_benchmark_no_components());
+			assert_ok!(Pallet::<Test>::test_benchmark_variable_components());
 		});
 	}
 }
diff --git a/frame/benchmarking/src/tests_instance.rs b/frame/benchmarking/src/tests_instance.rs
new file mode 100644
index 000000000000..221e9faa5c4a
--- /dev/null
+++ b/frame/benchmarking/src/tests_instance.rs
@@ -0,0 +1,183 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Tests for the benchmark macro for instantiable modules
+
+#![cfg(test)]
+
+use super::*;
+use frame_support::parameter_types;
+use sp_runtime::{
+	testing::{Header, H256},
+	traits::{BlakeTwo256, IdentityLookup},
+	BuildStorage,
+};
+use sp_std::prelude::*;
+
+mod pallet_test {
+	use frame_support::pallet_prelude::Get;
+
+	frame_support::decl_storage! {
+		trait Store for Module<T: Config<I>, I: Instance = DefaultInstance> as Test where
+			<T as OtherConfig>::OtherEvent: Into<<T as Config<I>>::Event>
+		{
+			pub Value get(fn value): Option<u32>;
+		}
+	}
+
+	frame_support::decl_module! {
+		pub struct Module<T: Config<I>, I: Instance = DefaultInstance> for enum Call where
+			origin: T::Origin, <T as OtherConfig>::OtherEvent: Into<<T as Config<I>>::Event>
+		{
+			#[weight = 0]
+			fn set_value(origin, n: u32) -> frame_support::dispatch::DispatchResult {
+				let _sender = frame_system::ensure_signed(origin)?;
+				Value::<I>::put(n);
+				Ok(())
+			}
+
+			#[weight = 0]
+			fn dummy(origin, _n: u32) -> frame_support::dispatch::DispatchResult {
+				let _sender = frame_system::ensure_none(origin)?;
+				Ok(())
+			}
+		}
+	}
+
+	pub trait OtherConfig {
+		type OtherEvent;
+	}
+
+	pub trait Config<I: Instance = DefaultInstance>: frame_system::Config + OtherConfig
+	where
+		Self::OtherEvent: Into<<Self as Config<I>>::Event>,
+	{
+		type Event;
+		type LowerBound: Get<u32>;
+		type UpperBound: Get<u32>;
+	}
+}
+
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		TestPallet: pallet_test::{Pallet, Call, Storage},
+	}
+);
+
+impl frame_system::Config for Test {
+	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
+	type Origin = Origin;
+	type Index = u64;
+	type BlockNumber = u64;
+	type Hash = H256;
+	type Call = Call;
+	type Hashing = BlakeTwo256;
+	type AccountId = u64;
+	type Lookup = IdentityLookup<Self::AccountId>;
+	type Header = Header;
+	type Event = Event;
+	type BlockHashCount = ();
+	type Version = ();
+	type PalletInfo = PalletInfo;
+	type AccountData = ();
+	type OnNewAccount = ();
+	type OnKilledAccount = ();
+	type SystemWeightInfo = ();
+	type SS58Prefix = ();
+	type OnSetCode = ();
+}
+
+parameter_types! {
+	pub const LowerBound: u32 = 1;
+	pub const UpperBound: u32 = 100;
+}
+
+impl pallet_test::Config for Test {
+	type Event = Event;
+	type LowerBound = LowerBound;
+	type UpperBound = UpperBound;
+}
+
+impl pallet_test::OtherConfig for Test {
+	type OtherEvent = Event;
+}
+
+fn new_test_ext() -> sp_io::TestExternalities {
+	GenesisConfig::default().build_storage().unwrap().into()
+}
+
+mod benchmarks {
+	use super::pallet_test::{self, Value};
+	use crate::account;
+	use frame_support::{ensure, StorageValue};
+	use frame_system::RawOrigin;
+	use sp_std::prelude::*;
+
+	// Additional used internally by the benchmark macro.
+	use super::pallet_test::{Call, Config, Pallet};
+	use frame_support::traits::Instance;
+
+	crate::benchmarks_instance! {
+		where_clause {
+			where
+				<T as pallet_test::OtherConfig>::OtherEvent: Clone
+					+ Into<<T as pallet_test::Config<I>>::Event>,
+				<T as pallet_test::Config<I>>::Event: Clone,
+		}
+
+		set_value {
+			let b in 1 .. 1000;
+			let caller = account::<T::AccountId>("caller", 0, 0);
+		}: _ (RawOrigin::Signed(caller), b.into())
+		verify {
+			assert_eq!(Value::<pallet_test::DefaultInstance>::get(), Some(b));
+		}
+
+		other_name {
+			let b in 1 .. 1000;
+		}: dummy (RawOrigin::None, b.into())
+
+		sort_vector {
+			let x in 1 .. 10000;
+			let mut m = Vec::<u32>::new();
+			for i in (0..x).rev() {
+				m.push(i);
+			}
+		}: {
+			m.sort();
+		} verify {
+			ensure!(m[0] == 0, "You forgot to sort!")
+		}
+	}
+
+	crate::impl_benchmark_test_suite!(
+		Pallet,
+		crate::tests_instance::new_test_ext(),
+		crate::tests_instance::Test
+	);
+}
diff --git a/frame/grandpa/src/benchmarking.rs b/frame/grandpa/src/benchmarking.rs
index d5372c5687a4..b0f70adb6061 100644
--- a/frame/grandpa/src/benchmarking.rs
+++ b/frame/grandpa/src/benchmarking.rs
@@ -76,15 +76,12 @@ benchmarks! {
 mod tests {
 	use super::*;
 	use crate::mock::*;
-	use frame_support::assert_ok;
 
-	#[test]
-	fn test_benchmarks() {
-		new_test_ext(vec![(1, 1), (2, 1), (3, 1)]).execute_with(|| {
-			assert_ok!(test_benchmark_check_equivocation_proof::<Test>());
-			assert_ok!(test_benchmark_note_stalled::<Test>());
-		})
-	}
+	frame_benchmarking::impl_benchmark_test_suite!(
+		Pallet,
+		crate::mock::new_test_ext(vec![(1, 1), (2, 1), (3, 1)]),
+		crate::mock::Test,
+	);
 
 	#[test]
 	fn test_generate_equivocation_report_blob() {

From 8e52c1054a7585829ecd7a5b25af8af08acdf340 Mon Sep 17 00:00:00 2001
From: Squirrel <gilescope@gmail.com>
Date: Wed, 4 Aug 2021 11:57:08 +0100
Subject: [PATCH 1054/1194] Removing wasm unused import warnings (#9492)

* Removing wasm unused import warnings

* cargo fmt
---
 primitives/authorship/src/lib.rs             | 4 +++-
 primitives/npos-elections/src/assignments.rs | 1 +
 utils/prometheus/src/lib.rs                  | 5 ++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/primitives/authorship/src/lib.rs b/primitives/authorship/src/lib.rs
index 254078b8445a..ac4b5fd315dc 100644
--- a/primitives/authorship/src/lib.rs
+++ b/primitives/authorship/src/lib.rs
@@ -21,7 +21,9 @@
 
 use sp_std::{prelude::*, result::Result};
 
-use codec::{Decode, Encode};
+#[cfg(feature = "std")]
+use codec::Decode;
+use codec::Encode;
 use sp_inherents::{Error, InherentData, InherentIdentifier, IsFatalError};
 use sp_runtime::{traits::Header as HeaderT, RuntimeString};
 
diff --git a/primitives/npos-elections/src/assignments.rs b/primitives/npos-elections/src/assignments.rs
index b0dd29dc1904..da101e64a71a 100644
--- a/primitives/npos-elections/src/assignments.rs
+++ b/primitives/npos-elections/src/assignments.rs
@@ -18,6 +18,7 @@
 //! Structs and helpers for distributing a voter's stake among various winners.
 
 use crate::{Error, ExtendedBalance, IdentifierT, PerThing128, __OrInvalidIndex};
+#[cfg(feature = "std")]
 use codec::{Decode, Encode};
 use sp_arithmetic::{
 	traits::{Bounded, Zero},
diff --git a/utils/prometheus/src/lib.rs b/utils/prometheus/src/lib.rs
index 96407b006235..3753ab9061bc 100644
--- a/utils/prometheus/src/lib.rs
+++ b/utils/prometheus/src/lib.rs
@@ -15,7 +15,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#[cfg(not(target_os = "unknown"))]
 use futures_util::{future::Future, FutureExt};
+use prometheus::core::Collector;
 pub use prometheus::{
 	self,
 	core::{
@@ -25,7 +27,8 @@ pub use prometheus::{
 	exponential_buckets, Error as PrometheusError, Histogram, HistogramOpts, HistogramVec, Opts,
 	Registry,
 };
-use prometheus::{core::Collector, Encoder, TextEncoder};
+#[cfg(not(target_os = "unknown"))]
+use prometheus::{Encoder, TextEncoder};
 use std::net::SocketAddr;
 
 #[cfg(not(target_os = "unknown"))]

From b7409a2257c7c231b485ee827daa73d05d303047 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Wed, 4 Aug 2021 15:38:14 +0200
Subject: [PATCH 1055/1194] Decouples light-sync state from chain spec (#9491)

* Decouples light-sync state from chain spec

This decouples the light-sync state from chain spec. First, the
light-sync state currently only works with BABE+Grandpa, so not
all *Substrate* based chains can use this feature. The next problem was
also that this pulled the `sc-consensus-babe` and `sc-finality-grandpa`
crate into `sc-chain-spec`.

If a chain now wants to support the light-sync state, it needs to add
the `LightSyncStateExtension` to the chain spec as an extension. This is
documented in the crate level docs of `sc-sync-state-rpc`. If this
extension is not available, `SyncStateRpc` fails at initialization.

* Fix compilation for browser

* Fmt
---
 Cargo.lock                            |   7 +-
 bin/node-template/node/src/service.rs |   4 +-
 bin/node/cli/Cargo.toml               |   1 +
 bin/node/cli/src/chain_spec.rs        |   2 +
 bin/node/cli/src/service.rs           |   7 +-
 bin/node/rpc/src/lib.rs               |   6 +-
 client/chain-spec/Cargo.toml          |   4 -
 client/chain-spec/derive/src/impls.rs |   9 ++
 client/chain-spec/src/chain_spec.rs   |  81 +++--------------
 client/chain-spec/src/extension.rs    |  44 +++++++--
 client/chain-spec/src/lib.rs          |  12 +--
 client/consensus/babe/src/lib.rs      |   2 +-
 client/service/src/builder.rs         |  20 ++---
 client/service/src/lib.rs             |  34 ++++---
 client/sync-state-rpc/Cargo.toml      |   2 +
 client/sync-state-rpc/src/lib.rs      | 123 +++++++++++++++++++++-----
 test-utils/test-runner/src/client.rs  |   2 +-
 17 files changed, 211 insertions(+), 149 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 11359c078140..cc6299397b6c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4222,6 +4222,7 @@ dependencies = [
  "sc-rpc",
  "sc-service",
  "sc-service-test",
+ "sc-sync-state-rpc",
  "sc-telemetry",
  "sc-tracing",
  "sc-transaction-pool",
@@ -7126,14 +7127,10 @@ dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
  "sc-chain-spec-derive",
- "sc-consensus-babe",
- "sc-consensus-epochs",
- "sc-finality-grandpa",
  "sc-network",
  "sc-telemetry",
  "serde",
  "serde_json",
- "sp-consensus-babe",
  "sp-core",
  "sp-runtime",
 ]
@@ -8151,12 +8148,14 @@ dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
+ "parity-scale-codec",
  "sc-chain-spec",
  "sc-client-api",
  "sc-consensus-babe",
  "sc-consensus-epochs",
  "sc-finality-grandpa",
  "sc-rpc-api",
+ "serde",
  "serde_json",
  "sp-blockchain",
  "sp-runtime",
diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
index 9eba1d0e9e05..8eef2ce0905b 100644
--- a/bin/node-template/node/src/service.rs
+++ b/bin/node-template/node/src/service.rs
@@ -203,7 +203,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 			let deps =
 				crate::rpc::FullDeps { client: client.clone(), pool: pool.clone(), deny_unsafe };
 
-			crate::rpc::create_full(deps)
+			Ok(crate::rpc::create_full(deps))
 		})
 	};
 
@@ -436,7 +436,7 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		transaction_pool,
 		task_manager: &mut task_manager,
 		on_demand: Some(on_demand),
-		rpc_extensions_builder: Box::new(|_, _| ()),
+		rpc_extensions_builder: Box::new(|_, _| Ok(())),
 		config,
 		client,
 		keystore: keystore_container.sync_keystore(),
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index 12a76cf323e4..21c42a5ed2f6 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -77,6 +77,7 @@ sc-service = { version = "0.10.0-dev", default-features = false, path = "../../.
 sc-tracing = { version = "4.0.0-dev", path = "../../../client/tracing" }
 sc-telemetry = { version = "4.0.0-dev", path = "../../../client/telemetry" }
 sc-authority-discovery = { version = "0.10.0-dev",  path = "../../../client/authority-discovery" }
+sc-sync-state-rpc = { version = "0.10.0-dev", path = "../../../client/sync-state-rpc" }
 
 # frame dependencies
 pallet-indices = { version = "4.0.0-dev", path = "../../../frame/indices" }
diff --git a/bin/node/cli/src/chain_spec.rs b/bin/node/cli/src/chain_spec.rs
index 2891736e5c22..5d9e049cc366 100644
--- a/bin/node/cli/src/chain_spec.rs
+++ b/bin/node/cli/src/chain_spec.rs
@@ -57,6 +57,8 @@ pub struct Extensions {
 	pub fork_blocks: sc_client_api::ForkBlocks<Block>,
 	/// Known bad block hashes.
 	pub bad_blocks: sc_client_api::BadBlocks<Block>,
+	/// The light sync state extension used by the sync-state rpc.
+	pub light_sync_state: sc_sync_state_rpc::LightSyncStateExtension,
 }
 
 /// Specialized `ChainSpec`.
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index 301df01c55f8..1bd1e6748568 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -49,7 +49,10 @@ pub fn new_partial(
 		sc_consensus::DefaultImportQueue<Block, FullClient>,
 		sc_transaction_pool::FullPool<Block, FullClient>,
 		(
-			impl Fn(node_rpc::DenyUnsafe, sc_rpc::SubscriptionTaskExecutor) -> node_rpc::IoHandler,
+			impl Fn(
+				node_rpc::DenyUnsafe,
+				sc_rpc::SubscriptionTaskExecutor,
+			) -> Result<node_rpc::IoHandler, sc_service::Error>,
 			(
 				sc_consensus_babe::BabeBlockImport<Block, FullClient, FullGrandpaBlockImport>,
 				grandpa::LinkHalf<Block, FullClient, FullSelectChain>,
@@ -180,7 +183,7 @@ pub fn new_partial(
 				},
 			};
 
-			node_rpc::create_full(deps)
+			node_rpc::create_full(deps).map_err(Into::into)
 		};
 
 		(rpc_extensions_builder, rpc_setup)
diff --git a/bin/node/rpc/src/lib.rs b/bin/node/rpc/src/lib.rs
index 1b326eda6c19..2f7862d3d264 100644
--- a/bin/node/rpc/src/lib.rs
+++ b/bin/node/rpc/src/lib.rs
@@ -111,7 +111,7 @@ pub type IoHandler = jsonrpc_core::IoHandler<sc_rpc::Metadata>;
 /// Instantiate all Full RPC extensions.
 pub fn create_full<C, P, SC, B>(
 	deps: FullDeps<C, P, SC, B>,
-) -> jsonrpc_core::IoHandler<sc_rpc_api::Metadata>
+) -> Result<jsonrpc_core::IoHandler<sc_rpc_api::Metadata>, Box<dyn std::error::Error + Send + Sync>>
 where
 	C: ProvideRuntimeApi<Block>
 		+ HeaderBackend<Block>
@@ -178,10 +178,10 @@ where
 			shared_authority_set,
 			shared_epoch_changes,
 			deny_unsafe,
-		),
+		)?,
 	));
 
-	io
+	Ok(io)
 }
 
 /// Instantiate all Light RPC extensions.
diff --git a/client/chain-spec/Cargo.toml b/client/chain-spec/Cargo.toml
index fcc5bc3bda94..3243430989c7 100644
--- a/client/chain-spec/Cargo.toml
+++ b/client/chain-spec/Cargo.toml
@@ -22,7 +22,3 @@ serde_json = "1.0.41"
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
 sc-telemetry = { version = "4.0.0-dev", path = "../telemetry" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-sc-consensus-babe = { version = "0.10.0-dev", path = "../consensus/babe" }
-sp-consensus-babe = { version = "0.10.0-dev", path = "../../primitives/consensus/babe" }
-sc-consensus-epochs = { version = "0.10.0-dev", path = "../consensus/epochs" }
-sc-finality-grandpa = { version = "0.10.0-dev", path = "../finality-grandpa" }
diff --git a/client/chain-spec/derive/src/impls.rs b/client/chain-spec/derive/src/impls.rs
index 23415903b464..8c56430e81d0 100644
--- a/client/chain-spec/derive/src/impls.rs
+++ b/client/chain-spec/derive/src/impls.rs
@@ -65,6 +65,15 @@ pub fn extension_derive(ast: &DeriveInput) -> proc_macro::TokenStream {
 						_ => self,
 					}
 				}
+
+				fn get_any_mut(&mut self, t: std::any::TypeId) -> &mut dyn std::any::Any {
+					use std::any::{Any, TypeId};
+
+					match t {
+						#( x if x == TypeId::of::<#field_types>() => &mut self.#field_names ),*,
+						_ => self,
+					}
+				}
 			}
 		}
 	})
diff --git a/client/chain-spec/src/chain_spec.rs b/client/chain-spec/src/chain_spec.rs
index 681ab8ea640a..fcdb053c47c1 100644
--- a/client/chain-spec/src/chain_spec.rs
+++ b/client/chain-spec/src/chain_spec.rs
@@ -28,10 +28,7 @@ use sp_core::{
 	storage::{ChildInfo, Storage, StorageChild, StorageData, StorageKey},
 	Bytes,
 };
-use sp_runtime::{
-	traits::{Block as BlockT, NumberFor},
-	BuildStorage,
-};
+use sp_runtime::BuildStorage;
 use std::{borrow::Cow, collections::HashMap, fs::File, path::PathBuf, sync::Arc};
 
 enum GenesisSource<G> {
@@ -167,7 +164,6 @@ struct ClientSpec<E> {
 	consensus_engine: (),
 	#[serde(skip_serializing)]
 	genesis: serde::de::IgnoredAny,
-	light_sync_state: Option<SerializableLightSyncState>,
 	/// Mapping from `block_hash` to `wasm_code`.
 	///
 	/// The given `wasm_code` will be used to substitute the on-chain wasm code from the given
@@ -231,11 +227,16 @@ impl<G, E> ChainSpec<G, E> {
 		self.client_spec.boot_nodes.push(addr)
 	}
 
-	/// Returns a reference to defined chain spec extensions.
+	/// Returns a reference to the defined chain spec extensions.
 	pub fn extensions(&self) -> &E {
 		&self.client_spec.extensions
 	}
 
+	/// Returns a mutable reference to the defined chain spec extensions.
+	pub fn extensions_mut(&mut self) -> &mut E {
+		&mut self.client_spec.extensions
+	}
+
 	/// Create hardcoded spec.
 	pub fn from_genesis<F: Fn() -> G + 'static + Send + Sync>(
 		name: &str,
@@ -259,7 +260,6 @@ impl<G, E> ChainSpec<G, E> {
 			extensions,
 			consensus_engine: (),
 			genesis: Default::default(),
-			light_sync_state: None,
 			code_substitutes: HashMap::new(),
 		};
 
@@ -270,11 +270,6 @@ impl<G, E> ChainSpec<G, E> {
 	fn chain_type(&self) -> ChainType {
 		self.client_spec.chain_type.clone()
 	}
-
-	/// Hardcode infomation to allow light clients to sync quickly into the chain spec.
-	fn set_light_sync_state(&mut self, light_sync_state: SerializableLightSyncState) {
-		self.client_spec.light_sync_state = Some(light_sync_state);
-	}
 }
 
 impl<G, E: serde::de::DeserializeOwned> ChainSpec<G, E> {
@@ -379,6 +374,10 @@ where
 		ChainSpec::extensions(self) as &dyn GetExtension
 	}
 
+	fn extensions_mut(&mut self) -> &mut dyn GetExtension {
+		ChainSpec::extensions_mut(self) as &mut dyn GetExtension
+	}
+
 	fn as_json(&self, raw: bool) -> Result<String, String> {
 		ChainSpec::as_json(self, raw)
 	}
@@ -395,10 +394,6 @@ where
 		self.genesis = GenesisSource::Storage(storage);
 	}
 
-	fn set_light_sync_state(&mut self, light_sync_state: SerializableLightSyncState) {
-		ChainSpec::set_light_sync_state(self, light_sync_state)
-	}
-
 	fn code_substitutes(&self) -> std::collections::HashMap<String, Vec<u8>> {
 		self.client_spec
 			.code_substitutes
@@ -408,60 +403,6 @@ where
 	}
 }
 
-/// Hardcoded infomation that allows light clients to sync quickly.
-pub struct LightSyncState<Block: BlockT> {
-	/// The header of the best finalized block.
-	pub finalized_block_header: <Block as BlockT>::Header,
-	/// The epoch changes tree for babe.
-	pub babe_epoch_changes: sc_consensus_epochs::EpochChangesFor<Block, sc_consensus_babe::Epoch>,
-	/// The babe weight of the finalized block.
-	pub babe_finalized_block_weight: sp_consensus_babe::BabeBlockWeight,
-	/// The authority set for grandpa.
-	pub grandpa_authority_set:
-		sc_finality_grandpa::AuthoritySet<<Block as BlockT>::Hash, NumberFor<Block>>,
-}
-
-impl<Block: BlockT> LightSyncState<Block> {
-	/// Convert into a `SerializableLightSyncState`.
-	pub fn to_serializable(&self) -> SerializableLightSyncState {
-		use codec::Encode;
-
-		SerializableLightSyncState {
-			finalized_block_header: StorageData(self.finalized_block_header.encode()),
-			babe_epoch_changes: StorageData(self.babe_epoch_changes.encode()),
-			babe_finalized_block_weight: self.babe_finalized_block_weight,
-			grandpa_authority_set: StorageData(self.grandpa_authority_set.encode()),
-		}
-	}
-
-	/// Convert from a `SerializableLightSyncState`.
-	pub fn from_serializable(
-		serialized: &SerializableLightSyncState,
-	) -> Result<Self, codec::Error> {
-		Ok(Self {
-			finalized_block_header: codec::Decode::decode(
-				&mut &serialized.finalized_block_header.0[..],
-			)?,
-			babe_epoch_changes: codec::Decode::decode(&mut &serialized.babe_epoch_changes.0[..])?,
-			babe_finalized_block_weight: serialized.babe_finalized_block_weight,
-			grandpa_authority_set: codec::Decode::decode(
-				&mut &serialized.grandpa_authority_set.0[..],
-			)?,
-		})
-	}
-}
-
-/// The serializable form of `LightSyncState`. Created using `LightSyncState::serialize`.
-#[derive(Serialize, Deserialize, Clone, Debug)]
-#[serde(rename_all = "camelCase")]
-#[serde(deny_unknown_fields)]
-pub struct SerializableLightSyncState {
-	finalized_block_header: StorageData,
-	babe_epoch_changes: StorageData,
-	babe_finalized_block_weight: sp_consensus_babe::BabeBlockWeight,
-	grandpa_authority_set: StorageData,
-}
-
 #[cfg(test)]
 mod tests {
 	use super::*;
diff --git a/client/chain-spec/src/extension.rs b/client/chain-spec/src/extension.rs
index 665f51303b6a..4b59232cf577 100644
--- a/client/chain-spec/src/extension.rs
+++ b/client/chain-spec/src/extension.rs
@@ -126,8 +126,10 @@ pub trait Extension: Serialize + DeserializeOwned + Clone {
 
 	/// Get an extension of specific type.
 	fn get<T: 'static>(&self) -> Option<&T>;
-	/// Get an extension of specific type as refernce to `Any`
+	/// Get an extension of specific type as reference to `Any`.
 	fn get_any(&self, t: TypeId) -> &dyn Any;
+	/// Get an extension of specific type as mutable reference to `Any`.
+	fn get_any_mut(&mut self, t: TypeId) -> &mut dyn Any;
 
 	/// Get forkable extensions of specific type.
 	fn forks<BlockNumber, T>(&self) -> Option<Forks<BlockNumber, T>>
@@ -151,6 +153,9 @@ impl Extension for crate::NoExtension {
 	fn get_any(&self, _t: TypeId) -> &dyn Any {
 		self
 	}
+	fn get_any_mut(&mut self, _: TypeId) -> &mut dyn Any {
+		self
+	}
 }
 
 pub trait IsForks {
@@ -240,16 +245,26 @@ where
 	type Forks = Self;
 
 	fn get<T: 'static>(&self) -> Option<&T> {
-		match TypeId::of::<T>() {
-			x if x == TypeId::of::<E>() => <dyn Any>::downcast_ref(&self.base),
-			_ => self.base.get(),
+		if TypeId::of::<T>() == TypeId::of::<E>() {
+			<dyn Any>::downcast_ref(&self.base)
+		} else {
+			self.base.get()
 		}
 	}
 
 	fn get_any(&self, t: TypeId) -> &dyn Any {
-		match t {
-			x if x == TypeId::of::<E>() => &self.base,
-			_ => self.base.get_any(t),
+		if t == TypeId::of::<E>() {
+			&self.base
+		} else {
+			self.base.get_any(t)
+		}
+	}
+
+	fn get_any_mut(&mut self, t: TypeId) -> &mut dyn Any {
+		if t == TypeId::of::<E>() {
+			&mut self.base
+		} else {
+			self.base.get_any_mut(t)
 		}
 	}
 
@@ -273,20 +288,31 @@ where
 pub trait GetExtension {
 	/// Get an extension of specific type.
 	fn get_any(&self, t: TypeId) -> &dyn Any;
+
+	/// Get an extension of specific type with mutable access.
+	fn get_any_mut(&mut self, t: TypeId) -> &mut dyn Any;
 }
 
 impl<E: Extension> GetExtension for E {
 	fn get_any(&self, t: TypeId) -> &dyn Any {
 		Extension::get_any(self, t)
 	}
+
+	fn get_any_mut(&mut self, t: TypeId) -> &mut dyn Any {
+		Extension::get_any_mut(self, t)
+	}
 }
 
-/// Helper function that queries an extension by type from `GetExtension`
-/// trait object.
+/// Helper function that queries an extension by type from `GetExtension` trait object.
 pub fn get_extension<T: 'static>(e: &dyn GetExtension) -> Option<&T> {
 	<dyn Any>::downcast_ref(GetExtension::get_any(e, TypeId::of::<T>()))
 }
 
+/// Helper function that queries an extension by type from `GetExtension` trait object.
+pub fn get_extension_mut<T: 'static>(e: &mut dyn GetExtension) -> Option<&mut T> {
+	<dyn Any>::downcast_mut(GetExtension::get_any_mut(e, TypeId::of::<T>()))
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;
diff --git a/client/chain-spec/src/lib.rs b/client/chain-spec/src/lib.rs
index ac580802a5d5..334d8f8b3d7a 100644
--- a/client/chain-spec/src/lib.rs
+++ b/client/chain-spec/src/lib.rs
@@ -110,10 +110,10 @@
 mod chain_spec;
 mod extension;
 
-pub use chain_spec::{
-	ChainSpec as GenericChainSpec, LightSyncState, NoExtension, SerializableLightSyncState,
+pub use chain_spec::{ChainSpec as GenericChainSpec, NoExtension};
+pub use extension::{
+	get_extension, get_extension_mut, Extension, Fork, Forks, GetExtension, Group,
 };
-pub use extension::{get_extension, Extension, Fork, Forks, GetExtension, Group};
 pub use sc_chain_spec_derive::{ChainSpecExtension, ChainSpecGroup};
 
 use sc_network::config::MultiaddrWithPeerId;
@@ -169,8 +169,10 @@ pub trait ChainSpec: BuildStorage + Send + Sync {
 	///
 	/// Returns an empty JSON object if 'properties' not defined in config
 	fn properties(&self) -> Properties;
-	/// Returns a reference to defined chain spec extensions.
+	/// Returns a reference to the defined chain spec extensions.
 	fn extensions(&self) -> &dyn GetExtension;
+	/// Returns a mutable reference to the defined chain spec extensions.
+	fn extensions_mut(&mut self) -> &mut dyn GetExtension;
 	/// Add a bootnode to the list.
 	fn add_boot_node(&mut self, addr: MultiaddrWithPeerId);
 	/// Return spec as JSON.
@@ -183,8 +185,6 @@ pub trait ChainSpec: BuildStorage + Send + Sync {
 	///
 	/// This will be used as storage at genesis.
 	fn set_storage(&mut self, storage: Storage);
-	/// Hardcode infomation to allow light clients to sync quickly into the chain spec.
-	fn set_light_sync_state(&mut self, light_sync_state: SerializableLightSyncState);
 	/// Returns code substitutes that should be used for the on chain wasm.
 	fn code_substitutes(&self) -> std::collections::HashMap<String, Vec<u8>>;
 }
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index 2828c345c459..d5caf36542ee 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -127,7 +127,7 @@ pub use sp_consensus_babe::{
 		CompatibleDigestItem, NextConfigDescriptor, NextEpochDescriptor, PreDigest,
 		PrimaryPreDigest, SecondaryPlainPreDigest,
 	},
-	AuthorityId, AuthorityPair, AuthoritySignature, BabeApi, BabeAuthorityWeight,
+	AuthorityId, AuthorityPair, AuthoritySignature, BabeApi, BabeAuthorityWeight, BabeBlockWeight,
 	BabeEpochConfiguration, BabeGenesisConfiguration, ConsensusLog, BABE_ENGINE_ID,
 	VRF_OUTPUT_LENGTH,
 };
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index fb24a890133c..83c8e1d9d1cb 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -80,12 +80,12 @@ pub trait RpcExtensionBuilder {
 		&self,
 		deny: sc_rpc::DenyUnsafe,
 		subscription_executor: sc_rpc::SubscriptionTaskExecutor,
-	) -> Self::Output;
+	) -> Result<Self::Output, Error>;
 }
 
 impl<F, R> RpcExtensionBuilder for F
 where
-	F: Fn(sc_rpc::DenyUnsafe, sc_rpc::SubscriptionTaskExecutor) -> R,
+	F: Fn(sc_rpc::DenyUnsafe, sc_rpc::SubscriptionTaskExecutor) -> Result<R, Error>,
 	R: sc_rpc::RpcExtension<sc_rpc::Metadata>,
 {
 	type Output = R;
@@ -94,7 +94,7 @@ where
 		&self,
 		deny: sc_rpc::DenyUnsafe,
 		subscription_executor: sc_rpc::SubscriptionTaskExecutor,
-	) -> Self::Output {
+	) -> Result<Self::Output, Error> {
 		(*self)(deny, subscription_executor)
 	}
 }
@@ -114,8 +114,8 @@ where
 		&self,
 		_deny: sc_rpc::DenyUnsafe,
 		_subscription_executor: sc_rpc::SubscriptionTaskExecutor,
-	) -> Self::Output {
-		self.0.clone()
+	) -> Result<Self::Output, Error> {
+		Ok(self.0.clone())
 	}
 }
 
@@ -655,7 +655,7 @@ where
 		gen_handler(
 			sc_rpc::DenyUnsafe::No,
 			sc_rpc_server::RpcMiddleware::new(rpc_metrics, "inbrowser"),
-		)
+		)?
 		.into(),
 	));
 
@@ -742,7 +742,7 @@ fn gen_handler<TBl, TBackend, TExPool, TRpc, TCl>(
 	rpc_extensions_builder: &(dyn RpcExtensionBuilder<Output = TRpc> + Send),
 	offchain_storage: Option<<TBackend as sc_client_api::backend::Backend<TBl>>::OffchainStorage>,
 	system_rpc_tx: TracingUnboundedSender<sc_rpc::system::Request<TBl>>,
-) -> sc_rpc_server::RpcHandler<sc_rpc::Metadata>
+) -> Result<sc_rpc_server::RpcHandler<sc_rpc::Metadata>, Error>
 where
 	TBl: BlockT,
 	TCl: ProvideRuntimeApi<TBl>
@@ -813,7 +813,7 @@ where
 		offchain::OffchainApi::to_delegate(offchain)
 	});
 
-	sc_rpc_server::rpc_handler(
+	Ok(sc_rpc_server::rpc_handler(
 		(
 			state::StateApi::to_delegate(state),
 			state::ChildStateApi::to_delegate(child_state),
@@ -821,10 +821,10 @@ where
 			maybe_offchain_rpc,
 			author::AuthorApi::to_delegate(author),
 			system::SystemApi::to_delegate(system),
-			rpc_extensions_builder.build(deny_unsafe, task_executor),
+			rpc_extensions_builder.build(deny_unsafe, task_executor)?,
 		),
 		rpc_middleware,
-	)
+	))
 }
 
 /// Parameters to pass into `build_network`.
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index a6cefcd5db62..5791165e5389 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -348,28 +348,31 @@ fn start_rpc_servers<
 	H: FnMut(
 		sc_rpc::DenyUnsafe,
 		sc_rpc_server::RpcMiddleware,
-	) -> sc_rpc_server::RpcHandler<sc_rpc::Metadata>,
+	) -> Result<sc_rpc_server::RpcHandler<sc_rpc::Metadata>, Error>,
 >(
 	config: &Configuration,
 	mut gen_handler: H,
 	rpc_metrics: sc_rpc_server::RpcMetrics,
-) -> Result<Box<dyn std::any::Any + Send + Sync>, error::Error> {
+) -> Result<Box<dyn std::any::Any + Send + Sync>, Error> {
 	fn maybe_start_server<T, F>(
 		address: Option<SocketAddr>,
 		mut start: F,
-	) -> Result<Option<T>, io::Error>
+	) -> Result<Option<T>, Error>
 	where
-		F: FnMut(&SocketAddr) -> Result<T, io::Error>,
+		F: FnMut(&SocketAddr) -> Result<T, Error>,
 	{
 		address
 			.map(|mut address| {
-				start(&address).or_else(|e| match e.kind() {
-					io::ErrorKind::AddrInUse | io::ErrorKind::PermissionDenied => {
-						warn!("Unable to bind RPC server to {}. Trying random port.", address);
-						address.set_port(0);
-						start(&address)
+				start(&address).or_else(|e| match e {
+					Error::Io(e) => match e.kind() {
+						io::ErrorKind::AddrInUse | io::ErrorKind::PermissionDenied => {
+							warn!("Unable to bind RPC server to {}. Trying random port.", address);
+							address.set_port(0);
+							start(&address)
+						},
+						_ => Err(e.into()),
 					},
-					_ => Err(e),
+					e => Err(e),
 				})
 			})
 			.transpose()
@@ -390,8 +393,9 @@ fn start_rpc_servers<
 				gen_handler(
 					sc_rpc::DenyUnsafe::No,
 					sc_rpc_server::RpcMiddleware::new(rpc_metrics.clone(), "ipc"),
-				),
+				)?,
 			)
+			.map_err(Error::from)
 		}),
 		maybe_start_server(config.rpc_http, |address| {
 			sc_rpc_server::start_http(
@@ -401,9 +405,10 @@ fn start_rpc_servers<
 				gen_handler(
 					deny_unsafe(&address, &config.rpc_methods),
 					sc_rpc_server::RpcMiddleware::new(rpc_metrics.clone(), "http"),
-				),
+				)?,
 				config.rpc_max_payload,
 			)
+			.map_err(Error::from)
 		})?
 		.map(|s| waiting::HttpServer(Some(s))),
 		maybe_start_server(config.rpc_ws, |address| {
@@ -414,9 +419,10 @@ fn start_rpc_servers<
 				gen_handler(
 					deny_unsafe(&address, &config.rpc_methods),
 					sc_rpc_server::RpcMiddleware::new(rpc_metrics.clone(), "ws"),
-				),
+				)?,
 				config.rpc_max_payload,
 			)
+			.map_err(Error::from)
 		})?
 		.map(|s| waiting::WsServer(Some(s))),
 	)))
@@ -428,7 +434,7 @@ fn start_rpc_servers<
 	H: FnMut(
 		sc_rpc::DenyUnsafe,
 		sc_rpc_server::RpcMiddleware,
-	) -> sc_rpc_server::RpcHandler<sc_rpc::Metadata>,
+	) -> Result<sc_rpc_server::RpcHandler<sc_rpc::Metadata>, Error>,
 >(
 	_: &Configuration,
 	_: H,
diff --git a/client/sync-state-rpc/Cargo.toml b/client/sync-state-rpc/Cargo.toml
index 0402d16ae008..a96b80ff930d 100644
--- a/client/sync-state-rpc/Cargo.toml
+++ b/client/sync-state-rpc/Cargo.toml
@@ -24,5 +24,7 @@ sc-consensus-epochs = { version = "0.10.0-dev", path = "../consensus/epochs" }
 sc-finality-grandpa = { version = "0.10.0-dev", path = "../finality-grandpa" }
 sc-rpc-api = { version = "0.10.0-dev", path = "../rpc-api" }
 serde_json = "1.0.58"
+serde = { version = "1.0.126", features = ["derive"] }
 sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
diff --git a/client/sync-state-rpc/src/lib.rs b/client/sync-state-rpc/src/lib.rs
index e786a10cd440..a1621e3986d7 100644
--- a/client/sync-state-rpc/src/lib.rs
+++ b/client/sync-state-rpc/src/lib.rs
@@ -17,10 +17,31 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! A RPC handler to create sync states for light clients.
+//!
 //! Currently only usable with BABE + GRANDPA.
+//!
+//! # Usage
+//!
+//! To use the light sync state, it needs to be added as an extension to the chain spec:
+//!
+//! ```
+//! use sc_sync_state_rpc::LightSyncStateExtension;
+//!
+//! #[derive(Default, Clone, serde::Serialize, serde::Deserialize, sc_chain_spec::ChainSpecExtension)]
+//! #[serde(rename_all = "camelCase")]
+//! pub struct Extensions {
+//!    light_sync_state: LightSyncStateExtension,
+//! }
+//!
+//! type ChainSpec = sc_chain_spec::GenericChainSpec<(), Extensions>;
+//! ```
+//!
+//! If the [`LightSyncStateExtension`] is not added as an extension to the chain spec,
+//! the [`SyncStateRpcHandler`] will fail at instantiation.
 
 #![deny(unused_crate_dependencies)]
 
+use sc_client_api::StorageData;
 use sp_blockchain::HeaderBackend;
 use sp_runtime::{
 	generic::BlockId,
@@ -35,17 +56,24 @@ type SharedAuthoritySet<TBl> =
 type SharedEpochChanges<TBl> =
 	sc_consensus_epochs::SharedEpochChanges<TBl, sc_consensus_babe::Epoch>;
 
+/// Error type used by this crate.
 #[derive(Debug, thiserror::Error)]
 #[allow(missing_docs)]
-enum Error<Block: BlockT> {
+pub enum Error<Block: BlockT> {
 	#[error(transparent)]
 	Blockchain(#[from] sp_blockchain::Error),
 
 	#[error("Failed to load the block weight for block {0:?}")]
-	LoadingBlockWeightFailed(<Block as BlockT>::Hash),
+	LoadingBlockWeightFailed(Block::Hash),
 
 	#[error("JsonRpc error: {0}")]
 	JsonRpc(String),
+
+	#[error(
+		"The light sync state extension is not provided by the chain spec. \
+		Read the `sc-sync-state-rpc` crate docs on how to do this!"
+	)]
+	LightSyncStateExtensionNotFound,
 }
 
 impl<Block: BlockT> From<Error<Block>> for jsonrpc_core::Error {
@@ -58,6 +86,40 @@ impl<Block: BlockT> From<Error<Block>> for jsonrpc_core::Error {
 	}
 }
 
+/// Serialize the given `val` by encoding it with SCALE codec and serializing it as hex.
+fn serialize_encoded<S: serde::Serializer, T: codec::Encode>(
+	val: &T,
+	s: S,
+) -> Result<S::Ok, S::Error> {
+	let encoded = StorageData(val.encode());
+	serde::Serialize::serialize(&encoded, s)
+}
+
+/// The light sync state extension.
+///
+/// This represents a JSON serialized [`LightSyncState`]. It is required to be added to the
+/// chain-spec as an extension.
+pub type LightSyncStateExtension = Option<serde_json::Value>;
+
+/// Hardcoded infomation that allows light clients to sync quickly.
+#[derive(serde::Serialize, Clone)]
+#[serde(rename_all = "camelCase")]
+#[serde(deny_unknown_fields)]
+pub struct LightSyncState<Block: BlockT> {
+	/// The header of the best finalized block.
+	#[serde(serialize_with = "serialize_encoded")]
+	pub finalized_block_header: <Block as BlockT>::Header,
+	/// The epoch changes tree for babe.
+	#[serde(serialize_with = "serialize_encoded")]
+	pub babe_epoch_changes: sc_consensus_epochs::EpochChangesFor<Block, sc_consensus_babe::Epoch>,
+	/// The babe weight of the finalized block.
+	pub babe_finalized_block_weight: sc_consensus_babe::BabeBlockWeight,
+	/// The authority set for grandpa.
+	#[serde(serialize_with = "serialize_encoded")]
+	pub grandpa_authority_set:
+		sc_finality_grandpa::AuthoritySet<<Block as BlockT>::Hash, NumberFor<Block>>,
+}
+
 /// An api for sync state RPC calls.
 #[rpc]
 pub trait SyncStateRpcApi {
@@ -67,31 +129,37 @@ pub trait SyncStateRpcApi {
 }
 
 /// The handler for sync state RPC calls.
-pub struct SyncStateRpcHandler<TBl: BlockT, TCl> {
+pub struct SyncStateRpcHandler<Block: BlockT, Backend> {
 	chain_spec: Box<dyn sc_chain_spec::ChainSpec>,
-	client: Arc<TCl>,
-	shared_authority_set: SharedAuthoritySet<TBl>,
-	shared_epoch_changes: SharedEpochChanges<TBl>,
+	client: Arc<Backend>,
+	shared_authority_set: SharedAuthoritySet<Block>,
+	shared_epoch_changes: SharedEpochChanges<Block>,
 	deny_unsafe: sc_rpc_api::DenyUnsafe,
 }
 
-impl<TBl, TCl> SyncStateRpcHandler<TBl, TCl>
+impl<Block, Backend> SyncStateRpcHandler<Block, Backend>
 where
-	TBl: BlockT,
-	TCl: HeaderBackend<TBl> + sc_client_api::AuxStore + 'static,
+	Block: BlockT,
+	Backend: HeaderBackend<Block> + sc_client_api::AuxStore + 'static,
 {
 	/// Create a new handler.
 	pub fn new(
 		chain_spec: Box<dyn sc_chain_spec::ChainSpec>,
-		client: Arc<TCl>,
-		shared_authority_set: SharedAuthoritySet<TBl>,
-		shared_epoch_changes: SharedEpochChanges<TBl>,
+		client: Arc<Backend>,
+		shared_authority_set: SharedAuthoritySet<Block>,
+		shared_epoch_changes: SharedEpochChanges<Block>,
 		deny_unsafe: sc_rpc_api::DenyUnsafe,
-	) -> Self {
-		Self { chain_spec, client, shared_authority_set, shared_epoch_changes, deny_unsafe }
+	) -> Result<Self, Error<Block>> {
+		if sc_chain_spec::get_extension::<LightSyncStateExtension>(chain_spec.extensions())
+			.is_some()
+		{
+			Ok(Self { chain_spec, client, shared_authority_set, shared_epoch_changes, deny_unsafe })
+		} else {
+			Err(Error::<Block>::LightSyncStateExtensionNotFound)
+		}
 	}
 
-	fn build_sync_state(&self) -> Result<sc_chain_spec::LightSyncState<TBl>, Error<TBl>> {
+	fn build_sync_state(&self) -> Result<LightSyncState<Block>, Error<Block>> {
 		let finalized_hash = self.client.info().finalized_hash;
 		let finalized_header = self
 			.client
@@ -102,7 +170,7 @@ where
 			sc_consensus_babe::aux_schema::load_block_weight(&*self.client, finalized_hash)?
 				.ok_or_else(|| Error::LoadingBlockWeightFailed(finalized_hash))?;
 
-		Ok(sc_chain_spec::LightSyncState {
+		Ok(LightSyncState {
 			finalized_block_header: finalized_header,
 			babe_epoch_changes: self.shared_epoch_changes.shared_data().clone(),
 			babe_finalized_block_weight: finalized_block_weight,
@@ -111,10 +179,10 @@ where
 	}
 }
 
-impl<TBl, TCl> SyncStateRpcApi for SyncStateRpcHandler<TBl, TCl>
+impl<Block, Backend> SyncStateRpcApi for SyncStateRpcHandler<Block, Backend>
 where
-	TBl: BlockT,
-	TCl: HeaderBackend<TBl> + sc_client_api::AuxStore + 'static,
+	Block: BlockT,
+	Backend: HeaderBackend<Block> + sc_client_api::AuxStore + 'static,
 {
 	fn system_gen_sync_spec(&self, raw: bool) -> jsonrpc_core::Result<jsonrpc_core::Value> {
 		if let Err(err) = self.deny_unsafe.check_if_safe() {
@@ -123,12 +191,21 @@ where
 
 		let mut chain_spec = self.chain_spec.cloned_box();
 
-		let sync_state = self.build_sync_state().map_err(map_error::<TBl, Error<TBl>>)?;
+		let sync_state = self.build_sync_state().map_err(map_error::<Block, Error<Block>>)?;
+
+		let extension = sc_chain_spec::get_extension_mut::<LightSyncStateExtension>(
+			chain_spec.extensions_mut(),
+		)
+		.ok_or_else(|| {
+			Error::<Block>::JsonRpc("Could not find `LightSyncState` chain-spec extension!".into())
+		})?;
+
+		*extension =
+			Some(serde_json::to_value(&sync_state).map_err(|err| map_error::<Block, _>(err))?);
 
-		chain_spec.set_light_sync_state(sync_state.to_serializable());
-		let string = chain_spec.as_json(raw).map_err(map_error::<TBl, _>)?;
+		let json_string = chain_spec.as_json(raw).map_err(map_error::<Block, _>)?;
 
-		serde_json::from_str(&string).map_err(|err| map_error::<TBl, _>(err))
+		serde_json::from_str(&json_string).map_err(|err| map_error::<Block, _>(err))
 	}
 }
 
diff --git a/test-utils/test-runner/src/client.rs b/test-utils/test-runner/src/client.rs
index d130993bff4c..17117e0b5ee6 100644
--- a/test-utils/test-runner/src/client.rs
+++ b/test-utils/test-runner/src/client.rs
@@ -192,7 +192,7 @@ where
 			rpc_extensions_builder: Box::new(move |_, _| {
 				let mut io = jsonrpc_core::IoHandler::default();
 				io.extend_with(ManualSealApi::to_delegate(ManualSeal::new(rpc_sink.clone())));
-				io
+				Ok(io)
 			}),
 			remote_blockchain: None,
 			network,

From 88a59a046d68c703fa0f9f285c541c5282f0dc60 Mon Sep 17 00:00:00 2001
From: Andronik Ordian <write@reusable.software>
Date: Wed, 4 Aug 2021 22:56:20 +0200
Subject: [PATCH 1056/1194] companion_build: enable runtime-benchmarks feature
 (#9501)

---
 .maintain/gitlab/check_polkadot_companion_build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.maintain/gitlab/check_polkadot_companion_build.sh b/.maintain/gitlab/check_polkadot_companion_build.sh
index 531155b73dfc..72bfaf715152 100755
--- a/.maintain/gitlab/check_polkadot_companion_build.sh
+++ b/.maintain/gitlab/check_polkadot_companion_build.sh
@@ -96,4 +96,4 @@ diener patch --crates-to-patch ../ --substrate --path Cargo.toml
 cargo update -p sp-core
 
 # Test Polkadot pr or master branch with this Substrate commit.
-time cargo test --all --release --verbose
+time cargo test --workspace --release --verbose --features=runtime-benchmarks

From 376712c05c2f2ff1d832df3803ff5b76b50aa4e8 Mon Sep 17 00:00:00 2001
From: Amar Singh <asinghchrony@protonmail.com>
Date: Thu, 5 Aug 2021 04:22:51 -0400
Subject: [PATCH 1057/1194] remove unused events and errors in democracy
 (#9502)

---
 frame/democracy/src/lib.rs | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/frame/democracy/src/lib.rs b/frame/democracy/src/lib.rs
index 65bc483d2e5b..2f955b70ab42 100644
--- a/frame/democracy/src/lib.rs
+++ b/frame/democracy/src/lib.rs
@@ -542,8 +542,6 @@ pub mod pallet {
 		/// A registered preimage was removed and the deposit collected by the reaper.
 		/// \[proposal_hash, provider, deposit, reaper\]
 		PreimageReaped(T::Hash, T::AccountId, BalanceOf<T>, T::AccountId),
-		/// An \[account\] has been unlocked successfully.
-		Unlocked(T::AccountId),
 		/// A proposal \[hash\] has been blacklisted permanently.
 		Blacklisted(T::Hash),
 	}
@@ -554,8 +552,6 @@ pub mod pallet {
 		ValueLow,
 		/// Proposal does not exist
 		ProposalMissing,
-		/// Unknown index
-		BadIndex,
 		/// Cannot cancel the same proposal twice
 		AlreadyCanceled,
 		/// Proposal already made
@@ -570,8 +566,6 @@ pub mod pallet {
 		NoProposal,
 		/// Identity may not veto a proposal twice
 		AlreadyVetoed,
-		/// Not delegated
-		NotDelegated,
 		/// Preimage already noted
 		DuplicatePreimage,
 		/// Not imminent
@@ -588,10 +582,6 @@ pub mod pallet {
 		PreimageInvalid,
 		/// No proposals waiting
 		NoneWaiting,
-		/// The target account does not have a lock.
-		NotLocked,
-		/// The lock on the account to be unlocked has not yet expired.
-		NotExpired,
 		/// The given account did not vote on the referendum.
 		NotVoter,
 		/// The actor has no permission to conduct the action.
@@ -613,8 +603,6 @@ pub mod pallet {
 		WrongUpperBound,
 		/// Maximum number of votes reached.
 		MaxVotesReached,
-		/// The provided witness data is wrong.
-		InvalidWitness,
 		/// Maximum number of proposals reached.
 		TooManyProposals,
 	}

From a2742a70d459dc60c79c7282205b1a987b64645a Mon Sep 17 00:00:00 2001
From: Amar Singh <asinghchrony@protonmail.com>
Date: Thu, 5 Aug 2021 04:55:18 -0400
Subject: [PATCH 1058/1194] done (#9494)

---
 frame/support/src/weights.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/frame/support/src/weights.rs b/frame/support/src/weights.rs
index c0431534ed93..6b4f5e4046cc 100644
--- a/frame/support/src/weights.rs
+++ b/frame/support/src/weights.rs
@@ -329,6 +329,12 @@ pub trait GetDispatchInfo {
 	fn get_dispatch_info(&self) -> DispatchInfo;
 }
 
+impl GetDispatchInfo for () {
+	fn get_dispatch_info(&self) -> DispatchInfo {
+		DispatchInfo::default()
+	}
+}
+
 /// Weight information that is only available post dispatch.
 /// NOTE: This can only be used to reduce the weight or fee, not increase it.
 #[derive(Clone, Copy, Eq, PartialEq, Default, RuntimeDebug, Encode, Decode)]

From 4d93a6ee4b78c4d9b01901b2100582a672c2aadb Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Thu, 5 Aug 2021 14:07:23 +0200
Subject: [PATCH 1059/1194] Storage chain fixes + guide (#9504)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Transaction storage guide and fixes

* Apply suggestions from code review

Co-authored-by: Bruno Škvorc <bruno@skvorc.me>

* Update frame/transaction-storage/README.md

Co-authored-by: Bruno Škvorc <bruno@skvorc.me>

* Extended example

Co-authored-by: Bruno Škvorc <bruno@skvorc.me>
---
 Cargo.lock                                    |  1 +
 bin/node/cli/Cargo.toml                       |  1 +
 bin/node/cli/src/service.rs                   |  8 +-
 client/network/src/block_request_handler.rs   |  5 +-
 frame/transaction-storage/README.md           | 78 ++++++++++++++++++-
 .../transaction-storage-proof/src/lib.rs      |  5 +-
 6 files changed, 92 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cc6299397b6c..7f1d46f46aa3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4243,6 +4243,7 @@ dependencies = [
  "sp-runtime",
  "sp-timestamp",
  "sp-transaction-pool",
+ "sp-transaction-storage-proof",
  "sp-trie",
  "structopt",
  "substrate-browser-utils",
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index 21c42a5ed2f6..1b5173246c38 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -57,6 +57,7 @@ sp-keystore = { version = "0.10.0-dev", path = "../../../primitives/keystore" }
 sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
 sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
 sp-transaction-pool = { version = "4.0.0-dev", path = "../../../primitives/transaction-pool" }
+sp-transaction-storage-proof = { version = "4.0.0-dev", path = "../../../primitives/transaction-storage-proof" }
 
 # client dependencies
 sc-client-api = { version = "4.0.0-dev", path = "../../../client/api" }
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index 1bd1e6748568..938b7e67f3ce 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -322,7 +322,13 @@ pub fn new_full_base(
 							slot_duration,
 						);
 
-					Ok((timestamp, slot, uncles))
+					let storage_proof =
+						sp_transaction_storage_proof::registration::new_data_provider(
+							&*client_clone,
+							&parent,
+						)?;
+
+					Ok((timestamp, slot, uncles, storage_proof))
 				}
 			},
 			force_authoring,
diff --git a/client/network/src/block_request_handler.rs b/client/network/src/block_request_handler.rs
index 66ae0d43bb22..e546ae7661a0 100644
--- a/client/network/src/block_request_handler.rs
+++ b/client/network/src/block_request_handler.rs
@@ -333,7 +333,10 @@ impl<B: BlockT> BlockRequestHandler<B> {
 							target: LOG_TARGET,
 							"Missing indexed block data for block request."
 						);
-						break
+						// If the indexed body is missing we still continue returning headers.
+						// Ideally `None` should distinguish a missing body from the empty body,
+						// but the current protobuf based protocol does not allow it.
+						Vec::new()
 					},
 				}
 			} else {
diff --git a/frame/transaction-storage/README.md b/frame/transaction-storage/README.md
index a4f77797f5ef..0ed3ba279c2a 100644
--- a/frame/transaction-storage/README.md
+++ b/frame/transaction-storage/README.md
@@ -1,8 +1,82 @@
 # Transaction Storage Pallet
 
 Indexes transactions and manages storage proofs.
-# Transaction Storage Pallet
 
-Indexes transactions and manages storage proofs.
+Allows storing arbitrary data on the chain. Data is automatically removed after `StoragePeriod` blocks, unless the storage is renewed.
+Validators must submit proof of storing a random chunk of data for block `N - StoragePeriod` when producing block `N`.
+
+# Running a chain
+
+The following describes how to set up a new storage chain.
+
+Start with generating a chain spec.
+
+```bash
+cargo run --release -- build-spec --chain=local > sc_init.json
+```
+
+Edit the json chain spec file to customise the chain. The storage chain genesis params are configured in the `transactionStorage` section.
+Note that `storagePeriod` is specified in blocks and changing it also requires code changes at the moment.
+
+Build a raw spec from the init spec.
+
+```bash
+cargo run --release build-spec --chain=sc_init.json --raw > sc.json
+```
+
+Run a few validator nodes.
+
+```bash
+cargo run --release -- --chain=sc.json -d /tmp/alice --storage-chain --keep-blocks=100800 --ipfs-server --validator --alice
+cargo run --release -- --chain=sc.json -d /tmp/bob --storage-chain --keep-blocks=100800 --ipfs-server --validator --bob
+```
+
+`--storage-chain` enables transaction indexing.
+`--keep-blocks=100800` enables block pruning. The value here should be greater or equal than the storage period.
+`--ipfs-server` enables serving stored content over IPFS.
+
+Once the network is started, any other joining nodes need to sync with `--sync=fast`. Regular sync will fail because block pruning removes old blocks. The chain does not keep full block history.
+
+```bash
+cargo run --release -- --chain=sc.json -d /tmp/charlie --storage-chain --keep-blocks=100800 --ipfs-server --validator --charlie --sync=fast
+```
+
+# Making transactions
+
+To store data use the `transactionStorage.store` extrinsic. And IPFS CID can be generated from the Blake2-256 hash of the data.
+
+```js
+const util_crypto = require('@polkadot/util-crypto');
+const keyring_api = require('@polkadot/keyring');
+const polkadot_api = require('@polkadot/api');
+const fs = require('fs');
+const multihash = require('multihashes');
+const CID = require('cids')
+
+const wsProvider = new polkadot_api.WsProvider();
+const api = await polkadot_api.ApiPromise.create({ provider: wsProvider });
+
+const keyring = new keyring_api.Keyring({ type: "sr25519" });
+const alice = keyring.addFromUri("//Alice");
+
+const file = fs.readFileSync('cute_kitten.jpeg');
+const hash = util_crypto.blake2AsU8a(file)
+const encoded_hash = multihash.encode(hash, 'blake2b-256');
+
+const cid = new CID(1, 'blake2b-256', encoded_hash)
+console.log(cid.toString());
+
+const txHash = await api.tx.transactionStorage.store('0x' + file.toString('hex')).signAndSend(alice);
+```
+Data can be queried over IPFS
+
+```bash
+ipfs swarm connect <substrate peer address>
+ipfs block get /ipfs/<CID> > kitten.jpeg
+```
+
+To renew data and prevent it from being disposed after the storage period, use `transactionStorage.renew(block, index)`
+where `block` is the block number of the previous store or renew transction, and index is the index of that transaction in the block.
+
 
 License: Apache-2.0
diff --git a/primitives/transaction-storage-proof/src/lib.rs b/primitives/transaction-storage-proof/src/lib.rs
index 864d6d4084a8..d159aa735c26 100644
--- a/primitives/transaction-storage-proof/src/lib.rs
+++ b/primitives/transaction-storage-proof/src/lib.rs
@@ -164,8 +164,9 @@ pub mod registration {
 		}
 
 		let proof = match client.block_indexed_body(number)? {
-			Some(transactions) => Some(build_proof(parent.as_ref(), transactions)?),
-			None => {
+			Some(transactions) if !transactions.is_empty() =>
+				Some(build_proof(parent.as_ref(), transactions)?),
+			Some(_) | None => {
 				// Nothing was indexed in that block.
 				None
 			},

From 423a46fb318961c5def77128f2a5e110fa15f3a3 Mon Sep 17 00:00:00 2001
From: Amar Singh <asinghchrony@protonmail.com>
Date: Fri, 6 Aug 2021 04:37:48 -0400
Subject: [PATCH 1060/1194] fix private event enum error message (#9506)

---
 frame/support/procedural/src/pallet/parse/event.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frame/support/procedural/src/pallet/parse/event.rs b/frame/support/procedural/src/pallet/parse/event.rs
index 1bec2d775f85..d66e35e09025 100644
--- a/frame/support/procedural/src/pallet/parse/event.rs
+++ b/frame/support/procedural/src/pallet/parse/event.rs
@@ -167,7 +167,7 @@ impl EventDef {
 		let deposit_event = attr_info.deposit_event;
 
 		if !matches!(item.vis, syn::Visibility::Public(_)) {
-			let msg = "Invalid pallet::event, `Error` must be public";
+			let msg = "Invalid pallet::event, `Event` must be public";
 			return Err(syn::Error::new(item.span(), msg))
 		}
 

From 670ca51e954182746fa3bf76214f2b1b560c1f90 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Sat, 7 Aug 2021 11:34:25 +0200
Subject: [PATCH 1061/1194] Improve call, and usage in pallet utility (#9418)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* WIP

* WIP

* WIP

* add some tests and limit

* remove wip test

* fmt

* Update bin/node/runtime/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* fmt

* use primitives allocation limit

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 bin/node/runtime/src/lib.rs                   | 10 ++++
 frame/babe/src/equivocation.rs                |  3 +-
 frame/babe/src/lib.rs                         |  8 +--
 frame/babe/src/tests.rs                       | 57 +++++++++++++------
 .../src/benchmarking.rs                       | 17 ++++--
 .../election-provider-multi-phase/src/lib.rs  | 11 ++--
 .../src/signed.rs                             |  8 ++-
 .../src/unsigned.rs                           | 30 ++++++----
 frame/grandpa/src/equivocation.rs             |  3 +-
 frame/grandpa/src/lib.rs                      |  8 +--
 frame/grandpa/src/tests.rs                    | 32 ++++++-----
 frame/identity/Cargo.toml                     |  6 +-
 frame/identity/src/benchmarking.rs            | 16 +++---
 frame/identity/src/lib.rs                     | 11 ++--
 frame/identity/src/tests.rs                   | 28 ++++-----
 frame/utility/src/lib.rs                      | 29 +++++++++-
 frame/utility/src/tests.rs                    | 12 ++++
 17 files changed, 197 insertions(+), 92 deletions(-)

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 0a8d258495a3..1cd41d6e6d96 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -1679,4 +1679,14 @@ mod tests {
 
 		is_submit_signed_transaction::<Runtime>();
 	}
+
+	#[test]
+	fn call_size() {
+		assert!(
+			core::mem::size_of::<Call>() <= 200,
+			"size of Call is more than 200 bytes: some calls have too big arguments, use Box to reduce the
+			size of Call.
+			If the limit is too strong, maybe consider increase the limit to 300.",
+		);
+	}
 }
diff --git a/frame/babe/src/equivocation.rs b/frame/babe/src/equivocation.rs
index 95abd87787b4..2558ca8a6e25 100644
--- a/frame/babe/src/equivocation.rs
+++ b/frame/babe/src/equivocation.rs
@@ -155,7 +155,8 @@ where
 	) -> DispatchResult {
 		use frame_system::offchain::SubmitTransaction;
 
-		let call = Call::report_equivocation_unsigned(equivocation_proof, key_owner_proof);
+		let call =
+			Call::report_equivocation_unsigned(Box::new(equivocation_proof), key_owner_proof);
 
 		match SubmitTransaction::<T, Call<T>>::submit_unsigned_transaction(call.into()) {
 			Ok(()) => log::info!(
diff --git a/frame/babe/src/lib.rs b/frame/babe/src/lib.rs
index e9c5d2e8d922..cb2f2168a221 100644
--- a/frame/babe/src/lib.rs
+++ b/frame/babe/src/lib.rs
@@ -349,12 +349,12 @@ pub mod pallet {
 		))]
 		pub fn report_equivocation(
 			origin: OriginFor<T>,
-			equivocation_proof: EquivocationProof<T::Header>,
+			equivocation_proof: Box<EquivocationProof<T::Header>>,
 			key_owner_proof: T::KeyOwnerProof,
 		) -> DispatchResultWithPostInfo {
 			let reporter = ensure_signed(origin)?;
 
-			Self::do_report_equivocation(Some(reporter), equivocation_proof, key_owner_proof)
+			Self::do_report_equivocation(Some(reporter), *equivocation_proof, key_owner_proof)
 		}
 
 		/// Report authority equivocation/misbehavior. This method will verify
@@ -370,14 +370,14 @@ pub mod pallet {
 		))]
 		pub fn report_equivocation_unsigned(
 			origin: OriginFor<T>,
-			equivocation_proof: EquivocationProof<T::Header>,
+			equivocation_proof: Box<EquivocationProof<T::Header>>,
 			key_owner_proof: T::KeyOwnerProof,
 		) -> DispatchResultWithPostInfo {
 			ensure_none(origin)?;
 
 			Self::do_report_equivocation(
 				T::HandleEquivocation::block_author(),
-				equivocation_proof,
+				*equivocation_proof,
 				key_owner_proof,
 			)
 		}
diff --git a/frame/babe/src/tests.rs b/frame/babe/src/tests.rs
index 1cf4b0aac150..edb3eeb059d8 100644
--- a/frame/babe/src/tests.rs
+++ b/frame/babe/src/tests.rs
@@ -440,8 +440,12 @@ fn report_equivocation_current_session_works() {
 		let key_owner_proof = Historical::prove(key).unwrap();
 
 		// report the equivocation
-		Babe::report_equivocation_unsigned(Origin::none(), equivocation_proof, key_owner_proof)
-			.unwrap();
+		Babe::report_equivocation_unsigned(
+			Origin::none(),
+			Box::new(equivocation_proof),
+			key_owner_proof,
+		)
+		.unwrap();
 
 		// start a new era so that the results of the offence report
 		// are applied at era end
@@ -508,8 +512,12 @@ fn report_equivocation_old_session_works() {
 		assert_eq!(Staking::slashable_balance_of(&offending_validator_id), 10_000);
 
 		// report the equivocation
-		Babe::report_equivocation_unsigned(Origin::none(), equivocation_proof, key_owner_proof)
-			.unwrap();
+		Babe::report_equivocation_unsigned(
+			Origin::none(),
+			Box::new(equivocation_proof),
+			key_owner_proof,
+		)
+		.unwrap();
 
 		// start a new era so that the results of the offence report
 		// are applied at era end
@@ -558,7 +566,7 @@ fn report_equivocation_invalid_key_owner_proof() {
 		assert_err!(
 			Babe::report_equivocation_unsigned(
 				Origin::none(),
-				equivocation_proof.clone(),
+				Box::new(equivocation_proof.clone()),
 				key_owner_proof
 			),
 			Error::<Test>::InvalidKeyOwnershipProof,
@@ -576,7 +584,11 @@ fn report_equivocation_invalid_key_owner_proof() {
 		start_era(2);
 
 		assert_err!(
-			Babe::report_equivocation_unsigned(Origin::none(), equivocation_proof, key_owner_proof),
+			Babe::report_equivocation_unsigned(
+				Origin::none(),
+				Box::new(equivocation_proof),
+				key_owner_proof,
+			),
 			Error::<Test>::InvalidKeyOwnershipProof,
 		);
 	})
@@ -608,7 +620,7 @@ fn report_equivocation_invalid_equivocation_proof() {
 			assert_err!(
 				Babe::report_equivocation_unsigned(
 					Origin::none(),
-					equivocation_proof,
+					Box::new(equivocation_proof),
 					key_owner_proof.clone(),
 				),
 				Error::<Test>::InvalidEquivocationProof,
@@ -714,8 +726,10 @@ fn report_equivocation_validate_unsigned_prevents_duplicates() {
 		let key = (sp_consensus_babe::KEY_TYPE, &offending_authority_pair.public());
 		let key_owner_proof = Historical::prove(key).unwrap();
 
-		let inner =
-			Call::report_equivocation_unsigned(equivocation_proof.clone(), key_owner_proof.clone());
+		let inner = Call::report_equivocation_unsigned(
+			Box::new(equivocation_proof.clone()),
+			key_owner_proof.clone(),
+		);
 
 		// only local/inblock reports are allowed
 		assert_eq!(
@@ -746,8 +760,12 @@ fn report_equivocation_validate_unsigned_prevents_duplicates() {
 		assert_ok!(<Babe as sp_runtime::traits::ValidateUnsigned>::pre_dispatch(&inner));
 
 		// we submit the report
-		Babe::report_equivocation_unsigned(Origin::none(), equivocation_proof, key_owner_proof)
-			.unwrap();
+		Babe::report_equivocation_unsigned(
+			Origin::none(),
+			Box::new(equivocation_proof),
+			key_owner_proof,
+		)
+		.unwrap();
 
 		// the report should now be considered stale and the transaction is invalid.
 		// the check for staleness should be done on both `validate_unsigned` and on `pre_dispatch`
@@ -805,7 +823,7 @@ fn valid_equivocation_reports_dont_pay_fees() {
 
 		// check the dispatch info for the call.
 		let info = Call::<Test>::report_equivocation_unsigned(
-			equivocation_proof.clone(),
+			Box::new(equivocation_proof.clone()),
 			key_owner_proof.clone(),
 		)
 		.get_dispatch_info();
@@ -817,7 +835,7 @@ fn valid_equivocation_reports_dont_pay_fees() {
 		// report the equivocation.
 		let post_info = Babe::report_equivocation_unsigned(
 			Origin::none(),
-			equivocation_proof.clone(),
+			Box::new(equivocation_proof.clone()),
 			key_owner_proof.clone(),
 		)
 		.unwrap();
@@ -829,11 +847,14 @@ fn valid_equivocation_reports_dont_pay_fees() {
 
 		// report the equivocation again which is invalid now since it is
 		// duplicate.
-		let post_info =
-			Babe::report_equivocation_unsigned(Origin::none(), equivocation_proof, key_owner_proof)
-				.err()
-				.unwrap()
-				.post_info;
+		let post_info = Babe::report_equivocation_unsigned(
+			Origin::none(),
+			Box::new(equivocation_proof),
+			key_owner_proof,
+		)
+		.err()
+		.unwrap()
+		.post_info;
 
 		// the fee is not waived and the original weight is kept.
 		assert!(post_info.actual_weight.is_none());
diff --git a/frame/election-provider-multi-phase/src/benchmarking.rs b/frame/election-provider-multi-phase/src/benchmarking.rs
index 5e89db7537d0..cc7d99a85494 100644
--- a/frame/election-provider-multi-phase/src/benchmarking.rs
+++ b/frame/election-provider-multi-phase/src/benchmarking.rs
@@ -26,7 +26,10 @@ use rand::{prelude::SliceRandom, rngs::SmallRng, SeedableRng};
 use sp_arithmetic::{per_things::Percent, traits::One};
 use sp_npos_elections::IndexAssignment;
 use sp_runtime::InnerOf;
-use sp_std::convert::{TryFrom, TryInto};
+use sp_std::{
+	boxed::Box,
+	convert::{TryFrom, TryInto},
+};
 
 const SEED: u32 = 999;
 
@@ -317,7 +320,7 @@ frame_benchmarking::benchmarks! {
 		let caller = frame_benchmarking::whitelisted_caller();
 		T::Currency::make_free_balance_be(&caller,  T::Currency::minimum_balance() * 10u32.into());
 
-	}: _(RawOrigin::Signed(caller), solution, c)
+	}: _(RawOrigin::Signed(caller), Box::new(solution), c)
 	verify {
 		assert!(<MultiPhase<T>>::signed_submissions().len() as u32 == c + 1);
 	}
@@ -344,9 +347,15 @@ frame_benchmarking::benchmarks! {
 
 		// encode the most significant storage item that needs to be decoded in the dispatch.
 		let encoded_snapshot = <MultiPhase<T>>::snapshot().unwrap().encode();
-		let encoded_call = <Call<T>>::submit_unsigned(raw_solution.clone(), witness).encode();
+		let encoded_call = <Call<T>>::submit_unsigned(Box::new(raw_solution.clone()), witness).encode();
 	}: {
-		assert_ok!(<MultiPhase<T>>::submit_unsigned(RawOrigin::None.into(), raw_solution, witness));
+		assert_ok!(
+			<MultiPhase<T>>::submit_unsigned(
+				RawOrigin::None.into(),
+				Box::new(raw_solution),
+				witness,
+			)
+		);
 		let _decoded_snap = <RoundSnapshot<T::AccountId> as Decode>::decode(&mut &*encoded_snapshot)
 			.unwrap();
 		let _decoded_call = <Call<T> as Decode>::decode(&mut &*encoded_call).unwrap();
diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index 48504b607395..a115d12c8ad2 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -857,7 +857,7 @@ pub mod pallet {
 		))]
 		pub fn submit_unsigned(
 			origin: OriginFor<T>,
-			solution: RawSolution<CompactOf<T>>,
+			solution: Box<RawSolution<CompactOf<T>>>,
 			witness: SolutionOrSnapshotSize,
 		) -> DispatchResultWithPostInfo {
 			ensure_none(origin)?;
@@ -876,7 +876,7 @@ pub mod pallet {
 			assert!(targets as u32 == witness.targets, "{}", error_message);
 
 			let ready =
-				Self::feasibility_check(solution, ElectionCompute::Unsigned).expect(error_message);
+				Self::feasibility_check(*solution, ElectionCompute::Unsigned).expect(error_message);
 
 			// Store the newly received solution.
 			log!(info, "queued unsigned solution with score {:?}", ready.score);
@@ -947,7 +947,7 @@ pub mod pallet {
 		#[pallet::weight(T::WeightInfo::submit(*num_signed_submissions))]
 		pub fn submit(
 			origin: OriginFor<T>,
-			solution: RawSolution<CompactOf<T>>,
+			solution: Box<RawSolution<CompactOf<T>>>,
 			num_signed_submissions: u32,
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
@@ -982,7 +982,8 @@ pub mod pallet {
 				T::SignedRewardBase::get().saturating_add(call_fee)
 			};
 
-			let submission = SignedSubmission { who: who.clone(), deposit, solution, reward };
+			let submission =
+				SignedSubmission { who: who.clone(), deposit, solution: *solution, reward };
 
 			// insert the submission if the queue has space or it's better than the weakest
 			// eject the weakest if the queue was full
@@ -1927,7 +1928,7 @@ mod tests {
 				let solution = RawSolution { score: [(5 + s).into(), 0, 0], ..Default::default() };
 				assert_ok!(MultiPhase::submit(
 					crate::mock::Origin::signed(99),
-					solution,
+					Box::new(solution),
 					MultiPhase::signed_submissions().len() as u32
 				));
 			}
diff --git a/frame/election-provider-multi-phase/src/signed.rs b/frame/election-provider-multi-phase/src/signed.rs
index 40dee8bb7870..6d491b9d7149 100644
--- a/frame/election-provider-multi-phase/src/signed.rs
+++ b/frame/election-provider-multi-phase/src/signed.rs
@@ -499,7 +499,11 @@ mod tests {
 		origin: Origin,
 		solution: RawSolution<CompactOf<Runtime>>,
 	) -> DispatchResult {
-		MultiPhase::submit(origin, solution, MultiPhase::signed_submissions().len() as u32)
+		MultiPhase::submit(
+			origin,
+			Box::new(solution),
+			MultiPhase::signed_submissions().len() as u32,
+		)
 	}
 
 	#[test]
@@ -532,7 +536,7 @@ mod tests {
 
 			// now try and cheat by passing a lower queue length
 			assert_noop!(
-				MultiPhase::submit(Origin::signed(99), solution, 0),
+				MultiPhase::submit(Origin::signed(99), Box::new(solution), 0),
 				Error::<Runtime>::SignedInvalidWitness,
 			);
 		})
diff --git a/frame/election-provider-multi-phase/src/unsigned.rs b/frame/election-provider-multi-phase/src/unsigned.rs
index 93e3878a7152..41f8ced0ce82 100644
--- a/frame/election-provider-multi-phase/src/unsigned.rs
+++ b/frame/election-provider-multi-phase/src/unsigned.rs
@@ -34,7 +34,7 @@ use sp_runtime::{
 	traits::TrailingZeroInput,
 	DispatchError, SaturatedConversion,
 };
-use sp_std::{cmp::Ordering, convert::TryFrom, vec::Vec};
+use sp_std::{boxed::Box, cmp::Ordering, convert::TryFrom, vec::Vec};
 
 /// Storage key used to store the last block number at which offchain worker ran.
 pub(crate) const OFFCHAIN_LAST_BLOCK: &[u8] = b"parity/multi-phase-unsigned-election";
@@ -208,7 +208,7 @@ impl<T: Config> Pallet<T> {
 		let (raw_solution, witness) = Self::mine_and_check(iters)?;
 
 		let score = raw_solution.score.clone();
-		let call: Call<T> = Call::submit_unsigned(raw_solution, witness).into();
+		let call: Call<T> = Call::submit_unsigned(Box::new(raw_solution), witness).into();
 
 		log!(
 			debug,
@@ -773,7 +773,7 @@ mod tests {
 	fn validate_unsigned_retracts_wrong_phase() {
 		ExtBuilder::default().desired_targets(0).build_and_execute(|| {
 			let solution = RawSolution::<TestCompact> { score: [5, 0, 0], ..Default::default() };
-			let call = Call::submit_unsigned(solution.clone(), witness());
+			let call = Call::submit_unsigned(Box::new(solution.clone()), witness());
 
 			// initial
 			assert_eq!(MultiPhase::current_phase(), Phase::Off);
@@ -842,7 +842,7 @@ mod tests {
 			assert!(MultiPhase::current_phase().is_unsigned());
 
 			let solution = RawSolution::<TestCompact> { score: [5, 0, 0], ..Default::default() };
-			let call = Call::submit_unsigned(solution.clone(), witness());
+			let call = Call::submit_unsigned(Box::new(solution.clone()), witness());
 
 			// initial
 			assert!(<MultiPhase as ValidateUnsigned>::validate_unsigned(
@@ -879,7 +879,7 @@ mod tests {
 			assert!(MultiPhase::current_phase().is_unsigned());
 
 			let solution = RawSolution::<TestCompact> { score: [5, 0, 0], ..Default::default() };
-			let call = Call::submit_unsigned(solution.clone(), witness());
+			let call = Call::submit_unsigned(Box::new(solution.clone()), witness());
 			assert_eq!(solution.compact.unique_targets().len(), 0);
 
 			// won't work anymore.
@@ -905,7 +905,7 @@ mod tests {
 
 				let solution =
 					RawSolution::<TestCompact> { score: [5, 0, 0], ..Default::default() };
-				let call = Call::submit_unsigned(solution.clone(), witness());
+				let call = Call::submit_unsigned(Box::new(solution.clone()), witness());
 
 				assert_eq!(
 					<MultiPhase as ValidateUnsigned>::validate_unsigned(
@@ -931,7 +931,7 @@ mod tests {
 
 			// This is in itself an invalid BS solution.
 			let solution = RawSolution::<TestCompact> { score: [5, 0, 0], ..Default::default() };
-			let call = Call::submit_unsigned(solution.clone(), witness());
+			let call = Call::submit_unsigned(Box::new(solution.clone()), witness());
 			let outer_call: OuterCall = call.into();
 			let _ = outer_call.dispatch(Origin::none());
 		})
@@ -951,7 +951,7 @@ mod tests {
 			let mut correct_witness = witness();
 			correct_witness.voters += 1;
 			correct_witness.targets -= 1;
-			let call = Call::submit_unsigned(solution.clone(), correct_witness);
+			let call = Call::submit_unsigned(Box::new(solution.clone()), correct_witness);
 			let outer_call: OuterCall = call.into();
 			let _ = outer_call.dispatch(Origin::none());
 		})
@@ -972,7 +972,7 @@ mod tests {
 
 			// ensure this solution is valid.
 			assert!(MultiPhase::queued_solution().is_none());
-			assert_ok!(MultiPhase::submit_unsigned(Origin::none(), solution, witness));
+			assert_ok!(MultiPhase::submit_unsigned(Origin::none(), Box::new(solution), witness));
 			assert!(MultiPhase::queued_solution().is_some());
 		})
 	}
@@ -1054,7 +1054,11 @@ mod tests {
 				};
 				let (solution, witness) = MultiPhase::prepare_election_result(result).unwrap();
 				assert_ok!(MultiPhase::unsigned_pre_dispatch_checks(&solution));
-				assert_ok!(MultiPhase::submit_unsigned(Origin::none(), solution, witness));
+				assert_ok!(MultiPhase::submit_unsigned(
+					Origin::none(),
+					Box::new(solution),
+					witness
+				));
 				assert_eq!(MultiPhase::queued_solution().unwrap().score[0], 10);
 
 				// trial 1: a solution who's score is only 2, i.e. 20% better in the first element.
@@ -1096,7 +1100,11 @@ mod tests {
 
 				// and it is fine
 				assert_ok!(MultiPhase::unsigned_pre_dispatch_checks(&solution));
-				assert_ok!(MultiPhase::submit_unsigned(Origin::none(), solution, witness));
+				assert_ok!(MultiPhase::submit_unsigned(
+					Origin::none(),
+					Box::new(solution),
+					witness
+				));
 			})
 	}
 
diff --git a/frame/grandpa/src/equivocation.rs b/frame/grandpa/src/equivocation.rs
index 2ef106817c3e..40d8535dabb6 100644
--- a/frame/grandpa/src/equivocation.rs
+++ b/frame/grandpa/src/equivocation.rs
@@ -164,7 +164,8 @@ where
 	) -> DispatchResult {
 		use frame_system::offchain::SubmitTransaction;
 
-		let call = Call::report_equivocation_unsigned(equivocation_proof, key_owner_proof);
+		let call =
+			Call::report_equivocation_unsigned(Box::new(equivocation_proof), key_owner_proof);
 
 		match SubmitTransaction::<T, Call<T>>::submit_unsigned_transaction(call.into()) {
 			Ok(()) => log::info!(
diff --git a/frame/grandpa/src/lib.rs b/frame/grandpa/src/lib.rs
index fe9973fcf9ba..7cad0d477c9e 100644
--- a/frame/grandpa/src/lib.rs
+++ b/frame/grandpa/src/lib.rs
@@ -190,12 +190,12 @@ pub mod pallet {
 		#[pallet::weight(T::WeightInfo::report_equivocation(key_owner_proof.validator_count()))]
 		pub fn report_equivocation(
 			origin: OriginFor<T>,
-			equivocation_proof: EquivocationProof<T::Hash, T::BlockNumber>,
+			equivocation_proof: Box<EquivocationProof<T::Hash, T::BlockNumber>>,
 			key_owner_proof: T::KeyOwnerProof,
 		) -> DispatchResultWithPostInfo {
 			let reporter = ensure_signed(origin)?;
 
-			Self::do_report_equivocation(Some(reporter), equivocation_proof, key_owner_proof)
+			Self::do_report_equivocation(Some(reporter), *equivocation_proof, key_owner_proof)
 		}
 
 		/// Report voter equivocation/misbehavior. This method will verify the
@@ -210,14 +210,14 @@ pub mod pallet {
 		#[pallet::weight(T::WeightInfo::report_equivocation(key_owner_proof.validator_count()))]
 		pub fn report_equivocation_unsigned(
 			origin: OriginFor<T>,
-			equivocation_proof: EquivocationProof<T::Hash, T::BlockNumber>,
+			equivocation_proof: Box<EquivocationProof<T::Hash, T::BlockNumber>>,
 			key_owner_proof: T::KeyOwnerProof,
 		) -> DispatchResultWithPostInfo {
 			ensure_none(origin)?;
 
 			Self::do_report_equivocation(
 				T::HandleEquivocation::block_author(),
-				equivocation_proof,
+				*equivocation_proof,
 				key_owner_proof,
 			)
 		}
diff --git a/frame/grandpa/src/tests.rs b/frame/grandpa/src/tests.rs
index 2439c8c81957..034758e0a21b 100644
--- a/frame/grandpa/src/tests.rs
+++ b/frame/grandpa/src/tests.rs
@@ -354,7 +354,7 @@ fn report_equivocation_current_set_works() {
 		// report the equivocation and the tx should be dispatched successfully
 		assert_ok!(Grandpa::report_equivocation_unsigned(
 			Origin::none(),
-			equivocation_proof,
+			Box::new(equivocation_proof),
 			key_owner_proof,
 		),);
 
@@ -432,7 +432,7 @@ fn report_equivocation_old_set_works() {
 		// the old set, the tx should be dispatched successfully
 		assert_ok!(Grandpa::report_equivocation_unsigned(
 			Origin::none(),
-			equivocation_proof,
+			Box::new(equivocation_proof),
 			key_owner_proof,
 		),);
 
@@ -495,7 +495,7 @@ fn report_equivocation_invalid_set_id() {
 		assert_err!(
 			Grandpa::report_equivocation_unsigned(
 				Origin::none(),
-				equivocation_proof,
+				Box::new(equivocation_proof),
 				key_owner_proof,
 			),
 			Error::<Test>::InvalidEquivocationProof,
@@ -536,7 +536,7 @@ fn report_equivocation_invalid_session() {
 		assert_err!(
 			Grandpa::report_equivocation_unsigned(
 				Origin::none(),
-				equivocation_proof,
+				Box::new(equivocation_proof),
 				key_owner_proof,
 			),
 			Error::<Test>::InvalidEquivocationProof,
@@ -581,7 +581,7 @@ fn report_equivocation_invalid_key_owner_proof() {
 		assert_err!(
 			Grandpa::report_equivocation_unsigned(
 				Origin::none(),
-				equivocation_proof,
+				Box::new(equivocation_proof),
 				invalid_key_owner_proof,
 			),
 			Error::<Test>::InvalidKeyOwnershipProof,
@@ -612,7 +612,7 @@ fn report_equivocation_invalid_equivocation_proof() {
 			assert_err!(
 				Grandpa::report_equivocation_unsigned(
 					Origin::none(),
-					equivocation_proof,
+					Box::new(equivocation_proof),
 					key_owner_proof.clone(),
 				),
 				Error::<Test>::InvalidEquivocationProof,
@@ -681,8 +681,10 @@ fn report_equivocation_validate_unsigned_prevents_duplicates() {
 		let key_owner_proof =
 			Historical::prove((sp_finality_grandpa::KEY_TYPE, &equivocation_key)).unwrap();
 
-		let call =
-			Call::report_equivocation_unsigned(equivocation_proof.clone(), key_owner_proof.clone());
+		let call = Call::report_equivocation_unsigned(
+			Box::new(equivocation_proof.clone()),
+			key_owner_proof.clone(),
+		);
 
 		// only local/inblock reports are allowed
 		assert_eq!(
@@ -714,8 +716,12 @@ fn report_equivocation_validate_unsigned_prevents_duplicates() {
 		assert_ok!(<Grandpa as sp_runtime::traits::ValidateUnsigned>::pre_dispatch(&call));
 
 		// we submit the report
-		Grandpa::report_equivocation_unsigned(Origin::none(), equivocation_proof, key_owner_proof)
-			.unwrap();
+		Grandpa::report_equivocation_unsigned(
+			Origin::none(),
+			Box::new(equivocation_proof),
+			key_owner_proof,
+		)
+		.unwrap();
 
 		// the report should now be considered stale and the transaction is invalid
 		// the check for staleness should be done on both `validate_unsigned` and on `pre_dispatch`
@@ -838,7 +844,7 @@ fn valid_equivocation_reports_dont_pay_fees() {
 
 		// check the dispatch info for the call.
 		let info = Call::<Test>::report_equivocation_unsigned(
-			equivocation_proof.clone(),
+			Box::new(equivocation_proof.clone()),
 			key_owner_proof.clone(),
 		)
 		.get_dispatch_info();
@@ -850,7 +856,7 @@ fn valid_equivocation_reports_dont_pay_fees() {
 		// report the equivocation.
 		let post_info = Grandpa::report_equivocation_unsigned(
 			Origin::none(),
-			equivocation_proof.clone(),
+			Box::new(equivocation_proof.clone()),
 			key_owner_proof.clone(),
 		)
 		.unwrap();
@@ -864,7 +870,7 @@ fn valid_equivocation_reports_dont_pay_fees() {
 		// duplicate.
 		let post_info = Grandpa::report_equivocation_unsigned(
 			Origin::none(),
-			equivocation_proof,
+			Box::new(equivocation_proof),
 			key_owner_proof,
 		)
 		.err()
diff --git a/frame/identity/Cargo.toml b/frame/identity/Cargo.toml
index b04594b73780..489a01b27da6 100644
--- a/frame/identity/Cargo.toml
+++ b/frame/identity/Cargo.toml
@@ -37,5 +37,9 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 ]
-runtime-benchmarks = ["frame-benchmarking"]
+runtime-benchmarks = [
+	"frame-benchmarking",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/identity/src/benchmarking.rs b/frame/identity/src/benchmarking.rs
index 77b64c68fd7c..8bda24ddc73e 100644
--- a/frame/identity/src/benchmarking.rs
+++ b/frame/identity/src/benchmarking.rs
@@ -77,7 +77,7 @@ fn create_sub_accounts<T: Config>(
 	// Set identity so `set_subs` does not fail.
 	let _ = T::Currency::make_free_balance_be(&who, BalanceOf::<T>::max_value());
 	let info = create_identity_info::<T>(1);
-	Identity::<T>::set_identity(who_origin.clone().into(), info)?;
+	Identity::<T>::set_identity(who_origin.clone().into(), Box::new(info))?;
 
 	Ok(subs)
 }
@@ -137,7 +137,7 @@ benchmarks! {
 
 			// Add an initial identity
 			let initial_info = create_identity_info::<T>(1);
-			Identity::<T>::set_identity(caller_origin.clone(), initial_info)?;
+			Identity::<T>::set_identity(caller_origin.clone(), Box::new(initial_info))?;
 
 			// User requests judgement from all the registrars, and they approve
 			for i in 0..r {
@@ -151,7 +151,7 @@ benchmarks! {
 			}
 			caller
 		};
-	}: _(RawOrigin::Signed(caller.clone()), create_identity_info::<T>(x))
+	}: _(RawOrigin::Signed(caller.clone()), Box::new(create_identity_info::<T>(x)))
 	verify {
 		assert_last_event::<T>(Event::<T>::IdentitySet(caller).into());
 	}
@@ -204,7 +204,7 @@ benchmarks! {
 			let info = create_identity_info::<T>(x);
 			let caller: T::AccountId = whitelisted_caller();
 			let caller_origin = <T as frame_system::Config>::Origin::from(RawOrigin::Signed(caller));
-			Identity::<T>::set_identity(caller_origin, info)?;
+			Identity::<T>::set_identity(caller_origin, Box::new(info))?;
 		};
 
 		// User requests judgement from all the registrars, and they approve
@@ -233,7 +233,7 @@ benchmarks! {
 			let info = create_identity_info::<T>(x);
 			let caller: T::AccountId = whitelisted_caller();
 			let caller_origin = <T as frame_system::Config>::Origin::from(RawOrigin::Signed(caller));
-			Identity::<T>::set_identity(caller_origin, info)?;
+			Identity::<T>::set_identity(caller_origin, Box::new(info))?;
 		};
 	}: _(RawOrigin::Signed(caller.clone()), r - 1, 10u32.into())
 	verify {
@@ -251,7 +251,7 @@ benchmarks! {
 			let info = create_identity_info::<T>(x);
 			let caller: T::AccountId = whitelisted_caller();
 			let caller_origin = <T as frame_system::Config>::Origin::from(RawOrigin::Signed(caller));
-			Identity::<T>::set_identity(caller_origin, info)?;
+			Identity::<T>::set_identity(caller_origin, Box::new(info))?;
 		};
 
 		Identity::<T>::request_judgement(caller_origin, r - 1, 10u32.into())?;
@@ -321,7 +321,7 @@ benchmarks! {
 		let r in 1 .. T::MaxRegistrars::get() - 1 => add_registrars::<T>(r)?;
 		let x in 1 .. T::MaxAdditionalFields::get() => {
 			let info = create_identity_info::<T>(x);
-			Identity::<T>::set_identity(user_origin.clone(), info)?;
+			Identity::<T>::set_identity(user_origin.clone(), Box::new(info))?;
 		};
 
 		Identity::<T>::add_registrar(RawOrigin::Root.into(), caller.clone())?;
@@ -342,7 +342,7 @@ benchmarks! {
 		let _ = T::Currency::make_free_balance_be(&target, BalanceOf::<T>::max_value());
 
 		let info = create_identity_info::<T>(x);
-		Identity::<T>::set_identity(target_origin.clone(), info)?;
+		Identity::<T>::set_identity(target_origin.clone(), Box::new(info))?;
 		let _ = add_sub_accounts::<T>(&target, s)?;
 
 		// User requests judgement from all the registrars, and they approve
diff --git a/frame/identity/src/lib.rs b/frame/identity/src/lib.rs
index 7b401d95573f..19251cfbb85f 100644
--- a/frame/identity/src/lib.rs
+++ b/frame/identity/src/lib.rs
@@ -335,7 +335,7 @@ pub mod pallet {
 		))]
 		pub fn set_identity(
 			origin: OriginFor<T>,
-			info: IdentityInfo<T::MaxAdditionalFields>,
+			info: Box<IdentityInfo<T::MaxAdditionalFields>>,
 		) -> DispatchResultWithPostInfo {
 			let sender = ensure_signed(origin)?;
 			let extra_fields = info.additional.len() as u32;
@@ -346,11 +346,14 @@ pub mod pallet {
 				Some(mut id) => {
 					// Only keep non-positive judgements.
 					id.judgements.retain(|j| j.1.is_sticky());
-					id.info = info;
+					id.info = *info;
 					id
 				},
-				None =>
-					Registration { info, judgements: BoundedVec::default(), deposit: Zero::zero() },
+				None => Registration {
+					info: *info,
+					judgements: BoundedVec::default(),
+					deposit: Zero::zero(),
+				},
 			};
 
 			let old_deposit = id.deposit;
diff --git a/frame/identity/src/tests.rs b/frame/identity/src/tests.rs
index 127b0a9ecb17..3e1219ad64f2 100644
--- a/frame/identity/src/tests.rs
+++ b/frame/identity/src/tests.rs
@@ -150,7 +150,7 @@ fn editing_subaccounts_should_work() {
 
 		assert_noop!(Identity::add_sub(Origin::signed(10), 20, data(1)), Error::<Test>::NoIdentity);
 
-		assert_ok!(Identity::set_identity(Origin::signed(10), ten()));
+		assert_ok!(Identity::set_identity(Origin::signed(10), Box::new(ten())));
 
 		// first sub account
 		assert_ok!(Identity::add_sub(Origin::signed(10), 1, data(1)));
@@ -195,8 +195,8 @@ fn resolving_subaccount_ownership_works() {
 	new_test_ext().execute_with(|| {
 		let data = |x| Data::Raw(vec![x; 1].try_into().unwrap());
 
-		assert_ok!(Identity::set_identity(Origin::signed(10), ten()));
-		assert_ok!(Identity::set_identity(Origin::signed(20), twenty()));
+		assert_ok!(Identity::set_identity(Origin::signed(10), Box::new(ten())));
+		assert_ok!(Identity::set_identity(Origin::signed(20), Box::new(twenty())));
 
 		// 10 claims 1 as a subaccount
 		assert_ok!(Identity::add_sub(Origin::signed(10), 1, data(1)));
@@ -266,7 +266,7 @@ fn registration_should_work() {
 		three_fields.additional.try_push(Default::default()).unwrap();
 		three_fields.additional.try_push(Default::default()).unwrap();
 		assert_eq!(three_fields.additional.try_push(Default::default()), Err(()));
-		assert_ok!(Identity::set_identity(Origin::signed(10), ten()));
+		assert_ok!(Identity::set_identity(Origin::signed(10), Box::new(ten())));
 		assert_eq!(Identity::identity(10).unwrap().info, ten());
 		assert_eq!(Balances::free_balance(10), 90);
 		assert_ok!(Identity::clear_identity(Origin::signed(10)));
@@ -289,7 +289,7 @@ fn uninvited_judgement_should_work() {
 			Error::<Test>::InvalidTarget
 		);
 
-		assert_ok!(Identity::set_identity(Origin::signed(10), ten()));
+		assert_ok!(Identity::set_identity(Origin::signed(10), Box::new(ten())));
 		assert_noop!(
 			Identity::provide_judgement(Origin::signed(10), 0, 10, Judgement::Reasonable),
 			Error::<Test>::InvalidIndex
@@ -308,7 +308,7 @@ fn uninvited_judgement_should_work() {
 fn clearing_judgement_should_work() {
 	new_test_ext().execute_with(|| {
 		assert_ok!(Identity::add_registrar(Origin::signed(1), 3));
-		assert_ok!(Identity::set_identity(Origin::signed(10), ten()));
+		assert_ok!(Identity::set_identity(Origin::signed(10), Box::new(ten())));
 		assert_ok!(Identity::provide_judgement(Origin::signed(3), 0, 10, Judgement::Reasonable));
 		assert_ok!(Identity::clear_identity(Origin::signed(10)));
 		assert_eq!(Identity::identity(10), None);
@@ -318,7 +318,7 @@ fn clearing_judgement_should_work() {
 #[test]
 fn killing_slashing_should_work() {
 	new_test_ext().execute_with(|| {
-		assert_ok!(Identity::set_identity(Origin::signed(10), ten()));
+		assert_ok!(Identity::set_identity(Origin::signed(10), Box::new(ten())));
 		assert_noop!(Identity::kill_identity(Origin::signed(1), 10), BadOrigin);
 		assert_ok!(Identity::kill_identity(Origin::signed(2), 10));
 		assert_eq!(Identity::identity(10), None);
@@ -333,7 +333,7 @@ fn setting_subaccounts_should_work() {
 		let mut subs = vec![(20, Data::Raw(vec![40; 1].try_into().unwrap()))];
 		assert_noop!(Identity::set_subs(Origin::signed(10), subs.clone()), Error::<Test>::NotFound);
 
-		assert_ok!(Identity::set_identity(Origin::signed(10), ten()));
+		assert_ok!(Identity::set_identity(Origin::signed(10), Box::new(ten())));
 		assert_ok!(Identity::set_subs(Origin::signed(10), subs.clone()));
 		assert_eq!(Balances::free_balance(10), 80);
 		assert_eq!(Identity::subs_of(10), (10, vec![20].try_into().unwrap()));
@@ -374,7 +374,7 @@ fn setting_subaccounts_should_work() {
 #[test]
 fn clearing_account_should_remove_subaccounts_and_refund() {
 	new_test_ext().execute_with(|| {
-		assert_ok!(Identity::set_identity(Origin::signed(10), ten()));
+		assert_ok!(Identity::set_identity(Origin::signed(10), Box::new(ten())));
 		assert_ok!(Identity::set_subs(
 			Origin::signed(10),
 			vec![(20, Data::Raw(vec![40; 1].try_into().unwrap()))]
@@ -388,7 +388,7 @@ fn clearing_account_should_remove_subaccounts_and_refund() {
 #[test]
 fn killing_account_should_remove_subaccounts_and_not_refund() {
 	new_test_ext().execute_with(|| {
-		assert_ok!(Identity::set_identity(Origin::signed(10), ten()));
+		assert_ok!(Identity::set_identity(Origin::signed(10), Box::new(ten())));
 		assert_ok!(Identity::set_subs(
 			Origin::signed(10),
 			vec![(20, Data::Raw(vec![40; 1].try_into().unwrap()))]
@@ -405,7 +405,7 @@ fn cancelling_requested_judgement_should_work() {
 		assert_ok!(Identity::add_registrar(Origin::signed(1), 3));
 		assert_ok!(Identity::set_fee(Origin::signed(3), 0, 10));
 		assert_noop!(Identity::cancel_request(Origin::signed(10), 0), Error::<Test>::NoIdentity);
-		assert_ok!(Identity::set_identity(Origin::signed(10), ten()));
+		assert_ok!(Identity::set_identity(Origin::signed(10), Box::new(ten())));
 		assert_ok!(Identity::request_judgement(Origin::signed(10), 0, 10));
 		assert_ok!(Identity::cancel_request(Origin::signed(10), 0));
 		assert_eq!(Balances::free_balance(10), 90);
@@ -424,7 +424,7 @@ fn requesting_judgement_should_work() {
 	new_test_ext().execute_with(|| {
 		assert_ok!(Identity::add_registrar(Origin::signed(1), 3));
 		assert_ok!(Identity::set_fee(Origin::signed(3), 0, 10));
-		assert_ok!(Identity::set_identity(Origin::signed(10), ten()));
+		assert_ok!(Identity::set_identity(Origin::signed(10), Box::new(ten())));
 		assert_noop!(
 			Identity::request_judgement(Origin::signed(10), 0, 9),
 			Error::<Test>::FeeChanged
@@ -465,7 +465,7 @@ fn field_deposit_should_work() {
 		assert_ok!(Identity::set_fee(Origin::signed(3), 0, 10));
 		assert_ok!(Identity::set_identity(
 			Origin::signed(10),
-			IdentityInfo {
+			Box::new(IdentityInfo {
 				additional: vec![
 					(
 						Data::Raw(b"number".to_vec().try_into().unwrap()),
@@ -479,7 +479,7 @@ fn field_deposit_should_work() {
 				.try_into()
 				.unwrap(),
 				..Default::default()
-			}
+			})
 		));
 		assert_eq!(Balances::free_balance(10), 70);
 	});
diff --git a/frame/utility/src/lib.rs b/frame/utility/src/lib.rs
index 81cc3c65238b..7c47e81368f6 100644
--- a/frame/utility/src/lib.rs
+++ b/frame/utility/src/lib.rs
@@ -112,13 +112,33 @@ pub mod pallet {
 		ItemCompleted,
 	}
 
+	#[pallet::extra_constants]
+	impl<T: Config> Pallet<T> {
+		/// The limit on the number of batched calls.
+		fn batched_calls_limit() -> u32 {
+			let allocator_limit = sp_core::MAX_POSSIBLE_ALLOCATION;
+			let call_size = core::mem::size_of::<<T as Config>::Call>() as u32;
+			// The margin to take into account vec doubling capacity.
+			let margin_factor = 3;
+
+			allocator_limit / margin_factor / call_size
+		}
+	}
+
+	#[pallet::error]
+	pub enum Error<T> {
+		/// Too many calls batched.
+		TooManyCalls,
+	}
+
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
 		/// Send a batch of dispatch calls.
 		///
 		/// May be called from any origin.
 		///
-		/// - `calls`: The calls to be dispatched from the same origin.
+		/// - `calls`: The calls to be dispatched from the same origin. The number of call must not
+		///   exceed the constant: `batched_calls_limit` (available in constant metadata).
 		///
 		/// If origin is root then call are dispatch without checking origin filter. (This includes
 		/// bypassing `frame_system::Config::BaseCallFilter`).
@@ -156,6 +176,8 @@ pub mod pallet {
 		) -> DispatchResultWithPostInfo {
 			let is_root = ensure_root(origin.clone()).is_ok();
 			let calls_len = calls.len();
+			ensure!(calls_len <= Self::batched_calls_limit() as usize, Error::<T>::TooManyCalls);
+
 			// Track the actual weight of each of the batch calls.
 			let mut weight: Weight = 0;
 			for (index, call) in calls.into_iter().enumerate() {
@@ -234,7 +256,8 @@ pub mod pallet {
 		///
 		/// May be called from any origin.
 		///
-		/// - `calls`: The calls to be dispatched from the same origin.
+		/// - `calls`: The calls to be dispatched from the same origin. The number of call must not
+		///   exceed the constant: `batched_calls_limit` (available in constant metadata).
 		///
 		/// If origin is root then call are dispatch without checking origin filter. (This includes
 		/// bypassing `frame_system::Config::BaseCallFilter`).
@@ -267,6 +290,8 @@ pub mod pallet {
 		) -> DispatchResultWithPostInfo {
 			let is_root = ensure_root(origin.clone()).is_ok();
 			let calls_len = calls.len();
+			ensure!(calls_len <= Self::batched_calls_limit() as usize, Error::<T>::TooManyCalls);
+
 			// Track the actual weight of each of the batch calls.
 			let mut weight: Weight = 0;
 			for (index, call) in calls.into_iter().enumerate() {
diff --git a/frame/utility/src/tests.rs b/frame/utility/src/tests.rs
index 61890972d3a0..fdc738bcded9 100644
--- a/frame/utility/src/tests.rs
+++ b/frame/utility/src/tests.rs
@@ -66,6 +66,9 @@ pub mod example {
 					Ok(end_weight.into())
 				}
 			}
+
+			#[weight = 0]
+			fn big_variant(_origin, _arg: [u8; 400]) {}
 		}
 	}
 }
@@ -588,3 +591,12 @@ fn batch_all_does_not_nest() {
 		assert_eq!(Balances::free_balance(2), 10);
 	});
 }
+
+#[test]
+fn batch_limit() {
+	new_test_ext().execute_with(|| {
+		let calls = vec![Call::System(SystemCall::remark(vec![])); 40_000];
+		assert_noop!(Utility::batch(Origin::signed(1), calls.clone()), Error::<Test>::TooManyCalls);
+		assert_noop!(Utility::batch_all(Origin::signed(1), calls), Error::<Test>::TooManyCalls);
+	});
+}

From 8a88403d3e0791bf2a3a45cfadc202fc85065b7b Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Sat, 7 Aug 2021 18:05:12 +0200
Subject: [PATCH 1062/1194] FRAME Weights with Storage Metadata (#9471)

* weights with metadata

* fix

* fix contract test

* skip metadata tag

* special handling for `frame_system`

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=frame_system --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/system/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* add skip metadata to contracts

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_contracts --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/contracts/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* fix contract test

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_democracy --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/democracy/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_bounties --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/bounties/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* expose component information

* fix test generation

* refactor list benchmarks

* move component selection out of runtime

* add benchmark verification

* missing feature

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_bounties --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/bounties/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_democracy --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/democracy/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* add internal repeats

* update weights with internal repeats

* fix warning

* return error with pov

* try without tracking

* Revert "return error with pov"

This reverts commit 44c36cbbd3c6818f36f377e3e291f1df156e40f7.

* Revert "try without tracking"

This reverts commit f401c44aebff2232389d8d307b20924891e5d77d.

* Revert "Revert "try without tracking""

This reverts commit 4b4e05929802ad3e8154e107359447634e5fb21b.

* state without tracking

* fix build

* temp test

* split db and timing benchmarks

* extend db results?

* default repeat is internal

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_democracy --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/democracy/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* fix warning

* bump linked hash map

* use linked hash map for storage tracker

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_democracy --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/democracy/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* remove conflicting short command

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_democracy --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/democracy/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* missed one linked hashmap

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_bounties --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/bounties/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_bounties --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/bounties/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_election_provider_multi_phase --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/election-provider-multi-phase/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* new weights with latest changes

* Update frame/benchmarking/src/utils.rs

Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
---
 .maintain/frame-weight-template.hbs           |    4 +
 client/db/Cargo.toml                          |    2 +-
 client/db/src/bench.rs                        |   34 +-
 client/finality-grandpa/Cargo.toml            |    2 +-
 client/network/Cargo.toml                     |    2 +-
 client/transaction-pool/Cargo.toml            |    2 +-
 client/transaction-pool/graph/Cargo.toml      |    2 +-
 frame/assets/src/weights.rs                   |  228 ++-
 frame/balances/src/weights.rs                 |   26 +-
 frame/benchmarking/src/lib.rs                 |  282 ++-
 frame/benchmarking/src/tests.rs               |   18 +
 frame/benchmarking/src/utils.rs               |   59 +-
 frame/bounties/src/weights.rs                 |  106 +-
 frame/collective/src/weights.rs               |  228 ++-
 frame/contracts/src/benchmarking/mod.rs       |    5 +
 frame/contracts/src/tests.rs                  |    2 +-
 frame/contracts/src/weights.rs                | 1724 +++++++++++------
 frame/democracy/src/weights.rs                |  320 ++-
 .../src/weights.rs                            |  284 ++-
 frame/elections-phragmen/src/weights.rs       |  210 +-
 frame/gilt/src/weights.rs                     |   92 +-
 frame/identity/src/weights.rs                 |  302 +--
 frame/im-online/src/weights.rs                |   30 +-
 frame/indices/src/weights.rs                  |   38 +-
 frame/lottery/src/weights.rs                  |   80 +-
 frame/membership/src/weights.rs               |  122 +-
 frame/multisig/src/weights.rs                 |  156 +-
 frame/proxy/src/weights.rs                    |  162 +-
 frame/scheduler/src/weights.rs                |   54 +-
 frame/session/src/weights.rs                  |   24 +-
 frame/staking/src/weights.rs                  |  490 ++---
 frame/system/benchmarking/src/lib.rs          |    3 +
 frame/system/src/weights.rs                   |   50 +-
 frame/timestamp/src/weights.rs                |   20 +-
 frame/tips/src/weights.rs                     |   74 +-
 frame/transaction-storage/src/weights.rs      |   46 +-
 frame/treasury/src/weights.rs                 |   54 +-
 frame/uniques/src/weights.rs                  |  210 +-
 frame/utility/Cargo.toml                      |    1 +
 frame/utility/src/weights.rs                  |   30 +-
 frame/vesting/src/weights.rs                  |  108 +-
 utils/frame/benchmarking-cli/src/command.rs   |  273 ++-
 utils/frame/benchmarking-cli/src/lib.rs       |   14 +-
 utils/frame/benchmarking-cli/src/writer.rs    |   43 +-
 44 files changed, 3895 insertions(+), 2121 deletions(-)

diff --git a/.maintain/frame-weight-template.hbs b/.maintain/frame-weight-template.hbs
index 2f1fa742f078..045140d54dff 100644
--- a/.maintain/frame-weight-template.hbs
+++ b/.maintain/frame-weight-template.hbs
@@ -46,7 +46,11 @@ pub trait WeightInfo {
 
 /// Weights for {{pallet}} using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
+{{~#if (eq pallet "frame_system")}}
+impl<T: crate::Config> WeightInfo for SubstrateWeight<T> {
+{{~else}}
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+{{~/if}}
 	{{~#each benchmarks as |benchmark|}}
 	{{~#each benchmark.comments as |comment|}}
 	// {{comment}}
diff --git a/client/db/Cargo.toml b/client/db/Cargo.toml
index 856770c31f3e..ab06ecee75f4 100644
--- a/client/db/Cargo.toml
+++ b/client/db/Cargo.toml
@@ -18,7 +18,7 @@ log = "0.4.8"
 kvdb = "0.10.0"
 kvdb-rocksdb = { version = "0.12.0", optional = true }
 kvdb-memorydb = "0.10.0"
-linked-hash-map = "0.5.2"
+linked-hash-map = "0.5.4"
 hash-db = "0.15.2"
 parity-util-mem = { version = "0.10.0", default-features = false, features = ["std"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
diff --git a/client/db/src/bench.rs b/client/db/src/bench.rs
index c21119bd1176..a4b8f6696ea6 100644
--- a/client/db/src/bench.rs
+++ b/client/db/src/bench.rs
@@ -27,6 +27,7 @@ use std::{
 use crate::storage_cache::{new_shared_cache, CachingState, SharedCache};
 use hash_db::{Hasher, Prefix};
 use kvdb::{DBTransaction, KeyValueDB};
+use linked_hash_map::LinkedHashMap;
 use sp_core::{
 	hexdisplay::HexDisplay,
 	storage::{ChildInfo, TrackedStorageKey},
@@ -72,7 +73,6 @@ impl<Block: BlockT> sp_state_machine::Storage<HashFor<Block>> for StorageDb<Bloc
 		}
 	}
 }
-
 /// State that manages the backend database reference. Allows runtime to control the database.
 pub struct BenchmarkingState<B: BlockT> {
 	root: Cell<B::Hash>,
@@ -85,15 +85,16 @@ pub struct BenchmarkingState<B: BlockT> {
 	/// Key tracker for keys in the main trie.
 	/// We track the total number of reads and writes to these keys,
 	/// not de-duplicated for repeats.
-	main_key_tracker: RefCell<HashMap<Vec<u8>, TrackedStorageKey>>,
+	main_key_tracker: RefCell<LinkedHashMap<Vec<u8>, TrackedStorageKey>>,
 	/// Key tracker for keys in a child trie.
 	/// Child trie are identified by their storage key (i.e. `ChildInfo::storage_key()`)
 	/// We track the total number of reads and writes to these keys,
 	/// not de-duplicated for repeats.
-	child_key_tracker: RefCell<HashMap<Vec<u8>, HashMap<Vec<u8>, TrackedStorageKey>>>,
+	child_key_tracker: RefCell<LinkedHashMap<Vec<u8>, LinkedHashMap<Vec<u8>, TrackedStorageKey>>>,
 	whitelist: RefCell<Vec<TrackedStorageKey>>,
 	proof_recorder: Option<ProofRecorder<B::Hash>>,
 	proof_recorder_root: Cell<B::Hash>,
+	enable_tracking: bool,
 }
 
 impl<B: BlockT> BenchmarkingState<B> {
@@ -102,6 +103,7 @@ impl<B: BlockT> BenchmarkingState<B> {
 		genesis: Storage,
 		_cache_size_mb: Option<usize>,
 		record_proof: bool,
+		enable_tracking: bool,
 	) -> Result<Self, String> {
 		let mut root = B::Hash::default();
 		let mut mdb = MemoryDB::<HashFor<B>>::default();
@@ -120,6 +122,7 @@ impl<B: BlockT> BenchmarkingState<B> {
 			whitelist: Default::default(),
 			proof_recorder: record_proof.then(Default::default),
 			proof_recorder_root: Cell::new(root.clone()),
+			enable_tracking,
 		};
 
 		state.add_whitelist_to_tracker();
@@ -180,18 +183,24 @@ impl<B: BlockT> BenchmarkingState<B> {
 	}
 
 	fn wipe_tracker(&self) {
-		*self.main_key_tracker.borrow_mut() = HashMap::new();
-		*self.child_key_tracker.borrow_mut() = HashMap::new();
+		*self.main_key_tracker.borrow_mut() = LinkedHashMap::new();
+		*self.child_key_tracker.borrow_mut() = LinkedHashMap::new();
 		self.add_whitelist_to_tracker();
 	}
 
 	// Childtrie is identified by its storage key (i.e. `ChildInfo::storage_key`)
 	fn add_read_key(&self, childtrie: Option<&[u8]>, key: &[u8]) {
+		if !self.enable_tracking {
+			return
+		}
+
 		let mut child_key_tracker = self.child_key_tracker.borrow_mut();
 		let mut main_key_tracker = self.main_key_tracker.borrow_mut();
 
 		let key_tracker = if let Some(childtrie) = childtrie {
-			child_key_tracker.entry(childtrie.to_vec()).or_insert_with(|| HashMap::new())
+			child_key_tracker
+				.entry(childtrie.to_vec())
+				.or_insert_with(|| LinkedHashMap::new())
 		} else {
 			&mut main_key_tracker
 		};
@@ -224,11 +233,17 @@ impl<B: BlockT> BenchmarkingState<B> {
 
 	// Childtrie is identified by its storage key (i.e. `ChildInfo::storage_key`)
 	fn add_write_key(&self, childtrie: Option<&[u8]>, key: &[u8]) {
+		if !self.enable_tracking {
+			return
+		}
+
 		let mut child_key_tracker = self.child_key_tracker.borrow_mut();
 		let mut main_key_tracker = self.main_key_tracker.borrow_mut();
 
 		let key_tracker = if let Some(childtrie) = childtrie {
-			child_key_tracker.entry(childtrie.to_vec()).or_insert_with(|| HashMap::new())
+			child_key_tracker
+				.entry(childtrie.to_vec())
+				.or_insert_with(|| LinkedHashMap::new())
 		} else {
 			&mut main_key_tracker
 		};
@@ -553,7 +568,7 @@ impl<B: BlockT> StateBackend<HashFor<B>> for BenchmarkingState<B> {
 		// We only track at the level of a key-prefix and not whitelisted for now for memory size.
 		// TODO: Refactor to enable full storage key transparency, where we can remove the
 		// `prefix_key_tracker`.
-		let mut prefix_key_tracker = HashMap::<Vec<u8>, (u32, u32, bool)>::new();
+		let mut prefix_key_tracker = LinkedHashMap::<Vec<u8>, (u32, u32, bool)>::new();
 		self.all_trackers().iter().for_each(|tracker| {
 			if !tracker.whitelisted {
 				let prefix_length = tracker.key.len().min(32);
@@ -629,7 +644,8 @@ mod test {
 	#[test]
 	fn read_to_main_and_child_tries() {
 		let bench_state =
-			BenchmarkingState::<crate::tests::Block>::new(Default::default(), None, false).unwrap();
+			BenchmarkingState::<crate::tests::Block>::new(Default::default(), None, false, true)
+				.unwrap();
 
 		for _ in 0..2 {
 			let child1 = sp_core::storage::ChildInfo::new_default(b"child1");
diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml
index 66432a7aa51c..6c19dccfa8a5 100644
--- a/client/finality-grandpa/Cargo.toml
+++ b/client/finality-grandpa/Cargo.toml
@@ -46,7 +46,7 @@ prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../..
 sc-block-builder = { version = "0.10.0-dev", path = "../block-builder" }
 finality-grandpa = { version = "0.14.1", features = ["derive-codec"] }
 pin-project = "1.0.4"
-linked-hash-map = "0.5.2"
+linked-hash-map = "0.5.4"
 async-trait = "0.1.50"
 wasm-timer = "0.2"
 
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index a24b8fe5310a..e7f23e484e5f 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -34,7 +34,7 @@ futures-timer = "3.0.2"
 asynchronous-codec = "0.5"
 hex = "0.4.0"
 ip_network = "0.3.4"
-linked-hash-map = "0.5.2"
+linked-hash-map = "0.5.4"
 linked_hash_set = "0.1.3"
 lru = "0.6.5"
 log = "0.4.8"
diff --git a/client/transaction-pool/Cargo.toml b/client/transaction-pool/Cargo.toml
index 846bc68931bd..ef50d17268c9 100644
--- a/client/transaction-pool/Cargo.toml
+++ b/client/transaction-pool/Cargo.toml
@@ -33,7 +33,7 @@ sp-utils = { version = "4.0.0-dev", path = "../../primitives/utils" }
 wasm-timer = "0.2"
 derive_more = "0.99.2"
 serde = { version = "1.0.126", features = ["derive"] }
-linked-hash-map = "0.5.2"
+linked-hash-map = "0.5.4"
 retain_mut = "0.1.3"
 
 [dev-dependencies]
diff --git a/client/transaction-pool/graph/Cargo.toml b/client/transaction-pool/graph/Cargo.toml
index 492ca89f5039..162829e1ddf0 100644
--- a/client/transaction-pool/graph/Cargo.toml
+++ b/client/transaction-pool/graph/Cargo.toml
@@ -26,7 +26,7 @@ sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
 sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
 sp-transaction-pool = { version = "4.0.0-dev", path = "../../../primitives/transaction-pool" }
 parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
-linked-hash-map = "0.5.2"
+linked-hash-map = "0.5.4"
 retain_mut = "0.1.3"
 
 [dev-dependencies]
diff --git a/frame/assets/src/weights.rs b/frame/assets/src/weights.rs
index 6e8517064f16..912ebcf7e851 100644
--- a/frame/assets/src/weights.rs
+++ b/frame/assets/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_assets
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -73,24 +73,31 @@ pub trait WeightInfo {
 /// Weights for pallet_assets using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	// Storage: Assets Asset (r:1 w:1)
 	fn create() -> Weight {
-		(43_277_000 as Weight)
+		(41_651_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:1)
 	fn force_create() -> Weight {
-		(21_829_000 as Weight)
+		(21_378_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:1)
+	// Storage: Assets Account (r:5002 w:5001)
+	// Storage: System Account (r:5000 w:5000)
+	// Storage: Assets Metadata (r:1 w:0)
+	// Storage: Assets Approvals (r:501 w:500)
 	fn destroy(c: u32, s: u32, a: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 34_000
-			.saturating_add((22_206_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 34_000
-			.saturating_add((28_086_000 as Weight).saturating_mul(s as Weight))
-			// Standard Error: 346_000
-			.saturating_add((32_168_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 32_000
+			.saturating_add((21_163_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 32_000
+			.saturating_add((26_932_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 329_000
+			.saturating_add((29_714_000 as Weight).saturating_mul(a as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(c as Weight)))
 			.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(s as Weight)))
@@ -100,107 +107,150 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 			.saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(s as Weight)))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(a as Weight)))
 	}
+	// Storage: Assets Asset (r:1 w:1)
+	// Storage: Assets Account (r:1 w:1)
 	fn mint() -> Weight {
-		(45_983_000 as Weight)
+		(47_913_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:1)
+	// Storage: Assets Account (r:1 w:1)
 	fn burn() -> Weight {
-		(52_925_000 as Weight)
+		(55_759_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:1)
+	// Storage: Assets Account (r:2 w:2)
+	// Storage: System Account (r:1 w:1)
 	fn transfer() -> Weight {
-		(80_375_000 as Weight)
+		(83_205_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:1)
+	// Storage: Assets Account (r:2 w:2)
+	// Storage: System Account (r:1 w:1)
 	fn transfer_keep_alive() -> Weight {
-		(67_688_000 as Weight)
+		(70_665_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:1)
+	// Storage: Assets Account (r:2 w:2)
+	// Storage: System Account (r:1 w:1)
 	fn force_transfer() -> Weight {
-		(80_267_000 as Weight)
+		(81_458_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:0)
+	// Storage: Assets Account (r:1 w:1)
 	fn freeze() -> Weight {
-		(30_541_000 as Weight)
+		(32_845_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:0)
+	// Storage: Assets Account (r:1 w:1)
 	fn thaw() -> Weight {
-		(30_494_000 as Weight)
+		(33_303_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:1)
 	fn freeze_asset() -> Weight {
-		(22_025_000 as Weight)
+		(23_434_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:1)
 	fn thaw_asset() -> Weight {
-		(21_889_000 as Weight)
+		(24_173_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:1)
+	// Storage: Assets Metadata (r:1 w:0)
 	fn transfer_ownership() -> Weight {
-		(24_939_000 as Weight)
+		(27_466_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:1)
 	fn set_team() -> Weight {
-		(21_959_000 as Weight)
+		(24_608_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
-	fn set_metadata(_n: u32, s: u32, ) -> Weight {
-		(47_510_000 as Weight)
-			// Standard Error: 0
+	// Storage: Assets Asset (r:1 w:0)
+	// Storage: Assets Metadata (r:1 w:1)
+	fn set_metadata(n: u32, s: u32, ) -> Weight {
+		(49_515_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 1_000
 			.saturating_add((6_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:0)
+	// Storage: Assets Metadata (r:1 w:1)
 	fn clear_metadata() -> Weight {
-		(46_085_000 as Weight)
+		(48_163_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:0)
+	// Storage: Assets Metadata (r:1 w:1)
 	fn force_set_metadata(_n: u32, s: u32, ) -> Weight {
-		(24_297_000 as Weight)
+		(26_722_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((7_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((5_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:0)
+	// Storage: Assets Metadata (r:1 w:1)
 	fn force_clear_metadata() -> Weight {
-		(45_787_000 as Weight)
+		(47_923_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:1)
 	fn force_asset_status() -> Weight {
-		(20_574_000 as Weight)
+		(23_081_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:1)
+	// Storage: Assets Approvals (r:1 w:1)
 	fn approve_transfer() -> Weight {
-		(53_893_000 as Weight)
+		(56_998_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Assets Approvals (r:1 w:1)
+	// Storage: Assets Asset (r:1 w:1)
+	// Storage: Assets Account (r:2 w:2)
+	// Storage: System Account (r:1 w:1)
 	fn transfer_approved() -> Weight {
-		(106_171_000 as Weight)
+		(107_171_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:1)
+	// Storage: Assets Approvals (r:1 w:1)
 	fn cancel_approval() -> Weight {
-		(55_213_000 as Weight)
+		(57_358_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:1)
+	// Storage: Assets Approvals (r:1 w:1)
 	fn force_cancel_approval() -> Weight {
-		(55_946_000 as Weight)
+		(58_330_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
@@ -208,24 +258,31 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
+	// Storage: Assets Asset (r:1 w:1)
 	fn create() -> Weight {
-		(43_277_000 as Weight)
+		(41_651_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:1)
 	fn force_create() -> Weight {
-		(21_829_000 as Weight)
+		(21_378_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:1)
+	// Storage: Assets Account (r:5002 w:5001)
+	// Storage: System Account (r:5000 w:5000)
+	// Storage: Assets Metadata (r:1 w:0)
+	// Storage: Assets Approvals (r:501 w:500)
 	fn destroy(c: u32, s: u32, a: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 34_000
-			.saturating_add((22_206_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 34_000
-			.saturating_add((28_086_000 as Weight).saturating_mul(s as Weight))
-			// Standard Error: 346_000
-			.saturating_add((32_168_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 32_000
+			.saturating_add((21_163_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 32_000
+			.saturating_add((26_932_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 329_000
+			.saturating_add((29_714_000 as Weight).saturating_mul(a as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(c as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(s as Weight)))
@@ -235,107 +292,150 @@ impl WeightInfo for () {
 			.saturating_add(RocksDbWeight::get().writes((2 as Weight).saturating_mul(s as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(a as Weight)))
 	}
+	// Storage: Assets Asset (r:1 w:1)
+	// Storage: Assets Account (r:1 w:1)
 	fn mint() -> Weight {
-		(45_983_000 as Weight)
+		(47_913_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:1)
+	// Storage: Assets Account (r:1 w:1)
 	fn burn() -> Weight {
-		(52_925_000 as Weight)
+		(55_759_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:1)
+	// Storage: Assets Account (r:2 w:2)
+	// Storage: System Account (r:1 w:1)
 	fn transfer() -> Weight {
-		(80_375_000 as Weight)
+		(83_205_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:1)
+	// Storage: Assets Account (r:2 w:2)
+	// Storage: System Account (r:1 w:1)
 	fn transfer_keep_alive() -> Weight {
-		(67_688_000 as Weight)
+		(70_665_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:1)
+	// Storage: Assets Account (r:2 w:2)
+	// Storage: System Account (r:1 w:1)
 	fn force_transfer() -> Weight {
-		(80_267_000 as Weight)
+		(81_458_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:0)
+	// Storage: Assets Account (r:1 w:1)
 	fn freeze() -> Weight {
-		(30_541_000 as Weight)
+		(32_845_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:0)
+	// Storage: Assets Account (r:1 w:1)
 	fn thaw() -> Weight {
-		(30_494_000 as Weight)
+		(33_303_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:1)
 	fn freeze_asset() -> Weight {
-		(22_025_000 as Weight)
+		(23_434_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:1)
 	fn thaw_asset() -> Weight {
-		(21_889_000 as Weight)
+		(24_173_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:1)
+	// Storage: Assets Metadata (r:1 w:0)
 	fn transfer_ownership() -> Weight {
-		(24_939_000 as Weight)
+		(27_466_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:1)
 	fn set_team() -> Weight {
-		(21_959_000 as Weight)
+		(24_608_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
-	fn set_metadata(_n: u32, s: u32, ) -> Weight {
-		(47_510_000 as Weight)
-			// Standard Error: 0
+	// Storage: Assets Asset (r:1 w:0)
+	// Storage: Assets Metadata (r:1 w:1)
+	fn set_metadata(n: u32, s: u32, ) -> Weight {
+		(49_515_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 1_000
 			.saturating_add((6_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:0)
+	// Storage: Assets Metadata (r:1 w:1)
 	fn clear_metadata() -> Weight {
-		(46_085_000 as Weight)
+		(48_163_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:0)
+	// Storage: Assets Metadata (r:1 w:1)
 	fn force_set_metadata(_n: u32, s: u32, ) -> Weight {
-		(24_297_000 as Weight)
+		(26_722_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((7_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((5_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:0)
+	// Storage: Assets Metadata (r:1 w:1)
 	fn force_clear_metadata() -> Weight {
-		(45_787_000 as Weight)
+		(47_923_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:1)
 	fn force_asset_status() -> Weight {
-		(20_574_000 as Weight)
+		(23_081_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:1)
+	// Storage: Assets Approvals (r:1 w:1)
 	fn approve_transfer() -> Weight {
-		(53_893_000 as Weight)
+		(56_998_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Assets Approvals (r:1 w:1)
+	// Storage: Assets Asset (r:1 w:1)
+	// Storage: Assets Account (r:2 w:2)
+	// Storage: System Account (r:1 w:1)
 	fn transfer_approved() -> Weight {
-		(106_171_000 as Weight)
+		(107_171_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:1)
+	// Storage: Assets Approvals (r:1 w:1)
 	fn cancel_approval() -> Weight {
-		(55_213_000 as Weight)
+		(57_358_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Assets Asset (r:1 w:1)
+	// Storage: Assets Approvals (r:1 w:1)
 	fn force_cancel_approval() -> Weight {
-		(55_946_000 as Weight)
+		(58_330_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
diff --git a/frame/balances/src/weights.rs b/frame/balances/src/weights.rs
index df609b74840d..9fce8d4fde26 100644
--- a/frame/balances/src/weights.rs
+++ b/frame/balances/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_balances
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2021-07-30, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -58,37 +58,37 @@ pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:1)
 	fn transfer() -> Weight {
-		(78_358_000 as Weight)
+		(72_229_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: System Account (r:1 w:1)
 	fn transfer_keep_alive() -> Weight {
-		(59_001_000 as Weight)
+		(55_013_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: System Account (r:1 w:1)
 	fn set_balance_creating() -> Weight {
-		(32_698_000 as Weight)
+		(29_404_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: System Account (r:1 w:1)
 	fn set_balance_killing() -> Weight {
-		(38_746_000 as Weight)
+		(36_311_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: System Account (r:2 w:2)
 	fn force_transfer() -> Weight {
-		(77_622_000 as Weight)
+		(73_125_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	// Storage: System Account (r:1 w:1)
 	fn transfer_all() -> Weight {
-		(72_020_000 as Weight)
+		(67_749_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -98,37 +98,37 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 impl WeightInfo for () {
 	// Storage: System Account (r:1 w:1)
 	fn transfer() -> Weight {
-		(78_358_000 as Weight)
+		(72_229_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: System Account (r:1 w:1)
 	fn transfer_keep_alive() -> Weight {
-		(59_001_000 as Weight)
+		(55_013_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: System Account (r:1 w:1)
 	fn set_balance_creating() -> Weight {
-		(32_698_000 as Weight)
+		(29_404_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: System Account (r:1 w:1)
 	fn set_balance_killing() -> Weight {
-		(38_746_000 as Weight)
+		(36_311_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: System Account (r:2 w:2)
 	fn force_transfer() -> Weight {
-		(77_622_000 as Weight)
+		(73_125_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	// Storage: System Account (r:1 w:1)
 	fn transfer_all() -> Weight {
-		(72_020_000 as Weight)
+		(67_749_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
index 26ef4873c230..1680e7331510 100644
--- a/frame/benchmarking/src/lib.rs
+++ b/frame/benchmarking/src/lib.rs
@@ -190,6 +190,7 @@ macro_rules! benchmarks {
 			{ }
 			( )
 			( )
+			( )
 			$( $rest )*
 		);
 	}
@@ -208,6 +209,7 @@ macro_rules! benchmarks_instance {
 			{ }
 			( )
 			( )
+			( )
 			$( $rest )*
 		);
 	}
@@ -226,6 +228,7 @@ macro_rules! benchmarks_instance_pallet {
 			{ }
 			( )
 			( )
+			( )
 			$( $rest )*
 		);
 	}
@@ -240,6 +243,7 @@ macro_rules! benchmarks_iter {
 		{ $( $where_clause:tt )* }
 		( $( $names:tt )* )
 		( $( $names_extra:tt )* )
+		( $( $names_skip_meta:tt )* )
 		where_clause { where $( $where_bound:tt )* }
 		$( $rest:tt )*
 	) => {
@@ -248,15 +252,38 @@ macro_rules! benchmarks_iter {
 			{ $( $where_bound )* }
 			( $( $names )* )
 			( $( $names_extra )* )
+			( $( $names_skip_meta )* )
+			$( $rest )*
+		}
+	};
+	// detect and extract `#[skip_meta]` tag:
+	(
+		{ $( $instance:ident: $instance_bound:tt )? }
+		{ $( $where_clause:tt )* }
+		( $( $names:tt )* )
+		( $( $names_extra:tt )* )
+		( $( $names_skip_meta:tt )* )
+		#[skip_meta]
+		$name:ident
+		$( $rest:tt )*
+	) => {
+		$crate::benchmarks_iter! {
+			{ $( $instance: $instance_bound )? }
+			{ $( $where_clause )* }
+			( $( $names )* )
+			( $( $names_extra )* )
+			( $( $names_skip_meta )* $name )
+			$name
 			$( $rest )*
 		}
 	};
-	// detect and extract extra tag:
+	// detect and extract `#[extra] tag:
 	(
 		{ $( $instance:ident: $instance_bound:tt )? }
 		{ $( $where_clause:tt )* }
 		( $( $names:tt )* )
 		( $( $names_extra:tt )* )
+		( $( $names_skip_meta:tt )* )
 		#[extra]
 		$name:ident
 		$( $rest:tt )*
@@ -266,6 +293,7 @@ macro_rules! benchmarks_iter {
 			{ $( $where_clause )* }
 			( $( $names )* )
 			( $( $names_extra )* $name )
+			( $( $names_skip_meta )* )
 			$name
 			$( $rest )*
 		}
@@ -276,6 +304,7 @@ macro_rules! benchmarks_iter {
 		{ $( $where_clause:tt )* }
 		( $( $names:tt )* ) // This contains $( $( { $instance } )? $name:ident )*
 		( $( $names_extra:tt )* )
+		( $( $names_skip_meta:tt )* )
 		$name:ident { $( $code:tt )* }: _ ( $origin:expr $( , $arg:expr )* )
 		verify $postcode:block
 		$( $rest:tt )*
@@ -285,6 +314,7 @@ macro_rules! benchmarks_iter {
 			{ $( $where_clause )* }
 			( $( $names )* )
 			( $( $names_extra )* )
+			( $( $names_skip_meta )* )
 			$name { $( $code )* }: $name ( $origin $( , $arg )* )
 			verify $postcode
 			$( $rest )*
@@ -296,6 +326,7 @@ macro_rules! benchmarks_iter {
 		{ $( $where_clause:tt )* }
 		( $( $names:tt )* )
 		( $( $names_extra:tt )* )
+		( $( $names_skip_meta:tt )* )
 		$name:ident { $( $code:tt )* }: $dispatch:ident ( $origin:expr $( , $arg:expr )* )
 		verify $postcode:block
 		$( $rest:tt )*
@@ -305,6 +336,7 @@ macro_rules! benchmarks_iter {
 			{ $( $where_clause )* }
 			( $( $names )* )
 			( $( $names_extra )* )
+			( $( $names_skip_meta )* )
 			$name {
 				$( $code )*
 				let __benchmarked_call_encoded = $crate::frame_support::codec::Encode::encode(
@@ -331,6 +363,7 @@ macro_rules! benchmarks_iter {
 		{ $( $where_clause:tt )* }
 		( $( $names:tt )* )
 		( $( $names_extra:tt )* )
+		( $( $names_skip_meta:tt )* )
 		$name:ident { $( $code:tt )* }: $eval:block
 		verify $postcode:block
 		$( $rest:tt )*
@@ -357,6 +390,7 @@ macro_rules! benchmarks_iter {
 			{ $( $where_clause )* }
 			( $( $names )* { $( $instance )? } $name )
 			( $( $names_extra )* )
+			( $( $names_skip_meta )* )
 			$( $rest )*
 		);
 	};
@@ -366,6 +400,7 @@ macro_rules! benchmarks_iter {
 		{ $( $where_clause:tt )* }
 		( $( $names:tt )* )
 		( $( $names_extra:tt )* )
+		( $( $names_skip_meta:tt )* )
 	) => {
 		$crate::selected_benchmark!(
 			{ $( $where_clause)* }
@@ -377,6 +412,7 @@ macro_rules! benchmarks_iter {
 			{ $( $instance: $instance_bound )? }
 			( $( $names )* )
 			( $( $names_extra ),* )
+			( $( $names_skip_meta ),* )
 		);
 	};
 	// add verify block to _() format
@@ -385,6 +421,7 @@ macro_rules! benchmarks_iter {
 		{ $( $where_clause:tt )* }
 		( $( $names:tt )* )
 		( $( $names_extra:tt )* )
+		( $( $names_skip_meta:tt )* )
 		$name:ident { $( $code:tt )* }: _ ( $origin:expr $( , $arg:expr )* )
 		$( $rest:tt )*
 	) => {
@@ -393,6 +430,7 @@ macro_rules! benchmarks_iter {
 			{ $( $where_clause )* }
 			( $( $names )* )
 			( $( $names_extra )* )
+			( $( $names_skip_meta )* )
 			$name { $( $code )* }: _ ( $origin $( , $arg )* )
 			verify { }
 			$( $rest )*
@@ -404,6 +442,7 @@ macro_rules! benchmarks_iter {
 		{ $( $where_clause:tt )* }
 		( $( $names:tt )* )
 		( $( $names_extra:tt )* )
+		( $( $names_skip_meta:tt )* )
 		$name:ident { $( $code:tt )* }: $dispatch:ident ( $origin:expr $( , $arg:expr )* )
 		$( $rest:tt )*
 	) => {
@@ -412,6 +451,7 @@ macro_rules! benchmarks_iter {
 			{ $( $where_clause )* }
 			( $( $names )* )
 			( $( $names_extra )* )
+			( $( $names_skip_meta )* )
 			$name { $( $code )* }: $dispatch ( $origin $( , $arg )* )
 			verify { }
 			$( $rest )*
@@ -423,6 +463,7 @@ macro_rules! benchmarks_iter {
 		{ $( $where_clause:tt )* }
 		( $( $names:tt )* )
 		( $( $names_extra:tt )* )
+		( $( $names_skip_meta:tt )* )
 		$name:ident { $( $code:tt )* }: $eval:block
 		$( $rest:tt )*
 	) => {
@@ -431,6 +472,7 @@ macro_rules! benchmarks_iter {
 			{ $( $where_clause )* }
 			( $( $names )* )
 			( $( $names_extra )* )
+			( $( $names_skip_meta )* )
 			$name { $( $code )* }: $eval
 			verify { }
 			$( $rest )*
@@ -696,28 +738,40 @@ macro_rules! impl_benchmark {
 		{ $( $instance:ident: $instance_bound:tt )? }
 		( $( { $( $name_inst:ident )? } $name:ident )* )
 		( $( $name_extra:ident ),* )
+		( $( $name_skip_meta:ident ),* )
 	) => {
 		impl<T: Config $(<$instance>, $instance: $instance_bound )? >
 			$crate::Benchmarking<$crate::BenchmarkResults> for Pallet<T $(, $instance)? >
 			where T: frame_system::Config, $( $where_clause )*
 		{
-			fn benchmarks(extra: bool) -> $crate::Vec<&'static [u8]> {
-				let mut all = $crate::vec![ $( stringify!($name).as_ref() ),* ];
+			fn benchmarks(extra: bool) -> $crate::Vec<$crate::BenchmarkMetadata> {
+				let mut all_names = $crate::vec![ $( stringify!($name).as_ref() ),* ];
 				if !extra {
 					let extra = [ $( stringify!($name_extra).as_ref() ),* ];
-					all.retain(|x| !extra.contains(x));
+					all_names.retain(|x| !extra.contains(x));
 				}
-				all
+				all_names.into_iter().map(|benchmark| {
+					let selected_benchmark = match benchmark {
+						$( stringify!($name) => SelectedBenchmark::$name, )*
+						_ => panic!("all benchmarks should be selectable"),
+					};
+					let components = <
+						SelectedBenchmark as $crate::BenchmarkingSetup<T $(, $instance)?>
+					>::components(&selected_benchmark);
+
+					$crate::BenchmarkMetadata {
+						name: benchmark.as_bytes().to_vec(),
+						components,
+					}
+				}).collect::<$crate::Vec<_>>()
 			}
 
 			fn run_benchmark(
 				extrinsic: &[u8],
-				lowest_range_values: &[u32],
-				highest_range_values: &[u32],
-				steps: (u32, u32),
-				_repeat: (u32, u32),
+				c: &[($crate::BenchmarkParameter, u32)],
 				whitelist: &[$crate::TrackedStorageKey],
 				verify: bool,
+				internal_repeats: u32,
 			) -> Result<$crate::Vec<$crate::BenchmarkResults>, &'static str> {
 				// Map the input to the selected benchmark.
 				let extrinsic = $crate::sp_std::str::from_utf8(extrinsic)
@@ -726,7 +780,6 @@ macro_rules! impl_benchmark {
 					$( stringify!($name) => SelectedBenchmark::$name, )*
 					_ => return Err("Could not find extrinsic."),
 				};
-				let mut results: $crate::Vec<$crate::BenchmarkResults> = $crate::Vec::new();
 
 				// Add whitelist to DB including whitelisted caller
 				let mut whitelist = whitelist.to_vec();
@@ -737,15 +790,10 @@ macro_rules! impl_benchmark {
 				whitelist.push(whitelisted_caller_key.into());
 				$crate::benchmarking::set_whitelist(whitelist);
 
-				let components = <
-					SelectedBenchmark as $crate::BenchmarkingSetup<T $(, $instance)?>
-				>::components(&selected_benchmark);
+				let mut results: $crate::Vec<$crate::BenchmarkResults> = $crate::Vec::new();
 
-				let do_benchmark = |
-					c: &[($crate::BenchmarkParameter, u32)],
-					results: &mut $crate::Vec<$crate::BenchmarkResults>,
-					verify: bool,
-				| -> Result<(), &'static str> {
+				// Always do at least one internal repeat...
+				for _ in 0 .. internal_repeats.max(1) {
 					// Set up the externalities environment for the setup we want to
 					// benchmark.
 					let closure_to_benchmark = <
@@ -764,120 +812,68 @@ macro_rules! impl_benchmark {
 					// Reset the read/write counter so we don't count operations in the setup process.
 					$crate::benchmarking::reset_read_write_count();
 
-					if verify {
-						closure_to_benchmark()?;
-					} else {
-						// Time the extrinsic logic.
-						$crate::log::trace!(
-							target: "benchmark",
-							"Start Benchmark: {:?}", c
-						);
+					// Time the extrinsic logic.
+					$crate::log::trace!(
+						target: "benchmark",
+						"Start Benchmark: {:?}", c
+					);
 
-						let start_pov = $crate::benchmarking::proof_size();
-						let start_extrinsic = $crate::benchmarking::current_time();
+					let start_pov = $crate::benchmarking::proof_size();
+					let start_extrinsic = $crate::benchmarking::current_time();
 
-						closure_to_benchmark()?;
+					closure_to_benchmark()?;
 
-						let finish_extrinsic = $crate::benchmarking::current_time();
-						let end_pov = $crate::benchmarking::proof_size();
+					let finish_extrinsic = $crate::benchmarking::current_time();
+					let end_pov = $crate::benchmarking::proof_size();
 
-						// Calculate the diff caused by the benchmark.
-						let elapsed_extrinsic = finish_extrinsic.saturating_sub(start_extrinsic);
-						let diff_pov = match (start_pov, end_pov) {
-							(Some(start), Some(end)) => end.saturating_sub(start),
-							_ => Default::default(),
-						};
+					// Calculate the diff caused by the benchmark.
+					let elapsed_extrinsic = finish_extrinsic.saturating_sub(start_extrinsic);
+					let diff_pov = match (start_pov, end_pov) {
+						(Some(start), Some(end)) => end.saturating_sub(start),
+						_ => Default::default(),
+					};
 
-						// Commit the changes to get proper write count
-						$crate::benchmarking::commit_db();
-						$crate::log::trace!(
-							target: "benchmark",
-							"End Benchmark: {} ns", elapsed_extrinsic
-						);
-						let read_write_count = $crate::benchmarking::read_write_count();
-						$crate::log::trace!(
-							target: "benchmark",
-							"Read/Write Count {:?}", read_write_count
-						);
+					// Commit the changes to get proper write count
+					$crate::benchmarking::commit_db();
+					$crate::log::trace!(
+						target: "benchmark",
+						"End Benchmark: {} ns", elapsed_extrinsic
+					);
+					let read_write_count = $crate::benchmarking::read_write_count();
+					$crate::log::trace!(
+						target: "benchmark",
+						"Read/Write Count {:?}", read_write_count
+					);
 
-						// Time the storage root recalculation.
-						let start_storage_root = $crate::benchmarking::current_time();
-						$crate::storage_root();
-						let finish_storage_root = $crate::benchmarking::current_time();
-						let elapsed_storage_root = finish_storage_root - start_storage_root;
+					// Time the storage root recalculation.
+					let start_storage_root = $crate::benchmarking::current_time();
+					$crate::storage_root();
+					let finish_storage_root = $crate::benchmarking::current_time();
+					let elapsed_storage_root = finish_storage_root - start_storage_root;
 
-						let read_and_written_keys = $crate::benchmarking::get_read_and_written_keys();
+					let skip_meta = [ $( stringify!($name_skip_meta).as_ref() ),* ];
+					let read_and_written_keys = if (&skip_meta).contains(&extrinsic) {
+						$crate::vec![(b"Skipped Metadata".to_vec(), 0, 0, false)]
+					} else {
+						$crate::benchmarking::get_read_and_written_keys()
+					};
 
-						results.push($crate::BenchmarkResults {
-							components: c.to_vec(),
-							extrinsic_time: elapsed_extrinsic,
-							storage_root_time: elapsed_storage_root,
-							reads: read_write_count.0,
-							repeat_reads: read_write_count.1,
-							writes: read_write_count.2,
-							repeat_writes: read_write_count.3,
-							proof_size: diff_pov,
-							keys: read_and_written_keys,
-						});
-					}
+					results.push($crate::BenchmarkResults {
+						components: c.to_vec(),
+						extrinsic_time: elapsed_extrinsic,
+						storage_root_time: elapsed_storage_root,
+						reads: read_write_count.0,
+						repeat_reads: read_write_count.1,
+						writes: read_write_count.2,
+						repeat_writes: read_write_count.3,
+						proof_size: diff_pov,
+						keys: read_and_written_keys,
+					});
 
 					// Wipe the DB back to the genesis state.
 					$crate::benchmarking::wipe_db();
-
-					Ok(())
-				};
-
-				let (current_step, total_steps) = steps;
-
-				if components.is_empty() {
-					// The CLI could ask to do more steps than is sensible, so we skip those.
-					if current_step == 0 {
-						if verify {
-							// If `--verify` is used, run the benchmark once to verify it would complete.
-							do_benchmark(Default::default(), &mut $crate::Vec::new(), true)?;
-						}
-						do_benchmark(Default::default(), &mut results, false)?;
-					}
-				} else {
-					// Select the component we will be benchmarking. Each component will be benchmarked.
-					for (idx, (name, low, high)) in components.iter().enumerate() {
-
-						let lowest = lowest_range_values.get(idx).cloned().unwrap_or(*low);
-						let highest = highest_range_values.get(idx).cloned().unwrap_or(*high);
-
-						let diff = highest - lowest;
-
-						// Create up to `STEPS` steps for that component between high and low.
-						let step_size = (diff / total_steps).max(1);
-						let num_of_steps = diff / step_size + 1;
-
-						// The CLI could ask to do more steps than is sensible, so we just skip those.
-						if current_step >= num_of_steps {
-							continue;
-						}
-
-						// This is the value we will be testing for component `name`
-						let component_value = lowest + step_size * current_step;
-
-						// Select the max value for all the other components.
-						let c: $crate::Vec<($crate::BenchmarkParameter, u32)> = components.iter()
-							.enumerate()
-							.map(|(idx, (n, _, h))|
-								if n == name {
-									(*n, component_value)
-								} else {
-									(*n, *highest_range_values.get(idx).unwrap_or(h))
-								}
-							)
-							.collect();
-
-						if verify {
-							// If `--verify` is used, run the benchmark once to verify it would complete.
-							do_benchmark(&c, &mut $crate::Vec::new(), true)?;
-						}
-						do_benchmark(&c, &mut results, false)?;
-					}
 				}
+
 				return Ok(results);
 			}
 		}
@@ -960,15 +956,14 @@ macro_rules! impl_benchmark_test {
 					if components.is_empty() {
 						execute_benchmark(Default::default())?;
 					} else {
-						for (_, (name, low, high)) in components.iter().enumerate() {
+						for (name, low, high) in components.iter() {
 							// Test only the low and high value, assuming values in the middle
 							// won't break
 							for component_value in $crate::vec![low, high] {
 								// Select the max value for all the other components.
 								let c: $crate::Vec<($crate::BenchmarkParameter, u32)> = components
 									.iter()
-									.enumerate()
-									.map(|(_, (n, _, h))|
+									.map(|(n, _, h)|
 										if n == name {
 											(*n, *component_value)
 										} else {
@@ -1206,7 +1201,8 @@ macro_rules! impl_benchmark_test_suite {
 
 					let mut anything_failed = false;
 					println!("failing benchmark tests:");
-					for benchmark_name in $bench_module::<$test>::benchmarks($extra) {
+					for benchmark_metadata in $bench_module::<$test>::benchmarks($extra) {
+						let benchmark_name = &benchmark_metadata.name;
 						match std::panic::catch_unwind(|| {
 							$bench_module::<$test>::test_bench_by_name(benchmark_name)
 						}) {
@@ -1233,30 +1229,21 @@ macro_rules! impl_benchmark_test_suite {
 pub fn show_benchmark_debug_info(
 	instance_string: &[u8],
 	benchmark: &[u8],
-	lowest_range_values: &sp_std::prelude::Vec<u32>,
-	highest_range_values: &sp_std::prelude::Vec<u32>,
-	steps: &(u32, u32),
-	repeat: &(u32, u32),
+	components: &[(BenchmarkParameter, u32)],
 	verify: &bool,
 	error_message: &str,
 ) -> sp_runtime::RuntimeString {
 	sp_runtime::format_runtime_string!(
 		"\n* Pallet: {}\n\
 		* Benchmark: {}\n\
-		* Lowest_range_values: {:?}\n\
-		* Highest_range_values: {:?}\n\
-		* Steps: {:?}\n\
-		* Repeat: {:?}\n\
+		* Components: {:?}\n\
 		* Verify: {:?}\n\
 		* Error message: {}",
 		sp_std::str::from_utf8(instance_string)
 			.expect("it's all just strings ran through the wasm interface. qed"),
 		sp_std::str::from_utf8(benchmark)
 			.expect("it's all just strings ran through the wasm interface. qed"),
-		lowest_range_values,
-		highest_range_values,
-		steps.1,
-		repeat.1,
+		components,
 		verify,
 		error_message,
 	)
@@ -1334,12 +1321,9 @@ macro_rules! add_benchmark {
 		let $crate::BenchmarkConfig {
 			pallet,
 			benchmark,
-			lowest_range_values,
-			highest_range_values,
-			steps,
-			repeat,
+			selected_components,
 			verify,
-			extra,
+			internal_repeats,
 		} = config;
 		if &pallet[..] == &name_string[..] {
 			$batches.push($crate::BenchmarkBatch {
@@ -1348,20 +1332,15 @@ macro_rules! add_benchmark {
 				benchmark: benchmark.clone(),
 				results: $( $location )*::run_benchmark(
 					&benchmark[..],
-					&lowest_range_values[..],
-					&highest_range_values[..],
-					*steps,
-					*repeat,
+					&selected_components[..],
 					whitelist,
 					*verify,
+					*internal_repeats,
 				).map_err(|e| {
 					$crate::show_benchmark_debug_info(
 						instance_string,
 						benchmark,
-						lowest_range_values,
-						highest_range_values,
-						steps,
-						repeat,
+						selected_components,
 						verify,
 						e,
 					)
@@ -1396,10 +1375,7 @@ macro_rules! list_benchmark {
 	( $list:ident, $extra:ident, $name:path, $( $location:tt )* ) => (
 		let pallet_string = stringify!($name).as_bytes();
 		let instance_string = stringify!( $( $location )* ).as_bytes();
-		let benchmarks = $( $location )*::benchmarks($extra)
-			.iter()
-			.map(|b| b.to_vec())
-			.collect::<Vec<_>>();
+		let benchmarks = $( $location )*::benchmarks($extra);
 		let pallet_benchmarks = BenchmarkList {
 			pallet: pallet_string.to_vec(),
 			instance: instance_string.to_vec(),
diff --git a/frame/benchmarking/src/tests.rs b/frame/benchmarking/src/tests.rs
index aabdb7815c55..f092b41b65c3 100644
--- a/frame/benchmarking/src/tests.rs
+++ b/frame/benchmarking/src/tests.rs
@@ -199,6 +199,24 @@ mod benchmarks {
 		variable_components {
 			let b in ( T::LowerBound::get() ) .. T::UpperBound::get();
 		}: dummy (RawOrigin::None, b.into())
+
+		#[extra]
+		extra_benchmark {
+			let b in 1 .. 1000;
+			let caller = account::<T::AccountId>("caller", 0, 0);
+		}: set_value(RawOrigin::Signed(caller), b.into())
+		verify {
+			assert_eq!(Value::get(), Some(b));
+		}
+
+		#[skip_meta]
+		skip_meta_benchmark {
+			let b in 1 .. 1000;
+			let caller = account::<T::AccountId>("caller", 0, 0);
+		}: set_value(RawOrigin::Signed(caller), b.into())
+		verify {
+			assert_eq!(Value::get(), Some(b));
+		}
 	}
 
 	#[test]
diff --git a/frame/benchmarking/src/utils.rs b/frame/benchmarking/src/utils.rs
index 82c6e44796fa..c9662bf6fdff 100644
--- a/frame/benchmarking/src/utils.rs
+++ b/frame/benchmarking/src/utils.rs
@@ -76,6 +76,22 @@ pub struct BenchmarkBatch {
 	pub results: Vec<BenchmarkResults>,
 }
 
+// TODO: could probably make API cleaner here.
+/// The results of a single of benchmark, where time and db results are separated.
+#[derive(Encode, Decode, Clone, PartialEq, Debug)]
+pub struct BenchmarkBatchSplitResults {
+	/// The pallet containing this benchmark.
+	pub pallet: Vec<u8>,
+	/// The instance of this pallet being benchmarked.
+	pub instance: Vec<u8>,
+	/// The extrinsic (or benchmark name) of this benchmark.
+	pub benchmark: Vec<u8>,
+	/// The extrinsic timing results from this benchmark.
+	pub time_results: Vec<BenchmarkResults>,
+	/// The db tracking results from this benchmark.
+	pub db_results: Vec<BenchmarkResults>,
+}
+
 /// Results from running benchmarks on a FRAME pallet.
 /// Contains duration of the function call in nanoseconds along with the benchmark parameters
 /// used for that benchmark result.
@@ -99,21 +115,12 @@ pub struct BenchmarkConfig {
 	pub pallet: Vec<u8>,
 	/// The encoded name of the benchmark/extrinsic to run.
 	pub benchmark: Vec<u8>,
-	/// An optional manual override to the lowest values used in the `steps` range.
-	pub lowest_range_values: Vec<u32>,
-	/// An optional manual override to the highest values used in the `steps` range.
-	pub highest_range_values: Vec<u32>,
-	/// The number of samples to take across the range of values for components. (current_step,
-	/// total_steps)
-	pub steps: (u32, u32),
-	/// The number times to repeat each benchmark to increase accuracy of results. (current_repeat,
-	/// total_repeat)
-	pub repeat: (u32, u32),
+	/// The selected component values to use when running the benchmark.
+	pub selected_components: Vec<(BenchmarkParameter, u32)>,
 	/// Enable an extra benchmark iteration which runs the verification logic for a benchmark.
 	pub verify: bool,
-	/// Enable benchmarking of "extra" extrinsics, i.e. those that are not directly used in a
-	/// pallet.
-	pub extra: bool,
+	/// Number of times to repeat benchmark within the Wasm environment. (versus in the client)
+	pub internal_repeats: u32,
 }
 
 /// A list of benchmarks available for a particular pallet and instance.
@@ -123,7 +130,13 @@ pub struct BenchmarkConfig {
 pub struct BenchmarkList {
 	pub pallet: Vec<u8>,
 	pub instance: Vec<u8>,
-	pub benchmarks: Vec<Vec<u8>>,
+	pub benchmarks: Vec<BenchmarkMetadata>,
+}
+
+#[derive(Encode, Decode, Default, Clone, PartialEq, Debug)]
+pub struct BenchmarkMetadata {
+	pub name: Vec<u8>,
+	pub components: Vec<(BenchmarkParameter, u32, u32)>,
 }
 
 sp_api::decl_runtime_apis! {
@@ -228,27 +241,15 @@ pub trait Benchmarking<T> {
 	/// Parameters
 	/// - `extra`: Also return benchmarks marked "extra" which would otherwise not be
 	///            needed for weight calculation.
-	fn benchmarks(extra: bool) -> Vec<&'static [u8]>;
+	fn benchmarks(extra: bool) -> Vec<BenchmarkMetadata>;
 
 	/// Run the benchmarks for this pallet.
-	///
-	/// Parameters
-	/// - `name`: The name of extrinsic function or benchmark you want to benchmark encoded as
-	///   bytes.
-	/// - `lowest_range_values`: The lowest number for each range of parameters.
-	/// - `highest_range_values`: The highest number for each range of parameters.
-	/// - `steps`: The number of sample points you want to take across the range of parameters.
-	///   (current_step, total_steps)
-	/// - `repeat`: The total number times to repeat each benchmark to increase accuracy of results.
-	///   (current_repeat, total_repeats)
 	fn run_benchmark(
 		name: &[u8],
-		lowest_range_values: &[u32],
-		highest_range_values: &[u32],
-		steps: (u32, u32),
-		repeat: (u32, u32),
+		selected_components: &[(BenchmarkParameter, u32)],
 		whitelist: &[TrackedStorageKey],
 		verify: bool,
+		internal_repeats: u32,
 	) -> Result<Vec<T>, &'static str>;
 }
 
diff --git a/frame/bounties/src/weights.rs b/frame/bounties/src/weights.rs
index 2f982490bd44..be9363642439 100644
--- a/frame/bounties/src/weights.rs
+++ b/frame/bounties/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_bounties
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -61,62 +61,87 @@ pub trait WeightInfo {
 /// Weights for pallet_bounties using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	// Storage: Treasury BountyCount (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Treasury BountyDescriptions (r:0 w:1)
+	// Storage: Treasury Bounties (r:0 w:1)
 	fn propose_bounty(d: u32, ) -> Weight {
-		(44_351_000 as Weight)
+		(44_482_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((1_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
+	// Storage: Treasury Bounties (r:1 w:1)
+	// Storage: Treasury BountyApprovals (r:1 w:1)
 	fn approve_bounty() -> Weight {
-		(12_417_000 as Weight)
+		(11_955_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Treasury Bounties (r:1 w:1)
 	fn propose_curator() -> Weight {
-		(9_692_000 as Weight)
+		(9_771_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Treasury Bounties (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn unassign_curator() -> Weight {
-		(41_211_000 as Weight)
+		(40_683_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Treasury Bounties (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn accept_curator() -> Weight {
-		(37_376_000 as Weight)
+		(36_390_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Treasury Bounties (r:1 w:1)
 	fn award_bounty() -> Weight {
-		(25_525_000 as Weight)
+		(25_187_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Treasury Bounties (r:1 w:1)
+	// Storage: System Account (r:3 w:3)
+	// Storage: Treasury BountyDescriptions (r:0 w:1)
 	fn claim_bounty() -> Weight {
-		(125_495_000 as Weight)
+		(124_785_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
+	// Storage: Treasury Bounties (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Treasury BountyDescriptions (r:0 w:1)
 	fn close_bounty_proposed() -> Weight {
-		(40_464_000 as Weight)
+		(39_483_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Treasury Bounties (r:1 w:1)
+	// Storage: System Account (r:2 w:2)
+	// Storage: Treasury BountyDescriptions (r:0 w:1)
 	fn close_bounty_active() -> Weight {
-		(84_042_000 as Weight)
+		(83_453_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
+	// Storage: Treasury Bounties (r:1 w:1)
 	fn extend_bounty_expiry() -> Weight {
-		(25_114_000 as Weight)
+		(24_151_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Treasury BountyApprovals (r:1 w:1)
+	// Storage: Treasury Bounties (r:1 w:1)
+	// Storage: System Account (r:2 w:2)
 	fn spend_funds(b: u32, ) -> Weight {
-		(351_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((58_724_000 as Weight).saturating_mul(b as Weight))
+		(0 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((58_004_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(b as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -126,62 +151,87 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
+	// Storage: Treasury BountyCount (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Treasury BountyDescriptions (r:0 w:1)
+	// Storage: Treasury Bounties (r:0 w:1)
 	fn propose_bounty(d: u32, ) -> Weight {
-		(44_351_000 as Weight)
+		(44_482_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((1_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
+	// Storage: Treasury Bounties (r:1 w:1)
+	// Storage: Treasury BountyApprovals (r:1 w:1)
 	fn approve_bounty() -> Weight {
-		(12_417_000 as Weight)
+		(11_955_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Treasury Bounties (r:1 w:1)
 	fn propose_curator() -> Weight {
-		(9_692_000 as Weight)
+		(9_771_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Treasury Bounties (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn unassign_curator() -> Weight {
-		(41_211_000 as Weight)
+		(40_683_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Treasury Bounties (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn accept_curator() -> Weight {
-		(37_376_000 as Weight)
+		(36_390_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Treasury Bounties (r:1 w:1)
 	fn award_bounty() -> Weight {
-		(25_525_000 as Weight)
+		(25_187_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Treasury Bounties (r:1 w:1)
+	// Storage: System Account (r:3 w:3)
+	// Storage: Treasury BountyDescriptions (r:0 w:1)
 	fn claim_bounty() -> Weight {
-		(125_495_000 as Weight)
+		(124_785_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}
+	// Storage: Treasury Bounties (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Treasury BountyDescriptions (r:0 w:1)
 	fn close_bounty_proposed() -> Weight {
-		(40_464_000 as Weight)
+		(39_483_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Treasury Bounties (r:1 w:1)
+	// Storage: System Account (r:2 w:2)
+	// Storage: Treasury BountyDescriptions (r:0 w:1)
 	fn close_bounty_active() -> Weight {
-		(84_042_000 as Weight)
+		(83_453_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
+	// Storage: Treasury Bounties (r:1 w:1)
 	fn extend_bounty_expiry() -> Weight {
-		(25_114_000 as Weight)
+		(24_151_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Treasury BountyApprovals (r:1 w:1)
+	// Storage: Treasury Bounties (r:1 w:1)
+	// Storage: System Account (r:2 w:2)
 	fn spend_funds(b: u32, ) -> Weight {
-		(351_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((58_724_000 as Weight).saturating_mul(b as Weight))
+		(0 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((58_004_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(b as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
diff --git a/frame/collective/src/weights.rs b/frame/collective/src/weights.rs
index aab389a45e5b..40ac9eabdd6e 100644
--- a/frame/collective/src/weights.rs
+++ b/frame/collective/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_collective
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2021-07-13, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -60,97 +60,132 @@ pub trait WeightInfo {
 /// Weights for pallet_collective using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	// Storage: Instance1Collective Members (r:1 w:1)
+	// Storage: Instance1Collective Proposals (r:1 w:0)
+	// Storage: Instance1Collective Voting (r:100 w:100)
+	// Storage: Instance1Collective Prime (r:0 w:1)
 	fn set_members(m: u32, n: u32, p: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((14_534_000 as Weight).saturating_mul(m as Weight))
-			// Standard Error: 5_000
-			.saturating_add((160_000 as Weight).saturating_mul(n as Weight))
-			// Standard Error: 5_000
-			.saturating_add((20_189_000 as Weight).saturating_mul(p as Weight))
+			// Standard Error: 4_000
+			.saturating_add((14_084_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 4_000
+			.saturating_add((161_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 4_000
+			.saturating_add((19_201_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(p as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
 	}
+	// Storage: Instance1Collective Members (r:1 w:0)
 	fn execute(b: u32, m: u32, ) -> Weight {
-		(23_177_000 as Weight)
+		(22_748_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
 			// Standard Error: 0
-			.saturating_add((89_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((92_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 	}
+	// Storage: Instance1Collective Members (r:1 w:0)
+	// Storage: Instance1Collective ProposalOf (r:1 w:0)
 	fn propose_execute(b: u32, m: u32, ) -> Weight {
-		(28_063_000 as Weight)
+		(27_465_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
 			// Standard Error: 0
-			.saturating_add((174_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((178_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 	}
+	// Storage: Instance1Collective Members (r:1 w:0)
+	// Storage: Instance1Collective ProposalOf (r:1 w:1)
+	// Storage: Instance1Collective Proposals (r:1 w:1)
+	// Storage: Instance1Collective ProposalCount (r:1 w:1)
+	// Storage: Instance1Collective Voting (r:0 w:1)
 	fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight {
-		(46_515_000 as Weight)
+		(39_869_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((5_000 as Weight).saturating_mul(b as Weight))
-			// Standard Error: 2_000
-			.saturating_add((91_000 as Weight).saturating_mul(m as Weight))
-			// Standard Error: 2_000
-			.saturating_add((486_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((8_000 as Weight).saturating_mul(b as Weight))
+			// Standard Error: 1_000
+			.saturating_add((107_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 1_000
+			.saturating_add((406_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
+	// Storage: Instance1Collective Members (r:1 w:0)
+	// Storage: Instance1Collective Voting (r:1 w:1)
 	fn vote(m: u32, ) -> Weight {
-		(38_491_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((209_000 as Weight).saturating_mul(m as Weight))
+		(37_387_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((223_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Instance1Collective Voting (r:1 w:1)
+	// Storage: Instance1Collective Members (r:1 w:0)
+	// Storage: Instance1Collective Proposals (r:1 w:1)
+	// Storage: Instance1Collective ProposalOf (r:0 w:1)
 	fn close_early_disapproved(m: u32, p: u32, ) -> Weight {
-		(44_903_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((181_000 as Weight).saturating_mul(m as Weight))
-			// Standard Error: 0
-			.saturating_add((350_000 as Weight).saturating_mul(p as Weight))
+		(45_670_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((170_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 1_000
+			.saturating_add((358_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Instance1Collective Voting (r:1 w:1)
+	// Storage: Instance1Collective Members (r:1 w:0)
+	// Storage: Instance1Collective ProposalOf (r:1 w:1)
+	// Storage: Instance1Collective Proposals (r:1 w:1)
 	fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		(57_416_000 as Weight)
+		(52_529_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add((7_000 as Weight).saturating_mul(b as Weight))
 			// Standard Error: 1_000
-			.saturating_add((217_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((206_000 as Weight).saturating_mul(m as Weight))
 			// Standard Error: 1_000
-			.saturating_add((485_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((412_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Instance1Collective Voting (r:1 w:1)
+	// Storage: Instance1Collective Members (r:1 w:0)
+	// Storage: Instance1Collective Prime (r:1 w:0)
+	// Storage: Instance1Collective Proposals (r:1 w:1)
+	// Storage: Instance1Collective ProposalOf (r:0 w:1)
 	fn close_disapproved(m: u32, p: u32, ) -> Weight {
-		(50_134_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((189_000 as Weight).saturating_mul(m as Weight))
-			// Standard Error: 0
-			.saturating_add((487_000 as Weight).saturating_mul(p as Weight))
+		(50_427_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((170_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 1_000
+			.saturating_add((354_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Instance1Collective Voting (r:1 w:1)
+	// Storage: Instance1Collective Members (r:1 w:0)
+	// Storage: Instance1Collective Prime (r:1 w:0)
+	// Storage: Instance1Collective ProposalOf (r:1 w:1)
+	// Storage: Instance1Collective Proposals (r:1 w:1)
 	fn close_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		(65_901_000 as Weight)
+		(57_031_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add((7_000 as Weight).saturating_mul(b as Weight))
 			// Standard Error: 1_000
-			.saturating_add((186_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((208_000 as Weight).saturating_mul(m as Weight))
 			// Standard Error: 1_000
-			.saturating_add((482_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((408_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Instance1Collective Proposals (r:1 w:1)
+	// Storage: Instance1Collective Voting (r:0 w:1)
+	// Storage: Instance1Collective ProposalOf (r:0 w:1)
 	fn disapprove_proposal(p: u32, ) -> Weight {
-		(28_849_000 as Weight)
+		(27_458_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((494_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((402_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
@@ -158,97 +193,132 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
+	// Storage: Instance1Collective Members (r:1 w:1)
+	// Storage: Instance1Collective Proposals (r:1 w:0)
+	// Storage: Instance1Collective Voting (r:100 w:100)
+	// Storage: Instance1Collective Prime (r:0 w:1)
 	fn set_members(m: u32, n: u32, p: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((14_534_000 as Weight).saturating_mul(m as Weight))
-			// Standard Error: 5_000
-			.saturating_add((160_000 as Weight).saturating_mul(n as Weight))
-			// Standard Error: 5_000
-			.saturating_add((20_189_000 as Weight).saturating_mul(p as Weight))
+			// Standard Error: 4_000
+			.saturating_add((14_084_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 4_000
+			.saturating_add((161_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 4_000
+			.saturating_add((19_201_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(p as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
 	}
+	// Storage: Instance1Collective Members (r:1 w:0)
 	fn execute(b: u32, m: u32, ) -> Weight {
-		(23_177_000 as Weight)
+		(22_748_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
 			// Standard Error: 0
-			.saturating_add((89_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((92_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 	}
+	// Storage: Instance1Collective Members (r:1 w:0)
+	// Storage: Instance1Collective ProposalOf (r:1 w:0)
 	fn propose_execute(b: u32, m: u32, ) -> Weight {
-		(28_063_000 as Weight)
+		(27_465_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
 			// Standard Error: 0
-			.saturating_add((174_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((178_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 	}
+	// Storage: Instance1Collective Members (r:1 w:0)
+	// Storage: Instance1Collective ProposalOf (r:1 w:1)
+	// Storage: Instance1Collective Proposals (r:1 w:1)
+	// Storage: Instance1Collective ProposalCount (r:1 w:1)
+	// Storage: Instance1Collective Voting (r:0 w:1)
 	fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight {
-		(46_515_000 as Weight)
+		(39_869_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((5_000 as Weight).saturating_mul(b as Weight))
-			// Standard Error: 2_000
-			.saturating_add((91_000 as Weight).saturating_mul(m as Weight))
-			// Standard Error: 2_000
-			.saturating_add((486_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((8_000 as Weight).saturating_mul(b as Weight))
+			// Standard Error: 1_000
+			.saturating_add((107_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 1_000
+			.saturating_add((406_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
+	// Storage: Instance1Collective Members (r:1 w:0)
+	// Storage: Instance1Collective Voting (r:1 w:1)
 	fn vote(m: u32, ) -> Weight {
-		(38_491_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((209_000 as Weight).saturating_mul(m as Weight))
+		(37_387_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((223_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Instance1Collective Voting (r:1 w:1)
+	// Storage: Instance1Collective Members (r:1 w:0)
+	// Storage: Instance1Collective Proposals (r:1 w:1)
+	// Storage: Instance1Collective ProposalOf (r:0 w:1)
 	fn close_early_disapproved(m: u32, p: u32, ) -> Weight {
-		(44_903_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((181_000 as Weight).saturating_mul(m as Weight))
-			// Standard Error: 0
-			.saturating_add((350_000 as Weight).saturating_mul(p as Weight))
+		(45_670_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((170_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 1_000
+			.saturating_add((358_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Instance1Collective Voting (r:1 w:1)
+	// Storage: Instance1Collective Members (r:1 w:0)
+	// Storage: Instance1Collective ProposalOf (r:1 w:1)
+	// Storage: Instance1Collective Proposals (r:1 w:1)
 	fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		(57_416_000 as Weight)
+		(52_529_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add((7_000 as Weight).saturating_mul(b as Weight))
 			// Standard Error: 1_000
-			.saturating_add((217_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((206_000 as Weight).saturating_mul(m as Weight))
 			// Standard Error: 1_000
-			.saturating_add((485_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((412_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Instance1Collective Voting (r:1 w:1)
+	// Storage: Instance1Collective Members (r:1 w:0)
+	// Storage: Instance1Collective Prime (r:1 w:0)
+	// Storage: Instance1Collective Proposals (r:1 w:1)
+	// Storage: Instance1Collective ProposalOf (r:0 w:1)
 	fn close_disapproved(m: u32, p: u32, ) -> Weight {
-		(50_134_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((189_000 as Weight).saturating_mul(m as Weight))
-			// Standard Error: 0
-			.saturating_add((487_000 as Weight).saturating_mul(p as Weight))
+		(50_427_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((170_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 1_000
+			.saturating_add((354_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Instance1Collective Voting (r:1 w:1)
+	// Storage: Instance1Collective Members (r:1 w:0)
+	// Storage: Instance1Collective Prime (r:1 w:0)
+	// Storage: Instance1Collective ProposalOf (r:1 w:1)
+	// Storage: Instance1Collective Proposals (r:1 w:1)
 	fn close_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		(65_901_000 as Weight)
+		(57_031_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add((7_000 as Weight).saturating_mul(b as Weight))
 			// Standard Error: 1_000
-			.saturating_add((186_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((208_000 as Weight).saturating_mul(m as Weight))
 			// Standard Error: 1_000
-			.saturating_add((482_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((408_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Instance1Collective Proposals (r:1 w:1)
+	// Storage: Instance1Collective Voting (r:0 w:1)
+	// Storage: Instance1Collective ProposalOf (r:0 w:1)
 	fn disapprove_proposal(p: u32, ) -> Weight {
-		(28_849_000 as Weight)
+		(27_458_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((494_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((402_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index 683a575826a3..9760cddcc5d8 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -288,6 +288,7 @@ benchmarks! {
 		Storage::<T>::process_deletion_queue_batch(Weight::max_value())
 	}
 
+	#[skip_meta]
 	on_initialize_per_trie_key {
 		let k in 0..1024;
 		let instance = ContractWithStorage::<T>::new(k, T::Schedule::get().limits.payload_len)?;
@@ -815,6 +816,7 @@ benchmarks! {
 	}
 
 	// `d`: Number of supplied delta keys
+	#[skip_meta]
 	seal_restore_to_per_delta {
 		let d in 0 .. API_BENCHMARK_BATCHES;
 		let mut tombstone = ContractWithStorage::<T>::new(0, 0)?;
@@ -1057,6 +1059,7 @@ benchmarks! {
 	// The contract is a bit more complex because I needs to use different keys in order
 	// to generate unique storage accesses. However, it is still dominated by the storage
 	// accesses.
+	#[skip_meta]
 	seal_set_storage {
 		let r in 0 .. API_BENCHMARK_BATCHES;
 		let keys = (0 .. r * API_BENCHMARK_BATCH_SIZE)
@@ -1122,6 +1125,7 @@ benchmarks! {
 	// Similar to seal_set_storage. However, we store all the keys that we are about to
 	// delete beforehand in order to prevent any optimizations that could occur when
 	// deleting a non existing key.
+	#[skip_meta]
 	seal_clear_storage {
 		let r in 0 .. API_BENCHMARK_BATCHES;
 		let keys = (0 .. r * API_BENCHMARK_BATCH_SIZE)
@@ -1165,6 +1169,7 @@ benchmarks! {
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
 	// We make sure that all storage accesses are to unique keys.
+	#[skip_meta]
 	seal_get_storage {
 		let r in 0 .. API_BENCHMARK_BATCHES;
 		let keys = (0 .. r * API_BENCHMARK_BATCH_SIZE)
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index 30340eaead19..db5f3ba92a70 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -1644,7 +1644,7 @@ fn self_destruct_works() {
 
 		// The call triggers rent collection that reduces the amount of balance
 		// that remains for the beneficiary.
-		let balance_after_rent = 93_078;
+		let balance_after_rent = 93_086;
 
 		pretty_assertions::assert_eq!(
 			System::events(),
diff --git a/frame/contracts/src/weights.rs b/frame/contracts/src/weights.rs
index 390873949ab6..cffdb6ca9f00 100644
--- a/frame/contracts/src/weights.rs
+++ b/frame/contracts/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_contracts
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-08, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -153,1300 +153,1812 @@ pub trait WeightInfo {
 /// Weights for pallet_contracts using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	// Storage: Contracts DeletionQueue (r:1 w:0)
 	fn on_initialize() -> Weight {
-		(4_636_000 as Weight)
+		(3_175_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 	}
+	// Storage: Skipped Metadata (r:0 w:0)
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 3_000
-			.saturating_add((2_851_000 as Weight).saturating_mul(k as Weight))
+			.saturating_add((2_201_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
+	// Storage: Contracts DeletionQueue (r:1 w:0)
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((38_093_000 as Weight).saturating_mul(q as Weight))
+		(66_035_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((38_159_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts PristineCode (r:1 w:0)
+	// Storage: Contracts CodeStorage (r:0 w:1)
 	fn instrument(c: u32, ) -> Weight {
-		(60_027_000 as Weight)
-			// Standard Error: 109_000
-			.saturating_add((169_008_000 as Weight).saturating_mul(c as Weight))
+		(35_007_000 as Weight)
+			// Standard Error: 110_000
+			.saturating_add((75_739_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts CodeStorage (r:1 w:0)
 	fn code_load(c: u32, ) -> Weight {
-		(7_881_000 as Weight)
+		(6_238_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((2_007_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((1_671_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 	}
+	// Storage: Contracts CodeStorage (r:1 w:1)
 	fn code_refcount(c: u32, ) -> Weight {
-		(12_861_000 as Weight)
+		(10_080_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((3_028_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((2_694_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts AccountCounter (r:1 w:0)
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Timestamp Now (r:1 w:0)
+	// Storage: Contracts CodeStorage (r:1 w:1)
+	// Storage: Contracts PristineCode (r:0 w:1)
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight {
-		(189_624_000 as Weight)
-			// Standard Error: 120_000
-			.saturating_add((244_984_000 as Weight).saturating_mul(c as Weight))
+		(182_161_000 as Weight)
+			// Standard Error: 115_000
+			.saturating_add((113_515_000 as Weight).saturating_mul(c as Weight))
 			// Standard Error: 7_000
-			.saturating_add((1_588_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((2_314_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
+	// Storage: Contracts CodeStorage (r:1 w:1)
+	// Storage: Contracts AccountCounter (r:1 w:0)
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn instantiate(s: u32, ) -> Weight {
-		(224_867_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((1_476_000 as Weight).saturating_mul(s as Weight))
+		(183_914_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((2_224_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn call() -> Weight {
-		(197_338_000 as Weight)
+		(166_507_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Contracts DeletionQueue (r:1 w:1)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743acafbc76efb655f52a2] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a45e3386f1a83f00b28] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a96e4ef3ab80b5c3a5f] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a3d24875569a319056f] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a64ad561e495f01c762] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a3b624bb134596373c1] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743aadbe519bace97698b4] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a7e33b1a343f33065bd] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a626f271ae6979bbffe] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a7ce585fd4ae98b830b] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ac889c022f51a43b527] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a4f6353225ab0496d48] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ab578892d355575c3e4] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a02b4c8040b81dc785d] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a8d13a70c1e380292ea] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a2e4d2fc709d989c778] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a6df81b28bd3ec99a3a] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743af54f74589657eac0fd] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a1849a3092175db4a2f] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a4f05ecdc6c2c42c9fb] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a24c3c0036dfb085bb9] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a44d725ac77836eb10b] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ad04db6c692ab73d90d] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a873009d6cdb99c5a4c] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743aa958795fbfc2b5fa41] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a205b6f659d219c8cbc] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ade54b3bc3d3cdb1aeb] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a538b748c1c5f92be98] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ad50de2ad89aaa1e067] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a0576917f19ecaf2a3f] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a5b44bd2793555a71e7] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743acc874645f7bbf62e62] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a7ae1b958a847e98bc8] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a396ae49d5311ee6bd1] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743aa5d56999a2ebd1c4c9] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a72f370c054587f81a5] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a3a32934e459acb2ceb] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ac10fd56a5e084aae1c] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a2ba8e27fcdbc3ab4f2] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a4a75b804eec44f3f2a] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a64ebb181fc616bfdb4] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a9aaf019a62fd907a8a] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a19730285453eb7702a] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743acced4c24d0ebee7c29] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ae458a57da6a2a6280a] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a83b9f09b407c57d07e] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743acc9fc095b3aaaef755] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a587ccf84053d9950ff] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a13d53bcf137f3784e9] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743abb79d34fb381ebd7c1] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a935ea70a3e699d23b6] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a109fcd63aefdae75a1] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743abca8d937a761f2eb46] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a314c97ff9e866a835b] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a691e4b5f67da0dea8e] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a127c680b864ee61620] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a148df8dfd47b4493f3] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a57c606ebe91374fcee] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743acec20322704f7bec44] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743abf6a27e09c6d0a9f0f] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ae2e8bdcf5850e20836] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ab8399645bc39338a47] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a658619de90cae5dbe1] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743aeb9db1dfeed3a7b47b] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743abdc9db5edf43ffcb0d] (r:1 w:0)
 	fn claim_surcharge(c: u32, ) -> Weight {
-		(147_775_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((3_094_000 as Weight).saturating_mul(c as Weight))
+		(126_115_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((2_829_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_caller(r: u32, ) -> Weight {
-		(150_159_000 as Weight)
-			// Standard Error: 90_000
-			.saturating_add((274_529_000 as Weight).saturating_mul(r as Weight))
+		(134_110_000 as Weight)
+			// Standard Error: 130_000
+			.saturating_add((230_337_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_address(r: u32, ) -> Weight {
-		(140_207_000 as Weight)
+		(131_212_000 as Weight)
 			// Standard Error: 116_000
-			.saturating_add((276_569_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((230_568_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(156_581_000 as Weight)
-			// Standard Error: 107_000
-			.saturating_add((270_368_000 as Weight).saturating_mul(r as Weight))
+		(135_149_000 as Weight)
+			// Standard Error: 149_000
+			.saturating_add((224_830_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_balance(r: u32, ) -> Weight {
-		(141_778_000 as Weight)
-			// Standard Error: 305_000
-			.saturating_add((615_927_000 as Weight).saturating_mul(r as Weight))
+		(148_463_000 as Weight)
+			// Standard Error: 246_000
+			.saturating_add((480_930_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(138_752_000 as Weight)
-			// Standard Error: 91_000
-			.saturating_add((280_176_000 as Weight).saturating_mul(r as Weight))
+		(137_790_000 as Weight)
+			// Standard Error: 152_000
+			.saturating_add((224_961_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(141_089_000 as Weight)
-			// Standard Error: 82_000
-			.saturating_add((274_199_000 as Weight).saturating_mul(r as Weight))
+		(134_238_000 as Weight)
+			// Standard Error: 135_000
+			.saturating_add((224_433_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(140_447_000 as Weight)
-			// Standard Error: 119_000
-			.saturating_add((270_823_000 as Weight).saturating_mul(r as Weight))
+		(135_053_000 as Weight)
+			// Standard Error: 147_000
+			.saturating_add((223_955_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(138_394_000 as Weight)
-			// Standard Error: 105_000
-			.saturating_add((275_261_000 as Weight).saturating_mul(r as Weight))
+		(138_522_000 as Weight)
+			// Standard Error: 145_000
+			.saturating_add((223_459_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_block_number(r: u32, ) -> Weight {
-		(151_633_000 as Weight)
-			// Standard Error: 109_000
-			.saturating_add((269_666_000 as Weight).saturating_mul(r as Weight))
+		(133_568_000 as Weight)
+			// Standard Error: 143_000
+			.saturating_add((224_792_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_now(r: u32, ) -> Weight {
-		(129_087_000 as Weight)
-			// Standard Error: 252_000
-			.saturating_add((277_368_000 as Weight).saturating_mul(r as Weight))
+		(134_786_000 as Weight)
+			// Standard Error: 130_000
+			.saturating_add((224_331_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
+	// Storage: TransactionPayment NextFeeMultiplier (r:1 w:0)
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(176_205_000 as Weight)
-			// Standard Error: 304_000
-			.saturating_add((555_094_000 as Weight).saturating_mul(r as Weight))
+		(147_402_000 as Weight)
+			// Standard Error: 233_000
+			.saturating_add((439_237_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_gas(r: u32, ) -> Weight {
-		(129_942_000 as Weight)
-			// Standard Error: 92_000
-			.saturating_add((144_914_000 as Weight).saturating_mul(r as Weight))
+		(115_711_000 as Weight)
+			// Standard Error: 88_000
+			.saturating_add((113_467_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_input(r: u32, ) -> Weight {
-		(141_540_000 as Weight)
-			// Standard Error: 68_000
-			.saturating_add((6_576_000 as Weight).saturating_mul(r as Weight))
+		(123_004_000 as Weight)
+			// Standard Error: 78_000
+			.saturating_add((6_674_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(150_832_000 as Weight)
+		(131_611_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((263_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((1_035_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_return(r: u32, ) -> Weight {
-		(135_920_000 as Weight)
-			// Standard Error: 61_000
-			.saturating_add((3_733_000 as Weight).saturating_mul(r as Weight))
+		(118_327_000 as Weight)
+			// Standard Error: 84_000
+			.saturating_add((4_274_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(144_104_000 as Weight)
+		(126_129_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((640_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((495_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
+	// Storage: Contracts DeletionQueue (r:1 w:1)
 	fn seal_terminate(r: u32, ) -> Weight {
-		(141_631_000 as Weight)
-			// Standard Error: 70_000
-			.saturating_add((112_747_000 as Weight).saturating_mul(r as Weight))
+		(123_759_000 as Weight)
+			// Standard Error: 115_000
+			.saturating_add((89_730_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743af3fd4cc2fc8d170b6d] (r:1 w:0)
 	fn seal_restore_to(r: u32, ) -> Weight {
-		(168_955_000 as Weight)
-			// Standard Error: 211_000
-			.saturating_add((119_247_000 as Weight).saturating_mul(r as Weight))
+		(151_364_000 as Weight)
+			// Standard Error: 263_000
+			.saturating_add((99_367_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((5 as Weight).saturating_mul(r as Weight)))
 	}
+	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_restore_to_per_delta(d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 3_299_000
-			.saturating_add((3_257_862_000 as Weight).saturating_mul(d as Weight))
+			// Standard Error: 1_919_000
+			.saturating_add((2_415_482_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
 			.saturating_add(T::DbWeight::get().writes(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
+	// Storage: RandomnessCollectiveFlip RandomMaterial (r:1 w:0)
 	fn seal_random(r: u32, ) -> Weight {
-		(124_927_000 as Weight)
-			// Standard Error: 407_000
-			.saturating_add((730_247_000 as Weight).saturating_mul(r as Weight))
+		(137_660_000 as Weight)
+			// Standard Error: 204_000
+			.saturating_add((563_042_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(135_014_000 as Weight)
-			// Standard Error: 892_000
-			.saturating_add((1_131_992_000 as Weight).saturating_mul(r as Weight))
+		(137_087_000 as Weight)
+			// Standard Error: 413_000
+			.saturating_add((835_499_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
+	// Storage: System EventTopics (r:100 w:100)
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_401_344_000 as Weight)
-			// Standard Error: 2_961_000
-			.saturating_add((701_918_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 583_000
-			.saturating_add((169_206_000 as Weight).saturating_mul(n as Weight))
+		(1_117_515_000 as Weight)
+			// Standard Error: 2_167_000
+			.saturating_add((494_145_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 427_000
+			.saturating_add((150_093_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(146_753_000 as Weight)
-			// Standard Error: 117_000
-			.saturating_add((194_150_000 as Weight).saturating_mul(r as Weight))
+		(132_070_000 as Weight)
+			// Standard Error: 129_000
+			.saturating_add((155_669_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_debug_message(r: u32, ) -> Weight {
-		(141_972_000 as Weight)
-			// Standard Error: 114_000
-			.saturating_add((164_981_000 as Weight).saturating_mul(r as Weight))
+		(126_971_000 as Weight)
+			// Standard Error: 90_000
+			.saturating_add((122_445_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(549_424_000 as Weight)
-			// Standard Error: 7_901_000
-			.saturating_add((4_159_879_000 as Weight).saturating_mul(r as Weight))
+		(125_746_000 as Weight)
+			// Standard Error: 610_000
+			.saturating_add((501_265_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
+	// Storage: unknown [0x7afa01283080ef247df84e0ba38ea5a587d25ce6633a6bfbba02068c14023441] (r:1 w:1)
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(682_814_000 as Weight)
-			// Standard Error: 229_000
-			.saturating_add((59_572_000 as Weight).saturating_mul(n as Weight))
+		(563_219_000 as Weight)
+			// Standard Error: 219_000
+			.saturating_add((41_578_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_clear_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_889_000
-			.saturating_add((1_563_117_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 1_727_000
+			.saturating_add((1_001_461_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
+	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_get_storage(r: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 2_414_000
-			.saturating_add((1_178_803_000 as Weight).saturating_mul(r as Weight))
+		(9_115_000 as Weight)
+			// Standard Error: 784_000
+			.saturating_add((660_533_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
+	// Storage: unknown [0x7afa01283080ef247df84e0ba38ea5a587d25ce6633a6bfbba02068c14023441] (r:1 w:0)
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(696_056_000 as Weight)
-			// Standard Error: 266_000
-			.saturating_add((108_870_000 as Weight).saturating_mul(n as Weight))
+		(563_175_000 as Weight)
+			// Standard Error: 206_000
+			.saturating_add((89_626_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_transfer(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_764_000
-			.saturating_add((6_397_838_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 1_750_000
+			.saturating_add((4_820_493_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 8_279_000
-			.saturating_add((13_318_274_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 6_692_000
+			.saturating_add((11_477_937_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((200 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
+	// Storage: Contracts ContractInfoOf (r:101 w:101)
+	// Storage: Contracts CodeStorage (r:2 w:0)
+	// Storage: System Account (r:101 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight {
-		(13_411_599_000 as Weight)
-			// Standard Error: 40_931_000
-			.saturating_add((4_291_567_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 14_000
-			.saturating_add((48_818_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 15_000
-			.saturating_add((68_502_000 as Weight).saturating_mul(o as Weight))
+		(11_238_437_000 as Weight)
+			// Standard Error: 81_620_000
+			.saturating_add((3_700_413_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 29_000
+			.saturating_add((32_106_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 31_000
+			.saturating_add((54_386_000 as Weight).saturating_mul(o as Weight))
 			.saturating_add(T::DbWeight::get().reads(205 as Weight))
 			.saturating_add(T::DbWeight::get().writes(101 as Weight))
 			.saturating_add(T::DbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
+	// Storage: Contracts AccountCounter (r:1 w:1)
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 31_671_000
-			.saturating_add((24_164_540_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 35_258_000
+			.saturating_add((20_674_357_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes((300 as Weight).saturating_mul(r as Weight)))
 	}
+	// Storage: Contracts ContractInfoOf (r:101 w:101)
+	// Storage: Contracts CodeStorage (r:2 w:1)
+	// Storage: System Account (r:101 w:101)
+	// Storage: Timestamp Now (r:1 w:0)
+	// Storage: Contracts AccountCounter (r:1 w:1)
 	fn seal_instantiate_per_input_output_salt_kb(i: u32, o: u32, s: u32, ) -> Weight {
-		(17_228_488_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((50_822_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 26_000
-			.saturating_add((71_276_000 as Weight).saturating_mul(o as Weight))
-			// Standard Error: 26_000
-			.saturating_add((198_669_000 as Weight).saturating_mul(s as Weight))
+		(14_725_288_000 as Weight)
+			// Standard Error: 53_000
+			.saturating_add((33_848_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 53_000
+			.saturating_add((57_054_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 53_000
+			.saturating_add((180_033_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(206 as Weight))
 			.saturating_add(T::DbWeight::get().writes(204 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(149_183_000 as Weight)
-			// Standard Error: 99_000
-			.saturating_add((279_233_000 as Weight).saturating_mul(r as Weight))
+		(131_974_000 as Weight)
+			// Standard Error: 125_000
+			.saturating_add((220_711_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(457_629_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((480_686_000 as Weight).saturating_mul(n as Weight))
+		(367_148_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((462_143_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(141_603_000 as Weight)
-			// Standard Error: 120_000
-			.saturating_add((283_527_000 as Weight).saturating_mul(r as Weight))
+		(134_585_000 as Weight)
+			// Standard Error: 131_000
+			.saturating_add((227_264_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(463_644_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((332_183_000 as Weight).saturating_mul(n as Weight))
+		(325_319_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((313_033_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(144_145_000 as Weight)
-			// Standard Error: 113_000
-			.saturating_add((252_640_000 as Weight).saturating_mul(r as Weight))
+		(135_347_000 as Weight)
+			// Standard Error: 150_000
+			.saturating_add((199_764_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(455_101_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((149_174_000 as Weight).saturating_mul(n as Weight))
+		(424_473_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((130_936_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(147_166_000 as Weight)
-			// Standard Error: 233_000
-			.saturating_add((254_430_000 as Weight).saturating_mul(r as Weight))
+		(128_776_000 as Weight)
+			// Standard Error: 118_000
+			.saturating_add((203_125_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(445_667_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((149_178_000 as Weight).saturating_mul(n as Weight))
+		(445_726_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((130_931_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(21_505_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((7_963_000 as Weight).saturating_mul(r as Weight))
+		(22_161_000 as Weight)
+			// Standard Error: 36_000
+			.saturating_add((3_329_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(24_775_000 as Weight)
-			// Standard Error: 37_000
-			.saturating_add((157_130_000 as Weight).saturating_mul(r as Weight))
+		(24_430_000 as Weight)
+			// Standard Error: 65_000
+			.saturating_add((159_566_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(24_722_000 as Weight)
-			// Standard Error: 69_000
-			.saturating_add((240_564_000 as Weight).saturating_mul(r as Weight))
+		(24_443_000 as Weight)
+			// Standard Error: 62_000
+			.saturating_add((232_854_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(21_506_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((45_277_000 as Weight).saturating_mul(r as Weight))
+		(22_158_000 as Weight)
+			// Standard Error: 34_000
+			.saturating_add((12_112_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(21_587_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((42_269_000 as Weight).saturating_mul(r as Weight))
+		(22_178_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((11_374_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(21_538_000 as Weight)
-			// Standard Error: 807_000
-			.saturating_add((22_392_000 as Weight).saturating_mul(r as Weight))
+		(22_157_000 as Weight)
+			// Standard Error: 41_000
+			.saturating_add((5_826_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(21_634_000 as Weight)
-			// Standard Error: 57_000
-			.saturating_add((44_203_000 as Weight).saturating_mul(r as Weight))
+		(22_182_000 as Weight)
+			// Standard Error: 34_000
+			.saturating_add((13_647_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(21_531_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((33_198_000 as Weight).saturating_mul(r as Weight))
+		(22_083_000 as Weight)
+			// Standard Error: 44_000
+			.saturating_add((14_901_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(60_960_000 as Weight)
+		(32_689_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((151_000 as Weight).saturating_mul(e as Weight))
+			.saturating_add((154_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(21_777_000 as Weight)
-			// Standard Error: 141_000
-			.saturating_add((245_105_000 as Weight).saturating_mul(r as Weight))
+		(22_313_000 as Weight)
+			// Standard Error: 383_000
+			.saturating_add((89_804_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(34_307_000 as Weight)
-			// Standard Error: 365_000
-			.saturating_add((344_623_000 as Weight).saturating_mul(r as Weight))
+		(29_939_000 as Weight)
+			// Standard Error: 230_000
+			.saturating_add((185_309_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(398_310_000 as Weight)
-			// Standard Error: 6_000
-			.saturating_add((4_163_000 as Weight).saturating_mul(p as Weight))
+		(221_596_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((4_045_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(40_478_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((9_991_000 as Weight).saturating_mul(r as Weight))
+		(22_171_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((3_362_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(40_427_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((8_526_000 as Weight).saturating_mul(r as Weight))
+		(22_182_000 as Weight)
+			// Standard Error: 31_000
+			.saturating_add((3_801_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(40_463_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((16_497_000 as Weight).saturating_mul(r as Weight))
+		(22_200_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((5_080_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(25_998_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((18_214_000 as Weight).saturating_mul(r as Weight))
+		(25_255_000 as Weight)
+			// Standard Error: 41_000
+			.saturating_add((8_875_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(25_972_000 as Weight)
-			// Standard Error: 42_000
-			.saturating_add((18_901_000 as Weight).saturating_mul(r as Weight))
+		(25_145_000 as Weight)
+			// Standard Error: 37_000
+			.saturating_add((9_556_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(24_949_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((8_541_000 as Weight).saturating_mul(r as Weight))
+		(24_435_000 as Weight)
+			// Standard Error: 49_000
+			.saturating_add((4_204_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(22_204_000 as Weight)
-			// Standard Error: 4_776_000
-			.saturating_add((2_198_462_000 as Weight).saturating_mul(r as Weight))
+		(23_158_000 as Weight)
+			// Standard Error: 5_969_000
+			.saturating_add((2_339_630_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(21_506_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((25_302_000 as Weight).saturating_mul(r as Weight))
+		(21_984_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((5_421_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(21_523_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((25_206_000 as Weight).saturating_mul(r as Weight))
+		(22_069_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((5_187_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(21_567_000 as Weight)
-			// Standard Error: 466_000
-			.saturating_add((19_925_000 as Weight).saturating_mul(r as Weight))
+		(22_042_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((6_116_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(21_569_000 as Weight)
-			// Standard Error: 30_000
-			.saturating_add((25_027_000 as Weight).saturating_mul(r as Weight))
+		(22_018_000 as Weight)
+			// Standard Error: 34_000
+			.saturating_add((5_130_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(21_536_000 as Weight)
-			// Standard Error: 193_000
-			.saturating_add((17_690_000 as Weight).saturating_mul(r as Weight))
+		(21_933_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((5_005_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(21_555_000 as Weight)
-			// Standard Error: 356_000
-			.saturating_add((17_105_000 as Weight).saturating_mul(r as Weight))
+		(22_066_000 as Weight)
+			// Standard Error: 34_000
+			.saturating_add((4_877_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(21_561_000 as Weight)
-			// Standard Error: 1_038_000
-			.saturating_add((22_198_000 as Weight).saturating_mul(r as Weight))
+		(22_003_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((5_018_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(21_513_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((33_620_000 as Weight).saturating_mul(r as Weight))
+		(22_130_000 as Weight)
+			// Standard Error: 35_000
+			.saturating_add((7_071_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(21_556_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((33_669_000 as Weight).saturating_mul(r as Weight))
+		(22_112_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((7_056_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(21_571_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((33_649_000 as Weight).saturating_mul(r as Weight))
+		(22_114_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((6_974_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(21_533_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((33_450_000 as Weight).saturating_mul(r as Weight))
+		(22_111_000 as Weight)
+			// Standard Error: 32_000
+			.saturating_add((7_183_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(21_525_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((33_727_000 as Weight).saturating_mul(r as Weight))
+		(22_148_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((7_044_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(21_546_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((33_420_000 as Weight).saturating_mul(r as Weight))
+		(22_158_000 as Weight)
+			// Standard Error: 33_000
+			.saturating_add((7_116_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(21_546_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((33_720_000 as Weight).saturating_mul(r as Weight))
+		(22_194_000 as Weight)
+			// Standard Error: 31_000
+			.saturating_add((7_039_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(21_546_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((33_383_000 as Weight).saturating_mul(r as Weight))
+		(22_219_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((7_076_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(21_577_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((33_454_000 as Weight).saturating_mul(r as Weight))
+		(22_170_000 as Weight)
+			// Standard Error: 50_000
+			.saturating_add((7_122_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(21_566_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((33_665_000 as Weight).saturating_mul(r as Weight))
+		(22_113_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((7_069_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(21_524_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((33_351_000 as Weight).saturating_mul(r as Weight))
+		(22_090_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((6_956_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(21_558_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((33_423_000 as Weight).saturating_mul(r as Weight))
+		(22_006_000 as Weight)
+			// Standard Error: 30_000
+			.saturating_add((7_094_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(21_554_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((33_588_000 as Weight).saturating_mul(r as Weight))
+		(22_111_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((6_825_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(21_568_000 as Weight)
+		(22_041_000 as Weight)
 			// Standard Error: 29_000
-			.saturating_add((38_897_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((13_164_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(21_567_000 as Weight)
-			// Standard Error: 31_000
-			.saturating_add((38_756_000 as Weight).saturating_mul(r as Weight))
+		(21_989_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((12_808_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(21_540_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((39_244_000 as Weight).saturating_mul(r as Weight))
+		(22_045_000 as Weight)
+			// Standard Error: 39_000
+			.saturating_add((13_387_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(21_581_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((38_461_000 as Weight).saturating_mul(r as Weight))
+		(22_075_000 as Weight)
+			// Standard Error: 40_000
+			.saturating_add((12_791_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(21_555_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((33_367_000 as Weight).saturating_mul(r as Weight))
+		(22_044_000 as Weight)
+			// Standard Error: 32_000
+			.saturating_add((7_090_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(21_523_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((33_466_000 as Weight).saturating_mul(r as Weight))
+		(22_133_000 as Weight)
+			// Standard Error: 40_000
+			.saturating_add((6_967_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(21_536_000 as Weight)
-			// Standard Error: 34_000
-			.saturating_add((33_452_000 as Weight).saturating_mul(r as Weight))
+		(22_069_000 as Weight)
+			// Standard Error: 41_000
+			.saturating_add((7_026_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(21_567_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((33_809_000 as Weight).saturating_mul(r as Weight))
+		(22_165_000 as Weight)
+			// Standard Error: 44_000
+			.saturating_add((7_440_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(21_580_000 as Weight)
-			// Standard Error: 32_000
-			.saturating_add((33_849_000 as Weight).saturating_mul(r as Weight))
+		(22_063_000 as Weight)
+			// Standard Error: 34_000
+			.saturating_add((7_309_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(21_571_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((33_799_000 as Weight).saturating_mul(r as Weight))
+		(22_086_000 as Weight)
+			// Standard Error: 36_000
+			.saturating_add((7_188_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(21_559_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((33_947_000 as Weight).saturating_mul(r as Weight))
+		(22_109_000 as Weight)
+			// Standard Error: 45_000
+			.saturating_add((7_169_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(21_565_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((33_754_000 as Weight).saturating_mul(r as Weight))
+		(22_076_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((7_070_000 as Weight).saturating_mul(r as Weight))
 	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
+	// Storage: Contracts DeletionQueue (r:1 w:0)
 	fn on_initialize() -> Weight {
-		(4_636_000 as Weight)
+		(3_175_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 	}
+	// Storage: Skipped Metadata (r:0 w:0)
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 3_000
-			.saturating_add((2_851_000 as Weight).saturating_mul(k as Weight))
+			.saturating_add((2_201_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
+	// Storage: Contracts DeletionQueue (r:1 w:0)
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((38_093_000 as Weight).saturating_mul(q as Weight))
+		(66_035_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((38_159_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts PristineCode (r:1 w:0)
+	// Storage: Contracts CodeStorage (r:0 w:1)
 	fn instrument(c: u32, ) -> Weight {
-		(60_027_000 as Weight)
-			// Standard Error: 109_000
-			.saturating_add((169_008_000 as Weight).saturating_mul(c as Weight))
+		(35_007_000 as Weight)
+			// Standard Error: 110_000
+			.saturating_add((75_739_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts CodeStorage (r:1 w:0)
 	fn code_load(c: u32, ) -> Weight {
-		(7_881_000 as Weight)
+		(6_238_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((2_007_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((1_671_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 	}
+	// Storage: Contracts CodeStorage (r:1 w:1)
 	fn code_refcount(c: u32, ) -> Weight {
-		(12_861_000 as Weight)
+		(10_080_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((3_028_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((2_694_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts AccountCounter (r:1 w:0)
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Timestamp Now (r:1 w:0)
+	// Storage: Contracts CodeStorage (r:1 w:1)
+	// Storage: Contracts PristineCode (r:0 w:1)
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight {
-		(189_624_000 as Weight)
-			// Standard Error: 120_000
-			.saturating_add((244_984_000 as Weight).saturating_mul(c as Weight))
+		(182_161_000 as Weight)
+			// Standard Error: 115_000
+			.saturating_add((113_515_000 as Weight).saturating_mul(c as Weight))
 			// Standard Error: 7_000
-			.saturating_add((1_588_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((2_314_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
+	// Storage: Contracts CodeStorage (r:1 w:1)
+	// Storage: Contracts AccountCounter (r:1 w:0)
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn instantiate(s: u32, ) -> Weight {
-		(224_867_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((1_476_000 as Weight).saturating_mul(s as Weight))
+		(183_914_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((2_224_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn call() -> Weight {
-		(197_338_000 as Weight)
+		(166_507_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Contracts DeletionQueue (r:1 w:1)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743acafbc76efb655f52a2] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a45e3386f1a83f00b28] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a96e4ef3ab80b5c3a5f] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a3d24875569a319056f] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a64ad561e495f01c762] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a3b624bb134596373c1] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743aadbe519bace97698b4] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a7e33b1a343f33065bd] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a626f271ae6979bbffe] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a7ce585fd4ae98b830b] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ac889c022f51a43b527] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a4f6353225ab0496d48] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ab578892d355575c3e4] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a02b4c8040b81dc785d] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a8d13a70c1e380292ea] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a2e4d2fc709d989c778] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a6df81b28bd3ec99a3a] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743af54f74589657eac0fd] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a1849a3092175db4a2f] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a4f05ecdc6c2c42c9fb] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a24c3c0036dfb085bb9] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a44d725ac77836eb10b] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ad04db6c692ab73d90d] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a873009d6cdb99c5a4c] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743aa958795fbfc2b5fa41] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a205b6f659d219c8cbc] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ade54b3bc3d3cdb1aeb] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a538b748c1c5f92be98] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ad50de2ad89aaa1e067] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a0576917f19ecaf2a3f] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a5b44bd2793555a71e7] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743acc874645f7bbf62e62] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a7ae1b958a847e98bc8] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a396ae49d5311ee6bd1] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743aa5d56999a2ebd1c4c9] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a72f370c054587f81a5] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a3a32934e459acb2ceb] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ac10fd56a5e084aae1c] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a2ba8e27fcdbc3ab4f2] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a4a75b804eec44f3f2a] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a64ebb181fc616bfdb4] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a9aaf019a62fd907a8a] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a19730285453eb7702a] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743acced4c24d0ebee7c29] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ae458a57da6a2a6280a] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a83b9f09b407c57d07e] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743acc9fc095b3aaaef755] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a587ccf84053d9950ff] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a13d53bcf137f3784e9] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743abb79d34fb381ebd7c1] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a935ea70a3e699d23b6] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a109fcd63aefdae75a1] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743abca8d937a761f2eb46] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a314c97ff9e866a835b] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a691e4b5f67da0dea8e] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a127c680b864ee61620] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a148df8dfd47b4493f3] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a57c606ebe91374fcee] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743acec20322704f7bec44] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743abf6a27e09c6d0a9f0f] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ae2e8bdcf5850e20836] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ab8399645bc39338a47] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a658619de90cae5dbe1] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743aeb9db1dfeed3a7b47b] (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743abdc9db5edf43ffcb0d] (r:1 w:0)
 	fn claim_surcharge(c: u32, ) -> Weight {
-		(147_775_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((3_094_000 as Weight).saturating_mul(c as Weight))
+		(126_115_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((2_829_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_caller(r: u32, ) -> Weight {
-		(150_159_000 as Weight)
-			// Standard Error: 90_000
-			.saturating_add((274_529_000 as Weight).saturating_mul(r as Weight))
+		(134_110_000 as Weight)
+			// Standard Error: 130_000
+			.saturating_add((230_337_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_address(r: u32, ) -> Weight {
-		(140_207_000 as Weight)
+		(131_212_000 as Weight)
 			// Standard Error: 116_000
-			.saturating_add((276_569_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((230_568_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(156_581_000 as Weight)
-			// Standard Error: 107_000
-			.saturating_add((270_368_000 as Weight).saturating_mul(r as Weight))
+		(135_149_000 as Weight)
+			// Standard Error: 149_000
+			.saturating_add((224_830_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_balance(r: u32, ) -> Weight {
-		(141_778_000 as Weight)
-			// Standard Error: 305_000
-			.saturating_add((615_927_000 as Weight).saturating_mul(r as Weight))
+		(148_463_000 as Weight)
+			// Standard Error: 246_000
+			.saturating_add((480_930_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(138_752_000 as Weight)
-			// Standard Error: 91_000
-			.saturating_add((280_176_000 as Weight).saturating_mul(r as Weight))
+		(137_790_000 as Weight)
+			// Standard Error: 152_000
+			.saturating_add((224_961_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(141_089_000 as Weight)
-			// Standard Error: 82_000
-			.saturating_add((274_199_000 as Weight).saturating_mul(r as Weight))
+		(134_238_000 as Weight)
+			// Standard Error: 135_000
+			.saturating_add((224_433_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(140_447_000 as Weight)
-			// Standard Error: 119_000
-			.saturating_add((270_823_000 as Weight).saturating_mul(r as Weight))
+		(135_053_000 as Weight)
+			// Standard Error: 147_000
+			.saturating_add((223_955_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(138_394_000 as Weight)
-			// Standard Error: 105_000
-			.saturating_add((275_261_000 as Weight).saturating_mul(r as Weight))
+		(138_522_000 as Weight)
+			// Standard Error: 145_000
+			.saturating_add((223_459_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_block_number(r: u32, ) -> Weight {
-		(151_633_000 as Weight)
-			// Standard Error: 109_000
-			.saturating_add((269_666_000 as Weight).saturating_mul(r as Weight))
+		(133_568_000 as Weight)
+			// Standard Error: 143_000
+			.saturating_add((224_792_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_now(r: u32, ) -> Weight {
-		(129_087_000 as Weight)
-			// Standard Error: 252_000
-			.saturating_add((277_368_000 as Weight).saturating_mul(r as Weight))
+		(134_786_000 as Weight)
+			// Standard Error: 130_000
+			.saturating_add((224_331_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
+	// Storage: TransactionPayment NextFeeMultiplier (r:1 w:0)
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(176_205_000 as Weight)
-			// Standard Error: 304_000
-			.saturating_add((555_094_000 as Weight).saturating_mul(r as Weight))
+		(147_402_000 as Weight)
+			// Standard Error: 233_000
+			.saturating_add((439_237_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_gas(r: u32, ) -> Weight {
-		(129_942_000 as Weight)
-			// Standard Error: 92_000
-			.saturating_add((144_914_000 as Weight).saturating_mul(r as Weight))
+		(115_711_000 as Weight)
+			// Standard Error: 88_000
+			.saturating_add((113_467_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_input(r: u32, ) -> Weight {
-		(141_540_000 as Weight)
-			// Standard Error: 68_000
-			.saturating_add((6_576_000 as Weight).saturating_mul(r as Weight))
+		(123_004_000 as Weight)
+			// Standard Error: 78_000
+			.saturating_add((6_674_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(150_832_000 as Weight)
+		(131_611_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((263_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((1_035_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_return(r: u32, ) -> Weight {
-		(135_920_000 as Weight)
-			// Standard Error: 61_000
-			.saturating_add((3_733_000 as Weight).saturating_mul(r as Weight))
+		(118_327_000 as Weight)
+			// Standard Error: 84_000
+			.saturating_add((4_274_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(144_104_000 as Weight)
+		(126_129_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((640_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((495_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
+	// Storage: Contracts DeletionQueue (r:1 w:1)
 	fn seal_terminate(r: u32, ) -> Weight {
-		(141_631_000 as Weight)
-			// Standard Error: 70_000
-			.saturating_add((112_747_000 as Weight).saturating_mul(r as Weight))
+		(123_759_000 as Weight)
+			// Standard Error: 115_000
+			.saturating_add((89_730_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
+	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743af3fd4cc2fc8d170b6d] (r:1 w:0)
 	fn seal_restore_to(r: u32, ) -> Weight {
-		(168_955_000 as Weight)
-			// Standard Error: 211_000
-			.saturating_add((119_247_000 as Weight).saturating_mul(r as Weight))
+		(151_364_000 as Weight)
+			// Standard Error: 263_000
+			.saturating_add((99_367_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((4 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((5 as Weight).saturating_mul(r as Weight)))
 	}
+	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_restore_to_per_delta(d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 3_299_000
-			.saturating_add((3_257_862_000 as Weight).saturating_mul(d as Weight))
+			// Standard Error: 1_919_000
+			.saturating_add((2_415_482_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(7 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
+	// Storage: RandomnessCollectiveFlip RandomMaterial (r:1 w:0)
 	fn seal_random(r: u32, ) -> Weight {
-		(124_927_000 as Weight)
-			// Standard Error: 407_000
-			.saturating_add((730_247_000 as Weight).saturating_mul(r as Weight))
+		(137_660_000 as Weight)
+			// Standard Error: 204_000
+			.saturating_add((563_042_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(135_014_000 as Weight)
-			// Standard Error: 892_000
-			.saturating_add((1_131_992_000 as Weight).saturating_mul(r as Weight))
+		(137_087_000 as Weight)
+			// Standard Error: 413_000
+			.saturating_add((835_499_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
+	// Storage: System EventTopics (r:100 w:100)
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_401_344_000 as Weight)
-			// Standard Error: 2_961_000
-			.saturating_add((701_918_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 583_000
-			.saturating_add((169_206_000 as Weight).saturating_mul(n as Weight))
+		(1_117_515_000 as Weight)
+			// Standard Error: 2_167_000
+			.saturating_add((494_145_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 427_000
+			.saturating_add((150_093_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(146_753_000 as Weight)
-			// Standard Error: 117_000
-			.saturating_add((194_150_000 as Weight).saturating_mul(r as Weight))
+		(132_070_000 as Weight)
+			// Standard Error: 129_000
+			.saturating_add((155_669_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_debug_message(r: u32, ) -> Weight {
-		(141_972_000 as Weight)
-			// Standard Error: 114_000
-			.saturating_add((164_981_000 as Weight).saturating_mul(r as Weight))
+		(126_971_000 as Weight)
+			// Standard Error: 90_000
+			.saturating_add((122_445_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(549_424_000 as Weight)
-			// Standard Error: 7_901_000
-			.saturating_add((4_159_879_000 as Weight).saturating_mul(r as Weight))
+		(125_746_000 as Weight)
+			// Standard Error: 610_000
+			.saturating_add((501_265_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
+	// Storage: unknown [0x7afa01283080ef247df84e0ba38ea5a587d25ce6633a6bfbba02068c14023441] (r:1 w:1)
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(682_814_000 as Weight)
-			// Standard Error: 229_000
-			.saturating_add((59_572_000 as Weight).saturating_mul(n as Weight))
+		(563_219_000 as Weight)
+			// Standard Error: 219_000
+			.saturating_add((41_578_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_clear_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_889_000
-			.saturating_add((1_563_117_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 1_727_000
+			.saturating_add((1_001_461_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
+	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_get_storage(r: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 2_414_000
-			.saturating_add((1_178_803_000 as Weight).saturating_mul(r as Weight))
+		(9_115_000 as Weight)
+			// Standard Error: 784_000
+			.saturating_add((660_533_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
+	// Storage: unknown [0x7afa01283080ef247df84e0ba38ea5a587d25ce6633a6bfbba02068c14023441] (r:1 w:0)
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(696_056_000 as Weight)
-			// Standard Error: 266_000
-			.saturating_add((108_870_000 as Weight).saturating_mul(n as Weight))
+		(563_175_000 as Weight)
+			// Standard Error: 206_000
+			.saturating_add((89_626_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_transfer(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_764_000
-			.saturating_add((6_397_838_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 1_750_000
+			.saturating_add((4_820_493_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 8_279_000
-			.saturating_add((13_318_274_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 6_692_000
+			.saturating_add((11_477_937_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((200 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
+	// Storage: Contracts ContractInfoOf (r:101 w:101)
+	// Storage: Contracts CodeStorage (r:2 w:0)
+	// Storage: System Account (r:101 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight {
-		(13_411_599_000 as Weight)
-			// Standard Error: 40_931_000
-			.saturating_add((4_291_567_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 14_000
-			.saturating_add((48_818_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 15_000
-			.saturating_add((68_502_000 as Weight).saturating_mul(o as Weight))
+		(11_238_437_000 as Weight)
+			// Standard Error: 81_620_000
+			.saturating_add((3_700_413_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 29_000
+			.saturating_add((32_106_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 31_000
+			.saturating_add((54_386_000 as Weight).saturating_mul(o as Weight))
 			.saturating_add(RocksDbWeight::get().reads(205 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(101 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
+	// Storage: Contracts AccountCounter (r:1 w:1)
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 31_671_000
-			.saturating_add((24_164_540_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 35_258_000
+			.saturating_add((20_674_357_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((300 as Weight).saturating_mul(r as Weight)))
 	}
+	// Storage: Contracts ContractInfoOf (r:101 w:101)
+	// Storage: Contracts CodeStorage (r:2 w:1)
+	// Storage: System Account (r:101 w:101)
+	// Storage: Timestamp Now (r:1 w:0)
+	// Storage: Contracts AccountCounter (r:1 w:1)
 	fn seal_instantiate_per_input_output_salt_kb(i: u32, o: u32, s: u32, ) -> Weight {
-		(17_228_488_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((50_822_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 26_000
-			.saturating_add((71_276_000 as Weight).saturating_mul(o as Weight))
-			// Standard Error: 26_000
-			.saturating_add((198_669_000 as Weight).saturating_mul(s as Weight))
+		(14_725_288_000 as Weight)
+			// Standard Error: 53_000
+			.saturating_add((33_848_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 53_000
+			.saturating_add((57_054_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 53_000
+			.saturating_add((180_033_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(206 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(204 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(149_183_000 as Weight)
-			// Standard Error: 99_000
-			.saturating_add((279_233_000 as Weight).saturating_mul(r as Weight))
+		(131_974_000 as Weight)
+			// Standard Error: 125_000
+			.saturating_add((220_711_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(457_629_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((480_686_000 as Weight).saturating_mul(n as Weight))
+		(367_148_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((462_143_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(141_603_000 as Weight)
-			// Standard Error: 120_000
-			.saturating_add((283_527_000 as Weight).saturating_mul(r as Weight))
+		(134_585_000 as Weight)
+			// Standard Error: 131_000
+			.saturating_add((227_264_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(463_644_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((332_183_000 as Weight).saturating_mul(n as Weight))
+		(325_319_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((313_033_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(144_145_000 as Weight)
-			// Standard Error: 113_000
-			.saturating_add((252_640_000 as Weight).saturating_mul(r as Weight))
+		(135_347_000 as Weight)
+			// Standard Error: 150_000
+			.saturating_add((199_764_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(455_101_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((149_174_000 as Weight).saturating_mul(n as Weight))
+		(424_473_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((130_936_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(147_166_000 as Weight)
-			// Standard Error: 233_000
-			.saturating_add((254_430_000 as Weight).saturating_mul(r as Weight))
+		(128_776_000 as Weight)
+			// Standard Error: 118_000
+			.saturating_add((203_125_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(445_667_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((149_178_000 as Weight).saturating_mul(n as Weight))
+		(445_726_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((130_931_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(21_505_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((7_963_000 as Weight).saturating_mul(r as Weight))
+		(22_161_000 as Weight)
+			// Standard Error: 36_000
+			.saturating_add((3_329_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(24_775_000 as Weight)
-			// Standard Error: 37_000
-			.saturating_add((157_130_000 as Weight).saturating_mul(r as Weight))
+		(24_430_000 as Weight)
+			// Standard Error: 65_000
+			.saturating_add((159_566_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(24_722_000 as Weight)
-			// Standard Error: 69_000
-			.saturating_add((240_564_000 as Weight).saturating_mul(r as Weight))
+		(24_443_000 as Weight)
+			// Standard Error: 62_000
+			.saturating_add((232_854_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(21_506_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((45_277_000 as Weight).saturating_mul(r as Weight))
+		(22_158_000 as Weight)
+			// Standard Error: 34_000
+			.saturating_add((12_112_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(21_587_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((42_269_000 as Weight).saturating_mul(r as Weight))
+		(22_178_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((11_374_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(21_538_000 as Weight)
-			// Standard Error: 807_000
-			.saturating_add((22_392_000 as Weight).saturating_mul(r as Weight))
+		(22_157_000 as Weight)
+			// Standard Error: 41_000
+			.saturating_add((5_826_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(21_634_000 as Weight)
-			// Standard Error: 57_000
-			.saturating_add((44_203_000 as Weight).saturating_mul(r as Weight))
+		(22_182_000 as Weight)
+			// Standard Error: 34_000
+			.saturating_add((13_647_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(21_531_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((33_198_000 as Weight).saturating_mul(r as Weight))
+		(22_083_000 as Weight)
+			// Standard Error: 44_000
+			.saturating_add((14_901_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(60_960_000 as Weight)
+		(32_689_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((151_000 as Weight).saturating_mul(e as Weight))
+			.saturating_add((154_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(21_777_000 as Weight)
-			// Standard Error: 141_000
-			.saturating_add((245_105_000 as Weight).saturating_mul(r as Weight))
+		(22_313_000 as Weight)
+			// Standard Error: 383_000
+			.saturating_add((89_804_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(34_307_000 as Weight)
-			// Standard Error: 365_000
-			.saturating_add((344_623_000 as Weight).saturating_mul(r as Weight))
+		(29_939_000 as Weight)
+			// Standard Error: 230_000
+			.saturating_add((185_309_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(398_310_000 as Weight)
-			// Standard Error: 6_000
-			.saturating_add((4_163_000 as Weight).saturating_mul(p as Weight))
+		(221_596_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((4_045_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(40_478_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((9_991_000 as Weight).saturating_mul(r as Weight))
+		(22_171_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((3_362_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(40_427_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((8_526_000 as Weight).saturating_mul(r as Weight))
+		(22_182_000 as Weight)
+			// Standard Error: 31_000
+			.saturating_add((3_801_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(40_463_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((16_497_000 as Weight).saturating_mul(r as Weight))
+		(22_200_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((5_080_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(25_998_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((18_214_000 as Weight).saturating_mul(r as Weight))
+		(25_255_000 as Weight)
+			// Standard Error: 41_000
+			.saturating_add((8_875_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(25_972_000 as Weight)
-			// Standard Error: 42_000
-			.saturating_add((18_901_000 as Weight).saturating_mul(r as Weight))
+		(25_145_000 as Weight)
+			// Standard Error: 37_000
+			.saturating_add((9_556_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(24_949_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((8_541_000 as Weight).saturating_mul(r as Weight))
+		(24_435_000 as Weight)
+			// Standard Error: 49_000
+			.saturating_add((4_204_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(22_204_000 as Weight)
-			// Standard Error: 4_776_000
-			.saturating_add((2_198_462_000 as Weight).saturating_mul(r as Weight))
+		(23_158_000 as Weight)
+			// Standard Error: 5_969_000
+			.saturating_add((2_339_630_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(21_506_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((25_302_000 as Weight).saturating_mul(r as Weight))
+		(21_984_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((5_421_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(21_523_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((25_206_000 as Weight).saturating_mul(r as Weight))
+		(22_069_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((5_187_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(21_567_000 as Weight)
-			// Standard Error: 466_000
-			.saturating_add((19_925_000 as Weight).saturating_mul(r as Weight))
+		(22_042_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((6_116_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(21_569_000 as Weight)
-			// Standard Error: 30_000
-			.saturating_add((25_027_000 as Weight).saturating_mul(r as Weight))
+		(22_018_000 as Weight)
+			// Standard Error: 34_000
+			.saturating_add((5_130_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(21_536_000 as Weight)
-			// Standard Error: 193_000
-			.saturating_add((17_690_000 as Weight).saturating_mul(r as Weight))
+		(21_933_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((5_005_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(21_555_000 as Weight)
-			// Standard Error: 356_000
-			.saturating_add((17_105_000 as Weight).saturating_mul(r as Weight))
+		(22_066_000 as Weight)
+			// Standard Error: 34_000
+			.saturating_add((4_877_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(21_561_000 as Weight)
-			// Standard Error: 1_038_000
-			.saturating_add((22_198_000 as Weight).saturating_mul(r as Weight))
+		(22_003_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((5_018_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(21_513_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((33_620_000 as Weight).saturating_mul(r as Weight))
+		(22_130_000 as Weight)
+			// Standard Error: 35_000
+			.saturating_add((7_071_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(21_556_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((33_669_000 as Weight).saturating_mul(r as Weight))
+		(22_112_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((7_056_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(21_571_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((33_649_000 as Weight).saturating_mul(r as Weight))
+		(22_114_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((6_974_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(21_533_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((33_450_000 as Weight).saturating_mul(r as Weight))
+		(22_111_000 as Weight)
+			// Standard Error: 32_000
+			.saturating_add((7_183_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(21_525_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((33_727_000 as Weight).saturating_mul(r as Weight))
+		(22_148_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((7_044_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(21_546_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((33_420_000 as Weight).saturating_mul(r as Weight))
+		(22_158_000 as Weight)
+			// Standard Error: 33_000
+			.saturating_add((7_116_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(21_546_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((33_720_000 as Weight).saturating_mul(r as Weight))
+		(22_194_000 as Weight)
+			// Standard Error: 31_000
+			.saturating_add((7_039_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(21_546_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((33_383_000 as Weight).saturating_mul(r as Weight))
+		(22_219_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((7_076_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(21_577_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((33_454_000 as Weight).saturating_mul(r as Weight))
+		(22_170_000 as Weight)
+			// Standard Error: 50_000
+			.saturating_add((7_122_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(21_566_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((33_665_000 as Weight).saturating_mul(r as Weight))
+		(22_113_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((7_069_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(21_524_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((33_351_000 as Weight).saturating_mul(r as Weight))
+		(22_090_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((6_956_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(21_558_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((33_423_000 as Weight).saturating_mul(r as Weight))
+		(22_006_000 as Weight)
+			// Standard Error: 30_000
+			.saturating_add((7_094_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(21_554_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((33_588_000 as Weight).saturating_mul(r as Weight))
+		(22_111_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((6_825_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(21_568_000 as Weight)
+		(22_041_000 as Weight)
 			// Standard Error: 29_000
-			.saturating_add((38_897_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((13_164_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(21_567_000 as Weight)
-			// Standard Error: 31_000
-			.saturating_add((38_756_000 as Weight).saturating_mul(r as Weight))
+		(21_989_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((12_808_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(21_540_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((39_244_000 as Weight).saturating_mul(r as Weight))
+		(22_045_000 as Weight)
+			// Standard Error: 39_000
+			.saturating_add((13_387_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(21_581_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((38_461_000 as Weight).saturating_mul(r as Weight))
+		(22_075_000 as Weight)
+			// Standard Error: 40_000
+			.saturating_add((12_791_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(21_555_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((33_367_000 as Weight).saturating_mul(r as Weight))
+		(22_044_000 as Weight)
+			// Standard Error: 32_000
+			.saturating_add((7_090_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(21_523_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((33_466_000 as Weight).saturating_mul(r as Weight))
+		(22_133_000 as Weight)
+			// Standard Error: 40_000
+			.saturating_add((6_967_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(21_536_000 as Weight)
-			// Standard Error: 34_000
-			.saturating_add((33_452_000 as Weight).saturating_mul(r as Weight))
+		(22_069_000 as Weight)
+			// Standard Error: 41_000
+			.saturating_add((7_026_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(21_567_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((33_809_000 as Weight).saturating_mul(r as Weight))
+		(22_165_000 as Weight)
+			// Standard Error: 44_000
+			.saturating_add((7_440_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(21_580_000 as Weight)
-			// Standard Error: 32_000
-			.saturating_add((33_849_000 as Weight).saturating_mul(r as Weight))
+		(22_063_000 as Weight)
+			// Standard Error: 34_000
+			.saturating_add((7_309_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(21_571_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((33_799_000 as Weight).saturating_mul(r as Weight))
+		(22_086_000 as Weight)
+			// Standard Error: 36_000
+			.saturating_add((7_188_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(21_559_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((33_947_000 as Weight).saturating_mul(r as Weight))
+		(22_109_000 as Weight)
+			// Standard Error: 45_000
+			.saturating_add((7_169_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(21_565_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((33_754_000 as Weight).saturating_mul(r as Weight))
+		(22_076_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((7_070_000 as Weight).saturating_mul(r as Weight))
 	}
 }
diff --git a/frame/democracy/src/weights.rs b/frame/democracy/src/weights.rs
index 6572e62889c1..e3f22f4fc0ab 100644
--- a/frame/democracy/src/weights.rs
+++ b/frame/democracy/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_democracy
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -75,164 +75,224 @@ pub trait WeightInfo {
 /// Weights for pallet_democracy using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	// Storage: Democracy PublicPropCount (r:1 w:1)
+	// Storage: Democracy PublicProps (r:1 w:1)
+	// Storage: Democracy Blacklist (r:1 w:0)
+	// Storage: Democracy DepositOf (r:0 w:1)
 	fn propose() -> Weight {
-		(71_782_000 as Weight)
+		(65_665_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Democracy DepositOf (r:1 w:1)
 	fn second(s: u32, ) -> Weight {
-		(41_071_000 as Weight)
+		(40_003_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((211_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((180_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
+	// Storage: Democracy VotingOf (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
 	fn vote_new(r: u32, ) -> Weight {
-		(46_179_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((283_000 as Weight).saturating_mul(r as Weight))
+		(45_465_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((220_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
+	// Storage: Democracy VotingOf (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
 	fn vote_existing(r: u32, ) -> Weight {
-		(46_169_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((284_000 as Weight).saturating_mul(r as Weight))
+		(45_112_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((222_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
+	// Storage: Democracy Cancellations (r:1 w:1)
 	fn emergency_cancel() -> Weight {
-		(28_615_000 as Weight)
+		(26_651_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Democracy PublicProps (r:1 w:1)
+	// Storage: Democracy NextExternal (r:1 w:1)
+	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
+	// Storage: Democracy Blacklist (r:0 w:1)
+	// Storage: Democracy DepositOf (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn blacklist(p: u32, ) -> Weight {
-		(80_711_000 as Weight)
+		(77_737_000 as Weight)
 			// Standard Error: 4_000
-			.saturating_add((590_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((512_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(6 as Weight))
 	}
+	// Storage: Democracy NextExternal (r:1 w:1)
+	// Storage: Democracy Blacklist (r:1 w:0)
 	fn external_propose(v: u32, ) -> Weight {
-		(13_197_000 as Weight)
+		(13_126_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((90_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((89_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Democracy NextExternal (r:0 w:1)
 	fn external_propose_majority() -> Weight {
-		(2_712_000 as Weight)
+		(2_923_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Democracy NextExternal (r:0 w:1)
 	fn external_propose_default() -> Weight {
-		(2_680_000 as Weight)
+		(2_889_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Democracy NextExternal (r:1 w:1)
+	// Storage: Democracy ReferendumCount (r:1 w:1)
+	// Storage: Democracy ReferendumInfoOf (r:0 w:1)
 	fn fast_track() -> Weight {
-		(28_340_000 as Weight)
+		(27_598_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Democracy NextExternal (r:1 w:1)
+	// Storage: Democracy Blacklist (r:1 w:1)
 	fn veto_external(v: u32, ) -> Weight {
-		(28_894_000 as Weight)
+		(28_416_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((133_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((132_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Democracy PublicProps (r:1 w:1)
+	// Storage: Democracy DepositOf (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn cancel_proposal(p: u32, ) -> Weight {
-		(54_339_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((561_000 as Weight).saturating_mul(p as Weight))
+		(52_836_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((478_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Democracy ReferendumInfoOf (r:0 w:1)
 	fn cancel_referendum() -> Weight {
-		(17_183_000 as Weight)
+		(16_891_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Scheduler Lookup (r:1 w:1)
+	// Storage: Scheduler Agenda (r:1 w:1)
 	fn cancel_queued(r: u32, ) -> Weight {
-		(30_500_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_730_000 as Weight).saturating_mul(r as Weight))
+		(30_504_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((1_480_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Democracy LastTabledWasExternal (r:1 w:0)
+	// Storage: Democracy NextExternal (r:1 w:0)
+	// Storage: Democracy PublicProps (r:1 w:0)
+	// Storage: Democracy LowestUnbaked (r:1 w:0)
+	// Storage: Democracy ReferendumCount (r:1 w:0)
+	// Storage: Democracy ReferendumInfoOf (r:1 w:0)
 	fn on_initialize_base(r: u32, ) -> Weight {
-		(7_788_000 as Weight)
+		(6_259_000 as Weight)
 			// Standard Error: 4_000
-			.saturating_add((5_422_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((5_032_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
 	}
+	// Storage: Democracy VotingOf (r:3 w:3)
+	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
 	fn delegate(r: u32, ) -> Weight {
-		(55_676_000 as Weight)
+		(51_719_000 as Weight)
 			// Standard Error: 5_000
-			.saturating_add((7_553_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((7_210_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight)))
 	}
+	// Storage: Democracy VotingOf (r:2 w:2)
+	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
 	fn undelegate(r: u32, ) -> Weight {
-		(23_908_000 as Weight)
+		(23_203_000 as Weight)
 			// Standard Error: 5_000
-			.saturating_add((7_551_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((7_206_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight)))
 	}
+	// Storage: Democracy PublicProps (r:0 w:1)
 	fn clear_public_proposals() -> Weight {
-		(3_023_000 as Weight)
+		(3_127_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Democracy Preimages (r:1 w:1)
 	fn note_preimage(b: u32, ) -> Weight {
-		(44_069_000 as Weight)
+		(44_130_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Democracy Preimages (r:1 w:1)
 	fn note_imminent_preimage(b: u32, ) -> Weight {
-		(28_457_000 as Weight)
+		(28_756_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Democracy Preimages (r:1 w:1)
+	// Storage: System Account (r:1 w:0)
 	fn reap_preimage(b: u32, ) -> Weight {
-		(39_646_000 as Weight)
+		(39_922_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Democracy VotingOf (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn unlock_remove(r: u32, ) -> Weight {
-		(39_499_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((148_000 as Weight).saturating_mul(r as Weight))
+		(38_621_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((110_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Democracy VotingOf (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn unlock_set(r: u32, ) -> Weight {
-		(37_340_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((266_000 as Weight).saturating_mul(r as Weight))
+		(36_631_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((214_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
+	// Storage: Democracy VotingOf (r:1 w:1)
 	fn remove_vote(r: u32, ) -> Weight {
-		(20_397_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((259_000 as Weight).saturating_mul(r as Weight))
+		(21_025_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((195_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
+	// Storage: Democracy VotingOf (r:1 w:1)
 	fn remove_other_vote(r: u32, ) -> Weight {
-		(20_425_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((156_000 as Weight).saturating_mul(r as Weight))
+		(20_628_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((214_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
@@ -240,164 +300,224 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
+	// Storage: Democracy PublicPropCount (r:1 w:1)
+	// Storage: Democracy PublicProps (r:1 w:1)
+	// Storage: Democracy Blacklist (r:1 w:0)
+	// Storage: Democracy DepositOf (r:0 w:1)
 	fn propose() -> Weight {
-		(71_782_000 as Weight)
+		(65_665_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Democracy DepositOf (r:1 w:1)
 	fn second(s: u32, ) -> Weight {
-		(41_071_000 as Weight)
+		(40_003_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((211_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((180_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
+	// Storage: Democracy VotingOf (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
 	fn vote_new(r: u32, ) -> Weight {
-		(46_179_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((283_000 as Weight).saturating_mul(r as Weight))
+		(45_465_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((220_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
+	// Storage: Democracy VotingOf (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
 	fn vote_existing(r: u32, ) -> Weight {
-		(46_169_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((284_000 as Weight).saturating_mul(r as Weight))
+		(45_112_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((222_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
+	// Storage: Democracy Cancellations (r:1 w:1)
 	fn emergency_cancel() -> Weight {
-		(28_615_000 as Weight)
+		(26_651_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Democracy PublicProps (r:1 w:1)
+	// Storage: Democracy NextExternal (r:1 w:1)
+	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
+	// Storage: Democracy Blacklist (r:0 w:1)
+	// Storage: Democracy DepositOf (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn blacklist(p: u32, ) -> Weight {
-		(80_711_000 as Weight)
+		(77_737_000 as Weight)
 			// Standard Error: 4_000
-			.saturating_add((590_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((512_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(6 as Weight))
 	}
+	// Storage: Democracy NextExternal (r:1 w:1)
+	// Storage: Democracy Blacklist (r:1 w:0)
 	fn external_propose(v: u32, ) -> Weight {
-		(13_197_000 as Weight)
+		(13_126_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((90_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((89_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Democracy NextExternal (r:0 w:1)
 	fn external_propose_majority() -> Weight {
-		(2_712_000 as Weight)
+		(2_923_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Democracy NextExternal (r:0 w:1)
 	fn external_propose_default() -> Weight {
-		(2_680_000 as Weight)
+		(2_889_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Democracy NextExternal (r:1 w:1)
+	// Storage: Democracy ReferendumCount (r:1 w:1)
+	// Storage: Democracy ReferendumInfoOf (r:0 w:1)
 	fn fast_track() -> Weight {
-		(28_340_000 as Weight)
+		(27_598_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Democracy NextExternal (r:1 w:1)
+	// Storage: Democracy Blacklist (r:1 w:1)
 	fn veto_external(v: u32, ) -> Weight {
-		(28_894_000 as Weight)
+		(28_416_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((133_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((132_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Democracy PublicProps (r:1 w:1)
+	// Storage: Democracy DepositOf (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn cancel_proposal(p: u32, ) -> Weight {
-		(54_339_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((561_000 as Weight).saturating_mul(p as Weight))
+		(52_836_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((478_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Democracy ReferendumInfoOf (r:0 w:1)
 	fn cancel_referendum() -> Weight {
-		(17_183_000 as Weight)
+		(16_891_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Scheduler Lookup (r:1 w:1)
+	// Storage: Scheduler Agenda (r:1 w:1)
 	fn cancel_queued(r: u32, ) -> Weight {
-		(30_500_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_730_000 as Weight).saturating_mul(r as Weight))
+		(30_504_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((1_480_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Democracy LastTabledWasExternal (r:1 w:0)
+	// Storage: Democracy NextExternal (r:1 w:0)
+	// Storage: Democracy PublicProps (r:1 w:0)
+	// Storage: Democracy LowestUnbaked (r:1 w:0)
+	// Storage: Democracy ReferendumCount (r:1 w:0)
+	// Storage: Democracy ReferendumInfoOf (r:1 w:0)
 	fn on_initialize_base(r: u32, ) -> Weight {
-		(7_788_000 as Weight)
+		(6_259_000 as Weight)
 			// Standard Error: 4_000
-			.saturating_add((5_422_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((5_032_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
 	}
+	// Storage: Democracy VotingOf (r:3 w:3)
+	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
 	fn delegate(r: u32, ) -> Weight {
-		(55_676_000 as Weight)
+		(51_719_000 as Weight)
 			// Standard Error: 5_000
-			.saturating_add((7_553_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((7_210_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(r as Weight)))
 	}
+	// Storage: Democracy VotingOf (r:2 w:2)
+	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
 	fn undelegate(r: u32, ) -> Weight {
-		(23_908_000 as Weight)
+		(23_203_000 as Weight)
 			// Standard Error: 5_000
-			.saturating_add((7_551_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((7_206_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(r as Weight)))
 	}
+	// Storage: Democracy PublicProps (r:0 w:1)
 	fn clear_public_proposals() -> Weight {
-		(3_023_000 as Weight)
+		(3_127_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Democracy Preimages (r:1 w:1)
 	fn note_preimage(b: u32, ) -> Weight {
-		(44_069_000 as Weight)
+		(44_130_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Democracy Preimages (r:1 w:1)
 	fn note_imminent_preimage(b: u32, ) -> Weight {
-		(28_457_000 as Weight)
+		(28_756_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Democracy Preimages (r:1 w:1)
+	// Storage: System Account (r:1 w:0)
 	fn reap_preimage(b: u32, ) -> Weight {
-		(39_646_000 as Weight)
+		(39_922_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Democracy VotingOf (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn unlock_remove(r: u32, ) -> Weight {
-		(39_499_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((148_000 as Weight).saturating_mul(r as Weight))
+		(38_621_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((110_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Democracy VotingOf (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn unlock_set(r: u32, ) -> Weight {
-		(37_340_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((266_000 as Weight).saturating_mul(r as Weight))
+		(36_631_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((214_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
+	// Storage: Democracy VotingOf (r:1 w:1)
 	fn remove_vote(r: u32, ) -> Weight {
-		(20_397_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((259_000 as Weight).saturating_mul(r as Weight))
+		(21_025_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((195_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
+	// Storage: Democracy VotingOf (r:1 w:1)
 	fn remove_other_vote(r: u32, ) -> Weight {
-		(20_425_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((156_000 as Weight).saturating_mul(r as Weight))
+		(20_628_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((214_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
diff --git a/frame/election-provider-multi-phase/src/weights.rs b/frame/election-provider-multi-phase/src/weights.rs
index 99fad2f06818..c3bca7136c21 100644
--- a/frame/election-provider-multi-phase/src/weights.rs
+++ b/frame/election-provider-multi-phase/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_election_provider_multi_phase
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-07-07, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -48,9 +48,9 @@ pub trait WeightInfo {
 	fn on_initialize_nothing() -> Weight;
 	fn on_initialize_open_signed() -> Weight;
 	fn on_initialize_open_unsigned_with_snapshot() -> Weight;
+	fn on_initialize_open_unsigned_without_snapshot() -> Weight;
 	fn finalize_signed_phase_accept_solution() -> Weight;
 	fn finalize_signed_phase_reject_solution() -> Weight;
-	fn on_initialize_open_unsigned_without_snapshot() -> Weight;
 	fn elect_queued(v: u32, t: u32, a: u32, d: u32, ) -> Weight;
 	fn submit(c: u32, ) -> Weight;
 	fn submit_unsigned(v: u32, t: u32, a: u32, d: u32, ) -> Weight;
@@ -60,150 +60,286 @@ pub trait WeightInfo {
 /// Weights for pallet_election_provider_multi_phase using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	// Storage: Staking CurrentEra (r:1 w:0)
+	// Storage: Staking CurrentPlannedSession (r:1 w:0)
+	// Storage: Staking ErasStartSessionIndex (r:1 w:0)
+	// Storage: Babe EpochIndex (r:1 w:0)
+	// Storage: Babe GenesisSlot (r:1 w:0)
+	// Storage: Babe CurrentSlot (r:1 w:0)
+	// Storage: Staking ForceEra (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase CurrentPhase (r:1 w:0)
 	fn on_initialize_nothing() -> Weight {
-		(33_170_000 as Weight)
+		(22_589_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(8 as Weight))
 	}
+	// Storage: Staking CounterForValidators (r:1 w:0)
+	// Storage: Staking Validators (r:2 w:0)
+	// Storage: Staking CounterForNominators (r:1 w:0)
+	// Storage: Staking SlashingSpans (r:1 w:0)
+	// Storage: Staking Bonded (r:1 w:0)
+	// Storage: Staking Ledger (r:1 w:0)
+	// Storage: Staking Nominators (r:1 w:0)
+	// Storage: Staking ValidatorCount (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase Round (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:0 w:1)
+	// Storage: ElectionProviderMultiPhase DesiredTargets (r:0 w:1)
+	// Storage: ElectionProviderMultiPhase Snapshot (r:0 w:1)
+	// Storage: ElectionProviderMultiPhase CurrentPhase (r:0 w:1)
 	fn on_initialize_open_signed() -> Weight {
-		(113_680_000 as Weight)
+		(107_551_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(10 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
+	// Storage: Staking CounterForValidators (r:1 w:0)
+	// Storage: Staking Validators (r:2 w:0)
+	// Storage: Staking CounterForNominators (r:1 w:0)
+	// Storage: Staking SlashingSpans (r:1 w:0)
+	// Storage: Staking Bonded (r:1 w:0)
+	// Storage: Staking Ledger (r:1 w:0)
+	// Storage: Staking Nominators (r:1 w:0)
+	// Storage: Staking ValidatorCount (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase Round (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:0 w:1)
+	// Storage: ElectionProviderMultiPhase DesiredTargets (r:0 w:1)
+	// Storage: ElectionProviderMultiPhase Snapshot (r:0 w:1)
+	// Storage: ElectionProviderMultiPhase CurrentPhase (r:0 w:1)
 	fn on_initialize_open_unsigned_with_snapshot() -> Weight {
-		(113_619_000 as Weight)
+		(96_899_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(10 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
+	// Storage: ElectionProviderMultiPhase Round (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase CurrentPhase (r:0 w:1)
+	fn on_initialize_open_unsigned_without_snapshot() -> Weight {
+		(18_549_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	// Storage: System Account (r:1 w:1)
+	// Storage: ElectionProviderMultiPhase QueuedSolution (r:0 w:1)
 	fn finalize_signed_phase_accept_solution() -> Weight {
-		(60_184_000 as Weight)
+		(48_349_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: System Account (r:1 w:1)
 	fn finalize_signed_phase_reject_solution() -> Weight {
-		(40_151_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn on_initialize_open_unsigned_without_snapshot() -> Weight {
-		(23_833_000 as Weight)
+		(32_014_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
-	fn elect_queued(v: u32, _t: u32, a: u32, d: u32, ) -> Weight {
-		(51_573_000 as Weight)
+	// Storage: ElectionProviderMultiPhase SignedSubmissionIndices (r:1 w:1)
+	// Storage: ElectionProviderMultiPhase SignedSubmissionNextIndex (r:1 w:1)
+	// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:1 w:1)
+	// Storage: ElectionProviderMultiPhase SignedSubmissionsMap (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase QueuedSolution (r:1 w:1)
+	// Storage: ElectionProviderMultiPhase Round (r:1 w:1)
+	// Storage: ElectionProviderMultiPhase DesiredTargets (r:0 w:1)
+	// Storage: ElectionProviderMultiPhase Snapshot (r:0 w:1)
+	// Storage: ElectionProviderMultiPhase CurrentPhase (r:0 w:1)
+	fn elect_queued(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
+		(0 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((9_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((43_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 6_000
+			.saturating_add((189_000 as Weight).saturating_mul(t as Weight))
 			// Standard Error: 2_000
-			.saturating_add((1_957_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 18_000
-			.saturating_add((588_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add((1_667_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 15_000
+			.saturating_add((129_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(8 as Weight))
 	}
+	// Storage: ElectionProviderMultiPhase SignedSubmissionIndices (r:1 w:1)
+	// Storage: ElectionProviderMultiPhase CurrentPhase (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:1 w:0)
+	// Storage: TransactionPayment NextFeeMultiplier (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase SignedSubmissionNextIndex (r:1 w:1)
+	// Storage: ElectionProviderMultiPhase SignedSubmissionsMap (r:0 w:1)
 	fn submit(c: u32, ) -> Weight {
-		(77_469_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((281_000 as Weight).saturating_mul(c as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(72_163_000 as Weight)
+			// Standard Error: 30_000
+			.saturating_add((254_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
+	// Storage: ElectionProviderMultiPhase CurrentPhase (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase Round (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase DesiredTargets (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase QueuedSolution (r:1 w:1)
+	// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase MinimumUntrustedScore (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase Snapshot (r:1 w:0)
 	fn submit_unsigned(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((3_667_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 29_000
-			.saturating_add((497_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 9_000
-			.saturating_add((11_228_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 73_000
-			.saturating_add((4_432_000 as Weight).saturating_mul(d as Weight))
+			// Standard Error: 4_000
+			.saturating_add((3_512_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 23_000
+			.saturating_add((49_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 7_000
+			.saturating_add((10_295_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 59_000
+			.saturating_add((6_008_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: ElectionProviderMultiPhase Round (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase DesiredTargets (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase MinimumUntrustedScore (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase Snapshot (r:1 w:0)
 	fn feasibility_check(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((3_613_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 23_000
-			.saturating_add((286_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 7_000
-			.saturating_add((9_677_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 58_000
-			.saturating_add((4_178_000 as Weight).saturating_mul(d as Weight))
+			// Standard Error: 8_000
+			.saturating_add((3_508_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 40_000
+			.saturating_add((302_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 13_000
+			.saturating_add((8_658_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 100_000
+			.saturating_add((4_816_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
+	// Storage: Staking CurrentEra (r:1 w:0)
+	// Storage: Staking CurrentPlannedSession (r:1 w:0)
+	// Storage: Staking ErasStartSessionIndex (r:1 w:0)
+	// Storage: Babe EpochIndex (r:1 w:0)
+	// Storage: Babe GenesisSlot (r:1 w:0)
+	// Storage: Babe CurrentSlot (r:1 w:0)
+	// Storage: Staking ForceEra (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase CurrentPhase (r:1 w:0)
 	fn on_initialize_nothing() -> Weight {
-		(33_564_000 as Weight)
+		(22_589_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(8 as Weight))
 	}
+	// Storage: Staking CounterForValidators (r:1 w:0)
+	// Storage: Staking Validators (r:2 w:0)
+	// Storage: Staking CounterForNominators (r:1 w:0)
+	// Storage: Staking SlashingSpans (r:1 w:0)
+	// Storage: Staking Bonded (r:1 w:0)
+	// Storage: Staking Ledger (r:1 w:0)
+	// Storage: Staking Nominators (r:1 w:0)
+	// Storage: Staking ValidatorCount (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase Round (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:0 w:1)
+	// Storage: ElectionProviderMultiPhase DesiredTargets (r:0 w:1)
+	// Storage: ElectionProviderMultiPhase Snapshot (r:0 w:1)
+	// Storage: ElectionProviderMultiPhase CurrentPhase (r:0 w:1)
 	fn on_initialize_open_signed() -> Weight {
-		(114_561_000 as Weight)
+		(107_551_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
+	// Storage: Staking CounterForValidators (r:1 w:0)
+	// Storage: Staking Validators (r:2 w:0)
+	// Storage: Staking CounterForNominators (r:1 w:0)
+	// Storage: Staking SlashingSpans (r:1 w:0)
+	// Storage: Staking Bonded (r:1 w:0)
+	// Storage: Staking Ledger (r:1 w:0)
+	// Storage: Staking Nominators (r:1 w:0)
+	// Storage: Staking ValidatorCount (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase Round (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:0 w:1)
+	// Storage: ElectionProviderMultiPhase DesiredTargets (r:0 w:1)
+	// Storage: ElectionProviderMultiPhase Snapshot (r:0 w:1)
+	// Storage: ElectionProviderMultiPhase CurrentPhase (r:0 w:1)
 	fn on_initialize_open_unsigned_with_snapshot() -> Weight {
-		(114_070_000 as Weight)
+		(96_899_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
+	// Storage: ElectionProviderMultiPhase Round (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase CurrentPhase (r:0 w:1)
+	fn on_initialize_open_unsigned_without_snapshot() -> Weight {
+		(18_549_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	// Storage: System Account (r:1 w:1)
+	// Storage: ElectionProviderMultiPhase QueuedSolution (r:0 w:1)
 	fn finalize_signed_phase_accept_solution() -> Weight {
-		(59_765_000 as Weight)
+		(48_349_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: System Account (r:1 w:1)
 	fn finalize_signed_phase_reject_solution() -> Weight {
-		(39_894_000 as Weight)
+		(32_014_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
-	fn on_initialize_open_unsigned_without_snapshot() -> Weight {
-		(23_591_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-	}
-	fn elect_queued(v: u32, _t: u32, a: u32, d: u32, ) -> Weight {
+	// Storage: ElectionProviderMultiPhase SignedSubmissionIndices (r:1 w:1)
+	// Storage: ElectionProviderMultiPhase SignedSubmissionNextIndex (r:1 w:1)
+	// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:1 w:1)
+	// Storage: ElectionProviderMultiPhase SignedSubmissionsMap (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase QueuedSolution (r:1 w:1)
+	// Storage: ElectionProviderMultiPhase Round (r:1 w:1)
+	// Storage: ElectionProviderMultiPhase DesiredTargets (r:0 w:1)
+	// Storage: ElectionProviderMultiPhase Snapshot (r:0 w:1)
+	// Storage: ElectionProviderMultiPhase CurrentPhase (r:0 w:1)
+	fn elect_queued(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((19_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 1_000
-			.saturating_add((1_959_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 14_000
-			.saturating_add((392_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add((43_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 6_000
+			.saturating_add((189_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 2_000
+			.saturating_add((1_667_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 15_000
+			.saturating_add((129_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
 	}
+	// Storage: ElectionProviderMultiPhase SignedSubmissionIndices (r:1 w:1)
+	// Storage: ElectionProviderMultiPhase CurrentPhase (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:1 w:0)
+	// Storage: TransactionPayment NextFeeMultiplier (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase SignedSubmissionNextIndex (r:1 w:1)
+	// Storage: ElectionProviderMultiPhase SignedSubmissionsMap (r:0 w:1)
 	fn submit(c: u32, ) -> Weight {
-		(77_616_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((213_000 as Weight).saturating_mul(c as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(72_163_000 as Weight)
+			// Standard Error: 30_000
+			.saturating_add((254_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
+	// Storage: ElectionProviderMultiPhase CurrentPhase (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase Round (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase DesiredTargets (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase QueuedSolution (r:1 w:1)
+	// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase MinimumUntrustedScore (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase Snapshot (r:1 w:0)
 	fn submit_unsigned(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 8_000
-			.saturating_add((3_701_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 42_000
-			.saturating_add((75_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 14_000
-			.saturating_add((11_268_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 107_000
-			.saturating_add((5_019_000 as Weight).saturating_mul(d as Weight))
+			// Standard Error: 4_000
+			.saturating_add((3_512_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 23_000
+			.saturating_add((49_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 7_000
+			.saturating_add((10_295_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 59_000
+			.saturating_add((6_008_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
-	fn feasibility_check(v: u32, _t: u32, a: u32, d: u32, ) -> Weight {
+	// Storage: ElectionProviderMultiPhase Round (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase DesiredTargets (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase MinimumUntrustedScore (r:1 w:0)
+	// Storage: ElectionProviderMultiPhase Snapshot (r:1 w:0)
+	fn feasibility_check(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 7_000
-			.saturating_add((3_632_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 12_000
-			.saturating_add((9_664_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 95_000
-			.saturating_add((4_264_000 as Weight).saturating_mul(d as Weight))
+			// Standard Error: 8_000
+			.saturating_add((3_508_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 40_000
+			.saturating_add((302_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 13_000
+			.saturating_add((8_658_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 100_000
+			.saturating_add((4_816_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 	}
 }
diff --git a/frame/elections-phragmen/src/weights.rs b/frame/elections-phragmen/src/weights.rs
index ce558fb9d7f0..40d4ead0a4ec 100644
--- a/frame/elections-phragmen/src/weights.rs
+++ b/frame/elections-phragmen/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_elections_phragmen
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -62,81 +62,130 @@ pub trait WeightInfo {
 /// Weights for pallet_elections_phragmen using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	// Storage: Elections Candidates (r:1 w:0)
+	// Storage: Elections Members (r:1 w:0)
+	// Storage: Elections RunnersUp (r:1 w:0)
+	// Storage: Elections Voting (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
 	fn vote_equal(v: u32, ) -> Weight {
-		(43_911_000 as Weight)
-			// Standard Error: 7_000
-			.saturating_add((324_000 as Weight).saturating_mul(v as Weight))
+		(42_509_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((372_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Elections Candidates (r:1 w:0)
+	// Storage: Elections Members (r:1 w:0)
+	// Storage: Elections RunnersUp (r:1 w:0)
+	// Storage: Elections Voting (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
 	fn vote_more(v: u32, ) -> Weight {
-		(68_236_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((359_000 as Weight).saturating_mul(v as Weight))
+		(65_311_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((419_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Elections Candidates (r:1 w:0)
+	// Storage: Elections Members (r:1 w:0)
+	// Storage: Elections RunnersUp (r:1 w:0)
+	// Storage: Elections Voting (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
 	fn vote_less(v: u32, ) -> Weight {
-		(68_162_000 as Weight)
-			// Standard Error: 9_000
-			.saturating_add((350_000 as Weight).saturating_mul(v as Weight))
+		(65_444_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((376_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Elections Voting (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
 	fn remove_voter() -> Weight {
-		(63_005_000 as Weight)
+		(61_585_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Elections Candidates (r:1 w:1)
+	// Storage: Elections Members (r:1 w:0)
+	// Storage: Elections RunnersUp (r:1 w:0)
 	fn submit_candidacy(c: u32, ) -> Weight {
-		(58_498_000 as Weight)
+		(53_333_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((305_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((267_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Elections Candidates (r:1 w:1)
 	fn renounce_candidacy_candidate(c: u32, ) -> Weight {
-		(52_062_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((173_000 as Weight).saturating_mul(c as Weight))
+		(49_128_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((144_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Elections Members (r:1 w:1)
+	// Storage: Elections RunnersUp (r:1 w:1)
+	// Storage: Instance1Collective Prime (r:1 w:1)
+	// Storage: Instance1Collective Proposals (r:1 w:0)
+	// Storage: Instance1Collective Members (r:0 w:1)
 	fn renounce_candidacy_members() -> Weight {
-		(73_234_000 as Weight)
+		(70_685_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
+	// Storage: Elections RunnersUp (r:1 w:1)
 	fn renounce_candidacy_runners_up() -> Weight {
-		(51_689_000 as Weight)
+		(49_766_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Elections RunnersUp (r:1 w:1)
+	// Storage: Elections Members (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Instance1Collective Prime (r:1 w:1)
+	// Storage: Instance1Collective Proposals (r:1 w:0)
+	// Storage: Instance1Collective Members (r:0 w:1)
 	fn remove_member_with_replacement() -> Weight {
-		(79_906_000 as Weight)
+		(76_153_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
+	// Storage: Elections RunnersUp (r:1 w:0)
 	fn remove_member_wrong_refund() -> Weight {
-		(6_877_000 as Weight)
+		(6_697_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 	}
+	// Storage: Elections Voting (r:251 w:250)
+	// Storage: Elections Members (r:1 w:0)
+	// Storage: Elections RunnersUp (r:1 w:0)
+	// Storage: Elections Candidates (r:1 w:0)
+	// Storage: Balances Locks (r:250 w:250)
+	// Storage: System Account (r:250 w:250)
 	fn clean_defunct_voters(v: u32, _d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 39_000
-			.saturating_add((112_381_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 60_000
+			.saturating_add((107_467_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(v as Weight)))
 	}
+	// Storage: Elections Candidates (r:1 w:1)
+	// Storage: Elections Members (r:1 w:1)
+	// Storage: Elections RunnersUp (r:1 w:1)
+	// Storage: Elections Voting (r:502 w:0)
+	// Storage: Instance1Collective Proposals (r:1 w:0)
+	// Storage: Elections ElectionRounds (r:1 w:1)
+	// Storage: Instance1Collective Members (r:0 w:1)
+	// Storage: Instance1Collective Prime (r:0 w:1)
+	// Storage: System Account (r:2 w:2)
 	fn election_phragmen(c: u32, v: u32, e: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 1_789_000
-			.saturating_add((42_600_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 744_000
-			.saturating_add((60_743_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 50_000
-			.saturating_add((3_837_000 as Weight).saturating_mul(e as Weight))
+			// Standard Error: 1_846_000
+			.saturating_add((39_843_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 768_000
+			.saturating_add((60_623_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 52_000
+			.saturating_add((3_884_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(c as Weight)))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(c as Weight)))
@@ -145,81 +194,130 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
+	// Storage: Elections Candidates (r:1 w:0)
+	// Storage: Elections Members (r:1 w:0)
+	// Storage: Elections RunnersUp (r:1 w:0)
+	// Storage: Elections Voting (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
 	fn vote_equal(v: u32, ) -> Weight {
-		(43_911_000 as Weight)
-			// Standard Error: 7_000
-			.saturating_add((324_000 as Weight).saturating_mul(v as Weight))
+		(42_509_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((372_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Elections Candidates (r:1 w:0)
+	// Storage: Elections Members (r:1 w:0)
+	// Storage: Elections RunnersUp (r:1 w:0)
+	// Storage: Elections Voting (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
 	fn vote_more(v: u32, ) -> Weight {
-		(68_236_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((359_000 as Weight).saturating_mul(v as Weight))
+		(65_311_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((419_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Elections Candidates (r:1 w:0)
+	// Storage: Elections Members (r:1 w:0)
+	// Storage: Elections RunnersUp (r:1 w:0)
+	// Storage: Elections Voting (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
 	fn vote_less(v: u32, ) -> Weight {
-		(68_162_000 as Weight)
-			// Standard Error: 9_000
-			.saturating_add((350_000 as Weight).saturating_mul(v as Weight))
+		(65_444_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((376_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Elections Voting (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
 	fn remove_voter() -> Weight {
-		(63_005_000 as Weight)
+		(61_585_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Elections Candidates (r:1 w:1)
+	// Storage: Elections Members (r:1 w:0)
+	// Storage: Elections RunnersUp (r:1 w:0)
 	fn submit_candidacy(c: u32, ) -> Weight {
-		(58_498_000 as Weight)
+		(53_333_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((305_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((267_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Elections Candidates (r:1 w:1)
 	fn renounce_candidacy_candidate(c: u32, ) -> Weight {
-		(52_062_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((173_000 as Weight).saturating_mul(c as Weight))
+		(49_128_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((144_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Elections Members (r:1 w:1)
+	// Storage: Elections RunnersUp (r:1 w:1)
+	// Storage: Instance1Collective Prime (r:1 w:1)
+	// Storage: Instance1Collective Proposals (r:1 w:0)
+	// Storage: Instance1Collective Members (r:0 w:1)
 	fn renounce_candidacy_members() -> Weight {
-		(73_234_000 as Weight)
+		(70_685_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
+	// Storage: Elections RunnersUp (r:1 w:1)
 	fn renounce_candidacy_runners_up() -> Weight {
-		(51_689_000 as Weight)
+		(49_766_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Elections RunnersUp (r:1 w:1)
+	// Storage: Elections Members (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Instance1Collective Prime (r:1 w:1)
+	// Storage: Instance1Collective Proposals (r:1 w:0)
+	// Storage: Instance1Collective Members (r:0 w:1)
 	fn remove_member_with_replacement() -> Weight {
-		(79_906_000 as Weight)
+		(76_153_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}
+	// Storage: Elections RunnersUp (r:1 w:0)
 	fn remove_member_wrong_refund() -> Weight {
-		(6_877_000 as Weight)
+		(6_697_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 	}
+	// Storage: Elections Voting (r:251 w:250)
+	// Storage: Elections Members (r:1 w:0)
+	// Storage: Elections RunnersUp (r:1 w:0)
+	// Storage: Elections Candidates (r:1 w:0)
+	// Storage: Balances Locks (r:250 w:250)
+	// Storage: System Account (r:250 w:250)
 	fn clean_defunct_voters(v: u32, _d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 39_000
-			.saturating_add((112_381_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 60_000
+			.saturating_add((107_467_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(v as Weight)))
 	}
+	// Storage: Elections Candidates (r:1 w:1)
+	// Storage: Elections Members (r:1 w:1)
+	// Storage: Elections RunnersUp (r:1 w:1)
+	// Storage: Elections Voting (r:502 w:0)
+	// Storage: Instance1Collective Proposals (r:1 w:0)
+	// Storage: Elections ElectionRounds (r:1 w:1)
+	// Storage: Instance1Collective Members (r:0 w:1)
+	// Storage: Instance1Collective Prime (r:0 w:1)
+	// Storage: System Account (r:2 w:2)
 	fn election_phragmen(c: u32, v: u32, e: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 1_789_000
-			.saturating_add((42_600_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 744_000
-			.saturating_add((60_743_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 50_000
-			.saturating_add((3_837_000 as Weight).saturating_mul(e as Weight))
+			// Standard Error: 1_846_000
+			.saturating_add((39_843_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 768_000
+			.saturating_add((60_623_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 52_000
+			.saturating_add((3_884_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(c as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(c as Weight)))
diff --git a/frame/gilt/src/weights.rs b/frame/gilt/src/weights.rs
index 7a12687260a7..f54d917cc160 100644
--- a/frame/gilt/src/weights.rs
+++ b/frame/gilt/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_gilt
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -58,51 +58,69 @@ pub trait WeightInfo {
 /// Weights for pallet_gilt using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	// Storage: Gilt Queues (r:1 w:1)
+	// Storage: Gilt QueueTotals (r:1 w:1)
 	fn place_bid(l: u32, ) -> Weight {
-		(60_401_000 as Weight)
+		(59_219_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((146_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add((156_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Gilt Queues (r:1 w:1)
+	// Storage: Gilt QueueTotals (r:1 w:1)
 	fn place_bid_max() -> Weight {
-		(178_653_000 as Weight)
+		(184_943_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Gilt Queues (r:1 w:1)
+	// Storage: Gilt QueueTotals (r:1 w:1)
 	fn retract_bid(l: u32, ) -> Weight {
-		(61_026_000 as Weight)
+		(59_352_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((119_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add((129_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Gilt ActiveTotal (r:1 w:1)
 	fn set_target() -> Weight {
-		(5_756_000 as Weight)
+		(5_444_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Gilt Active (r:1 w:1)
+	// Storage: Gilt ActiveTotal (r:1 w:1)
 	fn thaw() -> Weight {
-		(72_668_000 as Weight)
+		(71_399_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Gilt ActiveTotal (r:1 w:0)
 	fn pursue_target_noop() -> Weight {
-		(3_449_000 as Weight)
+		(3_044_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 	}
+	// Storage: Gilt ActiveTotal (r:1 w:1)
+	// Storage: Gilt QueueTotals (r:1 w:1)
+	// Storage: Gilt Queues (r:1 w:1)
+	// Storage: Gilt Active (r:0 w:1)
 	fn pursue_target_per_item(b: u32, ) -> Weight {
-		(58_182_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((10_005_000 as Weight).saturating_mul(b as Weight))
+		(54_478_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((10_150_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(b as Weight)))
 	}
+	// Storage: Gilt ActiveTotal (r:1 w:1)
+	// Storage: Gilt QueueTotals (r:1 w:1)
+	// Storage: Gilt Queues (r:1 w:1)
+	// Storage: Gilt Active (r:0 w:1)
 	fn pursue_target_per_queue(q: u32, ) -> Weight {
-		(21_740_000 as Weight)
+		(20_099_000 as Weight)
 			// Standard Error: 7_000
-			.saturating_add((16_849_000 as Weight).saturating_mul(q as Weight))
+			.saturating_add((16_603_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(q as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
@@ -112,51 +130,69 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
+	// Storage: Gilt Queues (r:1 w:1)
+	// Storage: Gilt QueueTotals (r:1 w:1)
 	fn place_bid(l: u32, ) -> Weight {
-		(60_401_000 as Weight)
+		(59_219_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((146_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add((156_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Gilt Queues (r:1 w:1)
+	// Storage: Gilt QueueTotals (r:1 w:1)
 	fn place_bid_max() -> Weight {
-		(178_653_000 as Weight)
+		(184_943_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Gilt Queues (r:1 w:1)
+	// Storage: Gilt QueueTotals (r:1 w:1)
 	fn retract_bid(l: u32, ) -> Weight {
-		(61_026_000 as Weight)
+		(59_352_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((119_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add((129_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Gilt ActiveTotal (r:1 w:1)
 	fn set_target() -> Weight {
-		(5_756_000 as Weight)
+		(5_444_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Gilt Active (r:1 w:1)
+	// Storage: Gilt ActiveTotal (r:1 w:1)
 	fn thaw() -> Weight {
-		(72_668_000 as Weight)
+		(71_399_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Gilt ActiveTotal (r:1 w:0)
 	fn pursue_target_noop() -> Weight {
-		(3_449_000 as Weight)
+		(3_044_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 	}
+	// Storage: Gilt ActiveTotal (r:1 w:1)
+	// Storage: Gilt QueueTotals (r:1 w:1)
+	// Storage: Gilt Queues (r:1 w:1)
+	// Storage: Gilt Active (r:0 w:1)
 	fn pursue_target_per_item(b: u32, ) -> Weight {
-		(58_182_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((10_005_000 as Weight).saturating_mul(b as Weight))
+		(54_478_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((10_150_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(b as Weight)))
 	}
+	// Storage: Gilt ActiveTotal (r:1 w:1)
+	// Storage: Gilt QueueTotals (r:1 w:1)
+	// Storage: Gilt Queues (r:1 w:1)
+	// Storage: Gilt Active (r:0 w:1)
 	fn pursue_target_per_queue(q: u32, ) -> Weight {
-		(21_740_000 as Weight)
+		(20_099_000 as Weight)
 			// Standard Error: 7_000
-			.saturating_add((16_849_000 as Weight).saturating_mul(q as Weight))
+			.saturating_add((16_603_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(q as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
diff --git a/frame/identity/src/weights.rs b/frame/identity/src/weights.rs
index b23df125c23b..611909f326ea 100644
--- a/frame/identity/src/weights.rs
+++ b/frame/identity/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_identity
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -66,136 +66,167 @@ pub trait WeightInfo {
 /// Weights for pallet_identity using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	// Storage: Identity Registrars (r:1 w:1)
 	fn add_registrar(r: u32, ) -> Weight {
-		(21_825_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((288_000 as Weight).saturating_mul(r as Weight))
+		(22_152_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((339_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Identity IdentityOf (r:1 w:1)
 	fn set_identity(r: u32, x: u32, ) -> Weight {
-		(53_354_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((274_000 as Weight).saturating_mul(r as Weight))
-			// Standard Error: 2_000
-			.saturating_add((939_000 as Weight).saturating_mul(x as Weight))
+		(53_017_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((279_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 1_000
+			.saturating_add((1_081_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Identity IdentityOf (r:1 w:0)
+	// Storage: Identity SubsOf (r:1 w:1)
+	// Storage: Identity SuperOf (r:1 w:1)
 	fn set_subs_new(s: u32, ) -> Weight {
-		(42_017_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((6_457_000 as Weight).saturating_mul(s as Weight))
+		(44_693_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((6_631_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
+	// Storage: Identity IdentityOf (r:1 w:0)
+	// Storage: Identity SubsOf (r:1 w:1)
+	// Storage: Identity SuperOf (r:0 w:1)
 	fn set_subs_old(p: u32, ) -> Weight {
-		(41_605_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((2_157_000 as Weight).saturating_mul(p as Weight))
+		(42_017_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((2_193_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
 	}
+	// Storage: Identity SubsOf (r:1 w:1)
+	// Storage: Identity IdentityOf (r:1 w:1)
+	// Storage: Identity SuperOf (r:0 w:100)
 	fn clear_identity(r: u32, s: u32, x: u32, ) -> Weight {
-		(51_811_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((202_000 as Weight).saturating_mul(r as Weight))
-			// Standard Error: 0
-			.saturating_add((2_157_000 as Weight).saturating_mul(s as Weight))
-			// Standard Error: 0
-			.saturating_add((618_000 as Weight).saturating_mul(x as Weight))
+		(50_989_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((258_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 1_000
+			.saturating_add((2_184_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 1_000
+			.saturating_add((579_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
+	// Storage: Identity Registrars (r:1 w:0)
+	// Storage: Identity IdentityOf (r:1 w:1)
 	fn request_judgement(r: u32, x: u32, ) -> Weight {
-		(54_657_000 as Weight)
+		(55_562_000 as Weight)
 			// Standard Error: 5_000
-			.saturating_add((381_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((317_000 as Weight).saturating_mul(r as Weight))
 			// Standard Error: 0
-			.saturating_add((1_153_000 as Weight).saturating_mul(x as Weight))
+			.saturating_add((1_137_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Identity IdentityOf (r:1 w:1)
 	fn cancel_request(r: u32, x: u32, ) -> Weight {
-		(50_895_000 as Weight)
+		(51_744_000 as Weight)
 			// Standard Error: 6_000
-			.saturating_add((267_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((192_000 as Weight).saturating_mul(r as Weight))
 			// Standard Error: 0
-			.saturating_add((1_141_000 as Weight).saturating_mul(x as Weight))
+			.saturating_add((1_131_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Identity Registrars (r:1 w:1)
 	fn set_fee(r: u32, ) -> Weight {
-		(8_036_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((281_000 as Weight).saturating_mul(r as Weight))
+		(9_472_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((321_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Identity Registrars (r:1 w:1)
 	fn set_account_id(r: u32, ) -> Weight {
-		(9_001_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((288_000 as Weight).saturating_mul(r as Weight))
+		(9_705_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((312_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Identity Registrars (r:1 w:1)
 	fn set_fields(r: u32, ) -> Weight {
-		(8_039_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((286_000 as Weight).saturating_mul(r as Weight))
+		(9_537_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((318_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Identity Registrars (r:1 w:0)
+	// Storage: Identity IdentityOf (r:1 w:1)
 	fn provide_judgement(r: u32, x: u32, ) -> Weight {
-		(35_746_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((346_000 as Weight).saturating_mul(r as Weight))
+		(36_298_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((284_000 as Weight).saturating_mul(r as Weight))
 			// Standard Error: 0
-			.saturating_add((1_164_000 as Weight).saturating_mul(x as Weight))
+			.saturating_add((1_141_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
-	fn kill_identity(r: u32, s: u32, x: u32, ) -> Weight {
-		(65_304_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((149_000 as Weight).saturating_mul(r as Weight))
-			// Standard Error: 0
-			.saturating_add((2_118_000 as Weight).saturating_mul(s as Weight))
-			// Standard Error: 0
-			.saturating_add((6_000 as Weight).saturating_mul(x as Weight))
+	// Storage: Identity SubsOf (r:1 w:1)
+	// Storage: Identity IdentityOf (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Identity SuperOf (r:0 w:100)
+	fn kill_identity(r: u32, s: u32, _x: u32, ) -> Weight {
+		(63_238_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((246_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 1_000
+			.saturating_add((2_184_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
+	// Storage: Identity IdentityOf (r:1 w:0)
+	// Storage: Identity SuperOf (r:1 w:1)
+	// Storage: Identity SubsOf (r:1 w:1)
 	fn add_sub(s: u32, ) -> Weight {
-		(55_491_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((220_000 as Weight).saturating_mul(s as Weight))
+		(57_394_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((208_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Identity IdentityOf (r:1 w:0)
+	// Storage: Identity SuperOf (r:1 w:1)
 	fn rename_sub(s: u32, ) -> Weight {
-		(17_564_000 as Weight)
+		(18_274_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((84_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((52_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Identity IdentityOf (r:1 w:0)
+	// Storage: Identity SuperOf (r:1 w:1)
+	// Storage: Identity SubsOf (r:1 w:1)
 	fn remove_sub(s: u32, ) -> Weight {
-		(56_535_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((209_000 as Weight).saturating_mul(s as Weight))
+		(58_184_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((195_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Identity SuperOf (r:1 w:1)
+	// Storage: Identity SubsOf (r:1 w:1)
 	fn quit_sub(s: u32, ) -> Weight {
-		(35_369_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((200_000 as Weight).saturating_mul(s as Weight))
+		(36_304_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((191_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
@@ -203,136 +234,167 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
+	// Storage: Identity Registrars (r:1 w:1)
 	fn add_registrar(r: u32, ) -> Weight {
-		(21_825_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((288_000 as Weight).saturating_mul(r as Weight))
+		(22_152_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((339_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Identity IdentityOf (r:1 w:1)
 	fn set_identity(r: u32, x: u32, ) -> Weight {
-		(53_354_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((274_000 as Weight).saturating_mul(r as Weight))
-			// Standard Error: 2_000
-			.saturating_add((939_000 as Weight).saturating_mul(x as Weight))
+		(53_017_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((279_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 1_000
+			.saturating_add((1_081_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Identity IdentityOf (r:1 w:0)
+	// Storage: Identity SubsOf (r:1 w:1)
+	// Storage: Identity SuperOf (r:1 w:1)
 	fn set_subs_new(s: u32, ) -> Weight {
-		(42_017_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((6_457_000 as Weight).saturating_mul(s as Weight))
+		(44_693_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((6_631_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
+	// Storage: Identity IdentityOf (r:1 w:0)
+	// Storage: Identity SubsOf (r:1 w:1)
+	// Storage: Identity SuperOf (r:0 w:1)
 	fn set_subs_old(p: u32, ) -> Weight {
-		(41_605_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((2_157_000 as Weight).saturating_mul(p as Weight))
+		(42_017_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((2_193_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
 	}
+	// Storage: Identity SubsOf (r:1 w:1)
+	// Storage: Identity IdentityOf (r:1 w:1)
+	// Storage: Identity SuperOf (r:0 w:100)
 	fn clear_identity(r: u32, s: u32, x: u32, ) -> Weight {
-		(51_811_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((202_000 as Weight).saturating_mul(r as Weight))
-			// Standard Error: 0
-			.saturating_add((2_157_000 as Weight).saturating_mul(s as Weight))
-			// Standard Error: 0
-			.saturating_add((618_000 as Weight).saturating_mul(x as Weight))
+		(50_989_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((258_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 1_000
+			.saturating_add((2_184_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 1_000
+			.saturating_add((579_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
+	// Storage: Identity Registrars (r:1 w:0)
+	// Storage: Identity IdentityOf (r:1 w:1)
 	fn request_judgement(r: u32, x: u32, ) -> Weight {
-		(54_657_000 as Weight)
+		(55_562_000 as Weight)
 			// Standard Error: 5_000
-			.saturating_add((381_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((317_000 as Weight).saturating_mul(r as Weight))
 			// Standard Error: 0
-			.saturating_add((1_153_000 as Weight).saturating_mul(x as Weight))
+			.saturating_add((1_137_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Identity IdentityOf (r:1 w:1)
 	fn cancel_request(r: u32, x: u32, ) -> Weight {
-		(50_895_000 as Weight)
+		(51_744_000 as Weight)
 			// Standard Error: 6_000
-			.saturating_add((267_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((192_000 as Weight).saturating_mul(r as Weight))
 			// Standard Error: 0
-			.saturating_add((1_141_000 as Weight).saturating_mul(x as Weight))
+			.saturating_add((1_131_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Identity Registrars (r:1 w:1)
 	fn set_fee(r: u32, ) -> Weight {
-		(8_036_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((281_000 as Weight).saturating_mul(r as Weight))
+		(9_472_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((321_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Identity Registrars (r:1 w:1)
 	fn set_account_id(r: u32, ) -> Weight {
-		(9_001_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((288_000 as Weight).saturating_mul(r as Weight))
+		(9_705_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((312_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Identity Registrars (r:1 w:1)
 	fn set_fields(r: u32, ) -> Weight {
-		(8_039_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((286_000 as Weight).saturating_mul(r as Weight))
+		(9_537_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((318_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Identity Registrars (r:1 w:0)
+	// Storage: Identity IdentityOf (r:1 w:1)
 	fn provide_judgement(r: u32, x: u32, ) -> Weight {
-		(35_746_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((346_000 as Weight).saturating_mul(r as Weight))
+		(36_298_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((284_000 as Weight).saturating_mul(r as Weight))
 			// Standard Error: 0
-			.saturating_add((1_164_000 as Weight).saturating_mul(x as Weight))
+			.saturating_add((1_141_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
-	fn kill_identity(r: u32, s: u32, x: u32, ) -> Weight {
-		(65_304_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((149_000 as Weight).saturating_mul(r as Weight))
-			// Standard Error: 0
-			.saturating_add((2_118_000 as Weight).saturating_mul(s as Weight))
-			// Standard Error: 0
-			.saturating_add((6_000 as Weight).saturating_mul(x as Weight))
+	// Storage: Identity SubsOf (r:1 w:1)
+	// Storage: Identity IdentityOf (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Identity SuperOf (r:0 w:100)
+	fn kill_identity(r: u32, s: u32, _x: u32, ) -> Weight {
+		(63_238_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((246_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 1_000
+			.saturating_add((2_184_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
+	// Storage: Identity IdentityOf (r:1 w:0)
+	// Storage: Identity SuperOf (r:1 w:1)
+	// Storage: Identity SubsOf (r:1 w:1)
 	fn add_sub(s: u32, ) -> Weight {
-		(55_491_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((220_000 as Weight).saturating_mul(s as Weight))
+		(57_394_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((208_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Identity IdentityOf (r:1 w:0)
+	// Storage: Identity SuperOf (r:1 w:1)
 	fn rename_sub(s: u32, ) -> Weight {
-		(17_564_000 as Weight)
+		(18_274_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((84_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((52_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Identity IdentityOf (r:1 w:0)
+	// Storage: Identity SuperOf (r:1 w:1)
+	// Storage: Identity SubsOf (r:1 w:1)
 	fn remove_sub(s: u32, ) -> Weight {
-		(56_535_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((209_000 as Weight).saturating_mul(s as Weight))
+		(58_184_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((195_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Identity SuperOf (r:1 w:1)
+	// Storage: Identity SubsOf (r:1 w:1)
 	fn quit_sub(s: u32, ) -> Weight {
-		(35_369_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((200_000 as Weight).saturating_mul(s as Weight))
+		(36_304_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((191_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
diff --git a/frame/im-online/src/weights.rs b/frame/im-online/src/weights.rs
index 5f04a3637d16..1eadd63cc9d6 100644
--- a/frame/im-online/src/weights.rs
+++ b/frame/im-online/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_im_online
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -51,12 +51,17 @@ pub trait WeightInfo {
 /// Weights for pallet_im_online using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	// Storage: Session Validators (r:1 w:0)
+	// Storage: Session CurrentIndex (r:1 w:0)
+	// Storage: ImOnline ReceivedHeartbeats (r:1 w:1)
+	// Storage: ImOnline AuthoredBlocks (r:1 w:0)
+	// Storage: ImOnline Keys (r:1 w:0)
 	fn validate_unsigned_and_then_heartbeat(k: u32, e: u32, ) -> Weight {
-		(97_166_000 as Weight)
+		(93_400_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((153_000 as Weight).saturating_mul(k as Weight))
-			// Standard Error: 1_000
-			.saturating_add((328_000 as Weight).saturating_mul(e as Weight))
+			.saturating_add((144_000 as Weight).saturating_mul(k as Weight))
+			// Standard Error: 0
+			.saturating_add((335_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -64,12 +69,17 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
+	// Storage: Session Validators (r:1 w:0)
+	// Storage: Session CurrentIndex (r:1 w:0)
+	// Storage: ImOnline ReceivedHeartbeats (r:1 w:1)
+	// Storage: ImOnline AuthoredBlocks (r:1 w:0)
+	// Storage: ImOnline Keys (r:1 w:0)
 	fn validate_unsigned_and_then_heartbeat(k: u32, e: u32, ) -> Weight {
-		(97_166_000 as Weight)
+		(93_400_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((144_000 as Weight).saturating_mul(k as Weight))
 			// Standard Error: 0
-			.saturating_add((153_000 as Weight).saturating_mul(k as Weight))
-			// Standard Error: 1_000
-			.saturating_add((328_000 as Weight).saturating_mul(e as Weight))
+			.saturating_add((335_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
diff --git a/frame/indices/src/weights.rs b/frame/indices/src/weights.rs
index 6c49615a8521..97db58973953 100644
--- a/frame/indices/src/weights.rs
+++ b/frame/indices/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_indices
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -55,28 +55,35 @@ pub trait WeightInfo {
 /// Weights for pallet_indices using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	// Storage: Indices Accounts (r:1 w:1)
 	fn claim() -> Weight {
-		(40_622_000 as Weight)
+		(38_814_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Indices Accounts (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn transfer() -> Weight {
-		(49_166_000 as Weight)
+		(47_274_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Indices Accounts (r:1 w:1)
 	fn free() -> Weight {
-		(40_802_000 as Weight)
+		(39_692_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Indices Accounts (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn force_transfer() -> Weight {
-		(41_423_000 as Weight)
+		(40_250_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Indices Accounts (r:1 w:1)
 	fn freeze() -> Weight {
-		(38_476_000 as Weight)
+		(37_358_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -84,28 +91,35 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
+	// Storage: Indices Accounts (r:1 w:1)
 	fn claim() -> Weight {
-		(40_622_000 as Weight)
+		(38_814_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Indices Accounts (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn transfer() -> Weight {
-		(49_166_000 as Weight)
+		(47_274_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Indices Accounts (r:1 w:1)
 	fn free() -> Weight {
-		(40_802_000 as Weight)
+		(39_692_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Indices Accounts (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn force_transfer() -> Weight {
-		(41_423_000 as Weight)
+		(40_250_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Indices Accounts (r:1 w:1)
 	fn freeze() -> Weight {
-		(38_476_000 as Weight)
+		(37_358_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
diff --git a/frame/lottery/src/weights.rs b/frame/lottery/src/weights.rs
index 038050c0fb40..5fbc61a32e57 100644
--- a/frame/lottery/src/weights.rs
+++ b/frame/lottery/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_lottery
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2021-07-14, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -56,34 +56,57 @@ pub trait WeightInfo {
 /// Weights for pallet_lottery using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	// Storage: Lottery Lottery (r:1 w:0)
+	// Storage: Lottery CallIndices (r:1 w:0)
+	// Storage: Lottery TicketsCount (r:1 w:1)
+	// Storage: Lottery Participants (r:1 w:1)
+	// Storage: Lottery LotteryIndex (r:1 w:0)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Lottery Tickets (r:0 w:1)
 	fn buy_ticket() -> Weight {
-		(74_856_000 as Weight)
+		(70_034_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
+	// Storage: Lottery CallIndices (r:0 w:1)
 	fn set_calls(n: u32, ) -> Weight {
-		(15_549_000 as Weight)
-			// Standard Error: 7_000
-			.saturating_add((281_000 as Weight).saturating_mul(n as Weight))
+		(15_243_000 as Weight)
+			// Standard Error: 8_000
+			.saturating_add((312_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Lottery Lottery (r:1 w:1)
+	// Storage: Lottery LotteryIndex (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn start_lottery() -> Weight {
-		(58_904_000 as Weight)
+		(57_312_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Lottery Lottery (r:1 w:1)
 	fn stop_repeat() -> Weight {
-		(7_714_000 as Weight)
+		(6_964_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: RandomnessCollectiveFlip RandomMaterial (r:1 w:0)
+	// Storage: Lottery Lottery (r:1 w:1)
+	// Storage: System Account (r:2 w:2)
+	// Storage: Lottery TicketsCount (r:1 w:1)
+	// Storage: Lottery Tickets (r:1 w:0)
 	fn on_initialize_end() -> Weight {
-		(117_420_000 as Weight)
+		(110_470_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
+	// Storage: RandomnessCollectiveFlip RandomMaterial (r:1 w:0)
+	// Storage: Lottery Lottery (r:1 w:1)
+	// Storage: System Account (r:2 w:2)
+	// Storage: Lottery TicketsCount (r:1 w:1)
+	// Storage: Lottery Tickets (r:1 w:0)
+	// Storage: Lottery LotteryIndex (r:1 w:1)
 	fn on_initialize_repeat() -> Weight {
-		(123_035_000 as Weight)
+		(114_794_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
@@ -91,34 +114,57 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
+	// Storage: Lottery Lottery (r:1 w:0)
+	// Storage: Lottery CallIndices (r:1 w:0)
+	// Storage: Lottery TicketsCount (r:1 w:1)
+	// Storage: Lottery Participants (r:1 w:1)
+	// Storage: Lottery LotteryIndex (r:1 w:0)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Lottery Tickets (r:0 w:1)
 	fn buy_ticket() -> Weight {
-		(74_856_000 as Weight)
+		(70_034_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
+	// Storage: Lottery CallIndices (r:0 w:1)
 	fn set_calls(n: u32, ) -> Weight {
-		(15_549_000 as Weight)
-			// Standard Error: 7_000
-			.saturating_add((281_000 as Weight).saturating_mul(n as Weight))
+		(15_243_000 as Weight)
+			// Standard Error: 8_000
+			.saturating_add((312_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Lottery Lottery (r:1 w:1)
+	// Storage: Lottery LotteryIndex (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn start_lottery() -> Weight {
-		(58_904_000 as Weight)
+		(57_312_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Lottery Lottery (r:1 w:1)
 	fn stop_repeat() -> Weight {
-		(7_714_000 as Weight)
+		(6_964_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: RandomnessCollectiveFlip RandomMaterial (r:1 w:0)
+	// Storage: Lottery Lottery (r:1 w:1)
+	// Storage: System Account (r:2 w:2)
+	// Storage: Lottery TicketsCount (r:1 w:1)
+	// Storage: Lottery Tickets (r:1 w:0)
 	fn on_initialize_end() -> Weight {
-		(117_420_000 as Weight)
+		(110_470_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
+	// Storage: RandomnessCollectiveFlip RandomMaterial (r:1 w:0)
+	// Storage: Lottery Lottery (r:1 w:1)
+	// Storage: System Account (r:2 w:2)
+	// Storage: Lottery TicketsCount (r:1 w:1)
+	// Storage: Lottery Tickets (r:1 w:0)
+	// Storage: Lottery LotteryIndex (r:1 w:1)
 	fn on_initialize_repeat() -> Weight {
-		(123_035_000 as Weight)
+		(114_794_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}
diff --git a/frame/membership/src/weights.rs b/frame/membership/src/weights.rs
index bd2a09cb534c..81a1b073faac 100644
--- a/frame/membership/src/weights.rs
+++ b/frame/membership/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_membership
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -57,104 +57,162 @@ pub trait WeightInfo {
 /// Weights for pallet_membership using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	// Storage: Instance1Membership Members (r:1 w:1)
+	// Storage: Instance2Collective Proposals (r:1 w:0)
+	// Storage: Instance2Collective Members (r:0 w:1)
+	// Storage: Instance2Collective Prime (r:0 w:1)
 	fn add_member(m: u32, ) -> Weight {
-		(24_309_000 as Weight)
+		(23_668_000 as Weight)
 			// Standard Error: 3_000
-			.saturating_add((147_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((142_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Instance1Membership Members (r:1 w:1)
+	// Storage: Instance2Collective Proposals (r:1 w:0)
+	// Storage: Instance1Membership Prime (r:1 w:0)
+	// Storage: Instance2Collective Members (r:0 w:1)
+	// Storage: Instance2Collective Prime (r:0 w:1)
 	fn remove_member(m: u32, ) -> Weight {
-		(29_722_000 as Weight)
+		(29_149_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((119_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((111_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Instance1Membership Members (r:1 w:1)
+	// Storage: Instance2Collective Proposals (r:1 w:0)
+	// Storage: Instance1Membership Prime (r:1 w:0)
+	// Storage: Instance2Collective Members (r:0 w:1)
+	// Storage: Instance2Collective Prime (r:0 w:1)
 	fn swap_member(m: u32, ) -> Weight {
-		(30_239_000 as Weight)
+		(29_289_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((132_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((126_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Instance1Membership Members (r:1 w:1)
+	// Storage: Instance2Collective Proposals (r:1 w:0)
+	// Storage: Instance1Membership Prime (r:1 w:0)
+	// Storage: Instance2Collective Members (r:0 w:1)
+	// Storage: Instance2Collective Prime (r:0 w:1)
 	fn reset_member(m: u32, ) -> Weight {
-		(31_302_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((289_000 as Weight).saturating_mul(m as Weight))
+		(30_178_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((286_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Instance1Membership Members (r:1 w:1)
+	// Storage: Instance2Collective Proposals (r:1 w:0)
+	// Storage: Instance1Membership Prime (r:1 w:1)
+	// Storage: Instance2Collective Members (r:0 w:1)
+	// Storage: Instance2Collective Prime (r:0 w:1)
 	fn change_key(m: u32, ) -> Weight {
-		(31_967_000 as Weight)
+		(31_049_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((130_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((121_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
+	// Storage: Instance1Membership Members (r:1 w:0)
+	// Storage: Instance1Membership Prime (r:0 w:1)
+	// Storage: Instance2Collective Prime (r:0 w:1)
 	fn set_prime(m: u32, ) -> Weight {
-		(8_083_000 as Weight)
+		(8_006_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((91_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((89_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Instance1Membership Prime (r:0 w:1)
+	// Storage: Instance2Collective Prime (r:0 w:1)
 	fn clear_prime(m: u32, ) -> Weight {
-		(3_360_000 as Weight)
+		(3_452_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((1_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((2_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
+	// Storage: Instance1Membership Members (r:1 w:1)
+	// Storage: Instance2Collective Proposals (r:1 w:0)
+	// Storage: Instance2Collective Members (r:0 w:1)
+	// Storage: Instance2Collective Prime (r:0 w:1)
 	fn add_member(m: u32, ) -> Weight {
-		(24_309_000 as Weight)
+		(23_668_000 as Weight)
 			// Standard Error: 3_000
-			.saturating_add((147_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((142_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Instance1Membership Members (r:1 w:1)
+	// Storage: Instance2Collective Proposals (r:1 w:0)
+	// Storage: Instance1Membership Prime (r:1 w:0)
+	// Storage: Instance2Collective Members (r:0 w:1)
+	// Storage: Instance2Collective Prime (r:0 w:1)
 	fn remove_member(m: u32, ) -> Weight {
-		(29_722_000 as Weight)
+		(29_149_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((119_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((111_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Instance1Membership Members (r:1 w:1)
+	// Storage: Instance2Collective Proposals (r:1 w:0)
+	// Storage: Instance1Membership Prime (r:1 w:0)
+	// Storage: Instance2Collective Members (r:0 w:1)
+	// Storage: Instance2Collective Prime (r:0 w:1)
 	fn swap_member(m: u32, ) -> Weight {
-		(30_239_000 as Weight)
+		(29_289_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((132_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((126_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Instance1Membership Members (r:1 w:1)
+	// Storage: Instance2Collective Proposals (r:1 w:0)
+	// Storage: Instance1Membership Prime (r:1 w:0)
+	// Storage: Instance2Collective Members (r:0 w:1)
+	// Storage: Instance2Collective Prime (r:0 w:1)
 	fn reset_member(m: u32, ) -> Weight {
-		(31_302_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((289_000 as Weight).saturating_mul(m as Weight))
+		(30_178_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((286_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Instance1Membership Members (r:1 w:1)
+	// Storage: Instance2Collective Proposals (r:1 w:0)
+	// Storage: Instance1Membership Prime (r:1 w:1)
+	// Storage: Instance2Collective Members (r:0 w:1)
+	// Storage: Instance2Collective Prime (r:0 w:1)
 	fn change_key(m: u32, ) -> Weight {
-		(31_967_000 as Weight)
+		(31_049_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((130_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((121_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
+	// Storage: Instance1Membership Members (r:1 w:0)
+	// Storage: Instance1Membership Prime (r:0 w:1)
+	// Storage: Instance2Collective Prime (r:0 w:1)
 	fn set_prime(m: u32, ) -> Weight {
-		(8_083_000 as Weight)
+		(8_006_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((91_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((89_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Instance1Membership Prime (r:0 w:1)
+	// Storage: Instance2Collective Prime (r:0 w:1)
 	fn clear_prime(m: u32, ) -> Weight {
-		(3_360_000 as Weight)
+		(3_452_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((1_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((2_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 }
diff --git a/frame/multisig/src/weights.rs b/frame/multisig/src/weights.rs
index ce111911bbd2..1bc72d251808 100644
--- a/frame/multisig/src/weights.rs
+++ b/frame/multisig/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_multisig
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -60,79 +60,101 @@ pub trait WeightInfo {
 /// Weights for pallet_multisig using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
-	fn as_multi_threshold_1(_z: u32, ) -> Weight {
-		(14_411_000 as Weight)
+	fn as_multi_threshold_1(z: u32, ) -> Weight {
+		(19_405_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
 	}
+	// Storage: Multisig Multisigs (r:1 w:1)
+	// Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
 	fn as_multi_create(s: u32, z: u32, ) -> Weight {
-		(54_200_000 as Weight)
+		(54_364_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((127_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((163_000 as Weight).saturating_mul(s as Weight))
 			// Standard Error: 0
-			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
+			.saturating_add((2_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Multisig Multisigs (r:1 w:1)
+	// Storage: Multisig Calls (r:1 w:1)
+	// Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
 	fn as_multi_create_store(s: u32, z: u32, ) -> Weight {
-		(60_502_000 as Weight)
+		(59_545_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((128_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((168_000 as Weight).saturating_mul(s as Weight))
 			// Standard Error: 0
-			.saturating_add((2_000 as Weight).saturating_mul(z as Weight))
+			.saturating_add((3_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Multisig Multisigs (r:1 w:1)
 	fn as_multi_approve(s: u32, z: u32, ) -> Weight {
-		(32_075_000 as Weight)
+		(32_721_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((132_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((176_000 as Weight).saturating_mul(s as Weight))
 			// Standard Error: 0
-			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
+			.saturating_add((2_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Multisig Multisigs (r:1 w:1)
+	// Storage: Multisig Calls (r:1 w:1)
 	fn as_multi_approve_store(s: u32, z: u32, ) -> Weight {
-		(57_742_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((141_000 as Weight).saturating_mul(s as Weight))
+		(56_596_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((183_000 as Weight).saturating_mul(s as Weight))
 			// Standard Error: 0
-			.saturating_add((2_000 as Weight).saturating_mul(z as Weight))
+			.saturating_add((3_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Multisig Multisigs (r:1 w:1)
+	// Storage: Multisig Calls (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn as_multi_complete(s: u32, z: u32, ) -> Weight {
-		(73_503_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((246_000 as Weight).saturating_mul(s as Weight))
+		(72_391_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((268_000 as Weight).saturating_mul(s as Weight))
 			// Standard Error: 0
 			.saturating_add((4_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Multisig Multisigs (r:1 w:1)
+	// Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
 	fn approve_as_multi_create(s: u32, ) -> Weight {
-		(53_659_000 as Weight)
+		(52_543_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((133_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((164_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Multisig Multisigs (r:1 w:1)
+	// Storage: Multisig Calls (r:1 w:0)
 	fn approve_as_multi_approve(s: u32, ) -> Weight {
-		(31_353_000 as Weight)
+		(30_764_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((136_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((180_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Multisig Multisigs (r:1 w:1)
+	// Storage: Multisig Calls (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn approve_as_multi_complete(s: u32, ) -> Weight {
-		(125_011_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((247_000 as Weight).saturating_mul(s as Weight))
+		(113_631_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((283_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Multisig Multisigs (r:1 w:1)
+	// Storage: Multisig Calls (r:1 w:1)
 	fn cancel_as_multi(s: u32, ) -> Weight {
-		(92_318_000 as Weight)
+		(86_310_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((128_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((166_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
@@ -140,79 +162,101 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
-	fn as_multi_threshold_1(_z: u32, ) -> Weight {
-		(14_411_000 as Weight)
+	fn as_multi_threshold_1(z: u32, ) -> Weight {
+		(19_405_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
 	}
+	// Storage: Multisig Multisigs (r:1 w:1)
+	// Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
 	fn as_multi_create(s: u32, z: u32, ) -> Weight {
-		(54_200_000 as Weight)
+		(54_364_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((127_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((163_000 as Weight).saturating_mul(s as Weight))
 			// Standard Error: 0
-			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
+			.saturating_add((2_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Multisig Multisigs (r:1 w:1)
+	// Storage: Multisig Calls (r:1 w:1)
+	// Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
 	fn as_multi_create_store(s: u32, z: u32, ) -> Weight {
-		(60_502_000 as Weight)
+		(59_545_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((128_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((168_000 as Weight).saturating_mul(s as Weight))
 			// Standard Error: 0
-			.saturating_add((2_000 as Weight).saturating_mul(z as Weight))
+			.saturating_add((3_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Multisig Multisigs (r:1 w:1)
 	fn as_multi_approve(s: u32, z: u32, ) -> Weight {
-		(32_075_000 as Weight)
+		(32_721_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((132_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((176_000 as Weight).saturating_mul(s as Weight))
 			// Standard Error: 0
-			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
+			.saturating_add((2_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Multisig Multisigs (r:1 w:1)
+	// Storage: Multisig Calls (r:1 w:1)
 	fn as_multi_approve_store(s: u32, z: u32, ) -> Weight {
-		(57_742_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((141_000 as Weight).saturating_mul(s as Weight))
+		(56_596_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((183_000 as Weight).saturating_mul(s as Weight))
 			// Standard Error: 0
-			.saturating_add((2_000 as Weight).saturating_mul(z as Weight))
+			.saturating_add((3_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Multisig Multisigs (r:1 w:1)
+	// Storage: Multisig Calls (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn as_multi_complete(s: u32, z: u32, ) -> Weight {
-		(73_503_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((246_000 as Weight).saturating_mul(s as Weight))
+		(72_391_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((268_000 as Weight).saturating_mul(s as Weight))
 			// Standard Error: 0
 			.saturating_add((4_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Multisig Multisigs (r:1 w:1)
+	// Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
 	fn approve_as_multi_create(s: u32, ) -> Weight {
-		(53_659_000 as Weight)
+		(52_543_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((133_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((164_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Multisig Multisigs (r:1 w:1)
+	// Storage: Multisig Calls (r:1 w:0)
 	fn approve_as_multi_approve(s: u32, ) -> Weight {
-		(31_353_000 as Weight)
+		(30_764_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((136_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((180_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Multisig Multisigs (r:1 w:1)
+	// Storage: Multisig Calls (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn approve_as_multi_complete(s: u32, ) -> Weight {
-		(125_011_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((247_000 as Weight).saturating_mul(s as Weight))
+		(113_631_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((283_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Multisig Multisigs (r:1 w:1)
+	// Storage: Multisig Calls (r:1 w:1)
 	fn cancel_as_multi(s: u32, ) -> Weight {
-		(92_318_000 as Weight)
+		(86_310_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((128_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((166_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
diff --git a/frame/proxy/src/weights.rs b/frame/proxy/src/weights.rs
index 872c7b79fb60..41aa3034bece 100644
--- a/frame/proxy/src/weights.rs
+++ b/frame/proxy/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_proxy
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -60,80 +60,93 @@ pub trait WeightInfo {
 /// Weights for pallet_proxy using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	// Storage: Proxy Proxies (r:1 w:0)
 	fn proxy(p: u32, ) -> Weight {
-		(22_645_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((162_000 as Weight).saturating_mul(p as Weight))
+		(23_213_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((153_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 	}
+	// Storage: Proxy Proxies (r:1 w:0)
+	// Storage: Proxy Announcements (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn proxy_announced(a: u32, p: u32, ) -> Weight {
-		(53_259_000 as Weight)
+		(53_286_000 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((543_000 as Weight).saturating_mul(a as Weight))
+			.saturating_add((549_000 as Weight).saturating_mul(a as Weight))
 			// Standard Error: 2_000
-			.saturating_add((153_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((138_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
-	fn remove_announcement(a: u32, p: u32, ) -> Weight {
-		(37_983_000 as Weight)
+	// Storage: Proxy Announcements (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	fn remove_announcement(a: u32, _p: u32, ) -> Weight {
+		(36_864_000 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((545_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 2_000
-			.saturating_add((4_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((550_000 as Weight).saturating_mul(a as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
-	fn reject_announcement(a: u32, p: u32, ) -> Weight {
-		(37_922_000 as Weight)
+	// Storage: Proxy Announcements (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	fn reject_announcement(a: u32, _p: u32, ) -> Weight {
+		(36_755_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((541_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 2_000
-			.saturating_add((6_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((550_000 as Weight).saturating_mul(a as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Proxy Proxies (r:1 w:0)
+	// Storage: Proxy Announcements (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn announce(a: u32, p: u32, ) -> Weight {
-		(51_355_000 as Weight)
+		(50_765_000 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((534_000 as Weight).saturating_mul(a as Weight))
+			.saturating_add((547_000 as Weight).saturating_mul(a as Weight))
 			// Standard Error: 2_000
-			.saturating_add((148_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((141_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Proxy Proxies (r:1 w:1)
 	fn add_proxy(p: u32, ) -> Weight {
-		(35_798_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((228_000 as Weight).saturating_mul(p as Weight))
+		(35_556_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((211_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Proxy Proxies (r:1 w:1)
 	fn remove_proxy(p: u32, ) -> Weight {
-		(35_554_000 as Weight)
+		(35_284_000 as Weight)
 			// Standard Error: 3_000
-			.saturating_add((250_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((229_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Proxy Proxies (r:1 w:1)
 	fn remove_proxies(p: u32, ) -> Weight {
-		(33_911_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((165_000 as Weight).saturating_mul(p as Weight))
+		(34_449_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((146_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
+	// Storage: Proxy Proxies (r:1 w:1)
 	fn anonymous(p: u32, ) -> Weight {
-		(48_695_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((53_000 as Weight).saturating_mul(p as Weight))
+		(49_149_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((15_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Proxy Proxies (r:1 w:1)
 	fn kill_anonymous(p: u32, ) -> Weight {
-		(35_904_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((159_000 as Weight).saturating_mul(p as Weight))
+		(36_399_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((152_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -141,80 +154,93 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
+	// Storage: Proxy Proxies (r:1 w:0)
 	fn proxy(p: u32, ) -> Weight {
-		(22_645_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((162_000 as Weight).saturating_mul(p as Weight))
+		(23_213_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((153_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 	}
+	// Storage: Proxy Proxies (r:1 w:0)
+	// Storage: Proxy Announcements (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn proxy_announced(a: u32, p: u32, ) -> Weight {
-		(53_259_000 as Weight)
+		(53_286_000 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((543_000 as Weight).saturating_mul(a as Weight))
+			.saturating_add((549_000 as Weight).saturating_mul(a as Weight))
 			// Standard Error: 2_000
-			.saturating_add((153_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((138_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
-	fn remove_announcement(a: u32, p: u32, ) -> Weight {
-		(37_983_000 as Weight)
+	// Storage: Proxy Announcements (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	fn remove_announcement(a: u32, _p: u32, ) -> Weight {
+		(36_864_000 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((545_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 2_000
-			.saturating_add((4_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((550_000 as Weight).saturating_mul(a as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
-	fn reject_announcement(a: u32, p: u32, ) -> Weight {
-		(37_922_000 as Weight)
+	// Storage: Proxy Announcements (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	fn reject_announcement(a: u32, _p: u32, ) -> Weight {
+		(36_755_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((541_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 2_000
-			.saturating_add((6_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((550_000 as Weight).saturating_mul(a as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Proxy Proxies (r:1 w:0)
+	// Storage: Proxy Announcements (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn announce(a: u32, p: u32, ) -> Weight {
-		(51_355_000 as Weight)
+		(50_765_000 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((534_000 as Weight).saturating_mul(a as Weight))
+			.saturating_add((547_000 as Weight).saturating_mul(a as Weight))
 			// Standard Error: 2_000
-			.saturating_add((148_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((141_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Proxy Proxies (r:1 w:1)
 	fn add_proxy(p: u32, ) -> Weight {
-		(35_798_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((228_000 as Weight).saturating_mul(p as Weight))
+		(35_556_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((211_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Proxy Proxies (r:1 w:1)
 	fn remove_proxy(p: u32, ) -> Weight {
-		(35_554_000 as Weight)
+		(35_284_000 as Weight)
 			// Standard Error: 3_000
-			.saturating_add((250_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((229_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Proxy Proxies (r:1 w:1)
 	fn remove_proxies(p: u32, ) -> Weight {
-		(33_911_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((165_000 as Weight).saturating_mul(p as Weight))
+		(34_449_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((146_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
+	// Storage: Proxy Proxies (r:1 w:1)
 	fn anonymous(p: u32, ) -> Weight {
-		(48_695_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((53_000 as Weight).saturating_mul(p as Weight))
+		(49_149_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((15_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Proxy Proxies (r:1 w:1)
 	fn kill_anonymous(p: u32, ) -> Weight {
-		(35_904_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((159_000 as Weight).saturating_mul(p as Weight))
+		(36_399_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((152_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
diff --git a/frame/scheduler/src/weights.rs b/frame/scheduler/src/weights.rs
index 854cd5a525ce..d83aefdc453a 100644
--- a/frame/scheduler/src/weights.rs
+++ b/frame/scheduler/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_scheduler
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -54,31 +54,38 @@ pub trait WeightInfo {
 /// Weights for pallet_scheduler using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	// Storage: Scheduler Agenda (r:1 w:1)
 	fn schedule(s: u32, ) -> Weight {
-		(24_811_000 as Weight)
+		(24_730_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((116_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((77_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Scheduler Agenda (r:1 w:1)
+	// Storage: Scheduler Lookup (r:0 w:1)
 	fn cancel(s: u32, ) -> Weight {
-		(23_851_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((1_439_000 as Weight).saturating_mul(s as Weight))
+		(23_272_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((1_261_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Scheduler Lookup (r:1 w:1)
+	// Storage: Scheduler Agenda (r:1 w:1)
 	fn schedule_named(s: u32, ) -> Weight {
-		(31_096_000 as Weight)
+		(30_971_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((141_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((96_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Scheduler Lookup (r:1 w:1)
+	// Storage: Scheduler Agenda (r:1 w:1)
 	fn cancel_named(s: u32, ) -> Weight {
-		(26_715_000 as Weight)
+		(25_778_000 as Weight)
 			// Standard Error: 4_000
-			.saturating_add((1_455_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((1_270_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
@@ -86,31 +93,38 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
+	// Storage: Scheduler Agenda (r:1 w:1)
 	fn schedule(s: u32, ) -> Weight {
-		(24_811_000 as Weight)
+		(24_730_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((116_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((77_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Scheduler Agenda (r:1 w:1)
+	// Storage: Scheduler Lookup (r:0 w:1)
 	fn cancel(s: u32, ) -> Weight {
-		(23_851_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((1_439_000 as Weight).saturating_mul(s as Weight))
+		(23_272_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((1_261_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Scheduler Lookup (r:1 w:1)
+	// Storage: Scheduler Agenda (r:1 w:1)
 	fn schedule_named(s: u32, ) -> Weight {
-		(31_096_000 as Weight)
+		(30_971_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((141_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((96_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Scheduler Lookup (r:1 w:1)
+	// Storage: Scheduler Agenda (r:1 w:1)
 	fn cancel_named(s: u32, ) -> Weight {
-		(26_715_000 as Weight)
+		(25_778_000 as Weight)
 			// Standard Error: 4_000
-			.saturating_add((1_455_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((1_270_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
diff --git a/frame/session/src/weights.rs b/frame/session/src/weights.rs
index ad722fdec159..64e7ac19ea7a 100644
--- a/frame/session/src/weights.rs
+++ b/frame/session/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_session
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -52,13 +52,19 @@ pub trait WeightInfo {
 /// Weights for pallet_session using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	// Storage: Staking Ledger (r:1 w:0)
+	// Storage: Session NextKeys (r:1 w:1)
+	// Storage: Session KeyOwner (r:4 w:4)
 	fn set_keys() -> Weight {
-		(70_351_000 as Weight)
+		(64_427_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
+	// Storage: Staking Ledger (r:1 w:0)
+	// Storage: Session NextKeys (r:1 w:1)
+	// Storage: Session KeyOwner (r:0 w:4)
 	fn purge_keys() -> Weight {
-		(45_866_000 as Weight)
+		(42_497_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
@@ -66,13 +72,19 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
+	// Storage: Staking Ledger (r:1 w:0)
+	// Storage: Session NextKeys (r:1 w:1)
+	// Storage: Session KeyOwner (r:4 w:4)
 	fn set_keys() -> Weight {
-		(70_351_000 as Weight)
+		(64_427_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}
+	// Storage: Staking Ledger (r:1 w:0)
+	// Storage: Session NextKeys (r:1 w:1)
+	// Storage: Session KeyOwner (r:0 w:4)
 	fn purge_keys() -> Weight {
-		(45_866_000 as Weight)
+		(42_497_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}
diff --git a/frame/staking/src/weights.rs b/frame/staking/src/weights.rs
index fb4ed160d832..5d8090144fb9 100644
--- a/frame/staking/src/weights.rs
+++ b/frame/staking/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_staking
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2021-07-31, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -78,281 +78,281 @@ pub trait WeightInfo {
 /// Weights for pallet_staking using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
-	// Storage: Staking CurrentEra (r:1 w:0)
-	// Storage: Balances Locks (r:1 w:1)
 	// Storage: Staking Bonded (r:1 w:1)
-	// Storage: Staking HistoryDepth (r:1 w:0)
 	// Storage: Staking Ledger (r:1 w:1)
+	// Storage: Staking CurrentEra (r:1 w:0)
+	// Storage: Staking HistoryDepth (r:1 w:0)
+	// Storage: Balances Locks (r:1 w:1)
 	// Storage: Staking Payee (r:0 w:1)
 	fn bond() -> Weight {
-		(77_492_000 as Weight)
+		(72_423_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
-	// Storage: Staking Ledger (r:1 w:1)
 	// Storage: Staking Bonded (r:1 w:0)
+	// Storage: Staking Ledger (r:1 w:1)
 	// Storage: Balances Locks (r:1 w:1)
 	fn bond_extra() -> Weight {
-		(59_476_000 as Weight)
+		(56_157_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
-	// Storage: Staking CurrentEra (r:1 w:0)
 	// Storage: Staking Ledger (r:1 w:1)
 	// Storage: Staking Nominators (r:1 w:0)
+	// Storage: Staking Validators (r:1 w:0)
+	// Storage: Staking CurrentEra (r:1 w:0)
 	// Storage: Balances Locks (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
-	// Storage: Staking Validators (r:1 w:0)
 	fn unbond() -> Weight {
-		(63_655_000 as Weight)
+		(59_039_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
-	// Storage: Balances Locks (r:1 w:1)
 	// Storage: Staking Ledger (r:1 w:1)
 	// Storage: Staking CurrentEra (r:1 w:0)
+	// Storage: Balances Locks (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn withdraw_unbonded_update(s: u32, ) -> Weight {
-		(54_534_000 as Weight)
+		(51_503_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((24_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((59_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
-	// Storage: Staking CurrentEra (r:1 w:0)
-	// Storage: Balances Locks (r:1 w:1)
-	// Storage: Staking Nominators (r:1 w:0)
 	// Storage: Staking Ledger (r:1 w:1)
+	// Storage: Staking CurrentEra (r:1 w:0)
 	// Storage: Staking Bonded (r:1 w:1)
-	// Storage: Staking Validators (r:1 w:0)
-	// Storage: Staking Payee (r:0 w:1)
 	// Storage: Staking SlashingSpans (r:1 w:0)
+	// Storage: Staking Validators (r:1 w:0)
+	// Storage: Staking Nominators (r:1 w:0)
 	// Storage: System Account (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
+	// Storage: Staking Payee (r:0 w:1)
 	// Storage: Staking SpanSlash (r:0 w:2)
 	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
-		(89_850_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((2_396_000 as Weight).saturating_mul(s as Weight))
+		(84_211_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((2_391_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(8 as Weight))
 			.saturating_add(T::DbWeight::get().writes(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
-	// Storage: Staking MaxValidatorsCount (r:1 w:0)
-	// Storage: Staking MinValidatorBond (r:1 w:0)
 	// Storage: Staking Ledger (r:1 w:0)
-	// Storage: Staking Nominators (r:1 w:0)
+	// Storage: Staking MinValidatorBond (r:1 w:0)
 	// Storage: Staking Validators (r:1 w:1)
+	// Storage: Staking MaxValidatorsCount (r:1 w:0)
+	// Storage: Staking Nominators (r:1 w:0)
 	// Storage: Staking CounterForValidators (r:1 w:1)
 	fn validate() -> Weight {
-		(36_726_000 as Weight)
+		(34_206_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	// Storage: Staking Ledger (r:1 w:0)
 	// Storage: Staking Nominators (r:1 w:1)
 	fn kick(k: u32, ) -> Weight {
-		(19_497_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((17_057_000 as Weight).saturating_mul(k as Weight))
+		(22_863_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((16_208_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(k as Weight)))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	// Storage: Staking Ledger (r:1 w:0)
 	// Storage: Staking MinNominatorBond (r:1 w:0)
-	// Storage: Staking CounterForNominators (r:1 w:1)
-	// Storage: Staking CurrentEra (r:1 w:0)
 	// Storage: Staking Nominators (r:1 w:1)
-	// Storage: Staking Validators (r:2 w:0)
 	// Storage: Staking MaxNominatorsCount (r:1 w:0)
+	// Storage: Staking Validators (r:2 w:0)
+	// Storage: Staking CurrentEra (r:1 w:0)
+	// Storage: Staking CounterForNominators (r:1 w:1)
 	fn nominate(n: u32, ) -> Weight {
-		(45_146_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((5_527_000 as Weight).saturating_mul(n as Weight))
+		(41_047_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((5_611_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
-	// Storage: Staking Validators (r:1 w:0)
 	// Storage: Staking Ledger (r:1 w:0)
+	// Storage: Staking Validators (r:1 w:0)
 	// Storage: Staking Nominators (r:1 w:0)
 	fn chill() -> Weight {
-		(18_986_000 as Weight)
+		(17_489_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 	}
-	// Storage: Staking Payee (r:0 w:1)
 	// Storage: Staking Ledger (r:1 w:0)
+	// Storage: Staking Payee (r:0 w:1)
 	fn set_payee() -> Weight {
-		(13_348_000 as Weight)
+		(13_384_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Staking Bonded (r:1 w:1)
 	// Storage: Staking Ledger (r:2 w:2)
 	fn set_controller() -> Weight {
-		(28_148_000 as Weight)
+		(27_863_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	// Storage: Staking ValidatorCount (r:0 w:1)
 	fn set_validator_count() -> Weight {
-		(2_909_000 as Weight)
+		(2_468_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Staking ForceEra (r:0 w:1)
 	fn force_no_eras() -> Weight {
-		(3_163_000 as Weight)
+		(2_798_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Staking ForceEra (r:0 w:1)
 	fn force_new_era() -> Weight {
-		(3_141_000 as Weight)
+		(2_763_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Staking ForceEra (r:0 w:1)
 	fn force_new_era_always() -> Weight {
-		(3_220_000 as Weight)
+		(2_707_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Staking Invulnerables (r:0 w:1)
 	fn set_invulnerables(v: u32, ) -> Weight {
-		(3_569_000 as Weight)
+		(3_353_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((58_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((56_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
-	// Storage: Balances Locks (r:1 w:1)
-	// Storage: System Account (r:1 w:1)
-	// Storage: Staking Nominators (r:1 w:0)
-	// Storage: Staking Payee (r:0 w:1)
 	// Storage: Staking Bonded (r:1 w:1)
-	// Storage: Staking Validators (r:1 w:0)
 	// Storage: Staking SlashingSpans (r:1 w:0)
+	// Storage: Staking Validators (r:1 w:0)
+	// Storage: Staking Nominators (r:1 w:0)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
 	// Storage: Staking Ledger (r:0 w:1)
+	// Storage: Staking Payee (r:0 w:1)
 	// Storage: Staking SpanSlash (r:0 w:2)
 	fn force_unstake(s: u32, ) -> Weight {
-		(65_753_000 as Weight)
+		(60_682_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((2_420_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((2_384_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	// Storage: Staking UnappliedSlashes (r:1 w:1)
 	fn cancel_deferred_slash(s: u32, ) -> Weight {
-		(3_056_514_000 as Weight)
-			// Standard Error: 218_000
-			.saturating_add((21_159_000 as Weight).saturating_mul(s as Weight))
+		(3_368_335_000 as Weight)
+			// Standard Error: 221_000
+			.saturating_add((19_815_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
-	// Storage: Staking Bonded (r:2 w:0)
-	// Storage: Staking Ledger (r:1 w:1)
 	// Storage: Staking CurrentEra (r:1 w:0)
-	// Storage: Staking ErasRewardPoints (r:1 w:0)
-	// Storage: Staking ErasValidatorReward (r:1 w:0)
 	// Storage: Staking HistoryDepth (r:1 w:0)
-	// Storage: System Account (r:2 w:2)
-	// Storage: Staking Payee (r:2 w:0)
+	// Storage: Staking ErasValidatorReward (r:1 w:0)
+	// Storage: Staking Bonded (r:2 w:0)
+	// Storage: Staking Ledger (r:1 w:1)
 	// Storage: Staking ErasStakersClipped (r:1 w:0)
+	// Storage: Staking ErasRewardPoints (r:1 w:0)
 	// Storage: Staking ErasValidatorPrefs (r:1 w:0)
+	// Storage: Staking Payee (r:2 w:0)
+	// Storage: System Account (r:2 w:2)
 	fn payout_stakers_dead_controller(n: u32, ) -> Weight {
-		(121_794_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((49_467_000 as Weight).saturating_mul(n as Weight))
+		(108_594_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((46_477_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(10 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(n as Weight)))
 	}
-	// Storage: Staking ErasValidatorPrefs (r:1 w:0)
-	// Storage: Staking Ledger (r:2 w:2)
-	// Storage: Staking ErasValidatorReward (r:1 w:0)
-	// Storage: Balances Locks (r:2 w:2)
-	// Storage: Staking ErasRewardPoints (r:1 w:0)
 	// Storage: Staking CurrentEra (r:1 w:0)
 	// Storage: Staking HistoryDepth (r:1 w:0)
-	// Storage: System Account (r:2 w:2)
-	// Storage: Staking ErasStakersClipped (r:1 w:0)
+	// Storage: Staking ErasValidatorReward (r:1 w:0)
 	// Storage: Staking Bonded (r:2 w:0)
+	// Storage: Staking Ledger (r:2 w:2)
+	// Storage: Staking ErasStakersClipped (r:1 w:0)
+	// Storage: Staking ErasRewardPoints (r:1 w:0)
+	// Storage: Staking ErasValidatorPrefs (r:1 w:0)
 	// Storage: Staking Payee (r:2 w:0)
+	// Storage: System Account (r:2 w:2)
+	// Storage: Balances Locks (r:2 w:2)
 	fn payout_stakers_alive_staked(n: u32, ) -> Weight {
-		(147_049_000 as Weight)
-			// Standard Error: 30_000
-			.saturating_add((64_428_000 as Weight).saturating_mul(n as Weight))
+		(157_564_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((59_781_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(11 as Weight))
 			.saturating_add(T::DbWeight::get().reads((5 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(n as Weight)))
 	}
-	// Storage: Balances Locks (r:1 w:1)
 	// Storage: Staking Ledger (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn rebond(l: u32, ) -> Weight {
-		(52_184_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((35_000 as Weight).saturating_mul(l as Weight))
+		(48_497_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((89_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
-	// Storage: Staking ErasStakersClipped (r:0 w:2)
-	// Storage: Staking ErasValidatorReward (r:0 w:1)
 	// Storage: Staking CurrentEra (r:1 w:0)
+	// Storage: Staking HistoryDepth (r:1 w:1)
+	// Storage: Staking ErasStakersClipped (r:0 w:2)
 	// Storage: Staking ErasValidatorPrefs (r:0 w:2)
-	// Storage: Staking ErasTotalStake (r:0 w:1)
-	// Storage: Staking ErasStakers (r:0 w:2)
+	// Storage: Staking ErasValidatorReward (r:0 w:1)
 	// Storage: Staking ErasRewardPoints (r:0 w:1)
-	// Storage: Staking HistoryDepth (r:1 w:1)
+	// Storage: Staking ErasStakers (r:0 w:2)
+	// Storage: Staking ErasTotalStake (r:0 w:1)
 	// Storage: Staking ErasStartSessionIndex (r:0 w:1)
 	fn set_history_depth(e: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 57_000
-			.saturating_add((30_689_000 as Weight).saturating_mul(e as Weight))
+			// Standard Error: 73_000
+			.saturating_add((34_176_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes((7 as Weight).saturating_mul(e as Weight)))
 	}
-	// Storage: Staking Nominators (r:1 w:0)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Staking Bonded (r:1 w:1)
 	// Storage: Staking SlashingSpans (r:1 w:1)
 	// Storage: Staking Validators (r:1 w:1)
-	// Storage: Staking SpanSlash (r:0 w:1)
 	// Storage: Staking CounterForValidators (r:1 w:1)
-	// Storage: System Account (r:1 w:1)
-	// Storage: Staking Payee (r:0 w:1)
-	// Storage: Staking Ledger (r:0 w:1)
-	// Storage: Staking Bonded (r:1 w:1)
+	// Storage: Staking Nominators (r:1 w:0)
 	// Storage: Balances Locks (r:1 w:1)
+	// Storage: Staking Ledger (r:0 w:1)
+	// Storage: Staking Payee (r:0 w:1)
+	// Storage: Staking SpanSlash (r:0 w:1)
 	fn reap_stash(s: u32, ) -> Weight {
-		(75_836_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((2_423_000 as Weight).saturating_mul(s as Weight))
+		(71_895_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_376_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes(8 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
-	// Storage: System BlockWeight (r:1 w:1)
-	// Storage: Staking ErasStakers (r:0 w:1)
-	// Storage: Staking ErasStakersClipped (r:0 w:1)
-	// Storage: Staking Nominators (r:101 w:0)
+	// Storage: Staking CounterForNominators (r:1 w:0)
+	// Storage: Staking CounterForValidators (r:1 w:0)
 	// Storage: Staking SlashingSpans (r:1 w:0)
-	// Storage: Staking ErasStartSessionIndex (r:0 w:1)
-	// Storage: Staking Ledger (r:101 w:0)
 	// Storage: Staking Validators (r:2 w:0)
 	// Storage: Staking Bonded (r:101 w:0)
-	// Storage: Staking CounterForNominators (r:1 w:0)
+	// Storage: Staking Ledger (r:101 w:0)
+	// Storage: Staking Nominators (r:101 w:0)
 	// Storage: Staking ValidatorCount (r:1 w:0)
+	// Storage: System BlockWeight (r:1 w:1)
+	// Storage: Staking MinimumValidatorCount (r:1 w:0)
+	// Storage: Staking CurrentEra (r:1 w:1)
 	// Storage: Staking HistoryDepth (r:1 w:0)
+	// Storage: Staking ErasStakersClipped (r:0 w:1)
 	// Storage: Staking ErasValidatorPrefs (r:0 w:1)
-	// Storage: Staking CounterForValidators (r:1 w:0)
-	// Storage: Staking CurrentEra (r:1 w:1)
-	// Storage: Staking MinimumValidatorCount (r:1 w:0)
+	// Storage: Staking ErasStakers (r:0 w:1)
 	// Storage: Staking ErasTotalStake (r:0 w:1)
+	// Storage: Staking ErasStartSessionIndex (r:0 w:1)
 	fn new_era(v: u32, n: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 1_492_000
-			.saturating_add((299_860_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 99_000
-			.saturating_add((47_937_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 980_000
+			.saturating_add((300_866_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 49_000
+			.saturating_add((46_397_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(10 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
@@ -361,17 +361,17 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	}
 	// Storage: Staking Validators (r:501 w:0)
 	// Storage: Staking Bonded (r:1500 w:0)
-	// Storage: Staking Nominators (r:1001 w:0)
 	// Storage: Staking Ledger (r:1500 w:0)
 	// Storage: Staking SlashingSpans (r:21 w:0)
+	// Storage: Staking Nominators (r:1001 w:0)
 	fn get_npos_voters(v: u32, n: u32, s: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 101_000
-			.saturating_add((27_304_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 101_000
-			.saturating_add((29_893_000 as Weight).saturating_mul(n as Weight))
-			// Standard Error: 3_441_000
-			.saturating_add((91_111_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 98_000
+			.saturating_add((24_916_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 98_000
+			.saturating_add((26_575_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 3_335_000
+			.saturating_add((22_464_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
@@ -381,28 +381,28 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn get_npos_targets(v: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 32_000
-			.saturating_add((11_692_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((10_706_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(v as Weight)))
 	}
-	// Storage: Staking MaxNominatorsCount (r:0 w:1)
-	// Storage: Staking MaxValidatorsCount (r:0 w:1)
 	// Storage: Staking MinValidatorBond (r:0 w:1)
+	// Storage: Staking MaxValidatorsCount (r:0 w:1)
 	// Storage: Staking ChillThreshold (r:0 w:1)
+	// Storage: Staking MaxNominatorsCount (r:0 w:1)
 	// Storage: Staking MinNominatorBond (r:0 w:1)
 	fn set_staking_limits() -> Weight {
-		(7_325_000 as Weight)
+		(6_463_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
-	// Storage: Staking MinValidatorBond (r:1 w:0)
+	// Storage: Staking Ledger (r:1 w:0)
 	// Storage: Staking ChillThreshold (r:1 w:0)
 	// Storage: Staking Nominators (r:1 w:0)
 	// Storage: Staking Validators (r:1 w:1)
-	// Storage: Staking CounterForValidators (r:1 w:1)
 	// Storage: Staking MaxValidatorsCount (r:1 w:0)
-	// Storage: Staking Ledger (r:1 w:0)
+	// Storage: Staking CounterForValidators (r:1 w:1)
+	// Storage: Staking MinValidatorBond (r:1 w:0)
 	fn chill_other() -> Weight {
-		(62_683_000 as Weight)
+		(56_717_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
@@ -410,281 +410,281 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
-	// Storage: Staking CurrentEra (r:1 w:0)
-	// Storage: Balances Locks (r:1 w:1)
 	// Storage: Staking Bonded (r:1 w:1)
-	// Storage: Staking HistoryDepth (r:1 w:0)
 	// Storage: Staking Ledger (r:1 w:1)
+	// Storage: Staking CurrentEra (r:1 w:0)
+	// Storage: Staking HistoryDepth (r:1 w:0)
+	// Storage: Balances Locks (r:1 w:1)
 	// Storage: Staking Payee (r:0 w:1)
 	fn bond() -> Weight {
-		(77_492_000 as Weight)
+		(72_423_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
-	// Storage: Staking Ledger (r:1 w:1)
 	// Storage: Staking Bonded (r:1 w:0)
+	// Storage: Staking Ledger (r:1 w:1)
 	// Storage: Balances Locks (r:1 w:1)
 	fn bond_extra() -> Weight {
-		(59_476_000 as Weight)
+		(56_157_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
-	// Storage: Staking CurrentEra (r:1 w:0)
 	// Storage: Staking Ledger (r:1 w:1)
 	// Storage: Staking Nominators (r:1 w:0)
+	// Storage: Staking Validators (r:1 w:0)
+	// Storage: Staking CurrentEra (r:1 w:0)
 	// Storage: Balances Locks (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
-	// Storage: Staking Validators (r:1 w:0)
 	fn unbond() -> Weight {
-		(63_655_000 as Weight)
+		(59_039_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
-	// Storage: Balances Locks (r:1 w:1)
 	// Storage: Staking Ledger (r:1 w:1)
 	// Storage: Staking CurrentEra (r:1 w:0)
+	// Storage: Balances Locks (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn withdraw_unbonded_update(s: u32, ) -> Weight {
-		(54_534_000 as Weight)
+		(51_503_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((24_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((59_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
-	// Storage: Staking CurrentEra (r:1 w:0)
-	// Storage: Balances Locks (r:1 w:1)
-	// Storage: Staking Nominators (r:1 w:0)
 	// Storage: Staking Ledger (r:1 w:1)
+	// Storage: Staking CurrentEra (r:1 w:0)
 	// Storage: Staking Bonded (r:1 w:1)
-	// Storage: Staking Validators (r:1 w:0)
-	// Storage: Staking Payee (r:0 w:1)
 	// Storage: Staking SlashingSpans (r:1 w:0)
+	// Storage: Staking Validators (r:1 w:0)
+	// Storage: Staking Nominators (r:1 w:0)
 	// Storage: System Account (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
+	// Storage: Staking Payee (r:0 w:1)
 	// Storage: Staking SpanSlash (r:0 w:2)
 	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
-		(89_850_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((2_396_000 as Weight).saturating_mul(s as Weight))
+		(84_211_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((2_391_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(8 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
-	// Storage: Staking MaxValidatorsCount (r:1 w:0)
-	// Storage: Staking MinValidatorBond (r:1 w:0)
 	// Storage: Staking Ledger (r:1 w:0)
-	// Storage: Staking Nominators (r:1 w:0)
+	// Storage: Staking MinValidatorBond (r:1 w:0)
 	// Storage: Staking Validators (r:1 w:1)
+	// Storage: Staking MaxValidatorsCount (r:1 w:0)
+	// Storage: Staking Nominators (r:1 w:0)
 	// Storage: Staking CounterForValidators (r:1 w:1)
 	fn validate() -> Weight {
-		(36_726_000 as Weight)
+		(34_206_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	// Storage: Staking Ledger (r:1 w:0)
 	// Storage: Staking Nominators (r:1 w:1)
 	fn kick(k: u32, ) -> Weight {
-		(19_497_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((17_057_000 as Weight).saturating_mul(k as Weight))
+		(22_863_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((16_208_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(k as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	// Storage: Staking Ledger (r:1 w:0)
 	// Storage: Staking MinNominatorBond (r:1 w:0)
-	// Storage: Staking CounterForNominators (r:1 w:1)
-	// Storage: Staking CurrentEra (r:1 w:0)
 	// Storage: Staking Nominators (r:1 w:1)
-	// Storage: Staking Validators (r:2 w:0)
 	// Storage: Staking MaxNominatorsCount (r:1 w:0)
+	// Storage: Staking Validators (r:2 w:0)
+	// Storage: Staking CurrentEra (r:1 w:0)
+	// Storage: Staking CounterForNominators (r:1 w:1)
 	fn nominate(n: u32, ) -> Weight {
-		(45_146_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((5_527_000 as Weight).saturating_mul(n as Weight))
+		(41_047_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((5_611_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
-	// Storage: Staking Validators (r:1 w:0)
 	// Storage: Staking Ledger (r:1 w:0)
+	// Storage: Staking Validators (r:1 w:0)
 	// Storage: Staking Nominators (r:1 w:0)
 	fn chill() -> Weight {
-		(18_986_000 as Weight)
+		(17_489_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 	}
-	// Storage: Staking Payee (r:0 w:1)
 	// Storage: Staking Ledger (r:1 w:0)
+	// Storage: Staking Payee (r:0 w:1)
 	fn set_payee() -> Weight {
-		(13_348_000 as Weight)
+		(13_384_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Staking Bonded (r:1 w:1)
 	// Storage: Staking Ledger (r:2 w:2)
 	fn set_controller() -> Weight {
-		(28_148_000 as Weight)
+		(27_863_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	// Storage: Staking ValidatorCount (r:0 w:1)
 	fn set_validator_count() -> Weight {
-		(2_909_000 as Weight)
+		(2_468_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Staking ForceEra (r:0 w:1)
 	fn force_no_eras() -> Weight {
-		(3_163_000 as Weight)
+		(2_798_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Staking ForceEra (r:0 w:1)
 	fn force_new_era() -> Weight {
-		(3_141_000 as Weight)
+		(2_763_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Staking ForceEra (r:0 w:1)
 	fn force_new_era_always() -> Weight {
-		(3_220_000 as Weight)
+		(2_707_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Staking Invulnerables (r:0 w:1)
 	fn set_invulnerables(v: u32, ) -> Weight {
-		(3_569_000 as Weight)
+		(3_353_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((58_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((56_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
-	// Storage: Balances Locks (r:1 w:1)
-	// Storage: System Account (r:1 w:1)
-	// Storage: Staking Nominators (r:1 w:0)
-	// Storage: Staking Payee (r:0 w:1)
 	// Storage: Staking Bonded (r:1 w:1)
-	// Storage: Staking Validators (r:1 w:0)
 	// Storage: Staking SlashingSpans (r:1 w:0)
+	// Storage: Staking Validators (r:1 w:0)
+	// Storage: Staking Nominators (r:1 w:0)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
 	// Storage: Staking Ledger (r:0 w:1)
+	// Storage: Staking Payee (r:0 w:1)
 	// Storage: Staking SpanSlash (r:0 w:2)
 	fn force_unstake(s: u32, ) -> Weight {
-		(65_753_000 as Weight)
+		(60_682_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((2_420_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((2_384_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	// Storage: Staking UnappliedSlashes (r:1 w:1)
 	fn cancel_deferred_slash(s: u32, ) -> Weight {
-		(3_056_514_000 as Weight)
-			// Standard Error: 218_000
-			.saturating_add((21_159_000 as Weight).saturating_mul(s as Weight))
+		(3_368_335_000 as Weight)
+			// Standard Error: 221_000
+			.saturating_add((19_815_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
-	// Storage: Staking Bonded (r:2 w:0)
-	// Storage: Staking Ledger (r:1 w:1)
 	// Storage: Staking CurrentEra (r:1 w:0)
-	// Storage: Staking ErasRewardPoints (r:1 w:0)
-	// Storage: Staking ErasValidatorReward (r:1 w:0)
 	// Storage: Staking HistoryDepth (r:1 w:0)
-	// Storage: System Account (r:2 w:2)
-	// Storage: Staking Payee (r:2 w:0)
+	// Storage: Staking ErasValidatorReward (r:1 w:0)
+	// Storage: Staking Bonded (r:2 w:0)
+	// Storage: Staking Ledger (r:1 w:1)
 	// Storage: Staking ErasStakersClipped (r:1 w:0)
+	// Storage: Staking ErasRewardPoints (r:1 w:0)
 	// Storage: Staking ErasValidatorPrefs (r:1 w:0)
+	// Storage: Staking Payee (r:2 w:0)
+	// Storage: System Account (r:2 w:2)
 	fn payout_stakers_dead_controller(n: u32, ) -> Weight {
-		(121_794_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((49_467_000 as Weight).saturating_mul(n as Weight))
+		(108_594_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((46_477_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(n as Weight)))
 	}
-	// Storage: Staking ErasValidatorPrefs (r:1 w:0)
-	// Storage: Staking Ledger (r:2 w:2)
-	// Storage: Staking ErasValidatorReward (r:1 w:0)
-	// Storage: Balances Locks (r:2 w:2)
-	// Storage: Staking ErasRewardPoints (r:1 w:0)
 	// Storage: Staking CurrentEra (r:1 w:0)
 	// Storage: Staking HistoryDepth (r:1 w:0)
-	// Storage: System Account (r:2 w:2)
-	// Storage: Staking ErasStakersClipped (r:1 w:0)
+	// Storage: Staking ErasValidatorReward (r:1 w:0)
 	// Storage: Staking Bonded (r:2 w:0)
+	// Storage: Staking Ledger (r:2 w:2)
+	// Storage: Staking ErasStakersClipped (r:1 w:0)
+	// Storage: Staking ErasRewardPoints (r:1 w:0)
+	// Storage: Staking ErasValidatorPrefs (r:1 w:0)
 	// Storage: Staking Payee (r:2 w:0)
+	// Storage: System Account (r:2 w:2)
+	// Storage: Balances Locks (r:2 w:2)
 	fn payout_stakers_alive_staked(n: u32, ) -> Weight {
-		(147_049_000 as Weight)
-			// Standard Error: 30_000
-			.saturating_add((64_428_000 as Weight).saturating_mul(n as Weight))
+		(157_564_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((59_781_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(11 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((5 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(n as Weight)))
 	}
-	// Storage: Balances Locks (r:1 w:1)
 	// Storage: Staking Ledger (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn rebond(l: u32, ) -> Weight {
-		(52_184_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((35_000 as Weight).saturating_mul(l as Weight))
+		(48_497_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((89_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
-	// Storage: Staking ErasStakersClipped (r:0 w:2)
-	// Storage: Staking ErasValidatorReward (r:0 w:1)
 	// Storage: Staking CurrentEra (r:1 w:0)
+	// Storage: Staking HistoryDepth (r:1 w:1)
+	// Storage: Staking ErasStakersClipped (r:0 w:2)
 	// Storage: Staking ErasValidatorPrefs (r:0 w:2)
-	// Storage: Staking ErasTotalStake (r:0 w:1)
-	// Storage: Staking ErasStakers (r:0 w:2)
+	// Storage: Staking ErasValidatorReward (r:0 w:1)
 	// Storage: Staking ErasRewardPoints (r:0 w:1)
-	// Storage: Staking HistoryDepth (r:1 w:1)
+	// Storage: Staking ErasStakers (r:0 w:2)
+	// Storage: Staking ErasTotalStake (r:0 w:1)
 	// Storage: Staking ErasStartSessionIndex (r:0 w:1)
 	fn set_history_depth(e: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 57_000
-			.saturating_add((30_689_000 as Weight).saturating_mul(e as Weight))
+			// Standard Error: 73_000
+			.saturating_add((34_176_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((7 as Weight).saturating_mul(e as Weight)))
 	}
-	// Storage: Staking Nominators (r:1 w:0)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Staking Bonded (r:1 w:1)
 	// Storage: Staking SlashingSpans (r:1 w:1)
 	// Storage: Staking Validators (r:1 w:1)
-	// Storage: Staking SpanSlash (r:0 w:1)
 	// Storage: Staking CounterForValidators (r:1 w:1)
-	// Storage: System Account (r:1 w:1)
-	// Storage: Staking Payee (r:0 w:1)
-	// Storage: Staking Ledger (r:0 w:1)
-	// Storage: Staking Bonded (r:1 w:1)
+	// Storage: Staking Nominators (r:1 w:0)
 	// Storage: Balances Locks (r:1 w:1)
+	// Storage: Staking Ledger (r:0 w:1)
+	// Storage: Staking Payee (r:0 w:1)
+	// Storage: Staking SpanSlash (r:0 w:1)
 	fn reap_stash(s: u32, ) -> Weight {
-		(75_836_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((2_423_000 as Weight).saturating_mul(s as Weight))
+		(71_895_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_376_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
-	// Storage: System BlockWeight (r:1 w:1)
-	// Storage: Staking ErasStakers (r:0 w:1)
-	// Storage: Staking ErasStakersClipped (r:0 w:1)
-	// Storage: Staking Nominators (r:101 w:0)
+	// Storage: Staking CounterForNominators (r:1 w:0)
+	// Storage: Staking CounterForValidators (r:1 w:0)
 	// Storage: Staking SlashingSpans (r:1 w:0)
-	// Storage: Staking ErasStartSessionIndex (r:0 w:1)
-	// Storage: Staking Ledger (r:101 w:0)
 	// Storage: Staking Validators (r:2 w:0)
 	// Storage: Staking Bonded (r:101 w:0)
-	// Storage: Staking CounterForNominators (r:1 w:0)
+	// Storage: Staking Ledger (r:101 w:0)
+	// Storage: Staking Nominators (r:101 w:0)
 	// Storage: Staking ValidatorCount (r:1 w:0)
+	// Storage: System BlockWeight (r:1 w:1)
+	// Storage: Staking MinimumValidatorCount (r:1 w:0)
+	// Storage: Staking CurrentEra (r:1 w:1)
 	// Storage: Staking HistoryDepth (r:1 w:0)
+	// Storage: Staking ErasStakersClipped (r:0 w:1)
 	// Storage: Staking ErasValidatorPrefs (r:0 w:1)
-	// Storage: Staking CounterForValidators (r:1 w:0)
-	// Storage: Staking CurrentEra (r:1 w:1)
-	// Storage: Staking MinimumValidatorCount (r:1 w:0)
+	// Storage: Staking ErasStakers (r:0 w:1)
 	// Storage: Staking ErasTotalStake (r:0 w:1)
+	// Storage: Staking ErasStartSessionIndex (r:0 w:1)
 	fn new_era(v: u32, n: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 1_492_000
-			.saturating_add((299_860_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 99_000
-			.saturating_add((47_937_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 980_000
+			.saturating_add((300_866_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 49_000
+			.saturating_add((46_397_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
@@ -693,17 +693,17 @@ impl WeightInfo for () {
 	}
 	// Storage: Staking Validators (r:501 w:0)
 	// Storage: Staking Bonded (r:1500 w:0)
-	// Storage: Staking Nominators (r:1001 w:0)
 	// Storage: Staking Ledger (r:1500 w:0)
 	// Storage: Staking SlashingSpans (r:21 w:0)
+	// Storage: Staking Nominators (r:1001 w:0)
 	fn get_npos_voters(v: u32, n: u32, s: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 101_000
-			.saturating_add((27_304_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 101_000
-			.saturating_add((29_893_000 as Weight).saturating_mul(n as Weight))
-			// Standard Error: 3_441_000
-			.saturating_add((91_111_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 98_000
+			.saturating_add((24_916_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 98_000
+			.saturating_add((26_575_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 3_335_000
+			.saturating_add((22_464_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
@@ -713,28 +713,28 @@ impl WeightInfo for () {
 	fn get_npos_targets(v: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 32_000
-			.saturating_add((11_692_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((10_706_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(v as Weight)))
 	}
-	// Storage: Staking MaxNominatorsCount (r:0 w:1)
-	// Storage: Staking MaxValidatorsCount (r:0 w:1)
 	// Storage: Staking MinValidatorBond (r:0 w:1)
+	// Storage: Staking MaxValidatorsCount (r:0 w:1)
 	// Storage: Staking ChillThreshold (r:0 w:1)
+	// Storage: Staking MaxNominatorsCount (r:0 w:1)
 	// Storage: Staking MinNominatorBond (r:0 w:1)
 	fn set_staking_limits() -> Weight {
-		(7_325_000 as Weight)
+		(6_463_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}
-	// Storage: Staking MinValidatorBond (r:1 w:0)
+	// Storage: Staking Ledger (r:1 w:0)
 	// Storage: Staking ChillThreshold (r:1 w:0)
 	// Storage: Staking Nominators (r:1 w:0)
 	// Storage: Staking Validators (r:1 w:1)
-	// Storage: Staking CounterForValidators (r:1 w:1)
 	// Storage: Staking MaxValidatorsCount (r:1 w:0)
-	// Storage: Staking Ledger (r:1 w:0)
+	// Storage: Staking CounterForValidators (r:1 w:1)
+	// Storage: Staking MinValidatorBond (r:1 w:0)
 	fn chill_other() -> Weight {
-		(62_683_000 as Weight)
+		(56_717_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
diff --git a/frame/system/benchmarking/src/lib.rs b/frame/system/benchmarking/src/lib.rs
index 3211d391d336..beb61829bce3 100644
--- a/frame/system/benchmarking/src/lib.rs
+++ b/frame/system/benchmarking/src/lib.rs
@@ -79,6 +79,7 @@ benchmarks! {
 		assert_eq!(System::<T>::digest().logs.len(), (d + 1) as usize)
 	}
 
+	#[skip_meta]
 	set_storage {
 		let i in 1 .. 1000;
 
@@ -95,6 +96,7 @@ benchmarks! {
 		assert_eq!(value, last_hash.as_ref().to_vec());
 	}
 
+	#[skip_meta]
 	kill_storage {
 		let i in 1 .. 1000;
 
@@ -116,6 +118,7 @@ benchmarks! {
 		assert_eq!(storage::unhashed::get_raw(last_hash.as_ref()), None);
 	}
 
+	#[skip_meta]
 	kill_prefix {
 		let p in 1 .. 1000;
 
diff --git a/frame/system/src/weights.rs b/frame/system/src/weights.rs
index e5821739d0ec..281d26375c81 100644
--- a/frame/system/src/weights.rs
+++ b/frame/system/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for frame_system
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2021-07-20, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -58,40 +58,46 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: crate::Config> WeightInfo for SubstrateWeight<T> {
 	fn remark(b: u32, ) -> Weight {
-		(0 as Weight)
+		(574_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((1_000 as Weight).saturating_mul(b as Weight))
 	}
 	fn remark_with_event(b: u32, ) -> Weight {
-		(16_569_000 as Weight)
+		(0 as Weight)
 			// Standard Error: 0
 			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
 	}
+	// Storage: unknown [0x3a686561707061676573] (r:0 w:1)
 	fn set_heap_pages() -> Weight {
-		(1_783_000 as Weight)
+		(1_891_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: System Digest (r:1 w:1)
+	// Storage: unknown [0x3a6368616e6765735f74726965] (r:0 w:1)
 	fn set_changes_trie_config() -> Weight {
-		(7_727_000 as Weight)
+		(7_370_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Skipped Metadata (r:0 w:0)
 	fn set_storage(i: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 0
-			.saturating_add((875_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((848_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
+	// Storage: Skipped Metadata (r:0 w:0)
 	fn kill_storage(i: u32, ) -> Weight {
-		(4_216_000 as Weight)
+		(308_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((555_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((559_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
+	// Storage: Skipped Metadata (r:0 w:0)
 	fn kill_prefix(p: u32, ) -> Weight {
-		(14_558_000 as Weight)
+		(7_616_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((781_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((783_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
 	}
 }
@@ -99,40 +105,46 @@ impl<T: crate::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn remark(b: u32, ) -> Weight {
-		(0 as Weight)
+		(574_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((1_000 as Weight).saturating_mul(b as Weight))
 	}
 	fn remark_with_event(b: u32, ) -> Weight {
-		(16_569_000 as Weight)
+		(0 as Weight)
 			// Standard Error: 0
 			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
 	}
+	// Storage: unknown [0x3a686561707061676573] (r:0 w:1)
 	fn set_heap_pages() -> Weight {
-		(1_783_000 as Weight)
+		(1_891_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: System Digest (r:1 w:1)
+	// Storage: unknown [0x3a6368616e6765735f74726965] (r:0 w:1)
 	fn set_changes_trie_config() -> Weight {
-		(7_727_000 as Weight)
+		(7_370_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Skipped Metadata (r:0 w:0)
 	fn set_storage(i: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 0
-			.saturating_add((875_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((848_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
+	// Storage: Skipped Metadata (r:0 w:0)
 	fn kill_storage(i: u32, ) -> Weight {
-		(4_216_000 as Weight)
+		(308_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((555_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((559_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
+	// Storage: Skipped Metadata (r:0 w:0)
 	fn kill_prefix(p: u32, ) -> Weight {
-		(14_558_000 as Weight)
+		(7_616_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((781_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((783_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
 	}
 }
diff --git a/frame/timestamp/src/weights.rs b/frame/timestamp/src/weights.rs
index a3fe6f198346..b4e7370ee761 100644
--- a/frame/timestamp/src/weights.rs
+++ b/frame/timestamp/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_timestamp
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -52,24 +52,28 @@ pub trait WeightInfo {
 /// Weights for pallet_timestamp using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	// Storage: Timestamp Now (r:1 w:1)
+	// Storage: Babe CurrentSlot (r:1 w:0)
 	fn set() -> Weight {
-		(10_277_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+		(10_391_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn on_finalize() -> Weight {
-		(4_859_000 as Weight)
+		(4_843_000 as Weight)
 	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
+	// Storage: Timestamp Now (r:1 w:1)
+	// Storage: Babe CurrentSlot (r:1 w:0)
 	fn set() -> Weight {
-		(10_277_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+		(10_391_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn on_finalize() -> Weight {
-		(4_859_000 as Weight)
+		(4_843_000 as Weight)
 	}
 }
diff --git a/frame/tips/src/weights.rs b/frame/tips/src/weights.rs
index 439c7f976c12..3376afb06617 100644
--- a/frame/tips/src/weights.rs
+++ b/frame/tips/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_tips
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -56,45 +56,60 @@ pub trait WeightInfo {
 /// Weights for pallet_tips using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	// Storage: Treasury Reasons (r:1 w:1)
+	// Storage: Treasury Tips (r:1 w:1)
 	fn report_awesome(r: u32, ) -> Weight {
-		(49_844_000 as Weight)
+		(50_921_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((2_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Treasury Tips (r:1 w:1)
+	// Storage: Treasury Reasons (r:0 w:1)
 	fn retract_tip() -> Weight {
-		(45_934_000 as Weight)
+		(46_352_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Elections Members (r:1 w:0)
+	// Storage: Treasury Reasons (r:1 w:1)
+	// Storage: Treasury Tips (r:0 w:1)
 	fn tip_new(r: u32, t: u32, ) -> Weight {
-		(31_777_000 as Weight)
+		(33_338_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((2_000 as Weight).saturating_mul(r as Weight))
 			// Standard Error: 0
-			.saturating_add((127_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((115_000 as Weight).saturating_mul(t as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Elections Members (r:1 w:0)
+	// Storage: Treasury Tips (r:1 w:1)
 	fn tip(t: u32, ) -> Weight {
-		(22_361_000 as Weight)
+		(22_702_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((584_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((538_000 as Weight).saturating_mul(t as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Treasury Tips (r:1 w:1)
+	// Storage: Elections Members (r:1 w:0)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Treasury Reasons (r:0 w:1)
 	fn close_tip(t: u32, ) -> Weight {
-		(84_470_000 as Weight)
+		(84_094_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((326_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((283_000 as Weight).saturating_mul(t as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Treasury Tips (r:1 w:1)
+	// Storage: Treasury Reasons (r:0 w:1)
 	fn slash_tip(t: u32, ) -> Weight {
-		(25_214_000 as Weight)
+		(24_891_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((8_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((6_000 as Weight).saturating_mul(t as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
@@ -102,45 +117,60 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
+	// Storage: Treasury Reasons (r:1 w:1)
+	// Storage: Treasury Tips (r:1 w:1)
 	fn report_awesome(r: u32, ) -> Weight {
-		(49_844_000 as Weight)
+		(50_921_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((2_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Treasury Tips (r:1 w:1)
+	// Storage: Treasury Reasons (r:0 w:1)
 	fn retract_tip() -> Weight {
-		(45_934_000 as Weight)
+		(46_352_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Elections Members (r:1 w:0)
+	// Storage: Treasury Reasons (r:1 w:1)
+	// Storage: Treasury Tips (r:0 w:1)
 	fn tip_new(r: u32, t: u32, ) -> Weight {
-		(31_777_000 as Weight)
+		(33_338_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((2_000 as Weight).saturating_mul(r as Weight))
 			// Standard Error: 0
-			.saturating_add((127_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((115_000 as Weight).saturating_mul(t as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Elections Members (r:1 w:0)
+	// Storage: Treasury Tips (r:1 w:1)
 	fn tip(t: u32, ) -> Weight {
-		(22_361_000 as Weight)
+		(22_702_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((584_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((538_000 as Weight).saturating_mul(t as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Treasury Tips (r:1 w:1)
+	// Storage: Elections Members (r:1 w:0)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Treasury Reasons (r:0 w:1)
 	fn close_tip(t: u32, ) -> Weight {
-		(84_470_000 as Weight)
+		(84_094_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((326_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((283_000 as Weight).saturating_mul(t as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Treasury Tips (r:1 w:1)
+	// Storage: Treasury Reasons (r:0 w:1)
 	fn slash_tip(t: u32, ) -> Weight {
-		(25_214_000 as Weight)
+		(24_891_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((8_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((6_000 as Weight).saturating_mul(t as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
diff --git a/frame/transaction-storage/src/weights.rs b/frame/transaction-storage/src/weights.rs
index 82259e60d874..104b18d3f92c 100644
--- a/frame/transaction-storage/src/weights.rs
+++ b/frame/transaction-storage/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_transaction_storage
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -53,6 +53,12 @@ pub trait WeightInfo {
 /// Weights for pallet_transaction_storage using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	// Storage: TransactionStorage MaxTransactionSize (r:1 w:0)
+	// Storage: TransactionStorage ByteFee (r:1 w:0)
+	// Storage: TransactionStorage EntryFee (r:1 w:0)
+	// Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
+	// Storage: TransactionStorage BlockTransactions (r:1 w:1)
+	// Storage: TransactionStorage MaxBlockTransactions (r:1 w:0)
 	fn store(l: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 0
@@ -60,13 +66,24 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: TransactionStorage Transactions (r:1 w:0)
+	// Storage: TransactionStorage ByteFee (r:1 w:0)
+	// Storage: TransactionStorage EntryFee (r:1 w:0)
+	// Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
+	// Storage: TransactionStorage BlockTransactions (r:1 w:1)
+	// Storage: TransactionStorage MaxBlockTransactions (r:1 w:0)
 	fn renew() -> Weight {
-		(65_933_000 as Weight)
+		(67_532_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: TransactionStorage ProofChecked (r:1 w:1)
+	// Storage: TransactionStorage StoragePeriod (r:1 w:0)
+	// Storage: TransactionStorage ChunkCount (r:1 w:0)
+	// Storage: System ParentHash (r:1 w:0)
+	// Storage: TransactionStorage Transactions (r:1 w:0)
 	fn check_proof_max() -> Weight {
-		(163_549_000 as Weight)
+		(182_886_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -74,6 +91,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
+	// Storage: TransactionStorage MaxTransactionSize (r:1 w:0)
+	// Storage: TransactionStorage ByteFee (r:1 w:0)
+	// Storage: TransactionStorage EntryFee (r:1 w:0)
+	// Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
+	// Storage: TransactionStorage BlockTransactions (r:1 w:1)
+	// Storage: TransactionStorage MaxBlockTransactions (r:1 w:0)
 	fn store(l: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 0
@@ -81,13 +104,24 @@ impl WeightInfo for () {
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: TransactionStorage Transactions (r:1 w:0)
+	// Storage: TransactionStorage ByteFee (r:1 w:0)
+	// Storage: TransactionStorage EntryFee (r:1 w:0)
+	// Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
+	// Storage: TransactionStorage BlockTransactions (r:1 w:1)
+	// Storage: TransactionStorage MaxBlockTransactions (r:1 w:0)
 	fn renew() -> Weight {
-		(65_933_000 as Weight)
+		(67_532_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: TransactionStorage ProofChecked (r:1 w:1)
+	// Storage: TransactionStorage StoragePeriod (r:1 w:0)
+	// Storage: TransactionStorage ChunkCount (r:1 w:0)
+	// Storage: System ParentHash (r:1 w:0)
+	// Storage: TransactionStorage Transactions (r:1 w:0)
 	fn check_proof_max() -> Weight {
-		(163_549_000 as Weight)
+		(182_886_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
diff --git a/frame/treasury/src/weights.rs b/frame/treasury/src/weights.rs
index 234d71e3add2..126c8a176626 100644
--- a/frame/treasury/src/weights.rs
+++ b/frame/treasury/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_treasury
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2021-07-13, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -54,27 +54,37 @@ pub trait WeightInfo {
 /// Weights for pallet_treasury using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	// Storage: Treasury ProposalCount (r:1 w:1)
+	// Storage: Treasury Proposals (r:0 w:1)
 	fn propose_spend() -> Weight {
-		(42_325_000 as Weight)
+		(41_567_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Treasury Proposals (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn reject_proposal() -> Weight {
-		(39_633_000 as Weight)
+		(38_993_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Treasury Proposals (r:1 w:0)
+	// Storage: Treasury Approvals (r:1 w:1)
 	fn approve_proposal(p: u32, ) -> Weight {
-		(14_337_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((116_000 as Weight).saturating_mul(p as Weight))
+		(13_543_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((55_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Treasury Approvals (r:1 w:1)
+	// Storage: Treasury BountyApprovals (r:1 w:1)
+	// Storage: Treasury Proposals (r:2 w:2)
+	// Storage: System Account (r:4 w:4)
 	fn on_initialize_proposals(p: u32, ) -> Weight {
-		(50_379_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((59_595_000 as Weight).saturating_mul(p as Weight))
+		(51_708_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((57_926_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(p as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
@@ -84,27 +94,37 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
+	// Storage: Treasury ProposalCount (r:1 w:1)
+	// Storage: Treasury Proposals (r:0 w:1)
 	fn propose_spend() -> Weight {
-		(42_325_000 as Weight)
+		(41_567_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Treasury Proposals (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn reject_proposal() -> Weight {
-		(39_633_000 as Weight)
+		(38_993_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Treasury Proposals (r:1 w:0)
+	// Storage: Treasury Approvals (r:1 w:1)
 	fn approve_proposal(p: u32, ) -> Weight {
-		(14_337_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((116_000 as Weight).saturating_mul(p as Weight))
+		(13_543_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((55_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Treasury Approvals (r:1 w:1)
+	// Storage: Treasury BountyApprovals (r:1 w:1)
+	// Storage: Treasury Proposals (r:2 w:2)
+	// Storage: System Account (r:4 w:4)
 	fn on_initialize_proposals(p: u32, ) -> Weight {
-		(50_379_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((59_595_000 as Weight).saturating_mul(p as Weight))
+		(51_708_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((57_926_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(p as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
diff --git a/frame/uniques/src/weights.rs b/frame/uniques/src/weights.rs
index 0bef1cb5d693..40d1ddfdc556 100644
--- a/frame/uniques/src/weights.rs
+++ b/frame/uniques/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_uniques
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -72,24 +72,32 @@ pub trait WeightInfo {
 /// Weights for pallet_uniques using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	// Storage: Uniques Class (r:1 w:1)
 	fn create() -> Weight {
-		(43_219_000 as Weight)
+		(42_138_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:1)
 	fn force_create() -> Weight {
-		(21_919_000 as Weight)
+		(22_238_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:1)
+	// Storage: Uniques Asset (r:1 w:0)
+	// Storage: Uniques Attribute (r:0 w:1000)
+	// Storage: Uniques ClassMetadataOf (r:0 w:1)
+	// Storage: Uniques InstanceMetadataOf (r:0 w:1000)
+	// Storage: Uniques Account (r:0 w:20)
 	fn destroy(n: u32, m: u32, a: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((16_619_000 as Weight).saturating_mul(n as Weight))
-			// Standard Error: 13_000
-			.saturating_add((967_000 as Weight).saturating_mul(m as Weight))
-			// Standard Error: 13_000
-			.saturating_add((834_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 12_000
+			.saturating_add((16_171_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 12_000
+			.saturating_add((1_058_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 12_000
+			.saturating_add((953_000 as Weight).saturating_mul(a as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
@@ -97,102 +105,141 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(m as Weight)))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(a as Weight)))
 	}
+	// Storage: Uniques Asset (r:1 w:1)
+	// Storage: Uniques Class (r:1 w:1)
+	// Storage: Uniques Account (r:0 w:1)
 	fn mint() -> Weight {
-		(57_627_000 as Weight)
+		(55_359_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:1)
+	// Storage: Uniques Asset (r:1 w:1)
+	// Storage: Uniques Account (r:0 w:1)
 	fn burn() -> Weight {
-		(58_615_000 as Weight)
+		(58_254_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:0)
+	// Storage: Uniques Asset (r:1 w:1)
+	// Storage: Uniques Account (r:0 w:2)
 	fn transfer() -> Weight {
-		(43_335_000 as Weight)
+		(42_906_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:1)
+	// Storage: Uniques Asset (r:100 w:100)
 	fn redeposit(i: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((26_322_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 9_000
+			.saturating_add((25_237_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(i as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
+	// Storage: Uniques Asset (r:1 w:1)
+	// Storage: Uniques Class (r:1 w:0)
 	fn freeze() -> Weight {
-		(31_020_000 as Weight)
+		(30_153_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Uniques Asset (r:1 w:1)
+	// Storage: Uniques Class (r:1 w:0)
 	fn thaw() -> Weight {
-		(31_012_000 as Weight)
+		(31_212_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:1)
 	fn freeze_class() -> Weight {
-		(22_761_000 as Weight)
+		(22_689_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:1)
 	fn thaw_class() -> Weight {
-		(22_789_000 as Weight)
+		(22_647_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn transfer_ownership() -> Weight {
-		(50_779_000 as Weight)
+		(50_902_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:1)
 	fn set_team() -> Weight {
-		(24_045_000 as Weight)
+		(23_632_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:1)
 	fn force_asset_status() -> Weight {
-		(22_925_000 as Weight)
+		(22_508_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:1)
+	// Storage: Uniques InstanceMetadataOf (r:1 w:0)
+	// Storage: Uniques Attribute (r:1 w:1)
 	fn set_attribute() -> Weight {
-		(70_416_000 as Weight)
+		(69_942_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:1)
+	// Storage: Uniques InstanceMetadataOf (r:1 w:0)
+	// Storage: Uniques Attribute (r:1 w:1)
 	fn clear_attribute() -> Weight {
-		(64_640_000 as Weight)
+		(62_314_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:1)
+	// Storage: Uniques InstanceMetadataOf (r:1 w:1)
 	fn set_metadata() -> Weight {
-		(53_229_000 as Weight)
+		(52_647_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:1)
+	// Storage: Uniques InstanceMetadataOf (r:1 w:1)
 	fn clear_metadata() -> Weight {
-		(52_145_000 as Weight)
+		(50_391_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:1)
+	// Storage: Uniques ClassMetadataOf (r:1 w:1)
 	fn set_class_metadata() -> Weight {
-		(51_556_000 as Weight)
+		(50_928_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:0)
+	// Storage: Uniques ClassMetadataOf (r:1 w:1)
 	fn clear_class_metadata() -> Weight {
-		(47_314_000 as Weight)
+		(46_667_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:0)
+	// Storage: Uniques Asset (r:1 w:1)
 	fn approve_transfer() -> Weight {
-		(32_946_000 as Weight)
+		(32_111_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:0)
+	// Storage: Uniques Asset (r:1 w:1)
 	fn cancel_approval() -> Weight {
-		(32_328_000 as Weight)
+		(32_627_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -200,24 +247,32 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
+	// Storage: Uniques Class (r:1 w:1)
 	fn create() -> Weight {
-		(43_219_000 as Weight)
+		(42_138_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:1)
 	fn force_create() -> Weight {
-		(21_919_000 as Weight)
+		(22_238_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:1)
+	// Storage: Uniques Asset (r:1 w:0)
+	// Storage: Uniques Attribute (r:0 w:1000)
+	// Storage: Uniques ClassMetadataOf (r:0 w:1)
+	// Storage: Uniques InstanceMetadataOf (r:0 w:1000)
+	// Storage: Uniques Account (r:0 w:20)
 	fn destroy(n: u32, m: u32, a: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((16_619_000 as Weight).saturating_mul(n as Weight))
-			// Standard Error: 13_000
-			.saturating_add((967_000 as Weight).saturating_mul(m as Weight))
-			// Standard Error: 13_000
-			.saturating_add((834_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 12_000
+			.saturating_add((16_171_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 12_000
+			.saturating_add((1_058_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 12_000
+			.saturating_add((953_000 as Weight).saturating_mul(a as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
@@ -225,102 +280,141 @@ impl WeightInfo for () {
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(m as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(a as Weight)))
 	}
+	// Storage: Uniques Asset (r:1 w:1)
+	// Storage: Uniques Class (r:1 w:1)
+	// Storage: Uniques Account (r:0 w:1)
 	fn mint() -> Weight {
-		(57_627_000 as Weight)
+		(55_359_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:1)
+	// Storage: Uniques Asset (r:1 w:1)
+	// Storage: Uniques Account (r:0 w:1)
 	fn burn() -> Weight {
-		(58_615_000 as Weight)
+		(58_254_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:0)
+	// Storage: Uniques Asset (r:1 w:1)
+	// Storage: Uniques Account (r:0 w:2)
 	fn transfer() -> Weight {
-		(43_335_000 as Weight)
+		(42_906_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:1)
+	// Storage: Uniques Asset (r:100 w:100)
 	fn redeposit(i: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((26_322_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 9_000
+			.saturating_add((25_237_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(i as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
+	// Storage: Uniques Asset (r:1 w:1)
+	// Storage: Uniques Class (r:1 w:0)
 	fn freeze() -> Weight {
-		(31_020_000 as Weight)
+		(30_153_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Uniques Asset (r:1 w:1)
+	// Storage: Uniques Class (r:1 w:0)
 	fn thaw() -> Weight {
-		(31_012_000 as Weight)
+		(31_212_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:1)
 	fn freeze_class() -> Weight {
-		(22_761_000 as Weight)
+		(22_689_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:1)
 	fn thaw_class() -> Weight {
-		(22_789_000 as Weight)
+		(22_647_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn transfer_ownership() -> Weight {
-		(50_779_000 as Weight)
+		(50_902_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:1)
 	fn set_team() -> Weight {
-		(24_045_000 as Weight)
+		(23_632_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:1)
 	fn force_asset_status() -> Weight {
-		(22_925_000 as Weight)
+		(22_508_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:1)
+	// Storage: Uniques InstanceMetadataOf (r:1 w:0)
+	// Storage: Uniques Attribute (r:1 w:1)
 	fn set_attribute() -> Weight {
-		(70_416_000 as Weight)
+		(69_942_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:1)
+	// Storage: Uniques InstanceMetadataOf (r:1 w:0)
+	// Storage: Uniques Attribute (r:1 w:1)
 	fn clear_attribute() -> Weight {
-		(64_640_000 as Weight)
+		(62_314_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:1)
+	// Storage: Uniques InstanceMetadataOf (r:1 w:1)
 	fn set_metadata() -> Weight {
-		(53_229_000 as Weight)
+		(52_647_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:1)
+	// Storage: Uniques InstanceMetadataOf (r:1 w:1)
 	fn clear_metadata() -> Weight {
-		(52_145_000 as Weight)
+		(50_391_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:1)
+	// Storage: Uniques ClassMetadataOf (r:1 w:1)
 	fn set_class_metadata() -> Weight {
-		(51_556_000 as Weight)
+		(50_928_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:0)
+	// Storage: Uniques ClassMetadataOf (r:1 w:1)
 	fn clear_class_metadata() -> Weight {
-		(47_314_000 as Weight)
+		(46_667_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:0)
+	// Storage: Uniques Asset (r:1 w:1)
 	fn approve_transfer() -> Weight {
-		(32_946_000 as Weight)
+		(32_111_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Uniques Class (r:1 w:0)
+	// Storage: Uniques Asset (r:1 w:1)
 	fn cancel_approval() -> Weight {
-		(32_328_000 as Weight)
+		(32_627_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
diff --git a/frame/utility/Cargo.toml b/frame/utility/Cargo.toml
index 8f9e18c610fb..fe43f63b15d5 100644
--- a/frame/utility/Cargo.toml
+++ b/frame/utility/Cargo.toml
@@ -40,5 +40,6 @@ std = [
 runtime-benchmarks = [
 	"frame-benchmarking",
 	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
 ]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/utility/src/weights.rs b/frame/utility/src/weights.rs
index b676ca5cdbcf..6ac23419e3ef 100644
--- a/frame/utility/src/weights.rs
+++ b/frame/utility/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_utility
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2021-07-14, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -54,33 +54,33 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn batch(c: u32, ) -> Weight {
-		(20_779_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_080_000 as Weight).saturating_mul(c as Weight))
+		(30_319_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((6_759_000 as Weight).saturating_mul(c as Weight))
 	}
 	fn as_derivative() -> Weight {
-		(3_994_000 as Weight)
+		(4_030_000 as Weight)
 	}
 	fn batch_all(c: u32, ) -> Weight {
-		(22_183_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_506_000 as Weight).saturating_mul(c as Weight))
+		(26_621_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((7_251_000 as Weight).saturating_mul(c as Weight))
 	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn batch(c: u32, ) -> Weight {
-		(20_779_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_080_000 as Weight).saturating_mul(c as Weight))
+		(30_319_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((6_759_000 as Weight).saturating_mul(c as Weight))
 	}
 	fn as_derivative() -> Weight {
-		(3_994_000 as Weight)
+		(4_030_000 as Weight)
 	}
 	fn batch_all(c: u32, ) -> Weight {
-		(22_183_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_506_000 as Weight).saturating_mul(c as Weight))
+		(26_621_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((7_251_000 as Weight).saturating_mul(c as Weight))
 	}
 }
diff --git a/frame/vesting/src/weights.rs b/frame/vesting/src/weights.rs
index d180e6828c59..50f72b44d6cf 100644
--- a/frame/vesting/src/weights.rs
+++ b/frame/vesting/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_vesting
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -56,45 +56,61 @@ pub trait WeightInfo {
 /// Weights for pallet_vesting using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	// Storage: Vesting Vesting (r:1 w:0)
+	// Storage: Balances Locks (r:1 w:1)
 	fn vest_locked(l: u32, ) -> Weight {
-		(42_905_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((232_000 as Weight).saturating_mul(l as Weight))
+		(42_983_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((190_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Vesting Vesting (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
 	fn vest_unlocked(l: u32, ) -> Weight {
-		(45_650_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((215_000 as Weight).saturating_mul(l as Weight))
+		(46_213_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((158_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Vesting Vesting (r:1 w:0)
+	// Storage: Balances Locks (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn vest_other_locked(l: u32, ) -> Weight {
-		(42_273_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((246_000 as Weight).saturating_mul(l as Weight))
+		(42_644_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((202_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Vesting Vesting (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn vest_other_unlocked(l: u32, ) -> Weight {
-		(45_324_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((214_000 as Weight).saturating_mul(l as Weight))
+		(45_765_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((159_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Vesting Vesting (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
 	fn vested_transfer(l: u32, ) -> Weight {
-		(96_661_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((211_000 as Weight).saturating_mul(l as Weight))
+		(97_417_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((235_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Vesting Vesting (r:1 w:1)
+	// Storage: System Account (r:2 w:2)
+	// Storage: Balances Locks (r:1 w:1)
 	fn force_vested_transfer(l: u32, ) -> Weight {
-		(98_812_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((139_000 as Weight).saturating_mul(l as Weight))
+		(97_661_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((239_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
@@ -102,45 +118,61 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
+	// Storage: Vesting Vesting (r:1 w:0)
+	// Storage: Balances Locks (r:1 w:1)
 	fn vest_locked(l: u32, ) -> Weight {
-		(42_905_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((232_000 as Weight).saturating_mul(l as Weight))
+		(42_983_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((190_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: Vesting Vesting (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
 	fn vest_unlocked(l: u32, ) -> Weight {
-		(45_650_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((215_000 as Weight).saturating_mul(l as Weight))
+		(46_213_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((158_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Vesting Vesting (r:1 w:0)
+	// Storage: Balances Locks (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn vest_other_locked(l: u32, ) -> Weight {
-		(42_273_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((246_000 as Weight).saturating_mul(l as Weight))
+		(42_644_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((202_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
+	// Storage: Vesting Vesting (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
 	fn vest_other_unlocked(l: u32, ) -> Weight {
-		(45_324_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((214_000 as Weight).saturating_mul(l as Weight))
+		(45_765_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((159_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Vesting Vesting (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
 	fn vested_transfer(l: u32, ) -> Weight {
-		(96_661_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((211_000 as Weight).saturating_mul(l as Weight))
+		(97_417_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((235_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Vesting Vesting (r:1 w:1)
+	// Storage: System Account (r:2 w:2)
+	// Storage: Balances Locks (r:1 w:1)
 	fn force_vested_transfer(l: u32, ) -> Weight {
-		(98_812_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((139_000 as Weight).saturating_mul(l as Weight))
+		(97_661_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((239_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
diff --git a/utils/frame/benchmarking-cli/src/command.rs b/utils/frame/benchmarking-cli/src/command.rs
index 925cfd07d03e..671386a721a0 100644
--- a/utils/frame/benchmarking-cli/src/command.rs
+++ b/utils/frame/benchmarking-cli/src/command.rs
@@ -18,7 +18,8 @@
 use crate::BenchmarkCmd;
 use codec::{Decode, Encode};
 use frame_benchmarking::{
-	Analysis, BenchmarkBatch, BenchmarkList, BenchmarkResults, BenchmarkSelector,
+	Analysis, BenchmarkBatch, BenchmarkBatchSplitResults, BenchmarkList, BenchmarkParameter,
+	BenchmarkResults, BenchmarkSelector,
 };
 use frame_support::traits::StorageInfo;
 use linked_hash_map::LinkedHashMap;
@@ -38,14 +39,18 @@ use std::{fmt::Debug, sync::Arc, time};
 
 // This takes multiple benchmark batches and combines all the results where the pallet, instance,
 // and benchmark are the same.
-fn combine_batches(batches: Vec<BenchmarkBatch>) -> Vec<BenchmarkBatch> {
-	if batches.is_empty() {
-		return batches
+fn combine_batches(
+	time_batches: Vec<BenchmarkBatch>,
+	db_batches: Vec<BenchmarkBatch>,
+) -> Vec<BenchmarkBatchSplitResults> {
+	if time_batches.is_empty() && db_batches.is_empty() {
+		return Default::default()
 	}
 
-	let mut all_benchmarks = LinkedHashMap::<_, Vec<BenchmarkResults>>::new();
+	let mut all_benchmarks =
+		LinkedHashMap::<_, (Vec<BenchmarkResults>, Vec<BenchmarkResults>)>::new();
 
-	batches
+	db_batches
 		.into_iter()
 		.for_each(|BenchmarkBatch { pallet, instance, benchmark, results }| {
 			// We use this key to uniquely identify a benchmark among batches.
@@ -53,21 +58,31 @@ fn combine_batches(batches: Vec<BenchmarkBatch>) -> Vec<BenchmarkBatch> {
 
 			match all_benchmarks.get_mut(&key) {
 				// We already have this benchmark, so we extend the results.
-				Some(x) => x.extend(results),
+				Some(x) => x.1.extend(results),
 				// New benchmark, so we add a new entry with the initial results.
 				None => {
-					all_benchmarks.insert(key, results);
+					all_benchmarks.insert(key, (Vec::new(), results));
 				},
 			}
 		});
 
+	time_batches
+		.into_iter()
+		.for_each(|BenchmarkBatch { pallet, instance, benchmark, results }| {
+			// We use this key to uniquely identify a benchmark among batches.
+			let key = (pallet, instance, benchmark);
+
+			match all_benchmarks.get_mut(&key) {
+				// We already have this benchmark, so we extend the results.
+				Some(x) => x.0.extend(results),
+				None => panic!("all benchmark keys should have been populated by db batches"),
+			}
+		});
+
 	all_benchmarks
 		.into_iter()
-		.map(|((pallet, instance, benchmark), results)| BenchmarkBatch {
-			pallet,
-			instance,
-			benchmark,
-			results,
+		.map(|((pallet, instance, benchmark), (time_results, db_results))| {
+			BenchmarkBatchSplitResults { pallet, instance, benchmark, time_results, db_results }
 		})
 		.collect::<Vec<_>>()
 }
@@ -110,7 +125,14 @@ impl BenchmarkCmd {
 		let genesis_storage = spec.build_storage()?;
 		let mut changes = Default::default();
 		let cache_size = Some(self.database_cache_size as usize);
-		let state = BenchmarkingState::<BB>::new(genesis_storage, cache_size, self.record_proof)?;
+		let state_with_tracking = BenchmarkingState::<BB>::new(
+			genesis_storage.clone(),
+			cache_size,
+			self.record_proof,
+			true,
+		)?;
+		let state_without_tracking =
+			BenchmarkingState::<BB>::new(genesis_storage, cache_size, self.record_proof, false)?;
 		let executor = NativeExecutor::<ExecDispatch>::new(
 			wasm_method,
 			self.heap_pages,
@@ -129,15 +151,16 @@ impl BenchmarkCmd {
 		};
 
 		// Get Benchmark List
+		let state = &state_without_tracking;
 		let result = StateMachine::<_, _, NumberFor<BB>, _>::new(
-			&state,
+			state,
 			None,
 			&mut changes,
 			&executor,
 			"Benchmark_benchmark_metadata",
 			&(self.extra).encode(),
 			extensions(),
-			&sp_state_machine::backend::BackendRuntimeCode::new(&state).runtime_code()?,
+			&sp_state_machine::backend::BackendRuntimeCode::new(state).runtime_code()?,
 			sp_core::testing::TaskExecutor::new(),
 		)
 		.execute(strategy.into())
@@ -147,35 +170,141 @@ impl BenchmarkCmd {
 			<(Vec<BenchmarkList>, Vec<StorageInfo>) as Decode>::decode(&mut &result[..])
 				.map_err(|e| format!("Failed to decode benchmark metadata: {:?}", e))?;
 
-		if self.list {
-			list_benchmark(pallet, extrinsic, list);
-			return Ok(())
-		}
-
 		// Use the benchmark list and the user input to determine the set of benchmarks to run.
 		let mut benchmarks_to_run = Vec::new();
-		for item in list {
-			if pallet == &item.pallet[..] || pallet == &b"*"[..] {
-				if &pallet[..] == &b"*"[..] || &extrinsic[..] == &b"*"[..] {
-					for benchmark in item.benchmarks {
-						benchmarks_to_run.push((item.pallet.clone(), benchmark));
+		list.iter()
+			.filter(|item| pallet.is_empty() || pallet == &b"*"[..] || pallet == &item.pallet[..])
+			.for_each(|item| {
+				for benchmark in &item.benchmarks {
+					if extrinsic.is_empty() ||
+						&extrinsic[..] == &b"*"[..] ||
+						extrinsic == benchmark.name
+					{
+						benchmarks_to_run.push((
+							item.pallet.clone(),
+							benchmark.name.clone(),
+							benchmark.components.clone(),
+						))
 					}
-				} else {
-					benchmarks_to_run.push((pallet.to_vec(), extrinsic.to_vec()));
 				}
-			}
+			});
+
+		if benchmarks_to_run.is_empty() {
+			return Err("No benchmarks found which match your input.".into())
+		}
+
+		if self.list {
+			// List benchmarks instead of running them
+			list_benchmark(benchmarks_to_run);
+			return Ok(())
 		}
 
 		// Run the benchmarks
 		let mut batches = Vec::new();
+		let mut batches_db = Vec::new();
 		let mut timer = time::SystemTime::now();
-		for (pallet, extrinsic) in benchmarks_to_run {
-			for s in 0..self.steps {
-				for r in 0..self.repeat {
-					// This should run only a single instance of a benchmark for `pallet` and
-					// `extrinsic`. All loops happen above.
+		for (pallet, extrinsic, components) in benchmarks_to_run {
+			let all_components = if components.is_empty() {
+				vec![Default::default()]
+			} else {
+				let mut all_components = Vec::new();
+				for (idx, (name, low, high)) in components.iter().enumerate() {
+					let lowest = self.lowest_range_values.get(idx).cloned().unwrap_or(*low);
+					let highest = self.highest_range_values.get(idx).cloned().unwrap_or(*high);
+
+					let diff = highest - lowest;
+
+					// Create up to `STEPS` steps for that component between high and low.
+					let step_size = (diff / self.steps).max(1);
+					let num_of_steps = diff / step_size + 1;
+					for s in 0..num_of_steps {
+						// This is the value we will be testing for component `name`
+						let component_value = lowest + step_size * s;
+
+						// Select the max value for all the other components.
+						let c: Vec<(BenchmarkParameter, u32)> = components
+							.iter()
+							.enumerate()
+							.map(|(idx, (n, _, h))| {
+								if n == name {
+									(*n, component_value)
+								} else {
+									(*n, *self.highest_range_values.get(idx).unwrap_or(h))
+								}
+							})
+							.collect();
+						all_components.push(c);
+					}
+				}
+				all_components
+			};
+			for (s, selected_components) in all_components.iter().enumerate() {
+				// First we run a verification
+				if !self.no_verify {
+					// Dont use these results since verification code will add overhead
+					let state = &state_without_tracking;
+					let _results = StateMachine::<_, _, NumberFor<BB>, _>::new(
+						state,
+						None,
+						&mut changes,
+						&executor,
+						"Benchmark_dispatch_benchmark",
+						&(
+							&pallet.clone(),
+							&extrinsic.clone(),
+							&selected_components.clone(),
+							true, // run verification code
+							1,    // no need to do internal repeats
+						)
+							.encode(),
+						extensions(),
+						&sp_state_machine::backend::BackendRuntimeCode::new(state)
+							.runtime_code()?,
+						sp_core::testing::TaskExecutor::new(),
+					)
+					.execute(strategy.into())
+					.map_err(|e| {
+						format!("Error executing and verifying runtime benchmark: {:?}", e)
+					})?;
+				}
+				// Do one loop of DB tracking.
+				{
+					let state = &state_with_tracking;
+					let result = StateMachine::<_, _, NumberFor<BB>, _>::new(
+						state, // todo remove tracking
+						None,
+						&mut changes,
+						&executor,
+						"Benchmark_dispatch_benchmark",
+						&(
+							&pallet.clone(),
+							&extrinsic.clone(),
+							&selected_components.clone(),
+							false, // dont run verification code for final values
+							self.repeat,
+						)
+							.encode(),
+						extensions(),
+						&sp_state_machine::backend::BackendRuntimeCode::new(state)
+							.runtime_code()?,
+						sp_core::testing::TaskExecutor::new(),
+					)
+					.execute(strategy.into())
+					.map_err(|e| format!("Error executing runtime benchmark: {:?}", e))?;
+
+					let batch =
+						<std::result::Result<Vec<BenchmarkBatch>, String> as Decode>::decode(
+							&mut &result[..],
+						)
+						.map_err(|e| format!("Failed to decode benchmark results: {:?}", e))??;
+
+					batches_db.extend(batch);
+				}
+				// Finally run a bunch of loops to get extrinsic timing information.
+				for r in 0..self.external_repeat {
+					let state = &state_without_tracking;
 					let result = StateMachine::<_, _, NumberFor<BB>, _>::new(
-						&state,
+						state, // todo remove tracking
 						None,
 						&mut changes,
 						&executor,
@@ -183,16 +312,13 @@ impl BenchmarkCmd {
 						&(
 							&pallet.clone(),
 							&extrinsic.clone(),
-							self.lowest_range_values.clone(),
-							self.highest_range_values.clone(),
-							(s, self.steps),
-							(r, self.repeat),
-							!self.no_verify,
-							self.extra,
+							&selected_components.clone(),
+							false, // dont run verification code for final values
+							self.repeat,
 						)
 							.encode(),
 						extensions(),
-						&sp_state_machine::backend::BackendRuntimeCode::new(&state)
+						&sp_state_machine::backend::BackendRuntimeCode::new(state)
 							.runtime_code()?,
 						sp_core::testing::TaskExecutor::new(),
 					)
@@ -217,10 +343,10 @@ impl BenchmarkCmd {
 									.expect("Encoded from String; qed"),
 								String::from_utf8(extrinsic.clone())
 									.expect("Encoded from String; qed"),
-								s,
+								s, // todo show step
 								self.steps,
 								r,
-								self.repeat,
+								self.external_repeat,
 							);
 						}
 					}
@@ -230,7 +356,7 @@ impl BenchmarkCmd {
 
 		// Combine all of the benchmark results, so that benchmarks of the same pallet/function
 		// are together.
-		let batches = combine_batches(batches);
+		let batches: Vec<BenchmarkBatchSplitResults> = combine_batches(batches, batches_db);
 
 		if let Some(output_path) = &self.output {
 			crate::writer::write_results(&batches, &storage_info, output_path, self)?;
@@ -249,17 +375,20 @@ impl BenchmarkCmd {
 			);
 
 			// Skip raw data + analysis if there are no results
-			if batch.results.is_empty() {
+			if batch.time_results.is_empty() {
 				continue
 			}
 
 			if self.raw_data {
 				// Print the table header
-				batch.results[0].components.iter().for_each(|param| print!("{:?},", param.0));
+				batch.time_results[0]
+					.components
+					.iter()
+					.for_each(|param| print!("{:?},", param.0));
 
 				print!("extrinsic_time_ns,storage_root_time_ns,reads,repeat_reads,writes,repeat_writes,proof_size_bytes\n");
 				// Print the values
-				batch.results.iter().for_each(|result| {
+				batch.time_results.iter().for_each(|result| {
 					let parameters = &result.components;
 					parameters.iter().for_each(|param| print!("{:?},", param.1));
 					// Print extrinsic time and storage root time
@@ -282,17 +411,17 @@ impl BenchmarkCmd {
 			if !self.no_median_slopes {
 				println!("Median Slopes Analysis\n========");
 				if let Some(analysis) =
-					Analysis::median_slopes(&batch.results, BenchmarkSelector::ExtrinsicTime)
+					Analysis::median_slopes(&batch.time_results, BenchmarkSelector::ExtrinsicTime)
 				{
 					println!("-- Extrinsic Time --\n{}", analysis);
 				}
 				if let Some(analysis) =
-					Analysis::median_slopes(&batch.results, BenchmarkSelector::Reads)
+					Analysis::median_slopes(&batch.db_results, BenchmarkSelector::Reads)
 				{
 					println!("Reads = {:?}", analysis);
 				}
 				if let Some(analysis) =
-					Analysis::median_slopes(&batch.results, BenchmarkSelector::Writes)
+					Analysis::median_slopes(&batch.db_results, BenchmarkSelector::Writes)
 				{
 					println!("Writes = {:?}", analysis);
 				}
@@ -300,17 +429,17 @@ impl BenchmarkCmd {
 			if !self.no_min_squares {
 				println!("Min Squares Analysis\n========");
 				if let Some(analysis) =
-					Analysis::min_squares_iqr(&batch.results, BenchmarkSelector::ExtrinsicTime)
+					Analysis::min_squares_iqr(&batch.time_results, BenchmarkSelector::ExtrinsicTime)
 				{
 					println!("-- Extrinsic Time --\n{}", analysis);
 				}
 				if let Some(analysis) =
-					Analysis::min_squares_iqr(&batch.results, BenchmarkSelector::Reads)
+					Analysis::min_squares_iqr(&batch.db_results, BenchmarkSelector::Reads)
 				{
 					println!("Reads = {:?}", analysis);
 				}
 				if let Some(analysis) =
-					Analysis::min_squares_iqr(&batch.results, BenchmarkSelector::Writes)
+					Analysis::min_squares_iqr(&batch.db_results, BenchmarkSelector::Writes)
 				{
 					println!("Writes = {:?}", analysis);
 				}
@@ -335,39 +464,9 @@ impl CliConfiguration for BenchmarkCmd {
 }
 
 /// List the benchmarks available in the runtime, in a CSV friendly format.
-///
-/// If `pallet_input` and `extrinsic_input` is empty, we list everything.
-///
-/// If `pallet_input` is present, we only list the benchmarks for that pallet.
-///
-/// If `extrinsic_input` is `*`, we will hide the individual benchmarks for each pallet, and just
-/// show a single line for each available pallet.
-fn list_benchmark(pallet_input: &[u8], extrinsic_input: &[u8], list: Vec<BenchmarkList>) {
-	let filtered_list = list
-		.into_iter()
-		.filter(|item| pallet_input.is_empty() || pallet_input == &item.pallet)
-		.collect::<Vec<_>>();
-
-	if filtered_list.is_empty() {
-		println!("Pallet not found.");
-		return
-	}
-
+fn list_benchmark(benchmarks_to_run: Vec<(Vec<u8>, Vec<u8>, Vec<(BenchmarkParameter, u32, u32)>)>) {
 	println!("pallet, benchmark");
-	for item in filtered_list {
-		let pallet_string =
-			String::from_utf8(item.pallet.clone()).expect("Encoded from String; qed");
-
-		if extrinsic_input == &b"*"[..] {
-			println!("{}, *", pallet_string)
-		} else {
-			for benchmark in item.benchmarks {
-				println!(
-					"{}, {}",
-					pallet_string,
-					String::from_utf8(benchmark).expect("Encoded from String; qed"),
-				);
-			}
-		}
+	for (pallet, extrinsic, _components) in benchmarks_to_run {
+		println!("{}, {}", String::from_utf8_lossy(&pallet), String::from_utf8_lossy(&extrinsic));
 	}
 }
diff --git a/utils/frame/benchmarking-cli/src/lib.rs b/utils/frame/benchmarking-cli/src/lib.rs
index 41629a866f72..51a89f6d5863 100644
--- a/utils/frame/benchmarking-cli/src/lib.rs
+++ b/utils/frame/benchmarking-cli/src/lib.rs
@@ -50,10 +50,16 @@ pub struct BenchmarkCmd {
 	#[structopt(long = "high", use_delimiter = true)]
 	pub highest_range_values: Vec<u32>,
 
-	/// Select how many repetitions of this benchmark should run.
+	/// Select how many repetitions of this benchmark should run from within the wasm.
 	#[structopt(short, long, default_value = "1")]
 	pub repeat: u32,
 
+	/// Select how many repetitions of this benchmark should run from the client.
+	///
+	/// NOTE: Using this alone may give slower results, but will afford you maximum Wasm memory.
+	#[structopt(long, default_value = "1")]
+	pub external_repeat: u32,
+
 	/// Print the raw results.
 	#[structopt(long = "raw")]
 	pub raw_data: bool,
@@ -130,11 +136,9 @@ pub struct BenchmarkCmd {
 	#[structopt(long = "db-cache", value_name = "MiB", default_value = "128")]
 	pub database_cache_size: u32,
 
-	/// List the benchmarks available.
+	/// List the benchmarks that match your query rather than running them.
 	///
-	/// * If nothing else is specified, all pallets and benchmarks will be listed.
-	/// * If the `pallet` argument is passed, then we will only list benchmarks for that pallet.
-	/// * If the `extrinsic` argument is set to `*`, we will hide the individual benchmarks.
+	/// When nothing is provided, we list all benchmarks.
 	#[structopt(long)]
 	pub list: bool,
 }
diff --git a/utils/frame/benchmarking-cli/src/writer.rs b/utils/frame/benchmarking-cli/src/writer.rs
index d80a17e1b2db..b1816d4a7bbc 100644
--- a/utils/frame/benchmarking-cli/src/writer.rs
+++ b/utils/frame/benchmarking-cli/src/writer.rs
@@ -29,7 +29,8 @@ use serde::Serialize;
 
 use crate::BenchmarkCmd;
 use frame_benchmarking::{
-	Analysis, AnalysisChoice, BenchmarkBatch, BenchmarkResults, BenchmarkSelector, RegressionModel,
+	Analysis, AnalysisChoice, BenchmarkBatchSplitResults, BenchmarkResults, BenchmarkSelector,
+	RegressionModel,
 };
 use frame_support::traits::StorageInfo;
 use sp_core::hexdisplay::HexDisplay;
@@ -114,7 +115,7 @@ fn io_error(s: &str) -> std::io::Error {
 // p2 -> [b1, b2]
 // ```
 fn map_results(
-	batches: &[BenchmarkBatch],
+	batches: &[BenchmarkBatchSplitResults],
 	storage_info: &[StorageInfo],
 	analysis_choice: &AnalysisChoice,
 ) -> Result<HashMap<(String, String), Vec<BenchmarkData>>, std::io::Error> {
@@ -129,7 +130,7 @@ fn map_results(
 	let mut batches_iter = batches.iter().peekable();
 	while let Some(batch) = batches_iter.next() {
 		// Skip if there are no results
-		if batch.results.is_empty() {
+		if batch.time_results.is_empty() {
 			continue
 		}
 
@@ -166,7 +167,7 @@ fn extract_errors(model: &Option<RegressionModel>) -> impl Iterator<Item = u128>
 
 // Analyze and return the relevant results for a given benchmark.
 fn get_benchmark_data(
-	batch: &BenchmarkBatch,
+	batch: &BenchmarkBatchSplitResults,
 	storage_info: &[StorageInfo],
 	analysis_choice: &AnalysisChoice,
 ) -> BenchmarkData {
@@ -180,11 +181,11 @@ fn get_benchmark_data(
 		AnalysisChoice::Max => Analysis::max,
 	};
 
-	let extrinsic_time = analysis_function(&batch.results, BenchmarkSelector::ExtrinsicTime)
+	let extrinsic_time = analysis_function(&batch.time_results, BenchmarkSelector::ExtrinsicTime)
 		.expect("analysis function should return an extrinsic time for valid inputs");
-	let reads = analysis_function(&batch.results, BenchmarkSelector::Reads)
+	let reads = analysis_function(&batch.db_results, BenchmarkSelector::Reads)
 		.expect("analysis function should return the number of reads for valid inputs");
-	let writes = analysis_function(&batch.results, BenchmarkSelector::Writes)
+	let writes = analysis_function(&batch.db_results, BenchmarkSelector::Writes)
 		.expect("analysis function should return the number of writes for valid inputs");
 
 	// Analysis data may include components that are not used, this filters out anything whose value is zero.
@@ -238,7 +239,7 @@ fn get_benchmark_data(
 		});
 
 	// This puts a marker on any component which is entirely unused in the weight formula.
-	let components = batch.results[0]
+	let components = batch.time_results[0]
 		.components
 		.iter()
 		.map(|(name, _)| -> Component {
@@ -249,7 +250,7 @@ fn get_benchmark_data(
 		.collect::<Vec<_>>();
 
 	// We add additional comments showing which storage items were touched.
-	add_storage_comments(&mut comments, &batch.results, storage_info);
+	add_storage_comments(&mut comments, &batch.db_results, storage_info);
 
 	BenchmarkData {
 		name: String::from_utf8(batch.benchmark.clone()).unwrap(),
@@ -266,7 +267,7 @@ fn get_benchmark_data(
 
 // Create weight file from benchmark data and Handlebars template.
 pub fn write_results(
-	batches: &[BenchmarkBatch],
+	batches: &[BenchmarkBatchSplitResults],
 	storage_info: &[StorageInfo],
 	path: &PathBuf,
 	cmd: &BenchmarkCmd,
@@ -360,10 +361,21 @@ fn add_storage_comments(
 	results: &[BenchmarkResults],
 	storage_info: &[StorageInfo],
 ) {
-	let storage_info_map = storage_info
+	let mut storage_info_map = storage_info
 		.iter()
 		.map(|info| (info.prefix.clone(), info))
 		.collect::<HashMap<_, _>>();
+
+	// Special hack to show `Skipped Metadata`
+	let skip_storage_info = StorageInfo {
+		pallet_name: b"Skipped".to_vec(),
+		storage_name: b"Metadata".to_vec(),
+		prefix: b"Skipped Metadata".to_vec(),
+		max_values: None,
+		max_size: None,
+	};
+	storage_info_map.insert(skip_storage_info.prefix.clone(), &skip_storage_info);
+
 	// This tracks the keys we already identified, so we only generate a single comment.
 	let mut identified = HashSet::<Vec<u8>>::new();
 
@@ -489,7 +501,7 @@ where
 #[cfg(test)]
 mod test {
 	use super::*;
-	use frame_benchmarking::{BenchmarkBatch, BenchmarkParameter, BenchmarkResults};
+	use frame_benchmarking::{BenchmarkBatchSplitResults, BenchmarkParameter, BenchmarkResults};
 
 	fn test_data(
 		pallet: &[u8],
@@ -497,7 +509,7 @@ mod test {
 		param: BenchmarkParameter,
 		base: u32,
 		slope: u32,
-	) -> BenchmarkBatch {
+	) -> BenchmarkBatchSplitResults {
 		let mut results = Vec::new();
 		for i in 0..5 {
 			results.push(BenchmarkResults {
@@ -513,11 +525,12 @@ mod test {
 			})
 		}
 
-		return BenchmarkBatch {
+		return BenchmarkBatchSplitResults {
 			pallet: [pallet.to_vec(), b"_pallet".to_vec()].concat(),
 			instance: b"instance".to_vec(),
 			benchmark: [benchmark.to_vec(), b"_benchmark".to_vec()].concat(),
-			results,
+			time_results: results.clone(),
+			db_results: results,
 		}
 	}
 

From 2b7309beff2bf1e60f1269cf292c7797f53d7f83 Mon Sep 17 00:00:00 2001
From: Liu-Cheng Xu <xuliuchengxlc@gmail.com>
Date: Sun, 8 Aug 2021 02:38:14 +0800
Subject: [PATCH 1063/1194] Expose UnsafeRpcError (#9515)

---
 client/rpc-api/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/rpc-api/src/lib.rs b/client/rpc-api/src/lib.rs
index 488ae429c1f4..92de1e7fcb34 100644
--- a/client/rpc-api/src/lib.rs
+++ b/client/rpc-api/src/lib.rs
@@ -30,7 +30,7 @@ mod policy;
 pub use helpers::Receiver;
 pub use jsonrpc_core::IoHandlerExtension as RpcExtension;
 pub use metadata::Metadata;
-pub use policy::DenyUnsafe;
+pub use policy::{DenyUnsafe, UnsafeRpcError};
 
 pub mod author;
 pub mod chain;

From 0c9e9019bc850c41e5a5409aceac743b6c4528bf Mon Sep 17 00:00:00 2001
From: zjb0807 <zjb0807@qq.com>
Date: Sun, 8 Aug 2021 02:52:03 +0800
Subject: [PATCH 1064/1194] Support test-runner to submit unsigned_extrinsic
 (#9512)

* support to submit unsigned_extrinsic

* format

* update comment
---
 bin/node/test-runner-example/src/lib.rs |  5 ++++-
 test-utils/test-runner/src/node.rs      | 29 +++++++++++++++++++++----
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/bin/node/test-runner-example/src/lib.rs b/bin/node/test-runner-example/src/lib.rs
index f0b306db6b0c..cee050ba4f30 100644
--- a/bin/node/test-runner-example/src/lib.rs
+++ b/bin/node/test-runner-example/src/lib.rs
@@ -107,7 +107,10 @@ mod tests {
 			// submit extrinsics
 			let alice = MultiSigner::from(Alice.public()).into_account();
 			let _hash = node
-				.submit_extrinsic(frame_system::Call::remark((b"hello world").to_vec()), alice)
+				.submit_extrinsic(
+					frame_system::Call::remark((b"hello world").to_vec()),
+					Some(alice),
+				)
 				.await
 				.unwrap();
 
diff --git a/test-utils/test-runner/src/node.rs b/test-utils/test-runner/src/node.rs
index 83fc23681345..32b8bc5206f5 100644
--- a/test-utils/test-runner/src/node.rs
+++ b/test-utils/test-runner/src/node.rs
@@ -130,6 +130,23 @@ where
 		self.client.clone()
 	}
 
+	/// Return a reference to the pool.
+	pub fn pool(
+		&self,
+	) -> Arc<
+		dyn TransactionPool<
+			Block = <T as ChainInfo>::Block,
+			Hash = <<T as ChainInfo>::Block as BlockT>::Hash,
+			Error = sc_transaction_pool::error::Error,
+			InPoolTransaction = sc_transaction_pool::Transaction<
+				<<T as ChainInfo>::Block as BlockT>::Hash,
+				<<T as ChainInfo>::Block as BlockT>::Extrinsic,
+			>,
+		>,
+	> {
+		self.pool.clone()
+	}
+
 	/// Executes closure in an externalities provided environment.
 	pub fn with_state<R>(&self, closure: impl FnOnce() -> R) -> R
 	where
@@ -164,11 +181,11 @@ where
 		sp_externalities::set_and_run_with_externalities(&mut ext, closure)
 	}
 
-	/// submit some extrinsic to the node, providing the sending account.
+	/// submit some extrinsic to the node. if signer is None, will submit unsigned_extrinsic.
 	pub async fn submit_extrinsic(
 		&self,
 		call: impl Into<<T::Runtime as frame_system::Config>::Call>,
-		from: <T::Runtime as frame_system::Config>::AccountId,
+		signer: Option<<T::Runtime as frame_system::Config>::AccountId>,
 	) -> Result<<T::Block as BlockT>::Hash, sc_transaction_pool::error::Error>
 	where
 		<T::Block as BlockT>::Extrinsic: From<
@@ -183,8 +200,12 @@ where
 			>,
 		>,
 	{
-		let extra = self.with_state(|| T::signed_extras(from.clone()));
-		let signed_data = Some((from.into(), MultiSignature::Sr25519(Default::default()), extra));
+		let signed_data = if let Some(signer) = signer {
+			let extra = self.with_state(|| T::signed_extras(signer.clone()));
+			Some((signer.into(), MultiSignature::Sr25519(Default::default()), extra))
+		} else {
+			None
+		};
 		let ext = UncheckedExtrinsic::<
 			MultiAddress<
 				<T::Runtime as frame_system::Config>::AccountId,

From 9d867b6b4dd099ecef7bed1a1ff5a3441f41d684 Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Sat, 7 Aug 2021 21:26:40 +0200
Subject: [PATCH 1065/1194] Remove Filter and use Contains instead (#9514)

* Remove Filter and use Contains instead

* Fixes

* Formatting

* Update docs/Upgrading-2.0-to-3.0.md

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Typo

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
---
 .../pallets/template/src/mock.rs              |   2 +-
 bin/node-template/runtime/src/lib.rs          |   2 +-
 bin/node/runtime/src/lib.rs                   |   8 +-
 frame/assets/src/mock.rs                      |   2 +-
 frame/atomic-swap/src/tests.rs                |   2 +-
 frame/aura/src/mock.rs                        |   2 +-
 frame/authority-discovery/src/lib.rs          |   2 +-
 frame/authorship/src/lib.rs                   |   2 +-
 frame/babe/src/mock.rs                        |   2 +-
 frame/balances/src/tests_composite.rs         |   2 +-
 frame/balances/src/tests_local.rs             |   2 +-
 frame/balances/src/tests_reentrancy.rs        |   2 +-
 frame/benchmarking/src/tests.rs               |   2 +-
 frame/benchmarking/src/tests_instance.rs      |   2 +-
 frame/bounties/src/tests.rs                   |   2 +-
 frame/collective/src/lib.rs                   |   2 +-
 frame/contracts/src/exec.rs                   |   4 +-
 frame/contracts/src/lib.rs                    |   4 +-
 frame/contracts/src/tests.rs                  |   8 +-
 frame/democracy/src/tests.rs                  |   8 +-
 .../election-provider-multi-phase/src/mock.rs |   2 +-
 frame/elections-phragmen/src/lib.rs           |   2 +-
 frame/elections/src/mock.rs                   |   2 +-
 frame/example-offchain-worker/src/tests.rs    |   2 +-
 frame/example-parallel/src/tests.rs           |   2 +-
 frame/example/src/tests.rs                    |   2 +-
 frame/executive/src/lib.rs                    |   2 +-
 frame/gilt/src/mock.rs                        |   2 +-
 frame/grandpa/src/mock.rs                     |   2 +-
 frame/identity/src/tests.rs                   |   2 +-
 frame/im-online/src/mock.rs                   |   2 +-
 frame/indices/src/mock.rs                     |   2 +-
 frame/lottery/src/mock.rs                     |   2 +-
 frame/membership/src/lib.rs                   |   2 +-
 frame/merkle-mountain-range/src/mock.rs       |   2 +-
 frame/multisig/src/tests.rs                   |   6 +-
 frame/nicks/src/lib.rs                        |   2 +-
 frame/node-authorization/src/mock.rs          |   2 +-
 frame/offences/benchmarking/src/mock.rs       |   2 +-
 frame/offences/src/mock.rs                    |   2 +-
 frame/proxy/src/tests.rs                      |   7 +-
 frame/randomness-collective-flip/src/lib.rs   |   2 +-
 frame/recovery/src/mock.rs                    |   2 +-
 frame/scheduler/src/lib.rs                    |  18 +--
 frame/scored-pool/src/mock.rs                 |   2 +-
 frame/session/benchmarking/src/mock.rs        |   2 +-
 frame/session/src/mock.rs                     |   2 +-
 frame/society/src/mock.rs                     |   2 +-
 frame/staking/fuzzer/src/mock.rs              |   2 +-
 frame/staking/src/lib.rs                      |   2 +-
 frame/staking/src/mock.rs                     |   2 +-
 frame/sudo/src/mock.rs                        |   6 +-
 .../src/construct_runtime/expand/origin.rs    |   4 +-
 frame/support/src/dispatch.rs                 |   2 +-
 frame/support/src/traits.rs                   |  11 +-
 frame/support/src/traits/filter.rs            | 139 ++++++++----------
 frame/support/src/traits/members.rs           |  29 +++-
 frame/support/test/tests/construct_runtime.rs |   8 +-
 frame/support/test/tests/instance.rs          |   2 +-
 frame/support/test/tests/issue2219.rs         |   2 +-
 frame/support/test/tests/pallet.rs            |   2 +-
 .../test/tests/pallet_compatibility.rs        |   2 +-
 .../tests/pallet_compatibility_instance.rs    |   2 +-
 frame/support/test/tests/pallet_instance.rs   |   2 +-
 .../tests/pallet_with_name_trait_is_valid.rs  |   2 +-
 frame/support/test/tests/system.rs            |   2 +-
 frame/system/benches/bench.rs                 |   2 +-
 frame/system/benchmarking/src/mock.rs         |   2 +-
 frame/system/src/lib.rs                       |   4 +-
 frame/system/src/mock.rs                      |   2 +-
 frame/timestamp/src/lib.rs                    |   2 +-
 frame/tips/src/tests.rs                       |   2 +-
 frame/transaction-payment/src/lib.rs          |   2 +-
 frame/transaction-storage/src/mock.rs         |   2 +-
 frame/treasury/src/tests.rs                   |   2 +-
 frame/uniques/src/mock.rs                     |   2 +-
 frame/utility/src/tests.rs                    |   8 +-
 frame/vesting/src/mock.rs                     |   2 +-
 test-utils/runtime/src/lib.rs                 |   2 +-
 79 files changed, 199 insertions(+), 199 deletions(-)

diff --git a/bin/node-template/pallets/template/src/mock.rs b/bin/node-template/pallets/template/src/mock.rs
index 76742477000f..4532d3d09b49 100644
--- a/bin/node-template/pallets/template/src/mock.rs
+++ b/bin/node-template/pallets/template/src/mock.rs
@@ -28,7 +28,7 @@ parameter_types! {
 }
 
 impl system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index afd31b8f7b5b..63d79e604791 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -144,7 +144,7 @@ parameter_types! {
 
 impl frame_system::Config for Runtime {
 	/// The basic call filter to use in dispatchable.
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	/// Block & extrinsics weights: base values and limits.
 	type BlockWeights = BlockWeights;
 	/// The maximum length of a block (in bytes).
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 1cd41d6e6d96..7466c940d65d 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -26,8 +26,8 @@ use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::{
 	construct_runtime, parameter_types,
 	traits::{
-		AllowAll, Currency, DenyAll, Imbalance, InstanceFilter, KeyOwnerProofSystem,
-		LockIdentifier, OnUnbalanced, U128CurrencyToVote,
+		Currency, Everything, Imbalance, InstanceFilter, KeyOwnerProofSystem, LockIdentifier,
+		Nothing, OnUnbalanced, U128CurrencyToVote,
 	},
 	weights::{
 		constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
@@ -192,7 +192,7 @@ parameter_types! {
 const_assert!(NORMAL_DISPATCH_RATIO.deconstruct() >= AVERAGE_ON_INITIALIZE_RATIO.deconstruct());
 
 impl frame_system::Config for Runtime {
-	type BaseCallFilter = AllowAll;
+	type BaseCallFilter = Everything;
 	type BlockWeights = RuntimeBlockWeights;
 	type BlockLength = RuntimeBlockLength;
 	type DbWeight = RocksDbWeight;
@@ -857,7 +857,7 @@ impl pallet_contracts::Config for Runtime {
 	/// and make sure they are stable. Dispatchables exposed to contracts are not allowed to
 	/// change because that would break already deployed contracts. The `Call` structure itself
 	/// is not allowed to change the indices of existing pallets, too.
-	type CallFilter = DenyAll;
+	type CallFilter = Nothing;
 	type RentPayment = ();
 	type SignedClaimHandicap = SignedClaimHandicap;
 	type TombstoneDeposit = TombstoneDeposit;
diff --git a/frame/assets/src/mock.rs b/frame/assets/src/mock.rs
index e4f5763f149f..1b2602792d84 100644
--- a/frame/assets/src/mock.rs
+++ b/frame/assets/src/mock.rs
@@ -46,7 +46,7 @@ parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 }
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type Origin = Origin;
diff --git a/frame/atomic-swap/src/tests.rs b/frame/atomic-swap/src/tests.rs
index 2165b403dd35..a76d0f20ffa3 100644
--- a/frame/atomic-swap/src/tests.rs
+++ b/frame/atomic-swap/src/tests.rs
@@ -31,7 +31,7 @@ parameter_types! {
 		frame_system::limits::BlockWeights::simple_max(1024);
 }
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/aura/src/mock.rs b/frame/aura/src/mock.rs
index 8d604e527c99..0e258fb9a67d 100644
--- a/frame/aura/src/mock.rs
+++ b/frame/aura/src/mock.rs
@@ -55,7 +55,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/authority-discovery/src/lib.rs b/frame/authority-discovery/src/lib.rs
index e30bcb629662..4577a9dd1722 100644
--- a/frame/authority-discovery/src/lib.rs
+++ b/frame/authority-discovery/src/lib.rs
@@ -202,7 +202,7 @@ mod tests {
 	}
 
 	impl frame_system::Config for Test {
-		type BaseCallFilter = frame_support::traits::AllowAll;
+		type BaseCallFilter = frame_support::traits::Everything;
 		type BlockWeights = ();
 		type BlockLength = ();
 		type DbWeight = ();
diff --git a/frame/authorship/src/lib.rs b/frame/authorship/src/lib.rs
index 73efbbe30b01..43d48df46437 100644
--- a/frame/authorship/src/lib.rs
+++ b/frame/authorship/src/lib.rs
@@ -435,7 +435,7 @@ mod tests {
 	}
 
 	impl frame_system::Config for Test {
-		type BaseCallFilter = frame_support::traits::AllowAll;
+		type BaseCallFilter = frame_support::traits::Everything;
 		type BlockWeights = ();
 		type BlockLength = ();
 		type DbWeight = ();
diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index a034360c3fec..f872fb23b12a 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -74,7 +74,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/balances/src/tests_composite.rs b/frame/balances/src/tests_composite.rs
index e2d50e8b88aa..f6faebed3931 100644
--- a/frame/balances/src/tests_composite.rs
+++ b/frame/balances/src/tests_composite.rs
@@ -50,7 +50,7 @@ parameter_types! {
 	pub static ExistentialDeposit: u64 = 0;
 }
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = BlockWeights;
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/balances/src/tests_local.rs b/frame/balances/src/tests_local.rs
index 668c335376c6..d8c07aa9c42e 100644
--- a/frame/balances/src/tests_local.rs
+++ b/frame/balances/src/tests_local.rs
@@ -52,7 +52,7 @@ parameter_types! {
 	pub static ExistentialDeposit: u64 = 0;
 }
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = BlockWeights;
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/balances/src/tests_reentrancy.rs b/frame/balances/src/tests_reentrancy.rs
index 8682949b2c55..9c7ba3e1ec82 100644
--- a/frame/balances/src/tests_reentrancy.rs
+++ b/frame/balances/src/tests_reentrancy.rs
@@ -54,7 +54,7 @@ parameter_types! {
 	pub static ExistentialDeposit: u64 = 0;
 }
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = BlockWeights;
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/benchmarking/src/tests.rs b/frame/benchmarking/src/tests.rs
index f092b41b65c3..9cb5043a0dd7 100644
--- a/frame/benchmarking/src/tests.rs
+++ b/frame/benchmarking/src/tests.rs
@@ -87,7 +87,7 @@ frame_support::construct_runtime!(
 );
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/benchmarking/src/tests_instance.rs b/frame/benchmarking/src/tests_instance.rs
index 221e9faa5c4a..caccebd39c70 100644
--- a/frame/benchmarking/src/tests_instance.rs
+++ b/frame/benchmarking/src/tests_instance.rs
@@ -87,7 +87,7 @@ frame_support::construct_runtime!(
 );
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/bounties/src/tests.rs b/frame/bounties/src/tests.rs
index 5ce1373ed906..f945d0b2dbd2 100644
--- a/frame/bounties/src/tests.rs
+++ b/frame/bounties/src/tests.rs
@@ -59,7 +59,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/collective/src/lib.rs b/frame/collective/src/lib.rs
index 0747e4e9ade0..39da8e2c45fb 100644
--- a/frame/collective/src/lib.rs
+++ b/frame/collective/src/lib.rs
@@ -1011,7 +1011,7 @@ mod tests {
 			frame_system::limits::BlockWeights::simple_max(1024);
 	}
 	impl frame_system::Config for Test {
-		type BaseCallFilter = frame_support::traits::AllowAll;
+		type BaseCallFilter = frame_support::traits::Everything;
 		type BlockWeights = ();
 		type BlockLength = ();
 		type DbWeight = ();
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index 16c4886746d1..a3b48ca3bcc9 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -26,7 +26,7 @@ use frame_support::{
 	dispatch::{DispatchError, DispatchResult, DispatchResultWithPostInfo, Dispatchable},
 	ensure,
 	storage::{with_transaction, TransactionOutcome},
-	traits::{Currency, ExistenceRequirement, Filter, Get, OriginTrait, Randomness, Time},
+	traits::{Contains, Currency, ExistenceRequirement, Get, OriginTrait, Randomness, Time},
 	weights::Weight,
 	DefaultNoBound,
 };
@@ -1255,7 +1255,7 @@ where
 
 	fn call_runtime(&self, call: <Self::T as Config>::Call) -> DispatchResultWithPostInfo {
 		let mut origin: T::Origin = RawOrigin::Signed(self.address().clone()).into();
-		origin.add_filter(T::CallFilter::filter);
+		origin.add_filter(T::CallFilter::contains);
 		call.dispatch(origin)
 	}
 }
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index 74ab6578f797..4860937c423e 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -111,7 +111,7 @@ use crate::{
 };
 use frame_support::{
 	dispatch::Dispatchable,
-	traits::{Currency, Filter, Get, OnUnbalanced, Randomness, StorageVersion, Time},
+	traits::{Contains, Currency, Get, OnUnbalanced, Randomness, StorageVersion, Time},
 	weights::{GetDispatchInfo, PostDispatchInfo, Weight, WithPostDispatchInfo},
 };
 use frame_system::Pallet as System;
@@ -189,7 +189,7 @@ pub mod pallet {
 		/// Therefore please make sure to be restrictive about which dispatchables are allowed
 		/// in order to not introduce a new DoS vector like memory allocation patterns that can
 		/// be exploited to drive the runtime into a panic.
-		type CallFilter: Filter<<Self as frame_system::Config>::Call>;
+		type CallFilter: Contains<<Self as frame_system::Config>::Call>;
 
 		/// Handler for rent payments.
 		type RentPayment: OnUnbalanced<NegativeImbalanceOf<Self>>;
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index db5f3ba92a70..81d973221b6c 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -33,7 +33,7 @@ use frame_support::{
 	dispatch::DispatchErrorWithPostInfo,
 	parameter_types,
 	storage::child,
-	traits::{Currency, Filter, OnInitialize, ReservableCurrency},
+	traits::{Contains, Currency, OnInitialize, ReservableCurrency},
 	weights::{constants::WEIGHT_PER_SECOND, DispatchClass, PostDispatchInfo, Weight},
 };
 use frame_system::{self as system, EventRecord, Phase};
@@ -197,7 +197,7 @@ parameter_types! {
 	pub static ExistentialDeposit: u64 = 0;
 }
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = BlockWeights;
 	type BlockLength = ();
 	type DbWeight = ();
@@ -282,8 +282,8 @@ impl TestFilter {
 	}
 }
 
-impl Filter<Call> for TestFilter {
-	fn filter(call: &Call) -> bool {
+impl Contains<Call> for TestFilter {
+	fn contains(call: &Call) -> bool {
 		CALL_FILTER.with(|fltr| fltr.borrow()(call))
 	}
 }
diff --git a/frame/democracy/src/tests.rs b/frame/democracy/src/tests.rs
index 64444304db67..46d3cade36eb 100644
--- a/frame/democracy/src/tests.rs
+++ b/frame/democracy/src/tests.rs
@@ -22,7 +22,7 @@ use crate as pallet_democracy;
 use codec::Encode;
 use frame_support::{
 	assert_noop, assert_ok, ord_parameter_types, parameter_types,
-	traits::{Filter, GenesisBuild, OnInitialize, SortedMembers},
+	traits::{Contains, GenesisBuild, OnInitialize, SortedMembers},
 	weights::Weight,
 };
 use frame_system::{EnsureRoot, EnsureSignedBy};
@@ -70,8 +70,8 @@ frame_support::construct_runtime!(
 
 // Test that a fitlered call can be dispatched.
 pub struct BaseFilter;
-impl Filter<Call> for BaseFilter {
-	fn filter(call: &Call) -> bool {
+impl Contains<Call> for BaseFilter {
+	fn contains(call: &Call) -> bool {
 		!matches!(call, &Call::Balances(pallet_balances::Call::set_balance(..)))
 	}
 }
@@ -231,7 +231,7 @@ fn set_balance_proposal(value: u64) -> Vec<u8> {
 fn set_balance_proposal_is_correctly_filtered_out() {
 	for i in 0..10 {
 		let call = Call::decode(&mut &set_balance_proposal(i)[..]).unwrap();
-		assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
+		assert!(!<Test as frame_system::Config>::BaseCallFilter::contains(&call));
 	}
 }
 
diff --git a/frame/election-provider-multi-phase/src/mock.rs b/frame/election-provider-multi-phase/src/mock.rs
index 56007f15f84a..94fdb4559027 100644
--- a/frame/election-provider-multi-phase/src/mock.rs
+++ b/frame/election-provider-multi-phase/src/mock.rs
@@ -195,7 +195,7 @@ pub fn witness() -> SolutionOrSnapshotSize {
 
 impl frame_system::Config for Runtime {
 	type SS58Prefix = ();
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u64;
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index 144997c60c2e..b67680b9abce 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -1120,7 +1120,7 @@ mod tests {
 	}
 
 	impl frame_system::Config for Test {
-		type BaseCallFilter = frame_support::traits::AllowAll;
+		type BaseCallFilter = frame_support::traits::Everything;
 		type BlockWeights = BlockWeights;
 		type BlockLength = ();
 		type DbWeight = ();
diff --git a/frame/elections/src/mock.rs b/frame/elections/src/mock.rs
index 78982f7af398..91318e1e07bc 100644
--- a/frame/elections/src/mock.rs
+++ b/frame/elections/src/mock.rs
@@ -37,7 +37,7 @@ parameter_types! {
 		frame_system::limits::BlockWeights::simple_max(1024);
 }
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/example-offchain-worker/src/tests.rs b/frame/example-offchain-worker/src/tests.rs
index 706569e0e18d..d0a3664abf4a 100644
--- a/frame/example-offchain-worker/src/tests.rs
+++ b/frame/example-offchain-worker/src/tests.rs
@@ -54,7 +54,7 @@ parameter_types! {
 		frame_system::limits::BlockWeights::simple_max(1024);
 }
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/example-parallel/src/tests.rs b/frame/example-parallel/src/tests.rs
index f67c5ae51b50..4c36f0d6eb85 100644
--- a/frame/example-parallel/src/tests.rs
+++ b/frame/example-parallel/src/tests.rs
@@ -45,7 +45,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type Origin = Origin;
 	type Call = Call;
 	type PalletInfo = PalletInfo;
diff --git a/frame/example/src/tests.rs b/frame/example/src/tests.rs
index 18089888dba1..645b5c9bc13a 100644
--- a/frame/example/src/tests.rs
+++ b/frame/example/src/tests.rs
@@ -56,7 +56,7 @@ parameter_types! {
 		frame_system::limits::BlockWeights::simple_max(1024);
 }
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index 3e2cdd241f6d..8f857d2c8212 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -701,7 +701,7 @@ mod tests {
 		};
 	}
 	impl frame_system::Config for Runtime {
-		type BaseCallFilter = frame_support::traits::AllowAll;
+		type BaseCallFilter = frame_support::traits::Everything;
 		type BlockWeights = BlockWeights;
 		type BlockLength = ();
 		type DbWeight = ();
diff --git a/frame/gilt/src/mock.rs b/frame/gilt/src/mock.rs
index 91606f185231..ac3f4df1b71d 100644
--- a/frame/gilt/src/mock.rs
+++ b/frame/gilt/src/mock.rs
@@ -51,7 +51,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type Origin = Origin;
diff --git a/frame/grandpa/src/mock.rs b/frame/grandpa/src/mock.rs
index 882acdb4bcc1..b9c4858e353e 100644
--- a/frame/grandpa/src/mock.rs
+++ b/frame/grandpa/src/mock.rs
@@ -75,7 +75,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/identity/src/tests.rs b/frame/identity/src/tests.rs
index 3e1219ad64f2..c842b0e2f64b 100644
--- a/frame/identity/src/tests.rs
+++ b/frame/identity/src/tests.rs
@@ -50,7 +50,7 @@ parameter_types! {
 		frame_system::limits::BlockWeights::simple_max(1024);
 }
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type Origin = Origin;
diff --git a/frame/im-online/src/mock.rs b/frame/im-online/src/mock.rs
index a04da49c6526..e4031b04271b 100644
--- a/frame/im-online/src/mock.rs
+++ b/frame/im-online/src/mock.rs
@@ -116,7 +116,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Runtime {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/indices/src/mock.rs b/frame/indices/src/mock.rs
index e026e36bc389..f4c87016141b 100644
--- a/frame/indices/src/mock.rs
+++ b/frame/indices/src/mock.rs
@@ -46,7 +46,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/lottery/src/mock.rs b/frame/lottery/src/mock.rs
index 253923de0d5e..d1f090aa26dc 100644
--- a/frame/lottery/src/mock.rs
+++ b/frame/lottery/src/mock.rs
@@ -56,7 +56,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/membership/src/lib.rs b/frame/membership/src/lib.rs
index f43c056658f3..a9bc59a361f0 100644
--- a/frame/membership/src/lib.rs
+++ b/frame/membership/src/lib.rs
@@ -499,7 +499,7 @@ mod tests {
 	}
 
 	impl frame_system::Config for Test {
-		type BaseCallFilter = frame_support::traits::AllowAll;
+		type BaseCallFilter = frame_support::traits::Everything;
 		type BlockWeights = ();
 		type BlockLength = ();
 		type DbWeight = ();
diff --git a/frame/merkle-mountain-range/src/mock.rs b/frame/merkle-mountain-range/src/mock.rs
index 4a6b224b051b..3616a8d1d524 100644
--- a/frame/merkle-mountain-range/src/mock.rs
+++ b/frame/merkle-mountain-range/src/mock.rs
@@ -46,7 +46,7 @@ parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 }
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type Origin = Origin;
 	type Call = Call;
 	type Index = u64;
diff --git a/frame/multisig/src/tests.rs b/frame/multisig/src/tests.rs
index 6dba6f7d4ab5..635906d47cd6 100644
--- a/frame/multisig/src/tests.rs
+++ b/frame/multisig/src/tests.rs
@@ -22,7 +22,7 @@
 use super::*;
 
 use crate as pallet_multisig;
-use frame_support::{assert_noop, assert_ok, parameter_types, traits::Filter};
+use frame_support::{assert_noop, assert_ok, parameter_types, traits::Contains};
 use sp_core::H256;
 use sp_runtime::{
 	testing::Header,
@@ -94,8 +94,8 @@ parameter_types! {
 	pub const MaxSignatories: u16 = 3;
 }
 pub struct TestBaseCallFilter;
-impl Filter<Call> for TestBaseCallFilter {
-	fn filter(c: &Call) -> bool {
+impl Contains<Call> for TestBaseCallFilter {
+	fn contains(c: &Call) -> bool {
 		match *c {
 			Call::Balances(_) => true,
 			// Needed for benchmarking
diff --git a/frame/nicks/src/lib.rs b/frame/nicks/src/lib.rs
index d78f1c446565..a5c22b619a5e 100644
--- a/frame/nicks/src/lib.rs
+++ b/frame/nicks/src/lib.rs
@@ -282,7 +282,7 @@ mod tests {
 			frame_system::limits::BlockWeights::simple_max(1024);
 	}
 	impl frame_system::Config for Test {
-		type BaseCallFilter = frame_support::traits::AllowAll;
+		type BaseCallFilter = frame_support::traits::Everything;
 		type BlockWeights = ();
 		type BlockLength = ();
 		type DbWeight = ();
diff --git a/frame/node-authorization/src/mock.rs b/frame/node-authorization/src/mock.rs
index 302378f48ce6..6c79f601c197 100644
--- a/frame/node-authorization/src/mock.rs
+++ b/frame/node-authorization/src/mock.rs
@@ -48,7 +48,7 @@ parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 }
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type DbWeight = ();
 	type BlockWeights = ();
 	type BlockLength = ();
diff --git a/frame/offences/benchmarking/src/mock.rs b/frame/offences/benchmarking/src/mock.rs
index 6fc5ee8b66eb..3416dafa3547 100644
--- a/frame/offences/benchmarking/src/mock.rs
+++ b/frame/offences/benchmarking/src/mock.rs
@@ -40,7 +40,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/offences/src/mock.rs b/frame/offences/src/mock.rs
index 84114f015089..5e4c94944b6f 100644
--- a/frame/offences/src/mock.rs
+++ b/frame/offences/src/mock.rs
@@ -88,7 +88,7 @@ parameter_types! {
 		frame_system::limits::BlockWeights::simple_max(2 * WEIGHT_PER_SECOND);
 }
 impl frame_system::Config for Runtime {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = RocksDbWeight;
diff --git a/frame/proxy/src/tests.rs b/frame/proxy/src/tests.rs
index 536a226c7b46..df88f17b71a5 100644
--- a/frame/proxy/src/tests.rs
+++ b/frame/proxy/src/tests.rs
@@ -24,7 +24,8 @@ use super::*;
 use crate as proxy;
 use codec::{Decode, Encode};
 use frame_support::{
-	assert_noop, assert_ok, dispatch::DispatchError, parameter_types, traits::Filter, RuntimeDebug,
+	assert_noop, assert_ok, dispatch::DispatchError, parameter_types, traits::Contains,
+	RuntimeDebug,
 };
 use sp_core::H256;
 use sp_runtime::{
@@ -132,8 +133,8 @@ impl InstanceFilter<Call> for ProxyType {
 	}
 }
 pub struct BaseFilter;
-impl Filter<Call> for BaseFilter {
-	fn filter(c: &Call) -> bool {
+impl Contains<Call> for BaseFilter {
+	fn contains(c: &Call) -> bool {
 		match *c {
 			// Remark is used as a no-op call in the benchmarking
 			Call::System(SystemCall::remark(_)) => true,
diff --git a/frame/randomness-collective-flip/src/lib.rs b/frame/randomness-collective-flip/src/lib.rs
index 64a263dd5bbd..1b1d5cb5cd82 100644
--- a/frame/randomness-collective-flip/src/lib.rs
+++ b/frame/randomness-collective-flip/src/lib.rs
@@ -196,7 +196,7 @@ mod tests {
 	}
 
 	impl frame_system::Config for Test {
-		type BaseCallFilter = frame_support::traits::AllowAll;
+		type BaseCallFilter = frame_support::traits::Everything;
 		type BlockWeights = ();
 		type BlockLength = BlockLength;
 		type DbWeight = ();
diff --git a/frame/recovery/src/mock.rs b/frame/recovery/src/mock.rs
index c9c01e35bf9b..f6d4a6b15943 100644
--- a/frame/recovery/src/mock.rs
+++ b/frame/recovery/src/mock.rs
@@ -52,7 +52,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/scheduler/src/lib.rs b/frame/scheduler/src/lib.rs
index 6cbf172d26d8..cb6aaeb9a93d 100644
--- a/frame/scheduler/src/lib.rs
+++ b/frame/scheduler/src/lib.rs
@@ -833,7 +833,7 @@ mod tests {
 	use crate as scheduler;
 	use frame_support::{
 		assert_err, assert_noop, assert_ok, ord_parameter_types, parameter_types,
-		traits::{Filter, OnFinalize, OnInitialize},
+		traits::{Contains, OnFinalize, OnInitialize},
 		weights::constants::RocksDbWeight,
 		Hashable,
 	};
@@ -925,8 +925,8 @@ mod tests {
 
 	// Scheduler must dispatch with root and no filter, this tests base filter is indeed not used.
 	pub struct BaseFilter;
-	impl Filter<Call> for BaseFilter {
-		fn filter(call: &Call) -> bool {
+	impl Contains<Call> for BaseFilter {
+		fn contains(call: &Call) -> bool {
 			!matches!(call, Call::Logger(LoggerCall::log(_, _)))
 		}
 	}
@@ -1006,7 +1006,7 @@ mod tests {
 	fn basic_scheduling_works() {
 		new_test_ext().execute_with(|| {
 			let call = Call::Logger(LoggerCall::log(42, 1000));
-			assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
+			assert!(!<Test as frame_system::Config>::BaseCallFilter::contains(&call));
 			assert_ok!(Scheduler::do_schedule(DispatchTime::At(4), None, 127, root(), call));
 			run_to_block(3);
 			assert!(logger::log().is_empty());
@@ -1022,7 +1022,7 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			run_to_block(2);
 			let call = Call::Logger(LoggerCall::log(42, 1000));
-			assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
+			assert!(!<Test as frame_system::Config>::BaseCallFilter::contains(&call));
 			// This will schedule the call 3 blocks after the next block... so block 3 + 3 = 6
 			assert_ok!(Scheduler::do_schedule(DispatchTime::After(3), None, 127, root(), call));
 			run_to_block(5);
@@ -1039,7 +1039,7 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			run_to_block(2);
 			let call = Call::Logger(LoggerCall::log(42, 1000));
-			assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
+			assert!(!<Test as frame_system::Config>::BaseCallFilter::contains(&call));
 			assert_ok!(Scheduler::do_schedule(DispatchTime::After(0), None, 127, root(), call));
 			// Will trigger on the next block.
 			run_to_block(3);
@@ -1081,7 +1081,7 @@ mod tests {
 	fn reschedule_works() {
 		new_test_ext().execute_with(|| {
 			let call = Call::Logger(LoggerCall::log(42, 1000));
-			assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
+			assert!(!<Test as frame_system::Config>::BaseCallFilter::contains(&call));
 			assert_eq!(
 				Scheduler::do_schedule(DispatchTime::At(4), None, 127, root(), call).unwrap(),
 				(4, 0)
@@ -1112,7 +1112,7 @@ mod tests {
 	fn reschedule_named_works() {
 		new_test_ext().execute_with(|| {
 			let call = Call::Logger(LoggerCall::log(42, 1000));
-			assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
+			assert!(!<Test as frame_system::Config>::BaseCallFilter::contains(&call));
 			assert_eq!(
 				Scheduler::do_schedule_named(
 					1u32.encode(),
@@ -1154,7 +1154,7 @@ mod tests {
 	fn reschedule_named_perodic_works() {
 		new_test_ext().execute_with(|| {
 			let call = Call::Logger(LoggerCall::log(42, 1000));
-			assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
+			assert!(!<Test as frame_system::Config>::BaseCallFilter::contains(&call));
 			assert_eq!(
 				Scheduler::do_schedule_named(
 					1u32.encode(),
diff --git a/frame/scored-pool/src/mock.rs b/frame/scored-pool/src/mock.rs
index 80ded36fbf0a..5c5425ae2bdd 100644
--- a/frame/scored-pool/src/mock.rs
+++ b/frame/scored-pool/src/mock.rs
@@ -58,7 +58,7 @@ ord_parameter_types! {
 }
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/session/benchmarking/src/mock.rs b/frame/session/benchmarking/src/mock.rs
index bd61acb9de18..672862f5ed99 100644
--- a/frame/session/benchmarking/src/mock.rs
+++ b/frame/session/benchmarking/src/mock.rs
@@ -45,7 +45,7 @@ frame_support::construct_runtime!(
 );
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/session/src/mock.rs b/frame/session/src/mock.rs
index 7007286de641..449acaff5305 100644
--- a/frame/session/src/mock.rs
+++ b/frame/session/src/mock.rs
@@ -234,7 +234,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/society/src/mock.rs b/frame/society/src/mock.rs
index 2ae9f7b44ba7..38c258632313 100644
--- a/frame/society/src/mock.rs
+++ b/frame/society/src/mock.rs
@@ -69,7 +69,7 @@ ord_parameter_types! {
 }
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/staking/fuzzer/src/mock.rs b/frame/staking/fuzzer/src/mock.rs
index 98181ca2694d..921e0d3b48d7 100644
--- a/frame/staking/fuzzer/src/mock.rs
+++ b/frame/staking/fuzzer/src/mock.rs
@@ -42,7 +42,7 @@ frame_support::construct_runtime!(
 );
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index 7f8774b94efb..a25995df6e45 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -60,7 +60,7 @@
 //! #### Staking
 //!
 //! Almost any interaction with the Staking pallet requires a process of _**bonding**_ (also known
-//! as being a _staker_). To become *bonded*, a fund-holding account known as the _stash account_,
+//! as being a _staker_). To become *bonded*, a fund-holding register known as the _stash account_,
 //! which holds some or all of the funds that become frozen in place as part of the staking process,
 //! is paired with an active **controller** account, which issues instructions on how they shall be
 //! used.
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index 9d50a43754e7..3d9465ed872d 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -135,7 +135,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = RocksDbWeight;
diff --git a/frame/sudo/src/mock.rs b/frame/sudo/src/mock.rs
index 4fa24dd56ce5..7fd55a618a6b 100644
--- a/frame/sudo/src/mock.rs
+++ b/frame/sudo/src/mock.rs
@@ -21,7 +21,7 @@ use super::*;
 use crate as sudo;
 use frame_support::{
 	parameter_types,
-	traits::{Filter, GenesisBuild},
+	traits::{Contains, GenesisBuild},
 };
 use frame_system::limits;
 use sp_core::H256;
@@ -115,8 +115,8 @@ parameter_types! {
 }
 
 pub struct BlockEverything;
-impl Filter<Call> for BlockEverything {
-	fn filter(_: &Call) -> bool {
+impl Contains<Call> for BlockEverything {
+	fn contains(_: &Call) -> bool {
 		false
 	}
 }
diff --git a/frame/support/procedural/src/construct_runtime/expand/origin.rs b/frame/support/procedural/src/construct_runtime/expand/origin.rs
index 5091867eeef5..10ab9e9347eb 100644
--- a/frame/support/procedural/src/construct_runtime/expand/origin.rs
+++ b/frame/support/procedural/src/construct_runtime/expand/origin.rs
@@ -129,8 +129,8 @@ pub fn expand_outer_origin(
 			fn reset_filter(&mut self) {
 				let filter = <
 					<#runtime as #system_path::Config>::BaseCallFilter
-					as #scrate::traits::Filter<<#runtime as #system_path::Config>::Call>
-				>::filter;
+					as #scrate::traits::Contains<<#runtime as #system_path::Config>::Call>
+				>::contains;
 
 				self.filter = #scrate::sp_std::rc::Rc::new(Box::new(filter));
 			}
diff --git a/frame/support/src/dispatch.rs b/frame/support/src/dispatch.rs
index 4ee5154a6b0f..a4644cebeeb5 100644
--- a/frame/support/src/dispatch.rs
+++ b/frame/support/src/dispatch.rs
@@ -2814,7 +2814,7 @@ mod tests {
 		type Origin = OuterOrigin;
 		type AccountId = u32;
 		type Call = ();
-		type BaseCallFilter = frame_support::traits::AllowAll;
+		type BaseCallFilter = frame_support::traits::Everything;
 		type BlockNumber = u32;
 		type PalletInfo = Self;
 		type DbWeight = ();
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index fbb21de7ebb1..efb5559ed062 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -31,9 +31,11 @@ pub use tokens::{
 };
 
 mod members;
+#[allow(deprecated)]
+pub use members::{AllowAll, DenyAll, Filter};
 pub use members::{
-	All, AsContains, ChangeMembers, Contains, ContainsLengthBound, InitializeMembers, IsInVec,
-	SortedMembers,
+	AsContains, ChangeMembers, Contains, ContainsLengthBound, Everything, InitializeMembers,
+	IsInVec, Nothing, SortedMembers,
 };
 
 mod validation;
@@ -44,10 +46,7 @@ pub use validation::{
 };
 
 mod filter;
-pub use filter::{
-	AllowAll, ClearFilterGuard, DenyAll, Filter, FilterStack, FilterStackGuard, InstanceFilter,
-	IntegrityTest,
-};
+pub use filter::{ClearFilterGuard, FilterStack, FilterStackGuard, InstanceFilter, IntegrityTest};
 
 mod misc;
 pub use misc::{
diff --git a/frame/support/src/traits/filter.rs b/frame/support/src/traits/filter.rs
index b9f5037abc66..c67ffc3c3a11 100644
--- a/frame/support/src/traits/filter.rs
+++ b/frame/support/src/traits/filter.rs
@@ -17,34 +17,11 @@
 
 //! Traits and associated utilities for dealing with abstract constraint filters.
 
+pub use super::members::Contains;
 use sp_std::marker::PhantomData;
 
-/// Simple trait for providing a filter over a reference to some type.
-pub trait Filter<T> {
-	/// Determine if a given value should be allowed through the filter (returns `true`) or not.
-	fn filter(_: &T) -> bool;
-}
-
-/// A [`Filter`] that allows any value.
-pub enum AllowAll {}
-
-/// A [`Filter`] that denies any value.
-pub enum DenyAll {}
-
-impl<T> Filter<T> for AllowAll {
-	fn filter(_: &T) -> bool {
-		true
-	}
-}
-
-impl<T> Filter<T> for DenyAll {
-	fn filter(_: &T) -> bool {
-		false
-	}
-}
-
 /// Trait to add a constraint onto the filter.
-pub trait FilterStack<T>: Filter<T> {
+pub trait FilterStack<T>: Contains<T> {
 	/// The type used to archive the stack.
 	type Stack;
 
@@ -135,15 +112,15 @@ macro_rules! impl_filter_stack {
 		mod $module {
 			#[allow(unused_imports)]
 			use super::*;
-			use $crate::traits::filter::{swap, take, RefCell, Vec, Box, Filter, FilterStack};
+			use $crate::traits::filter::{swap, take, RefCell, Vec, Box, Contains, FilterStack};
 
 			thread_local! {
 				static FILTER: RefCell<Vec<Box<dyn Fn(&$call) -> bool + 'static>>> = RefCell::new(Vec::new());
 			}
 
-			impl Filter<$call> for $target {
-				fn filter(call: &$call) -> bool {
-					<$base>::filter(call) &&
+			impl Contains<$call> for $target {
+				fn contains(call: &$call) -> bool {
+					<$base>::contains(call) &&
 						FILTER.with(|filter| filter.borrow().iter().all(|f| f(call)))
 				}
 			}
@@ -169,7 +146,7 @@ macro_rules! impl_filter_stack {
 		mod $module {
 			#[allow(unused_imports)]
 			use super::*;
-			use $crate::traits::{swap, take, RefCell, Vec, Box, Filter, FilterStack};
+			use $crate::traits::{swap, take, RefCell, Vec, Box, Contains, FilterStack};
 
 			struct ThisFilter(RefCell<Vec<Box<dyn Fn(&$call) -> bool + 'static>>>);
 			// NOTE: Safe only in wasm (guarded above) because there's only one thread.
@@ -178,9 +155,9 @@ macro_rules! impl_filter_stack {
 
 			static FILTER: ThisFilter = ThisFilter(RefCell::new(Vec::new()));
 
-			impl Filter<$call> for $target {
-				fn filter(call: &$call) -> bool {
-					<$base>::filter(call) && FILTER.0.borrow().iter().all(|f| f(call))
+			impl Contains<$call> for $target {
+				fn contains(call: &$call) -> bool {
+					<$base>::contains(call) && FILTER.0.borrow().iter().all(|f| f(call))
 				}
 			}
 
@@ -220,8 +197,8 @@ pub mod test_impl_filter_stack {
 
 	pub struct IsCallable;
 	pub struct BaseFilter;
-	impl Filter<u32> for BaseFilter {
-		fn filter(x: &u32) -> bool {
+	impl Contains<u32> for BaseFilter {
+		fn contains(x: &u32) -> bool {
 			x % 2 == 0
 		}
 	}
@@ -234,76 +211,76 @@ pub mod test_impl_filter_stack {
 
 	#[test]
 	fn impl_filter_stack_should_work() {
-		assert!(IsCallable::filter(&36));
-		assert!(IsCallable::filter(&40));
-		assert!(IsCallable::filter(&42));
-		assert!(!IsCallable::filter(&43));
+		assert!(IsCallable::contains(&36));
+		assert!(IsCallable::contains(&40));
+		assert!(IsCallable::contains(&42));
+		assert!(!IsCallable::contains(&43));
 
 		IsCallable::push(|x| *x < 42);
-		assert!(IsCallable::filter(&36));
-		assert!(IsCallable::filter(&40));
-		assert!(!IsCallable::filter(&42));
+		assert!(IsCallable::contains(&36));
+		assert!(IsCallable::contains(&40));
+		assert!(!IsCallable::contains(&42));
 
 		IsCallable::push(|x| *x % 3 == 0);
-		assert!(IsCallable::filter(&36));
-		assert!(!IsCallable::filter(&40));
+		assert!(IsCallable::contains(&36));
+		assert!(!IsCallable::contains(&40));
 
 		IsCallable::pop();
-		assert!(IsCallable::filter(&36));
-		assert!(IsCallable::filter(&40));
-		assert!(!IsCallable::filter(&42));
+		assert!(IsCallable::contains(&36));
+		assert!(IsCallable::contains(&40));
+		assert!(!IsCallable::contains(&42));
 
 		let saved = IsCallable::take();
-		assert!(IsCallable::filter(&36));
-		assert!(IsCallable::filter(&40));
-		assert!(IsCallable::filter(&42));
-		assert!(!IsCallable::filter(&43));
+		assert!(IsCallable::contains(&36));
+		assert!(IsCallable::contains(&40));
+		assert!(IsCallable::contains(&42));
+		assert!(!IsCallable::contains(&43));
 
 		IsCallable::restore(saved);
-		assert!(IsCallable::filter(&36));
-		assert!(IsCallable::filter(&40));
-		assert!(!IsCallable::filter(&42));
+		assert!(IsCallable::contains(&36));
+		assert!(IsCallable::contains(&40));
+		assert!(!IsCallable::contains(&42));
 
 		IsCallable::pop();
-		assert!(IsCallable::filter(&36));
-		assert!(IsCallable::filter(&40));
-		assert!(IsCallable::filter(&42));
-		assert!(!IsCallable::filter(&43));
+		assert!(IsCallable::contains(&36));
+		assert!(IsCallable::contains(&40));
+		assert!(IsCallable::contains(&42));
+		assert!(!IsCallable::contains(&43));
 	}
 
 	#[test]
 	fn guards_should_work() {
-		assert!(IsCallable::filter(&36));
-		assert!(IsCallable::filter(&40));
-		assert!(IsCallable::filter(&42));
-		assert!(!IsCallable::filter(&43));
+		assert!(IsCallable::contains(&36));
+		assert!(IsCallable::contains(&40));
+		assert!(IsCallable::contains(&42));
+		assert!(!IsCallable::contains(&43));
 		{
 			let _guard_1 = FilterStackGuard::<IsCallable, u32>::new(|x| *x < 42);
-			assert!(IsCallable::filter(&36));
-			assert!(IsCallable::filter(&40));
-			assert!(!IsCallable::filter(&42));
+			assert!(IsCallable::contains(&36));
+			assert!(IsCallable::contains(&40));
+			assert!(!IsCallable::contains(&42));
 			{
 				let _guard_2 = FilterStackGuard::<IsCallable, u32>::new(|x| *x % 3 == 0);
-				assert!(IsCallable::filter(&36));
-				assert!(!IsCallable::filter(&40));
+				assert!(IsCallable::contains(&36));
+				assert!(!IsCallable::contains(&40));
 			}
-			assert!(IsCallable::filter(&36));
-			assert!(IsCallable::filter(&40));
-			assert!(!IsCallable::filter(&42));
+			assert!(IsCallable::contains(&36));
+			assert!(IsCallable::contains(&40));
+			assert!(!IsCallable::contains(&42));
 			{
 				let _guard_2 = ClearFilterGuard::<IsCallable, u32>::new();
-				assert!(IsCallable::filter(&36));
-				assert!(IsCallable::filter(&40));
-				assert!(IsCallable::filter(&42));
-				assert!(!IsCallable::filter(&43));
+				assert!(IsCallable::contains(&36));
+				assert!(IsCallable::contains(&40));
+				assert!(IsCallable::contains(&42));
+				assert!(!IsCallable::contains(&43));
 			}
-			assert!(IsCallable::filter(&36));
-			assert!(IsCallable::filter(&40));
-			assert!(!IsCallable::filter(&42));
+			assert!(IsCallable::contains(&36));
+			assert!(IsCallable::contains(&40));
+			assert!(!IsCallable::contains(&42));
 		}
-		assert!(IsCallable::filter(&36));
-		assert!(IsCallable::filter(&40));
-		assert!(IsCallable::filter(&42));
-		assert!(!IsCallable::filter(&43));
+		assert!(IsCallable::contains(&36));
+		assert!(IsCallable::contains(&40));
+		assert!(IsCallable::contains(&42));
+		assert!(!IsCallable::contains(&43));
 	}
 }
diff --git a/frame/support/src/traits/members.rs b/frame/support/src/traits/members.rs
index dbfc2e0120e4..1d7c1c73208d 100644
--- a/frame/support/src/traits/members.rs
+++ b/frame/support/src/traits/members.rs
@@ -25,14 +25,37 @@ pub trait Contains<T> {
 	fn contains(t: &T) -> bool;
 }
 
-/// A `Contains` implementation which always returns `true`.
-pub struct All<T>(PhantomData<T>);
-impl<T> Contains<T> for All<T> {
+/// A [`Contains`] implementation that contains every value.
+pub enum Everything {}
+impl<T> Contains<T> for Everything {
 	fn contains(_: &T) -> bool {
 		true
 	}
 }
 
+/// A [`Contains`] implementation that contains no value.
+pub enum Nothing {}
+impl<T> Contains<T> for Nothing {
+	fn contains(_: &T) -> bool {
+		false
+	}
+}
+
+#[deprecated = "Use `Everything` instead"]
+pub type AllowAll = Everything;
+#[deprecated = "Use `Nothing` instead"]
+pub type DenyAll = Nothing;
+#[deprecated = "Use `Contains` instead"]
+pub trait Filter<T> {
+	fn filter(t: &T) -> bool;
+}
+#[allow(deprecated)]
+impl<T, C: Contains<T>> Filter<T> for C {
+	fn filter(t: &T) -> bool {
+		Self::contains(t)
+	}
+}
+
 #[impl_trait_for_tuples::impl_for_tuples(30)]
 impl<T> Contains<T> for Tuple {
 	fn contains(t: &T) -> bool {
diff --git a/frame/support/test/tests/construct_runtime.rs b/frame/support/test/tests/construct_runtime.rs
index 98669cb1add0..5ddcb89a7dca 100644
--- a/frame/support/test/tests/construct_runtime.rs
+++ b/frame/support/test/tests/construct_runtime.rs
@@ -229,7 +229,7 @@ pub type BlockNumber = u64;
 pub type Index = u64;
 
 impl system::Config for Runtime {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type Hash = H256;
 	type Origin = Origin;
 	type BlockNumber = BlockNumber;
@@ -268,14 +268,14 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, Call, Signature,
 
 mod origin_test {
 	use super::{module3, nested, system, Block, UncheckedExtrinsic};
-	use frame_support::traits::{Filter, OriginTrait};
+	use frame_support::traits::{Contains, OriginTrait};
 
 	impl nested::module3::Config for RuntimeOriginTest {}
 	impl module3::Config for RuntimeOriginTest {}
 
 	pub struct BaseCallFilter;
-	impl Filter<Call> for BaseCallFilter {
-		fn filter(c: &Call) -> bool {
+	impl Contains<Call> for BaseCallFilter {
+		fn contains(c: &Call) -> bool {
 			match c {
 				Call::NestedModule3(_) => true,
 				_ => false,
diff --git a/frame/support/test/tests/instance.rs b/frame/support/test/tests/instance.rs
index 65a2c11d0d13..a948853ff2a4 100644
--- a/frame/support/test/tests/instance.rs
+++ b/frame/support/test/tests/instance.rs
@@ -275,7 +275,7 @@ pub type BlockNumber = u64;
 pub type Index = u64;
 
 impl system::Config for Runtime {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type Hash = H256;
 	type Origin = Origin;
 	type BlockNumber = BlockNumber;
diff --git a/frame/support/test/tests/issue2219.rs b/frame/support/test/tests/issue2219.rs
index dd73700cf5ca..17eebf2d1022 100644
--- a/frame/support/test/tests/issue2219.rs
+++ b/frame/support/test/tests/issue2219.rs
@@ -157,7 +157,7 @@ pub type Block = generic::Block<Header, UncheckedExtrinsic>;
 pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, Call, Signature, ()>;
 
 impl system::Config for Runtime {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type Hash = H256;
 	type Origin = Origin;
 	type BlockNumber = BlockNumber;
diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index c21808dfa8f2..00af4d261c65 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -493,7 +493,7 @@ frame_support::parameter_types!(
 );
 
 impl frame_system::Config for Runtime {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u32;
diff --git a/frame/support/test/tests/pallet_compatibility.rs b/frame/support/test/tests/pallet_compatibility.rs
index 35c991432acd..9814fcb392b5 100644
--- a/frame/support/test/tests/pallet_compatibility.rs
+++ b/frame/support/test/tests/pallet_compatibility.rs
@@ -223,7 +223,7 @@ frame_support::parameter_types!(
 );
 
 impl frame_system::Config for Runtime {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u32;
diff --git a/frame/support/test/tests/pallet_compatibility_instance.rs b/frame/support/test/tests/pallet_compatibility_instance.rs
index 2d92920b81d8..b8d43b5e32bf 100644
--- a/frame/support/test/tests/pallet_compatibility_instance.rs
+++ b/frame/support/test/tests/pallet_compatibility_instance.rs
@@ -206,7 +206,7 @@ impl frame_system::Config for Runtime {
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u32;
diff --git a/frame/support/test/tests/pallet_instance.rs b/frame/support/test/tests/pallet_instance.rs
index 2c6c2a7a6646..adfbc7a64f0e 100644
--- a/frame/support/test/tests/pallet_instance.rs
+++ b/frame/support/test/tests/pallet_instance.rs
@@ -243,7 +243,7 @@ frame_support::parameter_types!(
 );
 
 impl frame_system::Config for Runtime {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u32;
diff --git a/frame/support/test/tests/pallet_with_name_trait_is_valid.rs b/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
index 867d95274101..1c47d13a619f 100644
--- a/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
+++ b/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
@@ -129,7 +129,7 @@ mod tests {
 	}
 
 	impl frame_system::Config for Runtime {
-		type BaseCallFilter = frame_support::traits::AllowAll;
+		type BaseCallFilter = frame_support::traits::Everything;
 		type Origin = Origin;
 		type Index = u64;
 		type BlockNumber = u64;
diff --git a/frame/support/test/tests/system.rs b/frame/support/test/tests/system.rs
index a0947e72b194..041932629926 100644
--- a/frame/support/test/tests/system.rs
+++ b/frame/support/test/tests/system.rs
@@ -25,7 +25,7 @@ pub trait Config: 'static + Eq + Clone {
 	type Origin: Into<Result<RawOrigin<Self::AccountId>, Self::Origin>>
 		+ From<RawOrigin<Self::AccountId>>;
 
-	type BaseCallFilter: frame_support::traits::Filter<Self::Call>;
+	type BaseCallFilter: frame_support::traits::Contains<Self::Call>;
 	type BlockNumber: Decode + Encode + EncodeLike + Clone + Default;
 	type Hash;
 	type AccountId: Encode + EncodeLike + Decode;
diff --git a/frame/system/benches/bench.rs b/frame/system/benches/bench.rs
index e3f60733a623..97c19c5e8159 100644
--- a/frame/system/benches/bench.rs
+++ b/frame/system/benches/bench.rs
@@ -71,7 +71,7 @@ frame_support::parameter_types! {
 		);
 }
 impl system::Config for Runtime {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
 	type BlockLength = BlockLength;
 	type DbWeight = ();
diff --git a/frame/system/benchmarking/src/mock.rs b/frame/system/benchmarking/src/mock.rs
index b375c9fcb509..d828fb22ff5f 100644
--- a/frame/system/benchmarking/src/mock.rs
+++ b/frame/system/benchmarking/src/mock.rs
@@ -39,7 +39,7 @@ frame_support::construct_runtime!(
 );
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index 68681ea5aca6..6b967fd8925a 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -85,7 +85,7 @@ use frame_support::{
 	dispatch::{DispatchResult, DispatchResultWithPostInfo},
 	storage,
 	traits::{
-		EnsureOrigin, Filter, Get, HandleLifetime, OnKilledAccount, OnNewAccount, OriginTrait,
+		Contains, EnsureOrigin, Get, HandleLifetime, OnKilledAccount, OnNewAccount, OriginTrait,
 		PalletInfo, SortedMembers, StoredMap,
 	},
 	weights::{
@@ -161,7 +161,7 @@ pub mod pallet {
 	pub trait Config: 'static + Eq + Clone {
 		/// The basic call filter to use in Origin. All origins are built with this filter as base,
 		/// except Root.
-		type BaseCallFilter: Filter<Self::Call>;
+		type BaseCallFilter: Contains<Self::Call>;
 
 		/// Block & extrinsics weights: base values and limits.
 		#[pallet::constant]
diff --git a/frame/system/src/mock.rs b/frame/system/src/mock.rs
index 480e8b1a26ba..8039b73445ae 100644
--- a/frame/system/src/mock.rs
+++ b/frame/system/src/mock.rs
@@ -88,7 +88,7 @@ impl OnKilledAccount<u64> for RecordKilled {
 }
 
 impl Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = RuntimeBlockWeights;
 	type BlockLength = RuntimeBlockLength;
 	type Origin = Origin;
diff --git a/frame/timestamp/src/lib.rs b/frame/timestamp/src/lib.rs
index 247520297d24..a5a3b319b03c 100644
--- a/frame/timestamp/src/lib.rs
+++ b/frame/timestamp/src/lib.rs
@@ -336,7 +336,7 @@ mod tests {
 			frame_system::limits::BlockWeights::simple_max(1024);
 	}
 	impl frame_system::Config for Test {
-		type BaseCallFilter = frame_support::traits::AllowAll;
+		type BaseCallFilter = frame_support::traits::Everything;
 		type BlockWeights = ();
 		type BlockLength = ();
 		type DbWeight = ();
diff --git a/frame/tips/src/tests.rs b/frame/tips/src/tests.rs
index ac5793256381..c357942c54e1 100644
--- a/frame/tips/src/tests.rs
+++ b/frame/tips/src/tests.rs
@@ -56,7 +56,7 @@ parameter_types! {
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
index 61de183dac1b..36bfd31a6753 100644
--- a/frame/transaction-payment/src/lib.rs
+++ b/frame/transaction-payment/src/lib.rs
@@ -742,7 +742,7 @@ mod tests {
 	}
 
 	impl frame_system::Config for Runtime {
-		type BaseCallFilter = frame_support::traits::AllowAll;
+		type BaseCallFilter = frame_support::traits::Everything;
 		type BlockWeights = BlockWeights;
 		type BlockLength = ();
 		type DbWeight = ();
diff --git a/frame/transaction-storage/src/mock.rs b/frame/transaction-storage/src/mock.rs
index 17a5d8097b67..38d14129d76e 100644
--- a/frame/transaction-storage/src/mock.rs
+++ b/frame/transaction-storage/src/mock.rs
@@ -54,7 +54,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type Origin = Origin;
diff --git a/frame/treasury/src/tests.rs b/frame/treasury/src/tests.rs
index cf341d5ad80f..534661b2773b 100644
--- a/frame/treasury/src/tests.rs
+++ b/frame/treasury/src/tests.rs
@@ -56,7 +56,7 @@ parameter_types! {
 		frame_system::limits::BlockWeights::simple_max(1024);
 }
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type DbWeight = ();
diff --git a/frame/uniques/src/mock.rs b/frame/uniques/src/mock.rs
index 4b80aa73030c..658e82a5143e 100644
--- a/frame/uniques/src/mock.rs
+++ b/frame/uniques/src/mock.rs
@@ -46,7 +46,7 @@ parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 }
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
 	type Origin = Origin;
diff --git a/frame/utility/src/tests.rs b/frame/utility/src/tests.rs
index fdc738bcded9..7679df944ec0 100644
--- a/frame/utility/src/tests.rs
+++ b/frame/utility/src/tests.rs
@@ -26,7 +26,7 @@ use frame_support::{
 	assert_err_ignore_postinfo, assert_noop, assert_ok, decl_module,
 	dispatch::{DispatchError, DispatchErrorWithPostInfo, Dispatchable},
 	parameter_types, storage,
-	traits::Filter,
+	traits::Contains,
 	weights::{Pays, Weight},
 };
 use sp_core::H256;
@@ -142,8 +142,8 @@ parameter_types! {
 impl example::Config for Test {}
 
 pub struct TestBaseCallFilter;
-impl Filter<Call> for TestBaseCallFilter {
-	fn filter(c: &Call) -> bool {
+impl Contains<Call> for TestBaseCallFilter {
+	fn contains(c: &Call) -> bool {
 		match *c {
 			// Transfer works. Use `transfer_keep_alive` for a call that doesn't pass the filter.
 			Call::Balances(pallet_balances::Call::transfer(..)) => true,
@@ -282,7 +282,7 @@ fn batch_with_root_works() {
 	new_test_ext().execute_with(|| {
 		let k = b"a".to_vec();
 		let call = Call::System(frame_system::Call::set_storage(vec![(k.clone(), k.clone())]));
-		assert!(!TestBaseCallFilter::filter(&call));
+		assert!(!TestBaseCallFilter::contains(&call));
 		assert_eq!(Balances::free_balance(1), 10);
 		assert_eq!(Balances::free_balance(2), 10);
 		assert_ok!(Utility::batch(
diff --git a/frame/vesting/src/mock.rs b/frame/vesting/src/mock.rs
index 45bfb788ba72..4efbabefe688 100644
--- a/frame/vesting/src/mock.rs
+++ b/frame/vesting/src/mock.rs
@@ -48,7 +48,7 @@ parameter_types! {
 impl frame_system::Config for Test {
 	type AccountData = pallet_balances::AccountData<u64>;
 	type AccountId = u64;
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockHashCount = BlockHashCount;
 	type BlockLength = ();
 	type BlockNumber = u64;
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index e7f25ad33611..bdb872412081 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -537,7 +537,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Runtime {
-	type BaseCallFilter = frame_support::traits::AllowAll;
+	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = RuntimeBlockWeights;
 	type BlockLength = RuntimeBlockLength;
 	type Origin = Origin;

From f2b3997004d10512aa7b412b50785e29987f883d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Mon, 9 Aug 2021 13:01:16 +0200
Subject: [PATCH 1066/1194] Tell dependabot to ignore jsonrpc-* updates (#9518)

---
 .github/dependabot.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index a321729dcbc8..c93461c8806d 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -5,3 +5,6 @@ updates:
     labels: ["A2-insubstantial", "B0-silent", "C1-low 📌"]
     schedule:
       interval: "daily"
+    ignore:
+        - dependency-name: "jsonrpc-*"
+          versions: [">= 16"]

From d7babec5fe89999937e8ca36ac32b91e2065b4e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Mon, 9 Aug 2021 13:39:50 +0200
Subject: [PATCH 1067/1194] Clarify how `ApiId` is being generated (#9519)

* Clarify how `ApiId` is being generated

* Clarify more
---
 primitives/version/src/lib.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/primitives/version/src/lib.rs b/primitives/version/src/lib.rs
index b3ddb7d7fecc..da2cb342d22f 100644
--- a/primitives/version/src/lib.rs
+++ b/primitives/version/src/lib.rs
@@ -98,6 +98,11 @@ pub mod embed;
 pub use sp_version_proc_macro::runtime_version;
 
 /// The identity of a particular API interface that the runtime might provide.
+///
+/// The id is generated by hashing the name of the runtime api with BLAKE2 using a hash size
+/// of 8 bytes.
+///
+/// The name of the runtime api is the name of the trait when using `decl_runtime_apis!` macro.
 pub type ApiId = [u8; 8];
 
 /// A vector of pairs of `ApiId` and a `u32` for version.

From 91061a7d925b5bc597804293da283477512ba4ff Mon Sep 17 00:00:00 2001
From: Zeke Mostov <32168567+emostov@users.noreply.github.com>
Date: Mon, 9 Aug 2021 04:59:00 -0700
Subject: [PATCH 1068/1194] Fix staking `rebond` weight refund (#9508)

* Fix staking `rebond` weight refund


Comment

* use safe arithmetic

* comment
---
 frame/staking/src/pallet/mod.rs | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/frame/staking/src/pallet/mod.rs b/frame/staking/src/pallet/mod.rs
index 444768dbdccf..8af6204273f9 100644
--- a/frame/staking/src/pallet/mod.rs
+++ b/frame/staking/src/pallet/mod.rs
@@ -23,10 +23,7 @@ use frame_support::{
 		Currency, CurrencyToVote, EnsureOrigin, EstimateNextNewSession, Get, LockIdentifier,
 		LockableCurrency, OnUnbalanced, UnixTime,
 	},
-	weights::{
-		constants::{WEIGHT_PER_MICROS, WEIGHT_PER_NANOS},
-		Weight,
-	},
+	weights::Weight,
 };
 use frame_system::{ensure_root, ensure_signed, offchain::SendTransactionTypes, pallet_prelude::*};
 use sp_runtime::{
@@ -1311,18 +1308,18 @@ pub mod pallet {
 			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
 			ensure!(!ledger.unlocking.is_empty(), Error::<T>::NoUnlockChunk);
 
+			let initial_unlocking = ledger.unlocking.len() as u32;
 			let ledger = ledger.rebond(value);
 			// Last check: the new active amount of ledger must be more than ED.
 			ensure!(ledger.active >= T::Currency::minimum_balance(), Error::<T>::InsufficientBond);
 
 			Self::deposit_event(Event::<T>::Bonded(ledger.stash.clone(), value));
 			Self::update_ledger(&controller, &ledger);
-			Ok(Some(
-				35 * WEIGHT_PER_MICROS +
-					50 * WEIGHT_PER_NANOS * (ledger.unlocking.len() as Weight) +
-					T::DbWeight::get().reads_writes(3, 2),
-			)
-			.into())
+
+			let removed_chunks = 1u32 // for the case where the last iterated chunk is not removed
+				.saturating_add(initial_unlocking)
+				.saturating_sub(ledger.unlocking.len() as u32);
+			Ok(Some(T::WeightInfo::rebond(removed_chunks)).into())
 		}
 
 		/// Set `HistoryDepth` value. This function will delete any history information

From b9d86e1ed319a096456e32790b1f48bd29b996bd Mon Sep 17 00:00:00 2001
From: Marek Kotewicz <marek.kotewicz@gmail.com>
Date: Mon, 9 Aug 2021 15:22:28 +0200
Subject: [PATCH 1069/1194] DatabaseSource::Auto (#9500)

* implement "auto" database backend in client/db, in progress, #9201

* move fn supports_ref_counting from DatabaseSource enum to Database trait to make it work correctly for all types of dbs

* update kvdb_rocksdb to 0.13 and use it's new config feature  to properly auto start existing database

* tests for auto database reopening

* introduce OpenDbError to cleanup opening database error handling and handle case when database is not enabled at the compile time

* cargo fmt strings again

* cargo fmt strings again

* rename DataSettingsSrc to fix test compilation

* fix the call to the new kvdb-rocksdb interdace in tests to fix compilation

* simplify OpenDbError and make it compile even when paritydb and rocksdb are disabled

* cargo fmt

* fix compilation without flag with-parity-db

* fix unused var compilation warning

* support different paths for rocksdb and paritydb in DatabaseSouce::Auto

* support "auto" database option in substrate cli

* enable Lz4 compression for some of the parity-db colums as per review suggestion

* applied review suggestions
---
 Cargo.lock                                   |  84 ++++-
 bin/node/bench/Cargo.toml                    |   4 +-
 bin/node/bench/src/tempdb.rs                 |   5 +-
 bin/node/testing/src/bench.rs                |   6 +-
 client/cli/src/arg_enums.rs                  |   7 +-
 client/cli/src/commands/export_blocks_cmd.rs |   6 +-
 client/cli/src/commands/purge_chain_cmd.rs   |   4 +-
 client/cli/src/config.rs                     |  11 +-
 client/db/Cargo.toml                         |   6 +-
 client/db/src/lib.rs                         |  52 +--
 client/db/src/parity_db.rs                   |  46 ++-
 client/db/src/upgrade.rs                     | 140 ++++----
 client/db/src/utils.rs                       | 359 +++++++++++++++----
 client/service/src/config.rs                 |   7 +-
 client/service/src/lib.rs                    |   2 +-
 client/service/test/src/client/mod.rs        |   6 +-
 client/service/test/src/lib.rs               |   4 +-
 primitives/database/src/lib.rs               |   7 +
 test-utils/test-runner/src/lib.rs            |   2 +-
 test-utils/test-runner/src/utils.rs          |   4 +-
 utils/browser/src/lib.rs                     |   4 +-
 21 files changed, 548 insertions(+), 218 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7f1d46f46aa3..1afa55c77162 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -503,9 +503,9 @@ dependencies = [
 
 [[package]]
 name = "bindgen"
-version = "0.57.0"
+version = "0.59.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd4865004a46a0aafb2a0a5eb19d3c9fc46ee5f063a6cfc605c69ac9ecf5263d"
+checksum = "453c49e5950bb0eb63bb3df640e31618846c89d5b7faa54040d76e98e0134375"
 dependencies = [
  "bitflags",
  "cexpr",
@@ -526,6 +526,18 @@ version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
 
+[[package]]
+name = "bitvec"
+version = "0.19.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321"
+dependencies = [
+ "funty",
+ "radium 0.5.3",
+ "tap",
+ "wyz",
+]
+
 [[package]]
 name = "bitvec"
 version = "0.20.2"
@@ -533,7 +545,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f682656975d3a682daff957be4ddeb65d6ad656737cd821f2d00685ae466af1"
 dependencies = [
  "funty",
- "radium",
+ "radium 0.6.2",
  "tap",
  "wyz",
 ]
@@ -788,9 +800,9 @@ dependencies = [
 
 [[package]]
 name = "cexpr"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27"
+checksum = "db507a7679252d2276ed0dd8113c6875ec56d3089f9225b2b42c30cc1f8e5c89"
 dependencies = [
  "nom",
 ]
@@ -3119,9 +3131,9 @@ dependencies = [
 
 [[package]]
 name = "kvdb-rocksdb"
-version = "0.12.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "431ca65516efab86e65d96281f750ebb54277dec656fcf6c027f3d1c0cb69e4c"
+checksum = "9b1b6ea8f2536f504b645ad78419c8246550e19d2c3419a167080ce08edee35a"
 dependencies = [
  "fs-swap",
  "kvdb",
@@ -3621,9 +3633,9 @@ dependencies = [
 
 [[package]]
 name = "librocksdb-sys"
-version = "6.17.3"
+version = "6.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5da125e1c0f22c7cae785982115523a0738728498547f415c9054cb17c7e89f9"
+checksum = "c309a9d2470844aceb9a4a098cf5286154d20596868b75a6b36357d2bb9ca25d"
 dependencies = [
  "bindgen",
  "cc",
@@ -3747,6 +3759,26 @@ dependencies = [
  "linked-hash-map",
 ]
 
+[[package]]
+name = "lz4"
+version = "1.23.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aac20ed6991e01bf6a2e68cc73df2b389707403662a8ba89f68511fb340f724c"
+dependencies = [
+ "libc",
+ "lz4-sys",
+]
+
+[[package]]
+name = "lz4-sys"
+version = "1.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dca79aa95d8b3226213ad454d328369853be3a1382d89532a854f4d69640acae"
+dependencies = [
+ "cc",
+ "libc",
+]
+
 [[package]]
 name = "mach"
 version = "0.3.2"
@@ -4576,10 +4608,12 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
 
 [[package]]
 name = "nom"
-version = "5.1.2"
+version = "6.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
+checksum = "9c5c51b9083a3c620fa67a2a635d1ce7d95b897e957d6b28ff9a5da960a103a6"
 dependencies = [
+ "bitvec 0.19.5",
+ "funty",
  "memchr",
  "version_check",
 ]
@@ -5742,9 +5776,9 @@ dependencies = [
 
 [[package]]
 name = "parity-db"
-version = "0.2.4"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e337f62db341435f0da05b8f6b97e984ef4ea5800510cd07c2d624688c40b47"
+checksum = "241f9c5d25063080f2c02846221f13e1d0e5e18fa00c32c234aad585b744ee55"
 dependencies = [
  "blake2-rfc",
  "crc32fast",
@@ -5752,9 +5786,11 @@ dependencies = [
  "hex",
  "libc",
  "log",
+ "lz4",
  "memmap2",
  "parking_lot 0.11.1",
  "rand 0.8.4",
+ "snap",
 ]
 
 [[package]]
@@ -5782,7 +5818,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8975095a2a03bbbdc70a74ab11a4f76a6d0b84680d87c68d722531b0ac28e8a9"
 dependencies = [
  "arrayvec 0.7.0",
- "bitvec",
+ "bitvec 0.20.2",
  "byte-slice-cast",
  "impl-trait-for-tuples",
  "parity-scale-codec-derive",
@@ -6506,6 +6542,12 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "radium"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8"
+
 [[package]]
 name = "radium"
 version = "0.6.2"
@@ -6870,9 +6912,9 @@ dependencies = [
 
 [[package]]
 name = "rocksdb"
-version = "0.16.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c749134fda8bfc90d0de643d59bfc841dcb3ac8a1062e12b6754bd60235c48b3"
+checksum = "7a62eca5cacf2c8261128631bed9f045598d40bfbe4b29f5163f0f802f8f44a7"
 dependencies = [
  "libc",
  "librocksdb-sys",
@@ -8546,9 +8588,9 @@ dependencies = [
 
 [[package]]
 name = "shlex"
-version = "0.1.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
+checksum = "42a568c8f2cd051a4d283bd6eb0343ac214c1b0f1ac19f93e1175b2dee38c73d"
 
 [[package]]
 name = "signal-hook"
@@ -8617,6 +8659,12 @@ version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
 
+[[package]]
+name = "snap"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45456094d1983e2ee2a18fdfebce3189fa451699d0502cb8e3b49dba5ba41451"
+
 [[package]]
 name = "snow"
 version = "0.7.2"
diff --git a/bin/node/bench/Cargo.toml b/bin/node/bench/Cargo.toml
index ac643a1109c5..01ec8b253e03 100644
--- a/bin/node/bench/Cargo.toml
+++ b/bin/node/bench/Cargo.toml
@@ -22,7 +22,7 @@ serde_json = "1.0.41"
 structopt = "0.3"
 derive_more = "0.99.2"
 kvdb = "0.10.0"
-kvdb-rocksdb = "0.12.0"
+kvdb-rocksdb = "0.14.0"
 sp-trie = { version = "4.0.0-dev", path = "../../../primitives/trie" }
 sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
 sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
@@ -37,7 +37,7 @@ hex = "0.4.0"
 rand = { version = "0.7.2", features = ["small_rng"] }
 lazy_static = "1.4.0"
 parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
-parity-db = { version = "0.2.4" }
+parity-db = { version = "0.3" }
 sc-transaction-pool = { version = "4.0.0-dev", path = "../../../client/transaction-pool" }
 sc-transaction-pool-api = { version = "4.0.0-dev", path = "../../../client/transaction-pool/api" }
 futures = { version = "0.3.4", features = ["thread-pool"] }
diff --git a/bin/node/bench/src/tempdb.rs b/bin/node/bench/src/tempdb.rs
index 3c1c0f250e49..518c0dd96127 100644
--- a/bin/node/bench/src/tempdb.rs
+++ b/bin/node/bench/src/tempdb.rs
@@ -91,8 +91,7 @@ impl TempDatabase {
 		match db_type {
 			DatabaseType::RocksDb => {
 				let db_cfg = DatabaseConfig::with_columns(1);
-				let db = Database::open(&db_cfg, &self.0.path().to_string_lossy())
-					.expect("Database backend error");
+				let db = Database::open(&db_cfg, &self.0.path()).expect("Database backend error");
 				Arc::new(db)
 			},
 			DatabaseType::ParityDb => Arc::new(ParityDbWrapper({
@@ -101,7 +100,7 @@ impl TempDatabase {
 				column_options.ref_counted = true;
 				column_options.preimage = true;
 				column_options.uniform = true;
-				parity_db::Db::open(&options).expect("db open error")
+				parity_db::Db::open_or_create(&options).expect("db open error")
 			})),
 		}
 	}
diff --git a/bin/node/testing/src/bench.rs b/bin/node/testing/src/bench.rs
index 6aaaab04b627..9b49f82c6a12 100644
--- a/bin/node/testing/src/bench.rs
+++ b/bin/node/testing/src/bench.rs
@@ -220,10 +220,10 @@ pub enum DatabaseType {
 }
 
 impl DatabaseType {
-	fn into_settings(self, path: PathBuf) -> sc_client_db::DatabaseSettingsSrc {
+	fn into_settings(self, path: PathBuf) -> sc_client_db::DatabaseSource {
 		match self {
-			Self::RocksDb => sc_client_db::DatabaseSettingsSrc::RocksDb { path, cache_size: 512 },
-			Self::ParityDb => sc_client_db::DatabaseSettingsSrc::ParityDb { path },
+			Self::RocksDb => sc_client_db::DatabaseSource::RocksDb { path, cache_size: 512 },
+			Self::ParityDb => sc_client_db::DatabaseSource::ParityDb { path },
 		}
 	}
 }
diff --git a/client/cli/src/arg_enums.rs b/client/cli/src/arg_enums.rs
index 72741d7bea2b..5221500f08b3 100644
--- a/client/cli/src/arg_enums.rs
+++ b/client/cli/src/arg_enums.rs
@@ -197,6 +197,9 @@ pub enum Database {
 	RocksDb,
 	/// ParityDb. <https://github.com/paritytech/parity-db/>
 	ParityDb,
+	/// Detect whether there is an existing database. Use it, if there is, if not, create new
+	/// instance of paritydb
+	Auto,
 }
 
 impl std::str::FromStr for Database {
@@ -207,6 +210,8 @@ impl std::str::FromStr for Database {
 			Ok(Self::RocksDb)
 		} else if s.eq_ignore_ascii_case("paritydb-experimental") {
 			Ok(Self::ParityDb)
+		} else if s.eq_ignore_ascii_case("auto") {
+			Ok(Self::Auto)
 		} else {
 			Err(format!("Unknown variant `{}`, known variants: {:?}", s, Self::variants()))
 		}
@@ -216,7 +221,7 @@ impl std::str::FromStr for Database {
 impl Database {
 	/// Returns all the variants of this enum to be shown in the cli.
 	pub fn variants() -> &'static [&'static str] {
-		&["rocksdb", "paritydb-experimental"]
+		&["rocksdb", "paritydb-experimental", "auto"]
 	}
 }
 
diff --git a/client/cli/src/commands/export_blocks_cmd.rs b/client/cli/src/commands/export_blocks_cmd.rs
index 0ed8e3ff3591..ca3069442a1d 100644
--- a/client/cli/src/commands/export_blocks_cmd.rs
+++ b/client/cli/src/commands/export_blocks_cmd.rs
@@ -23,7 +23,7 @@ use crate::{
 };
 use log::info;
 use sc_client_api::{BlockBackend, UsageProvider};
-use sc_service::{chain_ops::export_blocks, config::DatabaseConfig};
+use sc_service::{chain_ops::export_blocks, config::DatabaseSource};
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT};
 use std::{fmt::Debug, fs, io, path::PathBuf, str::FromStr, sync::Arc};
 use structopt::StructOpt;
@@ -69,14 +69,14 @@ impl ExportBlocksCmd {
 	pub async fn run<B, C>(
 		&self,
 		client: Arc<C>,
-		database_config: DatabaseConfig,
+		database_config: DatabaseSource,
 	) -> error::Result<()>
 	where
 		B: BlockT,
 		C: BlockBackend<B> + UsageProvider<B> + 'static,
 		<<B::Header as HeaderT>::Number as FromStr>::Err: Debug,
 	{
-		if let DatabaseConfig::RocksDb { ref path, .. } = database_config {
+		if let DatabaseSource::RocksDb { ref path, .. } = database_config {
 			info!("DB path: {}", path.display());
 		}
 
diff --git a/client/cli/src/commands/purge_chain_cmd.rs b/client/cli/src/commands/purge_chain_cmd.rs
index 590046aa779b..e1bdb3a03cc5 100644
--- a/client/cli/src/commands/purge_chain_cmd.rs
+++ b/client/cli/src/commands/purge_chain_cmd.rs
@@ -21,7 +21,7 @@ use crate::{
 	params::{DatabaseParams, SharedParams},
 	CliConfiguration,
 };
-use sc_service::DatabaseConfig;
+use sc_service::DatabaseSource;
 use std::{
 	fmt::Debug,
 	fs,
@@ -47,7 +47,7 @@ pub struct PurgeChainCmd {
 
 impl PurgeChainCmd {
 	/// Run the purge command
-	pub fn run(&self, database_config: DatabaseConfig) -> error::Result<()> {
+	pub fn run(&self, database_config: DatabaseSource) -> error::Result<()> {
 		let db_path = database_config.path().ok_or_else(|| {
 			error::Error::Input("Cannot purge custom database implementation".into())
 		})?;
diff --git a/client/cli/src/config.rs b/client/cli/src/config.rs
index d58615641050..d985dce75d47 100644
--- a/client/cli/src/config.rs
+++ b/client/cli/src/config.rs
@@ -27,7 +27,7 @@ use names::{Generator, Name};
 use sc_client_api::execution_extensions::ExecutionStrategies;
 use sc_service::{
 	config::{
-		BasePath, Configuration, DatabaseConfig, ExtTransport, KeystoreConfig,
+		BasePath, Configuration, DatabaseSource, ExtTransport, KeystoreConfig,
 		NetworkConfiguration, NodeKeyConfig, OffchainWorkerConfig, PrometheusConfig, PruningMode,
 		Role, RpcMethods, TaskExecutor, TelemetryEndpoints, TransactionPoolOptions,
 		WasmExecutionMethod,
@@ -220,10 +220,13 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 		base_path: &PathBuf,
 		cache_size: usize,
 		database: Database,
-	) -> Result<DatabaseConfig> {
+	) -> Result<DatabaseSource> {
+		let rocksdb_path = base_path.join("db");
+		let paritydb_path = base_path.join("paritydb");
 		Ok(match database {
-			Database::RocksDb => DatabaseConfig::RocksDb { path: base_path.join("db"), cache_size },
-			Database::ParityDb => DatabaseConfig::ParityDb { path: base_path.join("paritydb") },
+			Database::RocksDb => DatabaseSource::RocksDb { path: rocksdb_path, cache_size },
+			Database::ParityDb => DatabaseSource::ParityDb { path: rocksdb_path },
+			Database::Auto => DatabaseSource::Auto { paritydb_path, rocksdb_path, cache_size },
 		})
 	}
 
diff --git a/client/db/Cargo.toml b/client/db/Cargo.toml
index ab06ecee75f4..85ab58472f43 100644
--- a/client/db/Cargo.toml
+++ b/client/db/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 parking_lot = "0.11.1"
 log = "0.4.8"
 kvdb = "0.10.0"
-kvdb-rocksdb = { version = "0.12.0", optional = true }
+kvdb-rocksdb = { version = "0.14.0", optional = true }
 kvdb-memorydb = "0.10.0"
 linked-hash-map = "0.5.4"
 hash-db = "0.15.2"
@@ -34,7 +34,7 @@ sc-state-db = { version = "0.10.0-dev", path = "../state-db" }
 sp-trie = { version = "4.0.0-dev", path = "../../primitives/trie" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
 sp-database = { version = "4.0.0-dev", path = "../../primitives/database" }
-parity-db = { version = "0.2.4", optional = true }
+parity-db = { version = "0.3.1", optional = true }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.9.0", path = "../../utils/prometheus" }
 
 [dev-dependencies]
@@ -42,7 +42,7 @@ sp-keyring = { version = "4.0.0-dev", path = "../../primitives/keyring" }
 sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 quickcheck = "1.0.3"
-kvdb-rocksdb = "0.12.0"
+kvdb-rocksdb = "0.14.0"
 tempfile = "3"
 
 [features]
diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index dda469f4fd33..b909b52610a8 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -297,7 +297,7 @@ pub struct DatabaseSettings {
 	/// State pruning mode.
 	pub state_pruning: PruningMode,
 	/// Where to find the database.
-	pub source: DatabaseSettingsSrc,
+	pub source: DatabaseSource,
 	/// Block pruning mode.
 	pub keep_blocks: KeepBlocks,
 	/// Block body/Transaction storage scheme.
@@ -325,7 +325,17 @@ pub enum TransactionStorageMode {
 
 /// Where to find the database..
 #[derive(Debug, Clone)]
-pub enum DatabaseSettingsSrc {
+pub enum DatabaseSource {
+	/// Check given path, and see if there is an existing database there. If it's either `RocksDb`
+	/// or `ParityDb`, use it. If there is none, create a new instance of `ParityDb`.
+	Auto {
+		/// Path to the paritydb database.
+		paritydb_path: PathBuf,
+		/// Path to the rocksdb database.
+		rocksdb_path: PathBuf,
+		/// Cache size in MiB. Used only by `RocksDb` variant of `DatabaseSource`.
+		cache_size: usize,
+	},
 	/// Load a RocksDB database from a given path. Recommended for most uses.
 	RocksDb {
 		/// Path to the database.
@@ -344,27 +354,28 @@ pub enum DatabaseSettingsSrc {
 	Custom(Arc<dyn Database<DbHash>>),
 }
 
-impl DatabaseSettingsSrc {
+impl DatabaseSource {
 	/// Return dabase path for databases that are on the disk.
 	pub fn path(&self) -> Option<&Path> {
 		match self {
-			DatabaseSettingsSrc::RocksDb { path, .. } => Some(path.as_path()),
-			DatabaseSettingsSrc::ParityDb { path, .. } => Some(path.as_path()),
-			DatabaseSettingsSrc::Custom(_) => None,
+			// as per https://github.com/paritytech/substrate/pull/9500#discussion_r684312550
+			//
+			// IIUC this is needed for polkadot to create its own dbs, so until it can use parity db
+			// I would think rocksdb, but later parity-db.
+			DatabaseSource::Auto { paritydb_path, .. } => Some(&paritydb_path),
+			DatabaseSource::RocksDb { path, .. } | DatabaseSource::ParityDb { path } => Some(&path),
+			DatabaseSource::Custom(..) => None,
 		}
 	}
-	/// Check if database supports internal ref counting for state data.
-	pub fn supports_ref_counting(&self) -> bool {
-		matches!(self, DatabaseSettingsSrc::ParityDb { .. })
-	}
 }
 
-impl std::fmt::Display for DatabaseSettingsSrc {
+impl std::fmt::Display for DatabaseSource {
 	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
 		let name = match self {
-			DatabaseSettingsSrc::RocksDb { .. } => "RocksDb",
-			DatabaseSettingsSrc::ParityDb { .. } => "ParityDb",
-			DatabaseSettingsSrc::Custom(_) => "Custom",
+			DatabaseSource::Auto { .. } => "Auto",
+			DatabaseSource::RocksDb { .. } => "RocksDb",
+			DatabaseSource::ParityDb { .. } => "ParityDb",
+			DatabaseSource::Custom(_) => "Custom",
 		};
 		write!(f, "{}", name)
 	}
@@ -1106,7 +1117,7 @@ impl<Block: BlockT> Backend<Block> {
 			state_cache_size: 16777216,
 			state_cache_child_ratio: Some((50, 100)),
 			state_pruning: PruningMode::keep_blocks(keep_blocks),
-			source: DatabaseSettingsSrc::Custom(db),
+			source: DatabaseSource::Custom(db),
 			keep_blocks: KeepBlocks::Some(keep_blocks),
 			transaction_storage,
 		};
@@ -1125,15 +1136,12 @@ impl<Block: BlockT> Backend<Block> {
 		let map_e = |e: sc_state_db::Error<io::Error>| sp_blockchain::Error::from_state_db(e);
 		let state_db: StateDb<_, _> = StateDb::new(
 			config.state_pruning.clone(),
-			!config.source.supports_ref_counting(),
+			!db.supports_ref_counting(),
 			&StateMetaDb(&*db),
 		)
 		.map_err(map_e)?;
-		let storage_db = StorageDb {
-			db: db.clone(),
-			state_db,
-			prefix_keys: !config.source.supports_ref_counting(),
-		};
+		let storage_db =
+			StorageDb { db: db.clone(), state_db, prefix_keys: !db.supports_ref_counting() };
 		let offchain_storage = offchain::LocalStorage::new(db.clone());
 		let changes_tries_storage = DbChangesTrieStorage::new(
 			db,
@@ -2516,7 +2524,7 @@ pub(crate) mod tests {
 				state_cache_size: 16777216,
 				state_cache_child_ratio: Some((50, 100)),
 				state_pruning: PruningMode::keep_blocks(1),
-				source: DatabaseSettingsSrc::Custom(backing),
+				source: DatabaseSource::Custom(backing),
 				keep_blocks: KeepBlocks::All,
 				transaction_storage: TransactionStorageMode::BlockBody,
 			},
diff --git a/client/db/src/parity_db.rs b/client/db/src/parity_db.rs
index 07f58baf0154..1b645ca9fb2b 100644
--- a/client/db/src/parity_db.rs
+++ b/client/db/src/parity_db.rs
@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 use crate::{
-	columns,
+	columns, light,
 	utils::{DatabaseType, NUM_COLUMNS},
 };
 /// A `Database` adapter for parity-db.
@@ -37,16 +37,42 @@ fn handle_err<T>(result: parity_db::Result<T>) -> T {
 pub fn open<H: Clone + AsRef<[u8]>>(
 	path: &std::path::Path,
 	db_type: DatabaseType,
+	create: bool,
 ) -> parity_db::Result<std::sync::Arc<dyn Database<H>>> {
 	let mut config = parity_db::Options::with_columns(path, NUM_COLUMNS as u8);
-	config.sync = true; // Flush each commit
-	if db_type == DatabaseType::Full {
-		let mut state_col = &mut config.columns[columns::STATE as usize];
-		state_col.ref_counted = true;
-		state_col.preimage = true;
-		state_col.uniform = true;
+
+	match db_type {
+		DatabaseType::Full => {
+			let indexes = [
+				columns::STATE,
+				columns::HEADER,
+				columns::BODY,
+				columns::TRANSACTION,
+				columns::JUSTIFICATIONS,
+			];
+
+			for i in indexes {
+				let mut column = &mut config.columns[i as usize];
+				column.compression = parity_db::CompressionType::Lz4;
+			}
+
+			let mut state_col = &mut config.columns[columns::STATE as usize];
+			state_col.ref_counted = true;
+			state_col.preimage = true;
+			state_col.uniform = true;
+		},
+		DatabaseType::Light => {
+			config.columns[light::columns::HEADER as usize].compression =
+				parity_db::CompressionType::Lz4;
+		},
 	}
-	let db = parity_db::Db::open(&config)?;
+
+	let db = if create {
+		parity_db::Db::open_or_create(&config)?
+	} else {
+		parity_db::Db::open(&config)?
+	};
+
 	Ok(std::sync::Arc::new(DbAdapter(db)))
 }
 
@@ -72,4 +98,8 @@ impl<H: Clone + AsRef<[u8]>> Database<H> for DbAdapter {
 	fn value_size(&self, col: ColumnId, key: &[u8]) -> Option<usize> {
 		handle_err(self.0.get_size(col as u8, key)).map(|s| s as usize)
 	}
+
+	fn supports_ref_counting(&self) -> bool {
+		true
+	}
 }
diff --git a/client/db/src/upgrade.rs b/client/db/src/upgrade.rs
index fe0abaed1b07..0358086690cc 100644
--- a/client/db/src/upgrade.rs
+++ b/client/db/src/upgrade.rs
@@ -19,8 +19,8 @@
 //! Database upgrade logic.
 
 use std::{
-	fs,
-	io::{ErrorKind, Read, Write},
+	fmt, fs,
+	io::{self, ErrorKind, Read, Write},
 	path::{Path, PathBuf},
 };
 
@@ -39,61 +39,79 @@ const CURRENT_VERSION: u32 = 3;
 const V1_NUM_COLUMNS: u32 = 11;
 const V2_NUM_COLUMNS: u32 = 12;
 
-/// Upgrade database to current version.
-pub fn upgrade_db<Block: BlockT>(
-	db_path: &Path,
-	db_type: DatabaseType,
-) -> sp_blockchain::Result<()> {
-	let is_empty = db_path.read_dir().map_or(true, |mut d| d.next().is_none());
-	if !is_empty {
-		let db_version = current_version(db_path)?;
-		match db_version {
-			0 => Err(sp_blockchain::Error::Backend(format!(
-				"Unsupported database version: {}",
-				db_version
-			)))?,
-			1 => {
-				migrate_1_to_2::<Block>(db_path, db_type)?;
-				migrate_2_to_3::<Block>(db_path, db_type)?
-			},
-			2 => migrate_2_to_3::<Block>(db_path, db_type)?,
-			CURRENT_VERSION => (),
-			_ => Err(sp_blockchain::Error::Backend(format!(
-				"Future database version: {}",
-				db_version
-			)))?,
+/// Database upgrade errors.
+#[derive(Debug)]
+pub enum UpgradeError {
+	/// Database version cannot be read from existing db_version file.
+	UnknownDatabaseVersion,
+	/// Missing database version file.
+	MissingDatabaseVersionFile,
+	/// Database version no longer supported.
+	UnsupportedVersion(u32),
+	/// Database version comes from future version of the client.
+	FutureDatabaseVersion(u32),
+	/// Invalid justification block.
+	DecodingJustificationBlock,
+	/// Common io error.
+	Io(io::Error),
+}
+
+pub type UpgradeResult<T> = Result<T, UpgradeError>;
+
+impl From<io::Error> for UpgradeError {
+	fn from(err: io::Error) -> Self {
+		UpgradeError::Io(err)
+	}
+}
+
+impl fmt::Display for UpgradeError {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		match self {
+			UpgradeError::UnknownDatabaseVersion =>
+				write!(f, "Database version cannot be read from exisiting db_version file"),
+			UpgradeError::MissingDatabaseVersionFile => write!(f, "Missing database version file"),
+			UpgradeError::UnsupportedVersion(version) =>
+				write!(f, "Database version no longer supported: {}", version),
+			UpgradeError::FutureDatabaseVersion(version) =>
+				write!(f, "Database version comes from future version of the client: {}", version),
+			UpgradeError::DecodingJustificationBlock =>
+				write!(f, "Decodoning justification block failed"),
+			UpgradeError::Io(err) => write!(f, "Io error: {}", err),
 		}
 	}
+}
 
-	update_version(db_path)
+/// Upgrade database to current version.
+pub fn upgrade_db<Block: BlockT>(db_path: &Path, db_type: DatabaseType) -> UpgradeResult<()> {
+	let db_version = current_version(db_path)?;
+	match db_version {
+		0 => return Err(UpgradeError::UnsupportedVersion(db_version)),
+		1 => {
+			migrate_1_to_2::<Block>(db_path, db_type)?;
+			migrate_2_to_3::<Block>(db_path, db_type)?
+		},
+		2 => migrate_2_to_3::<Block>(db_path, db_type)?,
+		CURRENT_VERSION => (),
+		_ => return Err(UpgradeError::FutureDatabaseVersion(db_version)),
+	}
+	update_version(db_path)?;
+	Ok(())
 }
 
 /// Migration from version1 to version2:
 /// 1) the number of columns has changed from 11 to 12;
 /// 2) transactions column is added;
-fn migrate_1_to_2<Block: BlockT>(
-	db_path: &Path,
-	_db_type: DatabaseType,
-) -> sp_blockchain::Result<()> {
-	let db_path = db_path
-		.to_str()
-		.ok_or_else(|| sp_blockchain::Error::Backend("Invalid database path".into()))?;
+fn migrate_1_to_2<Block: BlockT>(db_path: &Path, _db_type: DatabaseType) -> UpgradeResult<()> {
 	let db_cfg = DatabaseConfig::with_columns(V1_NUM_COLUMNS);
-	let db = Database::open(&db_cfg, db_path).map_err(db_err)?;
-	db.add_column().map_err(db_err)
+	let db = Database::open(&db_cfg, db_path)?;
+	db.add_column().map_err(Into::into)
 }
 
 /// Migration from version2 to version3:
 /// - The format of the stored Justification changed to support multiple Justifications.
-fn migrate_2_to_3<Block: BlockT>(
-	db_path: &Path,
-	_db_type: DatabaseType,
-) -> sp_blockchain::Result<()> {
-	let db_path = db_path
-		.to_str()
-		.ok_or_else(|| sp_blockchain::Error::Backend("Invalid database path".into()))?;
+fn migrate_2_to_3<Block: BlockT>(db_path: &Path, _db_type: DatabaseType) -> UpgradeResult<()> {
 	let db_cfg = DatabaseConfig::with_columns(V2_NUM_COLUMNS);
-	let db = Database::open(&db_cfg, db_path).map_err(db_err)?;
+	let db = Database::open(&db_cfg, db_path)?;
 
 	// Get all the keys we need to update
 	let keys: Vec<_> = db.iter(columns::JUSTIFICATIONS).map(|entry| entry.0).collect();
@@ -101,49 +119,43 @@ fn migrate_2_to_3<Block: BlockT>(
 	// Read and update each entry
 	let mut transaction = db.transaction();
 	for key in keys {
-		if let Some(justification) = db.get(columns::JUSTIFICATIONS, &key).map_err(db_err)? {
+		if let Some(justification) = db.get(columns::JUSTIFICATIONS, &key)? {
 			// Tag each justification with the hardcoded ID for GRANDPA to avoid the dependency on
 			// the GRANDPA crate.
 			// NOTE: when storing justifications the previous API would get a `Vec<u8>` and still
 			// call encode on it.
 			let justification = Vec::<u8>::decode(&mut &justification[..])
-				.map_err(|_| sp_blockchain::Error::Backend("Invalid justification blob".into()))?;
+				.map_err(|_| UpgradeError::DecodingJustificationBlock)?;
 			let justifications = sp_runtime::Justifications::from((*b"FRNK", justification));
 			transaction.put_vec(columns::JUSTIFICATIONS, &key, justifications.encode());
 		}
 	}
-	db.write(transaction).map_err(db_err)?;
+	db.write(transaction)?;
 
 	Ok(())
 }
 
 /// Reads current database version from the file at given path.
 /// If the file does not exist returns 0.
-fn current_version(path: &Path) -> sp_blockchain::Result<u32> {
-	let unknown_version_err = || sp_blockchain::Error::Backend("Unknown database version".into());
-
+fn current_version(path: &Path) -> UpgradeResult<u32> {
 	match fs::File::open(version_file_path(path)) {
-		Err(ref err) if err.kind() == ErrorKind::NotFound => Ok(0),
-		Err(_) => Err(unknown_version_err()),
+		Err(ref err) if err.kind() == ErrorKind::NotFound =>
+			Err(UpgradeError::MissingDatabaseVersionFile),
+		Err(_) => Err(UpgradeError::UnknownDatabaseVersion),
 		Ok(mut file) => {
 			let mut s = String::new();
-			file.read_to_string(&mut s).map_err(|_| unknown_version_err())?;
-			u32::from_str_radix(&s, 10).map_err(|_| unknown_version_err())
+			file.read_to_string(&mut s).map_err(|_| UpgradeError::UnknownDatabaseVersion)?;
+			u32::from_str_radix(&s, 10).map_err(|_| UpgradeError::UnknownDatabaseVersion)
 		},
 	}
 }
 
-/// Maps database error to client error
-fn db_err(err: std::io::Error) -> sp_blockchain::Error {
-	sp_blockchain::Error::Backend(format!("{}", err))
-}
-
 /// Writes current database version to the file.
 /// Creates a new file if the version file does not exist yet.
-fn update_version(path: &Path) -> sp_blockchain::Result<()> {
-	fs::create_dir_all(path).map_err(db_err)?;
-	let mut file = fs::File::create(version_file_path(path)).map_err(db_err)?;
-	file.write_all(format!("{}", CURRENT_VERSION).as_bytes()).map_err(db_err)?;
+pub fn update_version(path: &Path) -> io::Result<()> {
+	fs::create_dir_all(path)?;
+	let mut file = fs::File::create(version_file_path(path))?;
+	file.write_all(format!("{}", CURRENT_VERSION).as_bytes())?;
 	Ok(())
 }
 
@@ -158,7 +170,7 @@ fn version_file_path(path: &Path) -> PathBuf {
 mod tests {
 	use super::*;
 	use crate::{
-		tests::Block, DatabaseSettings, DatabaseSettingsSrc, KeepBlocks, TransactionStorageMode,
+		tests::Block, DatabaseSettings, DatabaseSource, KeepBlocks, TransactionStorageMode,
 	};
 	use sc_state_db::PruningMode;
 
@@ -176,7 +188,7 @@ mod tests {
 				state_cache_size: 0,
 				state_cache_child_ratio: None,
 				state_pruning: PruningMode::ArchiveAll,
-				source: DatabaseSettingsSrc::RocksDb { path: db_path.to_owned(), cache_size: 128 },
+				source: DatabaseSource::RocksDb { path: db_path.to_owned(), cache_size: 128 },
 				keep_blocks: KeepBlocks::All,
 				transaction_storage: TransactionStorageMode::BlockBody,
 			},
diff --git a/client/db/src/utils.rs b/client/db/src/utils.rs
index fc2324f35af6..95cf698c2436 100644
--- a/client/db/src/utils.rs
+++ b/client/db/src/utils.rs
@@ -19,11 +19,11 @@
 //! Db-based backend utility structures and functions, used by both
 //! full and light storages.
 
-use std::{convert::TryInto, sync::Arc};
+use std::{convert::TryInto, fmt, io, path::Path, sync::Arc};
 
 use log::debug;
 
-use crate::{Database, DatabaseSettings, DatabaseSettingsSrc, DbHash};
+use crate::{Database, DatabaseSettings, DatabaseSource, DbHash};
 use codec::Decode;
 use sp_database::Transaction;
 use sp_runtime::{
@@ -204,88 +204,170 @@ where
 	})
 }
 
+fn backend_err(feat: &'static str) -> sp_blockchain::Error {
+	sp_blockchain::Error::Backend(feat.to_string())
+}
+
 /// Opens the configured database.
 pub fn open_database<Block: BlockT>(
 	config: &DatabaseSettings,
 	db_type: DatabaseType,
 ) -> sp_blockchain::Result<Arc<dyn Database<DbHash>>> {
-	#[allow(unused)]
-	fn db_open_error(feat: &'static str) -> sp_blockchain::Error {
-		sp_blockchain::Error::Backend(format!(
-			"`{}` feature not enabled, database can not be opened",
-			feat
-		))
-	}
-
 	let db: Arc<dyn Database<DbHash>> = match &config.source {
-		#[cfg(any(feature = "with-kvdb-rocksdb", test))]
-		DatabaseSettingsSrc::RocksDb { path, cache_size } => {
-			// first upgrade database to required version
-			crate::upgrade::upgrade_db::<Block>(&path, db_type)?;
-
-			// and now open database assuming that it has the latest version
-			let mut db_config = kvdb_rocksdb::DatabaseConfig::with_columns(NUM_COLUMNS);
-			let path = path
-				.to_str()
-				.ok_or_else(|| sp_blockchain::Error::Backend("Invalid database path".into()))?;
-
-			let mut memory_budget = std::collections::HashMap::new();
-			match db_type {
-				DatabaseType::Full => {
-					let state_col_budget = (*cache_size as f64 * 0.9) as usize;
-					let other_col_budget =
-						(cache_size - state_col_budget) / (NUM_COLUMNS as usize - 1);
-
-					for i in 0..NUM_COLUMNS {
-						if i == crate::columns::STATE {
-							memory_budget.insert(i, state_col_budget);
-						} else {
-							memory_budget.insert(i, other_col_budget);
-						}
-					}
-					log::trace!(
-						target: "db",
-						"Open RocksDB database at {}, state column budget: {} MiB, others({}) column cache: {} MiB",
-						path,
-						state_col_budget,
-						NUM_COLUMNS,
-						other_col_budget,
-					);
-				},
-				DatabaseType::Light => {
-					let col_budget = cache_size / (NUM_COLUMNS as usize);
-					for i in 0..NUM_COLUMNS {
-						memory_budget.insert(i, col_budget);
-					}
-					log::trace!(
-						target: "db",
-						"Open RocksDB light database at {}, column cache: {} MiB",
-						path,
-						col_budget,
-					);
-				},
+		DatabaseSource::ParityDb { path } => open_parity_db::<Block>(&path, db_type, true)?,
+		DatabaseSource::RocksDb { path, cache_size } =>
+			open_kvdb_rocksdb::<Block>(&path, db_type, true, *cache_size)?,
+		DatabaseSource::Custom(db) => db.clone(),
+		DatabaseSource::Auto { paritydb_path, rocksdb_path, cache_size } => {
+			// check if rocksdb exists first, if not, open paritydb
+			match open_kvdb_rocksdb::<Block>(&rocksdb_path, db_type, false, *cache_size) {
+				Ok(db) => db,
+				Err(OpenDbError::NotEnabled(_)) | Err(OpenDbError::DoesNotExist) =>
+					open_parity_db::<Block>(&paritydb_path, db_type, true)?,
+				Err(_) => return Err(backend_err("cannot open rocksdb. corrupted database")),
 			}
-			db_config.memory_budget = memory_budget;
-
-			let db = kvdb_rocksdb::Database::open(&db_config, &path)
-				.map_err(|err| sp_blockchain::Error::Backend(format!("{}", err)))?;
-			sp_database::as_database(db)
 		},
-		#[cfg(not(any(feature = "with-kvdb-rocksdb", test)))]
-		DatabaseSettingsSrc::RocksDb { .. } => return Err(db_open_error("with-kvdb-rocksdb")),
-		#[cfg(feature = "with-parity-db")]
-		DatabaseSettingsSrc::ParityDb { path } => crate::parity_db::open(&path, db_type)
-			.map_err(|e| sp_blockchain::Error::Backend(format!("{}", e)))?,
-		#[cfg(not(feature = "with-parity-db"))]
-		DatabaseSettingsSrc::ParityDb { .. } => return Err(db_open_error("with-parity-db")),
-		DatabaseSettingsSrc::Custom(db) => db.clone(),
 	};
 
 	check_database_type(&*db, db_type)?;
+	Ok(db)
+}
 
+#[derive(Debug)]
+enum OpenDbError {
+	// constructed only when rocksdb and paritydb are disabled
+	#[allow(dead_code)]
+	NotEnabled(&'static str),
+	DoesNotExist,
+	Internal(String),
+}
+
+type OpenDbResult = Result<Arc<dyn Database<DbHash>>, OpenDbError>;
+
+impl fmt::Display for OpenDbError {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+		match self {
+			OpenDbError::Internal(e) => write!(f, "{}", e.to_string()),
+			OpenDbError::DoesNotExist => write!(f, "Database does not exist at given location"),
+			OpenDbError::NotEnabled(feat) =>
+				write!(f, "`{}` feature not enabled, database can not be opened", feat),
+		}
+	}
+}
+
+impl From<OpenDbError> for sp_blockchain::Error {
+	fn from(err: OpenDbError) -> Self {
+		sp_blockchain::Error::Backend(err.to_string())
+	}
+}
+
+#[cfg(feature = "with-parity-db")]
+impl From<parity_db::Error> for OpenDbError {
+	fn from(err: parity_db::Error) -> Self {
+		if err.to_string().contains("use open_or_create") {
+			OpenDbError::DoesNotExist
+		} else {
+			OpenDbError::Internal(err.to_string())
+		}
+	}
+}
+
+impl From<io::Error> for OpenDbError {
+	fn from(err: io::Error) -> Self {
+		if err.to_string().contains("create_if_missing is false") {
+			OpenDbError::DoesNotExist
+		} else {
+			OpenDbError::Internal(err.to_string())
+		}
+	}
+}
+
+#[cfg(feature = "with-parity-db")]
+fn open_parity_db<Block: BlockT>(path: &Path, db_type: DatabaseType, create: bool) -> OpenDbResult {
+	let db = crate::parity_db::open(path, db_type, create)?;
 	Ok(db)
 }
 
+#[cfg(not(feature = "with-parity-db"))]
+fn open_parity_db<Block: BlockT>(
+	_path: &Path,
+	_db_type: DatabaseType,
+	_create: bool,
+) -> OpenDbResult {
+	Err(OpenDbError::NotEnabled("with-parity-db"))
+}
+
+#[cfg(any(feature = "with-kvdb-rocksdb", test))]
+fn open_kvdb_rocksdb<Block: BlockT>(
+	path: &Path,
+	db_type: DatabaseType,
+	create: bool,
+	cache_size: usize,
+) -> OpenDbResult {
+	// first upgrade database to required version
+	match crate::upgrade::upgrade_db::<Block>(&path, db_type) {
+		// in case of missing version file, assume that database simply does not exist at given location
+		Ok(_) | Err(crate::upgrade::UpgradeError::MissingDatabaseVersionFile) => (),
+		Err(err) => return Err(io::Error::new(io::ErrorKind::Other, err.to_string()).into()),
+	}
+
+	// and now open database assuming that it has the latest version
+	let mut db_config = kvdb_rocksdb::DatabaseConfig::with_columns(NUM_COLUMNS);
+	db_config.create_if_missing = create;
+
+	let mut memory_budget = std::collections::HashMap::new();
+	match db_type {
+		DatabaseType::Full => {
+			let state_col_budget = (cache_size as f64 * 0.9) as usize;
+			let other_col_budget = (cache_size - state_col_budget) / (NUM_COLUMNS as usize - 1);
+
+			for i in 0..NUM_COLUMNS {
+				if i == crate::columns::STATE {
+					memory_budget.insert(i, state_col_budget);
+				} else {
+					memory_budget.insert(i, other_col_budget);
+				}
+			}
+			log::trace!(
+				target: "db",
+				"Open RocksDB database at {:?}, state column budget: {} MiB, others({}) column cache: {} MiB",
+				path,
+				state_col_budget,
+				NUM_COLUMNS,
+				other_col_budget,
+			);
+		},
+		DatabaseType::Light => {
+			let col_budget = cache_size / (NUM_COLUMNS as usize);
+			for i in 0..NUM_COLUMNS {
+				memory_budget.insert(i, col_budget);
+			}
+			log::trace!(
+				target: "db",
+				"Open RocksDB light database at {:?}, column cache: {} MiB",
+				path,
+				col_budget,
+			);
+		},
+	}
+	db_config.memory_budget = memory_budget;
+
+	let db = kvdb_rocksdb::Database::open(&db_config, path)?;
+	// write database version only after the database is succesfully opened
+	crate::upgrade::update_version(path)?;
+	Ok(sp_database::as_database(db))
+}
+
+#[cfg(not(any(feature = "with-kvdb-rocksdb", test)))]
+fn open_kvdb_rocksdb<Block: BlockT>(
+	_path: &Path,
+	_db_type: DatabaseType,
+	_create: bool,
+	_cache_size: usize,
+) -> OpenDbResult {
+	Err(OpenDbError::NotEnabled("with-kvdb-rocksdb"))
+}
+
 /// Check database type.
 pub fn check_database_type(
 	db: &dyn Database<DbHash>,
@@ -482,7 +564,9 @@ impl<'a, 'b> codec::Input for JoinInput<'a, 'b> {
 #[cfg(test)]
 mod tests {
 	use super::*;
+	use crate::{KeepBlocks, TransactionStorageMode};
 	use codec::Input;
+	use sc_state_db::PruningMode;
 	use sp_runtime::testing::{Block as RawBlock, ExtrinsicWrapper};
 	type Block = RawBlock<ExtrinsicWrapper<u32>>;
 
@@ -521,4 +605,141 @@ mod tests {
 		assert_eq!(test, [7, 8, 6]);
 		assert_eq!(joined.remaining_len().unwrap(), Some(0));
 	}
+
+	fn db_settings(source: DatabaseSource) -> DatabaseSettings {
+		DatabaseSettings {
+			state_cache_size: 0,
+			state_cache_child_ratio: None,
+			state_pruning: PruningMode::ArchiveAll,
+			source,
+			keep_blocks: KeepBlocks::All,
+			transaction_storage: TransactionStorageMode::BlockBody,
+		}
+	}
+
+	#[cfg(feature = "with-parity-db")]
+	#[cfg(any(feature = "with-kvdb-rocksdb", test))]
+	#[test]
+	fn test_open_database_auto_new() {
+		let db_dir = tempfile::TempDir::new().unwrap();
+		let db_path = db_dir.path().to_owned();
+		let paritydb_path = db_path.join("paritydb");
+		let rocksdb_path = db_path.join("rocksdb_path");
+		let source = DatabaseSource::Auto {
+			paritydb_path: paritydb_path.clone(),
+			rocksdb_path: rocksdb_path.clone(),
+			cache_size: 128,
+		};
+		let mut settings = db_settings(source);
+
+		// it should create new auto (paritydb) database
+		{
+			let db_res = open_database::<Block>(&settings, DatabaseType::Full);
+			assert!(db_res.is_ok(), "New database should be created.");
+		}
+
+		// it should reopen existing auto (pairtydb) database
+		{
+			let db_res = open_database::<Block>(&settings, DatabaseType::Full);
+			assert!(db_res.is_ok(), "Existing parity database should be reopened");
+		}
+
+		// it should fail to open existing auto (pairtydb) database
+		{
+			settings.source = DatabaseSource::RocksDb { path: rocksdb_path, cache_size: 128 };
+			let db_res = open_database::<Block>(&settings, DatabaseType::Full);
+			assert!(db_res.is_ok(), "New database should be opened.");
+		}
+
+		// it should reopen existing auto (pairtydb) database
+		{
+			settings.source = DatabaseSource::ParityDb { path: paritydb_path };
+			let db_res = open_database::<Block>(&settings, DatabaseType::Full);
+			assert!(db_res.is_ok(), "Existing parity database should be reopened");
+		}
+	}
+
+	#[cfg(feature = "with-parity-db")]
+	#[cfg(any(feature = "with-kvdb-rocksdb", test))]
+	#[test]
+	fn test_open_database_rocksdb_new() {
+		let db_dir = tempfile::TempDir::new().unwrap();
+		let db_path = db_dir.path().to_owned();
+		let paritydb_path = db_path.join("paritydb");
+		let rocksdb_path = db_path.join("rocksdb_path");
+
+		let source = DatabaseSource::RocksDb { path: rocksdb_path.clone(), cache_size: 128 };
+		let mut settings = db_settings(source);
+
+		// it should create new rocksdb database
+		{
+			let db_res = open_database::<Block>(&settings, DatabaseType::Full);
+			assert!(db_res.is_ok(), "New rocksdb database should be created");
+		}
+
+		// it should reopen existing auto (rocksdb) database
+		{
+			settings.source = DatabaseSource::Auto {
+				paritydb_path: paritydb_path.clone(),
+				rocksdb_path: rocksdb_path.clone(),
+				cache_size: 128,
+			};
+			let db_res = open_database::<Block>(&settings, DatabaseType::Full);
+			assert!(db_res.is_ok(), "Existing rocksdb database should be reopened");
+		}
+
+		// it should fail to open existing auto (rocksdb) database
+		{
+			settings.source = DatabaseSource::ParityDb { path: paritydb_path };
+			let db_res = open_database::<Block>(&settings, DatabaseType::Full);
+			assert!(db_res.is_ok(), "New paritydb database should be created");
+		}
+
+		// it should reopen existing auto (pairtydb) database
+		{
+			settings.source = DatabaseSource::RocksDb { path: rocksdb_path, cache_size: 128 };
+			let db_res = open_database::<Block>(&settings, DatabaseType::Full);
+			assert!(db_res.is_ok(), "Existing rocksdb database should be reopened");
+		}
+	}
+
+	#[cfg(feature = "with-parity-db")]
+	#[cfg(any(feature = "with-kvdb-rocksdb", test))]
+	#[test]
+	fn test_open_database_paritydb_new() {
+		let db_dir = tempfile::TempDir::new().unwrap();
+		let db_path = db_dir.path().to_owned();
+		let paritydb_path = db_path.join("paritydb");
+		let rocksdb_path = db_path.join("rocksdb_path");
+
+		let source = DatabaseSource::ParityDb { path: paritydb_path.clone() };
+		let mut settings = db_settings(source);
+
+		// it should create new paritydb database
+		{
+			let db_res = open_database::<Block>(&settings, DatabaseType::Full);
+			assert!(db_res.is_ok(), "New database should be created.");
+		}
+
+		// it should reopen existing pairtydb database
+		{
+			let db_res = open_database::<Block>(&settings, DatabaseType::Full);
+			assert!(db_res.is_ok(), "Existing parity database should be reopened");
+		}
+
+		// it should fail to open existing pairtydb database
+		{
+			settings.source =
+				DatabaseSource::RocksDb { path: rocksdb_path.clone(), cache_size: 128 };
+			let db_res = open_database::<Block>(&settings, DatabaseType::Full);
+			assert!(db_res.is_ok(), "New rocksdb database should be created");
+		}
+
+		// it should reopen existing auto (pairtydb) database
+		{
+			settings.source = DatabaseSource::Auto { paritydb_path, rocksdb_path, cache_size: 128 };
+			let db_res = open_database::<Block>(&settings, DatabaseType::Full);
+			assert!(db_res.is_ok(), "Existing parity database should be reopened");
+		}
+	}
 }
diff --git a/client/service/src/config.rs b/client/service/src/config.rs
index c915978f5384..6b10545886e7 100644
--- a/client/service/src/config.rs
+++ b/client/service/src/config.rs
@@ -19,10 +19,7 @@
 //! Service configuration.
 
 pub use sc_client_api::execution_extensions::{ExecutionStrategies, ExecutionStrategy};
-pub use sc_client_db::{
-	Database, DatabaseSettingsSrc as DatabaseConfig, KeepBlocks, PruningMode,
-	TransactionStorageMode,
-};
+pub use sc_client_db::{Database, DatabaseSource, KeepBlocks, PruningMode, TransactionStorageMode};
 pub use sc_executor::WasmExecutionMethod;
 pub use sc_network::{
 	config::{
@@ -69,7 +66,7 @@ pub struct Configuration {
 	/// Remote URI to connect to for async keystore support
 	pub keystore_remote: Option<String>,
 	/// Configuration for the database.
-	pub database: DatabaseConfig,
+	pub database: DatabaseSource,
 	/// Size of internal state cache in Bytes
 	pub state_cache_size: usize,
 	/// Size in percent of cache size dedicated to child tries
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index 5791165e5389..b1dcc615a422 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -59,7 +59,7 @@ pub use self::{
 	error::Error,
 };
 pub use config::{
-	BasePath, Configuration, DatabaseConfig, KeepBlocks, PruningMode, Role, RpcMethods,
+	BasePath, Configuration, DatabaseSource, KeepBlocks, PruningMode, Role, RpcMethods,
 	TaskExecutor, TaskType, TransactionStorageMode,
 };
 pub use sc_chain_spec::{
diff --git a/client/service/test/src/client/mod.rs b/client/service/test/src/client/mod.rs
index 6ac149677bc1..01d46c9678bc 100644
--- a/client/service/test/src/client/mod.rs
+++ b/client/service/test/src/client/mod.rs
@@ -22,7 +22,7 @@ use parity_scale_codec::{Decode, Encode, Joiner};
 use sc_block_builder::BlockBuilderProvider;
 use sc_client_api::{in_mem, BlockBackend, BlockchainEvents, StorageProvider};
 use sc_client_db::{
-	Backend, DatabaseSettings, DatabaseSettingsSrc, KeepBlocks, PruningMode, TransactionStorageMode,
+	Backend, DatabaseSettings, DatabaseSource, KeepBlocks, PruningMode, TransactionStorageMode,
 };
 use sc_consensus::{
 	BlockCheckParams, BlockImport, BlockImportParams, ForkChoiceStrategy, ImportResult,
@@ -1433,7 +1433,7 @@ fn doesnt_import_blocks_that_revert_finality() {
 				state_pruning: PruningMode::ArchiveAll,
 				keep_blocks: KeepBlocks::All,
 				transaction_storage: TransactionStorageMode::BlockBody,
-				source: DatabaseSettingsSrc::RocksDb { path: tmp.path().into(), cache_size: 1024 },
+				source: DatabaseSource::RocksDb { path: tmp.path().into(), cache_size: 1024 },
 			},
 			u64::MAX,
 		)
@@ -1648,7 +1648,7 @@ fn returns_status_for_pruned_blocks() {
 				state_pruning: PruningMode::keep_blocks(1),
 				keep_blocks: KeepBlocks::All,
 				transaction_storage: TransactionStorageMode::BlockBody,
-				source: DatabaseSettingsSrc::RocksDb { path: tmp.path().into(), cache_size: 1024 },
+				source: DatabaseSource::RocksDb { path: tmp.path().into(), cache_size: 1024 },
 			},
 			u64::MAX,
 		)
diff --git a/client/service/test/src/lib.rs b/client/service/test/src/lib.rs
index 9433ed0bde06..87153c2736ef 100644
--- a/client/service/test/src/lib.rs
+++ b/client/service/test/src/lib.rs
@@ -29,7 +29,7 @@ use sc_network::{
 };
 use sc_service::{
 	client::Client,
-	config::{BasePath, DatabaseConfig, KeystoreConfig},
+	config::{BasePath, DatabaseSource, KeystoreConfig},
 	ChainSpecExtension, Configuration, Error, GenericChainSpec, KeepBlocks, Role, RuntimeGenesis,
 	SpawnTaskHandle, TaskExecutor, TaskManager, TransactionStorageMode,
 };
@@ -236,7 +236,7 @@ fn node_config<
 		network: network_config,
 		keystore_remote: Default::default(),
 		keystore: KeystoreConfig::Path { path: root.join("key"), password: None },
-		database: DatabaseConfig::RocksDb { path: root.join("db"), cache_size: 128 },
+		database: DatabaseSource::RocksDb { path: root.join("db"), cache_size: 128 },
 		state_cache_size: 16777216,
 		state_cache_child_ratio: None,
 		state_pruning: Default::default(),
diff --git a/primitives/database/src/lib.rs b/primitives/database/src/lib.rs
index ed5d93ed5b9c..d30c7eb3323e 100644
--- a/primitives/database/src/lib.rs
+++ b/primitives/database/src/lib.rs
@@ -103,6 +103,13 @@ pub trait Database<H: Clone + AsRef<[u8]>>: Send + Sync {
 	fn with_get(&self, col: ColumnId, key: &[u8], f: &mut dyn FnMut(&[u8])) {
 		self.get(col, key).map(|v| f(&v));
 	}
+
+	/// Check if database supports internal ref counting for state data.
+	///
+	/// For backwards compatibility returns `false` by default.
+	fn supports_ref_counting(&self) -> bool {
+		false
+	}
 }
 
 impl<H> std::fmt::Debug for dyn Database<H> {
diff --git a/test-utils/test-runner/src/lib.rs b/test-utils/test-runner/src/lib.rs
index 9f0a8d5d6cb6..ed0cc222bf44 100644
--- a/test-utils/test-runner/src/lib.rs
+++ b/test-utils/test-runner/src/lib.rs
@@ -42,7 +42,7 @@
 //! use sc_finality_grandpa::GrandpaBlockImport;
 //! use sc_service::{
 //!     TFullBackend, TFullClient, Configuration, TaskManager, new_full_parts, BasePath,
-//!     DatabaseConfig, KeepBlocks, TransactionStorageMode, ChainSpec, Role,
+//!     DatabaseSource, KeepBlocks, TransactionStorageMode, ChainSpec, Role,
 //!     config::{NetworkConfiguration, KeystoreConfig},
 //! };
 //! use std::sync::Arc;
diff --git a/test-utils/test-runner/src/utils.rs b/test-utils/test-runner/src/utils.rs
index e0176fcb6cc2..2fe3a98d44ad 100644
--- a/test-utils/test-runner/src/utils.rs
+++ b/test-utils/test-runner/src/utils.rs
@@ -25,7 +25,7 @@ use sc_network::{
 	multiaddr,
 };
 use sc_service::{
-	config::KeystoreConfig, BasePath, ChainSpec, Configuration, DatabaseConfig, KeepBlocks,
+	config::KeystoreConfig, BasePath, ChainSpec, Configuration, DatabaseSource, KeepBlocks,
 	TaskExecutor, TaskType, TransactionStorageMode,
 };
 use sp_keyring::sr25519::Keyring::Alice;
@@ -79,7 +79,7 @@ pub fn default_config(
 		transaction_pool: Default::default(),
 		network: network_config,
 		keystore: KeystoreConfig::Path { path: root_path.join("key"), password: None },
-		database: DatabaseConfig::RocksDb { path: root_path.join("db"), cache_size: 128 },
+		database: DatabaseSource::RocksDb { path: root_path.join("db"), cache_size: 128 },
 		state_cache_size: 16777216,
 		state_cache_child_ratio: None,
 		chain_spec,
diff --git a/utils/browser/src/lib.rs b/utils/browser/src/lib.rs
index 0870ea84296c..6cd35f22bffb 100644
--- a/utils/browser/src/lib.rs
+++ b/utils/browser/src/lib.rs
@@ -27,7 +27,7 @@ use log::{debug, info};
 use sc_chain_spec::Extension;
 use sc_network::config::TransportConfig;
 use sc_service::{
-	config::{DatabaseConfig, KeystoreConfig, NetworkConfiguration},
+	config::{DatabaseSource, KeystoreConfig, NetworkConfiguration},
 	Configuration, GenericChainSpec, KeepBlocks, Role, RpcHandlers, RpcSession, RuntimeGenesis,
 	TaskManager, TransactionStorageMode,
 };
@@ -83,7 +83,7 @@ where
 			info!("Opening Indexed DB database '{}'...", name);
 			let db = kvdb_memorydb::create(10);
 
-			DatabaseConfig::Custom(sp_database::as_database(db))
+			DatabaseSource::Custom(sp_database::as_database(db))
 		},
 		keystore_remote: Default::default(),
 		keystore: KeystoreConfig::InMemory,

From 0dfb48cbbf4a6589e1441c2ec81774dc3d1348ff Mon Sep 17 00:00:00 2001
From: Ashley <ashley.ruglys@gmail.com>
Date: Mon, 9 Aug 2021 16:24:24 +0200
Subject: [PATCH 1070/1194] Consistently use `I::from(Self::get())` in
 `parameter_types!` (#9526)

---
 frame/support/src/lib.rs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index a9cbe94d4fb7..d1a62106dc8d 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -359,7 +359,6 @@ macro_rules! parameter_types {
 	(IMPL_CONST $name:ident, $type:ty, $value:expr) => {
 		impl $name {
 			/// Returns the value of this parameter type.
-			#[allow(unused)]
 			pub const fn get() -> $type {
 				$value
 			}
@@ -367,14 +366,13 @@ macro_rules! parameter_types {
 
 		impl<I: From<$type>> $crate::traits::Get<I> for $name {
 			fn get() -> I {
-				I::from($value)
+				I::from(Self::get())
 			}
 		}
 	};
 	(IMPL $name:ident, $type:ty, $value:expr) => {
 		impl $name {
 			/// Returns the value of this parameter type.
-			#[allow(unused)]
 			pub fn get() -> $type {
 				$value
 			}
@@ -382,7 +380,7 @@ macro_rules! parameter_types {
 
 		impl<I: From<$type>> $crate::traits::Get<I> for $name {
 			fn get() -> I {
-				I::from($value)
+				I::from(Self::get())
 			}
 		}
 	};

From 00bb485b4894139550fa3b47543512d2cc6ec121 Mon Sep 17 00:00:00 2001
From: Nazar Mokrynskyi <nazar@mokrynskyi.com>
Date: Tue, 10 Aug 2021 12:13:00 +0300
Subject: [PATCH 1071/1194] Remove unused pdqselect dependency from
 `sc-consensus-babe` (#9528)

---
 Cargo.lock                       | 7 -------
 client/consensus/babe/Cargo.toml | 1 -
 2 files changed, 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1afa55c77162..bf00732f2135 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6047,12 +6047,6 @@ dependencies = [
  "crypto-mac 0.8.0",
 ]
 
-[[package]]
-name = "pdqselect"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec91767ecc0a0bbe558ce8c9da33c068066c57ecc8bb8477ef8c1ad3ef77c27"
-
 [[package]]
 name = "peeking_take_while"
 version = "0.1.2"
@@ -7380,7 +7374,6 @@ dependencies = [
  "num-traits",
  "parity-scale-codec",
  "parking_lot 0.11.1",
- "pdqselect",
  "rand 0.7.3",
  "rand_chacha 0.2.2",
  "retain_mut",
diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml
index e6538cb57aae..7e754c6fb2e6 100644
--- a/client/consensus/babe/Cargo.toml
+++ b/client/consensus/babe/Cargo.toml
@@ -50,7 +50,6 @@ log = "0.4.8"
 schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated"] }
 rand = "0.7.2"
 merlin = "2.0"
-pdqselect = "0.1.0"
 derive_more = "0.99.2"
 retain_mut = "0.1.3"
 async-trait = "0.1.50"

From 026a8491694783dd95c9c3d2f917b11cf609cb49 Mon Sep 17 00:00:00 2001
From: Ashley <ashley.ruglys@gmail.com>
Date: Tue, 10 Aug 2021 15:23:09 +0200
Subject: [PATCH 1072/1194] Refactor `sc_executor::RuntimeInfo` trait into 2
 parts (#9498)

* Split native executor stuff from wasm executor stuff

* Remove `native_runtime_version` in places

* Fix warning

* Fix test warning

* Remove redundant NativeRuntimeInfo trait

* Add a warning for use_native

* Run cargo fmt

* Revert "Add a warning for use_native"

This reverts commit 9494f765a06037e991dd60524f2ed1b14649bfd6.
---
 bin/node/executor/benches/bench.rs            |  2 +-
 client/api/src/call_executor.rs               |  5 +-
 client/executor/src/lib.rs                    |  7 +--
 client/executor/src/native_executor.rs        | 58 ++++++++++++++++---
 client/light/src/call_executor.rs             |  6 +-
 client/service/src/builder.rs                 |  4 +-
 client/service/src/client/call_executor.rs    | 25 ++++----
 client/service/src/client/client.rs           |  6 +-
 client/service/src/client/light.rs            |  4 +-
 client/service/src/client/wasm_override.rs    |  6 +-
 client/service/src/client/wasm_substitutes.rs |  4 +-
 client/service/test/src/client/light.rs       |  6 +-
 primitives/consensus/common/src/lib.rs        |  4 +-
 primitives/version/src/lib.rs                 | 23 +++++---
 14 files changed, 101 insertions(+), 59 deletions(-)

diff --git a/bin/node/executor/benches/bench.rs b/bin/node/executor/benches/bench.rs
index cd201cfc9598..485298e8c428 100644
--- a/bin/node/executor/benches/bench.rs
+++ b/bin/node/executor/benches/bench.rs
@@ -25,7 +25,7 @@ use node_runtime::{
 	UncheckedExtrinsic,
 };
 use node_testing::keyring::*;
-use sc_executor::{Externalities, NativeExecutor, RuntimeInfo, WasmExecutionMethod};
+use sc_executor::{Externalities, NativeExecutor, RuntimeVersionOf, WasmExecutionMethod};
 use sp_core::{
 	storage::well_known_keys,
 	traits::{CodeExecutor, RuntimeCode},
diff --git a/client/api/src/call_executor.rs b/client/api/src/call_executor.rs
index a19df7432606..22af495c0654 100644
--- a/client/api/src/call_executor.rs
+++ b/client/api/src/call_executor.rs
@@ -19,7 +19,7 @@
 //! A method call executor interface.
 
 use codec::{Decode, Encode};
-use sc_executor::{NativeVersion, RuntimeVersion};
+use sc_executor::RuntimeVersion;
 use sp_core::NativeOrEncoded;
 use sp_externalities::Extensions;
 use sp_runtime::{generic::BlockId, traits::Block as BlockT};
@@ -106,7 +106,4 @@ pub trait CallExecutor<B: BlockT> {
 		method: &str,
 		call_data: &[u8],
 	) -> Result<(Vec<u8>, StorageProof), sp_blockchain::Error>;
-
-	/// Get runtime version if supported.
-	fn native_runtime_version(&self) -> Option<&NativeVersion>;
 }
diff --git a/client/executor/src/lib.rs b/client/executor/src/lib.rs
index f4b972a86f27..e4442960ea24 100644
--- a/client/executor/src/lib.rs
+++ b/client/executor/src/lib.rs
@@ -51,11 +51,8 @@ pub use wasmi;
 
 pub use sc_executor_common::{error, sandbox};
 
-/// Provides runtime information.
-pub trait RuntimeInfo {
-	/// Native runtime information.
-	fn native_version(&self) -> &NativeVersion;
-
+/// Extracts the runtime version of a given runtime code.
+pub trait RuntimeVersionOf {
 	/// Extract [`RuntimeVersion`](sp_version::RuntimeVersion) of the given `runtime_code`.
 	fn runtime_version(
 		&self,
diff --git a/client/executor/src/native_executor.rs b/client/executor/src/native_executor.rs
index 8222e00b1761..51b9a404bbcc 100644
--- a/client/executor/src/native_executor.rs
+++ b/client/executor/src/native_executor.rs
@@ -19,7 +19,7 @@
 use crate::{
 	error::{Error, Result},
 	wasm_runtime::{RuntimeCache, WasmExecutionMethod},
-	RuntimeInfo,
+	RuntimeVersionOf,
 };
 
 use std::{
@@ -45,7 +45,7 @@ use sp_core::{
 };
 use sp_externalities::ExternalitiesExt as _;
 use sp_tasks::new_async_externalities;
-use sp_version::{NativeVersion, RuntimeVersion};
+use sp_version::{GetNativeVersion, NativeVersion, RuntimeVersion};
 use sp_wasm_interface::{Function, HostFunctions};
 
 /// Default num of pages for the heap
@@ -269,6 +269,48 @@ impl sp_core::traits::ReadRuntimeVersion for WasmExecutor {
 	}
 }
 
+impl CodeExecutor for WasmExecutor {
+	type Error = Error;
+
+	fn call<
+		R: Decode + Encode + PartialEq,
+		NC: FnOnce() -> result::Result<R, Box<dyn std::error::Error + Send + Sync>> + UnwindSafe,
+	>(
+		&self,
+		ext: &mut dyn Externalities,
+		runtime_code: &RuntimeCode,
+		method: &str,
+		data: &[u8],
+		_use_native: bool,
+		_native_call: Option<NC>,
+	) -> (Result<NativeOrEncoded<R>>, bool) {
+		let result = self.with_instance(
+			runtime_code,
+			ext,
+			false,
+			|module, instance, _onchain_version, mut ext| {
+				with_externalities_safe(&mut **ext, move || {
+					preregister_builtin_ext(module.clone());
+					instance.call_export(method, data).map(NativeOrEncoded::Encoded)
+				})
+			},
+		);
+		(result, false)
+	}
+}
+
+impl RuntimeVersionOf for WasmExecutor {
+	fn runtime_version(
+		&self,
+		ext: &mut dyn Externalities,
+		runtime_code: &RuntimeCode,
+	) -> Result<RuntimeVersion> {
+		self.with_instance(runtime_code, ext, false, |_module, _instance, version, _ext| {
+			Ok(version.cloned().ok_or_else(|| Error::ApiError("Unknown version".into())))
+		})
+	}
+}
+
 /// A generic `CodeExecutor` implementation that uses a delegate to determine wasm code equivalence
 /// and dispatch to native code when possible, falling back on `WasmExecutor` when not.
 pub struct NativeExecutor<D> {
@@ -324,11 +366,7 @@ impl<D: NativeExecutionDispatch> NativeExecutor<D> {
 	}
 }
 
-impl<D: NativeExecutionDispatch> RuntimeInfo for NativeExecutor<D> {
-	fn native_version(&self) -> &NativeVersion {
-		&self.native_version
-	}
-
+impl<D: NativeExecutionDispatch> RuntimeVersionOf for NativeExecutor<D> {
 	fn runtime_version(
 		&self,
 		ext: &mut dyn Externalities,
@@ -341,6 +379,12 @@ impl<D: NativeExecutionDispatch> RuntimeInfo for NativeExecutor<D> {
 	}
 }
 
+impl<D: NativeExecutionDispatch> GetNativeVersion for NativeExecutor<D> {
+	fn native_version(&self) -> &NativeVersion {
+		&self.native_version
+	}
+}
+
 /// Helper inner struct to implement `RuntimeSpawn` extension.
 pub struct RuntimeInstanceSpawn {
 	module: Arc<dyn WasmModule>,
diff --git a/client/light/src/call_executor.rs b/client/light/src/call_executor.rs
index 144e0cbf96dc..a0776131e406 100644
--- a/client/light/src/call_executor.rs
+++ b/client/light/src/call_executor.rs
@@ -44,7 +44,7 @@ use sp_blockchain::{Error as ClientError, Result as ClientResult};
 use sc_client_api::{
 	backend::RemoteBackend, call_executor::CallExecutor, light::RemoteCallRequest,
 };
-use sc_executor::{NativeVersion, RuntimeVersion};
+use sc_executor::RuntimeVersion;
 
 /// Call executor that is able to execute calls only on genesis state.
 ///
@@ -162,10 +162,6 @@ where
 			Err(ClientError::NotAvailableOnLightClient)
 		}
 	}
-
-	fn native_runtime_version(&self) -> Option<&NativeVersion> {
-		None
-	}
 }
 
 /// Check remote contextual execution proof using given backend.
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index 83c8e1d9d1cb..18f701d6f1b5 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -37,7 +37,7 @@ use sc_client_api::{
 };
 use sc_client_db::{Backend, DatabaseSettings};
 use sc_consensus::import_queue::ImportQueue;
-use sc_executor::{NativeExecutionDispatch, NativeExecutor, RuntimeInfo};
+use sc_executor::{NativeExecutionDispatch, NativeExecutor, RuntimeVersionOf};
 use sc_keystore::LocalKeystore;
 use sc_network::{
 	block_request_handler::{self, BlockRequestHandler},
@@ -454,7 +454,7 @@ pub fn new_client<E, Block, RA>(
 >
 where
 	Block: BlockT,
-	E: CodeExecutor + RuntimeInfo,
+	E: CodeExecutor + RuntimeVersionOf,
 {
 	let executor = crate::client::LocalCallExecutor::new(
 		backend.clone(),
diff --git a/client/service/src/client/call_executor.rs b/client/service/src/client/call_executor.rs
index 2fae972d3472..0710c4ae870e 100644
--- a/client/service/src/client/call_executor.rs
+++ b/client/service/src/client/call_executor.rs
@@ -19,7 +19,7 @@
 use super::{client::ClientConfig, wasm_override::WasmOverride, wasm_substitutes::WasmSubstitutes};
 use codec::{Decode, Encode};
 use sc_client_api::{backend, call_executor::CallExecutor, HeaderBackend};
-use sc_executor::{NativeVersion, RuntimeInfo, RuntimeVersion};
+use sc_executor::{RuntimeVersion, RuntimeVersionOf};
 use sp_api::{ProofRecorder, StorageTransactionCache};
 use sp_core::{
 	traits::{CodeExecutor, RuntimeCode, SpawnNamed},
@@ -49,7 +49,7 @@ pub struct LocalCallExecutor<Block: BlockT, B, E> {
 
 impl<Block: BlockT, B, E> LocalCallExecutor<Block, B, E>
 where
-	E: CodeExecutor + RuntimeInfo + Clone + 'static,
+	E: CodeExecutor + RuntimeVersionOf + Clone + 'static,
 	B: backend::Backend<Block>,
 {
 	/// Creates new instance of local call executor.
@@ -137,7 +137,7 @@ where
 impl<B, E, Block> CallExecutor<Block> for LocalCallExecutor<Block, B, E>
 where
 	B: backend::Backend<Block>,
-	E: CodeExecutor + RuntimeInfo + Clone + 'static,
+	E: CodeExecutor + RuntimeVersionOf + Clone + 'static,
 	Block: BlockT,
 {
 	type Error = E::Error;
@@ -333,25 +333,28 @@ where
 		)
 		.map_err(Into::into)
 	}
+}
 
-	fn native_runtime_version(&self) -> Option<&NativeVersion> {
-		Some(self.executor.native_version())
+impl<Block, B, E> sp_version::GetRuntimeVersionAt<Block> for LocalCallExecutor<Block, B, E>
+where
+	B: backend::Backend<Block>,
+	E: CodeExecutor + RuntimeVersionOf + Clone + 'static,
+	Block: BlockT,
+{
+	fn runtime_version(&self, at: &BlockId<Block>) -> Result<sp_version::RuntimeVersion, String> {
+		CallExecutor::runtime_version(self, at).map_err(|e| format!("{:?}", e))
 	}
 }
 
-impl<Block, B, E> sp_version::GetRuntimeVersion<Block> for LocalCallExecutor<Block, B, E>
+impl<Block, B, E> sp_version::GetNativeVersion for LocalCallExecutor<Block, B, E>
 where
 	B: backend::Backend<Block>,
-	E: CodeExecutor + RuntimeInfo + Clone + 'static,
+	E: CodeExecutor + sp_version::GetNativeVersion + Clone + 'static,
 	Block: BlockT,
 {
 	fn native_version(&self) -> &sp_version::NativeVersion {
 		self.executor.native_version()
 	}
-
-	fn runtime_version(&self, at: &BlockId<Block>) -> Result<sp_version::RuntimeVersion, String> {
-		CallExecutor::runtime_version(self, at).map_err(|e| format!("{:?}", e))
-	}
 }
 
 #[cfg(test)]
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index 17fbe6988dab..727d58dfa046 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -96,7 +96,7 @@ use std::{
 use {
 	super::call_executor::LocalCallExecutor,
 	sc_client_api::in_mem,
-	sc_executor::RuntimeInfo,
+	sc_executor::RuntimeVersionOf,
 	sp_core::traits::{CodeExecutor, SpawnNamed},
 };
 
@@ -169,7 +169,7 @@ pub fn new_in_mem<E, Block, S, RA>(
 	Client<in_mem::Backend<Block>, LocalCallExecutor<Block, in_mem::Backend<Block>, E>, Block, RA>,
 >
 where
-	E: CodeExecutor + RuntimeInfo,
+	E: CodeExecutor + RuntimeVersionOf,
 	S: BuildStorage,
 	Block: BlockT,
 {
@@ -227,7 +227,7 @@ pub fn new_with_backend<B, E, Block, S, RA>(
 	config: ClientConfig<Block>,
 ) -> sp_blockchain::Result<Client<B, LocalCallExecutor<Block, B, E>, Block, RA>>
 where
-	E: CodeExecutor + RuntimeInfo,
+	E: CodeExecutor + RuntimeVersionOf,
 	S: BuildStorage,
 	Block: BlockT,
 	B: backend::LocalBackend<Block> + 'static,
diff --git a/client/service/src/client/light.rs b/client/service/src/client/light.rs
index 82fe17e6855e..7c13b98843e0 100644
--- a/client/service/src/client/light.rs
+++ b/client/service/src/client/light.rs
@@ -21,7 +21,7 @@
 use std::sync::Arc;
 
 use prometheus_endpoint::Registry;
-use sc_executor::RuntimeInfo;
+use sc_executor::RuntimeVersionOf;
 use sc_telemetry::TelemetryHandle;
 use sp_blockchain::Result as ClientResult;
 use sp_core::traits::{CodeExecutor, SpawnNamed};
@@ -59,7 +59,7 @@ pub fn new_light<B, S, RA, E>(
 where
 	B: BlockT,
 	S: BlockchainStorage<B> + 'static,
-	E: CodeExecutor + RuntimeInfo + Clone + 'static,
+	E: CodeExecutor + RuntimeVersionOf + Clone + 'static,
 {
 	let local_executor = LocalCallExecutor::new(
 		backend.clone(),
diff --git a/client/service/src/client/wasm_override.rs b/client/service/src/client/wasm_override.rs
index 7abd04f2be23..a04a48f9c4b4 100644
--- a/client/service/src/client/wasm_override.rs
+++ b/client/service/src/client/wasm_override.rs
@@ -35,7 +35,7 @@
 //! A custom WASM blob will override on-chain WASM if the spec version matches. If it is
 //! required to overrides multiple runtimes, multiple WASM blobs matching each of the spec versions
 //! needed must be provided in the given directory.
-use sc_executor::RuntimeInfo;
+use sc_executor::RuntimeVersionOf;
 use sp_blockchain::Result;
 use sp_core::traits::{FetchRuntimeCode, RuntimeCode};
 use sp_state_machine::BasicExternalities;
@@ -112,7 +112,7 @@ pub struct WasmOverride<E> {
 
 impl<E> WasmOverride<E>
 where
-	E: RuntimeInfo + Clone + 'static,
+	E: RuntimeVersionOf + Clone + 'static,
 {
 	pub fn new<P>(path: P, executor: E) -> Result<Self>
 	where
@@ -192,7 +192,7 @@ where
 #[cfg(test)]
 pub fn dummy_overrides<E>(executor: &E) -> WasmOverride<E>
 where
-	E: RuntimeInfo + Clone + 'static,
+	E: RuntimeVersionOf + Clone + 'static,
 {
 	let mut overrides = HashMap::new();
 	overrides.insert(0, WasmBlob::new(vec![0, 0, 0, 0, 0, 0, 0, 0]));
diff --git a/client/service/src/client/wasm_substitutes.rs b/client/service/src/client/wasm_substitutes.rs
index ac48059fc2f3..28975790e9b5 100644
--- a/client/service/src/client/wasm_substitutes.rs
+++ b/client/service/src/client/wasm_substitutes.rs
@@ -20,7 +20,7 @@
 
 use parking_lot::RwLock;
 use sc_client_api::backend;
-use sc_executor::RuntimeInfo;
+use sc_executor::RuntimeVersionOf;
 use sp_blockchain::{HeaderBackend, Result};
 use sp_core::traits::{FetchRuntimeCode, RuntimeCode};
 use sp_runtime::{
@@ -139,7 +139,7 @@ impl<Block: BlockT, Executor: Clone, Backend> Clone for WasmSubstitutes<Block, E
 
 impl<Executor, Backend, Block> WasmSubstitutes<Block, Executor, Backend>
 where
-	Executor: RuntimeInfo + Clone + 'static,
+	Executor: RuntimeVersionOf + Clone + 'static,
 	Backend: backend::Backend<Block>,
 	Block: BlockT,
 {
diff --git a/client/service/test/src/client/light.rs b/client/service/test/src/client/light.rs
index 90f87670c0ce..da4363b88102 100644
--- a/client/service/test/src/client/light.rs
+++ b/client/service/test/src/client/light.rs
@@ -30,7 +30,7 @@ use sc_client_api::{
 	RemoteBodyRequest, RemoteCallRequest, RemoteChangesRequest, RemoteHeaderRequest,
 	RemoteReadChildRequest, RemoteReadRequest, Storage, StorageProof, StorageProvider,
 };
-use sc_executor::{NativeExecutor, NativeVersion, RuntimeVersion, WasmExecutionMethod};
+use sc_executor::{NativeExecutor, RuntimeVersion, WasmExecutionMethod};
 use sc_light::{
 	backend::{Backend, GenesisOrUnavailableState},
 	blockchain::{Blockchain, BlockchainCache},
@@ -256,10 +256,6 @@ impl CallExecutor<Block> for DummyCallExecutor {
 	) -> Result<(Vec<u8>, StorageProof), ClientError> {
 		unreachable!()
 	}
-
-	fn native_runtime_version(&self) -> Option<&NativeVersion> {
-		unreachable!()
-	}
 }
 
 fn local_executor() -> NativeExecutor<substrate_test_runtime_client::LocalExecutor> {
diff --git a/primitives/consensus/common/src/lib.rs b/primitives/consensus/common/src/lib.rs
index c72024e112d4..d7979baf47c1 100644
--- a/primitives/consensus/common/src/lib.rs
+++ b/primitives/consensus/common/src/lib.rs
@@ -294,8 +294,8 @@ impl<T> CanAuthorWithNativeVersion<T> {
 	}
 }
 
-impl<T: sp_version::GetRuntimeVersion<Block>, Block: BlockT> CanAuthorWith<Block>
-	for CanAuthorWithNativeVersion<T>
+impl<T: sp_version::GetRuntimeVersionAt<Block> + sp_version::GetNativeVersion, Block: BlockT>
+	CanAuthorWith<Block> for CanAuthorWithNativeVersion<T>
 {
 	fn can_author_with(&self, at: &BlockId<Block>) -> Result<(), String> {
 		match self.0.runtime_version(at) {
diff --git a/primitives/version/src/lib.rs b/primitives/version/src/lib.rs
index da2cb342d22f..c76fb44a2cd6 100644
--- a/primitives/version/src/lib.rs
+++ b/primitives/version/src/lib.rs
@@ -251,27 +251,36 @@ impl NativeVersion {
 	}
 }
 
-/// Something that can provide the runtime version at a given block and the native runtime version.
 #[cfg(feature = "std")]
-pub trait GetRuntimeVersion<Block: BlockT> {
+/// Returns the version of the native runtime.
+pub trait GetNativeVersion {
 	/// Returns the version of the native runtime.
 	fn native_version(&self) -> &NativeVersion;
+}
 
+/// Something that can provide the runtime version at a given block.
+#[cfg(feature = "std")]
+pub trait GetRuntimeVersionAt<Block: BlockT> {
 	/// Returns the version of runtime at the given block.
 	fn runtime_version(&self, at: &BlockId<Block>) -> Result<RuntimeVersion, String>;
 }
 
 #[cfg(feature = "std")]
-impl<T: GetRuntimeVersion<Block>, Block: BlockT> GetRuntimeVersion<Block> for std::sync::Arc<T> {
-	fn native_version(&self) -> &NativeVersion {
-		(&**self).native_version()
-	}
-
+impl<T: GetRuntimeVersionAt<Block>, Block: BlockT> GetRuntimeVersionAt<Block>
+	for std::sync::Arc<T>
+{
 	fn runtime_version(&self, at: &BlockId<Block>) -> Result<RuntimeVersion, String> {
 		(&**self).runtime_version(at)
 	}
 }
 
+#[cfg(feature = "std")]
+impl<T: GetNativeVersion> GetNativeVersion for std::sync::Arc<T> {
+	fn native_version(&self) -> &NativeVersion {
+		(&**self).native_version()
+	}
+}
+
 #[cfg(feature = "std")]
 mod apis_serialize {
 	use super::*;

From 5675e9e48d2d07b50fb9027ea35bd6de1f200ef7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 10 Aug 2021 15:33:21 +0200
Subject: [PATCH 1073/1194] Make `UncheckedExtrinsic` encode more readable
 (#9531)

Actually this will cost us another allocation, but before this wasn't
really safe. Assuming that we only need `size_of` bytes for the encoding
of the tx could have ended with an invalid encoding.
---
 primitives/runtime/src/generic/mod.rs         | 25 -------------
 .../src/generic/unchecked_extrinsic.rs        | 36 ++++++++++++-------
 2 files changed, 23 insertions(+), 38 deletions(-)

diff --git a/primitives/runtime/src/generic/mod.rs b/primitives/runtime/src/generic/mod.rs
index deaecd65e478..71127e88ec32 100644
--- a/primitives/runtime/src/generic/mod.rs
+++ b/primitives/runtime/src/generic/mod.rs
@@ -36,28 +36,3 @@ pub use self::{
 	header::Header,
 	unchecked_extrinsic::{SignedPayload, UncheckedExtrinsic},
 };
-
-use crate::codec::Encode;
-use sp_std::prelude::*;
-
-fn encode_with_vec_prefix<T: Encode, F: Fn(&mut Vec<u8>)>(encoder: F) -> Vec<u8> {
-	let size = ::sp_std::mem::size_of::<T>();
-	let reserve = match size {
-		0..=0b00111111 => 1,
-		0b01000000..=0b00111111_11111111 => 2,
-		_ => 4,
-	};
-	let mut v = Vec::with_capacity(reserve + size);
-	v.resize(reserve, 0);
-	encoder(&mut v);
-
-	// need to prefix with the total length to ensure it's binary compatible with
-	// Vec<u8>.
-	let mut length: Vec<()> = Vec::new();
-	length.resize(v.len() - reserve, ());
-	length.using_encoded(|s| {
-		v.splice(0..reserve, s.iter().cloned());
-	});
-
-	v
-}
diff --git a/primitives/runtime/src/generic/unchecked_extrinsic.rs b/primitives/runtime/src/generic/unchecked_extrinsic.rs
index 68ab8447cfbc..9f50ab35b33a 100644
--- a/primitives/runtime/src/generic/unchecked_extrinsic.rs
+++ b/primitives/runtime/src/generic/unchecked_extrinsic.rs
@@ -228,19 +228,29 @@ where
 	Extra: SignedExtension,
 {
 	fn encode(&self) -> Vec<u8> {
-		super::encode_with_vec_prefix::<Self, _>(|v| {
-			// 1 byte version id.
-			match self.signature.as_ref() {
-				Some(s) => {
-					v.push(EXTRINSIC_VERSION | 0b1000_0000);
-					s.encode_to(v);
-				},
-				None => {
-					v.push(EXTRINSIC_VERSION & 0b0111_1111);
-				},
-			}
-			self.function.encode_to(v);
-		})
+		let mut tmp = Vec::with_capacity(sp_std::mem::size_of::<Self>());
+
+		// 1 byte version id.
+		match self.signature.as_ref() {
+			Some(s) => {
+				tmp.push(EXTRINSIC_VERSION | 0b1000_0000);
+				s.encode_to(&mut tmp);
+			},
+			None => {
+				tmp.push(EXTRINSIC_VERSION & 0b0111_1111);
+			},
+		}
+		self.function.encode_to(&mut tmp);
+
+		let compact_len = codec::Compact::<u32>(tmp.len() as u32);
+
+		// Allocate the output buffer with the correct length
+		let mut output = Vec::with_capacity(compact_len.size_hint() + tmp.len());
+
+		compact_len.encode_to(&mut output);
+		output.extend(tmp);
+
+		output
 	}
 }
 

From 86783fed9c26a05dcb23c89f5223790d07e0c1db Mon Sep 17 00:00:00 2001
From: Chevdor <chevdor@users.noreply.github.com>
Date: Wed, 11 Aug 2021 11:52:25 +0200
Subject: [PATCH 1074/1194] Remove dependency on substrate-prometheus-endpoint
 that is no longer required (#9521)

* remove dependency that is no longer required

* remove unused deps
---
 Cargo.lock                             | 219 ++++++++++++-------------
 primitives/consensus/common/Cargo.toml |   7 -
 2 files changed, 106 insertions(+), 120 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bf00732f2135..24c0bfc3faf3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -364,9 +364,9 @@ checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0"
 
 [[package]]
 name = "async-trait"
-version = "0.1.50"
+version = "0.1.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722"
+checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1648,7 +1648,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5"
 dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
 ]
 
 [[package]]
@@ -1720,7 +1720,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74a1bfdcc776e63e49f741c7ce6116fa1b887e8ac2e3ccb14dd4aa113e54feb9"
 dependencies = [
  "either",
- "futures 0.3.15",
+ "futures 0.3.16",
  "futures-timer 3.0.2",
  "log",
  "num-traits",
@@ -2076,9 +2076,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678"
 
 [[package]]
 name = "futures"
-version = "0.3.15"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e7e43a803dae2fa37c1f6a8fe121e1f7bf9548b4dfc0522a42f34145dadfc27"
+checksum = "1adc00f486adfc9ce99f77d717836f0c5aa84965eb0b4f051f4e83f7cab53f8b"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2091,9 +2091,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.15"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2"
+checksum = "74ed2411805f6e4e3d9bc904c95d5d423b89b3b25dc0250aa74729de20629ff9"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -2101,9 +2101,9 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.15"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1"
+checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99"
 
 [[package]]
 name = "futures-cpupool"
@@ -2117,9 +2117,9 @@ dependencies = [
 
 [[package]]
 name = "futures-executor"
-version = "0.3.15"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79"
+checksum = "4d0d535a57b87e1ae31437b892713aee90cd2d7b0ee48727cd11fc72ef54761c"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -2129,9 +2129,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.15"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1"
+checksum = "0b0e06c393068f3a6ef246c75cdca793d6a46347e75286933e5e75fd2fd11582"
 
 [[package]]
 name = "futures-lite"
@@ -2150,9 +2150,9 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.15"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121"
+checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57"
 dependencies = [
  "autocfg",
  "proc-macro-hack",
@@ -2174,15 +2174,15 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.15"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282"
+checksum = "c0f30aaa67363d119812743aa5f33c201a7a66329f97d1a887022971feea4b53"
 
 [[package]]
 name = "futures-task"
-version = "0.3.15"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae"
+checksum = "bbe54a98670017f3be909561f6ad13e810d9a51f3f061b902062ca3da80799f2"
 
 [[package]]
 name = "futures-timer"
@@ -2202,9 +2202,9 @@ dependencies = [
 
 [[package]]
 name = "futures-util"
-version = "0.3.15"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967"
+checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78"
 dependencies = [
  "autocfg",
  "futures 0.1.31",
@@ -2738,7 +2738,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a6d52908d4ea4ab2bc22474ba149bf1011c8e2c3ebc1ff593ae28ac44f494b6"
 dependencies = [
  "async-io",
- "futures 0.3.15",
+ "futures 0.3.16",
  "futures-lite",
  "if-addrs",
  "ipnet",
@@ -2814,7 +2814,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64fa110ec7b8f493f416eed552740d10e7030ad5f63b2308f82c9608ec2df275"
 dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
  "futures-timer 2.0.2",
 ]
 
@@ -3056,7 +3056,7 @@ checksum = "8e2834b6e7f57ce9a4412ed4d6dc95125d2c8612e68f86b9d9a07369164e4198"
 dependencies = [
  "async-trait",
  "fnv",
- "futures 0.3.15",
+ "futures 0.3.16",
  "jsonrpsee-types",
  "log",
  "pin-project 1.0.5",
@@ -3205,7 +3205,7 @@ checksum = "08053fbef67cd777049ef7a95ebaca2ece370b4ed7712c3fa404d69a88cb741b"
 dependencies = [
  "atomic",
  "bytes 1.0.1",
- "futures 0.3.15",
+ "futures 0.3.16",
  "lazy_static",
  "libp2p-core",
  "libp2p-deflate",
@@ -3247,7 +3247,7 @@ dependencies = [
  "ed25519-dalek",
  "either",
  "fnv",
- "futures 0.3.15",
+ "futures 0.3.16",
  "futures-timer 3.0.2",
  "lazy_static",
  "libsecp256k1",
@@ -3277,7 +3277,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2181a641cd15f9b6ba71b1335800f309012a0a97a29ffaabbbf40e9d3d58f08"
 dependencies = [
  "flate2",
- "futures 0.3.15",
+ "futures 0.3.16",
  "libp2p-core",
 ]
 
@@ -3288,7 +3288,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62e63dab8b5ff35e0c101a3e51e843ba782c07bbb1682f5fd827622e0d02b98b"
 dependencies = [
  "async-std-resolver",
- "futures 0.3.15",
+ "futures 0.3.16",
  "libp2p-core",
  "log",
  "smallvec 1.6.1",
@@ -3303,7 +3303,7 @@ checksum = "48a9b570f6766301d9c4aa00fce3554cad1598e2f466debbc4dde909028417cf"
 dependencies = [
  "cuckoofilter",
  "fnv",
- "futures 0.3.15",
+ "futures 0.3.16",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3324,7 +3324,7 @@ dependencies = [
  "byteorder",
  "bytes 1.0.1",
  "fnv",
- "futures 0.3.15",
+ "futures 0.3.16",
  "hex_fmt",
  "libp2p-core",
  "libp2p-swarm",
@@ -3345,7 +3345,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f668f00efd9883e8b7bcc582eaf0164615792608f886f6577da18bcbeea0a46"
 dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3366,7 +3366,7 @@ dependencies = [
  "bytes 1.0.1",
  "either",
  "fnv",
- "futures 0.3.15",
+ "futures 0.3.16",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3390,7 +3390,7 @@ dependencies = [
  "async-io",
  "data-encoding",
  "dns-parser",
- "futures 0.3.15",
+ "futures 0.3.16",
  "if-watch",
  "lazy_static",
  "libp2p-core",
@@ -3410,7 +3410,7 @@ checksum = "85e9b544335d1ed30af71daa96edbefadef6f19c7a55f078b9fc92c87163105d"
 dependencies = [
  "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
- "futures 0.3.15",
+ "futures 0.3.16",
  "libp2p-core",
  "log",
  "nohash-hasher",
@@ -3428,7 +3428,7 @@ checksum = "36db0f0db3b0433f5b9463f1c0cd9eadc0a3734a9170439ce501ff99733a88bd"
 dependencies = [
  "bytes 1.0.1",
  "curve25519-dalek 3.0.2",
- "futures 0.3.15",
+ "futures 0.3.16",
  "lazy_static",
  "libp2p-core",
  "log",
@@ -3448,7 +3448,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf4bfaffac63bf3c7ec11ed9d8879d455966ddea7e78ee14737f0b6dce0d1cd1"
 dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3465,7 +3465,7 @@ checksum = "0c8c37b4d2a075b4be8442760a5f8c037180f0c8dd5b5734b9978ab868b3aa11"
 dependencies = [
  "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
- "futures 0.3.15",
+ "futures 0.3.16",
  "libp2p-core",
  "log",
  "prost",
@@ -3480,7 +3480,7 @@ version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ce3374f3b28162db9d3442c9347c4f14cb01e8290052615c7d341d40eae0599"
 dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
  "log",
  "pin-project 1.0.5",
  "rand 0.7.3",
@@ -3496,7 +3496,7 @@ checksum = "0b8786aca3f18671d8776289706a5521f6c9124a820f69e358de214b9939440d"
 dependencies = [
  "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
- "futures 0.3.15",
+ "futures 0.3.16",
  "futures-timer 3.0.2",
  "libp2p-core",
  "libp2p-swarm",
@@ -3519,7 +3519,7 @@ checksum = "1cdbe172f08e6d0f95fa8634e273d4c4268c4063de2e33e7435194b0130c62e3"
 dependencies = [
  "async-trait",
  "bytes 1.0.1",
- "futures 0.3.15",
+ "futures 0.3.16",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3538,7 +3538,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e04d8e1eef675029ec728ba14e8d0da7975d84b6679b699b4ae91a1de9c3a92"
 dependencies = [
  "either",
- "futures 0.3.15",
+ "futures 0.3.16",
  "libp2p-core",
  "log",
  "rand 0.7.3",
@@ -3564,7 +3564,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b1a27d21c477951799e99d5c105d78868258502ce092988040a808d5a19bbd9"
 dependencies = [
  "async-io",
- "futures 0.3.15",
+ "futures 0.3.16",
  "futures-timer 3.0.2",
  "if-watch",
  "ipnet",
@@ -3581,7 +3581,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ffd6564bb3b7ff203661ccbb69003c2b551e34cef974f2d6c6a28306a12170b5"
 dependencies = [
  "async-std",
- "futures 0.3.15",
+ "futures 0.3.16",
  "libp2p-core",
  "log",
 ]
@@ -3592,7 +3592,7 @@ version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cef45d61e43c313531b5e903e4e8415212ff6338e0c54c47da5b9b412b5760de"
 dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
  "js-sys",
  "libp2p-core",
  "parity-send-wrapper",
@@ -3607,7 +3607,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cace60995ef6f637e4752cccbb2590f6bc358e8741a0d066307636c69a4b3a74"
 dependencies = [
  "either",
- "futures 0.3.15",
+ "futures 0.3.16",
  "futures-rustls",
  "libp2p-core",
  "log",
@@ -3624,7 +3624,7 @@ version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f35da42cfc6d5cb0dcf3ad6881bc68d146cdf38f98655e09e33fbba4d13eabc4"
 dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
  "libp2p-core",
  "parking_lot 0.11.1",
  "thiserror",
@@ -4069,7 +4069,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d91ec0a2440aaff5f78ec35631a7027d50386c6163aa975f7caa0d5da4b6ff8"
 dependencies = [
  "bytes 1.0.1",
- "futures 0.3.15",
+ "futures 0.3.16",
  "log",
  "pin-project 1.0.5",
  "smallvec 1.6.1",
@@ -4153,7 +4153,7 @@ version = "0.9.0-dev"
 dependencies = [
  "derive_more",
  "fs_extra",
- "futures 0.3.15",
+ "futures 0.3.16",
  "hash-db",
  "hex",
  "kvdb",
@@ -4189,7 +4189,7 @@ dependencies = [
 name = "node-browser-testing"
 version = "3.0.0-dev"
 dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
  "futures-timer 3.0.2",
  "jsonrpc-core",
  "libp2p",
@@ -4212,7 +4212,7 @@ dependencies = [
  "frame-benchmarking-cli",
  "frame-support",
  "frame-system",
- "futures 0.3.15",
+ "futures 0.3.16",
  "hex-literal",
  "libp2p-wasm-ext",
  "log",
@@ -4295,7 +4295,7 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "futures 0.3.15",
+ "futures 0.3.16",
  "node-primitives",
  "node-runtime",
  "node-testing",
@@ -4557,7 +4557,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "fs_extra",
- "futures 0.3.15",
+ "futures 0.3.16",
  "log",
  "node-executor",
  "node-primitives",
@@ -7035,7 +7035,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020"
 dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
  "pin-project 0.4.27",
  "static_assertions",
 ]
@@ -7090,7 +7090,7 @@ dependencies = [
  "async-trait",
  "derive_more",
  "either",
- "futures 0.3.15",
+ "futures 0.3.16",
  "futures-timer 3.0.2",
  "ip_network",
  "libp2p",
@@ -7119,7 +7119,7 @@ dependencies = [
 name = "sc-basic-authorship"
 version = "0.10.0-dev"
 dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
  "futures-timer 3.0.2",
  "log",
  "parity-scale-codec",
@@ -7188,7 +7188,7 @@ version = "0.10.0-dev"
 dependencies = [
  "chrono",
  "fdlimit",
- "futures 0.3.15",
+ "futures 0.3.16",
  "hex",
  "libp2p",
  "log",
@@ -7226,7 +7226,7 @@ version = "4.0.0-dev"
 dependencies = [
  "derive_more",
  "fnv",
- "futures 0.3.15",
+ "futures 0.3.16",
  "hash-db",
  "kvdb",
  "kvdb-memorydb",
@@ -7295,7 +7295,7 @@ name = "sc-consensus"
 version = "0.10.0-dev"
 dependencies = [
  "async-trait",
- "futures 0.3.15",
+ "futures 0.3.16",
  "futures-timer 3.0.2",
  "libp2p",
  "log",
@@ -7321,7 +7321,7 @@ version = "0.10.0-dev"
 dependencies = [
  "async-trait",
  "derive_more",
- "futures 0.3.15",
+ "futures 0.3.16",
  "futures-timer 3.0.2",
  "getrandom 0.2.3",
  "log",
@@ -7365,7 +7365,7 @@ dependencies = [
  "async-trait",
  "derive_more",
  "fork-tree",
- "futures 0.3.15",
+ "futures 0.3.16",
  "futures-timer 3.0.2",
  "log",
  "merlin",
@@ -7419,7 +7419,7 @@ name = "sc-consensus-babe-rpc"
 version = "0.10.0-dev"
 dependencies = [
  "derive_more",
- "futures 0.3.15",
+ "futures 0.3.16",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -7462,7 +7462,7 @@ dependencies = [
  "assert_matches",
  "async-trait",
  "derive_more",
- "futures 0.3.15",
+ "futures 0.3.16",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -7501,7 +7501,7 @@ version = "0.10.0-dev"
 dependencies = [
  "async-trait",
  "derive_more",
- "futures 0.3.15",
+ "futures 0.3.16",
  "futures-timer 3.0.2",
  "log",
  "parity-scale-codec",
@@ -7524,7 +7524,7 @@ name = "sc-consensus-slots"
 version = "0.10.0-dev"
 dependencies = [
  "async-trait",
- "futures 0.3.15",
+ "futures 0.3.16",
  "futures-timer 3.0.2",
  "impl-trait-for-tuples",
  "log",
@@ -7663,7 +7663,7 @@ dependencies = [
  "dyn-clone",
  "finality-grandpa",
  "fork-tree",
- "futures 0.3.15",
+ "futures 0.3.16",
  "futures-timer 3.0.2",
  "linked-hash-map",
  "log",
@@ -7708,7 +7708,7 @@ version = "0.10.0-dev"
 dependencies = [
  "derive_more",
  "finality-grandpa",
- "futures 0.3.15",
+ "futures 0.3.16",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -7737,7 +7737,7 @@ name = "sc-informant"
 version = "0.10.0-dev"
 dependencies = [
  "ansi_term 0.12.1",
- "futures 0.3.15",
+ "futures 0.3.16",
  "futures-timer 3.0.2",
  "log",
  "parity-util-mem",
@@ -7755,7 +7755,7 @@ version = "4.0.0-dev"
 dependencies = [
  "async-trait",
  "derive_more",
- "futures 0.3.15",
+ "futures 0.3.16",
  "futures-util",
  "hex",
  "merlin",
@@ -7804,7 +7804,7 @@ dependencies = [
  "erased-serde",
  "fnv",
  "fork-tree",
- "futures 0.3.15",
+ "futures 0.3.16",
  "futures-timer 3.0.2",
  "hex",
  "ip_network",
@@ -7854,7 +7854,7 @@ name = "sc-network-gossip"
 version = "0.10.0-dev"
 dependencies = [
  "async-std",
- "futures 0.3.15",
+ "futures 0.3.16",
  "futures-timer 3.0.2",
  "libp2p",
  "log",
@@ -7875,7 +7875,7 @@ version = "0.8.0"
 dependencies = [
  "async-std",
  "async-trait",
- "futures 0.3.15",
+ "futures 0.3.16",
  "futures-timer 3.0.2",
  "libp2p",
  "log",
@@ -7903,7 +7903,7 @@ version = "4.0.0-dev"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
- "futures 0.3.15",
+ "futures 0.3.16",
  "futures-timer 3.0.2",
  "hex",
  "hyper 0.13.10",
@@ -7937,7 +7937,7 @@ dependencies = [
 name = "sc-peerset"
 version = "4.0.0-dev"
 dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
  "libp2p",
  "log",
  "rand 0.7.3",
@@ -7960,7 +7960,7 @@ version = "4.0.0-dev"
 dependencies = [
  "assert_matches",
  "futures 0.1.31",
- "futures 0.3.15",
+ "futures 0.3.16",
  "hash-db",
  "jsonrpc-core",
  "jsonrpc-pubsub",
@@ -8003,7 +8003,7 @@ name = "sc-rpc-api"
 version = "0.10.0-dev"
 dependencies = [
  "derive_more",
- "futures 0.3.15",
+ "futures 0.3.16",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -8061,7 +8061,7 @@ dependencies = [
  "directories",
  "exit-future",
  "futures 0.1.31",
- "futures 0.3.15",
+ "futures 0.3.16",
  "futures-timer 3.0.2",
  "hash-db",
  "jsonrpc-core",
@@ -8132,7 +8132,7 @@ version = "2.0.0"
 dependencies = [
  "fdlimit",
  "futures 0.1.31",
- "futures 0.3.15",
+ "futures 0.3.16",
  "hex-literal",
  "log",
  "parity-scale-codec",
@@ -8203,7 +8203,7 @@ name = "sc-telemetry"
 version = "4.0.0-dev"
 dependencies = [
  "chrono",
- "futures 0.3.15",
+ "futures 0.3.16",
  "libp2p",
  "log",
  "parking_lot 0.11.1",
@@ -8270,7 +8270,7 @@ dependencies = [
  "assert_matches",
  "criterion",
  "derive_more",
- "futures 0.3.15",
+ "futures 0.3.16",
  "hex",
  "intervalier",
  "linked-hash-map",
@@ -8304,7 +8304,7 @@ name = "sc-transaction-pool-api"
 version = "4.0.0-dev"
 dependencies = [
  "derive_more",
- "futures 0.3.15",
+ "futures 0.3.16",
  "log",
  "parity-scale-codec",
  "serde",
@@ -8706,7 +8706,7 @@ dependencies = [
  "base64 0.12.3",
  "bytes 0.5.6",
  "flate2",
- "futures 0.3.15",
+ "futures 0.3.16",
  "httparse",
  "log",
  "rand 0.7.3",
@@ -8721,7 +8721,7 @@ checksum = "a74e48087dbeed4833785c2f3352b59140095dc192dce966a3bfc155020a439f"
 dependencies = [
  "base64 0.13.0",
  "bytes 1.0.1",
- "futures 0.3.15",
+ "futures 0.3.16",
  "httparse",
  "log",
  "rand 0.8.4",
@@ -8761,7 +8761,7 @@ name = "sp-api-test"
 version = "2.0.1"
 dependencies = [
  "criterion",
- "futures 0.3.15",
+ "futures 0.3.16",
  "log",
  "parity-scale-codec",
  "rustversion",
@@ -8866,7 +8866,7 @@ dependencies = [
 name = "sp-blockchain"
 version = "4.0.0-dev"
 dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
  "log",
  "lru",
  "parity-scale-codec",
@@ -8884,25 +8884,18 @@ name = "sp-consensus"
 version = "0.10.0-dev"
 dependencies = [
  "async-trait",
- "futures 0.3.15",
+ "futures 0.3.16",
  "futures-timer 3.0.2",
  "log",
  "parity-scale-codec",
- "parking_lot 0.11.1",
- "serde",
- "sp-api",
  "sp-core",
  "sp-inherents",
  "sp-runtime",
  "sp-state-machine",
  "sp-std",
  "sp-test-primitives",
- "sp-trie",
- "sp-utils",
  "sp-version",
- "substrate-prometheus-endpoint",
  "thiserror",
- "wasm-timer",
 ]
 
 [[package]]
@@ -8983,7 +8976,7 @@ dependencies = [
  "criterion",
  "dyn-clonable",
  "ed25519-dalek",
- "futures 0.3.15",
+ "futures 0.3.16",
  "hash-db",
  "hash256-std-hasher",
  "hex",
@@ -9070,7 +9063,7 @@ name = "sp-inherents"
 version = "4.0.0-dev"
 dependencies = [
  "async-trait",
- "futures 0.3.15",
+ "futures 0.3.16",
  "impl-trait-for-tuples",
  "parity-scale-codec",
  "sp-core",
@@ -9083,7 +9076,7 @@ dependencies = [
 name = "sp-io"
 version = "4.0.0-dev"
 dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
  "hash-db",
  "libsecp256k1",
  "log",
@@ -9119,7 +9112,7 @@ version = "0.10.0-dev"
 dependencies = [
  "async-trait",
  "derive_more",
- "futures 0.3.15",
+ "futures 0.3.16",
  "merlin",
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -9493,7 +9486,7 @@ dependencies = [
 name = "sp-utils"
 version = "4.0.0-dev"
 dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
  "futures-core",
  "futures-timer 3.0.2",
  "lazy_static",
@@ -9665,7 +9658,7 @@ dependencies = [
  "chrono",
  "console_error_panic_hook",
  "futures 0.1.31",
- "futures 0.3.15",
+ "futures 0.3.16",
  "futures-timer 3.0.2",
  "getrandom 0.2.3",
  "js-sys",
@@ -9708,7 +9701,7 @@ version = "3.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
- "futures 0.3.15",
+ "futures 0.3.16",
  "jsonrpc-client-transports",
  "jsonrpc-core",
  "parity-scale-codec",
@@ -9723,7 +9716,7 @@ name = "substrate-frame-rpc-system"
 version = "4.0.0-dev"
 dependencies = [
  "frame-system-rpc-runtime-api",
- "futures 0.3.15",
+ "futures 0.3.16",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -9762,7 +9755,7 @@ version = "2.0.1"
 dependencies = [
  "async-trait",
  "futures 0.1.31",
- "futures 0.3.15",
+ "futures 0.3.16",
  "hash-db",
  "hex",
  "parity-scale-codec",
@@ -9792,7 +9785,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "frame-system-rpc-runtime-api",
- "futures 0.3.15",
+ "futures 0.3.16",
  "log",
  "memory-db",
  "pallet-babe",
@@ -9833,7 +9826,7 @@ dependencies = [
 name = "substrate-test-runtime-client"
 version = "2.0.0"
 dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
  "parity-scale-codec",
  "sc-block-builder",
  "sc-client-api",
@@ -9854,7 +9847,7 @@ name = "substrate-test-runtime-transaction-pool"
 version = "2.0.0"
 dependencies = [
  "derive_more",
- "futures 0.3.15",
+ "futures 0.3.16",
  "parity-scale-codec",
  "parking_lot 0.11.1",
  "sc-transaction-pool",
@@ -9868,7 +9861,7 @@ dependencies = [
 name = "substrate-test-utils"
 version = "4.0.0-dev"
 dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
  "sc-service",
  "substrate-test-utils-derive",
  "tokio 0.2.25",
@@ -10000,7 +9993,7 @@ name = "test-runner"
 version = "0.9.0"
 dependencies = [
  "frame-system",
- "futures 0.3.15",
+ "futures 0.3.16",
  "jsonrpc-core",
  "log",
  "num-traits",
@@ -10084,18 +10077,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.24"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e"
+checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.24"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0"
+checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -11080,7 +11073,7 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f"
 dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
  "js-sys",
  "parking_lot 0.11.1",
  "pin-utils",
@@ -11466,7 +11459,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e7d9028f208dd5e63c614be69f115c1b53cacc1111437d4c765185856666c107"
 dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
  "log",
  "nohash-hasher",
  "parking_lot 0.11.1",
diff --git a/primitives/consensus/common/Cargo.toml b/primitives/consensus/common/Cargo.toml
index d2bdc9cd7e28..af6e430ff704 100644
--- a/primitives/consensus/common/Cargo.toml
+++ b/primitives/consensus/common/Cargo.toml
@@ -25,13 +25,6 @@ futures-timer = "3.0.1"
 sp-std = { version = "4.0.0-dev", path = "../../std" }
 sp-version = { version = "4.0.0-dev", path = "../../version" }
 sp-runtime = { version = "4.0.0-dev", path = "../../runtime" }
-sp-utils = { version = "4.0.0-dev", path = "../../utils" }
-sp-trie = { version = "4.0.0-dev", path = "../../trie" }
-sp-api = { version = "4.0.0-dev", path = "../../api" }
-parking_lot = "0.11.1"
-serde = { version = "1.0", features = ["derive"] }
-prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0"}
-wasm-timer = "0.2.5"
 thiserror = "1.0.21"
 
 [dev-dependencies]

From c34fc32d31f02b762820bac1e724a87c97a61fca Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Wed, 11 Aug 2021 15:34:03 +0200
Subject: [PATCH 1075/1194] mega cleanup of staking tests (#9516)

* general cleanup of staking tests

* fix fishy test

* fix one more fishy test

* some review comments
---
 frame/staking/src/mock.rs       |  167 +++--
 frame/staking/src/pallet/mod.rs |    8 +-
 frame/staking/src/tests.rs      | 1077 +++++++++++++++----------------
 3 files changed, 609 insertions(+), 643 deletions(-)

diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index 3d9465ed872d..776affde5d42 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -285,33 +285,35 @@ pub(crate) type StakingCall = crate::Call<Test>;
 pub(crate) type TestRuntimeCall = <Test as frame_system::Config>::Call;
 
 pub struct ExtBuilder {
-	validator_pool: bool,
 	nominate: bool,
 	validator_count: u32,
 	minimum_validator_count: u32,
-	fair: bool,
-	num_validators: Option<u32>,
 	invulnerables: Vec<AccountId>,
 	has_stakers: bool,
 	initialize_first_session: bool,
 	min_nominator_bond: Balance,
 	min_validator_bond: Balance,
+	balance_factor: Balance,
+	status: BTreeMap<AccountId, StakerStatus<AccountId>>,
+	stakes: BTreeMap<AccountId, Balance>,
+	stakers: Vec<(AccountId, AccountId, Balance, StakerStatus<AccountId>)>,
 }
 
 impl Default for ExtBuilder {
 	fn default() -> Self {
 		Self {
-			validator_pool: false,
 			nominate: true,
 			validator_count: 2,
 			minimum_validator_count: 0,
-			fair: true,
-			num_validators: None,
+			balance_factor: 1,
 			invulnerables: vec![],
 			has_stakers: true,
 			initialize_first_session: true,
 			min_nominator_bond: ExistentialDeposit::get(),
 			min_validator_bond: ExistentialDeposit::get(),
+			status: Default::default(),
+			stakes: Default::default(),
+			stakers: Default::default(),
 		}
 	}
 }
@@ -321,10 +323,6 @@ impl ExtBuilder {
 		EXISTENTIAL_DEPOSIT.with(|v| *v.borrow_mut() = existential_deposit);
 		self
 	}
-	pub fn validator_pool(mut self, validator_pool: bool) -> Self {
-		self.validator_pool = validator_pool;
-		self
-	}
 	pub fn nominate(mut self, nominate: bool) -> Self {
 		self.nominate = nominate;
 		self
@@ -341,14 +339,6 @@ impl ExtBuilder {
 		SLASH_DEFER_DURATION.with(|v| *v.borrow_mut() = eras);
 		self
 	}
-	pub fn fair(mut self, is_fair: bool) -> Self {
-		self.fair = is_fair;
-		self
-	}
-	pub fn num_validators(mut self, num_validators: u32) -> Self {
-		self.num_validators = Some(num_validators);
-		self
-	}
 	pub fn invulnerables(mut self, invulnerables: Vec<AccountId>) -> Self {
 		self.invulnerables = invulnerables;
 		self
@@ -381,41 +371,60 @@ impl ExtBuilder {
 		self.min_validator_bond = amount;
 		self
 	}
+	pub fn set_status(mut self, who: AccountId, status: StakerStatus<AccountId>) -> Self {
+		self.status.insert(who, status);
+		self
+	}
+	pub fn set_stake(mut self, who: AccountId, stake: Balance) -> Self {
+		self.stakes.insert(who, stake);
+		self
+	}
+	pub fn add_staker(
+		mut self,
+		stash: AccountId,
+		ctrl: AccountId,
+		stake: Balance,
+		status: StakerStatus<AccountId>,
+	) -> Self {
+		self.stakers.push((stash, ctrl, stake, status));
+		self
+	}
+	pub fn balance_factor(mut self, factor: Balance) -> Self {
+		self.balance_factor = factor;
+		self
+	}
 	fn build(self) -> sp_io::TestExternalities {
 		sp_tracing::try_init_simple();
 		let mut storage = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-		let balance_factor = if ExistentialDeposit::get() > 1 { 256 } else { 1 };
-
-		let num_validators = self.num_validators.unwrap_or(self.validator_count);
-		// Check that the number of validators is sensible.
-		assert!(num_validators <= 8);
-		let validators =
-			(0..num_validators).map(|x| ((x + 1) * 10 + 1) as AccountId).collect::<Vec<_>>();
 
 		let _ = pallet_balances::GenesisConfig::<Test> {
 			balances: vec![
-				(1, 10 * balance_factor),
-				(2, 20 * balance_factor),
-				(3, 300 * balance_factor),
-				(4, 400 * balance_factor),
-				(10, balance_factor),
-				(11, balance_factor * 1000),
-				(20, balance_factor),
-				(21, balance_factor * 2000),
-				(30, balance_factor),
-				(31, balance_factor * 2000),
-				(40, balance_factor),
-				(41, balance_factor * 2000),
-				(50, balance_factor),
-				(51, balance_factor * 2000),
-				(60, balance_factor),
-				(61, balance_factor * 2000),
-				(70, balance_factor),
-				(71, balance_factor * 2000),
-				(80, balance_factor),
-				(81, balance_factor * 2000),
-				(100, 2000 * balance_factor),
-				(101, 2000 * balance_factor),
+				(1, 10 * self.balance_factor),
+				(2, 20 * self.balance_factor),
+				(3, 300 * self.balance_factor),
+				(4, 400 * self.balance_factor),
+				// controllers
+				(10, self.balance_factor),
+				(20, self.balance_factor),
+				(30, self.balance_factor),
+				(40, self.balance_factor),
+				(50, self.balance_factor),
+				// stashes
+				(11, self.balance_factor * 1000),
+				(21, self.balance_factor * 2000),
+				(31, self.balance_factor * 2000),
+				(41, self.balance_factor * 2000),
+				(51, self.balance_factor * 2000),
+				// optional nominator
+				(100, self.balance_factor * 2000),
+				(101, self.balance_factor * 2000),
+				// aux accounts
+				(60, self.balance_factor),
+				(61, self.balance_factor * 2000),
+				(70, self.balance_factor),
+				(71, self.balance_factor * 2000),
+				(80, self.balance_factor),
+				(81, self.balance_factor * 2000),
 				// This allows us to have a total_payout different from 0.
 				(999, 1_000_000_000_000),
 			],
@@ -424,24 +433,45 @@ impl ExtBuilder {
 
 		let mut stakers = vec![];
 		if self.has_stakers {
-			let stake_21 = if self.fair { 1000 } else { 2000 };
-			let stake_31 = if self.validator_pool { balance_factor * 1000 } else { 1 };
-			let status_41 = if self.validator_pool {
-				StakerStatus::<AccountId>::Validator
-			} else {
-				StakerStatus::<AccountId>::Idle
-			};
-			let nominated = if self.nominate { vec![11, 21] } else { vec![] };
 			stakers = vec![
-				// (stash, controller, staked_amount, status)
-				(11, 10, balance_factor * 1000, StakerStatus::<AccountId>::Validator),
-				(21, 20, stake_21, StakerStatus::<AccountId>::Validator),
-				(31, 30, stake_31, StakerStatus::<AccountId>::Validator),
-				(41, 40, balance_factor * 1000, status_41),
-				// nominator
-				(101, 100, balance_factor * 500, StakerStatus::<AccountId>::Nominator(nominated)),
+				// (stash, ctrl, stake, status)
+				// these two will be elected in the default test where we elect 2.
+				(11, 10, self.balance_factor * 1000, StakerStatus::<AccountId>::Validator),
+				(21, 20, self.balance_factor * 1000, StakerStatus::<AccountId>::Validator),
+				// a loser validator
+				(31, 30, self.balance_factor * 500, StakerStatus::<AccountId>::Validator),
+				// an idle validator
+				(41, 40, self.balance_factor * 1000, StakerStatus::<AccountId>::Idle),
 			];
+			// optionally add a nominator
+			if self.nominate {
+				stakers.push((
+					101,
+					100,
+					self.balance_factor * 500,
+					StakerStatus::<AccountId>::Nominator(vec![11, 21]),
+				))
+			}
+			// replace any of the status if needed.
+			self.status.into_iter().for_each(|(stash, status)| {
+				let (_, _, _, ref mut prev_status) = stakers
+					.iter_mut()
+					.find(|s| s.0 == stash)
+					.expect("set_status staker should exist; qed");
+				*prev_status = status;
+			});
+			// replaced any of the stakes if needed.
+			self.stakes.into_iter().for_each(|(stash, stake)| {
+				let (_, _, ref mut prev_stake, _) = stakers
+					.iter_mut()
+					.find(|s| s.0 == stash)
+					.expect("set_stake staker should exits; qed.");
+				*prev_stake = stake;
+			});
+			// extend stakers if needed.
+			stakers.extend(self.stakers)
 		}
+
 		let _ = staking::GenesisConfig::<Test> {
 			stakers,
 			validator_count: self.validator_count,
@@ -455,10 +485,15 @@ impl ExtBuilder {
 		.assimilate_storage(&mut storage);
 
 		let _ = pallet_session::GenesisConfig::<Test> {
-			keys: validators
-				.iter()
-				.map(|x| (*x, *x, SessionKeys { other: UintAuthorityId(*x as u64) }))
-				.collect(),
+			keys: if self.has_stakers {
+				// genesis election will overwrite this, no worries.
+				Default::default()
+			} else {
+				// set some dummy validators in genesis.
+				(0..self.validator_count as u64)
+					.map(|x| (x, x, SessionKeys { other: UintAuthorityId(x as u64) }))
+					.collect()
+			},
 		}
 		.assimilate_storage(&mut storage);
 
diff --git a/frame/staking/src/pallet/mod.rs b/frame/staking/src/pallet/mod.rs
index 8af6204273f9..e7c5947ac0f3 100644
--- a/frame/staking/src/pallet/mod.rs
+++ b/frame/staking/src/pallet/mod.rs
@@ -494,13 +494,13 @@ pub mod pallet {
 					T::Currency::free_balance(&stash) >= balance,
 					"Stash does not have enough balance to bond."
 				);
-				let _ = <Pallet<T>>::bond(
+				frame_support::assert_ok!(<Pallet<T>>::bond(
 					T::Origin::from(Some(stash.clone()).into()),
 					T::Lookup::unlookup(controller.clone()),
 					balance,
 					RewardDestination::Staked,
-				);
-				let _ = match status {
+				));
+				frame_support::assert_ok!(match status {
 					StakerStatus::Validator => <Pallet<T>>::validate(
 						T::Origin::from(Some(controller.clone()).into()),
 						Default::default(),
@@ -510,7 +510,7 @@ pub mod pallet {
 						votes.iter().map(|l| T::Lookup::unlookup(l.clone())).collect(),
 					),
 					_ => Ok(()),
-				};
+				});
 			}
 		}
 	}
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index 3cb7a74e8982..364822ed3e03 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -145,7 +145,7 @@ fn basic_setup_works() {
 		assert_eq!(Staking::nominators(101).unwrap().targets, vec![11, 21]);
 
 		assert_eq!(
-			Staking::eras_stakers(Staking::active_era().unwrap().index, 11),
+			Staking::eras_stakers(active_era(), 11),
 			Exposure {
 				total: 1125,
 				own: 1000,
@@ -153,7 +153,7 @@ fn basic_setup_works() {
 			},
 		);
 		assert_eq!(
-			Staking::eras_stakers(Staking::active_era().unwrap().index, 21),
+			Staking::eras_stakers(active_era(), 21),
 			Exposure {
 				total: 1375,
 				own: 1000,
@@ -162,13 +162,13 @@ fn basic_setup_works() {
 		);
 
 		// initial total stake = 1125 + 1375
-		assert_eq!(Staking::eras_total_stake(Staking::active_era().unwrap().index), 2500);
+		assert_eq!(Staking::eras_total_stake(active_era()), 2500);
 
 		// The number of validators required.
 		assert_eq!(Staking::validator_count(), 2);
 
 		// Initial Era and session
-		assert_eq!(Staking::active_era().unwrap().index, 0);
+		assert_eq!(active_era(), 0);
 
 		// Account 10 has `balance_factor` free balance
 		assert_eq!(Balances::free_balance(10), 1);
@@ -236,7 +236,7 @@ fn rewards_should_work() {
 		assert_eq!(Balances::total_balance(&101), init_balance_101);
 		assert_eq_uvec!(Session::validators(), vec![11, 21]);
 		assert_eq!(
-			Staking::eras_reward_points(Staking::active_era().unwrap().index),
+			Staking::eras_reward_points(active_era()),
 			EraRewardPoints {
 				total: 50 * 3,
 				individual: vec![(11, 100), (21, 50)].into_iter().collect(),
@@ -250,7 +250,7 @@ fn rewards_should_work() {
 		start_session(2);
 		start_session(3);
 
-		assert_eq!(Staking::active_era().unwrap().index, 1);
+		assert_eq!(active_era(), 1);
 		assert_eq!(
 			mock::REWARD_REMAINDER_UNBALANCED.with(|v| *v.borrow()),
 			maximum_payout - total_payout_0,
@@ -324,77 +324,71 @@ fn rewards_should_work() {
 
 #[test]
 fn staking_should_work() {
-	ExtBuilder::default()
-		.nominate(false)
-		.fair(false) // to give 20 more staked value
-		.build_and_execute(|| {
-			// remember + compare this along with the test.
-			assert_eq_uvec!(validator_controllers(), vec![20, 10]);
+	ExtBuilder::default().nominate(false).build_and_execute(|| {
+		// remember + compare this along with the test.
+		assert_eq_uvec!(validator_controllers(), vec![20, 10]);
 
-			// put some money in account that we'll use.
-			for i in 1..5 {
-				let _ = Balances::make_free_balance_be(&i, 2000);
-			}
+		// put some money in account that we'll use.
+		for i in 1..5 {
+			let _ = Balances::make_free_balance_be(&i, 2000);
+		}
 
-			// --- Block 2:
-			start_session(2);
-			// add a new candidate for being a validator. account 3 controlled by 4.
-			assert_ok!(Staking::bond(Origin::signed(3), 4, 1500, RewardDestination::Controller));
-			assert_ok!(Staking::validate(Origin::signed(4), ValidatorPrefs::default()));
+		// --- Block 2:
+		start_session(2);
+		// add a new candidate for being a validator. account 3 controlled by 4.
+		assert_ok!(Staking::bond(Origin::signed(3), 4, 1500, RewardDestination::Controller));
+		assert_ok!(Staking::validate(Origin::signed(4), ValidatorPrefs::default()));
 
-			// No effects will be seen so far.
-			assert_eq_uvec!(validator_controllers(), vec![20, 10]);
+		// No effects will be seen so far.
+		assert_eq_uvec!(validator_controllers(), vec![20, 10]);
 
-			// --- Block 3:
-			start_session(3);
+		// --- Block 3:
+		start_session(3);
 
-			// No effects will be seen so far. Era has not been yet triggered.
-			assert_eq_uvec!(validator_controllers(), vec![20, 10]);
+		// No effects will be seen so far. Era has not been yet triggered.
+		assert_eq_uvec!(validator_controllers(), vec![20, 10]);
 
-			// --- Block 4: the validators will now be queued.
-			start_session(4);
-			assert_eq!(Staking::active_era().unwrap().index, 1);
+		// --- Block 4: the validators will now be queued.
+		start_session(4);
+		assert_eq!(active_era(), 1);
 
-			// --- Block 5: the validators are still in queue.
-			start_session(5);
+		// --- Block 5: the validators are still in queue.
+		start_session(5);
 
-			// --- Block 6: the validators will now be changed.
-			start_session(6);
+		// --- Block 6: the validators will now be changed.
+		start_session(6);
 
-			assert_eq_uvec!(validator_controllers(), vec![20, 4]);
-			// --- Block 6: Unstake 4 as a validator, freeing up the balance stashed in 3
-			// 4 will chill
-			Staking::chill(Origin::signed(4)).unwrap();
+		assert_eq_uvec!(validator_controllers(), vec![20, 4]);
+		// --- Block 6: Unstake 4 as a validator, freeing up the balance stashed in 3
+		// 4 will chill
+		Staking::chill(Origin::signed(4)).unwrap();
 
-			// --- Block 7: nothing. 4 is still there.
-			start_session(7);
-			assert_eq_uvec!(validator_controllers(), vec![20, 4]);
+		// --- Block 7: nothing. 4 is still there.
+		start_session(7);
+		assert_eq_uvec!(validator_controllers(), vec![20, 4]);
 
-			// --- Block 8:
-			start_session(8);
+		// --- Block 8:
+		start_session(8);
 
-			// --- Block 9: 4 will not be a validator.
-			start_session(9);
-			assert_eq_uvec!(validator_controllers(), vec![20, 10]);
+		// --- Block 9: 4 will not be a validator.
+		start_session(9);
+		assert_eq_uvec!(validator_controllers(), vec![20, 10]);
 
-			// Note: the stashed value of 4 is still lock
-			assert_eq!(
-				Staking::ledger(&4),
-				Some(StakingLedger {
-					stash: 3,
-					total: 1500,
-					active: 1500,
-					unlocking: vec![],
-					claimed_rewards: vec![0],
-				})
-			);
-			// e.g. it cannot reserve more than 500 that it has free from the total 2000
-			assert_noop!(
-				Balances::reserve(&3, 501),
-				BalancesError::<Test, _>::LiquidityRestrictions
-			);
-			assert_ok!(Balances::reserve(&3, 409));
-		});
+		// Note: the stashed value of 4 is still lock
+		assert_eq!(
+			Staking::ledger(&4),
+			Some(StakingLedger {
+				stash: 3,
+				total: 1500,
+				active: 1500,
+				unlocking: vec![],
+				claimed_rewards: vec![0],
+			})
+		);
+		// e.g. it cannot reserve more than 500 that it has free from the total 2000
+		assert_noop!(Balances::reserve(&3, 501), BalancesError::<Test, _>::LiquidityRestrictions);
+		assert_ok!(Balances::reserve(&3, 409));
+	});
 }
 
 #[test]
@@ -403,7 +397,6 @@ fn blocking_and_kicking_works() {
 		.minimum_validator_count(1)
 		.validator_count(4)
 		.nominate(true)
-		.num_validators(3)
 		.build_and_execute(|| {
 			// block validator 10/11
 			assert_ok!(Staking::validate(
@@ -432,7 +425,6 @@ fn less_than_needed_candidates_works() {
 		.minimum_validator_count(1)
 		.validator_count(4)
 		.nominate(false)
-		.num_validators(3)
 		.build_and_execute(|| {
 			assert_eq!(Staking::validator_count(), 4);
 			assert_eq!(Staking::minimum_validator_count(), 1);
@@ -445,7 +437,7 @@ fn less_than_needed_candidates_works() {
 
 			// But the exposure is updated in a simple way. No external votes exists.
 			// This is purely self-vote.
-			assert!(ErasStakers::<Test>::iter_prefix_values(Staking::active_era().unwrap().index)
+			assert!(ErasStakers::<Test>::iter_prefix_values(active_era())
 				.all(|exposure| exposure.others.is_empty()));
 		});
 }
@@ -455,8 +447,7 @@ fn no_candidate_emergency_condition() {
 	ExtBuilder::default()
 		.minimum_validator_count(1)
 		.validator_count(15)
-		.num_validators(4)
-		.validator_pool(true)
+		.set_status(41, StakerStatus::Validator)
 		.nominate(false)
 		.build_and_execute(|| {
 			// initial validators
@@ -482,7 +473,8 @@ fn no_candidate_emergency_condition() {
 			// Go to far further session to see if validator have changed
 			mock::run_to_block(100);
 
-			// Previous ones are elected. chill is not effective in active era (as era hasn't changed)
+			// Previous ones are elected. chill is not effective in active era (as era hasn't
+			// changed)
 			assert_eq_uvec!(validator_controllers(), vec![10, 20, 30, 40]);
 			// The chill is still pending.
 			assert!(!<Staking as crate::Store>::Validators::contains_key(11));
@@ -495,12 +487,18 @@ fn no_candidate_emergency_condition() {
 fn nominating_and_rewards_should_work() {
 	ExtBuilder::default()
 		.nominate(false)
-		.validator_pool(true)
+		.set_status(41, StakerStatus::Validator)
+		.set_status(11, StakerStatus::Idle)
+		.set_status(31, StakerStatus::Idle)
 		.build_and_execute(|| {
-			// initial validators -- everyone is actually even.
-			assert_eq_uvec!(validator_controllers(), vec![40, 30]);
+			// initial validators.
+			assert_eq_uvec!(validator_controllers(), vec![40, 20]);
+
+			// re-validate with 11 and 31.
+			assert_ok!(Staking::validate(Origin::signed(10), Default::default()));
+			assert_ok!(Staking::validate(Origin::signed(30), Default::default()));
 
-			// Set payee to controller
+			// Set payee to controller.
 			assert_ok!(Staking::set_payee(Origin::signed(10), RewardDestination::Controller));
 			assert_ok!(Staking::set_payee(Origin::signed(20), RewardDestination::Controller));
 			assert_ok!(Staking::set_payee(Origin::signed(30), RewardDestination::Controller));
@@ -513,38 +511,33 @@ fn nominating_and_rewards_should_work() {
 			}
 
 			// bond two account pairs and state interest in nomination.
-			// 2 will nominate for 10, 20, 30
 			assert_ok!(Staking::bond(Origin::signed(1), 2, 1000, RewardDestination::Controller));
 			assert_ok!(Staking::nominate(Origin::signed(2), vec![11, 21, 31]));
-			// 4 will nominate for 10, 20, 40
+
 			assert_ok!(Staking::bond(Origin::signed(3), 4, 1000, RewardDestination::Controller));
 			assert_ok!(Staking::nominate(Origin::signed(4), vec![11, 21, 41]));
 
 			// the total reward for era 0
 			let total_payout_0 = current_total_payout_for_duration(reward_time_per_era());
 			<Pallet<Test>>::reward_by_ids(vec![(41, 1)]);
-			<Pallet<Test>>::reward_by_ids(vec![(31, 1)]);
+			<Pallet<Test>>::reward_by_ids(vec![(21, 1)]);
 
 			mock::start_active_era(1);
 
 			// 10 and 20 have more votes, they will be chosen.
 			assert_eq_uvec!(validator_controllers(), vec![20, 10]);
 
-			// OLD validators must have already received some rewards.
+			// old validators must have already received some rewards.
+			let initial_balance_40 = Balances::total_balance(&40);
+			let mut initial_balance_20 = Balances::total_balance(&20);
 			mock::make_all_reward_payment(0);
-			assert_eq!(Balances::total_balance(&40), 1 + total_payout_0 / 2);
-			assert_eq!(Balances::total_balance(&30), 1 + total_payout_0 / 2);
+			assert_eq!(Balances::total_balance(&40), initial_balance_40 + total_payout_0 / 2);
+			assert_eq!(Balances::total_balance(&20), initial_balance_20 + total_payout_0 / 2);
+			initial_balance_20 = Balances::total_balance(&20);
 
-			// ------ check the staked value of all parties.
-
-			// 30 and 40 are not chosen anymore
-			assert_eq!(
-				ErasStakers::<Test>::iter_prefix_values(Staking::active_era().unwrap().index)
-					.count(),
-				2
-			);
+			assert_eq!(ErasStakers::<Test>::iter_prefix_values(active_era()).count(), 2);
 			assert_eq!(
-				Staking::eras_stakers(Staking::active_era().unwrap().index, 11),
+				Staking::eras_stakers(active_era(), 11),
 				Exposure {
 					total: 1000 + 800,
 					own: 1000,
@@ -555,7 +548,7 @@ fn nominating_and_rewards_should_work() {
 				},
 			);
 			assert_eq!(
-				Staking::eras_stakers(Staking::active_era().unwrap().index, 21),
+				Staking::eras_stakers(active_era(), 21),
 				Exposure {
 					total: 1000 + 1200,
 					own: 1000,
@@ -573,8 +566,8 @@ fn nominating_and_rewards_should_work() {
 
 			mock::start_active_era(2);
 
-			// nothing else will happen, era ends and rewards are paid again,
-			// it is expected that nominators will also be paid. See below
+			// nothing else will happen, era ends and rewards are paid again, it is expected that
+			// nominators will also be paid. See below
 
 			mock::make_all_reward_payment(1);
 			let payout_for_10 = total_payout_1 / 3;
@@ -598,10 +591,10 @@ fn nominating_and_rewards_should_work() {
 				initial_balance + 5 * payout_for_10 / 9,
 				2,
 			);
-			// Validator 20: got 1200 / 2200 external stake => 12/22 =? 6/11 => Validator's share = 5/11
+			// Validator 20: got `1200/2200` external stake => 12/22 =? 6/11 => Validator's share = 5/11
 			assert_eq_error_rate!(
 				Balances::total_balance(&20),
-				initial_balance + 5 * payout_for_20 / 11,
+				initial_balance_20 + 5 * payout_for_20 / 11,
 				2,
 			);
 		});
@@ -885,13 +878,13 @@ fn cannot_transfer_staked_balance_2() {
 	// Tests that a stash account cannot transfer funds
 	// Same test as above but with 20, and more accurate.
 	// 21 has 2000 free balance but 1000 at stake
-	ExtBuilder::default().nominate(false).fair(true).build_and_execute(|| {
+	ExtBuilder::default().nominate(false).build_and_execute(|| {
 		// Confirm account 21 is stashed
 		assert_eq!(Staking::bonded(&21), Some(20));
 		// Confirm account 21 has some free balance
 		assert_eq!(Balances::free_balance(21), 2000);
 		// Confirm account 21 (via controller 20) is totally staked
-		assert_eq!(Staking::eras_stakers(Staking::active_era().unwrap().index, 21).total, 1000);
+		assert_eq!(Staking::eras_stakers(active_era(), 21).total, 1000);
 		// Confirm account 21 can transfer at most 1000
 		assert_noop!(
 			Balances::transfer(Origin::signed(21), 20, 1001),
@@ -910,7 +903,7 @@ fn cannot_reserve_staked_balance() {
 		// Confirm account 11 has some free balance
 		assert_eq!(Balances::free_balance(11), 1000);
 		// Confirm account 11 (via controller 10) is totally staked
-		assert_eq!(Staking::eras_stakers(Staking::active_era().unwrap().index, 11).own, 1000);
+		assert_eq!(Staking::eras_stakers(active_era(), 11).own, 1000);
 		// Confirm account 11 cannot reserve as a result
 		assert_noop!(Balances::reserve(&11, 1), BalancesError::<Test, _>::LiquidityRestrictions);
 
@@ -1051,7 +1044,7 @@ fn validator_payment_prefs_work() {
 
 		// Compute total payout now for whole duration as other parameter won't change
 		let total_payout_1 = current_total_payout_for_duration(reward_time_per_era());
-		let exposure_1 = Staking::eras_stakers(Staking::active_era().unwrap().index, 11);
+		let exposure_1 = Staking::eras_stakers(active_era(), 11);
 		<Pallet<Test>>::reward_by_ids(vec![(11, 1)]);
 
 		mock::start_active_era(2);
@@ -1136,7 +1129,7 @@ fn bond_extra_and_withdraw_unbonded_works() {
 		let _ = Balances::make_free_balance_be(&11, 1000000);
 
 		// Initial config should be correct
-		assert_eq!(Staking::active_era().unwrap().index, 0);
+		assert_eq!(active_era(), 0);
 
 		// check the balance of a validator accounts.
 		assert_eq!(Balances::total_balance(&10), 1);
@@ -1156,7 +1149,7 @@ fn bond_extra_and_withdraw_unbonded_works() {
 			})
 		);
 		assert_eq!(
-			Staking::eras_stakers(Staking::active_era().unwrap().index, 11),
+			Staking::eras_stakers(active_era(), 11),
 			Exposure { total: 1000, own: 1000, others: vec![] }
 		);
 
@@ -1175,13 +1168,13 @@ fn bond_extra_and_withdraw_unbonded_works() {
 		);
 		// Exposure is a snapshot! only updated after the next era update.
 		assert_ne!(
-			Staking::eras_stakers(Staking::active_era().unwrap().index, 11),
+			Staking::eras_stakers(active_era(), 11),
 			Exposure { total: 1000 + 100, own: 1000 + 100, others: vec![] }
 		);
 
 		// trigger next era.
 		mock::start_active_era(2);
-		assert_eq!(Staking::active_era().unwrap().index, 2);
+		assert_eq!(active_era(), 2);
 
 		// ledger should be the same.
 		assert_eq!(
@@ -1196,7 +1189,7 @@ fn bond_extra_and_withdraw_unbonded_works() {
 		);
 		// Exposure is now updated.
 		assert_eq!(
-			Staking::eras_stakers(Staking::active_era().unwrap().index, 11),
+			Staking::eras_stakers(active_era(), 11),
 			Exposure { total: 1000 + 100, own: 1000 + 100, others: vec![] }
 		);
 
@@ -1316,7 +1309,7 @@ fn rebond_works() {
 		);
 
 		mock::start_active_era(2);
-		assert_eq!(Staking::active_era().unwrap().index, 2);
+		assert_eq!(active_era(), 2);
 
 		// Try to rebond some funds. We get an error since no fund is unbonded.
 		assert_noop!(Staking::rebond(Origin::signed(10), 500), Error::<Test>::NoUnlockChunk);
@@ -1520,63 +1513,58 @@ fn rebond_is_fifo() {
 
 #[test]
 fn reward_to_stake_works() {
-	ExtBuilder::default().nominate(false).fair(false).build_and_execute(|| {
-		// Confirm validator count is 2
-		assert_eq!(Staking::validator_count(), 2);
-		// Confirm account 10 and 20 are validators
-		assert!(<Validators<Test>>::contains_key(&11) && <Validators<Test>>::contains_key(&21));
-
-		assert_eq!(Staking::eras_stakers(Staking::active_era().unwrap().index, 11).total, 1000);
-		assert_eq!(Staking::eras_stakers(Staking::active_era().unwrap().index, 21).total, 2000);
+	ExtBuilder::default()
+		.nominate(false)
+		.set_status(31, StakerStatus::Idle)
+		.set_status(41, StakerStatus::Idle)
+		.set_stake(21, 2000)
+		.build_and_execute(|| {
+			assert_eq!(Staking::validator_count(), 2);
+			// Confirm account 10 and 20 are validators
+			assert!(<Validators<Test>>::contains_key(&11) && <Validators<Test>>::contains_key(&21));
 
-		// Give the man some money.
-		let _ = Balances::make_free_balance_be(&10, 1000);
-		let _ = Balances::make_free_balance_be(&20, 1000);
+			assert_eq!(Staking::eras_stakers(active_era(), 11).total, 1000);
+			assert_eq!(Staking::eras_stakers(active_era(), 21).total, 2000);
 
-		// Bypass logic and change current exposure
-		ErasStakers::<Test>::insert(0, 21, Exposure { total: 69, own: 69, others: vec![] });
+			// Give the man some money.
+			let _ = Balances::make_free_balance_be(&10, 1000);
+			let _ = Balances::make_free_balance_be(&20, 1000);
 
-		// Now lets lower account 20 stake
-		assert_eq!(Staking::eras_stakers(Staking::active_era().unwrap().index, 21).total, 69);
-		<Ledger<Test>>::insert(
-			&20,
-			StakingLedger {
-				stash: 21,
-				total: 69,
-				active: 69,
-				unlocking: vec![],
-				claimed_rewards: vec![],
-			},
-		);
+			// Bypass logic and change current exposure
+			ErasStakers::<Test>::insert(0, 21, Exposure { total: 69, own: 69, others: vec![] });
+			<Ledger<Test>>::insert(
+				&20,
+				StakingLedger {
+					stash: 21,
+					total: 69,
+					active: 69,
+					unlocking: vec![],
+					claimed_rewards: vec![],
+				},
+			);
 
-		// Compute total payout now for whole duration as other parameter won't change
-		let total_payout_0 = current_total_payout_for_duration(reward_time_per_era());
-		<Pallet<Test>>::reward_by_ids(vec![(11, 1)]);
-		<Pallet<Test>>::reward_by_ids(vec![(21, 1)]);
+			// Compute total payout now for whole duration as other parameter won't change
+			let total_payout_0 = current_total_payout_for_duration(reward_time_per_era());
+			<Pallet<Test>>::reward_by_ids(vec![(11, 1)]);
+			<Pallet<Test>>::reward_by_ids(vec![(21, 1)]);
 
-		// New era --> rewards are paid --> stakes are changed
-		mock::start_active_era(1);
-		mock::make_all_reward_payment(0);
+			// New era --> rewards are paid --> stakes are changed
+			mock::start_active_era(1);
+			mock::make_all_reward_payment(0);
 
-		assert_eq!(Staking::eras_stakers(Staking::active_era().unwrap().index, 11).total, 1000);
-		assert_eq!(Staking::eras_stakers(Staking::active_era().unwrap().index, 21).total, 69);
+			assert_eq!(Staking::eras_stakers(active_era(), 11).total, 1000);
+			assert_eq!(Staking::eras_stakers(active_era(), 21).total, 69);
 
-		let _11_balance = Balances::free_balance(&11);
-		assert_eq!(_11_balance, 1000 + total_payout_0 / 2);
+			let _11_balance = Balances::free_balance(&11);
+			assert_eq!(_11_balance, 1000 + total_payout_0 / 2);
 
-		// Trigger another new era as the info are frozen before the era start.
-		mock::start_active_era(2);
+			// Trigger another new era as the info are frozen before the era start.
+			mock::start_active_era(2);
 
-		// -- new infos
-		assert_eq!(
-			Staking::eras_stakers(Staking::active_era().unwrap().index, 11).total,
-			1000 + total_payout_0 / 2
-		);
-		assert_eq!(
-			Staking::eras_stakers(Staking::active_era().unwrap().index, 21).total,
-			69 + total_payout_0 / 2
-		);
-	});
+			// -- new infos
+			assert_eq!(Staking::eras_stakers(active_era(), 11).total, 1000 + total_payout_0 / 2);
+			assert_eq!(Staking::eras_stakers(active_era(), 21).total, 69 + total_payout_0 / 2);
+		});
 }
 
 #[test]
@@ -1585,17 +1573,15 @@ fn on_free_balance_zero_stash_removes_validator() {
 	// Tests that storage items are untouched when controller is empty
 	ExtBuilder::default()
 		.existential_deposit(10)
-		.min_nominator_bond(10)
-		.min_validator_bond(10)
+		.balance_factor(10)
 		.build_and_execute(|| {
 			// Check the balance of the validator account
-			assert_eq!(Balances::free_balance(10), 256);
+			assert_eq!(Balances::free_balance(10), 10);
 			// Check the balance of the stash account
-			assert_eq!(Balances::free_balance(11), 256000);
+			assert_eq!(Balances::free_balance(11), 10 * 1000);
 			// Check these two accounts are bonded
 			assert_eq!(Staking::bonded(&11), Some(10));
 
-			// Set some storage items which we expect to be cleaned up
 			// Set payee information
 			assert_ok!(Staking::set_payee(Origin::signed(10), RewardDestination::Stash));
 
@@ -1609,7 +1595,7 @@ fn on_free_balance_zero_stash_removes_validator() {
 			let _ = Balances::slash(&10, Balance::max_value());
 
 			// Check the balance of the stash account has not been touched
-			assert_eq!(Balances::free_balance(11), 256000);
+			assert_eq!(Balances::free_balance(11), 10 * 1000);
 			// Check these two accounts are still bonded
 			assert_eq!(Staking::bonded(&11), Some(10));
 
@@ -1642,17 +1628,16 @@ fn on_free_balance_zero_stash_removes_nominator() {
 	// Tests that storage items are untouched when controller is empty
 	ExtBuilder::default()
 		.existential_deposit(10)
-		.min_nominator_bond(10)
-		.min_validator_bond(10)
+		.balance_factor(10)
 		.build_and_execute(|| {
 			// Make 10 a nominator
 			assert_ok!(Staking::nominate(Origin::signed(10), vec![20]));
 			// Check that account 10 is a nominator
 			assert!(<Nominators<Test>>::contains_key(11));
 			// Check the balance of the nominator account
-			assert_eq!(Balances::free_balance(10), 256);
+			assert_eq!(Balances::free_balance(10), 10);
 			// Check the balance of the stash account
-			assert_eq!(Balances::free_balance(11), 256000);
+			assert_eq!(Balances::free_balance(11), 10_000);
 
 			// Set payee information
 			assert_ok!(Staking::set_payee(Origin::signed(10), RewardDestination::Stash));
@@ -1669,7 +1654,7 @@ fn on_free_balance_zero_stash_removes_nominator() {
 			assert_eq!(Balances::total_balance(&10), 0);
 
 			// Check the balance of the stash account has not been touched
-			assert_eq!(Balances::free_balance(11), 256000);
+			assert_eq!(Balances::free_balance(11), 10_000);
 			// Check these two accounts are still bonded
 			assert_eq!(Staking::bonded(&11), Some(10));
 
@@ -1744,32 +1729,27 @@ fn switching_roles() {
 }
 
 #[test]
-fn wrong_vote_is_null() {
+fn wrong_vote_is_moot() {
 	ExtBuilder::default()
-		.nominate(false)
-		.validator_pool(true)
+		.add_staker(
+			61,
+			60,
+			500,
+			StakerStatus::Nominator(vec![
+				11, 21, // good votes
+				1, 2, 15, 1000, 25, // crap votes. No effect.
+			]),
+		)
 		.build_and_execute(|| {
-			assert_eq_uvec!(validator_controllers(), vec![40, 30]);
-
-			// put some money in account that we'll use.
-			for i in 1..3 {
-				let _ = Balances::deposit_creating(&i, 5000);
-			}
-
-			// add 1 nominators
-			assert_ok!(Staking::bond(Origin::signed(1), 2, 2000, RewardDestination::default()));
-			assert_ok!(Staking::nominate(
-				Origin::signed(2),
-				vec![
-					11, 21, // good votes
-					1, 2, 15, 1000, 25 // crap votes. No effect.
-				]
-			));
-
-			// new block
+			// the genesis validators already reflect the above vote, nonetheless start a new era.
 			mock::start_active_era(1);
 
+			// new validators
 			assert_eq_uvec!(validator_controllers(), vec![20, 10]);
+
+			// our new voter is taken into account
+			assert!(Staking::eras_stakers(active_era(), 11).others.iter().any(|i| i.who == 61));
+			assert!(Staking::eras_stakers(active_era(), 21).others.iter().any(|i| i.who == 61));
 		});
 }
 
@@ -1780,8 +1760,7 @@ fn bond_with_no_staked_value() {
 	ExtBuilder::default()
 		.validator_count(3)
 		.existential_deposit(5)
-		.min_nominator_bond(5)
-		.min_validator_bond(5)
+		.balance_factor(5)
 		.nominate(false)
 		.minimum_validator_count(1)
 		.build_and_execute(|| {
@@ -1891,11 +1870,8 @@ fn bond_with_duplicate_vote_should_be_ignored_by_election_provider() {
 		.validator_count(2)
 		.nominate(false)
 		.minimum_validator_count(1)
+		.set_stake(31, 1000)
 		.build_and_execute(|| {
-			// disable the nominator
-			assert_ok!(Staking::chill(Origin::signed(100)));
-			// make stakes equal.
-			assert_ok!(Staking::bond_extra(Origin::signed(31), 999));
 			// ensure all have equal stake.
 			assert_eq!(
 				<Validators<Test>>::iter()
@@ -1933,25 +1909,23 @@ fn bond_with_duplicate_vote_should_be_ignored_by_election_provider() {
 
 #[test]
 fn bond_with_duplicate_vote_should_be_ignored_by_election_provider_elected() {
-	// same as above but ensures that even when the duple is being elected, everything is sane.
+	// same as above but ensures that even when the dupe is being elected, everything is sane.
 	ExtBuilder::default()
 		.validator_count(2)
 		.nominate(false)
+		.set_stake(31, 1000)
 		.minimum_validator_count(1)
 		.build_and_execute(|| {
-			// disable the nominator
-			assert_ok!(Staking::chill(Origin::signed(100)));
-			// 31/30 will have less stake
-			assert_ok!(Staking::bond_extra(Origin::signed(31), 99));
 			// ensure all have equal stake.
 			assert_eq!(
 				<Validators<Test>>::iter()
 					.map(|(v, _)| (v, Staking::ledger(v - 1).unwrap().total))
 					.collect::<Vec<_>>(),
-				vec![(31, 100), (21, 1000), (11, 1000)],
+				vec![(31, 1000), (21, 1000), (11, 1000)],
 			);
+
 			// no nominators shall exist.
-			assert!(<Nominators<Test>>::iter().map(|(n, _)| n).collect::<Vec<_>>().is_empty());
+			assert!(<Nominators<Test>>::iter().collect::<Vec<_>>().is_empty());
 
 			// give the man some money.
 			let initial_balance = 1000;
@@ -1960,10 +1934,10 @@ fn bond_with_duplicate_vote_should_be_ignored_by_election_provider_elected() {
 			}
 
 			assert_ok!(Staking::bond(Origin::signed(1), 2, 1000, RewardDestination::Controller));
-			assert_ok!(Staking::nominate(Origin::signed(2), vec![11, 11, 11, 21, 31]));
+			assert_ok!(Staking::nominate(Origin::signed(2), vec![11, 11, 11, 21]));
 
 			assert_ok!(Staking::bond(Origin::signed(3), 4, 1000, RewardDestination::Controller));
-			assert_ok!(Staking::nominate(Origin::signed(4), vec![21, 31]));
+			assert_ok!(Staking::nominate(Origin::signed(4), vec![21]));
 
 			// winners should be 21 and 11.
 			let supports = <Test as Config>::ElectionProvider::elect().unwrap().0;
@@ -1979,19 +1953,14 @@ fn bond_with_duplicate_vote_should_be_ignored_by_election_provider_elected() {
 
 #[test]
 fn new_era_elects_correct_number_of_validators() {
-	ExtBuilder::default()
-		.nominate(true)
-		.validator_pool(true)
-		.fair(true)
-		.validator_count(1)
-		.build_and_execute(|| {
-			assert_eq!(Staking::validator_count(), 1);
-			assert_eq!(validator_controllers().len(), 1);
+	ExtBuilder::default().nominate(true).validator_count(1).build_and_execute(|| {
+		assert_eq!(Staking::validator_count(), 1);
+		assert_eq!(validator_controllers().len(), 1);
 
-			Session::on_initialize(System::block_number());
+		Session::on_initialize(System::block_number());
 
-			assert_eq!(validator_controllers().len(), 1);
-		})
+		assert_eq!(validator_controllers().len(), 1);
+	})
 }
 
 #[test]
@@ -2066,7 +2035,7 @@ fn reward_validator_slashing_validator_does_not_overflow() {
 		// Check slashing
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
+				offender: (11, Staking::eras_stakers(active_era(), 11)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(100)],
@@ -2095,7 +2064,7 @@ fn reward_from_authorship_event_handler_works() {
 		// 21 is rewarded as an uncle producer
 		// 11 is rewarded as a block producer and uncle referencer and uncle producer
 		assert_eq!(
-			ErasRewardPoints::<Test>::get(Staking::active_era().unwrap().index),
+			ErasRewardPoints::<Test>::get(active_era()),
 			EraRewardPoints {
 				individual: vec![(11, 20 + 2 * 2 + 1), (21, 1)].into_iter().collect(),
 				total: 26,
@@ -2115,7 +2084,7 @@ fn add_reward_points_fns_works() {
 		<Pallet<Test>>::reward_by_ids(vec![(21, 1), (11, 1), (11, 1)]);
 
 		assert_eq!(
-			ErasRewardPoints::<Test>::get(Staking::active_era().unwrap().index),
+			ErasRewardPoints::<Test>::get(active_era()),
 			EraRewardPoints { individual: vec![(11, 4), (21, 2)].into_iter().collect(), total: 6 },
 		);
 	})
@@ -2170,7 +2139,7 @@ fn offence_forces_new_era() {
 	ExtBuilder::default().build_and_execute(|| {
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
+				offender: (11, Staking::eras_stakers(active_era(), 11)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(5)],
@@ -2188,7 +2157,7 @@ fn offence_ensures_new_era_without_clobbering() {
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
+				offender: (11, Staking::eras_stakers(active_era(), 11)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(5)],
@@ -2206,7 +2175,7 @@ fn offence_deselects_validator_even_when_slash_is_zero() {
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
+				offender: (11, Staking::eras_stakers(active_era(), 11)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(0)],
@@ -2227,7 +2196,7 @@ fn slashing_performed_according_exposure() {
 	// This test checks that slashing is performed according the exposure (or more precisely,
 	// historical exposure), not the current balance.
 	ExtBuilder::default().build_and_execute(|| {
-		assert_eq!(Staking::eras_stakers(Staking::active_era().unwrap().index, 11).own, 1000);
+		assert_eq!(Staking::eras_stakers(active_era(), 11).own, 1000);
 
 		// Handle an offence with a historical exposure.
 		on_offence_now(
@@ -2253,7 +2222,7 @@ fn slash_in_old_span_does_not_deselect() {
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
+				offender: (11, Staking::eras_stakers(active_era(), 11)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(0)],
@@ -2276,7 +2245,7 @@ fn slash_in_old_span_does_not_deselect() {
 
 		on_offence_in_era(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
+				offender: (11, Staking::eras_stakers(active_era(), 11)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(0)],
@@ -2290,7 +2259,7 @@ fn slash_in_old_span_does_not_deselect() {
 
 		on_offence_in_era(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
+				offender: (11, Staking::eras_stakers(active_era(), 11)),
 				reporters: vec![],
 			}],
 			// NOTE: A 100% slash here would clean up the account, causing de-registration.
@@ -2313,14 +2282,11 @@ fn reporters_receive_their_slice() {
 		// The reporters' reward is calculated from the total exposure.
 		let initial_balance = 1125;
 
-		assert_eq!(
-			Staking::eras_stakers(Staking::active_era().unwrap().index, 11).total,
-			initial_balance
-		);
+		assert_eq!(Staking::eras_stakers(active_era(), 11).total, initial_balance);
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
+				offender: (11, Staking::eras_stakers(active_era(), 11)),
 				reporters: vec![1, 2],
 			}],
 			&[Perbill::from_percent(50)],
@@ -2343,14 +2309,11 @@ fn subsequent_reports_in_same_span_pay_out_less() {
 		// The reporters' reward is calculated from the total exposure.
 		let initial_balance = 1125;
 
-		assert_eq!(
-			Staking::eras_stakers(Staking::active_era().unwrap().index, 11).total,
-			initial_balance
-		);
+		assert_eq!(Staking::eras_stakers(active_era(), 11).total, initial_balance);
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
+				offender: (11, Staking::eras_stakers(active_era(), 11)),
 				reporters: vec![1],
 			}],
 			&[Perbill::from_percent(20)],
@@ -2363,7 +2326,7 @@ fn subsequent_reports_in_same_span_pay_out_less() {
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
+				offender: (11, Staking::eras_stakers(active_era(), 11)),
 				reporters: vec![1],
 			}],
 			&[Perbill::from_percent(50)],
@@ -2385,7 +2348,7 @@ fn invulnerables_are_not_slashed() {
 		assert_eq!(Balances::free_balance(11), 1000);
 		assert_eq!(Balances::free_balance(21), 2000);
 
-		let exposure = Staking::eras_stakers(Staking::active_era().unwrap().index, 21);
+		let exposure = Staking::eras_stakers(active_era(), 21);
 		let initial_balance = Staking::slashable_balance_of(&21);
 
 		let nominator_balances: Vec<_> =
@@ -2394,11 +2357,11 @@ fn invulnerables_are_not_slashed() {
 		on_offence_now(
 			&[
 				OffenceDetails {
-					offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
+					offender: (11, Staking::eras_stakers(active_era(), 11)),
 					reporters: vec![],
 				},
 				OffenceDetails {
-					offender: (21, Staking::eras_stakers(Staking::active_era().unwrap().index, 21)),
+					offender: (21, Staking::eras_stakers(active_era(), 21)),
 					reporters: vec![],
 				},
 			],
@@ -2428,7 +2391,7 @@ fn dont_slash_if_fraction_is_zero() {
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
+				offender: (11, Staking::eras_stakers(active_era(), 11)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(0)],
@@ -2449,7 +2412,7 @@ fn only_slash_for_max_in_era() {
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
+				offender: (11, Staking::eras_stakers(active_era(), 11)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(50)],
@@ -2461,7 +2424,7 @@ fn only_slash_for_max_in_era() {
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
+				offender: (11, Staking::eras_stakers(active_era(), 11)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(25)],
@@ -2472,7 +2435,7 @@ fn only_slash_for_max_in_era() {
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
+				offender: (11, Staking::eras_stakers(active_era(), 11)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(60)],
@@ -2488,29 +2451,25 @@ fn garbage_collection_after_slashing() {
 	// ensures that `SlashingSpans` and `SpanSlash` of an account is removed after reaping.
 	ExtBuilder::default()
 		.existential_deposit(2)
-		.min_nominator_bond(2)
-		.min_validator_bond(2)
+		.balance_factor(2)
 		.build_and_execute(|| {
-			assert_eq!(Balances::free_balance(11), 256_000);
+			assert_eq!(Balances::free_balance(11), 2000);
 
 			on_offence_now(
 				&[OffenceDetails {
-					offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
+					offender: (11, Staking::eras_stakers(active_era(), 11)),
 					reporters: vec![],
 				}],
 				&[Perbill::from_percent(10)],
 			);
 
-			assert_eq!(Balances::free_balance(11), 256_000 - 25_600);
+			assert_eq!(Balances::free_balance(11), 2000 - 200);
 			assert!(<Staking as crate::Store>::SlashingSpans::get(&11).is_some());
-			assert_eq!(
-				<Staking as crate::Store>::SpanSlash::get(&(11, 0)).amount_slashed(),
-				&25_600
-			);
+			assert_eq!(<Staking as crate::Store>::SpanSlash::get(&(11, 0)).amount_slashed(), &200);
 
 			on_offence_now(
 				&[OffenceDetails {
-					offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
+					offender: (11, Staking::eras_stakers(active_era(), 11)),
 					reporters: vec![],
 				}],
 				&[Perbill::from_percent(100)],
@@ -2545,7 +2504,7 @@ fn garbage_collection_on_window_pruning() {
 		mock::start_active_era(1);
 
 		assert_eq!(Balances::free_balance(11), 1000);
-		let now = Staking::active_era().unwrap().index;
+		let now = active_era();
 
 		let exposure = Staking::eras_stakers(now, 11);
 		assert_eq!(Balances::free_balance(101), 2000);
@@ -2587,14 +2546,14 @@ fn slashing_nominators_by_span_max() {
 		assert_eq!(Balances::free_balance(101), 2000);
 		assert_eq!(Staking::slashable_balance_of(&21), 1000);
 
-		let exposure_11 = Staking::eras_stakers(Staking::active_era().unwrap().index, 11);
-		let exposure_21 = Staking::eras_stakers(Staking::active_era().unwrap().index, 21);
+		let exposure_11 = Staking::eras_stakers(active_era(), 11);
+		let exposure_21 = Staking::eras_stakers(active_era(), 21);
 		let nominated_value_11 = exposure_11.others.iter().find(|o| o.who == 101).unwrap().value;
 		let nominated_value_21 = exposure_21.others.iter().find(|o| o.who == 101).unwrap().value;
 
 		on_offence_in_era(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
+				offender: (11, Staking::eras_stakers(active_era(), 11)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(10)],
@@ -2620,7 +2579,7 @@ fn slashing_nominators_by_span_max() {
 		// second slash: higher era, higher value, same span.
 		on_offence_in_era(
 			&[OffenceDetails {
-				offender: (21, Staking::eras_stakers(Staking::active_era().unwrap().index, 21)),
+				offender: (21, Staking::eras_stakers(active_era(), 21)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(30)],
@@ -2641,7 +2600,7 @@ fn slashing_nominators_by_span_max() {
 		// in-era value, but lower slash value than slash 2.
 		on_offence_in_era(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
+				offender: (11, Staking::eras_stakers(active_era(), 11)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(20)],
@@ -2675,7 +2634,7 @@ fn slashes_are_summed_across_spans() {
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (21, Staking::eras_stakers(Staking::active_era().unwrap().index, 21)),
+				offender: (21, Staking::eras_stakers(active_era(), 21)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(10)],
@@ -2698,7 +2657,7 @@ fn slashes_are_summed_across_spans() {
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (21, Staking::eras_stakers(Staking::active_era().unwrap().index, 21)),
+				offender: (21, Staking::eras_stakers(active_era(), 21)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(10)],
@@ -2722,13 +2681,13 @@ fn deferred_slashes_are_deferred() {
 
 		assert_eq!(Balances::free_balance(11), 1000);
 
-		let exposure = Staking::eras_stakers(Staking::active_era().unwrap().index, 11);
+		let exposure = Staking::eras_stakers(active_era(), 11);
 		assert_eq!(Balances::free_balance(101), 2000);
 		let nominated_value = exposure.others.iter().find(|o| o.who == 101).unwrap().value;
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
+				offender: (11, Staking::eras_stakers(active_era(), 11)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(10)],
@@ -2763,7 +2722,7 @@ fn remove_deferred() {
 
 		assert_eq!(Balances::free_balance(11), 1000);
 
-		let exposure = Staking::eras_stakers(Staking::active_era().unwrap().index, 11);
+		let exposure = Staking::eras_stakers(active_era(), 11);
 		assert_eq!(Balances::free_balance(101), 2000);
 		let nominated_value = exposure.others.iter().find(|o| o.who == 101).unwrap().value;
 
@@ -2829,7 +2788,7 @@ fn remove_multi_deferred() {
 
 		assert_eq!(Balances::free_balance(11), 1000);
 
-		let exposure = Staking::eras_stakers(Staking::active_era().unwrap().index, 11);
+		let exposure = Staking::eras_stakers(active_era(), 11);
 		assert_eq!(Balances::free_balance(101), 2000);
 
 		on_offence_now(
@@ -2839,7 +2798,7 @@ fn remove_multi_deferred() {
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (21, Staking::eras_stakers(Staking::active_era().unwrap().index, 21)),
+				offender: (21, Staking::eras_stakers(active_era(), 21)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(10)],
@@ -2898,8 +2857,8 @@ fn slash_kicks_validators_not_nominators_and_disables_nominator_for_kicked_valid
 		assert_eq!(Balances::free_balance(101), 2000);
 
 		// 11 and 21 both have the support of 100
-		let exposure_11 = Staking::eras_stakers(Staking::active_era().unwrap().index, &11);
-		let exposure_21 = Staking::eras_stakers(Staking::active_era().unwrap().index, &21);
+		let exposure_11 = Staking::eras_stakers(active_era(), &11);
+		let exposure_21 = Staking::eras_stakers(active_era(), &21);
 
 		assert_eq!(exposure_11.total, 1000 + 125);
 		assert_eq!(exposure_21.total, 1000 + 375);
@@ -2931,8 +2890,8 @@ fn slash_kicks_validators_not_nominators_and_disables_nominator_for_kicked_valid
 		assert_ok!(Staking::validate(Origin::signed(10), Default::default()));
 
 		mock::start_active_era(2);
-		let exposure_11 = Staking::eras_stakers(Staking::active_era().unwrap().index, &11);
-		let exposure_21 = Staking::eras_stakers(Staking::active_era().unwrap().index, &21);
+		let exposure_11 = Staking::eras_stakers(active_era(), &11);
+		let exposure_21 = Staking::eras_stakers(active_era(), &21);
 
 		// 10 is re-elected, but without the support of 100
 		assert_eq!(exposure_11.total, 900);
@@ -2987,7 +2946,7 @@ fn claim_reward_at_the_last_era_and_no_double_claim_and_invalid_claim() {
 
 		mock::start_active_era(Staking::history_depth() + 1);
 
-		let active_era = Staking::active_era().unwrap().index;
+		let active_era = active_era();
 
 		// This is the latest planned era in staking, not the active era
 		let current_era = Staking::current_era().unwrap();
@@ -3033,7 +2992,7 @@ fn zero_slash_keeps_nominators() {
 
 		assert_eq!(Balances::free_balance(11), 1000);
 
-		let exposure = Staking::eras_stakers(Staking::active_era().unwrap().index, 11);
+		let exposure = Staking::eras_stakers(active_era(), 11);
 		assert_eq!(Balances::free_balance(101), 2000);
 
 		on_offence_now(
@@ -3066,7 +3025,7 @@ fn six_session_delay() {
 
 		let val_set = Session::validators();
 		let init_session = Session::current_index();
-		let init_active_era = Staking::active_era().unwrap().index;
+		let init_active_era = active_era();
 
 		// pallet-session is delaying session by one, thus the next session to plan is +2.
 		assert_eq!(<Staking as SessionManager<_>>::new_session(init_session + 2), None);
@@ -3509,7 +3468,7 @@ fn offences_weight_calculated_correctly() {
 		let offenders: Vec<OffenceDetails<<Test as frame_system::Config>::AccountId, pallet_session::historical::IdentificationTuple<Test>>>
 			= (1..10).map(|i|
 				OffenceDetails {
-					offender: (i, Staking::eras_stakers(Staking::active_era().unwrap().index, i)),
+					offender: (i, Staking::eras_stakers(active_era(), i)),
 					reporters: vec![],
 				}
 			).collect();
@@ -3518,7 +3477,7 @@ fn offences_weight_calculated_correctly() {
 		// On Offence with one offenders, Applied
 		let one_offender = [
 			OffenceDetails {
-				offender: (11, Staking::eras_stakers(Staking::active_era().unwrap().index, 11)),
+				offender: (11, Staking::eras_stakers(active_era(), 11)),
 				reporters: vec![1],
 			},
 		];
@@ -3698,19 +3657,15 @@ fn session_buffering_no_offset() {
 fn cannot_rebond_to_lower_than_ed() {
 	ExtBuilder::default()
 		.existential_deposit(10)
-		.min_nominator_bond(10)
-		.min_validator_bond(10)
+		.balance_factor(10)
 		.build_and_execute(|| {
-			// stash must have more balance than bonded for this to work.
-			assert_eq!(Balances::free_balance(&21), 512_000);
-
 			// initial stuff.
 			assert_eq!(
 				Staking::ledger(&20).unwrap(),
 				StakingLedger {
 					stash: 21,
-					total: 1000,
-					active: 1000,
+					total: 10 * 1000,
+					active: 10 * 1000,
 					unlocking: vec![],
 					claimed_rewards: vec![]
 				}
@@ -3718,14 +3673,14 @@ fn cannot_rebond_to_lower_than_ed() {
 
 			// unbond all of it. must be chilled first.
 			assert_ok!(Staking::chill(Origin::signed(20)));
-			assert_ok!(Staking::unbond(Origin::signed(20), 1000));
+			assert_ok!(Staking::unbond(Origin::signed(20), 10 * 1000));
 			assert_eq!(
 				Staking::ledger(&20).unwrap(),
 				StakingLedger {
 					stash: 21,
-					total: 1000,
+					total: 10 * 1000,
 					active: 0,
-					unlocking: vec![UnlockChunk { value: 1000, era: 3 }],
+					unlocking: vec![UnlockChunk { value: 10 * 1000, era: 3 }],
 					claimed_rewards: vec![]
 				}
 			);
@@ -3739,19 +3694,15 @@ fn cannot_rebond_to_lower_than_ed() {
 fn cannot_bond_extra_to_lower_than_ed() {
 	ExtBuilder::default()
 		.existential_deposit(10)
-		.min_nominator_bond(10)
-		.min_validator_bond(10)
+		.balance_factor(10)
 		.build_and_execute(|| {
-			// stash must have more balance than bonded for this to work.
-			assert_eq!(Balances::free_balance(&21), 512_000);
-
 			// initial stuff.
 			assert_eq!(
 				Staking::ledger(&20).unwrap(),
 				StakingLedger {
 					stash: 21,
-					total: 1000,
-					active: 1000,
+					total: 10 * 1000,
+					active: 10 * 1000,
 					unlocking: vec![],
 					claimed_rewards: vec![]
 				}
@@ -3759,14 +3710,14 @@ fn cannot_bond_extra_to_lower_than_ed() {
 
 			// unbond all of it. must be chilled first.
 			assert_ok!(Staking::chill(Origin::signed(20)));
-			assert_ok!(Staking::unbond(Origin::signed(20), 1000));
+			assert_ok!(Staking::unbond(Origin::signed(20), 10 * 1000));
 			assert_eq!(
 				Staking::ledger(&20).unwrap(),
 				StakingLedger {
 					stash: 21,
-					total: 1000,
+					total: 10 * 1000,
 					active: 0,
-					unlocking: vec![UnlockChunk { value: 1000, era: 3 }],
+					unlocking: vec![UnlockChunk { value: 10 * 1000, era: 3 }],
 					claimed_rewards: vec![]
 				}
 			);
@@ -3784,27 +3735,26 @@ fn do_not_die_when_active_is_ed() {
 	let ed = 10;
 	ExtBuilder::default()
 		.existential_deposit(ed)
-		.min_nominator_bond(ed)
-		.min_validator_bond(ed)
+		.balance_factor(ed)
 		.build_and_execute(|| {
-			// initial stuff.
+			// given
 			assert_eq!(
 				Staking::ledger(&20).unwrap(),
 				StakingLedger {
 					stash: 21,
-					total: 1000,
-					active: 1000,
+					total: 1000 * ed,
+					active: 1000 * ed,
 					unlocking: vec![],
 					claimed_rewards: vec![]
 				}
 			);
 
-			// unbond all of it except ed.
-			assert_ok!(Staking::unbond(Origin::signed(20), 1000 - ed));
+			// when unbond all of it except ed.
+			assert_ok!(Staking::unbond(Origin::signed(20), 999 * ed));
 			start_active_era(3);
 			assert_ok!(Staking::withdraw_unbonded(Origin::signed(20), 100));
 
-			// initial stuff.
+			// then
 			assert_eq!(
 				Staking::ledger(&20).unwrap(),
 				StakingLedger {
@@ -3981,313 +3931,294 @@ mod election_data_provider {
 			assert_eq!(ForceEra::<Test>::get(), Forcing::NotForcing);
 		})
 	}
+}
 
-	#[test]
-	#[should_panic]
-	fn count_check_works() {
-		ExtBuilder::default().build_and_execute(|| {
-			// We should never insert into the validators or nominators map directly as this will
-			// not keep track of the count. This test should panic as we verify the count is accurate
-			// after every test using the `post_checks` in `mock`.
-			Validators::<Test>::insert(987654321, ValidatorPrefs::default());
-			Nominators::<Test>::insert(
-				987654321,
-				Nominations {
-					targets: vec![],
-					submitted_in: Default::default(),
-					suppressed: false,
-				},
+#[test]
+#[should_panic]
+fn count_check_works() {
+	ExtBuilder::default().build_and_execute(|| {
+		// We should never insert into the validators or nominators map directly as this will
+		// not keep track of the count. This test should panic as we verify the count is accurate
+		// after every test using the `post_checks` in `mock`.
+		Validators::<Test>::insert(987654321, ValidatorPrefs::default());
+		Nominators::<Test>::insert(
+			987654321,
+			Nominations { targets: vec![], submitted_in: Default::default(), suppressed: false },
+		);
+	})
+}
+
+#[test]
+fn min_bond_checks_work() {
+	ExtBuilder::default()
+		.existential_deposit(100)
+		.balance_factor(100)
+		.min_nominator_bond(1_000)
+		.min_validator_bond(1_500)
+		.build_and_execute(|| {
+			// 500 is not enough for any role
+			assert_ok!(Staking::bond(Origin::signed(3), 4, 500, RewardDestination::Controller));
+			assert_noop!(
+				Staking::nominate(Origin::signed(4), vec![1]),
+				Error::<Test>::InsufficientBond
+			);
+			assert_noop!(
+				Staking::validate(Origin::signed(4), ValidatorPrefs::default()),
+				Error::<Test>::InsufficientBond,
 			);
-		})
-	}
 
-	#[test]
-	fn min_bond_checks_work() {
-		ExtBuilder::default()
-			.existential_deposit(100)
-			.min_nominator_bond(1_000)
-			.min_validator_bond(1_500)
-			.build_and_execute(|| {
-				// 500 is not enough for any role
-				assert_ok!(Staking::bond(Origin::signed(3), 4, 500, RewardDestination::Controller));
-				assert_noop!(
-					Staking::nominate(Origin::signed(4), vec![1]),
-					Error::<Test>::InsufficientBond
-				);
-				assert_noop!(
-					Staking::validate(Origin::signed(4), ValidatorPrefs::default()),
-					Error::<Test>::InsufficientBond,
-				);
-
-				// 1000 is enough for nominator
-				assert_ok!(Staking::bond_extra(Origin::signed(3), 500));
-				assert_ok!(Staking::nominate(Origin::signed(4), vec![1]));
-				assert_noop!(
-					Staking::validate(Origin::signed(4), ValidatorPrefs::default()),
-					Error::<Test>::InsufficientBond,
-				);
-
-				// 1500 is enough for validator
-				assert_ok!(Staking::bond_extra(Origin::signed(3), 500));
-				assert_ok!(Staking::nominate(Origin::signed(4), vec![1]));
-				assert_ok!(Staking::validate(Origin::signed(4), ValidatorPrefs::default()));
-
-				// Can't unbond anything as validator
-				assert_noop!(
-					Staking::unbond(Origin::signed(4), 500),
-					Error::<Test>::InsufficientBond
-				);
-
-				// Once they are a nominator, they can unbond 500
-				assert_ok!(Staking::nominate(Origin::signed(4), vec![1]));
-				assert_ok!(Staking::unbond(Origin::signed(4), 500));
-				assert_noop!(
-					Staking::unbond(Origin::signed(4), 500),
-					Error::<Test>::InsufficientBond
-				);
-
-				// Once they are chilled they can unbond everything
-				assert_ok!(Staking::chill(Origin::signed(4)));
-				assert_ok!(Staking::unbond(Origin::signed(4), 1000));
-			})
-	}
+			// 1000 is enough for nominator
+			assert_ok!(Staking::bond_extra(Origin::signed(3), 500));
+			assert_ok!(Staking::nominate(Origin::signed(4), vec![1]));
+			assert_noop!(
+				Staking::validate(Origin::signed(4), ValidatorPrefs::default()),
+				Error::<Test>::InsufficientBond,
+			);
 
-	#[test]
-	fn chill_other_works() {
-		ExtBuilder::default()
-			.existential_deposit(100)
-			.min_nominator_bond(1_000)
-			.min_validator_bond(1_500)
-			.build_and_execute(|| {
-				for i in 0..15 {
-					let a = 4 * i;
-					let b = 4 * i + 1;
-					let c = 4 * i + 2;
-					let d = 4 * i + 3;
-					Balances::make_free_balance_be(&a, 100_000);
-					Balances::make_free_balance_be(&b, 100_000);
-					Balances::make_free_balance_be(&c, 100_000);
-					Balances::make_free_balance_be(&d, 100_000);
-
-					// Nominator
-					assert_ok!(Staking::bond(
-						Origin::signed(a),
-						b,
-						1000,
-						RewardDestination::Controller
-					));
-					assert_ok!(Staking::nominate(Origin::signed(b), vec![1]));
-
-					// Validator
-					assert_ok!(Staking::bond(
-						Origin::signed(c),
-						d,
-						1500,
-						RewardDestination::Controller
-					));
-					assert_ok!(Staking::validate(Origin::signed(d), ValidatorPrefs::default()));
-				}
+			// 1500 is enough for validator
+			assert_ok!(Staking::bond_extra(Origin::signed(3), 500));
+			assert_ok!(Staking::nominate(Origin::signed(4), vec![1]));
+			assert_ok!(Staking::validate(Origin::signed(4), ValidatorPrefs::default()));
 
-				// To chill other users, we need to:
-				// * Set a minimum bond amount
-				// * Set a limit
-				// * Set a threshold
-				//
-				// If any of these are missing, we do not have enough information to allow the
-				// `chill_other` to succeed from one user to another.
-
-				// Can't chill these users
-				assert_noop!(
-					Staking::chill_other(Origin::signed(1337), 1),
-					Error::<Test>::CannotChillOther
-				);
-				assert_noop!(
-					Staking::chill_other(Origin::signed(1337), 3),
-					Error::<Test>::CannotChillOther
-				);
-
-				// Change the minimum bond... but no limits.
-				assert_ok!(Staking::set_staking_limits(
-					Origin::root(),
-					1_500,
-					2_000,
-					None,
-					None,
-					None
-				));
+			// Can't unbond anything as validator
+			assert_noop!(Staking::unbond(Origin::signed(4), 500), Error::<Test>::InsufficientBond);
 
-				// Still can't chill these users
-				assert_noop!(
-					Staking::chill_other(Origin::signed(1337), 1),
-					Error::<Test>::CannotChillOther
-				);
-				assert_noop!(
-					Staking::chill_other(Origin::signed(1337), 3),
-					Error::<Test>::CannotChillOther
-				);
-
-				// Add limits, but no threshold
-				assert_ok!(Staking::set_staking_limits(
-					Origin::root(),
-					1_500,
-					2_000,
-					Some(10),
-					Some(10),
-					None
-				));
+			// Once they are a nominator, they can unbond 500
+			assert_ok!(Staking::nominate(Origin::signed(4), vec![1]));
+			assert_ok!(Staking::unbond(Origin::signed(4), 500));
+			assert_noop!(Staking::unbond(Origin::signed(4), 500), Error::<Test>::InsufficientBond);
 
-				// Still can't chill these users
-				assert_noop!(
-					Staking::chill_other(Origin::signed(1337), 1),
-					Error::<Test>::CannotChillOther
-				);
-				assert_noop!(
-					Staking::chill_other(Origin::signed(1337), 3),
-					Error::<Test>::CannotChillOther
-				);
-
-				// Add threshold, but no limits
-				assert_ok!(Staking::set_staking_limits(
-					Origin::root(),
-					1_500,
-					2_000,
-					None,
-					None,
-					Some(Percent::from_percent(0))
-				));
+			// Once they are chilled they can unbond everything
+			assert_ok!(Staking::chill(Origin::signed(4)));
+			assert_ok!(Staking::unbond(Origin::signed(4), 1000));
+		})
+}
 
-				// Still can't chill these users
-				assert_noop!(
-					Staking::chill_other(Origin::signed(1337), 1),
-					Error::<Test>::CannotChillOther
-				);
-				assert_noop!(
-					Staking::chill_other(Origin::signed(1337), 3),
-					Error::<Test>::CannotChillOther
-				);
-
-				// Add threshold and limits
-				assert_ok!(Staking::set_staking_limits(
-					Origin::root(),
-					1_500,
-					2_000,
-					Some(10),
-					Some(10),
-					Some(Percent::from_percent(75))
+#[test]
+fn chill_other_works() {
+	ExtBuilder::default()
+		.existential_deposit(100)
+		.balance_factor(100)
+		.min_nominator_bond(1_000)
+		.min_validator_bond(1_500)
+		.build_and_execute(|| {
+			let initial_validators = CounterForValidators::<Test>::get();
+			let initial_nominators = CounterForNominators::<Test>::get();
+			for i in 0..15 {
+				let a = 4 * i;
+				let b = 4 * i + 1;
+				let c = 4 * i + 2;
+				let d = 4 * i + 3;
+				Balances::make_free_balance_be(&a, 100_000);
+				Balances::make_free_balance_be(&b, 100_000);
+				Balances::make_free_balance_be(&c, 100_000);
+				Balances::make_free_balance_be(&d, 100_000);
+
+				// Nominator
+				assert_ok!(Staking::bond(
+					Origin::signed(a),
+					b,
+					1000,
+					RewardDestination::Controller
+				));
+				assert_ok!(Staking::nominate(Origin::signed(b), vec![1]));
+
+				// Validator
+				assert_ok!(Staking::bond(
+					Origin::signed(c),
+					d,
+					1500,
+					RewardDestination::Controller
 				));
+				assert_ok!(Staking::validate(Origin::signed(d), ValidatorPrefs::default()));
+			}
 
-				// 16 people total because tests start with 1 active one
-				assert_eq!(CounterForNominators::<Test>::get(), 16);
-				assert_eq!(CounterForValidators::<Test>::get(), 16);
+			// To chill other users, we need to:
+			// * Set a minimum bond amount
+			// * Set a limit
+			// * Set a threshold
+			//
+			// If any of these are missing, we do not have enough information to allow the
+			// `chill_other` to succeed from one user to another.
 
-				// Users can now be chilled down to 7 people, so we try to remove 9 of them (starting with 16)
-				for i in 6..15 {
-					let b = 4 * i + 1;
-					let d = 4 * i + 3;
-					assert_ok!(Staking::chill_other(Origin::signed(1337), b));
-					assert_ok!(Staking::chill_other(Origin::signed(1337), d));
-				}
+			// Can't chill these users
+			assert_noop!(
+				Staking::chill_other(Origin::signed(1337), 1),
+				Error::<Test>::CannotChillOther
+			);
+			assert_noop!(
+				Staking::chill_other(Origin::signed(1337), 3),
+				Error::<Test>::CannotChillOther
+			);
 
-				// Cant go lower.
-				assert_noop!(
-					Staking::chill_other(Origin::signed(1337), 1),
-					Error::<Test>::CannotChillOther
-				);
-				assert_noop!(
-					Staking::chill_other(Origin::signed(1337), 3),
-					Error::<Test>::CannotChillOther
-				);
-			})
-	}
+			// Change the minimum bond... but no limits.
+			assert_ok!(Staking::set_staking_limits(Origin::root(), 1_500, 2_000, None, None, None));
 
-	#[test]
-	fn capped_stakers_works() {
-		ExtBuilder::default().build_and_execute(|| {
-			let validator_count = CounterForValidators::<Test>::get();
-			assert_eq!(validator_count, 3);
-			let nominator_count = CounterForNominators::<Test>::get();
-			assert_eq!(nominator_count, 1);
+			// Still can't chill these users
+			assert_noop!(
+				Staking::chill_other(Origin::signed(1337), 1),
+				Error::<Test>::CannotChillOther
+			);
+			assert_noop!(
+				Staking::chill_other(Origin::signed(1337), 3),
+				Error::<Test>::CannotChillOther
+			);
+
+			// Add limits, but no threshold
+			assert_ok!(Staking::set_staking_limits(
+				Origin::root(),
+				1_500,
+				2_000,
+				Some(10),
+				Some(10),
+				None
+			));
+
+			// Still can't chill these users
+			assert_noop!(
+				Staking::chill_other(Origin::signed(1337), 1),
+				Error::<Test>::CannotChillOther
+			);
+			assert_noop!(
+				Staking::chill_other(Origin::signed(1337), 3),
+				Error::<Test>::CannotChillOther
+			);
 
-			// Change the maximums
-			let max = 10;
+			// Add threshold, but no limits
 			assert_ok!(Staking::set_staking_limits(
 				Origin::root(),
-				10,
-				10,
-				Some(max),
-				Some(max),
+				1_500,
+				2_000,
+				None,
+				None,
 				Some(Percent::from_percent(0))
 			));
 
-			// can create `max - validator_count` validators
-			let mut some_existing_validator = AccountId::default();
-			for i in 0..max - validator_count {
-				let (_, controller) = testing_utils::create_stash_controller::<Test>(
-					i + 10_000_000,
-					100,
-					RewardDestination::Controller,
-				)
-				.unwrap();
-				assert_ok!(Staking::validate(
-					Origin::signed(controller),
-					ValidatorPrefs::default()
-				));
-				some_existing_validator = controller;
+			// Still can't chill these users
+			assert_noop!(
+				Staking::chill_other(Origin::signed(1337), 1),
+				Error::<Test>::CannotChillOther
+			);
+			assert_noop!(
+				Staking::chill_other(Origin::signed(1337), 3),
+				Error::<Test>::CannotChillOther
+			);
+
+			// Add threshold and limits
+			assert_ok!(Staking::set_staking_limits(
+				Origin::root(),
+				1_500,
+				2_000,
+				Some(10),
+				Some(10),
+				Some(Percent::from_percent(75))
+			));
+
+			// 16 people total because tests start with 2 active one
+			assert_eq!(CounterForNominators::<Test>::get(), 15 + initial_nominators);
+			assert_eq!(CounterForValidators::<Test>::get(), 15 + initial_validators);
+
+			// Users can now be chilled down to 7 people, so we try to remove 9 of them (starting with 16)
+			for i in 6..15 {
+				let b = 4 * i + 1;
+				let d = 4 * i + 3;
+				assert_ok!(Staking::chill_other(Origin::signed(1337), b));
+				assert_ok!(Staking::chill_other(Origin::signed(1337), d));
 			}
 
-			// but no more
-			let (_, last_validator) = testing_utils::create_stash_controller::<Test>(
-				1337,
+			// chill a nominator. Limit is not reached, not chill-able
+			assert_eq!(CounterForNominators::<Test>::get(), 7);
+			assert_noop!(
+				Staking::chill_other(Origin::signed(1337), 1),
+				Error::<Test>::CannotChillOther
+			);
+			// chill a validator. Limit is reached, chill-able.
+			assert_eq!(CounterForValidators::<Test>::get(), 9);
+			assert_ok!(Staking::chill_other(Origin::signed(1337), 3));
+		})
+}
+
+#[test]
+fn capped_stakers_works() {
+	ExtBuilder::default().build_and_execute(|| {
+		let validator_count = CounterForValidators::<Test>::get();
+		assert_eq!(validator_count, 3);
+		let nominator_count = CounterForNominators::<Test>::get();
+		assert_eq!(nominator_count, 1);
+
+		// Change the maximums
+		let max = 10;
+		assert_ok!(Staking::set_staking_limits(
+			Origin::root(),
+			10,
+			10,
+			Some(max),
+			Some(max),
+			Some(Percent::from_percent(0))
+		));
+
+		// can create `max - validator_count` validators
+		let mut some_existing_validator = AccountId::default();
+		for i in 0..max - validator_count {
+			let (_, controller) = testing_utils::create_stash_controller::<Test>(
+				i + 10_000_000,
 				100,
 				RewardDestination::Controller,
 			)
 			.unwrap();
+			assert_ok!(Staking::validate(Origin::signed(controller), ValidatorPrefs::default()));
+			some_existing_validator = controller;
+		}
 
-			assert_noop!(
-				Staking::validate(Origin::signed(last_validator), ValidatorPrefs::default()),
-				Error::<Test>::TooManyValidators,
-			);
+		// but no more
+		let (_, last_validator) = testing_utils::create_stash_controller::<Test>(
+			1337,
+			100,
+			RewardDestination::Controller,
+		)
+		.unwrap();
 
-			// same with nominators
-			let mut some_existing_nominator = AccountId::default();
-			for i in 0..max - nominator_count {
-				let (_, controller) = testing_utils::create_stash_controller::<Test>(
-					i + 20_000_000,
-					100,
-					RewardDestination::Controller,
-				)
-				.unwrap();
-				assert_ok!(Staking::nominate(Origin::signed(controller), vec![1]));
-				some_existing_nominator = controller;
-			}
+		assert_noop!(
+			Staking::validate(Origin::signed(last_validator), ValidatorPrefs::default()),
+			Error::<Test>::TooManyValidators,
+		);
 
-			// one more is too many
-			let (_, last_nominator) = testing_utils::create_stash_controller::<Test>(
-				30_000_000,
+		// same with nominators
+		let mut some_existing_nominator = AccountId::default();
+		for i in 0..max - nominator_count {
+			let (_, controller) = testing_utils::create_stash_controller::<Test>(
+				i + 20_000_000,
 				100,
 				RewardDestination::Controller,
 			)
 			.unwrap();
-			assert_noop!(
-				Staking::nominate(Origin::signed(last_nominator), vec![1]),
-				Error::<Test>::TooManyNominators
-			);
+			assert_ok!(Staking::nominate(Origin::signed(controller), vec![1]));
+			some_existing_nominator = controller;
+		}
 
-			// Re-nominate works fine
-			assert_ok!(Staking::nominate(Origin::signed(some_existing_nominator), vec![1]));
-			// Re-validate works fine
-			assert_ok!(Staking::validate(
-				Origin::signed(some_existing_validator),
-				ValidatorPrefs::default()
-			));
+		// one more is too many
+		let (_, last_nominator) = testing_utils::create_stash_controller::<Test>(
+			30_000_000,
+			100,
+			RewardDestination::Controller,
+		)
+		.unwrap();
+		assert_noop!(
+			Staking::nominate(Origin::signed(last_nominator), vec![1]),
+			Error::<Test>::TooManyNominators
+		);
 
-			// No problem when we set to `None` again
-			assert_ok!(Staking::set_staking_limits(Origin::root(), 10, 10, None, None, None));
-			assert_ok!(Staking::nominate(Origin::signed(last_nominator), vec![1]));
-			assert_ok!(Staking::validate(
-				Origin::signed(last_validator),
-				ValidatorPrefs::default()
-			));
-		})
-	}
+		// Re-nominate works fine
+		assert_ok!(Staking::nominate(Origin::signed(some_existing_nominator), vec![1]));
+		// Re-validate works fine
+		assert_ok!(Staking::validate(
+			Origin::signed(some_existing_validator),
+			ValidatorPrefs::default()
+		));
+
+		// No problem when we set to `None` again
+		assert_ok!(Staking::set_staking_limits(Origin::root(), 10, 10, None, None, None));
+		assert_ok!(Staking::nominate(Origin::signed(last_nominator), vec![1]));
+		assert_ok!(Staking::validate(Origin::signed(last_validator), ValidatorPrefs::default()));
+	})
 }

From 4c3a55e7ca5c4c85c1eb53fd82ed71029d952510 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Wed, 11 Aug 2021 16:56:55 +0200
Subject: [PATCH 1076/1194] Rewrap all comments to 100 line width (#9490)

* reformat everything again

* manual formatting

* last manual fix

* Fix build
---
 bin/node/bench/src/import.rs                  |   3 +-
 bin/node/cli/src/chain_spec.rs                |   3 +
 bin/node/executor/tests/basic.rs              |   6 +-
 bin/node/testing/src/bench.rs                 |   4 +-
 client/allocator/src/freeing_bump.rs          |   2 +-
 client/api/src/backend.rs                     |  21 +-
 client/api/src/cht.rs                         |   3 +-
 client/api/src/leaves.rs                      |   3 +-
 client/api/src/proof_provider.rs              |  13 +-
 client/authority-discovery/src/lib.rs         |   4 +-
 client/authority-discovery/src/worker.rs      |   3 +-
 .../basic-authorship/src/basic_authorship.rs  |  10 +-
 client/cli/src/commands/utils.rs              |   3 +-
 client/cli/src/lib.rs                         |  15 +-
 client/cli/src/params/import_params.rs        |   3 +-
 client/cli/src/params/mod.rs                  |   3 +-
 client/cli/src/params/network_params.rs       |   8 +-
 client/cli/src/params/node_key_params.rs      |  17 +-
 client/cli/src/params/shared_params.rs        |   4 +-
 client/consensus/aura/src/lib.rs              |   8 +-
 client/consensus/babe/src/lib.rs              |   4 +-
 client/consensus/common/src/block_import.rs   |   4 +-
 client/consensus/common/src/shared_data.rs    |  13 +-
 client/consensus/epochs/src/lib.rs            |   3 +-
 .../manual-seal/src/consensus/babe.rs         |   5 +-
 client/consensus/manual-seal/src/lib.rs       |  13 +-
 client/consensus/pow/src/lib.rs               |   4 +-
 client/consensus/slots/src/lib.rs             |   6 +-
 client/db/src/cache/list_cache.rs             |  41 ++--
 client/db/src/changes_tries_storage.rs        |  15 +-
 client/db/src/lib.rs                          |  12 +-
 client/db/src/light.rs                        |   4 +-
 client/db/src/storage_cache.rs                |   8 +-
 client/db/src/utils.rs                        |   3 +-
 .../executor/common/src/runtime_blob/mod.rs   |  15 +-
 .../common/src/runtime_blob/runtime_blob.rs   |   9 +-
 client/executor/common/src/wasm_runtime.rs    |   3 +-
 client/executor/src/native_executor.rs        |   8 +-
 client/executor/src/wasm_runtime.rs           |  24 ++-
 client/executor/wasmi/src/lib.rs              |   3 +-
 .../executor/wasmtime/src/instance_wrapper.rs |  10 +-
 client/executor/wasmtime/src/runtime.rs       |  74 +++----
 client/executor/wasmtime/src/util.rs          |   3 +-
 client/finality-grandpa/src/authorities.rs    |  15 +-
 .../src/communication/gossip.rs               |  22 +-
 .../finality-grandpa/src/communication/mod.rs |  16 +-
 client/finality-grandpa/src/import.rs         |   3 +-
 client/finality-grandpa/src/justification.rs  |   3 +-
 client/finality-grandpa/src/observer.rs       |   3 +-
 client/finality-grandpa/src/warp_proof.rs     |   4 +-
 client/informant/src/display.rs               |   1 -
 client/informant/src/lib.rs                   |   6 +-
 client/keystore/src/local.rs                  |   4 +-
 client/network-gossip/src/bridge.rs           |   4 +-
 client/network-gossip/src/lib.rs              |   4 +-
 client/network/src/behaviour.rs               |   6 +-
 client/network/src/block_request_handler.rs   |  12 +-
 client/network/src/config.rs                  |  25 +--
 client/network/src/discovery.rs               |   3 +-
 client/network/src/lib.rs                     |   9 +-
 client/network/src/light_client_requests.rs   |   3 +-
 .../src/light_client_requests/sender.rs       |   5 +-
 client/network/src/protocol/message.rs        |   6 +-
 .../src/protocol/notifications/behaviour.rs   |   8 +-
 .../notifications/upgrade/notifications.rs    |  16 +-
 client/network/src/protocol/sync.rs           |  41 ++--
 client/network/src/protocol/sync/blocks.rs    |   6 +-
 .../src/protocol/sync/extra_requests.rs       |   7 +-
 client/network/src/request_responses.rs       |   7 +-
 client/network/src/service.rs                 |  32 +--
 client/network/src/warp_request_handler.rs    |   9 +-
 client/offchain/src/api/http_dummy.rs         |   3 +-
 client/rpc-api/src/author/mod.rs              |   4 +-
 client/rpc-api/src/state/mod.rs               |  12 +-
 client/rpc/src/author/mod.rs                  |   3 +-
 client/rpc/src/state/mod.rs                   |   3 +-
 client/rpc/src/state/state_full.rs            |   3 +-
 client/service/src/builder.rs                 |   5 +-
 client/service/src/chain_ops/import_blocks.rs |   4 +-
 client/service/src/client/call_executor.rs    |   1 -
 client/service/src/client/client.rs           |   4 +-
 client/service/src/config.rs                  |   3 +-
 client/service/src/lib.rs                     |   9 +-
 client/service/test/src/client/mod.rs         |   3 +-
 client/state-db/src/lib.rs                    |  19 +-
 client/state-db/src/noncanonical.rs           |  19 +-
 client/state-db/src/pruning.rs                |   7 +-
 client/telemetry/src/lib.rs                   |   8 +-
 client/telemetry/src/node.rs                  |  16 +-
 client/transaction-pool/api/src/lib.rs        |   3 +-
 .../transaction-pool/src/graph/base_pool.rs   |  10 +-
 client/transaction-pool/src/graph/pool.rs     |  10 +-
 client/transaction-pool/src/graph/ready.rs    |  13 +-
 .../src/graph/validated_pool.rs               |   8 +-
 frame/assets/src/functions.rs                 |   3 +-
 frame/assets/src/lib.rs                       |  18 +-
 frame/assets/src/types.rs                     |  10 +-
 frame/atomic-swap/src/lib.rs                  |  10 +-
 frame/aura/src/lib.rs                         |   6 +-
 frame/authorship/src/lib.rs                   |   4 +-
 frame/babe/src/lib.rs                         |  15 +-
 frame/balances/src/lib.rs                     | 101 +++++----
 frame/benchmarking/src/analysis.rs            |   4 +-
 frame/benchmarking/src/lib.rs                 |  20 +-
 frame/benchmarking/src/utils.rs               |   7 +-
 frame/bounties/src/lib.rs                     |   3 +-
 frame/bounties/src/tests.rs                   |   3 +-
 frame/contracts/src/benchmarking/mod.rs       |   3 +-
 frame/contracts/src/chain_extension.rs        |   4 +-
 frame/contracts/src/exec.rs                   |  16 +-
 frame/contracts/src/lib.rs                    |  67 +++---
 frame/contracts/src/rent.rs                   |  28 +--
 frame/contracts/src/storage.rs                |   7 +-
 frame/contracts/src/wasm/code_cache.rs        |   7 +-
 frame/contracts/src/wasm/prepare.rs           |   3 +-
 frame/contracts/src/wasm/runtime.rs           |   4 +-
 frame/democracy/src/lib.rs                    | 112 +++++-----
 .../election-provider-multi-phase/src/lib.rs  |  28 ++-
 frame/elections-phragmen/src/lib.rs           |  19 +-
 frame/elections/src/lib.rs                    |  23 +-
 frame/example-offchain-worker/src/lib.rs      |   9 +-
 frame/example/src/lib.rs                      | 109 ++++++----
 frame/executive/src/lib.rs                    |   6 +-
 frame/gilt/src/lib.rs                         |  12 +-
 frame/identity/src/lib.rs                     |   7 +-
 frame/im-online/src/lib.rs                    |  10 +-
 frame/indices/src/lib.rs                      |   7 +-
 frame/lottery/src/lib.rs                      |   6 +-
 frame/merkle-mountain-range/src/lib.rs        |  26 +--
 frame/multisig/src/lib.rs                     |  14 +-
 frame/multisig/src/tests.rs                   |   5 +-
 frame/proxy/src/lib.rs                        |  22 +-
 frame/recovery/src/lib.rs                     |  98 +++++----
 frame/recovery/src/tests.rs                   |   3 +-
 frame/scheduler/src/lib.rs                    |  18 +-
 frame/session/src/lib.rs                      |   7 +-
 frame/society/src/lib.rs                      |  25 ++-
 frame/staking/reward-curve/src/lib.rs         |  23 +-
 frame/staking/reward-fn/src/lib.rs            |  18 +-
 frame/staking/src/inflation.rs                |   4 +-
 frame/staking/src/pallet/impls.rs             |   9 +-
 frame/staking/src/pallet/mod.rs               | 105 ++++-----
 frame/staking/src/tests.rs                    |  23 +-
 frame/sudo/src/lib.rs                         |  11 +-
 frame/sudo/src/tests.rs                       |   3 +-
 frame/support/procedural/src/lib.rs           |  32 +--
 .../procedural/src/pallet/expand/call.rs      |   1 +
 .../procedural/src/pallet/expand/config.rs    |   1 +
 .../procedural/src/pallet/expand/constants.rs |   1 +
 .../procedural/src/pallet/expand/error.rs     |   1 +
 .../procedural/src/pallet/expand/event.rs     |   1 +
 .../src/pallet/expand/genesis_build.rs        |   1 +
 .../src/pallet/expand/genesis_config.rs       |   1 +
 .../procedural/src/pallet/expand/hooks.rs     |   1 +
 .../procedural/src/pallet/expand/instances.rs |   1 +
 .../src/pallet/expand/pallet_struct.rs        |   1 +
 .../procedural/src/pallet/expand/storage.rs   |   2 +
 .../src/pallet/expand/type_value.rs           |   1 +
 .../procedural/src/pallet/parse/storage.rs    |   3 +-
 frame/support/src/lib.rs                      | 202 ++++++++++--------
 .../support/src/storage/bounded_btree_map.rs  |   6 +-
 frame/support/src/storage/mod.rs              |  10 +-
 frame/support/src/storage/types/key.rs        |   3 +-
 frame/support/src/storage/types/mod.rs        |   8 +-
 frame/support/src/storage/weak_bounded_vec.rs |   4 +-
 frame/support/src/traits/members.rs           |   4 +-
 frame/support/src/traits/misc.rs              |   3 +-
 frame/support/src/traits/schedule.rs          |   4 +-
 frame/support/src/traits/storage.rs           |   3 +-
 frame/support/src/traits/tokens/currency.rs   |   8 +-
 .../src/traits/tokens/currency/reservable.rs  |   4 +-
 .../src/traits/tokens/fungible/balanced.rs    |   3 +-
 .../src/traits/tokens/fungible/imbalance.rs   |   3 +-
 .../src/traits/tokens/fungibles/balanced.rs   |   3 +-
 .../src/traits/tokens/fungibles/imbalance.rs  |   3 +-
 frame/support/src/traits/tokens/misc.rs       |   4 +-
 frame/support/src/traits/validation.rs        |   3 +-
 frame/support/src/weights.rs                  |  15 +-
 frame/support/test/src/lib.rs                 |   3 +-
 frame/system/src/extensions/check_weight.rs   |   3 +-
 frame/system/src/lib.rs                       |  35 +--
 frame/timestamp/src/lib.rs                    |  30 +--
 frame/tips/src/lib.rs                         |  26 +--
 frame/tips/src/tests.rs                       |   4 +-
 frame/transaction-payment/src/lib.rs          |   4 +-
 frame/transaction-payment/src/types.rs        |  12 +-
 frame/transaction-storage/src/lib.rs          |   9 +-
 frame/treasury/src/lib.rs                     |  21 +-
 frame/uniques/src/lib.rs                      |   3 +-
 frame/utility/src/lib.rs                      |   6 +-
 frame/utility/src/tests.rs                    |   3 +-
 primitives/api/src/lib.rs                     |  76 +++----
 .../fuzzer/src/multiply_by_rational.rs        |   4 +-
 .../fuzzer/src/per_thing_rational.rs          |   4 +-
 primitives/arithmetic/src/helpers_128bit.rs   |   4 +-
 primitives/blockchain/src/backend.rs          |   6 +-
 .../consensus/common/src/block_validation.rs  |   6 +-
 primitives/core/src/crypto.rs                 |  17 +-
 primitives/core/src/lib.rs                    |   3 +-
 primitives/core/src/offchain/mod.rs           |  12 +-
 primitives/core/src/offchain/testing.rs       |   4 +-
 primitives/core/src/sr25519.rs                |   3 +-
 primitives/core/src/traits.rs                 |   8 +-
 primitives/externalities/src/extensions.rs    |   6 +-
 primitives/externalities/src/lib.rs           |   9 +-
 primitives/externalities/src/scope_limited.rs |   6 +-
 primitives/inherents/src/lib.rs               |   4 +-
 primitives/io/src/lib.rs                      |  26 +--
 .../npos-elections/fuzzer/src/compact.rs      |  14 +-
 .../fuzzer/src/phragmen_balancing.rs          |   4 +-
 .../npos-elections/fuzzer/src/phragmen_pjr.rs |  12 +-
 primitives/npos-elections/src/mock.rs         |   3 +-
 primitives/npos-elections/src/phragmms.rs     |   3 +-
 primitives/npos-elections/src/pjr.rs          |  40 ++--
 primitives/npos-elections/src/reduce.rs       |   8 +-
 primitives/panic-handler/src/lib.rs           |   3 +-
 .../runtime-interface/proc-macro/src/lib.rs   |   7 +-
 .../host_function_interface.rs                |   4 +-
 primitives/runtime-interface/src/lib.rs       |  56 ++---
 primitives/runtime-interface/src/pass_by.rs   |  15 +-
 primitives/runtime-interface/src/util.rs      |   4 +-
 primitives/runtime/src/generic/digest.rs      |  11 +-
 primitives/runtime/src/generic/era.rs         |   5 +-
 primitives/runtime/src/lib.rs                 |   8 +-
 primitives/runtime/src/offchain/http.rs       |   3 +-
 primitives/runtime/src/traits.rs              |   8 +-
 .../runtime/src/transaction_validity.rs       |   7 +-
 primitives/sandbox/src/lib.rs                 |  14 +-
 .../state-machine/src/changes_trie/build.rs   |  17 +-
 .../src/changes_trie/build_cache.rs           |   3 +-
 .../src/changes_trie/build_iterator.rs        |  17 +-
 .../src/changes_trie/changes_iterator.rs      |   3 +-
 .../state-machine/src/changes_trie/input.rs   |   6 +-
 .../state-machine/src/changes_trie/mod.rs     |  11 +-
 .../src/changes_trie/surface_iterator.rs      |  16 +-
 primitives/state-machine/src/ext.rs           |   6 +-
 primitives/state-machine/src/lib.rs           |  21 +-
 .../src/overlayed_changes/offchain.rs         |   3 +-
 primitives/timestamp/src/lib.rs               |   4 +-
 primitives/tracing/src/types.rs               |   6 +-
 primitives/trie/src/storage_proof.rs          |   4 +-
 primitives/utils/src/lib.rs                   |   3 +-
 primitives/utils/src/status_sinks.rs          |   4 +-
 .../proc-macro/src/decl_runtime_version.rs    |  11 +-
 primitives/version/src/lib.rs                 |  60 +++---
 primitives/wasm-interface/src/lib.rs          |   3 +-
 rustfmt.toml                                  |   3 +
 test-utils/client/src/lib.rs                  |   5 +-
 test-utils/src/lib.rs                         |   4 +-
 test-utils/test-runner/src/lib.rs             |  10 +-
 utils/fork-tree/src/lib.rs                    |   9 +-
 utils/frame/benchmarking-cli/src/lib.rs       |   4 +-
 utils/frame/benchmarking-cli/src/writer.rs    |   3 +-
 utils/frame/remote-externalities/src/lib.rs   |   3 +-
 utils/frame/try-runtime/cli/src/lib.rs        |   3 +-
 utils/wasm-builder/src/builder.rs             |  11 +-
 utils/wasm-builder/src/lib.rs                 |  57 ++---
 utils/wasm-builder/src/wasm_project.rs        |  11 +-
 258 files changed, 1776 insertions(+), 1447 deletions(-)

diff --git a/bin/node/bench/src/import.rs b/bin/node/bench/src/import.rs
index a4056b49f7f4..5bbf1ddf3b73 100644
--- a/bin/node/bench/src/import.rs
+++ b/bin/node/bench/src/import.rs
@@ -138,7 +138,8 @@ impl core::Benchmark for ImportBenchmark {
 						// should be 5 per signed extrinsic + 1 per unsigned
 						// we have 1 unsigned and the rest are signed in the block
 						// those 5 events per signed are:
-						//    - new account (RawEvent::NewAccount) as we always transfer fund to non-existant account
+						//    - new account (RawEvent::NewAccount) as we always transfer fund to
+						//      non-existant account
 						//    - endowed (RawEvent::Endowed) for this new account
 						//    - successful transfer (RawEvent::Transfer) for this transfer operation
 						//    - deposit event for charging transaction fee
diff --git a/bin/node/cli/src/chain_spec.rs b/bin/node/cli/src/chain_spec.rs
index 5d9e049cc366..bbb2904beab3 100644
--- a/bin/node/cli/src/chain_spec.rs
+++ b/bin/node/cli/src/chain_spec.rs
@@ -78,10 +78,13 @@ fn session_keys(
 }
 
 fn staging_testnet_config_genesis() -> GenesisConfig {
+	#[rustfmt::skip]
 	// stash, controller, session-key
 	// generated with secret:
 	// for i in 1 2 3 4 ; do for j in stash controller; do subkey inspect "$secret"/fir/$j/$i; done; done
+	//
 	// and
+	//
 	// for i in 1 2 3 4 ; do for j in session; do subkey --ed25519 inspect "$secret"//fir//$j//$i; done; done
 
 	let initial_authorities: Vec<(
diff --git a/bin/node/executor/tests/basic.rs b/bin/node/executor/tests/basic.rs
index 062e9f7b5a7b..e9e21e541e75 100644
--- a/bin/node/executor/tests/basic.rs
+++ b/bin/node/executor/tests/basic.rs
@@ -50,7 +50,8 @@ pub fn bloaty_code_unwrap() -> &'static [u8] {
 	)
 }
 
-/// Default transfer fee. This will use the same logic that is implemented in transaction-payment module.
+/// Default transfer fee. This will use the same logic that is implemented in transaction-payment
+/// module.
 ///
 /// Note that reads the multiplier from storage directly, hence to get the fee of `extrinsic`
 /// at block `n`, it must be called prior to executing block `n` to do the calculation with the
@@ -721,7 +722,8 @@ fn native_big_block_import_succeeds() {
 fn native_big_block_import_fails_on_fallback() {
 	let mut t = new_test_ext(compact_code_unwrap(), false);
 
-	// We set the heap pages to 8 because we know that should give an OOM in WASM with the given block.
+	// We set the heap pages to 8 because we know that should give an OOM in WASM with the given
+	// block.
 	set_heap_pages(&mut t.ext(), 8);
 
 	assert!(executor_call::<NeverNativeValue, fn() -> _>(
diff --git a/bin/node/testing/src/bench.rs b/bin/node/testing/src/bench.rs
index 9b49f82c6a12..f6ed2418410e 100644
--- a/bin/node/testing/src/bench.rs
+++ b/bin/node/testing/src/bench.rs
@@ -306,8 +306,8 @@ impl<'a> Iterator for BlockContentIterator<'a> {
 					BlockType::RandomTransfersReaping => {
 						Call::Balances(BalancesCall::transfer(
 							sp_runtime::MultiAddress::Id(receiver),
-							// Transfer so that ending balance would be 1 less than existential deposit
-							// so that we kill the sender account.
+							// Transfer so that ending balance would be 1 less than existential
+							// deposit so that we kill the sender account.
 							100 * DOLLARS - (node_runtime::ExistentialDeposit::get() - 1),
 						))
 					},
diff --git a/client/allocator/src/freeing_bump.rs b/client/allocator/src/freeing_bump.rs
index ef401deed63f..741f4012cdcb 100644
--- a/client/allocator/src/freeing_bump.rs
+++ b/client/allocator/src/freeing_bump.rs
@@ -217,7 +217,7 @@ impl Link {
 /// |            0 | next element link |
 /// +--------------+-------------------+
 /// ```
-///
+/// 
 /// ## Occupied header
 /// ```ignore
 /// 64             32                  0
diff --git a/client/api/src/backend.rs b/client/api/src/backend.rs
index 0fcd85120c89..8b5bd50ffa61 100644
--- a/client/api/src/backend.rs
+++ b/client/api/src/backend.rs
@@ -365,14 +365,16 @@ pub trait StorageProvider<Block: BlockT, B: Backend<Block>> {
 		key: &StorageKey,
 	) -> sp_blockchain::Result<Option<Block::Hash>>;
 
-	/// Given a `BlockId` and a key prefix, return the matching child storage keys and values in that block.
+	/// Given a `BlockId` and a key prefix, return the matching child storage keys and values in
+	/// that block.
 	fn storage_pairs(
 		&self,
 		id: &BlockId<Block>,
 		key_prefix: &StorageKey,
 	) -> sp_blockchain::Result<Vec<(StorageKey, StorageData)>>;
 
-	/// Given a `BlockId` and a key prefix, return a `KeyIterator` iterates matching storage keys in that block.
+	/// Given a `BlockId` and a key prefix, return a `KeyIterator` iterates matching storage keys in
+	/// that block.
 	fn storage_keys_iter<'a>(
 		&self,
 		id: &BlockId<Block>,
@@ -380,7 +382,8 @@ pub trait StorageProvider<Block: BlockT, B: Backend<Block>> {
 		start_key: Option<&StorageKey>,
 	) -> sp_blockchain::Result<KeyIterator<'a, B::State, Block>>;
 
-	/// Given a `BlockId`, a key and a child storage key, return the value under the key in that block.
+	/// Given a `BlockId`, a key and a child storage key, return the value under the key in that
+	/// block.
 	fn child_storage(
 		&self,
 		id: &BlockId<Block>,
@@ -388,7 +391,8 @@ pub trait StorageProvider<Block: BlockT, B: Backend<Block>> {
 		key: &StorageKey,
 	) -> sp_blockchain::Result<Option<StorageData>>;
 
-	/// Given a `BlockId`, a key prefix, and a child storage key, return the matching child storage keys.
+	/// Given a `BlockId`, a key prefix, and a child storage key, return the matching child storage
+	/// keys.
 	fn child_storage_keys(
 		&self,
 		id: &BlockId<Block>,
@@ -406,7 +410,8 @@ pub trait StorageProvider<Block: BlockT, B: Backend<Block>> {
 		start_key: Option<&StorageKey>,
 	) -> sp_blockchain::Result<KeyIterator<'a, B::State, Block>>;
 
-	/// Given a `BlockId`, a key and a child storage key, return the hash under the key in that block.
+	/// Given a `BlockId`, a key and a child storage key, return the hash under the key in that
+	/// block.
 	fn child_storage_hash(
 		&self,
 		id: &BlockId<Block>,
@@ -569,7 +574,8 @@ pub trait PrunableStateChangesTrieStorage<Block: BlockT>:
 	) -> sp_blockchain::Result<ChangesTrieConfigurationRange<NumberFor<Block>, Block::Hash>>;
 	/// Get end block (inclusive) of oldest pruned max-level (or skewed) digest trie blocks range.
 	/// It is guaranteed that we have no any changes tries before (and including) this block.
-	/// It is guaranteed that all existing changes tries after this block are not yet pruned (if created).
+	/// It is guaranteed that all existing changes tries after this block are not yet pruned (if
+	/// created).
 	fn oldest_pruned_digest_range_end(&self) -> NumberFor<Block>;
 }
 
@@ -616,7 +622,8 @@ pub trait ProvideChtRoots<Block: BlockT> {
 		block: NumberFor<Block>,
 	) -> sp_blockchain::Result<Option<Block::Hash>>;
 
-	/// Get changes trie CHT root for given block. Returns None if the block is not a part of any CHT.
+	/// Get changes trie CHT root for given block. Returns None if the block is not a part of any
+	/// CHT.
 	fn changes_trie_cht_root(
 		&self,
 		cht_size: NumberFor<Block>,
diff --git a/client/api/src/cht.rs b/client/api/src/cht.rs
index 50b54a17f8c0..83bc84c6ec9b 100644
--- a/client/api/src/cht.rs
+++ b/client/api/src/cht.rs
@@ -47,7 +47,8 @@ pub fn size<N: From<u32>>() -> N {
 	SIZE.into()
 }
 
-/// Returns Some(cht_number) if CHT is need to be built when the block with given number is canonized.
+/// Returns Some(cht_number) if CHT is need to be built when the block with given number is
+/// canonized.
 pub fn is_build_required<N>(cht_size: N, block_num: N) -> Option<N>
 where
 	N: Clone + AtLeast32Bit,
diff --git a/client/api/src/leaves.rs b/client/api/src/leaves.rs
index db5a25b451c5..80216bc4664b 100644
--- a/client/api/src/leaves.rs
+++ b/client/api/src/leaves.rs
@@ -125,7 +125,8 @@ where
 		displaced
 	}
 
-	/// Note a block height finalized, displacing all leaves with number less than the finalized block's.
+	/// Note a block height finalized, displacing all leaves with number less than the finalized
+	/// block's.
 	///
 	/// Although it would be more technically correct to also prune out leaves at the
 	/// same number as the finalized block, but with different hashes, the current behavior
diff --git a/client/api/src/proof_provider.rs b/client/api/src/proof_provider.rs
index ad0989c74396..79444f006923 100644
--- a/client/api/src/proof_provider.rs
+++ b/client/api/src/proof_provider.rs
@@ -55,11 +55,11 @@ pub trait ProofProvider<Block: BlockT> {
 		id: &BlockId<Block>,
 	) -> sp_blockchain::Result<(Block::Header, StorageProof)>;
 
-	/// Get proof for computation of (block, extrinsic) pairs where key has been changed at given blocks range.
-	/// `min` is the hash of the first block, which changes trie root is known to the requester - when we're using
-	/// changes tries from ascendants of this block, we should provide proofs for changes tries roots
-	/// `max` is the hash of the last block known to the requester - we can't use changes tries from descendants
-	/// of this block.
+	/// Get proof for computation of (block, extrinsic) pairs where key has been changed at given
+	/// blocks range. `min` is the hash of the first block, which changes trie root is known to the
+	/// requester - when we're using changes tries from ascendants of this block, we should provide
+	/// proofs for changes tries roots `max` is the hash of the last block known to the requester -
+	/// we can't use changes tries from descendants of this block.
 	/// Works only for runtimes that are supporting changes tries.
 	fn key_changes_proof(
 		&self,
@@ -72,7 +72,8 @@ pub trait ProofProvider<Block: BlockT> {
 	) -> sp_blockchain::Result<ChangesProof<Block::Header>>;
 
 	/// Given a `BlockId` iterate over all storage values starting at `start_key` exclusively,
-	/// building proofs until size limit is reached. Returns combined proof and the number of collected keys.
+	/// building proofs until size limit is reached. Returns combined proof and the number of
+	/// collected keys.
 	fn read_proof_collection(
 		&self,
 		id: &BlockId<Block>,
diff --git a/client/authority-discovery/src/lib.rs b/client/authority-discovery/src/lib.rs
index 4929ce69917a..800f683aa0ae 100644
--- a/client/authority-discovery/src/lib.rs
+++ b/client/authority-discovery/src/lib.rs
@@ -87,8 +87,8 @@ impl Default for WorkerConfig {
 			max_publish_interval: Duration::from_secs(1 * 60 * 60),
 			keystore_refresh_interval: Duration::from_secs(60),
 			// External addresses of remote authorities can change at any given point in time. The
-			// interval on which to trigger new queries for the current and next authorities is a trade
-			// off between efficiency and performance.
+			// interval on which to trigger new queries for the current and next authorities is a
+			// trade off between efficiency and performance.
 			//
 			// Querying 700 [`AuthorityId`]s takes ~8m on the Kusama DHT (16th Nov 2020) when
 			// comparing `authority_discovery_authority_addresses_requested_total` and
diff --git a/client/authority-discovery/src/worker.rs b/client/authority-discovery/src/worker.rs
index dccaf10d0684..5974bb7afb0a 100644
--- a/client/authority-discovery/src/worker.rs
+++ b/client/authority-discovery/src/worker.rs
@@ -91,7 +91,8 @@ pub enum Role {
 ///
 ///    4. Put addresses and signature as a record with the authority id as a key on a Kademlia DHT.
 ///
-/// When constructed with either [`Role::PublishAndDiscover`] or [`Role::Discover`] a [`Worker`] will
+/// When constructed with either [`Role::PublishAndDiscover`] or [`Role::Discover`] a [`Worker`]
+/// will
 ///
 ///    1. Retrieve the current and next set of authorities.
 ///
diff --git a/client/basic-authorship/src/basic_authorship.rs b/client/basic-authorship/src/basic_authorship.rs
index b60606294890..b9703041ffd9 100644
--- a/client/basic-authorship/src/basic_authorship.rs
+++ b/client/basic-authorship/src/basic_authorship.rs
@@ -68,8 +68,8 @@ pub struct ProposerFactory<A, B, C, PR> {
 	metrics: PrometheusMetrics,
 	/// The default block size limit.
 	///
-	/// If no `block_size_limit` is passed to [`sp_consensus::Proposer::propose`], this block size limit will be
-	/// used.
+	/// If no `block_size_limit` is passed to [`sp_consensus::Proposer::propose`], this block size
+	/// limit will be used.
 	default_block_size_limit: usize,
 	telemetry: Option<TelemetryHandle>,
 	/// When estimating the block size, should the proof be included?
@@ -81,7 +81,8 @@ pub struct ProposerFactory<A, B, C, PR> {
 impl<A, B, C> ProposerFactory<A, B, C, DisableProofRecording> {
 	/// Create a new proposer factory.
 	///
-	/// Proof recording will be disabled when using proposers built by this instance to build blocks.
+	/// Proof recording will be disabled when using proposers built by this instance to build
+	/// blocks.
 	pub fn new(
 		spawn_handle: impl SpawnNamed + 'static,
 		client: Arc<C>,
@@ -140,7 +141,8 @@ impl<A, B, C, PR> ProposerFactory<A, B, C, PR> {
 	/// The default value for the block size limit is:
 	/// [`DEFAULT_BLOCK_SIZE_LIMIT`].
 	///
-	/// If there is no block size limit passed to [`sp_consensus::Proposer::propose`], this value will be used.
+	/// If there is no block size limit passed to [`sp_consensus::Proposer::propose`], this value
+	/// will be used.
 	pub fn set_default_block_size_limit(&mut self, limit: usize) {
 		self.default_block_size_limit = limit;
 	}
diff --git a/client/cli/src/commands/utils.rs b/client/cli/src/commands/utils.rs
index fa783f7a95a5..6148f17e7f17 100644
--- a/client/cli/src/commands/utils.rs
+++ b/client/cli/src/commands/utils.rs
@@ -55,7 +55,8 @@ pub fn read_uri(uri: Option<&String>) -> error::Result<String> {
 ///
 /// 1. Try to construct the `Pair` while using `uri` as input for [`sp_core::Pair::from_phrase`].
 ///
-/// 2. Try to construct the `Pair` while using `uri` as input for [`sp_core::Pair::from_string_with_seed`].
+/// 2. Try to construct the `Pair` while using `uri` as input for
+/// [`sp_core::Pair::from_string_with_seed`].
 ///
 /// 3. Try to construct the `Pair::Public` while using `uri` as input for
 ///    [`sp_core::crypto::Ss58Codec::from_string_with_version`].
diff --git a/client/cli/src/lib.rs b/client/cli/src/lib.rs
index 0d5051bc113e..b560594f77c8 100644
--- a/client/cli/src/lib.rs
+++ b/client/cli/src/lib.rs
@@ -92,8 +92,9 @@ pub trait SubstrateCli: Sized {
 	fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn ChainSpec>, String>;
 
 	/// Helper function used to parse the command line arguments. This is the equivalent of
-	/// `structopt`'s `from_iter()` except that it takes a `VersionInfo` argument to provide the name of
-	/// the application, author, "about" and version. It will also set `AppSettings::GlobalVersion`.
+	/// `structopt`'s `from_iter()` except that it takes a `VersionInfo` argument to provide the
+	/// name of the application, author, "about" and version. It will also set
+	/// `AppSettings::GlobalVersion`.
 	///
 	/// To allow running the node without subcommand, tt also sets a few more settings:
 	/// `AppSettings::ArgsNegateSubcommands` and `AppSettings::SubcommandsNegateReqs`.
@@ -108,8 +109,9 @@ pub trait SubstrateCli: Sized {
 	}
 
 	/// Helper function used to parse the command line arguments. This is the equivalent of
-	/// `structopt`'s `from_iter()` except that it takes a `VersionInfo` argument to provide the name of
-	/// the application, author, "about" and version. It will also set `AppSettings::GlobalVersion`.
+	/// `structopt`'s `from_iter()` except that it takes a `VersionInfo` argument to provide the
+	/// name of the application, author, "about" and version. It will also set
+	/// `AppSettings::GlobalVersion`.
 	///
 	/// To allow running the node without subcommand, it also sets a few more settings:
 	/// `AppSettings::ArgsNegateSubcommands` and `AppSettings::SubcommandsNegateReqs`.
@@ -166,8 +168,9 @@ pub trait SubstrateCli: Sized {
 	}
 
 	/// Helper function used to parse the command line arguments. This is the equivalent of
-	/// `structopt`'s `from_iter()` except that it takes a `VersionInfo` argument to provide the name of
-	/// the application, author, "about" and version. It will also set `AppSettings::GlobalVersion`.
+	/// `structopt`'s `from_iter()` except that it takes a `VersionInfo` argument to provide the
+	/// name of the application, author, "about" and version. It will also set
+	/// `AppSettings::GlobalVersion`.
 	///
 	/// To allow running the node without subcommand, it also sets a few more settings:
 	/// `AppSettings::ArgsNegateSubcommands` and `AppSettings::SubcommandsNegateReqs`.
diff --git a/client/cli/src/params/import_params.rs b/client/cli/src/params/import_params.rs
index 9248e210eb66..3c87e91c220f 100644
--- a/client/cli/src/params/import_params.rs
+++ b/client/cli/src/params/import_params.rs
@@ -167,7 +167,8 @@ pub struct ExecutionStrategiesParams {
 	)]
 	pub execution_offchain_worker: Option<ExecutionStrategy>,
 
-	/// The means of execution used when calling into the runtime while not syncing, importing or constructing blocks.
+	/// The means of execution used when calling into the runtime while not syncing, importing or
+	/// constructing blocks.
 	#[structopt(
 		long = "execution-other",
 		value_name = "STRATEGY",
diff --git a/client/cli/src/params/mod.rs b/client/cli/src/params/mod.rs
index 6e55f607aed5..dac832a1f897 100644
--- a/client/cli/src/params/mod.rs
+++ b/client/cli/src/params/mod.rs
@@ -40,7 +40,8 @@ pub use crate::params::{
 	transaction_pool_params::*,
 };
 
-/// Wrapper type of `String` that holds an unsigned integer of arbitrary size, formatted as a decimal.
+/// Wrapper type of `String` that holds an unsigned integer of arbitrary size, formatted as a
+/// decimal.
 #[derive(Debug, Clone)]
 pub struct GenericNumber(String);
 
diff --git a/client/cli/src/params/network_params.rs b/client/cli/src/params/network_params.rs
index dd2e09e4a8c3..676873cfab14 100644
--- a/client/cli/src/params/network_params.rs
+++ b/client/cli/src/params/network_params.rs
@@ -110,13 +110,13 @@ pub struct NetworkParams {
 
 	/// Enable peer discovery on local networks.
 	///
-	/// By default this option is `true` for `--dev` or when the chain type is `Local`/`Development`
-	/// and false otherwise.
+	/// By default this option is `true` for `--dev` or when the chain type is
+	/// `Local`/`Development` and false otherwise.
 	#[structopt(long)]
 	pub discover_local: bool,
 
-	/// Require iterative Kademlia DHT queries to use disjoint paths for increased resiliency in the
-	/// presence of potentially adversarial nodes.
+	/// Require iterative Kademlia DHT queries to use disjoint paths for increased resiliency in
+	/// the presence of potentially adversarial nodes.
 	///
 	/// See the S/Kademlia paper for more information on the high level design as well as its
 	/// security improvements.
diff --git a/client/cli/src/params/node_key_params.rs b/client/cli/src/params/node_key_params.rs
index bc5606752a88..41f9033d282d 100644
--- a/client/cli/src/params/node_key_params.rs
+++ b/client/cli/src/params/node_key_params.rs
@@ -53,17 +53,16 @@ pub struct NodeKeyParams {
 	///
 	/// The secret key of the node is obtained as follows:
 	///
-	///   * If the `--node-key` option is given, the value is parsed as a secret key
-	///     according to the type. See the documentation for `--node-key`.
+	///   * If the `--node-key` option is given, the value is parsed as a secret key according to
+	///     the type. See the documentation for `--node-key`.
 	///
-	///   * If the `--node-key-file` option is given, the secret key is read from the
-	///     specified file. See the documentation for `--node-key-file`.
+	///   * If the `--node-key-file` option is given, the secret key is read from the specified
+	///     file. See the documentation for `--node-key-file`.
 	///
-	///   * Otherwise, the secret key is read from a file with a predetermined,
-	///     type-specific name from the chain-specific network config directory
-	///     inside the base directory specified by `--base-dir`. If this file does
-	///     not exist, it is created with a newly generated secret key of the
-	///     chosen type.
+	///   * Otherwise, the secret key is read from a file with a predetermined, type-specific name
+	///     from the chain-specific network config directory inside the base directory specified by
+	///     `--base-dir`. If this file does not exist, it is created with a newly generated secret
+	///     key of the chosen type.
 	///
 	/// The node's secret key determines the corresponding public key and hence the
 	/// node's peer ID in the context of libp2p.
diff --git a/client/cli/src/params/shared_params.rs b/client/cli/src/params/shared_params.rs
index 5ded5846e34c..41472387d263 100644
--- a/client/cli/src/params/shared_params.rs
+++ b/client/cli/src/params/shared_params.rs
@@ -26,8 +26,8 @@ use structopt::StructOpt;
 pub struct SharedParams {
 	/// Specify the chain specification.
 	///
-	/// It can be one of the predefined ones (dev, local, or staging) or it can be a path to a file with
-	/// the chainspec (such as one exported by the `build-spec` subcommand).
+	/// It can be one of the predefined ones (dev, local, or staging) or it can be a path to a file
+	/// with the chainspec (such as one exported by the `build-spec` subcommand).
 	#[structopt(long, value_name = "CHAIN_SPEC")]
 	pub chain: Option<String>,
 
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index d9c089b9561e..d038db97cb47 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -143,8 +143,8 @@ pub struct StartAuraParams<C, SC, I, PF, SO, L, CIDP, BS, CAW> {
 	/// The proportion of the slot dedicated to proposing.
 	///
 	/// The block proposing will be limited to this proportion of the slot from the starting of the
-	/// slot. However, the proposing can still take longer when there is some lenience factor applied,
-	/// because there were no blocks produced for some slots.
+	/// slot. However, the proposing can still take longer when there is some lenience factor
+	/// applied, because there were no blocks produced for some slots.
 	pub block_proposal_slot_portion: SlotProportion,
 	/// The maximum proportion of the slot dedicated to proposing with any lenience factor applied
 	/// due to no blocks being produced.
@@ -237,8 +237,8 @@ pub struct BuildAuraWorkerParams<C, I, PF, SO, L, BS> {
 	/// The proportion of the slot dedicated to proposing.
 	///
 	/// The block proposing will be limited to this proportion of the slot from the starting of the
-	/// slot. However, the proposing can still take longer when there is some lenience factor applied,
-	/// because there were no blocks produced for some slots.
+	/// slot. However, the proposing can still take longer when there is some lenience factor
+	/// applied, because there were no blocks produced for some slots.
 	pub block_proposal_slot_portion: SlotProportion,
 	/// The maximum proportion of the slot dedicated to proposing with any lenience factor applied
 	/// due to no blocks being produced.
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index d5caf36542ee..21fba61866c9 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -430,8 +430,8 @@ pub struct BabeParams<B: BlockT, C, SC, E, I, SO, L, CIDP, BS, CAW> {
 	/// The proportion of the slot dedicated to proposing.
 	///
 	/// The block proposing will be limited to this proportion of the slot from the starting of the
-	/// slot. However, the proposing can still take longer when there is some lenience factor applied,
-	/// because there were no blocks produced for some slots.
+	/// slot. However, the proposing can still take longer when there is some lenience factor
+	/// applied, because there were no blocks produced for some slots.
 	pub block_proposal_slot_portion: SlotProportion,
 
 	/// The maximum proportion of the slot dedicated to proposing with any lenience factor applied
diff --git a/client/consensus/common/src/block_import.rs b/client/consensus/common/src/block_import.rs
index 83fb11834dae..d16d71aec926 100644
--- a/client/consensus/common/src/block_import.rs
+++ b/client/consensus/common/src/block_import.rs
@@ -250,8 +250,8 @@ impl<Block: BlockT, Transaction> BlockImportParams<Block, Transaction> {
 
 	/// Auxiliary function for "converting" the transaction type.
 	///
-	/// Actually this just sets `StorageChanges::Changes` to `None` and makes rustc think that `Self` now
-	/// uses a different transaction type.
+	/// Actually this just sets `StorageChanges::Changes` to `None` and makes rustc think that
+	/// `Self` now uses a different transaction type.
 	pub fn clear_storage_changes_and_mutate<Transaction2>(
 		self,
 	) -> BlockImportParams<Block, Transaction2> {
diff --git a/client/consensus/common/src/shared_data.rs b/client/consensus/common/src/shared_data.rs
index e1797bc6f517..7a25660e08aa 100644
--- a/client/consensus/common/src/shared_data.rs
+++ b/client/consensus/common/src/shared_data.rs
@@ -54,10 +54,11 @@ impl<T> Drop for SharedDataLockedUpgradable<T> {
 /// Created by [`SharedData::shared_data_locked`].
 ///
 /// As long as this object isn't dropped, the shared data is held in a mutex guard and the shared
-/// data is tagged as locked. Access to the shared data is provided through [`Deref`](std::ops::Deref) and
-/// [`DerefMut`](std::ops::DerefMut). The trick is to use [`Self::release_mutex`] to release the mutex, but still keep
-/// the shared data locked. This means every other thread trying to access the shared data in this
-/// time will need to wait until this lock is freed.
+/// data is tagged as locked. Access to the shared data is provided through
+/// [`Deref`](std::ops::Deref) and [`DerefMut`](std::ops::DerefMut). The trick is to use
+/// [`Self::release_mutex`] to release the mutex, but still keep the shared data locked. This means
+/// every other thread trying to access the shared data in this time will need to wait until this
+/// lock is freed.
 ///
 /// If this object is dropped without calling [`Self::release_mutex`], the lock will be dropped
 /// immediately.
@@ -210,8 +211,8 @@ impl<T> SharedData<T> {
 	///
 	/// This will give mutable access to the shared data. The returned [`SharedDataLocked`]
 	/// provides the function [`SharedDataLocked::release_mutex`] to release the mutex, but
-	/// keeping the data locked. This is useful in async contexts for example where the data needs to
-	/// be locked, but a mutex guard can not be held.
+	/// keeping the data locked. This is useful in async contexts for example where the data needs
+	/// to be locked, but a mutex guard can not be held.
 	///
 	/// For an example see [`SharedData`].
 	pub fn shared_data_locked(&self) -> SharedDataLocked<T> {
diff --git a/client/consensus/epochs/src/lib.rs b/client/consensus/epochs/src/lib.rs
index 52327dbbf60e..685a5c26d0db 100644
--- a/client/consensus/epochs/src/lib.rs
+++ b/client/consensus/epochs/src/lib.rs
@@ -615,7 +615,8 @@ where
 		&self.inner
 	}
 
-	/// Reset to a specified pair of epochs, as if they were announced at blocks `parent_hash` and `hash`.
+	/// Reset to a specified pair of epochs, as if they were announced at blocks `parent_hash` and
+	/// `hash`.
 	pub fn reset(&mut self, parent_hash: Hash, hash: Hash, number: Number, current: E, next: E) {
 		self.inner = ForkTree::new();
 		self.epochs.clear();
diff --git a/client/consensus/manual-seal/src/consensus/babe.rs b/client/consensus/manual-seal/src/consensus/babe.rs
index d18170e9a0d6..1d3afe392d62 100644
--- a/client/consensus/manual-seal/src/consensus/babe.rs
+++ b/client/consensus/manual-seal/src/consensus/babe.rs
@@ -209,8 +209,9 @@ where
 		{
 			vec![<DigestItemFor<B> as CompatibleDigestItem>::babe_pre_digest(predigest)]
 		} else {
-			// well we couldn't claim a slot because this is an existing chain and we're not in the authorities.
-			// we need to tell BabeBlockImport that the epoch has changed, and we put ourselves in the authorities.
+			// well we couldn't claim a slot because this is an existing chain and we're not in the
+			// authorities. we need to tell BabeBlockImport that the epoch has changed, and we put
+			// ourselves in the authorities.
 			let predigest =
 				PreDigest::SecondaryPlain(SecondaryPlainPreDigest { slot, authority_index: 0_u32 });
 
diff --git a/client/consensus/manual-seal/src/lib.rs b/client/consensus/manual-seal/src/lib.rs
index 4f23bdcf6592..f6994e452024 100644
--- a/client/consensus/manual-seal/src/lib.rs
+++ b/client/consensus/manual-seal/src/lib.rs
@@ -94,8 +94,8 @@ pub struct ManualSealParams<B: BlockT, BI, E, C: ProvideRuntimeApi<B>, TP, SC, C
 	/// Shared reference to the transaction pool.
 	pub pool: Arc<TP>,
 
-	/// Stream<Item = EngineCommands>, Basically the receiving end of a channel for sending commands to
-	/// the authorship task.
+	/// Stream<Item = EngineCommands>, Basically the receiving end of a channel for sending
+	/// commands to the authorship task.
 	pub commands_stream: CS,
 
 	/// SelectChain strategy.
@@ -281,7 +281,8 @@ mod tests {
 			0,
 		));
 		let env = ProposerFactory::new(spawner.clone(), client.clone(), pool.clone(), None, None);
-		// this test checks that blocks are created as soon as transactions are imported into the pool.
+		// this test checks that blocks are created as soon as transactions are imported into the
+		// pool.
 		let (sender, receiver) = futures::channel::oneshot::channel();
 		let mut sender = Arc::new(Some(sender));
 		let commands_stream =
@@ -350,7 +351,8 @@ mod tests {
 			0,
 		));
 		let env = ProposerFactory::new(spawner.clone(), client.clone(), pool.clone(), None, None);
-		// this test checks that blocks are created as soon as an engine command is sent over the stream.
+		// this test checks that blocks are created as soon as an engine command is sent over the
+		// stream.
 		let (mut sink, commands_stream) = futures::channel::mpsc::channel(1024);
 		let future = run_manual_seal(ManualSealParams {
 			block_import: client.clone(),
@@ -427,7 +429,8 @@ mod tests {
 			0,
 		));
 		let env = ProposerFactory::new(spawner.clone(), client.clone(), pool.clone(), None, None);
-		// this test checks that blocks are created as soon as an engine command is sent over the stream.
+		// this test checks that blocks are created as soon as an engine command is sent over the
+		// stream.
 		let (mut sink, commands_stream) = futures::channel::mpsc::channel(1024);
 		let future = run_manual_seal(ManualSealParams {
 			block_import: client.clone(),
diff --git a/client/consensus/pow/src/lib.rs b/client/consensus/pow/src/lib.rs
index c2305180ca89..1b8a62256689 100644
--- a/client/consensus/pow/src/lib.rs
+++ b/client/consensus/pow/src/lib.rs
@@ -591,8 +591,8 @@ where
 				return
 			}
 
-			// The worker is locked for the duration of the whole proposing period. Within this period,
-			// the mining target is outdated and useless anyway.
+			// The worker is locked for the duration of the whole proposing period. Within this
+			// period, the mining target is outdated and useless anyway.
 
 			let difficulty = match algorithm.difficulty(best_hash) {
 				Ok(x) => x,
diff --git a/client/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs
index 1aa8d984d3fa..da04b98ccee9 100644
--- a/client/consensus/slots/src/lib.rs
+++ b/client/consensus/slots/src/lib.rs
@@ -428,7 +428,8 @@ impl<B: BlockT, T: SimpleSlotWorker<B> + Send> SlotWorker<B, <T::Proposer as Pro
 
 /// Slot specific extension that the inherent data provider needs to implement.
 pub trait InherentDataProviderExt {
-	/// The current timestamp that will be found in the [`InherentData`](`sp_inherents::InherentData`).
+	/// The current timestamp that will be found in the
+	/// [`InherentData`](`sp_inherents::InherentData`).
 	fn timestamp(&self) -> Timestamp;
 
 	/// The current slot that will be found in the [`InherentData`](`sp_inherents::InherentData`).
@@ -1059,7 +1060,8 @@ mod test {
 			})
 			.collect();
 
-		// Should always be true after a short while, since the chain is advancing but finality is stalled
+		// Should always be true after a short while, since the chain is advancing but finality is
+		// stalled
 		let expected: Vec<bool> = (slot_now..300).map(|s| s > 8).collect();
 		assert_eq!(should_backoff, expected);
 	}
diff --git a/client/db/src/cache/list_cache.rs b/client/db/src/cache/list_cache.rs
index 1808d431dd05..795cb8f90118 100644
--- a/client/db/src/cache/list_cache.rs
+++ b/client/db/src/cache/list_cache.rs
@@ -178,8 +178,8 @@ impl<Block: BlockT, T: CacheItemT, S: Storage<Block, T>> ListCache<Block, T, S>
 		} else {
 			// there are unfinalized entries
 			// => find the fork containing given block and read from this fork
-			// IF there's no matching fork, ensure that this isn't a block from a fork that has forked
-			// behind the best finalized block and search at finalized fork
+			// IF there's no matching fork, ensure that this isn't a block from a fork that has
+			// forked behind the best finalized block and search at finalized fork
 
 			match self.find_unfinalized_fork(&at)? {
 				Some(fork) => Some(&fork.head),
@@ -316,7 +316,8 @@ impl<Block: BlockT, T: CacheItemT, S: Storage<Block, T>> ListCache<Block, T, S>
 			return Ok(None)
 		}
 
-		// if the block is not final, it is possibly appended to/forking from existing unfinalized fork
+		// if the block is not final, it is possibly appended to/forking from existing unfinalized
+		// fork
 		let is_final = entry_type == EntryType::Final || entry_type == EntryType::Genesis;
 		if !is_final {
 			let mut fork_and_action = None;
@@ -392,9 +393,10 @@ impl<Block: BlockT, T: CacheItemT, S: Storage<Block, T>> ListCache<Block, T, S>
 		}
 
 		// if we're here, then one of following is true:
-		// - either we're inserting final block => all ancestors are already finalized AND the only thing we can do
-		//   is to try to update last finalized entry
-		// - either we're inserting non-final blocks that has no ancestors in any known unfinalized forks
+		// - either we're inserting final block => all ancestors are already finalized AND the only
+		//   thing we can do is to try to update last finalized entry
+		// - either we're inserting non-final blocks that has no ancestors in any known unfinalized
+		//   forks
 
 		let new_storage_entry = match self.best_finalized_entry.as_ref() {
 			Some(best_finalized_entry) => best_finalized_entry.try_update(value),
@@ -1015,8 +1017,8 @@ mod tests {
 		.value_at_block(&ComplexBlockId::new(H256::from_low_u64_be(2), 100))
 		.is_err());
 
-		// when block is later than last finalized block AND there are no forks AND finalized value is Some
-		// ---> [100] --- 200
+		// when block is later than last finalized block AND there are no forks AND finalized value
+		// is Some ---> [100] --- 200
 		assert_eq!(
 			ListCache::new(
 				DummyStorage::new()
@@ -1088,8 +1090,8 @@ mod tests {
 			None
 		);
 
-		// when block is later than last finalized block AND it appends to unfinalized fork from the end
-		// AND unfinalized value is Some
+		// when block is later than last finalized block AND it appends to unfinalized fork from the
+		// end AND unfinalized value is Some
 		// ---> [2] ---> [4] ---> 5
 		assert_eq!(
 			ListCache::new(
@@ -1170,8 +1172,8 @@ mod tests {
 			.unwrap()
 			.is_none());
 
-		// when trying to insert non-final block AND it appends to the best block of unfinalized fork
-		// AND new value is the same as in the fork' best block
+		// when trying to insert non-final block AND it appends to the best block of unfinalized
+		// fork AND new value is the same as in the fork' best block
 		let mut cache = ListCache::new(
 			DummyStorage::new()
 				.with_meta(None, vec![test_id(4)])
@@ -1198,8 +1200,8 @@ mod tests {
 		assert!(tx.inserted_entries().is_empty());
 		assert!(tx.removed_entries().is_empty());
 		assert!(tx.updated_meta().is_none());
-		// when trying to insert non-final block AND it appends to the best block of unfinalized fork
-		// AND new value is the same as in the fork' best block
+		// when trying to insert non-final block AND it appends to the best block of unfinalized
+		// fork AND new value is the same as in the fork' best block
 		let mut tx = DummyTransaction::new();
 		assert_eq!(
 			cache
@@ -1221,8 +1223,8 @@ mod tests {
 			Some(Metadata { finalized: None, unfinalized: vec![test_id(5)] })
 		);
 
-		// when trying to insert non-final block AND it is the first block that appends to the best block of unfinalized fork
-		// AND new value is the same as in the fork' best block
+		// when trying to insert non-final block AND it is the first block that appends to the best
+		// block of unfinalized fork AND new value is the same as in the fork' best block
 		let cache = ListCache::new(
 			DummyStorage::new()
 				.with_meta(None, vec![correct_id(4)])
@@ -1249,8 +1251,8 @@ mod tests {
 		assert!(tx.inserted_entries().is_empty());
 		assert!(tx.removed_entries().is_empty());
 		assert!(tx.updated_meta().is_none());
-		// when trying to insert non-final block AND it is the first block that appends to the best block of unfinalized fork
-		// AND new value is the same as in the fork' best block
+		// when trying to insert non-final block AND it is the first block that appends to the best
+		// block of unfinalized fork AND new value is the same as in the fork' best block
 		let mut tx = DummyTransaction::new();
 		assert_eq!(
 			cache
@@ -2204,7 +2206,8 @@ mod tests {
 			cache.prune_finalized_entries(&mut tx, &test_id(20));
 			assert!(tx.removed_entries().is_empty());
 			assert!(tx.inserted_entries().is_empty());
-			// when finalizing entry #30: entry 10 pruned + entry 20 is truncated (if pruning is enabled)
+			// when finalizing entry #30: entry 10 pruned + entry 20 is truncated (if pruning is
+			// enabled)
 			cache.prune_finalized_entries(&mut tx, &test_id(30));
 			match strategy {
 				PruningStrategy::NeverPrune => {
diff --git a/client/db/src/changes_tries_storage.rs b/client/db/src/changes_tries_storage.rs
index c0649853160f..3a3c5918535f 100644
--- a/client/db/src/changes_tries_storage.rs
+++ b/client/db/src/changes_tries_storage.rs
@@ -59,8 +59,8 @@ pub fn extract_new_configuration<Header: HeaderT>(
 		.and_then(ChangesTrieSignal::as_new_configuration)
 }
 
-/// Opaque configuration cache transaction. During its lifetime, no-one should modify cache. This is currently
-/// guaranteed because import lock is held during block import/finalization.
+/// Opaque configuration cache transaction. During its lifetime, no-one should modify cache. This is
+/// currently guaranteed because import lock is held during block import/finalization.
 pub struct DbChangesTrieStorageTransaction<Block: BlockT> {
 	/// Cache operations that must be performed after db transaction is committed.
 	cache_ops: DbCacheTransactionOps<Block>,
@@ -110,12 +110,13 @@ struct ChangesTriesMeta<Block: BlockT> {
 	/// The range is inclusive from both sides.
 	/// Is None only if:
 	/// 1) we haven't yet finalized any blocks (except genesis)
-	/// 2) if best_finalized_block - min_blocks_to_keep points to the range where changes tries are disabled
-	/// 3) changes tries pruning is disabled
+	/// 2) if best_finalized_block - min_blocks_to_keep points to the range where changes tries are
+	/// disabled 3) changes tries pruning is disabled
 	pub oldest_digest_range: Option<(NumberFor<Block>, NumberFor<Block>)>,
 	/// End block (inclusive) of oldest pruned max-level (or skewed) digest trie blocks range.
 	/// It is guaranteed that we have no any changes tries before (and including) this block.
-	/// It is guaranteed that all existing changes tries after this block are not yet pruned (if created).
+	/// It is guaranteed that all existing changes tries after this block are not yet pruned (if
+	/// created).
 	pub oldest_pruned_digest_range_end: NumberFor<Block>,
 }
 
@@ -1131,8 +1132,8 @@ mod tests {
 			vec![3, 3],
 		);
 
-		// after truncating block2_1 && block2_2 - there are still two unfinalized forks (cache impl specifics),
-		// the 1st one points to the block #3 because it isn't truncated
+		// after truncating block2_1 && block2_2 - there are still two unfinalized forks (cache impl
+		// specifics), the 1st one points to the block #3 because it isn't truncated
 		backend.revert(1, false).unwrap();
 		assert_eq!(
 			backend
diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index b909b52610a8..9f1dd4c0ec07 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -1067,8 +1067,8 @@ impl<T: Clone> FrozenForDuration<T> {
 
 /// Disk backend.
 ///
-/// Disk backend keeps data in a key-value store. In archive mode, trie nodes are kept from all blocks.
-/// Otherwise, trie nodes are kept only from some recent blocks.
+/// Disk backend keeps data in a key-value store. In archive mode, trie nodes are kept from all
+/// blocks. Otherwise, trie nodes are kept only from some recent blocks.
 pub struct Backend<Block: BlockT> {
 	storage: Arc<StorageDb<Block>>,
 	offchain_storage: offchain::LocalStorage,
@@ -1459,8 +1459,9 @@ impl<Block: BlockT> Backend<Block> {
 				if operation.commit_state {
 					transaction.set_from_vec(columns::META, meta_keys::FINALIZED_STATE, lookup_key);
 				} else {
-					// When we don't want to commit the genesis state, we still preserve it in memory
-					// to bootstrap consensus. It is queried for an initial list of authorities, etc.
+					// When we don't want to commit the genesis state, we still preserve it in
+					// memory to bootstrap consensus. It is queried for an initial list of
+					// authorities, etc.
 					*self.genesis_state.write() = Some(Arc::new(DbGenesisStorage::new(
 						pending_block.header.state_root().clone(),
 						operation.db_updates.clone(),
@@ -3403,7 +3404,8 @@ pub(crate) mod tests {
 		let block5 = insert_header(&backend, 5, block4, None, Default::default());
 		assert_eq!(backend.blockchain().info().best_hash, block5);
 
-		// Insert 1 as best again. This should fail because canonicalization_delay == 3 and best == 5
+		// Insert 1 as best again. This should fail because canonicalization_delay == 3 and best ==
+		// 5
 		let header = Header {
 			number: 1,
 			parent_hash: block0,
diff --git a/client/db/src/light.rs b/client/db/src/light.rs
index 0ad8224f0261..d56188b70fcb 100644
--- a/client/db/src/light.rs
+++ b/client/db/src/light.rs
@@ -829,8 +829,8 @@ pub(crate) mod tests {
 			assert_eq!(raw_db.count(columns::HEADER), 1 + ucht_size + ucht_size);
 			assert_eq!(raw_db.count(columns::CHT), 0);
 
-			// insert block #{2 * cht::size() + 1} && check that new CHT is created + headers of this CHT are pruned
-			// nothing is yet finalized, so nothing is pruned.
+			// insert block #{2 * cht::size() + 1} && check that new CHT is created + headers of
+			// this CHT are pruned nothing is yet finalized, so nothing is pruned.
 			prev_hash = insert_block(&db, HashMap::new(), || {
 				header_producer(&prev_hash, 1 + cht_size + cht_size)
 			});
diff --git a/client/db/src/storage_cache.rs b/client/db/src/storage_cache.rs
index d5aa43e8bac9..3193d3479619 100644
--- a/client/db/src/storage_cache.rs
+++ b/client/db/src/storage_cache.rs
@@ -366,8 +366,8 @@ impl<B: BlockT> CacheChanges<B> {
 		}
 		cache.sync(&enacted, &retracted);
 		// Propagate cache only if committing on top of the latest canonical state
-		// blocks are ordered by number and only one block with a given number is marked as canonical
-		// (contributed to canonical state cache)
+		// blocks are ordered by number and only one block with a given number is marked as
+		// canonical (contributed to canonical state cache)
 		if let Some(_) = self.parent_hash {
 			let mut local_cache = self.local_cache.write();
 			if is_best {
@@ -463,8 +463,8 @@ impl<S: StateBackend<HashFor<B>>, B: BlockT> CachingState<S, B> {
 		}
 	}
 
-	/// Check if the key can be returned from cache by matching current block parent hash against canonical
-	/// state and filtering out entries modified in later blocks.
+	/// Check if the key can be returned from cache by matching current block parent hash against
+	/// canonical state and filtering out entries modified in later blocks.
 	fn is_allowed(
 		key: Option<&[u8]>,
 		child_key: Option<&ChildStorageKey>,
diff --git a/client/db/src/utils.rs b/client/db/src/utils.rs
index 95cf698c2436..48aaf6694816 100644
--- a/client/db/src/utils.rs
+++ b/client/db/src/utils.rs
@@ -306,7 +306,8 @@ fn open_kvdb_rocksdb<Block: BlockT>(
 ) -> OpenDbResult {
 	// first upgrade database to required version
 	match crate::upgrade::upgrade_db::<Block>(&path, db_type) {
-		// in case of missing version file, assume that database simply does not exist at given location
+		// in case of missing version file, assume that database simply does not exist at given
+		// location
 		Ok(_) | Err(crate::upgrade::UpgradeError::MissingDatabaseVersionFile) => (),
 		Err(err) => return Err(io::Error::new(io::ErrorKind::Other, err.to_string()).into()),
 	}
diff --git a/client/executor/common/src/runtime_blob/mod.rs b/client/executor/common/src/runtime_blob/mod.rs
index 43d6e5e7a0df..1af2708d3eb4 100644
--- a/client/executor/common/src/runtime_blob/mod.rs
+++ b/client/executor/common/src/runtime_blob/mod.rs
@@ -26,27 +26,28 @@
 //!
 //! To give you some examples:
 //!
-//! - wasmi allows reaching to non-exported mutable globals so that we could reset them.
-//!   Wasmtime doesn’t support that.
+//! - wasmi allows reaching to non-exported mutable globals so that we could reset them. Wasmtime
+//!   doesn’t support that.
 //!
 //!   We need to reset the globals because when we
 //!   execute the Substrate Runtime, we do not drop and create the instance anew, instead
 //!   we restore some selected parts of the state.
 //!
-//! - stack depth metering can be performed via instrumentation or deferred to the engine and say
-//!   be added directly in machine code. Implementing this in machine code is rather cumbersome so
+//! - stack depth metering can be performed via instrumentation or deferred to the engine and say be
+//!   added directly in machine code. Implementing this in machine code is rather cumbersome so
 //!   instrumentation looks like a good solution.
 //!
 //!   Stack depth metering is needed to make a wasm blob
-//!   execution deterministic, which in turn is needed by the Parachain Validation Function in Polkadot.
+//!   execution deterministic, which in turn is needed by the Parachain Validation Function in
+//! Polkadot.
 //!
 //! ## Inspection
 //!
 //! Inspection of a wasm module may be needed to extract some useful information, such as to extract
 //! data segment snapshot, which is helpful for quickly restoring the initial state of instances.
 //! Inspection can be also useful to prove that a wasm module possesses some properties, such as,
-//! is free of any floating point operations, which is a useful step towards making instances produced
-//! from such a module deterministic.
+//! is free of any floating point operations, which is a useful step towards making instances
+//! produced from such a module deterministic.
 
 mod data_segments_snapshot;
 mod globals_snapshot;
diff --git a/client/executor/common/src/runtime_blob/runtime_blob.rs b/client/executor/common/src/runtime_blob/runtime_blob.rs
index b7f71193449c..6fb9303e0775 100644
--- a/client/executor/common/src/runtime_blob/runtime_blob.rs
+++ b/client/executor/common/src/runtime_blob/runtime_blob.rs
@@ -72,11 +72,13 @@ impl RuntimeBlob {
 		export_mutable_globals(&mut self.raw_module, "exported_internal_global");
 	}
 
-	/// Run a pass that instrument this module so as to introduce a deterministic stack height limit.
+	/// Run a pass that instrument this module so as to introduce a deterministic stack height
+	/// limit.
 	///
 	/// It will introduce a global mutable counter. The instrumentation will increase the counter
 	/// according to the "cost" of the callee. If the cost exceeds the `stack_depth_limit` constant,
-	/// the instrumentation will trap. The counter will be decreased as soon as the the callee returns.
+	/// the instrumentation will trap. The counter will be decreased as soon as the the callee
+	/// returns.
 	///
 	/// The stack cost of a function is computed based on how much locals there are and the maximum
 	/// depth of the wasm operand stack.
@@ -89,7 +91,8 @@ impl RuntimeBlob {
 		Ok(Self { raw_module: injected_module })
 	}
 
-	/// Perform an instrumentation that makes sure that a specific function `entry_point` is exported
+	/// Perform an instrumentation that makes sure that a specific function `entry_point` is
+	/// exported
 	pub fn entry_point_exists(&self, entry_point: &str) -> bool {
 		self.raw_module
 			.export_section()
diff --git a/client/executor/common/src/wasm_runtime.rs b/client/executor/common/src/wasm_runtime.rs
index 12ff92a2c607..eb73909d9234 100644
--- a/client/executor/common/src/wasm_runtime.rs
+++ b/client/executor/common/src/wasm_runtime.rs
@@ -98,7 +98,8 @@ pub trait WasmInstance: Send {
 	///
 	/// This is meant to be the starting address of the memory mapped area for the linear memory.
 	///
-	/// This function is intended only for a specific test that measures physical memory consumption.
+	/// This function is intended only for a specific test that measures physical memory
+	/// consumption.
 	fn linear_memory_base_ptr(&self) -> Option<*const u8> {
 		None
 	}
diff --git a/client/executor/src/native_executor.rs b/client/executor/src/native_executor.rs
index 51b9a404bbcc..9faa64521880 100644
--- a/client/executor/src/native_executor.rs
+++ b/client/executor/src/native_executor.rs
@@ -197,8 +197,8 @@ impl WasmExecutor {
 	/// The runtime is passed as a [`RuntimeBlob`]. The runtime will be isntantiated with the
 	/// parameters this `WasmExecutor` was initialized with.
 	///
-	/// In case of problems with during creation of the runtime or instantation, a `Err` is returned.
-	/// that describes the message.
+	/// In case of problems with during creation of the runtime or instantation, a `Err` is
+	/// returned. that describes the message.
 	#[doc(hidden)] // We use this function for tests across multiple crates.
 	pub fn uncached_call(
 		&self,
@@ -456,8 +456,8 @@ impl RuntimeSpawn for RuntimeInstanceSpawn {
 						let _ = sender.send(output);
 					},
 					Err(error) => {
-						// If execution is panicked, the `join` in the original runtime code will panic as well,
-						// since the sender is dropped without sending anything.
+						// If execution is panicked, the `join` in the original runtime code will
+						// panic as well, since the sender is dropped without sending anything.
 						log::error!("Call error in spawned task: {:?}", error);
 					},
 				}
diff --git a/client/executor/src/wasm_runtime.rs b/client/executor/src/wasm_runtime.rs
index c55af60b70a9..892c3681c7ce 100644
--- a/client/executor/src/wasm_runtime.rs
+++ b/client/executor/src/wasm_runtime.rs
@@ -304,8 +304,8 @@ pub fn create_wasm_runtime_with_code(
 		WasmExecutionMethod::Interpreted => {
 			// Wasmi doesn't have any need in a cache directory.
 			//
-			// We drop the cache_path here to silence warnings that cache_path is not used if compiling
-			// without the `wasmtime` flag.
+			// We drop the cache_path here to silence warnings that cache_path is not used if
+			// compiling without the `wasmtime` flag.
 			drop(cache_path);
 
 			sc_executor_wasmi::create_runtime(
@@ -361,8 +361,8 @@ fn decode_runtime_apis(apis: &[u8]) -> Result<Vec<([u8; 8], u32)>, WasmError> {
 
 	apis.chunks(RUNTIME_API_INFO_SIZE)
 		.map(|chunk| {
-			// `chunk` can be less than `RUNTIME_API_INFO_SIZE` if the total length of `apis` doesn't
-			// completely divide by `RUNTIME_API_INFO_SIZE`.
+			// `chunk` can be less than `RUNTIME_API_INFO_SIZE` if the total length of `apis`
+			// doesn't completely divide by `RUNTIME_API_INFO_SIZE`.
 			<[u8; RUNTIME_API_INFO_SIZE]>::try_from(chunk)
 				.map(sp_api::deserialize_runtime_api_info)
 				.map_err(|_| WasmError::Other("a clipped runtime api info declaration".to_owned()))
@@ -370,8 +370,8 @@ fn decode_runtime_apis(apis: &[u8]) -> Result<Vec<([u8; 8], u32)>, WasmError> {
 		.collect::<Result<Vec<_>, WasmError>>()
 }
 
-/// Take the runtime blob and scan it for the custom wasm sections containing the version information
-/// and construct the `RuntimeVersion` from them.
+/// Take the runtime blob and scan it for the custom wasm sections containing the version
+/// information and construct the `RuntimeVersion` from them.
 ///
 /// If there are no such sections, it returns `None`. If there is an error during decoding those
 /// sections, `Err` will be returned.
@@ -380,8 +380,8 @@ pub fn read_embedded_version(blob: &RuntimeBlob) -> Result<Option<RuntimeVersion
 		// We do not use `decode_version` here because the runtime_version section is not supposed
 		// to ever contain a legacy version. Apart from that `decode_version` relies on presence
 		// of a special API in the `apis` field to treat the input as a non-legacy version. However
-		// the structure found in the `runtime_version` always contain an empty `apis` field. Therefore
-		// the version read will be mistakenly treated as an legacy one.
+		// the structure found in the `runtime_version` always contain an empty `apis` field.
+		// Therefore the version read will be mistakenly treated as an legacy one.
 		let mut decoded_version = sp_api::RuntimeVersion::decode(&mut version_section)
 			.map_err(|_| WasmError::Instantiation("failed to decode version section".into()))?;
 
@@ -411,8 +411,9 @@ fn create_versioned_wasm_runtime(
 	// the uncompressed code from now on.
 	let blob = sc_executor_common::runtime_blob::RuntimeBlob::uncompress_if_needed(&code)?;
 
-	// Use the runtime blob to scan if there is any metadata embedded into the wasm binary pertaining
-	// to runtime version. We do it before consuming the runtime blob for creating the runtime.
+	// Use the runtime blob to scan if there is any metadata embedded into the wasm binary
+	// pertaining to runtime version. We do it before consuming the runtime blob for creating the
+	// runtime.
 	let mut version: Option<_> = read_embedded_version(&blob)?;
 
 	let runtime = create_wasm_runtime_with_code(
@@ -429,7 +430,8 @@ fn create_versioned_wasm_runtime(
 	if version.is_none() {
 		// Call to determine runtime version.
 		let version_result = {
-			// `ext` is already implicitly handled as unwind safe, as we store it in a global variable.
+			// `ext` is already implicitly handled as unwind safe, as we store it in a global
+			// variable.
 			let mut ext = AssertUnwindSafe(ext);
 
 			// The following unwind safety assertion is OK because if the method call panics, the
diff --git a/client/executor/wasmi/src/lib.rs b/client/executor/wasmi/src/lib.rs
index d11d867e9a1b..cc6a05fccf81 100644
--- a/client/executor/wasmi/src/lib.rs
+++ b/client/executor/wasmi/src/lib.rs
@@ -687,7 +687,8 @@ pub struct WasmiInstance {
 	missing_functions: Vec<String>,
 }
 
-// This is safe because `WasmiInstance` does not leak any references to `self.memory` and `self.instance`
+// This is safe because `WasmiInstance` does not leak any references to `self.memory` and
+// `self.instance`
 unsafe impl Send for WasmiInstance {}
 
 impl WasmInstance for WasmiInstance {
diff --git a/client/executor/wasmtime/src/instance_wrapper.rs b/client/executor/wasmtime/src/instance_wrapper.rs
index 797fe30690c2..23a912204521 100644
--- a/client/executor/wasmtime/src/instance_wrapper.rs
+++ b/client/executor/wasmtime/src/instance_wrapper.rs
@@ -98,8 +98,8 @@ pub struct InstanceWrapper {
 	instance: Instance,
 	// The memory instance of the `instance`.
 	//
-	// It is important to make sure that we don't make any copies of this to make it easier to proof
-	// See `memory_as_slice` and `memory_as_slice_mut`.
+	// It is important to make sure that we don't make any copies of this to make it easier to
+	// proof See `memory_as_slice` and `memory_as_slice_mut`.
 	memory: Memory,
 	table: Option<Table>,
 	// Make this struct explicitly !Send & !Sync.
@@ -399,9 +399,9 @@ impl InstanceWrapper {
 		self.memory.data_ptr()
 	}
 
-	/// Removes physical backing from the allocated linear memory. This leads to returning the memory
-	/// back to the system. While the memory is zeroed this is considered as a side-effect and is not
-	/// relied upon. Thus this function acts as a hint.
+	/// Removes physical backing from the allocated linear memory. This leads to returning the
+	/// memory back to the system. While the memory is zeroed this is considered as a side-effect
+	/// and is not relied upon. Thus this function acts as a hint.
 	pub fn decommit(&self) {
 		if self.memory.data_size() == 0 {
 			return
diff --git a/client/executor/wasmtime/src/runtime.rs b/client/executor/wasmtime/src/runtime.rs
index d4a2a28394b5..f80d8c8e5bd5 100644
--- a/client/executor/wasmtime/src/runtime.rs
+++ b/client/executor/wasmtime/src/runtime.rs
@@ -100,8 +100,8 @@ impl WasmModule for WasmtimeRuntime {
 		// and results.
 		//
 		// NOTE: Attentive reader may notice that this could've been moved in `WasmModule` creation.
-		//       However, I am not sure if that's a good idea since it would be pushing our luck further
-		//       by assuming that `Store` not only `Send` but also `Sync`.
+		//       However, I am not sure if that's a good idea since it would be pushing our luck
+		// further       by assuming that `Store` not only `Send` but also `Sync`.
 		let imports = resolve_imports(
 			&store,
 			&self.module,
@@ -115,10 +115,10 @@ impl WasmModule for WasmtimeRuntime {
 				InstanceWrapper::new(&store, &self.module, &imports, self.config.heap_pages)?;
 			let heap_base = instance_wrapper.extract_heap_base()?;
 
-			// This function panics if the instance was created from a runtime blob different from which
-			// the mutable globals were collected. Here, it is easy to see that there is only a single
-			// runtime blob and thus it's the same that was used for both creating the instance and
-			// collecting the mutable globals.
+			// This function panics if the instance was created from a runtime blob different from
+			// which the mutable globals were collected. Here, it is easy to see that there is only
+			// a single runtime blob and thus it's the same that was used for both creating the
+			// instance and collecting the mutable globals.
 			let globals_snapshot =
 				GlobalsSnapshot::take(&snapshot_data.mutable_globals, &instance_wrapper);
 
@@ -291,10 +291,10 @@ fn common_config(semantics: &Semantics) -> std::result::Result<wasmtime::Config,
 /// estimate of the actual stack limit in wasmtime. This is because wasmtime measures it's stack
 /// usage in bytes.
 ///
-/// The actual number of bytes consumed by a function is not trivial to compute  without going through
-/// full compilation. Therefore, it's expected that `native_stack_max` is grealy overestimated and
-/// thus never reached in practice. The stack overflow check introduced by the instrumentation and
-/// that relies on the logical item count should be reached first.
+/// The actual number of bytes consumed by a function is not trivial to compute  without going
+/// through full compilation. Therefore, it's expected that `native_stack_max` is grealy
+/// overestimated and thus never reached in practice. The stack overflow check introduced by the
+/// instrumentation and that relies on the logical item count should be reached first.
 ///
 /// See [here][stack_height] for more details of the instrumentation
 ///
@@ -307,12 +307,12 @@ pub struct DeterministicStackLimit {
 	pub logical_max: u32,
 	/// The maximum number of bytes for stack used by wasmtime JITed code.
 	///
-	/// It's not specified how much bytes will be consumed by a stack frame for a given wasm function
-	/// after translation into machine code. It is also not quite trivial.
+	/// It's not specified how much bytes will be consumed by a stack frame for a given wasm
+	/// function after translation into machine code. It is also not quite trivial.
 	///
 	/// Therefore, this number should be choosen conservatively. It must be so large so that it can
-	/// fit the [`logical_max`](Self::logical_max) logical values on the stack, according to the current
-	/// instrumentation algorithm.
+	/// fit the [`logical_max`](Self::logical_max) logical values on the stack, according to the
+	/// current instrumentation algorithm.
 	///
 	/// This value cannot be 0.
 	pub native_stack_max: u32,
@@ -335,9 +335,9 @@ pub struct Semantics {
 	// I.e. if [`CodeSupplyMode::Verbatim`] is used.
 	pub fast_instance_reuse: bool,
 
-	/// Specifiying `Some` will enable deterministic stack height. That is, all executor invocations
-	/// will reach stack overflow at the exactly same point across different wasmtime versions and
-	/// architectures.
+	/// Specifiying `Some` will enable deterministic stack height. That is, all executor
+	/// invocations will reach stack overflow at the exactly same point across different wasmtime
+	/// versions and architectures.
 	///
 	/// This is achieved by a combination of running an instrumentation pass on input code and
 	/// configuring wasmtime accordingly.
@@ -351,10 +351,10 @@ pub struct Semantics {
 	/// non-determinism.
 	///
 	/// By default, the wasm spec allows some local non-determinism wrt. certain floating point
-	/// operations. Specifically, those operations that are not defined to operate on bits (e.g. fneg)
-	/// can produce NaN values. The exact bit pattern for those is not specified and may depend
-	/// on the particular machine that executes wasmtime generated JITed machine code. That is
-	/// a source of non-deterministic values.
+	/// operations. Specifically, those operations that are not defined to operate on bits (e.g.
+	/// fneg) can produce NaN values. The exact bit pattern for those is not specified and may
+	/// depend on the particular machine that executes wasmtime generated JITed machine code. That
+	/// is a source of non-deterministic values.
 	///
 	/// The classical runtime environment for Substrate allowed it and punted this on the runtime
 	/// developers. For PVFs, we want to ensure that execution is deterministic though. Therefore,
@@ -368,11 +368,11 @@ pub struct Config {
 
 	/// The total number of wasm pages an instance can request.
 	///
-	/// If specified, the runtime will be able to allocate only that much of wasm memory pages. This
-	/// is the total number and therefore the [`heap_pages`] is accounted for.
+	/// If specified, the runtime will be able to allocate only that much of wasm memory pages.
+	/// This is the total number and therefore the [`heap_pages`] is accounted for.
 	///
-	/// That means that the initial number of pages of a linear memory plus the [`heap_pages`] should
-	/// be less or equal to `max_memory_pages`, otherwise the instance won't be created.
+	/// That means that the initial number of pages of a linear memory plus the [`heap_pages`]
+	/// should be less or equal to `max_memory_pages`, otherwise the instance won't be created.
 	///
 	/// Moreover, `memory.grow` will fail (return -1) if the sum of the number of currently mounted
 	/// pages and the number of additional pages exceeds `max_memory_pages`.
@@ -382,8 +382,8 @@ pub struct Config {
 
 	/// The WebAssembly standard requires all imports of an instantiated module to be resolved,
 	/// othewise, the instantiation fails. If this option is set to `true`, then this behavior is
-	/// overriden and imports that are requested by the module and not provided by the host functions
-	/// will be resolved using stubs. These stubs will trap upon a call.
+	/// overriden and imports that are requested by the module and not provided by the host
+	/// functions will be resolved using stubs. These stubs will trap upon a call.
 	pub allow_missing_func_imports: bool,
 
 	/// A directory in which wasmtime can store its compiled artifacts cache.
@@ -402,15 +402,16 @@ enum CodeSupplyMode<'a> {
 		// some instrumentations for both anticipated paths: substrate execution and PVF execution.
 		//
 		// Should there raise a need in performing no instrumentation and the client doesn't need
-		// to do any checks, then we can provide a `Cow` like semantics here: if we need the blob and
-		//  the user got `RuntimeBlob` then extract it, or otherwise create it from the given
+		// to do any checks, then we can provide a `Cow` like semantics here: if we need the blob
+		// and  the user got `RuntimeBlob` then extract it, or otherwise create it from the given
 		// bytecode.
 		blob: RuntimeBlob,
 	},
 
 	/// The code is supplied in a form of a compiled artifact.
 	///
-	/// This assumes that the code is already prepared for execution and the same `Config` was used.
+	/// This assumes that the code is already prepared for execution and the same `Config` was
+	/// used.
 	Artifact { compiled_artifact: &'a [u8] },
 }
 
@@ -430,11 +431,12 @@ pub fn create_runtime(
 ///
 /// # Safety
 ///
-/// The caller must ensure that the compiled artifact passed here was produced by [`prepare_runtime_artifact`].
-/// Otherwise, there is a risk of arbitrary code execution with all implications.
+/// The caller must ensure that the compiled artifact passed here was produced by
+/// [`prepare_runtime_artifact`]. Otherwise, there is a risk of arbitrary code execution with all
+/// implications.
 ///
-/// It is ok though if the `compiled_artifact` was created by code of another version or with different
-/// configuration flags. In such case the caller will receive an `Err` deterministically.
+/// It is ok though if the `compiled_artifact` was created by code of another version or with
+/// different configuration flags. In such case the caller will receive an `Err` deterministically.
 pub unsafe fn create_runtime_from_artifact(
 	compiled_artifact: &[u8],
 	config: Config,
@@ -445,8 +447,8 @@ pub unsafe fn create_runtime_from_artifact(
 
 /// # Safety
 ///
-/// This is only unsafe if called with [`CodeSupplyMode::Artifact`]. See [`create_runtime_from_artifact`]
-/// to get more details.
+/// This is only unsafe if called with [`CodeSupplyMode::Artifact`]. See
+/// [`create_runtime_from_artifact`] to get more details.
 unsafe fn do_create_runtime(
 	code_supply_mode: CodeSupplyMode<'_>,
 	config: Config,
diff --git a/client/executor/wasmtime/src/util.rs b/client/executor/wasmtime/src/util.rs
index c294f66b5017..3109a76a9af8 100644
--- a/client/executor/wasmtime/src/util.rs
+++ b/client/executor/wasmtime/src/util.rs
@@ -44,7 +44,8 @@ pub fn from_wasmtime_val(val: wasmtime::Val) -> Value {
 	}
 }
 
-/// Converts a sp_wasm_interface's [`Value`] into the corresponding variant in wasmtime's [`wasmtime::Val`].
+/// Converts a sp_wasm_interface's [`Value`] into the corresponding variant in wasmtime's
+/// [`wasmtime::Val`].
 pub fn into_wasmtime_val(value: Value) -> wasmtime::Val {
 	match value {
 		Value::I32(v) => wasmtime::Val::I32(v),
diff --git a/client/finality-grandpa/src/authorities.rs b/client/finality-grandpa/src/authorities.rs
index 6f958bef0ad9..6e5dfdd05e62 100644
--- a/client/finality-grandpa/src/authorities.rs
+++ b/client/finality-grandpa/src/authorities.rs
@@ -165,8 +165,8 @@ pub struct AuthoritySet<H, N> {
 	/// is lower than the last finalized block (as signaled in the forced
 	/// change) must be applied beforehand.
 	pending_forced_changes: Vec<PendingChange<H, N>>,
-	/// Track at which blocks the set id changed. This is useful when we need to prove finality for a
-	/// given block since we can figure out what set the block belongs to and when the set
+	/// Track at which blocks the set id changed. This is useful when we need to prove finality for
+	/// a given block since we can figure out what set the block belongs to and when the set
 	/// started/ended.
 	authority_set_changes: AuthoritySetChanges<N>,
 }
@@ -657,16 +657,16 @@ impl<H, N: Add<Output = N> + Clone> PendingChange<H, N> {
 pub struct AuthoritySetChanges<N>(Vec<(u64, N)>);
 
 /// The response when querying for a set id for a specific block. Either we get a set id
-/// together with a block number for the last block in the set, or that the requested block is in the
-/// latest set, or that we don't know what set id the given block belongs to.
+/// together with a block number for the last block in the set, or that the requested block is in
+/// the latest set, or that we don't know what set id the given block belongs to.
 #[derive(Debug, PartialEq)]
 pub enum AuthoritySetChangeId<N> {
 	/// The requested block is in the latest set.
 	Latest,
 	/// Tuple containing the set id and the last block number of that set.
 	Set(SetId, N),
-	/// We don't know which set id the request block belongs to (this can only happen due to missing
-	/// data).
+	/// We don't know which set id the request block belongs to (this can only happen due to
+	/// missing data).
 	Unknown,
 }
 
@@ -912,7 +912,8 @@ mod tests {
 
 		assert_eq!(authorities.pending_changes().collect::<Vec<_>>(), vec![&change_a, &change_b]);
 
-		// finalizing "hash_c" won't enact the change signaled at "hash_a" but it will prune out "hash_b"
+		// finalizing "hash_c" won't enact the change signaled at "hash_a" but it will prune out
+		// "hash_b"
 		let status = authorities
 			.apply_standard_changes(
 				"hash_c",
diff --git a/client/finality-grandpa/src/communication/gossip.rs b/client/finality-grandpa/src/communication/gossip.rs
index c3b385209bda..90f40a93cb9e 100644
--- a/client/finality-grandpa/src/communication/gossip.rs
+++ b/client/finality-grandpa/src/communication/gossip.rs
@@ -483,8 +483,8 @@ struct Peers<N> {
 	/// gossiping.
 	first_stage_peers: HashSet<PeerId>,
 	/// The randomly picked set of peers we'll gossip to in the second stage of gossiping if the
-	/// first stage didn't allow us to spread the voting data enough to conclude the round. This set
-	/// should have size `sqrt(connected_peers)`.
+	/// first stage didn't allow us to spread the voting data enough to conclude the round. This
+	/// set should have size `sqrt(connected_peers)`.
 	second_stage_peers: HashSet<PeerId>,
 	/// The randomly picked set of `LUCKY_PEERS` light clients we'll gossip commit messages to.
 	lucky_light_peers: HashSet<PeerId>,
@@ -583,9 +583,11 @@ impl<N: Ord> Peers<N> {
 
 	fn reshuffle(&mut self) {
 		// we want to randomly select peers into three sets according to the following logic:
-		// - first set: LUCKY_PEERS random peers where at least LUCKY_PEERS/2 are authorities (unless
+		// - first set: LUCKY_PEERS random peers where at least LUCKY_PEERS/2 are authorities
+		//   (unless
 		// we're not connected to that many authorities)
-		// - second set: max(LUCKY_PEERS, sqrt(peers)) peers where at least LUCKY_PEERS are authorities.
+		// - second set: max(LUCKY_PEERS, sqrt(peers)) peers where at least LUCKY_PEERS are
+		//   authorities.
 		// - third set: LUCKY_PEERS random light client peers
 
 		let shuffled_peers = {
@@ -1220,8 +1222,10 @@ impl<Block: BlockT> Inner<Block> {
 	/// The initial logic for filtering round messages follows the given state
 	/// transitions:
 	///
-	/// - State 1: allowed to LUCKY_PEERS random peers (where at least LUCKY_PEERS/2 are authorities)
-	/// - State 2: allowed to max(LUCKY_PEERS, sqrt(random peers)) (where at least LUCKY_PEERS are authorities)
+	/// - State 1: allowed to LUCKY_PEERS random peers (where at least LUCKY_PEERS/2 are
+	///   authorities)
+	/// - State 2: allowed to max(LUCKY_PEERS, sqrt(random peers)) (where at least LUCKY_PEERS are
+	///   authorities)
 	/// - State 3: allowed to all peers
 	///
 	/// Transitions will be triggered on repropagation attempts by the underlying gossip layer.
@@ -1249,7 +1253,8 @@ impl<Block: BlockT> Inner<Block> {
 	/// The initial logic for filtering global messages follows the given state
 	/// transitions:
 	///
-	/// - State 1: allowed to max(LUCKY_PEERS, sqrt(peers)) (where at least LUCKY_PEERS are authorities)
+	/// - State 1: allowed to max(LUCKY_PEERS, sqrt(peers)) (where at least LUCKY_PEERS are
+	///   authorities)
 	/// - State 2: allowed to all peers
 	///
 	/// We are more lenient with global messages since there should be a lot
@@ -1625,7 +1630,8 @@ impl<Block: BlockT> sc_network_gossip::Validator<Block> for GossipValidator<Bloc
 			// it is expired.
 			match inner.live_topics.topic_info(&topic) {
 				None => return true,
-				Some((Some(_), _)) => return false, /* round messages don't require further checking. */
+				// round messages don't require further checking.
+				Some((Some(_), _)) => return false,
 				Some((None, _)) => {},
 			};
 
diff --git a/client/finality-grandpa/src/communication/mod.rs b/client/finality-grandpa/src/communication/mod.rs
index 077dc6a3f96b..0c1fb79c558e 100644
--- a/client/finality-grandpa/src/communication/mod.rs
+++ b/client/finality-grandpa/src/communication/mod.rs
@@ -191,16 +191,16 @@ pub(crate) struct NetworkBridge<B: BlockT, N: Network<B>> {
 	neighbor_sender: periodic::NeighborPacketSender<B>,
 
 	/// `NeighborPacketWorker` processing packets sent through the `NeighborPacketSender`.
-	// `NetworkBridge` is required to be cloneable, thus one needs to be able to clone its children,
-	// thus one has to wrap `neighbor_packet_worker` with an `Arc` `Mutex`.
+	// `NetworkBridge` is required to be cloneable, thus one needs to be able to clone its
+	// children, thus one has to wrap `neighbor_packet_worker` with an `Arc` `Mutex`.
 	neighbor_packet_worker: Arc<Mutex<periodic::NeighborPacketWorker<B>>>,
 
 	/// Receiver side of the peer report stream populated by the gossip validator, forwarded to the
 	/// gossip engine.
-	// `NetworkBridge` is required to be cloneable, thus one needs to be able to clone its children,
-	// thus one has to wrap gossip_validator_report_stream with an `Arc` `Mutex`. Given that it is
-	// just an `UnboundedReceiver`, one could also switch to a multi-producer-*multi*-consumer
-	// channel implementation.
+	// `NetworkBridge` is required to be cloneable, thus one needs to be able to clone its
+	// children, thus one has to wrap gossip_validator_report_stream with an `Arc` `Mutex`. Given
+	// that it is just an `UnboundedReceiver`, one could also switch to a
+	// multi-producer-*multi*-consumer channel implementation.
 	gossip_validator_report_stream: Arc<Mutex<TracingUnboundedReceiver<PeerReport>>>,
 
 	telemetry: Option<TelemetryHandle>,
@@ -291,8 +291,8 @@ impl<B: BlockT, N: Network<B>> NetworkBridge<B, N> {
 			.note_round(round, |to, neighbor| self.neighbor_sender.send(to, neighbor));
 	}
 
-	/// Get a stream of signature-checked round messages from the network as well as a sink for round messages to the
-	/// network all within the current set.
+	/// Get a stream of signature-checked round messages from the network as well as a sink for
+	/// round messages to the network all within the current set.
 	pub(crate) fn round_communication(
 		&self,
 		keystore: Option<LocalIdKeystore>,
diff --git a/client/finality-grandpa/src/import.rs b/client/finality-grandpa/src/import.rs
index a86421b4a0ef..c6bdbc00323d 100644
--- a/client/finality-grandpa/src/import.rs
+++ b/client/finality-grandpa/src/import.rs
@@ -100,7 +100,8 @@ where
 		let mut out = Vec::new();
 		let chain_info = self.inner.info();
 
-		// request justifications for all pending changes for which change blocks have already been imported
+		// request justifications for all pending changes for which change blocks have already been
+		// imported
 		let pending_changes: Vec<_> =
 			self.authority_set.inner().pending_changes().cloned().collect();
 
diff --git a/client/finality-grandpa/src/justification.rs b/client/finality-grandpa/src/justification.rs
index d051d0c44e03..a852c74d9d1a 100644
--- a/client/finality-grandpa/src/justification.rs
+++ b/client/finality-grandpa/src/justification.rs
@@ -171,7 +171,8 @@ impl<Block: BlockT> GrandpaJustification<Block> {
 
 			match ancestry_chain.ancestry(self.commit.target_hash, signed.precommit.target_hash) {
 				Ok(route) => {
-					// ancestry starts from parent hash but the precommit target hash has been visited
+					// ancestry starts from parent hash but the precommit target hash has been
+					// visited
 					visited_hashes.insert(signed.precommit.target_hash);
 					for hash in route {
 						visited_hashes.insert(hash);
diff --git a/client/finality-grandpa/src/observer.rs b/client/finality-grandpa/src/observer.rs
index dd120fdd1450..91779daf3941 100644
--- a/client/finality-grandpa/src/observer.rs
+++ b/client/finality-grandpa/src/observer.rs
@@ -361,7 +361,8 @@ where
 		match Future::poll(Pin::new(&mut self.observer), cx) {
 			Poll::Pending => {},
 			Poll::Ready(Ok(())) => {
-				// observer commit stream doesn't conclude naturally; this could reasonably be an error.
+				// observer commit stream doesn't conclude naturally; this could reasonably be an
+				// error.
 				return Poll::Ready(Ok(()))
 			},
 			Poll::Ready(Err(CommandOrError::Error(e))) => {
diff --git a/client/finality-grandpa/src/warp_proof.rs b/client/finality-grandpa/src/warp_proof.rs
index 86b57c78a43e..34eaa49cdf36 100644
--- a/client/finality-grandpa/src/warp_proof.rs
+++ b/client/finality-grandpa/src/warp_proof.rs
@@ -188,8 +188,8 @@ impl<Block: BlockT> WarpSyncProof<Block> {
 	}
 
 	/// Verifies the warp sync proof starting at the given set id and with the given authorities.
-	/// Verification stops when either the proof is exhausted or finality for the target header can be proven.
-	/// If the proof is valid the new set id and authorities is returned.
+	/// Verification stops when either the proof is exhausted or finality for the target header can
+	/// be proven. If the proof is valid the new set id and authorities is returned.
 	fn verify(
 		&self,
 		set_id: SetId,
diff --git a/client/informant/src/display.rs b/client/informant/src/display.rs
index 76e21215c245..a41cf8e25535 100644
--- a/client/informant/src/display.rs
+++ b/client/informant/src/display.rs
@@ -40,7 +40,6 @@ use wasm_timer::Instant;
 ///
 /// Call `InformantDisplay::new` to initialize the state, then regularly call `display` with the
 /// information to display.
-///
 pub struct InformantDisplay<B: BlockT> {
 	/// Head of chain block number from the last time `display` has been called.
 	/// `None` if `display` has never been called.
diff --git a/client/informant/src/lib.rs b/client/informant/src/lib.rs
index c7c90a626a34..4f6aa2b7a3fe 100644
--- a/client/informant/src/lib.rs
+++ b/client/informant/src/lib.rs
@@ -52,11 +52,13 @@ impl Default for OutputFormat {
 	}
 }
 
-/// Marker trait for a type that implements `TransactionPool` and `MallocSizeOf` on `not(target_os = "unknown")`.
+/// Marker trait for a type that implements `TransactionPool` and `MallocSizeOf` on `not(target_os =
+/// "unknown")`.
 #[cfg(target_os = "unknown")]
 pub trait TransactionPoolAndMaybeMallogSizeOf: TransactionPool {}
 
-/// Marker trait for a type that implements `TransactionPool` and `MallocSizeOf` on `not(target_os = "unknown")`.
+/// Marker trait for a type that implements `TransactionPool` and `MallocSizeOf` on `not(target_os =
+/// "unknown")`.
 #[cfg(not(target_os = "unknown"))]
 pub trait TransactionPoolAndMaybeMallogSizeOf: TransactionPool + MallocSizeOf {}
 
diff --git a/client/keystore/src/local.rs b/client/keystore/src/local.rs
index a86812a9f984..e5c8ff14af09 100644
--- a/client/keystore/src/local.rs
+++ b/client/keystore/src/local.rs
@@ -521,8 +521,8 @@ impl KeystoreInner {
 
 	/// Get a key pair for the given public key.
 	///
-	/// Returns `Ok(None)` if the key doesn't exist, `Ok(Some(_))` if the key exists or `Err(_)` when
-	/// something failed.
+	/// Returns `Ok(None)` if the key doesn't exist, `Ok(Some(_))` if the key exists or `Err(_)`
+	/// when something failed.
 	pub fn key_pair<Pair: AppPair>(
 		&self,
 		public: &<Pair as AppKey>::Public,
diff --git a/client/network-gossip/src/bridge.rs b/client/network-gossip/src/bridge.rs
index 9ef5e0caee3d..6fa16cad7753 100644
--- a/client/network-gossip/src/bridge.rs
+++ b/client/network-gossip/src/bridge.rs
@@ -64,8 +64,8 @@ enum ForwardingState<B: BlockT> {
 	/// more messages to forward.
 	Idle,
 	/// The gossip engine is in the progress of forwarding messages and thus will not poll the
-	/// network for more messages until it has send all current messages into the subscribed message
-	/// sinks.
+	/// network for more messages until it has send all current messages into the subscribed
+	/// message sinks.
 	Busy(VecDeque<(B::Hash, TopicNotification)>),
 }
 
diff --git a/client/network-gossip/src/lib.rs b/client/network-gossip/src/lib.rs
index 45fc19d6ef8a..55c2fc820637 100644
--- a/client/network-gossip/src/lib.rs
+++ b/client/network-gossip/src/lib.rs
@@ -32,8 +32,8 @@
 //!
 //! # Usage
 //!
-//! - Implement the `Network` trait, representing the low-level networking primitives. It is
-//!   already implemented on `sc_network::NetworkService`.
+//! - Implement the `Network` trait, representing the low-level networking primitives. It is already
+//!   implemented on `sc_network::NetworkService`.
 //! - Implement the `Validator` trait. See the section below.
 //! - Decide on a protocol name. Each gossiping protocol should have a different one.
 //! - Build a `GossipEngine` using these three elements.
diff --git a/client/network/src/behaviour.rs b/client/network/src/behaviour.rs
index c181ee4e6339..cb3b19d96c6d 100644
--- a/client/network/src/behaviour.rs
+++ b/client/network/src/behaviour.rs
@@ -302,12 +302,14 @@ impl<B: BlockT> Behaviour<B> {
 		&mut self.substrate
 	}
 
-	/// Start querying a record from the DHT. Will later produce either a `ValueFound` or a `ValueNotFound` event.
+	/// Start querying a record from the DHT. Will later produce either a `ValueFound` or a
+	/// `ValueNotFound` event.
 	pub fn get_value(&mut self, key: &record::Key) {
 		self.discovery.get_value(key);
 	}
 
-	/// Starts putting a record into DHT. Will later produce either a `ValuePut` or a `ValuePutFailed` event.
+	/// Starts putting a record into DHT. Will later produce either a `ValuePut` or a
+	/// `ValuePutFailed` event.
 	pub fn put_value(&mut self, key: record::Key, value: Vec<u8>) {
 		self.discovery.put_value(key, value);
 	}
diff --git a/client/network/src/block_request_handler.rs b/client/network/src/block_request_handler.rs
index e546ae7661a0..67a83af89768 100644
--- a/client/network/src/block_request_handler.rs
+++ b/client/network/src/block_request_handler.rs
@@ -294,12 +294,12 @@ impl<B: BlockT> BlockRequestHandler<B> {
 					};
 					(justifications, Vec::new(), false)
 				} else {
-					// For now we keep compatibility by selecting precisely the GRANDPA one, and not just
-					// the first one. When sending we could have just taken the first one, since we don't
-					// expect there to be any other kind currently, but when receiving we need to add the
-					// engine ID tag.
-					// The ID tag is hardcoded here to avoid depending on the GRANDPA crate, and will be
-					// removed once we remove the backwards compatibility.
+					// For now we keep compatibility by selecting precisely the GRANDPA one, and not
+					// just the first one. When sending we could have just taken the first one,
+					// since we don't expect there to be any other kind currently, but when
+					// receiving we need to add the engine ID tag.
+					// The ID tag is hardcoded here to avoid depending on the GRANDPA crate, and
+					// will be removed once we remove the backwards compatibility.
 					// See: https://github.com/paritytech/substrate/issues/8172
 					let justification =
 						justifications.and_then(|just| just.into_justification(*b"FRNK"));
diff --git a/client/network/src/config.rs b/client/network/src/config.rs
index dd60f329128f..306a4cfd2903 100644
--- a/client/network/src/config.rs
+++ b/client/network/src/config.rs
@@ -112,8 +112,8 @@ pub struct Params<B: BlockT, H: ExHashT> {
 	/// Request response configuration for the block request protocol.
 	///
 	/// [`RequestResponseConfig::name`] is used to tag outgoing block requests with the correct
-	/// protocol name. In addition all of [`RequestResponseConfig`] is used to handle incoming block
-	/// requests, if enabled.
+	/// protocol name. In addition all of [`RequestResponseConfig`] is used to handle incoming
+	/// block requests, if enabled.
 	///
 	/// Can be constructed either via [`crate::block_request_handler::generate_protocol_config`]
 	/// allowing outgoing but not incoming requests, or constructed via
@@ -272,7 +272,6 @@ impl fmt::Debug for ProtocolId {
 /// assert_eq!(peer_id, "QmSk5HQbn6LhUwDiNMseVUjuRYhEtYj4aUZ6WfWoGURpdV".parse::<PeerId>().unwrap());
 /// assert_eq!(addr, "/ip4/198.51.100.19/tcp/30333".parse::<Multiaddr>().unwrap());
 /// ```
-///
 pub fn parse_str_addr(addr_str: &str) -> Result<(PeerId, Multiaddr), ParseErr> {
 	let addr: Multiaddr = addr_str.parse()?;
 	parse_addr(addr)
@@ -506,7 +505,8 @@ impl NetworkConfiguration {
 		}
 	}
 
-	/// Create new default configuration for localhost-only connection with random port (useful for testing)
+	/// Create new default configuration for localhost-only connection with random port (useful for
+	/// testing)
 	pub fn new_local() -> NetworkConfiguration {
 		let mut config =
 			NetworkConfiguration::new("test-node", "test-client", Default::default(), None);
@@ -520,7 +520,8 @@ impl NetworkConfiguration {
 		config
 	}
 
-	/// Create new default configuration for localhost-only connection with random port (useful for testing)
+	/// Create new default configuration for localhost-only connection with random port (useful for
+	/// testing)
 	pub fn new_memory() -> NetworkConfiguration {
 		let mut config =
 			NetworkConfiguration::new("test-node", "test-client", Default::default(), None);
@@ -629,8 +630,8 @@ pub enum TransportConfig {
 		allow_private_ipv4: bool,
 
 		/// Optional external implementation of a libp2p transport. Used in WASM contexts where we
-		/// need some binding between the networking provided by the operating system or environment
-		/// and libp2p.
+		/// need some binding between the networking provided by the operating system or
+		/// environment and libp2p.
 		///
 		/// This parameter exists whatever the target platform is, but it is expected to be set to
 		/// `Some` only when compiling for WASM.
@@ -710,12 +711,12 @@ impl NodeKeyConfig {
 	///
 	///  * If the secret is configured as input, the corresponding keypair is returned.
 	///
-	///  * If the secret is configured as a file, it is read from that file, if it exists.
-	///    Otherwise a new secret is generated and stored. In either case, the
-	///    keypair obtained from the secret is returned.
+	///  * If the secret is configured as a file, it is read from that file, if it exists. Otherwise
+	///    a new secret is generated and stored. In either case, the keypair obtained from the
+	///    secret is returned.
 	///
-	///  * If the secret is configured to be new, it is generated and the corresponding
-	///    keypair is returned.
+	///  * If the secret is configured to be new, it is generated and the corresponding keypair is
+	///    returned.
 	pub fn into_keypair(self) -> io::Result<Keypair> {
 		use NodeKeyConfig::*;
 		match self {
diff --git a/client/network/src/discovery.rs b/client/network/src/discovery.rs
index 6ca01cd89219..d4367b2ada30 100644
--- a/client/network/src/discovery.rs
+++ b/client/network/src/discovery.rs
@@ -1002,7 +1002,8 @@ mod tests {
 							match e {
 								DiscoveryOut::UnroutablePeer(other) |
 								DiscoveryOut::Discovered(other) => {
-									// Call `add_self_reported_address` to simulate identify happening.
+									// Call `add_self_reported_address` to simulate identify
+									// happening.
 									let addr = swarms
 										.iter()
 										.find_map(|(s, a)| {
diff --git a/client/network/src/lib.rs b/client/network/src/lib.rs
index 633baaca47aa..51bc370265ef 100644
--- a/client/network/src/lib.rs
+++ b/client/network/src/lib.rs
@@ -121,10 +121,10 @@
 //!
 //! - **`/substrate/<protocol-id>/<version>`** (where `<protocol-id>` must be replaced with the
 //! protocol ID of the targeted chain, and `<version>` is a number between 2 and 6). For each
-//! connection we optionally keep an additional substream for all Substrate-based communications alive.
-//! This protocol is considered legacy, and is progressively being replaced with alternatives.
-//! This is designated as "The legacy Substrate substream" in this documentation. See below for
-//! more details.
+//! connection we optionally keep an additional substream for all Substrate-based communications
+//! alive. This protocol is considered legacy, and is progressively being replaced with
+//! alternatives. This is designated as "The legacy Substrate substream" in this documentation. See
+//! below for more details.
 //! - **`/<protocol-id>/sync/2`** is a request-response protocol (see below) that lets one perform
 //! requests for information about blocks. Each request is the encoding of a `BlockRequest` and
 //! each response is the encoding of a `BlockResponse`, as defined in the `api.v1.proto` file in
@@ -243,7 +243,6 @@
 //! - Calling `trigger_repropagate` when a transaction is added to the pool.
 //!
 //! More precise usage details are still being worked on and will likely change in the future.
-//!
 
 mod behaviour;
 mod chain;
diff --git a/client/network/src/light_client_requests.rs b/client/network/src/light_client_requests.rs
index 8489585e2883..e18b783f219b 100644
--- a/client/network/src/light_client_requests.rs
+++ b/client/network/src/light_client_requests.rs
@@ -36,7 +36,8 @@ fn generate_protocol_name(protocol_id: &ProtocolId) -> String {
 	s
 }
 
-/// Generates a [`ProtocolConfig`] for the light client request protocol, refusing incoming requests.
+/// Generates a [`ProtocolConfig`] for the light client request protocol, refusing incoming
+/// requests.
 pub fn generate_protocol_config(protocol_id: &ProtocolId) -> ProtocolConfig {
 	ProtocolConfig {
 		name: generate_protocol_name(protocol_id).into(),
diff --git a/client/network/src/light_client_requests/sender.rs b/client/network/src/light_client_requests/sender.rs
index 0c12c9a3f85a..1560e7afbfcc 100644
--- a/client/network/src/light_client_requests/sender.rs
+++ b/client/network/src/light_client_requests/sender.rs
@@ -26,8 +26,9 @@
 //! 2. Forward the request to [`crate::request_responses::RequestResponsesBehaviour`] via
 //! [`OutEvent::SendRequest`](sender::OutEvent::SendRequest).
 //!
-//! 3. Wait for the response and forward the response via the [`futures::channel::oneshot::Sender`] provided earlier
-//! with [`LightClientRequestSender::request`](sender::LightClientRequestSender::request).
+//! 3. Wait for the response and forward the response via the [`futures::channel::oneshot::Sender`]
+//! provided earlier with [`LightClientRequestSender::request`](sender::LightClientRequestSender::
+//! request).
 
 use crate::{
 	config::ProtocolId,
diff --git a/client/network/src/protocol/message.rs b/client/network/src/protocol/message.rs
index 95f5ffa3a545..1ffc57de181c 100644
--- a/client/network/src/protocol/message.rs
+++ b/client/network/src/protocol/message.rs
@@ -16,7 +16,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-//! Network packet message types. These get serialized and put into the lower level protocol payload.
+//! Network packet message types. These get serialized and put into the lower level protocol
+//! payload.
 
 pub use self::generic::{
 	BlockAnnounce, FromBlock, RemoteCallRequest, RemoteChangesRequest, RemoteChangesResponse,
@@ -392,7 +393,8 @@ pub mod generic {
 		pub to: Option<Hash>,
 		/// Sequence direction.
 		pub direction: Direction,
-		/// Maximum number of blocks to return. An implementation defined maximum is used when unspecified.
+		/// Maximum number of blocks to return. An implementation defined maximum is used when
+		/// unspecified.
 		pub max: Option<u32>,
 	}
 
diff --git a/client/network/src/protocol/notifications/behaviour.rs b/client/network/src/protocol/notifications/behaviour.rs
index 1466e9d4264d..648abc391fba 100644
--- a/client/network/src/protocol/notifications/behaviour.rs
+++ b/client/network/src/protocol/notifications/behaviour.rs
@@ -63,8 +63,8 @@ use wasm_timer::Instant;
 /// - [`PeerState::Disabled`]: Has open TCP connection(s) unbeknownst to the peerset. No substream
 ///   is open.
 /// - [`PeerState::Enabled`]: Has open TCP connection(s), acknowledged by the peerset.
-///   - Notifications substreams are open on at least one connection, and external
-///     API has been notified.
+///   - Notifications substreams are open on at least one connection, and external API has been
+///     notified.
 ///   - Notifications substreams aren't open.
 /// - [`PeerState::Incoming`]: Has open TCP connection(s) and remote would like to open substreams.
 ///   Peerset has been asked to attribute an inbound slot.
@@ -1255,8 +1255,8 @@ impl NetworkBehaviour for Notifications {
 						.iter()
 						.any(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote));
 
-					// If no connection is `OpenDesiredByRemote` anymore, clean up the peerset incoming
-					// request.
+					// If no connection is `OpenDesiredByRemote` anymore, clean up the peerset
+					// incoming request.
 					if no_desired_left {
 						// In the incoming state, we don't report "Dropped". Instead we will just
 						// ignore the corresponding Accept/Reject.
diff --git a/client/network/src/protocol/notifications/upgrade/notifications.rs b/client/network/src/protocol/notifications/upgrade/notifications.rs
index d01b1b5054f6..868544824f2d 100644
--- a/client/network/src/protocol/notifications/upgrade/notifications.rs
+++ b/client/network/src/protocol/notifications/upgrade/notifications.rs
@@ -21,17 +21,17 @@ use asynchronous_codec::Framed;
 ///
 /// The Substrate notifications protocol consists in the following:
 ///
-/// - Node A opens a substream to node B and sends a message which contains some protocol-specific
-///   higher-level logic. This message is prefixed with a variable-length integer message length.
-///   This message can be empty, in which case `0` is sent.
+/// - Node A opens a substream to node B and sends a message which contains some
+///   protocol-specific higher-level logic. This message is prefixed with a variable-length
+///   integer message length. This message can be empty, in which case `0` is sent.
 /// - If node B accepts the substream, it sends back a message with the same properties.
 /// - If instead B refuses the connection (which typically happens because no empty slot is
 ///   available), then it immediately closes the substream without sending back anything.
-/// - Node A can then send notifications to B, prefixed with a variable-length integer indicating
-///   the length of the message.
-/// - Either node A or node B can signal that it doesn't want this notifications substream anymore
-///   by closing its writing side. The other party should respond by also closing their own
-///   writing side soon after.
+/// - Node A can then send notifications to B, prefixed with a variable-length integer
+///   indicating the length of the message.
+/// - Either node A or node B can signal that it doesn't want this notifications substream
+///   anymore by closing its writing side. The other party should respond by also closing their
+///   own writing side soon after.
 ///
 /// Notification substreams are unidirectional. If A opens a substream with B, then B is
 /// encouraged but not required to open a substream to A as well.
diff --git a/client/network/src/protocol/sync.rs b/client/network/src/protocol/sync.rs
index e9bf14a623b6..5cbe1fa13542 100644
--- a/client/network/src/protocol/sync.rs
+++ b/client/network/src/protocol/sync.rs
@@ -27,7 +27,6 @@
 //! The `ChainSync` struct maintains the state of the block requests. Whenever something happens on
 //! the network, or whenever a block has been successfully verified, call the appropriate method in
 //! order to update it.
-//!
 
 use crate::{
 	protocol::message::{self, BlockAnnounce, BlockAttributes, BlockRequest, BlockResponse},
@@ -900,8 +899,8 @@ impl<B: BlockT> ChainSync<B> {
 			// If our best queued is more than `MAX_BLOCKS_TO_LOOK_BACKWARDS` blocks away from the
 			// common number, the peer best number is higher than our best queued and the common
 			// number is smaller than the last finalized block number, we should do an ancestor
-			// search to find a better common block. If the queue is full we wait till all blocks are
-			// imported though.
+			// search to find a better common block. If the queue is full we wait till all blocks
+			// are imported though.
 			if best_queued.saturating_sub(peer.common_number) > MAX_BLOCKS_TO_LOOK_BACKWARDS.into() &&
 				best_queued < peer.best_number &&
 				peer.common_number < last_finalized &&
@@ -1149,8 +1148,8 @@ impl<B: BlockT> ChainSync<B> {
 								ancestry_request::<B>(next_num),
 							))
 						} else {
-							// Ancestry search is complete. Check if peer is on a stale fork unknown to us and
-							// add it to sync targets if necessary.
+							// Ancestry search is complete. Check if peer is on a stale fork unknown
+							// to us and add it to sync targets if necessary.
 							trace!(
 								target: "sync",
 								"Ancestry search complete. Ours={} ({}), Theirs={} ({}), Common={:?} ({})",
@@ -1774,8 +1773,8 @@ impl<B: BlockT> ChainSync<B> {
 	///
 	/// This should be polled until it returns [`Poll::Pending`].
 	///
-	/// If [`PollBlockAnnounceValidation::ImportHeader`] is returned, then the caller MUST try to import passed
-	/// header (call `on_block_data`). The network request isn't sent in this case.
+	/// If [`PollBlockAnnounceValidation::ImportHeader`] is returned, then the caller MUST try to
+	/// import passed header (call `on_block_data`). The network request isn't sent in this case.
 	pub fn poll_block_announce_validation(
 		&mut self,
 		cx: &mut std::task::Context,
@@ -2002,7 +2001,8 @@ impl<B: BlockT> ChainSync<B> {
 		})
 	}
 
-	/// Find a block to start sync from. If we sync with state, that's the latest block we have state for.
+	/// Find a block to start sync from. If we sync with state, that's the latest block we have
+	/// state for.
 	fn reset_sync_start_point(&mut self) -> Result<(), ClientError> {
 		let info = self.client.info();
 		if matches!(self.mode, SyncMode::LightState { .. }) && info.finalized_state.is_some() {
@@ -2132,8 +2132,8 @@ fn ancestry_request<B: BlockT>(block: NumberFor<B>) -> BlockRequest<B> {
 	}
 }
 
-/// The ancestor search state expresses which algorithm, and its stateful parameters, we are using to
-/// try to find an ancestor block
+/// The ancestor search state expresses which algorithm, and its stateful parameters, we are using
+/// to try to find an ancestor block
 #[derive(Copy, Clone, Eq, PartialEq, Debug)]
 pub enum AncestorSearchState<B: BlockT> {
 	/// Use exponential backoff to find an ancestor, then switch to binary search.
@@ -2161,7 +2161,8 @@ fn handle_ancestor_search_state<B: BlockT>(
 		AncestorSearchState::ExponentialBackoff(next_distance_to_tip) => {
 			let next_distance_to_tip = *next_distance_to_tip;
 			if block_hash_match && next_distance_to_tip == One::one() {
-				// We found the ancestor in the first step so there is no need to execute binary search.
+				// We found the ancestor in the first step so there is no need to execute binary
+				// search.
 				return None
 			}
 			if block_hash_match {
@@ -2645,13 +2646,13 @@ mod test {
 
 	/// This test is a regression test as observed on a real network.
 	///
-	/// The node is connected to multiple peers. Both of these peers are having a best block (1) that
-	/// is below our best block (3). Now peer 2 announces a fork of block 3 that we will
+	/// The node is connected to multiple peers. Both of these peers are having a best block (1)
+	/// that is below our best block (3). Now peer 2 announces a fork of block 3 that we will
 	/// request from peer 2. After importing the fork, peer 2 and then peer 1 will announce block 4.
-	/// But as peer 1 in our view is still at block 1, we will request block 2 (which we already have)
-	/// from it. In the meanwhile peer 2 sends us block 4 and 3 and we send another request for block
-	/// 2 to peer 2. Peer 1 answers with block 2 and then peer 2. This will need to succeed, as we
-	/// have requested block 2 from both peers.
+	/// But as peer 1 in our view is still at block 1, we will request block 2 (which we already
+	/// have) from it. In the meanwhile peer 2 sends us block 4 and 3 and we send another request
+	/// for block 2 to peer 2. Peer 1 answers with block 2 and then peer 2. This will need to
+	/// succeed, as we have requested block 2 from both peers.
 	#[test]
 	fn do_not_report_peer_on_block_response_for_block_request() {
 		sp_tracing::try_init_simple();
@@ -2756,9 +2757,9 @@ mod test {
 	///
 	/// The scenario is that the node is doing a full resync and is connected to some node that is
 	/// doing a major sync as well. This other node that is doing a major sync will finish before
-	/// our node and send a block announcement message, but we don't have seen any block announcement
-	/// from this node in its sync process. Meaning our common number didn't change. It is now expected
-	/// that we start an ancestor search to find the common number.
+	/// our node and send a block announcement message, but we don't have seen any block
+	/// announcement from this node in its sync process. Meaning our common number didn't change. It
+	/// is now expected that we start an ancestor search to find the common number.
 	#[test]
 	fn do_ancestor_search_when_common_block_to_best_qeued_gap_is_to_big() {
 		sp_tracing::try_init_simple();
diff --git a/client/network/src/protocol/sync/blocks.rs b/client/network/src/protocol/sync/blocks.rs
index e93d0174b828..df3506e7a8b0 100644
--- a/client/network/src/protocol/sync/blocks.rs
+++ b/client/network/src/protocol/sync/blocks.rs
@@ -98,7 +98,8 @@ impl<B: BlockT> BlockCollection<B> {
 		);
 	}
 
-	/// Returns a set of block hashes that require a header download. The returned set is marked as being downloaded.
+	/// Returns a set of block hashes that require a header download. The returned set is marked as
+	/// being downloaded.
 	pub fn needed_blocks(
 		&mut self,
 		who: PeerId,
@@ -171,7 +172,8 @@ impl<B: BlockT> BlockCollection<B> {
 		Some(range)
 	}
 
-	/// Get a valid chain of blocks ordered in descending order and ready for importing into blockchain.
+	/// Get a valid chain of blocks ordered in descending order and ready for importing into
+	/// blockchain.
 	pub fn drain(&mut self, from: NumberFor<B>) -> Vec<BlockData<B>> {
 		let mut drained = Vec::new();
 		let mut ranges = Vec::new();
diff --git a/client/network/src/protocol/sync/extra_requests.rs b/client/network/src/protocol/sync/extra_requests.rs
index 52419b5d7702..3716384136ec 100644
--- a/client/network/src/protocol/sync/extra_requests.rs
+++ b/client/network/src/protocol/sync/extra_requests.rs
@@ -176,8 +176,8 @@ impl<B: BlockT> ExtraRequests<B> {
 		}
 
 		if best_finalized_number > self.best_seen_finalized_number {
-			// normally we'll receive finality notifications for every block => finalize would be enough
-			// but if many blocks are finalized at once, some notifications may be omitted
+			// normally we'll receive finality notifications for every block => finalize would be
+			// enough but if many blocks are finalized at once, some notifications may be omitted
 			// => let's use finalize_with_ancestors here
 			match self.tree.finalize_with_ancestors(
 				best_finalized_hash,
@@ -315,7 +315,8 @@ impl<'a, B: BlockT> Matcher<'a, B> {
 			for (peer, sync) in
 				peers.iter().filter(|(_, sync)| sync.state == PeerSyncState::Available)
 			{
-				// only ask peers that have synced at least up to the block number that we're asking the extra for
+				// only ask peers that have synced at least up to the block number that we're asking
+				// the extra for
 				if sync.best_number < request.1 {
 					continue
 				}
diff --git a/client/network/src/request_responses.rs b/client/network/src/request_responses.rs
index bd20f1610d1a..87a09bed4261 100644
--- a/client/network/src/request_responses.rs
+++ b/client/network/src/request_responses.rs
@@ -310,7 +310,8 @@ impl RequestResponsesBehaviour {
 
 	/// Initiates sending a request.
 	///
-	/// If there is no established connection to the target peer, the behavior is determined by the choice of `connect`.
+	/// If there is no established connection to the target peer, the behavior is determined by the
+	/// choice of `connect`.
 	///
 	/// An error is returned if the protocol doesn't match one that has been registered.
 	pub fn send_request(
@@ -700,8 +701,8 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 							return Poll::Ready(NetworkBehaviourAction::GenerateEvent(out))
 						},
 
-						// An inbound request failed, either while reading the request or due to failing
-						// to send a response.
+						// An inbound request failed, either while reading the request or due to
+						// failing to send a response.
 						RequestResponseEvent::InboundFailure {
 							request_id, peer, error, ..
 						} => {
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 31d4488bc9aa..c6a7a953fe72 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -729,7 +729,8 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	/// >			preventing the message from being delivered.
 	///
 	/// The protocol must have been registered with
-	/// [`NetworkConfiguration::notifications_protocols`](crate::config::NetworkConfiguration::notifications_protocols).
+	/// [`NetworkConfiguration::notifications_protocols`](crate::config::NetworkConfiguration::
+	/// notifications_protocols).
 	pub fn write_notification(
 		&self,
 		target: PeerId,
@@ -774,7 +775,8 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	/// Obtains a [`NotificationSender`] for a connected peer, if it exists.
 	///
 	/// A `NotificationSender` is scoped to a particular connection to the peer that holds
-	/// a receiver. With a `NotificationSender` at hand, sending a notification is done in two steps:
+	/// a receiver. With a `NotificationSender` at hand, sending a notification is done in two
+	/// steps:
 	///
 	/// 1.  [`NotificationSender::ready`] is used to wait for the sender to become ready
 	/// for another notification, yielding a [`NotificationSenderReady`] token.
@@ -794,7 +796,8 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	/// in which case enqueued notifications will be lost.
 	///
 	/// The protocol must have been registered with
-	/// [`NetworkConfiguration::notifications_protocols`](crate::config::NetworkConfiguration::notifications_protocols).
+	/// [`NetworkConfiguration::notifications_protocols`](crate::config::NetworkConfiguration::
+	/// notifications_protocols).
 	///
 	/// # Usage
 	///
@@ -883,10 +886,10 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	/// notifications should remain the default ways of communicating information. For example, a
 	/// peer can announce something through a notification, after which the recipient can obtain
 	/// more information by performing a request.
-	/// As such, call this function with `IfDisconnected::ImmediateError` for `connect`. This way you
-	/// will get an error immediately for disconnected peers, instead of waiting for a potentially very
-	/// long connection attempt, which would suggest that something is wrong anyway, as you are
-	/// supposed to be connected because of the notification protocol.
+	/// As such, call this function with `IfDisconnected::ImmediateError` for `connect`. This way
+	/// you will get an error immediately for disconnected peers, instead of waiting for a
+	/// potentially very long connection attempt, which would suggest that something is wrong
+	/// anyway, as you are supposed to be connected because of the notification protocol.
 	///
 	/// No limit or throttling of concurrent outbound requests per peer and protocol are enforced.
 	/// Such restrictions, if desired, need to be enforced at the call site(s).
@@ -914,7 +917,8 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 		}
 	}
 
-	/// Variation of `request` which starts a request whose response is delivered on a provided channel.
+	/// Variation of `request` which starts a request whose response is delivered on a provided
+	/// channel.
 	///
 	/// Instead of blocking and waiting for a reply, this function returns immediately, sending
 	/// responses via the passed in sender. This alternative API exists to make it easier to
@@ -1130,7 +1134,8 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	///
 	/// Returns an `Err` if one of the given addresses is invalid or contains an
 	/// invalid peer ID (which includes the local peer ID).
-	// NOTE: technically, this function only needs `Vec<PeerId>`, but we use `Multiaddr` here for convenience.
+	// NOTE: technically, this function only needs `Vec<PeerId>`, but we use `Multiaddr` here for
+	// convenience.
 	pub fn remove_peers_from_reserved_set(
 		&self,
 		protocol: Cow<'static, str>,
@@ -1198,7 +1203,8 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 	///
 	/// Returns an `Err` if one of the given addresses is invalid or contains an
 	/// invalid peer ID (which includes the local peer ID).
-	// NOTE: technically, this function only needs `Vec<PeerId>`, but we use `Multiaddr` here for convenience.
+	// NOTE: technically, this function only needs `Vec<PeerId>`, but we use `Multiaddr` here for
+	// convenience.
 	pub fn remove_from_peers_set(
 		&self,
 		protocol: Cow<'static, str>,
@@ -1314,7 +1320,8 @@ pub struct NotificationSender {
 }
 
 impl NotificationSender {
-	/// Returns a future that resolves when the `NotificationSender` is ready to send a notification.
+	/// Returns a future that resolves when the `NotificationSender` is ready to send a
+	/// notification.
 	pub async fn ready<'a>(
 		&'a self,
 	) -> Result<NotificationSenderReady<'a>, NotificationSenderError> {
@@ -1371,7 +1378,8 @@ impl<'a> NotificationSenderReady<'a> {
 /// Error returned by [`NetworkService::send_notification`].
 #[derive(Debug, derive_more::Display, derive_more::Error)]
 pub enum NotificationSenderError {
-	/// The notification receiver has been closed, usually because the underlying connection closed.
+	/// The notification receiver has been closed, usually because the underlying connection
+	/// closed.
 	///
 	/// Some of the notifications most recently sent may not have been received. However,
 	/// the peer may still be connected and a new `NotificationSender` for the same
diff --git a/client/network/src/warp_request_handler.rs b/client/network/src/warp_request_handler.rs
index beb9d1ce528a..0e45f2d43afa 100644
--- a/client/network/src/warp_request_handler.rs
+++ b/client/network/src/warp_request_handler.rs
@@ -49,7 +49,8 @@ pub enum VerificationResult<Block: BlockT> {
 
 /// Warp sync backend. Handles retrieveing and verifying warp sync proofs.
 pub trait WarpSyncProvider<B: BlockT>: Send + Sync {
-	/// Generate proof starting at given block hash. The proof is accumulated until maximum proof size is reached.
+	/// Generate proof starting at given block hash. The proof is accumulated until maximum proof
+	/// size is reached.
 	fn generate(
 		&self,
 		start: B::Hash,
@@ -61,11 +62,13 @@ pub trait WarpSyncProvider<B: BlockT>: Send + Sync {
 		set_id: SetId,
 		authorities: AuthorityList,
 	) -> Result<VerificationResult<B>, Box<dyn std::error::Error + Send + Sync>>;
-	/// Get current list of authorities. This is supposed to be genesis authorities when starting sync.
+	/// Get current list of authorities. This is supposed to be genesis authorities when starting
+	/// sync.
 	fn current_authorities(&self) -> AuthorityList;
 }
 
-/// Generates a [`RequestResponseConfig`] for the grandpa warp sync request protocol, refusing incoming requests.
+/// Generates a [`RequestResponseConfig`] for the grandpa warp sync request protocol, refusing
+/// incoming requests.
 pub fn generate_request_response_config(protocol_id: ProtocolId) -> RequestResponseConfig {
 	RequestResponseConfig {
 		name: generate_protocol_name(protocol_id).into(),
diff --git a/client/offchain/src/api/http_dummy.rs b/client/offchain/src/api/http_dummy.rs
index 386fc445d4e9..73d30396ab1c 100644
--- a/client/offchain/src/api/http_dummy.rs
+++ b/client/offchain/src/api/http_dummy.rs
@@ -25,7 +25,8 @@ use std::{
 	task::{Context, Poll},
 };
 
-/// Wrapper struct (wrapping nothing in case of http_dummy) used for keeping the hyper_rustls client running.
+/// Wrapper struct (wrapping nothing in case of http_dummy) used for keeping the hyper_rustls client
+/// running.
 #[derive(Clone)]
 pub struct SharedClient;
 
diff --git a/client/rpc-api/src/author/mod.rs b/client/rpc-api/src/author/mod.rs
index dbf729ea18ad..720598e0b32a 100644
--- a/client/rpc-api/src/author/mod.rs
+++ b/client/rpc-api/src/author/mod.rs
@@ -74,8 +74,8 @@ pub trait AuthorApi<Hash, BlockHash> {
 
 	/// Submit an extrinsic to watch.
 	///
-	/// See [`TransactionStatus`](sc_transaction_pool_api::TransactionStatus) for details on transaction
-	/// life cycle.
+	/// See [`TransactionStatus`](sc_transaction_pool_api::TransactionStatus) for details on
+	/// transaction life cycle.
 	#[pubsub(
 		subscription = "author_extrinsicUpdate",
 		subscribe,
diff --git a/client/rpc-api/src/state/mod.rs b/client/rpc-api/src/state/mod.rs
index b3048d7bb5ff..5b8e0ffc7afa 100644
--- a/client/rpc-api/src/state/mod.rs
+++ b/client/rpc-api/src/state/mod.rs
@@ -89,7 +89,8 @@ pub trait StateApi<Hash> {
 	#[rpc(name = "state_getRuntimeVersion", alias("chain_getRuntimeVersion"))]
 	fn runtime_version(&self, hash: Option<Hash>) -> FutureResult<RuntimeVersion>;
 
-	/// Query historical storage entries (by key) starting from a block given as the second parameter.
+	/// Query historical storage entries (by key) starting from a block given as the second
+	/// parameter.
 	///
 	/// NOTE This first returned result contains the initial state of storage for all keys.
 	/// Subsequent values in the vector represent changes to the previous state (diffs).
@@ -176,7 +177,8 @@ pub trait StateApi<Hash> {
 	/// ## Node requirements
 	///
 	/// - Fully synced archive node (i.e. a node that is not actively doing a "major" sync).
-	/// - [Tracing enabled WASM runtimes](#creating-tracing-enabled-wasm-runtimes) for all runtime versions
+	/// - [Tracing enabled WASM runtimes](#creating-tracing-enabled-wasm-runtimes) for all runtime
+	///   versions
 	/// for which tracing is desired.
 	///
 	/// ## Node recommendations
@@ -192,10 +194,12 @@ pub trait StateApi<Hash> {
 	/// - Add feature `with-tracing = ["frame-executive/with-tracing", "sp-io/with-tracing"]`
 	/// under `[features]` to the `runtime` packages' `Cargo.toml`.
 	/// - Compile the runtime with `cargo build --release --features with-tracing`
-	/// - Tracing-enabled WASM runtime should be found in `./target/release/wbuild/{{chain}}-runtime`
+	/// - Tracing-enabled WASM runtime should be found in
+	///   `./target/release/wbuild/{{chain}}-runtime`
 	/// and be called something like `{{your_chain}}_runtime.compact.wasm`. This can be
 	/// renamed/modified however you like, as long as it retains the `.wasm` extension.
-	/// - Run the node with the wasm blob overrides by placing them in a folder with all your runtimes,
+	/// - Run the node with the wasm blob overrides by placing them in a folder with all your
+	///   runtimes,
 	/// and passing the path of this folder to your chain, e.g.:
 	/// - `./target/release/polkadot --wasm-runtime-overrides /home/user/my-custom-wasm-runtimes`
 	///
diff --git a/client/rpc/src/author/mod.rs b/client/rpc/src/author/mod.rs
index 966959050c17..0cb24d25b206 100644
--- a/client/rpc/src/author/mod.rs
+++ b/client/rpc/src/author/mod.rs
@@ -215,7 +215,8 @@ where
 				},
 				Err(err) => {
 					warn!("Failed to submit extrinsic: {}", err);
-					// reject the subscriber (ignore errors - we don't care if subscriber is no longer there).
+					// reject the subscriber (ignore errors - we don't care if subscriber is no
+					// longer there).
 					let _ = subscriber.reject(err.into());
 				},
 			});
diff --git a/client/rpc/src/state/mod.rs b/client/rpc/src/state/mod.rs
index 9137404df3ee..472e50c74991 100644
--- a/client/rpc/src/state/mod.rs
+++ b/client/rpc/src/state/mod.rs
@@ -119,7 +119,8 @@ where
 	/// Get the runtime version.
 	fn runtime_version(&self, block: Option<Block::Hash>) -> FutureResult<RuntimeVersion>;
 
-	/// Query historical storage entries (by key) starting from a block given as the second parameter.
+	/// Query historical storage entries (by key) starting from a block given as the second
+	/// parameter.
 	///
 	/// NOTE This first returned result contains the initial state of storage for all keys.
 	/// Subsequent values in the vector represent changes to the previous state (diffs).
diff --git a/client/rpc/src/state/state_full.rs b/client/rpc/src/state/state_full.rs
index 313e89bdf80b..242a78d58579 100644
--- a/client/rpc/src/state/state_full.rs
+++ b/client/rpc/src/state/state_full.rs
@@ -208,7 +208,8 @@ where
 		Ok(())
 	}
 
-	/// Iterates through all blocks that are changing keys within range.filtered_range and collects these changes.
+	/// Iterates through all blocks that are changing keys within range.filtered_range and collects
+	/// these changes.
 	fn query_storage_filtered(
 		&self,
 		range: &QueryStorageRange<Block>,
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index 18f701d6f1b5..f9b68c4ae396 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -254,8 +254,9 @@ impl KeystoreContainer {
 	///
 	/// # Note
 	///
-	/// Using the [`LocalKeystore`] will result in loosing the ability to use any other keystore implementation, like
-	/// a remote keystore for example. Only use this if you a certain that you require it!
+	/// Using the [`LocalKeystore`] will result in loosing the ability to use any other keystore
+	/// implementation, like a remote keystore for example. Only use this if you a certain that you
+	/// require it!
 	pub fn local_keystore(&self) -> Option<Arc<LocalKeystore>> {
 		Some(self.local.clone())
 	}
diff --git a/client/service/src/chain_ops/import_blocks.rs b/client/service/src/chain_ops/import_blocks.rs
index 396e5b80f280..1ba9e0bd6144 100644
--- a/client/service/src/chain_ops/import_blocks.rs
+++ b/client/service/src/chain_ops/import_blocks.rs
@@ -272,8 +272,8 @@ where
 {
 	/// We are reading from the BlockIter structure, adding those blocks to the queue if possible.
 	Reading { block_iter: BlockIter<R, B> },
-	/// The queue is full (contains at least MAX_PENDING_BLOCKS blocks) and we are waiting for it to
-	/// catch up.
+	/// The queue is full (contains at least MAX_PENDING_BLOCKS blocks) and we are waiting for it
+	/// to catch up.
 	WaitingForImportQueueToCatchUp {
 		block_iter: BlockIter<R, B>,
 		delay: Delay,
diff --git a/client/service/src/client/call_executor.rs b/client/service/src/client/call_executor.rs
index 0710c4ae870e..23cc08b7e188 100644
--- a/client/service/src/client/call_executor.rs
+++ b/client/service/src/client/call_executor.rs
@@ -253,7 +253,6 @@ where
 				)
 				.set_parent_hash(at_hash);
 				// TODO: https://github.com/paritytech/substrate/issues/4455
-				// .with_storage_transaction_cache(storage_transaction_cache.as_mut().map(|c| &mut **c))
 				state_machine.execute_using_consensus_failure_handler(
 					execution_manager,
 					native_call.map(|n| || (n)().map_err(|e| Box::new(e) as Box<_>)),
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index 727d58dfa046..9439a06a5af9 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -827,8 +827,8 @@ where
 
 						let state_root = operation.op.reset_storage(storage)?;
 						if state_root != *import_headers.post().state_root() {
-							// State root mismatch when importing state. This should not happen in safe fast sync mode,
-							// but may happen in unsafe mode.
+							// State root mismatch when importing state. This should not happen in
+							// safe fast sync mode, but may happen in unsafe mode.
 							warn!("Error imporing state: State root mismatch.");
 							return Err(Error::InvalidStateRoot)
 						}
diff --git a/client/service/src/config.rs b/client/service/src/config.rs
index 6b10545886e7..67a4a2acfcb5 100644
--- a/client/service/src/config.rs
+++ b/client/service/src/config.rs
@@ -120,7 +120,8 @@ pub struct Configuration {
 	pub disable_grandpa: bool,
 	/// Development key seed.
 	///
-	/// When running in development mode, the seed will be used to generate authority keys by the keystore.
+	/// When running in development mode, the seed will be used to generate authority keys by the
+	/// keystore.
 	///
 	/// Should only be set when `node` is running development mode.
 	pub dev_key_seed: Option<String>,
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index b1dcc615a422..e9a6d2160676 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -342,7 +342,8 @@ mod waiting {
 	}
 }
 
-/// Starts RPC servers that run in their own thread, and returns an opaque object that keeps them alive.
+/// Starts RPC servers that run in their own thread, and returns an opaque object that keeps them
+/// alive.
 #[cfg(not(target_os = "unknown"))]
 fn start_rpc_servers<
 	H: FnMut(
@@ -428,7 +429,8 @@ fn start_rpc_servers<
 	)))
 }
 
-/// Starts RPC servers that run in their own thread, and returns an opaque object that keeps them alive.
+/// Starts RPC servers that run in their own thread, and returns an opaque object that keeps them
+/// alive.
 #[cfg(target_os = "unknown")]
 fn start_rpc_servers<
 	H: FnMut(
@@ -539,7 +541,8 @@ where
 					},
 					Err(e) => {
 						debug!("Error converting pool error: {:?}", e);
-						// it is not bad at least, just some internal node logic error, so peer is innocent.
+						// it is not bad at least, just some internal node logic error, so peer is
+						// innocent.
 						TransactionImport::KnownGood
 					},
 				},
diff --git a/client/service/test/src/client/mod.rs b/client/service/test/src/client/mod.rs
index 01d46c9678bc..84a9c5b91407 100644
--- a/client/service/test/src/client/mod.rs
+++ b/client/service/test/src/client/mod.rs
@@ -1826,7 +1826,8 @@ fn imports_blocks_with_changes_tries_config_change() {
 	// blocks 24,25 are changing the key
 	// block 26 is empty
 	// block 27 changes the key
-	// block 28 is the L1 digest (NOT SKEWED!!!) that covers changes AND changes configuration to 3^1
+	// block 28 is the L1 digest (NOT SKEWED!!!) that covers changes AND changes configuration to
+	// `3^1`
 	// ===================================================================
 	// block 29 is empty
 	// block 30 changes the key
diff --git a/client/state-db/src/lib.rs b/client/state-db/src/lib.rs
index cdff39895d22..44629975d781 100644
--- a/client/state-db/src/lib.rs
+++ b/client/state-db/src/lib.rs
@@ -25,15 +25,17 @@
 //! There's a limit of 32 blocks that may have the same block number in the canonicalization window.
 //!
 //! Canonicalization function selects one root from the top of the tree and discards all other roots
-//! and their subtrees. Upon canonicalization all trie nodes that were inserted in the block are added to
-//! the backing DB and block tracking is moved to the pruning window, where no forks are allowed.
+//! and their subtrees. Upon canonicalization all trie nodes that were inserted in the block are
+//! added to the backing DB and block tracking is moved to the pruning window, where no forks are
+//! allowed.
 //!
 //! # Canonicalization vs Finality
-//! Database engine uses a notion of canonicality, rather then finality. A canonical block may not be yet finalized
-//! from the perspective of the consensus engine, but it still can't be reverted in the database. Most of the time
-//! during normal operation last canonical block is the same as last finalized. However if finality stall for a
-//! long duration for some reason, there's only a certain number of blocks that can fit in the non-canonical overlay,
-//! so canonicalization of an unfinalized block may be forced.
+//! Database engine uses a notion of canonicality, rather then finality. A canonical block may not
+//! be yet finalized from the perspective of the consensus engine, but it still can't be reverted in
+//! the database. Most of the time during normal operation last canonical block is the same as last
+//! finalized. However if finality stall for a long duration for some reason, there's only a certain
+//! number of blocks that can fit in the non-canonical overlay, so canonicalization of an
+//! unfinalized block may be forced.
 //!
 //! # Pruning.
 //! See `RefWindow` for pruning algorithm details. `StateDb` prunes on each canonicalization until
@@ -177,7 +179,8 @@ pub struct CommitSet<H: Hash> {
 /// Pruning constraints. If none are specified pruning is
 #[derive(Default, Debug, Clone, Eq, PartialEq)]
 pub struct Constraints {
-	/// Maximum blocks. Defaults to 0 when unspecified, effectively keeping only non-canonical states.
+	/// Maximum blocks. Defaults to 0 when unspecified, effectively keeping only non-canonical
+	/// states.
 	pub max_blocks: Option<u32>,
 	/// Maximum memory in the pruning overlay.
 	pub max_mem: Option<usize>,
diff --git a/client/state-db/src/noncanonical.rs b/client/state-db/src/noncanonical.rs
index eff440d3375c..c726ceae4b05 100644
--- a/client/state-db/src/noncanonical.rs
+++ b/client/state-db/src/noncanonical.rs
@@ -241,7 +241,8 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 		})
 	}
 
-	/// Insert a new block into the overlay. If inserted on the second level or lover expects parent to be present in the window.
+	/// Insert a new block into the overlay. If inserted on the second level or lover expects parent
+	/// to be present in the window.
 	pub fn insert<E: fmt::Debug>(
 		&mut self,
 		hash: &BlockHash,
@@ -501,7 +502,8 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 			!self.pending_canonicalizations.contains(hash)
 	}
 
-	/// Revert a single level. Returns commit set that deletes the journal or `None` if not possible.
+	/// Revert a single level. Returns commit set that deletes the journal or `None` if not
+	/// possible.
 	pub fn revert_one(&mut self) -> Option<CommitSet<Key>> {
 		self.levels.pop_back().map(|level| {
 			let mut commit = CommitSet::default();
@@ -514,7 +516,8 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 		})
 	}
 
-	/// Revert a single block. Returns commit set that deletes the journal or `None` if not possible.
+	/// Revert a single block. Returns commit set that deletes the journal or `None` if not
+	/// possible.
 	pub fn remove(&mut self, hash: &BlockHash) -> Option<CommitSet<Key>> {
 		let mut commit = CommitSet::default();
 		let level_count = self.levels.len();
@@ -548,7 +551,8 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
 		self.pending_insertions.reverse();
 		for hash in self.pending_insertions.drain(..) {
 			self.parents.remove(&hash);
-			// find a level. When iterating insertions backwards the hash is always last in the level.
+			// find a level. When iterating insertions backwards the hash is always last in the
+			// level.
 			let level_index = self
 				.levels
 				.iter()
@@ -870,6 +874,7 @@ mod tests {
 	fn complex_tree() {
 		let mut db = make_db(&[]);
 
+		#[rustfmt::skip]
 		// - 1 - 1_1 - 1_1_1
 		//     \ 1_2 - 1_2_1
 		//           \ 1_2_2
@@ -1027,6 +1032,7 @@ mod tests {
 	fn keeps_pinned() {
 		let mut db = make_db(&[]);
 
+		#[rustfmt::skip]
 		// - 0 - 1_1
 		//     \ 1_2
 
@@ -1053,6 +1059,7 @@ mod tests {
 	fn keeps_pinned_ref_count() {
 		let mut db = make_db(&[]);
 
+		#[rustfmt::skip]
 		// - 0 - 1_1
 		//     \ 1_2
 		//     \ 1_3
@@ -1084,6 +1091,7 @@ mod tests {
 	fn pin_keeps_parent() {
 		let mut db = make_db(&[]);
 
+		#[rustfmt::skip]
 		// - 0 - 1_1 - 2_1
 		//     \ 1_2
 
@@ -1178,7 +1186,8 @@ mod tests {
 		db.commit(&commit);
 		overlay.apply_pending();
 
-		// add another block at top level. It should reuse journal index 0 of previously discarded block
+		// add another block at top level. It should reuse journal index 0 of previously discarded
+		// block
 		let h22 = H256::random();
 		db.commit(&overlay.insert::<io::Error>(&h22, 12, &h2, make_changeset(&[22], &[])).unwrap());
 		assert_eq!(overlay.levels[0].blocks[0].journal_index, 1);
diff --git a/client/state-db/src/pruning.rs b/client/state-db/src/pruning.rs
index bb0f7f796144..465c1ecda6cc 100644
--- a/client/state-db/src/pruning.rs
+++ b/client/state-db/src/pruning.rs
@@ -219,9 +219,10 @@ impl<BlockHash: Hash, Key: Hash> RefWindow<BlockHash, Key> {
 	/// Revert all pending changes
 	pub fn revert_pending(&mut self) {
 		// Revert pending deletions.
-		// Note that pending insertions might cause some existing deletions to be removed from `death_index`
-		// We don't bother to track and revert that for now. This means that a few nodes might end up no being
-		// deleted in case transaction fails and `revert_pending` is called.
+		// Note that pending insertions might cause some existing deletions to be removed from
+		// `death_index` We don't bother to track and revert that for now. This means that a few
+		// nodes might end up no being deleted in case transaction fails and `revert_pending` is
+		// called.
 		self.death_rows.truncate(self.death_rows.len() - self.pending_canonicalizations);
 		if self.count_insertions {
 			let new_max_block = self.death_rows.len() as u64 + self.pending_number;
diff --git a/client/telemetry/src/lib.rs b/client/telemetry/src/lib.rs
index 5bd839e07495..929931e3b628 100644
--- a/client/telemetry/src/lib.rs
+++ b/client/telemetry/src/lib.rs
@@ -29,10 +29,10 @@
 //! identify which substrate node is reporting the telemetry. Every task spawned using sc-service's
 //! `TaskManager` automatically inherit this span.
 //!
-//! Substrate's nodes initialize/register with the [`TelemetryWorker`] using a [`TelemetryWorkerHandle`].
-//! This handle can be cloned and passed around. It uses an asynchronous channel to communicate with
-//! the running [`TelemetryWorker`] dedicated to registration. Registering can happen at any point
-//! in time during the process execution.
+//! Substrate's nodes initialize/register with the [`TelemetryWorker`] using a
+//! [`TelemetryWorkerHandle`]. This handle can be cloned and passed around. It uses an asynchronous
+//! channel to communicate with the running [`TelemetryWorker`] dedicated to registration.
+//! Registering can happen at any point in time during the process execution.
 
 #![warn(missing_docs)]
 
diff --git a/client/telemetry/src/node.rs b/client/telemetry/src/node.rs
index 9e5738cb8477..4d845c328fe8 100644
--- a/client/telemetry/src/node.rs
+++ b/client/telemetry/src/node.rs
@@ -39,14 +39,14 @@ pub(crate) fn connection_notifier_channel() -> (ConnectionNotifierSender, Connec
 /// Handler for a single telemetry node.
 ///
 /// This is a wrapper `Sink` around a network `Sink` with 3 particularities:
-///  -  It is infallible: if the connection stops, it will reconnect automatically when the server
-///     becomes available again.
-///  -  It holds a list of "connection messages" which are sent automatically when the connection is
-///     (re-)established. This is used for the "system.connected" message that needs to be send for
-///     every substrate node that connects.
-///  -  It doesn't stay in pending while waiting for connection. Instead, it moves data into the
-///     void if the connection could not be established. This is important for the `Dispatcher`
-///     `Sink` which we don't want to block if one connection is broken.
+///  - It is infallible: if the connection stops, it will reconnect automatically when the server
+///    becomes available again.
+///  - It holds a list of "connection messages" which are sent automatically when the connection is
+///    (re-)established. This is used for the "system.connected" message that needs to be send for
+///    every substrate node that connects.
+///  - It doesn't stay in pending while waiting for connection. Instead, it moves data into the void
+///    if the connection could not be established. This is important for the `Dispatcher` `Sink`
+///    which we don't want to block if one connection is broken.
 #[derive(Debug)]
 pub(crate) struct Node<TTrans: Transport> {
 	/// Address of the node.
diff --git a/client/transaction-pool/api/src/lib.rs b/client/transaction-pool/api/src/lib.rs
index eb9b1b09b899..e861e6e0424d 100644
--- a/client/transaction-pool/api/src/lib.rs
+++ b/client/transaction-pool/api/src/lib.rs
@@ -203,7 +203,8 @@ pub trait TransactionPool: Send + Sync {
 		xt: TransactionFor<Self>,
 	) -> PoolFuture<TxHash<Self>, Self::Error>;
 
-	/// Returns a future that import a single transaction and starts to watch their progress in the pool.
+	/// Returns a future that import a single transaction and starts to watch their progress in the
+	/// pool.
 	fn submit_and_watch(
 		&self,
 		at: &BlockId<Self::Block>,
diff --git a/client/transaction-pool/src/graph/base_pool.rs b/client/transaction-pool/src/graph/base_pool.rs
index 86433bea4928..b5ff036c0139 100644
--- a/client/transaction-pool/src/graph/base_pool.rs
+++ b/client/transaction-pool/src/graph/base_pool.rs
@@ -322,7 +322,8 @@ impl<Hash: hash::Hash + Member + Serialize, Ex: std::fmt::Debug> BasePool<Hash,
 					if !first {
 						promoted.push(current_hash);
 					}
-					// The transactions were removed from the ready pool. We might attempt to re-import them.
+					// The transactions were removed from the ready pool. We might attempt to
+					// re-import them.
 					removed.append(&mut replaced);
 				},
 				// transaction failed to be imported.
@@ -382,9 +383,10 @@ impl<Hash: hash::Hash + Member + Serialize, Ex: std::fmt::Debug> BasePool<Hash,
 
 	/// Makes sure that the transactions in the queues stay within provided limits.
 	///
-	/// Removes and returns worst transactions from the queues and all transactions that depend on them.
-	/// Technically the worst transaction should be evaluated by computing the entire pending set.
-	/// We use a simplified approach to remove the transaction that occupies the pool for the longest time.
+	/// Removes and returns worst transactions from the queues and all transactions that depend on
+	/// them. Technically the worst transaction should be evaluated by computing the entire pending
+	/// set. We use a simplified approach to remove the transaction that occupies the pool for the
+	/// longest time.
 	pub fn enforce_limits(
 		&mut self,
 		ready: &Limit,
diff --git a/client/transaction-pool/src/graph/pool.rs b/client/transaction-pool/src/graph/pool.rs
index c04c167bc750..21ce46785f04 100644
--- a/client/transaction-pool/src/graph/pool.rs
+++ b/client/transaction-pool/src/graph/pool.rs
@@ -262,7 +262,8 @@ impl<B: ChainApi> Pool<B> {
 			extrinsics.iter().map(|extrinsic| self.hash_of(extrinsic)).collect::<Vec<_>>();
 		let in_pool_tags = self.validated_pool.extrinsics_tags(&in_pool_hashes);
 
-		// Zip the ones from the pool with the full list (we get pairs `(Extrinsic, Option<Vec<Tag>>)`)
+		// Zip the ones from the pool with the full list (we get pairs `(Extrinsic,
+		// Option<Vec<Tag>>)`)
 		let all = extrinsics.iter().zip(in_pool_tags.into_iter());
 
 		let mut future_tags = Vec::new();
@@ -1112,13 +1113,14 @@ mod tests {
 			block_on(pool.submit_one(&BlockId::Number(0), SOURCE, xt)).unwrap();
 			assert_eq!(pool.validated_pool().status().ready, 1);
 
-			// Now block import happens before the second transaction is able to finish verification.
+			// Now block import happens before the second transaction is able to finish
+			// verification.
 			block_on(pool.prune_tags(&BlockId::Number(1), vec![provides], vec![])).unwrap();
 			assert_eq!(pool.validated_pool().status().ready, 0);
 
 			// so when we release the verification of the previous one it will have
-			// something in `requires`, but should go to ready directly, since the previous transaction was imported
-			// correctly.
+			// something in `requires`, but should go to ready directly, since the previous
+			// transaction was imported correctly.
 			tx.send(()).unwrap();
 
 			// then
diff --git a/client/transaction-pool/src/graph/ready.rs b/client/transaction-pool/src/graph/ready.rs
index ac842b99bf12..03689aeb32e6 100644
--- a/client/transaction-pool/src/graph/ready.rs
+++ b/client/transaction-pool/src/graph/ready.rs
@@ -114,7 +114,8 @@ pub struct ReadyTransactions<Hash: hash::Hash + Eq, Ex> {
 	provided_tags: HashMap<Tag, Hash>,
 	/// Transactions that are ready (i.e. don't have any requirements external to the pool)
 	ready: TrackedMap<Hash, ReadyTx<Hash, Ex>>,
-	/// Best transactions that are ready to be included to the block without any other previous transaction.
+	/// Best transactions that are ready to be included to the block without any other previous
+	/// transaction.
 	best: BTreeSet<TransactionRef<Hash, Ex>>,
 }
 
@@ -145,10 +146,12 @@ impl<Hash: hash::Hash + Member + Serialize, Ex> ReadyTransactions<Hash, Ex> {
 	///
 	/// Transactions are returned in order:
 	/// 1. First by the dependencies:
-	/// 	- never return transaction that requires a tag, which was not provided by one of the previously
+	/// 	- never return transaction that requires a tag, which was not provided by one of the
+	///    previously
 	/// returned transactions
 	/// 2. Then by priority:
-	/// - If there are two transactions with all requirements satisfied the one with higher priority goes first.
+	/// - If there are two transactions with all requirements satisfied the one with higher priority
+	///   goes first.
 	/// 3. Then by the ttl that's left
 	/// - transactions that are valid for a shorter time go first
 	/// 4. Lastly we sort by the time in the queue
@@ -252,8 +255,8 @@ impl<Hash: hash::Hash + Member + Serialize, Ex> ReadyTransactions<Hash, Ex> {
 
 	/// Removes a subtree of transactions from the ready pool.
 	///
-	/// NOTE removing a transaction will also cause a removal of all transactions that depend on that one
-	/// (i.e. the entire subgraph that this transaction is a start of will be removed).
+	/// NOTE removing a transaction will also cause a removal of all transactions that depend on
+	/// that one (i.e. the entire subgraph that this transaction is a start of will be removed).
 	/// All removed transactions are returned.
 	pub fn remove_subtree(&mut self, hashes: &[Hash]) -> Vec<Arc<Transaction<Hash, Ex>>> {
 		let to_remove = hashes.to_vec();
diff --git a/client/transaction-pool/src/graph/validated_pool.rs b/client/transaction-pool/src/graph/validated_pool.rs
index 3ac7f002077c..a0adeef6831f 100644
--- a/client/transaction-pool/src/graph/validated_pool.rs
+++ b/client/transaction-pool/src/graph/validated_pool.rs
@@ -393,8 +393,9 @@ impl<B: ChainApi> ValidatedPool<B> {
 							},
 							Err(err) => {
 								// we do not want to fail if single transaction import has failed
-								// nor we do want to propagate this error, because it could tx unknown to caller
-								// => let's just notify listeners (and issue debug message)
+								// nor we do want to propagate this error, because it could tx
+								// unknown to caller => let's just notify listeners (and issue debug
+								// message)
 								log::warn!(
 									target: "txpool",
 									"[{:?}] Removing invalid transaction from update: {}",
@@ -490,7 +491,8 @@ impl<B: ChainApi> ValidatedPool<B> {
 		// Resubmit pruned transactions
 		let results = self.submit(pruned_xts);
 
-		// Collect the hashes of transactions that now became invalid (meaning that they are successfully pruned).
+		// Collect the hashes of transactions that now became invalid (meaning that they are
+		// successfully pruned).
 		let hashes = results.into_iter().enumerate().filter_map(|(idx, r)| {
 			match r.map_err(error::IntoPoolError::into_pool_error) {
 				Err(Ok(error::Error::InvalidTransaction(_))) => Some(pruned_hashes[idx]),
diff --git a/frame/assets/src/functions.rs b/frame/assets/src/functions.rs
index 6e6847ad7dfb..81b490eaf877 100644
--- a/frame/assets/src/functions.rs
+++ b/frame/assets/src/functions.rs
@@ -439,7 +439,8 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 
 			// Burn any dust if needed.
 			if let Some(burn) = maybe_burn {
-				// Debit dust from supply; this will not saturate since it's already checked in prep.
+				// Debit dust from supply; this will not saturate since it's already checked in
+				// prep.
 				debug_assert!(details.supply >= burn, "checked in prep; qed");
 				details.supply = details.supply.saturating_sub(burn);
 			}
diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index 65878672c9a7..386a3ea05c08 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -43,8 +43,8 @@
 //!   account that issues the asset. This is a privileged operation.
 //! * **Asset transfer**: The reduction of the balance of an asset of one account with the
 //!   corresponding increase in the balance of another.
-//! * **Asset destruction**: The process of reduce the balance of an asset of one account. This is
-//!   a privileged operation.
+//! * **Asset destruction**: The process of reduce the balance of an asset of one account. This is a
+//!   privileged operation.
 //! * **Fungible asset**: An asset whose units are interchangeable.
 //! * **Issuer**: An account ID uniquely privileged to be able to mint a particular class of assets.
 //! * **Freezer**: An account ID uniquely privileged to be able to freeze an account from
@@ -54,8 +54,8 @@
 //! * **Non-fungible asset**: An asset for which each unit has unique characteristics.
 //! * **Owner**: An account ID uniquely privileged to be able to destroy a particular asset class,
 //!   or to set the Issuer, Freezer or Admin of that asset class.
-//! * **Approval**: The act of allowing an account the permission to transfer some
-//!   balance of asset from the approving account into some third-party destination account.
+//! * **Approval**: The act of allowing an account the permission to transfer some balance of asset
+//!   from the approving account into some third-party destination account.
 //! * **Sufficiency**: The idea of a minimum-balance of an asset being sufficient to allow the
 //!   account's existence on the system without requiring any other existential-deposit.
 //!
@@ -104,7 +104,8 @@
 //! * `set_team`: Changes an asset class's Admin, Freezer and Issuer; called by the asset class's
 //!   Owner.
 //!
-//! Please refer to the [`Call`] enum and its associated variants for documentation on each function.
+//! Please refer to the [`Call`] enum and its associated variants for documentation on each
+//! function.
 //!
 //! ### Public Functions
 //! <!-- Original author of descriptions: @gavofyork -->
@@ -339,7 +340,8 @@ pub mod pallet {
 		BadWitness,
 		/// Minimum balance should be non-zero.
 		MinBalanceZero,
-		/// No provider reference exists to allow a non-zero balance of a non-self-sufficient asset.
+		/// No provider reference exists to allow a non-zero balance of a non-self-sufficient
+		/// asset.
 		NoProvider,
 		/// Invalid metadata given.
 		BadMetadata,
@@ -418,8 +420,8 @@ pub mod pallet {
 		/// - `id`: The identifier of the new asset. This must not be currently in use to identify
 		/// an existing asset.
 		/// - `owner`: The owner of this class of assets. The owner has full superuser permissions
-		/// over this asset, but may later change and configure the permissions using `transfer_ownership`
-		/// and `set_team`.
+		/// over this asset, but may later change and configure the permissions using
+		/// `transfer_ownership` and `set_team`.
 		/// - `min_balance`: The minimum balance of this new asset that any single account must
 		/// have. If an account's balance is reduced below this, then it collapses to zero.
 		///
diff --git a/frame/assets/src/types.rs b/frame/assets/src/types.rs
index 810b83506e2b..5e867550b380 100644
--- a/frame/assets/src/types.rs
+++ b/frame/assets/src/types.rs
@@ -183,7 +183,8 @@ pub enum ConversionError {
 	MinBalanceZero,
 	/// The asset is not present in storage.
 	AssetMissing,
-	/// The asset is not sufficient and thus does not have a reliable `min_balance` so it cannot be converted.
+	/// The asset is not sufficient and thus does not have a reliable `min_balance` so it cannot be
+	/// converted.
 	AssetNotSufficient,
 }
 
@@ -210,10 +211,11 @@ where
 {
 	type Error = ConversionError;
 
-	/// Convert the given balance value into an asset balance based on the ratio between the fungible's
-	/// minimum balance and the minimum asset balance.
+	/// Convert the given balance value into an asset balance based on the ratio between the
+	/// fungible's minimum balance and the minimum asset balance.
 	///
-	/// Will return `Err` if the asset is not found, not sufficient or the fungible's minimum balance is zero.
+	/// Will return `Err` if the asset is not found, not sufficient or the fungible's minimum
+	/// balance is zero.
 	fn to_asset_balance(
 		balance: BalanceOf<F, T>,
 		asset_id: AssetIdOf<T, I>,
diff --git a/frame/atomic-swap/src/lib.rs b/frame/atomic-swap/src/lib.rs
index ac78024a10dc..b068dc7ba1a9 100644
--- a/frame/atomic-swap/src/lib.rs
+++ b/frame/atomic-swap/src/lib.rs
@@ -165,14 +165,14 @@ pub mod pallet {
 		type SwapAction: SwapAction<Self::AccountId, Self> + Parameter;
 		/// Limit of proof size.
 		///
-		/// Atomic swap is only atomic if once the proof is revealed, both parties can submit the proofs
-		/// on-chain. If A is the one that generates the proof, then it requires that either:
+		/// Atomic swap is only atomic if once the proof is revealed, both parties can submit the
+		/// proofs on-chain. If A is the one that generates the proof, then it requires that either:
 		/// - A's blockchain has the same proof length limit as B's blockchain.
 		/// - Or A's blockchain has shorter proof length limit as B's blockchain.
 		///
-		/// If B sees A is on a blockchain with larger proof length limit, then it should kindly refuse
-		/// to accept the atomic swap request if A generates the proof, and asks that B generates the
-		/// proof instead.
+		/// If B sees A is on a blockchain with larger proof length limit, then it should kindly
+		/// refuse to accept the atomic swap request if A generates the proof, and asks that B
+		/// generates the proof instead.
 		#[pallet::constant]
 		type ProofLimit: Get<u32>;
 	}
diff --git a/frame/aura/src/lib.rs b/frame/aura/src/lib.rs
index ebb869194ad2..1138a3e8505a 100644
--- a/frame/aura/src/lib.rs
+++ b/frame/aura/src/lib.rs
@@ -28,7 +28,8 @@
 //!
 //! ### Public Functions
 //!
-//! - `slot_duration` - Determine the Aura slot-duration based on the Timestamp module configuration.
+//! - `slot_duration` - Determine the Aura slot-duration based on the Timestamp module
+//!   configuration.
 //!
 //! ## Related Modules
 //!
@@ -99,7 +100,8 @@ pub mod pallet {
 					}
 				}
 
-				// TODO [#3398] Generate offence report for all authorities that skipped their slots.
+				// TODO [#3398] Generate offence report for all authorities that skipped their
+				// slots.
 
 				T::DbWeight::get().reads_writes(2, 1)
 			} else {
diff --git a/frame/authorship/src/lib.rs b/frame/authorship/src/lib.rs
index 43d48df46437..325f80c74aa1 100644
--- a/frame/authorship/src/lib.rs
+++ b/frame/authorship/src/lib.rs
@@ -140,8 +140,8 @@ pub mod pallet {
 		/// further constraints on what uncles can be included, other than their ancestry.
 		///
 		/// For PoW, as long as the seals are checked, there is no need to use anything
-		/// but the `VerifySeal` implementation as the filter. This is because the cost of making many equivocating
-		/// uncles is high.
+		/// but the `VerifySeal` implementation as the filter. This is because the cost of making
+		/// many equivocating uncles is high.
 		///
 		/// For PoS, there is no such limitation, so a further constraint must be imposed
 		/// beyond a seal check in order to prevent an arbitrary number of
diff --git a/frame/babe/src/lib.rs b/frame/babe/src/lib.rs
index cb2f2168a221..b39074bb3f05 100644
--- a/frame/babe/src/lib.rs
+++ b/frame/babe/src/lib.rs
@@ -135,8 +135,8 @@ pub mod pallet {
 		/// BABE requires some logic to be triggered on every block to query for whether an epoch
 		/// has ended and to perform the transition to the next epoch.
 		///
-		/// Typically, the `ExternalTrigger` type should be used. An internal trigger should only be used
-		/// when no other module is responsible for changing authority set.
+		/// Typically, the `ExternalTrigger` type should be used. An internal trigger should only be
+		/// used when no other module is responsible for changing authority set.
 		type EpochChangeTrigger: EpochChangeTrigger;
 
 		/// A way to check whether a given validator is disabled and should not be authoring blocks.
@@ -281,7 +281,8 @@ pub mod pallet {
 	#[pallet::getter(fn lateness)]
 	pub(super) type Lateness<T: Config> = StorageValue<_, T::BlockNumber, ValueQuery>;
 
-	/// The configuration for the current epoch. Should never be `None` as it is initialized in genesis.
+	/// The configuration for the current epoch. Should never be `None` as it is initialized in
+	/// genesis.
 	#[pallet::storage]
 	pub(super) type EpochConfig<T> = StorageValue<_, BabeEpochConfiguration>;
 
@@ -496,11 +497,11 @@ impl<T: Config> Pallet<T> {
 		})
 	}
 
-	/// DANGEROUS: Enact an epoch change. Should be done on every block where `should_epoch_change` has returned `true`,
-	/// and the caller is the only caller of this function.
+	/// DANGEROUS: Enact an epoch change. Should be done on every block where `should_epoch_change`
+	/// has returned `true`, and the caller is the only caller of this function.
 	///
-	/// Typically, this is not handled directly by the user, but by higher-level validator-set manager logic like
-	/// `pallet-session`.
+	/// Typically, this is not handled directly by the user, but by higher-level validator-set
+	/// manager logic like `pallet-session`.
 	pub fn enact_epoch_change(
 		authorities: Vec<(AuthorityId, BabeAuthorityWeight)>,
 		next_authorities: Vec<(AuthorityId, BabeAuthorityWeight)>,
diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index c955d917a643..7ab8a54de232 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -38,17 +38,18 @@
 //!
 //! ### Terminology
 //!
-//! - **Existential Deposit:** The minimum balance required to create or keep an account open. This prevents
-//!   "dust accounts" from filling storage. When the free plus the reserved balance (i.e. the total balance)
-//!   fall below this, then the account is said to be dead; and it loses its functionality as well as any
-//!   prior history and all information on it is removed from the chain's state.
-//!   No account should ever have a total balance that is strictly between 0 and the existential
-//!   deposit (exclusive). If this ever happens, it indicates either a bug in this pallet or an
-//!   erroneous raw mutation of storage.
+//! - **Existential Deposit:** The minimum balance required to create or keep an account open. This
+//!   prevents "dust accounts" from filling storage. When the free plus the reserved balance (i.e.
+//!   the total balance) fall below this, then the account is said to be dead; and it loses its
+//!   functionality as well as any prior history and all information on it is removed from the
+//!   chain's state. No account should ever have a total balance that is strictly between 0 and the
+//!   existential deposit (exclusive). If this ever happens, it indicates either a bug in this
+//!   pallet or an erroneous raw mutation of storage.
 //!
 //! - **Total Issuance:** The total number of units in existence in a system.
 //!
-//! - **Reaping an account:** The act of removing an account by resetting its nonce. Happens after its
+//! - **Reaping an account:** The act of removing an account by resetting its nonce. Happens after
+//!   its
 //! total balance has become zero (or, strictly speaking, less than the Existential Deposit).
 //!
 //! - **Free Balance:** The portion of a balance that is not reserved. The free balance is the only
@@ -57,18 +58,21 @@
 //! - **Reserved Balance:** Reserved balance still belongs to the account holder, but is suspended.
 //!   Reserved balance can still be slashed, but only after all the free balance has been slashed.
 //!
-//! - **Imbalance:** A condition when some funds were credited or debited without equal and opposite accounting
-//! (i.e. a difference between total issuance and account balances). Functions that result in an imbalance will
-//! return an object of the `Imbalance` trait that can be managed within your runtime logic. (If an imbalance is
-//! simply dropped, it should automatically maintain any book-keeping such as total issuance.)
+//! - **Imbalance:** A condition when some funds were credited or debited without equal and opposite
+//!   accounting
+//! (i.e. a difference between total issuance and account balances). Functions that result in an
+//! imbalance will return an object of the `Imbalance` trait that can be managed within your runtime
+//! logic. (If an imbalance is simply dropped, it should automatically maintain any book-keeping
+//! such as total issuance.)
 //!
-//! - **Lock:** A freeze on a specified amount of an account's free balance until a specified block number. Multiple
+//! - **Lock:** A freeze on a specified amount of an account's free balance until a specified block
+//!   number. Multiple
 //! locks always operate over the same funds, so they "overlay" rather than "stack".
 //!
 //! ### Implementations
 //!
-//! The Balances pallet provides implementations for the following traits. If these traits provide the functionality
-//! that you need, then you can avoid coupling with the Balances pallet.
+//! The Balances pallet provides implementations for the following traits. If these traits provide
+//! the functionality that you need, then you can avoid coupling with the Balances pallet.
 //!
 //! - [`Currency`](frame_support::traits::Currency): Functions for dealing with a
 //! fungible assets system.
@@ -78,8 +82,8 @@
 //! - [`LockableCurrency`](frame_support::traits::LockableCurrency): Functions for
 //! dealing with accounts that allow liquidity restrictions.
 //! - [`Imbalance`](frame_support::traits::Imbalance): Functions for handling
-//! imbalances between total issuance in the system and account balances. Must be used when a function
-//! creates new funds (e.g. a reward) or destroys some funds (e.g. a system fee).
+//! imbalances between total issuance in the system and account balances. Must be used when a
+//! function creates new funds (e.g. a reward) or destroys some funds (e.g. a system fee).
 //!
 //! ## Interface
 //!
@@ -94,7 +98,8 @@
 //!
 //! ### Examples from the FRAME
 //!
-//! The Contract pallet uses the `Currency` trait to handle gas payment, and its types inherit from `Currency`:
+//! The Contract pallet uses the `Currency` trait to handle gas payment, and its types inherit from
+//! `Currency`:
 //!
 //! ```
 //! use frame_support::traits::Currency;
@@ -249,18 +254,19 @@ pub mod pallet {
 		/// The dispatch origin for this call must be `Signed` by the transactor.
 		///
 		/// # <weight>
-		/// - Dependent on arguments but not critical, given proper implementations for
-		///   input config types. See related functions below.
-		/// - It contains a limited number of reads and writes internally and no complex computation.
+		/// - Dependent on arguments but not critical, given proper implementations for input config
+		///   types. See related functions below.
+		/// - It contains a limited number of reads and writes internally and no complex
+		///   computation.
 		///
 		/// Related functions:
 		///
 		///   - `ensure_can_withdraw` is always called internally but has a bounded complexity.
 		///   - Transferring balances to accounts that did not exist before will cause
-		///      `T::OnNewAccount::on_new_account` to be called.
+		///     `T::OnNewAccount::on_new_account` to be called.
 		///   - Removing enough funds from an account will trigger `T::DustRemoval::on_unbalanced`.
-		///   - `transfer_keep_alive` works the same way as `transfer`, but has an additional
-		///     check that the transfer will not kill the origin account.
+		///   - `transfer_keep_alive` works the same way as `transfer`, but has an additional check
+		///     that the transfer will not kill the origin account.
 		/// ---------------------------------
 		/// - Base Weight: 73.64 µs, worst case scenario (account created, account removed)
 		/// - DB Weight: 1 Read and 1 Write to destination account
@@ -344,8 +350,8 @@ pub mod pallet {
 		/// Exactly as `transfer`, except the origin must be root and the source account may be
 		/// specified.
 		/// # <weight>
-		/// - Same as transfer, but additional read and write because the source account is
-		///   not assumed to be in the overlay.
+		/// - Same as transfer, but additional read and write because the source account is not
+		///   assumed to be in the overlay.
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::force_transfer())]
 		pub fn force_transfer(
@@ -403,8 +409,7 @@ pub mod pallet {
 		/// - `keep_alive`: A boolean to determine if the `transfer_all` operation should send all
 		///   of the funds the account has, causing the sender account to be killed (false), or
 		///   transfer everything except at least the existential deposit, which will guarantee to
-		///   keep the sender account alive (true).
-		///   # <weight>
+		///   keep the sender account alive (true). # <weight>
 		/// - O(1). Just like transfer, but reading the user's transferable balance first.
 		///   #</weight>
 		#[pallet::weight(T::WeightInfo::transfer_all())]
@@ -1052,8 +1057,8 @@ impl<T: Config<I>, I: 'static> fungible::Inspect<T::AccountId> for Pallet<T, I>
 		if frame_system::Pallet::<T>::can_dec_provider(who) && !keep_alive {
 			liquid
 		} else {
-			// `must_remain_to_exist` is the part of liquid balance which must remain to keep total over
-			// ED.
+			// `must_remain_to_exist` is the part of liquid balance which must remain to keep total
+			// over ED.
 			let must_remain_to_exist =
 				T::ExistentialDeposit::get().saturating_sub(a.total() - liquid);
 			liquid.saturating_sub(must_remain_to_exist)
@@ -1464,8 +1469,8 @@ where
 							.checked_sub(&value)
 							.ok_or(Error::<T, I>::InsufficientBalance)?;
 
-						// NOTE: total stake being stored in the same type means that this could never overflow
-						// but better to be safe than sorry.
+						// NOTE: total stake being stored in the same type means that this could
+						// never overflow but better to be safe than sorry.
 						to_account.free =
 							to_account.free.checked_add(&value).ok_or(ArithmeticError::Overflow)?;
 
@@ -1480,8 +1485,8 @@ where
 						)
 						.map_err(|_| Error::<T, I>::LiquidityRestrictions)?;
 
-						// TODO: This is over-conservative. There may now be other providers, and this pallet
-						//   may not even be a provider.
+						// TODO: This is over-conservative. There may now be other providers, and
+						// this pallet   may not even be a provider.
 						let allow_death = existence_requirement == ExistenceRequirement::AllowDeath;
 						let allow_death =
 							allow_death && system::Pallet::<T>::can_dec_provider(transactor);
@@ -1509,9 +1514,9 @@ where
 	/// Is a no-op if `value` to be slashed is zero or the account does not exist.
 	///
 	/// NOTE: `slash()` prefers free balance, but assumes that reserve balance can be drawn
-	/// from in extreme circumstances. `can_slash()` should be used prior to `slash()` to avoid having
-	/// to draw from reserved funds, however we err on the side of punishment if things are inconsistent
-	/// or `can_slash` wasn't used appropriately.
+	/// from in extreme circumstances. `can_slash()` should be used prior to `slash()` to avoid
+	/// having to draw from reserved funds, however we err on the side of punishment if things are
+	/// inconsistent or `can_slash` wasn't used appropriately.
 	fn slash(who: &T::AccountId, value: Self::Balance) -> (Self::NegativeImbalance, Self::Balance) {
 		if value.is_zero() {
 			return (NegativeImbalance::zero(), Zero::zero())
@@ -1528,7 +1533,8 @@ where
 				 -> Result<(Self::NegativeImbalance, Self::Balance), DispatchError> {
 					// Best value is the most amount we can slash following liveness rules.
 					let best_value = match attempt {
-						// First attempt we try to slash the full amount, and see if liveness issues happen.
+						// First attempt we try to slash the full amount, and see if liveness issues
+						// happen.
 						0 => value,
 						// If acting as a critical provider (i.e. first attempt failed), then slash
 						// as much as possible while leaving at least at ED.
@@ -1548,7 +1554,8 @@ where
 						account.reserved -= reserved_slash; // Safe because of above check
 						Ok((
 							NegativeImbalance::new(free_slash + reserved_slash),
-							value - free_slash - reserved_slash, /* Safe because value is gt or eq total slashed */
+							value - free_slash - reserved_slash, /* Safe because value is gt or
+							                                      * eq total slashed */
 						))
 					} else {
 						// Else we are done!
@@ -1593,8 +1600,10 @@ where
 	///
 	/// This function is a no-op if:
 	/// - the `value` to be deposited is zero; or
-	/// - the `value` to be deposited is less than the required ED and the account does not yet exist; or
-	/// - the deposit would necessitate the account to exist and there are no provider references; or
+	/// - the `value` to be deposited is less than the required ED and the account does not yet
+	///   exist; or
+	/// - the deposit would necessitate the account to exist and there are no provider references;
+	///   or
 	/// - `value` is so large it would cause the balance of `who` to overflow.
 	fn deposit_creating(who: &T::AccountId, value: Self::Balance) -> Self::PositiveImbalance {
 		if value.is_zero() {
@@ -1744,8 +1753,8 @@ where
 		let actual = match Self::mutate_account(who, |account| {
 			let actual = cmp::min(account.reserved, value);
 			account.reserved -= actual;
-			// defensive only: this can never fail since total issuance which is at least free+reserved
-			// fits into the same data type.
+			// defensive only: this can never fail since total issuance which is at least
+			// free+reserved fits into the same data type.
 			account.free = account.free.saturating_add(actual);
 			actual
 		}) {
@@ -1991,7 +2000,8 @@ where
 												status,
 											)?;
 
-										// remain should always be zero but just to be defensive here
+										// remain should always be zero but just to be defensive
+										// here
 										let actual = to_change.saturating_sub(remain);
 
 										// this add can't overflow but just to be defensive.
@@ -2009,7 +2019,8 @@ where
 												status,
 											)?;
 
-										// remain should always be zero but just to be defensive here
+										// remain should always be zero but just to be defensive
+										// here
 										let actual = to_change.saturating_sub(remain);
 
 										reserves
diff --git a/frame/benchmarking/src/analysis.rs b/frame/benchmarking/src/analysis.rs
index fffa6828cede..4944de8553f8 100644
--- a/frame/benchmarking/src/analysis.rs
+++ b/frame/benchmarking/src/analysis.rs
@@ -74,8 +74,8 @@ impl TryFrom<Option<String>> for AnalysisChoice {
 }
 
 impl Analysis {
-	// Useful for when there are no components, and we just need an median value of the benchmark results.
-	// Note: We choose the median value because it is more robust to outliers.
+	// Useful for when there are no components, and we just need an median value of the benchmark
+	// results. Note: We choose the median value because it is more robust to outliers.
 	fn median_value(r: &Vec<BenchmarkResults>, selector: BenchmarkSelector) -> Option<Self> {
 		if r.is_empty() {
 			return None
diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
index 1680e7331510..673f6dee6fc7 100644
--- a/frame/benchmarking/src/lib.rs
+++ b/frame/benchmarking/src/lib.rs
@@ -675,7 +675,7 @@ macro_rules! benchmark_backend {
 // Every variant must implement [`BenchmarkingSetup`].
 //
 // ```nocompile
-//
+// 
 // struct Transfer;
 // impl BenchmarkingSetup for Transfer { ... }
 //
@@ -1032,11 +1032,12 @@ macro_rules! impl_benchmark_test {
 /// );
 /// ```
 ///
-/// There is an optional fourth argument, with keyword syntax: `benchmarks_path = path_to_benchmarks_invocation`.
-/// In the typical case in which this macro is in the same module as the `benchmarks!` invocation,
-/// you don't need to supply this. However, if the `impl_benchmark_test_suite!` invocation is in a
-/// different module than the `benchmarks!` invocation, then you should provide the path to the
-/// module containing the `benchmarks!` invocation:
+/// There is an optional fourth argument, with keyword syntax: `benchmarks_path =
+/// path_to_benchmarks_invocation`. In the typical case in which this macro is in the same module as
+/// the `benchmarks!` invocation, you don't need to supply this. However, if the
+/// `impl_benchmark_test_suite!` invocation is in a different module than the `benchmarks!`
+/// invocation, then you should provide the path to the module containing the `benchmarks!`
+/// invocation:
 ///
 /// ```rust,ignore
 /// mod benches {
@@ -1065,7 +1066,8 @@ macro_rules! impl_benchmark_test {
 /// to these restrictions:
 ///
 /// - It must be the name of a method applied to the output of the `new_test_ext` argument.
-/// - That method must have a signature capable of receiving a single argument of the form `impl FnOnce()`.
+/// - That method must have a signature capable of receiving a single argument of the form `impl
+///   FnOnce()`.
 // ## Notes (not for rustdoc)
 //
 // The biggest challenge for this macro is communicating the actual test functions to be run. We
@@ -1258,8 +1260,8 @@ pub fn show_benchmark_debug_info(
 /// ```
 ///
 /// The `whitelist` is a parameter you pass to control the DB read/write tracking.
-/// We use a vector of [TrackedStorageKey](./struct.TrackedStorageKey.html), which is a simple struct used to set
-/// if a key has been read or written to.
+/// We use a vector of [TrackedStorageKey](./struct.TrackedStorageKey.html), which is a simple
+/// struct used to set if a key has been read or written to.
 ///
 /// For values that should be skipped entirely, we can just pass `key.into()`. For example:
 ///
diff --git a/frame/benchmarking/src/utils.rs b/frame/benchmarking/src/utils.rs
index c9662bf6fdff..8be25f7f5e9c 100644
--- a/frame/benchmarking/src/utils.rs
+++ b/frame/benchmarking/src/utils.rs
@@ -202,7 +202,8 @@ pub trait Benchmarking {
 	fn add_to_whitelist(&mut self, add: TrackedStorageKey) {
 		let mut whitelist = self.get_whitelist();
 		match whitelist.iter_mut().find(|x| x.key == add.key) {
-			// If we already have this key in the whitelist, update to be the most constrained value.
+			// If we already have this key in the whitelist, update to be the most constrained
+			// value.
 			Some(item) => {
 				item.reads += add.reads;
 				item.writes += add.writes;
@@ -239,8 +240,8 @@ pub trait Benchmarking<T> {
 	/// extrinsic, so these are sometimes just called "extrinsics".
 	///
 	/// Parameters
-	/// - `extra`: Also return benchmarks marked "extra" which would otherwise not be
-	///            needed for weight calculation.
+	/// - `extra`: Also return benchmarks marked "extra" which would otherwise not be needed for
+	///   weight calculation.
 	fn benchmarks(extra: bool) -> Vec<BenchmarkMetadata>;
 
 	/// Run the benchmarks for this pallet.
diff --git a/frame/bounties/src/lib.rs b/frame/bounties/src/lib.rs
index 4700b1d34d81..a5be4a00cb94 100644
--- a/frame/bounties/src/lib.rs
+++ b/frame/bounties/src/lib.rs
@@ -161,7 +161,8 @@ pub enum BountyStatus<AccountId, BlockNumber> {
 	Approved,
 	/// The bounty is funded and waiting for curator assignment.
 	Funded,
-	/// A curator has been proposed by the `ApproveOrigin`. Waiting for acceptance from the curator.
+	/// A curator has been proposed by the `ApproveOrigin`. Waiting for acceptance from the
+	/// curator.
 	CuratorProposed {
 		/// The assigned curator of this bounty.
 		curator: AccountId,
diff --git a/frame/bounties/src/tests.rs b/frame/bounties/src/tests.rs
index f945d0b2dbd2..ff058a3601e0 100644
--- a/frame/bounties/src/tests.rs
+++ b/frame/bounties/src/tests.rs
@@ -774,7 +774,8 @@ fn cancel_and_refund() {
 
 		assert_ok!(Bounties::close_bounty(Origin::root(), 0));
 
-		assert_eq!(Treasury::pot(), 85); // - 25 + 10
+		// `- 25 + 10`
+		assert_eq!(Treasury::pot(), 85);
 	});
 }
 
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index 9760cddcc5d8..e36f9173869c 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -114,7 +114,8 @@ where
 			Endow::CollectRent => {
 				// storage_size cannot be zero because otherwise a contract that is just above
 				// the subsistence threshold does not pay rent given a large enough subsistence
-				// threshold. But we need rent payments to occur in order to benchmark for worst cases.
+				// threshold. But we need rent payments to occur in order to benchmark for worst
+				// cases.
 				let storage_size = u32::MAX / 10;
 
 				// Endowment should be large but not as large to inhibit rent payments.
diff --git a/frame/contracts/src/chain_extension.rs b/frame/contracts/src/chain_extension.rs
index 13696240fe4e..14080102933c 100644
--- a/frame/contracts/src/chain_extension.rs
+++ b/frame/contracts/src/chain_extension.rs
@@ -86,8 +86,8 @@ pub trait ChainExtension<C: Config> {
 	/// imported wasm function.
 	///
 	/// # Parameters
-	/// - `func_id`: The first argument to `seal_call_chain_extension`. Usually used to
-	/// 		determine which function to realize.
+	/// - `func_id`: The first argument to `seal_call_chain_extension`. Usually used to determine
+	///   which function to realize.
 	/// - `env`: Access to the remaining arguments and the execution environment.
 	///
 	/// # Return
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index a3b48ca3bcc9..ef19c443c79c 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -173,8 +173,8 @@ pub trait Ext: sealing::Sealed {
 	/// Instantiate a contract from the given code.
 	///
 	/// Returns the original code size of the called contract.
-	/// The newly created account will be associated with `code`. `value` specifies the amount of value
-	/// transferred from this to the newly created account (also known as endowment).
+	/// The newly created account will be associated with `code`. `value` specifies the amount of
+	/// value transferred from this to the newly created account (also known as endowment).
 	///
 	/// # Return Value
 	///
@@ -190,8 +190,8 @@ pub trait Ext: sealing::Sealed {
 
 	/// Transfer all funds to `beneficiary` and delete the contract.
 	///
-	/// Since this function removes the self contract eagerly, if succeeded, no further actions should
-	/// be performed on this `Ext` instance.
+	/// Since this function removes the self contract eagerly, if succeeded, no further actions
+	/// should be performed on this `Ext` instance.
 	///
 	/// This function will fail if the same contract is present on the contract
 	/// call stack.
@@ -199,8 +199,8 @@ pub trait Ext: sealing::Sealed {
 
 	/// Restores the given destination contract sacrificing the current one.
 	///
-	/// Since this function removes the self contract eagerly, if succeeded, no further actions should
-	/// be performed on this `Ext` instance.
+	/// Since this function removes the self contract eagerly, if succeeded, no further actions
+	/// should be performed on this `Ext` instance.
 	///
 	/// This function will fail if the same contract is present
 	/// on the contract call stack.
@@ -1283,8 +1283,8 @@ mod sealing {
 
 /// These tests exercise the executive layer.
 ///
-/// In these tests the VM/loader are mocked. Instead of dealing with wasm bytecode they use simple closures.
-/// This allows you to tackle executive logic more thoroughly without writing a
+/// In these tests the VM/loader are mocked. Instead of dealing with wasm bytecode they use simple
+/// closures. This allows you to tackle executive logic more thoroughly without writing a
 /// wasm VM code.
 #[cfg(test)]
 mod tests {
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index 4860937c423e..87db8048b3c3 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -17,43 +17,47 @@
 
 //! # Contract Pallet
 //!
-//! The Contract module provides functionality for the runtime to deploy and execute WebAssembly smart-contracts.
+//! The Contract module provides functionality for the runtime to deploy and execute WebAssembly
+//! smart-contracts.
 //!
 //! - [`Config`]
 //! - [`Call`]
 //!
 //! ## Overview
 //!
-//! This module extends accounts based on the [`Currency`] trait to have smart-contract functionality. It can
-//! be used with other modules that implement accounts based on [`Currency`]. These "smart-contract accounts"
-//! have the ability to instantiate smart-contracts and make calls to other contract and non-contract accounts.
+//! This module extends accounts based on the [`Currency`] trait to have smart-contract
+//! functionality. It can be used with other modules that implement accounts based on [`Currency`].
+//! These "smart-contract accounts" have the ability to instantiate smart-contracts and make calls
+//! to other contract and non-contract accounts.
 //!
 //! The smart-contract code is stored once in a code cache, and later retrievable via its hash.
-//! This means that multiple smart-contracts can be instantiated from the same hash, without replicating
-//! the code each time.
+//! This means that multiple smart-contracts can be instantiated from the same hash, without
+//! replicating the code each time.
 //!
-//! When a smart-contract is called, its associated code is retrieved via the code hash and gets executed.
-//! This call can alter the storage entries of the smart-contract account, instantiate new smart-contracts,
-//! or call other smart-contracts.
+//! When a smart-contract is called, its associated code is retrieved via the code hash and gets
+//! executed. This call can alter the storage entries of the smart-contract account, instantiate new
+//! smart-contracts, or call other smart-contracts.
 //!
-//! Finally, when an account is reaped, its associated code and storage of the smart-contract account
-//! will also be deleted.
+//! Finally, when an account is reaped, its associated code and storage of the smart-contract
+//! account will also be deleted.
 //!
 //! ### Gas
 //!
-//! Senders must specify a gas limit with every call, as all instructions invoked by the smart-contract require gas.
-//! Unused gas is refunded after the call, regardless of the execution outcome.
+//! Senders must specify a gas limit with every call, as all instructions invoked by the
+//! smart-contract require gas. Unused gas is refunded after the call, regardless of the execution
+//! outcome.
 //!
-//! If the gas limit is reached, then all calls and state changes (including balance transfers) are only
-//! reverted at the current call's contract level. For example, if contract A calls B and B runs out of gas mid-call,
-//! then all of B's calls are reverted. Assuming correct error handling by contract A, A's other calls and state
-//! changes still persist.
+//! If the gas limit is reached, then all calls and state changes (including balance transfers) are
+//! only reverted at the current call's contract level. For example, if contract A calls B and B
+//! runs out of gas mid-call, then all of B's calls are reverted. Assuming correct error handling by
+//! contract A, A's other calls and state changes still persist.
 //!
 //! ### Notable Scenarios
 //!
-//! Contract call failures are not always cascading. When failures occur in a sub-call, they do not "bubble up",
-//! and the call will only revert at the specific contract level. For example, if contract A calls contract B, and B
-//! fails, A can decide how to handle that failure, either proceeding or reverting A's changes.
+//! Contract call failures are not always cascading. When failures occur in a sub-call, they do not
+//! "bubble up", and the call will only revert at the specific contract level. For example, if
+//! contract A calls contract B, and B fails, A can decide how to handle that failure, either
+//! proceeding or reverting A's changes.
 //!
 //! ## Interface
 //!
@@ -226,17 +230,18 @@ pub mod pallet {
 		/// deposited while the contract is alive. Costs for additional storage are added to
 		/// this base cost.
 		///
-		/// This is a simple way to ensure that contracts with empty storage eventually get deleted by
-		/// making them pay rent. This creates an incentive to remove them early in order to save rent.
+		/// This is a simple way to ensure that contracts with empty storage eventually get deleted
+		/// by making them pay rent. This creates an incentive to remove them early in order to save
+		/// rent.
 		#[pallet::constant]
 		type DepositPerContract: Get<BalanceOf<Self>>;
 
 		/// The balance a contract needs to deposit per storage byte to stay alive indefinitely.
 		///
-		/// Let's suppose the deposit is 1,000 BU (balance units)/byte and the rent is 1 BU/byte/day,
-		/// then a contract with 1,000,000 BU that uses 1,000 bytes of storage would pay no rent.
-		/// But if the balance reduced to 500,000 BU and the storage stayed the same at 1,000,
-		/// then it would pay 500 BU/day.
+		/// Let's suppose the deposit is 1,000 BU (balance units)/byte and the rent is 1
+		/// BU/byte/day, then a contract with 1,000,000 BU that uses 1,000 bytes of storage would
+		/// pay no rent. But if the balance reduced to 500,000 BU and the storage stayed the same at
+		/// 1,000, then it would pay 500 BU/day.
 		#[pallet::constant]
 		type DepositPerStorageByte: Get<BalanceOf<Self>>;
 
@@ -353,7 +358,8 @@ pub mod pallet {
 		///
 		/// Instantiation is executed as follows:
 		///
-		/// - The supplied `code` is instrumented, deployed, and a `code_hash` is created for that code.
+		/// - The supplied `code` is instrumented, deployed, and a `code_hash` is created for that
+		///   code.
 		/// - If the `code_hash` already exists on the chain the underlying `code` will be shared.
 		/// - The destination address is computed based on the sender, code_hash and the salt.
 		/// - The smart-contract account is created at the computed address.
@@ -458,7 +464,8 @@ pub mod pallet {
 
 			// Add some advantage for block producers (who send unsigned extrinsics) by
 			// adding a handicap: for signed extrinsics we use a slightly older block number
-			// for the eviction check. This can be viewed as if we pushed regular users back in past.
+			// for the eviction check. This can be viewed as if we pushed regular users back in
+			// past.
 			let handicap = if signed { T::SignedClaimHandicap::get() } else { Zero::zero() };
 
 			// If poking the contract has lead to eviction of the contract, give out the rewards.
@@ -530,8 +537,8 @@ pub mod pallet {
 		/// # Params
 		///
 		/// - `contract`: The contract that emitted the event.
-		/// - `data`: Data supplied by the contract. Metadata generated during contract
-		///           compilation is needed to decode it.
+		/// - `data`: Data supplied by the contract. Metadata generated during contract compilation
+		///   is needed to decode it.
 		ContractEmitted(T::AccountId, Vec<u8>),
 
 		/// A code with the specified hash was removed.
diff --git a/frame/contracts/src/rent.rs b/frame/contracts/src/rent.rs
index 9446b027ec1f..336f03153c01 100644
--- a/frame/contracts/src/rent.rs
+++ b/frame/contracts/src/rent.rs
@@ -96,8 +96,8 @@ where
 	///
 	/// The `handicap` parameter gives a way to check the rent to a moment in the past instead
 	/// of current block. E.g. if the contract is going to be evicted at the current block,
-	/// `handicap = 1` can defer the eviction for 1 block. This is useful to handicap certain snitchers
-	/// relative to others.
+	/// `handicap = 1` can defer the eviction for 1 block. This is useful to handicap certain
+	/// snitchers relative to others.
 	///
 	/// NOTE this function performs eviction eagerly. All changes are read and written directly to
 	/// storage.
@@ -148,12 +148,12 @@ where
 	/// accessed at the beginning of the current block. Returns `None` in case if the contract was
 	/// evicted before or as a result of the rent collection.
 	///
-	/// The returned value is only an estimation. It doesn't take into account any top ups, changing the
-	/// rent allowance, or any problems coming from withdrawing the dues.
+	/// The returned value is only an estimation. It doesn't take into account any top ups, changing
+	/// the rent allowance, or any problems coming from withdrawing the dues.
 	///
 	/// NOTE that this is not a side-effect free function! It will actually collect rent and then
-	/// compute the projection. This function is only used for implementation of an RPC method through
-	/// `RuntimeApi` meaning that the changes will be discarded anyway.
+	/// compute the projection. This function is only used for implementation of an RPC method
+	/// through `RuntimeApi` meaning that the changes will be discarded anyway.
 	pub fn compute_projection(account: &T::AccountId) -> RentProjectionResult<T::BlockNumber> {
 		use ContractAccessError::IsTombstone;
 
@@ -357,8 +357,8 @@ where
 
 	/// Returns amount of funds available to consume by rent mechanism.
 	///
-	/// Rent mechanism cannot consume more than `rent_allowance` set by the contract and it cannot make
-	/// the balance lower than [`subsistence_threshold`].
+	/// Rent mechanism cannot consume more than `rent_allowance` set by the contract and it cannot
+	/// make the balance lower than [`subsistence_threshold`].
 	///
 	/// In case the toal_balance is below the subsistence threshold, this function returns `None`.
 	fn rent_budget(
@@ -381,8 +381,8 @@ where
 
 	/// Consider the case for rent payment of the given account and returns a `Verdict`.
 	///
-	/// Use `handicap` in case you want to change the reference block number. (To get more details see
-	/// `try_eviction` ).
+	/// Use `handicap` in case you want to change the reference block number. (To get more details
+	/// see `try_eviction` ).
 	fn consider_case(
 		account: &T::AccountId,
 		current_block_number: T::BlockNumber,
@@ -435,8 +435,8 @@ where
 			.unwrap_or_else(|| <BalanceOf<T>>::max_value());
 		let insufficient_rent = rent_budget < dues;
 
-		// If the rent payment cannot be withdrawn due to locks on the account balance, then evict the
-		// account.
+		// If the rent payment cannot be withdrawn due to locks on the account balance, then evict
+		// the account.
 		//
 		// NOTE: This seems problematic because it provides a way to tombstone an account while
 		// avoiding the last rent payment. In effect, someone could retroactively set rent_allowance
@@ -566,8 +566,8 @@ impl<T: Config> OutstandingAmount<T> {
 enum Verdict<T: Config> {
 	/// The contract is exempted from paying rent.
 	///
-	/// For example, it already paid its rent in the current block, or it has enough deposit for not
-	/// paying rent at all.
+	/// For example, it already paid its rent in the current block, or it has enough deposit for
+	/// not paying rent at all.
 	Exempt,
 	/// The contract cannot afford payment within its rent budget so it gets evicted. However,
 	/// because its balance is greater than the subsistence threshold it leaves a tombstone.
diff --git a/frame/contracts/src/storage.rs b/frame/contracts/src/storage.rs
index 847b57c89d6b..07819834837a 100644
--- a/frame/contracts/src/storage.rs
+++ b/frame/contracts/src/storage.rs
@@ -167,8 +167,8 @@ where
 {
 	/// Reads a storage kv pair of a contract.
 	///
-	/// The read is performed from the `trie_id` only. The `address` is not necessary. If the contract
-	/// doesn't store under the given `key` `None` is returned.
+	/// The read is performed from the `trie_id` only. The `address` is not necessary. If the
+	/// contract doesn't store under the given `key` `None` is returned.
 	pub fn read(trie_id: &TrieId, key: &StorageKey) -> Option<Vec<u8>> {
 		child::get_raw(&child_trie_info(&trie_id), &blake2_256(key))
 	}
@@ -230,7 +230,8 @@ where
 		Ok(())
 	}
 
-	/// Creates a new contract descriptor in the storage with the given code hash at the given address.
+	/// Creates a new contract descriptor in the storage with the given code hash at the given
+	/// address.
 	///
 	/// Returns `Err` if there is already a contract (or a tombstone) exists at the given address.
 	pub fn new_contract(
diff --git a/frame/contracts/src/wasm/code_cache.rs b/frame/contracts/src/wasm/code_cache.rs
index 06329a7e81ad..0a20485cab13 100644
--- a/frame/contracts/src/wasm/code_cache.rs
+++ b/frame/contracts/src/wasm/code_cache.rs
@@ -23,9 +23,10 @@
 //! - Before running contract code we check if the cached code has the schedule version that
 //! is equal to the current saved schedule.
 //! If it is equal then run the code, if it isn't reinstrument with the current schedule.
-//! - When we update the schedule we want it to have strictly greater version than the current saved one:
-//! this guarantees that every instrumented contract code in cache cannot have the version equal to the current one.
-//! Thus, before executing a contract it should be reinstrument with new schedule.
+//! - When we update the schedule we want it to have strictly greater version than the current saved
+//!   one:
+//! this guarantees that every instrumented contract code in cache cannot have the version equal to
+//! the current one. Thus, before executing a contract it should be reinstrument with new schedule.
 
 #[cfg(feature = "runtime-benchmarks")]
 pub use self::private::reinstrument;
diff --git a/frame/contracts/src/wasm/prepare.rs b/frame/contracts/src/wasm/prepare.rs
index 280dedc39e66..c766914f3d46 100644
--- a/frame/contracts/src/wasm/prepare.rs
+++ b/frame/contracts/src/wasm/prepare.rs
@@ -279,8 +279,7 @@ impl<'a, T: Config> ContractModule<'a, T> {
 	///
 	/// This accomplishes two tasks:
 	///
-	/// - checks any imported function against defined host functions set, incl.
-	///   their signatures.
+	/// - checks any imported function against defined host functions set, incl. their signatures.
 	/// - if there is a memory import, returns it's descriptor
 	/// `import_fn_banlist`: list of function names that are disallowed to be imported
 	fn scan_imports<C: ImportSatisfyCheck>(
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index c04f25766dc7..2edd7b82099b 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -534,8 +534,8 @@ where
 	/// when the caller is not interested in the result.
 	///
 	/// `create_token` can optionally instruct this function to charge the gas meter with the token
-	/// it returns. `create_token` receives the variable amount of bytes that are about to be copied by
-	/// this function.
+	/// it returns. `create_token` receives the variable amount of bytes that are about to be copied
+	/// by this function.
 	///
 	/// In addition to the error conditions of `write_sandbox_memory` this functions returns
 	/// `Err` if the size of the buffer located at `out_ptr` is too small to fit `buf`.
diff --git a/frame/democracy/src/lib.rs b/frame/democracy/src/lib.rs
index 2f955b70ab42..7c2e53a817b0 100644
--- a/frame/democracy/src/lib.rs
+++ b/frame/democracy/src/lib.rs
@@ -46,12 +46,12 @@
 //! - **Conviction:** An indication of a voter's strength of belief in their vote. An increase
 //! of one in conviction indicates that a token holder is willing to lock their tokens for twice
 //! as many lock periods after enactment.
-//! - **Vote:** A value that can either be in approval ("Aye") or rejection ("Nay")
-//!   of a particular referendum.
+//! - **Vote:** A value that can either be in approval ("Aye") or rejection ("Nay") of a particular
+//!   referendum.
 //! - **Proposal:** A submission to the chain that represents an action that a proposer (either an
 //! account or an external origin) suggests that the system adopt.
-//! - **Referendum:** A proposal that is in the process of being voted on for
-//!   either acceptance or rejection as a change to the system.
+//! - **Referendum:** A proposal that is in the process of being voted on for either acceptance or
+//!   rejection as a change to the system.
 //! - **Delegation:** The act of granting your voting power to the decisions of another account for
 //!   up to a certain conviction.
 //!
@@ -92,50 +92,50 @@
 //! - `unlock` - Redetermine the account's balance lock, potentially making tokens available.
 //!
 //! Preimage actions:
-//! - `note_preimage` - Registers the preimage for an upcoming proposal, requires
-//!   a deposit that is returned once the proposal is enacted.
+//! - `note_preimage` - Registers the preimage for an upcoming proposal, requires a deposit that is
+//!   returned once the proposal is enacted.
 //! - `note_preimage_operational` - same but provided by `T::OperationalPreimageOrigin`.
-//! - `note_imminent_preimage` - Registers the preimage for an upcoming proposal.
-//!   Does not require a deposit, but the proposal must be in the dispatch queue.
+//! - `note_imminent_preimage` - Registers the preimage for an upcoming proposal. Does not require a
+//!   deposit, but the proposal must be in the dispatch queue.
 //! - `note_imminent_preimage_operational` - same but provided by `T::OperationalPreimageOrigin`.
-//! - `reap_preimage` - Removes the preimage for an expired proposal. Will only
-//!   work under the condition that it's the same account that noted it and
-//!   after the voting period, OR it's a different account after the enactment period.
+//! - `reap_preimage` - Removes the preimage for an expired proposal. Will only work under the
+//!   condition that it's the same account that noted it and after the voting period, OR it's a
+//!   different account after the enactment period.
 //!
 //! #### Cancellation Origin
 //!
 //! This call can only be made by the `CancellationOrigin`.
 //!
-//! - `emergency_cancel` - Schedules an emergency cancellation of a referendum.
-//!   Can only happen once to a specific referendum.
+//! - `emergency_cancel` - Schedules an emergency cancellation of a referendum. Can only happen once
+//!   to a specific referendum.
 //!
 //! #### ExternalOrigin
 //!
 //! This call can only be made by the `ExternalOrigin`.
 //!
-//! - `external_propose` - Schedules a proposal to become a referendum once it is is legal
-//!   for an externally proposed referendum.
+//! - `external_propose` - Schedules a proposal to become a referendum once it is is legal for an
+//!   externally proposed referendum.
 //!
 //! #### External Majority Origin
 //!
 //! This call can only be made by the `ExternalMajorityOrigin`.
 //!
-//! - `external_propose_majority` - Schedules a proposal to become a majority-carries
-//! 	 referendum once it is legal for an externally proposed referendum.
+//! - `external_propose_majority` - Schedules a proposal to become a majority-carries referendum
+//!   once it is legal for an externally proposed referendum.
 //!
 //! #### External Default Origin
 //!
 //! This call can only be made by the `ExternalDefaultOrigin`.
 //!
-//! - `external_propose_default` - Schedules a proposal to become a negative-turnout-bias
-//!   referendum once it is legal for an externally proposed referendum.
+//! - `external_propose_default` - Schedules a proposal to become a negative-turnout-bias referendum
+//!   once it is legal for an externally proposed referendum.
 //!
 //! #### Fast Track Origin
 //!
 //! This call can only be made by the `FastTrackOrigin`.
 //!
-//! - `fast_track` - Schedules the current externally proposed proposal that
-//!   is "majority-carries" to become a referendum immediately.
+//! - `fast_track` - Schedules the current externally proposed proposal that is "majority-carries"
+//!   to become a referendum immediately.
 //!
 //! #### Veto Origin
 //!
@@ -263,11 +263,12 @@ pub mod pallet {
 		type Currency: ReservableCurrency<Self::AccountId>
 			+ LockableCurrency<Self::AccountId, Moment = Self::BlockNumber>;
 
-		/// The minimum period of locking and the period between a proposal being approved and enacted.
+		/// The minimum period of locking and the period between a proposal being approved and
+		/// enacted.
 		///
 		/// It should generally be a little more than the unstake period to ensure that
-		/// voting stakers have an opportunity to remove themselves from the system in the case where
-		/// they are on the losing side of a vote.
+		/// voting stakers have an opportunity to remove themselves from the system in the case
+		/// where they are on the losing side of a vote.
 		#[pallet::constant]
 		type EnactmentPeriod: Get<Self::BlockNumber>;
 
@@ -287,27 +288,27 @@ pub mod pallet {
 		/// "super-majority-required" referendum.
 		type ExternalOrigin: EnsureOrigin<Self::Origin>;
 
-		/// Origin from which the next tabled referendum may be forced; this allows for the tabling of
-		/// a majority-carries referendum.
+		/// Origin from which the next tabled referendum may be forced; this allows for the tabling
+		/// of a majority-carries referendum.
 		type ExternalMajorityOrigin: EnsureOrigin<Self::Origin>;
 
-		/// Origin from which the next tabled referendum may be forced; this allows for the tabling of
-		/// a negative-turnout-bias (default-carries) referendum.
+		/// Origin from which the next tabled referendum may be forced; this allows for the tabling
+		/// of a negative-turnout-bias (default-carries) referendum.
 		type ExternalDefaultOrigin: EnsureOrigin<Self::Origin>;
 
-		/// Origin from which the next majority-carries (or more permissive) referendum may be tabled to
-		/// vote according to the `FastTrackVotingPeriod` asynchronously in a similar manner to the
-		/// emergency origin. It retains its threshold method.
+		/// Origin from which the next majority-carries (or more permissive) referendum may be
+		/// tabled to vote according to the `FastTrackVotingPeriod` asynchronously in a similar
+		/// manner to the emergency origin. It retains its threshold method.
 		type FastTrackOrigin: EnsureOrigin<Self::Origin>;
 
-		/// Origin from which the next majority-carries (or more permissive) referendum may be tabled to
-		/// vote immediately and asynchronously in a similar manner to the emergency origin. It retains
-		/// its threshold method.
+		/// Origin from which the next majority-carries (or more permissive) referendum may be
+		/// tabled to vote immediately and asynchronously in a similar manner to the emergency
+		/// origin. It retains its threshold method.
 		type InstantOrigin: EnsureOrigin<Self::Origin>;
 
-		/// Indicator for whether an emergency origin is even allowed to happen. Some chains may want
-		/// to set this permanently to `false`, others may want to condition it on things such as
-		/// an upgrade having happened recently.
+		/// Indicator for whether an emergency origin is even allowed to happen. Some chains may
+		/// want to set this permanently to `false`, others may want to condition it on things such
+		/// as an upgrade having happened recently.
 		#[pallet::constant]
 		type InstantAllowed: Get<bool>;
 
@@ -446,8 +447,8 @@ pub mod pallet {
 
 	/// True if the last referendum tabled was submitted externally. False if it was a public
 	/// proposal.
-	// TODO: There should be any number of tabling origins, not just public and "external" (council).
-	// https://github.com/paritytech/substrate/issues/5322
+	// TODO: There should be any number of tabling origins, not just public and "external"
+	// (council). https://github.com/paritytech/substrate/issues/5322
 	#[pallet::storage]
 	pub type LastTabledWasExternal<T> = StorageValue<_, bool, ValueQuery>;
 
@@ -508,7 +509,8 @@ pub mod pallet {
 	pub enum Event<T: Config> {
 		/// A motion has been proposed by a public account. \[proposal_index, deposit\]
 		Proposed(PropIndex, BalanceOf<T>),
-		/// A public proposal has been tabled for referendum vote. \[proposal_index, deposit, depositors\]
+		/// A public proposal has been tabled for referendum vote. \[proposal_index, deposit,
+		/// depositors\]
 		Tabled(PropIndex, BalanceOf<T>, Vec<T::AccountId>),
 		/// An external proposal has been tabled.
 		ExternalTabled,
@@ -824,7 +826,8 @@ pub mod pallet {
 			delay: T::BlockNumber,
 		) -> DispatchResult {
 			// Rather complicated bit of code to ensure that either:
-			// - `voting_period` is at least `FastTrackVotingPeriod` and `origin` is `FastTrackOrigin`; or
+			// - `voting_period` is at least `FastTrackVotingPeriod` and `origin` is
+			//   `FastTrackOrigin`; or
 			// - `InstantAllowed` is `true` and `origin` is `InstantOrigin`.
 			let maybe_ensure_instant = if voting_period < T::FastTrackVotingPeriod::get() {
 				Some(origin)
@@ -932,8 +935,8 @@ pub mod pallet {
 		/// - `to`: The account whose voting the `target` account's voting power will follow.
 		/// - `conviction`: The conviction that will be attached to the delegated votes. When the
 		///   account is undelegated, the funds will be locked for the corresponding period.
-		/// - `balance`: The amount of the account's balance to be used in delegating. This must
-		///   not be more than the account's current balance.
+		/// - `balance`: The amount of the account's balance to be used in delegating. This must not
+		///   be more than the account's current balance.
 		///
 		/// Emits `Delegated`.
 		///
@@ -1035,8 +1038,9 @@ pub mod pallet {
 			encoded_proposal: Vec<u8>,
 		) -> DispatchResultWithPostInfo {
 			Self::note_imminent_preimage_inner(ensure_signed(origin)?, encoded_proposal)?;
-			// We check that this preimage was not uploaded before in `note_imminent_preimage_inner`,
-			// thus this call can only be successful once. If successful, user does not pay a fee.
+			// We check that this preimage was not uploaded before in
+			// `note_imminent_preimage_inner`, thus this call can only be successful once. If
+			// successful, user does not pay a fee.
 			Ok(Pays::No.into())
 		}
 
@@ -1051,8 +1055,9 @@ pub mod pallet {
 		) -> DispatchResultWithPostInfo {
 			let who = T::OperationalPreimageOrigin::ensure_origin(origin)?;
 			Self::note_imminent_preimage_inner(who, encoded_proposal)?;
-			// We check that this preimage was not uploaded before in `note_imminent_preimage_inner`,
-			// thus this call can only be successful once. If successful, user does not pay a fee.
+			// We check that this preimage was not uploaded before in
+			// `note_imminent_preimage_inner`, thus this call can only be successful once. If
+			// successful, user does not pay a fee.
 			Ok(Pays::No.into())
 		}
 
@@ -1061,8 +1066,8 @@ pub mod pallet {
 		/// The dispatch origin of this call must be _Signed_.
 		///
 		/// - `proposal_hash`: The preimage hash of a proposal.
-		/// - `proposal_length_upper_bound`: an upper bound on length of the proposal.
-		///   Extrinsic is weighted according to this value with no refund.
+		/// - `proposal_length_upper_bound`: an upper bound on length of the proposal. Extrinsic is
+		///   weighted according to this value with no refund.
 		///
 		/// This will only work after `VotingPeriod` blocks from the time that the preimage was
 		/// noted, if it's the same account doing it. If it's a different account, then it'll only
@@ -1620,11 +1625,10 @@ impl<T: Config> Pallet<T> {
 	/// Table the waiting public proposal with the highest backing for a vote.
 	fn launch_public(now: T::BlockNumber) -> DispatchResult {
 		let mut public_props = Self::public_props();
-		if let Some((winner_index, _)) = public_props.iter()
-			.enumerate()
-			.max_by_key(|x| Self::backing_for((x.1).0).unwrap_or_else(Zero::zero)
-				/* ^^ defensive only: All current public proposals have an amount locked*/)
-		{
+		if let Some((winner_index, _)) = public_props.iter().enumerate().max_by_key(
+			// defensive only: All current public proposals have an amount locked
+			|x| Self::backing_for((x.1).0).unwrap_or_else(Zero::zero),
+		) {
 			let (prop_index, proposal, _) = public_props.swap_remove(winner_index);
 			<PublicProps<T>>::put(public_props);
 
diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index a115d12c8ad2..44a4d66ca4cb 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -334,8 +334,8 @@ pub enum Phase<Bn> {
 	/// number.
 	///
 	/// We do not yet check whether the unsigned phase is active or passive. The intent is for the
-	/// blockchain to be able to declare: "I believe that there exists an adequate signed solution,"
-	/// advising validators not to bother running the unsigned offchain worker.
+	/// blockchain to be able to declare: "I believe that there exists an adequate signed
+	/// solution," advising validators not to bother running the unsigned offchain worker.
 	///
 	/// As validator nodes are free to edit their OCW code, they could simply ignore this advisory
 	/// and always compute their own solution. However, by default, when the unsigned phase is
@@ -716,20 +716,23 @@ pub mod pallet {
 				Phase::Signed | Phase::Off
 					if remaining <= unsigned_deadline && remaining > Zero::zero() =>
 				{
-					// our needs vary according to whether or not the unsigned phase follows a signed phase
+					// our needs vary according to whether or not the unsigned phase follows a
+					// signed phase
 					let (need_snapshot, enabled, signed_weight) = if current_phase == Phase::Signed
 					{
-						// there was previously a signed phase: close the signed phase, no need for snapshot.
+						// there was previously a signed phase: close the signed phase, no need for
+						// snapshot.
 						//
 						// Notes:
 						//
-						//   - `Self::finalize_signed_phase()` also appears in `fn do_elect`. This is
-						//     a guard against the case that `elect` is called prematurely. This adds
-						//     a small amount of overhead, but that is unfortunately unavoidable.
+						//   - `Self::finalize_signed_phase()` also appears in `fn do_elect`. This
+						//     is a guard against the case that `elect` is called prematurely. This
+						//     adds a small amount of overhead, but that is unfortunately
+						//     unavoidable.
 						let (_success, weight) = Self::finalize_signed_phase();
 						// In the future we can consider disabling the unsigned phase if the signed
-						// phase completes successfully, but for now we're enabling it unconditionally
-						// as a defensive measure.
+						// phase completes successfully, but for now we're enabling it
+						// unconditionally as a defensive measure.
 						(false, true, weight)
 					} else {
 						// No signed phase: create a new snapshot, definitely `enable` the unsigned
@@ -1068,6 +1071,7 @@ pub mod pallet {
 
 	#[pallet::origin]
 	pub struct Origin<T>(PhantomData<T>);
+
 	#[pallet::validate_unsigned]
 	impl<T: Config> ValidateUnsigned for Pallet<T> {
 		type Call = Call<T>;
@@ -1320,7 +1324,8 @@ impl<T: Config> Pallet<T> {
 		<DesiredTargets<T>>::put(desired_targets);
 
 		// instead of using storage APIs, we do a manual encoding into a fixed-size buffer.
-		// `encoded_size` encodes it without storing it anywhere, this should not cause any allocation.
+		// `encoded_size` encodes it without storing it anywhere, this should not cause any
+		// allocation.
 		let snapshot = RoundSnapshot { voters, targets };
 		let size = snapshot.encoded_size();
 		log!(info, "snapshot pre-calculated size {:?}", size);
@@ -1473,7 +1478,8 @@ impl<T: Config> Pallet<T> {
 		// We have to unconditionally try finalizing the signed phase here. There are only two
 		// possibilities:
 		//
-		// - signed phase was open, in which case this is essential for correct functioning of the system
+		// - signed phase was open, in which case this is essential for correct functioning of the
+		//   system
 		// - signed phase was complete or not started, in which case finalization is idempotent and
 		//   inexpensive (1 read of an empty vector).
 		let (_, signed_finalize_weight) = Self::finalize_signed_phase();
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index b67680b9abce..12e696563392 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -401,9 +401,9 @@ pub mod pallet {
 		///   origin is removed as a runner-up.
 		/// - `origin` is a current member. In this case, the deposit is unreserved and origin is
 		///   removed as a member, consequently not being a candidate for the next round anymore.
-		///   Similar to [`remove_member`](Self::remove_member), if replacement runners exists,
-		///   they are immediately used. If the prime is renouncing, then no prime will exist until
-		///   the next round.
+		///   Similar to [`remove_member`](Self::remove_member), if replacement runners exists, they
+		///   are immediately used. If the prime is renouncing, then no prime will exist until the
+		///   next round.
 		///
 		/// The dispatch origin of this call must be signed, and have one of the above roles.
 		///
@@ -673,9 +673,10 @@ pub mod pallet {
 						"Genesis member does not have enough stake.",
 					);
 
-					// Note: all members will only vote for themselves, hence they must be given exactly
-					// their own stake as total backing. Any sane election should behave as such.
-					// Nonetheless, stakes will be updated for term 1 onwards according to the election.
+					// Note: all members will only vote for themselves, hence they must be given
+					// exactly their own stake as total backing. Any sane election should behave as
+					// such. Nonetheless, stakes will be updated for term 1 onwards according to the
+					// election.
 					Members::<T>::mutate(|members| {
 						match members.binary_search_by(|m| m.who.cmp(member)) {
 							Ok(_) =>
@@ -692,9 +693,9 @@ pub mod pallet {
 					});
 
 					// set self-votes to make persistent. Genesis voters don't have any bond, nor do
-					// they have any lock. NOTE: this means that we will still try to remove a lock once
-					// this genesis voter is removed, and for now it is okay because remove_lock is noop
-					// if lock is not there.
+					// they have any lock. NOTE: this means that we will still try to remove a lock
+					// once this genesis voter is removed, and for now it is okay because
+					// remove_lock is noop if lock is not there.
 					<Voting<T>>::insert(
 						&member,
 						Voter { votes: vec![member.clone()], stake: *stake, deposit: Zero::zero() },
diff --git a/frame/elections/src/lib.rs b/frame/elections/src/lib.rs
index c4c88e434966..5057a6e00f56 100644
--- a/frame/elections/src/lib.rs
+++ b/frame/elections/src/lib.rs
@@ -73,8 +73,8 @@ mod tests;
 // - remove inactive voter (either you or the target is removed; if the target, you get their
 //   "voter" bond back; O(1); one fewer DB entry, one DB change)
 // - submit candidacy (you pay a "candidate" bond; O(1); one extra DB entry, two DB changes)
-// - present winner/runner-up (you may pay a "presentation" bond of O(voters) if the presentation
-//   is invalid; O(voters) compute; ) protected operations:
+// - present winner/runner-up (you may pay a "presentation" bond of O(voters) if the presentation is
+//   invalid; O(voters) compute; ) protected operations:
 // - remove candidacy (remove all votes for a candidate) (one fewer DB entry, two DB changes)
 
 // to avoid a potentially problematic case of not-enough approvals prior to voting causing a
@@ -128,8 +128,8 @@ pub struct VoterInfo<Balance> {
 /// Used to demonstrate the status of a particular index in the global voter list.
 #[derive(PartialEq, Eq, RuntimeDebug)]
 pub enum CellStatus {
-	/// Any out of bound index. Means a push a must happen to the chunk pointed by `NextVoterSet<T>`.
-	/// Voting fee is applied in case a new chunk is created.
+	/// Any out of bound index. Means a push a must happen to the chunk pointed by
+	/// `NextVoterSet<T>`. Voting fee is applied in case a new chunk is created.
 	Head,
 	/// Already occupied by another voter. Voting fee is applied.
 	Occupied,
@@ -850,13 +850,14 @@ impl<T: Config> Pallet<T> {
 			None
 		} else {
 			let c = Self::members();
-			let (next_possible, count, coming) =
-				if let Some((tally_end, comers, leavers)) = Self::next_finalize() {
-					// if there's a tally in progress, then next tally can begin immediately afterwards
-					(tally_end, c.len() - leavers.len() + comers as usize, comers)
-				} else {
-					(<frame_system::Pallet<T>>::block_number(), c.len(), 0)
-				};
+			let (next_possible, count, coming) = if let Some((tally_end, comers, leavers)) =
+				Self::next_finalize()
+			{
+				// if there's a tally in progress, then next tally can begin immediately afterwards
+				(tally_end, c.len() - leavers.len() + comers as usize, comers)
+			} else {
+				(<frame_system::Pallet<T>>::block_number(), c.len(), 0)
+			};
 			if count < desired_seats as usize {
 				Some(next_possible)
 			} else {
diff --git a/frame/example-offchain-worker/src/lib.rs b/frame/example-offchain-worker/src/lib.rs
index 01f3c355fa43..9e043c8bfb25 100644
--- a/frame/example-offchain-worker/src/lib.rs
+++ b/frame/example-offchain-worker/src/lib.rs
@@ -131,7 +131,8 @@ pub mod pallet {
 
 		/// Number of blocks of cooldown after unsigned transaction is included.
 		///
-		/// This ensures that we only accept unsigned transactions once, every `UnsignedInterval` blocks.
+		/// This ensures that we only accept unsigned transactions once, every `UnsignedInterval`
+		/// blocks.
 		#[pallet::constant]
 		type UnsignedInterval: Get<Self::BlockNumber>;
 
@@ -439,9 +440,9 @@ impl<T: Config> Pallet<T> {
 		// Submit signed will return a vector of results for all accounts that were found in the
 		// local keystore with expected `KEY_TYPE`.
 		let results = signer.send_signed_transaction(|_account| {
-			// Received price is wrapped into a call to `submit_price` public function of this pallet.
-			// This means that the transaction, when executed, will simply call that function passing
-			// `price` as an argument.
+			// Received price is wrapped into a call to `submit_price` public function of this
+			// pallet. This means that the transaction, when executed, will simply call that
+			// function passing `price` as an argument.
 			Call::submit_price(price)
 		});
 
diff --git a/frame/example/src/lib.rs b/frame/example/src/lib.rs
index 48b356df792e..f588e11a6164 100644
--- a/frame/example/src/lib.rs
+++ b/frame/example/src/lib.rs
@@ -26,27 +26,35 @@
 //!
 //! ### Documentation Guidelines:
 //!
-//! <!-- Original author of paragraph: Various. Based on collation of review comments to PRs addressing issues with -->
-//! <!-- label 'S3-FRAME' in https://github.com/paritytech/substrate-developer-hub/issues -->
+//! <!-- Original author of paragraph: Various. Based on collation of review comments to PRs
+//! addressing issues with --> <!-- label 'S3-FRAME' in https://github.com/paritytech/substrate-developer-hub/issues -->
 //! <ul>
-//!     <li>Documentation comments (i.e. <code>/// comment</code>) - should
-//!         accompany pallet functions and be restricted to the pallet interface,
-//!         not the internals of the pallet implementation. Only state inputs,
-//!         outputs, and a brief description that mentions whether calling it
-//!         requires root, but without repeating the source code details.
-//!         Capitalize the first word of each documentation comment and end it with
-//!         a full stop. See
-//!         <a href="https://github.com/paritytech/substrate#72-contributing-to-documentation-for-substrate-packages"
-//!         target="_blank"> Generic example of annotating source code with documentation comments</a></li>
-//!     <li>Self-documenting code - Try to refactor code to be self-documenting.</li>
-//!     <li>Code comments - Supplement complex code with a brief explanation, not every line of code.</li>
-//!     <li>Identifiers - surround by backticks (i.e. <code>INHERENT_IDENTIFIER</code>, <code>InherentType</code>,
-//!         <code>u64</code>)</li>
-//!     <li>Usage scenarios - should be simple doctests. The compiler should ensure they stay valid.</li>
-//!     <li>Extended tutorials - should be moved to external files and refer to.</li>
-//!     <!-- Original author of paragraph: @AmarRSingh -->
-//!     <li>Mandatory - include all of the sections/subsections where <b>MUST</b> is specified.</li>
-//!     <li>Optional - optionally include sections/subsections where <b>CAN</b> is specified.</li>
+//! <li>Documentation comments (i.e. <code>/// comment</code>) - should
+//! accompany pallet functions and be restricted to the pallet interface,
+//! not the internals of the pallet implementation. Only state inputs,
+//! outputs, and a brief description that mentions whether calling it
+//! requires root, but without repeating the source code details.
+//! Capitalize the first word of each documentation comment and end it with
+//! a full stop. See
+//! <a href="https://github.com/paritytech/substrate#72-contributing-to-documentation-for-substrate-packages"
+//! target="_blank"> Generic example of annotating source code with documentation comments</a></li>
+//!
+//! <li>Self-documenting code - Try to refactor code to be self-documenting.</li>
+//!
+//! <li>Code comments - Supplement complex code with a brief explanation, not every line of
+//! code.</li>
+//!
+//! <li>Identifiers - surround by backticks (i.e. <code>INHERENT_IDENTIFIER</code>,
+//! <code>InherentType</code>, <code>u64</code>)</li>
+//!
+//! <li>Usage scenarios - should be simple doctests. The compiler should ensure they stay
+//! valid.</li>
+//!
+//! <li>Extended tutorials - should be moved to external files and refer to.</li>
+//!
+//! <li>Mandatory - include all of the sections/subsections where <b>MUST</b> is specified.</li>
+//!
+//! <li>Optional - optionally include sections/subsections where <b>CAN</b> is specified.</li>
 //! </ul>
 //!
 //! ### Documentation Template:<br>
@@ -84,12 +92,13 @@
 //!
 //! \## Terminology
 //!
-//! // Add terminology used in the custom pallet. Include concepts, storage items, or actions that you think
-//! // deserve to be noted to give context to the rest of the documentation or pallet usage. The author needs to
-//! // use some judgment about what is included. We don't want a list of every storage item nor types - the user
-//! // can go to the code for that. For example, "transfer fee" is obvious and should not be included, but
-//! // "free balance" and "reserved balance" should be noted to give context to the pallet.
-//! // Please do not link to outside resources. The reference docs should be the ultimate source of truth.
+//! // Add terminology used in the custom pallet. Include concepts, storage items, or actions that
+//! you think // deserve to be noted to give context to the rest of the documentation or pallet
+//! usage. The author needs to // use some judgment about what is included. We don't want a list of
+//! every storage item nor types - the user // can go to the code for that. For example, "transfer
+//! fee" is obvious and should not be included, but // "free balance" and "reserved balance" should
+//! be noted to give context to the pallet. // Please do not link to outside resources. The
+//! reference docs should be the ultimate source of truth.
 //!
 //! <!-- Original author of heading: @Kianenigma in PR https://github.com/paritytech/substrate/pull/1951 -->
 //!
@@ -106,7 +115,8 @@
 //! \#### <INSERT_SCENARIO_NAME>
 //!
 //! // Describe requirements prior to interacting with the custom pallet.
-//! // Describe the process of interacting with the custom pallet for this scenario and public API functions used.
+//! // Describe the process of interacting with the custom pallet for this scenario and public API
+//! functions used.
 //!
 //! \## Interface
 //!
@@ -130,14 +140,16 @@
 //!
 //! <!-- Original author of paragraph: ??? -->
 //!
-//! // Reference documentation of aspects such as `storageItems` and `dispatchable` functions should only be
-//! // included in the <https://docs.rs> Rustdocs for Substrate and not repeated in the README file.
+//! // Reference documentation of aspects such as `storageItems` and `dispatchable` functions should
+//! // only be included in the <https://docs.rs> Rustdocs for Substrate and not repeated in the
+//! // README file.
 //!
 //! \### Dispatchable Functions
 //!
 //! <!-- Original author of paragraph: @AmarRSingh & @joepetrowski -->
 //!
-//! // A brief description of dispatchable functions and a link to the rustdoc with their actual documentation.
+//! // A brief description of dispatchable functions and a link to the rustdoc with their actual
+//! documentation.
 //!
 //! // <b>MUST</b> have link to Call enum
 //! // <b>MUST</b> have origin information included in function doc
@@ -154,7 +166,8 @@
 //!
 //! <!-- Original author of paragraph: @AmarRSingh -->
 //!
-//! // It is up to the writer of the respective pallet (with respect to how much information to provide).
+//! // It is up to the writer of the respective pallet (with respect to how much information to
+//! provide).
 //!
 //! \#### Public Inspection functions - Immutable (getters)
 //!
@@ -217,7 +230,8 @@
 //!
 //! \### Simple Code Snippet
 //!
-//! // Show a simple example (e.g. how to query a public getter function of <INSERT_CUSTOM_PALLET_NAME>)
+//! // Show a simple example (e.g. how to query a public getter function of
+//! <INSERT_CUSTOM_PALLET_NAME>)
 //!
 //! \### Example from FRAME
 //!
@@ -408,10 +422,10 @@ pub mod pallet {
 	// - Public calls that are signed by an external account.
 	// - Root calls that are allowed to be made only by the governance system.
 	// - Unsigned calls that can be of two kinds:
-	//   * "Inherent extrinsics" that are opinions generally held by the block
-	//     authors that build child blocks.
-	//   * Unsigned Transactions that are of intrinsic recognizable utility to the
-	//     network, and are validated by the runtime.
+	//   * "Inherent extrinsics" that are opinions generally held by the block authors that build
+	//     child blocks.
+	//   * Unsigned Transactions that are of intrinsic recognizable utility to the network, and are
+	//     validated by the runtime.
 	//
 	// Information about where this dispatch initiated from is provided as the first argument
 	// "origin". As such functions must always look like:
@@ -466,10 +480,10 @@ pub mod pallet {
 		//
 		// If you don't respect these rules, it is likely that your chain will be attackable.
 		//
-		// Each transaction must define a `#[pallet::weight(..)]` attribute to convey a set of static
-		// information about its dispatch. FRAME System and FRAME Executive pallet then use this
-		// information to properly execute the transaction, whilst keeping the total load of the
-		// chain in a moderate rate.
+		// Each transaction must define a `#[pallet::weight(..)]` attribute to convey a set of
+		// static information about its dispatch. FRAME System and FRAME Executive pallet then use
+		// this information to properly execute the transaction, whilst keeping the total load of
+		// the chain in a moderate rate.
 		//
 		// The parenthesized value of the `#[pallet::weight(..)]` attribute can be any type that
 		// implements a set of traits, namely [`WeighData`] and [`ClassifyDispatch`].
@@ -478,8 +492,8 @@ pub mod pallet {
 		// call. A higher weight means a larger transaction (less of which can be placed in a
 		// single block).
 		//
-		// The weight for this extrinsic we rely on the auto-generated `WeightInfo` from the benchmark
-		// toolchain.
+		// The weight for this extrinsic we rely on the auto-generated `WeightInfo` from the
+		// benchmark toolchain.
 		#[pallet::weight(
 			<T as pallet::Config>::WeightInfo::accumulate_dummy((*increase_by).saturated_into())
 		)]
@@ -522,8 +536,8 @@ pub mod pallet {
 		// assume it's a one-off operation and substantial processing/storage/memory can be used
 		// without worrying about gameability or attack scenarios.
 		//
-		// The weight for this extrinsic we use our own weight object `WeightForSetDummy` to determine
-		// its weight
+		// The weight for this extrinsic we use our own weight object `WeightForSetDummy` to
+		// determine its weight
 		#[pallet::weight(WeightForSetDummy::<T>(<BalanceOf<T>>::from(100u32)))]
 		pub fn set_dummy(
 			origin: OriginFor<T>,
@@ -531,8 +545,8 @@ pub mod pallet {
 		) -> DispatchResult {
 			ensure_root(origin)?;
 
-			// Print out log or debug message in the console via log::{error, warn, info, debug, trace},
-			// accepting format strings similar to `println!`.
+			// Print out log or debug message in the console via log::{error, warn, info, debug,
+			// trace}, accepting format strings similar to `println!`.
 			// https://substrate.dev/rustdocs/v3.0.0/log/index.html
 			info!("New value is now: {:?}", new_value);
 
@@ -631,7 +645,8 @@ impl<T: Config> Pallet<T> {
 		let _sender = ensure_signed(origin)?;
 
 		let prev = <Foo<T>>::get();
-		// Because Foo has 'default', the type of 'foo' in closure is the raw type instead of an Option<> type.
+		// Because Foo has 'default', the type of 'foo' in closure is the raw type instead of an
+		// Option<> type.
 		let result = <Foo<T>>::mutate(|foo| {
 			*foo = foo.saturating_add(increase_by);
 			*foo
diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index 8f857d2c8212..5f1ae23c2f53 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -150,8 +150,7 @@ pub type OriginOf<E, C> = <CallOf<E, C> as Dispatchable>::Origin;
 /// - `UnsignedValidator`: The unsigned transaction validator of the runtime.
 /// - `AllPallets`: Tuple that contains all modules. Will be used to call e.g. `on_initialize`.
 /// - `OnRuntimeUpgrade`: Custom logic that should be called after a runtime upgrade. Modules are
-///                       already called by `AllPallets`. It will be called before all modules will
-///                       be called.
+///   already called by `AllPallets`. It will be called before all modules will be called.
 pub struct Executive<System, Block, Context, UnsignedValidator, AllPallets, OnRuntimeUpgrade = ()>(
 	PhantomData<(System, Block, Context, UnsignedValidator, AllPallets, OnRuntimeUpgrade)>,
 );
@@ -479,7 +478,8 @@ where
 	}
 
 	/// Check a given signed transaction for validity. This doesn't execute any
-	/// side-effects; it merely checks whether the transaction would panic if it were included or not.
+	/// side-effects; it merely checks whether the transaction would panic if it were included or
+	/// not.
 	///
 	/// Changes made to storage should be discarded.
 	pub fn validate_transaction(
diff --git a/frame/gilt/src/lib.rs b/frame/gilt/src/lib.rs
index 3803d78c0531..7bfca872dc3f 100644
--- a/frame/gilt/src/lib.rs
+++ b/frame/gilt/src/lib.rs
@@ -294,8 +294,8 @@ pub mod pallet {
 		DurationTooBig,
 		/// The amount of the bid is less than the minimum allowed.
 		AmountTooSmall,
-		/// The queue for the bid's duration is full and the amount bid is too low to get in through
-		/// replacing an existing bid.
+		/// The queue for the bid's duration is full and the amount bid is too low to get in
+		/// through replacing an existing bid.
 		BidTooLow,
 		/// Gilt index is unknown.
 		Unknown,
@@ -506,8 +506,8 @@ pub mod pallet {
 	pub struct IssuanceInfo<Balance> {
 		/// The balance held in reserve over all active gilts.
 		pub reserved: Balance,
-		/// The issuance not held in reserve for active gilts. Together with `reserved` this sums to
-		/// `Currency::total_issuance`.
+		/// The issuance not held in reserve for active gilts. Together with `reserved` this sums
+		/// to `Currency::total_issuance`.
 		pub non_gilt: Balance,
 		/// The balance that `reserved` is effectively worth, at present. This is not issued funds
 		/// and could be less than `reserved` (though in most cases should be greater).
@@ -586,8 +586,8 @@ pub mod pallet {
 								let amount = bid.amount;
 								// Can never overflow due to block above.
 								remaining -= amount;
-								// Should never underflow since it should track the total of the bids
-								// exactly, but we'll be defensive.
+								// Should never underflow since it should track the total of the
+								// bids exactly, but we'll be defensive.
 								qs[queue_index].1 = qs[queue_index].1.saturating_sub(bid.amount);
 
 								// Now to activate the bid...
diff --git a/frame/identity/src/lib.rs b/frame/identity/src/lib.rs
index 19251cfbb85f..b56df59e113c 100644
--- a/frame/identity/src/lib.rs
+++ b/frame/identity/src/lib.rs
@@ -118,8 +118,8 @@ pub mod pallet {
 		type FieldDeposit: Get<BalanceOf<Self>>;
 
 		/// The amount held on deposit for a registered subaccount. This should account for the fact
-		/// that one storage item's value will increase by the size of an account ID, and there will be
-		/// another trie item whose value is the size of an account ID plus 32 bytes.
+		/// that one storage item's value will increase by the size of an account ID, and there will
+		/// be another trie item whose value is the size of an account ID plus 32 bytes.
 		#[pallet::constant]
 		type SubAccountDeposit: Get<BalanceOf<Self>>;
 
@@ -451,7 +451,8 @@ pub mod pallet {
 
 			Ok(Some(
 				T::WeightInfo::set_subs_old(old_ids.len() as u32) // P: Real number of old accounts removed.
-					.saturating_add(T::WeightInfo::set_subs_new(new_subs as u32)), /* S: New subs added. */
+					// S: New subs added
+					.saturating_add(T::WeightInfo::set_subs_new(new_subs as u32)),
 			)
 			.into())
 		}
diff --git a/frame/im-online/src/lib.rs b/frame/im-online/src/lib.rs
index 99500ece837f..842f593de772 100644
--- a/frame/im-online/src/lib.rs
+++ b/frame/im-online/src/lib.rs
@@ -222,7 +222,8 @@ pub type ValidatorId<T> = <<T as Config>::ValidatorSet as ValidatorSet<
 	<T as frame_system::Config>::AccountId,
 >>::ValidatorId;
 
-/// A tuple of (ValidatorId, Identification) where `Identification` is the full identification of `ValidatorId`.
+/// A tuple of (ValidatorId, Identification) where `Identification` is the full identification of
+/// `ValidatorId`.
 pub type IdentificationTuple<T> = (
 	ValidatorId<T>,
 	<<T as Config>::ValidatorSet as ValidatorSetWithIdentification<
@@ -375,8 +376,8 @@ pub mod pallet {
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
 		/// # <weight>
-		/// - Complexity: `O(K + E)` where K is length of `Keys` (heartbeat.validators_len)
-		///   and E is length of `heartbeat.network_state.external_address`
+		/// - Complexity: `O(K + E)` where K is length of `Keys` (heartbeat.validators_len) and E is
+		///   length of `heartbeat.network_state.external_address`
 		///   - `O(K)`: decoding of length `K`
 		///   - `O(E)`: decoding/encoding of length `E`
 		/// - DbReads: pallet_session `Validators`, pallet_session `CurrentIndex`, `Keys`,
@@ -447,7 +448,8 @@ pub mod pallet {
 		}
 	}
 
-	/// Invalid transaction custom error. Returned when validators_len field in heartbeat is incorrect.
+	/// Invalid transaction custom error. Returned when validators_len field in heartbeat is
+	/// incorrect.
 	pub(crate) const INVALID_VALIDATORS_LEN: u8 = 10;
 
 	#[pallet::validate_unsigned]
diff --git a/frame/indices/src/lib.rs b/frame/indices/src/lib.rs
index ced8c1e06165..331873d42451 100644
--- a/frame/indices/src/lib.rs
+++ b/frame/indices/src/lib.rs
@@ -48,8 +48,8 @@ pub mod pallet {
 	/// The module's config trait.
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
-		/// Type used for storing an account's index; implies the maximum number of accounts the system
-		/// can hold.
+		/// Type used for storing an account's index; implies the maximum number of accounts the
+		/// system can hold.
 		type AccountIndex: Parameter
 			+ Member
 			+ MaybeSerializeDeserialize
@@ -223,7 +223,8 @@ pub mod pallet {
 			Ok(())
 		}
 
-		/// Freeze an index so it will always point to the sender account. This consumes the deposit.
+		/// Freeze an index so it will always point to the sender account. This consumes the
+		/// deposit.
 		///
 		/// The dispatch origin for this call must be _Signed_ and the signing account must have a
 		/// non-frozen account `index`.
diff --git a/frame/lottery/src/lib.rs b/frame/lottery/src/lib.rs
index e2e56860e605..c879a819b0b7 100644
--- a/frame/lottery/src/lib.rs
+++ b/frame/lottery/src/lib.rs
@@ -266,9 +266,9 @@ pub mod pallet {
 							*lottery = None;
 							return T::WeightInfo::on_initialize_end()
 						}
-						// We choose not need to kill Participants and Tickets to avoid a large number
-						// of writes at one time. Instead, data persists between lotteries, but is not used
-						// if it is not relevant.
+						// We choose not need to kill Participants and Tickets to avoid a large
+						// number of writes at one time. Instead, data persists between lotteries,
+						// but is not used if it is not relevant.
 					}
 				}
 				return T::DbWeight::get().reads(1)
diff --git a/frame/merkle-mountain-range/src/lib.rs b/frame/merkle-mountain-range/src/lib.rs
index 974b868f6105..83fdc5b1715c 100644
--- a/frame/merkle-mountain-range/src/lib.rs
+++ b/frame/merkle-mountain-range/src/lib.rs
@@ -96,14 +96,14 @@ pub mod pallet {
 		/// and some of the inner mmr nodes might be pruned from on-chain storage.
 		/// The latter will contain all the entries in their full form.
 		///
-		/// Each node is stored in the Off-chain DB under key derived from the [`Self::INDEXING_PREFIX`] and
-		/// it's in-tree index (MMR position).
+		/// Each node is stored in the Off-chain DB under key derived from the
+		/// [`Self::INDEXING_PREFIX`] and it's in-tree index (MMR position).
 		const INDEXING_PREFIX: &'static [u8];
 
 		/// A hasher type for MMR.
 		///
-		/// To construct trie nodes that result in merging (bagging) two peaks, depending on the node
-		/// kind we take either:
+		/// To construct trie nodes that result in merging (bagging) two peaks, depending on the
+		/// node kind we take either:
 		/// - The node (hash) itself if it's an inner node.
 		/// - The hash of SCALE-encoding of the leaf data if it's a leaf node.
 		///
@@ -128,22 +128,22 @@ pub mod pallet {
 
 		/// Data stored in the leaf nodes.
 		///
-		/// The [LeafData](primitives::LeafDataProvider) is responsible for returning the entire leaf
-		/// data that will be inserted to the MMR.
+		/// The [LeafData](primitives::LeafDataProvider) is responsible for returning the entire
+		/// leaf data that will be inserted to the MMR.
 		/// [LeafDataProvider](primitives::LeafDataProvider)s can be composed into tuples to put
-		/// multiple elements into the tree. In such a case it might be worth using [primitives::Compact]
-		/// to make MMR proof for one element of the tuple leaner.
+		/// multiple elements into the tree. In such a case it might be worth using
+		/// [primitives::Compact] to make MMR proof for one element of the tuple leaner.
 		///
-		/// Note that the leaf at each block MUST be unique. You may want to include a block hash or block
-		/// number as an easiest way to ensure that.
+		/// Note that the leaf at each block MUST be unique. You may want to include a block hash or
+		/// block number as an easiest way to ensure that.
 		type LeafData: primitives::LeafDataProvider;
 
 		/// A hook to act on the new MMR root.
 		///
 		/// For some applications it might be beneficial to make the MMR root available externally
-		/// apart from having it in the storage. For instance you might output it in the header digest
-		/// (see [`frame_system::Pallet::deposit_log`]) to make it available for Light Clients.
-		/// Hook complexity should be `O(1)`.
+		/// apart from having it in the storage. For instance you might output it in the header
+		/// digest (see [`frame_system::Pallet::deposit_log`]) to make it available for Light
+		/// Clients. Hook complexity should be `O(1)`.
 		type OnNewRoot: primitives::OnNewRoot<<Self as Config<I>>::Hash>;
 
 		/// Weights for this pallet.
diff --git a/frame/multisig/src/lib.rs b/frame/multisig/src/lib.rs
index 6522abd72f07..b1ef5f11a5e3 100644
--- a/frame/multisig/src/lib.rs
+++ b/frame/multisig/src/lib.rs
@@ -127,8 +127,8 @@ pub mod pallet {
 		/// The currency mechanism.
 		type Currency: ReservableCurrency<Self::AccountId>;
 
-		/// The base amount of currency needed to reserve for creating a multisig execution or to store
-		/// a dispatch call for later.
+		/// The base amount of currency needed to reserve for creating a multisig execution or to
+		/// store a dispatch call for later.
 		///
 		/// This is held for an additional storage item whose value size is
 		/// `4 + sizeof((BlockNumber, Balance, AccountId))` bytes and whose key size is
@@ -333,9 +333,8 @@ pub mod pallet {
 		/// - I/O: 1 read `O(S)`, up to 1 mutate `O(S)`. Up to one remove.
 		/// - One event.
 		/// - The weight of the `call`.
-		/// - Storage: inserts one item, value size bounded by `MaxSignatories`, with a
-		///   deposit taken for its lifetime of
-		///   `DepositBase + threshold * DepositFactor`.
+		/// - Storage: inserts one item, value size bounded by `MaxSignatories`, with a deposit
+		///   taken for its lifetime of `DepositBase + threshold * DepositFactor`.
 		/// -------------------------------
 		/// - DB Weight:
 		///     - Reads: Multisig Storage, [Caller Account], Calls (if `store_call`)
@@ -400,9 +399,8 @@ pub mod pallet {
 		/// - Up to one binary search and insert (`O(logS + S)`).
 		/// - I/O: 1 read `O(S)`, up to 1 mutate `O(S)`. Up to one remove.
 		/// - One event.
-		/// - Storage: inserts one item, value size bounded by `MaxSignatories`, with a
-		///   deposit taken for its lifetime of
-		///   `DepositBase + threshold * DepositFactor`.
+		/// - Storage: inserts one item, value size bounded by `MaxSignatories`, with a deposit
+		///   taken for its lifetime of `DepositBase + threshold * DepositFactor`.
 		/// ----------------------------------
 		/// - DB Weight:
 		///     - Read: Multisig Storage, [Caller Account]
diff --git a/frame/multisig/src/tests.rs b/frame/multisig/src/tests.rs
index 635906d47cd6..2809a106d66e 100644
--- a/frame/multisig/src/tests.rs
+++ b/frame/multisig/src/tests.rs
@@ -812,8 +812,9 @@ fn weight_check_works() {
 
 #[test]
 fn multisig_handles_no_preimage_after_all_approve() {
-	// This test checks the situation where everyone approves a multi-sig, but no-one provides the call data.
-	// In the end, any of the multisig callers can approve again with the call data and the call will go through.
+	// This test checks the situation where everyone approves a multi-sig, but no-one provides the
+	// call data. In the end, any of the multisig callers can approve again with the call data and
+	// the call will go through.
 	new_test_ext().execute_with(|| {
 		let multi = Multisig::multi_account_id(&[1, 2, 3][..], 3);
 		assert_ok!(Balances::transfer(Origin::signed(1), multi, 5));
diff --git a/frame/proxy/src/lib.rs b/frame/proxy/src/lib.rs
index 3647ead700fd..6a853c8e2b8e 100644
--- a/frame/proxy/src/lib.rs
+++ b/frame/proxy/src/lib.rs
@@ -67,8 +67,8 @@ pub struct ProxyDefinition<AccountId, ProxyType, BlockNumber> {
 	pub delegate: AccountId,
 	/// A value defining the subset of calls that it is allowed to make.
 	pub proxy_type: ProxyType,
-	/// The number of blocks that an announcement must be in place for before the corresponding call
-	/// may be dispatched. If zero, then no announcement is needed.
+	/// The number of blocks that an announcement must be in place for before the corresponding
+	/// call may be dispatched. If zero, then no announcement is needed.
 	pub delay: BlockNumber,
 }
 
@@ -132,9 +132,9 @@ pub mod pallet {
 
 		/// The amount of currency needed per proxy added.
 		///
-		/// This is held for adding 32 bytes plus an instance of `ProxyType` more into a pre-existing
-		/// storage value. Thus, when configuring `ProxyDepositFactor` one should take into account
-		/// `32 + proxy_type.encode().len()` bytes of data.
+		/// This is held for adding 32 bytes plus an instance of `ProxyType` more into a
+		/// pre-existing storage value. Thus, when configuring `ProxyDepositFactor` one should take
+		/// into account `32 + proxy_type.encode().len()` bytes of data.
 		#[pallet::constant]
 		type ProxyDepositFactor: Get<BalanceOf<Self>>;
 
@@ -154,7 +154,8 @@ pub mod pallet {
 
 		/// The base amount of currency needed to reserve for creating an announcement.
 		///
-		/// This is held when a new storage item holding a `Balance` is created (typically 16 bytes).
+		/// This is held when a new storage item holding a `Balance` is created (typically 16
+		/// bytes).
 		#[pallet::constant]
 		type AnnouncementDepositBase: Get<BalanceOf<Self>>;
 
@@ -539,7 +540,8 @@ pub mod pallet {
 		/// A proxy was executed correctly, with the given \[result\].
 		ProxyExecuted(DispatchResult),
 		/// Anonymous account has been created by new proxy with given
-		/// disambiguation index and proxy type. \[anonymous, who, proxy_type, disambiguation_index\]
+		/// disambiguation index and proxy type. \[anonymous, who, proxy_type,
+		/// disambiguation_index\]
 		AnonymousCreated(T::AccountId, T::AccountId, T::ProxyType, u16),
 		/// An announcement was placed to make a call in the future. \[real, proxy, call_hash\]
 		Announced(T::AccountId, T::AccountId, CallHashOf<T>),
@@ -761,11 +763,13 @@ impl<T: Config> Pallet<T> {
 			let c = <T as Config>::Call::from_ref(c);
 			// We make sure the proxy call does access this pallet to change modify proxies.
 			match c.is_sub_type() {
-				// Proxy call cannot add or remove a proxy with more permissions than it already has.
+				// Proxy call cannot add or remove a proxy with more permissions than it already
+				// has.
 				Some(Call::add_proxy(_, ref pt, _)) | Some(Call::remove_proxy(_, ref pt, _))
 					if !def.proxy_type.is_superset(&pt) =>
 					false,
-				// Proxy call cannot remove all proxies or kill anonymous proxies unless it has full permissions.
+				// Proxy call cannot remove all proxies or kill anonymous proxies unless it has full
+				// permissions.
 				Some(Call::remove_proxies(..)) | Some(Call::kill_anonymous(..))
 					if def.proxy_type != T::ProxyType::default() =>
 					false,
diff --git a/frame/recovery/src/lib.rs b/frame/recovery/src/lib.rs
index 0214a38b0e8e..ad61baae60c9 100644
--- a/frame/recovery/src/lib.rs
+++ b/frame/recovery/src/lib.rs
@@ -33,12 +33,12 @@
 //!
 //! The recovery process for each recoverable account can be configured by the account owner.
 //! They are able to choose:
-//! * `friends` - The list of friends that the account owner trusts to protect the
-//!   recovery process for their account.
-//! * `threshold` - The number of friends that need to approve a recovery process for
-//!   the account to be successfully recovered.
-//! * `delay_period` - The minimum number of blocks after the beginning of the recovery
-//!   process that need to pass before the account can be successfully recovered.
+//! * `friends` - The list of friends that the account owner trusts to protect the recovery process
+//!   for their account.
+//! * `threshold` - The number of friends that need to approve a recovery process for the account to
+//!   be successfully recovered.
+//! * `delay_period` - The minimum number of blocks after the beginning of the recovery process that
+//!   need to pass before the account can be successfully recovered.
 //!
 //! There is a configurable deposit that all users need to pay to create a recovery
 //! configuration. This deposit is composed of a base deposit plus a multiplier for
@@ -101,25 +101,23 @@
 //! security of an account if used incorrectly. Some recommended practices for users
 //! of this pallet are:
 //!
-//! * Configure a significant `delay_period` for your recovery process: As long as you
-//!   have access to your recoverable account, you need only check the blockchain once
-//!   every `delay_period` blocks to ensure that no recovery attempt is successful
-//!   against your account. Using off-chain notification systems can help with this,
-//!   but ultimately, setting a large `delay_period` means that even the most skilled
-//!   attacker will need to wait this long before they can access your account.
-//! * Use a high threshold of approvals: Setting a value of 1 for the threshold means
-//!   that any of your friends would be able to recover your account. They would
-//!   simply need to start a recovery process and approve their own process. Similarly,
-//!   a threshold of 2 would mean that any 2 friends could work together to gain
-//!   access to your account. The only way to prevent against these kinds of attacks
-//!   is to choose a high threshold of approvals and select from a diverse friend
-//!   group that would not be able to reasonably coordinate with one another.
-//! * Reset your configuration over time: Since the entire deposit of creating a
-//!   recovery configuration is returned to the user, the only cost of updating
-//!   your recovery configuration is the transaction fees for the calls. Thus,
-//!   it is strongly encouraged to regularly update your recovery configuration
-//!   as your life changes and your relationship with new and existing friends
-//!   change as well.
+//! * Configure a significant `delay_period` for your recovery process: As long as you have access
+//!   to your recoverable account, you need only check the blockchain once every `delay_period`
+//!   blocks to ensure that no recovery attempt is successful against your account. Using off-chain
+//!   notification systems can help with this, but ultimately, setting a large `delay_period` means
+//!   that even the most skilled attacker will need to wait this long before they can access your
+//!   account.
+//! * Use a high threshold of approvals: Setting a value of 1 for the threshold means that any of
+//!   your friends would be able to recover your account. They would simply need to start a recovery
+//!   process and approve their own process. Similarly, a threshold of 2 would mean that any 2
+//!   friends could work together to gain access to your account. The only way to prevent against
+//!   these kinds of attacks is to choose a high threshold of approvals and select from a diverse
+//!   friend group that would not be able to reasonably coordinate with one another.
+//! * Reset your configuration over time: Since the entire deposit of creating a recovery
+//!   configuration is returned to the user, the only cost of updating your recovery configuration
+//!   is the transaction fees for the calls. Thus, it is strongly encouraged to regularly update
+//!   your recovery configuration as your life changes and your relationship with new and existing
+//!   friends change as well.
 //!
 //! ## Interface
 //!
@@ -131,22 +129,27 @@
 //! * `initiate_recovery` - Start the recovery process for a recoverable account.
 //!
 //! #### For Friends of a Recoverable Account
-//! * `vouch_recovery` - As a `friend` of a recoverable account, vouch for a recovery attempt on the account.
+//! * `vouch_recovery` - As a `friend` of a recoverable account, vouch for a recovery attempt on the
+//!   account.
 //!
 //! #### For a User Who Successfully Recovered an Account
 //!
-//! * `claim_recovery` - Claim access to the account that you have successfully completed the recovery process for.
-//! * `as_recovered` - Send a transaction as an account that you have recovered. See other functions below.
+//! * `claim_recovery` - Claim access to the account that you have successfully completed the
+//!   recovery process for.
+//! * `as_recovered` - Send a transaction as an account that you have recovered. See other functions
+//!   below.
 //!
 //! #### For the Recoverable Account
 //!
-//! * `close_recovery` - Close an active recovery process for your account and reclaim the recovery deposit.
-//! * `remove_recovery` - Remove the recovery configuration from the account, making it un-recoverable.
+//! * `close_recovery` - Close an active recovery process for your account and reclaim the recovery
+//!   deposit.
+//! * `remove_recovery` - Remove the recovery configuration from the account, making it
+//!   un-recoverable.
 //!
 //! #### For Super Users
 //!
-//! * `set_recovered` - The ROOT origin is able to skip the recovery process and directly allow
-//!   one account to access another.
+//! * `set_recovered` - The ROOT origin is able to skip the recovery process and directly allow one
+//!   account to access another.
 
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
@@ -231,9 +234,11 @@ pub mod pallet {
 		#[pallet::constant]
 		type ConfigDepositBase: Get<BalanceOf<Self>>;
 
-		/// The amount of currency needed per additional user when creating a recovery configuration.
+		/// The amount of currency needed per additional user when creating a recovery
+		/// configuration.
 		///
-		/// This is held for adding `sizeof(AccountId)` bytes more into a pre-existing storage value.
+		/// This is held for adding `sizeof(AccountId)` bytes more into a pre-existing storage
+		/// value.
 		#[pallet::constant]
 		type FriendDepositFactor: Get<BalanceOf<Self>>;
 
@@ -417,13 +422,13 @@ pub mod pallet {
 		/// The dispatch origin for this call must be _Signed_.
 		///
 		/// Parameters:
-		/// - `friends`: A list of friends you trust to vouch for recovery attempts.
-		///   Should be ordered and contain no duplicate values.
-		/// - `threshold`: The number of friends that must vouch for a recovery attempt
-		///   before the account can be recovered. Should be less than or equal to
-		///   the length of the list of friends.
-		/// - `delay_period`: The number of blocks after a recovery attempt is initialized
-		///   that needs to pass before the account can be recovered.
+		/// - `friends`: A list of friends you trust to vouch for recovery attempts. Should be
+		///   ordered and contain no duplicate values.
+		/// - `threshold`: The number of friends that must vouch for a recovery attempt before the
+		///   account can be recovered. Should be less than or equal to the length of the list of
+		///   friends.
+		/// - `delay_period`: The number of blocks after a recovery attempt is initialized that
+		///   needs to pass before the account can be recovered.
 		///
 		/// # <weight>
 		/// - Key: F (len of friends)
@@ -480,8 +485,8 @@ pub mod pallet {
 		/// The dispatch origin for this call must be _Signed_.
 		///
 		/// Parameters:
-		/// - `account`: The lost account that you want to recover. This account
-		///   needs to be recoverable (i.e. have a recovery configuration).
+		/// - `account`: The lost account that you want to recover. This account needs to be
+		///   recoverable (i.e. have a recovery configuration).
 		///
 		/// # <weight>
 		/// - One storage read to check that account is recoverable. O(F)
@@ -526,8 +531,7 @@ pub mod pallet {
 		///
 		/// Parameters:
 		/// - `lost`: The lost account that you want to recover.
-		/// - `rescuer`: The account trying to rescue the lost account that you
-		///   want to vouch for.
+		/// - `rescuer`: The account trying to rescue the lost account that you want to vouch for.
 		///
 		/// The combination of these two parameters must point to an active recovery
 		/// process.
@@ -575,8 +579,8 @@ pub mod pallet {
 		/// `threshold` or more vouches, waited `delay_period` blocks since initiation.
 		///
 		/// Parameters:
-		/// - `account`: The lost account that you want to claim has been successfully
-		///   recovered by you.
+		/// - `account`: The lost account that you want to claim has been successfully recovered by
+		///   you.
 		///
 		/// # <weight>
 		/// Key: F (len of friends in config), V (len of vouching friends)
diff --git a/frame/recovery/src/tests.rs b/frame/recovery/src/tests.rs
index 9065e9afe886..122088bf5ed6 100644
--- a/frame/recovery/src/tests.rs
+++ b/frame/recovery/src/tests.rs
@@ -64,7 +64,8 @@ fn recovery_life_cycle_works() {
 		run_to_block(10);
 		// Using account 1, the user begins the recovery process to recover the lost account
 		assert_ok!(Recovery::initiate_recovery(Origin::signed(1), 5));
-		// Off chain, the user contacts their friends and asks them to vouch for the recovery attempt
+		// Off chain, the user contacts their friends and asks them to vouch for the recovery
+		// attempt
 		assert_ok!(Recovery::vouch_recovery(Origin::signed(2), 5, 1));
 		assert_ok!(Recovery::vouch_recovery(Origin::signed(3), 5, 1));
 		assert_ok!(Recovery::vouch_recovery(Origin::signed(4), 5, 1));
diff --git a/frame/scheduler/src/lib.rs b/frame/scheduler/src/lib.rs
index cb6aaeb9a93d..ceb163a432e7 100644
--- a/frame/scheduler/src/lib.rs
+++ b/frame/scheduler/src/lib.rs
@@ -40,12 +40,11 @@
 //!
 //! ### Dispatchable Functions
 //!
-//! * `schedule` - schedule a dispatch, which may be periodic, to occur at a
-//!   specified block and with a specified priority.
-//! * `cancel` - cancel a scheduled dispatch, specified by block number and
-//!   index.
-//! * `schedule_named` - augments the `schedule` interface with an additional
-//!   `Vec<u8>` parameter that can be used for identification.
+//! * `schedule` - schedule a dispatch, which may be periodic, to occur at a specified block and
+//!   with a specified priority.
+//! * `cancel` - cancel a scheduled dispatch, specified by block number and index.
+//! * `schedule_named` - augments the `schedule` interface with an additional `Vec<u8>` parameter
+//!   that can be used for identification.
 //! * `cancel_named` - the named complement to the cancel function.
 
 // Ensure we're `no_std` when compiling for Wasm.
@@ -152,8 +151,8 @@ pub mod pallet {
 			+ GetDispatchInfo
 			+ From<system::Call<Self>>;
 
-		/// The maximum weight that may be scheduled per block for any dispatchables of less priority
-		/// than `schedule::HARD_DEADLINE`.
+		/// The maximum weight that may be scheduled per block for any dispatchables of less
+		/// priority than `schedule::HARD_DEADLINE`.
 		#[pallet::constant]
 		type MaximumWeight: Get<Weight>;
 
@@ -1321,7 +1320,8 @@ mod tests {
 				root(),
 				Call::Logger(LoggerCall::log(69, MaximumSchedulerWeight::get() / 2))
 			));
-			// With base weights, 69 and 42 should not fit together, but do because of hard deadlines
+			// With base weights, 69 and 42 should not fit together, but do because of hard
+			// deadlines
 			run_to_block(4);
 			assert_eq!(logger::log(), vec![(root(), 42u32), (root(), 69u32)]);
 		});
diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs
index 5f6c05e650e2..3f5d853d4fa2 100644
--- a/frame/session/src/lib.rs
+++ b/frame/session/src/lib.rs
@@ -269,7 +269,8 @@ pub trait SessionHandler<ValidatorId> {
 	/// All the key type ids this session handler can process.
 	///
 	/// The order must be the same as it expects them in
-	/// [`on_new_session`](Self::on_new_session<Ks>) and [`on_genesis_session`](Self::on_genesis_session<Ks>).
+	/// [`on_new_session`](Self::on_new_session<Ks>) and
+	/// [`on_genesis_session`](Self::on_genesis_session<Ks>).
 	const KEY_TYPE_IDS: &'static [KeyTypeId];
 
 	/// The given validator set will be used for the genesis session.
@@ -490,8 +491,8 @@ decl_storage! {
 
 decl_event!(
 	pub enum Event {
-		/// New session has happened. Note that the argument is the \[session_index\], not the block
-		/// number as the type might suggest.
+		/// New session has happened. Note that the argument is the \[session_index\], not the
+		/// block number as the type might suggest.
 		NewSession(SessionIndex),
 	}
 );
diff --git a/frame/society/src/lib.rs b/frame/society/src/lib.rs
index ffe2759eb8f3..c19cd35ae7db 100644
--- a/frame/society/src/lib.rs
+++ b/frame/society/src/lib.rs
@@ -1332,8 +1332,9 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 		// we assume there's at least one member or this logic won't work.
 		if !members.is_empty() {
 			let candidates = <Candidates<T, I>>::take();
-			// NOTE: This may cause member length to surpass `MaxMembers`, but results in no consensus
-			// critical issues or side-effects. This is auto-correcting as members fall out of society.
+			// NOTE: This may cause member length to surpass `MaxMembers`, but results in no
+			// consensus critical issues or side-effects. This is auto-correcting as members fall
+			// out of society.
 			members.reserve(candidates.len());
 
 			let maturity =
@@ -1369,8 +1370,9 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 					let matching_vote = if is_accepted { Vote::Approve } else { Vote::Reject };
 
 					let bad_vote = |m: &T::AccountId| {
-						// Voter voted wrong way (or was just a lazy skeptic) then reduce their payout
-						// and increase their strikes. after MaxStrikes then they go into suspension.
+						// Voter voted wrong way (or was just a lazy skeptic) then reduce their
+						// payout and increase their strikes. after MaxStrikes then they go into
+						// suspension.
 						let amount = Self::slash_payout(m, T::WrongSideDeduction::get());
 
 						let strikes = <Strikes<T, I>>::mutate(m, |s| {
@@ -1405,9 +1407,10 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 
 						Self::pay_accepted_candidate(&candidate, value, kind, maturity);
 
-						// We track here the total_approvals so that every candidate has a unique range
-						// of numbers from 0 to `total_approvals` with length `approval_count` so each
-						// candidate is proportionally represented when selecting a "primary" below.
+						// We track here the total_approvals so that every candidate has a unique
+						// range of numbers from 0 to `total_approvals` with length `approval_count`
+						// so each candidate is proportionally represented when selecting a
+						// "primary" below.
 						Some((candidate, total_approvals, value))
 					} else {
 						// Suspend Candidate
@@ -1474,8 +1477,9 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 
 				// Then write everything back out, signal the changed membership and leave an event.
 				members.sort();
-				// NOTE: This may cause member length to surpass `MaxMembers`, but results in no consensus
-				// critical issues or side-effects. This is auto-correcting as members fall out of society.
+				// NOTE: This may cause member length to surpass `MaxMembers`, but results in no
+				// consensus critical issues or side-effects. This is auto-correcting as members
+				// fall out of society.
 				<Members<T, I>>::put(&members[..]);
 				<Head<T, I>>::put(&primary);
 
@@ -1565,7 +1569,8 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 				value
 			},
 			BidKind::Vouch(voucher, tip) => {
-				// Check that the voucher is still vouching, else some other logic may have removed their status.
+				// Check that the voucher is still vouching, else some other logic may have removed
+				// their status.
 				if <Vouching<T, I>>::take(&voucher) == Some(VouchingStatus::Vouching) {
 					// In the case that a vouched-for bid is accepted we unset the
 					// vouching status and transfer the tip over to the voucher.
diff --git a/frame/staking/reward-curve/src/lib.rs b/frame/staking/reward-curve/src/lib.rs
index 22ddc817091c..06e35d11350e 100644
--- a/frame/staking/reward-curve/src/lib.rs
+++ b/frame/staking/reward-curve/src/lib.rs
@@ -32,28 +32,27 @@ use syn::parse::{Parse, ParseStream};
 /// [here](https://research.web3.foundation/en/latest/polkadot/Token%20Economics.html#inflation-model))
 /// for those parameters. Parameters are:
 /// - `min_inflation`: the minimal amount to be rewarded between validators, expressed as a fraction
-///   of total issuance. Known as `I_0` in the literature.
-///   Expressed in millionth, must be between 0 and 1_000_000.
+///   of total issuance. Known as `I_0` in the literature. Expressed in millionth, must be between 0
+///   and 1_000_000.
 ///
 /// - `max_inflation`: the maximum amount to be rewarded between validators, expressed as a fraction
-///   of total issuance. This is attained only when `ideal_stake` is achieved.
-///   Expressed in millionth, must be between min_inflation and 1_000_000.
+///   of total issuance. This is attained only when `ideal_stake` is achieved. Expressed in
+///   millionth, must be between min_inflation and 1_000_000.
 ///
 /// - `ideal_stake`: the fraction of total issued tokens that should be actively staked behind
-///   validators. Known as `x_ideal` in the literature.
-///   Expressed in millionth, must be between 0_100_000 and 0_900_000.
+///   validators. Known as `x_ideal` in the literature. Expressed in millionth, must be between
+///   0_100_000 and 0_900_000.
 ///
 /// - `falloff`: Known as `decay_rate` in the literature. A co-efficient dictating the strength of
 ///   the global incentivization to get the `ideal_stake`. A higher number results in less typical
-///   inflation at the cost of greater volatility for validators.
-///   Expressed in millionth, must be between 0 and 1_000_000.
+///   inflation at the cost of greater volatility for validators. Expressed in millionth, must be
+///   between 0 and 1_000_000.
 ///
 /// - `max_piece_count`: The maximum number of pieces in the curve. A greater number uses more
-///   resources but results in higher accuracy.
-///   Must be between 2 and 1_000.
+///   resources but results in higher accuracy. Must be between 2 and 1_000.
 ///
-/// - `test_precision`: The maximum error allowed in the generated test.
-///   Expressed in millionth, must be between 0 and 1_000_000.
+/// - `test_precision`: The maximum error allowed in the generated test. Expressed in millionth,
+///   must be between 0 and 1_000_000.
 ///
 /// # Example
 ///
diff --git a/frame/staking/reward-fn/src/lib.rs b/frame/staking/reward-fn/src/lib.rs
index 3f91c39b4055..dd5e629b3984 100644
--- a/frame/staking/reward-fn/src/lib.rs
+++ b/frame/staking/reward-fn/src/lib.rs
@@ -45,19 +45,13 @@ use sp_arithmetic::{
 /// [here](https://research.web3.foundation/en/latest/polkadot/economics/1-token-economics.html#inflation-model-with-parachains))
 ///
 /// Arguments are:
-/// * `stake`:
-///   The fraction of total issued tokens that actively staked behind
-///   validators. Known as `x` in the literature.
-///   Must be between 0 and 1.
-/// * `ideal_stake`:
-///   The fraction of total issued tokens that should be actively staked behind
-///   validators. Known as `x_ideal` in the literature.
-///   Must be between 0 and 1.
-/// * `falloff`:
-///   Known as `decay_rate` in the literature. A co-efficient dictating the strength of
+/// * `stake`: The fraction of total issued tokens that actively staked behind validators. Known as
+///   `x` in the literature. Must be between 0 and 1.
+/// * `ideal_stake`: The fraction of total issued tokens that should be actively staked behind
+///   validators. Known as `x_ideal` in the literature. Must be between 0 and 1.
+/// * `falloff`: Known as `decay_rate` in the literature. A co-efficient dictating the strength of
 ///   the global incentivization to get the `ideal_stake`. A higher number results in less typical
-///   inflation at the cost of greater volatility for validators.
-///   Must be more than 0.01.
+///   inflation at the cost of greater volatility for validators. Must be more than 0.01.
 pub fn compute_inflation<P: PerThing>(stake: P, ideal_stake: P, falloff: P) -> P {
 	if stake < ideal_stake {
 		// ideal_stake is more than 0 because it is strictly more than stake
diff --git a/frame/staking/src/inflation.rs b/frame/staking/src/inflation.rs
index 6f2bfe06ac24..8e44a8c5482e 100644
--- a/frame/staking/src/inflation.rs
+++ b/frame/staking/src/inflation.rs
@@ -25,8 +25,8 @@ use sp_runtime::{curve::PiecewiseLinear, traits::AtLeast32BitUnsigned, Perbill};
 /// The total payout to all validators (and their nominators) per era and maximum payout.
 ///
 /// Defined as such:
-/// `staker-payout = yearly_inflation(npos_token_staked / total_tokens) * total_tokens / era_per_year`
-/// `maximum-payout = max_yearly_inflation * total_tokens / era_per_year`
+/// `staker-payout = yearly_inflation(npos_token_staked / total_tokens) * total_tokens /
+/// era_per_year` `maximum-payout = max_yearly_inflation * total_tokens / era_per_year`
 ///
 /// `era_duration` is expressed in millisecond.
 pub fn compute_total_payout<N>(
diff --git a/frame/staking/src/pallet/impls.rs b/frame/staking/src/pallet/impls.rs
index accd7a0cf02e..64d66f5a5fa5 100644
--- a/frame/staking/src/pallet/impls.rs
+++ b/frame/staking/src/pallet/impls.rs
@@ -163,8 +163,9 @@ impl<T: Config> Pallet<T> {
 			Self::deposit_event(Event::<T>::Rewarded(ledger.stash, imbalance.peek()));
 		}
 
-		// Track the number of payout ops to nominators. Note: `WeightInfo::payout_stakers_alive_staked`
-		// always assumes at least a validator is paid out, so we do not need to count their payout op.
+		// Track the number of payout ops to nominators. Note:
+		// `WeightInfo::payout_stakers_alive_staked` always assumes at least a validator is paid
+		// out, so we do not need to count their payout op.
 		let mut nominator_payout_count: u32 = 0;
 
 		// Lets now calculate how this is split to the nominators.
@@ -306,6 +307,7 @@ impl<T: Config> Pallet<T> {
 		}
 	}
 
+	///
 	/// * Increment `active_era.index`,
 	/// * reset `active_era.start`,
 	/// * update `BondedEras` and apply slashes.
@@ -674,7 +676,8 @@ impl<T: Config> Pallet<T> {
 		all_voters
 	}
 
-	/// This is a very expensive function and result should be cached versus being called multiple times.
+	/// This is a very expensive function and result should be cached versus being called multiple
+	/// times.
 	pub fn get_npos_targets() -> Vec<T::AccountId> {
 		Validators::<T>::iter().map(|(v, _)| v).collect::<Vec<_>>()
 	}
diff --git a/frame/staking/src/pallet/mod.rs b/frame/staking/src/pallet/mod.rs
index e7c5947ac0f3..ee09660d23d2 100644
--- a/frame/staking/src/pallet/mod.rs
+++ b/frame/staking/src/pallet/mod.rs
@@ -62,12 +62,12 @@ pub mod pallet {
 
 		/// Time used for computing era duration.
 		///
-		/// It is guaranteed to start being called from the first `on_finalize`. Thus value at genesis
-		/// is not used.
+		/// It is guaranteed to start being called from the first `on_finalize`. Thus value at
+		/// genesis is not used.
 		type UnixTime: UnixTime;
 
-		/// Convert a balance into a number used for election calculation. This must fit into a `u64`
-		/// but is allowed to be sensibly lossy. The `u64` is used to communicate with the
+		/// Convert a balance into a number used for election calculation. This must fit into a
+		/// `u64` but is allowed to be sensibly lossy. The `u64` is used to communicate with the
 		/// [`sp_npos_elections`] crate which accepts u64 numbers and does operations in 128.
 		/// Consequently, the backward convert is used convert the u128s from sp-elections back to a
 		/// [`BalanceOf`].
@@ -129,13 +129,14 @@ pub mod pallet {
 		/// See [Era payout](./index.html#era-payout).
 		type EraPayout: EraPayout<BalanceOf<Self>>;
 
-		/// Something that can estimate the next session change, accurately or as a best effort guess.
+		/// Something that can estimate the next session change, accurately or as a best effort
+		/// guess.
 		type NextNewSession: EstimateNextNewSession<Self::BlockNumber>;
 
 		/// The maximum number of nominators rewarded for each validator.
 		///
-		/// For each validator only the `$MaxNominatorRewardedPerValidator` biggest stakers can claim
-		/// their reward. This used to limit the i/o cost for the nominator payout.
+		/// For each validator only the `$MaxNominatorRewardedPerValidator` biggest stakers can
+		/// claim their reward. This used to limit the i/o cost for the nominator payout.
 		#[pallet::constant]
 		type MaxNominatorRewardedPerValidator: Get<u32>;
 
@@ -437,9 +438,9 @@ pub mod pallet {
 	#[pallet::storage]
 	pub(crate) type StorageVersion<T: Config> = StorageValue<_, Releases, ValueQuery>;
 
-	/// The threshold for when users can start calling `chill_other` for other validators / nominators.
-	/// The threshold is compared to the actual number of validators / nominators (`CountFor*`) in
-	/// the system compared to the configured max (`Max*Count`).
+	/// The threshold for when users can start calling `chill_other` for other validators /
+	/// nominators. The threshold is compared to the actual number of validators / nominators
+	/// (`CountFor*`) in the system compared to the configured max (`Max*Count`).
 	#[pallet::storage]
 	pub(crate) type ChillThreshold<T: Config> = StorageValue<_, Percent, OptionQuery>;
 
@@ -598,11 +599,11 @@ pub mod pallet {
 		BadTarget,
 		/// The user has enough bond and thus cannot be chilled forcefully by an external person.
 		CannotChillOther,
-		/// There are too many nominators in the system. Governance needs to adjust the staking settings
-		/// to keep things safe for the runtime.
+		/// There are too many nominators in the system. Governance needs to adjust the staking
+		/// settings to keep things safe for the runtime.
 		TooManyNominators,
-		/// There are too many validators in the system. Governance needs to adjust the staking settings
-		/// to keep things safe for the runtime.
+		/// There are too many validators in the system. Governance needs to adjust the staking
+		/// settings to keep things safe for the runtime.
 		TooManyValidators,
 	}
 
@@ -636,7 +637,8 @@ pub mod pallet {
 				if active_era.start.is_none() {
 					let now_as_millis_u64 = T::UnixTime::now().as_millis().saturated_into::<u64>();
 					active_era.start = Some(now_as_millis_u64);
-					// This write only ever happens once, we don't include it in the weight in general
+					// This write only ever happens once, we don't include it in the weight in
+					// general
 					ActiveEra::<T>::put(active_era);
 				}
 			}
@@ -731,8 +733,8 @@ pub mod pallet {
 		/// The dispatch origin for this call must be _Signed_ by the stash, not the controller.
 		///
 		/// Use this if there are additional funds in your stash account that you wish to bond.
-		/// Unlike [`bond`](Self::bond) or [`unbond`](Self::unbond) this function does not impose any limitation
-		/// on the amount that can be added.
+		/// Unlike [`bond`](Self::bond) or [`unbond`](Self::unbond) this function does not impose
+		/// any limitation on the amount that can be added.
 		///
 		/// Emits `Bonded`.
 		///
@@ -854,23 +856,24 @@ pub mod pallet {
 				ledger = ledger.consolidate_unlocked(current_era)
 			}
 
-			let post_info_weight =
-				if ledger.unlocking.is_empty() && ledger.active < T::Currency::minimum_balance() {
-					// This account must have called `unbond()` with some value that caused the active
-					// portion to fall below existential deposit + will have no more unlocking chunks
-					// left. We can now safely remove all staking-related information.
-					Self::kill_stash(&stash, num_slashing_spans)?;
-					// Remove the lock.
-					T::Currency::remove_lock(STAKING_ID, &stash);
-					// This is worst case scenario, so we use the full weight and return None
-					None
-				} else {
-					// This was the consequence of a partial unbond. just update the ledger and move on.
-					Self::update_ledger(&controller, &ledger);
+			let post_info_weight = if ledger.unlocking.is_empty() &&
+				ledger.active < T::Currency::minimum_balance()
+			{
+				// This account must have called `unbond()` with some value that caused the active
+				// portion to fall below existential deposit + will have no more unlocking chunks
+				// left. We can now safely remove all staking-related information.
+				Self::kill_stash(&stash, num_slashing_spans)?;
+				// Remove the lock.
+				T::Currency::remove_lock(STAKING_ID, &stash);
+				// This is worst case scenario, so we use the full weight and return None
+				None
+			} else {
+				// This was the consequence of a partial unbond. just update the ledger and move on.
+				Self::update_ledger(&controller, &ledger);
 
-					// This is only an update, so we use less overall weight.
-					Some(T::WeightInfo::withdraw_unbonded_update(num_slashing_spans))
-				};
+				// This is only an update, so we use less overall weight.
+				Some(T::WeightInfo::withdraw_unbonded_update(num_slashing_spans))
+			};
 
 			// `old_total` should never be less than the new total because
 			// `consolidate_unlocked` strictly subtracts balance.
@@ -898,8 +901,9 @@ pub mod pallet {
 
 			// Only check limits if they are not already a validator.
 			if !Validators::<T>::contains_key(stash) {
-				// If this error is reached, we need to adjust the `MinValidatorBond` and start calling `chill_other`.
-				// Until then, we explicitly block new validators to protect the runtime.
+				// If this error is reached, we need to adjust the `MinValidatorBond` and start
+				// calling `chill_other`. Until then, we explicitly block new validators to protect
+				// the runtime.
 				if let Some(max_validators) = MaxValidatorsCount::<T>::get() {
 					ensure!(
 						CounterForValidators::<T>::get() < max_validators,
@@ -937,8 +941,9 @@ pub mod pallet {
 
 			// Only check limits if they are not already a nominator.
 			if !Nominators::<T>::contains_key(stash) {
-				// If this error is reached, we need to adjust the `MinNominatorBond` and start calling `chill_other`.
-				// Until then, we explicitly block new nominators to protect the runtime.
+				// If this error is reached, we need to adjust the `MinNominatorBond` and start
+				// calling `chill_other`. Until then, we explicitly block new nominators to protect
+				// the runtime.
 				if let Some(max_nominators) = MaxNominatorsCount::<T>::get() {
 					ensure!(
 						CounterForNominators::<T>::get() < max_nominators,
@@ -1180,8 +1185,8 @@ pub mod pallet {
 		/// # <weight>
 		/// O(S) where S is the number of slashing spans to be removed
 		/// Reads: Bonded, Slashing Spans, Account, Locks
-		/// Writes: Bonded, Slashing Spans (if S > 0), Ledger, Payee, Validators, Nominators, Account, Locks
-		/// Writes Each: SpanSlash * S
+		/// Writes: Bonded, Slashing Spans (if S > 0), Ledger, Payee, Validators, Nominators,
+		/// Account, Locks Writes Each: SpanSlash * S
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::force_unstake(*num_slashing_spans))]
 		pub fn force_unstake(
@@ -1327,10 +1332,10 @@ pub mod pallet {
 		///
 		/// Parameters:
 		/// - `new_history_depth`: The new history depth you would like to set.
-		/// - `era_items_deleted`: The number of items that will be deleted by this dispatch.
-		///    This should report all the storage items that will be deleted by clearing old
-		///    era history. Needed to report an accurate weight for the dispatch. Trusted by
-		///    `Root` to report an accurate number.
+		/// - `era_items_deleted`: The number of items that will be deleted by this dispatch. This
+		///   should report all the storage items that will be deleted by clearing old era history.
+		///   Needed to report an accurate weight for the dispatch. Trusted by `Root` to report an
+		///   accurate number.
 		///
 		/// Origin must be root.
 		///
@@ -1341,7 +1346,8 @@ pub mod pallet {
 		///     - Reads: Current Era, History Depth
 		///     - Writes: History Depth
 		///     - Clear Prefix Each: Era Stakers, EraStakersClipped, ErasValidatorPrefs
-		///     - Writes Each: ErasValidatorReward, ErasRewardPoints, ErasTotalStake, ErasStartSessionIndex
+		///     - Writes Each: ErasValidatorReward, ErasRewardPoints, ErasTotalStake,
+		///       ErasStartSessionIndex
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::set_history_depth(*_era_items_deleted))]
 		pub fn set_history_depth(
@@ -1375,7 +1381,8 @@ pub mod pallet {
 		/// Complexity: O(S) where S is the number of slashing spans on the account.
 		/// DB Weight:
 		/// - Reads: Stash Account, Bonded, Slashing Spans, Locks
-		/// - Writes: Bonded, Slashing Spans (if S > 0), Ledger, Payee, Validators, Nominators, Stash Account, Locks
+		/// - Writes: Bonded, Slashing Spans (if S > 0), Ledger, Payee, Validators, Nominators,
+		///   Stash Account, Locks
 		/// - Writes Each: SpanSlash * S
 		/// # </weight>
 		#[pallet::weight(T::WeightInfo::reap_stash(*num_slashing_spans))]
@@ -1437,10 +1444,10 @@ pub mod pallet {
 		///
 		/// * `min_nominator_bond`: The minimum active bond needed to be a nominator.
 		/// * `min_validator_bond`: The minimum active bond needed to be a validator.
-		/// * `max_nominator_count`: The max number of users who can be a nominator at once.
-		///   When set to `None`, no limit is enforced.
-		/// * `max_validator_count`: The max number of users who can be a validator at once.
-		///   When set to `None`, no limit is enforced.
+		/// * `max_nominator_count`: The max number of users who can be a nominator at once. When
+		///   set to `None`, no limit is enforced.
+		/// * `max_validator_count`: The max number of users who can be a validator at once. When
+		///   set to `None`, no limit is enforced.
 		///
 		/// Origin must be Root to call this function.
 		///
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index 364822ed3e03..67a402060aa7 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -572,13 +572,15 @@ fn nominating_and_rewards_should_work() {
 			mock::make_all_reward_payment(1);
 			let payout_for_10 = total_payout_1 / 3;
 			let payout_for_20 = 2 * total_payout_1 / 3;
-			// Nominator 2: has [400/1800 ~ 2/9 from 10] + [600/2200 ~ 3/11 from 20]'s reward. ==> 2/9 + 3/11
+			// Nominator 2: has [400/1800 ~ 2/9 from 10] + [600/2200 ~ 3/11 from 20]'s reward. ==>
+			// 2/9 + 3/11
 			assert_eq_error_rate!(
 				Balances::total_balance(&2),
 				initial_balance + (2 * payout_for_10 / 9 + 3 * payout_for_20 / 11),
 				2,
 			);
-			// Nominator 4: has [400/1800 ~ 2/9 from 10] + [600/2200 ~ 3/11 from 20]'s reward. ==> 2/9 + 3/11
+			// Nominator 4: has [400/1800 ~ 2/9 from 10] + [600/2200 ~ 3/11 from 20]'s reward. ==>
+			// 2/9 + 3/11
 			assert_eq_error_rate!(
 				Balances::total_balance(&4),
 				initial_balance + (2 * payout_for_10 / 9 + 3 * payout_for_20 / 11),
@@ -591,7 +593,8 @@ fn nominating_and_rewards_should_work() {
 				initial_balance + 5 * payout_for_10 / 9,
 				2,
 			);
-			// Validator 20: got `1200/2200` external stake => 12/22 =? 6/11 => Validator's share = 5/11
+			// Validator 20: got 1200 / 2200 external stake => 12/22 =? 6/11 => Validator's share =
+			// 5/11
 			assert_eq_error_rate!(
 				Balances::total_balance(&20),
 				initial_balance_20 + 5 * payout_for_20 / 11,
@@ -684,7 +687,8 @@ fn double_staking_should_fail() {
 #[test]
 fn double_controlling_should_fail() {
 	// should test (in the same order):
-	// * an account already bonded as controller CANNOT be reused as the controller of another account.
+	// * an account already bonded as controller CANNOT be reused as the controller of another
+	//   account.
 	ExtBuilder::default().build_and_execute(|| {
 		let arbitrary_value = 5;
 		// 2 = controller, 1 stashed => ok
@@ -1116,6 +1120,7 @@ fn bond_extra_works() {
 
 #[test]
 fn bond_extra_and_withdraw_unbonded_works() {
+	//
 	// * Should test
 	// * Given an account being bonded [and chosen as a validator](not mandatory)
 	// * It can add extra funds to the bonded account.
@@ -1282,6 +1287,7 @@ fn too_many_unbond_calls_should_not_work() {
 
 #[test]
 fn rebond_works() {
+	//
 	// * Should test
 	// * Given an account being bonded [and chosen as a validator](not mandatory)
 	// * it can unbond a portion of its funds from the stash account.
@@ -1683,7 +1689,8 @@ fn on_free_balance_zero_stash_removes_nominator() {
 
 #[test]
 fn switching_roles() {
-	// Test that it should be possible to switch between roles (nominator, validator, idle) with minimal overhead.
+	// Test that it should be possible to switch between roles (nominator, validator, idle) with
+	// minimal overhead.
 	ExtBuilder::default().nominate(false).build_and_execute(|| {
 		// Reset reward destination
 		for i in &[10, 20] {
@@ -3354,7 +3361,8 @@ fn payout_stakers_handles_weight_refund() {
 		assert_ok!(result);
 		assert_eq!(extract_actual_weight(&result, &info), zero_nom_payouts_weight);
 
-		// The validator is not rewarded in this era; so there will be zero payouts to claim for this era.
+		// The validator is not rewarded in this era; so there will be zero payouts to claim for
+		// this era.
 
 		// Era 3
 		start_active_era(3);
@@ -4118,7 +4126,8 @@ fn chill_other_works() {
 			assert_eq!(CounterForNominators::<Test>::get(), 15 + initial_nominators);
 			assert_eq!(CounterForValidators::<Test>::get(), 15 + initial_validators);
 
-			// Users can now be chilled down to 7 people, so we try to remove 9 of them (starting with 16)
+			// Users can now be chilled down to 7 people, so we try to remove 9 of them (starting
+			// with 16)
 			for i in 6..15 {
 				let b = 4 * i + 1;
 				let d = 4 * i + 3;
diff --git a/frame/sudo/src/lib.rs b/frame/sudo/src/lib.rs
index 7f0f6f57bf42..6dcb3bf5e44c 100644
--- a/frame/sudo/src/lib.rs
+++ b/frame/sudo/src/lib.rs
@@ -41,9 +41,9 @@
 //! ### Executing Privileged Functions
 //!
 //! The Sudo pallet itself is not intended to be used within other pallets.
-//! Instead, you can build "privileged functions" (i.e. functions that require `Root` origin) in other pallets.
-//! You can execute these privileged functions by calling `sudo` with the sudo key account.
-//! Privileged functions cannot be directly executed via an extrinsic.
+//! Instead, you can build "privileged functions" (i.e. functions that require `Root` origin) in
+//! other pallets. You can execute these privileged functions by calling `sudo` with the sudo key
+//! account. Privileged functions cannot be directly executed via an extrinsic.
 //!
 //! Learn more about privileged functions and `Root` origin in the [`Origin`] type documentation.
 //!
@@ -52,7 +52,7 @@
 //! This is an example of a pallet that exposes a privileged function:
 //!
 //! ```
-//!
+//! 
 //! #[frame_support::pallet]
 //! pub mod logger {
 //! 	use frame_support::pallet_prelude::*;
@@ -181,7 +181,8 @@ pub mod pallet {
 			Ok(Pays::No.into())
 		}
 
-		/// Authenticates the current sudo key and sets the given AccountId (`new`) as the new sudo key.
+		/// Authenticates the current sudo key and sets the given AccountId (`new`) as the new sudo
+		/// key.
 		///
 		/// The dispatch origin for this call must be _Signed_.
 		///
diff --git a/frame/sudo/src/tests.rs b/frame/sudo/src/tests.rs
index 9437f20832c4..ebd7a11a70f1 100644
--- a/frame/sudo/src/tests.rs
+++ b/frame/sudo/src/tests.rs
@@ -109,7 +109,8 @@ fn set_key_basics() {
 	});
 
 	new_test_ext(1).execute_with(|| {
-		// A non-root `key` will trigger a `RequireSudo` error and a non-root `key` cannot change the root `key`.
+		// A non-root `key` will trigger a `RequireSudo` error and a non-root `key` cannot change
+		// the root `key`.
 		assert_noop!(Sudo::set_key(Origin::signed(2), 3), Error::<Test>::RequireSudo);
 	});
 }
diff --git a/frame/support/procedural/src/lib.rs b/frame/support/procedural/src/lib.rs
index 483d7c31c062..a8ac022c35c6 100644
--- a/frame/support/procedural/src/lib.rs
+++ b/frame/support/procedural/src/lib.rs
@@ -92,23 +92,24 @@ impl Counter {
 ///   ```
 ///
 /// * Map: `Foo: map hasher($hash) type => type`: Implements the
-///   [`StorageMap`](../frame_support/storage/trait.StorageMap.html) trait using the
-///   [`StorageMap generator`](../frame_support/storage/generator/trait.StorageMap.html).
-///   And [`StoragePrefixedMap`](../frame_support/storage/trait.StoragePrefixedMap.html).
+///   [`StorageMap`](../frame_support/storage/trait.StorageMap.html) trait using the [`StorageMap
+///   generator`](../frame_support/storage/generator/trait.StorageMap.html). And
+///   [`StoragePrefixedMap`](../frame_support/storage/trait.StoragePrefixedMap.html).
 ///
 ///   `$hash` representing a choice of hashing algorithms available in the
 ///   [`Hashable`](../frame_support/trait.Hashable.html) trait. You will generally want to use one
 ///   of three hashers:
 ///   * `blake2_128_concat`: The default, safe choice. Use if you are unsure or don't care. It is
-///     secure against user-tainted keys, fairly fast and memory-efficient and supports
-///     iteration over its keys and values. This must be used if the keys of your map can be
-///     selected *en masse* by untrusted users.
+///     secure against user-tainted keys, fairly fast and memory-efficient and supports iteration
+///     over its keys and values. This must be used if the keys of your map can be selected *en
+///     masse* by untrusted users.
 ///   * `twox_64_concat`: This is an insecure hasher and can only be used safely if you know that
 ///     the preimages cannot be chosen at will by untrusted users. It is memory-efficient, extremely
 ///     performant and supports iteration over its keys and values. You can safely use this is the
 ///     key is:
 ///     - A (slowly) incrementing index.
-///     - Known to be the result of a cryptographic hash (though `identity` is a better choice here).
+///     - Known to be the result of a cryptographic hash (though `identity` is a better choice
+///       here).
 ///     - Known to be the public key of a cryptographic key pair in existence.
 ///   * `identity`: This is not a hasher at all, and just uses the key material directly. Since it
 ///     does no hashing or appending, it's the fastest possible hasher, however, it's also the least
@@ -132,8 +133,9 @@ impl Counter {
 ///
 /// * Double map: `Foo: double_map hasher($hash1) u32, hasher($hash2) u32 => u32`: Implements the
 ///   [`StorageDoubleMap`](../frame_support/storage/trait.StorageDoubleMap.html) trait using the
-///   [`StorageDoubleMap generator`](../frame_support/storage/generator/trait.StorageDoubleMap.html).
-///   And [`StoragePrefixedMap`](../frame_support/storage/trait.StoragePrefixedMap.html).
+///   [`StorageDoubleMap
+///   generator`](../frame_support/storage/generator/trait.StorageDoubleMap.html). And
+///   [`StoragePrefixedMap`](../frame_support/storage/trait.StoragePrefixedMap.html).
 ///
 ///   `$hash1` and `$hash2` representing choices of hashing algorithms available in the
 ///   [`Hashable`](../frame_support/trait.Hashable.html) trait. They must be chosen with care, see
@@ -147,8 +149,8 @@ impl Counter {
 ///
 ///   Thus keys are stored at:
 ///   ```nocompile
-///   Twox128(module_prefix) ++ Twox128(storage_prefix) ++ Hasher1(encode(key1)) ++ Hasher2(encode(key2))
-///   ```
+///   Twox128(module_prefix) ++ Twox128(storage_prefix) ++ Hasher1(encode(key1)) ++
+/// Hasher2(encode(key2))   ```
 ///
 /// Supported hashers (ordered from least to best security):
 ///
@@ -176,8 +178,8 @@ impl Counter {
 /// Will include the item in `GenesisConfig`.
 /// * \[optional\] `build(#closure)`: Closure called with storage overlays.
 /// * \[optional\] `max_values(#expr)`: `expr` is an expression returning a `u32`. It is used to
-/// implement `StorageInfoTrait`. Note this attribute is not available for storage value as the maximum
-/// number of values is 1.
+/// implement `StorageInfoTrait`. Note this attribute is not available for storage value as the
+/// maximum number of values is 1.
 /// * `#type`: Storage type.
 /// * \[optional\] `#default`: Value returned when none.
 ///
@@ -339,8 +341,8 @@ pub fn decl_storage(input: TokenStream) -> TokenStream {
 ///
 /// # Type definitions
 ///
-/// * The macro generates a type alias for each pallet to their `Module` (or `Pallet`).
-///   E.g. `type System = frame_system::Pallet<Runtime>`
+/// * The macro generates a type alias for each pallet to their `Module` (or `Pallet`). E.g. `type
+///   System = frame_system::Pallet<Runtime>`
 #[proc_macro]
 pub fn construct_runtime(input: TokenStream) -> TokenStream {
 	construct_runtime::construct_runtime(input)
diff --git a/frame/support/procedural/src/pallet/expand/call.rs b/frame/support/procedural/src/pallet/expand/call.rs
index 4dcee9e24fe3..23ea9be9eac7 100644
--- a/frame/support/procedural/src/pallet/expand/call.rs
+++ b/frame/support/procedural/src/pallet/expand/call.rs
@@ -19,6 +19,7 @@ use crate::{pallet::Def, COUNTER};
 use frame_support_procedural_tools::clean_type_string;
 use syn::spanned::Spanned;
 
+///
 /// * Generate enum call and implement various trait on it.
 /// * Implement Callable and call_function on `Pallet`
 pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
diff --git a/frame/support/procedural/src/pallet/expand/config.rs b/frame/support/procedural/src/pallet/expand/config.rs
index 306578cc3adc..17101b0be8f5 100644
--- a/frame/support/procedural/src/pallet/expand/config.rs
+++ b/frame/support/procedural/src/pallet/expand/config.rs
@@ -17,6 +17,7 @@
 
 use crate::pallet::{parse::helper::get_doc_literals, Def};
 
+///
 /// * Generate default rust doc
 pub fn expand_config(def: &mut Def) -> proc_macro2::TokenStream {
 	let config = &def.config;
diff --git a/frame/support/procedural/src/pallet/expand/constants.rs b/frame/support/procedural/src/pallet/expand/constants.rs
index 58df22e361c4..fcf77ae8e4b7 100644
--- a/frame/support/procedural/src/pallet/expand/constants.rs
+++ b/frame/support/procedural/src/pallet/expand/constants.rs
@@ -30,6 +30,7 @@ struct ConstDef {
 	pub default_byte_impl: proc_macro2::TokenStream,
 }
 
+///
 /// * Impl fn module_constant_metadata for pallet.
 pub fn expand_constants(def: &mut Def) -> proc_macro2::TokenStream {
 	let frame_support = &def.frame_support;
diff --git a/frame/support/procedural/src/pallet/expand/error.rs b/frame/support/procedural/src/pallet/expand/error.rs
index ce3d3428fc6e..19c4296ad02f 100644
--- a/frame/support/procedural/src/pallet/expand/error.rs
+++ b/frame/support/procedural/src/pallet/expand/error.rs
@@ -17,6 +17,7 @@
 
 use crate::pallet::{parse::helper::get_doc_literals, Def};
 
+///
 /// * impl various trait on Error
 /// * impl ModuleErrorMetadata for Error
 pub fn expand_error(def: &mut Def) -> proc_macro2::TokenStream {
diff --git a/frame/support/procedural/src/pallet/expand/event.rs b/frame/support/procedural/src/pallet/expand/event.rs
index 08e59ae7e877..2a2a3020a96b 100644
--- a/frame/support/procedural/src/pallet/expand/event.rs
+++ b/frame/support/procedural/src/pallet/expand/event.rs
@@ -21,6 +21,7 @@ use crate::{
 };
 use syn::{spanned::Spanned, Ident};
 
+///
 /// * Add __Ignore variant on Event
 /// * Impl various trait on Event including metadata
 /// * if deposit_event is defined, implement deposit_event on module.
diff --git a/frame/support/procedural/src/pallet/expand/genesis_build.rs b/frame/support/procedural/src/pallet/expand/genesis_build.rs
index c68f2339cfce..06acaf324254 100644
--- a/frame/support/procedural/src/pallet/expand/genesis_build.rs
+++ b/frame/support/procedural/src/pallet/expand/genesis_build.rs
@@ -17,6 +17,7 @@
 
 use crate::pallet::Def;
 
+///
 /// * implement the trait `sp_runtime::BuildModuleGenesisStorage`
 /// * add #[cfg(features = "std")] to GenesisBuild implementation.
 pub fn expand_genesis_build(def: &mut Def) -> proc_macro2::TokenStream {
diff --git a/frame/support/procedural/src/pallet/expand/genesis_config.rs b/frame/support/procedural/src/pallet/expand/genesis_config.rs
index b26be2b34aa7..8c540209f40c 100644
--- a/frame/support/procedural/src/pallet/expand/genesis_config.rs
+++ b/frame/support/procedural/src/pallet/expand/genesis_config.rs
@@ -21,6 +21,7 @@ use crate::{
 };
 use syn::{spanned::Spanned, Ident};
 
+///
 /// * add various derive trait on GenesisConfig struct.
 pub fn expand_genesis_config(def: &mut Def) -> proc_macro2::TokenStream {
 	let count = COUNTER.with(|counter| counter.borrow_mut().inc());
diff --git a/frame/support/procedural/src/pallet/expand/hooks.rs b/frame/support/procedural/src/pallet/expand/hooks.rs
index 314f982c5aad..e0b7e3669da4 100644
--- a/frame/support/procedural/src/pallet/expand/hooks.rs
+++ b/frame/support/procedural/src/pallet/expand/hooks.rs
@@ -17,6 +17,7 @@
 
 use crate::pallet::Def;
 
+///
 /// * implement the individual traits using the Hooks trait
 pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 	let (where_clause, span, has_runtime_upgrade) = match def.hooks.as_ref() {
diff --git a/frame/support/procedural/src/pallet/expand/instances.rs b/frame/support/procedural/src/pallet/expand/instances.rs
index ceb86fcad7ea..2ecb5ec481ac 100644
--- a/frame/support/procedural/src/pallet/expand/instances.rs
+++ b/frame/support/procedural/src/pallet/expand/instances.rs
@@ -18,6 +18,7 @@
 use crate::{pallet::Def, NUMBER_OF_INSTANCE};
 use proc_macro2::Span;
 
+///
 /// * Provide inherent instance to be used by construct_runtime
 /// * Provide Instance1 ..= Instance16 for instantiable pallet
 pub fn expand_instances(def: &mut Def) -> proc_macro2::TokenStream {
diff --git a/frame/support/procedural/src/pallet/expand/pallet_struct.rs b/frame/support/procedural/src/pallet/expand/pallet_struct.rs
index ccc6fee5c2ba..40fc39b161f1 100644
--- a/frame/support/procedural/src/pallet/expand/pallet_struct.rs
+++ b/frame/support/procedural/src/pallet/expand/pallet_struct.rs
@@ -17,6 +17,7 @@
 
 use crate::pallet::{expand::merge_where_clauses, parse::helper::get_doc_literals, Def};
 
+///
 /// * Add derive trait on Pallet
 /// * Implement GetStorageVersion on Pallet
 /// * Implement OnGenesis on Pallet
diff --git a/frame/support/procedural/src/pallet/expand/storage.rs b/frame/support/procedural/src/pallet/expand/storage.rs
index 21d6628c8b84..ac03a41deb99 100644
--- a/frame/support/procedural/src/pallet/expand/storage.rs
+++ b/frame/support/procedural/src/pallet/expand/storage.rs
@@ -46,6 +46,7 @@ fn check_prefix_duplicates(storage_def: &StorageDef, set: &mut HashSet<String>)
 	Ok(())
 }
 
+///
 /// * if generics are unnamed: replace the first generic `_` by the generated prefix structure
 /// * if generics are named: reorder the generic, remove their name, and add the missing ones.
 /// * Add `#[allow(type_alias_bounds)]`
@@ -150,6 +151,7 @@ pub fn process_generics(def: &mut Def) -> syn::Result<()> {
 	Ok(())
 }
 
+///
 /// * generate StoragePrefix structs (e.g. for a storage `MyStorage` a struct with the name
 ///   `_GeneratedPrefixForStorage$NameOfStorage` is generated) and implements StorageInstance trait.
 /// * if generics are unnamed: replace the first generic `_` by the generated prefix structure
diff --git a/frame/support/procedural/src/pallet/expand/type_value.rs b/frame/support/procedural/src/pallet/expand/type_value.rs
index b1b94eb4fbe6..535a18777380 100644
--- a/frame/support/procedural/src/pallet/expand/type_value.rs
+++ b/frame/support/procedural/src/pallet/expand/type_value.rs
@@ -17,6 +17,7 @@
 
 use crate::pallet::Def;
 
+///
 /// * Generate the struct
 /// * implement the `Get<..>` on it
 /// * Rename the name of the function to internal name
diff --git a/frame/support/procedural/src/pallet/parse/storage.rs b/frame/support/procedural/src/pallet/parse/storage.rs
index 7927aa2455fe..5df7bc132dff 100644
--- a/frame/support/procedural/src/pallet/parse/storage.rs
+++ b/frame/support/procedural/src/pallet/parse/storage.rs
@@ -112,7 +112,8 @@ pub struct StorageDef {
 	pub instances: Vec<helper::InstanceUsage>,
 	/// Optional getter to generate. If some then query_kind is ensured to be some as well.
 	pub getter: Option<syn::Ident>,
-	/// Optional expression that evaluates to a type that can be used as StoragePrefix instead of ident.
+	/// Optional expression that evaluates to a type that can be used as StoragePrefix instead of
+	/// ident.
 	pub rename_as: Option<syn::LitStr>,
 	/// Whereas the querytype of the storage is OptionQuery or ValueQuery.
 	/// Note that this is best effort as it can't be determined when QueryKind is generic, and
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index d1a62106dc8d..bf314161c7f8 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -271,10 +271,10 @@ macro_rules! generate_storage_alias {
 ///
 ///   `twox_128(":" ++ NAME ++ ":")` where `NAME` is the name that is passed as type name.
 ///
-/// - Using `static` to create a static parameter type. Its value is
-///   being provided by a static variable with the equivalent name in `UPPER_SNAKE_CASE`. An
-///   additional `set` function is provided in this case to alter the static variable.
-///   **This is intended for testing ONLY and is ONLY available when `std` is enabled.**
+/// - Using `static` to create a static parameter type. Its value is being provided by a static
+///   variable with the equivalent name in `UPPER_SNAKE_CASE`. An additional `set` function is
+///   provided in this case to alter the static variable. **This is intended for testing ONLY and is
+///   ONLY available when `std` is enabled.**
 ///
 /// # Examples
 ///
@@ -1314,11 +1314,11 @@ pub mod pallet_prelude {
 /// }
 /// ```
 ///
-/// Inside the module the macro will parse item with the attribute: `#[pallet::*]`, some attributes
-/// are mandatory, some other optional.
+/// Inside the module the macro will parse item with the attribute: `#[pallet::*]`, some
+/// attributes are mandatory, some other optional.
 ///
-/// The attribute are explained with the syntax of non instantiable pallets, to see how pallet with
-/// instance work see below example.
+/// The attribute are explained with the syntax of non instantiable pallets, to see how pallet
+/// with instance work see below example.
 ///
 /// Note various type can be automatically imported using pallet_prelude in frame_support and
 /// frame_system:
@@ -1348,7 +1348,8 @@ pub mod pallet_prelude {
 /// optionally other supertrait and where clause.
 ///
 /// The associated type `Event` is reserved, if defined it must bounds `From<Event>` and
-/// `IsType<<Self as frame_system::Config>::Event>`, see `#[pallet::event]` for more information.
+/// `IsType<<Self as frame_system::Config>::Event>`, see `#[pallet::event]` for more
+/// information.
 ///
 /// To put `Get` associated type into metadatas, use the attribute `#[pallet::constant]`, e.g.:
 /// ```ignore
@@ -1369,7 +1370,8 @@ pub mod pallet_prelude {
 ///
 /// ### Macro expansion:
 ///
-/// The macro expand pallet constant metadata with the information given by `#[pallet::constant]`.
+/// The macro expand pallet constant metadata with the information given by
+/// `#[pallet::constant]`.
 ///
 /// # Pallet struct placeholder: `#[pallet::pallet]` mandatory
 ///
@@ -1389,8 +1391,8 @@ pub mod pallet_prelude {
 /// #[pallet::generate_store(pub(super) trait Store)]
 /// pub struct Pallet<T>(_);
 /// ```
-/// More precisely the store trait contains an associated type for each storage. It is implemented
-/// for `Pallet` allowing to access the storage from pallet struct.
+/// More precisely the store trait contains an associated type for each storage. It is
+/// implemented for `Pallet` allowing to access the storage from pallet struct.
 ///
 /// Thus when defining a storage named `Foo`, it can later be accessed from `Pallet` using
 /// `<Pallet as Store>::Foo`.
@@ -1406,8 +1408,8 @@ pub mod pallet_prelude {
 /// This require all storage to implement the trait [`traits::StorageInfoTrait`], thus all keys
 /// and value types must bound [`pallet_prelude::MaxEncodedLen`].
 ///
-/// As the macro implements [`traits::GetStorageVersion`], the current storage version needs to be
-/// communicated to the macro. This can be done by using the `storage_version` attribute:
+/// As the macro implements [`traits::GetStorageVersion`], the current storage version needs to
+/// be communicated to the macro. This can be done by using the `storage_version` attribute:
 ///
 /// ```ignore
 /// const STORAGE_VERSION: StorageVersion = StorageVersion::new(5);
@@ -1439,14 +1441,15 @@ pub mod pallet_prelude {
 ///
 /// It declare `type Module` type alias for `Pallet`, used by [`construct_runtime`].
 ///
-/// It implements [`traits::PalletInfoAccess`] on `Pallet` to ease access to pallet informations
-/// given by [`frame_support::traits::PalletInfo`].
+/// It implements [`traits::PalletInfoAccess`] on `Pallet` to ease access to pallet
+/// informations given by [`frame_support::traits::PalletInfo`].
 /// (The implementation use the associated type `frame_system::Config::PalletInfo`).
 ///
-/// It implements [`traits::StorageInfoTrait`] on `Pallet` which give information about all storages.
+/// It implements [`traits::StorageInfoTrait`] on `Pallet` which give information about all
+/// storages.
 ///
-/// If the attribute generate_store is set then the macro creates the trait `Store` and implements
-/// it on `Pallet`.
+/// If the attribute generate_store is set then the macro creates the trait `Store` and
+/// implements it on `Pallet`.
 ///
 /// If the attribute set_storage_max_encoded_len is set then the macro call
 /// [`traits::StorageInfoTrait`] for each storage in the implementation of
@@ -1468,8 +1471,8 @@ pub mod pallet_prelude {
 /// `Hooks<BlockNumberFor<T>>` (they are defined in preludes), for the type `Pallet<T>`
 /// and with an optional where clause.
 ///
-/// If no `#[pallet::hooks]` exists, then a default implementation corresponding to the following
-/// code is automatically generated:
+/// If no `#[pallet::hooks]` exists, then a default implementation corresponding to the
+/// following code is automatically generated:
 /// ```ignore
 /// #[pallet::hooks]
 /// impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
@@ -1483,8 +1486,8 @@ pub mod pallet_prelude {
 /// NOTE: OnRuntimeUpgrade is implemented with `Hooks::on_runtime_upgrade` and some additional
 /// logic. E.g. logic to write pallet version into storage.
 ///
-/// NOTE: The macro also adds some tracing logic when implementing the above traits. The following
-///  hooks emit traces: `on_initialize`, `on_finalize` and `on_runtime_upgrade`.
+/// NOTE: The macro also adds some tracing logic when implementing the above traits. The
+/// following  hooks emit traces: `on_initialize`, `on_finalize` and `on_runtime_upgrade`.
 ///
 /// # Call: `#[pallet::call]` optional
 ///
@@ -1511,30 +1514,30 @@ pub mod pallet_prelude {
 /// optional where clause.
 ///
 /// Each dispatchable needs to define a weight with `#[pallet::weight($expr)]` attribute,
-/// the first argument must be `origin: OriginFor<T>`, compact encoding for argument can be used
-/// using `#[pallet::compact]`, function must return `DispatchResultWithPostInfo` or
+/// the first argument must be `origin: OriginFor<T>`, compact encoding for argument can be
+/// used using `#[pallet::compact]`, function must return `DispatchResultWithPostInfo` or
 /// `DispatchResult`.
 ///
-/// All arguments must implement `Debug`, `PartialEq`, `Eq`, `Decode`, `Encode`, `Clone`. For ease
-/// of use, bound the trait `Member` available in frame_support::pallet_prelude.
+/// All arguments must implement `Debug`, `PartialEq`, `Eq`, `Decode`, `Encode`, `Clone`. For
+/// ease of use, bound the trait `Member` available in frame_support::pallet_prelude.
 ///
-/// If no `#[pallet::call]` exists, then a default implementation corresponding to the following
-/// code is automatically generated:
+/// If no `#[pallet::call]` exists, then a default implementation corresponding to the
+/// following code is automatically generated:
 /// ```ignore
 /// #[pallet::call]
 /// impl<T: Config> Pallet<T> {}
 /// ```
 ///
 /// **WARNING**: modifying dispatchables, changing their order, removing some must be done with
-/// care. Indeed this will change the outer runtime call type (which is an enum with one variant
-/// per pallet), this outer runtime call can be stored on-chain (e.g. in pallet-scheduler).
-/// Thus migration might be needed.
+/// care. Indeed this will change the outer runtime call type (which is an enum with one
+/// variant per pallet), this outer runtime call can be stored on-chain (e.g. in
+/// pallet-scheduler). Thus migration might be needed.
 ///
 /// ### Macro expansion
 ///
 /// The macro create an enum `Call` with one variant per dispatchable. This enum implements:
-/// `Clone`, `Eq`, `PartialEq`, `Debug` (with stripped implementation in `not("std")`), `Encode`,
-/// `Decode`, `GetDispatchInfo`, `GetCallName`, `UnfilteredDispatchable`.
+/// `Clone`, `Eq`, `PartialEq`, `Debug` (with stripped implementation in `not("std")`),
+/// `Encode`, `Decode`, `GetDispatchInfo`, `GetCallName`, `UnfilteredDispatchable`.
 ///
 /// The macro implement on `Pallet`, the `Callable` trait and a function `call_functions` which
 /// returns the dispatchable metadatas.
@@ -1554,8 +1557,8 @@ pub mod pallet_prelude {
 /// 	...
 /// }
 /// ```
-/// I.e. a regular rust implement block with some optional where clause and functions with 0 args,
-/// 0 generics, and some return type.
+/// I.e. a regular rust implement block with some optional where clause and functions with 0
+/// args, 0 generics, and some return type.
 ///
 /// ### Macro expansion
 ///
@@ -1576,13 +1579,13 @@ pub mod pallet_prelude {
 /// }
 /// ```
 /// I.e. a regular rust enum named `Error`, with generic `T` and fieldless variants.
-/// The generic `T` mustn't bound anything and where clause is not allowed. But bounds and where
-/// clause shouldn't be needed for any usecase.
+/// The generic `T` mustn't bound anything and where clause is not allowed. But bounds and
+/// where clause shouldn't be needed for any usecase.
 ///
 /// ### Macro expansion
 ///
-/// The macro implements `Debug` trait and functions `as_u8` using variant position, and `as_str`
-/// using variant doc.
+/// The macro implements `Debug` trait and functions `as_u8` using variant position, and
+/// `as_str` using variant doc.
 ///
 /// The macro implements `From<Error<T>>` for `&'static str`.
 /// The macro implements `From<Error<T>>` for `DispatchError`.
@@ -1592,8 +1595,8 @@ pub mod pallet_prelude {
 ///
 /// # Event: `#[pallet::event]` optional
 ///
-/// Allow to define pallet events, pallet events are stored in the block when they deposited (and
-/// removed in next block).
+/// Allow to define pallet events, pallet events are stored in the block when they deposited
+/// (and removed in next block).
 ///
 /// Item is defined as:
 /// ```ignore
@@ -1606,15 +1609,16 @@ pub mod pallet_prelude {
 /// 	...
 /// }
 /// ```
-/// I.e. an enum (with named or unnamed fields variant), named Event, with generic: none or `T` or
-/// `T: Config`, and optional where clause.
+/// I.e. an enum (with named or unnamed fields variant), named Event, with generic: none or `T`
+/// or `T: Config`, and optional where clause.
 ///
-/// Each field must implement `Clone`, `Eq`, `PartialEq`, `Encode`, `Decode`, and `Debug` (on std
-/// only).
+/// Each field must implement `Clone`, `Eq`, `PartialEq`, `Encode`, `Decode`, and `Debug` (on
+/// std only).
 /// For ease of use, bound the trait `Member` available in frame_support::pallet_prelude.
 ///
 /// Variant documentations and field types are put into metadata.
-/// The attribute `#[pallet::metadata(..)]` allows to specify the metadata to put for some types.
+/// The attribute `#[pallet::metadata(..)]` allows to specify the metadata to put for some
+/// types.
 ///
 /// The metadata of a type is defined by:
 /// * if matching a type in `#[pallet::metadata(..)]`, then the corresponding metadata.
@@ -1676,16 +1680,16 @@ pub mod pallet_prelude {
 /// For named generic argument: the name for each argument is the one as define on the storage
 /// struct:
 /// * [`pallet_prelude::StorageValue`] expect `Value` and optionally `QueryKind` and `OnEmpty`,
-/// * [`pallet_prelude::StorageMap`] expect `Hasher`, `Key`, `Value` and optionally `QueryKind` and
-///   `OnEmpty`,
-/// * [`pallet_prelude::StorageDoubleMap`] expect `Hasher1`, `Key1`, `Hasher2`, `Key2`, `Value` and
-///   optionally `QueryKind` and `OnEmpty`.
+/// * [`pallet_prelude::StorageMap`] expect `Hasher`, `Key`, `Value` and optionally `QueryKind`
+///   and `OnEmpty`,
+/// * [`pallet_prelude::StorageDoubleMap`] expect `Hasher1`, `Key1`, `Hasher2`, `Key2`, `Value`
+///   and optionally `QueryKind` and `OnEmpty`.
 ///
-/// For unnamed generic argument: Their first generic must be `_` as it is replaced by the macro
-/// and other generic must declared as a normal declaration of type generic in rust.
+/// For unnamed generic argument: Their first generic must be `_` as it is replaced by the
+/// macro and other generic must declared as a normal declaration of type generic in rust.
 ///
-/// The Prefix generic written by the macro is generated using `PalletInfo::name::<Pallet<..>>()`
-/// and the name of the storage type.
+/// The Prefix generic written by the macro is generated using
+/// `PalletInfo::name::<Pallet<..>>()` and the name of the storage type.
 /// E.g. if runtime names the pallet "MyExample" then the storage `type Foo<T> = ...` use the
 /// prefix: `Twox128(b"MyExample") ++ Twox128(b"Foo")`.
 ///
@@ -1714,12 +1718,12 @@ pub mod pallet_prelude {
 /// pub(super) type MyStorage<T> = StorageValue<Value = u32>;
 /// ```
 ///
-/// All the `cfg` attributes are automatically copied to the items generated for the storage, i.e. the
-/// getter, storage prefix, and the metadata element etc.
+/// All the `cfg` attributes are automatically copied to the items generated for the storage,
+/// i.e. the getter, storage prefix, and the metadata element etc.
 ///
-/// NOTE: If the `QueryKind` generic parameter is still generic at this stage or is using some type
-/// alias then the generation of the getter might fail. In this case the getter can be implemented
-/// manually.
+/// NOTE: If the `QueryKind` generic parameter is still generic at this stage or is using some
+/// type alias then the generation of the getter might fail. In this case the getter can be
+/// implemented manually.
 ///
 /// NOTE: The generic `Hasher` must implement the [`StorageHasher`] trait (or the type is not
 /// usable at all). We use [`StorageHasher::METADATA`] for the metadata of the hasher of the
@@ -1729,17 +1733,17 @@ pub mod pallet_prelude {
 ///
 /// For each storage item the macro generates a struct named
 /// `_GeneratedPrefixForStorage$NameOfStorage`, and implements
-/// [`StorageInstance`](traits::StorageInstance) on it using the pallet and storage name. It then
-/// uses it as the first generic of the aliased type.
+/// [`StorageInstance`](traits::StorageInstance) on it using the pallet and storage name. It
+/// then uses it as the first generic of the aliased type.
 ///
 /// For named generic, the macro will reorder the generics, and remove the names.
 ///
-/// The macro implements the function `storage_metadata` on `Pallet` implementing the metadata for
-/// all storage items based on their kind:
+/// The macro implements the function `storage_metadata` on `Pallet` implementing the metadata
+/// for all storage items based on their kind:
 /// * for a storage value, the type of the value is copied into the metadata
 /// * for a storage map, the type of the values and the key's type is copied into the metadata
-/// * for a storage double map, the type of the values, and the types of key1 and key2 are copied into
-///   the metadata.
+/// * for a storage double map, the type of the values, and the types of key1 and key2 are
+///   copied into the metadata.
 ///
 /// # Type value: `#[pallet::type_value]` optional
 ///
@@ -1764,9 +1768,9 @@ pub mod pallet_prelude {
 ///
 /// ### Macro expansion
 ///
-/// Macro renames the function to some internal name, generate a struct with the original name of
-/// the function and its generic, and implement `Get<$ReturnType>` by calling the user defined
-/// function.
+/// Macro renames the function to some internal name, generate a struct with the original name
+/// of the function and its generic, and implement `Get<$ReturnType>` by calling the user
+/// defined function.
 ///
 /// # Genesis config: `#[pallet::genesis_config]` optional
 ///
@@ -1805,8 +1809,8 @@ pub mod pallet_prelude {
 /// 	fn build(&self) { $expr }
 /// }
 /// ```
-/// I.e. a rust trait implementation with generic `T: Config`, of trait `GenesisBuild<T>` on type
-/// `GenesisConfig` with generics none or `T`.
+/// I.e. a rust trait implementation with generic `T: Config`, of trait `GenesisBuild<T>` on
+/// type `GenesisConfig` with generics none or `T`.
 ///
 /// E.g.:
 /// ```ignore
@@ -1821,8 +1825,8 @@ pub mod pallet_prelude {
 /// Macro will add the following attribute on it:
 /// * `#[cfg(feature = "std")]`
 ///
-/// Macro will implement `sp_runtime::BuildModuleGenesisStorage` using `()` as second generic for
-/// non-instantiable pallets.
+/// Macro will implement `sp_runtime::BuildModuleGenesisStorage` using `()` as second generic
+/// for non-instantiable pallets.
 ///
 /// # Inherent: `#[pallet::inherent]` optional
 ///
@@ -1857,8 +1861,8 @@ pub mod pallet_prelude {
 /// I.e. a trait implementation with bound `T: Config`, of trait `ValidateUnsigned` for type
 /// `Pallet<T>`, and some optional where clause.
 ///
-/// NOTE: There is also `sp_runtime::traits::SignedExtension` that can be used to add some specific
-/// logic for transaction validation.
+/// NOTE: There is also `sp_runtime::traits::SignedExtension` that can be used to add some
+/// specific logic for transaction validation.
 ///
 /// ### Macro expansion
 ///
@@ -1877,19 +1881,19 @@ pub mod pallet_prelude {
 /// pub struct Origin<T>(PhantomData<(T)>);
 /// ```
 ///
-/// **WARNING**: modifying origin changes the outer runtime origin. This outer runtime origin can
-/// be stored on-chain (e.g. in pallet-scheduler), thus any change must be done with care as it
-/// might require some migration.
+/// **WARNING**: modifying origin changes the outer runtime origin. This outer runtime origin
+/// can be stored on-chain (e.g. in pallet-scheduler), thus any change must be done with care
+/// as it might require some migration.
 ///
 /// NOTE: for instantiable pallet, origin must be generic over T and I.
 ///
 /// # General notes on instantiable pallet
 ///
-/// An instantiable pallet is one where Config is generic, i.e. `Config<I>`. This allow runtime to
-/// implement multiple instance of the pallet, by using different type for the generic.
+/// An instantiable pallet is one where Config is generic, i.e. `Config<I>`. This allow runtime
+/// to implement multiple instance of the pallet, by using different type for the generic.
 /// This is the sole purpose of the generic `I`.
-/// But because `PalletInfo` requires `Pallet` placeholder to be static it is important to bound
-/// `'static` whenever `PalletInfo` can be used.
+/// But because `PalletInfo` requires `Pallet` placeholder to be static it is important to
+/// bound `'static` whenever `PalletInfo` can be used.
 /// And in order to have instantiable pallet usable as a regular pallet without instance, it is
 /// important to bound `= ()` on every types.
 ///
@@ -2226,8 +2230,8 @@ pub mod pallet_prelude {
 ///
 /// 1. Export the metadata of the pallet for later checks
 ///     - run your node with the pallet active
-///     - query the metadata using the `state_getMetadata` RPC and curl, or use
-///       `subsee -p <PALLET_NAME> > meta.json`
+///     - query the metadata using the `state_getMetadata` RPC and curl, or use `subsee -p
+///       <PALLET_NAME> > meta.json`
 /// 2. generate the template upgrade for the pallet provided by decl_storage
 ///     with environment variable `PRINT_PALLET_UPGRADE`:
 ///     `PRINT_PALLET_UPGRADE=1 cargo check -p my_pallet` This template can be
@@ -2271,7 +2275,8 @@ pub mod pallet_prelude {
 /// 	impl<T: Config> Hooks for Pallet<T> {
 /// 	}
 /// 	```
-/// 	and write inside on_initialize/on_finalize/on_runtime_upgrade/offchain_worker/integrity_test
+/// 	and write inside
+/// 	`on_initialize`, `on_finalize`, `on_runtime_upgrade`, `offchain_worker`, `integrity_test`.
 ///
 /// 	then write:
 /// 	```ignore
@@ -2281,7 +2286,8 @@ pub mod pallet_prelude {
 /// 	```
 /// 	and write inside all the calls in decl_module with a few changes in the signature:
 /// 	- origin must now be written completely, e.g. `origin: OriginFor<T>`
-/// 	- result type must be `DispatchResultWithPostInfo`, you need to write it and also you might
+/// 	- result type must be `DispatchResultWithPostInfo`, you need to write it and also you
+///    might
 /// 	need to put `Ok(().into())` at the end or the function.
 /// 	- `#[compact]` must now be written `#[pallet::compact]`
 /// 	- `#[weight = ..]` must now be written `#[pallet::weight(..)]`
@@ -2289,8 +2295,8 @@ pub mod pallet_prelude {
 /// 7. **migrate event**:
 /// 	rewrite as a simple enum under with the attribute `#[pallet::event]`,
 /// 	use `#[pallet::generate_deposit($vis fn deposit_event)]` to generate deposit_event,
-/// 	use `#[pallet::metadata(...)]` to configure the metadata for types in order not to break them.
-/// 8. **migrate error**: rewrite it with attribute `#[pallet::error]`.
+/// 	use `#[pallet::metadata(...)]` to configure the metadata for types in order not to break
+/// them. 8. **migrate error**: rewrite it with attribute `#[pallet::error]`.
 /// 9. **migrate storage**:
 /// 	decl_storage provide an upgrade template (see 3.). All storages, genesis config, genesis
 /// 	build and default implementation of genesis config can be taken from it directly.
@@ -2308,7 +2314,8 @@ pub mod pallet_prelude {
 /// 	}
 /// 	#[pallet::genesis_build]
 /// 	impl<T: Config> GenesisBuild<T> for GenesisConfig {
-/// 	// impl<T: Config, I: 'static> GenesisBuild<T, I> for GenesisConfig { for instantiable pallet
+/// 	// for instantiable pallet:
+/// 	// `impl<T: Config, I: 'static> GenesisBuild<T, I> for GenesisConfig {
 /// 		fn build() {
 /// 			// The add_extra_genesis build logic
 /// 		}
@@ -2325,10 +2332,12 @@ pub mod pallet_prelude {
 /// 	Once this is done you can migrate storage individually, a few notes:
 /// 	- for private storage use `pub(crate) type ` or `pub(super) type` or nothing,
 /// 	- for storage with `get(fn ..)` use `#[pallet::getter(fn ...)]`
-/// 	- for storage with value being `Option<$something>` make generic `Value` being `$something`
+/// 	- for storage with value being `Option<$something>` make generic `Value` being
+///    `$something`
 /// 		and generic `QueryKind` being `OptionQuery` (note: this is default). Otherwise make
 /// 		`Value` the complete value type and `QueryKind` being `ValueQuery`.
-/// 	- for storage with default value: `= $expr;` provide some specific OnEmpty generic. To do so
+/// 	- for storage with default value: `= $expr;` provide some specific OnEmpty generic. To do
+///    so
 /// 		use of `#[pallet::type_value]` to generate the wanted struct to put.
 /// 		example: `MyStorage: u32 = 3u32` would be written:
 /// 		```ignore
@@ -2361,9 +2370,11 @@ pub mod pallet_prelude {
 /// 	* error , error, constant,
 /// * manually check that:
 /// 	* `Origin` is moved inside the macro under `#[pallet::origin]` if it exists
-/// 	* `ValidateUnsigned` is moved inside the macro under `#[pallet::validate_unsigned)]` if it exists
+/// 	* `ValidateUnsigned` is moved inside the macro under `#[pallet::validate_unsigned)]` if it
+///    exists
 /// 	* `ProvideInherent` is moved inside macro under `#[pallet::inherent)]` if it exists
-/// 	* `on_initialize`/`on_finalize`/`on_runtime_upgrade`/`offchain_worker` are moved to `Hooks`
+/// 	* `on_initialize`/`on_finalize`/`on_runtime_upgrade`/`offchain_worker` are moved to
+///    `Hooks`
 /// 		implementation
 /// 	* storages with `config(..)` are converted to `GenesisConfig` field, and their default is
 /// 		`= $expr;` if the storage have default value
@@ -2380,8 +2391,9 @@ pub mod pallet_prelude {
 /// 		as the name the pallet was giving to `decl_storage`,
 /// 	* or do a storage migration from the old prefix used to the new prefix used.
 ///
-/// 	NOTE: The prefixes used by storage items are in the metadata. Thus, ensuring the metadata hasn't
-/// 	changed does ensure that the `pallet_prefix`s used by the storage items haven't changed.
+/// 	NOTE: The prefixes used by storage items are in the metadata. Thus, ensuring the metadata
+/// hasn't 	changed does ensure that the `pallet_prefix`s used by the storage items haven't
+/// changed.
 ///
 /// # Notes when macro fails to show proper error message spans:
 ///
diff --git a/frame/support/src/storage/bounded_btree_map.rs b/frame/support/src/storage/bounded_btree_map.rs
index f8ea35ae584d..737c8953d29e 100644
--- a/frame/support/src/storage/bounded_btree_map.rs
+++ b/frame/support/src/storage/bounded_btree_map.rs
@@ -125,7 +125,8 @@ where
 		}
 	}
 
-	/// Remove a key from the map, returning the value at the key if the key was previously in the map.
+	/// Remove a key from the map, returning the value at the key if the key was previously in the
+	/// map.
 	///
 	/// The key may be any borrowed form of the map's key type, but the ordering on the borrowed
 	/// form _must_ match the ordering on the key type.
@@ -137,7 +138,8 @@ where
 		self.0.remove(key)
 	}
 
-	/// Remove a key from the map, returning the value at the key if the key was previously in the map.
+	/// Remove a key from the map, returning the value at the key if the key was previously in the
+	/// map.
 	///
 	/// The key may be any borrowed form of the map's key type, but the ordering on the borrowed
 	/// form _must_ match the ordering on the key type.
diff --git a/frame/support/src/storage/mod.rs b/frame/support/src/storage/mod.rs
index 57cbc6e31da1..ac2ddaa73c3b 100644
--- a/frame/support/src/storage/mod.rs
+++ b/frame/support/src/storage/mod.rs
@@ -160,8 +160,8 @@ pub trait StorageValue<T: FullCodec> {
 	/// # Usage
 	///
 	/// This would typically be called inside the module implementation of on_runtime_upgrade, while
-	/// ensuring **no usage of this storage are made before the call to `on_runtime_upgrade`**. (More
-	/// precisely prior initialized modules doesn't make use of this storage).
+	/// ensuring **no usage of this storage are made before the call to `on_runtime_upgrade`**.
+	/// (More precisely prior initialized modules doesn't make use of this storage).
 	fn translate<O: Decode, F: FnOnce(Option<O>) -> Option<T>>(f: F) -> Result<Option<T>, ()>;
 
 	/// Store a value under this key into the provided storage instance.
@@ -989,7 +989,8 @@ impl<T> ChildTriePrefixIterator<T> {
 }
 
 impl<T: Decode + Sized> ChildTriePrefixIterator<(Vec<u8>, T)> {
-	/// Construct iterator to iterate over child trie items in `child_info` with the prefix `prefix`.
+	/// Construct iterator to iterate over child trie items in `child_info` with the prefix
+	/// `prefix`.
 	///
 	/// NOTE: Iterator with [`Self::drain`] will remove any value who failed to decode
 	pub fn with_prefix(child_info: &ChildInfo, prefix: &[u8]) -> Self {
@@ -1012,7 +1013,8 @@ impl<T: Decode + Sized> ChildTriePrefixIterator<(Vec<u8>, T)> {
 }
 
 impl<K: Decode + Sized, T: Decode + Sized> ChildTriePrefixIterator<(K, T)> {
-	/// Construct iterator to iterate over child trie items in `child_info` with the prefix `prefix`.
+	/// Construct iterator to iterate over child trie items in `child_info` with the prefix
+	/// `prefix`.
 	///
 	/// NOTE: Iterator with [`Self::drain`] will remove any key or value who failed to decode
 	pub fn with_prefix_over_key<H: ReversibleStorageHasher>(
diff --git a/frame/support/src/storage/types/key.rs b/frame/support/src/storage/types/key.rs
index a8cdb4546a6f..db66838e3ff1 100755
--- a/frame/support/src/storage/types/key.rs
+++ b/frame/support/src/storage/types/key.rs
@@ -58,7 +58,8 @@ pub trait KeyGeneratorMaxEncodedLen: KeyGenerator {
 	fn key_max_encoded_len() -> usize;
 }
 
-/// A trait containing methods that are only implemented on the Key struct instead of the entire tuple.
+/// A trait containing methods that are only implemented on the Key struct instead of the entire
+/// tuple.
 pub trait KeyGeneratorInner: KeyGenerator {
 	type Hasher: StorageHasher;
 
diff --git a/frame/support/src/storage/types/mod.rs b/frame/support/src/storage/types/mod.rs
index f800f33dc316..d61ca6813c9d 100644
--- a/frame/support/src/storage/types/mod.rs
+++ b/frame/support/src/storage/types/mod.rs
@@ -39,10 +39,10 @@ pub use value::{StorageValue, StorageValueMetadata};
 /// Trait implementing how the storage optional value is converted into the queried type.
 ///
 /// It is implemented by:
-/// * `OptionQuery` which convert an optional value to an optional value, user when querying
-///   storage will get an optional value.
-/// * `ValueQuery` which convert an optional value to a value, user when querying storage will get
-///   a value.
+/// * `OptionQuery` which convert an optional value to an optional value, user when querying storage
+///   will get an optional value.
+/// * `ValueQuery` which convert an optional value to a value, user when querying storage will get a
+///   value.
 pub trait QueryKindTrait<Value, OnEmpty> {
 	/// Metadata for the storage kind.
 	const METADATA: StorageEntryModifier;
diff --git a/frame/support/src/storage/weak_bounded_vec.rs b/frame/support/src/storage/weak_bounded_vec.rs
index 9fa360230691..f60e4d87bde8 100644
--- a/frame/support/src/storage/weak_bounded_vec.rs
+++ b/frame/support/src/storage/weak_bounded_vec.rs
@@ -270,8 +270,8 @@ impl<T, S> codec::DecodeLength for WeakBoundedVec<T, S> {
 }
 
 // NOTE: we could also implement this as:
-// impl<T: Value, S1: Get<u32>, S2: Get<u32>> PartialEq<WeakBoundedVec<T, S2>> for WeakBoundedVec<T, S1>
-// to allow comparison of bounded vectors with different bounds.
+// impl<T: Value, S1: Get<u32>, S2: Get<u32>> PartialEq<WeakBoundedVec<T, S2>> for WeakBoundedVec<T,
+// S1> to allow comparison of bounded vectors with different bounds.
 impl<T, S> PartialEq for WeakBoundedVec<T, S>
 where
 	T: PartialEq,
diff --git a/frame/support/src/traits/members.rs b/frame/support/src/traits/members.rs
index 1d7c1c73208d..35405e44731d 100644
--- a/frame/support/src/traits/members.rs
+++ b/frame/support/src/traits/members.rs
@@ -185,8 +185,8 @@ pub trait ChangeMembers<AccountId: Clone + Ord> {
 		sorted_new: &[AccountId],
 	);
 
-	/// Set the new members; they **must already be sorted**. This will compute the diff and use it to
-	/// call `change_members_sorted`.
+	/// Set the new members; they **must already be sorted**. This will compute the diff and use it
+	/// to call `change_members_sorted`.
 	///
 	/// This resets any previous value of prime.
 	fn set_members_sorted(new_members: &[AccountId], old_members: &[AccountId]) {
diff --git a/frame/support/src/traits/misc.rs b/frame/support/src/traits/misc.rs
index 382c5ebf5713..1776e1ba320e 100644
--- a/frame/support/src/traits/misc.rs
+++ b/frame/support/src/traits/misc.rs
@@ -277,7 +277,8 @@ pub trait IsSubType<T> {
 pub trait ExecuteBlock<Block: BlockT> {
 	/// Execute the given `block`.
 	///
-	/// This will execute all extrinsics in the block and check that the resulting header is correct.
+	/// This will execute all extrinsics in the block and check that the resulting header is
+	/// correct.
 	///
 	/// # Panic
 	///
diff --git a/frame/support/src/traits/schedule.rs b/frame/support/src/traits/schedule.rs
index 10a973a993df..a4a4f9c03ab1 100644
--- a/frame/support/src/traits/schedule.rs
+++ b/frame/support/src/traits/schedule.rs
@@ -42,8 +42,8 @@ pub enum DispatchTime<BlockNumber> {
 /// The highest priority. We invert the value so that normal sorting will place the highest
 /// priority at the beginning of the list.
 pub const HIGHEST_PRIORITY: Priority = 0;
-/// Anything of this value or lower will definitely be scheduled on the block that they ask for, even
-/// if it breaches the `MaximumWeight` limitation.
+/// Anything of this value or lower will definitely be scheduled on the block that they ask for,
+/// even if it breaches the `MaximumWeight` limitation.
 pub const HARD_DEADLINE: Priority = 63;
 /// The lowest priority. Most stuff should be around here.
 pub const LOWEST_PRIORITY: Priority = 255;
diff --git a/frame/support/src/traits/storage.rs b/frame/support/src/traits/storage.rs
index c0cbfb3a9078..9a88a3ed4404 100644
--- a/frame/support/src/traits/storage.rs
+++ b/frame/support/src/traits/storage.rs
@@ -21,7 +21,8 @@ use sp_std::prelude::*;
 
 /// An instance of a pallet in the storage.
 ///
-/// It is required that these instances are unique, to support multiple instances per pallet in the same runtime!
+/// It is required that these instances are unique, to support multiple instances per pallet in the
+/// same runtime!
 ///
 /// E.g. for module MyModule default instance will have prefix "MyModule" and other instances
 /// "InstanceNMyModule".
diff --git a/frame/support/src/traits/tokens/currency.rs b/frame/support/src/traits/tokens/currency.rs
index 6c73a1527b48..bf078658477f 100644
--- a/frame/support/src/traits/tokens/currency.rs
+++ b/frame/support/src/traits/tokens/currency.rs
@@ -56,8 +56,8 @@ pub trait Currency<AccountId> {
 	/// The total amount of issuance in the system.
 	fn total_issuance() -> Self::Balance;
 
-	/// The minimum balance any single account may have. This is equivalent to the `Balances` module's
-	/// `ExistentialDeposit`.
+	/// The minimum balance any single account may have. This is equivalent to the `Balances`
+	/// module's `ExistentialDeposit`.
 	fn minimum_balance() -> Self::Balance;
 
 	/// Reduce the total issuance by `amount` and return the according imbalance. The imbalance will
@@ -192,8 +192,8 @@ pub trait Currency<AccountId> {
 	/// Ensure an account's free balance equals some value; this will create the account
 	/// if needed.
 	///
-	/// Returns a signed imbalance and status to indicate if the account was successfully updated or update
-	/// has led to killing of the account.
+	/// Returns a signed imbalance and status to indicate if the account was successfully updated or
+	/// update has led to killing of the account.
 	fn make_free_balance_be(
 		who: &AccountId,
 		balance: Self::Balance,
diff --git a/frame/support/src/traits/tokens/currency/reservable.rs b/frame/support/src/traits/tokens/currency/reservable.rs
index 41220ca81cac..0ca7a93dc7f6 100644
--- a/frame/support/src/traits/tokens/currency/reservable.rs
+++ b/frame/support/src/traits/tokens/currency/reservable.rs
@@ -193,8 +193,8 @@ pub trait NamedReservableCurrency<AccountId>: ReservableCurrency<AccountId> {
 		Self::slash_reserved_named(id, who, value).0
 	}
 
-	/// Move all the named reserved balance of one account into the balance of another, according to `status`.
-	/// If `status` is `Reserved`, the balance will be reserved with given `id`.
+	/// Move all the named reserved balance of one account into the balance of another, according to
+	/// `status`. If `status` is `Reserved`, the balance will be reserved with given `id`.
 	///
 	/// Is a no-op if:
 	/// - the value to be moved is zero; or
diff --git a/frame/support/src/traits/tokens/fungible/balanced.rs b/frame/support/src/traits/tokens/fungible/balanced.rs
index a54b29a9d913..7b33a595a1b5 100644
--- a/frame/support/src/traits/tokens/fungible/balanced.rs
+++ b/frame/support/src/traits/tokens/fungible/balanced.rs
@@ -198,7 +198,8 @@ pub trait Unbalanced<AccountId>: Inspect<AccountId> {
 		}
 		let mut r = Self::set_balance(who, new_balance);
 		if r.is_err() {
-			// Some error, probably because we tried to destroy an account which cannot be destroyed.
+			// Some error, probably because we tried to destroy an account which cannot be
+			// destroyed.
 			if new_balance.is_zero() && amount >= minimum_balance {
 				new_balance = minimum_balance;
 				amount -= minimum_balance;
diff --git a/frame/support/src/traits/tokens/fungible/imbalance.rs b/frame/support/src/traits/tokens/fungible/imbalance.rs
index e6d3b5bed66a..362e0c126d99 100644
--- a/frame/support/src/traits/tokens/fungible/imbalance.rs
+++ b/frame/support/src/traits/tokens/fungible/imbalance.rs
@@ -142,7 +142,8 @@ pub type DebtOf<AccountId, B> = Imbalance<
 	<B as Balanced<AccountId>>::OnDropCredit,
 >;
 
-/// Imbalance implying that the total_issuance value is greater than the sum of all account balances.
+/// Imbalance implying that the total_issuance value is greater than the sum of all account
+/// balances.
 pub type CreditOf<AccountId, B> = Imbalance<
 	<B as Inspect<AccountId>>::Balance,
 	// This will generally be implemented by decreasing the total_issuance value.
diff --git a/frame/support/src/traits/tokens/fungibles/balanced.rs b/frame/support/src/traits/tokens/fungibles/balanced.rs
index 9c601c3e7c42..40a65305b87d 100644
--- a/frame/support/src/traits/tokens/fungibles/balanced.rs
+++ b/frame/support/src/traits/tokens/fungibles/balanced.rs
@@ -223,7 +223,8 @@ pub trait Unbalanced<AccountId>: Inspect<AccountId> {
 		}
 		let mut r = Self::set_balance(asset, who, new_balance);
 		if r.is_err() {
-			// Some error, probably because we tried to destroy an account which cannot be destroyed.
+			// Some error, probably because we tried to destroy an account which cannot be
+			// destroyed.
 			if new_balance.is_zero() && amount >= minimum_balance {
 				new_balance = minimum_balance;
 				amount -= minimum_balance;
diff --git a/frame/support/src/traits/tokens/fungibles/imbalance.rs b/frame/support/src/traits/tokens/fungibles/imbalance.rs
index 2195cacc4282..c44c47164648 100644
--- a/frame/support/src/traits/tokens/fungibles/imbalance.rs
+++ b/frame/support/src/traits/tokens/fungibles/imbalance.rs
@@ -168,7 +168,8 @@ pub type DebtOf<AccountId, B> = Imbalance<
 	<B as Balanced<AccountId>>::OnDropCredit,
 >;
 
-/// Imbalance implying that the total_issuance value is greater than the sum of all account balances.
+/// Imbalance implying that the total_issuance value is greater than the sum of all account
+/// balances.
 pub type CreditOf<AccountId, B> = Imbalance<
 	<B as Inspect<AccountId>>::AssetId,
 	<B as Inspect<AccountId>>::Balance,
diff --git a/frame/support/src/traits/tokens/misc.rs b/frame/support/src/traits/tokens/misc.rs
index 8eda930380d8..bea6e664cf2c 100644
--- a/frame/support/src/traits/tokens/misc.rs
+++ b/frame/support/src/traits/tokens/misc.rs
@@ -51,8 +51,8 @@ pub enum WithdrawConsequence<Balance> {
 }
 
 impl<Balance: Zero> WithdrawConsequence<Balance> {
-	/// Convert the type into a `Result` with `DispatchError` as the error or the additional `Balance`
-	/// by which the account will be reduced.
+	/// Convert the type into a `Result` with `DispatchError` as the error or the additional
+	/// `Balance` by which the account will be reduced.
 	pub fn into_result(self) -> Result<Balance, DispatchError> {
 		use WithdrawConsequence::*;
 		match self {
diff --git a/frame/support/src/traits/validation.rs b/frame/support/src/traits/validation.rs
index a473e332a83f..f4107ef6e2b0 100644
--- a/frame/support/src/traits/validation.rs
+++ b/frame/support/src/traits/validation.rs
@@ -238,7 +238,8 @@ impl<N: Zero> Lateness<N> for () {
 }
 
 /// Implementors of this trait provide information about whether or not some validator has
-/// been registered with them. The [Session module](../../pallet_session/index.html) is an implementor.
+/// been registered with them. The [Session module](../../pallet_session/index.html) is an
+/// implementor.
 pub trait ValidatorRegistration<ValidatorId> {
 	/// Returns true if the provided validator ID has been registered with the implementing runtime
 	/// module
diff --git a/frame/support/src/weights.rs b/frame/support/src/weights.rs
index 6b4f5e4046cc..7af6d440aa40 100644
--- a/frame/support/src/weights.rs
+++ b/frame/support/src/weights.rs
@@ -229,8 +229,9 @@ pub enum DispatchClass {
 	Operational,
 	/// A mandatory dispatch. These kinds of dispatch are always included regardless of their
 	/// weight, therefore it is critical that they are separately validated to ensure that a
-	/// malicious validator cannot craft a valid but impossibly heavy block. Usually this just means
-	/// ensuring that the extrinsic can only be included once and that it is always very light.
+	/// malicious validator cannot craft a valid but impossibly heavy block. Usually this just
+	/// means ensuring that the extrinsic can only be included once and that it is always very
+	/// light.
 	///
 	/// Do *NOT* use it for extrinsics that can be heavy.
 	///
@@ -528,12 +529,12 @@ impl<T> PaysFee<T> for (Weight, Pays) {
 /// A struct to represent a weight which is a function of the input arguments. The given items have
 /// the following types:
 ///
-/// - `WD`: a raw `Weight` value or a closure that returns a `Weight` with the same
+/// - `WD`: a raw `Weight` value or a closure that returns a `Weight` with the same argument list as
+///   the dispatched, wrapped in a tuple.
+/// - `CD`: a raw `DispatchClass` value or a closure that returns a `DispatchClass` with the same
 ///   argument list as the dispatched, wrapped in a tuple.
-/// - `CD`: a raw `DispatchClass` value or a closure that returns a `DispatchClass`
-///   with the same argument list as the dispatched, wrapped in a tuple.
-/// - `PF`: a `Pays` variant for whether this dispatch pays fee or not or a closure that
-///   returns a `Pays` variant with the same argument list as the dispatched, wrapped in a tuple.
+/// - `PF`: a `Pays` variant for whether this dispatch pays fee or not or a closure that returns a
+///   `Pays` variant with the same argument list as the dispatched, wrapped in a tuple.
 #[deprecated = "Function arguments are available directly inside the annotation now."]
 pub struct FunctionOf<WD, CD, PF>(pub WD, pub CD, pub PF);
 
diff --git a/frame/support/test/src/lib.rs b/frame/support/test/src/lib.rs
index ffda500f96ad..78317a1a2f90 100644
--- a/frame/support/test/src/lib.rs
+++ b/frame/support/test/src/lib.rs
@@ -51,7 +51,8 @@ impl frame_support::traits::PalletInfo for PanicPalletInfo {
 	}
 }
 
-/// Provides an implementation of [`frame_support::traits::Randomness`] that should only be used in tests!
+/// Provides an implementation of [`frame_support::traits::Randomness`] that should only be used in
+/// tests!
 pub struct TestRandomness<T>(sp_std::marker::PhantomData<T>);
 
 impl<Output: codec::Decode + Default, T> frame_support::traits::Randomness<Output, T::BlockNumber>
diff --git a/frame/system/src/extensions/check_weight.rs b/frame/system/src/extensions/check_weight.rs
index fae973ac18be..1e7ad9454b4c 100644
--- a/frame/system/src/extensions/check_weight.rs
+++ b/frame/system/src/extensions/check_weight.rs
@@ -456,7 +456,8 @@ mod tests {
 				CheckWeight::<Test>::do_pre_dispatch(&dispatch_normal, len),
 				InvalidTransaction::ExhaustsResources
 			);
-			// Thank goodness we can still do an operational transaction to possibly save the blockchain.
+			// Thank goodness we can still do an operational transaction to possibly save the
+			// blockchain.
 			assert_ok!(CheckWeight::<Test>::do_pre_dispatch(&dispatch_operational, len));
 			// Not too much though
 			assert_err!(
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index 6b967fd8925a..a8bf253c392c 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -27,8 +27,8 @@
 //! The System pallet defines the core data types used in a Substrate runtime.
 //! It also provides several utility functions (see [`Pallet`]) for other FRAME pallets.
 //!
-//! In addition, it manages the storage items for extrinsics data, indexes, event records, and digest items,
-//! among other things that support the execution of the current block.
+//! In addition, it manages the storage items for extrinsics data, indexes, event records, and
+//! digest items, among other things that support the execution of the current block.
 //!
 //! It also handles low-level tasks like depositing logs, basic set up and take down of
 //! temporary storage entries, and access to previous block hashes.
@@ -54,10 +54,10 @@
 //!   - [`CheckEra`]: Checks the era of the transaction. Contains a single payload of type `Era`.
 //!   - [`CheckGenesis`]: Checks the provided genesis hash of the transaction. Must be a part of the
 //!     signed payload of the transaction.
-//!   - [`CheckSpecVersion`]: Checks that the runtime version is the same as the one used to sign the
-//!     transaction.
-//!   - [`CheckTxVersion`]: Checks that the transaction version is the same as the one used to sign the
-//!     transaction.
+//!   - [`CheckSpecVersion`]: Checks that the runtime version is the same as the one used to sign
+//!     the transaction.
+//!   - [`CheckTxVersion`]: Checks that the transaction version is the same as the one used to sign
+//!     the transaction.
 //!
 //! Lookup the runtime aggregator file (e.g. `node/runtime`) to see the full list of signed
 //! extensions included in a chain.
@@ -180,8 +180,8 @@ pub mod pallet {
 		/// The aggregated `Call` type.
 		type Call: Dispatchable + Debug;
 
-		/// Account index (aka nonce) type. This stores the number of previous transactions associated
-		/// with a sender account.
+		/// Account index (aka nonce) type. This stores the number of previous transactions
+		/// associated with a sender account.
 		type Index: Parameter
 			+ Member
 			+ MaybeSerializeDeserialize
@@ -238,10 +238,10 @@ pub mod pallet {
 
 		/// Converting trait to take a source type and convert to `AccountId`.
 		///
-		/// Used to define the type and conversion mechanism for referencing accounts in transactions.
-		/// It's perfectly reasonable for this to be an identity conversion (with the source type being
-		/// `AccountId`), but other pallets (e.g. Indices pallet) may provide more functional/efficient
-		/// alternatives.
+		/// Used to define the type and conversion mechanism for referencing accounts in
+		/// transactions. It's perfectly reasonable for this to be an identity conversion (with the
+		/// source type being `AccountId`), but other pallets (e.g. Indices pallet) may provide more
+		/// functional/efficient alternatives.
 		type Lookup: StaticLookup<Target = Self::AccountId>;
 
 		/// The block header.
@@ -363,10 +363,11 @@ pub mod pallet {
 		/// # <weight>
 		/// - `O(C + S)` where `C` length of `code` and `S` complexity of `can_set_code`
 		/// - 1 storage write (codec `O(C)`).
-		/// - 1 call to `can_set_code`: `O(S)` (calls `sp_io::misc::runtime_version` which is expensive).
+		/// - 1 call to `can_set_code`: `O(S)` (calls `sp_io::misc::runtime_version` which is
+		///   expensive).
 		/// - 1 event.
-		/// The weight of this function is dependent on the runtime, but generally this is very expensive.
-		/// We will treat this as a full block.
+		/// The weight of this function is dependent on the runtime, but generally this is very
+		/// expensive. We will treat this as a full block.
 		/// # </weight>
 		#[pallet::weight((T::BlockWeights::get().max_block, DispatchClass::Operational))]
 		pub fn set_code(origin: OriginFor<T>, code: Vec<u8>) -> DispatchResultWithPostInfo {
@@ -384,8 +385,8 @@ pub mod pallet {
 		/// - `O(C)` where `C` length of `code`
 		/// - 1 storage write (codec `O(C)`).
 		/// - 1 event.
-		/// The weight of this function is dependent on the runtime. We will treat this as a full block.
-		/// # </weight>
+		/// The weight of this function is dependent on the runtime. We will treat this as a full
+		/// block. # </weight>
 		#[pallet::weight((T::BlockWeights::get().max_block, DispatchClass::Operational))]
 		pub fn set_code_without_checks(
 			origin: OriginFor<T>,
diff --git a/frame/timestamp/src/lib.rs b/frame/timestamp/src/lib.rs
index a5a3b319b03c..a1ff8d37ff88 100644
--- a/frame/timestamp/src/lib.rs
+++ b/frame/timestamp/src/lib.rs
@@ -27,13 +27,14 @@
 //!
 //! The Timestamp pallet allows the validators to set and validate a timestamp with each block.
 //!
-//! It uses inherents for timestamp data, which is provided by the block author and validated/verified
-//! by other validators. The timestamp can be set only once per block and must be set each block.
-//! There could be a constraint on how much time must pass before setting the new timestamp.
+//! It uses inherents for timestamp data, which is provided by the block author and
+//! validated/verified by other validators. The timestamp can be set only once per block and must be
+//! set each block. There could be a constraint on how much time must pass before setting the new
+//! timestamp.
 //!
-//! **NOTE:** The Timestamp pallet is the recommended way to query the on-chain time instead of using
-//! an approach based on block numbers. The block number based time measurement can cause issues
-//! because of cumulative calculation errors and hence should be avoided.
+//! **NOTE:** The Timestamp pallet is the recommended way to query the on-chain time instead of
+//! using an approach based on block numbers. The block number based time measurement can cause
+//! issues because of cumulative calculation errors and hence should be avoided.
 //!
 //! ## Interface
 //!
@@ -52,7 +53,8 @@
 //!
 //! ## Usage
 //!
-//! The following example shows how to use the Timestamp pallet in your custom pallet to query the current timestamp.
+//! The following example shows how to use the Timestamp pallet in your custom pallet to query the
+//! current timestamp.
 //!
 //! ### Prerequisites
 //!
@@ -120,13 +122,14 @@ pub mod pallet {
 			+ Copy
 			+ MaxEncodedLen;
 
-		/// Something which can be notified when the timestamp is set. Set this to `()` if not needed.
+		/// Something which can be notified when the timestamp is set. Set this to `()` if not
+		/// needed.
 		type OnTimestampSet: OnTimestampSet<Self::Moment>;
 
-		/// The minimum period between blocks. Beware that this is different to the *expected* period
-		/// that the block production apparatus provides. Your chosen consensus system will generally
-		/// work with this to determine a sensible block time. e.g. For Aura, it will be double this
-		/// period on default settings.
+		/// The minimum period between blocks. Beware that this is different to the *expected*
+		/// period that the block production apparatus provides. Your chosen consensus system will
+		/// generally work with this to determine a sensible block time. e.g. For Aura, it will be
+		/// double this period on default settings.
 		#[pallet::constant]
 		type MinimumPeriod: Get<Self::Moment>;
 
@@ -179,7 +182,8 @@ pub mod pallet {
 		///
 		/// # <weight>
 		/// - `O(1)` (Note that implementations of `OnTimestampSet` must also be `O(1)`)
-		/// - 1 storage read and 1 storage mutation (codec `O(1)`). (because of `DidUpdate::take` in `on_finalize`)
+		/// - 1 storage read and 1 storage mutation (codec `O(1)`). (because of `DidUpdate::take` in
+		///   `on_finalize`)
 		/// - 1 event handler `on_timestamp_set`. Must be `O(1)`.
 		/// # </weight>
 		#[pallet::weight((
diff --git a/frame/tips/src/lib.rs b/frame/tips/src/lib.rs
index e8b5544bd664..ca327f6c8710 100644
--- a/frame/tips/src/lib.rs
+++ b/frame/tips/src/lib.rs
@@ -22,11 +22,11 @@
 //! A subsystem to allow for an agile "tipping" process, whereby a reward may be given without first
 //! having a pre-determined stakeholder group come to consensus on how much should be paid.
 //!
-//! A group of `Tippers` is determined through the config `Config`. After half of these have declared
-//! some amount that they believe a particular reported reason deserves, then a countdown period is
-//! entered where any remaining members can declare their tip amounts also. After the close of the
-//! countdown period, the median of all declared tips is paid to the reported beneficiary, along
-//! with any finders fee, in case of a public (and bonded) original report.
+//! A group of `Tippers` is determined through the config `Config`. After half of these have
+//! declared some amount that they believe a particular reported reason deserves, then a countdown
+//! period is entered where any remaining members can declare their tip amounts also. After the
+//! close of the countdown period, the median of all declared tips is paid to the reported
+//! beneficiary, along with any finders fee, in case of a public (and bonded) original report.
 //!
 //!
 //! ### Terminology
@@ -114,8 +114,8 @@ pub struct OpenTip<
 	BlockNumber: Parameter,
 	Hash: Parameter,
 > {
-	/// The hash of the reason for the tip. The reason should be a human-readable UTF-8 encoded string. A URL would be
-	/// sensible.
+	/// The hash of the reason for the tip. The reason should be a human-readable UTF-8 encoded
+	/// string. A URL would be sensible.
 	reason: Hash,
 	/// The account to be tipped.
 	who: AccountId,
@@ -530,8 +530,8 @@ impl<T: Config> Module<T> {
 	}
 
 	pub fn migrate_retract_tip_for_tip_new() {
-		/// An open tipping "motion". Retains all details of a tip including information on the finder
-		/// and the members who have voted.
+		/// An open tipping "motion". Retains all details of a tip including information on the
+		/// finder and the members who have voted.
 		#[derive(Clone, Eq, PartialEq, Encode, Decode, RuntimeDebug)]
 		pub struct OldOpenTip<
 			AccountId: Parameter,
@@ -539,15 +539,15 @@ impl<T: Config> Module<T> {
 			BlockNumber: Parameter,
 			Hash: Parameter,
 		> {
-			/// The hash of the reason for the tip. The reason should be a human-readable UTF-8 encoded string. A URL would be
-			/// sensible.
+			/// The hash of the reason for the tip. The reason should be a human-readable UTF-8
+			/// encoded string. A URL would be sensible.
 			reason: Hash,
 			/// The account to be tipped.
 			who: AccountId,
 			/// The account who began this tip and the amount held on deposit.
 			finder: Option<(AccountId, Balance)>,
-			/// The block number at which this tip will close if `Some`. If `None`, then no closing is
-			/// scheduled.
+			/// The block number at which this tip will close if `Some`. If `None`, then no closing
+			/// is scheduled.
 			closes: Option<BlockNumber>,
 			/// The members who have voted for this tip. Sorted by AccountId.
 			tips: Vec<(AccountId, Balance)>,
diff --git a/frame/tips/src/tests.rs b/frame/tips/src/tests.rs
index c357942c54e1..8611320563c7 100644
--- a/frame/tips/src/tests.rs
+++ b/frame/tips/src/tests.rs
@@ -412,8 +412,8 @@ fn test_last_reward_migration() {
 		BlockNumber: Parameter,
 		Hash: Parameter,
 	> {
-		/// The hash of the reason for the tip. The reason should be a human-readable UTF-8 encoded string. A URL would be
-		/// sensible.
+		/// The hash of the reason for the tip. The reason should be a human-readable UTF-8 encoded
+		/// string. A URL would be sensible.
 		reason: Hash,
 		/// The account to be tipped.
 		who: AccountId,
diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
index 36bfd31a6753..9e8dbf6cb5d1 100644
--- a/frame/transaction-payment/src/lib.rs
+++ b/frame/transaction-payment/src/lib.rs
@@ -117,8 +117,8 @@ type BalanceOf<T> = <<T as Config>::OnChargeTransaction as OnChargeTransaction<T
 /// - in a fully congested chain: `p >= v * k * (1 - s')`.
 /// - in an empty chain: `p >= v * k * (-s')`.
 ///
-/// For example, when all blocks are full and there are 28800 blocks per day (default in `substrate-node`)
-/// and v == 0.00001, s' == 0.1875, we'd have:
+/// For example, when all blocks are full and there are 28800 blocks per day (default in
+/// `substrate-node`) and v == 0.00001, s' == 0.1875, we'd have:
 ///
 /// p >= 0.00001 * 28800 * 0.8125
 /// p >= 0.234
diff --git a/frame/transaction-payment/src/types.rs b/frame/transaction-payment/src/types.rs
index 345bd39718a7..3ce5bcf890bd 100644
--- a/frame/transaction-payment/src/types.rs
+++ b/frame/transaction-payment/src/types.rs
@@ -36,8 +36,9 @@ pub struct InclusionFee<Balance> {
 	pub base_fee: Balance,
 	/// The length fee, the amount paid for the encoded length (in bytes) of the transaction.
 	pub len_fee: Balance,
-	/// - `targeted_fee_adjustment`: This is a multiplier that can tune the final fee based on
-	///     the congestion of the network.
+	///
+	/// - `targeted_fee_adjustment`: This is a multiplier that can tune the final fee based on the
+	///   congestion of the network.
 	/// - `weight_fee`: This amount is computed based on the weight of the transaction. Weight
 	/// accounts for the execution time of a transaction.
 	///
@@ -60,8 +61,8 @@ impl<Balance: AtLeast32BitUnsigned + Copy> InclusionFee<Balance> {
 
 /// The `FeeDetails` is composed of:
 ///   - (Optional) `inclusion_fee`: Only the `Pays::Yes` transaction can have the inclusion fee.
-///   - `tip`: If included in the transaction, the tip will be added on top. Only
-///     signed transactions can have a tip.
+///   - `tip`: If included in the transaction, the tip will be added on top. Only signed
+///     transactions can have a tip.
 #[derive(Encode, Decode, Clone, Eq, PartialEq)]
 #[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
 #[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
@@ -88,7 +89,8 @@ impl<Balance: AtLeast32BitUnsigned + Copy> FeeDetails<Balance> {
 	}
 }
 
-/// Information related to a dispatchable's class, weight, and fee that can be queried from the runtime.
+/// Information related to a dispatchable's class, weight, and fee that can be queried from the
+/// runtime.
 #[derive(Eq, PartialEq, Encode, Decode, Default)]
 #[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
 #[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
diff --git a/frame/transaction-storage/src/lib.rs b/frame/transaction-storage/src/lib.rs
index 3964f42998b4..1b751f3b214c 100644
--- a/frame/transaction-storage/src/lib.rs
+++ b/frame/transaction-storage/src/lib.rs
@@ -169,9 +169,9 @@ pub mod pallet {
 
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
-		/// Index and store data on chain. Minimum data size is 1 bytes, maximum is `MaxTransactionSize`.
-		/// Data will be removed after `STORAGE_PERIOD` blocks, unless `renew` is called.
-		/// # <weight>
+		/// Index and store data on chain. Minimum data size is 1 bytes, maximum is
+		/// `MaxTransactionSize`. Data will be removed after `STORAGE_PERIOD` blocks, unless `renew`
+		/// is called. # <weight>
 		/// - n*log(n) of data size, as all data is pushed to an in-memory trie.
 		/// Additionally contains a DB write.
 		/// # </weight>
@@ -258,7 +258,8 @@ pub mod pallet {
 		/// Check storage proof for block number `block_number() - StoragePeriod`.
 		/// If such block does not exist the proof is expected to be `None`.
 		/// # <weight>
-		/// - Linear w.r.t the number of indexed transactions in the proved block for random probing.
+		/// - Linear w.r.t the number of indexed transactions in the proved block for random
+		///   probing.
 		/// There's a DB read for each transaction.
 		/// Here we assume a maximum of 100 probed transactions.
 		/// # </weight>
diff --git a/frame/treasury/src/lib.rs b/frame/treasury/src/lib.rs
index 207d51905af5..965f06731c94 100644
--- a/frame/treasury/src/lib.rs
+++ b/frame/treasury/src/lib.rs
@@ -95,15 +95,14 @@ pub type NegativeImbalanceOf<T, I = ()> = <<T as Config<I>>::Currency as Currenc
 /// A trait to allow the Treasury Pallet to spend it's funds for other purposes.
 /// There is an expectation that the implementer of this trait will correctly manage
 /// the mutable variables passed to it:
-/// * `budget_remaining`: How much available funds that can be spent by the treasury.
-///    As funds are spent, you must correctly deduct from this value.
-/// * `imbalance`: Any imbalances that you create should be subsumed in here to
-///    maximize efficiency of updating the total issuance. (i.e. `deposit_creating`)
-/// * `total_weight`: Track any weight that your `spend_fund` implementation uses by
-///    updating this value.
-/// * `missed_any`: If there were items that you want to spend on, but there were
-///    not enough funds, mark this value as `true`. This will prevent the treasury
-///    from burning the excess funds.
+/// * `budget_remaining`: How much available funds that can be spent by the treasury. As funds are
+///   spent, you must correctly deduct from this value.
+/// * `imbalance`: Any imbalances that you create should be subsumed in here to maximize efficiency
+///   of updating the total issuance. (i.e. `deposit_creating`)
+/// * `total_weight`: Track any weight that your `spend_fund` implementation uses by updating this
+///   value.
+/// * `missed_any`: If there were items that you want to spend on, but there were not enough funds,
+///   mark this value as `true`. This will prevent the treasury from burning the excess funds.
 #[impl_trait_for_tuples::impl_for_tuples(30)]
 pub trait SpendFunds<T: Config<I>, I: 'static = ()> {
 	fn spend_funds(
@@ -293,8 +292,8 @@ pub mod pallet {
 		/// # <weight>
 		/// - Complexity: `O(A)` where `A` is the number of approvals
 		/// - Db reads and writes: `Approvals`, `pot account data`
-		/// - Db reads and writes per approval:
-		///   `Proposals`, `proposer account data`, `beneficiary account data`
+		/// - Db reads and writes per approval: `Proposals`, `proposer account data`, `beneficiary
+		///   account data`
 		/// - The weight is overestimated if some approvals got missed.
 		/// # </weight>
 		fn on_initialize(n: T::BlockNumber) -> Weight {
diff --git a/frame/uniques/src/lib.rs b/frame/uniques/src/lib.rs
index ee052486b03a..37855253ffca 100644
--- a/frame/uniques/src/lib.rs
+++ b/frame/uniques/src/lib.rs
@@ -413,7 +413,8 @@ pub mod pallet {
 
 				Self::deposit_event(Event::Destroyed(class));
 
-				// NOTE: could use postinfo to reflect the actual number of accounts/sufficient/approvals
+				// NOTE: could use postinfo to reflect the actual number of
+				// accounts/sufficient/approvals
 				Ok(())
 			})
 		}
diff --git a/frame/utility/src/lib.rs b/frame/utility/src/lib.rs
index 7c47e81368f6..2e34502494c7 100644
--- a/frame/utility/src/lib.rs
+++ b/frame/utility/src/lib.rs
@@ -32,9 +32,9 @@
 //!   an alternative signed origin. Each account has 2 * 2**16 possible "pseudonyms" (alternative
 //!   account IDs) and these can be stacked. This can be useful as a key management tool, where you
 //!   need multiple distinct accounts (e.g. as controllers for many staking accounts), but where
-//!   it's perfectly fine to have each of them controlled by the same underlying keypair.
-//!   Derivative accounts are, for the purposes of proxy filtering considered exactly the same as
-//!   the origin and are thus hampered with the origin's filters.
+//!   it's perfectly fine to have each of them controlled by the same underlying keypair. Derivative
+//!   accounts are, for the purposes of proxy filtering considered exactly the same as the origin
+//!   and are thus hampered with the origin's filters.
 //!
 //! Since proxy filters are respected in all dispatches of this pallet, it should never need to be
 //! filtered by any proxy.
diff --git a/frame/utility/src/tests.rs b/frame/utility/src/tests.rs
index 7679df944ec0..2731b6ca0b8b 100644
--- a/frame/utility/src/tests.rs
+++ b/frame/utility/src/tests.rs
@@ -579,7 +579,8 @@ fn batch_all_does_not_nest() {
 		);
 
 		// And for those who want to get a little fancy, we check that the filter persists across
-		// other kinds of dispatch wrapping functions... in this case `batch_all(batch(batch_all(..)))`
+		// other kinds of dispatch wrapping functions... in this case
+		// `batch_all(batch(batch_all(..)))`
 		let batch_nested = Call::Utility(UtilityCall::batch(vec![batch_all]));
 		// Batch will end with `Ok`, but does not actually execute as we can see from the event
 		// and balances.
diff --git a/primitives/api/src/lib.rs b/primitives/api/src/lib.rs
index 0ec1c5aeadbb..82954d193e60 100644
--- a/primitives/api/src/lib.rs
+++ b/primitives/api/src/lib.rs
@@ -60,9 +60,10 @@
 //! `${TRAIT_NAME}_${FUNCTION_NAME}`. Such a function has the following signature
 //! `(ptr: *u8, length: u32) -> u64`. It takes a pointer to an `u8` array and its length as an
 //! argument. This `u8` array is expected to be the SCALE encoded parameters of the function as
-//! defined in the trait. The return value is an `u64` that represents `length << 32 | pointer` of an
-//! `u8` array. This return value `u8` array contains the SCALE encoded return value as defined by
-//! the trait function. The macros take care to encode the parameters and to decode the return value.
+//! defined in the trait. The return value is an `u64` that represents `length << 32 | pointer` of
+//! an `u8` array. This return value `u8` array contains the SCALE encoded return value as defined
+//! by the trait function. The macros take care to encode the parameters and to decode the return
+//! value.
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
@@ -116,8 +117,9 @@ pub const MAX_EXTRINSIC_DEPTH: u32 = 256;
 /// on the runtime side. The declaration for the runtime side is hidden in its own module.
 /// The client side declaration gets two extra parameters per function,
 /// `&self` and `at: &BlockId<Block>`. The runtime side declaration will match the given trait
-/// declaration. Besides one exception, the macro adds an extra generic parameter `Block: BlockT`
-/// to the client side and the runtime side. This generic parameter is usable by the user.
+/// declaration. Besides one exception, the macro adds an extra generic parameter `Block:
+/// BlockT` to the client side and the runtime side. This generic parameter is usable by the
+/// user.
 ///
 /// For implementing these macros you should use the
 /// [`impl_runtime_apis!`] macro.
@@ -149,14 +151,14 @@ pub const MAX_EXTRINSIC_DEPTH: u32 = 256;
 /// # Runtime api trait versioning
 ///
 /// To support versioning of the traits, the macro supports the attribute `#[api_version(1)]`.
-/// The attribute supports any `u32` as version. By default, each trait is at version `1`, if no
-/// version is provided. We also support changing the signature of a method. This signature
-/// change is highlighted with the `#[changed_in(2)]` attribute above a method. A method that is
-/// tagged with this attribute is callable by the name `METHOD_before_version_VERSION`. This
-/// method will only support calling into wasm, trying to call into native will fail (change the
-/// spec version!). Such a method also does not need to be implemented in the runtime. It is
-/// required that there exist the "default" of the method without the `#[changed_in(_)]` attribute,
-/// this method will be used to call the current default implementation.
+/// The attribute supports any `u32` as version. By default, each trait is at version `1`, if
+/// no version is provided. We also support changing the signature of a method. This signature
+/// change is highlighted with the `#[changed_in(2)]` attribute above a method. A method that
+/// is tagged with this attribute is callable by the name `METHOD_before_version_VERSION`. This
+/// method will only support calling into wasm, trying to call into native will fail (change
+/// the spec version!). Such a method also does not need to be implemented in the runtime. It
+/// is required that there exist the "default" of the method without the `#[changed_in(_)]`
+/// attribute, this method will be used to call the current default implementation.
 ///
 /// ```rust
 /// sp_api::decl_runtime_apis! {
@@ -181,22 +183,23 @@ pub const MAX_EXTRINSIC_DEPTH: u32 = 256;
 /// ```
 ///
 /// To check if a given runtime implements a runtime api trait, the `RuntimeVersion` has the
-/// function `has_api<A>()`. Also the `ApiExt` provides a function `has_api<A>(at: &BlockId)` to
-/// check if the runtime at the given block id implements the requested runtime api trait.
+/// function `has_api<A>()`. Also the `ApiExt` provides a function `has_api<A>(at: &BlockId)`
+/// to check if the runtime at the given block id implements the requested runtime api trait.
 pub use sp_api_proc_macro::decl_runtime_apis;
 
 /// Tags given trait implementations as runtime apis.
 ///
 /// All traits given to this macro, need to be declared with the
 /// [`decl_runtime_apis!`](macro.decl_runtime_apis.html) macro. The implementation of the trait
-/// should follow the declaration given to the [`decl_runtime_apis!`](macro.decl_runtime_apis.html)
-/// macro, besides the `Block` type that is required as first generic parameter for each runtime
-/// api trait. When implementing a runtime api trait, it is required that the trait is referenced
-/// by a path, e.g. `impl my_trait::MyTrait for Runtime`. The macro will use this path to access
-/// the declaration of the trait for the runtime side.
+/// should follow the declaration given to the
+/// [`decl_runtime_apis!`](macro.decl_runtime_apis.html) macro, besides the `Block` type that
+/// is required as first generic parameter for each runtime api trait. When implementing a
+/// runtime api trait, it is required that the trait is referenced by a path, e.g. `impl
+/// my_trait::MyTrait for Runtime`. The macro will use this path to access the declaration of
+/// the trait for the runtime side.
 ///
-/// The macro also generates the api implementations for the client side and provides it through
-/// the `RuntimeApi` type. The `RuntimeApi` is hidden behind a `feature` called `std`.
+/// The macro also generates the api implementations for the client side and provides it
+/// through the `RuntimeApi` type. The `RuntimeApi` is hidden behind a `feature` called `std`.
 ///
 /// To expose version information about all implemented api traits, the constant
 /// `RUNTIME_API_VERSIONS` is generated. This constant should be used to instantiate the `apis`
@@ -275,13 +278,13 @@ pub use sp_api_proc_macro::impl_runtime_apis;
 /// Mocks given trait implementations as runtime apis.
 ///
 /// Accepts similar syntax as [`impl_runtime_apis!`] and generates
-/// simplified mock implementations of the given runtime apis. The difference in syntax is that the
-/// trait does not need to be referenced by a qualified path, methods accept the `&self` parameter
-/// and the error type can be specified as associated type. If no error type is specified [`String`]
-/// is used as error type.
+/// simplified mock implementations of the given runtime apis. The difference in syntax is that
+/// the trait does not need to be referenced by a qualified path, methods accept the `&self`
+/// parameter and the error type can be specified as associated type. If no error type is
+/// specified [`String`] is used as error type.
 ///
-/// Besides implementing the given traits, the [`Core`](sp_api::Core) and [`ApiExt`](sp_api::ApiExt)
-/// are implemented automatically.
+/// Besides implementing the given traits, the [`Core`](sp_api::Core) and
+/// [`ApiExt`](sp_api::ApiExt) are implemented automatically.
 ///
 /// # Example
 ///
@@ -329,14 +332,15 @@ pub use sp_api_proc_macro::impl_runtime_apis;
 ///
 /// # `advanced` attribute
 ///
-/// This attribute can be placed above individual function in the mock implementation to request
-/// more control over the function declaration. From the client side each runtime api function is
-/// called with the `at` parameter that is a [`BlockId`](sp_api::BlockId). When using the `advanced`
-/// attribute, the macro expects that the first parameter of the function is this `at` parameter.
-/// Besides that the macro also doesn't do the automatic return value rewrite, which means that full
-/// return value must be specified. The full return value is constructed like
-/// [`Result`]`<`[`NativeOrEncoded`](sp_api::NativeOrEncoded)`<ReturnValue>, Error>` while
-/// `ReturnValue` being the return value that is specified in the trait declaration.
+/// This attribute can be placed above individual function in the mock implementation to
+/// request more control over the function declaration. From the client side each runtime api
+/// function is called with the `at` parameter that is a [`BlockId`](sp_api::BlockId). When
+/// using the `advanced` attribute, the macro expects that the first parameter of the function
+/// is this `at` parameter. Besides that the macro also doesn't do the automatic return value
+/// rewrite, which means that full return value must be specified. The full return value is
+/// constructed like [`Result`]`<`[`NativeOrEncoded`](sp_api::NativeOrEncoded)`<ReturnValue>,
+/// Error>` while `ReturnValue` being the return value that is specified in the trait
+/// declaration.
 ///
 /// ## Example
 /// ```rust
diff --git a/primitives/arithmetic/fuzzer/src/multiply_by_rational.rs b/primitives/arithmetic/fuzzer/src/multiply_by_rational.rs
index d829a93ad4bb..3089d4b09218 100644
--- a/primitives/arithmetic/fuzzer/src/multiply_by_rational.rs
+++ b/primitives/arithmetic/fuzzer/src/multiply_by_rational.rs
@@ -16,8 +16,8 @@
 // limitations under the License.
 
 //! # Running
-//! Running this fuzzer can be done with `cargo hfuzz run multiply_by_rational`. `honggfuzz` CLI options can
-//! be used by setting `HFUZZ_RUN_ARGS`, such as `-n 4` to use 4 threads.
+//! Running this fuzzer can be done with `cargo hfuzz run multiply_by_rational`. `honggfuzz` CLI
+//! options can be used by setting `HFUZZ_RUN_ARGS`, such as `-n 4` to use 4 threads.
 //!
 //! # Debugging a panic
 //! Once a panic is found, it can be debugged with
diff --git a/primitives/arithmetic/fuzzer/src/per_thing_rational.rs b/primitives/arithmetic/fuzzer/src/per_thing_rational.rs
index c7f6a14c5f79..7b90faa94069 100644
--- a/primitives/arithmetic/fuzzer/src/per_thing_rational.rs
+++ b/primitives/arithmetic/fuzzer/src/per_thing_rational.rs
@@ -16,8 +16,8 @@
 // limitations under the License.
 
 //! # Running
-//! Running this fuzzer can be done with `cargo hfuzz run per_thing_rational`. `honggfuzz` CLI options can
-//! be used by setting `HFUZZ_RUN_ARGS`, such as `-n 4` to use 4 threads.
+//! Running this fuzzer can be done with `cargo hfuzz run per_thing_rational`. `honggfuzz` CLI
+//! options can be used by setting `HFUZZ_RUN_ARGS`, such as `-n 4` to use 4 threads.
 //!
 //! # Debugging a panic
 //! Once a panic is found, it can be debugged with
diff --git a/primitives/arithmetic/src/helpers_128bit.rs b/primitives/arithmetic/src/helpers_128bit.rs
index 8784136c804a..bbf69ea359fe 100644
--- a/primitives/arithmetic/src/helpers_128bit.rs
+++ b/primitives/arithmetic/src/helpers_128bit.rs
@@ -62,8 +62,8 @@ pub fn to_big_uint(x: u128) -> biguint::BigUint {
 
 /// Safely and accurately compute `a * b / c`. The approach is:
 ///   - Simply try `a * b / c`.
-///   - Else, convert them both into big numbers and re-try. `Err` is returned if the result
-///     cannot be safely casted back to u128.
+///   - Else, convert them both into big numbers and re-try. `Err` is returned if the result cannot
+///     be safely casted back to u128.
 ///
 /// Invariant: c must be greater than or equal to 1.
 pub fn multiply_by_rational(mut a: u128, mut b: u128, mut c: u128) -> Result<u128, &'static str> {
diff --git a/primitives/blockchain/src/backend.rs b/primitives/blockchain/src/backend.rs
index fb0ef5b4d7a7..bb34a0449b5f 100644
--- a/primitives/blockchain/src/backend.rs
+++ b/primitives/blockchain/src/backend.rs
@@ -69,14 +69,16 @@ pub trait HeaderBackend<Block: BlockT>: Send + Sync {
 			.ok_or_else(|| Error::UnknownBlock(format!("Expect header: {}", id)))
 	}
 
-	/// Convert an arbitrary block ID into a block number. Returns `UnknownBlock` error if block is not found.
+	/// Convert an arbitrary block ID into a block number. Returns `UnknownBlock` error if block is
+	/// not found.
 	fn expect_block_number_from_id(&self, id: &BlockId<Block>) -> Result<NumberFor<Block>> {
 		self.block_number_from_id(id).and_then(|n| {
 			n.ok_or_else(|| Error::UnknownBlock(format!("Expect block number from id: {}", id)))
 		})
 	}
 
-	/// Convert an arbitrary block ID into a block hash. Returns `UnknownBlock` error if block is not found.
+	/// Convert an arbitrary block ID into a block hash. Returns `UnknownBlock` error if block is
+	/// not found.
 	fn expect_block_hash_from_id(&self, id: &BlockId<Block>) -> Result<Block::Hash> {
 		self.block_hash_from_id(id).and_then(|n| {
 			n.ok_or_else(|| Error::UnknownBlock(format!("Expect block hash from id: {}", id)))
diff --git a/primitives/consensus/common/src/block_validation.rs b/primitives/consensus/common/src/block_validation.rs
index 9a9f21394f9a..54a70a402b06 100644
--- a/primitives/consensus/common/src/block_validation.rs
+++ b/primitives/consensus/common/src/block_validation.rs
@@ -60,9 +60,9 @@ pub trait BlockAnnounceValidator<B: Block> {
 	/// Returning [`Validation::Failure`] will lead to a decrease of the
 	/// peers reputation as it sent us invalid data.
 	///
-	/// The returned future should only resolve to an error iff there was an internal error validating
-	/// the block announcement. If the block announcement itself is invalid, this should *always*
-	/// return [`Validation::Failure`].
+	/// The returned future should only resolve to an error iff there was an internal error
+	/// validating the block announcement. If the block announcement itself is invalid, this should
+	/// *always* return [`Validation::Failure`].
 	fn validate(
 		&mut self,
 		header: &B::Header,
diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index a9f41956841a..5346ea66fe8a 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -255,8 +255,8 @@ pub trait Ss58Codec: Sized + AsMut<[u8]> + AsRef<[u8]> + Default {
 		let (prefix_len, ident) = match data[0] {
 			0..=63 => (1, data[0] as u16),
 			64..=127 => {
-				// weird bit manipulation owing to the combination of LE encoding and missing two bits
-				// from the left.
+				// weird bit manipulation owing to the combination of LE encoding and missing two
+				// bits from the left.
 				// d[0] d[1] are: 01aaaaaa bbcccccc
 				// they make the LE-encoded 16-bit value: aaaaaabb 00cccccc
 				// so the lower byte is formed of aaaaaabb and the higher byte is 00cccccc
@@ -1029,9 +1029,9 @@ pub trait Pair: CryptoType + Sized + Clone + Send + Sync + 'static {
 	/// Get the public key.
 	fn public(&self) -> Self::Public;
 
-	/// Interprets the string `s` in order to generate a key Pair. Returns both the pair and an optional seed, in the
-	/// case that the pair can be expressed as a direct derivation from a seed (some cases, such as Sr25519 derivations
-	/// with path components, cannot).
+	/// Interprets the string `s` in order to generate a key Pair. Returns both the pair and an
+	/// optional seed, in the case that the pair can be expressed as a direct derivation from a seed
+	/// (some cases, such as Sr25519 derivations with path components, cannot).
 	///
 	/// This takes a helper function to do the key generation from a phrase, password and
 	/// junction iterator.
@@ -1043,7 +1043,8 @@ pub trait Pair: CryptoType + Sized + Clone + Send + Sync + 'static {
 	///   - the phrase may be followed by one or more items delimited by `/` characters.
 	///   - the path may be followed by `///`, in which case everything after the `///` is treated
 	/// as a password.
-	/// - If `s` begins with a `/` character it is prefixed with the Substrate public `DEV_PHRASE` and
+	/// - If `s` begins with a `/` character it is prefixed with the Substrate public `DEV_PHRASE`
+	///   and
 	/// interpreted as above.
 	///
 	/// In this case they are interpreted as HDKD junctions; purely numeric items are interpreted as
@@ -1053,8 +1054,8 @@ pub trait Pair: CryptoType + Sized + Clone + Send + Sync + 'static {
 	/// There is no correspondence mapping between SURI strings and the keys they represent.
 	/// Two different non-identical strings can actually lead to the same secret being derived.
 	/// Notably, integer junction indices may be legally prefixed with arbitrary number of zeros.
-	/// Similarly an empty password (ending the SURI with `///`) is perfectly valid and will generally
-	/// be equivalent to no password at all.
+	/// Similarly an empty password (ending the SURI with `///`) is perfectly valid and will
+	/// generally be equivalent to no password at all.
 	///
 	/// `None` is returned if no matches are found.
 	#[cfg(feature = "std")]
diff --git a/primitives/core/src/lib.rs b/primitives/core/src/lib.rs
index 83a7518358a9..0a61c90d7135 100644
--- a/primitives/core/src/lib.rs
+++ b/primitives/core/src/lib.rs
@@ -118,7 +118,8 @@ impl ExecutionContext {
 
 		match self {
 			Importing | Syncing | BlockConstruction => offchain::Capabilities::none(),
-			// Enable keystore, transaction pool and Offchain DB reads by default for offchain calls.
+			// Enable keystore, transaction pool and Offchain DB reads by default for offchain
+			// calls.
 			OffchainCall(None) => [
 				offchain::Capability::Keystore,
 				offchain::Capability::OffchainDbRead,
diff --git a/primitives/core/src/offchain/mod.rs b/primitives/core/src/offchain/mod.rs
index d4e27fc64348..59c92f540bad 100644
--- a/primitives/core/src/offchain/mod.rs
+++ b/primitives/core/src/offchain/mod.rs
@@ -344,8 +344,8 @@ pub trait Externalities: Send {
 
 	/// Initiates a http request given HTTP verb and the URL.
 	///
-	/// Meta is a future-reserved field containing additional, parity-scale-codec encoded parameters.
-	/// Returns the id of newly started request.
+	/// Meta is a future-reserved field containing additional, parity-scale-codec encoded
+	/// parameters. Returns the id of newly started request.
 	///
 	/// Returns an error if:
 	/// - No new request identifier could be allocated.
@@ -388,8 +388,8 @@ pub trait Externalities: Send {
 	/// - The request identifier is invalid.
 	/// - `http_response_wait` has already been called on this request.
 	/// - The deadline is reached.
-	/// - An I/O error has happened, for example the remote has closed our
-	///   request. The request is then considered invalid.
+	/// - An I/O error has happened, for example the remote has closed our request. The request is
+	///   then considered invalid.
 	fn http_request_write_body(
 		&mut self,
 		request_id: HttpRequestId,
@@ -440,8 +440,8 @@ pub trait Externalities: Send {
 	/// Returns an error if:
 	/// - The request identifier is invalid.
 	/// - The deadline is reached.
-	/// - An I/O error has happened, for example the remote has closed our
-	///   request. The request is then considered invalid.
+	/// - An I/O error has happened, for example the remote has closed our request. The request is
+	///   then considered invalid.
 	fn http_response_read_body(
 		&mut self,
 		request_id: HttpRequestId,
diff --git a/primitives/core/src/offchain/testing.rs b/primitives/core/src/offchain/testing.rs
index 30150918313f..5a9996af9aaf 100644
--- a/primitives/core/src/offchain/testing.rs
+++ b/primitives/core/src/offchain/testing.rs
@@ -168,8 +168,8 @@ impl OffchainState {
 	/// Add expected HTTP request.
 	///
 	/// This method can be used to initialize expected HTTP requests and their responses
-	/// before running the actual code that utilizes them (for instance before calling into runtime).
-	/// Expected request has to be fulfilled before this struct is dropped,
+	/// before running the actual code that utilizes them (for instance before calling into
+	/// runtime). Expected request has to be fulfilled before this struct is dropped,
 	/// the `response` and `response_headers` fields will be used to return results to the callers.
 	/// Requests are expected to be performed in the insertion order.
 	pub fn expect_request(&mut self, expected: PendingRequest) {
diff --git a/primitives/core/src/sr25519.rs b/primitives/core/src/sr25519.rs
index 7e98bee96d83..4c5122162d65 100644
--- a/primitives/core/src/sr25519.rs
+++ b/primitives/core/src/sr25519.rs
@@ -870,7 +870,8 @@ mod test {
 
 	#[test]
 	fn verify_from_old_wasm_works() {
-		// The values in this test case are compared to the output of `node-test.js` in schnorrkel-js.
+		// The values in this test case are compared to the output of `node-test.js` in
+		// schnorrkel-js.
 		//
 		// This is to make sure that the wasm library is compatible.
 		let pk = Pair::from_seed(&hex!(
diff --git a/primitives/core/src/traits.rs b/primitives/core/src/traits.rs
index dfa61f606cb9..47639f9d87ba 100644
--- a/primitives/core/src/traits.rs
+++ b/primitives/core/src/traits.rs
@@ -126,13 +126,13 @@ pub trait ReadRuntimeVersion: Send + Sync {
 	/// The version information may be embedded into the wasm binary itself. If it is not present,
 	/// then this function may fallback to the legacy way of reading the version.
 	///
-	/// The legacy mechanism involves instantiating the passed wasm runtime and calling `Core_version`
-	/// on it. This is a very expensive operation.
+	/// The legacy mechanism involves instantiating the passed wasm runtime and calling
+	/// `Core_version` on it. This is a very expensive operation.
 	///
 	/// `ext` is only needed in case the calling into runtime happens. Otherwise it is ignored.
 	///
-	/// Compressed wasm blobs are supported and will be decompressed if needed. If uncompression fails,
-	/// the error is returned.
+	/// Compressed wasm blobs are supported and will be decompressed if needed. If uncompression
+	/// fails, the error is returned.
 	///
 	/// # Errors
 	///
diff --git a/primitives/externalities/src/extensions.rs b/primitives/externalities/src/extensions.rs
index 55b69fde0890..37086a707b64 100644
--- a/primitives/externalities/src/extensions.rs
+++ b/primitives/externalities/src/extensions.rs
@@ -30,7 +30,8 @@ use sp_std::{
 	ops::DerefMut,
 };
 
-/// Marker trait for types that should be registered as [`Externalities`](crate::Externalities) extension.
+/// Marker trait for types that should be registered as [`Externalities`](crate::Externalities)
+/// extension.
 ///
 /// As extensions are stored as `Box<Any>`, this trait should give more confidence that the correct
 /// type is registered and requested.
@@ -95,7 +96,8 @@ macro_rules! decl_extension {
 ///
 /// This is a super trait of the [`Externalities`](crate::Externalities).
 pub trait ExtensionStore {
-	/// Tries to find a registered extension by the given `type_id` and returns it as a `&mut dyn Any`.
+	/// Tries to find a registered extension by the given `type_id` and returns it as a `&mut dyn
+	/// Any`.
 	///
 	/// It is advised to use [`ExternalitiesExt::extension`](crate::ExternalitiesExt::extension)
 	/// instead of this function to get type system support and automatic type downcasting.
diff --git a/primitives/externalities/src/lib.rs b/primitives/externalities/src/lib.rs
index b0ec16213b2c..e6a8f8caa8d3 100644
--- a/primitives/externalities/src/lib.rs
+++ b/primitives/externalities/src/lib.rs
@@ -94,7 +94,8 @@ pub trait Externalities: ExtensionStore {
 		self.place_storage(key.to_vec(), None);
 	}
 
-	/// Clear a child storage entry (`key`) of current contract being called (effective immediately).
+	/// Clear a child storage entry (`key`) of current contract being called (effective
+	/// immediately).
 	fn clear_child_storage(&mut self, child_info: &ChildInfo, key: &[u8]) {
 		self.place_child_storage(child_info, key.to_vec(), None)
 	}
@@ -144,7 +145,8 @@ pub trait Externalities: ExtensionStore {
 		limit: Option<u32>,
 	) -> (bool, u32);
 
-	/// Set or clear a storage entry (`key`) of current contract being called (effective immediately).
+	/// Set or clear a storage entry (`key`) of current contract being called (effective
+	/// immediately).
 	fn place_storage(&mut self, key: Vec<u8>, value: Option<Vec<u8>>);
 
 	/// Set or clear a child storage entry.
@@ -167,7 +169,8 @@ pub trait Externalities: ExtensionStore {
 
 	/// Append storage item.
 	///
-	/// This assumes specific format of the storage item. Also there is no way to undo this operation.
+	/// This assumes specific format of the storage item. Also there is no way to undo this
+	/// operation.
 	fn storage_append(&mut self, key: Vec<u8>, value: Vec<u8>);
 
 	/// Get the changes trie root of the current storage overlay at a block with given `parent`.
diff --git a/primitives/externalities/src/scope_limited.rs b/primitives/externalities/src/scope_limited.rs
index ab8be1f3fc81..15a670a9abee 100644
--- a/primitives/externalities/src/scope_limited.rs
+++ b/primitives/externalities/src/scope_limited.rs
@@ -21,9 +21,9 @@ use crate::Externalities;
 
 environmental::environmental!(ext: trait Externalities);
 
-/// Set the given externalities while executing the given closure. To get access to the externalities
-/// while executing the given closure [`with_externalities`] grants access to them. The externalities
-/// are only set for the same thread this function was called from.
+/// Set the given externalities while executing the given closure. To get access to the
+/// externalities while executing the given closure [`with_externalities`] grants access to them.
+/// The externalities are only set for the same thread this function was called from.
 pub fn set_and_run_with_externalities<F, R>(ext: &mut dyn Externalities, f: F) -> R
 where
 	F: FnOnce() -> R,
diff --git a/primitives/inherents/src/lib.rs b/primitives/inherents/src/lib.rs
index a2b533641b5a..90f4e455a42d 100644
--- a/primitives/inherents/src/lib.rs
+++ b/primitives/inherents/src/lib.rs
@@ -21,8 +21,8 @@
 //! runtime implementation to require an inherent for each block or to make it optional. Inherents
 //! are mainly used to pass data from the block producer to the runtime. So, inherents require some
 //! part that is running on the client side and some part that is running on the runtime side. Any
-//! data that is required by an inherent is passed as [`InherentData`] from the client to the runtime
-//! when the inherents are constructed.
+//! data that is required by an inherent is passed as [`InherentData`] from the client to the
+//! runtime when the inherents are constructed.
 //!
 //! The process of constructing and applying inherents is the following:
 //!
diff --git a/primitives/io/src/lib.rs b/primitives/io/src/lib.rs
index 8ecbd1722017..0b5c37af5f66 100644
--- a/primitives/io/src/lib.rs
+++ b/primitives/io/src/lib.rs
@@ -258,8 +258,8 @@ pub trait Storage {
 pub trait DefaultChildStorage {
 	/// Get a default child storage value for a given key.
 	///
-	/// Parameter `storage_key` is the unprefixed location of the root of the child trie in the parent trie.
-	/// Result is `None` if the value for `key` in the child storage can not be found.
+	/// Parameter `storage_key` is the unprefixed location of the root of the child trie in the
+	/// parent trie. Result is `None` if the value for `key` in the child storage can not be found.
 	fn get(&self, storage_key: &[u8], key: &[u8]) -> Option<Vec<u8>> {
 		let child_info = ChildInfo::new_default(storage_key);
 		self.child_storage(&child_info, key).map(|s| s.to_vec())
@@ -435,11 +435,12 @@ pub trait Trie {
 	}
 }
 
-/// Interface that provides miscellaneous functions for communicating between the runtime and the node.
+/// Interface that provides miscellaneous functions for communicating between the runtime and the
+/// node.
 #[runtime_interface]
 pub trait Misc {
-	// NOTE: We use the target 'runtime' for messages produced by general printing functions, instead
-	// of LOG_TARGET.
+	// NOTE: We use the target 'runtime' for messages produced by general printing functions,
+	// instead of LOG_TARGET.
 
 	/// Print a number.
 	fn print_num(val: u64) {
@@ -466,8 +467,8 @@ pub trait Misc {
 	/// # Performance
 	///
 	/// This function may be very expensive to call depending on the wasm binary. It may be
-	/// relatively cheap if the wasm binary contains version information. In that case, uncompression
-	/// of the wasm blob is the dominating factor.
+	/// relatively cheap if the wasm binary contains version information. In that case,
+	/// uncompression of the wasm blob is the dominating factor.
 	///
 	/// If the wasm binary does not have the version information attached, then a legacy mechanism
 	/// may be involved. This means that a runtime call will be performed to query the version.
@@ -986,8 +987,8 @@ pub trait Offchain {
 
 	/// Initiates a http request given HTTP verb and the URL.
 	///
-	/// Meta is a future-reserved field containing additional, parity-scale-codec encoded parameters.
-	/// Returns the id of newly started request.
+	/// Meta is a future-reserved field containing additional, parity-scale-codec encoded
+	/// parameters. Returns the id of newly started request.
 	fn http_request_start(
 		&mut self,
 		method: &str,
@@ -1149,13 +1150,14 @@ where
 #[runtime_interface(wasm_only, no_tracing)]
 pub trait WasmTracing {
 	/// Whether the span described in `WasmMetadata` should be traced wasm-side
-	/// On the host converts into a static Metadata and checks against the global `tracing` dispatcher.
+	/// On the host converts into a static Metadata and checks against the global `tracing`
+	/// dispatcher.
 	///
 	/// When returning false the calling code should skip any tracing-related execution. In general
 	/// within the same block execution this is not expected to change and it doesn't have to be
 	/// checked more than once per metadata. This exists for optimisation purposes but is still not
-	/// cheap as it will jump the wasm-native-barrier every time it is called. So an implementation might
-	/// chose to cache the result for the execution of the entire block.
+	/// cheap as it will jump the wasm-native-barrier every time it is called. So an implementation
+	/// might chose to cache the result for the execution of the entire block.
 	fn enabled(&mut self, metadata: Crossing<sp_tracing::WasmMetadata>) -> bool {
 		let metadata: &tracing_core::metadata::Metadata<'static> = (&metadata.into_inner()).into();
 		tracing::dispatcher::get_default(|d| d.enabled(metadata))
diff --git a/primitives/npos-elections/fuzzer/src/compact.rs b/primitives/npos-elections/fuzzer/src/compact.rs
index b171765e783f..4e78c94b8257 100644
--- a/primitives/npos-elections/fuzzer/src/compact.rs
+++ b/primitives/npos-elections/fuzzer/src/compact.rs
@@ -12,18 +12,20 @@ fn main() {
 		fuzz!(|fuzzer_data: &[u8]| {
 			let result_decoded: Result<InnerTestSolutionCompact, Error> =
 				<InnerTestSolutionCompact as codec::Decode>::decode(&mut &fuzzer_data[..]);
-			// Ignore errors as not every random sequence of bytes can be decoded as InnerTestSolutionCompact
+			// Ignore errors as not every random sequence of bytes can be decoded as
+			// InnerTestSolutionCompact
 			if let Ok(decoded) = result_decoded {
 				// Decoding works, let's re-encode it and compare results.
 				let reencoded: std::vec::Vec<u8> = decoded.encode();
-				// The reencoded value may or may not be equal to the original fuzzer output. However, the
-				// original decoder should be optimal (in the sense that there is no shorter encoding of
-				// the same object). So let's see if the fuzzer can find something shorter:
+				// The reencoded value may or may not be equal to the original fuzzer output.
+				// However, the original decoder should be optimal (in the sense that there is no
+				// shorter encoding of the same object). So let's see if the fuzzer can find
+				// something shorter:
 				if fuzzer_data.len() < reencoded.len() {
 					panic!("fuzzer_data.len() < reencoded.len()");
 				}
-				// The reencoded value should definitely be decodable (if unwrap() fails that is a valid
-				// panic/finding for the fuzzer):
+				// The reencoded value should definitely be decodable (if unwrap() fails that is a
+				// valid panic/finding for the fuzzer):
 				let decoded2: InnerTestSolutionCompact =
 					<InnerTestSolutionCompact as codec::Decode>::decode(&mut reencoded.as_slice())
 						.unwrap();
diff --git a/primitives/npos-elections/fuzzer/src/phragmen_balancing.rs b/primitives/npos-elections/fuzzer/src/phragmen_balancing.rs
index 04ff60683f9c..5da57ccfd9ae 100644
--- a/primitives/npos-elections/fuzzer/src/phragmen_balancing.rs
+++ b/primitives/npos-elections/fuzzer/src/phragmen_balancing.rs
@@ -94,8 +94,8 @@ fn main() {
 					iterations, unbalanced_score, balanced_score, enhance,
 				);
 
-				// The only guarantee of balancing is such that the first and third element of the score
-				// cannot decrease.
+				// The only guarantee of balancing is such that the first and third element of the
+				// score cannot decrease.
 				assert!(
 					balanced_score[0] >= unbalanced_score[0] &&
 						balanced_score[1] == unbalanced_score[1] &&
diff --git a/primitives/npos-elections/fuzzer/src/phragmen_pjr.rs b/primitives/npos-elections/fuzzer/src/phragmen_pjr.rs
index 6efc17f24f93..f1110da8ef8b 100644
--- a/primitives/npos-elections/fuzzer/src/phragmen_pjr.rs
+++ b/primitives/npos-elections/fuzzer/src/phragmen_pjr.rs
@@ -21,17 +21,17 @@
 //! ## Running a single iteration
 //!
 //! Honggfuzz shuts down each individual loop iteration after a configurable time limit.
-//! It can be helpful to run a single iteration on your hardware to help benchmark how long that time
-//! limit should reasonably be. Simply run the program without the `fuzzing` configuration to run a
-//! single iteration: `cargo run --bin phragmen_pjr`.
+//! It can be helpful to run a single iteration on your hardware to help benchmark how long that
+//! time limit should reasonably be. Simply run the program without the `fuzzing` configuration to
+//! run a single iteration: `cargo run --bin phragmen_pjr`.
 //!
 //! ## Running
 //!
 //! Run with `HFUZZ_RUN_ARGS="-t 10" cargo hfuzz run phragmen_pjr`.
 //!
-//! Note the environment variable: by default, `cargo hfuzz` shuts down each iteration after 1 second
-//! of runtime. We significantly increase that to ensure that the fuzzing gets a chance to complete.
-//! Running a single iteration can help determine an appropriate value for this parameter.
+//! Note the environment variable: by default, `cargo hfuzz` shuts down each iteration after 1
+//! second of runtime. We significantly increase that to ensure that the fuzzing gets a chance to
+//! complete. Running a single iteration can help determine an appropriate value for this parameter.
 //!
 //! ## Debugging a panic
 //!
diff --git a/primitives/npos-elections/src/mock.rs b/primitives/npos-elections/src/mock.rs
index 1be591e4ea6f..8de0c09959d1 100644
--- a/primitives/npos-elections/src/mock.rs
+++ b/primitives/npos-elections/src/mock.rs
@@ -406,7 +406,8 @@ pub(crate) fn build_support_map_float(
 	supports
 }
 
-/// Generate voter and assignment lists. Makes no attempt to be realistic about winner or assignment fairness.
+/// Generate voter and assignment lists. Makes no attempt to be realistic about winner or assignment
+/// fairness.
 ///
 /// Maintains these invariants:
 ///
diff --git a/primitives/npos-elections/src/phragmms.rs b/primitives/npos-elections/src/phragmms.rs
index 95551d9761fc..4e7316d5778b 100644
--- a/primitives/npos-elections/src/phragmms.rs
+++ b/primitives/npos-elections/src/phragmms.rs
@@ -237,7 +237,8 @@ mod tests {
 	#[test]
 	fn basic_election_manual_works() {
 		//! Manually run the internal steps of phragmms. In each round we select a new winner by
-		//! `max_score`, then apply this change by `apply_elected`, and finally do a `balance` round.
+		//! `max_score`, then apply this change by `apply_elected`, and finally do a `balance`
+		//! round.
 		let candidates = vec![1, 2, 3];
 		let voters = vec![(10, 10, vec![1, 2]), (20, 20, vec![1, 3]), (30, 30, vec![2, 3])];
 
diff --git a/primitives/npos-elections/src/pjr.rs b/primitives/npos-elections/src/pjr.rs
index 3cc99b33aa57..e27acf1408f9 100644
--- a/primitives/npos-elections/src/pjr.rs
+++ b/primitives/npos-elections/src/pjr.rs
@@ -35,9 +35,9 @@ type Threshold = ExtendedBalance;
 
 /// Compute the threshold corresponding to the standard PJR property
 ///
-/// `t-PJR` checks can check PJR according to an arbitrary threshold. The threshold can be any value,
-/// but the property gets stronger as the threshold gets smaller. The strongest possible `t-PJR` property
-/// corresponds to `t == 0`.
+/// `t-PJR` checks can check PJR according to an arbitrary threshold. The threshold can be any
+/// value, but the property gets stronger as the threshold gets smaller. The strongest possible
+/// `t-PJR` property corresponds to `t == 0`.
 ///
 /// However, standard PJR is less stringent than that. This function returns the threshold whose
 /// strength corresponds to the standard PJR property.
@@ -74,13 +74,13 @@ pub fn pjr_check<AccountId: IdentifierT>(
 ///
 /// ### Semantics
 ///
-/// The t-PJR property is defined in the paper ["Validator Election in Nominated Proof-of-Stake"][NPoS],
-/// section 5, definition 1.
+/// The t-PJR property is defined in the paper ["Validator Election in Nominated
+/// Proof-of-Stake"][NPoS], section 5, definition 1.
 ///
 /// In plain language, the t-PJR condition is: if there is a group of `N` voters
 /// who have `r` common candidates and can afford to support each of them with backing stake `t`
-/// (i.e `sum(stake(v) for v in voters) == r * t`), then this committee needs to be represented by at
-/// least `r` elected candidates.
+/// (i.e `sum(stake(v) for v in voters) == r * t`), then this committee needs to be represented by
+/// at least `r` elected candidates.
 ///
 /// Section 5 of the NPoS paper shows that this property can be tested by: for a feasible solution,
 /// if `Max {score(c)} < t` where c is every unelected candidate, then this solution is t-PJR. There
@@ -120,8 +120,8 @@ pub fn t_pjr_check<AccountId: IdentifierT>(
 ///
 /// [`pjr_check`] or [`t_pjr_check`] are typically easier to work with.
 ///
-/// This function returns an `AccountId` in the `Err` case. This is the counter_example: the ID of the
-/// unelected candidate with the highest prescore, such that `pre_score(counter_example) >= t`.
+/// This function returns an `AccountId` in the `Err` case. This is the counter_example: the ID of
+/// the unelected candidate with the highest prescore, such that `pre_score(counter_example) >= t`.
 pub fn pjr_check_core<AccountId: IdentifierT>(
 	candidates: &[CandidatePtr<AccountId>],
 	voters: &[Voter<AccountId>],
@@ -141,8 +141,8 @@ pub fn pjr_check_core<AccountId: IdentifierT>(
 /// Validate a challenge to an election result.
 ///
 /// A challenge to an election result is valid if there exists some counter_example for which
-/// `pre_score(counter_example) >= threshold`. Validating an existing counter_example is computationally
-/// cheaper than re-running the PJR check.
+/// `pre_score(counter_example) >= threshold`. Validating an existing counter_example is
+/// computationally cheaper than re-running the PJR check.
 ///
 /// This function uses the standard threshold.
 ///
@@ -164,8 +164,8 @@ pub fn validate_pjr_challenge<AccountId: IdentifierT>(
 /// Validate a challenge to an election result.
 ///
 /// A challenge to an election result is valid if there exists some counter_example for which
-/// `pre_score(counter_example) >= threshold`. Validating an existing counter_example is computationally
-/// cheaper than re-running the PJR check.
+/// `pre_score(counter_example) >= threshold`. Validating an existing counter_example is
+/// computationally cheaper than re-running the PJR check.
 ///
 /// This function uses a supplied threshold.
 ///
@@ -185,8 +185,8 @@ pub fn validate_t_pjr_challenge<AccountId: IdentifierT>(
 /// Validate a challenge to an election result.
 ///
 /// A challenge to an election result is valid if there exists some counter_example for which
-/// `pre_score(counter_example) >= threshold`. Validating an existing counter_example is computationally
-/// cheaper than re-running the PJR check.
+/// `pre_score(counter_example) >= threshold`. Validating an existing counter_example is
+/// computationally cheaper than re-running the PJR check.
 ///
 /// Returns `true` if the challenge is valid: the proposed solution does not satisfy PJR.
 /// Returns `false` if the challenge is invalid: the proposed solution does in fact satisfy PJR.
@@ -222,8 +222,8 @@ fn validate_pjr_challenge_core<AccountId: IdentifierT>(
 ///
 /// The ultimate goal, in any case, is to convert the election data into [`Candidate`] and [`Voter`]
 /// types defined by this crate, whilst setting correct value for some of their fields, namely:
-/// 1. Candidate [`backing_stake`](Candidate::backing_stake) and [`elected`](Candidate::elected) if they are a winner.
-/// 2. Voter edge [`weight`](Edge::weight) if they are backing a winner.
+/// 1. Candidate [`backing_stake`](Candidate::backing_stake) and [`elected`](Candidate::elected) if
+/// they are a winner. 2. Voter edge [`weight`](Edge::weight) if they are backing a winner.
 /// 3. Voter [`budget`](Voter::budget).
 ///
 /// None of the `load` or `score` values are used and can be ignored. This is similar to
@@ -487,9 +487,9 @@ mod tests {
 		assert_core_failure(&candidates, &voters, 20);
 	}
 
-	// These next tests ensure that the threshold phase change property holds for us, but that's not their real purpose.
-	// They were written to help develop an intuition about what the threshold value actually means
-	// in layman's terms.
+	// These next tests ensure that the threshold phase change property holds for us, but that's not
+	// their real purpose. They were written to help develop an intuition about what the threshold
+	// value actually means in layman's terms.
 	//
 	// The results tend to support the intuition that the threshold is the voting power at and below
 	// which a voter's preferences can simply be ignored.
diff --git a/primitives/npos-elections/src/reduce.rs b/primitives/npos-elections/src/reduce.rs
index 4290743832a5..8b90796af85c 100644
--- a/primitives/npos-elections/src/reduce.rs
+++ b/primitives/npos-elections/src/reduce.rs
@@ -506,8 +506,8 @@ fn reduce_all<A: IdentifierT>(assignments: &mut Vec<StakedAssignment<A>>) -> u32
 										};
 
 										if next_value.is_zero() {
-											// if the removed edge is from the current assignment, dis_index
-											// should NOT be increased.
+											// if the removed edge is from the current assignment,
+											// index should NOT be increased.
 											if target_ass_index == assignment_index {
 												should_inc_counter = false
 											}
@@ -551,8 +551,8 @@ fn reduce_all<A: IdentifierT>(assignments: &mut Vec<StakedAssignment<A>>) -> u32
 										};
 
 										if next_value.is_zero() {
-											// if the removed edge is from the current assignment, dis_index
-											// should NOT be increased.
+											// if the removed edge is from the current assignment,
+											// index should NOT be increased.
 											if target_ass_index == assignment_index {
 												should_inc_counter = false
 											}
diff --git a/primitives/panic-handler/src/lib.rs b/primitives/panic-handler/src/lib.rs
index 1c72f224071c..75b057cebf3e 100644
--- a/primitives/panic-handler/src/lib.rs
+++ b/primitives/panic-handler/src/lib.rs
@@ -112,7 +112,8 @@ impl AbortGuard {
 	}
 
 	/// Create a new guard. While the guard is alive, panics that happen in the current thread will
-	/// **never** abort the process (even if `AbortGuard::force_abort()` guard will be created afterwards).
+	/// **never** abort the process (even if `AbortGuard::force_abort()` guard will be created
+	/// afterwards).
 	pub fn never_abort() -> AbortGuard {
 		AbortGuard { previous_val: set_abort(OnPanic::NeverAbort), _not_send: PhantomData }
 	}
diff --git a/primitives/runtime-interface/proc-macro/src/lib.rs b/primitives/runtime-interface/proc-macro/src/lib.rs
index 502130f1b410..6b0669a298e1 100644
--- a/primitives/runtime-interface/proc-macro/src/lib.rs
+++ b/primitives/runtime-interface/proc-macro/src/lib.rs
@@ -22,9 +22,10 @@
 //!
 //! 1. The [`#[runtime_interface]`](attr.runtime_interface.html) attribute macro for generating the
 //!    runtime interfaces.
-//! 2. The [`PassByCodec`](derive.PassByCodec.html) derive macro for implementing `PassBy` with `Codec`.
-//! 3. The [`PassByEnum`](derive.PassByInner.html) derive macro for implementing `PassBy` with `Enum`.
-//! 4. The [`PassByInner`](derive.PassByInner.html) derive macro for implementing `PassBy` with `Inner`.
+//! 2. The [`PassByCodec`](derive.PassByCodec.html) derive macro for implementing `PassBy` with
+//! `Codec`. 3. The [`PassByEnum`](derive.PassByInner.html) derive macro for implementing `PassBy`
+//! with `Enum`. 4. The [`PassByInner`](derive.PassByInner.html) derive macro for implementing
+//! `PassBy` with `Inner`.
 
 use syn::{
 	parse::{Parse, ParseStream},
diff --git a/primitives/runtime-interface/proc-macro/src/runtime_interface/host_function_interface.rs b/primitives/runtime-interface/proc-macro/src/runtime_interface/host_function_interface.rs
index ab84c04e3a72..75498c09c18c 100644
--- a/primitives/runtime-interface/proc-macro/src/runtime_interface/host_function_interface.rs
+++ b/primitives/runtime-interface/proc-macro/src/runtime_interface/host_function_interface.rs
@@ -184,8 +184,8 @@ fn generate_host_functions_struct(
 	})
 }
 
-/// Generates the host function struct that implements `wasm_interface::Function` and returns a static
-/// reference to this struct.
+/// Generates the host function struct that implements `wasm_interface::Function` and returns a
+/// static reference to this struct.
 ///
 /// When calling from wasm into the host, we will call the `execute` function that calls the native
 /// implementation of the function.
diff --git a/primitives/runtime-interface/src/lib.rs b/primitives/runtime-interface/src/lib.rs
index 53b4270fe8a6..27c4422ed900 100644
--- a/primitives/runtime-interface/src/lib.rs
+++ b/primitives/runtime-interface/src/lib.rs
@@ -26,11 +26,12 @@
 //! # Using a type in a runtime interface
 //!
 //! Any type that should be used in a runtime interface as argument or return value needs to
-//! implement [`RIType`]. The associated type [`FFIType`](./trait.RIType.html#associatedtype.FFIType)
-//! is the type that is used in the FFI function to represent the actual type. For example `[T]` is
-//! represented by an `u64`. The slice pointer and the length will be mapped to an `u64` value.
-//! For more information see this [table](#ffi-type-and-conversion).
-//! The FFI function definition is used when calling from the wasm runtime into the node.
+//! implement [`RIType`]. The associated type
+//! [`FFIType`](./trait.RIType.html#associatedtype.FFIType) is the type that is used in the FFI
+//! function to represent the actual type. For example `[T]` is represented by an `u64`. The slice
+//! pointer and the length will be mapped to an `u64` value. For more information see this
+//! [table](#ffi-type-and-conversion). The FFI function definition is used when calling from the
+//! wasm runtime into the node.
 //!
 //! Traits are used to convert from a type to the corresponding
 //! [`RIType::FFIType`](./trait.RIType.html#associatedtype.FFIType).
@@ -93,13 +94,14 @@
 //! | `&str` | `u64` | <code>v.len() 32bit << 32 &#124; v.as_ptr() 32bit</code> |
 //! | `&[u8]` | `u64` | <code>v.len() 32bit << 32 &#124; v.as_ptr() 32bit</code> |
 //! | `Vec<u8>` | `u64` | <code>v.len() 32bit << 32 &#124; v.as_ptr() 32bit</code> |
-//! | `Vec<T> where T: Encode` | `u64` | `let e = v.encode();`<br><br><code>e.len() 32bit << 32 &#124; e.as_ptr() 32bit</code> |
-//! | `&[T] where T: Encode` | `u64` | `let e = v.encode();`<br><br><code>e.len() 32bit << 32 &#124; e.as_ptr() 32bit</code> |
-//! | `[u8; N]` | `u32` | `v.as_ptr()` |
-//! | `*const T` | `u32` | `Identity` |
-//! | `Option<T>` | `u64` | `let e = v.encode();`<br><br><code>e.len() 32bit << 32 &#124; e.as_ptr() 32bit</code> |
-//! | [`T where T: PassBy<PassBy=Inner>`](./pass_by#Inner) | Depends on inner | Depends on inner |
-//! | [`T where T: PassBy<PassBy=Codec>`](./pass_by#Codec)|`u64`|<code>v.len() 32bit << 32 &#124;v.as_ptr() 32bit</code>|
+//! | `Vec<T> where T: Encode` | `u64` | `let e = v.encode();`<br><br><code>e.len() 32bit << 32
+//! &#124; e.as_ptr() 32bit</code> | | `&[T] where T: Encode` | `u64` | `let e =
+//! v.encode();`<br><br><code>e.len() 32bit << 32 &#124; e.as_ptr() 32bit</code> | | `[u8; N]` |
+//! `u32` | `v.as_ptr()` | | `*const T` | `u32` | `Identity` |
+//! | `Option<T>` | `u64` | `let e = v.encode();`<br><br><code>e.len() 32bit << 32 &#124; e.as_ptr()
+//! 32bit</code> | | [`T where T: PassBy<PassBy=Inner>`](./pass_by#Inner) | Depends on inner |
+//! Depends on inner | | [`T where T: PassBy<PassBy=Codec>`](./pass_by#Codec)|`u64`|<code>v.len()
+//! 32bit << 32 &#124;v.as_ptr() 32bit</code>|
 //!
 //! `Identity` means that the value is converted directly into the corresponding FFI type.
 
@@ -119,10 +121,10 @@ pub use sp_std;
 
 /// Attribute macro for transforming a trait declaration into a runtime interface.
 ///
-/// A runtime interface is a fixed interface between a Substrate compatible runtime and the native
-/// node. This interface is callable from a native and a wasm runtime. The macro will generate the
-/// corresponding code for the native implementation and the code for calling from the wasm
-/// side to the native implementation.
+/// A runtime interface is a fixed interface between a Substrate compatible runtime and the
+/// native node. This interface is callable from a native and a wasm runtime. The macro will
+/// generate the corresponding code for the native implementation and the code for calling from
+/// the wasm side to the native implementation.
 ///
 /// The macro expects the runtime interface declaration as trait declaration:
 ///
@@ -273,25 +275,25 @@ pub use sp_std;
 /// The macro supports any kind of argument type, as long as it implements [`RIType`] and the
 /// required `FromFFIValue`/`IntoFFIValue`. The macro will convert each
 /// argument to the corresponding FFI representation and will call into the host using this FFI
-/// representation. On the host each argument is converted back to the native representation and
-/// the native implementation is called. Any return value is handled in the same way.
+/// representation. On the host each argument is converted back to the native representation
+/// and the native implementation is called. Any return value is handled in the same way.
 ///
 /// # Wasm only interfaces
 ///
-/// Some interfaces are only required from within the wasm runtime e.g. the allocator interface.
-/// To support this, the macro can be called like `#[runtime_interface(wasm_only)]`. This instructs
-/// the macro to make two significant changes to the generated code:
+/// Some interfaces are only required from within the wasm runtime e.g. the allocator
+/// interface. To support this, the macro can be called like `#[runtime_interface(wasm_only)]`.
+/// This instructs the macro to make two significant changes to the generated code:
 ///
 /// 1. The generated functions are not callable from the native side.
-/// 2. The trait as shown above is not implemented for `Externalities` and is instead implemented
-///    for `FunctionExecutor` (from `sp-wasm-interface`).
+/// 2. The trait as shown above is not implemented for `Externalities` and is instead
+/// implemented    for `FunctionExecutor` (from `sp-wasm-interface`).
 ///
 /// # Disable tracing
 /// By addding `no_tracing` to the list of options you can prevent the wasm-side interface from
-/// generating the default `sp-tracing`-calls. Note that this is rarely needed but only meant for
-/// the case when that would create a circular dependency. You usually _do not_ want to add this
-/// flag, as tracing doesn't cost you anything by default anyways (it is added as a no-op) but is
-/// super useful for debugging later.
+/// generating the default `sp-tracing`-calls. Note that this is rarely needed but only meant
+/// for the case when that would create a circular dependency. You usually _do not_ want to add
+/// this flag, as tracing doesn't cost you anything by default anyways (it is added as a no-op)
+/// but is super useful for debugging later.
 pub use sp_runtime_interface_proc_macro::runtime_interface;
 
 #[doc(hidden)]
diff --git a/primitives/runtime-interface/src/pass_by.rs b/primitives/runtime-interface/src/pass_by.rs
index 0535d1ca8d7f..7324e9363804 100644
--- a/primitives/runtime-interface/src/pass_by.rs
+++ b/primitives/runtime-interface/src/pass_by.rs
@@ -40,8 +40,8 @@ use sp_std::vec::Vec;
 
 /// Derive macro for implementing [`PassBy`] with the [`Codec`] strategy.
 ///
-/// This requires that the type implements [`Encode`](codec::Encode) and [`Decode`](codec::Decode)
-/// from `parity-scale-codec`.
+/// This requires that the type implements [`Encode`](codec::Encode) and
+/// [`Decode`](codec::Decode) from `parity-scale-codec`.
 ///
 /// # Example
 ///
@@ -58,11 +58,12 @@ pub use sp_runtime_interface_proc_macro::PassByCodec;
 
 /// Derive macro for implementing [`PassBy`] with the [`Inner`] strategy.
 ///
-/// Besides implementing [`PassBy`], this derive also implements the helper trait [`PassByInner`].
+/// Besides implementing [`PassBy`], this derive also implements the helper trait
+/// [`PassByInner`].
 ///
 /// The type is required to be a struct with just one field. The field type needs to implement
-/// the required traits to pass it between the wasm and the native side. (See the runtime interface
-/// crate for more information about these traits.)
+/// the required traits to pass it between the wasm and the native side. (See the runtime
+/// interface crate for more information about these traits.)
 ///
 /// # Example
 ///
@@ -86,8 +87,8 @@ pub use sp_runtime_interface_proc_macro::PassByInner;
 /// Besides implementing [`PassBy`], this derive also implements `TryFrom<u8>` and
 /// `From<Self> for u8` for the type.
 ///
-/// The type is required to be an enum with only unit variants and at maximum `256` variants. Also
-/// it is required that the type implements `Copy`.
+/// The type is required to be an enum with only unit variants and at maximum `256` variants.
+/// Also it is required that the type implements `Copy`.
 ///
 /// # Example
 ///
diff --git a/primitives/runtime-interface/src/util.rs b/primitives/runtime-interface/src/util.rs
index 5b3aa07e60d9..31045c83c9dc 100644
--- a/primitives/runtime-interface/src/util.rs
+++ b/primitives/runtime-interface/src/util.rs
@@ -29,8 +29,8 @@ pub fn pack_ptr_and_len(ptr: u32, len: u32) -> u64 {
 /// Unpacks an `u64` into the pointer and length.
 ///
 /// Runtime API functions return a 64-bit value which encodes a pointer in the least-significant
-/// 32-bits and a length in the most-significant 32 bits. This interprets the returned value as a pointer,
-/// length tuple.
+/// 32-bits and a length in the most-significant 32 bits. This interprets the returned value as a
+/// pointer, length tuple.
 pub fn unpack_ptr_and_len(val: u64) -> (u32, u32) {
 	// The static assertions from above are changed into a runtime check.
 	#[cfg(all(not(feature = "std"), feature = "disable_target_static_assertions"))]
diff --git a/primitives/runtime/src/generic/digest.rs b/primitives/runtime/src/generic/digest.rs
index 195bf1cbe5da..390acb87f690 100644
--- a/primitives/runtime/src/generic/digest.rs
+++ b/primitives/runtime/src/generic/digest.rs
@@ -128,12 +128,11 @@ pub enum ChangesTrieSignal {
 	///
 	/// The block that emits this signal will contain changes trie (CT) that covers
 	/// blocks range [BEGIN; current block], where BEGIN is (order matters):
-	/// - LAST_TOP_LEVEL_DIGEST_BLOCK+1 if top level digest CT has ever been created
-	///   using current configuration AND the last top level digest CT has been created
-	///   at block LAST_TOP_LEVEL_DIGEST_BLOCK;
-	/// - LAST_CONFIGURATION_CHANGE_BLOCK+1 if there has been CT configuration change
-	///   before and the last configuration change happened at block
-	///   LAST_CONFIGURATION_CHANGE_BLOCK;
+	/// - LAST_TOP_LEVEL_DIGEST_BLOCK+1 if top level digest CT has ever been created using current
+	///   configuration AND the last top level digest CT has been created at block
+	///   LAST_TOP_LEVEL_DIGEST_BLOCK;
+	/// - LAST_CONFIGURATION_CHANGE_BLOCK+1 if there has been CT configuration change before and
+	///   the last configuration change happened at block LAST_CONFIGURATION_CHANGE_BLOCK;
 	/// - 1 otherwise.
 	NewConfiguration(Option<ChangesTrieConfiguration>),
 }
diff --git a/primitives/runtime/src/generic/era.rs b/primitives/runtime/src/generic/era.rs
index 80ac46125b36..1a7239ab6e3e 100644
--- a/primitives/runtime/src/generic/era.rs
+++ b/primitives/runtime/src/generic/era.rs
@@ -55,8 +55,9 @@ pub enum Era {
 // phase = 1
 // n = Q(current - phase, period) + phase
 impl Era {
-	/// Create a new era based on a period (which should be a power of two between 4 and 65536 inclusive)
-	/// and a block number on which it should start (or, for long periods, be shortly after the start).
+	/// Create a new era based on a period (which should be a power of two between 4 and 65536
+	/// inclusive) and a block number on which it should start (or, for long periods, be shortly
+	/// after the start).
 	///
 	/// If using `Era` in the context of `FRAME` runtime, make sure that `period`
 	/// does not exceed `BlockHashCount` parameter passed to `system` module, since that
diff --git a/primitives/runtime/src/lib.rs b/primitives/runtime/src/lib.rs
index ce24848792e3..4a9c6087fa5c 100644
--- a/primitives/runtime/src/lib.rs
+++ b/primitives/runtime/src/lib.rs
@@ -728,10 +728,10 @@ pub type DispatchOutcome = Result<(), DispatchError>;
 ///
 /// Examples of reasons preventing inclusion in a block:
 /// - More block weight is required to process the extrinsic than is left in the block being built.
-///   This doesn't necessarily mean that the extrinsic is invalid, since it can still be
-///   included in the next block if it has enough spare weight available.
-/// - The sender doesn't have enough funds to pay the transaction inclusion fee. Including such
-///   a transaction in the block doesn't make sense.
+///   This doesn't necessarily mean that the extrinsic is invalid, since it can still be included in
+///   the next block if it has enough spare weight available.
+/// - The sender doesn't have enough funds to pay the transaction inclusion fee. Including such a
+///   transaction in the block doesn't make sense.
 /// - The extrinsic supplied a bad signature. This transaction won't become valid ever.
 pub type ApplyExtrinsicResult =
 	Result<DispatchOutcome, transaction_validity::TransactionValidityError>;
diff --git a/primitives/runtime/src/offchain/http.rs b/primitives/runtime/src/offchain/http.rs
index 7b305ebd9ccb..469f2fb5aff3 100644
--- a/primitives/runtime/src/offchain/http.rs
+++ b/primitives/runtime/src/offchain/http.rs
@@ -288,7 +288,8 @@ impl PendingRequest {
 
 	/// Attempt to wait for all provided requests, but up to given deadline.
 	///
-	/// Requests that are complete will resolve to an `Ok` others will return a `DeadlineReached` error.
+	/// Requests that are complete will resolve to an `Ok` others will return a `DeadlineReached`
+	/// error.
 	pub fn try_wait_all(
 		requests: Vec<PendingRequest>,
 		deadline: impl Into<Option<Timestamp>>,
diff --git a/primitives/runtime/src/traits.rs b/primitives/runtime/src/traits.rs
index 3baf7c6655b9..15ca897e618e 100644
--- a/primitives/runtime/src/traits.rs
+++ b/primitives/runtime/src/traits.rs
@@ -738,8 +738,8 @@ pub trait Extrinsic: Sized + MaybeMallocSizeOf {
 	///
 	/// Extrinsics can be split into:
 	/// 1. Inherents (no signature; created by validators during block production)
-	/// 2. Unsigned Transactions (no signature; represent "system calls" or other special kinds of calls)
-	/// 3. Signed Transactions (with signature; a regular transactions with known origin)
+	/// 2. Unsigned Transactions (no signature; represent "system calls" or other special kinds of
+	/// calls) 3. Signed Transactions (with signature; a regular transactions with known origin)
 	fn new(_call: Self::Call, _signed_data: Option<Self::SignaturePayload>) -> Option<Self> {
 		None
 	}
@@ -765,8 +765,8 @@ pub type DigestItemFor<B> = DigestItem<<<B as Block>::Header as Header>::Hash>;
 
 /// A "checkable" piece of information, used by the standard Substrate Executive in order to
 /// check the validity of a piece of extrinsic information, usually by verifying the signature.
-/// Implement for pieces of information that require some additional context `Context` in order to be
-/// checked.
+/// Implement for pieces of information that require some additional context `Context` in order to
+/// be checked.
 pub trait Checkable<Context>: Sized {
 	/// Returned if `check` succeeds.
 	type Checked;
diff --git a/primitives/runtime/src/transaction_validity.rs b/primitives/runtime/src/transaction_validity.rs
index 939452384f75..e114bb598546 100644
--- a/primitives/runtime/src/transaction_validity.rs
+++ b/primitives/runtime/src/transaction_validity.rs
@@ -60,7 +60,8 @@ pub enum InvalidTransaction {
 	/// # Possible causes
 	///
 	/// For `FRAME`-based runtimes this would be caused by `current block number
-	/// - Era::birth block number > BlockHashCount`. (e.g. in Polkadot `BlockHashCount` = 2400, so a
+	/// - Era::birth block number > BlockHashCount`. (e.g. in Polkadot `BlockHashCount` = 2400, so
+	///   a
 	/// transaction with birth block number 1337 would be valid up until block number 1337 + 2400,
 	/// after which point the transaction would be considered to have an ancient birth block.)
 	AncientBirthBlock,
@@ -72,8 +73,8 @@ pub enum InvalidTransaction {
 	/// Any other custom invalid validity that is not covered by this enum.
 	Custom(u8),
 	/// An extrinsic with a Mandatory dispatch resulted in Error. This is indicative of either a
-	/// malicious validator or a buggy `provide_inherent`. In any case, it can result in dangerously
-	/// overweight blocks and therefore if found, invalidates the block.
+	/// malicious validator or a buggy `provide_inherent`. In any case, it can result in
+	/// dangerously overweight blocks and therefore if found, invalidates the block.
 	BadMandatory,
 	/// A transaction with a mandatory dispatch. This is invalid; only inherent extrinsics are
 	/// allowed to have mandatory dispatches.
diff --git a/primitives/sandbox/src/lib.rs b/primitives/sandbox/src/lib.rs
index a433d57c3b51..94cb676b51ed 100755
--- a/primitives/sandbox/src/lib.rs
+++ b/primitives/sandbox/src/lib.rs
@@ -23,9 +23,9 @@
 //! and without the performance penalty of full wasm emulation inside wasm.
 //!
 //! This is achieved by using bindings to the wasm VM, which are published by the host API.
-//! This API is thin and consists of only a handful functions. It contains functions for instantiating
-//! modules and executing them, but doesn't contain functions for inspecting the module
-//! structure. The user of this library is supposed to read the wasm module.
+//! This API is thin and consists of only a handful functions. It contains functions for
+//! instantiating modules and executing them, but doesn't contain functions for inspecting the
+//! module structure. The user of this library is supposed to read the wasm module.
 //!
 //! When this crate is used in the `std` environment all these functions are implemented by directly
 //! calling the wasm VM.
@@ -168,8 +168,8 @@ impl<T> Instance<T> {
 	/// run the `start` function (if it is present in the module) with the given `state`.
 	///
 	/// Returns `Err(Error::Module)` if this module can't be instantiated with the given
-	/// environment. If execution of `start` function generated a trap, then `Err(Error::Execution)` will
-	/// be returned.
+	/// environment. If execution of `start` function generated a trap, then `Err(Error::Execution)`
+	/// will be returned.
 	///
 	/// [`EnvironmentDefinitionBuilder`]: struct.EnvironmentDefinitionBuilder.html
 	pub fn new(
@@ -188,8 +188,8 @@ impl<T> Instance<T> {
 	///
 	/// - An export function name isn't a proper utf8 byte sequence,
 	/// - This module doesn't have an exported function with the given name,
-	/// - If types of the arguments passed to the function doesn't match function signature
-	///   then trap occurs (as if the exported function was called via call_indirect),
+	/// - If types of the arguments passed to the function doesn't match function signature then
+	///   trap occurs (as if the exported function was called via call_indirect),
 	/// - Trap occurred at the execution time.
 	pub fn invoke(
 		&mut self,
diff --git a/primitives/state-machine/src/changes_trie/build.rs b/primitives/state-machine/src/changes_trie/build.rs
index 2c75ac236bf3..d3c6c12122c4 100644
--- a/primitives/state-machine/src/changes_trie/build.rs
+++ b/primitives/state-machine/src/changes_trie/build.rs
@@ -147,8 +147,8 @@ where
 			|mut map: BTreeMap<&[u8], (ExtrinsicIndex<Number>, Vec<u32>)>, (k, extrinsics)| {
 				match map.entry(k) {
 					Entry::Vacant(entry) => {
-						// ignore temporary values (values that have null value at the end of operation
-						// AND are not in storage at the beginning of operation
+						// ignore temporary values (values that have null value at the end of
+						// operation AND are not in storage at the beginning of operation
 						if let Some(child_info) = child_info.as_ref() {
 							if !overlay
 								.child_storage(child_info, k)
@@ -177,8 +177,8 @@ where
 						));
 					},
 					Entry::Occupied(mut entry) => {
-						// we do not need to check for temporary values here, because entry is Occupied
-						// AND we are checking it before insertion
+						// we do not need to check for temporary values here, because entry is
+						// Occupied AND we are checking it before insertion
 						let entry_extrinsics = &mut entry.get_mut().1;
 						entry_extrinsics.extend(extrinsics.into_iter());
 						entry_extrinsics.sort();
@@ -246,11 +246,12 @@ where
 							));
 						},
 						Entry::Occupied(mut entry) => {
-							// DigestIndexValue must be sorted. Here we are relying on the fact that digest_build_iterator()
-							// returns blocks in ascending order => we only need to check for duplicates
+							// DigestIndexValue must be sorted. Here we are relying on the fact that
+							// digest_build_iterator() returns blocks in ascending order => we only
+							// need to check for duplicates
 							//
-							// is_dup_block could be true when key has been changed in both digest block
-							// AND other blocks that it covers
+							// is_dup_block could be true when key has been changed in both digest
+							// block AND other blocks that it covers
 							let is_dup_block = entry.get().1.last() == Some(&digest_build_block);
 							if !is_dup_block {
 								entry.get_mut().1.push(digest_build_block.clone());
diff --git a/primitives/state-machine/src/changes_trie/build_cache.rs b/primitives/state-machine/src/changes_trie/build_cache.rs
index 67098d4d7204..04820242d9d0 100644
--- a/primitives/state-machine/src/changes_trie/build_cache.rs
+++ b/primitives/state-machine/src/changes_trie/build_cache.rs
@@ -39,7 +39,8 @@ pub struct BuildCache<H, N> {
 	/// Map of changes trie root => set of storage keys that are in this trie.
 	/// The `Option<Vec<u8>>` in inner `HashMap` stands for the child storage key.
 	/// If it is `None`, then the `HashSet` contains keys changed in top-level storage.
-	/// If it is `Some`, then the `HashSet` contains keys changed in child storage, identified by the key.
+	/// If it is `Some`, then the `HashSet` contains keys changed in child storage, identified by
+	/// the key.
 	changed_keys: HashMap<H, HashMap<Option<PrefixedStorageKey>, HashSet<StorageKey>>>,
 }
 
diff --git a/primitives/state-machine/src/changes_trie/build_iterator.rs b/primitives/state-machine/src/changes_trie/build_iterator.rs
index d4adc99d109f..62bb00a2f882 100644
--- a/primitives/state-machine/src/changes_trie/build_iterator.rs
+++ b/primitives/state-machine/src/changes_trie/build_iterator.rs
@@ -50,11 +50,12 @@ pub fn digest_build_iterator<'a, Number: BlockNumber>(
 /// required for inclusion into changes trie of given block.
 #[derive(Debug)]
 pub struct DigestBuildIterator<Number: BlockNumber> {
-	/// Block we're building changes trie for. It could (logically) be a post-end block if we are creating
-	/// skewed digest.
+	/// Block we're building changes trie for. It could (logically) be a post-end block if we are
+	/// creating skewed digest.
 	block: Number,
-	/// Block that is a last block where current configuration is active. We have never yet created anything
-	/// after this block => digest that we're creating can't reference any blocks that are >= end.
+	/// Block that is a last block where current configuration is active. We have never yet created
+	/// anything after this block => digest that we're creating can't reference any blocks that are
+	/// >= end.
 	end: Number,
 	/// Interval of L1 digest blocks.
 	digest_interval: u32,
@@ -445,7 +446,8 @@ mod tests {
 					256, 512, 768, 1024, 1280,
 					// level3 MUST point to previous 16-1 level1 digests, BUT there are only 3:
 					1296, 1312, 1328,
-					// level3 MUST be a level1 digest of 16-1 previous blocks, BUT there are only 9:
+					// level3 MUST be a level1 digest of 16-1 previous blocks, BUT there are only
+					// 9:
 					1329, 1330, 1331, 1332, 1333, 1334, 1335, 1336, 1337,
 				]
 				.iter()
@@ -467,8 +469,9 @@ mod tests {
 				[
 					// level3 MUST point to previous 16-1 level2 digests, BUT there are only 5:
 					256, 512, 768, 1024, 1280,
-					// level3 MUST point to previous 16-1 level1 digests, BUT there are NO ANY L1-digests:
-					// level3 MUST be a level1 digest of 16-1 previous blocks, BUT there are only 3:
+					// level3 MUST point to previous 16-1 level1 digests, BUT there are NO ANY
+					// L1-digests: level3 MUST be a level1 digest of 16-1 previous blocks, BUT
+					// there are only 3:
 					1281, 1282, 1283,
 				]
 				.iter()
diff --git a/primitives/state-machine/src/changes_trie/changes_iterator.rs b/primitives/state-machine/src/changes_trie/changes_iterator.rs
index 8b7d7c578109..9343a226a3aa 100644
--- a/primitives/state-machine/src/changes_trie/changes_iterator.rs
+++ b/primitives/state-machine/src/changes_trie/changes_iterator.rs
@@ -279,7 +279,8 @@ where
 				if let Some(blocks) = blocks? {
 					if let Ok(blocks) = <DigestIndexValue<Number>>::decode(&mut &blocks[..]) {
 						// filter level0 blocks here because we tend to use digest blocks,
-						// AND digest block changes could also include changes for out-of-range blocks
+						// AND digest block changes could also include changes for out-of-range
+						// blocks
 						let begin = self.begin.clone();
 						let end = self.end.number.clone();
 						let config = self.config.clone();
diff --git a/primitives/state-machine/src/changes_trie/input.rs b/primitives/state-machine/src/changes_trie/input.rs
index 426104295611..af0a423e5726 100644
--- a/primitives/state-machine/src/changes_trie/input.rs
+++ b/primitives/state-machine/src/changes_trie/input.rs
@@ -63,9 +63,11 @@ pub type ChildIndexValue = Vec<u8>;
 pub enum InputPair<Number: BlockNumber> {
 	/// Element of { key => set of extrinsics where key has been changed } element mapping.
 	ExtrinsicIndex(ExtrinsicIndex<Number>, ExtrinsicIndexValue),
-	/// Element of { key => set of blocks/digest blocks where key has been changed } element mapping.
+	/// Element of { key => set of blocks/digest blocks where key has been changed } element
+	/// mapping.
 	DigestIndex(DigestIndex<Number>, DigestIndexValue<Number>),
-	/// Element of { childtrie key => Childchange trie } where key has been changed } element mapping.
+	/// Element of { childtrie key => Childchange trie } where key has been changed } element
+	/// mapping.
 	ChildIndex(ChildIndex<Number>, ChildIndexValue),
 }
 
diff --git a/primitives/state-machine/src/changes_trie/mod.rs b/primitives/state-machine/src/changes_trie/mod.rs
index 7fedff1f1e2b..40148095247d 100644
--- a/primitives/state-machine/src/changes_trie/mod.rs
+++ b/primitives/state-machine/src/changes_trie/mod.rs
@@ -153,8 +153,8 @@ pub struct State<'a, H, Number> {
 	/// Configuration that is active at given block.
 	pub config: Configuration,
 	/// Configuration activation block number. Zero if it is the first configuration on the chain,
-	/// or number of the block that have emit NewConfiguration signal (thus activating configuration
-	/// starting from the **next** block).
+	/// or number of the block that have emit NewConfiguration signal (thus activating
+	/// configuration starting from the **next** block).
 	pub zero: Number,
 	/// Underlying changes tries storage reference.
 	pub storage: &'a dyn Storage<H, Number>,
@@ -276,8 +276,8 @@ where
 	let parent = state.storage.build_anchor(parent_hash).map_err(|_| ())?;
 	let block = parent.number.clone() + One::one();
 
-	// prepare configuration range - we already know zero block. Current block may be the end block if configuration
-	// has been changed in this block
+	// prepare configuration range - we already know zero block. Current block may be the end block
+	// if configuration has been changed in this block
 	let is_config_changed =
 		match changes.storage(sp_core::storage::well_known_keys::CHANGES_TRIE_CONFIG) {
 			Some(Some(new_config)) => new_config != &state.config.encode()[..],
@@ -290,7 +290,8 @@ where
 		end: if is_config_changed { Some(block.clone()) } else { None },
 	};
 
-	// storage errors are considered fatal (similar to situations when runtime fetches values from storage)
+	// storage errors are considered fatal (similar to situations when runtime fetches values from
+	// storage)
 	let (input_pairs, child_input_pairs, digest_input_blocks) = maybe_panic(
 		prepare_input::<B, H, Number>(
 			backend,
diff --git a/primitives/state-machine/src/changes_trie/surface_iterator.rs b/primitives/state-machine/src/changes_trie/surface_iterator.rs
index 509c02ee379f..b3e5a490cd18 100644
--- a/primitives/state-machine/src/changes_trie/surface_iterator.rs
+++ b/primitives/state-machine/src/changes_trie/surface_iterator.rs
@@ -15,11 +15,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! The best way to understand how this iterator works is to imagine some 2D terrain that have some mountains
-//! (digest changes tries) and valleys (changes tries for regular blocks). There are gems (blocks) beneath the
-//! terrain. Given the request to find all gems in the range [X1; X2] this iterator will return **minimal set**
-//! of points at the terrain (mountains and valleys) inside this range that have to be drilled down to
-//! search for gems.
+//! The best way to understand how this iterator works is to imagine some 2D terrain that have some
+//! mountains (digest changes tries) and valleys (changes tries for regular blocks). There are gems
+//! (blocks) beneath the terrain. Given the request to find all gems in the range [X1; X2] this
+//! iterator will return **minimal set** of points at the terrain (mountains and valleys) inside
+//! this range that have to be drilled down to search for gems.
 
 use crate::changes_trie::{BlockNumber, ConfigurationRange};
 use num_traits::One;
@@ -50,9 +50,9 @@ pub fn surface_iterator<'a, Number: BlockNumber>(
 /// Surface iterator - only traverses top-level digests from given range and tries to find
 /// all valid digest changes.
 ///
-/// Iterator item is the tuple of (last block of the current point + digest level of the current point).
-/// Digest level is Some(0) when it is regular block, is Some(non-zero) when it is digest block and None
-/// if it is skewed digest block.
+/// Iterator item is the tuple of (last block of the current point + digest level of the current
+/// point). Digest level is Some(0) when it is regular block, is Some(non-zero) when it is digest
+/// block and None if it is skewed digest block.
 pub struct SurfaceIterator<'a, Number: BlockNumber> {
 	config: ConfigurationRange<'a, Number>,
 	begin: Number,
diff --git a/primitives/state-machine/src/ext.rs b/primitives/state-machine/src/ext.rs
index 5f22714d4da3..c9693ca6a88c 100644
--- a/primitives/state-machine/src/ext.rs
+++ b/primitives/state-machine/src/ext.rs
@@ -573,9 +573,9 @@ where
 
 			if let Some((root, is_empty, _)) = root {
 				let root = root.encode();
-				// We store update in the overlay in order to be able to use 'self.storage_transaction'
-				// cache. This is brittle as it rely on Ext only querying the trie backend for
-				// storage root.
+				// We store update in the overlay in order to be able to use
+				// 'self.storage_transaction' cache. This is brittle as it rely on Ext only querying
+				// the trie backend for storage root.
 				// A better design would be to manage 'child_storage_transaction' in a
 				// similar way as 'storage_transaction' but for each child trie.
 				if is_empty {
diff --git a/primitives/state-machine/src/lib.rs b/primitives/state-machine/src/lib.rs
index 1588a42f41fe..3c4acdccb10c 100644
--- a/primitives/state-machine/src/lib.rs
+++ b/primitives/state-machine/src/lib.rs
@@ -206,7 +206,8 @@ mod execution {
 		NativeWhenPossible,
 		/// Use the given wasm module.
 		AlwaysWasm,
-		/// Run with both the wasm and the native variant (if compatible). Report any discrepancy as an error.
+		/// Run with both the wasm and the native variant (if compatible). Report any discrepancy
+		/// as an error.
 		Both,
 		/// First native, then if that fails or is not possible, wasm.
 		NativeElseWasm,
@@ -230,10 +231,12 @@ mod execution {
 		/// otherwise fall back to the wasm.
 		NativeWhenPossible,
 		/// Use the given wasm module. The backend on which code is executed code could be
-		/// trusted to provide all storage or not (i.e. the light client cannot be trusted to provide
-		/// for all storage queries since the storage entries it has come from an external node).
+		/// trusted to provide all storage or not (i.e. the light client cannot be trusted to
+		/// provide for all storage queries since the storage entries it has come from an external
+		/// node).
 		AlwaysWasm(BackendTrustLevel),
-		/// Run with both the wasm and the native variant (if compatible). Call `F` in the case of any discrepancy.
+		/// Run with both the wasm and the native variant (if compatible). Call `F` in the case of
+		/// any discrepancy.
 		Both(F),
 		/// First native, then if that fails or is not possible, wasm.
 		NativeElseWasm,
@@ -278,12 +281,14 @@ mod execution {
 		ExecutionManager::NativeElseWasm
 	}
 
-	/// Evaluate to ExecutionManager::AlwaysWasm with trusted backend, without having to figure out the type.
+	/// Evaluate to ExecutionManager::AlwaysWasm with trusted backend, without having to figure out
+	/// the type.
 	fn always_wasm<E, R: Decode>() -> ExecutionManager<DefaultHandler<R, E>> {
 		ExecutionManager::AlwaysWasm(BackendTrustLevel::Trusted)
 	}
 
-	/// Evaluate ExecutionManager::AlwaysWasm with untrusted backend, without having to figure out the type.
+	/// Evaluate ExecutionManager::AlwaysWasm with untrusted backend, without having to figure out
+	/// the type.
 	fn always_untrusted_wasm<E, R: Decode>() -> ExecutionManager<DefaultHandler<R, E>> {
 		ExecutionManager::AlwaysWasm(BackendTrustLevel::Untrusted)
 	}
@@ -390,8 +395,8 @@ mod execution {
 		///
 		/// Returns the SCALE encoded result of the executed function.
 		pub fn execute(&mut self, strategy: ExecutionStrategy) -> Result<Vec<u8>, Box<dyn Error>> {
-			// We are not giving a native call and thus we are sure that the result can never be a native
-			// value.
+			// We are not giving a native call and thus we are sure that the result can never be a
+			// native value.
 			self.execute_using_consensus_failure_handler::<_, NeverNativeValue, fn() -> _>(
 				strategy.get_manager(),
 				None,
diff --git a/primitives/state-machine/src/overlayed_changes/offchain.rs b/primitives/state-machine/src/overlayed_changes/offchain.rs
index 9603426fa551..ac67ca330300 100644
--- a/primitives/state-machine/src/overlayed_changes/offchain.rs
+++ b/primitives/state-machine/src/overlayed_changes/offchain.rs
@@ -21,7 +21,8 @@ use super::changeset::OverlayedMap;
 use sp_core::offchain::OffchainOverlayedChange;
 use sp_std::prelude::Vec;
 
-/// In-memory storage for offchain workers recoding changes for the actual offchain storage implementation.
+/// In-memory storage for offchain workers recoding changes for the actual offchain storage
+/// implementation.
 #[derive(Debug, Clone, Default)]
 pub struct OffchainOverlayedChanges(OverlayedMap<(Vec<u8>, Vec<u8>), OffchainOverlayedChange>);
 
diff --git a/primitives/timestamp/src/lib.rs b/primitives/timestamp/src/lib.rs
index 892d359d8e88..5de1b10e7993 100644
--- a/primitives/timestamp/src/lib.rs
+++ b/primitives/timestamp/src/lib.rs
@@ -198,8 +198,8 @@ impl InherentDataProvider {
 	/// By default the maximum drift is 60 seconds.
 	///
 	/// The maximum drift is used when checking the inherents of a runtime. If the current timestamp
-	/// plus the maximum drift is smaller than the timestamp in the block, the block will be rejected
-	/// as being too far in the future.
+	/// plus the maximum drift is smaller than the timestamp in the block, the block will be
+	/// rejected as being too far in the future.
 	pub fn with_max_drift(mut self, max_drift: std::time::Duration) -> Self {
 		self.max_drift = max_drift.into();
 		self
diff --git a/primitives/tracing/src/types.rs b/primitives/tracing/src/types.rs
index 355e2fa451db..377bd0f42c6e 100644
--- a/primitives/tracing/src/types.rs
+++ b/primitives/tracing/src/types.rs
@@ -465,9 +465,9 @@ mod std_features {
 
 	// Implementation Note:
 	// the original `tracing` crate generates these static metadata entries at every `span!` and
-	// `event!` location to allow for highly optimised filtering. For us to allow level-based emitting
-	// of wasm events we need these static metadata entries to inject into that system. We then provide
-	// generic `From`-implementations picking the right metadata to refer to.
+	// `event!` location to allow for highly optimised filtering. For us to allow level-based
+	// emitting of wasm events we need these static metadata entries to inject into that system. We
+	// then provide generic `From`-implementations picking the right metadata to refer to.
 
 	static SPAN_ERROR_METADATA: tracing_core::Metadata<'static> = tracing::Metadata::new(
 		WASM_TRACE_IDENTIFIER,
diff --git a/primitives/trie/src/storage_proof.rs b/primitives/trie/src/storage_proof.rs
index b4e4b393a71a..410ad44e75a6 100644
--- a/primitives/trie/src/storage_proof.rs
+++ b/primitives/trie/src/storage_proof.rs
@@ -72,8 +72,8 @@ impl StorageProof {
 	}
 
 	/// Merges multiple storage proofs covering potentially different sets of keys into one proof
-	/// covering all keys. The merged proof output may be smaller than the aggregate size of the input
-	/// proofs due to deduplication of trie nodes.
+	/// covering all keys. The merged proof output may be smaller than the aggregate size of the
+	/// input proofs due to deduplication of trie nodes.
 	pub fn merge<I>(proofs: I) -> Self
 	where
 		I: IntoIterator<Item = Self>,
diff --git a/primitives/utils/src/lib.rs b/primitives/utils/src/lib.rs
index 6461361c96d1..693b05a8b998 100644
--- a/primitives/utils/src/lib.rs
+++ b/primitives/utils/src/lib.rs
@@ -27,7 +27,8 @@
 //! and `UnboundedReceiver<T>` to register every `send`/`received`/`dropped` action happened on
 //! the channel.
 //!
-//! Also this feature creates and registers a prometheus vector with name `unbounded_channel_len` and labels:
+//! Also this feature creates and registers a prometheus vector with name `unbounded_channel_len`
+//! and labels:
 //!
 //! | Label        | Description                                   |
 //! | ------------ | --------------------------------------------- |
diff --git a/primitives/utils/src/status_sinks.rs b/primitives/utils/src/status_sinks.rs
index 0870ab119299..b8e05781611c 100644
--- a/primitives/utils/src/status_sinks.rs
+++ b/primitives/utils/src/status_sinks.rs
@@ -86,8 +86,8 @@ impl<T> StatusSinks<T> {
 		let inner = &mut *inner;
 
 		loop {
-			// Future that produces the next ready entry in `entries`, or doesn't produce anything if
-			// the list is empty.
+			// Future that produces the next ready entry in `entries`, or doesn't produce anything
+			// if the list is empty.
 			let next_ready_entry = {
 				let entries = &mut inner.entries;
 				async move {
diff --git a/primitives/version/proc-macro/src/decl_runtime_version.rs b/primitives/version/proc-macro/src/decl_runtime_version.rs
index cdf244f72ce8..eef6314be4c8 100644
--- a/primitives/version/proc-macro/src/decl_runtime_version.rs
+++ b/primitives/version/proc-macro/src/decl_runtime_version.rs
@@ -25,9 +25,10 @@ use syn::{
 	Expr, ExprLit, FieldValue, ItemConst, Lit,
 };
 
-/// This macro accepts a `const` item that has a struct initializer expression of `RuntimeVersion`-like type.
-/// The macro will pass through this declaration and append an item declaration that will
-/// lead to emitting a wasm custom section with the contents of `RuntimeVersion`.
+/// This macro accepts a `const` item that has a struct initializer expression of
+/// `RuntimeVersion`-like type. The macro will pass through this declaration and append an item
+/// declaration that will lead to emitting a wasm custom section with the contents of
+/// `RuntimeVersion`.
 pub fn decl_runtime_version_impl(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
 	let item = parse_macro_input!(input as ItemConst);
 	decl_runtime_version_impl_inner(item)
@@ -125,8 +126,8 @@ impl ParseRuntimeVersion {
 			// Intentionally ignored
 			//
 			// The definition will pass through for the declaration, however, it won't get into
-			// the "runtime_version" custom section. `impl_runtime_apis` is responsible for generating
-			// a custom section with the supported runtime apis descriptor.
+			// the "runtime_version" custom section. `impl_runtime_apis` is responsible for
+			// generating a custom section with the supported runtime apis descriptor.
 		} else {
 			return Err(Error::new(field_name.span(), "unknown field"))
 		}
diff --git a/primitives/version/src/lib.rs b/primitives/version/src/lib.rs
index c76fb44a2cd6..65b22436a5ba 100644
--- a/primitives/version/src/lib.rs
+++ b/primitives/version/src/lib.rs
@@ -38,15 +38,15 @@ use sp_runtime::{generic::BlockId, traits::Block as BlockT};
 #[cfg(feature = "std")]
 pub mod embed;
 
-/// An attribute that accepts a version declaration of a runtime and generates a custom wasm section
-/// with the equivalent contents.
+/// An attribute that accepts a version declaration of a runtime and generates a custom wasm
+/// section with the equivalent contents.
 ///
-/// The custom section allows to read the version of the runtime without having to execute any code.
-/// Instead, the generated custom section can be relatively easily parsed from the wasm binary. The
-/// identifier of the custom section is "runtime_version".
+/// The custom section allows to read the version of the runtime without having to execute any
+/// code. Instead, the generated custom section can be relatively easily parsed from the wasm
+/// binary. The identifier of the custom section is "runtime_version".
 ///
-/// A shortcoming of this macro is that it is unable to embed information regarding supported APIs.
-/// This is supported by the `construct_runtime!` macro.
+/// A shortcoming of this macro is that it is unable to embed information regarding supported
+/// APIs. This is supported by the `construct_runtime!` macro.
 ///
 /// # Usage
 ///
@@ -69,32 +69,33 @@ pub mod embed;
 /// # const RUNTIME_API_VERSIONS: sp_version::ApisVec = sp_version::create_apis_vec!([]);
 /// ```
 ///
-/// It will pass it through and add code required for emitting a custom section. The information that
-/// will go into the custom section is parsed from the item declaration. Due to that, the macro is
-/// somewhat rigid in terms of the code it accepts. There are the following considerations:
+/// It will pass it through and add code required for emitting a custom section. The
+/// information that will go into the custom section is parsed from the item declaration. Due
+/// to that, the macro is somewhat rigid in terms of the code it accepts. There are the
+/// following considerations:
 ///
-/// - The `spec_name` and `impl_name` must be set by a macro-like expression. The name of the macro
-///   doesn't matter though.
+/// - The `spec_name` and `impl_name` must be set by a macro-like expression. The name of the
+///   macro doesn't matter though.
 ///
 /// - `authoring_version`, `spec_version`, `impl_version` and `transaction_version` must be set
-///   by a literal. Literal must be an integer. No other expressions are allowed there. In particular,
-///   you can't supply a constant variable.
+///   by a literal. Literal must be an integer. No other expressions are allowed there. In
+///   particular, you can't supply a constant variable.
 ///
-/// - `apis` doesn't have any specific constraints. This is because this information doesn't get into
-///   the custom section and is not parsed.
+/// - `apis` doesn't have any specific constraints. This is because this information doesn't
+///   get into the custom section and is not parsed.
 ///
 /// # Compilation Target & "std" feature
 ///
-/// This macro assumes it will be used within a runtime. By convention, a runtime crate defines a
-/// feature named "std". This feature is enabled when the runtime is compiled to native code and
-/// disabled when it is compiled to the wasm code.
+/// This macro assumes it will be used within a runtime. By convention, a runtime crate defines
+/// a feature named "std". This feature is enabled when the runtime is compiled to native code
+/// and disabled when it is compiled to the wasm code.
 ///
-/// The custom section can only be emitted while compiling to wasm. In order to detect the compilation
-/// target we use the "std" feature. This macro will emit the custom section only if the "std" feature
-/// is **not** enabled.
+/// The custom section can only be emitted while compiling to wasm. In order to detect the
+/// compilation target we use the "std" feature. This macro will emit the custom section only
+/// if the "std" feature is **not** enabled.
 ///
-/// Including this macro in the context where there is no "std" feature and the code is not compiled
-/// to wasm can lead to cryptic linking errors.
+/// Including this macro in the context where there is no "std" feature and the code is not
+/// compiled to wasm can lead to cryptic linking errors.
 pub use sp_version_proc_macro::runtime_version;
 
 /// The identity of a particular API interface that the runtime might provide.
@@ -119,8 +120,9 @@ macro_rules! create_apis_vec {
 /// Runtime version.
 /// This should not be thought of as classic Semver (major/minor/tiny).
 /// This triplet have different semantics and mis-interpretation could cause problems.
-/// In particular: bug fixes should result in an increment of `spec_version` and possibly `authoring_version`,
-/// absolutely not `impl_version` since they change the semantics of the runtime.
+/// In particular: bug fixes should result in an increment of `spec_version` and possibly
+/// `authoring_version`, absolutely not `impl_version` since they change the semantics of the
+/// runtime.
 #[derive(Clone, PartialEq, Eq, Encode, Decode, Default, sp_runtime::RuntimeDebug)]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
@@ -168,9 +170,9 @@ pub struct RuntimeVersion {
 	/// number changes, then `spec_version` must change, also.
 	///
 	/// This number must change when an existing dispatchable (module ID, dispatch ID) is changed,
-	/// either through an alteration in its user-level semantics, a parameter added/removed/changed,
-	/// a dispatchable being removed, a module being removed, or a dispatchable/module changing its
-	/// index.
+	/// either through an alteration in its user-level semantics, a parameter
+	/// added/removed/changed, a dispatchable being removed, a module being removed, or a
+	/// dispatchable/module changing its index.
 	///
 	/// It need *not* change when a new module is added or when a dispatchable is added.
 	pub transaction_version: u32,
diff --git a/primitives/wasm-interface/src/lib.rs b/primitives/wasm-interface/src/lib.rs
index 3f1f1c171403..e1903ef425ae 100644
--- a/primitives/wasm-interface/src/lib.rs
+++ b/primitives/wasm-interface/src/lib.rs
@@ -143,7 +143,8 @@ impl<T: PointerType> Pointer<T> {
 
 	/// Calculate the offset from this pointer.
 	///
-	/// `offset` is in units of `T`. So, `3` means `3 * mem::size_of::<T>()` as offset to the pointer.
+	/// `offset` is in units of `T`. So, `3` means `3 * mem::size_of::<T>()` as offset to the
+	/// pointer.
 	///
 	/// Returns an `Option` to respect that the pointer could probably overflow.
 	pub fn offset(self, offset: u32) -> Option<Self> {
diff --git a/rustfmt.toml b/rustfmt.toml
index 15e9bdcdf10f..441913f619cd 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -7,6 +7,9 @@ imports_granularity = "Crate"
 reorder_imports = true
 # Consistency
 newline_style = "Unix"
+# Format comments
+comment_width = 100
+wrap_comments = true
 # Misc
 chain_width = 80
 spaces_around_ranges = false
diff --git a/test-utils/client/src/lib.rs b/test-utils/client/src/lib.rs
index d08a01a4decb..a8d7818ace6d 100644
--- a/test-utils/client/src/lib.rs
+++ b/test-utils/client/src/lib.rs
@@ -392,8 +392,9 @@ where
 	C: BlockchainEvents<B>,
 	B: BlockT,
 {
-	/// Wait for `count` blocks to be imported in the node and then exit. This function will not return if no blocks
-	/// are ever created, thus you should restrict the maximum amount of time of the test execution.
+	/// Wait for `count` blocks to be imported in the node and then exit. This function will not
+	/// return if no blocks are ever created, thus you should restrict the maximum amount of time of
+	/// the test execution.
 	fn wait_for_blocks(&self, count: usize) -> Pin<Box<dyn Future<Output = ()> + Send>>;
 }
 
diff --git a/test-utils/src/lib.rs b/test-utils/src/lib.rs
index eef87a29ca07..27f13e2a7b30 100644
--- a/test-utils/src/lib.rs
+++ b/test-utils/src/lib.rs
@@ -19,8 +19,8 @@
 
 #[doc(hidden)]
 pub use futures;
-/// Marks async function to be executed by an async runtime and provide a `TaskExecutor`, suitable
-/// to test environment.
+/// Marks async function to be executed by an async runtime and provide a `TaskExecutor`,
+/// suitable to test environment.
 ///
 /// # Requirements
 ///
diff --git a/test-utils/test-runner/src/lib.rs b/test-utils/test-runner/src/lib.rs
index ed0cc222bf44..2c458f330ec6 100644
--- a/test-utils/test-runner/src/lib.rs
+++ b/test-utils/test-runner/src/lib.rs
@@ -23,15 +23,15 @@
 //! Allows you to test
 //! <br />
 //!
-//! -   Migrations
-//! -   Runtime Upgrades
-//! -   Pallets and general runtime functionality.
+//! - Migrations
+//! - Runtime Upgrades
+//! - Pallets and general runtime functionality.
 //!
 //! This works by running a full node with a Manual Seal-BABE™ hybrid consensus for block authoring.
 //!
 //! <h2>Note</h2>
-//! The running node has no signature verification, which allows us author extrinsics for any account on chain.
-//!     <br/>
+//! The running node has no signature verification, which allows us author extrinsics for any
+//! account on chain.     <br/>
 //!     <br/>
 //!
 //! <h2>How do I Use this?</h2>
diff --git a/utils/fork-tree/src/lib.rs b/utils/fork-tree/src/lib.rs
index bbcea262d467..9143da89a77e 100644
--- a/utils/fork-tree/src/lib.rs
+++ b/utils/fork-tree/src/lib.rs
@@ -145,8 +145,8 @@ where
 						child.number < *number && is_descendent_of(&child.hash, hash)?)
 				{
 					root.children.push(child);
-					// assuming that the tree is well formed only one child should pass this requirement
-					// due to ancestry restrictions (i.e. they must be different forks).
+					// assuming that the tree is well formed only one child should pass this
+					// requirement due to ancestry restrictions (i.e. they must be different forks).
 					is_first = false;
 				} else {
 					removed.push(child);
@@ -912,14 +912,15 @@ mod test {
 	) -> (ForkTree<&'a str, u64, ()>, impl Fn(&&str, &&str) -> Result<bool, TestError>) {
 		let mut tree = ForkTree::new();
 
+		#[rustfmt::skip]
+		//
 		//     - B - C - D - E
 		//    /
 		//   /   - G
 		//  /   /
 		// A - F - H - I
 		//          \
-		//           - L - M
-		//              \
+		//           - L - M \
 		//               - O
 		//  \
 		//   — J - K
diff --git a/utils/frame/benchmarking-cli/src/lib.rs b/utils/frame/benchmarking-cli/src/lib.rs
index 51a89f6d5863..cd314adebe89 100644
--- a/utils/frame/benchmarking-cli/src/lib.rs
+++ b/utils/frame/benchmarking-cli/src/lib.rs
@@ -21,8 +21,8 @@ mod writer;
 use sc_cli::{ExecutionStrategy, WasmExecutionMethod};
 use std::fmt::Debug;
 
-// Add a more relaxed parsing for pallet names by allowing pallet directory names with `-` to be used
-// like crate names with `_`
+// Add a more relaxed parsing for pallet names by allowing pallet directory names with `-` to be
+// used like crate names with `_`
 fn parse_pallet_name(pallet: &str) -> String {
 	pallet.replace("-", "_")
 }
diff --git a/utils/frame/benchmarking-cli/src/writer.rs b/utils/frame/benchmarking-cli/src/writer.rs
index b1816d4a7bbc..8701fb651262 100644
--- a/utils/frame/benchmarking-cli/src/writer.rs
+++ b/utils/frame/benchmarking-cli/src/writer.rs
@@ -188,7 +188,8 @@ fn get_benchmark_data(
 	let writes = analysis_function(&batch.db_results, BenchmarkSelector::Writes)
 		.expect("analysis function should return the number of writes for valid inputs");
 
-	// Analysis data may include components that are not used, this filters out anything whose value is zero.
+	// Analysis data may include components that are not used, this filters out anything whose value
+	// is zero.
 	let mut used_components = Vec::new();
 	let mut used_extrinsic_time = Vec::new();
 	let mut used_reads = Vec::new();
diff --git a/utils/frame/remote-externalities/src/lib.rs b/utils/frame/remote-externalities/src/lib.rs
index 53c44780a682..347cc8d66d91 100644
--- a/utils/frame/remote-externalities/src/lib.rs
+++ b/utils/frame/remote-externalities/src/lib.rs
@@ -107,7 +107,8 @@ impl From<String> for Transport {
 /// A state snapshot config may be present and will be written to in that case.
 #[derive(Clone)]
 pub struct OnlineConfig<B: BlockT> {
-	/// The block hash at which to get the runtime state. Will be latest finalized head if not provided.
+	/// The block hash at which to get the runtime state. Will be latest finalized head if not
+	/// provided.
 	pub at: Option<B::Hash>,
 	/// An optional state snapshot file to WRITE to, not for reading. Not written if set to `None`.
 	pub state_snapshot: Option<SnapshotConfig>,
diff --git a/utils/frame/try-runtime/cli/src/lib.rs b/utils/frame/try-runtime/cli/src/lib.rs
index 4f31bd741b3a..1f1eef70e1b9 100644
--- a/utils/frame/try-runtime/cli/src/lib.rs
+++ b/utils/frame/try-runtime/cli/src/lib.rs
@@ -45,7 +45,8 @@ pub enum Command {
 	OnRuntimeUpgrade(OnRuntimeUpgradeCmd),
 	/// Execute "OffchainWorkerApi_offchain_worker" against the given runtime state.
 	OffchainWorker(OffchainWorkerCmd),
-	/// Execute "Core_execute_block" using the given block and the runtime state of the parent block.
+	/// Execute "Core_execute_block" using the given block and the runtime state of the parent
+	/// block.
 	ExecuteBlock(ExecuteBlockCmd),
 }
 
diff --git a/utils/wasm-builder/src/builder.rs b/utils/wasm-builder/src/builder.rs
index 20f33583b892..113b5eb068da 100644
--- a/utils/wasm-builder/src/builder.rs
+++ b/utils/wasm-builder/src/builder.rs
@@ -215,12 +215,17 @@ fn generate_rerun_if_changed_instructions() {
 /// The current project is determined by using the `CARGO_MANIFEST_DIR` environment variable.
 ///
 /// `file_name` - The name + path of the file being generated. The file contains the
-///               constant `WASM_BINARY`, which contains the built WASM binary.
+/// constant `WASM_BINARY`, which contains the built WASM binary.
+///
 /// `project_cargo_toml` - The path to the `Cargo.toml` of the project that should be built.
+///
 /// `default_rustflags` - Default `RUSTFLAGS` that will always be set for the build.
+///
 /// `features_to_enable` - Features that should be enabled for the project.
-/// `wasm_binary_name` - The optional wasm binary name that is extended with `.compact.compressed.wasm`.
-///                      If `None`, the project name will be used.
+///
+/// `wasm_binary_name` - The optional wasm binary name that is extended with
+///
+/// `.compact.compressed.wasm`. If `None`, the project name will be used.
 fn build_project(
 	file_name: PathBuf,
 	project_cargo_toml: PathBuf,
diff --git a/utils/wasm-builder/src/lib.rs b/utils/wasm-builder/src/lib.rs
index 0bfd4e755014..b13ecc4e4ab3 100644
--- a/utils/wasm-builder/src/lib.rs
+++ b/utils/wasm-builder/src/lib.rs
@@ -17,8 +17,8 @@
 
 //! # Wasm builder is a utility for building a project as a Wasm binary
 //!
-//! The Wasm builder is a tool that integrates the process of building the WASM binary of your project into the main
-//! `cargo` build process.
+//! The Wasm builder is a tool that integrates the process of building the WASM binary of your
+//! project into the main `cargo` build process.
 //!
 //! ## Project setup
 //!
@@ -51,14 +51,14 @@
 //! include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 //! ```
 //!
-//! This will include the generated Wasm binary as two constants `WASM_BINARY` and `WASM_BINARY_BLOATY`.
-//! The former is a compact Wasm binary and the latter is the Wasm binary as being generated by the compiler.
-//! Both variables have `Option<&'static [u8]>` as type.
+//! This will include the generated Wasm binary as two constants `WASM_BINARY` and
+//! `WASM_BINARY_BLOATY`. The former is a compact Wasm binary and the latter is the Wasm binary as
+//! being generated by the compiler. Both variables have `Option<&'static [u8]>` as type.
 //!
 //! ### Feature
 //!
-//! Wasm builder supports to enable cargo features while building the Wasm binary. By default it will
-//! enable all features in the wasm build that are enabled for the native build except the
+//! Wasm builder supports to enable cargo features while building the Wasm binary. By default it
+//! will enable all features in the wasm build that are enabled for the native build except the
 //! `default` and `std` features. Besides that, wasm builder supports the special `runtime-wasm`
 //! feature. This `runtime-wasm` feature will be enabled by the wasm builder when it compiles the
 //! Wasm binary. If this feature is not present, it will not be enabled.
@@ -67,24 +67,26 @@
 //!
 //! By using environment variables, you can configure which Wasm binaries are built and how:
 //!
-//! - `SKIP_WASM_BUILD` - Skips building any Wasm binary. This is useful when only native should be recompiled.
-//!                       If this is the first run and there doesn't exist a Wasm binary, this will set both
-//!                       variables to `None`.
-//! - `WASM_BUILD_TYPE` - Sets the build type for building Wasm binaries. Supported values are `release` or `debug`.
-//!                       By default the build type is equal to the build type used by the main build.
-//! - `FORCE_WASM_BUILD` - Can be set to force a Wasm build. On subsequent calls the value of the variable
-//!                        needs to change. As wasm-builder instructs `cargo` to watch for file changes
-//!                        this environment variable should only be required in certain circumstances.
-//! - `WASM_BUILD_RUSTFLAGS` - Extend `RUSTFLAGS` given to `cargo build` while building the wasm binary.
+//! - `SKIP_WASM_BUILD` - Skips building any Wasm binary. This is useful when only native should be
+//!   recompiled. If this is the first run and there doesn't exist a Wasm binary, this will set both
+//!   variables to `None`.
+//! - `WASM_BUILD_TYPE` - Sets the build type for building Wasm binaries. Supported values are
+//!   `release` or `debug`. By default the build type is equal to the build type used by the main
+//!   build.
+//! - `FORCE_WASM_BUILD` - Can be set to force a Wasm build. On subsequent calls the value of the
+//!   variable needs to change. As wasm-builder instructs `cargo` to watch for file changes this
+//!   environment variable should only be required in certain circumstances.
+//! - `WASM_BUILD_RUSTFLAGS` - Extend `RUSTFLAGS` given to `cargo build` while building the wasm
+//!   binary.
 //! - `WASM_BUILD_NO_COLOR` - Disable color output of the wasm build.
-//! - `WASM_TARGET_DIRECTORY` - Will copy any build Wasm binary to the given directory. The path needs
-//!                            to be absolute.
+//! - `WASM_TARGET_DIRECTORY` - Will copy any build Wasm binary to the given directory. The path
+//!   needs to be absolute.
 //! - `WASM_BUILD_TOOLCHAIN` - The toolchain that should be used to build the Wasm binaries. The
-//!                            format needs to be the same as used by cargo, e.g. `nightly-2020-02-20`.
+//!   format needs to be the same as used by cargo, e.g. `nightly-2020-02-20`.
 //!
-//! Each project can be skipped individually by using the environment variable `SKIP_PROJECT_NAME_WASM_BUILD`.
-//! Where `PROJECT_NAME` needs to be replaced by the name of the cargo project, e.g. `node-runtime` will
-//! be `NODE_RUNTIME`.
+//! Each project can be skipped individually by using the environment variable
+//! `SKIP_PROJECT_NAME_WASM_BUILD`. Where `PROJECT_NAME` needs to be replaced by the name of the
+//! cargo project, e.g. `node-runtime` will be `NODE_RUNTIME`.
 //!
 //! ## Prerequisites:
 //!
@@ -92,9 +94,10 @@
 //!
 //! - rust nightly + `wasm32-unknown-unknown` toolchain
 //!
-//! If a specific rust nightly is installed with `rustup`, it is important that the wasm target is installed
-//! as well. For example if installing the rust nightly from 20.02.2020 using `rustup install nightly-2020-02-20`,
-//! the wasm target needs to be installed as well `rustup target add wasm32-unknown-unknown --toolchain nightly-2020-02-20`.
+//! If a specific rust nightly is installed with `rustup`, it is important that the wasm target is
+//! installed as well. For example if installing the rust nightly from 20.02.2020 using `rustup
+//! install nightly-2020-02-20`, the wasm target needs to be installed as well `rustup target add
+//! wasm32-unknown-unknown --toolchain nightly-2020-02-20`.
 
 use std::{
 	env, fs,
@@ -234,8 +237,8 @@ impl CargoCommand {
 	/// Check if the supplied cargo command is a nightly version
 	fn is_nightly(&self) -> bool {
 		// `RUSTC_BOOTSTRAP` tells a stable compiler to behave like a nightly. So, when this env
-		// variable is set, we can assume that whatever rust compiler we have, it is a nightly compiler.
-		// For "more" information, see:
+		// variable is set, we can assume that whatever rust compiler we have, it is a nightly
+		// compiler. For "more" information, see:
 		// https://github.com/rust-lang/rust/blob/fa0f7d0080d8e7e9eb20aa9cbf8013f96c81287f/src/libsyntax/feature_gate/check.rs#L891
 		env::var("RUSTC_BOOTSTRAP").is_ok() ||
 			self.command()
diff --git a/utils/wasm-builder/src/wasm_project.rs b/utils/wasm-builder/src/wasm_project.rs
index 4824991aca39..868692d341ff 100644
--- a/utils/wasm-builder/src/wasm_project.rs
+++ b/utils/wasm-builder/src/wasm_project.rs
@@ -432,9 +432,9 @@ fn build_project(project: &Path, default_rustflags: &str, cargo_cmd: CargoComman
 		.args(&["rustc", "--target=wasm32-unknown-unknown"])
 		.arg(format!("--manifest-path={}", manifest_path.display()))
 		.env("RUSTFLAGS", rustflags)
-		// Unset the `CARGO_TARGET_DIR` to prevent a cargo deadlock (cargo locks a target dir exclusive).
-		// The runner project is created in `CARGO_TARGET_DIR` and executing it will create a sub target
-		// directory inside of `CARGO_TARGET_DIR`.
+		// Unset the `CARGO_TARGET_DIR` to prevent a cargo deadlock (cargo locks a target dir
+		// exclusive). The runner project is created in `CARGO_TARGET_DIR` and executing it will
+		// create a sub target directory inside of `CARGO_TARGET_DIR`.
 		.env_remove("CARGO_TARGET_DIR")
 		// We don't want to call ourselves recursively
 		.env(crate::SKIP_BUILD_ENV, "");
@@ -642,8 +642,9 @@ fn package_rerun_if_changed(package: &DeduplicatePackage) {
 		.into_iter()
 		.filter_entry(|p| {
 			// Ignore this entry if it is a directory that contains a `Cargo.toml` that is not the
-			// `Cargo.toml` related to the current package. This is done to ignore sub-crates of a crate.
-			// If such a sub-crate is a dependency, it will be processed independently anyway.
+			// `Cargo.toml` related to the current package. This is done to ignore sub-crates of a
+			// crate. If such a sub-crate is a dependency, it will be processed independently
+			// anyway.
 			p.path() == manifest_path || !p.path().is_dir() || !p.path().join("Cargo.toml").exists()
 		})
 		.filter_map(|p| p.ok().map(|p| p.into_path()))

From 09c016ba0a77f00a662dcd6ea76e5a5c777f31f4 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Wed, 11 Aug 2021 17:45:53 +0200
Subject: [PATCH 1077/1194] Multi-Block Election part 0: preparation and some
 cleanup.  (#9442)

* Partially applied

* Everything builds, need to implement compact encoding as well.

* Fix some tests, add a ui test as well.

* Fix everything and everything.

* small nits

* a bunch more rename

* more reorg

* more reorg

* last nit of self-review

* Seemingly fixed the build now

* Fix build

* make it work again

* Update primitives/npos-elections/solution-type/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Update primitives/npos-elections/solution-type/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* nits

* factor out double type

* fix try-build

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
---
 Cargo.lock                                    |  30 +-
 Cargo.toml                                    |   2 +-
 bin/node/runtime/src/lib.rs                   |   7 +-
 .../election-provider-multi-phase/Cargo.toml  |   3 +-
 .../src/benchmarking.rs                       |  48 +-
 .../src/helpers.rs                            |  40 +-
 .../election-provider-multi-phase/src/lib.rs  | 133 +++--
 .../election-provider-multi-phase/src/mock.rs |  26 +-
 .../src/signed.rs                             |  80 ++-
 .../src/unsigned.rs                           | 135 ++---
 primitives/npos-elections/Cargo.toml          |   3 +-
 .../npos-elections/compact/src/assignment.rs  | 161 ------
 primitives/npos-elections/compact/src/lib.rs  | 499 ------------------
 .../{compact => solution-type}/Cargo.toml     |   8 +-
 .../{compact => solution-type}/src/codec.rs   |  60 +--
 .../src/from_assignment_helpers.rs            |  56 ++
 .../src/index_assignment.rs                   |  31 +-
 .../npos-elections/solution-type/src/lib.rs   | 243 +++++++++
 .../solution-type/src/single_page.rs          | 354 +++++++++++++
 .../tests/ui/fail/missing_accuracy.rs         |   2 +-
 .../tests/ui/fail/missing_accuracy.stderr     |   0
 .../tests/ui/fail/missing_target.rs           |   2 +-
 .../tests/ui/fail/missing_target.stderr       |   0
 .../tests/ui/fail/missing_voter.rs            |   2 +-
 .../tests/ui/fail/missing_voter.stderr        |   0
 .../tests/ui/fail/no_annotations.rs           |   2 +-
 .../tests/ui/fail/no_annotations.stderr       |   0
 .../tests/ui/fail/swap_voter_target.rs        |   2 +-
 .../tests/ui/fail/swap_voter_target.stderr    |   0
 .../solution-type/tests/ui/fail/wrong_page.rs |  11 +
 .../tests/ui/fail/wrong_page.stderr           |  38 ++
 primitives/npos-elections/src/assignments.rs  |  14 +-
 primitives/npos-elections/src/lib.rs          | 180 +------
 primitives/npos-elections/src/mock.rs         |  56 +-
 primitives/npos-elections/src/tests.rs        | 308 +++++------
 primitives/npos-elections/src/traits.rs       | 155 ++++++
 36 files changed, 1327 insertions(+), 1364 deletions(-)
 delete mode 100644 primitives/npos-elections/compact/src/assignment.rs
 delete mode 100644 primitives/npos-elections/compact/src/lib.rs
 rename primitives/npos-elections/{compact => solution-type}/Cargo.toml (71%)
 rename primitives/npos-elections/{compact => solution-type}/src/codec.rs (76%)
 create mode 100644 primitives/npos-elections/solution-type/src/from_assignment_helpers.rs
 rename primitives/npos-elections/{compact => solution-type}/src/index_assignment.rs (67%)
 create mode 100644 primitives/npos-elections/solution-type/src/lib.rs
 create mode 100644 primitives/npos-elections/solution-type/src/single_page.rs
 rename primitives/npos-elections/{compact => solution-type}/tests/ui/fail/missing_accuracy.rs (66%)
 rename primitives/npos-elections/{compact => solution-type}/tests/ui/fail/missing_accuracy.stderr (100%)
 rename primitives/npos-elections/{compact => solution-type}/tests/ui/fail/missing_target.rs (65%)
 rename primitives/npos-elections/{compact => solution-type}/tests/ui/fail/missing_target.stderr (100%)
 rename primitives/npos-elections/{compact => solution-type}/tests/ui/fail/missing_voter.rs (66%)
 rename primitives/npos-elections/{compact => solution-type}/tests/ui/fail/missing_voter.stderr (100%)
 rename primitives/npos-elections/{compact => solution-type}/tests/ui/fail/no_annotations.rs (60%)
 rename primitives/npos-elections/{compact => solution-type}/tests/ui/fail/no_annotations.stderr (100%)
 rename primitives/npos-elections/{compact => solution-type}/tests/ui/fail/swap_voter_target.rs (68%)
 rename primitives/npos-elections/{compact => solution-type}/tests/ui/fail/swap_voter_target.stderr (100%)
 create mode 100644 primitives/npos-elections/solution-type/tests/ui/fail/wrong_page.rs
 create mode 100644 primitives/npos-elections/solution-type/tests/ui/fail/wrong_page.stderr
 create mode 100644 primitives/npos-elections/src/traits.rs

diff --git a/Cargo.lock b/Cargo.lock
index 24c0bfc3faf3..bc33d4a5fed9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9141,26 +9141,12 @@ dependencies = [
  "serde",
  "sp-arithmetic",
  "sp-core",
- "sp-npos-elections-compact",
+ "sp-npos-elections-solution-type",
  "sp-runtime",
  "sp-std",
  "substrate-test-utils",
 ]
 
-[[package]]
-name = "sp-npos-elections-compact"
-version = "4.0.0-dev"
-dependencies = [
- "parity-scale-codec",
- "proc-macro-crate 1.0.0",
- "proc-macro2",
- "quote",
- "sp-arithmetic",
- "sp-npos-elections",
- "syn",
- "trybuild",
-]
-
 [[package]]
 name = "sp-npos-elections-fuzzer"
 version = "2.0.0-alpha.5"
@@ -9175,6 +9161,20 @@ dependencies = [
  "structopt",
 ]
 
+[[package]]
+name = "sp-npos-elections-solution-type"
+version = "4.0.0-dev"
+dependencies = [
+ "parity-scale-codec",
+ "proc-macro-crate 1.0.0",
+ "proc-macro2",
+ "quote",
+ "sp-arithmetic",
+ "sp-npos-elections",
+ "syn",
+ "trybuild",
+]
+
 [[package]]
 name = "sp-offchain"
 version = "4.0.0-dev"
diff --git a/Cargo.toml b/Cargo.toml
index 2834344153a8..ec5620e8c3f5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -156,7 +156,7 @@ members = [
 	"primitives/keystore",
 	"primitives/maybe-compressed-blob",
 	"primitives/npos-elections",
-	"primitives/npos-elections/compact",
+	"primitives/npos-elections/solution-type",
 	"primitives/npos-elections/fuzzer",
 	"primitives/offchain",
 	"primitives/panic-handler",
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 7466c940d65d..af16ea0f8aed 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -548,15 +548,14 @@ parameter_types! {
 
 sp_npos_elections::generate_solution_type!(
 	#[compact]
-	pub struct NposCompactSolution16::<
+	pub struct NposSolution16::<
 		VoterIndex = u32,
 		TargetIndex = u16,
 		Accuracy = sp_runtime::PerU16,
 	>(16)
 );
 
-pub const MAX_NOMINATIONS: u32 =
-	<NposCompactSolution16 as sp_npos_elections::CompactSolution>::LIMIT as u32;
+pub const MAX_NOMINATIONS: u32 = <NposSolution16 as sp_npos_elections::NposSolution>::LIMIT as u32;
 
 /// The numbers configured here should always be more than the the maximum limits of staking pallet
 /// to ensure election snapshot will not run out of memory.
@@ -593,7 +592,7 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
 	type RewardHandler = (); // nothing to do upon rewards
 	type DataProvider = Staking;
 	type OnChainAccuracy = Perbill;
-	type CompactSolution = NposCompactSolution16;
+	type Solution = NposSolution16;
 	type Fallback = Fallback;
 	type WeightInfo = pallet_election_provider_multi_phase::weights::SubstrateWeight<Runtime>;
 	type ForceOrigin = EnsureRootOrHalfCouncil;
diff --git a/frame/election-provider-multi-phase/Cargo.toml b/frame/election-provider-multi-phase/Cargo.toml
index c78fba0a569f..74c1a0108412 100644
--- a/frame/election-provider-multi-phase/Cargo.toml
+++ b/frame/election-provider-multi-phase/Cargo.toml
@@ -40,7 +40,7 @@ hex-literal = "0.3.1"
 substrate-test-utils = { version = "4.0.0-dev", path = "../../test-utils" }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
 sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
-sp-npos-elections = { version = "4.0.0-dev", default-features = false, features = [ "mocks" ], path = "../../primitives/npos-elections" }
+sp-npos-elections = { version = "4.0.0-dev", default-features = false, path = "../../primitives/npos-elections" }
 sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
 frame-election-provider-support = { version = "4.0.0-dev", features = ["runtime-benchmarks"], path = "../election-provider-support" }
 pallet-balances = { version = "4.0.0-dev", path = "../balances" }
@@ -67,6 +67,5 @@ std = [
 runtime-benchmarks = [
 	"frame-benchmarking",
 	"rand",
-	"sp-npos-elections/mocks",
 ]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/election-provider-multi-phase/src/benchmarking.rs b/frame/election-provider-multi-phase/src/benchmarking.rs
index cc7d99a85494..da08722a6a24 100644
--- a/frame/election-provider-multi-phase/src/benchmarking.rs
+++ b/frame/election-provider-multi-phase/src/benchmarking.rs
@@ -40,15 +40,15 @@ fn solution_with_size<T: Config>(
 	size: SolutionOrSnapshotSize,
 	active_voters_count: u32,
 	desired_targets: u32,
-) -> Result<RawSolution<CompactOf<T>>, &'static str> {
+) -> Result<RawSolution<SolutionOf<T>>, &'static str> {
 	ensure!(size.targets >= desired_targets, "must have enough targets");
 	ensure!(
-		size.targets >= (<CompactOf<T>>::LIMIT * 2) as u32,
+		size.targets >= (<SolutionOf<T>>::LIMIT * 2) as u32,
 		"must have enough targets for unique votes."
 	);
 	ensure!(size.voters >= active_voters_count, "must have enough voters");
 	ensure!(
-		(<CompactOf<T>>::LIMIT as u32) < desired_targets,
+		(<SolutionOf<T>>::LIMIT as u32) < desired_targets,
 		"must have enough winners to give them votes."
 	);
 
@@ -75,7 +75,7 @@ fn solution_with_size<T: Config>(
 			// chose a random subset of winners.
 			let winner_votes = winners
 				.as_slice()
-				.choose_multiple(&mut rng, <CompactOf<T>>::LIMIT)
+				.choose_multiple(&mut rng, <SolutionOf<T>>::LIMIT)
 				.cloned()
 				.collect::<Vec<_>>();
 			let voter = frame_benchmarking::account::<T::AccountId>("Voter", i, SEED);
@@ -92,7 +92,7 @@ fn solution_with_size<T: Config>(
 	let rest_voters = (active_voters_count..size.voters)
 		.map(|i| {
 			let votes = (&non_winners)
-				.choose_multiple(&mut rng, <CompactOf<T>>::LIMIT)
+				.choose_multiple(&mut rng, <SolutionOf<T>>::LIMIT)
 				.cloned()
 				.collect::<Vec<T::AccountId>>();
 			let voter = frame_benchmarking::account::<T::AccountId>("Voter", i, SEED);
@@ -129,25 +129,25 @@ fn solution_with_size<T: Config>(
 	let assignments = active_voters
 		.iter()
 		.map(|(voter, _stake, votes)| {
-			let percent_per_edge: InnerOf<CompactAccuracyOf<T>> =
+			let percent_per_edge: InnerOf<SolutionAccuracyOf<T>> =
 				(100 / votes.len()).try_into().unwrap_or_else(|_| panic!("failed to convert"));
 			crate::unsigned::Assignment::<T> {
 				who: voter.clone(),
 				distribution: votes
 					.iter()
-					.map(|t| (t.clone(), <CompactAccuracyOf<T>>::from_percent(percent_per_edge)))
+					.map(|t| (t.clone(), <SolutionAccuracyOf<T>>::from_percent(percent_per_edge)))
 					.collect::<Vec<_>>(),
 			}
 		})
 		.collect::<Vec<_>>();
 
-	let compact =
-		<CompactOf<T>>::from_assignment(&assignments, &voter_index, &target_index).unwrap();
-	let score = compact.clone().score(&winners, stake_of, voter_at, target_at).unwrap();
+	let solution =
+		<SolutionOf<T>>::from_assignment(&assignments, &voter_index, &target_index).unwrap();
+	let score = solution.clone().score(&winners, stake_of, voter_at, target_at).unwrap();
 	let round = <MultiPhase<T>>::round();
 
 	assert!(score[0] > 0, "score is zero, this probably means that the stakes are not set.");
-	Ok(RawSolution { compact, score, round })
+	Ok(RawSolution { solution, score, round })
 }
 
 fn set_up_data_provider<T: Config>(v: u32, t: u32) {
@@ -265,7 +265,7 @@ frame_benchmarking::benchmarks! {
 		let v in (T::BenchmarkingConfig::VOTERS[0]) .. T::BenchmarkingConfig::VOTERS[1];
 		// number of targets in snapshot.
 		let t in (T::BenchmarkingConfig::TARGETS[0]) .. T::BenchmarkingConfig::TARGETS[1];
-		// number of assignments, i.e. compact.len(). This means the active nominators, thus must be
+		// number of assignments, i.e. solution.len(). This means the active nominators, thus must be
 		// a subset of `v` component.
 		let a in (T::BenchmarkingConfig::ACTIVE_VOTERS[0]) .. T::BenchmarkingConfig::ACTIVE_VOTERS[1];
 		// number of desired targets. Must be a subset of `t` component.
@@ -308,11 +308,11 @@ frame_benchmarking::benchmarks! {
 
 		let mut signed_submissions = SignedSubmissions::<T>::get();
 		for i in 0..c {
-			let solution = RawSolution {
+			let raw_solution = RawSolution {
 				score: [(10_000_000 + i).into(), 0, 0],
 				..Default::default()
 			};
-			let signed_submission = SignedSubmission { solution, ..Default::default() };
+			let signed_submission = SignedSubmission { raw_solution, ..Default::default() };
 			signed_submissions.insert(signed_submission);
 		}
 		signed_submissions.put();
@@ -330,7 +330,7 @@ frame_benchmarking::benchmarks! {
 		let v in (T::BenchmarkingConfig::VOTERS[0]) .. T::BenchmarkingConfig::VOTERS[1];
 		// number of targets in snapshot.
 		let t in (T::BenchmarkingConfig::TARGETS[0]) .. T::BenchmarkingConfig::TARGETS[1];
-		// number of assignments, i.e. compact.len(). This means the active nominators, thus must be
+		// number of assignments, i.e. solution.len(). This means the active nominators, thus must be
 		// a subset of `v` component.
 		let a in
 			(T::BenchmarkingConfig::ACTIVE_VOTERS[0]) .. T::BenchmarkingConfig::ACTIVE_VOTERS[1];
@@ -369,7 +369,7 @@ frame_benchmarking::benchmarks! {
 		let v in (T::BenchmarkingConfig::VOTERS[0]) .. T::BenchmarkingConfig::VOTERS[1];
 		// number of targets in snapshot.
 		let t in (T::BenchmarkingConfig::TARGETS[0]) .. T::BenchmarkingConfig::TARGETS[1];
-		// number of assignments, i.e. compact.len(). This means the active nominators, thus must be
+		// number of assignments, i.e. solution.len(). This means the active nominators, thus must be
 		// a subset of `v` component.
 		let a in (T::BenchmarkingConfig::ACTIVE_VOTERS[0]) .. T::BenchmarkingConfig::ACTIVE_VOTERS[1];
 		// number of desired targets. Must be a subset of `t` component.
@@ -378,8 +378,8 @@ frame_benchmarking::benchmarks! {
 		let size = SolutionOrSnapshotSize { voters: v, targets: t };
 		let raw_solution = solution_with_size::<T>(size, a, d)?;
 
-		assert_eq!(raw_solution.compact.voter_count() as u32, a);
-		assert_eq!(raw_solution.compact.unique_targets().len() as u32, d);
+		assert_eq!(raw_solution.solution.voter_count() as u32, a);
+		assert_eq!(raw_solution.solution.unique_targets().len() as u32, d);
 
 		// encode the most significant storage item that needs to be decoded in the dispatch.
 		let encoded_snapshot = <MultiPhase<T>>::snapshot().unwrap().encode();
@@ -447,7 +447,7 @@ frame_benchmarking::benchmarks! {
 		let v in (T::BenchmarkingConfig::VOTERS[0]) .. T::BenchmarkingConfig::VOTERS[1];
 		// number of targets in snapshot.
 		let t in (T::BenchmarkingConfig::TARGETS[0]) .. T::BenchmarkingConfig::TARGETS[1];
-		// number of assignments, i.e. compact.len(). This means the active nominators, thus must be
+		// number of assignments, i.e. solution.len(). This means the active nominators, thus must be
 		// a subset of `v` component.
 		let a in
 			(T::BenchmarkingConfig::ACTIVE_VOTERS[0]) .. T::BenchmarkingConfig::ACTIVE_VOTERS[1];
@@ -461,11 +461,11 @@ frame_benchmarking::benchmarks! {
 		// Compute a random solution, then work backwards to get the lists of voters, targets, and
 		// assignments
 		let witness = SolutionOrSnapshotSize { voters: v, targets: t };
-		let RawSolution { compact, .. } = solution_with_size::<T>(witness, a, d)?;
+		let RawSolution { solution, .. } = solution_with_size::<T>(witness, a, d)?;
 		let RoundSnapshot { voters, targets } = MultiPhase::<T>::snapshot().unwrap();
 		let voter_at = helpers::voter_at_fn::<T>(&voters);
 		let target_at = helpers::target_at_fn::<T>(&targets);
-		let mut assignments = compact.into_assignment(voter_at, target_at).unwrap();
+		let mut assignments = solution.into_assignment(voter_at, target_at).unwrap();
 
 		// make a voter cache and some helper functions for access
 		let cache = helpers::generate_voter_cache::<T>(&voters);
@@ -488,7 +488,7 @@ frame_benchmarking::benchmarks! {
 			.unwrap();
 
 		let encoded_size_of = |assignments: &[IndexAssignmentOf<T>]| {
-			CompactOf::<T>::try_from(assignments).map(|compact| compact.encoded_size())
+			SolutionOf::<T>::try_from(assignments).map(|solution| solution.encoded_size())
 		};
 
 		let desired_size = Percent::from_percent(100 - f.saturated_into::<u8>())
@@ -501,8 +501,8 @@ frame_benchmarking::benchmarks! {
 			&encoded_size_of,
 		).unwrap();
 	} verify {
-		let compact = CompactOf::<T>::try_from(index_assignments.as_slice()).unwrap();
-		let encoding = compact.encode();
+		let solution = SolutionOf::<T>::try_from(index_assignments.as_slice()).unwrap();
+		let encoding = solution.encode();
 		log!(
 			trace,
 			"encoded size prediction = {}",
diff --git a/frame/election-provider-multi-phase/src/helpers.rs b/frame/election-provider-multi-phase/src/helpers.rs
index 0abf448a4567..72b1b23f27f3 100644
--- a/frame/election-provider-multi-phase/src/helpers.rs
+++ b/frame/election-provider-multi-phase/src/helpers.rs
@@ -17,7 +17,7 @@
 
 //! Some helper functions/macros for this crate.
 
-use super::{CompactTargetIndexOf, CompactVoterIndexOf, Config, VoteWeight};
+use super::{Config, SolutionTargetIndexOf, SolutionVoterIndexOf, VoteWeight};
 use sp_std::{collections::btree_map::BTreeMap, convert::TryInto, prelude::*};
 
 #[macro_export]
@@ -49,18 +49,18 @@ pub fn generate_voter_cache<T: Config>(
 
 /// Create a function that returns the index of a voter in the snapshot.
 ///
-/// The returning index type is the same as the one defined in `T::CompactSolution::Voter`.
+/// The returning index type is the same as the one defined in `T::Solution::Voter`.
 ///
 /// ## Warning
 ///
 /// Note that this will represent the snapshot data from which the `cache` is generated.
 pub fn voter_index_fn<T: Config>(
 	cache: &BTreeMap<T::AccountId, usize>,
-) -> impl Fn(&T::AccountId) -> Option<CompactVoterIndexOf<T>> + '_ {
+) -> impl Fn(&T::AccountId) -> Option<SolutionVoterIndexOf<T>> + '_ {
 	move |who| {
 		cache
 			.get(who)
-			.and_then(|i| <usize as TryInto<CompactVoterIndexOf<T>>>::try_into(*i).ok())
+			.and_then(|i| <usize as TryInto<SolutionVoterIndexOf<T>>>::try_into(*i).ok())
 	}
 }
 
@@ -70,11 +70,11 @@ pub fn voter_index_fn<T: Config>(
 /// borrowed.
 pub fn voter_index_fn_owned<T: Config>(
 	cache: BTreeMap<T::AccountId, usize>,
-) -> impl Fn(&T::AccountId) -> Option<CompactVoterIndexOf<T>> {
+) -> impl Fn(&T::AccountId) -> Option<SolutionVoterIndexOf<T>> {
 	move |who| {
 		cache
 			.get(who)
-			.and_then(|i| <usize as TryInto<CompactVoterIndexOf<T>>>::try_into(*i).ok())
+			.and_then(|i| <usize as TryInto<SolutionVoterIndexOf<T>>>::try_into(*i).ok())
 	}
 }
 
@@ -98,37 +98,37 @@ pub fn voter_index_fn_usize<T: Config>(
 #[cfg(test)]
 pub fn voter_index_fn_linear<T: Config>(
 	snapshot: &Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)>,
-) -> impl Fn(&T::AccountId) -> Option<CompactVoterIndexOf<T>> + '_ {
+) -> impl Fn(&T::AccountId) -> Option<SolutionVoterIndexOf<T>> + '_ {
 	move |who| {
 		snapshot
 			.iter()
 			.position(|(x, _, _)| x == who)
-			.and_then(|i| <usize as TryInto<CompactVoterIndexOf<T>>>::try_into(i).ok())
+			.and_then(|i| <usize as TryInto<SolutionVoterIndexOf<T>>>::try_into(i).ok())
 	}
 }
 
 /// Create a function that returns the index of a target in the snapshot.
 ///
-/// The returned index type is the same as the one defined in `T::CompactSolution::Target`.
+/// The returned index type is the same as the one defined in `T::Solution::Target`.
 ///
 /// Note: to the extent possible, the returned function should be cached and reused. Producing that
 /// function requires a `O(n log n)` data transform. Each invocation of that function completes
 /// in `O(log n)`.
 pub fn target_index_fn<T: Config>(
 	snapshot: &Vec<T::AccountId>,
-) -> impl Fn(&T::AccountId) -> Option<CompactTargetIndexOf<T>> + '_ {
+) -> impl Fn(&T::AccountId) -> Option<SolutionTargetIndexOf<T>> + '_ {
 	let cache: BTreeMap<_, _> =
 		snapshot.iter().enumerate().map(|(idx, account_id)| (account_id, idx)).collect();
 	move |who| {
 		cache
 			.get(who)
-			.and_then(|i| <usize as TryInto<CompactTargetIndexOf<T>>>::try_into(*i).ok())
+			.and_then(|i| <usize as TryInto<SolutionTargetIndexOf<T>>>::try_into(*i).ok())
 	}
 }
 
 /// Create a function the returns the index to a target in the snapshot.
 ///
-/// The returned index type is the same as the one defined in `T::CompactSolution::Target`.
+/// The returned index type is the same as the one defined in `T::Solution::Target`.
 ///
 /// ## Warning
 ///
@@ -136,34 +136,34 @@ pub fn target_index_fn<T: Config>(
 #[cfg(test)]
 pub fn target_index_fn_linear<T: Config>(
 	snapshot: &Vec<T::AccountId>,
-) -> impl Fn(&T::AccountId) -> Option<CompactTargetIndexOf<T>> + '_ {
+) -> impl Fn(&T::AccountId) -> Option<SolutionTargetIndexOf<T>> + '_ {
 	move |who| {
 		snapshot
 			.iter()
 			.position(|x| x == who)
-			.and_then(|i| <usize as TryInto<CompactTargetIndexOf<T>>>::try_into(i).ok())
+			.and_then(|i| <usize as TryInto<SolutionTargetIndexOf<T>>>::try_into(i).ok())
 	}
 }
 
-/// Create a function that can map a voter index ([`CompactVoterIndexOf`]) to the actual voter
+/// Create a function that can map a voter index ([`SolutionVoterIndexOf`]) to the actual voter
 /// account using a linearly indexible snapshot.
 pub fn voter_at_fn<T: Config>(
 	snapshot: &Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)>,
-) -> impl Fn(CompactVoterIndexOf<T>) -> Option<T::AccountId> + '_ {
+) -> impl Fn(SolutionVoterIndexOf<T>) -> Option<T::AccountId> + '_ {
 	move |i| {
-		<CompactVoterIndexOf<T> as TryInto<usize>>::try_into(i)
+		<SolutionVoterIndexOf<T> as TryInto<usize>>::try_into(i)
 			.ok()
 			.and_then(|i| snapshot.get(i).map(|(x, _, _)| x).cloned())
 	}
 }
 
-/// Create a function that can map a target index ([`CompactTargetIndexOf`]) to the actual target
+/// Create a function that can map a target index ([`SolutionTargetIndexOf`]) to the actual target
 /// account using a linearly indexible snapshot.
 pub fn target_at_fn<T: Config>(
 	snapshot: &Vec<T::AccountId>,
-) -> impl Fn(CompactTargetIndexOf<T>) -> Option<T::AccountId> + '_ {
+) -> impl Fn(SolutionTargetIndexOf<T>) -> Option<T::AccountId> + '_ {
 	move |i| {
-		<CompactTargetIndexOf<T> as TryInto<usize>>::try_into(i)
+		<SolutionTargetIndexOf<T> as TryInto<usize>>::try_into(i)
 			.ok()
 			.and_then(|i| snapshot.get(i).cloned())
 	}
diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index 44a4d66ca4cb..0c7fe170ecbd 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -148,7 +148,7 @@
 //!
 //! The accuracy of the election is configured via two trait parameters. namely,
 //! [`OnChainAccuracyOf`] dictates the accuracy used to compute the on-chain fallback election and
-//! [`CompactAccuracyOf`] is the accuracy that the submitted solutions must adhere to.
+//! [`SolutionAccuracyOf`] is the accuracy that the submitted solutions must adhere to.
 //!
 //! Note that both accuracies are of great importance. The offchain solution should be as small as
 //! possible, reducing solutions size/weight. The on-chain solution can use more space for accuracy,
@@ -212,7 +212,7 @@
 //! there is a tie. Even more harsh should be to enforce the bound of the `reduce` algorithm.
 //!
 //! **Make the number of nominators configurable from the runtime**. Remove `sp_npos_elections`
-//! dependency from staking and the compact solution type. It should be generated at runtime, there
+//! dependency from staking and the solution type. It should be generated at runtime, there
 //! it should be encoded how many votes each nominators have. Essentially translate
 //! <https://github.com/paritytech/substrate/pull/7929> to this pallet.
 //!
@@ -241,7 +241,7 @@ use sp_arithmetic::{
 	UpperOf,
 };
 use sp_npos_elections::{
-	assignment_ratio_to_staked_normalized, CompactSolution, ElectionScore, EvaluateSupport,
+	assignment_ratio_to_staked_normalized, ElectionScore, EvaluateSupport, NposSolution,
 	PerThing128, Supports, VoteWeight,
 };
 use sp_runtime::{
@@ -273,15 +273,15 @@ pub use signed::{
 };
 pub use weights::WeightInfo;
 
-/// The compact solution type used by this crate.
-pub type CompactOf<T> = <T as Config>::CompactSolution;
+/// The solution type used by this crate.
+pub type SolutionOf<T> = <T as Config>::Solution;
 
-/// The voter index. Derived from [`CompactOf`].
-pub type CompactVoterIndexOf<T> = <CompactOf<T> as CompactSolution>::Voter;
-/// The target index. Derived from [`CompactOf`].
-pub type CompactTargetIndexOf<T> = <CompactOf<T> as CompactSolution>::Target;
-/// The accuracy of the election, when submitted from offchain. Derived from [`CompactOf`].
-pub type CompactAccuracyOf<T> = <CompactOf<T> as CompactSolution>::Accuracy;
+/// The voter index. Derived from [`SolutionOf`].
+pub type SolutionVoterIndexOf<T> = <SolutionOf<T> as NposSolution>::VoterIndex;
+/// The target index. Derived from [`SolutionOf`].
+pub type SolutionTargetIndexOf<T> = <SolutionOf<T> as NposSolution>::TargetIndex;
+/// The accuracy of the election, when submitted from offchain. Derived from [`SolutionOf`].
+pub type SolutionAccuracyOf<T> = <SolutionOf<T> as NposSolution>::Accuracy;
 /// The accuracy of the election, when computed on-chain. Equal to [`Config::OnChainAccuracy`].
 pub type OnChainAccuracyOf<T> = <T as Config>::OnChainAccuracy;
 
@@ -422,11 +422,11 @@ impl Default for ElectionCompute {
 /// This is what will get submitted to the chain.
 ///
 /// Such a solution should never become effective in anyway before being checked by the
-/// `Pallet::feasibility_check`
+/// `Pallet::feasibility_check`.
 #[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, PartialOrd, Ord)]
-pub struct RawSolution<C> {
-	/// Compact election edges.
-	pub compact: C,
+pub struct RawSolution<S> {
+	/// the solution itself.
+	pub solution: S,
 	/// The _claimed_ score of the solution.
 	pub score: ElectionScore,
 	/// The round at which this solution should be submitted.
@@ -436,7 +436,7 @@ pub struct RawSolution<C> {
 impl<C: Default> Default for RawSolution<C> {
 	fn default() -> Self {
 		// Round 0 is always invalid, only set this to 1.
-		Self { round: 1, compact: Default::default(), score: Default::default() }
+		Self { round: 1, solution: Default::default(), score: Default::default() }
 	}
 }
 
@@ -651,15 +651,15 @@ pub mod pallet {
 		/// Something that will provide the election data.
 		type DataProvider: ElectionDataProvider<Self::AccountId, Self::BlockNumber>;
 
-		/// The compact solution type
-		type CompactSolution: codec::Codec
+		/// The solution type.
+		type Solution: codec::Codec
 			+ Default
 			+ PartialEq
 			+ Eq
 			+ Clone
 			+ sp_std::fmt::Debug
 			+ Ord
-			+ CompactSolution;
+			+ NposSolution;
 
 		/// Accuracy used for fallback on-chain election.
 		type OnChainAccuracy: PerThing128;
@@ -790,12 +790,12 @@ pub mod pallet {
 			use sp_std::mem::size_of;
 			// The index type of both voters and targets need to be smaller than that of usize (very
 			// unlikely to be the case, but anyhow).
-			assert!(size_of::<CompactVoterIndexOf<T>>() <= size_of::<usize>());
-			assert!(size_of::<CompactTargetIndexOf<T>>() <= size_of::<usize>());
+			assert!(size_of::<SolutionVoterIndexOf<T>>() <= size_of::<usize>());
+			assert!(size_of::<SolutionTargetIndexOf<T>>() <= size_of::<usize>());
 
 			// ----------------------------
 			// Based on the requirements of [`sp_npos_elections::Assignment::try_normalize`].
-			let max_vote: usize = <CompactOf<T> as CompactSolution>::LIMIT;
+			let max_vote: usize = <SolutionOf<T> as NposSolution>::LIMIT;
 
 			// 1. Maximum sum of [ChainAccuracy; 16] must fit into `UpperOf<ChainAccuracy>`..
 			let maximum_chain_accuracy: Vec<UpperOf<OnChainAccuracyOf<T>>> = (0..max_vote)
@@ -809,26 +809,26 @@ pub mod pallet {
 				.iter()
 				.fold(Zero::zero(), |acc, x| acc.checked_add(x).unwrap());
 
-			// 2. Maximum sum of [CompactAccuracy; 16] must fit into `UpperOf<OffchainAccuracy>`.
-			let maximum_chain_accuracy: Vec<UpperOf<CompactAccuracyOf<T>>> = (0..max_vote)
+			// 2. Maximum sum of [SolutionAccuracy; 16] must fit into `UpperOf<OffchainAccuracy>`.
+			let maximum_chain_accuracy: Vec<UpperOf<SolutionAccuracyOf<T>>> = (0..max_vote)
 				.map(|_| {
-					<UpperOf<CompactAccuracyOf<T>>>::from(
-						<CompactAccuracyOf<T>>::one().deconstruct(),
+					<UpperOf<SolutionAccuracyOf<T>>>::from(
+						<SolutionAccuracyOf<T>>::one().deconstruct(),
 					)
 				})
 				.collect();
-			let _: UpperOf<CompactAccuracyOf<T>> = maximum_chain_accuracy
+			let _: UpperOf<SolutionAccuracyOf<T>> = maximum_chain_accuracy
 				.iter()
 				.fold(Zero::zero(), |acc, x| acc.checked_add(x).unwrap());
 
 			// We only accept data provider who's maximum votes per voter matches our
-			// `T::CompactSolution`'s `LIMIT`.
+			// `T::Solution`'s `LIMIT`.
 			//
-			// NOTE that this pallet does not really need to enforce this in runtime. The compact
+			// NOTE that this pallet does not really need to enforce this in runtime. The
 			// solution cannot represent any voters more than `LIMIT` anyhow.
 			assert_eq!(
 				<T::DataProvider as ElectionDataProvider<T::AccountId, T::BlockNumber>>::MAXIMUM_VOTES_PER_VOTER,
-				<CompactOf<T> as CompactSolution>::LIMIT as u32,
+				<SolutionOf<T> as NposSolution>::LIMIT as u32,
 			);
 		}
 	}
@@ -853,14 +853,14 @@ pub mod pallet {
 			T::WeightInfo::submit_unsigned(
 				witness.voters,
 				witness.targets,
-				solution.compact.voter_count() as u32,
-				solution.compact.unique_targets().len() as u32
+				raw_solution.solution.voter_count() as u32,
+				raw_solution.solution.unique_targets().len() as u32
 			),
 			DispatchClass::Operational,
 		))]
 		pub fn submit_unsigned(
 			origin: OriginFor<T>,
-			solution: Box<RawSolution<CompactOf<T>>>,
+			raw_solution: Box<RawSolution<SolutionOf<T>>>,
 			witness: SolutionOrSnapshotSize,
 		) -> DispatchResultWithPostInfo {
 			ensure_none(origin)?;
@@ -868,7 +868,7 @@ pub mod pallet {
 				 deprive validator from their authoring reward.";
 
 			// Check score being an improvement, phase, and desired targets.
-			Self::unsigned_pre_dispatch_checks(&solution).expect(error_message);
+			Self::unsigned_pre_dispatch_checks(&raw_solution).expect(error_message);
 
 			// Ensure witness was correct.
 			let SolutionOrSnapshotSize { voters, targets } =
@@ -878,8 +878,8 @@ pub mod pallet {
 			assert!(voters as u32 == witness.voters, "{}", error_message);
 			assert!(targets as u32 == witness.targets, "{}", error_message);
 
-			let ready =
-				Self::feasibility_check(*solution, ElectionCompute::Unsigned).expect(error_message);
+			let ready = Self::feasibility_check(*raw_solution, ElectionCompute::Unsigned)
+				.expect(error_message);
 
 			// Store the newly received solution.
 			log!(info, "queued unsigned solution with score {:?}", ready.score);
@@ -950,7 +950,7 @@ pub mod pallet {
 		#[pallet::weight(T::WeightInfo::submit(*num_signed_submissions))]
 		pub fn submit(
 			origin: OriginFor<T>,
-			solution: Box<RawSolution<CompactOf<T>>>,
+			raw_solution: Box<RawSolution<SolutionOf<T>>>,
 			num_signed_submissions: u32,
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
@@ -973,20 +973,20 @@ pub mod pallet {
 			let size = Self::snapshot_metadata().ok_or(Error::<T>::MissingSnapshotMetadata)?;
 
 			ensure!(
-				Self::feasibility_weight_of(&solution, size) < T::SignedMaxWeight::get(),
+				Self::feasibility_weight_of(&raw_solution, size) < T::SignedMaxWeight::get(),
 				Error::<T>::SignedTooMuchWeight,
 			);
 
 			// create the submission
-			let deposit = Self::deposit_for(&solution, size);
+			let deposit = Self::deposit_for(&raw_solution, size);
 			let reward = {
-				let call = Call::submit(solution.clone(), num_signed_submissions);
+				let call = Call::submit(raw_solution.clone(), num_signed_submissions);
 				let call_fee = T::EstimateCallFee::estimate_call_fee(&call, None.into());
 				T::SignedRewardBase::get().saturating_add(call_fee)
 			};
 
 			let submission =
-				SignedSubmission { who: who.clone(), deposit, solution: *solution, reward };
+				SignedSubmission { who: who.clone(), deposit, raw_solution: *raw_solution, reward };
 
 			// insert the submission if the queue has space or it's better than the weakest
 			// eject the weakest if the queue was full
@@ -1299,8 +1299,8 @@ impl<T: Config> Pallet<T> {
 	///
 	/// Returns `Ok(consumed_weight)` if operation is okay.
 	pub fn create_snapshot() -> Result<Weight, ElectionError> {
-		let target_limit = <CompactTargetIndexOf<T>>::max_value().saturated_into::<usize>();
-		let voter_limit = <CompactVoterIndexOf<T>>::max_value().saturated_into::<usize>();
+		let target_limit = <SolutionTargetIndexOf<T>>::max_value().saturated_into::<usize>();
+		let voter_limit = <SolutionVoterIndexOf<T>>::max_value().saturated_into::<usize>();
 
 		let (targets, w1) =
 			T::DataProvider::targets(Some(target_limit)).map_err(ElectionError::DataProvider)?;
@@ -1353,16 +1353,16 @@ impl<T: Config> Pallet<T> {
 
 	/// Checks the feasibility of a solution.
 	pub fn feasibility_check(
-		solution: RawSolution<CompactOf<T>>,
+		raw_solution: RawSolution<SolutionOf<T>>,
 		compute: ElectionCompute,
 	) -> Result<ReadySolution<T::AccountId>, FeasibilityError> {
-		let RawSolution { compact, score, round } = solution;
+		let RawSolution { solution, score, round } = raw_solution;
 
 		// First, check round.
 		ensure!(Self::round() == round, FeasibilityError::InvalidRound);
 
 		// Winners are not directly encoded in the solution.
-		let winners = compact.unique_targets();
+		let winners = solution.unique_targets();
 
 		let desired_targets =
 			Self::desired_targets().ok_or(FeasibilityError::SnapshotUnavailable)?;
@@ -1373,7 +1373,7 @@ impl<T: Config> Pallet<T> {
 		ensure!(winners.len() as u32 == desired_targets, FeasibilityError::WrongWinnerCount);
 
 		// Ensure that the solution's score can pass absolute min-score.
-		let submitted_score = solution.score.clone();
+		let submitted_score = raw_solution.score.clone();
 		ensure!(
 			Self::minimum_untrusted_score().map_or(true, |min_score| {
 				sp_npos_elections::is_score_better(submitted_score, min_score, Perbill::zero())
@@ -1394,15 +1394,15 @@ impl<T: Config> Pallet<T> {
 		// First, make sure that all the winners are sane.
 		// OPTIMIZATION: we could first build the assignments, and then extract the winners directly
 		// from that, as that would eliminate a little bit of duplicate work. For now, we keep them
-		// separate: First extract winners separately from compact, and then assignments. This is
+		// separate: First extract winners separately from solution, and then assignments. This is
 		// also better, because we can reject solutions that don't meet `desired_targets` early on.
 		let winners = winners
 			.into_iter()
 			.map(|i| target_at(i).ok_or(FeasibilityError::InvalidWinner))
 			.collect::<Result<Vec<T::AccountId>, FeasibilityError>>()?;
 
-		// Then convert compact -> assignment. This will fail if any of the indices are gibberish.
-		let assignments = compact
+		// Then convert solution -> assignment. This will fail if any of the indices are gibberish.
+		let assignments = solution
 			.into_assignment(voter_at, target_at)
 			.map_err::<FeasibilityError, _>(Into::into)?;
 
@@ -1413,7 +1413,7 @@ impl<T: Config> Pallet<T> {
 				// Check that assignment.who is actually a voter (defensive-only).
 				// NOTE: while using the index map from `voter_index` is better than a blind linear
 				// search, this *still* has room for optimization. Note that we had the index when
-				// we did `compact -> assignment` and we lost it. Ideal is to keep the index around.
+				// we did `solution -> assignment` and we lost it. Ideal is to keep the index around.
 
 				// Defensive-only: must exist in the snapshot.
 				let snapshot_index =
@@ -1438,7 +1438,7 @@ impl<T: Config> Pallet<T> {
 			.map_err::<FeasibilityError, _>(Into::into)?;
 
 		// This might fail if one of the voter edges is pointing to a non-winner, which is not
-		// really possible anymore because all the winners come from the same `compact`.
+		// really possible anymore because all the winners come from the same `solution`.
 		let supports = sp_npos_elections::to_supports(&winners, &staked_assignments)
 			.map_err::<FeasibilityError, _>(Into::into)?;
 
@@ -1611,13 +1611,13 @@ mod feasibility_check {
 			roll_to(<EpochLength>::get() - <SignedPhase>::get() - <UnsignedPhase>::get());
 			assert!(MultiPhase::current_phase().is_signed());
 
-			let solution = raw_solution();
+			let raw = raw_solution();
 
-			assert_eq!(solution.compact.unique_targets().len(), 4);
+			assert_eq!(raw.solution.unique_targets().len(), 4);
 			assert_eq!(MultiPhase::desired_targets().unwrap(), 8);
 
 			assert_noop!(
-				MultiPhase::feasibility_check(solution, COMPUTE),
+				MultiPhase::feasibility_check(raw, COMPUTE),
 				FeasibilityError::WrongWinnerCount,
 			);
 		})
@@ -1629,20 +1629,19 @@ mod feasibility_check {
 			roll_to(<EpochLength>::get() - <SignedPhase>::get() - <UnsignedPhase>::get());
 			assert!(MultiPhase::current_phase().is_signed());
 
-			let mut solution = raw_solution();
+			let mut raw = raw_solution();
 			assert_eq!(MultiPhase::snapshot().unwrap().targets.len(), 4);
 			// ----------------------------------------------------^^ valid range is [0..3].
 
-			// Swap all votes from 3 to 4. This will ensure that the number of unique winners
-			// will still be 4, but one of the indices will be gibberish. Requirement is to make
-			// sure 3 a winner, which we don't do here.
-			solution
-				.compact
+			// Swap all votes from 3 to 4. This will ensure that the number of unique winners will
+			// still be 4, but one of the indices will be gibberish. Requirement is to make sure 3 a
+			// winner, which we don't do here.
+			raw.solution
 				.votes1
 				.iter_mut()
 				.filter(|(_, t)| *t == TargetIndex::from(3u16))
 				.for_each(|(_, t)| *t += 1);
-			solution.compact.votes2.iter_mut().for_each(|(_, (t0, _), t1)| {
+			raw.solution.votes2.iter_mut().for_each(|(_, [(t0, _)], t1)| {
 				if *t0 == TargetIndex::from(3u16) {
 					*t0 += 1
 				};
@@ -1651,7 +1650,7 @@ mod feasibility_check {
 				};
 			});
 			assert_noop!(
-				MultiPhase::feasibility_check(solution, COMPUTE),
+				MultiPhase::feasibility_check(raw, COMPUTE),
 				FeasibilityError::InvalidWinner
 			);
 		})
@@ -1659,7 +1658,7 @@ mod feasibility_check {
 
 	#[test]
 	fn voter_indices() {
-		// Should be caught in `compact.into_assignment`.
+		// Should be caught in `solution.into_assignment`.
 		ExtBuilder::default().desired_targets(2).build_and_execute(|| {
 			roll_to(<EpochLength>::get() - <SignedPhase>::get() - <UnsignedPhase>::get());
 			assert!(MultiPhase::current_phase().is_signed());
@@ -1671,7 +1670,7 @@ mod feasibility_check {
 			// Check that there is an index 7 in votes1, and flip to 8.
 			assert!(
 				solution
-					.compact
+					.solution
 					.votes1
 					.iter_mut()
 					.filter(|(v, _)| *v == VoterIndex::from(7u32))
@@ -1680,7 +1679,7 @@ mod feasibility_check {
 			);
 			assert_noop!(
 				MultiPhase::feasibility_check(solution, COMPUTE),
-				FeasibilityError::NposElection(sp_npos_elections::Error::CompactInvalidIndex),
+				FeasibilityError::NposElection(sp_npos_elections::Error::SolutionInvalidIndex),
 			);
 		})
 	}
@@ -1699,7 +1698,7 @@ mod feasibility_check {
 			// vote. Then, change the vote to 2 (30).
 			assert_eq!(
 				solution
-					.compact
+					.solution
 					.votes1
 					.iter_mut()
 					.filter(|(v, t)| *v == 7 && *t == 3)
diff --git a/frame/election-provider-multi-phase/src/mock.rs b/frame/election-provider-multi-phase/src/mock.rs
index 94fdb4559027..f760676abf76 100644
--- a/frame/election-provider-multi-phase/src/mock.rs
+++ b/frame/election-provider-multi-phase/src/mock.rs
@@ -31,7 +31,7 @@ use sp_core::{
 };
 use sp_npos_elections::{
 	assignment_ratio_to_staked_normalized, seq_phragmen, to_supports, to_without_backing,
-	CompactSolution, ElectionResult, EvaluateSupport,
+	ElectionResult, EvaluateSupport, NposSolution,
 };
 use sp_runtime::{
 	testing::Header,
@@ -63,7 +63,7 @@ pub(crate) type TargetIndex = u16;
 
 sp_npos_elections::generate_solution_type!(
 	#[compact]
-	pub struct TestCompact::<VoterIndex = VoterIndex, TargetIndex = TargetIndex, Accuracy = PerU16>(16)
+	pub struct TestNposSolution::<VoterIndex = VoterIndex, TargetIndex = TargetIndex, Accuracy = PerU16>(16)
 );
 
 /// All events of this pallet.
@@ -101,7 +101,7 @@ pub struct TrimHelpers {
 	pub voter_index: Box<
 		dyn Fn(
 			&<Runtime as frame_system::Config>::AccountId,
-		) -> Option<CompactVoterIndexOf<Runtime>>,
+		) -> Option<SolutionVoterIndexOf<Runtime>>,
 	>,
 }
 
@@ -113,11 +113,11 @@ pub fn trim_helpers() -> TrimHelpers {
 	let stakes: std::collections::HashMap<_, _> =
 		voters.iter().map(|(id, stake, _)| (*id, *stake)).collect();
 
-	// Compute the size of a compact solution comprised of the selected arguments.
+	// Compute the size of a solution comprised of the selected arguments.
 	//
 	// This function completes in `O(edges)`; it's expensive, but linear.
 	let encoded_size_of = Box::new(|assignments: &[IndexAssignmentOf<Runtime>]| {
-		CompactOf::<Runtime>::try_from(assignments).map(|compact| compact.encoded_size())
+		SolutionOf::<Runtime>::try_from(assignments).map(|s| s.encoded_size())
 	});
 	let cache = helpers::generate_voter_cache::<Runtime>(&voters);
 	let voter_index = helpers::voter_index_fn_owned::<Runtime>(cache);
@@ -125,7 +125,7 @@ pub fn trim_helpers() -> TrimHelpers {
 
 	let desired_targets = MultiPhase::desired_targets().unwrap();
 
-	let ElectionResult { mut assignments, .. } = seq_phragmen::<_, CompactAccuracyOf<Runtime>>(
+	let ElectionResult { mut assignments, .. } = seq_phragmen::<_, SolutionAccuracyOf<Runtime>>(
 		desired_targets as usize,
 		targets.clone(),
 		voters.clone(),
@@ -153,11 +153,11 @@ pub fn trim_helpers() -> TrimHelpers {
 /// Spit out a verifiable raw solution.
 ///
 /// This is a good example of what an offchain miner would do.
-pub fn raw_solution() -> RawSolution<CompactOf<Runtime>> {
+pub fn raw_solution() -> RawSolution<SolutionOf<Runtime>> {
 	let RoundSnapshot { voters, targets } = MultiPhase::snapshot().unwrap();
 	let desired_targets = MultiPhase::desired_targets().unwrap();
 
-	let ElectionResult { winners, assignments } = seq_phragmen::<_, CompactAccuracyOf<Runtime>>(
+	let ElectionResult { winners, assignments } = seq_phragmen::<_, SolutionAccuracyOf<Runtime>>(
 		desired_targets as usize,
 		targets.clone(),
 		voters.clone(),
@@ -177,11 +177,11 @@ pub fn raw_solution() -> RawSolution<CompactOf<Runtime>> {
 		let staked = assignment_ratio_to_staked_normalized(assignments.clone(), &stake_of).unwrap();
 		to_supports(&winners, &staked).unwrap().evaluate()
 	};
-	let compact =
-		<CompactOf<Runtime>>::from_assignment(&assignments, &voter_index, &target_index).unwrap();
+	let solution =
+		<SolutionOf<Runtime>>::from_assignment(&assignments, &voter_index, &target_index).unwrap();
 
 	let round = MultiPhase::round();
-	RawSolution { compact, score, round }
+	RawSolution { solution, score, round }
 }
 
 pub fn witness() -> SolutionOrSnapshotSize {
@@ -378,7 +378,7 @@ impl crate::Config for Runtime {
 	type OnChainAccuracy = Perbill;
 	type Fallback = Fallback;
 	type ForceOrigin = frame_system::EnsureRoot<AccountId>;
-	type CompactSolution = TestCompact;
+	type Solution = TestNposSolution;
 }
 
 impl<LocalCall> frame_system::offchain::SendTransactionTypes<LocalCall> for Runtime
@@ -396,7 +396,7 @@ pub struct ExtBuilder {}
 
 pub struct StakingMock;
 impl ElectionDataProvider<AccountId, u64> for StakingMock {
-	const MAXIMUM_VOTES_PER_VOTER: u32 = <TestCompact as CompactSolution>::LIMIT as u32;
+	const MAXIMUM_VOTES_PER_VOTER: u32 = <TestNposSolution as NposSolution>::LIMIT as u32;
 	fn targets(maybe_max_len: Option<usize>) -> data_provider::Result<(Vec<AccountId>, Weight)> {
 		let targets = Targets::get();
 
diff --git a/frame/election-provider-multi-phase/src/signed.rs b/frame/election-provider-multi-phase/src/signed.rs
index 6d491b9d7149..39d2e37765a3 100644
--- a/frame/election-provider-multi-phase/src/signed.rs
+++ b/frame/election-provider-multi-phase/src/signed.rs
@@ -18,8 +18,8 @@
 //! The signed phase implementation.
 
 use crate::{
-	CompactOf, Config, ElectionCompute, Pallet, QueuedSolution, RawSolution, ReadySolution,
-	SignedSubmissionIndices, SignedSubmissionNextIndex, SignedSubmissionsMap,
+	Config, ElectionCompute, Pallet, QueuedSolution, RawSolution, ReadySolution,
+	SignedSubmissionIndices, SignedSubmissionNextIndex, SignedSubmissionsMap, SolutionOf,
 	SolutionOrSnapshotSize, Weight, WeightInfo,
 };
 use codec::{Decode, Encode, HasCompact};
@@ -29,7 +29,7 @@ use frame_support::{
 	DebugNoBound,
 };
 use sp_arithmetic::traits::SaturatedConversion;
-use sp_npos_elections::{is_score_better, CompactSolution, ElectionScore};
+use sp_npos_elections::{is_score_better, ElectionScore, NposSolution};
 use sp_runtime::{
 	traits::{Saturating, Zero},
 	RuntimeDebug,
@@ -44,42 +44,40 @@ use sp_std::{
 ///
 /// This is just a wrapper around [`RawSolution`] and some additional info.
 #[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, Default)]
-pub struct SignedSubmission<AccountId, Balance: HasCompact, CompactSolution> {
+pub struct SignedSubmission<AccountId, Balance: HasCompact, Solution> {
 	/// Who submitted this solution.
 	pub who: AccountId,
 	/// The deposit reserved for storing this solution.
 	pub deposit: Balance,
 	/// The raw solution itself.
-	pub solution: RawSolution<CompactSolution>,
+	pub raw_solution: RawSolution<Solution>,
 	/// The reward that should potentially be paid for this solution, if accepted.
 	pub reward: Balance,
 }
 
-impl<AccountId, Balance, CompactSolution> Ord
-	for SignedSubmission<AccountId, Balance, CompactSolution>
+impl<AccountId, Balance, Solution> Ord for SignedSubmission<AccountId, Balance, Solution>
 where
 	AccountId: Ord,
 	Balance: Ord + HasCompact,
-	CompactSolution: Ord,
-	RawSolution<CompactSolution>: Ord,
+	Solution: Ord,
+	RawSolution<Solution>: Ord,
 {
 	fn cmp(&self, other: &Self) -> Ordering {
-		self.solution
+		self.raw_solution
 			.score
-			.cmp(&other.solution.score)
-			.then_with(|| self.solution.cmp(&other.solution))
+			.cmp(&other.raw_solution.score)
+			.then_with(|| self.raw_solution.cmp(&other.raw_solution))
 			.then_with(|| self.deposit.cmp(&other.deposit))
 			.then_with(|| self.who.cmp(&other.who))
 	}
 }
 
-impl<AccountId, Balance, CompactSolution> PartialOrd
-	for SignedSubmission<AccountId, Balance, CompactSolution>
+impl<AccountId, Balance, Solution> PartialOrd for SignedSubmission<AccountId, Balance, Solution>
 where
 	AccountId: Ord,
 	Balance: Ord + HasCompact,
-	CompactSolution: Ord,
-	RawSolution<CompactSolution>: Ord,
+	Solution: Ord,
+	RawSolution<Solution>: Ord,
 {
 	fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
 		Some(self.cmp(other))
@@ -95,7 +93,7 @@ pub type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<
 	<T as frame_system::Config>::AccountId,
 >>::NegativeImbalance;
 pub type SignedSubmissionOf<T> =
-	SignedSubmission<<T as frame_system::Config>::AccountId, BalanceOf<T>, CompactOf<T>>;
+	SignedSubmission<<T as frame_system::Config>::AccountId, BalanceOf<T>, SolutionOf<T>>;
 
 pub type SubmissionIndicesOf<T> =
 	BoundedBTreeMap<ElectionScore, u32, <T as Config>::SignedMaxSubmissions>;
@@ -270,13 +268,13 @@ impl<T: Config> SignedSubmissions<T> {
 		// verify the expectation that we never reuse an index
 		debug_assert!(!self.indices.values().any(|&idx| idx == self.next_idx));
 
-		let weakest = match self.indices.try_insert(submission.solution.score, self.next_idx) {
+		let weakest = match self.indices.try_insert(submission.raw_solution.score, self.next_idx) {
 			Ok(Some(prev_idx)) => {
 				// a submission of equal score was already present in the set;
 				// no point editing the actual backing map as we know that the newer solution can't
 				// be better than the old. However, we do need to put the old value back.
 				self.indices
-					.try_insert(submission.solution.score, prev_idx)
+					.try_insert(submission.raw_solution.score, prev_idx)
 					.expect("didn't change the map size; qed");
 				return InsertResult::NotInserted
 			},
@@ -354,8 +352,8 @@ impl<T: Config> Pallet<T> {
 			Self::snapshot_metadata().unwrap_or_default();
 
 		while let Some(best) = all_submissions.pop_last() {
-			let SignedSubmission { solution, who, deposit, reward } = best;
-			let active_voters = solution.compact.voter_count() as u32;
+			let SignedSubmission { raw_solution, who, deposit, reward } = best;
+			let active_voters = raw_solution.solution.voter_count() as u32;
 			let feasibility_weight = {
 				// defensive only: at the end of signed phase, snapshot will exits.
 				let desired_targets = Self::desired_targets().unwrap_or_default();
@@ -363,7 +361,7 @@ impl<T: Config> Pallet<T> {
 			};
 			// the feasibility check itself has some weight
 			weight = weight.saturating_add(feasibility_weight);
-			match Self::feasibility_check(solution, ElectionCompute::Signed) {
+			match Self::feasibility_check(raw_solution, ElectionCompute::Signed) {
 				Ok(ready_solution) => {
 					Self::finalize_signed_phase_accept_solution(
 						ready_solution,
@@ -447,14 +445,14 @@ impl<T: Config> Pallet<T> {
 
 	/// The feasibility weight of the given raw solution.
 	pub fn feasibility_weight_of(
-		solution: &RawSolution<CompactOf<T>>,
+		raw_solution: &RawSolution<SolutionOf<T>>,
 		size: SolutionOrSnapshotSize,
 	) -> Weight {
 		T::WeightInfo::feasibility_check(
 			size.voters,
 			size.targets,
-			solution.compact.voter_count() as u32,
-			solution.compact.unique_targets().len() as u32,
+			raw_solution.solution.voter_count() as u32,
+			raw_solution.solution.unique_targets().len() as u32,
 		)
 	}
 
@@ -466,12 +464,12 @@ impl<T: Config> Pallet<T> {
 	/// 2. a per-byte deposit, for renting the state usage.
 	/// 3. a per-weight deposit, for the potential weight usage in an upcoming on_initialize
 	pub fn deposit_for(
-		solution: &RawSolution<CompactOf<T>>,
+		raw_solution: &RawSolution<SolutionOf<T>>,
 		size: SolutionOrSnapshotSize,
 	) -> BalanceOf<T> {
-		let encoded_len: u32 = solution.encoded_size().saturated_into();
+		let encoded_len: u32 = raw_solution.encoded_size().saturated_into();
 		let encoded_len: BalanceOf<T> = encoded_len.into();
-		let feasibility_weight = Self::feasibility_weight_of(solution, size);
+		let feasibility_weight = Self::feasibility_weight_of(raw_solution, size);
 
 		let len_deposit = T::SignedDepositByte::get().saturating_mul(encoded_len);
 		let weight_deposit =
@@ -497,7 +495,7 @@ mod tests {
 
 	fn submit_with_witness(
 		origin: Origin,
-		solution: RawSolution<CompactOf<Runtime>>,
+		solution: RawSolution<SolutionOf<Runtime>>,
 	) -> DispatchResult {
 		MultiPhase::submit(
 			origin,
@@ -663,7 +661,7 @@ mod tests {
 			assert_eq!(
 				MultiPhase::signed_submissions()
 					.iter()
-					.map(|s| s.solution.score[0])
+					.map(|s| s.raw_solution.score[0])
 					.collect::<Vec<_>>(),
 				vec![5, 6, 7, 8, 9]
 			);
@@ -676,7 +674,7 @@ mod tests {
 			assert_eq!(
 				MultiPhase::signed_submissions()
 					.iter()
-					.map(|s| s.solution.score[0])
+					.map(|s| s.raw_solution.score[0])
 					.collect::<Vec<_>>(),
 				vec![6, 7, 8, 9, 20]
 			);
@@ -701,7 +699,7 @@ mod tests {
 			assert_eq!(
 				MultiPhase::signed_submissions()
 					.iter()
-					.map(|s| s.solution.score[0])
+					.map(|s| s.raw_solution.score[0])
 					.collect::<Vec<_>>(),
 				vec![4, 6, 7, 8, 9],
 			);
@@ -714,7 +712,7 @@ mod tests {
 			assert_eq!(
 				MultiPhase::signed_submissions()
 					.iter()
-					.map(|s| s.solution.score[0])
+					.map(|s| s.raw_solution.score[0])
 					.collect::<Vec<_>>(),
 				vec![5, 6, 7, 8, 9],
 			);
@@ -759,7 +757,7 @@ mod tests {
 			assert_eq!(
 				MultiPhase::signed_submissions()
 					.iter()
-					.map(|s| s.solution.score[0])
+					.map(|s| s.raw_solution.score[0])
 					.collect::<Vec<_>>(),
 				vec![5, 6, 7]
 			);
@@ -828,33 +826,33 @@ mod tests {
 				roll_to(15);
 				assert!(MultiPhase::current_phase().is_signed());
 
-				let (solution, witness) = MultiPhase::mine_solution(2).unwrap();
+				let (raw, witness) = MultiPhase::mine_solution(2).unwrap();
 				let solution_weight = <Runtime as Config>::WeightInfo::feasibility_check(
 					witness.voters,
 					witness.targets,
-					solution.compact.voter_count() as u32,
-					solution.compact.unique_targets().len() as u32,
+					raw.solution.voter_count() as u32,
+					raw.solution.unique_targets().len() as u32,
 				);
 				// default solution will have 5 edges (5 * 5 + 10)
 				assert_eq!(solution_weight, 35);
-				assert_eq!(solution.compact.voter_count(), 5);
+				assert_eq!(raw.solution.voter_count(), 5);
 				assert_eq!(<Runtime as Config>::SignedMaxWeight::get(), 40);
 
-				assert_ok!(submit_with_witness(Origin::signed(99), solution.clone()));
+				assert_ok!(submit_with_witness(Origin::signed(99), raw.clone()));
 
 				<SignedMaxWeight>::set(30);
 
 				// note: resubmitting the same solution is technically okay as long as the queue has
 				// space.
 				assert_noop!(
-					submit_with_witness(Origin::signed(99), solution),
+					submit_with_witness(Origin::signed(99), raw),
 					Error::<Runtime>::SignedTooMuchWeight,
 				);
 			})
 	}
 
 	#[test]
-	fn insufficient_deposit_doesnt_store_submission() {
+	fn insufficient_deposit_does_not_store_submission() {
 		ExtBuilder::default().build_and_execute(|| {
 			roll_to(15);
 			assert!(MultiPhase::current_phase().is_signed());
diff --git a/frame/election-provider-multi-phase/src/unsigned.rs b/frame/election-provider-multi-phase/src/unsigned.rs
index 41f8ced0ce82..abb4f2c47dd5 100644
--- a/frame/election-provider-multi-phase/src/unsigned.rs
+++ b/frame/election-provider-multi-phase/src/unsigned.rs
@@ -18,8 +18,9 @@
 //! The unsigned phase, and its miner.
 
 use crate::{
-	helpers, Call, CompactAccuracyOf, CompactOf, Config, ElectionCompute, Error, FeasibilityError,
-	Pallet, RawSolution, ReadySolution, RoundSnapshot, SolutionOrSnapshotSize, Weight, WeightInfo,
+	helpers, Call, Config, ElectionCompute, Error, FeasibilityError, Pallet, RawSolution,
+	ReadySolution, RoundSnapshot, SolutionAccuracyOf, SolutionOf, SolutionOrSnapshotSize, Weight,
+	WeightInfo,
 };
 use codec::{Decode, Encode};
 use frame_support::{dispatch::DispatchResult, ensure, traits::Get};
@@ -27,7 +28,7 @@ use frame_system::offchain::SubmitTransaction;
 use sp_arithmetic::Perbill;
 use sp_npos_elections::{
 	assignment_ratio_to_staked_normalized, assignment_staked_to_ratio_normalized, is_score_better,
-	seq_phragmen, CompactSolution, ElectionResult,
+	seq_phragmen, ElectionResult, NposSolution,
 };
 use sp_runtime::{
 	offchain::storage::{MutateStorageError, StorageValueRef},
@@ -54,11 +55,11 @@ pub type Voter<T> = (
 
 /// The relative distribution of a voter's stake among the winning targets.
 pub type Assignment<T> =
-	sp_npos_elections::Assignment<<T as frame_system::Config>::AccountId, CompactAccuracyOf<T>>;
+	sp_npos_elections::Assignment<<T as frame_system::Config>::AccountId, SolutionAccuracyOf<T>>;
 
 /// The [`IndexAssignment`][sp_npos_elections::IndexAssignment] type specialized for a particular
 /// runtime `T`.
-pub type IndexAssignmentOf<T> = sp_npos_elections::IndexAssignmentOf<CompactOf<T>>;
+pub type IndexAssignmentOf<T> = sp_npos_elections::IndexAssignmentOf<SolutionOf<T>>;
 
 #[derive(Debug, Eq, PartialEq)]
 pub enum MinerError {
@@ -231,7 +232,7 @@ impl<T: Config> Pallet<T> {
 	//
 	// Performance: note that it internally clones the provided solution.
 	pub fn basic_checks(
-		raw_solution: &RawSolution<CompactOf<T>>,
+		raw_solution: &RawSolution<SolutionOf<T>>,
 		solution_type: &str,
 	) -> Result<(), MinerError> {
 		Self::unsigned_pre_dispatch_checks(raw_solution).map_err(|err| {
@@ -257,7 +258,7 @@ impl<T: Config> Pallet<T> {
 	/// [`Pallet::mine_check_save_submit`].
 	pub fn mine_and_check(
 		iters: usize,
-	) -> Result<(RawSolution<CompactOf<T>>, SolutionOrSnapshotSize), MinerError> {
+	) -> Result<(RawSolution<SolutionOf<T>>, SolutionOrSnapshotSize), MinerError> {
 		let (raw_solution, witness) = Self::mine_solution(iters)?;
 		Self::basic_checks(&raw_solution, "mined")?;
 		Ok((raw_solution, witness))
@@ -266,12 +267,12 @@ impl<T: Config> Pallet<T> {
 	/// Mine a new npos solution.
 	pub fn mine_solution(
 		iters: usize,
-	) -> Result<(RawSolution<CompactOf<T>>, SolutionOrSnapshotSize), MinerError> {
+	) -> Result<(RawSolution<SolutionOf<T>>, SolutionOrSnapshotSize), MinerError> {
 		let RoundSnapshot { voters, targets } =
 			Self::snapshot().ok_or(MinerError::SnapshotUnAvailable)?;
 		let desired_targets = Self::desired_targets().ok_or(MinerError::SnapshotUnAvailable)?;
 
-		seq_phragmen::<_, CompactAccuracyOf<T>>(
+		seq_phragmen::<_, SolutionAccuracyOf<T>>(
 			desired_targets as usize,
 			targets,
 			voters,
@@ -286,8 +287,8 @@ impl<T: Config> Pallet<T> {
 	///
 	/// Will always reduce the solution as well.
 	pub fn prepare_election_result(
-		election_result: ElectionResult<T::AccountId, CompactAccuracyOf<T>>,
-	) -> Result<(RawSolution<CompactOf<T>>, SolutionOrSnapshotSize), MinerError> {
+		election_result: ElectionResult<T::AccountId, SolutionAccuracyOf<T>>,
+	) -> Result<(RawSolution<SolutionOf<T>>, SolutionOrSnapshotSize), MinerError> {
 		// NOTE: This code path is generally not optimized as it is run offchain. Could use some at
 		// some point though.
 
@@ -304,11 +305,11 @@ impl<T: Config> Pallet<T> {
 		let target_at = helpers::target_at_fn::<T>(&targets);
 		let stake_of = helpers::stake_of_fn::<T>(&voters, &cache);
 
-		// Compute the size of a compact solution comprised of the selected arguments.
+		// Compute the size of a solution comprised of the selected arguments.
 		//
 		// This function completes in `O(edges)`; it's expensive, but linear.
 		let encoded_size_of = |assignments: &[IndexAssignmentOf<T>]| {
-			CompactOf::<T>::try_from(assignments).map(|compact| compact.encoded_size())
+			SolutionOf::<T>::try_from(assignments).map(|s| s.encoded_size())
 		};
 
 		let ElectionResult { assignments, winners } = election_result;
@@ -345,7 +346,7 @@ impl<T: Config> Pallet<T> {
 		};
 
 		// convert to `IndexAssignment`. This improves the runtime complexity of repeatedly
-		// converting to `Compact`.
+		// converting to `Solution`.
 		let mut index_assignments = sorted_assignments
 			.into_iter()
 			.map(|assignment| IndexAssignmentOf::<T>::new(&assignment, &voter_index, &target_index))
@@ -366,15 +367,15 @@ impl<T: Config> Pallet<T> {
 			&encoded_size_of,
 		)?;
 
-		// now make compact.
-		let compact = CompactOf::<T>::try_from(&index_assignments)?;
+		// now make solution.
+		let solution = SolutionOf::<T>::try_from(&index_assignments)?;
 
 		// re-calc score.
 		let winners = sp_npos_elections::to_without_backing(winners);
-		let score = compact.clone().score(&winners, stake_of, voter_at, target_at)?;
+		let score = solution.clone().score(&winners, stake_of, voter_at, target_at)?;
 
 		let round = Self::round();
-		Ok((RawSolution { compact, score, round }, size))
+		Ok((RawSolution { solution, score, round }, size))
 	}
 
 	/// Get a random number of iterations to run the balancing in the OCW.
@@ -502,7 +503,7 @@ impl<T: Config> Pallet<T> {
 		Ok(())
 	}
 
-	/// Find the maximum `len` that a compact can have in order to fit into the block weight.
+	/// Find the maximum `len` that a solution can have in order to fit into the block weight.
 	///
 	/// This only returns a value between zero and `size.nominators`.
 	pub fn maximum_voter_for_weight<W: WeightInfo>(
@@ -623,24 +624,26 @@ impl<T: Config> Pallet<T> {
 	///
 	/// NOTE: Ideally, these tests should move more and more outside of this and more to the miner's
 	/// code, so that we do less and less storage reads here.
-	pub fn unsigned_pre_dispatch_checks(solution: &RawSolution<CompactOf<T>>) -> DispatchResult {
+	pub fn unsigned_pre_dispatch_checks(
+		raw_solution: &RawSolution<SolutionOf<T>>,
+	) -> DispatchResult {
 		// ensure solution is timely. Don't panic yet. This is a cheap check.
 		ensure!(Self::current_phase().is_unsigned_open(), Error::<T>::PreDispatchEarlySubmission);
 
 		// ensure round is current
-		ensure!(Self::round() == solution.round, Error::<T>::OcwCallWrongEra);
+		ensure!(Self::round() == raw_solution.round, Error::<T>::OcwCallWrongEra);
 
 		// ensure correct number of winners.
 		ensure!(
 			Self::desired_targets().unwrap_or_default() ==
-				solution.compact.unique_targets().len() as u32,
+				raw_solution.solution.unique_targets().len() as u32,
 			Error::<T>::PreDispatchWrongWinnerCount,
 		);
 
 		// ensure score is being improved. Panic henceforth.
 		ensure!(
 			Self::queued_solution().map_or(true, |q: ReadySolution<_>| is_score_better::<Perbill>(
-				solution.score,
+				raw_solution.score,
 				q.score,
 				T::SolutionImprovementThreshold::get()
 			)),
@@ -753,7 +756,7 @@ mod tests {
 		mock::{
 			roll_to, roll_to_with_ocw, trim_helpers, witness, BlockNumber, Call as OuterCall,
 			ExtBuilder, Extrinsic, MinerMaxWeight, MultiPhase, Origin, Runtime, System,
-			TestCompact, TrimHelpers, UnsignedPhase,
+			TestNposSolution, TrimHelpers, UnsignedPhase,
 		},
 		CurrentPhase, InvalidTransaction, Phase, QueuedSolution, TransactionSource,
 		TransactionValidityError,
@@ -772,7 +775,8 @@ mod tests {
 	#[test]
 	fn validate_unsigned_retracts_wrong_phase() {
 		ExtBuilder::default().desired_targets(0).build_and_execute(|| {
-			let solution = RawSolution::<TestCompact> { score: [5, 0, 0], ..Default::default() };
+			let solution =
+				RawSolution::<TestNposSolution> { score: [5, 0, 0], ..Default::default() };
 			let call = Call::submit_unsigned(Box::new(solution.clone()), witness());
 
 			// initial
@@ -841,7 +845,8 @@ mod tests {
 			roll_to(25);
 			assert!(MultiPhase::current_phase().is_unsigned());
 
-			let solution = RawSolution::<TestCompact> { score: [5, 0, 0], ..Default::default() };
+			let solution =
+				RawSolution::<TestNposSolution> { score: [5, 0, 0], ..Default::default() };
 			let call = Call::submit_unsigned(Box::new(solution.clone()), witness());
 
 			// initial
@@ -878,9 +883,9 @@ mod tests {
 			roll_to(25);
 			assert!(MultiPhase::current_phase().is_unsigned());
 
-			let solution = RawSolution::<TestCompact> { score: [5, 0, 0], ..Default::default() };
-			let call = Call::submit_unsigned(Box::new(solution.clone()), witness());
-			assert_eq!(solution.compact.unique_targets().len(), 0);
+			let raw = RawSolution::<TestNposSolution> { score: [5, 0, 0], ..Default::default() };
+			let call = Call::submit_unsigned(Box::new(raw.clone()), witness());
+			assert_eq!(raw.solution.unique_targets().len(), 0);
 
 			// won't work anymore.
 			assert!(matches!(
@@ -904,7 +909,7 @@ mod tests {
 				assert!(MultiPhase::current_phase().is_unsigned());
 
 				let solution =
-					RawSolution::<TestCompact> { score: [5, 0, 0], ..Default::default() };
+					RawSolution::<TestNposSolution> { score: [5, 0, 0], ..Default::default() };
 				let call = Call::submit_unsigned(Box::new(solution.clone()), witness());
 
 				assert_eq!(
@@ -930,7 +935,8 @@ mod tests {
 			assert!(MultiPhase::current_phase().is_unsigned());
 
 			// This is in itself an invalid BS solution.
-			let solution = RawSolution::<TestCompact> { score: [5, 0, 0], ..Default::default() };
+			let solution =
+				RawSolution::<TestNposSolution> { score: [5, 0, 0], ..Default::default() };
 			let call = Call::submit_unsigned(Box::new(solution.clone()), witness());
 			let outer_call: OuterCall = call.into();
 			let _ = outer_call.dispatch(Origin::none());
@@ -946,7 +952,8 @@ mod tests {
 			assert!(MultiPhase::current_phase().is_unsigned());
 
 			// This solution is unfeasible as well, but we won't even get there.
-			let solution = RawSolution::<TestCompact> { score: [5, 0, 0], ..Default::default() };
+			let solution =
+				RawSolution::<TestNposSolution> { score: [5, 0, 0], ..Default::default() };
 
 			let mut correct_witness = witness();
 			correct_witness.voters += 1;
@@ -986,30 +993,30 @@ mod tests {
 				roll_to(25);
 				assert!(MultiPhase::current_phase().is_unsigned());
 
-				let (solution, witness) = MultiPhase::mine_solution(2).unwrap();
+				let (raw, witness) = MultiPhase::mine_solution(2).unwrap();
 				let solution_weight = <Runtime as Config>::WeightInfo::submit_unsigned(
 					witness.voters,
 					witness.targets,
-					solution.compact.voter_count() as u32,
-					solution.compact.unique_targets().len() as u32,
+					raw.solution.voter_count() as u32,
+					raw.solution.unique_targets().len() as u32,
 				);
 				// default solution will have 5 edges (5 * 5 + 10)
 				assert_eq!(solution_weight, 35);
-				assert_eq!(solution.compact.voter_count(), 5);
+				assert_eq!(raw.solution.voter_count(), 5);
 
 				// now reduce the max weight
 				<MinerMaxWeight>::set(25);
 
-				let (solution, witness) = MultiPhase::mine_solution(2).unwrap();
+				let (raw, witness) = MultiPhase::mine_solution(2).unwrap();
 				let solution_weight = <Runtime as Config>::WeightInfo::submit_unsigned(
 					witness.voters,
 					witness.targets,
-					solution.compact.voter_count() as u32,
-					solution.compact.unique_targets().len() as u32,
+					raw.solution.voter_count() as u32,
+					raw.solution.unique_targets().len() as u32,
 				);
 				// default solution will have 5 edges (5 * 5 + 10)
 				assert_eq!(solution_weight, 25);
-				assert_eq!(solution.compact.voter_count(), 3);
+				assert_eq!(raw.solution.voter_count(), 3);
 			})
 	}
 
@@ -1068,7 +1075,7 @@ mod tests {
 						Assignment { who: 10, distribution: vec![(10, PerU16::one())] },
 						Assignment {
 							who: 7,
-							// note: this percent doesn't even matter, in compact it is 100%.
+							// note: this percent doesn't even matter, in solution it is 100%.
 							distribution: vec![(10, PerU16::one())],
 						},
 					],
@@ -1090,7 +1097,7 @@ mod tests {
 						Assignment { who: 7, distribution: vec![(10, PerU16::one())] },
 						Assignment {
 							who: 8,
-							// note: this percent doesn't even matter, in compact it is 100%.
+							// note: this percent doesn't even matter, in solution it is 100%.
 							distribution: vec![(10, PerU16::one())],
 						},
 					],
@@ -1400,17 +1407,17 @@ mod tests {
 
 			// given
 			let TrimHelpers { mut assignments, encoded_size_of, .. } = trim_helpers();
-			let compact = CompactOf::<Runtime>::try_from(assignments.as_slice()).unwrap();
-			let encoded_len = compact.encoded_size() as u32;
-			let compact_clone = compact.clone();
+			let solution = SolutionOf::<Runtime>::try_from(assignments.as_slice()).unwrap();
+			let encoded_len = solution.encoded_size() as u32;
+			let solution_clone = solution.clone();
 
 			// when
 			MultiPhase::trim_assignments_length(encoded_len, &mut assignments, encoded_size_of)
 				.unwrap();
 
 			// then
-			let compact = CompactOf::<Runtime>::try_from(assignments.as_slice()).unwrap();
-			assert_eq!(compact, compact_clone);
+			let solution = SolutionOf::<Runtime>::try_from(assignments.as_slice()).unwrap();
+			assert_eq!(solution, solution_clone);
 		});
 	}
 
@@ -1421,9 +1428,9 @@ mod tests {
 
 			// given
 			let TrimHelpers { mut assignments, encoded_size_of, .. } = trim_helpers();
-			let compact = CompactOf::<Runtime>::try_from(assignments.as_slice()).unwrap();
-			let encoded_len = compact.encoded_size();
-			let compact_clone = compact.clone();
+			let solution = SolutionOf::<Runtime>::try_from(assignments.as_slice()).unwrap();
+			let encoded_len = solution.encoded_size();
+			let solution_clone = solution.clone();
 
 			// when
 			MultiPhase::trim_assignments_length(
@@ -1434,9 +1441,9 @@ mod tests {
 			.unwrap();
 
 			// then
-			let compact = CompactOf::<Runtime>::try_from(assignments.as_slice()).unwrap();
-			assert_ne!(compact, compact_clone);
-			assert!(compact.encoded_size() < encoded_len);
+			let solution = SolutionOf::<Runtime>::try_from(assignments.as_slice()).unwrap();
+			assert_ne!(solution, solution_clone);
+			assert!(solution.encoded_size() < encoded_len);
 		});
 	}
 
@@ -1448,8 +1455,8 @@ mod tests {
 			// given
 			let TrimHelpers { voters, mut assignments, encoded_size_of, voter_index } =
 				trim_helpers();
-			let compact = CompactOf::<Runtime>::try_from(assignments.as_slice()).unwrap();
-			let encoded_len = compact.encoded_size() as u32;
+			let solution = SolutionOf::<Runtime>::try_from(assignments.as_slice()).unwrap();
+			let encoded_len = solution.encoded_size() as u32;
 			let count = assignments.len();
 			let min_stake_voter = voters
 				.iter()
@@ -1476,15 +1483,15 @@ mod tests {
 		// we shan't panic if assignments are initially empty.
 		ExtBuilder::default().build_and_execute(|| {
 			let encoded_size_of = Box::new(|assignments: &[IndexAssignmentOf<Runtime>]| {
-				CompactOf::<Runtime>::try_from(assignments).map(|compact| compact.encoded_size())
+				SolutionOf::<Runtime>::try_from(assignments).map(|solution| solution.encoded_size())
 			});
 
 			let mut assignments = vec![];
 
 			// since we have 16 fields, we need to store the length fields of 16 vecs, thus 16 bytes
 			// minimum.
-			let min_compact_size = encoded_size_of(&assignments).unwrap();
-			assert_eq!(min_compact_size, CompactOf::<Runtime>::LIMIT);
+			let min_solution_size = encoded_size_of(&assignments).unwrap();
+			assert_eq!(min_solution_size, SolutionOf::<Runtime>::LIMIT);
 
 			// all of this should not panic.
 			MultiPhase::trim_assignments_length(0, &mut assignments, encoded_size_of.clone())
@@ -1492,7 +1499,7 @@ mod tests {
 			MultiPhase::trim_assignments_length(1, &mut assignments, encoded_size_of.clone())
 				.unwrap();
 			MultiPhase::trim_assignments_length(
-				min_compact_size as u32,
+				min_solution_size as u32,
 				&mut assignments,
 				encoded_size_of,
 			)
@@ -1506,10 +1513,10 @@ mod tests {
 			let TrimHelpers { mut assignments, encoded_size_of, .. } = trim_helpers();
 			assert!(assignments.len() > 0);
 
-			// trim to min compact size.
-			let min_compact_size = CompactOf::<Runtime>::LIMIT as u32;
+			// trim to min solution size.
+			let min_solution_size = SolutionOf::<Runtime>::LIMIT as u32;
 			MultiPhase::trim_assignments_length(
-				min_compact_size,
+				min_solution_size,
 				&mut assignments,
 				encoded_size_of,
 			)
@@ -1529,14 +1536,14 @@ mod tests {
 			// how long would the default solution be?
 			let solution = MultiPhase::mine_solution(0).unwrap();
 			let max_length = <Runtime as Config>::MinerMaxLength::get();
-			let solution_size = solution.0.compact.encoded_size();
+			let solution_size = solution.0.solution.encoded_size();
 			assert!(solution_size <= max_length as usize);
 
 			// now set the max size to less than the actual size and regenerate
 			<Runtime as Config>::MinerMaxLength::set(solution_size as u32 - 1);
 			let solution = MultiPhase::mine_solution(0).unwrap();
 			let max_length = <Runtime as Config>::MinerMaxLength::get();
-			let solution_size = solution.0.compact.encoded_size();
+			let solution_size = solution.0.solution.encoded_size();
 			assert!(solution_size <= max_length as usize);
 		});
 	}
diff --git a/primitives/npos-elections/Cargo.toml b/primitives/npos-elections/Cargo.toml
index 902b3040ba49..0d1834a94ad9 100644
--- a/primitives/npos-elections/Cargo.toml
+++ b/primitives/npos-elections/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.126", optional = true, features = ["derive"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
-sp-npos-elections-compact = { version = "4.0.0-dev", path = "./compact" }
+sp-npos-elections-solution-type = { version = "4.0.0-dev", path = "./solution-type" }
 sp-arithmetic = { version = "4.0.0-dev", default-features = false, path = "../arithmetic" }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../core" }
 
@@ -28,7 +28,6 @@ sp-runtime = { version = "4.0.0-dev", path = "../runtime" }
 [features]
 default = ["std"]
 bench = []
-mocks = []
 std = [
 	"codec/std",
 	"serde",
diff --git a/primitives/npos-elections/compact/src/assignment.rs b/primitives/npos-elections/compact/src/assignment.rs
deleted file mode 100644
index bd5b1bf0c154..000000000000
--- a/primitives/npos-elections/compact/src/assignment.rs
+++ /dev/null
@@ -1,161 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Code generation for the ratio assignment type' compact representation.
-
-use crate::field_name_for;
-use proc_macro2::TokenStream as TokenStream2;
-use quote::quote;
-
-pub(crate) fn from_impl(count: usize) -> TokenStream2 {
-	let from_impl_single = {
-		let name = field_name_for(1);
-		quote!(1 => compact.#name.push(
-			(
-				index_of_voter(&who).or_invalid_index()?,
-				index_of_target(&distribution[0].0).or_invalid_index()?,
-			)
-		),)
-	};
-
-	let from_impl_double = {
-		let name = field_name_for(2);
-		quote!(2 => compact.#name.push(
-			(
-				index_of_voter(&who).or_invalid_index()?,
-				(
-					index_of_target(&distribution[0].0).or_invalid_index()?,
-					distribution[0].1,
-				),
-				index_of_target(&distribution[1].0).or_invalid_index()?,
-			)
-		),)
-	};
-
-	let from_impl_rest = (3..=count)
-		.map(|c| {
-			let inner = (0..c - 1)
-				.map(
-					|i| quote!((index_of_target(&distribution[#i].0).or_invalid_index()?, distribution[#i].1),),
-				)
-				.collect::<TokenStream2>();
-
-			let field_name = field_name_for(c);
-			let last_index = c - 1;
-			let last = quote!(index_of_target(&distribution[#last_index].0).or_invalid_index()?);
-
-			quote!(
-				#c => compact.#field_name.push(
-					(
-						index_of_voter(&who).or_invalid_index()?,
-						[#inner],
-						#last,
-					)
-				),
-			)
-		})
-		.collect::<TokenStream2>();
-
-	quote!(
-		#from_impl_single
-		#from_impl_double
-		#from_impl_rest
-	)
-}
-
-pub(crate) fn into_impl(count: usize, per_thing: syn::Type) -> TokenStream2 {
-	let into_impl_single = {
-		let name = field_name_for(1);
-		quote!(
-			for (voter_index, target_index) in self.#name {
-				assignments.push(_npos::Assignment {
-					who: voter_at(voter_index).or_invalid_index()?,
-					distribution: vec![
-						(target_at(target_index).or_invalid_index()?, #per_thing::one())
-					],
-				})
-			}
-		)
-	};
-
-	let into_impl_double = {
-		let name = field_name_for(2);
-		quote!(
-			for (voter_index, (t1_idx, p1), t2_idx) in self.#name {
-				if p1 >= #per_thing::one() {
-					return Err(_npos::Error::CompactStakeOverflow);
-				}
-
-				// defensive only. Since Percent doesn't have `Sub`.
-				let p2 = _npos::sp_arithmetic::traits::Saturating::saturating_sub(
-					#per_thing::one(),
-					p1,
-				);
-
-				assignments.push( _npos::Assignment {
-					who: voter_at(voter_index).or_invalid_index()?,
-					distribution: vec![
-						(target_at(t1_idx).or_invalid_index()?, p1),
-						(target_at(t2_idx).or_invalid_index()?, p2),
-					]
-				});
-			}
-		)
-	};
-
-	let into_impl_rest = (3..=count)
-		.map(|c| {
-			let name = field_name_for(c);
-			quote!(
-				for (voter_index, inners, t_last_idx) in self.#name {
-					let mut sum = #per_thing::zero();
-					let mut inners_parsed = inners
-						.iter()
-						.map(|(ref t_idx, p)| {
-							sum = _npos::sp_arithmetic::traits::Saturating::saturating_add(sum, *p);
-							let target = target_at(*t_idx).or_invalid_index()?;
-							Ok((target, *p))
-						})
-						.collect::<Result<_npos::sp_std::prelude::Vec<(A, #per_thing)>, _npos::Error>>()?;
-
-					if sum >= #per_thing::one() {
-						return Err(_npos::Error::CompactStakeOverflow);
-					}
-
-					// defensive only. Since Percent doesn't have `Sub`.
-					let p_last = _npos::sp_arithmetic::traits::Saturating::saturating_sub(
-						#per_thing::one(),
-						sum,
-					);
-
-					inners_parsed.push((target_at(t_last_idx).or_invalid_index()?, p_last));
-
-					assignments.push(_npos::Assignment {
-						who: voter_at(voter_index).or_invalid_index()?,
-						distribution: inners_parsed,
-					});
-				}
-			)
-		})
-		.collect::<TokenStream2>();
-
-	quote!(
-		#into_impl_single
-		#into_impl_double
-		#into_impl_rest
-	)
-}
diff --git a/primitives/npos-elections/compact/src/lib.rs b/primitives/npos-elections/compact/src/lib.rs
deleted file mode 100644
index 5897e607cfa6..000000000000
--- a/primitives/npos-elections/compact/src/lib.rs
+++ /dev/null
@@ -1,499 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Proc macro for a npos compact assignment.
-
-use proc_macro::TokenStream;
-use proc_macro2::{Ident, Span, TokenStream as TokenStream2};
-use proc_macro_crate::{crate_name, FoundCrate};
-use quote::quote;
-use syn::parse::{Parse, ParseStream, Result};
-
-mod assignment;
-mod codec;
-mod index_assignment;
-
-// prefix used for struct fields in compact.
-const PREFIX: &'static str = "votes";
-
-pub(crate) fn syn_err(message: &'static str) -> syn::Error {
-	syn::Error::new(Span::call_site(), message)
-}
-
-/// Generates a struct to store the election result in a small way. This can encode a structure
-/// which is the equivalent of a `sp_npos_elections::Assignment<_>`.
-///
-/// The following data types can be configured by the macro.
-///
-/// - The identifier of the voter. This can be any type that supports `parity-scale-codec`'s compact
-///   encoding.
-/// - The identifier of the target. This can be any type that supports `parity-scale-codec`'s
-///   compact encoding.
-/// - The accuracy of the ratios. This must be one of the `PerThing` types defined in
-///   `sp-arithmetic`.
-///
-/// Moreover, the maximum number of edges per voter (distribution per assignment) also need to be
-/// specified. Attempting to convert from/to an assignment with more distributions will fail.
-///
-///
-/// For example, the following generates a public struct with name `TestSolution` with `u16` voter
-/// type, `u8` target type and `Perbill` accuracy with maximum of 8 edges per voter.
-///
-/// ```
-/// # use sp_npos_elections_compact::generate_solution_type;
-/// # use sp_arithmetic::per_things::Perbill;
-/// generate_solution_type!(pub struct TestSolution::<
-/// 	VoterIndex = u16,
-/// 	TargetIndex = u8,
-/// 	Accuracy = Perbill,
-/// >(8));
-/// ```
-///
-/// The given struct provides function to convert from/to Assignment:
-///
-/// - `fn from_assignment<..>(..)`
-/// - `fn into_assignment<..>(..)`
-///
-/// The generated struct is by default deriving both `Encode` and `Decode`. This is okay but could
-/// lead to many 0s in the solution. If prefixed with `#[compact]`, then a custom compact encoding
-/// for numbers will be used, similar to how `parity-scale-codec`'s `Compact` works.
-///
-/// ```
-/// # use sp_npos_elections_compact::generate_solution_type;
-/// # use sp_arithmetic::per_things::Perbill;
-/// generate_solution_type!(
-///     #[compact]
-///     pub struct TestSolutionCompact::<VoterIndex = u16, TargetIndex = u8, Accuracy = Perbill>(8)
-/// );
-/// ```
-#[proc_macro]
-pub fn generate_solution_type(item: TokenStream) -> TokenStream {
-	let SolutionDef { vis, ident, count, voter_type, target_type, weight_type, compact_encoding } =
-		syn::parse_macro_input!(item as SolutionDef);
-
-	let imports = imports().unwrap_or_else(|e| e.to_compile_error());
-
-	let solution_struct = struct_def(
-		vis,
-		ident,
-		count,
-		voter_type.clone(),
-		target_type.clone(),
-		weight_type.clone(),
-		compact_encoding,
-	)
-	.unwrap_or_else(|e| e.to_compile_error());
-
-	quote!(
-		#imports
-		#solution_struct
-	)
-	.into()
-}
-
-fn struct_def(
-	vis: syn::Visibility,
-	ident: syn::Ident,
-	count: usize,
-	voter_type: syn::Type,
-	target_type: syn::Type,
-	weight_type: syn::Type,
-	compact_encoding: bool,
-) -> Result<TokenStream2> {
-	if count <= 2 {
-		Err(syn_err("cannot build compact solution struct with capacity less than 3."))?
-	}
-
-	let singles = {
-		let name = field_name_for(1);
-		// NOTE: we use the visibility of the struct for the fields as well.. could be made better.
-		quote!(
-			#vis #name: _npos::sp_std::prelude::Vec<(#voter_type, #target_type)>,
-		)
-	};
-
-	let doubles = {
-		let name = field_name_for(2);
-		quote!(
-			#vis #name: _npos::sp_std::prelude::Vec<(#voter_type, (#target_type, #weight_type), #target_type)>,
-		)
-	};
-
-	let rest = (3..=count)
-		.map(|c| {
-			let field_name = field_name_for(c);
-			let array_len = c - 1;
-			quote!(
-				#vis #field_name: _npos::sp_std::prelude::Vec<(
-					#voter_type,
-					[(#target_type, #weight_type); #array_len],
-					#target_type
-				)>,
-			)
-		})
-		.collect::<TokenStream2>();
-
-	let len_impl = len_impl(count);
-	let edge_count_impl = edge_count_impl(count);
-	let unique_targets_impl = unique_targets_impl(count);
-	let remove_voter_impl = remove_voter_impl(count);
-
-	let derives_and_maybe_compact_encoding = if compact_encoding {
-		// custom compact encoding.
-		let compact_impl = codec::codec_impl(
-			ident.clone(),
-			voter_type.clone(),
-			target_type.clone(),
-			weight_type.clone(),
-			count,
-		);
-		quote! {
-			#compact_impl
-			#[derive(Default, PartialEq, Eq, Clone, Debug, PartialOrd, Ord)]
-		}
-	} else {
-		// automatically derived.
-		quote!(#[derive(Default, PartialEq, Eq, Clone, Debug, _npos::codec::Encode, _npos::codec::Decode)])
-	};
-
-	let from_impl = assignment::from_impl(count);
-	let into_impl = assignment::into_impl(count, weight_type.clone());
-	let from_index_impl = index_assignment::from_impl(count);
-
-	Ok(quote! (
-		/// A struct to encode a election assignment in a compact way.
-		#derives_and_maybe_compact_encoding
-		#vis struct #ident { #singles #doubles #rest }
-
-		use _npos::__OrInvalidIndex;
-		impl _npos::CompactSolution for #ident {
-			const LIMIT: usize = #count;
-			type Voter = #voter_type;
-			type Target = #target_type;
-			type Accuracy = #weight_type;
-
-			fn voter_count(&self) -> usize {
-				let mut all_len = 0usize;
-				#len_impl
-				all_len
-			}
-
-			fn edge_count(&self) -> usize {
-				let mut all_edges = 0usize;
-				#edge_count_impl
-				all_edges
-			}
-
-			fn unique_targets(&self) -> _npos::sp_std::prelude::Vec<Self::Target> {
-				// NOTE: this implementation returns the targets sorted, but we don't use it yet per
-				// se, nor is the API enforcing it.
-				use _npos::sp_std::collections::btree_set::BTreeSet;
-
-				let mut all_targets: BTreeSet<Self::Target> = BTreeSet::new();
-				let mut maybe_insert_target = |t: Self::Target| {
-					all_targets.insert(t);
-				};
-
-				#unique_targets_impl
-
-				all_targets.into_iter().collect()
-			}
-
-			fn remove_voter(&mut self, to_remove: Self::Voter) -> bool {
-				#remove_voter_impl
-				return false
-			}
-
-			fn from_assignment<FV, FT, A>(
-				assignments: &[_npos::Assignment<A, #weight_type>],
-				index_of_voter: FV,
-				index_of_target: FT,
-			) -> Result<Self, _npos::Error>
-				where
-					A: _npos::IdentifierT,
-					for<'r> FV: Fn(&'r A) -> Option<Self::Voter>,
-					for<'r> FT: Fn(&'r A) -> Option<Self::Target>,
-			{
-				let mut compact: #ident = Default::default();
-
-				for _npos::Assignment { who, distribution } in assignments {
-					match distribution.len() {
-						0 => continue,
-						#from_impl
-						_ => {
-							return Err(_npos::Error::CompactTargetOverflow);
-						}
-					}
-				};
-				Ok(compact)
-			}
-
-			fn into_assignment<A: _npos::IdentifierT>(
-				self,
-				voter_at: impl Fn(Self::Voter) -> Option<A>,
-				target_at: impl Fn(Self::Target) -> Option<A>,
-			) -> Result<_npos::sp_std::prelude::Vec<_npos::Assignment<A, #weight_type>>, _npos::Error> {
-				let mut assignments: _npos::sp_std::prelude::Vec<_npos::Assignment<A, #weight_type>> = Default::default();
-				#into_impl
-				Ok(assignments)
-			}
-		}
-		type __IndexAssignment = _npos::IndexAssignment<
-			<#ident as _npos::CompactSolution>::Voter,
-			<#ident as _npos::CompactSolution>::Target,
-			<#ident as _npos::CompactSolution>::Accuracy,
-		>;
-		impl<'a> _npos::sp_std::convert::TryFrom<&'a [__IndexAssignment]> for #ident {
-			type Error = _npos::Error;
-			fn try_from(index_assignments: &'a [__IndexAssignment]) -> Result<Self, Self::Error> {
-				let mut compact =  #ident::default();
-
-				for _npos::IndexAssignment { who, distribution } in index_assignments {
-					match distribution.len() {
-						0 => {}
-						#from_index_impl
-						_ => {
-							return Err(_npos::Error::CompactTargetOverflow);
-						}
-					}
-				};
-
-				Ok(compact)
-			}
-		}
-	))
-}
-
-fn remove_voter_impl(count: usize) -> TokenStream2 {
-	let field_name = field_name_for(1);
-	let single = quote! {
-		if let Some(idx) = self.#field_name.iter().position(|(x, _)| *x == to_remove) {
-			self.#field_name.remove(idx);
-			return true
-		}
-	};
-
-	let field_name = field_name_for(2);
-	let double = quote! {
-		if let Some(idx) = self.#field_name.iter().position(|(x, _, _)| *x == to_remove) {
-			self.#field_name.remove(idx);
-			return true
-		}
-	};
-
-	let rest = (3..=count)
-		.map(|c| {
-			let field_name = field_name_for(c);
-			quote! {
-				if let Some(idx) = self.#field_name.iter().position(|(x, _, _)| *x == to_remove) {
-					self.#field_name.remove(idx);
-					return true
-				}
-			}
-		})
-		.collect::<TokenStream2>();
-
-	quote! {
-		#single
-		#double
-		#rest
-	}
-}
-
-fn len_impl(count: usize) -> TokenStream2 {
-	(1..=count)
-		.map(|c| {
-			let field_name = field_name_for(c);
-			quote!(
-				all_len = all_len.saturating_add(self.#field_name.len());
-			)
-		})
-		.collect::<TokenStream2>()
-}
-
-fn edge_count_impl(count: usize) -> TokenStream2 {
-	(1..=count)
-		.map(|c| {
-			let field_name = field_name_for(c);
-			quote!(
-				all_edges = all_edges.saturating_add(
-					self.#field_name.len().saturating_mul(#c as usize)
-				);
-			)
-		})
-		.collect::<TokenStream2>()
-}
-
-fn unique_targets_impl(count: usize) -> TokenStream2 {
-	let unique_targets_impl_single = {
-		let field_name = field_name_for(1);
-		quote! {
-			self.#field_name.iter().for_each(|(_, t)| {
-				maybe_insert_target(*t);
-			});
-		}
-	};
-
-	let unique_targets_impl_double = {
-		let field_name = field_name_for(2);
-		quote! {
-			self.#field_name.iter().for_each(|(_, (t1, _), t2)| {
-				maybe_insert_target(*t1);
-				maybe_insert_target(*t2);
-			});
-		}
-	};
-
-	let unique_targets_impl_rest = (3..=count)
-		.map(|c| {
-			let field_name = field_name_for(c);
-			quote! {
-				self.#field_name.iter().for_each(|(_, inners, t_last)| {
-					inners.iter().for_each(|(t, _)| {
-						maybe_insert_target(*t);
-					});
-					maybe_insert_target(*t_last);
-				});
-			}
-		})
-		.collect::<TokenStream2>();
-
-	quote! {
-		#unique_targets_impl_single
-		#unique_targets_impl_double
-		#unique_targets_impl_rest
-	}
-}
-
-fn imports() -> Result<TokenStream2> {
-	match crate_name("sp-npos-elections") {
-		Ok(FoundCrate::Itself) => Ok(quote! { use crate as _npos; }),
-		Ok(FoundCrate::Name(sp_npos_elections)) => {
-			let ident = syn::Ident::new(&sp_npos_elections, Span::call_site());
-			Ok(quote!( extern crate #ident as _npos; ))
-		},
-		Err(e) => Err(syn::Error::new(Span::call_site(), e)),
-	}
-}
-
-struct SolutionDef {
-	vis: syn::Visibility,
-	ident: syn::Ident,
-	voter_type: syn::Type,
-	target_type: syn::Type,
-	weight_type: syn::Type,
-	count: usize,
-	compact_encoding: bool,
-}
-
-fn check_compact_attr(input: ParseStream) -> Result<bool> {
-	let mut attrs = input.call(syn::Attribute::parse_outer).unwrap_or_default();
-	if attrs.len() == 1 {
-		let attr = attrs.pop().expect("Vec with len 1 can be popped.");
-		if attr.path.segments.len() == 1 {
-			let segment = attr.path.segments.first().expect("Vec with len 1 can be popped.");
-			if segment.ident == Ident::new("compact", Span::call_site()) {
-				Ok(true)
-			} else {
-				Err(syn_err("generate_solution_type macro can only accept #[compact] attribute."))
-			}
-		} else {
-			Err(syn_err("generate_solution_type macro can only accept #[compact] attribute."))
-		}
-	} else {
-		Ok(false)
-	}
-}
-
-/// `#[compact] pub struct CompactName::<VoterIndex = u32, TargetIndex = u32, Accuracy = u32>()`
-impl Parse for SolutionDef {
-	fn parse(input: ParseStream) -> syn::Result<Self> {
-		// optional #[compact]
-		let compact_encoding = check_compact_attr(input)?;
-
-		// <vis> struct <name>
-		let vis: syn::Visibility = input.parse()?;
-		let _ = <syn::Token![struct]>::parse(input)?;
-		let ident: syn::Ident = input.parse()?;
-
-		// ::<V, T, W>
-		let _ = <syn::Token![::]>::parse(input)?;
-		let generics: syn::AngleBracketedGenericArguments = input.parse()?;
-
-		if generics.args.len() != 3 {
-			return Err(syn_err("Must provide 3 generic args."))
-		}
-
-		let expected_types = ["VoterIndex", "TargetIndex", "Accuracy"];
-
-		let mut types: Vec<syn::Type> = generics
-			.args
-			.iter()
-			.zip(expected_types.iter())
-			.map(|(t, expected)| match t {
-				syn::GenericArgument::Type(ty) => {
-					// this is now an error
-					Err(syn::Error::new_spanned(
-						ty,
-						format!("Expected binding: `{} = ...`", expected),
-					))
-				},
-				syn::GenericArgument::Binding(syn::Binding { ident, ty, .. }) => {
-					// check that we have the right keyword for this position in the argument list
-					if ident == expected {
-						Ok(ty.clone())
-					} else {
-						Err(syn::Error::new_spanned(ident, format!("Expected `{}`", expected)))
-					}
-				},
-				_ => Err(syn_err("Wrong type of generic provided. Must be a `type`.")),
-			})
-			.collect::<Result<_>>()?;
-
-		let weight_type = types.pop().expect("Vector of length 3 can be popped; qed");
-		let target_type = types.pop().expect("Vector of length 2 can be popped; qed");
-		let voter_type = types.pop().expect("Vector of length 1 can be popped; qed");
-
-		// (<count>)
-		let count_expr: syn::ExprParen = input.parse()?;
-		let expr = count_expr.expr;
-		let expr_lit = match *expr {
-			syn::Expr::Lit(count_lit) => count_lit.lit,
-			_ => return Err(syn_err("Count must be literal.")),
-		};
-		let int_lit = match expr_lit {
-			syn::Lit::Int(int_lit) => int_lit,
-			_ => return Err(syn_err("Count must be int literal.")),
-		};
-		let count = int_lit.base10_parse::<usize>()?;
-
-		Ok(Self { vis, ident, voter_type, target_type, weight_type, count, compact_encoding })
-	}
-}
-
-fn field_name_for(n: usize) -> Ident {
-	Ident::new(&format!("{}{}", PREFIX, n), Span::call_site())
-}
-
-#[cfg(test)]
-mod tests {
-	#[test]
-	fn ui_fail() {
-		let cases = trybuild::TestCases::new();
-		cases.compile_fail("tests/ui/fail/*.rs");
-	}
-}
diff --git a/primitives/npos-elections/compact/Cargo.toml b/primitives/npos-elections/solution-type/Cargo.toml
similarity index 71%
rename from primitives/npos-elections/compact/Cargo.toml
rename to primitives/npos-elections/solution-type/Cargo.toml
index d90bdf373b4d..4b54e4670385 100644
--- a/primitives/npos-elections/compact/Cargo.toml
+++ b/primitives/npos-elections/solution-type/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
-name = "sp-npos-elections-compact"
+name = "sp-npos-elections-solution-type"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
 homepage = "https://substrate.dev"
 repository = "https://github.com/paritytech/substrate/"
-description = "NPoS Compact Solution Type"
+description = "NPoS Solution Type"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
@@ -22,6 +22,6 @@ proc-macro-crate = "1.0.0"
 
 [dev-dependencies]
 parity-scale-codec = "2.0.1"
-sp-arithmetic = { path = "../../arithmetic" , version = "4.0.0-dev"}
-sp-npos-elections = { path = ".." , version = "4.0.0-dev"}
+sp-arithmetic = { path = "../../arithmetic", version = "4.0.0-dev"}
+sp-npos-elections = { path = "..", version = "4.0.0-dev"}
 trybuild = "1.0.43"
diff --git a/primitives/npos-elections/compact/src/codec.rs b/primitives/npos-elections/solution-type/src/codec.rs
similarity index 76%
rename from primitives/npos-elections/compact/src/codec.rs
rename to primitives/npos-elections/solution-type/src/codec.rs
index 6d59e11f041b..21688c03ace5 100644
--- a/primitives/npos-elections/compact/src/codec.rs
+++ b/primitives/npos-elections/solution-type/src/codec.rs
@@ -17,7 +17,7 @@
 
 //! Code generation for the ratio assignment type' encode/decode impl.
 
-use crate::field_name_for;
+use crate::vote_field;
 use proc_macro2::TokenStream as TokenStream2;
 use quote::quote;
 
@@ -45,7 +45,7 @@ fn decode_impl(
 	count: usize,
 ) -> TokenStream2 {
 	let decode_impl_single = {
-		let name = field_name_for(1);
+		let name = vote_field(1);
 		quote! {
 			let #name =
 			<
@@ -60,29 +60,9 @@ fn decode_impl(
 		}
 	};
 
-	let decode_impl_double = {
-		let name = field_name_for(2);
-		quote! {
-			let #name =
-			<
-				_npos::sp_std::prelude::Vec<(
-					_npos::codec::Compact<#voter_type>,
-					(_npos::codec::Compact<#target_type>, _npos::codec::Compact<#weight_type>),
-					_npos::codec::Compact<#target_type>,
-				)>
-				as
-				_npos::codec::Decode
-			>::decode(value)?;
-			let #name = #name
-				.into_iter()
-				.map(|(v, (t1, w), t2)| (v.0, (t1.0, w.0), t2.0))
-				.collect::<_npos::sp_std::prelude::Vec<_>>();
-		}
-	};
-
-	let decode_impl_rest = (3..=count)
+	let decode_impl_rest = (2..=count)
 		.map(|c| {
-			let name = field_name_for(c);
+			let name = vote_field(c);
 
 			let inner_impl = (0..c - 1)
 				.map(|i| quote! { ( (inner[#i].0).0, (inner[#i].1).0 ), })
@@ -112,7 +92,7 @@ fn decode_impl(
 
 	let all_field_names = (1..=count)
 		.map(|c| {
-			let name = field_name_for(c);
+			let name = vote_field(c);
 			quote! { #name, }
 		})
 		.collect::<TokenStream2>();
@@ -121,7 +101,6 @@ fn decode_impl(
 		impl _npos::codec::Decode for #ident {
 			fn decode<I: _npos::codec::Input>(value: &mut I) -> Result<Self, _npos::codec::Error> {
 				#decode_impl_single
-				#decode_impl_double
 				#decode_impl_rest
 
 				// The above code generates variables with the decoded value with the same name as
@@ -137,7 +116,7 @@ fn decode_impl(
 // `Encode` implementation.
 fn encode_impl(ident: syn::Ident, count: usize) -> TokenStream2 {
 	let encode_impl_single = {
-		let name = field_name_for(1);
+		let name = vote_field(1);
 		quote! {
 			let #name = self.#name
 				.iter()
@@ -150,30 +129,12 @@ fn encode_impl(ident: syn::Ident, count: usize) -> TokenStream2 {
 		}
 	};
 
-	let encode_impl_double = {
-		let name = field_name_for(2);
-		quote! {
-			let #name = self.#name
-				.iter()
-				.map(|(v, (t1, w), t2)| (
-					_npos::codec::Compact(v.clone()),
-					(
-						_npos::codec::Compact(t1.clone()),
-						_npos::codec::Compact(w.clone())
-					),
-					_npos::codec::Compact(t2.clone()),
-				))
-				.collect::<_npos::sp_std::prelude::Vec<_>>();
-			#name.encode_to(&mut r);
-		}
-	};
-
-	let encode_impl_rest = (3..=count)
+	let encode_impl_rest = (2..=count)
 		.map(|c| {
-			let name = field_name_for(c);
+			let name = vote_field(c);
 
 			// we use the knowledge of the length to avoid copy_from_slice.
-			let inners_compact_array = (0..c - 1)
+			let inners_solution_array = (0..c - 1)
 				.map(|i| {
 					quote! {(
 						_npos::codec::Compact(inner[#i].0.clone()),
@@ -187,7 +148,7 @@ fn encode_impl(ident: syn::Ident, count: usize) -> TokenStream2 {
 					.iter()
 					.map(|(v, inner, t_last)| (
 						_npos::codec::Compact(v.clone()),
-						[ #inners_compact_array ],
+						[ #inners_solution_array ],
 						_npos::codec::Compact(t_last.clone()),
 					))
 					.collect::<_npos::sp_std::prelude::Vec<_>>();
@@ -201,7 +162,6 @@ fn encode_impl(ident: syn::Ident, count: usize) -> TokenStream2 {
 			fn encode(&self) -> _npos::sp_std::prelude::Vec<u8> {
 				let mut r = vec![];
 				#encode_impl_single
-				#encode_impl_double
 				#encode_impl_rest
 				r
 			}
diff --git a/primitives/npos-elections/solution-type/src/from_assignment_helpers.rs b/primitives/npos-elections/solution-type/src/from_assignment_helpers.rs
new file mode 100644
index 000000000000..dc194baa6d9e
--- /dev/null
+++ b/primitives/npos-elections/solution-type/src/from_assignment_helpers.rs
@@ -0,0 +1,56 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Helpers to generate the push code for `from_assignment` implementations. This can be shared
+//! between both single_page and double_page, thus extracted here.
+//!
+//! All of the code in this helper module assumes some variable names, namely `who` and
+//! `distribution`.
+
+use proc_macro2::TokenStream as TokenStream2;
+use quote::quote;
+
+pub(crate) fn from_impl_single_push_code() -> TokenStream2 {
+	quote!(push((
+		voter_index(&who).or_invalid_index()?,
+		target_index(&distribution[0].0).or_invalid_index()?,
+	)))
+}
+
+pub(crate) fn from_impl_rest_push_code(count: usize) -> TokenStream2 {
+	let inner = (0..count - 1).map(|i| {
+		quote!(
+			(
+				target_index(&distribution[#i].0).or_invalid_index()?,
+				distribution[#i].1
+			)
+		)
+	});
+
+	let last_index = count - 1;
+	let last = quote!(target_index(&distribution[#last_index].0).or_invalid_index()?);
+
+	quote!(
+		push(
+			(
+				voter_index(&who).or_invalid_index()?,
+				[ #( #inner ),* ],
+				#last,
+			)
+		)
+	)
+}
diff --git a/primitives/npos-elections/compact/src/index_assignment.rs b/primitives/npos-elections/solution-type/src/index_assignment.rs
similarity index 67%
rename from primitives/npos-elections/compact/src/index_assignment.rs
rename to primitives/npos-elections/solution-type/src/index_assignment.rs
index 347be7d19984..d38dc3ec309d 100644
--- a/primitives/npos-elections/compact/src/index_assignment.rs
+++ b/primitives/npos-elections/solution-type/src/index_assignment.rs
@@ -15,16 +15,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Code generation for getting the compact representation from the `IndexAssignment` type.
+//! Code generation for getting the solution representation from the `IndexAssignment` type.
 
-use crate::field_name_for;
+use crate::vote_field;
 use proc_macro2::TokenStream as TokenStream2;
 use quote::quote;
 
-pub(crate) fn from_impl(count: usize) -> TokenStream2 {
+pub(crate) fn from_impl(struct_name: &syn::Ident, count: usize) -> TokenStream2 {
 	let from_impl_single = {
-		let name = field_name_for(1);
-		quote!(1 => compact.#name.push(
+		let name = vote_field(1);
+		quote!(1 => #struct_name.#name.push(
 			(
 				*who,
 				distribution[0].0,
@@ -32,32 +32,18 @@ pub(crate) fn from_impl(count: usize) -> TokenStream2 {
 		),)
 	};
 
-	let from_impl_double = {
-		let name = field_name_for(2);
-		quote!(2 => compact.#name.push(
-			(
-				*who,
-				(
-					distribution[0].0,
-					distribution[0].1,
-				),
-				distribution[1].0,
-			)
-		),)
-	};
-
-	let from_impl_rest = (3..=count)
+	let from_impl_rest = (2..=count)
 		.map(|c| {
 			let inner = (0..c - 1)
 				.map(|i| quote!((distribution[#i].0, distribution[#i].1),))
 				.collect::<TokenStream2>();
 
-			let field_name = field_name_for(c);
+			let field_name = vote_field(c);
 			let last_index = c - 1;
 			let last = quote!(distribution[#last_index].0);
 
 			quote!(
-				#c => compact.#field_name.push(
+				#c => #struct_name.#field_name.push(
 					(
 						*who,
 						[#inner],
@@ -70,7 +56,6 @@ pub(crate) fn from_impl(count: usize) -> TokenStream2 {
 
 	quote!(
 		#from_impl_single
-		#from_impl_double
 		#from_impl_rest
 	)
 }
diff --git a/primitives/npos-elections/solution-type/src/lib.rs b/primitives/npos-elections/solution-type/src/lib.rs
new file mode 100644
index 000000000000..9503f71131d9
--- /dev/null
+++ b/primitives/npos-elections/solution-type/src/lib.rs
@@ -0,0 +1,243 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Proc macro for a npos solution type.
+
+use proc_macro::TokenStream;
+use proc_macro2::{Ident, Span, TokenStream as TokenStream2};
+use proc_macro_crate::{crate_name, FoundCrate};
+use quote::quote;
+use syn::parse::{Parse, ParseStream, Result};
+
+mod codec;
+mod from_assignment_helpers;
+mod index_assignment;
+mod single_page;
+
+/// Get the name of a filed based on voter count.
+pub(crate) fn vote_field(n: usize) -> Ident {
+	quote::format_ident!("votes{}", n)
+}
+
+/// Generate a `syn::Error`.
+pub(crate) fn syn_err(message: &'static str) -> syn::Error {
+	syn::Error::new(Span::call_site(), message)
+}
+
+/// Generates a struct to store the election result in a small/compact way. This can encode a
+/// structure which is the equivalent of a `sp_npos_elections::Assignment<_>`.
+///
+/// The following data types can be configured by the macro.
+///
+/// - The identifier of the voter. This can be any type that supports `parity-scale-codec`'s compact
+///   encoding.
+/// - The identifier of the target. This can be any type that supports `parity-scale-codec`'s
+///   compact encoding.
+/// - The accuracy of the ratios. This must be one of the `PerThing` types defined in
+///   `sp-arithmetic`.
+///
+/// Moreover, the maximum number of edges per voter (distribution per assignment) also need to be
+/// specified. Attempting to convert from/to an assignment with more distributions will fail.
+///
+/// For example, the following generates a public struct with name `TestSolution` with `u16` voter
+/// type, `u8` target type and `Perbill` accuracy with maximum of 4 edges per voter.
+///
+/// ```
+/// # use sp_npos_elections_solution_type::generate_solution_type;
+/// # use sp_arithmetic::per_things::Perbill;
+/// generate_solution_type!(pub struct TestSolution::<
+///     VoterIndex = u16,
+///     TargetIndex = u8,
+///     Accuracy = Perbill,
+/// >(4));
+/// ```
+///
+/// The output of this macro will roughly look like:
+///
+/// ```ignore
+/// struct TestSolution {
+/// 	voters1: vec![(u16 /* voter */, u8 /* target */)]
+/// 	voters2: vec![
+/// 		(u16 /* voter */, [u8 /* first target*/, Perbill /* proportion for first target */], u8 /* last target */)
+/// 	]
+/// 	voters3: vec![
+/// 		(u16 /* voter */,  [
+/// 			(u8 /* first target*/, Perbill /* proportion for first target */ ),
+/// 			(u8 /* second target */, Perbill /* proportion for second target*/)
+/// 		], u8 /* last target */)
+///		],
+/// 	voters4: ...,
+/// }
+///
+/// impl NposSolution for TestSolution {};
+/// impl Solution for TestSolution {};
+/// ```
+///
+/// The given struct provides function to convert from/to `Assignment` as part of
+/// [`sp_npos_elections::Solution`] trait:
+///
+/// - `fn from_assignment<..>(..)`
+/// - `fn into_assignment<..>(..)`
+///
+/// ## Compact Encoding
+///
+/// The generated struct is by default deriving both `Encode` and `Decode`. This is okay but could
+/// lead to many `0`s in the solution. If prefixed with `#[compact]`, then a custom compact encoding
+/// for numbers will be used, similar to how `parity-scale-codec`'s `Compact` works.
+///
+/// ```
+/// # use sp_npos_elections_solution_type::generate_solution_type;
+/// # use sp_npos_elections::NposSolution;
+/// # use sp_arithmetic::per_things::Perbill;
+/// generate_solution_type!(
+///     #[compact]
+///     pub struct TestSolutionCompact::<VoterIndex = u16, TargetIndex = u8, Accuracy = Perbill>(8)
+/// );
+/// ```
+#[proc_macro]
+pub fn generate_solution_type(item: TokenStream) -> TokenStream {
+	let solution_def = syn::parse_macro_input!(item as SolutionDef);
+
+	let imports = imports().unwrap_or_else(|e| e.to_compile_error());
+
+	let def = single_page::generate(solution_def).unwrap_or_else(|e| e.to_compile_error());
+
+	quote!(
+		#imports
+		#def
+	)
+	.into()
+}
+
+struct SolutionDef {
+	vis: syn::Visibility,
+	ident: syn::Ident,
+	voter_type: syn::Type,
+	target_type: syn::Type,
+	weight_type: syn::Type,
+	count: usize,
+	compact_encoding: bool,
+}
+
+fn check_attributes(input: ParseStream) -> syn::Result<bool> {
+	let attrs = input.call(syn::Attribute::parse_outer).unwrap_or_default();
+	if attrs.len() > 1 {
+		return Err(syn_err("compact solution can accept only #[compact]"))
+	}
+
+	Ok(attrs.iter().any(|attr| {
+		if attr.path.segments.len() == 1 {
+			let segment = attr.path.segments.first().expect("Vec with len 1 can be popped.");
+			if segment.ident == Ident::new("compact", Span::call_site()) {
+				return true
+			}
+		}
+		false
+	}))
+}
+
+impl Parse for SolutionDef {
+	fn parse(input: ParseStream) -> syn::Result<Self> {
+		// optional #[compact]
+		let compact_encoding = check_attributes(input)?;
+
+		// <vis> struct <name>
+		let vis: syn::Visibility = input.parse()?;
+		let _ = <syn::Token![struct]>::parse(input)?;
+		let ident: syn::Ident = input.parse()?;
+
+		// ::<V, T, W>
+		let _ = <syn::Token![::]>::parse(input)?;
+		let generics: syn::AngleBracketedGenericArguments = input.parse()?;
+
+		if generics.args.len() != 3 {
+			return Err(syn_err("Must provide 3 generic args."))
+		}
+
+		let expected_types = ["VoterIndex", "TargetIndex", "Accuracy"];
+
+		let mut types: Vec<syn::Type> = generics
+			.args
+			.iter()
+			.zip(expected_types.iter())
+			.map(|(t, expected)| match t {
+				syn::GenericArgument::Type(ty) => {
+					// this is now an error
+					Err(syn::Error::new_spanned(
+						ty,
+						format!("Expected binding: `{} = ...`", expected),
+					))
+				},
+				syn::GenericArgument::Binding(syn::Binding { ident, ty, .. }) => {
+					// check that we have the right keyword for this position in the argument list
+					if ident == expected {
+						Ok(ty.clone())
+					} else {
+						Err(syn::Error::new_spanned(ident, format!("Expected `{}`", expected)))
+					}
+				},
+				_ => Err(syn_err("Wrong type of generic provided. Must be a `type`.")),
+			})
+			.collect::<Result<_>>()?;
+
+		let weight_type = types.pop().expect("Vector of length 3 can be popped; qed");
+		let target_type = types.pop().expect("Vector of length 2 can be popped; qed");
+		let voter_type = types.pop().expect("Vector of length 1 can be popped; qed");
+
+		// (<count>)
+		let count_expr: syn::ExprParen = input.parse()?;
+		let count = parse_parenthesized_number::<usize>(count_expr)?;
+
+		Ok(Self { vis, ident, voter_type, target_type, weight_type, count, compact_encoding })
+	}
+}
+
+fn parse_parenthesized_number<N: std::str::FromStr>(input_expr: syn::ExprParen) -> syn::Result<N>
+where
+	<N as std::str::FromStr>::Err: std::fmt::Display,
+{
+	let expr = input_expr.expr;
+	let expr_lit = match *expr {
+		syn::Expr::Lit(count_lit) => count_lit.lit,
+		_ => return Err(syn_err("Count must be literal.")),
+	};
+	let int_lit = match expr_lit {
+		syn::Lit::Int(int_lit) => int_lit,
+		_ => return Err(syn_err("Count must be int literal.")),
+	};
+	int_lit.base10_parse::<N>()
+}
+
+fn imports() -> Result<TokenStream2> {
+	match crate_name("sp-npos-elections") {
+		Ok(FoundCrate::Itself) => Ok(quote! { use crate as _npos; }),
+		Ok(FoundCrate::Name(sp_npos_elections)) => {
+			let ident = syn::Ident::new(&sp_npos_elections, Span::call_site());
+			Ok(quote!( extern crate #ident as _npos; ))
+		},
+		Err(e) => Err(syn::Error::new(Span::call_site(), e)),
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	#[test]
+	fn ui_fail() {
+		let cases = trybuild::TestCases::new();
+		cases.compile_fail("tests/ui/fail/*.rs");
+	}
+}
diff --git a/primitives/npos-elections/solution-type/src/single_page.rs b/primitives/npos-elections/solution-type/src/single_page.rs
new file mode 100644
index 000000000000..7dfd0e56618f
--- /dev/null
+++ b/primitives/npos-elections/solution-type/src/single_page.rs
@@ -0,0 +1,354 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::{from_assignment_helpers::*, syn_err, vote_field};
+use proc_macro2::TokenStream as TokenStream2;
+use quote::quote;
+use syn::parse::Result;
+
+pub(crate) fn generate(def: crate::SolutionDef) -> Result<TokenStream2> {
+	let crate::SolutionDef {
+		vis,
+		ident,
+		count,
+		voter_type,
+		target_type,
+		weight_type,
+		compact_encoding,
+	} = def;
+
+	if count <= 2 {
+		Err(syn_err("cannot build solution struct with capacity less than 3."))?
+	}
+
+	let single = {
+		let name = vote_field(1);
+		// NOTE: we use the visibility of the struct for the fields as well.. could be made better.
+		quote!(
+			#vis #name: _npos::sp_std::prelude::Vec<(#voter_type, #target_type)>,
+		)
+	};
+
+	let rest = (2..=count)
+		.map(|c| {
+			let field_name = vote_field(c);
+			let array_len = c - 1;
+			quote!(
+				#vis #field_name: _npos::sp_std::prelude::Vec<(
+					#voter_type,
+					[(#target_type, #weight_type); #array_len],
+					#target_type
+				)>,
+			)
+		})
+		.collect::<TokenStream2>();
+
+	let len_impl = len_impl(count);
+	let edge_count_impl = edge_count_impl(count);
+	let unique_targets_impl = unique_targets_impl(count);
+	let remove_voter_impl = remove_voter_impl(count);
+
+	let derives_and_maybe_compact_encoding = if compact_encoding {
+		// custom compact encoding.
+		let compact_impl = crate::codec::codec_impl(
+			ident.clone(),
+			voter_type.clone(),
+			target_type.clone(),
+			weight_type.clone(),
+			count,
+		);
+		quote! {
+			#compact_impl
+			#[derive(Default, PartialEq, Eq, Clone, Debug, PartialOrd, Ord)]
+		}
+	} else {
+		// automatically derived.
+		quote!(#[derive(Default, PartialEq, Eq, Clone, Debug, _npos::codec::Encode, _npos::codec::Decode)])
+	};
+
+	let struct_name = syn::Ident::new("solution", proc_macro2::Span::call_site());
+	let assignment_name = syn::Ident::new("all_assignments", proc_macro2::Span::call_site());
+
+	let from_impl = from_impl(&struct_name, count);
+	let into_impl = into_impl(&assignment_name, count, weight_type.clone());
+	let from_index_impl = crate::index_assignment::from_impl(&struct_name, count);
+
+	Ok(quote! (
+		/// A struct to encode a election assignment in a compact way.
+		#derives_and_maybe_compact_encoding
+		#vis struct #ident { #single #rest }
+
+		use _npos::__OrInvalidIndex;
+		impl _npos::NposSolution for #ident {
+			const LIMIT: usize = #count;
+			type VoterIndex = #voter_type;
+			type TargetIndex = #target_type;
+			type Accuracy = #weight_type;
+
+			fn remove_voter(&mut self, to_remove: Self::VoterIndex) -> bool {
+				#remove_voter_impl
+				return false
+			}
+
+			fn from_assignment<FV, FT, A>(
+				assignments: &[_npos::Assignment<A, #weight_type>],
+				voter_index: FV,
+				target_index: FT,
+			) -> Result<Self, _npos::Error>
+				where
+					A: _npos::IdentifierT,
+					for<'r> FV: Fn(&'r A) -> Option<Self::VoterIndex>,
+					for<'r> FT: Fn(&'r A) -> Option<Self::TargetIndex>,
+			{
+				let mut #struct_name: #ident = Default::default();
+				for _npos::Assignment { who, distribution } in assignments {
+					match distribution.len() {
+						0 => continue,
+						#from_impl
+						_ => {
+							return Err(_npos::Error::SolutionTargetOverflow);
+						}
+					}
+				};
+				Ok(#struct_name)
+			}
+
+			fn into_assignment<A: _npos::IdentifierT>(
+				self,
+				voter_at: impl Fn(Self::VoterIndex) -> Option<A>,
+				target_at: impl Fn(Self::TargetIndex) -> Option<A>,
+			) -> Result<_npos::sp_std::prelude::Vec<_npos::Assignment<A, #weight_type>>, _npos::Error> {
+				let mut #assignment_name: _npos::sp_std::prelude::Vec<_npos::Assignment<A, #weight_type>> = Default::default();
+				#into_impl
+				Ok(#assignment_name)
+			}
+
+			fn voter_count(&self) -> usize {
+				let mut all_len = 0usize;
+				#len_impl
+				all_len
+			}
+
+			fn edge_count(&self) -> usize {
+				let mut all_edges = 0usize;
+				#edge_count_impl
+				all_edges
+			}
+
+			fn unique_targets(&self) -> _npos::sp_std::prelude::Vec<Self::TargetIndex> {
+				// NOTE: this implementation returns the targets sorted, but we don't use it yet per
+				// se, nor is the API enforcing it.
+				use _npos::sp_std::collections::btree_set::BTreeSet;
+				let mut all_targets: BTreeSet<Self::TargetIndex> = BTreeSet::new();
+				let mut maybe_insert_target = |t: Self::TargetIndex| {
+					all_targets.insert(t);
+				};
+
+				#unique_targets_impl
+
+				all_targets.into_iter().collect()
+			}
+		}
+
+		type __IndexAssignment = _npos::IndexAssignment<
+			<#ident as _npos::NposSolution>::VoterIndex,
+			<#ident as _npos::NposSolution>::TargetIndex,
+			<#ident as _npos::NposSolution>::Accuracy,
+		>;
+		impl<'a> _npos::sp_std::convert::TryFrom<&'a [__IndexAssignment]> for #ident {
+			type Error = _npos::Error;
+			fn try_from(index_assignments: &'a [__IndexAssignment]) -> Result<Self, Self::Error> {
+				let mut #struct_name =  #ident::default();
+
+				for _npos::IndexAssignment { who, distribution } in index_assignments {
+					match distribution.len() {
+						0 => {}
+						#from_index_impl
+						_ => {
+							return Err(_npos::Error::SolutionTargetOverflow);
+						}
+					}
+				};
+
+				Ok(#struct_name)
+			}
+		}
+	))
+}
+
+fn remove_voter_impl(count: usize) -> TokenStream2 {
+	let field_name = vote_field(1);
+	let single = quote! {
+		if let Some(idx) = self.#field_name.iter().position(|(x, _)| *x == to_remove) {
+			self.#field_name.remove(idx);
+			return true
+		}
+	};
+
+	let rest = (2..=count)
+		.map(|c| {
+			let field_name = vote_field(c);
+			quote! {
+				if let Some(idx) = self.#field_name.iter().position(|(x, _, _)| *x == to_remove) {
+					self.#field_name.remove(idx);
+					return true
+				}
+			}
+		})
+		.collect::<TokenStream2>();
+
+	quote! {
+		#single
+		#rest
+	}
+}
+
+fn len_impl(count: usize) -> TokenStream2 {
+	(1..=count)
+		.map(|c| {
+			let field_name = vote_field(c);
+			quote!(
+				all_len = all_len.saturating_add(self.#field_name.len());
+			)
+		})
+		.collect::<TokenStream2>()
+}
+
+fn edge_count_impl(count: usize) -> TokenStream2 {
+	(1..=count)
+		.map(|c| {
+			let field_name = vote_field(c);
+			quote!(
+				all_edges = all_edges.saturating_add(
+					self.#field_name.len().saturating_mul(#c as usize)
+				);
+			)
+		})
+		.collect::<TokenStream2>()
+}
+
+fn unique_targets_impl(count: usize) -> TokenStream2 {
+	let unique_targets_impl_single = {
+		let field_name = vote_field(1);
+		quote! {
+			self.#field_name.iter().for_each(|(_, t)| {
+				maybe_insert_target(*t);
+			});
+		}
+	};
+
+	let unique_targets_impl_rest = (2..=count)
+		.map(|c| {
+			let field_name = vote_field(c);
+			quote! {
+				self.#field_name.iter().for_each(|(_, inners, t_last)| {
+					inners.iter().for_each(|(t, _)| {
+						maybe_insert_target(*t);
+					});
+					maybe_insert_target(*t_last);
+				});
+			}
+		})
+		.collect::<TokenStream2>();
+
+	quote! {
+		#unique_targets_impl_single
+		#unique_targets_impl_rest
+	}
+}
+
+pub(crate) fn from_impl(struct_name: &syn::Ident, count: usize) -> TokenStream2 {
+	let from_impl_single = {
+		let field = vote_field(1);
+		let push_code = from_impl_single_push_code();
+		quote!(1 => #struct_name.#field.#push_code,)
+	};
+
+	let from_impl_rest = (2..=count)
+		.map(|c| {
+			let field = vote_field(c);
+			let push_code = from_impl_rest_push_code(c);
+			quote!(#c => #struct_name.#field.#push_code,)
+		})
+		.collect::<TokenStream2>();
+
+	quote!(
+		#from_impl_single
+		#from_impl_rest
+	)
+}
+
+pub(crate) fn into_impl(
+	assignments: &syn::Ident,
+	count: usize,
+	per_thing: syn::Type,
+) -> TokenStream2 {
+	let into_impl_single = {
+		let name = vote_field(1);
+		quote!(
+			for (voter_index, target_index) in self.#name {
+				#assignments.push(_npos::Assignment {
+					who: voter_at(voter_index).or_invalid_index()?,
+					distribution: vec![
+						(target_at(target_index).or_invalid_index()?, #per_thing::one())
+					],
+				})
+			}
+		)
+	};
+
+	let into_impl_rest = (2..=count)
+		.map(|c| {
+			let name = vote_field(c);
+			quote!(
+				for (voter_index, inners, t_last_idx) in self.#name {
+					let mut sum = #per_thing::zero();
+					let mut inners_parsed = inners
+						.iter()
+						.map(|(ref t_idx, p)| {
+							sum = _npos::sp_arithmetic::traits::Saturating::saturating_add(sum, *p);
+							let target = target_at(*t_idx).or_invalid_index()?;
+							Ok((target, *p))
+						})
+						.collect::<Result<_npos::sp_std::prelude::Vec<(A, #per_thing)>, _npos::Error>>()?;
+
+					if sum >= #per_thing::one() {
+						return Err(_npos::Error::SolutionWeightOverflow);
+					}
+
+					// defensive only. Since Percent doesn't have `Sub`.
+					let p_last = _npos::sp_arithmetic::traits::Saturating::saturating_sub(
+						#per_thing::one(),
+						sum,
+					);
+
+					inners_parsed.push((target_at(t_last_idx).or_invalid_index()?, p_last));
+
+					#assignments.push(_npos::Assignment {
+						who: voter_at(voter_index).or_invalid_index()?,
+						distribution: inners_parsed,
+					});
+				}
+			)
+		})
+		.collect::<TokenStream2>();
+
+	quote!(
+		#into_impl_single
+		#into_impl_rest
+	)
+}
diff --git a/primitives/npos-elections/compact/tests/ui/fail/missing_accuracy.rs b/primitives/npos-elections/solution-type/tests/ui/fail/missing_accuracy.rs
similarity index 66%
rename from primitives/npos-elections/compact/tests/ui/fail/missing_accuracy.rs
rename to primitives/npos-elections/solution-type/tests/ui/fail/missing_accuracy.rs
index 4bbf4960a948..b74b857e4581 100644
--- a/primitives/npos-elections/compact/tests/ui/fail/missing_accuracy.rs
+++ b/primitives/npos-elections/solution-type/tests/ui/fail/missing_accuracy.rs
@@ -1,4 +1,4 @@
-use sp_npos_elections_compact::generate_solution_type;
+use sp_npos_elections_solution_type::generate_solution_type;
 
 generate_solution_type!(pub struct TestSolution::<
 	VoterIndex = u16,
diff --git a/primitives/npos-elections/compact/tests/ui/fail/missing_accuracy.stderr b/primitives/npos-elections/solution-type/tests/ui/fail/missing_accuracy.stderr
similarity index 100%
rename from primitives/npos-elections/compact/tests/ui/fail/missing_accuracy.stderr
rename to primitives/npos-elections/solution-type/tests/ui/fail/missing_accuracy.stderr
diff --git a/primitives/npos-elections/compact/tests/ui/fail/missing_target.rs b/primitives/npos-elections/solution-type/tests/ui/fail/missing_target.rs
similarity index 65%
rename from primitives/npos-elections/compact/tests/ui/fail/missing_target.rs
rename to primitives/npos-elections/solution-type/tests/ui/fail/missing_target.rs
index 7d7584340713..4c9cd51a3209 100644
--- a/primitives/npos-elections/compact/tests/ui/fail/missing_target.rs
+++ b/primitives/npos-elections/solution-type/tests/ui/fail/missing_target.rs
@@ -1,4 +1,4 @@
-use sp_npos_elections_compact::generate_solution_type;
+use sp_npos_elections_solution_type::generate_solution_type;
 
 generate_solution_type!(pub struct TestSolution::<
 	VoterIndex = u16,
diff --git a/primitives/npos-elections/compact/tests/ui/fail/missing_target.stderr b/primitives/npos-elections/solution-type/tests/ui/fail/missing_target.stderr
similarity index 100%
rename from primitives/npos-elections/compact/tests/ui/fail/missing_target.stderr
rename to primitives/npos-elections/solution-type/tests/ui/fail/missing_target.stderr
diff --git a/primitives/npos-elections/compact/tests/ui/fail/missing_voter.rs b/primitives/npos-elections/solution-type/tests/ui/fail/missing_voter.rs
similarity index 66%
rename from primitives/npos-elections/compact/tests/ui/fail/missing_voter.rs
rename to primitives/npos-elections/solution-type/tests/ui/fail/missing_voter.rs
index 3ad77dc104ad..b87037f77f1e 100644
--- a/primitives/npos-elections/compact/tests/ui/fail/missing_voter.rs
+++ b/primitives/npos-elections/solution-type/tests/ui/fail/missing_voter.rs
@@ -1,4 +1,4 @@
-use sp_npos_elections_compact::generate_solution_type;
+use sp_npos_elections_solution_type::generate_solution_type;
 
 generate_solution_type!(pub struct TestSolution::<
 	u16,
diff --git a/primitives/npos-elections/compact/tests/ui/fail/missing_voter.stderr b/primitives/npos-elections/solution-type/tests/ui/fail/missing_voter.stderr
similarity index 100%
rename from primitives/npos-elections/compact/tests/ui/fail/missing_voter.stderr
rename to primitives/npos-elections/solution-type/tests/ui/fail/missing_voter.stderr
diff --git a/primitives/npos-elections/compact/tests/ui/fail/no_annotations.rs b/primitives/npos-elections/solution-type/tests/ui/fail/no_annotations.rs
similarity index 60%
rename from primitives/npos-elections/compact/tests/ui/fail/no_annotations.rs
rename to primitives/npos-elections/solution-type/tests/ui/fail/no_annotations.rs
index aaebb857b3d8..cfca2841db63 100644
--- a/primitives/npos-elections/compact/tests/ui/fail/no_annotations.rs
+++ b/primitives/npos-elections/solution-type/tests/ui/fail/no_annotations.rs
@@ -1,4 +1,4 @@
-use sp_npos_elections_compact::generate_solution_type;
+use sp_npos_elections_solution_type::generate_solution_type;
 
 generate_solution_type!(pub struct TestSolution::<
 	u16,
diff --git a/primitives/npos-elections/compact/tests/ui/fail/no_annotations.stderr b/primitives/npos-elections/solution-type/tests/ui/fail/no_annotations.stderr
similarity index 100%
rename from primitives/npos-elections/compact/tests/ui/fail/no_annotations.stderr
rename to primitives/npos-elections/solution-type/tests/ui/fail/no_annotations.stderr
diff --git a/primitives/npos-elections/compact/tests/ui/fail/swap_voter_target.rs b/primitives/npos-elections/solution-type/tests/ui/fail/swap_voter_target.rs
similarity index 68%
rename from primitives/npos-elections/compact/tests/ui/fail/swap_voter_target.rs
rename to primitives/npos-elections/solution-type/tests/ui/fail/swap_voter_target.rs
index 37124256b35e..443202d11b39 100644
--- a/primitives/npos-elections/compact/tests/ui/fail/swap_voter_target.rs
+++ b/primitives/npos-elections/solution-type/tests/ui/fail/swap_voter_target.rs
@@ -1,4 +1,4 @@
-use sp_npos_elections_compact::generate_solution_type;
+use sp_npos_elections_solution_type::generate_solution_type;
 
 generate_solution_type!(pub struct TestSolution::<
 	TargetIndex = u16,
diff --git a/primitives/npos-elections/compact/tests/ui/fail/swap_voter_target.stderr b/primitives/npos-elections/solution-type/tests/ui/fail/swap_voter_target.stderr
similarity index 100%
rename from primitives/npos-elections/compact/tests/ui/fail/swap_voter_target.stderr
rename to primitives/npos-elections/solution-type/tests/ui/fail/swap_voter_target.stderr
diff --git a/primitives/npos-elections/solution-type/tests/ui/fail/wrong_page.rs b/primitives/npos-elections/solution-type/tests/ui/fail/wrong_page.rs
new file mode 100644
index 000000000000..3008277e36b7
--- /dev/null
+++ b/primitives/npos-elections/solution-type/tests/ui/fail/wrong_page.rs
@@ -0,0 +1,11 @@
+use sp_npos_elections_solution_type::generate_solution_type;
+
+generate_solution_type!(
+	#[pages(1)] pub struct TestSolution::<
+		VoterIndex = u8,
+		TargetIndex = u16,
+		Accuracy = Perbill,
+	>(8)
+);
+
+fn main() {}
diff --git a/primitives/npos-elections/solution-type/tests/ui/fail/wrong_page.stderr b/primitives/npos-elections/solution-type/tests/ui/fail/wrong_page.stderr
new file mode 100644
index 000000000000..7104305a9e1e
--- /dev/null
+++ b/primitives/npos-elections/solution-type/tests/ui/fail/wrong_page.stderr
@@ -0,0 +1,38 @@
+error[E0412]: cannot find type `Perbill` in this scope
+ --> $DIR/wrong_page.rs:7:14
+  |
+7 |         Accuracy = Perbill,
+  |                    ^^^^^^^ not found in this scope
+  |
+help: consider importing this struct
+  |
+1 | use sp_arithmetic::Perbill;
+  |
+
+error[E0433]: failed to resolve: use of undeclared type `Perbill`
+ --> $DIR/wrong_page.rs:7:14
+  |
+7 |         Accuracy = Perbill,
+  |                    ^^^^^^^ not found in this scope
+  |
+help: consider importing this struct
+  |
+1 | use sp_arithmetic::Perbill;
+  |
+
+error[E0119]: conflicting implementations of trait `std::convert::TryFrom<&[_npos::IndexAssignment<u8, u16, [type error]>]>` for type `TestSolution`
+ --> $DIR/wrong_page.rs:3:1
+  |
+3 | / generate_solution_type!(
+4 | |     #[pages(1)] pub struct TestSolution::<
+5 | |         VoterIndex = u8,
+6 | |         TargetIndex = u16,
+7 | |         Accuracy = Perbill,
+8 | |     >(8)
+9 | | );
+  | |__^
+  |
+  = note: conflicting implementation in crate `core`:
+          - impl<T, U> TryFrom<U> for T
+            where U: Into<T>;
+  = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/primitives/npos-elections/src/assignments.rs b/primitives/npos-elections/src/assignments.rs
index da101e64a71a..bdd1e2cd281b 100644
--- a/primitives/npos-elections/src/assignments.rs
+++ b/primitives/npos-elections/src/assignments.rs
@@ -167,11 +167,11 @@ impl<AccountId> StakedAssignment<AccountId> {
 	}
 }
 /// The [`IndexAssignment`] type is an intermediate between the assignments list
-/// ([`&[Assignment<T>]`][Assignment]) and `CompactOf<T>`.
+/// ([`&[Assignment<T>]`][Assignment]) and `SolutionOf<T>`.
 ///
 /// The voter and target identifiers have already been replaced with appropriate indices,
-/// making it fast to repeatedly encode into a `CompactOf<T>`. This property turns out
-/// to be important when trimming for compact length.
+/// making it fast to repeatedly encode into a `SolutionOf<T>`. This property turns out
+/// to be important when trimming for solution length.
 #[derive(RuntimeDebug, Clone, Default)]
 #[cfg_attr(feature = "std", derive(PartialEq, Eq, Encode, Decode))]
 pub struct IndexAssignment<VoterIndex, TargetIndex, P: PerThing> {
@@ -201,9 +201,9 @@ impl<VoterIndex, TargetIndex, P: PerThing> IndexAssignment<VoterIndex, TargetInd
 	}
 }
 
-/// A type alias for [`IndexAssignment`] made from [`crate::CompactSolution`].
+/// A type alias for [`IndexAssignment`] made from [`crate::Solution`].
 pub type IndexAssignmentOf<C> = IndexAssignment<
-	<C as crate::CompactSolution>::Voter,
-	<C as crate::CompactSolution>::Target,
-	<C as crate::CompactSolution>::Accuracy,
+	<C as crate::NposSolution>::VoterIndex,
+	<C as crate::NposSolution>::TargetIndex,
+	<C as crate::NposSolution>::Accuracy,
 >;
diff --git a/primitives/npos-elections/src/lib.rs b/primitives/npos-elections/src/lib.rs
index ece5be33b114..6a7e7e8c23cc 100644
--- a/primitives/npos-elections/src/lib.rs
+++ b/primitives/npos-elections/src/lib.rs
@@ -74,21 +74,9 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use sp_arithmetic::{
-	traits::{Bounded, UniqueSaturatedInto, Zero},
-	Normalizable, PerThing, Rational128, ThresholdOrd,
-};
+use sp_arithmetic::{traits::Zero, Normalizable, PerThing, Rational128, ThresholdOrd};
 use sp_core::RuntimeDebug;
-use sp_std::{
-	cell::RefCell,
-	cmp::Ordering,
-	collections::btree_map::BTreeMap,
-	convert::{TryFrom, TryInto},
-	fmt::Debug,
-	ops::Mul,
-	prelude::*,
-	rc::Rc,
-};
+use sp_std::{cell::RefCell, cmp::Ordering, collections::btree_map::BTreeMap, prelude::*, rc::Rc};
 
 use codec::{Decode, Encode};
 #[cfg(feature = "std")]
@@ -107,6 +95,7 @@ pub mod phragmen;
 pub mod phragmms;
 pub mod pjr;
 pub mod reduce;
+pub mod traits;
 
 pub use assignments::{Assignment, IndexAssignment, IndexAssignmentOf, StakedAssignment};
 pub use balancing::*;
@@ -115,8 +104,9 @@ pub use phragmen::*;
 pub use phragmms::*;
 pub use pjr::*;
 pub use reduce::reduce;
+pub use traits::{IdentifierT, NposSolution, PerThing128, __OrInvalidIndex};
 
-// re-export the compact macro, with the dependencies of the macro.
+// re-export for the solution macro, with the dependencies of the macro.
 #[doc(hidden)]
 pub use codec;
 #[doc(hidden)]
@@ -124,141 +114,21 @@ pub use sp_arithmetic;
 #[doc(hidden)]
 pub use sp_std;
 
-/// Simple Extension trait to easily convert `None` from index closures to `Err`.
-///
-/// This is only generated and re-exported for the compact solution code to use.
-#[doc(hidden)]
-pub trait __OrInvalidIndex<T> {
-	fn or_invalid_index(self) -> Result<T, Error>;
-}
-
-impl<T> __OrInvalidIndex<T> for Option<T> {
-	fn or_invalid_index(self) -> Result<T, Error> {
-		self.ok_or(Error::CompactInvalidIndex)
-	}
-}
-
-/// A common interface for all compact solutions.
-///
-/// See [`sp-npos-elections-compact`] for more info.
-pub trait CompactSolution
-where
-	Self: Sized + for<'a> sp_std::convert::TryFrom<&'a [IndexAssignmentOf<Self>], Error = Error>,
-{
-	/// The maximum number of votes that are allowed.
-	const LIMIT: usize;
-
-	/// The voter type. Needs to be an index (convert to usize).
-	type Voter: UniqueSaturatedInto<usize>
-		+ TryInto<usize>
-		+ TryFrom<usize>
-		+ Debug
-		+ Copy
-		+ Clone
-		+ Bounded;
-
-	/// The target type. Needs to be an index (convert to usize).
-	type Target: UniqueSaturatedInto<usize>
-		+ TryInto<usize>
-		+ TryFrom<usize>
-		+ Debug
-		+ Copy
-		+ Clone
-		+ Bounded;
-
-	/// The weight/accuracy type of each vote.
-	type Accuracy: PerThing128;
-
-	/// Build self from a list of assignments.
-	fn from_assignment<FV, FT, A>(
-		assignments: &[Assignment<A, Self::Accuracy>],
-		voter_index: FV,
-		target_index: FT,
-	) -> Result<Self, Error>
-	where
-		A: IdentifierT,
-		for<'r> FV: Fn(&'r A) -> Option<Self::Voter>,
-		for<'r> FT: Fn(&'r A) -> Option<Self::Target>;
-
-	/// Convert self into a `Vec<Assignment<A, Self::Accuracy>>`
-	fn into_assignment<A: IdentifierT>(
-		self,
-		voter_at: impl Fn(Self::Voter) -> Option<A>,
-		target_at: impl Fn(Self::Target) -> Option<A>,
-	) -> Result<Vec<Assignment<A, Self::Accuracy>>, Error>;
-
-	/// Get the length of all the voters that this type is encoding.
-	///
-	/// This is basically the same as the number of assignments, or number of active voters.
-	fn voter_count(&self) -> usize;
-
-	/// Get the total count of edges.
-	///
-	/// This is effectively in the range of {[`Self::voter_count`], [`Self::voter_count`] *
-	/// [`Self::LIMIT`]}.
-	fn edge_count(&self) -> usize;
-
-	/// Get the number of unique targets in the whole struct.
-	///
-	/// Once presented with a list of winners, this set and the set of winners must be
-	/// equal.
-	fn unique_targets(&self) -> Vec<Self::Target>;
-
-	/// Get the average edge count.
-	fn average_edge_count(&self) -> usize {
-		self.edge_count().checked_div(self.voter_count()).unwrap_or(0)
-	}
-
-	/// Remove a certain voter.
-	///
-	/// This will only search until the first instance of `to_remove`, and return true. If
-	/// no instance is found (no-op), then it returns false.
-	///
-	/// In other words, if this return true, exactly **one** element must have been removed from
-	/// `self.len()`.
-	fn remove_voter(&mut self, to_remove: Self::Voter) -> bool;
-
-	/// Compute the score of this compact solution type.
-	fn score<A, FS>(
-		self,
-		winners: &[A],
-		stake_of: FS,
-		voter_at: impl Fn(Self::Voter) -> Option<A>,
-		target_at: impl Fn(Self::Target) -> Option<A>,
-	) -> Result<ElectionScore, Error>
-	where
-		for<'r> FS: Fn(&'r A) -> VoteWeight,
-		A: IdentifierT,
-	{
-		let ratio = self.into_assignment(voter_at, target_at)?;
-		let staked = helpers::assignment_ratio_to_staked_normalized(ratio, stake_of)?;
-		let supports = to_supports(winners, &staked)?;
-		Ok(supports.evaluate())
-	}
-}
-
-// re-export the compact solution type.
-pub use sp_npos_elections_compact::generate_solution_type;
-
-/// an aggregator trait for a generic type of a voter/target identifier. This usually maps to
-/// substrate's account id.
-pub trait IdentifierT: Clone + Eq + Default + Ord + Debug + codec::Codec {}
-impl<T: Clone + Eq + Default + Ord + Debug + codec::Codec> IdentifierT for T {}
-
-/// Aggregator trait for a PerThing that can be multiplied by u128 (ExtendedBalance).
-pub trait PerThing128: PerThing + Mul<ExtendedBalance, Output = ExtendedBalance> {}
-impl<T: PerThing + Mul<ExtendedBalance, Output = ExtendedBalance>> PerThing128 for T {}
+// re-export the solution type macro.
+pub use sp_npos_elections_solution_type::generate_solution_type;
 
-/// The errors that might occur in the this crate and compact.
+/// The errors that might occur in the this crate and solution-type.
 #[derive(Eq, PartialEq, RuntimeDebug)]
 pub enum Error {
-	/// While going from compact to staked, the stake of all the edges has gone above the total and
-	/// the last stake cannot be assigned.
-	CompactStakeOverflow,
-	/// The compact type has a voter who's number of targets is out of bound.
-	CompactTargetOverflow,
+	/// While going from solution indices to ratio, the weight of all the edges has gone above the
+	/// total.
+	SolutionWeightOverflow,
+	/// The solution type has a voter who's number of targets is out of bound.
+	SolutionTargetOverflow,
 	/// One of the index functions returned none.
-	CompactInvalidIndex,
+	SolutionInvalidIndex,
+	/// One of the page indices was invalid
+	SolutionInvalidPageIndex,
 	/// An error occurred in some arithmetic operation.
 	ArithmeticError(&'static str),
 	/// The data provided to create support map was invalid.
@@ -507,12 +377,12 @@ impl<A> FlattenSupportMap<A> for SupportMap<A> {
 ///
 /// The list of winners is basically a redundancy for error checking only; It ensures that all the
 /// targets pointed to by the [`Assignment`] are present in the `winners`.
-pub fn to_support_map<A: IdentifierT>(
-	winners: &[A],
-	assignments: &[StakedAssignment<A>],
-) -> Result<SupportMap<A>, Error> {
+pub fn to_support_map<AccountId: IdentifierT>(
+	winners: &[AccountId],
+	assignments: &[StakedAssignment<AccountId>],
+) -> Result<SupportMap<AccountId>, Error> {
 	// Initialize the support of each candidate.
-	let mut supports = <SupportMap<A>>::new();
+	let mut supports = <SupportMap<AccountId>>::new();
 	winners.iter().for_each(|e| {
 		supports.insert(e.clone(), Default::default());
 	});
@@ -535,10 +405,10 @@ pub fn to_support_map<A: IdentifierT>(
 /// flat vector.
 ///
 /// Similar to [`to_support_map`], `winners` is used for error checking.
-pub fn to_supports<A: IdentifierT>(
-	winners: &[A],
-	assignments: &[StakedAssignment<A>],
-) -> Result<Supports<A>, Error> {
+pub fn to_supports<AccountId: IdentifierT>(
+	winners: &[AccountId],
+	assignments: &[StakedAssignment<AccountId>],
+) -> Result<Supports<AccountId>, Error> {
 	to_support_map(winners, assignments).map(FlattenSupportMap::flatten)
 }
 
diff --git a/primitives/npos-elections/src/mock.rs b/primitives/npos-elections/src/mock.rs
index 8de0c09959d1..36fd78b5757e 100644
--- a/primitives/npos-elections/src/mock.rs
+++ b/primitives/npos-elections/src/mock.rs
@@ -17,7 +17,7 @@
 
 //! Mock file for npos-elections.
 
-#![cfg(any(test, mocks))]
+#![cfg(test)]
 
 use std::{
 	collections::{HashMap, HashSet},
@@ -35,20 +35,27 @@ use sp_std::collections::btree_map::BTreeMap;
 
 use crate::{seq_phragmen, Assignment, ElectionResult, ExtendedBalance, PerThing128, VoteWeight};
 
-sp_npos_elections_compact::generate_solution_type!(
-	#[compact]
-	pub struct Compact::<VoterIndex = u32, TargetIndex = u16, Accuracy = Accuracy>(16)
-);
-
 pub type AccountId = u64;
+
 /// The candidate mask allows easy disambiguation between voters and candidates: accounts
 /// for which this bit is set are candidates, and without it, are voters.
 pub const CANDIDATE_MASK: AccountId = 1 << ((std::mem::size_of::<AccountId>() * 8) - 1);
-pub type CandidateId = AccountId;
 
-pub type Accuracy = sp_runtime::Perbill;
+pub type TestAccuracy = sp_runtime::Perbill;
+
+crate::generate_solution_type! {
+	pub struct TestSolution::<
+		VoterIndex = u32,
+		TargetIndex = u16,
+		Accuracy = TestAccuracy,
+	>(16)
+}
+
+pub fn p(p: u8) -> TestAccuracy {
+	TestAccuracy::from_percent(p.into())
+}
 
-pub type MockAssignment = crate::Assignment<AccountId, Accuracy>;
+pub type MockAssignment = crate::Assignment<AccountId, TestAccuracy>;
 pub type Voter = (AccountId, VoteWeight, Vec<AccountId>);
 
 #[derive(Default, Debug)]
@@ -422,7 +429,7 @@ pub fn generate_random_votes(
 	candidate_count: usize,
 	voter_count: usize,
 	mut rng: impl Rng,
-) -> (Vec<Voter>, Vec<MockAssignment>, Vec<CandidateId>) {
+) -> (Vec<Voter>, Vec<MockAssignment>, Vec<AccountId>) {
 	// cache for fast generation of unique candidate and voter ids
 	let mut used_ids = HashSet::with_capacity(candidate_count + voter_count);
 
@@ -452,7 +459,8 @@ pub fn generate_random_votes(
 
 		// it's not interesting if a voter chooses 0 or all candidates, so rule those cases out.
 		// also, let's not generate any cases which result in a compact overflow.
-		let n_candidates_chosen = rng.gen_range(1, candidates.len().min(16));
+		let n_candidates_chosen =
+			rng.gen_range(1, candidates.len().min(<TestSolution as crate::NposSolution>::LIMIT));
 
 		let mut chosen_candidates = Vec::with_capacity(n_candidates_chosen);
 		chosen_candidates.extend(candidates.choose_multiple(&mut rng, n_candidates_chosen));
@@ -473,16 +481,16 @@ pub fn generate_random_votes(
 
 		// distribute the available stake randomly
 		let stake_distribution = if num_chosen_winners == 0 {
-			Vec::new()
+			continue
 		} else {
 			let mut available_stake = 1000;
 			let mut stake_distribution = Vec::with_capacity(num_chosen_winners);
 			for _ in 0..num_chosen_winners - 1 {
-				let stake = rng.gen_range(0, available_stake);
-				stake_distribution.push(Accuracy::from_perthousand(stake));
+				let stake = rng.gen_range(0, available_stake).min(1);
+				stake_distribution.push(TestAccuracy::from_perthousand(stake));
 				available_stake -= stake;
 			}
-			stake_distribution.push(Accuracy::from_perthousand(available_stake));
+			stake_distribution.push(TestAccuracy::from_perthousand(available_stake));
 			stake_distribution.shuffle(&mut rng);
 			stake_distribution
 		};
@@ -514,16 +522,26 @@ where
 	usize: TryInto<VoterIndex>,
 {
 	let cache = generate_cache(voters.iter().map(|(id, _, _)| *id));
-	move |who| cache.get(who).cloned().and_then(|i| i.try_into().ok())
+	move |who| {
+		if cache.get(who).is_none() {
+			println!("WARNING: voter {} will raise InvalidIndex", who);
+		}
+		cache.get(who).cloned().and_then(|i| i.try_into().ok())
+	}
 }
 
 /// Create a function that returns the index of a candidate in the candidates list.
 pub fn make_target_fn<TargetIndex>(
-	candidates: &[CandidateId],
-) -> impl Fn(&CandidateId) -> Option<TargetIndex>
+	candidates: &[AccountId],
+) -> impl Fn(&AccountId) -> Option<TargetIndex>
 where
 	usize: TryInto<TargetIndex>,
 {
 	let cache = generate_cache(candidates.iter().cloned());
-	move |who| cache.get(who).cloned().and_then(|i| i.try_into().ok())
+	move |who| {
+		if cache.get(who).is_none() {
+			println!("WARNING: target {} will raise InvalidIndex", who);
+		}
+		cache.get(who).cloned().and_then(|i| i.try_into().ok())
+	}
 }
diff --git a/primitives/npos-elections/src/tests.rs b/primitives/npos-elections/src/tests.rs
index da6b417b613e..eac218f77e38 100644
--- a/primitives/npos-elections/src/tests.rs
+++ b/primitives/npos-elections/src/tests.rs
@@ -19,8 +19,8 @@
 
 use crate::{
 	balancing, helpers::*, is_score_better, mock::*, seq_phragmen, seq_phragmen_core, setup_inputs,
-	to_support_map, to_supports, Assignment, CompactSolution, ElectionResult, EvaluateSupport,
-	ExtendedBalance, IndexAssignment, StakedAssignment, Support, Voter,
+	to_support_map, to_supports, Assignment, ElectionResult, EvaluateSupport, ExtendedBalance,
+	IndexAssignment, NposSolution, StakedAssignment, Support, Voter,
 };
 use rand::{self, SeedableRng};
 use sp_arithmetic::{PerU16, Perbill, Percent, Permill};
@@ -917,30 +917,20 @@ mod score {
 }
 
 mod solution_type {
-	use super::AccountId;
+	use super::*;
 	use codec::{Decode, Encode};
 	// these need to come from the same dev-dependency `sp-npos-elections`, not from the crate.
-	use crate::{generate_solution_type, Assignment, CompactSolution, Error as PhragmenError};
-	use sp_arithmetic::Percent;
+	use crate::{generate_solution_type, Assignment, Error as NposError, NposSolution};
 	use sp_std::{convert::TryInto, fmt::Debug};
 
-	type TestAccuracy = Percent;
-
-	generate_solution_type!(pub struct TestSolutionCompact::<
-		VoterIndex = u32,
-		TargetIndex = u8,
-		Accuracy = TestAccuracy,
-	>(16));
-
 	#[allow(dead_code)]
 	mod __private {
-		// This is just to make sure that that the compact can be generated in a scope without any
+		// This is just to make sure that the solution can be generated in a scope without any
 		// imports.
 		use crate::generate_solution_type;
-		use sp_arithmetic::Percent;
 		generate_solution_type!(
 			#[compact]
-			struct InnerTestSolutionCompact::<VoterIndex = u32, TargetIndex = u8, Accuracy = Percent>(12)
+			struct InnerTestSolutionIsolated::<VoterIndex = u32, TargetIndex = u8, Accuracy = sp_runtime::Percent>(12)
 		);
 	}
 
@@ -948,35 +938,34 @@ mod solution_type {
 	fn solution_struct_works_with_and_without_compact() {
 		// we use u32 size to make sure compact is smaller.
 		let without_compact = {
-			generate_solution_type!(pub struct InnerTestSolution::<
-				VoterIndex = u32,
-				TargetIndex = u32,
-				Accuracy = Percent,
-			>(16));
-			let compact = InnerTestSolution {
+			generate_solution_type!(
+				pub struct InnerTestSolution::<
+					VoterIndex = u32,
+					TargetIndex = u32,
+					Accuracy = TestAccuracy,
+				>(16)
+			);
+			let solution = InnerTestSolution {
 				votes1: vec![(2, 20), (4, 40)],
-				votes2: vec![
-					(1, (10, TestAccuracy::from_percent(80)), 11),
-					(5, (50, TestAccuracy::from_percent(85)), 51),
-				],
+				votes2: vec![(1, [(10, p(80))], 11), (5, [(50, p(85))], 51)],
 				..Default::default()
 			};
 
-			compact.encode().len()
+			solution.encode().len()
 		};
 
 		let with_compact = {
-			generate_solution_type!(#[compact] pub struct InnerTestSolutionCompact::<
-				VoterIndex = u32,
-				TargetIndex = u32,
-				Accuracy = Percent,
-			>(16));
+			generate_solution_type!(
+				#[compact]
+				pub struct InnerTestSolutionCompact::<
+					VoterIndex = u32,
+					TargetIndex = u32,
+					Accuracy = TestAccuracy,
+				>(16)
+			);
 			let compact = InnerTestSolutionCompact {
 				votes1: vec![(2, 20), (4, 40)],
-				votes2: vec![
-					(1, (10, TestAccuracy::from_percent(80)), 11),
-					(5, (50, TestAccuracy::from_percent(85)), 51),
-				],
+				votes2: vec![(1, [(10, p(80))], 11), (5, [(50, p(85))], 51)],
 				..Default::default()
 			};
 
@@ -988,78 +977,64 @@ mod solution_type {
 
 	#[test]
 	fn solution_struct_is_codec() {
-		let compact = TestSolutionCompact {
+		let solution = TestSolution {
 			votes1: vec![(2, 20), (4, 40)],
-			votes2: vec![
-				(1, (10, TestAccuracy::from_percent(80)), 11),
-				(5, (50, TestAccuracy::from_percent(85)), 51),
-			],
+			votes2: vec![(1, [(10, p(80))], 11), (5, [(50, p(85))], 51)],
 			..Default::default()
 		};
 
-		let encoded = compact.encode();
+		let encoded = solution.encode();
 
-		assert_eq!(compact, Decode::decode(&mut &encoded[..]).unwrap());
-		assert_eq!(compact.voter_count(), 4);
-		assert_eq!(compact.edge_count(), 2 + 4);
-		assert_eq!(compact.unique_targets(), vec![10, 11, 20, 40, 50, 51]);
+		assert_eq!(solution, Decode::decode(&mut &encoded[..]).unwrap());
+		assert_eq!(solution.voter_count(), 4);
+		assert_eq!(solution.edge_count(), 2 + 4);
+		assert_eq!(solution.unique_targets(), vec![10, 11, 20, 40, 50, 51]);
 	}
 
 	#[test]
 	fn remove_voter_works() {
-		let mut compact = TestSolutionCompact {
+		let mut solution = TestSolution {
 			votes1: vec![(0, 2), (1, 6)],
-			votes2: vec![
-				(2, (0, TestAccuracy::from_percent(80)), 1),
-				(3, (7, TestAccuracy::from_percent(85)), 8),
-			],
-			votes3: vec![(
-				4,
-				[(3, TestAccuracy::from_percent(50)), (4, TestAccuracy::from_percent(25))],
-				5,
-			)],
+			votes2: vec![(2, [(0, p(80))], 1), (3, [(7, p(85))], 8)],
+			votes3: vec![(4, [(3, p(50)), (4, p(25))], 5)],
 			..Default::default()
 		};
 
-		assert!(!compact.remove_voter(11));
-		assert!(compact.remove_voter(2));
+		assert!(!solution.remove_voter(11));
+		assert!(solution.remove_voter(2));
 		assert_eq!(
-			compact,
-			TestSolutionCompact {
+			solution,
+			TestSolution {
 				votes1: vec![(0, 2), (1, 6)],
-				votes2: vec![(3, (7, TestAccuracy::from_percent(85)), 8),],
-				votes3: vec![(
-					4,
-					[(3, TestAccuracy::from_percent(50)), (4, TestAccuracy::from_percent(25))],
-					5,
-				),],
+				votes2: vec![(3, [(7, p(85))], 8)],
+				votes3: vec![(4, [(3, p(50)), (4, p(25))], 5,)],
 				..Default::default()
 			},
 		);
 
-		assert!(compact.remove_voter(4));
+		assert!(solution.remove_voter(4));
 		assert_eq!(
-			compact,
-			TestSolutionCompact {
+			solution,
+			TestSolution {
 				votes1: vec![(0, 2), (1, 6)],
-				votes2: vec![(3, (7, TestAccuracy::from_percent(85)), 8),],
+				votes2: vec![(3, [(7, p(85))], 8)],
 				..Default::default()
 			},
 		);
 
-		assert!(compact.remove_voter(1));
+		assert!(solution.remove_voter(1));
 		assert_eq!(
-			compact,
-			TestSolutionCompact {
+			solution,
+			TestSolution {
 				votes1: vec![(0, 2)],
-				votes2: vec![(3, (7, TestAccuracy::from_percent(85)), 8),],
+				votes2: vec![(3, [(7, p(85))], 8),],
 				..Default::default()
 			},
 		);
 	}
 
 	#[test]
-	fn basic_from_and_into_compact_works_assignments() {
+	fn from_and_into_assignment_works() {
 		let voters = vec![2 as AccountId, 4, 1, 5, 3];
 		let targets = vec![
 			10 as AccountId,
@@ -1074,182 +1049,144 @@ mod solution_type {
 		];
 
 		let assignments = vec![
-			Assignment {
-				who: 2 as AccountId,
-				distribution: vec![(20u64, TestAccuracy::from_percent(100))],
-			},
-			Assignment { who: 4, distribution: vec![(40, TestAccuracy::from_percent(100))] },
-			Assignment {
-				who: 1,
-				distribution: vec![
-					(10, TestAccuracy::from_percent(80)),
-					(11, TestAccuracy::from_percent(20)),
-				],
-			},
-			Assignment {
-				who: 5,
-				distribution: vec![
-					(50, TestAccuracy::from_percent(85)),
-					(51, TestAccuracy::from_percent(15)),
-				],
-			},
-			Assignment {
-				who: 3,
-				distribution: vec![
-					(30, TestAccuracy::from_percent(50)),
-					(31, TestAccuracy::from_percent(25)),
-					(32, TestAccuracy::from_percent(25)),
-				],
-			},
+			Assignment { who: 2 as AccountId, distribution: vec![(20u64, p(100))] },
+			Assignment { who: 4, distribution: vec![(40, p(100))] },
+			Assignment { who: 1, distribution: vec![(10, p(80)), (11, p(20))] },
+			Assignment { who: 5, distribution: vec![(50, p(85)), (51, p(15))] },
+			Assignment { who: 3, distribution: vec![(30, p(50)), (31, p(25)), (32, p(25))] },
 		];
 
 		let voter_index = |a: &AccountId| -> Option<u32> {
 			voters.iter().position(|x| x == a).map(TryInto::try_into).unwrap().ok()
 		};
-		let target_index = |a: &AccountId| -> Option<u8> {
+		let target_index = |a: &AccountId| -> Option<u16> {
 			targets.iter().position(|x| x == a).map(TryInto::try_into).unwrap().ok()
 		};
 
-		let compacted =
-			TestSolutionCompact::from_assignment(&assignments, voter_index, target_index).unwrap();
+		let solution =
+			TestSolution::from_assignment(&assignments, voter_index, target_index).unwrap();
 
 		// basically number of assignments that it is encoding.
-		assert_eq!(compacted.voter_count(), assignments.len());
+		assert_eq!(solution.voter_count(), assignments.len());
 		assert_eq!(
-			compacted.edge_count(),
+			solution.edge_count(),
 			assignments.iter().fold(0, |a, b| a + b.distribution.len()),
 		);
 
 		assert_eq!(
-			compacted,
-			TestSolutionCompact {
+			solution,
+			TestSolution {
 				votes1: vec![(0, 2), (1, 6)],
-				votes2: vec![
-					(2, (0, TestAccuracy::from_percent(80)), 1),
-					(3, (7, TestAccuracy::from_percent(85)), 8),
-				],
-				votes3: vec![(
-					4,
-					[(3, TestAccuracy::from_percent(50)), (4, TestAccuracy::from_percent(25))],
-					5,
-				),],
+				votes2: vec![(2, [(0, p(80))], 1), (3, [(7, p(85))], 8)],
+				votes3: vec![(4, [(3, p(50)), (4, p(25))], 5)],
 				..Default::default()
 			}
 		);
 
-		assert_eq!(compacted.unique_targets(), vec![0, 1, 2, 3, 4, 5, 6, 7, 8]);
+		assert_eq!(solution.unique_targets(), vec![0, 1, 2, 3, 4, 5, 6, 7, 8]);
 
 		let voter_at = |a: u32| -> Option<AccountId> {
 			voters.get(<u32 as TryInto<usize>>::try_into(a).unwrap()).cloned()
 		};
-		let target_at = |a: u8| -> Option<AccountId> {
-			targets.get(<u8 as TryInto<usize>>::try_into(a).unwrap()).cloned()
+		let target_at = |a: u16| -> Option<AccountId> {
+			targets.get(<u16 as TryInto<usize>>::try_into(a).unwrap()).cloned()
 		};
 
-		assert_eq!(compacted.into_assignment(voter_at, target_at).unwrap(), assignments);
+		assert_eq!(solution.into_assignment(voter_at, target_at).unwrap(), assignments);
 	}
 
 	#[test]
 	fn unique_targets_len_edge_count_works() {
-		const ACC: TestAccuracy = TestAccuracy::from_percent(10);
-
 		// we don't really care about voters here so all duplicates. This is not invalid per se.
-		let compact = TestSolutionCompact {
+		let solution = TestSolution {
 			votes1: vec![(99, 1), (99, 2)],
-			votes2: vec![(99, (3, ACC.clone()), 7), (99, (4, ACC.clone()), 8)],
-			votes3: vec![(99, [(11, ACC.clone()), (12, ACC.clone())], 13)],
+			votes2: vec![(99, [(3, p(10))], 7), (99, [(4, p(10))], 8)],
+			votes3: vec![(99, [(11, p(10)), (12, p(10))], 13)],
 			// ensure the last one is also counted.
 			votes16: vec![(
 				99,
 				[
-					(66, ACC.clone()),
-					(66, ACC.clone()),
-					(66, ACC.clone()),
-					(66, ACC.clone()),
-					(66, ACC.clone()),
-					(66, ACC.clone()),
-					(66, ACC.clone()),
-					(66, ACC.clone()),
-					(66, ACC.clone()),
-					(66, ACC.clone()),
-					(66, ACC.clone()),
-					(66, ACC.clone()),
-					(66, ACC.clone()),
-					(66, ACC.clone()),
-					(66, ACC.clone()),
+					(66, p(10)),
+					(66, p(10)),
+					(66, p(10)),
+					(66, p(10)),
+					(66, p(10)),
+					(66, p(10)),
+					(66, p(10)),
+					(66, p(10)),
+					(66, p(10)),
+					(66, p(10)),
+					(66, p(10)),
+					(66, p(10)),
+					(66, p(10)),
+					(66, p(10)),
+					(66, p(10)),
 				],
 				67,
 			)],
 			..Default::default()
 		};
 
-		assert_eq!(compact.unique_targets(), vec![1, 2, 3, 4, 7, 8, 11, 12, 13, 66, 67]);
-		assert_eq!(compact.edge_count(), 2 + (2 * 2) + 3 + 16);
-		assert_eq!(compact.voter_count(), 6);
+		assert_eq!(solution.unique_targets(), vec![1, 2, 3, 4, 7, 8, 11, 12, 13, 66, 67]);
+		assert_eq!(solution.edge_count(), 2 + (2 * 2) + 3 + 16);
+		assert_eq!(solution.voter_count(), 6);
 
 		// this one has some duplicates.
-		let compact = TestSolutionCompact {
+		let solution = TestSolution {
 			votes1: vec![(99, 1), (99, 1)],
-			votes2: vec![(99, (3, ACC.clone()), 7), (99, (4, ACC.clone()), 8)],
-			votes3: vec![(99, [(11, ACC.clone()), (11, ACC.clone())], 13)],
+			votes2: vec![(99, [(3, p(10))], 7), (99, [(4, p(10))], 8)],
+			votes3: vec![(99, [(11, p(10)), (11, p(10))], 13)],
 			..Default::default()
 		};
 
-		assert_eq!(compact.unique_targets(), vec![1, 3, 4, 7, 8, 11, 13]);
-		assert_eq!(compact.edge_count(), 2 + (2 * 2) + 3);
-		assert_eq!(compact.voter_count(), 5);
+		assert_eq!(solution.unique_targets(), vec![1, 3, 4, 7, 8, 11, 13]);
+		assert_eq!(solution.edge_count(), 2 + (2 * 2) + 3);
+		assert_eq!(solution.voter_count(), 5);
 	}
 
 	#[test]
-	fn compact_into_assignment_must_report_overflow() {
+	fn solution_into_assignment_must_report_overflow() {
 		// in votes2
-		let compact = TestSolutionCompact {
+		let solution = TestSolution {
 			votes1: Default::default(),
-			votes2: vec![(0, (1, TestAccuracy::from_percent(100)), 2)],
+			votes2: vec![(0, [(1, p(100))], 2)],
 			..Default::default()
 		};
 
 		let voter_at = |a: u32| -> Option<AccountId> { Some(a as AccountId) };
-		let target_at = |a: u8| -> Option<AccountId> { Some(a as AccountId) };
+		let target_at = |a: u16| -> Option<AccountId> { Some(a as AccountId) };
 
 		assert_eq!(
-			compact.into_assignment(&voter_at, &target_at).unwrap_err(),
-			PhragmenError::CompactStakeOverflow,
+			solution.into_assignment(&voter_at, &target_at).unwrap_err(),
+			NposError::SolutionWeightOverflow,
 		);
 
 		// in votes3 onwards
-		let compact = TestSolutionCompact {
+		let solution = TestSolution {
 			votes1: Default::default(),
 			votes2: Default::default(),
-			votes3: vec![(
-				0,
-				[(1, TestAccuracy::from_percent(70)), (2, TestAccuracy::from_percent(80))],
-				3,
-			)],
+			votes3: vec![(0, [(1, p(70)), (2, p(80))], 3)],
 			..Default::default()
 		};
 
 		assert_eq!(
-			compact.into_assignment(&voter_at, &target_at).unwrap_err(),
-			PhragmenError::CompactStakeOverflow,
+			solution.into_assignment(&voter_at, &target_at).unwrap_err(),
+			NposError::SolutionWeightOverflow,
 		);
 	}
 
 	#[test]
 	fn target_count_overflow_is_detected() {
 		let voter_index = |a: &AccountId| -> Option<u32> { Some(*a as u32) };
-		let target_index = |a: &AccountId| -> Option<u8> { Some(*a as u8) };
+		let target_index = |a: &AccountId| -> Option<u16> { Some(*a as u16) };
 
 		let assignments = vec![Assignment {
 			who: 1 as AccountId,
-			distribution: (10..27)
-				.map(|i| (i as AccountId, Percent::from_parts(i as u8)))
-				.collect::<Vec<_>>(),
+			distribution: (10..27).map(|i| (i as AccountId, p(i as u8))).collect::<Vec<_>>(),
 		}];
 
-		let compacted =
-			TestSolutionCompact::from_assignment(&assignments, voter_index, target_index);
-		assert_eq!(compacted.unwrap_err(), PhragmenError::CompactTargetOverflow);
+		let solution = TestSolution::from_assignment(&assignments, voter_index, target_index);
+		assert_eq!(solution.unwrap_err(), NposError::SolutionTargetOverflow);
 	}
 
 	#[test]
@@ -1258,31 +1195,25 @@ mod solution_type {
 		let targets = vec![10 as AccountId, 11];
 
 		let assignments = vec![
-			Assignment {
-				who: 1 as AccountId,
-				distribution: vec![
-					(10, Percent::from_percent(50)),
-					(11, Percent::from_percent(50)),
-				],
-			},
+			Assignment { who: 1 as AccountId, distribution: vec![(10, p(50)), (11, p(50))] },
 			Assignment { who: 2, distribution: vec![] },
 		];
 
 		let voter_index = |a: &AccountId| -> Option<u32> {
 			voters.iter().position(|x| x == a).map(TryInto::try_into).unwrap().ok()
 		};
-		let target_index = |a: &AccountId| -> Option<u8> {
+		let target_index = |a: &AccountId| -> Option<u16> {
 			targets.iter().position(|x| x == a).map(TryInto::try_into).unwrap().ok()
 		};
 
-		let compacted =
-			TestSolutionCompact::from_assignment(&assignments, voter_index, target_index).unwrap();
+		let solution =
+			TestSolution::from_assignment(&assignments, voter_index, target_index).unwrap();
 
 		assert_eq!(
-			compacted,
-			TestSolutionCompact {
+			solution,
+			TestSolution {
 				votes1: Default::default(),
-				votes2: vec![(0, (0, Percent::from_percent(50)), 1)],
+				votes2: vec![(0, [(0, p(50))], 1)],
 				..Default::default()
 			}
 		);
@@ -1290,14 +1221,15 @@ mod solution_type {
 }
 
 #[test]
-fn index_assignments_generate_same_compact_as_plain_assignments() {
+fn index_assignments_generate_same_solution_as_plain_assignments() {
 	let rng = rand::rngs::SmallRng::seed_from_u64(0);
 
 	let (voters, assignments, candidates) = generate_random_votes(1000, 2500, rng);
 	let voter_index = make_voter_fn(&voters);
 	let target_index = make_target_fn(&candidates);
 
-	let compact = Compact::from_assignment(&assignments, &voter_index, &target_index).unwrap();
+	let solution =
+		TestSolution::from_assignment(&assignments, &voter_index, &target_index).unwrap();
 
 	let index_assignments = assignments
 		.into_iter()
@@ -1307,5 +1239,5 @@ fn index_assignments_generate_same_compact_as_plain_assignments() {
 
 	let index_compact = index_assignments.as_slice().try_into().unwrap();
 
-	assert_eq!(compact, index_compact);
+	assert_eq!(solution, index_compact);
 }
diff --git a/primitives/npos-elections/src/traits.rs b/primitives/npos-elections/src/traits.rs
new file mode 100644
index 000000000000..ac077680167f
--- /dev/null
+++ b/primitives/npos-elections/src/traits.rs
@@ -0,0 +1,155 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Traits for the npos-election operations.
+
+use crate::{
+	Assignment, ElectionScore, Error, EvaluateSupport, ExtendedBalance, IndexAssignmentOf,
+	VoteWeight,
+};
+use codec::Encode;
+use sp_arithmetic::{
+	traits::{Bounded, UniqueSaturatedInto},
+	PerThing,
+};
+use sp_std::{
+	convert::{TryFrom, TryInto},
+	fmt::Debug,
+	ops::Mul,
+	prelude::*,
+};
+
+/// an aggregator trait for a generic type of a voter/target identifier. This usually maps to
+/// substrate's account id.
+pub trait IdentifierT: Clone + Eq + Default + Ord + Debug + codec::Codec {}
+impl<T: Clone + Eq + Default + Ord + Debug + codec::Codec> IdentifierT for T {}
+
+/// Aggregator trait for a PerThing that can be multiplied by u128 (ExtendedBalance).
+pub trait PerThing128: PerThing + Mul<ExtendedBalance, Output = ExtendedBalance> {}
+impl<T: PerThing + Mul<ExtendedBalance, Output = ExtendedBalance>> PerThing128 for T {}
+
+/// Simple Extension trait to easily convert `None` from index closures to `Err`.
+///
+/// This is only generated and re-exported for the solution code to use.
+#[doc(hidden)]
+pub trait __OrInvalidIndex<T> {
+	fn or_invalid_index(self) -> Result<T, Error>;
+}
+
+impl<T> __OrInvalidIndex<T> for Option<T> {
+	fn or_invalid_index(self) -> Result<T, Error> {
+		self.ok_or(Error::SolutionInvalidIndex)
+	}
+}
+
+/// An opaque index-based, NPoS solution type.
+pub trait NposSolution
+where
+	Self: Sized + for<'a> sp_std::convert::TryFrom<&'a [IndexAssignmentOf<Self>], Error = Error>,
+{
+	/// The maximum number of votes that are allowed.
+	const LIMIT: usize;
+
+	/// The voter type. Needs to be an index (convert to usize).
+	type VoterIndex: UniqueSaturatedInto<usize>
+		+ TryInto<usize>
+		+ TryFrom<usize>
+		+ Debug
+		+ Copy
+		+ Clone
+		+ Bounded
+		+ Encode;
+
+	/// The target type. Needs to be an index (convert to usize).
+	type TargetIndex: UniqueSaturatedInto<usize>
+		+ TryInto<usize>
+		+ TryFrom<usize>
+		+ Debug
+		+ Copy
+		+ Clone
+		+ Bounded
+		+ Encode;
+
+	/// The weight/accuracy type of each vote.
+	type Accuracy: PerThing128;
+
+	/// Get the length of all the voters that this type is encoding.
+	///
+	/// This is basically the same as the number of assignments, or number of active voters.
+	fn voter_count(&self) -> usize;
+
+	/// Get the total count of edges.
+	///
+	/// This is effectively in the range of {[`Self::voter_count`], [`Self::voter_count`] *
+	/// [`Self::LIMIT`]}.
+	fn edge_count(&self) -> usize;
+
+	/// Get the number of unique targets in the whole struct.
+	///
+	/// Once presented with a list of winners, this set and the set of winners must be
+	/// equal.
+	fn unique_targets(&self) -> Vec<Self::TargetIndex>;
+
+	/// Get the average edge count.
+	fn average_edge_count(&self) -> usize {
+		self.edge_count().checked_div(self.voter_count()).unwrap_or(0)
+	}
+
+	/// Compute the score of this solution type.
+	fn score<A, FS>(
+		self,
+		winners: &[A],
+		stake_of: FS,
+		voter_at: impl Fn(Self::VoterIndex) -> Option<A>,
+		target_at: impl Fn(Self::TargetIndex) -> Option<A>,
+	) -> Result<ElectionScore, Error>
+	where
+		for<'r> FS: Fn(&'r A) -> VoteWeight,
+		A: IdentifierT,
+	{
+		let ratio = self.into_assignment(voter_at, target_at)?;
+		let staked = crate::helpers::assignment_ratio_to_staked_normalized(ratio, stake_of)?;
+		let supports = crate::to_supports(winners, &staked)?;
+		Ok(supports.evaluate())
+	}
+
+	/// Remove a certain voter.
+	///
+	/// This will only search until the first instance of `to_remove`, and return true. If
+	/// no instance is found (no-op), then it returns false.
+	///
+	/// In other words, if this return true, exactly **one** element must have been removed self.
+	fn remove_voter(&mut self, to_remove: Self::VoterIndex) -> bool;
+
+	/// Build self from a list of assignments.
+	fn from_assignment<FV, FT, A>(
+		assignments: &[Assignment<A, Self::Accuracy>],
+		voter_index: FV,
+		target_index: FT,
+	) -> Result<Self, Error>
+	where
+		A: IdentifierT,
+		for<'r> FV: Fn(&'r A) -> Option<Self::VoterIndex>,
+		for<'r> FT: Fn(&'r A) -> Option<Self::TargetIndex>;
+
+	/// Convert self into a `Vec<Assignment<A, Self::Accuracy>>`
+	fn into_assignment<A: IdentifierT>(
+		self,
+		voter_at: impl Fn(Self::VoterIndex) -> Option<A>,
+		target_at: impl Fn(Self::TargetIndex) -> Option<A>,
+	) -> Result<Vec<Assignment<A, Self::Accuracy>>, Error>;
+}

From 2717d98d396c517d9cb14427428cff8364b19a0c Mon Sep 17 00:00:00 2001
From: Amar Singh <asinghchrony@protonmail.com>
Date: Thu, 12 Aug 2021 00:51:31 -0400
Subject: [PATCH 1078/1194] fix rust docs for remove storage prefix and take
 storage item (#9544)

---
 frame/support/src/storage/migration.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frame/support/src/storage/migration.rs b/frame/support/src/storage/migration.rs
index 701b2627f31c..3713e4d3375d 100644
--- a/frame/support/src/storage/migration.rs
+++ b/frame/support/src/storage/migration.rs
@@ -249,7 +249,7 @@ pub fn put_storage_value<T: Encode>(module: &[u8], item: &[u8], hash: &[u8], val
 	frame_support::storage::unhashed::put(&key, &value);
 }
 
-/// Get a particular value in storage by the `module`, the map's `item` name and the key `hash`.
+/// Remove all items under a storage prefix by the `module`, the map's `item` name and the key `hash`.
 pub fn remove_storage_prefix(module: &[u8], item: &[u8], hash: &[u8]) {
 	let mut key = vec![0u8; 32 + hash.len()];
 	key[0..16].copy_from_slice(&Twox128::hash(module));
@@ -258,7 +258,7 @@ pub fn remove_storage_prefix(module: &[u8], item: &[u8], hash: &[u8]) {
 	frame_support::storage::unhashed::kill_prefix(&key, None);
 }
 
-/// Get a particular value in storage by the `module`, the map's `item` name and the key `hash`.
+/// Take a particular item in storage by the `module`, the map's `item` name and the key `hash`.
 pub fn take_storage_item<K: Encode + Sized, T: Decode + Sized, H: StorageHasher>(
 	module: &[u8],
 	item: &[u8],

From ee76b9f11ba00fd04ba7e34d11c70a854254b1d8 Mon Sep 17 00:00:00 2001
From: Denis Pisarev <denis.pisarev@parity.io>
Date: Thu, 12 Aug 2021 10:13:51 +0200
Subject: [PATCH 1079/1194] CI: publish rustdocs (#9527)

* CI: publish docs to gh-pages

* CI: debug

* CI: add CI image

* CI: chmod for dox

* CI: typo

* CI: remove ownership debug

* CI: unfixme

* Revert "CI: debug"

This reverts commit f058b739fbe8c7ba6a9932e991ead93121d67309.

* CI: build-rust-doc can not fail now

* CI: remove publish-s3-doc

* CI: chore

* CI: less needs

* CI: pwd ruins the prettiness

* CI: return needs
---
 .gitlab-ci.yml | 70 +++++++++++++++++++++++++++++++-------------------
 1 file changed, 43 insertions(+), 27 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9a9f725780da..fc5b397af1b1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -529,13 +529,10 @@ build-macos-subkey:
   tags:
     - osx
 
-build-rust-doc:
+build-rustdoc:
   stage:                           build
   <<:                              *docker-env
   <<:                              *test-refs
-  needs:
-    - job:                         test-linux-stable
-      artifacts:                   false
   variables:
     <<:                            *default-vars
     SKIP_WASM_BUILD:               1
@@ -546,13 +543,15 @@ build-rust-doc:
     paths:
     - ./crate-docs/
   script:
+    # FIXME: it fails with `RUSTDOCFLAGS="-Dwarnings"`
     - RUSTDOCFLAGS="--html-in-header $(pwd)/.maintain/rustdoc-header.html"
         time cargo +nightly doc --no-deps --workspace --all-features --verbose
     - rm -f ./target/doc/.lock
     - mv ./target/doc ./crate-docs
+    # FIXME: remove me after CI image gets nonroot
+    - chown -R nonroot:nonroot ./crate-docs
     - echo "<meta http-equiv=refresh content=0;url=sc_service/index.html>" > ./crate-docs/index.html
     - sccache -s
-  allow_failure:                   true
 
 #### stage:                        publish
 
@@ -641,32 +640,49 @@ publish-s3-release:
     - aws s3 ls s3://${BUCKET}/${PREFIX}/latest/
         --recursive --human-readable --summarize
 
-publish-s3-doc:
+publish-rustdoc:
   stage:                           publish
-  image:                           paritytech/awscli:latest
-  allow_failure:                   true
-  needs:
-    - job:                         build-rust-doc
-      artifacts:                   true
-    - job:                         build-linux-substrate
-      artifacts:                   false
-  <<:                              *build-refs
   <<:                              *kubernetes-env
+  image:                           paritytech/tools:latest
   variables:
-    GIT_STRATEGY:                  none
-    BUCKET:                        "releases.parity.io"
-    PREFIX:                        "substrate-rustdoc"
-  script:
-    - test -r ./crate-docs/index.html || (
-        echo "./crate-docs/index.html not present, build:rust:doc:release job not complete";
-        exit 1
-      )
-    - ls -lah crate-docs
-    - aws s3 sync --delete --size-only --only-show-errors
-        ./crate-docs/ s3://${BUCKET}/${PREFIX}/
+    GIT_DEPTH:                     100
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "pipeline"
+      when: never
+    - if: $CI_PIPELINE_SOURCE == "web" && $CI_COMMIT_REF_NAME == "master"
+    - if: $CI_COMMIT_REF_NAME == "master"
+  # `needs:` can be removed after CI image gets nonroot. In this case `needs:` stops other
+  # artifacts from being dowloaded by this job.
+  needs:
+    - job:                         build-rustdoc
+      artifacts:                   true
+  script:
+    - rm -rf /tmp/*
+    # Set git config
+    - rm -rf .git/config
+    - git config user.email "devops-team@parity.io"
+    - git config user.name "${GITHUB_USER}"
+    - git config remote.origin.url "https://${GITHUB_TOKEN}@github.com/paritytech/substrate.git"
+    - git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
+    - git fetch origin gh-pages
+    # Save README and docs
+    - cp -r ./crate-docs/ /tmp/doc/
+    - cp README.md /tmp/doc/
+    - git checkout gh-pages
+    # Remove everything and restore generated docs and README
+    - rm -rf ./*
+    - mv /tmp/doc/* .
+    # Upload files
+    - git add --all --force
+    # `git commit` has an exit code of > 0 if there is nothing to commit.
+    # This causes GitLab to exit immediately and marks this job failed.
+    # We don't want to mark the entire job failed if there's nothing to
+    # publish though, hence the `|| true`.
+    - git commit -m "Updated docs for ${CI_COMMIT_REF_NAME}" ||
+        echo "___Nothing to commit___"
+    - git push origin gh-pages --force
   after_script:
-    - aws s3 ls s3://${BUCKET}/${PREFIX}/
-        --human-readable --summarize
+    - rm -rf .git/ ./*
 
 publish-draft-release:
   stage:                           publish

From 78b535b965f1d3b9b1d801fe910cb8c6181a23e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Thu, 12 Aug 2021 22:40:11 +0200
Subject: [PATCH 1080/1194] Stabilize `seal_debug_message` (#9550)

* Stableize `seal_debug_message`

* Update changelog

* Enable more tests

* Cargo fmt
---
 frame/contracts/CHANGELOG.md                                | 5 +++--
 frame/contracts/fixtures/debug_message_invalid_utf8.wat     | 2 +-
 frame/contracts/fixtures/debug_message_logging_disabled.wat | 2 +-
 frame/contracts/fixtures/debug_message_works.wat            | 2 +-
 frame/contracts/src/benchmarking/mod.rs                     | 2 +-
 frame/contracts/src/tests.rs                                | 3 ---
 frame/contracts/src/wasm/mod.rs                             | 6 ++----
 frame/contracts/src/wasm/runtime.rs                         | 5 +----
 frame/election-provider-multi-phase/src/lib.rs              | 3 ++-
 frame/support/src/storage/migration.rs                      | 3 ++-
 primitives/npos-elections/solution-type/src/lib.rs          | 2 +-
 11 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/frame/contracts/CHANGELOG.md b/frame/contracts/CHANGELOG.md
index 494c041d1bc8..eaedd28bf3e4 100644
--- a/frame/contracts/CHANGELOG.md
+++ b/frame/contracts/CHANGELOG.md
@@ -38,9 +38,10 @@ In other words: Upgrading this pallet will not break pre-existing contracts.
 
 ### Changed
 
-- Replaced `seal_println` with the **unstable** `seal_debug_message` API which allows
-output to an RPC client.
+- Replaced `seal_println` with the `seal_debug_message` API which allows outputting debug
+messages to the console and RPC clients.
 [#8773](https://github.com/paritytech/substrate/pull/8773)
+[#9550](https://github.com/paritytech/substrate/pull/9550)
 
 - Make storage and fields of `Schedule` private to the crate.
 [#8359](https://github.com/paritytech/substrate/pull/8359)
diff --git a/frame/contracts/fixtures/debug_message_invalid_utf8.wat b/frame/contracts/fixtures/debug_message_invalid_utf8.wat
index 82cabb6fdca4..c60371076440 100644
--- a/frame/contracts/fixtures/debug_message_invalid_utf8.wat
+++ b/frame/contracts/fixtures/debug_message_invalid_utf8.wat
@@ -1,6 +1,6 @@
 ;; Emit a "Hello World!" debug message
 (module
-	(import "__unstable__" "seal_debug_message" (func $seal_debug_message (param i32 i32) (result i32)))
+	(import "seal0" "seal_debug_message" (func $seal_debug_message (param i32 i32) (result i32)))
 	(import "env" "memory" (memory 1 1))
 
 	(data (i32.const 0) "\fc")
diff --git a/frame/contracts/fixtures/debug_message_logging_disabled.wat b/frame/contracts/fixtures/debug_message_logging_disabled.wat
index 0eaa9696afb6..cfe238943ad0 100644
--- a/frame/contracts/fixtures/debug_message_logging_disabled.wat
+++ b/frame/contracts/fixtures/debug_message_logging_disabled.wat
@@ -1,6 +1,6 @@
 ;; Emit a "Hello World!" debug message but assume that logging is disabled.
 (module
-	(import "__unstable__" "seal_debug_message" (func $seal_debug_message (param i32 i32) (result i32)))
+	(import "seal0" "seal_debug_message" (func $seal_debug_message (param i32 i32) (result i32)))
 	(import "env" "memory" (memory 1 1))
 
 	(data (i32.const 0) "Hello World!")
diff --git a/frame/contracts/fixtures/debug_message_works.wat b/frame/contracts/fixtures/debug_message_works.wat
index 1a50a51e3e0d..61933c232961 100644
--- a/frame/contracts/fixtures/debug_message_works.wat
+++ b/frame/contracts/fixtures/debug_message_works.wat
@@ -1,6 +1,6 @@
 ;; Emit a "Hello World!" debug message
 (module
-	(import "__unstable__" "seal_debug_message" (func $seal_debug_message (param i32 i32) (result i32)))
+	(import "seal0" "seal_debug_message" (func $seal_debug_message (param i32 i32) (result i32)))
 	(import "env" "memory" (memory 1 1))
 
 	(data (i32.const 0) "Hello World!")
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index e36f9173869c..1ffb84dad9aa 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -1039,7 +1039,7 @@ benchmarks! {
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory { min_pages: 1, max_pages: 1 }),
 			imported_functions: vec![ImportedFunction {
-				module: "__unstable__",
+				module: "seal0",
 				name: "seal_debug_message",
 				params: vec![ValueType::I32, ValueType::I32],
 				return_type: Some(ValueType::I32),
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index 81d973221b6c..cc19dccd6d1d 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -2615,7 +2615,6 @@ fn reinstrument_does_charge() {
 }
 
 #[test]
-#[cfg(feature = "unstable-interface")]
 fn debug_message_works() {
 	let (wasm, code_hash) = compile_module::<Test>("debug_message_works").unwrap();
 
@@ -2638,7 +2637,6 @@ fn debug_message_works() {
 }
 
 #[test]
-#[cfg(feature = "unstable-interface")]
 fn debug_message_logging_disabled() {
 	let (wasm, code_hash) = compile_module::<Test>("debug_message_logging_disabled").unwrap();
 
@@ -2663,7 +2661,6 @@ fn debug_message_logging_disabled() {
 }
 
 #[test]
-#[cfg(feature = "unstable-interface")]
 fn debug_message_invalid_utf8() {
 	let (wasm, code_hash) = compile_module::<Test>("debug_message_invalid_utf8").unwrap();
 
diff --git a/frame/contracts/src/wasm/mod.rs b/frame/contracts/src/wasm/mod.rs
index 0486a67e07ec..f9854bbbdc9b 100644
--- a/frame/contracts/src/wasm/mod.rs
+++ b/frame/contracts/src/wasm/mod.rs
@@ -1932,11 +1932,10 @@ mod tests {
 	}
 
 	#[test]
-	#[cfg(feature = "unstable-interface")]
 	fn debug_message_works() {
 		const CODE_DEBUG_MESSAGE: &str = r#"
 (module
-	(import "__unstable__" "seal_debug_message" (func $seal_debug_message (param i32 i32) (result i32)))
+	(import "seal0" "seal_debug_message" (func $seal_debug_message (param i32 i32) (result i32)))
 	(import "env" "memory" (memory 1 1))
 
 	(data (i32.const 0) "Hello World!")
@@ -1959,11 +1958,10 @@ mod tests {
 	}
 
 	#[test]
-	#[cfg(feature = "unstable-interface")]
 	fn debug_message_invalid_utf8_fails() {
 		const CODE_DEBUG_MESSAGE_FAIL: &str = r#"
 (module
-	(import "__unstable__" "seal_debug_message" (func $seal_debug_message (param i32 i32) (result i32)))
+	(import "seal0" "seal_debug_message" (func $seal_debug_message (param i32 i32) (result i32)))
 	(import "env" "memory" (memory 1 1))
 
 	(data (i32.const 0) "\fc")
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index 2edd7b82099b..d238d3afcb2f 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -69,7 +69,6 @@ pub enum ReturnCode {
 	NotCallable = 8,
 	/// The call to `seal_debug_message` had no effect because debug message
 	/// recording was disabled.
-	#[cfg(feature = "unstable-interface")]
 	LoggingDisabled = 9,
 	/// The call dispatched by `seal_call_runtime` was executed but returned an error.
 	#[cfg(feature = "unstable-interface")]
@@ -175,7 +174,6 @@ pub enum RuntimeCosts {
 	/// Weight of calling `seal_deposit_event` with the given number of topics and event size.
 	DepositEvent { num_topic: u32, len: u32 },
 	/// Weight of calling `seal_debug_message`.
-	#[cfg(feature = "unstable-interface")]
 	DebugMessage,
 	/// Weight of calling `seal_set_rent_allowance`.
 	SetRentAllowance,
@@ -250,7 +248,6 @@ impl RuntimeCosts {
 				.deposit_event
 				.saturating_add(s.deposit_event_per_topic.saturating_mul(num_topic.into()))
 				.saturating_add(s.deposit_event_per_byte.saturating_mul(len.into())),
-			#[cfg(feature = "unstable-interface")]
 			DebugMessage => s.debug_message,
 			SetRentAllowance => s.set_rent_allowance,
 			SetStorage(len) =>
@@ -1748,7 +1745,7 @@ define_env!(Env, <E: Ext>,
 	// not being executed as an RPC. For example, they could allow users to disable logging
 	// through compile time flags (cargo features) for on-chain deployment. Additionally, the
 	// return value of this function can be cached in order to prevent further calls at runtime.
-	[__unstable__] seal_debug_message(ctx, str_ptr: u32, str_len: u32) -> ReturnCode => {
+	[seal0] seal_debug_message(ctx, str_ptr: u32, str_len: u32) -> ReturnCode => {
 		ctx.charge_gas(RuntimeCosts::DebugMessage)?;
 		if ctx.ext.append_debug_buffer("") {
 			let data = ctx.read_sandbox_memory(str_ptr, str_len)?;
diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index 0c7fe170ecbd..fad76623faf5 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -1413,7 +1413,8 @@ impl<T: Config> Pallet<T> {
 				// Check that assignment.who is actually a voter (defensive-only).
 				// NOTE: while using the index map from `voter_index` is better than a blind linear
 				// search, this *still* has room for optimization. Note that we had the index when
-				// we did `solution -> assignment` and we lost it. Ideal is to keep the index around.
+				// we did `solution -> assignment` and we lost it. Ideal is to keep the index
+				// around.
 
 				// Defensive-only: must exist in the snapshot.
 				let snapshot_index =
diff --git a/frame/support/src/storage/migration.rs b/frame/support/src/storage/migration.rs
index 3713e4d3375d..0f10c5cbb47d 100644
--- a/frame/support/src/storage/migration.rs
+++ b/frame/support/src/storage/migration.rs
@@ -249,7 +249,8 @@ pub fn put_storage_value<T: Encode>(module: &[u8], item: &[u8], hash: &[u8], val
 	frame_support::storage::unhashed::put(&key, &value);
 }
 
-/// Remove all items under a storage prefix by the `module`, the map's `item` name and the key `hash`.
+/// Remove all items under a storage prefix by the `module`, the map's `item` name and the key
+/// `hash`.
 pub fn remove_storage_prefix(module: &[u8], item: &[u8], hash: &[u8]) {
 	let mut key = vec![0u8; 32 + hash.len()];
 	key[0..16].copy_from_slice(&Twox128::hash(module));
diff --git a/primitives/npos-elections/solution-type/src/lib.rs b/primitives/npos-elections/solution-type/src/lib.rs
index 9503f71131d9..16b4e8e04743 100644
--- a/primitives/npos-elections/solution-type/src/lib.rs
+++ b/primitives/npos-elections/solution-type/src/lib.rs
@@ -79,7 +79,7 @@ pub(crate) fn syn_err(message: &'static str) -> syn::Error {
 /// 			(u8 /* first target*/, Perbill /* proportion for first target */ ),
 /// 			(u8 /* second target */, Perbill /* proportion for second target*/)
 /// 		], u8 /* last target */)
-///		],
+/// 		],
 /// 	voters4: ...,
 /// }
 ///

From 7342a2fb587c895b5d117e3983e6e0f91868b03b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Fri, 13 Aug 2021 08:46:07 +0200
Subject: [PATCH 1081/1194] Upgrade jsonrpc to 0.18.0 (#9547)

* Upgrade jsonrpc to 0.18.0

I think this says all :P

* :facepalm:

* Fmt etc

* Fix tests

* Fix tests again...

* Better impl

* Revert "Tell dependabot to ignore jsonrpc-* updates (#9518)"

This reverts commit f2b3997004d10512aa7b412b50785e29987f883d.
---
 .github/dependabot.yml                        |    3 -
 Cargo.lock                                    | 1081 ++++++++++-------
 bin/node-template/node/Cargo.toml             |    2 +-
 bin/node/bench/src/construct.rs               |    2 +-
 bin/node/browser-testing/Cargo.toml           |    2 +-
 bin/node/cli/Cargo.toml                       |    2 +-
 bin/node/rpc-client/Cargo.toml                |    5 +-
 bin/node/rpc-client/src/main.rs               |   17 +-
 bin/node/rpc/Cargo.toml                       |    2 +-
 client/consensus/babe/rpc/Cargo.toml          |    8 +-
 client/consensus/babe/rpc/src/lib.rs          |   15 +-
 client/consensus/manual-seal/Cargo.toml       |    6 +-
 client/consensus/manual-seal/src/rpc.rs       |   17 +-
 client/consensus/pow/Cargo.toml               |    2 +-
 client/finality-grandpa/rpc/Cargo.toml        |   10 +-
 client/finality-grandpa/rpc/src/lib.rs        |   49 +-
 client/rpc-api/Cargo.toml                     |   10 +-
 client/rpc-api/src/author/error.rs            |    2 +-
 client/rpc-api/src/chain/error.rs             |    2 +-
 client/rpc-api/src/helpers.rs                 |   22 +-
 client/rpc-api/src/metadata.rs                |   12 +-
 client/rpc-api/src/state/error.rs             |    2 +-
 client/rpc-api/src/system/mod.rs              |   17 +-
 client/rpc-servers/Cargo.toml                 |   12 +-
 client/rpc-servers/src/lib.rs                 |   16 +-
 client/rpc-servers/src/middleware.rs          |    4 +-
 client/rpc/Cargo.toml                         |    8 +-
 client/rpc/src/author/mod.rs                  |   93 +-
 client/rpc/src/author/tests.rs                |   29 +-
 client/rpc/src/chain/chain_full.rs            |   22 +-
 client/rpc/src/chain/chain_light.rs           |   50 +-
 client/rpc/src/chain/mod.rs                   |   32 +-
 client/rpc/src/chain/tests.rs                 |   67 +-
 client/rpc/src/lib.rs                         |   19 +-
 client/rpc/src/state/mod.rs                   |   26 +-
 client/rpc/src/state/state_full.rs            |  385 +++---
 client/rpc/src/state/state_light.rs           |  233 ++--
 client/rpc/src/state/tests.rs                 |  106 +-
 client/rpc/src/system/mod.rs                  |   55 +-
 client/rpc/src/system/tests.rs                |   22 +-
 client/rpc/src/testing.rs                     |   21 +-
 client/service/Cargo.toml                     |    7 +-
 client/service/src/builder.rs                 |    4 +
 client/service/src/lib.rs                     |   38 +-
 client/service/src/task_manager/mod.rs        |    4 +-
 client/service/test/Cargo.toml                |    2 +-
 client/sync-state-rpc/Cargo.toml              |    6 +-
 client/transaction-pool/Cargo.toml            |    2 +-
 client/transaction-pool/api/src/lib.rs        |    4 +-
 client/transaction-pool/src/lib.rs            |    8 +-
 frame/contracts/rpc/Cargo.toml                |    6 +-
 frame/merkle-mountain-range/rpc/Cargo.toml    |    6 +-
 frame/transaction-payment/rpc/Cargo.toml      |    6 +-
 test-utils/Cargo.toml                         |    2 +-
 test-utils/client/Cargo.toml                  |    3 +-
 test-utils/client/src/lib.rs                  |   11 +-
 .../runtime/transaction-pool/Cargo.toml       |    2 +-
 test-utils/test-runner/Cargo.toml             |    4 +-
 test-utils/test-runner/src/client.rs          |    3 +-
 utils/browser/Cargo.toml                      |    3 +-
 utils/browser/src/lib.rs                      |   13 +-
 utils/frame/rpc/support/Cargo.toml            |    6 +-
 utils/frame/rpc/support/src/lib.rs            |    8 +-
 utils/frame/rpc/system/Cargo.toml             |    8 +-
 utils/frame/rpc/system/src/lib.rs             |   69 +-
 65 files changed, 1423 insertions(+), 1292 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index c93461c8806d..a321729dcbc8 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -5,6 +5,3 @@ updates:
     labels: ["A2-insubstantial", "B0-silent", "C1-low 📌"]
     schedule:
       interval: "daily"
-    ignore:
-        - dependency-name: "jsonrpc-*"
-          versions: [">= 16"]
diff --git a/Cargo.lock b/Cargo.lock
index bc33d4a5fed9..5aaa7e2b1b2e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -104,7 +104,7 @@ checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98"
 dependencies = [
  "getrandom 0.2.3",
  "once_cell",
- "version_check",
+ "version_check 0.9.2",
 ]
 
 [[package]]
@@ -269,7 +269,7 @@ dependencies = [
  "fastrand",
  "futures-lite",
  "libc",
- "log",
+ "log 0.4.14",
  "nb-connect",
  "once_cell",
  "parking",
@@ -332,7 +332,7 @@ dependencies = [
  "futures-lite",
  "gloo-timers",
  "kv-log-macro",
- "log",
+ "log 0.4.14",
  "memchr",
  "num_cpus",
  "once_cell",
@@ -405,7 +405,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3410529e8288c463bedb5930f82833bc0c90e5d2fe639a56582a4d09220b281"
 dependencies = [
- "autocfg",
+ "autocfg 1.0.1",
 ]
 
 [[package]]
@@ -425,6 +425,12 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "autocfg"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
+
 [[package]]
 name = "autocfg"
 version = "1.0.1"
@@ -470,6 +476,25 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5024ee8015f02155eee35c711107ddd9a9bf3cb689cf2a9089c97e79b6e1ae83"
 
+[[package]]
+name = "base64"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
+dependencies = [
+ "byteorder",
+ "safemem",
+]
+
+[[package]]
+name = "base64"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
+dependencies = [
+ "byteorder",
+]
+
 [[package]]
 name = "base64"
 version = "0.12.3"
@@ -726,7 +751,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
 dependencies = [
  "byteorder",
- "either",
  "iovec",
 ]
 
@@ -1034,7 +1058,7 @@ dependencies = [
  "cranelift-codegen-shared",
  "cranelift-entity",
  "gimli 0.24.0",
- "log",
+ "log 0.4.14",
  "regalloc",
  "serde",
  "smallvec 1.6.1",
@@ -1076,7 +1100,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c31b783b351f966fce33e3c03498cb116d16d97a8f9978164a60920bd0d3a99c"
 dependencies = [
  "cranelift-codegen",
- "log",
+ "log 0.4.14",
  "smallvec 1.6.1",
  "target-lexicon",
 ]
@@ -1101,7 +1125,7 @@ dependencies = [
  "cranelift-entity",
  "cranelift-frontend",
  "itertools 0.10.0",
- "log",
+ "log 0.4.14",
  "serde",
  "smallvec 1.6.1",
  "thiserror",
@@ -1191,7 +1215,7 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
 dependencies = [
- "autocfg",
+ "autocfg 1.0.1",
  "cfg-if 0.1.10",
  "crossbeam-utils 0.7.2",
  "lazy_static",
@@ -1230,7 +1254,7 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
 dependencies = [
- "autocfg",
+ "autocfg 1.0.1",
  "cfg-if 0.1.10",
  "lazy_static",
 ]
@@ -1241,7 +1265,7 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49"
 dependencies = [
- "autocfg",
+ "autocfg 1.0.1",
  "cfg-if 1.0.0",
  "lazy_static",
 ]
@@ -1582,7 +1606,7 @@ checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
 dependencies = [
  "atty",
  "humantime 1.3.0",
- "log",
+ "log 0.4.14",
  "regex",
  "termcolor",
 ]
@@ -1595,7 +1619,7 @@ checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f"
 dependencies = [
  "atty",
  "humantime 2.1.0",
- "log",
+ "log 0.4.14",
  "regex",
  "termcolor",
 ]
@@ -1651,28 +1675,6 @@ dependencies = [
  "futures 0.3.16",
 ]
 
-[[package]]
-name = "failure"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86"
-dependencies = [
- "backtrace",
- "failure_derive",
-]
-
-[[package]]
-name = "failure_derive"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "synstructure",
-]
-
 [[package]]
 name = "fake-simd"
 version = "0.1.2"
@@ -1710,7 +1712,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fdbe0d94371f9ce939b555dd342d0686cc4c0cadbcd4b61d70af5ff97eb4126"
 dependencies = [
  "env_logger 0.7.1",
- "log",
+ "log 0.4.14",
 ]
 
 [[package]]
@@ -1722,7 +1724,7 @@ dependencies = [
  "either",
  "futures 0.3.16",
  "futures-timer 3.0.2",
- "log",
+ "log 0.4.14",
  "num-traits",
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -1766,6 +1768,21 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
@@ -1791,7 +1808,7 @@ dependencies = [
  "frame-system",
  "hex-literal",
  "linregress",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "paste 1.0.4",
  "serde",
@@ -1813,7 +1830,7 @@ dependencies = [
  "frame-support",
  "handlebars",
  "linked-hash-map",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "sc-cli",
  "sc-client-db",
@@ -1880,7 +1897,7 @@ dependencies = [
  "frame-support-procedural",
  "frame-system",
  "impl-trait-for-tuples",
- "log",
+ "log 0.4.14",
  "once_cell",
  "parity-scale-codec",
  "parity-util-mem",
@@ -1966,7 +1983,7 @@ dependencies = [
  "criterion",
  "frame-support",
  "impl-trait-for-tuples",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "serde",
  "sp-core",
@@ -2105,16 +2122,6 @@ version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99"
 
-[[package]]
-name = "futures-cpupool"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
-dependencies = [
- "futures 0.1.31",
- "num_cpus",
-]
-
 [[package]]
 name = "futures-executor"
 version = "0.3.16"
@@ -2154,7 +2161,7 @@ version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57"
 dependencies = [
- "autocfg",
+ "autocfg 1.0.1",
  "proc-macro-hack",
  "proc-macro2",
  "quote",
@@ -2206,7 +2213,7 @@ version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78"
 dependencies = [
- "autocfg",
+ "autocfg 1.0.1",
  "futures 0.1.31",
  "futures-channel",
  "futures-core",
@@ -2244,7 +2251,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
 dependencies = [
  "typenum",
- "version_check",
+ "version_check 0.9.2",
 ]
 
 [[package]]
@@ -2315,7 +2322,7 @@ dependencies = [
  "aho-corasick",
  "bstr",
  "fnv",
- "log",
+ "log 0.4.14",
  "regex",
 ]
 
@@ -2332,24 +2339,6 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "h2"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462"
-dependencies = [
- "byteorder",
- "bytes 0.4.12",
- "fnv",
- "futures 0.1.31",
- "http 0.1.21",
- "indexmap",
- "log",
- "slab",
- "string",
- "tokio-io",
-]
-
 [[package]]
 name = "h2"
 version = "0.2.7"
@@ -2361,11 +2350,11 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "futures-util",
- "http 0.2.3",
+ "http",
  "indexmap",
  "slab",
  "tokio 0.2.25",
- "tokio-util",
+ "tokio-util 0.3.1",
  "tracing",
  "tracing-futures",
 ]
@@ -2382,7 +2371,7 @@ version = "3.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cdb0867bbc5a3da37a753e78021d5fcf8a4db00e18dd2dd90fd36e24190e162d"
 dependencies = [
- "log",
+ "log 0.4.14",
  "pest",
  "pest_derive",
  "quick-error 2.0.0",
@@ -2512,17 +2501,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "http"
-version = "0.1.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0"
-dependencies = [
- "bytes 0.4.12",
- "fnv",
- "itoa",
-]
-
 [[package]]
 name = "http"
 version = "0.2.3"
@@ -2534,18 +2512,6 @@ dependencies = [
  "itoa",
 ]
 
-[[package]]
-name = "http-body"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d"
-dependencies = [
- "bytes 0.4.12",
- "futures 0.1.31",
- "http 0.1.21",
- "tokio-buf",
-]
-
 [[package]]
 name = "http-body"
 version = "0.3.1"
@@ -2553,7 +2519,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
 dependencies = [
  "bytes 0.5.6",
- "http 0.2.3",
+ "http",
 ]
 
 [[package]]
@@ -2563,15 +2529,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60daa14be0e0786db0f03a9e57cb404c9d756eed2b6c62b9ea98ec5743ec75a9"
 dependencies = [
  "bytes 1.0.1",
- "http 0.2.3",
+ "http",
  "pin-project-lite 0.2.6",
 ]
 
 [[package]]
 name = "httparse"
-version = "1.3.5"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "615caabe2c3160b313d52ccc905335f4ed5f10881dd63dc5699d47e90be85691"
+checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68"
 
 [[package]]
 name = "httpdate"
@@ -2579,6 +2545,12 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47"
 
+[[package]]
+name = "httpdate"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440"
+
 [[package]]
 name = "humantime"
 version = "1.3.0"
@@ -2596,32 +2568,21 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.12.36"
+version = "0.10.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c843caf6296fc1f93444735205af9ed4e109a539005abb2564ae1d6fad34c52"
+checksum = "0a0652d9a2609a968c14be1a9ea00bf4b1d64e2e1f53a1b51b6fff3a6e829273"
 dependencies = [
- "bytes 0.4.12",
- "futures 0.1.31",
- "futures-cpupool",
- "h2 0.1.26",
- "http 0.1.21",
- "http-body 0.1.0",
+ "base64 0.9.3",
  "httparse",
- "iovec",
- "itoa",
- "log",
- "net2",
- "rustc_version",
+ "language-tags",
+ "log 0.3.9",
+ "mime",
+ "num_cpus",
  "time",
- "tokio 0.1.22",
- "tokio-buf",
- "tokio-executor",
- "tokio-io",
- "tokio-reactor",
- "tokio-tcp",
- "tokio-threadpool",
- "tokio-timer",
- "want 0.2.0",
+ "traitobject",
+ "typeable",
+ "unicase 1.4.2",
+ "url 1.7.2",
 ]
 
 [[package]]
@@ -2634,40 +2595,41 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2 0.2.7",
- "http 0.2.3",
+ "h2",
+ "http",
  "http-body 0.3.1",
  "httparse",
- "httpdate",
+ "httpdate 0.3.2",
  "itoa",
  "pin-project 1.0.5",
  "socket2 0.3.19",
  "tokio 0.2.25",
  "tower-service",
  "tracing",
- "want 0.3.0",
+ "want",
 ]
 
 [[package]]
 name = "hyper"
-version = "0.14.5"
+version = "0.14.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bf09f61b52cfcf4c00de50df88ae423d6c02354e385a86341133b5338630ad1"
+checksum = "0b61cf2d1aebcf6e6352c97b81dc2244ca29194be1b276f5d8ad5c6330fffb11"
 dependencies = [
  "bytes 1.0.1",
  "futures-channel",
  "futures-core",
  "futures-util",
- "http 0.2.3",
+ "http",
  "http-body 0.4.2",
  "httparse",
- "httpdate",
+ "httpdate 1.0.1",
  "itoa",
- "pin-project 1.0.5",
- "tokio 1.6.0",
+ "pin-project-lite 0.2.6",
+ "socket2 0.4.0",
+ "tokio 1.9.0",
  "tower-service",
  "tracing",
- "want 0.3.0",
+ "want",
 ]
 
 [[package]]
@@ -2680,7 +2642,7 @@ dependencies = [
  "ct-logs",
  "futures-util",
  "hyper 0.13.10",
- "log",
+ "log 0.4.14",
  "rustls 0.18.1",
  "rustls-native-certs 0.4.0",
  "tokio 0.2.25",
@@ -2688,6 +2650,19 @@ dependencies = [
  "webpki",
 ]
 
+[[package]]
+name = "hyper-tls"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
+dependencies = [
+ "bytes 1.0.1",
+ "hyper 0.14.11",
+ "native-tls",
+ "tokio 1.9.0",
+ "tokio-native-tls",
+]
+
 [[package]]
 name = "idna"
 version = "0.1.5"
@@ -2743,7 +2718,7 @@ dependencies = [
  "if-addrs",
  "ipnet",
  "libc",
- "log",
+ "log 0.4.14",
  "winapi 0.3.9",
 ]
 
@@ -2782,7 +2757,7 @@ version = "1.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3"
 dependencies = [
- "autocfg",
+ "autocfg 1.0.1",
  "hashbrown 0.9.1",
  "serde",
 ]
@@ -2895,29 +2870,34 @@ dependencies = [
 
 [[package]]
 name = "jsonrpc-client-transports"
-version = "15.1.0"
+version = "18.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "489b9c612e60c766f751ab40fcb43cbb55a1e10bb44a9b4307ed510ca598cbd7"
+checksum = "d2b99d4207e2a04fb4581746903c2bb7eb376f88de9c699d0f3e10feeac0cd3a"
 dependencies = [
- "failure",
- "futures 0.1.31",
- "hyper 0.12.36",
+ "derive_more",
+ "futures 0.3.16",
+ "hyper 0.14.11",
+ "hyper-tls",
  "jsonrpc-core",
  "jsonrpc-pubsub",
- "log",
+ "log 0.4.14",
  "serde",
  "serde_json",
+ "tokio 1.9.0",
  "url 1.7.2",
+ "websocket",
 ]
 
 [[package]]
 name = "jsonrpc-core"
-version = "15.1.0"
+version = "18.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0745a6379e3edc893c84ec203589790774e4247420033e71a76d3ab4687991fa"
+checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb"
 dependencies = [
- "futures 0.1.31",
- "log",
+ "futures 0.3.16",
+ "futures-executor",
+ "futures-util",
+ "log 0.4.14",
  "serde",
  "serde_derive",
  "serde_json",
@@ -2925,18 +2905,19 @@ dependencies = [
 
 [[package]]
 name = "jsonrpc-core-client"
-version = "15.1.0"
+version = "18.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f764902d7b891344a0acb65625f32f6f7c6db006952143bd650209fbe7d94db"
+checksum = "b51da17abecbdab3e3d4f26b01c5ec075e88d3abe3ab3b05dc9aa69392764ec0"
 dependencies = [
+ "futures 0.3.16",
  "jsonrpc-client-transports",
 ]
 
 [[package]]
 name = "jsonrpc-derive"
-version = "15.1.0"
+version = "18.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99a847f9ec7bb52149b2786a17c9cb260d6effc6b8eeb8c16b343a487a7563a3"
+checksum = "5b939a78fa820cdfcb7ee7484466746a7377760970f6f9c6fe19f9edcc8a38d2"
 dependencies = [
  "proc-macro-crate 0.1.5",
  "proc-macro2",
@@ -2946,73 +2927,80 @@ dependencies = [
 
 [[package]]
 name = "jsonrpc-http-server"
-version = "15.1.0"
+version = "18.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb5c4513b7b542f42da107942b7b759f27120b5cc894729f88254b28dff44b7"
+checksum = "e1dea6e07251d9ce6a552abfb5d7ad6bc290a4596c8dcc3d795fae2bbdc1f3ff"
 dependencies = [
- "hyper 0.12.36",
+ "futures 0.3.16",
+ "hyper 0.14.11",
  "jsonrpc-core",
  "jsonrpc-server-utils",
- "log",
+ "log 0.4.14",
  "net2",
- "parking_lot 0.10.2",
- "unicase",
+ "parking_lot 0.11.1",
+ "unicase 2.6.0",
 ]
 
 [[package]]
 name = "jsonrpc-ipc-server"
-version = "15.1.0"
+version = "18.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf50e53e4eea8f421a7316c5f63e395f7bc7c4e786a6dc54d76fab6ff7aa7ce7"
+checksum = "382bb0206323ca7cda3dcd7e245cea86d37d02457a02a975e3378fb149a48845"
 dependencies = [
+ "futures 0.3.16",
  "jsonrpc-core",
  "jsonrpc-server-utils",
- "log",
+ "log 0.4.14",
  "parity-tokio-ipc",
- "parking_lot 0.10.2",
- "tokio-service",
+ "parking_lot 0.11.1",
+ "tower-service",
 ]
 
 [[package]]
 name = "jsonrpc-pubsub"
-version = "15.1.0"
+version = "18.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "639558e0604013be9787ae52f798506ae42bf4220fe587bdc5625871cc8b9c77"
+checksum = "240f87695e6c6f62fb37f05c02c04953cf68d6408b8c1c89de85c7a0125b1011"
 dependencies = [
+ "futures 0.3.16",
  "jsonrpc-core",
- "log",
- "parking_lot 0.10.2",
+ "lazy_static",
+ "log 0.4.14",
+ "parking_lot 0.11.1",
  "rand 0.7.3",
  "serde",
 ]
 
 [[package]]
 name = "jsonrpc-server-utils"
-version = "15.1.0"
+version = "18.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72f1f3990650c033bd8f6bd46deac76d990f9bbfb5f8dc8c4767bf0a00392176"
+checksum = "fa4fdea130485b572c39a460d50888beb00afb3e35de23ccd7fad8ff19f0e0d4"
 dependencies = [
- "bytes 0.4.12",
+ "bytes 1.0.1",
+ "futures 0.3.16",
  "globset",
  "jsonrpc-core",
  "lazy_static",
- "log",
- "tokio 0.1.22",
- "tokio-codec",
- "unicase",
+ "log 0.4.14",
+ "tokio 1.9.0",
+ "tokio-stream",
+ "tokio-util 0.6.7",
+ "unicase 2.6.0",
 ]
 
 [[package]]
 name = "jsonrpc-ws-server"
-version = "15.1.0"
+version = "18.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6596fe75209b73a2a75ebe1dce4e60e03b88a2b25e8807b667597f6315150d22"
+checksum = "f892c7d766369475ab7b0669f417906302d7c0fb521285c0a0c92e52e7c8e946"
 dependencies = [
+ "futures 0.3.16",
  "jsonrpc-core",
  "jsonrpc-server-utils",
- "log",
+ "log 0.4.14",
  "parity-ws",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.1",
  "slab",
 ]
 
@@ -3040,8 +3028,8 @@ dependencies = [
  "beef",
  "futures-channel",
  "futures-util",
- "hyper 0.14.5",
- "log",
+ "hyper 0.14.11",
+ "log 0.4.14",
  "serde",
  "serde_json",
  "soketto 0.6.0",
@@ -3058,7 +3046,7 @@ dependencies = [
  "fnv",
  "futures 0.3.16",
  "jsonrpsee-types",
- "log",
+ "log 0.4.14",
  "pin-project 1.0.5",
  "rustls 0.19.1",
  "rustls-native-certs 0.5.0",
@@ -3068,7 +3056,7 @@ dependencies = [
  "thiserror",
  "tokio 0.2.25",
  "tokio-rustls 0.15.0",
- "tokio-util",
+ "tokio-util 0.3.1",
  "url 2.2.1",
 ]
 
@@ -3105,7 +3093,7 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
 dependencies = [
- "log",
+ "log 0.4.14",
 ]
 
 [[package]]
@@ -3137,7 +3125,7 @@ checksum = "9b1b6ea8f2536f504b645ad78419c8246550e19d2c3419a167080ce08edee35a"
 dependencies = [
  "fs-swap",
  "kvdb",
- "log",
+ "log 0.4.14",
  "num_cpus",
  "owning_ref",
  "parity-util-mem",
@@ -3147,6 +3135,12 @@ dependencies = [
  "smallvec 1.6.1",
 ]
 
+[[package]]
+name = "language-tags"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
+
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -3251,7 +3245,7 @@ dependencies = [
  "futures-timer 3.0.2",
  "lazy_static",
  "libsecp256k1",
- "log",
+ "log 0.4.14",
  "multihash",
  "multistream-select",
  "parity-multiaddr",
@@ -3290,7 +3284,7 @@ dependencies = [
  "async-std-resolver",
  "futures 0.3.16",
  "libp2p-core",
- "log",
+ "log 0.4.14",
  "smallvec 1.6.1",
  "trust-dns-resolver",
 ]
@@ -3306,7 +3300,7 @@ dependencies = [
  "futures 0.3.16",
  "libp2p-core",
  "libp2p-swarm",
- "log",
+ "log 0.4.14",
  "prost",
  "prost-build",
  "rand 0.7.3",
@@ -3328,7 +3322,7 @@ dependencies = [
  "hex_fmt",
  "libp2p-core",
  "libp2p-swarm",
- "log",
+ "log 0.4.14",
  "prost",
  "prost-build",
  "rand 0.7.3",
@@ -3348,7 +3342,7 @@ dependencies = [
  "futures 0.3.16",
  "libp2p-core",
  "libp2p-swarm",
- "log",
+ "log 0.4.14",
  "prost",
  "prost-build",
  "smallvec 1.6.1",
@@ -3369,7 +3363,7 @@ dependencies = [
  "futures 0.3.16",
  "libp2p-core",
  "libp2p-swarm",
- "log",
+ "log 0.4.14",
  "prost",
  "prost-build",
  "rand 0.7.3",
@@ -3395,7 +3389,7 @@ dependencies = [
  "lazy_static",
  "libp2p-core",
  "libp2p-swarm",
- "log",
+ "log 0.4.14",
  "rand 0.8.4",
  "smallvec 1.6.1",
  "socket2 0.4.0",
@@ -3412,7 +3406,7 @@ dependencies = [
  "bytes 1.0.1",
  "futures 0.3.16",
  "libp2p-core",
- "log",
+ "log 0.4.14",
  "nohash-hasher",
  "parking_lot 0.11.1",
  "rand 0.7.3",
@@ -3431,7 +3425,7 @@ dependencies = [
  "futures 0.3.16",
  "lazy_static",
  "libp2p-core",
- "log",
+ "log 0.4.14",
  "prost",
  "prost-build",
  "rand 0.7.3",
@@ -3451,7 +3445,7 @@ dependencies = [
  "futures 0.3.16",
  "libp2p-core",
  "libp2p-swarm",
- "log",
+ "log 0.4.14",
  "rand 0.7.3",
  "void",
  "wasm-timer",
@@ -3467,7 +3461,7 @@ dependencies = [
  "bytes 1.0.1",
  "futures 0.3.16",
  "libp2p-core",
- "log",
+ "log 0.4.14",
  "prost",
  "prost-build",
  "unsigned-varint 0.7.0",
@@ -3481,7 +3475,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ce3374f3b28162db9d3442c9347c4f14cb01e8290052615c7d341d40eae0599"
 dependencies = [
  "futures 0.3.16",
- "log",
+ "log 0.4.14",
  "pin-project 1.0.5",
  "rand 0.7.3",
  "salsa20",
@@ -3500,7 +3494,7 @@ dependencies = [
  "futures-timer 3.0.2",
  "libp2p-core",
  "libp2p-swarm",
- "log",
+ "log 0.4.14",
  "pin-project 1.0.5",
  "prost",
  "prost-build",
@@ -3522,7 +3516,7 @@ dependencies = [
  "futures 0.3.16",
  "libp2p-core",
  "libp2p-swarm",
- "log",
+ "log 0.4.14",
  "lru",
  "minicbor",
  "rand 0.7.3",
@@ -3540,7 +3534,7 @@ dependencies = [
  "either",
  "futures 0.3.16",
  "libp2p-core",
- "log",
+ "log 0.4.14",
  "rand 0.7.3",
  "smallvec 1.6.1",
  "void",
@@ -3570,7 +3564,7 @@ dependencies = [
  "ipnet",
  "libc",
  "libp2p-core",
- "log",
+ "log 0.4.14",
  "socket2 0.4.0",
 ]
 
@@ -3583,7 +3577,7 @@ dependencies = [
  "async-std",
  "futures 0.3.16",
  "libp2p-core",
- "log",
+ "log 0.4.14",
 ]
 
 [[package]]
@@ -3610,7 +3604,7 @@ dependencies = [
  "futures 0.3.16",
  "futures-rustls",
  "libp2p-core",
- "log",
+ "log 0.4.14",
  "quicksink",
  "rw-stream-sink",
  "soketto 0.4.2",
@@ -3731,6 +3725,15 @@ dependencies = [
  "scopeguard",
 ]
 
+[[package]]
+name = "log"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
+dependencies = [
+ "log 0.4.14",
+]
+
 [[package]]
 name = "log"
 version = "0.4.14"
@@ -3861,7 +3864,7 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa"
 dependencies = [
- "autocfg",
+ "autocfg 1.0.1",
 ]
 
 [[package]]
@@ -3870,7 +3873,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87"
 dependencies = [
- "autocfg",
+ "autocfg 1.0.1",
 ]
 
 [[package]]
@@ -3902,6 +3905,15 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "mime"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0"
+dependencies = [
+ "log 0.3.9",
+]
+
 [[package]]
 name = "minicbor"
 version = "0.8.0"
@@ -3929,7 +3941,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
 dependencies = [
  "adler",
- "autocfg",
+ "autocfg 1.0.1",
 ]
 
 [[package]]
@@ -3944,7 +3956,7 @@ dependencies = [
  "iovec",
  "kernel32-sys",
  "libc",
- "log",
+ "log 0.4.14",
  "miow 0.2.2",
  "net2",
  "slab",
@@ -3952,27 +3964,28 @@ dependencies = [
 ]
 
 [[package]]
-name = "mio-extras"
-version = "2.0.6"
+name = "mio"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19"
+checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16"
 dependencies = [
- "lazycell",
- "log",
- "mio",
- "slab",
+ "libc",
+ "log 0.4.14",
+ "miow 0.3.6",
+ "ntapi",
+ "winapi 0.3.9",
 ]
 
 [[package]]
-name = "mio-named-pipes"
-version = "0.1.7"
+name = "mio-extras"
+version = "2.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656"
+checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19"
 dependencies = [
- "log",
- "mio",
- "miow 0.3.6",
- "winapi 0.3.9",
+ "lazycell",
+ "log 0.4.14",
+ "mio 0.6.23",
+ "slab",
 ]
 
 [[package]]
@@ -3983,7 +3996,7 @@ checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0"
 dependencies = [
  "iovec",
  "libc",
- "mio",
+ "mio 0.6.23",
 ]
 
 [[package]]
@@ -4070,7 +4083,7 @@ checksum = "7d91ec0a2440aaff5f78ec35631a7027d50386c6163aa975f7caa0d5da4b6ff8"
 dependencies = [
  "bytes 1.0.1",
  "futures 0.3.16",
- "log",
+ "log 0.4.14",
  "pin-project 1.0.5",
  "smallvec 1.6.1",
  "unsigned-varint 0.7.0",
@@ -4114,6 +4127,24 @@ dependencies = [
  "rand 0.3.23",
 ]
 
+[[package]]
+name = "native-tls"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d"
+dependencies = [
+ "lazy_static",
+ "libc",
+ "log 0.4.14",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework 2.3.0",
+ "security-framework-sys 2.3.0",
+ "tempfile",
+]
+
 [[package]]
 name = "nb-connect"
 version = "1.0.3"
@@ -4159,7 +4190,7 @@ dependencies = [
  "kvdb",
  "kvdb-rocksdb",
  "lazy_static",
- "log",
+ "log 0.4.14",
  "node-primitives",
  "node-runtime",
  "node-testing",
@@ -4215,7 +4246,7 @@ dependencies = [
  "futures 0.3.16",
  "hex-literal",
  "libp2p-wasm-ext",
- "log",
+ "log 0.4.14",
  "nix",
  "node-executor",
  "node-inspect",
@@ -4329,7 +4360,7 @@ name = "node-inspect"
 version = "0.9.0-dev"
 dependencies = [
  "derive_more",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "sc-cli",
  "sc-client-api",
@@ -4388,10 +4419,9 @@ dependencies = [
 name = "node-rpc-client"
 version = "2.0.0"
 dependencies = [
- "futures 0.1.31",
- "hyper 0.12.36",
+ "futures 0.3.16",
  "jsonrpc-core-client",
- "log",
+ "log 0.4.14",
  "node-primitives",
  "sc-rpc",
  "sp-tracing",
@@ -4410,7 +4440,7 @@ dependencies = [
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
  "hex-literal",
- "log",
+ "log 0.4.14",
  "node-primitives",
  "pallet-assets",
  "pallet-authority-discovery",
@@ -4558,7 +4588,7 @@ dependencies = [
  "frame-system",
  "fs_extra",
  "futures 0.3.16",
- "log",
+ "log 0.4.14",
  "node-executor",
  "node-primitives",
  "node-runtime",
@@ -4615,7 +4645,16 @@ dependencies = [
  "bitvec 0.19.5",
  "funty",
  "memchr",
- "version_check",
+ "version_check 0.9.2",
+]
+
+[[package]]
+name = "ntapi"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
+dependencies = [
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -4624,7 +4663,7 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304"
 dependencies = [
- "autocfg",
+ "autocfg 1.0.1",
  "num-integer",
  "num-traits",
 ]
@@ -4644,7 +4683,7 @@ version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
 dependencies = [
- "autocfg",
+ "autocfg 1.0.1",
  "num-traits",
 ]
 
@@ -4654,7 +4693,7 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
 dependencies = [
- "autocfg",
+ "autocfg 1.0.1",
  "num-bigint",
  "num-integer",
  "num-traits",
@@ -4666,7 +4705,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a"
 dependencies = [
- "autocfg",
+ "autocfg 1.0.1",
  "num-integer",
  "num-traits",
 ]
@@ -4677,7 +4716,7 @@ version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
 dependencies = [
- "autocfg",
+ "autocfg 1.0.1",
  "libm",
 ]
 
@@ -4734,12 +4773,39 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
+[[package]]
+name = "openssl"
+version = "0.10.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "549430950c79ae24e6d02e0b7404534ecf311d94cc9f861e9e4020187d13d885"
+dependencies = [
+ "bitflags",
+ "cfg-if 1.0.0",
+ "foreign-types",
+ "libc",
+ "once_cell",
+ "openssl-sys",
+]
+
 [[package]]
 name = "openssl-probe"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
 
+[[package]]
+name = "openssl-sys"
+version = "0.9.65"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a7907e3bfa08bb85105209cdfcb6c63d109f8f6c1ed6ca318fff5c1853fbc1d"
+dependencies = [
+ "autocfg 1.0.1",
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
 [[package]]
 name = "output_vt100"
 version = "0.1.2"
@@ -4847,7 +4913,7 @@ dependencies = [
  "frame-election-provider-support",
  "frame-support",
  "frame-system",
- "log",
+ "log 0.4.14",
  "pallet-authorship",
  "pallet-balances",
  "pallet-offences",
@@ -4874,7 +4940,7 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "log",
+ "log 0.4.14",
  "pallet-transaction-payment",
  "parity-scale-codec",
  "sp-core",
@@ -4908,7 +4974,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "hex-literal",
- "log",
+ "log 0.4.14",
  "pallet-balances",
  "parity-scale-codec",
  "sp-core",
@@ -4927,7 +4993,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "hex-literal",
- "log",
+ "log 0.4.14",
  "pallet-balances",
  "pallet-contracts-primitives",
  "pallet-contracts-proc-macro",
@@ -5031,7 +5097,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "hex-literal",
- "log",
+ "log 0.4.14",
  "pallet-balances",
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -5071,7 +5137,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "hex-literal",
- "log",
+ "log 0.4.14",
  "pallet-balances",
  "parity-scale-codec",
  "sp-core",
@@ -5089,7 +5155,7 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "log",
+ "log 0.4.14",
  "pallet-balances",
  "parity-scale-codec",
  "sp-core",
@@ -5105,7 +5171,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "lite-json",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "sp-core",
  "sp-io",
@@ -5154,7 +5220,7 @@ dependencies = [
  "frame-election-provider-support",
  "frame-support",
  "frame-system",
- "log",
+ "log 0.4.14",
  "pallet-authorship",
  "pallet-balances",
  "pallet-offences",
@@ -5197,7 +5263,7 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "log",
+ "log 0.4.14",
  "pallet-authorship",
  "pallet-session",
  "parity-scale-codec",
@@ -5249,7 +5315,7 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "sp-core",
  "sp-io",
@@ -5282,7 +5348,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "hex-literal",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "serde",
  "sp-api",
@@ -5344,7 +5410,7 @@ version = "4.0.0-dev"
 dependencies = [
  "frame-support",
  "frame-system",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "sp-core",
  "sp-io",
@@ -5358,7 +5424,7 @@ version = "4.0.0-dev"
 dependencies = [
  "frame-support",
  "frame-system",
- "log",
+ "log 0.4.14",
  "pallet-balances",
  "parity-scale-codec",
  "serde",
@@ -5447,7 +5513,7 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "sp-core",
  "sp-io",
@@ -5478,7 +5544,7 @@ dependencies = [
  "frame-system",
  "impl-trait-for-tuples",
  "lazy_static",
- "log",
+ "log 0.4.14",
  "pallet-timestamp",
  "parity-scale-codec",
  "sp-application-crypto",
@@ -5539,7 +5605,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "hex",
- "log",
+ "log 0.4.14",
  "pallet-authorship",
  "pallet-balances",
  "pallet-session",
@@ -5577,7 +5643,7 @@ dependencies = [
 name = "pallet-staking-reward-fn"
 version = "4.0.0-dev"
 dependencies = [
- "log",
+ "log 0.4.14",
  "sp-arithmetic",
 ]
 
@@ -5616,7 +5682,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "impl-trait-for-tuples",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "sp-core",
  "sp-inherents",
@@ -5785,7 +5851,7 @@ dependencies = [
  "fs2",
  "hex",
  "libc",
- "log",
+ "log 0.4.14",
  "lz4",
  "memmap2",
  "parking_lot 0.11.1",
@@ -5845,20 +5911,15 @@ checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f"
 
 [[package]]
 name = "parity-tokio-ipc"
-version = "0.4.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e57fea504fea33f9fbb5f49f378359030e7e026a6ab849bb9e8f0787376f1bf"
+checksum = "9981e32fb75e004cc148f5fb70342f393830e0a4aa62e3cc93b50976218d42b6"
 dependencies = [
- "bytes 0.4.12",
- "futures 0.1.31",
+ "futures 0.3.16",
  "libc",
- "log",
- "mio-named-pipes",
- "miow 0.3.6",
+ "log 0.4.14",
  "rand 0.7.3",
- "tokio 0.1.22",
- "tokio-named-pipes",
- "tokio-uds",
+ "tokio 1.9.0",
  "winapi 0.3.9",
 ]
 
@@ -5906,15 +5967,15 @@ checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92"
 
 [[package]]
 name = "parity-ws"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e02a625dd75084c2a7024f07c575b61b782f729d18702dabb3cdbf31911dc61"
+checksum = "d0ab8a461779bd022964cae2b4989fa9c99deb270bec162da2125ec03c09fcaa"
 dependencies = [
  "byteorder",
  "bytes 0.4.12",
  "httparse",
- "log",
- "mio",
+ "log 0.4.14",
+ "mio 0.6.23",
  "mio-extras",
  "rand 0.7.3",
  "sha-1 0.8.2",
@@ -6224,7 +6285,7 @@ checksum = "a2a7bc6b2a29e632e45451c941832803a18cce6781db04de8a04696cdca8bde4"
 dependencies = [
  "cfg-if 0.1.10",
  "libc",
- "log",
+ "log 0.4.14",
  "wepoll-sys",
  "winapi 0.3.9",
 ]
@@ -6347,7 +6408,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "syn",
- "version_check",
+ "version_check 0.9.2",
 ]
 
 [[package]]
@@ -6360,7 +6421,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "syn",
- "version_check",
+ "version_check 0.9.2",
 ]
 
 [[package]]
@@ -6373,7 +6434,7 @@ dependencies = [
  "quote",
  "syn",
  "syn-mid",
- "version_check",
+ "version_check 0.9.2",
 ]
 
 [[package]]
@@ -6384,7 +6445,7 @@ checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
  "proc-macro2",
  "quote",
- "version_check",
+ "version_check 0.9.2",
 ]
 
 [[package]]
@@ -6441,7 +6502,7 @@ dependencies = [
  "bytes 1.0.1",
  "heck",
  "itertools 0.9.0",
- "log",
+ "log 0.4.14",
  "multimap",
  "petgraph",
  "prost",
@@ -6489,7 +6550,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0c1a2f10b47d446372a4f397c58b329aaea72b2daf9395a623a411cb8ccb54f"
 dependencies = [
  "byteorder",
- "log",
+ "log 0.4.14",
  "parity-wasm 0.42.2",
 ]
 
@@ -6512,7 +6573,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6"
 dependencies = [
  "env_logger 0.8.3",
- "log",
+ "log 0.4.14",
  "rand 0.8.4",
 ]
 
@@ -6571,6 +6632,25 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "rand"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
+dependencies = [
+ "autocfg 0.1.7",
+ "libc",
+ "rand_chacha 0.1.1",
+ "rand_core 0.4.2",
+ "rand_hc 0.1.0",
+ "rand_isaac",
+ "rand_jitter",
+ "rand_os",
+ "rand_pcg 0.1.2",
+ "rand_xorshift",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "rand"
 version = "0.7.3"
@@ -6597,6 +6677,16 @@ dependencies = [
  "rand_hc 0.3.0",
 ]
 
+[[package]]
+name = "rand_chacha"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
+dependencies = [
+ "autocfg 0.1.7",
+ "rand_core 0.3.1",
+]
+
 [[package]]
 name = "rand_chacha"
 version = "0.2.2"
@@ -6660,6 +6750,15 @@ dependencies = [
  "rand 0.8.4",
 ]
 
+[[package]]
+name = "rand_hc"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
+dependencies = [
+ "rand_core 0.3.1",
+]
+
 [[package]]
 name = "rand_hc"
 version = "0.2.0"
@@ -6678,6 +6777,50 @@ dependencies = [
  "rand_core 0.6.2",
 ]
 
+[[package]]
+name = "rand_isaac"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
+dependencies = [
+ "rand_core 0.3.1",
+]
+
+[[package]]
+name = "rand_jitter"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
+dependencies = [
+ "libc",
+ "rand_core 0.4.2",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "rand_os"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
+dependencies = [
+ "cloudabi",
+ "fuchsia-cprng",
+ "libc",
+ "rand_core 0.4.2",
+ "rdrand",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "rand_pcg"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
+dependencies = [
+ "autocfg 0.1.7",
+ "rand_core 0.4.2",
+]
+
 [[package]]
 name = "rand_pcg"
 version = "0.2.1"
@@ -6696,6 +6839,15 @@ dependencies = [
  "rand_core 0.6.2",
 ]
 
+[[package]]
+name = "rand_xorshift"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
+dependencies = [
+ "rand_core 0.3.1",
+]
+
 [[package]]
 name = "rawpointer"
 version = "0.2.1"
@@ -6708,7 +6860,7 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
 dependencies = [
- "autocfg",
+ "autocfg 1.0.1",
  "crossbeam-deque 0.8.0",
  "either",
  "rayon-core",
@@ -6798,7 +6950,7 @@ version = "0.0.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "571f7f397d61c4755285cd37853fe8e03271c243424a907415909379659381c5"
 dependencies = [
- "log",
+ "log 0.4.14",
  "rustc-hash",
  "serde",
  "smallvec 1.6.1",
@@ -6853,7 +7005,7 @@ dependencies = [
  "hex",
  "jsonrpsee-proc-macros",
  "jsonrpsee-ws-client",
- "log",
+ "log 0.4.14",
  "pallet-elections-phragmen",
  "parity-scale-codec",
  "serde",
@@ -6970,7 +7122,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81"
 dependencies = [
  "base64 0.12.3",
- "log",
+ "log 0.4.14",
  "ring",
  "sct",
  "webpki",
@@ -6983,7 +7135,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
 dependencies = [
  "base64 0.13.0",
- "log",
+ "log 0.4.14",
  "ring",
  "sct",
  "webpki",
@@ -7055,6 +7207,12 @@ dependencies = [
  "rustc_version",
 ]
 
+[[package]]
+name = "safemem"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
+
 [[package]]
 name = "salsa20"
 version = "0.7.2"
@@ -7077,7 +7235,7 @@ dependencies = [
 name = "sc-allocator"
 version = "4.0.0-dev"
 dependencies = [
- "log",
+ "log 0.4.14",
  "sp-core",
  "sp-wasm-interface",
  "thiserror",
@@ -7094,7 +7252,7 @@ dependencies = [
  "futures-timer 3.0.2",
  "ip_network",
  "libp2p",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "prost",
  "prost-build",
@@ -7121,7 +7279,7 @@ version = "0.10.0-dev"
 dependencies = [
  "futures 0.3.16",
  "futures-timer 3.0.2",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "parking_lot 0.11.1",
  "sc-block-builder",
@@ -7191,7 +7349,7 @@ dependencies = [
  "futures 0.3.16",
  "hex",
  "libp2p",
- "log",
+ "log 0.4.14",
  "names",
  "parity-scale-codec",
  "rand 0.7.3",
@@ -7231,7 +7389,7 @@ dependencies = [
  "kvdb",
  "kvdb-memorydb",
  "lazy_static",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "parking_lot 0.11.1",
  "sc-executor",
@@ -7267,7 +7425,7 @@ dependencies = [
  "kvdb-memorydb",
  "kvdb-rocksdb",
  "linked-hash-map",
- "log",
+ "log 0.4.14",
  "parity-db",
  "parity-scale-codec",
  "parity-util-mem",
@@ -7298,7 +7456,7 @@ dependencies = [
  "futures 0.3.16",
  "futures-timer 3.0.2",
  "libp2p",
- "log",
+ "log 0.4.14",
  "parking_lot 0.11.1",
  "sc-client-api",
  "serde",
@@ -7324,7 +7482,7 @@ dependencies = [
  "futures 0.3.16",
  "futures-timer 3.0.2",
  "getrandom 0.2.3",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "parking_lot 0.11.1",
  "sc-block-builder",
@@ -7367,7 +7525,7 @@ dependencies = [
  "fork-tree",
  "futures 0.3.16",
  "futures-timer 3.0.2",
- "log",
+ "log 0.4.14",
  "merlin",
  "num-bigint",
  "num-rational 0.2.4",
@@ -7466,7 +7624,7 @@ dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "parking_lot 0.11.1",
  "sc-basic-authorship",
@@ -7503,7 +7661,7 @@ dependencies = [
  "derive_more",
  "futures 0.3.16",
  "futures-timer 3.0.2",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "parking_lot 0.11.1",
  "sc-client-api",
@@ -7527,7 +7685,7 @@ dependencies = [
  "futures 0.3.16",
  "futures-timer 3.0.2",
  "impl-trait-for-tuples",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "sc-client-api",
  "sc-consensus",
@@ -7567,7 +7725,7 @@ dependencies = [
  "hex-literal",
  "lazy_static",
  "libsecp256k1",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "parity-wasm 0.42.2",
  "parking_lot 0.11.1",
@@ -7620,7 +7778,7 @@ dependencies = [
 name = "sc-executor-wasmi"
 version = "0.10.0-dev"
 dependencies = [
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "sc-allocator",
  "sc-executor-common",
@@ -7637,7 +7795,7 @@ dependencies = [
  "assert_matches",
  "cfg-if 1.0.0",
  "libc",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "parity-wasm 0.42.2",
  "pwasm-utils",
@@ -7666,7 +7824,7 @@ dependencies = [
  "futures 0.3.16",
  "futures-timer 3.0.2",
  "linked-hash-map",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "parking_lot 0.11.1",
  "pin-project 1.0.5",
@@ -7714,7 +7872,7 @@ dependencies = [
  "jsonrpc-derive",
  "jsonrpc-pubsub",
  "lazy_static",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "sc-block-builder",
  "sc-client-api",
@@ -7739,7 +7897,7 @@ dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.16",
  "futures-timer 3.0.2",
- "log",
+ "log 0.4.14",
  "parity-util-mem",
  "sc-client-api",
  "sc-network",
@@ -7811,7 +7969,7 @@ dependencies = [
  "libp2p",
  "linked-hash-map",
  "linked_hash_set",
- "log",
+ "log 0.4.14",
  "lru",
  "nohash-hasher",
  "parity-scale-codec",
@@ -7857,7 +8015,7 @@ dependencies = [
  "futures 0.3.16",
  "futures-timer 3.0.2",
  "libp2p",
- "log",
+ "log 0.4.14",
  "lru",
  "quickcheck",
  "rand 0.7.3",
@@ -7878,7 +8036,7 @@ dependencies = [
  "futures 0.3.16",
  "futures-timer 3.0.2",
  "libp2p",
- "log",
+ "log 0.4.14",
  "parking_lot 0.11.1",
  "rand 0.7.3",
  "sc-block-builder",
@@ -7909,7 +8067,7 @@ dependencies = [
  "hyper 0.13.10",
  "hyper-rustls",
  "lazy_static",
- "log",
+ "log 0.4.14",
  "num_cpus",
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -7939,7 +8097,7 @@ version = "4.0.0-dev"
 dependencies = [
  "futures 0.3.16",
  "libp2p",
- "log",
+ "log 0.4.14",
  "rand 0.7.3",
  "serde_json",
  "sp-utils",
@@ -7950,7 +8108,7 @@ dependencies = [
 name = "sc-proposer-metrics"
 version = "0.9.0"
 dependencies = [
- "log",
+ "log 0.4.14",
  "substrate-prometheus-endpoint",
 ]
 
@@ -7959,13 +8117,12 @@ name = "sc-rpc"
 version = "4.0.0-dev"
 dependencies = [
  "assert_matches",
- "futures 0.1.31",
  "futures 0.3.16",
  "hash-db",
  "jsonrpc-core",
  "jsonrpc-pubsub",
  "lazy_static",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "parking_lot 0.11.1",
  "sc-block-builder",
@@ -7995,7 +8152,6 @@ dependencies = [
  "sp-utils",
  "sp-version",
  "substrate-test-runtime-client",
- "tokio 0.1.22",
 ]
 
 [[package]]
@@ -8008,7 +8164,7 @@ dependencies = [
  "jsonrpc-core-client",
  "jsonrpc-derive",
  "jsonrpc-pubsub",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "parking_lot 0.11.1",
  "sc-chain-spec",
@@ -8026,13 +8182,13 @@ dependencies = [
 name = "sc-rpc-server"
 version = "4.0.0-dev"
 dependencies = [
- "futures 0.1.31",
+ "futures 0.3.16",
  "jsonrpc-core",
  "jsonrpc-http-server",
  "jsonrpc-ipc-server",
  "jsonrpc-pubsub",
  "jsonrpc-ws-server",
- "log",
+ "log 0.4.14",
  "serde",
  "serde_json",
  "sp-runtime",
@@ -8060,14 +8216,13 @@ dependencies = [
  "async-trait",
  "directories",
  "exit-future",
- "futures 0.1.31",
  "futures 0.3.16",
  "futures-timer 3.0.2",
  "hash-db",
  "jsonrpc-core",
  "jsonrpc-pubsub",
  "lazy_static",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "parity-util-mem",
  "parking_lot 0.11.1",
@@ -8134,7 +8289,7 @@ dependencies = [
  "futures 0.1.31",
  "futures 0.3.16",
  "hex-literal",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "parking_lot 0.11.1",
  "sc-block-builder",
@@ -8167,7 +8322,7 @@ dependencies = [
 name = "sc-state-db"
 version = "0.10.0-dev"
 dependencies = [
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "parity-util-mem",
  "parity-util-mem-derive",
@@ -8205,7 +8360,7 @@ dependencies = [
  "chrono",
  "futures 0.3.16",
  "libp2p",
- "log",
+ "log 0.4.14",
  "parking_lot 0.11.1",
  "pin-project 1.0.5",
  "rand 0.7.3",
@@ -8225,7 +8380,7 @@ dependencies = [
  "atty",
  "erased-serde",
  "lazy_static",
- "log",
+ "log 0.4.14",
  "once_cell",
  "parking_lot 0.11.1",
  "regex",
@@ -8274,7 +8429,7 @@ dependencies = [
  "hex",
  "intervalier",
  "linked-hash-map",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "parity-util-mem",
  "parking_lot 0.11.1",
@@ -8305,7 +8460,7 @@ version = "4.0.0-dev"
 dependencies = [
  "derive_more",
  "futures 0.3.16",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "serde",
  "sp-blockchain",
@@ -8533,6 +8688,12 @@ dependencies = [
  "opaque-debug 0.3.0",
 ]
 
+[[package]]
+name = "sha1"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
+
 [[package]]
 name = "sha2"
 version = "0.8.2"
@@ -8708,7 +8869,7 @@ dependencies = [
  "flate2",
  "futures 0.3.16",
  "httparse",
- "log",
+ "log 0.4.14",
  "rand 0.7.3",
  "sha-1 0.9.4",
 ]
@@ -8723,7 +8884,7 @@ dependencies = [
  "bytes 1.0.1",
  "futures 0.3.16",
  "httparse",
- "log",
+ "log 0.4.14",
  "rand 0.8.4",
  "sha-1 0.9.4",
 ]
@@ -8733,7 +8894,7 @@ name = "sp-api"
 version = "4.0.0-dev"
 dependencies = [
  "hash-db",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "sp-api-proc-macro",
  "sp-core",
@@ -8762,7 +8923,7 @@ version = "2.0.1"
 dependencies = [
  "criterion",
  "futures 0.3.16",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "rustversion",
  "sc-block-builder",
@@ -8867,7 +9028,7 @@ name = "sp-blockchain"
 version = "4.0.0-dev"
 dependencies = [
  "futures 0.3.16",
- "log",
+ "log 0.4.14",
  "lru",
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -8886,7 +9047,7 @@ dependencies = [
  "async-trait",
  "futures 0.3.16",
  "futures-timer 3.0.2",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "sp-core",
  "sp-inherents",
@@ -8984,7 +9145,7 @@ dependencies = [
  "impl-serde",
  "lazy_static",
  "libsecp256k1",
- "log",
+ "log 0.4.14",
  "merlin",
  "num-traits",
  "parity-scale-codec",
@@ -9047,7 +9208,7 @@ name = "sp-finality-grandpa"
 version = "4.0.0-dev"
 dependencies = [
  "finality-grandpa",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "serde",
  "sp-api",
@@ -9079,7 +9240,7 @@ dependencies = [
  "futures 0.3.16",
  "hash-db",
  "libsecp256k1",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "parking_lot 0.11.1",
  "sp-core",
@@ -9210,7 +9371,7 @@ dependencies = [
  "either",
  "hash256-std-hasher",
  "impl-trait-for-tuples",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "parity-util-mem",
  "paste 1.0.4",
@@ -9349,7 +9510,7 @@ version = "0.10.0-dev"
 dependencies = [
  "hash-db",
  "hex-literal",
- "log",
+ "log 0.4.14",
  "num-traits",
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -9388,7 +9549,7 @@ dependencies = [
 name = "sp-tasks"
 version = "4.0.0-dev"
 dependencies = [
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "sp-core",
  "sp-externalities",
@@ -9415,7 +9576,7 @@ version = "4.0.0-dev"
 dependencies = [
  "async-trait",
  "futures-timer 3.0.2",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "sp-api",
  "sp-inherents",
@@ -9430,7 +9591,7 @@ name = "sp-tracing"
 version = "4.0.0-dev"
 dependencies = [
  "erased-serde",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "parking_lot 0.10.2",
  "serde",
@@ -9455,7 +9616,7 @@ name = "sp-transaction-storage-proof"
 version = "4.0.0-dev"
 dependencies = [
  "async-trait",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "sp-core",
  "sp-inherents",
@@ -9570,15 +9731,6 @@ dependencies = [
  "generic-array 0.14.4",
 ]
 
-[[package]]
-name = "string"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d"
-dependencies = [
- "bytes 0.4.12",
-]
-
 [[package]]
 name = "strsim"
 version = "0.8.0"
@@ -9657,14 +9809,13 @@ version = "0.10.0-dev"
 dependencies = [
  "chrono",
  "console_error_panic_hook",
- "futures 0.1.31",
  "futures 0.3.16",
  "futures-timer 3.0.2",
  "getrandom 0.2.3",
  "js-sys",
  "kvdb-memorydb",
  "libp2p-wasm-ext",
- "log",
+ "log 0.4.14",
  "rand 0.7.3",
  "sc-chain-spec",
  "sc-informant",
@@ -9720,7 +9871,7 @@ dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "sc-client-api",
  "sc-rpc-api",
@@ -9744,7 +9895,7 @@ dependencies = [
  "derive_more",
  "futures-util",
  "hyper 0.13.10",
- "log",
+ "log 0.4.14",
  "prometheus",
  "tokio 0.2.25",
 ]
@@ -9754,7 +9905,6 @@ name = "substrate-test-client"
 version = "2.0.1"
 dependencies = [
  "async-trait",
- "futures 0.1.31",
  "futures 0.3.16",
  "hash-db",
  "hex",
@@ -9786,7 +9936,7 @@ dependencies = [
  "frame-system",
  "frame-system-rpc-runtime-api",
  "futures 0.3.16",
- "log",
+ "log 0.4.14",
  "memory-db",
  "pallet-babe",
  "pallet-timestamp",
@@ -9995,7 +10145,7 @@ dependencies = [
  "frame-system",
  "futures 0.3.16",
  "jsonrpc-core",
- "log",
+ "log 0.4.14",
  "num-traits",
  "sc-basic-authorship",
  "sc-cli",
@@ -10040,7 +10190,7 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "log",
+ "log 0.4.14",
  "node-cli",
  "node-primitives",
  "node-runtime",
@@ -10184,7 +10334,7 @@ checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6"
 dependencies = [
  "bytes 0.4.12",
  "futures 0.1.31",
- "mio",
+ "mio 0.6.23",
  "num_cpus",
  "tokio-codec",
  "tokio-current-thread",
@@ -10213,35 +10363,34 @@ dependencies = [
  "lazy_static",
  "libc",
  "memchr",
- "mio",
+ "mio 0.6.23",
  "mio-uds",
  "num_cpus",
  "pin-project-lite 0.1.12",
  "signal-hook-registry",
  "slab",
- "tokio-macros",
+ "tokio-macros 0.2.6",
  "winapi 0.3.9",
 ]
 
 [[package]]
 name = "tokio"
-version = "1.6.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd3076b5c8cc18138b8f8814895c11eb4de37114a5d127bafdc5e55798ceef37"
+checksum = "4b7b349f11a7047e6d1276853e612d152f5e8a352c61917887cc2169e2366b4c"
 dependencies = [
- "autocfg",
+ "autocfg 1.0.1",
+ "bytes 1.0.1",
+ "libc",
+ "memchr",
+ "mio 0.7.13",
+ "num_cpus",
+ "once_cell",
+ "parking_lot 0.11.1",
  "pin-project-lite 0.2.6",
-]
-
-[[package]]
-name = "tokio-buf"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46"
-dependencies = [
- "bytes 0.4.12",
- "either",
- "futures 0.1.31",
+ "signal-hook-registry",
+ "tokio-macros 1.3.0",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -10294,7 +10443,7 @@ checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674"
 dependencies = [
  "bytes 0.4.12",
  "futures 0.1.31",
- "log",
+ "log 0.4.14",
 ]
 
 [[package]]
@@ -10309,16 +10458,24 @@ dependencies = [
 ]
 
 [[package]]
-name = "tokio-named-pipes"
-version = "0.1.0"
+name = "tokio-macros"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d282d483052288b2308ba5ee795f5673b159c9bdf63c385a05609da782a5eae"
+checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110"
 dependencies = [
- "bytes 0.4.12",
- "futures 0.1.31",
- "mio",
- "mio-named-pipes",
- "tokio 0.1.22",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tokio-native-tls"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
+dependencies = [
+ "native-tls",
+ "tokio 1.9.0",
 ]
 
 [[package]]
@@ -10330,8 +10487,8 @@ dependencies = [
  "crossbeam-utils 0.7.2",
  "futures 0.1.31",
  "lazy_static",
- "log",
- "mio",
+ "log 0.4.14",
+ "mio 0.6.23",
  "num_cpus",
  "parking_lot 0.9.0",
  "slab",
@@ -10365,12 +10522,14 @@ dependencies = [
 ]
 
 [[package]]
-name = "tokio-service"
-version = "0.1.0"
+name = "tokio-stream"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24da22d077e0f15f55162bdbdc661228c1581892f52074fb242678d015b45162"
+checksum = "7b2f3f698253f03119ac0102beaa64f67a67e08074d03a22d18784104543727f"
 dependencies = [
- "futures 0.1.31",
+ "futures-core",
+ "pin-project-lite 0.2.6",
+ "tokio 1.9.0",
 ]
 
 [[package]]
@@ -10392,7 +10551,7 @@ dependencies = [
  "bytes 0.4.12",
  "futures 0.1.31",
  "iovec",
- "mio",
+ "mio 0.6.23",
  "tokio-io",
  "tokio-reactor",
 ]
@@ -10408,7 +10567,7 @@ dependencies = [
  "crossbeam-utils 0.7.2",
  "futures 0.1.31",
  "lazy_static",
- "log",
+ "log 0.4.14",
  "num_cpus",
  "slab",
  "tokio-executor",
@@ -10426,6 +10585,17 @@ dependencies = [
  "tokio-executor",
 ]
 
+[[package]]
+name = "tokio-tls"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "354b8cd83825b3c20217a9dc174d6a0c67441a2fae5c41bcb1ea6679f6ae0f7c"
+dependencies = [
+ "futures 0.1.31",
+ "native-tls",
+ "tokio-io",
+]
+
 [[package]]
 name = "tokio-udp"
 version = "0.1.6"
@@ -10434,8 +10604,8 @@ checksum = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82"
 dependencies = [
  "bytes 0.4.12",
  "futures 0.1.31",
- "log",
- "mio",
+ "log 0.4.14",
+ "mio 0.6.23",
  "tokio-codec",
  "tokio-io",
  "tokio-reactor",
@@ -10451,8 +10621,8 @@ dependencies = [
  "futures 0.1.31",
  "iovec",
  "libc",
- "log",
- "mio",
+ "log 0.4.14",
+ "mio 0.6.23",
  "mio-uds",
  "tokio-codec",
  "tokio-io",
@@ -10469,11 +10639,25 @@ dependencies = [
  "futures-core",
  "futures-io",
  "futures-sink",
- "log",
+ "log 0.4.14",
  "pin-project-lite 0.1.12",
  "tokio 0.2.25",
 ]
 
+[[package]]
+name = "tokio-util"
+version = "0.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592"
+dependencies = [
+ "bytes 1.0.1",
+ "futures-core",
+ "futures-sink",
+ "log 0.4.14",
+ "pin-project-lite 0.2.6",
+ "tokio 1.9.0",
+]
+
 [[package]]
 name = "toml"
 version = "0.5.8"
@@ -10496,7 +10680,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f"
 dependencies = [
  "cfg-if 1.0.0",
- "log",
+ "log 0.4.14",
  "pin-project-lite 0.2.6",
  "tracing-attributes",
  "tracing-core",
@@ -10539,7 +10723,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3"
 dependencies = [
  "lazy_static",
- "log",
+ "log 0.4.14",
  "tracing-core",
 ]
 
@@ -10575,6 +10759,12 @@ dependencies = [
  "tracing-serde",
 ]
 
+[[package]]
+name = "traitobject"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079"
+
 [[package]]
 name = "treeline"
 version = "0.1.0"
@@ -10605,7 +10795,7 @@ checksum = "9eac131e334e81b6b3be07399482042838adcd7957aa0010231d0813e39e02fa"
 dependencies = [
  "hash-db",
  "hashbrown 0.11.2",
- "log",
+ "log 0.4.14",
  "rustc-hex",
  "smallvec 1.6.1",
 ]
@@ -10645,7 +10835,7 @@ dependencies = [
  "idna 0.2.2",
  "ipnet",
  "lazy_static",
- "log",
+ "log 0.4.14",
  "rand 0.8.4",
  "smallvec 1.6.1",
  "thiserror",
@@ -10663,7 +10853,7 @@ dependencies = [
  "futures-util",
  "ipconfig",
  "lazy_static",
- "log",
+ "log 0.4.14",
  "lru-cache",
  "parking_lot 0.11.1",
  "resolv-conf",
@@ -10683,7 +10873,7 @@ name = "try-runtime-cli"
 version = "0.10.0-dev"
 dependencies = [
  "frame-try-runtime",
- "log",
+ "log 0.4.14",
  "parity-scale-codec",
  "remote-externalities",
  "sc-chain-spec",
@@ -10728,6 +10918,12 @@ dependencies = [
  "static_assertions",
 ]
 
+[[package]]
+name = "typeable"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887"
+
 [[package]]
 name = "typenum"
 version = "1.12.0"
@@ -10752,13 +10948,22 @@ dependencies = [
  "static_assertions",
 ]
 
+[[package]]
+name = "unicase"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
+dependencies = [
+ "version_check 0.1.5",
+]
+
 [[package]]
 name = "unicase"
 version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
 dependencies = [
- "version_check",
+ "version_check 0.9.2",
 ]
 
 [[package]]
@@ -10893,6 +11098,12 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
 
+[[package]]
+name = "version_check"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
+
 [[package]]
 name = "version_check"
 version = "0.9.2"
@@ -10931,24 +11142,13 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "want"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230"
-dependencies = [
- "futures 0.1.31",
- "log",
- "try-lock",
-]
-
 [[package]]
 name = "want"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
 dependencies = [
- "log",
+ "log 0.4.14",
  "try-lock",
 ]
 
@@ -10984,7 +11184,7 @@ checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae"
 dependencies = [
  "bumpalo",
  "lazy_static",
- "log",
+ "log 0.4.14",
  "proc-macro2",
  "quote",
  "syn",
@@ -11062,7 +11262,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0c32691b6c7e6c14e7f8fd55361a9088b507aa49620fcd06c09b3a1082186b9"
 dependencies = [
- "log",
+ "log 0.4.14",
  "parity-wasm 0.32.0",
  "rustc-demangle",
 ]
@@ -11127,7 +11327,7 @@ dependencies = [
  "indexmap",
  "lazy_static",
  "libc",
- "log",
+ "log 0.4.14",
  "paste 1.0.4",
  "psm",
  "region",
@@ -11157,7 +11357,7 @@ dependencies = [
  "errno",
  "file-per-thread-logger",
  "libc",
- "log",
+ "log 0.4.14",
  "serde",
  "sha2 0.9.3",
  "toml",
@@ -11208,7 +11408,7 @@ dependencies = [
  "cranelift-wasm",
  "gimli 0.24.0",
  "indexmap",
- "log",
+ "log 0.4.14",
  "more-asserts",
  "serde",
  "thiserror",
@@ -11230,7 +11430,7 @@ dependencies = [
  "cranelift-native",
  "cranelift-wasm",
  "gimli 0.24.0",
- "log",
+ "log 0.4.14",
  "more-asserts",
  "object 0.24.0",
  "rayon",
@@ -11291,7 +11491,7 @@ dependencies = [
  "indexmap",
  "lazy_static",
  "libc",
- "log",
+ "log 0.4.14",
  "mach",
  "memoffset 0.6.1",
  "more-asserts",
@@ -11349,6 +11549,47 @@ dependencies = [
  "webpki",
 ]
 
+[[package]]
+name = "websocket"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413b37840b9e27b340ce91b319ede10731de8c72f5bc4cb0206ec1ca4ce581d0"
+dependencies = [
+ "bytes 0.4.12",
+ "futures 0.1.31",
+ "hyper 0.10.16",
+ "native-tls",
+ "rand 0.6.5",
+ "tokio-codec",
+ "tokio-io",
+ "tokio-reactor",
+ "tokio-tcp",
+ "tokio-tls",
+ "unicase 1.4.2",
+ "url 1.7.2",
+ "websocket-base",
+]
+
+[[package]]
+name = "websocket-base"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e3810f0d00c4dccb54c30a4eee815e703232819dec7b007db115791c42aa374"
+dependencies = [
+ "base64 0.10.1",
+ "bitflags",
+ "byteorder",
+ "bytes 0.4.12",
+ "futures 0.1.31",
+ "native-tls",
+ "rand 0.6.5",
+ "sha1",
+ "tokio-codec",
+ "tokio-io",
+ "tokio-tcp",
+ "tokio-tls",
+]
+
 [[package]]
 name = "wepoll-sys"
 version = "3.0.1"
@@ -11460,7 +11701,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e7d9028f208dd5e63c614be69f115c1b53cacc1111437d4c765185856666c107"
 dependencies = [
  "futures 0.3.16",
- "log",
+ "log 0.4.14",
  "nohash-hasher",
  "parking_lot 0.11.1",
  "rand 0.8.4",
diff --git a/bin/node-template/node/Cargo.toml b/bin/node-template/node/Cargo.toml
index 21f28764eab4..98d880b95d70 100644
--- a/bin/node-template/node/Cargo.toml
+++ b/bin/node-template/node/Cargo.toml
@@ -39,7 +39,7 @@ sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
 sp-timestamp = { version = "4.0.0-dev", path = "../../../primitives/timestamp" }
 
 # These dependencies are used for the node template's RPCs
-jsonrpc-core = "15.1.0"
+jsonrpc-core = "18.0.0"
 sc-rpc = { version = "4.0.0-dev", path = "../../../client/rpc" }
 sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
 sc-rpc-api = { version = "0.10.0-dev", path = "../../../client/rpc-api" }
diff --git a/bin/node/bench/src/construct.rs b/bin/node/bench/src/construct.rs
index eeeb833c1ff1..1532e02bd3ef 100644
--- a/bin/node/bench/src/construct.rs
+++ b/bin/node/bench/src/construct.rs
@@ -248,7 +248,7 @@ impl sc_transaction_pool_api::TransactionPool for Transactions {
 		_at: &BlockId<Self::Block>,
 		_source: TransactionSource,
 		_xt: TransactionFor<Self>,
-	) -> PoolFuture<Box<TransactionStatusStreamFor<Self>>, Self::Error> {
+	) -> PoolFuture<Pin<Box<TransactionStatusStreamFor<Self>>>, Self::Error> {
 		unimplemented!()
 	}
 
diff --git a/bin/node/browser-testing/Cargo.toml b/bin/node/browser-testing/Cargo.toml
index 17b3966766b9..b4f2cfa5ecec 100644
--- a/bin/node/browser-testing/Cargo.toml
+++ b/bin/node/browser-testing/Cargo.toml
@@ -9,7 +9,7 @@ license = "Apache-2.0"
 [dependencies]
 futures-timer = "3.0.2"
 libp2p = { version = "0.37.1", default-features = false }
-jsonrpc-core = "15.0.0"
+jsonrpc-core = "18.0.0"
 serde = "1.0.126"
 serde_json = "1.0.48"
 wasm-bindgen = { version = "=0.2.73", features = ["serde-serialize"] }
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index 1b5173246c38..df432ab26647 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -36,7 +36,7 @@ crate-type = ["cdylib", "rlib"]
 # third-party dependencies
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 serde = { version = "1.0.126", features = ["derive"] }
-futures = { version = "0.3.9", features = ["compat"] }
+futures = "0.3.16"
 hex-literal = "0.3.1"
 log = "0.4.8"
 rand = "0.7.2"
diff --git a/bin/node/rpc-client/Cargo.toml b/bin/node/rpc-client/Cargo.toml
index 9ccb6c0817fd..4cf3e57994db 100644
--- a/bin/node/rpc-client/Cargo.toml
+++ b/bin/node/rpc-client/Cargo.toml
@@ -11,9 +11,8 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-futures = "0.1.29"
-hyper = "~0.12.35"
-jsonrpc-core-client = { version = "15.1.0", default-features = false, features = ["http"] }
+futures = "0.3.16"
+jsonrpc-core-client = { version = "18.0.0", default-features = false, features = ["http"] }
 log = "0.4.8"
 node-primitives = { version = "2.0.0", path = "../primitives" }
 sp-tracing = { version = "4.0.0-dev", path = "../../../primitives/tracing" }
diff --git a/bin/node/rpc-client/src/main.rs b/bin/node/rpc-client/src/main.rs
index 46e700a73911..6d0b88799f54 100644
--- a/bin/node/rpc-client/src/main.rs
+++ b/bin/node/rpc-client/src/main.rs
@@ -22,24 +22,21 @@
 //! This module shows how you can write a Rust RPC client that connects to a running
 //! substrate node and use statically typed RPC wrappers.
 
-use futures::Future;
-use hyper::rt;
+use futures::{Future, TryFutureExt};
 use jsonrpc_core_client::{transports::http, RpcError};
 use node_primitives::Hash;
 use sc_rpc::author::{hash::ExtrinsicOrHash, AuthorClient};
 
-fn main() {
+fn main() -> Result<(), RpcError> {
 	sp_tracing::try_init_simple();
 
-	rt::run(rt::lazy(|| {
+	futures::executor::block_on(async {
 		let uri = "http://localhost:9933";
 
 		http::connect(uri)
 			.and_then(|client: AuthorClient<Hash, Hash>| remove_all_extrinsics(client))
-			.map_err(|e| {
-				println!("Error: {:?}", e);
-			})
-	}))
+			.await
+	})
 }
 
 /// Remove all pending extrinsics from the node.
@@ -52,7 +49,7 @@ fn main() {
 /// to be removed and the extrinsics are going to be temporarily banned.
 fn remove_all_extrinsics(
 	client: AuthorClient<Hash, Hash>,
-) -> impl Future<Item = (), Error = RpcError> {
+) -> impl Future<Output = Result<(), RpcError>> {
 	client
 		.pending_extrinsics()
 		.and_then(move |pending| {
@@ -60,7 +57,7 @@ fn remove_all_extrinsics(
 				pending.into_iter().map(|tx| ExtrinsicOrHash::Extrinsic(tx.into())).collect(),
 			)
 		})
-		.map(|removed| {
+		.map_ok(|removed| {
 			println!("Removed extrinsics: {:?}", removed);
 		})
 }
diff --git a/bin/node/rpc/Cargo.toml b/bin/node/rpc/Cargo.toml
index 464971379c49..971a02e73386 100644
--- a/bin/node/rpc/Cargo.toml
+++ b/bin/node/rpc/Cargo.toml
@@ -11,7 +11,7 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-jsonrpc-core = "15.1.0"
+jsonrpc-core = "18.0.0"
 node-primitives = { version = "2.0.0", path = "../primitives" }
 pallet-contracts-rpc = { version = "4.0.0-dev", path = "../../../frame/contracts/rpc/" }
 pallet-mmr-rpc = { version = "3.0.0", path = "../../../frame/merkle-mountain-range/rpc/" }
diff --git a/client/consensus/babe/rpc/Cargo.toml b/client/consensus/babe/rpc/Cargo.toml
index 5081edf25594..0f6c411a730e 100644
--- a/client/consensus/babe/rpc/Cargo.toml
+++ b/client/consensus/babe/rpc/Cargo.toml
@@ -15,15 +15,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 sc-consensus-babe = { version = "0.10.0-dev", path = "../" }
 sc-rpc-api = { version = "0.10.0-dev", path = "../../../rpc-api" }
-jsonrpc-core = "15.1.0"
-jsonrpc-core-client = "15.1.0"
-jsonrpc-derive = "15.1.0"
+jsonrpc-core = "18.0.0"
+jsonrpc-core-client = "18.0.0"
+jsonrpc-derive = "18.0.0"
 sp-consensus-babe = { version = "0.10.0-dev", path = "../../../../primitives/consensus/babe" }
 serde = { version = "1.0.126", features=["derive"] }
 sp-blockchain = { version = "4.0.0-dev", path = "../../../../primitives/blockchain" }
 sp-runtime = { version = "4.0.0-dev", path = "../../../../primitives/runtime" }
 sc-consensus-epochs = { version = "0.10.0-dev", path = "../../epochs" }
-futures = { version = "0.3.4", features = ["compat"] }
+futures = "0.3.16"
 derive_more = "0.99.2"
 sp-api = { version = "4.0.0-dev", path = "../../../../primitives/api" }
 sp-consensus = { version = "0.10.0-dev", path = "../../../../primitives/consensus/common" }
diff --git a/client/consensus/babe/rpc/src/lib.rs b/client/consensus/babe/rpc/src/lib.rs
index e85a43065537..285cfe543cee 100644
--- a/client/consensus/babe/rpc/src/lib.rs
+++ b/client/consensus/babe/rpc/src/lib.rs
@@ -18,8 +18,8 @@
 
 //! RPC api for babe.
 
-use futures::{FutureExt as _, TryFutureExt as _};
-use jsonrpc_core::{futures::future as rpc_future, Error as RpcError};
+use futures::{FutureExt, TryFutureExt};
+use jsonrpc_core::Error as RpcError;
 use jsonrpc_derive::rpc;
 use sc_consensus_babe::{authorship, Config, Epoch};
 use sc_consensus_epochs::{descendent_query, Epoch as EpochT, SharedEpochChanges};
@@ -35,7 +35,7 @@ use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr};
 use sp_runtime::traits::{Block as BlockT, Header as _};
 use std::{collections::HashMap, sync::Arc};
 
-type FutureResult<T> = Box<dyn rpc_future::Future<Item = T, Error = RpcError> + Send>;
+type FutureResult<T> = jsonrpc_core::BoxFuture<Result<T, RpcError>>;
 
 /// Provides rpc methods for interacting with Babe.
 #[rpc]
@@ -88,7 +88,7 @@ where
 {
 	fn epoch_authorship(&self) -> FutureResult<HashMap<AuthorityId, EpochAuthorship>> {
 		if let Err(err) = self.deny_unsafe.check_if_safe() {
-			return Box::new(rpc_future::err(err.into()))
+			return async move { Err(err.into()) }.boxed()
 		}
 
 		let (babe_config, keystore, shared_epoch, client, select_chain) = (
@@ -98,7 +98,8 @@ where
 			self.client.clone(),
 			self.select_chain.clone(),
 		);
-		let future = async move {
+
+		async move {
 			let header = select_chain.best_chain().map_err(Error::Consensus).await?;
 			let epoch_start = client
 				.runtime_api()
@@ -149,9 +150,7 @@ where
 
 			Ok(claims)
 		}
-		.boxed();
-
-		Box::new(future.compat())
+		.boxed()
 	}
 }
 
diff --git a/client/consensus/manual-seal/Cargo.toml b/client/consensus/manual-seal/Cargo.toml
index a0de596b005b..82969c91652d 100644
--- a/client/consensus/manual-seal/Cargo.toml
+++ b/client/consensus/manual-seal/Cargo.toml
@@ -15,9 +15,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 derive_more = "0.99.2"
 futures = "0.3.9"
-jsonrpc-core = "15.1.0"
-jsonrpc-core-client = "15.1.0"
-jsonrpc-derive = "15.1.0"
+jsonrpc-core = "18.0.0"
+jsonrpc-core-client = "18.0.0"
+jsonrpc-derive = "18.0.0"
 log = "0.4.8"
 parking_lot = "0.11.1"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
diff --git a/client/consensus/manual-seal/src/rpc.rs b/client/consensus/manual-seal/src/rpc.rs
index 699505b00c3c..6755879ceedd 100644
--- a/client/consensus/manual-seal/src/rpc.rs
+++ b/client/consensus/manual-seal/src/rpc.rs
@@ -30,7 +30,7 @@ use serde::{Deserialize, Serialize};
 use sp_runtime::EncodedJustification;
 
 /// Future's type for jsonrpc
-type FutureResult<T> = Box<dyn jsonrpc_core::futures::Future<Item = T, Error = Error> + Send>;
+type FutureResult<T> = jsonrpc_core::BoxFuture<Result<T, Error>>;
 /// sender passed to the authorship task to report errors or successes.
 pub type Sender<T> = Option<oneshot::Sender<std::result::Result<T, crate::Error>>>;
 
@@ -114,7 +114,7 @@ impl<Hash: Send + 'static> ManualSealApi<Hash> for ManualSeal<Hash> {
 		parent_hash: Option<Hash>,
 	) -> FutureResult<CreatedBlock<Hash>> {
 		let mut sink = self.import_block_channel.clone();
-		let future = async move {
+		async move {
 			let (sender, receiver) = oneshot::channel();
 			let command = EngineCommand::SealNewBlock {
 				create_empty,
@@ -125,9 +125,8 @@ impl<Hash: Send + 'static> ManualSealApi<Hash> for ManualSeal<Hash> {
 			sink.send(command).await?;
 			receiver.await?
 		}
-		.boxed();
-
-		Box::new(future.map_err(Error::from).compat())
+		.map_err(Error::from)
+		.boxed()
 	}
 
 	fn finalize_block(
@@ -136,15 +135,15 @@ impl<Hash: Send + 'static> ManualSealApi<Hash> for ManualSeal<Hash> {
 		justification: Option<EncodedJustification>,
 	) -> FutureResult<bool> {
 		let mut sink = self.import_block_channel.clone();
-		let future = async move {
+		async move {
 			let (sender, receiver) = oneshot::channel();
 			sink.send(EngineCommand::FinalizeBlock { hash, sender: Some(sender), justification })
 				.await?;
 
 			receiver.await?.map(|_| true)
-		};
-
-		Box::new(future.boxed().map_err(Error::from).compat())
+		}
+		.map_err(Error::from)
+		.boxed()
 	}
 }
 
diff --git a/client/consensus/pow/Cargo.toml b/client/consensus/pow/Cargo.toml
index 368005fafb13..c71e11aef275 100644
--- a/client/consensus/pow/Cargo.toml
+++ b/client/consensus/pow/Cargo.toml
@@ -25,7 +25,7 @@ sp-consensus-pow = { version = "0.10.0-dev", path = "../../../primitives/consens
 sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
 sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/common" }
 log = "0.4.8"
-futures = { version = "0.3.1", features = ["compat"] }
+futures = "0.3.16"
 futures-timer = "3.0.1"
 parking_lot = "0.11.1"
 derive_more = "0.99.2"
diff --git a/client/finality-grandpa/rpc/Cargo.toml b/client/finality-grandpa/rpc/Cargo.toml
index e965f9279bd3..13fcd3f7392d 100644
--- a/client/finality-grandpa/rpc/Cargo.toml
+++ b/client/finality-grandpa/rpc/Cargo.toml
@@ -15,11 +15,11 @@ sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain"
 sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
 sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
 finality-grandpa = { version = "0.14.1", features = ["derive-codec"] }
-jsonrpc-core = "15.1.0"
-jsonrpc-core-client = "15.1.0"
-jsonrpc-derive = "15.1.0"
-jsonrpc-pubsub = "15.1.0"
-futures = { version = "0.3.4", features = ["compat"] }
+jsonrpc-core = "18.0.0"
+jsonrpc-core-client = "18.0.0"
+jsonrpc-derive = "18.0.0"
+jsonrpc-pubsub = "18.0.0"
+futures = "0.3.16"
 serde = { version = "1.0.105", features = ["derive"] }
 serde_json = "1.0.50"
 log = "0.4.8"
diff --git a/client/finality-grandpa/rpc/src/lib.rs b/client/finality-grandpa/rpc/src/lib.rs
index 42d8630d10f8..b8b8b2d95646 100644
--- a/client/finality-grandpa/rpc/src/lib.rs
+++ b/client/finality-grandpa/rpc/src/lib.rs
@@ -19,12 +19,7 @@
 //! RPC API for GRANDPA.
 #![warn(missing_docs)]
 
-use futures::{FutureExt, StreamExt, TryFutureExt, TryStreamExt};
-use jsonrpc_core::futures::{
-	future::{Executor as Executor01, Future as Future01},
-	sink::Sink as Sink01,
-	stream::Stream as Stream01,
-};
+use futures::{task::Spawn, FutureExt, SinkExt, StreamExt, TryFutureExt};
 use jsonrpc_derive::rpc;
 use jsonrpc_pubsub::{manager::SubscriptionManager, typed::Subscriber, SubscriptionId};
 use log::warn;
@@ -42,8 +37,7 @@ use finality::{EncodedFinalityProof, RpcFinalityProofProvider};
 use notification::JustificationNotification;
 use report::{ReportAuthoritySet, ReportVoterState, ReportedRoundStates};
 
-type FutureResult<T> =
-	Box<dyn jsonrpc_core::futures::Future<Item = T, Error = jsonrpc_core::Error> + Send>;
+type FutureResult<T> = jsonrpc_core::BoxFuture<Result<T, jsonrpc_core::Error>>;
 
 /// Provides RPC methods for interacting with GRANDPA.
 #[rpc]
@@ -108,7 +102,7 @@ impl<AuthoritySet, VoterState, Block: BlockT, ProofProvider>
 		finality_proof_provider: Arc<ProofProvider>,
 	) -> Self
 	where
-		E: Executor01<Box<dyn Future01<Item = (), Error = ()> + Send>> + Send + Sync + 'static,
+		E: Spawn + Sync + Send + 'static,
 	{
 		let manager = SubscriptionManager::new(Arc::new(executor));
 		Self { authority_set, voter_state, justification_stream, manager, finality_proof_provider }
@@ -129,7 +123,7 @@ where
 	fn round_state(&self) -> FutureResult<ReportedRoundStates> {
 		let round_states = ReportedRoundStates::from(&self.authority_set, &self.voter_state);
 		let future = async move { round_states }.boxed();
-		Box::new(future.map_err(jsonrpc_core::Error::from).compat())
+		future.map_err(jsonrpc_core::Error::from).boxed()
 	}
 
 	fn subscribe_justifications(
@@ -140,14 +134,11 @@ where
 		let stream = self
 			.justification_stream
 			.subscribe()
-			.map(|x| Ok::<_, ()>(JustificationNotification::from(x)))
-			.map_err(|e| warn!("Notification stream error: {:?}", e))
-			.compat();
+			.map(|x| Ok(Ok::<_, jsonrpc_core::Error>(JustificationNotification::from(x))));
 
 		self.manager.add(subscriber, |sink| {
-			let stream = stream.map(|res| Ok(res));
-			sink.sink_map_err(|e| warn!("Error sending notifications: {:?}", e))
-				.send_all(stream)
+			stream
+				.forward(sink.sink_map_err(|e| warn!("Error sending notifications: {:?}", e)))
 				.map(|_| ())
 		});
 	}
@@ -166,15 +157,13 @@ where
 	) -> FutureResult<Option<EncodedFinalityProof>> {
 		let result = self.finality_proof_provider.rpc_prove_finality(block);
 		let future = async move { result }.boxed();
-		Box::new(
-			future
-				.map_err(|e| {
-					warn!("Error proving finality: {}", e);
-					error::Error::ProveFinalityFailed(e)
-				})
-				.map_err(jsonrpc_core::Error::from)
-				.compat(),
-		)
+		future
+			.map_err(|e| {
+				warn!("Error proving finality: {}", e);
+				error::Error::ProveFinalityFailed(e)
+			})
+			.map_err(jsonrpc_core::Error::from)
+			.boxed()
 	}
 }
 
@@ -350,8 +339,8 @@ mod tests {
 		assert_eq!(io.handle_request_sync(request, meta), Some(response.into()));
 	}
 
-	fn setup_session() -> (sc_rpc::Metadata, jsonrpc_core::futures::sync::mpsc::Receiver<String>) {
-		let (tx, rx) = jsonrpc_core::futures::sync::mpsc::channel(1);
+	fn setup_session() -> (sc_rpc::Metadata, futures::channel::mpsc::UnboundedReceiver<String>) {
+		let (tx, rx) = futures::channel::mpsc::unbounded();
 		let meta = sc_rpc::Metadata::new(tx);
 		(meta, rx)
 	}
@@ -385,7 +374,7 @@ mod tests {
 		// Unsubscribe again and fail
 		assert_eq!(
 			io.handle_request_sync(&unsub_req, meta),
-			Some(r#"{"jsonrpc":"2.0","result":false,"id":1}"#.into()),
+			Some("{\"jsonrpc\":\"2.0\",\"error\":{\"code\":-32602,\"message\":\"Invalid subscription id.\"},\"id\":1}".into()),
 		);
 	}
 
@@ -407,7 +396,7 @@ mod tests {
 				r#"{"jsonrpc":"2.0","method":"grandpa_unsubscribeJustifications","params":["FOO"],"id":1}"#,
 				meta.clone()
 			),
-			Some(r#"{"jsonrpc":"2.0","result":false,"id":1}"#.into())
+			Some("{\"jsonrpc\":\"2.0\",\"error\":{\"code\":-32602,\"message\":\"Invalid subscription id.\"},\"id\":1}".into())
 		);
 	}
 
@@ -483,7 +472,7 @@ mod tests {
 		justification_sender.notify(|| Ok(justification.clone())).unwrap();
 
 		// Inspect what we received
-		let recv = receiver.take(1).wait().flatten().collect::<Vec<_>>();
+		let recv = futures::executor::block_on(receiver.take(1).collect::<Vec<_>>());
 		let recv: Notification = serde_json::from_str(&recv[0]).unwrap();
 		let mut json_map = match recv.params {
 			Params::Map(json_map) => json_map,
diff --git a/client/rpc-api/Cargo.toml b/client/rpc-api/Cargo.toml
index 0ed17813ee75..b0d7c28b788e 100644
--- a/client/rpc-api/Cargo.toml
+++ b/client/rpc-api/Cargo.toml
@@ -15,11 +15,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 derive_more = "0.99.2"
-futures = { version = "0.3.1", features = ["compat"] }
-jsonrpc-core = "15.1.0"
-jsonrpc-core-client = "15.1.0"
-jsonrpc-derive = "15.1.0"
-jsonrpc-pubsub = "15.1.0"
+futures = "0.3.16"
+jsonrpc-core = "18.0.0"
+jsonrpc-core-client = "18.0.0"
+jsonrpc-derive = "18.0.0"
+jsonrpc-pubsub = "18.0.0"
 log = "0.4.8"
 parking_lot = "0.11.1"
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
diff --git a/client/rpc-api/src/author/error.rs b/client/rpc-api/src/author/error.rs
index 0c963d4e4c25..249c8df39518 100644
--- a/client/rpc-api/src/author/error.rs
+++ b/client/rpc-api/src/author/error.rs
@@ -26,7 +26,7 @@ use sp_runtime::transaction_validity::InvalidTransaction;
 pub type Result<T> = std::result::Result<T, Error>;
 
 /// Author RPC future Result type.
-pub type FutureResult<T> = Box<dyn rpc::futures::Future<Item = T, Error = Error> + Send>;
+pub type FutureResult<T> = jsonrpc_core::BoxFuture<Result<T>>;
 
 /// Author RPC errors.
 #[derive(Debug, derive_more::Display, derive_more::From)]
diff --git a/client/rpc-api/src/chain/error.rs b/client/rpc-api/src/chain/error.rs
index 9bedd328d001..b1ce800d2731 100644
--- a/client/rpc-api/src/chain/error.rs
+++ b/client/rpc-api/src/chain/error.rs
@@ -25,7 +25,7 @@ use jsonrpc_core as rpc;
 pub type Result<T> = std::result::Result<T, Error>;
 
 /// Chain RPC future Result type.
-pub type FutureResult<T> = Box<dyn rpc::futures::Future<Item = T, Error = Error> + Send>;
+pub type FutureResult<T> = jsonrpc_core::BoxFuture<Result<T>>;
 
 /// Chain RPC errors.
 #[derive(Debug, derive_more::Display, derive_more::From)]
diff --git a/client/rpc-api/src/helpers.rs b/client/rpc-api/src/helpers.rs
index bb37cfbbb780..a26adbf2e903 100644
--- a/client/rpc-api/src/helpers.rs
+++ b/client/rpc-api/src/helpers.rs
@@ -16,18 +16,26 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use futures::{channel::oneshot, compat::Compat};
-use jsonrpc_core::futures::prelude::*;
+use futures::{channel::oneshot, Future};
+use std::pin::Pin;
 
 /// Wraps around `oneshot::Receiver` and adjusts the error type to produce an internal error if the
 /// sender gets dropped.
-pub struct Receiver<T>(pub Compat<oneshot::Receiver<T>>);
+pub struct Receiver<T>(pub oneshot::Receiver<T>);
 
 impl<T> Future for Receiver<T> {
-	type Item = T;
-	type Error = jsonrpc_core::Error;
+	type Output = Result<T, jsonrpc_core::Error>;
 
-	fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
-		self.0.poll().map_err(|_| jsonrpc_core::Error::internal_error())
+	fn poll(
+		mut self: Pin<&mut Self>,
+		cx: &mut std::task::Context<'_>,
+	) -> std::task::Poll<Self::Output> {
+		Future::poll(Pin::new(&mut self.0), cx).map_err(|_| jsonrpc_core::Error::internal_error())
+	}
+}
+
+impl<T: Send + 'static> jsonrpc_core::WrapFuture<T, jsonrpc_core::Error> for Receiver<T> {
+	fn into_future(self) -> jsonrpc_core::BoxFuture<Result<T, jsonrpc_core::Error>> {
+		Box::pin(async { self.await })
 	}
 }
diff --git a/client/rpc-api/src/metadata.rs b/client/rpc-api/src/metadata.rs
index bda7b8f7ba36..d493b92c11ac 100644
--- a/client/rpc-api/src/metadata.rs
+++ b/client/rpc-api/src/metadata.rs
@@ -19,7 +19,7 @@
 //! RPC Metadata
 use std::sync::Arc;
 
-use jsonrpc_core::futures::sync::mpsc;
+use futures::channel::mpsc;
 use jsonrpc_pubsub::{PubSubMetadata, Session};
 
 /// RPC Metadata.
@@ -41,20 +41,20 @@ impl PubSubMetadata for Metadata {
 
 impl Metadata {
 	/// Create new `Metadata` with session (Pub/Sub) support.
-	pub fn new(transport: mpsc::Sender<String>) -> Self {
+	pub fn new(transport: mpsc::UnboundedSender<String>) -> Self {
 		Metadata { session: Some(Arc::new(Session::new(transport))) }
 	}
 
 	/// Create new `Metadata` for tests.
 	#[cfg(test)]
-	pub fn new_test() -> (mpsc::Receiver<String>, Self) {
-		let (tx, rx) = mpsc::channel(1);
+	pub fn new_test() -> (mpsc::UnboundedReceiver<String>, Self) {
+		let (tx, rx) = mpsc::unbounded();
 		(rx, Self::new(tx))
 	}
 }
 
-impl From<mpsc::Sender<String>> for Metadata {
-	fn from(sender: mpsc::Sender<String>) -> Self {
+impl From<mpsc::UnboundedSender<String>> for Metadata {
+	fn from(sender: mpsc::UnboundedSender<String>) -> Self {
 		Self::new(sender)
 	}
 }
diff --git a/client/rpc-api/src/state/error.rs b/client/rpc-api/src/state/error.rs
index 30437246e6ea..e30757f0dd39 100644
--- a/client/rpc-api/src/state/error.rs
+++ b/client/rpc-api/src/state/error.rs
@@ -25,7 +25,7 @@ use jsonrpc_core as rpc;
 pub type Result<T> = std::result::Result<T, Error>;
 
 /// State RPC future Result type.
-pub type FutureResult<T> = Box<dyn rpc::futures::Future<Item = T, Error = Error> + Send>;
+pub type FutureResult<T> = jsonrpc_core::BoxFuture<Result<T>>;
 
 /// State RPC errors.
 #[derive(Debug, derive_more::Display, derive_more::From)]
diff --git a/client/rpc-api/src/system/mod.rs b/client/rpc-api/src/system/mod.rs
index 2f9ed45cd2e2..3ffc5f434650 100644
--- a/client/rpc-api/src/system/mod.rs
+++ b/client/rpc-api/src/system/mod.rs
@@ -22,7 +22,7 @@ pub mod error;
 pub mod helpers;
 
 use crate::helpers::Receiver;
-use futures::{compat::Compat, future::BoxFuture};
+use jsonrpc_core::BoxFuture;
 use jsonrpc_derive::rpc;
 
 use self::error::Result as SystemResult;
@@ -76,9 +76,7 @@ pub trait SystemApi<Hash, Number> {
 
 	/// Returns currently connected peers
 	#[rpc(name = "system_peers", returns = "Vec<PeerInfo<Hash, Number>>")]
-	fn system_peers(
-		&self,
-	) -> Compat<BoxFuture<'static, jsonrpc_core::Result<Vec<PeerInfo<Hash, Number>>>>>;
+	fn system_peers(&self) -> BoxFuture<jsonrpc_core::Result<Vec<PeerInfo<Hash, Number>>>>;
 
 	/// Returns current state of the network.
 	///
@@ -87,9 +85,7 @@ pub trait SystemApi<Hash, Number> {
 	// TODO: the future of this call is uncertain: https://github.com/paritytech/substrate/issues/1890
 	// https://github.com/paritytech/substrate/issues/5541
 	#[rpc(name = "system_unstable_networkState", returns = "jsonrpc_core::Value")]
-	fn system_network_state(
-		&self,
-	) -> Compat<BoxFuture<'static, jsonrpc_core::Result<jsonrpc_core::Value>>>;
+	fn system_network_state(&self) -> BoxFuture<jsonrpc_core::Result<jsonrpc_core::Value>>;
 
 	/// Adds a reserved peer. Returns the empty string or an error. The string
 	/// parameter should encode a `p2p` multiaddr.
@@ -97,10 +93,7 @@ pub trait SystemApi<Hash, Number> {
 	/// `/ip4/198.51.100.19/tcp/30333/p2p/QmSk5HQbn6LhUwDiNMseVUjuRYhEtYj4aUZ6WfWoGURpdV`
 	/// is an example of a valid, passing multiaddr with PeerId attached.
 	#[rpc(name = "system_addReservedPeer", returns = "()")]
-	fn system_add_reserved_peer(
-		&self,
-		peer: String,
-	) -> Compat<BoxFuture<'static, Result<(), jsonrpc_core::Error>>>;
+	fn system_add_reserved_peer(&self, peer: String) -> BoxFuture<Result<(), jsonrpc_core::Error>>;
 
 	/// Remove a reserved peer. Returns the empty string or an error. The string
 	/// should encode only the PeerId e.g. `QmSk5HQbn6LhUwDiNMseVUjuRYhEtYj4aUZ6WfWoGURpdV`.
@@ -108,7 +101,7 @@ pub trait SystemApi<Hash, Number> {
 	fn system_remove_reserved_peer(
 		&self,
 		peer_id: String,
-	) -> Compat<BoxFuture<'static, Result<(), jsonrpc_core::Error>>>;
+	) -> BoxFuture<Result<(), jsonrpc_core::Error>>;
 
 	/// Returns the list of reserved peers
 	#[rpc(name = "system_reservedPeers", returns = "Vec<String>")]
diff --git a/client/rpc-servers/Cargo.toml b/client/rpc-servers/Cargo.toml
index 025d586c4e53..d2bce6a08638 100644
--- a/client/rpc-servers/Cargo.toml
+++ b/client/rpc-servers/Cargo.toml
@@ -13,9 +13,9 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-futures = "0.1.6"
-jsonrpc-core = "15.1.0"
-pubsub = { package = "jsonrpc-pubsub", version = "15.1.0" }
+futures = "0.3.16"
+jsonrpc-core = "18.0.0"
+pubsub = { package = "jsonrpc-pubsub", version = "18.0.0" }
 log = "0.4.8"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
 serde = "1.0.126"
@@ -23,6 +23,6 @@ serde_json = "1.0.41"
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
-http = { package = "jsonrpc-http-server", version = "15.1.0" }
-ipc = { package = "jsonrpc-ipc-server", version = "15.1.0" }
-ws = { package = "jsonrpc-ws-server", version = "15.1.0" }
+http = { package = "jsonrpc-http-server", version = "18.0.0" }
+ipc = { package = "jsonrpc-ipc-server", version = "18.0.0" }
+ws = { package = "jsonrpc-ws-server", version = "18.0.0" }
diff --git a/client/rpc-servers/src/lib.rs b/client/rpc-servers/src/lib.rs
index 7f14cee39f20..a833002fcdbf 100644
--- a/client/rpc-servers/src/lib.rs
+++ b/client/rpc-servers/src/lib.rs
@@ -61,10 +61,13 @@ pub fn rpc_handler<M: PubSubMetadata>(
 			.expect("Serialization of Vec<String> is infallible; qed");
 
 		move |_| {
-			Ok(serde_json::json!({
-				"version": 1,
-				"methods": methods.clone(),
-			}))
+			let methods = methods.clone();
+			async move {
+				Ok(serde_json::json!({
+					"version": 1,
+					"methods": methods,
+				}))
+			}
 		}
 	});
 	io
@@ -84,7 +87,7 @@ mod inner {
 	/// Start HTTP server listening on given address.
 	///
 	/// **Note**: Only available if `not(target_os = "unknown")`.
-	pub fn start_http<M: pubsub::PubSubMetadata + Default>(
+	pub fn start_http<M: pubsub::PubSubMetadata + Default + Unpin>(
 		addr: &std::net::SocketAddr,
 		thread_pool_size: Option<usize>,
 		cors: Option<&Vec<String>>,
@@ -94,6 +97,7 @@ mod inner {
 		let max_request_body_size = maybe_max_payload_mb
 			.map(|mb| mb.saturating_mul(MEGABYTE))
 			.unwrap_or(RPC_MAX_PAYLOAD_DEFAULT);
+
 		http::ServerBuilder::new(io)
 			.threads(thread_pool_size.unwrap_or(HTTP_THREADS))
 			.health_api(("/health", "system_health"))
@@ -125,7 +129,7 @@ mod inner {
 	///
 	/// **Note**: Only available if `not(target_os = "unknown")`.
 	pub fn start_ws<
-		M: pubsub::PubSubMetadata + From<jsonrpc_core::futures::sync::mpsc::Sender<String>>,
+		M: pubsub::PubSubMetadata + From<futures::channel::mpsc::UnboundedSender<String>>,
 	>(
 		addr: &std::net::SocketAddr,
 		max_connections: Option<usize>,
diff --git a/client/rpc-servers/src/middleware.rs b/client/rpc-servers/src/middleware.rs
index d87c653e2b25..5ba5c18a8e95 100644
--- a/client/rpc-servers/src/middleware.rs
+++ b/client/rpc-servers/src/middleware.rs
@@ -73,12 +73,12 @@ impl<M: Metadata> RequestMiddleware<M> for RpcMiddleware {
 	fn on_request<F, X>(&self, request: Request, meta: M, next: F) -> Either<FutureResponse, X>
 	where
 		F: Fn(Request, M) -> X + Send + Sync,
-		X: Future<Item = Option<Response>, Error = ()> + Send + 'static,
+		X: Future<Output = Option<Response>> + Send + 'static,
 	{
 		if let Some(ref rpc_calls) = self.metrics.rpc_calls {
 			rpc_calls.with_label_values(&[self.transport_label.as_str()]).inc();
 		}
 
-		Either::B(next(request, meta))
+		Either::Right(next(request, meta))
 	}
 }
diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml
index 04eb8b8b3f78..89064d879a98 100644
--- a/client/rpc/Cargo.toml
+++ b/client/rpc/Cargo.toml
@@ -17,11 +17,11 @@ sc-rpc-api = { version = "0.10.0-dev", path = "../rpc-api" }
 sc-client-api = { version = "4.0.0-dev", path = "../api" }
 sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-futures = { version = "0.3.1", features = ["compat"] }
-jsonrpc-pubsub = "15.1.0"
+futures = "0.3.16"
+jsonrpc-pubsub = "18.0.0"
 log = "0.4.8"
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
-rpc = { package = "jsonrpc-core", version = "15.1.0" }
+rpc = { package = "jsonrpc-core", version = "18.0.0" }
 sp-version = { version = "4.0.0-dev", path = "../../primitives/version" }
 serde_json = "1.0.41"
 sp-session = { version = "4.0.0-dev", path = "../../primitives/session" }
@@ -45,12 +45,10 @@ sc-transaction-pool-api = { version = "4.0.0-dev", path = "../transaction-pool/a
 
 [dev-dependencies]
 assert_matches = "1.3.0"
-futures01 = { package = "futures", version = "0.1.29" }
 lazy_static = "1.4.0"
 sc-network = { version = "0.10.0-dev", path = "../network" }
 sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
-tokio = "0.1.22"
 sc-transaction-pool = { version = "4.0.0-dev", path = "../transaction-pool" }
 sc-cli = { version = "0.10.0-dev", path = "../cli" }
 sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
diff --git a/client/rpc/src/author/mod.rs b/client/rpc/src/author/mod.rs
index 0cb24d25b206..40b477a662a6 100644
--- a/client/rpc/src/author/mod.rs
+++ b/client/rpc/src/author/mod.rs
@@ -28,12 +28,10 @@ use sp_blockchain::HeaderBackend;
 
 use codec::{Decode, Encode};
 use futures::{
-	compat::Compat,
-	future::{ready, FutureExt, TryFutureExt},
-	StreamExt as _,
+	future::{FutureExt, TryFutureExt},
+	SinkExt, StreamExt as _,
 };
 use jsonrpc_pubsub::{manager::SubscriptionManager, typed::Subscriber, SubscriptionId};
-use rpc::futures::{future::result, Future, Sink};
 use sc_rpc_api::DenyUnsafe;
 use sc_transaction_pool_api::{
 	error::IntoPoolError, BlockHash, InPoolTransaction, TransactionFor, TransactionPool,
@@ -42,7 +40,7 @@ use sc_transaction_pool_api::{
 use sp_api::ProvideRuntimeApi;
 use sp_core::Bytes;
 use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr};
-use sp_runtime::generic;
+use sp_runtime::{generic, traits::Block as BlockT};
 use sp_session::SessionKeys;
 
 use self::error::{Error, FutureResult, Result};
@@ -88,6 +86,8 @@ where
 	P: TransactionPool + Sync + Send + 'static,
 	Client: HeaderBackend<P::Block> + ProvideRuntimeApi<P::Block> + Send + Sync + 'static,
 	Client::Api: SessionKeys<P::Block>,
+	P::Hash: Unpin,
+	<P::Block as BlockT>::Hash: Unpin,
 {
 	type Metadata = crate::Metadata;
 
@@ -135,19 +135,18 @@ where
 	fn submit_extrinsic(&self, ext: Bytes) -> FutureResult<TxHash<P>> {
 		let xt = match Decode::decode(&mut &ext[..]) {
 			Ok(xt) => xt,
-			Err(err) => return Box::new(result(Err(err.into()))),
+			Err(err) => return async move { Err(err.into()) }.boxed(),
 		};
 		let best_block_hash = self.client.info().best_hash;
-		Box::new(
-			self.pool
-				.submit_one(&generic::BlockId::hash(best_block_hash), TX_SOURCE, xt)
-				.compat()
-				.map_err(|e| {
-					e.into_pool_error()
-						.map(Into::into)
-						.unwrap_or_else(|e| error::Error::Verification(Box::new(e)).into())
-				}),
-		)
+
+		self.pool
+			.submit_one(&generic::BlockId::hash(best_block_hash), TX_SOURCE, xt)
+			.map_err(|e| {
+				e.into_pool_error()
+					.map(Into::into)
+					.unwrap_or_else(|e| error::Error::Verification(Box::new(e)).into())
+			})
+			.boxed()
 	}
 
 	fn pending_extrinsics(&self) -> Result<Vec<Bytes>> {
@@ -185,46 +184,50 @@ where
 		subscriber: Subscriber<TransactionStatus<TxHash<P>, BlockHash<P>>>,
 		xt: Bytes,
 	) {
-		let submit = || -> Result<_> {
-			let best_block_hash = self.client.info().best_hash;
-			let dxt = TransactionFor::<P>::decode(&mut &xt[..]).map_err(error::Error::from)?;
-			Ok(self
-				.pool
-				.submit_and_watch(&generic::BlockId::hash(best_block_hash), TX_SOURCE, dxt)
-				.map_err(|e| {
-					e.into_pool_error()
-						.map(error::Error::from)
-						.unwrap_or_else(|e| error::Error::Verification(Box::new(e)).into())
-				}))
+		let best_block_hash = self.client.info().best_hash;
+		let dxt = match TransactionFor::<P>::decode(&mut &xt[..]).map_err(error::Error::from) {
+			Ok(tx) => tx,
+			Err(err) => {
+				warn!("Failed to submit extrinsic: {}", err);
+				// reject the subscriber (ignore errors - we don't care if subscriber is no longer
+				// there).
+				let _ = subscriber.reject(err.into());
+				return
+			},
 		};
 
+		let submit = self
+			.pool
+			.submit_and_watch(&generic::BlockId::hash(best_block_hash), TX_SOURCE, dxt)
+			.map_err(|e| {
+				e.into_pool_error()
+					.map(error::Error::from)
+					.unwrap_or_else(|e| error::Error::Verification(Box::new(e)).into())
+			});
+
 		let subscriptions = self.subscriptions.clone();
-		let future = ready(submit())
-			.and_then(|res| res)
-			// convert the watcher into a `Stream`
-			.map(|res| res.map(|stream| stream.map(|v| Ok::<_, ()>(Ok(v)))))
-			// now handle the import result,
-			// start a new subscrition
-			.map(move |result| match result {
-				Ok(watcher) => {
-					subscriptions.add(subscriber, move |sink| {
-						sink.sink_map_err(|e| log::debug!("Subscription sink failed: {:?}", e))
-							.send_all(Compat::new(watcher))
-							.map(|_| ())
-					});
-				},
+
+		let future = async move {
+			let tx_stream = match submit.await {
+				Ok(s) => s,
 				Err(err) => {
 					warn!("Failed to submit extrinsic: {}", err);
 					// reject the subscriber (ignore errors - we don't care if subscriber is no
 					// longer there).
 					let _ = subscriber.reject(err.into());
+					return
 				},
+			};
+
+			subscriptions.add(subscriber, move |sink| {
+				tx_stream
+					.map(|v| Ok(Ok(v)))
+					.forward(sink.sink_map_err(|e| warn!("Error sending notifications: {:?}", e)))
+					.map(drop)
 			});
+		};
 
-		let res = self
-			.subscriptions
-			.executor()
-			.execute(Box::new(Compat::new(future.map(|_| Ok(())))));
+		let res = self.subscriptions.executor().spawn_obj(future.boxed().into());
 		if res.is_err() {
 			warn!("Error spawning subscription RPC task.");
 		}
diff --git a/client/rpc/src/author/tests.rs b/client/rpc/src/author/tests.rs
index 9da6ff8d13f6..2349e08fee50 100644
--- a/client/rpc/src/author/tests.rs
+++ b/client/rpc/src/author/tests.rs
@@ -20,8 +20,7 @@ use super::*;
 
 use assert_matches::assert_matches;
 use codec::Encode;
-use futures::{compat::Future01CompatExt, executor};
-use rpc::futures::Stream as _;
+use futures::executor;
 use sc_transaction_pool::{BasicPool, FullChainApi};
 use sp_core::{
 	blake2_256,
@@ -86,10 +85,10 @@ fn submit_transaction_should_not_cause_error() {
 	let h: H256 = blake2_256(&xt).into();
 
 	assert_matches!(
-		AuthorApi::submit_extrinsic(&p, xt.clone().into()).wait(),
+		executor::block_on(AuthorApi::submit_extrinsic(&p, xt.clone().into())),
 		Ok(h2) if h == h2
 	);
-	assert!(AuthorApi::submit_extrinsic(&p, xt.into()).wait().is_err());
+	assert!(executor::block_on(AuthorApi::submit_extrinsic(&p, xt.into())).is_err());
 }
 
 #[test]
@@ -99,10 +98,10 @@ fn submit_rich_transaction_should_not_cause_error() {
 	let h: H256 = blake2_256(&xt).into();
 
 	assert_matches!(
-		AuthorApi::submit_extrinsic(&p, xt.clone().into()).wait(),
+		executor::block_on(AuthorApi::submit_extrinsic(&p, xt.clone().into())),
 		Ok(h2) if h == h2
 	);
-	assert!(AuthorApi::submit_extrinsic(&p, xt.into()).wait().is_err());
+	assert!(executor::block_on(AuthorApi::submit_extrinsic(&p, xt.into())).is_err());
 }
 
 #[test]
@@ -120,7 +119,7 @@ fn should_watch_extrinsic() {
 		uxt(AccountKeyring::Alice, 0).encode().into(),
 	);
 
-	let id = executor::block_on(id_rx.compat()).unwrap().unwrap();
+	let id = executor::block_on(id_rx).unwrap().unwrap();
 	assert_matches!(id, SubscriptionId::String(_));
 
 	let id = match id {
@@ -138,8 +137,8 @@ fn should_watch_extrinsic() {
 		};
 		tx.into_signed_tx()
 	};
-	AuthorApi::submit_extrinsic(&p, replacement.encode().into()).wait().unwrap();
-	let (res, data) = executor::block_on(data.into_future().compat()).unwrap();
+	executor::block_on(AuthorApi::submit_extrinsic(&p, replacement.encode().into())).unwrap();
+	let (res, data) = executor::block_on(data.into_future());
 
 	let expected = Some(format!(
 		r#"{{"jsonrpc":"2.0","method":"test","params":{{"result":"ready","subscription":"{}"}}}}"#,
@@ -154,7 +153,7 @@ fn should_watch_extrinsic() {
 		id,
 	));
 
-	let res = executor::block_on(data.into_future().compat()).unwrap().0;
+	let res = executor::block_on(data.into_future()).0;
 	assert_eq!(res, expected);
 }
 
@@ -174,7 +173,7 @@ fn should_return_watch_validation_error() {
 	);
 
 	// then
-	let res = executor::block_on(id_rx.compat()).unwrap();
+	let res = executor::block_on(id_rx).unwrap();
 	assert!(res.is_err(), "Expected the transaction to be rejected as invalid.");
 }
 
@@ -183,7 +182,7 @@ fn should_return_pending_extrinsics() {
 	let p = TestSetup::default().author();
 
 	let ex = uxt(AccountKeyring::Alice, 0);
-	AuthorApi::submit_extrinsic(&p, ex.encode().into()).wait().unwrap();
+	executor::block_on(AuthorApi::submit_extrinsic(&p, ex.encode().into())).unwrap();
 	assert_matches!(
 		p.pending_extrinsics(),
 		Ok(ref expected) if *expected == vec![Bytes(ex.encode())]
@@ -196,11 +195,11 @@ fn should_remove_extrinsics() {
 	let p = setup.author();
 
 	let ex1 = uxt(AccountKeyring::Alice, 0);
-	p.submit_extrinsic(ex1.encode().into()).wait().unwrap();
+	executor::block_on(p.submit_extrinsic(ex1.encode().into())).unwrap();
 	let ex2 = uxt(AccountKeyring::Alice, 1);
-	p.submit_extrinsic(ex2.encode().into()).wait().unwrap();
+	executor::block_on(p.submit_extrinsic(ex2.encode().into())).unwrap();
 	let ex3 = uxt(AccountKeyring::Bob, 0);
-	let hash3 = p.submit_extrinsic(ex3.encode().into()).wait().unwrap();
+	let hash3 = executor::block_on(p.submit_extrinsic(ex3.encode().into())).unwrap();
 	assert_eq!(setup.pool.status().ready, 3);
 
 	// now remove all 3
diff --git a/client/rpc/src/chain/chain_full.rs b/client/rpc/src/chain/chain_full.rs
index 8d0f622d1e7a..96d5b86f4249 100644
--- a/client/rpc/src/chain/chain_full.rs
+++ b/client/rpc/src/chain/chain_full.rs
@@ -18,19 +18,16 @@
 
 //! Blockchain API backend for full nodes.
 
+use super::{client_err, error::FutureResult, ChainBackend};
+use futures::FutureExt;
 use jsonrpc_pubsub::manager::SubscriptionManager;
-use rpc::futures::future::result;
-use std::sync::Arc;
-
 use sc_client_api::{BlockBackend, BlockchainEvents};
+use sp_blockchain::HeaderBackend;
 use sp_runtime::{
 	generic::{BlockId, SignedBlock},
 	traits::Block as BlockT,
 };
-
-use super::{client_err, error::FutureResult, ChainBackend};
-use sp_blockchain::HeaderBackend;
-use std::marker::PhantomData;
+use std::{marker::PhantomData, sync::Arc};
 
 /// Blockchain API backend for full nodes. Reads all the data from local database.
 pub struct FullChain<Block: BlockT, Client> {
@@ -52,6 +49,7 @@ impl<Block: BlockT, Client> FullChain<Block, Client> {
 impl<Block, Client> ChainBackend<Client, Block> for FullChain<Block, Client>
 where
 	Block: BlockT + 'static,
+	Block::Header: Unpin,
 	Client: BlockBackend<Block> + HeaderBackend<Block> + BlockchainEvents<Block> + 'static,
 {
 	fn client(&self) -> &Arc<Client> {
@@ -63,14 +61,12 @@ where
 	}
 
 	fn header(&self, hash: Option<Block::Hash>) -> FutureResult<Option<Block::Header>> {
-		Box::new(result(
-			self.client.header(BlockId::Hash(self.unwrap_or_best(hash))).map_err(client_err),
-		))
+		let res = self.client.header(BlockId::Hash(self.unwrap_or_best(hash))).map_err(client_err);
+		async move { res }.boxed()
 	}
 
 	fn block(&self, hash: Option<Block::Hash>) -> FutureResult<Option<SignedBlock<Block>>> {
-		Box::new(result(
-			self.client.block(&BlockId::Hash(self.unwrap_or_best(hash))).map_err(client_err),
-		))
+		let res = self.client.block(&BlockId::Hash(self.unwrap_or_best(hash))).map_err(client_err);
+		async move { res }.boxed()
 	}
 }
diff --git a/client/rpc/src/chain/chain_light.rs b/client/rpc/src/chain/chain_light.rs
index ebca664c0f23..2d15c819e1da 100644
--- a/client/rpc/src/chain/chain_light.rs
+++ b/client/rpc/src/chain/chain_light.rs
@@ -20,7 +20,6 @@
 
 use futures::{future::ready, FutureExt, TryFutureExt};
 use jsonrpc_pubsub::manager::SubscriptionManager;
-use rpc::futures::future::{result, Either, Future};
 use std::sync::Arc;
 
 use sc_client_api::light::{Fetcher, RemoteBlockchain, RemoteBodyRequest};
@@ -61,6 +60,7 @@ impl<Block: BlockT, Client, F: Fetcher<Block>> LightChain<Block, Client, F> {
 impl<Block, Client, F> ChainBackend<Client, Block> for LightChain<Block, Client, F>
 where
 	Block: BlockT + 'static,
+	Block::Header: Unpin,
 	Client: BlockchainEvents<Block> + HeaderBackend<Block> + Send + Sync + 'static,
 	F: Fetcher<Block> + Send + Sync + 'static,
 {
@@ -82,33 +82,33 @@ where
 			BlockId::Hash(hash),
 		);
 
-		Box::new(
-			maybe_header
-				.then(move |result| ready(result.map_err(client_err)))
-				.boxed()
-				.compat(),
-		)
+		maybe_header.then(move |result| ready(result.map_err(client_err))).boxed()
 	}
 
 	fn block(&self, hash: Option<Block::Hash>) -> FutureResult<Option<SignedBlock<Block>>> {
 		let fetcher = self.fetcher.clone();
-		let block = self.header(hash).and_then(move |header| match header {
-			Some(header) => Either::A(
-				fetcher
-					.remote_body(RemoteBodyRequest {
-						header: header.clone(),
-						retry_count: Default::default(),
-					})
-					.boxed()
-					.compat()
-					.map(move |body| {
-						Some(SignedBlock { block: Block::new(header, body), justifications: None })
-					})
-					.map_err(client_err),
-			),
-			None => Either::B(result(Ok(None))),
-		});
-
-		Box::new(block)
+		self.header(hash)
+			.and_then(move |header| async move {
+				match header {
+					Some(header) => {
+						let body = fetcher
+							.remote_body(RemoteBodyRequest {
+								header: header.clone(),
+								retry_count: Default::default(),
+							})
+							.await;
+
+						body.map(|body| {
+							Some(SignedBlock {
+								block: Block::new(header, body),
+								justifications: None,
+							})
+						})
+						.map_err(client_err)
+					},
+					None => Ok(None),
+				}
+			})
+			.boxed()
 	}
 }
diff --git a/client/rpc/src/chain/mod.rs b/client/rpc/src/chain/mod.rs
index f78188249f6f..8685b3f93c4e 100644
--- a/client/rpc/src/chain/mod.rs
+++ b/client/rpc/src/chain/mod.rs
@@ -27,7 +27,7 @@ mod tests;
 use futures::{future, StreamExt, TryStreamExt};
 use log::warn;
 use rpc::{
-	futures::{stream, Future, Sink, Stream},
+	futures::{stream, FutureExt, SinkExt, Stream},
 	Result as RpcResult,
 };
 use std::sync::Arc;
@@ -53,6 +53,7 @@ use sp_blockchain::HeaderBackend;
 trait ChainBackend<Client, Block: BlockT>: Send + Sync + 'static
 where
 	Block: BlockT + 'static,
+	Block::Header: Unpin,
 	Client: HeaderBackend<Block> + BlockchainEvents<Block> + 'static,
 {
 	/// Get client reference.
@@ -120,8 +121,7 @@ where
 			|| {
 				self.client()
 					.import_notification_stream()
-					.map(|notification| Ok::<_, ()>(notification.header))
-					.compat()
+					.map(|notification| Ok::<_, rpc::Error>(notification.header))
 			},
 		)
 	}
@@ -150,8 +150,7 @@ where
 				self.client()
 					.import_notification_stream()
 					.filter(|notification| future::ready(notification.is_new_best))
-					.map(|notification| Ok::<_, ()>(notification.header))
-					.compat()
+					.map(|notification| Ok::<_, rpc::Error>(notification.header))
 			},
 		)
 	}
@@ -179,8 +178,7 @@ where
 			|| {
 				self.client()
 					.finality_notification_stream()
-					.map(|notification| Ok::<_, ()>(notification.header))
-					.compat()
+					.map(|notification| Ok::<_, rpc::Error>(notification.header))
 			},
 		)
 	}
@@ -202,6 +200,7 @@ pub fn new_full<Block: BlockT, Client>(
 ) -> Chain<Block, Client>
 where
 	Block: BlockT + 'static,
+	Block::Header: Unpin,
 	Client: BlockBackend<Block> + HeaderBackend<Block> + BlockchainEvents<Block> + 'static,
 {
 	Chain { backend: Box::new(self::chain_full::FullChain::new(client, subscriptions)) }
@@ -216,6 +215,7 @@ pub fn new_light<Block: BlockT, Client, F: Fetcher<Block>>(
 ) -> Chain<Block, Client>
 where
 	Block: BlockT + 'static,
+	Block::Header: Unpin,
 	Client: BlockBackend<Block> + HeaderBackend<Block> + BlockchainEvents<Block> + 'static,
 	F: Send + Sync + 'static,
 {
@@ -238,6 +238,7 @@ impl<Block, Client> ChainApi<NumberFor<Block>, Block::Hash, Block::Header, Signe
 	for Chain<Block, Client>
 where
 	Block: BlockT + 'static,
+	Block::Header: Unpin,
 	Client: HeaderBackend<Block> + BlockchainEvents<Block> + 'static,
 {
 	type Metadata = crate::Metadata;
@@ -312,7 +313,7 @@ where
 }
 
 /// Subscribe to new headers.
-fn subscribe_headers<Block, Client, F, G, S, ERR>(
+fn subscribe_headers<Block, Client, F, G, S>(
 	client: &Arc<Client>,
 	subscriptions: &SubscriptionManager,
 	subscriber: Subscriber<Block::Header>,
@@ -320,27 +321,28 @@ fn subscribe_headers<Block, Client, F, G, S, ERR>(
 	stream: F,
 ) where
 	Block: BlockT + 'static,
+	Block::Header: Unpin,
 	Client: HeaderBackend<Block> + 'static,
 	F: FnOnce() -> S,
 	G: FnOnce() -> Block::Hash,
-	ERR: ::std::fmt::Debug,
-	S: Stream<Item = Block::Header, Error = ERR> + Send + 'static,
+	S: Stream<Item = std::result::Result<Block::Header, rpc::Error>> + Send + 'static,
 {
 	subscriptions.add(subscriber, |sink| {
 		// send current head right at the start.
 		let header = client
 			.header(BlockId::Hash(best_block_hash()))
 			.map_err(client_err)
-			.and_then(|header| header.ok_or_else(|| "Best header missing.".to_owned().into()))
+			.and_then(|header| header.ok_or_else(|| "Best header missing.".to_string().into()))
 			.map_err(Into::into);
 
 		// send further subscriptions
 		let stream = stream()
-			.map(|res| Ok(res))
-			.map_err(|e| warn!("Block notification stream error: {:?}", e));
+			.inspect_err(|e| warn!("Block notification stream error: {:?}", e))
+			.map(|res| Ok(res));
 
-		sink.sink_map_err(|e| warn!("Error sending notifications: {:?}", e))
-			.send_all(stream::iter_result(vec![Ok(header)]).chain(stream))
+		stream::iter(vec![Ok(header)])
+			.chain(stream)
+			.forward(sink.sink_map_err(|e| warn!("Error sending notifications: {:?}", e)))
 			// we ignore the resulting Stream (if the first stream is over we are unsubscribed)
 			.map(|_| ())
 	});
diff --git a/client/rpc/src/chain/tests.rs b/client/rpc/src/chain/tests.rs
index bf682a57a341..caa9f33138b8 100644
--- a/client/rpc/src/chain/tests.rs
+++ b/client/rpc/src/chain/tests.rs
@@ -19,10 +19,7 @@
 use super::*;
 use crate::testing::TaskExecutor;
 use assert_matches::assert_matches;
-use futures::{
-	compat::{Future01CompatExt, Stream01CompatExt},
-	executor,
-};
+use futures::executor;
 use sc_block_builder::BlockBuilderProvider;
 use sp_consensus::BlockOrigin;
 use sp_rpc::list::ListOrValue;
@@ -37,7 +34,7 @@ fn should_return_header() {
 	let api = new_full(client.clone(), SubscriptionManager::new(Arc::new(TaskExecutor)));
 
 	assert_matches!(
-		api.header(Some(client.genesis_hash()).into()).wait(),
+		executor::block_on(api.header(Some(client.genesis_hash()).into())),
 		Ok(Some(ref x)) if x == &Header {
 			parent_hash: H256::from_low_u64_be(0),
 			number: 0,
@@ -49,7 +46,7 @@ fn should_return_header() {
 	);
 
 	assert_matches!(
-		api.header(None.into()).wait(),
+		executor::block_on(api.header(None.into())),
 		Ok(Some(ref x)) if x == &Header {
 			parent_hash: H256::from_low_u64_be(0),
 			number: 0,
@@ -60,7 +57,10 @@ fn should_return_header() {
 		}
 	);
 
-	assert_matches!(api.header(Some(H256::from_low_u64_be(5)).into()).wait(), Ok(None));
+	assert_matches!(
+		executor::block_on(api.header(Some(H256::from_low_u64_be(5)).into())),
+		Ok(None)
+	);
 }
 
 #[test]
@@ -74,12 +74,12 @@ fn should_return_a_block() {
 
 	// Genesis block is not justified
 	assert_matches!(
-		api.block(Some(client.genesis_hash()).into()).wait(),
+		executor::block_on(api.block(Some(client.genesis_hash()).into())),
 		Ok(Some(SignedBlock { justifications: None, .. }))
 	);
 
 	assert_matches!(
-		api.block(Some(block_hash).into()).wait(),
+		executor::block_on(api.block(Some(block_hash).into())),
 		Ok(Some(ref x)) if x.block == Block {
 			header: Header {
 				parent_hash: client.genesis_hash(),
@@ -94,7 +94,7 @@ fn should_return_a_block() {
 	);
 
 	assert_matches!(
-		api.block(None.into()).wait(),
+		executor::block_on(api.block(None.into())),
 		Ok(Some(ref x)) if x.block == Block {
 			header: Header {
 				parent_hash: client.genesis_hash(),
@@ -108,7 +108,7 @@ fn should_return_a_block() {
 		}
 	);
 
-	assert_matches!(api.block(Some(H256::from_low_u64_be(5)).into()).wait(), Ok(None));
+	assert_matches!(executor::block_on(api.block(Some(H256::from_low_u64_be(5)).into())), Ok(None));
 }
 
 #[test]
@@ -182,7 +182,7 @@ fn should_return_finalized_hash() {
 
 #[test]
 fn should_notify_about_latest_block() {
-	let (subscriber, id, transport) = Subscriber::new_test("test");
+	let (subscriber, id, mut transport) = Subscriber::new_test("test");
 
 	{
 		let mut client = Arc::new(substrate_test_runtime_client::new());
@@ -191,25 +191,20 @@ fn should_notify_about_latest_block() {
 		api.subscribe_all_heads(Default::default(), subscriber);
 
 		// assert id assigned
-		assert!(matches!(executor::block_on(id.compat()), Ok(Ok(SubscriptionId::String(_)))));
+		assert!(matches!(executor::block_on(id), Ok(Ok(SubscriptionId::String(_)))));
 
 		let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
 		executor::block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	}
 
-	// assert initial head sent.
-	let (notification, next) = executor::block_on(transport.into_future().compat()).unwrap();
-	assert!(notification.is_some());
-	// assert notification sent to transport
-	let (notification, next) = executor::block_on(next.into_future().compat()).unwrap();
-	assert!(notification.is_some());
-	// no more notifications on this channel
-	assert_eq!(executor::block_on(next.into_future().compat()).unwrap().0, None);
+	// Check for the correct number of notifications
+	executor::block_on((&mut transport).take(2).collect::<Vec<_>>());
+	assert!(executor::block_on(transport.next()).is_none());
 }
 
 #[test]
 fn should_notify_about_best_block() {
-	let (subscriber, id, transport) = Subscriber::new_test("test");
+	let (subscriber, id, mut transport) = Subscriber::new_test("test");
 
 	{
 		let mut client = Arc::new(substrate_test_runtime_client::new());
@@ -218,25 +213,20 @@ fn should_notify_about_best_block() {
 		api.subscribe_new_heads(Default::default(), subscriber);
 
 		// assert id assigned
-		assert!(matches!(executor::block_on(id.compat()), Ok(Ok(SubscriptionId::String(_)))));
+		assert!(matches!(executor::block_on(id), Ok(Ok(SubscriptionId::String(_)))));
 
 		let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
 		executor::block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	}
 
-	// assert initial head sent.
-	let (notification, next) = executor::block_on(transport.into_future().compat()).unwrap();
-	assert!(notification.is_some());
-	// assert notification sent to transport
-	let (notification, next) = executor::block_on(next.into_future().compat()).unwrap();
-	assert!(notification.is_some());
-	// no more notifications on this channel
-	assert_eq!(executor::block_on(Stream01CompatExt::compat(next).into_future()).0, None);
+	// Assert that the correct number of notifications have been sent.
+	executor::block_on((&mut transport).take(2).collect::<Vec<_>>());
+	assert!(executor::block_on(transport.next()).is_none());
 }
 
 #[test]
 fn should_notify_about_finalized_block() {
-	let (subscriber, id, transport) = Subscriber::new_test("test");
+	let (subscriber, id, mut transport) = Subscriber::new_test("test");
 
 	{
 		let mut client = Arc::new(substrate_test_runtime_client::new());
@@ -245,19 +235,14 @@ fn should_notify_about_finalized_block() {
 		api.subscribe_finalized_heads(Default::default(), subscriber);
 
 		// assert id assigned
-		assert!(matches!(executor::block_on(id.compat()), Ok(Ok(SubscriptionId::String(_)))));
+		assert!(matches!(executor::block_on(id), Ok(Ok(SubscriptionId::String(_)))));
 
 		let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
 		executor::block_on(client.import(BlockOrigin::Own, block)).unwrap();
 		client.finalize_block(BlockId::number(1), None).unwrap();
 	}
 
-	// assert initial head sent.
-	let (notification, next) = executor::block_on(transport.into_future().compat()).unwrap();
-	assert!(notification.is_some());
-	// assert notification sent to transport
-	let (notification, next) = executor::block_on(next.into_future().compat()).unwrap();
-	assert!(notification.is_some());
-	// no more notifications on this channel
-	assert_eq!(executor::block_on(next.into_future().compat()).unwrap().0, None);
+	// Assert that the correct number of notifications have been sent.
+	executor::block_on((&mut transport).take(2).collect::<Vec<_>>());
+	assert!(executor::block_on(transport.next()).is_none());
 }
diff --git a/client/rpc/src/lib.rs b/client/rpc/src/lib.rs
index ebdec6647f43..832585db4854 100644
--- a/client/rpc/src/lib.rs
+++ b/client/rpc/src/lib.rs
@@ -22,8 +22,10 @@
 
 #![warn(missing_docs)]
 
-use futures::{compat::Future01CompatExt, FutureExt};
-use rpc::futures::future::{ExecuteError, Executor, Future};
+use futures::{
+	task::{FutureObj, Spawn, SpawnError},
+	FutureExt,
+};
 use sp_core::traits::SpawnNamed;
 use std::sync::Arc;
 
@@ -50,12 +52,13 @@ impl SubscriptionTaskExecutor {
 	}
 }
 
-impl Executor<Box<dyn Future<Item = (), Error = ()> + Send>> for SubscriptionTaskExecutor {
-	fn execute(
-		&self,
-		future: Box<dyn Future<Item = (), Error = ()> + Send>,
-	) -> Result<(), ExecuteError<Box<dyn Future<Item = (), Error = ()> + Send>>> {
-		self.0.spawn("substrate-rpc-subscription", future.compat().map(drop).boxed());
+impl Spawn for SubscriptionTaskExecutor {
+	fn spawn_obj(&self, future: FutureObj<'static, ()>) -> Result<(), SpawnError> {
+		self.0.spawn("substrate-rpc-subscription", future.map(drop).boxed());
+		Ok(())
+	}
+
+	fn status(&self) -> Result<(), SpawnError> {
 		Ok(())
 	}
 }
diff --git a/client/rpc/src/state/mod.rs b/client/rpc/src/state/mod.rs
index 472e50c74991..042225042d80 100644
--- a/client/rpc/src/state/mod.rs
+++ b/client/rpc/src/state/mod.rs
@@ -24,11 +24,9 @@ mod state_light;
 #[cfg(test)]
 mod tests;
 
+use futures::FutureExt;
 use jsonrpc_pubsub::{manager::SubscriptionManager, typed::Subscriber, SubscriptionId};
-use rpc::{
-	futures::{future::result, Future},
-	Result as RpcResult,
-};
+use rpc::Result as RpcResult;
 use std::sync::Arc;
 
 use sc_client_api::light::{Fetcher, RemoteBlockchain};
@@ -192,6 +190,7 @@ pub fn new_full<BE, Block: BlockT, Client>(
 ) -> (State<Block, Client>, ChildState<Block, Client>)
 where
 	Block: BlockT + 'static,
+	Block::Hash: Unpin,
 	BE: Backend<Block> + 'static,
 	Client: ExecutorProvider<Block>
 		+ StorageProvider<Block, BE>
@@ -227,6 +226,7 @@ pub fn new_light<BE, Block: BlockT, Client, F: Fetcher<Block>>(
 ) -> (State<Block, Client>, ChildState<Block, Client>)
 where
 	Block: BlockT + 'static,
+	Block::Hash: Unpin,
 	BE: Backend<Block> + 'static,
 	Client: ExecutorProvider<Block>
 		+ StorageProvider<Block, BE>
@@ -287,7 +287,7 @@ where
 		block: Option<Block::Hash>,
 	) -> FutureResult<Vec<(StorageKey, StorageData)>> {
 		if let Err(err) = self.deny_unsafe.check_if_safe() {
-			return Box::new(result(Err(err.into())))
+			return async move { Err(err.into()) }.boxed()
 		}
 
 		self.backend.storage_pairs(block, key_prefix)
@@ -301,10 +301,10 @@ where
 		block: Option<Block::Hash>,
 	) -> FutureResult<Vec<StorageKey>> {
 		if count > STORAGE_KEYS_PAGED_MAX_COUNT {
-			return Box::new(result(Err(Error::InvalidCount {
-				value: count,
-				max: STORAGE_KEYS_PAGED_MAX_COUNT,
-			})))
+			return async move {
+				Err(Error::InvalidCount { value: count, max: STORAGE_KEYS_PAGED_MAX_COUNT })
+			}
+			.boxed()
 		}
 		self.backend.storage_keys_paged(block, prefix, count, start_key)
 	}
@@ -344,7 +344,7 @@ where
 		to: Option<Block::Hash>,
 	) -> FutureResult<Vec<StorageChangeSet<Block::Hash>>> {
 		if let Err(err) = self.deny_unsafe.check_if_safe() {
-			return Box::new(result(Err(err.into())))
+			return async move { Err(err.into()) }.boxed()
 		}
 
 		self.backend.query_storage(from, to, keys)
@@ -415,7 +415,7 @@ where
 		storage_keys: Option<String>,
 	) -> FutureResult<sp_rpc::tracing::TraceBlockResponse> {
 		if let Err(err) = self.deny_unsafe.check_if_safe() {
-			return Box::new(result(Err(err.into())))
+			return async move { Err(err.into()) }.boxed()
 		}
 
 		self.backend.trace_block(block, targets, storage_keys)
@@ -478,7 +478,9 @@ where
 		storage_key: PrefixedStorageKey,
 		key: StorageKey,
 	) -> FutureResult<Option<u64>> {
-		Box::new(self.storage(block, storage_key, key).map(|x| x.map(|x| x.0.len() as u64)))
+		self.storage(block, storage_key, key)
+			.map(|x| x.map(|r| r.map(|v| v.0.len() as u64)))
+			.boxed()
 	}
 }
 
diff --git a/client/rpc/src/state/state_full.rs b/client/rpc/src/state/state_full.rs
index 242a78d58579..ef008700f6d5 100644
--- a/client/rpc/src/state/state_full.rs
+++ b/client/rpc/src/state/state_full.rs
@@ -18,13 +18,10 @@
 
 //! State API backend for full nodes.
 
-use futures::{future, StreamExt as _, TryStreamExt as _};
+use futures::{future, stream, FutureExt, SinkExt, StreamExt};
 use jsonrpc_pubsub::{manager::SubscriptionManager, typed::Subscriber, SubscriptionId};
 use log::warn;
-use rpc::{
-	futures::{future::result, stream, Future, Sink, Stream},
-	Result as RpcResult,
-};
+use rpc::Result as RpcResult;
 use std::{
 	collections::{BTreeMap, HashMap},
 	ops::Range,
@@ -263,6 +260,7 @@ where
 impl<BE, Block, Client> StateBackend<Block, Client> for FullState<BE, Block, Client>
 where
 	Block: BlockT + 'static,
+	Block::Hash: Unpin,
 	BE: Backend<Block> + 'static,
 	Client: ExecutorProvider<Block>
 		+ StorageProvider<Block, BE>
@@ -299,7 +297,7 @@ where
 					.map(Into::into)
 			})
 			.map_err(client_err);
-		Box::new(result(r))
+		async move { r }.boxed()
 	}
 
 	fn storage_keys(
@@ -307,11 +305,11 @@ where
 		block: Option<Block::Hash>,
 		prefix: StorageKey,
 	) -> FutureResult<Vec<StorageKey>> {
-		Box::new(result(
-			self.block_or_best(block)
-				.and_then(|block| self.client.storage_keys(&BlockId::Hash(block), &prefix))
-				.map_err(client_err),
-		))
+		let r = self
+			.block_or_best(block)
+			.and_then(|block| self.client.storage_keys(&BlockId::Hash(block), &prefix))
+			.map_err(client_err);
+		async move { r }.boxed()
 	}
 
 	fn storage_pairs(
@@ -319,11 +317,11 @@ where
 		block: Option<Block::Hash>,
 		prefix: StorageKey,
 	) -> FutureResult<Vec<(StorageKey, StorageData)>> {
-		Box::new(result(
-			self.block_or_best(block)
-				.and_then(|block| self.client.storage_pairs(&BlockId::Hash(block), &prefix))
-				.map_err(client_err),
-		))
+		let r = self
+			.block_or_best(block)
+			.and_then(|block| self.client.storage_pairs(&BlockId::Hash(block), &prefix))
+			.map_err(client_err);
+		async move { r }.boxed()
 	}
 
 	fn storage_keys_paged(
@@ -333,18 +331,18 @@ where
 		count: u32,
 		start_key: Option<StorageKey>,
 	) -> FutureResult<Vec<StorageKey>> {
-		Box::new(result(
-			self.block_or_best(block)
-				.and_then(|block| {
-					self.client.storage_keys_iter(
-						&BlockId::Hash(block),
-						prefix.as_ref(),
-						start_key.as_ref(),
-					)
-				})
-				.map(|iter| iter.take(count as usize).collect())
-				.map_err(client_err),
-		))
+		let r = self
+			.block_or_best(block)
+			.and_then(|block| {
+				self.client.storage_keys_iter(
+					&BlockId::Hash(block),
+					prefix.as_ref(),
+					start_key.as_ref(),
+				)
+			})
+			.map(|iter| iter.take(count as usize).collect())
+			.map_err(client_err);
+		async move { r }.boxed()
 	}
 
 	fn storage(
@@ -352,11 +350,11 @@ where
 		block: Option<Block::Hash>,
 		key: StorageKey,
 	) -> FutureResult<Option<StorageData>> {
-		Box::new(result(
-			self.block_or_best(block)
-				.and_then(|block| self.client.storage(&BlockId::Hash(block), &key))
-				.map_err(client_err),
-		))
+		let r = self
+			.block_or_best(block)
+			.and_then(|block| self.client.storage(&BlockId::Hash(block), &key))
+			.map_err(client_err);
+		async move { r }.boxed()
 	}
 
 	fn storage_size(
@@ -366,28 +364,28 @@ where
 	) -> FutureResult<Option<u64>> {
 		let block = match self.block_or_best(block) {
 			Ok(b) => b,
-			Err(e) => return Box::new(result(Err(client_err(e)))),
+			Err(e) => return async move { Err(client_err(e)) }.boxed(),
 		};
 
 		match self.client.storage(&BlockId::Hash(block), &key) {
-			Ok(Some(d)) => return Box::new(result(Ok(Some(d.0.len() as u64)))),
-			Err(e) => return Box::new(result(Err(client_err(e)))),
+			Ok(Some(d)) => return async move { Ok(Some(d.0.len() as u64)) }.boxed(),
+			Err(e) => return async move { Err(client_err(e)) }.boxed(),
 			Ok(None) => {},
 		}
 
-		Box::new(result(
-			self.client
-				.storage_pairs(&BlockId::Hash(block), &key)
-				.map(|kv| {
-					let item_sum = kv.iter().map(|(_, v)| v.0.len() as u64).sum::<u64>();
-					if item_sum > 0 {
-						Some(item_sum)
-					} else {
-						None
-					}
-				})
-				.map_err(client_err),
-		))
+		let r = self
+			.client
+			.storage_pairs(&BlockId::Hash(block), &key)
+			.map(|kv| {
+				let item_sum = kv.iter().map(|(_, v)| v.0.len() as u64).sum::<u64>();
+				if item_sum > 0 {
+					Some(item_sum)
+				} else {
+					None
+				}
+			})
+			.map_err(client_err);
+		async move { r }.boxed()
 	}
 
 	fn storage_hash(
@@ -395,29 +393,31 @@ where
 		block: Option<Block::Hash>,
 		key: StorageKey,
 	) -> FutureResult<Option<Block::Hash>> {
-		Box::new(result(
-			self.block_or_best(block)
-				.and_then(|block| self.client.storage_hash(&BlockId::Hash(block), &key))
-				.map_err(client_err),
-		))
+		let r = self
+			.block_or_best(block)
+			.and_then(|block| self.client.storage_hash(&BlockId::Hash(block), &key))
+			.map_err(client_err);
+		async move { r }.boxed()
 	}
 
 	fn metadata(&self, block: Option<Block::Hash>) -> FutureResult<Bytes> {
-		Box::new(result(self.block_or_best(block).map_err(client_err).and_then(|block| {
+		let r = self.block_or_best(block).map_err(client_err).and_then(|block| {
 			self.client
 				.runtime_api()
 				.metadata(&BlockId::Hash(block))
 				.map(Into::into)
 				.map_err(|e| Error::Client(Box::new(e)))
-		})))
+		});
+		async move { r }.boxed()
 	}
 
 	fn runtime_version(&self, block: Option<Block::Hash>) -> FutureResult<RuntimeVersion> {
-		Box::new(result(self.block_or_best(block).map_err(client_err).and_then(|block| {
+		let r = self.block_or_best(block).map_err(client_err).and_then(|block| {
 			self.client
 				.runtime_version_at(&BlockId::Hash(block))
 				.map_err(|e| Error::Client(Box::new(e)))
-		})))
+		});
+		async move { r }.boxed()
 	}
 
 	fn query_storage(
@@ -434,7 +434,9 @@ where
 			self.query_storage_filtered(&range, &keys, &last_values, &mut changes)?;
 			Ok(changes)
 		};
-		Box::new(result(call_fn()))
+
+		let r = call_fn();
+		async move { r }.boxed()
 	}
 
 	fn query_storage_at(
@@ -451,19 +453,16 @@ where
 		block: Option<Block::Hash>,
 		keys: Vec<StorageKey>,
 	) -> FutureResult<ReadProof<Block::Hash>> {
-		Box::new(result(
-			self.block_or_best(block)
-				.and_then(|block| {
-					self.client
-						.read_proof(
-							&BlockId::Hash(block),
-							&mut keys.iter().map(|key| key.0.as_ref()),
-						)
-						.map(|proof| proof.iter_nodes().map(|node| node.into()).collect())
-						.map(|proof| ReadProof { at: block, proof })
-				})
-				.map_err(client_err),
-		))
+		let r = self
+			.block_or_best(block)
+			.and_then(|block| {
+				self.client
+					.read_proof(&BlockId::Hash(block), &mut keys.iter().map(|key| key.0.as_ref()))
+					.map(|proof| proof.iter_nodes().map(|node| node.into()).collect())
+					.map(|proof| ReadProof { at: block, proof })
+			})
+			.map_err(client_err);
+		async move { r }.boxed()
 	}
 
 	fn subscribe_runtime_version(
@@ -483,29 +482,34 @@ where
 		};
 
 		self.subscriptions.add(subscriber, |sink| {
-			let version = self.runtime_version(None.into()).map_err(Into::into).wait();
+			let version = self
+				.block_or_best(None)
+				.and_then(|block| {
+					self.client.runtime_version_at(&BlockId::Hash(block)).map_err(Into::into)
+				})
+				.map_err(client_err)
+				.map_err(Into::into);
 
 			let client = self.client.clone();
 			let mut previous_version = version.clone();
 
-			let stream = stream
-				.filter_map(move |_| {
-					let info = client.info();
-					let version = client
-						.runtime_version_at(&BlockId::hash(info.best_hash))
-						.map_err(|e| Error::Client(Box::new(e)))
-						.map_err(Into::into);
-					if previous_version != version {
-						previous_version = version.clone();
-						future::ready(Some(Ok::<_, ()>(version)))
-					} else {
-						future::ready(None)
-					}
-				})
-				.compat();
+			let stream = stream.filter_map(move |_| {
+				let info = client.info();
+				let version = client
+					.runtime_version_at(&BlockId::hash(info.best_hash))
+					.map_err(|e| Error::Client(Box::new(e)))
+					.map_err(Into::into);
+				if previous_version != version {
+					previous_version = version.clone();
+					future::ready(Some(Ok::<_, ()>(version)))
+				} else {
+					future::ready(None)
+				}
+			});
 
-			sink.sink_map_err(|e| warn!("Error sending notifications: {:?}", e))
-				.send_all(stream::iter_result(vec![Ok(version)]).chain(stream))
+			stream::iter(vec![Ok(version)])
+				.chain(stream)
+				.forward(sink.sink_map_err(|e| warn!("Error sending notifications: {:?}", e)))
 				// we ignore the resulting Stream (if the first stream is over we are unsubscribed)
 				.map(|_| ())
 		});
@@ -538,16 +542,14 @@ where
 		};
 
 		// initial values
-		let initial = stream::iter_result(
+		let initial = stream::iter(
 			keys.map(|keys| {
 				let block = self.client.info().best_hash;
 				let changes = keys
 					.into_iter()
 					.map(|key| {
-						StateBackend::storage(self, Some(block.clone()).into(), key.clone())
-							.map(|val| (key.clone(), val))
-							.wait()
-							.unwrap_or_else(|_| (key, None))
+						let v = self.client.storage(&BlockId::Hash(block), &key).ok().flatten();
+						(key, v)
 					})
 					.collect();
 				vec![Ok(Ok(StorageChangeSet { block, changes }))]
@@ -556,26 +558,19 @@ where
 		);
 
 		self.subscriptions.add(subscriber, |sink| {
-			let stream = stream
-				.map(|(block, changes)| {
-					Ok::<_, ()>(Ok(StorageChangeSet {
-						block,
-						changes: changes
-							.iter()
-							.filter_map(|(o_sk, k, v)| {
-								if o_sk.is_none() {
-									Some((k.clone(), v.cloned()))
-								} else {
-									None
-								}
-							})
-							.collect(),
-					}))
-				})
-				.compat();
-
-			sink.sink_map_err(|e| warn!("Error sending notifications: {:?}", e))
-				.send_all(initial.chain(stream))
+			let stream = stream.map(|(block, changes)| {
+				Ok(Ok::<_, rpc::Error>(StorageChangeSet {
+					block,
+					changes: changes
+						.iter()
+						.filter_map(|(o_sk, k, v)| o_sk.is_none().then(|| (k.clone(), v.cloned())))
+						.collect(),
+				}))
+			});
+
+			initial
+				.chain(stream)
+				.forward(sink.sink_map_err(|e| warn!("Error sending notifications: {:?}", e)))
 				// we ignore the resulting Stream (if the first stream is over we are unsubscribed)
 				.map(|_| ())
 		});
@@ -602,11 +597,10 @@ where
 			storage_keys,
 			self.rpc_max_payload,
 		);
-		Box::new(result(
-			block_executor
-				.trace_block()
-				.map_err(|e| invalid_block::<Block>(block, None, e.to_string())),
-		))
+		let r = block_executor
+			.trace_block()
+			.map_err(|e| invalid_block::<Block>(block, None, e.to_string()));
+		async move { r }.boxed()
 	}
 }
 
@@ -634,25 +628,26 @@ where
 		storage_key: PrefixedStorageKey,
 		keys: Vec<StorageKey>,
 	) -> FutureResult<ReadProof<Block::Hash>> {
-		Box::new(result(
-			self.block_or_best(block)
-				.and_then(|block| {
-					let child_info = match ChildType::from_prefixed_key(&storage_key) {
-						Some((ChildType::ParentKeyId, storage_key)) =>
-							ChildInfo::new_default(storage_key),
-						None => return Err(sp_blockchain::Error::InvalidChildStorageKey),
-					};
-					self.client
-						.read_child_proof(
-							&BlockId::Hash(block),
-							&child_info,
-							&mut keys.iter().map(|key| key.0.as_ref()),
-						)
-						.map(|proof| proof.iter_nodes().map(|node| node.into()).collect())
-						.map(|proof| ReadProof { at: block, proof })
-				})
-				.map_err(client_err),
-		))
+		let r = self
+			.block_or_best(block)
+			.and_then(|block| {
+				let child_info = match ChildType::from_prefixed_key(&storage_key) {
+					Some((ChildType::ParentKeyId, storage_key)) =>
+						ChildInfo::new_default(storage_key),
+					None => return Err(sp_blockchain::Error::InvalidChildStorageKey),
+				};
+				self.client
+					.read_child_proof(
+						&BlockId::Hash(block),
+						&child_info,
+						&mut keys.iter().map(|key| key.0.as_ref()),
+					)
+					.map(|proof| proof.iter_nodes().map(|node| node.into()).collect())
+					.map(|proof| ReadProof { at: block, proof })
+			})
+			.map_err(client_err);
+
+		async move { r }.boxed()
 	}
 
 	fn storage_keys(
@@ -661,18 +656,19 @@ where
 		storage_key: PrefixedStorageKey,
 		prefix: StorageKey,
 	) -> FutureResult<Vec<StorageKey>> {
-		Box::new(result(
-			self.block_or_best(block)
-				.and_then(|block| {
-					let child_info = match ChildType::from_prefixed_key(&storage_key) {
-						Some((ChildType::ParentKeyId, storage_key)) =>
-							ChildInfo::new_default(storage_key),
-						None => return Err(sp_blockchain::Error::InvalidChildStorageKey),
-					};
-					self.client.child_storage_keys(&BlockId::Hash(block), &child_info, &prefix)
-				})
-				.map_err(client_err),
-		))
+		let r = self
+			.block_or_best(block)
+			.and_then(|block| {
+				let child_info = match ChildType::from_prefixed_key(&storage_key) {
+					Some((ChildType::ParentKeyId, storage_key)) =>
+						ChildInfo::new_default(storage_key),
+					None => return Err(sp_blockchain::Error::InvalidChildStorageKey),
+				};
+				self.client.child_storage_keys(&BlockId::Hash(block), &child_info, &prefix)
+			})
+			.map_err(client_err);
+
+		async move { r }.boxed()
 	}
 
 	fn storage_keys_paged(
@@ -683,24 +679,25 @@ where
 		count: u32,
 		start_key: Option<StorageKey>,
 	) -> FutureResult<Vec<StorageKey>> {
-		Box::new(result(
-			self.block_or_best(block)
-				.and_then(|block| {
-					let child_info = match ChildType::from_prefixed_key(&storage_key) {
-						Some((ChildType::ParentKeyId, storage_key)) =>
-							ChildInfo::new_default(storage_key),
-						None => return Err(sp_blockchain::Error::InvalidChildStorageKey),
-					};
-					self.client.child_storage_keys_iter(
-						&BlockId::Hash(block),
-						child_info,
-						prefix.as_ref(),
-						start_key.as_ref(),
-					)
-				})
-				.map(|iter| iter.take(count as usize).collect())
-				.map_err(client_err),
-		))
+		let r = self
+			.block_or_best(block)
+			.and_then(|block| {
+				let child_info = match ChildType::from_prefixed_key(&storage_key) {
+					Some((ChildType::ParentKeyId, storage_key)) =>
+						ChildInfo::new_default(storage_key),
+					None => return Err(sp_blockchain::Error::InvalidChildStorageKey),
+				};
+				self.client.child_storage_keys_iter(
+					&BlockId::Hash(block),
+					child_info,
+					prefix.as_ref(),
+					start_key.as_ref(),
+				)
+			})
+			.map(|iter| iter.take(count as usize).collect())
+			.map_err(client_err);
+
+		async move { r }.boxed()
 	}
 
 	fn storage(
@@ -709,18 +706,19 @@ where
 		storage_key: PrefixedStorageKey,
 		key: StorageKey,
 	) -> FutureResult<Option<StorageData>> {
-		Box::new(result(
-			self.block_or_best(block)
-				.and_then(|block| {
-					let child_info = match ChildType::from_prefixed_key(&storage_key) {
-						Some((ChildType::ParentKeyId, storage_key)) =>
-							ChildInfo::new_default(storage_key),
-						None => return Err(sp_blockchain::Error::InvalidChildStorageKey),
-					};
-					self.client.child_storage(&BlockId::Hash(block), &child_info, &key)
-				})
-				.map_err(client_err),
-		))
+		let r = self
+			.block_or_best(block)
+			.and_then(|block| {
+				let child_info = match ChildType::from_prefixed_key(&storage_key) {
+					Some((ChildType::ParentKeyId, storage_key)) =>
+						ChildInfo::new_default(storage_key),
+					None => return Err(sp_blockchain::Error::InvalidChildStorageKey),
+				};
+				self.client.child_storage(&BlockId::Hash(block), &child_info, &key)
+			})
+			.map_err(client_err);
+
+		async move { r }.boxed()
 	}
 
 	fn storage_hash(
@@ -729,18 +727,19 @@ where
 		storage_key: PrefixedStorageKey,
 		key: StorageKey,
 	) -> FutureResult<Option<Block::Hash>> {
-		Box::new(result(
-			self.block_or_best(block)
-				.and_then(|block| {
-					let child_info = match ChildType::from_prefixed_key(&storage_key) {
-						Some((ChildType::ParentKeyId, storage_key)) =>
-							ChildInfo::new_default(storage_key),
-						None => return Err(sp_blockchain::Error::InvalidChildStorageKey),
-					};
-					self.client.child_storage_hash(&BlockId::Hash(block), &child_info, &key)
-				})
-				.map_err(client_err),
-		))
+		let r = self
+			.block_or_best(block)
+			.and_then(|block| {
+				let child_info = match ChildType::from_prefixed_key(&storage_key) {
+					Some((ChildType::ParentKeyId, storage_key)) =>
+						ChildInfo::new_default(storage_key),
+					None => return Err(sp_blockchain::Error::InvalidChildStorageKey),
+				};
+				self.client.child_storage_hash(&BlockId::Hash(block), &child_info, &key)
+			})
+			.map_err(client_err);
+
+		async move { r }.boxed()
 	}
 }
 
diff --git a/client/rpc/src/state/state_light.rs b/client/rpc/src/state/state_light.rs
index 274eabe376d9..cdb3a77e8d70 100644
--- a/client/rpc/src/state/state_light.rs
+++ b/client/rpc/src/state/state_light.rs
@@ -22,20 +22,13 @@ use codec::Decode;
 use futures::{
 	channel::oneshot::{channel, Sender},
 	future::{ready, Either},
-	FutureExt, StreamExt as _, TryFutureExt, TryStreamExt as _,
+	Future, FutureExt, SinkExt, Stream, StreamExt as _, TryFutureExt, TryStreamExt as _,
 };
 use hash_db::Hasher;
 use jsonrpc_pubsub::{manager::SubscriptionManager, typed::Subscriber, SubscriptionId};
 use log::warn;
 use parking_lot::Mutex;
-use rpc::{
-	futures::{
-		future::{result, Future},
-		stream::Stream,
-		Sink,
-	},
-	Result as RpcResult,
-};
+use rpc::Result as RpcResult;
 use std::{
 	collections::{hash_map::Entry, HashMap, HashSet},
 	sync::Arc,
@@ -171,6 +164,7 @@ where
 impl<Block, F, Client> StateBackend<Block, Client> for LightState<Block, F, Client>
 where
 	Block: BlockT,
+	Block::Hash: Unpin,
 	Client: BlockchainEvents<Block> + HeaderBackend<Block> + Send + Sync + 'static,
 	F: Fetcher<Block> + 'static,
 {
@@ -180,17 +174,14 @@ where
 		method: String,
 		call_data: Bytes,
 	) -> FutureResult<Bytes> {
-		Box::new(
-			call(
-				&*self.remote_blockchain,
-				self.fetcher.clone(),
-				self.block_or_best(block),
-				method,
-				call_data,
-			)
-			.boxed()
-			.compat(),
+		call(
+			&*self.remote_blockchain,
+			self.fetcher.clone(),
+			self.block_or_best(block),
+			method,
+			call_data,
 		)
+		.boxed()
 	}
 
 	fn storage_keys(
@@ -198,7 +189,7 @@ where
 		_block: Option<Block::Hash>,
 		_prefix: StorageKey,
 	) -> FutureResult<Vec<StorageKey>> {
-		Box::new(result(Err(client_err(ClientError::NotAvailableOnLightClient))))
+		async move { Err(client_err(ClientError::NotAvailableOnLightClient)) }.boxed()
 	}
 
 	fn storage_pairs(
@@ -206,7 +197,7 @@ where
 		_block: Option<Block::Hash>,
 		_prefix: StorageKey,
 	) -> FutureResult<Vec<(StorageKey, StorageData)>> {
-		Box::new(result(Err(client_err(ClientError::NotAvailableOnLightClient))))
+		async move { Err(client_err(ClientError::NotAvailableOnLightClient)) }.boxed()
 	}
 
 	fn storage_keys_paged(
@@ -216,11 +207,11 @@ where
 		_count: u32,
 		_start_key: Option<StorageKey>,
 	) -> FutureResult<Vec<StorageKey>> {
-		Box::new(result(Err(client_err(ClientError::NotAvailableOnLightClient))))
+		async move { Err(client_err(ClientError::NotAvailableOnLightClient)) }.boxed()
 	}
 
 	fn storage_size(&self, _: Option<Block::Hash>, _: StorageKey) -> FutureResult<Option<u64>> {
-		Box::new(result(Err(client_err(ClientError::NotAvailableOnLightClient))))
+		async move { Err(client_err(ClientError::NotAvailableOnLightClient)) }.boxed()
 	}
 
 	fn storage(
@@ -228,21 +219,18 @@ where
 		block: Option<Block::Hash>,
 		key: StorageKey,
 	) -> FutureResult<Option<StorageData>> {
-		Box::new(
-			storage(
-				&*self.remote_blockchain,
-				self.fetcher.clone(),
-				self.block_or_best(block),
-				vec![key.0.clone()],
-			)
-			.boxed()
-			.compat()
-			.map(move |mut values| {
-				values
-					.remove(&key)
-					.expect("successful request has entries for all requested keys; qed")
-			}),
+		storage(
+			&*self.remote_blockchain,
+			self.fetcher.clone(),
+			self.block_or_best(block),
+			vec![key.0.clone()],
 		)
+		.map_ok(move |mut values| {
+			values
+				.remove(&key)
+				.expect("successful request has entries for all requested keys; qed")
+		})
+		.boxed()
 	}
 
 	fn storage_hash(
@@ -250,38 +238,28 @@ where
 		block: Option<Block::Hash>,
 		key: StorageKey,
 	) -> FutureResult<Option<Block::Hash>> {
-		Box::new(StateBackend::storage(self, block, key).and_then(|maybe_storage| {
-			result(Ok(maybe_storage.map(|storage| HashFor::<Block>::hash(&storage.0))))
-		}))
+		let res = StateBackend::storage(self, block, key);
+		async move { res.await.map(|r| r.map(|s| HashFor::<Block>::hash(&s.0))) }.boxed()
 	}
 
 	fn metadata(&self, block: Option<Block::Hash>) -> FutureResult<Bytes> {
-		let metadata =
-			self.call(block, "Metadata_metadata".into(), Bytes(Vec::new()))
-				.and_then(|metadata| {
-					OpaqueMetadata::decode(&mut &metadata.0[..]).map(Into::into).map_err(
-						|decode_err| {
-							client_err(ClientError::CallResultDecode(
-								"Unable to decode metadata",
-								decode_err,
-							))
-						},
-					)
-				});
-
-		Box::new(metadata)
+		self.call(block, "Metadata_metadata".into(), Bytes(Vec::new()))
+			.and_then(|metadata| async move {
+				OpaqueMetadata::decode(&mut &metadata.0[..])
+					.map(Into::into)
+					.map_err(|decode_err| {
+						client_err(ClientError::CallResultDecode(
+							"Unable to decode metadata",
+							decode_err,
+						))
+					})
+			})
+			.boxed()
 	}
 
 	fn runtime_version(&self, block: Option<Block::Hash>) -> FutureResult<RuntimeVersion> {
-		Box::new(
-			runtime_version(
-				&*self.remote_blockchain,
-				self.fetcher.clone(),
-				self.block_or_best(block),
-			)
+		runtime_version(&*self.remote_blockchain, self.fetcher.clone(), self.block_or_best(block))
 			.boxed()
-			.compat(),
-		)
 	}
 
 	fn query_storage(
@@ -290,7 +268,7 @@ where
 		_to: Option<Block::Hash>,
 		_keys: Vec<StorageKey>,
 	) -> FutureResult<Vec<StorageChangeSet<Block::Hash>>> {
-		Box::new(result(Err(client_err(ClientError::NotAvailableOnLightClient))))
+		async move { Err(client_err(ClientError::NotAvailableOnLightClient)) }.boxed()
 	}
 
 	fn query_storage_at(
@@ -298,7 +276,7 @@ where
 		_keys: Vec<StorageKey>,
 		_at: Option<Block::Hash>,
 	) -> FutureResult<Vec<StorageChangeSet<Block::Hash>>> {
-		Box::new(result(Err(client_err(ClientError::NotAvailableOnLightClient))))
+		async move { Err(client_err(ClientError::NotAvailableOnLightClient)) }.boxed()
 	}
 
 	fn read_proof(
@@ -306,7 +284,7 @@ where
 		_block: Option<Block::Hash>,
 		_keys: Vec<StorageKey>,
 	) -> FutureResult<ReadProof<Block::Hash>> {
-		Box::new(result(Err(client_err(ClientError::NotAvailableOnLightClient))))
+		async move { Err(client_err(ClientError::NotAvailableOnLightClient)) }.boxed()
 	}
 
 	fn subscribe_storage(
@@ -334,10 +312,7 @@ where
 
 			let changes_stream = subscription_stream::<Block, _, _, _, _, _, _, _, _>(
 				storage_subscriptions.clone(),
-				self.client
-					.import_notification_stream()
-					.map(|notification| Ok::<_, ()>(notification.hash))
-					.compat(),
+				self.client.import_notification_stream().map(|notification| notification.hash),
 				display_error(
 					storage(&*remote_blockchain, fetcher.clone(), initial_block, initial_keys)
 						.map(move |r| r.map(|r| (initial_block, r))),
@@ -365,21 +340,17 @@ where
 						.as_ref()
 						.map(|old_value| **old_value != new_value)
 						.unwrap_or(true);
-					match value_differs {
-						true => Some(StorageChangeSet {
-							block,
-							changes: new_value
-								.iter()
-								.map(|(k, v)| (k.clone(), v.clone()))
-								.collect(),
-						}),
-						false => None,
-					}
+
+					value_differs.then(|| StorageChangeSet {
+						block,
+						changes: new_value.iter().map(|(k, v)| (k.clone(), v.clone())).collect(),
+					})
 				},
 			);
 
-			sink.sink_map_err(|e| warn!("Error sending notifications: {:?}", e))
-				.send_all(changes_stream.map(|changes| Ok(changes)))
+			changes_stream
+				.map_ok(Ok)
+				.forward(sink.sink_map_err(|e| warn!("Error sending notifications: {:?}", e)))
 				// we ignore the resulting Stream (if the first stream is over we are unsubscribed)
 				.map(|_| ())
 		});
@@ -441,10 +412,7 @@ where
 
 			let versions_stream = subscription_stream::<Block, _, _, _, _, _, _, _, _>(
 				version_subscriptions,
-				self.client
-					.import_notification_stream()
-					.map(|notification| Ok::<_, ()>(notification.hash))
-					.compat(),
+				self.client.import_notification_stream().map(|notification| notification.hash),
 				display_error(
 					runtime_version(&*remote_blockchain, fetcher.clone(), initial_block)
 						.map(move |r| r.map(|r| (initial_block, r))),
@@ -455,15 +423,14 @@ where
 						.as_ref()
 						.map(|old_version| *old_version != new_version)
 						.unwrap_or(true);
-					match version_differs {
-						true => Some(new_version.clone()),
-						false => None,
-					}
+
+					version_differs.then(|| new_version.clone())
 				},
 			);
 
-			sink.sink_map_err(|e| warn!("Error sending notifications: {:?}", e))
-				.send_all(versions_stream.map(|version| Ok(version)))
+			versions_stream
+				.map_ok(Ok)
+				.forward(sink.sink_map_err(|e| warn!("Error sending notifications: {:?}", e)))
 				// we ignore the resulting Stream (if the first stream is over we are unsubscribed)
 				.map(|_| ())
 		});
@@ -483,7 +450,7 @@ where
 		_targets: Option<String>,
 		_storage_keys: Option<String>,
 	) -> FutureResult<sp_rpc::tracing::TraceBlockResponse> {
-		Box::new(result(Err(client_err(ClientError::NotAvailableOnLightClient))))
+		async move { Err(client_err(ClientError::NotAvailableOnLightClient)) }.boxed()
 	}
 }
 
@@ -499,7 +466,7 @@ where
 		_storage_key: PrefixedStorageKey,
 		_keys: Vec<StorageKey>,
 	) -> FutureResult<ReadProof<Block::Hash>> {
-		Box::new(result(Err(client_err(ClientError::NotAvailableOnLightClient))))
+		async move { Err(client_err(ClientError::NotAvailableOnLightClient)) }.boxed()
 	}
 
 	fn storage_keys(
@@ -508,7 +475,7 @@ where
 		_storage_key: PrefixedStorageKey,
 		_prefix: StorageKey,
 	) -> FutureResult<Vec<StorageKey>> {
-		Box::new(result(Err(client_err(ClientError::NotAvailableOnLightClient))))
+		async move { Err(client_err(ClientError::NotAvailableOnLightClient)) }.boxed()
 	}
 
 	fn storage_keys_paged(
@@ -519,7 +486,7 @@ where
 		_count: u32,
 		_start_key: Option<StorageKey>,
 	) -> FutureResult<Vec<StorageKey>> {
-		Box::new(result(Err(client_err(ClientError::NotAvailableOnLightClient))))
+		async move { Err(client_err(ClientError::NotAvailableOnLightClient)) }.boxed()
 	}
 
 	fn storage(
@@ -560,7 +527,7 @@ where
 				}
 			});
 
-		Box::new(child_storage.boxed().compat())
+		child_storage.boxed()
 	}
 
 	fn storage_hash(
@@ -569,11 +536,9 @@ where
 		storage_key: PrefixedStorageKey,
 		key: StorageKey,
 	) -> FutureResult<Option<Block::Hash>> {
-		Box::new(ChildStateBackend::storage(self, block, storage_key, key).and_then(
-			|maybe_storage| {
-				result(Ok(maybe_storage.map(|storage| HashFor::<Block>::hash(&storage.0))))
-			},
-		))
+		let child_storage = ChildStateBackend::storage(self, block, storage_key, key);
+
+		async move { child_storage.await.map(|r| r.map(|s| HashFor::<Block>::hash(&s.0))) }.boxed()
 	}
 }
 
@@ -687,54 +652,50 @@ fn subscription_stream<
 	initial_request: InitialRequestFuture,
 	issue_request: IssueRequest,
 	compare_values: CompareValues,
-) -> impl Stream<Item = N, Error = ()>
+) -> impl Stream<Item = std::result::Result<N, ()>>
 where
 	Block: BlockT,
 	Requests: 'static + SharedRequests<Block::Hash, V>,
-	FutureBlocksStream: Stream<Item = Block::Hash, Error = ()>,
+	FutureBlocksStream: Stream<Item = Block::Hash>,
 	V: Send + 'static + Clone,
-	InitialRequestFuture:
-		std::future::Future<Output = Result<(Block::Hash, V), ()>> + Send + 'static,
+	InitialRequestFuture: Future<Output = Result<(Block::Hash, V), ()>> + Send + 'static,
 	IssueRequest: 'static + Fn(Block::Hash) -> IssueRequestFuture,
-	IssueRequestFuture: std::future::Future<Output = Result<V, Error>> + Send + 'static,
+	IssueRequestFuture: Future<Output = Result<V, Error>> + Send + 'static,
 	CompareValues: Fn(Block::Hash, Option<&V>, &V) -> Option<N>,
 {
 	// we need to send initial value first, then we'll only be sending if value has changed
 	let previous_value = Arc::new(Mutex::new(None));
 
 	// prepare 'stream' of initial values
-	let initial_value_stream = ignore_error(initial_request).boxed().compat().into_stream();
+	let initial_value_stream = initial_request.into_stream();
 
 	// prepare stream of future values
 	//
 	// we do not want to stop stream if single request fails
 	// (the warning should have been already issued by the request issuer)
-	let future_values_stream = future_blocks_stream.and_then(move |block| {
-		ignore_error(
+	let future_values_stream = future_blocks_stream
+		.then(move |block| {
 			maybe_share_remote_request::<Block, _, _, _, _>(
 				shared_requests.clone(),
 				block,
 				&issue_request,
 			)
-			.map(move |r| r.map(|v| (block, v))),
-		)
-		.boxed()
-		.compat()
-	});
+			.map(move |r| r.map(|v| (block, v)))
+		})
+		.filter(|r| ready(r.is_ok()));
 
 	// now let's return changed values for selected blocks
 	initial_value_stream
 		.chain(future_values_stream)
-		.filter_map(move |block_and_new_value| {
-			block_and_new_value.and_then(|(block, new_value)| {
-				let mut previous_value = previous_value.lock();
-				compare_values(block, previous_value.as_ref(), &new_value).map(
-					|notification_value| {
-						*previous_value = Some(new_value);
-						notification_value
-					},
-				)
-			})
+		.try_filter_map(move |(block, new_value)| {
+			let mut previous_value = previous_value.lock();
+			let res = compare_values(block, previous_value.as_ref(), &new_value).map(
+				|notification_value| {
+					*previous_value = Some(new_value);
+					notification_value
+				},
+			);
+			async move { Ok(res) }
 		})
 		.map_err(|_| ())
 }
@@ -789,24 +750,10 @@ where
 	})
 }
 
-/// Convert successful future result into Ok(Some(result)) and error into Ok(None),
-/// displaying warning.
-fn ignore_error<F, T>(future: F) -> impl std::future::Future<Output = Result<Option<T>, ()>>
-where
-	F: std::future::Future<Output = Result<T, ()>>,
-{
-	future.then(|result| {
-		ready(match result {
-			Ok(result) => Ok(Some(result)),
-			Err(()) => Ok(None),
-		})
-	})
-}
-
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use rpc::futures::stream::futures_ordered;
+	use futures::{executor, stream};
 	use sp_core::H256;
 	use substrate_test_runtime_client::runtime::Block;
 
@@ -814,7 +761,7 @@ mod tests {
 	fn subscription_stream_works() {
 		let stream = subscription_stream::<Block, _, _, _, _, _, _, _, _>(
 			SimpleSubscriptions::default(),
-			futures_ordered(vec![result(Ok(H256::from([2; 32]))), result(Ok(H256::from([3; 32])))]),
+			stream::iter(vec![H256::from([2; 32]), H256::from([3; 32])]),
 			ready(Ok((H256::from([1; 32]), 100))),
 			|block| match block[0] {
 				2 => ready(Ok(100)),
@@ -827,14 +774,14 @@ mod tests {
 			},
 		);
 
-		assert_eq!(stream.collect().wait(), Ok(vec![100, 200]));
+		assert_eq!(executor::block_on(stream.collect::<Vec<_>>()), vec![Ok(100), Ok(200)]);
 	}
 
 	#[test]
 	fn subscription_stream_ignores_failed_requests() {
 		let stream = subscription_stream::<Block, _, _, _, _, _, _, _, _>(
 			SimpleSubscriptions::default(),
-			futures_ordered(vec![result(Ok(H256::from([2; 32]))), result(Ok(H256::from([3; 32])))]),
+			stream::iter(vec![H256::from([2; 32]), H256::from([3; 32])]),
 			ready(Ok((H256::from([1; 32]), 100))),
 			|block| match block[0] {
 				2 => ready(Err(client_err(ClientError::NotAvailableOnLightClient))),
@@ -847,7 +794,7 @@ mod tests {
 			},
 		);
 
-		assert_eq!(stream.collect().wait(), Ok(vec![100, 200]));
+		assert_eq!(executor::block_on(stream.collect::<Vec<_>>()), vec![Ok(100), Ok(200)]);
 	}
 
 	#[test]
diff --git a/client/rpc/src/state/tests.rs b/client/rpc/src/state/tests.rs
index 6754a68296a6..ef13b37ce42f 100644
--- a/client/rpc/src/state/tests.rs
+++ b/client/rpc/src/state/tests.rs
@@ -18,11 +18,9 @@
 
 use self::error::Error;
 use super::{state_full::split_range, *};
-
 use crate::testing::TaskExecutor;
 use assert_matches::assert_matches;
-use futures::{compat::Future01CompatExt, executor};
-use futures01::stream::Stream;
+use futures::{executor, StreamExt};
 use sc_block_builder::BlockBuilderProvider;
 use sc_rpc_api::DenyUnsafe;
 use sp_consensus::BlockOrigin;
@@ -63,37 +61,33 @@ fn should_return_storage() {
 	let key = StorageKey(KEY.to_vec());
 
 	assert_eq!(
-		client
-			.storage(key.clone(), Some(genesis_hash).into())
-			.wait()
+		executor::block_on(client.storage(key.clone(), Some(genesis_hash).into()))
 			.map(|x| x.map(|x| x.0.len()))
 			.unwrap()
 			.unwrap() as usize,
 		VALUE.len(),
 	);
 	assert_matches!(
-		client
-			.storage_hash(key.clone(), Some(genesis_hash).into())
-			.wait()
+		executor::block_on(client.storage_hash(key.clone(), Some(genesis_hash).into()))
 			.map(|x| x.is_some()),
 		Ok(true)
 	);
 	assert_eq!(
-		client.storage_size(key.clone(), None).wait().unwrap().unwrap() as usize,
+		executor::block_on(client.storage_size(key.clone(), None)).unwrap().unwrap() as usize,
 		VALUE.len(),
 	);
 	assert_eq!(
-		client.storage_size(StorageKey(b":map".to_vec()), None).wait().unwrap().unwrap() as usize,
+		executor::block_on(client.storage_size(StorageKey(b":map".to_vec()), None))
+			.unwrap()
+			.unwrap() as usize,
 		2 + 3,
 	);
 	assert_eq!(
 		executor::block_on(
 			child
 				.storage(prefixed_storage_key(), key, Some(genesis_hash).into())
-				.map(|x| x.map(|x| x.0.len()))
-				.compat(),
+				.map(|x| x.map(|x| x.unwrap().0.len()))
 		)
-		.unwrap()
 		.unwrap() as usize,
 		CHILD_VALUE.len(),
 	);
@@ -114,21 +108,26 @@ fn should_return_child_storage() {
 	let key = StorageKey(b"key".to_vec());
 
 	assert_matches!(
-		child.storage(
+		executor::block_on(child.storage(
 			child_key.clone(),
 			key.clone(),
 			Some(genesis_hash).into(),
-		).wait(),
+		)),
 		Ok(Some(StorageData(ref d))) if d[0] == 42 && d.len() == 1
 	);
 	assert_matches!(
-		child
-			.storage_hash(child_key.clone(), key.clone(), Some(genesis_hash).into(),)
-			.wait()
-			.map(|x| x.is_some()),
+		executor::block_on(child.storage_hash(
+			child_key.clone(),
+			key.clone(),
+			Some(genesis_hash).into(),
+		))
+		.map(|x| x.is_some()),
 		Ok(true)
 	);
-	assert_matches!(child.storage_size(child_key.clone(), key.clone(), None).wait(), Ok(Some(1)));
+	assert_matches!(
+		executor::block_on(child.storage_size(child_key.clone(), key.clone(), None)),
+		Ok(Some(1))
+	);
 }
 
 #[test]
@@ -139,16 +138,18 @@ fn should_call_contract() {
 		new_full(client, SubscriptionManager::new(Arc::new(TaskExecutor)), DenyUnsafe::No, None);
 
 	assert_matches!(
-		client
-			.call("balanceOf".into(), Bytes(vec![1, 2, 3]), Some(genesis_hash).into())
-			.wait(),
+		executor::block_on(client.call(
+			"balanceOf".into(),
+			Bytes(vec![1, 2, 3]),
+			Some(genesis_hash).into()
+		)),
 		Err(Error::Client(_))
 	)
 }
 
 #[test]
 fn should_notify_about_storage_changes() {
-	let (subscriber, id, transport) = Subscriber::new_test("test");
+	let (subscriber, id, mut transport) = Subscriber::new_test("test");
 
 	{
 		let mut client = Arc::new(substrate_test_runtime_client::new());
@@ -162,7 +163,7 @@ fn should_notify_about_storage_changes() {
 		api.subscribe_storage(Default::default(), subscriber, None.into());
 
 		// assert id assigned
-		assert!(matches!(executor::block_on(id.compat()), Ok(Ok(SubscriptionId::String(_)))));
+		assert!(matches!(executor::block_on(id), Ok(Ok(SubscriptionId::String(_)))));
 
 		let mut builder = client.new_block(Default::default()).unwrap();
 		builder
@@ -177,16 +178,14 @@ fn should_notify_about_storage_changes() {
 		executor::block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	}
 
-	// assert notification sent to transport
-	let (notification, next) = executor::block_on(transport.into_future().compat()).unwrap();
-	assert!(notification.is_some());
-	// no more notifications on this channel
-	assert_eq!(executor::block_on(next.into_future().compat()).unwrap().0, None);
+	// Check notification sent to transport
+	executor::block_on((&mut transport).take(2).collect::<Vec<_>>());
+	assert!(executor::block_on(transport.next()).is_none());
 }
 
 #[test]
 fn should_send_initial_storage_changes_and_notifications() {
-	let (subscriber, id, transport) = Subscriber::new_test("test");
+	let (subscriber, id, mut transport) = Subscriber::new_test("test");
 
 	{
 		let mut client = Arc::new(substrate_test_runtime_client::new());
@@ -207,7 +206,7 @@ fn should_send_initial_storage_changes_and_notifications() {
 		);
 
 		// assert id assigned
-		assert!(matches!(executor::block_on(id.compat()), Ok(Ok(SubscriptionId::String(_)))));
+		assert!(matches!(executor::block_on(id), Ok(Ok(SubscriptionId::String(_)))));
 
 		let mut builder = client.new_block(Default::default()).unwrap();
 		builder
@@ -222,14 +221,9 @@ fn should_send_initial_storage_changes_and_notifications() {
 		executor::block_on(client.import(BlockOrigin::Own, block)).unwrap();
 	}
 
-	// assert initial values sent to transport
-	let (notification, next) = executor::block_on(transport.into_future().compat()).unwrap();
-	assert!(notification.is_some());
-	// assert notification sent to transport
-	let (notification, next) = executor::block_on(next.into_future().compat()).unwrap();
-	assert!(notification.is_some());
-	// no more notifications on this channel
-	assert_eq!(executor::block_on(next.into_future().compat()).unwrap().0, None);
+	// Check for the correct number of notifications
+	executor::block_on((&mut transport).take(2).collect::<Vec<_>>());
+	assert!(executor::block_on(transport.next()).is_none());
 }
 
 #[test]
@@ -299,7 +293,7 @@ fn should_query_storage() {
 		let keys = (1..6).map(|k| StorageKey(vec![k])).collect::<Vec<_>>();
 		let result = api.query_storage(keys.clone(), genesis_hash, Some(block1_hash).into());
 
-		assert_eq!(result.wait().unwrap(), expected);
+		assert_eq!(executor::block_on(result).unwrap(), expected);
 
 		// Query all changes
 		let result = api.query_storage(keys.clone(), genesis_hash, None.into());
@@ -312,18 +306,18 @@ fn should_query_storage() {
 				(StorageKey(vec![5]), Some(StorageData(vec![1]))),
 			],
 		});
-		assert_eq!(result.wait().unwrap(), expected);
+		assert_eq!(executor::block_on(result).unwrap(), expected);
 
 		// Query changes up to block2.
 		let result = api.query_storage(keys.clone(), genesis_hash, Some(block2_hash));
 
-		assert_eq!(result.wait().unwrap(), expected);
+		assert_eq!(executor::block_on(result).unwrap(), expected);
 
 		// Inverted range.
 		let result = api.query_storage(keys.clone(), block1_hash, Some(genesis_hash));
 
 		assert_eq!(
-			result.wait().map_err(|e| e.to_string()),
+			executor::block_on(result).map_err(|e| e.to_string()),
 			Err(Error::InvalidBlockRange {
 				from: format!("1 ({:?})", block1_hash),
 				to: format!("0 ({:?})", genesis_hash),
@@ -339,7 +333,7 @@ fn should_query_storage() {
 		let result = api.query_storage(keys.clone(), genesis_hash, Some(random_hash1));
 
 		assert_eq!(
-			result.wait().map_err(|e| e.to_string()),
+			executor::block_on(result).map_err(|e| e.to_string()),
 			Err(Error::InvalidBlockRange {
 				from: format!("{:?}", genesis_hash),
 				to: format!("{:?}", Some(random_hash1)),
@@ -355,7 +349,7 @@ fn should_query_storage() {
 		let result = api.query_storage(keys.clone(), random_hash1, Some(genesis_hash));
 
 		assert_eq!(
-			result.wait().map_err(|e| e.to_string()),
+			executor::block_on(result).map_err(|e| e.to_string()),
 			Err(Error::InvalidBlockRange {
 				from: format!("{:?}", random_hash1),
 				to: format!("{:?}", Some(genesis_hash)),
@@ -371,7 +365,7 @@ fn should_query_storage() {
 		let result = api.query_storage(keys.clone(), random_hash1, None);
 
 		assert_eq!(
-			result.wait().map_err(|e| e.to_string()),
+			executor::block_on(result).map_err(|e| e.to_string()),
 			Err(Error::InvalidBlockRange {
 				from: format!("{:?}", random_hash1),
 				to: format!("{:?}", Some(block2_hash)), // Best block hash.
@@ -387,7 +381,7 @@ fn should_query_storage() {
 		let result = api.query_storage(keys.clone(), random_hash1, Some(random_hash2));
 
 		assert_eq!(
-			result.wait().map_err(|e| e.to_string()),
+			executor::block_on(result).map_err(|e| e.to_string()),
 			Err(Error::InvalidBlockRange {
 				from: format!("{:?}", random_hash1), // First hash not found.
 				to: format!("{:?}", Some(random_hash2)),
@@ -403,7 +397,7 @@ fn should_query_storage() {
 		let result = api.query_storage_at(keys.clone(), Some(block1_hash));
 
 		assert_eq!(
-			result.wait().unwrap(),
+			executor::block_on(result).unwrap(),
 			vec![StorageChangeSet {
 				block: block1_hash,
 				changes: vec![
@@ -454,7 +448,7 @@ fn should_return_runtime_version() {
 		[\"0xf78b278be53f454c\",2],[\"0xab3c0572291feb8b\",1],[\"0xbc9d89904f5b923f\",1]],\
 		\"transactionVersion\":1}";
 
-	let runtime_version = api.runtime_version(None.into()).wait().unwrap();
+	let runtime_version = executor::block_on(api.runtime_version(None.into())).unwrap();
 	let serialized = serde_json::to_string(&runtime_version).unwrap();
 	assert_eq!(serialized, result);
 
@@ -464,7 +458,7 @@ fn should_return_runtime_version() {
 
 #[test]
 fn should_notify_on_runtime_version_initially() {
-	let (subscriber, id, transport) = Subscriber::new_test("test");
+	let (subscriber, id, mut transport) = Subscriber::new_test("test");
 
 	{
 		let client = Arc::new(substrate_test_runtime_client::new());
@@ -478,14 +472,12 @@ fn should_notify_on_runtime_version_initially() {
 		api.subscribe_runtime_version(Default::default(), subscriber);
 
 		// assert id assigned
-		assert!(matches!(executor::block_on(id.compat()), Ok(Ok(SubscriptionId::String(_)))));
+		assert!(matches!(executor::block_on(id), Ok(Ok(SubscriptionId::String(_)))));
 	}
 
 	// assert initial version sent.
-	let (notification, next) = executor::block_on(transport.into_future().compat()).unwrap();
-	assert!(notification.is_some());
-	// no more notifications on this channel
-	assert_eq!(executor::block_on(next.into_future().compat()).unwrap().0, None);
+	executor::block_on((&mut transport).take(1).collect::<Vec<_>>());
+	assert!(executor::block_on(transport.next()).is_none());
 }
 
 #[test]
diff --git a/client/rpc/src/system/mod.rs b/client/rpc/src/system/mod.rs
index 08258640ad7a..798f3f035ad5 100644
--- a/client/rpc/src/system/mod.rs
+++ b/client/rpc/src/system/mod.rs
@@ -18,28 +18,27 @@
 
 //! Substrate system API.
 
-#[cfg(test)]
-mod tests;
-
-use futures::{channel::oneshot, compat::Compat, future::BoxFuture, FutureExt, TryFutureExt};
+use self::error::Result;
+use futures::{channel::oneshot, FutureExt};
 use sc_rpc_api::{DenyUnsafe, Receiver};
 use sc_tracing::logging;
 use sp_runtime::traits::{self, Header as HeaderT};
 use sp_utils::mpsc::TracingUnboundedSender;
 
-use self::error::Result;
-
 pub use self::{
 	gen_client::Client as SystemClient,
 	helpers::{Health, NodeRole, PeerInfo, SyncState, SystemInfo},
 };
 pub use sc_rpc_api::system::*;
 
+#[cfg(test)]
+mod tests;
+
 /// Early exit for RPCs that require `--rpc-methods=Unsafe` to be enabled
 macro_rules! bail_if_unsafe {
 	($value: expr) => {
 		if let Err(err) = $value.check_if_safe() {
-			return async move { Err(err.into()) }.boxed().compat()
+			return async move { Err(err.into()) }.boxed()
 		}
 	};
 }
@@ -114,51 +113,42 @@ impl<B: traits::Block> SystemApi<B::Hash, <B::Header as HeaderT>::Number> for Sy
 	fn system_health(&self) -> Receiver<Health> {
 		let (tx, rx) = oneshot::channel();
 		let _ = self.send_back.unbounded_send(Request::Health(tx));
-		Receiver(Compat::new(rx))
+		Receiver(rx)
 	}
 
 	fn system_local_peer_id(&self) -> Receiver<String> {
 		let (tx, rx) = oneshot::channel();
 		let _ = self.send_back.unbounded_send(Request::LocalPeerId(tx));
-		Receiver(Compat::new(rx))
+		Receiver(rx)
 	}
 
 	fn system_local_listen_addresses(&self) -> Receiver<Vec<String>> {
 		let (tx, rx) = oneshot::channel();
 		let _ = self.send_back.unbounded_send(Request::LocalListenAddresses(tx));
-		Receiver(Compat::new(rx))
+		Receiver(rx)
 	}
 
 	fn system_peers(
 		&self,
-	) -> Compat<
-		BoxFuture<'static, rpc::Result<Vec<PeerInfo<B::Hash, <B::Header as HeaderT>::Number>>>>,
-	> {
+	) -> rpc::BoxFuture<rpc::Result<Vec<PeerInfo<B::Hash, <B::Header as HeaderT>::Number>>>> {
 		bail_if_unsafe!(self.deny_unsafe);
 
 		let (tx, rx) = oneshot::channel();
 		let _ = self.send_back.unbounded_send(Request::Peers(tx));
 
-		async move { rx.await.map_err(|_| rpc::Error::internal_error()) }
-			.boxed()
-			.compat()
+		async move { rx.await.map_err(|_| rpc::Error::internal_error()) }.boxed()
 	}
 
-	fn system_network_state(&self) -> Compat<BoxFuture<'static, rpc::Result<rpc::Value>>> {
+	fn system_network_state(&self) -> rpc::BoxFuture<rpc::Result<rpc::Value>> {
 		bail_if_unsafe!(self.deny_unsafe);
 
 		let (tx, rx) = oneshot::channel();
 		let _ = self.send_back.unbounded_send(Request::NetworkState(tx));
 
-		async move { rx.await.map_err(|_| rpc::Error::internal_error()) }
-			.boxed()
-			.compat()
+		async move { rx.await.map_err(|_| rpc::Error::internal_error()) }.boxed()
 	}
 
-	fn system_add_reserved_peer(
-		&self,
-		peer: String,
-	) -> Compat<BoxFuture<'static, std::result::Result<(), rpc::Error>>> {
+	fn system_add_reserved_peer(&self, peer: String) -> rpc::BoxFuture<rpc::Result<()>> {
 		bail_if_unsafe!(self.deny_unsafe);
 
 		let (tx, rx) = oneshot::channel();
@@ -171,13 +161,9 @@ impl<B: traits::Block> SystemApi<B::Hash, <B::Header as HeaderT>::Number> for Sy
 			}
 		}
 		.boxed()
-		.compat()
 	}
 
-	fn system_remove_reserved_peer(
-		&self,
-		peer: String,
-	) -> Compat<BoxFuture<'static, std::result::Result<(), rpc::Error>>> {
+	fn system_remove_reserved_peer(&self, peer: String) -> rpc::BoxFuture<rpc::Result<()>> {
 		bail_if_unsafe!(self.deny_unsafe);
 
 		let (tx, rx) = oneshot::channel();
@@ -190,34 +176,33 @@ impl<B: traits::Block> SystemApi<B::Hash, <B::Header as HeaderT>::Number> for Sy
 			}
 		}
 		.boxed()
-		.compat()
 	}
 
 	fn system_reserved_peers(&self) -> Receiver<Vec<String>> {
 		let (tx, rx) = oneshot::channel();
 		let _ = self.send_back.unbounded_send(Request::NetworkReservedPeers(tx));
-		Receiver(Compat::new(rx))
+		Receiver(rx)
 	}
 
 	fn system_node_roles(&self) -> Receiver<Vec<NodeRole>> {
 		let (tx, rx) = oneshot::channel();
 		let _ = self.send_back.unbounded_send(Request::NodeRoles(tx));
-		Receiver(Compat::new(rx))
+		Receiver(rx)
 	}
 
 	fn system_sync_state(&self) -> Receiver<SyncState<<B::Header as HeaderT>::Number>> {
 		let (tx, rx) = oneshot::channel();
 		let _ = self.send_back.unbounded_send(Request::SyncState(tx));
-		Receiver(Compat::new(rx))
+		Receiver(rx)
 	}
 
-	fn system_add_log_filter(&self, directives: String) -> std::result::Result<(), rpc::Error> {
+	fn system_add_log_filter(&self, directives: String) -> rpc::Result<()> {
 		self.deny_unsafe.check_if_safe()?;
 		logging::add_directives(&directives);
 		logging::reload_filter().map_err(|_e| rpc::Error::internal_error())
 	}
 
-	fn system_reset_log_filter(&self) -> std::result::Result<(), rpc::Error> {
+	fn system_reset_log_filter(&self) -> rpc::Result<()> {
 		self.deny_unsafe.check_if_safe()?;
 		logging::reset_log_filter().map_err(|_e| rpc::Error::internal_error())
 	}
diff --git a/client/rpc/src/system/tests.rs b/client/rpc/src/system/tests.rs
index a29859e3e9f9..15b53c3ff462 100644
--- a/client/rpc/src/system/tests.rs
+++ b/client/rpc/src/system/tests.rs
@@ -19,7 +19,7 @@
 use super::*;
 
 use assert_matches::assert_matches;
-use futures::prelude::*;
+use futures::{executor, prelude::*};
 use sc_network::{self, config::Role, PeerId};
 use sp_utils::mpsc::tracing_unbounded;
 use std::{
@@ -139,8 +139,7 @@ fn api<T: Into<Option<Status>>>(sync: T) -> System<Block> {
 }
 
 fn wait_receiver<T>(rx: Receiver<T>) -> T {
-	let mut runtime = tokio::runtime::current_thread::Runtime::new().unwrap();
-	runtime.block_on(rx).unwrap()
+	futures::executor::block_on(rx).unwrap()
 }
 
 #[test]
@@ -223,12 +222,10 @@ fn system_local_listen_addresses_works() {
 
 #[test]
 fn system_peers() {
-	let mut runtime = tokio::runtime::current_thread::Runtime::new().unwrap();
-
 	let peer_id = PeerId::random();
 	let req = api(Status { peer_id: peer_id.clone(), peers: 1, is_syncing: false, is_dev: true })
 		.system_peers();
-	let res = runtime.block_on(req).unwrap();
+	let res = executor::block_on(req).unwrap();
 
 	assert_eq!(
 		res,
@@ -243,9 +240,8 @@ fn system_peers() {
 
 #[test]
 fn system_network_state() {
-	let mut runtime = tokio::runtime::current_thread::Runtime::new().unwrap();
 	let req = api(None).system_network_state();
-	let res = runtime.block_on(req).unwrap();
+	let res = executor::block_on(req).unwrap();
 
 	assert_eq!(
 		serde_json::from_value::<sc_network::network_state::NetworkState>(res).unwrap(),
@@ -278,12 +274,11 @@ fn system_network_add_reserved() {
 	let good_peer_id =
 		"/ip4/198.51.100.19/tcp/30333/p2p/QmSk5HQbn6LhUwDiNMseVUjuRYhEtYj4aUZ6WfWoGURpdV";
 	let bad_peer_id = "/ip4/198.51.100.19/tcp/30333";
-	let mut runtime = tokio::runtime::current_thread::Runtime::new().unwrap();
 
 	let good_fut = api(None).system_add_reserved_peer(good_peer_id.into());
 	let bad_fut = api(None).system_add_reserved_peer(bad_peer_id.into());
-	assert_eq!(runtime.block_on(good_fut), Ok(()));
-	assert!(runtime.block_on(bad_fut).is_err());
+	assert_eq!(executor::block_on(good_fut), Ok(()));
+	assert!(executor::block_on(bad_fut).is_err());
 }
 
 #[test]
@@ -291,12 +286,11 @@ fn system_network_remove_reserved() {
 	let good_peer_id = "QmSk5HQbn6LhUwDiNMseVUjuRYhEtYj4aUZ6WfWoGURpdV";
 	let bad_peer_id =
 		"/ip4/198.51.100.19/tcp/30333/p2p/QmSk5HQbn6LhUwDiNMseVUjuRYhEtYj4aUZ6WfWoGURpdV";
-	let mut runtime = tokio::runtime::current_thread::Runtime::new().unwrap();
 
 	let good_fut = api(None).system_remove_reserved_peer(good_peer_id.into());
 	let bad_fut = api(None).system_remove_reserved_peer(bad_peer_id.into());
-	assert_eq!(runtime.block_on(good_fut), Ok(()));
-	assert!(runtime.block_on(bad_fut).is_err());
+	assert_eq!(executor::block_on(good_fut), Ok(()));
+	assert!(executor::block_on(bad_fut).is_err());
 }
 
 #[test]
diff --git a/client/rpc/src/testing.rs b/client/rpc/src/testing.rs
index e6b30ecdb42b..23071ba10e0d 100644
--- a/client/rpc/src/testing.rs
+++ b/client/rpc/src/testing.rs
@@ -18,8 +18,10 @@
 
 //! Testing utils used by the RPC tests.
 
-use futures::{compat::Future01CompatExt, executor, FutureExt};
-use rpc::futures::future as future01;
+use futures::{
+	executor,
+	task::{FutureObj, Spawn, SpawnError},
+};
 
 // Executor shared by all tests.
 //
@@ -30,16 +32,15 @@ lazy_static::lazy_static! {
 		.expect("Failed to create thread pool executor for tests");
 }
 
-type Boxed01Future01 = Box<dyn future01::Future<Item = (), Error = ()> + Send + 'static>;
-
 /// Executor for use in testing
 pub struct TaskExecutor;
-impl future01::Executor<Boxed01Future01> for TaskExecutor {
-	fn execute(
-		&self,
-		future: Boxed01Future01,
-	) -> std::result::Result<(), future01::ExecuteError<Boxed01Future01>> {
-		EXECUTOR.spawn_ok(future.compat().map(drop));
+impl Spawn for TaskExecutor {
+	fn spawn_obj(&self, future: FutureObj<'static, ()>) -> Result<(), SpawnError> {
+		EXECUTOR.spawn_ok(future);
+		Ok(())
+	}
+
+	fn status(&self) -> Result<(), SpawnError> {
 		Ok(())
 	}
 }
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index 17aa41536388..c5b7fc7c1e09 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -25,10 +25,9 @@ test-helpers = []
 
 [dependencies]
 thiserror = "1.0.21"
-futures01 = { package = "futures", version = "0.1.29" }
-futures = { version = "0.3.4", features = ["compat"] }
-jsonrpc-pubsub = "15.1"
-jsonrpc-core = "15.1"
+futures = "0.3.16"
+jsonrpc-pubsub = "18.0"
+jsonrpc-core = "18.0"
 rand = "0.7.3"
 parking_lot = "0.11.1"
 lazy_static = "1.4.0"
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index f9b68c4ae396..fc9fbad1ef47 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -561,6 +561,8 @@ where
 		+ sp_session::SessionKeys<TBl>
 		+ sp_api::ApiExt<TBl, StateBackend = TBackend::State>,
 	TBl: BlockT,
+	TBl::Hash: Unpin,
+	TBl::Header: Unpin,
 	TBackend: 'static + sc_client_api::backend::Backend<TBl> + Send,
 	TExPool: MaintainedTransactionPool<Block = TBl, Hash = <TBl as BlockT>::Hash>
 		+ MallocSizeOfWasm
@@ -762,6 +764,8 @@ where
 	TBackend: sc_client_api::backend::Backend<TBl> + 'static,
 	TRpc: sc_rpc::RpcExtension<sc_rpc::Metadata>,
 	<TCl as ProvideRuntimeApi<TBl>>::Api: sp_session::SessionKeys<TBl> + sp_api::Metadata<TBl>,
+	TBl::Hash: Unpin,
+	TBl::Header: Unpin,
 {
 	use sc_rpc::{author, chain, offchain, state, system};
 
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index e9a6d2160676..24506a977e1f 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -37,7 +37,7 @@ mod task_manager;
 use std::{collections::HashMap, io, net::SocketAddr, pin::Pin, task::Poll};
 
 use codec::{Decode, Encode};
-use futures::{compat::*, stream, Future, FutureExt, Stream, StreamExt};
+use futures::{stream, Future, FutureExt, Stream, StreamExt};
 use log::{debug, error, warn};
 use parity_util_mem::MallocSizeOf;
 use sc_network::PeerId;
@@ -112,11 +112,7 @@ impl RpcHandlers {
 		mem: &RpcSession,
 		request: &str,
 	) -> Pin<Box<dyn Future<Output = Option<String>> + Send>> {
-		self.0
-			.handle_request(request, mem.metadata.clone())
-			.compat()
-			.map(|res| res.expect("this should never fail"))
-			.boxed()
+		self.0.handle_request(request, mem.metadata.clone()).boxed()
 	}
 
 	/// Provides access to the underlying `MetaIoHandler`
@@ -354,7 +350,7 @@ fn start_rpc_servers<
 	config: &Configuration,
 	mut gen_handler: H,
 	rpc_metrics: sc_rpc_server::RpcMetrics,
-) -> Result<Box<dyn std::any::Any + Send + Sync>, Error> {
+) -> Result<Box<dyn std::any::Any + Send>, Error> {
 	fn maybe_start_server<T, F>(
 		address: Option<SocketAddr>,
 		mut start: F,
@@ -388,16 +384,20 @@ fn start_rpc_servers<
 	}
 
 	Ok(Box::new((
-		config.rpc_ipc.as_ref().map(|path| {
-			sc_rpc_server::start_ipc(
-				&*path,
-				gen_handler(
-					sc_rpc::DenyUnsafe::No,
-					sc_rpc_server::RpcMiddleware::new(rpc_metrics.clone(), "ipc"),
-				)?,
-			)
-			.map_err(Error::from)
-		}),
+		config
+			.rpc_ipc
+			.as_ref()
+			.map(|path| {
+				sc_rpc_server::start_ipc(
+					&*path,
+					gen_handler(
+						sc_rpc::DenyUnsafe::No,
+						sc_rpc_server::RpcMiddleware::new(rpc_metrics.clone(), "ipc"),
+					)?,
+				)
+				.map_err(Error::from)
+			})
+			.transpose()?,
 		maybe_start_server(config.rpc_http, |address| {
 			sc_rpc_server::start_http(
 				address,
@@ -441,7 +441,7 @@ fn start_rpc_servers<
 	_: &Configuration,
 	_: H,
 	_: sc_rpc_server::RpcMetrics,
-) -> Result<Box<dyn std::any::Any + Send + Sync>, error::Error> {
+) -> Result<Box<dyn std::any::Any + Send>, error::Error> {
 	Ok(Box::new(()))
 }
 
@@ -459,7 +459,7 @@ impl RpcSession {
 	/// messages.
 	///
 	/// The `RpcSession` must be kept alive in order to receive messages on the sender.
-	pub fn new(sender: futures01::sync::mpsc::Sender<String>) -> RpcSession {
+	pub fn new(sender: futures::channel::mpsc::UnboundedSender<String>) -> RpcSession {
 		RpcSession { metadata: sender.into() }
 	}
 }
diff --git a/client/service/src/task_manager/mod.rs b/client/service/src/task_manager/mod.rs
index d759798f744b..ae89b785870f 100644
--- a/client/service/src/task_manager/mod.rs
+++ b/client/service/src/task_manager/mod.rs
@@ -232,7 +232,7 @@ pub struct TaskManager {
 	/// A receiver for spawned essential-tasks concluding.
 	essential_failed_rx: TracingUnboundedReceiver<()>,
 	/// Things to keep alive until the task manager is dropped.
-	keep_alive: Box<dyn std::any::Any + Send + Sync>,
+	keep_alive: Box<dyn std::any::Any + Send>,
 	/// A sender to a stream of background tasks. This is used for the completion future.
 	task_notifier: TracingUnboundedSender<JoinFuture>,
 	/// This future will complete when all the tasks are joined and the stream is closed.
@@ -359,7 +359,7 @@ impl TaskManager {
 	}
 
 	/// Set what the task manager should keep alive, can be called multiple times.
-	pub fn keep_alive<T: 'static + Send + Sync>(&mut self, to_keep_alive: T) {
+	pub fn keep_alive<T: 'static + Send>(&mut self, to_keep_alive: T) {
 		// allows this fn to safely called multiple times.
 		use std::mem;
 		let old = mem::replace(&mut self.keep_alive, Box::new(()));
diff --git a/client/service/test/Cargo.toml b/client/service/test/Cargo.toml
index d0081b324911..e64bb30045bb 100644
--- a/client/service/test/Cargo.toml
+++ b/client/service/test/Cargo.toml
@@ -27,7 +27,7 @@ sp-externalities = { version = "0.10.0-dev", path = "../../../primitives/externa
 sp-trie = { version = "4.0.0-dev", path = "../../../primitives/trie" }
 sp-storage = { version = "4.0.0-dev", path = "../../../primitives/storage" }
 sc-client-db = { version = "0.10.0-dev", default-features = false, path = "../../db" }
-futures = { version = "0.3.1", features = ["compat"] }
+futures = "0.3.16"
 sc-service = { version = "0.10.0-dev", features = ["test-helpers"], path = "../../service" }
 sc-network = { version = "0.10.0-dev", path = "../../network" }
 sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
diff --git a/client/sync-state-rpc/Cargo.toml b/client/sync-state-rpc/Cargo.toml
index a96b80ff930d..9da9944a5454 100644
--- a/client/sync-state-rpc/Cargo.toml
+++ b/client/sync-state-rpc/Cargo.toml
@@ -14,9 +14,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 thiserror = "1.0.21"
-jsonrpc-core = "15.0"
-jsonrpc-core-client = "15.0"
-jsonrpc-derive = "15.0"
+jsonrpc-core = "18.0.0"
+jsonrpc-core-client = "18.0.0"
+jsonrpc-derive = "18.0.0"
 sc-chain-spec = { version = "4.0.0-dev", path = "../chain-spec" }
 sc-client-api = { version = "4.0.0-dev", path = "../api" }
 sc-consensus-babe = { version = "0.10.0-dev", path = "../consensus/babe" }
diff --git a/client/transaction-pool/Cargo.toml b/client/transaction-pool/Cargo.toml
index ef50d17268c9..931043da09e3 100644
--- a/client/transaction-pool/Cargo.toml
+++ b/client/transaction-pool/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 thiserror = "1.0.21"
-futures = { version = "0.3.1", features = ["compat"] }
+futures = "0.3.16"
 intervalier = "0.4.0"
 log = "0.4.8"
 parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
diff --git a/client/transaction-pool/api/src/lib.rs b/client/transaction-pool/api/src/lib.rs
index e861e6e0424d..4a083ad2e15a 100644
--- a/client/transaction-pool/api/src/lib.rs
+++ b/client/transaction-pool/api/src/lib.rs
@@ -126,7 +126,7 @@ pub enum TransactionStatus<Hash, BlockHash> {
 
 /// The stream of transaction events.
 pub type TransactionStatusStream<Hash, BlockHash> =
-	dyn Stream<Item = TransactionStatus<Hash, BlockHash>> + Send + Unpin;
+	dyn Stream<Item = TransactionStatus<Hash, BlockHash>> + Send;
 
 /// The import notification event stream.
 pub type ImportNotificationStream<H> = futures::channel::mpsc::Receiver<H>;
@@ -210,7 +210,7 @@ pub trait TransactionPool: Send + Sync {
 		at: &BlockId<Self::Block>,
 		source: TransactionSource,
 		xt: TransactionFor<Self>,
-	) -> PoolFuture<Box<TransactionStatusStreamFor<Self>>, Self::Error>;
+	) -> PoolFuture<Pin<Box<TransactionStatusStreamFor<Self>>>, Self::Error>;
 
 	// *** Block production / Networking
 	/// Get an iterator for ready transactions ordered by priority.
diff --git a/client/transaction-pool/src/lib.rs b/client/transaction-pool/src/lib.rs
index 302c7a1b59b6..c35bba8d2a98 100644
--- a/client/transaction-pool/src/lib.rs
+++ b/client/transaction-pool/src/lib.rs
@@ -290,16 +290,16 @@ where
 		at: &BlockId<Self::Block>,
 		source: TransactionSource,
 		xt: TransactionFor<Self>,
-	) -> PoolFuture<Box<TransactionStatusStreamFor<Self>>, Self::Error> {
+	) -> PoolFuture<Pin<Box<TransactionStatusStreamFor<Self>>>, Self::Error> {
 		let at = *at;
 		let pool = self.pool.clone();
 
 		self.metrics.report(|metrics| metrics.submitted_transactions.inc());
 
 		async move {
-			pool.submit_and_watch(&at, source, xt)
-				.map(|result| result.map(|watcher| Box::new(watcher.into_stream()) as _))
-				.await
+			let watcher = pool.submit_and_watch(&at, source, xt).await?;
+
+			Ok(watcher.into_stream().boxed())
 		}
 		.boxed()
 	}
diff --git a/frame/contracts/rpc/Cargo.toml b/frame/contracts/rpc/Cargo.toml
index 32aa9e21a1a0..b73039ba7191 100644
--- a/frame/contracts/rpc/Cargo.toml
+++ b/frame/contracts/rpc/Cargo.toml
@@ -14,9 +14,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2" }
-jsonrpc-core = "15"
-jsonrpc-core-client = "15"
-jsonrpc-derive = "15"
+jsonrpc-core = "18.0.0"
+jsonrpc-core-client = "18.0.0"
+jsonrpc-derive = "18.0.0"
 serde = { version = "1", features = ["derive"] }
 
 # Substrate Dependencies
diff --git a/frame/merkle-mountain-range/rpc/Cargo.toml b/frame/merkle-mountain-range/rpc/Cargo.toml
index 637abe60c2e4..fe2d9cfc552b 100644
--- a/frame/merkle-mountain-range/rpc/Cargo.toml
+++ b/frame/merkle-mountain-range/rpc/Cargo.toml
@@ -14,9 +14,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-jsonrpc-core = "15.1.0"
-jsonrpc-core-client = "15.1.0"
-jsonrpc-derive = "15.1.0"
+jsonrpc-core = "18.0.0"
+jsonrpc-core-client = "18.0.0"
+jsonrpc-derive = "18.0.0"
 serde = { version = "1.0.126", features = ["derive"] }
 
 sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
diff --git a/frame/transaction-payment/rpc/Cargo.toml b/frame/transaction-payment/rpc/Cargo.toml
index 785a7c9c96ab..3858c41a3876 100644
--- a/frame/transaction-payment/rpc/Cargo.toml
+++ b/frame/transaction-payment/rpc/Cargo.toml
@@ -14,9 +14,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-jsonrpc-core = "15.1.0"
-jsonrpc-core-client = "15.1.0"
-jsonrpc-derive = "15.1.0"
+jsonrpc-core = "18.0.0"
+jsonrpc-core-client = "18.0.0"
+jsonrpc-derive = "18.0.0"
 
 sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml
index e59d0556522f..d828e418d906 100644
--- a/test-utils/Cargo.toml
+++ b/test-utils/Cargo.toml
@@ -12,7 +12,7 @@ description = "Substrate test utilities"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-futures = { version = "0.3.1", features = ["compat"] }
+futures = "0.3.16"
 substrate-test-utils-derive = { version = "0.10.0-dev", path = "./derive" }
 tokio = { version = "0.2.13", features = ["macros"] }
 
diff --git a/test-utils/client/Cargo.toml b/test-utils/client/Cargo.toml
index a647aeaedc4f..425cac7eb776 100644
--- a/test-utils/client/Cargo.toml
+++ b/test-utils/client/Cargo.toml
@@ -13,8 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-futures = "0.3.9"
-futures01 = { package = "futures", version = "0.1.29" }
+futures = "0.3.16"
 hash-db = "0.15.2"
 hex = "0.4"
 serde = "1.0.126"
diff --git a/test-utils/client/src/lib.rs b/test-utils/client/src/lib.rs
index a8d7818ace6d..3eb7eb0b7174 100644
--- a/test-utils/client/src/lib.rs
+++ b/test-utils/client/src/lib.rs
@@ -307,7 +307,7 @@ pub struct RpcTransactionOutput {
 	/// The session object.
 	pub session: RpcSession,
 	/// An async receiver if data will be returned via a callback.
-	pub receiver: futures01::sync::mpsc::Receiver<String>,
+	pub receiver: futures::channel::mpsc::UnboundedReceiver<String>,
 }
 
 impl std::fmt::Debug for RpcTransactionOutput {
@@ -347,7 +347,7 @@ impl RpcHandlersExt for RpcHandlers {
 		&self,
 		extrinsic: OpaqueExtrinsic,
 	) -> Pin<Box<dyn Future<Output = Result<RpcTransactionOutput, RpcTransactionError>> + Send>> {
-		let (tx, rx) = futures01::sync::mpsc::channel(0);
+		let (tx, rx) = futures::channel::mpsc::unbounded();
 		let mem = RpcSession::new(tx.into());
 		Box::pin(
 			self.rpc_query(
@@ -370,7 +370,7 @@ impl RpcHandlersExt for RpcHandlers {
 pub(crate) fn parse_rpc_result(
 	result: Option<String>,
 	session: RpcSession,
-	receiver: futures01::sync::mpsc::Receiver<String>,
+	receiver: futures::channel::mpsc::UnboundedReceiver<String>,
 ) -> Result<RpcTransactionOutput, RpcTransactionError> {
 	if let Some(ref result) = result {
 		let json: serde_json::Value =
@@ -426,8 +426,9 @@ where
 mod tests {
 	use sc_service::RpcSession;
 
-	fn create_session_and_receiver() -> (RpcSession, futures01::sync::mpsc::Receiver<String>) {
-		let (tx, rx) = futures01::sync::mpsc::channel(0);
+	fn create_session_and_receiver(
+	) -> (RpcSession, futures::channel::mpsc::UnboundedReceiver<String>) {
+		let (tx, rx) = futures::channel::mpsc::unbounded();
 		let mem = RpcSession::new(tx.into());
 
 		(mem, rx)
diff --git a/test-utils/runtime/transaction-pool/Cargo.toml b/test-utils/runtime/transaction-pool/Cargo.toml
index 420d052829aa..09839ebae6ff 100644
--- a/test-utils/runtime/transaction-pool/Cargo.toml
+++ b/test-utils/runtime/transaction-pool/Cargo.toml
@@ -19,5 +19,5 @@ sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain"
 sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
 sc-transaction-pool = { version = "4.0.0-dev", path = "../../../client/transaction-pool", features = ["test-helpers"] }
 sc-transaction-pool-api = { version = "4.0.0-dev", path = "../../../client/transaction-pool/api" }
-futures = { version = "0.3.1", features = ["compat"] }
+futures = "0.3.16"
 derive_more = "0.99.2"
diff --git a/test-utils/test-runner/Cargo.toml b/test-utils/test-runner/Cargo.toml
index 06454ee24eae..dc443d5d8d51 100644
--- a/test-utils/test-runner/Cargo.toml
+++ b/test-utils/test-runner/Cargo.toml
@@ -48,8 +48,8 @@ sp-runtime-interface = { path = "../../primitives/runtime-interface" }
 frame-system = { path = "../../frame/system" }
 
 log = "0.4.8"
-futures = { package = "futures", version = "0.3", features = ["compat"] }
+futures = "0.3.16"
 tokio = { version = "0.2", features = ["signal"] }
 # Calling RPC
-jsonrpc-core = "15.1"
+jsonrpc-core = "18.0"
 num-traits = "0.2.14"
diff --git a/test-utils/test-runner/src/client.rs b/test-utils/test-runner/src/client.rs
index 17117e0b5ee6..80b11e7bff7f 100644
--- a/test-utils/test-runner/src/client.rs
+++ b/test-utils/test-runner/src/client.rs
@@ -94,7 +94,8 @@ where
 		+ ApiExt<T::Block, StateBackend = <TFullBackend<T::Block> as Backend<T::Block>>::State>
 		+ GrandpaApi<T::Block>,
 	<T::Runtime as frame_system::Config>::Call: From<frame_system::Call<T::Runtime>>,
-	<<T as ChainInfo>::Block as BlockT>::Hash: FromStr,
+	<<T as ChainInfo>::Block as BlockT>::Hash: FromStr + Unpin,
+	<<T as ChainInfo>::Block as BlockT>::Header: Unpin,
 	<<<T as ChainInfo>::Block as BlockT>::Header as Header>::Number:
 		num_traits::cast::AsPrimitive<usize>,
 {
diff --git a/utils/browser/Cargo.toml b/utils/browser/Cargo.toml
index c1f4c20c3645..3522432001a0 100644
--- a/utils/browser/Cargo.toml
+++ b/utils/browser/Cargo.toml
@@ -13,8 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-futures = { version = "0.3", features = ["compat"] }
-futures01 = { package = "futures", version = "0.1.29" }
+futures = "0.3.16"
 log = "0.4.8"
 libp2p-wasm-ext = { version = "0.28.1", features = ["websocket"] }
 console_error_panic_hook = "0.1.6"
diff --git a/utils/browser/src/lib.rs b/utils/browser/src/lib.rs
index 6cd35f22bffb..49f5c7ad4bd1 100644
--- a/utils/browser/src/lib.rs
+++ b/utils/browser/src/lib.rs
@@ -17,11 +17,9 @@
 
 use futures::{
 	channel::{mpsc, oneshot},
-	compat::*,
-	future::{ok, ready, select},
+	future::{ready, select},
 	prelude::*,
 };
-use futures01::sync::mpsc as mpsc01;
 use libp2p_wasm_ext::{ffi, ExtTransport};
 use log::{debug, info};
 use sc_chain_spec::Extension;
@@ -166,7 +164,7 @@ impl Client {
 	/// Allows starting an RPC request. Returns a `Promise` containing the result of that request.
 	#[wasm_bindgen(js_name = "rpcSend")]
 	pub fn rpc_send(&mut self, rpc: &str) -> js_sys::Promise {
-		let rpc_session = RpcSession::new(mpsc01::channel(1).0);
+		let rpc_session = RpcSession::new(mpsc::unbounded().0);
 		let (tx, rx) = oneshot::channel();
 		let _ = self.rpc_send_tx.unbounded_send(RpcMessage {
 			rpc_json: rpc.to_owned(),
@@ -184,7 +182,7 @@ impl Client {
 	/// Subscribes to an RPC pubsub endpoint.
 	#[wasm_bindgen(js_name = "rpcSubscribe")]
 	pub fn rpc_subscribe(&mut self, rpc: &str, callback: js_sys::Function) {
-		let (tx, rx) = mpsc01::channel(4);
+		let (tx, rx) = mpsc::unbounded();
 		let rpc_session = RpcSession::new(tx);
 		let (fut_tx, fut_rx) = oneshot::channel();
 		let _ = self.rpc_send_tx.unbounded_send(RpcMessage {
@@ -200,10 +198,9 @@ impl Client {
 
 		wasm_bindgen_futures::spawn_local(async move {
 			let _ = rx
-				.compat()
-				.try_for_each(|s| {
+				.for_each(|s| {
 					let _ = callback.call1(&callback, &JsValue::from_str(&s));
-					ok(())
+					ready(())
 				})
 				.await;
 
diff --git a/utils/frame/rpc/support/Cargo.toml b/utils/frame/rpc/support/Cargo.toml
index 4d4631be2025..5651b1da3aab 100644
--- a/utils/frame/rpc/support/Cargo.toml
+++ b/utils/frame/rpc/support/Cargo.toml
@@ -12,9 +12,9 @@ description = "Substrate RPC for FRAME's support"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-futures = { version = "0.3.0", features = ["compat"] }
-jsonrpc-client-transports = { version = "15.1.0", default-features = false, features = ["http"] }
-jsonrpc-core = "15.1.0"
+futures = "0.3.16"
+jsonrpc-client-transports = { version = "18.0.0", features = ["http"] }
+jsonrpc-core = "18.0.0"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 serde = "1"
 frame-support = { version = "4.0.0-dev", path = "../../../../frame/support" }
diff --git a/utils/frame/rpc/support/src/lib.rs b/utils/frame/rpc/support/src/lib.rs
index 37d85f41825d..1b2453c361d9 100644
--- a/utils/frame/rpc/support/src/lib.rs
+++ b/utils/frame/rpc/support/src/lib.rs
@@ -23,7 +23,6 @@
 use codec::{DecodeAll, FullCodec, FullEncode};
 use core::marker::PhantomData;
 use frame_support::storage::generator::{StorageDoubleMap, StorageMap, StorageValue};
-use futures::compat::Future01CompatExt;
 use jsonrpc_client_transports::RpcError;
 use sc_rpc_api::state::StateClient;
 use serde::{de::DeserializeOwned, Serialize};
@@ -32,7 +31,6 @@ use sp_storage::{StorageData, StorageKey};
 /// A typed query on chain state usable from an RPC client.
 ///
 /// ```no_run
-/// # use futures::compat::Future01CompatExt;
 /// # use jsonrpc_client_transports::RpcError;
 /// # use jsonrpc_client_transports::transports::http;
 /// # use codec::Encode;
@@ -69,7 +67,7 @@ use sp_storage::{StorageData, StorageKey};
 /// }
 ///
 /// # async fn test() -> Result<(), RpcError> {
-/// let conn = http::connect("http://[::1]:9933").compat().await?;
+/// let conn = http::connect("http://[::1]:9933").await?;
 /// let cl = StateClient::<Hash>::new(conn);
 ///
 /// let q = StorageQuery::value::<LastActionId>();
@@ -127,9 +125,9 @@ impl<V: FullCodec> StorageQuery<V> {
 		state_client: &StateClient<Hash>,
 		block_index: Option<Hash>,
 	) -> Result<Option<V>, RpcError> {
-		let opt: Option<StorageData> = state_client.storage(self.key, block_index).compat().await?;
+		let opt: Option<StorageData> = state_client.storage(self.key, block_index).await?;
 		opt.map(|encoded| V::decode_all(&encoded.0))
 			.transpose()
-			.map_err(|decode_err| RpcError::Other(decode_err.into()))
+			.map_err(|decode_err| RpcError::Other(Box::new(decode_err)))
 	}
 }
diff --git a/utils/frame/rpc/system/Cargo.toml b/utils/frame/rpc/system/Cargo.toml
index 909da94624a1..9d56d0391344 100644
--- a/utils/frame/rpc/system/Cargo.toml
+++ b/utils/frame/rpc/system/Cargo.toml
@@ -15,10 +15,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 sc-client-api = { version = "4.0.0-dev", path = "../../../../client/api" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-futures = { version = "0.3.4", features = ["compat"] }
-jsonrpc-core = "15.1.0"
-jsonrpc-core-client = "15.1.0"
-jsonrpc-derive = "15.1.0"
+futures = "0.3.16"
+jsonrpc-core = "18.0.0"
+jsonrpc-core-client = "18.0.0"
+jsonrpc-derive = "18.0.0"
 log = "0.4.8"
 serde = { version = "1.0.126", features = ["derive"] }
 sp-runtime = { version = "4.0.0-dev", path = "../../../../primitives/runtime" }
diff --git a/utils/frame/rpc/system/src/lib.rs b/utils/frame/rpc/system/src/lib.rs
index 64c25157dbe2..f0f37f0b2067 100644
--- a/utils/frame/rpc/system/src/lib.rs
+++ b/utils/frame/rpc/system/src/lib.rs
@@ -19,12 +19,9 @@
 
 use std::sync::Arc;
 
-use codec::{self, Codec, Decode, Encode};
-use futures::future::{ready, TryFutureExt};
-use jsonrpc_core::{
-	futures::future::{self as rpc_future, result, Future},
-	Error as RpcError, ErrorCode,
-};
+use codec::{Codec, Decode, Encode};
+use futures::{future::ready, FutureExt, TryFutureExt};
+use jsonrpc_core::{Error as RpcError, ErrorCode};
 use jsonrpc_derive::rpc;
 use sc_client_api::light::{future_header, Fetcher, RemoteBlockchain, RemoteCallRequest};
 use sc_rpc_api::DenyUnsafe;
@@ -38,7 +35,7 @@ pub use self::gen_client::Client as SystemClient;
 pub use frame_system_rpc_runtime_api::AccountNonceApi;
 
 /// Future that resolves to account nonce.
-pub type FutureResult<T> = Box<dyn Future<Item = T, Error = RpcError> + Send>;
+type FutureResult<T> = jsonrpc_core::BoxFuture<Result<T, RpcError>>;
 
 /// System RPC methods.
 #[rpc]
@@ -116,7 +113,8 @@ where
 			Ok(adjust_nonce(&*self.pool, account, nonce))
 		};
 
-		Box::new(result(get_nonce()))
+		let res = get_nonce();
+		async move { res }.boxed()
 	}
 
 	fn dry_run(
@@ -125,7 +123,7 @@ where
 		at: Option<<Block as traits::Block>::Hash>,
 	) -> FutureResult<Bytes> {
 		if let Err(err) = self.deny_unsafe.check_if_safe() {
-			return Box::new(rpc_future::err(err.into()))
+			return async move { Err(err.into()) }.boxed()
 		}
 
 		let dry_run = || {
@@ -150,7 +148,9 @@ where
 			Ok(Encode::encode(&result).into())
 		};
 
-		Box::new(result(dry_run()))
+		let res = dry_run();
+
+		async move { res }.boxed()
 	}
 }
 
@@ -197,19 +197,19 @@ where
 					.ok_or_else(|| ClientError::UnknownBlock(format!("{}", best_hash))),
 			)
 		});
-		let future_nonce = future_best_header
-			.and_then(move |best_header| {
-				fetcher.remote_call(RemoteCallRequest {
-					block: best_hash,
-					header: best_header,
-					method: "AccountNonceApi_account_nonce".into(),
-					call_data,
-					retry_count: None,
-				})
+
+		let future_nonce = future_best_header.and_then(move |best_header| {
+			fetcher.remote_call(RemoteCallRequest {
+				block: best_hash,
+				header: best_header,
+				method: "AccountNonceApi_account_nonce".into(),
+				call_data,
+				retry_count: None,
 			})
-			.compat();
-		let future_nonce = future_nonce.and_then(|nonce| {
-			Decode::decode(&mut &nonce[..])
+		});
+
+		let future_nonce = future_nonce.and_then(|nonce| async move {
+			Index::decode(&mut &nonce[..])
 				.map_err(|e| ClientError::CallResultDecode("Cannot decode account nonce", e))
 		});
 		let future_nonce = future_nonce.map_err(|e| RpcError {
@@ -219,9 +219,7 @@ where
 		});
 
 		let pool = self.pool.clone();
-		let future_nonce = future_nonce.map(move |nonce| adjust_nonce(&*pool, account, nonce));
-
-		Box::new(future_nonce)
+		future_nonce.map_ok(move |nonce| adjust_nonce(&*pool, account, nonce)).boxed()
 	}
 
 	fn dry_run(
@@ -229,11 +227,14 @@ where
 		_extrinsic: Bytes,
 		_at: Option<<Block as traits::Block>::Hash>,
 	) -> FutureResult<Bytes> {
-		Box::new(result(Err(RpcError {
-			code: ErrorCode::MethodNotFound,
-			message: "Unable to dry run extrinsic.".into(),
-			data: None,
-		})))
+		async {
+			Err(RpcError {
+				code: ErrorCode::MethodNotFound,
+				message: "Unable to dry run extrinsic.".into(),
+				data: None,
+			})
+		}
+		.boxed()
 	}
 }
 
@@ -317,7 +318,7 @@ mod tests {
 		let nonce = accounts.nonce(AccountKeyring::Alice.into());
 
 		// then
-		assert_eq!(nonce.wait().unwrap(), 2);
+		assert_eq!(block_on(nonce).unwrap(), 2);
 	}
 
 	#[test]
@@ -336,7 +337,7 @@ mod tests {
 		let res = accounts.dry_run(vec![].into(), None);
 
 		// then
-		assert_eq!(res.wait(), Err(RpcError::method_not_found()));
+		assert_eq!(block_on(res), Err(RpcError::method_not_found()));
 	}
 
 	#[test]
@@ -363,7 +364,7 @@ mod tests {
 		let res = accounts.dry_run(tx.encode().into(), None);
 
 		// then
-		let bytes = res.wait().unwrap().0;
+		let bytes = block_on(res).unwrap().0;
 		let apply_res: ApplyExtrinsicResult = Decode::decode(&mut bytes.as_slice()).unwrap();
 		assert_eq!(apply_res, Ok(Ok(())));
 	}
@@ -392,7 +393,7 @@ mod tests {
 		let res = accounts.dry_run(tx.encode().into(), None);
 
 		// then
-		let bytes = res.wait().unwrap().0;
+		let bytes = block_on(res).unwrap().0;
 		let apply_res: ApplyExtrinsicResult = Decode::decode(&mut bytes.as_slice()).unwrap();
 		assert_eq!(apply_res, Err(TransactionValidityError::Invalid(InvalidTransaction::Stale)));
 	}

From 52478c0372cfedc914b2e4606ac4eb80ba62a144 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 13 Aug 2021 11:48:51 +0000
Subject: [PATCH 1082/1194] Bump env_logger from 0.8.3 to 0.9.0 (#9538)

Bumps [env_logger](https://github.com/env-logger-rs/env_logger) from 0.8.3 to 0.9.0.
- [Release notes](https://github.com/env-logger-rs/env_logger/releases)
- [Changelog](https://github.com/env-logger-rs/env_logger/blob/main/CHANGELOG.md)
- [Commits](https://github.com/env-logger-rs/env_logger/compare/v0.8.3...v0.9.0)

---
updated-dependencies:
- dependency-name: env_logger
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                                  | 20 +++++++++++++++-----
 frame/merkle-mountain-range/Cargo.toml      |  2 +-
 utils/frame/remote-externalities/Cargo.toml |  2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5aaa7e2b1b2e..d16a0d824ff2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1613,9 +1613,19 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.8.3"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3"
+dependencies = [
+ "log 0.4.14",
+ "regex",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f"
+checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
 dependencies = [
  "atty",
  "humantime 2.1.0",
@@ -5328,7 +5338,7 @@ name = "pallet-mmr"
 version = "4.0.0-dev"
 dependencies = [
  "ckb-merkle-mountain-range",
- "env_logger 0.8.3",
+ "env_logger 0.9.0",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -6572,7 +6582,7 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6"
 dependencies = [
- "env_logger 0.8.3",
+ "env_logger 0.8.4",
  "log 0.4.14",
  "rand 0.8.4",
 ]
@@ -7000,7 +7010,7 @@ dependencies = [
 name = "remote-externalities"
 version = "0.10.0-dev"
 dependencies = [
- "env_logger 0.8.3",
+ "env_logger 0.9.0",
  "frame-support",
  "hex",
  "jsonrpsee-proc-macros",
diff --git a/frame/merkle-mountain-range/Cargo.toml b/frame/merkle-mountain-range/Cargo.toml
index 28de91b0604e..eecdfd7a9e84 100644
--- a/frame/merkle-mountain-range/Cargo.toml
+++ b/frame/merkle-mountain-range/Cargo.toml
@@ -27,7 +27,7 @@ frame-system = { version = "4.0.0-dev", default-features = false, path = "../sys
 pallet-mmr-primitives = { version = "4.0.0-dev", default-features = false, path = "./primitives" }
 
 [dev-dependencies]
-env_logger = "0.8"
+env_logger = "0.9"
 hex-literal = "0.3"
 
 [features]
diff --git a/utils/frame/remote-externalities/Cargo.toml b/utils/frame/remote-externalities/Cargo.toml
index 705ba2ed0298..c157cdf272b6 100644
--- a/utils/frame/remote-externalities/Cargo.toml
+++ b/utils/frame/remote-externalities/Cargo.toml
@@ -17,7 +17,7 @@ jsonrpsee-ws-client = { version = "0.3.0", default-features = false, features =
 jsonrpsee-proc-macros = "0.3.0"
 
 hex = "0.4.0"
-env_logger = "0.8.2"
+env_logger = "0.9.0"
 log = "0.4.11"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 serde_json = "1.0"

From e4a0cc407f60b6d3c735805881a07ae147c4beba Mon Sep 17 00:00:00 2001
From: Squirrel <gilescope@gmail.com>
Date: Fri, 13 Aug 2021 15:18:37 +0100
Subject: [PATCH 1083/1194] depend-o-pocalipse (#9450)

Remove unneeded dependencies and dev-dependencies.
Made self_destruct test not dependent on wasm bin size.
Updated code related to deprecated warning on tracing-subscriber `scope()`
( See https://github.com/tokio-rs/tracing/issues/1429 )
---
 Cargo.lock                                    | 217 +-----------------
 bin/node-template/node/Cargo.toml             |   1 -
 bin/node-template/pallets/template/Cargo.toml |   9 +-
 bin/node/bench/Cargo.toml                     |   5 +-
 bin/node/browser-testing/Cargo.toml           |   8 +-
 bin/node/cli/Cargo.toml                       |  46 ++--
 bin/node/cli/tests/export_import_flow.rs      |   5 +-
 bin/node/executor/Cargo.toml                  |  15 +-
 bin/node/inspect/Cargo.toml                   |   1 -
 bin/node/primitives/Cargo.toml                |   8 +-
 bin/node/rpc-client/Cargo.toml                |   5 +-
 bin/node/rpc/Cargo.toml                       |   1 -
 bin/node/runtime/Cargo.toml                   |  17 +-
 bin/node/test-runner-example/Cargo.toml       |  12 -
 bin/node/testing/Cargo.toml                   |  28 +--
 client/api/Cargo.toml                         |  13 +-
 client/authority-discovery/Cargo.toml         |   7 +-
 .../basic-authorship/src/basic_authorship.rs  |   5 +-
 client/block-builder/Cargo.toml               |   5 +-
 client/consensus/aura/Cargo.toml              |   7 +-
 client/consensus/babe/Cargo.toml              |  12 +-
 client/consensus/common/Cargo.toml            |   4 +-
 client/consensus/epochs/src/lib.rs            |   5 +-
 client/consensus/manual-seal/Cargo.toml       |  39 ++--
 client/consensus/slots/Cargo.toml             |   3 -
 client/db/Cargo.toml                          |   9 +-
 client/db/src/upgrade.rs                      |  20 +-
 client/db/src/utils.rs                        |   5 +-
 client/executor/Cargo.toml                    |  17 +-
 client/executor/wasmtime/Cargo.toml           |   7 +-
 client/finality-grandpa-warp-sync/Cargo.toml  |   2 -
 client/finality-grandpa/Cargo.toml            |  14 +-
 client/finality-grandpa/rpc/Cargo.toml        |   9 +-
 .../src/communication/gossip.rs               |  10 +-
 .../finality-grandpa/src/communication/mod.rs |  15 +-
 client/keystore/Cargo.toml                    |   5 -
 client/light/Cargo.toml                       |   1 -
 client/network-gossip/Cargo.toml              |   1 -
 client/network-gossip/src/bridge.rs           |  10 +-
 client/network-gossip/src/state_machine.rs    |   5 +-
 client/network/Cargo.toml                     |  26 ++-
 .../src/light_client_requests/sender.rs       |  30 ++-
 client/network/src/peer_info.rs               |   5 +-
 .../src/protocol/notifications/behaviour.rs   |   5 +-
 .../notifications/upgrade/notifications.rs    |  20 +-
 client/network/src/service.rs                 |  10 +-
 client/network/src/warp_request_handler.rs    |   5 +-
 client/network/test/Cargo.toml                |   1 -
 client/offchain/Cargo.toml                    |   1 -
 client/offchain/src/api/http.rs               |  15 +-
 client/peerset/src/lib.rs                     |   5 +-
 client/rpc-servers/Cargo.toml                 |   2 -
 client/rpc/Cargo.toml                         |   5 -
 client/service/Cargo.toml                     |  15 +-
 client/state-db/Cargo.toml                    |   1 -
 client/telemetry/Cargo.toml                   |   2 -
 client/tracing/Cargo.toml                     |  10 +-
 client/tracing/src/logging/event_format.rs    |   3 +-
 client/transaction-pool/Cargo.toml            |   1 -
 client/transaction-pool/api/Cargo.toml        |   1 -
 frame/aura/Cargo.toml                         |   9 +-
 frame/authority-discovery/Cargo.toml          |   9 +-
 frame/authorship/Cargo.toml                   |   7 +-
 frame/benchmarking/Cargo.toml                 |   1 -
 frame/bounties/Cargo.toml                     |   7 +-
 frame/collective/Cargo.toml                   |   5 +-
 frame/contracts/Cargo.toml                    |  10 +-
 frame/contracts/src/tests.rs                  |  26 ++-
 frame/democracy/Cargo.toml                    |   7 +-
 frame/democracy/src/lib.rs                    |   5 +-
 .../election-provider-multi-phase/Cargo.toml  |  21 +-
 frame/elections-phragmen/Cargo.toml           |   5 +-
 frame/elections-phragmen/src/lib.rs           |   5 +-
 frame/elections/Cargo.toml                    |   5 +-
 frame/example-offchain-worker/Cargo.toml      |   2 +-
 frame/example-parallel/Cargo.toml             |   3 -
 frame/executive/Cargo.toml                    |  11 +-
 frame/im-online/src/lib.rs                    |  10 +-
 frame/lottery/Cargo.toml                      |   5 +-
 frame/merkle-mountain-range/rpc/Cargo.toml    |   1 -
 frame/multisig/Cargo.toml                     |   1 -
 frame/offences/benchmarking/Cargo.toml        |   9 +-
 frame/proxy/Cargo.toml                        |   1 -
 frame/proxy/src/tests.rs                      |   5 +-
 frame/recovery/Cargo.toml                     |   1 -
 frame/session/Cargo.toml                      |   8 +-
 frame/session/benchmarking/Cargo.toml         |  11 +-
 frame/staking/Cargo.toml                      |  21 +-
 .../procedural/src/pallet/parse/mod.rs        |   5 +-
 .../src/storage/genesis_config/builder_def.rs |  10 +-
 .../tokens/imbalance/signed_imbalance.rs      |   5 +-
 frame/system/Cargo.toml                       |   1 -
 frame/system/benchmarking/Cargo.toml          |   3 +-
 frame/timestamp/Cargo.toml                    |   1 -
 frame/transaction-payment/Cargo.toml          |   5 +-
 frame/transaction-storage/Cargo.toml          |   6 +-
 frame/treasury/Cargo.toml                     |   8 +-
 frame/try-runtime/Cargo.toml                  |   2 -
 frame/uniques/Cargo.toml                      |   2 -
 frame/utility/Cargo.toml                      |   2 +-
 frame/vesting/Cargo.toml                      |   7 +-
 primitives/api/Cargo.toml                     |   6 +-
 primitives/api/test/Cargo.toml                |   2 -
 primitives/arithmetic/Cargo.toml              |   5 +-
 primitives/arithmetic/fuzzer/Cargo.toml       |   1 -
 primitives/arithmetic/src/per_things.rs       |  10 +-
 primitives/consensus/common/Cargo.toml        |   6 +-
 primitives/core/Cargo.toml                    |  29 ++-
 primitives/core/src/offchain/testing.rs       |   5 +-
 primitives/npos-elections/fuzzer/Cargo.toml   |   2 -
 .../npos-elections/solution-type/Cargo.toml   |   5 +-
 primitives/offchain/Cargo.toml                |   9 +-
 primitives/rpc/Cargo.toml                     |   1 -
 primitives/runtime-interface/test/Cargo.toml  |   1 -
 primitives/runtime/src/multiaddress.rs        |  10 +-
 primitives/tracing/Cargo.toml                 |  21 +-
 primitives/trie/src/trie_codec.rs             |   5 +-
 primitives/utils/Cargo.toml                   |   1 -
 primitives/version/proc-macro/Cargo.toml      |   1 -
 test-utils/client/Cargo.toml                  |   9 +-
 test-utils/runtime/client/Cargo.toml          |   1 -
 test-utils/test-runner/Cargo.toml             |   1 -
 test-utils/test-runner/src/node.rs            |  10 +-
 utils/frame/remote-externalities/Cargo.toml   |  10 +-
 utils/frame/rpc/support/Cargo.toml            |   6 +-
 utils/frame/rpc/system/Cargo.toml             |   1 -
 utils/frame/try-runtime/cli/Cargo.toml        |   5 -
 utils/prometheus/src/sourced.rs               |  10 +-
 utils/wasm-builder/Cargo.toml                 |   1 -
 129 files changed, 487 insertions(+), 726 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d16a0d824ff2..a3e83092025e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1821,7 +1821,6 @@ dependencies = [
  "log 0.4.14",
  "parity-scale-codec",
  "paste 1.0.4",
- "serde",
  "sp-api",
  "sp-io",
  "sp-runtime",
@@ -1876,7 +1875,6 @@ dependencies = [
  "frame-system",
  "hex-literal",
  "pallet-balances",
- "pallet-indices",
  "pallet-transaction-payment",
  "parity-scale-codec",
  "sp-core",
@@ -1992,7 +1990,6 @@ version = "4.0.0-dev"
 dependencies = [
  "criterion",
  "frame-support",
- "impl-trait-for-tuples",
  "log 0.4.14",
  "parity-scale-codec",
  "serde",
@@ -2013,7 +2010,6 @@ dependencies = [
  "frame-support",
  "frame-system",
  "parity-scale-codec",
- "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -2033,7 +2029,6 @@ name = "frame-try-runtime"
 version = "0.10.0-dev"
 dependencies = [
  "frame-support",
- "parity-scale-codec",
  "sp-api",
  "sp-runtime",
  "sp-std",
@@ -4208,7 +4203,6 @@ dependencies = [
  "parity-util-mem",
  "rand 0.7.3",
  "sc-basic-authorship",
- "sc-cli",
  "sc-client-api",
  "sc-transaction-pool",
  "sc-transaction-pool-api",
@@ -4230,13 +4224,9 @@ dependencies = [
 name = "node-browser-testing"
 version = "3.0.0-dev"
 dependencies = [
- "futures 0.3.16",
- "futures-timer 3.0.2",
  "jsonrpc-core",
- "libp2p",
  "node-cli",
  "parking_lot 0.11.1",
- "sc-rpc-api",
  "serde",
  "serde_json",
  "wasm-bindgen",
@@ -4251,7 +4241,6 @@ dependencies = [
  "assert_cmd",
  "async-std",
  "frame-benchmarking-cli",
- "frame-support",
  "frame-system",
  "futures 0.3.16",
  "hex-literal",
@@ -4263,17 +4252,9 @@ dependencies = [
  "node-primitives",
  "node-rpc",
  "node-runtime",
- "pallet-authority-discovery",
- "pallet-balances",
- "pallet-contracts",
- "pallet-grandpa",
  "pallet-im-online",
- "pallet-indices",
- "pallet-staking",
- "pallet-timestamp",
  "pallet-transaction-payment",
  "parity-scale-codec",
- "parking_lot 0.11.1",
  "platforms",
  "rand 0.7.3",
  "regex",
@@ -4282,7 +4263,6 @@ dependencies = [
  "sc-chain-spec",
  "sc-cli",
  "sc-client-api",
- "sc-client-db",
  "sc-consensus",
  "sc-consensus-babe",
  "sc-consensus-epochs",
@@ -4291,13 +4271,11 @@ dependencies = [
  "sc-finality-grandpa",
  "sc-keystore",
  "sc-network",
- "sc-offchain",
  "sc-rpc",
  "sc-service",
  "sc-service-test",
  "sc-sync-state-rpc",
  "sc-telemetry",
- "sc-tracing",
  "sc-transaction-pool",
  "sc-transaction-pool-api",
  "serde",
@@ -4310,7 +4288,6 @@ dependencies = [
  "sp-core",
  "sp-finality-grandpa",
  "sp-inherents",
- "sp-io",
  "sp-keyring",
  "sp-keystore",
  "sp-runtime",
@@ -4342,12 +4319,8 @@ dependencies = [
  "node-testing",
  "pallet-balances",
  "pallet-contracts",
- "pallet-grandpa",
  "pallet-im-online",
- "pallet-indices",
- "pallet-session",
  "pallet-timestamp",
- "pallet-transaction-payment",
  "pallet-treasury",
  "parity-scale-codec",
  "sc-executor",
@@ -4355,13 +4328,10 @@ dependencies = [
  "sp-consensus-babe",
  "sp-core",
  "sp-externalities",
- "sp-io",
  "sp-keystore",
  "sp-runtime",
  "sp-state-machine",
  "sp-trie",
- "substrate-test-client",
- "trie-root",
  "wat",
 ]
 
@@ -4370,7 +4340,6 @@ name = "node-inspect"
 version = "0.9.0-dev"
 dependencies = [
  "derive_more",
- "log 0.4.14",
  "parity-scale-codec",
  "sc-cli",
  "sc-client-api",
@@ -4387,11 +4356,9 @@ version = "2.0.0"
 dependencies = [
  "frame-system",
  "parity-scale-codec",
- "pretty_assertions 0.6.1",
  "sp-application-crypto",
  "sp-core",
  "sp-runtime",
- "sp-serializer",
 ]
 
 [[package]]
@@ -4410,7 +4377,6 @@ dependencies = [
  "sc-consensus-epochs",
  "sc-finality-grandpa",
  "sc-finality-grandpa-rpc",
- "sc-keystore",
  "sc-rpc",
  "sc-rpc-api",
  "sc-sync-state-rpc",
@@ -4431,7 +4397,6 @@ version = "2.0.0"
 dependencies = [
  "futures 0.3.16",
  "jsonrpc-core-client",
- "log 0.4.14",
  "node-primitives",
  "sc-rpc",
  "sp-tracing",
@@ -4546,7 +4511,6 @@ dependencies = [
  "sp-consensus-aura",
  "sp-core",
  "sp-finality-grandpa",
- "sp-inherents",
  "sp-runtime",
  "sp-timestamp",
  "structopt",
@@ -4593,8 +4557,6 @@ dependencies = [
 name = "node-testing"
 version = "3.0.0-dev"
 dependencies = [
- "criterion",
- "frame-support",
  "frame-system",
  "fs_extra",
  "futures 0.3.16",
@@ -4602,19 +4564,9 @@ dependencies = [
  "node-executor",
  "node-primitives",
  "node-runtime",
- "pallet-balances",
- "pallet-contracts",
- "pallet-grandpa",
- "pallet-indices",
- "pallet-session",
- "pallet-society",
- "pallet-staking",
- "pallet-timestamp",
  "pallet-transaction-payment",
- "pallet-treasury",
  "parity-scale-codec",
  "sc-block-builder",
- "sc-cli",
  "sc-client-api",
  "sc-client-db",
  "sc-consensus",
@@ -4869,11 +4821,8 @@ version = "4.0.0-dev"
 dependencies = [
  "frame-support",
  "frame-system",
- "lazy_static",
- "pallet-session",
  "pallet-timestamp",
  "parity-scale-codec",
- "parking_lot 0.11.1",
  "sp-application-crypto",
  "sp-consensus-aura",
  "sp-core",
@@ -4895,7 +4844,6 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-staking",
  "sp-std",
 ]
 
@@ -4907,7 +4855,6 @@ dependencies = [
  "frame-system",
  "impl-trait-for-tuples",
  "parity-scale-codec",
- "serde",
  "sp-authorship",
  "sp-core",
  "sp-io",
@@ -4973,7 +4920,6 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-std",
- "sp-storage",
 ]
 
 [[package]]
@@ -4985,7 +4931,6 @@ dependencies = [
  "frame-system",
  "hex-literal",
  "log 0.4.14",
- "pallet-balances",
  "parity-scale-codec",
  "sp-core",
  "sp-io",
@@ -5011,7 +4956,6 @@ dependencies = [
  "pallet-timestamp",
  "pallet-utility",
  "parity-scale-codec",
- "paste 1.0.4",
  "pretty_assertions 0.7.2",
  "pwasm-utils",
  "rand 0.8.4",
@@ -5085,7 +5029,6 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "hex-literal",
  "pallet-balances",
  "pallet-scheduler",
  "parity-scale-codec",
@@ -5094,8 +5037,6 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-std",
- "sp-storage",
- "substrate-test-utils",
 ]
 
 [[package]]
@@ -5106,12 +5047,10 @@ dependencies = [
  "frame-election-provider-support",
  "frame-support",
  "frame-system",
- "hex-literal",
  "log 0.4.14",
  "pallet-balances",
  "parity-scale-codec",
  "parking_lot 0.11.1",
- "paste 1.0.4",
  "rand 0.7.3",
  "sp-arithmetic",
  "sp-core",
@@ -5121,7 +5060,6 @@ dependencies = [
  "sp-std",
  "sp-tracing",
  "static_assertions",
- "substrate-test-utils",
 ]
 
 [[package]]
@@ -5130,7 +5068,6 @@ version = "4.0.0-dev"
 dependencies = [
  "frame-support",
  "frame-system",
- "hex-literal",
  "pallet-balances",
  "parity-scale-codec",
  "sp-core",
@@ -5146,7 +5083,6 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "hex-literal",
  "log 0.4.14",
  "pallet-balances",
  "parity-scale-codec",
@@ -5176,7 +5112,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-example-offchain-worker"
-version = "3.0.0-dev"
+version = "4.0.0-dev"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5197,7 +5133,6 @@ dependencies = [
  "frame-support",
  "frame-system",
  "parity-scale-codec",
- "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5311,7 +5246,6 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "parity-scale-codec",
- "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5381,7 +5315,6 @@ dependencies = [
  "sp-api",
  "sp-blockchain",
  "sp-core",
- "sp-rpc",
  "sp-runtime",
 ]
 
@@ -5463,7 +5396,6 @@ dependencies = [
  "pallet-staking-reward-curve",
  "pallet-timestamp",
  "parity-scale-codec",
- "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5505,7 +5437,6 @@ dependencies = [
 name = "pallet-recovery"
 version = "4.0.0-dev"
 dependencies = [
- "enumflags2",
  "frame-support",
  "frame-system",
  "pallet-balances",
@@ -5553,11 +5484,9 @@ dependencies = [
  "frame-support",
  "frame-system",
  "impl-trait-for-tuples",
- "lazy_static",
  "log 0.4.14",
  "pallet-timestamp",
  "parity-scale-codec",
- "sp-application-crypto",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5582,7 +5511,6 @@ dependencies = [
  "pallet-timestamp",
  "parity-scale-codec",
  "rand 0.7.3",
- "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5614,7 +5542,6 @@ dependencies = [
  "frame-election-provider-support",
  "frame-support",
  "frame-system",
- "hex",
  "log 0.4.14",
  "pallet-authorship",
  "pallet-balances",
@@ -5622,8 +5549,6 @@ dependencies = [
  "pallet-staking-reward-curve",
  "pallet-timestamp",
  "parity-scale-codec",
- "parking_lot 0.11.1",
- "paste 1.0.4",
  "rand_chacha 0.2.2",
  "serde",
  "sp-application-crypto",
@@ -5632,9 +5557,7 @@ dependencies = [
  "sp-runtime",
  "sp-staking",
  "sp-std",
- "sp-storage",
  "sp-tracing",
- "static_assertions",
  "substrate-test-utils",
 ]
 
@@ -5678,7 +5601,6 @@ dependencies = [
  "frame-support",
  "frame-system",
  "parity-scale-codec",
- "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5691,7 +5613,6 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "impl-trait-for-tuples",
  "log 0.4.14",
  "parity-scale-codec",
  "sp-core",
@@ -5735,7 +5656,6 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-std",
- "sp-storage",
 ]
 
 [[package]]
@@ -5770,7 +5690,6 @@ version = "4.0.0-dev"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
- "frame-support-test",
  "frame-system",
  "hex-literal",
  "pallet-balances",
@@ -5799,7 +5718,6 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-std",
- "sp-storage",
 ]
 
 [[package]]
@@ -5836,18 +5754,15 @@ dependencies = [
 name = "pallet-vesting"
 version = "4.0.0-dev"
 dependencies = [
- "enumflags2",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "hex-literal",
  "pallet-balances",
  "parity-scale-codec",
  "sp-core",
  "sp-io",
  "sp-runtime",
  "sp-std",
- "sp-storage",
 ]
 
 [[package]]
@@ -7011,8 +6926,6 @@ name = "remote-externalities"
 version = "0.10.0-dev"
 dependencies = [
  "env_logger 0.9.0",
- "frame-support",
- "hex",
  "jsonrpsee-proc-macros",
  "jsonrpsee-ws-client",
  "log 0.4.14",
@@ -7257,7 +7170,6 @@ version = "0.10.0-dev"
 dependencies = [
  "async-trait",
  "derive_more",
- "either",
  "futures 0.3.16",
  "futures-timer 3.0.2",
  "ip_network",
@@ -7270,8 +7182,6 @@ dependencies = [
  "rand 0.7.3",
  "sc-client-api",
  "sc-network",
- "sc-peerset",
- "serde_json",
  "sp-api",
  "sp-authority-discovery",
  "sp-blockchain",
@@ -7321,7 +7231,6 @@ dependencies = [
  "sp-inherents",
  "sp-runtime",
  "sp-state-machine",
- "sp-trie",
  "substrate-test-runtime-client",
 ]
 
@@ -7392,13 +7301,9 @@ dependencies = [
 name = "sc-client-api"
 version = "4.0.0-dev"
 dependencies = [
- "derive_more",
  "fnv",
  "futures 0.3.16",
  "hash-db",
- "kvdb",
- "kvdb-memorydb",
- "lazy_static",
  "log 0.4.14",
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -7410,16 +7315,13 @@ dependencies = [
  "sp-core",
  "sp-database",
  "sp-externalities",
- "sp-inherents",
  "sp-keystore",
  "sp-runtime",
  "sp-state-machine",
- "sp-std",
  "sp-storage",
  "sp-test-primitives",
  "sp-trie",
  "sp-utils",
- "sp-version",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime",
  "thiserror",
@@ -7429,7 +7331,6 @@ dependencies = [
 name = "sc-client-db"
 version = "0.10.0-dev"
 dependencies = [
- "blake2-rfc",
  "hash-db",
  "kvdb",
  "kvdb-memorydb",
@@ -7438,22 +7339,18 @@ dependencies = [
  "log 0.4.14",
  "parity-db",
  "parity-scale-codec",
- "parity-util-mem",
  "parking_lot 0.11.1",
  "quickcheck",
  "sc-client-api",
- "sc-executor",
  "sc-state-db",
  "sp-arithmetic",
  "sp-blockchain",
  "sp-core",
  "sp-database",
- "sp-keyring",
  "sp-runtime",
  "sp-state-machine",
  "sp-tracing",
  "sp-trie",
- "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
  "tempfile",
 ]
@@ -7490,7 +7387,6 @@ dependencies = [
  "async-trait",
  "derive_more",
  "futures 0.3.16",
- "futures-timer 3.0.2",
  "getrandom 0.2.3",
  "log 0.4.14",
  "parity-scale-codec",
@@ -7499,11 +7395,9 @@ dependencies = [
  "sc-client-api",
  "sc-consensus",
  "sc-consensus-slots",
- "sc-executor",
  "sc-keystore",
  "sc-network",
  "sc-network-test",
- "sc-service",
  "sc-telemetry",
  "sp-api",
  "sp-application-crypto",
@@ -7514,13 +7408,11 @@ dependencies = [
  "sp-consensus-slots",
  "sp-core",
  "sp-inherents",
- "sp-io",
  "sp-keyring",
  "sp-keystore",
  "sp-runtime",
  "sp-timestamp",
  "sp-tracing",
- "sp-version",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
  "tempfile",
@@ -7534,7 +7426,6 @@ dependencies = [
  "derive_more",
  "fork-tree",
  "futures 0.3.16",
- "futures-timer 3.0.2",
  "log 0.4.14",
  "merlin",
  "num-bigint",
@@ -7550,12 +7441,9 @@ dependencies = [
  "sc-consensus",
  "sc-consensus-epochs",
  "sc-consensus-slots",
- "sc-consensus-uncles",
- "sc-executor",
  "sc-keystore",
  "sc-network",
  "sc-network-test",
- "sc-service",
  "sc-telemetry",
  "schnorrkel",
  "serde",
@@ -7570,12 +7458,10 @@ dependencies = [
  "sp-core",
  "sp-inherents",
  "sp-io",
- "sp-keyring",
  "sp-keystore",
  "sp-runtime",
  "sp-timestamp",
  "sp-tracing",
- "sp-utils",
  "sp-version",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
@@ -7636,7 +7522,6 @@ dependencies = [
  "jsonrpc-derive",
  "log 0.4.14",
  "parity-scale-codec",
- "parking_lot 0.11.1",
  "sc-basic-authorship",
  "sc-client-api",
  "sc-consensus",
@@ -7652,14 +7537,12 @@ dependencies = [
  "sp-consensus-slots",
  "sp-core",
  "sp-inherents",
- "sp-keyring",
  "sp-keystore",
  "sp-runtime",
  "sp-timestamp",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
  "substrate-test-runtime-transaction-pool",
- "tempfile",
  "tokio 0.2.25",
 ]
 
@@ -7694,14 +7577,12 @@ dependencies = [
  "async-trait",
  "futures 0.3.16",
  "futures-timer 3.0.2",
- "impl-trait-for-tuples",
  "log 0.4.14",
  "parity-scale-codec",
  "sc-client-api",
  "sc-consensus",
  "sc-telemetry",
  "sp-api",
- "sp-application-crypto",
  "sp-arithmetic",
  "sp-blockchain",
  "sp-consensus",
@@ -7711,7 +7592,6 @@ dependencies = [
  "sp-runtime",
  "sp-state-machine",
  "sp-timestamp",
- "sp-trie",
  "substrate-test-runtime-client",
  "thiserror",
 ]
@@ -7730,14 +7610,11 @@ dependencies = [
 name = "sc-executor"
 version = "0.10.0-dev"
 dependencies = [
- "assert_matches",
- "derive_more",
  "hex-literal",
  "lazy_static",
  "libsecp256k1",
  "log 0.4.14",
  "parity-scale-codec",
- "parity-wasm 0.42.2",
  "parking_lot 0.11.1",
  "paste 1.0.4",
  "regex",
@@ -7754,10 +7631,8 @@ dependencies = [
  "sp-panic-handler",
  "sp-runtime",
  "sp-runtime-interface",
- "sp-serializer",
  "sp-state-machine",
  "sp-tasks",
- "sp-tracing",
  "sp-trie",
  "sp-version",
  "sp-wasm-interface",
@@ -7802,13 +7677,11 @@ dependencies = [
 name = "sc-executor-wasmtime"
 version = "0.10.0-dev"
 dependencies = [
- "assert_matches",
  "cfg-if 1.0.0",
  "libc",
  "log 0.4.14",
  "parity-scale-codec",
  "parity-wasm 0.42.2",
- "pwasm-utils",
  "sc-allocator",
  "sc-executor-common",
  "sc-runtime-test",
@@ -7833,11 +7706,9 @@ dependencies = [
  "fork-tree",
  "futures 0.3.16",
  "futures-timer 3.0.2",
- "linked-hash-map",
  "log 0.4.14",
  "parity-scale-codec",
  "parking_lot 0.11.1",
- "pin-project 1.0.5",
  "rand 0.8.4",
  "sc-block-builder",
  "sc-client-api",
@@ -7853,14 +7724,11 @@ dependencies = [
  "sp-arithmetic",
  "sp-blockchain",
  "sp-consensus",
- "sp-consensus-babe",
  "sp-core",
  "sp-finality-grandpa",
- "sp-inherents",
  "sp-keyring",
  "sp-keystore",
  "sp-runtime",
- "sp-state-machine",
  "sp-tracing",
  "sp-utils",
  "substrate-prometheus-endpoint",
@@ -7881,18 +7749,15 @@ dependencies = [
  "jsonrpc-core-client",
  "jsonrpc-derive",
  "jsonrpc-pubsub",
- "lazy_static",
  "log 0.4.14",
  "parity-scale-codec",
  "sc-block-builder",
  "sc-client-api",
  "sc-finality-grandpa",
- "sc-network-test",
  "sc-rpc",
  "serde",
  "serde_json",
  "sp-blockchain",
- "sp-consensus",
  "sp-core",
  "sp-finality-grandpa",
  "sp-keyring",
@@ -7923,17 +7788,12 @@ version = "4.0.0-dev"
 dependencies = [
  "async-trait",
  "derive_more",
- "futures 0.3.16",
- "futures-util",
  "hex",
- "merlin",
  "parking_lot 0.11.1",
- "rand 0.7.3",
  "serde_json",
  "sp-application-crypto",
  "sp-core",
  "sp-keystore",
- "subtle 2.4.0",
  "tempfile",
 ]
 
@@ -7942,7 +7802,6 @@ name = "sc-light"
 version = "4.0.0-dev"
 dependencies = [
  "hash-db",
- "lazy_static",
  "parity-scale-codec",
  "parking_lot 0.11.1",
  "sc-client-api",
@@ -7964,12 +7823,10 @@ dependencies = [
  "async-trait",
  "asynchronous-codec 0.5.0",
  "bitflags",
- "bs58",
  "bytes 1.0.1",
  "cid",
  "derive_more",
  "either",
- "erased-serde",
  "fnv",
  "fork-tree",
  "futures 0.3.16",
@@ -7981,7 +7838,6 @@ dependencies = [
  "linked_hash_set",
  "log 0.4.14",
  "lru",
- "nohash-hasher",
  "parity-scale-codec",
  "parking_lot 0.11.1",
  "pin-project 1.0.5",
@@ -8001,7 +7857,6 @@ dependencies = [
  "sp-consensus",
  "sp-core",
  "sp-finality-grandpa",
- "sp-keyring",
  "sp-runtime",
  "sp-test-primitives",
  "sp-tracing",
@@ -8028,7 +7883,6 @@ dependencies = [
  "log 0.4.14",
  "lru",
  "quickcheck",
- "rand 0.7.3",
  "sc-network",
  "sp-runtime",
  "substrate-prometheus-endpoint",
@@ -8062,7 +7916,6 @@ dependencies = [
  "sp-tracing",
  "substrate-test-runtime",
  "substrate-test-runtime-client",
- "tempfile",
 ]
 
 [[package]]
@@ -8085,7 +7938,6 @@ dependencies = [
  "sc-block-builder",
  "sc-client-api",
  "sc-client-db",
- "sc-keystore",
  "sc-network",
  "sc-transaction-pool",
  "sc-transaction-pool-api",
@@ -8137,10 +7989,7 @@ dependencies = [
  "parking_lot 0.11.1",
  "sc-block-builder",
  "sc-chain-spec",
- "sc-cli",
  "sc-client-api",
- "sc-executor",
- "sc-keystore",
  "sc-network",
  "sc-rpc-api",
  "sc-tracing",
@@ -8157,8 +8006,6 @@ dependencies = [
  "sp-rpc",
  "sp-runtime",
  "sp-session",
- "sp-state-machine",
- "sp-tracing",
  "sp-utils",
  "sp-version",
  "substrate-test-runtime-client",
@@ -8199,9 +8046,7 @@ dependencies = [
  "jsonrpc-pubsub",
  "jsonrpc-ws-server",
  "log 0.4.14",
- "serde",
  "serde_json",
- "sp-runtime",
  "substrate-prometheus-endpoint",
 ]
 
@@ -8231,7 +8076,6 @@ dependencies = [
  "hash-db",
  "jsonrpc-core",
  "jsonrpc-pubsub",
- "lazy_static",
  "log 0.4.14",
  "parity-scale-codec",
  "parity-util-mem",
@@ -8244,7 +8088,6 @@ dependencies = [
  "sc-client-db",
  "sc-consensus",
  "sc-executor",
- "sc-finality-grandpa",
  "sc-informant",
  "sc-keystore",
  "sc-light",
@@ -8263,12 +8106,9 @@ dependencies = [
  "sp-block-builder",
  "sp-blockchain",
  "sp-consensus",
- "sp-consensus-babe",
  "sp-core",
  "sp-externalities",
- "sp-finality-grandpa",
  "sp-inherents",
- "sp-io",
  "sp-keystore",
  "sp-runtime",
  "sp-session",
@@ -8339,7 +8179,6 @@ dependencies = [
  "parking_lot 0.11.1",
  "sc-client-api",
  "sp-core",
- "thiserror",
 ]
 
 [[package]]
@@ -8376,9 +8215,7 @@ dependencies = [
  "rand 0.7.3",
  "serde",
  "serde_json",
- "take_mut",
  "thiserror",
- "void",
  "wasm-timer",
 ]
 
@@ -8388,7 +8225,6 @@ version = "4.0.0-dev"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
- "erased-serde",
  "lazy_static",
  "log 0.4.14",
  "once_cell",
@@ -8397,24 +8233,19 @@ dependencies = [
  "rustc-hash",
  "sc-client-api",
  "sc-rpc-server",
- "sc-telemetry",
  "sc-tracing-proc-macro",
  "serde",
- "serde_json",
  "sp-api",
- "sp-block-builder",
  "sp-blockchain",
  "sp-core",
  "sp-rpc",
  "sp-runtime",
- "sp-storage",
  "sp-tracing",
  "thiserror",
  "tracing",
  "tracing-log",
  "tracing-subscriber",
  "wasm-bindgen",
- "wasm-timer",
  "web-sys",
 ]
 
@@ -8434,7 +8265,6 @@ version = "4.0.0-dev"
 dependencies = [
  "assert_matches",
  "criterion",
- "derive_more",
  "futures 0.3.16",
  "hex",
  "intervalier",
@@ -8471,7 +8301,6 @@ dependencies = [
  "derive_more",
  "futures 0.3.16",
  "log 0.4.14",
- "parity-scale-codec",
  "serde",
  "sp-blockchain",
  "sp-runtime",
@@ -8938,7 +8767,6 @@ dependencies = [
  "rustversion",
  "sc-block-builder",
  "sp-api",
- "sp-blockchain",
  "sp-consensus",
  "sp-core",
  "sp-runtime",
@@ -8983,7 +8811,6 @@ dependencies = [
  "primitive-types",
  "rand 0.7.3",
  "serde",
- "serde_json",
  "sp-debug-derive",
  "sp-std",
  "static_assertions",
@@ -8995,7 +8822,6 @@ version = "2.0.0"
 dependencies = [
  "honggfuzz",
  "num-bigint",
- "num-traits",
  "primitive-types",
  "sp-arithmetic",
 ]
@@ -9161,10 +8987,8 @@ dependencies = [
  "parity-scale-codec",
  "parity-util-mem",
  "parking_lot 0.11.1",
- "pretty_assertions 0.6.1",
  "primitive-types",
  "rand 0.7.3",
- "rand_chacha 0.2.2",
  "regex",
  "schnorrkel",
  "secrecy",
@@ -9325,10 +9149,8 @@ dependencies = [
  "honggfuzz",
  "parity-scale-codec",
  "rand 0.7.3",
- "sp-arithmetic",
  "sp-npos-elections",
  "sp-runtime",
- "sp-std",
  "structopt",
 ]
 
@@ -9353,7 +9175,6 @@ dependencies = [
  "sp-api",
  "sp-core",
  "sp-runtime",
- "sp-state-machine",
 ]
 
 [[package]]
@@ -9371,7 +9192,6 @@ dependencies = [
  "serde",
  "serde_json",
  "sp-core",
- "tracing-core",
 ]
 
 [[package]]
@@ -9438,7 +9258,6 @@ version = "2.0.0"
 dependencies = [
  "sc-executor",
  "sc-executor-common",
- "sp-core",
  "sp-io",
  "sp-runtime",
  "sp-runtime-interface",
@@ -9658,7 +9477,6 @@ name = "sp-utils"
 version = "4.0.0-dev"
 dependencies = [
  "futures 0.3.16",
- "futures-core",
  "futures-timer 3.0.2",
  "lazy_static",
  "prometheus",
@@ -9683,7 +9501,6 @@ name = "sp-version-proc-macro"
 version = "4.0.0-dev"
 dependencies = [
  "parity-scale-codec",
- "proc-macro-crate 1.0.0",
  "proc-macro2",
  "quote",
  "sp-version",
@@ -9864,7 +9681,6 @@ dependencies = [
  "frame-system",
  "futures 0.3.16",
  "jsonrpc-client-transports",
- "jsonrpc-core",
  "parity-scale-codec",
  "sc-rpc-api",
  "serde",
@@ -9887,7 +9703,6 @@ dependencies = [
  "sc-rpc-api",
  "sc-transaction-pool",
  "sc-transaction-pool-api",
- "serde",
  "sp-api",
  "sp-block-builder",
  "sp-blockchain",
@@ -9916,7 +9731,6 @@ version = "2.0.1"
 dependencies = [
  "async-trait",
  "futures 0.3.16",
- "hash-db",
  "hex",
  "parity-scale-codec",
  "sc-client-api",
@@ -9992,7 +9806,6 @@ dependencies = [
  "sc-client-api",
  "sc-consensus",
  "sc-light",
- "sc-service",
  "sp-api",
  "sp-blockchain",
  "sp-consensus",
@@ -10051,7 +9864,6 @@ name = "substrate-wasm-builder"
 version = "5.0.0-dev"
 dependencies = [
  "ansi_term 0.12.1",
- "atty",
  "build-helper",
  "cargo_metadata",
  "sp-maybe-compressed-blob",
@@ -10107,12 +9919,6 @@ dependencies = [
  "unicode-xid",
 ]
 
-[[package]]
-name = "take_mut"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
-
 [[package]]
 name = "tap"
 version = "1.0.1"
@@ -10182,7 +9988,6 @@ dependencies = [
  "sp-finality-grandpa",
  "sp-inherents",
  "sp-keyring",
- "sp-keystore",
  "sp-offchain",
  "sp-runtime",
  "sp-runtime-interface",
@@ -10198,31 +10003,20 @@ name = "test-runner-example"
 version = "0.1.0"
 dependencies = [
  "frame-benchmarking",
- "frame-support",
  "frame-system",
- "log 0.4.14",
  "node-cli",
  "node-primitives",
  "node-runtime",
- "pallet-balances",
- "pallet-sudo",
  "pallet-transaction-payment",
- "sc-client-api",
  "sc-consensus",
  "sc-consensus-babe",
  "sc-consensus-manual-seal",
  "sc-executor",
  "sc-finality-grandpa",
- "sc-informant",
- "sc-network",
  "sc-service",
- "sp-api",
  "sp-consensus-babe",
- "sp-inherents",
  "sp-keyring",
- "sp-keystore",
  "sp-runtime",
- "sp-timestamp",
  "test-runner",
 ]
 
@@ -10749,9 +10543,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa5553bf0883ba7c9cbe493b085c29926bd41b66afc31ff72cf17ff4fb60dcd5"
+checksum = "ab69019741fca4d98be3c62d2b75254528b5432233fd8a4d2739fec20278de48"
 dependencies = [
  "ansi_term 0.12.1",
  "chrono",
@@ -10882,20 +10676,15 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 name = "try-runtime-cli"
 version = "0.10.0-dev"
 dependencies = [
- "frame-try-runtime",
  "log 0.4.14",
  "parity-scale-codec",
  "remote-externalities",
  "sc-chain-spec",
  "sc-cli",
- "sc-client-api",
  "sc-executor",
  "sc-service",
  "serde",
- "sp-api",
- "sp-blockchain",
  "sp-core",
- "sp-externalities",
  "sp-keystore",
  "sp-runtime",
  "sp-state-machine",
diff --git a/bin/node-template/node/Cargo.toml b/bin/node-template/node/Cargo.toml
index 98d880b95d70..04d70b338ac0 100644
--- a/bin/node-template/node/Cargo.toml
+++ b/bin/node-template/node/Cargo.toml
@@ -25,7 +25,6 @@ sc-executor = { version = "0.10.0-dev", path = "../../../client/executor", featu
 sc-service = { version = "0.10.0-dev", path = "../../../client/service", features = ["wasmtime"] }
 sc-telemetry = { version = "4.0.0-dev", path = "../../../client/telemetry" }
 sc-keystore = { version = "4.0.0-dev", path = "../../../client/keystore" }
-sp-inherents = { version = "4.0.0-dev", path = "../../../primitives/inherents" }
 sc-transaction-pool = { version = "4.0.0-dev", path = "../../../client/transaction-pool" }
 sc-transaction-pool-api = { version = "4.0.0-dev", path = "../../../client/transaction-pool/api" }
 sc-consensus-aura = { version = "0.10.0-dev", path = "../../../client/consensus/aura" }
diff --git a/bin/node-template/pallets/template/Cargo.toml b/bin/node-template/pallets/template/Cargo.toml
index 2e9746d0b8c3..bd4a91f0146a 100644
--- a/bin/node-template/pallets/template/Cargo.toml
+++ b/bin/node-template/pallets/template/Cargo.toml
@@ -14,13 +14,14 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
+	"derive",
+] }
 frame-support = { default-features = false, version = "4.0.0-dev", path = "../../../../frame/support" }
-frame-system = { default-features = false,  version = "4.0.0-dev",  path = "../../../../frame/system" }
-frame-benchmarking = { default-features = false,  version = "4.0.0-dev",  path = "../../../../frame/benchmarking", optional = true }
+frame-system = { default-features = false, version = "4.0.0-dev", path = "../../../../frame/system" }
+frame-benchmarking = { default-features = false, version = "4.0.0-dev", path = "../../../../frame/benchmarking", optional = true }
 
 [dev-dependencies]
-serde = { version = "1.0.126" }
 sp-core = { default-features = false, version = "4.0.0-dev", path = "../../../../primitives/core" }
 sp-io = { default-features = false, version = "4.0.0-dev", path = "../../../../primitives/io" }
 sp-runtime = { default-features = false, version = "4.0.0-dev", path = "../../../../primitives/runtime" }
diff --git a/bin/node/bench/Cargo.toml b/bin/node/bench/Cargo.toml
index 01ec8b253e03..dee927cf944b 100644
--- a/bin/node/bench/Cargo.toml
+++ b/bin/node/bench/Cargo.toml
@@ -13,7 +13,6 @@ log = "0.4.8"
 node-primitives = { version = "2.0.0", path = "../primitives" }
 node-testing = { version = "3.0.0-dev", path = "../testing" }
 node-runtime = { version = "3.0.0-dev", path = "../runtime" }
-sc-cli = { version = "0.10.0-dev", path = "../../../client/cli" }
 sc-client-api = { version = "4.0.0-dev", path = "../../../client/api/" }
 sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
 sp-state-machine = { version = "0.10.0-dev", path = "../../../primitives/state-machine" }
@@ -36,7 +35,9 @@ fs_extra = "1"
 hex = "0.4.0"
 rand = { version = "0.7.2", features = ["small_rng"] }
 lazy_static = "1.4.0"
-parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.10.0", default-features = false, features = [
+    "primitive-types",
+] }
 parity-db = { version = "0.3" }
 sc-transaction-pool = { version = "4.0.0-dev", path = "../../../client/transaction-pool" }
 sc-transaction-pool-api = { version = "4.0.0-dev", path = "../../../client/transaction-pool/api" }
diff --git a/bin/node/browser-testing/Cargo.toml b/bin/node/browser-testing/Cargo.toml
index b4f2cfa5ecec..64c8f4740454 100644
--- a/bin/node/browser-testing/Cargo.toml
+++ b/bin/node/browser-testing/Cargo.toml
@@ -7,18 +7,16 @@ edition = "2018"
 license = "Apache-2.0"
 
 [dependencies]
-futures-timer = "3.0.2"
-libp2p = { version = "0.37.1", default-features = false }
 jsonrpc-core = "18.0.0"
 serde = "1.0.126"
 serde_json = "1.0.48"
 wasm-bindgen = { version = "=0.2.73", features = ["serde-serialize"] }
 wasm-bindgen-futures = "0.4.18"
 wasm-bindgen-test = "0.3.18"
-futures = "0.3.9"
 
-node-cli = { path = "../cli", default-features = false, features = ["browser"], version = "3.0.0-dev"}
-sc-rpc-api = { path = "../../../client/rpc-api", version = "0.10.0-dev"}
+node-cli = { path = "../cli", default-features = false, features = [
+    "browser",
+], version = "3.0.0-dev" }
 
 # This is a HACK to make browser tests pass.
 # enables [`instant/wasm_bindgen`]
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index df432ab26647..a85fa91fa792 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -41,10 +41,9 @@ hex-literal = "0.3.1"
 log = "0.4.8"
 rand = "0.7.2"
 structopt = { version = "0.3.8", optional = true }
-parking_lot = "0.11.1"
 
 # primitives
-sp-authority-discovery = { version = "4.0.0-dev",  path = "../../../primitives/authority-discovery" }
+sp-authority-discovery = { version = "4.0.0-dev", path = "../../../primitives/authority-discovery" }
 sp-consensus-babe = { version = "0.10.0-dev", path = "../../../primitives/consensus/babe" }
 grandpa-primitives = { version = "4.0.0-dev", package = "sp-finality-grandpa", path = "../../../primitives/finality-grandpa" }
 sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
@@ -54,7 +53,6 @@ sp-authorship = { version = "4.0.0-dev", path = "../../../primitives/authorship"
 sp-inherents = { version = "4.0.0-dev", path = "../../../primitives/inherents" }
 sp-keyring = { version = "4.0.0-dev", path = "../../../primitives/keyring" }
 sp-keystore = { version = "0.10.0-dev", path = "../../../primitives/keystore" }
-sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
 sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
 sp-transaction-pool = { version = "4.0.0-dev", path = "../../../primitives/transaction-pool" }
 sp-transaction-storage-proof = { version = "4.0.0-dev", path = "../../../primitives/transaction-storage-proof" }
@@ -70,28 +68,17 @@ sc-consensus-slots = { version = "0.10.0-dev", path = "../../../client/consensus
 sc-consensus-babe = { version = "0.10.0-dev", path = "../../../client/consensus/babe" }
 sc-consensus-uncles = { version = "0.10.0-dev", path = "../../../client/consensus/uncles" }
 grandpa = { version = "0.10.0-dev", package = "sc-finality-grandpa", path = "../../../client/finality-grandpa" }
-sc-client-db = { version = "0.10.0-dev", default-features = false, path = "../../../client/db" }
-sc-offchain = { version = "4.0.0-dev", path = "../../../client/offchain" }
 sc-rpc = { version = "4.0.0-dev", path = "../../../client/rpc" }
 sc-basic-authorship = { version = "0.10.0-dev", path = "../../../client/basic-authorship" }
 sc-service = { version = "0.10.0-dev", default-features = false, path = "../../../client/service" }
-sc-tracing = { version = "4.0.0-dev", path = "../../../client/tracing" }
 sc-telemetry = { version = "4.0.0-dev", path = "../../../client/telemetry" }
-sc-authority-discovery = { version = "0.10.0-dev",  path = "../../../client/authority-discovery" }
+sc-authority-discovery = { version = "0.10.0-dev", path = "../../../client/authority-discovery" }
 sc-sync-state-rpc = { version = "0.10.0-dev", path = "../../../client/sync-state-rpc" }
 
 # frame dependencies
-pallet-indices = { version = "4.0.0-dev", path = "../../../frame/indices" }
-pallet-timestamp = { version = "4.0.0-dev", default-features = false, path = "../../../frame/timestamp" }
-pallet-contracts = { version = "4.0.0-dev", path = "../../../frame/contracts" }
 frame-system = { version = "4.0.0-dev", path = "../../../frame/system" }
-pallet-balances = { version = "4.0.0-dev", path = "../../../frame/balances" }
 pallet-transaction-payment = { version = "4.0.0-dev", path = "../../../frame/transaction-payment" }
-frame-support = { version = "4.0.0-dev", default-features = false, path = "../../../frame/support" }
 pallet-im-online = { version = "4.0.0-dev", default-features = false, path = "../../../frame/im-online" }
-pallet-authority-discovery = { version = "4.0.0-dev", path = "../../../frame/authority-discovery" }
-pallet-staking = { version = "4.0.0-dev", path = "../../../frame/staking" }
-pallet-grandpa = { version = "4.0.0-dev", path = "../../../frame/grandpa" }
 
 # node-specific dependencies
 node-runtime = { version = "3.0.0-dev", path = "../runtime" }
@@ -108,14 +95,24 @@ try-runtime-cli = { version = "0.10.0-dev", optional = true, path = "../../../ut
 # WASM-specific dependencies
 wasm-bindgen = { version = "0.2.73", optional = true }
 wasm-bindgen-futures = { version = "0.4.18", optional = true }
-browser-utils = { package = "substrate-browser-utils", path = "../../../utils/browser", optional = true, version = "0.10.0-dev"}
-libp2p-wasm-ext = { version = "0.28", features = ["websocket"], optional = true }
+browser-utils = { package = "substrate-browser-utils", path = "../../../utils/browser", optional = true, version = "0.10.0-dev" }
+libp2p-wasm-ext = { version = "0.28", features = [
+	"websocket",
+], optional = true }
 
 [target.'cfg(target_arch="x86_64")'.dependencies]
-node-executor = { version = "3.0.0-dev", path = "../executor", features = [ "wasmtime" ] }
-sc-cli = { version = "0.10.0-dev", optional = true, path = "../../../client/cli", features = [ "wasmtime" ] }
-sc-service = { version = "0.10.0-dev", default-features = false, path = "../../../client/service", features = [ "wasmtime" ] }
-sp-trie = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/trie", features = ["memory-tracker"] }
+node-executor = { version = "3.0.0-dev", path = "../executor", features = [
+	"wasmtime",
+] }
+sc-cli = { version = "0.10.0-dev", optional = true, path = "../../../client/cli", features = [
+	"wasmtime",
+] }
+sc-service = { version = "0.10.0-dev", default-features = false, path = "../../../client/service", features = [
+	"wasmtime",
+] }
+sp-trie = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/trie", features = [
+	"memory-tracker",
+] }
 
 [dev-dependencies]
 sc-keystore = { version = "4.0.0-dev", path = "../../../client/keystore" }
@@ -148,7 +145,7 @@ path = "../../../client/cli"
 optional = true
 
 [features]
-default = [ "cli" ]
+default = ["cli"]
 browser = [
 	"browser-utils",
 	"wasm-bindgen",
@@ -172,7 +169,4 @@ runtime-benchmarks = [
 ]
 # Enable features that allow the runtime to be tried and debugged. Name might be subject to change
 # in the near future.
-try-runtime = [
-	"node-runtime/try-runtime",
-	"try-runtime-cli",
-]
+try-runtime = ["node-runtime/try-runtime", "try-runtime-cli"]
diff --git a/bin/node/cli/tests/export_import_flow.rs b/bin/node/cli/tests/export_import_flow.rs
index 583445434d39..7bf64900b752 100644
--- a/bin/node/cli/tests/export_import_flow.rs
+++ b/bin/node/cli/tests/export_import_flow.rs
@@ -78,8 +78,9 @@ impl<'a> ExportImportRevertExecutor<'a> {
 		let sub_command_str = sub_command.to_string();
 		// Adding "--binary" if need be.
 		let arguments: Vec<&str> = match format_opt {
-			FormatOpt::Binary =>
-				vec![&sub_command_str, "--dev", "--pruning", "archive", "--binary", "-d"],
+			FormatOpt::Binary => {
+				vec![&sub_command_str, "--dev", "--pruning", "archive", "--binary", "-d"]
+			},
 			FormatOpt::Json => vec![&sub_command_str, "--dev", "--pruning", "archive", "-d"],
 		};
 
diff --git a/bin/node/executor/Cargo.toml b/bin/node/executor/Cargo.toml
index 5b0617d6af8e..0db8a9e411bf 100644
--- a/bin/node/executor/Cargo.toml
+++ b/bin/node/executor/Cargo.toml
@@ -18,10 +18,8 @@ node-runtime = { version = "3.0.0-dev", path = "../runtime" }
 sc-executor = { version = "0.10.0-dev", path = "../../../client/executor" }
 sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
 sp-keystore = { version = "0.10.0-dev", path = "../../../primitives/keystore" }
-sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
 sp-state-machine = { version = "0.10.0-dev", path = "../../../primitives/state-machine" }
 sp-trie = { version = "4.0.0-dev", path = "../../../primitives/trie" }
-trie-root = "0.16.0"
 frame-benchmarking = { version = "4.0.0-dev", path = "../../../frame/benchmarking" }
 
 [dev-dependencies]
@@ -31,28 +29,19 @@ frame-system = { version = "4.0.0-dev", path = "../../../frame/system" }
 node-testing = { version = "3.0.0-dev", path = "../testing" }
 pallet-balances = { version = "4.0.0-dev", path = "../../../frame/balances" }
 pallet-contracts = { version = "4.0.0-dev", path = "../../../frame/contracts" }
-pallet-grandpa = { version = "4.0.0-dev", path = "../../../frame/grandpa" }
 pallet-im-online = { version = "4.0.0-dev", path = "../../../frame/im-online" }
-pallet-indices = { version = "4.0.0-dev", path = "../../../frame/indices" }
-pallet-session = { version = "4.0.0-dev", path = "../../../frame/session" }
 pallet-timestamp = { version = "4.0.0-dev", path = "../../../frame/timestamp" }
-pallet-transaction-payment = { version = "4.0.0-dev", path = "../../../frame/transaction-payment" }
 pallet-treasury = { version = "4.0.0-dev", path = "../../../frame/treasury" }
 sp-application-crypto = { version = "4.0.0-dev", path = "../../../primitives/application-crypto" }
 sp-consensus-babe = { version = "0.10.0-dev", path = "../../../primitives/consensus/babe" }
 sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
 sp-externalities = { version = "0.10.0-dev", path = "../../../primitives/externalities" }
-substrate-test-client = { version = "2.0.0", path = "../../../test-utils/client" }
 wat = "1.0"
 futures = "0.3.9"
 
 [features]
-wasmtime = [
-	"sc-executor/wasmtime",
-]
-wasmi-errno = [
-	"sc-executor/wasmi-errno",
-]
+wasmtime = ["sc-executor/wasmtime"]
+wasmi-errno = ["sc-executor/wasmi-errno"]
 stress-test = []
 
 [[bench]]
diff --git a/bin/node/inspect/Cargo.toml b/bin/node/inspect/Cargo.toml
index abd54cdbcd95..c4fd1fb3adc9 100644
--- a/bin/node/inspect/Cargo.toml
+++ b/bin/node/inspect/Cargo.toml
@@ -13,7 +13,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 derive_more = "0.99"
-log = "0.4.8"
 sc-cli = { version = "0.10.0-dev", path = "../../../client/cli" }
 sc-client-api = { version = "4.0.0-dev", path = "../../../client/api" }
 sc-service = { version = "0.10.0-dev", default-features = false, path = "../../../client/service" }
diff --git a/bin/node/primitives/Cargo.toml b/bin/node/primitives/Cargo.toml
index 170983d7e096..de6000b60206 100644
--- a/bin/node/primitives/Cargo.toml
+++ b/bin/node/primitives/Cargo.toml
@@ -11,16 +11,14 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
+	"derive",
+] }
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../../../frame/system" }
 sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/application-crypto" }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/core" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/runtime" }
 
-[dev-dependencies]
-sp-serializer = { version = "3.0.0", path = "../../../primitives/serializer" }
-pretty_assertions = "0.6.1"
-
 [features]
 default = ["std"]
 std = [
diff --git a/bin/node/rpc-client/Cargo.toml b/bin/node/rpc-client/Cargo.toml
index 4cf3e57994db..a5255769158a 100644
--- a/bin/node/rpc-client/Cargo.toml
+++ b/bin/node/rpc-client/Cargo.toml
@@ -12,8 +12,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 futures = "0.3.16"
-jsonrpc-core-client = { version = "18.0.0", default-features = false, features = ["http"] }
-log = "0.4.8"
+jsonrpc-core-client = { version = "18.0.0", default-features = false, features = [
+    "http",
+] }
 node-primitives = { version = "2.0.0", path = "../primitives" }
 sp-tracing = { version = "4.0.0-dev", path = "../../../primitives/tracing" }
 sc-rpc = { version = "4.0.0-dev", path = "../../../client/rpc" }
diff --git a/bin/node/rpc/Cargo.toml b/bin/node/rpc/Cargo.toml
index 971a02e73386..0cb606f79f08 100644
--- a/bin/node/rpc/Cargo.toml
+++ b/bin/node/rpc/Cargo.toml
@@ -23,7 +23,6 @@ sc-consensus-epochs = { version = "0.10.0-dev", path = "../../../client/consensu
 sc-chain-spec = { version = "4.0.0-dev", path = "../../../client/chain-spec" }
 sc-finality-grandpa = { version = "0.10.0-dev", path = "../../../client/finality-grandpa" }
 sc-finality-grandpa-rpc = { version = "0.10.0-dev", path = "../../../client/finality-grandpa/rpc" }
-sc-keystore = { version = "4.0.0-dev", path = "../../../client/keystore" }
 sc-rpc-api = { version = "0.10.0-dev", path = "../../../client/rpc-api" }
 sc-rpc = { version = "4.0.0-dev", path = "../../../client/rpc" }
 sc-sync-state-rpc = { version = "0.10.0-dev", path = "../../../client/sync-state-rpc" }
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index 78e46edbd64e..d4b9975704a4 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -14,7 +14,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 
 # third-party dependencies
-codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
+codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = [
+	"derive",
+	"max-encoded-len",
+] }
 static_assertions = "1.1.0"
 hex-literal = { version = "0.3.1", optional = true }
 log = { version = "0.4.14", default-features = false }
@@ -22,7 +25,7 @@ log = { version = "0.4.14", default-features = false }
 # primitives
 sp-authority-discovery = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/authority-discovery" }
 sp-consensus-babe = { version = "0.10.0-dev", default-features = false, path = "../../../primitives/consensus/babe" }
-sp-block-builder = { path = "../../../primitives/block-builder", default-features = false, version = "4.0.0-dev"}
+sp-block-builder = { path = "../../../primitives/block-builder", default-features = false, version = "4.0.0-dev" }
 sp-inherents = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/inherents" }
 node-primitives = { version = "2.0.0", default-features = false, path = "../primitives" }
 sp-offchain = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/offchain" }
@@ -73,7 +76,9 @@ pallet-offences-benchmarking = { version = "4.0.0-dev", path = "../../../frame/o
 pallet-proxy = { version = "4.0.0-dev", default-features = false, path = "../../../frame/proxy" }
 pallet-randomness-collective-flip = { version = "4.0.0-dev", default-features = false, path = "../../../frame/randomness-collective-flip" }
 pallet-recovery = { version = "4.0.0-dev", default-features = false, path = "../../../frame/recovery" }
-pallet-session = { version = "4.0.0-dev", features = ["historical"], path = "../../../frame/session", default-features = false }
+pallet-session = { version = "4.0.0-dev", features = [
+	"historical",
+], path = "../../../frame/session", default-features = false }
 pallet-session-benchmarking = { version = "4.0.0-dev", path = "../../../frame/session/benchmarking", default-features = false, optional = true }
 pallet-staking = { version = "4.0.0-dev", default-features = false, path = "../../../frame/staking" }
 pallet-staking-reward-curve = { version = "4.0.0-dev", default-features = false, path = "../../../frame/staking/reward-curve" }
@@ -98,7 +103,7 @@ sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
 
 [features]
 default = ["std"]
-with-tracing = [ "frame-executive/with-tracing" ]
+with-tracing = ["frame-executive/with-tracing"]
 std = [
 	"sp-authority-discovery/std",
 	"pallet-assets/std",
@@ -247,6 +252,4 @@ try-runtime = [
 ]
 # Make contract callable functions marked as __unstable__ available. Do not enable
 # on live chains as those are subject to change.
-contracts-unstable-interface = [
-	"pallet-contracts/unstable-interface"
-]
+contracts-unstable-interface = ["pallet-contracts/unstable-interface"]
diff --git a/bin/node/test-runner-example/Cargo.toml b/bin/node/test-runner-example/Cargo.toml
index ef75731c38a6..96c4c2047ac4 100644
--- a/bin/node/test-runner-example/Cargo.toml
+++ b/bin/node/test-runner-example/Cargo.toml
@@ -9,10 +9,7 @@ publish = false
 test-runner = { path = "../../../test-utils/test-runner" }
 
 frame-system = { path = "../../../frame/system" }
-frame-support = { path = "../../../frame/support" }
 frame-benchmarking = { path = "../../../frame/benchmarking" }
-pallet-balances = { path = "../../../frame/balances" }
-pallet-sudo = { path = "../../../frame/sudo" }
 pallet-transaction-payment = { path = "../../../frame/transaction-payment" }
 
 node-runtime = { path = "../runtime" }
@@ -25,16 +22,7 @@ sc-consensus-babe = { path = "../../../client/consensus/babe" }
 sc-consensus-manual-seal = { path = "../../../client/consensus/manual-seal" }
 sc-service = { default-features = false, path = "../../../client/service" }
 sc-executor = { path = "../../../client/executor" }
-sc-client-api = { path = "../../../client/api" }
-sc-network = { path = "../../../client/network" }
-sc-informant = { path = "../../../client/informant" }
 sc-consensus = { path = "../../../client/consensus/common" }
 
 sp-runtime = { path = "../../../primitives/runtime" }
 sp-keyring = { path = "../../../primitives/keyring" }
-sp-timestamp = { path = "../../../primitives/timestamp" }
-sp-api = {  path = "../../../primitives/api" }
-sp-inherents = { path = "../../../primitives/inherents" }
-sp-keystore = { path = "../../../primitives/keystore" }
-
-log = "0.4.14"
diff --git a/bin/node/testing/Cargo.toml b/bin/node/testing/Cargo.toml
index 656f9331c5af..d05d815121f8 100644
--- a/bin/node/testing/Cargo.toml
+++ b/bin/node/testing/Cargo.toml
@@ -13,33 +13,31 @@ publish = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-pallet-balances = { version = "4.0.0-dev", path = "../../../frame/balances" }
-sc-service = { version = "0.10.0-dev", features = ["test-helpers", "db"],  path = "../../../client/service" }
-sc-client-db = { version = "0.10.0-dev", path = "../../../client/db/", features = ["kvdb-rocksdb", "parity-db"] }
+sc-service = { version = "0.10.0-dev", features = [
+    "test-helpers",
+    "db",
+], path = "../../../client/service" }
+sc-client-db = { version = "0.10.0-dev", path = "../../../client/db/", features = [
+    "kvdb-rocksdb",
+    "parity-db",
+] }
 sc-client-api = { version = "4.0.0-dev", path = "../../../client/api/" }
 sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/common" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-pallet-contracts = { version = "4.0.0-dev", path = "../../../frame/contracts" }
-pallet-grandpa = { version = "4.0.0-dev", path = "../../../frame/grandpa" }
-pallet-indices = { version = "4.0.0-dev", path = "../../../frame/indices" }
 sp-keyring = { version = "4.0.0-dev", path = "../../../primitives/keyring" }
 node-executor = { version = "3.0.0-dev", path = "../executor" }
 node-primitives = { version = "2.0.0", path = "../primitives" }
 node-runtime = { version = "3.0.0-dev", path = "../runtime" }
 sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
 sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
-frame-support = { version = "4.0.0-dev", path = "../../../frame/support" }
-pallet-session = { version = "4.0.0-dev", path = "../../../frame/session" }
-pallet-society = { version = "4.0.0-dev", path = "../../../frame/society" }
 sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
-pallet-staking = { version = "4.0.0-dev", path = "../../../frame/staking" }
-sc-executor = { version = "0.10.0-dev", path = "../../../client/executor", features = ["wasmtime"] }
+sc-executor = { version = "0.10.0-dev", path = "../../../client/executor", features = [
+    "wasmtime",
+] }
 sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
 frame-system = { version = "4.0.0-dev", path = "../../../frame/system" }
 substrate-test-client = { version = "2.0.0", path = "../../../test-utils/client" }
-pallet-timestamp = { version = "4.0.0-dev", path = "../../../frame/timestamp" }
 pallet-transaction-payment = { version = "4.0.0-dev", path = "../../../frame/transaction-payment" }
-pallet-treasury = { version = "4.0.0-dev", path = "../../../frame/treasury" }
 sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
 sp-timestamp = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/timestamp" }
 sp-block-builder = { version = "4.0.0-dev", path = "../../../primitives/block-builder" }
@@ -50,7 +48,3 @@ log = "0.4.8"
 tempfile = "3.1.0"
 fs_extra = "1"
 futures = "0.3.1"
-
-[dev-dependencies]
-criterion = "0.3.0"
-sc-cli = { version = "0.10.0-dev", path = "../../../client/cli" }
diff --git a/client/api/Cargo.toml b/client/api/Cargo.toml
index 29d38147b988..06acc33bd20c 100644
--- a/client/api/Cargo.toml
+++ b/client/api/Cargo.toml
@@ -14,25 +14,21 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
+    "derive",
+] }
 sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
-derive_more = "0.99.2"
 sc-executor = { version = "0.10.0-dev", path = "../executor" }
 sp-externalities = { version = "0.10.0-dev", path = "../../primitives/externalities" }
 fnv = "1.0.6"
 futures = "0.3.1"
 hash-db = { version = "0.15.2", default-features = false }
 sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
-sp-inherents = { version = "4.0.0-dev", default-features = false, path = "../../primitives/inherents" }
-kvdb = "0.10.0"
 log = "0.4.8"
 parking_lot = "0.11.1"
-lazy_static =  "1.4.0"
 sp-database = { version = "4.0.0-dev", path = "../../primitives/database" }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
 sp-keystore = { version = "0.10.0-dev", default-features = false, path = "../../primitives/keystore" }
-sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
-sp-version = { version = "4.0.0-dev", default-features = false, path = "../../primitives/version" }
 sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
 sp-utils = { version = "4.0.0-dev", path = "../../primitives/utils" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
@@ -43,7 +39,6 @@ sc-transaction-pool-api = { version = "4.0.0-dev", path = "../transaction-pool/a
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.9.0", path = "../../utils/prometheus" }
 
 [dev-dependencies]
-kvdb-memorydb = "0.10.0"
 sp-test-primitives = { version = "2.0.0", path = "../../primitives/test-primitives" }
-substrate-test-runtime = { version = "2.0.0", path = "../../test-utils/runtime"  }
+substrate-test-runtime = { version = "2.0.0", path = "../../test-utils/runtime" }
 thiserror = "1.0.21"
diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml
index bca84d18d088..10dbf5fdc8a8 100644
--- a/client/authority-discovery/Cargo.toml
+++ b/client/authority-discovery/Cargo.toml
@@ -20,18 +20,16 @@ prost-build = "0.7"
 async-trait = "0.1"
 codec = { package = "parity-scale-codec", default-features = false, version = "2.0.0" }
 derive_more = "0.99.2"
-either = "1.5.3"
 futures = "0.3.9"
 futures-timer = "3.0.1"
 ip_network = "0.3.4"
 libp2p = { version = "0.37.1", default-features = false, features = ["kad"] }
 log = "0.4.8"
-prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
+prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0" }
 prost = "0.7"
 rand = "0.7.2"
 sc-client-api = { version = "4.0.0-dev", path = "../api" }
 sc-network = { version = "0.10.0-dev", path = "../network" }
-serde_json = "1.0.41"
 sp-authority-discovery = { version = "4.0.0-dev", path = "../../primitives/authority-discovery" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
@@ -42,5 +40,4 @@ sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
 [dev-dependencies]
 quickcheck = "1.0.3"
 sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
-sc-peerset = { version = "4.0.0-dev", path = "../peerset" }
-substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client"}
+substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
diff --git a/client/basic-authorship/src/basic_authorship.rs b/client/basic-authorship/src/basic_authorship.rs
index b9703041ffd9..144a3ab6850f 100644
--- a/client/basic-authorship/src/basic_authorship.rs
+++ b/client/basic-authorship/src/basic_authorship.rs
@@ -319,8 +319,9 @@ where
 
 		for inherent in block_builder.create_inherents(inherent_data)? {
 			match block_builder.push(inherent) {
-				Err(ApplyExtrinsicFailed(Validity(e))) if e.exhausted_resources() =>
-					warn!("⚠️  Dropping non-mandatory inherent from overweight block."),
+				Err(ApplyExtrinsicFailed(Validity(e))) if e.exhausted_resources() => {
+					warn!("⚠️  Dropping non-mandatory inherent from overweight block.")
+				},
 				Err(ApplyExtrinsicFailed(Validity(e))) if e.was_mandatory() => {
 					error!(
 						"❌️ Mandatory inherent extrinsic returned error. Block cannot be produced."
diff --git a/client/block-builder/Cargo.toml b/client/block-builder/Cargo.toml
index 557b324efc9a..6fef8498134e 100644
--- a/client/block-builder/Cargo.toml
+++ b/client/block-builder/Cargo.toml
@@ -22,8 +22,9 @@ sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 sp-block-builder = { version = "4.0.0-dev", path = "../../primitives/block-builder" }
 sp-inherents = { version = "4.0.0-dev", path = "../../primitives/inherents" }
 sc-client-api = { version = "4.0.0-dev", path = "../api" }
-codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", features = [
+    "derive",
+] }
 
 [dev-dependencies]
 substrate-test-runtime-client = { path = "../../test-utils/runtime/client" }
-sp-trie = { version = "4.0.0-dev", path = "../../primitives/trie" }
diff --git a/client/consensus/aura/Cargo.toml b/client/consensus/aura/Cargo.toml
index c23ad5550576..75595779427b 100644
--- a/client/consensus/aura/Cargo.toml
+++ b/client/consensus/aura/Cargo.toml
@@ -24,19 +24,16 @@ sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/commo
 sp-consensus-slots = { version = "0.10.0-dev", path = "../../../primitives/consensus/slots" }
 derive_more = "0.99.2"
 futures = "0.3.9"
-futures-timer = "3.0.1"
 sp-inherents = { version = "4.0.0-dev", path = "../../../primitives/inherents" }
 log = "0.4.8"
 sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
-sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
-sp-version = { version = "4.0.0-dev", path = "../../../primitives/version" }
 sc-consensus-slots = { version = "0.10.0-dev", path = "../slots" }
 sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
 sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
 sp-keystore = { version = "0.10.0-dev", path = "../../../primitives/keystore" }
 sc-telemetry = { version = "4.0.0-dev", path = "../../telemetry" }
-prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0"}
+prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0" }
 async-trait = "0.1.50"
 # We enable it only for web-wasm check
 # See https://docs.rs/getrandom/0.2.1/getrandom/#webassembly-support
@@ -46,11 +43,9 @@ getrandom = { version = "0.2", features = ["js"], optional = true }
 sp-timestamp = { version = "4.0.0-dev", path = "../../../primitives/timestamp" }
 sp-keyring = { version = "4.0.0-dev", path = "../../../primitives/keyring" }
 sp-tracing = { version = "4.0.0-dev", path = "../../../primitives/tracing" }
-sc-executor = { version = "0.10.0-dev", path = "../../executor" }
 sc-keystore = { version = "4.0.0-dev", path = "../../keystore" }
 sc-network = { version = "0.10.0-dev", path = "../../network" }
 sc-network-test = { version = "0.8.0", path = "../../network/test" }
-sc-service = { version = "0.10.0-dev", default-features = false, path = "../../service" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
 tempfile = "3.1.0"
 parking_lot = "0.11.1"
diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml
index 7e754c6fb2e6..65dfc5713320 100644
--- a/client/consensus/babe/Cargo.toml
+++ b/client/consensus/babe/Cargo.toml
@@ -14,7 +14,9 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", features = [
+    "derive",
+] }
 sp-consensus-babe = { version = "0.10.0-dev", path = "../../../primitives/consensus/babe" }
 sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/common" }
 sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
@@ -37,14 +39,11 @@ sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain"
 sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
 sp-consensus-slots = { version = "0.10.0-dev", path = "../../../primitives/consensus/slots" }
 sp-consensus-vrf = { version = "0.10.0-dev", path = "../../../primitives/consensus/vrf" }
-sc-consensus-uncles = { version = "0.10.0-dev", path = "../uncles" }
 sc-consensus-slots = { version = "0.10.0-dev", path = "../slots" }
 sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
-sp-utils = { version = "4.0.0-dev", path = "../../../primitives/utils" }
 fork-tree = { version = "3.0.0", path = "../../../utils/fork-tree" }
-prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0"}
+prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0" }
 futures = "0.3.9"
-futures-timer = "3.0.1"
 parking_lot = "0.11.1"
 log = "0.4.8"
 schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated"] }
@@ -56,12 +55,9 @@ async-trait = "0.1.50"
 
 [dev-dependencies]
 sp-timestamp = { version = "4.0.0-dev", path = "../../../primitives/timestamp" }
-sp-keyring = { version = "4.0.0-dev", path = "../../../primitives/keyring" }
 sp-tracing = { version = "4.0.0-dev", path = "../../../primitives/tracing" }
-sc-executor = { version = "0.10.0-dev", path = "../../executor" }
 sc-network = { version = "0.10.0-dev", path = "../../network" }
 sc-network-test = { version = "0.8.0", path = "../../network/test" }
-sc-service = { version = "0.10.0-dev", default-features = false, path = "../../service" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
 sc-block-builder = { version = "0.10.0-dev", path = "../../block-builder" }
 rand_chacha = "0.2.2"
diff --git a/client/consensus/common/Cargo.toml b/client/consensus/common/Cargo.toml
index c34e5416f84b..9cec265f859f 100644
--- a/client/consensus/common/Cargo.toml
+++ b/client/consensus/common/Cargo.toml
@@ -20,8 +20,8 @@ futures = { version = "0.3.1", features = ["thread-pool"] }
 futures-timer = "3.0.1"
 sc-client-api = { version = "4.0.0-dev", path = "../../api" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
-sp-core = { path = "../../../primitives/core", version = "4.0.0-dev"}
-sp-consensus = { path = "../../../primitives/consensus/common", version = "0.10.0-dev"}
+sp-core = { path = "../../../primitives/core", version = "4.0.0-dev" }
+sp-consensus = { path = "../../../primitives/consensus/common", version = "0.10.0-dev" }
 sp-state-machine = { version = "0.10.0-dev", path = "../../../primitives/state-machine" }
 sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
 sp-utils = { version = "4.0.0-dev", path = "../../../primitives/utils" }
diff --git a/client/consensus/epochs/src/lib.rs b/client/consensus/epochs/src/lib.rs
index 685a5c26d0db..f3cfc55bae69 100644
--- a/client/consensus/epochs/src/lib.rs
+++ b/client/consensus/epochs/src/lib.rs
@@ -561,12 +561,13 @@ where
 							// Ok, we found our node.
 							// and here we figure out which of the internal epochs
 							// of a genesis node to use based on their start slot.
-							PersistedEpochHeader::Genesis(ref epoch_0, ref epoch_1) =>
+							PersistedEpochHeader::Genesis(ref epoch_0, ref epoch_1) => {
 								if epoch_1.start_slot <= slot {
 									(EpochIdentifierPosition::Genesis1, epoch_1.clone())
 								} else {
 									(EpochIdentifierPosition::Genesis0, epoch_0.clone())
-								},
+								}
+							},
 							PersistedEpochHeader::Regular(ref epoch_n) =>
 								(EpochIdentifierPosition::Regular, epoch_n.clone()),
 						},
diff --git a/client/consensus/manual-seal/Cargo.toml b/client/consensus/manual-seal/Cargo.toml
index 82969c91652d..26172f634fa7 100644
--- a/client/consensus/manual-seal/Cargo.toml
+++ b/client/consensus/manual-seal/Cargo.toml
@@ -19,36 +19,33 @@ jsonrpc-core = "18.0.0"
 jsonrpc-core-client = "18.0.0"
 jsonrpc-derive = "18.0.0"
 log = "0.4.8"
-parking_lot = "0.11.1"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-serde = { version = "1.0", features=["derive"] }
+serde = { version = "1.0", features = ["derive"] }
 assert_matches = "1.3.0"
 async-trait = "0.1.50"
 
-sc-client-api = { path = "../../api", version = "4.0.0-dev"}
+sc-client-api = { path = "../../api", version = "4.0.0-dev" }
 sc-consensus = { version = "0.10.0-dev", path = "../../consensus/common" }
-sc-consensus-babe = { path = "../../consensus/babe", version = "0.10.0-dev"}
-sc-consensus-epochs = { path = "../../consensus/epochs", version = "0.10.0-dev"}
-sp-consensus-babe = { path = "../../../primitives/consensus/babe", version = "0.10.0-dev"}
+sc-consensus-babe = { path = "../../consensus/babe", version = "0.10.0-dev" }
+sc-consensus-epochs = { path = "../../consensus/epochs", version = "0.10.0-dev" }
+sp-consensus-babe = { path = "../../../primitives/consensus/babe", version = "0.10.0-dev" }
 
-sc-transaction-pool = { path = "../../transaction-pool", version = "4.0.0-dev"}
-sp-blockchain = { path = "../../../primitives/blockchain", version = "4.0.0-dev"}
-sp-consensus = { path = "../../../primitives/consensus/common", version = "0.10.0-dev"}
-sp-consensus-slots = { path = "../../../primitives/consensus/slots", version = "0.10.0-dev"}
-sp-inherents = { path = "../../../primitives/inherents", version = "4.0.0-dev"}
-sp-runtime = {  path = "../../../primitives/runtime", version = "4.0.0-dev"}
-sp-core = {  path = "../../../primitives/core", version = "4.0.0-dev"}
-sp-keystore = {  path = "../../../primitives/keystore", version = "0.10.0-dev"}
-sp-keyring = {  path = "../../../primitives/keyring", version = "4.0.0-dev"}
-sp-api = {  path = "../../../primitives/api", version = "4.0.0-dev"}
-sc-transaction-pool-api = { path = "../../../client/transaction-pool/api", version = "4.0.0-dev"}
-sp-timestamp = { path = "../../../primitives/timestamp", version = "4.0.0-dev"}
+sc-transaction-pool = { path = "../../transaction-pool", version = "4.0.0-dev" }
+sp-blockchain = { path = "../../../primitives/blockchain", version = "4.0.0-dev" }
+sp-consensus = { path = "../../../primitives/consensus/common", version = "0.10.0-dev" }
+sp-consensus-slots = { path = "../../../primitives/consensus/slots", version = "0.10.0-dev" }
+sp-inherents = { path = "../../../primitives/inherents", version = "4.0.0-dev" }
+sp-runtime = { path = "../../../primitives/runtime", version = "4.0.0-dev" }
+sp-core = { path = "../../../primitives/core", version = "4.0.0-dev" }
+sp-keystore = { path = "../../../primitives/keystore", version = "0.10.0-dev" }
+sp-api = { path = "../../../primitives/api", version = "4.0.0-dev" }
+sc-transaction-pool-api = { path = "../../../client/transaction-pool/api", version = "4.0.0-dev" }
+sp-timestamp = { path = "../../../primitives/timestamp", version = "4.0.0-dev" }
 
-prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0"}
+prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0" }
 
 [dev-dependencies]
 tokio = { version = "0.2", features = ["rt-core", "macros"] }
-sc-basic-authorship = { path = "../../basic-authorship", version = "0.10.0-dev"}
+sc-basic-authorship = { path = "../../basic-authorship", version = "0.10.0-dev" }
 substrate-test-runtime-client = { path = "../../../test-utils/runtime/client", version = "2.0.0" }
 substrate-test-runtime-transaction-pool = { path = "../../../test-utils/runtime/transaction-pool", version = "2.0.0" }
-tempfile = "3.1.0"
diff --git a/client/consensus/slots/Cargo.toml b/client/consensus/slots/Cargo.toml
index 4e027ccab772..4c0142829bb5 100644
--- a/client/consensus/slots/Cargo.toml
+++ b/client/consensus/slots/Cargo.toml
@@ -17,8 +17,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 sc-client-api = { version = "4.0.0-dev", path = "../../api" }
 sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
-sp-trie = { version = "4.0.0-dev", path = "../../../primitives/trie" }
-sp-application-crypto = { version = "4.0.0-dev", path = "../../../primitives/application-crypto" }
 sp-arithmetic = { version = "4.0.0-dev", path = "../../../primitives/arithmetic" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
 sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/common" }
@@ -34,7 +32,6 @@ futures = "0.3.9"
 futures-timer = "3.0.1"
 log = "0.4.11"
 thiserror = "1.0.21"
-impl-trait-for-tuples = "0.2.1"
 async-trait = "0.1.50"
 
 [dev-dependencies]
diff --git a/client/db/Cargo.toml b/client/db/Cargo.toml
index 85ab58472f43..1d3d76ee7a55 100644
--- a/client/db/Cargo.toml
+++ b/client/db/Cargo.toml
@@ -20,25 +20,22 @@ kvdb-rocksdb = { version = "0.14.0", optional = true }
 kvdb-memorydb = "0.10.0"
 linked-hash-map = "0.5.4"
 hash-db = "0.15.2"
-parity-util-mem = { version = "0.10.0", default-features = false, features = ["std"] }
-codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
-blake2-rfc = "0.2.18"
+codec = { package = "parity-scale-codec", version = "2.0.0", features = [
+    "derive",
+] }
 
 sc-client-api = { version = "4.0.0-dev", path = "../api" }
 sp-arithmetic = { version = "4.0.0-dev", path = "../../primitives/arithmetic" }
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
 sp-state-machine = { version = "0.10.0-dev", path = "../../primitives/state-machine" }
-sc-executor = { version = "0.10.0-dev", path = "../executor" }
 sc-state-db = { version = "0.10.0-dev", path = "../state-db" }
 sp-trie = { version = "4.0.0-dev", path = "../../primitives/trie" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
 sp-database = { version = "4.0.0-dev", path = "../../primitives/database" }
 parity-db = { version = "0.3.1", optional = true }
-prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.9.0", path = "../../utils/prometheus" }
 
 [dev-dependencies]
-sp-keyring = { version = "4.0.0-dev", path = "../../primitives/keyring" }
 sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 quickcheck = "1.0.3"
diff --git a/client/db/src/upgrade.rs b/client/db/src/upgrade.rs
index 0358086690cc..5c9c2ccdc51d 100644
--- a/client/db/src/upgrade.rs
+++ b/client/db/src/upgrade.rs
@@ -67,15 +67,19 @@ impl From<io::Error> for UpgradeError {
 impl fmt::Display for UpgradeError {
 	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 		match self {
-			UpgradeError::UnknownDatabaseVersion =>
-				write!(f, "Database version cannot be read from exisiting db_version file"),
+			UpgradeError::UnknownDatabaseVersion => {
+				write!(f, "Database version cannot be read from exisiting db_version file")
+			},
 			UpgradeError::MissingDatabaseVersionFile => write!(f, "Missing database version file"),
-			UpgradeError::UnsupportedVersion(version) =>
-				write!(f, "Database version no longer supported: {}", version),
-			UpgradeError::FutureDatabaseVersion(version) =>
-				write!(f, "Database version comes from future version of the client: {}", version),
-			UpgradeError::DecodingJustificationBlock =>
-				write!(f, "Decodoning justification block failed"),
+			UpgradeError::UnsupportedVersion(version) => {
+				write!(f, "Database version no longer supported: {}", version)
+			},
+			UpgradeError::FutureDatabaseVersion(version) => {
+				write!(f, "Database version comes from future version of the client: {}", version)
+			},
+			UpgradeError::DecodingJustificationBlock => {
+				write!(f, "Decodoning justification block failed")
+			},
 			UpgradeError::Io(err) => write!(f, "Io error: {}", err),
 		}
 	}
diff --git a/client/db/src/utils.rs b/client/db/src/utils.rs
index 48aaf6694816..604a0e132876 100644
--- a/client/db/src/utils.rs
+++ b/client/db/src/utils.rs
@@ -249,8 +249,9 @@ impl fmt::Display for OpenDbError {
 		match self {
 			OpenDbError::Internal(e) => write!(f, "{}", e.to_string()),
 			OpenDbError::DoesNotExist => write!(f, "Database does not exist at given location"),
-			OpenDbError::NotEnabled(feat) =>
-				write!(f, "`{}` feature not enabled, database can not be opened", feat),
+			OpenDbError::NotEnabled(feat) => {
+				write!(f, "`{}` feature not enabled, database can not be opened", feat)
+			},
 		}
 	}
 }
diff --git a/client/executor/Cargo.toml b/client/executor/Cargo.toml
index a96163f200df..12c417253574 100644
--- a/client/executor/Cargo.toml
+++ b/client/executor/Cargo.toml
@@ -14,17 +14,14 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-derive_more = "0.99.2"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 sp-tasks = { version = "4.0.0-dev", path = "../../primitives/tasks" }
 sp-trie = { version = "4.0.0-dev", path = "../../primitives/trie" }
-sp-serializer = { version = "3.0.0", path = "../../primitives/serializer" }
 sp-version = { version = "4.0.0-dev", path = "../../primitives/version" }
 sp-panic-handler = { version = "3.0.0", path = "../../primitives/panic-handler" }
 wasmi = "0.9.0"
-parity-wasm = "0.42.0"
 lazy_static = "1.4.0"
 sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
 sp-wasm-interface = { version = "4.0.0-dev", path = "../../primitives/wasm-interface" }
@@ -38,29 +35,23 @@ log = "0.4.8"
 libsecp256k1 = "0.3.4"
 
 [dev-dependencies]
-assert_matches = "1.3.0"
 wat = "1.0"
 hex-literal = "0.3.1"
 sc-runtime-test = { version = "2.0.0", path = "runtime-test" }
 substrate-test-runtime = { version = "2.0.0", path = "../../test-utils/runtime" }
 sp-state-machine = { version = "0.10.0-dev", path = "../../primitives/state-machine" }
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
-sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
 sp-maybe-compressed-blob = { version = "4.0.0-dev", path = "../../primitives/maybe-compressed-blob" }
 sc-tracing = { version = "4.0.0-dev", path = "../tracing" }
 tracing = "0.1.25"
-tracing-subscriber = "0.2.18"
+tracing-subscriber = "0.2.19"
 paste = "1.0"
 regex = "1"
 
 [features]
-default = [ "std" ]
+default = ["std"]
 # This crate does not have `no_std` support, we just require this for tests
 std = []
 wasm-extern-trace = []
-wasmtime = [
-	"sc-executor-wasmtime",
-]
-wasmi-errno = [
-	"wasmi/errno"
-]
+wasmtime = ["sc-executor-wasmtime"]
+wasmi-errno = ["wasmi/errno"]
diff --git a/client/executor/wasmtime/Cargo.toml b/client/executor/wasmtime/Cargo.toml
index e2736cd375a3..3158cdecc326 100644
--- a/client/executor/wasmtime/Cargo.toml
+++ b/client/executor/wasmtime/Cargo.toml
@@ -24,11 +24,12 @@ sp-wasm-interface = { version = "4.0.0-dev", path = "../../../primitives/wasm-in
 sp-runtime-interface = { version = "4.0.0-dev", path = "../../../primitives/runtime-interface" }
 sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
 sc-allocator = { version = "4.0.0-dev", path = "../../allocator" }
-wasmtime = { version = "0.27.0", default-features = false, features = ["cache", "parallel-compilation"] }
-pwasm-utils = { version = "0.18" }
+wasmtime = { version = "0.27.0", default-features = false, features = [
+    "cache",
+    "parallel-compilation",
+] }
 
 [dev-dependencies]
-assert_matches = "1.3.0"
 sc-runtime-test = { version = "2.0.0", path = "../runtime-test" }
 sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
 wat = "1.0"
diff --git a/client/finality-grandpa-warp-sync/Cargo.toml b/client/finality-grandpa-warp-sync/Cargo.toml
index 62fe59608333..a1caee4ee74b 100644
--- a/client/finality-grandpa-warp-sync/Cargo.toml
+++ b/client/finality-grandpa-warp-sync/Cargo.toml
@@ -16,8 +16,6 @@ codec = { package = "parity-scale-codec", version = "2.0.0" }
 derive_more = "0.99.11"
 futures = "0.3.8"
 log = "0.4.11"
-num-traits = "0.2.14"
-parking_lot = "0.11.1"
 prost = "0.7"
 sc-client-api = { version = "4.0.0-dev", path = "../api" }
 sc-finality-grandpa = { version = "0.10.0-dev", path = "../finality-grandpa" }
diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml
index 6c19dccfa8a5..6fbeeaf1ee65 100644
--- a/client/finality-grandpa/Cargo.toml
+++ b/client/finality-grandpa/Cargo.toml
@@ -37,28 +37,26 @@ sc-telemetry = { version = "4.0.0-dev", path = "../telemetry" }
 sc-keystore = { version = "4.0.0-dev", path = "../keystore" }
 serde_json = "1.0.41"
 sc-client-api = { version = "4.0.0-dev", path = "../api" }
-sp-inherents = { version = "4.0.0-dev", path = "../../primitives/inherents" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
 sc-network = { version = "0.10.0-dev", path = "../network" }
 sc-network-gossip = { version = "0.10.0-dev", path = "../network-gossip" }
 sp-finality-grandpa = { version = "4.0.0-dev", path = "../../primitives/finality-grandpa" }
-prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
+prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0" }
 sc-block-builder = { version = "0.10.0-dev", path = "../block-builder" }
 finality-grandpa = { version = "0.14.1", features = ["derive-codec"] }
-pin-project = "1.0.4"
-linked-hash-map = "0.5.4"
 async-trait = "0.1.50"
 wasm-timer = "0.2"
 
 [dev-dependencies]
 assert_matches = "1.3.0"
-finality-grandpa = { version = "0.14.1", features = ["derive-codec", "test-helpers"] }
+finality-grandpa = { version = "0.14.1", features = [
+    "derive-codec",
+    "test-helpers",
+] }
 sc-network = { version = "0.10.0-dev", path = "../network" }
 sc-network-test = { version = "0.8.0", path = "../network/test" }
 sp-keyring = { version = "4.0.0-dev", path = "../../primitives/keyring" }
-substrate-test-runtime-client = { version = "2.0.0",  path = "../../test-utils/runtime/client" }
-sp-consensus-babe = { version = "0.10.0-dev", path = "../../primitives/consensus/babe" }
-sp-state-machine = { version = "0.10.0-dev", path = "../../primitives/state-machine" }
+substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
 tokio = { version = "0.2", features = ["rt-core"] }
 tempfile = "3.1.0"
diff --git a/client/finality-grandpa/rpc/Cargo.toml b/client/finality-grandpa/rpc/Cargo.toml
index 13fcd3f7392d..4f989ad4964c 100644
--- a/client/finality-grandpa/rpc/Cargo.toml
+++ b/client/finality-grandpa/rpc/Cargo.toml
@@ -29,11 +29,10 @@ sc-client-api = { version = "4.0.0-dev", path = "../../api" }
 
 [dev-dependencies]
 sc-block-builder = { version = "0.10.0-dev", path = "../../block-builder" }
-sc-network-test = { version = "0.8.0", path = "../../network/test" }
-sc-rpc = { version = "4.0.0-dev", path = "../../rpc", features = ["test-helpers"] }
-sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
+sc-rpc = { version = "4.0.0-dev", path = "../../rpc", features = [
+    "test-helpers",
+] }
 sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
 sp-finality-grandpa = { version = "4.0.0-dev", path = "../../../primitives/finality-grandpa" }
 sp-keyring = { version = "4.0.0-dev", path = "../../../primitives/keyring" }
-substrate-test-runtime-client = { version = "2.0.0",  path = "../../../test-utils/runtime/client" }
-lazy_static = "1.4"
+substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
diff --git a/client/finality-grandpa/src/communication/gossip.rs b/client/finality-grandpa/src/communication/gossip.rs
index 90f40a93cb9e..12d12c9628a7 100644
--- a/client/finality-grandpa/src/communication/gossip.rs
+++ b/client/finality-grandpa/src/communication/gossip.rs
@@ -1194,19 +1194,21 @@ impl<Block: BlockT> Inner<Block> {
 		catch_up_request: &CatchUpRequestMessage,
 	) -> (bool, Option<Report>) {
 		let report = match &self.pending_catch_up {
-			PendingCatchUp::Requesting { who: peer, instant, .. } =>
+			PendingCatchUp::Requesting { who: peer, instant, .. } => {
 				if instant.elapsed() <= CATCH_UP_REQUEST_TIMEOUT {
 					return (false, None)
 				} else {
 					// report peer for timeout
 					Some((peer.clone(), cost::CATCH_UP_REQUEST_TIMEOUT))
-				},
-			PendingCatchUp::Processing { instant, .. } =>
+				}
+			},
+			PendingCatchUp::Processing { instant, .. } => {
 				if instant.elapsed() < CATCH_UP_PROCESS_TIMEOUT {
 					return (false, None)
 				} else {
 					None
-				},
+				}
+			},
 			_ => None,
 		};
 
diff --git a/client/finality-grandpa/src/communication/mod.rs b/client/finality-grandpa/src/communication/mod.rs
index 0c1fb79c558e..a4d85e443ab6 100644
--- a/client/finality-grandpa/src/communication/mod.rs
+++ b/client/finality-grandpa/src/communication/mod.rs
@@ -684,18 +684,21 @@ impl<Block: BlockT> Sink<Message<Block>> for OutgoingMessages<Block> {
 	fn start_send(mut self: Pin<&mut Self>, mut msg: Message<Block>) -> Result<(), Self::Error> {
 		// if we've voted on this round previously under the same key, send that vote instead
 		match &mut msg {
-			finality_grandpa::Message::PrimaryPropose(ref mut vote) =>
+			finality_grandpa::Message::PrimaryPropose(ref mut vote) => {
 				if let Some(propose) = self.has_voted.propose() {
 					*vote = propose.clone();
-				},
-			finality_grandpa::Message::Prevote(ref mut vote) =>
+				}
+			},
+			finality_grandpa::Message::Prevote(ref mut vote) => {
 				if let Some(prevote) = self.has_voted.prevote() {
 					*vote = prevote.clone();
-				},
-			finality_grandpa::Message::Precommit(ref mut vote) =>
+				}
+			},
+			finality_grandpa::Message::Precommit(ref mut vote) => {
 				if let Some(precommit) = self.has_voted.precommit() {
 					*vote = precommit.clone();
-				},
+				}
+			},
 		}
 
 		// when locals exist, sign messages on import
diff --git a/client/keystore/Cargo.toml b/client/keystore/Cargo.toml
index a9b53f348ab7..11d6f5cb1e24 100644
--- a/client/keystore/Cargo.toml
+++ b/client/keystore/Cargo.toml
@@ -17,17 +17,12 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 async-trait = "0.1.50"
 derive_more = "0.99.2"
-futures = "0.3.9"
-futures-util = "0.3.4"
 sp-application-crypto = { version = "4.0.0-dev", path = "../../primitives/application-crypto" }
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 sp-keystore = { version = "0.10.0-dev", path = "../../primitives/keystore" }
 hex = "0.4.0"
-merlin = { version = "2.0", default-features = false }
 parking_lot = "0.11.1"
-rand = "0.7.2"
 serde_json = "1.0.41"
-subtle = "2.1.1"
 
 [dev-dependencies]
 tempfile = "3.1.0"
diff --git a/client/light/Cargo.toml b/client/light/Cargo.toml
index 4dee5d55e7d3..b10f7646bf9b 100644
--- a/client/light/Cargo.toml
+++ b/client/light/Cargo.toml
@@ -12,7 +12,6 @@ readme = "README.md"
 
 [dependencies]
 parking_lot = "0.11.1"
-lazy_static = "1.4.0"
 hash-db = "0.15.2"
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
 sp-externalities = { version = "0.10.0-dev", path = "../../primitives/externalities" }
diff --git a/client/network-gossip/Cargo.toml b/client/network-gossip/Cargo.toml
index ed9dd45d99f8..4a213f796b6d 100644
--- a/client/network-gossip/Cargo.toml
+++ b/client/network-gossip/Cargo.toml
@@ -29,5 +29,4 @@ tracing = "0.1.25"
 [dev-dependencies]
 async-std = "1.6.5"
 quickcheck = "1.0.3"
-rand = "0.7.2"
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
diff --git a/client/network-gossip/src/bridge.rs b/client/network-gossip/src/bridge.rs
index 6fa16cad7753..70b13983d8bd 100644
--- a/client/network-gossip/src/bridge.rs
+++ b/client/network-gossip/src/bridge.rs
@@ -263,8 +263,9 @@ impl<B: BlockT> Future for GossipEngine<B> {
 					for sink in sinks {
 						match sink.start_send(notification.clone()) {
 							Ok(()) => {},
-							Err(e) if e.is_full() =>
-								unreachable!("Previously ensured that all sinks are ready; qed."),
+							Err(e) if e.is_full() => {
+								unreachable!("Previously ensured that all sinks are ready; qed.")
+							},
 							// Receiver got dropped. Will be removed in next iteration (See (1)).
 							Err(_) => {},
 						}
@@ -623,8 +624,9 @@ mod tests {
 									.and_modify(|e| *e += 1)
 									.or_insert(1);
 							},
-							Poll::Ready(None) =>
-								unreachable!("Sender side of channel is never dropped"),
+							Poll::Ready(None) => {
+								unreachable!("Sender side of channel is never dropped")
+							},
 							Poll::Pending => {},
 						}
 					}
diff --git a/client/network-gossip/src/state_machine.rs b/client/network-gossip/src/state_machine.rs
index 5cda52b9db49..0fd1e6f6eae0 100644
--- a/client/network-gossip/src/state_machine.rs
+++ b/client/network-gossip/src/state_machine.rs
@@ -127,14 +127,15 @@ where
 					} else {
 						MessageIntent::Broadcast
 					},
-				MessageIntent::PeriodicRebroadcast =>
+				MessageIntent::PeriodicRebroadcast => {
 					if peer.known_messages.contains(&message_hash) {
 						MessageIntent::PeriodicRebroadcast
 					} else {
 						// peer doesn't know message, so the logic should treat it as an
 						// initial broadcast.
 						MessageIntent::Broadcast
-					},
+					}
+				},
 				other => other,
 			};
 
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index e7f23e484e5f..c8ea8db8acb6 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -20,13 +20,13 @@ prost-build = "0.7"
 async-trait = "0.1"
 async-std = "1.6.5"
 bitflags = "1.2.0"
-bs58 = "0.4.0"
 cid = "0.6.0"
 bytes = "1"
-codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", features = [
+    "derive",
+] }
 derive_more = "0.99.2"
 either = "1.5.3"
-erased-serde = "0.3.9"
 fnv = "1.0.6"
 fork-tree = { version = "3.0.0", path = "../../utils/fork-tree" }
 futures = "0.3.9"
@@ -38,7 +38,6 @@ linked-hash-map = "0.5.4"
 linked_hash_set = "0.1.3"
 lru = "0.6.5"
 log = "0.4.8"
-nohash-hasher = "0.2.0"
 parking_lot = "0.11.1"
 pin-project = "1.0.4"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.9.0", path = "../../utils/prometheus" }
@@ -59,7 +58,10 @@ sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
 sp-utils = { version = "4.0.0-dev", path = "../../primitives/utils" }
 sp-finality-grandpa = { version = "4.0.0-dev", path = "../../primitives/finality-grandpa" }
 thiserror = "1"
-unsigned-varint = { version = "0.6.0", features = ["futures", "asynchronous_codec"] }
+unsigned-varint = { version = "0.6.0", features = [
+    "futures",
+    "asynchronous_codec",
+] }
 void = "1.0.2"
 wasm-timer = "0.2"
 zeroize = "1.2.0"
@@ -70,7 +72,18 @@ version = "0.37.1"
 [target.'cfg(target_os = "unknown")'.dependencies.libp2p]
 version = "0.37.1"
 default-features = false
-features = ["identify", "kad", "mdns", "mplex", "noise", "ping", "request-response", "tcp-async-io", "websocket", "yamux"]
+features = [
+    "identify",
+    "kad",
+    "mdns",
+    "mplex",
+    "noise",
+    "ping",
+    "request-response",
+    "tcp-async-io",
+    "websocket",
+    "yamux",
+]
 
 
 [dev-dependencies]
@@ -78,7 +91,6 @@ assert_matches = "1.3"
 libp2p = { version = "0.37.1", default-features = false }
 quickcheck = "1.0.3"
 rand = "0.7.2"
-sp-keyring = { version = "4.0.0-dev", path = "../../primitives/keyring" }
 sp-test-primitives = { version = "2.0.0", path = "../../primitives/test-primitives" }
 sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
 substrate-test-runtime = { version = "2.0.0", path = "../../test-utils/runtime" }
diff --git a/client/network/src/light_client_requests/sender.rs b/client/network/src/light_client_requests/sender.rs
index 1560e7afbfcc..9e3185d94438 100644
--- a/client/network/src/light_client_requests/sender.rs
+++ b/client/network/src/light_client_requests/sender.rs
@@ -213,14 +213,15 @@ where
 	) -> Result<Reply<B>, Error> {
 		use schema::v1::light::response::Response;
 		match response.response {
-			Some(Response::RemoteCallResponse(response)) =>
+			Some(Response::RemoteCallResponse(response)) => {
 				if let Request::Call { request, .. } = request {
 					let proof = Decode::decode(&mut response.proof.as_ref())?;
 					let reply = self.checker.check_execution_proof(request, proof)?;
 					Ok(Reply::VecU8(reply))
 				} else {
 					Err(Error::UnexpectedResponse)
-				},
+				}
+			},
 			Some(Response::RemoteReadResponse(response)) => match request {
 				Request::Read { request, .. } => {
 					let proof = Decode::decode(&mut response.proof.as_ref())?;
@@ -234,7 +235,7 @@ where
 				},
 				_ => Err(Error::UnexpectedResponse),
 			},
-			Some(Response::RemoteChangesResponse(response)) =>
+			Some(Response::RemoteChangesResponse(response)) => {
 				if let Request::Changes { request, .. } = request {
 					let max_block = Decode::decode(&mut response.max.as_ref())?;
 					let roots_proof = Decode::decode(&mut response.roots_proof.as_ref())?;
@@ -259,8 +260,9 @@ where
 					Ok(Reply::VecNumberU32(reply))
 				} else {
 					Err(Error::UnexpectedResponse)
-				},
-			Some(Response::RemoteHeaderResponse(response)) =>
+				}
+			},
+			Some(Response::RemoteHeaderResponse(response)) => {
 				if let Request::Header { request, .. } = request {
 					let header = if response.header.is_empty() {
 						None
@@ -272,7 +274,8 @@ where
 					Ok(Reply::Header(reply))
 				} else {
 					Err(Error::UnexpectedResponse)
-				},
+				}
+			},
 			None => Err(Error::UnexpectedResponse),
 		}
 	}
@@ -779,8 +782,9 @@ impl<B: Block> Request<B> {
 			Request::Header { request, sender } => match result {
 				Err(e) => send(Err(e), sender),
 				Ok(Reply::Header(x)) => send(Ok(x), sender),
-				reply =>
-					log::error!("invalid reply for header request: {:?}, {:?}", reply, request),
+				reply => {
+					log::error!("invalid reply for header request: {:?}, {:?}", reply, request)
+				},
 			},
 			Request::Read { request, sender } => match result {
 				Err(e) => send(Err(e), sender),
@@ -790,8 +794,9 @@ impl<B: Block> Request<B> {
 			Request::ReadChild { request, sender } => match result {
 				Err(e) => send(Err(e), sender),
 				Ok(Reply::MapVecU8OptVecU8(x)) => send(Ok(x), sender),
-				reply =>
-					log::error!("invalid reply for read child request: {:?}, {:?}", reply, request),
+				reply => {
+					log::error!("invalid reply for read child request: {:?}, {:?}", reply, request)
+				},
 			},
 			Request::Call { request, sender } => match result {
 				Err(e) => send(Err(e), sender),
@@ -801,8 +806,9 @@ impl<B: Block> Request<B> {
 			Request::Changes { request, sender } => match result {
 				Err(e) => send(Err(e), sender),
 				Ok(Reply::VecNumberU32(x)) => send(Ok(x), sender),
-				reply =>
-					log::error!("invalid reply for changes request: {:?}, {:?}", reply, request),
+				reply => {
+					log::error!("invalid reply for changes request: {:?}, {:?}", reply, request)
+				},
 			},
 		}
 	}
diff --git a/client/network/src/peer_info.rs b/client/network/src/peer_info.rs
index a123482be072..3599bc88900e 100644
--- a/client/network/src/peer_info.rs
+++ b/client/network/src/peer_info.rs
@@ -352,8 +352,9 @@ impl NetworkBehaviour for PeerInfoBehaviour {
 						let event = PeerInfoEvent::Identified { peer_id, info };
 						return Poll::Ready(NetworkBehaviourAction::GenerateEvent(event))
 					},
-					IdentifyEvent::Error { peer_id, error } =>
-						debug!(target: "sub-libp2p", "Identification with peer {:?} failed => {}", peer_id, error),
+					IdentifyEvent::Error { peer_id, error } => {
+						debug!(target: "sub-libp2p", "Identification with peer {:?} failed => {}", peer_id, error)
+					},
 					IdentifyEvent::Pushed { .. } => {},
 					IdentifyEvent::Sent { .. } => {},
 				},
diff --git a/client/network/src/protocol/notifications/behaviour.rs b/client/network/src/protocol/notifications/behaviour.rs
index 648abc391fba..b618d86b730d 100644
--- a/client/network/src/protocol/notifications/behaviour.rs
+++ b/client/network/src/protocol/notifications/behaviour.rs
@@ -565,8 +565,9 @@ impl Notifications {
 				*entry.into_mut() = PeerState::Disabled { connections, backoff_until }
 			},
 
-			PeerState::Poisoned =>
-				error!(target: "sub-libp2p", "State of {:?} is poisoned", peer_id),
+			PeerState::Poisoned => {
+				error!(target: "sub-libp2p", "State of {:?} is poisoned", peer_id)
+			},
 		}
 	}
 
diff --git a/client/network/src/protocol/notifications/upgrade/notifications.rs b/client/network/src/protocol/notifications/upgrade/notifications.rs
index 868544824f2d..386be69afffd 100644
--- a/client/network/src/protocol/notifications/upgrade/notifications.rs
+++ b/client/network/src/protocol/notifications/upgrade/notifications.rs
@@ -218,7 +218,7 @@ where
 
 		loop {
 			match mem::replace(this.handshake, NotificationsInSubstreamHandshake::Sent) {
-				NotificationsInSubstreamHandshake::PendingSend(msg) =>
+				NotificationsInSubstreamHandshake::PendingSend(msg) => {
 					match Sink::poll_ready(this.socket.as_mut(), cx) {
 						Poll::Ready(_) => {
 							*this.handshake = NotificationsInSubstreamHandshake::Flush;
@@ -231,8 +231,9 @@ where
 							*this.handshake = NotificationsInSubstreamHandshake::PendingSend(msg);
 							return Poll::Pending
 						},
-					},
-				NotificationsInSubstreamHandshake::Flush =>
+					}
+				},
+				NotificationsInSubstreamHandshake::Flush => {
 					match Sink::poll_flush(this.socket.as_mut(), cx)? {
 						Poll::Ready(()) =>
 							*this.handshake = NotificationsInSubstreamHandshake::Sent,
@@ -240,7 +241,8 @@ where
 							*this.handshake = NotificationsInSubstreamHandshake::Flush;
 							return Poll::Pending
 						},
-					},
+					}
+				},
 
 				st @ NotificationsInSubstreamHandshake::NotSent |
 				st @ NotificationsInSubstreamHandshake::Sent |
@@ -270,7 +272,7 @@ where
 					*this.handshake = NotificationsInSubstreamHandshake::NotSent;
 					return Poll::Pending
 				},
-				NotificationsInSubstreamHandshake::PendingSend(msg) =>
+				NotificationsInSubstreamHandshake::PendingSend(msg) => {
 					match Sink::poll_ready(this.socket.as_mut(), cx) {
 						Poll::Ready(_) => {
 							*this.handshake = NotificationsInSubstreamHandshake::Flush;
@@ -283,8 +285,9 @@ where
 							*this.handshake = NotificationsInSubstreamHandshake::PendingSend(msg);
 							return Poll::Pending
 						},
-					},
-				NotificationsInSubstreamHandshake::Flush =>
+					}
+				},
+				NotificationsInSubstreamHandshake::Flush => {
 					match Sink::poll_flush(this.socket.as_mut(), cx)? {
 						Poll::Ready(()) =>
 							*this.handshake = NotificationsInSubstreamHandshake::Sent,
@@ -292,7 +295,8 @@ where
 							*this.handshake = NotificationsInSubstreamHandshake::Flush;
 							return Poll::Pending
 						},
-					},
+					}
+				},
 
 				NotificationsInSubstreamHandshake::Sent => {
 					match Stream::poll_next(this.socket.as_mut(), cx) {
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index c6a7a953fe72..067fa3a21b60 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -1967,8 +1967,9 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 						}
 					}
 				},
-				Poll::Ready(SwarmEvent::Dialing(peer_id)) =>
-					trace!(target: "sub-libp2p", "Libp2p => Dialing({:?})", peer_id),
+				Poll::Ready(SwarmEvent::Dialing(peer_id)) => {
+					trace!(target: "sub-libp2p", "Libp2p => Dialing({:?})", peer_id)
+				},
 				Poll::Ready(SwarmEvent::IncomingConnection { local_addr, send_back_addr }) => {
 					trace!(target: "sub-libp2p", "Libp2p => IncomingConnection({},{}))",
 						local_addr, send_back_addr);
@@ -2007,9 +2008,10 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 							.inc();
 					}
 				},
-				Poll::Ready(SwarmEvent::UnknownPeerUnreachableAddr { address, error }) =>
+				Poll::Ready(SwarmEvent::UnknownPeerUnreachableAddr { address, error }) => {
 					trace!(target: "sub-libp2p", "Libp2p => UnknownPeerUnreachableAddr({}): {}",
-						address, error),
+						address, error)
+				},
 				Poll::Ready(SwarmEvent::ListenerClosed { reason, addresses }) => {
 					if let Some(metrics) = this.metrics.as_ref() {
 						metrics.listeners_local_addresses.sub(addresses.len() as u64);
diff --git a/client/network/src/warp_request_handler.rs b/client/network/src/warp_request_handler.rs
index 0e45f2d43afa..2ab95bb3853b 100644
--- a/client/network/src/warp_request_handler.rs
+++ b/client/network/src/warp_request_handler.rs
@@ -135,8 +135,9 @@ impl<TBlock: BlockT> RequestHandler<TBlock> {
 			let IncomingRequest { peer, payload, pending_response } = request;
 
 			match self.handle_request(payload, pending_response) {
-				Ok(()) =>
-					debug!(target: "sync", "Handled grandpa warp sync request from {}.", peer),
+				Ok(()) => {
+					debug!(target: "sync", "Handled grandpa warp sync request from {}.", peer)
+				},
 				Err(e) => debug!(
 					target: "sync",
 					"Failed to handle grandpa warp sync request from {}: {}",
diff --git a/client/network/test/Cargo.toml b/client/network/test/Cargo.toml
index c5915594d444..eada832946b2 100644
--- a/client/network/test/Cargo.toml
+++ b/client/network/test/Cargo.toml
@@ -31,7 +31,6 @@ sc-block-builder = { version = "0.10.0-dev", path = "../../block-builder" }
 sp-consensus-babe = { version = "0.10.0-dev", path = "../../../primitives/consensus/babe" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
 substrate-test-runtime = { version = "2.0.0", path = "../../../test-utils/runtime" }
-tempfile = "3.1.0"
 sp-tracing = { version = "4.0.0-dev", path = "../../../primitives/tracing" }
 sc-service = { version = "0.10.0-dev", default-features = false, features = ["test-helpers"],  path = "../../service" }
 async-trait = "0.1.50"
diff --git a/client/offchain/Cargo.toml b/client/offchain/Cargo.toml
index 977df259f5c4..9bf4425a537c 100644
--- a/client/offchain/Cargo.toml
+++ b/client/offchain/Cargo.toml
@@ -24,7 +24,6 @@ num_cpus = "1.10"
 parking_lot = "0.11.1"
 rand = "0.7.2"
 sc-client-api = { version = "4.0.0-dev", path = "../api" }
-sc-keystore = { version = "4.0.0-dev", path = "../keystore" }
 sc-network = { version = "0.10.0-dev", path = "../network" }
 sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
diff --git a/client/offchain/src/api/http.rs b/client/offchain/src/api/http.rs
index 75a27f0c7cfb..f2648e2bf052 100644
--- a/client/offchain/src/api/http.rs
+++ b/client/offchain/src/api/http.rs
@@ -219,7 +219,7 @@ impl HttpApi {
 					HttpApiRequest::Dispatched(Some(sender))
 				},
 
-				HttpApiRequest::Dispatched(Some(mut sender)) =>
+				HttpApiRequest::Dispatched(Some(mut sender)) => {
 					if !chunk.is_empty() {
 						match poll_sender(&mut sender) {
 							Err(HttpError::IoError) => return Err(HttpError::IoError),
@@ -234,11 +234,12 @@ impl HttpApi {
 						// the sender.
 						self.requests.insert(request_id, HttpApiRequest::Dispatched(None));
 						return Ok(())
-					},
+					}
+				},
 
 				HttpApiRequest::Response(
 					mut response @ HttpApiRequestRp { sending_body: Some(_), .. },
-				) =>
+				) => {
 					if !chunk.is_empty() {
 						match poll_sender(
 							response
@@ -264,7 +265,8 @@ impl HttpApi {
 							}),
 						);
 						return Ok(())
-					},
+					}
+				},
 
 				HttpApiRequest::Fail(_) =>
 				// If the request has already failed, return without putting back the request
@@ -368,7 +370,7 @@ impl HttpApi {
 
 			// Update internal state based on received message.
 			match next_message {
-				Some(WorkerToApi::Response { id, status_code, headers, body }) =>
+				Some(WorkerToApi::Response { id, status_code, headers, body }) => {
 					match self.requests.remove(&id) {
 						Some(HttpApiRequest::Dispatched(sending_body)) => {
 							self.requests.insert(
@@ -384,7 +386,8 @@ impl HttpApi {
 						},
 						None => {}, // can happen if we detected an IO error when sending the body
 						_ => error!("State mismatch between the API and worker"),
-					},
+					}
+				},
 
 				Some(WorkerToApi::Fail { id, error }) => match self.requests.remove(&id) {
 					Some(HttpApiRequest::Dispatched(_)) => {
diff --git a/client/peerset/src/lib.rs b/client/peerset/src/lib.rs
index 398d31c78b21..a7b4bdd43402 100644
--- a/client/peerset/src/lib.rs
+++ b/client/peerset/src/lib.rs
@@ -648,8 +648,9 @@ impl Peerset {
 					peer_id, DISCONNECT_REPUTATION_CHANGE, entry.reputation());
 				entry.disconnect();
 			},
-			peersstate::Peer::NotConnected(_) | peersstate::Peer::Unknown(_) =>
-				error!(target: "peerset", "Received dropped() for non-connected node"),
+			peersstate::Peer::NotConnected(_) | peersstate::Peer::Unknown(_) => {
+				error!(target: "peerset", "Received dropped() for non-connected node")
+			},
 		}
 
 		if let DropReason::Refused = reason {
diff --git a/client/rpc-servers/Cargo.toml b/client/rpc-servers/Cargo.toml
index d2bce6a08638..ebb8c620193f 100644
--- a/client/rpc-servers/Cargo.toml
+++ b/client/rpc-servers/Cargo.toml
@@ -18,9 +18,7 @@ jsonrpc-core = "18.0.0"
 pubsub = { package = "jsonrpc-pubsub", version = "18.0.0" }
 log = "0.4.8"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
-serde = "1.0.126"
 serde_json = "1.0.41"
-sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
 http = { package = "jsonrpc-http-server", version = "18.0.0" }
diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml
index 89064d879a98..453ff6e57daa 100644
--- a/client/rpc/Cargo.toml
+++ b/client/rpc/Cargo.toml
@@ -30,17 +30,13 @@ sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
 sp-utils = { version = "4.0.0-dev", path = "../../primitives/utils" }
 sp-rpc = { version = "4.0.0-dev", path = "../../primitives/rpc" }
 sp-keystore = { version = "0.10.0-dev", path = "../../primitives/keystore" }
-sp-state-machine = { version = "0.10.0-dev", path = "../../primitives/state-machine" }
 sc-chain-spec = { version = "4.0.0-dev", path = "../chain-spec" }
-sc-executor = { version = "0.10.0-dev", path = "../executor" }
 sc-block-builder = { version = "0.10.0-dev", path = "../block-builder" }
-sc-keystore = { version = "4.0.0-dev", path = "../keystore" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
 sc-tracing = { version = "4.0.0-dev", path = "../tracing" }
 hash-db = { version = "0.15.2", default-features = false }
 parking_lot = "0.11.1"
 lazy_static = { version = "1.4.0", optional = true }
-sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
 sc-transaction-pool-api = { version = "4.0.0-dev", path = "../transaction-pool/api" }
 
 [dev-dependencies]
@@ -50,7 +46,6 @@ sc-network = { version = "0.10.0-dev", path = "../network" }
 sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 sc-transaction-pool = { version = "4.0.0-dev", path = "../transaction-pool" }
-sc-cli = { version = "0.10.0-dev", path = "../cli" }
 sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
 
 [features]
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index c5b7fc7c1e09..4f1bffd65957 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -17,9 +17,7 @@ default = ["db"]
 # The RocksDB feature activates the RocksDB database backend. If it is not activated, and you pass
 # a path to a database, an error will be produced at runtime.
 db = ["sc-client-db/with-kvdb-rocksdb", "sc-client-db/with-parity-db"]
-wasmtime = [
-	"sc-executor/wasmtime",
-]
+wasmtime = ["sc-executor/wasmtime"]
 # exposes the client type
 test-helpers = []
 
@@ -30,7 +28,6 @@ jsonrpc-pubsub = "18.0"
 jsonrpc-core = "18.0"
 rand = "0.7.3"
 parking_lot = "0.11.1"
-lazy_static = "1.4.0"
 log = "0.4.11"
 futures-timer = "3.0.1"
 wasm-timer = "0.2"
@@ -40,7 +37,6 @@ hash-db = "0.15.2"
 serde = "1.0.126"
 serde_json = "1.0.41"
 sc-keystore = { version = "4.0.0-dev", path = "../keystore" }
-sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
 sp-trie = { version = "4.0.0-dev", path = "../../primitives/trie" }
 sp-externalities = { version = "0.10.0-dev", path = "../../primitives/externalities" }
@@ -75,12 +71,14 @@ sp-block-builder = { version = "4.0.0-dev", path = "../../primitives/block-build
 sc-informant = { version = "0.10.0-dev", path = "../informant" }
 sc-telemetry = { version = "4.0.0-dev", path = "../telemetry" }
 sc-offchain = { version = "4.0.0-dev", path = "../offchain" }
-prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
+prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0" }
 sc-tracing = { version = "4.0.0-dev", path = "../tracing" }
 sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
 tracing = "0.1.25"
 tracing-futures = { version = "0.2.4" }
-parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.10.0", default-features = false, features = [
+	"primitive-types",
+] }
 async-trait = "0.1.50"
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
@@ -90,8 +88,5 @@ directories = "3.0.1"
 [dev-dependencies]
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 substrate-test-runtime = { version = "2.0.0", path = "../../test-utils/runtime/" }
-sp-consensus-babe = { version = "0.10.0-dev", path = "../../primitives/consensus/babe" }
-grandpa = { version = "0.10.0-dev", package = "sc-finality-grandpa", path = "../finality-grandpa" }
-grandpa-primitives = { version = "4.0.0-dev", package = "sp-finality-grandpa", path = "../../primitives/finality-grandpa" }
 tokio = { version = "0.2.25", default-features = false }
 async-std = { version = "1.6.5", default-features = false }
diff --git a/client/state-db/Cargo.toml b/client/state-db/Cargo.toml
index 40997f65d223..93d5e1464b39 100644
--- a/client/state-db/Cargo.toml
+++ b/client/state-db/Cargo.toml
@@ -13,7 +13,6 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-thiserror = "1.0.21"
 parking_lot = "0.11.1"
 log = "0.4.11"
 sc-client-api = { version = "4.0.0-dev", path = "../api" }
diff --git a/client/telemetry/Cargo.toml b/client/telemetry/Cargo.toml
index eb0daf2d583b..d9d2b6b6aa84 100644
--- a/client/telemetry/Cargo.toml
+++ b/client/telemetry/Cargo.toml
@@ -23,8 +23,6 @@ log = "0.4.8"
 pin-project = "1.0.4"
 rand = "0.7.2"
 serde = { version = "1.0.126", features = ["derive"] }
-take_mut = "0.2.2"
-void = "1.0.2"
 serde_json = "1.0.41"
 chrono = "0.4.19"
 thiserror = "1.0.21"
diff --git a/client/tracing/Cargo.toml b/client/tracing/Cargo.toml
index 97d27161d210..647f4de4a3a7 100644
--- a/client/tracing/Cargo.toml
+++ b/client/tracing/Cargo.toml
@@ -21,26 +21,20 @@ once_cell = "1.4.1"
 parking_lot = "0.11.1"
 regex = "1.4.2"
 rustc-hash = "1.1.0"
-erased-serde = "0.3.9"
 serde = "1.0.126"
-serde_json = "1.0.41"
 thiserror = "1.0.21"
 tracing = "0.1.25"
 tracing-log = "0.1.2"
-tracing-subscriber = "0.2.18"
+tracing-subscriber = "0.2.19"
 sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
 sp-rpc = { version = "4.0.0-dev", path = "../../primitives/rpc" }
-sp-block-builder = { version = "4.0.0-dev", path = "../../primitives/block-builder" }
-sp-storage = { version = "4.0.0-dev", path = "../../primitives/storage" }
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
 sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
-sc-telemetry = { version = "4.0.0-dev", path = "../telemetry" }
 sc-client-api = { version = "4.0.0-dev", path = "../api" }
 sc-tracing-proc-macro = { version = "4.0.0-dev", path = "./proc-macro" }
-sc-rpc-server =  { version = "4.0.0-dev", path = "../rpc-servers" }
-wasm-timer = "0.2"
+sc-rpc-server = { version = "4.0.0-dev", path = "../rpc-servers" }
 
 [target.'cfg(target_os = "unknown")'.dependencies]
 wasm-bindgen = "0.2.67"
diff --git a/client/tracing/src/logging/event_format.rs b/client/tracing/src/logging/event_format.rs
index 01847bc2b5cb..61d7fe77aec6 100644
--- a/client/tracing/src/logging/event_format.rs
+++ b/client/tracing/src/logging/event_format.rs
@@ -93,8 +93,7 @@ where
 
 		// Custom code to display node name
 		if let Some(span) = ctx.lookup_current() {
-			let parents = span.parents();
-			for span in std::iter::once(span).chain(parents) {
+			for span in span.scope() {
 				let exts = span.extensions();
 				if let Some(prefix) = exts.get::<super::layers::Prefix>() {
 					write!(writer, "{}", prefix.as_str())?;
diff --git a/client/transaction-pool/Cargo.toml b/client/transaction-pool/Cargo.toml
index 931043da09e3..12b0646983db 100644
--- a/client/transaction-pool/Cargo.toml
+++ b/client/transaction-pool/Cargo.toml
@@ -31,7 +31,6 @@ sc-transaction-pool-api = { version = "4.0.0-dev", path = "./api" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
 sp-utils = { version = "4.0.0-dev", path = "../../primitives/utils" }
 wasm-timer = "0.2"
-derive_more = "0.99.2"
 serde = { version = "1.0.126", features = ["derive"] }
 linked-hash-map = "0.5.4"
 retain_mut = "0.1.3"
diff --git a/client/transaction-pool/api/Cargo.toml b/client/transaction-pool/api/Cargo.toml
index b49d47e53fe3..efef36071f08 100644
--- a/client/transaction-pool/api/Cargo.toml
+++ b/client/transaction-pool/api/Cargo.toml
@@ -15,6 +15,5 @@ serde = { version = "1.0.126", features = ["derive"] }
 thiserror = { version = "1.0.21" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/runtime" }
 
-codec = { package = "parity-scale-codec", version = "2.0.0" }
 derive_more = { version = "0.99.11" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
diff --git a/frame/aura/Cargo.toml b/frame/aura/Cargo.toml
index 9c4a31017bac..f6aa4fac2fc1 100644
--- a/frame/aura/Cargo.toml
+++ b/frame/aura/Cargo.toml
@@ -14,9 +14,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../../primitives/application-crypto" }
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
+	"derive",
+] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
-pallet-session = { version = "4.0.0-dev", default-features = false, path = "../session" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
 sp-consensus-aura = { version = "0.10.0-dev", path = "../../primitives/consensus/aura", default-features = false }
@@ -25,9 +26,7 @@ pallet-timestamp = { version = "4.0.0-dev", default-features = false, path = "..
 
 [dev-dependencies]
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
-sp-io ={ version = "4.0.0-dev", path = "../../primitives/io" }
-lazy_static = "1.4.0"
-parking_lot = "0.11.1"
+sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
 
 [features]
 default = ["std"]
diff --git a/frame/authority-discovery/Cargo.toml b/frame/authority-discovery/Cargo.toml
index 33faf0183e78..f5f695b0a064 100644
--- a/frame/authority-discovery/Cargo.toml
+++ b/frame/authority-discovery/Cargo.toml
@@ -15,9 +15,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 sp-authority-discovery = { version = "4.0.0-dev", default-features = false, path = "../../primitives/authority-discovery" }
 sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../../primitives/application-crypto" }
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
+	"derive",
+] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
-pallet-session = { version = "4.0.0-dev", features = ["historical" ], path = "../session", default-features = false }
+pallet-session = { version = "4.0.0-dev", features = [
+	"historical",
+], path = "../session", default-features = false }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
@@ -25,7 +29,6 @@ frame-system = { version = "4.0.0-dev", default-features = false, path = "../sys
 [dev-dependencies]
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
-sp-staking = { version = "4.0.0-dev", default-features = false, path = "../../primitives/staking" }
 
 [features]
 default = ["std"]
diff --git a/frame/authorship/Cargo.toml b/frame/authorship/Cargo.toml
index 64a5f20769d2..a5b8d9616091 100644
--- a/frame/authorship/Cargo.toml
+++ b/frame/authorship/Cargo.toml
@@ -13,7 +13,9 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
+	"derive",
+] }
 sp-authorship = { version = "4.0.0-dev", default-features = false, path = "../../primitives/authorship" }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
@@ -23,8 +25,7 @@ impl-trait-for-tuples = "0.2.1"
 
 [dev-dependencies]
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
-sp-io ={ version = "4.0.0-dev", path = "../../primitives/io" }
-serde = { version = "1.0.126" }
+sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
 
 [features]
 default = ["std"]
diff --git a/frame/benchmarking/Cargo.toml b/frame/benchmarking/Cargo.toml
index 69c107256e4d..ad15b8e6042e 100644
--- a/frame/benchmarking/Cargo.toml
+++ b/frame/benchmarking/Cargo.toml
@@ -28,7 +28,6 @@ log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
 hex-literal = "0.3.1"
-serde = "1.0.126"
 
 [features]
 default = ["std"]
diff --git a/frame/bounties/Cargo.toml b/frame/bounties/Cargo.toml
index 7385f717af10..84147b96f910 100644
--- a/frame/bounties/Cargo.toml
+++ b/frame/bounties/Cargo.toml
@@ -13,7 +13,9 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
+	"derive",
+] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
@@ -23,9 +25,8 @@ pallet-treasury = { version = "4.0.0-dev", default-features = false, path = "../
 frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
-sp-io ={ version = "4.0.0-dev", path = "../../primitives/io" }
+sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
-sp-storage = { version = "4.0.0-dev", path = "../../primitives/storage" }
 pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 
 [features]
diff --git a/frame/collective/Cargo.toml b/frame/collective/Cargo.toml
index 4f134b2173b2..4b1051e79304 100644
--- a/frame/collective/Cargo.toml
+++ b/frame/collective/Cargo.toml
@@ -13,7 +13,9 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
+	"derive",
+] }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
@@ -25,7 +27,6 @@ log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
 hex-literal = "0.3.1"
-pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/frame/contracts/Cargo.toml b/frame/contracts/Cargo.toml
index 9424698091b2..ce4ae872369e 100644
--- a/frame/contracts/Cargo.toml
+++ b/frame/contracts/Cargo.toml
@@ -14,11 +14,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 bitflags = "1.0"
-codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
+codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = [
+	"derive",
+	"max-encoded-len",
+] }
 log = { version = "0.4", default-features = false }
 pwasm-utils = { version = "0.18", default-features = false }
 serde = { version = "1", optional = true, features = ["derive"] }
-smallvec = { version = "1", default-features = false, features = ["const_generics"] }
+smallvec = { version = "1", default-features = false, features = [
+	"const_generics",
+] }
 wasmi-validation = { version = "0.4", default-features = false }
 
 # Only used in benchmarking to generate random contract code
@@ -40,7 +45,6 @@ sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primit
 [dev-dependencies]
 assert_matches = "1"
 hex-literal = "0.3"
-paste = "1"
 pretty_assertions = "0.7"
 wat = "1"
 
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index cc19dccd6d1d..fc5a2cf5221e 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -1644,10 +1644,28 @@ fn self_destruct_works() {
 
 		// The call triggers rent collection that reduces the amount of balance
 		// that remains for the beneficiary.
-		let balance_after_rent = 93_086;
+		let mut events = System::events();
+		let balance_after_rent = 99_000;
+
+		// The actual figure will bounce about with wasm compiler updates as the rent depends on
+		// the compiled wasm size, so we replace it with a fixed value
+		// as rent isn't what we're testing for in this test.
+		let mut actual_balance_after_rent = 99_000;
+		if let Event::Balances(pallet_balances::Event::Transfer(_, _, ref mut actual_bal)) =
+			&mut events[1].event
+		{
+			std::mem::swap(&mut actual_balance_after_rent, actual_bal);
+			assert!(
+				(90_000..99_000).contains(&actual_balance_after_rent),
+				"expected less than 100_000: {}",
+				actual_balance_after_rent
+			);
+		} else {
+			assert!(false);
+		}
 
 		pretty_assertions::assert_eq!(
-			System::events(),
+			events,
 			vec![
 				EventRecord {
 					phase: Phase::Initialization,
@@ -1673,7 +1691,7 @@ fn self_destruct_works() {
 					event: Event::Contracts(crate::Event::Terminated(addr.clone(), DJANGO)),
 					topics: vec![],
 				},
-			]
+			],
 		);
 
 		// Check that account is gone
@@ -1681,7 +1699,7 @@ fn self_destruct_works() {
 
 		// check that the beneficiary (django) got remaining balance
 		// some rent was deducted before termination
-		assert_eq!(Balances::free_balance(DJANGO), 1_000_000 + balance_after_rent);
+		assert_eq!(Balances::free_balance(DJANGO), 1_000_000 + actual_balance_after_rent);
 	});
 }
 
diff --git a/frame/democracy/Cargo.toml b/frame/democracy/Cargo.toml
index 5170fc2a3a29..98b034c3ce7e 100644
--- a/frame/democracy/Cargo.toml
+++ b/frame/democracy/Cargo.toml
@@ -14,7 +14,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.126", optional = true, features = ["derive"] }
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
+	"derive",
+] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
@@ -26,9 +28,6 @@ frame-system = { version = "4.0.0-dev", default-features = false, path = "../sys
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 pallet-scheduler = { version = "4.0.0-dev", path = "../scheduler" }
-sp-storage = { version = "4.0.0-dev", path = "../../primitives/storage" }
-substrate-test-utils = { version = "4.0.0-dev", path = "../../test-utils" }
-hex-literal = "0.3.1"
 
 [features]
 default = ["std"]
diff --git a/frame/democracy/src/lib.rs b/frame/democracy/src/lib.rs
index 7c2e53a817b0..9a1dd503b799 100644
--- a/frame/democracy/src/lib.rs
+++ b/frame/democracy/src/lib.rs
@@ -1427,7 +1427,7 @@ impl<T: Config> Pallet<T> {
 						}
 						ReferendumInfoOf::<T>::insert(ref_index, ReferendumInfo::Ongoing(status));
 					},
-					Some(ReferendumInfo::Finished { end, approved }) =>
+					Some(ReferendumInfo::Finished { end, approved }) => {
 						if let Some((lock_periods, balance)) = votes[i].1.locked_if(approved) {
 							let unlock_at = end + T::EnactmentPeriod::get() * lock_periods.into();
 							let now = frame_system::Pallet::<T>::block_number();
@@ -1438,7 +1438,8 @@ impl<T: Config> Pallet<T> {
 								);
 								prior.accumulate(unlock_at, balance)
 							}
-						},
+						}
+					},
 					None => {}, // Referendum was cancelled.
 				}
 				votes.remove(i);
diff --git a/frame/election-provider-multi-phase/Cargo.toml b/frame/election-provider-multi-phase/Cargo.toml
index 74c1a0108412..97b7f4d1340c 100644
--- a/frame/election-provider-multi-phase/Cargo.toml
+++ b/frame/election-provider-multi-phase/Cargo.toml
@@ -14,7 +14,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 static_assertions = "1.1.0"
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
+	"derive",
+] }
 log = { version = "0.4.14", default-features = false }
 
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
@@ -30,19 +32,21 @@ frame-election-provider-support = { version = "4.0.0-dev", default-features = fa
 
 # Optional imports for benchmarking
 frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
-rand = { version = "0.7.3", default-features = false, optional = true, features = ["alloc", "small_rng"] }
+rand = { version = "0.7.3", default-features = false, optional = true, features = [
+	"alloc",
+	"small_rng",
+] }
 
 [dev-dependencies]
-paste = "1.0.3"
 parking_lot = "0.11.0"
 rand = { version = "0.7.3" }
-hex-literal = "0.3.1"
-substrate-test-utils = { version = "4.0.0-dev", path = "../../test-utils" }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
 sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
 sp-npos-elections = { version = "4.0.0-dev", default-features = false, path = "../../primitives/npos-elections" }
 sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
-frame-election-provider-support = { version = "4.0.0-dev", features = ["runtime-benchmarks"], path = "../election-provider-support" }
+frame-election-provider-support = { version = "4.0.0-dev", features = [
+	"runtime-benchmarks",
+], path = "../election-provider-support" }
 pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 frame-benchmarking = { version = "4.0.0-dev", path = "../benchmarking" }
 
@@ -64,8 +68,5 @@ std = [
 	"frame-election-provider-support/std",
 	"log/std",
 ]
-runtime-benchmarks = [
-	"frame-benchmarking",
-	"rand",
-]
+runtime-benchmarks = ["frame-benchmarking", "rand"]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/elections-phragmen/Cargo.toml b/frame/elections-phragmen/Cargo.toml
index dc0088c12a57..930c9c2c8083 100644
--- a/frame/elections-phragmen/Cargo.toml
+++ b/frame/elections-phragmen/Cargo.toml
@@ -13,7 +13,9 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
+	"derive",
+] }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 sp-npos-elections = { version = "4.0.0-dev", default-features = false, path = "../../primitives/npos-elections" }
 sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
@@ -25,7 +27,6 @@ frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "
 log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
-hex-literal = "0.3.1"
 pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 substrate-test-utils = { version = "4.0.0-dev", path = "../../test-utils" }
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index 12e696563392..331d34180e98 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -679,8 +679,9 @@ pub mod pallet {
 					// election.
 					Members::<T>::mutate(|members| {
 						match members.binary_search_by(|m| m.who.cmp(member)) {
-							Ok(_) =>
-								panic!("Duplicate member in elections-phragmen genesis: {}", member),
+							Ok(_) => {
+								panic!("Duplicate member in elections-phragmen genesis: {}", member)
+							},
 							Err(pos) => members.insert(
 								pos,
 								SeatHolder {
diff --git a/frame/elections/Cargo.toml b/frame/elections/Cargo.toml
index b1f49d778050..29bc8f8a5cea 100644
--- a/frame/elections/Cargo.toml
+++ b/frame/elections/Cargo.toml
@@ -13,7 +13,9 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
+	"derive",
+] }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
@@ -22,7 +24,6 @@ frame-support = { version = "4.0.0-dev", default-features = false, path = "../su
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 
 [dev-dependencies]
-hex-literal = "0.3.1"
 pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 
 [features]
diff --git a/frame/example-offchain-worker/Cargo.toml b/frame/example-offchain-worker/Cargo.toml
index c6b13d110951..69a562174862 100644
--- a/frame/example-offchain-worker/Cargo.toml
+++ b/frame/example-offchain-worker/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-example-offchain-worker"
-version = "3.0.0-dev"
+version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Unlicense"
diff --git a/frame/example-parallel/Cargo.toml b/frame/example-parallel/Cargo.toml
index 761d0e4ff14d..4d14d635201f 100644
--- a/frame/example-parallel/Cargo.toml
+++ b/frame/example-parallel/Cargo.toml
@@ -21,9 +21,6 @@ sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../pr
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-tasks = { version = "4.0.0-dev", default-features = false, path = "../../primitives/tasks" }
 
-[dev-dependencies]
-serde = { version = "1.0.126" }
-
 [features]
 default = ["std"]
 std = [
diff --git a/frame/executive/Cargo.toml b/frame/executive/Cargo.toml
index 7b5be2ceec10..a809da6f1cd3 100644
--- a/frame/executive/Cargo.toml
+++ b/frame/executive/Cargo.toml
@@ -13,7 +13,9 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
+	"derive",
+] }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
@@ -25,8 +27,7 @@ sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primi
 [dev-dependencies]
 hex-literal = "0.3.1"
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
-sp-io ={ version = "4.0.0-dev", path = "../../primitives/io" }
-pallet-indices = { version = "4.0.0-dev", path = "../indices" }
+sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
 pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 pallet-transaction-payment = { version = "4.0.0-dev", path = "../transaction-payment" }
 sp-version = { version = "4.0.0-dev", path = "../../primitives/version" }
@@ -34,9 +35,7 @@ sp-inherents = { version = "4.0.0-dev", path = "../../primitives/inherents" }
 
 [features]
 default = ["std"]
-with-tracing = [
-	"sp-tracing/with-tracing"
-]
+with-tracing = ["sp-tracing/with-tracing"]
 std = [
 	"codec/std",
 	"frame-support/std",
diff --git a/frame/im-online/src/lib.rs b/frame/im-online/src/lib.rs
index 842f593de772..3a040c7b5e21 100644
--- a/frame/im-online/src/lib.rs
+++ b/frame/im-online/src/lib.rs
@@ -185,10 +185,12 @@ impl<BlockNumber: sp_std::fmt::Debug> sp_std::fmt::Debug for OffchainErr<BlockNu
 	fn fmt(&self, fmt: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
 		match *self {
 			OffchainErr::TooEarly => write!(fmt, "Too early to send heartbeat."),
-			OffchainErr::WaitingForInclusion(ref block) =>
-				write!(fmt, "Heartbeat already sent at {:?}. Waiting for inclusion.", block),
-			OffchainErr::AlreadyOnline(auth_idx) =>
-				write!(fmt, "Authority {} is already online", auth_idx),
+			OffchainErr::WaitingForInclusion(ref block) => {
+				write!(fmt, "Heartbeat already sent at {:?}. Waiting for inclusion.", block)
+			},
+			OffchainErr::AlreadyOnline(auth_idx) => {
+				write!(fmt, "Authority {} is already online", auth_idx)
+			},
 			OffchainErr::FailedSigning => write!(fmt, "Failed to sign heartbeat"),
 			OffchainErr::FailedToAcquireLock => write!(fmt, "Failed to acquire lock"),
 			OffchainErr::NetworkState => write!(fmt, "Failed to fetch network state"),
diff --git a/frame/lottery/Cargo.toml b/frame/lottery/Cargo.toml
index 237345805d20..351e72a77a55 100644
--- a/frame/lottery/Cargo.toml
+++ b/frame/lottery/Cargo.toml
@@ -13,7 +13,9 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
+	"derive",
+] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
@@ -26,7 +28,6 @@ frame-support-test = { version = "3.0.0", path = "../support/test" }
 pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
-serde = { version = "1.0.126" }
 
 [features]
 default = ["std"]
diff --git a/frame/merkle-mountain-range/rpc/Cargo.toml b/frame/merkle-mountain-range/rpc/Cargo.toml
index fe2d9cfc552b..9182afbb1f5f 100644
--- a/frame/merkle-mountain-range/rpc/Cargo.toml
+++ b/frame/merkle-mountain-range/rpc/Cargo.toml
@@ -22,7 +22,6 @@ serde = { version = "1.0.126", features = ["derive"] }
 sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
 sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
-sp-rpc = { version = "4.0.0-dev", path = "../../../primitives/rpc" }
 sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
 
 pallet-mmr-primitives = { version = "4.0.0-dev", path = "../primitives" }
diff --git a/frame/multisig/Cargo.toml b/frame/multisig/Cargo.toml
index f53df2460968..7ccdf7c7a0c9 100644
--- a/frame/multisig/Cargo.toml
+++ b/frame/multisig/Cargo.toml
@@ -16,7 +16,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
-sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
diff --git a/frame/offences/benchmarking/Cargo.toml b/frame/offences/benchmarking/Cargo.toml
index 89849d86d749..dc408ee8121d 100644
--- a/frame/offences/benchmarking/Cargo.toml
+++ b/frame/offences/benchmarking/Cargo.toml
@@ -21,9 +21,13 @@ pallet-babe = { version = "4.0.0-dev", default-features = false, path = "../../b
 pallet-balances = { version = "4.0.0-dev", default-features = false, path = "../../balances" }
 pallet-grandpa = { version = "4.0.0-dev", default-features = false, path = "../../grandpa" }
 pallet-im-online = { version = "4.0.0-dev", default-features = false, path = "../../im-online" }
-pallet-offences = { version = "4.0.0-dev", default-features = false, features = ["runtime-benchmarks"], path = "../../offences" }
+pallet-offences = { version = "4.0.0-dev", default-features = false, features = [
+	"runtime-benchmarks",
+], path = "../../offences" }
 pallet-session = { version = "4.0.0-dev", default-features = false, path = "../../session" }
-pallet-staking = { version = "4.0.0-dev", default-features = false, features = ["runtime-benchmarks"], path = "../../staking" }
+pallet-staking = { version = "4.0.0-dev", default-features = false, features = [
+	"runtime-benchmarks",
+], path = "../../staking" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/runtime" }
 sp-staking = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/staking" }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/std" }
@@ -32,7 +36,6 @@ frame-election-provider-support = { version = "4.0.0-dev", default-features = fa
 [dev-dependencies]
 pallet-staking-reward-curve = { version = "4.0.0-dev", path = "../../staking/reward-curve" }
 pallet-timestamp = { version = "4.0.0-dev", path = "../../timestamp" }
-serde = { version = "1.0.101" }
 sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
 sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
 
diff --git a/frame/proxy/Cargo.toml b/frame/proxy/Cargo.toml
index ac33c3d14c8e..22edf1f3c20a 100644
--- a/frame/proxy/Cargo.toml
+++ b/frame/proxy/Cargo.toml
@@ -16,7 +16,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["max-encoded-len"] }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
-sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
 sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
diff --git a/frame/proxy/src/tests.rs b/frame/proxy/src/tests.rs
index df88f17b71a5..f3fe1d674a87 100644
--- a/frame/proxy/src/tests.rs
+++ b/frame/proxy/src/tests.rs
@@ -123,8 +123,9 @@ impl InstanceFilter<Call> for ProxyType {
 	fn filter(&self, c: &Call) -> bool {
 		match self {
 			ProxyType::Any => true,
-			ProxyType::JustTransfer =>
-				matches!(c, Call::Balances(pallet_balances::Call::transfer(..))),
+			ProxyType::JustTransfer => {
+				matches!(c, Call::Balances(pallet_balances::Call::transfer(..)))
+			},
 			ProxyType::JustUtility => matches!(c, Call::Utility(..)),
 		}
 	}
diff --git a/frame/recovery/Cargo.toml b/frame/recovery/Cargo.toml
index e38f1fd35aaf..b8601d0852f6 100644
--- a/frame/recovery/Cargo.toml
+++ b/frame/recovery/Cargo.toml
@@ -14,7 +14,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-enumflags2 = { version = "0.6.2" }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
diff --git a/frame/session/Cargo.toml b/frame/session/Cargo.toml
index 40f1e58c9283..b5841319000b 100644
--- a/frame/session/Cargo.toml
+++ b/frame/session/Cargo.toml
@@ -13,7 +13,9 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
+	"derive",
+] }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
@@ -27,10 +29,6 @@ sp-trie = { version = "4.0.0-dev", optional = true, default-features = false, pa
 log = { version = "0.4.0", default-features = false }
 impl-trait-for-tuples = "0.2.1"
 
-[dev-dependencies]
-sp-application-crypto = { version = "4.0.0-dev", path = "../../primitives/application-crypto" }
-lazy_static = "1.4.0"
-
 [features]
 default = ["std", "historical"]
 historical = ["sp-trie"]
diff --git a/frame/session/benchmarking/Cargo.toml b/frame/session/benchmarking/Cargo.toml
index 2f8e069347bc..c559b29f14ee 100644
--- a/frame/session/benchmarking/Cargo.toml
+++ b/frame/session/benchmarking/Cargo.toml
@@ -19,16 +19,19 @@ sp-std = { version = "4.0.0-dev", default-features = false, path = "../../../pri
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../../system" }
 frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../../benchmarking" }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../../support" }
-pallet-staking = { version = "4.0.0-dev", default-features = false, features = ["runtime-benchmarks"], path = "../../staking" }
+pallet-staking = { version = "4.0.0-dev", default-features = false, features = [
+	"runtime-benchmarks",
+], path = "../../staking" }
 pallet-session = { version = "4.0.0-dev", default-features = false, path = "../../session" }
 rand = { version = "0.7.2", default-features = false }
 
 [dev-dependencies]
-serde = { version = "1.0.126" }
-codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", features = [
+	"derive",
+] }
 sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
 pallet-staking-reward-curve = { version = "4.0.0-dev", path = "../../staking/reward-curve" }
-sp-io ={ version = "4.0.0-dev", path = "../../../primitives/io" }
+sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
 pallet-timestamp = { version = "4.0.0-dev", path = "../../timestamp" }
 pallet-balances = { version = "4.0.0-dev", path = "../../balances" }
 frame-election-provider-support = { version = "4.0.0-dev", path = "../../election-provider-support" }
diff --git a/frame/staking/Cargo.toml b/frame/staking/Cargo.toml
index 285fb11cc52c..669a8ff96f2c 100644
--- a/frame/staking/Cargo.toml
+++ b/frame/staking/Cargo.toml
@@ -13,39 +13,40 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-static_assertions = "1.1.0"
 serde = { version = "1.0.126", optional = true }
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
+	"derive",
+] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
-sp-io ={ version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 sp-staking = { version = "4.0.0-dev", default-features = false, path = "../../primitives/staking" }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
-pallet-session = { version = "4.0.0-dev", default-features = false, features = ["historical"], path = "../session" }
+pallet-session = { version = "4.0.0-dev", default-features = false, features = [
+	"historical",
+], path = "../session" }
 pallet-authorship = { version = "4.0.0-dev", default-features = false, path = "../authorship" }
 sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../../primitives/application-crypto" }
 frame-election-provider-support = { version = "4.0.0-dev", default-features = false, path = "../election-provider-support" }
 log = { version = "0.4.14", default-features = false }
-paste = "1.0"
 
 # Optional imports for benchmarking
 frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
 rand_chacha = { version = "0.2", default-features = false, optional = true }
 
 [dev-dependencies]
-sp-storage = { version = "4.0.0-dev", path = "../../primitives/storage" }
 sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 pallet-timestamp = { version = "4.0.0-dev", path = "../timestamp" }
-pallet-staking-reward-curve = { version = "4.0.0-dev",  path = "../staking/reward-curve" }
+pallet-staking-reward-curve = { version = "4.0.0-dev", path = "../staking/reward-curve" }
 substrate-test-utils = { version = "4.0.0-dev", path = "../../test-utils" }
 frame-benchmarking = { version = "4.0.0-dev", path = "../benchmarking" }
-frame-election-provider-support = { version = "4.0.0-dev", features = ["runtime-benchmarks"], path = "../election-provider-support" }
+frame-election-provider-support = { version = "4.0.0-dev", features = [
+	"runtime-benchmarks",
+], path = "../election-provider-support" }
 rand_chacha = { version = "0.2" }
-parking_lot = "0.11.1"
-hex = "0.4"
 
 [features]
 default = ["std"]
diff --git a/frame/support/procedural/src/pallet/parse/mod.rs b/frame/support/procedural/src/pallet/parse/mod.rs
index c7367e582044..96d4776e805b 100644
--- a/frame/support/procedural/src/pallet/parse/mod.rs
+++ b/frame/support/procedural/src/pallet/parse/mod.rs
@@ -350,8 +350,9 @@ impl GenericKind {
 		match self {
 			GenericKind::None => quote::quote!(),
 			GenericKind::Config => quote::quote_spanned!(span => T: Config),
-			GenericKind::ConfigAndInstance =>
-				quote::quote_spanned!(span => T: Config<I>, I: 'static),
+			GenericKind::ConfigAndInstance => {
+				quote::quote_spanned!(span => T: Config<I>, I: 'static)
+			},
 		}
 	}
 
diff --git a/frame/support/procedural/src/storage/genesis_config/builder_def.rs b/frame/support/procedural/src/storage/genesis_config/builder_def.rs
index 9669212f198f..001cea0f2b78 100644
--- a/frame/support/procedural/src/storage/genesis_config/builder_def.rs
+++ b/frame/support/procedural/src/storage/genesis_config/builder_def.rs
@@ -53,13 +53,14 @@ impl BuilderDef {
 				is_generic |= line.is_generic;
 
 				data = Some(match &line.storage_type {
-					StorageLineTypeDef::Simple(_) if line.is_option =>
+					StorageLineTypeDef::Simple(_) if line.is_option => {
 						quote_spanned!(builder.span() =>
 							// NOTE: the type of `data` is specified when used later in the code
 							let builder: fn(&Self) -> _ = #builder;
 							let data = builder(self);
 							let data = Option::as_ref(&data);
-						),
+						)
+					},
 					_ => quote_spanned!(builder.span() =>
 						// NOTE: the type of `data` is specified when used later in the code
 						let builder: fn(&Self) -> _ = #builder;
@@ -70,8 +71,9 @@ impl BuilderDef {
 				is_generic |= line.is_generic;
 
 				data = Some(match &line.storage_type {
-					StorageLineTypeDef::Simple(_) if line.is_option =>
-						quote!( let data = Some(&self.#config); ),
+					StorageLineTypeDef::Simple(_) if line.is_option => {
+						quote!( let data = Some(&self.#config); )
+					},
 					_ => quote!( let data = &self.#config; ),
 				});
 			};
diff --git a/frame/support/src/traits/tokens/imbalance/signed_imbalance.rs b/frame/support/src/traits/tokens/imbalance/signed_imbalance.rs
index 59302b975854..3e76d069f50e 100644
--- a/frame/support/src/traits/tokens/imbalance/signed_imbalance.rs
+++ b/frame/support/src/traits/tokens/imbalance/signed_imbalance.rs
@@ -58,12 +58,13 @@ impl<
 				SignedImbalance::Positive(one.merge(other)),
 			(SignedImbalance::Negative(one), SignedImbalance::Negative(other)) =>
 				SignedImbalance::Negative(one.merge(other)),
-			(SignedImbalance::Positive(one), SignedImbalance::Negative(other)) =>
+			(SignedImbalance::Positive(one), SignedImbalance::Negative(other)) => {
 				match one.offset(other) {
 					SameOrOther::Same(positive) => SignedImbalance::Positive(positive),
 					SameOrOther::Other(negative) => SignedImbalance::Negative(negative),
 					SameOrOther::None => SignedImbalance::Positive(P::zero()),
-				},
+				}
+			},
 			(one, other) => other.merge(one),
 		}
 	}
diff --git a/frame/system/Cargo.toml b/frame/system/Cargo.toml
index 744a3cc22aea..d6e34de2a082 100644
--- a/frame/system/Cargo.toml
+++ b/frame/system/Cargo.toml
@@ -21,7 +21,6 @@ sp-io = { version = "4.0.0-dev", path = "../../primitives/io", default-features
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 sp-version = { version = "4.0.0-dev", default-features = false, path = "../../primitives/version" }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
-impl-trait-for-tuples = "0.2.1"
 log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
diff --git a/frame/system/benchmarking/Cargo.toml b/frame/system/benchmarking/Cargo.toml
index 2daa42366f77..d7e4e2641d39 100644
--- a/frame/system/benchmarking/Cargo.toml
+++ b/frame/system/benchmarking/Cargo.toml
@@ -22,8 +22,7 @@ frame-support = { version = "4.0.0-dev", default-features = false, path = "../..
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/core" }
 
 [dev-dependencies]
-serde = { version = "1.0.126" }
-sp-io ={ version = "4.0.0-dev", path = "../../../primitives/io" }
+sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
 
 [features]
 default = ["std"]
diff --git a/frame/timestamp/Cargo.toml b/frame/timestamp/Cargo.toml
index 7e8cd7dd751e..cdf31b1e7ae2 100644
--- a/frame/timestamp/Cargo.toml
+++ b/frame/timestamp/Cargo.toml
@@ -24,7 +24,6 @@ frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 sp-timestamp = { version = "4.0.0-dev", default-features = false, path = "../../primitives/timestamp" }
-impl-trait-for-tuples = "0.2.1"
 log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
diff --git a/frame/transaction-payment/Cargo.toml b/frame/transaction-payment/Cargo.toml
index 16f09d3e1d2d..12b7622c1b18 100644
--- a/frame/transaction-payment/Cargo.toml
+++ b/frame/transaction-payment/Cargo.toml
@@ -13,7 +13,9 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
+	"derive",
+] }
 serde = { version = "1.0.126", optional = true }
 smallvec = "1.4.1"
 
@@ -27,7 +29,6 @@ frame-system = { version = "4.0.0-dev", default-features = false, path = "../sys
 
 [dev-dependencies]
 serde_json = "1.0.41"
-sp-storage = { version = "4.0.0-dev", path = "../../primitives/storage" }
 pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 
 [features]
diff --git a/frame/transaction-storage/Cargo.toml b/frame/transaction-storage/Cargo.toml
index af6b66d2a01e..74f31ffed4b3 100644
--- a/frame/transaction-storage/Cargo.toml
+++ b/frame/transaction-storage/Cargo.toml
@@ -27,16 +27,12 @@ sp-transaction-storage-proof = { version = "4.0.0-dev", default-features = false
 frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
-frame-support-test = { version = "3.0.0", path = "../support/test" }
 sp-transaction-storage-proof = { version = "4.0.0-dev", default-features = true, path = "../../primitives/transaction-storage-proof" }
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core", default-features = false }
 
 [features]
 default = ["std"]
-runtime-benchmarks = [
-	"frame-benchmarking",
-	"hex-literal",
-]
+runtime-benchmarks = ["frame-benchmarking", "hex-literal"]
 std = [
 	"serde",
 	"codec/std",
diff --git a/frame/treasury/Cargo.toml b/frame/treasury/Cargo.toml
index 4e362ab0ac1c..c670cc1e439f 100644
--- a/frame/treasury/Cargo.toml
+++ b/frame/treasury/Cargo.toml
@@ -13,7 +13,10 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
+codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = [
+	"derive",
+	"max-encoded-len",
+] }
 serde = { version = "1.0.126", features = ["derive"], optional = true }
 impl-trait-for-tuples = "0.2.1"
 
@@ -27,9 +30,8 @@ pallet-balances = { version = "4.0.0-dev", default-features = false, path = "../
 
 
 [dev-dependencies]
-sp-io ={ version = "4.0.0-dev", path = "../../primitives/io" }
+sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
-sp-storage = { version = "4.0.0-dev", path = "../../primitives/storage" }
 
 [features]
 default = ["std"]
diff --git a/frame/try-runtime/Cargo.toml b/frame/try-runtime/Cargo.toml
index b9eac961cf22..0ff534767607 100644
--- a/frame/try-runtime/Cargo.toml
+++ b/frame/try-runtime/Cargo.toml
@@ -13,8 +13,6 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-
 sp-api = { version = "4.0.0-dev", path = "../../primitives/api", default-features = false }
 sp-std = { version = "4.0.0-dev", path = "../../primitives/std" , default-features = false }
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" , default-features = false }
diff --git a/frame/uniques/Cargo.toml b/frame/uniques/Cargo.toml
index 53069b5401df..32a283fc36d2 100644
--- a/frame/uniques/Cargo.toml
+++ b/frame/uniques/Cargo.toml
@@ -15,7 +15,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
-sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
@@ -32,7 +31,6 @@ default = ["std"]
 std = [
 	"codec/std",
 	"sp-std/std",
-	"sp-core/std",
 	"sp-runtime/std",
 	"frame-support/std",
 	"frame-system/std",
diff --git a/frame/utility/Cargo.toml b/frame/utility/Cargo.toml
index fe43f63b15d5..d3e2933faf9a 100644
--- a/frame/utility/Cargo.toml
+++ b/frame/utility/Cargo.toml
@@ -35,7 +35,7 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 	"sp-io/std",
-	"sp-std/std"
+	"sp-std/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
diff --git a/frame/vesting/Cargo.toml b/frame/vesting/Cargo.toml
index f035bcf7d007..9d818d7a33de 100644
--- a/frame/vesting/Cargo.toml
+++ b/frame/vesting/Cargo.toml
@@ -13,8 +13,9 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-enumflags2 = { version = "0.6.2" }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
+	"derive",
+] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
@@ -25,8 +26,6 @@ frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "
 sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 pallet-balances = { version = "4.0.0-dev", path = "../balances" }
-sp-storage = { version = "4.0.0-dev", path = "../../primitives/storage" }
-hex-literal = "0.3.1"
 
 [features]
 default = ["std"]
diff --git a/primitives/api/Cargo.toml b/primitives/api/Cargo.toml
index 07f7e100e168..7e751232acb5 100644
--- a/primitives/api/Cargo.toml
+++ b/primitives/api/Cargo.toml
@@ -29,7 +29,7 @@ log = { version = "0.4.14", default-features = false }
 sp-test-primitives = { version = "2.0.0", path = "../test-primitives" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"sp-core/std",
@@ -48,6 +48,4 @@ std = [
 # building a runtime for registering it on chain.
 #
 # This sets the max logging level to `off` for `log`.
-disable-logging = [
-	"log/max_level_off",
-]
+disable-logging = ["log/max_level_off"]
diff --git a/primitives/api/test/Cargo.toml b/primitives/api/test/Cargo.toml
index a43db55c39db..b78c9abb80dc 100644
--- a/primitives/api/test/Cargo.toml
+++ b/primitives/api/test/Cargo.toml
@@ -17,7 +17,6 @@ substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils
 sp-version = { version = "4.0.0-dev", path = "../../version" }
 sp-tracing = { version = "4.0.0-dev", path = "../../tracing" }
 sp-runtime = { version = "4.0.0-dev", path = "../../runtime" }
-sp-blockchain = { version = "4.0.0-dev", path = "../../blockchain" }
 sp-consensus = { version = "0.10.0-dev", path = "../../consensus/common" }
 sc-block-builder = { version = "0.10.0-dev", path = "../../../client/block-builder" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
@@ -30,7 +29,6 @@ criterion = "0.3.0"
 futures = "0.3.9"
 log = "0.4.14"
 sp-core = { version = "4.0.0-dev", path = "../../core" }
-substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
 
 [[bench]]
 name = "bench"
diff --git a/primitives/arithmetic/Cargo.toml b/primitives/arithmetic/Cargo.toml
index b43e12cd78d8..0b7913a01c04 100644
--- a/primitives/arithmetic/Cargo.toml
+++ b/primitives/arithmetic/Cargo.toml
@@ -15,7 +15,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
+	"derive",
+] }
 integer-sqrt = "0.1.2"
 static_assertions = "1.1.0"
 num-traits = { version = "0.2.8", default-features = false }
@@ -26,7 +28,6 @@ sp-debug-derive = { version = "3.0.0", default-features = false, path = "../debu
 [dev-dependencies]
 rand = "0.7.2"
 criterion = "0.3"
-serde_json = "1.0"
 primitive-types = "0.10.0"
 
 [features]
diff --git a/primitives/arithmetic/fuzzer/Cargo.toml b/primitives/arithmetic/fuzzer/Cargo.toml
index 14f75132afb8..fa951a143370 100644
--- a/primitives/arithmetic/fuzzer/Cargo.toml
+++ b/primitives/arithmetic/fuzzer/Cargo.toml
@@ -18,7 +18,6 @@ sp-arithmetic = { version = "4.0.0-dev", path = ".." }
 honggfuzz = "0.5.49"
 primitive-types = "0.10.0"
 num-bigint = "0.2"
-num-traits = "0.2"
 
 [[bin]]
 name = "biguint"
diff --git a/primitives/arithmetic/src/per_things.rs b/primitives/arithmetic/src/per_things.rs
index b114c4a96788..7fbf6bed3f5a 100644
--- a/primitives/arithmetic/src/per_things.rs
+++ b/primitives/arithmetic/src/per_things.rs
@@ -392,18 +392,20 @@ where
 		// Already rounded down
 		Rounding::Down => {},
 		// Round up if the fractional part of the result is non-zero.
-		Rounding::Up =>
+		Rounding::Up => {
 			if rem_mul_upper % denom_upper > 0.into() {
 				// `rem * numer / denom` is less than `numer`, so this will not overflow.
 				rem_mul_div_inner += 1.into();
-			},
+			}
+		},
 		// Round up if the fractional part of the result is greater than a half. An exact half is
 		// rounded down.
-		Rounding::Nearest =>
+		Rounding::Nearest => {
 			if rem_mul_upper % denom_upper > denom_upper / 2.into() {
 				// `rem * numer / denom` is less than `numer`, so this will not overflow.
 				rem_mul_div_inner += 1.into();
-			},
+			}
+		},
 	}
 	rem_mul_div_inner.into()
 }
diff --git a/primitives/consensus/common/Cargo.toml b/primitives/consensus/common/Cargo.toml
index af6e430ff704..ecfc1c1b3182 100644
--- a/primitives/consensus/common/Cargo.toml
+++ b/primitives/consensus/common/Cargo.toml
@@ -15,10 +15,12 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 async-trait = "0.1.42"
-codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", features = [
+    "derive",
+] }
 futures = { version = "0.3.1", features = ["thread-pool"] }
 log = "0.4.8"
-sp-core = { path = "../../core", version = "4.0.0-dev"}
+sp-core = { path = "../../core", version = "4.0.0-dev" }
 sp-inherents = { version = "4.0.0-dev", path = "../../inherents" }
 sp-state-machine = { version = "0.10.0-dev", path = "../../state-machine" }
 futures-timer = "3.0.1"
diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml
index 711fcc37e855..c7f19439c419 100644
--- a/primitives/core/Cargo.toml
+++ b/primitives/core/Cargo.toml
@@ -14,11 +14,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
-codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
+codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = [
+	"derive",
+	"max-encoded-len",
+] }
 log = { version = "0.4.11", default-features = false }
 serde = { version = "1.0.126", optional = true, features = ["derive"] }
 byteorder = { version = "1.3.2", default-features = false }
-primitive-types = { version = "0.10.0", default-features = false, features = ["codec"] }
+primitive-types = { version = "0.10.0", default-features = false, features = [
+	"codec",
+] }
 impl-serde = { version = "0.3.0", optional = true }
 wasmi = { version = "0.9.0", optional = true }
 hash-db = { version = "0.15.2", default-features = false }
@@ -36,32 +41,40 @@ parking_lot = { version = "0.11.1", optional = true }
 sp-debug-derive = { version = "3.0.0", path = "../debug-derive" }
 sp-externalities = { version = "0.10.0-dev", optional = true, path = "../externalities" }
 sp-storage = { version = "4.0.0-dev", default-features = false, path = "../storage" }
-parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.10.0", default-features = false, features = [
+	"primitive-types",
+] }
 futures = { version = "0.3.1", optional = true }
 dyn-clonable = { version = "0.9.0", optional = true }
 thiserror = { version = "1.0.21", optional = true }
 
 # full crypto
-ed25519-dalek = { version = "1.0.1", default-features = false, features = ["u64_backend", "alloc"], optional = true }
+ed25519-dalek = { version = "1.0.1", default-features = false, features = [
+	"u64_backend",
+	"alloc",
+], optional = true }
 blake2-rfc = { version = "0.2.18", default-features = false, optional = true }
 tiny-keccak = { version = "2.0.1", features = ["keccak"], optional = true }
-schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated", "u64_backend"], default-features = false, optional = true }
+schnorrkel = { version = "0.9.1", features = [
+	"preaudit_deprecated",
+	"u64_backend",
+], default-features = false, optional = true }
 sha2 = { version = "0.9.2", default-features = false, optional = true }
 hex = { version = "0.4", default-features = false, optional = true }
 twox-hash = { version = "1.5.0", default-features = false, optional = true }
-libsecp256k1 = { version = "0.3.2", default-features = false, features = ["hmac"], optional = true }
+libsecp256k1 = { version = "0.3.2", default-features = false, features = [
+	"hmac",
+], optional = true }
 merlin = { version = "2.0", default-features = false, optional = true }
 
 sp-runtime-interface = { version = "4.0.0-dev", default-features = false, path = "../runtime-interface" }
 
 [dev-dependencies]
 sp-serializer = { version = "3.0.0", path = "../serializer" }
-pretty_assertions = "0.6.1"
 hex-literal = "0.3.1"
 rand = "0.7.2"
 criterion = "0.3.3"
 serde_json = "1.0"
-rand_chacha = "0.2.2"
 
 [[bench]]
 name = "bench"
diff --git a/primitives/core/src/offchain/testing.rs b/primitives/core/src/offchain/testing.rs
index 5a9996af9aaf..26bcdb66de83 100644
--- a/primitives/core/src/offchain/testing.rs
+++ b/primitives/core/src/offchain/testing.rs
@@ -300,8 +300,9 @@ impl offchain::Externalities for TestOffchainExt {
 
 		ids.iter()
 			.map(|id| match state.requests.get(id) {
-				Some(req) if req.response.is_none() =>
-					panic!("No `response` provided for request with id: {:?}", id),
+				Some(req) if req.response.is_none() => {
+					panic!("No `response` provided for request with id: {:?}", id)
+				},
 				None => RequestStatus::Invalid,
 				_ => RequestStatus::Finished(200),
 			})
diff --git a/primitives/npos-elections/fuzzer/Cargo.toml b/primitives/npos-elections/fuzzer/Cargo.toml
index 775f9a1c211b..a8d0524fb871 100644
--- a/primitives/npos-elections/fuzzer/Cargo.toml
+++ b/primitives/npos-elections/fuzzer/Cargo.toml
@@ -17,10 +17,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 honggfuzz = "0.5"
 rand = { version = "0.7.3", features = ["std", "small_rng"] }
-sp-arithmetic = { version = "4.0.0-dev", path = "../../arithmetic" }
 sp-npos-elections = { version = "4.0.0-dev", path = ".." }
 sp-runtime = { version = "4.0.0-dev", path = "../../runtime" }
-sp-std = { version = "4.0.0-dev", path = "../../std" }
 structopt = "0.3.21"
 
 [[bin]]
diff --git a/primitives/npos-elections/solution-type/Cargo.toml b/primitives/npos-elections/solution-type/Cargo.toml
index 4b54e4670385..930b7de30f6a 100644
--- a/primitives/npos-elections/solution-type/Cargo.toml
+++ b/primitives/npos-elections/solution-type/Cargo.toml
@@ -22,6 +22,7 @@ proc-macro-crate = "1.0.0"
 
 [dev-dependencies]
 parity-scale-codec = "2.0.1"
-sp-arithmetic = { path = "../../arithmetic", version = "4.0.0-dev"}
-sp-npos-elections = { path = "..", version = "4.0.0-dev"}
+sp-arithmetic = { path = "../../arithmetic", version = "4.0.0-dev" }
+# used by generate_solution_type:
+sp-npos-elections = { path = "..", version = "4.0.0-dev" }
 trybuild = "1.0.43"
diff --git a/primitives/offchain/Cargo.toml b/primitives/offchain/Cargo.toml
index 500d3e8b867a..dd54147b6c62 100644
--- a/primitives/offchain/Cargo.toml
+++ b/primitives/offchain/Cargo.toml
@@ -17,13 +17,6 @@ sp-core = { version = "4.0.0-dev", default-features = false, path = "../core" }
 sp-api = { version = "4.0.0-dev", default-features = false, path = "../api" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../runtime" }
 
-[dev-dependencies]
-sp-state-machine = { version = "0.10.0-dev", default-features = false, path = "../state-machine" }
-
 [features]
 default = ["std"]
-std = [
-	"sp-core/std",
-	"sp-api/std",
-	"sp-runtime/std"
-]
+std = ["sp-core/std", "sp-api/std", "sp-runtime/std"]
diff --git a/primitives/rpc/Cargo.toml b/primitives/rpc/Cargo.toml
index 227fc0fb9fc2..73c42555f1f1 100644
--- a/primitives/rpc/Cargo.toml
+++ b/primitives/rpc/Cargo.toml
@@ -15,7 +15,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.126", features = ["derive"] }
 sp-core = { version = "4.0.0-dev", path = "../core" }
-tracing-core = "0.1.17"
 rustc-hash = "1.1.0"
 
 [dev-dependencies]
diff --git a/primitives/runtime-interface/test/Cargo.toml b/primitives/runtime-interface/test/Cargo.toml
index 686eb1b1a13e..377729521fcf 100644
--- a/primitives/runtime-interface/test/Cargo.toml
+++ b/primitives/runtime-interface/test/Cargo.toml
@@ -19,7 +19,6 @@ sp-runtime-interface-test-wasm = { version = "2.0.0", path = "../test-wasm" }
 sp-runtime-interface-test-wasm-deprecated = { version = "2.0.0", path = "../test-wasm-deprecated" }
 sp-state-machine = { version = "0.10.0-dev", path = "../../state-machine" }
 sp-runtime = { version = "4.0.0-dev", path = "../../runtime" }
-sp-core = { version = "4.0.0-dev", path = "../../core" }
 sp-io = { version = "4.0.0-dev", path = "../../io" }
 tracing = "0.1.25"
 tracing-core = "0.1.17"
diff --git a/primitives/runtime/src/multiaddress.rs b/primitives/runtime/src/multiaddress.rs
index 8c866b98ed85..28031461cf32 100644
--- a/primitives/runtime/src/multiaddress.rs
+++ b/primitives/runtime/src/multiaddress.rs
@@ -46,10 +46,12 @@ where
 		use sp_core::hexdisplay::HexDisplay;
 		match self {
 			Self::Raw(inner) => write!(f, "MultiAddress::Raw({})", HexDisplay::from(inner)),
-			Self::Address32(inner) =>
-				write!(f, "MultiAddress::Address32({})", HexDisplay::from(inner)),
-			Self::Address20(inner) =>
-				write!(f, "MultiAddress::Address20({})", HexDisplay::from(inner)),
+			Self::Address32(inner) => {
+				write!(f, "MultiAddress::Address32({})", HexDisplay::from(inner))
+			},
+			Self::Address20(inner) => {
+				write!(f, "MultiAddress::Address20({})", HexDisplay::from(inner))
+			},
 			_ => write!(f, "{:?}", self),
 		}
 	}
diff --git a/primitives/tracing/Cargo.toml b/primitives/tracing/Cargo.toml
index 451da77a817e..aba918c9c553 100644
--- a/primitives/tracing/Cargo.toml
+++ b/primitives/tracing/Cargo.toml
@@ -11,19 +11,23 @@ readme = "README.md"
 
 [package.metadata.docs.rs]
 # let's default to wasm32
-default-target =  "wasm32-unknown-unknown"
+default-target = "wasm32-unknown-unknown"
 # with the tracing enabled
 features = ["with-tracing"]
 # allowing for linux-gnu here, too, allows for `std` to show up as well
 targets = ["x86_64-unknown-linux-gnu", "wasm32-unknown-unknown"]
 
 [dependencies]
-sp-std = { version = "4.0.0-dev", path = "../std", default-features = false}
-codec = { version = "2.0.0", package = "parity-scale-codec", default-features = false, features = ["derive"]}
+sp-std = { version = "4.0.0-dev", path = "../std", default-features = false }
+codec = { version = "2.0.0", package = "parity-scale-codec", default-features = false, features = [
+	"derive",
+] }
 tracing = { version = "0.1.25", default-features = false }
 tracing-core = { version = "0.1.17", default-features = false }
 log = { version = "0.4.8", optional = true }
-tracing-subscriber = { version = "0.2.18", optional = true, features = ["tracing-log"] }
+tracing-subscriber = { version = "0.2.19", optional = true, features = [
+	"tracing-log",
+] }
 parking_lot = { version = "0.10.0", optional = true }
 erased-serde = { version = "0.3.9", optional = true }
 serde = { version = "1.0.126", optional = true }
@@ -31,11 +35,8 @@ serde_json = { version = "1.0.41", optional = true }
 slog = { version = "2.5.2", features = ["nested-values"], optional = true }
 
 [features]
-default = [ "std" ]
-with-tracing = [
-	"codec/derive",
-	"codec/full",
-]
+default = ["std"]
+with-tracing = ["codec/derive", "codec/full"]
 std = [
 	"with-tracing",
 	"tracing/std",
@@ -48,5 +49,5 @@ std = [
 	"erased-serde",
 	"serde",
 	"serde_json",
-	"slog"
+	"slog",
 ]
diff --git a/primitives/trie/src/trie_codec.rs b/primitives/trie/src/trie_codec.rs
index ed5724e0455d..8f2f44317649 100644
--- a/primitives/trie/src/trie_codec.rs
+++ b/primitives/trie/src/trie_codec.rs
@@ -81,8 +81,9 @@ impl<L: TrieConfiguration> fmt::Display for Error<L> {
 			Error::TrieError(e) => write!(f, "Trie error: {}", e),
 			Error::IncompleteProof => write!(f, "Incomplete proof"),
 			Error::ExtraneousChildNode => write!(f, "Child node content with no root in proof"),
-			Error::ExtraneousChildProof(root) =>
-				write!(f, "Proof of child trie {:x?} not in parent proof", root.as_ref()),
+			Error::ExtraneousChildProof(root) => {
+				write!(f, "Proof of child trie {:x?} not in parent proof", root.as_ref())
+			},
 			Error::RootMismatch(root, expected) => write!(
 				f,
 				"Verification error, root is {:x?}, expected: {:x?}",
diff --git a/primitives/utils/Cargo.toml b/primitives/utils/Cargo.toml
index bb5b1da59d41..d72df03af8cc 100644
--- a/primitives/utils/Cargo.toml
+++ b/primitives/utils/Cargo.toml
@@ -11,7 +11,6 @@ readme = "README.md"
 
 [dependencies]
 futures = "0.3.9"
-futures-core = "0.3.4"
 lazy_static = "1.4.0"
 prometheus = { version = "0.11.0", default-features = false }
 futures-timer = "3.0.2"
diff --git a/primitives/version/proc-macro/Cargo.toml b/primitives/version/proc-macro/Cargo.toml
index e27d26acc912..1221bc9a0bfe 100644
--- a/primitives/version/proc-macro/Cargo.toml
+++ b/primitives/version/proc-macro/Cargo.toml
@@ -19,7 +19,6 @@ proc-macro = true
 quote = "1.0.3"
 syn = { version = "1.0.58", features = ["full", "fold", "extra-traits", "visit"] }
 proc-macro2 = "1.0.28"
-proc-macro-crate = "1.0.0"
 codec = { package = "parity-scale-codec", version = "2.0.0", features = [ "derive" ] }
 
 [dev-dependencies]
diff --git a/test-utils/client/Cargo.toml b/test-utils/client/Cargo.toml
index 425cac7eb776..a6f152edafaa 100644
--- a/test-utils/client/Cargo.toml
+++ b/test-utils/client/Cargo.toml
@@ -14,17 +14,20 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 futures = "0.3.16"
-hash-db = "0.15.2"
 hex = "0.4"
 serde = "1.0.126"
 serde_json = "1.0.55"
 sc-client-api = { version = "4.0.0-dev", path = "../../client/api" }
-sc-client-db = { version = "0.10.0-dev", features = ["test-helpers"], path = "../../client/db" }
+sc-client-db = { version = "0.10.0-dev", features = [
+    "test-helpers",
+], path = "../../client/db" }
 sc-consensus = { version = "0.10.0-dev", path = "../../client/consensus/common" }
 sc-executor = { version = "0.10.0-dev", path = "../../client/executor" }
 sc-light = { version = "4.0.0-dev", path = "../../client/light" }
 sc-offchain = { version = "4.0.0-dev", path = "../../client/offchain" }
-sc-service = { version = "0.10.0-dev", default-features = false, features = ["test-helpers"],  path = "../../client/service" }
+sc-service = { version = "0.10.0-dev", default-features = false, features = [
+    "test-helpers",
+], path = "../../client/service" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
 sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
diff --git a/test-utils/runtime/client/Cargo.toml b/test-utils/runtime/client/Cargo.toml
index 9f1dc32a64ff..3561697042f2 100644
--- a/test-utils/runtime/client/Cargo.toml
+++ b/test-utils/runtime/client/Cargo.toml
@@ -24,5 +24,4 @@ sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 sc-client-api = { version = "4.0.0-dev", path = "../../../client/api" }
-sc-service = { version = "0.10.0-dev", default-features = false, path = "../../../client/service" }
 futures = "0.3.9"
diff --git a/test-utils/test-runner/Cargo.toml b/test-utils/test-runner/Cargo.toml
index dc443d5d8d51..1debd6fb0164 100644
--- a/test-utils/test-runner/Cargo.toml
+++ b/test-utils/test-runner/Cargo.toml
@@ -32,7 +32,6 @@ sp-block-builder = { path = "../../primitives/block-builder" }
 sp-api = { path = "../../primitives/api" }
 sp-transaction-pool = { path = "../../primitives/transaction-pool" }
 sp-consensus = { path = "../../primitives/consensus/common" }
-sp-keystore = { path = "../../primitives/keystore" }
 sp-runtime = { path = "../../primitives/runtime" }
 sp-session = { path = "../../primitives/session" }
 sp-offchain = { path = "../../primitives/offchain" }
diff --git a/test-utils/test-runner/src/node.rs b/test-utils/test-runner/src/node.rs
index 32b8bc5206f5..c76e20648d11 100644
--- a/test-utils/test-runner/src/node.rs
+++ b/test-utils/test-runner/src/node.rs
@@ -245,10 +245,12 @@ where
 			future.await.expect(ERROR);
 
 			match future_block.await.expect(ERROR) {
-				Ok(block) =>
-					log::info!("sealed {} (hash: {}) of {} blocks", count + 1, block.hash, num),
-				Err(err) =>
-					log::error!("failed to seal block {} of {}, error: {:?}", count + 1, num, err),
+				Ok(block) => {
+					log::info!("sealed {} (hash: {}) of {} blocks", count + 1, block.hash, num)
+				},
+				Err(err) => {
+					log::error!("failed to seal block {} of {}, error: {:?}", count + 1, num, err)
+				},
 			}
 		}
 	}
diff --git a/utils/frame/remote-externalities/Cargo.toml b/utils/frame/remote-externalities/Cargo.toml
index c157cdf272b6..c799e30d6a24 100644
--- a/utils/frame/remote-externalities/Cargo.toml
+++ b/utils/frame/remote-externalities/Cargo.toml
@@ -13,11 +13,12 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-jsonrpsee-ws-client = { version = "0.3.0", default-features = false, features = ["tokio02"] }
+jsonrpsee-ws-client = { version = "0.3.0", default-features = false, features = [
+    "tokio02",
+] }
 jsonrpsee-proc-macros = "0.3.0"
 
-hex = "0.4.0"
-env_logger = "0.9.0"
+env_logger = "0.9"
 log = "0.4.11"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 serde_json = "1.0"
@@ -29,8 +30,7 @@ sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
 
 [dev-dependencies]
 tokio = { version = "0.2", features = ["macros", "rt-threaded"] }
-pallet-elections-phragmen = { path = "../../../frame/elections-phragmen", version = "5.0.0-dev"}
-frame-support = { path = "../../../frame/support", version = "4.0.0-dev"}
+pallet-elections-phragmen = { path = "../../../frame/elections-phragmen", version = "5.0.0-dev" }
 
 [features]
 remote-test = []
diff --git a/utils/frame/rpc/support/Cargo.toml b/utils/frame/rpc/support/Cargo.toml
index 5651b1da3aab..827afb090c8f 100644
--- a/utils/frame/rpc/support/Cargo.toml
+++ b/utils/frame/rpc/support/Cargo.toml
@@ -1,7 +1,10 @@
 [package]
 name = "substrate-frame-rpc-support"
 version = "3.0.0"
-authors = ["Parity Technologies <admin@parity.io>", "Andrew Dirksen <andrew@dirksen.com>"]
+authors = [
+    "Parity Technologies <admin@parity.io>",
+    "Andrew Dirksen <andrew@dirksen.com>",
+]
 edition = "2018"
 license = "Apache-2.0"
 homepage = "https://substrate.dev"
@@ -14,7 +17,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 futures = "0.3.16"
 jsonrpc-client-transports = { version = "18.0.0", features = ["http"] }
-jsonrpc-core = "18.0.0"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 serde = "1"
 frame-support = { version = "4.0.0-dev", path = "../../../../frame/support" }
diff --git a/utils/frame/rpc/system/Cargo.toml b/utils/frame/rpc/system/Cargo.toml
index 9d56d0391344..e9ae506ef6b0 100644
--- a/utils/frame/rpc/system/Cargo.toml
+++ b/utils/frame/rpc/system/Cargo.toml
@@ -20,7 +20,6 @@ jsonrpc-core = "18.0.0"
 jsonrpc-core-client = "18.0.0"
 jsonrpc-derive = "18.0.0"
 log = "0.4.8"
-serde = { version = "1.0.126", features = ["derive"] }
 sp-runtime = { version = "4.0.0-dev", path = "../../../../primitives/runtime" }
 sp-api = { version = "4.0.0-dev", path = "../../../../primitives/api" }
 frame-system-rpc-runtime-api = { version = "4.0.0-dev", path = "../../../../frame/system/rpc/runtime-api" }
diff --git a/utils/frame/try-runtime/cli/Cargo.toml b/utils/frame/try-runtime/cli/Cargo.toml
index 827239e290be..5cc5ae6ee58b 100644
--- a/utils/frame/try-runtime/cli/Cargo.toml
+++ b/utils/frame/try-runtime/cli/Cargo.toml
@@ -21,15 +21,10 @@ structopt = "0.3.8"
 sc-service = { version = "0.10.0-dev", default-features = false, path = "../../../../client/service" }
 sc-cli = { version = "0.10.0-dev", path = "../../../../client/cli" }
 sc-executor = { version = "0.10.0-dev", path = "../../../../client/executor" }
-sc-client-api = { version = "4.0.0-dev", path = "../../../../client/api" }
 sc-chain-spec = { version = "4.0.0-dev", path = "../../../../client/chain-spec" }
 sp-state-machine = { version = "0.10.0-dev", path = "../../../../primitives/state-machine" }
-sp-api = { version = "4.0.0-dev", path = "../../../../primitives/api" }
-sp-blockchain = { version = "4.0.0-dev", path = "../../../../primitives/blockchain" }
 sp-runtime = { version = "4.0.0-dev", path = "../../../../primitives/runtime" }
-sp-externalities = { version = "0.10.0-dev", path = "../../../../primitives/externalities" }
 sp-core = { version = "4.0.0-dev", path = "../../../../primitives/core" }
 sp-keystore = { version = "0.10.0-dev", path = "../../../../primitives/keystore" }
-frame-try-runtime = { version = "0.10.0-dev", path = "../../../../frame/try-runtime" }
 
 remote-externalities = { version = "0.10.0-dev", path = "../../remote-externalities" }
diff --git a/utils/prometheus/src/sourced.rs b/utils/prometheus/src/sourced.rs
index 78853a6ef354..ca37eef021f6 100644
--- a/utils/prometheus/src/sourced.rs
+++ b/utils/prometheus/src/sourced.rs
@@ -95,10 +95,12 @@ impl<T: SourcedType, S: MetricSource> Collector for SourcedMetric<T, S> {
 
 			debug_assert_eq!(self.desc.variable_labels.len(), label_values.len());
 			match self.desc.variable_labels.len().cmp(&label_values.len()) {
-				Ordering::Greater =>
-					log::warn!("Missing label values for sourced metric {}", self.desc.fq_name),
-				Ordering::Less =>
-					log::warn!("Too many label values for sourced metric {}", self.desc.fq_name),
+				Ordering::Greater => {
+					log::warn!("Missing label values for sourced metric {}", self.desc.fq_name)
+				},
+				Ordering::Less => {
+					log::warn!("Too many label values for sourced metric {}", self.desc.fq_name)
+				},
 				Ordering::Equal => {},
 			}
 
diff --git a/utils/wasm-builder/Cargo.toml b/utils/wasm-builder/Cargo.toml
index 5c0c9c19dfac..721f332e130f 100644
--- a/utils/wasm-builder/Cargo.toml
+++ b/utils/wasm-builder/Cargo.toml
@@ -19,6 +19,5 @@ tempfile = "3.1.0"
 toml = "0.5.4"
 walkdir = "2.3.2"
 wasm-gc-api = "0.1.11"
-atty = "0.2.13"
 ansi_term = "0.12.1"
 sp-maybe-compressed-blob = { version = "4.0.0-dev", path = "../../primitives/maybe-compressed-blob" }

From 28e1691f96de6fda59b654259ec32c9385a71e30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Fri, 13 Aug 2021 20:31:40 +0200
Subject: [PATCH 1084/1194] Upgrade hyper to 0.14.11 (#9557)

* Upgrade hyper to 0.14.10

* fmt

* Enable required features
---
 Cargo.lock                         | 228 +++++++----------------------
 Cargo.toml                         |   1 -
 client/offchain/Cargo.toml         |   8 +-
 client/offchain/src/api/http.rs    |   6 +-
 test-utils/Cargo.toml              |   2 +-
 utils/prometheus/Cargo.toml        |   4 +-
 utils/prometheus/src/lib.rs        |  11 +-
 utils/prometheus/src/networking.rs |   8 +-
 8 files changed, 70 insertions(+), 198 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a3e83092025e..656054865fa7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -299,15 +299,16 @@ dependencies = [
 
 [[package]]
 name = "async-process"
-version = "1.0.2"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef37b86e2fa961bae5a4d212708ea0154f904ce31d1a4a7f47e1bbc33a0c040b"
+checksum = "b21b63ab5a0db0369deb913540af2892750e42d949faacc7a61495ac418a1692"
 dependencies = [
  "async-io",
  "blocking",
  "cfg-if 1.0.0",
  "event-listener",
  "futures-lite",
+ "libc",
  "once_cell",
  "signal-hook",
  "winapi 0.3.9",
@@ -984,32 +985,16 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
 
-[[package]]
-name = "core-foundation"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
-dependencies = [
- "core-foundation-sys 0.7.0",
- "libc",
-]
-
 [[package]]
 name = "core-foundation"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62"
 dependencies = [
- "core-foundation-sys 0.8.2",
+ "core-foundation-sys",
  "libc",
 ]
 
-[[package]]
-name = "core-foundation-sys"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
-
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.2"
@@ -1320,9 +1305,9 @@ dependencies = [
 
 [[package]]
 name = "ct-logs"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c8e13110a84b6315df212c045be706af261fd364791cad863285439ebba672e"
+checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8"
 dependencies = [
  "sct",
 ]
@@ -2180,7 +2165,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3a1387e07917c711fb4ee4f48ea0adb04a3c9739e53ef85bf43ae1edc2937a8b"
 dependencies = [
  "futures-io",
- "rustls 0.19.1",
+ "rustls",
  "webpki",
 ]
 
@@ -2344,26 +2329,6 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "h2"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535"
-dependencies = [
- "bytes 0.5.6",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http",
- "indexmap",
- "slab",
- "tokio 0.2.25",
- "tokio-util 0.3.1",
- "tracing",
- "tracing-futures",
-]
-
 [[package]]
 name = "half"
 version = "1.7.1"
@@ -2517,16 +2482,6 @@ dependencies = [
  "itoa",
 ]
 
-[[package]]
-name = "http-body"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
-dependencies = [
- "bytes 0.5.6",
- "http",
-]
-
 [[package]]
 name = "http-body"
 version = "0.4.2"
@@ -2544,12 +2499,6 @@ version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68"
 
-[[package]]
-name = "httpdate"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47"
-
 [[package]]
 name = "httpdate"
 version = "1.0.1"
@@ -2590,30 +2539,6 @@ dependencies = [
  "url 1.7.2",
 ]
 
-[[package]]
-name = "hyper"
-version = "0.13.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb"
-dependencies = [
- "bytes 0.5.6",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body 0.3.1",
- "httparse",
- "httpdate 0.3.2",
- "itoa",
- "pin-project 1.0.5",
- "socket2 0.3.19",
- "tokio 0.2.25",
- "tower-service",
- "tracing",
- "want",
-]
-
 [[package]]
 name = "hyper"
 version = "0.14.11"
@@ -2625,13 +2550,13 @@ dependencies = [
  "futures-core",
  "futures-util",
  "http",
- "http-body 0.4.2",
+ "http-body",
  "httparse",
- "httpdate 1.0.1",
+ "httpdate",
  "itoa",
  "pin-project-lite 0.2.6",
  "socket2 0.4.0",
- "tokio 1.9.0",
+ "tokio 1.10.0",
  "tower-service",
  "tracing",
  "want",
@@ -2639,19 +2564,18 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.21.0"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37743cc83e8ee85eacfce90f2f4102030d9ff0a95244098d781e9bee4a90abb6"
+checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64"
 dependencies = [
- "bytes 0.5.6",
  "ct-logs",
  "futures-util",
- "hyper 0.13.10",
+ "hyper 0.14.11",
  "log 0.4.14",
- "rustls 0.18.1",
- "rustls-native-certs 0.4.0",
- "tokio 0.2.25",
- "tokio-rustls 0.14.1",
+ "rustls",
+ "rustls-native-certs",
+ "tokio 1.10.0",
+ "tokio-rustls 0.22.0",
  "webpki",
 ]
 
@@ -2664,7 +2588,7 @@ dependencies = [
  "bytes 1.0.1",
  "hyper 0.14.11",
  "native-tls",
- "tokio 1.9.0",
+ "tokio 1.10.0",
  "tokio-native-tls",
 ]
 
@@ -2888,7 +2812,7 @@ dependencies = [
  "log 0.4.14",
  "serde",
  "serde_json",
- "tokio 1.9.0",
+ "tokio 1.10.0",
  "url 1.7.2",
  "websocket",
 ]
@@ -2988,7 +2912,7 @@ dependencies = [
  "jsonrpc-core",
  "lazy_static",
  "log 0.4.14",
- "tokio 1.9.0",
+ "tokio 1.10.0",
  "tokio-stream",
  "tokio-util 0.6.7",
  "unicase 2.6.0",
@@ -3053,8 +2977,8 @@ dependencies = [
  "jsonrpsee-types",
  "log 0.4.14",
  "pin-project 1.0.5",
- "rustls 0.19.1",
- "rustls-native-certs 0.5.0",
+ "rustls",
+ "rustls-native-certs",
  "serde",
  "serde_json",
  "soketto 0.6.0",
@@ -4145,8 +4069,8 @@ dependencies = [
  "openssl-probe",
  "openssl-sys",
  "schannel",
- "security-framework 2.3.0",
- "security-framework-sys 2.3.0",
+ "security-framework",
+ "security-framework-sys",
  "tempfile",
 ]
 
@@ -5844,7 +5768,7 @@ dependencies = [
  "libc",
  "log 0.4.14",
  "rand 0.7.3",
- "tokio 1.9.0",
+ "tokio 1.10.0",
  "winapi 0.3.9",
 ]
 
@@ -7038,19 +6962,6 @@ dependencies = [
  "semver 0.9.0",
 ]
 
-[[package]]
-name = "rustls"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81"
-dependencies = [
- "base64 0.12.3",
- "log 0.4.14",
- "ring",
- "sct",
- "webpki",
-]
-
 [[package]]
 name = "rustls"
 version = "0.19.1"
@@ -7064,18 +6975,6 @@ dependencies = [
  "webpki",
 ]
 
-[[package]]
-name = "rustls-native-certs"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "629d439a7672da82dd955498445e496ee2096fe2117b9f796558a43fdb9e59b8"
-dependencies = [
- "openssl-probe",
- "rustls 0.18.1",
- "schannel",
- "security-framework 1.0.0",
-]
-
 [[package]]
 name = "rustls-native-certs"
 version = "0.5.0"
@@ -7083,9 +6982,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092"
 dependencies = [
  "openssl-probe",
- "rustls 0.19.1",
+ "rustls",
  "schannel",
- "security-framework 2.3.0",
+ "security-framework",
 ]
 
 [[package]]
@@ -7922,12 +7821,12 @@ dependencies = [
 name = "sc-offchain"
 version = "4.0.0-dev"
 dependencies = [
- "bytes 0.5.6",
+ "bytes 1.0.1",
  "fnv",
  "futures 0.3.16",
  "futures-timer 3.0.2",
  "hex",
- "hyper 0.13.10",
+ "hyper 0.14.11",
  "hyper-rustls",
  "lazy_static",
  "log 0.4.14",
@@ -7950,7 +7849,7 @@ dependencies = [
  "sp-utils",
  "substrate-test-runtime-client",
  "threadpool",
- "tokio 0.2.25",
+ "tokio 1.10.0",
 ]
 
 [[package]]
@@ -8366,19 +8265,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "security-framework"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad502866817f0575705bd7be36e2b2535cc33262d493aa733a2ec862baa2bc2b"
-dependencies = [
- "bitflags",
- "core-foundation 0.7.0",
- "core-foundation-sys 0.7.0",
- "libc",
- "security-framework-sys 1.0.0",
-]
-
 [[package]]
 name = "security-framework"
 version = "2.3.0"
@@ -8386,20 +8272,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b239a3d5db51252f6f48f42172c65317f37202f4a21021bf5f9d40a408f4592c"
 dependencies = [
  "bitflags",
- "core-foundation 0.9.1",
- "core-foundation-sys 0.8.2",
- "libc",
- "security-framework-sys 2.3.0",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51ceb04988b17b6d1dcd555390fa822ca5637b4a14e1f5099f13d351bed4d6c7"
-dependencies = [
- "core-foundation-sys 0.7.0",
+ "core-foundation",
+ "core-foundation-sys",
  "libc",
+ "security-framework-sys",
 ]
 
 [[package]]
@@ -8408,7 +8284,7 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7e4effb91b4b8b6fb7732e670b6cee160278ff8e6bf485c7805d9e319d76e284"
 dependencies = [
- "core-foundation-sys 0.8.2",
+ "core-foundation-sys",
  "libc",
 ]
 
@@ -8587,9 +8463,9 @@ checksum = "42a568c8f2cd051a4d283bd6eb0343ac214c1b0f1ac19f93e1175b2dee38c73d"
 
 [[package]]
 name = "signal-hook"
-version = "0.3.6"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a7f3f92a1da3d6b1d32245d0cbcbbab0cfc45996d8df619c42bccfa6d2bbb5f"
+checksum = "ef33d6d0cd06e0840fba9985aab098c147e67e05cee14d412d3345ed14ff30ac"
 dependencies = [
  "libc",
  "signal-hook-registry",
@@ -9719,10 +9595,10 @@ dependencies = [
  "async-std",
  "derive_more",
  "futures-util",
- "hyper 0.13.10",
+ "hyper 0.14.11",
  "log 0.4.14",
  "prometheus",
- "tokio 0.2.25",
+ "tokio 1.10.0",
 ]
 
 [[package]]
@@ -10162,11 +10038,9 @@ checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
- "futures-core",
  "iovec",
  "lazy_static",
  "libc",
- "memchr",
  "mio 0.6.23",
  "mio-uds",
  "num_cpus",
@@ -10179,9 +10053,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b7b349f11a7047e6d1276853e612d152f5e8a352c61917887cc2169e2366b4c"
+checksum = "01cf844b23c6131f624accf65ce0e4e9956a8bb329400ea5bcc26ae3a5c20b0b"
 dependencies = [
  "autocfg 1.0.1",
  "bytes 1.0.1",
@@ -10279,7 +10153,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
 dependencies = [
  "native-tls",
- "tokio 1.9.0",
+ "tokio 1.10.0",
 ]
 
 [[package]]
@@ -10303,25 +10177,24 @@ dependencies = [
 
 [[package]]
 name = "tokio-rustls"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a"
+checksum = "03d15e5669243a45f630a5167d101b942174ca94b615445b2057eace1c818736"
 dependencies = [
  "futures-core",
- "rustls 0.18.1",
+ "rustls",
  "tokio 0.2.25",
  "webpki",
 ]
 
 [[package]]
 name = "tokio-rustls"
-version = "0.15.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03d15e5669243a45f630a5167d101b942174ca94b615445b2057eace1c818736"
+checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
 dependencies = [
- "futures-core",
- "rustls 0.19.1",
- "tokio 0.2.25",
+ "rustls",
+ "tokio 1.10.0",
  "webpki",
 ]
 
@@ -10333,7 +10206,7 @@ checksum = "7b2f3f698253f03119ac0102beaa64f67a67e08074d03a22d18784104543727f"
 dependencies = [
  "futures-core",
  "pin-project-lite 0.2.6",
- "tokio 1.9.0",
+ "tokio 1.10.0",
 ]
 
 [[package]]
@@ -10459,7 +10332,7 @@ dependencies = [
  "futures-sink",
  "log 0.4.14",
  "pin-project-lite 0.2.6",
- "tokio 1.9.0",
+ "tokio 1.10.0",
 ]
 
 [[package]]
@@ -10484,7 +10357,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f"
 dependencies = [
  "cfg-if 1.0.0",
- "log 0.4.14",
  "pin-project-lite 0.2.6",
  "tracing-attributes",
  "tracing-core",
diff --git a/Cargo.toml b/Cargo.toml
index ec5620e8c3f5..ce51e398375d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -238,7 +238,6 @@ ed25519-dalek = { opt-level = 3 }
 flate2 = { opt-level = 3 }
 futures-channel = { opt-level = 3 }
 hashbrown = { opt-level = 3 }
-h2 = { opt-level = 3 }
 hash-db = { opt-level = 3 }
 hmac = { opt-level = 3 }
 httparse = { opt-level = 3 }
diff --git a/client/offchain/Cargo.toml b/client/offchain/Cargo.toml
index 9bf4425a537c..65737765d513 100644
--- a/client/offchain/Cargo.toml
+++ b/client/offchain/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-bytes = "0.5"
+bytes = "1.0"
 codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 hex = "0.4"
 fnv = "1.0.6"
@@ -33,8 +33,8 @@ sp-utils = { version = "4.0.0-dev", path = "../../primitives/utils" }
 threadpool = "1.7"
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
-hyper = "0.13.9"
-hyper-rustls = "0.21.0"
+hyper = "0.14.11"
+hyper-rustls = "0.22.1"
 
 [dev-dependencies]
 sc-client-db = { version = "0.10.0-dev", default-features = true, path = "../db" }
@@ -44,7 +44,7 @@ sc-transaction-pool-api = { version = "4.0.0-dev", path = "../transaction-pool/a
 sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
 sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
-tokio = "0.2"
+tokio = "1.10"
 lazy_static = "1.4.0"
 
 [features]
diff --git a/client/offchain/src/api/http.rs b/client/offchain/src/api/http.rs
index f2648e2bf052..5bc120c21371 100644
--- a/client/offchain/src/api/http.rs
+++ b/client/offchain/src/api/http.rs
@@ -28,7 +28,7 @@
 //! actively calling any function.
 
 use crate::api::timestamp;
-use bytes::buf::ext::{BufExt, Reader};
+use bytes::buf::{Buf, Reader};
 use fnv::FnvHashMap;
 use futures::{channel::mpsc, future, prelude::*};
 use hyper::{client, Body, Client as HyperClient};
@@ -51,7 +51,7 @@ pub struct SharedClient(Arc<HyperClient<HttpsConnector<client::HttpConnector>, B
 
 impl SharedClient {
 	pub fn new() -> Self {
-		Self(Arc::new(HyperClient::builder().build(HttpsConnector::new())))
+		Self(Arc::new(HyperClient::builder().build(HttpsConnector::with_native_roots())))
 	}
 }
 
@@ -719,7 +719,7 @@ mod tests {
 
 			let (addr_tx, addr_rx) = std::sync::mpsc::channel();
 			std::thread::spawn(move || {
-				let mut rt = tokio::runtime::Runtime::new().unwrap();
+				let rt = tokio::runtime::Runtime::new().unwrap();
 				let worker = rt.spawn(worker);
 				let server = rt.spawn(async move {
 					let server = hyper::Server::bind(&"127.0.0.1:0".parse().unwrap()).serve(
diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml
index d828e418d906..560dbb26684c 100644
--- a/test-utils/Cargo.toml
+++ b/test-utils/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 futures = "0.3.16"
 substrate-test-utils-derive = { version = "0.10.0-dev", path = "./derive" }
-tokio = { version = "0.2.13", features = ["macros"] }
+tokio = { version = "0.2.13", features = ["macros", "rt-core", "time"] }
 
 [dev-dependencies]
 sc-service = { version = "0.10.0-dev", path = "../client/service" }
diff --git a/utils/prometheus/Cargo.toml b/utils/prometheus/Cargo.toml
index a7f90e831620..7766904a574b 100644
--- a/utils/prometheus/Cargo.toml
+++ b/utils/prometheus/Cargo.toml
@@ -20,5 +20,5 @@ derive_more = "0.99"
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
 async-std = { version = "1.6.5", features = ["unstable"] }
-hyper = { version = "0.13.9", default-features = false, features = ["stream"] }
-tokio = "0.2"
+tokio = "1.10"
+hyper = { version = "0.14.11", default-features = false, features = ["http1", "server", "tcp"] }
diff --git a/utils/prometheus/src/lib.rs b/utils/prometheus/src/lib.rs
index 3753ab9061bc..9f6f6e8f2255 100644
--- a/utils/prometheus/src/lib.rs
+++ b/utils/prometheus/src/lib.rs
@@ -16,7 +16,7 @@
 // limitations under the License.
 
 #[cfg(not(target_os = "unknown"))]
-use futures_util::{future::Future, FutureExt};
+use futures_util::future::Future;
 use prometheus::core::Collector;
 pub use prometheus::{
 	self,
@@ -67,8 +67,9 @@ mod known_os {
 	use super::*;
 	use hyper::{
 		http::StatusCode,
+		server::Server,
 		service::{make_service_fn, service_fn},
-		Body, Request, Response, Server,
+		Body, Request, Response,
 	};
 
 	#[derive(Debug, derive_more::Display, derive_more::From)]
@@ -153,10 +154,8 @@ mod known_os {
 			}
 		});
 
-		let server = Server::builder(Incoming(listener.incoming()))
-			.executor(Executor)
-			.serve(service)
-			.boxed();
+		let server =
+			Server::builder(Incoming(listener.incoming())).executor(Executor).serve(service);
 
 		let result = server.await.map_err(Into::into);
 
diff --git a/utils/prometheus/src/networking.rs b/utils/prometheus/src/networking.rs
index e04ac99a5694..de1a1c41d67c 100644
--- a/utils/prometheus/src/networking.rs
+++ b/utils/prometheus/src/networking.rs
@@ -44,9 +44,11 @@ impl tokio::io::AsyncRead for TcpStream {
 	fn poll_read(
 		self: Pin<&mut Self>,
 		cx: &mut Context,
-		buf: &mut [u8],
-	) -> Poll<Result<usize, std::io::Error>> {
-		Pin::new(&mut Pin::into_inner(self).0).poll_read(cx, buf)
+		buf: &mut tokio::io::ReadBuf<'_>,
+	) -> Poll<Result<(), std::io::Error>> {
+		Pin::new(&mut Pin::into_inner(self).0)
+			.poll_read(cx, buf.initialized_mut())
+			.map_ok(drop)
 	}
 }
 

From 8951d426f2c7e279bf175e4430da166b8b800d1f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 13 Aug 2021 18:32:19 +0000
Subject: [PATCH 1085/1194] Bump ip_network from 0.3.4 to 0.4.0 (#9524)

Bumps [ip_network](https://github.com/JakubOnderka/ip_network) from 0.3.4 to 0.4.0.
- [Release notes](https://github.com/JakubOnderka/ip_network/releases)
- [Commits](https://github.com/JakubOnderka/ip_network/compare/v0.3.4...v0.4.0)

---
updated-dependencies:
- dependency-name: ip_network
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                            | 4 ++--
 client/authority-discovery/Cargo.toml | 2 +-
 client/network/Cargo.toml             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 656054865fa7..f410b288e918 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2733,9 +2733,9 @@ dependencies = [
 
 [[package]]
 name = "ip_network"
-version = "0.3.4"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ee15951c035f79eddbef745611ec962f63f4558f1dadf98ab723cc603487c6f"
+checksum = "09b746553d2f4a1ca26fab939943ddfb217a091f34f53571620a8e3d30691303"
 
 [[package]]
 name = "ipconfig"
diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml
index 10dbf5fdc8a8..2d36c1974773 100644
--- a/client/authority-discovery/Cargo.toml
+++ b/client/authority-discovery/Cargo.toml
@@ -22,7 +22,7 @@ codec = { package = "parity-scale-codec", default-features = false, version = "2
 derive_more = "0.99.2"
 futures = "0.3.9"
 futures-timer = "3.0.1"
-ip_network = "0.3.4"
+ip_network = "0.4.0"
 libp2p = { version = "0.37.1", default-features = false, features = ["kad"] }
 log = "0.4.8"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0" }
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index c8ea8db8acb6..520c52e148f8 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -33,7 +33,7 @@ futures = "0.3.9"
 futures-timer = "3.0.2"
 asynchronous-codec = "0.5"
 hex = "0.4.0"
-ip_network = "0.3.4"
+ip_network = "0.4.0"
 linked-hash-map = "0.5.4"
 linked_hash_set = "0.1.3"
 lru = "0.6.5"

From 71e1c59e7e901882487ee516cf2faa02aed74da5 Mon Sep 17 00:00:00 2001
From: xx network <68822190+xx-labs@users.noreply.github.com>
Date: Fri, 13 Aug 2021 12:48:29 -0600
Subject: [PATCH 1086/1194] Add block hash to call data of
 TaggedTransactionQueue_validate_transaction in light api remote call (#9554)

Co-authored-by: Bernardo Cardoso <bernardo@xx.network>
---
 client/transaction-pool/src/api.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/transaction-pool/src/api.rs b/client/transaction-pool/src/api.rs
index 0d9ec122b87d..a735c67d846c 100644
--- a/client/transaction-pool/src/api.rs
+++ b/client/transaction-pool/src/api.rs
@@ -341,7 +341,7 @@ where
 			block,
 			header,
 			method: "TaggedTransactionQueue_validate_transaction".into(),
-			call_data: (source, uxt).encode(),
+			call_data: (source, uxt, block).encode(),
 			retry_count: None,
 		});
 		let remote_validation_request = remote_validation_request.then(move |result| {

From 08cac0089d7539b29098b6ce773faf79a7944690 Mon Sep 17 00:00:00 2001
From: Trevor Arjeski <72849114+trevor-crypto@users.noreply.github.com>
Date: Mon, 16 Aug 2021 17:17:10 +0300
Subject: [PATCH 1087/1194] RUSTSEC-2021-0076 bump libsecp256k1 (#9391)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* RUSTSEC-2021-0076 bump libsecp256k1

libsecp256k1 allows overflowing signatures
https://rustsec.org/advisories/RUSTSEC-2021-0076

Changes were made to conform to libsecp256k1 version differences.

Closes #9356

* parse_standard_slice() -> parse_overflowing_slice()

* Added v2 host function for ecdsa_verify

* Add feature tag over helpers

* Added ecdsa_verify v2 to test runner

* PR feedback

- Spaces -> tabs
- renamed two helper functions

* Fixed imports after rebasing

* Bump rest of libsecp256k1 (and libp2p)

libp2p also uses libsecp256k1 so it is required to be bumped too, along
with all the version difference changes.

* Add version2 for ecdsa pubkey recovery

* libp2p rebase master fixes

* Fix test panic when non Behaviour event is returned

* Update bin/node/browser-testing/Cargo.toml

* Update primitives/core/src/ecdsa.rs

* Update primitives/core/src/ecdsa.rs

* Update Cargo.lock

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 Cargo.lock                                    | 492 +++++++++++-------
 Cargo.toml                                    |   2 -
 bin/node/cli/Cargo.toml                       |   6 +-
 client/authority-discovery/Cargo.toml         |   2 +-
 client/cli/Cargo.toml                         |   2 +-
 client/consensus/common/Cargo.toml            |   2 +-
 client/executor/Cargo.toml                    |   2 +-
 client/network-gossip/Cargo.toml              |   2 +-
 client/network/Cargo.toml                     |   6 +-
 client/network/src/bitswap.rs                 |   6 +-
 client/network/src/discovery.rs               |  80 +--
 client/network/src/peer_info.rs               |  10 +
 client/network/src/protocol.rs                |   2 +
 .../src/protocol/notifications/tests.rs       |  98 ++--
 .../notifications/upgrade/notifications.rs    |   2 +-
 client/network/src/request_responses.rs       |  17 +-
 client/network/src/service.rs                 |  20 +-
 client/network/test/Cargo.toml                |   2 +-
 client/peerset/Cargo.toml                     |   2 +-
 client/telemetry/Cargo.toml                   |   2 +-
 primitives/core/Cargo.toml                    |   4 +-
 primitives/core/src/ecdsa.rs                  | 100 ++--
 primitives/io/Cargo.toml                      |   2 +-
 primitives/io/src/lib.rs                      |  81 ++-
 test-utils/test-runner/src/host_functions.rs  |   2 +
 utils/browser/Cargo.toml                      |   2 +-
 26 files changed, 582 insertions(+), 366 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f410b288e918..59ef2616913e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -38,58 +38,39 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "aead"
-version = "0.3.2"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331"
+checksum = "6e3e798aa0c8239776f54415bc06f3d74b1850f3f830b45c35cfc80556973f70"
 dependencies = [
  "generic-array 0.14.4",
 ]
 
 [[package]]
 name = "aes"
-version = "0.5.0"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd2bc6d3f370b5666245ff421e231cba4353df936e26986d2918e61a8fd6aef6"
+checksum = "495ee669413bfbe9e8cace80f4d3d78e6d8c8d99579f97fb93bde351b185f2d4"
 dependencies = [
- "aes-soft",
- "aesni",
- "block-cipher",
+ "cfg-if 1.0.0",
+ "cipher",
+ "cpufeatures",
+ "opaque-debug 0.3.0",
 ]
 
 [[package]]
 name = "aes-gcm"
-version = "0.7.0"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0301c9e9c443494d970a07885e8cf3e587bae8356a1d5abd0999068413f7205f"
+checksum = "b2a930fd487faaa92a30afa92cc9dd1526a5cff67124abbbb1c617ce070f4dcf"
 dependencies = [
  "aead",
  "aes",
- "block-cipher",
+ "cipher",
+ "ctr",
  "ghash",
  "subtle 2.4.0",
 ]
 
-[[package]]
-name = "aes-soft"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63dd91889c49327ad7ef3b500fd1109dbd3c509a03db0d4a9ce413b79f575cb6"
-dependencies = [
- "block-cipher",
- "byteorder",
- "opaque-debug 0.3.0",
-]
-
-[[package]]
-name = "aesni"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a6fe808308bb07d393e2ea47780043ec47683fcf19cf5efc8ca51c50cc8c68a"
-dependencies = [
- "block-cipher",
- "opaque-debug 0.3.0",
-]
-
 [[package]]
 name = "ahash"
 version = "0.4.7"
@@ -656,15 +637,6 @@ dependencies = [
  "generic-array 0.14.4",
 ]
 
-[[package]]
-name = "block-cipher"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f337a3e6da609650eb74e02bc9fac7b735049f7623ab12f2e4c719316fcc7e80"
-dependencies = [
- "generic-array 0.14.4",
-]
-
 [[package]]
 name = "block-padding"
 version = "0.1.5"
@@ -811,7 +783,7 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0"
 dependencies = [
- "rustc_version",
+ "rustc_version 0.2.3",
 ]
 
 [[package]]
@@ -846,24 +818,26 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chacha20"
-version = "0.5.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "244fbce0d47e97e8ef2f63b81d5e05882cb518c68531eb33194990d7b7e85845"
+checksum = "fee7ad89dc1128635074c268ee661f90c3f7e83d9fd12910608c36b47d6c3412"
 dependencies = [
- "stream-cipher",
+ "cfg-if 1.0.0",
+ "cipher",
+ "cpufeatures",
  "zeroize",
 ]
 
 [[package]]
 name = "chacha20poly1305"
-version = "0.6.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bf18d374d66df0c05cdddd528a7db98f78c28e2519b120855c4f84c5027b1f5"
+checksum = "1580317203210c517b6d44794abfbe600698276db18127e37ad3e69bf5e848e5"
 dependencies = [
  "aead",
  "chacha20",
+ "cipher",
  "poly1305",
- "stream-cipher",
  "zeroize",
 ]
 
@@ -903,15 +877,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff0e3bc0b6446b3f9663c1a6aba6ef06c5aeaa1bc92bd18077be337198ab9768"
 dependencies = [
  "multibase",
- "multihash",
+ "multihash 0.13.2",
  "unsigned-varint 0.5.1",
 ]
 
 [[package]]
 name = "cipher"
-version = "0.2.5"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801"
+checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
 dependencies = [
  "generic-array 0.14.4",
 ]
@@ -1012,16 +986,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "cpuid-bool"
-version = "0.1.2"
+name = "cpufeatures"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634"
+checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef"
+dependencies = [
+ "libc",
+]
 
 [[package]]
 name = "cpuid-bool"
-version = "0.2.0"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba"
+checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634"
 
 [[package]]
 name = "cranelift-bforest"
@@ -1322,6 +1299,15 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "ctr"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea"
+dependencies = [
+ "cipher",
+]
+
 [[package]]
 name = "cuckoofilter"
 version = "0.5.0"
@@ -2272,9 +2258,9 @@ dependencies = [
 
 [[package]]
 name = "ghash"
-version = "0.3.1"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375"
+checksum = "b442c439366184de619215247d24e908912b175e824a530253845ac4c251a5c1"
 dependencies = [
  "opaque-debug 0.3.0",
  "polyval",
@@ -2440,13 +2426,13 @@ dependencies = [
 
 [[package]]
 name = "hmac-drbg"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6e570451493f10f6581b48cdd530413b63ea9e780f544bfd3bdcaa0d89d1a7b"
+checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1"
 dependencies = [
- "digest 0.8.1",
- "generic-array 0.12.4",
- "hmac 0.7.1",
+ "digest 0.9.0",
+ "generic-array 0.14.4",
+ "hmac 0.8.1",
 ]
 
 [[package]]
@@ -3122,9 +3108,9 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
 
 [[package]]
 name = "libp2p"
-version = "0.37.1"
+version = "0.39.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08053fbef67cd777049ef7a95ebaca2ece370b4ed7712c3fa404d69a88cb741b"
+checksum = "9004c06878ef8f3b4b4067e69a140d87ed20bf777287f82223e49713b36ee433"
 dependencies = [
  "atomic",
  "bytes 1.0.1",
@@ -3152,7 +3138,7 @@ dependencies = [
  "libp2p-wasm-ext",
  "libp2p-websocket",
  "libp2p-yamux",
- "parity-multiaddr",
+ "multiaddr",
  "parking_lot 0.11.1",
  "pin-project 1.0.5",
  "smallvec 1.6.1",
@@ -3161,9 +3147,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-core"
-version = "0.28.2"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71dd51b562e14846e65bad00e5808d0644376e6588668c490d3c48e1dfeb4a9a"
+checksum = "af9b4abdeaa420593a297c8592f63fad4234f4b88dc9343b8fd8e736c35faa59"
 dependencies = [
  "asn1_der",
  "bs58",
@@ -3173,15 +3159,15 @@ dependencies = [
  "futures 0.3.16",
  "futures-timer 3.0.2",
  "lazy_static",
- "libsecp256k1",
+ "libsecp256k1 0.5.0",
  "log 0.4.14",
- "multihash",
+ "multiaddr",
+ "multihash 0.14.0",
  "multistream-select",
- "parity-multiaddr",
  "parking_lot 0.11.1",
  "pin-project 1.0.5",
- "prost",
- "prost-build",
+ "prost 0.8.0",
+ "prost-build 0.8.0",
  "rand 0.7.3",
  "ring",
  "rw-stream-sink",
@@ -3195,9 +3181,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-deflate"
-version = "0.28.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2181a641cd15f9b6ba71b1335800f309012a0a97a29ffaabbbf40e9d3d58f08"
+checksum = "66097fccc0b7f8579f90a03ea76ba6196332ea049fd07fd969490a06819dcdc8"
 dependencies = [
  "flate2",
  "futures 0.3.16",
@@ -3206,9 +3192,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-dns"
-version = "0.28.1"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62e63dab8b5ff35e0c101a3e51e843ba782c07bbb1682f5fd827622e0d02b98b"
+checksum = "58ff08b3196b85a17f202d80589e93b1660a574af67275706657fdc762e42c32"
 dependencies = [
  "async-std-resolver",
  "futures 0.3.16",
@@ -3220,9 +3206,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-floodsub"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48a9b570f6766301d9c4aa00fce3554cad1598e2f466debbc4dde909028417cf"
+checksum = "404eca8720967179dac7a5b4275eb91f904a53859c69ca8d018560ad6beb214f"
 dependencies = [
  "cuckoofilter",
  "fnv",
@@ -3230,17 +3216,17 @@ dependencies = [
  "libp2p-core",
  "libp2p-swarm",
  "log 0.4.14",
- "prost",
- "prost-build",
+ "prost 0.8.0",
+ "prost-build 0.8.0",
  "rand 0.7.3",
  "smallvec 1.6.1",
 ]
 
 [[package]]
 name = "libp2p-gossipsub"
-version = "0.30.0"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73cb9a89a301afde1e588c73f7e9131e12a5388725f290a9047b878862db1b53"
+checksum = "b1cc48709bcbc3a3321f08a73560b4bbb4166a7d56f6fdb615bc775f4f91058e"
 dependencies = [
  "asynchronous-codec 0.6.0",
  "base64 0.13.0",
@@ -3252,8 +3238,8 @@ dependencies = [
  "libp2p-core",
  "libp2p-swarm",
  "log 0.4.14",
- "prost",
- "prost-build",
+ "prost 0.8.0",
+ "prost-build 0.8.0",
  "rand 0.7.3",
  "regex",
  "sha2 0.9.3",
@@ -3264,25 +3250,25 @@ dependencies = [
 
 [[package]]
 name = "libp2p-identify"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f668f00efd9883e8b7bcc582eaf0164615792608f886f6577da18bcbeea0a46"
+checksum = "a7b61f6cf07664fb97016c318c4d4512b3dd4cc07238607f3f0163245f99008e"
 dependencies = [
  "futures 0.3.16",
  "libp2p-core",
  "libp2p-swarm",
  "log 0.4.14",
- "prost",
- "prost-build",
+ "prost 0.8.0",
+ "prost-build 0.8.0",
  "smallvec 1.6.1",
  "wasm-timer",
 ]
 
 [[package]]
 name = "libp2p-kad"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b07312ebe5ee4fd2404447a0609814574df55c65d4e20838b957bbd34907d820"
+checksum = "50ed78489c87924235665a0ab345b298ee34dff0f7ad62c0ba6608b2144fb75e"
 dependencies = [
  "arrayvec 0.5.2",
  "asynchronous-codec 0.6.0",
@@ -3293,8 +3279,8 @@ dependencies = [
  "libp2p-core",
  "libp2p-swarm",
  "log 0.4.14",
- "prost",
- "prost-build",
+ "prost 0.8.0",
+ "prost-build 0.8.0",
  "rand 0.7.3",
  "sha2 0.9.3",
  "smallvec 1.6.1",
@@ -3306,9 +3292,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-mdns"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c221897b3fd7f215de7ecfec215c5eba598e5b61c605b5f8b56fe8a4fb507724"
+checksum = "a29e6cbc2a24b8471b6567e580a0e8e7b70a6d0f0ea2be0844d1e842d7d4fa33"
 dependencies = [
  "async-io",
  "data-encoding",
@@ -3327,9 +3313,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-mplex"
-version = "0.28.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85e9b544335d1ed30af71daa96edbefadef6f19c7a55f078b9fc92c87163105d"
+checksum = "313d9ea526c68df4425f580024e67a9d3ffd49f2c33de5154b1f5019816f7a99"
 dependencies = [
  "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
@@ -3345,9 +3331,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-noise"
-version = "0.30.0"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36db0f0db3b0433f5b9463f1c0cd9eadc0a3734a9170439ce501ff99733a88bd"
+checksum = "3f1db7212f342b6ba7c981cc40e31f76e9e56cb48e65fa4c142ecaca5839523e"
 dependencies = [
  "bytes 1.0.1",
  "curve25519-dalek 3.0.2",
@@ -3355,9 +3341,9 @@ dependencies = [
  "lazy_static",
  "libp2p-core",
  "log 0.4.14",
- "prost",
- "prost-build",
- "rand 0.7.3",
+ "prost 0.8.0",
+ "prost-build 0.8.0",
+ "rand 0.8.4",
  "sha2 0.9.3",
  "snow",
  "static_assertions",
@@ -3367,9 +3353,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-ping"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4bfaffac63bf3c7ec11ed9d8879d455966ddea7e78ee14737f0b6dce0d1cd1"
+checksum = "2482cfd9eb0b7a0baaf3e7b329dc4f2785181a161b1a47b7192f8d758f54a439"
 dependencies = [
  "futures 0.3.16",
  "libp2p-core",
@@ -3382,26 +3368,26 @@ dependencies = [
 
 [[package]]
 name = "libp2p-plaintext"
-version = "0.28.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c8c37b4d2a075b4be8442760a5f8c037180f0c8dd5b5734b9978ab868b3aa11"
+checksum = "13b4783e5423870b9a5c199f65a7a3bc66d86ab56b2b9beebf3c338d889cf8e4"
 dependencies = [
  "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
  "futures 0.3.16",
  "libp2p-core",
  "log 0.4.14",
- "prost",
- "prost-build",
+ "prost 0.8.0",
+ "prost-build 0.8.0",
  "unsigned-varint 0.7.0",
  "void",
 ]
 
 [[package]]
 name = "libp2p-pnet"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce3374f3b28162db9d3442c9347c4f14cb01e8290052615c7d341d40eae0599"
+checksum = "07cb4dd4b917e5b40ddefe49b96b07adcd8d342e0317011d175b7b2bb1dcc974"
 dependencies = [
  "futures 0.3.16",
  "log 0.4.14",
@@ -3413,9 +3399,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-relay"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b8786aca3f18671d8776289706a5521f6c9124a820f69e358de214b9939440d"
+checksum = "0133f6cfd81cdc16e716de2982e012c62e6b9d4f12e41967b3ee361051c622aa"
 dependencies = [
  "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
@@ -3425,8 +3411,8 @@ dependencies = [
  "libp2p-swarm",
  "log 0.4.14",
  "pin-project 1.0.5",
- "prost",
- "prost-build",
+ "prost 0.8.0",
+ "prost-build 0.8.0",
  "rand 0.7.3",
  "smallvec 1.6.1",
  "unsigned-varint 0.7.0",
@@ -3436,9 +3422,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-request-response"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cdbe172f08e6d0f95fa8634e273d4c4268c4063de2e33e7435194b0130c62e3"
+checksum = "06cdae44b6821466123af93cbcdec7c9e6ba9534a8af9cdc296446d39416d241"
 dependencies = [
  "async-trait",
  "bytes 1.0.1",
@@ -3456,9 +3442,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-swarm"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e04d8e1eef675029ec728ba14e8d0da7975d84b6679b699b4ae91a1de9c3a92"
+checksum = "7083861341e1555467863b4cd802bea1e8c4787c0f7b5110097d0f1f3248f9a9"
 dependencies = [
  "either",
  "futures 0.3.16",
@@ -3472,9 +3458,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-swarm-derive"
-version = "0.23.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "365b0a699fea5168676840567582a012ea297b1ca02eee467e58301b9c9c5eed"
+checksum = "ab8cb308d4fc854869f5abb54fdab0833d2cf670d407c745849dc47e6e08d79c"
 dependencies = [
  "quote",
  "syn",
@@ -3482,9 +3468,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-tcp"
-version = "0.28.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b1a27d21c477951799e99d5c105d78868258502ce092988040a808d5a19bbd9"
+checksum = "79edd26b6b4bb5feee210dcda562dca186940dfecb0024b979c3f50824b3bf28"
 dependencies = [
  "async-io",
  "futures 0.3.16",
@@ -3499,9 +3485,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-uds"
-version = "0.28.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffd6564bb3b7ff203661ccbb69003c2b551e34cef974f2d6c6a28306a12170b5"
+checksum = "280e793440dd4e9f273d714f4497325c72cddb0fe85a49f9a03c88f41dd20182"
 dependencies = [
  "async-std",
  "futures 0.3.16",
@@ -3511,9 +3497,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-wasm-ext"
-version = "0.28.1"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cef45d61e43c313531b5e903e4e8415212ff6338e0c54c47da5b9b412b5760de"
+checksum = "f553b7140fad3d7a76f50497b0ea591e26737d9607428a75509fc191e4d1b1f6"
 dependencies = [
  "futures 0.3.16",
  "js-sys",
@@ -3525,9 +3511,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-websocket"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cace60995ef6f637e4752cccbb2590f6bc358e8741a0d066307636c69a4b3a74"
+checksum = "ddf99dcbf5063e9d59087f61b1e85c686ceab2f5abedb472d32288065c0e5e27"
 dependencies = [
  "either",
  "futures 0.3.16",
@@ -3543,9 +3529,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-yamux"
-version = "0.32.0"
+version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f35da42cfc6d5cb0dcf3ad6881bc68d146cdf38f98655e09e33fbba4d13eabc4"
+checksum = "214cc0dd9c37cbed27f0bb1eba0c41bbafdb93a8be5e9d6ae1e6b4b42cd044bf"
 dependencies = [
  "futures 0.3.16",
  "libp2p-core",
@@ -3568,20 +3554,71 @@ dependencies = [
 
 [[package]]
 name = "libsecp256k1"
-version = "0.3.5"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fc1e2c808481a63dc6da2074752fdd4336a3c8fcc68b83db6f1fd5224ae7962"
+checksum = "bd1137239ab33b41aa9637a88a28249e5e70c40a42ccc92db7f12cc356c1fcd7"
 dependencies = [
  "arrayref",
- "crunchy",
- "digest 0.8.1",
+ "base64 0.12.3",
+ "digest 0.9.0",
  "hmac-drbg",
+ "libsecp256k1-core",
+ "libsecp256k1-gen-ecmult",
+ "libsecp256k1-gen-genmult",
  "rand 0.7.3",
- "sha2 0.8.2",
- "subtle 2.4.0",
+ "serde",
+ "sha2 0.9.3",
+ "typenum",
+]
+
+[[package]]
+name = "libsecp256k1"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9d220bc1feda2ac231cb78c3d26f27676b8cf82c96971f7aeef3d0cf2797c73"
+dependencies = [
+ "arrayref",
+ "base64 0.12.3",
+ "digest 0.9.0",
+ "hmac-drbg",
+ "libsecp256k1-core",
+ "libsecp256k1-gen-ecmult",
+ "libsecp256k1-gen-genmult",
+ "rand 0.7.3",
+ "serde",
+ "sha2 0.9.3",
  "typenum",
 ]
 
+[[package]]
+name = "libsecp256k1-core"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0f6ab710cec28cef759c5f18671a27dae2a5f952cdaaee1d8e2908cb2478a80"
+dependencies = [
+ "crunchy",
+ "digest 0.9.0",
+ "subtle 2.4.0",
+]
+
+[[package]]
+name = "libsecp256k1-gen-ecmult"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccab96b584d38fac86a83f07e659f0deafd0253dc096dab5a36d53efe653c5c3"
+dependencies = [
+ "libsecp256k1-core",
+]
+
+[[package]]
+name = "libsecp256k1-gen-genmult"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67abfe149395e3aa1c48a2beb32b068e2334402df8181f818d3aee2b304c4f5d"
+dependencies = [
+ "libsecp256k1-core",
+]
+
 [[package]]
 name = "libz-sys"
 version = "1.1.2"
@@ -3956,6 +3993,24 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0debeb9fcf88823ea64d64e4a815ab1643f33127d995978e099942ce38f25238"
 
+[[package]]
+name = "multiaddr"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48ee4ea82141951ac6379f964f71b20876d43712bea8faf6dd1a375e08a46499"
+dependencies = [
+ "arrayref",
+ "bs58",
+ "byteorder",
+ "data-encoding",
+ "multihash 0.14.0",
+ "percent-encoding 2.1.0",
+ "serde",
+ "static_assertions",
+ "unsigned-varint 0.7.0",
+ "url 2.2.1",
+]
+
 [[package]]
 name = "multibase"
 version = "0.8.0"
@@ -3984,13 +4039,26 @@ dependencies = [
  "unsigned-varint 0.5.1",
 ]
 
+[[package]]
+name = "multihash"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "752a61cd890ff691b4411423d23816d5866dd5621e4d1c5687a53b94b5a979d8"
+dependencies = [
+ "digest 0.9.0",
+ "generic-array 0.14.4",
+ "multihash-derive",
+ "sha2 0.9.3",
+ "unsigned-varint 0.7.0",
+]
+
 [[package]]
 name = "multihash-derive"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85ee3c48cb9d9b275ad967a0e96715badc13c6029adb92f34fa17b9ff28fd81f"
+checksum = "424f6e86263cd5294cbd7f1e95746b95aca0e0d66bff31e5a40d6baa87b4aa99"
 dependencies = [
- "proc-macro-crate 0.1.5",
+ "proc-macro-crate 1.0.0",
  "proc-macro-error 1.0.4",
  "proc-macro2",
  "quote",
@@ -5708,24 +5776,6 @@ dependencies = [
  "snap",
 ]
 
-[[package]]
-name = "parity-multiaddr"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58341485071825827b7f03cf7efd1cb21e6a709bea778fb50227fd45d2f361b4"
-dependencies = [
- "arrayref",
- "bs58",
- "byteorder",
- "data-encoding",
- "multihash",
- "percent-encoding 2.1.0",
- "serde",
- "static_assertions",
- "unsigned-varint 0.7.0",
- "url 2.2.1",
-]
-
 [[package]]
 name = "parity-scale-codec"
 version = "2.2.0"
@@ -5846,7 +5896,7 @@ checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252"
 dependencies = [
  "lock_api 0.3.4",
  "parking_lot_core 0.6.2",
- "rustc_version",
+ "rustc_version 0.2.3",
 ]
 
 [[package]]
@@ -5880,7 +5930,7 @@ dependencies = [
  "cloudabi",
  "libc",
  "redox_syscall 0.1.57",
- "rustc_version",
+ "rustc_version 0.2.3",
  "smallvec 0.6.14",
  "winapi 0.3.9",
 ]
@@ -6141,21 +6191,23 @@ dependencies = [
 
 [[package]]
 name = "poly1305"
-version = "0.6.2"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b7456bc1ad2d4cf82b3a016be4c2ac48daf11bf990c1603ebd447fe6f30fca8"
+checksum = "9fcffab1f78ebbdf4b93b68c1ffebc24037eedf271edaca795732b24e5e4e349"
 dependencies = [
- "cpuid-bool 0.2.0",
+ "cpufeatures",
+ "opaque-debug 0.3.0",
  "universal-hash",
 ]
 
 [[package]]
 name = "polyval"
-version = "0.4.5"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd"
+checksum = "a6ba6a405ef63530d6cb12802014b22f9c5751bd17cdcddbe9e46d5c8ae83287"
 dependencies = [
- "cpuid-bool 0.2.0",
+ "cfg-if 1.0.0",
+ "cpufeatures",
  "opaque-debug 0.3.0",
  "universal-hash",
 ]
@@ -6339,7 +6391,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e6984d2f1a23009bd270b8bb56d0926810a3d483f59c987d77969e9d8e840b2"
 dependencies = [
  "bytes 1.0.1",
- "prost-derive",
+ "prost-derive 0.7.0",
+]
+
+[[package]]
+name = "prost"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020"
+dependencies = [
+ "bytes 1.0.1",
+ "prost-derive 0.8.0",
 ]
 
 [[package]]
@@ -6354,8 +6416,26 @@ dependencies = [
  "log 0.4.14",
  "multimap",
  "petgraph",
- "prost",
- "prost-types",
+ "prost 0.7.0",
+ "prost-types 0.7.0",
+ "tempfile",
+ "which",
+]
+
+[[package]]
+name = "prost-build"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "355f634b43cdd80724ee7848f95770e7e70eefa6dcf14fea676216573b8fd603"
+dependencies = [
+ "bytes 1.0.1",
+ "heck",
+ "itertools 0.10.0",
+ "log 0.4.14",
+ "multimap",
+ "petgraph",
+ "prost 0.8.0",
+ "prost-types 0.8.0",
  "tempfile",
  "which",
 ]
@@ -6373,6 +6453,19 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "prost-derive"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "600d2f334aa05acb02a755e217ef1ab6dea4d51b58b7846588b747edec04efba"
+dependencies = [
+ "anyhow",
+ "itertools 0.10.0",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "prost-types"
 version = "0.7.0"
@@ -6380,7 +6473,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b518d7cdd93dab1d1122cf07fa9a60771836c668dde9d9e2a139f957f0d9f1bb"
 dependencies = [
  "bytes 1.0.1",
- "prost",
+ "prost 0.7.0",
+]
+
+[[package]]
+name = "prost-types"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "603bbd6394701d13f3f25aada59c7de9d35a6a5887cfc156181234a44002771b"
+dependencies = [
+ "bytes 1.0.1",
+ "prost 0.8.0",
 ]
 
 [[package]]
@@ -6962,6 +7065,15 @@ dependencies = [
  "semver 0.9.0",
 ]
 
+[[package]]
+name = "rustc_version"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee"
+dependencies = [
+ "semver 0.11.0",
+]
+
 [[package]]
 name = "rustls"
 version = "0.19.1"
@@ -7026,7 +7138,7 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d3d055a2582e6b00ed7a31c1524040aa391092bf636328350813f3a0605215c"
 dependencies = [
- "rustc_version",
+ "rustc_version 0.2.3",
 ]
 
 [[package]]
@@ -7037,9 +7149,9 @@ checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
 
 [[package]]
 name = "salsa20"
-version = "0.7.2"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "399f290ffc409596022fce5ea5d4138184be4784f2b28c62c59f0d8389059a15"
+checksum = "ecbd2eb639fd7cab5804a0837fe373cc2172d15437e804c054a9fb885cb923b0"
 dependencies = [
  "cipher",
 ]
@@ -7075,8 +7187,8 @@ dependencies = [
  "libp2p",
  "log 0.4.14",
  "parity-scale-codec",
- "prost",
- "prost-build",
+ "prost 0.7.0",
+ "prost-build 0.7.0",
  "quickcheck",
  "rand 0.7.3",
  "sc-client-api",
@@ -7511,7 +7623,7 @@ version = "0.10.0-dev"
 dependencies = [
  "hex-literal",
  "lazy_static",
- "libsecp256k1",
+ "libsecp256k1 0.6.0",
  "log 0.4.14",
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -7740,8 +7852,8 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.11.1",
  "pin-project 1.0.5",
- "prost",
- "prost-build",
+ "prost 0.7.0",
+ "prost-build 0.7.0",
  "quickcheck",
  "rand 0.7.3",
  "sc-block-builder",
@@ -8398,7 +8510,7 @@ checksum = "dfebf75d25bd900fd1e7d11501efab59bc846dbc76196839663e6637bba9f25f"
 dependencies = [
  "block-buffer 0.9.0",
  "cfg-if 1.0.0",
- "cpuid-bool 0.1.2",
+ "cpuid-bool",
  "digest 0.9.0",
  "opaque-debug 0.3.0",
 ]
@@ -8429,7 +8541,7 @@ checksum = "fa827a14b29ab7f44778d14a88d3cb76e949c45083f7dbfa507d0cb699dc12de"
 dependencies = [
  "block-buffer 0.9.0",
  "cfg-if 1.0.0",
- "cpuid-bool 0.1.2",
+ "cpuid-bool",
  "digest 0.9.0",
  "opaque-debug 0.3.0",
 ]
@@ -8536,17 +8648,17 @@ checksum = "45456094d1983e2ee2a18fdfebce3189fa451699d0502cb8e3b49dba5ba41451"
 
 [[package]]
 name = "snow"
-version = "0.7.2"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "795dd7aeeee24468e5a32661f6d27f7b5cbed802031b2d7640c7b10f8fb2dd50"
+checksum = "6142f7c25e94f6fd25a32c3348ec230df9109b463f59c8c7acc4bd34936babb7"
 dependencies = [
  "aes-gcm",
  "blake2",
  "chacha20poly1305",
- "rand 0.7.3",
- "rand_core 0.5.1",
+ "rand 0.8.4",
+ "rand_core 0.6.2",
  "ring",
- "rustc_version",
+ "rustc_version 0.3.3",
  "sha2 0.9.3",
  "subtle 2.4.0",
  "x25519-dalek",
@@ -8856,7 +8968,7 @@ dependencies = [
  "hex-literal",
  "impl-serde",
  "lazy_static",
- "libsecp256k1",
+ "libsecp256k1 0.6.0",
  "log 0.4.14",
  "merlin",
  "num-traits",
@@ -8949,7 +9061,7 @@ version = "4.0.0-dev"
 dependencies = [
  "futures 0.3.16",
  "hash-db",
- "libsecp256k1",
+ "libsecp256k1 0.6.0",
  "log 0.4.14",
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -9424,16 +9536,6 @@ dependencies = [
  "rand 0.8.4",
 ]
 
-[[package]]
-name = "stream-cipher"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c80e15f898d8d8f25db24c253ea615cc14acf418ff307822995814e7d42cfa89"
-dependencies = [
- "block-cipher",
- "generic-array 0.14.4",
-]
-
 [[package]]
 name = "strsim"
 version = "0.8.0"
diff --git a/Cargo.toml b/Cargo.toml
index ce51e398375d..fd4c66e5d4dd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -221,8 +221,6 @@ members = [
 #
 # This list is ordered alphabetically.
 [profile.dev.package]
-aes-soft = { opt-level = 3 }
-aesni = { opt-level = 3 }
 blake2 = { opt-level = 3 }
 blake2-rfc = { opt-level = 3 }
 blake2b_simd = { opt-level = 3 }
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index a85fa91fa792..ae5fd11c9132 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -95,10 +95,8 @@ try-runtime-cli = { version = "0.10.0-dev", optional = true, path = "../../../ut
 # WASM-specific dependencies
 wasm-bindgen = { version = "0.2.73", optional = true }
 wasm-bindgen-futures = { version = "0.4.18", optional = true }
-browser-utils = { package = "substrate-browser-utils", path = "../../../utils/browser", optional = true, version = "0.10.0-dev" }
-libp2p-wasm-ext = { version = "0.28", features = [
-	"websocket",
-], optional = true }
+browser-utils = { package = "substrate-browser-utils", path = "../../../utils/browser", optional = true, version = "0.10.0-dev"}
+libp2p-wasm-ext = { version = "0.29", features = ["websocket"], optional = true }
 
 [target.'cfg(target_arch="x86_64")'.dependencies]
 node-executor = { version = "3.0.0-dev", path = "../executor", features = [
diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml
index 2d36c1974773..2b8ac25dde87 100644
--- a/client/authority-discovery/Cargo.toml
+++ b/client/authority-discovery/Cargo.toml
@@ -23,7 +23,7 @@ derive_more = "0.99.2"
 futures = "0.3.9"
 futures-timer = "3.0.1"
 ip_network = "0.4.0"
-libp2p = { version = "0.37.1", default-features = false, features = ["kad"] }
+libp2p = { version = "0.39.1", default-features = false, features = ["kad"] }
 log = "0.4.8"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0" }
 prost = "0.7"
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index f38686d22865..aadbdef79551 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -18,7 +18,7 @@ regex = "1.4.2"
 tokio = { version = "0.2.21", features = [ "signal", "rt-core", "rt-threaded", "blocking" ] }
 futures = "0.3.9"
 fdlimit = "0.2.1"
-libp2p = "0.37.1"
+libp2p = "0.39.1"
 parity-scale-codec = "2.0.0"
 hex = "0.4.2"
 rand = "0.7.3"
diff --git a/client/consensus/common/Cargo.toml b/client/consensus/common/Cargo.toml
index 9cec265f859f..eaf73bb19c12 100644
--- a/client/consensus/common/Cargo.toml
+++ b/client/consensus/common/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 thiserror = "1.0.21"
-libp2p = { version = "0.37.1", default-features = false }
+libp2p = { version = "0.39.1", default-features = false }
 log = "0.4.8"
 futures = { version = "0.3.1", features = ["thread-pool"] }
 futures-timer = "3.0.1"
diff --git a/client/executor/Cargo.toml b/client/executor/Cargo.toml
index 12c417253574..d99f1da89e1f 100644
--- a/client/executor/Cargo.toml
+++ b/client/executor/Cargo.toml
@@ -32,7 +32,7 @@ sc-executor-wasmi = { version = "0.10.0-dev", path = "wasmi" }
 sc-executor-wasmtime = { version = "0.10.0-dev", path = "wasmtime", optional = true }
 parking_lot = "0.11.1"
 log = "0.4.8"
-libsecp256k1 = "0.3.4"
+libsecp256k1 = "0.6"
 
 [dev-dependencies]
 wat = "1.0"
diff --git a/client/network-gossip/Cargo.toml b/client/network-gossip/Cargo.toml
index 4a213f796b6d..d06a11c03674 100644
--- a/client/network-gossip/Cargo.toml
+++ b/client/network-gossip/Cargo.toml
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 futures = "0.3.9"
 futures-timer = "3.0.1"
-libp2p = { version = "0.37.1", default-features = false }
+libp2p = { version = "0.39.1", default-features = false }
 log = "0.4.8"
 lru = "0.6.5"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.9.0", path = "../../utils/prometheus" }
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index 520c52e148f8..a87fb06b8271 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -67,10 +67,10 @@ wasm-timer = "0.2"
 zeroize = "1.2.0"
 
 [dependencies.libp2p]
-version = "0.37.1"
+version = "0.39.1"
 
 [target.'cfg(target_os = "unknown")'.dependencies.libp2p]
-version = "0.37.1"
+version = "0.39.1"
 default-features = false
 features = [
     "identify",
@@ -88,7 +88,7 @@ features = [
 
 [dev-dependencies]
 assert_matches = "1.3"
-libp2p = { version = "0.37.1", default-features = false }
+libp2p = { version = "0.39.1", default-features = false }
 quickcheck = "1.0.3"
 rand = "0.7.2"
 sp-test-primitives = { version = "2.0.0", path = "../../primitives/test-primitives" }
diff --git a/client/network/src/bitswap.rs b/client/network/src/bitswap.rs
index 8f5739c73704..2f0885c9347f 100644
--- a/client/network/src/bitswap.rs
+++ b/client/network/src/bitswap.rs
@@ -94,7 +94,7 @@ where
 
 	fn upgrade_inbound(self, mut socket: TSocket, _info: Self::Info) -> Self::Future {
 		Box::pin(async move {
-			let packet = upgrade::read_one(&mut socket, MAX_PACKET_SIZE).await?;
+			let packet = upgrade::read_length_prefixed(&mut socket, MAX_PACKET_SIZE).await?;
 			let message: BitswapMessage = Message::decode(packet.as_slice())?;
 			Ok(message)
 		})
@@ -122,7 +122,7 @@ where
 		Box::pin(async move {
 			let mut data = Vec::with_capacity(self.encoded_len());
 			self.encode(&mut data)?;
-			upgrade::write_one(&mut socket, data).await
+			upgrade::write_length_prefixed(&mut socket, data).await
 		})
 	}
 }
@@ -328,7 +328,7 @@ pub enum BitswapError {
 	/// Error parsing CID
 	BadCid(cid::Error),
 	/// Packet read error.
-	Read(upgrade::ReadOneError),
+	Read(io::Error),
 	/// Error sending response.
 	#[display(fmt = "Failed to send response.")]
 	SendResponse,
diff --git a/client/network/src/discovery.rs b/client/network/src/discovery.rs
index d4367b2ada30..594f824f3c94 100644
--- a/client/network/src/discovery.rs
+++ b/client/network/src/discovery.rs
@@ -722,7 +722,7 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 						KademliaEvent::PendingRoutablePeer { .. } => {
 							// We are not interested in this event at the moment.
 						},
-						KademliaEvent::QueryResult {
+						KademliaEvent::OutboundQueryCompleted {
 							result: QueryResult::GetClosestPeers(res),
 							..
 						} => match res {
@@ -741,7 +741,7 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 								}
 							},
 						},
-						KademliaEvent::QueryResult {
+						KademliaEvent::OutboundQueryCompleted {
 							result: QueryResult::GetRecord(res),
 							stats,
 							..
@@ -778,7 +778,7 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 							};
 							return Poll::Ready(NetworkBehaviourAction::GenerateEvent(ev))
 						},
-						KademliaEvent::QueryResult {
+						KademliaEvent::OutboundQueryCompleted {
 							result: QueryResult::PutRecord(res),
 							stats,
 							..
@@ -799,7 +799,7 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 							};
 							return Poll::Ready(NetworkBehaviourAction::GenerateEvent(ev))
 						},
-						KademliaEvent::QueryResult {
+						KademliaEvent::OutboundQueryCompleted {
 							result: QueryResult::RepublishRecord(res),
 							..
 						} => match res {
@@ -830,6 +830,11 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 							address,
 							score,
 						}),
+					NetworkBehaviourAction::CloseConnection { peer_id, connection } =>
+						return Poll::Ready(NetworkBehaviourAction::CloseConnection {
+							peer_id,
+							connection,
+						}),
 				}
 			}
 		}
@@ -862,6 +867,11 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 						address,
 						score,
 					}),
+				NetworkBehaviourAction::CloseConnection { peer_id, connection } =>
+					return Poll::Ready(NetworkBehaviourAction::CloseConnection {
+						peer_id,
+						connection,
+					}),
 			}
 		}
 
@@ -931,7 +941,7 @@ mod tests {
 		},
 		identity::Keypair,
 		noise,
-		swarm::Swarm,
+		swarm::{Swarm, SwarmEvent},
 		yamux, Multiaddr, PeerId,
 	};
 	use std::{collections::HashSet, task::Poll};
@@ -1000,32 +1010,42 @@ mod tests {
 					match swarms[swarm_n].0.poll_next_unpin(cx) {
 						Poll::Ready(Some(e)) => {
 							match e {
-								DiscoveryOut::UnroutablePeer(other) |
-								DiscoveryOut::Discovered(other) => {
-									// Call `add_self_reported_address` to simulate identify
-									// happening.
-									let addr = swarms
-										.iter()
-										.find_map(|(s, a)| {
-											if s.behaviour().local_peer_id == other {
-												Some(a.clone())
-											} else {
-												None
-											}
-										})
-										.unwrap();
-									swarms[swarm_n].0.behaviour_mut().add_self_reported_address(
-										&other,
-										[protocol_name_from_protocol_id(&protocol_id)].iter(),
-										addr,
-									);
-
-									to_discover[swarm_n].remove(&other);
-								},
-								DiscoveryOut::RandomKademliaStarted(_) => {},
-								e => {
-									panic!("Unexpected event: {:?}", e)
+								SwarmEvent::Behaviour(behavior) => {
+									match behavior {
+										DiscoveryOut::UnroutablePeer(other) |
+										DiscoveryOut::Discovered(other) => {
+											// Call `add_self_reported_address` to simulate identify
+											// happening.
+											let addr = swarms
+												.iter()
+												.find_map(|(s, a)| {
+													if s.behaviour().local_peer_id == other {
+														Some(a.clone())
+													} else {
+														None
+													}
+												})
+												.unwrap();
+											swarms[swarm_n]
+												.0
+												.behaviour_mut()
+												.add_self_reported_address(
+													&other,
+													[protocol_name_from_protocol_id(&protocol_id)]
+														.iter(),
+													addr,
+												);
+
+											to_discover[swarm_n].remove(&other);
+										},
+										DiscoveryOut::RandomKademliaStarted(_) => {},
+										e => {
+											panic!("Unexpected event: {:?}", e)
+										},
+									}
 								},
+								// ignore non Behaviour events
+								_ => {},
 							}
 							continue 'polling
 						},
diff --git a/client/network/src/peer_info.rs b/client/network/src/peer_info.rs
index 3599bc88900e..13c09178715c 100644
--- a/client/network/src/peer_info.rs
+++ b/client/network/src/peer_info.rs
@@ -340,6 +340,11 @@ impl NetworkBehaviour for PeerInfoBehaviour {
 						address,
 						score,
 					}),
+				Poll::Ready(NetworkBehaviourAction::CloseConnection { peer_id, connection }) =>
+					return Poll::Ready(NetworkBehaviourAction::CloseConnection {
+						peer_id,
+						connection,
+					}),
 			}
 		}
 
@@ -373,6 +378,11 @@ impl NetworkBehaviour for PeerInfoBehaviour {
 						address,
 						score,
 					}),
+				Poll::Ready(NetworkBehaviourAction::CloseConnection { peer_id, connection }) =>
+					return Poll::Ready(NetworkBehaviourAction::CloseConnection {
+						peer_id,
+						connection,
+					}),
 			}
 		}
 
diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index a5675dbdc34d..97653cf652f9 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -1575,6 +1575,8 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 				}),
 			Poll::Ready(NetworkBehaviourAction::ReportObservedAddr { address, score }) =>
 				return Poll::Ready(NetworkBehaviourAction::ReportObservedAddr { address, score }),
+			Poll::Ready(NetworkBehaviourAction::CloseConnection { peer_id, connection }) =>
+				return Poll::Ready(NetworkBehaviourAction::CloseConnection { peer_id, connection }),
 		};
 
 		let outcome = match event {
diff --git a/client/network/src/protocol/notifications/tests.rs b/client/network/src/protocol/notifications/tests.rs
index a80315050830..0b3ffc01a4b8 100644
--- a/client/network/src/protocol/notifications/tests.rs
+++ b/client/network/src/protocol/notifications/tests.rs
@@ -30,7 +30,7 @@ use libp2p::{
 	identity, noise,
 	swarm::{
 		IntoProtocolsHandler, NetworkBehaviour, NetworkBehaviourAction, PollParameters,
-		ProtocolsHandler, Swarm,
+		ProtocolsHandler, Swarm, SwarmEvent,
 	},
 	yamux, Multiaddr, PeerId, Transport,
 };
@@ -262,8 +262,8 @@ fn reconnect_after_disconnect() {
 		loop {
 			// Grab next event from services.
 			let event = {
-				let s1 = service1.next();
-				let s2 = service2.next();
+				let s1 = service1.select_next_some();
+				let s2 = service2.select_next_some();
 				futures::pin_mut!(s1, s2);
 				match future::select(s1, s2).await {
 					future::Either::Left((ev, _)) => future::Either::Left(ev),
@@ -272,48 +272,52 @@ fn reconnect_after_disconnect() {
 			};
 
 			match event {
-				future::Either::Left(NotificationsOut::CustomProtocolOpen { .. }) =>
-					match service1_state {
-						ServiceState::NotConnected => {
-							service1_state = ServiceState::FirstConnec;
-							if service2_state == ServiceState::FirstConnec {
-								service1.behaviour_mut().disconnect_peer(
-									Swarm::local_peer_id(&service2),
-									sc_peerset::SetId::from(0),
-								);
-							}
-						},
-						ServiceState::Disconnected => service1_state = ServiceState::ConnectedAgain,
-						ServiceState::FirstConnec | ServiceState::ConnectedAgain => panic!(),
+				future::Either::Left(SwarmEvent::Behaviour(
+					NotificationsOut::CustomProtocolOpen { .. },
+				)) => match service1_state {
+					ServiceState::NotConnected => {
+						service1_state = ServiceState::FirstConnec;
+						if service2_state == ServiceState::FirstConnec {
+							service1.behaviour_mut().disconnect_peer(
+								Swarm::local_peer_id(&service2),
+								sc_peerset::SetId::from(0),
+							);
+						}
 					},
-				future::Either::Left(NotificationsOut::CustomProtocolClosed { .. }) =>
-					match service1_state {
-						ServiceState::FirstConnec => service1_state = ServiceState::Disconnected,
-						ServiceState::ConnectedAgain |
-						ServiceState::NotConnected |
-						ServiceState::Disconnected => panic!(),
-					},
-				future::Either::Right(NotificationsOut::CustomProtocolOpen { .. }) =>
-					match service2_state {
-						ServiceState::NotConnected => {
-							service2_state = ServiceState::FirstConnec;
-							if service1_state == ServiceState::FirstConnec {
-								service1.behaviour_mut().disconnect_peer(
-									Swarm::local_peer_id(&service2),
-									sc_peerset::SetId::from(0),
-								);
-							}
-						},
-						ServiceState::Disconnected => service2_state = ServiceState::ConnectedAgain,
-						ServiceState::FirstConnec | ServiceState::ConnectedAgain => panic!(),
-					},
-				future::Either::Right(NotificationsOut::CustomProtocolClosed { .. }) =>
-					match service2_state {
-						ServiceState::FirstConnec => service2_state = ServiceState::Disconnected,
-						ServiceState::ConnectedAgain |
-						ServiceState::NotConnected |
-						ServiceState::Disconnected => panic!(),
+					ServiceState::Disconnected => service1_state = ServiceState::ConnectedAgain,
+					ServiceState::FirstConnec | ServiceState::ConnectedAgain => panic!(),
+				},
+				future::Either::Left(SwarmEvent::Behaviour(
+					NotificationsOut::CustomProtocolClosed { .. },
+				)) => match service1_state {
+					ServiceState::FirstConnec => service1_state = ServiceState::Disconnected,
+					ServiceState::ConnectedAgain |
+					ServiceState::NotConnected |
+					ServiceState::Disconnected => panic!(),
+				},
+				future::Either::Right(SwarmEvent::Behaviour(
+					NotificationsOut::CustomProtocolOpen { .. },
+				)) => match service2_state {
+					ServiceState::NotConnected => {
+						service2_state = ServiceState::FirstConnec;
+						if service1_state == ServiceState::FirstConnec {
+							service1.behaviour_mut().disconnect_peer(
+								Swarm::local_peer_id(&service2),
+								sc_peerset::SetId::from(0),
+							);
+						}
 					},
+					ServiceState::Disconnected => service2_state = ServiceState::ConnectedAgain,
+					ServiceState::FirstConnec | ServiceState::ConnectedAgain => panic!(),
+				},
+				future::Either::Right(SwarmEvent::Behaviour(
+					NotificationsOut::CustomProtocolClosed { .. },
+				)) => match service2_state {
+					ServiceState::FirstConnec => service2_state = ServiceState::Disconnected,
+					ServiceState::ConnectedAgain |
+					ServiceState::NotConnected |
+					ServiceState::Disconnected => panic!(),
+				},
 				_ => {},
 			}
 
@@ -331,8 +335,8 @@ fn reconnect_after_disconnect() {
 		loop {
 			// Grab next event from services.
 			let event = {
-				let s1 = service1.next();
-				let s2 = service2.next();
+				let s1 = service1.select_next_some();
+				let s2 = service2.select_next_some();
 				futures::pin_mut!(s1, s2);
 				match future::select(future::select(s1, s2), &mut delay).await {
 					future::Either::Right(_) => break, // success
@@ -342,8 +346,8 @@ fn reconnect_after_disconnect() {
 			};
 
 			match event {
-				NotificationsOut::CustomProtocolOpen { .. } |
-				NotificationsOut::CustomProtocolClosed { .. } => panic!(),
+				SwarmEvent::Behaviour(NotificationsOut::CustomProtocolOpen { .. }) |
+				SwarmEvent::Behaviour(NotificationsOut::CustomProtocolClosed { .. }) => panic!(),
 				_ => {},
 			}
 		}
diff --git a/client/network/src/protocol/notifications/upgrade/notifications.rs b/client/network/src/protocol/notifications/upgrade/notifications.rs
index 386be69afffd..068b92c0685b 100644
--- a/client/network/src/protocol/notifications/upgrade/notifications.rs
+++ b/client/network/src/protocol/notifications/upgrade/notifications.rs
@@ -385,7 +385,7 @@ where
 
 	fn upgrade_outbound(self, mut socket: TSubstream, negotiated_name: Self::Info) -> Self::Future {
 		Box::pin(async move {
-			upgrade::write_with_len_prefix(&mut socket, &self.initial_message).await?;
+			upgrade::write_length_prefixed(&mut socket, &self.initial_message).await?;
 
 			// Reading handshake.
 			let handshake_len = unsigned_varint::aio::read_usize(&mut socket).await?;
diff --git a/client/network/src/request_responses.rs b/client/network/src/request_responses.rs
index 87a09bed4261..2af6e176f697 100644
--- a/client/network/src/request_responses.rs
+++ b/client/network/src/request_responses.rs
@@ -567,6 +567,11 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 								address,
 								score,
 							}),
+						NetworkBehaviourAction::CloseConnection { peer_id, connection } =>
+							return Poll::Ready(NetworkBehaviourAction::CloseConnection {
+								peer_id,
+								connection,
+							}),
 					};
 
 					match ev {
@@ -1009,7 +1014,7 @@ mod tests {
 				let (mut swarm, _) = swarms.remove(0);
 				async move {
 					loop {
-						match swarm.next_event().await {
+						match swarm.select_next_some().await {
 							SwarmEvent::Behaviour(Event::InboundRequest { result, .. }) => {
 								result.unwrap();
 							},
@@ -1028,7 +1033,7 @@ mod tests {
 			let mut response_receiver = None;
 
 			loop {
-				match swarm.next_event().await {
+				match swarm.select_next_some().await {
 					SwarmEvent::ConnectionEstablished { peer_id, .. } => {
 						let (sender, receiver) = oneshot::channel();
 						swarm.behaviour_mut().send_request(
@@ -1106,7 +1111,7 @@ mod tests {
 				let (mut swarm, _) = swarms.remove(0);
 				async move {
 					loop {
-						match swarm.next_event().await {
+						match swarm.select_next_some().await {
 							SwarmEvent::Behaviour(Event::InboundRequest { result, .. }) => {
 								assert!(result.is_ok());
 								break
@@ -1126,7 +1131,7 @@ mod tests {
 			let mut response_receiver = None;
 
 			loop {
-				match swarm.next_event().await {
+				match swarm.select_next_some().await {
 					SwarmEvent::ConnectionEstablished { peer_id, .. } => {
 						let (sender, receiver) = oneshot::channel();
 						swarm.behaviour_mut().send_request(
@@ -1226,7 +1231,7 @@ mod tests {
 			.spawn_obj(
 				async move {
 					loop {
-						match swarm_2.next_event().await {
+						match swarm_2.select_next_some().await {
 							SwarmEvent::Behaviour(Event::InboundRequest { result, .. }) => {
 								result.unwrap();
 							},
@@ -1279,7 +1284,7 @@ mod tests {
 			let mut num_responses = 0;
 
 			loop {
-				match swarm_1.next_event().await {
+				match swarm_1.select_next_some().await {
 					SwarmEvent::ConnectionEstablished { peer_id, .. } => {
 						let (sender_1, receiver_1) = oneshot::channel();
 						let (sender_2, receiver_2) = oneshot::channel();
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 067fa3a21b60..92b300fe02f5 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -1631,7 +1631,7 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 			}
 
 			// Process the next action coming from the network.
-			let next_event = this.network_service.next_event();
+			let next_event = this.network_service.select_next_some();
 			futures::pin_mut!(next_event);
 			let poll_value = next_event.poll_unpin(cx);
 
@@ -1919,14 +1919,14 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 						}
 					}
 				},
-				Poll::Ready(SwarmEvent::NewListenAddr(addr)) => {
-					trace!(target: "sub-libp2p", "Libp2p => NewListenAddr({})", addr);
+				Poll::Ready(SwarmEvent::NewListenAddr { address, .. }) => {
+					trace!(target: "sub-libp2p", "Libp2p => NewListenAddr({})", address);
 					if let Some(metrics) = this.metrics.as_ref() {
 						metrics.listeners_local_addresses.inc();
 					}
 				},
-				Poll::Ready(SwarmEvent::ExpiredListenAddr(addr)) => {
-					info!(target: "sub-libp2p", "📪 No longer listening on {}", addr);
+				Poll::Ready(SwarmEvent::ExpiredListenAddr { address, .. }) => {
+					info!(target: "sub-libp2p", "📪 No longer listening on {}", address);
 					if let Some(metrics) = this.metrics.as_ref() {
 						metrics.listeners_local_addresses.dec();
 					}
@@ -2008,11 +2008,9 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 							.inc();
 					}
 				},
-				Poll::Ready(SwarmEvent::UnknownPeerUnreachableAddr { address, error }) => {
-					trace!(target: "sub-libp2p", "Libp2p => UnknownPeerUnreachableAddr({}): {}",
-						address, error)
-				},
-				Poll::Ready(SwarmEvent::ListenerClosed { reason, addresses }) => {
+				Poll::Ready(SwarmEvent::UnknownPeerUnreachableAddr { address, error }) =>
+					trace!(target: "sub-libp2p", "Libp2p => UnknownPeerUnreachableAddr({}): {}", address, error),
+				Poll::Ready(SwarmEvent::ListenerClosed { reason, addresses, .. }) => {
 					if let Some(metrics) = this.metrics.as_ref() {
 						metrics.listeners_local_addresses.sub(addresses.len() as u64);
 					}
@@ -2031,7 +2029,7 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 						),
 					}
 				},
-				Poll::Ready(SwarmEvent::ListenerError { error }) => {
+				Poll::Ready(SwarmEvent::ListenerError { error, .. }) => {
 					debug!(target: "sub-libp2p", "Libp2p => ListenerError: {}", error);
 					if let Some(metrics) = this.metrics.as_ref() {
 						metrics.listeners_errors_total.inc();
diff --git a/client/network/test/Cargo.toml b/client/network/test/Cargo.toml
index eada832946b2..88399ca54a43 100644
--- a/client/network/test/Cargo.toml
+++ b/client/network/test/Cargo.toml
@@ -20,7 +20,7 @@ parking_lot = "0.11.1"
 futures = "0.3.9"
 futures-timer = "3.0.1"
 rand = "0.7.2"
-libp2p = { version = "0.37.1", default-features = false }
+libp2p = { version = "0.39.1", default-features = false }
 sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
 sc-consensus = { version = "0.10.0-dev", path = "../../consensus/common" }
 sc-client-api = { version = "4.0.0-dev", path = "../../api" }
diff --git a/client/peerset/Cargo.toml b/client/peerset/Cargo.toml
index 1af585df5359..b4e48332d62f 100644
--- a/client/peerset/Cargo.toml
+++ b/client/peerset/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 futures = "0.3.9"
-libp2p = { version = "0.37.1", default-features = false }
+libp2p = { version = "0.39.1", default-features = false }
 sp-utils = { version = "4.0.0-dev", path = "../../primitives/utils"}
 log = "0.4.8"
 serde_json = "1.0.41"
diff --git a/client/telemetry/Cargo.toml b/client/telemetry/Cargo.toml
index d9d2b6b6aa84..4dafeb205544 100644
--- a/client/telemetry/Cargo.toml
+++ b/client/telemetry/Cargo.toml
@@ -18,7 +18,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 parking_lot = "0.11.1"
 futures = "0.3.9"
 wasm-timer = "0.2.5"
-libp2p = { version = "0.37.1", default-features = false, features = ["dns-async-std", "tcp-async-io", "wasm-ext", "websocket"] }
+libp2p = { version = "0.39.1", default-features = false, features = ["dns-async-std", "tcp-async-io", "wasm-ext", "websocket"] }
 log = "0.4.8"
 pin-project = "1.0.4"
 rand = "0.7.2"
diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml
index c7f19439c419..2e7818c3d427 100644
--- a/primitives/core/Cargo.toml
+++ b/primitives/core/Cargo.toml
@@ -62,9 +62,7 @@ schnorrkel = { version = "0.9.1", features = [
 sha2 = { version = "0.9.2", default-features = false, optional = true }
 hex = { version = "0.4", default-features = false, optional = true }
 twox-hash = { version = "1.5.0", default-features = false, optional = true }
-libsecp256k1 = { version = "0.3.2", default-features = false, features = [
-	"hmac",
-], optional = true }
+libsecp256k1 = { version = "0.6", default-features = false, features = ["hmac", "static-context"], optional = true }
 merlin = { version = "2.0", default-features = false, optional = true }
 
 sp-runtime-interface = { version = "4.0.0-dev", default-features = false, path = "../runtime-interface" }
diff --git a/primitives/core/src/ecdsa.rs b/primitives/core/src/ecdsa.rs
index b4c4bda17acb..147569d52b89 100644
--- a/primitives/core/src/ecdsa.rs
+++ b/primitives/core/src/ecdsa.rs
@@ -19,10 +19,8 @@
 //! Simple ECDSA API.
 // end::description[]
 
-#[cfg(feature = "full_crypto")]
-use sp_std::vec::Vec;
-
 use codec::{Decode, Encode, MaxEncodedLen};
+use sp_runtime_interface::pass_by::PassByInner;
 use sp_std::cmp::Ordering;
 
 #[cfg(feature = "std")]
@@ -40,12 +38,11 @@ use bip39::{Language, Mnemonic, MnemonicType};
 #[cfg(feature = "full_crypto")]
 use core::convert::{TryFrom, TryInto};
 #[cfg(feature = "full_crypto")]
-use secp256k1::{PublicKey, SecretKey};
+use libsecp256k1::{PublicKey, SecretKey};
 #[cfg(feature = "std")]
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
-use sp_runtime_interface::pass_by::PassByInner;
-#[cfg(feature = "std")]
-use substrate_bip39::seed_from_entropy;
+#[cfg(feature = "full_crypto")]
+use sp_std::vec::Vec;
 
 /// An identifier used to match public keys against ecdsa keys
 pub const CRYPTO_ID: CryptoTypeId = CryptoTypeId(*b"ecds");
@@ -108,7 +105,7 @@ impl Public {
 	/// This will convert the full public key into the compressed format.
 	#[cfg(feature = "std")]
 	pub fn from_full(full: &[u8]) -> Result<Self, ()> {
-		secp256k1::PublicKey::parse_slice(full, None)
+		libsecp256k1::PublicKey::parse_slice(full, None)
 			.map(|k| k.serialize_compressed())
 			.map(Self)
 			.map_err(|_| ())
@@ -364,9 +361,9 @@ impl Signature {
 	/// Recover the public key from this signature and a message.
 	#[cfg(feature = "full_crypto")]
 	pub fn recover<M: AsRef<[u8]>>(&self, message: M) -> Option<Public> {
-		let message = secp256k1::Message::parse(&blake2_256(message.as_ref()));
+		let message = libsecp256k1::Message::parse(&blake2_256(message.as_ref()));
 		let sig: (_, _) = self.try_into().ok()?;
-		secp256k1::recover(&message, &sig.0, &sig.1)
+		libsecp256k1::recover(&message, &sig.0, &sig.1)
 			.ok()
 			.map(|recovered| Public(recovered.serialize_compressed()))
 	}
@@ -374,19 +371,19 @@ impl Signature {
 	/// Recover the public key from this signature and a pre-hashed message.
 	#[cfg(feature = "full_crypto")]
 	pub fn recover_prehashed(&self, message: &[u8; 32]) -> Option<Public> {
-		let message = secp256k1::Message::parse(message);
+		let message = libsecp256k1::Message::parse(message);
 
 		let sig: (_, _) = self.try_into().ok()?;
 
-		secp256k1::recover(&message, &sig.0, &sig.1)
+		libsecp256k1::recover(&message, &sig.0, &sig.1)
 			.ok()
 			.map(|key| Public(key.serialize_compressed()))
 	}
 }
 
 #[cfg(feature = "full_crypto")]
-impl From<(secp256k1::Signature, secp256k1::RecoveryId)> for Signature {
-	fn from(x: (secp256k1::Signature, secp256k1::RecoveryId)) -> Signature {
+impl From<(libsecp256k1::Signature, libsecp256k1::RecoveryId)> for Signature {
+	fn from(x: (libsecp256k1::Signature, libsecp256k1::RecoveryId)) -> Signature {
 		let mut r = Self::default();
 		r.0[0..64].copy_from_slice(&x.0.serialize()[..]);
 		r.0[64] = x.1.serialize();
@@ -395,15 +392,12 @@ impl From<(secp256k1::Signature, secp256k1::RecoveryId)> for Signature {
 }
 
 #[cfg(feature = "full_crypto")]
-impl<'a> TryFrom<&'a Signature> for (secp256k1::Signature, secp256k1::RecoveryId) {
+impl<'a> TryFrom<&'a Signature> for (libsecp256k1::Signature, libsecp256k1::RecoveryId) {
 	type Error = ();
 	fn try_from(
 		x: &'a Signature,
-	) -> Result<(secp256k1::Signature, secp256k1::RecoveryId), Self::Error> {
-		Ok((
-			secp256k1::Signature::parse_slice(&x.0[0..64]).expect("hardcoded to 64 bytes; qed"),
-			secp256k1::RecoveryId::parse(x.0[64]).map_err(|_| ())?,
-		))
+	) -> Result<(libsecp256k1::Signature, libsecp256k1::RecoveryId), Self::Error> {
+		parse_signature_standard(&x.0).map_err(|_| ())
 	}
 }
 
@@ -457,7 +451,7 @@ impl TraitPair for Pair {
 		phrase: &str,
 		password: Option<&str>,
 	) -> Result<(Pair, Seed), SecretStringError> {
-		let big_seed = seed_from_entropy(
+		let big_seed = substrate_bip39::seed_from_entropy(
 			Mnemonic::from_phrase(phrase, Language::English)
 				.map_err(|_| SecretStringError::InvalidPhrase)?
 				.entropy(),
@@ -510,18 +504,18 @@ impl TraitPair for Pair {
 
 	/// Sign a message.
 	fn sign(&self, message: &[u8]) -> Signature {
-		let message = secp256k1::Message::parse(&blake2_256(message));
-		secp256k1::sign(&message, &self.secret).into()
+		let message = libsecp256k1::Message::parse(&blake2_256(message));
+		libsecp256k1::sign(&message, &self.secret).into()
 	}
 
 	/// Verify a signature on a message. Returns true if the signature is good.
 	fn verify<M: AsRef<[u8]>>(sig: &Self::Signature, message: M, pubkey: &Self::Public) -> bool {
-		let message = secp256k1::Message::parse(&blake2_256(message.as_ref()));
+		let message = libsecp256k1::Message::parse(&blake2_256(message.as_ref()));
 		let sig: (_, _) = match sig.try_into() {
 			Ok(x) => x,
 			_ => return false,
 		};
-		match secp256k1::recover(&message, &sig.0, &sig.1) {
+		match libsecp256k1::recover(&message, &sig.0, &sig.1) {
 			Ok(actual) => pubkey.0[..] == actual.serialize_compressed()[..],
 			_ => false,
 		}
@@ -532,19 +526,15 @@ impl TraitPair for Pair {
 	/// This doesn't use the type system to ensure that `sig` and `pubkey` are the correct
 	/// size. Use it only if you're coming from byte buffers and need the speed.
 	fn verify_weak<P: AsRef<[u8]>, M: AsRef<[u8]>>(sig: &[u8], message: M, pubkey: P) -> bool {
-		let message = secp256k1::Message::parse(&blake2_256(message.as_ref()));
+		let message = libsecp256k1::Message::parse(&blake2_256(message.as_ref()));
 		if sig.len() != 65 {
 			return false
 		}
-		let ri = match secp256k1::RecoveryId::parse(sig[64]) {
-			Ok(x) => x,
-			_ => return false,
-		};
-		let sig = match secp256k1::Signature::parse_slice(&sig[0..64]) {
-			Ok(x) => x,
+		let (sig, ri) = match parse_signature_standard(&sig) {
+			Ok(sigri) => sigri,
 			_ => return false,
 		};
-		match secp256k1::recover(&message, &sig, &ri) {
+		match libsecp256k1::recover(&message, &sig, &ri) {
 			Ok(actual) => pubkey.as_ref() == &actual.serialize()[1..],
 			_ => false,
 		}
@@ -577,25 +567,57 @@ impl Pair {
 
 	/// Sign a pre-hashed message
 	pub fn sign_prehashed(&self, message: &[u8; 32]) -> Signature {
-		let message = secp256k1::Message::parse(message);
-		secp256k1::sign(&message, &self.secret).into()
+		let message = libsecp256k1::Message::parse(message);
+		libsecp256k1::sign(&message, &self.secret).into()
 	}
 
 	/// Verify a signature on a pre-hashed message. Return `true` if the signature is valid
 	/// and thus matches the given `public` key.
 	pub fn verify_prehashed(sig: &Signature, message: &[u8; 32], public: &Public) -> bool {
-		let message = secp256k1::Message::parse(message);
+		let message = libsecp256k1::Message::parse(message);
 
 		let sig: (_, _) = match sig.try_into() {
 			Ok(x) => x,
 			_ => return false,
 		};
 
-		match secp256k1::recover(&message, &sig.0, &sig.1) {
+		match libsecp256k1::recover(&message, &sig.0, &sig.1) {
 			Ok(actual) => public.0[..] == actual.serialize_compressed()[..],
 			_ => false,
 		}
 	}
+
+	/// Verify a signature on a message. Returns true if the signature is good.
+	/// Parses Signature using parse_overflowing_slice
+	pub fn verify_deprecated<M: AsRef<[u8]>>(sig: &Signature, message: M, pubkey: &Public) -> bool {
+		let message = libsecp256k1::Message::parse(&blake2_256(message.as_ref()));
+		let (sig, ri) = match parse_signature_overflowing(&sig.0) {
+			Ok(sigri) => sigri,
+			_ => return false,
+		};
+		match libsecp256k1::recover(&message, &sig, &ri) {
+			Ok(actual) => pubkey.0[..] == actual.serialize_compressed()[..],
+			_ => false,
+		}
+	}
+}
+
+#[cfg(feature = "full_crypto")]
+fn parse_signature_standard(
+	x: &[u8],
+) -> Result<(libsecp256k1::Signature, libsecp256k1::RecoveryId), libsecp256k1::Error> {
+	let sig = libsecp256k1::Signature::parse_standard_slice(&x[..64])?;
+	let ri = libsecp256k1::RecoveryId::parse(x[64])?;
+	Ok((sig, ri))
+}
+
+#[cfg(feature = "full_crypto")]
+fn parse_signature_overflowing(
+	x: &[u8],
+) -> Result<(libsecp256k1::Signature, libsecp256k1::RecoveryId), libsecp256k1::Error> {
+	let sig = libsecp256k1::Signature::parse_overflowing_slice(&x[..64])?;
+	let ri = libsecp256k1::RecoveryId::parse(x[64])?;
+	Ok((sig, ri))
 }
 
 impl CryptoType for Public {
@@ -840,7 +862,7 @@ mod test {
 		let msg = [0u8; 32];
 		let sig1 = pair.sign_prehashed(&msg);
 		let sig2: Signature =
-			secp256k1::sign(&secp256k1::Message::parse(&msg), &pair.secret).into();
+			libsecp256k1::sign(&libsecp256k1::Message::parse(&msg), &pair.secret).into();
 
 		assert_eq!(sig1, sig2);
 
@@ -853,7 +875,7 @@ mod test {
 		let msg = keccak_256(b"this should be hashed");
 		let sig1 = pair.sign_prehashed(&msg);
 		let sig2: Signature =
-			secp256k1::sign(&secp256k1::Message::parse(&msg), &pair.secret).into();
+			libsecp256k1::sign(&libsecp256k1::Message::parse(&msg), &pair.secret).into();
 
 		assert_eq!(sig1, sig2);
 	}
diff --git a/primitives/io/Cargo.toml b/primitives/io/Cargo.toml
index da9a8fc83200..d3a2b5670592 100644
--- a/primitives/io/Cargo.toml
+++ b/primitives/io/Cargo.toml
@@ -20,7 +20,7 @@ hash-db = { version = "0.15.2", default-features = false }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../core" }
 sp-keystore = { version = "0.10.0-dev", default-features = false, optional = true, path = "../keystore" }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
-libsecp256k1 = { version = "0.3.4", optional = true }
+libsecp256k1 = { version = "0.6", optional = true }
 sp-state-machine = { version = "0.10.0-dev", optional = true, path = "../state-machine" }
 sp-wasm-interface = { version = "4.0.0-dev", path = "../wasm-interface", default-features = false }
 sp-runtime-interface = { version = "4.0.0-dev", default-features = false, path = "../runtime-interface" }
diff --git a/primitives/io/src/lib.rs b/primitives/io/src/lib.rs
index 0b5c37af5f66..5faeb59c72db 100644
--- a/primitives/io/src/lib.rs
+++ b/primitives/io/src/lib.rs
@@ -718,6 +718,14 @@ pub trait Crypto {
 	/// Verify `ecdsa` signature.
 	///
 	/// Returns `true` when the verification was successful.
+	fn ecdsa_verify(sig: &ecdsa::Signature, msg: &[u8], pub_key: &ecdsa::Public) -> bool {
+		ecdsa::Pair::verify_deprecated(sig, msg, pub_key)
+	}
+
+	/// Verify `ecdsa` signature.
+	///
+	/// Returns `true` when the verification was successful.
+	#[version(2)]
 	fn ecdsa_verify(sig: &ecdsa::Signature, msg: &[u8], pub_key: &ecdsa::Public) -> bool {
 		ecdsa::Pair::verify(sig, msg, pub_key)
 	}
@@ -752,12 +760,38 @@ pub trait Crypto {
 		sig: &[u8; 65],
 		msg: &[u8; 32],
 	) -> Result<[u8; 64], EcdsaVerifyError> {
-		let rs =
-			secp256k1::Signature::parse_slice(&sig[0..64]).map_err(|_| EcdsaVerifyError::BadRS)?;
-		let v =
-			secp256k1::RecoveryId::parse(if sig[64] > 26 { sig[64] - 27 } else { sig[64] } as u8)
-				.map_err(|_| EcdsaVerifyError::BadV)?;
-		let pubkey = secp256k1::recover(&secp256k1::Message::parse(msg), &rs, &v)
+		let rs = libsecp256k1::Signature::parse_overflowing_slice(&sig[0..64])
+			.map_err(|_| EcdsaVerifyError::BadRS)?;
+		let v = libsecp256k1::RecoveryId::parse(
+			if sig[64] > 26 { sig[64] - 27 } else { sig[64] } as u8
+		)
+		.map_err(|_| EcdsaVerifyError::BadV)?;
+		let pubkey = libsecp256k1::recover(&libsecp256k1::Message::parse(msg), &rs, &v)
+			.map_err(|_| EcdsaVerifyError::BadSignature)?;
+		let mut res = [0u8; 64];
+		res.copy_from_slice(&pubkey.serialize()[1..65]);
+		Ok(res)
+	}
+
+	/// Verify and recover a SECP256k1 ECDSA signature.
+	///
+	/// - `sig` is passed in RSV format. V should be either `0/1` or `27/28`.
+	/// - `msg` is the blake2-256 hash of the message.
+	///
+	/// Returns `Err` if the signature is bad, otherwise the 64-byte pubkey
+	/// (doesn't include the 0x04 prefix).
+	#[version(2)]
+	fn secp256k1_ecdsa_recover(
+		sig: &[u8; 65],
+		msg: &[u8; 32],
+	) -> Result<[u8; 64], EcdsaVerifyError> {
+		let rs = libsecp256k1::Signature::parse_standard_slice(&sig[0..64])
+			.map_err(|_| EcdsaVerifyError::BadRS)?;
+		let v = libsecp256k1::RecoveryId::parse(
+			if sig[64] > 26 { sig[64] - 27 } else { sig[64] } as u8
+		)
+		.map_err(|_| EcdsaVerifyError::BadV)?;
+		let pubkey = libsecp256k1::recover(&libsecp256k1::Message::parse(msg), &rs, &v)
 			.map_err(|_| EcdsaVerifyError::BadSignature)?;
 		let mut res = [0u8; 64];
 		res.copy_from_slice(&pubkey.serialize()[1..65]);
@@ -774,12 +808,35 @@ pub trait Crypto {
 		sig: &[u8; 65],
 		msg: &[u8; 32],
 	) -> Result<[u8; 33], EcdsaVerifyError> {
-		let rs =
-			secp256k1::Signature::parse_slice(&sig[0..64]).map_err(|_| EcdsaVerifyError::BadRS)?;
-		let v =
-			secp256k1::RecoveryId::parse(if sig[64] > 26 { sig[64] - 27 } else { sig[64] } as u8)
-				.map_err(|_| EcdsaVerifyError::BadV)?;
-		let pubkey = secp256k1::recover(&secp256k1::Message::parse(msg), &rs, &v)
+		let rs = libsecp256k1::Signature::parse_overflowing_slice(&sig[0..64])
+			.map_err(|_| EcdsaVerifyError::BadRS)?;
+		let v = libsecp256k1::RecoveryId::parse(
+			if sig[64] > 26 { sig[64] - 27 } else { sig[64] } as u8
+		)
+		.map_err(|_| EcdsaVerifyError::BadV)?;
+		let pubkey = libsecp256k1::recover(&libsecp256k1::Message::parse(msg), &rs, &v)
+			.map_err(|_| EcdsaVerifyError::BadSignature)?;
+		Ok(pubkey.serialize_compressed())
+	}
+
+	/// Verify and recover a SECP256k1 ECDSA signature.
+	///
+	/// - `sig` is passed in RSV format. V should be either `0/1` or `27/28`.
+	/// - `msg` is the blake2-256 hash of the message.
+	///
+	/// Returns `Err` if the signature is bad, otherwise the 33-byte compressed pubkey.
+	#[version(2)]
+	fn secp256k1_ecdsa_recover_compressed(
+		sig: &[u8; 65],
+		msg: &[u8; 32],
+	) -> Result<[u8; 33], EcdsaVerifyError> {
+		let rs = libsecp256k1::Signature::parse_standard_slice(&sig[0..64])
+			.map_err(|_| EcdsaVerifyError::BadRS)?;
+		let v = libsecp256k1::RecoveryId::parse(
+			if sig[64] > 26 { sig[64] - 27 } else { sig[64] } as u8
+		)
+		.map_err(|_| EcdsaVerifyError::BadV)?;
+		let pubkey = libsecp256k1::recover(&libsecp256k1::Message::parse(msg), &rs, &v)
 			.map_err(|_| EcdsaVerifyError::BadSignature)?;
 		Ok(pubkey.serialize_compressed())
 	}
diff --git a/test-utils/test-runner/src/host_functions.rs b/test-utils/test-runner/src/host_functions.rs
index 6bd91929256a..731abfbb9db0 100644
--- a/test-utils/test-runner/src/host_functions.rs
+++ b/test-utils/test-runner/src/host_functions.rs
@@ -77,6 +77,8 @@ impl sp_wasm_interface::HostFunctions for SignatureVerificationOverride {
 		override_host_functions!(
 			"ext_crypto_ecdsa_verify_version_1",
 			EcdsaVerify,
+			"ext_crypto_ecdsa_verify_version_2",
+			EcdsaVerifyV2,
 			"ext_crypto_ed25519_verify_version_1",
 			Ed25519Verify,
 			"ext_crypto_sr25519_verify_version_1",
diff --git a/utils/browser/Cargo.toml b/utils/browser/Cargo.toml
index 3522432001a0..9ede0f2ce8ff 100644
--- a/utils/browser/Cargo.toml
+++ b/utils/browser/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 futures = "0.3.16"
 log = "0.4.8"
-libp2p-wasm-ext = { version = "0.28.1", features = ["websocket"] }
+libp2p-wasm-ext = { version = "0.29", features = ["websocket"] }
 console_error_panic_hook = "0.1.6"
 js-sys = "0.3.34"
 wasm-bindgen = "0.2.73"

From 67f28cdba85c362da17909c69c19952e3ef931c7 Mon Sep 17 00:00:00 2001
From: Ashley <ashley.ruglys@gmail.com>
Date: Mon, 16 Aug 2021 17:06:52 +0200
Subject: [PATCH 1088/1194] Simplify `NativeExecutionDispatch` and remove the
 `native_executor_instance!` macro (#9562)

* Remove the `native_executor_instance!` macro

* Add comment to test runner ex

* Fix comments
---
 bin/node-template/node/src/service.rs   |  20 +++--
 bin/node/executor/src/lib.rs            |  20 +++--
 bin/node/executor/tests/common.rs       |   3 +-
 bin/node/test-runner-example/src/lib.rs |  25 +++---
 client/executor/src/native_executor.rs  | 100 ++++--------------------
 client/service/test/src/client/mod.rs   |  19 +++--
 test-utils/runtime/client/src/lib.rs    |  18 ++++-
 test-utils/runtime/src/system.rs        |  16 +++-
 test-utils/test-runner/src/lib.rs       |  19 +++--
 9 files changed, 114 insertions(+), 126 deletions(-)

diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
index 8eef2ce0905b..6f41dcb1d651 100644
--- a/bin/node-template/node/src/service.rs
+++ b/bin/node-template/node/src/service.rs
@@ -3,7 +3,6 @@
 use node_template_runtime::{self, opaque::Block, RuntimeApi};
 use sc_client_api::{ExecutorProvider, RemoteBackend};
 use sc_consensus_aura::{ImportQueueParams, SlotProportion, StartAuraParams};
-use sc_executor::native_executor_instance;
 pub use sc_executor::NativeExecutor;
 use sc_finality_grandpa::SharedVoterState;
 use sc_keystore::LocalKeystore;
@@ -14,12 +13,19 @@ use sp_consensus_aura::sr25519::AuthorityPair as AuraPair;
 use std::{sync::Arc, time::Duration};
 
 // Our native executor instance.
-native_executor_instance!(
-	pub Executor,
-	node_template_runtime::api::dispatch,
-	node_template_runtime::native_version,
-	frame_benchmarking::benchmarking::HostFunctions,
-);
+pub struct Executor;
+
+impl sc_executor::NativeExecutionDispatch for Executor {
+	type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;
+
+	fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
+		node_template_runtime::api::dispatch(method, data)
+	}
+
+	fn native_version() -> sc_executor::NativeVersion {
+		node_template_runtime::native_version()
+	}
+}
 
 type FullClient = sc_service::TFullClient<Block, RuntimeApi, Executor>;
 type FullBackend = sc_service::TFullBackend<Block>;
diff --git a/bin/node/executor/src/lib.rs b/bin/node/executor/src/lib.rs
index 0f4bfcf2eee2..a2e0455a96fa 100644
--- a/bin/node/executor/src/lib.rs
+++ b/bin/node/executor/src/lib.rs
@@ -18,14 +18,20 @@
 //! A `CodeExecutor` specialization which uses natively compiled runtime when the wasm to be
 //! executed is equivalent to the natively compiled code.
 
-use sc_executor::native_executor_instance;
 pub use sc_executor::NativeExecutor;
 
 // Declare an instance of the native executor named `Executor`. Include the wasm binary as the
 // equivalent wasm code.
-native_executor_instance!(
-	pub Executor,
-	node_runtime::api::dispatch,
-	node_runtime::native_version,
-	frame_benchmarking::benchmarking::HostFunctions,
-);
+pub struct Executor;
+
+impl sc_executor::NativeExecutionDispatch for Executor {
+	type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;
+
+	fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
+		node_runtime::api::dispatch(method, data)
+	}
+
+	fn native_version() -> sc_executor::NativeVersion {
+		node_runtime::native_version()
+	}
+}
diff --git a/bin/node/executor/tests/common.rs b/bin/node/executor/tests/common.rs
index f7cf8db003c0..337b4b0c15f9 100644
--- a/bin/node/executor/tests/common.rs
+++ b/bin/node/executor/tests/common.rs
@@ -67,8 +67,7 @@ impl AppCrypto<MultiSigner, MultiSignature> for TestAuthorityId {
 ///
 /// `compact` since it is after post-processing with wasm-gc which performs tree-shaking thus
 /// making the binary slimmer. There is a convention to use compact version of the runtime
-/// as canonical. This is why `native_executor_instance` also uses the compact version of the
-/// runtime.
+/// as canonical.
 pub fn compact_code_unwrap() -> &'static [u8] {
 	node_runtime::WASM_BINARY.expect(
 		"Development wasm binary is not available. Testing is only supported with the flag \
diff --git a/bin/node/test-runner-example/src/lib.rs b/bin/node/test-runner-example/src/lib.rs
index cee050ba4f30..a4101556681a 100644
--- a/bin/node/test-runner-example/src/lib.rs
+++ b/bin/node/test-runner-example/src/lib.rs
@@ -28,15 +28,22 @@ use test_runner::{ChainInfo, SignatureVerificationOverride};
 
 type BlockImport<B, BE, C, SC> = BabeBlockImport<B, C, GrandpaBlockImport<BE, B, C, SC>>;
 
-sc_executor::native_executor_instance!(
-	pub Executor,
-	node_runtime::api::dispatch,
-	node_runtime::native_version,
-	(
-		frame_benchmarking::benchmarking::HostFunctions,
-		SignatureVerificationOverride,
-	)
-);
+/// A unit struct which implements `NativeExecutionDispatch` feeding in the
+/// hard-coded runtime.
+pub struct Executor;
+
+impl sc_executor::NativeExecutionDispatch for Executor {
+	type ExtendHostFunctions =
+		(frame_benchmarking::benchmarking::HostFunctions, SignatureVerificationOverride);
+
+	fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
+		node_runtime::api::dispatch(method, data)
+	}
+
+	fn native_version() -> sc_executor::NativeVersion {
+		node_runtime::native_version()
+	}
+}
 
 /// ChainInfo implementation.
 struct NodeTemplateChainInfo;
diff --git a/client/executor/src/native_executor.rs b/client/executor/src/native_executor.rs
index 9faa64521880..c0542554c731 100644
--- a/client/executor/src/native_executor.rs
+++ b/client/executor/src/native_executor.rs
@@ -83,9 +83,7 @@ pub trait NativeExecutionDispatch: Send + Sync {
 	type ExtendHostFunctions: HostFunctions;
 
 	/// Dispatch a method in the runtime.
-	///
-	/// If the method with the specified name doesn't exist then `Err` is returned.
-	fn dispatch(ext: &mut dyn Externalities, method: &str, data: &[u8]) -> Result<Vec<u8>>;
+	fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>>;
 
 	/// Provide native runtime version.
 	fn native_version() -> NativeVersion;
@@ -577,7 +575,9 @@ impl<D: NativeExecutionDispatch + 'static> CodeExecutor for NativeExecutor<D> {
 						);
 
 						used_native = true;
-						Ok(D::dispatch(&mut **ext, method, data).map(NativeOrEncoded::Encoded))
+						Ok(with_externalities_safe(&mut **ext, move || D::dispatch(method, data))?
+							.map(NativeOrEncoded::Encoded)
+							.ok_or_else(|| Error::MethodNotFound(method.to_owned())))
 					},
 				}
 			},
@@ -606,79 +606,6 @@ impl<D: NativeExecutionDispatch> sp_core::traits::ReadRuntimeVersion for NativeE
 	}
 }
 
-/// Implements a `NativeExecutionDispatch` for provided parameters.
-///
-/// # Example
-///
-/// ```
-/// sc_executor::native_executor_instance!(
-///     pub MyExecutor,
-///     substrate_test_runtime::api::dispatch,
-///     substrate_test_runtime::native_version,
-/// );
-/// ```
-///
-/// # With custom host functions
-///
-/// When you want to use custom runtime interfaces from within your runtime, you need to make the
-/// executor aware of the host functions for these interfaces.
-///
-/// ```
-/// # use sp_runtime_interface::runtime_interface;
-///
-/// #[runtime_interface]
-/// trait MyInterface {
-///     fn say_hello_world(data: &str) {
-///         println!("Hello world from: {}", data);
-///     }
-/// }
-///
-/// sc_executor::native_executor_instance!(
-///     pub MyExecutor,
-///     substrate_test_runtime::api::dispatch,
-///     substrate_test_runtime::native_version,
-///     my_interface::HostFunctions,
-/// );
-/// ```
-///
-/// When you have multiple interfaces, you can give the host functions as a tuple e.g.:
-/// `(my_interface::HostFunctions, my_interface2::HostFunctions)`
-#[macro_export]
-macro_rules! native_executor_instance {
-	( $pub:vis $name:ident, $dispatcher:path, $version:path $(,)?) => {
-		/// A unit struct which implements `NativeExecutionDispatch` feeding in the
-		/// hard-coded runtime.
-		$pub struct $name;
-		$crate::native_executor_instance!(IMPL $name, $dispatcher, $version, ());
-	};
-	( $pub:vis $name:ident, $dispatcher:path, $version:path, $custom_host_functions:ty $(,)?) => {
-		/// A unit struct which implements `NativeExecutionDispatch` feeding in the
-		/// hard-coded runtime.
-		$pub struct $name;
-		$crate::native_executor_instance!(
-			IMPL $name, $dispatcher, $version, $custom_host_functions
-		);
-	};
-	(IMPL $name:ident, $dispatcher:path, $version:path, $custom_host_functions:ty) => {
-		impl $crate::NativeExecutionDispatch for $name {
-			type ExtendHostFunctions = $custom_host_functions;
-
-			fn dispatch(
-				ext: &mut dyn $crate::Externalities,
-				method: &str,
-				data: &[u8]
-			) -> $crate::error::Result<Vec<u8>> {
-				$crate::with_externalities_safe(ext, move || $dispatcher(method, data))?
-					.ok_or_else(|| $crate::error::Error::MethodNotFound(method.to_owned()))
-			}
-
-			fn native_version() -> $crate::NativeVersion {
-				$version()
-			}
-		}
-	}
-}
-
 #[cfg(test)]
 mod tests {
 	use super::*;
@@ -691,12 +618,19 @@ mod tests {
 		}
 	}
 
-	native_executor_instance!(
-		pub MyExecutor,
-		substrate_test_runtime::api::dispatch,
-		substrate_test_runtime::native_version,
-		(my_interface::HostFunctions, my_interface::HostFunctions),
-	);
+	pub struct MyExecutor;
+
+	impl NativeExecutionDispatch for MyExecutor {
+		type ExtendHostFunctions = (my_interface::HostFunctions, my_interface::HostFunctions);
+
+		fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
+			substrate_test_runtime::api::dispatch(method, data)
+		}
+
+		fn native_version() -> NativeVersion {
+			substrate_test_runtime::native_version()
+		}
+	}
 
 	#[test]
 	fn native_executor_registers_custom_interface() {
diff --git a/client/service/test/src/client/mod.rs b/client/service/test/src/client/mod.rs
index 84a9c5b91407..bd1f5be8d5cd 100644
--- a/client/service/test/src/client/mod.rs
+++ b/client/service/test/src/client/mod.rs
@@ -27,7 +27,6 @@ use sc_client_db::{
 use sc_consensus::{
 	BlockCheckParams, BlockImport, BlockImportParams, ForkChoiceStrategy, ImportResult,
 };
-use sc_executor::native_executor_instance;
 use sc_service::client::{self, new_in_mem, Client, LocalCallExecutor};
 use sp_api::ProvideRuntimeApi;
 use sp_consensus::{BlockOrigin, BlockStatus, Error as ConsensusError, SelectChain};
@@ -63,11 +62,19 @@ mod light;
 
 const TEST_ENGINE_ID: ConsensusEngineId = *b"TEST";
 
-native_executor_instance!(
-	Executor,
-	substrate_test_runtime_client::runtime::api::dispatch,
-	substrate_test_runtime_client::runtime::native_version,
-);
+pub struct Executor;
+
+impl sc_executor::NativeExecutionDispatch for Executor {
+	type ExtendHostFunctions = ();
+
+	fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
+		substrate_test_runtime_client::runtime::api::dispatch(method, data)
+	}
+
+	fn native_version() -> sc_executor::NativeVersion {
+		substrate_test_runtime_client::runtime::native_version()
+	}
+}
 
 fn executor() -> sc_executor::NativeExecutor<Executor> {
 	sc_executor::NativeExecutor::new(sc_executor::WasmExecutionMethod::Interpreted, None, 8)
diff --git a/test-utils/runtime/client/src/lib.rs b/test-utils/runtime/client/src/lib.rs
index 3db433968c9f..00a8b9495fa6 100644
--- a/test-utils/runtime/client/src/lib.rs
+++ b/test-utils/runtime/client/src/lib.rs
@@ -58,10 +58,20 @@ pub mod prelude {
 	pub use super::{AccountKeyring, Sr25519Keyring};
 }
 
-sc_executor::native_executor_instance! {
-	pub LocalExecutor,
-	substrate_test_runtime::api::dispatch,
-	substrate_test_runtime::native_version,
+/// A unit struct which implements `NativeExecutionDispatch` feeding in the
+/// hard-coded runtime.
+pub struct LocalExecutor;
+
+impl sc_executor::NativeExecutionDispatch for LocalExecutor {
+	type ExtendHostFunctions = ();
+
+	fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
+		substrate_test_runtime::api::dispatch(method, data)
+	}
+
+	fn native_version() -> sc_executor::NativeVersion {
+		substrate_test_runtime::native_version()
+	}
 }
 
 /// Test client database backend.
diff --git a/test-utils/runtime/src/system.rs b/test-utils/runtime/src/system.rs
index 316a553ed027..15f1a2e654dc 100644
--- a/test-utils/runtime/src/system.rs
+++ b/test-utils/runtime/src/system.rs
@@ -349,7 +349,7 @@ mod tests {
 	use super::*;
 
 	use crate::{wasm_binary_unwrap, Header, Transfer};
-	use sc_executor::{native_executor_instance, NativeExecutor, WasmExecutionMethod};
+	use sc_executor::{NativeExecutor, WasmExecutionMethod};
 	use sp_core::{
 		map,
 		traits::{CodeExecutor, RuntimeCode},
@@ -359,7 +359,19 @@ mod tests {
 	use substrate_test_runtime_client::{AccountKeyring, Sr25519Keyring};
 
 	// Declare an instance of the native executor dispatch for the test runtime.
-	native_executor_instance!(NativeDispatch, crate::api::dispatch, crate::native_version);
+	pub struct NativeDispatch;
+
+	impl sc_executor::NativeExecutionDispatch for NativeDispatch {
+		type ExtendHostFunctions = ();
+
+		fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
+			crate::api::dispatch(method, data)
+		}
+
+		fn native_version() -> sc_executor::NativeVersion {
+			crate::native_version()
+		}
+	}
 
 	fn executor() -> NativeExecutor<NativeDispatch> {
 		NativeExecutor::new(WasmExecutionMethod::Interpreted, None, 8)
diff --git a/test-utils/test-runner/src/lib.rs b/test-utils/test-runner/src/lib.rs
index 2c458f330ec6..4f5f20a8f398 100644
--- a/test-utils/test-runner/src/lib.rs
+++ b/test-utils/test-runner/src/lib.rs
@@ -62,12 +62,19 @@
 //!
 //! type BlockImport<B, BE, C, SC> = BabeBlockImport<B, C, GrandpaBlockImport<BE, B, C, SC>>;
 //!
-//! sc_executor::native_executor_instance!(
-//! 	pub Executor,
-//! 	node_runtime::api::dispatch,
-//! 	node_runtime::native_version,
-//! 	SignatureVerificationOverride,
-//! );
+//! pub struct Executor;
+//!
+//! impl sc_executor::NativeExecutionDispatch for Executor {
+//! 	type ExtendHostFunctions = SignatureVerificationOverride;
+//!
+//! 	fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
+//! 		node_runtime::api::dispatch(method, data)
+//! 	}
+//!
+//! 	fn native_version() -> sc_executor::NativeVersion {
+//! 		node_runtime::native_version()
+//! 	}
+//! }
 //!
 //! struct Requirements;
 //!

From c6c52d3c2ba999da0adba00587dbb31b246782e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 17 Aug 2021 12:08:07 +0200
Subject: [PATCH 1089/1194] Fix prometheus after hyper 14 upgrade (#9571)

* Fix prometheus after hyper 14 upgrade

* Fix stupid mistakes

* Use 127.0.0.1

* Update utils/prometheus/Cargo.toml

Co-authored-by: Niklas Adolfsson <niklasadolfsson1@gmail.com>

Co-authored-by: Niklas Adolfsson <niklasadolfsson1@gmail.com>
---
 utils/prometheus/Cargo.toml        |  4 +++
 utils/prometheus/src/lib.rs        | 56 ++++++++++++++++++++++++++++--
 utils/prometheus/src/networking.rs |  4 +--
 3 files changed, 60 insertions(+), 4 deletions(-)

diff --git a/utils/prometheus/Cargo.toml b/utils/prometheus/Cargo.toml
index 7766904a574b..16feedb2b5bd 100644
--- a/utils/prometheus/Cargo.toml
+++ b/utils/prometheus/Cargo.toml
@@ -22,3 +22,7 @@ derive_more = "0.99"
 async-std = { version = "1.6.5", features = ["unstable"] }
 tokio = "1.10"
 hyper = { version = "0.14.11", default-features = false, features = ["http1", "server", "tcp"] }
+
+[dev-dependencies]
+hyper = { version = "0.14.11", features = ["client"] }
+tokio = { version = "1.10", features = ["rt-multi-thread"] }
diff --git a/utils/prometheus/src/lib.rs b/utils/prometheus/src/lib.rs
index 9f6f6e8f2255..5771b6556757 100644
--- a/utils/prometheus/src/lib.rs
+++ b/utils/prometheus/src/lib.rs
@@ -137,12 +137,21 @@ mod known_os {
 		prometheus_addr: SocketAddr,
 		registry: Registry,
 	) -> Result<(), Error> {
-		use networking::Incoming;
 		let listener = async_std::net::TcpListener::bind(&prometheus_addr)
 			.await
 			.map_err(|_| Error::PortInUse(prometheus_addr))?;
 
-		log::info!("〽️ Prometheus exporter started at {}", prometheus_addr);
+		init_prometheus_with_listener(listener, registry).await
+	}
+
+	/// Init prometheus using the given listener.
+	pub(crate) async fn init_prometheus_with_listener(
+		listener: async_std::net::TcpListener,
+		registry: Registry,
+	) -> Result<(), Error> {
+		use networking::Incoming;
+
+		log::info!("〽️ Prometheus exporter started at {}", listener.local_addr()?);
 
 		let service = make_service_fn(move |_| {
 			let registry = registry.clone();
@@ -162,3 +171,46 @@ mod known_os {
 		result
 	}
 }
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use hyper::{Client, Uri};
+	use std::convert::TryFrom;
+
+	#[test]
+	fn prometheus_works() {
+		const METRIC_NAME: &str = "test_test_metric_name_test_test";
+
+		let runtime = tokio::runtime::Runtime::new().expect("Creates the runtime");
+
+		let listener = runtime
+			.block_on(async_std::net::TcpListener::bind("127.0.0.1:0"))
+			.expect("Creates listener");
+
+		let local_addr = listener.local_addr().expect("Returns the local addr");
+
+		let registry = Registry::default();
+		register(
+			prometheus::Counter::new(METRIC_NAME, "yeah").expect("Creates test counter"),
+			&registry,
+		)
+		.expect("Registers the test metric");
+
+		runtime.spawn(known_os::init_prometheus_with_listener(listener, registry));
+
+		runtime.block_on(async {
+			let client = Client::new();
+
+			let res = client
+				.get(Uri::try_from(&format!("http://{}/metrics", local_addr)).expect("Parses URI"))
+				.await
+				.expect("Requests metrics");
+
+			let buf = hyper::body::to_bytes(res).await.expect("Converts body to bytes");
+
+			let body = String::from_utf8(buf.to_vec()).expect("Converts body to String");
+			assert!(body.contains(&format!("{} 0", METRIC_NAME)));
+		});
+	}
+}
diff --git a/utils/prometheus/src/networking.rs b/utils/prometheus/src/networking.rs
index de1a1c41d67c..a24216bd2362 100644
--- a/utils/prometheus/src/networking.rs
+++ b/utils/prometheus/src/networking.rs
@@ -47,8 +47,8 @@ impl tokio::io::AsyncRead for TcpStream {
 		buf: &mut tokio::io::ReadBuf<'_>,
 	) -> Poll<Result<(), std::io::Error>> {
 		Pin::new(&mut Pin::into_inner(self).0)
-			.poll_read(cx, buf.initialized_mut())
-			.map_ok(drop)
+			.poll_read(cx, buf.initialize_unfilled())
+			.map_ok(|s| buf.set_filled(s))
 	}
 }
 

From d2a43d47ab7339e70c3448b4553073584cfd61ab Mon Sep 17 00:00:00 2001
From: David <dvdplm@gmail.com>
Date: Tue, 17 Aug 2021 20:06:23 +0200
Subject: [PATCH 1090/1194] Remove substrate-in-the-browser (#9541)

* Comment out browser stuff

* Remove browser stuff

* Remove more wasm transport code

* Remove ExtTransport and rework how telemetry initialises.

* Change (most) wasm-timer using code to use std::time

* Rename CI-job

* Aura does not compile for wasm

* Remove testing in the browser on CI

* Update README

* Leave `StreamSink` be

* fmt
---
 .gitlab-ci.yml                                |  23 +-
 Cargo.lock                                    | 103 ---------
 Cargo.toml                                    |   2 -
 bin/node/browser-testing/Cargo.toml           |  23 --
 bin/node/browser-testing/src/lib.rs           |  67 ------
 bin/node/browser-testing/webdriver.json       |   7 -
 bin/node/cli/Cargo.toml                       |  14 +-
 bin/node/cli/browser-demo/.gitignore          |   1 -
 bin/node/cli/browser-demo/README.md           |  10 -
 bin/node/cli/browser-demo/build.sh            |   5 -
 bin/node/cli/browser-demo/favicon.png         | Bin 10338 -> 0 bytes
 bin/node/cli/browser-demo/index.html          |  39 ----
 bin/node/cli/src/browser.rs                   |  57 -----
 bin/node/cli/src/lib.rs                       |   4 -
 bin/node/cli/src/service.rs                   |   7 +-
 client/cli/src/config.rs                      |  15 +-
 client/cli/src/params/network_params.rs       |   1 -
 client/consensus/common/Cargo.toml            |   1 -
 client/consensus/common/src/import_queue.rs   |   2 +-
 .../common/src/import_queue/basic_queue.rs    |   2 +-
 client/finality-grandpa/Cargo.toml            |   1 -
 .../src/communication/gossip.rs               |   3 +-
 client/finality-grandpa/src/until_imported.rs |   3 +-
 client/informant/Cargo.toml                   |   1 -
 client/informant/src/display.rs               |   2 +-
 client/network-gossip/Cargo.toml              |   1 -
 client/network-gossip/src/state_machine.rs    |   2 +-
 client/network/Cargo.toml                     |   1 -
 client/network/src/config.rs                  |  18 +-
 client/network/src/peer_info.rs               |   3 +-
 .../src/protocol/notifications/behaviour.rs   |   3 +-
 .../src/protocol/notifications/handler.rs     |   3 +-
 .../src/protocol/sync/extra_requests.rs       |   3 +-
 client/network/src/request_responses.rs       |   3 +-
 client/network/src/service.rs                 |   8 +-
 client/network/src/transport.rs               |  15 +-
 client/peerset/src/lib.rs                     |   4 +-
 client/peerset/src/peersstate.rs              |   2 +-
 client/service/Cargo.toml                     |   1 -
 client/service/src/builder.rs                 |   3 +-
 client/service/src/config.rs                  |   5 +-
 client/service/src/metrics.rs                 |   6 +-
 client/service/test/src/lib.rs                |   8 +-
 client/telemetry/src/lib.rs                   |  11 +-
 client/telemetry/src/transport.rs             |  26 +--
 .../tracing/src/logging/layers/console_log.rs | 116 ----------
 client/tracing/src/logging/layers/mod.rs      |   4 -
 client/transaction-pool/Cargo.toml            |   1 -
 client/transaction-pool/graph/Cargo.toml      |   1 -
 client/transaction-pool/src/graph/future.rs   |   2 +-
 client/transaction-pool/src/graph/pool.rs     |   8 +-
 client/transaction-pool/src/graph/rotator.rs  |   7 +-
 .../src/graph/validated_pool.rs               |   2 +-
 client/transaction-pool/src/lib.rs            |   2 +-
 docs/Upgrading-2.0-to-3.0.md                  |  63 ------
 primitives/timestamp/Cargo.toml               |   2 -
 primitives/timestamp/src/lib.rs               |   2 +-
 test-utils/test-runner/src/utils.rs           |   1 -
 utils/browser/Cargo.toml                      |  35 ---
 utils/browser/README.md                       |   1 -
 utils/browser/src/lib.rs                      | 212 ------------------
 61 files changed, 57 insertions(+), 921 deletions(-)
 delete mode 100644 bin/node/browser-testing/Cargo.toml
 delete mode 100644 bin/node/browser-testing/src/lib.rs
 delete mode 100644 bin/node/browser-testing/webdriver.json
 delete mode 100644 bin/node/cli/browser-demo/.gitignore
 delete mode 100644 bin/node/cli/browser-demo/README.md
 delete mode 100755 bin/node/cli/browser-demo/build.sh
 delete mode 100644 bin/node/cli/browser-demo/favicon.png
 delete mode 100644 bin/node/cli/browser-demo/index.html
 delete mode 100644 bin/node/cli/src/browser.rs
 delete mode 100644 client/tracing/src/logging/layers/console_log.rs
 delete mode 100644 utils/browser/Cargo.toml
 delete mode 100644 utils/browser/README.md
 delete mode 100644 utils/browser/src/lib.rs

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc5b397af1b1..d66e3f9a4cd1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -391,17 +391,11 @@ test-linux-stable-int:
     paths:
       - ${CI_COMMIT_SHORT_SHA}_int_failure.log
 
-check-web-wasm:
+check-tracing:
   stage:                           test
   <<:                              *docker-env
   <<:                              *test-refs
   script:
-    # WASM support is in progress. As more and more crates support WASM, we
-    # should add entries here. See https://github.com/paritytech/substrate/issues/2416
-    # Note: we don't need to test crates imported in `bin/node/cli`
-    - time cargo build --manifest-path=client/consensus/aura/Cargo.toml --target=wasm32-unknown-unknown --features getrandom
-    # Note: the command below is a bit weird because several Cargo issues prevent us from compiling the node in a more straight-forward way.
-    - time cargo +nightly build --manifest-path=bin/node/cli/Cargo.toml --no-default-features --features browser --target=wasm32-unknown-unknown
     # with-tracing must be explicitly activated, we run a test to ensure this works as expected in both cases
     - time cargo +nightly test --manifest-path primitives/tracing/Cargo.toml --no-default-features
     - time cargo +nightly test --manifest-path primitives/tracing/Cargo.toml --no-default-features --features=with-tracing
@@ -459,21 +453,6 @@ check-polkadot-companion-build:
     - cd polkadot && git rev-parse --abbrev-ref HEAD
   allow_failure:                   true
 
-test-browser-node:
-  stage:                           build
-  <<:                              *docker-env
-  <<:                              *test-refs
-  needs:
-    - job:                         check-web-wasm
-      artifacts:                   false
-  variables:
-    <<:                                         *default-vars
-    CHROMEDRIVER_ARGS:                          "--log-level=INFO --whitelisted-ips=127.0.0.1"
-    CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUNNER: "wasm-bindgen-test-runner"
-    WASM_BINDGEN_TEST_TIMEOUT:                  120
-  script:
-    - cargo +nightly test --target wasm32-unknown-unknown -p node-browser-testing
-
 build-linux-substrate:             &build-binary
   stage:                           build
   <<:                              *collect-artifacts
diff --git a/Cargo.lock b/Cargo.lock
index 59ef2616913e..08db695b05ef 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -861,12 +861,10 @@ version = "0.4.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
 dependencies = [
- "js-sys",
  "libc",
  "num-integer",
  "num-traits",
  "time",
- "wasm-bindgen",
  "winapi 0.3.9",
 ]
 
@@ -943,16 +941,6 @@ dependencies = [
  "cache-padded",
 ]
 
-[[package]]
-name = "console_error_panic_hook"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
-dependencies = [
- "cfg-if 0.1.10",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "constant_time_eq"
 version = "0.1.5"
@@ -2178,10 +2166,6 @@ name = "futures-timer"
 version = "3.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
-dependencies = [
- "gloo-timers",
- "send_wrapper",
-]
 
 [[package]]
 name = "futures-util"
@@ -2237,10 +2221,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
 dependencies = [
  "cfg-if 1.0.0",
- "js-sys",
  "libc",
  "wasi 0.9.0+wasi-snapshot-preview1",
- "wasm-bindgen",
 ]
 
 [[package]]
@@ -2684,9 +2666,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
 dependencies = [
  "cfg-if 1.0.0",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
 ]
 
 [[package]]
@@ -4212,20 +4191,6 @@ dependencies = [
  "tempfile",
 ]
 
-[[package]]
-name = "node-browser-testing"
-version = "3.0.0-dev"
-dependencies = [
- "jsonrpc-core",
- "node-cli",
- "parking_lot 0.11.1",
- "serde",
- "serde_json",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wasm-bindgen-test",
-]
-
 [[package]]
 name = "node-cli"
 version = "3.0.0-dev"
@@ -4236,7 +4201,6 @@ dependencies = [
  "frame-system",
  "futures 0.3.16",
  "hex-literal",
- "libp2p-wasm-ext",
  "log 0.4.14",
  "nix",
  "node-executor",
@@ -4288,13 +4252,10 @@ dependencies = [
  "sp-transaction-storage-proof",
  "sp-trie",
  "structopt",
- "substrate-browser-utils",
  "substrate-build-script-utils",
  "substrate-frame-cli",
  "tempfile",
  "try-runtime-cli",
- "wasm-bindgen",
- "wasm-bindgen-futures",
 ]
 
 [[package]]
@@ -7388,7 +7349,6 @@ dependencies = [
  "sp-utils",
  "substrate-prometheus-endpoint",
  "thiserror",
- "wasm-timer",
 ]
 
 [[package]]
@@ -7746,7 +7706,6 @@ dependencies = [
  "substrate-test-runtime-client",
  "tempfile",
  "tokio 0.2.25",
- "wasm-timer",
 ]
 
 [[package]]
@@ -7790,7 +7749,6 @@ dependencies = [
  "sc-transaction-pool-api",
  "sp-blockchain",
  "sp-runtime",
- "wasm-timer",
 ]
 
 [[package]]
@@ -7879,7 +7837,6 @@ dependencies = [
  "thiserror",
  "unsigned-varint 0.6.0",
  "void",
- "wasm-timer",
  "zeroize",
 ]
 
@@ -7899,7 +7856,6 @@ dependencies = [
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
  "tracing",
- "wasm-timer",
 ]
 
 [[package]]
@@ -8139,7 +8095,6 @@ dependencies = [
  "tokio 0.2.25",
  "tracing",
  "tracing-futures",
- "wasm-timer",
 ]
 
 [[package]]
@@ -8302,7 +8257,6 @@ dependencies = [
  "substrate-test-runtime-client",
  "substrate-test-runtime-transaction-pool",
  "thiserror",
- "wasm-timer",
 ]
 
 [[package]]
@@ -8443,12 +8397,6 @@ dependencies = [
  "pest",
 ]
 
-[[package]]
-name = "send_wrapper"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0"
-
 [[package]]
 name = "serde"
 version = "1.0.126"
@@ -9400,7 +9348,6 @@ dependencies = [
  "sp-runtime",
  "sp-std",
  "thiserror",
- "wasm-timer",
 ]
 
 [[package]]
@@ -9608,30 +9555,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "substrate-browser-utils"
-version = "0.10.0-dev"
-dependencies = [
- "chrono",
- "console_error_panic_hook",
- "futures 0.3.16",
- "futures-timer 3.0.2",
- "getrandom 0.2.3",
- "js-sys",
- "kvdb-memorydb",
- "libp2p-wasm-ext",
- "log 0.4.14",
- "rand 0.7.3",
- "sc-chain-spec",
- "sc-informant",
- "sc-network",
- "sc-service",
- "sc-tracing",
- "sp-database",
- "wasm-bindgen",
- "wasm-bindgen-futures",
-]
-
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
@@ -10944,8 +10867,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9"
 dependencies = [
  "cfg-if 1.0.0",
- "serde",
- "serde_json",
  "wasm-bindgen-macro",
 ]
 
@@ -11005,30 +10926,6 @@ version = "0.2.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489"
 
-[[package]]
-name = "wasm-bindgen-test"
-version = "0.3.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0d4da138503a4cf86801b94d95781ee3619faa8feca830569cc6b54997b8b5c"
-dependencies = [
- "console_error_panic_hook",
- "js-sys",
- "scoped-tls",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wasm-bindgen-test-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-test-macro"
-version = "0.3.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3199c33f06500c731d5544664c24d0c2b742b98debc6b1c6f0c6d6e8fb7c19b"
-dependencies = [
- "proc-macro2",
- "quote",
-]
-
 [[package]]
 name = "wasm-gc-api"
 version = "0.1.11"
diff --git a/Cargo.toml b/Cargo.toml
index fd4c66e5d4dd..6a1c26e95212 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,7 +6,6 @@ members = [
 	"bin/node-template/pallets/template",
 	"bin/node-template/runtime",
 	"bin/node/bench",
-	"bin/node/browser-testing",
 	"bin/node/cli",
 	"bin/node/test-runner-example",
 	"bin/node/executor",
@@ -192,7 +191,6 @@ members = [
 	"test-utils/runtime/transaction-pool",
 	"test-utils/test-runner",
 	"test-utils/test-crate",
-	"utils/browser",
 	"utils/build-script-utils",
 	"utils/fork-tree",
 	"utils/frame/benchmarking-cli",
diff --git a/bin/node/browser-testing/Cargo.toml b/bin/node/browser-testing/Cargo.toml
deleted file mode 100644
index 64c8f4740454..000000000000
--- a/bin/node/browser-testing/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-name = "node-browser-testing"
-version = "3.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-description = "Tests for the in-browser light client."
-edition = "2018"
-license = "Apache-2.0"
-
-[dependencies]
-jsonrpc-core = "18.0.0"
-serde = "1.0.126"
-serde_json = "1.0.48"
-wasm-bindgen = { version = "=0.2.73", features = ["serde-serialize"] }
-wasm-bindgen-futures = "0.4.18"
-wasm-bindgen-test = "0.3.18"
-
-node-cli = { path = "../cli", default-features = false, features = [
-    "browser",
-], version = "3.0.0-dev" }
-
-# This is a HACK to make browser tests pass.
-# enables [`instant/wasm_bindgen`]
-parking_lot = { version = "0.11.1", features = ["wasm-bindgen"] }
diff --git a/bin/node/browser-testing/src/lib.rs b/bin/node/browser-testing/src/lib.rs
deleted file mode 100644
index 35804bef2168..000000000000
--- a/bin/node/browser-testing/src/lib.rs
+++ /dev/null
@@ -1,67 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! # Running
-//! Running this test can be done with
-//! ```text
-//! wasm-pack test --firefox --release --headless bin/node/browser-testing
-//! ```
-//! or (without `wasm-pack`)
-//! ```text
-//! CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUNNER=wasm-bindgen-test-runner WASM_BINDGEN_TEST_TIMEOUT=60 cargo test --target wasm32-unknown-unknown
-//! ```
-//! For debug infomation, such as the informant, run without the `--headless`
-//! flag and open a browser to the url that `wasm-pack test` outputs.
-//! For more infomation see <https://rustwasm.github.io/docs/wasm-pack/>.
-
-use jsonrpc_core::types::{Id, MethodCall, Params, Success, Version};
-use serde::de::DeserializeOwned;
-use wasm_bindgen::JsValue;
-use wasm_bindgen_futures::JsFuture;
-use wasm_bindgen_test::{wasm_bindgen_test, wasm_bindgen_test_configure};
-
-wasm_bindgen_test_configure!(run_in_browser);
-
-fn rpc_call(method: &str) -> String {
-	serde_json::to_string(&MethodCall {
-		jsonrpc: Some(Version::V2),
-		method: method.into(),
-		params: Params::None,
-		id: Id::Num(1),
-	})
-	.unwrap()
-}
-
-fn deserialize_rpc_result<T: DeserializeOwned>(js_value: JsValue) -> T {
-	let string = js_value.as_string().unwrap();
-	let value = serde_json::from_str::<Success>(&string).unwrap().result;
-	// We need to convert a `Value::Object` into a proper type.
-	let value_string = serde_json::to_string(&value).unwrap();
-	serde_json::from_str(&value_string).unwrap()
-}
-
-#[wasm_bindgen_test]
-async fn runs() {
-	let mut client = node_cli::start_client(None, "info".into()).unwrap();
-
-	// Check that the node handles rpc calls.
-	// TODO: Re-add the code that checks if the node is syncing.
-	let chain_name: String = deserialize_rpc_result(
-		JsFuture::from(client.rpc_send(&rpc_call("system_chain"))).await.unwrap(),
-	);
-	assert_eq!(chain_name, "Development");
-}
diff --git a/bin/node/browser-testing/webdriver.json b/bin/node/browser-testing/webdriver.json
deleted file mode 100644
index 417ac35a7bcc..000000000000
--- a/bin/node/browser-testing/webdriver.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "goog:chromeOptions": {
-    "args": [
-      "--whitelisted-ips=127.0.0.1"
-    ]
-  }
-}
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index ae5fd11c9132..b595aa4b034d 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -92,12 +92,6 @@ frame-benchmarking-cli = { version = "4.0.0-dev", optional = true, path = "../..
 node-inspect = { version = "0.9.0-dev", optional = true, path = "../inspect" }
 try-runtime-cli = { version = "0.10.0-dev", optional = true, path = "../../../utils/frame/try-runtime/cli" }
 
-# WASM-specific dependencies
-wasm-bindgen = { version = "0.2.73", optional = true }
-wasm-bindgen-futures = { version = "0.4.18", optional = true }
-browser-utils = { package = "substrate-browser-utils", path = "../../../utils/browser", optional = true, version = "0.10.0-dev"}
-libp2p-wasm-ext = { version = "0.29", features = ["websocket"], optional = true }
-
 [target.'cfg(target_arch="x86_64")'.dependencies]
 node-executor = { version = "3.0.0-dev", path = "../executor", features = [
 	"wasmtime",
@@ -143,13 +137,7 @@ path = "../../../client/cli"
 optional = true
 
 [features]
-default = ["cli"]
-browser = [
-	"browser-utils",
-	"wasm-bindgen",
-	"wasm-bindgen-futures",
-	"libp2p-wasm-ext",
-]
+default = [ "cli" ]
 cli = [
 	"node-executor/wasmi-errno",
 	"node-inspect",
diff --git a/bin/node/cli/browser-demo/.gitignore b/bin/node/cli/browser-demo/.gitignore
deleted file mode 100644
index 0c6117d9fb83..000000000000
--- a/bin/node/cli/browser-demo/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-pkg
\ No newline at end of file
diff --git a/bin/node/cli/browser-demo/README.md b/bin/node/cli/browser-demo/README.md
deleted file mode 100644
index a11b250ba1f1..000000000000
--- a/bin/node/cli/browser-demo/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# How to run this demo
-
-```sh
-# If necessary, install wasm-bindgen
-# The version must match that used when building the browser demo.
-cargo install --version 0.2.67 wasm-bindgen-cli
-
-# Run the build script
-./build.sh
-```
diff --git a/bin/node/cli/browser-demo/build.sh b/bin/node/cli/browser-demo/build.sh
deleted file mode 100755
index 8840106daeb5..000000000000
--- a/bin/node/cli/browser-demo/build.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env sh
-set -e -x
-cargo +nightly build --release -p node-cli --target wasm32-unknown-unknown --no-default-features --features browser -Z features=itarget
-wasm-bindgen ../../../../target/wasm32-unknown-unknown/release/node_cli.wasm --out-dir pkg --target web
-python -m http.server 8000
diff --git a/bin/node/cli/browser-demo/favicon.png b/bin/node/cli/browser-demo/favicon.png
deleted file mode 100644
index 8a4548ce34dfa220f612080820cfde778a39cb8f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10338
zcmYLP1yoaS+(wZQfk{a_5mcmyv>+u2qR5bj(d7VXk&w|jQbIxLPKhB5DS^?QA~Be>
zGziGpzKj3wJKu9I=j@F4zQ5;ve)Zn>E>cVL2@Mq+6$uFmjk?-nZ4#18f){_3q`)_D
zIm|2x$>n3MXF4jp|8W2QeLg-uetv!d0RcflK_MX_VPRnr5fKOg(F;6y@IXvVOdNoO
zxP*j+q@<*jl$1088EF|AnTHP_$^wwPz@tZx<mKfR04QESNl8grS@|&ll?$k<sy=!0
zL=Awtn!39B)2B~006cs4?D@0j&!1~*YQ6xVrKJVcf<mF%+S)Gx=;-L^>gej~>gnm}
z128Z!Ff=eUG&BNWY;0^|YyvZZ!C<BU%*@Qp&CD&#Ei5c70a#gCSzB4#Sla-wwY9ag
zv$MCex3_-<01k&cI5;>uI668y0eJoTwX?Ici?fT1iz@&(H#c`TcMo?D0G^(nZ{ED|
zdgJxh>n#9pZ*LzTA739|KVLrp@7}%h_xDHmBLWbJfPjF&z`&rOpx~h3kl^5ukdV;O
z(6G?3@UZZR@bHL;h{(vusK}`3sAyz#G!lu7iHV7giH(bmjf;zmkB?7CNJvabe4m*3
z{{8!;q@?8J<do!;)RdIe)YK0jK79P}G3{eodRkg~ditkNpFV&3obmZ{W=2M4W@c7a
zR(4i)PIh)~PEKxaZeCtqeqMe-etuy=L1AHGQBhHGQBg^8acN0OX=!O$X<2z$Sw(qy
zWkp40W#yO3FI8W@R998iR9Dy3)YR70qH1gFP^h}Py02fq)_?ulP+yO3Xh5UUjg5`p
z8XKFweQR!NYHn_BX=!O~X=!V1{odC0{rmU!@83Jx+dDftFrA$k45kZ%>F(<4>F)0B
z>FMq5?d$FB@9P`r?;ji(7#tiN8XO!R8X6fM9vvAO9UU1P9UUJVn;0LToR|QvsmaOd
zsi_~+(=$JQ0N2l%nc1H|=VoW;=jMQGVSXOFu&{{5E-qr178h|#OTTcq<zK&+mw&A+
zFR!kwtgWuDudM;s#`^l^#>Vf>&8^?Rx3{)-wzqe8cJ_96_xJV=_64TdJb+BN<e{zk
zl0;!;+Lnam4y*cOMV+@ZTc5qnbvu7xn$*=US2qMO=3Oz&3&`UuDhlX~;-%t?vUh-P
z2J!p9_B4Zc=IfR^2@2}YDljTC($OWWC@ZL3p;KghTqU5Z7a89VUikR2roTb@;L(n>
zWTYh5ft@eU`+KYNcD5M{XM?7``7t`@lo-?TqSWw8gC-HkVTpdIuznK{@L`HO%;X5(
z5npN=E#+pjd4(c{(Js@-utc}8IBqBXov{8J_{6U^N!lLFkfj7X+1Fy7)$nv6ImVJx
z?szijH$G>mSslenblh}AbvmYNFFMuu+U?xF-Dm5u5_I5R<JFT4J6MMt1m6AeO=+N@
z=lAhY>O<ROpGUq0iC&&P0gemj)&tMTlaReuvXk4}5=U^)52CgRj1|p}5Wk$?3;oi)
z^9RyrtDhDZ%FdhyZxYn|IiWr`RvVNT1RK3}<j#FJi+*@9ir#dPuCsi4CU<V!eDnYZ
zvX)Ij%uVK>AA7tIsQ2E6d|K5sIz3<ZE|xPXA7jR6)C{cSeNGqt{1}@up0mT}-^W!I
zfVTWg&oY{2=2pR#9xE&>o$M{LPA|;*R$&mtt<?rA=B@hszO>|s+o)K?&I~!SYvz&J
zUjGn_sjC7^uk`#E;;Xr=-rLo|&?ll9?E9Uu(VJyPzH$BsT7&NGlLW6TR_SA&1=Hth
zH8Lf7gWmae?sYz$?uc)d5dX5%++|DERP^5_&yI&);?}a0md`rJgIP==`wy$!v|#5c
z&PU@1@^-S5*fhaDO><eVS^BE2zj&FANHWBSsqll@$UaH4&gm7#=k!c3YRgLbBe?QY
zUFxJi7bLr%gsUDWMJA>_Vkv{5(3*Cv`tK>c25fgh(yJ8=3!h%%D1ycF^bWcTT#@|8
z-)Tz2MKd0Ldz^G$1?7bGt;T#B60MjA<6Zc1=3kZ>m@KuSu(?x?<82xa9Q;AErED;w
zyTu~iV6?Jgn<3iNnpJ<%N#3t@5v+M?f_LV56HWV`prv&-4)+-PDS%@`+qRQYcl{Ps
zPLiMDcr<xJ0EfQKsVh!)-@csU$|>s09FDO6)BPG!!%ryYCh&LY+fCHHupIijy~r}<
zAD8;VY8TXy>PTNoj$4g2;qB1WLnb|kqx|;CVqKSEP2Q)G$ko3>H-0*IEU1)c(kVTY
z`r_lC4}Zx|4D&L?cz&-I%w?enme1tvsMmYz?s-7Vb%XOItVPGO*z@VS+Mq;X`?wn|
zad@{v6gqQF-fJdR$r1nVXvA$IS1)yn1(RRqAOx(Jm4L$Tg60<JEt&aMd+(ys<V2hJ
zaaEt_He1**Z?}iNgWBbP9~`@J6?kdp!;_5~Qv1RE-rL=w0yy~I4pkc#ye~vFjbI{u
zSv-@kx8Pl-;<0JRmtn`EPe2)yg(KElbRx>jSnj8f!zB|eOnT8bIQ!mi=P?1()@I&*
zOct9!6~1Ek-iT($r;vHIVNB2YTZDzl=fddy7Au0q&WMdte>-IKOJ&DuaJ6drr^Raq
zSkvRL2AGLM;l?Wf|I;lQu4W8Gd(Xsf;xFzUnPJXkc8#igt6Ue_6d<v!!hS(Qm+vua
zY{DNfj->$Gp(dWA7hNTcvXf2m>OAJxw3PMweY<TDY!u@z_JPtWk36?dYN*OGFHMV|
zIOAoAH6`X7SK9cE-IP*{u-k1jZv)p|t77R=yC>vTYuO3RHmQD4iG7xTo<v1U)Oy>c
z3Cu-aNpHyzn;@g<UdvaRCOX5XReDg0SPk%v^=#@}1aoXI?Sf!-!1&=`fv{MEn$jYq
zgcT}{U_(wZ+jqM4)eK}OWxK}#%)~=z#e&_0r?K{(Q3-IR^4aL80Hw-NQCi}yatAmC
z{^b+G3zw7dd9aibK$;D@Io%-XenTYI^SSjdXcR4lnQ)H0{?i3H{#W`5|DK6%%7|@_
z-p{Kq+zXZrrk0wKs{k1m{Sh9(7M1gP+Xz*cT7!75-Xdp>G&aKumM(=??$YPP&43==
z-J_r-ig=)MnPL;r{pNy1Q9Xz0%e3{Y2F%xH-%oamRD5!8rnBUXO`!d_WglwA^O5T+
z<Xy{#Ug^oe87nrUwnCBxA6zRG>&j`m<mm2#tlh!6r62G`C0K|3Lh1&Wp3cD`wofTA
zRt?-OXLv@8d#tA`Qez23P2k!o8Hgp9Qr)OAfOkeFh-#O%6&)Kqtnk;Ub3LJW1;e?@
zm3Dxo@a<RoIA~muJP&x<q7p=3ZgwP=O8@+nqb}g`!U)JmmRjwI9T%j>uuj83ASAIr
z{u6YDe`V*Ue!1pL@T%W^nMvKz_j{kLU>t<(K59S_wuR%|+)Ky=w?R{W)Ke{0_7~-M
zLH)me*SifGe%&^~=+JsUaXF!|fqg(|odmZ+Mzas{^dfuhaYf0#iuWD5Jm0Fbh9lx9
z#mgB8#i@?gtf?JfKm)*VLK#vb%&2K~7E`kJE+>d|Tm2#?M$vURmUX)q*MP{t&Xn&r
z<k{3ZqGn`|IST25tza6lR<eNF;RvnC(3nze0q3B*lqy@j5<K}EGNo8=vE1DtCYrn)
z|C+~&kD^I{4}%R>w1H9M5-+%EudZwJvv6;{>k8<A7dvle=QF##$%NUuw8{Zv2#SVN
zU#IKQO?RaJ@e8!%N#>eM))9n`ZpMEExv?=zPj-?VCwczU+eS)tX4Tm(o%A$(cELHx
zsEws~$`57#yey??x~Evu^$pC7+T#DIYAk{-XL57Ys6~-j<&k3Uw=;g_(T`qMe|N)q
z^<vQ(&e4+kqi7b)ojr=ce{sXX%`{sNle3FUFn~u2+9_=={jSgZ&-Mb2rPw|Ss9K`R
zZsbTHc6ioUB6Dw43wNQP#+mz3a{ebI3%-5+xVPzMY{H-sw|D?#RCr#?Xr$1U8Wr$v
z`P2E)*HuWJ^qg(v+{MzFSHMZ0R{^6#32gWXO<WogWfDnd$x}2rV<Fv&?gccd6^cTv
z9XnRlRnP#%OAQ~`CU1|wgi+%ISUh&gG79ZROFa~N1xs>eYFhI<AvCm9S8z(Hj!u$U
z<;jN1V_Aw9x}Nf5UYV#~{b&Wt<QRH8SS8e3uOrF@4P6IjwBP&=84XyzD2%?)bC=0i
zCU@a9CVO(>2;MZnlQV^h2kD;Q!3$Uxbwg&Lv^1C0Nw0}jjDU~KqV!eMP09zyfP}3E
zraWBw0p|5R>3jwRuo!{F3UK6Apt<N=gzk=DdGuJlnh~>&N%?H2yU3flg)4^4zrb!o
zX2L-FSnL#odt_oX3iP&5={w%q;5NosK@TTYSW_>58GZ5!G=l~T$=SQp9ejW$&WP}Y
zm~WXhg3;9&>R>%yY63ExdFBU^$YrKC86_o<dP3S>e?cG*zxlOz)iQYm^Rn-AB%8yG
z)n*Q|^sKDch)zS&1~y$!#YhPF=XO@^P8k+tZVEYMwrZEx9uTuw=KZ0C8T!@ccZ_FP
z2N+1+-OY{FDoq@HNxof9m(TFz><`am223(g%ac*nnbQAs<l5oQR48;ExH(_$e`{4t
zDBH;AF7<+2dGr$4zp1QRufyWh;*J1r^n?_dpaT>iVe&%liM*7D405LHBwm2obNuo@
zc22Mm*Y(QtZ~PORR8~AO@)28+PyZUimthUkC!LSToCY{Ib7CBHY^r{1NIJnDBgfY=
zx`L-X`^0al!b|tU>+#AQsD99(EkLuXBI@3{gn#n*?Lm$tPddz<vmeNptn@ezp^071
zrU6CBX#7uxQqTCkwuIFy_ETi1;bN$W_WfWx5?rD}Dof!W1q*k>1!45S(+tbCk86;|
z@OONiC{M^q_!px;8SiJ%lsIjL)a!lCOdN#8)Pv!~LHUS2o`b#ATsv*MAj{F7J7t_x
z&6R9MKR|sbPdZ5AW%ReI1I;fe`@PElTKSn!dr1FhP}P>3IyHo5r(P)x>hDT>5!9de
z8@Obmfb3Y%1H#H5H7*`VJ&`sXCd1H?{%tLJviJS{&D%(g%P>L!BoPBPN9u?f5`F)$
zL>5klKWQ&6f=$^p42$q#W*s(;{<cY6jIHUOe@o-&F4J@u=rOtSuiEo8aZ+%nTem2m
zTdu7KRIK!(IdD{nz8(L1LqIS{V&CmED~{8b=>+do^IZ_(st_x;1?tWDkLCeab!u^2
z&)mX;Mj{%M+&n+?*7Y^o6N*_D!g#}rsnu^%2eI@#Y$Jov>ujPlUHIUkS6L#snNKjf
z-hxDE<`=*n%hlb_P_d?YsUEjf_jduUZQ?EM>6LfTB(d4uazpil5mKcerzO4!-Bxuo
z{Iy#@^~WRqDv+(e7S@DRT#!iyf~g%^xL4@XhTF%~IPF&5ztUL;^Y>eBA^BH-SMn3X
zCz%Wvw;lr95h-09=#%J79=w4kjO|*h$FD#)HlmAB2kXI%WT5M-8`84B`9*<HI|@L!
z>`~aV?^(keUP2oy7TRE`)8|@aMN@)<h9NDNX=4f<`KxbIAp-Eh;qnoZZ=E{c7v-x{
z%Y7c{@JL%2g>Ip5pHk3p6~-V?0sQ6<II9EY&WJCgNlwCNHRkduOWE#!G!lx;#`IB)
zga<WBFaRyO=dkLC$QHolva9`5&)PfpaD{3QBt*DnFrn5n4g`hVXS1>JAb3BjF<&S{
zjXjelPp=iD;bfff3a{wc%yzS5?=(E*Kf3&p>$T~><n&zc7|j>P)iPx?T&6XJ|BNaN
zezd57S8i|oKMI_|?J4_+-x^>lG_I+A4Y6Mk;VkTajIHiow16duH<<BXI|&CKn(Dhq
zRx$j@sO%IC%c4D62q&mBzMDD=;?qx;(7y1IjUS86uPg61!C%@3C|?goM3kpUGKq6;
z=y`emEwv*}OLN#v^V!u+=hw*5l<Q{_@h^t0k?etP65{h>r1S+d5iSMp8kekul)g>V
zo^;v@D^e{x&wm&mF}QSwa{`DT)m-@7Y*k3*pB$p66u{J=PV-@wUSU6+w#uKk25lKZ
z#$p};C*kk)f!$qvW}p!nIdS)qI45(b3ppG<znJU+JUOtzkAjbQ+d^q20^mH%2tW<o
zh*e^#%`S+CaQzb@g_v9bsrAff)sIk*WSdN#38lSG96sba?nqt%yA7U6oHl%GlaD_M
z4!7)nJ|)cJUuDaC>Rl;T_H3w`IBez<faq>|%PmzqjEfk3rj5j&9qU?7EoZZQVed@X
zk!v1)ZBkMU9XF8wzOUVQLi!8**Dr)t@NoO6n6JmL!;K0-sfk#B%{Z?&12<`4c8nS>
znf<HX$V$Himc?J%1(8WQRVIcYJHYsch$vTzte1+(j2_En0c3eTGY%JehI(yZ3BR$e
zILmCREyBZqQp2|?Lq0(=^B{QcR+_qu6*QCa_%xHN*2LS|dFvdRJPU`m?9iLAg+uM4
z@U#L^EeB1IrI1k6rJAYNH*MjS>*9K?C+YmFUKf$xF1)IgryKk3=0S5-F`TDtl5ImK
z7JHbwt(v{*O{P1hA!B(*-viWjorqlo1t8)juWcx%jwqpC3tRWAMD&aoXiOcH^i2Dt
zwNL2TcP<+-FM-)iYREW@)?8=lcSPuuMr`Bby?Mj(ApR<H(}-eu)^tym@?T!ldIuSv
zTm%cO9S{SIO~1Uy4Ln3Xn3VrBy;#L^1!+Ow`e@AEckxT*ZLg@;(93+eo_iD>@+T*x
zxk!mBqt68gyA-e?{%};G_u<tLlLRK!&q`$~nEce+pzR=t_S5$tfPL-*lq@6ZA_$$K
ze;x}c<qa(~j+QOBw-IuURsZRn043n3we`=PRp_d_FZ;0IwH(uyw82Loc|9K0-h3#r
zbg1*JfFUYZo)KsO0r%wI`((pVc`S=#W@z@%A<JnCWUy(hOfm?8u`cu`^!V|$f=P&2
z94KfaM*O3Z)7{-&ib^K35oFN&lcJ$_pT-M!>%iAXOTu1QR{t}o47o+X*5$aA^+~Xj
zdE|rod<0~m$f%wn6H;2i*_wJu*|;dr7#~^GWkTS#>OWQJxQkPM%}cbYm-^OIOa>tA
z2@$K`ojV#;<zkI45fvoGj}57PpF1;>K`ruc`3!y)*lrJ}I`h_`OGE7LQ9L4EHxmSP
zlAHuDL<OzAx~V?he}3mn1v4fw>G}M`w)U@=X^6GW&z+rE@KOm7;gpEoQ;H?c<02}H
zO`rZ6p;sp1%?|hK$^H0%7SqW5O_EiI+a^b^RepGmSN2A55JV{IHmTEQ)l21==wD7=
z$zjy?I$<HF6kr4iUis|V_y+a>bm+tZ5S=)Tt=1}hv&o0(7>d8$J?8pX+ob=(xmYl|
zMNX)}=w{TVU5a2t)?T;=s%#T7g#M1vjfDIAboiJ=B#A!i5+mN?Z)Uj2aj_Uc8A=4D
zt_t17I6ij$1rf+j8VCzE`g?Pa-kY(I4;Z+dNf>=TKuQP<gDB}j>5^FpYsz9mPb)F4
z_~1Bs62juii;}xs+|D@46N&)&Jg1!862Ea5E1pu<Q2uuzC-Ey_&HZ@NG=x2|y69iJ
zUM5_^g4Wa5-1=@$MJN2mFb#5EA`YK=?ySnG(ot;KD$3pLek_P)?`$JjlOXA;B4cM1
zPMMnC;AB>m4~BzQz<zkeZ|Zv>dc^Lef4g?iL{54d1)ekjGW%G=kBN{{>7f(A@AESh
zws(It?_Z?=@)bg_7yUbeX&01L*zh%S-usEgU#i<WhB5p;>~k<oCD*|a{VRgvoIrO(
zLY9&BF-2UbLaOUYy8VyQZ=)MxQaT+>P1397xT$#5yLkk$JGVZoiYX#N6wTjDe0+<=
zDqK1>Vw-h4P`qMIu3F~{|F+*ng?dDY*Sl|+4=2Nu+N&-)<us|4?haOWQ-MuJe%|F9
ztn<Vk?^3j0I1ia1s>P25E37wk$$vOe{uxO(KH{M>V*J+k@h7LVHO8S(6?VA$k-hW-
z)!xT~|B=Hhvk|a}#j5n$U({yCr>@4Ae_B2x<D1c9zXnEJ|F+qkILEYn03yNE|MvZ9
za@h{#YNS^wCA(zbr@HwsUH}~(n_|60KK!cS%|wt4@P0F891&0*3-_vNY}9=XQy-SO
z=N}d&F%BdEIWgV@XiOxju2@q>!rfL`X5@+WS%4KUXSJV)%=3e23ErjF&4oT3II(28
zilyjGnL7?~tI|W>`%W&u4I{!zIouE5W?GxweB~Wp(eHt*s)f!)dR}T}DKljpTx+<)
z*8|b#>7>(TtDBnW0?NVg16~z$qs6BM`AHb`5s}0v?SU`!14Mf!Xv}y^Rqy3b)2aD+
z)ASYatg4RdN%$2w=Q-Ckg!ysKF29e)?L-dL``(sEIcYP0&~>as#g9eVp}>}48t_H?
z1MA~(zc_?~`yQW9W$(37GApS@k4#z-SnEFe?+K}W2b);VjK{0jC28YSCln-BF22zE
zgp_nH@ox_;AJpDm;)eUe<o@%oIYy1{o@<v~UdoVsK%Z276EC0s;oo9jamV#|v&yg0
zzraY`t0+V_XVs(NkbXPJ@aJt{DMo2e^bdV#D9YOZTo{~-n230!Mo^p=0P1*aeZkGg
zaF=!BTLBDo=ZT%#r2#r|$I8+;`2f{2#j?6BRm=3TzaNp>)c;%tSj0!oQ{t%9vY!I8
z`CQb2pzf4kV5-;i&^uRI>yg1fqc7_o{>AFQovw&o7nyMGc)AB7r&ZVo6_!^335fw~
z)5sAnp~Q~)e9Bq1=a+4uOkN}NOE{1Y_vCfB(mrr17t~cHfchXpzM(R5?&M_hhx&e$
zOWirE+dma9VRZi7yDTljKL29#gNfiUG6=A!fB43ylW@muFEb^%Ji1Mu#rR$n0vLjj
z5INmooLwK>QVHbuNq<xyZK4peChY{vqARVbqGW?6;FXCl@L=T>pjX<j;L%P%P<Ayk
zHBCml#(a0&-0gWbgkDoED;`(p57I0PQAcIcfBWvi>ZB^^0P%%h0S3~~_(vPgJvfwE
zI-C$7aJ6Fkz}$mN)cCf+X4{GzHOyqWIbY9zQQD+@V%=-m_OJiw3<FlGrGB|np5-K1
zVd~T->%yCjQZ6daxDmQi@*}hl#aTA3`tqL~8eA}EQe!+`xl-GoeeW0C)fbu<YXEfk
zI>dU=5#2R`V^2@^57+drNm*UV*Rj5*M~cACs;27*+6qTy<xKhHo<X4JqR1(6-fjts
zIbs{{SndhMfoWyj-!J|<JaAwIB78pFe<}5SV2uM&%E<7i3hD%lUFM(xc^>_~E*30|
zqbTPqbez?^W0S3vjf+?K?rC_%0~MfS7aPr*G8R|-P5xqrWFPNTU15d_-yakO3Xz8;
z%`U|aV!Rf>f~tiz^c^46G2zH_iwVV1YNBFOYngvSL5lb?pP@x|!Qe#C_6g*+vCXup
z{unxfs)<~YUoR1{%b#$9SH6q_HYv#y(cg{l{xF6<u2!j=68};$XMMC9*=I5KR66Qz
zBrwVk^`VJZmMzz^%&E(!wz=(_nmLSJ_%)lZ;qPj0U^X;^Lx6n5G41pG67~N$kp)_s
z&}UEFI}h~S@;5-MSWo=5$yU{2B*wdInhP)zUAphE76ZkszfnpJZ^78O;9w5(A5rb_
zUX;qEW9pH=^4S2;X`!p{fqFNP65pasfmT#%;|n9*6pbl$`x<i!#ug+OUneN+fi@O~
z6#nxEa~4Z3-(JH=?zE*z!e<lndwRH=6>*V9c?>Bw9zsLERp?6A?sNrcRlYr&fNT{!
z215#S8n2At+q1AYfm4`W(Yy}$mh~d&6;son5iXBEuMsdg(eI<mc;v)vL9!dmu?rNh
ztQC=Ds6_5_5t>;{p-@$g<_c4!wPeMcg|MGg+Mf+#He`bkB0J<j&wI=K#9GBU#MqvY
z%`qy&r^=UZE-54r0vfI1X~TxjnY(`&&z$9BH`E6&*H%5oCxYXFlh3y|;l55D&v!Ib
z&QQwU0qpnoWvUYK%JEzYHnm!UZ|`q+ebZwUB4Yck8Bft0X{IG8QyHq~<MFJkc8tX9
z8!L*PYFdIW%w5;Eby{QlmcirCRH2onK2AllrG|I<=Sxz4&{#ZblmFla8G&d6XGV4=
zyL`0AN?vmBp>K?yOdM)^>*-wWlKS~ZY^}CxTk=m+XrO$n#1d=KGAr}9DCGkX;n~cL
zDF<xqVJZJ0sZy6jJ2zN-dokxEe7Hd#ttv-~G9g?t?OfakRc3!&n+ii4ij*Aoj~evw
zbX_HI*>_M`<srxS)1cq3R4loiQphqK&1iY+wHH-m)?9wHf;+T>q}N)K*tu=;Ql^lX
zO*^w2q1caWX{NV__76zh{g^m~!e8g0&Hz?ehw%qmeXyNd__k&6?lVBMAa0kN*EhiI
zpV!hPN9g_O#4Ler5x`s`H_I5B=SR3S__#%4d>}|w-d=}`106ZJ&79qO^#Bw(aY5(@
zlYQ2IgyOv?m+6l9M;z1+ZVL4ZQ{w|W<#}}aj4w=WsRr8RIQaDVnCA9D43tHkbL3k4
z;|=i2qNv#;+V5c53oBEHLZqzPM6q$q<%%>|)YTSBwyOQpa2~k#0B^=$*6Ecsd)A@H
zooc@Zf(Cih68~7LNXlQGd#rI1Y6$OK0WXy<i|3N)yS|;{-F>Eme7s_~KB=N(@`=eq
zzYzbu6%3r{x=!p*KBPpr{HM<RSH&<!gQ*#dQCa~e=Kgg1VAV36ol2eU(_@>0l*ai}
zIxOfWkwl%ElRH83T3A`>vmc#b!nyf{lq5%H&TrdyJUsw4Ee!D-Tup-xPcGXTedy4F
z(0kWp`JG`F|4X#LfZ|&C;M-!NT73?xfx8r6*~#ugJdlTu4!Z`BzWNW6BWx$6o$~do
zE<F=&rxYRb^>|WX!1JB6Cv9LquJ(T;m`4)zM|_~#mMGJ9-mtW|6|hKTHr%Hto$LtM
zWBQKu>YUsZ`Yw!&wpS-`McjX&(H-FFJ;&>Ek4jfnW5uw-w*itk2b|cF0lDaJfdw%V
z%~i3H6ElH(7ksuKS7q|$zRM?_HS1w{H8Jq#?ox&4Y2=MXW{gTLqX%|^YkkjN8)Xzn
zdJ^0v->S)oF7P@fISIWJ?elf+!@{~xNlvO4L%A!RV2^yrFsCmz0~(dRlIx0$vj7N;
zY0L{0g(DNz(#hH{%tN{<Zvr755(*9UEr0`0w)G65%{NlfhQo3%QXr##ttk(jbHsNk
zq7anF7I#RG`^QHyDsOUz8MMWltmP`-Tw~>iy6R1%)mkXY;{KG{pFb-5)GEh-GQkB&
zx&jfu4{V*Sq0T>=vO*@m0HP=z#a<y^NB3VL-v$(RrH<+tR^9_WbPm6l#HX5ud}>cB
z8oz&y6p;m_qRm}oBbdH4zY!Y$nYY$k?%Jj|%D9^)ve{6?8kS`Cp^ZCRvA%=!Vy00%
zDZv3S2Rs|n7>;YC9E6oe??-Fxs<EgR`BDC73wgR*3Am{|b%|UVqn3p-?M73!P>!60
zScE(sGsk9_2m<O?3#B5|T0#UZi&!GR8H)IUn3tK!FDmq6^%KT=yPU}^u+}{)Ij&B5
z1-xRHnpqHa&le!Ol-hD(!7l28)UyxHc<NZ=h-_%iPAY24?wt88$v}FecEFT~P|h71
zZk-AmK*g42<7^7R?@b{CF2bzba?kD5?lwF*y$H`RsCC`tfIwfS9fsVnCGhXmFJwRE
zSh)pB92+byR-H;t51a^Ug@s%`X47(T?vxi%p#JBCG*2L!Ode~nhAo6AGuP|47@;{s
zQNN{Gs*9LwC$AYY|BIkJi^H@R%q~;)Mp1~YryFv|iT`qBM2X|%pLJJ-BJn>j%jxlN
zbW2lKz;~6dD|f0L0x90?TAa@#HIO}^k+wCg*c>U3ZEgBHF)H3feO>v+(QSO2S~u^1
zYs8J~A}?>J>1gbM*!O6fstcv<%L_3U)Gj*$xuF6UEZJ{DL|iH_p%{q@D~3M2gg`)O
zN3$d|mW$L20ge~zrvi)yn1~9?K(440E-ixG4nGO=1(=1%MEs=To>gTc-xklF3>>Oq
zgB}t{aG>7ijI!&(v|Q)k>myRckXq5Ez!c;6s)l%{Bb1KB5EbJ1LTlEou5<0qe^zW*
z2y(S2+u@mxs|;JFiHI!c8{@bn-M_YNmm4owka3EM0Vm4!z`IxFsV}<}tlY`O<oS&-
zKKrdOy4S`a(qjQ_jXz?A&Nn>fmJ-}<4~#C%tg;VaDcg5<vX>9pyYHfOUbyeuwzW2E
zg;`@kNfyAW`lD>(0L{&@pyFn5ZaUdH?UF*U%iPiT+>#CbVt<siJQX?NmK9Hk{9DeB
z5#8Esw8Oabt@QE4bKc%AAlUXmkX?#i5hc&5q6Gzs;{20v>CU(5xM}8kLy>Xw5G?q+
z=hO$LJ~osa53#is%tIu3edF+91j7VN?>*qAOxmKQg(9{Ictd=sJTJjQv@%#~2@L$>
za1La6{QAgPc2VKmK*MVX4t$^}Qfp59-LdlIj$clfI{(N(P}{q0G2-=R%^NkAs2Amf
zl~#C*TE*=jG~6a$&lk?M9!@0UNjt#QZgC?2d+U~t#*9ADb3~CYbK<t0@JypF|B!!#
z-cM<>zcXO<k{{PZ0VH?Bb$q!;jXaP?kV+7L?yDETo%<k4gb2MTu$uwo6x%9JhD-k;
zdwqktSY;Q)1-x8}ns|hYT2;a;#;jPaI}{ISxPE-@3;%4ChyV^l<~Nb}*9=%N-q-#I
z@NK#g*}*MB7RFVhZf+QO_E9<^t$FpL-1qCgrn#eMv}vN`wHpk0WlDs(<W}*~Sx3ak
zT85}+K8)X&bL-;@4H{n{=lP=ill#;=ciQvKW0A@yabvZGgT)gyR}u(|*T(PFmG}Ix
zNi`D8EK`uYX6hvIEbd2bp=NP1qP_0U`Pvh_hAV^kR<Q;gcuDXb96<-am67%8#T>M>
zkA2Oy&4tvpKWYL7{IsB&eO7?QB#NClnuE^Q+rE>oM^gZnhG&}tH=n_eU>w&F5r|jN
z&)S>4Rajd^21HicpWl%WGY?(S-W24olWU%oE}Le>3JaF#^CRUWn17ykjP<}#-(#X5
zZ6CjX!J9rILttow&%CTmd4RsEH<sap8s}XB#I->E>Gemslzw7k;P;)7p)oVksZ4oj
z6yqEBqrS+rd_4c)?~QA-%jKAfUd@KIRhb3jdR@(!=wy_c35+n#+jzHDU#~B@SG8(m
zIqHsHlTp=pNh*J=!I4`heW_`Mf#t*|lSZje!&0PfrM^J<22=3Ub9ueM)Z0O2WjVkv
PrbyIPG#^(enFsw3U`DIs

diff --git a/bin/node/cli/browser-demo/index.html b/bin/node/cli/browser-demo/index.html
deleted file mode 100644
index 4a706906ab10..000000000000
--- a/bin/node/cli/browser-demo/index.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-	<meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
-	<title>Substrate node</title>
-	<link rel="shortcut icon" href="/favicon.png" />
-	<script type="module">
-import { start_client, default as init } from './pkg/node_cli.js';
-
-function log(msg) {
-	document.getElementsByTagName('body')[0].innerHTML += msg + '\n';
-}
-
-async function start() {
-	log('Loading WASM');
-	await init('./pkg/node_cli_bg.wasm');
-	log('Fetching chain spec');
-	const chain_spec_response = await fetch("https://raw.githubusercontent.com/paritytech/substrate/master/bin/node/cli/res/flaming-fir.json");
-	const chain_spec_text = await chain_spec_response.text();
-
-	// Build our client.
-	let client = await start_client(chain_spec_text, 'info');
-	log('Client started');
-
-	client.rpcSubscribe('{"method":"chain_subscribeNewHead","params":[],"id":1,"jsonrpc":"2.0"}',
-		(r) => log("New chain head: " + r));
-
-	setInterval(() => {
-		client
-			.rpcSend('{"method":"system_localPeerId","params":[],"id":1,"jsonrpc":"2.0"}')
-			.then((r) => log("Local PeerId: " + r));
-	}, 20000);
-}
-
-start();
-	</script>
-  </head>
-  <body style="white-space: pre"></body>
-</html>
diff --git a/bin/node/cli/src/browser.rs b/bin/node/cli/src/browser.rs
deleted file mode 100644
index dee93180e70d..000000000000
--- a/bin/node/cli/src/browser.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-use crate::chain_spec::ChainSpec;
-use browser_utils::{browser_configuration, init_logging, set_console_error_panic_hook, Client};
-use log::info;
-use wasm_bindgen::prelude::*;
-
-/// Starts the client.
-#[wasm_bindgen]
-pub fn start_client(chain_spec: Option<String>, log_level: String) -> Result<Client, JsValue> {
-	start_inner(chain_spec, log_level).map_err(|err| JsValue::from_str(&err.to_string()))
-}
-
-fn start_inner(
-	chain_spec: Option<String>,
-	log_directives: String,
-) -> Result<Client, Box<dyn std::error::Error>> {
-	set_console_error_panic_hook();
-	init_logging(&log_directives)?;
-	let chain_spec = match chain_spec {
-		Some(chain_spec) => ChainSpec::from_json_bytes(chain_spec.as_bytes().to_vec())
-			.map_err(|e| format!("{:?}", e))?,
-		None => crate::chain_spec::development_config(),
-	};
-
-	let config = browser_configuration(chain_spec)?;
-
-	info!("Substrate browser node");
-	info!("✌️  version {}", config.impl_version);
-	info!("❤️  by Parity Technologies, 2017-2021");
-	info!("📋 Chain specification: {}", config.chain_spec.name());
-	info!("🏷 Node name: {}", config.network.node_name);
-	info!("👤 Role: {:?}", config.role);
-
-	// Create the service. This is the most heavy initialization step.
-	let (task_manager, rpc_handlers) = crate::service::new_light_base(config)
-		.map(|(components, rpc_handlers, _, _, _)| (components, rpc_handlers))
-		.map_err(|e| format!("{:?}", e))?;
-
-	Ok(browser_utils::start_client(task_manager, rpc_handlers))
-}
diff --git a/bin/node/cli/src/lib.rs b/bin/node/cli/src/lib.rs
index d29836c7499f..1a4c1b0eab8d 100644
--- a/bin/node/cli/src/lib.rs
+++ b/bin/node/cli/src/lib.rs
@@ -34,15 +34,11 @@ pub mod chain_spec;
 
 #[macro_use]
 mod service;
-#[cfg(feature = "browser")]
-mod browser;
 #[cfg(feature = "cli")]
 mod cli;
 #[cfg(feature = "cli")]
 mod command;
 
-#[cfg(feature = "browser")]
-pub use browser::*;
 #[cfg(feature = "cli")]
 pub use cli::*;
 #[cfg(feature = "cli")]
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index 938b7e67f3ce..bd3c92d9aa14 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -441,12 +441,7 @@ pub fn new_light_base(
 		.clone()
 		.filter(|x| !x.is_empty())
 		.map(|endpoints| -> Result<_, sc_telemetry::Error> {
-			#[cfg(feature = "browser")]
-			let transport = Some(sc_telemetry::ExtTransport::new(libp2p_wasm_ext::ffi::websocket_transport()));
-			#[cfg(not(feature = "browser"))]
-			let transport = None;
-
-			let worker = TelemetryWorker::with_transport(16, transport)?;
+			let worker = TelemetryWorker::new(16)?;
 			let telemetry = worker.handle().new_telemetry(endpoints);
 			Ok((worker, telemetry))
 		})
diff --git a/client/cli/src/config.rs b/client/cli/src/config.rs
index d985dce75d47..bfc7c6eb7bac 100644
--- a/client/cli/src/config.rs
+++ b/client/cli/src/config.rs
@@ -27,10 +27,9 @@ use names::{Generator, Name};
 use sc_client_api::execution_extensions::ExecutionStrategies;
 use sc_service::{
 	config::{
-		BasePath, Configuration, DatabaseSource, ExtTransport, KeystoreConfig,
-		NetworkConfiguration, NodeKeyConfig, OffchainWorkerConfig, PrometheusConfig, PruningMode,
-		Role, RpcMethods, TaskExecutor, TelemetryEndpoints, TransactionPoolOptions,
-		WasmExecutionMethod,
+		BasePath, Configuration, DatabaseSource, KeystoreConfig, NetworkConfiguration,
+		NodeKeyConfig, OffchainWorkerConfig, PrometheusConfig, PruningMode, Role, RpcMethods,
+		TaskExecutor, TelemetryEndpoints, TransactionPoolOptions, WasmExecutionMethod,
 	},
 	ChainSpec, KeepBlocks, TracingReceiver, TransactionStorageMode,
 };
@@ -380,13 +379,6 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 		Ok(chain_spec.telemetry_endpoints().clone())
 	}
 
-	/// Get the telemetry external transport
-	///
-	/// By default this is `None`.
-	fn telemetry_external_transport(&self) -> Result<Option<ExtTransport>> {
-		Ok(None)
-	}
-
 	/// Get the default value for heap pages
 	///
 	/// By default this is `None`.
@@ -526,7 +518,6 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 			rpc_max_payload: self.rpc_max_payload()?,
 			prometheus_config: self.prometheus_config(DCV::prometheus_listen_port())?,
 			telemetry_endpoints,
-			telemetry_external_transport: self.telemetry_external_transport()?,
 			default_heap_pages: self.default_heap_pages()?,
 			offchain_worker: self.offchain_worker(&role)?,
 			force_authoring: self.force_authoring()?,
diff --git a/client/cli/src/params/network_params.rs b/client/cli/src/params/network_params.rs
index 676873cfab14..6eaf068fdaec 100644
--- a/client/cli/src/params/network_params.rs
+++ b/client/cli/src/params/network_params.rs
@@ -222,7 +222,6 @@ impl NetworkParams {
 			transport: TransportConfig::Normal {
 				enable_mdns: !is_dev && !self.no_mdns,
 				allow_private_ipv4,
-				wasm_external_transport: None,
 			},
 			max_parallel_downloads: self.max_parallel_downloads,
 			enable_dht_random_walk: !self.reserved_only,
diff --git a/client/consensus/common/Cargo.toml b/client/consensus/common/Cargo.toml
index eaf73bb19c12..7e47e157b98d 100644
--- a/client/consensus/common/Cargo.toml
+++ b/client/consensus/common/Cargo.toml
@@ -29,7 +29,6 @@ sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
 parking_lot = "0.11.1"
 serde = { version = "1.0", features = ["derive"] }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0" }
-wasm-timer = "0.2.5"
 async-trait = "0.1.42"
 
 [dev-dependencies]
diff --git a/client/consensus/common/src/import_queue.rs b/client/consensus/common/src/import_queue.rs
index 57d80cd41c64..5117a8fd202d 100644
--- a/client/consensus/common/src/import_queue.rs
+++ b/client/consensus/common/src/import_queue.rs
@@ -265,7 +265,7 @@ pub(crate) async fn import_single_block_metered<
 		r => return Ok(r), // Any other successful result means that the block is already imported.
 	}
 
-	let started = wasm_timer::Instant::now();
+	let started = std::time::Instant::now();
 
 	let mut import_block = BlockImportParams::new(block_origin, header);
 	import_block.body = block.body;
diff --git a/client/consensus/common/src/import_queue/basic_queue.rs b/client/consensus/common/src/import_queue/basic_queue.rs
index dbf779c074f2..a898e268fc3d 100644
--- a/client/consensus/common/src/import_queue/basic_queue.rs
+++ b/client/consensus/common/src/import_queue/basic_queue.rs
@@ -289,7 +289,7 @@ impl<B: BlockT> BlockImportWorker<B> {
 		number: NumberFor<B>,
 		justification: Justification,
 	) {
-		let started = wasm_timer::Instant::now();
+		let started = std::time::Instant::now();
 
 		let success = match self.justification_import.as_mut() {
 			Some(justification_import) => justification_import
diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml
index 6fbeeaf1ee65..37d07c791948 100644
--- a/client/finality-grandpa/Cargo.toml
+++ b/client/finality-grandpa/Cargo.toml
@@ -45,7 +45,6 @@ prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../..
 sc-block-builder = { version = "0.10.0-dev", path = "../block-builder" }
 finality-grandpa = { version = "0.14.1", features = ["derive-codec"] }
 async-trait = "0.1.50"
-wasm-timer = "0.2"
 
 [dev-dependencies]
 assert_matches = "1.3.0"
diff --git a/client/finality-grandpa/src/communication/gossip.rs b/client/finality-grandpa/src/communication/gossip.rs
index 12d12c9628a7..bec824bc0b81 100644
--- a/client/finality-grandpa/src/communication/gossip.rs
+++ b/client/finality-grandpa/src/communication/gossip.rs
@@ -101,9 +101,8 @@ use crate::{environment, CatchUp, CompactCommit, SignedMessage};
 
 use std::{
 	collections::{HashMap, HashSet, VecDeque},
-	time::Duration,
+	time::{Duration, Instant},
 };
-use wasm_timer::Instant;
 
 const REBROADCAST_AFTER: Duration = Duration::from_secs(60 * 5);
 const CATCH_UP_REQUEST_TIMEOUT: Duration = Duration::from_secs(45);
diff --git a/client/finality-grandpa/src/until_imported.rs b/client/finality-grandpa/src/until_imported.rs
index 4063a3d484cf..8edf818e0d45 100644
--- a/client/finality-grandpa/src/until_imported.rs
+++ b/client/finality-grandpa/src/until_imported.rs
@@ -46,9 +46,8 @@ use std::{
 	pin::Pin,
 	sync::Arc,
 	task::{Context, Poll},
-	time::Duration,
+	time::{Duration, Instant},
 };
-use wasm_timer::Instant;
 
 const LOG_PENDING_INTERVAL: Duration = Duration::from_secs(15);
 
diff --git a/client/informant/Cargo.toml b/client/informant/Cargo.toml
index 73d2a9025303..88d02f81ad5b 100644
--- a/client/informant/Cargo.toml
+++ b/client/informant/Cargo.toml
@@ -23,4 +23,3 @@ sc-network = { version = "0.10.0-dev", path = "../network" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
 sc-transaction-pool-api = { version = "4.0.0-dev", path = "../transaction-pool/api" }
-wasm-timer = "0.2"
diff --git a/client/informant/src/display.rs b/client/informant/src/display.rs
index a41cf8e25535..1f23856101aa 100644
--- a/client/informant/src/display.rs
+++ b/client/informant/src/display.rs
@@ -25,8 +25,8 @@ use sp_runtime::traits::{Block as BlockT, CheckedDiv, NumberFor, Saturating, Zer
 use std::{
 	convert::{TryFrom, TryInto},
 	fmt,
+	time::Instant,
 };
-use wasm_timer::Instant;
 
 /// State of the informant display system.
 ///
diff --git a/client/network-gossip/Cargo.toml b/client/network-gossip/Cargo.toml
index d06a11c03674..06a68a0bda06 100644
--- a/client/network-gossip/Cargo.toml
+++ b/client/network-gossip/Cargo.toml
@@ -23,7 +23,6 @@ lru = "0.6.5"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.9.0", path = "../../utils/prometheus" }
 sc-network = { version = "0.10.0-dev", path = "../network" }
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
-wasm-timer = "0.2"
 tracing = "0.1.25"
 
 [dev-dependencies]
diff --git a/client/network-gossip/src/state_machine.rs b/client/network-gossip/src/state_machine.rs
index 0fd1e6f6eae0..f7851e497474 100644
--- a/client/network-gossip/src/state_machine.rs
+++ b/client/network-gossip/src/state_machine.rs
@@ -29,8 +29,8 @@ use std::{
 	iter,
 	sync::Arc,
 	time,
+	time::Instant,
 };
-use wasm_timer::Instant;
 
 // FIXME: Add additional spam/DoS attack protection: https://github.com/paritytech/substrate/issues/1115
 // NOTE: The current value is adjusted based on largest production network deployment (Kusama) and
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index a87fb06b8271..cef1afc954e3 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -63,7 +63,6 @@ unsigned-varint = { version = "0.6.0", features = [
     "asynchronous_codec",
 ] }
 void = "1.0.2"
-wasm-timer = "0.2"
 zeroize = "1.2.0"
 
 [dependencies.libp2p]
diff --git a/client/network/src/config.rs b/client/network/src/config.rs
index 306a4cfd2903..02ee73e8d521 100644
--- a/client/network/src/config.rs
+++ b/client/network/src/config.rs
@@ -29,7 +29,7 @@ pub use crate::{
 	},
 	warp_request_handler::WarpSyncProvider,
 };
-pub use libp2p::{build_multiaddr, core::PublicKey, identity, wasm_ext::ExtTransport};
+pub use libp2p::{build_multiaddr, core::PublicKey, identity};
 
 // Note: this re-export shouldn't be part of the public API of the crate and will be removed in
 // the future.
@@ -42,7 +42,7 @@ use core::{fmt, iter};
 use futures::future;
 use libp2p::{
 	identity::{ed25519, Keypair},
-	multiaddr, wasm_ext, Multiaddr, PeerId,
+	multiaddr, Multiaddr, PeerId,
 };
 use prometheus_endpoint::Registry;
 use sc_consensus::ImportQueue;
@@ -490,11 +490,7 @@ impl NetworkConfiguration {
 			extra_sets: Vec::new(),
 			client_version: client_version.into(),
 			node_name: node_name.into(),
-			transport: TransportConfig::Normal {
-				enable_mdns: false,
-				allow_private_ipv4: true,
-				wasm_external_transport: None,
-			},
+			transport: TransportConfig::Normal { enable_mdns: false, allow_private_ipv4: true },
 			max_parallel_downloads: 5,
 			sync_mode: SyncMode::Full,
 			enable_dht_random_walk: true,
@@ -628,14 +624,6 @@ pub enum TransportConfig {
 		/// [RFC1918](https://tools.ietf.org/html/rfc1918)). Irrelevant for addresses that have
 		/// been passed in [`NetworkConfiguration::boot_nodes`].
 		allow_private_ipv4: bool,
-
-		/// Optional external implementation of a libp2p transport. Used in WASM contexts where we
-		/// need some binding between the networking provided by the operating system or
-		/// environment and libp2p.
-		///
-		/// This parameter exists whatever the target platform is, but it is expected to be set to
-		/// `Some` only when compiling for WASM.
-		wasm_external_transport: Option<wasm_ext::ExtTransport>,
 	},
 
 	/// Only allow connections within the same process.
diff --git a/client/network/src/peer_info.rs b/client/network/src/peer_info.rs
index 13c09178715c..ba60c57e8b3c 100644
--- a/client/network/src/peer_info.rs
+++ b/client/network/src/peer_info.rs
@@ -40,9 +40,8 @@ use std::{
 	error, io,
 	pin::Pin,
 	task::{Context, Poll},
-	time::Duration,
+	time::{Duration, Instant},
 };
-use wasm_timer::Instant;
 
 /// Time after we disconnect from a node before we purge its information from the cache.
 const CACHE_EXPIRE: Duration = Duration::from_secs(10 * 60);
diff --git a/client/network/src/protocol/notifications/behaviour.rs b/client/network/src/protocol/notifications/behaviour.rs
index b618d86b730d..1cc63872673c 100644
--- a/client/network/src/protocol/notifications/behaviour.rs
+++ b/client/network/src/protocol/notifications/behaviour.rs
@@ -42,9 +42,8 @@ use std::{
 	str,
 	sync::Arc,
 	task::{Context, Poll},
-	time::Duration,
+	time::{Duration, Instant},
 };
-use wasm_timer::Instant;
 
 /// Network behaviour that handles opening substreams for custom protocols with other peers.
 ///
diff --git a/client/network/src/protocol/notifications/handler.rs b/client/network/src/protocol/notifications/handler.rs
index 0a59b2fcf034..9d063eb5b1be 100644
--- a/client/network/src/protocol/notifications/handler.rs
+++ b/client/network/src/protocol/notifications/handler.rs
@@ -88,9 +88,8 @@ use std::{
 	str,
 	sync::Arc,
 	task::{Context, Poll},
-	time::Duration,
+	time::{Duration, Instant},
 };
-use wasm_timer::Instant;
 
 /// Number of pending notifications in asynchronous contexts.
 /// See [`NotificationsSink::reserve_notification`] for context.
diff --git a/client/network/src/protocol/sync/extra_requests.rs b/client/network/src/protocol/sync/extra_requests.rs
index 3716384136ec..f00c41612335 100644
--- a/client/network/src/protocol/sync/extra_requests.rs
+++ b/client/network/src/protocol/sync/extra_requests.rs
@@ -24,9 +24,8 @@ use sp_blockchain::Error as ClientError;
 use sp_runtime::traits::{Block as BlockT, NumberFor, Zero};
 use std::{
 	collections::{HashMap, HashSet, VecDeque},
-	time::Duration,
+	time::{Duration, Instant},
 };
-use wasm_timer::Instant;
 
 // Time to wait before trying to get the same extra data from the same peer.
 const EXTRA_RETRY_WAIT: Duration = Duration::from_secs(10);
diff --git a/client/network/src/request_responses.rs b/client/network/src/request_responses.rs
index 2af6e176f697..6e09208dd45d 100644
--- a/client/network/src/request_responses.rs
+++ b/client/network/src/request_responses.rs
@@ -60,9 +60,8 @@ use std::{
 	io, iter,
 	pin::Pin,
 	task::{Context, Poll},
-	time::Duration,
+	time::{Duration, Instant},
 };
-use wasm_timer::Instant;
 
 pub use libp2p::request_response::{InboundFailure, OutboundFailure, RequestId};
 
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 92b300fe02f5..069223c2ff39 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -291,10 +291,9 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 			};
 
 			let (transport, bandwidth) = {
-				let (config_mem, config_wasm) = match params.network_config.transport {
-					TransportConfig::MemoryOnly => (true, None),
-					TransportConfig::Normal { wasm_external_transport, .. } =>
-						(false, wasm_external_transport),
+				let config_mem = match params.network_config.transport {
+					TransportConfig::MemoryOnly => true,
+					TransportConfig::Normal { .. } => false,
 				};
 
 				// The yamux buffer size limit is configured to be equal to the maximum frame size
@@ -337,7 +336,6 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 				transport::build_transport(
 					local_identity,
 					config_mem,
-					config_wasm,
 					params.network_config.yamux_window_size,
 					yamux_maximum_buffer_size,
 				)
diff --git a/client/network/src/transport.rs b/client/network/src/transport.rs
index 710d4775993b..47382fa3b135 100644
--- a/client/network/src/transport.rs
+++ b/client/network/src/transport.rs
@@ -25,7 +25,7 @@ use libp2p::{
 		transport::{Boxed, OptionalTransport},
 		upgrade,
 	},
-	identity, mplex, noise, wasm_ext, PeerId, Transport,
+	identity, mplex, noise, PeerId, Transport,
 };
 #[cfg(not(target_os = "unknown"))]
 use libp2p::{dns, tcp, websocket};
@@ -51,18 +51,11 @@ pub use self::bandwidth::BandwidthSinks;
 pub fn build_transport(
 	keypair: identity::Keypair,
 	memory_only: bool,
-	wasm_external_transport: Option<wasm_ext::ExtTransport>,
 	yamux_window_size: Option<u32>,
 	yamux_maximum_buffer_size: usize,
 ) -> (Boxed<(PeerId, StreamMuxerBox)>, Arc<BandwidthSinks>) {
 	// Build the base layer of the transport.
-	let transport = if let Some(t) = wasm_external_transport {
-		OptionalTransport::some(t)
-	} else {
-		OptionalTransport::none()
-	};
-	#[cfg(not(target_os = "unknown"))]
-	let transport = transport.or_transport(if !memory_only {
+	let transport = if !memory_only {
 		let desktop_trans = tcp::TcpConfig::new().nodelay(true);
 		let desktop_trans =
 			websocket::WsConfig::new(desktop_trans.clone()).or_transport(desktop_trans);
@@ -73,9 +66,9 @@ pub fn build_transport(
 			EitherTransport::Right(desktop_trans.map_err(dns::DnsErr::Transport))
 		})
 	} else {
+		// For the in-memory case we set up the transport with an `.or_transport` below.
 		OptionalTransport::none()
-	});
-
+	};
 	let transport = transport.or_transport(if memory_only {
 		OptionalTransport::some(libp2p::core::transport::MemoryTransport::default())
 	} else {
diff --git a/client/peerset/src/lib.rs b/client/peerset/src/lib.rs
index a7b4bdd43402..838f4c411c9c 100644
--- a/client/peerset/src/lib.rs
+++ b/client/peerset/src/lib.rs
@@ -42,9 +42,9 @@ use std::{
 	collections::{HashMap, HashSet, VecDeque},
 	pin::Pin,
 	task::{Context, Poll},
-	time::Duration,
+	time::{Duration, Instant},
 };
-use wasm_timer::{Delay, Instant};
+use wasm_timer::Delay;
 
 pub use libp2p::PeerId;
 
diff --git a/client/peerset/src/peersstate.rs b/client/peerset/src/peersstate.rs
index e4062bf938b3..de79ee520f9c 100644
--- a/client/peerset/src/peersstate.rs
+++ b/client/peerset/src/peersstate.rs
@@ -36,8 +36,8 @@ use std::{
 		hash_map::{Entry, OccupiedEntry},
 		HashMap, HashSet,
 	},
+	time::Instant,
 };
-use wasm_timer::Instant;
 
 /// State storage behind the peerset.
 ///
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index 4f1bffd65957..d0d85a554968 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -30,7 +30,6 @@ rand = "0.7.3"
 parking_lot = "0.11.1"
 log = "0.4.11"
 futures-timer = "3.0.1"
-wasm-timer = "0.2"
 exit-future = "0.2.0"
 pin-project = "1.0.4"
 hash-db = "0.15.2"
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index fc9fbad1ef47..9b5390710cd8 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -62,8 +62,7 @@ use sp_runtime::{
 	BuildStorage,
 };
 use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedSender};
-use std::{str::FromStr, sync::Arc};
-use wasm_timer::SystemTime;
+use std::{str::FromStr, sync::Arc, time::SystemTime};
 
 /// A utility trait for building an RPC extension given a `DenyUnsafe` instance.
 /// This is useful since at service definition time we don't know whether the
diff --git a/client/service/src/config.rs b/client/service/src/config.rs
index 67a4a2acfcb5..4223a1812204 100644
--- a/client/service/src/config.rs
+++ b/client/service/src/config.rs
@@ -23,7 +23,7 @@ pub use sc_client_db::{Database, DatabaseSource, KeepBlocks, PruningMode, Transa
 pub use sc_executor::WasmExecutionMethod;
 pub use sc_network::{
 	config::{
-		ExtTransport, IncomingRequest, MultiaddrWithPeerId, NetworkConfiguration, NodeKeyConfig,
+		IncomingRequest, MultiaddrWithPeerId, NetworkConfiguration, NodeKeyConfig,
 		NonDefaultSetConfig, OutgoingResponse, RequestResponseConfig, Role, SetConfig,
 		TransportConfig,
 	},
@@ -107,9 +107,6 @@ pub struct Configuration {
 	pub prometheus_config: Option<PrometheusConfig>,
 	/// Telemetry service URL. `None` if disabled.
 	pub telemetry_endpoints: Option<TelemetryEndpoints>,
-	/// External WASM transport for the telemetry. If `Some`, when connection to a telemetry
-	/// endpoint, this transport will be tried in priority before all others.
-	pub telemetry_external_transport: Option<ExtTransport>,
 	/// The default number of 64KB pages to allocate for Wasm execution
 	pub default_heap_pages: Option<u64>,
 	/// Should offchain workers be executed.
diff --git a/client/service/src/metrics.rs b/client/service/src/metrics.rs
index cd03916c9261..e3ad9e9cce19 100644
--- a/client/service/src/metrics.rs
+++ b/client/service/src/metrics.rs
@@ -28,8 +28,10 @@ use sc_transaction_pool_api::{MaintainedTransactionPool, PoolStatus};
 use sp_api::ProvideRuntimeApi;
 use sp_runtime::traits::{Block, NumberFor, SaturatedConversion, UniqueSaturatedInto};
 use sp_utils::metrics::register_globals;
-use std::{sync::Arc, time::Duration};
-use wasm_timer::Instant;
+use std::{
+	sync::Arc,
+	time::{Duration, Instant},
+};
 
 struct PrometheusMetrics {
 	// generic info
diff --git a/client/service/test/src/lib.rs b/client/service/test/src/lib.rs
index 87153c2736ef..6e86b9fcfdb2 100644
--- a/client/service/test/src/lib.rs
+++ b/client/service/test/src/lib.rs
@@ -221,11 +221,8 @@ fn node_config<
 			.collect(),
 	);
 
-	network_config.transport = TransportConfig::Normal {
-		enable_mdns: false,
-		allow_private_ipv4: true,
-		wasm_external_transport: None,
-	};
+	network_config.transport =
+		TransportConfig::Normal { enable_mdns: false, allow_private_ipv4: true };
 
 	Configuration {
 		impl_name: String::from("network-test-impl"),
@@ -256,7 +253,6 @@ fn node_config<
 		rpc_max_payload: None,
 		prometheus_config: None,
 		telemetry_endpoints: None,
-		telemetry_external_transport: None,
 		default_heap_pages: None,
 		offchain_worker: Default::default(),
 		force_authoring: false,
diff --git a/client/telemetry/src/lib.rs b/client/telemetry/src/lib.rs
index 929931e3b628..9fb86f57d839 100644
--- a/client/telemetry/src/lib.rs
+++ b/client/telemetry/src/lib.rs
@@ -46,7 +46,6 @@ use std::{
 	sync::{atomic, Arc},
 };
 
-pub use libp2p::wasm_ext::ExtTransport;
 pub use log;
 pub use serde_json;
 
@@ -124,15 +123,7 @@ impl TelemetryWorker {
 	///
 	/// Only one is needed per process.
 	pub fn new(buffer_size: usize) -> Result<Self> {
-		Self::with_transport(buffer_size, None)
-	}
-
-	/// Instantiate a new [`TelemetryWorker`] with the given [`ExtTransport`]
-	/// which can run in background.
-	///
-	/// Only one is needed per process.
-	pub fn with_transport(buffer_size: usize, transport: Option<ExtTransport>) -> Result<Self> {
-		let transport = initialize_transport(transport)?;
+		let transport = initialize_transport()?;
 		let (message_sender, message_receiver) = mpsc::channel(buffer_size);
 		let (register_sender, register_receiver) = mpsc::unbounded();
 
diff --git a/client/telemetry/src/transport.rs b/client/telemetry/src/transport.rs
index 2c309be0ffb6..04ec79ebf564 100644
--- a/client/telemetry/src/transport.rs
+++ b/client/telemetry/src/transport.rs
@@ -22,30 +22,15 @@ use futures::{
 	ready,
 	task::{Context, Poll},
 };
-use libp2p::{
-	core::transport::{timeout::TransportTimeout, OptionalTransport},
-	wasm_ext, Transport,
-};
+use libp2p::{core::transport::timeout::TransportTimeout, Transport};
 use std::{io, pin::Pin, time::Duration};
 
 /// Timeout after which a connection attempt is considered failed. Includes the WebSocket HTTP
 /// upgrading.
 const CONNECT_TIMEOUT: Duration = Duration::from_secs(20);
 
-pub(crate) fn initialize_transport(
-	wasm_external_transport: Option<wasm_ext::ExtTransport>,
-) -> Result<WsTrans, io::Error> {
-	let transport = match wasm_external_transport.clone() {
-		Some(t) => OptionalTransport::some(t),
-		None => OptionalTransport::none(),
-	}
-	.map((|inner, _| StreamSink::from(inner)) as fn(_, _) -> _);
-
-	// The main transport is the `wasm_external_transport`, but if we're on desktop we add
-	// support for TCP+WebSocket+DNS as a fallback. In practice, you're not expected to pass
-	// an external transport on desktop and the fallback is used all the time.
-	#[cfg(not(target_os = "unknown"))]
-	let transport = transport.or_transport({
+pub(crate) fn initialize_transport() -> Result<WsTrans, io::Error> {
+	let transport = {
 		let inner = block_on(libp2p::dns::DnsConfig::system(libp2p::tcp::TcpConfig::new()))?;
 		libp2p::websocket::framed::WsConfig::new(inner).and_then(|connec, _| {
 			let connec = connec
@@ -57,7 +42,7 @@ pub(crate) fn initialize_transport(
 				.map_ok(|data| data.into_bytes());
 			future::ready(Ok::<_, io::Error>(connec))
 		})
-	});
+	};
 
 	Ok(TransportTimeout::new(
 		transport.map(|out, _| {
@@ -86,9 +71,6 @@ pub(crate) type WsTrans = libp2p::core::transport::Boxed<
 
 /// Wraps around an `AsyncWrite` and implements `Sink`. Guarantees that each item being sent maps
 /// to one call of `write`.
-///
-/// For some context, we put this object around the `wasm_ext::ExtTransport` in order to make sure
-/// that each telemetry message maps to one single call to `write` in the WASM FFI.
 #[pin_project::pin_project]
 pub(crate) struct StreamSink<T>(#[pin] T, Option<Vec<u8>>);
 
diff --git a/client/tracing/src/logging/layers/console_log.rs b/client/tracing/src/logging/layers/console_log.rs
deleted file mode 100644
index 77295110c896..000000000000
--- a/client/tracing/src/logging/layers/console_log.rs
+++ /dev/null
@@ -1,116 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-use crate::logging::event_format::{CustomFmtContext, EventFormat};
-use std::fmt;
-use tracing::{Event, Level, Subscriber};
-use tracing_subscriber::{
-	fmt::{
-		time::{FormatTime, SystemTime},
-		FormatFields,
-	},
-	layer::Context,
-	registry::LookupSpan,
-	Layer,
-};
-use wasm_bindgen::prelude::*;
-
-/// A `Layer` that display logs in the browser's console.
-pub struct ConsoleLogLayer<S, N = tracing_subscriber::fmt::format::DefaultFields, T = SystemTime> {
-	event_format: EventFormat<T>,
-	fmt_fields: N,
-	_inner: std::marker::PhantomData<S>,
-}
-
-impl<S, T> ConsoleLogLayer<S, tracing_subscriber::fmt::format::DefaultFields, T> {
-	/// Create a new [`ConsoleLogLayer`] using the `EventFormat` provided in argument.
-	pub fn new(event_format: EventFormat<T>) -> Self {
-		Self { event_format, fmt_fields: Default::default(), _inner: std::marker::PhantomData }
-	}
-}
-
-// NOTE: the following code took inspiration from `EventFormat` (in this file)
-impl<S, N, T: FormatTime> ConsoleLogLayer<S, N, T>
-where
-	S: Subscriber + for<'a> LookupSpan<'a>,
-	N: for<'writer> FormatFields<'writer> + 'static,
-{
-	fn format_event(
-		&self,
-		ctx: &Context<'_, S>,
-		writer: &mut dyn fmt::Write,
-		event: &Event,
-	) -> fmt::Result {
-		self.event_format.format_event_custom(
-			CustomFmtContext::ContextWithFormatFields(ctx, &self.fmt_fields),
-			writer,
-			event,
-		)
-	}
-}
-
-// NOTE: the following code took inspiration from tracing-subscriber
-//
-//       https://github.com/tokio-rs/tracing/blob/2f59b32/tracing-subscriber/src/fmt/fmt_layer.rs#L717
-impl<S, N, T> Layer<S> for ConsoleLogLayer<S, N, T>
-where
-	S: Subscriber + for<'a> LookupSpan<'a>,
-	N: for<'writer> FormatFields<'writer> + 'static,
-	T: FormatTime + 'static,
-{
-	fn on_event(&self, event: &Event<'_>, ctx: Context<'_, S>) {
-		thread_local! {
-			static BUF: std::cell::RefCell<String> = std::cell::RefCell::new(String::new());
-		}
-
-		BUF.with(|buf| {
-			let borrow = buf.try_borrow_mut();
-			let mut a;
-			let mut b;
-			let mut buf = match borrow {
-				Ok(buf) => {
-					a = buf;
-					&mut *a
-				},
-				_ => {
-					b = String::new();
-					&mut b
-				},
-			};
-
-			if self.format_event(&ctx, &mut buf, event).is_ok() {
-				if !buf.is_empty() {
-					let meta = event.metadata();
-					let level = meta.level();
-					// NOTE: the following code took inspiration from tracing-subscriber
-					//
-					//       https://github.com/iamcodemaker/console_log/blob/f13b5d6755/src/lib.rs#L149
-					match *level {
-						Level::ERROR => web_sys::console::error_1(&JsValue::from(buf.as_str())),
-						Level::WARN => web_sys::console::warn_1(&JsValue::from(buf.as_str())),
-						Level::INFO => web_sys::console::info_1(&JsValue::from(buf.as_str())),
-						Level::DEBUG => web_sys::console::log_1(&JsValue::from(buf.as_str())),
-						Level::TRACE => web_sys::console::debug_1(&JsValue::from(buf.as_str())),
-					}
-				}
-			}
-
-			buf.clear();
-		});
-	}
-}
diff --git a/client/tracing/src/logging/layers/mod.rs b/client/tracing/src/logging/layers/mod.rs
index 8bda65f4c99b..7dd0c4d120ad 100644
--- a/client/tracing/src/logging/layers/mod.rs
+++ b/client/tracing/src/logging/layers/mod.rs
@@ -16,10 +16,6 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-#[cfg(target_os = "unknown")]
-mod console_log;
 mod prefix_layer;
 
-#[cfg(target_os = "unknown")]
-pub use console_log::*;
 pub use prefix_layer::*;
diff --git a/client/transaction-pool/Cargo.toml b/client/transaction-pool/Cargo.toml
index 12b0646983db..e2858a41d507 100644
--- a/client/transaction-pool/Cargo.toml
+++ b/client/transaction-pool/Cargo.toml
@@ -30,7 +30,6 @@ sp-transaction-pool = { version = "4.0.0-dev", path = "../../primitives/transact
 sc-transaction-pool-api = { version = "4.0.0-dev", path = "./api" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
 sp-utils = { version = "4.0.0-dev", path = "../../primitives/utils" }
-wasm-timer = "0.2"
 serde = { version = "1.0.126", features = ["derive"] }
 linked-hash-map = "0.5.4"
 retain_mut = "0.1.3"
diff --git a/client/transaction-pool/graph/Cargo.toml b/client/transaction-pool/graph/Cargo.toml
index 162829e1ddf0..aa4000f7c076 100644
--- a/client/transaction-pool/graph/Cargo.toml
+++ b/client/transaction-pool/graph/Cargo.toml
@@ -19,7 +19,6 @@ futures = "0.3.9"
 log = "0.4.8"
 parking_lot = "0.11.1"
 serde = { version = "1.0.101", features = ["derive"] }
-wasm-timer = "0.2"
 sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
 sp-utils = { version = "4.0.0-dev", path = "../../../primitives/utils" }
 sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
diff --git a/client/transaction-pool/src/graph/future.rs b/client/transaction-pool/src/graph/future.rs
index b0e70698f383..201d6f40e8b1 100644
--- a/client/transaction-pool/src/graph/future.rs
+++ b/client/transaction-pool/src/graph/future.rs
@@ -24,7 +24,7 @@ use std::{
 
 use sp_core::hexdisplay::HexDisplay;
 use sp_runtime::transaction_validity::TransactionTag as Tag;
-use wasm_timer::Instant;
+use std::time::Instant;
 
 use super::base_pool::Transaction;
 
diff --git a/client/transaction-pool/src/graph/pool.rs b/client/transaction-pool/src/graph/pool.rs
index 21ce46785f04..70de9b235668 100644
--- a/client/transaction-pool/src/graph/pool.rs
+++ b/client/transaction-pool/src/graph/pool.rs
@@ -27,7 +27,7 @@ use sp_runtime::{
 		TransactionSource, TransactionTag as Tag, TransactionValidity, TransactionValidityError,
 	},
 };
-use wasm_timer::Instant;
+use std::time::Instant;
 
 use super::{
 	base_pool as base,
@@ -454,9 +454,11 @@ mod tests {
 		traits::Hash,
 		transaction_validity::{InvalidTransaction, TransactionSource, ValidTransaction},
 	};
-	use std::collections::{HashMap, HashSet};
+	use std::{
+		collections::{HashMap, HashSet},
+		time::Instant,
+	};
 	use substrate_test_runtime::{AccountId, Block, Extrinsic, Hashing, Transfer, H256};
-	use wasm_timer::Instant;
 
 	const INVALID_NONCE: u64 = 254;
 	const SOURCE: TransactionSource = TransactionSource::External;
diff --git a/client/transaction-pool/src/graph/rotator.rs b/client/transaction-pool/src/graph/rotator.rs
index 820fde35dac1..910f86b5ed5b 100644
--- a/client/transaction-pool/src/graph/rotator.rs
+++ b/client/transaction-pool/src/graph/rotator.rs
@@ -22,8 +22,11 @@
 //! Discarded extrinsics are banned so that they don't get re-imported again.
 
 use parking_lot::RwLock;
-use std::{collections::HashMap, hash, iter, time::Duration};
-use wasm_timer::Instant;
+use std::{
+	collections::HashMap,
+	hash, iter,
+	time::{Duration, Instant},
+};
 
 use super::base_pool::Transaction;
 
diff --git a/client/transaction-pool/src/graph/validated_pool.rs b/client/transaction-pool/src/graph/validated_pool.rs
index a0adeef6831f..4dd5ea3b67e7 100644
--- a/client/transaction-pool/src/graph/validated_pool.rs
+++ b/client/transaction-pool/src/graph/validated_pool.rs
@@ -32,7 +32,7 @@ use sp_runtime::{
 	traits::{self, SaturatedConversion},
 	transaction_validity::{TransactionSource, TransactionTag as Tag, ValidTransaction},
 };
-use wasm_timer::Instant;
+use std::time::Instant;
 
 use super::{
 	base_pool::{self as base, PruneStatus},
diff --git a/client/transaction-pool/src/lib.rs b/client/transaction-pool/src/lib.rs
index c35bba8d2a98..cd97abab933f 100644
--- a/client/transaction-pool/src/lib.rs
+++ b/client/transaction-pool/src/lib.rs
@@ -63,7 +63,7 @@ use sp_runtime::{
 	generic::BlockId,
 	traits::{AtLeast32Bit, Block as BlockT, Extrinsic, Header as HeaderT, NumberFor, Zero},
 };
-use wasm_timer::Instant;
+use std::time::Instant;
 
 use crate::metrics::MetricsLink as PrometheusMetrics;
 use prometheus_endpoint::Registry as PrometheusRegistry;
diff --git a/docs/Upgrading-2.0-to-3.0.md b/docs/Upgrading-2.0-to-3.0.md
index 914b7b788d2e..45da3811220f 100644
--- a/docs/Upgrading-2.0-to-3.0.md
+++ b/docs/Upgrading-2.0-to-3.0.md
@@ -439,69 +439,6 @@ and add the new service:
 
 The telemetry subsystem has seen a few fixes and refactorings to allow for a more flexible handling, in particular in regards to parachains. Most notably `sc_service::spawn_tasks` now returns the `telemetry_connection_notifier` as the second member of the tuple, (`let (_rpc_handlers, telemetry_connection_notifier) = sc_service::spawn_tasks(`), which should be passed to `telemetry_on_connect` of `new_full_base` now: `telemetry_on_connect: telemetry_connection_notifier.map(|x| x.on_connect_stream()),` (see the service-section below for a full diff).
 
-On the browser-side, this complicates setup a tiny bit, yet not terribly. Instead of `init_console_log`,  we now use `init_logging_and_telemetry` and need to make sure we spawn the runner for its handle at the end (the other changes are formatting and cosmetics):
-
-```diff
---- a/bin/node/cli/src/browser.rs
-+++ b/bin/node/cli/src/browser.rs
-@@ -21,9 +21,8 @@ use log::info;
- use wasm_bindgen::prelude::*;
- use browser_utils::{
- 	Client,
--	browser_configuration, set_console_error_panic_hook, init_console_log,
-+	browser_configuration, init_logging_and_telemetry, set_console_error_panic_hook,
- };
--use std::str::FromStr;
-
- /// Starts the client.
- #[wasm_bindgen]
-@@ -33,29 +32,38 @@ pub async fn start_client(chain_spec: Option<String>, log_level: String) -> Resu
- 		.map_err(|err| JsValue::from_str(&err.to_string()))
- }
-
--async fn start_inner(chain_spec: Option<String>, log_level: String) -> Result<Client, Box<dyn std::error::Error>> {
-+async fn start_inner(
-+	chain_spec: Option<String>,
-+	log_directives: String,
-+) -> Result<Client, Box<dyn std::error::Error>> {
- 	set_console_error_panic_hook();
--	init_console_log(log::Level::from_str(&log_level)?)?;
-+	let telemetry_worker = init_logging_and_telemetry(&log_directives)?;
- 	let chain_spec = match chain_spec {
- 		Some(chain_spec) => ChainSpec::from_json_bytes(chain_spec.as_bytes().to_vec())
- 			.map_err(|e| format!("{:?}", e))?,
- 		None => crate::chain_spec::development_config(),
- 	};
-
--	let config = browser_configuration(chain_spec).await?;
-+	let telemetry_handle = telemetry_worker.handle();
-+	let config = browser_configuration(
-+		chain_spec,
-+		Some(telemetry_handle),
-+	).await?;
-
- 	info!("Substrate browser node");
- 	info!("✌️  version {}", config.impl_version);
--	info!("❤️  by Parity Technologies, 2017-2020");
-+	info!("❤️  by Parity Technologies, 2017-2021");
- 	info!("📋 Chain specification: {}", config.chain_spec.name());
--	info!("🏷  Node name: {}", config.network.node_name);
-+	info!("🏷 Node name: {}", config.network.node_name);
- 	info!("👤 Role: {:?}", config.role);
-
- 	// Create the service. This is the most heavy initialization step.
- 	let (task_manager, rpc_handlers) =
- 		crate::service::new_light_base(config)
--			.map(|(components, rpc_handlers, _, _, _)| (components, rpc_handlers))
-+			.map(|(components, rpc_handlers, _, _, _, _)| (components, rpc_handlers))
- 			.map_err(|e| format!("{:?}", e))?;
-
-+	task_manager.spawn_handle().spawn("telemetry", telemetry_worker.run());
-+
- 	Ok(browser_utils::start_client(task_manager, rpc_handlers))
- }
- ```
-
 ##### Async & Remote Keystore support
 
 In order to allow for remote-keystores, the keystore-subsystem has been reworked to support async operations and generally refactored to not provide the keys itself but only sign on request. This allows for remote-keystore to never hand out keys and thus to operate any substrate-based node in a manner without ever having the private keys in the local system memory.
diff --git a/primitives/timestamp/Cargo.toml b/primitives/timestamp/Cargo.toml
index 137faa3725b4..60daf9642df6 100644
--- a/primitives/timestamp/Cargo.toml
+++ b/primitives/timestamp/Cargo.toml
@@ -18,7 +18,6 @@ sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../runtime" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-inherents = { version = "4.0.0-dev", default-features = false, path = "../inherents" }
-wasm-timer = { version = "0.2", optional = true }
 thiserror = { version = "1.0.21", optional = true }
 log = { version = "0.4.8", optional = true }
 futures-timer = { version = "3.0.2", optional = true }
@@ -32,7 +31,6 @@ std = [
 	"sp-runtime/std",
 	"codec/std",
 	"sp-inherents/std",
-	"wasm-timer",
 	"thiserror",
 	"log",
 	"futures-timer",
diff --git a/primitives/timestamp/src/lib.rs b/primitives/timestamp/src/lib.rs
index 5de1b10e7993..02a579497b52 100644
--- a/primitives/timestamp/src/lib.rs
+++ b/primitives/timestamp/src/lib.rs
@@ -164,7 +164,7 @@ impl TimestampInherentData for InherentData {
 /// This timestamp is the time since the UNIX epoch.
 #[cfg(feature = "std")]
 fn current_timestamp() -> std::time::Duration {
-	use wasm_timer::SystemTime;
+	use std::time::SystemTime;
 
 	let now = SystemTime::now();
 	now.duration_since(SystemTime::UNIX_EPOCH)
diff --git a/test-utils/test-runner/src/utils.rs b/test-utils/test-runner/src/utils.rs
index 2fe3a98d44ad..3caba633dcfa 100644
--- a/test-utils/test-runner/src/utils.rs
+++ b/test-utils/test-runner/src/utils.rs
@@ -101,7 +101,6 @@ pub fn default_config(
 		rpc_max_payload: None,
 		prometheus_config: None,
 		telemetry_endpoints: None,
-		telemetry_external_transport: None,
 		default_heap_pages: None,
 		offchain_worker: Default::default(),
 		force_authoring: false,
diff --git a/utils/browser/Cargo.toml b/utils/browser/Cargo.toml
deleted file mode 100644
index 9ede0f2ce8ff..000000000000
--- a/utils/browser/Cargo.toml
+++ /dev/null
@@ -1,35 +0,0 @@
-[package]
-name = "substrate-browser-utils"
-version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-description = "Utilities for creating a browser light-client."
-edition = "2018"
-license = "Apache-2.0"
-homepage = "https://substrate.dev"
-repository = "https://github.com/paritytech/substrate/"
-readme = "README.md"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[dependencies]
-futures = "0.3.16"
-log = "0.4.8"
-libp2p-wasm-ext = { version = "0.29", features = ["websocket"] }
-console_error_panic_hook = "0.1.6"
-js-sys = "0.3.34"
-wasm-bindgen = "0.2.73"
-wasm-bindgen-futures = "0.4.18"
-kvdb-memorydb = "0.10.0"
-sp-database = { version = "4.0.0-dev", path = "../../primitives/database" }
-sc-informant = { version = "0.10.0-dev", path = "../../client/informant" }
-sc-service = { version = "0.10.0-dev", path = "../../client/service", default-features = false }
-sc-network = { path = "../../client/network", version = "0.10.0-dev"}
-sc-chain-spec = { path = "../../client/chain-spec", version = "4.0.0-dev"}
-sc-tracing = { path = "../../client/tracing", version = "4.0.0-dev"}
-
-# Imported just for the `wasm-bindgen` feature
-getrandom = { version = "0.2", features = ["js"] }
-rand = { version = "0.7", features = ["wasm-bindgen"] }
-futures-timer = { version = "3.0.1", features = ["wasm-bindgen"]}
-chrono = { version = "0.4", features = ["wasmbind"] }
diff --git a/utils/browser/README.md b/utils/browser/README.md
deleted file mode 100644
index 9718db58b37e..000000000000
--- a/utils/browser/README.md
+++ /dev/null
@@ -1 +0,0 @@
-License: Apache-2.0
\ No newline at end of file
diff --git a/utils/browser/src/lib.rs b/utils/browser/src/lib.rs
deleted file mode 100644
index 49f5c7ad4bd1..000000000000
--- a/utils/browser/src/lib.rs
+++ /dev/null
@@ -1,212 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use futures::{
-	channel::{mpsc, oneshot},
-	future::{ready, select},
-	prelude::*,
-};
-use libp2p_wasm_ext::{ffi, ExtTransport};
-use log::{debug, info};
-use sc_chain_spec::Extension;
-use sc_network::config::TransportConfig;
-use sc_service::{
-	config::{DatabaseSource, KeystoreConfig, NetworkConfiguration},
-	Configuration, GenericChainSpec, KeepBlocks, Role, RpcHandlers, RpcSession, RuntimeGenesis,
-	TaskManager, TransactionStorageMode,
-};
-use sc_tracing::logging::LoggerBuilder;
-use std::pin::Pin;
-use wasm_bindgen::prelude::*;
-
-pub use console_error_panic_hook::set_once as set_console_error_panic_hook;
-
-/// Initialize the logger and return a `TelemetryWorker` and a wasm `ExtTransport`.
-pub fn init_logging(pattern: &str) -> Result<(), sc_tracing::logging::Error> {
-	LoggerBuilder::new(pattern).init()
-}
-
-/// Create a service configuration from a chain spec.
-///
-/// This configuration contains good defaults for a browser light client.
-pub fn browser_configuration<G, E>(
-	chain_spec: GenericChainSpec<G, E>,
-) -> Result<Configuration, Box<dyn std::error::Error>>
-where
-	G: RuntimeGenesis + 'static,
-	E: Extension + 'static + Send + Sync,
-{
-	let name = chain_spec.name().to_string();
-	let transport = ExtTransport::new(ffi::websocket_transport());
-
-	let mut network = NetworkConfiguration::new(
-		format!("{} (Browser)", name),
-		"unknown",
-		Default::default(),
-		None,
-	);
-	network.boot_nodes = chain_spec.boot_nodes().to_vec();
-	network.transport = TransportConfig::Normal {
-		wasm_external_transport: Some(transport.clone()),
-		allow_private_ipv4: true,
-		enable_mdns: false,
-	};
-
-	let config = Configuration {
-		network,
-		telemetry_endpoints: chain_spec.telemetry_endpoints().clone(),
-		chain_spec: Box::new(chain_spec),
-		task_executor: (|fut, _| {
-			wasm_bindgen_futures::spawn_local(fut);
-			async {}
-		})
-		.into(),
-		telemetry_external_transport: Some(transport),
-		role: Role::Light,
-		database: {
-			info!("Opening Indexed DB database '{}'...", name);
-			let db = kvdb_memorydb::create(10);
-
-			DatabaseSource::Custom(sp_database::as_database(db))
-		},
-		keystore_remote: Default::default(),
-		keystore: KeystoreConfig::InMemory,
-		default_heap_pages: Default::default(),
-		dev_key_seed: Default::default(),
-		disable_grandpa: Default::default(),
-		execution_strategies: Default::default(),
-		force_authoring: Default::default(),
-		impl_name: String::from("parity-substrate"),
-		impl_version: String::from("0.0.0"),
-		offchain_worker: Default::default(),
-		prometheus_config: Default::default(),
-		state_pruning: Default::default(),
-		keep_blocks: KeepBlocks::All,
-		transaction_storage: TransactionStorageMode::BlockBody,
-		rpc_cors: Default::default(),
-		rpc_http: Default::default(),
-		rpc_ipc: Default::default(),
-		rpc_ws: Default::default(),
-		rpc_ws_max_connections: Default::default(),
-		rpc_http_threads: Default::default(),
-		rpc_methods: Default::default(),
-		rpc_max_payload: Default::default(),
-		state_cache_child_ratio: Default::default(),
-		state_cache_size: Default::default(),
-		tracing_receiver: Default::default(),
-		tracing_targets: Default::default(),
-		transaction_pool: Default::default(),
-		wasm_method: Default::default(),
-		wasm_runtime_overrides: Default::default(),
-		max_runtime_instances: 8,
-		announce_block: true,
-		base_path: None,
-		informant_output_format: sc_informant::OutputFormat { enable_color: false },
-		disable_log_reloading: false,
-	};
-
-	Ok(config)
-}
-
-/// A running client.
-#[wasm_bindgen]
-pub struct Client {
-	rpc_send_tx: mpsc::UnboundedSender<RpcMessage>,
-}
-
-struct RpcMessage {
-	rpc_json: String,
-	session: RpcSession,
-	send_back: oneshot::Sender<Pin<Box<dyn futures::Future<Output = Option<String>> + Send>>>,
-}
-
-/// Create a Client object that connects to a service.
-pub fn start_client(mut task_manager: TaskManager, rpc_handlers: RpcHandlers) -> Client {
-	// We dispatch a background task responsible for processing the service.
-	//
-	// The main action performed by the code below consists in polling the service with
-	// `service.poll()`.
-	// The rest consists in handling RPC requests.
-	let (rpc_send_tx, rpc_send_rx) = mpsc::unbounded::<RpcMessage>();
-	wasm_bindgen_futures::spawn_local(
-		select(
-			rpc_send_rx.for_each(move |message| {
-				let fut = rpc_handlers.rpc_query(&message.session, &message.rpc_json);
-				let _ = message.send_back.send(fut);
-				ready(())
-			}),
-			Box::pin(async move {
-				let _ = task_manager.future().await;
-			}),
-		)
-		.map(drop),
-	);
-
-	Client { rpc_send_tx }
-}
-
-#[wasm_bindgen]
-impl Client {
-	/// Allows starting an RPC request. Returns a `Promise` containing the result of that request.
-	#[wasm_bindgen(js_name = "rpcSend")]
-	pub fn rpc_send(&mut self, rpc: &str) -> js_sys::Promise {
-		let rpc_session = RpcSession::new(mpsc::unbounded().0);
-		let (tx, rx) = oneshot::channel();
-		let _ = self.rpc_send_tx.unbounded_send(RpcMessage {
-			rpc_json: rpc.to_owned(),
-			session: rpc_session,
-			send_back: tx,
-		});
-		wasm_bindgen_futures::future_to_promise(async {
-			match rx.await {
-				Ok(fut) => fut.await.map(|s| JsValue::from_str(&s)).ok_or_else(|| JsValue::NULL),
-				Err(_) => Err(JsValue::NULL),
-			}
-		})
-	}
-
-	/// Subscribes to an RPC pubsub endpoint.
-	#[wasm_bindgen(js_name = "rpcSubscribe")]
-	pub fn rpc_subscribe(&mut self, rpc: &str, callback: js_sys::Function) {
-		let (tx, rx) = mpsc::unbounded();
-		let rpc_session = RpcSession::new(tx);
-		let (fut_tx, fut_rx) = oneshot::channel();
-		let _ = self.rpc_send_tx.unbounded_send(RpcMessage {
-			rpc_json: rpc.to_owned(),
-			session: rpc_session.clone(),
-			send_back: fut_tx,
-		});
-		wasm_bindgen_futures::spawn_local(async {
-			if let Ok(fut) = fut_rx.await {
-				fut.await;
-			}
-		});
-
-		wasm_bindgen_futures::spawn_local(async move {
-			let _ = rx
-				.for_each(|s| {
-					let _ = callback.call1(&callback, &JsValue::from_str(&s));
-					ready(())
-				})
-				.await;
-
-			// We need to keep `rpc_session` alive.
-			debug!("RPC subscription has ended");
-			drop(rpc_session);
-		});
-	}
-}

From 3c2b2675c80f63b5371f4ea70890edb8d556a93c Mon Sep 17 00:00:00 2001
From: Ashley <ashley.ruglys@gmail.com>
Date: Wed, 18 Aug 2021 14:26:41 +0200
Subject: [PATCH 1091/1194] Make choosing an executor (native/wasm) an explicit
 part of service construction (#9525)

* Split native executor stuff from wasm executor stuff

* Remove `native_runtime_version` in places

* Fix warning

* Fix test warning

* Remove redundant NativeRuntimeInfo trait

* Add a warning for use_native

* Run cargo fmt

* Revert "Add a warning for use_native"

This reverts commit 9494f765a06037e991dd60524f2ed1b14649bfd6.

* Make choosing an executor (native/wasm) an explicit part of service construction

* Add Cargo.lock

* Rename Executor to ExecutorDispatch

* Update bin/node/executor/src/lib.rs

Co-authored-by: Squirrel <gilescope@gmail.com>

* Fix tests

* Fix minor node-executor error

* Fix node cli command thing

Co-authored-by: Squirrel <gilescope@gmail.com>
---
 Cargo.lock                                  |  2 +
 bin/node-template/node/src/command.rs       |  2 +-
 bin/node-template/node/src/service.rs       | 27 ++++++--
 bin/node/cli/Cargo.toml                     |  1 +
 bin/node/cli/src/command.rs                 |  8 +--
 bin/node/cli/src/service.rs                 | 27 ++++++--
 bin/node/executor/benches/bench.rs          | 10 +--
 bin/node/executor/src/lib.rs                | 10 +--
 bin/node/executor/tests/common.rs           |  8 +--
 bin/node/inspect/Cargo.toml                 |  1 +
 bin/node/inspect/src/command.rs             |  9 ++-
 bin/node/test-runner-example/src/lib.rs     |  9 +--
 bin/node/testing/src/bench.rs               |  4 +-
 bin/node/testing/src/client.rs              |  6 +-
 client/consensus/babe/src/tests.rs          |  2 +-
 client/executor/src/lib.rs                  |  2 +-
 client/executor/src/native_executor.rs      | 28 +++++----
 client/network/test/src/lib.rs              |  2 +-
 client/service/src/builder.rs               | 68 +++++++++------------
 client/service/src/client/call_executor.rs  | 11 ++--
 client/service/src/client/wasm_override.rs  | 24 +++++---
 client/service/test/src/client/light.rs     |  9 +--
 client/service/test/src/client/mod.rs       | 12 ++--
 primitives/api/test/tests/decl_and_impl.rs  |  2 +-
 primitives/api/test/tests/runtime_calls.rs  |  6 +-
 test-utils/client/src/lib.rs                | 45 ++++++++------
 test-utils/runtime/client/src/lib.rs        | 26 ++++----
 test-utils/runtime/src/system.rs            |  6 +-
 test-utils/test-runner/src/client.rs        | 13 +++-
 test-utils/test-runner/src/lib.rs           | 37 +++++++----
 test-utils/test-runner/src/node.rs          | 13 ++--
 utils/frame/benchmarking-cli/src/command.rs |  4 +-
 utils/frame/try-runtime/cli/src/lib.rs      | 23 ++++---
 33 files changed, 271 insertions(+), 186 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 08db695b05ef..5bff4b47b18b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4224,6 +4224,7 @@ dependencies = [
  "sc-consensus-epochs",
  "sc-consensus-slots",
  "sc-consensus-uncles",
+ "sc-executor",
  "sc-finality-grandpa",
  "sc-keystore",
  "sc-network",
@@ -4296,6 +4297,7 @@ dependencies = [
  "parity-scale-codec",
  "sc-cli",
  "sc-client-api",
+ "sc-executor",
  "sc-service",
  "sp-blockchain",
  "sp-core",
diff --git a/bin/node-template/node/src/command.rs b/bin/node-template/node/src/command.rs
index b4f0a1804f66..1e7e4edb7995 100644
--- a/bin/node-template/node/src/command.rs
+++ b/bin/node-template/node/src/command.rs
@@ -119,7 +119,7 @@ pub fn run() -> sc_cli::Result<()> {
 			if cfg!(feature = "runtime-benchmarks") {
 				let runner = cli.create_runner(cmd)?;
 
-				runner.sync_run(|config| cmd.run::<Block, service::Executor>(config))
+				runner.sync_run(|config| cmd.run::<Block, service::ExecutorDispatch>(config))
 			} else {
 				Err("Benchmarking wasn't enabled when building the node. You can enable it with \
 				     `--features runtime-benchmarks`."
diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
index 6f41dcb1d651..0f09ef436aca 100644
--- a/bin/node-template/node/src/service.rs
+++ b/bin/node-template/node/src/service.rs
@@ -3,7 +3,7 @@
 use node_template_runtime::{self, opaque::Block, RuntimeApi};
 use sc_client_api::{ExecutorProvider, RemoteBackend};
 use sc_consensus_aura::{ImportQueueParams, SlotProportion, StartAuraParams};
-pub use sc_executor::NativeExecutor;
+pub use sc_executor::NativeElseWasmExecutor;
 use sc_finality_grandpa::SharedVoterState;
 use sc_keystore::LocalKeystore;
 use sc_service::{error::Error as ServiceError, Configuration, TaskManager};
@@ -13,9 +13,9 @@ use sp_consensus_aura::sr25519::AuthorityPair as AuraPair;
 use std::{sync::Arc, time::Duration};
 
 // Our native executor instance.
-pub struct Executor;
+pub struct ExecutorDispatch;
 
-impl sc_executor::NativeExecutionDispatch for Executor {
+impl sc_executor::NativeExecutionDispatch for ExecutorDispatch {
 	type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;
 
 	fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
@@ -27,7 +27,8 @@ impl sc_executor::NativeExecutionDispatch for Executor {
 	}
 }
 
-type FullClient = sc_service::TFullClient<Block, RuntimeApi, Executor>;
+type FullClient =
+	sc_service::TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<ExecutorDispatch>>;
 type FullBackend = sc_service::TFullBackend<Block>;
 type FullSelectChain = sc_consensus::LongestChain<FullBackend, Block>;
 
@@ -68,10 +69,17 @@ pub fn new_partial(
 		})
 		.transpose()?;
 
+	let executor = NativeElseWasmExecutor::<ExecutorDispatch>::new(
+		config.wasm_method,
+		config.default_heap_pages,
+		config.max_runtime_instances,
+	);
+
 	let (client, backend, keystore_container, task_manager) =
-		sc_service::new_full_parts::<Block, RuntimeApi, Executor>(
+		sc_service::new_full_parts::<Block, RuntimeApi, _>(
 			&config,
 			telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()),
+			executor,
 		)?;
 	let client = Arc::new(client);
 
@@ -336,10 +344,17 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		})
 		.transpose()?;
 
+	let executor = NativeElseWasmExecutor::<ExecutorDispatch>::new(
+		config.wasm_method,
+		config.default_heap_pages,
+		config.max_runtime_instances,
+	);
+
 	let (client, backend, keystore_container, mut task_manager, on_demand) =
-		sc_service::new_light_parts::<Block, RuntimeApi, Executor>(
+		sc_service::new_light_parts::<Block, RuntimeApi, _>(
 			&config,
 			telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()),
+			executor,
 		)?;
 
 	let mut telemetry = telemetry.map(|(worker, telemetry)| {
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index b595aa4b034d..2caefebbbf3b 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -72,6 +72,7 @@ sc-rpc = { version = "4.0.0-dev", path = "../../../client/rpc" }
 sc-basic-authorship = { version = "0.10.0-dev", path = "../../../client/basic-authorship" }
 sc-service = { version = "0.10.0-dev", default-features = false, path = "../../../client/service" }
 sc-telemetry = { version = "4.0.0-dev", path = "../../../client/telemetry" }
+sc-executor = { version = "0.10.0-dev", path = "../../../client/executor" }
 sc-authority-discovery = { version = "0.10.0-dev", path = "../../../client/authority-discovery" }
 sc-sync-state-rpc = { version = "0.10.0-dev", path = "../../../client/sync-state-rpc" }
 
diff --git a/bin/node/cli/src/command.rs b/bin/node/cli/src/command.rs
index b904ea99e8f9..a660b8985b64 100644
--- a/bin/node/cli/src/command.rs
+++ b/bin/node/cli/src/command.rs
@@ -17,7 +17,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{chain_spec, service, service::new_partial, Cli, Subcommand};
-use node_executor::Executor;
+use node_executor::ExecutorDispatch;
 use node_runtime::{Block, RuntimeApi};
 use sc_cli::{ChainSpec, Result, Role, RuntimeVersion, SubstrateCli};
 use sc_service::PartialComponents;
@@ -87,13 +87,13 @@ pub fn run() -> Result<()> {
 		Some(Subcommand::Inspect(cmd)) => {
 			let runner = cli.create_runner(cmd)?;
 
-			runner.sync_run(|config| cmd.run::<Block, RuntimeApi, Executor>(config))
+			runner.sync_run(|config| cmd.run::<Block, RuntimeApi, ExecutorDispatch>(config))
 		},
 		Some(Subcommand::Benchmark(cmd)) =>
 			if cfg!(feature = "runtime-benchmarks") {
 				let runner = cli.create_runner(cmd)?;
 
-				runner.sync_run(|config| cmd.run::<Block, Executor>(config))
+				runner.sync_run(|config| cmd.run::<Block, ExecutorDispatch>(config))
 			} else {
 				Err("Benchmarking wasn't enabled when building the node. \
 				You can enable it with `--features runtime-benchmarks`."
@@ -159,7 +159,7 @@ pub fn run() -> Result<()> {
 					sc_service::TaskManager::new(config.task_executor.clone(), registry)
 						.map_err(|e| sc_cli::Error::Service(sc_service::Error::Prometheus(e)))?;
 
-				Ok((cmd.run::<Block, Executor>(config), task_manager))
+				Ok((cmd.run::<Block, ExecutorDispatch>(config), task_manager))
 			})
 		},
 		#[cfg(not(feature = "try-runtime"))]
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index bd3c92d9aa14..845e5c83e883 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -21,23 +21,26 @@
 //! Service implementation. Specialized wrapper over substrate service.
 
 use futures::prelude::*;
-use node_executor::Executor;
+use node_executor::ExecutorDispatch;
 use node_primitives::Block;
 use node_runtime::RuntimeApi;
 use sc_client_api::{ExecutorProvider, RemoteBackend};
 use sc_consensus_babe::{self, SlotProportion};
+use sc_executor::NativeElseWasmExecutor;
 use sc_network::{Event, NetworkService};
 use sc_service::{config::Configuration, error::Error as ServiceError, RpcHandlers, TaskManager};
 use sc_telemetry::{Telemetry, TelemetryWorker};
 use sp_runtime::traits::Block as BlockT;
 use std::sync::Arc;
 
-type FullClient = sc_service::TFullClient<Block, RuntimeApi, Executor>;
+type FullClient =
+	sc_service::TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<ExecutorDispatch>>;
 type FullBackend = sc_service::TFullBackend<Block>;
 type FullSelectChain = sc_consensus::LongestChain<FullBackend, Block>;
 type FullGrandpaBlockImport =
 	grandpa::GrandpaBlockImport<FullBackend, Block, FullClient, FullSelectChain>;
-type LightClient = sc_service::TLightClient<Block, RuntimeApi, Executor>;
+type LightClient =
+	sc_service::TLightClient<Block, RuntimeApi, NativeElseWasmExecutor<ExecutorDispatch>>;
 
 pub fn new_partial(
 	config: &Configuration,
@@ -75,10 +78,17 @@ pub fn new_partial(
 		})
 		.transpose()?;
 
+	let executor = NativeElseWasmExecutor::<ExecutorDispatch>::new(
+		config.wasm_method,
+		config.default_heap_pages,
+		config.max_runtime_instances,
+	);
+
 	let (client, backend, keystore_container, task_manager) =
-		sc_service::new_full_parts::<Block, RuntimeApi, Executor>(
+		sc_service::new_full_parts::<Block, RuntimeApi, _>(
 			&config,
 			telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()),
+			executor,
 		)?;
 	let client = Arc::new(client);
 
@@ -447,10 +457,17 @@ pub fn new_light_base(
 		})
 		.transpose()?;
 
+	let executor = NativeElseWasmExecutor::<ExecutorDispatch>::new(
+		config.wasm_method,
+		config.default_heap_pages,
+		config.max_runtime_instances,
+	);
+
 	let (client, backend, keystore_container, mut task_manager, on_demand) =
-		sc_service::new_light_parts::<Block, RuntimeApi, Executor>(
+		sc_service::new_light_parts::<Block, RuntimeApi, _>(
 			&config,
 			telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()),
+			executor,
 		)?;
 
 	let mut telemetry = telemetry.map(|(worker, telemetry)| {
diff --git a/bin/node/executor/benches/bench.rs b/bin/node/executor/benches/bench.rs
index 485298e8c428..0058a5c70340 100644
--- a/bin/node/executor/benches/bench.rs
+++ b/bin/node/executor/benches/bench.rs
@@ -18,14 +18,14 @@
 use codec::{Decode, Encode};
 use criterion::{criterion_group, criterion_main, BatchSize, Criterion};
 use frame_support::Hashable;
-use node_executor::Executor;
+use node_executor::ExecutorDispatch;
 use node_primitives::{BlockNumber, Hash};
 use node_runtime::{
 	constants::currency::*, Block, BuildStorage, Call, CheckedExtrinsic, GenesisConfig, Header,
 	UncheckedExtrinsic,
 };
 use node_testing::keyring::*;
-use sc_executor::{Externalities, NativeExecutor, RuntimeVersionOf, WasmExecutionMethod};
+use sc_executor::{Externalities, NativeElseWasmExecutor, RuntimeVersionOf, WasmExecutionMethod};
 use sp_core::{
 	storage::well_known_keys,
 	traits::{CodeExecutor, RuntimeCode},
@@ -77,7 +77,7 @@ fn new_test_ext(genesis_config: &GenesisConfig) -> TestExternalities<BlakeTwo256
 }
 
 fn construct_block<E: Externalities>(
-	executor: &NativeExecutor<Executor>,
+	executor: &NativeElseWasmExecutor<ExecutorDispatch>,
 	ext: &mut E,
 	number: BlockNumber,
 	parent_hash: Hash,
@@ -157,7 +157,7 @@ fn construct_block<E: Externalities>(
 
 fn test_blocks(
 	genesis_config: &GenesisConfig,
-	executor: &NativeExecutor<Executor>,
+	executor: &NativeElseWasmExecutor<ExecutorDispatch>,
 ) -> Vec<(Vec<u8>, Hash)> {
 	let mut test_ext = new_test_ext(genesis_config);
 	let mut block1_extrinsics = vec![CheckedExtrinsic {
@@ -191,7 +191,7 @@ fn bench_execute_block(c: &mut Criterion) {
 				ExecutionMethod::Wasm(wasm_method) => (false, wasm_method),
 			};
 
-			let executor = NativeExecutor::new(wasm_method, None, 8);
+			let executor = NativeElseWasmExecutor::new(wasm_method, None, 8);
 			let runtime_code = RuntimeCode {
 				code_fetcher: &sp_core::traits::WrappedRuntimeCode(compact_code_unwrap().into()),
 				hash: vec![1, 2, 3],
diff --git a/bin/node/executor/src/lib.rs b/bin/node/executor/src/lib.rs
index a2e0455a96fa..9a7a0c4d3c11 100644
--- a/bin/node/executor/src/lib.rs
+++ b/bin/node/executor/src/lib.rs
@@ -18,13 +18,13 @@
 //! A `CodeExecutor` specialization which uses natively compiled runtime when the wasm to be
 //! executed is equivalent to the natively compiled code.
 
-pub use sc_executor::NativeExecutor;
+pub use sc_executor::NativeElseWasmExecutor;
 
-// Declare an instance of the native executor named `Executor`. Include the wasm binary as the
-// equivalent wasm code.
-pub struct Executor;
+// Declare an instance of the native executor named `ExecutorDispatch`. Include the wasm binary as
+// the equivalent wasm code.
+pub struct ExecutorDispatch;
 
-impl sc_executor::NativeExecutionDispatch for Executor {
+impl sc_executor::NativeExecutionDispatch for ExecutorDispatch {
 	type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;
 
 	fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
diff --git a/bin/node/executor/tests/common.rs b/bin/node/executor/tests/common.rs
index 337b4b0c15f9..a0edb46a0d6a 100644
--- a/bin/node/executor/tests/common.rs
+++ b/bin/node/executor/tests/common.rs
@@ -18,7 +18,7 @@
 use codec::{Decode, Encode};
 use frame_support::Hashable;
 use frame_system::offchain::AppCrypto;
-use sc_executor::{error::Result, NativeExecutor, WasmExecutionMethod};
+use sc_executor::{error::Result, NativeElseWasmExecutor, WasmExecutionMethod};
 use sp_consensus_babe::{
 	digests::{PreDigest, SecondaryPlainPreDigest},
 	Slot, BABE_ENGINE_ID,
@@ -35,7 +35,7 @@ use sp_runtime::{
 };
 use sp_state_machine::TestExternalities as CoreTestExternalities;
 
-use node_executor::Executor;
+use node_executor::ExecutorDispatch;
 use node_primitives::{BlockNumber, Hash};
 use node_runtime::{
 	constants::currency::*, Block, BuildStorage, CheckedExtrinsic, Header, Runtime,
@@ -95,8 +95,8 @@ pub fn from_block_number(n: u32) -> Header {
 	Header::new(n, Default::default(), Default::default(), [69; 32].into(), Default::default())
 }
 
-pub fn executor() -> NativeExecutor<Executor> {
-	NativeExecutor::new(WasmExecutionMethod::Interpreted, None, 8)
+pub fn executor() -> NativeElseWasmExecutor<ExecutorDispatch> {
+	NativeElseWasmExecutor::new(WasmExecutionMethod::Interpreted, None, 8)
 }
 
 pub fn executor_call<
diff --git a/bin/node/inspect/Cargo.toml b/bin/node/inspect/Cargo.toml
index c4fd1fb3adc9..1570e5dbf8e4 100644
--- a/bin/node/inspect/Cargo.toml
+++ b/bin/node/inspect/Cargo.toml
@@ -15,6 +15,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0" }
 derive_more = "0.99"
 sc-cli = { version = "0.10.0-dev", path = "../../../client/cli" }
 sc-client-api = { version = "4.0.0-dev", path = "../../../client/api" }
+sc-executor = { version = "0.10.0-dev", path = "../../../client/executor" }
 sc-service = { version = "0.10.0-dev", default-features = false, path = "../../../client/service" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
 sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
diff --git a/bin/node/inspect/src/command.rs b/bin/node/inspect/src/command.rs
index a2c63d684bf9..9bf69511689c 100644
--- a/bin/node/inspect/src/command.rs
+++ b/bin/node/inspect/src/command.rs
@@ -23,6 +23,7 @@ use crate::{
 	Inspector,
 };
 use sc_cli::{CliConfiguration, ImportParams, Result, SharedParams};
+use sc_executor::NativeElseWasmExecutor;
 use sc_service::{new_full_client, Configuration, NativeExecutionDispatch};
 use sp_runtime::traits::Block;
 use std::str::FromStr;
@@ -36,7 +37,13 @@ impl InspectCmd {
 		RA: Send + Sync + 'static,
 		EX: NativeExecutionDispatch + 'static,
 	{
-		let client = new_full_client::<B, RA, EX>(&config, None)?;
+		let executor = NativeElseWasmExecutor::<EX>::new(
+			config.wasm_method,
+			config.default_heap_pages,
+			config.max_runtime_instances,
+		);
+
+		let client = new_full_client::<B, RA, _>(&config, None, executor)?;
 		let inspect = Inspector::<B>::new(client);
 
 		match &self.command {
diff --git a/bin/node/test-runner-example/src/lib.rs b/bin/node/test-runner-example/src/lib.rs
index a4101556681a..04c099a2f4c2 100644
--- a/bin/node/test-runner-example/src/lib.rs
+++ b/bin/node/test-runner-example/src/lib.rs
@@ -22,6 +22,7 @@
 use grandpa::GrandpaBlockImport;
 use sc_consensus_babe::BabeBlockImport;
 use sc_consensus_manual_seal::consensus::babe::SlotTimestampProvider;
+use sc_executor::NativeElseWasmExecutor;
 use sc_service::{TFullBackend, TFullClient};
 use sp_runtime::generic::Era;
 use test_runner::{ChainInfo, SignatureVerificationOverride};
@@ -30,9 +31,9 @@ type BlockImport<B, BE, C, SC> = BabeBlockImport<B, C, GrandpaBlockImport<BE, B,
 
 /// A unit struct which implements `NativeExecutionDispatch` feeding in the
 /// hard-coded runtime.
-pub struct Executor;
+pub struct ExecutorDispatch;
 
-impl sc_executor::NativeExecutionDispatch for Executor {
+impl sc_executor::NativeExecutionDispatch for ExecutorDispatch {
 	type ExtendHostFunctions =
 		(frame_benchmarking::benchmarking::HostFunctions, SignatureVerificationOverride);
 
@@ -50,14 +51,14 @@ struct NodeTemplateChainInfo;
 
 impl ChainInfo for NodeTemplateChainInfo {
 	type Block = node_primitives::Block;
-	type Executor = Executor;
+	type ExecutorDispatch = ExecutorDispatch;
 	type Runtime = node_runtime::Runtime;
 	type RuntimeApi = node_runtime::RuntimeApi;
 	type SelectChain = sc_consensus::LongestChain<TFullBackend<Self::Block>, Self::Block>;
 	type BlockImport = BlockImport<
 		Self::Block,
 		TFullBackend<Self::Block>,
-		TFullClient<Self::Block, Self::RuntimeApi, Self::Executor>,
+		TFullClient<Self::Block, Self::RuntimeApi, NativeElseWasmExecutor<Self::ExecutorDispatch>>,
 		Self::SelectChain,
 	>;
 	type SignedExtras = node_runtime::SignedExtra;
diff --git a/bin/node/testing/src/bench.rs b/bin/node/testing/src/bench.rs
index f6ed2418410e..a1f9bc871056 100644
--- a/bin/node/testing/src/bench.rs
+++ b/bin/node/testing/src/bench.rs
@@ -46,7 +46,7 @@ use sc_client_api::{
 };
 use sc_client_db::PruningMode;
 use sc_consensus::{BlockImport, BlockImportParams, ForkChoiceStrategy, ImportResult, ImportedAux};
-use sc_executor::{NativeExecutor, WasmExecutionMethod};
+use sc_executor::{NativeElseWasmExecutor, WasmExecutionMethod};
 use sp_api::ProvideRuntimeApi;
 use sp_block_builder::BlockBuilder;
 use sp_consensus::BlockOrigin;
@@ -390,7 +390,7 @@ impl BenchDb {
 		let backend = sc_service::new_db_backend(db_config).expect("Should not fail");
 		let client = sc_service::new_client(
 			backend.clone(),
-			NativeExecutor::new(WasmExecutionMethod::Compiled, None, 8),
+			NativeElseWasmExecutor::new(WasmExecutionMethod::Compiled, None, 8),
 			&keyring.generate_genesis(),
 			None,
 			None,
diff --git a/bin/node/testing/src/client.rs b/bin/node/testing/src/client.rs
index 9538cd47d88a..8bd75834c549 100644
--- a/bin/node/testing/src/client.rs
+++ b/bin/node/testing/src/client.rs
@@ -24,7 +24,7 @@ use sp_runtime::BuildStorage;
 pub use substrate_test_client::*;
 
 /// Call executor for `node-runtime` `TestClient`.
-pub type Executor = sc_executor::NativeExecutor<node_executor::Executor>;
+pub type ExecutorDispatch = sc_executor::NativeElseWasmExecutor<node_executor::ExecutorDispatch>;
 
 /// Default backend type.
 pub type Backend = sc_client_db::Backend<node_primitives::Block>;
@@ -32,7 +32,7 @@ pub type Backend = sc_client_db::Backend<node_primitives::Block>;
 /// Test client type.
 pub type Client = client::Client<
 	Backend,
-	client::LocalCallExecutor<node_primitives::Block, Backend, Executor>,
+	client::LocalCallExecutor<node_primitives::Block, Backend, ExecutorDispatch>,
 	node_primitives::Block,
 	node_runtime::RuntimeApi,
 >;
@@ -64,7 +64,7 @@ pub trait TestClientBuilderExt: Sized {
 impl TestClientBuilderExt
 	for substrate_test_client::TestClientBuilder<
 		node_primitives::Block,
-		client::LocalCallExecutor<node_primitives::Block, Backend, Executor>,
+		client::LocalCallExecutor<node_primitives::Block, Backend, ExecutorDispatch>,
 		Backend,
 		GenesisParameters,
 	>
diff --git a/client/consensus/babe/src/tests.rs b/client/consensus/babe/src/tests.rs
index 4b4e0a9d0f3d..c033f4535be0 100644
--- a/client/consensus/babe/src/tests.rs
+++ b/client/consensus/babe/src/tests.rs
@@ -55,7 +55,7 @@ type Error = sp_blockchain::Error;
 
 type TestClient = substrate_test_runtime_client::client::Client<
 	substrate_test_runtime_client::Backend,
-	substrate_test_runtime_client::Executor,
+	substrate_test_runtime_client::ExecutorDispatch,
 	TestBlock,
 	substrate_test_runtime_client::runtime::RuntimeApi,
 >;
diff --git a/client/executor/src/lib.rs b/client/executor/src/lib.rs
index e4442960ea24..041db87bc82a 100644
--- a/client/executor/src/lib.rs
+++ b/client/executor/src/lib.rs
@@ -39,7 +39,7 @@ mod wasm_runtime;
 
 pub use codec::Codec;
 pub use native_executor::{
-	with_externalities_safe, NativeExecutionDispatch, NativeExecutor, WasmExecutor,
+	with_externalities_safe, NativeElseWasmExecutor, NativeExecutionDispatch, WasmExecutor,
 };
 #[doc(hidden)]
 pub use sp_core::traits::Externalities;
diff --git a/client/executor/src/native_executor.rs b/client/executor/src/native_executor.rs
index c0542554c731..38dba55b5f87 100644
--- a/client/executor/src/native_executor.rs
+++ b/client/executor/src/native_executor.rs
@@ -311,7 +311,7 @@ impl RuntimeVersionOf for WasmExecutor {
 
 /// A generic `CodeExecutor` implementation that uses a delegate to determine wasm code equivalence
 /// and dispatch to native code when possible, falling back on `WasmExecutor` when not.
-pub struct NativeExecutor<D> {
+pub struct NativeElseWasmExecutor<D> {
 	/// Dummy field to avoid the compiler complaining about us not using `D`.
 	_dummy: std::marker::PhantomData<D>,
 	/// Native runtime version info.
@@ -320,7 +320,7 @@ pub struct NativeExecutor<D> {
 	wasm: WasmExecutor,
 }
 
-impl<D: NativeExecutionDispatch> NativeExecutor<D> {
+impl<D: NativeExecutionDispatch> NativeElseWasmExecutor<D> {
 	/// Create new instance.
 	///
 	/// # Parameters
@@ -356,7 +356,7 @@ impl<D: NativeExecutionDispatch> NativeExecutor<D> {
 			None,
 		);
 
-		NativeExecutor {
+		NativeElseWasmExecutor {
 			_dummy: Default::default(),
 			native_version: D::native_version(),
 			wasm: wasm_executor,
@@ -364,7 +364,7 @@ impl<D: NativeExecutionDispatch> NativeExecutor<D> {
 	}
 }
 
-impl<D: NativeExecutionDispatch> RuntimeVersionOf for NativeExecutor<D> {
+impl<D: NativeExecutionDispatch> RuntimeVersionOf for NativeElseWasmExecutor<D> {
 	fn runtime_version(
 		&self,
 		ext: &mut dyn Externalities,
@@ -377,7 +377,7 @@ impl<D: NativeExecutionDispatch> RuntimeVersionOf for NativeExecutor<D> {
 	}
 }
 
-impl<D: NativeExecutionDispatch> GetNativeVersion for NativeExecutor<D> {
+impl<D: NativeExecutionDispatch> GetNativeVersion for NativeElseWasmExecutor<D> {
 	fn native_version(&self) -> &NativeVersion {
 		&self.native_version
 	}
@@ -508,7 +508,7 @@ fn preregister_builtin_ext(module: Arc<dyn WasmModule>) {
 	});
 }
 
-impl<D: NativeExecutionDispatch + 'static> CodeExecutor for NativeExecutor<D> {
+impl<D: NativeExecutionDispatch + 'static> CodeExecutor for NativeElseWasmExecutor<D> {
 	type Error = Error;
 
 	fn call<
@@ -586,9 +586,9 @@ impl<D: NativeExecutionDispatch + 'static> CodeExecutor for NativeExecutor<D> {
 	}
 }
 
-impl<D: NativeExecutionDispatch> Clone for NativeExecutor<D> {
+impl<D: NativeExecutionDispatch> Clone for NativeElseWasmExecutor<D> {
 	fn clone(&self) -> Self {
-		NativeExecutor {
+		NativeElseWasmExecutor {
 			_dummy: Default::default(),
 			native_version: D::native_version(),
 			wasm: self.wasm.clone(),
@@ -596,7 +596,7 @@ impl<D: NativeExecutionDispatch> Clone for NativeExecutor<D> {
 	}
 }
 
-impl<D: NativeExecutionDispatch> sp_core::traits::ReadRuntimeVersion for NativeExecutor<D> {
+impl<D: NativeExecutionDispatch> sp_core::traits::ReadRuntimeVersion for NativeElseWasmExecutor<D> {
 	fn read_runtime_version(
 		&self,
 		wasm_code: &[u8],
@@ -618,9 +618,9 @@ mod tests {
 		}
 	}
 
-	pub struct MyExecutor;
+	pub struct MyExecutorDispatch;
 
-	impl NativeExecutionDispatch for MyExecutor {
+	impl NativeExecutionDispatch for MyExecutorDispatch {
 		type ExtendHostFunctions = (my_interface::HostFunctions, my_interface::HostFunctions);
 
 		fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
@@ -634,7 +634,11 @@ mod tests {
 
 	#[test]
 	fn native_executor_registers_custom_interface() {
-		let executor = NativeExecutor::<MyExecutor>::new(WasmExecutionMethod::Interpreted, None, 8);
+		let executor = NativeElseWasmExecutor::<MyExecutorDispatch>::new(
+			WasmExecutionMethod::Interpreted,
+			None,
+			8,
+		);
 		my_interface::HostFunctions::host_functions().iter().for_each(|function| {
 			assert_eq!(executor.wasm.host_functions.iter().filter(|f| f == &function).count(), 2);
 		});
diff --git a/client/network/test/src/lib.rs b/client/network/test/src/lib.rs
index 7668aa8fd56e..bb49cef8c642 100644
--- a/client/network/test/src/lib.rs
+++ b/client/network/test/src/lib.rs
@@ -126,7 +126,7 @@ impl<B: BlockT> Verifier<B> for PassThroughVerifier {
 
 pub type PeersFullClient = Client<
 	substrate_test_runtime_client::Backend,
-	substrate_test_runtime_client::Executor,
+	substrate_test_runtime_client::ExecutorDispatch,
 	Block,
 	substrate_test_runtime_client::runtime::RuntimeApi,
 >;
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index 9b5390710cd8..fb83fdb00ca4 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -37,7 +37,7 @@ use sc_client_api::{
 };
 use sc_client_db::{Backend, DatabaseSettings};
 use sc_consensus::import_queue::ImportQueue;
-use sc_executor::{NativeExecutionDispatch, NativeExecutor, RuntimeVersionOf};
+use sc_executor::RuntimeVersionOf;
 use sc_keystore::LocalKeystore;
 use sc_network::{
 	block_request_handler::{self, BlockRequestHandler},
@@ -128,39 +128,39 @@ where
 }
 
 /// Full client type.
-pub type TFullClient<TBl, TRtApi, TExecDisp> =
-	Client<TFullBackend<TBl>, TFullCallExecutor<TBl, TExecDisp>, TBl, TRtApi>;
+pub type TFullClient<TBl, TRtApi, TExec> =
+	Client<TFullBackend<TBl>, TFullCallExecutor<TBl, TExec>, TBl, TRtApi>;
 
 /// Full client backend type.
 pub type TFullBackend<TBl> = sc_client_db::Backend<TBl>;
 
 /// Full client call executor type.
-pub type TFullCallExecutor<TBl, TExecDisp> =
-	crate::client::LocalCallExecutor<TBl, sc_client_db::Backend<TBl>, NativeExecutor<TExecDisp>>;
+pub type TFullCallExecutor<TBl, TExec> =
+	crate::client::LocalCallExecutor<TBl, sc_client_db::Backend<TBl>, TExec>;
 
 /// Light client type.
-pub type TLightClient<TBl, TRtApi, TExecDisp> =
-	TLightClientWithBackend<TBl, TRtApi, TExecDisp, TLightBackend<TBl>>;
+pub type TLightClient<TBl, TRtApi, TExec> =
+	TLightClientWithBackend<TBl, TRtApi, TExec, TLightBackend<TBl>>;
 
 /// Light client backend type.
 pub type TLightBackend<TBl> =
 	sc_light::Backend<sc_client_db::light::LightStorage<TBl>, HashFor<TBl>>;
 
 /// Light call executor type.
-pub type TLightCallExecutor<TBl, TExecDisp> = sc_light::GenesisCallExecutor<
+pub type TLightCallExecutor<TBl, TExec> = sc_light::GenesisCallExecutor<
 	sc_light::Backend<sc_client_db::light::LightStorage<TBl>, HashFor<TBl>>,
 	crate::client::LocalCallExecutor<
 		TBl,
 		sc_light::Backend<sc_client_db::light::LightStorage<TBl>, HashFor<TBl>>,
-		NativeExecutor<TExecDisp>,
+		TExec,
 	>,
 >;
 
-type TFullParts<TBl, TRtApi, TExecDisp> =
-	(TFullClient<TBl, TRtApi, TExecDisp>, Arc<TFullBackend<TBl>>, KeystoreContainer, TaskManager);
+type TFullParts<TBl, TRtApi, TExec> =
+	(TFullClient<TBl, TRtApi, TExec>, Arc<TFullBackend<TBl>>, KeystoreContainer, TaskManager);
 
-type TLightParts<TBl, TRtApi, TExecDisp> = (
-	Arc<TLightClient<TBl, TRtApi, TExecDisp>>,
+type TLightParts<TBl, TRtApi, TExec> = (
+	Arc<TLightClient<TBl, TRtApi, TExec>>,
 	Arc<TLightBackend<TBl>>,
 	KeystoreContainer,
 	TaskManager,
@@ -172,12 +172,9 @@ pub type TLightBackendWithHash<TBl, THash> =
 	sc_light::Backend<sc_client_db::light::LightStorage<TBl>, THash>;
 
 /// Light client type with a specific backend.
-pub type TLightClientWithBackend<TBl, TRtApi, TExecDisp, TBackend> = Client<
+pub type TLightClientWithBackend<TBl, TRtApi, TExec, TBackend> = Client<
 	TBackend,
-	sc_light::GenesisCallExecutor<
-		TBackend,
-		crate::client::LocalCallExecutor<TBl, TBackend, NativeExecutor<TExecDisp>>,
-	>,
+	sc_light::GenesisCallExecutor<TBackend, crate::client::LocalCallExecutor<TBl, TBackend, TExec>>,
 	TBl,
 	TRtApi,
 >;
@@ -262,26 +259,28 @@ impl KeystoreContainer {
 }
 
 /// Creates a new full client for the given config.
-pub fn new_full_client<TBl, TRtApi, TExecDisp>(
+pub fn new_full_client<TBl, TRtApi, TExec>(
 	config: &Configuration,
 	telemetry: Option<TelemetryHandle>,
-) -> Result<TFullClient<TBl, TRtApi, TExecDisp>, Error>
+	executor: TExec,
+) -> Result<TFullClient<TBl, TRtApi, TExec>, Error>
 where
 	TBl: BlockT,
-	TExecDisp: NativeExecutionDispatch + 'static,
+	TExec: CodeExecutor + RuntimeVersionOf + Clone,
 	TBl::Hash: FromStr,
 {
-	new_full_parts(config, telemetry).map(|parts| parts.0)
+	new_full_parts(config, telemetry, executor).map(|parts| parts.0)
 }
 
 /// Create the initial parts of a full node.
-pub fn new_full_parts<TBl, TRtApi, TExecDisp>(
+pub fn new_full_parts<TBl, TRtApi, TExec>(
 	config: &Configuration,
 	telemetry: Option<TelemetryHandle>,
-) -> Result<TFullParts<TBl, TRtApi, TExecDisp>, Error>
+	executor: TExec,
+) -> Result<TFullParts<TBl, TRtApi, TExec>, Error>
 where
 	TBl: BlockT,
-	TExecDisp: NativeExecutionDispatch + 'static,
+	TExec: CodeExecutor + RuntimeVersionOf + Clone,
 	TBl::Hash: FromStr,
 {
 	let keystore_container = KeystoreContainer::new(&config.keystore)?;
@@ -291,12 +290,6 @@ where
 		TaskManager::new(config.task_executor.clone(), registry)?
 	};
 
-	let executor = NativeExecutor::<TExecDisp>::new(
-		config.wasm_method,
-		config.default_heap_pages,
-		config.max_runtime_instances,
-	);
-
 	let chain_spec = &config.chain_spec;
 	let fork_blocks = get_extension::<ForkBlocks<TBl>>(chain_spec.extensions())
 		.cloned()
@@ -368,13 +361,14 @@ where
 }
 
 /// Create the initial parts of a light node.
-pub fn new_light_parts<TBl, TRtApi, TExecDisp>(
+pub fn new_light_parts<TBl, TRtApi, TExec>(
 	config: &Configuration,
 	telemetry: Option<TelemetryHandle>,
-) -> Result<TLightParts<TBl, TRtApi, TExecDisp>, Error>
+	executor: TExec,
+) -> Result<TLightParts<TBl, TRtApi, TExec>, Error>
 where
 	TBl: BlockT,
-	TExecDisp: NativeExecutionDispatch + 'static,
+	TExec: CodeExecutor + RuntimeVersionOf + Clone,
 {
 	let keystore_container = KeystoreContainer::new(&config.keystore)?;
 	let task_manager = {
@@ -382,12 +376,6 @@ where
 		TaskManager::new(config.task_executor.clone(), registry)?
 	};
 
-	let executor = NativeExecutor::<TExecDisp>::new(
-		config.wasm_method,
-		config.default_heap_pages,
-		config.max_runtime_instances,
-	);
-
 	let db_storage = {
 		let db_settings = sc_client_db::DatabaseSettings {
 			state_cache_size: config.state_cache_size,
diff --git a/client/service/src/client/call_executor.rs b/client/service/src/client/call_executor.rs
index 23cc08b7e188..41cc1526fa3e 100644
--- a/client/service/src/client/call_executor.rs
+++ b/client/service/src/client/call_executor.rs
@@ -360,17 +360,20 @@ where
 mod tests {
 	use super::*;
 	use sc_client_api::in_mem;
-	use sc_executor::{NativeExecutor, WasmExecutionMethod};
+	use sc_executor::{NativeElseWasmExecutor, WasmExecutionMethod};
 	use sp_core::{
 		testing::TaskExecutor,
 		traits::{FetchRuntimeCode, WrappedRuntimeCode},
 	};
-	use substrate_test_runtime_client::{runtime, GenesisInit, LocalExecutor};
+	use substrate_test_runtime_client::{runtime, GenesisInit, LocalExecutorDispatch};
 
 	#[test]
 	fn should_get_override_if_exists() {
-		let executor =
-			NativeExecutor::<LocalExecutor>::new(WasmExecutionMethod::Interpreted, Some(128), 1);
+		let executor = NativeElseWasmExecutor::<LocalExecutorDispatch>::new(
+			WasmExecutionMethod::Interpreted,
+			Some(128),
+			1,
+		);
 
 		let overrides = crate::client::wasm_override::dummy_overrides(&executor);
 		let onchain_code = WrappedRuntimeCode(substrate_test_runtime::wasm_binary_unwrap().into());
diff --git a/client/service/src/client/wasm_override.rs b/client/service/src/client/wasm_override.rs
index a04a48f9c4b4..6d5a071269d4 100644
--- a/client/service/src/client/wasm_override.rs
+++ b/client/service/src/client/wasm_override.rs
@@ -204,19 +204,20 @@ where
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use sc_executor::{NativeExecutor, WasmExecutionMethod};
+	use sc_executor::{NativeElseWasmExecutor, WasmExecutionMethod};
 	use std::fs::{self, File};
-	use substrate_test_runtime_client::LocalExecutor;
+	use substrate_test_runtime_client::LocalExecutorDispatch;
 
 	fn wasm_test<F>(fun: F)
 	where
-		F: Fn(&Path, &[u8], &NativeExecutor<LocalExecutor>),
+		F: Fn(&Path, &[u8], &NativeElseWasmExecutor<LocalExecutorDispatch>),
 	{
-		let exec = NativeExecutor::<substrate_test_runtime_client::LocalExecutor>::new(
-			WasmExecutionMethod::Interpreted,
-			Some(128),
-			1,
-		);
+		let exec =
+			NativeElseWasmExecutor::<substrate_test_runtime_client::LocalExecutorDispatch>::new(
+				WasmExecutionMethod::Interpreted,
+				Some(128),
+				1,
+			);
 		let bytes = substrate_test_runtime::wasm_binary_unwrap();
 		let dir = tempfile::tempdir().expect("Create a temporary directory");
 		fun(dir.path(), bytes, &exec);
@@ -226,8 +227,11 @@ mod tests {
 	#[test]
 	fn should_get_runtime_version() {
 		let wasm = WasmBlob::new(substrate_test_runtime::wasm_binary_unwrap().to_vec());
-		let executor =
-			NativeExecutor::<LocalExecutor>::new(WasmExecutionMethod::Interpreted, Some(128), 1);
+		let executor = NativeElseWasmExecutor::<LocalExecutorDispatch>::new(
+			WasmExecutionMethod::Interpreted,
+			Some(128),
+			1,
+		);
 
 		let version = WasmOverride::runtime_version(&executor, &wasm, Some(128))
 			.expect("should get the `RuntimeVersion` of the test-runtime wasm blob");
diff --git a/client/service/test/src/client/light.rs b/client/service/test/src/client/light.rs
index da4363b88102..fb9566d208f7 100644
--- a/client/service/test/src/client/light.rs
+++ b/client/service/test/src/client/light.rs
@@ -30,7 +30,7 @@ use sc_client_api::{
 	RemoteBodyRequest, RemoteCallRequest, RemoteChangesRequest, RemoteHeaderRequest,
 	RemoteReadChildRequest, RemoteReadRequest, Storage, StorageProof, StorageProvider,
 };
-use sc_executor::{NativeExecutor, RuntimeVersion, WasmExecutionMethod};
+use sc_executor::{NativeElseWasmExecutor, RuntimeVersion, WasmExecutionMethod};
 use sc_light::{
 	backend::{Backend, GenesisOrUnavailableState},
 	blockchain::{Blockchain, BlockchainCache},
@@ -258,8 +258,9 @@ impl CallExecutor<Block> for DummyCallExecutor {
 	}
 }
 
-fn local_executor() -> NativeExecutor<substrate_test_runtime_client::LocalExecutor> {
-	NativeExecutor::new(WasmExecutionMethod::Interpreted, None, 8)
+fn local_executor() -> NativeElseWasmExecutor<substrate_test_runtime_client::LocalExecutorDispatch>
+{
+	NativeElseWasmExecutor::new(WasmExecutionMethod::Interpreted, None, 8)
 }
 
 #[test]
@@ -446,7 +447,7 @@ fn code_is_executed_at_genesis_only() {
 }
 
 type TestChecker = LightDataChecker<
-	NativeExecutor<substrate_test_runtime_client::LocalExecutor>,
+	NativeElseWasmExecutor<substrate_test_runtime_client::LocalExecutorDispatch>,
 	Block,
 	DummyStorage,
 >;
diff --git a/client/service/test/src/client/mod.rs b/client/service/test/src/client/mod.rs
index bd1f5be8d5cd..295e941f7ceb 100644
--- a/client/service/test/src/client/mod.rs
+++ b/client/service/test/src/client/mod.rs
@@ -62,9 +62,9 @@ mod light;
 
 const TEST_ENGINE_ID: ConsensusEngineId = *b"TEST";
 
-pub struct Executor;
+pub struct ExecutorDispatch;
 
-impl sc_executor::NativeExecutionDispatch for Executor {
+impl sc_executor::NativeExecutionDispatch for ExecutorDispatch {
 	type ExtendHostFunctions = ();
 
 	fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
@@ -76,14 +76,14 @@ impl sc_executor::NativeExecutionDispatch for Executor {
 	}
 }
 
-fn executor() -> sc_executor::NativeExecutor<Executor> {
-	sc_executor::NativeExecutor::new(sc_executor::WasmExecutionMethod::Interpreted, None, 8)
+fn executor() -> sc_executor::NativeElseWasmExecutor<ExecutorDispatch> {
+	sc_executor::NativeElseWasmExecutor::new(sc_executor::WasmExecutionMethod::Interpreted, None, 8)
 }
 
 pub fn prepare_client_with_key_changes() -> (
 	client::Client<
 		substrate_test_runtime_client::Backend,
-		substrate_test_runtime_client::Executor,
+		substrate_test_runtime_client::ExecutorDispatch,
 		Block,
 		RuntimeApi,
 	>,
@@ -2106,7 +2106,7 @@ fn cleans_up_closed_notification_sinks_on_block_import() {
 		LocalCallExecutor<
 			Block,
 			in_mem::Backend<Block>,
-			sc_executor::NativeExecutor<LocalExecutor>,
+			sc_executor::NativeElseWasmExecutor<LocalExecutorDispatch>,
 		>,
 		substrate_test_runtime_client::runtime::Block,
 		substrate_test_runtime_client::runtime::RuntimeApi,
diff --git a/primitives/api/test/tests/decl_and_impl.rs b/primitives/api/test/tests/decl_and_impl.rs
index ae24ed1cb8fe..8d1b04a37a9f 100644
--- a/primitives/api/test/tests/decl_and_impl.rs
+++ b/primitives/api/test/tests/decl_and_impl.rs
@@ -136,7 +136,7 @@ mock_impl_runtime_apis! {
 
 type TestClient = substrate_test_runtime_client::client::Client<
 	substrate_test_runtime_client::Backend,
-	substrate_test_runtime_client::Executor,
+	substrate_test_runtime_client::ExecutorDispatch,
 	Block,
 	RuntimeApi,
 >;
diff --git a/primitives/api/test/tests/runtime_calls.rs b/primitives/api/test/tests/runtime_calls.rs
index b0b14ec1e944..101f92fd6c7d 100644
--- a/primitives/api/test/tests/runtime_calls.rs
+++ b/primitives/api/test/tests/runtime_calls.rs
@@ -206,7 +206,11 @@ fn record_proof_works() {
 
 	// Use the proof backend to execute `execute_block`.
 	let mut overlay = Default::default();
-	let executor = NativeExecutor::<LocalExecutor>::new(WasmExecutionMethod::Interpreted, None, 8);
+	let executor = NativeElseWasmExecutor::<LocalExecutorDispatch>::new(
+		WasmExecutionMethod::Interpreted,
+		None,
+		8,
+	);
 	execution_proof_check_on_trie_backend::<_, u64, _, _>(
 		&backend,
 		&mut overlay,
diff --git a/test-utils/client/src/lib.rs b/test-utils/client/src/lib.rs
index 3eb7eb0b7174..9bc411af5d3e 100644
--- a/test-utils/client/src/lib.rs
+++ b/test-utils/client/src/lib.rs
@@ -27,7 +27,7 @@ pub use sc_client_api::{
 	BadBlocks, ForkBlocks,
 };
 pub use sc_client_db::{self, Backend};
-pub use sc_executor::{self, NativeExecutor, WasmExecutionMethod};
+pub use sc_executor::{self, NativeElseWasmExecutor, WasmExecutionMethod};
 pub use sc_service::{client, RpcHandlers, RpcSession};
 pub use sp_consensus;
 pub use sp_keyring::{
@@ -73,14 +73,14 @@ impl GenesisInit for () {
 }
 
 /// A builder for creating a test client instance.
-pub struct TestClientBuilder<Block: BlockT, Executor, Backend, G: GenesisInit> {
+pub struct TestClientBuilder<Block: BlockT, ExecutorDispatch, Backend, G: GenesisInit> {
 	execution_strategies: ExecutionStrategies,
 	genesis_init: G,
 	/// The key is an unprefixed storage key, this only contains
 	/// default child trie content.
 	child_storage_extension: HashMap<Vec<u8>, StorageChild>,
 	backend: Arc<Backend>,
-	_executor: std::marker::PhantomData<Executor>,
+	_executor: std::marker::PhantomData<ExecutorDispatch>,
 	keystore: Option<SyncCryptoStorePtr>,
 	fork_blocks: ForkBlocks<Block>,
 	bad_blocks: BadBlocks<Block>,
@@ -88,16 +88,16 @@ pub struct TestClientBuilder<Block: BlockT, Executor, Backend, G: GenesisInit> {
 	no_genesis: bool,
 }
 
-impl<Block: BlockT, Executor, G: GenesisInit> Default
-	for TestClientBuilder<Block, Executor, Backend<Block>, G>
+impl<Block: BlockT, ExecutorDispatch, G: GenesisInit> Default
+	for TestClientBuilder<Block, ExecutorDispatch, Backend<Block>, G>
 {
 	fn default() -> Self {
 		Self::with_default_backend()
 	}
 }
 
-impl<Block: BlockT, Executor, G: GenesisInit>
-	TestClientBuilder<Block, Executor, Backend<Block>, G>
+impl<Block: BlockT, ExecutorDispatch, G: GenesisInit>
+	TestClientBuilder<Block, ExecutorDispatch, Backend<Block>, G>
 {
 	/// Create new `TestClientBuilder` with default backend.
 	pub fn with_default_backend() -> Self {
@@ -122,8 +122,8 @@ impl<Block: BlockT, Executor, G: GenesisInit>
 	}
 }
 
-impl<Block: BlockT, Executor, Backend, G: GenesisInit>
-	TestClientBuilder<Block, Executor, Backend, G>
+impl<Block: BlockT, ExecutorDispatch, Backend, G: GenesisInit>
+	TestClientBuilder<Block, ExecutorDispatch, Backend, G>
 {
 	/// Create a new instance of the test client builder.
 	pub fn with_backend(backend: Arc<Backend>) -> Self {
@@ -210,13 +210,13 @@ impl<Block: BlockT, Executor, Backend, G: GenesisInit>
 	/// Build the test client with the given native executor.
 	pub fn build_with_executor<RuntimeApi>(
 		self,
-		executor: Executor,
+		executor: ExecutorDispatch,
 	) -> (
-		client::Client<Backend, Executor, Block, RuntimeApi>,
+		client::Client<Backend, ExecutorDispatch, Block, RuntimeApi>,
 		sc_consensus::LongestChain<Backend, Block>,
 	)
 	where
-		Executor: sc_client_api::CallExecutor<Block> + 'static,
+		ExecutorDispatch: sc_client_api::CallExecutor<Block> + 'static,
 		Backend: sc_client_api::backend::Backend<Block>,
 		<Backend as sc_client_api::backend::Backend<Block>>::OffchainStorage: 'static,
 	{
@@ -264,8 +264,13 @@ impl<Block: BlockT, Executor, Backend, G: GenesisInit>
 	}
 }
 
-impl<Block: BlockT, E, Backend, G: GenesisInit>
-	TestClientBuilder<Block, client::LocalCallExecutor<Block, Backend, NativeExecutor<E>>, Backend, G>
+impl<Block: BlockT, D, Backend, G: GenesisInit>
+	TestClientBuilder<
+		Block,
+		client::LocalCallExecutor<Block, Backend, NativeElseWasmExecutor<D>>,
+		Backend,
+		G,
+	>
 {
 	/// Build the test client with the given native executor.
 	pub fn build_with_native_executor<RuntimeApi, I>(
@@ -274,20 +279,20 @@ impl<Block: BlockT, E, Backend, G: GenesisInit>
 	) -> (
 		client::Client<
 			Backend,
-			client::LocalCallExecutor<Block, Backend, NativeExecutor<E>>,
+			client::LocalCallExecutor<Block, Backend, NativeElseWasmExecutor<D>>,
 			Block,
 			RuntimeApi,
 		>,
 		sc_consensus::LongestChain<Backend, Block>,
 	)
 	where
-		I: Into<Option<NativeExecutor<E>>>,
-		E: sc_executor::NativeExecutionDispatch + 'static,
+		I: Into<Option<NativeElseWasmExecutor<D>>>,
+		D: sc_executor::NativeExecutionDispatch + 'static,
 		Backend: sc_client_api::backend::Backend<Block> + 'static,
 	{
-		let executor = executor
-			.into()
-			.unwrap_or_else(|| NativeExecutor::new(WasmExecutionMethod::Interpreted, None, 8));
+		let executor = executor.into().unwrap_or_else(|| {
+			NativeElseWasmExecutor::new(WasmExecutionMethod::Interpreted, None, 8)
+		});
 		let executor = LocalCallExecutor::new(
 			self.backend.clone(),
 			executor,
diff --git a/test-utils/runtime/client/src/lib.rs b/test-utils/runtime/client/src/lib.rs
index 00a8b9495fa6..dc5ccadc4574 100644
--- a/test-utils/runtime/client/src/lib.rs
+++ b/test-utils/runtime/client/src/lib.rs
@@ -51,8 +51,8 @@ pub mod prelude {
 	};
 	// Client structs
 	pub use super::{
-		Backend, Executor, LightBackend, LightExecutor, LocalExecutor, NativeExecutor, TestClient,
-		TestClientBuilder, WasmExecutionMethod,
+		Backend, ExecutorDispatch, LightBackend, LightExecutor, LocalExecutorDispatch,
+		NativeElseWasmExecutor, TestClient, TestClientBuilder, WasmExecutionMethod,
 	};
 	// Keyring
 	pub use super::{AccountKeyring, Sr25519Keyring};
@@ -60,9 +60,9 @@ pub mod prelude {
 
 /// A unit struct which implements `NativeExecutionDispatch` feeding in the
 /// hard-coded runtime.
-pub struct LocalExecutor;
+pub struct LocalExecutorDispatch;
 
-impl sc_executor::NativeExecutionDispatch for LocalExecutor {
+impl sc_executor::NativeExecutionDispatch for LocalExecutorDispatch {
 	type ExtendHostFunctions = ();
 
 	fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
@@ -78,10 +78,10 @@ impl sc_executor::NativeExecutionDispatch for LocalExecutor {
 pub type Backend = substrate_test_client::Backend<substrate_test_runtime::Block>;
 
 /// Test client executor.
-pub type Executor = client::LocalCallExecutor<
+pub type ExecutorDispatch = client::LocalCallExecutor<
 	substrate_test_runtime::Block,
 	Backend,
-	NativeExecutor<LocalExecutor>,
+	NativeElseWasmExecutor<LocalExecutorDispatch>,
 >;
 
 /// Test client light database backend.
@@ -96,7 +96,7 @@ pub type LightExecutor = sc_light::GenesisCallExecutor<
 			sc_client_db::light::LightStorage<substrate_test_runtime::Block>,
 			HashFor<substrate_test_runtime::Block>,
 		>,
-		NativeExecutor<LocalExecutor>,
+		NativeElseWasmExecutor<LocalExecutorDispatch>,
 	>,
 >;
 
@@ -174,13 +174,13 @@ pub type TestClientBuilder<E, B> = substrate_test_client::TestClientBuilder<
 	GenesisParameters,
 >;
 
-/// Test client type with `LocalExecutor` and generic Backend.
+/// Test client type with `LocalExecutorDispatch` and generic Backend.
 pub type Client<B> = client::Client<
 	B,
 	client::LocalCallExecutor<
 		substrate_test_runtime::Block,
 		B,
-		sc_executor::NativeExecutor<LocalExecutor>,
+		sc_executor::NativeElseWasmExecutor<LocalExecutorDispatch>,
 	>,
 	substrate_test_runtime::Block,
 	substrate_test_runtime::RuntimeApi,
@@ -195,7 +195,7 @@ pub trait DefaultTestClientBuilderExt: Sized {
 	fn new() -> Self;
 }
 
-impl DefaultTestClientBuilderExt for TestClientBuilder<Executor, Backend> {
+impl DefaultTestClientBuilderExt for TestClientBuilder<ExecutorDispatch, Backend> {
 	fn new() -> Self {
 		Self::with_default_backend()
 	}
@@ -277,7 +277,7 @@ impl<B> TestClientBuilderExt<B>
 		client::LocalCallExecutor<
 			substrate_test_runtime::Block,
 			B,
-			sc_executor::NativeExecutor<LocalExecutor>,
+			sc_executor::NativeElseWasmExecutor<LocalExecutorDispatch>,
 		>,
 		B,
 	> where
@@ -436,6 +436,6 @@ pub fn new_light_fetcher() -> LightFetcher {
 }
 
 /// Create a new native executor.
-pub fn new_native_executor() -> sc_executor::NativeExecutor<LocalExecutor> {
-	sc_executor::NativeExecutor::new(sc_executor::WasmExecutionMethod::Interpreted, None, 8)
+pub fn new_native_executor() -> sc_executor::NativeElseWasmExecutor<LocalExecutorDispatch> {
+	sc_executor::NativeElseWasmExecutor::new(sc_executor::WasmExecutionMethod::Interpreted, None, 8)
 }
diff --git a/test-utils/runtime/src/system.rs b/test-utils/runtime/src/system.rs
index 15f1a2e654dc..334569d055a0 100644
--- a/test-utils/runtime/src/system.rs
+++ b/test-utils/runtime/src/system.rs
@@ -349,7 +349,7 @@ mod tests {
 	use super::*;
 
 	use crate::{wasm_binary_unwrap, Header, Transfer};
-	use sc_executor::{NativeExecutor, WasmExecutionMethod};
+	use sc_executor::{NativeElseWasmExecutor, WasmExecutionMethod};
 	use sp_core::{
 		map,
 		traits::{CodeExecutor, RuntimeCode},
@@ -373,8 +373,8 @@ mod tests {
 		}
 	}
 
-	fn executor() -> NativeExecutor<NativeDispatch> {
-		NativeExecutor::new(WasmExecutionMethod::Interpreted, None, 8)
+	fn executor() -> NativeElseWasmExecutor<NativeDispatch> {
+		NativeElseWasmExecutor::new(WasmExecutionMethod::Interpreted, None, 8)
 	}
 
 	fn new_test_ext() -> TestExternalities {
diff --git a/test-utils/test-runner/src/client.rs b/test-utils/test-runner/src/client.rs
index 80b11e7bff7f..6622c1f91942 100644
--- a/test-utils/test-runner/src/client.rs
+++ b/test-utils/test-runner/src/client.rs
@@ -26,6 +26,7 @@ use manual_seal::{
 	run_manual_seal, EngineCommand, ManualSealParams,
 };
 use sc_client_api::backend::Backend;
+use sc_executor::NativeElseWasmExecutor;
 use sc_service::{
 	build_network, new_full_parts, spawn_tasks, BuildNetworkParams, ChainSpec, Configuration,
 	SpawnTasksParams, TFullBackend, TFullClient, TaskExecutor, TaskManager,
@@ -50,7 +51,7 @@ type ClientParts<T> = (
 		TFullClient<
 			<T as ChainInfo>::Block,
 			<T as ChainInfo>::RuntimeApi,
-			<T as ChainInfo>::Executor,
+			NativeElseWasmExecutor<<T as ChainInfo>::ExecutorDispatch>,
 		>,
 	>,
 	Arc<
@@ -83,7 +84,7 @@ where
 	T: ChainInfo + 'static,
 	<T::RuntimeApi as ConstructRuntimeApi<
 		T::Block,
-		TFullClient<T::Block, T::RuntimeApi, T::Executor>,
+		TFullClient<T::Block, T::RuntimeApi, NativeElseWasmExecutor<T::ExecutorDispatch>>,
 	>>::RuntimeApi: Core<T::Block>
 		+ Metadata<T::Block>
 		+ OffchainWorkerApi<T::Block>
@@ -106,8 +107,14 @@ where
 			default_config(task_executor, chain_spec),
 	};
 
+	let executor = NativeElseWasmExecutor::<T::ExecutorDispatch>::new(
+		config.wasm_method,
+		config.default_heap_pages,
+		config.max_runtime_instances,
+	);
+
 	let (client, backend, keystore, mut task_manager) =
-		new_full_parts::<T::Block, T::RuntimeApi, T::Executor>(&config, None)?;
+		new_full_parts::<T::Block, T::RuntimeApi, _>(&config, None, executor)?;
 	let client = Arc::new(client);
 
 	let select_chain = sc_consensus::LongestChain::new(backend.clone());
diff --git a/test-utils/test-runner/src/lib.rs b/test-utils/test-runner/src/lib.rs
index 4f5f20a8f398..ca2c518fd692 100644
--- a/test-utils/test-runner/src/lib.rs
+++ b/test-utils/test-runner/src/lib.rs
@@ -62,9 +62,9 @@
 //!
 //! type BlockImport<B, BE, C, SC> = BabeBlockImport<B, C, GrandpaBlockImport<BE, B, C, SC>>;
 //!
-//! pub struct Executor;
+//! pub struct ExecutorDispatch;
 //!
-//! impl sc_executor::NativeExecutionDispatch for Executor {
+//! impl sc_executor::NativeExecutionDispatch for ExecutorDispatch {
 //! 	type ExtendHostFunctions = SignatureVerificationOverride;
 //!
 //! 	fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
@@ -81,8 +81,8 @@
 //! impl ChainInfo for Requirements {
 //!     /// Provide a Block type with an OpaqueExtrinsic
 //!     type Block = node_primitives::Block;
-//!     /// Provide an Executor type for the runtime
-//!     type Executor = Executor;
+//!     /// Provide an ExecutorDispatch type for the runtime
+//!     type ExecutorDispatch = ExecutorDispatch;
 //!     /// Provide the runtime itself
 //!     type Runtime = node_runtime::Runtime;
 //!     /// A touch of runtime api
@@ -93,7 +93,7 @@
 //! 	type BlockImport = BlockImport<
 //! 		Self::Block,
 //! 		TFullBackend<Self::Block>,
-//! 		TFullClient<Self::Block, Self::RuntimeApi, Self::Executor>,
+//! 		TFullClient<Self::Block, Self::RuntimeApi, NativeElseWasmExecutor<Self::ExecutorDispatch>>,
 //! 		Self::SelectChain,
 //!     >;
 //!     /// and a dash of SignedExtensions
@@ -119,7 +119,7 @@
 //!     /// The function signature tells you all you need to know. ;)
 //! 	fn create_client_parts(config: &Configuration) -> Result<
 //! 		(
-//! 			Arc<TFullClient<Self::Block, Self::RuntimeApi, Self::Executor>>,
+//! 			Arc<TFullClient<Self::Block, Self::RuntimeApi, NativeElseWasmExecutor<Self::ExecutorDispatch>>>,
 //! 			Arc<TFullBackend<Self::Block>>,
 //! 			KeyStorePtr,
 //! 			TaskManager,
@@ -128,7 +128,7 @@
 //! 				dyn ConsensusDataProvider<
 //! 					Self::Block,
 //! 					Transaction = TransactionFor<
-//! 						TFullClient<Self::Block, Self::RuntimeApi, Self::Executor>,
+//! 						TFullClient<Self::Block, Self::RuntimeApi, NativeElseWasmExecutor<Self::ExecutorDispatch>>,
 //! 						Self::Block
 //! 					>,
 //! 				>
@@ -143,7 +143,7 @@
 //! 			backend,
 //! 			keystore,
 //! 			task_manager,
-//! 		) = new_full_parts::<Self::Block, Self::RuntimeApi, Self::Executor>(config)?;
+//! 		) = new_full_parts::<Self::Block, Self::RuntimeApi, NativeElseWasmExecutor<Self::ExecutorDispatch>>(config)?;
 //! 		let client = Arc::new(client);
 //!
 //! 		let inherent_providers = InherentDataProviders::new();
@@ -235,7 +235,7 @@
 //! ```
 
 use sc_consensus::BlockImport;
-use sc_executor::NativeExecutionDispatch;
+use sc_executor::{NativeElseWasmExecutor, NativeExecutionDispatch};
 use sc_service::TFullClient;
 use sp_api::{ConstructRuntimeApi, TransactionFor};
 use sp_consensus::SelectChain;
@@ -257,8 +257,8 @@ pub trait ChainInfo: Sized {
 	/// Opaque block type
 	type Block: BlockT;
 
-	/// Executor type
-	type Executor: NativeExecutionDispatch + 'static;
+	/// ExecutorDispatch dispatch type
+	type ExecutorDispatch: NativeExecutionDispatch + 'static;
 
 	/// Runtime
 	type Runtime: frame_system::Config;
@@ -267,7 +267,14 @@ pub trait ChainInfo: Sized {
 	type RuntimeApi: Send
 		+ Sync
 		+ 'static
-		+ ConstructRuntimeApi<Self::Block, TFullClient<Self::Block, Self::RuntimeApi, Self::Executor>>;
+		+ ConstructRuntimeApi<
+			Self::Block,
+			TFullClient<
+				Self::Block,
+				Self::RuntimeApi,
+				NativeElseWasmExecutor<Self::ExecutorDispatch>,
+			>,
+		>;
 
 	/// select chain type.
 	type SelectChain: SelectChain<Self::Block> + 'static;
@@ -280,7 +287,11 @@ pub trait ChainInfo: Sized {
 			Self::Block,
 			Error = sp_consensus::Error,
 			Transaction = TransactionFor<
-				TFullClient<Self::Block, Self::RuntimeApi, Self::Executor>,
+				TFullClient<
+					Self::Block,
+					Self::RuntimeApi,
+					NativeElseWasmExecutor<Self::ExecutorDispatch>,
+				>,
 				Self::Block,
 			>,
 		> + 'static;
diff --git a/test-utils/test-runner/src/node.rs b/test-utils/test-runner/src/node.rs
index c76e20648d11..9114013b747f 100644
--- a/test-utils/test-runner/src/node.rs
+++ b/test-utils/test-runner/src/node.rs
@@ -29,6 +29,7 @@ use sc_client_api::{
 	backend::{self, Backend},
 	CallExecutor, ExecutorProvider,
 };
+use sc_executor::NativeElseWasmExecutor;
 use sc_service::{TFullBackend, TFullCallExecutor, TFullClient, TaskManager};
 use sc_transaction_pool_api::TransactionPool;
 use sp_api::{OverlayedChanges, StorageTransactionCache};
@@ -51,7 +52,7 @@ pub struct Node<T: ChainInfo> {
 	/// handle to the running node.
 	task_manager: Option<TaskManager>,
 	/// client instance
-	client: Arc<TFullClient<T::Block, T::RuntimeApi, T::Executor>>,
+	client: Arc<TFullClient<T::Block, T::RuntimeApi, NativeElseWasmExecutor<T::ExecutorDispatch>>>,
 	/// transaction pool
 	pool: Arc<
 		dyn TransactionPool<
@@ -86,7 +87,9 @@ where
 	pub fn new(
 		rpc_handler: Arc<MetaIoHandler<sc_rpc::Metadata, sc_rpc_server::RpcMiddleware>>,
 		task_manager: TaskManager,
-		client: Arc<TFullClient<T::Block, T::RuntimeApi, T::Executor>>,
+		client: Arc<
+			TFullClient<T::Block, T::RuntimeApi, NativeElseWasmExecutor<T::ExecutorDispatch>>,
+		>,
 		pool: Arc<
 			dyn TransactionPool<
 				Block = <T as ChainInfo>::Block,
@@ -126,7 +129,9 @@ where
 	}
 
 	/// Return a reference to the Client
-	pub fn client(&self) -> Arc<TFullClient<T::Block, T::RuntimeApi, T::Executor>> {
+	pub fn client(
+		&self,
+	) -> Arc<TFullClient<T::Block, T::RuntimeApi, NativeElseWasmExecutor<T::ExecutorDispatch>>> {
 		self.client.clone()
 	}
 
@@ -150,7 +155,7 @@ where
 	/// Executes closure in an externalities provided environment.
 	pub fn with_state<R>(&self, closure: impl FnOnce() -> R) -> R
 	where
-		<TFullCallExecutor<T::Block, T::Executor> as CallExecutor<T::Block>>::Error:
+		<TFullCallExecutor<T::Block, NativeElseWasmExecutor<T::ExecutorDispatch>> as CallExecutor<T::Block>>::Error:
 			std::fmt::Debug,
 	{
 		let id = BlockId::Hash(self.client.info().best_hash);
diff --git a/utils/frame/benchmarking-cli/src/command.rs b/utils/frame/benchmarking-cli/src/command.rs
index 671386a721a0..7ba714abe355 100644
--- a/utils/frame/benchmarking-cli/src/command.rs
+++ b/utils/frame/benchmarking-cli/src/command.rs
@@ -25,7 +25,7 @@ use frame_support::traits::StorageInfo;
 use linked_hash_map::LinkedHashMap;
 use sc_cli::{CliConfiguration, ExecutionStrategy, Result, SharedParams};
 use sc_client_db::BenchmarkingState;
-use sc_executor::NativeExecutor;
+use sc_executor::NativeElseWasmExecutor;
 use sc_service::{Configuration, NativeExecutionDispatch};
 use sp_core::offchain::{
 	testing::{TestOffchainExt, TestTransactionPoolExt},
@@ -133,7 +133,7 @@ impl BenchmarkCmd {
 		)?;
 		let state_without_tracking =
 			BenchmarkingState::<BB>::new(genesis_storage, cache_size, self.record_proof, false)?;
-		let executor = NativeExecutor::<ExecDispatch>::new(
+		let executor = NativeElseWasmExecutor::<ExecDispatch>::new(
 			wasm_method,
 			self.heap_pages,
 			2, // The runtime instances cache size.
diff --git a/utils/frame/try-runtime/cli/src/lib.rs b/utils/frame/try-runtime/cli/src/lib.rs
index 1f1eef70e1b9..047829d94da6 100644
--- a/utils/frame/try-runtime/cli/src/lib.rs
+++ b/utils/frame/try-runtime/cli/src/lib.rs
@@ -21,7 +21,7 @@ use parity_scale_codec::{Decode, Encode};
 use remote_externalities::{rpc_api, Builder, Mode, OfflineConfig, OnlineConfig, SnapshotConfig};
 use sc_chain_spec::ChainSpec;
 use sc_cli::{CliConfiguration, ExecutionStrategy, WasmExecutionMethod};
-use sc_executor::NativeExecutor;
+use sc_executor::NativeElseWasmExecutor;
 use sc_service::{Configuration, NativeExecutionDispatch};
 use sp_core::{
 	hashing::twox_128,
@@ -192,8 +192,11 @@ where
 
 	let mut changes = Default::default();
 	let max_runtime_instances = config.max_runtime_instances;
-	let executor =
-		NativeExecutor::<ExecDispatch>::new(wasm_method.into(), heap_pages, max_runtime_instances);
+	let executor = NativeElseWasmExecutor::<ExecDispatch>::new(
+		wasm_method.into(),
+		heap_pages,
+		max_runtime_instances,
+	);
 
 	let ext = {
 		let builder = match command.state {
@@ -265,8 +268,11 @@ where
 
 	let mut changes = Default::default();
 	let max_runtime_instances = config.max_runtime_instances;
-	let executor =
-		NativeExecutor::<ExecDispatch>::new(wasm_method.into(), heap_pages, max_runtime_instances);
+	let executor = NativeElseWasmExecutor::<ExecDispatch>::new(
+		wasm_method.into(),
+		heap_pages,
+		max_runtime_instances,
+	);
 
 	let mode = match command.state {
 		State::Live { snapshot_path, modules } => {
@@ -346,8 +352,11 @@ where
 
 	let mut changes = Default::default();
 	let max_runtime_instances = config.max_runtime_instances;
-	let executor =
-		NativeExecutor::<ExecDispatch>::new(wasm_method.into(), heap_pages, max_runtime_instances);
+	let executor = NativeElseWasmExecutor::<ExecDispatch>::new(
+		wasm_method.into(),
+		heap_pages,
+		max_runtime_instances,
+	);
 
 	let block_hash = shared.block_at::<Block>()?;
 	let block: Block = rpc_api::get_block::<Block, _>(shared.url.clone(), block_hash).await?;

From 287b5c5a8fe47beacfdfdf764b632b897691e9da Mon Sep 17 00:00:00 2001
From: radupopa2010 <radupopa2010@yahoo.com>
Date: Wed, 18 Aug 2021 17:49:40 +0200
Subject: [PATCH 1092/1194] upgrade simnet tests to v8 (#9573)

* upgrade simnet tests to v8

* undo change by mistake

* add suggested changes

* rm un-used script

* echo config of simnet tests

* use proper identation and rm : to fix ci-lint

* Update .gitlab-ci.yml

Co-authored-by: Denis Pisarev <denis.pisarev@parity.io>

* fix description for tets

* rm build for PRs from this branch

* dummy trigger ci

* rm content for future PR

Co-authored-by: Denis Pisarev <denis.pisarev@parity.io>
---
 .gitlab-ci.yml                       |  37 +++--
 .maintain/gitlab/trigger_pipeline.sh | 201 ---------------------------
 2 files changed, 24 insertions(+), 214 deletions(-)
 delete mode 100755 .maintain/gitlab/trigger_pipeline.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d66e3f9a4cd1..16c1ea9d1ce9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -566,9 +566,9 @@ build-rustdoc:
   after_script:
     - buildah logout "$IMAGE_NAME"
     # pass artifacts to the trigger-simnet job
-    - echo "IMAGE_NAME=${IMAGE_NAME}" | tee -a ./artifacts/$PRODUCT/build.env
+    - echo "SUBSTRATE_IMAGE_NAME=${IMAGE_NAME}" | tee -a ./artifacts/$PRODUCT/build.env
     - IMAGE_TAG="$(cat ./artifacts/$PRODUCT/VERSION)"
-    - echo "IMAGE_TAG=${IMAGE_TAG}"   | tee -a ./artifacts/$PRODUCT/build.env
+    - echo "SUBSTRATE_IMAGE_TAG=${IMAGE_TAG}"   | tee -a ./artifacts/$PRODUCT/build.env
     - cat ./artifacts/$PRODUCT/build.env
 
 publish-docker-substrate:
@@ -708,9 +708,14 @@ deploy-prometheus-alerting-rules:
         - .gitlab-ci.yml
         - .maintain/monitoring/**/*
 
-trigger-simnet:
+# Runs "quick" and "long" tests on nightly schedule and on commit / merge to master
+# A "quick" test is a smoke test where basic check-expect tests run by
+# checking values from metrics exposed by the app.
+# A "long" test is the load testing where we send 50K transactions into the 
+# network and check if all completed successfully
+simnet-tests:
   stage:                           deploy
-  image:                           paritytech/tools:latest
+  image:                           docker.io/paritytech/simnet:${SIMNET_REF}
   <<:                              *kubernetes-env
   rules:
     - if: $CI_PIPELINE_SOURCE == "pipeline"
@@ -719,13 +724,19 @@ trigger-simnet:
     - if: $CI_COMMIT_REF_NAME == "master"
   needs:
     - job:                         publish-docker-substrate
-  # `build.env` brings here `$IMAGE_NAME` and `$IMAGE_TAG` (`$VERSION` here,
-  # i.e. `2643-0.8.29-5f689e0a-6b24dc54`).
-  variables:
-    TRGR_PROJECT:                  ${CI_PROJECT_NAME}
-    TRGR_REF:                      ${CI_COMMIT_REF_NAME}
-    # Simnet project ID
-    DWNSTRM_ID:                    332
+  # variables:
+  # `build.env` brings here `${SUBSTRATE_IMAGE_NAME}` and `${SUBSTRATE_IMAGE_TAG}`
+  # (`$VERSION` here, # i.e. `2643-0.8.29-5f689e0a-6b24dc54`).
+  # ${SIMNET_REF} is a gitlab variable
+  before_script:
+    - echo "Simnet Tests Config
+      docker.io/paritytech/simnet:${SIMNET_REF}
+      ${SUBSTRATE_IMAGE_NAME} ${SUBSTRATE_IAMGE_TAG}"
   script:
-    # API trigger for a Simnet job
-    - .maintain/gitlab/trigger_pipeline.sh --simnet-version=${SIMNET_REF}
+    - /home/nonroot/simnet/gurke/scripts/run-test-environment-manager.sh
+        --github-remote-dir="https://github.com/paritytech/substrate/tree/master/simnet_tests"
+        --config="simnet_tests/configs/default_local_testnet.toml"
+        --image="${SUBSTRATE_IMAGE_NAME}:${SUBSTRATE_IMAGE_TAG}"
+  retry: 2
+  tags:
+    - parity-simnet
diff --git a/.maintain/gitlab/trigger_pipeline.sh b/.maintain/gitlab/trigger_pipeline.sh
deleted file mode 100755
index 3ed9215405af..000000000000
--- a/.maintain/gitlab/trigger_pipeline.sh
+++ /dev/null
@@ -1,201 +0,0 @@
-#!/bin/bash
-
-set -eou pipefail
-
-# This script is to trigger Simnet pipeline.
-# See help article for more details.
-
-SCRIPT_NAME="$0"
-SCRIPT_PATH=$(dirname "$0")               # relative
-SCRIPT_PATH=$(cd "${SCRIPT_PATH}" && pwd) # absolutized and normalized
-SIMNET_VERSION=""
-
-function usage {
-  cat << EOF
-This script is to trigger Simnet pipeline.
-It's designed to be launched locally and from CI.
-The required argumants for both cases are listed below.
-
-Usage: ${SCRIPT_NAME} OPTION
-
-OPTIONS
-
-    -h, --help                  Print this help message.
-
-  Mandatory in both cases:
-
-    -s, --simnet-version        Simnet version to trigger.
-                                E.g.: v4
-
-    -u, --upstream-project      Triggering project.
-                                E.g.: substrate
-
-    -r, --upstream-ref          The branch or tag name for which project is built.
-                                E.g.: master
-
-    -d, --downstream-id         Downstream project's ID to trigger.
-                                E.g.: 332 (simnet project id)
-
-    -n, --image-name            Name of image to test.
-                                E.g.: docker.io/paritypr/synth-wave
-
-    -i, --image-tag             Tag of the image to test.
-                                E.g.: master
-
-    -c, --collator-image-tag    Tag of collator image. Image name is hardcoded.
-                                E.g.: master
-
-  Required for local launch:
-
-    -g, --ci-server-fqdn        FQDN of your gitlab server.
-                                E.g.: gitlab.parity.io
-
-    -t, --trigger-token         Gitlab trigger token. This must be defined in
-                                project -> settings -> CI/CD -> Pipeline triggers
-                                Defaults to CI_JOB_TOKEN
-                                https://stackoverflow.com/questions/42746634/gitlab-trigger-api-returns-404
-
-    -a, --access-token          Gitlab  peronal access token or it defaults to
-                                PIPELINE_TOKEN (gitlab variable)
-                                https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html
-
-EXAMPLES
-  ${SCRIPT_NAME} -s v4
-  ${SCRIPT_NAME} --simnet-version=v4
-
-  Local test example. You need to set the 2 vars before running: TR_TOKEN and PERS_TOKEN
-  ${SCRIPT_NAME} --simnet-version=v4 \\
-                 --upstream-project=substrate \\
-                 --upstream-ref=master \\
-                 --image-name=docker.io/paritypr/synth-wave \\
-                 --image-tag=master \\
-                 --collator-image-tag=master \\
-                 --ci-server-fqdn=gitlab.parity.io \\
-                 --downstream-id=332 \\
-                 --trigger-token="\${TR_TOKEN}" \\
-                 --access-token="\${PERS_TOKEN}"
-EOF
-}
-
-function main {
-  # Main entry point for the script.
-  parse_args "$@"
-  check_args
-  trigger_pipeline
-  check_pipeline
-  poll_pipeline
-}
-
-function parse_args {
-  # shellcheck disable=SC2214
-  while getopts c:u:r:i:n:g:t:r:a:s:h-: OPT; do
-    # support long options: https://stackoverflow.com/a/28466267/519360
-    if [ "${OPT}" = "-" ]; then   # long option: reformulate OPT and OPTARG
-      OPT="${OPTARG%%=*}"         # extract long option name
-      OPTARG="${OPTARG#$OPT}"     # extract long option argument (may be empty)
-      OPTARG="${OPTARG#=}"        # if long option argument, remove assigning `=`
-    fi
-    case "${OPT}" in
-      h | help )                usage     ; exit 0 ;;
-      s | simnet-version )      needs_arg ; SIMNET_VERSION="${OPTARG}" ;;
-      u | upstream-project )    needs_arg ; TRGR_PROJECT="${OPTARG}" ;;
-      r | upstream-ref )        needs_arg ; TRGR_REF="${OPTARG}" ;;
-      n | image-name )          needs_arg ; IMAGE_NAME="${OPTARG}" ;;
-      i | image-tag )           needs_arg ; IMAGE_TAG="${OPTARG}" ;;
-      c | collator-image-tag )  needs_arg ; COLLATOR_IMAGE_TAG="${OPTARG}" ;;
-      g | ci-server-fqdn )      needs_arg ; CI_SERVER_HOST="${OPTARG}" ;;
-      d | downstream-id )       needs_arg ; DWNSTRM_ID="${OPTARG}" ;;
-      t | trigger-token )       needs_arg ; CI_JOB_TOKEN="${OPTARG}" ;;
-      a | access-token )        needs_arg ; PIPELINE_TOKEN="${OPTARG}" ;;
-      ??* )                     log DIE "Illegal option --${OPT}" ;;  # bad long option
-      ? )                       exit 2 ;;  # bad short option (error reported via getopts)
-    esac
-  done
-  shift $((OPTIND-1)) # remove parsed options and args from $@ list
-
-}
-
-function check_args {
-  if [[ -z "${SIMNET_VERSION}" ]] ; then
-    log DIE "Must specify value for mandatory argument -s,--simnet-version
-
-$(usage)"
-  fi
-}
-
-function needs_arg {
-  if [ -z "${OPTARG}" ]; then
-    log DIE "No arg for --${OPT} option"
-  fi
-}
-
-function trigger_pipeline {
-  # API trigger another project's pipeline.
-  log INFO "Triggering Simnet pipeline."
-
-  curl --silent \
-      -X POST \
-      -F "token=${CI_JOB_TOKEN}" \
-      -F "ref=${SIMNET_VERSION}" \
-      -F "variables[TRGR_PROJECT]=${TRGR_PROJECT}" \
-      -F "variables[TRGR_REF]=${TRGR_REF}" \
-      -F "variables[IMAGE_NAME]=${IMAGE_NAME}" \
-      -F "variables[IMAGE_TAG]=${IMAGE_TAG}" \
-      "https://${CI_SERVER_HOST}/api/v4/projects/${DWNSTRM_ID}/trigger/pipeline" | \
-          tee pipeline;
-}
-
-function check_pipeline {
-  PIPELINE_ID=$(jq ".id" pipeline)
-  PIPELINE_URL=$(jq ".web_url" pipeline)
-  echo
-  log INFO "Simnet pipeline ${PIPELINE_URL} was successfully triggered."
-  log INFO "Now we're polling it to obtain the distinguished status."
-}
-
-function poll_pipeline {
-  # This is a workaround for a Gitlab bug, waits here until
-  # https://gitlab.com/gitlab-org/gitlab/-/issues/326137 gets fixed.
-  # The timeout is 360 curls with 8 sec interval, roughly an hour.
-  log INFO "Waiting on ${PIPELINE_ID} status..."
-
-# shellcheck disable=SC2034
-  for i in {1..360}; do
-      STATUS=$(get_status);
-      log INFO "Triggered pipeline status is ${STATUS}";
-      if [[ ${STATUS} =~ ^(pending|running|created)$ ]]; then
-          echo;
-      elif [[ ${STATUS} =~ ^(failed|canceled|skipped|manual)$ ]]; then
-          log DIE "Something's broken in: ${PIPELINE_URL}";
-      elif [[ ${STATUS} =~ ^(success)$ ]]; then
-          log INFO "Look how green it is: ${PIPELINE_URL}"
-          exit 0
-      else
-          log DIE "Something else has happened in ${PIPELINE_URL}"
-      fi
-  sleep 8;
-  done
-}
-
-function get_status() {
-    curl --silent \
-        --header "PRIVATE-TOKEN: ${PIPELINE_TOKEN}" \
-        "https://${CI_SERVER_HOST}/api/v4/projects/${DWNSTRM_ID}/pipelines/${PIPELINE_ID}" | \
-            jq --raw-output ".status";
-}
-
-function log {
-  local lvl msg fmt
-  lvl=$1 msg=$2
-  fmt='+%Y-%m-%d %H:%M:%S'
-  lg_date=$(date "${fmt}")
-  if [[ "${lvl}" = "DIE" ]] ; then
-    lvl="ERROR"
-    echo  "${lg_date} - ${lvl} - ${msg}"
-    exit 1
-  else
-    echo "${lg_date} - ${lvl} - ${msg}"
-  fi
-}
-
-main "$@"

From 44ee839d5b2a224da099d367df8313077776b736 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Thu, 19 Aug 2021 08:45:54 +0100
Subject: [PATCH 1093/1194] remove the uselsss weight return type from election
 provider API (#9569)

* remove the uselsss weight return type from election provider API

* fix everything, should be ready for final benchmark

* simplify on_init a bit furhter

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_election_provider_multi_phase --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/election-provider-multi-phase/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* remove unwraps

* fmt

* Update lock file

* whitelist block weight

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_election_provider_multi_phase --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/election-provider-multi-phase/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* fix warning

Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
---
 Cargo.lock                                    |  24 +-
 bin/node/runtime/src/lib.rs                   |   2 +
 frame/babe/src/mock.rs                        |   1 -
 .../election-provider-multi-phase/Cargo.toml  |  11 +-
 .../src/benchmarking.rs                       |  98 +++----
 .../election-provider-multi-phase/src/lib.rs  | 254 +++++++++---------
 .../election-provider-multi-phase/src/mock.rs |  43 +--
 .../src/signed.rs                             |  28 +-
 .../src/unsigned.rs                           |  12 +-
 .../src/weights.rs                            | 200 +++++---------
 frame/election-provider-support/src/lib.rs    |  50 ++--
 .../election-provider-support/src/onchain.rs  |  33 +--
 frame/grandpa/src/mock.rs                     |   1 -
 frame/offences/benchmarking/src/mock.rs       |   1 -
 frame/session/benchmarking/src/mock.rs        |   1 -
 frame/staking/Cargo.toml                      |   4 +-
 frame/staking/src/lib.rs                      |   2 +-
 frame/staking/src/mock.rs                     |   1 -
 frame/staking/src/pallet/impls.rs             |  86 +++---
 frame/staking/src/tests.rs                    |   8 +-
 frame/staking/src/weights.rs                  | 236 ++++++++--------
 utils/frame/remote-externalities/src/lib.rs   |  10 +-
 22 files changed, 551 insertions(+), 555 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5bff4b47b18b..e1f5b2f81582 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5015,6 +5015,8 @@ dependencies = [
  "sp-std",
  "sp-tracing",
  "static_assertions",
+ "strum 0.21.0",
+ "strum_macros 0.21.1",
 ]
 
 [[package]]
@@ -9036,7 +9038,7 @@ dependencies = [
  "lazy_static",
  "sp-core",
  "sp-runtime",
- "strum",
+ "strum 0.20.0",
 ]
 
 [[package]]
@@ -9521,9 +9523,15 @@ version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7318c509b5ba57f18533982607f24070a55d353e90d4cae30c467cdb2ad5ac5c"
 dependencies = [
- "strum_macros",
+ "strum_macros 0.20.1",
 ]
 
+[[package]]
+name = "strum"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2"
+
 [[package]]
 name = "strum_macros"
 version = "0.20.1"
@@ -9536,6 +9544,18 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "strum_macros"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "subkey"
 version = "2.0.1"
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index af16ea0f8aed..e690ce8a3b3a 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -1618,6 +1618,8 @@ impl_runtime_apis! {
 				hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(),
 				// System Events
 				hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),
+				// System BlockWeight
+				hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef734abf5cb34d6244378cddbf18e849d96").to_vec().into(),
 				// Treasury Account
 				hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da95ecffd7b6c0f78751baa9d281e0bfa3a6d6f646c70792f74727372790000000000000000000000000000000000000000").to_vec().into(),
 			];
diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index f872fb23b12a..f4f1310e8356 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -194,7 +194,6 @@ parameter_types! {
 impl onchain::Config for Test {
 	type AccountId = <Self as frame_system::Config>::AccountId;
 	type BlockNumber = <Self as frame_system::Config>::BlockNumber;
-	type BlockWeights = ();
 	type Accuracy = Perbill;
 	type DataProvider = Staking;
 }
diff --git a/frame/election-provider-multi-phase/Cargo.toml b/frame/election-provider-multi-phase/Cargo.toml
index 97b7f4d1340c..2dca7ed0a4f9 100644
--- a/frame/election-provider-multi-phase/Cargo.toml
+++ b/frame/election-provider-multi-phase/Cargo.toml
@@ -36,6 +36,8 @@ rand = { version = "0.7.3", default-features = false, optional = true, features
 	"alloc",
 	"small_rng",
 ] }
+strum = { optional = true, version = "0.21.0" }
+strum_macros = { optional = true, version = "0.21.1" }
 
 [dev-dependencies]
 parking_lot = "0.11.0"
@@ -45,7 +47,6 @@ sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
 sp-npos-elections = { version = "4.0.0-dev", default-features = false, path = "../../primitives/npos-elections" }
 sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
 frame-election-provider-support = { version = "4.0.0-dev", features = [
-	"runtime-benchmarks",
 ], path = "../election-provider-support" }
 pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 frame-benchmarking = { version = "4.0.0-dev", path = "../benchmarking" }
@@ -68,5 +69,11 @@ std = [
 	"frame-election-provider-support/std",
 	"log/std",
 ]
-runtime-benchmarks = ["frame-benchmarking", "rand"]
+runtime-benchmarks = [
+	"frame-benchmarking",
+	"frame-election-provider-support/runtime-benchmarks",
+	"rand",
+	"strum",
+	"strum_macros",
+]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/election-provider-multi-phase/src/benchmarking.rs b/frame/election-provider-multi-phase/src/benchmarking.rs
index da08722a6a24..4aad1d556ce5 100644
--- a/frame/election-provider-multi-phase/src/benchmarking.rs
+++ b/frame/election-provider-multi-phase/src/benchmarking.rs
@@ -151,8 +151,6 @@ fn solution_with_size<T: Config>(
 }
 
 fn set_up_data_provider<T: Config>(v: u32, t: u32) {
-	// number of votes in snapshot.
-
 	T::DataProvider::clear();
 	log!(
 		info,
@@ -192,37 +190,22 @@ frame_benchmarking::benchmarks! {
 	}
 
 	on_initialize_open_signed {
-		// NOTE: this benchmark currently doesn't have any components because the length of a db
-		// read/write is not captured. Otherwise, it is quite influenced by how much data
-		// `T::ElectionDataProvider` is reading and passing on.
 		assert!(<MultiPhase<T>>::snapshot().is_none());
 		assert!(<MultiPhase<T>>::current_phase().is_off());
 	}: {
-		<MultiPhase<T>>::on_initialize_open_signed().unwrap();
+		<MultiPhase<T>>::on_initialize_open_signed();
 	} verify {
-		assert!(<MultiPhase<T>>::snapshot().is_some());
+		assert!(<MultiPhase<T>>::snapshot().is_none());
 		assert!(<MultiPhase<T>>::current_phase().is_signed());
 	}
 
-	on_initialize_open_unsigned_with_snapshot {
+	on_initialize_open_unsigned {
 		assert!(<MultiPhase<T>>::snapshot().is_none());
 		assert!(<MultiPhase<T>>::current_phase().is_off());
 	}: {
-		<MultiPhase<T>>::on_initialize_open_unsigned(true, true, 1u32.into()).unwrap();
-	} verify {
-		assert!(<MultiPhase<T>>::snapshot().is_some());
-		assert!(<MultiPhase<T>>::current_phase().is_unsigned());
-	}
-
-	on_initialize_open_unsigned_without_snapshot {
-		// need to assume signed phase was open before
-		<MultiPhase<T>>::on_initialize_open_signed().unwrap();
-		assert!(<MultiPhase<T>>::snapshot().is_some());
-		assert!(<MultiPhase<T>>::current_phase().is_signed());
-	}: {
-		<MultiPhase<T>>::on_initialize_open_unsigned(false, true, 1u32.into()).unwrap();
+		<MultiPhase<T>>::on_initialize_open_unsigned(true, 1u32.into())
 	} verify {
-		assert!(<MultiPhase<T>>::snapshot().is_some());
+		assert!(<MultiPhase<T>>::snapshot().is_none());
 		assert!(<MultiPhase<T>>::current_phase().is_unsigned());
 	}
 
@@ -259,30 +242,51 @@ frame_benchmarking::benchmarks! {
 		assert_eq!(T::Currency::reserved_balance(&receiver), 0u32.into());
 	}
 
+	create_snapshot_internal {
+		// number of votes in snapshot. Fixed to maximum.
+		let v = T::BenchmarkingConfig::SNAPSHOT_MAXIMUM_VOTERS;
+		// number of targets in snapshot. Fixed to maximum.
+		let t = T::BenchmarkingConfig::MAXIMUM_TARGETS;
+
+		// we don't directly need the data-provider to be populated, but it is just easy to use it.
+		set_up_data_provider::<T>(v, t);
+		let targets = T::DataProvider::targets(None)?;
+		let voters = T::DataProvider::voters(None)?;
+		let desired_targets = T::DataProvider::desired_targets()?;
+		assert!(<MultiPhase<T>>::snapshot().is_none());
+	}: {
+		<MultiPhase::<T>>::create_snapshot_internal(targets, voters, desired_targets)
+	} verify {
+		assert!(<MultiPhase<T>>::snapshot().is_some());
+		assert_eq!(<MultiPhase<T>>::snapshot_metadata().ok_or("metadata missing")?.voters, v + t);
+		assert_eq!(<MultiPhase<T>>::snapshot_metadata().ok_or("metadata missing")?.targets, t);
+	}
+
 	// a call to `<Pallet as ElectionProvider>::elect` where we only return the queued solution.
 	elect_queued {
-		// number of votes in snapshot.
-		let v in (T::BenchmarkingConfig::VOTERS[0]) .. T::BenchmarkingConfig::VOTERS[1];
-		// number of targets in snapshot.
-		let t in (T::BenchmarkingConfig::TARGETS[0]) .. T::BenchmarkingConfig::TARGETS[1];
 		// number of assignments, i.e. solution.len(). This means the active nominators, thus must be
-		// a subset of `v` component.
+		// a subset of `v`.
 		let a in (T::BenchmarkingConfig::ACTIVE_VOTERS[0]) .. T::BenchmarkingConfig::ACTIVE_VOTERS[1];
-		// number of desired targets. Must be a subset of `t` component.
+		// number of desired targets. Must be a subset of `t`.
 		let d in (T::BenchmarkingConfig::DESIRED_TARGETS[0]) .. T::BenchmarkingConfig::DESIRED_TARGETS[1];
 
+		// number of votes in snapshot. Not dominant.
+		let v  = T::BenchmarkingConfig::VOTERS[1];
+		// number of targets in snapshot. Not dominant.
+		let t = T::BenchmarkingConfig::TARGETS[1];
+
 		let witness = SolutionOrSnapshotSize { voters: v, targets: t };
 		let raw_solution = solution_with_size::<T>(witness, a, d)?;
 		let ready_solution =
-			<MultiPhase<T>>::feasibility_check(raw_solution, ElectionCompute::Signed).unwrap();
+			<MultiPhase<T>>::feasibility_check(raw_solution, ElectionCompute::Signed)?;
+		<CurrentPhase<T>>::put(Phase::Signed);
+		// assume a queued solution is stored, regardless of where it comes from.
+		<QueuedSolution<T>>::put(ready_solution);
 
 		// these are set by the `solution_with_size` function.
 		assert!(<DesiredTargets<T>>::get().is_some());
 		assert!(<Snapshot<T>>::get().is_some());
 		assert!(<SnapshotMetadata<T>>::get().is_some());
-		<CurrentPhase<T>>::put(Phase::Signed);
-		// assume a queued solution is stored, regardless of where it comes from.
-		<QueuedSolution<T>>::put(ready_solution);
 	}: {
 		assert_ok!(<MultiPhase<T> as ElectionProvider<T::AccountId, T::BlockNumber>>::elect());
 	} verify {
@@ -303,7 +307,8 @@ frame_benchmarking::benchmarks! {
 			..Default::default()
 		};
 
-		MultiPhase::<T>::on_initialize_open_signed().expect("should be ok to start signed phase");
+		<MultiPhase<T>>::create_snapshot()?;
+		MultiPhase::<T>::on_initialize_open_signed();
 		<Round<T>>::put(1);
 
 		let mut signed_submissions = SignedSubmissions::<T>::get();
@@ -346,7 +351,7 @@ frame_benchmarking::benchmarks! {
 		<CurrentPhase<T>>::put(Phase::Unsigned((true, 1u32.into())));
 
 		// encode the most significant storage item that needs to be decoded in the dispatch.
-		let encoded_snapshot = <MultiPhase<T>>::snapshot().unwrap().encode();
+		let encoded_snapshot = <MultiPhase<T>>::snapshot().ok_or("missing snapshot")?.encode();
 		let encoded_call = <Call<T>>::submit_unsigned(Box::new(raw_solution.clone()), witness).encode();
 	}: {
 		assert_ok!(
@@ -357,8 +362,8 @@ frame_benchmarking::benchmarks! {
 			)
 		);
 		let _decoded_snap = <RoundSnapshot<T::AccountId> as Decode>::decode(&mut &*encoded_snapshot)
-			.unwrap();
-		let _decoded_call = <Call<T> as Decode>::decode(&mut &*encoded_call).unwrap();
+			.expect("decoding should not fail; qed.");
+		let _decoded_call = <Call<T> as Decode>::decode(&mut &*encoded_call).expect("decoding should not fail; qed.");
 	} verify {
 		assert!(<MultiPhase<T>>::queued_solution().is_some());
 	}
@@ -382,10 +387,11 @@ frame_benchmarking::benchmarks! {
 		assert_eq!(raw_solution.solution.unique_targets().len() as u32, d);
 
 		// encode the most significant storage item that needs to be decoded in the dispatch.
-		let encoded_snapshot = <MultiPhase<T>>::snapshot().unwrap().encode();
+		let encoded_snapshot = <MultiPhase<T>>::snapshot().ok_or("snapshot missing")?.encode();
 	}: {
 		assert_ok!(<MultiPhase<T>>::feasibility_check(raw_solution, ElectionCompute::Unsigned));
-		let _decoded_snap = <RoundSnapshot<T::AccountId> as Decode>::decode(&mut &*encoded_snapshot).unwrap();
+		let _decoded_snap = <RoundSnapshot<T::AccountId> as Decode>::decode(&mut &*encoded_snapshot)
+			.expect("decoding should not fail; qed.");
 	}
 
 	// NOTE: this weight is not used anywhere, but the fact that it should succeed when execution in
@@ -405,9 +411,8 @@ frame_benchmarking::benchmarks! {
 		// number of votes in snapshot. Fixed to maximum.
 		let v = T::BenchmarkingConfig::MINER_MAXIMUM_VOTERS;
 		// number of targets in snapshot. Fixed to maximum.
-		let t  = T::BenchmarkingConfig::MAXIMUM_TARGETS;
+		let t = T::BenchmarkingConfig::MAXIMUM_TARGETS;
 
-		T::DataProvider::clear();
 		set_up_data_provider::<T>(v, t);
 		let now = frame_system::Pallet::<T>::block_number();
 		<CurrentPhase<T>>::put(Phase::Unsigned((true, now)));
@@ -428,17 +433,16 @@ frame_benchmarking::benchmarks! {
 		// number of votes in snapshot. Fixed to maximum.
 		let v = T::BenchmarkingConfig::SNAPSHOT_MAXIMUM_VOTERS;
 		// number of targets in snapshot. Fixed to maximum.
-		let t  = T::BenchmarkingConfig::MAXIMUM_TARGETS;
+		let t = T::BenchmarkingConfig::MAXIMUM_TARGETS;
 
-		T::DataProvider::clear();
 		set_up_data_provider::<T>(v, t);
 		assert!(<MultiPhase<T>>::snapshot().is_none());
 	}: {
-		<MultiPhase::<T>>::create_snapshot().unwrap()
+		<MultiPhase::<T>>::create_snapshot()?
 	} verify {
 		assert!(<MultiPhase<T>>::snapshot().is_some());
-		assert_eq!(<MultiPhase<T>>::snapshot_metadata().unwrap().voters, v + t);
-		assert_eq!(<MultiPhase<T>>::snapshot_metadata().unwrap().targets, t);
+		assert_eq!(<MultiPhase<T>>::snapshot_metadata().ok_or("snapshot missing")?.voters, v + t);
+		assert_eq!(<MultiPhase<T>>::snapshot_metadata().ok_or("snapshot missing")?.targets, t);
 	}
 
 	#[extra]
@@ -462,10 +466,10 @@ frame_benchmarking::benchmarks! {
 		// assignments
 		let witness = SolutionOrSnapshotSize { voters: v, targets: t };
 		let RawSolution { solution, .. } = solution_with_size::<T>(witness, a, d)?;
-		let RoundSnapshot { voters, targets } = MultiPhase::<T>::snapshot().unwrap();
+		let RoundSnapshot { voters, targets } = MultiPhase::<T>::snapshot().ok_or("snapshot missing")?;
 		let voter_at = helpers::voter_at_fn::<T>(&voters);
 		let target_at = helpers::target_at_fn::<T>(&targets);
-		let mut assignments = solution.into_assignment(voter_at, target_at).unwrap();
+		let mut assignments = solution.into_assignment(voter_at, target_at).expect("solution generated by `solution_with_size` must be valid.");
 
 		// make a voter cache and some helper functions for access
 		let cache = helpers::generate_voter_cache::<T>(&voters);
diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index fad76623faf5..4aef03a34389 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -233,7 +233,7 @@ use frame_support::{
 	dispatch::DispatchResultWithPostInfo,
 	ensure,
 	traits::{Currency, Get, OnUnbalanced, ReservableCurrency},
-	weights::Weight,
+	weights::{DispatchClass, Weight},
 };
 use frame_system::{ensure_none, offchain::SendTransactionTypes};
 use sp_arithmetic::{
@@ -254,7 +254,7 @@ use sp_runtime::{
 };
 use sp_std::{convert::TryInto, prelude::*};
 
-#[cfg(any(feature = "runtime-benchmarks", test))]
+#[cfg(feature = "runtime-benchmarks")]
 mod benchmarking;
 #[cfg(test)]
 mod mock;
@@ -266,12 +266,12 @@ const LOG_TARGET: &'static str = "runtime::election-provider";
 pub mod signed;
 pub mod unsigned;
 pub mod weights;
+pub use weights::WeightInfo;
 
 pub use signed::{
 	BalanceOf, NegativeImbalanceOf, PositiveImbalanceOf, SignedSubmission, SignedSubmissionOf,
 	SignedSubmissions, SubmissionIndicesOf,
 };
-pub use weights::WeightInfo;
 
 /// The solution type used by this crate.
 pub type SolutionOf<T> = <T as Config>::Solution;
@@ -290,7 +290,6 @@ pub struct OnChainConfig<T: Config>(sp_std::marker::PhantomData<T>);
 impl<T: Config> onchain::Config for OnChainConfig<T> {
 	type AccountId = T::AccountId;
 	type BlockNumber = T::BlockNumber;
-	type BlockWeights = T::BlockWeights;
 	type Accuracy = T::OnChainAccuracy;
 	type DataProvider = T::DataProvider;
 }
@@ -487,6 +486,7 @@ pub struct SolutionOrSnapshotSize {
 ///
 /// Note that this is different from [`pallet::Error`].
 #[derive(Debug, Eq, PartialEq)]
+#[cfg_attr(feature = "runtime-benchmarks", derive(strum_macros::IntoStaticStr))]
 pub enum ElectionError {
 	/// An error happened in the feasibility check sub-system.
 	Feasibility(FeasibilityError),
@@ -520,6 +520,7 @@ impl From<unsigned::MinerError> for ElectionError {
 
 /// Errors that can happen in the feasibility check.
 #[derive(Debug, Eq, PartialEq)]
+#[cfg_attr(feature = "runtime-benchmarks", derive(strum_macros::IntoStaticStr))]
 pub enum FeasibilityError {
 	/// Wrong number of winners presented.
 	WrongWinnerCount,
@@ -699,17 +700,15 @@ pub mod pallet {
 			match current_phase {
 				Phase::Off if remaining <= signed_deadline && remaining > unsigned_deadline => {
 					// NOTE: if signed-phase length is zero, second part of the if-condition fails.
-					match Self::on_initialize_open_signed() {
-						Ok(snap_weight) => {
-							log!(info, "Starting signed phase round {}.", Self::round());
-							T::WeightInfo::on_initialize_open_signed().saturating_add(snap_weight)
+					match Self::create_snapshot() {
+						Ok(_) => {
+							Self::on_initialize_open_signed();
+							T::WeightInfo::on_initialize_open_signed()
 						},
 						Err(why) => {
 							// Not much we can do about this at this point.
 							log!(warn, "failed to open signed phase due to {:?}", why);
 							T::WeightInfo::on_initialize_nothing()
-							// NOTE: ^^ The trait specifies that this is a noop in terms of weight
-							// in case of error.
 						},
 					}
 				},
@@ -718,8 +717,7 @@ pub mod pallet {
 				{
 					// our needs vary according to whether or not the unsigned phase follows a
 					// signed phase
-					let (need_snapshot, enabled, signed_weight) = if current_phase == Phase::Signed
-					{
+					let (need_snapshot, enabled) = if current_phase == Phase::Signed {
 						// there was previously a signed phase: close the signed phase, no need for
 						// snapshot.
 						//
@@ -729,35 +727,31 @@ pub mod pallet {
 						//     is a guard against the case that `elect` is called prematurely. This
 						//     adds a small amount of overhead, but that is unfortunately
 						//     unavoidable.
-						let (_success, weight) = Self::finalize_signed_phase();
+						let _ = Self::finalize_signed_phase();
 						// In the future we can consider disabling the unsigned phase if the signed
 						// phase completes successfully, but for now we're enabling it
 						// unconditionally as a defensive measure.
-						(false, true, weight)
+						(false, true)
 					} else {
 						// No signed phase: create a new snapshot, definitely `enable` the unsigned
 						// phase.
-						(true, true, Weight::zero())
+						(true, true)
 					};
 
-					match Self::on_initialize_open_unsigned(need_snapshot, enabled, now) {
-						Ok(snap_weight) => {
-							log!(info, "Starting unsigned phase({}).", enabled);
-							let base_weight = if need_snapshot {
-								T::WeightInfo::on_initialize_open_unsigned_with_snapshot()
-							} else {
-								T::WeightInfo::on_initialize_open_unsigned_without_snapshot()
-							};
-
-							base_weight.saturating_add(snap_weight).saturating_add(signed_weight)
-						},
-						Err(why) => {
-							// Not much we can do about this at this point.
-							log!(warn, "failed to open unsigned phase due to {:?}", why);
-							T::WeightInfo::on_initialize_nothing()
-							// NOTE: ^^ The trait specifies that this is a noop in terms of weight
-							// in case of error.
-						},
+					if need_snapshot {
+						match Self::create_snapshot() {
+							Ok(_) => {
+								Self::on_initialize_open_unsigned(enabled, now);
+								T::WeightInfo::on_initialize_open_unsigned()
+							},
+							Err(why) => {
+								log!(warn, "failed to open unsigned phase due to {:?}", why);
+								T::WeightInfo::on_initialize_nothing()
+							},
+						}
+					} else {
+						Self::on_initialize_open_unsigned(enabled, now);
+						T::WeightInfo::on_initialize_open_unsigned()
 					}
 				}
 				_ => T::WeightInfo::on_initialize_nothing(),
@@ -1255,70 +1249,31 @@ impl<T: Config> Pallet<T> {
 	}
 
 	/// Logic for [`<Pallet as Hooks>::on_initialize`] when signed phase is being opened.
-	///
-	/// This is decoupled for easy weight calculation.
-	///
-	/// Returns `Ok(snapshot_weight)` if success, where `snapshot_weight` is the weight that
-	/// needs to recorded for the creation of snapshot.
-	pub fn on_initialize_open_signed() -> Result<Weight, ElectionError> {
-		let weight = Self::create_snapshot()?;
+	pub fn on_initialize_open_signed() {
+		log!(info, "Starting signed phase round {}.", Self::round());
 		<CurrentPhase<T>>::put(Phase::Signed);
 		Self::deposit_event(Event::SignedPhaseStarted(Self::round()));
-		Ok(weight.saturating_add(T::DbWeight::get().writes(1)))
 	}
 
 	/// Logic for [`<Pallet as Hooks<T>>::on_initialize`] when unsigned phase is being opened.
-	///
-	/// This is decoupled for easy weight calculation.
-	///
-	/// Returns `Ok(snapshot_weight)` if success, where `snapshot_weight` is the weight that
-	/// needs to recorded for the creation of snapshot.
-	pub fn on_initialize_open_unsigned(
-		need_snapshot: bool,
-		enabled: bool,
-		now: T::BlockNumber,
-	) -> Result<Weight, ElectionError> {
-		let weight = if need_snapshot {
-			// If not being followed by a signed phase, then create the snapshots.
-			debug_assert!(Self::snapshot().is_none());
-			Self::create_snapshot()?
-		} else {
-			0
-		};
-
+	pub fn on_initialize_open_unsigned(enabled: bool, now: T::BlockNumber) {
+		let round = Self::round();
+		log!(info, "Starting unsigned phase round {} enabled {}.", round, enabled);
 		<CurrentPhase<T>>::put(Phase::Unsigned((enabled, now)));
-		Self::deposit_event(Event::UnsignedPhaseStarted(Self::round()));
-		Ok(weight.saturating_add(T::DbWeight::get().writes(1)))
+		Self::deposit_event(Event::UnsignedPhaseStarted(round));
 	}
 
-	/// Creates the snapshot. Writes new data to:
-	///
-	/// 1. [`SnapshotMetadata`]
-	/// 2. [`RoundSnapshot`]
-	/// 3. [`DesiredTargets`]
+	/// Parts of [`create_snapshot`] that happen inside of this pallet.
 	///
-	/// Returns `Ok(consumed_weight)` if operation is okay.
-	pub fn create_snapshot() -> Result<Weight, ElectionError> {
-		let target_limit = <SolutionTargetIndexOf<T>>::max_value().saturated_into::<usize>();
-		let voter_limit = <SolutionVoterIndexOf<T>>::max_value().saturated_into::<usize>();
-
-		let (targets, w1) =
-			T::DataProvider::targets(Some(target_limit)).map_err(ElectionError::DataProvider)?;
-		let (voters, w2) =
-			T::DataProvider::voters(Some(voter_limit)).map_err(ElectionError::DataProvider)?;
-		let (desired_targets, w3) =
-			T::DataProvider::desired_targets().map_err(ElectionError::DataProvider)?;
-
-		// Defensive-only.
-		if targets.len() > target_limit || voters.len() > voter_limit {
-			debug_assert!(false, "Snapshot limit has not been respected.");
-			return Err(ElectionError::DataProvider("Snapshot too big for submission."))
-		}
-
-		// Only write snapshot if all existed.
+	/// Extracted for easier weight calculation.
+	fn create_snapshot_internal(
+		targets: Vec<T::AccountId>,
+		voters: Vec<crate::unsigned::Voter<T>>,
+		desired_targets: u32,
+	) {
 		let metadata =
 			SolutionOrSnapshotSize { voters: voters.len() as u32, targets: targets.len() as u32 };
-		log!(debug, "creating a snapshot with metadata {:?}", metadata);
+		log!(info, "creating a snapshot with metadata {:?}", metadata);
 
 		<SnapshotMetadata<T>>::put(metadata);
 		<DesiredTargets<T>>::put(desired_targets);
@@ -1328,7 +1283,7 @@ impl<T: Config> Pallet<T> {
 		// allocation.
 		let snapshot = RoundSnapshot { voters, targets };
 		let size = snapshot.encoded_size();
-		log!(info, "snapshot pre-calculated size {:?}", size);
+		log!(debug, "snapshot pre-calculated size {:?}", size);
 		let mut buffer = Vec::with_capacity(size);
 		snapshot.encode_to(&mut buffer);
 
@@ -1338,10 +1293,60 @@ impl<T: Config> Pallet<T> {
 		debug_assert!(buffer.len() == size && size == buffer.capacity());
 
 		sp_io::storage::set(&<Snapshot<T>>::hashed_key(), &buffer);
-		Ok(w1
-			.saturating_add(w2)
-			.saturating_add(w3)
-			.saturating_add(T::DbWeight::get().writes(3)))
+	}
+
+	/// Parts of [`create_snapshot`] that happen outside of this pallet.
+	///
+	/// Extracted for easier weight calculation.
+	fn create_snapshot_external(
+	) -> Result<(Vec<T::AccountId>, Vec<crate::unsigned::Voter<T>>, u32), ElectionError> {
+		let target_limit = <SolutionTargetIndexOf<T>>::max_value().saturated_into::<usize>();
+		let voter_limit = <SolutionVoterIndexOf<T>>::max_value().saturated_into::<usize>();
+
+		let targets =
+			T::DataProvider::targets(Some(target_limit)).map_err(ElectionError::DataProvider)?;
+		let voters =
+			T::DataProvider::voters(Some(voter_limit)).map_err(ElectionError::DataProvider)?;
+		let desired_targets =
+			T::DataProvider::desired_targets().map_err(ElectionError::DataProvider)?;
+
+		// Defensive-only.
+		if targets.len() > target_limit || voters.len() > voter_limit {
+			debug_assert!(false, "Snapshot limit has not been respected.");
+			return Err(ElectionError::DataProvider("Snapshot too big for submission."))
+		}
+
+		Ok((targets, voters, desired_targets))
+	}
+
+	/// Creates the snapshot. Writes new data to:
+	///
+	/// 1. [`SnapshotMetadata`]
+	/// 2. [`RoundSnapshot`]
+	/// 3. [`DesiredTargets`]
+	///
+	/// Returns `Ok(())` if operation is okay.
+	///
+	/// This is a *self-weighing* function, it will register its own extra weight as
+	/// [`DispatchClass::Mandatory`] with the system pallet.
+	pub fn create_snapshot() -> Result<(), ElectionError> {
+		// this is self-weighing itself..
+		let (targets, voters, desired_targets) = Self::create_snapshot_external()?;
+
+		// ..therefore we only measure the weight of this and add it.
+		Self::create_snapshot_internal(targets, voters, desired_targets);
+		Self::register_weight(T::WeightInfo::create_snapshot_internal());
+		Ok(())
+	}
+
+	/// Register some amount of weight directly with the system pallet.
+	///
+	/// This is always mandatory weight.
+	fn register_weight(weight: Weight) {
+		<frame_system::Pallet<T>>::register_extra_weight_unchecked(
+			weight,
+			DispatchClass::Mandatory,
+		);
 	}
 
 	/// Kill everything created by [`Pallet::create_snapshot`].
@@ -1467,7 +1472,7 @@ impl<T: Config> Pallet<T> {
 	}
 
 	/// On-chain fallback of election.
-	fn onchain_fallback() -> Result<(Supports<T::AccountId>, Weight), ElectionError> {
+	fn onchain_fallback() -> Result<Supports<T::AccountId>, ElectionError> {
 		<onchain::OnChainSequentialPhragmen<OnChainConfig<T>> as ElectionProvider<
 			T::AccountId,
 			T::BlockNumber,
@@ -1475,7 +1480,7 @@ impl<T: Config> Pallet<T> {
 		.map_err(Into::into)
 	}
 
-	fn do_elect() -> Result<(Supports<T::AccountId>, Weight), ElectionError> {
+	fn do_elect() -> Result<Supports<T::AccountId>, ElectionError> {
 		// We have to unconditionally try finalizing the signed phase here. There are only two
 		// possibilities:
 		//
@@ -1483,41 +1488,27 @@ impl<T: Config> Pallet<T> {
 		//   system
 		// - signed phase was complete or not started, in which case finalization is idempotent and
 		//   inexpensive (1 read of an empty vector).
-		let (_, signed_finalize_weight) = Self::finalize_signed_phase();
+		let _ = Self::finalize_signed_phase();
 		<QueuedSolution<T>>::take()
 			.map_or_else(
 				|| match T::Fallback::get() {
 					FallbackStrategy::OnChain => Self::onchain_fallback()
-						.map(|(s, w)| (s, w, ElectionCompute::OnChain))
+						.map(|s| {
+							// onchain election incurs maximum block weight
+							Self::register_weight(T::BlockWeights::get().max_block);
+							(s, ElectionCompute::OnChain)
+						})
 						.map_err(Into::into),
 					FallbackStrategy::Nothing => Err(ElectionError::NoFallbackConfigured),
 				},
-				|ReadySolution { supports, compute, .. }| {
-					// defensive-only: snapshot must always exist by this point.
-					let metadata = Self::snapshot_metadata().unwrap_or_default();
-					let desired = supports.len() as u32;
-					let active_voters = supports
-						.iter()
-						.map(|(_, x)| x)
-						.fold(Zero::zero(), |acc, next| acc + next.voters.len() as u32);
-					Ok((
-						supports,
-						T::WeightInfo::elect_queued(
-							metadata.voters,
-							metadata.targets,
-							active_voters,
-							desired,
-						),
-						compute,
-					))
-				},
+				|ReadySolution { supports, compute, .. }| Ok((supports, compute)),
 			)
-			.map(|(supports, weight, compute)| {
+			.map(|(supports, compute)| {
 				Self::deposit_event(Event::ElectionFinalized(Some(compute)));
 				if Self::round() != 1 {
 					log!(info, "Finalized election round with compute {:?}.", compute);
 				}
-				(supports, weight.saturating_add(signed_finalize_weight))
+				supports
 			})
 			.map_err(|err| {
 				Self::deposit_event(Event::ElectionFinalized(None));
@@ -1527,18 +1518,29 @@ impl<T: Config> Pallet<T> {
 				err
 			})
 	}
+
+	/// record the weight of the given `supports`.
+	fn weigh_supports(supports: &Supports<T::AccountId>) {
+		let active_voters = supports
+			.iter()
+			.map(|(_, x)| x)
+			.fold(Zero::zero(), |acc, next| acc + next.voters.len() as u32);
+		let desired_targets = supports.len() as u32;
+		Self::register_weight(T::WeightInfo::elect_queued(active_voters, desired_targets));
+	}
 }
 
 impl<T: Config> ElectionProvider<T::AccountId, T::BlockNumber> for Pallet<T> {
 	type Error = ElectionError;
 	type DataProvider = T::DataProvider;
 
-	fn elect() -> Result<(Supports<T::AccountId>, Weight), Self::Error> {
+	fn elect() -> Result<Supports<T::AccountId>, Self::Error> {
 		match Self::do_elect() {
-			Ok((supports, weight)) => {
-				// All went okay, put sign to be Off, clean snapshot, etc.
+			Ok(supports) => {
+				// All went okay, record the weight, put sign to be Off, clean snapshot, etc.
+				Self::weigh_supports(&supports);
 				Self::rotate_round();
-				Ok((supports, weight))
+				Ok(supports)
 			},
 			Err(why) => {
 				log!(error, "Entering emergency mode: {:?}", why);
@@ -1796,7 +1798,7 @@ mod tests {
 			assert_eq!(MultiPhase::current_phase(), Phase::Unsigned((true, 25)));
 			assert!(MultiPhase::snapshot().is_some());
 
-			MultiPhase::elect().unwrap();
+			assert_ok!(MultiPhase::elect());
 
 			assert!(MultiPhase::current_phase().is_off());
 			assert!(MultiPhase::snapshot().is_none());
@@ -1829,7 +1831,7 @@ mod tests {
 			roll_to(30);
 			assert!(MultiPhase::current_phase().is_unsigned_open_at(20));
 
-			MultiPhase::elect().unwrap();
+			assert_ok!(MultiPhase::elect());
 
 			assert!(MultiPhase::current_phase().is_off());
 			assert!(MultiPhase::snapshot().is_none());
@@ -1896,7 +1898,7 @@ mod tests {
 
 			// An unexpected call to elect.
 			roll_to(20);
-			MultiPhase::elect().unwrap();
+			assert_ok!(MultiPhase::elect());
 
 			// We surely can't have any feasible solutions. This will cause an on-chain election.
 			assert_eq!(
@@ -1941,7 +1943,7 @@ mod tests {
 
 			// an unexpected call to elect.
 			roll_to(20);
-			assert!(MultiPhase::elect().is_ok());
+			assert_ok!(MultiPhase::elect());
 
 			// all storage items must be cleared.
 			assert_eq!(MultiPhase::round(), 2);
@@ -1963,7 +1965,7 @@ mod tests {
 			assert_eq!(MultiPhase::current_phase(), Phase::Unsigned((true, 25)));
 
 			// Zilch solutions thus far.
-			let (supports, _) = MultiPhase::elect().unwrap();
+			let supports = MultiPhase::elect().unwrap();
 
 			assert_eq!(
 				supports,
@@ -2001,7 +2003,7 @@ mod tests {
 
 			// On-chain backup works though.
 			roll_to(29);
-			let (supports, _) = MultiPhase::elect().unwrap();
+			let supports = MultiPhase::elect().unwrap();
 			assert!(supports.len() > 0);
 		})
 	}
diff --git a/frame/election-provider-multi-phase/src/mock.rs b/frame/election-provider-multi-phase/src/mock.rs
index f760676abf76..03dc6985f313 100644
--- a/frame/election-provider-multi-phase/src/mock.rs
+++ b/frame/election-provider-multi-phase/src/mock.rs
@@ -283,6 +283,13 @@ impl multi_phase::weights::WeightInfo for DualMockWeightInfo {
 			<() as multi_phase::weights::WeightInfo>::on_initialize_nothing()
 		}
 	}
+	fn create_snapshot_internal() -> Weight {
+		if MockWeightInfo::get() {
+			Zero::zero()
+		} else {
+			<() as multi_phase::weights::WeightInfo>::create_snapshot_internal()
+		}
+	}
 	fn on_initialize_open_signed() -> Weight {
 		if MockWeightInfo::get() {
 			Zero::zero()
@@ -290,18 +297,18 @@ impl multi_phase::weights::WeightInfo for DualMockWeightInfo {
 			<() as multi_phase::weights::WeightInfo>::on_initialize_open_signed()
 		}
 	}
-	fn on_initialize_open_unsigned_with_snapshot() -> Weight {
+	fn on_initialize_open_unsigned() -> Weight {
 		if MockWeightInfo::get() {
 			Zero::zero()
 		} else {
-			<() as multi_phase::weights::WeightInfo>::on_initialize_open_unsigned_with_snapshot()
+			<() as multi_phase::weights::WeightInfo>::on_initialize_open_unsigned()
 		}
 	}
-	fn on_initialize_open_unsigned_without_snapshot() -> Weight {
+	fn elect_queued(a: u32, d: u32) -> Weight {
 		if MockWeightInfo::get() {
 			Zero::zero()
 		} else {
-			<() as multi_phase::weights::WeightInfo>::on_initialize_open_unsigned_without_snapshot()
+			<() as multi_phase::weights::WeightInfo>::elect_queued(a, d)
 		}
 	}
 	fn finalize_signed_phase_accept_solution() -> Weight {
@@ -325,13 +332,6 @@ impl multi_phase::weights::WeightInfo for DualMockWeightInfo {
 			<() as multi_phase::weights::WeightInfo>::submit(c)
 		}
 	}
-	fn elect_queued(v: u32, t: u32, a: u32, d: u32) -> Weight {
-		if MockWeightInfo::get() {
-			Zero::zero()
-		} else {
-			<() as multi_phase::weights::WeightInfo>::elect_queued(v, t, a, d)
-		}
-	}
 	fn submit_unsigned(v: u32, t: u32, a: u32, d: u32) -> Weight {
 		if MockWeightInfo::get() {
 			// 10 base
@@ -397,35 +397,36 @@ pub struct ExtBuilder {}
 pub struct StakingMock;
 impl ElectionDataProvider<AccountId, u64> for StakingMock {
 	const MAXIMUM_VOTES_PER_VOTER: u32 = <TestNposSolution as NposSolution>::LIMIT as u32;
-	fn targets(maybe_max_len: Option<usize>) -> data_provider::Result<(Vec<AccountId>, Weight)> {
+	fn targets(maybe_max_len: Option<usize>) -> data_provider::Result<Vec<AccountId>> {
 		let targets = Targets::get();
 
 		if maybe_max_len.map_or(false, |max_len| targets.len() > max_len) {
 			return Err("Targets too big")
 		}
 
-		Ok((targets, 0))
+		Ok(targets)
 	}
 
 	fn voters(
 		maybe_max_len: Option<usize>,
-	) -> data_provider::Result<(Vec<(AccountId, VoteWeight, Vec<AccountId>)>, Weight)> {
+	) -> data_provider::Result<Vec<(AccountId, VoteWeight, Vec<AccountId>)>> {
 		let voters = Voters::get();
 		if maybe_max_len.map_or(false, |max_len| voters.len() > max_len) {
 			return Err("Voters too big")
 		}
 
-		Ok((voters, 0))
+		Ok(voters)
 	}
-	fn desired_targets() -> data_provider::Result<(u32, Weight)> {
-		Ok((DesiredTargets::get(), 0))
+
+	fn desired_targets() -> data_provider::Result<u32> {
+		Ok(DesiredTargets::get())
 	}
 
 	fn next_election_prediction(now: u64) -> u64 {
 		now + EpochLength::get() - now % EpochLength::get()
 	}
 
-	#[cfg(any(feature = "runtime-benchmarks", test))]
+	#[cfg(feature = "runtime-benchmarks")]
 	fn put_snapshot(
 		voters: Vec<(AccountId, VoteWeight, Vec<AccountId>)>,
 		targets: Vec<AccountId>,
@@ -435,20 +436,20 @@ impl ElectionDataProvider<AccountId, u64> for StakingMock {
 		Voters::set(voters);
 	}
 
-	#[cfg(any(feature = "runtime-benchmarks", test))]
+	#[cfg(feature = "runtime-benchmarks")]
 	fn clear() {
 		Targets::set(vec![]);
 		Voters::set(vec![]);
 	}
 
-	#[cfg(any(feature = "runtime-benchmarks", test))]
+	#[cfg(feature = "runtime-benchmarks")]
 	fn add_voter(voter: AccountId, weight: VoteWeight, targets: Vec<AccountId>) {
 		let mut current = Voters::get();
 		current.push((voter, weight, targets));
 		Voters::set(current);
 	}
 
-	#[cfg(any(feature = "runtime-benchmarks", test))]
+	#[cfg(feature = "runtime-benchmarks")]
 	fn add_target(target: AccountId) {
 		let mut current = Targets::get();
 		current.push(target);
diff --git a/frame/election-provider-multi-phase/src/signed.rs b/frame/election-provider-multi-phase/src/signed.rs
index 39d2e37765a3..8e140fa857b8 100644
--- a/frame/election-provider-multi-phase/src/signed.rs
+++ b/frame/election-provider-multi-phase/src/signed.rs
@@ -343,7 +343,17 @@ impl<T: Config> Pallet<T> {
 	///
 	/// This drains the [`SignedSubmissions`], potentially storing the best valid one in
 	/// [`QueuedSolution`].
-	pub fn finalize_signed_phase() -> (bool, Weight) {
+	///
+	/// This is a *self-weighing* function, it automatically registers its weight internally when
+	/// being called.
+	pub fn finalize_signed_phase() -> bool {
+		let (weight, found_solution) = Self::finalize_signed_phase_internal();
+		Self::register_weight(weight);
+		found_solution
+	}
+
+	/// The guts of [`finalized_signed_phase`], that does everything except registering its weight.
+	pub(crate) fn finalize_signed_phase_internal() -> (Weight, bool) {
 		let mut all_submissions = Self::signed_submissions();
 		let mut found_solution = false;
 		let mut weight = T::DbWeight::get().reads(1);
@@ -402,9 +412,9 @@ impl<T: Config> Pallet<T> {
 			found_solution,
 			discarded
 		);
-		(found_solution, weight)
-	}
 
+		(weight, found_solution)
+	}
 	/// Helper function for the case where a solution is accepted in the signed phase.
 	///
 	/// Extracted to facilitate with weight calculation.
@@ -568,7 +578,7 @@ mod tests {
 			assert_ok!(submit_with_witness(Origin::signed(99), solution));
 			assert_eq!(balances(&99), (95, 5));
 
-			assert!(MultiPhase::finalize_signed_phase().0);
+			assert!(MultiPhase::finalize_signed_phase());
 			assert_eq!(balances(&99), (100 + 7 + 8, 0));
 		})
 	}
@@ -589,7 +599,7 @@ mod tests {
 			assert_eq!(balances(&99), (95, 5));
 
 			// no good solution was stored.
-			assert!(!MultiPhase::finalize_signed_phase().0);
+			assert!(!MultiPhase::finalize_signed_phase());
 			// and the bond is gone.
 			assert_eq!(balances(&99), (95, 0));
 		})
@@ -615,7 +625,7 @@ mod tests {
 			assert_eq!(balances(&999), (95, 5));
 
 			// _some_ good solution was stored.
-			assert!(MultiPhase::finalize_signed_phase().0);
+			assert!(MultiPhase::finalize_signed_phase());
 
 			// 99 is rewarded.
 			assert_eq!(balances(&99), (100 + 7 + 8, 0));
@@ -806,7 +816,7 @@ mod tests {
 			);
 
 			// _some_ good solution was stored.
-			assert!(MultiPhase::finalize_signed_phase().0);
+			assert!(MultiPhase::finalize_signed_phase());
 
 			// 99 is rewarded.
 			assert_eq!(balances(&99), (100 + 7 + 8, 0));
@@ -906,7 +916,7 @@ mod tests {
 				roll_to(block_number);
 
 				assert_eq!(SignedSubmissions::<Runtime>::decode_len().unwrap_or_default(), 0);
-				assert_storage_noop!(MultiPhase::finalize_signed_phase());
+				assert_storage_noop!(MultiPhase::finalize_signed_phase_internal());
 			}
 		})
 	}
@@ -923,7 +933,7 @@ mod tests {
 			assert_ok!(submit_with_witness(Origin::signed(99), solution.clone()));
 
 			// _some_ good solution was stored.
-			assert!(MultiPhase::finalize_signed_phase().0);
+			assert!(MultiPhase::finalize_signed_phase());
 
 			// calling it again doesn't change anything
 			assert_storage_noop!(MultiPhase::finalize_signed_phase());
diff --git a/frame/election-provider-multi-phase/src/unsigned.rs b/frame/election-provider-multi-phase/src/unsigned.rs
index abb4f2c47dd5..aa01920fe490 100644
--- a/frame/election-provider-multi-phase/src/unsigned.rs
+++ b/frame/election-provider-multi-phase/src/unsigned.rs
@@ -662,19 +662,19 @@ mod max_weight {
 
 	struct TestWeight;
 	impl crate::weights::WeightInfo for TestWeight {
-		fn on_initialize_nothing() -> Weight {
+		fn elect_queued(a: u32, d: u32) -> Weight {
 			unreachable!()
 		}
-		fn on_initialize_open_signed() -> Weight {
+		fn create_snapshot_internal() -> Weight {
 			unreachable!()
 		}
-		fn on_initialize_open_unsigned_with_snapshot() -> Weight {
+		fn on_initialize_nothing() -> Weight {
 			unreachable!()
 		}
-		fn elect_queued(_v: u32, _t: u32, _a: u32, _d: u32) -> Weight {
-			0
+		fn on_initialize_open_signed() -> Weight {
+			unreachable!()
 		}
-		fn on_initialize_open_unsigned_without_snapshot() -> Weight {
+		fn on_initialize_open_unsigned() -> Weight {
 			unreachable!()
 		}
 		fn finalize_signed_phase_accept_solution() -> Weight {
diff --git a/frame/election-provider-multi-phase/src/weights.rs b/frame/election-provider-multi-phase/src/weights.rs
index c3bca7136c21..262838bcb9e7 100644
--- a/frame/election-provider-multi-phase/src/weights.rs
+++ b/frame/election-provider-multi-phase/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_election_provider_multi_phase
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-08-18, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -47,11 +47,11 @@ use sp_std::marker::PhantomData;
 pub trait WeightInfo {
 	fn on_initialize_nothing() -> Weight;
 	fn on_initialize_open_signed() -> Weight;
-	fn on_initialize_open_unsigned_with_snapshot() -> Weight;
-	fn on_initialize_open_unsigned_without_snapshot() -> Weight;
+	fn on_initialize_open_unsigned() -> Weight;
 	fn finalize_signed_phase_accept_solution() -> Weight;
 	fn finalize_signed_phase_reject_solution() -> Weight;
-	fn elect_queued(v: u32, t: u32, a: u32, d: u32, ) -> Weight;
+	fn create_snapshot_internal() -> Weight;
+	fn elect_queued(a: u32, d: u32, ) -> Weight;
 	fn submit(c: u32, ) -> Weight;
 	fn submit_unsigned(v: u32, t: u32, a: u32, d: u32, ) -> Weight;
 	fn feasibility_check(v: u32, t: u32, a: u32, d: u32, ) -> Weight;
@@ -69,65 +69,43 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Staking ForceEra (r:1 w:0)
 	// Storage: ElectionProviderMultiPhase CurrentPhase (r:1 w:0)
 	fn on_initialize_nothing() -> Weight {
-		(22_589_000 as Weight)
+		(23_878_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(8 as Weight))
 	}
-	// Storage: Staking CounterForValidators (r:1 w:0)
-	// Storage: Staking Validators (r:2 w:0)
-	// Storage: Staking CounterForNominators (r:1 w:0)
-	// Storage: Staking SlashingSpans (r:1 w:0)
-	// Storage: Staking Bonded (r:1 w:0)
-	// Storage: Staking Ledger (r:1 w:0)
-	// Storage: Staking Nominators (r:1 w:0)
-	// Storage: Staking ValidatorCount (r:1 w:0)
 	// Storage: ElectionProviderMultiPhase Round (r:1 w:0)
-	// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:0 w:1)
-	// Storage: ElectionProviderMultiPhase DesiredTargets (r:0 w:1)
-	// Storage: ElectionProviderMultiPhase Snapshot (r:0 w:1)
 	// Storage: ElectionProviderMultiPhase CurrentPhase (r:0 w:1)
 	fn on_initialize_open_signed() -> Weight {
-		(107_551_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(10 as Weight))
-			.saturating_add(T::DbWeight::get().writes(4 as Weight))
-	}
-	// Storage: Staking CounterForValidators (r:1 w:0)
-	// Storage: Staking Validators (r:2 w:0)
-	// Storage: Staking CounterForNominators (r:1 w:0)
-	// Storage: Staking SlashingSpans (r:1 w:0)
-	// Storage: Staking Bonded (r:1 w:0)
-	// Storage: Staking Ledger (r:1 w:0)
-	// Storage: Staking Nominators (r:1 w:0)
-	// Storage: Staking ValidatorCount (r:1 w:0)
-	// Storage: ElectionProviderMultiPhase Round (r:1 w:0)
-	// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:0 w:1)
-	// Storage: ElectionProviderMultiPhase DesiredTargets (r:0 w:1)
-	// Storage: ElectionProviderMultiPhase Snapshot (r:0 w:1)
-	// Storage: ElectionProviderMultiPhase CurrentPhase (r:0 w:1)
-	fn on_initialize_open_unsigned_with_snapshot() -> Weight {
-		(96_899_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(10 as Weight))
-			.saturating_add(T::DbWeight::get().writes(4 as Weight))
+		(34_547_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: ElectionProviderMultiPhase Round (r:1 w:0)
 	// Storage: ElectionProviderMultiPhase CurrentPhase (r:0 w:1)
-	fn on_initialize_open_unsigned_without_snapshot() -> Weight {
-		(18_549_000 as Weight)
+	fn on_initialize_open_unsigned() -> Weight {
+		(33_568_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: System Account (r:1 w:1)
 	// Storage: ElectionProviderMultiPhase QueuedSolution (r:0 w:1)
 	fn finalize_signed_phase_accept_solution() -> Weight {
-		(48_349_000 as Weight)
+		(50_596_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	// Storage: System Account (r:1 w:1)
 	fn finalize_signed_phase_reject_solution() -> Weight {
-		(32_014_000 as Weight)
+		(33_389_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
+	// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:0 w:1)
+	// Storage: ElectionProviderMultiPhase DesiredTargets (r:0 w:1)
+	// Storage: ElectionProviderMultiPhase Snapshot (r:0 w:1)
+	fn create_snapshot_internal() -> Weight {
+		(8_835_233_000 as Weight)
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+	}
 	// Storage: ElectionProviderMultiPhase SignedSubmissionIndices (r:1 w:1)
 	// Storage: ElectionProviderMultiPhase SignedSubmissionNextIndex (r:1 w:1)
 	// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:1 w:1)
@@ -137,16 +115,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: ElectionProviderMultiPhase DesiredTargets (r:0 w:1)
 	// Storage: ElectionProviderMultiPhase Snapshot (r:0 w:1)
 	// Storage: ElectionProviderMultiPhase CurrentPhase (r:0 w:1)
-	fn elect_queued(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
-		(0 as Weight)
+	fn elect_queued(a: u32, d: u32, ) -> Weight {
+		(82_395_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((43_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 6_000
-			.saturating_add((189_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 2_000
-			.saturating_add((1_667_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 15_000
-			.saturating_add((129_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add((1_769_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 13_000
+			.saturating_add((320_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(8 as Weight))
 	}
@@ -157,9 +131,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: ElectionProviderMultiPhase SignedSubmissionNextIndex (r:1 w:1)
 	// Storage: ElectionProviderMultiPhase SignedSubmissionsMap (r:0 w:1)
 	fn submit(c: u32, ) -> Weight {
-		(72_163_000 as Weight)
-			// Standard Error: 30_000
-			.saturating_add((254_000 as Weight).saturating_mul(c as Weight))
+		(77_368_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((369_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
@@ -173,13 +147,13 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn submit_unsigned(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 4_000
-			.saturating_add((3_512_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((3_553_000 as Weight).saturating_mul(v as Weight))
 			// Standard Error: 23_000
-			.saturating_add((49_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((35_000 as Weight).saturating_mul(t as Weight))
 			// Standard Error: 7_000
-			.saturating_add((10_295_000 as Weight).saturating_mul(a as Weight))
+			.saturating_add((10_600_000 as Weight).saturating_mul(a as Weight))
 			// Standard Error: 59_000
-			.saturating_add((6_008_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add((6_128_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -187,16 +161,14 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: ElectionProviderMultiPhase DesiredTargets (r:1 w:0)
 	// Storage: ElectionProviderMultiPhase MinimumUntrustedScore (r:1 w:0)
 	// Storage: ElectionProviderMultiPhase Snapshot (r:1 w:0)
-	fn feasibility_check(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
+	fn feasibility_check(v: u32, _t: u32, a: u32, d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 8_000
-			.saturating_add((3_508_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 40_000
-			.saturating_add((302_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 13_000
-			.saturating_add((8_658_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 100_000
-			.saturating_add((4_816_000 as Weight).saturating_mul(d as Weight))
+			// Standard Error: 3_000
+			.saturating_add((3_478_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 6_000
+			.saturating_add((8_930_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 47_000
+			.saturating_add((5_199_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 	}
 }
@@ -212,65 +184,43 @@ impl WeightInfo for () {
 	// Storage: Staking ForceEra (r:1 w:0)
 	// Storage: ElectionProviderMultiPhase CurrentPhase (r:1 w:0)
 	fn on_initialize_nothing() -> Weight {
-		(22_589_000 as Weight)
+		(23_878_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(8 as Weight))
 	}
-	// Storage: Staking CounterForValidators (r:1 w:0)
-	// Storage: Staking Validators (r:2 w:0)
-	// Storage: Staking CounterForNominators (r:1 w:0)
-	// Storage: Staking SlashingSpans (r:1 w:0)
-	// Storage: Staking Bonded (r:1 w:0)
-	// Storage: Staking Ledger (r:1 w:0)
-	// Storage: Staking Nominators (r:1 w:0)
-	// Storage: Staking ValidatorCount (r:1 w:0)
 	// Storage: ElectionProviderMultiPhase Round (r:1 w:0)
-	// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:0 w:1)
-	// Storage: ElectionProviderMultiPhase DesiredTargets (r:0 w:1)
-	// Storage: ElectionProviderMultiPhase Snapshot (r:0 w:1)
 	// Storage: ElectionProviderMultiPhase CurrentPhase (r:0 w:1)
 	fn on_initialize_open_signed() -> Weight {
-		(107_551_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
-	}
-	// Storage: Staking CounterForValidators (r:1 w:0)
-	// Storage: Staking Validators (r:2 w:0)
-	// Storage: Staking CounterForNominators (r:1 w:0)
-	// Storage: Staking SlashingSpans (r:1 w:0)
-	// Storage: Staking Bonded (r:1 w:0)
-	// Storage: Staking Ledger (r:1 w:0)
-	// Storage: Staking Nominators (r:1 w:0)
-	// Storage: Staking ValidatorCount (r:1 w:0)
-	// Storage: ElectionProviderMultiPhase Round (r:1 w:0)
-	// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:0 w:1)
-	// Storage: ElectionProviderMultiPhase DesiredTargets (r:0 w:1)
-	// Storage: ElectionProviderMultiPhase Snapshot (r:0 w:1)
-	// Storage: ElectionProviderMultiPhase CurrentPhase (r:0 w:1)
-	fn on_initialize_open_unsigned_with_snapshot() -> Weight {
-		(96_899_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
+		(34_547_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: ElectionProviderMultiPhase Round (r:1 w:0)
 	// Storage: ElectionProviderMultiPhase CurrentPhase (r:0 w:1)
-	fn on_initialize_open_unsigned_without_snapshot() -> Weight {
-		(18_549_000 as Weight)
+	fn on_initialize_open_unsigned() -> Weight {
+		(33_568_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: System Account (r:1 w:1)
 	// Storage: ElectionProviderMultiPhase QueuedSolution (r:0 w:1)
 	fn finalize_signed_phase_accept_solution() -> Weight {
-		(48_349_000 as Weight)
+		(50_596_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	// Storage: System Account (r:1 w:1)
 	fn finalize_signed_phase_reject_solution() -> Weight {
-		(32_014_000 as Weight)
+		(33_389_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
+	// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:0 w:1)
+	// Storage: ElectionProviderMultiPhase DesiredTargets (r:0 w:1)
+	// Storage: ElectionProviderMultiPhase Snapshot (r:0 w:1)
+	fn create_snapshot_internal() -> Weight {
+		(8_835_233_000 as Weight)
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+	}
 	// Storage: ElectionProviderMultiPhase SignedSubmissionIndices (r:1 w:1)
 	// Storage: ElectionProviderMultiPhase SignedSubmissionNextIndex (r:1 w:1)
 	// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:1 w:1)
@@ -280,16 +230,12 @@ impl WeightInfo for () {
 	// Storage: ElectionProviderMultiPhase DesiredTargets (r:0 w:1)
 	// Storage: ElectionProviderMultiPhase Snapshot (r:0 w:1)
 	// Storage: ElectionProviderMultiPhase CurrentPhase (r:0 w:1)
-	fn elect_queued(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
-		(0 as Weight)
+	fn elect_queued(a: u32, d: u32, ) -> Weight {
+		(82_395_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((43_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 6_000
-			.saturating_add((189_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 2_000
-			.saturating_add((1_667_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 15_000
-			.saturating_add((129_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add((1_769_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 13_000
+			.saturating_add((320_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
 	}
@@ -300,9 +246,9 @@ impl WeightInfo for () {
 	// Storage: ElectionProviderMultiPhase SignedSubmissionNextIndex (r:1 w:1)
 	// Storage: ElectionProviderMultiPhase SignedSubmissionsMap (r:0 w:1)
 	fn submit(c: u32, ) -> Weight {
-		(72_163_000 as Weight)
-			// Standard Error: 30_000
-			.saturating_add((254_000 as Weight).saturating_mul(c as Weight))
+		(77_368_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((369_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
@@ -316,13 +262,13 @@ impl WeightInfo for () {
 	fn submit_unsigned(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 4_000
-			.saturating_add((3_512_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((3_553_000 as Weight).saturating_mul(v as Weight))
 			// Standard Error: 23_000
-			.saturating_add((49_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((35_000 as Weight).saturating_mul(t as Weight))
 			// Standard Error: 7_000
-			.saturating_add((10_295_000 as Weight).saturating_mul(a as Weight))
+			.saturating_add((10_600_000 as Weight).saturating_mul(a as Weight))
 			// Standard Error: 59_000
-			.saturating_add((6_008_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add((6_128_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -330,16 +276,14 @@ impl WeightInfo for () {
 	// Storage: ElectionProviderMultiPhase DesiredTargets (r:1 w:0)
 	// Storage: ElectionProviderMultiPhase MinimumUntrustedScore (r:1 w:0)
 	// Storage: ElectionProviderMultiPhase Snapshot (r:1 w:0)
-	fn feasibility_check(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
+	fn feasibility_check(v: u32, _t: u32, a: u32, d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 8_000
-			.saturating_add((3_508_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 40_000
-			.saturating_add((302_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 13_000
-			.saturating_add((8_658_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 100_000
-			.saturating_add((4_816_000 as Weight).saturating_mul(d as Weight))
+			// Standard Error: 3_000
+			.saturating_add((3_478_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 6_000
+			.saturating_add((8_930_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 47_000
+			.saturating_add((5_199_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 	}
 }
diff --git a/frame/election-provider-support/src/lib.rs b/frame/election-provider-support/src/lib.rs
index 72896e559913..f2d11911c9b3 100644
--- a/frame/election-provider-support/src/lib.rs
+++ b/frame/election-provider-support/src/lib.rs
@@ -80,7 +80,6 @@
 //! ```rust
 //! # use frame_election_provider_support::{*, data_provider};
 //! # use sp_npos_elections::{Support, Assignment};
-//! # use frame_support::weights::Weight;
 //!
 //! type AccountId = u64;
 //! type Balance = u64;
@@ -101,16 +100,16 @@
 //!
 //!     impl<T: Config> ElectionDataProvider<AccountId, BlockNumber> for Module<T> {
 //!         const MAXIMUM_VOTES_PER_VOTER: u32 = 1;
-//!         fn desired_targets() -> data_provider::Result<(u32, Weight)> {
-//!             Ok((1, 0))
+//!         fn desired_targets() -> data_provider::Result<u32> {
+//!             Ok(1)
 //!         }
 //!         fn voters(maybe_max_len: Option<usize>)
-//!         -> data_provider::Result<(Vec<(AccountId, VoteWeight, Vec<AccountId>)>, Weight)>
+//!         -> data_provider::Result<Vec<(AccountId, VoteWeight, Vec<AccountId>)>>
 //!         {
-//!             Ok((Default::default(), 0))
+//!             Ok(Default::default())
 //!         }
-//!         fn targets(maybe_max_len: Option<usize>) -> data_provider::Result<(Vec<AccountId>, Weight)> {
-//!             Ok((vec![10, 20, 30], 0))
+//!         fn targets(maybe_max_len: Option<usize>) -> data_provider::Result<Vec<AccountId>> {
+//!             Ok(vec![10, 20, 30])
 //!         }
 //!         fn next_election_prediction(now: BlockNumber) -> BlockNumber {
 //!             0
@@ -132,12 +131,10 @@
 //!         type Error = &'static str;
 //!         type DataProvider = T::DataProvider;
 //!
-//!         fn elect() -> Result<(Supports<AccountId>, Weight), Self::Error> {
+//!         fn elect() -> Result<Supports<AccountId>, Self::Error> {
 //!             Self::DataProvider::targets(None)
 //!                 .map_err(|_| "failed to elect")
-//!                 .map(|(t, weight)| {
-//! 						(vec![(t[0], Support::default())], weight)
-//! 				})
+//!                 .map(|t| vec![(t[0], Support::default())])
 //!         }
 //!     }
 //! }
@@ -164,7 +161,6 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 pub mod onchain;
-use frame_support::weights::Weight;
 use sp_std::{fmt::Debug, prelude::*};
 
 /// Re-export some type as they are used in the interface.
@@ -189,9 +185,9 @@ pub trait ElectionDataProvider<AccountId, BlockNumber> {
 	/// If `maybe_max_len` is `Some(v)` then the resulting vector MUST NOT be longer than `v` items
 	/// long.
 	///
-	/// It is assumed that this function will only consume a notable amount of weight, when it
-	/// returns `Ok(_)`.
-	fn targets(maybe_max_len: Option<usize>) -> data_provider::Result<(Vec<AccountId>, Weight)>;
+	/// This should be implemented as a self-weighing function. The implementor should register its
+	/// appropriate weight at the end of execution with the system pallet directly.
+	fn targets(maybe_max_len: Option<usize>) -> data_provider::Result<Vec<AccountId>>;
 
 	/// All possible voters for the election.
 	///
@@ -200,14 +196,17 @@ pub trait ElectionDataProvider<AccountId, BlockNumber> {
 	/// If `maybe_max_len` is `Some(v)` then the resulting vector MUST NOT be longer than `v` items
 	/// long.
 	///
-	/// It is assumed that this function will only consume a notable amount of weight, when it
-	/// returns `Ok(_)`.
+	/// This should be implemented as a self-weighing function. The implementor should register its
+	/// appropriate weight at the end of execution with the system pallet directly.
 	fn voters(
 		maybe_max_len: Option<usize>,
-	) -> data_provider::Result<(Vec<(AccountId, VoteWeight, Vec<AccountId>)>, Weight)>;
+	) -> data_provider::Result<Vec<(AccountId, VoteWeight, Vec<AccountId>)>>;
 
 	/// The number of targets to elect.
-	fn desired_targets() -> data_provider::Result<(u32, Weight)>;
+	///
+	/// This should be implemented as a self-weighing function. The implementor should register its
+	/// appropriate weight at the end of execution with the system pallet directly.
+	fn desired_targets() -> data_provider::Result<u32>;
 
 	/// Provide a best effort prediction about when the next election is about to happen.
 	///
@@ -249,15 +248,15 @@ pub trait ElectionDataProvider<AccountId, BlockNumber> {
 #[cfg(feature = "std")]
 impl<AccountId, BlockNumber> ElectionDataProvider<AccountId, BlockNumber> for () {
 	const MAXIMUM_VOTES_PER_VOTER: u32 = 0;
-	fn targets(_maybe_max_len: Option<usize>) -> data_provider::Result<(Vec<AccountId>, Weight)> {
+	fn targets(_maybe_max_len: Option<usize>) -> data_provider::Result<Vec<AccountId>> {
 		Ok(Default::default())
 	}
 	fn voters(
 		_maybe_max_len: Option<usize>,
-	) -> data_provider::Result<(Vec<(AccountId, VoteWeight, Vec<AccountId>)>, Weight)> {
+	) -> data_provider::Result<Vec<(AccountId, VoteWeight, Vec<AccountId>)>> {
 		Ok(Default::default())
 	}
-	fn desired_targets() -> data_provider::Result<(u32, Weight)> {
+	fn desired_targets() -> data_provider::Result<u32> {
 		Ok(Default::default())
 	}
 	fn next_election_prediction(now: BlockNumber) -> BlockNumber {
@@ -280,7 +279,10 @@ pub trait ElectionProvider<AccountId, BlockNumber> {
 	/// Elect a new set of winners.
 	///
 	/// The result is returned in a target major format, namely as vector of supports.
-	fn elect() -> Result<(Supports<AccountId>, Weight), Self::Error>;
+	///
+	/// This should be implemented as a self-weighing function. The implementor should register its
+	/// appropriate weight at the end of execution with the system pallet directly.
+	fn elect() -> Result<Supports<AccountId>, Self::Error>;
 }
 
 #[cfg(feature = "std")]
@@ -288,7 +290,7 @@ impl<AccountId, BlockNumber> ElectionProvider<AccountId, BlockNumber> for () {
 	type Error = &'static str;
 	type DataProvider = ();
 
-	fn elect() -> Result<(Supports<AccountId>, Weight), Self::Error> {
+	fn elect() -> Result<Supports<AccountId>, Self::Error> {
 		Err("<() as ElectionProvider> cannot do anything.")
 	}
 }
diff --git a/frame/election-provider-support/src/onchain.rs b/frame/election-provider-support/src/onchain.rs
index 2e2c286dc642..8dcf8d4a87d0 100644
--- a/frame/election-provider-support/src/onchain.rs
+++ b/frame/election-provider-support/src/onchain.rs
@@ -18,7 +18,6 @@
 //! An implementation of [`ElectionProvider`] that does an on-chain sequential phragmen.
 
 use crate::{ElectionDataProvider, ElectionProvider};
-use frame_support::{traits::Get, weights::Weight};
 use sp_npos_elections::*;
 use sp_std::{collections::btree_map::BTreeMap, marker::PhantomData, prelude::*};
 
@@ -55,8 +54,6 @@ pub struct OnChainSequentialPhragmen<T: Config>(PhantomData<T>);
 ///
 /// Note that this is similar to a pallet traits, but [`OnChainSequentialPhragmen`] is not a pallet.
 pub trait Config {
-	/// The block limits.
-	type BlockWeights: Get<frame_system::limits::BlockWeights>;
 	/// The account identifier type.
 	type AccountId: IdentifierT;
 	/// The block number type.
@@ -71,11 +68,10 @@ impl<T: Config> ElectionProvider<T::AccountId, T::BlockNumber> for OnChainSequen
 	type Error = Error;
 	type DataProvider = T::DataProvider;
 
-	fn elect() -> Result<(Supports<T::AccountId>, Weight), Self::Error> {
-		let (voters, _) = Self::DataProvider::voters(None).map_err(Error::DataProvider)?;
-		let (targets, _) = Self::DataProvider::targets(None).map_err(Error::DataProvider)?;
-		let (desired_targets, _) =
-			Self::DataProvider::desired_targets().map_err(Error::DataProvider)?;
+	fn elect() -> Result<Supports<T::AccountId>, Self::Error> {
+		let voters = Self::DataProvider::voters(None).map_err(Error::DataProvider)?;
+		let targets = Self::DataProvider::targets(None).map_err(Error::DataProvider)?;
+		let desired_targets = Self::DataProvider::desired_targets().map_err(Error::DataProvider)?;
 
 		let mut stake_map: BTreeMap<T::AccountId, VoteWeight> = BTreeMap::new();
 
@@ -93,16 +89,13 @@ impl<T: Config> ElectionProvider<T::AccountId, T::BlockNumber> for OnChainSequen
 		let staked = assignment_ratio_to_staked_normalized(assignments, &stake_of)?;
 		let winners = to_without_backing(winners);
 
-		to_supports(&winners, &staked)
-			.map_err(Error::from)
-			.map(|s| (s, T::BlockWeights::get().max_block))
+		to_supports(&winners, &staked).map_err(Error::from)
 	}
 }
 
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use frame_support::weights::Weight;
 	use sp_npos_elections::Support;
 	use sp_runtime::Perbill;
 
@@ -110,7 +103,6 @@ mod tests {
 	type BlockNumber = u32;
 	struct Runtime;
 	impl Config for Runtime {
-		type BlockWeights = ();
 		type AccountId = AccountId;
 		type BlockNumber = BlockNumber;
 		type Accuracy = Perbill;
@@ -124,21 +116,20 @@ mod tests {
 		use crate::data_provider;
 
 		pub struct DataProvider;
-
 		impl ElectionDataProvider<AccountId, BlockNumber> for DataProvider {
 			const MAXIMUM_VOTES_PER_VOTER: u32 = 2;
 			fn voters(
 				_: Option<usize>,
-			) -> data_provider::Result<(Vec<(AccountId, VoteWeight, Vec<AccountId>)>, Weight)> {
-				Ok((vec![(1, 10, vec![10, 20]), (2, 20, vec![30, 20]), (3, 30, vec![10, 30])], 0))
+			) -> data_provider::Result<Vec<(AccountId, VoteWeight, Vec<AccountId>)>> {
+				Ok(vec![(1, 10, vec![10, 20]), (2, 20, vec![30, 20]), (3, 30, vec![10, 30])])
 			}
 
-			fn targets(_: Option<usize>) -> data_provider::Result<(Vec<AccountId>, Weight)> {
-				Ok((vec![10, 20, 30], 0))
+			fn targets(_: Option<usize>) -> data_provider::Result<Vec<AccountId>> {
+				Ok(vec![10, 20, 30])
 			}
 
-			fn desired_targets() -> data_provider::Result<(u32, Weight)> {
-				Ok((2, 0))
+			fn desired_targets() -> data_provider::Result<u32> {
+				Ok(2)
 			}
 
 			fn next_election_prediction(_: BlockNumber) -> BlockNumber {
@@ -150,7 +141,7 @@ mod tests {
 	#[test]
 	fn onchain_seq_phragmen_works() {
 		assert_eq!(
-			OnChainPhragmen::elect().unwrap().0,
+			OnChainPhragmen::elect().unwrap(),
 			vec![
 				(10, Support { total: 25, voters: vec![(1, 10), (3, 15)] }),
 				(30, Support { total: 35, voters: vec![(2, 20), (3, 15)] })
diff --git a/frame/grandpa/src/mock.rs b/frame/grandpa/src/mock.rs
index b9c4858e353e..b8d6f699f890 100644
--- a/frame/grandpa/src/mock.rs
+++ b/frame/grandpa/src/mock.rs
@@ -196,7 +196,6 @@ parameter_types! {
 impl onchain::Config for Test {
 	type AccountId = <Self as frame_system::Config>::AccountId;
 	type BlockNumber = <Self as frame_system::Config>::BlockNumber;
-	type BlockWeights = ();
 	type Accuracy = Perbill;
 	type DataProvider = Staking;
 }
diff --git a/frame/offences/benchmarking/src/mock.rs b/frame/offences/benchmarking/src/mock.rs
index 3416dafa3547..431877c3a8f9 100644
--- a/frame/offences/benchmarking/src/mock.rs
+++ b/frame/offences/benchmarking/src/mock.rs
@@ -153,7 +153,6 @@ pub type Extrinsic = sp_runtime::testing::TestXt<Call, ()>;
 impl onchain::Config for Test {
 	type AccountId = AccountId;
 	type BlockNumber = BlockNumber;
-	type BlockWeights = ();
 	type Accuracy = Perbill;
 	type DataProvider = Staking;
 }
diff --git a/frame/session/benchmarking/src/mock.rs b/frame/session/benchmarking/src/mock.rs
index 672862f5ed99..9de4a0320d15 100644
--- a/frame/session/benchmarking/src/mock.rs
+++ b/frame/session/benchmarking/src/mock.rs
@@ -161,7 +161,6 @@ where
 impl onchain::Config for Test {
 	type AccountId = AccountId;
 	type BlockNumber = BlockNumber;
-	type BlockWeights = ();
 	type Accuracy = sp_runtime::Perbill;
 	type DataProvider = Staking;
 }
diff --git a/frame/staking/Cargo.toml b/frame/staking/Cargo.toml
index 669a8ff96f2c..5859cf27788f 100644
--- a/frame/staking/Cargo.toml
+++ b/frame/staking/Cargo.toml
@@ -43,9 +43,7 @@ pallet-timestamp = { version = "4.0.0-dev", path = "../timestamp" }
 pallet-staking-reward-curve = { version = "4.0.0-dev", path = "../staking/reward-curve" }
 substrate-test-utils = { version = "4.0.0-dev", path = "../../test-utils" }
 frame-benchmarking = { version = "4.0.0-dev", path = "../benchmarking" }
-frame-election-provider-support = { version = "4.0.0-dev", features = [
-	"runtime-benchmarks",
-], path = "../election-provider-support" }
+frame-election-provider-support = { version = "4.0.0-dev", path = "../election-provider-support" }
 rand_chacha = { version = "0.2" }
 
 [features]
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index a25995df6e45..e424b724b4c2 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -267,7 +267,7 @@
 #![recursion_limit = "128"]
 #![cfg_attr(not(feature = "std"), no_std)]
 
-#[cfg(any(feature = "runtime-benchmarks", test))]
+#[cfg(feature = "runtime-benchmarks")]
 pub mod benchmarking;
 #[cfg(test)]
 mod mock;
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index 776affde5d42..82eca58e5355 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -245,7 +245,6 @@ impl OnUnbalanced<NegativeImbalanceOf<Test>> for RewardRemainderMock {
 impl onchain::Config for Test {
 	type AccountId = AccountId;
 	type BlockNumber = BlockNumber;
-	type BlockWeights = BlockWeights;
 	type Accuracy = Perbill;
 	type DataProvider = Staking;
 }
diff --git a/frame/staking/src/pallet/impls.rs b/frame/staking/src/pallet/impls.rs
index 64d66f5a5fa5..bc80b63a3750 100644
--- a/frame/staking/src/pallet/impls.rs
+++ b/frame/staking/src/pallet/impls.rs
@@ -405,7 +405,7 @@ impl<T: Config> Pallet<T> {
 		start_session_index: SessionIndex,
 		is_genesis: bool,
 	) -> Option<Vec<T::AccountId>> {
-		let (election_result, weight) = if is_genesis {
+		let election_result = if is_genesis {
 			T::GenesisElectionProvider::elect().map_err(|e| {
 				log!(warn, "genesis election provider failed due to {:?}", e);
 				Self::deposit_event(Event::StakingElectionFailed);
@@ -418,13 +418,7 @@ impl<T: Config> Pallet<T> {
 		}
 		.ok()?;
 
-		<frame_system::Pallet<T>>::register_extra_weight_unchecked(
-			weight,
-			frame_support::weights::DispatchClass::Mandatory,
-		);
-
 		let exposures = Self::collect_exposures(election_result);
-
 		if (exposures.len() as u32) < Self::minimum_validator_count().max(1) {
 			// Session will panic if we ever return an empty validator set, thus max(1) ^^.
 			match CurrentEra::<T>::get() {
@@ -637,25 +631,28 @@ impl<T: Config> Pallet<T> {
 	///
 	/// This will use all on-chain nominators, and all the validators will inject a self vote.
 	///
+	/// This function is self-weighing as [`DispatchClass::Mandatory`].
+	///
 	/// ### Slashing
 	///
 	/// All nominations that have been submitted before the last non-zero slash of the validator are
 	/// auto-chilled.
-	///
-	/// Note that this is VERY expensive. Use with care.
 	pub fn get_npos_voters() -> Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)> {
 		let weight_of = Self::slashable_balance_of_fn();
 		let mut all_voters = Vec::new();
 
+		let mut validator_count = 0u32;
 		for (validator, _) in <Validators<T>>::iter() {
 			// Append self vote.
 			let self_vote = (validator.clone(), weight_of(&validator), vec![validator.clone()]);
 			all_voters.push(self_vote);
+			validator_count.saturating_inc();
 		}
 
 		// Collect all slashing spans into a BTreeMap for further queries.
 		let slashing_spans = <SlashingSpans<T>>::iter().collect::<BTreeMap<_, _>>();
 
+		let mut nominator_count = 0u32;
 		for (nominator, nominations) in Nominators::<T>::iter() {
 			let Nominations { submitted_in, mut targets, suppressed: _ } = nominations;
 
@@ -669,17 +666,35 @@ impl<T: Config> Pallet<T> {
 
 			if !targets.is_empty() {
 				let vote_weight = weight_of(&nominator);
-				all_voters.push((nominator, vote_weight, targets))
+				all_voters.push((nominator, vote_weight, targets));
+				nominator_count.saturating_inc();
 			}
 		}
 
+		Self::register_weight(T::WeightInfo::get_npos_voters(
+			validator_count,
+			nominator_count,
+			slashing_spans.len() as u32,
+		));
+
 		all_voters
 	}
 
-	/// This is a very expensive function and result should be cached versus being called multiple
-	/// times.
+	/// Get the targets for an upcoming npos election.
+	///
+	/// This function is self-weighing as [`DispatchClass::Mandatory`].
 	pub fn get_npos_targets() -> Vec<T::AccountId> {
-		Validators::<T>::iter().map(|(v, _)| v).collect::<Vec<_>>()
+		let mut validator_count = 0u32;
+		let targets = Validators::<T>::iter()
+			.map(|(v, _)| {
+				validator_count.saturating_inc();
+				v
+			})
+			.collect::<Vec<_>>();
+
+		Self::register_weight(T::WeightInfo::get_npos_targets(validator_count));
+
+		targets
 	}
 
 	/// This function will add a nominator to the `Nominators` storage map,
@@ -731,47 +746,58 @@ impl<T: Config> Pallet<T> {
 			false
 		}
 	}
+
+	/// Register some amount of weight directly with the system pallet.
+	///
+	/// This is always mandatory weight.
+	fn register_weight(weight: Weight) {
+		<frame_system::Pallet<T>>::register_extra_weight_unchecked(
+			weight,
+			DispatchClass::Mandatory,
+		);
+	}
 }
 
 impl<T: Config> frame_election_provider_support::ElectionDataProvider<T::AccountId, T::BlockNumber>
 	for Pallet<T>
 {
 	const MAXIMUM_VOTES_PER_VOTER: u32 = T::MAX_NOMINATIONS;
-	fn desired_targets() -> data_provider::Result<(u32, Weight)> {
-		Ok((Self::validator_count(), <T as frame_system::Config>::DbWeight::get().reads(1)))
+	fn desired_targets() -> data_provider::Result<u32> {
+		Self::register_weight(T::DbWeight::get().reads(1));
+		Ok(Self::validator_count())
 	}
 
 	fn voters(
 		maybe_max_len: Option<usize>,
-	) -> data_provider::Result<(Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)>, Weight)> {
+	) -> data_provider::Result<Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)>> {
 		let nominator_count = CounterForNominators::<T>::get();
 		let validator_count = CounterForValidators::<T>::get();
+
 		let voter_count = nominator_count.saturating_add(validator_count) as usize;
 		debug_assert!(<Nominators<T>>::iter().count() as u32 == CounterForNominators::<T>::get());
 		debug_assert!(<Validators<T>>::iter().count() as u32 == CounterForValidators::<T>::get());
 
+		// register the extra 2 reads
+		Self::register_weight(T::DbWeight::get().reads(2));
+
 		if maybe_max_len.map_or(false, |max_len| voter_count > max_len) {
 			return Err("Voter snapshot too big")
 		}
 
-		let slashing_span_count = <SlashingSpans<T>>::iter().count();
-		let weight = T::WeightInfo::get_npos_voters(
-			nominator_count,
-			validator_count,
-			slashing_span_count as u32,
-		);
-		Ok((Self::get_npos_voters(), weight))
+		Ok(Self::get_npos_voters())
 	}
 
-	fn targets(maybe_max_len: Option<usize>) -> data_provider::Result<(Vec<T::AccountId>, Weight)> {
+	fn targets(maybe_max_len: Option<usize>) -> data_provider::Result<Vec<T::AccountId>> {
 		let target_count = CounterForValidators::<T>::get() as usize;
 
+		// register the extra 1 read
+		Self::register_weight(T::DbWeight::get().reads(1));
+
 		if maybe_max_len.map_or(false, |max_len| target_count > max_len) {
 			return Err("Target snapshot too big")
 		}
 
-		let weight = <T as frame_system::Config>::DbWeight::get().reads(target_count as u64);
-		Ok((Self::get_npos_targets(), weight))
+		Ok(Self::get_npos_targets())
 	}
 
 	fn next_election_prediction(now: T::BlockNumber) -> T::BlockNumber {
@@ -807,7 +833,7 @@ impl<T: Config> frame_election_provider_support::ElectionDataProvider<T::Account
 		)
 	}
 
-	#[cfg(any(feature = "runtime-benchmarks", test))]
+	#[cfg(feature = "runtime-benchmarks")]
 	fn add_voter(voter: T::AccountId, weight: VoteWeight, targets: Vec<T::AccountId>) {
 		use sp_std::convert::TryFrom;
 		let stake = <BalanceOf<T>>::try_from(weight).unwrap_or_else(|_| {
@@ -827,7 +853,7 @@ impl<T: Config> frame_election_provider_support::ElectionDataProvider<T::Account
 		Self::do_add_nominator(&voter, Nominations { targets, submitted_in: 0, suppressed: false });
 	}
 
-	#[cfg(any(feature = "runtime-benchmarks", test))]
+	#[cfg(feature = "runtime-benchmarks")]
 	fn add_target(target: T::AccountId) {
 		let stake = MinValidatorBond::<T>::get() * 100u32.into();
 		<Bonded<T>>::insert(target.clone(), target.clone());
@@ -847,7 +873,7 @@ impl<T: Config> frame_election_provider_support::ElectionDataProvider<T::Account
 		);
 	}
 
-	#[cfg(any(feature = "runtime-benchmarks", test))]
+	#[cfg(feature = "runtime-benchmarks")]
 	fn clear() {
 		<Bonded<T>>::remove_all(None);
 		<Ledger<T>>::remove_all(None);
@@ -855,7 +881,7 @@ impl<T: Config> frame_election_provider_support::ElectionDataProvider<T::Account
 		<Nominators<T>>::remove_all(None);
 	}
 
-	#[cfg(any(feature = "runtime-benchmarks", test))]
+	#[cfg(feature = "runtime-benchmarks")]
 	fn put_snapshot(
 		voters: Vec<(T::AccountId, VoteWeight, Vec<T::AccountId>)>,
 		targets: Vec<T::AccountId>,
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index 67a402060aa7..931ffaa10386 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -1903,7 +1903,7 @@ fn bond_with_duplicate_vote_should_be_ignored_by_election_provider() {
 
 			// winners should be 21 and 31. Otherwise this election is taking duplicates into
 			// account.
-			let supports = <Test as Config>::ElectionProvider::elect().unwrap().0;
+			let supports = <Test as Config>::ElectionProvider::elect().unwrap();
 			assert_eq!(
 				supports,
 				vec![
@@ -1947,7 +1947,7 @@ fn bond_with_duplicate_vote_should_be_ignored_by_election_provider_elected() {
 			assert_ok!(Staking::nominate(Origin::signed(4), vec![21]));
 
 			// winners should be 21 and 11.
-			let supports = <Test as Config>::ElectionProvider::elect().unwrap().0;
+			let supports = <Test as Config>::ElectionProvider::elect().unwrap();
 			assert_eq!(
 				supports,
 				vec![
@@ -3826,7 +3826,6 @@ mod election_data_provider {
 		ExtBuilder::default().nominate(false).build_and_execute(|| {
 			assert!(<Validators<Test>>::iter().map(|(x, _)| x).all(|v| Staking::voters(None)
 				.unwrap()
-				.0
 				.into_iter()
 				.find(|(w, _, t)| { v == *w && t[0] == *w })
 				.is_some()))
@@ -3840,7 +3839,6 @@ mod election_data_provider {
 			assert_eq!(
 				<Staking as ElectionDataProvider<AccountId, BlockNumber>>::voters(None)
 					.unwrap()
-					.0
 					.iter()
 					.find(|x| x.0 == 101)
 					.unwrap()
@@ -3856,7 +3854,6 @@ mod election_data_provider {
 			assert_eq!(
 				<Staking as ElectionDataProvider<AccountId, BlockNumber>>::voters(None)
 					.unwrap()
-					.0
 					.iter()
 					.find(|x| x.0 == 101)
 					.unwrap()
@@ -3869,7 +3866,6 @@ mod election_data_provider {
 			assert_eq!(
 				<Staking as ElectionDataProvider<AccountId, BlockNumber>>::voters(None)
 					.unwrap()
-					.0
 					.iter()
 					.find(|x| x.0 == 101)
 					.unwrap()
diff --git a/frame/staking/src/weights.rs b/frame/staking/src/weights.rs
index 5d8090144fb9..0bcf179e2933 100644
--- a/frame/staking/src/weights.rs
+++ b/frame/staking/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_staking
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-08-18, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -85,7 +85,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Balances Locks (r:1 w:1)
 	// Storage: Staking Payee (r:0 w:1)
 	fn bond() -> Weight {
-		(72_423_000 as Weight)
+		(73_523_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
@@ -93,7 +93,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Staking Ledger (r:1 w:1)
 	// Storage: Balances Locks (r:1 w:1)
 	fn bond_extra() -> Weight {
-		(56_157_000 as Weight)
+		(58_129_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
@@ -104,7 +104,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Balances Locks (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn unbond() -> Weight {
-		(59_039_000 as Weight)
+		(61_542_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
@@ -113,9 +113,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Balances Locks (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn withdraw_unbonded_update(s: u32, ) -> Weight {
-		(51_503_000 as Weight)
+		(53_160_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((59_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((53_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
@@ -130,9 +130,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Staking Payee (r:0 w:1)
 	// Storage: Staking SpanSlash (r:0 w:2)
 	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
-		(84_211_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((2_391_000 as Weight).saturating_mul(s as Weight))
+		(85_826_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((2_453_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(8 as Weight))
 			.saturating_add(T::DbWeight::get().writes(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
@@ -144,16 +144,16 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Staking Nominators (r:1 w:0)
 	// Storage: Staking CounterForValidators (r:1 w:1)
 	fn validate() -> Weight {
-		(34_206_000 as Weight)
+		(34_936_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	// Storage: Staking Ledger (r:1 w:0)
 	// Storage: Staking Nominators (r:1 w:1)
 	fn kick(k: u32, ) -> Weight {
-		(22_863_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((16_208_000 as Weight).saturating_mul(k as Weight))
+		(23_493_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((16_632_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(k as Weight)))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
@@ -166,9 +166,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Staking CurrentEra (r:1 w:0)
 	// Storage: Staking CounterForNominators (r:1 w:1)
 	fn nominate(n: u32, ) -> Weight {
-		(41_047_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((5_611_000 as Weight).saturating_mul(n as Weight))
+		(41_733_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((5_840_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
@@ -177,46 +177,46 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Staking Validators (r:1 w:0)
 	// Storage: Staking Nominators (r:1 w:0)
 	fn chill() -> Weight {
-		(17_489_000 as Weight)
+		(17_901_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 	}
 	// Storage: Staking Ledger (r:1 w:0)
 	// Storage: Staking Payee (r:0 w:1)
 	fn set_payee() -> Weight {
-		(13_384_000 as Weight)
+		(13_760_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Staking Bonded (r:1 w:1)
 	// Storage: Staking Ledger (r:2 w:2)
 	fn set_controller() -> Weight {
-		(27_863_000 as Weight)
+		(28_388_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	// Storage: Staking ValidatorCount (r:0 w:1)
 	fn set_validator_count() -> Weight {
-		(2_468_000 as Weight)
+		(2_537_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Staking ForceEra (r:0 w:1)
 	fn force_no_eras() -> Weight {
-		(2_798_000 as Weight)
+		(2_749_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Staking ForceEra (r:0 w:1)
 	fn force_new_era() -> Weight {
-		(2_763_000 as Weight)
+		(2_834_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Staking ForceEra (r:0 w:1)
 	fn force_new_era_always() -> Weight {
-		(2_707_000 as Weight)
+		(2_800_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Staking Invulnerables (r:0 w:1)
 	fn set_invulnerables(v: u32, ) -> Weight {
-		(3_353_000 as Weight)
+		(3_429_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((56_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -231,18 +231,18 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Staking Payee (r:0 w:1)
 	// Storage: Staking SpanSlash (r:0 w:2)
 	fn force_unstake(s: u32, ) -> Weight {
-		(60_682_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((2_384_000 as Weight).saturating_mul(s as Weight))
+		(61_799_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((2_451_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	// Storage: Staking UnappliedSlashes (r:1 w:1)
 	fn cancel_deferred_slash(s: u32, ) -> Weight {
-		(3_368_335_000 as Weight)
-			// Standard Error: 221_000
-			.saturating_add((19_815_000 as Weight).saturating_mul(s as Weight))
+		(3_383_988_000 as Weight)
+			// Standard Error: 223_000
+			.saturating_add((19_981_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -257,9 +257,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Staking Payee (r:2 w:0)
 	// Storage: System Account (r:2 w:2)
 	fn payout_stakers_dead_controller(n: u32, ) -> Weight {
-		(108_594_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((46_477_000 as Weight).saturating_mul(n as Weight))
+		(124_714_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((47_575_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(10 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
@@ -277,9 +277,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:2 w:2)
 	// Storage: Balances Locks (r:2 w:2)
 	fn payout_stakers_alive_staked(n: u32, ) -> Weight {
-		(157_564_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((59_781_000 as Weight).saturating_mul(n as Weight))
+		(160_203_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((61_321_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(11 as Weight))
 			.saturating_add(T::DbWeight::get().reads((5 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
@@ -289,9 +289,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Balances Locks (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn rebond(l: u32, ) -> Weight {
-		(48_497_000 as Weight)
+		(49_593_000 as Weight)
 			// Standard Error: 3_000
-			.saturating_add((89_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add((78_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
@@ -306,8 +306,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Staking ErasStartSessionIndex (r:0 w:1)
 	fn set_history_depth(e: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 73_000
-			.saturating_add((34_176_000 as Weight).saturating_mul(e as Weight))
+			// Standard Error: 71_000
+			.saturating_add((35_237_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes((7 as Weight).saturating_mul(e as Weight)))
@@ -323,22 +323,21 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Staking Payee (r:0 w:1)
 	// Storage: Staking SpanSlash (r:0 w:1)
 	fn reap_stash(s: u32, ) -> Weight {
-		(71_895_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((2_376_000 as Weight).saturating_mul(s as Weight))
+		(72_484_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((2_452_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes(8 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	// Storage: Staking CounterForNominators (r:1 w:0)
 	// Storage: Staking CounterForValidators (r:1 w:0)
-	// Storage: Staking SlashingSpans (r:1 w:0)
 	// Storage: Staking Validators (r:2 w:0)
 	// Storage: Staking Bonded (r:101 w:0)
 	// Storage: Staking Ledger (r:101 w:0)
+	// Storage: Staking SlashingSpans (r:1 w:0)
 	// Storage: Staking Nominators (r:101 w:0)
 	// Storage: Staking ValidatorCount (r:1 w:0)
-	// Storage: System BlockWeight (r:1 w:1)
 	// Storage: Staking MinimumValidatorCount (r:1 w:0)
 	// Storage: Staking CurrentEra (r:1 w:1)
 	// Storage: Staking HistoryDepth (r:1 w:0)
@@ -349,14 +348,14 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Staking ErasStartSessionIndex (r:0 w:1)
 	fn new_era(v: u32, n: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 980_000
-			.saturating_add((300_866_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 49_000
-			.saturating_add((46_397_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(10 as Weight))
+			// Standard Error: 856_000
+			.saturating_add((305_057_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 43_000
+			.saturating_add((47_890_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(9 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
-			.saturating_add(T::DbWeight::get().writes(4 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(v as Weight)))
 	}
 	// Storage: Staking Validators (r:501 w:0)
@@ -367,11 +366,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn get_npos_voters(v: u32, n: u32, s: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 98_000
-			.saturating_add((24_916_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((25_610_000 as Weight).saturating_mul(v as Weight))
 			// Standard Error: 98_000
-			.saturating_add((26_575_000 as Weight).saturating_mul(n as Weight))
-			// Standard Error: 3_335_000
-			.saturating_add((22_464_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((28_064_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 3_346_000
+			.saturating_add((18_123_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
@@ -379,9 +378,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	}
 	// Storage: Staking Validators (r:501 w:0)
 	fn get_npos_targets(v: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 32_000
-			.saturating_add((10_706_000 as Weight).saturating_mul(v as Weight))
+		(30_422_000 as Weight)
+			// Standard Error: 33_000
+			.saturating_add((11_252_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(v as Weight)))
 	}
@@ -391,7 +390,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Staking MaxNominatorsCount (r:0 w:1)
 	// Storage: Staking MinNominatorBond (r:0 w:1)
 	fn set_staking_limits() -> Weight {
-		(6_463_000 as Weight)
+		(6_486_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
 	// Storage: Staking Ledger (r:1 w:0)
@@ -402,7 +401,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Staking CounterForValidators (r:1 w:1)
 	// Storage: Staking MinValidatorBond (r:1 w:0)
 	fn chill_other() -> Weight {
-		(56_717_000 as Weight)
+		(58_222_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
@@ -417,7 +416,7 @@ impl WeightInfo for () {
 	// Storage: Balances Locks (r:1 w:1)
 	// Storage: Staking Payee (r:0 w:1)
 	fn bond() -> Weight {
-		(72_423_000 as Weight)
+		(73_523_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
@@ -425,7 +424,7 @@ impl WeightInfo for () {
 	// Storage: Staking Ledger (r:1 w:1)
 	// Storage: Balances Locks (r:1 w:1)
 	fn bond_extra() -> Weight {
-		(56_157_000 as Weight)
+		(58_129_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
@@ -436,7 +435,7 @@ impl WeightInfo for () {
 	// Storage: Balances Locks (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn unbond() -> Weight {
-		(59_039_000 as Weight)
+		(61_542_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
@@ -445,9 +444,9 @@ impl WeightInfo for () {
 	// Storage: Balances Locks (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn withdraw_unbonded_update(s: u32, ) -> Weight {
-		(51_503_000 as Weight)
+		(53_160_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((59_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((53_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
@@ -462,9 +461,9 @@ impl WeightInfo for () {
 	// Storage: Staking Payee (r:0 w:1)
 	// Storage: Staking SpanSlash (r:0 w:2)
 	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
-		(84_211_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((2_391_000 as Weight).saturating_mul(s as Weight))
+		(85_826_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((2_453_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(8 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
@@ -476,16 +475,16 @@ impl WeightInfo for () {
 	// Storage: Staking Nominators (r:1 w:0)
 	// Storage: Staking CounterForValidators (r:1 w:1)
 	fn validate() -> Weight {
-		(34_206_000 as Weight)
+		(34_936_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	// Storage: Staking Ledger (r:1 w:0)
 	// Storage: Staking Nominators (r:1 w:1)
 	fn kick(k: u32, ) -> Weight {
-		(22_863_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((16_208_000 as Weight).saturating_mul(k as Weight))
+		(23_493_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((16_632_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(k as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
@@ -498,9 +497,9 @@ impl WeightInfo for () {
 	// Storage: Staking CurrentEra (r:1 w:0)
 	// Storage: Staking CounterForNominators (r:1 w:1)
 	fn nominate(n: u32, ) -> Weight {
-		(41_047_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((5_611_000 as Weight).saturating_mul(n as Weight))
+		(41_733_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((5_840_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
@@ -509,46 +508,46 @@ impl WeightInfo for () {
 	// Storage: Staking Validators (r:1 w:0)
 	// Storage: Staking Nominators (r:1 w:0)
 	fn chill() -> Weight {
-		(17_489_000 as Weight)
+		(17_901_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 	}
 	// Storage: Staking Ledger (r:1 w:0)
 	// Storage: Staking Payee (r:0 w:1)
 	fn set_payee() -> Weight {
-		(13_384_000 as Weight)
+		(13_760_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Staking Bonded (r:1 w:1)
 	// Storage: Staking Ledger (r:2 w:2)
 	fn set_controller() -> Weight {
-		(27_863_000 as Weight)
+		(28_388_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	// Storage: Staking ValidatorCount (r:0 w:1)
 	fn set_validator_count() -> Weight {
-		(2_468_000 as Weight)
+		(2_537_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Staking ForceEra (r:0 w:1)
 	fn force_no_eras() -> Weight {
-		(2_798_000 as Weight)
+		(2_749_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Staking ForceEra (r:0 w:1)
 	fn force_new_era() -> Weight {
-		(2_763_000 as Weight)
+		(2_834_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Staking ForceEra (r:0 w:1)
 	fn force_new_era_always() -> Weight {
-		(2_707_000 as Weight)
+		(2_800_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Staking Invulnerables (r:0 w:1)
 	fn set_invulnerables(v: u32, ) -> Weight {
-		(3_353_000 as Weight)
+		(3_429_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((56_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
@@ -563,18 +562,18 @@ impl WeightInfo for () {
 	// Storage: Staking Payee (r:0 w:1)
 	// Storage: Staking SpanSlash (r:0 w:2)
 	fn force_unstake(s: u32, ) -> Weight {
-		(60_682_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((2_384_000 as Weight).saturating_mul(s as Weight))
+		(61_799_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((2_451_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	// Storage: Staking UnappliedSlashes (r:1 w:1)
 	fn cancel_deferred_slash(s: u32, ) -> Weight {
-		(3_368_335_000 as Weight)
-			// Standard Error: 221_000
-			.saturating_add((19_815_000 as Weight).saturating_mul(s as Weight))
+		(3_383_988_000 as Weight)
+			// Standard Error: 223_000
+			.saturating_add((19_981_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -589,9 +588,9 @@ impl WeightInfo for () {
 	// Storage: Staking Payee (r:2 w:0)
 	// Storage: System Account (r:2 w:2)
 	fn payout_stakers_dead_controller(n: u32, ) -> Weight {
-		(108_594_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((46_477_000 as Weight).saturating_mul(n as Weight))
+		(124_714_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((47_575_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
@@ -609,9 +608,9 @@ impl WeightInfo for () {
 	// Storage: System Account (r:2 w:2)
 	// Storage: Balances Locks (r:2 w:2)
 	fn payout_stakers_alive_staked(n: u32, ) -> Weight {
-		(157_564_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((59_781_000 as Weight).saturating_mul(n as Weight))
+		(160_203_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((61_321_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(11 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((5 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
@@ -621,9 +620,9 @@ impl WeightInfo for () {
 	// Storage: Balances Locks (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn rebond(l: u32, ) -> Weight {
-		(48_497_000 as Weight)
+		(49_593_000 as Weight)
 			// Standard Error: 3_000
-			.saturating_add((89_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add((78_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
@@ -638,8 +637,8 @@ impl WeightInfo for () {
 	// Storage: Staking ErasStartSessionIndex (r:0 w:1)
 	fn set_history_depth(e: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 73_000
-			.saturating_add((34_176_000 as Weight).saturating_mul(e as Weight))
+			// Standard Error: 71_000
+			.saturating_add((35_237_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((7 as Weight).saturating_mul(e as Weight)))
@@ -655,22 +654,21 @@ impl WeightInfo for () {
 	// Storage: Staking Payee (r:0 w:1)
 	// Storage: Staking SpanSlash (r:0 w:1)
 	fn reap_stash(s: u32, ) -> Weight {
-		(71_895_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((2_376_000 as Weight).saturating_mul(s as Weight))
+		(72_484_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((2_452_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	// Storage: Staking CounterForNominators (r:1 w:0)
 	// Storage: Staking CounterForValidators (r:1 w:0)
-	// Storage: Staking SlashingSpans (r:1 w:0)
 	// Storage: Staking Validators (r:2 w:0)
 	// Storage: Staking Bonded (r:101 w:0)
 	// Storage: Staking Ledger (r:101 w:0)
+	// Storage: Staking SlashingSpans (r:1 w:0)
 	// Storage: Staking Nominators (r:101 w:0)
 	// Storage: Staking ValidatorCount (r:1 w:0)
-	// Storage: System BlockWeight (r:1 w:1)
 	// Storage: Staking MinimumValidatorCount (r:1 w:0)
 	// Storage: Staking CurrentEra (r:1 w:1)
 	// Storage: Staking HistoryDepth (r:1 w:0)
@@ -681,14 +679,14 @@ impl WeightInfo for () {
 	// Storage: Staking ErasStartSessionIndex (r:0 w:1)
 	fn new_era(v: u32, n: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 980_000
-			.saturating_add((300_866_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 49_000
-			.saturating_add((46_397_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
+			// Standard Error: 856_000
+			.saturating_add((305_057_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 43_000
+			.saturating_add((47_890_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(9 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
-			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(v as Weight)))
 	}
 	// Storage: Staking Validators (r:501 w:0)
@@ -699,11 +697,11 @@ impl WeightInfo for () {
 	fn get_npos_voters(v: u32, n: u32, s: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 98_000
-			.saturating_add((24_916_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((25_610_000 as Weight).saturating_mul(v as Weight))
 			// Standard Error: 98_000
-			.saturating_add((26_575_000 as Weight).saturating_mul(n as Weight))
-			// Standard Error: 3_335_000
-			.saturating_add((22_464_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((28_064_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 3_346_000
+			.saturating_add((18_123_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
@@ -711,9 +709,9 @@ impl WeightInfo for () {
 	}
 	// Storage: Staking Validators (r:501 w:0)
 	fn get_npos_targets(v: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 32_000
-			.saturating_add((10_706_000 as Weight).saturating_mul(v as Weight))
+		(30_422_000 as Weight)
+			// Standard Error: 33_000
+			.saturating_add((11_252_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(v as Weight)))
 	}
@@ -723,7 +721,7 @@ impl WeightInfo for () {
 	// Storage: Staking MaxNominatorsCount (r:0 w:1)
 	// Storage: Staking MinNominatorBond (r:0 w:1)
 	fn set_staking_limits() -> Weight {
-		(6_463_000 as Weight)
+		(6_486_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}
 	// Storage: Staking Ledger (r:1 w:0)
@@ -734,7 +732,7 @@ impl WeightInfo for () {
 	// Storage: Staking CounterForValidators (r:1 w:1)
 	// Storage: Staking MinValidatorBond (r:1 w:0)
 	fn chill_other() -> Weight {
-		(56_717_000 as Weight)
+		(58_222_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
diff --git a/utils/frame/remote-externalities/src/lib.rs b/utils/frame/remote-externalities/src/lib.rs
index 347cc8d66d91..addb3d1dd3c1 100644
--- a/utils/frame/remote-externalities/src/lib.rs
+++ b/utils/frame/remote-externalities/src/lib.rs
@@ -282,7 +282,7 @@ impl<B: BlockT> Builder<B> {
 		use serde_json::to_value;
 		let keys = self.get_keys_paged(prefix, at).await?;
 		let keys_count = keys.len();
-		info!(target: LOG_TARGET, "Querying a total of {} keys", keys.len());
+		debug!(target: LOG_TARGET, "Querying a total of {} keys", keys.len());
 
 		let mut key_values: Vec<KeyPair> = vec![];
 		let client = self.as_online().rpc_client();
@@ -338,7 +338,7 @@ impl<B: BlockT> Builder<B> {
 impl<B: BlockT> Builder<B> {
 	/// Save the given data as state snapshot.
 	fn save_state_snapshot(&self, data: &[KeyPair], path: &Path) -> Result<(), &'static str> {
-		info!(target: LOG_TARGET, "writing to state snapshot file {:?}", path);
+		debug!(target: LOG_TARGET, "writing to state snapshot file {:?}", path);
 		fs::write(path, data.encode()).map_err(|_| "fs::write failed.")?;
 		Ok(())
 	}
@@ -403,7 +403,7 @@ impl<B: BlockT> Builder<B> {
 
 	pub(crate) async fn init_remote_client(&mut self) -> Result<(), &'static str> {
 		let mut online = self.as_online_mut();
-		info!(target: LOG_TARGET, "initializing remote client to {:?}", online.transport.uri);
+		debug!(target: LOG_TARGET, "initializing remote client to {:?}", online.transport.uri);
 
 		// First, initialize the ws client.
 		let ws_client = WsClientBuilder::default()
@@ -435,7 +435,7 @@ impl<B: BlockT> Builder<B> {
 			},
 		};
 
-		info!(
+		debug!(
 			target: LOG_TARGET,
 			"extending externalities with {} manually injected key-values",
 			self.inject.len()
@@ -487,7 +487,7 @@ impl<B: BlockT> Builder<B> {
 		let kv = self.pre_build().await?;
 		let mut ext = TestExternalities::new_empty();
 
-		info!(target: LOG_TARGET, "injecting a total of {} keys", kv.len());
+		debug!(target: LOG_TARGET, "injecting a total of {} keys", kv.len());
 		for (k, v) in kv {
 			let (k, v) = (k.0, v.0);
 			// Insert the key,value pair into the test trie backend

From 643818d65df12fee7401e0337e9b24af89cfbfca Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Thu, 19 Aug 2021 14:34:56 +0200
Subject: [PATCH 1094/1194] Custom Benchmark Errors and Override (#9517)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* initial idea

* update benchmark test to frame v2

* fix some errors

* fixes for elec phrag

* fix tests

* update extrinsic time and docs

* fix import

* undo extra changes

* helper function

* wrong way

* Update frame/benchmarking/src/utils.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* doesnt need encode/decode

* fix benchmark return

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 frame/benchmarking/src/analysis.rs            |  14 +-
 frame/benchmarking/src/lib.rs                 |  80 +++++++-----
 frame/benchmarking/src/tests.rs               | 120 ++++++++++--------
 frame/benchmarking/src/utils.rs               |  66 ++++++++--
 frame/collective/src/benchmarking.rs          |   2 +-
 frame/democracy/src/benchmarking.rs           |  50 ++++----
 .../src/benchmarking.rs                       |   2 +-
 frame/elections-phragmen/src/benchmarking.rs  |  13 +-
 frame/elections-phragmen/src/lib.rs           |   2 +-
 frame/elections-phragmen/src/weights.rs       |   9 ++
 frame/im-online/src/benchmarking.rs           |   6 +-
 utils/frame/benchmarking-cli/src/command.rs   |   4 +-
 utils/frame/benchmarking-cli/src/writer.rs    |  18 ++-
 13 files changed, 252 insertions(+), 134 deletions(-)

diff --git a/frame/benchmarking/src/analysis.rs b/frame/benchmarking/src/analysis.rs
index 4944de8553f8..2bb20ebe2e7f 100644
--- a/frame/benchmarking/src/analysis.rs
+++ b/frame/benchmarking/src/analysis.rs
@@ -17,7 +17,7 @@
 
 //! Tools for analyzing the benchmark results.
 
-use crate::BenchmarkResults;
+use crate::BenchmarkResult;
 use core::convert::TryFrom;
 use linregress::{FormulaRegressionBuilder, RegressionDataBuilder};
 use std::collections::BTreeMap;
@@ -76,7 +76,7 @@ impl TryFrom<Option<String>> for AnalysisChoice {
 impl Analysis {
 	// Useful for when there are no components, and we just need an median value of the benchmark
 	// results. Note: We choose the median value because it is more robust to outliers.
-	fn median_value(r: &Vec<BenchmarkResults>, selector: BenchmarkSelector) -> Option<Self> {
+	fn median_value(r: &Vec<BenchmarkResult>, selector: BenchmarkSelector) -> Option<Self> {
 		if r.is_empty() {
 			return None
 		}
@@ -104,7 +104,7 @@ impl Analysis {
 		})
 	}
 
-	pub fn median_slopes(r: &Vec<BenchmarkResults>, selector: BenchmarkSelector) -> Option<Self> {
+	pub fn median_slopes(r: &Vec<BenchmarkResult>, selector: BenchmarkSelector) -> Option<Self> {
 		if r[0].components.is_empty() {
 			return Self::median_value(r, selector)
 		}
@@ -199,7 +199,7 @@ impl Analysis {
 		})
 	}
 
-	pub fn min_squares_iqr(r: &Vec<BenchmarkResults>, selector: BenchmarkSelector) -> Option<Self> {
+	pub fn min_squares_iqr(r: &Vec<BenchmarkResult>, selector: BenchmarkSelector) -> Option<Self> {
 		if r[0].components.is_empty() {
 			return Self::median_value(r, selector)
 		}
@@ -279,7 +279,7 @@ impl Analysis {
 		})
 	}
 
-	pub fn max(r: &Vec<BenchmarkResults>, selector: BenchmarkSelector) -> Option<Self> {
+	pub fn max(r: &Vec<BenchmarkResult>, selector: BenchmarkSelector) -> Option<Self> {
 		let median_slopes = Self::median_slopes(r, selector);
 		let min_squares = Self::min_squares_iqr(r, selector);
 
@@ -402,8 +402,8 @@ mod tests {
 		storage_root_time: u128,
 		reads: u32,
 		writes: u32,
-	) -> BenchmarkResults {
-		BenchmarkResults {
+	) -> BenchmarkResult {
+		BenchmarkResult {
 			components,
 			extrinsic_time,
 			storage_root_time,
diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
index 673f6dee6fc7..fb602f0732b7 100644
--- a/frame/benchmarking/src/lib.rs
+++ b/frame/benchmarking/src/lib.rs
@@ -644,7 +644,7 @@ macro_rules! benchmark_backend {
 				&self,
 				components: &[($crate::BenchmarkParameter, u32)],
 				verify: bool
-			) -> Result<$crate::Box<dyn FnOnce() -> Result<(), &'static str>>, &'static str> {
+			) -> Result<$crate::Box<dyn FnOnce() -> Result<(), $crate::BenchmarkError>>, &'static str> {
 				$(
 					// Prepare instance
 					let $param = components.iter()
@@ -658,7 +658,7 @@ macro_rules! benchmark_backend {
 				$( $param_instancer ; )*
 				$( $post )*
 
-				Ok($crate::Box::new(move || -> Result<(), &'static str> {
+				Ok($crate::Box::new(move || -> Result<(), $crate::BenchmarkError> {
 					$eval;
 					if verify {
 						$postcode;
@@ -717,7 +717,7 @@ macro_rules! selected_benchmark {
 				&self,
 				components: &[($crate::BenchmarkParameter, u32)],
 				verify: bool
-			) -> Result<$crate::Box<dyn FnOnce() -> Result<(), &'static str>>, &'static str> {
+			) -> Result<$crate::Box<dyn FnOnce() -> Result<(), $crate::BenchmarkError>>, &'static str> {
 				match self {
 					$(
 						Self::$bench => <
@@ -741,7 +741,7 @@ macro_rules! impl_benchmark {
 		( $( $name_skip_meta:ident ),* )
 	) => {
 		impl<T: Config $(<$instance>, $instance: $instance_bound )? >
-			$crate::Benchmarking<$crate::BenchmarkResults> for Pallet<T $(, $instance)? >
+			$crate::Benchmarking for Pallet<T $(, $instance)? >
 			where T: frame_system::Config, $( $where_clause )*
 		{
 			fn benchmarks(extra: bool) -> $crate::Vec<$crate::BenchmarkMetadata> {
@@ -772,13 +772,13 @@ macro_rules! impl_benchmark {
 				whitelist: &[$crate::TrackedStorageKey],
 				verify: bool,
 				internal_repeats: u32,
-			) -> Result<$crate::Vec<$crate::BenchmarkResults>, &'static str> {
+			) -> Result<$crate::Vec<$crate::BenchmarkResult>, $crate::BenchmarkError> {
 				// Map the input to the selected benchmark.
 				let extrinsic = $crate::sp_std::str::from_utf8(extrinsic)
 					.map_err(|_| "`extrinsic` is not a valid utf8 string!")?;
 				let selected_benchmark = match extrinsic {
 					$( stringify!($name) => SelectedBenchmark::$name, )*
-					_ => return Err("Could not find extrinsic."),
+					_ => return Err("Could not find extrinsic.".into()),
 				};
 
 				// Add whitelist to DB including whitelisted caller
@@ -790,7 +790,7 @@ macro_rules! impl_benchmark {
 				whitelist.push(whitelisted_caller_key.into());
 				$crate::benchmarking::set_whitelist(whitelist);
 
-				let mut results: $crate::Vec<$crate::BenchmarkResults> = $crate::Vec::new();
+				let mut results: $crate::Vec<$crate::BenchmarkResult> = $crate::Vec::new();
 
 				// Always do at least one internal repeat...
 				for _ in 0 .. internal_repeats.max(1) {
@@ -852,13 +852,13 @@ macro_rules! impl_benchmark {
 					let elapsed_storage_root = finish_storage_root - start_storage_root;
 
 					let skip_meta = [ $( stringify!($name_skip_meta).as_ref() ),* ];
-					let read_and_written_keys = if (&skip_meta).contains(&extrinsic) {
+					let read_and_written_keys = if skip_meta.contains(&extrinsic) {
 						$crate::vec![(b"Skipped Metadata".to_vec(), 0, 0, false)]
 					} else {
 						$crate::benchmarking::get_read_and_written_keys()
 					};
 
-					results.push($crate::BenchmarkResults {
+					results.push($crate::BenchmarkResult {
 						components: c.to_vec(),
 						extrinsic_time: elapsed_extrinsic,
 						storage_root_time: elapsed_storage_root,
@@ -893,14 +893,14 @@ macro_rules! impl_benchmark {
 			/// by the `impl_benchmark_test_suite` macro. However, it is not an error if a pallet
 			/// author chooses not to implement benchmarks.
 			#[allow(unused)]
-			fn test_bench_by_name(name: &[u8]) -> Result<(), &'static str> {
+			fn test_bench_by_name(name: &[u8]) -> Result<(), $crate::BenchmarkError> {
 				let name = $crate::sp_std::str::from_utf8(name)
-					.map_err(|_| "`name` is not a valid utf8 string!")?;
+					.map_err(|_| -> $crate::BenchmarkError { "`name` is not a valid utf8 string!".into() })?;
 				match name {
 					$( stringify!($name) => {
 						$crate::paste::paste! { Self::[< test_benchmark_ $name >]() }
 					} )*
-					_ => Err("Could not find test for requested benchmark."),
+					_ => Err("Could not find test for requested benchmark.".into()),
 				}
 			}
 		}
@@ -925,7 +925,7 @@ macro_rules! impl_benchmark_test {
 			where T: frame_system::Config, $( $where_clause )*
 			{
 				#[allow(unused)]
-				fn [<test_benchmark_ $name>] () -> Result<(), &'static str> {
+				fn [<test_benchmark_ $name>] () -> Result<(), $crate::BenchmarkError> {
 					let selected_benchmark = SelectedBenchmark::$name;
 					let components = <
 						SelectedBenchmark as $crate::BenchmarkingSetup<T, _>
@@ -933,7 +933,7 @@ macro_rules! impl_benchmark_test {
 
 					let execute_benchmark = |
 						c: $crate::Vec<($crate::BenchmarkParameter, u32)>
-					| -> Result<(), &'static str> {
+					| -> Result<(), $crate::BenchmarkError> {
 						// Set up the benchmark, return execution + verification function.
 						let closure_to_verify = <
 							SelectedBenchmark as $crate::BenchmarkingSetup<T, _>
@@ -1213,8 +1213,15 @@ macro_rules! impl_benchmark_test_suite {
 								anything_failed = true;
 							},
 							Ok(Err(err)) => {
-								println!("{}: {}", String::from_utf8_lossy(benchmark_name), err);
-								anything_failed = true;
+								match err {
+									$crate::BenchmarkError::Stop(err) => {
+										println!("{}: {:?}", String::from_utf8_lossy(benchmark_name), err);
+										anything_failed = true;
+									},
+									$crate::BenchmarkError::Override(_) => {
+										// This is still considered a success condition.
+									}
+								}
 							},
 							Ok(Ok(_)) => (),
 						}
@@ -1328,25 +1335,40 @@ macro_rules! add_benchmark {
 			internal_repeats,
 		} = config;
 		if &pallet[..] == &name_string[..] {
-			$batches.push($crate::BenchmarkBatch {
-				pallet: name_string.to_vec(),
-				instance: instance_string.to_vec(),
-				benchmark: benchmark.clone(),
-				results: $( $location )*::run_benchmark(
-					&benchmark[..],
-					&selected_components[..],
-					whitelist,
-					*verify,
-					*internal_repeats,
-				).map_err(|e| {
+			let benchmark_result = $( $location )*::run_benchmark(
+				&benchmark[..],
+				&selected_components[..],
+				whitelist,
+				*verify,
+				*internal_repeats,
+			);
+
+			let final_results = match benchmark_result {
+				Ok(results) => results,
+				Err($crate::BenchmarkError::Override(mut result)) => {
+					// Insert override warning as the first storage key.
+					result.keys.insert(0,
+						(b"Benchmark Override".to_vec(), 0, 0, false)
+					);
+					$crate::vec![result]
+				},
+				Err($crate::BenchmarkError::Stop(e)) => {
 					$crate::show_benchmark_debug_info(
 						instance_string,
 						benchmark,
 						selected_components,
 						verify,
 						e,
-					)
-				})?
+					);
+					return Err(e.into());
+				},
+			};
+
+			$batches.push($crate::BenchmarkBatch {
+				pallet: name_string.to_vec(),
+				instance: instance_string.to_vec(),
+				benchmark: benchmark.clone(),
+				results: final_results,
 			});
 		}
 	)
diff --git a/frame/benchmarking/src/tests.rs b/frame/benchmarking/src/tests.rs
index 9cb5043a0dd7..af9a4e7f4a85 100644
--- a/frame/benchmarking/src/tests.rs
+++ b/frame/benchmarking/src/tests.rs
@@ -28,47 +28,44 @@ use sp_runtime::{
 };
 use sp_std::prelude::*;
 
+#[frame_support::pallet]
 mod pallet_test {
-	use frame_support::pallet_prelude::Get;
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
 
-	frame_support::decl_storage! {
-		trait Store for Module<T: Config> as Test where
-			<T as OtherConfig>::OtherEvent: Into<<T as Config>::Event>
-		{
-			pub Value get(fn value): Option<u32>;
-		}
-	}
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	pub struct Pallet<T>(_);
 
-	frame_support::decl_module! {
-		pub struct Module<T: Config> for enum Call where
-			origin: T::Origin, <T as OtherConfig>::OtherEvent: Into<<T as Config>::Event>
-		{
-			#[weight = 0]
-			fn set_value(origin, n: u32) -> frame_support::dispatch::DispatchResult {
-				let _sender = frame_system::ensure_signed(origin)?;
-				Value::put(n);
-				Ok(())
-			}
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		type LowerBound: Get<u32>;
+		type UpperBound: Get<u32>;
+	}
 
-			#[weight = 0]
-			fn dummy(origin, _n: u32) -> frame_support::dispatch::DispatchResult {
-				let _sender = frame_system::ensure_none(origin)?;
-				Ok(())
-			}
+	#[pallet::storage]
+	#[pallet::getter(fn heartbeat_after)]
+	pub(crate) type Value<T: Config> = StorageValue<_, u32, OptionQuery>;
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		#[pallet::weight(0)]
+		pub fn set_value(origin: OriginFor<T>, n: u32) -> DispatchResult {
+			let _sender = frame_system::ensure_signed(origin)?;
+			Value::<T>::put(n);
+			Ok(())
 		}
-	}
 
-	pub trait OtherConfig {
-		type OtherEvent;
-	}
+		#[pallet::weight(0)]
+		pub fn dummy(origin: OriginFor<T>, _n: u32) -> DispatchResult {
+			let _sender = frame_system::ensure_none(origin)?;
+			Ok(())
+		}
 
-	pub trait Config: frame_system::Config + OtherConfig
-	where
-		Self::OtherEvent: Into<<Self as Config>::Event>,
-	{
-		type Event;
-		type LowerBound: Get<u32>;
-		type UpperBound: Get<u32>;
+		#[pallet::weight(0)]
+		pub fn always_error(_origin: OriginFor<T>) -> DispatchResult {
+			return Err("I always fail".into())
+		}
 	}
 }
 
@@ -118,27 +115,18 @@ parameter_types! {
 }
 
 impl pallet_test::Config for Test {
-	type Event = Event;
 	type LowerBound = LowerBound;
 	type UpperBound = UpperBound;
 }
 
-impl pallet_test::OtherConfig for Test {
-	type OtherEvent = Event;
-}
-
 fn new_test_ext() -> sp_io::TestExternalities {
 	GenesisConfig::default().build_storage().unwrap().into()
 }
 
 mod benchmarks {
-	use super::{
-		new_test_ext,
-		pallet_test::{self, Value},
-		Test,
-	};
-	use crate::{account, BenchmarkParameter, BenchmarkingSetup};
-	use frame_support::{assert_err, assert_ok, ensure, traits::Get, StorageValue};
+	use super::{new_test_ext, pallet_test::Value, Test};
+	use crate::{account, BenchmarkError, BenchmarkParameter, BenchmarkResult, BenchmarkingSetup};
+	use frame_support::{assert_err, assert_ok, ensure, traits::Get};
 	use frame_system::RawOrigin;
 	use sp_std::prelude::*;
 
@@ -148,8 +136,7 @@ mod benchmarks {
 	crate::benchmarks! {
 		where_clause {
 			where
-				<T as pallet_test::OtherConfig>::OtherEvent: Into<<T as pallet_test::Config>::Event> + Clone,
-				<T as pallet_test::Config>::Event: Clone,
+				crate::tests::Origin: From<RawOrigin<<T as frame_system::Config>::AccountId>>,
 		}
 
 		set_value {
@@ -157,7 +144,7 @@ mod benchmarks {
 			let caller = account::<T::AccountId>("caller", 0, 0);
 		}: _ (RawOrigin::Signed(caller), b.into())
 		verify {
-			assert_eq!(Value::get(), Some(b));
+			assert_eq!(Value::<T>::get(), Some(b));
 		}
 
 		other_name {
@@ -206,7 +193,7 @@ mod benchmarks {
 			let caller = account::<T::AccountId>("caller", 0, 0);
 		}: set_value(RawOrigin::Signed(caller), b.into())
 		verify {
-			assert_eq!(Value::get(), Some(b));
+			assert_eq!(Value::<T>::get(), Some(b));
 		}
 
 		#[skip_meta]
@@ -215,7 +202,21 @@ mod benchmarks {
 			let caller = account::<T::AccountId>("caller", 0, 0);
 		}: set_value(RawOrigin::Signed(caller), b.into())
 		verify {
-			assert_eq!(Value::get(), Some(b));
+			assert_eq!(Value::<T>::get(), Some(b));
+		}
+
+		override_benchmark {
+			let b in 1 .. 1000;
+			let caller = account::<T::AccountId>("caller", 0, 0);
+		}: {
+			Err(BenchmarkError::Override(
+				BenchmarkResult {
+					extrinsic_time: 1_234_567_890,
+					reads: 1337,
+					writes: 420,
+					..Default::default()
+				}
+			))?;
 		}
 	}
 
@@ -306,6 +307,23 @@ mod benchmarks {
 		});
 	}
 
+	#[test]
+	fn benchmark_override_works() {
+		let selected = SelectedBenchmark::override_benchmark;
+
+		let closure = <SelectedBenchmark as BenchmarkingSetup<Test>>::instance(
+			&selected,
+			&[(BenchmarkParameter::b, 1)],
+			true,
+		)
+		.expect("failed to create closure");
+
+		new_test_ext().execute_with(|| {
+			let result = closure();
+			assert!(matches!(result, Err(BenchmarkError::Override(_))));
+		});
+	}
+
 	#[test]
 	fn benchmarks_generate_unit_tests() {
 		new_test_ext().execute_with(|| {
diff --git a/frame/benchmarking/src/utils.rs b/frame/benchmarking/src/utils.rs
index 8be25f7f5e9c..64eb611a187b 100644
--- a/frame/benchmarking/src/utils.rs
+++ b/frame/benchmarking/src/utils.rs
@@ -18,7 +18,11 @@
 //! Interfaces, types and utils for benchmarking a FRAME runtime.
 
 use codec::{Decode, Encode};
-use frame_support::traits::StorageInfo;
+use frame_support::{
+	dispatch::{DispatchError, DispatchErrorWithPostInfo},
+	pallet_prelude::*,
+	traits::StorageInfo,
+};
 use sp_io::hashing::blake2_256;
 use sp_std::{prelude::Box, vec::Vec};
 use sp_storage::TrackedStorageKey;
@@ -73,7 +77,7 @@ pub struct BenchmarkBatch {
 	/// The extrinsic (or benchmark name) of this benchmark.
 	pub benchmark: Vec<u8>,
 	/// The results from this benchmark.
-	pub results: Vec<BenchmarkResults>,
+	pub results: Vec<BenchmarkResult>,
 }
 
 // TODO: could probably make API cleaner here.
@@ -87,16 +91,16 @@ pub struct BenchmarkBatchSplitResults {
 	/// The extrinsic (or benchmark name) of this benchmark.
 	pub benchmark: Vec<u8>,
 	/// The extrinsic timing results from this benchmark.
-	pub time_results: Vec<BenchmarkResults>,
+	pub time_results: Vec<BenchmarkResult>,
 	/// The db tracking results from this benchmark.
-	pub db_results: Vec<BenchmarkResults>,
+	pub db_results: Vec<BenchmarkResult>,
 }
 
-/// Results from running benchmarks on a FRAME pallet.
+/// Result from running benchmarks on a FRAME pallet.
 /// Contains duration of the function call in nanoseconds along with the benchmark parameters
 /// used for that benchmark result.
 #[derive(Encode, Decode, Default, Clone, PartialEq, Debug)]
-pub struct BenchmarkResults {
+pub struct BenchmarkResult {
 	pub components: Vec<(BenchmarkParameter, u32)>,
 	pub extrinsic_time: u128,
 	pub storage_root_time: u128,
@@ -108,6 +112,50 @@ pub struct BenchmarkResults {
 	pub keys: Vec<(Vec<u8>, u32, u32, bool)>,
 }
 
+impl BenchmarkResult {
+	pub fn from_weight(w: Weight) -> Self {
+		Self { extrinsic_time: (w as u128) / 1_000, ..Default::default() }
+	}
+}
+
+/// Possible errors returned from the benchmarking pipeline.
+///
+/// * Stop: The benchmarking pipeline should stop and return the inner string.
+/// * WeightOverride: The benchmarking pipeline is allowed to fail here, and we should use the
+///   included weight instead.
+#[derive(Clone, PartialEq, Debug)]
+pub enum BenchmarkError {
+	Stop(&'static str),
+	Override(BenchmarkResult),
+}
+
+impl From<BenchmarkError> for &'static str {
+	fn from(e: BenchmarkError) -> Self {
+		match e {
+			BenchmarkError::Stop(s) => s,
+			BenchmarkError::Override(_) => "benchmark override",
+		}
+	}
+}
+
+impl From<&'static str> for BenchmarkError {
+	fn from(s: &'static str) -> Self {
+		Self::Stop(s)
+	}
+}
+
+impl From<DispatchErrorWithPostInfo> for BenchmarkError {
+	fn from(e: DispatchErrorWithPostInfo) -> Self {
+		Self::Stop(e.into())
+	}
+}
+
+impl From<DispatchError> for BenchmarkError {
+	fn from(e: DispatchError) -> Self {
+		Self::Stop(e.into())
+	}
+}
+
 /// Configuration used to setup and run runtime benchmarks.
 #[derive(Encode, Decode, Default, Clone, PartialEq, Debug)]
 pub struct BenchmarkConfig {
@@ -235,7 +283,7 @@ pub trait Benchmarking {
 }
 
 /// The pallet benchmarking trait.
-pub trait Benchmarking<T> {
+pub trait Benchmarking {
 	/// Get the benchmarks available for this pallet. Generally there is one benchmark per
 	/// extrinsic, so these are sometimes just called "extrinsics".
 	///
@@ -251,7 +299,7 @@ pub trait Benchmarking<T> {
 		whitelist: &[TrackedStorageKey],
 		verify: bool,
 		internal_repeats: u32,
-	) -> Result<Vec<T>, &'static str>;
+	) -> Result<Vec<BenchmarkResult>, BenchmarkError>;
 }
 
 /// The required setup for creating a benchmark.
@@ -267,7 +315,7 @@ pub trait BenchmarkingSetup<T, I = ()> {
 		&self,
 		components: &[(BenchmarkParameter, u32)],
 		verify: bool,
-	) -> Result<Box<dyn FnOnce() -> Result<(), &'static str>>, &'static str>;
+	) -> Result<Box<dyn FnOnce() -> Result<(), BenchmarkError>>, &'static str>;
 }
 
 /// Grab an account, seeded by a name and index.
diff --git a/frame/collective/src/benchmarking.rs b/frame/collective/src/benchmarking.rs
index ccc20356fbf4..b966279a42ff 100644
--- a/frame/collective/src/benchmarking.rs
+++ b/frame/collective/src/benchmarking.rs
@@ -277,7 +277,7 @@ benchmarks_instance! {
 	verify {
 		// All proposals exist and the last proposal has just been updated.
 		assert_eq!(Collective::<T, _>::proposals().len(), p as usize);
-		let voting = Collective::<T, _>::voting(&last_hash).ok_or(Error::<T, I>::ProposalMissing)?;
+		let voting = Collective::<T, _>::voting(&last_hash).ok_or("Proposal Missing")?;
 		assert_eq!(voting.ayes.len(), (m - 3) as usize);
 		assert_eq!(voting.nays.len(), 1);
 	}
diff --git a/frame/democracy/src/benchmarking.rs b/frame/democracy/src/benchmarking.rs
index ddc3de590659..487a52571941 100644
--- a/frame/democracy/src/benchmarking.rs
+++ b/frame/democracy/src/benchmarking.rs
@@ -136,7 +136,7 @@ benchmarks! {
 		}
 		let votes = match VotingOf::<T>::get(&caller) {
 			Voting::Direct { votes, .. } => votes,
-			_ => return Err("Votes are not direct"),
+			_ => return Err("Votes are not direct".into()),
 		};
 		assert_eq!(votes.len(), r as usize, "Votes were not recorded.");
 
@@ -146,7 +146,7 @@ benchmarks! {
 	verify {
 		let votes = match VotingOf::<T>::get(&caller) {
 			Voting::Direct { votes, .. } => votes,
-			_ => return Err("Votes are not direct"),
+			_ => return Err("Votes are not direct".into()),
 		};
 		assert_eq!(votes.len(), (r + 1) as usize, "Vote was not recorded.");
 	}
@@ -164,7 +164,7 @@ benchmarks! {
 		}
 		let votes = match VotingOf::<T>::get(&caller) {
 			Voting::Direct { votes, .. } => votes,
-			_ => return Err("Votes are not direct"),
+			_ => return Err("Votes are not direct".into()),
 		};
 		assert_eq!(votes.len(), (r + 1) as usize, "Votes were not recorded.");
 
@@ -179,14 +179,14 @@ benchmarks! {
 	verify {
 		let votes = match VotingOf::<T>::get(&caller) {
 			Voting::Direct { votes, .. } => votes,
-			_ => return Err("Votes are not direct"),
+			_ => return Err("Votes are not direct".into()),
 		};
 		assert_eq!(votes.len(), (r + 1) as usize, "Vote was incorrectly added");
 		let referendum_info = Democracy::<T>::referendum_info(referendum_index)
 			.ok_or("referendum doesn't exist")?;
 		let tally =  match referendum_info {
 			ReferendumInfo::Ongoing(r) => r.tally,
-			_ => return Err("referendum not ongoing"),
+			_ => return Err("referendum not ongoing".into()),
 		};
 		assert_eq!(tally.nays, 1000u32.into(), "changed vote was not recorded");
 	}
@@ -374,7 +374,7 @@ benchmarks! {
 			if let Some(value) = ReferendumInfoOf::<T>::get(i) {
 				match value {
 					ReferendumInfo::Finished { .. } => (),
-					ReferendumInfo::Ongoing(_) => return Err("Referendum was not finished"),
+					ReferendumInfo::Ongoing(_) => return Err("Referendum was not finished".into()),
 				}
 			}
 		}
@@ -408,7 +408,7 @@ benchmarks! {
 			if let Some(value) = ReferendumInfoOf::<T>::get(i) {
 				match value {
 					ReferendumInfo::Finished { .. } => (),
-					ReferendumInfo::Ongoing(_) => return Err("Referendum was not finished"),
+					ReferendumInfo::Ongoing(_) => return Err("Referendum was not finished".into()),
 				}
 			}
 		}
@@ -438,7 +438,7 @@ benchmarks! {
 		for i in 0 .. r {
 			if let Some(value) = ReferendumInfoOf::<T>::get(i) {
 				match value {
-					ReferendumInfo::Finished { .. } => return Err("Referendum has been finished"),
+					ReferendumInfo::Finished { .. } => return Err("Referendum has been finished".into()),
 					ReferendumInfo::Ongoing(_) => (),
 				}
 			}
@@ -462,7 +462,7 @@ benchmarks! {
 		)?;
 		let (target, balance) = match VotingOf::<T>::get(&caller) {
 			Voting::Delegating { target, balance, .. } => (target, balance),
-			_ => return Err("Votes are not direct"),
+			_ => return Err("Votes are not direct".into()),
 		};
 		assert_eq!(target, old_delegate, "delegation target didn't work");
 		assert_eq!(balance, delegated_balance, "delegation balance didn't work");
@@ -476,7 +476,7 @@ benchmarks! {
 		}
 		let votes = match VotingOf::<T>::get(&new_delegate) {
 			Voting::Direct { votes, .. } => votes,
-			_ => return Err("Votes are not direct"),
+			_ => return Err("Votes are not direct".into()),
 		};
 		assert_eq!(votes.len(), r as usize, "Votes were not recorded.");
 		whitelist_account!(caller);
@@ -484,13 +484,13 @@ benchmarks! {
 	verify {
 		let (target, balance) = match VotingOf::<T>::get(&caller) {
 			Voting::Delegating { target, balance, .. } => (target, balance),
-			_ => return Err("Votes are not direct"),
+			_ => return Err("Votes are not direct".into()),
 		};
 		assert_eq!(target, new_delegate, "delegation target didn't work");
 		assert_eq!(balance, delegated_balance, "delegation balance didn't work");
 		let delegations = match VotingOf::<T>::get(&new_delegate) {
 			Voting::Direct { delegations, .. } => delegations,
-			_ => return Err("Votes are not direct"),
+			_ => return Err("Votes are not direct".into()),
 		};
 		assert_eq!(delegations.capital, delegated_balance, "delegation was not recorded.");
 	}
@@ -512,7 +512,7 @@ benchmarks! {
 		)?;
 		let (target, balance) = match VotingOf::<T>::get(&caller) {
 			Voting::Delegating { target, balance, .. } => (target, balance),
-			_ => return Err("Votes are not direct"),
+			_ => return Err("Votes are not direct".into()),
 		};
 		assert_eq!(target, the_delegate, "delegation target didn't work");
 		assert_eq!(balance, delegated_balance, "delegation balance didn't work");
@@ -528,7 +528,7 @@ benchmarks! {
 		}
 		let votes = match VotingOf::<T>::get(&the_delegate) {
 			Voting::Direct { votes, .. } => votes,
-			_ => return Err("Votes are not direct"),
+			_ => return Err("Votes are not direct".into()),
 		};
 		assert_eq!(votes.len(), r as usize, "Votes were not recorded.");
 		whitelist_account!(caller);
@@ -537,7 +537,7 @@ benchmarks! {
 		// Voting should now be direct
 		match VotingOf::<T>::get(&caller) {
 			Voting::Direct { .. } => (),
-			_ => return Err("undelegation failed"),
+			_ => return Err("undelegation failed".into()),
 		}
 	}
 
@@ -558,7 +558,7 @@ benchmarks! {
 		let proposal_hash = T::Hashing::hash(&encoded_proposal[..]);
 		match Preimages::<T>::get(proposal_hash) {
 			Some(PreimageStatus::Available { .. }) => (),
-			_ => return Err("preimage not available")
+			_ => return Err("preimage not available".into())
 		}
 	}
 
@@ -580,7 +580,7 @@ benchmarks! {
 		let proposal_hash = T::Hashing::hash(&encoded_proposal[..]);
 		match Preimages::<T>::get(proposal_hash) {
 			Some(PreimageStatus::Available { .. }) => (),
-			_ => return Err("preimage not available")
+			_ => return Err("preimage not available".into())
 		}
 	}
 
@@ -652,7 +652,7 @@ benchmarks! {
 
 		let votes = match VotingOf::<T>::get(&locker) {
 			Voting::Direct { votes, .. } => votes,
-			_ => return Err("Votes are not direct"),
+			_ => return Err("Votes are not direct".into()),
 		};
 		assert_eq!(votes.len(), (r + 1) as usize, "Votes were not recorded.");
 
@@ -667,7 +667,7 @@ benchmarks! {
 	verify {
 		let votes = match VotingOf::<T>::get(&locker) {
 			Voting::Direct { votes, .. } => votes,
-			_ => return Err("Votes are not direct"),
+			_ => return Err("Votes are not direct".into()),
 		};
 		assert_eq!(votes.len(), r as usize, "Vote was not removed");
 
@@ -689,7 +689,7 @@ benchmarks! {
 
 		let votes = match VotingOf::<T>::get(&caller) {
 			Voting::Direct { votes, .. } => votes,
-			_ => return Err("Votes are not direct"),
+			_ => return Err("Votes are not direct".into()),
 		};
 		assert_eq!(votes.len(), r as usize, "Votes not created");
 
@@ -699,7 +699,7 @@ benchmarks! {
 	verify {
 		let votes = match VotingOf::<T>::get(&caller) {
 			Voting::Direct { votes, .. } => votes,
-			_ => return Err("Votes are not direct"),
+			_ => return Err("Votes are not direct".into()),
 		};
 		assert_eq!(votes.len(), (r - 1) as usize, "Vote was not removed");
 	}
@@ -718,7 +718,7 @@ benchmarks! {
 
 		let votes = match VotingOf::<T>::get(&caller) {
 			Voting::Direct { votes, .. } => votes,
-			_ => return Err("Votes are not direct"),
+			_ => return Err("Votes are not direct".into()),
 		};
 		assert_eq!(votes.len(), r as usize, "Votes not created");
 
@@ -728,7 +728,7 @@ benchmarks! {
 	verify {
 		let votes = match VotingOf::<T>::get(&caller) {
 			Voting::Direct { votes, .. } => votes,
-			_ => return Err("Votes are not direct"),
+			_ => return Err("Votes are not direct".into()),
 		};
 		assert_eq!(votes.len(), (r - 1) as usize, "Vote was not removed");
 	}
@@ -747,7 +747,7 @@ benchmarks! {
 
 		match Preimages::<T>::get(proposal_hash) {
 			Some(PreimageStatus::Available { .. }) => (),
-			_ => return Err("preimage not available")
+			_ => return Err("preimage not available".into())
 		}
 	}: enact_proposal(RawOrigin::Root, proposal_hash, 0)
 	verify {
@@ -768,7 +768,7 @@ benchmarks! {
 
 		match Preimages::<T>::get(proposal_hash) {
 			Some(PreimageStatus::Available { .. }) => (),
-			_ => return Err("preimage not available")
+			_ => return Err("preimage not available".into())
 		}
 	}: {
 		assert_eq!(
diff --git a/frame/election-provider-multi-phase/src/benchmarking.rs b/frame/election-provider-multi-phase/src/benchmarking.rs
index 4aad1d556ce5..9c734c482354 100644
--- a/frame/election-provider-multi-phase/src/benchmarking.rs
+++ b/frame/election-provider-multi-phase/src/benchmarking.rs
@@ -438,7 +438,7 @@ frame_benchmarking::benchmarks! {
 		set_up_data_provider::<T>(v, t);
 		assert!(<MultiPhase<T>>::snapshot().is_none());
 	}: {
-		<MultiPhase::<T>>::create_snapshot()?
+		<MultiPhase::<T>>::create_snapshot().map_err(|_| "could not create snapshot")?;
 	} verify {
 		assert!(<MultiPhase<T>>::snapshot().is_some());
 		assert_eq!(<MultiPhase<T>>::snapshot_metadata().ok_or("snapshot missing")?.voters, v + t);
diff --git a/frame/elections-phragmen/src/benchmarking.rs b/frame/elections-phragmen/src/benchmarking.rs
index 4e19b64ef7a5..7cb83b3dd779 100644
--- a/frame/elections-phragmen/src/benchmarking.rs
+++ b/frame/elections-phragmen/src/benchmarking.rs
@@ -21,7 +21,9 @@
 
 use super::*;
 
-use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, whitelist};
+use frame_benchmarking::{
+	account, benchmarks, impl_benchmark_test_suite, whitelist, BenchmarkError, BenchmarkResult,
+};
 use frame_support::{dispatch::DispatchResultWithPostInfo, traits::OnInitialize};
 use frame_system::RawOrigin;
 
@@ -332,9 +334,16 @@ benchmarks! {
 		}
 	}
 
+	// We use the max block weight for this extrinsic for now. See below.
+	remove_member_without_replacement {}: {
+		Err(BenchmarkError::Override(
+			BenchmarkResult::from_weight(T::BlockWeights::get().max_block)
+		))?;
+	}
+
 	// -- Root ones
 	#[extra] // this calls into phragmen and consumes a full block for now.
-	remove_member_without_replacement {
+	remove_member_without_replacement_extra {
 		// worse case is when we remove a member and we have no runner as a replacement. This
 		// triggers phragmen again. The only parameter is how many candidates will compete for the
 		// new slot.
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index 331d34180e98..8e0a31377f98 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -474,7 +474,7 @@ pub mod pallet {
 		#[pallet::weight(if *has_replacement {
 			T::WeightInfo::remove_member_with_replacement()
 		} else {
-			T::BlockWeights::get().max_block
+			T::WeightInfo::remove_member_without_replacement()
 		})]
 		pub fn remove_member(
 			origin: OriginFor<T>,
diff --git a/frame/elections-phragmen/src/weights.rs b/frame/elections-phragmen/src/weights.rs
index 40d4ead0a4ec..b60308c4f0a6 100644
--- a/frame/elections-phragmen/src/weights.rs
+++ b/frame/elections-phragmen/src/weights.rs
@@ -54,6 +54,7 @@ pub trait WeightInfo {
 	fn renounce_candidacy_members() -> Weight;
 	fn renounce_candidacy_runners_up() -> Weight;
 	fn remove_member_with_replacement() -> Weight;
+	fn remove_member_without_replacement() -> Weight;
 	fn remove_member_wrong_refund() -> Weight;
 	fn clean_defunct_voters(v: u32, d: u32, ) -> Weight;
 	fn election_phragmen(c: u32, v: u32, e: u32, ) -> Weight;
@@ -150,6 +151,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
+	fn remove_member_without_replacement() -> Weight {
+		T::BlockWeights::get().max_block
+	}
 	// Storage: Elections RunnersUp (r:1 w:0)
 	fn remove_member_wrong_refund() -> Weight {
 		(6_697_000 as Weight)
@@ -282,6 +286,11 @@ impl WeightInfo for () {
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}
+	fn remove_member_without_replacement() -> Weight {
+		(76_153_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
+	}
 	// Storage: Elections RunnersUp (r:1 w:0)
 	fn remove_member_wrong_refund() -> Weight {
 		(6_697_000 as Weight)
diff --git a/frame/im-online/src/benchmarking.rs b/frame/im-online/src/benchmarking.rs
index 46552cda68c0..4000ce339a16 100644
--- a/frame/im-online/src/benchmarking.rs
+++ b/frame/im-online/src/benchmarking.rs
@@ -82,7 +82,8 @@ benchmarks! {
 		let (input_heartbeat, signature) = create_heartbeat::<T>(k, e)?;
 		let call = Call::heartbeat(input_heartbeat, signature);
 	}: {
-		ImOnline::<T>::validate_unsigned(TransactionSource::InBlock, &call)?;
+		ImOnline::<T>::validate_unsigned(TransactionSource::InBlock, &call)
+			.map_err(|e| -> &'static str { e.into() })?;
 	}
 
 	validate_unsigned_and_then_heartbeat {
@@ -91,7 +92,8 @@ benchmarks! {
 		let (input_heartbeat, signature) = create_heartbeat::<T>(k, e)?;
 		let call = Call::heartbeat(input_heartbeat, signature);
 	}: {
-		ImOnline::<T>::validate_unsigned(TransactionSource::InBlock, &call)?;
+		ImOnline::<T>::validate_unsigned(TransactionSource::InBlock, &call)
+			.map_err(|e| -> &'static str { e.into() })?;
 		call.dispatch_bypass_filter(RawOrigin::None.into())?;
 	}
 }
diff --git a/utils/frame/benchmarking-cli/src/command.rs b/utils/frame/benchmarking-cli/src/command.rs
index 7ba714abe355..05e380a37ee7 100644
--- a/utils/frame/benchmarking-cli/src/command.rs
+++ b/utils/frame/benchmarking-cli/src/command.rs
@@ -19,7 +19,7 @@ use crate::BenchmarkCmd;
 use codec::{Decode, Encode};
 use frame_benchmarking::{
 	Analysis, BenchmarkBatch, BenchmarkBatchSplitResults, BenchmarkList, BenchmarkParameter,
-	BenchmarkResults, BenchmarkSelector,
+	BenchmarkResult, BenchmarkSelector,
 };
 use frame_support::traits::StorageInfo;
 use linked_hash_map::LinkedHashMap;
@@ -48,7 +48,7 @@ fn combine_batches(
 	}
 
 	let mut all_benchmarks =
-		LinkedHashMap::<_, (Vec<BenchmarkResults>, Vec<BenchmarkResults>)>::new();
+		LinkedHashMap::<_, (Vec<BenchmarkResult>, Vec<BenchmarkResult>)>::new();
 
 	db_batches
 		.into_iter()
diff --git a/utils/frame/benchmarking-cli/src/writer.rs b/utils/frame/benchmarking-cli/src/writer.rs
index 8701fb651262..ae3e2dc0966f 100644
--- a/utils/frame/benchmarking-cli/src/writer.rs
+++ b/utils/frame/benchmarking-cli/src/writer.rs
@@ -29,7 +29,7 @@ use serde::Serialize;
 
 use crate::BenchmarkCmd;
 use frame_benchmarking::{
-	Analysis, AnalysisChoice, BenchmarkBatchSplitResults, BenchmarkResults, BenchmarkSelector,
+	Analysis, AnalysisChoice, BenchmarkBatchSplitResults, BenchmarkResult, BenchmarkSelector,
 	RegressionModel,
 };
 use frame_support::traits::StorageInfo;
@@ -359,7 +359,7 @@ pub fn write_results(
 // each benchmark.
 fn add_storage_comments(
 	comments: &mut Vec<String>,
-	results: &[BenchmarkResults],
+	results: &[BenchmarkResult],
 	storage_info: &[StorageInfo],
 ) {
 	let mut storage_info_map = storage_info
@@ -377,6 +377,16 @@ fn add_storage_comments(
 	};
 	storage_info_map.insert(skip_storage_info.prefix.clone(), &skip_storage_info);
 
+	// Special hack to show `Benchmark Override`
+	let benchmark_override = StorageInfo {
+		pallet_name: b"Benchmark".to_vec(),
+		storage_name: b"Override".to_vec(),
+		prefix: b"Benchmark Override".to_vec(),
+		max_values: None,
+		max_size: None,
+	};
+	storage_info_map.insert(benchmark_override.prefix.clone(), &benchmark_override);
+
 	// This tracks the keys we already identified, so we only generate a single comment.
 	let mut identified = HashSet::<Vec<u8>>::new();
 
@@ -502,7 +512,7 @@ where
 #[cfg(test)]
 mod test {
 	use super::*;
-	use frame_benchmarking::{BenchmarkBatchSplitResults, BenchmarkParameter, BenchmarkResults};
+	use frame_benchmarking::{BenchmarkBatchSplitResults, BenchmarkParameter, BenchmarkResult};
 
 	fn test_data(
 		pallet: &[u8],
@@ -513,7 +523,7 @@ mod test {
 	) -> BenchmarkBatchSplitResults {
 		let mut results = Vec::new();
 		for i in 0..5 {
-			results.push(BenchmarkResults {
+			results.push(BenchmarkResult {
 				components: vec![(param, i), (BenchmarkParameter::z, 0)],
 				extrinsic_time: (base + slope * i).into(),
 				storage_root_time: (base + slope * i).into(),

From ecc76f3696ae62249daea806f08cf614aa43fcb0 Mon Sep 17 00:00:00 2001
From: Dmitry Kashitsyn <korvin@deeptown.org>
Date: Thu, 19 Aug 2021 20:04:13 +0700
Subject: [PATCH 1095/1194] Integrate Wasmer into Substrate sandbox environment
 (#5920)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add comments and refactor Sandbox module

* Adds some comments

* Add wasmtime instance to the sandbox and delegate calls

* Adds module imports stub

* WIP state holder via *mut

* My take at the problem

* Brings back invoke and instantiate implementation details

* Removes redundant bound

* Code cleanup

* Fixes invoke closure

* Refactors FunctionExecutor to eliminate lifetime

* Wraps `FunctionExecutor::sandbox_store` in `RefCell`

* Renames `FunctionExecutor::heap` to `allocator`

* Wraps `FunctionExecutor::allocator` in `RefCell`

* Refactors FunctionExecutor to `Rc<Inner>` pattern

* Implements scoped TLS for FunctionExecutor

* Fixes wasmi instancing

* Fixes sandbox asserts

* Makes sandbox compile after wasmtime API change

* Uses Vurich/wasmtime for the Lightbeam backend

* Uses wasmtime instead of wasmi for sandbox API results

* Refactors sandbox to use one  of the execution backends at a time

* Fixes wasmtime module instantiation

* TEMP vurich branch stuff

* Adds wasmer impl stub

* Adds get global

* Fixes warnings

* Adds wasmer invoke impl

* Implements host function interface for wasmer

* Fixes wasmer instantiation result

* Adds workaround to remove debug_assert

* Fixes import object generation for wasmer

* Attempt to propagate wasmer::Store through sandbox::Store

* Wraps `sandbox::Store::memories` in `RefCell`

* Moves `sandbox::instantiate` to `sandbox::Store`

* Eliminate `RefCell<memories>`

* Implements `HostState::memory_get/set`, removes accidental `borrow_mut`

* Fixes sandbox memory handling for wasmi

* Fix memory allocation

* Resets Cargo.lock to match master

* Fixes compilation

* Refactors sandbox to use TLS for dispatch_thunk propagation to wasmer

* Pass dispatch thunk to the sandbox as a TLS

* Initialize dispatch thunk holder in `SandboxInstance`

* Comment out Wasmtime/Lightbeam sandbox backend

* Revert wasmtime back to mainstream

* Adds SandboxExecutionMethod enum for cli param

* Cleanup sandbox code

* Allow wasmi to access wasmer memory regions

* More cleanup

* Remove debug logging, replace asserts with runtime errors

* Revert "Adds SandboxExecutionMethod enum for cli param"

This reverts commit 5cda36eba1cefdf9230ef5eea9031da5002c900b.

* Fixes warnings

* Fixes indentation and line width

* Fix return types condition

* Puts everything related under the `wasmer-sandbox` feature flag

* Fixes warnings

* Address grumbles

* Split instantiate per backend

* More splits

* Refacmemory allocation

* Nitpicks

* Attempt to wrap wasmer memory in protoco enforcing type

* Revert renaming

* WIP wasm buffer proxy API

* Reimplement util::wasmer::MemoryRef to use buffers instead of memory slices

* Adds WasmiMemoryWrapper and MemoryTransfer trait

* Refactor naming

* Perform all memory transfers using MemoryTransfer

* Adds allocating `read`

* Adds comments

* Removes unused imports

* Removes now unused function

* Pulls Cargo.lock from origin/master

* Fix rustdoc

* Removes unused `TransferError`

* Update Cargo.lock

* Removes unused import

* cargo fmt

* Fix feature dependency graph

* Feature should flow from the top level crate
	* We should not assume a specific workspace structure
* sc-executor-wasmi does not use the feature
* sc-executor-wasmtime should not know about the feature

* Fix doc typo

* Enable wasmer-sandbox by default (for now)

It will be removed before merge. It is so that the benchbot
uses the wasmer sandbox.

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_contracts --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/contracts/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Revert "cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_contracts --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/contracts/src/weights.rs --template=./.maintain/frame-weight-template.hbs"

This reverts commit d713590ba45387c4204b2ad97c8bd6f6ebabda4e.

* cargo fmt

* Add ci-check to prevent wasmer sandbox build breaking

* Run tests with wasmer-sandbox enabled

* Revert "Run tests with wasmer-sandbox enabled"

This reverts commit cff63156a162f9ffdab23e7cb94a30f44e320f8a.

Co-authored-by: Sergei Shulepov <s.pepyakin@gmail.com>
Co-authored-by: Andrew Jones <ascjones@gmail.com>
Co-authored-by: Alexander Theißen <alex.theissen@me.com>
Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
---
 .gitlab-ci.yml                                |   8 +
 Cargo.lock                                    | 479 +++++++++++-
 client/executor/Cargo.toml                    |   1 +
 client/executor/common/Cargo.toml             |   7 +
 client/executor/common/src/lib.rs             |   1 +
 client/executor/common/src/sandbox.rs         | 721 ++++++++++++++++--
 client/executor/common/src/util.rs            | 241 ++++++
 client/executor/wasmi/Cargo.toml              |   1 +
 client/executor/wasmi/src/lib.rs              | 231 ++++--
 client/executor/wasmtime/src/host.rs          | 226 +++---
 client/executor/wasmtime/src/imports.rs       |   2 +
 .../executor/wasmtime/src/instance_wrapper.rs |  46 +-
 client/executor/wasmtime/src/runtime.rs       |   2 +-
 client/executor/wasmtime/src/state_holder.rs  |   6 +-
 client/executor/wasmtime/src/util.rs          |  13 -
 15 files changed, 1667 insertions(+), 318 deletions(-)
 create mode 100644 client/executor/common/src/util.rs

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 16c1ea9d1ce9..5a2d8c5b4844 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -300,6 +300,14 @@ cargo-check-try-runtime:
     - time cargo check --features try-runtime
     - sccache -s
 
+cargo-check-wasmer-sandbox:
+  stage:                           test
+  <<:                              *docker-env
+  <<:                              *test-refs
+  script:
+    - time cargo check --features wasmer-sandbox
+    - sccache -s
+
 test-deterministic-wasm:
   stage:                           test
   <<:                              *docker-env
diff --git a/Cargo.lock b/Cargo.lock
index e1f5b2f81582..19d2062b0afd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -917,7 +917,7 @@ dependencies = [
  "ansi_term 0.11.0",
  "atty",
  "bitflags",
- "strsim",
+ "strsim 0.8.0",
  "textwrap",
  "unicode-width",
  "vec_map",
@@ -988,13 +988,41 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634"
 
+[[package]]
+name = "cranelift-bforest"
+version = "0.68.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9221545c0507dc08a62b2d8b5ffe8e17ac580b0a74d1813b496b8d70b070fbd0"
+dependencies = [
+ "cranelift-entity 0.68.0",
+]
+
 [[package]]
 name = "cranelift-bforest"
 version = "0.74.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c8ca3560686e7c9c7ed7e0fe77469f2410ba5d7781b1acaa9adc8d8deea28e3e"
 dependencies = [
- "cranelift-entity",
+ "cranelift-entity 0.74.0",
+]
+
+[[package]]
+name = "cranelift-codegen"
+version = "0.68.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e9936ea608b6cd176f107037f6adbb4deac933466fc7231154f96598b2d3ab1"
+dependencies = [
+ "byteorder",
+ "cranelift-bforest 0.68.0",
+ "cranelift-codegen-meta 0.68.0",
+ "cranelift-codegen-shared 0.68.0",
+ "cranelift-entity 0.68.0",
+ "gimli 0.22.0",
+ "log 0.4.14",
+ "regalloc",
+ "smallvec 1.6.1",
+ "target-lexicon 0.11.2",
+ "thiserror",
 ]
 
 [[package]]
@@ -1003,16 +1031,26 @@ version = "0.74.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf9bf1ffffb6ce3d2e5ebc83549bd2436426c99b31cc550d521364cbe35d276"
 dependencies = [
- "cranelift-bforest",
- "cranelift-codegen-meta",
- "cranelift-codegen-shared",
- "cranelift-entity",
+ "cranelift-bforest 0.74.0",
+ "cranelift-codegen-meta 0.74.0",
+ "cranelift-codegen-shared 0.74.0",
+ "cranelift-entity 0.74.0",
  "gimli 0.24.0",
  "log 0.4.14",
  "regalloc",
  "serde",
  "smallvec 1.6.1",
- "target-lexicon",
+ "target-lexicon 0.12.0",
+]
+
+[[package]]
+name = "cranelift-codegen-meta"
+version = "0.68.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ef2b2768568306540f4c8db3acce9105534d34c4a1e440529c1e702d7f8c8d7"
+dependencies = [
+ "cranelift-codegen-shared 0.68.0",
+ "cranelift-entity 0.68.0",
 ]
 
 [[package]]
@@ -1021,10 +1059,16 @@ version = "0.74.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4cc21936a5a6d07e23849ffe83e5c1f6f50305c074f4b2970ca50c13bf55b821"
 dependencies = [
- "cranelift-codegen-shared",
- "cranelift-entity",
+ "cranelift-codegen-shared 0.74.0",
+ "cranelift-entity 0.74.0",
 ]
 
+[[package]]
+name = "cranelift-codegen-shared"
+version = "0.68.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6759012d6d19c4caec95793f052613e9d4113e925e7f14154defbac0f1d4c938"
+
 [[package]]
 name = "cranelift-codegen-shared"
 version = "0.74.0"
@@ -1034,6 +1078,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "cranelift-entity"
+version = "0.68.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86badbce14e15f52a45b666b38abe47b204969dd7f8fb7488cb55dd46b361fa6"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "cranelift-entity"
 version = "0.74.0"
@@ -1043,16 +1096,28 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "cranelift-frontend"
+version = "0.68.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b608bb7656c554d0a4cf8f50c7a10b857e80306f6ff829ad6d468a7e2323c8d8"
+dependencies = [
+ "cranelift-codegen 0.68.0",
+ "log 0.4.14",
+ "smallvec 1.6.1",
+ "target-lexicon 0.11.2",
+]
+
 [[package]]
 name = "cranelift-frontend"
 version = "0.74.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c31b783b351f966fce33e3c03498cb116d16d97a8f9978164a60920bd0d3a99c"
 dependencies = [
- "cranelift-codegen",
+ "cranelift-codegen 0.74.0",
  "log 0.4.14",
  "smallvec 1.6.1",
- "target-lexicon",
+ "target-lexicon 0.12.0",
 ]
 
 [[package]]
@@ -1061,8 +1126,8 @@ version = "0.74.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a77c88d3dd48021ff1e37e978a00098524abd3513444ae252c08d37b310b3d2a"
 dependencies = [
- "cranelift-codegen",
- "target-lexicon",
+ "cranelift-codegen 0.74.0",
+ "target-lexicon 0.12.0",
 ]
 
 [[package]]
@@ -1071,15 +1136,15 @@ version = "0.74.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edb6d408e2da77cdbbd65466298d44c86ae71c1785d2ab0d8657753cdb4d9d89"
 dependencies = [
- "cranelift-codegen",
- "cranelift-entity",
- "cranelift-frontend",
+ "cranelift-codegen 0.74.0",
+ "cranelift-entity 0.74.0",
+ "cranelift-frontend 0.74.0",
  "itertools 0.10.0",
  "log 0.4.14",
  "serde",
  "smallvec 1.6.1",
  "thiserror",
- "wasmparser",
+ "wasmparser 0.78.2",
 ]
 
 [[package]]
@@ -1333,6 +1398,41 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "darling"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "757c0ded2af11d8e739c4daea1ac623dd1624b06c844cf3f5a39f1bdbd99bb12"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c34d8efb62d0c2d7f60ece80f75e5c63c1588ba68032740494b0b9a996466e3"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim 0.10.0",
+ "syn",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ade7bff147130fe5e6d39f089c6bd49ec0250f35d70b2eebf72afdfc919f15cc"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "data-encoding"
 version = "2.3.2"
@@ -1496,6 +1596,32 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee2626afccd7561a06cf1367e2950c4718ea04565e20fb5029b6c7d8ad09abcf"
 
+[[package]]
+name = "dynasm"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdc2d9a5e44da60059bd38db2d05cbb478619541b8c79890547861ec1e3194f0"
+dependencies = [
+ "bitflags",
+ "byteorder",
+ "lazy_static",
+ "proc-macro-error 1.0.4",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "dynasmrt"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42276e3f205fe63887cca255aa9a65a63fb72764c30b9a6252a7c7e46994f689"
+dependencies = [
+ "byteorder",
+ "dynasm",
+ "memmap2",
+]
+
 [[package]]
 name = "ed25519"
 version = "1.0.3"
@@ -1557,6 +1683,27 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "enumset"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e76129da36102af021b8e5000dab2c1c30dbef85c1e482beeff8da5dde0e0b0"
+dependencies = [
+ "enumset_derive",
+]
+
+[[package]]
+name = "enumset_derive"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6451128aa6655d880755345d085494cf7561a6bee7c8dc821e5d77e6d267ecd4"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "env_logger"
 version = "0.7.1"
@@ -2248,6 +2395,17 @@ dependencies = [
  "polyval",
 ]
 
+[[package]]
+name = "gimli"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724"
+dependencies = [
+ "fallible-iterator",
+ "indexmap",
+ "stable_deref_trait",
+]
+
 [[package]]
 name = "gimli"
 version = "0.23.0"
@@ -2560,6 +2718,12 @@ dependencies = [
  "tokio-native-tls",
 ]
 
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
 [[package]]
 name = "idna"
 version = "0.1.5"
@@ -3069,6 +3233,16 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "libloading"
+version = "0.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883"
+dependencies = [
+ "cfg-if 1.0.0",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "libloading"
 version = "0.7.0"
@@ -4647,6 +4821,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "object"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397"
+dependencies = [
+ "crc32fast",
+ "indexmap",
+]
+
 [[package]]
 name = "object"
 version = "0.23.0"
@@ -7631,6 +7815,8 @@ dependencies = [
  "sp-serializer",
  "sp-wasm-interface",
  "thiserror",
+ "wasmer",
+ "wasmer-compiler-singlepass",
  "wasmi",
 ]
 
@@ -7642,6 +7828,7 @@ dependencies = [
  "parity-scale-codec",
  "sc-allocator",
  "sc-executor-common",
+ "scoped-tls",
  "sp-core",
  "sp-runtime-interface",
  "sp-wasm-interface",
@@ -8410,6 +8597,15 @@ dependencies = [
  "serde_derive",
 ]
 
+[[package]]
+name = "serde_bytes"
+version = "0.11.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16ae07dd2f88a366f15bd0632ba725227018c69a1c8550a927324f8eb8368bb9"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serde_cbor"
 version = "0.11.1"
@@ -9493,6 +9689,12 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
 [[package]]
 name = "structopt"
 version = "0.3.21"
@@ -9848,6 +10050,12 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
+[[package]]
+name = "target-lexicon"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "422045212ea98508ae3d28025bc5aaa2bd4a9cdaecd442a08da2ee620ee9ea95"
+
 [[package]]
 name = "target-lexicon"
 version = "0.12.0"
@@ -10974,6 +11182,199 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "wasmer"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a70cfae554988d904d64ca17ab0e7cd652ee5c8a0807094819c1ea93eb9d6866"
+dependencies = [
+ "cfg-if 0.1.10",
+ "indexmap",
+ "more-asserts",
+ "target-lexicon 0.11.2",
+ "thiserror",
+ "wasmer-compiler",
+ "wasmer-compiler-cranelift",
+ "wasmer-derive",
+ "wasmer-engine",
+ "wasmer-engine-jit",
+ "wasmer-engine-native",
+ "wasmer-types",
+ "wasmer-vm",
+ "wat",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "wasmer-compiler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b7732a9cab472bd921d5a0c422f45b3d03f62fa2c40a89e0770cef6d47e383e"
+dependencies = [
+ "enumset",
+ "serde",
+ "serde_bytes",
+ "smallvec 1.6.1",
+ "target-lexicon 0.11.2",
+ "thiserror",
+ "wasmer-types",
+ "wasmer-vm",
+ "wasmparser 0.65.0",
+]
+
+[[package]]
+name = "wasmer-compiler-cranelift"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48cb9395f094e1d81534f4c5e330ed4cdb424e8df870d29ad585620284f5fddb"
+dependencies = [
+ "cranelift-codegen 0.68.0",
+ "cranelift-frontend 0.68.0",
+ "gimli 0.22.0",
+ "more-asserts",
+ "rayon",
+ "serde",
+ "smallvec 1.6.1",
+ "tracing",
+ "wasmer-compiler",
+ "wasmer-types",
+ "wasmer-vm",
+]
+
+[[package]]
+name = "wasmer-compiler-singlepass"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "426ae6ef0f606ca815510f3e2ef6f520e217514bfb7a664defe180b9a9e75d07"
+dependencies = [
+ "byteorder",
+ "dynasm",
+ "dynasmrt",
+ "lazy_static",
+ "more-asserts",
+ "rayon",
+ "serde",
+ "smallvec 1.6.1",
+ "wasmer-compiler",
+ "wasmer-types",
+ "wasmer-vm",
+]
+
+[[package]]
+name = "wasmer-derive"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8b86dcd2c3efdb8390728a2b56f762db07789aaa5aa872a9dc776ba3a7912ed"
+dependencies = [
+ "proc-macro-error 1.0.4",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "wasmer-engine"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "efe4667d6bd888f26ae8062a63a9379fa697415b4b4e380f33832e8418fd71b5"
+dependencies = [
+ "backtrace",
+ "bincode",
+ "lazy_static",
+ "memmap2",
+ "more-asserts",
+ "rustc-demangle",
+ "serde",
+ "serde_bytes",
+ "target-lexicon 0.11.2",
+ "thiserror",
+ "wasmer-compiler",
+ "wasmer-types",
+ "wasmer-vm",
+]
+
+[[package]]
+name = "wasmer-engine-jit"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26770be802888011b4a3072f2a282fc2faa68aa48c71b3db6252a3937a85f3da"
+dependencies = [
+ "bincode",
+ "cfg-if 0.1.10",
+ "region",
+ "serde",
+ "serde_bytes",
+ "wasmer-compiler",
+ "wasmer-engine",
+ "wasmer-types",
+ "wasmer-vm",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "wasmer-engine-native"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bb4083a6c69f2cd4b000b82a80717f37c6cc2e536aee3a8ffe9af3edc276a8b"
+dependencies = [
+ "bincode",
+ "cfg-if 0.1.10",
+ "leb128",
+ "libloading 0.6.7",
+ "serde",
+ "tempfile",
+ "tracing",
+ "wasmer-compiler",
+ "wasmer-engine",
+ "wasmer-object",
+ "wasmer-types",
+ "wasmer-vm",
+ "which",
+]
+
+[[package]]
+name = "wasmer-object"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abf8e0c12b82ff81ebecd30d7e118be5fec871d6de885a90eeb105df0a769a7b"
+dependencies = [
+ "object 0.22.0",
+ "thiserror",
+ "wasmer-compiler",
+ "wasmer-types",
+]
+
+[[package]]
+name = "wasmer-types"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7f4ac28c2951cd792c18332f03da523ed06b170f5cf6bb5b1bdd7e36c2a8218"
+dependencies = [
+ "cranelift-entity 0.68.0",
+ "serde",
+ "thiserror",
+]
+
+[[package]]
+name = "wasmer-vm"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7635ba0b6d2fd325f588d69a950ad9fa04dddbf6ad08b6b2a183146319bf6ae"
+dependencies = [
+ "backtrace",
+ "cc",
+ "cfg-if 0.1.10",
+ "indexmap",
+ "libc",
+ "memoffset 0.6.1",
+ "more-asserts",
+ "region",
+ "serde",
+ "thiserror",
+ "wasmer-types",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "wasmi"
 version = "0.9.0"
@@ -10999,6 +11400,12 @@ dependencies = [
  "parity-wasm 0.42.2",
 ]
 
+[[package]]
+name = "wasmparser"
+version = "0.65.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87cc2fe6350834b4e528ba0901e7aa405d78b89dc1fa3145359eb4de0e323fcf"
+
 [[package]]
 name = "wasmparser"
 version = "0.78.2"
@@ -11026,8 +11433,8 @@ dependencies = [
  "rustc-demangle",
  "serde",
  "smallvec 1.6.1",
- "target-lexicon",
- "wasmparser",
+ "target-lexicon 0.12.0",
+ "wasmparser 0.78.2",
  "wasmtime-cache",
  "wasmtime-environ",
  "wasmtime-jit",
@@ -11063,12 +11470,12 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c525b39f062eada7db3c1298287b96dcb6e472b9f6b22501300b28d9fa7582f6"
 dependencies = [
- "cranelift-codegen",
- "cranelift-entity",
- "cranelift-frontend",
+ "cranelift-codegen 0.74.0",
+ "cranelift-entity 0.74.0",
+ "cranelift-frontend 0.74.0",
  "cranelift-wasm",
- "target-lexicon",
- "wasmparser",
+ "target-lexicon 0.12.0",
+ "wasmparser 0.78.2",
  "wasmtime-environ",
 ]
 
@@ -11082,9 +11489,9 @@ dependencies = [
  "gimli 0.24.0",
  "more-asserts",
  "object 0.24.0",
- "target-lexicon",
+ "target-lexicon 0.12.0",
  "thiserror",
- "wasmparser",
+ "wasmparser 0.78.2",
  "wasmtime-environ",
 ]
 
@@ -11095,8 +11502,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f64d0c2d881c31b0d65c1f2695e022d71eb60b9fbdd336aacca28208b58eac90"
 dependencies = [
  "cfg-if 1.0.0",
- "cranelift-codegen",
- "cranelift-entity",
+ "cranelift-codegen 0.74.0",
+ "cranelift-entity 0.74.0",
  "cranelift-wasm",
  "gimli 0.24.0",
  "indexmap",
@@ -11104,7 +11511,7 @@ dependencies = [
  "more-asserts",
  "serde",
  "thiserror",
- "wasmparser",
+ "wasmparser 0.78.2",
 ]
 
 [[package]]
@@ -11116,9 +11523,9 @@ dependencies = [
  "addr2line 0.15.1",
  "anyhow",
  "cfg-if 1.0.0",
- "cranelift-codegen",
- "cranelift-entity",
- "cranelift-frontend",
+ "cranelift-codegen 0.74.0",
+ "cranelift-entity 0.74.0",
+ "cranelift-frontend 0.74.0",
  "cranelift-native",
  "cranelift-wasm",
  "gimli 0.24.0",
@@ -11128,9 +11535,9 @@ dependencies = [
  "rayon",
  "region",
  "serde",
- "target-lexicon",
+ "target-lexicon 0.12.0",
  "thiserror",
- "wasmparser",
+ "wasmparser 0.78.2",
  "wasmtime-cranelift",
  "wasmtime-debug",
  "wasmtime-environ",
@@ -11149,7 +11556,7 @@ dependencies = [
  "anyhow",
  "more-asserts",
  "object 0.24.0",
- "target-lexicon",
+ "target-lexicon 0.12.0",
  "wasmtime-debug",
  "wasmtime-environ",
 ]
@@ -11165,7 +11572,7 @@ dependencies = [
  "lazy_static",
  "libc",
  "serde",
- "target-lexicon",
+ "target-lexicon 0.12.0",
  "wasmtime-environ",
  "wasmtime-runtime",
 ]
diff --git a/client/executor/Cargo.toml b/client/executor/Cargo.toml
index d99f1da89e1f..b7e2595b8e16 100644
--- a/client/executor/Cargo.toml
+++ b/client/executor/Cargo.toml
@@ -55,3 +55,4 @@ std = []
 wasm-extern-trace = []
 wasmtime = ["sc-executor-wasmtime"]
 wasmi-errno = ["wasmi/errno"]
+wasmer-sandbox = ["sc-executor-common/wasmer-sandbox"]
diff --git a/client/executor/common/Cargo.toml b/client/executor/common/Cargo.toml
index 4457780f8cd8..402df438f645 100644
--- a/client/executor/common/Cargo.toml
+++ b/client/executor/common/Cargo.toml
@@ -25,5 +25,12 @@ sp-maybe-compressed-blob = { version = "4.0.0-dev", path = "../../../primitives/
 sp-serializer = { version = "3.0.0", path = "../../../primitives/serializer" }
 thiserror = "1.0.21"
 
+wasmer = { version = "1.0", optional = true }
+wasmer-compiler-singlepass = { version = "1.0", optional = true }
+
 [features]
 default = []
+wasmer-sandbox = [
+	"wasmer",
+	"wasmer-compiler-singlepass",
+]
diff --git a/client/executor/common/src/lib.rs b/client/executor/common/src/lib.rs
index ef73ecd90e28..99b927e06203 100644
--- a/client/executor/common/src/lib.rs
+++ b/client/executor/common/src/lib.rs
@@ -24,4 +24,5 @@
 pub mod error;
 pub mod runtime_blob;
 pub mod sandbox;
+pub mod util;
 pub mod wasm_runtime;
diff --git a/client/executor/common/src/sandbox.rs b/client/executor/common/src/sandbox.rs
index 63f9cc4f258e..7a92e8e2bd29 100644
--- a/client/executor/common/src/sandbox.rs
+++ b/client/executor/common/src/sandbox.rs
@@ -18,19 +18,25 @@
 
 //! This module implements sandboxing support in the runtime.
 //!
-//! Sandboxing is baked by wasmi at the moment. In future, however, we would like to add/switch to
-//! a compiled execution engine.
+//! Sandboxing is backed by wasmi and wasmer, depending on the configuration.
 
-use crate::error::{Error, Result};
+use crate::{
+	error::{Error, Result},
+	util,
+};
 use codec::{Decode, Encode};
 use sp_core::sandbox as sandbox_primitives;
 use sp_wasm_interface::{FunctionContext, Pointer, WordSize};
 use std::{collections::HashMap, rc::Rc};
 use wasmi::{
-	memory_units::Pages, Externals, ImportResolver, MemoryInstance, MemoryRef, Module,
-	ModuleInstance, ModuleRef, RuntimeArgs, RuntimeValue, Trap, TrapKind,
+	memory_units::Pages, Externals, ImportResolver, MemoryInstance, Module, ModuleInstance,
+	RuntimeArgs, RuntimeValue, Trap, TrapKind,
 };
 
+#[cfg(feature = "wasmer-sandbox")]
+use crate::util::wasmer::MemoryWrapper as WasmerMemoryWrapper;
+use crate::util::wasmi::MemoryWrapper as WasmiMemoryWrapper;
+
 /// Index of a function inside the supervisor.
 ///
 /// This is a typically an index in the default table of the supervisor, however
@@ -46,34 +52,59 @@ impl From<SupervisorFuncIndex> for usize {
 
 /// Index of a function within guest index space.
 ///
-/// This index is supposed to be used with as index for `Externals`.
+/// This index is supposed to be used as index for `Externals`.
 #[derive(Copy, Clone, Debug, PartialEq)]
 struct GuestFuncIndex(usize);
 
 /// This struct holds a mapping from guest index space to supervisor.
 struct GuestToSupervisorFunctionMapping {
+	/// Position of elements in this vector are interpreted
+	/// as indices of guest functions and are mapped to
+	/// corresponding supervisor function indices.
 	funcs: Vec<SupervisorFuncIndex>,
 }
 
 impl GuestToSupervisorFunctionMapping {
+	/// Create an empty function mapping
 	fn new() -> GuestToSupervisorFunctionMapping {
 		GuestToSupervisorFunctionMapping { funcs: Vec::new() }
 	}
 
+	/// Add a new supervisor function to the mapping.
+	/// Returns a newly assigned guest function index.
 	fn define(&mut self, supervisor_func: SupervisorFuncIndex) -> GuestFuncIndex {
 		let idx = self.funcs.len();
 		self.funcs.push(supervisor_func);
 		GuestFuncIndex(idx)
 	}
 
+	/// Find supervisor function index by its corresponding guest function index
 	fn func_by_guest_index(&self, guest_func_idx: GuestFuncIndex) -> Option<SupervisorFuncIndex> {
 		self.funcs.get(guest_func_idx.0).cloned()
 	}
 }
 
+/// Holds sandbox function and memory imports and performs name resolution
 struct Imports {
+	/// Maps qualified function name to its guest function index
 	func_map: HashMap<(Vec<u8>, Vec<u8>), GuestFuncIndex>,
-	memories_map: HashMap<(Vec<u8>, Vec<u8>), MemoryRef>,
+
+	/// Maps qualified field name to its memory reference
+	memories_map: HashMap<(Vec<u8>, Vec<u8>), Memory>,
+}
+
+impl Imports {
+	fn func_by_name(&self, module_name: &str, func_name: &str) -> Option<GuestFuncIndex> {
+		self.func_map
+			.get(&(module_name.as_bytes().to_owned(), func_name.as_bytes().to_owned()))
+			.cloned()
+	}
+
+	fn memory_by_name(&self, module_name: &str, memory_name: &str) -> Option<Memory> {
+		self.memories_map
+			.get(&(module_name.as_bytes().to_owned(), memory_name.as_bytes().to_owned()))
+			.cloned()
+	}
 }
 
 impl ImportResolver for Imports {
@@ -83,10 +114,10 @@ impl ImportResolver for Imports {
 		field_name: &str,
 		signature: &::wasmi::Signature,
 	) -> std::result::Result<wasmi::FuncRef, wasmi::Error> {
-		let key = (module_name.as_bytes().to_owned(), field_name.as_bytes().to_owned());
-		let idx = *self.func_map.get(&key).ok_or_else(|| {
+		let idx = self.func_by_name(module_name, field_name).ok_or_else(|| {
 			wasmi::Error::Instantiation(format!("Export {}:{} not found", module_name, field_name))
 		})?;
+
 		Ok(wasmi::FuncInstance::alloc_host(signature.clone(), idx.0))
 	}
 
@@ -95,18 +126,22 @@ impl ImportResolver for Imports {
 		module_name: &str,
 		field_name: &str,
 		_memory_type: &::wasmi::MemoryDescriptor,
-	) -> std::result::Result<MemoryRef, wasmi::Error> {
-		let key = (module_name.as_bytes().to_vec(), field_name.as_bytes().to_vec());
-		let mem = self
-			.memories_map
-			.get(&key)
-			.ok_or_else(|| {
-				wasmi::Error::Instantiation(format!(
-					"Export {}:{} not found",
-					module_name, field_name
-				))
-			})?
-			.clone();
+	) -> std::result::Result<wasmi::MemoryRef, wasmi::Error> {
+		let mem = self.memory_by_name(module_name, field_name).ok_or_else(|| {
+			wasmi::Error::Instantiation(format!("Export {}:{} not found", module_name, field_name))
+		})?;
+
+		let wrapper = mem.as_wasmi().ok_or_else(|| {
+			wasmi::Error::Instantiation(format!(
+				"Unsupported non-wasmi export {}:{}",
+				module_name, field_name
+			))
+		})?;
+
+		// Here we use inner memory reference only to resolve
+		// the imports without accessing the memory contents.
+		let mem = unsafe { wrapper.clone_inner() };
+
 		Ok(mem)
 	}
 
@@ -134,6 +169,7 @@ impl ImportResolver for Imports {
 /// Note that this functions are only called in the `supervisor` context.
 pub trait SandboxCapabilities: FunctionContext {
 	/// Represents a function reference into the supervisor environment.
+	/// Provides an abstraction over execution environment.
 	type SupervisorFuncRef;
 
 	/// Invoke a function in the supervisor environment.
@@ -141,9 +177,9 @@ pub trait SandboxCapabilities: FunctionContext {
 	/// This first invokes the dispatch_thunk function, passing in the function index of the
 	/// desired function to call and serialized arguments. The thunk calls the desired function
 	/// with the deserialized arguments, then serializes the result into memory and returns
-	/// reference. The pointer to and length of the result in linear memory is encoded into an i64,
-	/// with the upper 32 bits representing the pointer and the lower 32 bits representing the
-	/// length.
+	/// reference. The pointer to and length of the result in linear memory is encoded into an
+	/// `i64`, with the upper 32 bits representing the pointer and the lower 32 bits representing
+	/// the length.
 	///
 	/// # Errors
 	///
@@ -164,11 +200,17 @@ pub trait SandboxCapabilities: FunctionContext {
 ///
 /// [`Externals`]: ../wasmi/trait.Externals.html
 pub struct GuestExternals<'a, FE: SandboxCapabilities + 'a> {
+	/// Supervisor function environment
 	supervisor_externals: &'a mut FE,
+
+	/// Instance of sandboxed module to be dispatched
 	sandbox_instance: &'a SandboxInstance<FE::SupervisorFuncRef>,
+
+	/// External state passed to guest environment, see the `instantiate` function
 	state: u32,
 }
 
+/// Construct trap error from specified message
 fn trap(msg: &'static str) -> Trap {
 	TrapKind::Host(Box::new(Error::Other(msg.into()))).into()
 }
@@ -199,14 +241,15 @@ impl<'a, FE: SandboxCapabilities + 'a> Externals for GuestExternals<'a, FE> {
 		// Make `index` typesafe again.
 		let index = GuestFuncIndex(index);
 
+		// Convert function index from guest to supervisor space
 		let func_idx = self.sandbox_instance
 			.guest_to_supervisor_mapping
 			.func_by_guest_index(index)
 			.expect(
 				"`invoke_index` is called with indexes registered via `FuncInstance::alloc_host`;
-					`FuncInstance::alloc_host` is called with indexes that was obtained from `guest_to_supervisor_mapping`;
-					`func_by_guest_index` called with `index` can't return `None`;
-					qed"
+				`FuncInstance::alloc_host` is called with indexes that were obtained from `guest_to_supervisor_mapping`;
+				`func_by_guest_index` called with `index` can't return `None`;
+				qed"
 			);
 
 		// Serialize arguments into a byte vector.
@@ -220,7 +263,7 @@ impl<'a, FE: SandboxCapabilities + 'a> Externals for GuestExternals<'a, FE> {
 
 		let state = self.state;
 
-		// Move serialized arguments inside the memory and invoke dispatch thunk and
+		// Move serialized arguments inside the memory, invoke dispatch thunk and
 		// then free allocated memory.
 		let invoke_args_len = invoke_args_data.len() as WordSize;
 		let invoke_args_ptr = self
@@ -299,6 +342,16 @@ where
 	f(&mut guest_externals)
 }
 
+/// Module instance in terms of selected backend
+enum BackendInstance {
+	/// Wasmi module instance
+	Wasmi(wasmi::ModuleRef),
+
+	/// Wasmer module instance
+	#[cfg(feature = "wasmer-sandbox")]
+	Wasmer(wasmer::Instance),
+}
+
 /// Sandboxed instance of a wasm module.
 ///
 /// It's primary purpose is to [`invoke`] exported functions on it.
@@ -314,7 +367,7 @@ where
 ///
 /// [`invoke`]: #method.invoke
 pub struct SandboxInstance<FR> {
-	instance: ModuleRef,
+	backend_instance: BackendInstance,
 	dispatch_thunk: FR,
 	guest_to_supervisor_mapping: GuestToSupervisorFunctionMapping,
 }
@@ -327,15 +380,78 @@ impl<FR> SandboxInstance<FR> {
 	///
 	/// The `state` parameter can be used to provide custom data for
 	/// these syscall implementations.
-	pub fn invoke<FE: SandboxCapabilities<SupervisorFuncRef = FR>>(
+	pub fn invoke<'a, FE, SCH, DTH>(
 		&self,
+
+		// function to call that is exported from the module
 		export_name: &str,
+
+		// arguments passed to the function
 		args: &[RuntimeValue],
-		supervisor_externals: &mut FE,
+
+		// arbitraty context data of the call
 		state: u32,
-	) -> std::result::Result<Option<wasmi::RuntimeValue>, wasmi::Error> {
-		with_guest_externals(supervisor_externals, self, state, |guest_externals| {
-			self.instance.invoke_export(export_name, args, guest_externals)
+	) -> std::result::Result<Option<wasmi::RuntimeValue>, wasmi::Error>
+	where
+		FE: SandboxCapabilities<SupervisorFuncRef = FR> + 'a,
+		SCH: SandboxCapabilitiesHolder<SupervisorFuncRef = FR, SC = FE>,
+		DTH: DispatchThunkHolder<DispatchThunk = FR>,
+	{
+		SCH::with_sandbox_capabilities(|supervisor_externals| {
+			with_guest_externals(supervisor_externals, self, state, |guest_externals| {
+				match &self.backend_instance {
+					BackendInstance::Wasmi(wasmi_instance) => {
+						let wasmi_result =
+							wasmi_instance.invoke_export(export_name, args, guest_externals)?;
+
+						Ok(wasmi_result)
+					},
+
+					#[cfg(feature = "wasmer-sandbox")]
+					BackendInstance::Wasmer(wasmer_instance) => {
+						let function = wasmer_instance
+							.exports
+							.get_function(export_name)
+							.map_err(|error| wasmi::Error::Function(error.to_string()))?;
+
+						let args: Vec<wasmer::Val> = args
+							.iter()
+							.map(|v| match *v {
+								RuntimeValue::I32(val) => wasmer::Val::I32(val),
+								RuntimeValue::I64(val) => wasmer::Val::I64(val),
+								RuntimeValue::F32(val) => wasmer::Val::F32(val.into()),
+								RuntimeValue::F64(val) => wasmer::Val::F64(val.into()),
+							})
+							.collect();
+
+						let wasmer_result =
+							DTH::initialize_thunk(&self.dispatch_thunk, || function.call(&args))
+								.map_err(|error| wasmi::Error::Function(error.to_string()))?;
+
+						if wasmer_result.len() > 1 {
+							return Err(wasmi::Error::Function(
+								"multiple return types are not supported yet".to_owned(),
+							))
+						}
+
+						let wasmer_result = if let Some(wasmer_value) = wasmer_result.first() {
+							let wasmer_value = match *wasmer_value {
+								wasmer::Val::I32(val) => RuntimeValue::I32(val),
+								wasmer::Val::I64(val) => RuntimeValue::I64(val),
+								wasmer::Val::F32(val) => RuntimeValue::F32(val.into()),
+								wasmer::Val::F64(val) => RuntimeValue::F64(val.into()),
+								_ => unreachable!(),
+							};
+
+							Some(wasmer_value)
+						} else {
+							None
+						};
+
+						Ok(wasmer_result)
+					},
+				}
+			})
 		})
 	}
 
@@ -343,9 +459,29 @@ impl<FR> SandboxInstance<FR> {
 	///
 	/// Returns `Some(_)` if the global could be found.
 	pub fn get_global_val(&self, name: &str) -> Option<sp_wasm_interface::Value> {
-		let global = self.instance.export_by_name(name)?.as_global()?.get();
+		match &self.backend_instance {
+			BackendInstance::Wasmi(wasmi_instance) => {
+				let wasmi_global = wasmi_instance.export_by_name(name)?.as_global()?.get();
+
+				Some(wasmi_global.into())
+			},
+
+			#[cfg(feature = "wasmer-sandbox")]
+			BackendInstance::Wasmer(wasmer_instance) => {
+				use sp_wasm_interface::Value;
+
+				let global = wasmer_instance.exports.get_global(name).ok()?;
+				let wasmtime_value = match global.get() {
+					wasmer::Val::I32(val) => Value::I32(val),
+					wasmer::Val::I64(val) => Value::I64(val),
+					wasmer::Val::F32(val) => Value::F32(f32::to_bits(val)),
+					wasmer::Val::F64(val) => Value::F64(f64::to_bits(val)),
+					_ => None?,
+				};
 
-		Some(global.into())
+				Some(wasmtime_value)
+			},
+		}
 	}
 }
 
@@ -366,7 +502,7 @@ pub enum InstantiationError {
 
 fn decode_environment_definition(
 	mut raw_env_def: &[u8],
-	memories: &[Option<MemoryRef>],
+	memories: &[Option<Memory>],
 ) -> std::result::Result<(Imports, GuestToSupervisorFunctionMapping), InstantiationError> {
 	let env_def = sandbox_primitives::EnvironmentDefinition::decode(&mut raw_env_def)
 		.map_err(|_| InstantiationError::EnvironmentDefinitionCorrupted)?;
@@ -401,7 +537,10 @@ fn decode_environment_definition(
 
 /// An environment in which the guest module is instantiated.
 pub struct GuestEnvironment {
+	/// Function and memory imports of the guest module
 	imports: Imports,
+
+	/// Supervisor functinons mapped to guest index space
 	guest_to_supervisor_mapping: GuestToSupervisorFunctionMapping,
 }
 
@@ -436,47 +575,142 @@ impl<FR> UnregisteredInstance<FR> {
 	}
 }
 
-/// Instantiate a guest module and return it's index in the store.
-///
-/// The guest module's code is specified in `wasm`. Environment that will be available to
-/// guest module is specified in `raw_env_def` (serialized version of [`EnvironmentDefinition`]).
-/// `dispatch_thunk` is used as function that handle calls from guests.
-///
-/// # Errors
-///
-/// Returns `Err` if any of the following conditions happens:
-///
-/// - `raw_env_def` can't be deserialized as a [`EnvironmentDefinition`].
-/// - Module in `wasm` is invalid or couldn't be instantiated.
-///
-/// [`EnvironmentDefinition`]: ../sandbox/struct.EnvironmentDefinition.html
-pub fn instantiate<'a, FE: SandboxCapabilities>(
-	supervisor_externals: &mut FE,
-	dispatch_thunk: FE::SupervisorFuncRef,
-	wasm: &[u8],
-	host_env: GuestEnvironment,
-	state: u32,
-) -> std::result::Result<UnregisteredInstance<FE::SupervisorFuncRef>, InstantiationError> {
-	let module = Module::from_buffer(wasm).map_err(|_| InstantiationError::ModuleDecoding)?;
-	let instance = ModuleInstance::new(&module, &host_env.imports)
-		.map_err(|_| InstantiationError::Instantiation)?;
+/// Helper type to provide sandbox capabilities to the inner context
+pub trait SandboxCapabilitiesHolder {
+	/// Supervisor function reference
+	type SupervisorFuncRef;
+
+	/// Capabilities trait
+	type SC: SandboxCapabilities<SupervisorFuncRef = Self::SupervisorFuncRef>;
+
+	/// Wrapper that provides sandbox capabilities in a limited context
+	fn with_sandbox_capabilities<R, F: FnOnce(&mut Self::SC) -> R>(f: F) -> R;
+}
+
+/// Helper type to provide dispatch thunk to the inner context
+pub trait DispatchThunkHolder {
+	/// Dispatch thunk for this particular context
+	type DispatchThunk;
 
-	let sandbox_instance = Rc::new(SandboxInstance {
-		// In general, it's not a very good idea to use `.not_started_instance()` for anything
-		// but for extracting memory and tables. But in this particular case, we are extracting
-		// for the purpose of running `start` function which should be ok.
-		instance: instance.not_started_instance().clone(),
-		dispatch_thunk,
-		guest_to_supervisor_mapping: host_env.guest_to_supervisor_mapping,
-	});
+	/// Provide `DispatchThunk` for the runtime method call and execute the given function `f`.
+	///
+	/// During the execution of the provided function `dispatch_thunk` will be callable.
+	fn initialize_thunk<R, F>(s: &Self::DispatchThunk, f: F) -> R
+	where
+		F: FnOnce() -> R;
+
+	/// Wrapper that provides dispatch thunk in a limited context
+	fn with_dispatch_thunk<R, F: FnOnce(&mut Self::DispatchThunk) -> R>(f: F) -> R;
+}
+
+/// Sandbox backend to use
+pub enum SandboxBackend {
+	/// Wasm interpreter
+	Wasmi,
 
-	with_guest_externals(supervisor_externals, &sandbox_instance, state, |guest_externals| {
-		instance
-			.run_start(guest_externals)
-			.map_err(|_| InstantiationError::StartTrapped)
-	})?;
+	/// Wasmer environment
+	#[cfg(feature = "wasmer-sandbox")]
+	Wasmer,
 
-	Ok(UnregisteredInstance { sandbox_instance })
+	/// Use wasmer backend if available. Fall back to wasmi otherwise.
+	TryWasmer,
+}
+
+/// Memory reference in terms of a selected backend
+#[derive(Clone, Debug)]
+pub enum Memory {
+	/// Wasmi memory reference
+	Wasmi(WasmiMemoryWrapper),
+
+	/// Wasmer memory refernce
+	#[cfg(feature = "wasmer-sandbox")]
+	Wasmer(WasmerMemoryWrapper),
+}
+
+impl Memory {
+	/// View as wasmi memory
+	pub fn as_wasmi(&self) -> Option<WasmiMemoryWrapper> {
+		match self {
+			Memory::Wasmi(memory) => Some(memory.clone()),
+
+			#[cfg(feature = "wasmer-sandbox")]
+			Memory::Wasmer(_) => None,
+		}
+	}
+
+	/// View as wasmer memory
+	#[cfg(feature = "wasmer-sandbox")]
+	pub fn as_wasmer(&self) -> Option<WasmerMemoryWrapper> {
+		match self {
+			Memory::Wasmer(memory) => Some(memory.clone()),
+			Memory::Wasmi(_) => None,
+		}
+	}
+}
+
+impl util::MemoryTransfer for Memory {
+	fn read(&self, source_addr: Pointer<u8>, size: usize) -> Result<Vec<u8>> {
+		match self {
+			Memory::Wasmi(sandboxed_memory) => sandboxed_memory.read(source_addr, size),
+
+			#[cfg(feature = "wasmer-sandbox")]
+			Memory::Wasmer(sandboxed_memory) => sandboxed_memory.read(source_addr, size),
+		}
+	}
+
+	fn read_into(&self, source_addr: Pointer<u8>, destination: &mut [u8]) -> Result<()> {
+		match self {
+			Memory::Wasmi(sandboxed_memory) => sandboxed_memory.read_into(source_addr, destination),
+
+			#[cfg(feature = "wasmer-sandbox")]
+			Memory::Wasmer(sandboxed_memory) => sandboxed_memory.read_into(source_addr, destination),
+		}
+	}
+
+	fn write_from(&self, dest_addr: Pointer<u8>, source: &[u8]) -> Result<()> {
+		match self {
+			Memory::Wasmi(sandboxed_memory) => sandboxed_memory.write_from(dest_addr, source),
+
+			#[cfg(feature = "wasmer-sandbox")]
+			Memory::Wasmer(sandboxed_memory) => sandboxed_memory.write_from(dest_addr, source),
+		}
+	}
+}
+
+/// Wasmer specific context
+#[cfg(feature = "wasmer-sandbox")]
+struct WasmerBackend {
+	store: wasmer::Store,
+}
+
+/// Information specific to a particular execution backend
+enum BackendContext {
+	/// Wasmi specific context
+	Wasmi,
+
+	/// Wasmer specific context
+	#[cfg(feature = "wasmer-sandbox")]
+	Wasmer(WasmerBackend),
+}
+
+impl BackendContext {
+	pub fn new(backend: SandboxBackend) -> BackendContext {
+		match backend {
+			SandboxBackend::Wasmi => BackendContext::Wasmi,
+
+			#[cfg(not(feature = "wasmer-sandbox"))]
+			SandboxBackend::TryWasmer => BackendContext::Wasmi,
+
+			#[cfg(feature = "wasmer-sandbox")]
+			SandboxBackend::Wasmer | SandboxBackend::TryWasmer => {
+				let compiler = wasmer_compiler_singlepass::Singlepass::default();
+
+				BackendContext::Wasmer(WasmerBackend {
+					store: wasmer::Store::new(&wasmer::JIT::new(compiler).engine()),
+				})
+			},
+		}
+	}
 }
 
 /// This struct keeps track of all sandboxed components.
@@ -485,13 +719,18 @@ pub fn instantiate<'a, FE: SandboxCapabilities>(
 pub struct Store<FR> {
 	// Memories and instances are `Some` until torn down.
 	instances: Vec<Option<Rc<SandboxInstance<FR>>>>,
-	memories: Vec<Option<MemoryRef>>,
+	memories: Vec<Option<Memory>>,
+	backend_context: BackendContext,
 }
 
 impl<FR> Store<FR> {
 	/// Create a new empty sandbox store.
-	pub fn new() -> Self {
-		Store { instances: Vec::new(), memories: Vec::new() }
+	pub fn new(backend: SandboxBackend) -> Self {
+		Store {
+			instances: Vec::new(),
+			memories: Vec::new(),
+			backend_context: BackendContext::new(backend),
+		}
 	}
 
 	/// Create a new memory instance and return it's index.
@@ -501,15 +740,33 @@ impl<FR> Store<FR> {
 	/// Returns `Err` if the memory couldn't be created.
 	/// Typically happens if `initial` is more than `maximum`.
 	pub fn new_memory(&mut self, initial: u32, maximum: u32) -> Result<u32> {
+		let memories = &mut self.memories;
+		let backend_context = &self.backend_context;
+
 		let maximum = match maximum {
 			sandbox_primitives::MEM_UNLIMITED => None,
-			specified_limit => Some(Pages(specified_limit as usize)),
+			specified_limit => Some(specified_limit),
 		};
 
-		let mem = MemoryInstance::alloc(Pages(initial as usize), maximum)?;
+		let memory = match &backend_context {
+			BackendContext::Wasmi => Memory::Wasmi(WasmiMemoryWrapper::new(MemoryInstance::alloc(
+				Pages(initial as usize),
+				maximum.map(|m| Pages(m as usize)),
+			)?)),
+
+			#[cfg(feature = "wasmer-sandbox")]
+			BackendContext::Wasmer(context) => {
+				let ty = wasmer::MemoryType::new(initial, maximum, false);
+				Memory::Wasmer(WasmerMemoryWrapper::new(
+					wasmer::Memory::new(&context.store, ty)
+						.map_err(|_| Error::InvalidMemoryReference)?,
+				))
+			},
+		};
+
+		let mem_idx = memories.len();
+		memories.push(Some(memory.clone()));
 
-		let mem_idx = self.memories.len();
-		self.memories.push(Some(mem));
 		Ok(mem_idx as u32)
 	}
 
@@ -533,7 +790,7 @@ impl<FR> Store<FR> {
 	///
 	/// Returns `Err` If `memory_idx` isn't a valid index of an memory or
 	/// if memory has been torn down.
-	pub fn memory(&self, memory_idx: u32) -> Result<MemoryRef> {
+	pub fn memory(&self, memory_idx: u32) -> Result<Memory> {
 		self.memories
 			.get(memory_idx as usize)
 			.cloned()
@@ -575,9 +832,307 @@ impl<FR> Store<FR> {
 		}
 	}
 
+	/// Instantiate a guest module and return it's index in the store.
+	///
+	/// The guest module's code is specified in `wasm`. Environment that will be available to
+	/// guest module is specified in `guest_env`. A dispatch thunk is used as function that
+	/// handle calls from guests. `state` is an opaque pointer to caller's arbitrary context
+	/// normally created by `sp_sandbox::Instance` primitive.
+	///
+	/// Note: Due to borrowing constraints dispatch thunk is now propagated using DTH
+	///
+	/// Returns uninitialized sandboxed module instance or an instantiation error.
+	pub fn instantiate<'a, FE, SCH, DTH>(
+		&mut self,
+		wasm: &[u8],
+		guest_env: GuestEnvironment,
+		state: u32,
+	) -> std::result::Result<UnregisteredInstance<FR>, InstantiationError>
+	where
+		FR: Clone + 'static,
+		FE: SandboxCapabilities<SupervisorFuncRef = FR> + 'a,
+		SCH: SandboxCapabilitiesHolder<SupervisorFuncRef = FR, SC = FE>,
+		DTH: DispatchThunkHolder<DispatchThunk = FR>,
+	{
+		let backend_context = &self.backend_context;
+
+		let sandbox_instance = match backend_context {
+			BackendContext::Wasmi =>
+				Self::instantiate_wasmi::<FE, SCH, DTH>(wasm, guest_env, state)?,
+
+			#[cfg(feature = "wasmer-sandbox")]
+			BackendContext::Wasmer(context) =>
+				Self::instantiate_wasmer::<FE, SCH, DTH>(context, wasm, guest_env, state)?,
+		};
+
+		Ok(UnregisteredInstance { sandbox_instance })
+	}
+}
+
+// Private routines
+impl<FR> Store<FR> {
 	fn register_sandbox_instance(&mut self, sandbox_instance: Rc<SandboxInstance<FR>>) -> u32 {
 		let instance_idx = self.instances.len();
 		self.instances.push(Some(sandbox_instance));
 		instance_idx as u32
 	}
+
+	fn instantiate_wasmi<'a, FE, SCH, DTH>(
+		wasm: &[u8],
+		guest_env: GuestEnvironment,
+		state: u32,
+	) -> std::result::Result<Rc<SandboxInstance<FR>>, InstantiationError>
+	where
+		FR: Clone + 'static,
+		FE: SandboxCapabilities<SupervisorFuncRef = FR> + 'a,
+		SCH: SandboxCapabilitiesHolder<SupervisorFuncRef = FR, SC = FE>,
+		DTH: DispatchThunkHolder<DispatchThunk = FR>,
+	{
+		let wasmi_module =
+			Module::from_buffer(wasm).map_err(|_| InstantiationError::ModuleDecoding)?;
+		let wasmi_instance = ModuleInstance::new(&wasmi_module, &guest_env.imports)
+			.map_err(|_| InstantiationError::Instantiation)?;
+
+		let sandbox_instance = DTH::with_dispatch_thunk(|dispatch_thunk| {
+			Rc::new(SandboxInstance {
+				// In general, it's not a very good idea to use `.not_started_instance()` for
+				// anything but for extracting memory and tables. But in this particular case, we
+				// are extracting for the purpose of running `start` function which should be ok.
+				backend_instance: BackendInstance::Wasmi(
+					wasmi_instance.not_started_instance().clone(),
+				),
+				dispatch_thunk: dispatch_thunk.clone(),
+				guest_to_supervisor_mapping: guest_env.guest_to_supervisor_mapping,
+			})
+		});
+
+		SCH::with_sandbox_capabilities(|supervisor_externals| {
+			with_guest_externals(
+				supervisor_externals,
+				&sandbox_instance,
+				state,
+				|guest_externals| {
+					wasmi_instance
+						.run_start(guest_externals)
+						.map_err(|_| InstantiationError::StartTrapped)
+
+					// Note: no need to run start on wasmtime instance, since it's done
+					// automatically
+				},
+			)
+		})?;
+
+		Ok(sandbox_instance)
+	}
+
+	#[cfg(feature = "wasmer-sandbox")]
+	fn instantiate_wasmer<'a, FE, SCH, DTH>(
+		context: &WasmerBackend,
+		wasm: &[u8],
+		guest_env: GuestEnvironment,
+		state: u32,
+	) -> std::result::Result<Rc<SandboxInstance<FR>>, InstantiationError>
+	where
+		FR: Clone + 'static,
+		FE: SandboxCapabilities<SupervisorFuncRef = FR> + 'a,
+		SCH: SandboxCapabilitiesHolder<SupervisorFuncRef = FR, SC = FE>,
+		DTH: DispatchThunkHolder<DispatchThunk = FR>,
+	{
+		let module = wasmer::Module::new(&context.store, wasm)
+			.map_err(|_| InstantiationError::ModuleDecoding)?;
+
+		type Exports = HashMap<String, wasmer::Exports>;
+		let mut exports_map = Exports::new();
+
+		for import in module.imports().into_iter() {
+			match import.ty() {
+				// Nothing to do here
+				wasmer::ExternType::Global(_) | wasmer::ExternType::Table(_) => (),
+
+				wasmer::ExternType::Memory(_) => {
+					let exports = exports_map
+						.entry(import.module().to_string())
+						.or_insert(wasmer::Exports::new());
+
+					let memory = guest_env
+						.imports
+						.memory_by_name(import.module(), import.name())
+						.ok_or(InstantiationError::ModuleDecoding)?;
+
+					let mut wasmer_memory_ref = memory.as_wasmer().expect(
+						"memory is created by wasmer; \
+						exported by the same module and backend; \
+						thus the operation can't fail; \
+						qed",
+					);
+
+					// This is safe since we're only instantiating the module and populating
+					// the export table, so no memory access can happen at this time.
+					// All subsequent memory accesses should happen through the wrapper,
+					// that enforces the memory access protocol.
+					let wasmer_memory = unsafe { wasmer_memory_ref.clone_inner() };
+
+					exports.insert(import.name(), wasmer::Extern::Memory(wasmer_memory));
+				},
+
+				wasmer::ExternType::Function(func_ty) => {
+					let guest_func_index =
+						guest_env.imports.func_by_name(import.module(), import.name());
+
+					let guest_func_index = if let Some(index) = guest_func_index {
+						index
+					} else {
+						// Missing import (should we abort here?)
+						continue
+					};
+
+					let supervisor_func_index = guest_env
+						.guest_to_supervisor_mapping
+						.func_by_guest_index(guest_func_index)
+						.ok_or(InstantiationError::ModuleDecoding)?;
+
+					let function = Self::wasmer_dispatch_function::<FE, SCH, DTH>(
+						supervisor_func_index,
+						&context.store,
+						func_ty,
+						state,
+					);
+
+					let exports = exports_map
+						.entry(import.module().to_string())
+						.or_insert(wasmer::Exports::new());
+
+					exports.insert(import.name(), wasmer::Extern::Function(function));
+				},
+			}
+		}
+
+		let mut import_object = wasmer::ImportObject::new();
+		for (module_name, exports) in exports_map.into_iter() {
+			import_object.register(module_name, exports);
+		}
+
+		let instance =
+			wasmer::Instance::new(&module, &import_object).map_err(|error| match error {
+				wasmer::InstantiationError::Link(_) => InstantiationError::Instantiation,
+				wasmer::InstantiationError::Start(_) => InstantiationError::StartTrapped,
+				wasmer::InstantiationError::HostEnvInitialization(_) =>
+					InstantiationError::EnvironmentDefinitionCorrupted,
+			})?;
+
+		Ok(Rc::new(SandboxInstance {
+			backend_instance: BackendInstance::Wasmer(instance),
+			dispatch_thunk: DTH::with_dispatch_thunk(|dispatch_thunk| dispatch_thunk.clone()),
+			guest_to_supervisor_mapping: guest_env.guest_to_supervisor_mapping,
+		}))
+	}
+
+	#[cfg(feature = "wasmer-sandbox")]
+	fn wasmer_dispatch_function<'a, FE, SCH, DTH>(
+		supervisor_func_index: SupervisorFuncIndex,
+		store: &wasmer::Store,
+		func_ty: &wasmer::FunctionType,
+		state: u32,
+	) -> wasmer::Function
+	where
+		FR: Clone + 'static,
+		FE: SandboxCapabilities<SupervisorFuncRef = FR> + 'a,
+		SCH: SandboxCapabilitiesHolder<SupervisorFuncRef = FR, SC = FE>,
+		DTH: DispatchThunkHolder<DispatchThunk = FR>,
+	{
+		wasmer::Function::new(store, func_ty, move |params| {
+			SCH::with_sandbox_capabilities(|supervisor_externals| {
+				use sp_wasm_interface::Value;
+
+				// Serialize arguments into a byte vector.
+				let invoke_args_data = params
+					.iter()
+					.map(|val| match val {
+						wasmer::Val::I32(val) => Value::I32(*val),
+						wasmer::Val::I64(val) => Value::I64(*val),
+						wasmer::Val::F32(val) => Value::F32(f32::to_bits(*val)),
+						wasmer::Val::F64(val) => Value::F64(f64::to_bits(*val)),
+						_ => unimplemented!(),
+					})
+					.collect::<Vec<_>>()
+					.encode();
+
+				// Move serialized arguments inside the memory, invoke dispatch thunk and
+				// then free allocated memory.
+				let invoke_args_len = invoke_args_data.len() as WordSize;
+				let invoke_args_ptr =
+					supervisor_externals.allocate_memory(invoke_args_len).map_err(|_| {
+						wasmer::RuntimeError::new(
+							"Can't allocate memory in supervisor for the arguments",
+						)
+					})?;
+
+				let deallocate = |fe: &mut FE, ptr, fail_msg| {
+					fe.deallocate_memory(ptr).map_err(|_| wasmer::RuntimeError::new(fail_msg))
+				};
+
+				if supervisor_externals.write_memory(invoke_args_ptr, &invoke_args_data).is_err() {
+					deallocate(
+						supervisor_externals,
+						invoke_args_ptr,
+						"Failed dealloction after failed write of invoke arguments",
+					)?;
+
+					return Err(wasmer::RuntimeError::new("Can't write invoke args into memory"))
+				}
+
+				// Perform the actuall call
+				let serialized_result = DTH::with_dispatch_thunk(|dispatch_thunk| {
+					supervisor_externals.invoke(
+						&dispatch_thunk,
+						invoke_args_ptr,
+						invoke_args_len,
+						state,
+						supervisor_func_index,
+					)
+				})
+				.map_err(|e| wasmer::RuntimeError::new(e.to_string()))?;
+
+				// dispatch_thunk returns pointer to serialized arguments.
+				// Unpack pointer and len of the serialized result data.
+				let (serialized_result_val_ptr, serialized_result_val_len) = {
+					// Cast to u64 to use zero-extension.
+					let v = serialized_result as u64;
+					let ptr = (v as u64 >> 32) as u32;
+					let len = (v & 0xFFFFFFFF) as u32;
+					(Pointer::new(ptr), len)
+				};
+
+				let serialized_result_val = supervisor_externals
+					.read_memory(serialized_result_val_ptr, serialized_result_val_len)
+					.map_err(|_| {
+						wasmer::RuntimeError::new(
+							"Can't read the serialized result from dispatch thunk",
+						)
+					});
+
+				let deserialized_result = deallocate(
+					supervisor_externals,
+					serialized_result_val_ptr,
+					"Can't deallocate memory for dispatch thunk's result",
+				)
+				.and_then(|_| serialized_result_val)
+				.and_then(|serialized_result_val| {
+					deserialize_result(&serialized_result_val)
+						.map_err(|e| wasmer::RuntimeError::new(e.to_string()))
+				})?;
+
+				if let Some(value) = deserialized_result {
+					Ok(vec![match value {
+						RuntimeValue::I32(val) => wasmer::Val::I32(val),
+						RuntimeValue::I64(val) => wasmer::Val::I64(val),
+						RuntimeValue::F32(val) => wasmer::Val::F32(val.into()),
+						RuntimeValue::F64(val) => wasmer::Val::F64(val.into()),
+					}])
+				} else {
+					Ok(vec![])
+				}
+			})
+		})
+	}
 }
diff --git a/client/executor/common/src/util.rs b/client/executor/common/src/util.rs
new file mode 100644
index 000000000000..995424bfa839
--- /dev/null
+++ b/client/executor/common/src/util.rs
@@ -0,0 +1,241 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! Utilities used by all backends
+
+use crate::error::{Error, Result};
+use sp_wasm_interface::Pointer;
+use std::ops::Range;
+
+/// Construct a range from an offset to a data length after the offset.
+/// Returns None if the end of the range would exceed some maximum offset.
+pub fn checked_range(offset: usize, len: usize, max: usize) -> Option<Range<usize>> {
+	let end = offset.checked_add(len)?;
+	if end <= max {
+		Some(offset..end)
+	} else {
+		None
+	}
+}
+
+/// Provides safe memory access interface using an external buffer
+pub trait MemoryTransfer {
+	/// Read data from a slice of memory into a newly allocated buffer.
+	///
+	/// Returns an error if the read would go out of the memory bounds.
+	fn read(&self, source_addr: Pointer<u8>, size: usize) -> Result<Vec<u8>>;
+
+	/// Read data from a slice of memory into a destination buffer.
+	///
+	/// Returns an error if the read would go out of the memory bounds.
+	fn read_into(&self, source_addr: Pointer<u8>, destination: &mut [u8]) -> Result<()>;
+
+	/// Write data to a slice of memory.
+	///
+	/// Returns an error if the write would go out of the memory bounds.
+	fn write_from(&self, dest_addr: Pointer<u8>, source: &[u8]) -> Result<()>;
+}
+
+/// Safe wrapper over wasmi memory reference
+pub mod wasmi {
+	use super::*;
+
+	/// Wasmi provides direct access to its memory using slices.
+	///
+	/// This wrapper limits the scope where the slice can be taken to
+	#[derive(Debug, Clone)]
+	pub struct MemoryWrapper(::wasmi::MemoryRef);
+
+	impl MemoryWrapper {
+		/// Take ownership of the memory region and return a wrapper object
+		pub fn new(memory: ::wasmi::MemoryRef) -> Self {
+			Self(memory)
+		}
+
+		/// Clone the underlying memory object
+		///
+		/// # Safety
+		///
+		/// The sole purpose of `MemoryRef` is to protect the memory from uncontrolled
+		/// access. By returning the memory object "as is" we bypass all of the checks.
+		///
+		/// Intended to use only during module initialization.
+		pub unsafe fn clone_inner(&self) -> ::wasmi::MemoryRef {
+			self.0.clone()
+		}
+	}
+
+	impl super::MemoryTransfer for MemoryWrapper {
+		fn read(&self, source_addr: Pointer<u8>, size: usize) -> Result<Vec<u8>> {
+			self.0.with_direct_access(|source| {
+				let range = checked_range(source_addr.into(), size, source.len())
+					.ok_or_else(|| Error::Other("memory read is out of bounds".into()))?;
+
+				Ok(Vec::from(&source[range]))
+			})
+		}
+
+		fn read_into(&self, source_addr: Pointer<u8>, destination: &mut [u8]) -> Result<()> {
+			self.0.with_direct_access(|source| {
+				let range = checked_range(source_addr.into(), destination.len(), source.len())
+					.ok_or_else(|| Error::Other("memory read is out of bounds".into()))?;
+
+				destination.copy_from_slice(&source[range]);
+				Ok(())
+			})
+		}
+
+		fn write_from(&self, dest_addr: Pointer<u8>, source: &[u8]) -> Result<()> {
+			self.0.with_direct_access_mut(|destination| {
+				let range = checked_range(dest_addr.into(), source.len(), destination.len())
+					.ok_or_else(|| Error::Other("memory write is out of bounds".into()))?;
+
+				&mut destination[range].copy_from_slice(source);
+				Ok(())
+			})
+		}
+	}
+}
+
+// Routines specific to Wasmer runtime. Since sandbox can be invoked from both
+/// wasmi and wasmtime runtime executors, we need to have a way to deal with sanbox
+/// backends right from the start.
+#[cfg(feature = "wasmer-sandbox")]
+pub mod wasmer {
+	use super::checked_range;
+	use crate::error::{Error, Result};
+	use sp_wasm_interface::Pointer;
+	use std::{cell::RefCell, convert::TryInto, rc::Rc};
+
+	/// In order to enforce memory access protocol to the backend memory
+	/// we wrap it with `RefCell` and encapsulate all memory operations.
+	#[derive(Debug, Clone)]
+	pub struct MemoryWrapper {
+		buffer: Rc<RefCell<wasmer::Memory>>,
+	}
+
+	impl MemoryWrapper {
+		/// Take ownership of the memory region and return a wrapper object
+		pub fn new(memory: wasmer::Memory) -> Self {
+			Self { buffer: Rc::new(RefCell::new(memory)) }
+		}
+
+		/// Returns linear memory of the wasm instance as a slice.
+		///
+		/// # Safety
+		///
+		/// Wasmer doesn't provide comprehensive documentation about the exact behavior of the data
+		/// pointer. If a dynamic style heap is used the base pointer of the heap can change. Since
+		/// growing, we cannot guarantee the lifetime of the returned slice reference.
+		unsafe fn memory_as_slice(memory: &wasmer::Memory) -> &[u8] {
+			let ptr = memory.data_ptr() as *const _;
+			let len: usize =
+				memory.data_size().try_into().expect("data size should fit into usize");
+
+			if len == 0 {
+				&[]
+			} else {
+				core::slice::from_raw_parts(ptr, len)
+			}
+		}
+
+		/// Returns linear memory of the wasm instance as a slice.
+		///
+		/// # Safety
+		///
+		/// See `[memory_as_slice]`. In addition to those requirements, since a mutable reference is
+		/// returned it must be ensured that only one mutable and no shared references to memory
+		/// exists at the same time.
+		unsafe fn memory_as_slice_mut(memory: &wasmer::Memory) -> &mut [u8] {
+			let ptr = memory.data_ptr();
+			let len: usize =
+				memory.data_size().try_into().expect("data size should fit into usize");
+
+			if len == 0 {
+				&mut []
+			} else {
+				core::slice::from_raw_parts_mut(ptr, len)
+			}
+		}
+
+		/// Clone the underlying memory object
+		///
+		/// # Safety
+		///
+		/// The sole purpose of `MemoryRef` is to protect the memory from uncontrolled
+		/// access. By returning the memory object "as is" we bypass all of the checks.
+		///
+		/// Intended to use only during module initialization.
+		///
+		/// # Panics
+		///
+		/// Will panic if `MemoryRef` is currently in use.
+		pub unsafe fn clone_inner(&mut self) -> wasmer::Memory {
+			// We take exclusive lock to ensure that we're the only one here
+			self.buffer.borrow_mut().clone()
+		}
+	}
+
+	impl super::MemoryTransfer for MemoryWrapper {
+		fn read(&self, source_addr: Pointer<u8>, size: usize) -> Result<Vec<u8>> {
+			let memory = self.buffer.borrow();
+
+			let data_size = memory.data_size().try_into().expect("data size does not fit");
+
+			let range = checked_range(source_addr.into(), size, data_size)
+				.ok_or_else(|| Error::Other("memory read is out of bounds".into()))?;
+
+			let mut buffer = vec![0; range.len()];
+			self.read_into(source_addr, &mut buffer)?;
+
+			Ok(buffer)
+		}
+
+		fn read_into(&self, source_addr: Pointer<u8>, destination: &mut [u8]) -> Result<()> {
+			unsafe {
+				let memory = self.buffer.borrow();
+
+				// This should be safe since we don't grow up memory while caching this reference
+				// and we give up the reference before returning from this function.
+				let source = Self::memory_as_slice(&memory);
+
+				let range = checked_range(source_addr.into(), destination.len(), source.len())
+					.ok_or_else(|| Error::Other("memory read is out of bounds".into()))?;
+
+				destination.copy_from_slice(&source[range]);
+				Ok(())
+			}
+		}
+
+		fn write_from(&self, dest_addr: Pointer<u8>, source: &[u8]) -> Result<()> {
+			unsafe {
+				let memory = self.buffer.borrow_mut();
+
+				// This should be safe since we don't grow up memory while caching this reference
+				// and we give up the reference before returning from this function.
+				let destination = Self::memory_as_slice_mut(&memory);
+
+				let range = checked_range(dest_addr.into(), source.len(), destination.len())
+					.ok_or_else(|| Error::Other("memory write is out of bounds".into()))?;
+
+				&mut destination[range].copy_from_slice(source);
+				Ok(())
+			}
+		}
+	}
+}
diff --git a/client/executor/wasmi/Cargo.toml b/client/executor/wasmi/Cargo.toml
index c1e5b3d26723..324b2bdd0bae 100644
--- a/client/executor/wasmi/Cargo.toml
+++ b/client/executor/wasmi/Cargo.toml
@@ -22,3 +22,4 @@ sc-allocator = { version = "4.0.0-dev", path = "../../allocator" }
 sp-wasm-interface = { version = "4.0.0-dev", path = "../../../primitives/wasm-interface" }
 sp-runtime-interface = { version = "4.0.0-dev", path = "../../../primitives/runtime-interface" }
 sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
+scoped-tls = "1.0"
diff --git a/client/executor/wasmi/src/lib.rs b/client/executor/wasmi/src/lib.rs
index cc6a05fccf81..3c5836c77481 100644
--- a/client/executor/wasmi/src/lib.rs
+++ b/client/executor/wasmi/src/lib.rs
@@ -24,6 +24,7 @@ use sc_executor_common::{
 	error::{Error, WasmError},
 	runtime_blob::{DataSegmentsSnapshot, RuntimeBlob},
 	sandbox,
+	util::MemoryTransfer,
 	wasm_runtime::{InvokeMethod, WasmInstance, WasmModule},
 };
 use sp_core::sandbox as sandbox_primitives;
@@ -31,7 +32,7 @@ use sp_runtime_interface::unpack_ptr_and_len;
 use sp_wasm_interface::{
 	Function, FunctionContext, MemoryId, Pointer, Result as WResult, Sandbox, WordSize,
 };
-use std::{cell::RefCell, str, sync::Arc};
+use std::{cell::RefCell, rc::Rc, str, sync::Arc};
 use wasmi::{
 	memory_units::Pages,
 	FuncInstance, ImportsBuilder, MemoryInstance, MemoryRef, Module, ModuleInstance, ModuleRef,
@@ -39,38 +40,45 @@ use wasmi::{
 	TableRef,
 };
 
-struct FunctionExecutor<'a> {
-	sandbox_store: sandbox::Store<wasmi::FuncRef>,
-	heap: sc_allocator::FreeingBumpHeapAllocator,
+#[derive(Clone)]
+struct FunctionExecutor {
+	inner: Rc<Inner>,
+}
+
+struct Inner {
+	sandbox_store: RefCell<sandbox::Store<wasmi::FuncRef>>,
+	heap: RefCell<sc_allocator::FreeingBumpHeapAllocator>,
 	memory: MemoryRef,
 	table: Option<TableRef>,
-	host_functions: &'a [&'static dyn Function],
+	host_functions: Arc<Vec<&'static dyn Function>>,
 	allow_missing_func_imports: bool,
-	missing_functions: &'a [String],
+	missing_functions: Arc<Vec<String>>,
 }
 
-impl<'a> FunctionExecutor<'a> {
+impl FunctionExecutor {
 	fn new(
 		m: MemoryRef,
 		heap_base: u32,
 		t: Option<TableRef>,
-		host_functions: &'a [&'static dyn Function],
+		host_functions: Arc<Vec<&'static dyn Function>>,
 		allow_missing_func_imports: bool,
-		missing_functions: &'a [String],
+		missing_functions: Arc<Vec<String>>,
 	) -> Result<Self, Error> {
 		Ok(FunctionExecutor {
-			sandbox_store: sandbox::Store::new(),
-			heap: sc_allocator::FreeingBumpHeapAllocator::new(heap_base),
-			memory: m,
-			table: t,
-			host_functions,
-			allow_missing_func_imports,
-			missing_functions,
+			inner: Rc::new(Inner {
+				sandbox_store: RefCell::new(sandbox::Store::new(sandbox::SandboxBackend::Wasmi)),
+				heap: RefCell::new(sc_allocator::FreeingBumpHeapAllocator::new(heap_base)),
+				memory: m,
+				table: t,
+				host_functions,
+				allow_missing_func_imports,
+				missing_functions,
+			}),
 		})
 	}
 }
 
-impl<'a> sandbox::SandboxCapabilities for FunctionExecutor<'a> {
+impl sandbox::SandboxCapabilities for FunctionExecutor {
 	type SupervisorFuncRef = wasmi::FuncRef;
 
 	fn invoke(
@@ -99,24 +107,26 @@ impl<'a> sandbox::SandboxCapabilities for FunctionExecutor<'a> {
 	}
 }
 
-impl<'a> FunctionContext for FunctionExecutor<'a> {
+impl FunctionContext for FunctionExecutor {
 	fn read_memory_into(&self, address: Pointer<u8>, dest: &mut [u8]) -> WResult<()> {
-		self.memory.get_into(address.into(), dest).map_err(|e| e.to_string())
+		self.inner.memory.get_into(address.into(), dest).map_err(|e| e.to_string())
 	}
 
 	fn write_memory(&mut self, address: Pointer<u8>, data: &[u8]) -> WResult<()> {
-		self.memory.set(address.into(), data).map_err(|e| e.to_string())
+		self.inner.memory.set(address.into(), data).map_err(|e| e.to_string())
 	}
 
 	fn allocate_memory(&mut self, size: WordSize) -> WResult<Pointer<u8>> {
-		let heap = &mut self.heap;
-		self.memory
+		let heap = &mut self.inner.heap.borrow_mut();
+		self.inner
+			.memory
 			.with_direct_access_mut(|mem| heap.allocate(mem, size).map_err(|e| e.to_string()))
 	}
 
 	fn deallocate_memory(&mut self, ptr: Pointer<u8>) -> WResult<()> {
-		let heap = &mut self.heap;
-		self.memory
+		let heap = &mut self.inner.heap.borrow_mut();
+		self.inner
+			.memory
 			.with_direct_access_mut(|mem| heap.deallocate(mem, ptr).map_err(|e| e.to_string()))
 	}
 
@@ -125,7 +135,7 @@ impl<'a> FunctionContext for FunctionExecutor<'a> {
 	}
 }
 
-impl<'a> Sandbox for FunctionExecutor<'a> {
+impl Sandbox for FunctionExecutor {
 	fn memory_get(
 		&mut self,
 		memory_id: MemoryId,
@@ -133,18 +143,21 @@ impl<'a> Sandbox for FunctionExecutor<'a> {
 		buf_ptr: Pointer<u8>,
 		buf_len: WordSize,
 	) -> WResult<u32> {
-		let sandboxed_memory = self.sandbox_store.memory(memory_id).map_err(|e| e.to_string())?;
+		let sandboxed_memory =
+			self.inner.sandbox_store.borrow().memory(memory_id).map_err(|e| e.to_string())?;
 
-		match MemoryInstance::transfer(
-			&sandboxed_memory,
-			offset as usize,
-			&self.memory,
-			buf_ptr.into(),
-			buf_len as usize,
-		) {
-			Ok(()) => Ok(sandbox_primitives::ERR_OK),
-			Err(_) => Ok(sandbox_primitives::ERR_OUT_OF_BOUNDS),
+		let len = buf_len as usize;
+
+		let buffer = match sandboxed_memory.read(Pointer::new(offset as u32), len) {
+			Err(_) => return Ok(sandbox_primitives::ERR_OUT_OF_BOUNDS),
+			Ok(buffer) => buffer,
+		};
+
+		if let Err(_) = self.inner.memory.set(buf_ptr.into(), &buffer) {
+			return Ok(sandbox_primitives::ERR_OUT_OF_BOUNDS)
 		}
+
+		Ok(sandbox_primitives::ERR_OK)
 	}
 
 	fn memory_set(
@@ -154,26 +167,37 @@ impl<'a> Sandbox for FunctionExecutor<'a> {
 		val_ptr: Pointer<u8>,
 		val_len: WordSize,
 	) -> WResult<u32> {
-		let sandboxed_memory = self.sandbox_store.memory(memory_id).map_err(|e| e.to_string())?;
+		let sandboxed_memory =
+			self.inner.sandbox_store.borrow().memory(memory_id).map_err(|e| e.to_string())?;
 
-		match MemoryInstance::transfer(
-			&self.memory,
-			val_ptr.into(),
-			&sandboxed_memory,
-			offset as usize,
-			val_len as usize,
-		) {
-			Ok(()) => Ok(sandbox_primitives::ERR_OK),
-			Err(_) => Ok(sandbox_primitives::ERR_OUT_OF_BOUNDS),
+		let len = val_len as usize;
+
+		let buffer = match self.inner.memory.get(val_ptr.into(), len) {
+			Err(_) => return Ok(sandbox_primitives::ERR_OUT_OF_BOUNDS),
+			Ok(buffer) => buffer,
+		};
+
+		if let Err(_) = sandboxed_memory.write_from(Pointer::new(offset as u32), &buffer) {
+			return Ok(sandbox_primitives::ERR_OUT_OF_BOUNDS)
 		}
+
+		Ok(sandbox_primitives::ERR_OK)
 	}
 
 	fn memory_teardown(&mut self, memory_id: MemoryId) -> WResult<()> {
-		self.sandbox_store.memory_teardown(memory_id).map_err(|e| e.to_string())
+		self.inner
+			.sandbox_store
+			.borrow_mut()
+			.memory_teardown(memory_id)
+			.map_err(|e| e.to_string())
 	}
 
 	fn memory_new(&mut self, initial: u32, maximum: u32) -> WResult<MemoryId> {
-		self.sandbox_store.new_memory(initial, maximum).map_err(|e| e.to_string())
+		self.inner
+			.sandbox_store
+			.borrow_mut()
+			.new_memory(initial, maximum)
+			.map_err(|e| e.to_string())
 	}
 
 	fn invoke(
@@ -194,8 +218,15 @@ impl<'a> Sandbox for FunctionExecutor<'a> {
 			.map(Into::into)
 			.collect::<Vec<_>>();
 
-		let instance = self.sandbox_store.instance(instance_id).map_err(|e| e.to_string())?;
-		let result = instance.invoke(export_name, &args, self, state);
+		let instance = self
+			.inner
+			.sandbox_store
+			.borrow()
+			.instance(instance_id)
+			.map_err(|e| e.to_string())?;
+
+		let result = EXECUTOR
+			.set(self, || instance.invoke::<_, CapsHolder, ThunkHolder>(export_name, &args, state));
 
 		match result {
 			Ok(None) => Ok(sandbox_primitives::ERR_OK),
@@ -214,7 +245,11 @@ impl<'a> Sandbox for FunctionExecutor<'a> {
 	}
 
 	fn instance_teardown(&mut self, instance_id: u32) -> WResult<()> {
-		self.sandbox_store.instance_teardown(instance_id).map_err(|e| e.to_string())
+		self.inner
+			.sandbox_store
+			.borrow_mut()
+			.instance_teardown(instance_id)
+			.map_err(|e| e.to_string())
 	}
 
 	fn instance_new(
@@ -227,6 +262,7 @@ impl<'a> Sandbox for FunctionExecutor<'a> {
 		// Extract a dispatch thunk from instance's table by the specified index.
 		let dispatch_thunk = {
 			let table = self
+				.inner
 				.table
 				.as_ref()
 				.ok_or_else(|| "Runtime doesn't have a table; sandbox is unavailable")?;
@@ -236,19 +272,26 @@ impl<'a> Sandbox for FunctionExecutor<'a> {
 				.ok_or_else(|| "dispatch_thunk_idx points on an empty table entry")?
 		};
 
-		let guest_env = match sandbox::GuestEnvironment::decode(&self.sandbox_store, raw_env_def) {
+		let guest_env = match sandbox::GuestEnvironment::decode(
+			&*self.inner.sandbox_store.borrow(),
+			raw_env_def,
+		) {
 			Ok(guest_env) => guest_env,
 			Err(_) => return Ok(sandbox_primitives::ERR_MODULE as u32),
 		};
 
-		let instance_idx_or_err_code =
-			match sandbox::instantiate(self, dispatch_thunk, wasm, guest_env, state)
-				.map(|i| i.register(&mut self.sandbox_store))
-			{
-				Ok(instance_idx) => instance_idx,
-				Err(sandbox::InstantiationError::StartTrapped) => sandbox_primitives::ERR_EXECUTION,
-				Err(_) => sandbox_primitives::ERR_MODULE,
-			};
+		let store = &mut *self.inner.sandbox_store.borrow_mut();
+		let result = EXECUTOR.set(self, || {
+			DISPATCH_THUNK.set(&dispatch_thunk, || {
+				store.instantiate::<_, CapsHolder, ThunkHolder>(wasm, guest_env, state)
+			})
+		});
+
+		let instance_idx_or_err_code: u32 = match result.map(|i| i.register(store)) {
+			Ok(instance_idx) => instance_idx,
+			Err(sandbox::InstantiationError::StartTrapped) => sandbox_primitives::ERR_EXECUTION,
+			Err(_) => sandbox_primitives::ERR_MODULE,
+		};
 
 		Ok(instance_idx_or_err_code as u32)
 	}
@@ -258,13 +301,57 @@ impl<'a> Sandbox for FunctionExecutor<'a> {
 		instance_idx: u32,
 		name: &str,
 	) -> WResult<Option<sp_wasm_interface::Value>> {
-		self.sandbox_store
+		self.inner
+			.sandbox_store
+			.borrow()
 			.instance(instance_idx)
 			.map(|i| i.get_global_val(name))
 			.map_err(|e| e.to_string())
 	}
 }
 
+/// Wasmi specific implementation of `SandboxCapabilitiesHolder` that provides
+/// sandbox with a scoped thread local access to a function executor.
+/// This is a way to calm down the borrow checker since host function closures
+/// require exclusive access to it.
+struct CapsHolder;
+
+scoped_tls::scoped_thread_local!(static EXECUTOR: FunctionExecutor);
+
+impl sandbox::SandboxCapabilitiesHolder for CapsHolder {
+	type SupervisorFuncRef = wasmi::FuncRef;
+	type SC = FunctionExecutor;
+
+	fn with_sandbox_capabilities<R, F: FnOnce(&mut Self::SC) -> R>(f: F) -> R {
+		assert!(EXECUTOR.is_set(), "wasmi executor is not set");
+		EXECUTOR.with(|executor| f(&mut executor.clone()))
+	}
+}
+
+/// Wasmi specific implementation of `DispatchThunkHolder` that provides
+/// sandbox with a scoped thread local access to a dispatch thunk.
+/// This is a way to calm down the borrow checker since host function closures
+/// require exclusive access to it.
+struct ThunkHolder;
+
+scoped_tls::scoped_thread_local!(static DISPATCH_THUNK: wasmi::FuncRef);
+
+impl sandbox::DispatchThunkHolder for ThunkHolder {
+	type DispatchThunk = wasmi::FuncRef;
+
+	fn with_dispatch_thunk<R, F: FnOnce(&mut Self::DispatchThunk) -> R>(f: F) -> R {
+		assert!(DISPATCH_THUNK.is_set(), "dispatch thunk is not set");
+		DISPATCH_THUNK.with(|thunk| f(&mut thunk.clone()))
+	}
+
+	fn initialize_thunk<R, F>(s: &Self::DispatchThunk, f: F) -> R
+	where
+		F: FnOnce() -> R,
+	{
+		DISPATCH_THUNK.set(s, f)
+	}
+}
+
 /// Will be used on initialization of a module to resolve function and memory imports.
 struct Resolver<'a> {
 	/// All the hot functions that we export for the WASM blob.
@@ -375,7 +462,7 @@ impl<'a> wasmi::ModuleImportResolver for Resolver<'a> {
 	}
 }
 
-impl<'a> wasmi::Externals for FunctionExecutor<'a> {
+impl wasmi::Externals for FunctionExecutor {
 	fn invoke_index(
 		&mut self,
 		index: usize,
@@ -383,19 +470,19 @@ impl<'a> wasmi::Externals for FunctionExecutor<'a> {
 	) -> Result<Option<wasmi::RuntimeValue>, wasmi::Trap> {
 		let mut args = args.as_ref().iter().copied().map(Into::into);
 
-		if let Some(function) = self.host_functions.get(index) {
+		if let Some(function) = self.inner.host_functions.clone().get(index) {
 			function
 				.execute(self, &mut args)
 				.map_err(|msg| Error::FunctionExecution(function.name().to_string(), msg))
 				.map_err(wasmi::Trap::from)
 				.map(|v| v.map(Into::into))
-		} else if self.allow_missing_func_imports &&
-			index >= self.host_functions.len() &&
-			index < self.host_functions.len() + self.missing_functions.len()
+		} else if self.inner.allow_missing_func_imports &&
+			index >= self.inner.host_functions.len() &&
+			index < self.inner.host_functions.len() + self.inner.missing_functions.len()
 		{
 			Err(Error::from(format!(
 				"Function `{}` is only a stub. Calling a stub is not allowed.",
-				self.missing_functions[index - self.host_functions.len()],
+				self.inner.missing_functions[index - self.inner.host_functions.len()],
 			))
 			.into())
 		} else {
@@ -435,9 +522,9 @@ fn call_in_wasm_module(
 	memory: &MemoryRef,
 	method: InvokeMethod,
 	data: &[u8],
-	host_functions: &[&'static dyn Function],
+	host_functions: Arc<Vec<&'static dyn Function>>,
 	allow_missing_func_imports: bool,
-	missing_functions: &Vec<String>,
+	missing_functions: Arc<Vec<String>>,
 ) -> Result<Vec<u8>, Error> {
 	// Initialize FunctionExecutor.
 	let table: Option<TableRef> = module_instance
@@ -628,7 +715,7 @@ impl WasmModule for WasmiRuntime {
 			data_segments_snapshot: self.data_segments_snapshot.clone(),
 			host_functions: self.host_functions.clone(),
 			allow_missing_func_imports: self.allow_missing_func_imports,
-			missing_functions,
+			missing_functions: Arc::new(missing_functions),
 		}))
 	}
 }
@@ -684,7 +771,7 @@ pub struct WasmiInstance {
 	/// These stubs will error when the wasm blob trie to call them.
 	allow_missing_func_imports: bool,
 	/// List of missing functions detected during function resolution
-	missing_functions: Vec<String>,
+	missing_functions: Arc<Vec<String>>,
 }
 
 // This is safe because `WasmiInstance` does not leak any references to `self.memory` and
@@ -717,9 +804,9 @@ impl WasmInstance for WasmiInstance {
 			&self.memory,
 			method,
 			data,
-			self.host_functions.as_ref(),
+			self.host_functions.clone(),
 			self.allow_missing_func_imports,
-			self.missing_functions.as_ref(),
+			self.missing_functions.clone(),
 		)
 	}
 
diff --git a/client/executor/wasmtime/src/host.rs b/client/executor/wasmtime/src/host.rs
index ee0e82928db2..12e5ab0023ef 100644
--- a/client/executor/wasmtime/src/host.rs
+++ b/client/executor/wasmtime/src/host.rs
@@ -19,13 +19,14 @@
 //! This module defines `HostState` and `HostContext` structs which provide logic and state
 //! required for execution of host.
 
-use crate::{instance_wrapper::InstanceWrapper, util};
+use crate::instance_wrapper::InstanceWrapper;
 use codec::{Decode, Encode};
 use log::trace;
 use sc_allocator::FreeingBumpHeapAllocator;
 use sc_executor_common::{
 	error::Result,
-	sandbox::{self, SandboxCapabilities, SupervisorFuncIndex},
+	sandbox::{self, SandboxCapabilities, SandboxCapabilitiesHolder, SupervisorFuncIndex},
+	util::MemoryTransfer,
 };
 use sp_core::sandbox as sandbox_primitives;
 use sp_wasm_interface::{FunctionContext, MemoryId, Pointer, Sandbox, WordSize};
@@ -42,7 +43,12 @@ pub struct SupervisorFuncRef(Func);
 /// The state required to construct a HostContext context. The context only lasts for one host
 /// call, whereas the state is maintained for the duration of a Wasm runtime call, which may make
 /// many different host calls that must share state.
+#[derive(Clone)]
 pub struct HostState {
+	inner: Rc<Inner>,
+}
+
+struct Inner {
 	// We need some interior mutability here since the host state is shared between all host
 	// function handlers and the wasmtime backend's `impl WasmRuntime`.
 	//
@@ -61,31 +67,18 @@ impl HostState {
 	/// Constructs a new `HostState`.
 	pub fn new(allocator: FreeingBumpHeapAllocator, instance: Rc<InstanceWrapper>) -> Self {
 		HostState {
-			sandbox_store: RefCell::new(sandbox::Store::new()),
-			allocator: RefCell::new(allocator),
-			instance,
+			inner: Rc::new(Inner {
+				sandbox_store: RefCell::new(sandbox::Store::new(
+					sandbox::SandboxBackend::TryWasmer,
+				)),
+				allocator: RefCell::new(allocator),
+				instance,
+			}),
 		}
 	}
-
-	/// Materialize `HostContext` that can be used to invoke a substrate host `dyn Function`.
-	pub fn materialize<'a>(&'a self) -> HostContext<'a> {
-		HostContext(self)
-	}
 }
 
-/// A `HostContext` implements `FunctionContext` for making host calls from a Wasmtime
-/// runtime. The `HostContext` exists only for the lifetime of the call and borrows state from
-/// a longer-living `HostState`.
-pub struct HostContext<'a>(&'a HostState);
-
-impl<'a> std::ops::Deref for HostContext<'a> {
-	type Target = HostState;
-	fn deref(&self) -> &HostState {
-		self.0
-	}
-}
-
-impl<'a> SandboxCapabilities for HostContext<'a> {
+impl SandboxCapabilities for HostState {
 	type SupervisorFuncRef = SupervisorFuncRef;
 
 	fn invoke(
@@ -125,28 +118,30 @@ impl<'a> SandboxCapabilities for HostContext<'a> {
 	}
 }
 
-impl<'a> sp_wasm_interface::FunctionContext for HostContext<'a> {
+impl sp_wasm_interface::FunctionContext for HostState {
 	fn read_memory_into(
 		&self,
 		address: Pointer<u8>,
 		dest: &mut [u8],
 	) -> sp_wasm_interface::Result<()> {
-		self.instance.read_memory_into(address, dest).map_err(|e| e.to_string())
+		self.inner.instance.read_memory_into(address, dest).map_err(|e| e.to_string())
 	}
 
 	fn write_memory(&mut self, address: Pointer<u8>, data: &[u8]) -> sp_wasm_interface::Result<()> {
-		self.instance.write_memory_from(address, data).map_err(|e| e.to_string())
+		self.inner.instance.write_memory_from(address, data).map_err(|e| e.to_string())
 	}
 
 	fn allocate_memory(&mut self, size: WordSize) -> sp_wasm_interface::Result<Pointer<u8>> {
-		self.instance
-			.allocate(&mut *self.allocator.borrow_mut(), size)
+		self.inner
+			.instance
+			.allocate(&mut *self.inner.allocator.borrow_mut(), size)
 			.map_err(|e| e.to_string())
 	}
 
 	fn deallocate_memory(&mut self, ptr: Pointer<u8>) -> sp_wasm_interface::Result<()> {
-		self.instance
-			.deallocate(&mut *self.allocator.borrow_mut(), ptr)
+		self.inner
+			.instance
+			.deallocate(&mut *self.inner.allocator.borrow_mut(), ptr)
 			.map_err(|e| e.to_string())
 	}
 
@@ -155,7 +150,7 @@ impl<'a> sp_wasm_interface::FunctionContext for HostContext<'a> {
 	}
 }
 
-impl<'a> Sandbox for HostContext<'a> {
+impl Sandbox for HostState {
 	fn memory_get(
 		&mut self,
 		memory_id: MemoryId,
@@ -164,27 +159,20 @@ impl<'a> Sandbox for HostContext<'a> {
 		buf_len: WordSize,
 	) -> sp_wasm_interface::Result<u32> {
 		let sandboxed_memory =
-			self.sandbox_store.borrow().memory(memory_id).map_err(|e| e.to_string())?;
-		sandboxed_memory.with_direct_access(|sandboxed_memory| {
-			let len = buf_len as usize;
-			let src_range = match util::checked_range(offset as usize, len, sandboxed_memory.len())
-			{
-				Some(range) => range,
-				None => return Ok(sandbox_primitives::ERR_OUT_OF_BOUNDS),
-			};
-			let supervisor_mem_size = self.instance.memory_size() as usize;
-			let dst_range = match util::checked_range(buf_ptr.into(), len, supervisor_mem_size) {
-				Some(range) => range,
-				None => return Ok(sandbox_primitives::ERR_OUT_OF_BOUNDS),
-			};
-			self.instance
-				.write_memory_from(
-					Pointer::new(dst_range.start as u32),
-					&sandboxed_memory[src_range],
-				)
-				.expect("ranges are checked above; write can't fail; qed");
-			Ok(sandbox_primitives::ERR_OK)
-		})
+			self.inner.sandbox_store.borrow().memory(memory_id).map_err(|e| e.to_string())?;
+
+		let len = buf_len as usize;
+
+		let buffer = match sandboxed_memory.read(Pointer::new(offset as u32), len) {
+			Err(_) => return Ok(sandbox_primitives::ERR_OUT_OF_BOUNDS),
+			Ok(buffer) => buffer,
+		};
+
+		if let Err(_) = self.inner.instance.write_memory_from(buf_ptr, &buffer) {
+			return Ok(sandbox_primitives::ERR_OUT_OF_BOUNDS)
+		}
+
+		Ok(sandbox_primitives::ERR_OK)
 	}
 
 	fn memory_set(
@@ -195,38 +183,33 @@ impl<'a> Sandbox for HostContext<'a> {
 		val_len: WordSize,
 	) -> sp_wasm_interface::Result<u32> {
 		let sandboxed_memory =
-			self.sandbox_store.borrow().memory(memory_id).map_err(|e| e.to_string())?;
-		sandboxed_memory.with_direct_access_mut(|sandboxed_memory| {
-			let len = val_len as usize;
-			let supervisor_mem_size = self.instance.memory_size() as usize;
-			let src_range = match util::checked_range(val_ptr.into(), len, supervisor_mem_size) {
-				Some(range) => range,
-				None => return Ok(sandbox_primitives::ERR_OUT_OF_BOUNDS),
-			};
-			let dst_range = match util::checked_range(offset as usize, len, sandboxed_memory.len())
-			{
-				Some(range) => range,
-				None => return Ok(sandbox_primitives::ERR_OUT_OF_BOUNDS),
-			};
-			self.instance
-				.read_memory_into(
-					Pointer::new(src_range.start as u32),
-					&mut sandboxed_memory[dst_range],
-				)
-				.expect("ranges are checked above; read can't fail; qed");
-			Ok(sandbox_primitives::ERR_OK)
-		})
+			self.inner.sandbox_store.borrow().memory(memory_id).map_err(|e| e.to_string())?;
+
+		let len = val_len as usize;
+
+		let buffer = match self.inner.instance.read_memory(val_ptr, len) {
+			Err(_) => return Ok(sandbox_primitives::ERR_OUT_OF_BOUNDS),
+			Ok(buffer) => buffer,
+		};
+
+		if let Err(_) = sandboxed_memory.write_from(Pointer::new(offset as u32), &buffer) {
+			return Ok(sandbox_primitives::ERR_OUT_OF_BOUNDS)
+		}
+
+		Ok(sandbox_primitives::ERR_OK)
 	}
 
 	fn memory_teardown(&mut self, memory_id: MemoryId) -> sp_wasm_interface::Result<()> {
-		self.sandbox_store
+		self.inner
+			.sandbox_store
 			.borrow_mut()
 			.memory_teardown(memory_id)
 			.map_err(|e| e.to_string())
 	}
 
 	fn memory_new(&mut self, initial: u32, maximum: u32) -> sp_wasm_interface::Result<u32> {
-		self.sandbox_store
+		self.inner
+			.sandbox_store
 			.borrow_mut()
 			.new_memory(initial, maximum)
 			.map_err(|e| e.to_string())
@@ -250,9 +233,14 @@ impl<'a> Sandbox for HostContext<'a> {
 			.map(Into::into)
 			.collect::<Vec<_>>();
 
-		let instance =
-			self.sandbox_store.borrow().instance(instance_id).map_err(|e| e.to_string())?;
-		let result = instance.invoke(export_name, &args, self, state);
+		let instance = self
+			.inner
+			.sandbox_store
+			.borrow()
+			.instance(instance_id)
+			.map_err(|e| e.to_string())?;
+
+		let result = instance.invoke::<_, CapsHolder, ThunkHolder>(export_name, &args, state);
 
 		match result {
 			Ok(None) => Ok(sandbox_primitives::ERR_OK),
@@ -262,7 +250,7 @@ impl<'a> Sandbox for HostContext<'a> {
 					if val.len() > return_val_len as usize {
 						Err("Return value buffer is too small")?;
 					}
-					<HostContext as FunctionContext>::write_memory(self, return_val, val)
+					<HostState as FunctionContext>::write_memory(self, return_val, val)
 						.map_err(|_| "can't write return value")?;
 					Ok(sandbox_primitives::ERR_OK)
 				})
@@ -272,7 +260,8 @@ impl<'a> Sandbox for HostContext<'a> {
 	}
 
 	fn instance_teardown(&mut self, instance_id: u32) -> sp_wasm_interface::Result<()> {
-		self.sandbox_store
+		self.inner
+			.sandbox_store
 			.borrow_mut()
 			.instance_teardown(instance_id)
 			.map_err(|e| e.to_string())
@@ -288,6 +277,7 @@ impl<'a> Sandbox for HostContext<'a> {
 		// Extract a dispatch thunk from the instance's table by the specified index.
 		let dispatch_thunk = {
 			let table_item = self
+				.inner
 				.instance
 				.table()
 				.as_ref()
@@ -303,20 +293,26 @@ impl<'a> Sandbox for HostContext<'a> {
 			SupervisorFuncRef(func_ref)
 		};
 
-		let guest_env =
-			match sandbox::GuestEnvironment::decode(&*self.sandbox_store.borrow(), raw_env_def) {
-				Ok(guest_env) => guest_env,
-				Err(_) => return Ok(sandbox_primitives::ERR_MODULE as u32),
-			};
-
-		let instance_idx_or_err_code =
-			match sandbox::instantiate(self, dispatch_thunk, wasm, guest_env, state)
-				.map(|i| i.register(&mut *self.sandbox_store.borrow_mut()))
-			{
-				Ok(instance_idx) => instance_idx,
-				Err(sandbox::InstantiationError::StartTrapped) => sandbox_primitives::ERR_EXECUTION,
-				Err(_) => sandbox_primitives::ERR_MODULE,
-			};
+		let guest_env = match sandbox::GuestEnvironment::decode(
+			&*self.inner.sandbox_store.borrow(),
+			raw_env_def,
+		) {
+			Ok(guest_env) => guest_env,
+			Err(_) => return Ok(sandbox_primitives::ERR_MODULE as u32),
+		};
+
+		let store = &mut *self.inner.sandbox_store.borrow_mut();
+		let result = DISPATCH_THUNK.set(&dispatch_thunk, || {
+			store
+				.instantiate::<_, CapsHolder, ThunkHolder>(wasm, guest_env, state)
+				.map(|i| i.register(store))
+		});
+
+		let instance_idx_or_err_code = match result {
+			Ok(instance_idx) => instance_idx,
+			Err(sandbox::InstantiationError::StartTrapped) => sandbox_primitives::ERR_EXECUTION,
+			Err(_) => sandbox_primitives::ERR_MODULE,
+		};
 
 		Ok(instance_idx_or_err_code as u32)
 	}
@@ -326,10 +322,50 @@ impl<'a> Sandbox for HostContext<'a> {
 		instance_idx: u32,
 		name: &str,
 	) -> sp_wasm_interface::Result<Option<sp_wasm_interface::Value>> {
-		self.sandbox_store
+		self.inner
+			.sandbox_store
 			.borrow()
 			.instance(instance_idx)
 			.map(|i| i.get_global_val(name))
 			.map_err(|e| e.to_string())
 	}
 }
+
+/// Wasmtime specific implementation of `SandboxCapabilitiesHolder` that provides
+/// sandbox with a scoped thread local access to a function executor.
+/// This is a way to calm down the borrow checker since host function closures
+/// require exclusive access to it.
+struct CapsHolder;
+
+impl SandboxCapabilitiesHolder for CapsHolder {
+	type SupervisorFuncRef = SupervisorFuncRef;
+	type SC = HostState;
+
+	fn with_sandbox_capabilities<R, F: FnOnce(&mut Self::SC) -> R>(f: F) -> R {
+		crate::state_holder::with_context(|ctx| f(&mut ctx.expect("wasmtime executor is not set")))
+	}
+}
+
+/// Wasmtime specific implementation of `DispatchThunkHolder` that provides
+/// sandbox with a scoped thread local access to a dispatch thunk.
+/// This is a way to calm down the borrow checker since host function closures
+/// require exclusive access to it.
+struct ThunkHolder;
+
+scoped_tls::scoped_thread_local!(static DISPATCH_THUNK: SupervisorFuncRef);
+
+impl sandbox::DispatchThunkHolder for ThunkHolder {
+	type DispatchThunk = SupervisorFuncRef;
+
+	fn with_dispatch_thunk<R, F: FnOnce(&mut Self::DispatchThunk) -> R>(f: F) -> R {
+		assert!(DISPATCH_THUNK.is_set(), "dispatch thunk is not set");
+		DISPATCH_THUNK.with(|thunk| f(&mut thunk.clone()))
+	}
+
+	fn initialize_thunk<R, F>(s: &Self::DispatchThunk, f: F) -> R
+	where
+		F: FnOnce() -> R,
+	{
+		DISPATCH_THUNK.set(s, f)
+	}
+}
diff --git a/client/executor/wasmtime/src/imports.rs b/client/executor/wasmtime/src/imports.rs
index 0e5094db5119..b27fb944bc03 100644
--- a/client/executor/wasmtime/src/imports.rs
+++ b/client/executor/wasmtime/src/imports.rs
@@ -255,7 +255,9 @@ impl MissingHostFuncHandler {
 fn wasmtime_func_sig(func: &dyn Function) -> wasmtime::FuncType {
 	let signature = func.signature();
 	let params = signature.args.iter().cloned().map(into_wasmtime_val_type);
+
 	let results = signature.return_value.iter().cloned().map(into_wasmtime_val_type);
+
 	wasmtime::FuncType::new(params, results)
 }
 
diff --git a/client/executor/wasmtime/src/instance_wrapper.rs b/client/executor/wasmtime/src/instance_wrapper.rs
index 23a912204521..f66d62f673d9 100644
--- a/client/executor/wasmtime/src/instance_wrapper.rs
+++ b/client/executor/wasmtime/src/instance_wrapper.rs
@@ -19,11 +19,15 @@
 //! Defines data and logic needed for interaction with an WebAssembly instance of a substrate
 //! runtime module.
 
-use crate::{imports::Imports, util};
+use crate::{
+	imports::Imports,
+	util::{from_wasmtime_val, into_wasmtime_val},
+};
 
 use sc_executor_common::{
 	error::{Error, Result},
 	runtime_blob,
+	util::checked_range,
 	wasm_runtime::InvokeMethod,
 };
 use sp_wasm_interface::{Pointer, Value, WordSize};
@@ -96,12 +100,16 @@ impl EntryPoint {
 /// routines.
 pub struct InstanceWrapper {
 	instance: Instance,
+
 	// The memory instance of the `instance`.
 	//
 	// It is important to make sure that we don't make any copies of this to make it easier to
 	// proof See `memory_as_slice` and `memory_as_slice_mut`.
 	memory: Memory,
+
+	/// Indirect functions table of the module
 	table: Option<Table>,
+
 	// Make this struct explicitly !Send & !Sync.
 	_not_send_nor_sync: marker::PhantomData<*const ()>,
 }
@@ -147,7 +155,7 @@ impl InstanceWrapper {
 			None => {
 				let memory = get_linear_memory(&instance)?;
 				if !memory.grow(heap_pages).is_ok() {
-					return Err("failed top increase the linear memory size".into())
+					return Err("failed to increase the linear memory size".into())
 				}
 				memory
 			},
@@ -223,11 +231,6 @@ impl InstanceWrapper {
 		self.table.as_ref()
 	}
 
-	/// Returns the byte size of the linear memory instance attached to this instance.
-	pub fn memory_size(&self) -> u32 {
-		self.memory.data_size() as u32
-	}
-
 	/// Reads `__heap_base: i32` global variable and returns it.
 	///
 	/// If it doesn't exist, not a global or of not i32 type returns an error.
@@ -291,32 +294,45 @@ fn get_table(instance: &Instance) -> Option<Table> {
 
 /// Functions related to memory.
 impl InstanceWrapper {
-	/// Read data from a slice of memory into a destination buffer.
+	/// Read data from a slice of memory into a newly allocated buffer.
+	///
+	/// Returns an error if the read would go out of the memory bounds.
+	pub fn read_memory(&self, source_addr: Pointer<u8>, size: usize) -> Result<Vec<u8>> {
+		let range = checked_range(source_addr.into(), size, self.memory.data_size())
+			.ok_or_else(|| Error::Other("memory read is out of bounds".into()))?;
+
+		let mut buffer = vec![0; range.len()];
+		self.read_memory_into(source_addr, &mut buffer)?;
+
+		Ok(buffer)
+	}
+
+	/// Read data from the instance memory into a slice.
 	///
 	/// Returns an error if the read would go out of the memory bounds.
-	pub fn read_memory_into(&self, address: Pointer<u8>, dest: &mut [u8]) -> Result<()> {
+	pub fn read_memory_into(&self, source_addr: Pointer<u8>, dest: &mut [u8]) -> Result<()> {
 		unsafe {
 			// This should be safe since we don't grow up memory while caching this reference and
 			// we give up the reference before returning from this function.
 			let memory = self.memory_as_slice();
 
-			let range = util::checked_range(address.into(), dest.len(), memory.len())
+			let range = checked_range(source_addr.into(), dest.len(), memory.len())
 				.ok_or_else(|| Error::Other("memory read is out of bounds".into()))?;
 			dest.copy_from_slice(&memory[range]);
 			Ok(())
 		}
 	}
 
-	/// Write data to a slice of memory.
+	/// Write data to the instance memory from a slice.
 	///
 	/// Returns an error if the write would go out of the memory bounds.
-	pub fn write_memory_from(&self, address: Pointer<u8>, data: &[u8]) -> Result<()> {
+	pub fn write_memory_from(&self, dest_addr: Pointer<u8>, data: &[u8]) -> Result<()> {
 		unsafe {
 			// This should be safe since we don't grow up memory while caching this reference and
 			// we give up the reference before returning from this function.
 			let memory = self.memory_as_slice_mut();
 
-			let range = util::checked_range(address.into(), data.len(), memory.len())
+			let range = checked_range(dest_addr.into(), data.len(), memory.len())
 				.ok_or_else(|| Error::Other("memory write is out of bounds".into()))?;
 			memory[range].copy_from_slice(data);
 			Ok(())
@@ -442,11 +458,11 @@ impl runtime_blob::InstanceGlobals for InstanceWrapper {
 	}
 
 	fn get_global_value(&self, global: &Self::Global) -> Value {
-		util::from_wasmtime_val(global.get())
+		from_wasmtime_val(global.get())
 	}
 
 	fn set_global_value(&self, global: &Self::Global, value: Value) {
-		global.set(util::into_wasmtime_val(value)).expect(
+		global.set(into_wasmtime_val(value)).expect(
 			"the value is guaranteed to be of the same value; the global is guaranteed to be mutable; qed",
 		);
 	}
diff --git a/client/executor/wasmtime/src/runtime.rs b/client/executor/wasmtime/src/runtime.rs
index f80d8c8e5bd5..f6878ec5ee6e 100644
--- a/client/executor/wasmtime/src/runtime.rs
+++ b/client/executor/wasmtime/src/runtime.rs
@@ -148,7 +148,7 @@ pub struct WasmtimeInstance {
 }
 
 // This is safe because `WasmtimeInstance` does not leak reference to `self.imports`
-// and all imports don't reference any anything, other than host functions and memory
+// and all imports don't reference anything, other than host functions and memory
 unsafe impl Send for WasmtimeInstance {}
 
 impl WasmInstance for WasmtimeInstance {
diff --git a/client/executor/wasmtime/src/state_holder.rs b/client/executor/wasmtime/src/state_holder.rs
index 0e2684cd2513..45bddc841bde 100644
--- a/client/executor/wasmtime/src/state_holder.rs
+++ b/client/executor/wasmtime/src/state_holder.rs
@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::host::{HostContext, HostState};
+use crate::host::HostState;
 
 scoped_tls::scoped_thread_local!(static HOST_STATE: HostState);
 
@@ -36,10 +36,10 @@ where
 /// context will be `None`.
 pub fn with_context<R, F>(f: F) -> R
 where
-	F: FnOnce(Option<HostContext>) -> R,
+	F: FnOnce(Option<HostState>) -> R,
 {
 	if !HOST_STATE.is_set() {
 		return f(None)
 	}
-	HOST_STATE.with(|state| f(Some(state.materialize())))
+	HOST_STATE.with(|state| f(Some(state.clone())))
 }
diff --git a/client/executor/wasmtime/src/util.rs b/client/executor/wasmtime/src/util.rs
index 3109a76a9af8..2c135fe7a343 100644
--- a/client/executor/wasmtime/src/util.rs
+++ b/client/executor/wasmtime/src/util.rs
@@ -16,21 +16,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use std::ops::Range;
-
 use sp_wasm_interface::Value;
 
-/// Construct a range from an offset to a data length after the offset.
-/// Returns None if the end of the range would exceed some maximum offset.
-pub fn checked_range(offset: usize, len: usize, max: usize) -> Option<Range<usize>> {
-	let end = offset.checked_add(len)?;
-	if end <= max {
-		Some(offset..end)
-	} else {
-		None
-	}
-}
-
 /// Converts a [`wasmtime::Val`] into a substrate runtime interface [`Value`].
 ///
 /// Panics if the given value doesn't have a corresponding variant in `Value`.

From 74e839b8690725873423885bef2e0af7d878fc6e Mon Sep 17 00:00:00 2001
From: Wei Tang <wei@that.world>
Date: Thu, 19 Aug 2021 17:57:59 +0000
Subject: [PATCH 1096/1194] Do not implement () for Contains (#9582)

---
 frame/support/src/traits/members.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frame/support/src/traits/members.rs b/frame/support/src/traits/members.rs
index 35405e44731d..a59869c2fc9a 100644
--- a/frame/support/src/traits/members.rs
+++ b/frame/support/src/traits/members.rs
@@ -56,7 +56,7 @@ impl<T, C: Contains<T>> Filter<T> for C {
 	}
 }
 
-#[impl_trait_for_tuples::impl_for_tuples(30)]
+#[impl_trait_for_tuples::impl_for_tuples(1, 30)]
 impl<T> Contains<T> for Tuple {
 	fn contains(t: &T) -> bool {
 		for_tuples!( #(

From c6c912cfce1c759ffb64a991bb07974a98edd89f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Aug 2021 18:13:05 +0000
Subject: [PATCH 1097/1194] Bump bitflags from 1.2.1 to 1.3.2 (#9568)

Bumps [bitflags](https://github.com/bitflags/bitflags) from 1.2.1 to 1.3.2.
- [Release notes](https://github.com/bitflags/bitflags/releases)
- [Changelog](https://github.com/bitflags/bitflags/blob/main/CHANGELOG.md)
- [Commits](https://github.com/bitflags/bitflags/compare/1.2.1...1.3.2)

---
updated-dependencies:
- dependency-name: bitflags
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                 | 4 ++--
 client/network/Cargo.toml  | 2 +-
 frame/contracts/Cargo.toml | 2 +-
 frame/support/Cargo.toml   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 19d2062b0afd..72b430cfc9b1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -529,9 +529,9 @@ dependencies = [
 
 [[package]]
 name = "bitflags"
-version = "1.2.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitvec"
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index cef1afc954e3..7777f55d93b1 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -19,7 +19,7 @@ prost-build = "0.7"
 [dependencies]
 async-trait = "0.1"
 async-std = "1.6.5"
-bitflags = "1.2.0"
+bitflags = "1.3.2"
 cid = "0.6.0"
 bytes = "1"
 codec = { package = "parity-scale-codec", version = "2.0.0", features = [
diff --git a/frame/contracts/Cargo.toml b/frame/contracts/Cargo.toml
index ce4ae872369e..98e8e92e3b9d 100644
--- a/frame/contracts/Cargo.toml
+++ b/frame/contracts/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-bitflags = "1.0"
+bitflags = "1.3"
 codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = [
 	"derive",
 	"max-encoded-len",
diff --git a/frame/support/Cargo.toml b/frame/support/Cargo.toml
index ed3a2f45a2e1..9b515c3aa84a 100644
--- a/frame/support/Cargo.toml
+++ b/frame/support/Cargo.toml
@@ -28,7 +28,7 @@ frame-support-procedural = { version = "4.0.0-dev", default-features = false, pa
 paste = "1.0"
 once_cell = { version = "1", default-features = false, optional = true }
 sp-state-machine = { version = "0.10.0-dev", optional = true, path = "../../primitives/state-machine" }
-bitflags = "1.2"
+bitflags = "1.3"
 impl-trait-for-tuples = "0.2.1"
 smallvec = "1.4.1"
 log = { version = "0.4.14", default-features = false }

From 32f46ea3df7533b55fd9472c16b9f85fbdac53b8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Aug 2021 19:23:20 +0000
Subject: [PATCH 1098/1194] Bump prost from 0.7.0 to 0.8.0 (#9560)

Bumps [prost](https://github.com/tokio-rs/prost) from 0.7.0 to 0.8.0.
- [Release notes](https://github.com/tokio-rs/prost/releases)
- [Commits](https://github.com/tokio-rs/prost/compare/v0.7.0...v0.8.0)

---
updated-dependencies:
- dependency-name: prost
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                            | 4 ++--
 client/authority-discovery/Cargo.toml | 2 +-
 client/network/Cargo.toml             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 72b430cfc9b1..91471c5b3124 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7336,7 +7336,7 @@ dependencies = [
  "libp2p",
  "log 0.4.14",
  "parity-scale-codec",
- "prost 0.7.0",
+ "prost 0.8.0",
  "prost-build 0.7.0",
  "quickcheck",
  "rand 0.7.3",
@@ -8001,7 +8001,7 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.11.1",
  "pin-project 1.0.5",
- "prost 0.7.0",
+ "prost 0.8.0",
  "prost-build 0.7.0",
  "quickcheck",
  "rand 0.7.3",
diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml
index 2b8ac25dde87..8625fa3eb2e0 100644
--- a/client/authority-discovery/Cargo.toml
+++ b/client/authority-discovery/Cargo.toml
@@ -26,7 +26,7 @@ ip_network = "0.4.0"
 libp2p = { version = "0.39.1", default-features = false, features = ["kad"] }
 log = "0.4.8"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0" }
-prost = "0.7"
+prost = "0.8"
 rand = "0.7.2"
 sc-client-api = { version = "4.0.0-dev", path = "../api" }
 sc-network = { version = "0.10.0-dev", path = "../network" }
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index 7777f55d93b1..34c2b6972eec 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -41,7 +41,7 @@ log = "0.4.8"
 parking_lot = "0.11.1"
 pin-project = "1.0.4"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.9.0", path = "../../utils/prometheus" }
-prost = "0.7"
+prost = "0.8"
 rand = "0.7.2"
 sc-block-builder = { version = "0.10.0-dev", path = "../block-builder" }
 sc-client-api = { version = "4.0.0-dev", path = "../api" }

From 7e44628a345137872ac7be5f88a383f5c45329ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Aug 2021 19:43:39 +0000
Subject: [PATCH 1099/1194] Bump directories from 3.0.1 to 3.0.2 (#9589)

Bumps [directories](https://github.com/soc/directories-rs) from 3.0.1 to 3.0.2.
- [Release notes](https://github.com/soc/directories-rs/releases)
- [Commits](https://github.com/soc/directories-rs/commits)

---
updated-dependencies:
- dependency-name: directories
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                | 35 ++++++-----------------------------
 client/service/Cargo.toml |  2 +-
 2 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 91471c5b3124..33ad43a4eca8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1502,9 +1502,9 @@ dependencies = [
 
 [[package]]
 name = "directories"
-version = "3.0.1"
+version = "3.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8fed639d60b58d0f53498ab13d26f621fd77569cc6edb031f4cc36a2ad9da0f"
+checksum = "e69600ff1703123957937708eb27f7a564e48885c537782722ed0ba3189ce1d7"
 dependencies = [
  "dirs-sys",
 ]
@@ -1521,12 +1521,12 @@ dependencies = [
 
 [[package]]
 name = "dirs-sys"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a"
+checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780"
 dependencies = [
  "libc",
- "redox_users 0.3.5",
+ "redox_users",
  "winapi 0.3.9",
 ]
 
@@ -1537,7 +1537,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
 dependencies = [
  "libc",
- "redox_users 0.4.0",
+ "redox_users",
  "winapi 0.3.9",
 ]
 
@@ -7004,17 +7004,6 @@ dependencies = [
  "bitflags",
 ]
 
-[[package]]
-name = "redox_users"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
-dependencies = [
- "getrandom 0.1.16",
- "redox_syscall 0.1.57",
- "rust-argon2",
-]
-
 [[package]]
 name = "redox_users"
 version = "0.4.0"
@@ -7175,18 +7164,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "rust-argon2"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb"
-dependencies = [
- "base64 0.13.0",
- "blake2b_simd",
- "constant_time_eq",
- "crossbeam-utils 0.8.3",
-]
-
 [[package]]
 name = "rustc-demangle"
 version = "0.1.18"
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index d0d85a554968..fe94d57d96e8 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -82,7 +82,7 @@ async-trait = "0.1.50"
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
 tempfile = "3.1.0"
-directories = "3.0.1"
+directories = "3.0.2"
 
 [dev-dependencies]
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }

From bd2e5f361a1dce513998ff1aeec9f2ace85b6da1 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Fri, 20 Aug 2021 12:09:04 +0100
Subject: [PATCH 1100/1194] Show storage info in the raw benchmark output.
 (#9588)

---
 utils/frame/benchmarking-cli/src/command.rs | 16 ++++++++++++++++
 utils/frame/benchmarking-cli/src/lib.rs     |  7 +++++++
 utils/frame/benchmarking-cli/src/writer.rs  |  2 +-
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/utils/frame/benchmarking-cli/src/command.rs b/utils/frame/benchmarking-cli/src/command.rs
index 05e380a37ee7..5efa970d9358 100644
--- a/utils/frame/benchmarking-cli/src/command.rs
+++ b/utils/frame/benchmarking-cli/src/command.rs
@@ -407,6 +407,20 @@ impl BenchmarkCmd {
 				println!();
 			}
 
+			if !self.no_storage_info {
+				let mut comments: Vec<String> = Default::default();
+				crate::writer::add_storage_comments(
+					&mut comments,
+					&batch.db_results,
+					&storage_info,
+				);
+				println!("Raw Storage Info\n========");
+				for comment in comments {
+					println!("{}", comment);
+				}
+				println!("");
+			}
+
 			// Conduct analysis.
 			if !self.no_median_slopes {
 				println!("Median Slopes Analysis\n========");
@@ -425,6 +439,7 @@ impl BenchmarkCmd {
 				{
 					println!("Writes = {:?}", analysis);
 				}
+				println!("");
 			}
 			if !self.no_min_squares {
 				println!("Min Squares Analysis\n========");
@@ -443,6 +458,7 @@ impl BenchmarkCmd {
 				{
 					println!("Writes = {:?}", analysis);
 				}
+				println!("");
 			}
 		}
 
diff --git a/utils/frame/benchmarking-cli/src/lib.rs b/utils/frame/benchmarking-cli/src/lib.rs
index cd314adebe89..316ddfb8d0c1 100644
--- a/utils/frame/benchmarking-cli/src/lib.rs
+++ b/utils/frame/benchmarking-cli/src/lib.rs
@@ -141,4 +141,11 @@ pub struct BenchmarkCmd {
 	/// When nothing is provided, we list all benchmarks.
 	#[structopt(long)]
 	pub list: bool,
+
+	/// If enabled, the storage info is not displayed in the output next to the analysis.
+	///
+	/// This is independent of the storage info appearing in the *output file*. Use a Handlebar
+	/// template for that purpose.
+	#[structopt(long)]
+	pub no_storage_info: bool,
 }
diff --git a/utils/frame/benchmarking-cli/src/writer.rs b/utils/frame/benchmarking-cli/src/writer.rs
index ae3e2dc0966f..b6b97f251774 100644
--- a/utils/frame/benchmarking-cli/src/writer.rs
+++ b/utils/frame/benchmarking-cli/src/writer.rs
@@ -357,7 +357,7 @@ pub fn write_results(
 // This function looks at the keys touched during the benchmark, and the storage info we collected
 // from the pallets, and creates comments with information about the storage keys touched during
 // each benchmark.
-fn add_storage_comments(
+pub(crate) fn add_storage_comments(
 	comments: &mut Vec<String>,
 	results: &[BenchmarkResult],
 	storage_info: &[StorageInfo],

From 7ef1c0047d85ba3d259a942061c838c25c205cd0 Mon Sep 17 00:00:00 2001
From: Roman <humbug@deeptown.org>
Date: Fri, 20 Aug 2021 15:35:40 +0300
Subject: [PATCH 1101/1194] Change unhandled Kademlia events from warn to debug
 (#9599)

---
 client/network/src/discovery.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/network/src/discovery.rs b/client/network/src/discovery.rs
index 594f824f3c94..f8edd0203342 100644
--- a/client/network/src/discovery.rs
+++ b/client/network/src/discovery.rs
@@ -812,7 +812,7 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 						},
 						// We never start any other type of query.
 						e => {
-							warn!(target: "sub-libp2p", "Libp2p => Unhandled Kademlia event: {:?}", e)
+							debug!(target: "sub-libp2p", "Libp2p => Unhandled Kademlia event: {:?}", e)
 						},
 					},
 					NetworkBehaviourAction::DialAddress { address } =>

From 436d67100ca983ce2cf866c65bc187a6d41c149b Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Fri, 20 Aug 2021 19:41:21 +0100
Subject: [PATCH 1102/1194] Display warning on try-runtime spec_name mismatch
 (#9593)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Display warning on try-runtime version mismatch

* detect spec-name mismatch in try-runtime

* Update utils/frame/try-runtime/cli/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update utils/frame/try-runtime/cli/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update utils/frame/remote-externalities/src/rpc_api.rs

Co-authored-by: Chevdor <chevdor@users.noreply.github.com>

* remove unused import

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: Chevdor <chevdor@users.noreply.github.com>
---
 Cargo.lock                                    |  1 +
 utils/frame/remote-externalities/Cargo.toml   |  1 +
 .../frame/remote-externalities/src/rpc_api.rs | 21 ++++++++++
 utils/frame/try-runtime/cli/src/lib.rs        | 39 ++++++++++++++++++-
 4 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 33ad43a4eca8..0e7fce2b8d1a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7101,6 +7101,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
+ "sp-version",
  "tokio 0.2.25",
 ]
 
diff --git a/utils/frame/remote-externalities/Cargo.toml b/utils/frame/remote-externalities/Cargo.toml
index c799e30d6a24..f849c89d7053 100644
--- a/utils/frame/remote-externalities/Cargo.toml
+++ b/utils/frame/remote-externalities/Cargo.toml
@@ -27,6 +27,7 @@ serde = "1.0.126"
 sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
 sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
 sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
+sp-version = { version = "4.0.0-dev", path = "../../../primitives/version" }
 
 [dev-dependencies]
 tokio = { version = "0.2", features = ["macros", "rt-threaded"] }
diff --git a/utils/frame/remote-externalities/src/rpc_api.rs b/utils/frame/remote-externalities/src/rpc_api.rs
index be77cd949919..24050856a96a 100644
--- a/utils/frame/remote-externalities/src/rpc_api.rs
+++ b/utils/frame/remote-externalities/src/rpc_api.rs
@@ -88,3 +88,24 @@ async fn build_client<S: AsRef<str>>(from: S) -> Result<WsClient, String> {
 		.await
 		.map_err(|e| format!("`WsClientBuilder` failed to build: {:?}", e))
 }
+
+/// Get the runtime version of a given chain.
+pub async fn get_runtime_version<Block, S>(
+	from: S,
+	at: Option<Block::Hash>,
+) -> Result<sp_version::RuntimeVersion, String>
+where
+	S: AsRef<str>,
+	Block: BlockT + serde::de::DeserializeOwned,
+	Block::Header: HeaderT,
+{
+	let params = if let Some(at) = at { vec![hash_to_json::<Block>(at)?] } else { vec![] };
+	let client = build_client(from).await?;
+	client
+		.request::<sp_version::RuntimeVersion>(
+			"state_getRuntimeVersion",
+			JsonRpcParams::Array(params),
+		)
+		.await
+		.map_err(|e| format!("state_getRuntimeVersion request failed: {:?}", e))
+}
diff --git a/utils/frame/try-runtime/cli/src/lib.rs b/utils/frame/try-runtime/cli/src/lib.rs
index 047829d94da6..c92c3959535e 100644
--- a/utils/frame/try-runtime/cli/src/lib.rs
+++ b/utils/frame/try-runtime/cli/src/lib.rs
@@ -179,7 +179,7 @@ async fn on_runtime_upgrade<Block, ExecDispatch>(
 	config: Configuration,
 ) -> sc_cli::Result<()>
 where
-	Block: BlockT,
+	Block: BlockT + serde::de::DeserializeOwned,
 	Block::Hash: FromStr,
 	<Block::Hash as FromStr>::Err: Debug,
 	NumberFor<Block>: FromStr,
@@ -198,6 +198,8 @@ where
 		max_runtime_instances,
 	);
 
+	check_spec_name::<Block>(shared.url.clone(), config.chain_spec.name().to_string()).await;
+
 	let ext = {
 		let builder = match command.state {
 			State::Snap { snapshot_path } =>
@@ -254,7 +256,7 @@ async fn offchain_worker<Block, ExecDispatch>(
 	config: Configuration,
 ) -> sc_cli::Result<()>
 where
-	Block: BlockT,
+	Block: BlockT + serde::de::DeserializeOwned,
 	Block::Hash: FromStr,
 	Block::Header: serde::de::DeserializeOwned,
 	<Block::Hash as FromStr>::Err: Debug,
@@ -274,6 +276,8 @@ where
 		max_runtime_instances,
 	);
 
+	check_spec_name::<Block>(shared.url.clone(), config.chain_spec.name().to_string()).await;
+
 	let mode = match command.state {
 		State::Live { snapshot_path, modules } => {
 			let at = shared.block_at::<Block>()?;
@@ -361,6 +365,8 @@ where
 	let block_hash = shared.block_at::<Block>()?;
 	let block: Block = rpc_api::get_block::<Block, _>(shared.url.clone(), block_hash).await?;
 
+	check_spec_name::<Block>(shared.url.clone(), config.chain_spec.name().to_string()).await;
+
 	let mode = match command.state {
 		State::Snap { snapshot_path } => {
 			let mode =
@@ -484,3 +490,32 @@ fn extract_code(spec: Box<dyn ChainSpec>) -> sc_cli::Result<(StorageKey, Storage
 
 	Ok((code_key, code))
 }
+
+/// Check the spec_name of an `ext`
+///
+/// If the version does not exist, or if it does not match with the given, it emits a warning.
+async fn check_spec_name<Block: BlockT + serde::de::DeserializeOwned>(
+	uri: String,
+	expected_spec_name: String,
+) {
+	let expected_spec_name = expected_spec_name.to_lowercase();
+	match remote_externalities::rpc_api::get_runtime_version::<Block, _>(uri.clone(), None)
+		.await
+		.map(|version| String::from(version.spec_name.clone()))
+		.map(|spec_name| spec_name.to_lowercase())
+	{
+		Ok(spec) if spec == expected_spec_name => {
+			log::debug!("found matching spec name: {:?}", spec);
+		},
+		Ok(spec) => {
+			log::warn!(
+				"version mismatch: remote spec name: '{}', expected (local chain spec, aka. `--chain`): '{}'",
+				spec,
+				expected_spec_name,
+			);
+		},
+		Err(why) => {
+			log::error!("failed to fetch runtime version from {}: {:?}", uri, why);
+		},
+	}
+}

From 120793475f3fee4cee462ebd36196435a46e20ff Mon Sep 17 00:00:00 2001
From: Ayomide Onigbinde <onigbindeayomide@gmail.com>
Date: Sun, 22 Aug 2021 16:02:19 +0100
Subject: [PATCH 1103/1194] continue in pow loop instead of returning (#9539)

* continue in pow loop instead of returning

* change other return statements, add logs

* remove redundant logs

* formatting fix

* remove log

* Add some commas to make rustfmt happy

Co-authored-by: Wei Tang <accounts@that.world>
Co-authored-by: Wei Tang <wei@that.world>
---
 client/consensus/pow/src/lib.rs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/client/consensus/pow/src/lib.rs b/client/consensus/pow/src/lib.rs
index 1b8a62256689..1f5781434ef7 100644
--- a/client/consensus/pow/src/lib.rs
+++ b/client/consensus/pow/src/lib.rs
@@ -560,7 +560,7 @@ where
 			if sync_oracle.is_major_syncing() {
 				debug!(target: "pow", "Skipping proposal due to sync.");
 				worker.lock().on_major_syncing();
-				return
+				continue
 			}
 
 			let best_header = match select_chain.best_chain().await {
@@ -572,7 +572,7 @@ where
 						 Select best chain error: {:?}",
 						err
 					);
-					return
+					continue
 				},
 			};
 			let best_hash = best_header.hash();
@@ -584,11 +584,11 @@ where
 					 Probably a node update is required!",
 					err,
 				);
-				return
+				continue
 			}
 
 			if worker.lock().best_hash() == Some(best_hash) {
-				return
+				continue
 			}
 
 			// The worker is locked for the duration of the whole proposing period. Within this
@@ -603,7 +603,7 @@ where
 						 Fetch difficulty failed: {:?}",
 						err,
 					);
-					return
+					continue
 				},
 			};
 
@@ -619,7 +619,7 @@ where
 						 Creating inherent data providers failed: {:?}",
 						err,
 					);
-					return
+					continue
 				},
 			};
 
@@ -632,7 +632,7 @@ where
 						 Creating inherent data failed: {:?}",
 						e,
 					);
-					return
+					continue
 				},
 			};
 
@@ -652,7 +652,7 @@ where
 						 Creating proposer failed: {:?}",
 						err,
 					);
-					return
+					continue
 				},
 			};
 
@@ -668,7 +668,7 @@ where
 						 Creating proposal failed: {:?}",
 						err,
 					);
-					return
+					continue
 				},
 			};
 

From 60fd8cd0c9d8247070364fd923d5caf1f6f7ccda Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Mon, 23 Aug 2021 11:16:54 +0200
Subject: [PATCH 1104/1194] Remove spurious debug_assert! (#9603)

---
 client/service/src/builder.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index fb83fdb00ca4..dea995363319 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -1026,7 +1026,6 @@ where
 	// future using `spawn_blocking`.
 	spawn_handle.spawn_blocking("network-worker", async move {
 		if network_start_rx.await.is_err() {
-			debug_assert!(false);
 			log::warn!(
 				"The NetworkStart returned as part of `build_network` has been silently dropped"
 			);

From 60c6ec78ef14bb7fdab50141c0071629c33c8415 Mon Sep 17 00:00:00 2001
From: Zeke Mostov <32168567+emostov@users.noreply.github.com>
Date: Mon, 23 Aug 2021 17:15:27 -0700
Subject: [PATCH 1105/1194] pallet-vesting: Support multiple, merge-able
 vesting schedules (#9202)

* Support multiple, mergable vesting schedules

* Update node runtime

* Remove some TODO design questions and put them as commennts

* Update frame/vesting/src/benchmarking.rs

* Syntax and comment clean up

* Create filter enum for removing schedules

* Dry vesting calls with do_vest

* Improve old benchmarks to account for max schedules

* Update WeightInfo trait and make dummy fns

* Add merge_schedule weights

* Explicitly test multiple vesting scheudles

* Make new vesting tests more more clear

* Apply suggestions from code review

* Update remove_vesting_schedule to error with no index

* Try reduce spacing diff

* Apply suggestions from code review

* Use get on vesting for bounds check; check origin first

* No filter tuple; various simplifications

* unwrap or default when getting user schedules

* spaces be gone

* ReadMe fixes

* Update frame/vesting/src/lib.rs

Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>

* address some comments for docs

* merge sched docs

* Apply suggestions from code review

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* log error when trying to push to vesting vec

* use let Some, not is_some

* remove_vesting_schedule u32, not optin

* new not try_new, create validate builder; VestingInfo

* Merge prep: break out tests and mock

* Add files forgot to include in merge

* revert some accidental changes to merged files

* Revert remaining accidental file changes

* More revert of accidental file change

* Try to reduce diff on tests

* namespace Vesting; check key when key should not exist;

* ending_block throws error on per_block of 0

* Try improve merge vesting info comment

* Update frame/vesting/src/lib.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* add validate + correct; handle duration > blocknumber

* Move vesting_info module to its own file

* Seperate Vesting/locks updates from writing

* Add can_add_vesting schedule

* Adjust min vested transfer to be greater than all ED

* Initial integrity test impl

* merge_finished_and_yet_to_be_started_schedules

* Make sure to assert storage items are cleaned up

* Migration initial impl (not tested)

* Correct try-runtime hooks

* Apply suggestions from code review

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* header

* WIP: improve benchmarks

* Benchmarking working

* benchmarking: step over max schedules

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_vesting --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/vesting/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Simplify APIs by accepting vec; convert to bounded on write

* Test:  build_genesis_has_storage_version_v1

* Test more error cases

* Hack to get polkadot weights to work; should revert later

* Improve benchmarking; works on polkadot

* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_vesting --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/vesting/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* WIP override storage

* Set storage not working example

* Remove unused tests

* VestingInfo: make public, derive MaxEndcodedLen

* Rename ending_block to ending_block_as_balance

* Superificial improvements

* Check for end block infinite, not just duration

* More superficial update

* Update tests

* Test vest with multi schedule

* Don't use half max balance in benchmarks

* Use debug_assert when locked is unexpected 0

* Implement exec_action

* Simplify per_block calc in vesting_info

* VestingInfo.validate in add_vesting_schedule & can_add_vesting_schedule

* Simplify post migrate check

* Remove merge event

* Minor benchmarking updates

* Remove VestingInfo.correct

* per_block accesor max with 1

* Improve comment

* Remoe debug

* Fix add schedule comment

* Apply suggestions from code review

Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>

* no ref for should_remove param

* Remove unused vestingaction derive

* Asserts to show balance unlock in merge benchmark

* Remove unused imports

* trivial

* Fix benchmark asserts to handle non-multiple of 20 locked

* Add generate_storage_info

* migration :facepalm

* Remove per_block 0 logic

* Update frame/vesting/src/lib.rs

* Do not check for ending later than greatest block

* Apply suggestions from code review

* Benchmarks: simplify vesting schedule creation

* Add log back for migration

* Add note in ext docs explaining that all schedules will vest

* Make integrity test work

* Improve integrity test

* Remove unnescary type param from VestingInfo::new

* Remove unnescary resut for ending_block_as_balance

* Remove T param from ending_block_as_balance

* Reduce visibility of raw_per_block

* Remove unused type param for validate

* update old comment

* Make log a dep; log warn in migrate

* VestingInfo.validate returns Err(()), no T type param

* Try improve report_schedule_updates

* is_valid, not validate

* revert node runtime reorg;

* change schedule validity check to just warning

* Simplify merge_vesting_info return type

* Apply suggestions from code review

* Apply suggestions from code review

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Add warning for migration

* Fix indentation

* Delete duplicate warnings

* Reduce diff in node runtime

* Fix benchmark build

* Upgrade cargo.toml to use 4.0.0-dev

* Cleanup

* MaxVestingSchedulesGetter initial impl

* MinVestedTransfer getter inintial impl

* Test MaxVestingSchedules & MinVestedTransfer getters; use getters in benchmarks

* Run cargo fmt

* Revert MinVestedTransfer & MaxVestingSchedules getters; Add integrity test

* Make MAX_VESTING_SCHEDULES a const

* fmt

* WIP: benchmark improvements

* Finish benchmark update

* Add test for transfer to account with less than ed

* Rm min_new_account_transfer; move sp-io to dev-dep

* Reduce cargo.toml diff

* Explain MAX_VESTING_SCHEDULES choice

* Fix after merge

* Try fix CI complaints

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_vesting --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/vesting/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_vesting --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/vesting/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* fmt

* trigger

* fmt

Co-authored-by: Parity Bot <admin@parity.io>
Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Co-authored-by: kianenigma <kian@parity.io>
---
 Cargo.lock                                    |    1 +
 bin/node/runtime/src/lib.rs                   |    3 +
 .../src/traits/tokens/currency/lockable.rs    |   14 +-
 frame/vesting/Cargo.toml                      |    3 +-
 frame/vesting/src/benchmarking.rs             |  269 ++++-
 frame/vesting/src/lib.rs                      |  581 ++++++++--
 frame/vesting/src/migrations.rs               |   95 ++
 frame/vesting/src/mock.rs                     |   29 +-
 frame/vesting/src/tests.rs                    | 1026 +++++++++++++++--
 frame/vesting/src/vesting_info.rs             |  114 ++
 frame/vesting/src/weights.rs                  |  200 +++-
 11 files changed, 1981 insertions(+), 354 deletions(-)
 create mode 100644 frame/vesting/src/migrations.rs
 create mode 100644 frame/vesting/src/vesting_info.rs

diff --git a/Cargo.lock b/Cargo.lock
index 0e7fce2b8d1a..f02cafd76f0d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5898,6 +5898,7 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "log 0.4.14",
  "pallet-balances",
  "parity-scale-codec",
  "sp-core",
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index e690ce8a3b3a..909ff931756a 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -1062,6 +1062,9 @@ impl pallet_vesting::Config for Runtime {
 	type BlockNumberToBalance = ConvertInto;
 	type MinVestedTransfer = MinVestedTransfer;
 	type WeightInfo = pallet_vesting::weights::SubstrateWeight<Runtime>;
+	// `VestingInfo` encode length is 36bytes. 28 schedules gets encoded as 1009 bytes, which is the
+	// highest number of schedules that encodes less than 2^10.
+	const MAX_VESTING_SCHEDULES: u32 = 28;
 }
 
 impl pallet_mmr::Config for Runtime {
diff --git a/frame/support/src/traits/tokens/currency/lockable.rs b/frame/support/src/traits/tokens/currency/lockable.rs
index 94bce216dcbc..26463864a647 100644
--- a/frame/support/src/traits/tokens/currency/lockable.rs
+++ b/frame/support/src/traits/tokens/currency/lockable.rs
@@ -80,8 +80,8 @@ pub trait VestingSchedule<AccountId> {
 
 	/// Adds a vesting schedule to a given account.
 	///
-	/// If there already exists a vesting schedule for the given account, an `Err` is returned
-	/// and nothing is updated.
+	/// If the account has `MaxVestingSchedules`, an Error is returned and nothing
+	/// is updated.
 	///
 	/// Is a no-op if the amount to be vested is zero.
 	///
@@ -93,8 +93,16 @@ pub trait VestingSchedule<AccountId> {
 		starting_block: Self::Moment,
 	) -> DispatchResult;
 
+	/// Checks if `add_vesting_schedule` would work against `who`.
+	fn can_add_vesting_schedule(
+		who: &AccountId,
+		locked: <Self::Currency as Currency<AccountId>>::Balance,
+		per_block: <Self::Currency as Currency<AccountId>>::Balance,
+		starting_block: Self::Moment,
+	) -> DispatchResult;
+
 	/// Remove a vesting schedule for a given account.
 	///
 	/// NOTE: This doesn't alter the free balance of the account.
-	fn remove_vesting_schedule(who: &AccountId);
+	fn remove_vesting_schedule(who: &AccountId, schedule_index: u32) -> DispatchResult;
 }
diff --git a/frame/vesting/Cargo.toml b/frame/vesting/Cargo.toml
index 9d818d7a33de..96af259959c3 100644
--- a/frame/vesting/Cargo.toml
+++ b/frame/vesting/Cargo.toml
@@ -21,9 +21,10 @@ sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../pr
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
+log = { version = "0.4.0", default-features = false  }
 
 [dev-dependencies]
-sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 
diff --git a/frame/vesting/src/benchmarking.rs b/frame/vesting/src/benchmarking.rs
index fba4369dba9d..5cdc14c8fdac 100644
--- a/frame/vesting/src/benchmarking.rs
+++ b/frame/vesting/src/benchmarking.rs
@@ -19,12 +19,12 @@
 
 #![cfg(feature = "runtime-benchmarks")]
 
-use super::*;
-
 use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, whitelisted_caller};
+use frame_support::assert_ok;
 use frame_system::{Pallet as System, RawOrigin};
-use sp_runtime::traits::Bounded;
+use sp_runtime::traits::{Bounded, CheckedDiv, CheckedMul};
 
+use super::*;
 use crate::Pallet as Vesting;
 
 const SEED: u32 = 0;
@@ -35,42 +35,63 @@ type BalanceOf<T> =
 fn add_locks<T: Config>(who: &T::AccountId, n: u8) {
 	for id in 0..n {
 		let lock_id = [id; 8];
-		let locked = 100u32;
+		let locked = 256u32;
 		let reasons = WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE;
 		T::Currency::set_lock(lock_id, who, locked.into(), reasons);
 	}
 }
 
-fn add_vesting_schedule<T: Config>(who: &T::AccountId) -> Result<(), &'static str> {
-	let locked = 100u32;
-	let per_block = 10u32;
+fn add_vesting_schedules<T: Config>(
+	target: <T::Lookup as StaticLookup>::Source,
+	n: u32,
+) -> Result<BalanceOf<T>, &'static str> {
+	let min_transfer = T::MinVestedTransfer::get();
+	let locked = min_transfer.checked_mul(&20u32.into()).unwrap();
+	// Schedule has a duration of 20.
+	let per_block = min_transfer;
 	let starting_block = 1u32;
 
-	System::<T>::set_block_number(0u32.into());
+	let source: T::AccountId = account("source", 0, SEED);
+	let source_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(source.clone());
+	T::Currency::make_free_balance_be(&source, BalanceOf::<T>::max_value());
+
+	System::<T>::set_block_number(T::BlockNumber::zero());
+
+	let mut total_locked: BalanceOf<T> = Zero::zero();
+	for _ in 0..n {
+		total_locked += locked;
+
+		let schedule = VestingInfo::new(locked, per_block, starting_block.into());
+		assert_ok!(Vesting::<T>::do_vested_transfer(
+			source_lookup.clone(),
+			target.clone(),
+			schedule
+		));
+
+		// Top up to guarantee we can always transfer another schedule.
+		T::Currency::make_free_balance_be(&source, BalanceOf::<T>::max_value());
+	}
 
-	// Add schedule to avoid `NotVesting` error.
-	Vesting::<T>::add_vesting_schedule(
-		&who,
-		locked.into(),
-		per_block.into(),
-		starting_block.into(),
-	)?;
-	Ok(())
+	Ok(total_locked.into())
 }
 
 benchmarks! {
 	vest_locked {
-		let l in 0 .. MaxLocksOf::<T>::get();
+		let l in 0 .. MaxLocksOf::<T>::get() - 1;
+		let s in 1 .. T::MAX_VESTING_SCHEDULES;
+
+		let caller: T::AccountId = whitelisted_caller();
+		let caller_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(caller.clone());
+		T::Currency::make_free_balance_be(&caller, T::Currency::minimum_balance());
 
-		let caller = whitelisted_caller();
-		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 		add_locks::<T>(&caller, l as u8);
-		add_vesting_schedule::<T>(&caller)?;
+		let expected_balance = add_vesting_schedules::<T>(caller_lookup, s)?;
+
 		// At block zero, everything is vested.
-		System::<T>::set_block_number(T::BlockNumber::zero());
+		assert_eq!(System::<T>::block_number(), T::BlockNumber::zero());
 		assert_eq!(
 			Vesting::<T>::vesting_balance(&caller),
-			Some(100u32.into()),
+			Some(expected_balance.into()),
 			"Vesting schedule not added",
 		);
 	}: vest(RawOrigin::Signed(caller.clone()))
@@ -78,20 +99,24 @@ benchmarks! {
 		// Nothing happened since everything is still vested.
 		assert_eq!(
 			Vesting::<T>::vesting_balance(&caller),
-			Some(100u32.into()),
+			Some(expected_balance.into()),
 			"Vesting schedule was removed",
 		);
 	}
 
 	vest_unlocked {
-		let l in 0 .. MaxLocksOf::<T>::get();
+		let l in 0 .. MaxLocksOf::<T>::get() - 1;
+		let s in 1 .. T::MAX_VESTING_SCHEDULES;
+
+		let caller: T::AccountId = whitelisted_caller();
+		let caller_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(caller.clone());
+		T::Currency::make_free_balance_be(&caller, T::Currency::minimum_balance());
 
-		let caller = whitelisted_caller();
-		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 		add_locks::<T>(&caller, l as u8);
-		add_vesting_schedule::<T>(&caller)?;
-		// At block 20, everything is unvested.
-		System::<T>::set_block_number(20u32.into());
+		add_vesting_schedules::<T>(caller_lookup, s)?;
+
+		// At block 21, everything is unlocked.
+		System::<T>::set_block_number(21u32.into());
 		assert_eq!(
 			Vesting::<T>::vesting_balance(&caller),
 			Some(BalanceOf::<T>::zero()),
@@ -108,18 +133,20 @@ benchmarks! {
 	}
 
 	vest_other_locked {
-		let l in 0 .. MaxLocksOf::<T>::get();
+		let l in 0 .. MaxLocksOf::<T>::get() - 1;
+		let s in 1 .. T::MAX_VESTING_SCHEDULES;
 
 		let other: T::AccountId = account("other", 0, SEED);
 		let other_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(other.clone());
-		T::Currency::make_free_balance_be(&other, BalanceOf::<T>::max_value());
+
 		add_locks::<T>(&other, l as u8);
-		add_vesting_schedule::<T>(&other)?;
+		let expected_balance = add_vesting_schedules::<T>(other_lookup.clone(), s)?;
+
 		// At block zero, everything is vested.
-		System::<T>::set_block_number(T::BlockNumber::zero());
+		assert_eq!(System::<T>::block_number(), T::BlockNumber::zero());
 		assert_eq!(
 			Vesting::<T>::vesting_balance(&other),
-			Some(100u32.into()),
+			Some(expected_balance),
 			"Vesting schedule not added",
 		);
 
@@ -129,21 +156,23 @@ benchmarks! {
 		// Nothing happened since everything is still vested.
 		assert_eq!(
 			Vesting::<T>::vesting_balance(&other),
-			Some(100u32.into()),
+			Some(expected_balance.into()),
 			"Vesting schedule was removed",
 		);
 	}
 
 	vest_other_unlocked {
-		let l in 0 .. MaxLocksOf::<T>::get();
+		let l in 0 .. MaxLocksOf::<T>::get() - 1;
+		let s in 1 .. T::MAX_VESTING_SCHEDULES;
 
 		let other: T::AccountId = account("other", 0, SEED);
 		let other_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(other.clone());
-		T::Currency::make_free_balance_be(&other, BalanceOf::<T>::max_value());
+
 		add_locks::<T>(&other, l as u8);
-		add_vesting_schedule::<T>(&other)?;
-		// At block 20, everything is unvested.
-		System::<T>::set_block_number(20u32.into());
+		add_vesting_schedules::<T>(other_lookup.clone(), s)?;
+		// At block 21 everything is unlocked.
+		System::<T>::set_block_number(21u32.into());
+
 		assert_eq!(
 			Vesting::<T>::vesting_balance(&other),
 			Some(BalanceOf::<T>::zero()),
@@ -153,7 +182,7 @@ benchmarks! {
 		let caller: T::AccountId = whitelisted_caller();
 	}: vest_other(RawOrigin::Signed(caller.clone()), other_lookup)
 	verify {
-		// Vesting schedule is removed!
+		// Vesting schedule is removed.
 		assert_eq!(
 			Vesting::<T>::vesting_balance(&other),
 			None,
@@ -162,65 +191,187 @@ benchmarks! {
 	}
 
 	vested_transfer {
-		let l in 0 .. MaxLocksOf::<T>::get();
+		let l in 0 .. MaxLocksOf::<T>::get() - 1;
+		let s in 0 .. T::MAX_VESTING_SCHEDULES - 1;
 
 		let caller: T::AccountId = whitelisted_caller();
 		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
+
 		let target: T::AccountId = account("target", 0, SEED);
 		let target_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(target.clone());
 		// Give target existing locks
 		add_locks::<T>(&target, l as u8);
+		// Add one vesting schedules.
+		let mut expected_balance = add_vesting_schedules::<T>(target_lookup.clone(), s)?;
 
 		let transfer_amount = T::MinVestedTransfer::get();
+		let per_block = transfer_amount.checked_div(&20u32.into()).unwrap();
+		expected_balance += transfer_amount;
 
-		let vesting_schedule = VestingInfo {
-			locked: transfer_amount,
-			per_block: 10u32.into(),
-			starting_block: 1u32.into(),
-		};
+		let vesting_schedule = VestingInfo::new(
+			transfer_amount,
+			per_block,
+			1u32.into(),
+		);
 	}: _(RawOrigin::Signed(caller), target_lookup, vesting_schedule)
 	verify {
 		assert_eq!(
-			T::MinVestedTransfer::get(),
+			expected_balance,
 			T::Currency::free_balance(&target),
 			"Transfer didn't happen",
 		);
 		assert_eq!(
 			Vesting::<T>::vesting_balance(&target),
-			Some(T::MinVestedTransfer::get()),
-			"Lock not created",
+			Some(expected_balance),
+			"Lock not correctly updated",
 		);
 	}
 
 	force_vested_transfer {
-		let l in 0 .. MaxLocksOf::<T>::get();
+		let l in 0 .. MaxLocksOf::<T>::get() - 1;
+		let s in 0 .. T::MAX_VESTING_SCHEDULES - 1;
 
 		let source: T::AccountId = account("source", 0, SEED);
 		let source_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(source.clone());
 		T::Currency::make_free_balance_be(&source, BalanceOf::<T>::max_value());
+
 		let target: T::AccountId = account("target", 0, SEED);
 		let target_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(target.clone());
 		// Give target existing locks
 		add_locks::<T>(&target, l as u8);
+		// Add one less than max vesting schedules
+		let mut expected_balance = add_vesting_schedules::<T>(target_lookup.clone(), s)?;
 
 		let transfer_amount = T::MinVestedTransfer::get();
+		let per_block = transfer_amount.checked_div(&20u32.into()).unwrap();
+		expected_balance += transfer_amount;
 
-		let vesting_schedule = VestingInfo {
-			locked: transfer_amount,
-			per_block: 10u32.into(),
-			starting_block: 1u32.into(),
-		};
+		let vesting_schedule = VestingInfo::new(
+			transfer_amount,
+			per_block,
+			1u32.into(),
+		);
 	}: _(RawOrigin::Root, source_lookup, target_lookup, vesting_schedule)
 	verify {
 		assert_eq!(
-			T::MinVestedTransfer::get(),
+			expected_balance,
 			T::Currency::free_balance(&target),
 			"Transfer didn't happen",
 		);
 		assert_eq!(
 			Vesting::<T>::vesting_balance(&target),
-			Some(T::MinVestedTransfer::get()),
-			"Lock not created",
+			Some(expected_balance.into()),
+				"Lock not correctly updated",
+			);
+		}
+
+	not_unlocking_merge_schedules {
+		let l in 0 .. MaxLocksOf::<T>::get() - 1;
+		let s in 2 .. T::MAX_VESTING_SCHEDULES;
+
+		let caller: T::AccountId = account("caller", 0, SEED);
+		let caller_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(caller.clone());
+		// Give target existing locks.
+		add_locks::<T>(&caller, l as u8);
+		// Add max vesting schedules.
+		let expected_balance = add_vesting_schedules::<T>(caller_lookup.clone(), s)?;
+
+		// Schedules are not vesting at block 0.
+		assert_eq!(System::<T>::block_number(), T::BlockNumber::zero());
+		assert_eq!(
+			Vesting::<T>::vesting_balance(&caller),
+			Some(expected_balance),
+			"Vesting balance should equal sum locked of all schedules",
+		);
+		assert_eq!(
+			Vesting::<T>::vesting(&caller).unwrap().len(),
+			s as usize,
+			"There should be exactly max vesting schedules"
+		);
+	}: merge_schedules(RawOrigin::Signed(caller.clone()), 0, s - 1)
+	verify {
+		let expected_schedule = VestingInfo::new(
+			T::MinVestedTransfer::get() * 20u32.into() * 2u32.into(),
+			T::MinVestedTransfer::get() * 2u32.into(),
+			1u32.into(),
+		);
+		let expected_index = (s - 2) as usize;
+		assert_eq!(
+			Vesting::<T>::vesting(&caller).unwrap()[expected_index],
+			expected_schedule
+		);
+		assert_eq!(
+			Vesting::<T>::vesting_balance(&caller),
+			Some(expected_balance),
+			"Vesting balance should equal total locked of all schedules",
+		);
+		assert_eq!(
+			Vesting::<T>::vesting(&caller).unwrap().len(),
+			(s - 1) as usize,
+			"Schedule count should reduce by 1"
+		);
+	}
+
+	unlocking_merge_schedules {
+		let l in 0 .. MaxLocksOf::<T>::get() - 1;
+		let s in 2 .. T::MAX_VESTING_SCHEDULES;
+
+		// Destination used just for currency transfers in asserts.
+		let test_dest: T::AccountId = account("test_dest", 0, SEED);
+
+		let caller: T::AccountId = account("caller", 0, SEED);
+		let caller_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(caller.clone());
+		// Give target other locks.
+		add_locks::<T>(&caller, l as u8);
+		// Add max vesting schedules.
+		let total_transferred = add_vesting_schedules::<T>(caller_lookup.clone(), s)?;
+
+		// Go to about half way through all the schedules duration. (They all start at 1, and have a duration of 20 or 21).
+		System::<T>::set_block_number(11u32.into());
+		// We expect half the original locked balance (+ any remainder that vests on the last block).
+		let expected_balance = total_transferred / 2u32.into();
+		assert_eq!(
+			Vesting::<T>::vesting_balance(&caller),
+			Some(expected_balance),
+			"Vesting balance should reflect that we are half way through all schedules duration",
+		);
+		assert_eq!(
+			Vesting::<T>::vesting(&caller).unwrap().len(),
+			s as usize,
+			"There should be exactly max vesting schedules"
+		);
+		// The balance is not actually transferable because it has not been unlocked.
+		assert!(T::Currency::transfer(&caller, &test_dest, expected_balance, ExistenceRequirement::AllowDeath).is_err());
+	}: merge_schedules(RawOrigin::Signed(caller.clone()), 0, s - 1)
+	verify {
+		let expected_schedule = VestingInfo::new(
+			T::MinVestedTransfer::get() * 2u32.into() * 10u32.into(),
+			T::MinVestedTransfer::get() * 2u32.into(),
+			11u32.into(),
+		);
+		let expected_index = (s - 2) as usize;
+		assert_eq!(
+			Vesting::<T>::vesting(&caller).unwrap()[expected_index],
+			expected_schedule,
+			"New schedule is properly created and placed"
+		);
+		assert_eq!(
+			Vesting::<T>::vesting(&caller).unwrap()[expected_index],
+			expected_schedule
+		);
+		assert_eq!(
+			Vesting::<T>::vesting_balance(&caller),
+			Some(expected_balance),
+			"Vesting balance should equal half total locked of all schedules",
+		);
+		assert_eq!(
+			Vesting::<T>::vesting(&caller).unwrap().len(),
+			(s - 1) as usize,
+			"Schedule count should reduce by 1"
+		);
+		// Since merge unlocks all schedules we can now transfer the balance.
+		assert_ok!(
+			T::Currency::transfer(&caller, &test_dest, expected_balance, ExistenceRequirement::AllowDeath)
 		);
 	}
 }
diff --git a/frame/vesting/src/lib.rs b/frame/vesting/src/lib.rs
index 8a2651a84c64..7e4a11fbd5c3 100644
--- a/frame/vesting/src/lib.rs
+++ b/frame/vesting/src/lib.rs
@@ -45,14 +45,16 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 mod benchmarking;
+mod migrations;
 #[cfg(test)]
 mod mock;
 #[cfg(test)]
 mod tests;
+mod vesting_info;
 
 pub mod weights;
 
-use codec::{Decode, Encode};
+use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::{
 	ensure,
 	pallet_prelude::*,
@@ -64,10 +66,14 @@ use frame_support::{
 use frame_system::{ensure_root, ensure_signed, pallet_prelude::*};
 pub use pallet::*;
 use sp_runtime::{
-	traits::{AtLeast32BitUnsigned, Convert, MaybeSerializeDeserialize, StaticLookup, Zero},
+	traits::{
+		AtLeast32BitUnsigned, Bounded, Convert, MaybeSerializeDeserialize, One, Saturating,
+		StaticLookup, Zero,
+	},
 	RuntimeDebug,
 };
-use sp_std::{fmt::Debug, prelude::*};
+use sp_std::{convert::TryInto, fmt::Debug, prelude::*};
+pub use vesting_info::*;
 pub use weights::WeightInfo;
 
 type BalanceOf<T> =
@@ -77,37 +83,62 @@ type MaxLocksOf<T> =
 
 const VESTING_ID: LockIdentifier = *b"vesting ";
 
-/// Struct to encode the vesting schedule of an individual account.
-#[derive(Encode, Decode, Copy, Clone, PartialEq, Eq, RuntimeDebug)]
-pub struct VestingInfo<Balance, BlockNumber> {
-	/// Locked amount at genesis.
-	pub locked: Balance,
-	/// Amount that gets unlocked every block after `starting_block`.
-	pub per_block: Balance,
-	/// Starting block for unlocking(vesting).
-	pub starting_block: BlockNumber,
+// A value placed in storage that represents the current version of the Vesting storage.
+// This value is used by `on_runtime_upgrade` to determine whether we run storage migration logic.
+#[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, RuntimeDebug, MaxEncodedLen)]
+enum Releases {
+	V0,
+	V1,
 }
 
-impl<Balance: AtLeast32BitUnsigned + Copy, BlockNumber: AtLeast32BitUnsigned + Copy>
-	VestingInfo<Balance, BlockNumber>
-{
-	/// Amount locked at block `n`.
-	pub fn locked_at<BlockNumberToBalance: Convert<BlockNumber, Balance>>(
-		&self,
-		n: BlockNumber,
-	) -> Balance {
-		// Number of blocks that count toward vesting
-		// Saturating to 0 when n < starting_block
-		let vested_block_count = n.saturating_sub(self.starting_block);
-		let vested_block_count = BlockNumberToBalance::convert(vested_block_count);
-		// Return amount that is still locked in vesting
-		let maybe_balance = vested_block_count.checked_mul(&self.per_block);
-		if let Some(balance) = maybe_balance {
-			self.locked.saturating_sub(balance)
-		} else {
-			Zero::zero()
+impl Default for Releases {
+	fn default() -> Self {
+		Releases::V0
+	}
+}
+
+/// Actions to take against a user's `Vesting` storage entry.
+#[derive(Clone, Copy)]
+enum VestingAction {
+	/// Do not actively remove any schedules.
+	Passive,
+	/// Remove the schedule specified by the index.
+	Remove(usize),
+	/// Remove the two schedules, specified by index, so they can be merged.
+	Merge(usize, usize),
+}
+
+impl VestingAction {
+	/// Whether or not the filter says the schedule index should be removed.
+	fn should_remove(&self, index: usize) -> bool {
+		match self {
+			Self::Passive => false,
+			Self::Remove(index1) => *index1 == index,
+			Self::Merge(index1, index2) => *index1 == index || *index2 == index,
 		}
 	}
+
+	/// Pick the schedules that this action dictates should continue vesting undisturbed.
+	fn pick_schedules<'a, T: Config>(
+		&'a self,
+		schedules: Vec<VestingInfo<BalanceOf<T>, T::BlockNumber>>,
+	) -> impl Iterator<Item = VestingInfo<BalanceOf<T>, T::BlockNumber>> + 'a {
+		schedules.into_iter().enumerate().filter_map(move |(index, schedule)| {
+			if self.should_remove(index) {
+				None
+			} else {
+				Some(schedule)
+			}
+		})
+	}
+}
+
+// Wrapper for `T::MAX_VESTING_SCHEDULES` to satisfy `trait Get`.
+pub struct MaxVestingSchedulesGet<T>(PhantomData<T>);
+impl<T: Config> Get<u32> for MaxVestingSchedulesGet<T> {
+	fn get() -> u32 {
+		T::MAX_VESTING_SCHEDULES
+	}
 }
 
 #[frame_support::pallet]
@@ -131,16 +162,65 @@ pub mod pallet {
 
 		/// Weight information for extrinsics in this pallet.
 		type WeightInfo: WeightInfo;
+
+		/// Maximum number of vesting schedules an account may have at a given moment.
+		const MAX_VESTING_SCHEDULES: u32;
+	}
+
+	#[pallet::extra_constants]
+	impl<T: Config> Pallet<T> {
+		// TODO: rename to snake case after https://github.com/paritytech/substrate/issues/8826 fixed.
+		#[allow(non_snake_case)]
+		fn MaxVestingSchedules() -> u32 {
+			T::MAX_VESTING_SCHEDULES
+		}
+	}
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+		#[cfg(feature = "try-runtime")]
+		fn pre_upgrade() -> Result<(), &'static str> {
+			migrations::v1::pre_migrate::<T>()
+		}
+
+		fn on_runtime_upgrade() -> Weight {
+			if StorageVersion::<T>::get() == Releases::V0 {
+				StorageVersion::<T>::put(Releases::V1);
+				migrations::v1::migrate::<T>().saturating_add(T::DbWeight::get().reads_writes(1, 1))
+			} else {
+				T::DbWeight::get().reads(1)
+			}
+		}
+
+		#[cfg(feature = "try-runtime")]
+		fn post_upgrade() -> Result<(), &'static str> {
+			migrations::v1::post_migrate::<T>()
+		}
+
+		fn integrity_test() {
+			assert!(T::MAX_VESTING_SCHEDULES > 0, "`MaxVestingSchedules` must ge greater than 0");
+		}
 	}
 
 	/// Information regarding the vesting of a given account.
 	#[pallet::storage]
 	#[pallet::getter(fn vesting)]
-	pub type Vesting<T: Config> =
-		StorageMap<_, Blake2_128Concat, T::AccountId, VestingInfo<BalanceOf<T>, T::BlockNumber>>;
+	pub type Vesting<T: Config> = StorageMap<
+		_,
+		Blake2_128Concat,
+		T::AccountId,
+		BoundedVec<VestingInfo<BalanceOf<T>, T::BlockNumber>, MaxVestingSchedulesGet<T>>,
+	>;
+
+	/// Storage version of the pallet.
+	///
+	/// New networks start with latest version, as determined by the genesis build.
+	#[pallet::storage]
+	pub(crate) type StorageVersion<T: Config> = StorageValue<_, Releases, ValueQuery>;
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::generate_storage_info]
 	pub struct Pallet<T>(_);
 
 	#[pallet::genesis_config]
@@ -160,6 +240,9 @@ pub mod pallet {
 		fn build(&self) {
 			use sp_runtime::traits::Saturating;
 
+			// Genesis uses the latest storage version.
+			StorageVersion::<T>::put(Releases::V1);
+
 			// Generate initial vesting configuration
 			// * who - Account which we are generating vesting configuration for
 			// * begin - Block when the account will start to vest
@@ -172,8 +255,14 @@ pub mod pallet {
 				let locked = balance.saturating_sub(liquid);
 				let length_as_balance = T::BlockNumberToBalance::convert(length);
 				let per_block = locked / length_as_balance.max(sp_runtime::traits::One::one());
+				let vesting_info = VestingInfo::new(locked, per_block, begin);
+				if !vesting_info.is_valid() {
+					panic!("Invalid VestingInfo params at genesis")
+				};
+
+				Vesting::<T>::try_append(who, vesting_info)
+					.expect("Too many vesting schedules at genesis.");
 
-				Vesting::<T>::insert(who, VestingInfo { locked, per_block, starting_block: begin });
 				let reasons = WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE;
 				T::Currency::set_lock(VESTING_ID, who, locked, reasons);
 			}
@@ -182,13 +271,15 @@ pub mod pallet {
 
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
-	#[pallet::metadata(T::AccountId = "AccountId", BalanceOf<T> = "Balance")]
+	#[pallet::metadata(
+		T::AccountId = "AccountId", BalanceOf<T> = "Balance", T::BlockNumber = "BlockNumber"
+	)]
 	pub enum Event<T: Config> {
-		/// The amount vested has been updated. This could indicate more funds are available. The
-		/// balance given is the amount which is left unvested (and thus locked).
+		/// The amount vested has been updated. This could indicate a change in funds available.
+		/// The balance given is the amount which is left unvested (and thus locked).
 		/// \[account, unvested\]
 		VestingUpdated(T::AccountId, BalanceOf<T>),
-		/// An \[account\] has become fully vested. No further vesting can happen.
+		/// An \[account\] has become fully vested.
 		VestingCompleted(T::AccountId),
 	}
 
@@ -197,10 +288,15 @@ pub mod pallet {
 	pub enum Error<T> {
 		/// The account given is not vesting.
 		NotVesting,
-		/// An existing vesting schedule already exists for this account that cannot be clobbered.
-		ExistingVestingSchedule,
+		/// The account already has `MaxVestingSchedules` count of schedules and thus
+		/// cannot add another one. Consider merging existing schedules in order to add another.
+		AtMaxVestingSchedules,
 		/// Amount being transferred is too low to create a vesting schedule.
 		AmountLow,
+		/// An index was out of bounds of the vesting schedules.
+		ScheduleIndexOutOfBounds,
+		/// Failed to create a new schedule because some parameter was invalid.
+		InvalidScheduleParams,
 	}
 
 	#[pallet::call]
@@ -218,12 +314,12 @@ pub mod pallet {
 		///     - Reads: Vesting Storage, Balances Locks, [Sender Account]
 		///     - Writes: Vesting Storage, Balances Locks, [Sender Account]
 		/// # </weight>
-		#[pallet::weight(T::WeightInfo::vest_locked(MaxLocksOf::<T>::get())
-			.max(T::WeightInfo::vest_unlocked(MaxLocksOf::<T>::get()))
+		#[pallet::weight(T::WeightInfo::vest_locked(MaxLocksOf::<T>::get(), T::MAX_VESTING_SCHEDULES)
+			.max(T::WeightInfo::vest_unlocked(MaxLocksOf::<T>::get(), T::MAX_VESTING_SCHEDULES))
 		)]
 		pub fn vest(origin: OriginFor<T>) -> DispatchResult {
 			let who = ensure_signed(origin)?;
-			Self::update_lock(who)
+			Self::do_vest(who)
 		}
 
 		/// Unlock any vested funds of a `target` account.
@@ -241,61 +337,46 @@ pub mod pallet {
 		///     - Reads: Vesting Storage, Balances Locks, Target Account
 		///     - Writes: Vesting Storage, Balances Locks, Target Account
 		/// # </weight>
-		#[pallet::weight(T::WeightInfo::vest_other_locked(MaxLocksOf::<T>::get())
-			.max(T::WeightInfo::vest_other_unlocked(MaxLocksOf::<T>::get()))
+		#[pallet::weight(T::WeightInfo::vest_other_locked(MaxLocksOf::<T>::get(), T::MAX_VESTING_SCHEDULES)
+			.max(T::WeightInfo::vest_other_unlocked(MaxLocksOf::<T>::get(), T::MAX_VESTING_SCHEDULES))
 		)]
 		pub fn vest_other(
 			origin: OriginFor<T>,
 			target: <T::Lookup as StaticLookup>::Source,
 		) -> DispatchResult {
 			ensure_signed(origin)?;
-			Self::update_lock(T::Lookup::lookup(target)?)
+			let who = T::Lookup::lookup(target)?;
+			Self::do_vest(who)
 		}
 
 		/// Create a vested transfer.
 		///
 		/// The dispatch origin for this call must be _Signed_.
 		///
-		/// - `target`: The account that should be transferred the vested funds.
-		/// - `amount`: The amount of funds to transfer and will be vested.
+		/// - `target`: The account receiving the vested funds.
 		/// - `schedule`: The vesting schedule attached to the transfer.
 		///
 		/// Emits `VestingCreated`.
 		///
+		/// NOTE: This will unlock all schedules through the current block.
+		///
 		/// # <weight>
 		/// - `O(1)`.
 		/// - DbWeight: 3 Reads, 3 Writes
 		///     - Reads: Vesting Storage, Balances Locks, Target Account, [Sender Account]
 		///     - Writes: Vesting Storage, Balances Locks, Target Account, [Sender Account]
 		/// # </weight>
-		#[pallet::weight(T::WeightInfo::vested_transfer(MaxLocksOf::<T>::get()))]
+		#[pallet::weight(
+			T::WeightInfo::vested_transfer(MaxLocksOf::<T>::get(), T::MAX_VESTING_SCHEDULES)
+		)]
 		pub fn vested_transfer(
 			origin: OriginFor<T>,
 			target: <T::Lookup as StaticLookup>::Source,
 			schedule: VestingInfo<BalanceOf<T>, T::BlockNumber>,
 		) -> DispatchResult {
 			let transactor = ensure_signed(origin)?;
-			ensure!(schedule.locked >= T::MinVestedTransfer::get(), Error::<T>::AmountLow);
-
-			let who = T::Lookup::lookup(target)?;
-			ensure!(!Vesting::<T>::contains_key(&who), Error::<T>::ExistingVestingSchedule);
-
-			T::Currency::transfer(
-				&transactor,
-				&who,
-				schedule.locked,
-				ExistenceRequirement::AllowDeath,
-			)?;
-
-			Self::add_vesting_schedule(
-				&who,
-				schedule.locked,
-				schedule.per_block,
-				schedule.starting_block,
-			)
-			.expect("user does not have an existing vesting schedule; q.e.d.");
-
-			Ok(())
+			let transactor = <T::Lookup as StaticLookup>::unlookup(transactor);
+			Self::do_vested_transfer(transactor, target, schedule)
 		}
 
 		/// Force a vested transfer.
@@ -304,18 +385,21 @@ pub mod pallet {
 		///
 		/// - `source`: The account whose funds should be transferred.
 		/// - `target`: The account that should be transferred the vested funds.
-		/// - `amount`: The amount of funds to transfer and will be vested.
 		/// - `schedule`: The vesting schedule attached to the transfer.
 		///
 		/// Emits `VestingCreated`.
 		///
+		/// NOTE: This will unlock all schedules through the current block.
+		///
 		/// # <weight>
 		/// - `O(1)`.
 		/// - DbWeight: 4 Reads, 4 Writes
 		///     - Reads: Vesting Storage, Balances Locks, Target Account, Source Account
 		///     - Writes: Vesting Storage, Balances Locks, Target Account, Source Account
 		/// # </weight>
-		#[pallet::weight(T::WeightInfo::force_vested_transfer(MaxLocksOf::<T>::get()))]
+		#[pallet::weight(
+			T::WeightInfo::force_vested_transfer(MaxLocksOf::<T>::get(), T::MAX_VESTING_SCHEDULES)
+		)]
 		pub fn force_vested_transfer(
 			origin: OriginFor<T>,
 			source: <T::Lookup as StaticLookup>::Source,
@@ -323,26 +407,53 @@ pub mod pallet {
 			schedule: VestingInfo<BalanceOf<T>, T::BlockNumber>,
 		) -> DispatchResult {
 			ensure_root(origin)?;
-			ensure!(schedule.locked >= T::MinVestedTransfer::get(), Error::<T>::AmountLow);
-
-			let target = T::Lookup::lookup(target)?;
-			let source = T::Lookup::lookup(source)?;
-			ensure!(!Vesting::<T>::contains_key(&target), Error::<T>::ExistingVestingSchedule);
-
-			T::Currency::transfer(
-				&source,
-				&target,
-				schedule.locked,
-				ExistenceRequirement::AllowDeath,
-			)?;
-
-			Self::add_vesting_schedule(
-				&target,
-				schedule.locked,
-				schedule.per_block,
-				schedule.starting_block,
-			)
-			.expect("user does not have an existing vesting schedule; q.e.d.");
+			Self::do_vested_transfer(source, target, schedule)
+		}
+
+		/// Merge two vesting schedules together, creating a new vesting schedule that unlocks over
+		/// the highest possible start and end blocks. If both schedules have already started the
+		/// current block will be used as the schedule start; with the caveat that if one schedule
+		/// is finished by the current block, the other will be treated as the new merged schedule,
+		/// unmodified.
+		///
+		/// NOTE: If `schedule1_index == schedule2_index` this is a no-op.
+		/// NOTE: This will unlock all schedules through the current block prior to merging.
+		/// NOTE: If both schedules have ended by the current block, no new schedule will be created
+		/// and both will be removed.
+		///
+		/// Merged schedule attributes:
+		/// - `starting_block`: `MAX(schedule1.starting_block, scheduled2.starting_block,
+		///   current_block)`.
+		/// - `ending_block`: `MAX(schedule1.ending_block, schedule2.ending_block)`.
+		/// - `locked`: `schedule1.locked_at(current_block) + schedule2.locked_at(current_block)`.
+		///
+		/// The dispatch origin for this call must be _Signed_.
+		///
+		/// - `schedule1_index`: index of the first schedule to merge.
+		/// - `schedule2_index`: index of the second schedule to merge.
+		#[pallet::weight(
+			T::WeightInfo::not_unlocking_merge_schedules(MaxLocksOf::<T>::get(), T::MAX_VESTING_SCHEDULES)
+			.max(T::WeightInfo::unlocking_merge_schedules(MaxLocksOf::<T>::get(), T::MAX_VESTING_SCHEDULES))
+		)]
+		pub fn merge_schedules(
+			origin: OriginFor<T>,
+			schedule1_index: u32,
+			schedule2_index: u32,
+		) -> DispatchResult {
+			let who = ensure_signed(origin)?;
+			if schedule1_index == schedule2_index {
+				return Ok(())
+			};
+			let schedule1_index = schedule1_index as usize;
+			let schedule2_index = schedule2_index as usize;
+
+			let schedules = Self::vesting(&who).ok_or(Error::<T>::NotVesting)?;
+			let merge_action = VestingAction::Merge(schedule1_index, schedule2_index);
+
+			let (schedules, locked_now) = Self::exec_action(schedules.to_vec(), merge_action)?;
+
+			Self::write_vesting(&who, schedules)?;
+			Self::write_lock(&who, locked_now);
 
 			Ok(())
 		}
@@ -350,39 +461,233 @@ pub mod pallet {
 }
 
 impl<T: Config> Pallet<T> {
-	/// (Re)set or remove the pallet's currency lock on `who`'s account in accordance with their
-	/// current unvested amount.
-	fn update_lock(who: T::AccountId) -> DispatchResult {
-		let vesting = Self::vesting(&who).ok_or(Error::<T>::NotVesting)?;
+	// Create a new `VestingInfo`, based off of two other `VestingInfo`s.
+	// NOTE: We assume both schedules have had funds unlocked up through the current block.
+	fn merge_vesting_info(
+		now: T::BlockNumber,
+		schedule1: VestingInfo<BalanceOf<T>, T::BlockNumber>,
+		schedule2: VestingInfo<BalanceOf<T>, T::BlockNumber>,
+	) -> Option<VestingInfo<BalanceOf<T>, T::BlockNumber>> {
+		let schedule1_ending_block = schedule1.ending_block_as_balance::<T::BlockNumberToBalance>();
+		let schedule2_ending_block = schedule2.ending_block_as_balance::<T::BlockNumberToBalance>();
+		let now_as_balance = T::BlockNumberToBalance::convert(now);
+
+		// Check if one or both schedules have ended.
+		match (schedule1_ending_block <= now_as_balance, schedule2_ending_block <= now_as_balance) {
+			// If both schedules have ended, we don't merge and exit early.
+			(true, true) => return None,
+			// If one schedule has ended, we treat the one that has not ended as the new
+			// merged schedule.
+			(true, false) => return Some(schedule2),
+			(false, true) => return Some(schedule1),
+			// If neither schedule has ended don't exit early.
+			_ => {},
+		}
+
+		let locked = schedule1
+			.locked_at::<T::BlockNumberToBalance>(now)
+			.saturating_add(schedule2.locked_at::<T::BlockNumberToBalance>(now));
+		// This shouldn't happen because we know at least one ending block is greater than now,
+		// thus at least a schedule a some locked balance.
+		debug_assert!(
+			!locked.is_zero(),
+			"merge_vesting_info validation checks failed to catch a locked of 0"
+		);
+
+		let ending_block = schedule1_ending_block.max(schedule2_ending_block);
+		let starting_block = now.max(schedule1.starting_block()).max(schedule2.starting_block());
+
+		let per_block = {
+			let duration = ending_block
+				.saturating_sub(T::BlockNumberToBalance::convert(starting_block))
+				.max(One::one());
+			(locked / duration).max(One::one())
+		};
+
+		let schedule = VestingInfo::new(locked, per_block, starting_block);
+		debug_assert!(schedule.is_valid(), "merge_vesting_info schedule validation check failed");
+
+		Some(schedule)
+	}
+
+	// Execute a vested transfer from `source` to `target` with the given `schedule`.
+	fn do_vested_transfer(
+		source: <T::Lookup as StaticLookup>::Source,
+		target: <T::Lookup as StaticLookup>::Source,
+		schedule: VestingInfo<BalanceOf<T>, T::BlockNumber>,
+	) -> DispatchResult {
+		// Validate user inputs.
+		ensure!(schedule.locked() >= T::MinVestedTransfer::get(), Error::<T>::AmountLow);
+		if !schedule.is_valid() {
+			return Err(Error::<T>::InvalidScheduleParams.into())
+		};
+		let target = T::Lookup::lookup(target)?;
+		let source = T::Lookup::lookup(source)?;
+
+		// Check we can add to this account prior to any storage writes.
+		Self::can_add_vesting_schedule(
+			&target,
+			schedule.locked(),
+			schedule.per_block(),
+			schedule.starting_block(),
+		)?;
+
+		T::Currency::transfer(
+			&source,
+			&target,
+			schedule.locked(),
+			ExistenceRequirement::AllowDeath,
+		)?;
+
+		// We can't let this fail because the currency transfer has already happened.
+		let res = Self::add_vesting_schedule(
+			&target,
+			schedule.locked(),
+			schedule.per_block(),
+			schedule.starting_block(),
+		);
+		debug_assert!(res.is_ok(), "Failed to add a schedule when we had to succeed.");
+
+		Ok(())
+	}
+
+	/// Iterate through the schedules to track the current locked amount and
+	/// filter out completed and specified schedules.
+	///
+	/// Returns a tuple that consists of:
+	/// - Vec of vesting schedules, where completed schedules and those specified
+	/// 	by filter are removed. (Note the vec is not checked for respecting
+	/// 	bounded length.)
+	/// - The amount locked at the current block number based on the given schedules.
+	///
+	/// NOTE: the amount locked does not include any schedules that are filtered out via `action`.
+	fn report_schedule_updates(
+		schedules: Vec<VestingInfo<BalanceOf<T>, T::BlockNumber>>,
+		action: VestingAction,
+	) -> (Vec<VestingInfo<BalanceOf<T>, T::BlockNumber>>, BalanceOf<T>) {
 		let now = <frame_system::Pallet<T>>::block_number();
-		let locked_now = vesting.locked_at::<T::BlockNumberToBalance>(now);
 
-		if locked_now.is_zero() {
-			T::Currency::remove_lock(VESTING_ID, &who);
-			Vesting::<T>::remove(&who);
-			Self::deposit_event(Event::<T>::VestingCompleted(who));
+		let mut total_locked_now: BalanceOf<T> = Zero::zero();
+		let filtered_schedules = action
+			.pick_schedules::<T>(schedules)
+			.filter_map(|schedule| {
+				let locked_now = schedule.locked_at::<T::BlockNumberToBalance>(now);
+				if locked_now.is_zero() {
+					None
+				} else {
+					total_locked_now = total_locked_now.saturating_add(locked_now);
+					Some(schedule)
+				}
+			})
+			.collect::<Vec<_>>();
+
+		(filtered_schedules, total_locked_now)
+	}
+
+	/// Write an accounts updated vesting lock to storage.
+	fn write_lock(who: &T::AccountId, total_locked_now: BalanceOf<T>) {
+		if total_locked_now.is_zero() {
+			T::Currency::remove_lock(VESTING_ID, who);
+			Self::deposit_event(Event::<T>::VestingCompleted(who.clone()));
 		} else {
 			let reasons = WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE;
-			T::Currency::set_lock(VESTING_ID, &who, locked_now, reasons);
-			Self::deposit_event(Event::<T>::VestingUpdated(who, locked_now));
+			T::Currency::set_lock(VESTING_ID, who, total_locked_now, reasons);
+			Self::deposit_event(Event::<T>::VestingUpdated(who.clone(), total_locked_now));
+		};
+	}
+
+	/// Write an accounts updated vesting schedules to storage.
+	fn write_vesting(
+		who: &T::AccountId,
+		schedules: Vec<VestingInfo<BalanceOf<T>, T::BlockNumber>>,
+	) -> Result<(), DispatchError> {
+		let schedules: BoundedVec<
+			VestingInfo<BalanceOf<T>, T::BlockNumber>,
+			MaxVestingSchedulesGet<T>,
+		> = schedules.try_into().map_err(|_| Error::<T>::AtMaxVestingSchedules)?;
+
+		if schedules.len() == 0 {
+			Vesting::<T>::remove(&who);
+		} else {
+			Vesting::<T>::insert(who, schedules)
 		}
+
+		Ok(())
+	}
+
+	/// Unlock any vested funds of `who`.
+	fn do_vest(who: T::AccountId) -> DispatchResult {
+		let schedules = Self::vesting(&who).ok_or(Error::<T>::NotVesting)?;
+
+		let (schedules, locked_now) =
+			Self::exec_action(schedules.to_vec(), VestingAction::Passive)?;
+
+		Self::write_vesting(&who, schedules)?;
+		Self::write_lock(&who, locked_now);
+
 		Ok(())
 	}
+
+	/// Execute a `VestingAction` against the given `schedules`. Returns the updated schedules
+	/// and locked amount.
+	fn exec_action(
+		schedules: Vec<VestingInfo<BalanceOf<T>, T::BlockNumber>>,
+		action: VestingAction,
+	) -> Result<(Vec<VestingInfo<BalanceOf<T>, T::BlockNumber>>, BalanceOf<T>), DispatchError> {
+		let (schedules, locked_now) = match action {
+			VestingAction::Merge(idx1, idx2) => {
+				// The schedule index is based off of the schedule ordering prior to filtering out
+				// any schedules that may be ending at this block.
+				let schedule1 = *schedules.get(idx1).ok_or(Error::<T>::ScheduleIndexOutOfBounds)?;
+				let schedule2 = *schedules.get(idx2).ok_or(Error::<T>::ScheduleIndexOutOfBounds)?;
+
+				// The length of `schedules` decreases by 2 here since we filter out 2 schedules.
+				// Thus we know below that we can push the new merged schedule without error
+				// (assuming initial state was valid).
+				let (mut schedules, mut locked_now) =
+					Self::report_schedule_updates(schedules.to_vec(), action);
+
+				let now = <frame_system::Pallet<T>>::block_number();
+				if let Some(new_schedule) = Self::merge_vesting_info(now, schedule1, schedule2) {
+					// Merging created a new schedule so we:
+					// 1) need to add it to the accounts vesting schedule collection,
+					schedules.push(new_schedule);
+					// (we use `locked_at` in case this is a schedule that started in the past)
+					let new_schedule_locked =
+						new_schedule.locked_at::<T::BlockNumberToBalance>(now);
+					// and 2) update the locked amount to reflect the schedule we just added.
+					locked_now = locked_now.saturating_add(new_schedule_locked);
+				} // In the None case there was no new schedule to account for.
+
+				(schedules, locked_now)
+			},
+			_ => Self::report_schedule_updates(schedules.to_vec(), action),
+		};
+
+		debug_assert!(
+			locked_now > Zero::zero() && schedules.len() > 0 ||
+				locked_now == Zero::zero() && schedules.len() == 0
+		);
+
+		Ok((schedules, locked_now))
+	}
 }
 
 impl<T: Config> VestingSchedule<T::AccountId> for Pallet<T>
 where
 	BalanceOf<T>: MaybeSerializeDeserialize + Debug,
 {
-	type Moment = T::BlockNumber;
 	type Currency = T::Currency;
+	type Moment = T::BlockNumber;
 
 	/// Get the amount that is currently being vested and cannot be transferred out of this account.
 	fn vesting_balance(who: &T::AccountId) -> Option<BalanceOf<T>> {
 		if let Some(v) = Self::vesting(who) {
 			let now = <frame_system::Pallet<T>>::block_number();
-			let locked_now = v.locked_at::<T::BlockNumberToBalance>(now);
-			Some(T::Currency::free_balance(who).min(locked_now))
+			let total_locked_now = v.iter().fold(Zero::zero(), |total, schedule| {
+				schedule.locked_at::<T::BlockNumberToBalance>(now).saturating_add(total)
+			});
+			Some(T::Currency::free_balance(who).min(total_locked_now))
 		} else {
 			None
 		}
@@ -390,14 +695,16 @@ where
 
 	/// Adds a vesting schedule to a given account.
 	///
-	/// If there already exists a vesting schedule for the given account, an `Err` is returned
-	/// and nothing is updated.
+	/// If the account has `MaxVestingSchedules`, an Error is returned and nothing
+	/// is updated.
 	///
 	/// On success, a linearly reducing amount of funds will be locked. In order to realise any
 	/// reduction of the lock over time as it diminishes, the account owner must use `vest` or
 	/// `vest_other`.
 	///
 	/// Is a no-op if the amount to be vested is zero.
+	///
+	/// NOTE: This doesn't alter the free balance of the account.
 	fn add_vesting_schedule(
 		who: &T::AccountId,
 		locked: BalanceOf<T>,
@@ -407,22 +714,58 @@ where
 		if locked.is_zero() {
 			return Ok(())
 		}
-		if Vesting::<T>::contains_key(who) {
-			Err(Error::<T>::ExistingVestingSchedule)?
+
+		let vesting_schedule = VestingInfo::new(locked, per_block, starting_block);
+		// Check for `per_block` or `locked` of 0.
+		if !vesting_schedule.is_valid() {
+			return Err(Error::<T>::InvalidScheduleParams.into())
+		};
+
+		let mut schedules = Self::vesting(who).unwrap_or_default();
+
+		// NOTE: we must push the new schedule so that `exec_action`
+		// will give the correct new locked amount.
+		ensure!(schedules.try_push(vesting_schedule).is_ok(), Error::<T>::AtMaxVestingSchedules);
+
+		let (schedules, locked_now) =
+			Self::exec_action(schedules.to_vec(), VestingAction::Passive)?;
+
+		Self::write_vesting(&who, schedules)?;
+		Self::write_lock(who, locked_now);
+
+		Ok(())
+	}
+
+	// Ensure we can call `add_vesting_schedule` without error. This should always
+	// be called prior to `add_vesting_schedule`.
+	fn can_add_vesting_schedule(
+		who: &T::AccountId,
+		locked: BalanceOf<T>,
+		per_block: BalanceOf<T>,
+		starting_block: T::BlockNumber,
+	) -> DispatchResult {
+		// Check for `per_block` or `locked` of 0.
+		if !VestingInfo::new(locked, per_block, starting_block).is_valid() {
+			return Err(Error::<T>::InvalidScheduleParams.into())
 		}
-		let vesting_schedule = VestingInfo { locked, per_block, starting_block };
-		Vesting::<T>::insert(who, vesting_schedule);
-		// it can't fail, but even if somehow it did, we don't really care.
-		let res = Self::update_lock(who.clone());
-		debug_assert!(res.is_ok());
+
+		ensure!(
+			(Vesting::<T>::decode_len(who).unwrap_or_default() as u32) < T::MAX_VESTING_SCHEDULES,
+			Error::<T>::AtMaxVestingSchedules
+		);
+
 		Ok(())
 	}
 
 	/// Remove a vesting schedule for a given account.
-	fn remove_vesting_schedule(who: &T::AccountId) {
-		Vesting::<T>::remove(who);
-		// it can't fail, but even if somehow it did, we don't really care.
-		let res = Self::update_lock(who.clone());
-		debug_assert!(res.is_ok());
+	fn remove_vesting_schedule(who: &T::AccountId, schedule_index: u32) -> DispatchResult {
+		let schedules = Self::vesting(who).ok_or(Error::<T>::NotVesting)?;
+		let remove_action = VestingAction::Remove(schedule_index as usize);
+
+		let (schedules, locked_now) = Self::exec_action(schedules.to_vec(), remove_action)?;
+
+		Self::write_vesting(&who, schedules)?;
+		Self::write_lock(who, locked_now);
+		Ok(())
 	}
 }
diff --git a/frame/vesting/src/migrations.rs b/frame/vesting/src/migrations.rs
new file mode 100644
index 000000000000..086257d285ea
--- /dev/null
+++ b/frame/vesting/src/migrations.rs
@@ -0,0 +1,95 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Storage migrations for the vesting pallet.
+
+use super::*;
+
+// Migration from single schedule to multiple schedules.
+pub(crate) mod v1 {
+	use super::*;
+
+	#[cfg(feature = "try-runtime")]
+	pub(crate) fn pre_migrate<T: Config>() -> Result<(), &'static str> {
+		assert!(StorageVersion::<T>::get() == Releases::V0, "Storage version too high.");
+
+		log::debug!(
+			target: "runtime::vesting",
+			"migration: Vesting storage version v1 PRE migration checks succesful!"
+		);
+
+		Ok(())
+	}
+
+	/// Migrate from single schedule to multi schedule storage.
+	/// WARNING: This migration will delete schedules if `MaxVestingSchedules < 1`.
+	pub(crate) fn migrate<T: Config>() -> Weight {
+		let mut reads_writes = 0;
+
+		Vesting::<T>::translate::<VestingInfo<BalanceOf<T>, T::BlockNumber>, _>(
+			|_key, vesting_info| {
+				reads_writes += 1;
+				let v: Option<
+					BoundedVec<
+						VestingInfo<BalanceOf<T>, T::BlockNumber>,
+						MaxVestingSchedulesGet<T>,
+					>,
+				> = vec![vesting_info].try_into().ok();
+
+				if v.is_none() {
+					log::warn!(
+						target: "runtime::vesting",
+						"migration: Failed to move a vesting schedule into a BoundedVec"
+					);
+				}
+
+				v
+			},
+		);
+
+		T::DbWeight::get().reads_writes(reads_writes, reads_writes)
+	}
+
+	#[cfg(feature = "try-runtime")]
+	pub(crate) fn post_migrate<T: Config>() -> Result<(), &'static str> {
+		assert_eq!(StorageVersion::<T>::get(), Releases::V1);
+
+		for (_key, schedules) in Vesting::<T>::iter() {
+			assert!(
+				schedules.len() == 1,
+				"A bounded vec with incorrect count of items was created."
+			);
+
+			for s in schedules {
+				// It is ok if this does not pass, but ideally pre-existing schedules would pass
+				// this validation logic so we can be more confident about edge cases.
+				if !s.is_valid() {
+					log::warn!(
+						target: "runtime::vesting",
+						"migration: A schedule does not pass new validation logic.",
+					)
+				}
+			}
+		}
+
+		log::debug!(
+			target: "runtime::vesting",
+			"migration: Vesting storage version v1 POST migration checks successful!"
+		);
+		Ok(())
+	}
+}
diff --git a/frame/vesting/src/mock.rs b/frame/vesting/src/mock.rs
index 4efbabefe688..cb8961150003 100644
--- a/frame/vesting/src/mock.rs
+++ b/frame/vesting/src/mock.rs
@@ -92,24 +92,33 @@ impl Config for Test {
 	type BlockNumberToBalance = Identity;
 	type Currency = Balances;
 	type Event = Event;
+	const MAX_VESTING_SCHEDULES: u32 = 3;
 	type MinVestedTransfer = MinVestedTransfer;
 	type WeightInfo = ();
 }
 
 pub struct ExtBuilder {
 	existential_deposit: u64,
+	vesting_genesis_config: Option<Vec<(u64, u64, u64, u64)>>,
 }
+
 impl Default for ExtBuilder {
 	fn default() -> Self {
-		Self { existential_deposit: 1 }
+		Self { existential_deposit: 1, vesting_genesis_config: None }
 	}
 }
+
 impl ExtBuilder {
 	pub fn existential_deposit(mut self, existential_deposit: u64) -> Self {
 		self.existential_deposit = existential_deposit;
 		self
 	}
 
+	pub fn vesting_genesis_config(mut self, config: Vec<(u64, u64, u64, u64)>) -> Self {
+		self.vesting_genesis_config = Some(config);
+		self
+	}
+
 	pub fn build(self) -> sp_io::TestExternalities {
 		EXISTENTIAL_DEPOSIT.with(|v| *v.borrow_mut() = self.existential_deposit);
 		let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
@@ -120,19 +129,25 @@ impl ExtBuilder {
 				(3, 30 * self.existential_deposit),
 				(4, 40 * self.existential_deposit),
 				(12, 10 * self.existential_deposit),
+				(13, 9999 * self.existential_deposit),
 			],
 		}
 		.assimilate_storage(&mut t)
 		.unwrap();
-		pallet_vesting::GenesisConfig::<Test> {
-			vesting: vec![
+
+		let vesting = if let Some(vesting_config) = self.vesting_genesis_config {
+			vesting_config
+		} else {
+			vec![
 				(1, 0, 10, 5 * self.existential_deposit),
 				(2, 10, 20, 0),
 				(12, 10, 20, 5 * self.existential_deposit),
-			],
-		}
-		.assimilate_storage(&mut t)
-		.unwrap();
+			]
+		};
+
+		pallet_vesting::GenesisConfig::<Test> { vesting }
+			.assimilate_storage(&mut t)
+			.unwrap();
 		let mut ext = sp_io::TestExternalities::new(t);
 		ext.execute_with(|| System::set_block_number(1));
 		ext
diff --git a/frame/vesting/src/tests.rs b/frame/vesting/src/tests.rs
index 2ee0e83933cb..2a6dd0520c3b 100644
--- a/frame/vesting/src/tests.rs
+++ b/frame/vesting/src/tests.rs
@@ -15,47 +15,62 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use frame_support::{assert_noop, assert_ok};
+use frame_support::{assert_noop, assert_ok, assert_storage_noop, dispatch::EncodeLike};
 use frame_system::RawOrigin;
-use sp_runtime::traits::BadOrigin;
+use sp_runtime::traits::{BadOrigin, Identity};
 
-use super::*;
+use super::{Vesting as VestingStorage, *};
 use crate::mock::{Balances, ExtBuilder, System, Test, Vesting};
 
+/// A default existential deposit.
+const ED: u64 = 256;
+
+/// Calls vest, and asserts that there is no entry for `account`
+/// in the `Vesting` storage item.
+fn vest_and_assert_no_vesting<T>(account: u64)
+where
+	u64: EncodeLike<<T as frame_system::Config>::AccountId>,
+	T: pallet::Config,
+{
+	// Its ok for this to fail because the user may already have no schedules.
+	let _result = Vesting::vest(Some(account).into());
+	assert!(!<VestingStorage<T>>::contains_key(account));
+}
+
 #[test]
 fn check_vesting_status() {
-	ExtBuilder::default().existential_deposit(256).build().execute_with(|| {
+	ExtBuilder::default().existential_deposit(ED).build().execute_with(|| {
 		let user1_free_balance = Balances::free_balance(&1);
 		let user2_free_balance = Balances::free_balance(&2);
 		let user12_free_balance = Balances::free_balance(&12);
-		assert_eq!(user1_free_balance, 256 * 10); // Account 1 has free balance
-		assert_eq!(user2_free_balance, 256 * 20); // Account 2 has free balance
-		assert_eq!(user12_free_balance, 256 * 10); // Account 12 has free balance
-		let user1_vesting_schedule = VestingInfo {
-			locked: 256 * 5,
-			per_block: 128, // Vesting over 10 blocks
-			starting_block: 0,
-		};
-		let user2_vesting_schedule = VestingInfo {
-			locked: 256 * 20,
-			per_block: 256, // Vesting over 20 blocks
-			starting_block: 10,
-		};
-		let user12_vesting_schedule = VestingInfo {
-			locked: 256 * 5,
-			per_block: 64, // Vesting over 20 blocks
-			starting_block: 10,
-		};
-		assert_eq!(Vesting::vesting(&1), Some(user1_vesting_schedule)); // Account 1 has a vesting schedule
-		assert_eq!(Vesting::vesting(&2), Some(user2_vesting_schedule)); // Account 2 has a vesting schedule
-		assert_eq!(Vesting::vesting(&12), Some(user12_vesting_schedule)); // Account 12 has a vesting schedule
-
-		// Account 1 has only 128 units vested from their illiquid 256 * 5 units at block 1
+		assert_eq!(user1_free_balance, ED * 10); // Account 1 has free balance
+		assert_eq!(user2_free_balance, ED * 20); // Account 2 has free balance
+		assert_eq!(user12_free_balance, ED * 10); // Account 12 has free balance
+		let user1_vesting_schedule = VestingInfo::new(
+			ED * 5,
+			128, // Vesting over 10 blocks
+			0,
+		);
+		let user2_vesting_schedule = VestingInfo::new(
+			ED * 20,
+			ED, // Vesting over 20 blocks
+			10,
+		);
+		let user12_vesting_schedule = VestingInfo::new(
+			ED * 5,
+			64, // Vesting over 20 blocks
+			10,
+		);
+		assert_eq!(Vesting::vesting(&1).unwrap(), vec![user1_vesting_schedule]); // Account 1 has a vesting schedule
+		assert_eq!(Vesting::vesting(&2).unwrap(), vec![user2_vesting_schedule]); // Account 2 has a vesting schedule
+		assert_eq!(Vesting::vesting(&12).unwrap(), vec![user12_vesting_schedule]); // Account 12 has a vesting schedule
+
+		// Account 1 has only 128 units vested from their illiquid ED * 5 units at block 1
 		assert_eq!(Vesting::vesting_balance(&1), Some(128 * 9));
 		// Account 2 has their full balance locked
 		assert_eq!(Vesting::vesting_balance(&2), Some(user2_free_balance));
 		// Account 12 has only their illiquid funds locked
-		assert_eq!(Vesting::vesting_balance(&12), Some(user12_free_balance - 256 * 5));
+		assert_eq!(Vesting::vesting_balance(&12), Some(user12_free_balance - ED * 5));
 
 		System::set_block_number(10);
 		assert_eq!(System::block_number(), 10);
@@ -65,7 +80,7 @@ fn check_vesting_status() {
 		// Account 2 has started vesting by block 10
 		assert_eq!(Vesting::vesting_balance(&2), Some(user2_free_balance));
 		// Account 12 has started vesting by block 10
-		assert_eq!(Vesting::vesting_balance(&12), Some(user12_free_balance - 256 * 5));
+		assert_eq!(Vesting::vesting_balance(&12), Some(user12_free_balance - ED * 5));
 
 		System::set_block_number(30);
 		assert_eq!(System::block_number(), 30);
@@ -73,6 +88,88 @@ fn check_vesting_status() {
 		assert_eq!(Vesting::vesting_balance(&1), Some(0)); // Account 1 is still fully vested, and not negative
 		assert_eq!(Vesting::vesting_balance(&2), Some(0)); // Account 2 has fully vested by block 30
 		assert_eq!(Vesting::vesting_balance(&12), Some(0)); // Account 2 has fully vested by block 30
+
+		// Once we unlock the funds, they are removed from storage.
+		vest_and_assert_no_vesting::<Test>(1);
+		vest_and_assert_no_vesting::<Test>(2);
+		vest_and_assert_no_vesting::<Test>(12);
+	});
+}
+
+#[test]
+fn check_vesting_status_for_multi_schedule_account() {
+	ExtBuilder::default().existential_deposit(ED).build().execute_with(|| {
+		assert_eq!(System::block_number(), 1);
+		let sched0 = VestingInfo::new(
+			ED * 20,
+			ED, // Vesting over 20 blocks
+			10,
+		);
+		// Account 2 already has a vesting schedule.
+		assert_eq!(Vesting::vesting(&2).unwrap(), vec![sched0]);
+
+		// Account 2's free balance is from sched0.
+		let free_balance = Balances::free_balance(&2);
+		assert_eq!(free_balance, ED * (20));
+		assert_eq!(Vesting::vesting_balance(&2), Some(free_balance));
+
+		// Add a 2nd schedule that is already unlocking by block #1.
+		let sched1 = VestingInfo::new(
+			ED * 10,
+			ED, // Vesting over 10 blocks
+			0,
+		);
+		assert_ok!(Vesting::vested_transfer(Some(4).into(), 2, sched1));
+		// Free balance is equal to the two existing schedules total amount.
+		let free_balance = Balances::free_balance(&2);
+		assert_eq!(free_balance, ED * (10 + 20));
+		// The most recently added schedule exists.
+		assert_eq!(Vesting::vesting(&2).unwrap(), vec![sched0, sched1]);
+		// sched1 has free funds at block #1, but nothing else.
+		assert_eq!(Vesting::vesting_balance(&2), Some(free_balance - sched1.per_block()));
+
+		// Add a 3rd schedule.
+		let sched2 = VestingInfo::new(
+			ED * 30,
+			ED, // Vesting over 30 blocks
+			5,
+		);
+		assert_ok!(Vesting::vested_transfer(Some(4).into(), 2, sched2));
+
+		System::set_block_number(9);
+		// Free balance is equal to the 3 existing schedules total amount.
+		let free_balance = Balances::free_balance(&2);
+		assert_eq!(free_balance, ED * (10 + 20 + 30));
+		// sched1 and sched2 are freeing funds at block #9.
+		assert_eq!(
+			Vesting::vesting_balance(&2),
+			Some(free_balance - sched1.per_block() * 9 - sched2.per_block() * 4)
+		);
+
+		System::set_block_number(20);
+		// At block #20 sched1 is fully unlocked while sched2 and sched0 are partially unlocked.
+		assert_eq!(
+			Vesting::vesting_balance(&2),
+			Some(
+				free_balance - sched1.locked() - sched2.per_block() * 15 - sched0.per_block() * 10
+			)
+		);
+
+		System::set_block_number(30);
+		// At block #30 sched0 and sched1 are fully unlocked while sched2 is partially unlocked.
+		assert_eq!(
+			Vesting::vesting_balance(&2),
+			Some(free_balance - sched1.locked() - sched2.per_block() * 25 - sched0.locked())
+		);
+
+		// At block #35 sched2 fully unlocks and thus all schedules funds are unlocked.
+		System::set_block_number(35);
+		assert_eq!(Vesting::vesting_balance(&2), Some(0));
+		// Since we have not called any extrinsics that would unlock funds the schedules
+		// are still in storage,
+		assert_eq!(Vesting::vesting(&2).unwrap(), vec![sched0, sched1, sched2]);
+		// but once we unlock the funds, they are removed from storage.
+		vest_and_assert_no_vesting::<Test>(2);
 	});
 }
 
@@ -102,6 +199,32 @@ fn vested_balance_should_transfer() {
 	});
 }
 
+#[test]
+fn vested_balance_should_transfer_with_multi_sched() {
+	ExtBuilder::default().existential_deposit(ED).build().execute_with(|| {
+		let sched0 = VestingInfo::new(5 * ED, 128, 0);
+		assert_ok!(Vesting::vested_transfer(Some(13).into(), 1, sched0));
+		// Total 10*ED locked for all the schedules.
+		assert_eq!(Vesting::vesting(&1).unwrap(), vec![sched0, sched0]);
+
+		let user1_free_balance = Balances::free_balance(&1);
+		assert_eq!(user1_free_balance, 3840); // Account 1 has free balance
+
+		// Account 1 has only 256 units unlocking at block 1 (plus 1280 already fee).
+		assert_eq!(Vesting::vesting_balance(&1), Some(2304));
+		assert_ok!(Vesting::vest(Some(1).into()));
+		assert_ok!(Balances::transfer(Some(1).into(), 2, 1536));
+	});
+}
+
+#[test]
+fn non_vested_cannot_vest() {
+	ExtBuilder::default().existential_deposit(ED).build().execute_with(|| {
+		assert!(!<VestingStorage<Test>>::contains_key(4));
+		assert_noop!(Vesting::vest(Some(4).into()), Error::<Test>::NotVesting);
+	});
+}
+
 #[test]
 fn vested_balance_should_transfer_using_vest_other() {
 	ExtBuilder::default().existential_deposit(10).build().execute_with(|| {
@@ -114,6 +237,32 @@ fn vested_balance_should_transfer_using_vest_other() {
 	});
 }
 
+#[test]
+fn vested_balance_should_transfer_using_vest_other_with_multi_sched() {
+	ExtBuilder::default().existential_deposit(ED).build().execute_with(|| {
+		let sched0 = VestingInfo::new(5 * ED, 128, 0);
+		assert_ok!(Vesting::vested_transfer(Some(13).into(), 1, sched0));
+		// Total of 10*ED of locked for all the schedules.
+		assert_eq!(Vesting::vesting(&1).unwrap(), vec![sched0, sched0]);
+
+		let user1_free_balance = Balances::free_balance(&1);
+		assert_eq!(user1_free_balance, 3840); // Account 1 has free balance
+
+		// Account 1 has only 256 units unlocking at block 1 (plus 1280 already free).
+		assert_eq!(Vesting::vesting_balance(&1), Some(2304));
+		assert_ok!(Vesting::vest_other(Some(2).into(), 1));
+		assert_ok!(Balances::transfer(Some(1).into(), 2, 1536));
+	});
+}
+
+#[test]
+fn non_vested_cannot_vest_other() {
+	ExtBuilder::default().existential_deposit(ED).build().execute_with(|| {
+		assert!(!<VestingStorage<Test>>::contains_key(4));
+		assert_noop!(Vesting::vest_other(Some(3).into(), 4), Error::<Test>::NotVesting);
+	});
+}
+
 #[test]
 fn extra_balance_should_transfer() {
 	ExtBuilder::default().existential_deposit(10).build().execute_with(|| {
@@ -148,12 +297,12 @@ fn liquid_funds_should_transfer_with_delayed_vesting() {
 		assert_eq!(Vesting::vesting_balance(&12), Some(user12_free_balance - 256 * 5));
 
 		// Account 12 has delayed vesting
-		let user12_vesting_schedule = VestingInfo {
-			locked: 256 * 5,
-			per_block: 64, // Vesting over 20 blocks
-			starting_block: 10,
-		};
-		assert_eq!(Vesting::vesting(&12), Some(user12_vesting_schedule));
+		let user12_vesting_schedule = VestingInfo::new(
+			256 * 5,
+			64, // Vesting over 20 blocks
+			10,
+		);
+		assert_eq!(Vesting::vesting(&12).unwrap(), vec![user12_vesting_schedule]);
 
 		// Account 12 can still send liquid funds
 		assert_ok!(Balances::transfer(Some(12).into(), 3, 256 * 5));
@@ -170,14 +319,14 @@ fn vested_transfer_works() {
 		// Account 4 should not have any vesting yet.
 		assert_eq!(Vesting::vesting(&4), None);
 		// Make the schedule for the new transfer.
-		let new_vesting_schedule = VestingInfo {
-			locked: 256 * 5,
-			per_block: 64, // Vesting over 20 blocks
-			starting_block: 10,
-		};
+		let new_vesting_schedule = VestingInfo::new(
+			256 * 5,
+			64, // Vesting over 20 blocks
+			10,
+		);
 		assert_ok!(Vesting::vested_transfer(Some(3).into(), 4, new_vesting_schedule));
 		// Now account 4 should have vesting.
-		assert_eq!(Vesting::vesting(&4), Some(new_vesting_schedule));
+		assert_eq!(Vesting::vesting(&4).unwrap(), vec![new_vesting_schedule]);
 		// Ensure the transfer happened correctly.
 		let user3_free_balance_updated = Balances::free_balance(&3);
 		assert_eq!(user3_free_balance_updated, 256 * 25);
@@ -195,66 +344,117 @@ fn vested_transfer_works() {
 		System::set_block_number(30);
 		assert_eq!(System::block_number(), 30);
 
-		// Account 4 has fully vested.
+		// Account 4 has fully vested,
 		assert_eq!(Vesting::vesting_balance(&4), Some(0));
+		// and after unlocking its schedules are removed from storage.
+		vest_and_assert_no_vesting::<Test>(4);
 	});
 }
 
 #[test]
 fn vested_transfer_correctly_fails() {
-	ExtBuilder::default().existential_deposit(256).build().execute_with(|| {
+	ExtBuilder::default().existential_deposit(ED).build().execute_with(|| {
 		let user2_free_balance = Balances::free_balance(&2);
 		let user4_free_balance = Balances::free_balance(&4);
-		assert_eq!(user2_free_balance, 256 * 20);
-		assert_eq!(user4_free_balance, 256 * 40);
+		assert_eq!(user2_free_balance, ED * 20);
+		assert_eq!(user4_free_balance, ED * 40);
+
 		// Account 2 should already have a vesting schedule.
-		let user2_vesting_schedule = VestingInfo {
-			locked: 256 * 20,
-			per_block: 256, // Vesting over 20 blocks
-			starting_block: 10,
-		};
-		assert_eq!(Vesting::vesting(&2), Some(user2_vesting_schedule));
-
-		// The vesting schedule we will try to create, fails due to pre-existence of schedule.
-		let new_vesting_schedule = VestingInfo {
-			locked: 256 * 5,
-			per_block: 64, // Vesting over 20 blocks
-			starting_block: 10,
-		};
-		assert_noop!(
-			Vesting::vested_transfer(Some(4).into(), 2, new_vesting_schedule),
-			Error::<Test>::ExistingVestingSchedule,
+		let user2_vesting_schedule = VestingInfo::new(
+			ED * 20,
+			ED, // Vesting over 20 blocks
+			10,
 		);
+		assert_eq!(Vesting::vesting(&2).unwrap(), vec![user2_vesting_schedule]);
 
 		// Fails due to too low transfer amount.
 		let new_vesting_schedule_too_low =
-			VestingInfo { locked: 256 * 1, per_block: 64, starting_block: 10 };
+			VestingInfo::new(<Test as Config>::MinVestedTransfer::get() - 1, 64, 10);
 		assert_noop!(
 			Vesting::vested_transfer(Some(3).into(), 4, new_vesting_schedule_too_low),
 			Error::<Test>::AmountLow,
 		);
 
-		// Verify no currency transfer happened.
-		assert_eq!(user2_free_balance, 256 * 20);
-		assert_eq!(user4_free_balance, 256 * 40);
+		// `per_block` is 0, which would result in a schedule with infinite duration.
+		let schedule_per_block_0 =
+			VestingInfo::new(<Test as Config>::MinVestedTransfer::get(), 0, 10);
+		assert_noop!(
+			Vesting::vested_transfer(Some(13).into(), 4, schedule_per_block_0),
+			Error::<Test>::InvalidScheduleParams,
+		);
+
+		// `locked` is 0.
+		let schedule_locked_0 = VestingInfo::new(0, 1, 10);
+		assert_noop!(
+			Vesting::vested_transfer(Some(3).into(), 4, schedule_locked_0),
+			Error::<Test>::AmountLow,
+		);
+
+		// Free balance has not changed.
+		assert_eq!(user2_free_balance, Balances::free_balance(&2));
+		assert_eq!(user4_free_balance, Balances::free_balance(&4));
+		// Account 4 has no schedules.
+		vest_and_assert_no_vesting::<Test>(4);
+	});
+}
+
+#[test]
+fn vested_transfer_allows_max_schedules() {
+	ExtBuilder::default().existential_deposit(ED).build().execute_with(|| {
+		let mut user_4_free_balance = Balances::free_balance(&4);
+		let max_schedules = <Test as Config>::MAX_VESTING_SCHEDULES;
+		let sched = VestingInfo::new(
+			<Test as Config>::MinVestedTransfer::get(),
+			1, // Vest over 2 * 256 blocks.
+			10,
+		);
+
+		// Add max amount schedules to user 4.
+		for _ in 0..max_schedules {
+			assert_ok!(Vesting::vested_transfer(Some(13).into(), 4, sched));
+		}
+
+		// The schedules count towards vesting balance
+		let transferred_amount = <Test as Config>::MinVestedTransfer::get() * max_schedules as u64;
+		assert_eq!(Vesting::vesting_balance(&4), Some(transferred_amount));
+		// and free balance.
+		user_4_free_balance += transferred_amount;
+		assert_eq!(Balances::free_balance(&4), user_4_free_balance);
+
+		// Cannot insert a 4th vesting schedule when `MaxVestingSchedules` === 3,
+		assert_noop!(
+			Vesting::vested_transfer(Some(3).into(), 4, sched),
+			Error::<Test>::AtMaxVestingSchedules,
+		);
+		// so the free balance does not change.
+		assert_eq!(Balances::free_balance(&4), user_4_free_balance);
+
+		// Account 4 has fully vested when all the schedules end,
+		System::set_block_number(
+			<Test as Config>::MinVestedTransfer::get() + sched.starting_block(),
+		);
+		assert_eq!(Vesting::vesting_balance(&4), Some(0));
+		// and after unlocking its schedules are removed from storage.
+		vest_and_assert_no_vesting::<Test>(4);
 	});
 }
 
 #[test]
 fn force_vested_transfer_works() {
-	ExtBuilder::default().existential_deposit(256).build().execute_with(|| {
+	ExtBuilder::default().existential_deposit(ED).build().execute_with(|| {
 		let user3_free_balance = Balances::free_balance(&3);
 		let user4_free_balance = Balances::free_balance(&4);
-		assert_eq!(user3_free_balance, 256 * 30);
-		assert_eq!(user4_free_balance, 256 * 40);
+		assert_eq!(user3_free_balance, ED * 30);
+		assert_eq!(user4_free_balance, ED * 40);
 		// Account 4 should not have any vesting yet.
 		assert_eq!(Vesting::vesting(&4), None);
 		// Make the schedule for the new transfer.
-		let new_vesting_schedule = VestingInfo {
-			locked: 256 * 5,
-			per_block: 64, // Vesting over 20 blocks
-			starting_block: 10,
-		};
+		let new_vesting_schedule = VestingInfo::new(
+			ED * 5,
+			64, // Vesting over 20 blocks
+			10,
+		);
+
 		assert_noop!(
 			Vesting::force_vested_transfer(Some(4).into(), 3, 4, new_vesting_schedule),
 			BadOrigin
@@ -266,14 +466,15 @@ fn force_vested_transfer_works() {
 			new_vesting_schedule
 		));
 		// Now account 4 should have vesting.
-		assert_eq!(Vesting::vesting(&4), Some(new_vesting_schedule));
+		assert_eq!(Vesting::vesting(&4).unwrap()[0], new_vesting_schedule);
+		assert_eq!(Vesting::vesting(&4).unwrap().len(), 1);
 		// Ensure the transfer happened correctly.
 		let user3_free_balance_updated = Balances::free_balance(&3);
-		assert_eq!(user3_free_balance_updated, 256 * 25);
+		assert_eq!(user3_free_balance_updated, ED * 25);
 		let user4_free_balance_updated = Balances::free_balance(&4);
-		assert_eq!(user4_free_balance_updated, 256 * 45);
-		// Account 4 has 5 * 256 locked.
-		assert_eq!(Vesting::vesting_balance(&4), Some(256 * 5));
+		assert_eq!(user4_free_balance_updated, ED * 45);
+		// Account 4 has 5 * ED locked.
+		assert_eq!(Vesting::vesting_balance(&4), Some(ED * 5));
 
 		System::set_block_number(20);
 		assert_eq!(System::block_number(), 20);
@@ -284,40 +485,31 @@ fn force_vested_transfer_works() {
 		System::set_block_number(30);
 		assert_eq!(System::block_number(), 30);
 
-		// Account 4 has fully vested.
+		// Account 4 has fully vested,
 		assert_eq!(Vesting::vesting_balance(&4), Some(0));
+		// and after unlocking its schedules are removed from storage.
+		vest_and_assert_no_vesting::<Test>(4);
 	});
 }
 
 #[test]
 fn force_vested_transfer_correctly_fails() {
-	ExtBuilder::default().existential_deposit(256).build().execute_with(|| {
+	ExtBuilder::default().existential_deposit(ED).build().execute_with(|| {
 		let user2_free_balance = Balances::free_balance(&2);
 		let user4_free_balance = Balances::free_balance(&4);
-		assert_eq!(user2_free_balance, 256 * 20);
-		assert_eq!(user4_free_balance, 256 * 40);
+		assert_eq!(user2_free_balance, ED * 20);
+		assert_eq!(user4_free_balance, ED * 40);
 		// Account 2 should already have a vesting schedule.
-		let user2_vesting_schedule = VestingInfo {
-			locked: 256 * 20,
-			per_block: 256, // Vesting over 20 blocks
-			starting_block: 10,
-		};
-		assert_eq!(Vesting::vesting(&2), Some(user2_vesting_schedule));
-
-		// The vesting schedule we will try to create, fails due to pre-existence of schedule.
-		let new_vesting_schedule = VestingInfo {
-			locked: 256 * 5,
-			per_block: 64, // Vesting over 20 blocks
-			starting_block: 10,
-		};
-		assert_noop!(
-			Vesting::force_vested_transfer(RawOrigin::Root.into(), 4, 2, new_vesting_schedule),
-			Error::<Test>::ExistingVestingSchedule,
+		let user2_vesting_schedule = VestingInfo::new(
+			ED * 20,
+			ED, // Vesting over 20 blocks
+			10,
 		);
+		assert_eq!(Vesting::vesting(&2).unwrap(), vec![user2_vesting_schedule]);
 
-		// Fails due to too low transfer amount.
+		// Too low transfer amount.
 		let new_vesting_schedule_too_low =
-			VestingInfo { locked: 256 * 1, per_block: 64, starting_block: 10 };
+			VestingInfo::new(<Test as Config>::MinVestedTransfer::get() - 1, 64, 10);
 		assert_noop!(
 			Vesting::force_vested_transfer(
 				RawOrigin::Root.into(),
@@ -328,8 +520,638 @@ fn force_vested_transfer_correctly_fails() {
 			Error::<Test>::AmountLow,
 		);
 
+		// `per_block` is 0.
+		let schedule_per_block_0 =
+			VestingInfo::new(<Test as Config>::MinVestedTransfer::get(), 0, 10);
+		assert_noop!(
+			Vesting::force_vested_transfer(RawOrigin::Root.into(), 13, 4, schedule_per_block_0),
+			Error::<Test>::InvalidScheduleParams,
+		);
+
+		// `locked` is 0.
+		let schedule_locked_0 = VestingInfo::new(0, 1, 10);
+		assert_noop!(
+			Vesting::force_vested_transfer(RawOrigin::Root.into(), 3, 4, schedule_locked_0),
+			Error::<Test>::AmountLow,
+		);
+
 		// Verify no currency transfer happened.
-		assert_eq!(user2_free_balance, 256 * 20);
-		assert_eq!(user4_free_balance, 256 * 40);
+		assert_eq!(user2_free_balance, Balances::free_balance(&2));
+		assert_eq!(user4_free_balance, Balances::free_balance(&4));
+		// Account 4 has no schedules.
+		vest_and_assert_no_vesting::<Test>(4);
+	});
+}
+
+#[test]
+fn force_vested_transfer_allows_max_schedules() {
+	ExtBuilder::default().existential_deposit(ED).build().execute_with(|| {
+		let mut user_4_free_balance = Balances::free_balance(&4);
+		let max_schedules = <Test as Config>::MAX_VESTING_SCHEDULES;
+		let sched = VestingInfo::new(
+			<Test as Config>::MinVestedTransfer::get(),
+			1, // Vest over 2 * 256 blocks.
+			10,
+		);
+
+		// Add max amount schedules to user 4.
+		for _ in 0..max_schedules {
+			assert_ok!(Vesting::force_vested_transfer(RawOrigin::Root.into(), 13, 4, sched));
+		}
+
+		// The schedules count towards vesting balance.
+		let transferred_amount = <Test as Config>::MinVestedTransfer::get() * max_schedules as u64;
+		assert_eq!(Vesting::vesting_balance(&4), Some(transferred_amount));
+		// and free balance.
+		user_4_free_balance += transferred_amount;
+		assert_eq!(Balances::free_balance(&4), user_4_free_balance);
+
+		// Cannot insert a 4th vesting schedule when `MaxVestingSchedules` === 3
+		assert_noop!(
+			Vesting::force_vested_transfer(RawOrigin::Root.into(), 3, 4, sched),
+			Error::<Test>::AtMaxVestingSchedules,
+		);
+		// so the free balance does not change.
+		assert_eq!(Balances::free_balance(&4), user_4_free_balance);
+
+		// Account 4 has fully vested when all the schedules end,
+		System::set_block_number(<Test as Config>::MinVestedTransfer::get() + 10);
+		assert_eq!(Vesting::vesting_balance(&4), Some(0));
+		// and after unlocking its schedules are removed from storage.
+		vest_and_assert_no_vesting::<Test>(4);
+	});
+}
+
+#[test]
+fn merge_schedules_that_have_not_started() {
+	ExtBuilder::default().existential_deposit(ED).build().execute_with(|| {
+		// Account 2 should already have a vesting schedule.
+		let sched0 = VestingInfo::new(
+			ED * 20,
+			ED, // Vest over 20 blocks.
+			10,
+		);
+		assert_eq!(Vesting::vesting(&2).unwrap(), vec![sched0]);
+		assert_eq!(Balances::usable_balance(&2), 0);
+
+		// Add a schedule that is identical to the one that already exists.
+		assert_ok!(Vesting::vested_transfer(Some(3).into(), 2, sched0));
+		assert_eq!(Vesting::vesting(&2).unwrap(), vec![sched0, sched0]);
+		assert_eq!(Balances::usable_balance(&2), 0);
+		assert_ok!(Vesting::merge_schedules(Some(2).into(), 0, 1));
+
+		// Since we merged identical schedules, the new schedule finishes at the same
+		// time as the original, just with double the amount.
+		let sched1 = VestingInfo::new(
+			sched0.locked() * 2,
+			sched0.per_block() * 2,
+			10, // Starts at the block the schedules are merged/
+		);
+		assert_eq!(Vesting::vesting(&2).unwrap(), vec![sched1]);
+
+		assert_eq!(Balances::usable_balance(&2), 0);
+	});
+}
+
+#[test]
+fn merge_ongoing_schedules() {
+	// Merging two schedules that have started will vest both before merging.
+	ExtBuilder::default().existential_deposit(ED).build().execute_with(|| {
+		// Account 2 should already have a vesting schedule.
+		let sched0 = VestingInfo::new(
+			ED * 20,
+			ED, // Vest over 20 blocks.
+			10,
+		);
+		assert_eq!(Vesting::vesting(&2).unwrap(), vec![sched0]);
+
+		let sched1 = VestingInfo::new(
+			ED * 10,
+			ED,                          // Vest over 10 blocks.
+			sched0.starting_block() + 5, // Start at block 15.
+		);
+		assert_ok!(Vesting::vested_transfer(Some(4).into(), 2, sched1));
+		assert_eq!(Vesting::vesting(&2).unwrap(), vec![sched0, sched1]);
+
+		// Got to half way through the second schedule where both schedules are actively vesting.
+		let cur_block = 20;
+		System::set_block_number(cur_block);
+
+		// Account 2 has no usable balances prior to the merge because they have not unlocked
+		// with `vest` yet.
+		assert_eq!(Balances::usable_balance(&2), 0);
+
+		assert_ok!(Vesting::merge_schedules(Some(2).into(), 0, 1));
+
+		// Merging schedules un-vests all pre-existing schedules prior to merging, which is
+		// reflected in account 2's updated usable balance.
+		let sched0_vested_now = sched0.per_block() * (cur_block - sched0.starting_block());
+		let sched1_vested_now = sched1.per_block() * (cur_block - sched1.starting_block());
+		assert_eq!(Balances::usable_balance(&2), sched0_vested_now + sched1_vested_now);
+
+		// The locked amount is the sum of what both schedules have locked at the current block.
+		let sched2_locked = sched1
+			.locked_at::<Identity>(cur_block)
+			.saturating_add(sched0.locked_at::<Identity>(cur_block));
+		// End block of the new schedule is the greater of either merged schedule.
+		let sched2_end = sched1
+			.ending_block_as_balance::<Identity>()
+			.max(sched0.ending_block_as_balance::<Identity>());
+		let sched2_duration = sched2_end - cur_block;
+		// Based off the new schedules total locked and its duration, we can calculate the
+		// amount to unlock per block.
+		let sched2_per_block = sched2_locked / sched2_duration;
+
+		let sched2 = VestingInfo::new(sched2_locked, sched2_per_block, cur_block);
+		assert_eq!(Vesting::vesting(&2).unwrap(), vec![sched2]);
+
+		// And just to double check, we assert the new merged schedule we be cleaned up as expected.
+		System::set_block_number(30);
+		vest_and_assert_no_vesting::<Test>(2);
+	});
+}
+
+#[test]
+fn merging_shifts_other_schedules_index() {
+	// Schedules being merged are filtered out, schedules to the right of any merged
+	// schedule shift left and the merged schedule is always last.
+	ExtBuilder::default().existential_deposit(ED).build().execute_with(|| {
+		let sched0 = VestingInfo::new(
+			ED * 10,
+			ED, // Vesting over 10 blocks.
+			10,
+		);
+		let sched1 = VestingInfo::new(
+			ED * 11,
+			ED, // Vesting over 11 blocks.
+			11,
+		);
+		let sched2 = VestingInfo::new(
+			ED * 12,
+			ED, // Vesting over 12 blocks.
+			12,
+		);
+
+		// Account 3 starts out with no schedules,
+		assert_eq!(Vesting::vesting(&3), None);
+		// and some usable balance.
+		let usable_balance = Balances::usable_balance(&3);
+		assert_eq!(usable_balance, 30 * ED);
+
+		let cur_block = 1;
+		assert_eq!(System::block_number(), cur_block);
+
+		// Transfer the above 3 schedules to account 3.
+		assert_ok!(Vesting::vested_transfer(Some(4).into(), 3, sched0));
+		assert_ok!(Vesting::vested_transfer(Some(4).into(), 3, sched1));
+		assert_ok!(Vesting::vested_transfer(Some(4).into(), 3, sched2));
+
+		// With no schedules vested or merged they are in the order they are created
+		assert_eq!(Vesting::vesting(&3).unwrap(), vec![sched0, sched1, sched2]);
+		// and the usable balance has not changed.
+		assert_eq!(usable_balance, Balances::usable_balance(&3));
+
+		assert_ok!(Vesting::merge_schedules(Some(3).into(), 0, 2));
+
+		// Create the merged schedule of sched0 & sched2.
+		// The merged schedule will have the max possible starting block,
+		let sched3_start = sched1.starting_block().max(sched2.starting_block());
+		// `locked` equal to the sum of the two schedules locked through the current block,
+		let sched3_locked =
+			sched2.locked_at::<Identity>(cur_block) + sched0.locked_at::<Identity>(cur_block);
+		// and will end at the max possible block.
+		let sched3_end = sched2
+			.ending_block_as_balance::<Identity>()
+			.max(sched0.ending_block_as_balance::<Identity>());
+		let sched3_duration = sched3_end - sched3_start;
+		let sched3_per_block = sched3_locked / sched3_duration;
+		let sched3 = VestingInfo::new(sched3_locked, sched3_per_block, sched3_start);
+
+		// The not touched schedule moves left and the new merged schedule is appended.
+		assert_eq!(Vesting::vesting(&3).unwrap(), vec![sched1, sched3]);
+		// The usable balance hasn't changed since none of the schedules have started.
+		assert_eq!(Balances::usable_balance(&3), usable_balance);
+	});
+}
+
+#[test]
+fn merge_ongoing_and_yet_to_be_started_schedules() {
+	// Merge an ongoing schedule that has had `vest` called and a schedule that has not already
+	// started.
+	ExtBuilder::default().existential_deposit(ED).build().execute_with(|| {
+		// Account 2 should already have a vesting schedule.
+		let sched0 = VestingInfo::new(
+			ED * 20,
+			ED, // Vesting over 20 blocks
+			10,
+		);
+		assert_eq!(Vesting::vesting(&2).unwrap(), vec![sched0]);
+
+		// Fast forward to half way through the life of sched1.
+		let mut cur_block =
+			(sched0.starting_block() + sched0.ending_block_as_balance::<Identity>()) / 2;
+		assert_eq!(cur_block, 20);
+		System::set_block_number(cur_block);
+
+		// Prior to vesting there is no usable balance.
+		let mut usable_balance = 0;
+		assert_eq!(Balances::usable_balance(&2), usable_balance);
+		// Vest the current schedules (which is just sched0 now).
+		Vesting::vest(Some(2).into()).unwrap();
+
+		// After vesting the usable balance increases by the unlocked amount.
+		let sched0_vested_now = sched0.locked() - sched0.locked_at::<Identity>(cur_block);
+		usable_balance += sched0_vested_now;
+		assert_eq!(Balances::usable_balance(&2), usable_balance);
+
+		// Go forward a block.
+		cur_block += 1;
+		System::set_block_number(cur_block);
+
+		// And add a schedule that starts after this block, but before sched0 finishes.
+		let sched1 = VestingInfo::new(
+			ED * 10,
+			1, // Vesting over 256 * 10 (2560) blocks
+			cur_block + 1,
+		);
+		assert_ok!(Vesting::vested_transfer(Some(4).into(), 2, sched1));
+
+		// Merge the schedules before sched1 starts.
+		assert_ok!(Vesting::merge_schedules(Some(2).into(), 0, 1));
+		// After merging, the usable balance only changes by the amount sched0 vested since we
+		// last called `vest` (which is just 1 block). The usable balance is not affected by
+		// sched1 because it has not started yet.
+		usable_balance += sched0.per_block();
+		assert_eq!(Balances::usable_balance(&2), usable_balance);
+
+		// The resulting schedule will have the later starting block of the two,
+		let sched2_start = sched1.starting_block();
+		// `locked` equal to the sum of the two schedules locked through the current block,
+		let sched2_locked =
+			sched0.locked_at::<Identity>(cur_block) + sched1.locked_at::<Identity>(cur_block);
+		// and will end at the max possible block.
+		let sched2_end = sched0
+			.ending_block_as_balance::<Identity>()
+			.max(sched1.ending_block_as_balance::<Identity>());
+		let sched2_duration = sched2_end - sched2_start;
+		let sched2_per_block = sched2_locked / sched2_duration;
+
+		let sched2 = VestingInfo::new(sched2_locked, sched2_per_block, sched2_start);
+		assert_eq!(Vesting::vesting(&2).unwrap(), vec![sched2]);
+	});
+}
+
+#[test]
+fn merge_finished_and_ongoing_schedules() {
+	// If a schedule finishes by the current block we treat the ongoing schedule,
+	// without any alterations, as the merged one.
+	ExtBuilder::default().existential_deposit(ED).build().execute_with(|| {
+		// Account 2 should already have a vesting schedule.
+		let sched0 = VestingInfo::new(
+			ED * 20,
+			ED, // Vesting over 20 blocks.
+			10,
+		);
+		assert_eq!(Vesting::vesting(&2).unwrap(), vec![sched0]);
+
+		let sched1 = VestingInfo::new(
+			ED * 40,
+			ED, // Vesting over 40 blocks.
+			10,
+		);
+		assert_ok!(Vesting::vested_transfer(Some(4).into(), 2, sched1));
+
+		// Transfer a 3rd schedule, so we can demonstrate how schedule indices change.
+		// (We are not merging this schedule.)
+		let sched2 = VestingInfo::new(
+			ED * 30,
+			ED, // Vesting over 30 blocks.
+			10,
+		);
+		assert_ok!(Vesting::vested_transfer(Some(3).into(), 2, sched2));
+
+		// The schedules are in expected order prior to merging.
+		assert_eq!(Vesting::vesting(&2).unwrap(), vec![sched0, sched1, sched2]);
+
+		// Fast forward to sched0's end block.
+		let cur_block = sched0.ending_block_as_balance::<Identity>();
+		System::set_block_number(cur_block);
+		assert_eq!(System::block_number(), 30);
+
+		// Prior to `merge_schedules` and with no vest/vest_other called the user has no usable
+		// balance.
+		assert_eq!(Balances::usable_balance(&2), 0);
+		assert_ok!(Vesting::merge_schedules(Some(2).into(), 0, 1));
+
+		// sched2 is now the first, since sched0 & sched1 get filtered out while "merging".
+		// sched1 gets treated like the new merged schedule by getting pushed onto back
+		// of the vesting schedules vec. Note: sched0 finished at the current block.
+		assert_eq!(Vesting::vesting(&2).unwrap(), vec![sched2, sched1]);
+
+		// sched0 has finished, so its funds are fully unlocked.
+		let sched0_unlocked_now = sched0.locked();
+		// The remaining schedules are ongoing, so their funds are partially unlocked.
+		let sched1_unlocked_now = sched1.locked() - sched1.locked_at::<Identity>(cur_block);
+		let sched2_unlocked_now = sched2.locked() - sched2.locked_at::<Identity>(cur_block);
+
+		// Since merging also vests all the schedules, the users usable balance after merging
+		// includes all pre-existing schedules unlocked through the current block, including
+		// schedules not merged.
+		assert_eq!(
+			Balances::usable_balance(&2),
+			sched0_unlocked_now + sched1_unlocked_now + sched2_unlocked_now
+		);
+	});
+}
+
+#[test]
+fn merge_finishing_schedules_does_not_create_a_new_one() {
+	// If both schedules finish by the current block we don't create new one
+	ExtBuilder::default().existential_deposit(ED).build().execute_with(|| {
+		// Account 2 should already have a vesting schedule.
+		let sched0 = VestingInfo::new(
+			ED * 20,
+			ED, // 20 block duration.
+			10,
+		);
+		assert_eq!(Vesting::vesting(&2).unwrap(), vec![sched0]);
+
+		// Create sched1 and transfer it to account 2.
+		let sched1 = VestingInfo::new(
+			ED * 30,
+			ED, // 30 block duration.
+			10,
+		);
+		assert_ok!(Vesting::vested_transfer(Some(3).into(), 2, sched1));
+		assert_eq!(Vesting::vesting(&2).unwrap(), vec![sched0, sched1]);
+
+		let all_scheds_end = sched0
+			.ending_block_as_balance::<Identity>()
+			.max(sched1.ending_block_as_balance::<Identity>());
+
+		assert_eq!(all_scheds_end, 40);
+		System::set_block_number(all_scheds_end);
+
+		// Prior to merge_schedules and with no vest/vest_other called the user has no usable
+		// balance.
+		assert_eq!(Balances::usable_balance(&2), 0);
+
+		// Merge schedule 0 and 1.
+		assert_ok!(Vesting::merge_schedules(Some(2).into(), 0, 1));
+		// The user no longer has any more vesting schedules because they both ended at the
+		// block they where merged,
+		assert!(!<VestingStorage<Test>>::contains_key(&2));
+		// and their usable balance has increased by the total amount locked in the merged
+		// schedules.
+		assert_eq!(Balances::usable_balance(&2), sched0.locked() + sched1.locked());
+	});
+}
+
+#[test]
+fn merge_finished_and_yet_to_be_started_schedules() {
+	ExtBuilder::default().existential_deposit(ED).build().execute_with(|| {
+		// Account 2 should already have a vesting schedule.
+		let sched0 = VestingInfo::new(
+			ED * 20,
+			ED, // 20 block duration.
+			10, // Ends at block 30
+		);
+		assert_eq!(Vesting::vesting(&2).unwrap(), vec![sched0]);
+
+		let sched1 = VestingInfo::new(
+			ED * 30,
+			ED * 2, // 30 block duration.
+			35,
+		);
+		assert_ok!(Vesting::vested_transfer(Some(13).into(), 2, sched1));
+		assert_eq!(Vesting::vesting(&2).unwrap(), vec![sched0, sched1]);
+
+		let sched2 = VestingInfo::new(
+			ED * 40,
+			ED, // 40 block duration.
+			30,
+		);
+		// Add a 3rd schedule to demonstrate how sched1 shifts.
+		assert_ok!(Vesting::vested_transfer(Some(13).into(), 2, sched2));
+		assert_eq!(Vesting::vesting(&2).unwrap(), vec![sched0, sched1, sched2]);
+
+		System::set_block_number(30);
+
+		// At block 30, sched0 has finished unlocking while sched1 and sched2 are still fully
+		// locked,
+		assert_eq!(Vesting::vesting_balance(&2), Some(sched1.locked() + sched2.locked()));
+		// but since we have not vested usable balance is still 0.
+		assert_eq!(Balances::usable_balance(&2), 0);
+
+		// Merge schedule 0 and 1.
+		assert_ok!(Vesting::merge_schedules(Some(2).into(), 0, 1));
+
+		// sched0 is removed since it finished, and sched1 is removed and then pushed on the back
+		// because it is treated as the merged schedule
+		assert_eq!(Vesting::vesting(&2).unwrap(), vec![sched2, sched1]);
+
+		// The usable balance is updated because merging fully unlocked sched0.
+		assert_eq!(Balances::usable_balance(&2), sched0.locked());
+	});
+}
+
+#[test]
+fn merge_schedules_throws_proper_errors() {
+	ExtBuilder::default().existential_deposit(ED).build().execute_with(|| {
+		// Account 2 should already have a vesting schedule.
+		let sched0 = VestingInfo::new(
+			ED * 20,
+			ED, // 20 block duration.
+			10,
+		);
+		assert_eq!(Vesting::vesting(&2).unwrap(), vec![sched0]);
+
+		// Account 2 only has 1 vesting schedule.
+		assert_noop!(
+			Vesting::merge_schedules(Some(2).into(), 0, 1),
+			Error::<Test>::ScheduleIndexOutOfBounds
+		);
+
+		// Account 4 has 0 vesting schedules.
+		assert_eq!(Vesting::vesting(&4), None);
+		assert_noop!(Vesting::merge_schedules(Some(4).into(), 0, 1), Error::<Test>::NotVesting);
+
+		// There are enough schedules to merge but an index is non-existent.
+		Vesting::vested_transfer(Some(3).into(), 2, sched0).unwrap();
+		assert_eq!(Vesting::vesting(&2).unwrap(), vec![sched0, sched0]);
+		assert_noop!(
+			Vesting::merge_schedules(Some(2).into(), 0, 2),
+			Error::<Test>::ScheduleIndexOutOfBounds
+		);
+
+		// It is a storage noop with no errors if the indexes are the same.
+		assert_storage_noop!(Vesting::merge_schedules(Some(2).into(), 0, 0).unwrap());
+	});
+}
+
+#[test]
+fn generates_multiple_schedules_from_genesis_config() {
+	let vesting_config = vec![
+		// 5 * existential deposit locked.
+		(1, 0, 10, 5 * ED),
+		// 1 * existential deposit locked.
+		(2, 10, 20, 19 * ED),
+		// 2 * existential deposit locked.
+		(2, 10, 20, 18 * ED),
+		// 1 * existential deposit locked.
+		(12, 10, 20, 9 * ED),
+		// 2 * existential deposit locked.
+		(12, 10, 20, 8 * ED),
+		// 3 * existential deposit locked.
+		(12, 10, 20, 7 * ED),
+	];
+	ExtBuilder::default()
+		.existential_deposit(ED)
+		.vesting_genesis_config(vesting_config)
+		.build()
+		.execute_with(|| {
+			let user1_sched1 = VestingInfo::new(5 * ED, 128, 0u64);
+			assert_eq!(Vesting::vesting(&1).unwrap(), vec![user1_sched1]);
+
+			let user2_sched1 = VestingInfo::new(1 * ED, 12, 10u64);
+			let user2_sched2 = VestingInfo::new(2 * ED, 25, 10u64);
+			assert_eq!(Vesting::vesting(&2).unwrap(), vec![user2_sched1, user2_sched2]);
+
+			let user12_sched1 = VestingInfo::new(1 * ED, 12, 10u64);
+			let user12_sched2 = VestingInfo::new(2 * ED, 25, 10u64);
+			let user12_sched3 = VestingInfo::new(3 * ED, 38, 10u64);
+			assert_eq!(
+				Vesting::vesting(&12).unwrap(),
+				vec![user12_sched1, user12_sched2, user12_sched3]
+			);
+		});
+}
+
+#[test]
+#[should_panic]
+fn multiple_schedules_from_genesis_config_errors() {
+	// MaxVestingSchedules is 3, but this config has 4 for account 12 so we panic when building
+	// from genesis.
+	let vesting_config =
+		vec![(12, 10, 20, ED), (12, 10, 20, ED), (12, 10, 20, ED), (12, 10, 20, ED)];
+	ExtBuilder::default()
+		.existential_deposit(ED)
+		.vesting_genesis_config(vesting_config)
+		.build();
+}
+
+#[test]
+fn build_genesis_has_storage_version_v1() {
+	ExtBuilder::default().existential_deposit(ED).build().execute_with(|| {
+		assert_eq!(StorageVersion::<Test>::get(), Releases::V1);
+	});
+}
+
+#[test]
+fn merge_vesting_handles_per_block_0() {
+	ExtBuilder::default().existential_deposit(ED).build().execute_with(|| {
+		let sched0 = VestingInfo::new(
+			ED, 0, // Vesting over 256 blocks.
+			1,
+		);
+		assert_eq!(sched0.ending_block_as_balance::<Identity>(), 257);
+		let sched1 = VestingInfo::new(
+			ED * 2,
+			0, // Vesting over 512 blocks.
+			10,
+		);
+		assert_eq!(sched1.ending_block_as_balance::<Identity>(), 512u64 + 10);
+
+		let merged = VestingInfo::new(764, 1, 10);
+		assert_eq!(Vesting::merge_vesting_info(5, sched0, sched1), Some(merged));
+	});
+}
+
+#[test]
+fn vesting_info_validate_works() {
+	let min_transfer = <Test as Config>::MinVestedTransfer::get();
+	// Does not check for min transfer.
+	assert_eq!(VestingInfo::new(min_transfer - 1, 1u64, 10u64).is_valid(), true);
+
+	// `locked` cannot be 0.
+	assert_eq!(VestingInfo::new(0, 1u64, 10u64).is_valid(), false);
+
+	// `per_block` cannot be 0.
+	assert_eq!(VestingInfo::new(min_transfer + 1, 0u64, 10u64).is_valid(), false);
+
+	// With valid inputs it does not error.
+	assert_eq!(VestingInfo::new(min_transfer, 1u64, 10u64).is_valid(), true);
+}
+
+#[test]
+fn vesting_info_ending_block_as_balance_works() {
+	// Treats `per_block` 0 as 1.
+	let per_block_0 = VestingInfo::new(256u32, 0u32, 10u32);
+	assert_eq!(per_block_0.ending_block_as_balance::<Identity>(), 256 + 10);
+
+	// `per_block >= locked` always results in a schedule ending the block after it starts
+	let per_block_gt_locked = VestingInfo::new(256u32, 256 * 2u32, 10u32);
+	assert_eq!(
+		per_block_gt_locked.ending_block_as_balance::<Identity>(),
+		1 + per_block_gt_locked.starting_block()
+	);
+	let per_block_eq_locked = VestingInfo::new(256u32, 256u32, 10u32);
+	assert_eq!(
+		per_block_gt_locked.ending_block_as_balance::<Identity>(),
+		per_block_eq_locked.ending_block_as_balance::<Identity>()
+	);
+
+	// Correctly calcs end if `locked % per_block != 0`. (We need a block to unlock the remainder).
+	let imperfect_per_block = VestingInfo::new(256u32, 250u32, 10u32);
+	assert_eq!(
+		imperfect_per_block.ending_block_as_balance::<Identity>(),
+		imperfect_per_block.starting_block() + 2u32,
+	);
+	assert_eq!(
+		imperfect_per_block
+			.locked_at::<Identity>(imperfect_per_block.ending_block_as_balance::<Identity>()),
+		0
+	);
+}
+
+#[test]
+fn per_block_works() {
+	let per_block_0 = VestingInfo::new(256u32, 0u32, 10u32);
+	assert_eq!(per_block_0.per_block(), 1u32);
+	assert_eq!(per_block_0.raw_per_block(), 0u32);
+
+	let per_block_1 = VestingInfo::new(256u32, 1u32, 10u32);
+	assert_eq!(per_block_1.per_block(), 1u32);
+	assert_eq!(per_block_1.raw_per_block(), 1u32);
+}
+
+// When an accounts free balance + schedule.locked is less than ED, the vested transfer will fail.
+#[test]
+fn vested_transfer_less_than_existential_deposit_fails() {
+	ExtBuilder::default().existential_deposit(4 * ED).build().execute_with(|| {
+		// MinVestedTransfer is less the ED.
+		assert!(
+			<Test as Config>::Currency::minimum_balance() >
+				<Test as Config>::MinVestedTransfer::get()
+		);
+
+		let sched =
+			VestingInfo::new(<Test as Config>::MinVestedTransfer::get() as u64, 1u64, 10u64);
+		// The new account balance with the schedule's locked amount would be less than ED.
+		assert!(
+			Balances::free_balance(&99) + sched.locked() <
+				<Test as Config>::Currency::minimum_balance()
+		);
+
+		// vested_transfer fails.
+		assert_noop!(
+			Vesting::vested_transfer(Some(3).into(), 99, sched),
+			pallet_balances::Error::<Test, _>::ExistentialDeposit,
+		);
+		// force_vested_transfer fails.
+		assert_noop!(
+			Vesting::force_vested_transfer(RawOrigin::Root.into(), 3, 99, sched),
+			pallet_balances::Error::<Test, _>::ExistentialDeposit,
+		);
 	});
 }
diff --git a/frame/vesting/src/vesting_info.rs b/frame/vesting/src/vesting_info.rs
new file mode 100644
index 000000000000..72171910086c
--- /dev/null
+++ b/frame/vesting/src/vesting_info.rs
@@ -0,0 +1,114 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Module to enforce private fields on `VestingInfo`.
+
+use super::*;
+
+/// Struct to encode the vesting schedule of an individual account.
+#[derive(Encode, Decode, Copy, Clone, PartialEq, Eq, RuntimeDebug, MaxEncodedLen)]
+pub struct VestingInfo<Balance, BlockNumber> {
+	/// Locked amount at genesis.
+	locked: Balance,
+	/// Amount that gets unlocked every block after `starting_block`.
+	per_block: Balance,
+	/// Starting block for unlocking(vesting).
+	starting_block: BlockNumber,
+}
+
+impl<Balance, BlockNumber> VestingInfo<Balance, BlockNumber>
+where
+	Balance: AtLeast32BitUnsigned + Copy,
+	BlockNumber: AtLeast32BitUnsigned + Copy + Bounded,
+{
+	/// Instantiate a new `VestingInfo`.
+	pub fn new(
+		locked: Balance,
+		per_block: Balance,
+		starting_block: BlockNumber,
+	) -> VestingInfo<Balance, BlockNumber> {
+		VestingInfo { locked, per_block, starting_block }
+	}
+
+	/// Validate parameters for `VestingInfo`. Note that this does not check
+	/// against `MinVestedTransfer`.
+	pub fn is_valid(&self) -> bool {
+		!self.locked.is_zero() && !self.raw_per_block().is_zero()
+	}
+
+	/// Locked amount at schedule creation.
+	pub fn locked(&self) -> Balance {
+		self.locked
+	}
+
+	/// Amount that gets unlocked every block after `starting_block`. Corrects for `per_block` of 0.
+	/// We don't let `per_block` be less than 1, or else the vesting will never end.
+	/// This should be used whenever accessing `per_block` unless explicitly checking for 0 values.
+	pub fn per_block(&self) -> Balance {
+		self.per_block.max(One::one())
+	}
+
+	/// Get the unmodified `per_block`. Generally should not be used, but is useful for
+	/// validating `per_block`.
+	pub(crate) fn raw_per_block(&self) -> Balance {
+		self.per_block
+	}
+
+	/// Starting block for unlocking(vesting).
+	pub fn starting_block(&self) -> BlockNumber {
+		self.starting_block
+	}
+
+	/// Amount locked at block `n`.
+	pub fn locked_at<BlockNumberToBalance: Convert<BlockNumber, Balance>>(
+		&self,
+		n: BlockNumber,
+	) -> Balance {
+		// Number of blocks that count toward vesting;
+		// saturating to 0 when n < starting_block.
+		let vested_block_count = n.saturating_sub(self.starting_block);
+		let vested_block_count = BlockNumberToBalance::convert(vested_block_count);
+		// Return amount that is still locked in vesting.
+		vested_block_count
+			.checked_mul(&self.per_block()) // `per_block` accessor guarantees at least 1.
+			.map(|to_unlock| self.locked.saturating_sub(to_unlock))
+			.unwrap_or(Zero::zero())
+	}
+
+	/// Block number at which the schedule ends (as type `Balance`).
+	pub fn ending_block_as_balance<BlockNumberToBalance: Convert<BlockNumber, Balance>>(
+		&self,
+	) -> Balance {
+		let starting_block = BlockNumberToBalance::convert(self.starting_block);
+		let duration = if self.per_block() >= self.locked {
+			// If `per_block` is bigger than `locked`, the schedule will end
+			// the block after starting.
+			One::one()
+		} else {
+			self.locked / self.per_block() +
+				if (self.locked % self.per_block()).is_zero() {
+					Zero::zero()
+				} else {
+					// `per_block` does not perfectly divide `locked`, so we need an extra block to
+					// unlock some amount less than `per_block`.
+					One::one()
+				}
+		};
+
+		starting_block.saturating_add(duration)
+	}
+}
diff --git a/frame/vesting/src/weights.rs b/frame/vesting/src/weights.rs
index 50f72b44d6cf..3ccc1a5bda36 100644
--- a/frame/vesting/src/weights.rs
+++ b/frame/vesting/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_vesting
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-08-10, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -45,135 +45,209 @@ use sp_std::marker::PhantomData;
 
 /// Weight functions needed for pallet_vesting.
 pub trait WeightInfo {
-	fn vest_locked(l: u32, ) -> Weight;
-	fn vest_unlocked(l: u32, ) -> Weight;
-	fn vest_other_locked(l: u32, ) -> Weight;
-	fn vest_other_unlocked(l: u32, ) -> Weight;
-	fn vested_transfer(l: u32, ) -> Weight;
-	fn force_vested_transfer(l: u32, ) -> Weight;
+	fn vest_locked(l: u32, s: u32, ) -> Weight;
+	fn vest_unlocked(l: u32, s: u32, ) -> Weight;
+	fn vest_other_locked(l: u32, s: u32, ) -> Weight;
+	fn vest_other_unlocked(l: u32, s: u32, ) -> Weight;
+	fn vested_transfer(l: u32, s: u32, ) -> Weight;
+	fn force_vested_transfer(l: u32, s: u32, ) -> Weight;
+	fn not_unlocking_merge_schedules(l: u32, s: u32, ) -> Weight;
+	fn unlocking_merge_schedules(l: u32, s: u32, ) -> Weight;
 }
 
 /// Weights for pallet_vesting using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
-	// Storage: Vesting Vesting (r:1 w:0)
+	// Storage: Vesting Vesting (r:1 w:1)
 	// Storage: Balances Locks (r:1 w:1)
-	fn vest_locked(l: u32, ) -> Weight {
-		(42_983_000 as Weight)
-			// Standard Error: 9_000
-			.saturating_add((190_000 as Weight).saturating_mul(l as Weight))
+	fn vest_locked(l: u32, s: u32, ) -> Weight {
+		(50_642_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((144_000 as Weight).saturating_mul(l as Weight))
+			// Standard Error: 3_000
+			.saturating_add((177_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	// Storage: Vesting Vesting (r:1 w:1)
 	// Storage: Balances Locks (r:1 w:1)
-	fn vest_unlocked(l: u32, ) -> Weight {
-		(46_213_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((158_000 as Weight).saturating_mul(l as Weight))
+	fn vest_unlocked(l: u32, s: u32, ) -> Weight {
+		(50_830_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((115_000 as Weight).saturating_mul(l as Weight))
+			// Standard Error: 3_000
+			.saturating_add((112_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
-	// Storage: Vesting Vesting (r:1 w:0)
+	// Storage: Vesting Vesting (r:1 w:1)
 	// Storage: Balances Locks (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
-	fn vest_other_locked(l: u32, ) -> Weight {
-		(42_644_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((202_000 as Weight).saturating_mul(l as Weight))
+	fn vest_other_locked(l: u32, s: u32, ) -> Weight {
+		(52_151_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((130_000 as Weight).saturating_mul(l as Weight))
+			// Standard Error: 3_000
+			.saturating_add((162_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
-			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	// Storage: Vesting Vesting (r:1 w:1)
 	// Storage: Balances Locks (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
-	fn vest_other_unlocked(l: u32, ) -> Weight {
-		(45_765_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((159_000 as Weight).saturating_mul(l as Weight))
+	fn vest_other_unlocked(l: u32, s: u32, ) -> Weight {
+		(51_009_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((123_000 as Weight).saturating_mul(l as Weight))
+			// Standard Error: 9_000
+			.saturating_add((118_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	// Storage: Vesting Vesting (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	// Storage: Balances Locks (r:1 w:1)
-	fn vested_transfer(l: u32, ) -> Weight {
-		(97_417_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((235_000 as Weight).saturating_mul(l as Weight))
+	fn vested_transfer(l: u32, s: u32, ) -> Weight {
+		(89_517_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((114_000 as Weight).saturating_mul(l as Weight))
+			// Standard Error: 10_000
+			.saturating_add((23_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	// Storage: Vesting Vesting (r:1 w:1)
 	// Storage: System Account (r:2 w:2)
 	// Storage: Balances Locks (r:1 w:1)
-	fn force_vested_transfer(l: u32, ) -> Weight {
-		(97_661_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((239_000 as Weight).saturating_mul(l as Weight))
+	fn force_vested_transfer(l: u32, s: u32, ) -> Weight {
+		(87_903_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((121_000 as Weight).saturating_mul(l as Weight))
+			// Standard Error: 12_000
+			.saturating_add((56_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
+	// Storage: Vesting Vesting (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	fn not_unlocking_merge_schedules(l: u32, s: u32, ) -> Weight {
+		(54_463_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((123_000 as Weight).saturating_mul(l as Weight))
+			// Standard Error: 5_000
+			.saturating_add((149_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+	}
+	// Storage: Vesting Vesting (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	fn unlocking_merge_schedules(l: u32, s: u32, ) -> Weight {
+		(53_674_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((137_000 as Weight).saturating_mul(l as Weight))
+			// Standard Error: 4_000
+			.saturating_add((152_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
-	// Storage: Vesting Vesting (r:1 w:0)
+	// Storage: Vesting Vesting (r:1 w:1)
 	// Storage: Balances Locks (r:1 w:1)
-	fn vest_locked(l: u32, ) -> Weight {
-		(42_983_000 as Weight)
-			// Standard Error: 9_000
-			.saturating_add((190_000 as Weight).saturating_mul(l as Weight))
+	fn vest_locked(l: u32, s: u32, ) -> Weight {
+		(50_642_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((144_000 as Weight).saturating_mul(l as Weight))
+			// Standard Error: 3_000
+			.saturating_add((177_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	// Storage: Vesting Vesting (r:1 w:1)
 	// Storage: Balances Locks (r:1 w:1)
-	fn vest_unlocked(l: u32, ) -> Weight {
-		(46_213_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((158_000 as Weight).saturating_mul(l as Weight))
+	fn vest_unlocked(l: u32, s: u32, ) -> Weight {
+		(50_830_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((115_000 as Weight).saturating_mul(l as Weight))
+			// Standard Error: 3_000
+			.saturating_add((112_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
-	// Storage: Vesting Vesting (r:1 w:0)
+	// Storage: Vesting Vesting (r:1 w:1)
 	// Storage: Balances Locks (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
-	fn vest_other_locked(l: u32, ) -> Weight {
-		(42_644_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((202_000 as Weight).saturating_mul(l as Weight))
+	fn vest_other_locked(l: u32, s: u32, ) -> Weight {
+		(52_151_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((130_000 as Weight).saturating_mul(l as Weight))
+			// Standard Error: 3_000
+			.saturating_add((162_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	// Storage: Vesting Vesting (r:1 w:1)
 	// Storage: Balances Locks (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
-	fn vest_other_unlocked(l: u32, ) -> Weight {
-		(45_765_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((159_000 as Weight).saturating_mul(l as Weight))
+	fn vest_other_unlocked(l: u32, s: u32, ) -> Weight {
+		(51_009_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((123_000 as Weight).saturating_mul(l as Weight))
+			// Standard Error: 9_000
+			.saturating_add((118_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	// Storage: Vesting Vesting (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	// Storage: Balances Locks (r:1 w:1)
-	fn vested_transfer(l: u32, ) -> Weight {
-		(97_417_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((235_000 as Weight).saturating_mul(l as Weight))
+	fn vested_transfer(l: u32, s: u32, ) -> Weight {
+		(89_517_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((114_000 as Weight).saturating_mul(l as Weight))
+			// Standard Error: 10_000
+			.saturating_add((23_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	// Storage: Vesting Vesting (r:1 w:1)
 	// Storage: System Account (r:2 w:2)
 	// Storage: Balances Locks (r:1 w:1)
-	fn force_vested_transfer(l: u32, ) -> Weight {
-		(97_661_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((239_000 as Weight).saturating_mul(l as Weight))
+	fn force_vested_transfer(l: u32, s: u32, ) -> Weight {
+		(87_903_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((121_000 as Weight).saturating_mul(l as Weight))
+			// Standard Error: 12_000
+			.saturating_add((56_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
+	// Storage: Vesting Vesting (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	fn not_unlocking_merge_schedules(l: u32, s: u32, ) -> Weight {
+		(54_463_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((123_000 as Weight).saturating_mul(l as Weight))
+			// Standard Error: 5_000
+			.saturating_add((149_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+	}
+	// Storage: Vesting Vesting (r:1 w:1)
+	// Storage: Balances Locks (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	fn unlocking_merge_schedules(l: u32, s: u32, ) -> Weight {
+		(53_674_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((137_000 as Weight).saturating_mul(l as Weight))
+			// Standard Error: 4_000
+			.saturating_add((152_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+	}
 }

From e2c884cfd22629db90d60423ec2c5f5189560c22 Mon Sep 17 00:00:00 2001
From: brenzi <brenzi@users.noreply.github.com>
Date: Tue, 24 Aug 2021 09:30:39 +0200
Subject: [PATCH 1106/1194] rebranding SubstraTEE to integritee (#9248)

prefix 13 for parachain
prefix 113 for sidechains and offchain workers involving a runtime
---
 ss58-registry.json | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/ss58-registry.json b/ss58-registry.json
index 23aab7ea0c71..fc5de1033566 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -129,12 +129,12 @@
 		},
 		{
 			"prefix": 13,
-			"network": "substratee",
-			"displayName": "SubstraTEE",
-			"symbols": null,
-			"decimals": null,
+			"network": "integritee",
+			"displayName": "Integritee",
+			"symbols": ["TEER"],
+			"decimals": [12],
 			"standardAccount": "*25519",
-			"website": "https://www.substratee.com"
+			"website": "https://integritee.network"
 		},
 		{
 			"prefix": 14,
@@ -541,7 +541,7 @@
 			"standardAccount": "secp256k1",
 			"website": "https://origintrail.io"
 		},
-		{
+    {
 			"prefix": 110,
 			"network": "heiko",
 			"displayName": "Heiko",
@@ -549,7 +549,16 @@
 			"decimals": [12],
 			"standardAccount": "*25519",
 			"website": "https://parallel.fi/"
-		},
+		},  
+		{
+			"prefix": 113,
+			"network": "integritee-incognito",
+			"displayName": "Integritee Incognito",
+			"symbols": null,
+			"decimals": null,
+			"standardAccount": "*25519",
+			"website": "https://integritee.network"
+    },
 		{
 			"prefix": 136,
 			"network": "altair",

From ed702e8246d5c4f82e686fb044ac6c2e6cd269cf Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Tue, 24 Aug 2021 10:37:14 +0200
Subject: [PATCH 1107/1194] Fix spelling (#9614)

---
 frame/uniques/src/lib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frame/uniques/src/lib.rs b/frame/uniques/src/lib.rs
index 37855253ffca..b4a0b9821683 100644
--- a/frame/uniques/src/lib.rs
+++ b/frame/uniques/src/lib.rs
@@ -202,9 +202,9 @@ pub mod pallet {
 		ForceCreated(T::ClassId, T::AccountId),
 		/// An asset `class` was destroyed. \[ class \]
 		Destroyed(T::ClassId),
-		/// An asset `instace` was issued. \[ class, instance, owner \]
+		/// An asset `instance` was issued. \[ class, instance, owner \]
 		Issued(T::ClassId, T::InstanceId, T::AccountId),
-		/// An asset `instace` was transferred. \[ class, instance, from, to \]
+		/// An asset `instance` was transferred. \[ class, instance, from, to \]
 		Transferred(T::ClassId, T::InstanceId, T::AccountId, T::AccountId),
 		/// An asset `instance` was destroyed. \[ class, instance, owner \]
 		Burned(T::ClassId, T::InstanceId, T::AccountId),

From 16e17aeaa906ac12321286b5b6d5bdbefa030436 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Tue, 24 Aug 2021 11:54:30 +0200
Subject: [PATCH 1108/1194] Remove useless borrow (#9615)

---
 client/executor/common/src/util.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/executor/common/src/util.rs b/client/executor/common/src/util.rs
index 995424bfa839..3ea29540f98e 100644
--- a/client/executor/common/src/util.rs
+++ b/client/executor/common/src/util.rs
@@ -105,7 +105,7 @@ pub mod wasmi {
 				let range = checked_range(dest_addr.into(), source.len(), destination.len())
 					.ok_or_else(|| Error::Other("memory write is out of bounds".into()))?;
 
-				&mut destination[range].copy_from_slice(source);
+				destination[range].copy_from_slice(source);
 				Ok(())
 			})
 		}

From b79e2b95c23adca8749fc38cba8e39aee1b32e1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 24 Aug 2021 11:54:53 +0200
Subject: [PATCH 1109/1194] Fetch runtime code from storage cache when using
 proofing backend (#9611)

Before we fetched the runtime code from the `TrieBackend` and this lead
to not using the storage cache. Thus, we recalculated the storage hash
for the runtime code on every call into the runtime and this killed the
performance on parachains block authoring. The solution is to fetch the
runtime code from the storage cache, to make sure we use the cached
storage cache.
---
 client/api/src/cht.rs                         |  2 +-
 client/db/src/bench.rs                        |  6 -----
 client/db/src/lib.rs                          |  2 +-
 client/db/src/storage_cache.rs                |  6 ++---
 client/light/src/backend.rs                   |  4 +--
 client/service/src/client/call_executor.rs    | 26 ++++++++-----------
 primitives/state-machine/src/backend.rs       |  2 +-
 .../state-machine/src/in_memory_backend.rs    |  2 +-
 primitives/state-machine/src/lib.rs           | 16 ++++++------
 .../state-machine/src/proving_backend.rs      |  4 +--
 primitives/state-machine/src/trie_backend.rs  |  2 +-
 11 files changed, 31 insertions(+), 41 deletions(-)

diff --git a/client/api/src/cht.rs b/client/api/src/cht.rs
index 83bc84c6ec9b..ee7854b5d829 100644
--- a/client/api/src/cht.rs
+++ b/client/api/src/cht.rs
@@ -117,7 +117,7 @@ where
 		.into_iter()
 		.map(|(k, v)| (k, Some(v)))
 		.collect::<Vec<_>>();
-	let mut storage = InMemoryBackend::<Hasher>::default().update(vec![(None, transaction)]);
+	let storage = InMemoryBackend::<Hasher>::default().update(vec![(None, transaction)]);
 	let trie_storage = storage
 		.as_trie_backend()
 		.expect("InMemoryState::as_trie_backend always returns Some; qed");
diff --git a/client/db/src/bench.rs b/client/db/src/bench.rs
index a4b8f6696ea6..1b7826f97399 100644
--- a/client/db/src/bench.rs
+++ b/client/db/src/bench.rs
@@ -454,12 +454,6 @@ impl<B: BlockT> StateBackend<HashFor<B>> for BenchmarkingState<B> {
 			.map_or(Default::default(), |s| s.child_keys(child_info, prefix))
 	}
 
-	fn as_trie_backend(
-		&mut self,
-	) -> Option<&sp_state_machine::TrieBackend<Self::TrieBackendStorage, HashFor<B>>> {
-		None
-	}
-
 	fn commit(
 		&self,
 		storage_root: <HashFor<B> as Hasher>::Out,
diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index 9f1dd4c0ec07..c7d6029c5356 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -274,7 +274,7 @@ impl<B: BlockT> StateBackend<HashFor<B>> for RefTrackingState<B> {
 	}
 
 	fn as_trie_backend(
-		&mut self,
+		&self,
 	) -> Option<&sp_state_machine::TrieBackend<Self::TrieBackendStorage, HashFor<B>>> {
 		self.state.as_trie_backend()
 	}
diff --git a/client/db/src/storage_cache.rs b/client/db/src/storage_cache.rs
index 3193d3479619..a895324a2e7b 100644
--- a/client/db/src/storage_cache.rs
+++ b/client/db/src/storage_cache.rs
@@ -703,7 +703,7 @@ impl<S: StateBackend<HashFor<B>>, B: BlockT> StateBackend<HashFor<B>> for Cachin
 		self.state.child_keys(child_info, prefix)
 	}
 
-	fn as_trie_backend(&mut self) -> Option<&TrieBackend<Self::TrieBackendStorage, HashFor<B>>> {
+	fn as_trie_backend(&self) -> Option<&TrieBackend<Self::TrieBackendStorage, HashFor<B>>> {
 		self.state.as_trie_backend()
 	}
 
@@ -901,9 +901,9 @@ impl<S: StateBackend<HashFor<B>>, B: BlockT> StateBackend<HashFor<B>>
 		self.caching_state().child_keys(child_info, prefix)
 	}
 
-	fn as_trie_backend(&mut self) -> Option<&TrieBackend<Self::TrieBackendStorage, HashFor<B>>> {
+	fn as_trie_backend(&self) -> Option<&TrieBackend<Self::TrieBackendStorage, HashFor<B>>> {
 		self.caching_state
-			.as_mut()
+			.as_ref()
 			.expect("`caching_state` is valid for the lifetime of the object; qed")
 			.as_trie_backend()
 	}
diff --git a/client/light/src/backend.rs b/client/light/src/backend.rs
index 87d7dba3ddfb..3091dce625a3 100644
--- a/client/light/src/backend.rs
+++ b/client/light/src/backend.rs
@@ -569,9 +569,9 @@ where
 		sp_state_machine::UsageInfo::empty()
 	}
 
-	fn as_trie_backend(&mut self) -> Option<&TrieBackend<Self::TrieBackendStorage, H>> {
+	fn as_trie_backend(&self) -> Option<&TrieBackend<Self::TrieBackendStorage, H>> {
 		match self {
-			GenesisOrUnavailableState::Genesis(ref mut state) => state.as_trie_backend(),
+			GenesisOrUnavailableState::Genesis(ref state) => state.as_trie_backend(),
 			GenesisOrUnavailableState::Unavailable => None,
 		}
 	}
diff --git a/client/service/src/client/call_executor.rs b/client/service/src/client/call_executor.rs
index 41cc1526fa3e..9b8774ce6d49 100644
--- a/client/service/src/client/call_executor.rs
+++ b/client/service/src/client/call_executor.rs
@@ -212,7 +212,7 @@ where
 			backend::changes_tries_state_at_block(at, self.backend.changes_trie_storage())?;
 		let mut storage_transaction_cache = storage_transaction_cache.map(|c| c.borrow_mut());
 
-		let mut state = self.backend.state_at(*at)?;
+		let state = self.backend.state_at(*at)?;
 
 		let changes = &mut *changes.borrow_mut();
 
@@ -220,6 +220,15 @@ where
 			sp_blockchain::Error::UnknownBlock(format!("Could not find block hash for {:?}", at))
 		})?;
 
+		// It is important to extract the runtime code here before we create the proof
+		// recorder to not record it. We also need to fetch the runtime code from `state` to
+		// make sure we use the caching layers.
+		let state_runtime_code = sp_state_machine::backend::BackendRuntimeCode::new(&state);
+
+		let runtime_code =
+			state_runtime_code.runtime_code().map_err(sp_blockchain::Error::RuntimeCode)?;
+		let runtime_code = self.check_override(runtime_code, at)?;
+
 		match recorder {
 			Some(recorder) => {
 				let trie_state = state.as_trie_backend().ok_or_else(|| {
@@ -227,14 +236,6 @@ where
 						as Box<dyn sp_state_machine::Error>
 				})?;
 
-				let state_runtime_code =
-					sp_state_machine::backend::BackendRuntimeCode::new(trie_state);
-				// It is important to extract the runtime code here before we create the proof
-				// recorder.
-				let runtime_code =
-					state_runtime_code.runtime_code().map_err(sp_blockchain::Error::RuntimeCode)?;
-				let runtime_code = self.check_override(runtime_code, at)?;
-
 				let backend = sp_state_machine::ProvingBackend::new_with_recorder(
 					trie_state,
 					recorder.clone(),
@@ -259,11 +260,6 @@ where
 				)
 			},
 			None => {
-				let state_runtime_code = sp_state_machine::backend::BackendRuntimeCode::new(&state);
-				let runtime_code =
-					state_runtime_code.runtime_code().map_err(sp_blockchain::Error::RuntimeCode)?;
-				let runtime_code = self.check_override(runtime_code, at)?;
-
 				let mut state_machine = StateMachine::new(
 					&state,
 					changes_trie_state,
@@ -309,7 +305,7 @@ where
 		method: &str,
 		call_data: &[u8],
 	) -> sp_blockchain::Result<(Vec<u8>, StorageProof)> {
-		let mut state = self.backend.state_at(*at)?;
+		let state = self.backend.state_at(*at)?;
 
 		let trie_backend = state.as_trie_backend().ok_or_else(|| {
 			Box::new(sp_state_machine::ExecutionError::UnableToGenerateProof)
diff --git a/primitives/state-machine/src/backend.rs b/primitives/state-machine/src/backend.rs
index de4ff33b51fe..1b1a732f8d0f 100644
--- a/primitives/state-machine/src/backend.rs
+++ b/primitives/state-machine/src/backend.rs
@@ -173,7 +173,7 @@ pub trait Backend<H: Hasher>: sp_std::fmt::Debug {
 	}
 
 	/// Try convert into trie backend.
-	fn as_trie_backend(&mut self) -> Option<&TrieBackend<Self::TrieBackendStorage, H>> {
+	fn as_trie_backend(&self) -> Option<&TrieBackend<Self::TrieBackendStorage, H>> {
 		None
 	}
 
diff --git a/primitives/state-machine/src/in_memory_backend.rs b/primitives/state-machine/src/in_memory_backend.rs
index 4daf1004a85f..3e75ff5126a6 100644
--- a/primitives/state-machine/src/in_memory_backend.rs
+++ b/primitives/state-machine/src/in_memory_backend.rs
@@ -175,7 +175,7 @@ mod tests {
 		let storage = new_in_mem::<BlakeTwo256>();
 		let child_info = ChildInfo::new_default(b"1");
 		let child_info = &child_info;
-		let mut storage = storage
+		let storage = storage
 			.update(vec![(Some(child_info.clone()), vec![(b"2".to_vec(), Some(b"3".to_vec()))])]);
 		let trie_backend = storage.as_trie_backend().unwrap();
 		assert_eq!(trie_backend.child_storage(child_info, b"2").unwrap(), Some(b"3".to_vec()));
diff --git a/primitives/state-machine/src/lib.rs b/primitives/state-machine/src/lib.rs
index 3c4acdccb10c..07d7e54530ea 100644
--- a/primitives/state-machine/src/lib.rs
+++ b/primitives/state-machine/src/lib.rs
@@ -719,7 +719,7 @@ mod execution {
 	}
 
 	/// Generate storage read proof.
-	pub fn prove_read<B, H, I>(mut backend: B, keys: I) -> Result<StorageProof, Box<dyn Error>>
+	pub fn prove_read<B, H, I>(backend: B, keys: I) -> Result<StorageProof, Box<dyn Error>>
 	where
 		B: Backend<H>,
 		H: Hasher,
@@ -735,7 +735,7 @@ mod execution {
 
 	/// Generate range storage read proof.
 	pub fn prove_range_read_with_size<B, H>(
-		mut backend: B,
+		backend: B,
 		child_info: Option<&ChildInfo>,
 		prefix: Option<&[u8]>,
 		size_limit: usize,
@@ -794,7 +794,7 @@ mod execution {
 
 	/// Generate child storage read proof.
 	pub fn prove_child_read<B, H, I>(
-		mut backend: B,
+		backend: B,
 		child_info: &ChildInfo,
 		keys: I,
 	) -> Result<StorageProof, Box<dyn Error>>
@@ -1197,7 +1197,7 @@ mod tests {
 			b"abc".to_vec() => b"2".to_vec(),
 			b"bbb".to_vec() => b"3".to_vec()
 		];
-		let mut state = InMemoryBackend::<BlakeTwo256>::from(initial);
+		let state = InMemoryBackend::<BlakeTwo256>::from(initial);
 		let backend = state.as_trie_backend().unwrap();
 
 		let mut overlay = OverlayedChanges::default();
@@ -1350,7 +1350,7 @@ mod tests {
 	fn set_child_storage_works() {
 		let child_info = ChildInfo::new_default(b"sub1");
 		let child_info = &child_info;
-		let mut state = new_in_mem::<BlakeTwo256>();
+		let state = new_in_mem::<BlakeTwo256>();
 		let backend = state.as_trie_backend().unwrap();
 		let mut overlay = OverlayedChanges::default();
 		let mut cache = StorageTransactionCache::default();
@@ -1372,7 +1372,7 @@ mod tests {
 	fn append_storage_works() {
 		let reference_data = vec![b"data1".to_vec(), b"2".to_vec(), b"D3".to_vec(), b"d4".to_vec()];
 		let key = b"key".to_vec();
-		let mut state = new_in_mem::<BlakeTwo256>();
+		let state = new_in_mem::<BlakeTwo256>();
 		let backend = state.as_trie_backend().unwrap();
 		let mut overlay = OverlayedChanges::default();
 		let mut cache = StorageTransactionCache::default();
@@ -1427,7 +1427,7 @@ mod tests {
 
 		let key = b"events".to_vec();
 		let mut cache = StorageTransactionCache::default();
-		let mut state = new_in_mem::<BlakeTwo256>();
+		let state = new_in_mem::<BlakeTwo256>();
 		let backend = state.as_trie_backend().unwrap();
 		let mut overlay = OverlayedChanges::default();
 
@@ -1696,7 +1696,7 @@ mod tests {
 			b"aaa".to_vec() => b"0".to_vec(),
 			b"bbb".to_vec() => b"".to_vec()
 		];
-		let mut state = InMemoryBackend::<BlakeTwo256>::from(initial);
+		let state = InMemoryBackend::<BlakeTwo256>::from(initial);
 		let backend = state.as_trie_backend().unwrap();
 
 		let mut overlay = OverlayedChanges::default();
diff --git a/primitives/state-machine/src/proving_backend.rs b/primitives/state-machine/src/proving_backend.rs
index 3a242313a65c..690266dab1e7 100644
--- a/primitives/state-machine/src/proving_backend.rs
+++ b/primitives/state-machine/src/proving_backend.rs
@@ -433,7 +433,7 @@ mod tests {
 	fn proof_recorded_and_checked() {
 		let contents = (0..64).map(|i| (vec![i], Some(vec![i]))).collect::<Vec<_>>();
 		let in_memory = InMemoryBackend::<BlakeTwo256>::default();
-		let mut in_memory = in_memory.update(vec![(None, contents)]);
+		let in_memory = in_memory.update(vec![(None, contents)]);
 		let in_memory_root = in_memory.storage_root(::std::iter::empty()).0;
 		(0..64).for_each(|i| assert_eq!(in_memory.storage(&[i]).unwrap().unwrap(), vec![i]));
 
@@ -464,7 +464,7 @@ mod tests {
 			(Some(child_info_2.clone()), (10..15).map(|i| (vec![i], Some(vec![i]))).collect()),
 		];
 		let in_memory = InMemoryBackend::<BlakeTwo256>::default();
-		let mut in_memory = in_memory.update(contents);
+		let in_memory = in_memory.update(contents);
 		let child_storage_keys = vec![child_info_1.to_owned(), child_info_2.to_owned()];
 		let in_memory_root = in_memory
 			.full_storage_root(
diff --git a/primitives/state-machine/src/trie_backend.rs b/primitives/state-machine/src/trie_backend.rs
index 95007653321c..4cdf1d3b75e9 100644
--- a/primitives/state-machine/src/trie_backend.rs
+++ b/primitives/state-machine/src/trie_backend.rs
@@ -253,7 +253,7 @@ where
 		(root, is_default, write_overlay)
 	}
 
-	fn as_trie_backend(&mut self) -> Option<&TrieBackend<Self::TrieBackendStorage, H>> {
+	fn as_trie_backend(&self) -> Option<&TrieBackend<Self::TrieBackendStorage, H>> {
 		Some(self)
 	}
 

From 4172dfb8a5d530ac7216552ee38e6776092a7856 Mon Sep 17 00:00:00 2001
From: Vladimir Istyufeev <me@rcn.me>
Date: Tue, 24 Aug 2021 13:22:50 +0300
Subject: [PATCH 1110/1194] Run tests for the wasmer sandbox (#9610)

---
 .gitlab-ci.yml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5a2d8c5b4844..98b29fa65e37 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -113,6 +113,26 @@ default:
     - if: $CI_PIPELINE_SOURCE == "schedule"
     - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
 
+.test-refs-wasmer-sandbox:                        &test-refs-wasmer-sandbox
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "web"
+    - if: $CI_PIPELINE_SOURCE == "schedule"
+    - if: $CI_COMMIT_REF_NAME == "master"
+      changes:
+        - client/executor/**/*
+        - frame/contracts/**/*
+        - primitives/sandbox/**/*
+    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
+      changes:
+        - client/executor/**/*
+        - frame/contracts/**/*
+        - primitives/sandbox/**/*
+    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
+      changes:
+        - client/executor/**/*
+        - frame/contracts/**/*
+        - primitives/sandbox/**/*
+
 .build-refs:                       &build-refs
   rules:
     - if: $CI_PIPELINE_SOURCE == "pipeline"
@@ -426,6 +446,16 @@ test-full-crypto-feature:
     - time cargo +nightly build --verbose --no-default-features --features full_crypto
     - sccache -s
 
+test-wasmer-sandbox:
+  stage:                           test
+  <<:                              *docker-env
+  <<:                              *test-refs-wasmer-sandbox
+  variables:
+    <<:                            *default-vars
+  script:
+    - time cargo test --release --features runtime-benchmarks,wasmer-sandbox
+    - sccache -s
+
 cargo-check-macos:
   stage:                           test
   # shell runner on mac ignores the image set in *docker-env

From 72aaab6c9dface13e3c31ace323341dec43f20d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomusdrw@users.noreply.github.com>
Date: Tue, 24 Aug 2021 12:48:23 +0200
Subject: [PATCH 1111/1194] Better RPC prometheus metrics. (#9358)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Better RPC prometehus metrics.

* Add session metrics.

* Add counting requests as well.

* Fix type for web build.

* Fix browser-node

* Filter out unknown method names.

* Change Gauge to Counters

* Use micros instead of millis.

* cargo fmt

* Update client/rpc-servers/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* move log to separate lines.

* Fix compilation.

* cargo +nightly fmt --all

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 client/rpc-servers/src/lib.rs        |  55 ++++++-
 client/rpc-servers/src/middleware.rs | 221 +++++++++++++++++++++++----
 client/service/src/builder.rs        |   7 +-
 client/service/src/lib.rs            |  29 +++-
 4 files changed, 274 insertions(+), 38 deletions(-)

diff --git a/client/rpc-servers/src/lib.rs b/client/rpc-servers/src/lib.rs
index a833002fcdbf..6e09a0ea36ac 100644
--- a/client/rpc-servers/src/lib.rs
+++ b/client/rpc-servers/src/lib.rs
@@ -24,6 +24,7 @@ mod middleware;
 
 use jsonrpc_core::{IoHandlerExtension, MetaIoHandler};
 use log::error;
+use prometheus_endpoint::{register, Counter, PrometheusError, Registry, U64};
 use pubsub::PubSubMetadata;
 use std::io;
 
@@ -42,7 +43,7 @@ const HTTP_THREADS: usize = 4;
 pub type RpcHandler<T> = pubsub::PubSubHandler<T, RpcMiddleware>;
 
 pub use self::inner::*;
-pub use middleware::{RpcMetrics, RpcMiddleware};
+pub use middleware::{method_names, RpcMetrics, RpcMiddleware};
 
 /// Construct rpc `IoHandler`
 pub fn rpc_handler<M: PubSubMetadata>(
@@ -73,6 +74,43 @@ pub fn rpc_handler<M: PubSubMetadata>(
 	io
 }
 
+/// RPC server-specific prometheus metrics.
+#[derive(Debug, Clone, Default)]
+pub struct ServerMetrics {
+	/// Number of sessions opened.
+	session_opened: Option<Counter<U64>>,
+	/// Number of sessions closed.
+	session_closed: Option<Counter<U64>>,
+}
+
+impl ServerMetrics {
+	/// Create new WebSocket RPC server metrics.
+	pub fn new(registry: Option<&Registry>) -> Result<Self, PrometheusError> {
+		registry
+			.map(|r| {
+				Ok(Self {
+					session_opened: register(
+						Counter::new(
+							"rpc_sessions_opened",
+							"Number of persistent RPC sessions opened",
+						)?,
+						r,
+					)?
+					.into(),
+					session_closed: register(
+						Counter::new(
+							"rpc_sessions_closed",
+							"Number of persistent RPC sessions closed",
+						)?,
+						r,
+					)?
+					.into(),
+				})
+			})
+			.unwrap_or_else(|| Ok(Default::default()))
+	}
+}
+
 #[cfg(not(target_os = "unknown"))]
 mod inner {
 	use super::*;
@@ -84,6 +122,16 @@ mod inner {
 	/// Type alias for ws server
 	pub type WsServer = ws::Server;
 
+	impl ws::SessionStats for ServerMetrics {
+		fn open_session(&self, _id: ws::SessionId) {
+			self.session_opened.as_ref().map(|m| m.inc());
+		}
+
+		fn close_session(&self, _id: ws::SessionId) {
+			self.session_closed.as_ref().map(|m| m.inc());
+		}
+	}
+
 	/// Start HTTP server listening on given address.
 	///
 	/// **Note**: Only available if `not(target_os = "unknown")`.
@@ -114,6 +162,7 @@ mod inner {
 	pub fn start_ipc<M: pubsub::PubSubMetadata + Default>(
 		addr: &str,
 		io: RpcHandler<M>,
+		server_metrics: ServerMetrics,
 	) -> io::Result<ipc::Server> {
 		let builder = ipc::ServerBuilder::new(io);
 		#[cfg(target_os = "unix")]
@@ -122,7 +171,7 @@ mod inner {
 			security_attributes.set_mode(0o600)?;
 			security_attributes
 		});
-		builder.start(addr)
+		builder.session_stats(server_metrics).start(addr)
 	}
 
 	/// Start WS server listening on given address.
@@ -136,6 +185,7 @@ mod inner {
 		cors: Option<&Vec<String>>,
 		io: RpcHandler<M>,
 		maybe_max_payload_mb: Option<usize>,
+		server_metrics: ServerMetrics,
 	) -> io::Result<ws::Server> {
 		let rpc_max_payload = maybe_max_payload_mb
 			.map(|mb| mb.saturating_mul(MEGABYTE))
@@ -147,6 +197,7 @@ mod inner {
 		.max_connections(max_connections.unwrap_or(WS_MAX_CONNECTIONS))
 		.allowed_origins(map_cors(cors))
 		.allowed_hosts(hosts_filtering(cors.is_some()))
+		.session_stats(server_metrics)
 		.start(addr)
 		.map_err(|err| match err {
 			ws::Error::Io(io) => io,
diff --git a/client/rpc-servers/src/middleware.rs b/client/rpc-servers/src/middleware.rs
index 5ba5c18a8e95..43380977455d 100644
--- a/client/rpc-servers/src/middleware.rs
+++ b/client/rpc-servers/src/middleware.rs
@@ -18,41 +18,104 @@
 
 //! Middleware for RPC requests.
 
-use jsonrpc_core::{
-	FutureOutput, FutureResponse, Metadata, Middleware as RequestMiddleware, Request, Response,
+use std::collections::HashSet;
+
+use jsonrpc_core::{FutureOutput, FutureResponse, Metadata, Middleware as RequestMiddleware};
+use prometheus_endpoint::{
+	register, CounterVec, HistogramOpts, HistogramVec, Opts, PrometheusError, Registry, U64,
 };
-use prometheus_endpoint::{register, CounterVec, Opts, PrometheusError, Registry, U64};
 
-use futures::{future::Either, Future};
+use futures::{future::Either, Future, FutureExt};
+use pubsub::PubSubMetadata;
+
+use crate::RpcHandler;
 
 /// Metrics for RPC middleware
 #[derive(Debug, Clone)]
 pub struct RpcMetrics {
-	rpc_calls: Option<CounterVec<U64>>,
+	requests_started: CounterVec<U64>,
+	requests_finished: CounterVec<U64>,
+	calls_time: HistogramVec,
+	calls_started: CounterVec<U64>,
+	calls_finished: CounterVec<U64>,
 }
 
 impl RpcMetrics {
 	/// Create an instance of metrics
-	pub fn new(metrics_registry: Option<&Registry>) -> Result<Self, PrometheusError> {
-		Ok(Self {
-			rpc_calls: metrics_registry
-				.map(|r| {
-					register(
-						CounterVec::new(
-							Opts::new("rpc_calls_total", "Number of rpc calls received"),
-							&["protocol"],
-						)?,
-						r,
-					)
-				})
-				.transpose()?,
-		})
+	pub fn new(metrics_registry: Option<&Registry>) -> Result<Option<Self>, PrometheusError> {
+		if let Some(r) = metrics_registry {
+			Ok(Some(Self {
+				requests_started: register(
+					CounterVec::new(
+						Opts::new(
+							"rpc_requests_started",
+							"Number of RPC requests (not calls) received by the server.",
+						),
+						&["protocol"],
+					)?,
+					r,
+				)?,
+				requests_finished: register(
+					CounterVec::new(
+						Opts::new(
+							"rpc_requests_finished",
+							"Number of RPC requests (not calls) processed by the server.",
+						),
+						&["protocol"],
+					)?,
+					r,
+				)?,
+				calls_time: register(
+					HistogramVec::new(
+						HistogramOpts::new(
+							"rpc_calls_time",
+							"Total time [μs] of processed RPC calls",
+						),
+						&["protocol", "method"],
+					)?,
+					r,
+				)?,
+				calls_started: register(
+					CounterVec::new(
+						Opts::new(
+							"rpc_calls_started",
+							"Number of received RPC calls (unique un-batched requests)",
+						),
+						&["protocol", "method"],
+					)?,
+					r,
+				)?,
+				calls_finished: register(
+					CounterVec::new(
+						Opts::new(
+							"rpc_calls_finished",
+							"Number of processed RPC calls (unique un-batched requests)",
+						),
+						&["protocol", "method", "is_error"],
+					)?,
+					r,
+				)?,
+			}))
+		} else {
+			Ok(None)
+		}
 	}
 }
 
+/// Instantiates a dummy `IoHandler` given a builder function to extract supported method names.
+pub fn method_names<F, M, E>(gen_handler: F) -> Result<HashSet<String>, E>
+where
+	F: FnOnce(RpcMiddleware) -> Result<RpcHandler<M>, E>,
+	M: PubSubMetadata,
+{
+	let io = gen_handler(RpcMiddleware::new(None, HashSet::new(), "dummy"))?;
+	Ok(io.iter().map(|x| x.0.clone()).collect())
+}
+
 /// Middleware for RPC calls
 pub struct RpcMiddleware {
-	metrics: RpcMetrics,
+	metrics: Option<RpcMetrics>,
+	known_rpc_method_names: HashSet<String>,
 	transport_label: String,
 }
 
@@ -61,8 +124,12 @@ impl RpcMiddleware {
 	///
 	/// - `metrics`: Will be used to report statistics.
 	/// - `transport_label`: The label that is used when reporting the statistics.
-	pub fn new(metrics: RpcMetrics, transport_label: &str) -> Self {
-		RpcMiddleware { metrics, transport_label: String::from(transport_label) }
+	pub fn new(
+		metrics: Option<RpcMetrics>,
+		known_rpc_method_names: HashSet<String>,
+		transport_label: &str,
+	) -> Self {
+		RpcMiddleware { metrics, known_rpc_method_names, transport_label: transport_label.into() }
 	}
 }
 
@@ -70,15 +137,113 @@ impl<M: Metadata> RequestMiddleware<M> for RpcMiddleware {
 	type Future = FutureResponse;
 	type CallFuture = FutureOutput;
 
-	fn on_request<F, X>(&self, request: Request, meta: M, next: F) -> Either<FutureResponse, X>
+	fn on_request<F, X>(
+		&self,
+		request: jsonrpc_core::Request,
+		meta: M,
+		next: F,
+	) -> Either<Self::Future, X>
 	where
-		F: Fn(Request, M) -> X + Send + Sync,
-		X: Future<Output = Option<Response>> + Send + 'static,
+		F: Fn(jsonrpc_core::Request, M) -> X + Send + Sync,
+		X: Future<Output = Option<jsonrpc_core::Response>> + Send + 'static,
 	{
-		if let Some(ref rpc_calls) = self.metrics.rpc_calls {
-			rpc_calls.with_label_values(&[self.transport_label.as_str()]).inc();
+		let metrics = self.metrics.clone();
+		let transport_label = self.transport_label.clone();
+		if let Some(ref metrics) = metrics {
+			metrics.requests_started.with_label_values(&[transport_label.as_str()]).inc();
 		}
+		let r = next(request, meta);
+		Either::Left(
+			async move {
+				let r = r.await;
+				if let Some(ref metrics) = metrics {
+					metrics.requests_finished.with_label_values(&[transport_label.as_str()]).inc();
+				}
+				r
+			}
+			.boxed(),
+		)
+	}
+
+	fn on_call<F, X>(
+		&self,
+		call: jsonrpc_core::Call,
+		meta: M,
+		next: F,
+	) -> Either<Self::CallFuture, X>
+	where
+		F: Fn(jsonrpc_core::Call, M) -> X + Send + Sync,
+		X: Future<Output = Option<jsonrpc_core::Output>> + Send + 'static,
+	{
+		#[cfg(not(target_os = "unknown"))]
+		let start = std::time::Instant::now();
+		let name = call_name(&call, &self.known_rpc_method_names).to_owned();
+		let metrics = self.metrics.clone();
+		let transport_label = self.transport_label.clone();
+		log::trace!(target: "rpc_metrics", "[{}] {} call: {:?}", transport_label, name, &call);
+		if let Some(ref metrics) = metrics {
+			metrics
+				.calls_started
+				.with_label_values(&[transport_label.as_str(), name.as_str()])
+				.inc();
+		}
+		let r = next(call, meta);
+		Either::Left(
+			async move {
+				let r = r.await;
+				#[cfg(not(target_os = "unknown"))]
+				let micros = start.elapsed().as_micros();
+				// seems that std::time is not implemented for browser target
+				#[cfg(target_os = "unknown")]
+				let micros = 1;
+				if let Some(ref metrics) = metrics {
+					metrics
+						.calls_time
+						.with_label_values(&[transport_label.as_str(), name.as_str()])
+						.observe(micros as _);
+					metrics
+						.calls_finished
+						.with_label_values(&[
+							transport_label.as_str(),
+							name.as_str(),
+							if is_success(&r) { "true" } else { "false" },
+						])
+						.inc();
+				}
+				log::debug!(
+					target: "rpc_metrics",
+					"[{}] {} call took {} μs",
+					transport_label,
+					name,
+					micros,
+				);
+				r
+			}
+			.boxed(),
+		)
+	}
+}
+
+fn call_name<'a>(call: &'a jsonrpc_core::Call, known_methods: &HashSet<String>) -> &'a str {
+	// To prevent bloating metric with all invalid method names we filter them out here.
+	let only_known = |method: &'a String| {
+		if known_methods.contains(method) {
+			method.as_str()
+		} else {
+			"invalid method"
+		}
+	};
+
+	match call {
+		jsonrpc_core::Call::Invalid { .. } => "invalid call",
+		jsonrpc_core::Call::MethodCall(ref call) => only_known(&call.method),
+		jsonrpc_core::Call::Notification(ref notification) => only_known(&notification.method),
+	}
+}
 
-		Either::Right(next(request, meta))
+fn is_success(output: &Option<jsonrpc_core::Output>) -> bool {
+	match output {
+		Some(jsonrpc_core::Output::Success(..)) => true,
+		_ => false,
 	}
 }
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index dea995363319..a1fb1b909773 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -639,12 +639,15 @@ where
 		)
 	};
 	let rpc_metrics = sc_rpc_server::RpcMetrics::new(config.prometheus_registry())?;
-	let rpc = start_rpc_servers(&config, gen_handler, rpc_metrics.clone())?;
+	let server_metrics = sc_rpc_server::ServerMetrics::new(config.prometheus_registry())?;
+	let rpc = start_rpc_servers(&config, gen_handler, rpc_metrics.clone(), server_metrics)?;
 	// This is used internally, so don't restrict access to unsafe RPC
+	let known_rpc_method_names =
+		sc_rpc_server::method_names(|m| gen_handler(sc_rpc::DenyUnsafe::No, m))?;
 	let rpc_handlers = RpcHandlers(Arc::new(
 		gen_handler(
 			sc_rpc::DenyUnsafe::No,
-			sc_rpc_server::RpcMiddleware::new(rpc_metrics, "inbrowser"),
+			sc_rpc_server::RpcMiddleware::new(rpc_metrics, known_rpc_method_names, "inbrowser"),
 		)?
 		.into(),
 	));
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index 24506a977e1f..883ece42362b 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -349,7 +349,8 @@ fn start_rpc_servers<
 >(
 	config: &Configuration,
 	mut gen_handler: H,
-	rpc_metrics: sc_rpc_server::RpcMetrics,
+	rpc_metrics: Option<sc_rpc_server::RpcMetrics>,
+	server_metrics: sc_rpc_server::ServerMetrics,
 ) -> Result<Box<dyn std::any::Any + Send>, Error> {
 	fn maybe_start_server<T, F>(
 		address: Option<SocketAddr>,
@@ -383,6 +384,7 @@ fn start_rpc_servers<
 		}
 	}
 
+	let rpc_method_names = sc_rpc_server::method_names(|m| gen_handler(sc_rpc::DenyUnsafe::No, m))?;
 	Ok(Box::new((
 		config
 			.rpc_ipc
@@ -392,8 +394,13 @@ fn start_rpc_servers<
 					&*path,
 					gen_handler(
 						sc_rpc::DenyUnsafe::No,
-						sc_rpc_server::RpcMiddleware::new(rpc_metrics.clone(), "ipc"),
+						sc_rpc_server::RpcMiddleware::new(
+							rpc_metrics.clone(),
+							rpc_method_names.clone(),
+							"ipc",
+						),
 					)?,
+					server_metrics.clone(),
 				)
 				.map_err(Error::from)
 			})
@@ -405,7 +412,11 @@ fn start_rpc_servers<
 				config.rpc_cors.as_ref(),
 				gen_handler(
 					deny_unsafe(&address, &config.rpc_methods),
-					sc_rpc_server::RpcMiddleware::new(rpc_metrics.clone(), "http"),
+					sc_rpc_server::RpcMiddleware::new(
+						rpc_metrics.clone(),
+						rpc_method_names.clone(),
+						"http",
+					),
 				)?,
 				config.rpc_max_payload,
 			)
@@ -419,9 +430,14 @@ fn start_rpc_servers<
 				config.rpc_cors.as_ref(),
 				gen_handler(
 					deny_unsafe(&address, &config.rpc_methods),
-					sc_rpc_server::RpcMiddleware::new(rpc_metrics.clone(), "ws"),
+					sc_rpc_server::RpcMiddleware::new(
+						rpc_metrics.clone(),
+						rpc_method_names.clone(),
+						"ws",
+					),
 				)?,
 				config.rpc_max_payload,
+				server_metrics.clone(),
 			)
 			.map_err(Error::from)
 		})?
@@ -440,8 +456,9 @@ fn start_rpc_servers<
 >(
 	_: &Configuration,
 	_: H,
-	_: sc_rpc_server::RpcMetrics,
-) -> Result<Box<dyn std::any::Any + Send>, error::Error> {
+	_: Option<sc_rpc_server::RpcMetrics>,
+	_: sc_rpc_server::ServerMetrics,
+) -> Result<Box<dyn std::any::Any + Send + Sync>, error::Error> {
 	Ok(Box::new(()))
 }
 

From b7a1a2cda5c860f18a7802051e881c5062828042 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 24 Aug 2021 16:31:19 +0200
Subject: [PATCH 1112/1194] Upgrade tokio to 1.10 (#9575)

* Upgrade tokio to 1.10

* Fix test runner

* Try fix it

* Update Cargo.lock

* Review feedback

* ahhhh

* FML

* FMT

* Fix tests
---
 Cargo.lock                                  | 294 +++-----------------
 Cargo.toml                                  |   1 -
 bin/node/cli/Cargo.toml                     |   9 +-
 bin/node/test-runner-example/src/lib.rs     |   2 +-
 client/cli/Cargo.toml                       |   2 +-
 client/cli/src/runner.rs                    |   7 +-
 client/consensus/manual-seal/Cargo.toml     |   2 +-
 client/consensus/manual-seal/src/lib.rs     |   6 +-
 client/finality-grandpa/Cargo.toml          |   2 +-
 client/finality-grandpa/src/tests.rs        |   2 +-
 client/service/Cargo.toml                   |   2 +-
 client/service/src/lib.rs                   |   2 +-
 client/service/src/task_manager/mod.rs      |   8 +-
 client/service/src/task_manager/tests.rs    |  62 +++--
 client/service/test/Cargo.toml              |   3 +-
 client/service/test/src/lib.rs              |  65 +++--
 test-utils/Cargo.toml                       |   2 +-
 test-utils/derive/Cargo.toml                |   1 +
 test-utils/derive/src/lib.rs                |  31 +--
 test-utils/test-crate/Cargo.toml            |   2 +-
 test-utils/test-runner/Cargo.toml           |   2 +-
 test-utils/tests/basic.rs                   |   8 +-
 utils/frame/remote-externalities/Cargo.toml |   4 +-
 utils/frame/rpc/support/Cargo.toml          |   2 +-
 24 files changed, 143 insertions(+), 378 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f02cafd76f0d..0abb8aff2941 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1202,17 +1202,6 @@ dependencies = [
  "crossbeam-utils 0.8.3",
 ]
 
-[[package]]
-name = "crossbeam-deque"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
-dependencies = [
- "crossbeam-epoch 0.8.2",
- "crossbeam-utils 0.7.2",
- "maybe-uninit",
-]
-
 [[package]]
 name = "crossbeam-deque"
 version = "0.8.0"
@@ -1220,25 +1209,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
 dependencies = [
  "cfg-if 1.0.0",
- "crossbeam-epoch 0.9.3",
+ "crossbeam-epoch",
  "crossbeam-utils 0.8.3",
 ]
 
-[[package]]
-name = "crossbeam-epoch"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
-dependencies = [
- "autocfg 1.0.1",
- "cfg-if 0.1.10",
- "crossbeam-utils 0.7.2",
- "lazy_static",
- "maybe-uninit",
- "memoffset 0.5.6",
- "scopeguard",
-]
-
 [[package]]
 name = "crossbeam-epoch"
 version = "0.9.3"
@@ -1248,21 +1222,10 @@ dependencies = [
  "cfg-if 1.0.0",
  "crossbeam-utils 0.8.3",
  "lazy_static",
- "memoffset 0.6.1",
+ "memoffset",
  "scopeguard",
 ]
 
-[[package]]
-name = "crossbeam-queue"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570"
-dependencies = [
- "cfg-if 0.1.10",
- "crossbeam-utils 0.7.2",
- "maybe-uninit",
-]
-
 [[package]]
 name = "crossbeam-utils"
 version = "0.7.2"
@@ -2682,7 +2645,7 @@ dependencies = [
  "itoa",
  "pin-project-lite 0.2.6",
  "socket2 0.4.0",
- "tokio 1.10.0",
+ "tokio",
  "tower-service",
  "tracing",
  "want",
@@ -2700,8 +2663,8 @@ dependencies = [
  "log 0.4.14",
  "rustls",
  "rustls-native-certs",
- "tokio 1.10.0",
- "tokio-rustls 0.22.0",
+ "tokio",
+ "tokio-rustls",
  "webpki",
 ]
 
@@ -2714,7 +2677,7 @@ dependencies = [
  "bytes 1.0.1",
  "hyper 0.14.11",
  "native-tls",
- "tokio 1.10.0",
+ "tokio",
  "tokio-native-tls",
 ]
 
@@ -2941,7 +2904,7 @@ dependencies = [
  "log 0.4.14",
  "serde",
  "serde_json",
- "tokio 1.10.0",
+ "tokio",
  "url 1.7.2",
  "websocket",
 ]
@@ -3041,9 +3004,9 @@ dependencies = [
  "jsonrpc-core",
  "lazy_static",
  "log 0.4.14",
- "tokio 1.10.0",
+ "tokio",
  "tokio-stream",
- "tokio-util 0.6.7",
+ "tokio-util",
  "unicase 2.6.0",
 ]
 
@@ -3112,9 +3075,9 @@ dependencies = [
  "serde_json",
  "soketto 0.6.0",
  "thiserror",
- "tokio 0.2.25",
- "tokio-rustls 0.15.0",
- "tokio-util 0.3.1",
+ "tokio",
+ "tokio-rustls",
+ "tokio-util",
  "url 2.2.1",
 ]
 
@@ -3977,15 +3940,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "memoffset"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa"
-dependencies = [
- "autocfg 1.0.1",
-]
-
 [[package]]
 name = "memoffset"
 version = "0.6.1"
@@ -4107,17 +4061,6 @@ dependencies = [
  "slab",
 ]
 
-[[package]]
-name = "mio-uds"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0"
-dependencies = [
- "iovec",
- "libc",
- "mio 0.6.23",
-]
-
 [[package]]
 name = "miow"
 version = "0.2.2"
@@ -5968,7 +5911,7 @@ dependencies = [
  "libc",
  "log 0.4.14",
  "rand 0.7.3",
- "tokio 1.10.0",
+ "tokio",
  "winapi 0.3.9",
 ]
 
@@ -6963,7 +6906,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
 dependencies = [
  "autocfg 1.0.1",
- "crossbeam-deque 0.8.0",
+ "crossbeam-deque",
  "either",
  "rayon-core",
 ]
@@ -6975,7 +6918,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
 dependencies = [
  "crossbeam-channel",
- "crossbeam-deque 0.8.0",
+ "crossbeam-deque",
  "crossbeam-utils 0.8.3",
  "lazy_static",
  "num_cpus",
@@ -7103,7 +7046,7 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-version",
- "tokio 0.2.25",
+ "tokio",
 ]
 
 [[package]]
@@ -7433,7 +7376,7 @@ dependencies = [
  "tempfile",
  "thiserror",
  "tiny-bip39",
- "tokio 0.2.25",
+ "tokio",
 ]
 
 [[package]]
@@ -7681,7 +7624,7 @@ dependencies = [
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
  "substrate-test-runtime-transaction-pool",
- "tokio 0.2.25",
+ "tokio",
 ]
 
 [[package]]
@@ -7875,7 +7818,7 @@ dependencies = [
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
  "tempfile",
- "tokio 0.2.25",
+ "tokio",
 ]
 
 [[package]]
@@ -8087,7 +8030,7 @@ dependencies = [
  "sp-utils",
  "substrate-test-runtime-client",
  "threadpool",
- "tokio 1.10.0",
+ "tokio",
 ]
 
 [[package]]
@@ -8262,7 +8205,7 @@ dependencies = [
  "substrate-test-runtime-client",
  "tempfile",
  "thiserror",
- "tokio 0.2.25",
+ "tokio",
  "tracing",
  "tracing-futures",
 ]
@@ -8272,7 +8215,6 @@ name = "sc-service-test"
 version = "2.0.0"
 dependencies = [
  "fdlimit",
- "futures 0.1.31",
  "futures 0.3.16",
  "hex-literal",
  "log 0.4.14",
@@ -8301,7 +8243,7 @@ dependencies = [
  "substrate-test-runtime",
  "substrate-test-runtime-client",
  "tempfile",
- "tokio 0.1.22",
+ "tokio",
 ]
 
 [[package]]
@@ -9789,7 +9731,7 @@ dependencies = [
  "sc-rpc-api",
  "serde",
  "sp-storage",
- "tokio 0.2.25",
+ "tokio",
 ]
 
 [[package]]
@@ -9826,7 +9768,7 @@ dependencies = [
  "hyper 0.14.11",
  "log 0.4.14",
  "prometheus",
- "tokio 1.10.0",
+ "tokio",
 ]
 
 [[package]]
@@ -9941,7 +9883,7 @@ dependencies = [
  "futures 0.3.16",
  "sc-service",
  "substrate-test-utils-derive",
- "tokio 0.2.25",
+ "tokio",
  "trybuild",
 ]
 
@@ -9950,6 +9892,7 @@ name = "substrate-test-utils-derive"
 version = "0.10.0-dev"
 dependencies = [
  "proc-macro-crate 1.0.0",
+ "proc-macro2",
  "quote",
  "syn",
 ]
@@ -9960,7 +9903,7 @@ version = "0.1.0"
 dependencies = [
  "sc-service",
  "substrate-test-utils",
- "tokio 0.2.25",
+ "tokio",
 ]
 
 [[package]]
@@ -10105,7 +10048,7 @@ dependencies = [
  "sp-state-machine",
  "sp-transaction-pool",
  "sp-wasm-interface",
- "tokio 0.2.25",
+ "tokio",
 ]
 
 [[package]]
@@ -10240,51 +10183,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
-[[package]]
-name = "tokio"
-version = "0.1.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6"
-dependencies = [
- "bytes 0.4.12",
- "futures 0.1.31",
- "mio 0.6.23",
- "num_cpus",
- "tokio-codec",
- "tokio-current-thread",
- "tokio-executor",
- "tokio-fs",
- "tokio-io",
- "tokio-reactor",
- "tokio-sync",
- "tokio-tcp",
- "tokio-threadpool",
- "tokio-timer",
- "tokio-udp",
- "tokio-uds",
-]
-
-[[package]]
-name = "tokio"
-version = "0.2.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092"
-dependencies = [
- "bytes 0.5.6",
- "fnv",
- "iovec",
- "lazy_static",
- "libc",
- "mio 0.6.23",
- "mio-uds",
- "num_cpus",
- "pin-project-lite 0.1.12",
- "signal-hook-registry",
- "slab",
- "tokio-macros 0.2.6",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "tokio"
 version = "1.10.0"
@@ -10301,7 +10199,7 @@ dependencies = [
  "parking_lot 0.11.1",
  "pin-project-lite 0.2.6",
  "signal-hook-registry",
- "tokio-macros 1.3.0",
+ "tokio-macros",
  "winapi 0.3.9",
 ]
 
@@ -10316,16 +10214,6 @@ dependencies = [
  "tokio-io",
 ]
 
-[[package]]
-name = "tokio-current-thread"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e"
-dependencies = [
- "futures 0.1.31",
- "tokio-executor",
-]
-
 [[package]]
 name = "tokio-executor"
 version = "0.1.10"
@@ -10336,17 +10224,6 @@ dependencies = [
  "futures 0.1.31",
 ]
 
-[[package]]
-name = "tokio-fs"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "297a1206e0ca6302a0eed35b700d292b275256f596e2f3fea7729d5e629b6ff4"
-dependencies = [
- "futures 0.1.31",
- "tokio-io",
- "tokio-threadpool",
-]
-
 [[package]]
 name = "tokio-io"
 version = "0.1.13"
@@ -10358,17 +10235,6 @@ dependencies = [
  "log 0.4.14",
 ]
 
-[[package]]
-name = "tokio-macros"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "tokio-macros"
 version = "1.3.0"
@@ -10387,7 +10253,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
 dependencies = [
  "native-tls",
- "tokio 1.10.0",
+ "tokio",
 ]
 
 [[package]]
@@ -10409,18 +10275,6 @@ dependencies = [
  "tokio-sync",
 ]
 
-[[package]]
-name = "tokio-rustls"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03d15e5669243a45f630a5167d101b942174ca94b615445b2057eace1c818736"
-dependencies = [
- "futures-core",
- "rustls",
- "tokio 0.2.25",
- "webpki",
-]
-
 [[package]]
 name = "tokio-rustls"
 version = "0.22.0"
@@ -10428,7 +10282,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
 dependencies = [
  "rustls",
- "tokio 1.10.0",
+ "tokio",
  "webpki",
 ]
 
@@ -10440,7 +10294,7 @@ checksum = "7b2f3f698253f03119ac0102beaa64f67a67e08074d03a22d18784104543727f"
 dependencies = [
  "futures-core",
  "pin-project-lite 0.2.6",
- "tokio 1.10.0",
+ "tokio",
 ]
 
 [[package]]
@@ -10467,35 +10321,6 @@ dependencies = [
  "tokio-reactor",
 ]
 
-[[package]]
-name = "tokio-threadpool"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89"
-dependencies = [
- "crossbeam-deque 0.7.3",
- "crossbeam-queue",
- "crossbeam-utils 0.7.2",
- "futures 0.1.31",
- "lazy_static",
- "log 0.4.14",
- "num_cpus",
- "slab",
- "tokio-executor",
-]
-
-[[package]]
-name = "tokio-timer"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296"
-dependencies = [
- "crossbeam-utils 0.7.2",
- "futures 0.1.31",
- "slab",
- "tokio-executor",
-]
-
 [[package]]
 name = "tokio-tls"
 version = "0.2.1"
@@ -10507,54 +10332,6 @@ dependencies = [
  "tokio-io",
 ]
 
-[[package]]
-name = "tokio-udp"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82"
-dependencies = [
- "bytes 0.4.12",
- "futures 0.1.31",
- "log 0.4.14",
- "mio 0.6.23",
- "tokio-codec",
- "tokio-io",
- "tokio-reactor",
-]
-
-[[package]]
-name = "tokio-uds"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab57a4ac4111c8c9dbcf70779f6fc8bc35ae4b2454809febac840ad19bd7e4e0"
-dependencies = [
- "bytes 0.4.12",
- "futures 0.1.31",
- "iovec",
- "libc",
- "log 0.4.14",
- "mio 0.6.23",
- "mio-uds",
- "tokio-codec",
- "tokio-io",
- "tokio-reactor",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499"
-dependencies = [
- "bytes 0.5.6",
- "futures-core",
- "futures-io",
- "futures-sink",
- "log 0.4.14",
- "pin-project-lite 0.1.12",
- "tokio 0.2.25",
-]
-
 [[package]]
 name = "tokio-util"
 version = "0.6.7"
@@ -10563,10 +10340,11 @@ checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592"
 dependencies = [
  "bytes 1.0.1",
  "futures-core",
+ "futures-io",
  "futures-sink",
  "log 0.4.14",
  "pin-project-lite 0.2.6",
- "tokio 1.10.0",
+ "tokio",
 ]
 
 [[package]]
@@ -11345,7 +11123,7 @@ dependencies = [
  "cfg-if 0.1.10",
  "indexmap",
  "libc",
- "memoffset 0.6.1",
+ "memoffset",
  "more-asserts",
  "region",
  "serde",
@@ -11571,7 +11349,7 @@ dependencies = [
  "libc",
  "log 0.4.14",
  "mach",
- "memoffset 0.6.1",
+ "memoffset",
  "more-asserts",
  "rand 0.8.4",
  "region",
diff --git a/Cargo.toml b/Cargo.toml
index 6a1c26e95212..f583c2b087c0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -227,7 +227,6 @@ cranelift-codegen = { opt-level = 3 }
 cranelift-wasm = { opt-level = 3 }
 crc32fast = { opt-level = 3 }
 crossbeam-deque = { opt-level = 3 }
-crossbeam-queue = { opt-level = 3 }
 crypto-mac = { opt-level = 3 }
 curve25519-dalek = { opt-level = 3 }
 ed25519-dalek = { opt-level = 3 }
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index 2caefebbbf3b..75ac03266cff 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -113,7 +113,7 @@ sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/commo
 sc-consensus-babe = { version = "0.10.0-dev", path = "../../../client/consensus/babe" }
 sc-consensus-epochs = { version = "0.10.0-dev", path = "../../../client/consensus/epochs" }
 sc-service-test = { version = "2.0.0", path = "../../../client/service/test" }
-futures = "0.3.9"
+futures = "0.3.16"
 tempfile = "3.1.0"
 assert_cmd = "1.0"
 nix = "0.19"
@@ -130,12 +130,7 @@ frame-benchmarking-cli = { version = "4.0.0-dev", optional = true, path = "../..
 substrate-build-script-utils = { version = "3.0.0", optional = true, path = "../../../utils/build-script-utils" }
 substrate-frame-cli = { version = "4.0.0-dev", optional = true, path = "../../../utils/frame/frame-utilities-cli" }
 try-runtime-cli = { version = "0.10.0-dev", optional = true, path = "../../../utils/frame/try-runtime/cli" }
-
-[build-dependencies.sc-cli]
-version = "0.10.0-dev"
-package = "sc-cli"
-path = "../../../client/cli"
-optional = true
+sc-cli = { version = "0.10.0-dev", path = "../../../client/cli", optional = true }
 
 [features]
 default = [ "cli" ]
diff --git a/bin/node/test-runner-example/src/lib.rs b/bin/node/test-runner-example/src/lib.rs
index 04c099a2f4c2..6164372ab4f2 100644
--- a/bin/node/test-runner-example/src/lib.rs
+++ b/bin/node/test-runner-example/src/lib.rs
@@ -92,7 +92,7 @@ mod tests {
 
 	#[test]
 	fn test_runner() {
-		let mut tokio_runtime = build_runtime().unwrap();
+		let tokio_runtime = build_runtime().unwrap();
 		let task_executor = task_executor(tokio_runtime.handle().clone());
 		let (rpc, task_manager, client, pool, command_sink, backend) = client_parts::<
 			NodeTemplateChainInfo,
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index aadbdef79551..e2d27b95eca2 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 log = "0.4.11"
 regex = "1.4.2"
-tokio = { version = "0.2.21", features = [ "signal", "rt-core", "rt-threaded", "blocking" ] }
+tokio = { version = "1.10", features = [ "signal", "rt-multi-thread" ] }
 futures = "0.3.9"
 fdlimit = "0.2.1"
 libp2p = "0.39.1"
diff --git a/client/cli/src/runner.rs b/client/cli/src/runner.rs
index 9c5d160c37aa..686b6b3c05fe 100644
--- a/client/cli/src/runner.rs
+++ b/client/cli/src/runner.rs
@@ -73,8 +73,7 @@ where
 
 /// Build a tokio runtime with all features
 pub fn build_runtime() -> std::result::Result<tokio::runtime::Runtime, std::io::Error> {
-	tokio::runtime::Builder::new()
-		.threaded_scheduler()
+	tokio::runtime::Builder::new_multi_thread()
 		.on_thread_start(|| {
 			TOKIO_THREADS_ALIVE.inc();
 			TOKIO_THREADS_TOTAL.inc();
@@ -87,7 +86,7 @@ pub fn build_runtime() -> std::result::Result<tokio::runtime::Runtime, std::io::
 }
 
 fn run_until_exit<F, E>(
-	mut tokio_runtime: tokio::runtime::Runtime,
+	tokio_runtime: tokio::runtime::Runtime,
 	future: F,
 	task_manager: TaskManager,
 ) -> std::result::Result<(), E>
@@ -152,7 +151,7 @@ impl<C: SubstrateCli> Runner<C> {
 	/// A helper function that runs a node with tokio and stops if the process receives the signal
 	/// `SIGTERM` or `SIGINT`.
 	pub fn run_node_until_exit<F, E>(
-		mut self,
+		self,
 		initialize: impl FnOnce(Configuration) -> F,
 	) -> std::result::Result<(), E>
 	where
diff --git a/client/consensus/manual-seal/Cargo.toml b/client/consensus/manual-seal/Cargo.toml
index 26172f634fa7..d9ae8521c12f 100644
--- a/client/consensus/manual-seal/Cargo.toml
+++ b/client/consensus/manual-seal/Cargo.toml
@@ -45,7 +45,7 @@ sp-timestamp = { path = "../../../primitives/timestamp", version = "4.0.0-dev" }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0" }
 
 [dev-dependencies]
-tokio = { version = "0.2", features = ["rt-core", "macros"] }
+tokio = { version = "1.10.0", features = ["rt-multi-thread", "macros"] }
 sc-basic-authorship = { path = "../../basic-authorship", version = "0.10.0-dev" }
 substrate-test-runtime-client = { path = "../../../test-utils/runtime/client", version = "2.0.0" }
 substrate-test-runtime-transaction-pool = { path = "../../../test-utils/runtime/transaction-pool", version = "2.0.0" }
diff --git a/client/consensus/manual-seal/src/lib.rs b/client/consensus/manual-seal/src/lib.rs
index f6994e452024..390c23fe032f 100644
--- a/client/consensus/manual-seal/src/lib.rs
+++ b/client/consensus/manual-seal/src/lib.rs
@@ -308,7 +308,7 @@ mod tests {
 			consensus_data_provider: None,
 		});
 		std::thread::spawn(|| {
-			let mut rt = tokio::runtime::Runtime::new().unwrap();
+			let rt = tokio::runtime::Runtime::new().unwrap();
 			// spawn the background authorship task
 			rt.block_on(future);
 		});
@@ -365,7 +365,7 @@ mod tests {
 			create_inherent_data_providers: |_, _| async { Ok(()) },
 		});
 		std::thread::spawn(|| {
-			let mut rt = tokio::runtime::Runtime::new().unwrap();
+			let rt = tokio::runtime::Runtime::new().unwrap();
 			// spawn the background authorship task
 			rt.block_on(future);
 		});
@@ -443,7 +443,7 @@ mod tests {
 			create_inherent_data_providers: |_, _| async { Ok(()) },
 		});
 		std::thread::spawn(|| {
-			let mut rt = tokio::runtime::Runtime::new().unwrap();
+			let rt = tokio::runtime::Runtime::new().unwrap();
 			// spawn the background authorship task
 			rt.block_on(future);
 		});
diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml
index 37d07c791948..63a8c9aff225 100644
--- a/client/finality-grandpa/Cargo.toml
+++ b/client/finality-grandpa/Cargo.toml
@@ -57,5 +57,5 @@ sc-network-test = { version = "0.8.0", path = "../network/test" }
 sp-keyring = { version = "4.0.0-dev", path = "../../primitives/keyring" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
-tokio = { version = "0.2", features = ["rt-core"] }
+tokio = "1.10"
 tempfile = "3.1.0"
diff --git a/client/finality-grandpa/src/tests.rs b/client/finality-grandpa/src/tests.rs
index 6b151f314b5c..1aef7cd1b017 100644
--- a/client/finality-grandpa/src/tests.rs
+++ b/client/finality-grandpa/src/tests.rs
@@ -1244,7 +1244,7 @@ fn finalize_3_voters_1_light_observer() {
 #[test]
 fn voter_catches_up_to_latest_round_when_behind() {
 	sp_tracing::try_init_simple();
-	let mut runtime = Runtime::new().unwrap();
+	let runtime = Runtime::new().unwrap();
 
 	let peers = &[Ed25519Keyring::Alice, Ed25519Keyring::Bob];
 	let voters = make_ids(peers);
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index fe94d57d96e8..94be302ca270 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -87,5 +87,5 @@ directories = "3.0.2"
 [dev-dependencies]
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 substrate-test-runtime = { version = "2.0.0", path = "../../test-utils/runtime/" }
-tokio = { version = "0.2.25", default-features = false }
+tokio = { version = "1.10", features = ["time"] }
 async-std = { version = "1.6.5", default-features = false }
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index 883ece42362b..c8d5a9af3565 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -304,8 +304,8 @@ async fn build_network_future<
 	}
 }
 
-#[cfg(not(target_os = "unknown"))]
 // Wrapper for HTTP and WS servers that makes sure they are properly shut down.
+#[cfg(not(target_os = "unknown"))]
 mod waiting {
 	pub struct HttpServer(pub Option<sc_rpc_server::HttpServer>);
 	impl Drop for HttpServer {
diff --git a/client/service/src/task_manager/mod.rs b/client/service/src/task_manager/mod.rs
index ae89b785870f..25b08b37a3a1 100644
--- a/client/service/src/task_manager/mod.rs
+++ b/client/service/src/task_manager/mod.rs
@@ -311,7 +311,13 @@ impl TaskManager {
 		Box::pin(async move {
 			join_all(children_shutdowns).await;
 			completion_future.await;
-			drop(keep_alive);
+
+			// The keep_alive stuff is holding references to some RPC handles etc. These
+			// RPC handles spawn their own tokio stuff and that doesn't like to be closed in an
+			// async context. So, we move the deletion to some other thread.
+			std::thread::spawn(move || {
+				let _ = keep_alive;
+			});
 		})
 	}
 
diff --git a/client/service/src/task_manager/tests.rs b/client/service/src/task_manager/tests.rs
index d8789e556e1e..5b6cd7acdd4a 100644
--- a/client/service/src/task_manager/tests.rs
+++ b/client/service/src/task_manager/tests.rs
@@ -35,6 +35,12 @@ impl DropTester {
 		*self.0.lock() += 1;
 		DropTesterRef(self.clone())
 	}
+
+	fn wait_on_drop(&self) {
+		while *self != 0 {
+			std::thread::sleep(std::time::Duration::from_millis(10));
+		}
+	}
 }
 
 impl PartialEq<usize> for DropTester {
@@ -65,7 +71,7 @@ fn ensure_drop_tester_working() {
 
 async fn run_background_task(_keep_alive: impl Any) {
 	loop {
-		tokio::time::delay_for(Duration::from_secs(1)).await;
+		tokio::time::sleep(Duration::from_secs(1)).await;
 	}
 }
 
@@ -74,7 +80,7 @@ async fn run_background_task_blocking(duration: Duration, _keep_alive: impl Any)
 		// block for X sec (not interruptible)
 		std::thread::sleep(duration);
 		// await for 1 sec (interruptible)
-		tokio::time::delay_for(Duration::from_secs(1)).await;
+		tokio::time::sleep(Duration::from_secs(1)).await;
 	}
 }
 
@@ -84,7 +90,7 @@ fn new_task_manager(task_executor: TaskExecutor) -> TaskManager {
 
 #[test]
 fn ensure_tasks_are_awaited_on_shutdown() {
-	let mut runtime = tokio::runtime::Runtime::new().unwrap();
+	let runtime = tokio::runtime::Runtime::new().unwrap();
 	let handle = runtime.handle().clone();
 	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
@@ -95,15 +101,15 @@ fn ensure_tasks_are_awaited_on_shutdown() {
 	spawn_handle.spawn("task2", run_background_task(drop_tester.new_ref()));
 	assert_eq!(drop_tester, 2);
 	// allow the tasks to even start
-	runtime.block_on(async { tokio::time::delay_for(Duration::from_secs(1)).await });
+	runtime.block_on(async { tokio::time::sleep(Duration::from_secs(1)).await });
 	assert_eq!(drop_tester, 2);
 	runtime.block_on(task_manager.clean_shutdown());
-	assert_eq!(drop_tester, 0);
+	drop_tester.wait_on_drop();
 }
 
 #[test]
 fn ensure_keep_alive_during_shutdown() {
-	let mut runtime = tokio::runtime::Runtime::new().unwrap();
+	let runtime = tokio::runtime::Runtime::new().unwrap();
 	let handle = runtime.handle().clone();
 	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
@@ -114,15 +120,15 @@ fn ensure_keep_alive_during_shutdown() {
 	spawn_handle.spawn("task1", run_background_task(()));
 	assert_eq!(drop_tester, 1);
 	// allow the tasks to even start
-	runtime.block_on(async { tokio::time::delay_for(Duration::from_secs(1)).await });
+	runtime.block_on(async { tokio::time::sleep(Duration::from_secs(1)).await });
 	assert_eq!(drop_tester, 1);
 	runtime.block_on(task_manager.clean_shutdown());
-	assert_eq!(drop_tester, 0);
+	drop_tester.wait_on_drop();
 }
 
 #[test]
 fn ensure_blocking_futures_are_awaited_on_shutdown() {
-	let mut runtime = tokio::runtime::Runtime::new().unwrap();
+	let runtime = tokio::runtime::Runtime::new().unwrap();
 	let handle = runtime.handle().clone();
 	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
@@ -139,7 +145,7 @@ fn ensure_blocking_futures_are_awaited_on_shutdown() {
 	);
 	assert_eq!(drop_tester, 2);
 	// allow the tasks to even start
-	runtime.block_on(async { tokio::time::delay_for(Duration::from_secs(1)).await });
+	runtime.block_on(async { tokio::time::sleep(Duration::from_secs(1)).await });
 	assert_eq!(drop_tester, 2);
 	runtime.block_on(task_manager.clean_shutdown());
 	assert_eq!(drop_tester, 0);
@@ -147,7 +153,7 @@ fn ensure_blocking_futures_are_awaited_on_shutdown() {
 
 #[test]
 fn ensure_no_task_can_be_spawn_after_terminate() {
-	let mut runtime = tokio::runtime::Runtime::new().unwrap();
+	let runtime = tokio::runtime::Runtime::new().unwrap();
 	let handle = runtime.handle().clone();
 	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
@@ -158,17 +164,17 @@ fn ensure_no_task_can_be_spawn_after_terminate() {
 	spawn_handle.spawn("task2", run_background_task(drop_tester.new_ref()));
 	assert_eq!(drop_tester, 2);
 	// allow the tasks to even start
-	runtime.block_on(async { tokio::time::delay_for(Duration::from_secs(1)).await });
+	runtime.block_on(async { tokio::time::sleep(Duration::from_secs(1)).await });
 	assert_eq!(drop_tester, 2);
 	task_manager.terminate();
 	spawn_handle.spawn("task3", run_background_task(drop_tester.new_ref()));
 	runtime.block_on(task_manager.clean_shutdown());
-	assert_eq!(drop_tester, 0);
+	drop_tester.wait_on_drop();
 }
 
 #[test]
 fn ensure_task_manager_future_ends_when_task_manager_terminated() {
-	let mut runtime = tokio::runtime::Runtime::new().unwrap();
+	let runtime = tokio::runtime::Runtime::new().unwrap();
 	let handle = runtime.handle().clone();
 	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
@@ -179,7 +185,7 @@ fn ensure_task_manager_future_ends_when_task_manager_terminated() {
 	spawn_handle.spawn("task2", run_background_task(drop_tester.new_ref()));
 	assert_eq!(drop_tester, 2);
 	// allow the tasks to even start
-	runtime.block_on(async { tokio::time::delay_for(Duration::from_secs(1)).await });
+	runtime.block_on(async { tokio::time::sleep(Duration::from_secs(1)).await });
 	assert_eq!(drop_tester, 2);
 	task_manager.terminate();
 	runtime.block_on(task_manager.future()).expect("future has ended without error");
@@ -189,7 +195,7 @@ fn ensure_task_manager_future_ends_when_task_manager_terminated() {
 
 #[test]
 fn ensure_task_manager_future_ends_with_error_when_essential_task_fails() {
-	let mut runtime = tokio::runtime::Runtime::new().unwrap();
+	let runtime = tokio::runtime::Runtime::new().unwrap();
 	let handle = runtime.handle().clone();
 	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
@@ -201,7 +207,7 @@ fn ensure_task_manager_future_ends_with_error_when_essential_task_fails() {
 	spawn_handle.spawn("task2", run_background_task(drop_tester.new_ref()));
 	assert_eq!(drop_tester, 2);
 	// allow the tasks to even start
-	runtime.block_on(async { tokio::time::delay_for(Duration::from_secs(1)).await });
+	runtime.block_on(async { tokio::time::sleep(Duration::from_secs(1)).await });
 	assert_eq!(drop_tester, 2);
 	spawn_essential_handle.spawn("task3", async { panic!("task failed") });
 	runtime
@@ -209,12 +215,12 @@ fn ensure_task_manager_future_ends_with_error_when_essential_task_fails() {
 		.expect_err("future()'s Result must be Err");
 	assert_eq!(drop_tester, 2);
 	runtime.block_on(task_manager.clean_shutdown());
-	assert_eq!(drop_tester, 0);
+	drop_tester.wait_on_drop();
 }
 
 #[test]
 fn ensure_children_tasks_ends_when_task_manager_terminated() {
-	let mut runtime = tokio::runtime::Runtime::new().unwrap();
+	let runtime = tokio::runtime::Runtime::new().unwrap();
 	let handle = runtime.handle().clone();
 	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
@@ -233,17 +239,17 @@ fn ensure_children_tasks_ends_when_task_manager_terminated() {
 	spawn_handle_child_2.spawn("task4", run_background_task(drop_tester.new_ref()));
 	assert_eq!(drop_tester, 4);
 	// allow the tasks to even start
-	runtime.block_on(async { tokio::time::delay_for(Duration::from_secs(1)).await });
+	runtime.block_on(async { tokio::time::sleep(Duration::from_secs(1)).await });
 	assert_eq!(drop_tester, 4);
 	task_manager.terminate();
 	runtime.block_on(task_manager.future()).expect("future has ended without error");
 	runtime.block_on(task_manager.clean_shutdown());
-	assert_eq!(drop_tester, 0);
+	drop_tester.wait_on_drop();
 }
 
 #[test]
 fn ensure_task_manager_future_ends_with_error_when_childs_essential_task_fails() {
-	let mut runtime = tokio::runtime::Runtime::new().unwrap();
+	let runtime = tokio::runtime::Runtime::new().unwrap();
 	let handle = runtime.handle().clone();
 	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
@@ -263,7 +269,7 @@ fn ensure_task_manager_future_ends_with_error_when_childs_essential_task_fails()
 	spawn_handle_child_2.spawn("task4", run_background_task(drop_tester.new_ref()));
 	assert_eq!(drop_tester, 4);
 	// allow the tasks to even start
-	runtime.block_on(async { tokio::time::delay_for(Duration::from_secs(1)).await });
+	runtime.block_on(async { tokio::time::sleep(Duration::from_secs(1)).await });
 	assert_eq!(drop_tester, 4);
 	spawn_essential_handle_child_1.spawn("task5", async { panic!("task failed") });
 	runtime
@@ -271,12 +277,12 @@ fn ensure_task_manager_future_ends_with_error_when_childs_essential_task_fails()
 		.expect_err("future()'s Result must be Err");
 	assert_eq!(drop_tester, 4);
 	runtime.block_on(task_manager.clean_shutdown());
-	assert_eq!(drop_tester, 0);
+	drop_tester.wait_on_drop();
 }
 
 #[test]
 fn ensure_task_manager_future_continues_when_childs_not_essential_task_fails() {
-	let mut runtime = tokio::runtime::Runtime::new().unwrap();
+	let runtime = tokio::runtime::Runtime::new().unwrap();
 	let handle = runtime.handle().clone();
 	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
@@ -295,12 +301,12 @@ fn ensure_task_manager_future_continues_when_childs_not_essential_task_fails() {
 	spawn_handle_child_2.spawn("task4", run_background_task(drop_tester.new_ref()));
 	assert_eq!(drop_tester, 4);
 	// allow the tasks to even start
-	runtime.block_on(async { tokio::time::delay_for(Duration::from_secs(1)).await });
+	runtime.block_on(async { tokio::time::sleep(Duration::from_secs(1)).await });
 	assert_eq!(drop_tester, 4);
 	spawn_handle_child_1.spawn("task5", async { panic!("task failed") });
 	runtime.block_on(async {
 		let t1 = task_manager.future().fuse();
-		let t2 = tokio::time::delay_for(Duration::from_secs(3)).fuse();
+		let t2 = tokio::time::sleep(Duration::from_secs(3)).fuse();
 
 		pin_mut!(t1, t2);
 
@@ -311,5 +317,5 @@ fn ensure_task_manager_future_continues_when_childs_not_essential_task_fails() {
 	});
 	assert_eq!(drop_tester, 4);
 	runtime.block_on(task_manager.clean_shutdown());
-	assert_eq!(drop_tester, 0);
+	drop_tester.wait_on_drop();
 }
diff --git a/client/service/test/Cargo.toml b/client/service/test/Cargo.toml
index e64bb30045bb..85a6dcc9e8b2 100644
--- a/client/service/test/Cargo.toml
+++ b/client/service/test/Cargo.toml
@@ -14,8 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 hex-literal = "0.3.1"
 tempfile = "3.1.0"
-tokio = "0.1.22"
-futures01 = { package = "futures", version = "0.1.29" }
+tokio = { version = "1.10.0", features = ["time"] }
 log = "0.4.8"
 fdlimit = "0.2.1"
 parking_lot = "0.11.1"
diff --git a/client/service/test/src/lib.rs b/client/service/test/src/lib.rs
index 6e86b9fcfdb2..61313b4488cb 100644
--- a/client/service/test/src/lib.rs
+++ b/client/service/test/src/lib.rs
@@ -18,8 +18,7 @@
 
 //! Service integration test utils.
 
-use futures::{FutureExt as _, TryFutureExt as _};
-use futures01::{Future, Poll, Stream};
+use futures::{task::Poll, Future, FutureExt, TryFutureExt as _};
 use log::{debug, info};
 use parking_lot::Mutex;
 use sc_client_api::{Backend, CallExecutor};
@@ -36,9 +35,9 @@ use sc_service::{
 use sc_transaction_pool_api::TransactionPool;
 use sp_blockchain::HeaderBackend;
 use sp_runtime::{generic::BlockId, traits::Block as BlockT};
-use std::{iter, net::Ipv4Addr, pin::Pin, sync::Arc, time::Duration};
+use std::{iter, net::Ipv4Addr, pin::Pin, sync::Arc, task::Context, time::Duration};
 use tempfile::TempDir;
-use tokio::{prelude::FutureExt, runtime::Runtime, timer::Interval};
+use tokio::{runtime::Runtime, time};
 
 #[cfg(test)]
 mod client;
@@ -57,7 +56,7 @@ struct TestNet<G, E, F, L, U> {
 }
 
 pub trait TestNetNode:
-	Clone + Future<Item = (), Error = sc_service::Error> + Send + 'static
+	Clone + Future<Output = Result<(), sc_service::Error>> + Send + 'static
 {
 	type Block: BlockT;
 	type Backend: Backend<Self::Block>;
@@ -109,11 +108,10 @@ impl<TBl: BlockT, TBackend, TExec, TRtApi, TExPool> Clone
 impl<TBl: BlockT, TBackend, TExec, TRtApi, TExPool> Future
 	for TestNetComponents<TBl, TBackend, TExec, TRtApi, TExPool>
 {
-	type Item = ();
-	type Error = sc_service::Error;
+	type Output = Result<(), sc_service::Error>;
 
-	fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
-		futures::compat::Compat::new(&mut self.task_manager.lock().future()).poll()
+	fn poll(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> {
+		Pin::new(&mut self.task_manager.lock().future()).poll(cx)
 	}
 }
 
@@ -161,33 +159,36 @@ where
 	{
 		let full_nodes = self.full_nodes.clone();
 		let light_nodes = self.light_nodes.clone();
-		let interval = Interval::new_interval(Duration::from_millis(100))
-			.map_err(|_| ())
-			.for_each(move |_| {
+		let future = async move {
+			let mut interval = time::interval(Duration::from_millis(100));
+
+			loop {
+				interval.tick().await;
+
 				let full_ready = full_nodes
 					.iter()
 					.all(|&(ref id, ref service, _, _)| full_predicate(*id, service));
 
 				if !full_ready {
-					return Ok(())
+					continue
 				}
 
 				let light_ready = light_nodes
 					.iter()
 					.all(|&(ref id, ref service, _)| light_predicate(*id, service));
 
-				if !light_ready {
-					Ok(())
-				} else {
-					Err(())
+				if light_ready {
+					return
 				}
-			})
-			.timeout(MAX_WAIT_TIME);
+			}
+		};
 
-		match self.runtime.block_on(interval) {
-			Ok(()) => unreachable!("interval always fails; qed"),
-			Err(ref err) if err.is_inner() => (),
-			Err(_) => panic!("Waited for too long"),
+		if self
+			.runtime
+			.block_on(async move { time::timeout(MAX_WAIT_TIME, future).await })
+			.is_err()
+		{
+			panic!("Waited for too long");
 		}
 	}
 }
@@ -306,11 +307,11 @@ where
 		light: impl Iterator<Item = impl FnOnce(Configuration) -> Result<L, Error>>,
 		authorities: impl Iterator<Item = (String, impl FnOnce(Configuration) -> Result<(F, U), Error>)>,
 	) {
-		let executor = self.runtime.executor();
+		let handle = self.runtime.handle().clone();
 		let task_executor: TaskExecutor = {
-			let executor = executor.clone();
+			let executor = handle.clone();
 			(move |fut: Pin<Box<dyn futures::Future<Output = ()> + Send>>, _| {
-				executor.spawn(fut.unit_error().compat());
+				executor.spawn(fut.unit_error());
 				async {}
 			})
 			.into()
@@ -330,7 +331,7 @@ where
 			let (service, user_data) =
 				authority(node_config).expect("Error creating test node service");
 
-			executor.spawn(service.clone().map_err(|_| ()));
+			handle.spawn(service.clone().map_err(|_| ()));
 			let addr = addr
 				.with(multiaddr::Protocol::P2p(service.network().local_peer_id().clone().into()));
 			self.authority_nodes.push((self.nodes, service, user_data, addr));
@@ -350,7 +351,7 @@ where
 			let addr = node_config.network.listen_addresses.iter().next().unwrap().clone();
 			let (service, user_data) = full(node_config).expect("Error creating test node service");
 
-			executor.spawn(service.clone().map_err(|_| ()));
+			handle.spawn(service.clone().map_err(|_| ()));
 			let addr = addr
 				.with(multiaddr::Protocol::P2p(service.network().local_peer_id().clone().into()));
 			self.full_nodes.push((self.nodes, service, user_data, addr));
@@ -370,7 +371,7 @@ where
 			let addr = node_config.network.listen_addresses.iter().next().unwrap().clone();
 			let service = light(node_config).expect("Error creating test node service");
 
-			executor.spawn(service.clone().map_err(|_| ()));
+			handle.spawn(service.clone().map_err(|_| ()));
 			let addr = addr
 				.with(multiaddr::Protocol::P2p(service.network().local_peer_id().clone().into()));
 			self.light_nodes.push((self.nodes, service, addr));
@@ -406,7 +407,7 @@ pub fn connectivity<G, E, Fb, F, Lb, L>(
 
 	{
 		let temp = tempdir_with_prefix("substrate-connectivity-test");
-		let runtime = {
+		{
 			let mut network = TestNet::new(
 				&temp,
 				spec.clone(),
@@ -444,12 +445,8 @@ pub fn connectivity<G, E, Fb, F, Lb, L>(
 					connected == expected_light_connections
 				},
 			);
-
-			network.runtime
 		};
 
-		runtime.shutdown_now().wait().expect("Error shutting down runtime");
-
 		temp.close().expect("Error removing temp dir");
 	}
 	{
diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml
index 560dbb26684c..4eed6e5e2913 100644
--- a/test-utils/Cargo.toml
+++ b/test-utils/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 futures = "0.3.16"
 substrate-test-utils-derive = { version = "0.10.0-dev", path = "./derive" }
-tokio = { version = "0.2.13", features = ["macros", "rt-core", "time"] }
+tokio = { version = "1.10", features = ["macros", "time"] }
 
 [dev-dependencies]
 sc-service = { version = "0.10.0-dev", path = "../client/service" }
diff --git a/test-utils/derive/Cargo.toml b/test-utils/derive/Cargo.toml
index 991183edf4ab..566c83f88112 100644
--- a/test-utils/derive/Cargo.toml
+++ b/test-utils/derive/Cargo.toml
@@ -12,6 +12,7 @@ description = "Substrate test utilities macros"
 quote = "1.0.6"
 syn = { version = "1.0.58", features = ["full"] }
 proc-macro-crate = "1.0.0"
+proc-macro2 = "1.0.28"
 
 [lib]
 proc-macro = true
diff --git a/test-utils/derive/src/lib.rs b/test-utils/derive/src/lib.rs
index 877792f82de6..2205b259e3e6 100644
--- a/test-utils/derive/src/lib.rs
+++ b/test-utils/derive/src/lib.rs
@@ -22,19 +22,14 @@ use quote::quote;
 
 #[proc_macro_attribute]
 pub fn test(args: TokenStream, item: TokenStream) -> TokenStream {
-	impl_test(args, item)
-}
-
-fn impl_test(args: TokenStream, item: TokenStream) -> TokenStream {
 	let input = syn::parse_macro_input!(item as syn::ItemFn);
-	let args = syn::parse_macro_input!(args as syn::AttributeArgs);
 
-	parse_knobs(input, args).unwrap_or_else(|e| e.to_compile_error().into())
+	parse_knobs(input, args.into()).unwrap_or_else(|e| e.to_compile_error().into())
 }
 
 fn parse_knobs(
 	mut input: syn::ItemFn,
-	args: syn::AttributeArgs,
+	args: proc_macro2::TokenStream,
 ) -> Result<TokenStream, syn::Error> {
 	let sig = &mut input.sig;
 	let body = &input.block;
@@ -62,7 +57,7 @@ fn parse_knobs(
 
 	let header = {
 		quote! {
-			#[#crate_name::tokio::test(#(#args)*)]
+			#[#crate_name::tokio::test( #args )]
 		}
 	};
 
@@ -76,25 +71,15 @@ fn parse_knobs(
 				#crate_name::tokio::spawn(fut).map(drop)
 			})
 			.into();
-			let timeout_task = #crate_name::tokio::time::delay_for(
+			if #crate_name::tokio::time::timeout(
 				std::time::Duration::from_secs(
 					std::env::var("SUBSTRATE_TEST_TIMEOUT")
 						.ok()
 						.and_then(|x| x.parse().ok())
-						.unwrap_or(600))
-			).fuse();
-			let actual_test_task = async move {
-				#body
-			}
-			.fuse();
-
-			#crate_name::futures::pin_mut!(timeout_task, actual_test_task);
-
-			#crate_name::futures::select! {
-				_ = timeout_task => {
-					panic!("The test took too long!");
-				},
-				_ = actual_test_task => {},
+						.unwrap_or(600)),
+				async move { #body },
+			).await.is_err() {
+				panic!("The test took too long!");
 			}
 		}
 	};
diff --git a/test-utils/test-crate/Cargo.toml b/test-utils/test-crate/Cargo.toml
index 6ab53fc752ea..fff39c3964ad 100644
--- a/test-utils/test-crate/Cargo.toml
+++ b/test-utils/test-crate/Cargo.toml
@@ -12,6 +12,6 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dev-dependencies]
-tokio = { version = "0.2.13", features = ["macros"] }
+tokio = { version = "1.10", features = ["macros"] }
 test-utils = { version = "4.0.0-dev", path = "..", package = "substrate-test-utils" }
 sc-service = { version = "0.10.0-dev", path = "../../client/service" }
diff --git a/test-utils/test-runner/Cargo.toml b/test-utils/test-runner/Cargo.toml
index 1debd6fb0164..b5b115771b53 100644
--- a/test-utils/test-runner/Cargo.toml
+++ b/test-utils/test-runner/Cargo.toml
@@ -48,7 +48,7 @@ frame-system = { path = "../../frame/system" }
 
 log = "0.4.8"
 futures = "0.3.16"
-tokio = { version = "0.2", features = ["signal"] }
+tokio = { version = "1.10", features = ["signal"] }
 # Calling RPC
 jsonrpc-core = "18.0"
 num-traits = "0.2.14"
diff --git a/test-utils/tests/basic.rs b/test-utils/tests/basic.rs
index 3273d0386e8a..b94f85ccba57 100644
--- a/test-utils/tests/basic.rs
+++ b/test-utils/tests/basic.rs
@@ -29,7 +29,7 @@ async fn panicking_test(_: TaskExecutor) {
 	panic!("boo!");
 }
 
-#[substrate_test_utils::test(max_threads = 2)]
+#[substrate_test_utils::test(flavor = "multi_thread", worker_threads = 1)]
 async fn basic_test_with_args(_: TaskExecutor) {
 	assert!(true);
 }
@@ -41,14 +41,14 @@ async fn rename_argument(ex: TaskExecutor) {
 	assert!(true);
 }
 
-#[substrate_test_utils::test]
-#[should_panic(expected = "test took too long")]
 // NOTE: enable this test only after setting SUBSTRATE_TEST_TIMEOUT to a smaller value
 //
 // SUBSTRATE_TEST_TIMEOUT=1 cargo test -- --ignored timeout
+#[substrate_test_utils::test]
+#[should_panic(expected = "test took too long")]
 #[ignore]
 async fn timeout(_: TaskExecutor) {
-	tokio::time::delay_for(std::time::Duration::from_secs(
+	tokio::time::sleep(std::time::Duration::from_secs(
 		std::env::var("SUBSTRATE_TEST_TIMEOUT")
 			.expect("env var SUBSTRATE_TEST_TIMEOUT has been provided by the user")
 			.parse::<u64>()
diff --git a/utils/frame/remote-externalities/Cargo.toml b/utils/frame/remote-externalities/Cargo.toml
index f849c89d7053..d255499d6c3a 100644
--- a/utils/frame/remote-externalities/Cargo.toml
+++ b/utils/frame/remote-externalities/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 jsonrpsee-ws-client = { version = "0.3.0", default-features = false, features = [
-    "tokio02",
+    "tokio1",
 ] }
 jsonrpsee-proc-macros = "0.3.0"
 
@@ -30,7 +30,7 @@ sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
 sp-version = { version = "4.0.0-dev", path = "../../../primitives/version" }
 
 [dev-dependencies]
-tokio = { version = "0.2", features = ["macros", "rt-threaded"] }
+tokio = { version = "1.10", features = ["macros", "rt-multi-thread"] }
 pallet-elections-phragmen = { path = "../../../frame/elections-phragmen", version = "5.0.0-dev" }
 
 [features]
diff --git a/utils/frame/rpc/support/Cargo.toml b/utils/frame/rpc/support/Cargo.toml
index 827afb090c8f..aa9f1bbef802 100644
--- a/utils/frame/rpc/support/Cargo.toml
+++ b/utils/frame/rpc/support/Cargo.toml
@@ -25,4 +25,4 @@ sc-rpc-api = { version = "0.10.0-dev", path = "../../../../client/rpc-api" }
 
 [dev-dependencies]
 frame-system = { version = "4.0.0-dev", path = "../../../../frame/system" }
-tokio = "0.2"
+tokio = "1.10"

From 87b62665725b133a3ca53651b3266ee8cec08dda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Wed, 25 Aug 2021 09:13:00 +0200
Subject: [PATCH 1113/1194] Fix `state_subscribeRuntimeVersion` for parachains
 (#9617)

The old implementation was listening for storage changes and every time
a block changed the `CODE` storage field, it checked if the runtime
version changed. It used the best block to compare against the latest
known runtime version. It could happen that you processed the storage
notification of block Y and checked the runtime version of block X (the
current best block). This is also what happened on parachains.
Parachains import blocks and set the new best block in a later step.
This means we imported the block that changed the code, got notified and
checked the runtime version of the current best block (which would still
be the parent of the block that changed the runtime). As the parent did
not changed the runtime, the runtime version also did not changed and we
never notified the subscribers.

The new implementation now switches to listen for best imported blocks.
Every time we import a new best block, we check its runtime version
against the latest known runtime version. As we also send a notification
when the parachains sets a block as new best block, we will trigger this
code path correctly. It moves some computation from checking if the key
was modified to getting the runtime version. As fetching the runtime
version is a rather common pattern, it should not make any big
difference performancewise.
---
 client/rpc/src/state/state_full.rs | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/client/rpc/src/state/state_full.rs b/client/rpc/src/state/state_full.rs
index ef008700f6d5..0d9a35fd26ec 100644
--- a/client/rpc/src/state/state_full.rs
+++ b/client/rpc/src/state/state_full.rs
@@ -35,8 +35,7 @@ use sp_blockchain::{
 };
 use sp_core::{
 	storage::{
-		well_known_keys, ChildInfo, ChildType, PrefixedStorageKey, StorageChangeSet, StorageData,
-		StorageKey,
+		ChildInfo, ChildType, PrefixedStorageKey, StorageChangeSet, StorageData, StorageKey,
 	},
 	Bytes,
 };
@@ -470,17 +469,6 @@ where
 		_meta: crate::Metadata,
 		subscriber: Subscriber<RuntimeVersion>,
 	) {
-		let stream = match self.client.storage_changes_notification_stream(
-			Some(&[StorageKey(well_known_keys::CODE.to_vec())]),
-			None,
-		) {
-			Ok(stream) => stream,
-			Err(err) => {
-				let _ = subscriber.reject(Error::from(client_err(err)).into());
-				return
-			},
-		};
-
 		self.subscriptions.add(subscriber, |sink| {
 			let version = self
 				.block_or_best(None)
@@ -493,12 +481,16 @@ where
 			let client = self.client.clone();
 			let mut previous_version = version.clone();
 
-			let stream = stream.filter_map(move |_| {
-				let info = client.info();
+			// A stream of all best blocks.
+			let stream =
+				client.import_notification_stream().filter(|n| future::ready(n.is_new_best));
+
+			let stream = stream.filter_map(move |n| {
 				let version = client
-					.runtime_version_at(&BlockId::hash(info.best_hash))
+					.runtime_version_at(&BlockId::hash(n.hash))
 					.map_err(|e| Error::Client(Box::new(e)))
 					.map_err(Into::into);
+
 				if previous_version != version {
 					previous_version = version.clone();
 					future::ready(Some(Ok::<_, ()>(version)))

From b1a7585229697dbbd09ce5f32191a17724abd1e7 Mon Sep 17 00:00:00 2001
From: Shaun Wang <spxwang@gmail.com>
Date: Wed, 25 Aug 2021 22:27:56 +1200
Subject: [PATCH 1114/1194] pallet-proxy: emit events on proxy added. (#9546)

* pallet-proxy: emit events on proxy added.

* Apply review suggestions.
---
 frame/proxy/src/lib.rs   | 21 +++++++++++++++++++--
 frame/proxy/src/tests.rs |  1 +
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/frame/proxy/src/lib.rs b/frame/proxy/src/lib.rs
index 6a853c8e2b8e..0537ed4a3239 100644
--- a/frame/proxy/src/lib.rs
+++ b/frame/proxy/src/lib.rs
@@ -534,7 +534,12 @@ pub mod pallet {
 	}
 
 	#[pallet::event]
-	#[pallet::metadata(T::AccountId = "AccountId", T::ProxyType = "ProxyType", CallHashOf<T> = "Hash")]
+	#[pallet::metadata(
+		T::AccountId = "AccountId",
+		T::ProxyType = "ProxyType",
+		CallHashOf<T> = "Hash",
+		T::BlockNumber = "BlockNumber",
+	)]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
 	pub enum Event<T: Config> {
 		/// A proxy was executed correctly, with the given \[result\].
@@ -545,6 +550,8 @@ pub mod pallet {
 		AnonymousCreated(T::AccountId, T::AccountId, T::ProxyType, u16),
 		/// An announcement was placed to make a call in the future. \[real, proxy, call_hash\]
 		Announced(T::AccountId, T::AccountId, CallHashOf<T>),
+		/// A proxy was added. \[delegator, delegatee, proxy_type, delay\]
+		ProxyAdded(T::AccountId, T::AccountId, T::ProxyType, T::BlockNumber),
 	}
 
 	/// Old name generated by `decl_event`.
@@ -646,7 +653,11 @@ impl<T: Config> Pallet<T> {
 	) -> DispatchResult {
 		ensure!(delegator != &delegatee, Error::<T>::NoSelfProxy);
 		Proxies::<T>::try_mutate(delegator, |(ref mut proxies, ref mut deposit)| {
-			let proxy_def = ProxyDefinition { delegate: delegatee, proxy_type, delay };
+			let proxy_def = ProxyDefinition {
+				delegate: delegatee.clone(),
+				proxy_type: proxy_type.clone(),
+				delay,
+			};
 			let i = proxies.binary_search(&proxy_def).err().ok_or(Error::<T>::Duplicate)?;
 			proxies.try_insert(i, proxy_def).map_err(|_| Error::<T>::TooMany)?;
 			let new_deposit = Self::deposit(proxies.len() as u32);
@@ -656,6 +667,12 @@ impl<T: Config> Pallet<T> {
 				T::Currency::unreserve(delegator, *deposit - new_deposit);
 			}
 			*deposit = new_deposit;
+			Self::deposit_event(Event::<T>::ProxyAdded(
+				delegator.clone(),
+				delegatee,
+				proxy_type,
+				delay,
+			));
 			Ok(())
 		})
 	}
diff --git a/frame/proxy/src/tests.rs b/frame/proxy/src/tests.rs
index f3fe1d674a87..eb4193a18d93 100644
--- a/frame/proxy/src/tests.rs
+++ b/frame/proxy/src/tests.rs
@@ -194,6 +194,7 @@ fn expect_events(e: Vec<Event>) {
 fn announcement_works() {
 	new_test_ext().execute_with(|| {
 		assert_ok!(Proxy::add_proxy(Origin::signed(1), 3, ProxyType::Any, 1));
+		System::assert_last_event(ProxyEvent::ProxyAdded(1, 3, ProxyType::Any, 1).into());
 		assert_ok!(Proxy::add_proxy(Origin::signed(2), 3, ProxyType::Any, 1));
 		assert_eq!(Balances::reserved_balance(3), 0);
 

From bd697931c4352f08cfbe42a85488184890ea420f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Wed, 25 Aug 2021 13:37:15 +0200
Subject: [PATCH 1115/1194] Remove dependency on sandboxing host functions
 (#9592)

* Embed wasmi into the runtime

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_contracts --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/contracts/src/weights.rs --template=./.maintain/frame-weight-template.hbs

Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
---
 Cargo.lock                                    |    2 +
 frame/contracts/src/weights.rs                | 1250 ++++++++---------
 primitives/sandbox/Cargo.toml                 |    9 +
 .../{with_std.rs => embedded_executor.rs}     |  208 ++-
 .../{without_std.rs => host_executor.rs}      |    0
 primitives/sandbox/src/lib.rs                 |   13 +-
 6 files changed, 743 insertions(+), 739 deletions(-)
 rename primitives/sandbox/{with_std.rs => embedded_executor.rs} (69%)
 rename primitives/sandbox/{without_std.rs => host_executor.rs} (100%)

diff --git a/Cargo.lock b/Cargo.lock
index 0abb8aff2941..e883ba8c606e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9352,6 +9352,7 @@ name = "sp-sandbox"
 version = "0.10.0-dev"
 dependencies = [
  "assert_matches",
+ "log 0.4.14",
  "parity-scale-codec",
  "sp-core",
  "sp-io",
@@ -11141,6 +11142,7 @@ dependencies = [
  "downcast-rs",
  "errno",
  "libc",
+ "libm",
  "memory_units",
  "num-rational 0.2.4",
  "num-traits",
diff --git a/frame/contracts/src/weights.rs b/frame/contracts/src/weights.rs
index cffdb6ca9f00..b7e711a37aa2 100644
--- a/frame/contracts/src/weights.rs
+++ b/frame/contracts/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_contracts
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-08-20, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -155,47 +155,47 @@ pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts DeletionQueue (r:1 w:0)
 	fn on_initialize() -> Weight {
-		(3_175_000 as Weight)
+		(3_227_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 3_000
-			.saturating_add((2_201_000 as Weight).saturating_mul(k as Weight))
+			.saturating_add((2_273_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	// Storage: Contracts DeletionQueue (r:1 w:0)
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
-		(66_035_000 as Weight)
-			// Standard Error: 6_000
-			.saturating_add((38_159_000 as Weight).saturating_mul(q as Weight))
+		(50_365_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((39_799_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts PristineCode (r:1 w:0)
 	// Storage: Contracts CodeStorage (r:0 w:1)
 	fn instrument(c: u32, ) -> Weight {
-		(35_007_000 as Weight)
-			// Standard Error: 110_000
-			.saturating_add((75_739_000 as Weight).saturating_mul(c as Weight))
+		(40_033_000 as Weight)
+			// Standard Error: 109_000
+			.saturating_add((76_424_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	fn code_load(c: u32, ) -> Weight {
-		(6_238_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((1_671_000 as Weight).saturating_mul(c as Weight))
+		(6_675_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_668_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 	}
 	// Storage: Contracts CodeStorage (r:1 w:1)
 	fn code_refcount(c: u32, ) -> Weight {
-		(10_080_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((2_694_000 as Weight).saturating_mul(c as Weight))
+		(10_560_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((2_704_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -206,11 +206,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:1)
 	// Storage: Contracts PristineCode (r:0 w:1)
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight {
-		(182_161_000 as Weight)
-			// Standard Error: 115_000
-			.saturating_add((113_515_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 7_000
-			.saturating_add((2_314_000 as Weight).saturating_mul(s as Weight))
+		(479_578_000 as Weight)
+			// Standard Error: 166_000
+			.saturating_add((187_167_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 10_000
+			.saturating_add((2_450_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
@@ -220,9 +220,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:1)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn instantiate(s: u32, ) -> Weight {
-		(183_914_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((2_224_000 as Weight).saturating_mul(s as Weight))
+		(237_664_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((2_249_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
@@ -231,7 +231,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:1)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn call() -> Weight {
-		(166_507_000 as Weight)
+		(223_426_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
@@ -305,9 +305,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743aeb9db1dfeed3a7b47b] (r:1 w:0)
 	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743abdc9db5edf43ffcb0d] (r:1 w:0)
 	fn claim_surcharge(c: u32, ) -> Weight {
-		(126_115_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((2_829_000 as Weight).saturating_mul(c as Weight))
+		(130_759_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((2_850_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
@@ -316,9 +316,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_caller(r: u32, ) -> Weight {
-		(134_110_000 as Weight)
-			// Standard Error: 130_000
-			.saturating_add((230_337_000 as Weight).saturating_mul(r as Weight))
+		(492_555_000 as Weight)
+			// Standard Error: 174_000
+			.saturating_add((136_915_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -327,9 +327,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_address(r: u32, ) -> Weight {
-		(131_212_000 as Weight)
-			// Standard Error: 116_000
-			.saturating_add((230_568_000 as Weight).saturating_mul(r as Weight))
+		(487_655_000 as Weight)
+			// Standard Error: 165_000
+			.saturating_add((137_827_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -338,9 +338,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(135_149_000 as Weight)
-			// Standard Error: 149_000
-			.saturating_add((224_830_000 as Weight).saturating_mul(r as Weight))
+		(488_993_000 as Weight)
+			// Standard Error: 195_000
+			.saturating_add((137_040_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -349,9 +349,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_balance(r: u32, ) -> Weight {
-		(148_463_000 as Weight)
-			// Standard Error: 246_000
-			.saturating_add((480_930_000 as Weight).saturating_mul(r as Weight))
+		(500_062_000 as Weight)
+			// Standard Error: 208_000
+			.saturating_add((392_337_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -360,9 +360,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(137_790_000 as Weight)
-			// Standard Error: 152_000
-			.saturating_add((224_961_000 as Weight).saturating_mul(r as Weight))
+		(492_064_000 as Weight)
+			// Standard Error: 156_000
+			.saturating_add((137_082_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -371,9 +371,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(134_238_000 as Weight)
-			// Standard Error: 135_000
-			.saturating_add((224_433_000 as Weight).saturating_mul(r as Weight))
+		(496_566_000 as Weight)
+			// Standard Error: 159_000
+			.saturating_add((137_377_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -382,9 +382,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(135_053_000 as Weight)
-			// Standard Error: 147_000
-			.saturating_add((223_955_000 as Weight).saturating_mul(r as Weight))
+		(491_566_000 as Weight)
+			// Standard Error: 163_000
+			.saturating_add((137_586_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -393,9 +393,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(138_522_000 as Weight)
-			// Standard Error: 145_000
-			.saturating_add((223_459_000 as Weight).saturating_mul(r as Weight))
+		(491_459_000 as Weight)
+			// Standard Error: 150_000
+			.saturating_add((137_402_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -404,9 +404,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_block_number(r: u32, ) -> Weight {
-		(133_568_000 as Weight)
-			// Standard Error: 143_000
-			.saturating_add((224_792_000 as Weight).saturating_mul(r as Weight))
+		(488_379_000 as Weight)
+			// Standard Error: 170_000
+			.saturating_add((136_564_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -415,9 +415,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_now(r: u32, ) -> Weight {
-		(134_786_000 as Weight)
-			// Standard Error: 130_000
-			.saturating_add((224_331_000 as Weight).saturating_mul(r as Weight))
+		(494_827_000 as Weight)
+			// Standard Error: 175_000
+			.saturating_add((137_178_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -427,9 +427,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: TransactionPayment NextFeeMultiplier (r:1 w:0)
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(147_402_000 as Weight)
-			// Standard Error: 233_000
-			.saturating_add((439_237_000 as Weight).saturating_mul(r as Weight))
+		(497_508_000 as Weight)
+			// Standard Error: 191_000
+			.saturating_add((323_559_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -438,9 +438,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_gas(r: u32, ) -> Weight {
-		(115_711_000 as Weight)
-			// Standard Error: 88_000
-			.saturating_add((113_467_000 as Weight).saturating_mul(r as Weight))
+		(179_076_000 as Weight)
+			// Standard Error: 124_000
+			.saturating_add((62_013_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -449,9 +449,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_input(r: u32, ) -> Weight {
-		(123_004_000 as Weight)
-			// Standard Error: 78_000
-			.saturating_add((6_674_000 as Weight).saturating_mul(r as Weight))
+		(480_920_000 as Weight)
+			// Standard Error: 182_000
+			.saturating_add((3_254_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -460,9 +460,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(131_611_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((1_035_000 as Weight).saturating_mul(n as Weight))
+		(487_910_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_218_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -471,9 +471,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_return(r: u32, ) -> Weight {
-		(118_327_000 as Weight)
-			// Standard Error: 84_000
-			.saturating_add((4_274_000 as Weight).saturating_mul(r as Weight))
+		(470_960_000 as Weight)
+			// Standard Error: 678_000
+			.saturating_add((2_506_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -482,9 +482,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(126_129_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((495_000 as Weight).saturating_mul(n as Weight))
+		(478_623_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((749_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -494,9 +494,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: Contracts DeletionQueue (r:1 w:1)
 	fn seal_terminate(r: u32, ) -> Weight {
-		(123_759_000 as Weight)
-			// Standard Error: 115_000
-			.saturating_add((89_730_000 as Weight).saturating_mul(r as Weight))
+		(481_930_000 as Weight)
+			// Standard Error: 511_000
+			.saturating_add((84_726_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -508,9 +508,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743af3fd4cc2fc8d170b6d] (r:1 w:0)
 	fn seal_restore_to(r: u32, ) -> Weight {
-		(151_364_000 as Weight)
-			// Standard Error: 263_000
-			.saturating_add((99_367_000 as Weight).saturating_mul(r as Weight))
+		(514_296_000 as Weight)
+			// Standard Error: 458_000
+			.saturating_add((93_769_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -518,9 +518,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_restore_to_per_delta(d: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 1_919_000
-			.saturating_add((2_415_482_000 as Weight).saturating_mul(d as Weight))
+		(313_520_000 as Weight)
+			// Standard Error: 1_783_000
+			.saturating_add((2_435_407_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
 			.saturating_add(T::DbWeight::get().writes(7 as Weight))
@@ -532,9 +532,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: RandomnessCollectiveFlip RandomMaterial (r:1 w:0)
 	fn seal_random(r: u32, ) -> Weight {
-		(137_660_000 as Weight)
-			// Standard Error: 204_000
-			.saturating_add((563_042_000 as Weight).saturating_mul(r as Weight))
+		(484_059_000 as Weight)
+			// Standard Error: 285_000
+			.saturating_add((443_946_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -543,9 +543,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(137_087_000 as Weight)
-			// Standard Error: 413_000
-			.saturating_add((835_499_000 as Weight).saturating_mul(r as Weight))
+		(491_593_000 as Weight)
+			// Standard Error: 386_000
+			.saturating_add((733_958_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -555,11 +555,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System EventTopics (r:100 w:100)
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_117_515_000 as Weight)
-			// Standard Error: 2_167_000
-			.saturating_add((494_145_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 427_000
-			.saturating_add((150_093_000 as Weight).saturating_mul(n as Weight))
+		(1_342_357_000 as Weight)
+			// Standard Error: 2_458_000
+			.saturating_add((521_445_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 484_000
+			.saturating_add((195_792_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -570,9 +570,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(132_070_000 as Weight)
-			// Standard Error: 129_000
-			.saturating_add((155_669_000 as Weight).saturating_mul(r as Weight))
+		(209_818_000 as Weight)
+			// Standard Error: 157_000
+			.saturating_add((93_289_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -581,17 +581,17 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_debug_message(r: u32, ) -> Weight {
-		(126_971_000 as Weight)
-			// Standard Error: 90_000
-			.saturating_add((122_445_000 as Weight).saturating_mul(r as Weight))
+		(200_027_000 as Weight)
+			// Standard Error: 145_000
+			.saturating_add((79_038_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(125_746_000 as Weight)
-			// Standard Error: 610_000
-			.saturating_add((501_265_000 as Weight).saturating_mul(r as Weight))
+		(477_211_000 as Weight)
+			// Standard Error: 709_000
+			.saturating_add((407_264_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -603,17 +603,17 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: unknown [0x7afa01283080ef247df84e0ba38ea5a587d25ce6633a6bfbba02068c14023441] (r:1 w:1)
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(563_219_000 as Weight)
-			// Standard Error: 219_000
-			.saturating_add((41_578_000 as Weight).saturating_mul(n as Weight))
+		(832_538_000 as Weight)
+			// Standard Error: 262_000
+			.saturating_add((87_211_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_clear_storage(r: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 1_727_000
-			.saturating_add((1_001_461_000 as Weight).saturating_mul(r as Weight))
+		(199_686_000 as Weight)
+			// Standard Error: 1_610_000
+			.saturating_add((905_125_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -621,9 +621,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_get_storage(r: u32, ) -> Weight {
-		(9_115_000 as Weight)
-			// Standard Error: 784_000
-			.saturating_add((660_533_000 as Weight).saturating_mul(r as Weight))
+		(335_052_000 as Weight)
+			// Standard Error: 885_000
+			.saturating_add((545_754_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -634,9 +634,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: unknown [0x7afa01283080ef247df84e0ba38ea5a587d25ce6633a6bfbba02068c14023441] (r:1 w:0)
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(563_175_000 as Weight)
-			// Standard Error: 206_000
-			.saturating_add((89_626_000 as Weight).saturating_mul(n as Weight))
+		(800_556_000 as Weight)
+			// Standard Error: 337_000
+			.saturating_add((133_492_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -645,9 +645,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_transfer(r: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 1_750_000
-			.saturating_add((4_820_493_000 as Weight).saturating_mul(r as Weight))
+		(317_531_000 as Weight)
+			// Standard Error: 1_627_000
+			.saturating_add((4_748_591_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
@@ -659,8 +659,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 6_692_000
-			.saturating_add((11_477_937_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 8_848_000
+			.saturating_add((46_947_679_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((200 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -671,13 +671,13 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:101 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight {
-		(11_238_437_000 as Weight)
-			// Standard Error: 81_620_000
-			.saturating_add((3_700_413_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 29_000
-			.saturating_add((32_106_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 31_000
-			.saturating_add((54_386_000 as Weight).saturating_mul(o as Weight))
+		(47_469_660_000 as Weight)
+			// Standard Error: 45_192_000
+			.saturating_add((3_691_145_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 16_000
+			.saturating_add((75_339_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 17_000
+			.saturating_add((121_494_000 as Weight).saturating_mul(o as Weight))
 			.saturating_add(T::DbWeight::get().reads(205 as Weight))
 			.saturating_add(T::DbWeight::get().writes(101 as Weight))
 			.saturating_add(T::DbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
@@ -689,8 +689,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts AccountCounter (r:1 w:1)
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 35_258_000
-			.saturating_add((20_674_357_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 32_740_000
+			.saturating_add((55_623_588_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
@@ -702,13 +702,13 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: Contracts AccountCounter (r:1 w:1)
 	fn seal_instantiate_per_input_output_salt_kb(i: u32, o: u32, s: u32, ) -> Weight {
-		(14_725_288_000 as Weight)
-			// Standard Error: 53_000
-			.saturating_add((33_848_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 53_000
-			.saturating_add((57_054_000 as Weight).saturating_mul(o as Weight))
-			// Standard Error: 53_000
-			.saturating_add((180_033_000 as Weight).saturating_mul(s as Weight))
+		(54_718_944_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((75_276_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 29_000
+			.saturating_add((121_341_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 29_000
+			.saturating_add((223_964_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(206 as Weight))
 			.saturating_add(T::DbWeight::get().writes(204 as Weight))
 	}
@@ -717,9 +717,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(131_974_000 as Weight)
-			// Standard Error: 125_000
-			.saturating_add((220_711_000 as Weight).saturating_mul(r as Weight))
+		(485_310_000 as Weight)
+			// Standard Error: 169_000
+			.saturating_add((143_364_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -728,9 +728,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(367_148_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((462_143_000 as Weight).saturating_mul(n as Weight))
+		(632_820_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((511_722_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -739,9 +739,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(134_585_000 as Weight)
-			// Standard Error: 131_000
-			.saturating_add((227_264_000 as Weight).saturating_mul(r as Weight))
+		(484_331_000 as Weight)
+			// Standard Error: 195_000
+			.saturating_add((151_617_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -750,9 +750,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(325_319_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((313_033_000 as Weight).saturating_mul(n as Weight))
+		(565_213_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((359_762_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -761,9 +761,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(135_347_000 as Weight)
-			// Standard Error: 150_000
-			.saturating_add((199_764_000 as Weight).saturating_mul(r as Weight))
+		(481_843_000 as Weight)
+			// Standard Error: 186_000
+			.saturating_add((122_838_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -772,9 +772,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(424_473_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((130_936_000 as Weight).saturating_mul(n as Weight))
+		(582_445_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((176_329_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -783,9 +783,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(128_776_000 as Weight)
-			// Standard Error: 118_000
-			.saturating_add((203_125_000 as Weight).saturating_mul(r as Weight))
+		(486_320_000 as Weight)
+			// Standard Error: 147_000
+			.saturating_add((123_460_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -794,266 +794,266 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(445_726_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((130_931_000 as Weight).saturating_mul(n as Weight))
+		(515_967_000 as Weight)
+			// Standard Error: 33_000
+			.saturating_add((176_423_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(22_161_000 as Weight)
-			// Standard Error: 36_000
-			.saturating_add((3_329_000 as Weight).saturating_mul(r as Weight))
+		(54_127_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((10_198_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(24_430_000 as Weight)
-			// Standard Error: 65_000
-			.saturating_add((159_566_000 as Weight).saturating_mul(r as Weight))
+		(55_411_000 as Weight)
+			// Standard Error: 148_000
+			.saturating_add((22_916_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(24_443_000 as Weight)
-			// Standard Error: 62_000
-			.saturating_add((232_854_000 as Weight).saturating_mul(r as Weight))
+		(55_462_000 as Weight)
+			// Standard Error: 134_000
+			.saturating_add((24_449_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(22_158_000 as Weight)
-			// Standard Error: 34_000
-			.saturating_add((12_112_000 as Weight).saturating_mul(r as Weight))
+		(54_114_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((26_214_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(22_178_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((11_374_000 as Weight).saturating_mul(r as Weight))
+		(54_118_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((26_492_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(22_157_000 as Weight)
-			// Standard Error: 41_000
-			.saturating_add((5_826_000 as Weight).saturating_mul(r as Weight))
+		(54_119_000 as Weight)
+			// Standard Error: 304_000
+			.saturating_add((18_424_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(22_182_000 as Weight)
-			// Standard Error: 34_000
-			.saturating_add((13_647_000 as Weight).saturating_mul(r as Weight))
+		(55_352_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((32_291_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(22_083_000 as Weight)
-			// Standard Error: 44_000
-			.saturating_add((14_901_000 as Weight).saturating_mul(r as Weight))
+		(54_115_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((27_785_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(32_689_000 as Weight)
+		(86_048_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((154_000 as Weight).saturating_mul(e as Weight))
+			.saturating_add((82_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(22_313_000 as Weight)
-			// Standard Error: 383_000
-			.saturating_add((89_804_000 as Weight).saturating_mul(r as Weight))
+		(54_654_000 as Weight)
+			// Standard Error: 82_000
+			.saturating_add((199_159_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(29_939_000 as Weight)
-			// Standard Error: 230_000
-			.saturating_add((185_309_000 as Weight).saturating_mul(r as Weight))
+		(67_478_000 as Weight)
+			// Standard Error: 113_000
+			.saturating_add((302_597_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(221_596_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((4_045_000 as Weight).saturating_mul(p as Weight))
+		(384_281_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((9_984_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(22_171_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((3_362_000 as Weight).saturating_mul(r as Weight))
+		(55_473_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((9_287_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(22_182_000 as Weight)
-			// Standard Error: 31_000
-			.saturating_add((3_801_000 as Weight).saturating_mul(r as Weight))
+		(55_426_000 as Weight)
+			// Standard Error: 38_000
+			.saturating_add((10_559_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(22_200_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((5_080_000 as Weight).saturating_mul(r as Weight))
+		(55_332_000 as Weight)
+			// Standard Error: 8_000
+			.saturating_add((15_640_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(25_255_000 as Weight)
-			// Standard Error: 41_000
-			.saturating_add((8_875_000 as Weight).saturating_mul(r as Weight))
+		(74_497_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((15_067_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(25_145_000 as Weight)
-			// Standard Error: 37_000
-			.saturating_add((9_556_000 as Weight).saturating_mul(r as Weight))
+		(74_445_000 as Weight)
+			// Standard Error: 49_000
+			.saturating_add((17_650_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(24_435_000 as Weight)
-			// Standard Error: 49_000
-			.saturating_add((4_204_000 as Weight).saturating_mul(r as Weight))
+		(54_500_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((9_307_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(23_158_000 as Weight)
-			// Standard Error: 5_969_000
-			.saturating_add((2_339_630_000 as Weight).saturating_mul(r as Weight))
+		(54_382_000 as Weight)
+			// Standard Error: 5_644_000
+			.saturating_add((748_424_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(21_984_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((5_421_000 as Weight).saturating_mul(r as Weight))
+		(54_133_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((15_830_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(22_069_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((5_187_000 as Weight).saturating_mul(r as Weight))
+		(54_129_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((15_894_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(22_042_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((6_116_000 as Weight).saturating_mul(r as Weight))
+		(54_181_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((15_847_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(22_018_000 as Weight)
-			// Standard Error: 34_000
-			.saturating_add((5_130_000 as Weight).saturating_mul(r as Weight))
+		(54_130_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((15_825_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(21_933_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((5_005_000 as Weight).saturating_mul(r as Weight))
+		(54_122_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((15_803_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(22_066_000 as Weight)
-			// Standard Error: 34_000
-			.saturating_add((4_877_000 as Weight).saturating_mul(r as Weight))
+		(54_100_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((15_822_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(22_003_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((5_018_000 as Weight).saturating_mul(r as Weight))
+		(54_143_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((15_868_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(22_130_000 as Weight)
-			// Standard Error: 35_000
-			.saturating_add((7_071_000 as Weight).saturating_mul(r as Weight))
+		(54_133_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((21_121_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(22_112_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((7_056_000 as Weight).saturating_mul(r as Weight))
+		(54_177_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((21_003_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(22_114_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((6_974_000 as Weight).saturating_mul(r as Weight))
+		(54_164_000 as Weight)
+			// Standard Error: 31_000
+			.saturating_add((21_041_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(22_111_000 as Weight)
-			// Standard Error: 32_000
-			.saturating_add((7_183_000 as Weight).saturating_mul(r as Weight))
+		(54_171_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((21_101_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(22_148_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((7_044_000 as Weight).saturating_mul(r as Weight))
+		(54_177_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((21_074_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(22_158_000 as Weight)
-			// Standard Error: 33_000
-			.saturating_add((7_116_000 as Weight).saturating_mul(r as Weight))
+		(54_073_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((21_136_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(22_194_000 as Weight)
-			// Standard Error: 31_000
-			.saturating_add((7_039_000 as Weight).saturating_mul(r as Weight))
+		(54_116_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((21_140_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(22_219_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((7_076_000 as Weight).saturating_mul(r as Weight))
+		(54_115_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((21_164_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(22_170_000 as Weight)
-			// Standard Error: 50_000
-			.saturating_add((7_122_000 as Weight).saturating_mul(r as Weight))
+		(54_261_000 as Weight)
+			// Standard Error: 123_000
+			.saturating_add((20_921_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(22_113_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((7_069_000 as Weight).saturating_mul(r as Weight))
+		(54_090_000 as Weight)
+			// Standard Error: 38_000
+			.saturating_add((21_171_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(22_090_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((6_956_000 as Weight).saturating_mul(r as Weight))
+		(54_129_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((21_086_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(22_006_000 as Weight)
-			// Standard Error: 30_000
-			.saturating_add((7_094_000 as Weight).saturating_mul(r as Weight))
+		(54_126_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((21_051_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(22_111_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((6_825_000 as Weight).saturating_mul(r as Weight))
+		(54_153_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((21_021_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(22_041_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((13_164_000 as Weight).saturating_mul(r as Weight))
+		(54_168_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((27_336_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(21_989_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((12_808_000 as Weight).saturating_mul(r as Weight))
+		(54_124_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((24_783_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(22_045_000 as Weight)
-			// Standard Error: 39_000
-			.saturating_add((13_387_000 as Weight).saturating_mul(r as Weight))
+		(54_203_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((27_539_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(22_075_000 as Weight)
-			// Standard Error: 40_000
-			.saturating_add((12_791_000 as Weight).saturating_mul(r as Weight))
+		(54_176_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((24_686_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(22_044_000 as Weight)
-			// Standard Error: 32_000
-			.saturating_add((7_090_000 as Weight).saturating_mul(r as Weight))
+		(54_111_000 as Weight)
+			// Standard Error: 356_000
+			.saturating_add((22_077_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(22_133_000 as Weight)
-			// Standard Error: 40_000
-			.saturating_add((6_967_000 as Weight).saturating_mul(r as Weight))
+		(54_124_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((21_060_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(22_069_000 as Weight)
-			// Standard Error: 41_000
-			.saturating_add((7_026_000 as Weight).saturating_mul(r as Weight))
+		(54_153_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((21_064_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(22_165_000 as Weight)
-			// Standard Error: 44_000
-			.saturating_add((7_440_000 as Weight).saturating_mul(r as Weight))
+		(54_122_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((21_187_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(22_063_000 as Weight)
-			// Standard Error: 34_000
-			.saturating_add((7_309_000 as Weight).saturating_mul(r as Weight))
+		(54_149_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((21_110_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(22_086_000 as Weight)
-			// Standard Error: 36_000
-			.saturating_add((7_188_000 as Weight).saturating_mul(r as Weight))
+		(54_136_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((21_066_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(22_109_000 as Weight)
-			// Standard Error: 45_000
-			.saturating_add((7_169_000 as Weight).saturating_mul(r as Weight))
+		(54_231_000 as Weight)
+			// Standard Error: 30_000
+			.saturating_add((21_073_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(22_076_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((7_070_000 as Weight).saturating_mul(r as Weight))
+		(54_139_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((21_097_000 as Weight).saturating_mul(r as Weight))
 	}
 }
 
@@ -1061,47 +1061,47 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 impl WeightInfo for () {
 	// Storage: Contracts DeletionQueue (r:1 w:0)
 	fn on_initialize() -> Weight {
-		(3_175_000 as Weight)
+		(3_227_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 3_000
-			.saturating_add((2_201_000 as Weight).saturating_mul(k as Weight))
+			.saturating_add((2_273_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	// Storage: Contracts DeletionQueue (r:1 w:0)
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
-		(66_035_000 as Weight)
-			// Standard Error: 6_000
-			.saturating_add((38_159_000 as Weight).saturating_mul(q as Weight))
+		(50_365_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((39_799_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts PristineCode (r:1 w:0)
 	// Storage: Contracts CodeStorage (r:0 w:1)
 	fn instrument(c: u32, ) -> Weight {
-		(35_007_000 as Weight)
-			// Standard Error: 110_000
-			.saturating_add((75_739_000 as Weight).saturating_mul(c as Weight))
+		(40_033_000 as Weight)
+			// Standard Error: 109_000
+			.saturating_add((76_424_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	fn code_load(c: u32, ) -> Weight {
-		(6_238_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((1_671_000 as Weight).saturating_mul(c as Weight))
+		(6_675_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_668_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 	}
 	// Storage: Contracts CodeStorage (r:1 w:1)
 	fn code_refcount(c: u32, ) -> Weight {
-		(10_080_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((2_694_000 as Weight).saturating_mul(c as Weight))
+		(10_560_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((2_704_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1112,11 +1112,11 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:1)
 	// Storage: Contracts PristineCode (r:0 w:1)
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight {
-		(182_161_000 as Weight)
-			// Standard Error: 115_000
-			.saturating_add((113_515_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 7_000
-			.saturating_add((2_314_000 as Weight).saturating_mul(s as Weight))
+		(479_578_000 as Weight)
+			// Standard Error: 166_000
+			.saturating_add((187_167_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 10_000
+			.saturating_add((2_450_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
@@ -1126,9 +1126,9 @@ impl WeightInfo for () {
 	// Storage: System Account (r:1 w:1)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn instantiate(s: u32, ) -> Weight {
-		(183_914_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((2_224_000 as Weight).saturating_mul(s as Weight))
+		(237_664_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((2_249_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
@@ -1137,7 +1137,7 @@ impl WeightInfo for () {
 	// Storage: System Account (r:1 w:1)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn call() -> Weight {
-		(166_507_000 as Weight)
+		(223_426_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
@@ -1211,9 +1211,9 @@ impl WeightInfo for () {
 	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743aeb9db1dfeed3a7b47b] (r:1 w:0)
 	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743abdc9db5edf43ffcb0d] (r:1 w:0)
 	fn claim_surcharge(c: u32, ) -> Weight {
-		(126_115_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((2_829_000 as Weight).saturating_mul(c as Weight))
+		(130_759_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((2_850_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
@@ -1222,9 +1222,9 @@ impl WeightInfo for () {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_caller(r: u32, ) -> Weight {
-		(134_110_000 as Weight)
-			// Standard Error: 130_000
-			.saturating_add((230_337_000 as Weight).saturating_mul(r as Weight))
+		(492_555_000 as Weight)
+			// Standard Error: 174_000
+			.saturating_add((136_915_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1233,9 +1233,9 @@ impl WeightInfo for () {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_address(r: u32, ) -> Weight {
-		(131_212_000 as Weight)
-			// Standard Error: 116_000
-			.saturating_add((230_568_000 as Weight).saturating_mul(r as Weight))
+		(487_655_000 as Weight)
+			// Standard Error: 165_000
+			.saturating_add((137_827_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1244,9 +1244,9 @@ impl WeightInfo for () {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(135_149_000 as Weight)
-			// Standard Error: 149_000
-			.saturating_add((224_830_000 as Weight).saturating_mul(r as Weight))
+		(488_993_000 as Weight)
+			// Standard Error: 195_000
+			.saturating_add((137_040_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1255,9 +1255,9 @@ impl WeightInfo for () {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_balance(r: u32, ) -> Weight {
-		(148_463_000 as Weight)
-			// Standard Error: 246_000
-			.saturating_add((480_930_000 as Weight).saturating_mul(r as Weight))
+		(500_062_000 as Weight)
+			// Standard Error: 208_000
+			.saturating_add((392_337_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1266,9 +1266,9 @@ impl WeightInfo for () {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(137_790_000 as Weight)
-			// Standard Error: 152_000
-			.saturating_add((224_961_000 as Weight).saturating_mul(r as Weight))
+		(492_064_000 as Weight)
+			// Standard Error: 156_000
+			.saturating_add((137_082_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1277,9 +1277,9 @@ impl WeightInfo for () {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(134_238_000 as Weight)
-			// Standard Error: 135_000
-			.saturating_add((224_433_000 as Weight).saturating_mul(r as Weight))
+		(496_566_000 as Weight)
+			// Standard Error: 159_000
+			.saturating_add((137_377_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1288,9 +1288,9 @@ impl WeightInfo for () {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(135_053_000 as Weight)
-			// Standard Error: 147_000
-			.saturating_add((223_955_000 as Weight).saturating_mul(r as Weight))
+		(491_566_000 as Weight)
+			// Standard Error: 163_000
+			.saturating_add((137_586_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1299,9 +1299,9 @@ impl WeightInfo for () {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(138_522_000 as Weight)
-			// Standard Error: 145_000
-			.saturating_add((223_459_000 as Weight).saturating_mul(r as Weight))
+		(491_459_000 as Weight)
+			// Standard Error: 150_000
+			.saturating_add((137_402_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1310,9 +1310,9 @@ impl WeightInfo for () {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_block_number(r: u32, ) -> Weight {
-		(133_568_000 as Weight)
-			// Standard Error: 143_000
-			.saturating_add((224_792_000 as Weight).saturating_mul(r as Weight))
+		(488_379_000 as Weight)
+			// Standard Error: 170_000
+			.saturating_add((136_564_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1321,9 +1321,9 @@ impl WeightInfo for () {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_now(r: u32, ) -> Weight {
-		(134_786_000 as Weight)
-			// Standard Error: 130_000
-			.saturating_add((224_331_000 as Weight).saturating_mul(r as Weight))
+		(494_827_000 as Weight)
+			// Standard Error: 175_000
+			.saturating_add((137_178_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1333,9 +1333,9 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: TransactionPayment NextFeeMultiplier (r:1 w:0)
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(147_402_000 as Weight)
-			// Standard Error: 233_000
-			.saturating_add((439_237_000 as Weight).saturating_mul(r as Weight))
+		(497_508_000 as Weight)
+			// Standard Error: 191_000
+			.saturating_add((323_559_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1344,9 +1344,9 @@ impl WeightInfo for () {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_gas(r: u32, ) -> Weight {
-		(115_711_000 as Weight)
-			// Standard Error: 88_000
-			.saturating_add((113_467_000 as Weight).saturating_mul(r as Weight))
+		(179_076_000 as Weight)
+			// Standard Error: 124_000
+			.saturating_add((62_013_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1355,9 +1355,9 @@ impl WeightInfo for () {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_input(r: u32, ) -> Weight {
-		(123_004_000 as Weight)
-			// Standard Error: 78_000
-			.saturating_add((6_674_000 as Weight).saturating_mul(r as Weight))
+		(480_920_000 as Weight)
+			// Standard Error: 182_000
+			.saturating_add((3_254_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1366,9 +1366,9 @@ impl WeightInfo for () {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(131_611_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((1_035_000 as Weight).saturating_mul(n as Weight))
+		(487_910_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_218_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1377,9 +1377,9 @@ impl WeightInfo for () {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_return(r: u32, ) -> Weight {
-		(118_327_000 as Weight)
-			// Standard Error: 84_000
-			.saturating_add((4_274_000 as Weight).saturating_mul(r as Weight))
+		(470_960_000 as Weight)
+			// Standard Error: 678_000
+			.saturating_add((2_506_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1388,9 +1388,9 @@ impl WeightInfo for () {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(126_129_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((495_000 as Weight).saturating_mul(n as Weight))
+		(478_623_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((749_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1400,9 +1400,9 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: Contracts DeletionQueue (r:1 w:1)
 	fn seal_terminate(r: u32, ) -> Weight {
-		(123_759_000 as Weight)
-			// Standard Error: 115_000
-			.saturating_add((89_730_000 as Weight).saturating_mul(r as Weight))
+		(481_930_000 as Weight)
+			// Standard Error: 511_000
+			.saturating_add((84_726_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
@@ -1414,9 +1414,9 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743af3fd4cc2fc8d170b6d] (r:1 w:0)
 	fn seal_restore_to(r: u32, ) -> Weight {
-		(151_364_000 as Weight)
-			// Standard Error: 263_000
-			.saturating_add((99_367_000 as Weight).saturating_mul(r as Weight))
+		(514_296_000 as Weight)
+			// Standard Error: 458_000
+			.saturating_add((93_769_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((4 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
@@ -1424,9 +1424,9 @@ impl WeightInfo for () {
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_restore_to_per_delta(d: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 1_919_000
-			.saturating_add((2_415_482_000 as Weight).saturating_mul(d as Weight))
+		(313_520_000 as Weight)
+			// Standard Error: 1_783_000
+			.saturating_add((2_435_407_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(7 as Weight))
@@ -1438,9 +1438,9 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: RandomnessCollectiveFlip RandomMaterial (r:1 w:0)
 	fn seal_random(r: u32, ) -> Weight {
-		(137_660_000 as Weight)
-			// Standard Error: 204_000
-			.saturating_add((563_042_000 as Weight).saturating_mul(r as Weight))
+		(484_059_000 as Weight)
+			// Standard Error: 285_000
+			.saturating_add((443_946_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1449,9 +1449,9 @@ impl WeightInfo for () {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(137_087_000 as Weight)
-			// Standard Error: 413_000
-			.saturating_add((835_499_000 as Weight).saturating_mul(r as Weight))
+		(491_593_000 as Weight)
+			// Standard Error: 386_000
+			.saturating_add((733_958_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1461,11 +1461,11 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System EventTopics (r:100 w:100)
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_117_515_000 as Weight)
-			// Standard Error: 2_167_000
-			.saturating_add((494_145_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 427_000
-			.saturating_add((150_093_000 as Weight).saturating_mul(n as Weight))
+		(1_342_357_000 as Weight)
+			// Standard Error: 2_458_000
+			.saturating_add((521_445_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 484_000
+			.saturating_add((195_792_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
@@ -1476,9 +1476,9 @@ impl WeightInfo for () {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(132_070_000 as Weight)
-			// Standard Error: 129_000
-			.saturating_add((155_669_000 as Weight).saturating_mul(r as Weight))
+		(209_818_000 as Weight)
+			// Standard Error: 157_000
+			.saturating_add((93_289_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1487,17 +1487,17 @@ impl WeightInfo for () {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_debug_message(r: u32, ) -> Weight {
-		(126_971_000 as Weight)
-			// Standard Error: 90_000
-			.saturating_add((122_445_000 as Weight).saturating_mul(r as Weight))
+		(200_027_000 as Weight)
+			// Standard Error: 145_000
+			.saturating_add((79_038_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(125_746_000 as Weight)
-			// Standard Error: 610_000
-			.saturating_add((501_265_000 as Weight).saturating_mul(r as Weight))
+		(477_211_000 as Weight)
+			// Standard Error: 709_000
+			.saturating_add((407_264_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
@@ -1509,17 +1509,17 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: unknown [0x7afa01283080ef247df84e0ba38ea5a587d25ce6633a6bfbba02068c14023441] (r:1 w:1)
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(563_219_000 as Weight)
-			// Standard Error: 219_000
-			.saturating_add((41_578_000 as Weight).saturating_mul(n as Weight))
+		(832_538_000 as Weight)
+			// Standard Error: 262_000
+			.saturating_add((87_211_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_clear_storage(r: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 1_727_000
-			.saturating_add((1_001_461_000 as Weight).saturating_mul(r as Weight))
+		(199_686_000 as Weight)
+			// Standard Error: 1_610_000
+			.saturating_add((905_125_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
@@ -1527,9 +1527,9 @@ impl WeightInfo for () {
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_get_storage(r: u32, ) -> Weight {
-		(9_115_000 as Weight)
-			// Standard Error: 784_000
-			.saturating_add((660_533_000 as Weight).saturating_mul(r as Weight))
+		(335_052_000 as Weight)
+			// Standard Error: 885_000
+			.saturating_add((545_754_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
@@ -1540,9 +1540,9 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: unknown [0x7afa01283080ef247df84e0ba38ea5a587d25ce6633a6bfbba02068c14023441] (r:1 w:0)
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(563_175_000 as Weight)
-			// Standard Error: 206_000
-			.saturating_add((89_626_000 as Weight).saturating_mul(n as Weight))
+		(800_556_000 as Weight)
+			// Standard Error: 337_000
+			.saturating_add((133_492_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1551,9 +1551,9 @@ impl WeightInfo for () {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_transfer(r: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 1_750_000
-			.saturating_add((4_820_493_000 as Weight).saturating_mul(r as Weight))
+		(317_531_000 as Weight)
+			// Standard Error: 1_627_000
+			.saturating_add((4_748_591_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
@@ -1565,8 +1565,8 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 6_692_000
-			.saturating_add((11_477_937_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 8_848_000
+			.saturating_add((46_947_679_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((200 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
@@ -1577,13 +1577,13 @@ impl WeightInfo for () {
 	// Storage: System Account (r:101 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight {
-		(11_238_437_000 as Weight)
-			// Standard Error: 81_620_000
-			.saturating_add((3_700_413_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 29_000
-			.saturating_add((32_106_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 31_000
-			.saturating_add((54_386_000 as Weight).saturating_mul(o as Weight))
+		(47_469_660_000 as Weight)
+			// Standard Error: 45_192_000
+			.saturating_add((3_691_145_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 16_000
+			.saturating_add((75_339_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 17_000
+			.saturating_add((121_494_000 as Weight).saturating_mul(o as Weight))
 			.saturating_add(RocksDbWeight::get().reads(205 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(101 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
@@ -1595,8 +1595,8 @@ impl WeightInfo for () {
 	// Storage: Contracts AccountCounter (r:1 w:1)
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 35_258_000
-			.saturating_add((20_674_357_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 32_740_000
+			.saturating_add((55_623_588_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
@@ -1608,13 +1608,13 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: Contracts AccountCounter (r:1 w:1)
 	fn seal_instantiate_per_input_output_salt_kb(i: u32, o: u32, s: u32, ) -> Weight {
-		(14_725_288_000 as Weight)
-			// Standard Error: 53_000
-			.saturating_add((33_848_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 53_000
-			.saturating_add((57_054_000 as Weight).saturating_mul(o as Weight))
-			// Standard Error: 53_000
-			.saturating_add((180_033_000 as Weight).saturating_mul(s as Weight))
+		(54_718_944_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((75_276_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 29_000
+			.saturating_add((121_341_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 29_000
+			.saturating_add((223_964_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(206 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(204 as Weight))
 	}
@@ -1623,9 +1623,9 @@ impl WeightInfo for () {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(131_974_000 as Weight)
-			// Standard Error: 125_000
-			.saturating_add((220_711_000 as Weight).saturating_mul(r as Weight))
+		(485_310_000 as Weight)
+			// Standard Error: 169_000
+			.saturating_add((143_364_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1634,9 +1634,9 @@ impl WeightInfo for () {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(367_148_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((462_143_000 as Weight).saturating_mul(n as Weight))
+		(632_820_000 as Weight)
+			// Standard Error: 29_000
+			.saturating_add((511_722_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1645,9 +1645,9 @@ impl WeightInfo for () {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(134_585_000 as Weight)
-			// Standard Error: 131_000
-			.saturating_add((227_264_000 as Weight).saturating_mul(r as Weight))
+		(484_331_000 as Weight)
+			// Standard Error: 195_000
+			.saturating_add((151_617_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1656,9 +1656,9 @@ impl WeightInfo for () {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(325_319_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((313_033_000 as Weight).saturating_mul(n as Weight))
+		(565_213_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((359_762_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1667,9 +1667,9 @@ impl WeightInfo for () {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(135_347_000 as Weight)
-			// Standard Error: 150_000
-			.saturating_add((199_764_000 as Weight).saturating_mul(r as Weight))
+		(481_843_000 as Weight)
+			// Standard Error: 186_000
+			.saturating_add((122_838_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1678,9 +1678,9 @@ impl WeightInfo for () {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(424_473_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((130_936_000 as Weight).saturating_mul(n as Weight))
+		(582_445_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((176_329_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1689,9 +1689,9 @@ impl WeightInfo for () {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(128_776_000 as Weight)
-			// Standard Error: 118_000
-			.saturating_add((203_125_000 as Weight).saturating_mul(r as Weight))
+		(486_320_000 as Weight)
+			// Standard Error: 147_000
+			.saturating_add((123_460_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1700,265 +1700,265 @@ impl WeightInfo for () {
 	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(445_726_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((130_931_000 as Weight).saturating_mul(n as Weight))
+		(515_967_000 as Weight)
+			// Standard Error: 33_000
+			.saturating_add((176_423_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(22_161_000 as Weight)
-			// Standard Error: 36_000
-			.saturating_add((3_329_000 as Weight).saturating_mul(r as Weight))
+		(54_127_000 as Weight)
+			// Standard Error: 25_000
+			.saturating_add((10_198_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(24_430_000 as Weight)
-			// Standard Error: 65_000
-			.saturating_add((159_566_000 as Weight).saturating_mul(r as Weight))
+		(55_411_000 as Weight)
+			// Standard Error: 148_000
+			.saturating_add((22_916_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(24_443_000 as Weight)
-			// Standard Error: 62_000
-			.saturating_add((232_854_000 as Weight).saturating_mul(r as Weight))
+		(55_462_000 as Weight)
+			// Standard Error: 134_000
+			.saturating_add((24_449_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(22_158_000 as Weight)
-			// Standard Error: 34_000
-			.saturating_add((12_112_000 as Weight).saturating_mul(r as Weight))
+		(54_114_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((26_214_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(22_178_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((11_374_000 as Weight).saturating_mul(r as Weight))
+		(54_118_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((26_492_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(22_157_000 as Weight)
-			// Standard Error: 41_000
-			.saturating_add((5_826_000 as Weight).saturating_mul(r as Weight))
+		(54_119_000 as Weight)
+			// Standard Error: 304_000
+			.saturating_add((18_424_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(22_182_000 as Weight)
-			// Standard Error: 34_000
-			.saturating_add((13_647_000 as Weight).saturating_mul(r as Weight))
+		(55_352_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((32_291_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(22_083_000 as Weight)
-			// Standard Error: 44_000
-			.saturating_add((14_901_000 as Weight).saturating_mul(r as Weight))
+		(54_115_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((27_785_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(32_689_000 as Weight)
+		(86_048_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((154_000 as Weight).saturating_mul(e as Weight))
+			.saturating_add((82_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(22_313_000 as Weight)
-			// Standard Error: 383_000
-			.saturating_add((89_804_000 as Weight).saturating_mul(r as Weight))
+		(54_654_000 as Weight)
+			// Standard Error: 82_000
+			.saturating_add((199_159_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(29_939_000 as Weight)
-			// Standard Error: 230_000
-			.saturating_add((185_309_000 as Weight).saturating_mul(r as Weight))
+		(67_478_000 as Weight)
+			// Standard Error: 113_000
+			.saturating_add((302_597_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(221_596_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((4_045_000 as Weight).saturating_mul(p as Weight))
+		(384_281_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((9_984_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(22_171_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((3_362_000 as Weight).saturating_mul(r as Weight))
+		(55_473_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((9_287_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(22_182_000 as Weight)
-			// Standard Error: 31_000
-			.saturating_add((3_801_000 as Weight).saturating_mul(r as Weight))
+		(55_426_000 as Weight)
+			// Standard Error: 38_000
+			.saturating_add((10_559_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(22_200_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((5_080_000 as Weight).saturating_mul(r as Weight))
+		(55_332_000 as Weight)
+			// Standard Error: 8_000
+			.saturating_add((15_640_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(25_255_000 as Weight)
-			// Standard Error: 41_000
-			.saturating_add((8_875_000 as Weight).saturating_mul(r as Weight))
+		(74_497_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((15_067_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(25_145_000 as Weight)
-			// Standard Error: 37_000
-			.saturating_add((9_556_000 as Weight).saturating_mul(r as Weight))
+		(74_445_000 as Weight)
+			// Standard Error: 49_000
+			.saturating_add((17_650_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(24_435_000 as Weight)
-			// Standard Error: 49_000
-			.saturating_add((4_204_000 as Weight).saturating_mul(r as Weight))
+		(54_500_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((9_307_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(23_158_000 as Weight)
-			// Standard Error: 5_969_000
-			.saturating_add((2_339_630_000 as Weight).saturating_mul(r as Weight))
+		(54_382_000 as Weight)
+			// Standard Error: 5_644_000
+			.saturating_add((748_424_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(21_984_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((5_421_000 as Weight).saturating_mul(r as Weight))
+		(54_133_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((15_830_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(22_069_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((5_187_000 as Weight).saturating_mul(r as Weight))
+		(54_129_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((15_894_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(22_042_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((6_116_000 as Weight).saturating_mul(r as Weight))
+		(54_181_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((15_847_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(22_018_000 as Weight)
-			// Standard Error: 34_000
-			.saturating_add((5_130_000 as Weight).saturating_mul(r as Weight))
+		(54_130_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((15_825_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(21_933_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((5_005_000 as Weight).saturating_mul(r as Weight))
+		(54_122_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((15_803_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(22_066_000 as Weight)
-			// Standard Error: 34_000
-			.saturating_add((4_877_000 as Weight).saturating_mul(r as Weight))
+		(54_100_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((15_822_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(22_003_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((5_018_000 as Weight).saturating_mul(r as Weight))
+		(54_143_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((15_868_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(22_130_000 as Weight)
-			// Standard Error: 35_000
-			.saturating_add((7_071_000 as Weight).saturating_mul(r as Weight))
+		(54_133_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((21_121_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(22_112_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((7_056_000 as Weight).saturating_mul(r as Weight))
+		(54_177_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((21_003_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(22_114_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((6_974_000 as Weight).saturating_mul(r as Weight))
+		(54_164_000 as Weight)
+			// Standard Error: 31_000
+			.saturating_add((21_041_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(22_111_000 as Weight)
-			// Standard Error: 32_000
-			.saturating_add((7_183_000 as Weight).saturating_mul(r as Weight))
+		(54_171_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((21_101_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(22_148_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((7_044_000 as Weight).saturating_mul(r as Weight))
+		(54_177_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((21_074_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(22_158_000 as Weight)
-			// Standard Error: 33_000
-			.saturating_add((7_116_000 as Weight).saturating_mul(r as Weight))
+		(54_073_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((21_136_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(22_194_000 as Weight)
-			// Standard Error: 31_000
-			.saturating_add((7_039_000 as Weight).saturating_mul(r as Weight))
+		(54_116_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((21_140_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(22_219_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((7_076_000 as Weight).saturating_mul(r as Weight))
+		(54_115_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((21_164_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(22_170_000 as Weight)
-			// Standard Error: 50_000
-			.saturating_add((7_122_000 as Weight).saturating_mul(r as Weight))
+		(54_261_000 as Weight)
+			// Standard Error: 123_000
+			.saturating_add((20_921_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(22_113_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((7_069_000 as Weight).saturating_mul(r as Weight))
+		(54_090_000 as Weight)
+			// Standard Error: 38_000
+			.saturating_add((21_171_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(22_090_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((6_956_000 as Weight).saturating_mul(r as Weight))
+		(54_129_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((21_086_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(22_006_000 as Weight)
-			// Standard Error: 30_000
-			.saturating_add((7_094_000 as Weight).saturating_mul(r as Weight))
+		(54_126_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((21_051_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(22_111_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((6_825_000 as Weight).saturating_mul(r as Weight))
+		(54_153_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((21_021_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(22_041_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((13_164_000 as Weight).saturating_mul(r as Weight))
+		(54_168_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((27_336_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(21_989_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((12_808_000 as Weight).saturating_mul(r as Weight))
+		(54_124_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((24_783_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(22_045_000 as Weight)
-			// Standard Error: 39_000
-			.saturating_add((13_387_000 as Weight).saturating_mul(r as Weight))
+		(54_203_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((27_539_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(22_075_000 as Weight)
-			// Standard Error: 40_000
-			.saturating_add((12_791_000 as Weight).saturating_mul(r as Weight))
+		(54_176_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((24_686_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(22_044_000 as Weight)
-			// Standard Error: 32_000
-			.saturating_add((7_090_000 as Weight).saturating_mul(r as Weight))
+		(54_111_000 as Weight)
+			// Standard Error: 356_000
+			.saturating_add((22_077_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(22_133_000 as Weight)
-			// Standard Error: 40_000
-			.saturating_add((6_967_000 as Weight).saturating_mul(r as Weight))
+		(54_124_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((21_060_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(22_069_000 as Weight)
-			// Standard Error: 41_000
-			.saturating_add((7_026_000 as Weight).saturating_mul(r as Weight))
+		(54_153_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((21_064_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(22_165_000 as Weight)
-			// Standard Error: 44_000
-			.saturating_add((7_440_000 as Weight).saturating_mul(r as Weight))
+		(54_122_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((21_187_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(22_063_000 as Weight)
-			// Standard Error: 34_000
-			.saturating_add((7_309_000 as Weight).saturating_mul(r as Weight))
+		(54_149_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((21_110_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(22_086_000 as Weight)
-			// Standard Error: 36_000
-			.saturating_add((7_188_000 as Weight).saturating_mul(r as Weight))
+		(54_136_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((21_066_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(22_109_000 as Weight)
-			// Standard Error: 45_000
-			.saturating_add((7_169_000 as Weight).saturating_mul(r as Weight))
+		(54_231_000 as Weight)
+			// Standard Error: 30_000
+			.saturating_add((21_073_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(22_076_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((7_070_000 as Weight).saturating_mul(r as Weight))
+		(54_139_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((21_097_000 as Weight).saturating_mul(r as Weight))
 	}
 }
diff --git a/primitives/sandbox/Cargo.toml b/primitives/sandbox/Cargo.toml
index f15f1c02d511..a4d4a4d5d031 100755
--- a/primitives/sandbox/Cargo.toml
+++ b/primitives/sandbox/Cargo.toml
@@ -12,6 +12,12 @@ readme = "README.md"
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
 
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+wasmi = { version = "0.9.0", default-features = false, features = ["core"] }
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+wasmi = "0.9.0"
+
 [dependencies]
 wasmi = { version = "0.9.0", optional = true }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../core" }
@@ -19,6 +25,7 @@ sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
 sp-io = { version = "4.0.0-dev", default-features = false, path = "../io" }
 sp-wasm-interface = { version = "4.0.0-dev", default-features = false, path = "../wasm-interface" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
+log = { version = "0.4", default-features = false }
 
 [dev-dependencies]
 wat = "1.0"
@@ -33,5 +40,7 @@ std = [
 	"codec/std",
 	"sp-io/std",
 	"sp-wasm-interface/std",
+	"log/std",
 ]
 strict = []
+wasmer-sandbox = []
diff --git a/primitives/sandbox/with_std.rs b/primitives/sandbox/embedded_executor.rs
similarity index 69%
rename from primitives/sandbox/with_std.rs
rename to primitives/sandbox/embedded_executor.rs
index d5f87f165137..678da3c3aeaf 100755
--- a/primitives/sandbox/with_std.rs
+++ b/primitives/sandbox/embedded_executor.rs
@@ -15,16 +15,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use sp_std::collections::btree_map::BTreeMap;
-use sp_std::fmt;
-
+use super::{Error, HostError, HostFuncType, ReturnValue, Value, TARGET};
+use alloc::string::String;
+use log::debug;
+use sp_std::{
+	borrow::ToOwned, collections::btree_map::BTreeMap, fmt, marker::PhantomData, prelude::*,
+};
 use wasmi::{
-	Externals, FuncInstance, FuncRef, GlobalDescriptor, GlobalRef, ImportResolver,
-	MemoryDescriptor, MemoryInstance, MemoryRef, Module, ModuleInstance, ModuleRef,
-	RuntimeArgs, RuntimeValue, Signature, TableDescriptor, TableRef, Trap, TrapKind
+	memory_units::Pages, Externals, FuncInstance, FuncRef, GlobalDescriptor, GlobalRef,
+	ImportResolver, MemoryDescriptor, MemoryInstance, MemoryRef, Module, ModuleInstance, ModuleRef,
+	RuntimeArgs, RuntimeValue, Signature, TableDescriptor, TableRef, Trap, TrapKind,
 };
-use wasmi::memory_units::Pages;
-use super::{Error, Value, ReturnValue, HostFuncType, HostError};
 
 #[derive(Clone)]
 pub struct Memory {
@@ -37,7 +38,8 @@ impl Memory {
 			memref: MemoryInstance::alloc(
 				Pages(initial as usize),
 				maximum.map(|m| Pages(m as usize)),
-			).map_err(|_| Error::Module)?,
+			)
+			.map_err(|_| Error::Module)?,
 		})
 	}
 
@@ -60,17 +62,13 @@ struct DefinedHostFunctions<T> {
 
 impl<T> Clone for DefinedHostFunctions<T> {
 	fn clone(&self) -> DefinedHostFunctions<T> {
-		DefinedHostFunctions {
-			funcs: self.funcs.clone(),
-		}
+		DefinedHostFunctions { funcs: self.funcs.clone() }
 	}
 }
 
 impl<T> DefinedHostFunctions<T> {
 	fn new() -> DefinedHostFunctions<T> {
-		DefinedHostFunctions {
-			funcs: Vec::new(),
-		}
+		DefinedHostFunctions { funcs: Vec::new() }
 	}
 
 	fn define(&mut self, f: HostFuncType<T>) -> HostFuncIndex {
@@ -102,16 +100,12 @@ impl<'a, T> Externals for GuestExternals<'a, T> {
 		index: usize,
 		args: RuntimeArgs,
 	) -> Result<Option<RuntimeValue>, Trap> {
-		let args = args.as_ref()
-			.iter()
-			.cloned()
-			.map(Into::into)
-			.collect::<Vec<_>>();
+		let args = args.as_ref().iter().cloned().map(to_interface).collect::<Vec<_>>();
 
 		let result = (self.defined_host_functions.funcs[index])(self.state, &args);
 		match result {
 			Ok(value) => Ok(match value {
-				ReturnValue::Value(v) => Some(v.into()),
+				ReturnValue::Value(v) => Some(to_wasmi(v)),
 				ReturnValue::Unit => None,
 			}),
 			Err(HostError) => Err(TrapKind::Host(Box::new(DummyHostError)).into()),
@@ -143,8 +137,7 @@ impl<T> EnvironmentDefinitionBuilder<T> {
 		N2: Into<Vec<u8>>,
 	{
 		let idx = self.defined_host_functions.define(f);
-		self.map
-			.insert((module.into(), field.into()), ExternVal::HostFunc(idx));
+		self.map.insert((module.into(), field.into()), ExternVal::HostFunc(idx));
 	}
 
 	pub fn add_memory<N1, N2>(&mut self, module: N1, field: N2, mem: Memory)
@@ -152,8 +145,7 @@ impl<T> EnvironmentDefinitionBuilder<T> {
 		N1: Into<Vec<u8>>,
 		N2: Into<Vec<u8>>,
 	{
-		self.map
-			.insert((module.into(), field.into()), ExternVal::Memory(mem));
+		self.map.insert((module.into(), field.into()), ExternVal::Memory(mem));
 	}
 }
 
@@ -164,21 +156,17 @@ impl<T> ImportResolver for EnvironmentDefinitionBuilder<T> {
 		field_name: &str,
 		signature: &Signature,
 	) -> Result<FuncRef, wasmi::Error> {
-		let key = (
-			module_name.as_bytes().to_owned(),
-			field_name.as_bytes().to_owned(),
-		);
+		let key = (module_name.as_bytes().to_owned(), field_name.as_bytes().to_owned());
 		let externval = self.map.get(&key).ok_or_else(|| {
-			wasmi::Error::Instantiation(format!("Export {}:{} not found", module_name, field_name))
+			debug!(target: TARGET, "Export {}:{} not found", module_name, field_name);
+			wasmi::Error::Instantiation(String::new())
 		})?;
 		let host_func_idx = match *externval {
 			ExternVal::HostFunc(ref idx) => idx,
 			_ => {
-				return Err(wasmi::Error::Instantiation(format!(
-					"Export {}:{} is not a host func",
-					module_name, field_name
-				)))
-			}
+				debug!(target: TARGET, "Export {}:{} is not a host func", module_name, field_name);
+				return Err(wasmi::Error::Instantiation(String::new()))
+			},
 		};
 		Ok(FuncInstance::alloc_host(signature.clone(), host_func_idx.0))
 	}
@@ -189,9 +177,8 @@ impl<T> ImportResolver for EnvironmentDefinitionBuilder<T> {
 		_field_name: &str,
 		_global_type: &GlobalDescriptor,
 	) -> Result<GlobalRef, wasmi::Error> {
-		Err(wasmi::Error::Instantiation(format!(
-			"Importing globals is not supported yet"
-		)))
+		debug!(target: TARGET, "Importing globals is not supported yet");
+		Err(wasmi::Error::Instantiation(String::new()))
 	}
 
 	fn resolve_memory(
@@ -200,21 +187,17 @@ impl<T> ImportResolver for EnvironmentDefinitionBuilder<T> {
 		field_name: &str,
 		_memory_type: &MemoryDescriptor,
 	) -> Result<MemoryRef, wasmi::Error> {
-		let key = (
-			module_name.as_bytes().to_owned(),
-			field_name.as_bytes().to_owned(),
-		);
+		let key = (module_name.as_bytes().to_owned(), field_name.as_bytes().to_owned());
 		let externval = self.map.get(&key).ok_or_else(|| {
-			wasmi::Error::Instantiation(format!("Export {}:{} not found", module_name, field_name))
+			debug!(target: TARGET, "Export {}:{} not found", module_name, field_name);
+			wasmi::Error::Instantiation(String::new())
 		})?;
 		let memory = match *externval {
 			ExternVal::Memory(ref m) => m,
 			_ => {
-				return Err(wasmi::Error::Instantiation(format!(
-					"Export {}:{} is not a memory",
-					module_name, field_name
-				)))
-			}
+				debug!(target: TARGET, "Export {}:{} is not a memory", module_name, field_name);
+				return Err(wasmi::Error::Instantiation(String::new()))
+			},
 		};
 		Ok(memory.memref.clone())
 	}
@@ -225,16 +208,15 @@ impl<T> ImportResolver for EnvironmentDefinitionBuilder<T> {
 		_field_name: &str,
 		_table_type: &TableDescriptor,
 	) -> Result<TableRef, wasmi::Error> {
-		Err(wasmi::Error::Instantiation(format!(
-			"Importing tables is not supported yet"
-		)))
+		debug!("Importing tables is not supported yet");
+		Err(wasmi::Error::Instantiation(String::new()))
 	}
 }
 
 pub struct Instance<T> {
 	instance: ModuleRef,
 	defined_host_functions: DefinedHostFunctions<T>,
-	_marker: std::marker::PhantomData<T>,
+	_marker: PhantomData<T>,
 }
 
 impl<T> Instance<T> {
@@ -244,26 +226,19 @@ impl<T> Instance<T> {
 		state: &mut T,
 	) -> Result<Instance<T>, Error> {
 		let module = Module::from_buffer(code).map_err(|_| Error::Module)?;
-		let not_started_instance = ModuleInstance::new(&module, env_def_builder)
-			.map_err(|_| Error::Module)?;
-
+		let not_started_instance =
+			ModuleInstance::new(&module, env_def_builder).map_err(|_| Error::Module)?;
 
 		let defined_host_functions = env_def_builder.defined_host_functions.clone();
 		let instance = {
-			let mut externals = GuestExternals {
-				state,
-				defined_host_functions: &defined_host_functions,
-			};
-			let instance = not_started_instance.run_start(&mut externals)
-				.map_err(|_| Error::Execution)?;
+			let mut externals =
+				GuestExternals { state, defined_host_functions: &defined_host_functions };
+			let instance =
+				not_started_instance.run_start(&mut externals).map_err(|_| Error::Execution)?;
 			instance
 		};
 
-		Ok(Instance {
-			instance,
-			defined_host_functions,
-			_marker: std::marker::PhantomData::<T>,
-		})
+		Ok(Instance { instance, defined_host_functions, _marker: PhantomData::<T> })
 	}
 
 	pub fn invoke(
@@ -272,35 +247,49 @@ impl<T> Instance<T> {
 		args: &[Value],
 		state: &mut T,
 	) -> Result<ReturnValue, Error> {
-		let args = args.iter().cloned().map(Into::into).collect::<Vec<_>>();
+		let args = args.iter().cloned().map(to_wasmi).collect::<Vec<_>>();
 
-		let mut externals = GuestExternals {
-			state,
-			defined_host_functions: &self.defined_host_functions,
-		};
-		let result = self.instance
-			.invoke_export(&name, &args, &mut externals);
+		let mut externals =
+			GuestExternals { state, defined_host_functions: &self.defined_host_functions };
+		let result = self.instance.invoke_export(&name, &args, &mut externals);
 
 		match result {
 			Ok(None) => Ok(ReturnValue::Unit),
-			Ok(Some(val)) => Ok(ReturnValue::Value(val.into())),
+			Ok(Some(val)) => Ok(ReturnValue::Value(to_interface(val))),
 			Err(_err) => Err(Error::Execution),
 		}
 	}
 
 	pub fn get_global_val(&self, name: &str) -> Option<Value> {
-		let global = self.instance
-			.export_by_name(name)?
-			.as_global()?
-			.get();
+		let global = self.instance.export_by_name(name)?.as_global()?.get();
+
+		Some(to_interface(global))
+	}
+}
+
+/// Convert the substrate value type to the wasmi value type.
+fn to_wasmi(value: Value) -> RuntimeValue {
+	match value {
+		Value::I32(val) => RuntimeValue::I32(val),
+		Value::I64(val) => RuntimeValue::I64(val),
+		Value::F32(val) => RuntimeValue::F32(val.into()),
+		Value::F64(val) => RuntimeValue::F64(val.into()),
+	}
+}
 
-		Some(global.into())
+/// Convert the wasmi value type to the substrate value type.
+fn to_interface(value: RuntimeValue) -> Value {
+	match value {
+		RuntimeValue::I32(val) => Value::I32(val),
+		RuntimeValue::I64(val) => Value::I64(val),
+		RuntimeValue::F32(val) => Value::F32(val.into()),
+		RuntimeValue::F64(val) => Value::F64(val.into()),
 	}
 }
 
 #[cfg(test)]
 mod tests {
-	use crate::{Error, Value, ReturnValue, HostError, EnvironmentDefinitionBuilder, Instance};
+	use crate::{EnvironmentDefinitionBuilder, Error, HostError, Instance, ReturnValue, Value};
 	use assert_matches::assert_matches;
 
 	fn execute_sandboxed(code: &[u8], args: &[Value]) -> Result<ReturnValue, HostError> {
@@ -310,7 +299,7 @@ mod tests {
 
 		fn env_assert(_e: &mut State, args: &[Value]) -> Result<ReturnValue, HostError> {
 			if args.len() != 1 {
-				return Err(HostError);
+				return Err(HostError)
 			}
 			let condition = args[0].as_i32().ok_or_else(|| HostError)?;
 			if condition != 0 {
@@ -321,7 +310,7 @@ mod tests {
 		}
 		fn env_inc_counter(e: &mut State, args: &[Value]) -> Result<ReturnValue, HostError> {
 			if args.len() != 1 {
-				return Err(HostError);
+				return Err(HostError)
 			}
 			let inc_by = args[0].as_i32().ok_or_else(|| HostError)?;
 			e.counter += inc_by as u32;
@@ -330,7 +319,7 @@ mod tests {
 		/// Function that takes one argument of any type and returns that value.
 		fn env_polymorphic_id(_e: &mut State, args: &[Value]) -> Result<ReturnValue, HostError> {
 			if args.len() != 1 {
-				return Err(HostError);
+				return Err(HostError)
 			}
 			Ok(ReturnValue::Value(args[0]))
 		}
@@ -350,7 +339,8 @@ mod tests {
 
 	#[test]
 	fn invoke_args() {
-		let code = wat::parse_str(r#"
+		let code = wat::parse_str(
+			r#"
 		(module
 			(import "env" "assert" (func $assert (param i32)))
 
@@ -371,21 +361,19 @@ mod tests {
 				)
 			)
 		)
-		"#).unwrap();
-
-		let result = execute_sandboxed(
-			&code,
-			&[
-				Value::I32(0x12345678),
-				Value::I64(0x1234567887654321),
-			]
-		);
+		"#,
+		)
+		.unwrap();
+
+		let result =
+			execute_sandboxed(&code, &[Value::I32(0x12345678), Value::I64(0x1234567887654321)]);
 		assert!(result.is_ok());
 	}
 
 	#[test]
 	fn return_value() {
-		let code = wat::parse_str(r#"
+		let code = wat::parse_str(
+			r#"
 		(module
 			(func (export "call") (param $x i32) (result i32)
 				(i32.add
@@ -394,20 +382,18 @@ mod tests {
 				)
 			)
 		)
-		"#).unwrap();
-
-		let return_val = execute_sandboxed(
-			&code,
-			&[
-				Value::I32(0x1336),
-			]
-		).unwrap();
+		"#,
+		)
+		.unwrap();
+
+		let return_val = execute_sandboxed(&code, &[Value::I32(0x1336)]).unwrap();
 		assert_eq!(return_val, ReturnValue::Value(Value::I32(0x1337)));
 	}
 
 	#[test]
 	fn signatures_dont_matter() {
-		let code = wat::parse_str(r#"
+		let code = wat::parse_str(
+			r#"
 		(module
 			(import "env" "polymorphic_id" (func $id_i32 (param i32) (result i32)))
 			(import "env" "polymorphic_id" (func $id_i64 (param i64) (result i64)))
@@ -434,7 +420,9 @@ mod tests {
 				)
 			)
 		)
-		"#).unwrap();
+		"#,
+		)
+		.unwrap();
 
 		let return_val = execute_sandboxed(&code, &[]).unwrap();
 		assert_eq!(return_val, ReturnValue::Unit);
@@ -449,7 +437,8 @@ mod tests {
 		let mut env_builder = EnvironmentDefinitionBuilder::new();
 		env_builder.add_host_func("env", "returns_i32", env_returns_i32);
 
-		let code = wat::parse_str(r#"
+		let code = wat::parse_str(
+			r#"
 		(module
 			;; It's actually returns i32, but imported as if it returned i64
 			(import "env" "returns_i32" (func $returns_i32 (result i64)))
@@ -460,15 +449,14 @@ mod tests {
 				)
 			)
 		)
-		"#).unwrap();
+		"#,
+		)
+		.unwrap();
 
 		// It succeeds since we are able to import functions with types we want.
 		let mut instance = Instance::new(&code, &env_builder, &mut ()).unwrap();
 
 		// But this fails since we imported a function that returns i32 as if it returned i64.
-		assert_matches!(
-			instance.invoke("call", &[], &mut ()),
-			Err(Error::Execution)
-		);
+		assert_matches!(instance.invoke("call", &[], &mut ()), Err(Error::Execution));
 	}
 }
diff --git a/primitives/sandbox/without_std.rs b/primitives/sandbox/host_executor.rs
similarity index 100%
rename from primitives/sandbox/without_std.rs
rename to primitives/sandbox/host_executor.rs
diff --git a/primitives/sandbox/src/lib.rs b/primitives/sandbox/src/lib.rs
index 94cb676b51ed..1724b4152ff3 100755
--- a/primitives/sandbox/src/lib.rs
+++ b/primitives/sandbox/src/lib.rs
@@ -38,17 +38,22 @@
 #![warn(missing_docs)]
 #![cfg_attr(not(feature = "std"), no_std)]
 
+extern crate alloc;
+
 use sp_std::prelude::*;
 
 pub use sp_core::sandbox::HostError;
 pub use sp_wasm_interface::{ReturnValue, Value};
 
+/// The target used for logging.
+const TARGET: &str = "runtime::sandbox";
+
 mod imp {
-	#[cfg(feature = "std")]
-	include!("../with_std.rs");
+	#[cfg(all(feature = "wasmer-sandbox", not(feature = "std")))]
+	include!("../host_executor.rs");
 
-	#[cfg(not(feature = "std"))]
-	include!("../without_std.rs");
+	#[cfg(not(all(feature = "wasmer-sandbox", not(feature = "std"))))]
+	include!("../embedded_executor.rs");
 }
 
 /// Error that can occur while using this crate.

From 17ce41a1f4811d003326056b920ce472d13c7b0e Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Wed, 25 Aug 2021 15:16:47 -0400
Subject: [PATCH 1116/1194] Expose `storage_prefix` logic, and remove duplicate
 code (#9621)

* expose storage prefix generation, remove duplicate code

* remove more duplicate code

* clean up import

* fix io test

* remove slicing

* Update frame/support/src/storage/mod.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
---
 frame/support/src/migrations.rs               |  9 +---
 .../src/storage/generator/double_map.rs       | 49 ++++++-------------
 frame/support/src/storage/generator/map.rs    | 39 +++++----------
 frame/support/src/storage/generator/nmap.rs   | 45 +++++------------
 frame/support/src/storage/generator/value.rs  |  6 +--
 frame/support/src/storage/migration.rs        | 48 +++++++++---------
 frame/support/src/storage/mod.rs              | 23 ++++++---
 frame/support/src/traits/hooks.rs             |  9 +---
 frame/support/src/traits/metadata.rs          | 10 +---
 frame/support/test/tests/decl_storage.rs      | 19 ++-----
 frame/support/test/tests/pallet.rs            | 19 +------
 .../tests/pallet_ui/hooks_invalid_item.stderr |  4 +-
 12 files changed, 89 insertions(+), 191 deletions(-)

diff --git a/frame/support/src/migrations.rs b/frame/support/src/migrations.rs
index cf1ba8198242..dc3402440fdd 100644
--- a/frame/support/src/migrations.rs
+++ b/frame/support/src/migrations.rs
@@ -30,14 +30,7 @@ impl<T: GetStorageVersion + PalletInfoAccess> PalletVersionToStorageVersionHelpe
 		const PALLET_VERSION_STORAGE_KEY_POSTFIX: &[u8] = b":__PALLET_VERSION__:";
 
 		fn pallet_version_key(name: &str) -> [u8; 32] {
-			let pallet_name = sp_io::hashing::twox_128(name.as_bytes());
-			let postfix = sp_io::hashing::twox_128(PALLET_VERSION_STORAGE_KEY_POSTFIX);
-
-			let mut final_key = [0u8; 32];
-			final_key[..16].copy_from_slice(&pallet_name);
-			final_key[16..].copy_from_slice(&postfix);
-
-			final_key
+			crate::storage::storage_prefix(name.as_bytes(), PALLET_VERSION_STORAGE_KEY_POSTFIX)
 		}
 
 		sp_io::storage::clear(&pallet_version_key(<T as PalletInfoAccess>::name()));
diff --git a/frame/support/src/storage/generator/double_map.rs b/frame/support/src/storage/generator/double_map.rs
index cec5bf57e50c..d28e42028de5 100644
--- a/frame/support/src/storage/generator/double_map.rs
+++ b/frame/support/src/storage/generator/double_map.rs
@@ -16,8 +16,8 @@
 // limitations under the License.
 
 use crate::{
-	hash::{ReversibleStorageHasher, StorageHasher, Twox128},
-	storage::{self, unhashed, KeyPrefixIterator, PrefixIterator, StorageAppend},
+	hash::{ReversibleStorageHasher, StorageHasher},
+	storage::{self, storage_prefix, unhashed, KeyPrefixIterator, PrefixIterator, StorageAppend},
 	Never,
 };
 use codec::{Decode, Encode, EncodeLike, FullCodec, FullEncode};
@@ -62,16 +62,8 @@ pub trait StorageDoubleMap<K1: FullEncode, K2: FullEncode, V: FullCodec> {
 	/// The full prefix; just the hash of `module_prefix` concatenated to the hash of
 	/// `storage_prefix`.
 	fn prefix_hash() -> Vec<u8> {
-		let module_prefix_hashed = Twox128::hash(Self::module_prefix());
-		let storage_prefix_hashed = Twox128::hash(Self::storage_prefix());
-
-		let mut result =
-			Vec::with_capacity(module_prefix_hashed.len() + storage_prefix_hashed.len());
-
-		result.extend_from_slice(&module_prefix_hashed[..]);
-		result.extend_from_slice(&storage_prefix_hashed[..]);
-
-		result
+		let result = storage_prefix(Self::module_prefix(), Self::storage_prefix());
+		result.to_vec()
 	}
 
 	/// Convert an optional value retrieved from storage to the type queried.
@@ -85,16 +77,12 @@ pub trait StorageDoubleMap<K1: FullEncode, K2: FullEncode, V: FullCodec> {
 	where
 		KArg1: EncodeLike<K1>,
 	{
-		let module_prefix_hashed = Twox128::hash(Self::module_prefix());
-		let storage_prefix_hashed = Twox128::hash(Self::storage_prefix());
+		let storage_prefix = storage_prefix(Self::module_prefix(), Self::storage_prefix());
 		let key_hashed = k1.borrow().using_encoded(Self::Hasher1::hash);
 
-		let mut final_key = Vec::with_capacity(
-			module_prefix_hashed.len() + storage_prefix_hashed.len() + key_hashed.as_ref().len(),
-		);
+		let mut final_key = Vec::with_capacity(storage_prefix.len() + key_hashed.as_ref().len());
 
-		final_key.extend_from_slice(&module_prefix_hashed[..]);
-		final_key.extend_from_slice(&storage_prefix_hashed[..]);
+		final_key.extend_from_slice(&storage_prefix);
 		final_key.extend_from_slice(key_hashed.as_ref());
 
 		final_key
@@ -106,20 +94,15 @@ pub trait StorageDoubleMap<K1: FullEncode, K2: FullEncode, V: FullCodec> {
 		KArg1: EncodeLike<K1>,
 		KArg2: EncodeLike<K2>,
 	{
-		let module_prefix_hashed = Twox128::hash(Self::module_prefix());
-		let storage_prefix_hashed = Twox128::hash(Self::storage_prefix());
+		let storage_prefix = storage_prefix(Self::module_prefix(), Self::storage_prefix());
 		let key1_hashed = k1.borrow().using_encoded(Self::Hasher1::hash);
 		let key2_hashed = k2.borrow().using_encoded(Self::Hasher2::hash);
 
 		let mut final_key = Vec::with_capacity(
-			module_prefix_hashed.len() +
-				storage_prefix_hashed.len() +
-				key1_hashed.as_ref().len() +
-				key2_hashed.as_ref().len(),
+			storage_prefix.len() + key1_hashed.as_ref().len() + key2_hashed.as_ref().len(),
 		);
 
-		final_key.extend_from_slice(&module_prefix_hashed[..]);
-		final_key.extend_from_slice(&storage_prefix_hashed[..]);
+		final_key.extend_from_slice(&storage_prefix);
 		final_key.extend_from_slice(key1_hashed.as_ref());
 		final_key.extend_from_slice(key2_hashed.as_ref());
 
@@ -319,20 +302,16 @@ where
 		key2: KeyArg2,
 	) -> Option<V> {
 		let old_key = {
-			let module_prefix_hashed = Twox128::hash(Self::module_prefix());
-			let storage_prefix_hashed = Twox128::hash(Self::storage_prefix());
+			let storage_prefix = storage_prefix(Self::module_prefix(), Self::storage_prefix());
+
 			let key1_hashed = key1.borrow().using_encoded(OldHasher1::hash);
 			let key2_hashed = key2.borrow().using_encoded(OldHasher2::hash);
 
 			let mut final_key = Vec::with_capacity(
-				module_prefix_hashed.len() +
-					storage_prefix_hashed.len() +
-					key1_hashed.as_ref().len() +
-					key2_hashed.as_ref().len(),
+				storage_prefix.len() + key1_hashed.as_ref().len() + key2_hashed.as_ref().len(),
 			);
 
-			final_key.extend_from_slice(&module_prefix_hashed[..]);
-			final_key.extend_from_slice(&storage_prefix_hashed[..]);
+			final_key.extend_from_slice(&storage_prefix);
 			final_key.extend_from_slice(key1_hashed.as_ref());
 			final_key.extend_from_slice(key2_hashed.as_ref());
 
diff --git a/frame/support/src/storage/generator/map.rs b/frame/support/src/storage/generator/map.rs
index b78e9f96496f..3fd3b9a0ea7b 100644
--- a/frame/support/src/storage/generator/map.rs
+++ b/frame/support/src/storage/generator/map.rs
@@ -16,8 +16,8 @@
 // limitations under the License.
 
 use crate::{
-	hash::{ReversibleStorageHasher, StorageHasher, Twox128},
-	storage::{self, unhashed, KeyPrefixIterator, PrefixIterator, StorageAppend},
+	hash::{ReversibleStorageHasher, StorageHasher},
+	storage::{self, storage_prefix, unhashed, KeyPrefixIterator, PrefixIterator, StorageAppend},
 	Never,
 };
 use codec::{Decode, Encode, EncodeLike, FullCodec, FullEncode};
@@ -52,16 +52,8 @@ pub trait StorageMap<K: FullEncode, V: FullCodec> {
 	/// The full prefix; just the hash of `module_prefix` concatenated to the hash of
 	/// `storage_prefix`.
 	fn prefix_hash() -> Vec<u8> {
-		let module_prefix_hashed = Twox128::hash(Self::module_prefix());
-		let storage_prefix_hashed = Twox128::hash(Self::storage_prefix());
-
-		let mut result =
-			Vec::with_capacity(module_prefix_hashed.len() + storage_prefix_hashed.len());
-
-		result.extend_from_slice(&module_prefix_hashed[..]);
-		result.extend_from_slice(&storage_prefix_hashed[..]);
-
-		result
+		let result = storage_prefix(Self::module_prefix(), Self::storage_prefix());
+		result.to_vec()
 	}
 
 	/// Convert an optional value retrieved from storage to the type queried.
@@ -75,16 +67,12 @@ pub trait StorageMap<K: FullEncode, V: FullCodec> {
 	where
 		KeyArg: EncodeLike<K>,
 	{
-		let module_prefix_hashed = Twox128::hash(Self::module_prefix());
-		let storage_prefix_hashed = Twox128::hash(Self::storage_prefix());
+		let storage_prefix = storage_prefix(Self::module_prefix(), Self::storage_prefix());
 		let key_hashed = key.borrow().using_encoded(Self::Hasher::hash);
 
-		let mut final_key = Vec::with_capacity(
-			module_prefix_hashed.len() + storage_prefix_hashed.len() + key_hashed.as_ref().len(),
-		);
+		let mut final_key = Vec::with_capacity(storage_prefix.len() + key_hashed.as_ref().len());
 
-		final_key.extend_from_slice(&module_prefix_hashed[..]);
-		final_key.extend_from_slice(&storage_prefix_hashed[..]);
+		final_key.extend_from_slice(&storage_prefix);
 		final_key.extend_from_slice(key_hashed.as_ref());
 
 		final_key
@@ -330,18 +318,13 @@ impl<K: FullEncode, V: FullCodec, G: StorageMap<K, V>> storage::StorageMap<K, V>
 
 	fn migrate_key<OldHasher: StorageHasher, KeyArg: EncodeLike<K>>(key: KeyArg) -> Option<V> {
 		let old_key = {
-			let module_prefix_hashed = Twox128::hash(Self::module_prefix());
-			let storage_prefix_hashed = Twox128::hash(Self::storage_prefix());
+			let storage_prefix = storage_prefix(Self::module_prefix(), Self::storage_prefix());
 			let key_hashed = key.borrow().using_encoded(OldHasher::hash);
 
-			let mut final_key = Vec::with_capacity(
-				module_prefix_hashed.len() +
-					storage_prefix_hashed.len() +
-					key_hashed.as_ref().len(),
-			);
+			let mut final_key =
+				Vec::with_capacity(storage_prefix.len() + key_hashed.as_ref().len());
 
-			final_key.extend_from_slice(&module_prefix_hashed[..]);
-			final_key.extend_from_slice(&storage_prefix_hashed[..]);
+			final_key.extend_from_slice(&storage_prefix);
 			final_key.extend_from_slice(key_hashed.as_ref());
 
 			final_key
diff --git a/frame/support/src/storage/generator/nmap.rs b/frame/support/src/storage/generator/nmap.rs
index 2ea401f44e96..592bcc81341b 100755
--- a/frame/support/src/storage/generator/nmap.rs
+++ b/frame/support/src/storage/generator/nmap.rs
@@ -30,9 +30,8 @@
 //! be compromised.
 
 use crate::{
-	hash::{StorageHasher, Twox128},
 	storage::{
-		self,
+		self, storage_prefix,
 		types::{
 			EncodeLikeTuple, HasKeyPrefix, HasReversibleKeyPrefix, KeyGenerator,
 			ReversibleKeyGenerator, TupleToEncodedIter,
@@ -71,16 +70,8 @@ pub trait StorageNMap<K: KeyGenerator, V: FullCodec> {
 	/// The full prefix; just the hash of `module_prefix` concatenated to the hash of
 	/// `storage_prefix`.
 	fn prefix_hash() -> Vec<u8> {
-		let module_prefix_hashed = Twox128::hash(Self::module_prefix());
-		let storage_prefix_hashed = Twox128::hash(Self::storage_prefix());
-
-		let mut result =
-			Vec::with_capacity(module_prefix_hashed.len() + storage_prefix_hashed.len());
-
-		result.extend_from_slice(&module_prefix_hashed[..]);
-		result.extend_from_slice(&storage_prefix_hashed[..]);
-
-		result
+		let result = storage_prefix(Self::module_prefix(), Self::storage_prefix());
+		result.to_vec()
 	}
 
 	/// Convert an optional value retrieved from storage to the type queried.
@@ -94,16 +85,12 @@ pub trait StorageNMap<K: KeyGenerator, V: FullCodec> {
 	where
 		K: HasKeyPrefix<KP>,
 	{
-		let module_prefix_hashed = Twox128::hash(Self::module_prefix());
-		let storage_prefix_hashed = Twox128::hash(Self::storage_prefix());
+		let storage_prefix = storage_prefix(Self::module_prefix(), Self::storage_prefix());
 		let key_hashed = <K as HasKeyPrefix<KP>>::partial_key(key);
 
-		let mut final_key = Vec::with_capacity(
-			module_prefix_hashed.len() + storage_prefix_hashed.len() + key_hashed.len(),
-		);
+		let mut final_key = Vec::with_capacity(storage_prefix.len() + key_hashed.len());
 
-		final_key.extend_from_slice(&module_prefix_hashed[..]);
-		final_key.extend_from_slice(&storage_prefix_hashed[..]);
+		final_key.extend_from_slice(&storage_prefix);
 		final_key.extend_from_slice(key_hashed.as_ref());
 
 		final_key
@@ -115,16 +102,12 @@ pub trait StorageNMap<K: KeyGenerator, V: FullCodec> {
 		KG: KeyGenerator,
 		KArg: EncodeLikeTuple<KG::KArg> + TupleToEncodedIter,
 	{
-		let module_prefix_hashed = Twox128::hash(Self::module_prefix());
-		let storage_prefix_hashed = Twox128::hash(Self::storage_prefix());
+		let storage_prefix = storage_prefix(Self::module_prefix(), Self::storage_prefix());
 		let key_hashed = KG::final_key(key);
 
-		let mut final_key = Vec::with_capacity(
-			module_prefix_hashed.len() + storage_prefix_hashed.len() + key_hashed.len(),
-		);
+		let mut final_key = Vec::with_capacity(storage_prefix.len() + key_hashed.len());
 
-		final_key.extend_from_slice(&module_prefix_hashed[..]);
-		final_key.extend_from_slice(&storage_prefix_hashed[..]);
+		final_key.extend_from_slice(&storage_prefix);
 		final_key.extend_from_slice(key_hashed.as_ref());
 
 		final_key
@@ -286,16 +269,12 @@ where
 		KArg: EncodeLikeTuple<K::KArg> + TupleToEncodedIter,
 	{
 		let old_key = {
-			let module_prefix_hashed = Twox128::hash(Self::module_prefix());
-			let storage_prefix_hashed = Twox128::hash(Self::storage_prefix());
+			let storage_prefix = storage_prefix(Self::module_prefix(), Self::storage_prefix());
 			let key_hashed = K::migrate_key(&key, hash_fns);
 
-			let mut final_key = Vec::with_capacity(
-				module_prefix_hashed.len() + storage_prefix_hashed.len() + key_hashed.len(),
-			);
+			let mut final_key = Vec::with_capacity(storage_prefix.len() + key_hashed.len());
 
-			final_key.extend_from_slice(&module_prefix_hashed[..]);
-			final_key.extend_from_slice(&storage_prefix_hashed[..]);
+			final_key.extend_from_slice(&storage_prefix);
 			final_key.extend_from_slice(key_hashed.as_ref());
 
 			final_key
diff --git a/frame/support/src/storage/generator/value.rs b/frame/support/src/storage/generator/value.rs
index c765e059ec14..3486eaa005c0 100644
--- a/frame/support/src/storage/generator/value.rs
+++ b/frame/support/src/storage/generator/value.rs
@@ -16,7 +16,6 @@
 // limitations under the License.
 
 use crate::{
-	hash::{StorageHasher, Twox128},
 	storage::{self, unhashed, StorageAppend},
 	Never,
 };
@@ -46,10 +45,7 @@ pub trait StorageValue<T: FullCodec> {
 
 	/// Generate the full key used in top storage.
 	fn storage_value_final_key() -> [u8; 32] {
-		let mut final_key = [0u8; 32];
-		final_key[0..16].copy_from_slice(&Twox128::hash(Self::module_prefix()));
-		final_key[16..32].copy_from_slice(&Twox128::hash(Self::storage_prefix()));
-		final_key
+		crate::storage::storage_prefix(Self::module_prefix(), Self::storage_prefix())
 	}
 }
 
diff --git a/frame/support/src/storage/migration.rs b/frame/support/src/storage/migration.rs
index 0f10c5cbb47d..eae45b1e96ad 100644
--- a/frame/support/src/storage/migration.rs
+++ b/frame/support/src/storage/migration.rs
@@ -17,7 +17,11 @@
 
 //! Some utilities for helping access storage with arbitrary key types.
 
-use crate::{hash::ReversibleStorageHasher, storage::unhashed, StorageHasher, Twox128};
+use crate::{
+	hash::ReversibleStorageHasher,
+	storage::{storage_prefix, unhashed},
+	StorageHasher, Twox128,
+};
 use codec::{Decode, Encode};
 use sp_std::prelude::*;
 
@@ -47,8 +51,8 @@ impl<T> StorageIterator<T> {
 	)]
 	pub fn with_suffix(module: &[u8], item: &[u8], suffix: &[u8]) -> Self {
 		let mut prefix = Vec::new();
-		prefix.extend_from_slice(&Twox128::hash(module));
-		prefix.extend_from_slice(&Twox128::hash(item));
+		let storage_prefix = storage_prefix(module, item);
+		prefix.extend_from_slice(&storage_prefix);
 		prefix.extend_from_slice(suffix);
 		let previous_key = prefix.clone();
 		Self { prefix, previous_key, drain: false, _phantom: Default::default() }
@@ -112,8 +116,8 @@ impl<K, T, H: ReversibleStorageHasher> StorageKeyIterator<K, T, H> {
 	)]
 	pub fn with_suffix(module: &[u8], item: &[u8], suffix: &[u8]) -> Self {
 		let mut prefix = Vec::new();
-		prefix.extend_from_slice(&Twox128::hash(module));
-		prefix.extend_from_slice(&Twox128::hash(item));
+		let storage_prefix = storage_prefix(module, item);
+		prefix.extend_from_slice(&storage_prefix);
 		prefix.extend_from_slice(suffix);
 		let previous_key = prefix.clone();
 		Self { prefix, previous_key, drain: false, _phantom: Default::default() }
@@ -173,8 +177,8 @@ pub fn storage_iter_with_suffix<T: Decode + Sized>(
 	suffix: &[u8],
 ) -> PrefixIterator<(Vec<u8>, T)> {
 	let mut prefix = Vec::new();
-	prefix.extend_from_slice(&Twox128::hash(module));
-	prefix.extend_from_slice(&Twox128::hash(item));
+	let storage_prefix = storage_prefix(module, item);
+	prefix.extend_from_slice(&storage_prefix);
 	prefix.extend_from_slice(suffix);
 	let previous_key = prefix.clone();
 	let closure = |raw_key_without_prefix: &[u8], raw_value: &[u8]| {
@@ -204,8 +208,9 @@ pub fn storage_key_iter_with_suffix<
 	suffix: &[u8],
 ) -> PrefixIterator<(K, T)> {
 	let mut prefix = Vec::new();
-	prefix.extend_from_slice(&Twox128::hash(module));
-	prefix.extend_from_slice(&Twox128::hash(item));
+	let storage_prefix = storage_prefix(module, item);
+
+	prefix.extend_from_slice(&storage_prefix);
 	prefix.extend_from_slice(suffix);
 	let previous_key = prefix.clone();
 	let closure = |raw_key_without_prefix: &[u8], raw_value: &[u8]| {
@@ -225,8 +230,8 @@ pub fn have_storage_value(module: &[u8], item: &[u8], hash: &[u8]) -> bool {
 /// Get a particular value in storage by the `module`, the map's `item` name and the key `hash`.
 pub fn get_storage_value<T: Decode + Sized>(module: &[u8], item: &[u8], hash: &[u8]) -> Option<T> {
 	let mut key = vec![0u8; 32 + hash.len()];
-	key[0..16].copy_from_slice(&Twox128::hash(module));
-	key[16..32].copy_from_slice(&Twox128::hash(item));
+	let storage_prefix = storage_prefix(module, item);
+	key[0..32].copy_from_slice(&storage_prefix);
 	key[32..].copy_from_slice(hash);
 	frame_support::storage::unhashed::get::<T>(&key)
 }
@@ -234,8 +239,8 @@ pub fn get_storage_value<T: Decode + Sized>(module: &[u8], item: &[u8], hash: &[
 /// Take a particular value in storage by the `module`, the map's `item` name and the key `hash`.
 pub fn take_storage_value<T: Decode + Sized>(module: &[u8], item: &[u8], hash: &[u8]) -> Option<T> {
 	let mut key = vec![0u8; 32 + hash.len()];
-	key[0..16].copy_from_slice(&Twox128::hash(module));
-	key[16..32].copy_from_slice(&Twox128::hash(item));
+	let storage_prefix = storage_prefix(module, item);
+	key[0..32].copy_from_slice(&storage_prefix);
 	key[32..].copy_from_slice(hash);
 	frame_support::storage::unhashed::take::<T>(&key)
 }
@@ -243,8 +248,8 @@ pub fn take_storage_value<T: Decode + Sized>(module: &[u8], item: &[u8], hash: &
 /// Put a particular value into storage by the `module`, the map's `item` name and the key `hash`.
 pub fn put_storage_value<T: Encode>(module: &[u8], item: &[u8], hash: &[u8], value: T) {
 	let mut key = vec![0u8; 32 + hash.len()];
-	key[0..16].copy_from_slice(&Twox128::hash(module));
-	key[16..32].copy_from_slice(&Twox128::hash(item));
+	let storage_prefix = storage_prefix(module, item);
+	key[0..32].copy_from_slice(&storage_prefix);
 	key[32..].copy_from_slice(hash);
 	frame_support::storage::unhashed::put(&key, &value);
 }
@@ -253,8 +258,8 @@ pub fn put_storage_value<T: Encode>(module: &[u8], item: &[u8], hash: &[u8], val
 /// `hash`.
 pub fn remove_storage_prefix(module: &[u8], item: &[u8], hash: &[u8]) {
 	let mut key = vec![0u8; 32 + hash.len()];
-	key[0..16].copy_from_slice(&Twox128::hash(module));
-	key[16..32].copy_from_slice(&Twox128::hash(item));
+	let storage_prefix = storage_prefix(module, item);
+	key[0..32].copy_from_slice(&storage_prefix);
 	key[32..].copy_from_slice(hash);
 	frame_support::storage::unhashed::kill_prefix(&key, None);
 }
@@ -293,13 +298,8 @@ pub fn move_storage_from_pallet(
 	old_pallet_name: &[u8],
 	new_pallet_name: &[u8],
 ) {
-	let mut new_prefix = Vec::new();
-	new_prefix.extend_from_slice(&Twox128::hash(new_pallet_name));
-	new_prefix.extend_from_slice(&Twox128::hash(storage_name));
-
-	let mut old_prefix = Vec::new();
-	old_prefix.extend_from_slice(&Twox128::hash(old_pallet_name));
-	old_prefix.extend_from_slice(&Twox128::hash(storage_name));
+	let new_prefix = storage_prefix(new_pallet_name, storage_name);
+	let old_prefix = storage_prefix(old_pallet_name, storage_name);
 
 	move_prefix(&old_prefix, &new_prefix);
 
diff --git a/frame/support/src/storage/mod.rs b/frame/support/src/storage/mod.rs
index ac2ddaa73c3b..8cee9faf6e81 100644
--- a/frame/support/src/storage/mod.rs
+++ b/frame/support/src/storage/mod.rs
@@ -18,7 +18,7 @@
 //! Stuff to do with the runtime's storage.
 
 use crate::{
-	hash::{ReversibleStorageHasher, StorageHasher, Twox128},
+	hash::{ReversibleStorageHasher, StorageHasher},
 	storage::types::{
 		EncodeLikeTuple, HasKeyPrefix, HasReversibleKeyPrefix, KeyGenerator,
 		ReversibleKeyGenerator, TupleToEncodedIter,
@@ -1108,10 +1108,7 @@ pub trait StoragePrefixedMap<Value: FullCodec> {
 
 	/// Final full prefix that prefixes all keys.
 	fn final_prefix() -> [u8; 32] {
-		let mut final_key = [0u8; 32];
-		final_key[0..16].copy_from_slice(&Twox128::hash(Self::module_prefix()));
-		final_key[16..32].copy_from_slice(&Twox128::hash(Self::storage_prefix()));
-		final_key
+		crate::storage::storage_prefix(Self::module_prefix(), Self::storage_prefix())
 	}
 
 	/// Remove all value of the storage.
@@ -1361,10 +1358,24 @@ where
 	}
 }
 
+/// Returns the storage prefix for a specific pallet name and storage name.
+///
+/// The storage prefix is `concat(twox_128(pallet_name), twox_128(storage_name))`.
+pub fn storage_prefix(pallet_name: &[u8], storage_name: &[u8]) -> [u8; 32] {
+	let pallet_hash = sp_io::hashing::twox_128(pallet_name);
+	let storage_hash = sp_io::hashing::twox_128(storage_name);
+
+	let mut final_key = [0u8; 32];
+	final_key[..16].copy_from_slice(&pallet_hash);
+	final_key[16..].copy_from_slice(&storage_hash);
+
+	final_key
+}
+
 #[cfg(test)]
 mod test {
 	use super::*;
-	use crate::{assert_ok, hash::Identity};
+	use crate::{assert_ok, hash::Identity, Twox128};
 	use bounded_vec::BoundedVec;
 	use core::convert::{TryFrom, TryInto};
 	use generator::StorageValue as _;
diff --git a/frame/support/src/traits/hooks.rs b/frame/support/src/traits/hooks.rs
index 965cce234288..adba88e5acbf 100644
--- a/frame/support/src/traits/hooks.rs
+++ b/frame/support/src/traits/hooks.rs
@@ -124,14 +124,7 @@ pub trait OnRuntimeUpgradeHelpersExt {
 	/// them. See [`Self::set_temp_storage`] and [`Self::get_temp_storage`].
 	#[cfg(feature = "try-runtime")]
 	fn storage_key(ident: &str) -> [u8; 32] {
-		let prefix = sp_io::hashing::twox_128(ON_RUNTIME_UPGRADE_PREFIX);
-		let ident = sp_io::hashing::twox_128(ident.as_bytes());
-
-		let mut final_key = [0u8; 32];
-		final_key[..16].copy_from_slice(&prefix);
-		final_key[16..].copy_from_slice(&ident);
-
-		final_key
+		crate::storage::storage_prefix(ON_RUNTIME_UPGRADE_PREFIX, ident.as_bytes())
 	}
 
 	/// Get temporary storage data written by [`Self::set_temp_storage`].
diff --git a/frame/support/src/traits/metadata.rs b/frame/support/src/traits/metadata.rs
index 8b1707855f7b..e877f29e0a13 100644
--- a/frame/support/src/traits/metadata.rs
+++ b/frame/support/src/traits/metadata.rs
@@ -92,15 +92,7 @@ impl StorageVersion {
 	/// See [`STORAGE_VERSION_STORAGE_KEY_POSTFIX`] on how this key is built.
 	pub fn storage_key<P: PalletInfoAccess>() -> [u8; 32] {
 		let pallet_name = P::name();
-
-		let pallet_name = sp_io::hashing::twox_128(pallet_name.as_bytes());
-		let postfix = sp_io::hashing::twox_128(STORAGE_VERSION_STORAGE_KEY_POSTFIX);
-
-		let mut final_key = [0u8; 32];
-		final_key[..16].copy_from_slice(&pallet_name);
-		final_key[16..].copy_from_slice(&postfix);
-
-		final_key
+		crate::storage::storage_prefix(pallet_name.as_bytes(), STORAGE_VERSION_STORAGE_KEY_POSTFIX)
 	}
 
 	/// Put this storage version for the given pallet into the storage.
diff --git a/frame/support/test/tests/decl_storage.rs b/frame/support/test/tests/decl_storage.rs
index 666dda49935e..50c8387bca55 100644
--- a/frame/support/test/tests/decl_storage.rs
+++ b/frame/support/test/tests/decl_storage.rs
@@ -428,16 +428,10 @@ mod tests {
 	#[test]
 	fn storage_info() {
 		use frame_support::{
-			pallet_prelude::*,
+			storage::storage_prefix as prefix,
 			traits::{StorageInfo, StorageInfoTrait},
-			StorageHasher,
-		};
-		let prefix = |pallet_name, storage_name| {
-			let mut res = [0u8; 32];
-			res[0..16].copy_from_slice(&Twox128::hash(pallet_name));
-			res[16..32].copy_from_slice(&Twox128::hash(storage_name));
-			res
 		};
+
 		pretty_assertions::assert_eq!(
 			<Module<TraitImpl>>::storage_info(),
 			vec![
@@ -717,15 +711,8 @@ mod test2 {
 	#[test]
 	fn storage_info() {
 		use frame_support::{
-			pallet_prelude::*,
+			storage::storage_prefix as prefix,
 			traits::{StorageInfo, StorageInfoTrait},
-			StorageHasher,
-		};
-		let prefix = |pallet_name, storage_name| {
-			let mut res = [0u8; 32];
-			res[0..16].copy_from_slice(&Twox128::hash(pallet_name));
-			res[16..32].copy_from_slice(&Twox128::hash(storage_name));
-			res
 		};
 		pretty_assertions::assert_eq!(
 			<Module<TraitImpl>>::storage_info(),
diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index 00af4d261c65..80bae000b6c7 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -934,14 +934,7 @@ fn migrate_from_pallet_version_to_storage_version() {
 	const PALLET_VERSION_STORAGE_KEY_POSTFIX: &[u8] = b":__PALLET_VERSION__:";
 
 	fn pallet_version_key(name: &str) -> [u8; 32] {
-		let pallet_name = sp_io::hashing::twox_128(name.as_bytes());
-		let postfix = sp_io::hashing::twox_128(PALLET_VERSION_STORAGE_KEY_POSTFIX);
-
-		let mut final_key = [0u8; 32];
-		final_key[..16].copy_from_slice(&pallet_name);
-		final_key[16..].copy_from_slice(&postfix);
-
-		final_key
+		frame_support::storage::storage_prefix(name.as_bytes(), PALLET_VERSION_STORAGE_KEY_POSTFIX)
 	}
 
 	TestExternalities::default().execute_with(|| {
@@ -1274,16 +1267,8 @@ fn test_pallet_info_access() {
 #[test]
 fn test_storage_info() {
 	use frame_support::{
-		pallet_prelude::*,
+		storage::storage_prefix as prefix,
 		traits::{StorageInfo, StorageInfoTrait},
-		StorageHasher,
-	};
-
-	let prefix = |pallet_name, storage_name| {
-		let mut res = [0u8; 32];
-		res[0..16].copy_from_slice(&Twox128::hash(pallet_name));
-		res[16..32].copy_from_slice(&Twox128::hash(storage_name));
-		res
 	};
 
 	assert_eq!(
diff --git a/frame/support/test/tests/pallet_ui/hooks_invalid_item.stderr b/frame/support/test/tests/pallet_ui/hooks_invalid_item.stderr
index f3677113dabe..3d7303fafdcf 100644
--- a/frame/support/test/tests/pallet_ui/hooks_invalid_item.stderr
+++ b/frame/support/test/tests/pallet_ui/hooks_invalid_item.stderr
@@ -5,9 +5,9 @@ error[E0107]: missing generics for trait `Hooks`
     |                     ^^^^^ expected 1 type argument
     |
 note: trait defined here, with 1 type parameter: `BlockNumber`
-   --> $DIR/hooks.rs:221:11
+   --> $DIR/hooks.rs:214:11
     |
-221 | pub trait Hooks<BlockNumber> {
+214 | pub trait Hooks<BlockNumber> {
     |           ^^^^^ -----------
 help: use angle brackets to add missing type argument
     |

From caa863a91c672a0807b14778446a635e0ddcccf0 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Thu, 26 Aug 2021 03:14:09 +0200
Subject: [PATCH 1117/1194] improve doc of pallet macro (#9625)

* improve doc

* fmt
---
 frame/support/src/lib.rs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index bf314161c7f8..105b2328f232 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -1693,7 +1693,19 @@ pub mod pallet_prelude {
 /// E.g. if runtime names the pallet "MyExample" then the storage `type Foo<T> = ...` use the
 /// prefix: `Twox128(b"MyExample") ++ Twox128(b"Foo")`.
 ///
-/// The optional attribute `#[pallet::getter(fn $my_getter_fn_name)]` allow to define a
+/// The optional attribute `#[pallet::storage_prefix = "$custom_name"]` allows to define a
+/// specific name to use for the prefix.
+///
+/// E.g:
+/// ```ignore
+/// #[pallet::storage]
+/// #[pallet::storage_prefix = "OtherName"]
+/// pub(super) type MyStorage<T> = StorageMap<Hasher = Blake2_128Concat, Key = u32, Value = u32>;
+/// ```
+/// In this case the final prefix used by the map is
+/// `Twox128(b"MyExample") ++ Twox128(b"OtherName")`.
+///
+/// The optional attribute `#[pallet::getter(fn $my_getter_fn_name)]` allows to define a
 /// getter function on `Pallet`.
 ///
 /// E.g:
@@ -2023,6 +2035,7 @@ pub mod pallet_prelude {
 /// 	// Another storage declaration
 /// 	#[pallet::storage]
 /// 	#[pallet::getter(fn my_storage)]
+/// 	#[pallet::storage_prefix = "SomeOtherName"]
 /// 	pub(super) type MyStorage<T> =
 /// 		StorageMap<Hasher = Blake2_128Concat, Key = u32, Value = u32>;
 ///
@@ -2165,6 +2178,7 @@ pub mod pallet_prelude {
 ///
 /// 	#[pallet::storage]
 /// 	#[pallet::getter(fn my_storage)]
+/// 	#[pallet::storage_prefix = "SomeOtherName"]
 /// 	pub(super) type MyStorage<T, I = ()> =
 /// 		StorageMap<Hasher = Blake2_128Concat, Key = u32, Value = u32>;
 ///

From 42d317054ea0d1f1e6b2b22aaba67004bcf5e898 Mon Sep 17 00:00:00 2001
From: Amar Singh <asinghchrony@protonmail.com>
Date: Wed, 25 Aug 2021 21:32:25 -0400
Subject: [PATCH 1118/1194] Improve errors for `generate_solution_type` macro 
 (#9553)

* add more errors for check attributes in npos elections solution type

* revert local env

* return Ok false if there are no attributes

* fmt

* Update primitives/npos-elections/solution-type/src/lib.rs

Co-authored-by: Squirrel <gilescope@gmail.com>

* Update primitives/npos-elections/solution-type/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Update primitives/npos-elections/solution-type/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Update primitives/npos-elections/solution-type/src/lib.rs

* improve span by giving extra attribute, nightly fmt

* fix test to test new error msg

Co-authored-by: Squirrel <gilescope@gmail.com>
Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
---
 .../npos-elections/solution-type/src/lib.rs   | 27 +++++++------
 .../{wrong_page.rs => wrong_attribute.rs}     |  0
 .../tests/ui/fail/wrong_attribute.stderr      |  5 +++
 .../tests/ui/fail/wrong_page.stderr           | 38 -------------------
 4 files changed, 20 insertions(+), 50 deletions(-)
 rename primitives/npos-elections/solution-type/tests/ui/fail/{wrong_page.rs => wrong_attribute.rs} (100%)
 create mode 100644 primitives/npos-elections/solution-type/tests/ui/fail/wrong_attribute.stderr
 delete mode 100644 primitives/npos-elections/solution-type/tests/ui/fail/wrong_page.stderr

diff --git a/primitives/npos-elections/solution-type/src/lib.rs b/primitives/npos-elections/solution-type/src/lib.rs
index 16b4e8e04743..9b0ec56fc74d 100644
--- a/primitives/npos-elections/solution-type/src/lib.rs
+++ b/primitives/npos-elections/solution-type/src/lib.rs
@@ -134,20 +134,23 @@ struct SolutionDef {
 }
 
 fn check_attributes(input: ParseStream) -> syn::Result<bool> {
-	let attrs = input.call(syn::Attribute::parse_outer).unwrap_or_default();
+	let mut attrs = input.call(syn::Attribute::parse_outer).unwrap_or_default();
 	if attrs.len() > 1 {
-		return Err(syn_err("compact solution can accept only #[compact]"))
+		let extra_attr = attrs.pop().expect("attributes vec with len > 1 can be popped");
+		return Err(syn::Error::new_spanned(
+			extra_attr.clone(),
+			"compact solution can accept only #[compact]",
+		))
+	}
+	if attrs.is_empty() {
+		return Ok(false)
+	}
+	let attr = attrs.pop().expect("attributes vec with len 1 can be popped.");
+	if attr.path.is_ident("compact") {
+		Ok(true)
+	} else {
+		Err(syn::Error::new_spanned(attr.clone(), "compact solution can accept only #[compact]"))
 	}
-
-	Ok(attrs.iter().any(|attr| {
-		if attr.path.segments.len() == 1 {
-			let segment = attr.path.segments.first().expect("Vec with len 1 can be popped.");
-			if segment.ident == Ident::new("compact", Span::call_site()) {
-				return true
-			}
-		}
-		false
-	}))
 }
 
 impl Parse for SolutionDef {
diff --git a/primitives/npos-elections/solution-type/tests/ui/fail/wrong_page.rs b/primitives/npos-elections/solution-type/tests/ui/fail/wrong_attribute.rs
similarity index 100%
rename from primitives/npos-elections/solution-type/tests/ui/fail/wrong_page.rs
rename to primitives/npos-elections/solution-type/tests/ui/fail/wrong_attribute.rs
diff --git a/primitives/npos-elections/solution-type/tests/ui/fail/wrong_attribute.stderr b/primitives/npos-elections/solution-type/tests/ui/fail/wrong_attribute.stderr
new file mode 100644
index 000000000000..ab700a3f2afc
--- /dev/null
+++ b/primitives/npos-elections/solution-type/tests/ui/fail/wrong_attribute.stderr
@@ -0,0 +1,5 @@
+error: compact solution can accept only #[compact]
+ --> $DIR/wrong_attribute.rs:4:2
+  |
+4 |     #[pages(1)] pub struct TestSolution::<
+  |     ^^^^^^^^^^^
diff --git a/primitives/npos-elections/solution-type/tests/ui/fail/wrong_page.stderr b/primitives/npos-elections/solution-type/tests/ui/fail/wrong_page.stderr
deleted file mode 100644
index 7104305a9e1e..000000000000
--- a/primitives/npos-elections/solution-type/tests/ui/fail/wrong_page.stderr
+++ /dev/null
@@ -1,38 +0,0 @@
-error[E0412]: cannot find type `Perbill` in this scope
- --> $DIR/wrong_page.rs:7:14
-  |
-7 |         Accuracy = Perbill,
-  |                    ^^^^^^^ not found in this scope
-  |
-help: consider importing this struct
-  |
-1 | use sp_arithmetic::Perbill;
-  |
-
-error[E0433]: failed to resolve: use of undeclared type `Perbill`
- --> $DIR/wrong_page.rs:7:14
-  |
-7 |         Accuracy = Perbill,
-  |                    ^^^^^^^ not found in this scope
-  |
-help: consider importing this struct
-  |
-1 | use sp_arithmetic::Perbill;
-  |
-
-error[E0119]: conflicting implementations of trait `std::convert::TryFrom<&[_npos::IndexAssignment<u8, u16, [type error]>]>` for type `TestSolution`
- --> $DIR/wrong_page.rs:3:1
-  |
-3 | / generate_solution_type!(
-4 | |     #[pages(1)] pub struct TestSolution::<
-5 | |         VoterIndex = u8,
-6 | |         TargetIndex = u16,
-7 | |         Accuracy = Perbill,
-8 | |     >(8)
-9 | | );
-  | |__^
-  |
-  = note: conflicting implementation in crate `core`:
-          - impl<T, U> TryFrom<U> for T
-            where U: Into<T>;
-  = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)

From 69e5b50896ff743f4725cb9747750c4093963a66 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Thu, 26 Aug 2021 09:55:41 -0400
Subject: [PATCH 1119/1194] Make System Events Private from the Runtime (#9619)

* make events private

* "i know what i am doing"

* feedback
---
 .../election-provider-multi-phase/src/lib.rs  |  4 ++-
 frame/system/src/lib.rs                       | 25 +++++++++++++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index 4aef03a34389..96f54c4c03db 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -1236,7 +1236,9 @@ impl<T: Config> Pallet<T> {
 		}
 
 		// After election finalization, clear OCW solution storage.
-		if <frame_system::Pallet<T>>::events()
+		//
+		// We can read the events here because offchain worker doesn't affect PoV.
+		if <frame_system::Pallet<T>>::read_events_no_consensus()
 			.into_iter()
 			.filter_map(|event_record| {
 				let local_event = <T as Config>::Event::from(event_record.event);
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index a8bf253c392c..7b6ec9856d9f 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -612,9 +612,12 @@ pub mod pallet {
 	pub(super) type Digest<T: Config> = StorageValue<_, DigestOf<T>, ValueQuery>;
 
 	/// Events deposited for the current block.
+	///
+	/// NOTE: This storage item is explicitly unbounded since it is never intended to be read
+	/// from within the runtime.
 	#[pallet::storage]
-	#[pallet::getter(fn events)]
-	pub type Events<T: Config> = StorageValue<_, Vec<EventRecord<T::Event, T::Hash>>, ValueQuery>;
+	pub(super) type Events<T: Config> =
+		StorageValue<_, Vec<EventRecord<T::Event, T::Hash>>, ValueQuery>;
 
 	/// The number of events in the `Events<T>` list.
 	#[pallet::storage]
@@ -1448,6 +1451,24 @@ impl<T: Config> Pallet<T> {
 		})
 	}
 
+	/// Get the current events deposited by the runtime.
+	///
+	/// NOTE: This should only be used in tests. Reading events from the runtime can have a large
+	/// impact on the PoV size of a block. Users should use alternative and well bounded storage
+	/// items for any behavior like this.
+	#[cfg(any(feature = "std", feature = "runtime-benchmarks", test))]
+	pub fn events() -> Vec<EventRecord<T::Event, T::Hash>> {
+		Self::read_events_no_consensus()
+	}
+
+	/// Get the current events deposited by the runtime.
+	///
+	/// Should only be called if you know what you are doing and outside of the runtime block
+	/// execution else it can have a large impact on the PoV size of a block.
+	pub fn read_events_no_consensus() -> Vec<EventRecord<T::Event, T::Hash>> {
+		Events::<T>::get()
+	}
+
 	/// Set the block number to something in particular. Can be used as an alternative to
 	/// `initialize` for tests that don't need to bother with the other environment entries.
 	#[cfg(any(feature = "std", feature = "runtime-benchmarks", test))]

From 831a95de97b1a556d9ac22feb2ab7232120c00fa Mon Sep 17 00:00:00 2001
From: Joshy Orndorff <JoshOrndorff@users.noreply.github.com>
Date: Thu, 26 Aug 2021 12:24:14 -0400
Subject: [PATCH 1120/1194] remove crate visibility limitation (#9565)

---
 frame/democracy/src/types.rs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/frame/democracy/src/types.rs b/frame/democracy/src/types.rs
index 4e643006e516..5c4002a46dd3 100644
--- a/frame/democracy/src/types.rs
+++ b/frame/democracy/src/types.rs
@@ -28,20 +28,20 @@ use sp_runtime::{
 #[derive(Encode, Decode, Default, Clone, PartialEq, Eq, RuntimeDebug)]
 pub struct Tally<Balance> {
 	/// The number of aye votes, expressed in terms of post-conviction lock-vote.
-	pub(crate) ayes: Balance,
+	pub ayes: Balance,
 	/// The number of nay votes, expressed in terms of post-conviction lock-vote.
-	pub(crate) nays: Balance,
+	pub nays: Balance,
 	/// The amount of funds currently expressing its opinion. Pre-conviction.
-	pub(crate) turnout: Balance,
+	pub turnout: Balance,
 }
 
 /// Amount of votes and capital placed in delegation for an account.
 #[derive(Encode, Decode, Default, Copy, Clone, PartialEq, Eq, RuntimeDebug)]
 pub struct Delegations<Balance> {
 	/// The number of votes (this is post-conviction).
-	pub(crate) votes: Balance,
+	pub votes: Balance,
 	/// The amount of raw capital, used for the turnout.
-	pub(crate) capital: Balance,
+	pub capital: Balance,
 }
 
 impl<Balance: Saturating> Saturating for Delegations<Balance> {
@@ -162,15 +162,15 @@ impl<
 #[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug)]
 pub struct ReferendumStatus<BlockNumber, Hash, Balance> {
 	/// When voting on this referendum will end.
-	pub(crate) end: BlockNumber,
+	pub end: BlockNumber,
 	/// The hash of the proposal being voted on.
-	pub(crate) proposal_hash: Hash,
+	pub proposal_hash: Hash,
 	/// The thresholding mechanism to determine whether it passed.
-	pub(crate) threshold: VoteThreshold,
+	pub threshold: VoteThreshold,
 	/// The delay (in blocks) to wait after a successful referendum before deploying.
-	pub(crate) delay: BlockNumber,
+	pub delay: BlockNumber,
 	/// The current tally of votes in this referendum.
-	pub(crate) tally: Tally<Balance>,
+	pub tally: Tally<Balance>,
 }
 
 /// Info regarding a referendum, present or past.

From 111e6c6770d8678ddc2ec2ebe2ddabec65117b65 Mon Sep 17 00:00:00 2001
From: "Karel L. Kubat" <k.l.kubat@gmail.com>
Date: Fri, 27 Aug 2021 03:44:39 +0200
Subject: [PATCH 1121/1194] =?UTF-8?q?implement=20Add,=20Sub,=20CheckedAdd,?=
 =?UTF-8?q?=20CheckedSub,=20SaturatingAdd,=20Saturating=E2=80=A6=20(#9594)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* implement Add, Sub, CheckedAdd, CheckedSub, SaturatingAdd, SaturatingSub for Perthings

* ifx inner >= max bug

* move arithmetic impl to main macro block

* implement CheckedMul for Perthings

* incorporate feedback

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 primitives/arithmetic/src/per_things.rs | 170 +++++++++++++++++++++++-
 1 file changed, 167 insertions(+), 3 deletions(-)

diff --git a/primitives/arithmetic/src/per_things.rs b/primitives/arithmetic/src/per_things.rs
index 7fbf6bed3f5a..59c7f36d0fa3 100644
--- a/primitives/arithmetic/src/per_things.rs
+++ b/primitives/arithmetic/src/per_things.rs
@@ -19,15 +19,16 @@
 use serde::{Deserialize, Serialize};
 
 use crate::traits::{
-	BaseArithmetic, Bounded, One, SaturatedConversion, Saturating, UniqueSaturatedInto, Unsigned,
-	Zero,
+	BaseArithmetic, Bounded, CheckedAdd, CheckedMul, CheckedSub, One, SaturatedConversion,
+	Saturating, UniqueSaturatedInto, Unsigned, Zero,
 };
 use codec::{CompactAs, Encode};
-use num_traits::Pow;
+use num_traits::{Pow, SaturatingAdd, SaturatingSub};
 use sp_debug_derive::RuntimeDebug;
 use sp_std::{
 	convert::{TryFrom, TryInto},
 	fmt, ops,
+	ops::{Add, Sub},
 	prelude::*,
 };
 
@@ -768,6 +769,69 @@ macro_rules! implement_per_thing {
 			}
 		}
 
+		impl Add<Self> for $name {
+			type Output = $name;
+
+			#[inline]
+			fn add(self, rhs: Self) -> Self::Output {
+				let inner = self.deconstruct().add(rhs.deconstruct());
+				debug_assert!(inner < $max);
+				$name::from_parts(inner)
+			}
+		}
+
+		impl CheckedAdd for $name {
+			// For PerU16, $max == u16::MAX, so we need this `allow`.
+			#[allow(unused_comparisons)]
+			#[inline]
+			fn checked_add(&self, rhs: &Self) -> Option<Self> {
+				self.deconstruct()
+					.checked_add(rhs.deconstruct())
+					.map(|inner| if inner > $max { None } else { Some($name::from_parts(inner)) })
+					.flatten()
+			}
+		}
+
+		impl Sub<Self> for $name {
+			type Output = $name;
+
+			#[inline]
+			fn sub(self, rhs: Self) -> Self::Output {
+				$name::from_parts(self.deconstruct().sub(rhs.deconstruct()))
+			}
+		}
+
+		impl CheckedSub for $name {
+			#[inline]
+			fn checked_sub(&self, v: &Self) -> Option<Self> {
+				self.deconstruct().checked_sub(v.deconstruct()).map($name::from_parts)
+			}
+		}
+
+		impl SaturatingAdd for $name {
+			#[inline]
+			fn saturating_add(&self, v: &Self) -> Self {
+				$name::from_parts(self.deconstruct().saturating_add(v.deconstruct()))
+			}
+		}
+
+		impl SaturatingSub for $name {
+			#[inline]
+			fn saturating_sub(&self, v: &Self) -> Self {
+				$name::from_parts(self.deconstruct().saturating_sub(v.deconstruct()))
+			}
+		}
+
+		/// # Note
+		/// CheckedMul will never fail for PerThings.
+		impl CheckedMul for $name {
+			#[inline]
+			fn checked_mul(&self, rhs: &Self) -> Option<Self> {
+				Some(*self * *rhs)
+			}
+		}
+
+
 		#[cfg(test)]
 		mod $test_mod {
 			use codec::{Encode, Decode};
@@ -1354,6 +1418,106 @@ macro_rules! implement_per_thing {
 				assert_eq!((p.0).0, $max);
 				assert_eq!($name::from(p), $name::max_value());
 			}
+
+			#[allow(unused_imports)]
+			use super::*;
+
+			#[test]
+			fn test_add_basic() {
+				assert_eq!($name::from_parts(1) + $name::from_parts(1), $name::from_parts(2));
+				assert_eq!($name::from_parts(10) + $name::from_parts(10), $name::from_parts(20));
+			}
+
+			#[test]
+			fn test_basic_checked_add() {
+				assert_eq!(
+					$name::from_parts(1).checked_add(&$name::from_parts(1)),
+					Some($name::from_parts(2))
+				);
+				assert_eq!(
+					$name::from_parts(10).checked_add(&$name::from_parts(10)),
+					Some($name::from_parts(20))
+				);
+				assert_eq!(
+					$name::from_parts(<$type>::MAX).checked_add(&$name::from_parts(<$type>::MAX)),
+					None
+				);
+				assert_eq!(
+					$name::from_parts($max).checked_add(&$name::from_parts(1)),
+					None
+				);
+			}
+
+			#[test]
+			fn test_basic_saturating_add() {
+				assert_eq!(
+					$name::from_parts(1).saturating_add($name::from_parts(1)),
+					$name::from_parts(2)
+				);
+				assert_eq!(
+					$name::from_parts(10).saturating_add($name::from_parts(10)),
+					$name::from_parts(20)
+				);
+				assert_eq!(
+					$name::from_parts(<$type>::MAX).saturating_add($name::from_parts(<$type>::MAX)),
+					$name::from_parts(<$type>::MAX)
+				);
+			}
+
+			#[test]
+			fn test_basic_sub() {
+				assert_eq!($name::from_parts(2) - $name::from_parts(1), $name::from_parts(1));
+				assert_eq!($name::from_parts(20) - $name::from_parts(10), $name::from_parts(10));
+			}
+
+			#[test]
+			fn test_basic_checked_sub() {
+				assert_eq!(
+					$name::from_parts(2).checked_sub(&$name::from_parts(1)),
+					Some($name::from_parts(1))
+				);
+				assert_eq!(
+					$name::from_parts(20).checked_sub(&$name::from_parts(10)),
+					Some($name::from_parts(10))
+				);
+				assert_eq!($name::from_parts(0).checked_sub(&$name::from_parts(1)), None);
+			}
+
+			#[test]
+			fn test_basic_saturating_sub() {
+				assert_eq!(
+					$name::from_parts(2).saturating_sub($name::from_parts(1)),
+					$name::from_parts(1)
+				);
+				assert_eq!(
+					$name::from_parts(20).saturating_sub($name::from_parts(10)),
+					$name::from_parts(10)
+				);
+				assert_eq!(
+					$name::from_parts(0).saturating_sub($name::from_parts(1)),
+					$name::from_parts(0)
+				);
+			}
+
+			#[test]
+			fn test_basic_checked_mul() {
+				assert_eq!(
+					$name::from_parts($max).checked_mul(&$name::from_parts($max)),
+					Some($name::from_percent(100))
+				);
+				assert_eq!(
+					$name::from_percent(100).checked_mul(&$name::from_percent(100)),
+					Some($name::from_percent(100))
+				);
+				assert_eq!(
+					$name::from_percent(50).checked_mul(&$name::from_percent(26)),
+					Some($name::from_percent(13))
+				);
+				assert_eq!(
+					$name::from_percent(0).checked_mul(&$name::from_percent(0)),
+					Some($name::from_percent(0))
+				);
+			}
 		}
 	};
 }

From ae70e6e15b0e371abbe8b75035f25d85a4a9cf99 Mon Sep 17 00:00:00 2001
From: Qinxuan Chen <koushiro.cqx@gmail.com>
Date: Fri, 27 Aug 2021 13:50:36 +0800
Subject: [PATCH 1122/1194] rpc-api: use thiserror instead of derive_more for
 error handling (#9631)

Signed-off-by: koushiro <koushiro.cqx@gmail.com>
---
 Cargo.lock                           |  2 +-
 client/rpc-api/Cargo.toml            |  3 +-
 client/rpc-api/src/author/error.rs   | 41 ++++++++++------------------
 client/rpc-api/src/chain/error.rs    | 16 +++--------
 client/rpc-api/src/offchain/error.rs | 16 +++--------
 client/rpc-api/src/state/error.rs    | 22 +++++----------
 client/rpc-api/src/system/error.rs   |  7 ++---
 client/rpc/src/chain/mod.rs          |  6 ++--
 8 files changed, 39 insertions(+), 74 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e883ba8c606e..a613b7ba0368 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8095,7 +8095,6 @@ dependencies = [
 name = "sc-rpc-api"
 version = "0.10.0-dev"
 dependencies = [
- "derive_more",
  "futures 0.3.16",
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -8113,6 +8112,7 @@ dependencies = [
  "sp-runtime",
  "sp-tracing",
  "sp-version",
+ "thiserror",
 ]
 
 [[package]]
diff --git a/client/rpc-api/Cargo.toml b/client/rpc-api/Cargo.toml
index b0d7c28b788e..86fd24c24e7f 100644
--- a/client/rpc-api/Cargo.toml
+++ b/client/rpc-api/Cargo.toml
@@ -14,7 +14,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-derive_more = "0.99.2"
 futures = "0.3.16"
 jsonrpc-core = "18.0.0"
 jsonrpc-core-client = "18.0.0"
@@ -22,6 +21,8 @@ jsonrpc-derive = "18.0.0"
 jsonrpc-pubsub = "18.0.0"
 log = "0.4.8"
 parking_lot = "0.11.1"
+thiserror = "1.0"
+
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 sp-version = { version = "4.0.0-dev", path = "../../primitives/version" }
 sp-runtime = { path = "../../primitives/runtime", version = "4.0.0-dev" }
diff --git a/client/rpc-api/src/author/error.rs b/client/rpc-api/src/author/error.rs
index 249c8df39518..c7e3ccffabbb 100644
--- a/client/rpc-api/src/author/error.rs
+++ b/client/rpc-api/src/author/error.rs
@@ -29,51 +29,38 @@ pub type Result<T> = std::result::Result<T, Error>;
 pub type FutureResult<T> = jsonrpc_core::BoxFuture<Result<T>>;
 
 /// Author RPC errors.
-#[derive(Debug, derive_more::Display, derive_more::From)]
+#[derive(Debug, thiserror::Error)]
 pub enum Error {
 	/// Client error.
-	#[display(fmt = "Client error: {}", _0)]
-	#[from(ignore)]
+	#[error("Client error: {}", .0)]
 	Client(Box<dyn std::error::Error + Send>),
 	/// Transaction pool error,
-	#[display(fmt = "Transaction pool error: {}", _0)]
-	Pool(sc_transaction_pool_api::error::Error),
+	#[error("Transaction pool error: {}", .0)]
+	Pool(#[from] sc_transaction_pool_api::error::Error),
 	/// Verification error
-	#[display(fmt = "Extrinsic verification error: {}", _0)]
-	#[from(ignore)]
+	#[error("Extrinsic verification error: {}", .0)]
 	Verification(Box<dyn std::error::Error + Send>),
 	/// Incorrect extrinsic format.
-	#[display(fmt = "Invalid extrinsic format: {}", _0)]
-	BadFormat(codec::Error),
+	#[error("Invalid extrinsic format: {}", .0)]
+	BadFormat(#[from] codec::Error),
 	/// Incorrect seed phrase.
-	#[display(fmt = "Invalid seed phrase/SURI")]
+	#[error("Invalid seed phrase/SURI")]
 	BadSeedPhrase,
 	/// Key type ID has an unknown format.
-	#[display(fmt = "Invalid key type ID format (should be of length four)")]
+	#[error("Invalid key type ID format (should be of length four)")]
 	BadKeyType,
 	/// Key type ID has some unsupported crypto.
-	#[display(fmt = "The crypto of key type ID is unknown")]
+	#[error("The crypto of key type ID is unknown")]
 	UnsupportedKeyType,
 	/// Some random issue with the key store. Shouldn't happen.
-	#[display(fmt = "The key store is unavailable")]
+	#[error("The key store is unavailable")]
 	KeyStoreUnavailable,
 	/// Invalid session keys encoding.
-	#[display(fmt = "Session keys are not encoded correctly")]
+	#[error("Session keys are not encoded correctly")]
 	InvalidSessionKeys,
 	/// Call to an unsafe RPC was denied.
-	UnsafeRpcCalled(crate::policy::UnsafeRpcError),
-}
-
-impl std::error::Error for Error {
-	fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
-		match self {
-			Error::Client(ref err) => Some(&**err),
-			Error::Pool(ref err) => Some(err),
-			Error::Verification(ref err) => Some(&**err),
-			Error::UnsafeRpcCalled(ref err) => Some(err),
-			_ => None,
-		}
-	}
+	#[error(transparent)]
+	UnsafeRpcCalled(#[from] crate::policy::UnsafeRpcError),
 }
 
 /// Base code for all authorship errors.
diff --git a/client/rpc-api/src/chain/error.rs b/client/rpc-api/src/chain/error.rs
index b1ce800d2731..c7f14b2dfc16 100644
--- a/client/rpc-api/src/chain/error.rs
+++ b/client/rpc-api/src/chain/error.rs
@@ -28,24 +28,16 @@ pub type Result<T> = std::result::Result<T, Error>;
 pub type FutureResult<T> = jsonrpc_core::BoxFuture<Result<T>>;
 
 /// Chain RPC errors.
-#[derive(Debug, derive_more::Display, derive_more::From)]
+#[derive(Debug, thiserror::Error)]
 pub enum Error {
 	/// Client error.
-	#[display(fmt = "Client error: {}", _0)]
-	Client(Box<dyn std::error::Error + Send>),
+	#[error("Client error: {}", .0)]
+	Client(#[from] Box<dyn std::error::Error + Send>),
 	/// Other error type.
+	#[error("{0}")]
 	Other(String),
 }
 
-impl std::error::Error for Error {
-	fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
-		match self {
-			Error::Client(ref err) => Some(&**err),
-			_ => None,
-		}
-	}
-}
-
 /// Base error code for all chain errors.
 const BASE_ERROR: i64 = 3000;
 
diff --git a/client/rpc-api/src/offchain/error.rs b/client/rpc-api/src/offchain/error.rs
index f2567707bc5f..6b8e2bfe189b 100644
--- a/client/rpc-api/src/offchain/error.rs
+++ b/client/rpc-api/src/offchain/error.rs
@@ -24,22 +24,14 @@ use jsonrpc_core as rpc;
 pub type Result<T> = std::result::Result<T, Error>;
 
 /// Offchain RPC errors.
-#[derive(Debug, derive_more::Display, derive_more::From)]
+#[derive(Debug, thiserror::Error)]
 pub enum Error {
 	/// Unavailable storage kind error.
-	#[display(fmt = "This storage kind is not available yet.")]
+	#[error("This storage kind is not available yet.")]
 	UnavailableStorageKind,
 	/// Call to an unsafe RPC was denied.
-	UnsafeRpcCalled(crate::policy::UnsafeRpcError),
-}
-
-impl std::error::Error for Error {
-	fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
-		match self {
-			Self::UnsafeRpcCalled(err) => Some(err),
-			_ => None,
-		}
-	}
+	#[error(transparent)]
+	UnsafeRpcCalled(#[from] crate::policy::UnsafeRpcError),
 }
 
 /// Base error code for all offchain errors.
diff --git a/client/rpc-api/src/state/error.rs b/client/rpc-api/src/state/error.rs
index e30757f0dd39..d70086347632 100644
--- a/client/rpc-api/src/state/error.rs
+++ b/client/rpc-api/src/state/error.rs
@@ -28,13 +28,13 @@ pub type Result<T> = std::result::Result<T, Error>;
 pub type FutureResult<T> = jsonrpc_core::BoxFuture<Result<T>>;
 
 /// State RPC errors.
-#[derive(Debug, derive_more::Display, derive_more::From)]
+#[derive(Debug, thiserror::Error)]
 pub enum Error {
 	/// Client error.
-	#[display(fmt = "Client error: {}", _0)]
-	Client(Box<dyn std::error::Error + Send>),
+	#[error("Client error: {}", .0)]
+	Client(#[from] Box<dyn std::error::Error + Send>),
 	/// Provided block range couldn't be resolved to a list of blocks.
-	#[display(fmt = "Cannot resolve a block range ['{:?}' ... '{:?}]. {}", from, to, details)]
+	#[error("Cannot resolve a block range ['{:?}' ... '{:?}]. {}", .from, .to, .details)]
 	InvalidBlockRange {
 		/// Beginning of the block range.
 		from: String,
@@ -44,7 +44,7 @@ pub enum Error {
 		details: String,
 	},
 	/// Provided count exceeds maximum value.
-	#[display(fmt = "count exceeds maximum value. value: {}, max: {}", value, max)]
+	#[error("count exceeds maximum value. value: {}, max: {}", .value, .max)]
 	InvalidCount {
 		/// Provided value
 		value: u32,
@@ -52,16 +52,8 @@ pub enum Error {
 		max: u32,
 	},
 	/// Call to an unsafe RPC was denied.
-	UnsafeRpcCalled(crate::policy::UnsafeRpcError),
-}
-
-impl std::error::Error for Error {
-	fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
-		match self {
-			Error::Client(ref err) => Some(&**err),
-			_ => None,
-		}
-	}
+	#[error(transparent)]
+	UnsafeRpcCalled(#[from] crate::policy::UnsafeRpcError),
 }
 
 /// Base code for all state errors.
diff --git a/client/rpc-api/src/system/error.rs b/client/rpc-api/src/system/error.rs
index b16a7abb6ea5..4ba5125d82bc 100644
--- a/client/rpc-api/src/system/error.rs
+++ b/client/rpc-api/src/system/error.rs
@@ -25,17 +25,16 @@ use jsonrpc_core as rpc;
 pub type Result<T> = std::result::Result<T, Error>;
 
 /// System RPC errors.
-#[derive(Debug, derive_more::Display, derive_more::From)]
+#[derive(Debug, thiserror::Error)]
 pub enum Error {
 	/// Provided block range couldn't be resolved to a list of blocks.
-	#[display(fmt = "Node is not fully functional: {}", _0)]
+	#[error("Node is not fully functional: {}", .0)]
 	NotHealthy(Health),
 	/// Peer argument is malformatted.
+	#[error("{0}")]
 	MalformattedPeerArg(String),
 }
 
-impl std::error::Error for Error {}
-
 /// Base code for all system errors.
 const BASE_ERROR: i64 = 2000;
 
diff --git a/client/rpc/src/chain/mod.rs b/client/rpc/src/chain/mod.rs
index 8685b3f93c4e..a06c3a094b40 100644
--- a/client/rpc/src/chain/mod.rs
+++ b/client/rpc/src/chain/mod.rs
@@ -87,7 +87,7 @@ where
 
 				// FIXME <2329>: Database seems to limit the block number to u32 for no reason
 				let block_num: u32 = num_or_hex.try_into().map_err(|_| {
-					Error::from(format!(
+					Error::Other(format!(
 						"`{:?}` > u32::MAX, the max block number is u32.",
 						num_or_hex
 					))
@@ -332,7 +332,9 @@ fn subscribe_headers<Block, Client, F, G, S>(
 		let header = client
 			.header(BlockId::Hash(best_block_hash()))
 			.map_err(client_err)
-			.and_then(|header| header.ok_or_else(|| "Best header missing.".to_string().into()))
+			.and_then(|header| {
+				header.ok_or_else(|| Error::Other("Best header missing.".to_string()))
+			})
 			.map_err(Into::into);
 
 		// send further subscriptions

From 70a3bca00d95efea0bd37f7db04044a633e34943 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Fri, 27 Aug 2021 15:07:26 +0200
Subject: [PATCH 1123/1194] fix perthing add (#9638)

---
 primitives/arithmetic/src/per_things.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/primitives/arithmetic/src/per_things.rs b/primitives/arithmetic/src/per_things.rs
index 59c7f36d0fa3..f9c048e55b6f 100644
--- a/primitives/arithmetic/src/per_things.rs
+++ b/primitives/arithmetic/src/per_things.rs
@@ -772,10 +772,12 @@ macro_rules! implement_per_thing {
 		impl Add<Self> for $name {
 			type Output = $name;
 
+			// For PerU16, $max == u16::MAX, so we need this `allow`.
+			#[allow(unused_comparisons)]
 			#[inline]
 			fn add(self, rhs: Self) -> Self::Output {
 				let inner = self.deconstruct().add(rhs.deconstruct());
-				debug_assert!(inner < $max);
+				debug_assert!(inner <= $max);
 				$name::from_parts(inner)
 			}
 		}

From f7b6dca4200069b5100da46e5ab748bc6f04517f Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Fri, 27 Aug 2021 15:43:01 +0200
Subject: [PATCH 1124/1194] Fix benchmark writer (#9626)

* fix benchmark writer

* update doc to show the more general implementation
---
 utils/frame/benchmarking-cli/src/writer.rs | 23 ++++------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/utils/frame/benchmarking-cli/src/writer.rs b/utils/frame/benchmarking-cli/src/writer.rs
index b6b97f251774..ede5b2d1355a 100644
--- a/utils/frame/benchmarking-cli/src/writer.rs
+++ b/utils/frame/benchmarking-cli/src/writer.rs
@@ -107,7 +107,7 @@ fn io_error(s: &str) -> std::io::Error {
 }
 
 // This function takes a list of `BenchmarkBatch` and organizes them by pallet into a `HashMap`.
-// So this: `[(p1, b1), (p1, b2), (p1, b3), (p2, b1), (p2, b2)]`
+// So this: `[(p1, b1), (p1, b2), (p2, b1), (p1, b3), (p2, b2)]`
 // Becomes:
 //
 // ```
@@ -124,11 +124,9 @@ fn map_results(
 		return Err(io_error("empty batches"))
 	}
 
-	let mut all_benchmarks = HashMap::new();
-	let mut pallet_benchmarks = Vec::new();
+	let mut all_benchmarks = HashMap::<_, Vec<BenchmarkData>>::new();
 
-	let mut batches_iter = batches.iter().peekable();
-	while let Some(batch) = batches_iter.next() {
+	for batch in batches {
 		// Skip if there are no results
 		if batch.time_results.is_empty() {
 			continue
@@ -137,21 +135,8 @@ fn map_results(
 		let pallet_string = String::from_utf8(batch.pallet.clone()).unwrap();
 		let instance_string = String::from_utf8(batch.instance.clone()).unwrap();
 		let benchmark_data = get_benchmark_data(batch, storage_info, analysis_choice);
+		let pallet_benchmarks = all_benchmarks.entry((pallet_string, instance_string)).or_default();
 		pallet_benchmarks.push(benchmark_data);
-
-		// Check if this is the end of the iterator
-		if let Some(next) = batches_iter.peek() {
-			// Next pallet is different than current pallet, save and create new data.
-			let next_pallet = String::from_utf8(next.pallet.clone()).unwrap();
-			let next_instance = String::from_utf8(next.instance.clone()).unwrap();
-			if next_pallet != pallet_string || next_instance != instance_string {
-				all_benchmarks.insert((pallet_string, instance_string), pallet_benchmarks.clone());
-				pallet_benchmarks = Vec::new();
-			}
-		} else {
-			// This is the end of the iterator, so push the final data.
-			all_benchmarks.insert((pallet_string, instance_string), pallet_benchmarks.clone());
-		}
 	}
 	Ok(all_benchmarks)
 }

From ecf32b90dff013082b80b19f720dc3e9a473daaa Mon Sep 17 00:00:00 2001
From: Xiliang Chen <xlchen1291@gmail.com>
Date: Sun, 29 Aug 2021 18:43:50 +1200
Subject: [PATCH 1125/1194] improve decode for UncheckedExtrinsic (#9646)

* improve decode for UncheckedExtrinsic

* fmt
---
 .../runtime/src/generic/unchecked_extrinsic.rs      | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/primitives/runtime/src/generic/unchecked_extrinsic.rs b/primitives/runtime/src/generic/unchecked_extrinsic.rs
index 9f50ab35b33a..f0e00b7b8297 100644
--- a/primitives/runtime/src/generic/unchecked_extrinsic.rs
+++ b/primitives/runtime/src/generic/unchecked_extrinsic.rs
@@ -26,7 +26,7 @@ use crate::{
 	transaction_validity::{InvalidTransaction, TransactionValidityError},
 	OpaqueExtrinsic,
 };
-use codec::{Decode, Encode, EncodeLike, Error, Input};
+use codec::{Compact, Decode, Encode, EncodeLike, Error, Input};
 use sp_io::hashing::blake2_256;
 use sp_std::{fmt, prelude::*};
 
@@ -203,7 +203,7 @@ where
 		// with substrate's generic `Vec<u8>` type. Basically this just means accepting that there
 		// will be a prefix of vector length (we don't need
 		// to use this).
-		let _length_do_not_remove_me_see_above: Vec<()> = Decode::decode(input)?;
+		let _length_do_not_remove_me_see_above: Compact<u32> = Decode::decode(input)?;
 
 		let version = input.read_byte()?;
 
@@ -446,4 +446,13 @@ mod tests {
 		let opaque_encoded = opaque.encode();
 		assert_eq!(opaque_encoded, encoded);
 	}
+
+	#[test]
+	fn large_bad_prefix_should_work() {
+		let encoded = Compact::<u32>::from(u32::MAX).encode();
+		assert_eq!(
+			Ex::decode(&mut &encoded[..]),
+			Err(Error::from("Not enough data to fill buffer"))
+		);
+	}
 }

From d6847a740e3972c76ca72fc8eef56380be928ab9 Mon Sep 17 00:00:00 2001
From: Georges <georges.dib@gmail.com>
Date: Mon, 30 Aug 2021 07:11:59 +0100
Subject: [PATCH 1126/1194] Generate storage info for pallet
 authority_discovery (#9428)

* Migrate Aura pallet to BoundedVec

Implementing issue #8629

* Fixed aura tests after BoundedVec change

* Moved Vec to BoundedVec in authority-discovery

* Merging into the main branch

* Added MaxEncodedLen to crypto

Need this without full_crypto to be able to add generate_store_info

* Add generate_store_info for aura

* Adding changes to Slot to add MaxEncodedLen

* Adding generate_store_info to authority discovery

* fmt

* removing panics in runtime if vec size too large

* authority-discovery: Remove panics in runtime
Can happen if vec size is too large, so truncate the vec in that case

* Adding logging when I truncate Vecs

* Got the sign the other way around

* Reverting pallet_aura changes
This is already being addressed by PR #9371

* Change BoundedVec to WeakBoundedVec

More robust implementation following @thiolliere recommendation.

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 bin/node/runtime/src/lib.rs              |  5 +-
 frame/authority-discovery/src/lib.rs     | 74 ++++++++++++++++++------
 primitives/application-crypto/src/lib.rs |  1 +
 primitives/consensus/slots/src/lib.rs    |  4 +-
 4 files changed, 63 insertions(+), 21 deletions(-)

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 909ff931756a..5eea93101b6c 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -883,6 +883,7 @@ parameter_types! {
 	pub const ImOnlineUnsignedPriority: TransactionPriority = TransactionPriority::max_value();
 	/// We prioritize im-online heartbeats over election solution submission.
 	pub const StakingUnsignedPriority: TransactionPriority = TransactionPriority::max_value() / 2;
+	pub const MaxAuthorities: u32 = 100;
 }
 
 impl<LocalCall> frame_system::offchain::CreateSignedTransaction<LocalCall> for Runtime
@@ -955,7 +956,9 @@ impl pallet_offences::Config for Runtime {
 	type OnOffenceHandler = Staking;
 }
 
-impl pallet_authority_discovery::Config for Runtime {}
+impl pallet_authority_discovery::Config for Runtime {
+	type MaxAuthorities = MaxAuthorities;
+}
 
 impl pallet_grandpa::Config for Runtime {
 	type Event = Event;
diff --git a/frame/authority-discovery/src/lib.rs b/frame/authority-discovery/src/lib.rs
index 4577a9dd1722..d093b1533c69 100644
--- a/frame/authority-discovery/src/lib.rs
+++ b/frame/authority-discovery/src/lib.rs
@@ -23,10 +23,15 @@
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use frame_support::traits::OneSessionHandler;
+use frame_support::{
+	traits::{Get, OneSessionHandler},
+	WeakBoundedVec,
+};
 use sp_authority_discovery::AuthorityId;
 use sp_std::prelude::*;
 
+use core::convert::TryFrom;
+
 pub use pallet::*;
 
 #[frame_support::pallet]
@@ -36,21 +41,27 @@ pub mod pallet {
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::generate_storage_info]
 	pub struct Pallet<T>(_);
 
 	#[pallet::config]
 	/// The pallet's config trait.
-	pub trait Config: frame_system::Config + pallet_session::Config {}
+	pub trait Config: frame_system::Config + pallet_session::Config {
+		/// The maximum number of authorities that can be added.
+		type MaxAuthorities: Get<u32>;
+	}
 
 	#[pallet::storage]
 	#[pallet::getter(fn keys)]
 	/// Keys of the current authority set.
-	pub(super) type Keys<T: Config> = StorageValue<_, Vec<AuthorityId>, ValueQuery>;
+	pub(super) type Keys<T: Config> =
+		StorageValue<_, WeakBoundedVec<AuthorityId, T::MaxAuthorities>, ValueQuery>;
 
 	#[pallet::storage]
 	#[pallet::getter(fn next_keys)]
 	/// Keys of the next authority set.
-	pub(super) type NextKeys<T: Config> = StorageValue<_, Vec<AuthorityId>, ValueQuery>;
+	pub(super) type NextKeys<T: Config> =
+		StorageValue<_, WeakBoundedVec<AuthorityId, T::MaxAuthorities>, ValueQuery>;
 
 	#[pallet::genesis_config]
 	pub struct GenesisConfig {
@@ -75,31 +86,36 @@ impl<T: Config> Pallet<T> {
 	/// Retrieve authority identifiers of the current and next authority set
 	/// sorted and deduplicated.
 	pub fn authorities() -> Vec<AuthorityId> {
-		let mut keys = Keys::<T>::get();
-		let next = NextKeys::<T>::get();
+		let mut keys = Keys::<T>::get().to_vec();
+		let next = NextKeys::<T>::get().to_vec();
 
 		keys.extend(next);
 		keys.sort();
 		keys.dedup();
 
-		keys
+		keys.to_vec()
 	}
 
 	/// Retrieve authority identifiers of the current authority set in the original order.
-	pub fn current_authorities() -> Vec<AuthorityId> {
+	pub fn current_authorities() -> WeakBoundedVec<AuthorityId, T::MaxAuthorities> {
 		Keys::<T>::get()
 	}
 
 	/// Retrieve authority identifiers of the next authority set in the original order.
-	pub fn next_authorities() -> Vec<AuthorityId> {
+	pub fn next_authorities() -> WeakBoundedVec<AuthorityId, T::MaxAuthorities> {
 		NextKeys::<T>::get()
 	}
 
-	fn initialize_keys(keys: &[AuthorityId]) {
+	fn initialize_keys(keys: &Vec<AuthorityId>) {
 		if !keys.is_empty() {
 			assert!(Keys::<T>::get().is_empty(), "Keys are already initialized!");
-			Keys::<T>::put(keys);
-			NextKeys::<T>::put(keys);
+
+			let bounded_keys =
+				WeakBoundedVec::<AuthorityId, T::MaxAuthorities>::try_from((*keys).clone())
+					.expect("Keys vec too big");
+
+			Keys::<T>::put(&bounded_keys);
+			NextKeys::<T>::put(&bounded_keys);
 		}
 	}
 }
@@ -124,10 +140,29 @@ impl<T: Config> OneSessionHandler<T::AccountId> for Pallet<T> {
 	{
 		// Remember who the authorities are for the new and next session.
 		if changed {
-			let keys = validators.map(|x| x.1);
-			Keys::<T>::put(keys.collect::<Vec<_>>());
-			let next_keys = queued_validators.map(|x| x.1);
-			NextKeys::<T>::put(next_keys.collect::<Vec<_>>());
+			let keys = validators.map(|x| x.1).collect::<Vec<_>>();
+
+			let bounded_keys = WeakBoundedVec::<_, T::MaxAuthorities>::force_from(
+				keys,
+				Some(
+					"Warning: The session has more validators than expected. \
+				A runtime configuration adjustment may be needed.",
+				),
+			);
+
+			Keys::<T>::put(bounded_keys);
+
+			let next_keys = queued_validators.map(|x| x.1).collect::<Vec<_>>();
+
+			let next_bounded_keys = WeakBoundedVec::<_, T::MaxAuthorities>::force_from(
+				next_keys,
+				Some(
+					"Warning: The session has more queued validators than expected. \
+				A runtime configuration adjustment may be needed.",
+				),
+			);
+
+			NextKeys::<T>::put(next_bounded_keys);
 		}
 	}
 
@@ -166,10 +201,13 @@ mod tests {
 		}
 	);
 
-	impl Config for Test {}
-
 	parameter_types! {
 		pub const DisabledValidatorsThreshold: Perbill = Perbill::from_percent(33);
+		pub const MaxAuthorities: u32 = 100;
+	}
+
+	impl Config for Test {
+		type MaxAuthorities = MaxAuthorities;
 	}
 
 	impl pallet_session::Config for Test {
diff --git a/primitives/application-crypto/src/lib.rs b/primitives/application-crypto/src/lib.rs
index 95b8c1f11f80..43a14e29f4ee 100644
--- a/primitives/application-crypto/src/lib.rs
+++ b/primitives/application-crypto/src/lib.rs
@@ -259,6 +259,7 @@ macro_rules! app_crypto_public_not_full_crypto {
 				$crate::codec::Encode,
 				$crate::codec::Decode,
 				$crate::RuntimeDebug,
+				$crate::codec::MaxEncodedLen,
 			)]
 			pub struct Public($public);
 		}
diff --git a/primitives/consensus/slots/src/lib.rs b/primitives/consensus/slots/src/lib.rs
index 545d18af1f9b..0b66ac8c9cb6 100644
--- a/primitives/consensus/slots/src/lib.rs
+++ b/primitives/consensus/slots/src/lib.rs
@@ -19,10 +19,10 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use codec::{Decode, Encode};
+use codec::{Decode, Encode, MaxEncodedLen};
 
 /// Unit type wrapper that represents a slot.
-#[derive(Debug, Encode, Decode, Eq, Clone, Copy, Default, Ord)]
+#[derive(Debug, Encode, MaxEncodedLen, Decode, Eq, Clone, Copy, Default, Ord)]
 pub struct Slot(u64);
 
 impl core::ops::Deref for Slot {

From 864d096214cbde236f1ced7fdf4017ac22f5e5f5 Mon Sep 17 00:00:00 2001
From: Qinxuan Chen <koushiro.cqx@gmail.com>
Date: Mon, 30 Aug 2021 19:52:26 +0800
Subject: [PATCH 1127/1194] Add methods param for RPC `state_traceBlock`
 (#9642)

* Add methods param for RPC state_traceBlock

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* rename event_values_filter arg

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* Add some doc

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* Add some doc

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* Fix doc

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* format

Signed-off-by: koushiro <koushiro.cqx@gmail.com>
---
 client/rpc-api/src/state/mod.rs     | 47 +++++++++++++++++++++++++++--
 client/rpc/src/state/mod.rs         |  4 ++-
 client/rpc/src/state/state_full.rs  |  2 ++
 client/rpc/src/state/state_light.rs |  1 +
 client/tracing/src/block/mod.rs     | 19 +++++++++---
 primitives/rpc/src/tracing.rs       |  3 ++
 6 files changed, 68 insertions(+), 8 deletions(-)

diff --git a/client/rpc-api/src/state/mod.rs b/client/rpc-api/src/state/mod.rs
index 5b8e0ffc7afa..620a000c500f 100644
--- a/client/rpc-api/src/state/mod.rs
+++ b/client/rpc-api/src/state/mod.rs
@@ -222,17 +222,55 @@ pub trait StateApi<Hash> {
 	///
 	/// ### `curl` example
 	///
+	/// - Get tracing spans and events
 	/// ```text
 	/// curl \
 	/// 	-H "Content-Type: application/json" \
 	/// 	-d '{"id":1, "jsonrpc":"2.0", "method": "state_traceBlock", \
-	/// 		"params": ["0xb246acf1adea1f801ce15c77a5fa7d8f2eb8fed466978bcee172cc02cf64e264"]}' \
+	/// 		"params": ["0xb246acf1adea1f801ce15c77a5fa7d8f2eb8fed466978bcee172cc02cf64e264", "pallet,frame,state", "", ""]}' \
+	/// 	http://localhost:9933/
+	/// ```
+	///
+	/// - Get tracing events with all `storage_keys`
+	/// ```text
+	/// curl \
+	/// 	-H "Content-Type: application/json" \
+	/// 	-d '{"id":1, "jsonrpc":"2.0", "method": "state_traceBlock", \
+	/// 		"params": ["0xb246acf1adea1f801ce15c77a5fa7d8f2eb8fed466978bcee172cc02cf64e264", "state", "", ""]}' \
+	/// 	http://localhost:9933/
+	/// ```
+	///
+	/// - Get tracing events with `storage_keys` ('f0c365c3cf59d671eb72da0e7a4113c4')
+	/// ```text
+	/// curl \
+	/// 	-H "Content-Type: application/json" \
+	/// 	-d '{"id":1, "jsonrpc":"2.0", "method": "state_traceBlock", \
+	/// 		"params": ["0xb246acf1adea1f801ce15c77a5fa7d8f2eb8fed466978bcee172cc02cf64e264", "state", "f0c365c3cf59d671eb72da0e7a4113c4", ""]}' \
+	/// 	http://localhost:9933/
+	/// ```
+	///
+	/// - Get tracing events with `storage_keys` ('f0c365c3cf59d671eb72da0e7a4113c4') and method
+	///   ('Put')
+	/// ```text
+	/// curl \
+	/// 	-H "Content-Type: application/json" \
+	/// 	-d '{"id":1, "jsonrpc":"2.0", "method": "state_traceBlock", \
+	/// 		"params": ["0xb246acf1adea1f801ce15c77a5fa7d8f2eb8fed466978bcee172cc02cf64e264", "state", "f0c365c3cf59d671eb72da0e7a4113c4", "Put"]}' \
+	/// 	http://localhost:9933/
+	/// ```
+	///
+	/// - Get tracing events with all `storage_keys` and method ('Put')
+	/// ```text
+	/// curl \
+	/// 	-H "Content-Type: application/json" \
+	/// 	-d '{"id":1, "jsonrpc":"2.0", "method": "state_traceBlock", \
+	/// 		"params": ["0xb246acf1adea1f801ce15c77a5fa7d8f2eb8fed466978bcee172cc02cf64e264", "state", "", "Put"]}' \
 	/// 	http://localhost:9933/
 	/// ```
 	///
 	/// ### Params
 	///
-	/// - `block_hash` (param index 0): Hash of the block to trace.
+	/// - `block` (param index 0): Hash of the block to trace.
 	/// - `targets` (param index 1): String of comma separated (no spaces) targets. Specified
 	/// targets match with trace targets by prefix (i.e if a target is in the beginning
 	/// of a trace target it is considered a match). If an empty string is specified no
@@ -251,6 +289,10 @@ pub trait StateApi<Hash> {
 	/// which is a map from `AccountId` to `AccountInfo`. The key filter for this would be
 	/// the storage prefix for the map:
 	/// `26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da9`
+	/// - `methods` (param index 3): String of comma separated (no spaces) tracing event method.
+	/// If an empty string is specified no events will be filtered out. If anything other than
+	/// an empty string is specified, events will be filtered by method (so non-method events will
+	/// **not** show up).
 	///
 	/// Additionally you would want to track the extrinsic index, which is under the
 	/// `:extrinsic_index` key. The key for this would be the aforementioned string as bytes
@@ -277,5 +319,6 @@ pub trait StateApi<Hash> {
 		block: Hash,
 		targets: Option<String>,
 		storage_keys: Option<String>,
+		methods: Option<String>,
 	) -> FutureResult<sp_rpc::tracing::TraceBlockResponse>;
 }
diff --git a/client/rpc/src/state/mod.rs b/client/rpc/src/state/mod.rs
index 042225042d80..5413264de4d5 100644
--- a/client/rpc/src/state/mod.rs
+++ b/client/rpc/src/state/mod.rs
@@ -178,6 +178,7 @@ where
 		block: Block::Hash,
 		targets: Option<String>,
 		storage_keys: Option<String>,
+		methods: Option<String>,
 	) -> FutureResult<sp_rpc::tracing::TraceBlockResponse>;
 }
 
@@ -413,12 +414,13 @@ where
 		block: Block::Hash,
 		targets: Option<String>,
 		storage_keys: Option<String>,
+		methods: Option<String>,
 	) -> FutureResult<sp_rpc::tracing::TraceBlockResponse> {
 		if let Err(err) = self.deny_unsafe.check_if_safe() {
 			return async move { Err(err.into()) }.boxed()
 		}
 
-		self.backend.trace_block(block, targets, storage_keys)
+		self.backend.trace_block(block, targets, storage_keys, methods)
 	}
 }
 
diff --git a/client/rpc/src/state/state_full.rs b/client/rpc/src/state/state_full.rs
index 0d9a35fd26ec..54124ad95888 100644
--- a/client/rpc/src/state/state_full.rs
+++ b/client/rpc/src/state/state_full.rs
@@ -581,12 +581,14 @@ where
 		block: Block::Hash,
 		targets: Option<String>,
 		storage_keys: Option<String>,
+		methods: Option<String>,
 	) -> FutureResult<sp_rpc::tracing::TraceBlockResponse> {
 		let block_executor = sc_tracing::block::BlockExecutor::new(
 			self.client.clone(),
 			block,
 			targets,
 			storage_keys,
+			methods,
 			self.rpc_max_payload,
 		);
 		let r = block_executor
diff --git a/client/rpc/src/state/state_light.rs b/client/rpc/src/state/state_light.rs
index cdb3a77e8d70..b89b0638badd 100644
--- a/client/rpc/src/state/state_light.rs
+++ b/client/rpc/src/state/state_light.rs
@@ -449,6 +449,7 @@ where
 		_block: Block::Hash,
 		_targets: Option<String>,
 		_storage_keys: Option<String>,
+		_methods: Option<String>,
 	) -> FutureResult<sp_rpc::tracing::TraceBlockResponse> {
 		async move { Err(client_err(ClientError::NotAvailableOnLightClient)) }.boxed()
 	}
diff --git a/client/tracing/src/block/mod.rs b/client/tracing/src/block/mod.rs
index d439e70f8a0a..8280d4613a18 100644
--- a/client/tracing/src/block/mod.rs
+++ b/client/tracing/src/block/mod.rs
@@ -181,6 +181,7 @@ pub struct BlockExecutor<Block: BlockT, Client> {
 	block: Block::Hash,
 	targets: Option<String>,
 	storage_keys: Option<String>,
+	methods: Option<String>,
 	rpc_max_payload: usize,
 }
 
@@ -201,12 +202,13 @@ where
 		block: Block::Hash,
 		targets: Option<String>,
 		storage_keys: Option<String>,
+		methods: Option<String>,
 		rpc_max_payload: Option<usize>,
 	) -> Self {
 		let rpc_max_payload = rpc_max_payload
 			.map(|mb| mb.saturating_mul(MEGABYTE))
 			.unwrap_or(RPC_MAX_PAYLOAD_DEFAULT);
-		Self { client, block, targets, storage_keys, rpc_max_payload }
+		Self { client, block, targets, storage_keys, methods, rpc_max_payload }
 	}
 
 	/// Execute block, record all spans and events belonging to `Self::targets`
@@ -274,7 +276,13 @@ where
 			.filter(|e| {
 				self.storage_keys
 					.as_ref()
-					.map(|keys| event_key_filter(e, keys))
+					.map(|keys| event_values_filter(e, "key", keys))
+					.unwrap_or(false)
+			})
+			.filter(|e| {
+				self.methods
+					.as_ref()
+					.map(|methods| event_values_filter(e, "method", methods))
 					.unwrap_or(false)
 			})
 			.map(|s| s.into())
@@ -292,6 +300,7 @@ where
 				parent_hash: block_id_as_string(parent_id),
 				tracing_targets: targets.to_string(),
 				storage_keys: self.storage_keys.clone().unwrap_or_default(),
+				methods: self.methods.clone().unwrap_or_default(),
 				spans,
 				events,
 			})
@@ -301,12 +310,12 @@ where
 	}
 }
 
-fn event_key_filter(event: &TraceEvent, storage_keys: &str) -> bool {
+fn event_values_filter(event: &TraceEvent, filter_kind: &str, values: &str) -> bool {
 	event
 		.values
 		.string_values
-		.get("key")
-		.and_then(|key| Some(check_target(storage_keys, key, &event.level)))
+		.get(filter_kind)
+		.and_then(|value| Some(check_target(values, value, &event.level)))
 		.unwrap_or(false)
 }
 
diff --git a/primitives/rpc/src/tracing.rs b/primitives/rpc/src/tracing.rs
index 7e05cd84a7dd..737ace241037 100644
--- a/primitives/rpc/src/tracing.rs
+++ b/primitives/rpc/src/tracing.rs
@@ -35,6 +35,9 @@ pub struct BlockTrace {
 	/// Storage key targets used to filter out events that do not have one of the storage keys.
 	/// Empty string means do not filter out any events.
 	pub storage_keys: String,
+	/// Method targets used to filter out events that do not have one of the event method.
+	/// Empty string means do not filter out any events.
+	pub methods: String,
 	/// Vec of tracing spans
 	pub spans: Vec<Span>,
 	/// Vec of tracing events

From 856d0bd6f49fa42ecc3350761d055629d421da0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Tue, 31 Aug 2021 06:11:50 +0200
Subject: [PATCH 1128/1194] Fix compilation issue of pallet_contracts (#9652)

---
 frame/contracts/Cargo.toml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frame/contracts/Cargo.toml b/frame/contracts/Cargo.toml
index 98e8e92e3b9d..3498a77b8bfd 100644
--- a/frame/contracts/Cargo.toml
+++ b/frame/contracts/Cargo.toml
@@ -64,6 +64,7 @@ std = [
 	"sp-io/std",
 	"sp-std/std",
 	"sp-sandbox/std",
+	"frame-benchmarking/std",
 	"frame-support/std",
 	"frame-system/std",
 	"pwasm-utils/std",
@@ -71,6 +72,7 @@ std = [
 	"pallet-contracts-primitives/std",
 	"pallet-contracts-proc-macro/full",
 	"log/std",
+	"rand/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",

From b6e8afc69041888b31b7c19d414f2a55cd89b181 Mon Sep 17 00:00:00 2001
From: Nazar Mokrynskyi <nazar@mokrynskyi.com>
Date: Tue, 31 Aug 2021 07:13:41 +0300
Subject: [PATCH 1129/1194] Fix clippy warnings (#9649)

---
 primitives/api/proc-macro/src/decl_runtime_apis.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/primitives/api/proc-macro/src/decl_runtime_apis.rs b/primitives/api/proc-macro/src/decl_runtime_apis.rs
index bae7a40f8639..510a2eeaa530 100644
--- a/primitives/api/proc-macro/src/decl_runtime_apis.rs
+++ b/primitives/api/proc-macro/src/decl_runtime_apis.rs
@@ -183,7 +183,7 @@ fn generate_native_call_generators(decl: &ItemTrait) -> Result<TokenStream> {
 		{
 			<R as #crate_::DecodeLimit>::decode_with_depth_limit(
 				#crate_::MAX_EXTRINSIC_DEPTH,
-				&mut &#crate_::Encode::encode(input)[..],
+				&#crate_::Encode::encode(input)[..],
 			).map_err(map_error)
 		}
 	));
@@ -380,6 +380,7 @@ fn generate_call_api_at_calls(decl: &ItemTrait) -> Result<TokenStream> {
 		// Generate the generator function
 		result.push(quote!(
 			#[cfg(any(feature = "std", test))]
+			#[allow(clippy::too_many_arguments)]
 			pub fn #fn_name<
 				R: #crate_::Encode + #crate_::Decode + PartialEq,
 				NC: FnOnce() -> std::result::Result<R, #crate_::ApiError> + std::panic::UnwindSafe,

From 0931571d04f6d44b5cb37df5f530b3527eb658a6 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Tue, 31 Aug 2021 14:41:44 +0200
Subject: [PATCH 1130/1194] fix tracker repeat writes (#9653)

---
 client/db/src/bench.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/db/src/bench.rs b/client/db/src/bench.rs
index 1b7826f97399..d46aca8e8ff7 100644
--- a/client/db/src/bench.rs
+++ b/client/db/src/bench.rs
@@ -538,7 +538,7 @@ impl<B: BlockT> StateBackend<HashFor<B>> for BenchmarkingState<B> {
 
 				if tracker.writes > 0 {
 					writes += 1;
-					repeat_writes += tracker.reads - 1;
+					repeat_writes += tracker.writes - 1;
 				}
 			}
 		});

From 852bab073407b65b5e3e461baaa0541c4e0bc3d6 Mon Sep 17 00:00:00 2001
From: Chevdor <chevdor@users.noreply.github.com>
Date: Tue, 31 Aug 2021 15:24:37 +0200
Subject: [PATCH 1131/1194] doc: subkey documentation (#9639)

* doc: convert the adoc to md
* add ref to UncheckedExtrinsic
* Add references to the SS58 format
* Add details about the inspect command
* removing command that is no longer available
* reorder display so ss58 representations show up next to each other
* remove deprecated section
* Add doc about the password option
* fix fmt
* minor fixes

fix #6613

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Co-authored-by: Squirrel <gilescope@gmail.com>
Co-authored-by: David <dvdplm@gmail.com>
---
 bin/utils/subkey/README.adoc             |  91 ----------
 bin/utils/subkey/README.md               | 209 ++++++++++++++++++++++-
 bin/utils/subkey/SECURITY.md             |  25 +++
 client/cli/src/commands/utils.rs         |  22 +--
 client/cli/src/params/keystore_params.rs |   3 +-
 5 files changed, 246 insertions(+), 104 deletions(-)
 delete mode 100644 bin/utils/subkey/README.adoc
 create mode 100644 bin/utils/subkey/SECURITY.md

diff --git a/bin/utils/subkey/README.adoc b/bin/utils/subkey/README.adoc
deleted file mode 100644
index 7c2a9cca0eb1..000000000000
--- a/bin/utils/subkey/README.adoc
+++ /dev/null
@@ -1,91 +0,0 @@
-= Subkey
-
-Subkey is a commandline utility included with Substrate that generates or restores Substrate keys. 
-
-`subkey` will use the http://wiki.polkadot.network/en/latest/polkadot/learn/cryptography/#keypairs-and-signing[sr25519] cryptography by default. If you need to use the older ed25519 cryptography to generate or restore your key pass the `--ed25519` flag to any of the commands.
-
-== Usage
-
-=== Generate a random account
-
-```bash
-subkey generate
-```
-
-Will output a secret phrase("mnemonic phrase") and give you the secret seed("Private Key"), public key("Account ID") and SS58 address("Public Address") of a new account. DO NOT SHARE your mnemonic phrase or secret seed with ANYONE it will give them access to your funds. If someone is making a transfer to you they will only need your **Public Address**.
-
-=== Inspecting a key
-
-You can inspect a given URI (mnemonic, seed, public key, or address) and recover the public key and the address.
-
-```bash
-subkey inspect <mnemonic,seed,pubkey,address>
-```
-_Example Output_:
-```
-Secret Key URI `` is account:
-  Secret seed:       0xfac7959dbfe72f052e5a0c3c8d6530f202b02fd8f9f5ca3580ec8deb7797479e
-  Public key (hex):  0x46ebddef8cd9bb167dc30878d7113b7e168e6f0646beffd77d69d39bad76b47a
-  Public key (SS58): 5DfhGyQdFobKM8NsWvEeAKk5EQQgYe9AydgJ7rMB6E1EqRzV
-  Account ID:        0x46ebddef8cd9bb167dc30878d7113b7e168e6f0646beffd77d69d39bad76b47a
-  SS58 Address:      5DfhGyQdFobKM8NsWvEeAKk5EQQgYe9AydgJ7rMB6E1EqRzV
-```
-
-=== Signing
-
-`subkey` expects a message to come in on STDIN, one way to sign a message would look like this:
-
-```bash
-echo -n <msg> | subkey sign --suri <seed,mnemonic>
-```
-_Example Output_:
-```
-a69da4a6ccbf81dbbbfad235fa12cf8528c18012b991ae89214de8d20d29c1280576ced6eb38b7406d1b7e03231df6dd4a5257546ddad13259356e1c3adfb509
-```
-
-=== Verifying a signature
-
-```bash
-echo -n <msg> | subkey verify <sig> <address>
-
-OUTPUT:
-Signature verifies correctly.
-```
-
-=== Using the vanity generator
-
-You can use the included vanity generator to find a seed that provides an address which includes the desired pattern. Be warned, depending on your hardware this may take a while.
-
-```bash
-subkey vanity 1337
-```
-
-=== Signing a transaction
-
-Sign a transaction from an encoded `Call`.
-
-```bash
-subkey sign-transaction \
-	--call <call-as-hex> \
-	--nonce 0 \
-	--suri <secret-uri> \
-	--password <password> \
-	--prior-block-hash <prior-block-hash-as-hex>
-```
-
-Will output a signed and encoded `UncheckedMortalCompactExtrinsic` as hex.
-
-=== Inspecting a module ID
-
-```bash
-subkey module-id "py/trsry" --network kusama
-```
-_Example Output_:
-```
-Public Key URI `F3opxRbN5ZbjJNU511Kj2TLuzFcDq9BGduA9TgiECafpg29` is account:
-  Network ID/version: kusama
-  Public key (hex):   0x6d6f646c70792f74727372790000000000000000000000000000000000000000
-  Public key (SS58):  F3opxRbN5ZbjJNU511Kj2TLuzFcDq9BGduA9TgiECafpg29
-  Account ID:         0x6d6f646c70792f74727372790000000000000000000000000000000000000000
-  SS58 Address:       F3opxRbN5ZbjJNU511Kj2TLuzFcDq9BGduA9TgiECafpg29
-```
diff --git a/bin/utils/subkey/README.md b/bin/utils/subkey/README.md
index 3e9ac0bddbdc..fbb486247a77 100644
--- a/bin/utils/subkey/README.md
+++ b/bin/utils/subkey/README.md
@@ -1 +1,208 @@
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+# Subkey
+
+Subkey is a commandline utility included with Substrate. It allows generating and restoring keys for Substrate based chains such as Polkadot, Kusama and a growing number of parachains and Substrate based projects.
+
+`subkey` provides a few sub-commands to generate keys, check keys, sign messages, verify messages, etc...
+
+You can see the full list of commands with `subkey --help`. Most commands have additional help available with for instance `subkey generate --help` for the `generate` command.
+
+## Satefy first
+
+`subkey` does not need an internet connection to work. Indeed, for the best security, you should be using `subkey` on a machine that is **not connected** to the internet.
+
+`subkey` deals with **seeds** and **private keys**. Make sure to use `subkey` in a safe environment (ie. no one looking over your shoulder) and on a safe computer (ie. no one able to check you commands history).
+
+If you save any output of `subkey` into a file, make sure to apply proper permissions and/or delete the file as soon as possible.
+
+## Usage
+
+The following guide explains *some* of the `subkey` commands. For the full list and the most up to date documentation, make sure to check the integrated help with `subkey --help`.
+
+### Generate a random account
+
+Generating a new key is as simple as running:
+
+    subkey generate
+
+The output looks similar to:
+
+```
+Secret phrase `hotel forest jar hover kite book view eight stuff angle legend defense` is account:
+  Secret seed:      0xa05c75731970cc7868a2fb7cb577353cd5b31f62dccced92c441acd8fee0c92d
+  Public key (hex): 0xfec70cfbf1977c6965b5af10a4534a6a35d548eb14580594d0bc543286892515
+  Account ID:       0xfec70cfbf1977c6965b5af10a4534a6a35d548eb14580594d0bc543286892515
+  SS58 Address:     5Hpm9fq3W3dQgwWpAwDS2ZHKAdnk86QRCu7iX4GnmDxycrte
+```
+
+---
+☠️ DO NT RE-USE ANY OF THE SEEDS AND SECRETS FROM THIS PAGE ☠️.
+
+You can read more about security and risks in [SECURITY.md](./SECURITY.md) and in the [Polkadot Wiki](https://wiki.polkadot.network/docs/learn-account-generation).
+
+---
+
+The output above shows a **secret phrase** (also called **mnemonic phrase**) and the **secret seed** (also called **Private Key**). Those 2 secrets are the pieces of information you MUST keep safe and secret. All the other information below can be derived from those secrets.
+
+The output above also show the **public key** and the **Account ID**. Those are the independant from the network where you will use the key.
+
+The **SS58 address** (or **Public Address**) of a new account is a reprensentation of the public keys of an account for a given network (for instance Kusama or Polkadot).
+
+You can read more about the SS58 format in the [substrate wiki](https://github.com/paritytech/substrate/wiki/External-Address-Format-(SS58)) and see the list of reserved prefixes in the [Polkadot wiki](https://wiki.polkadot.network/docs/build-ss58-registry).
+
+For instance, considering the previous seed `0xa05c75731970cc7868a2fb7cb577353cd5b31f62dccced92c441acd8fee0c92d` the SS58 addresses are:
+- Polkadot: `16m4J167Mptt8UXL8aGSAi7U2FnPpPxZHPrCgMG9KJzVoFqM`
+- Kusama: `JLNozAv8QeLSbLFwe2UvWeKKE4yvmDbfGxTuiYkF2BUMx4M`
+
+### Json output
+
+`subkey` can calso generate the output as *json*. This is useful for automation.
+
+command:
+```
+subkey generate --output-type json
+```
+
+output:
+```
+{
+  "accountId": "0xfec70cfbf1977c6965b5af10a4534a6a35d548eb14580594d0bc543286892515",
+  "publicKey": "0xfec70cfbf1977c6965b5af10a4534a6a35d548eb14580594d0bc543286892515",
+  "secretPhrase": "hotel forest jar hover kite book view eight stuff angle legend defense",
+  "secretSeed": "0xa05c75731970cc7868a2fb7cb577353cd5b31f62dccced92c441acd8fee0c92d",
+  "ss58Address": "5Hpm9fq3W3dQgwWpAwDS2ZHKAdnk86QRCu7iX4GnmDxycrte"
+}
+```
+
+So if you only want to get the `secretSeed` for instance, you can use:
+
+command:
+```
+subkey generate --output-type json | jq -r .secretSeed
+```
+
+output:
+```
+0xa05c75731970cc7868a2fb7cb577353cd5b31f62dccced92c441acd8fee0c92d
+```
+
+### Additional user-defined password
+
+`subkey` supports an additional user-defined secret that will be appended to the seed. Let's see the following example:
+
+    subkey generate --password extra_secret
+
+output:
+```
+Secret phrase `soup lyrics media market way crouch elevator put moon useful question wide` is account:
+  Secret seed:      0xe7cfd179d6537a676cb94bac3b5c5c9cb1550e846ac4541040d077dfbac2e7fd
+  Public key (hex): 0xf6a233c3e1de1a2ae0486100b460b3ce3d7231ddfe9dadabbd35ab968c70905d
+  Account ID:       0xf6a233c3e1de1a2ae0486100b460b3ce3d7231ddfe9dadabbd35ab968c70905d
+  SS58 Address:     5He5pZpc7AJ8evPuab37vJF6KkFDqq9uDq2WXh877Qw6iaVC
+```
+
+Using the `inspect` command (see more details below), we see that knowning only the **secret seed** is no longer sufficient to recover the account:
+
+    subkey inspect "soup lyrics media market way crouch elevator put moon useful question wide"
+
+which recovers the account `5Fe4sqj2K4fRuzEGvToi4KATqZfiDU7TqynjXG6PZE2dxwyh` and not `5He5pZpc7AJ8evPuab37vJF6KkFDqq9uDq2WXh877Qw6iaVC` as we expected. The additional user-defined **password** (`extra_secret` in our example) is now required to fully recover the account. Let's inspect the the previous mnemonic, this time passing also the required `password` as shown below:
+
+    subkey inspect --password extra_secret "soup lyrics media market way crouch elevator put moon useful question wide"
+
+This time, we properly recovered `5He5pZpc7AJ8evPuab37vJF6KkFDqq9uDq2WXh877Qw6iaVC`.
+
+### Inspecting a key
+
+If you have *some data* about a key, `subkey inpsect` will help you discover more information about it.
+
+If you have **secrets** that you would like to verify for instance, you can use:
+
+    subkey inspect < mnemonic | seed >
+
+If you have only **public data**, you can see a subset of the information:
+
+    subkey inspect --public < pubkey | address >
+
+**NOTE**: While you will be able to recover the secret seed from the mnemonic, the opposite is not possible.
+
+**NOTE**: For obvious reasons, the **secrets** cannot be recovered from passing **public data** such as `pubkey` or `address` as input.
+
+command:
+```
+subkey inspect 0xa05c75731970cc7868a2fb7cb577353cd5b31f62dccced92c441acd8fee0c92d
+```
+
+output:
+```
+Secret Key URI `0xa05c75731970cc7868a2fb7cb577353cd5b31f62dccced92c441acd8fee0c92d` is account:
+  Secret seed:      0xa05c75731970cc7868a2fb7cb577353cd5b31f62dccced92c441acd8fee0c92d
+  Public key (hex): 0xfec70cfbf1977c6965b5af10a4534a6a35d548eb14580594d0bc543286892515
+  Account ID:       0xfec70cfbf1977c6965b5af10a4534a6a35d548eb14580594d0bc543286892515
+  SS58 Address:     5Hpm9fq3W3dQgwWpAwDS2ZHKAdnk86QRCu7iX4GnmDxycrte
+```
+
+### Signing
+
+`subkey` allows using a **secret key** to sign a random message. The signature can then be verified by anyone using your **public key**:
+
+    echo -n <msg> | subkey sign --suri <seed|mnemonic>
+
+example:
+
+    MESSAGE=hello
+    SURI=0xa05c75731970cc7868a2fb7cb577353cd5b31f62dccced92c441acd8fee0c92d
+    echo -n $MESSAGE | subkey sign --suri $SURI
+
+output:
+
+    9201af3788ad4f986b800853c79da47155f2e08fde2070d866be4c27ab060466fea0623dc2b51f4392f4c61f25381a62848dd66c5d8217fae3858e469ebd668c
+
+**NOTE**: Each run of the `sign` command will yield a different output. While each signature is different, they are all valid.
+
+### Verifying a signature
+
+Given a message, a signature and an address, `subkey` can verify whether the **message** has been digitally signed by the holder (or one of the holders) of the **private key** for the given **address**:
+
+    echo -n <msg> | subkey verify <sig> <address>
+
+example:
+
+    MESSAGE=hello
+    URI=0xfec70cfbf1977c6965b5af10a4534a6a35d548eb14580594d0bc543286892515
+    SIGNATURE=9201af3788ad4f986b800853c79da47155f2e08fde2070d866be4c27ab060466fea0623dc2b51f4392f4c61f25381a62848dd66c5d8217fae3858e469ebd668c
+    echo -n $MESSAGE | subkey verify $SIGNATURE $URI
+
+output:
+
+    Signature verifies correctly.
+
+A failure looks like:
+
+    Error: SignatureInvalid
+
+### Using the vanity generator
+
+You can use the included vanity generator to find a seed that provides an address which includes the desired pattern. Be warned, depending on your hardware this may take a while.
+
+command:
+```
+subkey vanity --network polkadot --pattern bob
+```
+
+output:
+```
+Generating key containing pattern 'bob'
+best: 190 == top: 189
+Secret Key URI `0x8c9a73097f235b84021a446bc2826a00c690ea0be3e0d81a84931cb4146d6691` is account:
+  Secret seed:      0x8c9a73097f235b84021a446bc2826a00c690ea0be3e0d81a84931cb4146d6691
+  Public key (hex): 0x1a8b32e95c1f571118ea0b84801264c3c70f823e320d099e5de31b9b1f18f843
+  Account ID:       0x1a8b32e95c1f571118ea0b84801264c3c70f823e320d099e5de31b9b1f18f843
+  SS58 Address:     1bobYxBPjZWRPbVo35aSwci1u5Zmq8P6J2jpa4kkudBZMqE
+```
+
+`Bob` now got a nice address starting with his name: 1**bob**YxBPjZWRPbVo35aSwci1u5Zmq8P6J2jpa4kkudBZMqE.
+
+**Note**: While `Bob`, having a short name (3 chars), got a result rather quickly, it will take much longer for `Alice` who has a much longer name, thus the chances to generate a random address that contains the chain `alice` will be much smaller.
+
+## License
+
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/bin/utils/subkey/SECURITY.md b/bin/utils/subkey/SECURITY.md
new file mode 100644
index 000000000000..672d2965c7ea
--- /dev/null
+++ b/bin/utils/subkey/SECURITY.md
@@ -0,0 +1,25 @@
+# Keys and Security
+
+The following information is not exhaustive but meant to prevent the most common mistakes.
+You can read more about security and risks in the [Polkadot Wiki](https://wiki.polkadot.network/docs/learn-account-generation).
+The Polkadot network has a few **test networks**, e.g. **Westend**. Test networks are a great way to experiment and learn safely as you can lose tokens on those networks without any financial consequences.
+
+`subkey` generates and provides 2 pieces of **secret** information:
+- **secret phrase**: a bunch of words, exactly 12 by default (can be 12, 15, 18, 21 or 24)
+- **secret seed**: a big hexadecimal value
+
+There are 2 risks related to private keys:
+- loss of keys: this can happen if you don't have a proper backup
+- leak of the keys: this can unfortunately happen in many ways, including malware, phishing, key logger, backups on system that are online and not properly secured
+
+You want to ensure that:
+- you **do not lose** those secrets
+- **no one but you can access** those secrets
+
+☠️ **DO NOT SHARE** your mnemonic phrase or secret seed with ANYONE under **ANY** circumstances. Doing so would give them access to your funds and to send transactions on your behalf.
+
+☠️ If someone is asking for your **secret** phrase or **secret** seed, you can be **SURE** they are attempting to steal your funds.
+
+✅ It is however fine to share your **SS58 Address** as this is meant to be public information and is needed by anyone you want to be able to make transfer to or otherwise interact with your account. They will only ever need your **Public Address**.
+
+⚠️ While using the same key on multiple networks is possible, it is usually **not** recommended unless you have good motivations for doing so and understand the associated risks and drawbacks.
diff --git a/client/cli/src/commands/utils.rs b/client/cli/src/commands/utils.rs
index 6148f17e7f17..864d7e920f81 100644
--- a/client/cli/src/commands/utils.rs
+++ b/client/cli/src/commands/utils.rs
@@ -91,17 +91,17 @@ pub fn print_from_uri<Pair>(
 			},
 			OutputType::Text => {
 				println!(
-					"Secret phrase `{}` is account:\n  \
+					"Secret phrase:       {}\n  \
 					Secret seed:       {}\n  \
 					Public key (hex):  {}\n  \
-					Public key (SS58): {}\n  \
 					Account ID:        {}\n  \
+					Public key (SS58): {}\n  \
 					SS58 Address:      {}",
 					uri,
 					format_seed::<Pair>(seed),
 					format_public_key::<Pair>(public_key.clone()),
+					format_account_id::<Pair>(public_key.clone()),
 					public_key.to_ss58check_with_version(network_override),
-					format_account_id::<Pair>(public_key),
 					pair.public().into().into_account().to_ss58check_with_version(network_override),
 				);
 			},
@@ -130,14 +130,14 @@ pub fn print_from_uri<Pair>(
 					"Secret Key URI `{}` is account:\n  \
 					Secret seed:       {}\n  \
 					Public key (hex):  {}\n  \
-					Public key (SS58): {}\n  \
 					Account ID:        {}\n  \
+					Public key (SS58): {}\n  \
 					SS58 Address:      {}",
 					uri,
 					if let Some(seed) = seed { format_seed::<Pair>(seed) } else { "n/a".into() },
 					format_public_key::<Pair>(public_key.clone()),
+					format_account_id::<Pair>(public_key.clone()),
 					public_key.to_ss58check_with_version(network_override),
-					format_account_id::<Pair>(public_key),
 					pair.public().into().into_account().to_ss58check_with_version(network_override),
 				);
 			},
@@ -151,8 +151,8 @@ pub fn print_from_uri<Pair>(
 					"publicKeyUri": uri,
 					"networkId": String::from(network_override),
 					"publicKey": format_public_key::<Pair>(public_key.clone()),
-					"ss58PublicKey": public_key.to_ss58check_with_version(network_override),
 					"accountId": format_account_id::<Pair>(public_key.clone()),
+					"ss58PublicKey": public_key.to_ss58check_with_version(network_override),
 					"ss58Address": public_key.to_ss58check_with_version(network_override),
 				});
 
@@ -166,15 +166,15 @@ pub fn print_from_uri<Pair>(
 					"Public Key URI `{}` is account:\n  \
 					 Network ID/version: {}\n  \
 					 Public key (hex):   {}\n  \
-					 Public key (SS58):  {}\n  \
 					 Account ID:         {}\n  \
+					 Public key (SS58):  {}\n  \
 					 SS58 Address:       {}",
 					uri,
 					String::from(network_override),
 					format_public_key::<Pair>(public_key.clone()),
-					public_key.to_ss58check_with_version(network_override),
 					format_account_id::<Pair>(public_key.clone()),
 					public_key.to_ss58check_with_version(network_override),
+					public_key.to_ss58check_with_version(network_override),
 				);
 			},
 		}
@@ -205,8 +205,8 @@ where
 			let json = json!({
 				"networkId": String::from(network_override),
 				"publicKey": format_public_key::<Pair>(public_key.clone()),
-				"ss58PublicKey": public_key.to_ss58check_with_version(network_override),
 				"accountId": format_account_id::<Pair>(public_key.clone()),
+				"ss58PublicKey": public_key.to_ss58check_with_version(network_override),
 				"ss58Address": public_key.to_ss58check_with_version(network_override),
 			});
 
@@ -216,14 +216,14 @@ where
 			println!(
 				"Network ID/version: {}\n  \
 				 Public key (hex):   {}\n  \
-				 Public key (SS58):  {}\n  \
 				 Account ID:         {}\n  \
+				 Public key (SS58):  {}\n  \
 				 SS58 Address:       {}",
 				String::from(network_override),
 				format_public_key::<Pair>(public_key.clone()),
-				public_key.to_ss58check_with_version(network_override),
 				format_account_id::<Pair>(public_key.clone()),
 				public_key.to_ss58check_with_version(network_override),
+				public_key.to_ss58check_with_version(network_override),
 			);
 		},
 	}
diff --git a/client/cli/src/params/keystore_params.rs b/client/cli/src/params/keystore_params.rs
index 4eb5e5dc6c2d..99da21a12f76 100644
--- a/client/cli/src/params/keystore_params.rs
+++ b/client/cli/src/params/keystore_params.rs
@@ -46,7 +46,8 @@ pub struct KeystoreParams {
 	)]
 	pub password_interactive: bool,
 
-	/// Password used by the keystore.
+	/// Password used by the keystore. This allows appending an extra user-defined secret to the
+	/// seed.
 	#[structopt(
 		long = "password",
 		parse(try_from_str = secret_string_from_str),

From 81cae8eac5545fc55c12e36241855ae3cf14e283 Mon Sep 17 00:00:00 2001
From: Squirrel <gilescope@gmail.com>
Date: Wed, 1 Sep 2021 17:58:53 +0100
Subject: [PATCH 1132/1194] Update contrib docs to reflect simplified process
 (#9465)

* Update contrib docs to reflect simplified process

Co-authored-by: Andronik Ordian <write@reusable.software>
---
 docs/CONTRIBUTING.adoc | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/docs/CONTRIBUTING.adoc b/docs/CONTRIBUTING.adoc
index c0f43f01f413..b0eaec04455e 100644
--- a/docs/CONTRIBUTING.adoc
+++ b/docs/CONTRIBUTING.adoc
@@ -21,7 +21,7 @@ There are a few basic ground-rules for contributors (including the maintainer(s)
 
 *In General*
 
-A PR needs to be reviewed and approved by project maintainers unless:
+A Pull Request (PR) needs to be reviewed and approved by project maintainers unless:
 
 - it does not alter any logic (e.g. comments, dependencies, docs), then it may be tagged https://github.com/paritytech/substrate/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aopen+label%3AA2-insubstantial[`insubstantial`] and merged by its author once CI is complete.
 - it is an urgent fix with no large change to logic, then it may be merged after a non-author contributor has approved the review once CI is complete.
@@ -76,19 +76,20 @@ When reviewing a pull request, the end-goal is to suggest useful changes to the
 To create a Polkadot companion PR:
 
 . Pull latest Polkadot master (or clone it, if you haven't yet).
-. Override your local cargo config to point to your local substrate (pointing to your WIP branch): place `paths = ["path/to/substrate"]` in `~/.cargo/config`.
+. Override substrate deps to point to your local path or branch using https://github.com/bkchr/diener. (E.g. from the polkadot clone dir run `diener patch --crates-to-patch ../substrate --substrate` assuming substrate clone is in a sibling dir. If you do use diener, ensure that you _do not_ commit the changes diener makes to the Cargo.tomls.)
 . Make the changes required and build polkadot locally.
-. Submit all this as a PR against the Polkadot Repo. Link to your Polkadot PR in the _description_ of your Substrate PR as "polkadot companion: [URL]"
+. Submit all this as a PR against the Polkadot Repo.
+. Link to your Polkadot PR in the _description_ of your _Substrate_ PR as "polkadot companion: [URL]"
 . Now you should see that the `check_polkadot` CI job will build your Substrate PR agains the mentioned Polkadot branch in your PR description.
-. Wait for reviews on both the Substrate and the Polkadot pull request.
-. Once the Substrate pull request runs green, a member of the `parity` github group can comment on the Substrate pull request with `bot merge` which will:
-    - Merge the Substrate pull request.
-    - In case the pull request origins from https://github.com/paritytech/polkadot directly and not from a fork:
-        - The bot will push a commit to the Polkadot pull request updating its Substrate reference.
-        - The bot will merge the Polkadot pull request once all its CI checks are green.
-    - In case the pull request origins from a fork (relevant for pull requests by external contributors):
-        - You need to push a commit to the Polkadot pull request updating the Substrate reference.
-        - You need to merge by commenting `bot merge` on the Polkadot pull request once all CI checks on the pull request are green.
+. Someone will need to approve the Polkadot PR before the Substrate CI will go green. (The Polkadot CI failing can be ignored as long as the polkadot job in the _substrate_ PR is green).
+. Wait for reviews on both the Substrate and the Polkadot PRs.
+. Once the Substrate PR runs green, a member of the `parity` github group can comment on the Substrate PR with `bot merge` which will:
+    - Merge the Substrate PR.
+    - The bot will push a commit to the Polkadot PR updating its Substrate reference.
+    - If the polkadot PR origins from a fork then a project member may need to press `approve run` on the polkadot PR.
+    - The bot will merge the Polkadot PR once all its CI `{"build_allow_failure":false}` checks are green.
+    
+    Note: The merge-bot currently doesn't work with forks on org accounts, only individual accounts. 
 
 If your PR is reviewed well, but a Polkadot PR is missing, signal it with https://github.com/paritytech/substrate/labels/A7-needspolkadotpr[`A7-needspolkadotpr`] to prevent it from getting automatically merged.
 

From 152f76459e57e8ed2d6d921825c2b08d35294651 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Wed, 1 Sep 2021 22:04:25 +0200
Subject: [PATCH 1133/1194] Remove some browser leftovers (#9636)

As we have removed the feature for now, we don't need this here as well.

Co-authored-by: Giles Cope <gilescope@gmail.com>
---
 Cargo.lock                        |  2 --
 client/tracing/Cargo.toml         |  4 ----
 client/tracing/src/logging/mod.rs | 10 ----------
 3 files changed, 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a613b7ba0368..c436497f3e42 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8323,8 +8323,6 @@ dependencies = [
  "tracing",
  "tracing-log",
  "tracing-subscriber",
- "wasm-bindgen",
- "web-sys",
 ]
 
 [[package]]
diff --git a/client/tracing/Cargo.toml b/client/tracing/Cargo.toml
index 647f4de4a3a7..3e314a82aa58 100644
--- a/client/tracing/Cargo.toml
+++ b/client/tracing/Cargo.toml
@@ -35,7 +35,3 @@ sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 sc-client-api = { version = "4.0.0-dev", path = "../api" }
 sc-tracing-proc-macro = { version = "4.0.0-dev", path = "./proc-macro" }
 sc-rpc-server = { version = "4.0.0-dev", path = "../rpc-servers" }
-
-[target.'cfg(target_os = "unknown")'.dependencies]
-wasm-bindgen = "0.2.67"
-web-sys = { version = "0.3.44", features = ["console"] }
diff --git a/client/tracing/src/logging/mod.rs b/client/tracing/src/logging/mod.rs
index 32a1f9250cd9..dd4830fe8975 100644
--- a/client/tracing/src/logging/mod.rs
+++ b/client/tracing/src/logging/mod.rs
@@ -177,26 +177,16 @@ where
 	};
 	let builder = FmtSubscriber::builder().with_env_filter(env_filter);
 
-	#[cfg(not(target_os = "unknown"))]
 	let builder = builder.with_span_events(format::FmtSpan::NONE);
 
-	#[cfg(not(target_os = "unknown"))]
 	let builder = builder.with_writer(std::io::stderr as _);
 
-	#[cfg(target_os = "unknown")]
-	let builder = builder.with_writer(std::io::sink);
-
-	#[cfg(not(target_os = "unknown"))]
 	let builder = builder.event_format(event_format);
 
-	#[cfg(not(target_os = "unknown"))]
 	let builder = builder_hook(builder);
 
 	let subscriber = builder.finish().with(PrefixLayer);
 
-	#[cfg(target_os = "unknown")]
-	let subscriber = subscriber.with(ConsoleLogLayer::new(event_format));
-
 	Ok(subscriber)
 }
 

From 6d0c04d58fc614f61072f6dde1a1716fb8072a44 Mon Sep 17 00:00:00 2001
From: Keith Yeung <kungfukeith11@gmail.com>
Date: Wed, 1 Sep 2021 18:24:08 -0700
Subject: [PATCH 1134/1194] Generate storage info for aura pallet (#9371)

* Generate storage info for aura pallet

* Add MaxAuthorities to node-template aura pallet config

* Fix compilation errors on node-template

* Use WeakBoundedVec instead of BoundedVec

* Improve comment on BoundedSlice's EncodeLike impl

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Bump MaxAuthorities count to 32 for node template

* cargo fmt

* cargo fmt

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
---
 bin/node-template/runtime/src/lib.rs     |  7 ++++-
 frame/aura/Cargo.toml                    |  4 +--
 frame/aura/src/lib.rs                    | 35 ++++++++++++++++--------
 frame/aura/src/mock.rs                   |  5 ++++
 frame/support/src/storage/bounded_vec.rs |  8 +++++-
 primitives/consensus/slots/Cargo.toml    |  2 +-
 6 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index 63d79e604791..eae40e1ab356 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -195,9 +195,14 @@ impl frame_system::Config for Runtime {
 
 impl pallet_randomness_collective_flip::Config for Runtime {}
 
+parameter_types! {
+	pub const MaxAuthorities: u32 = 32;
+}
+
 impl pallet_aura::Config for Runtime {
 	type AuthorityId = AuraId;
 	type DisabledValidators = ();
+	type MaxAuthorities = MaxAuthorities;
 }
 
 impl pallet_grandpa::Config for Runtime {
@@ -382,7 +387,7 @@ impl_runtime_apis! {
 		}
 
 		fn authorities() -> Vec<AuraId> {
-			Aura::authorities()
+			Aura::authorities().into_inner()
 		}
 	}
 
diff --git a/frame/aura/Cargo.toml b/frame/aura/Cargo.toml
index f6aa4fac2fc1..ee7b15f91e35 100644
--- a/frame/aura/Cargo.toml
+++ b/frame/aura/Cargo.toml
@@ -14,9 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../../primitives/application-crypto" }
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
-	"derive",
-] }
+codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
diff --git a/frame/aura/src/lib.rs b/frame/aura/src/lib.rs
index 1138a3e8505a..e8b68f928e08 100644
--- a/frame/aura/src/lib.rs
+++ b/frame/aura/src/lib.rs
@@ -38,10 +38,10 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use codec::{Decode, Encode};
+use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::{
 	traits::{DisabledValidators, FindAuthor, Get, OnTimestampSet, OneSessionHandler},
-	ConsensusEngineId, Parameter,
+	BoundedSlice, ConsensusEngineId, Parameter, WeakBoundedVec,
 };
 use sp_consensus_aura::{AuthorityIndex, ConsensusLog, Slot, AURA_ENGINE_ID};
 use sp_runtime::{
@@ -49,7 +49,7 @@ use sp_runtime::{
 	traits::{IsMember, Member, SaturatedConversion, Saturating, Zero},
 	RuntimeAppPublic,
 };
-use sp_std::prelude::*;
+use sp_std::{convert::TryFrom, vec::Vec};
 
 pub mod migrations;
 mod mock;
@@ -70,7 +70,10 @@ pub mod pallet {
 			+ Parameter
 			+ RuntimeAppPublic
 			+ Default
-			+ MaybeSerializeDeserialize;
+			+ MaybeSerializeDeserialize
+			+ MaxEncodedLen;
+		/// The maximum number of authorities that the pallet can hold.
+		type MaxAuthorities: Get<u32>;
 
 		/// A way to check whether a given validator is disabled and should not be authoring blocks.
 		/// Blocks authored by a disabled validator will lead to a panic as part of this module's
@@ -79,6 +82,7 @@ pub mod pallet {
 	}
 
 	#[pallet::pallet]
+	#[pallet::generate_storage_info]
 	pub struct Pallet<T>(sp_std::marker::PhantomData<T>);
 
 	#[pallet::hooks]
@@ -113,7 +117,8 @@ pub mod pallet {
 	/// The current authority set.
 	#[pallet::storage]
 	#[pallet::getter(fn authorities)]
-	pub(super) type Authorities<T: Config> = StorageValue<_, Vec<T::AuthorityId>, ValueQuery>;
+	pub(super) type Authorities<T: Config> =
+		StorageValue<_, WeakBoundedVec<T::AuthorityId, T::MaxAuthorities>, ValueQuery>;
 
 	/// The current slot of this block.
 	///
@@ -143,18 +148,22 @@ pub mod pallet {
 }
 
 impl<T: Config> Pallet<T> {
-	fn change_authorities(new: Vec<T::AuthorityId>) {
+	fn change_authorities(new: WeakBoundedVec<T::AuthorityId, T::MaxAuthorities>) {
 		<Authorities<T>>::put(&new);
 
-		let log: DigestItem<T::Hash> =
-			DigestItem::Consensus(AURA_ENGINE_ID, ConsensusLog::AuthoritiesChange(new).encode());
+		let log: DigestItem<T::Hash> = DigestItem::Consensus(
+			AURA_ENGINE_ID,
+			ConsensusLog::AuthoritiesChange(new.into_inner()).encode(),
+		);
 		<frame_system::Pallet<T>>::deposit_log(log.into());
 	}
 
 	fn initialize_authorities(authorities: &[T::AuthorityId]) {
 		if !authorities.is_empty() {
 			assert!(<Authorities<T>>::get().is_empty(), "Authorities are already initialized!");
-			<Authorities<T>>::put(authorities);
+			let bounded = <BoundedSlice<'_, _, T::MaxAuthorities>>::try_from(authorities)
+				.expect("Initial authority set must be less than T::MaxAuthorities");
+			<Authorities<T>>::put(bounded);
 		}
 	}
 
@@ -202,8 +211,12 @@ impl<T: Config> OneSessionHandler<T::AccountId> for Pallet<T> {
 		if changed {
 			let next_authorities = validators.map(|(_, k)| k).collect::<Vec<_>>();
 			let last_authorities = Self::authorities();
-			if next_authorities != last_authorities {
-				Self::change_authorities(next_authorities);
+			if last_authorities != next_authorities {
+				let bounded = <WeakBoundedVec<_, T::MaxAuthorities>>::force_from(
+					next_authorities,
+					Some("AuRa new session"),
+				);
+				Self::change_authorities(bounded);
 			}
 		}
 	}
diff --git a/frame/aura/src/mock.rs b/frame/aura/src/mock.rs
index 0e258fb9a67d..4418d9e85ae2 100644
--- a/frame/aura/src/mock.rs
+++ b/frame/aura/src/mock.rs
@@ -87,6 +87,10 @@ impl pallet_timestamp::Config for Test {
 	type WeightInfo = ();
 }
 
+parameter_types! {
+	pub const MaxAuthorities: u32 = 10;
+}
+
 thread_local! {
 	static DISABLED_VALIDATORS: RefCell<Vec<AuthorityIndex>> = RefCell::new(Default::default());
 }
@@ -113,6 +117,7 @@ impl DisabledValidators for MockDisabledValidators {
 impl pallet_aura::Config for Test {
 	type AuthorityId = AuthorityId;
 	type DisabledValidators = MockDisabledValidators;
+	type MaxAuthorities = MaxAuthorities;
 }
 
 pub fn new_test_ext(authorities: Vec<u64>) -> sp_io::TestExternalities {
diff --git a/frame/support/src/storage/bounded_vec.rs b/frame/support/src/storage/bounded_vec.rs
index 6d25e058c0f4..0f56511e6edd 100644
--- a/frame/support/src/storage/bounded_vec.rs
+++ b/frame/support/src/storage/bounded_vec.rs
@@ -21,6 +21,7 @@
 use crate::{
 	storage::{StorageDecodeLength, StorageTryAppend},
 	traits::Get,
+	WeakBoundedVec,
 };
 use codec::{Decode, Encode, EncodeLike, MaxEncodedLen};
 use core::{
@@ -45,8 +46,13 @@ pub struct BoundedVec<T, S>(Vec<T>, PhantomData<S>);
 #[derive(Encode)]
 pub struct BoundedSlice<'a, T, S>(&'a [T], PhantomData<S>);
 
-// `BoundedSlice`s encode to something which will always decode into a `BoundedVec` or a `Vec`.
+// `BoundedSlice`s encode to something which will always decode into a `BoundedVec`,
+// `WeakBoundedVec`, or a `Vec`.
 impl<'a, T: Encode + Decode, S: Get<u32>> EncodeLike<BoundedVec<T, S>> for BoundedSlice<'a, T, S> {}
+impl<'a, T: Encode + Decode, S: Get<u32>> EncodeLike<WeakBoundedVec<T, S>>
+	for BoundedSlice<'a, T, S>
+{
+}
 impl<'a, T: Encode + Decode, S: Get<u32>> EncodeLike<Vec<T>> for BoundedSlice<'a, T, S> {}
 
 impl<'a, T, S: Get<u32>> TryFrom<&'a [T]> for BoundedSlice<'a, T, S> {
diff --git a/primitives/consensus/slots/Cargo.toml b/primitives/consensus/slots/Cargo.toml
index 9619f627a0b7..2718158cfb7d 100644
--- a/primitives/consensus/slots/Cargo.toml
+++ b/primitives/consensus/slots/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../runtime" }
 sp-arithmetic = { version = "4.0.0-dev", default-features = false, path = "../../arithmetic" }
 

From 4880660fdc6d862543393c0eb31347ce18b3a997 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Thu, 2 Sep 2021 17:14:41 +0200
Subject: [PATCH 1135/1194] remove unused origin (#9679)

---
 frame/election-provider-multi-phase/src/lib.rs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index 96f54c4c03db..b2e0d3898428 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -1063,9 +1063,6 @@ pub mod pallet {
 		CallNotAllowed,
 	}
 
-	#[pallet::origin]
-	pub struct Origin<T>(PhantomData<T>);
-
 	#[pallet::validate_unsigned]
 	impl<T: Config> ValidateUnsigned for Pallet<T> {
 		type Call = Call<T>;

From dd297887c653e344c566e976c050b01f7dea8eef Mon Sep 17 00:00:00 2001
From: Andreas Doerr <adoerr@users.noreply.github.com>
Date: Thu, 2 Sep 2021 20:50:27 +0200
Subject: [PATCH 1136/1194] Use coherent prost crate  versions (#9676)

---
 Cargo.lock                                   | 99 +++++---------------
 client/authority-discovery/Cargo.toml        |  2 +-
 client/finality-grandpa-warp-sync/Cargo.toml |  2 +-
 client/network/Cargo.toml                    |  2 +-
 4 files changed, 27 insertions(+), 78 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c436497f3e42..5766084a9383 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3282,8 +3282,8 @@ dependencies = [
  "multistream-select",
  "parking_lot 0.11.1",
  "pin-project 1.0.5",
- "prost 0.8.0",
- "prost-build 0.8.0",
+ "prost",
+ "prost-build",
  "rand 0.7.3",
  "ring",
  "rw-stream-sink",
@@ -3332,8 +3332,8 @@ dependencies = [
  "libp2p-core",
  "libp2p-swarm",
  "log 0.4.14",
- "prost 0.8.0",
- "prost-build 0.8.0",
+ "prost",
+ "prost-build",
  "rand 0.7.3",
  "smallvec 1.6.1",
 ]
@@ -3354,8 +3354,8 @@ dependencies = [
  "libp2p-core",
  "libp2p-swarm",
  "log 0.4.14",
- "prost 0.8.0",
- "prost-build 0.8.0",
+ "prost",
+ "prost-build",
  "rand 0.7.3",
  "regex",
  "sha2 0.9.3",
@@ -3374,8 +3374,8 @@ dependencies = [
  "libp2p-core",
  "libp2p-swarm",
  "log 0.4.14",
- "prost 0.8.0",
- "prost-build 0.8.0",
+ "prost",
+ "prost-build",
  "smallvec 1.6.1",
  "wasm-timer",
 ]
@@ -3395,8 +3395,8 @@ dependencies = [
  "libp2p-core",
  "libp2p-swarm",
  "log 0.4.14",
- "prost 0.8.0",
- "prost-build 0.8.0",
+ "prost",
+ "prost-build",
  "rand 0.7.3",
  "sha2 0.9.3",
  "smallvec 1.6.1",
@@ -3457,8 +3457,8 @@ dependencies = [
  "lazy_static",
  "libp2p-core",
  "log 0.4.14",
- "prost 0.8.0",
- "prost-build 0.8.0",
+ "prost",
+ "prost-build",
  "rand 0.8.4",
  "sha2 0.9.3",
  "snow",
@@ -3493,8 +3493,8 @@ dependencies = [
  "futures 0.3.16",
  "libp2p-core",
  "log 0.4.14",
- "prost 0.8.0",
- "prost-build 0.8.0",
+ "prost",
+ "prost-build",
  "unsigned-varint 0.7.0",
  "void",
 ]
@@ -3527,8 +3527,8 @@ dependencies = [
  "libp2p-swarm",
  "log 0.4.14",
  "pin-project 1.0.5",
- "prost 0.8.0",
- "prost-build 0.8.0",
+ "prost",
+ "prost-build",
  "rand 0.7.3",
  "smallvec 1.6.1",
  "unsigned-varint 0.7.0",
@@ -6477,16 +6477,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "prost"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e6984d2f1a23009bd270b8bb56d0926810a3d483f59c987d77969e9d8e840b2"
-dependencies = [
- "bytes 1.0.1",
- "prost-derive 0.7.0",
-]
-
 [[package]]
 name = "prost"
 version = "0.8.0"
@@ -6494,25 +6484,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020"
 dependencies = [
  "bytes 1.0.1",
- "prost-derive 0.8.0",
-]
-
-[[package]]
-name = "prost-build"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32d3ebd75ac2679c2af3a92246639f9fcc8a442ee420719cc4fe195b98dd5fa3"
-dependencies = [
- "bytes 1.0.1",
- "heck",
- "itertools 0.9.0",
- "log 0.4.14",
- "multimap",
- "petgraph",
- "prost 0.7.0",
- "prost-types 0.7.0",
- "tempfile",
- "which",
+ "prost-derive",
 ]
 
 [[package]]
@@ -6527,25 +6499,12 @@ dependencies = [
  "log 0.4.14",
  "multimap",
  "petgraph",
- "prost 0.8.0",
- "prost-types 0.8.0",
+ "prost",
+ "prost-types",
  "tempfile",
  "which",
 ]
 
-[[package]]
-name = "prost-derive"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "169a15f3008ecb5160cba7d37bcd690a7601b6d30cfb87a117d45e59d52af5d4"
-dependencies = [
- "anyhow",
- "itertools 0.9.0",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "prost-derive"
 version = "0.8.0"
@@ -6559,16 +6518,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "prost-types"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b518d7cdd93dab1d1122cf07fa9a60771836c668dde9d9e2a139f957f0d9f1bb"
-dependencies = [
- "bytes 1.0.1",
- "prost 0.7.0",
-]
-
 [[package]]
 name = "prost-types"
 version = "0.8.0"
@@ -6576,7 +6525,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "603bbd6394701d13f3f25aada59c7de9d35a6a5887cfc156181234a44002771b"
 dependencies = [
  "bytes 1.0.1",
- "prost 0.8.0",
+ "prost",
 ]
 
 [[package]]
@@ -7258,8 +7207,8 @@ dependencies = [
  "libp2p",
  "log 0.4.14",
  "parity-scale-codec",
- "prost 0.8.0",
- "prost-build 0.7.0",
+ "prost",
+ "prost-build",
  "quickcheck",
  "rand 0.7.3",
  "sc-client-api",
@@ -7923,8 +7872,8 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.11.1",
  "pin-project 1.0.5",
- "prost 0.8.0",
- "prost-build 0.7.0",
+ "prost",
+ "prost-build",
  "quickcheck",
  "rand 0.7.3",
  "sc-block-builder",
diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml
index 8625fa3eb2e0..8d5ed20730f0 100644
--- a/client/authority-discovery/Cargo.toml
+++ b/client/authority-discovery/Cargo.toml
@@ -14,7 +14,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [build-dependencies]
-prost-build = "0.7"
+prost-build = "0.8"
 
 [dependencies]
 async-trait = "0.1"
diff --git a/client/finality-grandpa-warp-sync/Cargo.toml b/client/finality-grandpa-warp-sync/Cargo.toml
index a1caee4ee74b..6bb00b936574 100644
--- a/client/finality-grandpa-warp-sync/Cargo.toml
+++ b/client/finality-grandpa-warp-sync/Cargo.toml
@@ -16,7 +16,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0" }
 derive_more = "0.99.11"
 futures = "0.3.8"
 log = "0.4.11"
-prost = "0.7"
+prost = "0.8"
 sc-client-api = { version = "4.0.0-dev", path = "../api" }
 sc-finality-grandpa = { version = "0.10.0-dev", path = "../finality-grandpa" }
 sc-network = { version = "0.10.0-dev", path = "../network" }
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index 34c2b6972eec..69217453073d 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -14,7 +14,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [build-dependencies]
-prost-build = "0.7"
+prost-build = "0.8"
 
 [dependencies]
 async-trait = "0.1"

From 0f934e970501136c7370a3bbd234b96c81f59cba Mon Sep 17 00:00:00 2001
From: Xiliang Chen <xlchen1291@gmail.com>
Date: Fri, 3 Sep 2021 06:53:57 +1200
Subject: [PATCH 1137/1194] Add VoteLocking config (#9641)

* Add VoteLocking config

Co-authored-by: Alexander Popiak <alexander.popiak@gmail.com>
---
 bin/node/runtime/src/lib.rs              |  1 +
 frame/democracy/src/lib.rs               | 14 ++--
 frame/democracy/src/tests.rs             |  2 +
 frame/democracy/src/tests/lock_voting.rs | 88 ++++++++++++------------
 4 files changed, 57 insertions(+), 48 deletions(-)

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 5eea93101b6c..b17bbed107db 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -620,6 +620,7 @@ impl pallet_democracy::Config for Runtime {
 	type EnactmentPeriod = EnactmentPeriod;
 	type LaunchPeriod = LaunchPeriod;
 	type VotingPeriod = VotingPeriod;
+	type VoteLockingPeriod = EnactmentPeriod; // Same as EnactmentPeriod
 	type MinimumDeposit = MinimumDeposit;
 	/// A straight majority of the council can decide what their next motion is.
 	type ExternalOrigin =
diff --git a/frame/democracy/src/lib.rs b/frame/democracy/src/lib.rs
index 9a1dd503b799..473ac964692c 100644
--- a/frame/democracy/src/lib.rs
+++ b/frame/democracy/src/lib.rs
@@ -263,8 +263,7 @@ pub mod pallet {
 		type Currency: ReservableCurrency<Self::AccountId>
 			+ LockableCurrency<Self::AccountId, Moment = Self::BlockNumber>;
 
-		/// The minimum period of locking and the period between a proposal being approved and
-		/// enacted.
+		/// The period between a proposal being approved and enacted.
 		///
 		/// It should generally be a little more than the unstake period to ensure that
 		/// voting stakers have an opportunity to remove themselves from the system in the case
@@ -280,6 +279,13 @@ pub mod pallet {
 		#[pallet::constant]
 		type VotingPeriod: Get<Self::BlockNumber>;
 
+		/// The minimum period of vote locking.
+		///
+		/// It should be no shorter than enactment period to ensure that in the case of an approval,
+		/// those successful voters are locked into the consequences that their votes entail.
+		#[pallet::constant]
+		type VoteLockingPeriod: Get<Self::BlockNumber>;
+
 		/// The minimum amount to be used as a deposit for a public referendum proposal.
 		#[pallet::constant]
 		type MinimumDeposit: Get<BalanceOf<Self>>;
@@ -1429,7 +1435,7 @@ impl<T: Config> Pallet<T> {
 					},
 					Some(ReferendumInfo::Finished { end, approved }) => {
 						if let Some((lock_periods, balance)) = votes[i].1.locked_if(approved) {
-							let unlock_at = end + T::EnactmentPeriod::get() * lock_periods.into();
+							let unlock_at = end + T::VoteLockingPeriod::get() * lock_periods.into();
 							let now = frame_system::Pallet::<T>::block_number();
 							if now < unlock_at {
 								ensure!(
@@ -1553,7 +1559,7 @@ impl<T: Config> Pallet<T> {
 						Self::reduce_upstream_delegation(&target, conviction.votes(balance));
 					let now = frame_system::Pallet::<T>::block_number();
 					let lock_periods = conviction.lock_periods().into();
-					prior.accumulate(now + T::EnactmentPeriod::get() * lock_periods, balance);
+					prior.accumulate(now + T::VoteLockingPeriod::get() * lock_periods, balance);
 					voting.set_common(delegations, prior);
 
 					Ok(votes)
diff --git a/frame/democracy/src/tests.rs b/frame/democracy/src/tests.rs
index 46d3cade36eb..9a5e47c89ac7 100644
--- a/frame/democracy/src/tests.rs
+++ b/frame/democracy/src/tests.rs
@@ -140,6 +140,7 @@ parameter_types! {
 	pub const FastTrackVotingPeriod: u64 = 2;
 	pub const MinimumDeposit: u64 = 1;
 	pub const EnactmentPeriod: u64 = 2;
+	pub const VoteLockingPeriod: u64 = 3;
 	pub const CooloffPeriod: u64 = 2;
 	pub const MaxVotes: u32 = 100;
 	pub const MaxProposals: u32 = MAX_PROPOSALS;
@@ -170,6 +171,7 @@ impl Config for Test {
 	type EnactmentPeriod = EnactmentPeriod;
 	type LaunchPeriod = LaunchPeriod;
 	type VotingPeriod = VotingPeriod;
+	type VoteLockingPeriod = VoteLockingPeriod;
 	type FastTrackVotingPeriod = FastTrackVotingPeriod;
 	type MinimumDeposit = MinimumDeposit;
 	type ExternalOrigin = EnsureSignedBy<Two, u64>;
diff --git a/frame/democracy/src/tests/lock_voting.rs b/frame/democracy/src/tests/lock_voting.rs
index c1a27400fe55..8b80b39c14aa 100644
--- a/frame/democracy/src/tests/lock_voting.rs
+++ b/frame/democracy/src/tests/lock_voting.rs
@@ -85,7 +85,7 @@ fn lock_voting_should_work() {
 		assert_eq!(Balances::locks(5), vec![]);
 		assert_eq!(Balances::free_balance(42), 2);
 
-		fast_forward_to(5);
+		fast_forward_to(7);
 		// No change yet...
 		assert_noop!(
 			Democracy::remove_other_vote(Origin::signed(1), 4, r),
@@ -93,29 +93,29 @@ fn lock_voting_should_work() {
 		);
 		assert_ok!(Democracy::unlock(Origin::signed(1), 4));
 		assert_eq!(Balances::locks(4), vec![the_lock(40)]);
-		fast_forward_to(6);
+		fast_forward_to(8);
 		// 4 should now be able to reap and unlock
 		assert_ok!(Democracy::remove_other_vote(Origin::signed(1), 4, r));
 		assert_ok!(Democracy::unlock(Origin::signed(1), 4));
 		assert_eq!(Balances::locks(4), vec![]);
 
-		fast_forward_to(9);
+		fast_forward_to(13);
 		assert_noop!(
 			Democracy::remove_other_vote(Origin::signed(1), 3, r),
 			Error::<Test>::NoPermission
 		);
 		assert_ok!(Democracy::unlock(Origin::signed(1), 3));
 		assert_eq!(Balances::locks(3), vec![the_lock(30)]);
-		fast_forward_to(10);
+		fast_forward_to(14);
 		assert_ok!(Democracy::remove_other_vote(Origin::signed(1), 3, r));
 		assert_ok!(Democracy::unlock(Origin::signed(1), 3));
 		assert_eq!(Balances::locks(3), vec![]);
 
 		// 2 doesn't need to reap_vote here because it was already done before.
-		fast_forward_to(17);
+		fast_forward_to(25);
 		assert_ok!(Democracy::unlock(Origin::signed(1), 2));
 		assert_eq!(Balances::locks(2), vec![the_lock(20)]);
-		fast_forward_to(18);
+		fast_forward_to(26);
 		assert_ok!(Democracy::unlock(Origin::signed(1), 2));
 		assert_eq!(Balances::locks(2), vec![]);
 	});
@@ -201,40 +201,40 @@ fn setup_three_referenda() -> (u32, u32, u32) {
 fn prior_lockvotes_should_be_enforced() {
 	new_test_ext().execute_with(|| {
 		let r = setup_three_referenda();
-		// r.0 locked 10 until #18.
-		// r.1 locked 20 until #10.
-		// r.2 locked 50 until #6.
+		// r.0 locked 10 until 2 + 8 * 3 = #26
+		// r.1 locked 20 until 2 + 4 * 3 = #14
+		// r.2 locked 50 until 2 + 2 * 3 = #8
 
-		fast_forward_to(5);
+		fast_forward_to(7);
 		assert_noop!(
 			Democracy::remove_other_vote(Origin::signed(1), 5, r.2),
 			Error::<Test>::NoPermission
 		);
 		assert_ok!(Democracy::unlock(Origin::signed(5), 5));
 		assert_eq!(Balances::locks(5), vec![the_lock(50)]);
-		fast_forward_to(6);
+		fast_forward_to(8);
 		assert_ok!(Democracy::remove_other_vote(Origin::signed(1), 5, r.2));
 		assert_ok!(Democracy::unlock(Origin::signed(5), 5));
 		assert_eq!(Balances::locks(5), vec![the_lock(20)]);
-		fast_forward_to(9);
+		fast_forward_to(13);
 		assert_noop!(
 			Democracy::remove_other_vote(Origin::signed(1), 5, r.1),
 			Error::<Test>::NoPermission
 		);
 		assert_ok!(Democracy::unlock(Origin::signed(5), 5));
 		assert_eq!(Balances::locks(5), vec![the_lock(20)]);
-		fast_forward_to(10);
+		fast_forward_to(14);
 		assert_ok!(Democracy::remove_other_vote(Origin::signed(1), 5, r.1));
 		assert_ok!(Democracy::unlock(Origin::signed(5), 5));
 		assert_eq!(Balances::locks(5), vec![the_lock(10)]);
-		fast_forward_to(17);
+		fast_forward_to(25);
 		assert_noop!(
 			Democracy::remove_other_vote(Origin::signed(1), 5, r.0),
 			Error::<Test>::NoPermission
 		);
 		assert_ok!(Democracy::unlock(Origin::signed(5), 5));
 		assert_eq!(Balances::locks(5), vec![the_lock(10)]);
-		fast_forward_to(18);
+		fast_forward_to(26);
 		assert_ok!(Democracy::remove_other_vote(Origin::signed(1), 5, r.0));
 		assert_ok!(Democracy::unlock(Origin::signed(5), 5));
 		assert_eq!(Balances::locks(5), vec![]);
@@ -245,31 +245,31 @@ fn prior_lockvotes_should_be_enforced() {
 fn single_consolidation_of_lockvotes_should_work_as_before() {
 	new_test_ext().execute_with(|| {
 		let r = setup_three_referenda();
-		// r.0 locked 10 until #18.
-		// r.1 locked 20 until #10.
-		// r.2 locked 50 until #6.
+		// r.0 locked 10 until 2 + 8 * 3 = #26
+		// r.1 locked 20 until 2 + 4 * 3 = #14
+		// r.2 locked 50 until 2 + 2 * 3 = #8
 
-		fast_forward_to(5);
+		fast_forward_to(7);
 		assert_ok!(Democracy::remove_vote(Origin::signed(5), r.2));
 		assert_ok!(Democracy::unlock(Origin::signed(5), 5));
 		assert_eq!(Balances::locks(5), vec![the_lock(50)]);
-		fast_forward_to(6);
+		fast_forward_to(8);
 		assert_ok!(Democracy::unlock(Origin::signed(5), 5));
 		assert_eq!(Balances::locks(5), vec![the_lock(20)]);
 
-		fast_forward_to(9);
+		fast_forward_to(13);
 		assert_ok!(Democracy::remove_vote(Origin::signed(5), r.1));
 		assert_ok!(Democracy::unlock(Origin::signed(5), 5));
 		assert_eq!(Balances::locks(5), vec![the_lock(20)]);
-		fast_forward_to(10);
+		fast_forward_to(14);
 		assert_ok!(Democracy::unlock(Origin::signed(5), 5));
 		assert_eq!(Balances::locks(5), vec![the_lock(10)]);
 
-		fast_forward_to(17);
+		fast_forward_to(25);
 		assert_ok!(Democracy::remove_vote(Origin::signed(5), r.0));
 		assert_ok!(Democracy::unlock(Origin::signed(5), 5));
 		assert_eq!(Balances::locks(5), vec![the_lock(10)]);
-		fast_forward_to(18);
+		fast_forward_to(26);
 		assert_ok!(Democracy::unlock(Origin::signed(5), 5));
 		assert_eq!(Balances::locks(5), vec![]);
 	});
@@ -279,23 +279,23 @@ fn single_consolidation_of_lockvotes_should_work_as_before() {
 fn multi_consolidation_of_lockvotes_should_be_conservative() {
 	new_test_ext().execute_with(|| {
 		let r = setup_three_referenda();
-		// r.0 locked 10 until #18.
-		// r.1 locked 20 until #10.
-		// r.2 locked 50 until #6.
+		// r.0 locked 10 until 2 + 8 * 3 = #26
+		// r.1 locked 20 until 2 + 4 * 3 = #14
+		// r.2 locked 50 until 2 + 2 * 3 = #8
 
 		assert_ok!(Democracy::remove_vote(Origin::signed(5), r.2));
 		assert_ok!(Democracy::remove_vote(Origin::signed(5), r.1));
 		assert_ok!(Democracy::remove_vote(Origin::signed(5), r.0));
 
-		fast_forward_to(6);
+		fast_forward_to(8);
 		assert_ok!(Democracy::unlock(Origin::signed(5), 5));
 		assert!(Balances::locks(5)[0].amount >= 20);
 
-		fast_forward_to(10);
+		fast_forward_to(14);
 		assert_ok!(Democracy::unlock(Origin::signed(5), 5));
 		assert!(Balances::locks(5)[0].amount >= 10);
 
-		fast_forward_to(18);
+		fast_forward_to(26);
 		assert_ok!(Democracy::unlock(Origin::signed(5), 5));
 		assert_eq!(Balances::locks(5), vec![]);
 	});
@@ -314,28 +314,28 @@ fn locks_should_persist_from_voting_to_delegation() {
 		assert_ok!(Democracy::vote(Origin::signed(5), r, aye(4, 10)));
 		fast_forward_to(2);
 		assert_ok!(Democracy::remove_vote(Origin::signed(5), r));
-		// locked 10 until #18.
+		// locked 10 until #26.
 
 		assert_ok!(Democracy::delegate(Origin::signed(5), 1, Conviction::Locked3x, 20));
 		// locked 20.
 		assert!(Balances::locks(5)[0].amount == 20);
 
 		assert_ok!(Democracy::undelegate(Origin::signed(5)));
-		// locked 20 until #10
+		// locked 20 until #14
 
-		fast_forward_to(9);
+		fast_forward_to(13);
 		assert_ok!(Democracy::unlock(Origin::signed(5), 5));
 		assert!(Balances::locks(5)[0].amount == 20);
 
-		fast_forward_to(10);
+		fast_forward_to(14);
 		assert_ok!(Democracy::unlock(Origin::signed(5), 5));
 		assert!(Balances::locks(5)[0].amount >= 10);
 
-		fast_forward_to(17);
+		fast_forward_to(25);
 		assert_ok!(Democracy::unlock(Origin::signed(5), 5));
 		assert!(Balances::locks(5)[0].amount >= 10);
 
-		fast_forward_to(18);
+		fast_forward_to(26);
 		assert_ok!(Democracy::unlock(Origin::signed(5), 5));
 		assert_eq!(Balances::locks(5), vec![]);
 	});
@@ -347,30 +347,30 @@ fn locks_should_persist_from_delegation_to_voting() {
 		System::set_block_number(0);
 		assert_ok!(Democracy::delegate(Origin::signed(5), 1, Conviction::Locked5x, 5));
 		assert_ok!(Democracy::undelegate(Origin::signed(5)));
-		// locked 5 until #32
+		// locked 5 until 16 * 3 = #48
 
 		let r = setup_three_referenda();
-		// r.0 locked 10 until #18.
-		// r.1 locked 20 until #10.
-		// r.2 locked 50 until #6.
+		// r.0 locked 10 until 2 + 8 * 3 = #26
+		// r.1 locked 20 until 2 + 4 * 3 = #14
+		// r.2 locked 50 until 2 + 2 * 3 = #8
 
 		assert_ok!(Democracy::remove_vote(Origin::signed(5), r.2));
 		assert_ok!(Democracy::remove_vote(Origin::signed(5), r.1));
 		assert_ok!(Democracy::remove_vote(Origin::signed(5), r.0));
 
-		fast_forward_to(6);
+		fast_forward_to(8);
 		assert_ok!(Democracy::unlock(Origin::signed(5), 5));
 		assert!(Balances::locks(5)[0].amount >= 20);
 
-		fast_forward_to(10);
+		fast_forward_to(14);
 		assert_ok!(Democracy::unlock(Origin::signed(5), 5));
 		assert!(Balances::locks(5)[0].amount >= 10);
 
-		fast_forward_to(18);
+		fast_forward_to(26);
 		assert_ok!(Democracy::unlock(Origin::signed(5), 5));
 		assert!(Balances::locks(5)[0].amount >= 5);
 
-		fast_forward_to(32);
+		fast_forward_to(48);
 		assert_ok!(Democracy::unlock(Origin::signed(5), 5));
 		assert_eq!(Balances::locks(5), vec![]);
 	});

From c7a6264758ddee13e06908aaf3444febd580a7b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michi@parity.io>
Date: Fri, 3 Sep 2021 03:32:30 +0200
Subject: [PATCH 1138/1194] Clean up `node-template` (#9667)

* Remove dead file

* Remove leftover license header
---
 bin/node-template/node/src/command.rs | 17 -----------------
 bin/node-template/node/src/lib.rs     |  3 ---
 2 files changed, 20 deletions(-)
 delete mode 100644 bin/node-template/node/src/lib.rs

diff --git a/bin/node-template/node/src/command.rs b/bin/node-template/node/src/command.rs
index 1e7e4edb7995..e948c3f53b71 100644
--- a/bin/node-template/node/src/command.rs
+++ b/bin/node-template/node/src/command.rs
@@ -1,20 +1,3 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 use crate::{
 	chain_spec,
 	cli::{Cli, Subcommand},
diff --git a/bin/node-template/node/src/lib.rs b/bin/node-template/node/src/lib.rs
deleted file mode 100644
index f117b8aae619..000000000000
--- a/bin/node-template/node/src/lib.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub mod chain_spec;
-pub mod rpc;
-pub mod service;

From f708278335e30667af1434e19872a862c54ebf8b Mon Sep 17 00:00:00 2001
From: Zeke Mostov <32168567+emostov@users.noreply.github.com>
Date: Sat, 4 Sep 2021 08:56:34 +0200
Subject: [PATCH 1139/1194] Small syntax changes for staking and elections code
 (#9688)

* Simplify stake map creation in `OnChainSequentialPhragmen::elect`

* Use or_else

* More or_else

* trivial;

* revert
---
 frame/election-provider-support/src/onchain.rs |  9 ++++-----
 frame/staking/src/pallet/impls.rs              | 16 ++++++++--------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/frame/election-provider-support/src/onchain.rs b/frame/election-provider-support/src/onchain.rs
index 8dcf8d4a87d0..aa07a0527daa 100644
--- a/frame/election-provider-support/src/onchain.rs
+++ b/frame/election-provider-support/src/onchain.rs
@@ -73,11 +73,10 @@ impl<T: Config> ElectionProvider<T::AccountId, T::BlockNumber> for OnChainSequen
 		let targets = Self::DataProvider::targets(None).map_err(Error::DataProvider)?;
 		let desired_targets = Self::DataProvider::desired_targets().map_err(Error::DataProvider)?;
 
-		let mut stake_map: BTreeMap<T::AccountId, VoteWeight> = BTreeMap::new();
-
-		voters.iter().for_each(|(v, s, _)| {
-			stake_map.insert(v.clone(), *s);
-		});
+		let stake_map: BTreeMap<T::AccountId, VoteWeight> = voters
+			.iter()
+			.map(|(validator, vote_weight, _)| (validator.clone(), *vote_weight))
+			.collect();
 
 		let stake_of =
 			|w: &T::AccountId| -> VoteWeight { stake_map.get(w).cloned().unwrap_or_default() };
diff --git a/frame/staking/src/pallet/impls.rs b/frame/staking/src/pallet/impls.rs
index bc80b63a3750..fecd493eea02 100644
--- a/frame/staking/src/pallet/impls.rs
+++ b/frame/staking/src/pallet/impls.rs
@@ -78,10 +78,10 @@ impl<T: Config> Pallet<T> {
 		era: EraIndex,
 	) -> DispatchResultWithPostInfo {
 		// Validate input data
-		let current_era = CurrentEra::<T>::get().ok_or(
+		let current_era = CurrentEra::<T>::get().ok_or_else(|| {
 			Error::<T>::InvalidEraToReward
-				.with_weight(T::WeightInfo::payout_stakers_alive_staked(0)),
-		)?;
+				.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
+		})?;
 		let history_depth = Self::history_depth();
 		ensure!(
 			era <= current_era && era >= current_era.saturating_sub(history_depth),
@@ -96,10 +96,10 @@ impl<T: Config> Pallet<T> {
 				.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
 		})?;
 
-		let controller = Self::bonded(&validator_stash).ok_or(
-			Error::<T>::NotStash.with_weight(T::WeightInfo::payout_stakers_alive_staked(0)),
-		)?;
-		let mut ledger = <Ledger<T>>::get(&controller).ok_or_else(|| Error::<T>::NotController)?;
+		let controller = Self::bonded(&validator_stash).ok_or_else(|| {
+			Error::<T>::NotStash.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
+		})?;
+		let mut ledger = <Ledger<T>>::get(&controller).ok_or(Error::<T>::NotController)?;
 
 		ledger
 			.claimed_rewards
@@ -891,7 +891,7 @@ impl<T: Config> frame_election_provider_support::ElectionDataProvider<T::Account
 		targets.into_iter().for_each(|v| {
 			let stake: BalanceOf<T> = target_stake
 				.and_then(|w| <BalanceOf<T>>::try_from(w).ok())
-				.unwrap_or(MinNominatorBond::<T>::get() * 100u32.into());
+				.unwrap_or_else(|| MinNominatorBond::<T>::get() * 100u32.into());
 			<Bonded<T>>::insert(v.clone(), v.clone());
 			<Ledger<T>>::insert(
 				v.clone(),

From d73c37ecc16f4895c5f6ed5126d72af8cf87d9b3 Mon Sep 17 00:00:00 2001
From: Squirrel <gilescope@gmail.com>
Date: Sat, 4 Sep 2021 20:20:48 +0100
Subject: [PATCH 1140/1194] sp-utils => sc-utils (#9677)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* sp-utils => sc-utils

* cargo fmt

* These files are now in the client so should be licensed as GPL3

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 Cargo.lock                                    | 40 +++++++++----------
 Cargo.toml                                    |  2 +-
 client/api/Cargo.toml                         |  2 +-
 client/api/src/client.rs                      |  2 +-
 client/api/src/notifications.rs               |  2 +-
 client/cli/Cargo.toml                         |  2 +-
 client/cli/src/runner.rs                      |  2 +-
 client/consensus/common/Cargo.toml            |  2 +-
 client/consensus/common/src/block_import.rs   | 27 +++++++------
 client/consensus/common/src/import_queue.rs   | 27 +++++++------
 .../common/src/import_queue/basic_queue.rs    | 29 +++++++-------
 .../common/src/import_queue/buffered_link.rs  | 29 +++++++-------
 client/consensus/common/src/metrics.rs        | 25 ++++++------
 client/finality-grandpa/Cargo.toml            |  2 +-
 .../src/communication/gossip.rs               |  2 +-
 .../finality-grandpa/src/communication/mod.rs |  2 +-
 .../src/communication/periodic.rs             |  2 +-
 .../src/communication/tests.rs                |  2 +-
 client/finality-grandpa/src/import.rs         |  2 +-
 client/finality-grandpa/src/lib.rs            |  2 +-
 client/finality-grandpa/src/notification.rs   |  2 +-
 client/finality-grandpa/src/observer.rs       |  4 +-
 client/finality-grandpa/src/until_imported.rs |  4 +-
 client/network/Cargo.toml                     |  2 +-
 client/network/src/on_demand_layer.rs         |  2 +-
 client/network/src/service.rs                 |  2 +-
 client/offchain/Cargo.toml                    |  2 +-
 client/offchain/src/api/http.rs               |  2 +-
 client/peerset/Cargo.toml                     |  2 +-
 client/peerset/src/lib.rs                     |  2 +-
 client/rpc/Cargo.toml                         |  2 +-
 client/rpc/src/system/mod.rs                  |  2 +-
 client/rpc/src/system/tests.rs                |  2 +-
 client/service/Cargo.toml                     |  2 +-
 client/service/src/builder.rs                 |  2 +-
 client/service/src/client/client.rs           |  2 +-
 client/service/src/lib.rs                     |  2 +-
 client/service/src/metrics.rs                 |  2 +-
 client/service/src/task_manager/mod.rs        |  2 +-
 client/transaction-pool/Cargo.toml            |  2 +-
 client/transaction-pool/api/src/error.rs      | 27 +++++++------
 client/transaction-pool/api/src/lib.rs        | 27 +++++++------
 client/transaction-pool/graph/Cargo.toml      |  2 +-
 client/transaction-pool/src/graph/watcher.rs  |  2 +-
 client/transaction-pool/src/revalidation.rs   |  2 +-
 {primitives => client}/utils/Cargo.toml       |  2 +-
 {primitives => client}/utils/README.md        |  0
 {primitives => client}/utils/src/lib.rs       | 25 ++++++------
 {primitives => client}/utils/src/metrics.rs   | 28 +++++++------
 {primitives => client}/utils/src/mpsc.rs      | 27 +++++++------
 .../utils/src/status_sinks.rs                 | 27 +++++++------
 51 files changed, 215 insertions(+), 203 deletions(-)
 rename {primitives => client}/utils/Cargo.toml (96%)
 rename {primitives => client}/utils/README.md (100%)
 rename {primitives => client}/utils/src/lib.rs (58%)
 rename {primitives => client}/utils/src/metrics.rs (67%)
 rename {primitives => client}/utils/src/mpsc.rs (89%)
 rename {primitives => client}/utils/src/status_sinks.rs (87%)

diff --git a/Cargo.lock b/Cargo.lock
index 5766084a9383..529fbfc17315 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7311,6 +7311,7 @@ dependencies = [
  "sc-service",
  "sc-telemetry",
  "sc-tracing",
+ "sc-utils",
  "serde",
  "serde_json",
  "sp-blockchain",
@@ -7319,7 +7320,6 @@ dependencies = [
  "sp-keystore",
  "sp-panic-handler",
  "sp-runtime",
- "sp-utils",
  "sp-version",
  "structopt",
  "tempfile",
@@ -7340,6 +7340,7 @@ dependencies = [
  "parking_lot 0.11.1",
  "sc-executor",
  "sc-transaction-pool-api",
+ "sc-utils",
  "sp-api",
  "sp-blockchain",
  "sp-consensus",
@@ -7352,7 +7353,6 @@ dependencies = [
  "sp-storage",
  "sp-test-primitives",
  "sp-trie",
- "sp-utils",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime",
  "thiserror",
@@ -7397,6 +7397,7 @@ dependencies = [
  "log 0.4.14",
  "parking_lot 0.11.1",
  "sc-client-api",
+ "sc-utils",
  "serde",
  "sp-api",
  "sp-blockchain",
@@ -7405,7 +7406,6 @@ dependencies = [
  "sp-runtime",
  "sp-state-machine",
  "sp-test-primitives",
- "sp-utils",
  "substrate-prometheus-endpoint",
  "thiserror",
 ]
@@ -7751,6 +7751,7 @@ dependencies = [
  "sc-network-gossip",
  "sc-network-test",
  "sc-telemetry",
+ "sc-utils",
  "serde_json",
  "sp-api",
  "sp-application-crypto",
@@ -7763,7 +7764,6 @@ dependencies = [
  "sp-keystore",
  "sp-runtime",
  "sp-tracing",
- "sp-utils",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
  "tempfile",
@@ -7880,6 +7880,7 @@ dependencies = [
  "sc-client-api",
  "sc-consensus",
  "sc-peerset",
+ "sc-utils",
  "serde",
  "serde_json",
  "smallvec 1.6.1",
@@ -7891,7 +7892,6 @@ dependencies = [
  "sp-runtime",
  "sp-test-primitives",
  "sp-tracing",
- "sp-utils",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime",
  "substrate-test-runtime-client",
@@ -7970,13 +7970,13 @@ dependencies = [
  "sc-network",
  "sc-transaction-pool",
  "sc-transaction-pool-api",
+ "sc-utils",
  "sp-api",
  "sp-consensus",
  "sp-core",
  "sp-offchain",
  "sp-runtime",
  "sp-tracing",
- "sp-utils",
  "substrate-test-runtime-client",
  "threadpool",
  "tokio",
@@ -7990,8 +7990,8 @@ dependencies = [
  "libp2p",
  "log 0.4.14",
  "rand 0.7.3",
+ "sc-utils",
  "serde_json",
- "sp-utils",
  "wasm-timer",
 ]
 
@@ -8024,6 +8024,7 @@ dependencies = [
  "sc-tracing",
  "sc-transaction-pool",
  "sc-transaction-pool-api",
+ "sc-utils",
  "serde_json",
  "sp-api",
  "sp-blockchain",
@@ -8035,7 +8036,6 @@ dependencies = [
  "sp-rpc",
  "sp-runtime",
  "sp-session",
- "sp-utils",
  "sp-version",
  "substrate-test-runtime-client",
 ]
@@ -8128,6 +8128,7 @@ dependencies = [
  "sc-tracing",
  "sc-transaction-pool",
  "sc-transaction-pool-api",
+ "sc-utils",
  "serde",
  "serde_json",
  "sp-api",
@@ -8147,7 +8148,6 @@ dependencies = [
  "sp-transaction-pool",
  "sp-transaction-storage-proof",
  "sp-trie",
- "sp-utils",
  "sp-version",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime",
@@ -8302,6 +8302,7 @@ dependencies = [
  "sc-block-builder",
  "sc-client-api",
  "sc-transaction-pool-api",
+ "sc-utils",
  "serde",
  "sp-api",
  "sp-blockchain",
@@ -8310,7 +8311,6 @@ dependencies = [
  "sp-runtime",
  "sp-tracing",
  "sp-transaction-pool",
- "sp-utils",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime",
  "substrate-test-runtime-client",
@@ -8331,6 +8331,16 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "sc-utils"
+version = "4.0.0-dev"
+dependencies = [
+ "futures 0.3.16",
+ "futures-timer 3.0.2",
+ "lazy_static",
+ "prometheus",
+]
+
 [[package]]
 name = "schannel"
 version = "0.1.19"
@@ -9476,16 +9486,6 @@ dependencies = [
  "trie-standardmap",
 ]
 
-[[package]]
-name = "sp-utils"
-version = "4.0.0-dev"
-dependencies = [
- "futures 0.3.16",
- "futures-timer 3.0.2",
- "lazy_static",
- "prometheus",
-]
-
 [[package]]
 name = "sp-version"
 version = "4.0.0-dev"
diff --git a/Cargo.toml b/Cargo.toml
index f583c2b087c0..64cbbf38966c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -61,6 +61,7 @@ members = [
 	"client/tracing/proc-macro",
 	"client/transaction-pool",
 	"client/transaction-pool/api",
+	"client/utils",
 	"frame/assets",
 	"frame/atomic-swap",
 	"frame/aura",
@@ -180,7 +181,6 @@ members = [
 	"primitives/transaction-pool",
 	"primitives/transaction-storage-proof",
 	"primitives/trie",
-	"primitives/utils",
 	"primitives/version",
 	"primitives/version/proc-macro",
 	"primitives/wasm-interface",
diff --git a/client/api/Cargo.toml b/client/api/Cargo.toml
index 06acc33bd20c..772f22e822eb 100644
--- a/client/api/Cargo.toml
+++ b/client/api/Cargo.toml
@@ -30,7 +30,7 @@ sp-database = { version = "4.0.0-dev", path = "../../primitives/database" }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
 sp-keystore = { version = "0.10.0-dev", default-features = false, path = "../../primitives/keystore" }
 sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
-sp-utils = { version = "4.0.0-dev", path = "../../primitives/utils" }
+sc-utils = { version = "4.0.0-dev", path = "../utils" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 sp-state-machine = { version = "0.10.0-dev", path = "../../primitives/state-machine" }
 sp-trie = { version = "4.0.0-dev", path = "../../primitives/trie" }
diff --git a/client/api/src/client.rs b/client/api/src/client.rs
index 69c89f1aa5f6..21f8aecad053 100644
--- a/client/api/src/client.rs
+++ b/client/api/src/client.rs
@@ -29,8 +29,8 @@ use std::{collections::HashSet, convert::TryFrom, fmt, sync::Arc};
 
 use crate::{blockchain::Info, notifications::StorageEventStream};
 use sc_transaction_pool_api::ChainEvent;
+use sc_utils::mpsc::TracingUnboundedReceiver;
 use sp_blockchain;
-use sp_utils::mpsc::TracingUnboundedReceiver;
 
 /// Type that implements `futures::Stream` of block import events.
 pub type ImportNotifications<Block> = TracingUnboundedReceiver<BlockImportNotification<Block>>;
diff --git a/client/api/src/notifications.rs b/client/api/src/notifications.rs
index 3532568f9bd5..1346afd5e54d 100644
--- a/client/api/src/notifications.rs
+++ b/client/api/src/notifications.rs
@@ -25,9 +25,9 @@ use std::{
 
 use fnv::{FnvHashMap, FnvHashSet};
 use prometheus_endpoint::{register, CounterVec, Opts, Registry, U64};
+use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use sp_core::storage::{StorageData, StorageKey};
 use sp_runtime::traits::Block as BlockT;
-use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 
 /// Storage change set
 #[derive(Debug)]
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index e2d27b95eca2..7798507e529f 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -30,7 +30,7 @@ sc-client-api = { version = "4.0.0-dev", path = "../api" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
 sc-network = { version = "0.10.0-dev", path = "../network" }
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
-sp-utils = { version = "4.0.0-dev", path = "../../primitives/utils" }
+sc-utils = { version = "4.0.0-dev", path = "../utils" }
 sp-version = { version = "4.0.0-dev", path = "../../primitives/version" }
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 sp-keystore = { version = "0.10.0-dev", path = "../../primitives/keystore" }
diff --git a/client/cli/src/runner.rs b/client/cli/src/runner.rs
index 686b6b3c05fe..2ec200d9285b 100644
--- a/client/cli/src/runner.rs
+++ b/client/cli/src/runner.rs
@@ -21,7 +21,7 @@ use chrono::prelude::*;
 use futures::{future, future::FutureExt, pin_mut, select, Future};
 use log::info;
 use sc_service::{Configuration, Error as ServiceError, TaskManager, TaskType};
-use sp_utils::metrics::{TOKIO_THREADS_ALIVE, TOKIO_THREADS_TOTAL};
+use sc_utils::metrics::{TOKIO_THREADS_ALIVE, TOKIO_THREADS_TOTAL};
 use std::marker::PhantomData;
 
 #[cfg(target_family = "unix")]
diff --git a/client/consensus/common/Cargo.toml b/client/consensus/common/Cargo.toml
index 7e47e157b98d..6829bd2c6d8b 100644
--- a/client/consensus/common/Cargo.toml
+++ b/client/consensus/common/Cargo.toml
@@ -24,7 +24,7 @@ sp-core = { path = "../../../primitives/core", version = "4.0.0-dev" }
 sp-consensus = { path = "../../../primitives/consensus/common", version = "0.10.0-dev" }
 sp-state-machine = { version = "0.10.0-dev", path = "../../../primitives/state-machine" }
 sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
-sp-utils = { version = "4.0.0-dev", path = "../../../primitives/utils" }
+sc-utils = { version = "4.0.0-dev", path = "../../utils" }
 sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
 parking_lot = "0.11.1"
 serde = { version = "1.0", features = ["derive"] }
diff --git a/client/consensus/common/src/block_import.rs b/client/consensus/common/src/block_import.rs
index d16d71aec926..6d411dd9afbf 100644
--- a/client/consensus/common/src/block_import.rs
+++ b/client/consensus/common/src/block_import.rs
@@ -1,19 +1,20 @@
 // This file is part of Substrate.
 
 // Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Block import helpers.
 
diff --git a/client/consensus/common/src/import_queue.rs b/client/consensus/common/src/import_queue.rs
index 5117a8fd202d..3f2126ccadf6 100644
--- a/client/consensus/common/src/import_queue.rs
+++ b/client/consensus/common/src/import_queue.rs
@@ -1,19 +1,20 @@
 // This file is part of Substrate.
 
 // Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Import Queue primitive: something which can verify and import blocks.
 //!
diff --git a/client/consensus/common/src/import_queue/basic_queue.rs b/client/consensus/common/src/import_queue/basic_queue.rs
index a898e268fc3d..9042c8798be4 100644
--- a/client/consensus/common/src/import_queue/basic_queue.rs
+++ b/client/consensus/common/src/import_queue/basic_queue.rs
@@ -1,19 +1,20 @@
 // This file is part of Substrate.
 
 // Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 use futures::{
 	prelude::*,
 	task::{Context, Poll},
@@ -21,12 +22,12 @@ use futures::{
 use futures_timer::Delay;
 use log::{debug, trace};
 use prometheus_endpoint::Registry;
+use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use sp_consensus::BlockOrigin;
 use sp_runtime::{
 	traits::{Block as BlockT, Header as HeaderT, NumberFor},
 	Justification, Justifications,
 };
-use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use std::{marker::PhantomData, pin::Pin, time::Duration};
 
 use crate::{
diff --git a/client/consensus/common/src/import_queue/buffered_link.rs b/client/consensus/common/src/import_queue/buffered_link.rs
index 45aaf706ee1b..87ea6dde5c47 100644
--- a/client/consensus/common/src/import_queue/buffered_link.rs
+++ b/client/consensus/common/src/import_queue/buffered_link.rs
@@ -1,19 +1,20 @@
 // This file is part of Substrate.
 
 // Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Provides the `buffered_link` utility.
 //!
@@ -39,8 +40,8 @@
 
 use crate::import_queue::{Link, Origin};
 use futures::prelude::*;
+use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use sp_runtime::traits::{Block as BlockT, NumberFor};
-use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use std::{
 	pin::Pin,
 	task::{Context, Poll},
diff --git a/client/consensus/common/src/metrics.rs b/client/consensus/common/src/metrics.rs
index e9af41914a6e..ade45e3ffb68 100644
--- a/client/consensus/common/src/metrics.rs
+++ b/client/consensus/common/src/metrics.rs
@@ -1,19 +1,20 @@
 // This file is part of Substrate.
 
 // Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Metering tools for consensus
 
diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml
index 63a8c9aff225..40385a2faea5 100644
--- a/client/finality-grandpa/Cargo.toml
+++ b/client/finality-grandpa/Cargo.toml
@@ -27,7 +27,7 @@ parity-scale-codec = { version = "2.0.0", features = ["derive"] }
 sp-application-crypto = { version = "4.0.0-dev", path = "../../primitives/application-crypto" }
 sp-arithmetic = { version = "4.0.0-dev", path = "../../primitives/arithmetic" }
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
-sp-utils = { version = "4.0.0-dev", path = "../../primitives/utils" }
+sc-utils = { version = "4.0.0-dev", path = "../utils" }
 sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
 sc-consensus = { version = "0.10.0-dev", path = "../consensus/common" }
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
diff --git a/client/finality-grandpa/src/communication/gossip.rs b/client/finality-grandpa/src/communication/gossip.rs
index bec824bc0b81..d64c7421afa6 100644
--- a/client/finality-grandpa/src/communication/gossip.rs
+++ b/client/finality-grandpa/src/communication/gossip.rs
@@ -94,7 +94,7 @@ use log::{debug, trace};
 use prometheus_endpoint::{register, CounterVec, Opts, PrometheusError, Registry, U64};
 use rand::seq::SliceRandom;
 use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_DEBUG};
-use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
+use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 
 use super::{benefit, cost, Round, SetId};
 use crate::{environment, CatchUp, CompactCommit, SignedMessage};
diff --git a/client/finality-grandpa/src/communication/mod.rs b/client/finality-grandpa/src/communication/mod.rs
index a4d85e443ab6..c370e1d642d7 100644
--- a/client/finality-grandpa/src/communication/mod.rs
+++ b/client/finality-grandpa/src/communication/mod.rs
@@ -58,8 +58,8 @@ use crate::{
 use gossip::{
 	FullCatchUpMessage, FullCommitMessage, GossipMessage, GossipValidator, PeerReport, VoteMessage,
 };
+use sc_utils::mpsc::TracingUnboundedReceiver;
 use sp_finality_grandpa::{AuthorityId, AuthoritySignature, RoundNumber, SetId as SetIdNumber};
-use sp_utils::mpsc::TracingUnboundedReceiver;
 
 pub mod gossip;
 mod periodic;
diff --git a/client/finality-grandpa/src/communication/periodic.rs b/client/finality-grandpa/src/communication/periodic.rs
index a3c7b9380b25..77e55ad652f6 100644
--- a/client/finality-grandpa/src/communication/periodic.rs
+++ b/client/finality-grandpa/src/communication/periodic.rs
@@ -21,7 +21,7 @@
 use futures::{future::FutureExt as _, prelude::*, ready, stream::Stream};
 use futures_timer::Delay;
 use log::debug;
-use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
+use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use std::{
 	pin::Pin,
 	task::{Context, Poll},
diff --git a/client/finality-grandpa/src/communication/tests.rs b/client/finality-grandpa/src/communication/tests.rs
index ab72494ee853..1fac0230b2a8 100644
--- a/client/finality-grandpa/src/communication/tests.rs
+++ b/client/finality-grandpa/src/communication/tests.rs
@@ -28,10 +28,10 @@ use parity_scale_codec::Encode;
 use sc_network::{config::Role, Event as NetworkEvent, ObservedRole, PeerId};
 use sc_network_gossip::Validator;
 use sc_network_test::{Block, Hash};
+use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use sp_finality_grandpa::AuthorityList;
 use sp_keyring::Ed25519Keyring;
 use sp_runtime::traits::NumberFor;
-use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use std::{
 	borrow::Cow,
 	pin::Pin,
diff --git a/client/finality-grandpa/src/import.rs b/client/finality-grandpa/src/import.rs
index c6bdbc00323d..f663bfe94afd 100644
--- a/client/finality-grandpa/src/import.rs
+++ b/client/finality-grandpa/src/import.rs
@@ -27,6 +27,7 @@ use sc_consensus::{
 	BlockCheckParams, BlockImport, BlockImportParams, ImportResult, JustificationImport,
 };
 use sc_telemetry::TelemetryHandle;
+use sc_utils::mpsc::TracingUnboundedSender;
 use sp_api::{Core, RuntimeApiInfo, TransactionFor};
 use sp_blockchain::{well_known_cache_keys, BlockStatus};
 use sp_consensus::{BlockOrigin, Error as ConsensusError, SelectChain};
@@ -37,7 +38,6 @@ use sp_runtime::{
 	traits::{Block as BlockT, DigestFor, Header as HeaderT, NumberFor, Zero},
 	Justification,
 };
-use sp_utils::mpsc::TracingUnboundedSender;
 
 use crate::{
 	authorities::{AuthoritySet, DelayKind, PendingChange, SharedAuthoritySet},
diff --git a/client/finality-grandpa/src/lib.rs b/client/finality-grandpa/src/lib.rs
index 2a10dfc0d50d..452659ced6a7 100644
--- a/client/finality-grandpa/src/lib.rs
+++ b/client/finality-grandpa/src/lib.rs
@@ -68,6 +68,7 @@ use sc_client_api::{
 };
 use sc_consensus::BlockImport;
 use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_DEBUG, CONSENSUS_INFO};
+use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver};
 use sp_api::ProvideRuntimeApi;
 use sp_application_crypto::AppKey;
 use sp_blockchain::{Error as ClientError, HeaderBackend, HeaderMetadata};
@@ -78,7 +79,6 @@ use sp_runtime::{
 	generic::BlockId,
 	traits::{Block as BlockT, DigestFor, NumberFor, Zero},
 };
-use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver};
 
 pub use finality_grandpa::BlockNumberOps;
 use finality_grandpa::{voter, voter_set::VoterSet, Error as GrandpaError};
diff --git a/client/finality-grandpa/src/notification.rs b/client/finality-grandpa/src/notification.rs
index f0b0b1669dc9..85d581bd5065 100644
--- a/client/finality-grandpa/src/notification.rs
+++ b/client/finality-grandpa/src/notification.rs
@@ -19,8 +19,8 @@
 use parking_lot::Mutex;
 use std::sync::Arc;
 
+use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use sp_runtime::traits::Block as BlockT;
-use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 
 use crate::{justification::GrandpaJustification, Error};
 
diff --git a/client/finality-grandpa/src/observer.rs b/client/finality-grandpa/src/observer.rs
index 91779daf3941..70a94cd50472 100644
--- a/client/finality-grandpa/src/observer.rs
+++ b/client/finality-grandpa/src/observer.rs
@@ -29,12 +29,12 @@ use log::{debug, info, warn};
 
 use sc_client_api::backend::Backend;
 use sc_telemetry::TelemetryHandle;
+use sc_utils::mpsc::TracingUnboundedReceiver;
 use sp_blockchain::HeaderMetadata;
 use sp_consensus::SelectChain;
 use sp_finality_grandpa::AuthorityId;
 use sp_keystore::SyncCryptoStorePtr;
 use sp_runtime::traits::{Block as BlockT, NumberFor};
-use sp_utils::mpsc::TracingUnboundedReceiver;
 
 use crate::{
 	authorities::SharedAuthoritySet,
@@ -403,8 +403,8 @@ mod tests {
 	};
 	use assert_matches::assert_matches;
 	use sc_network::PeerId;
+	use sc_utils::mpsc::tracing_unbounded;
 	use sp_blockchain::HeaderBackend as _;
-	use sp_utils::mpsc::tracing_unbounded;
 	use substrate_test_runtime_client::{TestClientBuilder, TestClientBuilderExt};
 
 	use futures::executor;
diff --git a/client/finality-grandpa/src/until_imported.rs b/client/finality-grandpa/src/until_imported.rs
index 8edf818e0d45..deb657726434 100644
--- a/client/finality-grandpa/src/until_imported.rs
+++ b/client/finality-grandpa/src/until_imported.rs
@@ -37,9 +37,9 @@ use log::{debug, warn};
 use parking_lot::Mutex;
 use prometheus_endpoint::{register, Gauge, PrometheusError, Registry, U64};
 use sc_client_api::{BlockImportNotification, ImportNotifications};
+use sc_utils::mpsc::TracingUnboundedReceiver;
 use sp_finality_grandpa::AuthorityId;
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor};
-use sp_utils::mpsc::TracingUnboundedReceiver;
 
 use std::{
 	collections::{HashMap, VecDeque},
@@ -561,8 +561,8 @@ mod tests {
 	use futures::future::Either;
 	use futures_timer::Delay;
 	use sc_client_api::BlockImportNotification;
+	use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedSender};
 	use sp_consensus::BlockOrigin;
-	use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedSender};
 	use substrate_test_runtime_client::runtime::{Block, Hash, Header};
 
 	#[derive(Clone)]
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index 69217453073d..de62a534f866 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -55,7 +55,7 @@ sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/comm
 sc-consensus = { version = "0.10.0-dev", path = "../consensus/common" }
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
-sp-utils = { version = "4.0.0-dev", path = "../../primitives/utils" }
+sc-utils = { version = "4.0.0-dev", path = "../utils" }
 sp-finality-grandpa = { version = "4.0.0-dev", path = "../../primitives/finality-grandpa" }
 thiserror = "1"
 unsigned-varint = { version = "0.6.0", features = [
diff --git a/client/network/src/on_demand_layer.rs b/client/network/src/on_demand_layer.rs
index ebcf012c0fae..5bac05c7aefa 100644
--- a/client/network/src/on_demand_layer.rs
+++ b/client/network/src/on_demand_layer.rs
@@ -27,9 +27,9 @@ use sc_client_api::{
 	RemoteChangesRequest, RemoteHeaderRequest, RemoteReadChildRequest, RemoteReadRequest,
 	StorageProof,
 };
+use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use sp_blockchain::Error as ClientError;
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor};
-use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use std::{
 	collections::HashMap,
 	pin::Pin,
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 069223c2ff39..6b2928510760 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -70,8 +70,8 @@ use metrics::{Histogram, HistogramVec, MetricSources, Metrics};
 use parking_lot::Mutex;
 use sc_consensus::{BlockImportError, BlockImportStatus, ImportQueue, Link};
 use sc_peerset::PeersetHandle;
+use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use sp_runtime::traits::{Block as BlockT, NumberFor};
-use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use std::{
 	borrow::Cow,
 	cmp,
diff --git a/client/offchain/Cargo.toml b/client/offchain/Cargo.toml
index 65737765d513..a7ff572e9b0b 100644
--- a/client/offchain/Cargo.toml
+++ b/client/offchain/Cargo.toml
@@ -29,7 +29,7 @@ sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 sp-offchain = { version = "4.0.0-dev", path = "../../primitives/offchain" }
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
-sp-utils = { version = "4.0.0-dev", path = "../../primitives/utils" }
+sc-utils = { version = "4.0.0-dev", path = "../utils" }
 threadpool = "1.7"
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
diff --git a/client/offchain/src/api/http.rs b/client/offchain/src/api/http.rs
index 5bc120c21371..ce9fb298d1b0 100644
--- a/client/offchain/src/api/http.rs
+++ b/client/offchain/src/api/http.rs
@@ -34,8 +34,8 @@ use futures::{channel::mpsc, future, prelude::*};
 use hyper::{client, Body, Client as HyperClient};
 use hyper_rustls::HttpsConnector;
 use log::error;
+use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use sp_core::offchain::{HttpError, HttpRequestId, HttpRequestStatus, Timestamp};
-use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use std::{
 	convert::TryFrom,
 	fmt,
diff --git a/client/peerset/Cargo.toml b/client/peerset/Cargo.toml
index b4e48332d62f..9e83ede675d0 100644
--- a/client/peerset/Cargo.toml
+++ b/client/peerset/Cargo.toml
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 futures = "0.3.9"
 libp2p = { version = "0.39.1", default-features = false }
-sp-utils = { version = "4.0.0-dev", path = "../../primitives/utils"}
+sc-utils = { version = "4.0.0-dev", path = "../utils"}
 log = "0.4.8"
 serde_json = "1.0.41"
 wasm-timer = "0.2"
diff --git a/client/peerset/src/lib.rs b/client/peerset/src/lib.rs
index 838f4c411c9c..ecaa1d9f576f 100644
--- a/client/peerset/src/lib.rs
+++ b/client/peerset/src/lib.rs
@@ -36,8 +36,8 @@ mod peersstate;
 
 use futures::prelude::*;
 use log::{debug, error, trace};
+use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use serde_json::json;
-use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use std::{
 	collections::{HashMap, HashSet, VecDeque},
 	pin::Pin,
diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml
index 453ff6e57daa..9957bc999a8b 100644
--- a/client/rpc/Cargo.toml
+++ b/client/rpc/Cargo.toml
@@ -27,7 +27,7 @@ serde_json = "1.0.41"
 sp-session = { version = "4.0.0-dev", path = "../../primitives/session" }
 sp-offchain = { version = "4.0.0-dev", path = "../../primitives/offchain" }
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
-sp-utils = { version = "4.0.0-dev", path = "../../primitives/utils" }
+sc-utils = { version = "4.0.0-dev", path = "../utils" }
 sp-rpc = { version = "4.0.0-dev", path = "../../primitives/rpc" }
 sp-keystore = { version = "0.10.0-dev", path = "../../primitives/keystore" }
 sc-chain-spec = { version = "4.0.0-dev", path = "../chain-spec" }
diff --git a/client/rpc/src/system/mod.rs b/client/rpc/src/system/mod.rs
index 798f3f035ad5..f99994e41a1b 100644
--- a/client/rpc/src/system/mod.rs
+++ b/client/rpc/src/system/mod.rs
@@ -22,8 +22,8 @@ use self::error::Result;
 use futures::{channel::oneshot, FutureExt};
 use sc_rpc_api::{DenyUnsafe, Receiver};
 use sc_tracing::logging;
+use sc_utils::mpsc::TracingUnboundedSender;
 use sp_runtime::traits::{self, Header as HeaderT};
-use sp_utils::mpsc::TracingUnboundedSender;
 
 pub use self::{
 	gen_client::Client as SystemClient,
diff --git a/client/rpc/src/system/tests.rs b/client/rpc/src/system/tests.rs
index 15b53c3ff462..cc794b884f06 100644
--- a/client/rpc/src/system/tests.rs
+++ b/client/rpc/src/system/tests.rs
@@ -21,7 +21,7 @@ use super::*;
 use assert_matches::assert_matches;
 use futures::{executor, prelude::*};
 use sc_network::{self, config::Role, PeerId};
-use sp_utils::mpsc::tracing_unbounded;
+use sc_utils::mpsc::tracing_unbounded;
 use std::{
 	env,
 	io::{BufRead, BufReader, Write},
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index 94be302ca270..b79e95fbb091 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -39,7 +39,7 @@ sc-keystore = { version = "4.0.0-dev", path = "../keystore" }
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
 sp-trie = { version = "4.0.0-dev", path = "../../primitives/trie" }
 sp-externalities = { version = "0.10.0-dev", path = "../../primitives/externalities" }
-sp-utils = { version = "4.0.0-dev", path = "../../primitives/utils" }
+sc-utils = { version = "4.0.0-dev", path = "../utils" }
 sp-version = { version = "4.0.0-dev", path = "../../primitives/version" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index a1fb1b909773..f0c037aee232 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -49,6 +49,7 @@ use sc_network::{
 };
 use sc_telemetry::{telemetry, ConnectionMessage, Telemetry, TelemetryHandle, SUBSTRATE_INFO};
 use sc_transaction_pool_api::MaintainedTransactionPool;
+use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedSender};
 use sp_api::{CallApiAt, ProvideRuntimeApi};
 use sp_blockchain::{HeaderBackend, HeaderMetadata};
 use sp_consensus::block_validation::{
@@ -61,7 +62,6 @@ use sp_runtime::{
 	traits::{Block as BlockT, BlockIdTo, HashFor, Zero},
 	BuildStorage,
 };
-use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedSender};
 use std::{str::FromStr, sync::Arc, time::SystemTime};
 
 /// A utility trait for building an RPC extension given a `DenyUnsafe` instance.
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index 9439a06a5af9..f7d93d036a3f 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -61,6 +61,7 @@ use sp_blockchain::{
 };
 use sp_consensus::{BlockOrigin, BlockStatus, Error as ConsensusError};
 
+use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedSender};
 use sp_core::{
 	convert_hash,
 	storage::{well_known_keys, ChildInfo, PrefixedStorageKey, StorageData, StorageKey},
@@ -82,7 +83,6 @@ use sp_state_machine::{
 	ChangesTrieConfigurationRange, ChangesTrieRootsStorage, ChangesTrieStorage, DBValue,
 };
 use sp_trie::StorageProof;
-use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedSender};
 use std::{
 	collections::{BTreeMap, HashMap, HashSet},
 	marker::PhantomData,
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index c8d5a9af3565..ede6f01a4539 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -41,11 +41,11 @@ use futures::{stream, Future, FutureExt, Stream, StreamExt};
 use log::{debug, error, warn};
 use parity_util_mem::MallocSizeOf;
 use sc_network::PeerId;
+use sc_utils::mpsc::TracingUnboundedReceiver;
 use sp_runtime::{
 	generic::BlockId,
 	traits::{Block as BlockT, Header as HeaderT},
 };
-use sp_utils::mpsc::TracingUnboundedReceiver;
 
 pub use self::{
 	builder::{
diff --git a/client/service/src/metrics.rs b/client/service/src/metrics.rs
index e3ad9e9cce19..4d3c6df92fee 100644
--- a/client/service/src/metrics.rs
+++ b/client/service/src/metrics.rs
@@ -25,9 +25,9 @@ use sc_client_api::{ClientInfo, UsageProvider};
 use sc_network::{config::Role, NetworkService, NetworkStatus};
 use sc_telemetry::{telemetry, TelemetryHandle, SUBSTRATE_INFO};
 use sc_transaction_pool_api::{MaintainedTransactionPool, PoolStatus};
+use sc_utils::metrics::register_globals;
 use sp_api::ProvideRuntimeApi;
 use sp_runtime::traits::{Block, NumberFor, SaturatedConversion, UniqueSaturatedInto};
-use sp_utils::metrics::register_globals;
 use std::{
 	sync::Arc,
 	time::{Duration, Instant},
diff --git a/client/service/src/task_manager/mod.rs b/client/service/src/task_manager/mod.rs
index 25b08b37a3a1..7842acdf0455 100644
--- a/client/service/src/task_manager/mod.rs
+++ b/client/service/src/task_manager/mod.rs
@@ -33,7 +33,7 @@ use prometheus_endpoint::{
 	exponential_buckets, register, CounterVec, HistogramOpts, HistogramVec, Opts, PrometheusError,
 	Registry, U64,
 };
-use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
+use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use std::{panic, pin::Pin, result::Result};
 use tracing_futures::Instrument;
 
diff --git a/client/transaction-pool/Cargo.toml b/client/transaction-pool/Cargo.toml
index e2858a41d507..2184af819adf 100644
--- a/client/transaction-pool/Cargo.toml
+++ b/client/transaction-pool/Cargo.toml
@@ -29,7 +29,7 @@ sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
 sp-transaction-pool = { version = "4.0.0-dev", path = "../../primitives/transaction-pool" }
 sc-transaction-pool-api = { version = "4.0.0-dev", path = "./api" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
-sp-utils = { version = "4.0.0-dev", path = "../../primitives/utils" }
+sc-utils = { version = "4.0.0-dev", path = "../utils" }
 serde = { version = "1.0.126", features = ["derive"] }
 linked-hash-map = "0.5.4"
 retain_mut = "0.1.3"
diff --git a/client/transaction-pool/api/src/error.rs b/client/transaction-pool/api/src/error.rs
index 365d6a28d6b9..feee3b0a949c 100644
--- a/client/transaction-pool/api/src/error.rs
+++ b/client/transaction-pool/api/src/error.rs
@@ -1,19 +1,20 @@
 // This file is part of Substrate.
 
 // Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Transaction pool errors.
 
diff --git a/client/transaction-pool/api/src/lib.rs b/client/transaction-pool/api/src/lib.rs
index 4a083ad2e15a..a6252f1373c5 100644
--- a/client/transaction-pool/api/src/lib.rs
+++ b/client/transaction-pool/api/src/lib.rs
@@ -1,19 +1,20 @@
 // This file is part of Substrate.
 
 // Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Transaction pool client facing API.
 #![warn(missing_docs)]
diff --git a/client/transaction-pool/graph/Cargo.toml b/client/transaction-pool/graph/Cargo.toml
index aa4000f7c076..b49cadc51c33 100644
--- a/client/transaction-pool/graph/Cargo.toml
+++ b/client/transaction-pool/graph/Cargo.toml
@@ -20,7 +20,7 @@ log = "0.4.8"
 parking_lot = "0.11.1"
 serde = { version = "1.0.101", features = ["derive"] }
 sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
-sp-utils = { version = "4.0.0-dev", path = "../../../primitives/utils" }
+sc-utils = { version = "4.0.0-dev", path = "../../utils" }
 sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
 sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
 sp-transaction-pool = { version = "4.0.0-dev", path = "../../../primitives/transaction-pool" }
diff --git a/client/transaction-pool/src/graph/watcher.rs b/client/transaction-pool/src/graph/watcher.rs
index 91777117efe9..975ee6608886 100644
--- a/client/transaction-pool/src/graph/watcher.rs
+++ b/client/transaction-pool/src/graph/watcher.rs
@@ -20,7 +20,7 @@
 
 use futures::Stream;
 use sc_transaction_pool_api::TransactionStatus;
-use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
+use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 
 /// Extrinsic watcher.
 ///
diff --git a/client/transaction-pool/src/revalidation.rs b/client/transaction-pool/src/revalidation.rs
index 9f15185694d0..a8b2c1d32036 100644
--- a/client/transaction-pool/src/revalidation.rs
+++ b/client/transaction-pool/src/revalidation.rs
@@ -25,12 +25,12 @@ use std::{
 };
 
 use crate::graph::{ChainApi, ExtrinsicHash, NumberFor, Pool, ValidatedTransaction};
+use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use sp_runtime::{
 	generic::BlockId,
 	traits::{SaturatedConversion, Zero},
 	transaction_validity::TransactionValidityError,
 };
-use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 
 use futures::prelude::*;
 use std::time::Duration;
diff --git a/primitives/utils/Cargo.toml b/client/utils/Cargo.toml
similarity index 96%
rename from primitives/utils/Cargo.toml
rename to client/utils/Cargo.toml
index d72df03af8cc..99765dd501dd 100644
--- a/primitives/utils/Cargo.toml
+++ b/client/utils/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "sp-utils"
+name = "sc-utils"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
diff --git a/primitives/utils/README.md b/client/utils/README.md
similarity index 100%
rename from primitives/utils/README.md
rename to client/utils/README.md
diff --git a/primitives/utils/src/lib.rs b/client/utils/src/lib.rs
similarity index 58%
rename from primitives/utils/src/lib.rs
rename to client/utils/src/lib.rs
index 693b05a8b998..b49cd60d67b1 100644
--- a/primitives/utils/src/lib.rs
+++ b/client/utils/src/lib.rs
@@ -1,19 +1,20 @@
 // This file is part of Substrate.
 
 // Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Utilities Primitives for Substrate
 //!
diff --git a/primitives/utils/src/metrics.rs b/client/utils/src/metrics.rs
similarity index 67%
rename from primitives/utils/src/metrics.rs
rename to client/utils/src/metrics.rs
index 45d8b3b7311d..8df8e6596247 100644
--- a/primitives/utils/src/metrics.rs
+++ b/client/utils/src/metrics.rs
@@ -1,19 +1,21 @@
 // This file is part of Substrate.
 
 // Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
 
 //! Metering primitives and globals
 
diff --git a/primitives/utils/src/mpsc.rs b/client/utils/src/mpsc.rs
similarity index 89%
rename from primitives/utils/src/mpsc.rs
rename to client/utils/src/mpsc.rs
index 27e15cbe2ef2..1739af5e9015 100644
--- a/primitives/utils/src/mpsc.rs
+++ b/client/utils/src/mpsc.rs
@@ -1,19 +1,20 @@
 // This file is part of Substrate.
 
 // Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Features to meter unbounded channels
 
diff --git a/primitives/utils/src/status_sinks.rs b/client/utils/src/status_sinks.rs
similarity index 87%
rename from primitives/utils/src/status_sinks.rs
rename to client/utils/src/status_sinks.rs
index b8e05781611c..a87f0e0ad6e8 100644
--- a/primitives/utils/src/status_sinks.rs
+++ b/client/utils/src/status_sinks.rs
@@ -1,19 +1,20 @@
 // This file is part of Substrate.
 
 // Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use futures::{lock::Mutex, prelude::*};

From e7b93e1b1abcf0865824c68d10850bbb451e295f Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Mon, 6 Sep 2021 09:25:30 +0200
Subject: [PATCH 1141/1194] Fixed block response limit check (#9692)

* Fixed block response limit check

* Fixed start block detection and added a test

* Missing test
---
 client/network/src/block_request_handler.rs |  5 ++--
 client/network/src/protocol.rs              |  2 +-
 client/network/src/protocol/sync.rs         | 19 ++++++++------
 client/network/src/protocol/sync/blocks.rs  |  2 +-
 client/network/test/src/sync.rs             | 29 +++++++++++++++++++++
 5 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/client/network/src/block_request_handler.rs b/client/network/src/block_request_handler.rs
index 67a83af89768..9411ca71fd00 100644
--- a/client/network/src/block_request_handler.rs
+++ b/client/network/src/block_request_handler.rs
@@ -62,7 +62,7 @@ pub fn generate_protocol_config(protocol_id: &ProtocolId) -> ProtocolConfig {
 		name: generate_protocol_name(protocol_id).into(),
 		max_request_size: 1024 * 1024,
 		max_response_size: 16 * 1024 * 1024,
-		request_timeout: Duration::from_secs(40),
+		request_timeout: Duration::from_secs(20),
 		inbound_queue: None,
 	}
 }
@@ -355,7 +355,8 @@ impl<B: BlockT> BlockRequestHandler<B> {
 				indexed_body,
 			};
 
-			total_size += block_data.body.len();
+			total_size += block_data.body.iter().map(|ex| ex.len()).sum::<usize>();
+			total_size += block_data.indexed_body.iter().map(|ex| ex.len()).sum::<usize>();
 			blocks.push(block_data);
 
 			if blocks.len() >= max_blocks as usize || total_size > MAX_BODY_BYTES {
diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index 97653cf652f9..4d9fe269f2b6 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -629,7 +629,7 @@ impl<B: BlockT> Protocol<B> {
 					} else {
 						None
 					},
-					receipt: if !block_data.message_queue.is_empty() {
+					receipt: if !block_data.receipt.is_empty() {
 						Some(block_data.receipt)
 					} else {
 						None
diff --git a/client/network/src/protocol/sync.rs b/client/network/src/protocol/sync.rs
index 5cbe1fa13542..b10a3d72138b 100644
--- a/client/network/src/protocol/sync.rs
+++ b/client/network/src/protocol/sync.rs
@@ -70,7 +70,7 @@ mod state;
 mod warp;
 
 /// Maximum blocks to request in a single packet.
-const MAX_BLOCKS_TO_REQUEST: usize = 128;
+const MAX_BLOCKS_TO_REQUEST: usize = 64;
 
 /// Maximum blocks to store in the import queue.
 const MAX_IMPORTING_BLOCKS: usize = 2048;
@@ -1054,12 +1054,14 @@ impl<B: BlockT> ChainSync<B> {
 			self.pending_requests.add(who);
 			if let Some(request) = request {
 				match &mut peer.state {
-					PeerSyncState::DownloadingNew(start_block) => {
+					PeerSyncState::DownloadingNew(_) => {
 						self.blocks.clear_peer_download(who);
-						let start_block = *start_block;
 						peer.state = PeerSyncState::Available;
-						validate_blocks::<B>(&blocks, who, Some(request))?;
-						self.blocks.insert(start_block, blocks, who.clone());
+						if let Some(start_block) =
+							validate_blocks::<B>(&blocks, who, Some(request))?
+						{
+							self.blocks.insert(start_block, blocks, who.clone());
+						}
 						self.drain_blocks()
 					},
 					PeerSyncState::DownloadingStale(_) => {
@@ -2315,13 +2317,14 @@ where
 }
 
 /// Validate that the given `blocks` are correct.
+/// Returns the number of the first block in the sequence.
 ///
-/// It is expected that `blocks` are in asending order.
+/// It is expected that `blocks` are in ascending order.
 fn validate_blocks<Block: BlockT>(
 	blocks: &Vec<message::BlockData<Block>>,
 	who: &PeerId,
 	request: Option<BlockRequest<Block>>,
-) -> Result<(), BadPeer> {
+) -> Result<Option<NumberFor<Block>>, BadPeer> {
 	if let Some(request) = request {
 		if Some(blocks.len() as _) > request.max {
 			debug!(
@@ -2415,7 +2418,7 @@ fn validate_blocks<Block: BlockT>(
 		}
 	}
 
-	Ok(())
+	Ok(blocks.first().and_then(|b| b.header.as_ref()).map(|h| *h.number()))
 }
 
 #[cfg(test)]
diff --git a/client/network/src/protocol/sync/blocks.rs b/client/network/src/protocol/sync/blocks.rs
index df3506e7a8b0..e8851b9b2eb7 100644
--- a/client/network/src/protocol/sync/blocks.rs
+++ b/client/network/src/protocol/sync/blocks.rs
@@ -194,7 +194,7 @@ impl<B: BlockT> BlockCollection<B> {
 		for r in ranges {
 			self.blocks.remove(&r);
 		}
-		trace!(target: "sync", "Drained {} blocks", drained.len());
+		trace!(target: "sync", "Drained {} blocks from {:?}", drained.len(), from);
 		drained
 	}
 
diff --git a/client/network/test/src/sync.rs b/client/network/test/src/sync.rs
index 153a0f905bff..c86ccfeac3ed 100644
--- a/client/network/test/src/sync.rs
+++ b/client/network/test/src/sync.rs
@@ -1193,3 +1193,32 @@ fn syncs_indexed_blocks() {
 		.unwrap()
 		.is_some());
 }
+
+#[test]
+fn syncs_huge_blocks() {
+	use sp_core::storage::well_known_keys::HEAP_PAGES;
+	use sp_runtime::codec::Encode;
+	use substrate_test_runtime_client::BlockBuilderExt;
+
+	sp_tracing::try_init_simple();
+	let mut net = TestNet::new(2);
+
+	// Increase heap space for bigger blocks.
+	net.peer(0).generate_blocks(1, BlockOrigin::Own, |mut builder| {
+		builder.push_storage_change(HEAP_PAGES.to_vec(), Some(256u64.encode())).unwrap();
+		builder.build().unwrap().block
+	});
+
+	net.peer(0).generate_blocks(32, BlockOrigin::Own, |mut builder| {
+		// Add 32 extrinsics 32k each = 1MiB total
+		for _ in 0..32 {
+			let ex = Extrinsic::IncludeData([42u8; 32 * 1024].to_vec());
+			builder.push(ex).unwrap();
+		}
+		builder.build().unwrap().block
+	});
+
+	net.block_until_sync();
+	assert_eq!(net.peer(0).client.info().best_number, 33);
+	assert_eq!(net.peer(1).client.info().best_number, 33);
+}

From b799ee3208f8387a313c9728f9308eb2f259cf28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Mon, 6 Sep 2021 12:09:34 +0200
Subject: [PATCH 1142/1194] Don't allow failure for cargo fmt (#9702)

* Don't allow failure for cargo fmt

* cargo fmt
---
 .gitlab-ci.yml              | 1 -
 client/utils/src/metrics.rs | 1 -
 2 files changed, 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 98b29fa65e37..6f58af8c746b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -266,7 +266,6 @@ cargo-fmt:
   <<:                              *test-refs
   script:
     - cargo +nightly fmt --all -- --check
-  allow_failure:                   true
 
 cargo-check-benches:
   stage:                           test
diff --git a/client/utils/src/metrics.rs b/client/utils/src/metrics.rs
index 8df8e6596247..85ccce626bc2 100644
--- a/client/utils/src/metrics.rs
+++ b/client/utils/src/metrics.rs
@@ -16,7 +16,6 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-
 //! Metering primitives and globals
 
 use lazy_static::lazy_static;

From 60078b32141428576158662c81b402f081927e1b Mon Sep 17 00:00:00 2001
From: cheme <emericchevalier.pro@gmail.com>
Date: Mon, 6 Sep 2021 12:42:02 +0200
Subject: [PATCH 1143/1194] reset cache when storage possibly change (fix init
 of tests). (#9665)

* reset cache when storage possibly change (fix init of tests).

* remove backend_storage_mut

* fix warn

* remove remaining backend_storage_mut
---
 primitives/state-machine/src/in_memory_backend.rs    | 5 +++--
 primitives/state-machine/src/lib.rs                  | 7 ++++---
 primitives/state-machine/src/trie_backend.rs         | 5 -----
 primitives/state-machine/src/trie_backend_essence.rs | 5 -----
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/primitives/state-machine/src/in_memory_backend.rs b/primitives/state-machine/src/in_memory_backend.rs
index 3e75ff5126a6..f9f94c0c50d6 100644
--- a/primitives/state-machine/src/in_memory_backend.rs
+++ b/primitives/state-machine/src/in_memory_backend.rs
@@ -74,8 +74,9 @@ where
 
 	/// Apply the given transaction to this backend and set the root to the given value.
 	pub fn apply_transaction(&mut self, root: H::Out, transaction: MemoryDB<H>) {
-		self.backend_storage_mut().consolidate(transaction);
-		self.essence.set_root(root);
+		let mut storage = sp_std::mem::take(self).into_storage();
+		storage.consolidate(transaction);
+		*self = TrieBackend::new(storage, root);
 	}
 
 	/// Compare with another in-memory backend.
diff --git a/primitives/state-machine/src/lib.rs b/primitives/state-machine/src/lib.rs
index 07d7e54530ea..e12be0c586b7 100644
--- a/primitives/state-machine/src/lib.rs
+++ b/primitives/state-machine/src/lib.rs
@@ -1619,7 +1619,7 @@ mod tests {
 		let child_info2 = ChildInfo::new_default(b"sub2");
 		// this root will be include in proof
 		let child_info3 = ChildInfo::new_default(b"sub");
-		let mut remote_backend = trie_backend::tests::test_trie();
+		let remote_backend = trie_backend::tests::test_trie();
 		let (remote_root, transaction) = remote_backend.full_storage_root(
 			std::iter::empty(),
 			vec![
@@ -1641,8 +1641,9 @@ mod tests {
 			]
 			.into_iter(),
 		);
-		remote_backend.backend_storage_mut().consolidate(transaction);
-		remote_backend.essence.set_root(remote_root.clone());
+		let mut remote_storage = remote_backend.into_storage();
+		remote_storage.consolidate(transaction);
+		let remote_backend = TrieBackend::new(remote_storage, remote_root);
 		let remote_proof = prove_child_read(remote_backend, &child_info1, &[b"key1"]).unwrap();
 		let remote_proof = test_compact(remote_proof, &remote_root);
 		let local_result1 = read_child_proof_check::<BlakeTwo256, _>(
diff --git a/primitives/state-machine/src/trie_backend.rs b/primitives/state-machine/src/trie_backend.rs
index 4cdf1d3b75e9..7cb725a80503 100644
--- a/primitives/state-machine/src/trie_backend.rs
+++ b/primitives/state-machine/src/trie_backend.rs
@@ -56,11 +56,6 @@ where
 		self.essence.backend_storage()
 	}
 
-	/// Get backend storage reference.
-	pub fn backend_storage_mut(&mut self) -> &mut S {
-		self.essence.backend_storage_mut()
-	}
-
 	/// Get trie root.
 	pub fn root(&self) -> &H::Out {
 		self.essence.root()
diff --git a/primitives/state-machine/src/trie_backend_essence.rs b/primitives/state-machine/src/trie_backend_essence.rs
index 052c61bd6eee..557a098fbaf7 100644
--- a/primitives/state-machine/src/trie_backend_essence.rs
+++ b/primitives/state-machine/src/trie_backend_essence.rs
@@ -92,11 +92,6 @@ where
 		&self.storage
 	}
 
-	/// Get backend storage reference.
-	pub fn backend_storage_mut(&mut self) -> &mut S {
-		&mut self.storage
-	}
-
 	/// Get trie root.
 	pub fn root(&self) -> &H::Out {
 		&self.root

From 47ee91efb1326df09ea8c8e50d444d48f2df84e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Mon, 6 Sep 2021 13:30:28 +0200
Subject: [PATCH 1144/1194] Add initial contract macro benchmarks (#9600)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add erc20 benchmarks

* Fix typos

Co-authored-by: Michael Müller <michi@parity.io>

* Fix compilation issue on case sensitive fs

Co-authored-by: Michael Müller <michi@parity.io>
---
 frame/contracts/benchmarks/README.md          |   9 +
 frame/contracts/benchmarks/ink_erc20.json     | 819 ++++++++++++++++++
 frame/contracts/benchmarks/ink_erc20.wasm     | Bin 0 -> 30276 bytes
 .../contracts/benchmarks/ink_erc20_test.wasm  | Bin 0 -> 29726 bytes
 frame/contracts/benchmarks/solang_erc20.json  | 581 +++++++++++++
 frame/contracts/benchmarks/solang_erc20.wasm  | Bin 0 -> 12505 bytes
 frame/contracts/src/benchmarking/code.rs      |  54 +-
 frame/contracts/src/benchmarking/mod.rs       | 110 ++-
 8 files changed, 1560 insertions(+), 13 deletions(-)
 create mode 100644 frame/contracts/benchmarks/README.md
 create mode 100644 frame/contracts/benchmarks/ink_erc20.json
 create mode 100644 frame/contracts/benchmarks/ink_erc20.wasm
 create mode 100644 frame/contracts/benchmarks/ink_erc20_test.wasm
 create mode 100644 frame/contracts/benchmarks/solang_erc20.json
 create mode 100644 frame/contracts/benchmarks/solang_erc20.wasm

diff --git a/frame/contracts/benchmarks/README.md b/frame/contracts/benchmarks/README.md
new file mode 100644
index 000000000000..a4b15bd840db
--- /dev/null
+++ b/frame/contracts/benchmarks/README.md
@@ -0,0 +1,9 @@
+# Benchmarks
+
+This directory contains real world (ink!, solang) contracts which are used in macro benchmarks.
+Those benchmarks are not used to determine weights but rather to compare different contract
+languages and execution engines with larger wasm modules.
+
+Files in this directory are used by `#[extra]` benchmarks in `src/benchmarking`. The json
+files are for informational purposes only and are not consumed by the benchmarks.
+
diff --git a/frame/contracts/benchmarks/ink_erc20.json b/frame/contracts/benchmarks/ink_erc20.json
new file mode 100644
index 000000000000..390dd9b06cd4
--- /dev/null
+++ b/frame/contracts/benchmarks/ink_erc20.json
@@ -0,0 +1,819 @@
+{
+  "metadataVersion": "0.1.0",
+  "source": {
+    "hash": "0x6be8492017fe96b7a92bb39b4ede04b96effb8fcaf9237bfdccef7d9e732c760",
+    "language": "ink! 3.0.0-rc4",
+    "compiler": "rustc 1.56.0-nightly"
+  },
+  "contract": {
+    "name": "erc20",
+    "version": "3.0.0-rc4",
+    "authors": [
+      "Parity Technologies <admin@parity.io>"
+    ]
+  },
+  "spec": {
+    "constructors": [
+      {
+        "args": [
+          {
+            "name": "initial_supply",
+            "type": {
+              "displayName": [
+                "Balance"
+              ],
+              "type": 1
+            }
+          }
+        ],
+        "docs": [
+          "Creates a new ERC-20 contract with the specified initial supply."
+        ],
+        "name": [
+          "new"
+        ],
+        "selector": "0x9bae9d5e"
+      }
+    ],
+    "docs": [],
+    "events": [
+      {
+        "args": [
+          {
+            "docs": [],
+            "indexed": true,
+            "name": "from",
+            "type": {
+              "displayName": [
+                "Option"
+              ],
+              "type": 15
+            }
+          },
+          {
+            "docs": [],
+            "indexed": true,
+            "name": "to",
+            "type": {
+              "displayName": [
+                "Option"
+              ],
+              "type": 15
+            }
+          },
+          {
+            "docs": [],
+            "indexed": false,
+            "name": "value",
+            "type": {
+              "displayName": [
+                "Balance"
+              ],
+              "type": 1
+            }
+          }
+        ],
+        "docs": [
+          " Event emitted when a token transfer occurs."
+        ],
+        "name": "Transfer"
+      },
+      {
+        "args": [
+          {
+            "docs": [],
+            "indexed": true,
+            "name": "owner",
+            "type": {
+              "displayName": [
+                "AccountId"
+              ],
+              "type": 5
+            }
+          },
+          {
+            "docs": [],
+            "indexed": true,
+            "name": "spender",
+            "type": {
+              "displayName": [
+                "AccountId"
+              ],
+              "type": 5
+            }
+          },
+          {
+            "docs": [],
+            "indexed": false,
+            "name": "value",
+            "type": {
+              "displayName": [
+                "Balance"
+              ],
+              "type": 1
+            }
+          }
+        ],
+        "docs": [
+          " Event emitted when an approval occurs that `spender` is allowed to withdraw",
+          " up to the amount of `value` tokens from `owner`."
+        ],
+        "name": "Approval"
+      }
+    ],
+    "messages": [
+      {
+        "args": [],
+        "docs": [
+          " Returns the total token supply."
+        ],
+        "mutates": false,
+        "name": [
+          "total_supply"
+        ],
+        "payable": false,
+        "returnType": {
+          "displayName": [
+            "Balance"
+          ],
+          "type": 1
+        },
+        "selector": "0xdb6375a8"
+      },
+      {
+        "args": [
+          {
+            "name": "owner",
+            "type": {
+              "displayName": [
+                "AccountId"
+              ],
+              "type": 5
+            }
+          }
+        ],
+        "docs": [
+          " Returns the account balance for the specified `owner`.",
+          "",
+          " Returns `0` if the account is non-existent."
+        ],
+        "mutates": false,
+        "name": [
+          "balance_of"
+        ],
+        "payable": false,
+        "returnType": {
+          "displayName": [
+            "Balance"
+          ],
+          "type": 1
+        },
+        "selector": "0x0f755a56"
+      },
+      {
+        "args": [
+          {
+            "name": "owner",
+            "type": {
+              "displayName": [
+                "AccountId"
+              ],
+              "type": 5
+            }
+          },
+          {
+            "name": "spender",
+            "type": {
+              "displayName": [
+                "AccountId"
+              ],
+              "type": 5
+            }
+          }
+        ],
+        "docs": [
+          " Returns the amount which `spender` is still allowed to withdraw from `owner`.",
+          "",
+          " Returns `0` if no allowance has been set `0`."
+        ],
+        "mutates": false,
+        "name": [
+          "allowance"
+        ],
+        "payable": false,
+        "returnType": {
+          "displayName": [
+            "Balance"
+          ],
+          "type": 1
+        },
+        "selector": "0x6a00165e"
+      },
+      {
+        "args": [
+          {
+            "name": "to",
+            "type": {
+              "displayName": [
+                "AccountId"
+              ],
+              "type": 5
+            }
+          },
+          {
+            "name": "value",
+            "type": {
+              "displayName": [
+                "Balance"
+              ],
+              "type": 1
+            }
+          }
+        ],
+        "docs": [
+          " Transfers `value` amount of tokens from the caller's account to account `to`.",
+          "",
+          " On success a `Transfer` event is emitted.",
+          "",
+          " # Errors",
+          "",
+          " Returns `InsufficientBalance` error if there are not enough tokens on",
+          " the caller's account balance."
+        ],
+        "mutates": true,
+        "name": [
+          "transfer"
+        ],
+        "payable": false,
+        "returnType": {
+          "displayName": [
+            "Result"
+          ],
+          "type": 12
+        },
+        "selector": "0x84a15da1"
+      },
+      {
+        "args": [
+          {
+            "name": "spender",
+            "type": {
+              "displayName": [
+                "AccountId"
+              ],
+              "type": 5
+            }
+          },
+          {
+            "name": "value",
+            "type": {
+              "displayName": [
+                "Balance"
+              ],
+              "type": 1
+            }
+          }
+        ],
+        "docs": [
+          " Allows `spender` to withdraw from the caller's account multiple times, up to",
+          " the `value` amount.",
+          "",
+          " If this function is called again it overwrites the current allowance with `value`.",
+          "",
+          " An `Approval` event is emitted."
+        ],
+        "mutates": true,
+        "name": [
+          "approve"
+        ],
+        "payable": false,
+        "returnType": {
+          "displayName": [
+            "Result"
+          ],
+          "type": 12
+        },
+        "selector": "0x681266a0"
+      },
+      {
+        "args": [
+          {
+            "name": "from",
+            "type": {
+              "displayName": [
+                "AccountId"
+              ],
+              "type": 5
+            }
+          },
+          {
+            "name": "to",
+            "type": {
+              "displayName": [
+                "AccountId"
+              ],
+              "type": 5
+            }
+          },
+          {
+            "name": "value",
+            "type": {
+              "displayName": [
+                "Balance"
+              ],
+              "type": 1
+            }
+          }
+        ],
+        "docs": [
+          " Transfers `value` tokens on the behalf of `from` to the account `to`.",
+          "",
+          " This can be used to allow a contract to transfer tokens on ones behalf and/or",
+          " to charge fees in sub-currencies, for example.",
+          "",
+          " On success a `Transfer` event is emitted.",
+          "",
+          " # Errors",
+          "",
+          " Returns `InsufficientAllowance` error if there are not enough tokens allowed",
+          " for the caller to withdraw from `from`.",
+          "",
+          " Returns `InsufficientBalance` error if there are not enough tokens on",
+          " the account balance of `from`."
+        ],
+        "mutates": true,
+        "name": [
+          "transfer_from"
+        ],
+        "payable": false,
+        "returnType": {
+          "displayName": [
+            "Result"
+          ],
+          "type": 12
+        },
+        "selector": "0x0b396f18"
+      }
+    ]
+  },
+  "storage": {
+    "struct": {
+      "fields": [
+        {
+          "layout": {
+            "cell": {
+              "key": "0x0000000000000000000000000000000000000000000000000000000000000000",
+              "ty": 1
+            }
+          },
+          "name": "total_supply"
+        },
+        {
+          "layout": {
+            "struct": {
+              "fields": [
+                {
+                  "layout": {
+                    "struct": {
+                      "fields": [
+                        {
+                          "layout": {
+                            "cell": {
+                              "key": "0x0100000000000000000000000000000000000000000000000000000000000000",
+                              "ty": 2
+                            }
+                          },
+                          "name": "header"
+                        },
+                        {
+                          "layout": {
+                            "struct": {
+                              "fields": [
+                                {
+                                  "layout": {
+                                    "cell": {
+                                      "key": "0x0200000000000000000000000000000000000000000000000000000000000000",
+                                      "ty": 3
+                                    }
+                                  },
+                                  "name": "len"
+                                },
+                                {
+                                  "layout": {
+                                    "array": {
+                                      "cellsPerElem": 1,
+                                      "layout": {
+                                        "cell": {
+                                          "key": "0x0200000001000000000000000000000000000000000000000000000000000000",
+                                          "ty": 4
+                                        }
+                                      },
+                                      "len": 4294967295,
+                                      "offset": "0x0300000000000000000000000000000000000000000000000000000000000000"
+                                    }
+                                  },
+                                  "name": "elems"
+                                }
+                              ]
+                            }
+                          },
+                          "name": "entries"
+                        }
+                      ]
+                    }
+                  },
+                  "name": "keys"
+                },
+                {
+                  "layout": {
+                    "hash": {
+                      "layout": {
+                        "cell": {
+                          "key": "0x0300000001000000000000000000000000000000000000000000000000000000",
+                          "ty": 9
+                        }
+                      },
+                      "offset": "0x0200000001000000000000000000000000000000000000000000000000000000",
+                      "strategy": {
+                        "hasher": "Blake2x256",
+                        "postfix": "",
+                        "prefix": "0x696e6b20686173686d6170"
+                      }
+                    }
+                  },
+                  "name": "values"
+                }
+              ]
+            }
+          },
+          "name": "balances"
+        },
+        {
+          "layout": {
+            "struct": {
+              "fields": [
+                {
+                  "layout": {
+                    "struct": {
+                      "fields": [
+                        {
+                          "layout": {
+                            "cell": {
+                              "key": "0x0300000001000000000000000000000000000000000000000000000000000000",
+                              "ty": 2
+                            }
+                          },
+                          "name": "header"
+                        },
+                        {
+                          "layout": {
+                            "struct": {
+                              "fields": [
+                                {
+                                  "layout": {
+                                    "cell": {
+                                      "key": "0x0400000001000000000000000000000000000000000000000000000000000000",
+                                      "ty": 3
+                                    }
+                                  },
+                                  "name": "len"
+                                },
+                                {
+                                  "layout": {
+                                    "array": {
+                                      "cellsPerElem": 1,
+                                      "layout": {
+                                        "cell": {
+                                          "key": "0x0400000002000000000000000000000000000000000000000000000000000000",
+                                          "ty": 10
+                                        }
+                                      },
+                                      "len": 4294967295,
+                                      "offset": "0x0500000001000000000000000000000000000000000000000000000000000000"
+                                    }
+                                  },
+                                  "name": "elems"
+                                }
+                              ]
+                            }
+                          },
+                          "name": "entries"
+                        }
+                      ]
+                    }
+                  },
+                  "name": "keys"
+                },
+                {
+                  "layout": {
+                    "hash": {
+                      "layout": {
+                        "cell": {
+                          "key": "0x0500000002000000000000000000000000000000000000000000000000000000",
+                          "ty": 9
+                        }
+                      },
+                      "offset": "0x0400000002000000000000000000000000000000000000000000000000000000",
+                      "strategy": {
+                        "hasher": "Blake2x256",
+                        "postfix": "",
+                        "prefix": "0x696e6b20686173686d6170"
+                      }
+                    }
+                  },
+                  "name": "values"
+                }
+              ]
+            }
+          },
+          "name": "allowances"
+        }
+      ]
+    }
+  },
+  "types": [
+    {
+      "def": {
+        "primitive": "u128"
+      }
+    },
+    {
+      "def": {
+        "composite": {
+          "fields": [
+            {
+              "name": "last_vacant",
+              "type": 3,
+              "typeName": "Index"
+            },
+            {
+              "name": "len",
+              "type": 3,
+              "typeName": "u32"
+            },
+            {
+              "name": "len_entries",
+              "type": 3,
+              "typeName": "u32"
+            }
+          ]
+        }
+      },
+      "path": [
+        "ink_storage",
+        "collections",
+        "stash",
+        "Header"
+      ]
+    },
+    {
+      "def": {
+        "primitive": "u32"
+      }
+    },
+    {
+      "def": {
+        "variant": {
+          "variants": [
+            {
+              "fields": [
+                {
+                  "type": 8,
+                  "typeName": "VacantEntry"
+                }
+              ],
+              "name": "Vacant"
+            },
+            {
+              "fields": [
+                {
+                  "type": 5,
+                  "typeName": "T"
+                }
+              ],
+              "name": "Occupied"
+            }
+          ]
+        }
+      },
+      "params": [
+        5
+      ],
+      "path": [
+        "ink_storage",
+        "collections",
+        "stash",
+        "Entry"
+      ]
+    },
+    {
+      "def": {
+        "composite": {
+          "fields": [
+            {
+              "type": 6,
+              "typeName": "[u8; 32]"
+            }
+          ]
+        }
+      },
+      "path": [
+        "ink_env",
+        "types",
+        "AccountId"
+      ]
+    },
+    {
+      "def": {
+        "array": {
+          "len": 32,
+          "type": 7
+        }
+      }
+    },
+    {
+      "def": {
+        "primitive": "u8"
+      }
+    },
+    {
+      "def": {
+        "composite": {
+          "fields": [
+            {
+              "name": "next",
+              "type": 3,
+              "typeName": "Index"
+            },
+            {
+              "name": "prev",
+              "type": 3,
+              "typeName": "Index"
+            }
+          ]
+        }
+      },
+      "path": [
+        "ink_storage",
+        "collections",
+        "stash",
+        "VacantEntry"
+      ]
+    },
+    {
+      "def": {
+        "composite": {
+          "fields": [
+            {
+              "name": "value",
+              "type": 1,
+              "typeName": "V"
+            },
+            {
+              "name": "key_index",
+              "type": 3,
+              "typeName": "KeyIndex"
+            }
+          ]
+        }
+      },
+      "params": [
+        1
+      ],
+      "path": [
+        "ink_storage",
+        "collections",
+        "hashmap",
+        "ValueEntry"
+      ]
+    },
+    {
+      "def": {
+        "variant": {
+          "variants": [
+            {
+              "fields": [
+                {
+                  "type": 8,
+                  "typeName": "VacantEntry"
+                }
+              ],
+              "name": "Vacant"
+            },
+            {
+              "fields": [
+                {
+                  "type": 11,
+                  "typeName": "T"
+                }
+              ],
+              "name": "Occupied"
+            }
+          ]
+        }
+      },
+      "params": [
+        11
+      ],
+      "path": [
+        "ink_storage",
+        "collections",
+        "stash",
+        "Entry"
+      ]
+    },
+    {
+      "def": {
+        "tuple": [
+          5,
+          5
+        ]
+      }
+    },
+    {
+      "def": {
+        "variant": {
+          "variants": [
+            {
+              "fields": [
+                {
+                  "type": 13,
+                  "typeName": "T"
+                }
+              ],
+              "name": "Ok"
+            },
+            {
+              "fields": [
+                {
+                  "type": 14,
+                  "typeName": "E"
+                }
+              ],
+              "name": "Err"
+            }
+          ]
+        }
+      },
+      "params": [
+        13,
+        14
+      ],
+      "path": [
+        "Result"
+      ]
+    },
+    {
+      "def": {
+        "tuple": []
+      }
+    },
+    {
+      "def": {
+        "variant": {
+          "variants": [
+            {
+              "discriminant": 0,
+              "name": "InsufficientBalance"
+            },
+            {
+              "discriminant": 1,
+              "name": "InsufficientAllowance"
+            }
+          ]
+        }
+      },
+      "path": [
+        "erc20",
+        "erc20",
+        "Error"
+      ]
+    },
+    {
+      "def": {
+        "variant": {
+          "variants": [
+            {
+              "name": "None"
+            },
+            {
+              "fields": [
+                {
+                  "type": 5,
+                  "typeName": "T"
+                }
+              ],
+              "name": "Some"
+            }
+          ]
+        }
+      },
+      "params": [
+        5
+      ],
+      "path": [
+        "Option"
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/frame/contracts/benchmarks/ink_erc20.wasm b/frame/contracts/benchmarks/ink_erc20.wasm
new file mode 100644
index 0000000000000000000000000000000000000000..ffd522760a02dd8416f8ee04db02c32e2172b8ff
GIT binary patch
literal 30276
zcmds=f3O}`dEfV(-S@|R-}hdvZDC}~!TT=4T!9r|jFE&y!rfa-vZ7K9ai~MVmcRmW
zud!uWc1Q<Hm*7&7FpOxNiPO3rC8Z;^Qx&(Ntpe@zk}w^S@`swC9XF*N^~bczgbbP~
zN!(7S?&tfQv-|G7k{x23l&SCd-QBZi&w0-C`+U#YRdV3bkGmvE-2M4}fBbl|KRvEr
zPTleSj<bww4hfgKWu^QiR`ZzMKgOY>YI^+GF@AM*>=@Pjas9gE?wJ3s8+0B$c;Lag
zT)+1}dhqD|j~;#a$bpX@OkB9J-fkQ^@aUoYKlI>%rGvNMfBW0E);F)Un-3g3{P3e6
zJ9_`Y#}7VqG|9qqL%a3i0}noU@JNz`vg@tv@dFP&cJThAM-Dvn=tmA7IdbrU`gUmT
z!w()jaHOFkZIk!W7J1!pV_;2w?4iSt9j%)QJs&xE^syrkB`!Vq(Bs{YAN=^kM}F2j
zpQn!;hOf!MbK$)2IUi4xk)xddraV7A{$^A#6-qPRN;3*v+U<0FC+T)v#%cYNWtm@>
zq%KXVlP0~i-|MF?n;v#uw-2kU<>hSHyT*56)`JiKZ1Qj>)+CP%zWU$Y;Sag=`0JA@
zUn>2kr0`XLv2gjIa^uv`7k<|FrzxHFqj6Sv-O)u7%CfO5k|Nvcvm&wQw)&(>#_5pK
zlyh3k7dIutyPRLuMY7e8Xxwpsv{+^N-d&k>H5$8-8>(xy;H=$M4b3E!`+THF^U?4Y
z=i2QSYIoA=uDbivUDs2+WxrHTZA$1lsV*lP=1iGwPLl=q9{Oi^+tPlKRmqN|;E*pC
z>9!Qf42!A4RVzvUGvmz9H-E>iom&^-M%kyuIi2mHp`_ZrSPqJ0*3XvxeBHQ1V{S)6
z57qoq<&JPvV>fbq+AS8kJ-?LaMYbh*+LfKk@19PJPUUt_cMIs5_0LecyMocxDQDeL
zzI)?zRt$=6eofh%c2zR+L+)Rqy`;Lx*!uak(8t4<T;)VnR$ZVttNyn&A>m}zc`Nyz
zTiomuh6)R^&Hg)XTRP7z<Z>O<KzSl+^lTuzBM#lk<@{37$=BZ~4rSG4YnKz6gAtWK
zx)@mU{f-}zi(~4l>=vE9)14wIx?BCM%IB^upBrUEn9{4V#iF+*NnqH<Vg8zNk8yX3
zuEyLeIt<hwr`iBgVb!kb<i@K!q<%7uBRmlfS)i!s@0s?HLYw-3??y<1+lf>Z%5LS-
zD&E?V`0i;JZqw?mFf}TVt7fY{JYAz`MSrW`P-F|RT{4Mk$3s$%@aT;kVRjOWxRGC9
zxLH3RL|a!yyRsvQS-KU<vi!9s9w$*F6^g%UCng>khwU<uDNI9ldN%dhaeoX`x$J6p
zu-u};%gB>zb`i^>Jip!_HxFTCEckJ^NE&nUQpPf+da+2M2Is4b6v<a?m=rxn5t3%y
zbuBg0-<DpGdpJSwzPcb9^4AwB=a@jO2p`3ec-7(RWOL;Uzd1btORW_dgtd~FD&Ifu
z4vX%Be=jOxH1Yd<Qa9u)NTLJ}(NM%ghpescxHsgUm?CC0{EnhU9W_vNQ9gtbZ-xMQ
z6^)N4XgRhi9#8;7>Q1cDB!4Ypk|xS^N@BiR-`G>8Gu^`25Z52~TqeJE5x*9EH=USx
z9M*55$%BS?ToR9M((}PD&*}Q6+VI6LzkXYaN<|UEo64IzrXEz%ZcC2h&?+fPLRXRD
zdC5>-hF@y9v-xb{rRidPU?Q?<IDil+f38&`H;v>bC1UAa+tNdNewhgIb@lM{r_kdS
z2k~f~J+XpzZZ4B5#SLgo)o{0jt*2M${sd>zWfaUW=5H$emZV>~N2ZBWUiG=2n(>Ll
z1=KpIic`||6F5|PXj3=%Ip%cMf6k3Fys!!Gq_10kvsyao^?-UjxBAAp=Ei4qV@vXj
zUe4B6{}^8R>R<cC%}KJ&O3qrzH(Dis$4b7|Dna{s>Wh>FZ|<vKvXZ|$sl)h_-|*X#
zzX{h0e_QeeztcU*8P7cvpF3d;_0p6uvZuTvzsb*dQN0cSQn}$+6~AI5f_xmX(N3$h
zxYM0eo56aKe6^itMk!t~8A`3h*1zUu_|`<3v>!jm<0tjFR3>z($MId>!fVlK*FJgm
z&eX%tL);ZDo9I`!thzW7ez#8yBye-CQBJAOESe)%YM~Klsu5eJgMr61NaH`@cP0*<
zOVuPqL~;|79SUl8P=N;Sq~rvBC;56f9`t8}sG$5N9VdZQWL`8s{bS@k(icfcKK<*;
zO*o-~oyrnY@(5I3<5xxj%bmsTA%f#+YUk^W@8T-gA*d$=_u=rV)J@5;6ia1FzI0r%
zCM!EM$B7Z?@}DS)t(h9dq43bSFWbSeJGZ&}hy<x_Y`|rA2+$?=nRA{MU5#g}U+*z9
zDyLZCctFmmsGZ{SN>Y}joGLhE(9fMIF(o5LWjqI)$w<qdk_4jlyCEqnhFg7~N_fUW
zF(sk~MNd_6XCsAtr?bA2x9WJ&Q~SNb??LN(dpFMb)G^{BQ%vaZ!c0>o14cMxaz%I+
z=^`$Fn_9}qXgDNeb*e0Y8VYJiSK*X1Jc|;K$|)l9oJN2^Lp6Lf9jF=)Shd8e5lzfD
zCpdgnw@P?8#)0d_-Cx5qNbNwGNUrM`@4xB0YbB=(NeBR>Bgt55g11-mT<UqUm(4!g
zmd?R+^KW9loYoy>hOnxk*yxpEP_{k)3!H~^VZ2TycaBFo%rk5bbK^Asi7|O8PbyDa
zD#=3kk*YFfAiXXII`0=#JKcSjHo|Lixh~05x9BaEGdj<t5<H78l+&VeJV1=ob;39e
z0pu8cWp-2fo?=G*-nxeeInJsbJ=j|;W_0YzH+WdY14Omvflcv&f~I?Fnq*l?chM1P
zzF4=_-^GEE6eDuFJEerQ1H0`yas;!<?-{Q{RZTISX^6BB9oRd~17gGnN@hFTIY(S~
za6qba8vIhx+d~~^Ox{bv?#1L(9G>-ejdLAv0OBo{M6LX%uxOpYolM+>vprNF&T`Os
zTJ%IdGYT0%CKANi;Zix$x#JE7R(9c?_(}^g3x|nHIZ`pT2UAU^H;Fv@-@t=7=J;SS
z5?`+id_`STF|T=MeS9XjrVFb^w@@XTdLjje8?72huNu9ZXh{*b^=NAIldk=W*w76o
zgR98jCu(e}DT_sQ#E)@TW{#2cG%@r=9wdi>z&y<lqpSwSH1nRnXb)wm=*)P!m_oG(
z%_Bt~IKV)nM2SX9-}926tW0+y9Wx)7|CD6A)$fNVgnDw=eUcoxe;UXOUKcvEvOPsj
zB_%5Dqh@c<5uPzYb}B4_^I!~Olbws#9g#CF3zd&720DuZ40E_(yf_spDt)aQZho%_
z?w9ntSmNTOUvfPbX2Vb;LnZ@l*LGGLZdfnMv6%j^lUo_$Xqb`1uw?iTyc=8@3Ni#T
z2?g(xdvAvV3>AAEPx<4ro7>#&<)G>w9Wz}UcdFy^^^|uC%gF}gp60IDQPEi}N7WsR
z`JXTQ)eG(sfdW(L;<plt#(ms9Bb82IMB@%Z?^hd+RvR8uqUMLd25LvDf{g?Z4q5Wx
zC<-22UfG=Z4hsxeoJEChaN;;!h_(qXRCX26;`|e?nwy4Q*n)A(T(^Z7^Y!NSqmw>A
zbk~SqD@{&*PSKst+s>Hj(6frxN^jL{8RyouWB#%$Q?YHj_RY-CWEtn2d1rD_8Mpbx
zCp{X@tz{ql^RsAs{w|_`H2}AkKqoLqJe?GDRP=Q|EJi!s?J_w8BX@Df;%q`hgC=#=
zC4yA%kY(C*d`d2yaLM1)QrXqHo<xVEn;}lfV-IPj7~x#ZQ{%D8;^eVYTo~QxZkLl_
z@i^?E)V`^Y!?yZ`)entRKX?fG6Tyhc5;cen^!Z{YxLyWa4DjRl-zq_wbUqh{V~h^M
zr39l3qjdRCk7pE{!)1+c`0ClZ51c<$0_Vk?Sugeu<1Asi8oUd2!wN^^G_+%FLt-RO
z%w&!@o<^sfgd36`glE~5d2u}b-f7yFz~*F0=g<sk+?RDkchQtCqAT1Us*zpYUJdu!
z{6mt;LNGbuLo`t`Z@PfLp=SPm)LbWo5`>Q&_R&TvMHt|zIEPW<YX?^+MM$F}5FJbr
z(nb-2D=eI7o#HPgB<WmFP85L|lA=r|Q4dfAi!MYN<J|@-r?n#V8b!dWln_kn6Je}=
zZuMy#_o1j2Re>IZDul^ltqO93M3*IeA?j`k%I%DY=!5Unn2A1=R^RK;mHmqFCi;+?
z=6^}dLzX)9$FM(Y8yy9KcE!$dPd)}mBvn8}griSzz#kmtfB+A3ASYb*#3QL&tqcvl
z#kyjcf57gAJ|?Y?P_q>4og()l_?dGGexhk9fKONNVxqaB3&Nmze+{ZbCXAIRW|%Mu
zHfG6+8R14&W-(h%#!3Euq8X$4p8Q}U?q>T)r4<OXz^Oz&RJ_Vc@=TqZCk&bsY|eZL
zYOctb?L!V7BBLu3siae6<UB-KGjE;O{s<N(WWma1t;N72#Y(B0q)6TmWsUwRqf12J
zR)1b}LX*$|5w#L!nSXHY_@x<r<=Y_&u4sN$%qR+;?g!NP6vSuDg63g@B<S)R$_|i4
zK#j?Xh3^<9T5v#_Yt%Ty5*W7Qpm{vFkkCCcJIA3Z=}T)JG}I-93uk`5`Fm-oc}gBg
zQ1gvMf~?w%r3g`hd0F)qJZ^LGcIF$+g&|Y|d{uQ!RbUq;P8oqa-zY5lUh<PGpy&_O
zNc2U65gANCqRBJ!o7zaU&1pjxQzOv=PBekf<bkv5nHCUD?8vI8z`|NM^yk27ifVQ>
z3=PPzNeXCGE2o;$lQ1s~xKmxD>wqP~fKGLTt^?d?3?b@FFl*-cxZ=<?C#F~i;}c4a
zk*%hUm#wC=3U;n)`l=jNL*l4e;SUVmCP0h*|1Z$(SEl61SCBa7DJwFBq9~laCsUFD
ziOX8drr@OP&s5lqNl>3@w_Tx;LGg7JG$g&(xR2oq-Z2%=e?$|xqSizyy#yp6cTTY&
z*n!Jm7ne0=qlVZzk0}U|NJ*g9JWd%5`|ldm{8?N@0Aht?whTXb@Rr>NoU&#1#3(cS
z{Wv=k)d;dPru;`<5@bK42@2I);4D-z16u{pGJHJIRRG$Pa*P2o72xIau{?UU+`!Tq
zR}4n>1z+)YSHZ=t5upbH-~+@yzY1c9B5uO#*h~$#U6_;zUIW*qsR*%4oMJ^SnW!mO
zLD)~W5q3rzJBbK8eK)<T%_M&vrXI4jmq6GFq(Cme(06@h^ONO}S~d;BPF5|a7Sl?D
z>_RBPrwO~S!B__9M|d>F5eQmv?|t<Uc4={dOD72X-IPeAs{|GiSp?qj1W{85&eSE6
z#J$^6QksCUe^Dx82>U4q@um*^!q*o=*iRu4p&`Pd0=Q24unJsv4Y&>(8tNIgex49v
z*!ryhCab_zGFImo%uNT8HTB<IIo;fnglE*-zf@aWl7D5mY@Nk_yNN0_uKu4WiMYBj
z@NbY!TAtvmZ^gQ2XgE;N^seckul|-%OFvs8+%4KDM_X$4#nmHbeRYW-;jh!lGqft^
zo`F5*-5NCf*RW7co9Us{YGzmnpj~Ef#(`2=6IRh^n|$6@lWhIkO4Z9V^l~cpa-Loo
zM+D6SbGor%Aj{YoxN6<38aUPPq9#*IqV{k@6NWw^1)MOtT4i2q1}YM^YjzcE*&=JO
zji9izEf#G~i*4!MG2D~W1!$dAu3v!21>}^%O<aY6CJuj=iutgt85iu`zKu-)0#Ug&
zzogMAO9V{k8ggR+JT+%9LEW!(21c;xziiH6=Ni;~Qv<r|Ot$eNnER#{=6>T^%$*S#
z=KeJwT+M3CeKpXs?+T!0g0S?f&e8D{7Sl#prnCeAjwWOzq9=k`$P+si08K~s%w$NI
z%ge)3w!bKr5=|_rZWZH03Y<s~n{*u#V7oTKg!DH_p#SA#FK4fD8|1Aot_s6f!Csi4
zSw^5JYf%@aGG}RVH00_&EXz!iccJJ>zAarw(&F1J7-__|B7nXkUoh)G5fF59TFm4q
z`ML|>!HNqQ&0#R~eSnkp_>3T$ZZRWRM)Uk~olsxR9oL0vu3R2cL%srPQ0baL`JS%n
zbY1eCm7v+PNkslNf3gQwlr77-1T1F;R2?{eN;AM3{Q-%fj%HT@JQie36r0v$ejSr}
zbI}u2N02Tw>FyLK4XQJ($$C?Ng6gP#Xq@_C=1qTLj7nqVU>R%KcqF-1xDni+&1pzM
zSVg5&_ymJ3uOXJ3OOa#M%I+z-KPHBXKQOrHH;@o3IR*(`!=q0(-dW!5WOF62dZM{9
zZ@o;T@Gi!8iP+`u9;*>Ku{s$IK5kv@OD&}uwP{mKygP(23CTdew541YNCZzd(v{dX
zH?0ebw3cJYCIdJTi9zeY$5Ay@tA?irEqKZ{x0wGcuY+_FfSNcIs$5S|D+54f%GZPe
z)&mlI?`8#wQdl5JON(}WS%N`Ywm4$Ah;)oeb%3-`@HwrG+>128NABT3?tC{<2|SB^
zH6W8MJWI@tizDaV`1)u$uhnsdY{2T~cLO@;AtE4HPbVN+T5CZkIswr#Xfx>2wS=$K
zEJvtu%}O!51dUp2JLL_OwXLVqvYu2U1Dpu}SbwPmq)~qz3;=UusYP8)tVfDlLt(-=
z%@a(ZuwEgLZPqhvtfz*;n)(wcO!aA;NjcV~wHnzQJx=UrSX^6+%PeP9Y-p}!GuIY3
z)Iy(Fiw2b!j3zDe1~uyk)C`N^c0kRZBGh&&{c4OY)Xe4YVW1cd%?z9VFe&&mYOXOj
z<a2Gie_6ybh9$%e(--2#3{YZ5!oIkEt0#T&#cNrd?hCzQCXHPy8&y7V$^llOlyi#i
z15KG;qt5ICF0OAb5W#g#x1gyjG*F#F(}MlX6w~>8i`Nu+Bz1i=i0g_~1}r}?XY@^B
zX&t=xIs=cDA22$8NiOP+V&)yv4|7^Dh${Hvn8XFzVL(9h){LdDSr5lgGMRytYE@^#
zh;3BLXxgJnH3>6x8j~^b&lb<y;GX~vc_nVJnkDd0mJIlJHwuBNKE>P;XNB}!0RJeJ
zz*UL5I*H&P>pwBKvysA*h8b8JbWOahnI<Jy_q6g2>U<wF(f$N2v~@HGH6aiRsAk~G
zASi*pt_&fS5NMem#c1xPmgiZp5It5RMA4#!UD?DHXB!_-b1_P>vY_T|%Yv!Ct<@PO
zZ>mY;F?D3%sAHHC{iGP!23WPA*8&(XDwQm*5y1EhZq>F}c4`#pIm~A7n4kAbCz&-t
z0hHNv5!QDsge)whjR3B3US?JL7E`Fo&e($UxQT?lvNElbVnihwLMfbJ9t?z`L~N67
zC3sV_l{SSw*e^T=YQo%tz?AQT9^1|PM=oqT)2;)nT-~?`Dxi#A5v}@z-((iS`NHpg
z`|PKG?(B2Fafw#6g@O$bBQ>q0UJDClwqWgReYxz^=d;K%p6gK1kPY`vp0R1@yb;0=
zyJj~r96Nb~+=5DOQAT=~LJ(`~`?7gP$=STs1Bi3Rng}4m1%}jsqPCb<!=(&Ba}paA
zh6Nb#6*g^$-H~%O%mZOt{ia$D1>Ge6n04mKubCe^+kr;B8}8APjr6Wyn;lQ!v6Nlq
zJ54^e0UG8ZKXiavxj8|rF))F#@c^A!2*?GZ9BU*sG6v!mb{XOuWQGfF7^aGIQM^Cg
zGJE3>OlAY7lJIGm?;6I_g3~^N$C%zwZ>hP3DuoieTZSjtm(L3dJmruDe#n2a1e??Y
zb`WGo)}g!)kPV%?=WJcUM5?O7`RY0nde*9g#9})v4unqDv?BLTE5p;SF-gM|3vI%Z
z1<`>FSbOL5?pOoFphx+G)nM%8H?I6El9@r`e42H-z5di-SPj|PImL=OhrVsd8})`&
z%2k&oSq>di5)N#z?s7<nRgZ%oRxFC)fU2pmgHPU|aKm@5a${Z_$<~QTC|tK#xqNSl
zzo-&o{1#lzj>PF^z&FgFd^Yu6UI$^~Hoq9*Q@jW%CLpHGZ_}#KJl0p&ie<ifLp|U3
z)r`<j&m4104VerCe){UIO^NV=n|3;KToLfP9SMmg6<)u1TaxT_xm~<z@ixZ=zLGm{
z33r6M+#&c*bGK@X<#?K++_E_9n5Dw><YpED0|>DtxjrBkbhbY1{v%E6S$s0RxXtA|
z6SSxrpl6X-^s<g&a7uKJLLC+{(x%R}IH=Ih^;V}J>Yyep(wNsxw93)PRfX38$g%Se
zYpjG4+eE>-98YdZ0@HDmgiBJW4TusQKq6A6`6XQ3Z)dKn8MM~C0+21U2!1Iz6ge2w
z8}$#@=(C~N@md}m?`Fnh9*LIwi}{vP))ZXS>J|;9ZMA4Vt=(c+uBVM34NcuPmI|;|
zRHk%hc5pe7%tH?vijvXJYO<G=A*`nSd7g?ZZ#D4*y+epd^N>|!OK#6m*y046?yR6;
zMWVTDn->&VF2efnW!sV;r;w|M5(hCMe-+`YNWMC;m)Hbw1+mNI>8pr+o?5H8eAx<^
zU52p>;#NBiu}Ss0bTKd(K*cYHwV0&(udXRQ$0;0xISV+fSq^q(c@VlJC%fSCw+v5u
z*O5}isOj>LE5rqGxg9$_ft_-Tn<)VklTWLZt*c5@T9H!@Qjyc%QIhYwNwJbmY}3*V
zIas@^qFhC@e!YRWb;KR0s2}c(1UK0-yYd9f7Ko+x(n&qyIoT+BW=Ix*Bxe)#R(CCJ
zy;7T3Yr7Z>Yer(tGXLeU=R4Q=esF)2<s)fMOMbG>w)kv=XRBK;vjgytbj?9)t$X<v
z1qJ1hv*lpHzeo8bt(Ec}WTtWnA<G<u6f<B8tNOlV#59U-P(gdpb+=6NMaL)LKhTIo
zAJbJ^wtE$t%(u`q#vN2gmTvjrlM*|*__B`RRj3xatQWF!HVkS15kI#o-8C&Ych0@H
zQjx=LOxzRAmn|u-&IH&_iilg`&fm8J?etTJ-=PfGsZ#)xIOS0ZyEzKCt8(l|-Rci<
z!QtKtP1!gWSujKqt>@>{`NAof!9lmg&JjP4c)Bxb;xgu8z)`bmYu4}2@2IqY*jIFY
zuYm^-gn9CQwMeaTrncB)S#-1wNl8K2$H?lZTs+x6ZiU^cJf_&L&B~f8*^7OdWt^h?
z1g&Wx6E@l$W9=<jg>kru9A-0g;54)pB4|^7hh`LTkYB`P^cb&Xyvwc}7(CZgJTxBm
zia~JTk{274!pw`DIa_?2Px7s>$RPNVfVl~u0moPYfL%l|O^g&rOW=r*9MDLuZ<dy8
zY8Djal=Jfv1<(228`T;*k9*NwWh;^<3}8;D6w6dw$`B@WLnS<_7*m#55kAHWx0r0s
zIHe}DObGXdy;-_H>rc_9O|%5i1reCmZ85F8RBPSEwOWUp75nH+bi7in`~G!qTlM|v
z96QEdQs?GgU7a(RF98GVnsvk44dU-j`L<WAa{+~8<vS{1K)*vr`OWI37M&8ow&&2C
z`#IZ-$;pN0otfx4zGVe}_A>k-^&1wLCBv5AAp0gdzaqZ@X82Nm<IdV|-1)=iH{SU2
z{Dx*6C({_MPS}Y>m=LW<+T=IFnuz(0=t2~&;z|i6idM;0qE)ggTBR@TH;9o<ta|&)
z@EeKt+^>mM@*7DzRwaln#wy5vu~@a{Ruii%<&)0snD`BhSkvXVU*R_*d)l!|>o0+A
zY%ZR}Dl&0&F6?OLwbVb+Z`cNbfV1s){+P0{VvGcYvK1V(v<RNyY9v9IY}Kb>|32Ua
zYT;>An3sg=fH_c@heEx);ei;or5lQ5cmR;fCevXdnUoN$h`pKh>sSCqSRLKL5ljEM
zl`jGr(k>kcR<u!biI2@cMjw>-mFK7A=47u2SK$(*^M$_>khHW5@KIT_1yeh>aBeT~
zBZGbk4FV-C?dFUj<|4~bfe(jX!YHC5HiH03)W&`^xxKO9-p(4qSSUB70$tLu#k~0P
zmB~1cV>o;}$VJGTd;p!j?dJ~J3DU7_fVK<}#)2S`oe08i-`A!N#@Mvj;Jd&mn-(-F
zb6{v-x7}|ht1uOI%+{=Z8H0{1@IRnIv*0rs^vj?wzH9LVqK-|#6Y3uDfJH))T3@m-
zj6kZciAmz;Whp?}_Pq(Tn#~es3S+$lvS8b}f%}8CVJGOL=64;PMXfx?S381v)$iP4
zyQaA@YlyoI@*ksN3{MNn^^1L8x<~?3Oxa43o-z%yoZ`oI9`lQLQU`Oel~bG9ZV$QT
z9nwzE6sHExJqB3==UQyEQHH_h8f-NVZ}u@6tTA=3$zLy46b9dKJv1kqq6cyuE$-BN
zD|w$O!UVRWS??XPIr$v!#O4d)6i>4<$UMu~m5W$|&Sf#187;3IgekT-A?|7>z>5iX
zp`LleGaKRqIL+^rTcp8V!`D-_&e<7Mk}s|sYBE5NB=XF{z-@m%E=u4p1Y98#dA+3i
zyj~6039v10K@vAFA`<DH4G1Q`GR^-SC6Gm0DV@OK<;Dwq;~OB-f}J4S;34A1q|kPp
z2AX%&Q2$Jn<d***mE^N7Kt)K=)ly8?NKt`8fKSjNp&$qc2~%8pq=<sp?qT^@NwGr1
zP)^e)q9;KOn~8d;L_yJk=_oCP*SuVaayO$PMY=cWt4`5U)j^5%9`f*LI|}-Fh<vBb
zh&W+=JiPK-z3@U}Hfx1^`emn^F{PSWtbD#pc9T%&g%?uODjux-5!894J1iYZ!F8!r
z#e(8}&9{2eO^G^H6onVUJ2Tn3MVeZvbvw%+S2zUO-ZO0>UHP)t`n?TT3vp^$YMTu2
zrg>Urf~=4Jz$z_($VUlFP^eNLl_SDpeLE7p{~WGp#Ti#<HS&^xn+$J|nT>cz;7g3b
zW-T&uhVCAz`pn+d`*y`*5iCG|FE649(g;#*2<A>B1^EhE&4wj{s4nWA`~zkE+F}Km
ze;*wLHxsHnm0nTh_DPj{7<zTQf{2RLES;|)m*sH1S?rcHU>p!r3Hc%OE5ImlNN5UN
zEwbIyq6H-xmh^hpMjlT#hJL@tj*T^>wfcP+G3t-DIuam<r5W#h3d0sMrJUv^mBr)q
zl7&uPR0)c-qQ4>_u_@M&t@tzTV%qJ=%?`idf(nJa$`nZB5#RMvj=9G=nF+hfq#!&_
zGE-k;aRxrdYYZ)%C0dgg!bG@&7r7+Bi{2pGT>AWeRDhLXt<o!x#Piy_%7IH?e@W^5
z<*>vAf{fk^)4Cm^@#8xZy{L~7lMPDPc^XZ?a@yUN2+At7$Akx@dYd?)n?-moWM27C
zqRG-w?#srdyEJH6?KvNoL||AJTv8t<8N;*<34~5Bfxr;5zrY6jhEI!OTK{h|41_7x
z?Aay;F--5#WiZUXW~2+)g;GRj^7bXPsUE!4Ia?A~Dr3JBgF`p9f6!}fpI5<^$nu6J
zFTrWc0=uMaJA>dgWwExIA^(JcM!OC>dNf@27ui-KgoVBB-KhDAJZ%C?DcCK0WE+VX
z1dH?p<B<1^Mvz4&W=$CUVAv*5`*KBK^W9hx>V`bTGbK9Knqz+B$<m0rfnT`n?Q%Y&
z5?SnYfZ7tY_+YaTnQ9ONnnMTx2Ni=%mo>9+=$maUkn$l?UD{jfj7BbcG3eb%(8e{^
z*>W6L=-qv<uHN1I;(GVLT+lnR*<K8Vyd}&?*;98PyTD9oU}RtGS`5zKs_LTwL37Xp
zX$YFY*mcegoudsh&#p8Fv1$jM?d)MmTbhHW!7tpYG{-i+XxFD{j`T>HqtL4jGSmqZ
zB{o@xx7yJ})KCz@6`IqN>`<SeIiTFq9MOfE_42@mUK5F4x#qmBr8ys1qdD&n9&nz7
zaKczTmv-ZdQ)b;#AteqgEZvnZ-w#u8Wo$!>x)gV=>bqPtf=W+R>Wh4QVU0?)9R3w5
z^(wov55BlceLA`_M&78Db}xoEgiT}m5}i^C`G;ogw&zgq3J2Y?)djXSG`fX68?VHp
z(k<%BE7^{twpZ%t%}sR6wgNZ0Wp8<-TUuY2Zt3k#TO#NLuS9G7Wq2iX9>FV-lbKfn
zevxjWb><#c>6Xg_KZ2Z;XS{OV+R@UjwO;A-j%>u^l%+^eEw*4#!P?B;@ZXLiyyjAA
z=eRX(1eIRdkqp4>EM7|w6)qBG0{F{%)39A@&J`oGT`L#HdxrWN?N7ffaug`ky^abK
zGW+^kVo}Q<cv&rjnORFZ>Q&#mWnHJHa5t*)f9CM+ex4D-KJ5nNz*dr_M@mCz+{buL
zh+AmDyEaa<KAa5wyq~X5eoDI+ac}rIo`Ct)Q&v<YB=QW1Oj~yl3))iUkC*8@U}<%H
zH&@(yq)5Vs!zw>YE3lRgx7LtTLydyfg+uiiOL@1t0=Xn_AD(0nQ2+^W-VXQRG{@$1
zHe<^DJOR~P+6xD4{-KFVnVzmPUR5WJgf#YVgjFirzhMDU>-F^(4)dF`^U96AeRYhk
zVa7sn;`DG#f96RGf3`@@F7!Y1B+2!v4`o__jh{V}x7Oy6skkwRrM0jkW)qH|>xK#0
zinLWD(W7h#h~F5@$%6fSp#j7lidy?9eZ4}<R|qx#evs!d&O;nnOwJcLvU#8t`f1>h
zeG<beaGUkm>f~~kALRTsw$0L2&n(l_DOW&nSgf;M_O3bwzWWa9vE@{AhbEs0jh?gz
zsxi|AKCIxX>+Hh{uKI^+?OBza6ojB2^LM~gPG7wtd@Bs0A(&0gUsRVD>!GxUP*MI8
zL(p1i9Kwb;gg?5<5GoCT#aHFL(I3JGy&}1+j$uEF!UtjHo{*)?h0IfjIM>C^YBB(G
z^p1r!p~+`($LKB5f@zLCEeglRB6GcZMU*y_)A3pi`7wtF)e&96O>5rNK+gFPwhHXp
z=nUW9!MlfrSlpt%pCCn(ro0nf8%sLj!f72{GU5@8JS@qsdE^#q&()9U0tAXlnE-Fi
zq;w3;6(aJm%o|!Yy@d}tKZN;-MJw8=D`)hrRhXZ01`-2?L>+rihNCeO%r6z@H!vR@
zSeNPmM9b;{yT_%Q`qA74jP1wmpn`t2PWx*mH2VYy75EYt`5OmA{ZgTR%@*0Bf%6m%
z0)Ut5kYkKKpnkR$x{OF)D%39`eYW#<s`b#Ef_0#XP}*R9yxJd8KZCdHw{jp-yY2((
zXLCcIHq_4?<|3$Hn6U<?NKxRFQhUy9H+JCaeT_>pzakUi+r8nVWn%}7%e*0h*9v;I
zJK;TUxs&x2Qk~@wsiR@Ej;$WbT=X-_4<$o#9eZ=P_Q0#!-;yNbBy?e&x4MWPYdxe`
z7n1F`M_n4~m;+>Qr_3OriSavkL8>GtJ_3#kM^Gk!!#-NrmBOY$VMDRoJ?8BSeL)1E
z_1&nSjH&3G@73lJ(&GT7bTmk;5~t5<46ko7OmWrDMlwHrbz+k?1}k`o3H%rnhVV(;
z&-=;ny_zp+G=XrbAOqy4=3*#xjg-<8*@}fB1dE{?U}T_|&7;&I#PaBH3nDbGqp0vb
zQ;dZZ5UQsr;Q~u!NHU}U8IgyJNgYa-mofHR>Dr_^%ZZiD>6!~HM0Cy41ZI&FMC3GP
zxA9hgG;zE^{$_<mpz`n<wjv*QcPwspLi{<kx%qGM-e+BKvnqUpf{;|HQFpsAf7*G=
zm=`5!3QP(PK)%F5D?$<zhd}w<gw5>PHK#lJ+(f;x$*!%po13-?lt^ay)<)OErb?{{
zFdE~K7zaj2U+P3GGieU@yY!fr{E9IZwHK`rAu0jpv^7Cd#${Y6)E?tM)k5Kq2BIe7
zFk5;qME2kwT>b#V3u7210PlyT(fM7&-+6<dI^NY{%LP6Ng$+sH?GJ@8<SvNvi(Q^K
z>7LTrsqSJ9zA1j5VwvScT6MwOxUN{p&Ofy9ss95Odh@3jmjB6D{^0k9@8w&~dfdXZ
zD(vKn-9>O<jH1(q!`Gr4PrIRzIzkO5vc&N_eK|#V>8dYJPM7P27)!@i5V%HpA|9V-
z#-r;Cn)#fv{gZrVt9k1hI;?D2z)SRtqz+d0yb_PPOoUxV5GSO&7x+k_4XzmQ#UB=G
ztJ7VTP|iq%!tyy$bjo(?yXqftDgkeEBK_}iWnJ0TuW@Ca*wtU>Ds-evMVA#JJlNW=
z=m;?OJmadKXS3-;99N(-_Hm9=s;h(ZDS9XkchawCA=nrq!oOhyLtfRFBAHKh8=hY3
z=+v6{ww)TMpPiJR>Cmt_m+Dkgsz;ueU7xd-?D1zOr)Qc|RWx-$=2Vx`%vHjgxiAOu
zO=*m2)p?zrN9s|l^v3zqIG}Oj=T(Pq_I{`woEBW74P%1^f$eBmIZ&!hf-+dxz>)C0
zkaNr$H4e%w0IvVIbe<N5OEaBLzu#xNLE{}#lBJn6>nmgLR8Ph){GM@p@YHhq|Anap
zH~zh2Mxhr2RrZI;?&%I&?F(Q1+oZ1ehpHIv|E{JVGL$fKk#Ft|L!o`Ls_K#{)UT#B
z)`)dl$*;6Zp0koKOiIv{<g<L0=mM{Rv(%}OBXXePKTi6-p03ryi*}9JN>rt4caHq<
z{jO?vk043IU3C=#T2fszHt7Xs#P6B3-nmb<$4DB(vXM?qPn<AYks{#*lFy}ElV9gd
z=bt4$DYvIROxaBHvRwwpV>XUGb3>j)W~|czpC<0=yO6&6)kcn-)#CXN5|1doDvzRS
zzbZT;XQdnQ2%pEBx2M@tXpT5i%ojT3`b-@fCahu5D(0ybxm;9$w*vJ!0AHPI#&~Tr
z#Q&xts;{dKQ8!*KH6Wv>wPuKiPBRHW2kZk4!Mz`T*+b-8p>h|jR@X-M_GX0N)d<zq
zRY#~BjF8_oYEH=-C8y+1rQ+zH_6YLZQt?`Gze>lo;_~Ti)vXoxylA?LvQo+{PWNgx
zS$3z%GHpUDJt3XeH}Ls>VeK~<88?FG4t@gzZc2jRz<isMV380_!fbJ3qDDrpKgV<~
z*x79IRbSiR=JY%-1Y8El(hI22qhKXnZ5lpdC6LgREL#aAG$r8;1xTn%)cFOzudm1k
zujqKIzr>mN_UmqI^80okqVFYNC1a(;csyltAt$*=pq2}RpytCVco|B?V~Da3y9NGS
zP*A57!peI4gTWT10xQHd-zlKm%@C!Jx&*>5LD)(-hp4T|Z$-i`!IfuSJI2^@%}j^o
zzN`b8@qNfR&x><63(6MFgT^YRD`^hm3X0JdX{|RJXb2bRTbqX`Efgp~ZYJmx3hf_4
zuq1(M<`78|bQ;#7QKA%dhgaQe+h~gt4Whg)N;D{t*X~q;Gxxu&r2li`tVQq>sR&V!
z=a&IC-xMOb9`f$TXf#~FGl%HU(5ThcVunviTZ=<V*3#lyXO)mCwK$``)zcP^M$LE3
z!ZfqIq%+>A2~_N6$WXCodLX%OP9;Bu5lzTKvT5GAe|lOuS9p07eb>vIqXlwPzDF*;
zkx&+V`APjN2|HQ${}Ci^BC3-qm{^}8+<2;k#j7BFGDnlXoYchgO9+$DC;>EKQ}ie;
zGUgW|JT#=V>QRl036=?JnL(&>5iHDd$3WsQ%4^M{#(E8n=eeA8O+wu2S{~zyu0!b6
zM;x|#KJ1UYd_B7A%;fY`bE+{vZ6;~rm4lPUqxt-j<X3MDsq?BF;HAP}^*<~p`WsVv
zi_b<;vqh}c;GX8g@s}<2H%(N69y__XYPip>8ZNH!%Hf*B{$uV8HAi&SUu6*e#)A&F
zCEsOel>b&YQ1knC3456JO94gNvu<1Rf;eDMR*=|vnhe@`)SllS<hBwY0h3YW&_6Pf
z2e~1rs6-V~s!tJ7Jk`PUIkd0YQ)IKvqQqVM(4wX4iWl|QPJ;7kyrKw}|1&jxS&9kS
zje2t~Z=ea&V>^;dUiq>qT|I!8GZs-b8H>ziG8W8*m8xbm)p_nVI$T}gYGPW?an<O4
zJ#Lv+txqdT-=7D`nT%qZ^Y5FN)${Oq(mQk3R_`Y?MQ?l6n(KA%Xt4U1_G<CY=EP7O
zr+$|>4O2hO_sk*43p~IR03C4JqBZ(na~fr@Pto*vs)MO`qm^h4m{6pPCA@gXtf!{6
z!tz=!q$anH<Z=v8%ZEZZzu0+ge3ww>C5lkxrU$$>S9LE`e=(mEGr8qS_*0}%2mD(n
zbsi*VS!0_fMR|GSjlFZ%m<ErDSw|}uCYPJjdA?0FbC0DC=Phk5r;E`&#i*Em&qgMj
zfoMWw8yzsxL&`BxM-70nQ?K4}*{GA5=a)=`=1cyC(SNS_;+aFB$!XI+`8e}#f7>o+
zac3--*m>|L|5U26W;}caYLq`_Gh9}%_ZZo-m5JoUu?eZ-Rzsv&iseELH)SoW`74V-
zViOtE!mmjazgN0^5_#qcJ{hy_eSEfQ^aN{HPn3MV{(blXv9qIA8>=F)=F?2p6hI3y
zQxn%j9r;X)$?BsC@2|^wT$qYbeloO}+b|(lRp}U2KjQ)*Hdo`$mK$s$1F%G;;KWL1
zb<G8Dpz1(KP1x)XJZWeg(Q}qk8LDdRl-Bl73r?*1RZmxftu0r0^6riKU6rdrHHvM+
z(F81vz&HS*z4kwAFbgmJ(+tL>SN@^img%<HTLoO98KChu*z4B%K=CoFfp`S*LJ6s*
zIRg+}AkX1Hcl9SN*b|TeZ`)ob?eY~mir=@rOhP1^YdIu_*Idt{EbVIoR=p%`&u`cD
zq&@65wv3MH48B4mPKW(ZGgqM-$*-cD-Prnyx4o|Zr3@I-_Ixk1J}G!!UwJAO#@XcA
zk3H!lPV6`ktI9!B#wSOl8sOohx{RJg(JZZi<Ek+v_^1c$*_>`DXL#=d3-2It_=)Xj
z_u%%{y=SB57VMsitxOelANu}L7^}t*TDBK+i8g8)+e@E7@3SY0>9bFO4zi7+O}94Q
zv`E%`b``aOlcHAI7OCZ6uN~;~;qZ;g-=9QU-Ar1{e6q~t(NN^G8rmm6$)MNW1D%YL
znPnuKIuP5@TwR|XQO{qq$$XG<q5{5+Y&bciwrjpaEnbTYcKzEtU>yTrcB<deRlIEl
zziS0S>#X2ETS4eR1ybL`JPF{rHyq$Y;BvB=0tEMv&>UfN%#zWJuGS#7CVn25VVek8
z=m>jrNt)Q(rw`$w?_qg^wHnqiY}rCC<IQ-6bY2TGw&4WhVL1H6qz-hBmui`!Fwq<?
zstYycmS|p2X?c^&SlP3UK`Wzr#$odulJKvSP_z_^mc~hVkP3yeK7Lj`ZVwEHzwDfx
zQa1d&+jZo_x6kd^aZmh*O_R?jE(!m+WX-)DJ3eyc;g4TYc=X{|R2@Ei<YE4u)TWI)
cX=}~B9XlTWnTHM@xuW#Z!v`OF;NX$}3w9HbGynhq

literal 0
HcmV?d00001

diff --git a/frame/contracts/benchmarks/ink_erc20_test.wasm b/frame/contracts/benchmarks/ink_erc20_test.wasm
new file mode 100644
index 0000000000000000000000000000000000000000..f5d84552960a348db3935e457adc4b6fba249d17
GIT binary patch
literal 29726
zcmds=e~ca1b>Hv3Gw;Xlyj_kYTBb$Cnm4Acr7c!#Ste=HiFdXVf0%J4+p0sSibPqa
zE$!+DMbU~AB;vYK4JI~Rx>gbW;kHcSKr&#pbek5m6Cku<v~+8rD&V$6lNJmN6bzam
z0_vn{QB?hW&z+e!Z%HYxB&SBT(3?AV?vHcN?{n^*p}XhN2fcI7-+RTOaQwJClpNPD
zMSuK|r<8Kf#c``gRvXKYQ|k`(^jtk2uNyzk({NnB{<weKMtVGUeLVcBpY1(*_?`zA
zbN$}^=;32`KYHxpqxXFBu=DZ3MtgAIJ&)dZ_s1T%XZ7$+ci;5x?ajk0?cv7{A9?uE
z`;Xmy__4ze9dl{ym)WCx?|I;X!$+Nqbyr*6WA{Apsl#_4J9^JUkAC9t(W8ey-aL+@
z-TT1ddyckHBwg@6*#WN~AI#d2_dj&xQ^%TN;><@6AN$nNhn!CiKlE7t!NU(eeDs%s
z4|(#)5pe5<fg2yfz=yi%GEY7K4Ff*|{^nFMjJ2sAB`IAK-wVB->-T(`On%Zd4f8JX
zNkX5*4U(C`OtK*#&G!4gKLqd9+FF_ot_XdQ^}xfw<Q__e8h2#&i$Cy3KIW6-Z*f(=
zT81sI2-R?<@cC@z$4OW!!a^9%QM(XE<Fp8Rq8k_M(y=dGk!}xZ;jG{G;3_vxGHMgb
zjFzu#aoIi}rlxS)!-&B>&qpg&nm=}HYEzBIe&jPvtr5J9J2lX}qdw##b<IcF+r00N
zTWH+LsQa4fztr~wwOb3T<#3B*W>>x7w9NT3*_yaz|3T(Yim)RY7D?rHxlMpk3=3bK
zb@?v}5$)e`>wUutI4B2<v#8Quy1Q!UN;y-wg|JW#@(o}ssr)X-xYg2X<&SdJVApVc
z+OHIPytJC<MY7F3?aQ<Zd*+fNt^A(3elaMLh45u+_f#OVI^}J;UNP9Sc`hwxie7$2
z*`M>38-<ML7a7l07g*6CzY_T9e9>24P$kv#R43K{vLQs0q&jCcKlCeGgWHi%QzTo%
zANw825|5z9RX_ve5Vm6A2JBRLxrN)M)gsL|ULy=8)eAN*1%?9=RXDa1QSzg%A3_Ub
znyTy->HfK1;fmh&u%P<IOY0X$X$DgIRk~92w>byGHfQ-8#(mbE7Co)GFOGEKIL&4N
z6;$0i=dQU-C(V;;9kEBeq!FTGuy-y13S;X3{hI*^Y&$U~klnzoHN2q(@wPc1A2aF=
zAhl*5Ulr95oF>Ls)DN}?s9rPMGH8d>jU{4-Yq$f&uC9Vt@~aEK5SAiAo2KwodKBV{
zqhei>ztM=|MPO(__4lk`L;+orNVpm?kW4<2g!FiL9I?3I8__qRsM(aoR|_kM5S97W
z;kb#t!LS_0{lc|!6RPvjE}?m`LZ#Lds^_VaQrI-9I%gC{(X>?>WVj<aD?RWcOc|=P
zFr3fdBJ@-zVbC}nil;i!-u1X!Ywto4wkDsh2RYvil9#GJIPOE+<?tbxB2>)J??u;)
zYCR8G&;EFj@l4APEn2HcH&+a_Bp3~~0Pz|3EJPbpldCzywyV|vE`KA)7gq&TqUazc
z*T_byk{(^~BEo+k_*9zd0-7mmU&b`NdnDO#o=3U|)C=9VsDIR~i@LwI5n`<-Y}|q9
zql%0+thx%OP~&ur+aVA%qoP9|C}vA)7E=@FoQNZh5fSL0%NL3ut`$llgT|hqv?e2T
zXojhg`uwCu7~HobxljGq(DC2V3{QUsnLX<P-blnRtdMUlU6mlxT2qzn5g8l&pP(d@
z180Pl{Ov{9=7yDjWDZLc)Smm9`QSX_Y|K+PoDmzJKsid=8jpd`F~x=Oc|S(SMZ%p7
z&B*W2NGF3jXvQ<s56-j?KC1`Y+?RqBXQ=*}Vdme4m95V0u$t$r=DVGm-?Ex-b!uRF
z`hJC)sF_3ccdh2DlQyj1eIx8}e-Eq`;YRnxu-iXLiGE+M`<*a^260MU*;7HbyA}Wh
zsd_hBqw?8U4ZmqC0(_LI!Op0RxZ9u6n6!>PtDW>2C1^O8iLHdzzZ0ahZHUr!yPu)^
zNp+7hrzzDPjTFpO7QJrklb4@NGyFQhT{5zfetKlJl~t9Lv;q>bx!AIzSZ85J0`+S%
zhl<pSv4GnH@?1MITK|c#+j)2{(U1U9gX@rFDwsR2$CSb?)UZMXe<M>z{@ElbsJ~X%
ziBS}o7fk#9G@gt2MHG^z{*L?%3N)~yBq6~kfaSG*c?Y1}n+?t&9KC6sZ!o+ItK3He
z?Ru5VvZoS1BgImzmI)ruaaoYG>@ge#1JdUQO4&aRibA2&cqrLHuzNT9yHN31tnFbF
zy10k2Es;-|trXLXk>4IR2E>fU2~s$o#p@dw$T=;U0Z)ia3j92o5mNA57)Gj#2g7n8
zgP#?H+W;voG6+B;G~;YBBcNtwCLs)dXF0fa&Z{&Wr(vl&UJNw;pa^^6`oaFq^C9u9
zxJae#hqof8NztzX2TbmU5%dIwoxfWnrQ@D1ZmdaV(P<%T1$E^*P(rhS9Ox@kM?b9q
zg2ra(XeLlII#@Gj&4w$6O6oVRsJS&l!?6xjFY5jZ`arcqr4wB@u-<<+^jC^b&%0;<
za4p<eY=XAe@Z73D#&~N;cO;7--SnG~FQs*JnL?~86B>j32I_X^AD|qafbj;^+%g{N
zvc$5vERK`>z<5}wXW1`$tL1FbKY-hb)4vMgW>p>*GrRp=kRCD(@PDY%-(a<zS2-0+
z&=+1P=LF?=7BbE?&fgpW;5-cFrOo7fih0d@!(KXaUC=n{I9Ms>b?r+x1W-f=tXkV)
zOWmPh=z)eVtR?Q4Knul&?ExPjP}5?Be|C$Qka0k_-PagFZ1TT0-T<o_V|wF|=x!$a
z=jb3r+*zUnc2b61H*<lii(34u{J=rs4axg)zJrjQ2*V3u-#FI=1t8oaNwmsuL!wmx
zJE^b<W(Tl7nB}4}9-zQCj~A{L2*PZ(T8>oqJVC%pdAPzWBh(%>NW@^nOCWUsQjMn9
z3OwfDL`M{J-LV)6uUAF9!mf#s*Y??1_sMPO!kRHHP(^A33J5n?wU9wIx=pbOMDr`^
znpmvSw_gDpr$J;;75VLg#)3sjEUY7ZjQbLEgk+%5E);pB90CIJq<(8!%@%XTF#n)+
zN@3CY@mw(jYhjv4vOHjbh13+q8p##UOMcQaxfSY|`1t%b%o2kh0w<VyoYMoM9G-j<
z!HZfKIMcElWG12#jSkRqu=gl^jF7zwiJ%;XL1?nFaNQF)bCOW$$YNHdnt+BK^onC*
zl!_RYxu%wze@FliOXgiEQE}ogsU9=4aj7*zCJXJh_SPC~*er_l2;etJtz;+~VrmfP
zvVRo(?4_n4g&-4C@Uv3yT~mOdB9G&la9nb8qra(~t@_8tgkIxbbzHih`d(o^+3a|r
zIFw};y_IrQ-Mo^&zZ_OC`9~Di&%le{Cxm$ac!;`ZrQ!*MXxxM7!)nv9YSX9WsD+Hc
zU*m{XEJ~8;0W4{77zN`at!zqsml+0ynBuX1RN^RIfVLPLDEl&KiY4g^R!vQVE@Z*5
zWvbgujOlvQ`n8fim-#D%ud}UBen!@v$-By!IOnviwYmHZOBiTVH;VbUeVGVtbB%5$
z>XKxf@ur<|S|!}37oQApIFHss)X%5k_WWnD0yY5HB5NUWMAL~uN5xR(tQhU~H%a6m
zjMT-=D+>;b227f&j|HjTE6Fq!PR?LIod*2Ptd@P1)e|1B)eLq*8arc{VuW%rO^wFJ
zi<8DqP+?4?r+o^o!p_9@ZF>~9wJ)rF9Gv!1LolBJhD7G50c3<P6!TH_vfyGCJ&yjZ
z9L%KhV!a$gbi^<<2whyI&kv60Wt-z|O#|*uH*=u;X%aCn<SYcCH>;zBxoY+Uup3f1
z8Ygia8ygU7;Dk&<!toqD<we}+^gulGrc8^Y>G#huwg^VbVmn0U1{3nzy25~PN*~e{
zelN}Nu5PNb{T6?SQfV|MCqlF)a^{T}&^NTqKMI?xfGL6a(BS}MBw~bFG!<nKCA{`f
zbz+31W(2H*F+$QZLR5u?7pyb<C72|Y)pNoKL`bqSsYpEwBbar;${6l8(Ku-sVbC%H
zQYD9A(jE(A?Q?6-;HVE-t(p~>F|vZB$G|jfOATUOR?&s9yE!N~u^y}sx>IY$`cPZ_
zu*X#PE5KXpgKL`qypRVibs3I9f6Z-76bafFI>!U)7!;9M0TN-3KFtMvaEuECJi-Ot
zy%w-XVz-7FT6l{MMV9{!dlu)Ij6Q<R5~Ozq-wWes$|>rJcBGg{y8ILq&W%%G22J~G
zQ9V3iq(nBuh>5W=NtVrs57IKNy=6Cc`A4y4tmcQ(gHG5@58z765T+4RPC8V$N=y7q
zl}!^y&WSQ-Is`VCWlRr1haQ&E7fvkcWf>_)D{JDda-)wxp+f=7mz@xq)=}?>iunCN
z*7Bb`I@wD^=bYdKCS?Z%)Y+Pr`JL<6FU}as-;P%Btm3O;URLl+!<hFyCBY#IS^^28
zpwHh_rj{d7-Zzb@xYY7<hDP`w2goZsLiA4ZM@EO`doFFwQ2wuH=BB3bu@sitzgJEc
z52bgMEWQROFR8YoT9q{cWl8l;0*m(MJ&0F(L&z%is=W0MH>RnQUg}@0<eQaEK8Pv0
zB$<3?lS{r}DM1z!bIC}5er-3GY>}+_E^RJZ=@NzQ=0qmdmpiFsEJjj2MFy;sN&Y;^
zp`u!tP9&3B*aD^_)bfyK)Dz^z1*g>&(X_YsZ_<5CPZ>f84klS=B6}2YoSK4ZFH6LW
zorTEG(1uG9u*D$goErMF7}Y?+sL9@sEkBJm6Z-#O<fmU7lUIc$wJjl`(8H42h^P{y
zJ|?x<9Dp;8aZQBCyhfh3JNPiNyY3=iBnJ)W2&qyz#@P8!N!p8s|HSGdi*mG!()*G7
zeg5WpJ7S^c3)`QmjhZ=pXwB-BrCd+9d2gwOm~<6r9dQrF{~c*3#ceHGVaFbsuoLV6
zE>b|o8z1+lUNKG1s@A8;VPrJTR2~)qL^>~%CSQ{V6ddSM@Z)oYpE5`mXM;u*Stq@%
z#2iSjpW#%H58sj4AW<KaUoBO;b1F+N`M2ajx8ss^th3}SlomAws>lbINs_O1ljMxr
zj3-1DE`Kv}8y&7!NRmg2eQxN7a>!q3=|vncog~LGmWHZ5L(95FYha|=*ytx=A&gK@
zG6ev%>|e(uc_hs_k)}<O!ynqm;CDi%m@Vv*DiZW^<iab7N%F6V_?9F;<pI9gF9AU>
zmn1(0{*};BDk<j2@c^ds<G#(03utR+>G5;udrOZmgzvExTe-0&f8KO%Bw5@39hKL^
zZ7%lFZ2v-IZFB$HQmdhM#Q&f*5lw3R52>kB<4R+H7l+VHeW<=)w|$m@BLwa2is(Z1
z_YGR+*;Z$)1snCJJ4|-oY6#pKwo_L3J52IrMitjT3wqA^bqVc%i0moyWrlLlj?TCQ
zV1|KGToZS=7#o*7ZhkdNj*)L<hTZ;DJ<B;}VI6heJ0eHBmND%-tOp}C+6=1!PPMpb
zz$9>HrtXSKLQO!?_RJIr-GvH-oeGeoaU~!KUX+c<unQd&ZB2?D$?di6#x09r;*H^|
zD4`-%MdcRm;zFIL#**ZqtX-Fs$_{qol?P?YrB$s?jvo1N?g6*1Fs+F)m?X|~Q{aJ)
zQ+8eOzhLTn_qxRSmNsv$l4Rp$(&k$_Y4dB=r_EWBrOm$;qN<rrn@{IT_Fs}KnIuVu
zRqxn%28rn=NoJJACl#jTMx6jrri7rshb^-_NFbh3+T_)xLw3qYD&=-bI;0jcSKT1Q
zM}O9d5L<K~y;-|A!bJ1t9Pq#T^vQEq_)XH*lU?N(rSS3f8pcyD8zCabGD9y-ZpIX*
zGG)oG#iRnuLFd*JS0dcyGDl$vTB9J2DFd$bRGkAqE6HC7pN>gzQ(6RL)O^Rs`2Vbr
zX_h0T!S|D2wC?lDvh<62WmXibmm8G0Rrt3dMygVIP!0Mj*8)q&$iTD$J;c*ZjdV|6
zW{!MJjAs-A+2gZy645g1BtG~fqdub`u1VmKOsE5-nEzGQ7b`ZWczgr#xT)w#Vn$h6
zVA9hW3T<L$PVsizev+6``xxxgJ_gUs7uWbKDoqNOwU(_$l3E2DQT+`XJyl8lDaF8I
z%PU&SBKg`JKPB}?Y$y8zf{S6B)k&<pSX@EZr(5kT?RK)glU9Z7%~aCXawfoCZQn&=
zpMQ9)L8QbiQo;d>I&MSLQO-~?>cS?QczZNqB9fe}(n5iTbk9?3u|iWJvRg1wSKz6t
zWUye;nX&^6Tt|u<R)e*g4AX2U!(?YoO#hWv(G&0*;9#h7V}!qjp5sJspo#@HRl>yW
zYy!num6g)I+fb4amJ%XahAS<#p;(`|IA*0_@I`HJ9E2M9>347;2YNeJiImh(DU|^d
z)TE@eo_c@doF89ZOU@g0J&QMBZSy-&HtK{0Bwf>sNhxiYz!SZgl(Ot(<fSVyUx`VM
z62GmSfb5cl(t6n`-$Y$kdU_q{NwhNZD=~*PTrJ77Xuci-fVdGzYpTfLU_;wqD36%U
zQkv2<!6chCAf;MMPu5CLlg(<|PqJBR&*0?!kuGhwNZy!nB0pJiWkW8LoKdl<y_d{f
zS-hzsy2u%&MT^P{R+AKYoA?^W#1|67<Cyq*3RByw^s6;?5??<5>ns$ZVVJC)50L^t
zqxK$wgFaVw=a)pRAy~2>h`y3$1aKlV6b{AJ+XL=PDBj5a@=ysVazMznyixfBr+hK1
zRV>Q7&!XasH)t}u0gD^k8%S_fJ1q&(vkXw3g43e>%olU{M~XKTc@65ub`e)i3$XOS
zqQN(Vr1j9=8!Z1T|A5u;iz03&sy*-MewcayK{P=Z*G^o79R$RL+`6?iEt}<pi6=8F
zrka{eX<l0uoXZnQQCwA`@X8X*h>Yd$Z2!BPze~ZKv=R^4kW&6ml1%>Y4j2MaeJUwr
zv!R}k`8#Swa5bW>3U&T2jk_DBmVpA4w8)TZ>uOmOO=>Q$X{8%9`2k|g;UwW_TVWn(
zq9IhSnT0!`qXzi;5`=id&<utU&C_@a(V!AMR-+))_}}jEXAPjbLz5#!%Geyx@OJ9J
zSl_nWEUj*=iHS9K1W&M|aaI0vLSQ#Xs*F=7M|eT5WO0RZgirXXv#A`m*aV-0Y)*TH
zr66~bs0j#w%)&)b-!l`kyaqSo5`$(PUa}^H33*|5g>~9NRf$wd5fX`ZK&U4!XKPLl
z*cLkl@V52mSS^i015OkS^L=&8?9Y8XEvCZ)2@6Q7YgPy><)zDtRe$nrA_vOLfAj~>
zJ@Gf6JO7P~m?}GKsB^K#O4>TWu%yd8QLjaGSyNtsesx)wf`M#_x6sa(xI_W5wu7r%
zSc(<iDpi1F<k!pn+$XccmiU2mi4{^>vUX(BJZO<7ZYZpgniQwJ!#4Q|Sc*ezQ3w;q
zCVq?4(i|Sgsa$L_HUPFgYymL_Siv+dJZ_T(yhmbUZwJS)aoJw&w20RVPRAK4`B_-W
zcZ(Fcojl%}i0DFhd^D>^I!XeAEL)nwb`Gf=MQ%(W(6Y~BB)C{p@h6)+Z~L*4XO>72
z;%522tS%N5>$5J`^Q4fwc6~O4?<u@BJHgp^-Uy(VhZ|5c;a5sBhk9%mWz}&i#2sYE
zV6Qu#YZ@4d)KuBIrj6*EcG|#M^*AK*<0R`wk@jYk>>0mK@^nl}!omb5!5qQK`(rIo
z#Lri&*|C>exb&}Z^Rv!}B<=MF!<pHv;*{2ChCOXALpw4z8e~<%U7t-;E<HRBE*xj>
zb4jvlz$IiA+g9k8Y9^kslZq&O_P!}C6|`5eK|sQ<8&)cxKUSg|Du)T*hDO=tydFw1
zL?x5`S`zwEgqBw7q$dgk50a4H!q=oK6sCsiN}()NZ*9W)P|YiC83-Y_HTjlVWi3PX
zuC_+$fNOVqTv!3{=3NfIkp^#BxzV}ZKDV2<uiWUlA!y*qJL40jRc=;xPN7+~&0IJ|
zAa7e)@H$f!7Tk4g)5RRaHg|PQNHE#Pcs>vNFfj9Dd~u`Cce7+y&BAasu<&JLqQI2k
z9K|-;aA@0Hi7txcTy1TJv5oXq+lC#9AzCROy2pjiKc=-}DeRa7J7@IV<|5M3h*(2B
zB)v!g4?q!-Vrdm^_TAL?6(CR2&yo*xqco$rDNJk0=jI-MwvDFxUdkCoX2N3!kr{co
zl5Z;|O;%wNHyP0sZ)e1K41zxGjElgoG5$)t+&C5su&+}lOoqL({3SGxGw5EvW^Wqo
zH8}v&kQ4f|qdNsW9^8G92wynP)qpL!$w%p6!YLB%4(QCU>I~;VDZ{Wq`+}W>uLH#C
zmDFpPKtBcd6vUT@^#Z%}Qz#a!FH$)L>kC#9_nD;2s*6_9VwnnCa|^7io=jFEeqD7w
zti){-SCK4jYEM%HVT`tnzFOd7cjo25O46vyK7VI+GWec&s<w|lf57b7B~~(E!dZ%0
z$OO}9yLt&{OXZGqY^3y~Y^1#gB-MAV!U0a1&51FjU+t-?a#byajh337HlXpzNXaDI
z2bV`+egS(G_J&8ZV%QJ&SvVt4MY@sFgu6A}6v?N>Bbt{9vx@~l%}A(O<G&pA{MW0(
zFlxWk?H&SwLYICL&MvFT`R`5}Bz2_oYq%DHwPwA1n@oZn#D#KpIebvgqWM@T2i#66
zgy=%fM*q=dX?kiUDmwBR^BA2qH?tDK3ye>Le$oP>eC>;Bd*SsMGT+9~h<4m`ker);
z^`xkdqrIl<f~b$Iv&zMloC7^NAH>fM@@b99O_}rTT{Pr!BT>1lo{f99(t8R@j6Vgn
ztG;3tI*F$V|Cl-yr-~P}C@ZSwP9gu+%5z?Hd$^AqE(a?ZW%F2Ife_iVL0C$b3NKRz
zLi{QxJHis=>CY$5rvzDco`ta%!lC@;O6Pk+#Uuw2fQ9h!7z7{EhzsG)ajLO616lNR
zOh_(4JZG4Suoyu*7s%;Rx+P||GmC@l)w$GMOF@2u(X@~W8ZCfW|42e%7%plIb67cI
z8dwSev?ae;VFRe-7cv<<5kdI3YrdSd+}l9b&~P{?W~2HRy*NMwbV^@%(iiUzF5eD{
zY(t>LTyB9RV2t!W=)!&}>X8*K$u&gRfI%95GtHv7D>BF_AC^Q4`h`84H5xpRcF|M$
zDxxL`AYhY&#Wc;PAIy+va(C3Qc3A3$AedfiaJ|vySue+AfoShQJUgZ53*i)FS~R8X
zn>;6B2(H^^Tz8@2y7TL~4lOJ6F`0mStz7q`^W2W=N8>q8biE?aExx`yXBuAwCTDBX
z4Qe+Dzt`qFUNg_d6dN1XH3Pza;66^2U#D3b(#Z|%YK~!nS72u)DV%HHX)%50s_$9F
zUp@_gLiL8(Wzn#sH}JhN&aX*tkPv(&y>UyUH*Wb!(;IJlb$Ubb#)-r@)KzO%Fbfl{
z6+WBvM!knBy-}+WS*v=#hZ<QccNuHtrmR)+%6bD|4J)LdL-~7Nh2C&F6Ti+@NpHBW
zt#Xj9wpD=ta<*#Sqt;fL$0wfKHPIUgv4Z9IT%tE>^mJ{NHdi9rIQ%=YRXF1CTs(2i
z`=EcJ-mu;Om`pq5!{hSCiZK)@@RtiN+BYPd;F~;xZaGTNz~Lh#7ifj1QDt6Ys$<51
z$~;!;gi|2Fup{9O(Cnj4HY)BC;}P;gk<N>;JUg?leyov17QQR_K*nQW<qB=J+@f1^
zq9E1t0<0R^`$31NvJrUkMYuG}XzmuTz{^=SEox;m<CkO{&D(|;EG?J5RW>2JH_j5F
zuNklfo>!c7;2sX{9=Nx+rbZwX$Spqs4{5nVTK!U#(Y9Vkmc563Mf8_K%p?apXC1u~
zsA66KW62$np9hE>FHl1EBVFh~jCuQQaBK<4j;kCI3J=wxERfeFkP12$8q~guMc3Qv
zKc+>qi!)jDtAMV42ja&B9fxx#(7hjqw>QO`Z$u~v8HOcE1*j)Q9Y5dzGxMH~&z9>C
zIPk)n7=&bL%X??|>P3vinm68%OykemC#Vk!<UfrBAy(Q8W(H%fpbPFvF=LxR>ScUn
z9>dS5Tze1K(*~xuO-~D3cSg_gX7OMkfNApI0kLcH-`XeCx&T#|T+6G*@x3}?#U?c#
z2>Z%G-B4lPu+wQ#lEVymFxr=~<Gc*WVcVK1Z8Net_G1C}B2!s3pfH!-Z0Zq3F$S9B
zeOxR9F1gssYB}(45^b`FOiOpthaiU=&CL6iX@;az%x{s>W59jcuh;tqNW9KFf^X?7
zSA9YI7AlZ#MX))wg0$4AW@OF<7;VZV|Eoa40~|srHdIz_>jcKP0)Uw*rCOtm*XM=e
z*o}3Re$z7kQW&86|B(US0_B>x3f6S_{Tng`Z2A3AkXT45_FwZc4+N!sL+NB4rDYD3
z&54v&C<X!H0;<aZr5Re3_R^%HbOncr8^ur9MobqnQ}dzR026WJqnNt!(Ux5Y6Bo(;
z$ge8GrOd*(iQWRvj&*HaSOUoRS-eAmt?m0I6RvvcC1)~gm3%~Hx1Tr0n_sCyzOQNX
z(o2bP9v!Q26hw^lgdHHEMz?ZA%=F#Pw{Dn=_*7rDVJ+HykP=ZSFN={P@Ri5Vf!JM6
zuLs9F1j8HH3`k_Hg<$tw_9ltyh)&9V)TYo_UQ!7B{*h`(@GQ>1tNqSSvc&-e2p^Wv
zL3vb7%M=}<GbznKC4)=GeD9n&4f4c;w*Ap5LcFYD6f2jN;FJAPj@=(Bn|J>z^6fVP
zhRL+c?f`=7c!g=MaE_9t3W(Wl*1NZURcnU5aOTBjrXP4$4<xbhF|!xxo;enY53`z;
z47qPJ-QDIm?*)A~W_sScCi5C-Kjh5Bx+Wda9tI=&W4fMj!DV$m_>h3s<y3y5DLc8^
zaJ^gZHC2_;g;w>ql<aG(wPdUQY`2<m2hx^M75_wvumocW068Ak2|0`^tUAA|u-#GV
zanPh&dqWlqh(TB4x=)fxS+}Upx_>!t+K`lm;+98>ZlXRU!f57ci8gss6W{#BTg}N5
zKR|kQ5I=3<0>c%tU-WA755b;dJDxWTX+Y!S{ZAh^8L-%cS`qMC2rK0<&|Mr~VXerm
zIFS4|i%YRt#jqe5mfr;xI0DBuQNeqH;%~}4P?_|RwukzNKZxK3$sR`p;7vB`<mT~?
zp?2Ew=k(&U(4^yPc2(jj|FrnW?$stbgPabFZ`8tnML3}F2)NwXffOqCD2p}_vN%2w
z0|hd8Vt&B|(++Ah3|d+Eg}6)J=s;OF(|K@qw0uh2%Rw-)U^@1n%%VyDOx3+xI$=~g
z9qhRi1T#BWj(Y8jKFTq}i>kt*ghi~RccRROHa=@SG&b>Bn|qrFpS8Y6)5en1c?u(r
z*e=O`0bb)hdyp)=K_;MxCoE)6!MeRF9$E1_uPFMLu;NXxFDw4s%d_H{5Lpp~r47Q&
zu}DiDAtM2swoZOTLkcO45H(tKc7yvCVcN-wEeCc0C2}*^0AT|$x!!4vj9eoV#uNcz
zWN@i6%qa$!9g|Vh+0P(G=1qJtGK|kVEjn%jBU{c?*;8X=dz}?V)>e^%7dwq5{@`qw
z9Rq_{@a_K1@a83q3=fNu;TQE_9b)8K!=`yeVrqOQi}BhSd1r@_*|L~o<e!gxyoB#J
z(Gc*T&cjAbiMJ&LKzNqzwbJKzLn|1PgJ29MhOEzy>XTIrB3Gl;jbGsl2J3WVN8$gt
z8S>7TXUHdNhGgZfZq)g~_?oS$zM;uA=0H?#*KVi&^ulfAE!zU%<Uy+>QA{mw(N(-f
zTk)2i{ps>nPp_}STXq<?Rgw*FX$xGurB@^^kKc>D#c2Gc@RsSas3dW%Oi7}J#alk|
z7A)9Nl0J|4h;({=cx%@y@YWYR-bg^S#7IDG;s+MYYyjG7i4;ms;QhJ`bLuFj_{y$$
z0A?`id-0)!-pLa{zc$Bq?Ovf1I-`A#x{xy!@3q>GzAA8JzcjtB5_Z|I=3Zpc$alV~
zkx6XXNV@8M*=A(jC&qBsXz<_lco1QU6{Ed$9*+yBJystnEuG@;=S3YJ!2uuGJjWic
z%feDvs!o1J=LbvhyaL*!@2aP)s&M$@EC`2LPaq52QgL`BS#tPv$M<l@vquUSkNj2n
zF-8Hk>>1fWUIVoZ)>LMiv99F><%;wo?ss;QV?Hs~#|!bO2d_|>Z^DeJ4@=nhV9qfZ
zurNaLMwvWQrM&NrrwM2rv4~qqcErL$744}vrz~Kuagdx>ejM!6T}%x!mWvb5WMk$t
zm!JsG74Es^;b))Bc0w$6$(uBWnU(t6VPmG#`Hh+S><s%~aoft`hX2-!aaFs045H3U
zCCV#hIgp45Kko1H>I43dzPTxHm4>#3iW?zU@1S*D$(Olm8&4sKwbB5*pLYr{w3W&4
zDM)>CEzLhp`3)Qb)sru;fvJ-Q>h|#Tq%9|Xb6~Jj85Yn?4Z3C>sxbk~v+8q|9hr31
z*EQNH)sVpDml^XV@JaFYTf+C_5~Pj{V2%{qQZ6)0sh6uIyqB5T){HUPrAyG8BJ~nB
z)l2yE%Pir&S^y_c<Umgb(b3@}JOH_(wRVv3h;1Jdr@#cJj#hEDEF!dziN@GToD?;&
zF(G*p%eh!s1V}J{eVRYIg4#yLc;2arcmy&fkEjeelW@gB#FX%(Wf{I*gA)=rN}V=J
z4<XYAYF;5EV-W|qxzU%R;=BGjCXDtJldkJ>JrxU07u}G)(xGrl8l(_thj4xbp`u<^
zuku06nr7w9NsKAKKb5PKlMq=;@~Q=KHT03IOO&gdHKiL7mgqtPm7G2Yw&iQ<2cK5C
zv7fPvDu&etj<=FQvTuC~k(71<8yCygCCb*dCsd0z4JY*<6K{zw%GQCW7)2{vS7+!F
zW$Wq;ogI9g>2z9@b&e1zf@yMeeEX`-)>-noc@f55Qf{(!=F-#KvUR2*m92{*YD7vD
zYPJUK{FEJlj##~`)j_5br8fCyZT!^N*rT2BlO4F0m0PDnHd0A*HYJ#YA9=|fz<_q<
zuZ;3fa-KQFH`p4LJ2n0`=f*BhVUu^J;2WaK25tltn?kf552CW{Np~|_8K{hz!usoQ
zk*atjp-v{s{s5Ws9`>m}UTqh8YBp81-!tZg27Pyf1nF(CACWK~yD3{8=^(I+8J3<F
ziMNB6XRm}erdX!1Y9-F$>NP1TXB3vKg^-}AO-RVVlO!!4y6i)W^tGA@xLA+{@=&p$
zT-!Pe%1pQ?W_KVg;%&(mOI9HsQeV2r>}T5`p<z7=Q7WTK3jkFw$iWSyVM#LL|Dz5V
zFSyzYMylSx)Q0i}3T7)7b<YhFBDfG?U|h^s3twOw`Eubwd&rN(_#Lu?q`2do&!(V!
zwQFUoM;t^hi$TB5%R^1Yb&OYiH@>IlXu+WVCS~Xu=bdBTO=KuiRbT+{O|58Jjy!q@
z%I6w1g#?4XPM>RN4!_yG&30Ymf%yuRM;78;Ew4A9mWD12Ck*kElHX!3O(K*THM2uL
zd0eWo7}HP(#0uI_Wa^T0!c@>#xApd&&izse-c|V{Y~Q^z0yQBAVkEVyyjt{7SQ;k?
z@8uGgF>+*E9~M*Rd$Zr%60+loeK(gEb`T@6y#2uwN><d={M{ZUBk&oO&h%FDM+&3l
znI10%hpJB+j{E9azF&IJ@@M|{OE0~2-4n}e|NNVO@<-W+_+T-Q>`0oP?-nWcjZqW}
zVJTC}&c6981yDUXlqLj$eD8PA7M~u}yC$}z^TaXIe5dN`$@+Sc>`!%8%xW(y3CWRr
z^qo^c!xn2JGuEB9I-CUiXtvb}tf#^Lvoc>7`__k6qn!M4^?O7wR?9es-0ELRZD~9&
zXumD_ZtuRyoqZm}p8XT<;@G+^cxV4Sj4D0ybzM19bW+!o(CI<07x+k%9Wz2UG`|5S
z=6N2#v~UCP4{ZTZqWZ@*Kws;%2wStFiOvtxw)UJAt@do%V6-~Z)@tmN658h{-Oo*m
zXWOD08Y4hXnu{G4E9IBDG3h@>!Pw;p1)P(HTaM^$!^)3cSmME1l;J()=ozK(bU<sg
z4BLot%8|TYyx-CCCawwBoNL;0XXMc(l;-d;u`(lMtMk3ya5yA#VDKI;%<6oS4&{9J
zswe9&-ahO1qJyQme?U~ggWvZA2YSm+b${me%=I|fj`aR}*EIYyHH^>yqaq10SzNZj
zH^l}2Grk04jjurZ>Ra&(w}$8!jgP+3sd>R_zCNjeH{4e_5qptno$tTNm<Sx8_|KEM
zuV!k^@Ul}wvl8x_njGSx)qT~S9xBQutu6yVhotM)CZ<4E_(i^288V+=2bnO%(y@@5
zwHe>HYoAD*aMQ{pvhThYw!0soG*td7Ch3Be^;Ke<0SBAEtuUHU!{CT455{~A5-gER
z57lqB<fPP4=|71|0{F71(u3CvRi?3oDbr~AGo0iD-c8bM#tH3eD{;XD6H{24EV1J4
zI=xmOKy|}?SGLRgFItueciCm>!RxiG!sy&At9VB4JSO{9FN;rQN;R-u+^p(7?W+D%
zs}hS|c2#=7s`%}S6kJWsI-aKH|B9nwEq#Q6-!4bLXf+*<Zus=W6E@{tV|q1QdQmqG
zXHs08Lf+yt3T*UQnmL|D?ZARs35wc*1+_I%J0PTOO_V!eZEK?30c#_76CN@!!|jbQ
zEw~RiGPX6jhzWU`OqAZ?1mQAD0;wJLl+^%ITl2Kl08(3X(iA=*wKY#$4Ini&0_I{L
zOM*?4iN8PyNR+QK;=bK|$;#2xo(Pp2%jre)$ybXm#|f;mv<V>Er_G|pUX%T%7BI`^
zC3&yV*wh)ImQB!OK4obpm84M<^I%wMJIe@wTsAKj1I$)HRX8mOfmG+Q4cIRM?5c`e
zlM|@t+q>4sGVAj__Vm&ofY+}e*0Eh3ubHhj%O06q_Fay0Byqz)T4-d0E+a-(ff2h{
zJ#9t;>jp&62aKfsV*utQ&}=+s2AI#R1addLM&8Iym&Q?cx-^E>B23+xL_f0zYs&k4
zO=vfB{;aY?X7KrCRqgkBa5^*IycmtLWi)j31XvHPy6n!Hsp+zNbi+FAuC+y<GWt5_
zYURLTez;Z8e7=R|gi0qGDE6>qpx8SHi5r?l8=_Z-qmFjZ%+2W8a6Gr{$84pKgev^U
zVy<?pw5Y>S)I>vmPEDVt2=VHoE@qeLLUSBOqptMTMDYvX6U8rFx8_lB;13DSbdQ6`
zlR6qj$K1gP$?r%jEx1*^)MdVHX9DSh$pq3B>nDgfSP1vor##^n->g8dC^hRk*A`WC
zb^_8_a3`*Xd-(;E)%DT;6^l+5Di)r=Ar^1ps6J<2(LW`>;_Q8CBM(a#_O!6mgu*8v
zf*eVH!DKrJsO`)#wN`2Gc8(gErj7proh<8N=z4~`*@>d8exJi&0^@Tqj|Bca8x3M4
z{A~BPtxn&iaKB;2nk*NYDstMRJCX~+%>}R$iF3L|oFa?{oe-if>LL=<Lx~k@bej7h
zEH<Azii%*O+l0kdr)h=KQ^s<yiOFJUBV3R2W4qjmAeYzps)7F1EJPqp79zf%ECjx1
z->6+mb%CcX>8gv|by$bHmgLQ%qmY=qoJU@&lVn*UyNvS2vQ8!!FHR<(!eVt2d{3q(
zu<T5Iin~juj!bG(!=v&;#h=<nQ{1}7RFeSBRHkJ3ULKKl0JUao*FwV$)r&1-$o=T>
zh_P<1N{mOy(9|lK9kjYcq|&JA3VE7ng_{2xn~SWUmH~*QMsyp2I)Qo<>fqXTcvy2v
zuwG7y)UMd6iBXa&Z@+GVC&gWBZ3U6c<{5&!I^K(`LjnLmSbDVNs}gq*_(gb-u&EGT
zP=VoYh+YY{X!Kih*Go4U`!_&f)?ZjM@&6B2gXQn20Q8ZmfZs9I%RiyQKDKcfD&Y65
z&Q!p^6sN6&nQwa>vw)Mm;k^dA_`V^J*|rXegpd|a<9b-PgFbP-xg#x6U$B}EitE)i
z0w9bc0pRUd%TY1^5sL|@q=D#2=BpqgGj^P?)FN{U?VsSpkg?^3VVxY;W?OfyxtfYq
zX!^@B!_+2n*JOj0yfueF>07JWq<d~Qt>n7EWaPv)k?)I{EIVu-AMZBCdq&B*YFG_)
zH@tmwzPIvCT8egdf_##3tFy~w+3bDx1xpa|Haoqg!+Dn-fNgVY>^&Jb<8OT#S0bc;
z5zVr2L;SNWd)7Bc-j{G4wGj~0iyX_2=P)cEZVAHX-b`P6Vnb>CB9K*U+vD^r;n&{p
z)cs^UXjqQ~r>Il_;d$&*!oS(pK)7UxP%2q@e!xnzZzj!~o;qKgs*X|7q{>#}?Z!cM
zz{H$gE;DT%?(i(_xNz8(De2pQ5tc|(bDtkAM+eFANi)YLd`i16%_7$8x&iZ&eK)z_
z^BccPQjAk3T{v`zsRP0+w^OsnrNa)InPBoSnzm`Lk9~}Or5t^PP)fTy%EzS@FR)wA
z79gGQVmaJ)*W5nItJP}}_Pm57x*-FXR&N)5;zPT?N%yg{-S5(Uq@V6}=zAaCNZ5_z
zMU_TW$NpOWATrle*2c~^7d<7)x4W=}6x!A{+4y+y6Q2S)>H}#E5OeTsD3EBk+`6Q2
z=j13~5%%-_Yvo`iO11+oo1;AjW%QN6XMA;L>g*keX|km420K4ND-gs_t@cQVuhgIK
zcG-#pHo@RmflIx#WyfvZm~@t%pj00w*Tuzuv4Y&)YOGovyV#KiK*3yX8Yp(R4q5ga
z-b+KI*%$n+NAJC9ao4Up>VK}%eZhGb|MPC$vt7GBarEH_FR48Ca9vd$Idb%2{`Jdt
ej9VCM-LqZ09{$CL4j;Xw_R%AUANu&=qyGo`4<;r6

literal 0
HcmV?d00001

diff --git a/frame/contracts/benchmarks/solang_erc20.json b/frame/contracts/benchmarks/solang_erc20.json
new file mode 100644
index 000000000000..9d8fd5ce70e7
--- /dev/null
+++ b/frame/contracts/benchmarks/solang_erc20.json
@@ -0,0 +1,581 @@
+{
+  "contract": {
+    "authors": [
+      "unknown"
+    ],
+    "name": "ERC20PresetFixedSupply",
+    "version": "0.0.1"
+  },
+  "metadataVersion": "0.1.0",
+  "source": {
+    "compiler": "solang 0.1.7",
+    "hash": "0x9c55e342566e89c741eb641eec3af796836da750fc930c55bccc0604a47ef700",
+    "language": "Solidity 0.1.7"
+  },
+  "spec": {
+    "constructors": [
+      {
+        "args": [
+          {
+            "name": "name",
+            "type": {
+              "display_name": [
+                "String"
+              ],
+              "type": 2
+            }
+          },
+          {
+            "name": "symbol",
+            "type": {
+              "display_name": [
+                "String"
+              ],
+              "type": 2
+            }
+          },
+          {
+            "name": "initialSupply",
+            "type": {
+              "display_name": [
+                "u256"
+              ],
+              "type": 1
+            }
+          },
+          {
+            "name": "owner",
+            "type": {
+              "display_name": [
+                "AccountId"
+              ],
+              "type": 5
+            }
+          }
+        ],
+        "docs": [
+          ""
+        ],
+        "name": "new",
+        "selector": "0xa6f1f5e1"
+      }
+    ],
+    "events": [
+      {
+        "args": [
+          {
+            "indexed": true,
+            "name": "owner",
+            "type": {
+              "display_name": [
+                "AccountId"
+              ],
+              "type": 5
+            }
+          },
+          {
+            "indexed": true,
+            "name": "spender",
+            "type": {
+              "display_name": [
+                "AccountId"
+              ],
+              "type": 5
+            }
+          },
+          {
+            "indexed": false,
+            "name": "value",
+            "type": {
+              "display_name": [
+                "u256"
+              ],
+              "type": 1
+            }
+          }
+        ],
+        "docs": [
+          ""
+        ],
+        "name": "Approval"
+      },
+      {
+        "args": [
+          {
+            "indexed": true,
+            "name": "from",
+            "type": {
+              "display_name": [
+                "AccountId"
+              ],
+              "type": 5
+            }
+          },
+          {
+            "indexed": true,
+            "name": "to",
+            "type": {
+              "display_name": [
+                "AccountId"
+              ],
+              "type": 5
+            }
+          },
+          {
+            "indexed": false,
+            "name": "value",
+            "type": {
+              "display_name": [
+                "u256"
+              ],
+              "type": 1
+            }
+          }
+        ],
+        "docs": [
+          ""
+        ],
+        "name": "Transfer"
+      }
+    ],
+    "messages": [
+      {
+        "args": [
+          {
+            "name": "account",
+            "type": {
+              "display_name": [
+                "AccountId"
+              ],
+              "type": 5
+            }
+          },
+          {
+            "name": "amount",
+            "type": {
+              "display_name": [
+                "u256"
+              ],
+              "type": 1
+            }
+          }
+        ],
+        "docs": [
+          ""
+        ],
+        "mutates": true,
+        "name": "burnFrom",
+        "payable": false,
+        "return_type": null,
+        "selector": "0x0f1354f3"
+      },
+      {
+        "args": [
+          {
+            "name": "account",
+            "type": {
+              "display_name": [
+                "AccountId"
+              ],
+              "type": 5
+            }
+          }
+        ],
+        "docs": [
+          ""
+        ],
+        "mutates": false,
+        "name": "balanceOf",
+        "payable": false,
+        "return_type": {
+          "display_name": [
+            "u256"
+          ],
+          "type": 1
+        },
+        "selector": "0x6c7f1542"
+      },
+      {
+        "args": [],
+        "docs": [
+          ""
+        ],
+        "mutates": false,
+        "name": "totalSupply",
+        "payable": false,
+        "return_type": {
+          "display_name": [
+            "u256"
+          ],
+          "type": 1
+        },
+        "selector": "0x18160ddd"
+      },
+      {
+        "args": [],
+        "docs": [
+          ""
+        ],
+        "mutates": false,
+        "name": "decimals",
+        "payable": false,
+        "return_type": {
+          "display_name": [
+            "u8"
+          ],
+          "type": 3
+        },
+        "selector": "0x313ce567"
+      },
+      {
+        "args": [
+          {
+            "name": "owner",
+            "type": {
+              "display_name": [
+                "AccountId"
+              ],
+              "type": 5
+            }
+          },
+          {
+            "name": "spender",
+            "type": {
+              "display_name": [
+                "AccountId"
+              ],
+              "type": 5
+            }
+          }
+        ],
+        "docs": [
+          ""
+        ],
+        "mutates": false,
+        "name": "allowance",
+        "payable": false,
+        "return_type": {
+          "display_name": [
+            "u256"
+          ],
+          "type": 1
+        },
+        "selector": "0xf2a9a8c7"
+      },
+      {
+        "args": [],
+        "docs": [
+          ""
+        ],
+        "mutates": false,
+        "name": "name",
+        "payable": false,
+        "return_type": {
+          "display_name": [
+            "String"
+          ],
+          "type": 2
+        },
+        "selector": "0x06fdde03"
+      },
+      {
+        "args": [
+          {
+            "name": "spender",
+            "type": {
+              "display_name": [
+                "AccountId"
+              ],
+              "type": 5
+            }
+          },
+          {
+            "name": "subtractedValue",
+            "type": {
+              "display_name": [
+                "u256"
+              ],
+              "type": 1
+            }
+          }
+        ],
+        "docs": [
+          ""
+        ],
+        "mutates": true,
+        "name": "decreaseAllowance",
+        "payable": false,
+        "return_type": {
+          "display_name": [
+            "bool"
+          ],
+          "type": 6
+        },
+        "selector": "0x4b76697b"
+      },
+      {
+        "args": [
+          {
+            "name": "sender",
+            "type": {
+              "display_name": [
+                "AccountId"
+              ],
+              "type": 5
+            }
+          },
+          {
+            "name": "recipient",
+            "type": {
+              "display_name": [
+                "AccountId"
+              ],
+              "type": 5
+            }
+          },
+          {
+            "name": "amount",
+            "type": {
+              "display_name": [
+                "u256"
+              ],
+              "type": 1
+            }
+          }
+        ],
+        "docs": [
+          ""
+        ],
+        "mutates": true,
+        "name": "transferFrom",
+        "payable": false,
+        "return_type": {
+          "display_name": [
+            "bool"
+          ],
+          "type": 6
+        },
+        "selector": "0x2fb840f5"
+      },
+      {
+        "args": [],
+        "docs": [
+          ""
+        ],
+        "mutates": false,
+        "name": "symbol",
+        "payable": false,
+        "return_type": {
+          "display_name": [
+            "String"
+          ],
+          "type": 2
+        },
+        "selector": "0x95d89b41"
+      },
+      {
+        "args": [
+          {
+            "name": "spender",
+            "type": {
+              "display_name": [
+                "AccountId"
+              ],
+              "type": 5
+            }
+          },
+          {
+            "name": "addedValue",
+            "type": {
+              "display_name": [
+                "u256"
+              ],
+              "type": 1
+            }
+          }
+        ],
+        "docs": [
+          ""
+        ],
+        "mutates": true,
+        "name": "increaseAllowance",
+        "payable": false,
+        "return_type": {
+          "display_name": [
+            "bool"
+          ],
+          "type": 6
+        },
+        "selector": "0xb936c899"
+      },
+      {
+        "args": [
+          {
+            "name": "recipient",
+            "type": {
+              "display_name": [
+                "AccountId"
+              ],
+              "type": 5
+            }
+          },
+          {
+            "name": "amount",
+            "type": {
+              "display_name": [
+                "u256"
+              ],
+              "type": 1
+            }
+          }
+        ],
+        "docs": [
+          ""
+        ],
+        "mutates": true,
+        "name": "transfer",
+        "payable": false,
+        "return_type": {
+          "display_name": [
+            "bool"
+          ],
+          "type": 6
+        },
+        "selector": "0x6a467394"
+      },
+      {
+        "args": [
+          {
+            "name": "spender",
+            "type": {
+              "display_name": [
+                "AccountId"
+              ],
+              "type": 5
+            }
+          },
+          {
+            "name": "amount",
+            "type": {
+              "display_name": [
+                "u256"
+              ],
+              "type": 1
+            }
+          }
+        ],
+        "docs": [
+          ""
+        ],
+        "mutates": true,
+        "name": "approve",
+        "payable": false,
+        "return_type": {
+          "display_name": [
+            "bool"
+          ],
+          "type": 6
+        },
+        "selector": "0x47144421"
+      },
+      {
+        "args": [
+          {
+            "name": "amount",
+            "type": {
+              "display_name": [
+                "u256"
+              ],
+              "type": 1
+            }
+          }
+        ],
+        "docs": [
+          ""
+        ],
+        "mutates": true,
+        "name": "burn",
+        "payable": false,
+        "return_type": null,
+        "selector": "0x42966c68"
+      }
+    ]
+  },
+  "storage": {
+    "struct": {
+      "fields": [
+        {
+          "layout": {
+            "cell": {
+              "key": "0x0000000000000000000000000000000000000000000000000000000000000002",
+              "ty": 1
+            }
+          },
+          "name": "_totalSupply"
+        },
+        {
+          "layout": {
+            "cell": {
+              "key": "0x0000000000000000000000000000000000000000000000000000000000000003",
+              "ty": 2
+            }
+          },
+          "name": "_name"
+        },
+        {
+          "layout": {
+            "cell": {
+              "key": "0x0000000000000000000000000000000000000000000000000000000000000004",
+              "ty": 2
+            }
+          },
+          "name": "_symbol"
+        }
+      ]
+    }
+  },
+  "types": [
+    {
+      "def": {
+        "primitive": "u256"
+      }
+    },
+    {
+      "def": {
+        "primitive": "str"
+      }
+    },
+    {
+      "def": {
+        "primitive": "u8"
+      }
+    },
+    {
+      "def": {
+        "array": {
+          "len": 32,
+          "type": 3
+        }
+      }
+    },
+    {
+      "def": {
+        "composite": {
+          "fields": [
+            {
+              "type": 4
+            }
+          ]
+        }
+      },
+      "path": [
+        "AccountId"
+      ]
+    },
+    {
+      "def": {
+        "primitive": "bool"
+      }
+    }
+  ]
+}
diff --git a/frame/contracts/benchmarks/solang_erc20.wasm b/frame/contracts/benchmarks/solang_erc20.wasm
new file mode 100644
index 0000000000000000000000000000000000000000..0796085d33249b78871f4a336623444a0ef94e85
GIT binary patch
literal 12505
zcmdT~ZH!#kSw8n;X79|scjoTwmlFdyb8RPU(l~aU*!d7*kHK*xsFGA>QS--HuO}a~
zw%6TVyD@k@tFlHFN>!^WYKw|ULkS3FMT?3A5(T&AqY|RBL=i#o!xbP!5TK$Ftq2gF
z=RN1%nO(0pPLm>tm3z+Id+s^!dC&7c@5fy=vv|r=N_jsOKk4^+>dBzTt5Q#TJ+CLf
z&?FZJ{=;t%LqZHhgO_k4DxRZXEBbigKkvtt#m>yhy)m!HW@k>G>?|l{?~Tg6XJ!_k
zIX2gsot>FGcF%nWlxH7i^6=@-(y_&*`GuLMJ1QJ}usHC*y)iJ|@sl%ioqGnSYsqvc
zI%nn=pItiEIoCP8q=xK-_R;Lg&dfr&R@FYL%UjQ$K67@d5ZZ2Jp|f;$;dCMExC}ct
zbMkEG*wVtx>BXly3k#hSN(G(M=c=bVr{)*V`(Bm>X`-UQ4}*H8R`LC61SOl5l`tL}
z_N$QX<otOx8d6DWtbXMK$$LDnXTr80OlhUP-GMq7D6LG?ZQ~~!Py5E3%l%Zv@p;eh
zX_fo9pCx&q{R4ierBOPNcl;^5)jJYSY5#EQ*-7tG>OsXxJv%9yfk_iD=2*qCW^iDC
zSslbLcwX4!KH8o?g`wW0pB%<2XrtWM>e1AX`9tL%1U0G++3~B5yLf7by5_kL=KfqB
znr)BrHSKpz*3FfDCph3^1Gpb(g)PNe>Cj|z2mFXK9q<#}@VHlx&(Y`3BP?ieH$jti
z<2{PvakMh4Md$gV^O2SCN0rHz%;l93^Q!nIPx(_m)MTzGO5~e2-&F5IN1^L48E@es
zPhoW*I!m|<Jb&}eU|@v5Kv9$l-3YvRz=wb)u-dNhK9p-G95?}<Onfs(gLmW4Qt^I|
zvO-!V8peSF1HlJ@i-zxEGsbHJ1;#%INsW)bcee-8&tZ9B3qSE1e#QlILW>+}sLenS
zfz5{mQ2^QSj)P4=*x)A{=)J@u_66nRpyE#ke$ewS?oj5Mn#*fDm9CkoZXV}#bYpXW
zR|f=jZ1#4wZ+nwn?b)90YC`^yYIDT4?jbRNm`$doiO{&gS7hqB%)<&_Q(ag~J3;rV
z?FQ(+V!OVs?GC0OZ=I4*jymNS;+l2JQMEnDQL#P95!&81CuN;tXS%MFgF%EwWT*o!
zSVng<&wMR3ni{A<Y+UZAJe;D2AA9YOOnyw-9}$1-4m8I27cu5)h$%8ZoWkZS_`iCH
zcrmYr+*j3HleU6k{H@F@Y~yyQVH8{@qQDUv>>$$-g^*p<a17m@%Bc8D6~EF8c`$k|
zPudNg>{J#;+F#|dudY5uBMx<SRaf-T>gpl&{?s$MS@E(sPly_&lkKKPx@njfzWvcZ
zp?wi$JI&rLhXD8qb)V!Zw4anHNJ<nWra(agecC-GB?1zQ0BItfSOlcpNSZfgMjS*6
zB&5{Nuug$o_FCv=(i=f<oAgF?bAu=X1QA74CZY%sL=*u6MbV>FbfQP7;Y7En??eyt
z<~tCDhap;NaEVx!*m|*su2X`Bu2F)9j;vS>qqD%YaW;u%?!??uPB`4<OH_Rg=(Ihr
zE3e|UByZ9dGu<SvBQ%1kCgq^D%8-nJ%5+AAMQB7X8Hb4eQu8g?JC8Rt3HdDrM*w_T
z9s1Vz)$V4Y&ZPTg#eQnONrBo~MMHK0X){JQ?BZ^OOM$qoajS~I6Zu2Ei0}oDqIO+J
zo5B~i6v+soo~T4xR3a@ZkrtImqrF(Ji7e8jfjQZmFmX^>9%FNnm^?X$_<}_{qz$8I
zk=8`dB5ed5h8H6z3N!`i&{UgLWJKuDVl!&EppR%B5e$O}nwAJG0W_`Qw}%}Ov@Aiy
z?aaUE({@|ac?|0vp62E8?RlcBx;dSvdPrx}yga_0cP_DeY4x$~w0I%tLdyFcLBAUc
zYh0(Wky2r!rNYKag^d#kg~IBDR;GuRb-K0;NLH6~nB7|5Ji4|lYUJ~AtI#p4P#7o`
zDq61N-6jT-vxjwMS;u^h)ZNmdodDzylfmlcnm5J)UDfr61mBGla;Ma8;iN!@xw#gA
z4eJ)Zbw`*{pD@FM)?1F&o9;A+3tA_xZc-@g%UaYEPr6W56Id9wSiregc<yU?%c+jK
zDKs)E`k_WNdQIIzZ!eSx-E^rQVU);tH0g+pBGw)mFp98cL`D&|#31W7g)R^zQTYhV
zsC5J{JSqD0KBH`8bs5qp{hBa}jUa?kYGjlv0T=~#1q}(KfTPj1j8Y?`L}V1Y&bGO{
z^*O*RAtIQgcLec7B%V5nr#v|!o<EKUh-biW!rTzdZSFZAOFa<LyXx{pIXCn(bZ^$>
zjiP6XXbe3|MB}93!q12+6T3;Y*iAymMps6=DKVa`Bcf5jd~A@2#vBoiI_ORmL^L8q
z6zPd+IF*_no#q8ZL^~Xt&W8bok!fB)M7VQ_-GYeH4USnN#qTvn7*ts6x)@=+RM@ss
zVYieDyH&UP3KPc+E??Heu&yy(U(QE#ww8}MYZ8UtN_Z#w7Ggfp+pI!G%MCrE$6!?S
z*dRSnnI)ozp3spHQ9{}S5pCT5O~xhGM{R0M-y>couEWcO-QLaM#d4wpOnbs|;_c?L
z4^C`YPHZ?%O!}NyDL8S$apIT*)@Z?rg!uXp^82Wtw}Qt;d)n&wBRzT{2NbjbU>tU_
z2AdeUa3P1?P2wiZ00Y3iBQzIWz||LWSmRy*1O9kKj~`tF@W!XtU@a3DE?lsu!KkUE
z=)_X=|AnAWDEcjfKDx?X=JU)gZVU^I*<r42Jq9%1=+k&Y8gG!s%UOlS{~`9Py$tbV
z+s{(6+{y|vbmdrX$ovuWFTgWr9%~cq;)--Pcwef_l@OyjM9L1zy!3Z}^|6abQl|77
zYBG5MmhsIuLQJ6jtl7quqkX)8HSFf$Po&7QIMl;HWX~MuVH^g?!WttuSa(s)K|jD~
z^egO#@aL5yX$6lhr)TI{o*zc9NOxE>YLDPOJ1F6LlJ%tM*+C5*a8MJGG<<@Hg3*>l
z5Y3RNq>0dwfa&KT9&$gmJrAVJlT}&D@KD`=nu9E0?FDlwY)h4MA&ci+(jZAa#C!pB
zQ6-qmcXKH_7j6vBg=D~=f`G7hoR`MLcr(?_Rd8#==Be<nvH={}mdg$XZigtJOSDsU
zt4pqj9OEztr)H`J<3Izlt(#Z@b*(B)I+y&7{dhVL)(}RuVCIOEA`GbMVGKYqrK+Q&
zyoi}gQsqNyd<kY=!>enI&YhW4GjtA~D8q>YQa~MoyFv9LwY^Co-u93`Bg5G0EW|g;
z<~%_yuuUj>QgduqOF-4ov-qJdET)EtN*s2n6&n#E@RH-US*eoXum~pPtOg4lC~mZC
zHk_~p4wNaJ?(G@W2hV^g_+Q!hP`Pm;+HQQb-1yja8;3iDmKi<)=gi%KbE^#>qz*X1
zLus7+kggx?!vTr-q~HZ`fHE0tPxB&hz{9;baU3vS0uZWt2-n(rIP_UxS=Lt!%$Y|5
z5eUqsCZQOZqe#Jf2+Sq8W2zrmyObu<(y(6aC_rL&<mTK`NI;>mWYL6TtwWtBfw^T4
z3Cz7RFb6cCFA2<14@1`m<{krcWn5r>o4LYZpkxADQBq|vfRW&EA%t>_a5(NUTu)S-
zRAV*p&wx^l$|4oN@xy-98)li{1=h(C+k@(}KGD|-QvZImmOw0YS04+f-masuGC^yb
zxEs%eb8Qc*x%3}z{LoJ#YgguzFMsjXW!wG7=l}dy&p({jaQFBA`Gv2e3n-d@`->O9
zbm55jlyATRDf4>xNV*LVK2dojy+zt1>8<cspgr@qa{YU`z9!e#<@%p;U9E7;^St5|
zP-D%q!|8T~yv}@zVmu5FrOd}(y827Khq0hCzxAyT|7Pz9Jf4U7i?!Rb<|Ap2_KT2V
zhqOo1o%oXBoA0RZ4mj6#Ks{KgP|Fgz^2~^2dCQ1w`3UwxiLR3ld&B*F*nCFXhWVVd
zP4lv}aW;~BbYgwyQLvQr3<T;ncx&q&to;Z%iIv;K6-&3LjR8V$*11yamN#me@}W+p
z*pNlm)0h+~guk7Qg1?;wgTEcS7k+u8FO}-E<L^-1-<1LW9>-!<oC)--INQ*({5^)c
z{(4cQGAN=*Wl*s|CPhW)$W=Y55@w4~4wD<w9Z~|)o#Z$-6oqcXiqdx_D4sh}Mj^_2
zR{|>K5|D^XNP$xvOFu6y9k^7=QJ^aviFF_-`itIKN2B7?A}_5Yei%NQvtZsh$_sMR
zDu}gt6eNs_!ckt3lj6=LcA1k3dTn5{IY_*l2MHpV45g<L!2?htS}D*XewP9+Q?g|p
zBGH5(%Xy@$YdLa82(+w+a2KBqkalLnxjGCpW5lTv#9!=qjHoBg<!~!*O&-GcA=Yy6
z20jWLPIrk7|I>f}<>k;)$<Kpd9!8+4%%A?o<zMhEsr=#>{`L7#tU0}%s<6Q`Z1z*0
z3mtvBmCK%%_9JW&@U5W5pcT|@3isbLs)8991zv@u@d5w2<POrvmtX$vuU4%HuTh$Z
z5&tUlh3|gi536?JG0fC@P(7NAbNE*{+zR(+ul?HJ3_;`=Td{283)9u`0-3HZ?U6M0
zdzMw&4a+L+rezhNL|CPrSXOD*Ew8j=BfQs+Ec3N%@GHQBb1VGb<Mu^T1Zk)~9()_o
z5XgR?G(eq%rJ$Vf<U?zqE%dCVjA);ahH*oT11IHAAx&%oAo$(@2(<tum1X?8iYFu(
z)K%(FKr1o>YAx{-$P}~3b8kCt$^v;yM;sv}fC5JC2_TF`7{sWT*d^e>i-9a^{pPw2
z^40$K@OjT}1d{Z(M|HUE74lNLLa;)XLJVxCzKp#9+bGgb=L!Ian9JA=!YLN4Jyb2T
zWo#KX06|&a%rH_cz=Hu4tH3^J8d(eEo{AytL_DxXjFCLRuekQB1Ctrs*B&ea;e~^d
zb(jgneI4LW9e82~p2&fx=D<Uk@q;NaLVgumM#siU2<U`nJx1(8vtCKFV9&06`2m@6
z>4Nn)W@9dDze0Vk`{pR@tPnIh-E+WR`-3z}LYF7xYn+EJd{$wTQ&@O_N!N$u1(U}1
zm}9uKz<#F+xFv*;Hu7f(X?KSGGfHb<FKMG7PAF#!u0WQyf|BVW+R*@8^pmtAL5MBF
zV3F<%D78K{XBYM<31e%>g(#X*-k+ef>!o8iOIpZyS8j&1&X9!$Lz{7^nPf8|?U8g_
zNj5HoX}b`n?LwHg3t{jrM}ioTk|mp_BO8M9-x(5ZWs&*Ya6vbSQ>13#;*=E96SI;P
zdQ3yMMlEwsfG6DowGyiY+(VEvR`Hl?2FNv~3<3B!+N+^wsSp6OG=;E9VwC}LBy18R
zlCVjPNWvyDA_<#lK=xZLzW9@W@v)9L^=we{4n)Bo3Q@LNqJ%u_KKS9j>JM1hTg56q
zs~vAQT47Wxn*-w%A~*r4b-1UX&);63zr8+xQ((s-L<QcmVTy|)<;coF=52*5q-9`>
zglhwpUFO=BNnmoX3sme&606*@ftj_lxwf;pytKKx<LHLt=%(Z7)H(Rf*<8!n+=#O|
zI^F+zH*L;VR7N47#Wrcex_J-<RV>ymsM_?*ZvMnz-9@ZTX0prm%QlF=u^j$FCfH!$
z&KbciNz5-6C1tGAqTa$Sy?q0x5bKhW!m7YGQq2+rml~FcBXuni$FUKtPm&RjiPAeV
z@b#k5z=fi=TA(;5D0!oK<0DM}k9HDQ)4I-q*6`(L9N&WKE_^|xb0M!Y#y^^SEcUQy
z$an@7BqU3?5%Vh=vJ-q3z&A^&5VC5t#&{5QLZkzpO=+!p;p3;o_yeZ1V}t4J5R-W%
z-6`#nbeA)b*cnXZ45;RUp1L!TzLT;}t1zgf&`QZT;_oedb75!~5$7Oo<_VT{_?d&*
zf+e0Dm8%u6jB)GOHNPDvV8f<vAaz$HIiI_`nCw9sa5%kd!^U>Gjot1xcE|sRjWL}o
zHr7ktBOAMO!^ZBwh8TuUzU7A8-;!*45@JflNx;GeP6C!Ua1t;qoP^UnFefL0_}V{=
zKM-9=cdNMg*Dt>D4hx9<@=+3y57H;|ARF5qL<n$gu7q1K-DIbG1*sEkj-i}9059T)
z3uqa``b9v?7#0&vBJkiR2`q=IAC~n{+QgH))T795leUwtl*aujAnNeuRr^<gBF|$^
zo@;WC0{s9d!$gz*nY{e&VJiHaHxY{WH<l)~nzK@@m*gBJnQ)Q}iufTuXq5{+cY}qV
zyV-@7IbTvPbp65fwbSEJ)Co#;UE~cUK%#%~1yaf8Uf~a-zK*5mai18wd3`qixv-8?
ziFY1;|Bv0X_d$Iee=@CSPR*Y^y`($O&2~B`7B&9XdHzE)r)N7zQObccXU;6lpX=zS
z7UoasrDr<&XF3b>dgjE5h0fw4QcV>f`s&bApL_7>fBC`c8+YDT|N8mw{_^OzKl9T4
z2jBa<5AFG#<xj6oxh0F4mgYB^=ks2?%Z)4kYWs#udhw2pLpPoCvLD~Rao~n6AD=mC
zH+;p954*9ao`p^}o6tQ!(V1Q7%q(_J^cAL$cc3~^jl!R{#BDcJw0r~2T?yhtSMUDx
zZGZhE-~8yuAF4e5)4%e{2M&GsXOI2(o%y-ffBoZMdGYuE;KjjdZY25TFrIYdO3iH;
z+dtT)8cy@X+1bv*qL-jMi$m<3xa;_NuQCfwJbiTEzCC;Q?9-D^KfCnc-FM^q%-Q36
zX6H}cee&cvd$|j*bvv_5df)!ez55S5Fne(S{`>BmIWT+Q%>I2(&F-7ow{PElPt6{j
PJ@CN6d-u<rnA!b5r2y=n

literal 0
HcmV?d00001

diff --git a/frame/contracts/src/benchmarking/code.rs b/frame/contracts/src/benchmarking/code.rs
index 64bdde9b6ea5..15abd9968cd0 100644
--- a/frame/contracts/src/benchmarking/code.rs
+++ b/frame/contracts/src/benchmarking/code.rs
@@ -26,14 +26,12 @@
 
 use crate::Config;
 use frame_support::traits::Get;
-use pwasm_utils::{
-	parity_wasm::{
-		builder,
-		elements::{
-			self, BlockType, CustomSection, FuncBody, Instruction, Instructions, Section, ValueType,
-		},
+use pwasm_utils::parity_wasm::{
+	builder,
+	elements::{
+		self, BlockType, CustomSection, External, FuncBody, Instruction, Instructions, Module,
+		Section, ValueType,
 	},
-	stack_height::inject_limiter,
 };
 use sp_core::crypto::UncheckedFrom;
 use sp_runtime::traits::Hash;
@@ -241,9 +239,8 @@ where
 
 		let mut code = contract.build();
 
-		// Inject stack height metering
 		if def.inject_stack_metering {
-			code = inject_limiter(code, T::Schedule::get().limits.stack_height).unwrap();
+			code = inject_stack_metering::<T>(code);
 		}
 
 		let code = code.to_bytes().unwrap();
@@ -257,6 +254,34 @@ where
 	T: Config,
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
+	/// Uses the supplied wasm module and instruments it when requested.
+	pub fn instrumented(code: &[u8], inject_gas: bool, inject_stack: bool) -> Self {
+		let module = {
+			let mut module = Module::from_bytes(code).unwrap();
+			if inject_gas {
+				module = inject_gas_metering::<T>(module);
+			}
+			if inject_stack {
+				module = inject_stack_metering::<T>(module);
+			}
+			module
+		};
+		let limits = module
+			.import_section()
+			.unwrap()
+			.entries()
+			.iter()
+			.find_map(|e| if let External::Memory(mem) = e.external() { Some(mem) } else { None })
+			.unwrap()
+			.limits()
+			.clone();
+		let code = module.to_bytes().unwrap();
+		let hash = T::Hashing::hash(&code);
+		let memory =
+			ImportedMemory { min_pages: limits.initial(), max_pages: limits.maximum().unwrap() };
+		Self { code, hash, memory: Some(memory) }
+	}
+
 	/// Creates a wasm module with an empty `call` and `deploy` function and nothing else.
 	pub fn dummy() -> Self {
 		ModuleDefinition::default().into()
@@ -519,3 +544,14 @@ where
 {
 	T::Schedule::get().limits.memory_pages
 }
+
+fn inject_gas_metering<T: Config>(module: Module) -> Module {
+	let schedule = T::Schedule::get();
+	let gas_rules = schedule.rules(&module);
+	pwasm_utils::inject_gas_counter(module, &gas_rules, "seal0").unwrap()
+}
+
+fn inject_stack_metering<T: Config>(module: Module) -> Module {
+	let height = T::Schedule::get().limits.stack_height;
+	pwasm_utils::stack_height::inject_limiter(module, height).unwrap()
+}
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index 1ffb84dad9aa..c3757cf705bf 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -30,7 +30,7 @@ use self::{
 	sandbox::Sandbox,
 };
 use crate::{
-	exec::StorageKey,
+	exec::{AccountIdOf, StorageKey},
 	rent::Rent,
 	schedule::{API_BENCHMARK_BATCH_SIZE, INSTR_BENCHMARK_BATCH_SIZE},
 	storage::Storage,
@@ -124,9 +124,9 @@ where
 					.saturating_mul(<BalanceOf<T>>::from(storage_size) / 2u32.into())
 					.saturating_add(T::DepositPerContract::get());
 
-				(storage_size, endowment)
+				(Some(storage_size), endowment)
 			},
-			Endow::Max => (0u32.into(), Endow::max::<T>()),
+			Endow::Max => (None, Endow::max::<T>()),
 		};
 		T::Currency::make_free_balance_be(&caller, caller_funding::<T>());
 		let salt = vec![0xff];
@@ -158,7 +158,9 @@ where
 		};
 
 		let mut contract = result.alive_info()?;
-		contract.storage_size = storage_size;
+		if let Some(size) = storage_size {
+			contract.storage_size = size;
+		}
 		ContractInfoOf::<T>::insert(&result.account_id, ContractInfo::Alive(contract));
 
 		Ok(result)
@@ -278,6 +280,24 @@ fn caller_funding<T: Config>() -> BalanceOf<T> {
 	BalanceOf::<T>::max_value() / 2u32.into()
 }
 
+/// Load the specified contract file from disk by including it into the runtime.
+///
+/// We need to load a different version of ink! contracts when the benchmark is run as
+/// a test. This is because ink! contracts depend on the sizes of types that are defined
+/// differently in the test environment. Solang is more lax in that regard.
+macro_rules! load_benchmark {
+	($name:expr) => {{
+		#[cfg(not(test))]
+		{
+			include_bytes!(concat!("../../benchmarks/", $name, ".wasm"))
+		}
+		#[cfg(test)]
+		{
+			include_bytes!(concat!("../../benchmarks/", $name, "_test.wasm"))
+		}
+	}};
+}
+
 benchmarks! {
 	where_clause { where
 		T::AccountId: UncheckedFrom<T::Hash>,
@@ -2536,6 +2556,88 @@ benchmarks! {
 		#[cfg(not(feature = "std"))]
 		return Err("Run this bench with a native runtime in order to see the schedule.");
 	}: {}
+
+	// Execute one erc20 transfer using the ink! erc20 example contract.
+	//
+	// `g` is used to enable gas instrumentation to compare the performance impact of
+	// that instrumentation at runtime.
+	#[extra]
+	ink_erc20_transfer {
+		let g in 0 .. 1;
+		let gas_metering = if g == 0 { false } else { true };
+		let code = load_benchmark!("ink_erc20");
+		let data = {
+			let new: ([u8; 4], BalanceOf<T>) = ([0x9b, 0xae, 0x9d, 0x5e], 1000u32.into());
+			new.encode()
+		};
+		let instance = Contract::<T>::new(
+			WasmModule::instrumented(code, gas_metering, true), data, Endow::Max,
+		)?;
+		let data = {
+			let transfer: ([u8; 4], AccountIdOf<T>, BalanceOf<T>) = (
+				[0x84, 0xa1, 0x5d, 0xa1],
+				account::<T::AccountId>("receiver", 0, 0),
+				1u32.into(),
+			);
+			transfer.encode()
+		};
+	}: {
+		<Contracts<T>>::bare_call(
+			instance.caller,
+			instance.account_id,
+			0u32.into(),
+			Weight::MAX,
+			data,
+			false,
+		)
+		.result?;
+	}
+
+	// Execute one erc20 transfer using the open zeppelin erc20 contract compiled with solang.
+	//
+	// `g` is used to enable gas instrumentation to compare the performance impact of
+	// that instrumentation at runtime.
+	#[extra]
+	solang_erc20_transfer {
+		let g in 0 .. 1;
+		let gas_metering = if g == 0 { false } else { true };
+		let code = include_bytes!("../../benchmarks/solang_erc20.wasm");
+		let caller = account::<T::AccountId>("instantiator", 0, 0);
+		let mut balance = [0u8; 32];
+		balance[0] = 100;
+		let data = {
+			let new: ([u8; 4], &str, &str, [u8; 32], AccountIdOf<T>) = (
+				[0xa6, 0xf1, 0xf5, 0xe1],
+				"KSM",
+				"K",
+				balance,
+				caller.clone(),
+			);
+			new.encode()
+		};
+		let instance = Contract::<T>::with_caller(
+			caller, WasmModule::instrumented(code, gas_metering, true), data, Endow::Max,
+		)?;
+		balance[0] = 1;
+		let data = {
+			let transfer: ([u8; 4], AccountIdOf<T>, [u8; 32]) = (
+				[0x6a, 0x46, 0x73, 0x94],
+				account::<T::AccountId>("receiver", 0, 0),
+				balance,
+			);
+			transfer.encode()
+		};
+	}: {
+		<Contracts<T>>::bare_call(
+			instance.caller,
+			instance.account_id,
+			0u32.into(),
+			Weight::MAX,
+			data,
+			false,
+		)
+		.result?;
+	}
 }
 
 impl_benchmark_test_suite!(

From 1309f52711e2bb2dc019a22d802b771b7bd3e4ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Mon, 6 Sep 2021 18:40:58 +0200
Subject: [PATCH 1145/1194] contracts: Remove state rent (#9669)

* Remove storage rent

* Add storage migration

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_contracts --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/contracts/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_contracts --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/contracts/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_contracts --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/contracts/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* Add migration for deletetion queue

* Fix compilation

* Increase gas supplied to out_of_gas to be sure that it won't deplete too early

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_contracts --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/contracts/src/weights.rs --template=./.maintain/frame-weight-template.hbs

Co-authored-by: Parity Bot <admin@parity.io>
---
 bin/node/runtime/src/lib.rs                   |   27 +-
 frame/contracts/common/src/lib.rs             |   32 +-
 .../fixtures/check_default_rent_allowance.wat |   43 -
 .../fixtures/destroy_and_transfer.wat         |    2 +-
 frame/contracts/fixtures/restoration.wat      |   72 -
 frame/contracts/fixtures/set_rent.wat         |  105 --
 frame/contracts/rpc/runtime-api/src/lib.rs    |   15 +-
 frame/contracts/rpc/src/lib.rs                |   55 +-
 frame/contracts/src/benchmarking/mod.rs       |  599 ++----
 frame/contracts/src/exec.rs                   |  470 +----
 frame/contracts/src/lib.rs                    |  227 +--
 frame/contracts/src/migration.rs              |   96 +-
 frame/contracts/src/rent.rs                   |  577 ------
 frame/contracts/src/schedule.rs               |   22 +-
 frame/contracts/src/storage.rs                |  222 +--
 frame/contracts/src/tests.rs                  | 1110 +----------
 frame/contracts/src/wasm/code_cache.rs        |   16 -
 frame/contracts/src/wasm/mod.rs               |  133 +-
 frame/contracts/src/wasm/runtime.rs           |  277 +--
 frame/contracts/src/weights.rs                | 1679 +++++++----------
 20 files changed, 1148 insertions(+), 4631 deletions(-)
 delete mode 100644 frame/contracts/fixtures/check_default_rent_allowance.wat
 delete mode 100644 frame/contracts/fixtures/restoration.wat
 delete mode 100644 frame/contracts/fixtures/set_rent.wat
 delete mode 100644 frame/contracts/src/rent.rs

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index b17bbed107db..5acc429e952b 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -822,16 +822,10 @@ impl pallet_tips::Config for Runtime {
 }
 
 parameter_types! {
-	pub TombstoneDeposit: Balance = deposit(
+	pub ContractDeposit: Balance = deposit(
 		1,
 		<pallet_contracts::Pallet<Runtime>>::contract_info_size(),
 	);
-	pub DepositPerContract: Balance = TombstoneDeposit::get();
-	pub const DepositPerStorageByte: Balance = deposit(0, 1);
-	pub const DepositPerStorageItem: Balance = deposit(1, 0);
-	pub RentFraction: Perbill = Perbill::from_rational(1u32, 30 * DAYS);
-	pub const SurchargeReward: Balance = 150 * MILLICENTS;
-	pub const SignedClaimHandicap: u32 = 2;
 	pub const MaxValueSize: u32 = 16 * 1024;
 	// The lazy deletion runs inside on_initialize.
 	pub DeletionWeightLimit: Weight = AVERAGE_ON_INITIALIZE_RATIO *
@@ -858,14 +852,7 @@ impl pallet_contracts::Config for Runtime {
 	/// change because that would break already deployed contracts. The `Call` structure itself
 	/// is not allowed to change the indices of existing pallets, too.
 	type CallFilter = Nothing;
-	type RentPayment = ();
-	type SignedClaimHandicap = SignedClaimHandicap;
-	type TombstoneDeposit = TombstoneDeposit;
-	type DepositPerContract = DepositPerContract;
-	type DepositPerStorageByte = DepositPerStorageByte;
-	type DepositPerStorageItem = DepositPerStorageItem;
-	type RentFraction = RentFraction;
-	type SurchargeReward = SurchargeReward;
+	type ContractDeposit = ContractDeposit;
 	type CallStack = [pallet_contracts::Frame<Self>; 31];
 	type WeightPrice = pallet_transaction_payment::Pallet<Self>;
 	type WeightInfo = pallet_contracts::weights::SubstrateWeight<Self>;
@@ -1461,9 +1448,9 @@ impl_runtime_apis! {
 			code: pallet_contracts_primitives::Code<Hash>,
 			data: Vec<u8>,
 			salt: Vec<u8>,
-		) -> pallet_contracts_primitives::ContractInstantiateResult<AccountId, BlockNumber>
+		) -> pallet_contracts_primitives::ContractInstantiateResult<AccountId>
 		{
-			Contracts::bare_instantiate(origin, endowment, gas_limit, code, data, salt, true, true)
+			Contracts::bare_instantiate(origin, endowment, gas_limit, code, data, salt, true)
 		}
 
 		fn get_storage(
@@ -1472,12 +1459,6 @@ impl_runtime_apis! {
 		) -> pallet_contracts_primitives::GetStorageResult {
 			Contracts::get_storage(address, key)
 		}
-
-		fn rent_projection(
-			address: AccountId,
-		) -> pallet_contracts_primitives::RentProjectionResult<BlockNumber> {
-			Contracts::rent_projection(address)
-		}
 	}
 
 	impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<
diff --git a/frame/contracts/common/src/lib.rs b/frame/contracts/common/src/lib.rs
index 9260b3e05cf3..c57f728c26b6 100644
--- a/frame/contracts/common/src/lib.rs
+++ b/frame/contracts/common/src/lib.rs
@@ -70,35 +70,17 @@ pub struct ContractResult<T> {
 pub type ContractExecResult = ContractResult<Result<ExecReturnValue, DispatchError>>;
 
 /// Result type of a `bare_instantiate` call.
-pub type ContractInstantiateResult<AccountId, BlockNumber> =
-	ContractResult<Result<InstantiateReturnValue<AccountId, BlockNumber>, DispatchError>>;
+pub type ContractInstantiateResult<AccountId> =
+	ContractResult<Result<InstantiateReturnValue<AccountId>, DispatchError>>;
 
 /// Result type of a `get_storage` call.
 pub type GetStorageResult = Result<Option<Vec<u8>>, ContractAccessError>;
 
-/// Result type of a `rent_projection` call.
-pub type RentProjectionResult<BlockNumber> =
-	Result<RentProjection<BlockNumber>, ContractAccessError>;
-
 /// The possible errors that can happen querying the storage of a contract.
 #[derive(Eq, PartialEq, Encode, Decode, RuntimeDebug)]
 pub enum ContractAccessError {
 	/// The given address doesn't point to a contract.
 	DoesntExist,
-	/// The specified contract is a tombstone and thus cannot have any storage.
-	IsTombstone,
-}
-
-#[derive(Eq, PartialEq, Encode, Decode, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
-pub enum RentProjection<BlockNumber> {
-	/// Eviction is projected to happen at the specified block number.
-	EvictionAt(BlockNumber),
-	/// No eviction is scheduled.
-	///
-	/// E.g. Contract accumulated enough funds to offset the rent storage costs.
-	NoEviction,
 }
 
 bitflags! {
@@ -134,19 +116,11 @@ impl ExecReturnValue {
 #[derive(PartialEq, Eq, Encode, Decode, RuntimeDebug)]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
-pub struct InstantiateReturnValue<AccountId, BlockNumber> {
+pub struct InstantiateReturnValue<AccountId> {
 	/// The output of the called constructor.
 	pub result: ExecReturnValue,
 	/// The account id of the new contract.
 	pub account_id: AccountId,
-	/// Information about when and if the new project will be evicted.
-	///
-	/// # Note
-	///
-	/// `None` if `bare_instantiate` was called with
-	/// `compute_projection` set to false. From the perspective of an RPC this means that
-	/// the runtime API did not request this value and this feature is therefore unsupported.
-	pub rent_projection: Option<RentProjection<BlockNumber>>,
 }
 
 /// Reference to an existing code hash or a new wasm module.
diff --git a/frame/contracts/fixtures/check_default_rent_allowance.wat b/frame/contracts/fixtures/check_default_rent_allowance.wat
deleted file mode 100644
index 64cd67186bff..000000000000
--- a/frame/contracts/fixtures/check_default_rent_allowance.wat
+++ /dev/null
@@ -1,43 +0,0 @@
-(module
-	(import "seal0" "seal_rent_allowance" (func $seal_rent_allowance (param i32 i32)))
-	(import "env" "memory" (memory 1 1))
-
-	;; [0, 8) reserved for $seal_rent_allowance output
-
-	;; [8, 16) length of the buffer
-	(data (i32.const 8) "\08")
-
-	;; [16, inf) zero initialized
-
-	(func $assert (param i32)
-		(block $ok
-			(br_if $ok
-				(get_local 0)
-			)
-			(unreachable)
-		)
-	)
-
-	(func (export "call"))
-
-	(func (export "deploy")
-		;; fill the buffer with the rent allowance.
-		(call $seal_rent_allowance (i32.const 0) (i32.const 8))
-
-		;; assert len == 8
-		(call $assert
-			(i32.eq
-				(i32.load (i32.const 8))
-				(i32.const 8)
-			)
-		)
-
-		;; assert that contents of the buffer is equal to <BalanceOf<T>>::max_value().
-		(call $assert
-			(i64.eq
-				(i64.load (i32.const 0))
-				(i64.const 0xFFFFFFFFFFFFFFFF)
-			)
-		)
-	)
-)
diff --git a/frame/contracts/fixtures/destroy_and_transfer.wat b/frame/contracts/fixtures/destroy_and_transfer.wat
index 7e1d84f3cf98..aa13cd8b8107 100644
--- a/frame/contracts/fixtures/destroy_and_transfer.wat
+++ b/frame/contracts/fixtures/destroy_and_transfer.wat
@@ -145,7 +145,7 @@
 
 		;; Calling the destination address with non-empty input data should now work since the
 		;; contract has been removed. Also transfer a balance to the address so we can ensure this
-		;; does not keep the contract alive.
+		;; does not hinder the contract from being removed.
 		(call $assert
 			(i32.eq
 				(call $seal_transfer
diff --git a/frame/contracts/fixtures/restoration.wat b/frame/contracts/fixtures/restoration.wat
deleted file mode 100644
index e24e5695a356..000000000000
--- a/frame/contracts/fixtures/restoration.wat
+++ /dev/null
@@ -1,72 +0,0 @@
-(module
-	(import "seal0" "seal_set_storage" (func $seal_set_storage (param i32 i32 i32)))
-	(import "seal0" "seal_input" (func $seal_input (param i32 i32)))
-	(import "seal1" "seal_restore_to"
-		(func $seal_restore_to
-			(param i32 i32 i32 i32 i32)
-		)
-	)
-	(import "env" "memory" (memory 1 1))
-
-	(func $assert (param i32)
-		(block $ok
-			(br_if $ok
-				(get_local 0)
-			)
-			(unreachable)
-		)
-	)
-
-	(func (export "call")
-		;; copy code hash to contract memory
-		(call $seal_input (i32.const 308) (i32.const 304))
-		(call $assert
-			(i32.eq
-				(i32.load (i32.const 304))
-				(i32.const 64)
-			)
-		)
-		(call $seal_restore_to
-			;; Pointer to the encoded dest buffer.
-			(i32.const 340)
-			;; Pointer to the encoded code hash buffer
-			(i32.const 308)
-			;; Pointer to the encoded rent_allowance buffer
-			(i32.const 296)
-			;; Pointer and number of items in the delta buffer.
-			;; This buffer specifies multiple keys for removal before restoration.
-			(i32.const 100)
-			(i32.const 1)
-		)
-	)
-	(func (export "deploy")
-		;; Data to restore
-		(call $seal_set_storage
-			(i32.const 0)
-			(i32.const 0)
-			(i32.const 4)
-		)
-
-		;; ACL
-		(call $seal_set_storage
-			(i32.const 100)
-			(i32.const 0)
-			(i32.const 4)
-		)
-	)
-
-	;; Data to restore
-	(data (i32.const 0) "\28")
-
-	;; Buffer that has ACL storage keys.
-	(data (i32.const 100) "\01")
-
-	;; [296, 304) Rent allowance
-	(data (i32.const 296) "\32\00\00\00\00\00\00\00")
-
-	;; [304, 308) Size of the buffer that holds code_hash + addr
-	(data (i32.const 304) "\40")
-
-	;; [308, 340) code hash of bob (copied by seal_input)
-	;; [340, 372) addr of bob (copied by seal_input)
-)
diff --git a/frame/contracts/fixtures/set_rent.wat b/frame/contracts/fixtures/set_rent.wat
deleted file mode 100644
index 4abb7ffe9dbb..000000000000
--- a/frame/contracts/fixtures/set_rent.wat
+++ /dev/null
@@ -1,105 +0,0 @@
-(module
-	(import "seal0" "seal_transfer" (func $seal_transfer (param i32 i32 i32 i32) (result i32)))
-	(import "seal0" "seal_set_storage" (func $seal_set_storage (param i32 i32 i32)))
-	(import "seal0" "seal_clear_storage" (func $seal_clear_storage (param i32)))
-	(import "seal0" "seal_set_rent_allowance" (func $seal_set_rent_allowance (param i32 i32)))
-	(import "seal0" "seal_input" (func $seal_input (param i32 i32)))
-	(import "env" "memory" (memory 1 1))
-
-	;; insert a value of 4 bytes into storage
-	(func $call_0
-		(call $seal_set_storage
-			(i32.const 1)
-			(i32.const 0)
-			(i32.const 4)
-		)
-	)
-
-	;; remove the value inserted by call_1
-	(func $call_1
-		(call $seal_clear_storage
-			(i32.const 1)
-		)
-	)
-
-	;; transfer 50 to CHARLIE
-	(func $call_2
-		(call $assert
-			(i32.eq
-				(call $seal_transfer (i32.const 136) (i32.const 32) (i32.const 100) (i32.const 8))
-				(i32.const 0)
-			)
-		)
-	)
-
-	;; do nothing
-	(func $call_else)
-
-	(func $assert (param i32)
-		(block $ok
-			(br_if $ok
-				(get_local 0)
-			)
-			(unreachable)
-		)
-	)
-
-	;; Dispatch the call according to input size
-	(func (export "call")
-		(local $input_size i32)
-		;; 4 byte i32 for br_table followed by 32 byte destination for transfer
-		(i32.store (i32.const 128) (i32.const 36))
-		(call $seal_input (i32.const 132) (i32.const 128))
-		(set_local $input_size
-			(i32.load (i32.const 132))
-		)
-		(block $IF_ELSE
-			(block $IF_2
-				(block $IF_1
-					(block $IF_0
-						(br_table $IF_0 $IF_1 $IF_2 $IF_ELSE
-							(get_local $input_size)
-						)
-						(unreachable)
-					)
-					(call $call_0)
-					return
-				)
-				(call $call_1)
-				return
-			)
-			(call $call_2)
-			return
-		)
-		(call $call_else)
-	)
-
-	;; Set into storage a 4 bytes value
-	;; Set call set_rent_allowance with input
-	(func (export "deploy")
-		(call $seal_set_storage
-			(i32.const 0)
-			(i32.const 0)
-			(i32.const 4)
-		)
-		(i32.store (i32.const 128) (i32.const 64))
-		(call $seal_input
-			(i32.const 132)
-			(i32.const 128)
-		)
-		(call $seal_set_rent_allowance
-			(i32.const 132)
-			(i32.load (i32.const 128))
-		)
-	)
-
-	;; Encoding of 10 in balance
-	(data (i32.const 0) "\28")
-
-	;; encoding of 50 balance
-	(data (i32.const 100) "\32")
-
-	;; [128, 132) size of seal input buffer
-
-	;; [132, inf) output buffer for seal input
-)
diff --git a/frame/contracts/rpc/runtime-api/src/lib.rs b/frame/contracts/rpc/runtime-api/src/lib.rs
index 742c2997287d..20dfbe210e5c 100644
--- a/frame/contracts/rpc/runtime-api/src/lib.rs
+++ b/frame/contracts/rpc/runtime-api/src/lib.rs
@@ -25,7 +25,7 @@
 
 use codec::Codec;
 use pallet_contracts_primitives::{
-	Code, ContractExecResult, ContractInstantiateResult, GetStorageResult, RentProjectionResult,
+	Code, ContractExecResult, ContractInstantiateResult, GetStorageResult,
 };
 use sp_std::vec::Vec;
 
@@ -58,25 +58,16 @@ sp_api::decl_runtime_apis! {
 			code: Code<Hash>,
 			data: Vec<u8>,
 			salt: Vec<u8>,
-		) -> ContractInstantiateResult<AccountId, BlockNumber>;
+		) -> ContractInstantiateResult<AccountId>;
 
 		/// Query a given storage key in a given contract.
 		///
 		/// Returns `Ok(Some(Vec<u8>))` if the storage value exists under the given key in the
 		/// specified account and `Ok(None)` if it doesn't. If the account specified by the address
-		/// doesn't exist, or doesn't have a contract or if the contract is a tombstone, then `Err`
-		/// is returned.
+		/// doesn't exist, or doesn't have a contract then `Err` is returned.
 		fn get_storage(
 			address: AccountId,
 			key: [u8; 32],
 		) -> GetStorageResult;
-
-		/// Returns the projected time a given contract will be able to sustain paying its rent.
-		///
-		/// The returned projection is relevant for the current block, i.e. it is as if the contract
-		/// was accessed at the current block.
-		///
-		/// Returns `Err` if the contract is in a tombstone state or doesn't exist.
-		fn rent_projection(address: AccountId) -> RentProjectionResult<BlockNumber>;
 	}
 }
diff --git a/frame/contracts/rpc/src/lib.rs b/frame/contracts/rpc/src/lib.rs
index 2586ec7903dd..e0796af05654 100644
--- a/frame/contracts/rpc/src/lib.rs
+++ b/frame/contracts/rpc/src/lib.rs
@@ -22,9 +22,7 @@ use std::sync::Arc;
 use codec::Codec;
 use jsonrpc_core::{Error, ErrorCode, Result};
 use jsonrpc_derive::rpc;
-use pallet_contracts_primitives::{
-	Code, ContractExecResult, ContractInstantiateResult, RentProjection,
-};
+use pallet_contracts_primitives::{Code, ContractExecResult, ContractInstantiateResult};
 use serde::{Deserialize, Serialize};
 use sp_api::ProvideRuntimeApi;
 use sp_blockchain::HeaderBackend;
@@ -40,7 +38,6 @@ pub use pallet_contracts_rpc_runtime_api::ContractsApi as ContractsRuntimeApi;
 
 const RUNTIME_ERROR: i64 = 1;
 const CONTRACT_DOESNT_EXIST: i64 = 2;
-const CONTRACT_IS_A_TOMBSTONE: i64 = 3;
 
 pub type Weight = u64;
 
@@ -69,11 +66,6 @@ impl From<ContractAccessError> for Error {
 				message: "The specified contract doesn't exist.".into(),
 				data: None,
 			},
-			IsTombstone => Error {
-				code: ErrorCode::ServerError(CONTRACT_IS_A_TOMBSTONE),
-				message: "The contract is a tombstone and doesn't have any storage.".into(),
-				data: None,
-			},
 		}
 	}
 }
@@ -130,7 +122,7 @@ pub trait ContractsApi<BlockHash, BlockNumber, AccountId, Balance, Hash> {
 		&self,
 		instantiate_request: InstantiateRequest<AccountId, Hash>,
 		at: Option<BlockHash>,
-	) -> Result<ContractInstantiateResult<AccountId, BlockNumber>>;
+	) -> Result<ContractInstantiateResult<AccountId>>;
 
 	/// Returns the value under a specified storage `key` in a contract given by `address` param,
 	/// or `None` if it is not set.
@@ -141,19 +133,6 @@ pub trait ContractsApi<BlockHash, BlockNumber, AccountId, Balance, Hash> {
 		key: H256,
 		at: Option<BlockHash>,
 	) -> Result<Option<Bytes>>;
-
-	/// Returns the projected time a given contract will be able to sustain paying its rent.
-	///
-	/// The returned projection is relevant for the given block, i.e. it is as if the contract was
-	/// accessed at the beginning of that block.
-	///
-	/// Returns `None` if the contract is exempted from rent.
-	#[rpc(name = "contracts_rentProjection")]
-	fn rent_projection(
-		&self,
-		address: AccountId,
-		at: Option<BlockHash>,
-	) -> Result<Option<BlockNumber>>;
 }
 
 /// An implementation of contract specific RPC methods.
@@ -217,8 +196,7 @@ where
 		&self,
 		instantiate_request: InstantiateRequest<AccountId, Hash>,
 		at: Option<<Block as BlockT>::Hash>,
-	) -> Result<ContractInstantiateResult<AccountId, <<Block as BlockT>::Header as HeaderT>::Number>>
-	{
+	) -> Result<ContractInstantiateResult<AccountId>> {
 		let api = self.client.runtime_api();
 		let at = BlockId::hash(at.unwrap_or_else(||
 			// If the block hash is not supplied assume the best block.
@@ -257,27 +235,6 @@ where
 
 		Ok(result)
 	}
-
-	fn rent_projection(
-		&self,
-		address: AccountId,
-		at: Option<<Block as BlockT>::Hash>,
-	) -> Result<Option<<<Block as BlockT>::Header as HeaderT>::Number>> {
-		let api = self.client.runtime_api();
-		let at = BlockId::hash(at.unwrap_or_else(||
-			// If the block hash is not supplied assume the best block.
-			self.client.info().best_hash));
-
-		let result = api
-			.rent_projection(&at, address)
-			.map_err(runtime_error_into_rpc_err)?
-			.map_err(ContractAccessError)?;
-
-		Ok(match result {
-			RentProjection::NoEviction => None,
-			RentProjection::EvictionAt(block_num) => Some(block_num),
-		})
-	}
 }
 
 /// Converts a runtime trap into an RPC error.
@@ -404,8 +361,7 @@ mod tests {
 	#[test]
 	fn instantiate_result_should_serialize_deserialize_properly() {
 		fn test(expected: &str) {
-			let res: ContractInstantiateResult<String, u64> =
-				serde_json::from_str(expected).unwrap();
+			let res: ContractInstantiateResult<String> = serde_json::from_str(expected).unwrap();
 			let actual = serde_json::to_string(&res).unwrap();
 			assert_eq!(actual, trim(expected).as_str());
 		}
@@ -420,8 +376,7 @@ mod tests {
 					 "flags": 5,
 					 "data": "0x1234"
 				  },
-				  "accountId": "5CiPP",
-				  "rentProjection": null
+				  "accountId": "5CiPP"
 			   }
 			}
 		}"#,
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index c3757cf705bf..509f96bf035c 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -31,7 +31,6 @@ use self::{
 };
 use crate::{
 	exec::{AccountIdOf, StorageKey},
-	rent::Rent,
 	schedule::{API_BENCHMARK_BATCH_SIZE, INSTR_BENCHMARK_BATCH_SIZE},
 	storage::Storage,
 	Pallet as Contracts, *,
@@ -39,10 +38,12 @@ use crate::{
 use codec::Encode;
 use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, whitelisted_caller};
 use frame_support::weights::Weight;
-use frame_system::{Pallet as System, RawOrigin};
-use pallet_contracts_primitives::RentProjection;
+use frame_system::RawOrigin;
 use pwasm_utils::parity_wasm::elements::{BlockType, BrTableData, Instruction, ValueType};
-use sp_runtime::traits::{Bounded, Hash, Zero};
+use sp_runtime::{
+	traits::{Bounded, Hash},
+	Perbill,
+};
 use sp_std::{convert::TryInto, default::Default, vec, vec::Vec};
 
 /// How many batches we do per API benchmark.
@@ -57,26 +58,6 @@ struct Contract<T: Config> {
 	account_id: T::AccountId,
 	addr: <T::Lookup as StaticLookup>::Source,
 	endowment: BalanceOf<T>,
-	code_hash: <T::Hashing as Hash>::Output,
-}
-
-/// Describes how much balance should be transferred on instantiate from the caller.
-enum Endow {
-	/// Endow the contract with a maximum amount of balance. This value is described by
-	/// `Contract::max_endowment`.
-	Max,
-	/// Endow so that the amount of balance that is transferred is big but not so big
-	/// to offset the rent payment. This is needed in order to test rent collection.
-	CollectRent,
-}
-
-impl Endow {
-	/// The maximum amount of balance a caller can transfer without being brought below
-	/// the existential deposit. This assumes that every caller is funded with the amount
-	/// returned by `caller_funding`.
-	fn max<T: Config>() -> BalanceOf<T> {
-		caller_funding::<T>().saturating_sub(T::Currency::minimum_balance())
-	}
 }
 
 impl<T: Config> Contract<T>
@@ -85,12 +66,8 @@ where
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
 	/// Create new contract and use a default account id as instantiator.
-	fn new(
-		module: WasmModule<T>,
-		data: Vec<u8>,
-		endowment: Endow,
-	) -> Result<Contract<T>, &'static str> {
-		Self::with_index(0, module, data, endowment)
+	fn new(module: WasmModule<T>, data: Vec<u8>) -> Result<Contract<T>, &'static str> {
+		Self::with_index(0, module, data)
 	}
 
 	/// Create new contract and use an account id derived from the supplied index as instantiator.
@@ -98,9 +75,8 @@ where
 		index: u32,
 		module: WasmModule<T>,
 		data: Vec<u8>,
-		endowment: Endow,
 	) -> Result<Contract<T>, &'static str> {
-		Self::with_caller(account("instantiator", index, 0), module, data, endowment)
+		Self::with_caller(account("instantiator", index, 0), module, data)
 	}
 
 	/// Create new contract and use the supplied `caller` as instantiator.
@@ -108,37 +84,12 @@ where
 		caller: T::AccountId,
 		module: WasmModule<T>,
 		data: Vec<u8>,
-		endowment: Endow,
 	) -> Result<Contract<T>, &'static str> {
-		let (storage_size, endowment) = match endowment {
-			Endow::CollectRent => {
-				// storage_size cannot be zero because otherwise a contract that is just above
-				// the subsistence threshold does not pay rent given a large enough subsistence
-				// threshold. But we need rent payments to occur in order to benchmark for worst
-				// cases.
-				let storage_size = u32::MAX / 10;
-
-				// Endowment should be large but not as large to inhibit rent payments.
-				// Balance will only cover half the storage
-				let endowment = T::DepositPerStorageByte::get()
-					.saturating_mul(<BalanceOf<T>>::from(storage_size) / 2u32.into())
-					.saturating_add(T::DepositPerContract::get());
-
-				(Some(storage_size), endowment)
-			},
-			Endow::Max => (None, Endow::max::<T>()),
-		};
+		let endowment = contract_funding::<T>();
 		T::Currency::make_free_balance_be(&caller, caller_funding::<T>());
 		let salt = vec![0xff];
 		let addr = Contracts::<T>::contract_address(&caller, &module.hash, &salt);
 
-		// The default block number is zero. The benchmarking system bumps the block number
-		// to one for the benchmarking closure when it is set to zero. In order to prevent this
-		// undesired implicit bump (which messes with rent collection), we do the bump ourselves
-		// in the setup closure so that both the instantiate and subsequent call are run with the
-		// same block number.
-		System::<T>::set_block_number(1u32.into());
-
 		Contracts::<T>::store_code_raw(module.code)?;
 		Contracts::<T>::instantiate(
 			RawOrigin::Signed(caller.clone()).into(),
@@ -154,132 +105,65 @@ where
 			account_id: addr.clone(),
 			addr: T::Lookup::unlookup(addr),
 			endowment,
-			code_hash: module.hash.clone(),
 		};
 
-		let mut contract = result.alive_info()?;
-		if let Some(size) = storage_size {
-			contract.storage_size = size;
-		}
-		ContractInfoOf::<T>::insert(&result.account_id, ContractInfo::Alive(contract));
+		ContractInfoOf::<T>::insert(&result.account_id, result.info()?);
 
 		Ok(result)
 	}
 
+	/// Create a new contract with the supplied storage item count and size each.
+	fn with_storage(
+		code: WasmModule<T>,
+		stor_num: u32,
+		stor_size: u32,
+	) -> Result<Self, &'static str> {
+		let contract = Contract::<T>::new(code, vec![])?;
+		let storage_items = (0..stor_num)
+			.map(|i| {
+				let hash = T::Hashing::hash_of(&i)
+					.as_ref()
+					.try_into()
+					.map_err(|_| "Hash too big for storage key")?;
+				Ok((hash, vec![42u8; stor_size as usize]))
+			})
+			.collect::<Result<Vec<_>, &'static str>>()?;
+		contract.store(&storage_items)?;
+		Ok(contract)
+	}
+
 	/// Store the supplied storage items into this contracts storage.
 	fn store(&self, items: &Vec<(StorageKey, Vec<u8>)>) -> Result<(), &'static str> {
-		let mut info = self.alive_info()?;
+		let mut info = self.info()?;
 		for item in items {
-			Storage::<T>::write(
-				<System<T>>::block_number(),
-				&mut info,
-				&item.0,
-				Some(item.1.clone()),
-			)
-			.map_err(|_| "Failed to write storage to restoration dest")?;
+			Storage::<T>::write(&mut info, &item.0, Some(item.1.clone()))
+				.map_err(|_| "Failed to write storage to restoration dest")?;
 		}
-		<ContractInfoOf<T>>::insert(&self.account_id, ContractInfo::Alive(info.clone()));
+		<ContractInfoOf<T>>::insert(&self.account_id, info.clone());
 		Ok(())
 	}
 
-	/// Get the `AliveContractInfo` of the `addr` or an error if it is no longer alive.
-	fn address_alive_info(addr: &T::AccountId) -> Result<AliveContractInfo<T>, &'static str> {
-		ContractInfoOf::<T>::get(addr)
-			.and_then(|c| c.get_alive())
-			.ok_or("Expected contract to be alive at this point.")
-	}
-
-	/// Get the `AliveContractInfo` of this contract or an error if it is no longer alive.
-	fn alive_info(&self) -> Result<AliveContractInfo<T>, &'static str> {
-		Self::address_alive_info(&self.account_id)
-	}
-
-	/// Return an error if this contract is no tombstone.
-	fn ensure_tombstone(&self) -> Result<(), &'static str> {
-		ContractInfoOf::<T>::get(&self.account_id)
-			.and_then(|c| c.get_tombstone())
-			.ok_or("Expected contract to be a tombstone at this point.")
-			.map(|_| ())
-	}
-
-	/// Get the block number when this contract will be evicted. Returns an error when
-	/// the rent collection won't happen because the contract has to much endowment.
-	fn eviction_at(&self) -> Result<T::BlockNumber, &'static str> {
-		let projection = Rent::<T, PrefabWasmModule<T>>::compute_projection(&self.account_id)
-			.map_err(|_| "Invalid acc for rent")?;
-		match projection {
-			RentProjection::EvictionAt(at) => Ok(at),
-			_ => Err("Account does not pay rent.")?,
-		}
-	}
-}
-
-/// A `Contract` that contains some storage items.
-///
-/// This is used to benchmark contract destruction and resurection. Those operations'
-/// weight depend on the amount of storage accumulated.
-struct ContractWithStorage<T: Config> {
-	/// The contract that was evicted.
-	contract: Contract<T>,
-	/// The storage the contract held when it was avicted.
-	storage: Vec<(StorageKey, Vec<u8>)>,
-}
-
-impl<T: Config> ContractWithStorage<T>
-where
-	T: Config,
-	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
-{
-	/// Same as [`Self::with_code`] but with dummy contract code.
-	fn new(stor_num: u32, stor_size: u32) -> Result<Self, &'static str> {
-		Self::with_code(WasmModule::dummy(), stor_num, stor_size)
-	}
-
-	/// Create and evict a new contract with the supplied storage item count and size each.
-	fn with_code(code: WasmModule<T>, stor_num: u32, stor_size: u32) -> Result<Self, &'static str> {
-		let contract = Contract::<T>::new(code, vec![], Endow::CollectRent)?;
-		let storage_items = create_storage::<T>(stor_num, stor_size)?;
-		contract.store(&storage_items)?;
-		Ok(Self { contract, storage: storage_items })
-	}
-
-	/// Increase the system block number so that this contract is eligible for eviction.
-	fn set_block_num_for_eviction(&self) -> Result<(), &'static str> {
-		System::<T>::set_block_number(
-			self.contract.eviction_at()? + T::SignedClaimHandicap::get() + 5u32.into(),
-		);
-		Ok(())
+	/// Get the `ContractInfo` of the `addr` or an error if it no longer exists.
+	fn address_info(addr: &T::AccountId) -> Result<ContractInfo<T>, &'static str> {
+		ContractInfoOf::<T>::get(addr).ok_or("Expected contract to exist at this point.")
 	}
 
-	/// Evict this contract.
-	fn evict(&mut self) -> Result<(), &'static str> {
-		self.set_block_num_for_eviction()?;
-		Rent::<T, PrefabWasmModule<T>>::try_eviction(&self.contract.account_id, Zero::zero())?;
-		self.contract.ensure_tombstone()
+	/// Get the `ContractInfo` of this contract or an error if it no longer exists.
+	fn info(&self) -> Result<ContractInfo<T>, &'static str> {
+		Self::address_info(&self.account_id)
 	}
 }
 
-/// Generate `stor_num` storage items. Each has the size `stor_size`.
-fn create_storage<T: Config>(
-	stor_num: u32,
-	stor_size: u32,
-) -> Result<Vec<(StorageKey, Vec<u8>)>, &'static str> {
-	(0..stor_num)
-		.map(|i| {
-			let hash = T::Hashing::hash_of(&i)
-				.as_ref()
-				.try_into()
-				.map_err(|_| "Hash too big for storage key")?;
-			Ok((hash, vec![42u8; stor_size as usize]))
-		})
-		.collect::<Result<Vec<_>, &'static str>>()
-}
-
 /// The funding that each account that either calls or instantiates contracts is funded with.
 fn caller_funding<T: Config>() -> BalanceOf<T> {
 	BalanceOf::<T>::max_value() / 2u32.into()
 }
 
+/// The funding used for contracts. It is less than `caller_funding` in purpose.
+fn contract_funding<T: Config>() -> BalanceOf<T> {
+	caller_funding::<T>().saturating_sub(T::Currency::minimum_balance() * 100u32.into())
+}
+
 /// Load the specified contract file from disk by including it into the runtime.
 ///
 /// We need to load a different version of ink! contracts when the benchmark is run as
@@ -312,8 +196,8 @@ benchmarks! {
 	#[skip_meta]
 	on_initialize_per_trie_key {
 		let k in 0..1024;
-		let instance = ContractWithStorage::<T>::new(k, T::Schedule::get().limits.payload_len)?;
-		Storage::<T>::queue_trie_for_deletion(&instance.contract.alive_info()?)?;
+		let instance = Contract::<T>::with_storage(WasmModule::dummy(), k, T::Schedule::get().limits.payload_len)?;
+		Storage::<T>::queue_trie_for_deletion(&instance.info()?)?;
 	}: {
 		Storage::<T>::process_deletion_queue_batch(Weight::max_value())
 	}
@@ -321,8 +205,8 @@ benchmarks! {
 	on_initialize_per_queue_item {
 		let q in 0..1024.min(T::DeletionQueueDepth::get());
 		for i in 0 .. q {
-			let instance = Contract::<T>::with_index(i, WasmModule::dummy(), vec![], Endow::Max)?;
-			Storage::<T>::queue_trie_for_deletion(&instance.alive_info()?)?;
+			let instance = Contract::<T>::with_index(i, WasmModule::dummy(), vec![])?;
+			Storage::<T>::queue_trie_for_deletion(&instance.info()?)?;
 			ContractInfoOf::<T>::remove(instance.account_id);
 		}
 	}: {
@@ -376,7 +260,7 @@ benchmarks! {
 		let c in 0 .. Perbill::from_percent(50).mul_ceil(T::Schedule::get().limits.code_len / 1024);
 		let s in 0 .. code::max_pages::<T>() * 64;
 		let salt = vec![42u8; (s * 1024) as usize];
-		let endowment = caller_funding::<T>() / 3u32.into();
+		let endowment = contract_funding::<T>() / 3u32.into();
 		let caller = whitelisted_caller();
 		T::Currency::make_free_balance_be(&caller, caller_funding::<T>());
 		let WasmModule { code, hash, .. } = WasmModule::<T>::sized(c * 1024);
@@ -386,10 +270,10 @@ benchmarks! {
 	verify {
 		// endowment was removed from the caller
 		assert_eq!(T::Currency::free_balance(&caller), caller_funding::<T>() - endowment);
-		// contract has the full endowment because no rent collection happended
+		// contract has the full endowment
 		assert_eq!(T::Currency::free_balance(&addr), endowment);
-		// instantiate should leave a alive contract
-		Contract::<T>::address_alive_info(&addr)?;
+		// instantiate should leave a contract
+		Contract::<T>::address_info(&addr)?;
 	}
 
 	// Instantiate uses a dummy contract constructor to measure the overhead of the instantiate.
@@ -397,7 +281,7 @@ benchmarks! {
 	instantiate {
 		let s in 0 .. code::max_pages::<T>() * 64;
 		let salt = vec![42u8; (s * 1024) as usize];
-		let endowment = caller_funding::<T>() / 3u32.into();
+		let endowment = contract_funding::<T>() / 3u32.into();
 		let caller = whitelisted_caller();
 		T::Currency::make_free_balance_be(&caller, caller_funding::<T>());
 		let WasmModule { code, hash, .. } = WasmModule::<T>::dummy();
@@ -408,13 +292,13 @@ benchmarks! {
 	verify {
 		// endowment was removed from the caller
 		assert_eq!(T::Currency::free_balance(&caller), caller_funding::<T>() - endowment);
-		// contract has the full endowment because no rent collection happended
+		// contract has the full endowment
 		assert_eq!(T::Currency::free_balance(&addr), endowment);
-		// instantiate should leave a alive contract
-		Contract::<T>::address_alive_info(&addr)?;
+		// instantiate should leave a contract
+		Contract::<T>::address_info(&addr)?;
 	}
 
-	// We just call a dummy contract to measure to overhead of the call extrinsic.
+	// We just call a dummy contract to measure the overhead of the call extrinsic.
 	// The size of the data has no influence on the costs of this extrinsic as long as the contract
 	// won't call `seal_input` in its constructor to copy the data to contract memory.
 	// The dummy contract used here does not do this. The costs for the data copy is billed as
@@ -422,14 +306,11 @@ benchmarks! {
 	call {
 		let data = vec![42u8; 1024];
 		let instance = Contract::<T>::with_caller(
-			whitelisted_caller(), WasmModule::dummy(), vec![], Endow::CollectRent
+			whitelisted_caller(), WasmModule::dummy(), vec![],
 		)?;
-		let value = T::Currency::minimum_balance() * 100u32.into();
+		let value = T::Currency::minimum_balance();
 		let origin = RawOrigin::Signed(instance.caller.clone());
 		let callee = instance.addr.clone();
-
-		// trigger rent collection for worst case performance of call
-		System::<T>::set_block_number(instance.eviction_at()? - 5u32.into());
 		let before = T::Currency::free_balance(&instance.account_id);
 	}: _(origin, callee, value, Weight::max_value(), data)
 	verify {
@@ -438,57 +319,17 @@ benchmarks! {
 			T::Currency::free_balance(&instance.caller),
 			caller_funding::<T>() - instance.endowment - value,
 		);
-		// rent should have lowered the amount of balance of the contract
-		assert!(T::Currency::free_balance(&instance.account_id) < before + value);
-		// but it should not have been evicted by the rent collection
-		instance.alive_info()?;
-	}
-
-	// We benchmark the costs for sucessfully evicting an empty contract.
-	// The actual costs are depending on how many storage items the evicted contract
-	// does have. However, those costs are not to be paid by the sender but
-	// will be distributed over multiple blocks using a scheduler. Otherwise there is
-	// no incentive to remove large contracts when the removal is more expensive than
-	// the reward for removing them.
-	// `c`: Size of the code of the contract that should be evicted.
-	claim_surcharge {
-		let c in 0 .. T::Schedule::get().limits.code_len / 1024;
-		let instance = Contract::<T>::with_caller(
-			whitelisted_caller(), WasmModule::dummy_with_bytes(c * 1024), vec![], Endow::CollectRent
-		)?;
-		let origin = RawOrigin::Signed(instance.caller.clone());
-		let account_id = instance.account_id.clone();
-
-		// instantiate should leave us with an alive contract
-		instance.alive_info()?;
-
-		// generate enough rent so that the contract is evicted
-		System::<T>::set_block_number(
-			instance.eviction_at()? + T::SignedClaimHandicap::get() + 5u32.into()
-		);
-	}: _(origin, account_id, None)
-	verify {
-		// the claim surcharge should have evicted the contract
-		instance.ensure_tombstone()?;
-
-		// the caller should get the reward for being a good snitch
-		// this is capped by the maximum amount of rent paid. So we only now that it should
-		// have increased by at most the surcharge reward.
-		assert!(
-			T::Currency::free_balance(&instance.caller) >
-			caller_funding::<T>() - instance.endowment
-		);
-		assert!(
-			T::Currency::free_balance(&instance.caller) <=
-			caller_funding::<T>() - instance.endowment + <T as Config>::SurchargeReward::get(),
-		);
+		// contract should have received the value
+		assert_eq!(T::Currency::free_balance(&instance.account_id), before + value);
+		// contract should still exist
+		instance.info()?;
 	}
 
 	seal_caller {
 		let r in 0 .. API_BENCHMARK_BATCHES;
 		let instance = Contract::<T>::new(WasmModule::getter(
 			"seal_caller", r * API_BENCHMARK_BATCH_SIZE
-		), vec![], Endow::Max)?;
+		), vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -496,7 +337,7 @@ benchmarks! {
 		let r in 0 .. API_BENCHMARK_BATCHES;
 		let instance = Contract::<T>::new(WasmModule::getter(
 			"seal_address", r * API_BENCHMARK_BATCH_SIZE
-		), vec![], Endow::Max)?;
+		), vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -504,7 +345,7 @@ benchmarks! {
 		let r in 0 .. API_BENCHMARK_BATCHES;
 		let instance = Contract::<T>::new(WasmModule::getter(
 			"seal_gas_left", r * API_BENCHMARK_BATCH_SIZE
-		), vec![], Endow::Max)?;
+		), vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -512,7 +353,7 @@ benchmarks! {
 		let r in 0 .. API_BENCHMARK_BATCHES;
 		let instance = Contract::<T>::new(WasmModule::getter(
 			"seal_balance", r * API_BENCHMARK_BATCH_SIZE
-		), vec![], Endow::Max)?;
+		), vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -520,7 +361,7 @@ benchmarks! {
 		let r in 0 .. API_BENCHMARK_BATCHES;
 		let instance = Contract::<T>::new(WasmModule::getter(
 			"seal_value_transferred", r * API_BENCHMARK_BATCH_SIZE
-		), vec![], Endow::Max)?;
+		), vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -528,7 +369,7 @@ benchmarks! {
 		let r in 0 .. API_BENCHMARK_BATCHES;
 		let instance = Contract::<T>::new(WasmModule::getter(
 			"seal_minimum_balance", r * API_BENCHMARK_BATCH_SIZE
-		), vec![], Endow::Max)?;
+		), vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -536,15 +377,7 @@ benchmarks! {
 		let r in 0 .. API_BENCHMARK_BATCHES;
 		let instance = Contract::<T>::new(WasmModule::getter(
 			"seal_tombstone_deposit", r * API_BENCHMARK_BATCH_SIZE
-		), vec![], Endow::Max)?;
-		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
-
-	seal_rent_allowance {
-		let r in 0 .. API_BENCHMARK_BATCHES;
-		let instance = Contract::<T>::new(WasmModule::getter(
-			"seal_rent_allowance", r * API_BENCHMARK_BATCH_SIZE
-		), vec![], Endow::Max)?;
+		), vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -552,7 +385,7 @@ benchmarks! {
 		let r in 0 .. API_BENCHMARK_BATCHES;
 		let instance = Contract::<T>::new(WasmModule::getter(
 			"seal_block_number", r * API_BENCHMARK_BATCH_SIZE
-		), vec![], Endow::Max)?;
+		), vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -560,7 +393,7 @@ benchmarks! {
 		let r in 0 .. API_BENCHMARK_BATCHES;
 		let instance = Contract::<T>::new(WasmModule::getter(
 			"seal_now", r * API_BENCHMARK_BATCH_SIZE
-		), vec![], Endow::Max)?;
+		), vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -587,7 +420,7 @@ benchmarks! {
 			])),
 			.. Default::default()
 		});
-		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
+		let instance = Contract::<T>::new(code, vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -606,7 +439,7 @@ benchmarks! {
 			])),
 			.. Default::default()
 		});
-		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
+		let instance = Contract::<T>::new(code, vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
@@ -637,7 +470,7 @@ benchmarks! {
 			])),
 			.. Default::default()
 		});
-		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
+		let instance = Contract::<T>::new(code, vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -667,7 +500,7 @@ benchmarks! {
 			])),
 			.. Default::default()
 		});
-		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
+		let instance = Contract::<T>::new(code, vec![])?;
 		let data = vec![42u8; (n * 1024).min(buffer_size) as usize];
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), data)
@@ -691,7 +524,7 @@ benchmarks! {
 			])),
 			.. Default::default()
 		});
-		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
+		let instance = Contract::<T>::new(code, vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -714,7 +547,7 @@ benchmarks! {
 			])),
 			.. Default::default()
 		});
-		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
+		let instance = Contract::<T>::new(code, vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -745,184 +578,18 @@ benchmarks! {
 			])),
 			.. Default::default()
 		});
-		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
+		let instance = Contract::<T>::new(code, vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 		assert_eq!(T::Currency::total_balance(&beneficiary), 0u32.into());
-		assert_eq!(T::Currency::total_balance(&instance.account_id), Endow::max::<T>());
+		assert_eq!(T::Currency::total_balance(&instance.account_id), contract_funding::<T>());
 	}: call(origin, instance.addr.clone(), 0u32.into(), Weight::max_value(), vec![])
 	verify {
 		if r > 0 {
 			assert_eq!(T::Currency::total_balance(&instance.account_id), 0u32.into());
-			assert_eq!(T::Currency::total_balance(&beneficiary), Endow::max::<T>());
-		}
-	}
-
-	seal_restore_to {
-		let r in 0 .. 1;
-
-		// Restore just moves the trie id from origin to destination and therefore
-		// does not depend on the size of the destination contract. However, to not
-		// trigger any edge case we won't use an empty contract as destination.
-		let mut tombstone = ContractWithStorage::<T>::new(10, T::Schedule::get().limits.payload_len)?;
-		tombstone.evict()?;
-
-		let dest = tombstone.contract.account_id.encode();
-		let dest_len = dest.len();
-		let code_hash = tombstone.contract.code_hash.encode();
-		let code_hash_len = code_hash.len();
-		let rent_allowance = BalanceOf::<T>::max_value().encode();
-		let rent_allowance_len = rent_allowance.len();
-
-		let dest_offset = 0;
-		let code_hash_offset = dest_offset + dest_len;
-		let rent_allowance_offset = code_hash_offset + code_hash_len;
-
-		let code = WasmModule::<T>::from(ModuleDefinition {
-			memory: Some(ImportedMemory::max::<T>()),
-			imported_functions: vec![ImportedFunction {
-				module: "seal0",
-				name: "seal_restore_to",
-				params: vec![
-					ValueType::I32,
-					ValueType::I32,
-					ValueType::I32,
-					ValueType::I32,
-					ValueType::I32,
-					ValueType::I32,
-					ValueType::I32,
-					ValueType::I32,
-				],
-				return_type: None,
-			}],
-			data_segments: vec![
-				DataSegment {
-					offset: dest_offset as u32,
-					value: dest,
-				},
-				DataSegment {
-					offset: code_hash_offset as u32,
-					value: code_hash,
-				},
-				DataSegment {
-					offset: rent_allowance_offset as u32,
-					value: rent_allowance,
-				},
-			],
-			call_body: Some(body::repeated(r, &[
-				Instruction::I32Const(dest_offset as i32),
-				Instruction::I32Const(dest_len as i32),
-				Instruction::I32Const(code_hash_offset as i32),
-				Instruction::I32Const(code_hash_len as i32),
-				Instruction::I32Const(rent_allowance_offset as i32),
-				Instruction::I32Const(rent_allowance_len as i32),
-				Instruction::I32Const(0), // delta_ptr
-				Instruction::I32Const(0), // delta_count
-				Instruction::Call(0),
-			])),
-			.. Default::default()
-		});
-
-		let instance = Contract::<T>::with_caller(
-			account("origin", 0, 0), code, vec![], Endow::Max
-		)?;
-		instance.store(&tombstone.storage)?;
-		System::<T>::set_block_number(System::<T>::block_number() + 1u32.into());
-
-		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
-	verify {
-		if r > 0 {
-			tombstone.contract.alive_info()?;
+			assert_eq!(T::Currency::total_balance(&beneficiary), contract_funding::<T>());
 		}
 	}
 
-	// `d`: Number of supplied delta keys
-	#[skip_meta]
-	seal_restore_to_per_delta {
-		let d in 0 .. API_BENCHMARK_BATCHES;
-		let mut tombstone = ContractWithStorage::<T>::new(0, 0)?;
-		tombstone.evict()?;
-		let delta = create_storage::<T>(
-			d * API_BENCHMARK_BATCH_SIZE,
-			T::Schedule::get().limits.payload_len,
-		)?;
-
-		let dest = tombstone.contract.account_id.encode();
-		let dest_len = dest.len();
-		let code_hash = tombstone.contract.code_hash.encode();
-		let code_hash_len = code_hash.len();
-		let rent_allowance = BalanceOf::<T>::max_value().encode();
-		let rent_allowance_len = rent_allowance.len();
-		let delta_keys = delta.iter().flat_map(|(key, _)| key).cloned().collect::<Vec<_>>();
-
-		let dest_offset = 0;
-		let code_hash_offset = dest_offset + dest_len;
-		let rent_allowance_offset = code_hash_offset + code_hash_len;
-		let delta_keys_offset = rent_allowance_offset + rent_allowance_len;
-
-		let code = WasmModule::<T>::from(ModuleDefinition {
-			memory: Some(ImportedMemory::max::<T>()),
-			imported_functions: vec![ImportedFunction {
-				module: "seal0",
-				name: "seal_restore_to",
-				params: vec![
-					ValueType::I32,
-					ValueType::I32,
-					ValueType::I32,
-					ValueType::I32,
-					ValueType::I32,
-					ValueType::I32,
-					ValueType::I32,
-					ValueType::I32,
-				],
-				return_type: None,
-			}],
-			data_segments: vec![
-				DataSegment {
-					offset: dest_offset as u32,
-					value: dest,
-				},
-				DataSegment {
-					offset: code_hash_offset as u32,
-					value: code_hash,
-				},
-				DataSegment {
-					offset: rent_allowance_offset as u32,
-					value: rent_allowance,
-				},
-				DataSegment {
-					offset: delta_keys_offset as u32,
-					value: delta_keys,
-				},
-			],
-			call_body: Some(body::plain(vec![
-				Instruction::I32Const(dest_offset as i32),
-				Instruction::I32Const(dest_len as i32),
-				Instruction::I32Const(code_hash_offset as i32),
-				Instruction::I32Const(code_hash_len as i32),
-				Instruction::I32Const(rent_allowance_offset as i32),
-				Instruction::I32Const(rent_allowance_len as i32),
-				Instruction::I32Const(delta_keys_offset as i32), // delta_ptr
-				Instruction::I32Const(delta.len() as i32), // delta_count
-				Instruction::Call(0),
-				Instruction::End,
-			])),
-			.. Default::default()
-		});
-
-		let instance = Contract::<T>::with_caller(
-			account("origin", 0, 0), code, vec![], Endow::Max
-		)?;
-		instance.store(&tombstone.storage)?;
-		instance.store(&delta)?;
-		System::<T>::set_block_number(System::<T>::block_number() + 1u32.into());
-
-		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
-	verify {
-		tombstone.contract.alive_info()?;
-	}
-
 	// We benchmark only for the maximum subject length. We assume that this is some lowish
 	// number (< 1 KB). Therefore we are not overcharging too much in case a smaller subject is
 	// used.
@@ -954,7 +621,7 @@ benchmarks! {
 			])),
 			.. Default::default()
 		});
-		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
+		let instance = Contract::<T>::new(code, vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -979,7 +646,7 @@ benchmarks! {
 			])),
 			.. Default::default()
 		});
-		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
+		let instance = Contract::<T>::new(code, vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -1017,36 +684,7 @@ benchmarks! {
 			])),
 			.. Default::default()
 		});
-		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
-		let origin = RawOrigin::Signed(instance.caller.clone());
-	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
-
-	seal_set_rent_allowance {
-		let r in 0 .. API_BENCHMARK_BATCHES;
-		let allowance = caller_funding::<T>().encode();
-		let allowance_len = allowance.len();
-		let code = WasmModule::<T>::from(ModuleDefinition {
-			memory: Some(ImportedMemory { min_pages: 1, max_pages: 1 }),
-			imported_functions: vec![ImportedFunction {
-				module: "seal0",
-				name: "seal_set_rent_allowance",
-				params: vec![ValueType::I32, ValueType::I32],
-				return_type: None,
-			}],
-			data_segments: vec![
-				DataSegment {
-					offset: 0,
-					value: allowance,
-				},
-			],
-			call_body: Some(body::repeated(r * API_BENCHMARK_BATCH_SIZE, &[
-				Instruction::I32Const(0), // value_ptr
-				Instruction::I32Const(allowance_len as i32), // value_len
-				Instruction::Call(0),
-			])),
-			.. Default::default()
-		});
-		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
+		let instance = Contract::<T>::new(code, vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -1072,7 +710,7 @@ benchmarks! {
 			])),
 			.. Default::default()
 		});
-		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
+		let instance = Contract::<T>::new(code, vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -1109,7 +747,7 @@ benchmarks! {
 			])),
 			.. Default::default()
 		});
-		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
+		let instance = Contract::<T>::new(code, vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -1139,7 +777,7 @@ benchmarks! {
 			])),
 			.. Default::default()
 		});
-		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
+		let instance = Contract::<T>::new(code, vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -1174,18 +812,17 @@ benchmarks! {
 			])),
 			.. Default::default()
 		});
-		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
-		let mut info = instance.alive_info()?;
+		let instance = Contract::<T>::new(code, vec![])?;
+		let mut info = instance.info()?;
 		for key in keys {
 			Storage::<T>::write(
-				<System<T>>::block_number(),
 				&mut info,
 				key.as_slice().try_into().map_err(|e| "Key has wrong length")?,
 				Some(vec![42; T::Schedule::get().limits.payload_len as usize])
 			)
 			.map_err(|_| "Failed to write to storage during setup.")?;
 		}
-		<ContractInfoOf<T>>::insert(&instance.account_id, ContractInfo::Alive(info.clone()));
+		<ContractInfoOf<T>>::insert(&instance.account_id, info.clone());
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -1222,18 +859,17 @@ benchmarks! {
 			])),
 			.. Default::default()
 		});
-		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
-		let mut info = instance.alive_info()?;
+		let instance = Contract::<T>::new(code, vec![])?;
+		let mut info = instance.info()?;
 		for key in keys {
 			Storage::<T>::write(
-				<System<T>>::block_number(),
 				&mut info,
 				key.as_slice().try_into().map_err(|e| "Key has wrong length")?,
 				Some(vec![])
 			)
 			.map_err(|_| "Failed to write to storage during setup.")?;
 		}
-		<ContractInfoOf<T>>::insert(&instance.account_id, ContractInfo::Alive(info.clone()));
+		<ContractInfoOf<T>>::insert(&instance.account_id, info.clone());
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -1269,16 +905,15 @@ benchmarks! {
 			])),
 			.. Default::default()
 		});
-		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
-		let mut info = instance.alive_info()?;
+		let instance = Contract::<T>::new(code, vec![])?;
+		let mut info = instance.info()?;
 		Storage::<T>::write(
-			<System<T>>::block_number(),
 			&mut info,
 			key.as_slice().try_into().map_err(|e| "Key has wrong length")?,
 			Some(vec![42u8; (n * 1024) as usize])
 		)
 		.map_err(|_| "Failed to write to storage during setup.")?;
-		<ContractInfoOf<T>>::insert(&instance.account_id, ContractInfo::Alive(info.clone()));
+		<ContractInfoOf<T>>::insert(&instance.account_id, info.clone());
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -1322,7 +957,7 @@ benchmarks! {
 			])),
 			.. Default::default()
 		});
-		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
+		let instance = Contract::<T>::new(code, vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 		for account in &accounts {
 			assert_eq!(T::Currency::total_balance(account), 0u32.into());
@@ -1339,7 +974,7 @@ benchmarks! {
 		let r in 0 .. API_BENCHMARK_BATCHES;
 		let dummy_code = WasmModule::<T>::dummy_with_bytes(0);
 		let callees = (0..r * API_BENCHMARK_BATCH_SIZE)
-			.map(|i| Contract::with_index(i + 1, dummy_code.clone(), vec![], Endow::Max))
+			.map(|i| Contract::with_index(i + 1, dummy_code.clone(), vec![]))
 			.collect::<Result<Vec<_>, _>>()?;
 		let callee_len = callees.get(0).map(|i| i.account_id.encode().len()).unwrap_or(0);
 		let callee_bytes = callees.iter().flat_map(|x| x.account_id.encode()).collect();
@@ -1389,7 +1024,7 @@ benchmarks! {
 			])),
 			.. Default::default()
 		});
-		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
+		let instance = Contract::<T>::new(code, vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -1419,7 +1054,7 @@ benchmarks! {
 			.. Default::default()
 		});
 		let callees = (0..API_BENCHMARK_BATCH_SIZE)
-			.map(|i| Contract::with_index(i + 1, callee_code.clone(), vec![], Endow::Max))
+			.map(|i| Contract::with_index(i + 1, callee_code.clone(), vec![]))
 			.collect::<Result<Vec<_>, _>>()?;
 		let callee_len = callees.get(0).map(|i| i.account_id.encode().len()).unwrap_or(0);
 		let callee_bytes = callees.iter().flat_map(|x| x.account_id.encode()).collect::<Vec<_>>();
@@ -1474,7 +1109,7 @@ benchmarks! {
 			])),
 			.. Default::default()
 		});
-		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
+		let instance = Contract::<T>::new(code, vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -1501,7 +1136,7 @@ benchmarks! {
 		let hash_len = hashes.get(0).map(|x| x.encode().len()).unwrap_or(0);
 		let hashes_bytes = hashes.iter().flat_map(|x| x.encode()).collect::<Vec<_>>();
 		let hashes_len = hashes_bytes.len();
-		let value = Endow::max::<T>() / (r * API_BENCHMARK_BATCH_SIZE + 2).into();
+		let value = contract_funding::<T>() / (r * API_BENCHMARK_BATCH_SIZE + 2).into();
 		assert!(value > 0u32.into());
 		let value_bytes = value.encode();
 		let value_len = value_bytes.len();
@@ -1568,7 +1203,7 @@ benchmarks! {
 			])),
 			.. Default::default()
 		});
-		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
+		let instance = Contract::<T>::new(code, vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 		let callee = instance.addr.clone();
 		let addresses = hashes
@@ -1586,7 +1221,7 @@ benchmarks! {
 	}: call(origin, callee, 0u32.into(), Weight::max_value(), vec![])
 	verify {
 		for addr in &addresses {
-			ContractInfoOf::<T>::get(&addr).and_then(|c| c.get_alive())
+			ContractInfoOf::<T>::get(&addr)
 				.ok_or_else(|| "Contract should have been instantiated")?;
 		}
 	}
@@ -1624,7 +1259,7 @@ benchmarks! {
 		let input_len = inputs.get(0).map(|x| x.len()).unwrap_or(0);
 		let input_bytes = inputs.iter().cloned().flatten().collect::<Vec<_>>();
 		let inputs_len = input_bytes.len();
-		let value = Endow::max::<T>() / (API_BENCHMARK_BATCH_SIZE + 2).into();
+		let value = contract_funding::<T>() / (API_BENCHMARK_BATCH_SIZE + 2).into();
 		assert!(value > 0u32.into());
 		let value_bytes = value.encode();
 		let value_len = value_bytes.len();
@@ -1706,7 +1341,7 @@ benchmarks! {
 			])),
 			.. Default::default()
 		});
-		let instance = Contract::<T>::new(code, vec![], Endow::Max)?;
+		let instance = Contract::<T>::new(code, vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -1715,7 +1350,7 @@ benchmarks! {
 		let r in 0 .. API_BENCHMARK_BATCHES;
 		let instance = Contract::<T>::new(WasmModule::hasher(
 			"seal_hash_sha2_256", r * API_BENCHMARK_BATCH_SIZE, 0,
-		), vec![], Endow::Max)?;
+		), vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -1724,7 +1359,7 @@ benchmarks! {
 		let n in 0 .. code::max_pages::<T>() * 64;
 		let instance = Contract::<T>::new(WasmModule::hasher(
 			"seal_hash_sha2_256", API_BENCHMARK_BATCH_SIZE, n * 1024,
-		), vec![], Endow::Max)?;
+		), vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -1733,7 +1368,7 @@ benchmarks! {
 		let r in 0 .. API_BENCHMARK_BATCHES;
 		let instance = Contract::<T>::new(WasmModule::hasher(
 			"seal_hash_keccak_256", r * API_BENCHMARK_BATCH_SIZE, 0,
-		), vec![], Endow::Max)?;
+		), vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -1742,7 +1377,7 @@ benchmarks! {
 		let n in 0 .. code::max_pages::<T>() * 64;
 		let instance = Contract::<T>::new(WasmModule::hasher(
 			"seal_hash_keccak_256", API_BENCHMARK_BATCH_SIZE, n * 1024,
-		), vec![], Endow::Max)?;
+		), vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -1751,7 +1386,7 @@ benchmarks! {
 		let r in 0 .. API_BENCHMARK_BATCHES;
 		let instance = Contract::<T>::new(WasmModule::hasher(
 			"seal_hash_blake2_256", r * API_BENCHMARK_BATCH_SIZE, 0,
-		), vec![], Endow::Max)?;
+		), vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -1760,7 +1395,7 @@ benchmarks! {
 		let n in 0 .. code::max_pages::<T>() * 64;
 		let instance = Contract::<T>::new(WasmModule::hasher(
 			"seal_hash_blake2_256", API_BENCHMARK_BATCH_SIZE, n * 1024,
-		), vec![], Endow::Max)?;
+		), vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -1769,7 +1404,7 @@ benchmarks! {
 		let r in 0 .. API_BENCHMARK_BATCHES;
 		let instance = Contract::<T>::new(WasmModule::hasher(
 			"seal_hash_blake2_128", r * API_BENCHMARK_BATCH_SIZE, 0,
-		), vec![], Endow::Max)?;
+		), vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -1778,7 +1413,7 @@ benchmarks! {
 		let n in 0 .. code::max_pages::<T>() * 64;
 		let instance = Contract::<T>::new(WasmModule::hasher(
 			"seal_hash_blake2_128", API_BENCHMARK_BATCH_SIZE, n * 1024,
-		), vec![], Endow::Max)?;
+		), vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
@@ -2571,7 +2206,7 @@ benchmarks! {
 			new.encode()
 		};
 		let instance = Contract::<T>::new(
-			WasmModule::instrumented(code, gas_metering, true), data, Endow::Max,
+			WasmModule::instrumented(code, gas_metering, true), data,
 		)?;
 		let data = {
 			let transfer: ([u8; 4], AccountIdOf<T>, BalanceOf<T>) = (
@@ -2616,7 +2251,7 @@ benchmarks! {
 			new.encode()
 		};
 		let instance = Contract::<T>::with_caller(
-			caller, WasmModule::instrumented(code, gas_metering, true), data, Endow::Max,
+			caller, WasmModule::instrumented(code, gas_metering, true), data,
 		)?;
 		balance[0] = 1;
 		let data = {
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index ef19c443c79c..4039b1d134e1 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -16,11 +16,8 @@
 // limitations under the License.
 
 use crate::{
-	gas::GasMeter,
-	rent::{Rent, RentStatus},
-	storage::Storage,
-	AccountCounter, AliveContractInfo, BalanceOf, CodeHash, Config, ContractInfo, ContractInfoOf,
-	Error, Event, Pallet as Contracts, Schedule,
+	gas::GasMeter, storage::Storage, AccountCounter, BalanceOf, CodeHash, Config, ContractInfo,
+	ContractInfoOf, Error, Event, Pallet as Contracts, Schedule,
 };
 use frame_support::{
 	dispatch::{DispatchError, DispatchResult, DispatchResultWithPostInfo, Dispatchable},
@@ -28,18 +25,19 @@ use frame_support::{
 	storage::{with_transaction, TransactionOutcome},
 	traits::{Contains, Currency, ExistenceRequirement, Get, OriginTrait, Randomness, Time},
 	weights::Weight,
-	DefaultNoBound,
 };
 use frame_system::RawOrigin;
 use pallet_contracts_primitives::ExecReturnValue;
 use smallvec::{Array, SmallVec};
 use sp_core::crypto::UncheckedFrom;
-use sp_runtime::{
-	traits::{Convert, Saturating},
-	Perbill,
-};
+use sp_runtime::traits::{Convert, Saturating};
 use sp_std::{marker::PhantomData, mem, prelude::*};
 
+/// When fields are added to the [`ContractInfo`] that can change during execution this
+/// variable needs to be set to true. This will also force changes to the
+/// `in_memory_changes_not_discarded` test.
+const CONTRACT_INFO_CAN_CHANGE: bool = false;
+
 pub type AccountIdOf<T> = <T as frame_system::Config>::AccountId;
 pub type MomentOf<T> = <<T as Config>::Time as Time>::Moment;
 pub type SeedOf<T> = <T as frame_system::Config>::Hash;
@@ -81,67 +79,6 @@ impl<T: Into<DispatchError>> From<T> for ExecError {
 	}
 }
 
-/// Information needed for rent calculations that can be requested by a contract.
-#[derive(codec::Encode, DefaultNoBound)]
-#[cfg_attr(test, derive(Debug, PartialEq))]
-pub struct RentParams<T: Config> {
-	/// The total balance of the contract. Includes the balance transferred from the caller.
-	total_balance: BalanceOf<T>,
-	/// The free balance of the contract. Includes the balance transferred from the caller.
-	free_balance: BalanceOf<T>,
-	/// See crate [`Contracts::subsistence_threshold()`].
-	subsistence_threshold: BalanceOf<T>,
-	/// See crate [`Config::DepositPerContract`].
-	deposit_per_contract: BalanceOf<T>,
-	/// See crate [`Config::DepositPerStorageByte`].
-	deposit_per_storage_byte: BalanceOf<T>,
-	/// See crate [`Config::DepositPerStorageItem`].
-	deposit_per_storage_item: BalanceOf<T>,
-	/// See crate [`Ext::rent_allowance()`].
-	rent_allowance: BalanceOf<T>,
-	/// See crate [`Config::RentFraction`].
-	rent_fraction: Perbill,
-	/// See crate [`AliveContractInfo::storage_size`].
-	storage_size: u32,
-	/// See crate [`Executable::aggregate_code_len()`].
-	code_size: u32,
-	/// See crate [`Executable::refcount()`].
-	code_refcount: u32,
-	/// Reserved for backwards compatible changes to this data structure.
-	_reserved: Option<()>,
-}
-
-impl<T> RentParams<T>
-where
-	T: Config,
-	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
-{
-	/// Derive new `RentParams` from the passed in data.
-	///
-	/// `value` is added to the current free and total balance of the contracts' account.
-	fn new<E: Executable<T>>(
-		account_id: &T::AccountId,
-		value: &BalanceOf<T>,
-		contract: &AliveContractInfo<T>,
-		executable: &E,
-	) -> Self {
-		Self {
-			total_balance: T::Currency::total_balance(account_id).saturating_add(*value),
-			free_balance: T::Currency::free_balance(account_id).saturating_add(*value),
-			subsistence_threshold: <Contracts<T>>::subsistence_threshold(),
-			deposit_per_contract: T::DepositPerContract::get(),
-			deposit_per_storage_byte: T::DepositPerStorageByte::get(),
-			deposit_per_storage_item: T::DepositPerStorageItem::get(),
-			rent_allowance: contract.rent_allowance,
-			rent_fraction: T::RentFraction::get(),
-			storage_size: contract.storage_size,
-			code_size: executable.aggregate_code_len(),
-			code_refcount: executable.refcount(),
-			_reserved: None,
-		}
-	}
-}
-
 /// An interface that provides access to the external environment in which the
 /// smart-contract is executed.
 ///
@@ -197,25 +134,6 @@ pub trait Ext: sealing::Sealed {
 	/// call stack.
 	fn terminate(&mut self, beneficiary: &AccountIdOf<Self::T>) -> Result<(), DispatchError>;
 
-	/// Restores the given destination contract sacrificing the current one.
-	///
-	/// Since this function removes the self contract eagerly, if succeeded, no further actions
-	/// should be performed on this `Ext` instance.
-	///
-	/// This function will fail if the same contract is present
-	/// on the contract call stack.
-	///
-	/// # Return Value
-	///
-	/// Result<(CallerCodeSize, DestCodeSize), (DispatchError, CallerCodeSize, DestCodesize)>
-	fn restore_to(
-		&mut self,
-		dest: AccountIdOf<Self::T>,
-		code_hash: CodeHash<Self::T>,
-		rent_allowance: BalanceOf<Self::T>,
-		delta: Vec<StorageKey>,
-	) -> Result<(), DispatchError>;
-
 	/// Transfer some amount of funds into the specified account.
 	fn transfer(&mut self, to: &AccountIdOf<Self::T>, value: BalanceOf<Self::T>) -> DispatchResult;
 
@@ -249,8 +167,8 @@ pub trait Ext: sealing::Sealed {
 	/// Returns the minimum balance that is required for creating an account.
 	fn minimum_balance(&self) -> BalanceOf<Self::T>;
 
-	/// Returns the deposit required to create a tombstone upon contract eviction.
-	fn tombstone_deposit(&self) -> BalanceOf<Self::T>;
+	/// Returns the deposit required to instantiate a contract.
+	fn contract_deposit(&self) -> BalanceOf<Self::T>;
 
 	/// Returns a random number for the current block with the given subject.
 	fn random(&self, subject: &[u8]) -> (SeedOf<Self::T>, BlockNumberOf<Self::T>);
@@ -260,12 +178,6 @@ pub trait Ext: sealing::Sealed {
 	/// There should not be any duplicates in `topics`.
 	fn deposit_event(&mut self, topics: Vec<TopicOf<Self::T>>, data: Vec<u8>);
 
-	/// Set rent allowance of the contract
-	fn set_rent_allowance(&mut self, rent_allowance: BalanceOf<Self::T>);
-
-	/// Rent allowance of the contract
-	fn rent_allowance(&mut self) -> BalanceOf<Self::T>;
-
 	/// Returns the current block number.
 	fn block_number(&self) -> BlockNumberOf<Self::T>;
 
@@ -278,12 +190,6 @@ pub trait Ext: sealing::Sealed {
 	/// Get a reference to the schedule used by the current call.
 	fn schedule(&self) -> &Schedule<Self::T>;
 
-	/// Information needed for rent calculations.
-	fn rent_params(&self) -> &RentParams<Self::T>;
-
-	/// Information about the required deposit and resulting rent.
-	fn rent_status(&mut self, at_refcount: u32) -> RentStatus<Self::T>;
-
 	/// Get a mutable reference to the nested gas meter.
 	fn gas_meter(&mut self) -> &mut GasMeter<Self::T>;
 
@@ -336,9 +242,6 @@ pub trait Executable<T: Config>: Sized {
 	/// Does not charge from the gas meter. Do not call in contexts where this is important.
 	fn from_storage_noinstr(code_hash: CodeHash<T>) -> Result<Self, DispatchError>;
 
-	/// Decrements the refcount by one and deletes the code if it drops to zero.
-	fn drop_from_storage(self);
-
 	/// Increment the refcount by one. Fails if the code does not exist on-chain.
 	///
 	/// Returns the size of the original code.
@@ -387,23 +290,6 @@ pub trait Executable<T: Config>: Sized {
 
 	// The number of contracts using this executable.
 	fn refcount(&self) -> u32;
-
-	/// The storage that is occupied by the instrumented executable and its pristine source.
-	///
-	/// The returned size is already divided by the number of users who share the code.
-	/// This is essentially `aggregate_code_len() / refcount()`.
-	///
-	/// # Note
-	///
-	/// This works with the current in-memory value of refcount. When calling any contract
-	/// without refetching this from storage the result can be inaccurate as it might be
-	/// working with a stale value. Usually this inaccuracy is tolerable.
-	fn occupied_storage(&self) -> u32 {
-		// We disregard the size of the struct itself as the size is completely
-		// dominated by the code size.
-		let len = self.aggregate_code_len();
-		len.checked_div(self.refcount()).unwrap_or(len)
-	}
 }
 
 /// The complete call stack of a contract execution.
@@ -461,8 +347,6 @@ pub struct Frame<T: Config> {
 	contract_info: CachedContract<T>,
 	/// The amount of balance transferred by the caller as part of the call.
 	value_transferred: BalanceOf<T>,
-	/// Snapshotted rent information that can be copied to the contract if requested.
-	rent_params: RentParams<T>,
 	/// Determines whether this is a call or instantiate frame.
 	entry_point: ExportedFunction,
 	/// The gas meter capped to the supplied gas limit.
@@ -479,7 +363,7 @@ enum FrameArgs<'a, T: Config, E> {
 		/// The account id of the contract that is to be called.
 		dest: T::AccountId,
 		/// If `None` the contract info needs to be reloaded from storage.
-		cached_info: Option<AliveContractInfo<T>>,
+		cached_info: Option<ContractInfo<T>>,
 	},
 	Instantiate {
 		/// The contract or signed origin which instantiates the new contract.
@@ -496,12 +380,12 @@ enum FrameArgs<'a, T: Config, E> {
 /// Describes the different states of a contract as contained in a `Frame`.
 enum CachedContract<T: Config> {
 	/// The cached contract is up to date with the in-storage value.
-	Cached(AliveContractInfo<T>),
+	Cached(ContractInfo<T>),
 	/// A recursive call into the same contract did write to the contract info.
 	///
 	/// In this case the cached contract is stale and needs to be reloaded from storage.
 	Invalidated,
-	/// The current contract executed `terminate` or `restore_to` and removed the contract.
+	/// The current contract executed `terminate` and removed the contract.
 	///
 	/// In this case a reload is neither allowed nor possible. Please note that recursive
 	/// calls cannot remove a contract as this is checked and denied.
@@ -510,13 +394,8 @@ enum CachedContract<T: Config> {
 
 impl<T: Config> Frame<T> {
 	/// Return the `contract_info` of the current contract.
-	fn contract_info(&mut self) -> &mut AliveContractInfo<T> {
-		self.contract_info.as_alive(&self.account_id)
-	}
-
-	/// Invalidate and return the `contract_info` of the current contract.
-	fn invalidate(&mut self) -> AliveContractInfo<T> {
-		self.contract_info.invalidate(&self.account_id)
+	fn contract_info(&mut self) -> &mut ContractInfo<T> {
+		self.contract_info.get(&self.account_id)
 	}
 
 	/// Terminate and return the `contract_info` of the current contract.
@@ -525,7 +404,7 @@ impl<T: Config> Frame<T> {
 	///
 	/// Under no circumstances the contract is allowed to access the `contract_info` after
 	/// a call to this function. This would constitute a programming error in the exec module.
-	fn terminate(&mut self) -> AliveContractInfo<T> {
+	fn terminate(&mut self) -> ContractInfo<T> {
 		self.contract_info.terminate(&self.account_id)
 	}
 }
@@ -540,7 +419,7 @@ macro_rules! get_cached_or_panic_after_load {
 		} else {
 			panic!(
 				"It is impossible to remove a contract that is on the call stack;\
-				See implementations of terminate and restore_to;\
+				See implementations of terminate;\
 				Therefore fetching a contract will never fail while using an account id
 				that is currently active on the call stack;\
 				qed"
@@ -553,28 +432,21 @@ impl<T: Config> CachedContract<T> {
 	/// Load the `contract_info` from storage if necessary.
 	fn load(&mut self, account_id: &T::AccountId) {
 		if let CachedContract::Invalidated = self {
-			let contract =
-				<ContractInfoOf<T>>::get(&account_id).and_then(|contract| contract.get_alive());
+			let contract = <ContractInfoOf<T>>::get(&account_id);
 			if let Some(contract) = contract {
 				*self = CachedContract::Cached(contract);
 			}
 		}
 	}
 
-	/// Return the cached contract_info as alive contract info.
-	fn as_alive(&mut self, account_id: &T::AccountId) -> &mut AliveContractInfo<T> {
+	/// Return the cached contract_info.
+	fn get(&mut self, account_id: &T::AccountId) -> &mut ContractInfo<T> {
 		self.load(account_id);
 		get_cached_or_panic_after_load!(self)
 	}
 
-	/// Invalidate and return the contract info.
-	fn invalidate(&mut self, account_id: &T::AccountId) -> AliveContractInfo<T> {
-		self.load(account_id);
-		get_cached_or_panic_after_load!(mem::replace(self, Self::Invalidated))
-	}
-
 	/// Terminate and return the contract info.
-	fn terminate(&mut self, account_id: &T::AccountId) -> AliveContractInfo<T> {
+	fn terminate(&mut self, account_id: &T::AccountId) -> ContractInfo<T> {
 		self.load(account_id);
 		get_cached_or_panic_after_load!(mem::replace(self, Self::Terminated))
 	}
@@ -695,23 +567,11 @@ where
 				let contract = if let Some(contract) = cached_info {
 					contract
 				} else {
-					<ContractInfoOf<T>>::get(&dest)
-						.ok_or(<Error<T>>::ContractNotFound.into())
-						.and_then(|contract| {
-							contract.get_alive().ok_or(<Error<T>>::ContractIsTombstone)
-						})?
+					<ContractInfoOf<T>>::get(&dest).ok_or(<Error<T>>::ContractNotFound)?
 				};
 
 				let executable = E::from_storage(contract.code_hash, schedule, gas_meter)?;
 
-				// This charges the rent and denies access to a contract that is in need of
-				// eviction by returning `None`. We cannot evict eagerly here because those
-				// changes would be rolled back in case this contract is called by another
-				// contract.
-				// See: https://github.com/paritytech/substrate/issues/6439#issuecomment-648754324
-				let contract =
-					Rent::<T, E>::charge(&dest, contract, executable.occupied_storage())?
-						.ok_or(Error::<T>::RentNotPaid)?;
 				(dest, contract, executable, ExportedFunction::Call)
 			},
 			FrameArgs::Instantiate { sender, trie_seed, executable, salt } => {
@@ -728,12 +588,6 @@ where
 		};
 
 		let frame = Frame {
-			rent_params: RentParams::new(
-				&account_id,
-				&value_transferred,
-				&contract_info,
-				&executable,
-			),
 			value_transferred,
 			contract_info: CachedContract::Cached(contract_info),
 			account_id,
@@ -756,18 +610,17 @@ where
 			return Err(Error::<T>::MaxCallDepthReached.into())
 		}
 
-		// We need to make sure that changes made to the contract info are not discarded.
-		// See the `in_memory_changes_not_discarded` test for more information.
-		// We do not store on instantiate because we do not allow to call into a contract
-		// from its own constructor.
-		let frame = self.top_frame();
-		if let (CachedContract::Cached(contract), ExportedFunction::Call) =
-			(&frame.contract_info, frame.entry_point)
-		{
-			<ContractInfoOf<T>>::insert(
-				frame.account_id.clone(),
-				ContractInfo::Alive(contract.clone()),
-			);
+		if CONTRACT_INFO_CAN_CHANGE {
+			// We need to make sure that changes made to the contract info are not discarded.
+			// See the `in_memory_changes_not_discarded` test for more information.
+			// We do not store on instantiate because we do not allow to call into a contract
+			// from its own constructor.
+			let frame = self.top_frame();
+			if let (CachedContract::Cached(contract), ExportedFunction::Call) =
+				(&frame.contract_info, frame.entry_point)
+			{
+				<ContractInfoOf<T>>::insert(frame.account_id.clone(), contract.clone());
+			}
 		}
 
 		let nested_meter =
@@ -784,12 +637,6 @@ where
 	fn run(&mut self, executable: E, input_data: Vec<u8>) -> Result<ExecReturnValue, ExecError> {
 		let entry_point = self.top_frame().entry_point;
 		let do_transaction = || {
-			// Cache the value before calling into the constructor because that
-			// consumes the value. If the constructor creates additional contracts using
-			// the same code hash we still charge the "1 block rent" as if they weren't
-			// spawned. This is OK as overcharging is always safe.
-			let occupied_storage = executable.occupied_storage();
-
 			// Every call or instantiate also optionally transferres balance.
 			self.initial_transfer()?;
 
@@ -808,16 +655,6 @@ where
 					return Err(Error::<T>::TerminatedInConstructor.into())
 				}
 
-				// Collect the rent for the first block to prevent the creation of very large
-				// contracts that never intended to pay for even one block.
-				// This also makes sure that it is above the subsistence threshold
-				// in order to keep up the guarantuee that we always leave a tombstone behind
-				// with the exception of a contract that called `seal_terminate`.
-				let contract =
-					Rent::<T, E>::charge(&account_id, frame.invalidate(), occupied_storage)?
-						.ok_or(Error::<T>::NewContractNotFunded)?;
-				frame.contract_info = CachedContract::Cached(contract);
-
 				// Deposit an instantiation event.
 				deposit_event::<T>(vec![], Event::Instantiated(self.caller().clone(), account_id));
 			}
@@ -877,7 +714,7 @@ where
 				// because that case is already handled by the optimization above. Only the first
 				// cache needs to be invalidated because that one will invalidate the next cache
 				// when it is popped from the stack.
-				<ContractInfoOf<T>>::insert(account_id, ContractInfo::Alive(contract));
+				<ContractInfoOf<T>>::insert(account_id, contract);
 				if let Some(c) = self.frames_mut().skip(1).find(|f| f.account_id == *account_id) {
 					c.contract_info = CachedContract::Invalidated;
 				}
@@ -897,10 +734,7 @@ where
 				return
 			}
 			if let CachedContract::Cached(contract) = &self.first_frame.contract_info {
-				<ContractInfoOf<T>>::insert(
-					&self.first_frame.account_id,
-					ContractInfo::Alive(contract.clone()),
-				);
+				<ContractInfoOf<T>>::insert(&self.first_frame.account_id, contract.clone());
 			}
 			if let Some(counter) = self.account_counter {
 				<AccountCounter<T>>::set(counter);
@@ -1111,38 +945,6 @@ where
 		Ok(())
 	}
 
-	fn restore_to(
-		&mut self,
-		dest: AccountIdOf<Self::T>,
-		code_hash: CodeHash<Self::T>,
-		rent_allowance: BalanceOf<Self::T>,
-		delta: Vec<StorageKey>,
-	) -> Result<(), DispatchError> {
-		if self.is_recursive() {
-			return Err(Error::<T>::TerminatedWhileReentrant.into())
-		}
-		let frame = self.top_frame_mut();
-		let origin_contract = frame.contract_info().clone();
-		let account_id = frame.account_id.clone();
-		let result = Rent::<T, E>::restore_to(
-			&account_id,
-			origin_contract,
-			dest.clone(),
-			code_hash.clone(),
-			rent_allowance,
-			delta,
-			&mut frame.nested_meter,
-		);
-		if let Ok(_) = result {
-			deposit_event::<Self::T>(
-				vec![],
-				Event::Restored(account_id, dest, code_hash, rent_allowance),
-			);
-			frame.terminate();
-		}
-		result
-	}
-
 	fn transfer(&mut self, to: &T::AccountId, value: BalanceOf<T>) -> DispatchResult {
 		Self::transfer(true, false, &self.top_frame().account_id, to, value)
 	}
@@ -1152,9 +954,8 @@ where
 	}
 
 	fn set_storage(&mut self, key: StorageKey, value: Option<Vec<u8>>) -> DispatchResult {
-		let block_number = self.block_number;
 		let frame = self.top_frame_mut();
-		Storage::<T>::write(block_number, frame.contract_info(), &key, value)
+		Storage::<T>::write(frame.contract_info(), &key, value)
 	}
 
 	fn address(&self) -> &T::AccountId {
@@ -1185,8 +986,8 @@ where
 		T::Currency::minimum_balance()
 	}
 
-	fn tombstone_deposit(&self) -> BalanceOf<T> {
-		T::TombstoneDeposit::get()
+	fn contract_deposit(&self) -> BalanceOf<T> {
+		T::ContractDeposit::get()
 	}
 
 	fn deposit_event(&mut self, topics: Vec<T::Hash>, data: Vec<u8>) {
@@ -1196,14 +997,6 @@ where
 		);
 	}
 
-	fn set_rent_allowance(&mut self, rent_allowance: BalanceOf<T>) {
-		self.top_frame_mut().contract_info().rent_allowance = rent_allowance;
-	}
-
-	fn rent_allowance(&mut self) -> BalanceOf<T> {
-		self.top_frame_mut().contract_info().rent_allowance
-	}
-
 	fn block_number(&self) -> T::BlockNumber {
 		self.block_number
 	}
@@ -1220,24 +1013,6 @@ where
 		&self.schedule
 	}
 
-	fn rent_params(&self) -> &RentParams<Self::T> {
-		&self.top_frame().rent_params
-	}
-
-	fn rent_status(&mut self, at_refcount: u32) -> RentStatus<Self::T> {
-		let frame = self.top_frame_mut();
-		let balance = T::Currency::free_balance(&frame.account_id);
-		let code_size = frame.rent_params.code_size;
-		let refcount = frame.rent_params.code_refcount;
-		<Rent<T, E>>::rent_status(
-			&balance,
-			&frame.contract_info(),
-			code_size,
-			refcount,
-			at_refcount,
-		)
-	}
-
 	fn gas_meter(&mut self) -> &mut GasMeter<Self::T> {
 		&mut self.top_frame_mut().nested_meter
 	}
@@ -1304,7 +1079,7 @@ mod tests {
 	use frame_support::{assert_err, assert_ok};
 	use frame_system::{EventRecord, Phase};
 	use pallet_contracts_primitives::ReturnFlags;
-	use pretty_assertions::{assert_eq, assert_ne};
+	use pretty_assertions::assert_eq;
 	use sp_core::Bytes;
 	use sp_runtime::{
 		traits::{BadOrigin, Hash},
@@ -1400,12 +1175,6 @@ mod tests {
 				}
 			});
 		}
-
-		fn refcount(code_hash: &CodeHash<Test>) -> u32 {
-			LOADER.with(|loader| {
-				loader.borrow().map.get(code_hash).expect("code_hash does not exist").refcount()
-			})
-		}
 	}
 
 	impl Executable<Test> for MockExecutable {
@@ -1428,10 +1197,6 @@ mod tests {
 			})
 		}
 
-		fn drop_from_storage(self) {
-			MockLoader::decrement_refcount(self.code_hash);
-		}
-
 		fn add_user(
 			code_hash: CodeHash<Test>,
 			_: &mut GasMeter<Test>,
@@ -1546,7 +1311,7 @@ mod tests {
 
 		ExtBuilder::default().build().execute_with(|| {
 			let schedule = <Test as Config>::Schedule::get();
-			place_contract(&BOB, return_ch);
+			place_contract(&dest, return_ch);
 			set_balance(&origin, 100);
 			let balance = get_balance(&dest);
 
@@ -1563,9 +1328,7 @@ mod tests {
 
 			assert!(!output.is_success());
 			assert_eq!(get_balance(&origin), 100);
-
-			// the rent is still charged
-			assert!(get_balance(&dest) < balance);
+			assert_eq!(get_balance(&dest), balance);
 		});
 	}
 
@@ -2066,147 +1829,12 @@ mod tests {
 		});
 	}
 
-	#[test]
-	fn rent_allowance() {
-		let rent_allowance_ch = MockLoader::insert(Constructor, |ctx, _| {
-			let subsistence = Contracts::<Test>::subsistence_threshold();
-			let allowance = subsistence * 3;
-			assert_eq!(ctx.ext.rent_allowance(), <BalanceOf<Test>>::max_value());
-			ctx.ext.set_rent_allowance(allowance);
-			assert_eq!(ctx.ext.rent_allowance(), allowance);
-			exec_success()
-		});
-
-		ExtBuilder::default().build().execute_with(|| {
-			let subsistence = Contracts::<Test>::subsistence_threshold();
-			let schedule = <Test as Config>::Schedule::get();
-			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
-			let executable =
-				MockExecutable::from_storage(rent_allowance_ch, &schedule, &mut gas_meter).unwrap();
-			set_balance(&ALICE, subsistence * 10);
-
-			let result = MockStack::run_instantiate(
-				ALICE,
-				executable,
-				&mut gas_meter,
-				&schedule,
-				subsistence * 5,
-				vec![],
-				&[],
-				None,
-			);
-			assert_matches!(result, Ok(_));
-		});
-	}
-
-	#[test]
-	fn rent_params_works() {
-		let code_hash = MockLoader::insert(Call, |ctx, executable| {
-			let address = ctx.ext.address();
-			let contract =
-				<ContractInfoOf<Test>>::get(address).and_then(|c| c.get_alive()).unwrap();
-			assert_eq!(ctx.ext.rent_params(), &RentParams::new(address, &0, &contract, executable));
-			exec_success()
-		});
-
-		ExtBuilder::default().build().execute_with(|| {
-			let subsistence = Contracts::<Test>::subsistence_threshold();
-			let schedule = <Test as Config>::Schedule::get();
-			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
-			set_balance(&ALICE, subsistence * 10);
-			place_contract(&BOB, code_hash);
-			MockStack::run_call(ALICE, BOB, &mut gas_meter, &schedule, 0, vec![], None).unwrap();
-		});
-	}
-
-	#[test]
-	fn rent_params_snapshotted() {
-		let code_hash = MockLoader::insert(Call, |ctx, executable| {
-			let subsistence = Contracts::<Test>::subsistence_threshold();
-			let address = ctx.ext.address();
-			let contract =
-				<ContractInfoOf<Test>>::get(address).and_then(|c| c.get_alive()).unwrap();
-			let rent_params = RentParams::new(address, &0, &contract, executable);
-
-			// Changing the allowance during the call: rent params stay unchanged.
-			let allowance = 42;
-			assert_ne!(allowance, rent_params.rent_allowance);
-			ctx.ext.set_rent_allowance(allowance);
-			assert_eq!(ctx.ext.rent_params(), &rent_params);
-
-			// Creating another instance from the same code_hash increases the refcount.
-			// This is also not reflected in the rent params.
-			assert_eq!(MockLoader::refcount(&executable.code_hash), 1);
-			ctx.ext
-				.instantiate(0, executable.code_hash, subsistence * 25, vec![], &[])
-				.unwrap();
-			assert_eq!(MockLoader::refcount(&executable.code_hash), 2);
-			assert_eq!(ctx.ext.rent_params(), &rent_params);
-
-			exec_success()
-		});
-
-		ExtBuilder::default().build().execute_with(|| {
-			let subsistence = Contracts::<Test>::subsistence_threshold();
-			let schedule = <Test as Config>::Schedule::get();
-			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
-			set_balance(&ALICE, subsistence * 100);
-			place_contract(&BOB, code_hash);
-			MockStack::run_call(
-				ALICE,
-				BOB,
-				&mut gas_meter,
-				&schedule,
-				subsistence * 50,
-				vec![],
-				None,
-			)
-			.unwrap();
-		});
-	}
-
-	#[test]
-	fn rent_status_works() {
-		let code_hash = MockLoader::insert(Call, |ctx, _| {
-			assert_eq!(
-				ctx.ext.rent_status(0),
-				RentStatus {
-					max_deposit: 80000,
-					current_deposit: 80000,
-					custom_refcount_deposit: None,
-					max_rent: 32,
-					current_rent: 32,
-					custom_refcount_rent: None,
-					_reserved: None,
-				}
-			);
-			assert_eq!(
-				ctx.ext.rent_status(1),
-				RentStatus {
-					max_deposit: 80000,
-					current_deposit: 80000,
-					custom_refcount_deposit: Some(80000),
-					max_rent: 32,
-					current_rent: 32,
-					custom_refcount_rent: Some(32),
-					_reserved: None,
-				}
-			);
-			exec_success()
-		});
-
-		ExtBuilder::default().build().execute_with(|| {
-			let subsistence = Contracts::<Test>::subsistence_threshold();
-			let schedule = <Test as Config>::Schedule::get();
-			let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
-			set_balance(&ALICE, subsistence * 10);
-			place_contract(&BOB, code_hash);
-			MockStack::run_call(ALICE, BOB, &mut gas_meter, &schedule, 0, vec![], None).unwrap();
-		});
-	}
-
 	#[test]
 	fn in_memory_changes_not_discarded() {
+		// Remove this assert and fill out the "DO" stubs once fields are added to the
+		// contract info that can be modified during exection.
+		assert!(!CONTRACT_INFO_CAN_CHANGE);
+
 		// Call stack: BOB -> CHARLIE (trap) -> BOB' (success)
 		// This tests verfies some edge case of the contract info cache:
 		// We change some value in our contract info before calling into a contract
@@ -2217,13 +1845,9 @@ mod tests {
 		// are made before calling into CHARLIE are not discarded.
 		let code_bob = MockLoader::insert(Call, |ctx, _| {
 			if ctx.input_data[0] == 0 {
-				let original_allowance = ctx.ext.rent_allowance();
-				let changed_allowance = <BalanceOf<Test>>::max_value() / 2;
-				assert_ne!(original_allowance, changed_allowance);
-				ctx.ext.set_rent_allowance(changed_allowance);
+				// DO: modify medata (ContractInfo) of own contract through ctx.ext functions
 				assert_eq!(ctx.ext.call(0, CHARLIE, 0, vec![], true), exec_trapped());
-				assert_eq!(ctx.ext.rent_allowance(), changed_allowance);
-				assert_ne!(ctx.ext.rent_allowance(), original_allowance);
+				// DO: check that the value is not discarded (query via ctx.ext)
 			}
 			exec_success()
 		});
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index 87db8048b3c3..7b165e51dcfe 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -70,7 +70,6 @@
 //! * [`Pallet::instantiate`] - The same as `instantiate_with_code` but instead of uploading new
 //! code an existing `code_hash` is supplied.
 //! * [`Pallet::call`] - Makes a call to an account, optionally transferring some balance.
-//! * [`Pallet::claim_surcharge`] - Evict a contract that cannot pay rent anymore.
 //!
 //! ## Usage
 //!
@@ -89,7 +88,6 @@ mod gas;
 mod benchmarking;
 mod exec;
 mod migration;
-mod rent;
 mod schedule;
 mod storage;
 mod wasm;
@@ -108,38 +106,31 @@ pub use crate::{
 use crate::{
 	exec::{Executable, Stack as ExecStack},
 	gas::GasMeter,
-	rent::Rent,
-	storage::{AliveContractInfo, ContractInfo, DeletedContract, Storage, TombstoneContractInfo},
+	storage::{ContractInfo, DeletedContract, Storage},
 	wasm::PrefabWasmModule,
 	weights::WeightInfo,
 };
 use frame_support::{
 	dispatch::Dispatchable,
-	traits::{Contains, Currency, Get, OnUnbalanced, Randomness, StorageVersion, Time},
-	weights::{GetDispatchInfo, PostDispatchInfo, Weight, WithPostDispatchInfo},
+	traits::{Contains, Currency, Get, Randomness, StorageVersion, Time},
+	weights::{GetDispatchInfo, PostDispatchInfo, Weight},
 };
 use frame_system::Pallet as System;
 use pallet_contracts_primitives::{
 	Code, ContractAccessError, ContractExecResult, ContractInstantiateResult, GetStorageResult,
-	InstantiateReturnValue, RentProjectionResult,
+	InstantiateReturnValue,
 };
 use sp_core::{crypto::UncheckedFrom, Bytes};
-use sp_runtime::{
-	traits::{Convert, Hash, Saturating, StaticLookup, Zero},
-	Perbill,
-};
+use sp_runtime::traits::{Convert, Hash, Saturating, StaticLookup};
 use sp_std::prelude::*;
 
 type CodeHash<T> = <T as frame_system::Config>::Hash;
 type TrieId = Vec<u8>;
 type BalanceOf<T> =
 	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
-type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<
-	<T as frame_system::Config>::AccountId,
->>::NegativeImbalance;
 
 /// The current storage version.
-const STORAGE_VERSION: StorageVersion = StorageVersion::new(4);
+const STORAGE_VERSION: StorageVersion = StorageVersion::new(5);
 
 #[frame_support::pallet]
 pub mod pallet {
@@ -177,8 +168,7 @@ pub mod pallet {
 		///
 		/// The runtime **must** make sure that any allowed dispatchable makes sure that the
 		/// `total_balance` of the contract stays above [`Pallet::subsistence_threshold()`].
-		/// Otherwise contracts can clutter the storage with their tombstones without
-		/// deposting the correct amount of balance.
+		/// Otherwise users could clutter the storage with contracts.
 		///
 		/// # Stability
 		///
@@ -195,9 +185,6 @@ pub mod pallet {
 		/// be exploited to drive the runtime into a panic.
 		type CallFilter: Contains<<Self as frame_system::Config>::Call>;
 
-		/// Handler for rent payments.
-		type RentPayment: OnUnbalanced<NegativeImbalanceOf<Self>>;
-
 		/// Used to answer contracts' queries regarding the current weight price. This is **not**
 		/// used to calculate the actual fee and is only for informational purposes.
 		type WeightPrice: Convert<Weight, BalanceOf<Self>>;
@@ -213,56 +200,12 @@ pub mod pallet {
 		#[pallet::constant]
 		type Schedule: Get<Schedule<Self>>;
 
-		/// Number of block delay an extrinsic claim surcharge has.
-		///
-		/// When claim surcharge is called by an extrinsic the rent is checked
-		/// for current_block - delay
-		#[pallet::constant]
-		type SignedClaimHandicap: Get<Self::BlockNumber>;
-
-		/// The minimum amount required to generate a tombstone.
+		/// The deposit that must be placed into the contract's account to instantiate it.
+		/// This is in **addition** to the [`pallet_balances::Pallet::ExistenialDeposit`].
+		/// The minimum balance for a contract's account can be queried using
+		/// [`Pallet::subsistence_threshold`].
 		#[pallet::constant]
-		type TombstoneDeposit: Get<BalanceOf<Self>>;
-
-		/// The balance every contract needs to deposit to stay alive indefinitely.
-		///
-		/// This is different from the [`Self::TombstoneDeposit`] because this only needs to be
-		/// deposited while the contract is alive. Costs for additional storage are added to
-		/// this base cost.
-		///
-		/// This is a simple way to ensure that contracts with empty storage eventually get deleted
-		/// by making them pay rent. This creates an incentive to remove them early in order to save
-		/// rent.
-		#[pallet::constant]
-		type DepositPerContract: Get<BalanceOf<Self>>;
-
-		/// The balance a contract needs to deposit per storage byte to stay alive indefinitely.
-		///
-		/// Let's suppose the deposit is 1,000 BU (balance units)/byte and the rent is 1
-		/// BU/byte/day, then a contract with 1,000,000 BU that uses 1,000 bytes of storage would
-		/// pay no rent. But if the balance reduced to 500,000 BU and the storage stayed the same at
-		/// 1,000, then it would pay 500 BU/day.
-		#[pallet::constant]
-		type DepositPerStorageByte: Get<BalanceOf<Self>>;
-
-		/// The balance a contract needs to deposit per storage item to stay alive indefinitely.
-		///
-		/// It works the same as [`Self::DepositPerStorageByte`] but for storage items.
-		#[pallet::constant]
-		type DepositPerStorageItem: Get<BalanceOf<Self>>;
-
-		/// The fraction of the deposit that should be used as rent per block.
-		///
-		/// When a contract hasn't enough balance deposited to stay alive indefinitely it needs
-		/// to pay per block for the storage it consumes that is not covered by the deposit.
-		/// This determines how high this rent payment is per block as a fraction of the deposit.
-		#[pallet::constant]
-		type RentFraction: Get<Perbill>;
-
-		/// Reward that is received by the party whose touch has led
-		/// to removal of a contract.
-		#[pallet::constant]
-		type SurchargeReward: Get<BalanceOf<Self>>;
+		type ContractDeposit: Get<BalanceOf<Self>>;
 
 		/// The type of the call stack determines the maximum nesting depth of contract calls.
 		///
@@ -439,50 +382,6 @@ pub mod pallet {
 			gas_meter
 				.into_dispatch_result(result, T::WeightInfo::instantiate(salt.len() as u32 / 1024))
 		}
-
-		/// Allows block producers to claim a small reward for evicting a contract. If a block
-		/// producer fails to do so, a regular users will be allowed to claim the reward.
-		///
-		/// In case of a successful eviction no fees are charged from the sender. However, the
-		/// reward is capped by the total amount of rent that was paid by the contract while
-		/// it was alive.
-		///
-		/// If contract is not evicted as a result of this call, [`Error::ContractNotEvictable`]
-		/// is returned and the sender is not eligible for the reward.
-		#[pallet::weight(T::WeightInfo::claim_surcharge(T::Schedule::get().limits.code_len / 1024))]
-		pub fn claim_surcharge(
-			origin: OriginFor<T>,
-			dest: T::AccountId,
-			aux_sender: Option<T::AccountId>,
-		) -> DispatchResultWithPostInfo {
-			let origin = origin.into();
-			let (signed, rewarded) = match (origin, aux_sender) {
-				(Ok(frame_system::RawOrigin::Signed(account)), None) => (true, account),
-				(Ok(frame_system::RawOrigin::None), Some(aux_sender)) => (false, aux_sender),
-				_ => Err(Error::<T>::InvalidSurchargeClaim)?,
-			};
-
-			// Add some advantage for block producers (who send unsigned extrinsics) by
-			// adding a handicap: for signed extrinsics we use a slightly older block number
-			// for the eviction check. This can be viewed as if we pushed regular users back in
-			// past.
-			let handicap = if signed { T::SignedClaimHandicap::get() } else { Zero::zero() };
-
-			// If poking the contract has lead to eviction of the contract, give out the rewards.
-			match Rent::<T, PrefabWasmModule<T>>::try_eviction(&dest, handicap)? {
-				(Some(rent_paid), code_len) => T::Currency::deposit_into_existing(
-					&rewarded,
-					T::SurchargeReward::get().min(rent_paid),
-				)
-				.map(|_| PostDispatchInfo {
-					actual_weight: Some(T::WeightInfo::claim_surcharge(code_len / 1024)),
-					pays_fee: Pays::No,
-				})
-				.map_err(Into::into),
-				(None, code_len) => Err(Error::<T>::ContractNotEvictable
-					.with_weight(T::WeightInfo::claim_surcharge(code_len / 1024))),
-			}
-		}
 	}
 
 	#[pallet::event]
@@ -492,10 +391,7 @@ pub mod pallet {
 		/// Contract deployed by address at the specified address. \[deployer, contract\]
 		Instantiated(T::AccountId, T::AccountId),
 
-		/// Contract has been evicted and is now in tombstone state. \[contract\]
-		Evicted(T::AccountId),
-
-		/// Contract has been terminated without leaving a tombstone.
+		/// Contract has been removed.
 		/// \[contract, beneficiary\]
 		///
 		/// # Params
@@ -505,21 +401,10 @@ pub mod pallet {
 		///
 		/// # Note
 		///
-		/// The only way for a contract to be removed without a tombstone and emitting
-		/// this event is by calling `seal_terminate`.
+		/// The only way for a contract to be removed and emitting this event is by calling
+		/// `seal_terminate`.
 		Terminated(T::AccountId, T::AccountId),
 
-		/// Restoration of a contract has been successful.
-		/// \[restorer, dest, code_hash, rent_allowance\]
-		///
-		/// # Params
-		///
-		/// - `restorer`: Account ID of the restoring contract.
-		/// - `dest`: Account ID of the restored contract.
-		/// - `code_hash`: Code hash of the restored contract.
-		/// - `rent_allowance`: Rent allowance of the restored contract.
-		Restored(T::AccountId, T::AccountId, T::Hash, BalanceOf<T>),
-
 		/// Code with the specified hash has been stored. \[code_hash\]
 		CodeStored(T::Hash),
 
@@ -544,7 +429,7 @@ pub mod pallet {
 		/// A code with the specified hash was removed.
 		/// \[code_hash\]
 		///
-		/// This happens when the last contract that uses this code hash was removed or evicted.
+		/// This happens when the last contract that uses this code hash was removed.
 		CodeRemoved(T::Hash),
 	}
 
@@ -552,24 +437,13 @@ pub mod pallet {
 	pub enum Error<T> {
 		/// A new schedule must have a greater version than the current one.
 		InvalidScheduleVersion,
-		/// An origin must be signed or inherent and auxiliary sender only provided on inherent.
-		InvalidSurchargeClaim,
-		/// Cannot restore from nonexisting or tombstone contract.
-		InvalidSourceContract,
-		/// Cannot restore to nonexisting or alive contract.
-		InvalidDestinationContract,
-		/// Tombstones don't match.
-		InvalidTombstone,
-		/// An origin TrieId written in the current block.
-		InvalidContractOrigin,
 		/// The executed contract exhausted its gas limit.
 		OutOfGas,
 		/// The output buffer supplied to a contract API call was too small.
 		OutputBufferTooSmall,
 		/// Performing the requested transfer would have brought the contract below
-		/// the subsistence threshold. No transfer is allowed to do this in order to allow
-		/// for a tombstone to be created. Use `seal_terminate` to remove a contract without
-		/// leaving a tombstone behind.
+		/// the subsistence threshold. No transfer is allowed to do this. Use `seal_terminate`
+		/// to recover a deposit.
 		BelowSubsistenceThreshold,
 		/// The newly created contract is below the subsistence threshold after executing
 		/// its contructor. No contracts are allowed to exist below that threshold.
@@ -583,18 +457,6 @@ pub mod pallet {
 		MaxCallDepthReached,
 		/// No contract was found at the specified address.
 		ContractNotFound,
-		/// A tombstone exist at the specified address.
-		///
-		/// Tombstone cannot be called. Anyone can use `seal_restore_to` in order to revive
-		/// the contract, though.
-		ContractIsTombstone,
-		/// The called contract does not have enough balance to pay for its storage.
-		///
-		/// The contract ran out of balance and is therefore eligible for eviction into a
-		/// tombstone. Anyone can evict the contract by submitting a `claim_surcharge`
-		/// extrinsic. Alternatively, a plain balance transfer can be used in order to
-		/// increase the contracts funds so that it can be called again.
-		RentNotPaid,
 		/// The code supplied to `instantiate_with_code` exceeds the limit specified in the
 		/// current schedule.
 		CodeTooLarge,
@@ -609,7 +471,7 @@ pub mod pallet {
 		/// The size defined in `T::MaxValueSize` was exceeded.
 		ValueTooLarge,
 		/// Termination of a contract is not allowed while the contract is already
-		/// on the call stack. Can be triggered by `seal_terminate` or `seal_restore_to.
+		/// on the call stack. Can be triggered by `seal_terminate`.
 		TerminatedWhileReentrant,
 		/// `seal_call` forwarded this contracts input. It therefore is no longer available.
 		InputForwarded,
@@ -625,15 +487,10 @@ pub mod pallet {
 		NoChainExtension,
 		/// Removal of a contract failed because the deletion queue is full.
 		///
-		/// This can happen when either calling [`Pallet::claim_surcharge`] or `seal_terminate`.
+		/// This can happen when calling `seal_terminate`.
 		/// The queue is filled by deleting contracts and emptied by a fixed amount each block.
 		/// Trying again during another block is the only way to resolve this issue.
 		DeletionQueueFull,
-		/// A contract could not be evicted because it has enough balance to pay rent.
-		///
-		/// This can be returned from [`Pallet::claim_surcharge`] because the target
-		/// contract has enough balance to pay for its rent.
-		ContractNotEvictable,
 		/// A storage modification exhausted the 32bit type that holds the storage size.
 		///
 		/// This can either happen when the accumulated storage in bytes is too large or
@@ -643,7 +500,7 @@ pub mod pallet {
 		DuplicateContract,
 		/// A contract self destructed in its constructor.
 		///
-		/// This can be triggered by a call to `seal_terminate` or `seal_restore_to`.
+		/// This can be triggered by a call to `seal_terminate`.
 		TerminatedInConstructor,
 		/// The debug message specified to `seal_debug_message` does contain invalid UTF-8.
 		DebugMessageInvalidUTF8,
@@ -730,9 +587,6 @@ where
 	///
 	/// It returns the execution result, account id and the amount of used weight.
 	///
-	/// If `compute_projection` is set to `true` the result also contains the rent projection.
-	/// This is optional because some non trivial and stateful work is performed to compute
-	/// the projection. See [`Self::rent_projection`].
 	///
 	/// # Note
 	///
@@ -746,9 +600,8 @@ where
 		code: Code<CodeHash<T>>,
 		data: Vec<u8>,
 		salt: Vec<u8>,
-		compute_projection: bool,
 		debug: bool,
-	) -> ContractInstantiateResult<T::AccountId, T::BlockNumber> {
+	) -> ContractInstantiateResult<T::AccountId> {
 		let mut gas_meter = GasMeter::new(gas_limit);
 		let schedule = T::Schedule::get();
 		let executable = match code {
@@ -776,18 +629,7 @@ where
 			&salt,
 			debug_message.as_mut(),
 		)
-		.and_then(|(account_id, result)| {
-			let rent_projection = if compute_projection {
-				Some(
-					Rent::<T, PrefabWasmModule<T>>::compute_projection(&account_id)
-						.map_err(|_| <Error<T>>::NewContractNotFunded)?,
-				)
-			} else {
-				None
-			};
-
-			Ok(InstantiateReturnValue { result, account_id, rent_projection })
-		});
+		.and_then(|(account_id, result)| Ok(InstantiateReturnValue { result, account_id }));
 		ContractInstantiateResult {
 			result: result.map_err(|e| e.error),
 			gas_consumed: gas_meter.gas_consumed(),
@@ -798,21 +640,13 @@ where
 
 	/// Query storage of a specified contract under a specified key.
 	pub fn get_storage(address: T::AccountId, key: [u8; 32]) -> GetStorageResult {
-		let contract_info = ContractInfoOf::<T>::get(&address)
-			.ok_or(ContractAccessError::DoesntExist)?
-			.get_alive()
-			.ok_or(ContractAccessError::IsTombstone)?;
+		let contract_info =
+			ContractInfoOf::<T>::get(&address).ok_or(ContractAccessError::DoesntExist)?;
 
 		let maybe_value = Storage::<T>::read(&contract_info.trie_id, &key);
 		Ok(maybe_value)
 	}
 
-	/// Query how many blocks the contract stays alive given that the amount endowment
-	/// and consumed storage does not change.
-	pub fn rent_projection(address: T::AccountId) -> RentProjectionResult<T::BlockNumber> {
-		Rent::<T, PrefabWasmModule<T>>::compute_projection(&address)
-	}
-
 	/// Determine the address of a contract,
 	///
 	/// This is the address generation function used by contract instantiation. Its result
@@ -837,14 +671,13 @@ where
 	}
 
 	/// Subsistence threshold is the extension of the minimum balance (aka existential deposit)
-	/// by the tombstone deposit, required for leaving a tombstone.
-	///
-	/// Rent or any contract initiated balance transfer mechanism cannot make the balance lower
-	/// than the subsistence threshold in order to guarantee that a tombstone is created.
+	/// by the contract deposit. It is the minimum balance any contract must hold.
 	///
-	/// The only way to completely kill a contract without a tombstone is calling `seal_terminate`.
+	/// Any contract initiated balance transfer mechanism cannot make the balance lower
+	/// than the subsistence threshold. The only way to recover the balance is to remove
+	/// contract using `seal_terminate`.
 	pub fn subsistence_threshold() -> BalanceOf<T> {
-		T::Currency::minimum_balance().saturating_add(T::TombstoneDeposit::get())
+		T::Currency::minimum_balance().saturating_add(T::ContractDeposit::get())
 	}
 
 	/// The in-memory size in bytes of the data structure associated with each contract.
diff --git a/frame/contracts/src/migration.rs b/frame/contracts/src/migration.rs
index fbf5b59e9e8a..b7fa9575e23b 100644
--- a/frame/contracts/src/migration.rs
+++ b/frame/contracts/src/migration.rs
@@ -18,18 +18,104 @@
 use crate::{Config, Pallet, Weight};
 use frame_support::{
 	storage::migration,
-	traits::{Get, PalletInfoAccess, StorageVersion},
+	traits::{Get, PalletInfoAccess},
 };
+use sp_std::prelude::*;
 
 pub fn migrate<T: Config>() -> Weight {
-	let mut weight: Weight = 0;
+	use frame_support::traits::StorageVersion;
 
-	if StorageVersion::get::<Pallet<T>>() == 3 {
-		weight = weight.saturating_add(T::DbWeight::get().writes(1));
-		migration::remove_storage_prefix(<Pallet<T>>::name().as_bytes(), b"CurrentSchedule", b"");
+	let version = StorageVersion::get::<Pallet<T>>();
+	let mut weight: Weight = 0;
 
+	if version < 4 {
+		weight = weight.saturating_add(v4::migrate::<T>());
 		StorageVersion::new(4).put::<Pallet<T>>();
 	}
 
+	if version < 5 {
+		weight = weight.saturating_add(v5::migrate::<T>());
+		StorageVersion::new(5).put::<Pallet<T>>();
+	}
+
 	weight
 }
+
+/// V4: `Schedule` is changed to be a config item rather than an in-storage value.
+mod v4 {
+	use super::*;
+
+	pub fn migrate<T: Config>() -> Weight {
+		migration::remove_storage_prefix(<Pallet<T>>::name().as_bytes(), b"CurrentSchedule", b"");
+		T::DbWeight::get().writes(1)
+	}
+}
+
+/// V5: State rent is removed which obsoletes some fields in `ContractInfo`.
+mod v5 {
+	use super::*;
+	use crate::{
+		BalanceOf, CodeHash, ContractInfo, ContractInfoOf, DeletedContract, DeletionQueue, TrieId,
+	};
+	use codec::Decode;
+	use sp_std::marker::PhantomData;
+
+	type AliveContractInfo<T> =
+		RawAliveContractInfo<CodeHash<T>, BalanceOf<T>, <T as frame_system::Config>::BlockNumber>;
+	type TombstoneContractInfo<T> = RawTombstoneContractInfo<
+		<T as frame_system::Config>::Hash,
+		<T as frame_system::Config>::Hashing,
+	>;
+
+	#[derive(Decode)]
+	enum OldContractInfo<T: Config> {
+		Alive(AliveContractInfo<T>),
+		Tombstone(TombstoneContractInfo<T>),
+	}
+
+	#[derive(Decode)]
+	struct RawAliveContractInfo<CodeHash, Balance, BlockNumber> {
+		trie_id: TrieId,
+		_storage_size: u32,
+		_pair_count: u32,
+		code_hash: CodeHash,
+		_rent_allowance: Balance,
+		_rent_paid: Balance,
+		_deduct_block: BlockNumber,
+		_last_write: Option<BlockNumber>,
+		_reserved: Option<()>,
+	}
+
+	#[derive(Decode)]
+	struct RawTombstoneContractInfo<H, Hasher>(H, PhantomData<Hasher>);
+
+	#[derive(Decode)]
+	struct OldDeletedContract {
+		_pair_count: u32,
+		trie_id: TrieId,
+	}
+
+	pub fn migrate<T: Config>() -> Weight {
+		let mut weight: Weight = 0;
+
+		<ContractInfoOf<T>>::translate(|_key, old: OldContractInfo<T>| {
+			weight = weight.saturating_add(T::DbWeight::get().reads_writes(1, 1));
+			match old {
+				OldContractInfo::Alive(old) => Some(ContractInfo::<T> {
+					trie_id: old.trie_id,
+					code_hash: old.code_hash,
+					_reserved: old._reserved,
+				}),
+				OldContractInfo::Tombstone(_) => None,
+			}
+		});
+
+		<DeletionQueue<T>>::translate(|old: Option<Vec<OldDeletedContract>>| {
+			weight = weight.saturating_add(T::DbWeight::get().reads_writes(1, 1));
+			old.map(|old| old.into_iter().map(|o| DeletedContract { trie_id: o.trie_id }).collect())
+		})
+		.ok();
+
+		weight
+	}
+}
diff --git a/frame/contracts/src/rent.rs b/frame/contracts/src/rent.rs
deleted file mode 100644
index 336f03153c01..000000000000
--- a/frame/contracts/src/rent.rs
+++ /dev/null
@@ -1,577 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! A module responsible for computing the right amount of weight and charging it.
-
-use crate::{
-	exec::Executable, gas::GasMeter, storage::Storage, wasm::PrefabWasmModule, AliveContractInfo,
-	BalanceOf, CodeHash, Config, ContractInfo, ContractInfoOf, Error, Event, Pallet,
-	TombstoneContractInfo,
-};
-use frame_support::{
-	storage::child,
-	traits::{Currency, ExistenceRequirement, Get, OnUnbalanced, WithdrawReasons},
-	DefaultNoBound,
-};
-use pallet_contracts_primitives::{ContractAccessError, RentProjection, RentProjectionResult};
-use sp_core::crypto::UncheckedFrom;
-use sp_io::hashing::blake2_256;
-use sp_runtime::{
-	traits::{Bounded, CheckedDiv, CheckedMul, SaturatedConversion, Saturating, Zero},
-	DispatchError,
-};
-use sp_std::prelude::*;
-
-/// Information about the required deposit and resulting rent.
-///
-/// The easiest way to guarantee that a contract stays alive is to assert that
-/// `max_rent == 0` at the **end** of a contract's execution.
-///
-/// # Note
-///
-/// The `current_*` fields do **not** consider changes to the code's refcount made during
-/// the currently running call.
-#[derive(codec::Encode, DefaultNoBound)]
-#[cfg_attr(test, derive(Debug, PartialEq))]
-pub struct RentStatus<T: Config> {
-	/// Required deposit assuming that this contract is the only user of its code.
-	pub max_deposit: BalanceOf<T>,
-	/// Required deposit assuming the code's current refcount.
-	pub current_deposit: BalanceOf<T>,
-	/// Required deposit assuming the specified refcount (None if 0 is supplied).
-	pub custom_refcount_deposit: Option<BalanceOf<T>>,
-	/// Rent that is paid assuming that the contract is the only user of its code.
-	pub max_rent: BalanceOf<T>,
-	/// Rent that is paid given the code's current refcount.
-	pub current_rent: BalanceOf<T>,
-	/// Rent that is paid assuming the specified refcount (None is 0 is supplied).
-	pub custom_refcount_rent: Option<BalanceOf<T>>,
-	/// Reserved for backwards compatible changes to this data structure.
-	pub _reserved: Option<()>,
-}
-
-pub struct Rent<T, E>(sp_std::marker::PhantomData<(T, E)>);
-
-impl<T, E> Rent<T, E>
-where
-	T: Config,
-	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
-	E: Executable<T>,
-{
-	/// Make account paying the rent for the current block number
-	///
-	/// This functions does **not** evict the contract. It returns `None` in case the
-	/// contract is in need of eviction. [`try_eviction`] must
-	/// be called to perform the eviction.
-	pub fn charge(
-		account: &T::AccountId,
-		contract: AliveContractInfo<T>,
-		code_size: u32,
-	) -> Result<Option<AliveContractInfo<T>>, DispatchError> {
-		let current_block_number = <frame_system::Pallet<T>>::block_number();
-		let verdict =
-			Self::consider_case(account, current_block_number, Zero::zero(), &contract, code_size);
-		Self::enact_verdict(account, contract, current_block_number, verdict, None)
-	}
-
-	/// Process a report that a contract under the given address should be evicted.
-	///
-	/// Enact the eviction right away if the contract should be evicted and return the amount
-	/// of rent that the contract paid over its lifetime.
-	/// Otherwise, **do nothing** and return None.
-	///
-	/// The `handicap` parameter gives a way to check the rent to a moment in the past instead
-	/// of current block. E.g. if the contract is going to be evicted at the current block,
-	/// `handicap = 1` can defer the eviction for 1 block. This is useful to handicap certain
-	/// snitchers relative to others.
-	///
-	/// NOTE this function performs eviction eagerly. All changes are read and written directly to
-	/// storage.
-	pub fn try_eviction(
-		account: &T::AccountId,
-		handicap: T::BlockNumber,
-	) -> Result<(Option<BalanceOf<T>>, u32), DispatchError> {
-		let contract = <ContractInfoOf<T>>::get(account);
-		let contract = match contract {
-			None | Some(ContractInfo::Tombstone(_)) => return Ok((None, 0)),
-			Some(ContractInfo::Alive(contract)) => contract,
-		};
-		let module = PrefabWasmModule::<T>::from_storage_noinstr(contract.code_hash)?;
-		let code_len = module.code_len();
-		let current_block_number = <frame_system::Pallet<T>>::block_number();
-		let verdict = Self::consider_case(
-			account,
-			current_block_number,
-			handicap,
-			&contract,
-			module.occupied_storage(),
-		);
-
-		// Enact the verdict only if the contract gets removed.
-		match verdict {
-			Verdict::Evict { ref amount } => {
-				// The outstanding `amount` is withdrawn inside `enact_verdict`.
-				let rent_paid = amount
-					.as_ref()
-					.map(|a| a.peek())
-					.unwrap_or_else(|| <BalanceOf<T>>::zero())
-					.saturating_add(contract.rent_paid);
-				Self::enact_verdict(
-					account,
-					contract,
-					current_block_number,
-					verdict,
-					Some(module),
-				)?;
-				Ok((Some(rent_paid), code_len))
-			},
-			_ => Ok((None, code_len)),
-		}
-	}
-
-	/// Returns the projected time a given contract will be able to sustain paying its rent. The
-	/// returned projection is relevant for the current block, i.e. it is as if the contract was
-	/// accessed at the beginning of the current block. Returns `None` in case if the contract was
-	/// evicted before or as a result of the rent collection.
-	///
-	/// The returned value is only an estimation. It doesn't take into account any top ups, changing
-	/// the rent allowance, or any problems coming from withdrawing the dues.
-	///
-	/// NOTE that this is not a side-effect free function! It will actually collect rent and then
-	/// compute the projection. This function is only used for implementation of an RPC method
-	/// through `RuntimeApi` meaning that the changes will be discarded anyway.
-	pub fn compute_projection(account: &T::AccountId) -> RentProjectionResult<T::BlockNumber> {
-		use ContractAccessError::IsTombstone;
-
-		let contract_info = <ContractInfoOf<T>>::get(account);
-		let alive_contract_info = match contract_info {
-			None | Some(ContractInfo::Tombstone(_)) => return Err(IsTombstone),
-			Some(ContractInfo::Alive(contract)) => contract,
-		};
-		let module = <PrefabWasmModule<T>>::from_storage_noinstr(alive_contract_info.code_hash)
-			.map_err(|_| IsTombstone)?;
-		let code_size = module.occupied_storage();
-		let current_block_number = <frame_system::Pallet<T>>::block_number();
-		let verdict = Self::consider_case(
-			account,
-			current_block_number,
-			Zero::zero(),
-			&alive_contract_info,
-			code_size,
-		);
-
-		// We skip the eviction in case one is in order.
-		// Evictions should only be performed by [`try_eviction`].
-		let new_contract_info =
-			Self::enact_verdict(account, alive_contract_info, current_block_number, verdict, None);
-
-		// Check what happened after enaction of the verdict.
-		let alive_contract_info =
-			new_contract_info.map_err(|_| IsTombstone)?.ok_or_else(|| IsTombstone)?;
-
-		// Compute how much would the fee per block be with the *updated* balance.
-		let total_balance = T::Currency::total_balance(account);
-		let free_balance = T::Currency::free_balance(account);
-		let fee_per_block = Self::fee_per_block(&free_balance, &alive_contract_info, code_size);
-		if fee_per_block.is_zero() {
-			return Ok(RentProjection::NoEviction)
-		}
-
-		// Then compute how much the contract will sustain under these circumstances.
-		let rent_budget = Self::rent_budget(&total_balance, &free_balance, &alive_contract_info)
-			.expect(
-				"the contract exists and in the alive state;
-			the updated balance must be greater than subsistence deposit;
-			this function doesn't return `None`;
-			qed
-			",
-			);
-		let blocks_left = match rent_budget.checked_div(&fee_per_block) {
-			Some(blocks_left) => blocks_left,
-			None => {
-				// `fee_per_block` is not zero here, so `checked_div` can return `None` if
-				// there is an overflow. This cannot happen with integers though. Return
-				// `NoEviction` here just in case.
-				return Ok(RentProjection::NoEviction)
-			},
-		};
-
-		let blocks_left = blocks_left.saturated_into::<u32>().into();
-		Ok(RentProjection::EvictionAt(current_block_number + blocks_left))
-	}
-
-	/// Restores the destination account using the origin as prototype.
-	///
-	/// The restoration will be performed iff:
-	/// - the supplied code_hash does still exist on-chain
-	/// - origin exists and is alive,
-	/// - the origin's storage is not written in the current block
-	/// - the restored account has tombstone
-	/// - the tombstone matches the hash of the origin storage root, and code hash.
-	///
-	/// Upon succesful restoration, `origin` will be destroyed, all its funds are transferred to
-	/// the restored account. The restored account will inherit the last write block and its last
-	/// deduct block will be set to the current block.
-	pub fn restore_to(
-		origin: &T::AccountId,
-		mut origin_contract: AliveContractInfo<T>,
-		dest: T::AccountId,
-		code_hash: CodeHash<T>,
-		rent_allowance: BalanceOf<T>,
-		delta: Vec<crate::exec::StorageKey>,
-		gas_meter: &mut GasMeter<T>,
-	) -> Result<(), DispatchError> {
-		let child_trie_info = origin_contract.child_trie_info();
-
-		let current_block = <frame_system::Pallet<T>>::block_number();
-
-		if origin_contract.last_write == Some(current_block) {
-			return Err(Error::<T>::InvalidContractOrigin.into())
-		}
-
-		let dest_tombstone = <ContractInfoOf<T>>::get(&dest)
-			.and_then(|c| c.get_tombstone())
-			.ok_or(Error::<T>::InvalidDestinationContract)?;
-
-		let last_write =
-			if !delta.is_empty() { Some(current_block) } else { origin_contract.last_write };
-
-		// Fails if the code hash does not exist on chain
-		E::add_user(code_hash, gas_meter)?;
-
-		// We are allowed to eagerly modify storage even though the function can
-		// fail later due to tombstones not matching. This is because the restoration
-		// is always called from a contract and therefore in a storage transaction.
-		// The failure of this function will lead to this transaction's rollback.
-		let bytes_taken: u32 = delta
-			.iter()
-			.filter_map(|key| {
-				let key = blake2_256(key);
-				child::get_raw(&child_trie_info, &key).map(|value| {
-					child::kill(&child_trie_info, &key);
-					value.len() as u32
-				})
-			})
-			.sum();
-
-		let tombstone = <TombstoneContractInfo<T>>::new(
-			// This operation is cheap enough because last_write (delta not included)
-			// is not this block as it has been checked earlier.
-			&child::root(&child_trie_info)[..],
-			code_hash,
-		);
-
-		if tombstone != dest_tombstone {
-			return Err(Error::<T>::InvalidTombstone.into())
-		}
-
-		origin_contract.storage_size -= bytes_taken;
-
-		<ContractInfoOf<T>>::remove(&origin);
-		E::remove_user(origin_contract.code_hash, gas_meter)?;
-		<ContractInfoOf<T>>::insert(
-			&dest,
-			ContractInfo::Alive(AliveContractInfo::<T> {
-				code_hash,
-				rent_allowance,
-				rent_paid: <BalanceOf<T>>::zero(),
-				deduct_block: current_block,
-				last_write,
-				..origin_contract
-			}),
-		);
-
-		let origin_free_balance = T::Currency::free_balance(&origin);
-		T::Currency::make_free_balance_be(&origin, <BalanceOf<T>>::zero());
-		T::Currency::deposit_creating(&dest, origin_free_balance);
-		Ok(())
-	}
-
-	/// Create a new `RentStatus` struct for pass through to a requesting contract.
-	pub fn rent_status(
-		free_balance: &BalanceOf<T>,
-		contract: &AliveContractInfo<T>,
-		aggregated_code_size: u32,
-		current_refcount: u32,
-		at_refcount: u32,
-	) -> RentStatus<T> {
-		let calc_share = |refcount: u32| aggregated_code_size.checked_div(refcount).unwrap_or(0);
-		let current_share = calc_share(current_refcount);
-		let custom_share = calc_share(at_refcount);
-		RentStatus {
-			max_deposit: Self::required_deposit(contract, aggregated_code_size),
-			current_deposit: Self::required_deposit(contract, current_share),
-			custom_refcount_deposit: if at_refcount > 0 {
-				Some(Self::required_deposit(contract, custom_share))
-			} else {
-				None
-			},
-			max_rent: Self::fee_per_block(free_balance, contract, aggregated_code_size),
-			current_rent: Self::fee_per_block(free_balance, contract, current_share),
-			custom_refcount_rent: if at_refcount > 0 {
-				Some(Self::fee_per_block(free_balance, contract, custom_share))
-			} else {
-				None
-			},
-			_reserved: None,
-		}
-	}
-
-	/// Returns how much deposit is required to not pay rent.
-	fn required_deposit(contract: &AliveContractInfo<T>, code_size_share: u32) -> BalanceOf<T> {
-		T::DepositPerStorageByte::get()
-			.saturating_mul(contract.storage_size.saturating_add(code_size_share).into())
-			.saturating_add(
-				T::DepositPerStorageItem::get().saturating_mul(contract.pair_count.into()),
-			)
-			.saturating_add(T::DepositPerContract::get())
-	}
-
-	/// Returns a fee charged per block from the contract.
-	///
-	/// This function accounts for the storage rent deposit. I.e. if the contract
-	/// possesses enough funds then the fee can drop to zero.
-	fn fee_per_block(
-		free_balance: &BalanceOf<T>,
-		contract: &AliveContractInfo<T>,
-		code_size_share: u32,
-	) -> BalanceOf<T> {
-		let missing_deposit =
-			Self::required_deposit(contract, code_size_share).saturating_sub(*free_balance);
-		T::RentFraction::get().mul_ceil(missing_deposit)
-	}
-
-	/// Returns amount of funds available to consume by rent mechanism.
-	///
-	/// Rent mechanism cannot consume more than `rent_allowance` set by the contract and it cannot
-	/// make the balance lower than [`subsistence_threshold`].
-	///
-	/// In case the toal_balance is below the subsistence threshold, this function returns `None`.
-	fn rent_budget(
-		total_balance: &BalanceOf<T>,
-		free_balance: &BalanceOf<T>,
-		contract: &AliveContractInfo<T>,
-	) -> Option<BalanceOf<T>> {
-		let subsistence_threshold = Pallet::<T>::subsistence_threshold();
-		// Reserved balance contributes towards the subsistence threshold to stay consistent
-		// with the existential deposit where the reserved balance is also counted.
-		if *total_balance < subsistence_threshold {
-			return None
-		}
-
-		// However, reserved balance cannot be charged so we need to use the free balance
-		// to calculate the actual budget (which can be 0).
-		let rent_allowed_to_charge = free_balance.saturating_sub(subsistence_threshold);
-		Some(<BalanceOf<T>>::min(contract.rent_allowance, rent_allowed_to_charge))
-	}
-
-	/// Consider the case for rent payment of the given account and returns a `Verdict`.
-	///
-	/// Use `handicap` in case you want to change the reference block number. (To get more details
-	/// see `try_eviction` ).
-	fn consider_case(
-		account: &T::AccountId,
-		current_block_number: T::BlockNumber,
-		handicap: T::BlockNumber,
-		contract: &AliveContractInfo<T>,
-		code_size: u32,
-	) -> Verdict<T> {
-		// How much block has passed since the last deduction for the contract.
-		let blocks_passed = {
-			// Calculate an effective block number, i.e. after adjusting for handicap.
-			let effective_block_number = current_block_number.saturating_sub(handicap);
-			effective_block_number.saturating_sub(contract.deduct_block)
-		};
-		if blocks_passed.is_zero() {
-			// Rent has already been paid
-			return Verdict::Exempt
-		}
-
-		let total_balance = T::Currency::total_balance(account);
-		let free_balance = T::Currency::free_balance(account);
-
-		// An amount of funds to charge per block for storage taken up by the contract.
-		let fee_per_block = Self::fee_per_block(&free_balance, contract, code_size);
-		if fee_per_block.is_zero() {
-			// The rent deposit offset reduced the fee to 0. This means that the contract
-			// gets the rent for free.
-			return Verdict::Exempt
-		}
-
-		let rent_budget = match Self::rent_budget(&total_balance, &free_balance, contract) {
-			Some(rent_budget) => rent_budget,
-			None => {
-				// All functions that allow a contract to transfer balance enforce
-				// that the contract always stays above the subsistence threshold.
-				// We want the rent system to always leave a tombstone to prevent the
-				// accidental loss of a contract. Ony `seal_terminate` can remove a
-				// contract without a tombstone. Therefore this case should be never
-				// hit.
-				log::error!(
-					target: "runtime::contracts",
-					"Tombstoned a contract that is below the subsistence threshold: {:?}",
-					account,
-				);
-				0u32.into()
-			},
-		};
-
-		let dues = fee_per_block
-			.checked_mul(&blocks_passed.saturated_into::<u32>().into())
-			.unwrap_or_else(|| <BalanceOf<T>>::max_value());
-		let insufficient_rent = rent_budget < dues;
-
-		// If the rent payment cannot be withdrawn due to locks on the account balance, then evict
-		// the account.
-		//
-		// NOTE: This seems problematic because it provides a way to tombstone an account while
-		// avoiding the last rent payment. In effect, someone could retroactively set rent_allowance
-		// for their contract to 0.
-		let dues_limited = dues.min(rent_budget);
-		let can_withdraw_rent = T::Currency::ensure_can_withdraw(
-			account,
-			dues_limited,
-			WithdrawReasons::FEE,
-			free_balance.saturating_sub(dues_limited),
-		)
-		.is_ok();
-
-		if insufficient_rent || !can_withdraw_rent {
-			// The contract cannot afford the rent payment and has a balance above the subsistence
-			// threshold, so it leaves a tombstone.
-			let amount =
-				if can_withdraw_rent { Some(OutstandingAmount::new(dues_limited)) } else { None };
-			return Verdict::Evict { amount }
-		}
-
-		return Verdict::Charge {
-			// We choose to use `dues_limited` here instead of `dues` just to err on the safer side.
-			amount: OutstandingAmount::new(dues_limited),
-		}
-	}
-
-	/// Enacts the given verdict and returns the updated `ContractInfo`.
-	///
-	/// `alive_contract_info` should be from the same address as `account`.
-	///
-	/// # Note
-	///
-	/// if `evictable_code` is `None` an `Evict` verdict will not be enacted. This is for
-	/// when calling this function during a `call` where access to the soon to be evicted
-	/// contract should be denied but storage should be left unmodified.
-	fn enact_verdict(
-		account: &T::AccountId,
-		alive_contract_info: AliveContractInfo<T>,
-		current_block_number: T::BlockNumber,
-		verdict: Verdict<T>,
-		evictable_code: Option<PrefabWasmModule<T>>,
-	) -> Result<Option<AliveContractInfo<T>>, DispatchError> {
-		match (verdict, evictable_code) {
-			(Verdict::Evict { amount }, Some(code)) => {
-				// We need to remove the trie first because it is the only operation
-				// that can fail and this function is called without a storage
-				// transaction when called through `claim_surcharge`.
-				Storage::<T>::queue_trie_for_deletion(&alive_contract_info)?;
-
-				if let Some(amount) = amount {
-					amount.withdraw(account);
-				}
-
-				// Note: this operation is heavy.
-				let child_storage_root = child::root(&alive_contract_info.child_trie_info());
-
-				let tombstone = <TombstoneContractInfo<T>>::new(
-					&child_storage_root[..],
-					alive_contract_info.code_hash,
-				);
-				let tombstone_info = ContractInfo::Tombstone(tombstone);
-				<ContractInfoOf<T>>::insert(account, &tombstone_info);
-				code.drop_from_storage();
-				<Pallet<T>>::deposit_event(Event::Evicted(account.clone()));
-				Ok(None)
-			},
-			(Verdict::Evict { amount: _ }, None) => Ok(None),
-			(Verdict::Exempt, _) => {
-				let contract = ContractInfo::Alive(AliveContractInfo::<T> {
-					deduct_block: current_block_number,
-					..alive_contract_info
-				});
-				<ContractInfoOf<T>>::insert(account, &contract);
-				Ok(Some(contract.get_alive().expect("We just constructed it as alive. qed")))
-			},
-			(Verdict::Charge { amount }, _) => {
-				let contract = ContractInfo::Alive(AliveContractInfo::<T> {
-					rent_allowance: alive_contract_info.rent_allowance - amount.peek(),
-					deduct_block: current_block_number,
-					rent_paid: alive_contract_info.rent_paid.saturating_add(amount.peek()),
-					..alive_contract_info
-				});
-				<ContractInfoOf<T>>::insert(account, &contract);
-				amount.withdraw(account);
-				Ok(Some(contract.get_alive().expect("We just constructed it as alive. qed")))
-			},
-		}
-	}
-}
-
-/// The amount to charge.
-///
-/// This amount respects the contract's rent allowance and the subsistence deposit.
-/// Because of that, charging the amount cannot remove the contract.
-struct OutstandingAmount<T: Config> {
-	amount: BalanceOf<T>,
-}
-
-impl<T: Config> OutstandingAmount<T> {
-	/// Create the new outstanding amount.
-	///
-	/// The amount should be always withdrawable and it should not kill the account.
-	fn new(amount: BalanceOf<T>) -> Self {
-		Self { amount }
-	}
-
-	/// Returns the amount this instance wraps.
-	fn peek(&self) -> BalanceOf<T> {
-		self.amount
-	}
-
-	/// Withdraws the outstanding amount from the given account.
-	fn withdraw(self, account: &T::AccountId) {
-		if let Ok(imbalance) = T::Currency::withdraw(
-			account,
-			self.amount,
-			WithdrawReasons::FEE,
-			ExistenceRequirement::KeepAlive,
-		) {
-			// This should never fail. However, let's err on the safe side.
-			T::RentPayment::on_unbalanced(imbalance);
-		}
-	}
-}
-
-enum Verdict<T: Config> {
-	/// The contract is exempted from paying rent.
-	///
-	/// For example, it already paid its rent in the current block, or it has enough deposit for
-	/// not paying rent at all.
-	Exempt,
-	/// The contract cannot afford payment within its rent budget so it gets evicted. However,
-	/// because its balance is greater than the subsistence threshold it leaves a tombstone.
-	Evict { amount: Option<OutstandingAmount<T>> },
-	/// Everything is OK, we just only take some charge.
-	Charge { amount: OutstandingAmount<T> },
-}
diff --git a/frame/contracts/src/schedule.rs b/frame/contracts/src/schedule.rs
index a1118633bfde..2768ddf43a97 100644
--- a/frame/contracts/src/schedule.rs
+++ b/frame/contracts/src/schedule.rs
@@ -267,11 +267,8 @@ pub struct HostFnWeights<T: Config> {
 	/// Weight of calling `seal_minimum_balance`.
 	pub minimum_balance: Weight,
 
-	/// Weight of calling `seal_tombstone_deposit`.
-	pub tombstone_deposit: Weight,
-
-	/// Weight of calling `seal_rent_allowance`.
-	pub rent_allowance: Weight,
+	/// Weight of calling `seal_contract_deposit`.
+	pub contract_deposit: Weight,
 
 	/// Weight of calling `seal_block_number`.
 	pub block_number: Weight,
@@ -300,12 +297,6 @@ pub struct HostFnWeights<T: Config> {
 	/// Weight of calling `seal_terminate`.
 	pub terminate: Weight,
 
-	/// Weight of calling `seal_restore_to`.
-	pub restore_to: Weight,
-
-	/// Weight per delta key supplied to `seal_restore_to`.
-	pub restore_to_per_delta: Weight,
-
 	/// Weight of calling `seal_random`.
 	pub random: Weight,
 
@@ -321,9 +312,6 @@ pub struct HostFnWeights<T: Config> {
 	/// Weight of calling `seal_debug_message`.
 	pub debug_message: Weight,
 
-	/// Weight of calling `seal_set_rent_allowance`.
-	pub set_rent_allowance: Weight,
-
 	/// Weight of calling `seal_set_storage`.
 	pub set_storage: Weight,
 
@@ -566,8 +554,7 @@ impl<T: Config> Default for HostFnWeights<T> {
 			balance: cost_batched!(seal_balance),
 			value_transferred: cost_batched!(seal_value_transferred),
 			minimum_balance: cost_batched!(seal_minimum_balance),
-			tombstone_deposit: cost_batched!(seal_tombstone_deposit),
-			rent_allowance: cost_batched!(seal_rent_allowance),
+			contract_deposit: cost_batched!(seal_tombstone_deposit),
 			block_number: cost_batched!(seal_block_number),
 			now: cost_batched!(seal_now),
 			weight_to_fee: cost_batched!(seal_weight_to_fee),
@@ -577,8 +564,6 @@ impl<T: Config> Default for HostFnWeights<T> {
 			r#return: cost!(seal_return),
 			return_per_byte: cost_byte!(seal_return_per_kb),
 			terminate: cost!(seal_terminate),
-			restore_to: cost!(seal_restore_to),
-			restore_to_per_delta: cost_batched!(seal_restore_to_per_delta),
 			random: cost_batched!(seal_random),
 			deposit_event: cost_batched!(seal_deposit_event),
 			deposit_event_per_topic: cost_batched_args!(seal_deposit_event_per_topic_and_kb, 1, 0),
@@ -588,7 +573,6 @@ impl<T: Config> Default for HostFnWeights<T> {
 				1
 			),
 			debug_message: cost_batched!(seal_debug_message),
-			set_rent_allowance: cost_batched!(seal_set_rent_allowance),
 			set_storage: cost_batched!(seal_set_storage),
 			set_storage_per_byte: cost_byte_batched!(seal_set_storage_per_kb),
 			clear_storage: cost_batched!(seal_clear_storage),
diff --git a/frame/contracts/src/storage.rs b/frame/contracts/src/storage.rs
index 07819834837a..510a1c95f9a3 100644
--- a/frame/contracts/src/storage.rs
+++ b/frame/contracts/src/storage.rs
@@ -20,9 +20,9 @@
 use crate::{
 	exec::{AccountIdOf, StorageKey},
 	weights::WeightInfo,
-	BalanceOf, CodeHash, Config, ContractInfoOf, DeletionQueue, Error, TrieId,
+	CodeHash, Config, ContractInfoOf, DeletionQueue, Error, TrieId,
 };
-use codec::{Codec, Decode, Encode};
+use codec::{Decode, Encode};
 use frame_support::{
 	dispatch::{DispatchError, DispatchResult},
 	storage::child::{self, ChildInfo, KillStorageResult},
@@ -31,87 +31,26 @@ use frame_support::{
 };
 use sp_core::crypto::UncheckedFrom;
 use sp_io::hashing::blake2_256;
-use sp_runtime::{
-	traits::{Bounded, Hash, MaybeSerializeDeserialize, Member, Saturating, Zero},
-	RuntimeDebug,
-};
-use sp_std::{fmt::Debug, marker::PhantomData, prelude::*};
-
-pub type AliveContractInfo<T> =
-	RawAliveContractInfo<CodeHash<T>, BalanceOf<T>, <T as frame_system::Config>::BlockNumber>;
-pub type TombstoneContractInfo<T> = RawTombstoneContractInfo<
-	<T as frame_system::Config>::Hash,
-	<T as frame_system::Config>::Hashing,
->;
-
-/// Information for managing an account and its sub trie abstraction.
-/// This is the required info to cache for an account
-#[derive(Encode, Decode, RuntimeDebug)]
-pub enum ContractInfo<T: Config> {
-	Alive(AliveContractInfo<T>),
-	Tombstone(TombstoneContractInfo<T>),
-}
-
-impl<T: Config> ContractInfo<T> {
-	/// If contract is alive then return some alive info
-	pub fn get_alive(self) -> Option<AliveContractInfo<T>> {
-		if let ContractInfo::Alive(alive) = self {
-			Some(alive)
-		} else {
-			None
-		}
-	}
+use sp_runtime::{traits::Hash, RuntimeDebug};
+use sp_std::{marker::PhantomData, prelude::*};
 
-	/// If contract is alive then return some reference to alive info
-	#[cfg(test)]
-	pub fn as_alive(&self) -> Option<&AliveContractInfo<T>> {
-		if let ContractInfo::Alive(ref alive) = self {
-			Some(alive)
-		} else {
-			None
-		}
-	}
-
-	/// If contract is tombstone then return some tombstone info
-	pub fn get_tombstone(self) -> Option<TombstoneContractInfo<T>> {
-		if let ContractInfo::Tombstone(tombstone) = self {
-			Some(tombstone)
-		} else {
-			None
-		}
-	}
-}
+pub type ContractInfo<T> = RawContractInfo<CodeHash<T>>;
 
 /// Information for managing an account and its sub trie abstraction.
 /// This is the required info to cache for an account.
 #[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug)]
-pub struct RawAliveContractInfo<CodeHash, Balance, BlockNumber> {
+pub struct RawContractInfo<CodeHash> {
 	/// Unique ID for the subtree encoded as a bytes vector.
 	pub trie_id: TrieId,
-	/// The total number of bytes used by this contract.
-	///
-	/// It is a sum of each key-value pair stored by this contract.
-	pub storage_size: u32,
-	/// The total number of key-value pairs in storage of this contract.
-	pub pair_count: u32,
 	/// The code associated with a given account.
 	pub code_hash: CodeHash,
-	/// Pay rent at most up to this value.
-	pub rent_allowance: Balance,
-	/// The amount of rent that was paid by the contract over its whole lifetime.
-	///
-	/// A restored contract starts with a value of zero just like a new contract.
-	pub rent_paid: Balance,
-	/// Last block rent has been paid.
-	pub deduct_block: BlockNumber,
-	/// Last block child storage has been written.
-	pub last_write: Option<BlockNumber>,
 	/// This field is reserved for future evolution of format.
 	pub _reserved: Option<()>,
 }
 
-impl<CodeHash, Balance, BlockNumber> RawAliveContractInfo<CodeHash, Balance, BlockNumber> {
+impl<CodeHash> RawContractInfo<CodeHash> {
 	/// Associated child trie unique id is built from the hash part of the trie id.
+	#[cfg(test)]
 	pub fn child_trie_info(&self) -> ChildInfo {
 		child_trie_info(&self.trie_id[..])
 	}
@@ -122,40 +61,9 @@ fn child_trie_info(trie_id: &[u8]) -> ChildInfo {
 	ChildInfo::new_default(trie_id)
 }
 
-#[derive(Encode, Decode, PartialEq, Eq, RuntimeDebug)]
-pub struct RawTombstoneContractInfo<H, Hasher>(H, PhantomData<Hasher>);
-
-impl<H, Hasher> RawTombstoneContractInfo<H, Hasher>
-where
-	H: Member
-		+ MaybeSerializeDeserialize
-		+ Debug
-		+ AsRef<[u8]>
-		+ AsMut<[u8]>
-		+ Copy
-		+ Default
-		+ sp_std::hash::Hash
-		+ Codec,
-	Hasher: Hash<Output = H>,
-{
-	pub fn new(storage_root: &[u8], code_hash: H) -> Self {
-		let mut buf = Vec::new();
-		storage_root.using_encoded(|encoded| buf.extend_from_slice(encoded));
-		buf.extend_from_slice(code_hash.as_ref());
-		RawTombstoneContractInfo(<Hasher as Hash>::hash(&buf[..]), PhantomData)
-	}
-}
-
-impl<T: Config> From<AliveContractInfo<T>> for ContractInfo<T> {
-	fn from(alive_info: AliveContractInfo<T>) -> Self {
-		Self::Alive(alive_info)
-	}
-}
-
 #[derive(Encode, Decode)]
 pub struct DeletedContract {
-	pair_count: u32,
-	trie_id: TrieId,
+	pub(crate) trie_id: TrieId,
 }
 
 pub struct Storage<T>(PhantomData<T>);
@@ -181,47 +89,13 @@ where
 	/// contract owns, the last block the storage was written to, etc. That's why, in contrast to
 	/// `read`, this function also requires the `account` ID.
 	pub fn write(
-		block_number: T::BlockNumber,
-		new_info: &mut AliveContractInfo<T>,
+		new_info: &mut ContractInfo<T>,
 		key: &StorageKey,
 		opt_new_value: Option<Vec<u8>>,
 	) -> DispatchResult {
 		let hashed_key = blake2_256(key);
 		let child_trie_info = &child_trie_info(&new_info.trie_id);
 
-		let opt_prev_len = child::len(&child_trie_info, &hashed_key);
-
-		// Update the total number of KV pairs and the number of empty pairs.
-		match (&opt_prev_len, &opt_new_value) {
-			(Some(_), None) => {
-				new_info.pair_count = new_info
-					.pair_count
-					.checked_sub(1)
-					.ok_or_else(|| Error::<T>::StorageExhausted)?;
-			},
-			(None, Some(_)) => {
-				new_info.pair_count = new_info
-					.pair_count
-					.checked_add(1)
-					.ok_or_else(|| Error::<T>::StorageExhausted)?;
-			},
-			(Some(_), Some(_)) => {},
-			(None, None) => {},
-		}
-
-		// Update the total storage size.
-		let prev_value_len = opt_prev_len.unwrap_or(0);
-		let new_value_len =
-			opt_new_value.as_ref().map(|new_value| new_value.len() as u32).unwrap_or(0);
-		new_info.storage_size = new_info
-			.storage_size
-			.checked_sub(prev_value_len)
-			.and_then(|val| val.checked_add(new_value_len))
-			.ok_or_else(|| Error::<T>::StorageExhausted)?;
-
-		new_info.last_write = Some(block_number);
-
-		// Finally, perform the change on the storage.
 		match opt_new_value {
 			Some(new_value) => child::put_raw(&child_trie_info, &hashed_key, &new_value[..]),
 			None => child::kill(&child_trie_info, &hashed_key),
@@ -233,47 +107,29 @@ where
 	/// Creates a new contract descriptor in the storage with the given code hash at the given
 	/// address.
 	///
-	/// Returns `Err` if there is already a contract (or a tombstone) exists at the given address.
+	/// Returns `Err` if there is already a contract at the given address.
 	pub fn new_contract(
 		account: &AccountIdOf<T>,
 		trie_id: TrieId,
 		ch: CodeHash<T>,
-	) -> Result<AliveContractInfo<T>, DispatchError> {
+	) -> Result<ContractInfo<T>, DispatchError> {
 		if <ContractInfoOf<T>>::contains_key(account) {
 			return Err(Error::<T>::DuplicateContract.into())
 		}
 
-		let contract = AliveContractInfo::<T> {
-			code_hash: ch,
-			storage_size: 0,
-			trie_id,
-			deduct_block:
-				// We want to charge rent for the first block in advance. Therefore we
-				// treat the contract as if it was created in the last block and then
-				// charge rent for it during instantiation.
-				<frame_system::Pallet<T>>::block_number().saturating_sub(1u32.into()),
-			rent_allowance: <BalanceOf<T>>::max_value(),
-			rent_paid: <BalanceOf<T>>::zero(),
-			pair_count: 0,
-			last_write: None,
-			_reserved: None,
-		};
+		let contract = ContractInfo::<T> { code_hash: ch, trie_id, _reserved: None };
 
 		Ok(contract)
 	}
 
 	/// Push a contract's trie to the deletion queue for lazy removal.
 	///
-	/// You must make sure that the contract is also removed or converted into a tombstone
-	/// when queuing the trie for deletion.
-	pub fn queue_trie_for_deletion(contract: &AliveContractInfo<T>) -> DispatchResult {
+	/// You must make sure that the contract is also removed when queuing the trie for deletion.
+	pub fn queue_trie_for_deletion(contract: &ContractInfo<T>) -> DispatchResult {
 		if <DeletionQueue<T>>::decode_len().unwrap_or(0) >= T::DeletionQueueDepth::get() as usize {
 			Err(Error::<T>::DeletionQueueFull.into())
 		} else {
-			<DeletionQueue<T>>::append(DeletedContract {
-				pair_count: contract.pair_count,
-				trie_id: contract.trie_id.clone(),
-			});
+			<DeletionQueue<T>>::append(DeletedContract { trie_id: contract.trie_id.clone() });
 			Ok(())
 		}
 	}
@@ -302,12 +158,11 @@ where
 
 	/// Delete as many items from the deletion queue possible within the supplied weight limit.
 	///
-	/// It returns the amount of weight used for that task or `None` when no weight was used
-	/// apart from the base weight.
+	/// It returns the amount of weight used for that task.
 	pub fn process_deletion_queue_batch(weight_limit: Weight) -> Weight {
 		let queue_len = <DeletionQueue<T>>::decode_len().unwrap_or(0);
 		if queue_len == 0 {
-			return weight_limit
+			return 0
 		}
 
 		let (weight_per_key, mut remaining_key_budget) =
@@ -322,33 +177,20 @@ where
 
 		let mut queue = <DeletionQueue<T>>::get();
 
-		while !queue.is_empty() && remaining_key_budget > 0 {
-			// Cannot panic due to loop condition
-			let trie = &mut queue[0];
-			let pair_count = trie.pair_count;
+		if let (Some(trie), true) = (queue.get(0), remaining_key_budget > 0) {
 			let outcome =
 				child::kill_storage(&child_trie_info(&trie.trie_id), Some(remaining_key_budget));
-			if pair_count > remaining_key_budget {
-				// Cannot underflow because of the if condition
-				trie.pair_count -= remaining_key_budget;
-			} else {
-				// We do not care to preserve order. The contract is deleted already and
-				// noone waits for the trie to be deleted.
-				let removed = queue.swap_remove(0);
-				match outcome {
-					// This should not happen as our budget was large enough to remove all keys.
-					KillStorageResult::SomeRemaining(_) => {
-						log::error!(
-							target: "runtime::contracts",
-							"After deletion keys are remaining in this child trie: {:?}",
-							removed.trie_id,
-						);
-					},
-					KillStorageResult::AllRemoved(_) => (),
-				}
-			}
-			remaining_key_budget =
-				remaining_key_budget.saturating_sub(remaining_key_budget.min(pair_count));
+			let keys_removed = match outcome {
+				// This should not happen as our budget was large enough to remove all keys.
+				KillStorageResult::SomeRemaining(count) => count,
+				KillStorageResult::AllRemoved(count) => {
+					// We do not care to preserve order. The contract is deleted already and
+					// noone waits for the trie to be deleted.
+					queue.swap_remove(0);
+					count
+				},
+			};
+			remaining_key_budget = remaining_key_budget.saturating_sub(keys_removed);
 		}
 
 		<DeletionQueue<T>>::put(queue);
@@ -365,14 +207,14 @@ where
 	/// Returns the code hash of the contract specified by `account` ID.
 	#[cfg(test)]
 	pub fn code_hash(account: &AccountIdOf<T>) -> Option<CodeHash<T>> {
-		<ContractInfoOf<T>>::get(account).and_then(|i| i.as_alive().map(|i| i.code_hash))
+		<ContractInfoOf<T>>::get(account).map(|i| i.code_hash)
 	}
 
 	/// Fill up the queue in order to exercise the limits during testing.
 	#[cfg(test)]
 	pub fn fill_queue_with_dummies() {
 		let queue: Vec<_> = (0..T::DeletionQueueDepth::get())
-			.map(|_| DeletedContract { pair_count: 0, trie_id: vec![] })
+			.map(|_| DeletedContract { trie_id: vec![] })
 			.collect();
 		<DeletionQueue<T>>::put(queue);
 	}
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index fc5a2cf5221e..5d2057a0b7df 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -20,16 +20,16 @@ use crate::{
 		ChainExtension, Environment, Ext, InitState, Result as ExtensionResult, RetVal,
 		ReturnFlags, SysConfig, UncheckedFrom,
 	},
-	exec::{AccountIdOf, Executable, Frame},
-	storage::{RawAliveContractInfo, Storage},
+	exec::Frame,
+	storage::{RawContractInfo, Storage},
 	wasm::{PrefabWasmModule, ReturnCode as RuntimeReturnCode},
 	weights::WeightInfo,
-	BalanceOf, Config, ContractInfo, ContractInfoOf, Error, Pallet, Schedule,
+	BalanceOf, Config, ContractInfoOf, Error, Pallet, Schedule,
 };
 use assert_matches::assert_matches;
 use codec::Encode;
 use frame_support::{
-	assert_err, assert_err_ignore_postinfo, assert_ok, assert_storage_noop,
+	assert_err, assert_err_ignore_postinfo, assert_ok,
 	dispatch::DispatchErrorWithPostInfo,
 	parameter_types,
 	storage::child,
@@ -43,7 +43,7 @@ use sp_io::hashing::blake2_256;
 use sp_runtime::{
 	testing::{Header, H256},
 	traits::{BlakeTwo256, Convert, Hash, IdentityLookup},
-	AccountId32, Perbill,
+	AccountId32,
 };
 use std::cell::RefCell;
 
@@ -69,21 +69,20 @@ frame_support::construct_runtime!(
 
 #[macro_use]
 pub mod test_utils {
-	use super::{Balances, System, Test};
+	use super::{Balances, Test};
 	use crate::{
 		exec::{AccountIdOf, StorageKey},
-		storage::{ContractInfo, Storage},
+		storage::Storage,
 		AccountCounter, CodeHash, ContractInfoOf, Pallet as Contracts, TrieId,
 	};
 	use frame_support::traits::Currency;
 
 	pub fn set_storage(addr: &AccountIdOf<Test>, key: &StorageKey, value: Option<Vec<u8>>) {
-		let mut contract_info = <ContractInfoOf<Test>>::get(&addr).unwrap().get_alive().unwrap();
-		let block_number = System::block_number();
-		Storage::<Test>::write(block_number, &mut contract_info, key, value).unwrap();
+		let mut contract_info = <ContractInfoOf<Test>>::get(&addr).unwrap();
+		Storage::<Test>::write(&mut contract_info, key, value).unwrap();
 	}
 	pub fn get_storage(addr: &AccountIdOf<Test>, key: &StorageKey) -> Option<Vec<u8>> {
-		let contract_info = <ContractInfoOf<Test>>::get(&addr).unwrap().get_alive().unwrap();
+		let contract_info = <ContractInfoOf<Test>>::get(&addr).unwrap();
 		Storage::<Test>::read(&contract_info.trie_id, key)
 	}
 	pub fn generate_trie_id(address: &AccountIdOf<Test>) -> TrieId {
@@ -97,7 +96,7 @@ pub mod test_utils {
 		let trie_id = generate_trie_id(address);
 		set_balance(address, Contracts::<Test>::subsistence_threshold() * 10);
 		let contract = Storage::<Test>::new_contract(&address, trie_id, code_hash).unwrap();
-		<ContractInfoOf<Test>>::insert(address, ContractInfo::Alive(contract));
+		<ContractInfoOf<Test>>::insert(address, contract);
 	}
 	pub fn set_balance(who: &AccountIdOf<Test>, amount: u64) {
 		let imbalance = Balances::deposit_creating(who, amount);
@@ -248,13 +247,7 @@ impl pallet_utility::Config for Test {
 	type WeightInfo = ();
 }
 parameter_types! {
-	pub const SignedClaimHandicap: u64 = 2;
-	pub const TombstoneDeposit: u64 = 16;
-	pub const DepositPerContract: u64 = 8 * DepositPerStorageByte::get();
-	pub const DepositPerStorageByte: u64 = 10_000;
-	pub const DepositPerStorageItem: u64 = 10_000;
-	pub RentFraction: Perbill = Perbill::from_rational(4u32, 10_000u32);
-	pub const SurchargeReward: u64 = 500_000;
+	pub const ContractDeposit: u64 = 16;
 	pub const MaxValueSize: u32 = 16_384;
 	pub const DeletionQueueDepth: u32 = 1024;
 	pub const DeletionWeightLimit: Weight = 500_000_000_000;
@@ -295,14 +288,7 @@ impl Config for Test {
 	type Event = Event;
 	type Call = Call;
 	type CallFilter = TestFilter;
-	type RentPayment = ();
-	type SignedClaimHandicap = SignedClaimHandicap;
-	type TombstoneDeposit = TombstoneDeposit;
-	type DepositPerContract = DepositPerContract;
-	type DepositPerStorageByte = DepositPerStorageByte;
-	type DepositPerStorageItem = DepositPerStorageItem;
-	type RentFraction = RentFraction;
-	type SurchargeReward = SurchargeReward;
+	type ContractDeposit = ContractDeposit;
 	type CallStack = [Frame<Self>; 31];
 	type WeightPrice = Self;
 	type WeightInfo = ();
@@ -395,33 +381,21 @@ fn account_removal_does_not_remove_storage() {
 
 		// Set up two accounts with free balance above the existential threshold.
 		{
-			let alice_contract_info = ContractInfo::Alive(RawAliveContractInfo {
+			let alice_contract_info = RawContractInfo {
 				trie_id: trie_id1.clone(),
-				storage_size: 0,
-				pair_count: 0,
-				deduct_block: System::block_number(),
 				code_hash: H256::repeat_byte(1),
-				rent_allowance: 40,
-				rent_paid: 0,
-				last_write: None,
 				_reserved: None,
-			});
+			};
 			let _ = Balances::deposit_creating(&ALICE, 110);
 			ContractInfoOf::<Test>::insert(ALICE, &alice_contract_info);
 			set_storage(&ALICE, &key1, Some(b"1".to_vec()));
 			set_storage(&ALICE, &key2, Some(b"2".to_vec()));
 
-			let bob_contract_info = ContractInfo::Alive(RawAliveContractInfo {
+			let bob_contract_info = RawContractInfo {
 				trie_id: trie_id2.clone(),
-				storage_size: 0,
-				pair_count: 0,
-				deduct_block: System::block_number(),
 				code_hash: H256::repeat_byte(2),
-				rent_allowance: 40,
-				rent_paid: 0,
-				last_write: None,
 				_reserved: None,
-			});
+			};
 			let _ = Balances::deposit_creating(&BOB, 110);
 			ContractInfoOf::<Test>::insert(BOB, &bob_contract_info);
 			set_storage(&BOB, &key1, Some(b"3".to_vec()));
@@ -593,7 +567,7 @@ fn run_out_of_gas() {
 				Origin::signed(ALICE),
 				addr, // newly created account
 				0,
-				67_500_000,
+				1_000_000_000_000,
 				vec![],
 			),
 			Error::<Test>::OutOfGas,
@@ -601,881 +575,10 @@ fn run_out_of_gas() {
 	});
 }
 
-/// Input data for each call in set_rent code
-mod call {
-	use super::{AccountIdOf, Test};
-	pub fn set_storage_4_byte() -> Vec<u8> {
-		0u32.to_le_bytes().to_vec()
-	}
-	pub fn remove_storage_4_byte() -> Vec<u8> {
-		1u32.to_le_bytes().to_vec()
-	}
-	#[allow(dead_code)]
-	pub fn transfer(to: &AccountIdOf<Test>) -> Vec<u8> {
-		2u32.to_le_bytes().iter().chain(AsRef::<[u8]>::as_ref(to)).cloned().collect()
-	}
-	pub fn null() -> Vec<u8> {
-		3u32.to_le_bytes().to_vec()
-	}
-}
-
-#[test]
-fn storage_size() {
-	let (wasm, code_hash) = compile_module::<Test>("set_rent").unwrap();
-
-	// Storage size
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		// Create
-		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-		assert_ok!(Contracts::instantiate_with_code(
-			Origin::signed(ALICE),
-			30_000,
-			GAS_LIMIT,
-			wasm,
-			// rent_allowance
-			<Test as pallet_balances::Config>::Balance::from(10_000u32).encode(),
-			vec![],
-		));
-		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
-		let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
-		assert_eq!(bob_contract.storage_size, 4);
-		assert_eq!(bob_contract.pair_count, 1);
-
-		assert_ok!(Contracts::call(
-			Origin::signed(ALICE),
-			addr.clone(),
-			0,
-			GAS_LIMIT,
-			call::set_storage_4_byte()
-		));
-		let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
-		assert_eq!(bob_contract.storage_size, 4 + 4);
-		assert_eq!(bob_contract.pair_count, 2);
-
-		assert_ok!(Contracts::call(
-			Origin::signed(ALICE),
-			addr.clone(),
-			0,
-			GAS_LIMIT,
-			call::remove_storage_4_byte()
-		));
-		let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
-		assert_eq!(bob_contract.storage_size, 4);
-		assert_eq!(bob_contract.pair_count, 1);
-	});
-}
-
-#[test]
-fn empty_kv_pairs() {
-	let (wasm, code_hash) = compile_module::<Test>("set_empty_storage").unwrap();
-
-	ExtBuilder::default().build().execute_with(|| {
-		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-		assert_ok!(Contracts::instantiate_with_code(
-			Origin::signed(ALICE),
-			30_000,
-			GAS_LIMIT,
-			wasm,
-			vec![],
-			vec![],
-		));
-		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
-		let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
-
-		assert_eq!(bob_contract.storage_size, 0);
-		assert_eq!(bob_contract.pair_count, 1);
-	});
-}
-
 fn initialize_block(number: u64) {
 	System::initialize(&number, &[0u8; 32].into(), &Default::default(), Default::default());
 }
 
-#[test]
-fn deduct_blocks() {
-	let (wasm, code_hash) = compile_module::<Test>("set_rent").unwrap();
-	let endowment: BalanceOf<Test> = 100_000;
-	let allowance: BalanceOf<Test> = 70_000;
-
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		// Create
-		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-		assert_ok!(Contracts::instantiate_with_code(
-			Origin::signed(ALICE),
-			endowment,
-			GAS_LIMIT,
-			wasm,
-			allowance.encode(),
-			vec![],
-		));
-		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
-		let contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
-		let code_len: BalanceOf<Test> =
-			PrefabWasmModule::<Test>::from_storage_noinstr(contract.code_hash)
-				.unwrap()
-				.occupied_storage()
-				.into();
-
-		// The instantiation deducted the rent for one block immediately
-		let rent0 = <Test as Config>::RentFraction::get()
-				// (base_deposit(8) + bytes in storage(4) + size of code) * byte_price
-				// + 1 storage item (10_000) - free_balance
-				.mul_ceil((8 + 4 + code_len) * 10_000 + 10_000 - endowment)
-				// blocks to rent
-				* 1;
-		assert!(rent0 > 0);
-		assert_eq!(contract.rent_allowance, allowance - rent0);
-		assert_eq!(contract.deduct_block, 1);
-		assert_eq!(Balances::free_balance(&addr), endowment - rent0);
-
-		// Advance 4 blocks
-		initialize_block(5);
-
-		// Trigger rent through call
-		assert_ok!(Contracts::call(
-			Origin::signed(ALICE),
-			addr.clone(),
-			0,
-			GAS_LIMIT,
-			call::null()
-		));
-
-		// Check result
-		let rent = <Test as Config>::RentFraction::get()
-			.mul_ceil((8 + 4 + code_len) * 10_000 + 10_000 - (endowment - rent0)) *
-			4;
-		let contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
-		assert_eq!(contract.rent_allowance, allowance - rent0 - rent);
-		assert_eq!(contract.deduct_block, 5);
-		assert_eq!(Balances::free_balance(&addr), endowment - rent0 - rent);
-
-		// Advance 2 blocks more
-		initialize_block(7);
-
-		// Trigger rent through call
-		assert_ok!(Contracts::call(
-			Origin::signed(ALICE),
-			addr.clone(),
-			0,
-			GAS_LIMIT,
-			call::null()
-		));
-
-		// Check result
-		let rent_2 = <Test as Config>::RentFraction::get()
-			.mul_ceil((8 + 4 + code_len) * 10_000 + 10_000 - (endowment - rent0 - rent)) *
-			2;
-		let contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
-		assert_eq!(contract.rent_allowance, allowance - rent0 - rent - rent_2);
-		assert_eq!(contract.deduct_block, 7);
-		assert_eq!(Balances::free_balance(&addr), endowment - rent0 - rent - rent_2);
-
-		// Second call on same block should have no effect on rent
-		assert_ok!(Contracts::call(
-			Origin::signed(ALICE),
-			addr.clone(),
-			0,
-			GAS_LIMIT,
-			call::null()
-		));
-		let contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
-		assert_eq!(contract.rent_allowance, allowance - rent0 - rent - rent_2);
-		assert_eq!(contract.deduct_block, 7);
-		assert_eq!(Balances::free_balance(&addr), endowment - rent0 - rent - rent_2)
-	});
-}
-
-#[test]
-fn inherent_claim_surcharge_contract_removals() {
-	removals(|addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok());
-}
-
-#[test]
-fn signed_claim_surcharge_contract_removals() {
-	removals(|addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok());
-}
-
-#[test]
-fn claim_surcharge_malus() {
-	// Test surcharge malus for inherent
-	claim_surcharge(
-		8,
-		|addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(),
-		true,
-	);
-	claim_surcharge(
-		7,
-		|addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(),
-		true,
-	);
-	claim_surcharge(
-		6,
-		|addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(),
-		true,
-	);
-	claim_surcharge(
-		5,
-		|addr| Contracts::claim_surcharge(Origin::none(), addr, Some(ALICE)).is_ok(),
-		false,
-	);
-
-	// Test surcharge malus for signed
-	claim_surcharge(
-		8,
-		|addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(),
-		true,
-	);
-	claim_surcharge(
-		7,
-		|addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(),
-		false,
-	);
-	claim_surcharge(
-		6,
-		|addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(),
-		false,
-	);
-	claim_surcharge(
-		5,
-		|addr| Contracts::claim_surcharge(Origin::signed(ALICE), addr, None).is_ok(),
-		false,
-	);
-}
-
-/// Claim surcharge with the given trigger_call at the given blocks.
-/// If `removes` is true then assert that the contract is a tombstone.
-fn claim_surcharge(blocks: u64, trigger_call: impl Fn(AccountIdOf<Test>) -> bool, removes: bool) {
-	let (wasm, code_hash) = compile_module::<Test>("set_rent").unwrap();
-
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		// Create
-		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-		assert_ok!(Contracts::instantiate_with_code(
-			Origin::signed(ALICE),
-			100_000,
-			GAS_LIMIT,
-			wasm,
-			<Test as pallet_balances::Config>::Balance::from(30_000u32).encode(), // rent allowance
-			vec![],
-		));
-		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
-
-		// Advance blocks
-		initialize_block(blocks);
-
-		// Trigger rent through call
-		assert_eq!(trigger_call(addr.clone()), removes);
-
-		if removes {
-			assert!(ContractInfoOf::<Test>::get(&addr).unwrap().get_tombstone().is_some());
-		} else {
-			assert!(ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().is_some());
-		}
-	});
-}
-
-/// Test for all kind of removals for the given trigger:
-/// * if balance is reached and balance > subsistence threshold
-/// * if allowance is exceeded
-/// * if balance is reached and balance < subsistence threshold
-/// 	    * this case cannot be triggered by a contract: we check whether a tombstone is left
-fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
-	let (wasm, code_hash) = compile_module::<Test>("set_rent").unwrap();
-
-	// Balance reached and superior to subsistence threshold
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		// Create
-		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-		assert_ok!(Contracts::instantiate_with_code(
-			Origin::signed(ALICE),
-			70_000,
-			GAS_LIMIT,
-			wasm.clone(),
-			<Test as pallet_balances::Config>::Balance::from(100_000u32).encode(), /* rent allowance */
-			vec![],
-		));
-		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
-		let allowance =
-			ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap().rent_allowance;
-		let balance = Balances::free_balance(&addr);
-
-		let subsistence_threshold = Pallet::<Test>::subsistence_threshold();
-
-		// Trigger rent must have no effect
-		assert!(!trigger_call(addr.clone()));
-		assert_eq!(
-			ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap().rent_allowance,
-			allowance,
-		);
-		assert_eq!(Balances::free_balance(&addr), balance);
-
-		// Advance blocks
-		initialize_block(27);
-
-		// Trigger rent through call (should remove the contract)
-		assert!(trigger_call(addr.clone()));
-		assert!(ContractInfoOf::<Test>::get(&addr).unwrap().get_tombstone().is_some());
-		assert_eq!(Balances::free_balance(&addr), subsistence_threshold);
-
-		// Advance blocks
-		initialize_block(30);
-
-		// Trigger rent must have no effect
-		assert!(!trigger_call(addr.clone()));
-		assert!(ContractInfoOf::<Test>::get(&addr).unwrap().get_tombstone().is_some());
-		assert_eq!(Balances::free_balance(&addr), subsistence_threshold);
-	});
-
-	// Allowance exceeded
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		// Create
-		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-		assert_ok!(Contracts::instantiate_with_code(
-			Origin::signed(ALICE),
-			100_000,
-			GAS_LIMIT,
-			wasm.clone(),
-			<Test as pallet_balances::Config>::Balance::from(70_000u32).encode(), // rent allowance
-			vec![],
-		));
-		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
-		let allowance =
-			ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap().rent_allowance;
-		let balance = Balances::free_balance(&addr);
-
-		// Trigger rent must have no effect
-		assert!(!trigger_call(addr.clone()));
-		assert_eq!(
-			ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap().rent_allowance,
-			allowance,
-		);
-		assert_eq!(Balances::free_balance(&addr), balance);
-
-		// Advance blocks
-		initialize_block(27);
-
-		// Trigger rent through call
-		assert!(trigger_call(addr.clone()));
-		assert!(ContractInfoOf::<Test>::get(&addr).unwrap().get_tombstone().is_some());
-		// Balance should be initial balance - initial rent_allowance
-		assert_eq!(Balances::free_balance(&addr), 30_000);
-
-		// Advance blocks
-		initialize_block(20);
-
-		// Trigger rent must have no effect
-		assert!(!trigger_call(addr.clone()));
-		assert!(ContractInfoOf::<Test>::get(&addr).unwrap().get_tombstone().is_some());
-		assert_eq!(Balances::free_balance(&addr), 30_000);
-	});
-
-	// Balance reached and inferior to subsistence threshold
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		// Create
-		let subsistence_threshold = Pallet::<Test>::subsistence_threshold();
-		let _ = Balances::deposit_creating(&ALICE, subsistence_threshold * 1000);
-		assert_ok!(Contracts::instantiate_with_code(
-			Origin::signed(ALICE),
-			subsistence_threshold * 100,
-			GAS_LIMIT,
-			wasm,
-			(subsistence_threshold * 100).encode(), // rent allowance
-			vec![],
-		));
-		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
-		let allowance =
-			ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap().rent_allowance;
-		let balance = Balances::free_balance(&addr);
-
-		// Trigger rent must have no effect
-		assert!(!trigger_call(addr.clone()));
-		assert_eq!(
-			ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap().rent_allowance,
-			allowance,
-		);
-		assert_eq!(Balances::free_balance(&addr), balance);
-
-		// Make contract have exactly the subsistence threshold
-		Balances::make_free_balance_be(&addr, subsistence_threshold);
-		assert_eq!(Balances::free_balance(&addr), subsistence_threshold);
-
-		// Advance blocks (should remove as balance is exactly subsistence)
-		initialize_block(10);
-
-		// Trigger rent through call
-		assert!(trigger_call(addr.clone()));
-		assert_matches!(ContractInfoOf::<Test>::get(&addr), Some(ContractInfo::Tombstone(_)));
-		assert_eq!(Balances::free_balance(&addr), subsistence_threshold);
-
-		// Advance blocks
-		initialize_block(20);
-
-		// Trigger rent must have no effect
-		assert!(!trigger_call(addr.clone()));
-		assert_matches!(ContractInfoOf::<Test>::get(&addr), Some(ContractInfo::Tombstone(_)));
-		assert_eq!(Balances::free_balance(&addr), subsistence_threshold);
-	});
-}
-
-#[test]
-fn call_removed_contract() {
-	let (wasm, code_hash) = compile_module::<Test>("set_rent").unwrap();
-
-	// Balance reached and superior to subsistence threshold
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		// Create
-		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-		assert_ok!(Contracts::instantiate_with_code(
-			Origin::signed(ALICE),
-			30_000,
-			GAS_LIMIT,
-			wasm,
-			// rent allowance
-			<Test as pallet_balances::Config>::Balance::from(10_000u32).encode(),
-			vec![],
-		));
-		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
-
-		// Calling contract should succeed.
-		assert_ok!(Contracts::call(
-			Origin::signed(ALICE),
-			addr.clone(),
-			0,
-			GAS_LIMIT,
-			call::null()
-		));
-
-		// Advance blocks
-		initialize_block(27);
-
-		// Calling contract should deny access because rent cannot be paid.
-		assert_err_ignore_postinfo!(
-			Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, call::null()),
-			Error::<Test>::RentNotPaid,
-		);
-		// No event is generated because the contract is not actually removed.
-		assert_eq!(System::events(), vec![]);
-
-		// Subsequent contract calls should also fail.
-		assert_err_ignore_postinfo!(
-			Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, call::null()),
-			Error::<Test>::RentNotPaid,
-		);
-
-		// A snitch can now remove the contract
-		assert_ok!(Contracts::claim_surcharge(Origin::none(), addr.clone(), Some(ALICE)));
-		assert!(ContractInfoOf::<Test>::get(&addr).unwrap().get_tombstone().is_some());
-	})
-}
-
-#[test]
-fn default_rent_allowance_on_instantiate() {
-	let (wasm, code_hash) = compile_module::<Test>("check_default_rent_allowance").unwrap();
-
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		// Create
-		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-		assert_ok!(Contracts::instantiate_with_code(
-			Origin::signed(ALICE),
-			30_000,
-			GAS_LIMIT,
-			wasm,
-			vec![],
-			vec![],
-		));
-		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
-		let contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
-		let code_len: BalanceOf<Test> =
-			PrefabWasmModule::<Test>::from_storage_noinstr(contract.code_hash)
-				.unwrap()
-				.occupied_storage()
-				.into();
-
-		// The instantiation deducted the rent for one block immediately
-		let first_rent = <Test as Config>::RentFraction::get()
-				// (base_deposit(8) + code_len) * byte_price - free_balance
-				.mul_ceil((8 + code_len) * 10_000 - 30_000)
-				// blocks to rent
-				* 1;
-		assert_eq!(contract.rent_allowance, <BalanceOf<Test>>::max_value() - first_rent);
-
-		// Advance blocks
-		initialize_block(5);
-
-		// Trigger rent through call
-		assert_ok!(Contracts::call(
-			Origin::signed(ALICE),
-			addr.clone(),
-			0,
-			GAS_LIMIT,
-			call::null()
-		));
-
-		// Check contract is still alive
-		let contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive();
-		assert!(contract.is_some())
-	});
-}
-
-#[test]
-fn restorations_dirty_storage_and_different_storage() {
-	restoration(true, true, false);
-}
-
-#[test]
-fn restorations_dirty_storage() {
-	restoration(false, true, false);
-}
-
-#[test]
-fn restoration_different_storage() {
-	restoration(true, false, false);
-}
-
-#[test]
-fn restoration_code_evicted() {
-	restoration(false, false, true);
-}
-
-#[test]
-fn restoration_success() {
-	restoration(false, false, false);
-}
-
-fn restoration(
-	test_different_storage: bool,
-	test_restore_to_with_dirty_storage: bool,
-	test_code_evicted: bool,
-) {
-	let (set_rent_wasm, set_rent_code_hash) = compile_module::<Test>("set_rent").unwrap();
-	let (restoration_wasm, restoration_code_hash) = compile_module::<Test>("restoration").unwrap();
-	let allowance: <Test as pallet_balances::Config>::Balance = 10_000;
-
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-
-		// Create an account with address `BOB` with code `CODE_SET_RENT`.
-		// The input parameter sets the rent allowance to 0.
-		assert_ok!(Contracts::instantiate_with_code(
-			Origin::signed(ALICE),
-			30_000,
-			GAS_LIMIT,
-			set_rent_wasm.clone(),
-			allowance.encode(),
-			vec![],
-		));
-		let addr_bob = Contracts::contract_address(&ALICE, &set_rent_code_hash, &[]);
-
-		let mut events = vec![
-			EventRecord {
-				phase: Phase::Initialization,
-				event: Event::System(frame_system::Event::NewAccount(ALICE)),
-				topics: vec![],
-			},
-			EventRecord {
-				phase: Phase::Initialization,
-				event: Event::Balances(pallet_balances::Event::Endowed(ALICE, 1_000_000)),
-				topics: vec![],
-			},
-			EventRecord {
-				phase: Phase::Initialization,
-				event: Event::System(frame_system::Event::NewAccount(addr_bob.clone())),
-				topics: vec![],
-			},
-			EventRecord {
-				phase: Phase::Initialization,
-				event: Event::Balances(pallet_balances::Event::Endowed(addr_bob.clone(), 30_000)),
-				topics: vec![],
-			},
-			EventRecord {
-				phase: Phase::Initialization,
-				event: Event::Balances(pallet_balances::Event::Transfer(
-					ALICE,
-					addr_bob.clone(),
-					30_000,
-				)),
-				topics: vec![],
-			},
-			EventRecord {
-				phase: Phase::Initialization,
-				event: Event::Contracts(crate::Event::CodeStored(set_rent_code_hash.into())),
-				topics: vec![],
-			},
-			EventRecord {
-				phase: Phase::Initialization,
-				event: Event::Contracts(crate::Event::Instantiated(ALICE, addr_bob.clone())),
-				topics: vec![],
-			},
-		];
-
-		// Create another contract from the same code in order to increment the codes
-		// refcounter so that it stays on chain.
-		if !test_code_evicted {
-			assert_ok!(Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				20_000,
-				GAS_LIMIT,
-				set_rent_wasm,
-				allowance.encode(),
-				vec![1],
-			));
-			assert_refcount!(set_rent_code_hash, 2);
-			let addr_dummy = Contracts::contract_address(&ALICE, &set_rent_code_hash, &[1]);
-			events.extend(
-				[
-					EventRecord {
-						phase: Phase::Initialization,
-						event: Event::System(frame_system::Event::NewAccount(addr_dummy.clone())),
-						topics: vec![],
-					},
-					EventRecord {
-						phase: Phase::Initialization,
-						event: Event::Balances(pallet_balances::Event::Endowed(
-							addr_dummy.clone(),
-							20_000,
-						)),
-						topics: vec![],
-					},
-					EventRecord {
-						phase: Phase::Initialization,
-						event: Event::Balances(pallet_balances::Event::Transfer(
-							ALICE,
-							addr_dummy.clone(),
-							20_000,
-						)),
-						topics: vec![],
-					},
-					EventRecord {
-						phase: Phase::Initialization,
-						event: Event::Contracts(crate::Event::Instantiated(
-							ALICE,
-							addr_dummy.clone(),
-						)),
-						topics: vec![],
-					},
-				]
-				.iter()
-				.cloned(),
-			);
-		}
-
-		assert_eq!(System::events(), events);
-
-		// Check if `BOB` was created successfully and that the rent allowance is below what
-		// we specified as the first rent was already collected.
-		let bob_contract = ContractInfoOf::<Test>::get(&addr_bob).unwrap().get_alive().unwrap();
-		assert!(bob_contract.rent_allowance < allowance);
-
-		if test_different_storage {
-			assert_ok!(Contracts::call(
-				Origin::signed(ALICE),
-				addr_bob.clone(),
-				0,
-				GAS_LIMIT,
-				call::set_storage_4_byte()
-			));
-		}
-
-		// Advance blocks in order to make the contract run out of money for rent.
-		initialize_block(27);
-
-		// Call `BOB`, which makes it pay rent. Since the rent allowance is set to 20_000
-		// we expect that it is no longer callable but keeps existing until someone
-		// calls `claim_surcharge`.
-		assert_err_ignore_postinfo!(
-			Contracts::call(Origin::signed(ALICE), addr_bob.clone(), 0, GAS_LIMIT, call::null()),
-			Error::<Test>::RentNotPaid,
-		);
-		assert!(System::events().is_empty());
-		assert!(ContractInfoOf::<Test>::get(&addr_bob).unwrap().get_alive().is_some());
-		assert_ok!(Contracts::claim_surcharge(Origin::none(), addr_bob.clone(), Some(ALICE)));
-		assert!(ContractInfoOf::<Test>::get(&addr_bob).unwrap().get_tombstone().is_some());
-		if test_code_evicted {
-			assert_refcount!(set_rent_code_hash, 0);
-		} else {
-			assert_refcount!(set_rent_code_hash, 1);
-		}
-
-		// Create another account with the address `DJANGO` with `CODE_RESTORATION`.
-		//
-		// Note that we can't use `ALICE` for creating `DJANGO` so we create yet another
-		// account `CHARLIE` and create `DJANGO` with it.
-		let _ = Balances::deposit_creating(&CHARLIE, 1_000_000);
-		assert_ok!(Contracts::instantiate_with_code(
-			Origin::signed(CHARLIE),
-			30_000,
-			GAS_LIMIT,
-			restoration_wasm,
-			vec![],
-			vec![],
-		));
-		let addr_django = Contracts::contract_address(&CHARLIE, &restoration_code_hash, &[]);
-
-		// Before performing a call to `DJANGO` save its original trie id.
-		let django_trie_id =
-			ContractInfoOf::<Test>::get(&addr_django).unwrap().get_alive().unwrap().trie_id;
-
-		// The trie is regarded as 'dirty' when it was written to in the current block.
-		if !test_restore_to_with_dirty_storage {
-			// Advance 1 block.
-			initialize_block(28);
-		}
-
-		// Perform a call to `DJANGO`. This should either perform restoration successfully or
-		// fail depending on the test parameters.
-		let perform_the_restoration = || {
-			Contracts::call(
-				Origin::signed(ALICE),
-				addr_django.clone(),
-				0,
-				GAS_LIMIT,
-				set_rent_code_hash
-					.as_ref()
-					.iter()
-					.chain(AsRef::<[u8]>::as_ref(&addr_bob))
-					.cloned()
-					.collect(),
-			)
-		};
-
-		// The key that is used in the restorer contract but is not in the target contract.
-		// Is supplied as delta to the restoration. We need it to check whether the key
-		// is properly removed on success but still there on failure.
-		let delta_key = {
-			let mut key = [0u8; 32];
-			key[0] = 1;
-			key
-		};
-
-		if test_different_storage || test_restore_to_with_dirty_storage || test_code_evicted {
-			// Parametrization of the test imply restoration failure. Check that `DJANGO` aka
-			// restoration contract is still in place and also that `BOB` doesn't exist.
-			let result = perform_the_restoration();
-			assert!(ContractInfoOf::<Test>::get(&addr_bob).unwrap().get_tombstone().is_some());
-			let django_contract =
-				ContractInfoOf::<Test>::get(&addr_django).unwrap().get_alive().unwrap();
-			assert_eq!(django_contract.storage_size, 8);
-			assert_eq!(django_contract.trie_id, django_trie_id);
-			assert_eq!(django_contract.deduct_block, System::block_number());
-			assert_eq!(Storage::<Test>::read(&django_trie_id, &delta_key), Some(vec![40, 0, 0, 0]));
-			match (test_different_storage, test_restore_to_with_dirty_storage, test_code_evicted) {
-				(true, false, false) => {
-					assert_err_ignore_postinfo!(result, Error::<Test>::InvalidTombstone);
-					assert_eq!(System::events(), vec![]);
-				},
-				(_, true, false) => {
-					assert_err_ignore_postinfo!(result, Error::<Test>::InvalidContractOrigin);
-					assert_eq!(
-						System::events(),
-						vec![
-							EventRecord {
-								phase: Phase::Initialization,
-								event: Event::Contracts(crate::Event::Evicted(addr_bob)),
-								topics: vec![],
-							},
-							EventRecord {
-								phase: Phase::Initialization,
-								event: Event::System(frame_system::Event::NewAccount(CHARLIE)),
-								topics: vec![],
-							},
-							EventRecord {
-								phase: Phase::Initialization,
-								event: Event::Balances(pallet_balances::Event::Endowed(
-									CHARLIE, 1_000_000
-								)),
-								topics: vec![],
-							},
-							EventRecord {
-								phase: Phase::Initialization,
-								event: Event::System(frame_system::Event::NewAccount(
-									addr_django.clone()
-								)),
-								topics: vec![],
-							},
-							EventRecord {
-								phase: Phase::Initialization,
-								event: Event::Balances(pallet_balances::Event::Endowed(
-									addr_django.clone(),
-									30_000
-								)),
-								topics: vec![],
-							},
-							EventRecord {
-								phase: Phase::Initialization,
-								event: Event::Balances(pallet_balances::Event::Transfer(
-									CHARLIE,
-									addr_django.clone(),
-									30_000
-								)),
-								topics: vec![],
-							},
-							EventRecord {
-								phase: Phase::Initialization,
-								event: Event::Contracts(crate::Event::CodeStored(
-									restoration_code_hash
-								)),
-								topics: vec![],
-							},
-							EventRecord {
-								phase: Phase::Initialization,
-								event: Event::Contracts(crate::Event::Instantiated(
-									CHARLIE,
-									addr_django.clone()
-								)),
-								topics: vec![],
-							},
-						]
-					);
-				},
-				(false, false, true) => {
-					assert_err_ignore_postinfo!(result, Error::<Test>::CodeNotFound);
-					assert_refcount!(set_rent_code_hash, 0);
-					assert_eq!(System::events(), vec![]);
-				},
-				_ => unreachable!(),
-			}
-		} else {
-			assert_ok!(perform_the_restoration());
-			assert_refcount!(set_rent_code_hash, 2);
-
-			// Here we expect that the restoration is succeeded. Check that the restoration
-			// contract `DJANGO` ceased to exist and that `BOB` returned back.
-			let bob_contract = ContractInfoOf::<Test>::get(&addr_bob).unwrap().get_alive().unwrap();
-			assert_eq!(bob_contract.rent_allowance, 50);
-			assert_eq!(bob_contract.storage_size, 4);
-			assert_eq!(bob_contract.trie_id, django_trie_id);
-			assert_eq!(bob_contract.deduct_block, System::block_number());
-			assert!(ContractInfoOf::<Test>::get(&addr_django).is_none());
-			assert_matches!(Storage::<Test>::read(&django_trie_id, &delta_key), None);
-			assert_eq!(
-				System::events(),
-				vec![
-					EventRecord {
-						phase: Phase::Initialization,
-						event: Event::Contracts(crate::Event::CodeRemoved(restoration_code_hash)),
-						topics: vec![],
-					},
-					EventRecord {
-						phase: Phase::Initialization,
-						event: Event::System(system::Event::KilledAccount(addr_django.clone())),
-						topics: vec![],
-					},
-					EventRecord {
-						phase: Phase::Initialization,
-						event: Event::Contracts(crate::Event::Restored(
-							addr_django,
-							addr_bob,
-							bob_contract.code_hash,
-							50
-						)),
-						topics: vec![],
-					},
-				]
-			);
-		}
-	});
-}
-
 #[test]
 fn storage_max_value_limit() {
 	let (wasm, code_hash) = compile_module::<Test>("storage_size").unwrap();
@@ -1492,7 +595,7 @@ fn storage_max_value_limit() {
 			vec![],
 		));
 		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
-		ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
+		ContractInfoOf::<Test>::get(&addr).unwrap();
 
 		// Call contract with allowed storage value.
 		assert_ok!(Contracts::call(
@@ -1572,7 +675,7 @@ fn cannot_self_destruct_through_draning() {
 		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
 		// Check that the BOB contract has been instantiated.
-		assert_matches!(ContractInfoOf::<Test>::get(&addr), Some(ContractInfo::Alive(_)));
+		assert_matches!(ContractInfoOf::<Test>::get(&addr), Some(_));
 
 		// Call BOB which makes it send all funds to the zero address
 		// The contract code asserts that the correct error value is returned.
@@ -1598,7 +701,7 @@ fn cannot_self_destruct_while_live() {
 		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
 		// Check that the BOB contract has been instantiated.
-		assert_matches!(ContractInfoOf::<Test>::get(&addr), Some(ContractInfo::Alive(_)));
+		assert_matches!(ContractInfoOf::<Test>::get(&addr), Some(_));
 
 		// Call BOB with input data, forcing it make a recursive call to itself to
 		// self-destruct, resulting in a trap.
@@ -1607,8 +710,8 @@ fn cannot_self_destruct_while_live() {
 			Error::<Test>::ContractTrapped,
 		);
 
-		// Check that BOB is still alive.
-		assert_matches!(ContractInfoOf::<Test>::get(&addr), Some(ContractInfo::Alive(_)));
+		// Check that BOB is still there.
+		assert_matches!(ContractInfoOf::<Test>::get(&addr), Some(_));
 	});
 }
 
@@ -1631,7 +734,7 @@ fn self_destruct_works() {
 		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
 
 		// Check that the BOB contract has been instantiated.
-		assert_matches!(ContractInfoOf::<Test>::get(&addr), Some(ContractInfo::Alive(_)));
+		assert_matches!(ContractInfoOf::<Test>::get(&addr), Some(_));
 
 		// Drop all previous events
 		initialize_block(2);
@@ -1642,30 +745,8 @@ fn self_destruct_works() {
 			Ok(_)
 		);
 
-		// The call triggers rent collection that reduces the amount of balance
-		// that remains for the beneficiary.
-		let mut events = System::events();
-		let balance_after_rent = 99_000;
-
-		// The actual figure will bounce about with wasm compiler updates as the rent depends on
-		// the compiled wasm size, so we replace it with a fixed value
-		// as rent isn't what we're testing for in this test.
-		let mut actual_balance_after_rent = 99_000;
-		if let Event::Balances(pallet_balances::Event::Transfer(_, _, ref mut actual_bal)) =
-			&mut events[1].event
-		{
-			std::mem::swap(&mut actual_balance_after_rent, actual_bal);
-			assert!(
-				(90_000..99_000).contains(&actual_balance_after_rent),
-				"expected less than 100_000: {}",
-				actual_balance_after_rent
-			);
-		} else {
-			assert!(false);
-		}
-
 		pretty_assertions::assert_eq!(
-			events,
+			System::events(),
 			vec![
 				EventRecord {
 					phase: Phase::Initialization,
@@ -1677,7 +758,7 @@ fn self_destruct_works() {
 					event: Event::Balances(pallet_balances::Event::Transfer(
 						addr.clone(),
 						DJANGO,
-						balance_after_rent
+						100_000,
 					)),
 					topics: vec![],
 				},
@@ -1699,7 +780,7 @@ fn self_destruct_works() {
 
 		// check that the beneficiary (django) got remaining balance
 		// some rent was deducted before termination
-		assert_eq!(Balances::free_balance(DJANGO), 1_000_000 + actual_balance_after_rent);
+		assert_eq!(Balances::free_balance(DJANGO), 1_000_000 + 100_000);
 	});
 }
 
@@ -1736,7 +817,7 @@ fn destroy_contract_and_transfer_funds() {
 		let addr_charlie = Contracts::contract_address(&addr_bob, &callee_code_hash, &[0x47, 0x11]);
 
 		// Check that the CHARLIE contract has been instantiated.
-		assert_matches!(ContractInfoOf::<Test>::get(&addr_charlie), Some(ContractInfo::Alive(_)));
+		assert_matches!(ContractInfoOf::<Test>::get(&addr_charlie), Some(_));
 
 		// Call BOB, which calls CHARLIE, forcing CHARLIE to self-destruct.
 		assert_ok!(Contracts::call(
@@ -2166,7 +1247,7 @@ fn lazy_removal_works() {
 		),);
 
 		let addr = Contracts::contract_address(&ALICE, &hash, &[]);
-		let info = <ContractInfoOf<Test>>::get(&addr).unwrap().get_alive().unwrap();
+		let info = <ContractInfoOf<Test>>::get(&addr).unwrap();
 		let trie = &info.child_trie_info();
 
 		// Put value into the contracts child trie
@@ -2217,14 +1298,13 @@ fn lazy_removal_partial_remove_works() {
 		),);
 
 		let addr = Contracts::contract_address(&ALICE, &hash, &[]);
-		let mut info = <ContractInfoOf<Test>>::get(&addr).unwrap().get_alive().unwrap();
+		let mut info = <ContractInfoOf<Test>>::get(&addr).unwrap();
 
 		// Put value into the contracts child trie
 		for val in &vals {
-			Storage::<Test>::write(System::block_number(), &mut info, &val.0, Some(val.2.clone()))
-				.unwrap();
+			Storage::<Test>::write(&mut info, &val.0, Some(val.2.clone())).unwrap();
 		}
-		<ContractInfoOf<Test>>::insert(&addr, ContractInfo::Alive(info.clone()));
+		<ContractInfoOf<Test>>::insert(&addr, info.clone());
 
 		// Terminate the contract
 		assert_ok!(Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, vec![]));
@@ -2288,7 +1368,7 @@ fn lazy_removal_does_no_run_on_full_block() {
 		),);
 
 		let addr = Contracts::contract_address(&ALICE, &hash, &[]);
-		let mut info = <ContractInfoOf<Test>>::get(&addr).unwrap().get_alive().unwrap();
+		let mut info = <ContractInfoOf<Test>>::get(&addr).unwrap();
 		let max_keys = 30;
 
 		// Create some storage items for the contract.
@@ -2298,10 +1378,9 @@ fn lazy_removal_does_no_run_on_full_block() {
 
 		// Put value into the contracts child trie
 		for val in &vals {
-			Storage::<Test>::write(System::block_number(), &mut info, &val.0, Some(val.2.clone()))
-				.unwrap();
+			Storage::<Test>::write(&mut info, &val.0, Some(val.2.clone())).unwrap();
 		}
-		<ContractInfoOf<Test>>::insert(&addr, ContractInfo::Alive(info.clone()));
+		<ContractInfoOf<Test>>::insert(&addr, info.clone());
 
 		// Terminate the contract
 		assert_ok!(Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, vec![]));
@@ -2346,7 +1425,11 @@ fn lazy_removal_does_no_run_on_full_block() {
 #[test]
 fn lazy_removal_does_not_use_all_weight() {
 	let (code, hash) = compile_module::<Test>("self_destruct").unwrap();
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+
+	let weight_limit = 5_000_000_000;
+	let mut ext = ExtBuilder::default().existential_deposit(50).build();
+
+	let (trie, vals, weight_per_key) = ext.execute_with(|| {
 		let subsistence = Pallet::<Test>::subsistence_threshold();
 		let _ = Balances::deposit_creating(&ALICE, 1000 * subsistence);
 
@@ -2360,8 +1443,7 @@ fn lazy_removal_does_not_use_all_weight() {
 		),);
 
 		let addr = Contracts::contract_address(&ALICE, &hash, &[]);
-		let mut info = <ContractInfoOf<Test>>::get(&addr).unwrap().get_alive().unwrap();
-		let weight_limit = 5_000_000_000;
+		let mut info = <ContractInfoOf<Test>>::get(&addr).unwrap();
 		let (weight_per_key, max_keys) = Storage::<Test>::deletion_budget(1, weight_limit);
 
 		// We create a contract with one less storage item than we can remove within the limit
@@ -2371,10 +1453,9 @@ fn lazy_removal_does_not_use_all_weight() {
 
 		// Put value into the contracts child trie
 		for val in &vals {
-			Storage::<Test>::write(System::block_number(), &mut info, &val.0, Some(val.2.clone()))
-				.unwrap();
+			Storage::<Test>::write(&mut info, &val.0, Some(val.2.clone())).unwrap();
 		}
-		<ContractInfoOf<Test>>::insert(&addr, ContractInfo::Alive(info.clone()));
+		<ContractInfoOf<Test>>::insert(&addr, info.clone());
 
 		// Terminate the contract
 		assert_ok!(Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, vec![]));
@@ -2389,6 +1470,14 @@ fn lazy_removal_does_not_use_all_weight() {
 			assert_eq!(child::get::<u32>(&trie, &blake2_256(&val.0)), Some(val.1));
 		}
 
+		(trie, vals, weight_per_key)
+	});
+
+	// The lazy removal limit only applies to the backend but not to the overlay.
+	// This commits all keys from the overlay to the backend.
+	ext.commit_all().unwrap();
+
+	ext.execute_with(|| {
 		// Run the lazy removal
 		let weight_used = Storage::<Test>::process_deletion_queue_batch(weight_limit);
 
@@ -2429,92 +1518,8 @@ fn deletion_queue_full() {
 			Error::<Test>::DeletionQueueFull,
 		);
 
-		// Contract should be alive because removal failed
-		<ContractInfoOf<Test>>::get(&addr).unwrap().get_alive().unwrap();
-
-		// make the contract ripe for eviction
-		initialize_block(5);
-
-		// eviction should fail for the same reason as termination
-		assert_err!(
-			Contracts::claim_surcharge(Origin::none(), addr.clone(), Some(ALICE)),
-			Error::<Test>::DeletionQueueFull,
-		);
-
-		// Contract should be alive because removal failed
-		<ContractInfoOf<Test>>::get(&addr).unwrap().get_alive().unwrap();
-	});
-}
-
-#[test]
-fn not_deployed_if_endowment_too_low_for_first_rent() {
-	let (wasm, code_hash) = compile_module::<Test>("set_rent").unwrap();
-
-	// The instantiation deducted the rent for one block immediately
-	let first_rent = <Test as Config>::RentFraction::get()
-		// base_deposit + deploy_set_storage (4 bytes in 1 item) - free_balance
-		.mul_ceil(80_000u32 + 40_000 + 10_000 - 30_000)
-		// blocks to rent
-		* 1;
-
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		// Create
-		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-		assert_storage_noop!(assert_err_ignore_postinfo!(
-			Contracts::instantiate_with_code(
-				Origin::signed(ALICE),
-				30_000,
-				GAS_LIMIT,
-				wasm,
-				(BalanceOf::<Test>::from(first_rent) - BalanceOf::<Test>::from(1u32)).encode(), /* rent allowance */
-				vec![],
-			),
-			Error::<Test>::NewContractNotFunded,
-		));
-		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
-		assert_matches!(ContractInfoOf::<Test>::get(&addr), None);
-	});
-}
-
-#[test]
-fn surcharge_reward_is_capped() {
-	let (wasm, code_hash) = compile_module::<Test>("set_rent").unwrap();
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-		assert_ok!(Contracts::instantiate_with_code(
-			Origin::signed(ALICE),
-			30_000,
-			GAS_LIMIT,
-			wasm,
-			<BalanceOf<Test>>::from(10_000u32).encode(), // rent allowance
-			vec![],
-		));
-		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
-		let contract = <ContractInfoOf<Test>>::get(&addr).unwrap().get_alive().unwrap();
-		let balance = Balances::free_balance(&ALICE);
-		let reward = <Test as Config>::SurchargeReward::get();
-
-		// some rent should have paid due to instantiation
-		assert_ne!(contract.rent_paid, 0);
-
-		// the reward should be parameterized sufficiently high to make this test useful
-		assert!(reward > contract.rent_paid);
-
-		// make contract eligible for eviction
-		initialize_block(40);
-
-		// this should have removed the contract
-		assert_ok!(Contracts::claim_surcharge(Origin::none(), addr.clone(), Some(ALICE)));
-
-		// this reward does not take into account the last rent payment collected during eviction
-		let capped_reward = reward.min(contract.rent_paid);
-
-		// this is smaller than the actual reward because it does not take into account the
-		// rent collected during eviction
-		assert!(Balances::free_balance(&ALICE) > balance + capped_reward);
-
-		// the full reward is not paid out because of the cap introduced by rent_paid
-		assert!(Balances::free_balance(&ALICE) < balance + reward);
+		// Contract should exist because removal failed
+		<ContractInfoOf<Test>>::get(&addr).unwrap();
 	});
 }
 
@@ -2564,18 +1569,15 @@ fn refcounter() {
 		assert_ok!(Contracts::call(Origin::signed(ALICE), addr0, 0, GAS_LIMIT, vec![]));
 		assert_refcount!(code_hash, 2);
 
-		// make remaining contracts eligible for eviction
-		initialize_block(40);
-
-		// remove one of them
-		assert_ok!(Contracts::claim_surcharge(Origin::none(), addr1, Some(ALICE)));
+		// remove another one
+		assert_ok!(Contracts::call(Origin::signed(ALICE), addr1, 0, GAS_LIMIT, vec![]));
 		assert_refcount!(code_hash, 1);
 
 		// Pristine code should still be there
 		crate::PristineCode::<Test>::get(code_hash).unwrap();
 
 		// remove the last contract
-		assert_ok!(Contracts::claim_surcharge(Origin::none(), addr2, Some(ALICE)));
+		assert_ok!(Contracts::call(Origin::signed(ALICE), addr2, 0, GAS_LIMIT, vec![]));
 		assert_refcount!(code_hash, 0);
 
 		// all code should be gone
diff --git a/frame/contracts/src/wasm/code_cache.rs b/frame/contracts/src/wasm/code_cache.rs
index 0a20485cab13..08a7449683ed 100644
--- a/frame/contracts/src/wasm/code_cache.rs
+++ b/frame/contracts/src/wasm/code_cache.rs
@@ -64,22 +64,6 @@ where
 	});
 }
 
-/// Decrement the refcount and store.
-///
-/// Removes the code instead of storing it when the refcount drops to zero.
-pub fn store_decremented<T: Config>(mut prefab_module: PrefabWasmModule<T>)
-where
-	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
-{
-	prefab_module.refcount = prefab_module.refcount.saturating_sub(1);
-	if prefab_module.refcount > 0 {
-		<CodeStorage<T>>::insert(prefab_module.code_hash, prefab_module);
-	} else {
-		<CodeStorage<T>>::remove(prefab_module.code_hash);
-		finish_removal::<T>(prefab_module.code_hash);
-	}
-}
-
 /// Increment the refcount of a code in-storage by one.
 pub fn increment_refcount<T: Config>(
 	code_hash: CodeHash<T>,
diff --git a/frame/contracts/src/wasm/mod.rs b/frame/contracts/src/wasm/mod.rs
index f9854bbbdc9b..843c78b73ca8 100644
--- a/frame/contracts/src/wasm/mod.rs
+++ b/frame/contracts/src/wasm/mod.rs
@@ -61,7 +61,7 @@ pub struct PrefabWasmModule<T: Config> {
 	/// The maximum memory size of a contract's sandbox.
 	#[codec(compact)]
 	maximum: u32,
-	/// The number of alive contracts that use this as their contract code.
+	/// The number of contracts that use this as their contract code.
 	///
 	/// If this number drops to zero this module is removed from storage.
 	#[codec(compact)]
@@ -164,10 +164,6 @@ where
 		code_cache::load(code_hash, None)
 	}
 
-	fn drop_from_storage(self) {
-		code_cache::store_decremented(self);
-	}
-
 	fn add_user(code_hash: CodeHash<T>, gas_meter: &mut GasMeter<T>) -> Result<(), DispatchError> {
 		code_cache::increment_refcount::<T>(code_hash, gas_meter)
 	}
@@ -240,11 +236,9 @@ mod tests {
 	use super::*;
 	use crate::{
 		exec::{
-			AccountIdOf, BlockNumberOf, ErrorOrigin, ExecError, Executable, Ext, RentParams,
-			SeedOf, StorageKey,
+			AccountIdOf, BlockNumberOf, ErrorOrigin, ExecError, Executable, Ext, SeedOf, StorageKey,
 		},
 		gas::GasMeter,
-		rent::RentStatus,
 		tests::{Call, Test, ALICE, BOB},
 		BalanceOf, CodeHash, Error, Pallet as Contracts,
 	};
@@ -261,14 +255,6 @@ mod tests {
 	use sp_runtime::DispatchError;
 	use std::{borrow::BorrowMut, cell::RefCell, collections::HashMap};
 
-	#[derive(Debug, PartialEq, Eq)]
-	struct RestoreEntry {
-		dest: AccountIdOf<Test>,
-		code_hash: H256,
-		rent_allowance: u64,
-		delta: Vec<StorageKey>,
-	}
-
 	#[derive(Debug, PartialEq, Eq)]
 	struct InstantiateEntry {
 		code_hash: H256,
@@ -299,17 +285,14 @@ mod tests {
 
 	pub struct MockExt {
 		storage: HashMap<StorageKey, Vec<u8>>,
-		rent_allowance: u64,
 		instantiates: Vec<InstantiateEntry>,
 		terminations: Vec<TerminationEntry>,
 		calls: Vec<CallEntry>,
 		transfers: Vec<TransferEntry>,
-		restores: Vec<RestoreEntry>,
 		// (topics, data)
 		events: Vec<(Vec<H256>, Vec<u8>)>,
 		runtime_calls: RefCell<Vec<Call>>,
 		schedule: Schedule<Test>,
-		rent_params: RentParams<Test>,
 		gas_meter: GasMeter<Test>,
 		debug_buffer: Vec<u8>,
 	}
@@ -323,16 +306,13 @@ mod tests {
 		fn default() -> Self {
 			Self {
 				storage: Default::default(),
-				rent_allowance: Default::default(),
 				instantiates: Default::default(),
 				terminations: Default::default(),
 				calls: Default::default(),
 				transfers: Default::default(),
-				restores: Default::default(),
 				events: Default::default(),
 				runtime_calls: Default::default(),
 				schedule: Default::default(),
-				rent_params: Default::default(),
 				gas_meter: GasMeter::new(10_000_000_000),
 				debug_buffer: Default::default(),
 			}
@@ -381,16 +361,6 @@ mod tests {
 			self.terminations.push(TerminationEntry { beneficiary: beneficiary.clone() });
 			Ok(())
 		}
-		fn restore_to(
-			&mut self,
-			dest: AccountIdOf<Self::T>,
-			code_hash: H256,
-			rent_allowance: u64,
-			delta: Vec<StorageKey>,
-		) -> Result<(), DispatchError> {
-			self.restores.push(RestoreEntry { dest, code_hash, rent_allowance, delta });
-			Ok(())
-		}
 		fn get_storage(&mut self, key: &StorageKey) -> Option<Vec<u8>> {
 			self.storage.get(key).cloned()
 		}
@@ -416,7 +386,7 @@ mod tests {
 		fn minimum_balance(&self) -> u64 {
 			666
 		}
-		fn tombstone_deposit(&self) -> u64 {
+		fn contract_deposit(&self) -> u64 {
 			16
 		}
 		fn random(&self, subject: &[u8]) -> (SeedOf<Self::T>, BlockNumberOf<Self::T>) {
@@ -425,12 +395,6 @@ mod tests {
 		fn deposit_event(&mut self, topics: Vec<H256>, data: Vec<u8>) {
 			self.events.push((topics, data))
 		}
-		fn set_rent_allowance(&mut self, rent_allowance: u64) {
-			self.rent_allowance = rent_allowance;
-		}
-		fn rent_allowance(&mut self) -> u64 {
-			self.rent_allowance
-		}
 		fn block_number(&self) -> u64 {
 			121
 		}
@@ -443,12 +407,6 @@ mod tests {
 		fn schedule(&self) -> &Schedule<Self::T> {
 			&self.schedule
 		}
-		fn rent_params(&self) -> &RentParams<Self::T> {
-			&self.rent_params
-		}
-		fn rent_status(&mut self, _at_refcount: u32) -> RentStatus<Self::T> {
-			Default::default()
-		}
 		fn gas_meter(&mut self) -> &mut GasMeter<Self::T> {
 			&mut self.gas_meter
 		}
@@ -1380,9 +1338,9 @@ mod tests {
 		assert_ok!(execute(CODE_MINIMUM_BALANCE, vec![], MockExt::default()));
 	}
 
-	const CODE_TOMBSTONE_DEPOSIT: &str = r#"
+	const CODE_CONTRACT_DEPOSIT: &str = r#"
 (module
-	(import "seal0" "seal_tombstone_deposit" (func $seal_tombstone_deposit (param i32 i32)))
+	(import "seal0" "seal_contract_deposit" (func $seal_contract_deposit (param i32 i32)))
 	(import "env" "memory" (memory 1 1))
 
 	;; size of our buffer is 32 bytes
@@ -1398,7 +1356,7 @@ mod tests {
 	)
 
 	(func (export "call")
-		(call $seal_tombstone_deposit (i32.const 0) (i32.const 32))
+		(call $seal_contract_deposit (i32.const 0) (i32.const 32))
 
 		;; assert len == 8
 		(call $assert
@@ -1421,8 +1379,8 @@ mod tests {
 "#;
 
 	#[test]
-	fn tombstone_deposit() {
-		assert_ok!(execute(CODE_TOMBSTONE_DEPOSIT, vec![], MockExt::default()));
+	fn contract_deposit() {
+		assert_ok!(execute(CODE_CONTRACT_DEPOSIT, vec![], MockExt::default()));
 	}
 
 	const CODE_RANDOM: &str = r#"
@@ -1856,81 +1814,6 @@ mod tests {
 		assert_ok!(result);
 	}
 
-	#[test]
-	#[cfg(feature = "unstable-interface")]
-	fn rent_params_work() {
-		const CODE_RENT_PARAMS: &str = r#"
-(module
-	(import "__unstable__" "seal_rent_params" (func $seal_rent_params (param i32 i32)))
-	(import "seal0" "seal_return" (func $seal_return (param i32 i32 i32)))
-	(import "env" "memory" (memory 1 1))
-
-	;; [0, 4) buffer size = 128 bytes
-	(data (i32.const 0) "\80")
-
-	;; [4; inf) buffer where the result is copied
-
-	(func (export "call")
-		;; Load the rent params into memory
-		(call $seal_rent_params
-			(i32.const 4)		;; Pointer to the output buffer
-			(i32.const 0)		;; Pointer to the size of the buffer
-		)
-
-		;; Return the contents of the buffer
-		(call $seal_return
-			(i32.const 0)				;; return flags
-			(i32.const 4)				;; buffer pointer
-			(i32.load (i32.const 0))	;; buffer size
-		)
-	)
-
-	(func (export "deploy"))
-)
-"#;
-		let output = execute(CODE_RENT_PARAMS, vec![], MockExt::default()).unwrap();
-		let rent_params = Bytes(<RentParams<Test>>::default().encode());
-		assert_eq!(output, ExecReturnValue { flags: ReturnFlags::empty(), data: rent_params });
-	}
-
-	#[test]
-	#[cfg(feature = "unstable-interface")]
-	fn rent_status_works() {
-		const CODE_RENT_STATUS: &str = r#"
-(module
-	(import "__unstable__" "seal_rent_status" (func $seal_rent_status (param i32 i32 i32)))
-	(import "seal0" "seal_return" (func $seal_return (param i32 i32 i32)))
-	(import "env" "memory" (memory 1 1))
-
-	;; [0, 4) buffer size = 128 bytes
-	(data (i32.const 0) "\80")
-
-	;; [4; inf) buffer where the result is copied
-
-	(func (export "call")
-		;; Load the rent params into memory
-		(call $seal_rent_status
-			(i32.const 1)		;; at_refcount
-			(i32.const 4)		;; Pointer to the output buffer
-			(i32.const 0)		;; Pointer to the size of the buffer
-		)
-
-		;; Return the contents of the buffer
-		(call $seal_return
-			(i32.const 0)				;; return flags
-			(i32.const 4)				;; buffer pointer
-			(i32.load (i32.const 0))	;; buffer size
-		)
-	)
-
-	(func (export "deploy"))
-)
-"#;
-		let output = execute(CODE_RENT_STATUS, vec![], MockExt::default()).unwrap();
-		let rent_status = Bytes(<RentStatus<Test>>::default().encode());
-		assert_eq!(output, ExecReturnValue { flags: ReturnFlags::empty(), data: rent_status });
-	}
-
 	#[test]
 	fn debug_message_works() {
 		const CODE_DEBUG_MESSAGE: &str = r#"
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index d238d3afcb2f..4612cc131faf 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -31,6 +31,7 @@ use pallet_contracts_primitives::{ExecReturnValue, ReturnFlags};
 use pwasm_utils::parity_wasm::elements::ValueType;
 use sp_core::{crypto::UncheckedFrom, Bytes};
 use sp_io::hashing::{blake2_128, blake2_256, keccak_256, sha2_256};
+use sp_runtime::traits::Bounded;
 use sp_std::prelude::*;
 
 /// Every error that can be returned to a contract when it calls any of the host functions.
@@ -64,8 +65,7 @@ pub enum ReturnCode {
 	NewContractNotFunded = 6,
 	/// No code could be found at the supplied code hash.
 	CodeNotFound = 7,
-	/// The contract that was called is either no contract at all (a plain account)
-	/// or is a tombstone.
+	/// The contract that was called is no contract (a plain account).
 	NotCallable = 8,
 	/// The call to `seal_debug_message` had no effect because debug message
 	/// recording was disabled.
@@ -121,8 +121,6 @@ pub enum TrapReason {
 	/// Signals that a trap was generated in response to a successful call to the
 	/// `seal_terminate` host function.
 	Termination,
-	/// Signals that a trap was generated because of a successful restoration.
-	Restoration,
 }
 
 impl<T: Into<DispatchError>> From<T> for TrapReason {
@@ -149,10 +147,8 @@ pub enum RuntimeCosts {
 	ValueTransferred,
 	/// Weight of calling `seal_minimum_balance`.
 	MinimumBalance,
-	/// Weight of calling `seal_tombstone_deposit`.
-	TombstoneDeposit,
-	/// Weight of calling `seal_rent_allowance`.
-	RentAllowance,
+	/// Weight of calling `seal_contract_deposit`.
+	ContractDeposit,
 	/// Weight of calling `seal_block_number`.
 	BlockNumber,
 	/// Weight of calling `seal_now`.
@@ -167,16 +163,12 @@ pub enum RuntimeCosts {
 	Return(u32),
 	/// Weight of calling `seal_terminate`.
 	Terminate,
-	/// Weight of calling `seal_restore_to` per number of supplied delta entries.
-	RestoreTo(u32),
 	/// Weight of calling `seal_random`. It includes the weight for copying the subject.
 	Random,
 	/// Weight of calling `seal_deposit_event` with the given number of topics and event size.
 	DepositEvent { num_topic: u32, len: u32 },
 	/// Weight of calling `seal_debug_message`.
 	DebugMessage,
-	/// Weight of calling `seal_set_rent_allowance`.
-	SetRentAllowance,
 	/// Weight of calling `seal_set_storage` for the given storage item size.
 	SetStorage(u32),
 	/// Weight of calling `seal_clear_storage`.
@@ -232,8 +224,7 @@ impl RuntimeCosts {
 			Balance => s.balance,
 			ValueTransferred => s.value_transferred,
 			MinimumBalance => s.minimum_balance,
-			TombstoneDeposit => s.tombstone_deposit,
-			RentAllowance => s.rent_allowance,
+			ContractDeposit => s.contract_deposit,
 			BlockNumber => s.block_number,
 			Now => s.now,
 			WeightToFee => s.weight_to_fee,
@@ -241,15 +232,12 @@ impl RuntimeCosts {
 			InputCopyOut(len) => s.input_per_byte.saturating_mul(len.into()),
 			Return(len) => s.r#return.saturating_add(s.return_per_byte.saturating_mul(len.into())),
 			Terminate => s.terminate,
-			RestoreTo(delta) =>
-				s.restore_to.saturating_add(s.restore_to_per_delta.saturating_mul(delta.into())),
 			Random => s.random,
 			DepositEvent { num_topic, len } => s
 				.deposit_event
 				.saturating_add(s.deposit_event_per_topic.saturating_mul(num_topic.into()))
 				.saturating_add(s.deposit_event_per_byte.saturating_mul(len.into())),
 			DebugMessage => s.debug_message,
-			SetRentAllowance => s.set_rent_allowance,
 			SetStorage(len) =>
 				s.set_storage.saturating_add(s.set_storage_per_byte.saturating_mul(len.into())),
 			ClearStorage => s.clear_storage,
@@ -395,8 +383,6 @@ where
 				},
 				TrapReason::Termination =>
 					Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: Bytes(Vec::new()) }),
-				TrapReason::Restoration =>
-					Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: Bytes(Vec::new()) }),
 				TrapReason::SupervisorError(error) => Err(error)?,
 			}
 		}
@@ -617,15 +603,13 @@ where
 		let not_funded = Error::<E::T>::NewContractNotFunded.into();
 		let no_code = Error::<E::T>::CodeNotFound.into();
 		let not_found = Error::<E::T>::ContractNotFound.into();
-		let is_tombstone = Error::<E::T>::ContractIsTombstone.into();
-		let rent_not_paid = Error::<E::T>::RentNotPaid.into();
 
 		match from {
 			x if x == below_sub => Ok(BelowSubsistenceThreshold),
 			x if x == transfer_failed => Ok(TransferFailed),
 			x if x == not_funded => Ok(NewContractNotFunded),
 			x if x == no_code => Ok(CodeNotFound),
-			x if (x == not_found || x == is_tombstone || x == rent_not_paid) => Ok(NotCallable),
+			x if x == not_found => Ok(NotCallable),
 			err => Err(err),
 		}
 	}
@@ -737,49 +721,6 @@ where
 		self.ext.terminate(&beneficiary)?;
 		Err(TrapReason::Termination)
 	}
-
-	fn restore_to(
-		&mut self,
-		dest_ptr: u32,
-		code_hash_ptr: u32,
-		rent_allowance_ptr: u32,
-		delta_ptr: u32,
-		delta_count: u32,
-	) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::RestoreTo(delta_count))?;
-		let dest: <<E as Ext>::T as frame_system::Config>::AccountId =
-			self.read_sandbox_memory_as(dest_ptr)?;
-		let code_hash: CodeHash<<E as Ext>::T> = self.read_sandbox_memory_as(code_hash_ptr)?;
-		let rent_allowance: BalanceOf<<E as Ext>::T> =
-			self.read_sandbox_memory_as(rent_allowance_ptr)?;
-		let delta = {
-			const KEY_SIZE: usize = 32;
-
-			// We can eagerly allocate because we charged for the complete delta count already
-			// We still need to make sure that the allocation isn't larger than the memory
-			// allocator can handle.
-			let max_memory = self.ext.schedule().limits.max_memory_size();
-			ensure!(
-				delta_count.saturating_mul(KEY_SIZE as u32) <= max_memory,
-				Error::<E::T>::OutOfBounds,
-			);
-			let mut delta = vec![[0; KEY_SIZE]; delta_count as usize];
-			let mut key_ptr = delta_ptr;
-
-			for i in 0..delta_count {
-				// Read the delta into the provided buffer
-				// This cannot panic because of the loop condition
-				self.read_sandbox_memory_into_buf(key_ptr, &mut delta[i as usize])?;
-
-				// Offset key_ptr to the next element.
-				key_ptr = key_ptr.checked_add(KEY_SIZE as u32).ok_or(Error::<E::T>::OutOfBounds)?;
-			}
-
-			delta
-		};
-		self.ext.restore_to(dest, code_hash, rent_allowance, delta)?;
-		Err(TrapReason::Restoration)
-	}
 }
 
 // ***********************************************************
@@ -1369,7 +1310,20 @@ define_env!(Env, <E: Ext>,
 		)?)
 	},
 
-	// Stores the tombstone deposit into the supplied buffer.
+	// Stores the contract deposit into the supplied buffer.
+	//
+	// # Deprecation
+	//
+	// This is equivalent to calling `seal_contract_deposit` and only exists for backwards
+	// compatibility. See that function for documentation.
+	[seal0] seal_tombstone_deposit(ctx, out_ptr: u32, out_len_ptr: u32) => {
+		ctx.charge_gas(RuntimeCosts::ContractDeposit)?;
+		Ok(ctx.write_sandbox_output(
+			out_ptr, out_len_ptr, &ctx.ext.contract_deposit().encode(), false, already_charged
+		)?)
+	},
+
+	// Stores the contract deposit into the supplied buffer.
 	//
 	// The value is stored to linear memory at the address pointed to by `out_ptr`.
 	// `out_len_ptr` must point to a u32 value that describes the available space at
@@ -1380,95 +1334,53 @@ define_env!(Env, <E: Ext>,
 	//
 	// # Note
 	//
-	// The tombstone deposit is on top of the existential deposit. So in order for
-	// a contract to leave a tombstone the balance of the contract must not go
-	// below the sum of existential deposit and the tombstone deposit. The sum
-	// is commonly referred as subsistence threshold in code.
-	[seal0] seal_tombstone_deposit(ctx, out_ptr: u32, out_len_ptr: u32) => {
-		ctx.charge_gas(RuntimeCosts::TombstoneDeposit)?;
+	// The contract deposit is on top of the existential deposit. The sum
+	// is commonly referred as subsistence threshold in code. No contract initiated
+	// balance transfer can go below this threshold.
+	[seal0] seal_contract_deposit(ctx, out_ptr: u32, out_len_ptr: u32) => {
+		ctx.charge_gas(RuntimeCosts::ContractDeposit)?;
 		Ok(ctx.write_sandbox_output(
-			out_ptr, out_len_ptr, &ctx.ext.tombstone_deposit().encode(), false, already_charged
+			out_ptr, out_len_ptr, &ctx.ext.contract_deposit().encode(), false, already_charged
 		)?)
 	},
 
-	// Try to restore the given destination contract sacrificing the caller.
-	//
-	// # Deprecation
-	//
-	// This is equivalent to calling the newer version of this function. The newer version
-	// drops the now unnecessary length fields.
+	// Was used to restore the given destination contract sacrificing the caller.
 	//
 	// # Note
 	//
-	// The values `_dest_len`, `_code_hash_len` and `_rent_allowance_len` are ignored because
-	// the encoded sizes of those types are fixed through `[`MaxEncodedLen`]. The fields
-	// exist for backwards compatibility. Consider switching to the newest version of this function.
+	// The state rent functionality was removed. This is stub only exists for
+	// backwards compatiblity
 	[seal0] seal_restore_to(
 		ctx,
-		dest_ptr: u32,
+		_dest_ptr: u32,
 		_dest_len: u32,
-		code_hash_ptr: u32,
+		_code_hash_ptr: u32,
 		_code_hash_len: u32,
-		rent_allowance_ptr: u32,
+		_rent_allowance_ptr: u32,
 		_rent_allowance_len: u32,
-		delta_ptr: u32,
-		delta_count: u32
+		_delta_ptr: u32,
+		_delta_count: u32
 	) => {
-		ctx.restore_to(
-			dest_ptr,
-			code_hash_ptr,
-			rent_allowance_ptr,
-			delta_ptr,
-			delta_count,
-		)
+		ctx.charge_gas(RuntimeCosts::DebugMessage)?;
+		Ok(())
 	},
 
-	// Try to restore the given destination contract sacrificing the caller.
-	//
-	// This function will compute a tombstone hash from the caller's storage and the given code hash
-	// and if the hash matches the hash found in the tombstone at the specified address - kill
-	// the caller contract and restore the destination contract and set the specified `rent_allowance`.
-	// All caller's funds are transferred to the destination.
-	//
-	// The tombstone hash is derived as `hash(code_hash, storage_root_hash)`. In order to match
-	// this hash to its own hash the restorer must make its storage equal to the one of the
-	// evicted destination contract. In order to allow for additional storage items in the
-	// restoring contract a delta can be specified to this function. All keys specified as
-	// delta are disregarded when calculating the storage root hash.
+	// Was used to restore the given destination contract sacrificing the caller.
 	//
-	// On success, the destination contract is restored. This function is diverging and
-	// stops execution even on success.
-	//
-	// - `dest_ptr` - the pointer to a buffer that encodes `T::AccountId`
-	//    with the address of the to be restored contract.
-	// - `code_hash_ptr` - the pointer to a buffer that encodes
-	//    a code hash of the to be restored contract.
-	// - `rent_allowance_ptr`  - the pointer to a buffer that
-	//    encodes the rent allowance that must be set in the case of successful restoration.
-	// - `delta_ptr` is the pointer to the start of a buffer that has `delta_count` storage keys
-	//    laid out sequentially.
-	//
-	// # Traps
+	// # Note
 	//
-	// - There is no tombstone at the destination address.
-	// - Tombstone hashes do not match.
-	// - The calling contract is already present on the call stack.
-	// - The supplied code_hash does not exist on-chain.
+	// The state rent functionality was removed. This is stub only exists for
+	// backwards compatiblity
 	[seal1] seal_restore_to(
 		ctx,
-		dest_ptr: u32,
-		code_hash_ptr: u32,
-		rent_allowance_ptr: u32,
-		delta_ptr: u32,
-		delta_count: u32
+		_dest_ptr: u32,
+		_code_hash_ptr: u32,
+		_rent_allowance_ptr: u32,
+		_delta_ptr: u32,
+		_delta_count: u32
 	) => {
-		ctx.restore_to(
-			dest_ptr,
-			code_hash_ptr,
-			rent_allowance_ptr,
-			delta_ptr,
-			delta_count,
-		)
+		ctx.charge_gas(RuntimeCosts::DebugMessage)?;
+		Ok(())
 	},
 
 	// Deposit a contract event with the data buffer and optional list of topics. There is a limit
@@ -1536,47 +1448,37 @@ define_env!(Env, <E: Ext>,
 		Ok(())
 	},
 
-	// Set rent allowance of the contract.
-	//
-	// # Deprecation
-	//
-	// This is equivalent to calling the newer version of this function. The newer version
-	// drops the now unnecessary length fields.
+	// Was used to set rent allowance of the contract.
 	//
 	// # Note
 	//
-	// The value `_VALUE_len` is ignored because the encoded sizes
-	// this type is fixed through `[`MaxEncodedLen`]. The field exist for backwards
-	// compatibility. Consider switching to the newest version of this function.
-	[seal0] seal_set_rent_allowance(ctx, value_ptr: u32, _value_len: u32) => {
-		ctx.charge_gas(RuntimeCosts::SetRentAllowance)?;
-		let value: BalanceOf<<E as Ext>::T> = ctx.read_sandbox_memory_as(value_ptr)?;
-		ctx.ext.set_rent_allowance(value);
+	// The state rent functionality was removed. This is stub only exists for
+	// backwards compatiblity.
+	[seal0] seal_set_rent_allowance(ctx, _value_ptr: u32, _value_len: u32) => {
+		ctx.charge_gas(RuntimeCosts::DebugMessage)?;
 		Ok(())
 	},
 
-	// Set rent allowance of the contract.
+	// Was used to set rent allowance of the contract.
 	//
-	// - value_ptr: a pointer to the buffer with value, how much to allow for rent
-	//   Should be decodable as a `T::Balance`. Traps otherwise.
-	[seal1] seal_set_rent_allowance(ctx, value_ptr: u32) => {
-		ctx.charge_gas(RuntimeCosts::SetRentAllowance)?;
-		let value: BalanceOf<<E as Ext>::T> = ctx.read_sandbox_memory_as(value_ptr)?;
-		ctx.ext.set_rent_allowance(value);
+	// # Note
+	//
+	// The state rent functionality was removed. This is stub only exists for
+	// backwards compatiblity.
+	[seal1] seal_set_rent_allowance(ctx, _value_ptr: u32) => {
+		ctx.charge_gas(RuntimeCosts::DebugMessage)?;
 		Ok(())
 	},
 
-	// Stores the rent allowance into the supplied buffer.
+	// Was used to store the rent allowance into the supplied buffer.
 	//
-	// The value is stored to linear memory at the address pointed to by `out_ptr`.
-	// `out_len_ptr` must point to a u32 value that describes the available space at
-	// `out_ptr`. This call overwrites it with the size of the value. If the available
-	// space at `out_ptr` is less than the size of the value a trap is triggered.
+	// # Note
 	//
-	// The data is encoded as T::Balance.
+	// The state rent functionality was removed. This is stub only exists for
+	// backwards compatiblity.
 	[seal0] seal_rent_allowance(ctx, out_ptr: u32, out_len_ptr: u32) => {
-		ctx.charge_gas(RuntimeCosts::RentAllowance)?;
-		let rent_allowance = ctx.ext.rent_allowance().encode();
+		ctx.charge_gas(RuntimeCosts::Balance)?;
+		let rent_allowance = <BalanceOf<E::T>>::max_value().encode();
 		Ok(ctx.write_sandbox_output(
 			out_ptr, out_len_ptr, &rent_allowance, false, already_charged
 		)?)
@@ -1757,55 +1659,6 @@ define_env!(Env, <E: Ext>,
 		Ok(ReturnCode::LoggingDisabled)
 	},
 
-	// Stores the rent params into the supplied buffer.
-	//
-	// The value is stored to linear memory at the address pointed to by `out_ptr`.
-	// `out_len_ptr` must point to a u32 value that describes the available space at
-	// `out_ptr`. This call overwrites it with the size of the value. If the available
-	// space at `out_ptr` is less than the size of the value a trap is triggered.
-	//
-	// The data is encoded as [`crate::exec::RentParams`].
-	//
-	// # Note
-	//
-	// The returned information was collected and cached when the current contract call
-	// started execution. Any change to those values that happens due to actions of the
-	// current call or contracts that are called by this contract are not considered.
-	//
-	// # Unstable
-	//
-	// This function is unstable and subject to change (or removal) in the future. Do not
-	// deploy a contract using it to a production chain.
-	[__unstable__] seal_rent_params(ctx, out_ptr: u32, out_len_ptr: u32) => {
-		Ok(ctx.write_sandbox_output(
-			out_ptr, out_len_ptr, &ctx.ext.rent_params().encode(), false, already_charged
-		)?)
-	},
-
-	// Stores the rent status into the supplied buffer.
-	//
-	// The value is stored to linear memory at the address pointed to by `out_ptr`.
-	// `out_len_ptr` must point to a u32 value that describes the available space at
-	// `out_ptr`. This call overwrites it with the size of the value. If the available
-	// space at `out_ptr` is less than the size of the value a trap is triggered.
-	//
-	// The data is encoded as [`crate::rent::RentStatus`].
-	//
-	// # Parameters
-	//
-	// - `at_refcount`: The refcount assumed for the returned `custom_refcount_*` fields
-	//
-	// # Unstable
-	//
-	// This function is unstable and subject to change (or removal) in the future. Do not
-	// deploy a contract using it to a production chain.
-	[__unstable__] seal_rent_status(ctx, at_refcount: u32, out_ptr: u32, out_len_ptr: u32) => {
-		let rent_status = ctx.ext.rent_status(at_refcount).encode();
-		Ok(ctx.write_sandbox_output(
-			out_ptr, out_len_ptr, &rent_status, false, already_charged
-		)?)
-	},
-
 	// Call some dispatchable of the runtime.
 	//
 	// This function decodes the passed in data as the overarching `Call` type of the
diff --git a/frame/contracts/src/weights.rs b/frame/contracts/src/weights.rs
index b7e711a37aa2..75e5a846063d 100644
--- a/frame/contracts/src/weights.rs
+++ b/frame/contracts/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_contracts
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2021-08-20, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-09-06, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -54,7 +54,6 @@ pub trait WeightInfo {
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight;
 	fn instantiate(s: u32, ) -> Weight;
 	fn call() -> Weight;
-	fn claim_surcharge(c: u32, ) -> Weight;
 	fn seal_caller(r: u32, ) -> Weight;
 	fn seal_address(r: u32, ) -> Weight;
 	fn seal_gas_left(r: u32, ) -> Weight;
@@ -62,7 +61,6 @@ pub trait WeightInfo {
 	fn seal_value_transferred(r: u32, ) -> Weight;
 	fn seal_minimum_balance(r: u32, ) -> Weight;
 	fn seal_tombstone_deposit(r: u32, ) -> Weight;
-	fn seal_rent_allowance(r: u32, ) -> Weight;
 	fn seal_block_number(r: u32, ) -> Weight;
 	fn seal_now(r: u32, ) -> Weight;
 	fn seal_weight_to_fee(r: u32, ) -> Weight;
@@ -72,12 +70,9 @@ pub trait WeightInfo {
 	fn seal_return(r: u32, ) -> Weight;
 	fn seal_return_per_kb(n: u32, ) -> Weight;
 	fn seal_terminate(r: u32, ) -> Weight;
-	fn seal_restore_to(r: u32, ) -> Weight;
-	fn seal_restore_to_per_delta(d: u32, ) -> Weight;
 	fn seal_random(r: u32, ) -> Weight;
 	fn seal_deposit_event(r: u32, ) -> Weight;
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight;
-	fn seal_set_rent_allowance(r: u32, ) -> Weight;
 	fn seal_debug_message(r: u32, ) -> Weight;
 	fn seal_set_storage(r: u32, ) -> Weight;
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight;
@@ -155,499 +150,353 @@ pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts DeletionQueue (r:1 w:0)
 	fn on_initialize() -> Weight {
-		(3_227_000 as Weight)
+		(3_259_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 3_000
-			.saturating_add((2_273_000 as Weight).saturating_mul(k as Weight))
+			.saturating_add((2_197_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	// Storage: Contracts DeletionQueue (r:1 w:0)
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
-		(50_365_000 as Weight)
-			// Standard Error: 7_000
-			.saturating_add((39_799_000 as Weight).saturating_mul(q as Weight))
+		(81_940_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((354_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts PristineCode (r:1 w:0)
 	// Storage: Contracts CodeStorage (r:0 w:1)
 	fn instrument(c: u32, ) -> Weight {
-		(40_033_000 as Weight)
-			// Standard Error: 109_000
-			.saturating_add((76_424_000 as Weight).saturating_mul(c as Weight))
+		(32_129_000 as Weight)
+			// Standard Error: 95_000
+			.saturating_add((65_706_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	fn code_load(c: u32, ) -> Weight {
-		(6_675_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_668_000 as Weight).saturating_mul(c as Weight))
+		(6_215_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((1_430_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 	}
 	// Storage: Contracts CodeStorage (r:1 w:1)
 	fn code_refcount(c: u32, ) -> Weight {
-		(10_560_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((2_704_000 as Weight).saturating_mul(c as Weight))
+		(10_499_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_278_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts AccountCounter (r:1 w:0)
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
-	// Storage: System Account (r:1 w:1)
 	// Storage: Timestamp Now (r:1 w:0)
+	// Storage: System Account (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:1)
 	// Storage: Contracts PristineCode (r:0 w:1)
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight {
-		(479_578_000 as Weight)
-			// Standard Error: 166_000
-			.saturating_add((187_167_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 10_000
-			.saturating_add((2_450_000 as Weight).saturating_mul(s as Weight))
+		(473_826_000 as Weight)
+			// Standard Error: 133_000
+			.saturating_add((171_504_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 8_000
+			.saturating_add((2_161_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	// Storage: Contracts CodeStorage (r:1 w:1)
 	// Storage: Contracts AccountCounter (r:1 w:0)
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
-	// Storage: System Account (r:1 w:1)
 	// Storage: Timestamp Now (r:1 w:0)
+	// Storage: System Account (r:1 w:1)
 	fn instantiate(s: u32, ) -> Weight {
-		(237_664_000 as Weight)
+		(215_899_000 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((2_249_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((1_991_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:1)
 	// Storage: Timestamp Now (r:1 w:0)
+	// Storage: System Account (r:1 w:1)
 	fn call() -> Weight {
-		(223_426_000 as Weight)
+		(176_744_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
-	// Storage: Contracts CodeStorage (r:1 w:1)
-	// Storage: System Account (r:1 w:1)
-	// Storage: Contracts DeletionQueue (r:1 w:1)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743acafbc76efb655f52a2] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a45e3386f1a83f00b28] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a96e4ef3ab80b5c3a5f] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a3d24875569a319056f] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a64ad561e495f01c762] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a3b624bb134596373c1] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743aadbe519bace97698b4] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a7e33b1a343f33065bd] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a626f271ae6979bbffe] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a7ce585fd4ae98b830b] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ac889c022f51a43b527] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a4f6353225ab0496d48] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ab578892d355575c3e4] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a02b4c8040b81dc785d] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a8d13a70c1e380292ea] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a2e4d2fc709d989c778] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a6df81b28bd3ec99a3a] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743af54f74589657eac0fd] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a1849a3092175db4a2f] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a4f05ecdc6c2c42c9fb] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a24c3c0036dfb085bb9] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a44d725ac77836eb10b] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ad04db6c692ab73d90d] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a873009d6cdb99c5a4c] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743aa958795fbfc2b5fa41] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a205b6f659d219c8cbc] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ade54b3bc3d3cdb1aeb] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a538b748c1c5f92be98] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ad50de2ad89aaa1e067] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a0576917f19ecaf2a3f] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a5b44bd2793555a71e7] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743acc874645f7bbf62e62] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a7ae1b958a847e98bc8] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a396ae49d5311ee6bd1] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743aa5d56999a2ebd1c4c9] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a72f370c054587f81a5] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a3a32934e459acb2ceb] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ac10fd56a5e084aae1c] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a2ba8e27fcdbc3ab4f2] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a4a75b804eec44f3f2a] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a64ebb181fc616bfdb4] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a9aaf019a62fd907a8a] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a19730285453eb7702a] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743acced4c24d0ebee7c29] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ae458a57da6a2a6280a] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a83b9f09b407c57d07e] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743acc9fc095b3aaaef755] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a587ccf84053d9950ff] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a13d53bcf137f3784e9] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743abb79d34fb381ebd7c1] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a935ea70a3e699d23b6] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a109fcd63aefdae75a1] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743abca8d937a761f2eb46] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a314c97ff9e866a835b] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a691e4b5f67da0dea8e] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a127c680b864ee61620] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a148df8dfd47b4493f3] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a57c606ebe91374fcee] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743acec20322704f7bec44] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743abf6a27e09c6d0a9f0f] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ae2e8bdcf5850e20836] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ab8399645bc39338a47] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a658619de90cae5dbe1] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743aeb9db1dfeed3a7b47b] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743abdc9db5edf43ffcb0d] (r:1 w:0)
-	fn claim_surcharge(c: u32, ) -> Weight {
-		(130_759_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((2_850_000 as Weight).saturating_mul(c as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
-			.saturating_add(T::DbWeight::get().writes(4 as Weight))
-	}
-	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_caller(r: u32, ) -> Weight {
-		(492_555_000 as Weight)
-			// Standard Error: 174_000
-			.saturating_add((136_915_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(426_422_000 as Weight)
+			// Standard Error: 183_000
+			.saturating_add((134_155_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_address(r: u32, ) -> Weight {
-		(487_655_000 as Weight)
-			// Standard Error: 165_000
-			.saturating_add((137_827_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(424_450_000 as Weight)
+			// Standard Error: 157_000
+			.saturating_add((134_814_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(488_993_000 as Weight)
-			// Standard Error: 195_000
-			.saturating_add((137_040_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(423_245_000 as Weight)
+			// Standard Error: 158_000
+			.saturating_add((133_566_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
 	fn seal_balance(r: u32, ) -> Weight {
-		(500_062_000 as Weight)
-			// Standard Error: 208_000
-			.saturating_add((392_337_000 as Weight).saturating_mul(r as Weight))
+		(438_039_000 as Weight)
+			// Standard Error: 216_000
+			.saturating_add((383_624_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(492_064_000 as Weight)
-			// Standard Error: 156_000
-			.saturating_add((137_082_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(421_656_000 as Weight)
+			// Standard Error: 163_000
+			.saturating_add((135_160_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(496_566_000 as Weight)
-			// Standard Error: 159_000
-			.saturating_add((137_377_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(425_416_000 as Weight)
+			// Standard Error: 177_000
+			.saturating_add((134_306_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(491_566_000 as Weight)
-			// Standard Error: 163_000
-			.saturating_add((137_586_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(422_733_000 as Weight)
+			// Standard Error: 171_000
+			.saturating_add((134_775_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
-	// Storage: Timestamp Now (r:1 w:0)
-	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(491_459_000 as Weight)
-			// Standard Error: 150_000
-			.saturating_add((137_402_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	// Storage: Contracts ContractInfoOf (r:1 w:1)
-	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_block_number(r: u32, ) -> Weight {
-		(488_379_000 as Weight)
-			// Standard Error: 170_000
-			.saturating_add((136_564_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(425_223_000 as Weight)
+			// Standard Error: 193_000
+			.saturating_add((133_823_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_now(r: u32, ) -> Weight {
-		(494_827_000 as Weight)
-			// Standard Error: 175_000
-			.saturating_add((137_178_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(433_528_000 as Weight)
+			// Standard Error: 166_000
+			.saturating_add((133_358_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: TransactionPayment NextFeeMultiplier (r:1 w:0)
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(497_508_000 as Weight)
-			// Standard Error: 191_000
-			.saturating_add((323_559_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(432_032_000 as Weight)
+			// Standard Error: 214_000
+			.saturating_add((305_418_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_gas(r: u32, ) -> Weight {
-		(179_076_000 as Weight)
-			// Standard Error: 124_000
-			.saturating_add((62_013_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(148_160_000 as Weight)
+			// Standard Error: 120_000
+			.saturating_add((59_833_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
-	fn seal_input(r: u32, ) -> Weight {
-		(480_920_000 as Weight)
-			// Standard Error: 182_000
-			.saturating_add((3_254_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+	fn seal_input(_r: u32, ) -> Weight {
+		(420_503_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(487_910_000 as Weight)
+		(424_727_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((1_218_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add((1_017_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_return(r: u32, ) -> Weight {
-		(470_960_000 as Weight)
-			// Standard Error: 678_000
-			.saturating_add((2_506_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(397_994_000 as Weight)
+			// Standard Error: 1_720_000
+			.saturating_add((17_298_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(478_623_000 as Weight)
+		(414_811_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((749_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add((637_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: Contracts DeletionQueue (r:1 w:1)
+	// Storage: System Account (r:2 w:2)
 	fn seal_terminate(r: u32, ) -> Weight {
-		(481_930_000 as Weight)
-			// Standard Error: 511_000
-			.saturating_add((84_726_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
+		(407_583_000 as Weight)
+			// Standard Error: 4_720_000
+			.saturating_add((110_145_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
-	// Storage: Timestamp Now (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743af3fd4cc2fc8d170b6d] (r:1 w:0)
-	fn seal_restore_to(r: u32, ) -> Weight {
-		(514_296_000 as Weight)
-			// Standard Error: 458_000
-			.saturating_add((93_769_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(r as Weight)))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes((5 as Weight).saturating_mul(r as Weight)))
-	}
-	// Storage: Skipped Metadata (r:0 w:0)
-	fn seal_restore_to_per_delta(d: u32, ) -> Weight {
-		(313_520_000 as Weight)
-			// Standard Error: 1_783_000
-			.saturating_add((2_435_407_000 as Weight).saturating_mul(d as Weight))
-			.saturating_add(T::DbWeight::get().reads(7 as Weight))
-			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
-			.saturating_add(T::DbWeight::get().writes(7 as Weight))
-			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
-	}
-	// Storage: Contracts ContractInfoOf (r:1 w:1)
-	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: RandomnessCollectiveFlip RandomMaterial (r:1 w:0)
 	fn seal_random(r: u32, ) -> Weight {
-		(484_059_000 as Weight)
-			// Standard Error: 285_000
-			.saturating_add((443_946_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(421_151_000 as Weight)
+			// Standard Error: 239_000
+			.saturating_add((432_224_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(491_593_000 as Weight)
-			// Standard Error: 386_000
-			.saturating_add((733_958_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(417_192_000 as Weight)
+			// Standard Error: 312_000
+			.saturating_add((752_443_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System EventTopics (r:100 w:100)
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_342_357_000 as Weight)
-			// Standard Error: 2_458_000
-			.saturating_add((521_445_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 484_000
-			.saturating_add((195_792_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(1_265_810_000 as Weight)
+			// Standard Error: 2_068_000
+			.saturating_add((507_093_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 407_000
+			.saturating_add((165_100_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
-	// Storage: Timestamp Now (r:1 w:0)
-	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(209_818_000 as Weight)
-			// Standard Error: 157_000
-			.saturating_add((93_289_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	// Storage: Contracts ContractInfoOf (r:1 w:1)
-	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_debug_message(r: u32, ) -> Weight {
-		(200_027_000 as Weight)
-			// Standard Error: 145_000
-			.saturating_add((79_038_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(161_459_000 as Weight)
+			// Standard Error: 151_000
+			.saturating_add((76_693_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(477_211_000 as Weight)
-			// Standard Error: 709_000
-			.saturating_add((407_264_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
+		(402_875_000 as Weight)
+			// Standard Error: 282_000
+			.saturating_add((258_574_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
-	// Storage: unknown [0x7afa01283080ef247df84e0ba38ea5a587d25ce6633a6bfbba02068c14023441] (r:1 w:1)
+	// Storage: unknown [0x7afa01283080ef247df84e0ba38ea5a587d25ce6633a6bfbba02068c14023441] (r:0 w:1)
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(832_538_000 as Weight)
-			// Standard Error: 262_000
-			.saturating_add((87_211_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(666_594_000 as Weight)
+			// Standard Error: 264_000
+			.saturating_add((70_365_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_clear_storage(r: u32, ) -> Weight {
-		(199_686_000 as Weight)
-			// Standard Error: 1_610_000
-			.saturating_add((905_125_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
+		(452_019_000 as Weight)
+			// Standard Error: 236_000
+			.saturating_add((233_300_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_get_storage(r: u32, ) -> Weight {
-		(335_052_000 as Weight)
-			// Standard Error: 885_000
-			.saturating_add((545_754_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(303_530_000 as Weight)
+			// Standard Error: 801_000
+			.saturating_add((532_265_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: unknown [0x7afa01283080ef247df84e0ba38ea5a587d25ce6633a6bfbba02068c14023441] (r:1 w:0)
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(800_556_000 as Weight)
-			// Standard Error: 337_000
-			.saturating_add((133_492_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+		(734_714_000 as Weight)
+			// Standard Error: 246_000
+			.saturating_add((112_631_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
+	// Storage: System Account (r:101 w:101)
 	fn seal_transfer(r: u32, ) -> Weight {
-		(317_531_000 as Weight)
-			// Standard Error: 1_627_000
-			.saturating_add((4_748_591_000 as Weight).saturating_mul(r as Weight))
+		(319_298_000 as Weight)
+			// Standard Error: 2_180_000
+			.saturating_add((4_710_724_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
@@ -655,42 +504,42 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 8_848_000
-			.saturating_add((46_947_679_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
-			.saturating_add(T::DbWeight::get().reads((200 as Weight).saturating_mul(r as Weight)))
+			// Standard Error: 10_059_000
+			.saturating_add((40_188_894_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	// Storage: Contracts ContractInfoOf (r:101 w:101)
 	// Storage: Contracts CodeStorage (r:2 w:0)
-	// Storage: System Account (r:101 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
+	// Storage: System Account (r:101 w:101)
 	fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight {
-		(47_469_660_000 as Weight)
-			// Standard Error: 45_192_000
-			.saturating_add((3_691_145_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 16_000
-			.saturating_add((75_339_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 17_000
-			.saturating_add((121_494_000 as Weight).saturating_mul(o as Weight))
-			.saturating_add(T::DbWeight::get().reads(205 as Weight))
+		(39_972_999_000 as Weight)
+			// Standard Error: 56_397_000
+			.saturating_add((3_858_600_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 20_000
+			.saturating_add((62_963_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 21_000
+			.saturating_add((101_497_000 as Weight).saturating_mul(o as Weight))
+			.saturating_add(T::DbWeight::get().reads(104 as Weight))
+			.saturating_add(T::DbWeight::get().reads((101 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(T::DbWeight::get().writes(101 as Weight))
 			.saturating_add(T::DbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: Contracts AccountCounter (r:1 w:1)
+	// Storage: System Account (r:101 w:101)
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 32_740_000
-			.saturating_add((55_623_588_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 103_701_000
+			.saturating_add((48_209_042_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
@@ -698,362 +547,354 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	}
 	// Storage: Contracts ContractInfoOf (r:101 w:101)
 	// Storage: Contracts CodeStorage (r:2 w:1)
-	// Storage: System Account (r:101 w:101)
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: Contracts AccountCounter (r:1 w:1)
+	// Storage: System Account (r:101 w:101)
 	fn seal_instantiate_per_input_output_salt_kb(i: u32, o: u32, s: u32, ) -> Weight {
-		(54_718_944_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((75_276_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 29_000
-			.saturating_add((121_341_000 as Weight).saturating_mul(o as Weight))
-			// Standard Error: 29_000
-			.saturating_add((223_964_000 as Weight).saturating_mul(s as Weight))
+		(45_662_002_000 as Weight)
+			// Standard Error: 30_000
+			.saturating_add((63_978_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 30_000
+			.saturating_add((101_724_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 30_000
+			.saturating_add((201_820_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(206 as Weight))
 			.saturating_add(T::DbWeight::get().writes(204 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(485_310_000 as Weight)
-			// Standard Error: 169_000
-			.saturating_add((143_364_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(422_425_000 as Weight)
+			// Standard Error: 164_000
+			.saturating_add((139_580_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(632_820_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((511_722_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(691_929_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((499_602_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(484_331_000 as Weight)
-			// Standard Error: 195_000
-			.saturating_add((151_617_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(420_255_000 as Weight)
+			// Standard Error: 167_000
+			.saturating_add((148_167_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(565_213_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((359_762_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(541_872_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((347_194_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(481_843_000 as Weight)
-			// Standard Error: 186_000
-			.saturating_add((122_838_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(419_267_000 as Weight)
+			// Standard Error: 139_000
+			.saturating_add((119_855_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(582_445_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((176_329_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(547_517_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((164_328_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(486_320_000 as Weight)
-			// Standard Error: 147_000
-			.saturating_add((123_460_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(424_870_000 as Weight)
+			// Standard Error: 163_000
+			.saturating_add((118_215_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(515_967_000 as Weight)
-			// Standard Error: 33_000
-			.saturating_add((176_423_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+		(514_057_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((164_390_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(54_127_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((10_198_000 as Weight).saturating_mul(r as Weight))
+		(51_570_000 as Weight)
+			// Standard Error: 74_000
+			.saturating_add((9_529_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(55_411_000 as Weight)
-			// Standard Error: 148_000
-			.saturating_add((22_916_000 as Weight).saturating_mul(r as Weight))
+		(38_616_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((37_349_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(55_462_000 as Weight)
-			// Standard Error: 134_000
-			.saturating_add((24_449_000 as Weight).saturating_mul(r as Weight))
+		(38_576_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((38_351_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(54_114_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((26_214_000 as Weight).saturating_mul(r as Weight))
+		(51_383_000 as Weight)
+			// Standard Error: 60_000
+			.saturating_add((27_099_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(54_118_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((26_492_000 as Weight).saturating_mul(r as Weight))
+		(38_218_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((41_226_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(54_119_000 as Weight)
-			// Standard Error: 304_000
-			.saturating_add((18_424_000 as Weight).saturating_mul(r as Weight))
+		(38_216_000 as Weight)
+			// Standard Error: 33_000
+			.saturating_add((28_483_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(55_352_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((32_291_000 as Weight).saturating_mul(r as Weight))
+		(51_637_000 as Weight)
+			// Standard Error: 56_000
+			.saturating_add((34_688_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(54_115_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((27_785_000 as Weight).saturating_mul(r as Weight))
+		(51_490_000 as Weight)
+			// Standard Error: 71_000
+			.saturating_add((27_683_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(86_048_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((82_000 as Weight).saturating_mul(e as Weight))
+		(77_260_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((130_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(54_654_000 as Weight)
-			// Standard Error: 82_000
-			.saturating_add((199_159_000 as Weight).saturating_mul(r as Weight))
+		(52_012_000 as Weight)
+			// Standard Error: 564_000
+			.saturating_add((188_018_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(67_478_000 as Weight)
-			// Standard Error: 113_000
-			.saturating_add((302_597_000 as Weight).saturating_mul(r as Weight))
+		(65_670_000 as Weight)
+			// Standard Error: 5_489_000
+			.saturating_add((294_560_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(384_281_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((9_984_000 as Weight).saturating_mul(p as Weight))
+		(368_428_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((10_469_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(55_473_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((9_287_000 as Weight).saturating_mul(r as Weight))
+		(52_091_000 as Weight)
+			// Standard Error: 32_000
+			.saturating_add((11_160_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(55_426_000 as Weight)
-			// Standard Error: 38_000
-			.saturating_add((10_559_000 as Weight).saturating_mul(r as Weight))
+		(52_145_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((12_086_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(55_332_000 as Weight)
-			// Standard Error: 8_000
-			.saturating_add((15_640_000 as Weight).saturating_mul(r as Weight))
+		(52_057_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((2_555_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(74_497_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((15_067_000 as Weight).saturating_mul(r as Weight))
+		(73_126_000 as Weight)
+			// Standard Error: 35_000
+			.saturating_add((16_004_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(74_445_000 as Weight)
-			// Standard Error: 49_000
-			.saturating_add((17_650_000 as Weight).saturating_mul(r as Weight))
+		(73_104_000 as Weight)
+			// Standard Error: 63_000
+			.saturating_add((2_267_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(54_500_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((9_307_000 as Weight).saturating_mul(r as Weight))
+		(38_596_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((22_244_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(54_382_000 as Weight)
-			// Standard Error: 5_644_000
-			.saturating_add((748_424_000 as Weight).saturating_mul(r as Weight))
+		(39_320_000 as Weight)
+			// Standard Error: 4_805_000
+			.saturating_add((642_459_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(54_133_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((15_830_000 as Weight).saturating_mul(r as Weight))
+		(51_634_000 as Weight)
+			// Standard Error: 65_000
+			.saturating_add((14_706_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(54_129_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((15_894_000 as Weight).saturating_mul(r as Weight))
+		(51_490_000 as Weight)
+			// Standard Error: 63_000
+			.saturating_add((14_759_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(54_181_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((15_847_000 as Weight).saturating_mul(r as Weight))
+		(51_278_000 as Weight)
+			// Standard Error: 37_000
+			.saturating_add((15_084_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(54_130_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((15_825_000 as Weight).saturating_mul(r as Weight))
+		(51_524_000 as Weight)
+			// Standard Error: 53_000
+			.saturating_add((14_801_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(54_122_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((15_803_000 as Weight).saturating_mul(r as Weight))
+		(50_775_000 as Weight)
+			// Standard Error: 88_000
+			.saturating_add((3_125_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(54_100_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((15_822_000 as Weight).saturating_mul(r as Weight))
+		(50_748_000 as Weight)
+			// Standard Error: 191_000
+			.saturating_add((3_785_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(54_143_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((15_868_000 as Weight).saturating_mul(r as Weight))
+		(52_621_000 as Weight)
+			// Standard Error: 60_000
+			.saturating_add((13_744_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(54_133_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((21_121_000 as Weight).saturating_mul(r as Weight))
+		(51_486_000 as Weight)
+			// Standard Error: 71_000
+			.saturating_add((21_786_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(54_177_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((21_003_000 as Weight).saturating_mul(r as Weight))
+		(51_573_000 as Weight)
+			// Standard Error: 73_000
+			.saturating_add((21_792_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(54_164_000 as Weight)
-			// Standard Error: 31_000
-			.saturating_add((21_041_000 as Weight).saturating_mul(r as Weight))
+		(51_445_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((21_838_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(54_171_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((21_101_000 as Weight).saturating_mul(r as Weight))
+		(51_609_000 as Weight)
+			// Standard Error: 61_000
+			.saturating_add((21_766_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(54_177_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((21_074_000 as Weight).saturating_mul(r as Weight))
+		(51_374_000 as Weight)
+			// Standard Error: 73_000
+			.saturating_add((22_062_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(54_073_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((21_136_000 as Weight).saturating_mul(r as Weight))
+		(51_451_000 as Weight)
+			// Standard Error: 52_000
+			.saturating_add((21_918_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(54_116_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((21_140_000 as Weight).saturating_mul(r as Weight))
+		(51_276_000 as Weight)
+			// Standard Error: 30_000
+			.saturating_add((22_040_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(54_115_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((21_164_000 as Weight).saturating_mul(r as Weight))
+		(51_401_000 as Weight)
+			// Standard Error: 46_000
+			.saturating_add((21_886_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(54_261_000 as Weight)
-			// Standard Error: 123_000
-			.saturating_add((20_921_000 as Weight).saturating_mul(r as Weight))
+		(51_480_000 as Weight)
+			// Standard Error: 35_000
+			.saturating_add((21_792_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(54_090_000 as Weight)
-			// Standard Error: 38_000
-			.saturating_add((21_171_000 as Weight).saturating_mul(r as Weight))
+		(51_771_000 as Weight)
+			// Standard Error: 63_000
+			.saturating_add((21_607_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(54_129_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((21_086_000 as Weight).saturating_mul(r as Weight))
+		(51_506_000 as Weight)
+			// Standard Error: 62_000
+			.saturating_add((21_743_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(54_126_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((21_051_000 as Weight).saturating_mul(r as Weight))
+		(51_456_000 as Weight)
+			// Standard Error: 68_000
+			.saturating_add((21_916_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(54_153_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((21_021_000 as Weight).saturating_mul(r as Weight))
+		(52_595_000 as Weight)
+			// Standard Error: 31_000
+			.saturating_add((20_604_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(54_168_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((27_336_000 as Weight).saturating_mul(r as Weight))
+		(51_575_000 as Weight)
+			// Standard Error: 101_000
+			.saturating_add((28_754_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(54_124_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((24_783_000 as Weight).saturating_mul(r as Weight))
+		(51_396_000 as Weight)
+			// Standard Error: 57_000
+			.saturating_add((26_422_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(54_203_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((27_539_000 as Weight).saturating_mul(r as Weight))
+		(51_575_000 as Weight)
+			// Standard Error: 58_000
+			.saturating_add((29_376_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(54_176_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((24_686_000 as Weight).saturating_mul(r as Weight))
+		(51_649_000 as Weight)
+			// Standard Error: 73_000
+			.saturating_add((26_067_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(54_111_000 as Weight)
-			// Standard Error: 356_000
-			.saturating_add((22_077_000 as Weight).saturating_mul(r as Weight))
+		(51_641_000 as Weight)
+			// Standard Error: 69_000
+			.saturating_add((21_615_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(54_124_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((21_060_000 as Weight).saturating_mul(r as Weight))
+		(51_246_000 as Weight)
+			// Standard Error: 35_000
+			.saturating_add((22_115_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(54_153_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((21_064_000 as Weight).saturating_mul(r as Weight))
+		(51_413_000 as Weight)
+			// Standard Error: 64_000
+			.saturating_add((21_917_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(54_122_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((21_187_000 as Weight).saturating_mul(r as Weight))
+		(51_315_000 as Weight)
+			// Standard Error: 35_000
+			.saturating_add((22_099_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(54_149_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((21_110_000 as Weight).saturating_mul(r as Weight))
+		(51_504_000 as Weight)
+			// Standard Error: 66_000
+			.saturating_add((21_901_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(54_136_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((21_066_000 as Weight).saturating_mul(r as Weight))
+		(51_487_000 as Weight)
+			// Standard Error: 68_000
+			.saturating_add((21_941_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(54_231_000 as Weight)
-			// Standard Error: 30_000
-			.saturating_add((21_073_000 as Weight).saturating_mul(r as Weight))
+		(51_893_000 as Weight)
+			// Standard Error: 59_000
+			.saturating_add((21_505_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(54_139_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((21_097_000 as Weight).saturating_mul(r as Weight))
+		(51_307_000 as Weight)
+			// Standard Error: 65_000
+			.saturating_add((22_056_000 as Weight).saturating_mul(r as Weight))
 	}
 }
 
@@ -1061,499 +902,353 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 impl WeightInfo for () {
 	// Storage: Contracts DeletionQueue (r:1 w:0)
 	fn on_initialize() -> Weight {
-		(3_227_000 as Weight)
+		(3_259_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 3_000
-			.saturating_add((2_273_000 as Weight).saturating_mul(k as Weight))
+			.saturating_add((2_197_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	// Storage: Contracts DeletionQueue (r:1 w:0)
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
-		(50_365_000 as Weight)
-			// Standard Error: 7_000
-			.saturating_add((39_799_000 as Weight).saturating_mul(q as Weight))
+		(81_940_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((354_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts PristineCode (r:1 w:0)
 	// Storage: Contracts CodeStorage (r:0 w:1)
 	fn instrument(c: u32, ) -> Weight {
-		(40_033_000 as Weight)
-			// Standard Error: 109_000
-			.saturating_add((76_424_000 as Weight).saturating_mul(c as Weight))
+		(32_129_000 as Weight)
+			// Standard Error: 95_000
+			.saturating_add((65_706_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	fn code_load(c: u32, ) -> Weight {
-		(6_675_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_668_000 as Weight).saturating_mul(c as Weight))
+		(6_215_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((1_430_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 	}
 	// Storage: Contracts CodeStorage (r:1 w:1)
 	fn code_refcount(c: u32, ) -> Weight {
-		(10_560_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((2_704_000 as Weight).saturating_mul(c as Weight))
+		(10_499_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_278_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts AccountCounter (r:1 w:0)
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
-	// Storage: System Account (r:1 w:1)
 	// Storage: Timestamp Now (r:1 w:0)
+	// Storage: System Account (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:1)
 	// Storage: Contracts PristineCode (r:0 w:1)
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight {
-		(479_578_000 as Weight)
-			// Standard Error: 166_000
-			.saturating_add((187_167_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 10_000
-			.saturating_add((2_450_000 as Weight).saturating_mul(s as Weight))
+		(473_826_000 as Weight)
+			// Standard Error: 133_000
+			.saturating_add((171_504_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 8_000
+			.saturating_add((2_161_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	// Storage: Contracts CodeStorage (r:1 w:1)
 	// Storage: Contracts AccountCounter (r:1 w:0)
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
-	// Storage: System Account (r:1 w:1)
 	// Storage: Timestamp Now (r:1 w:0)
+	// Storage: System Account (r:1 w:1)
 	fn instantiate(s: u32, ) -> Weight {
-		(237_664_000 as Weight)
+		(215_899_000 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((2_249_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((1_991_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:1)
 	// Storage: Timestamp Now (r:1 w:0)
+	// Storage: System Account (r:1 w:1)
 	fn call() -> Weight {
-		(223_426_000 as Weight)
+		(176_744_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
-	// Storage: Contracts CodeStorage (r:1 w:1)
-	// Storage: System Account (r:1 w:1)
-	// Storage: Contracts DeletionQueue (r:1 w:1)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743acafbc76efb655f52a2] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a45e3386f1a83f00b28] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a96e4ef3ab80b5c3a5f] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a3d24875569a319056f] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a64ad561e495f01c762] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a3b624bb134596373c1] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743aadbe519bace97698b4] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a7e33b1a343f33065bd] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a626f271ae6979bbffe] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a7ce585fd4ae98b830b] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ac889c022f51a43b527] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a4f6353225ab0496d48] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ab578892d355575c3e4] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a02b4c8040b81dc785d] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a8d13a70c1e380292ea] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a2e4d2fc709d989c778] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a6df81b28bd3ec99a3a] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743af54f74589657eac0fd] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a1849a3092175db4a2f] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a4f05ecdc6c2c42c9fb] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a24c3c0036dfb085bb9] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a44d725ac77836eb10b] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ad04db6c692ab73d90d] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a873009d6cdb99c5a4c] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743aa958795fbfc2b5fa41] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a205b6f659d219c8cbc] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ade54b3bc3d3cdb1aeb] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a538b748c1c5f92be98] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ad50de2ad89aaa1e067] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a0576917f19ecaf2a3f] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a5b44bd2793555a71e7] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743acc874645f7bbf62e62] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a7ae1b958a847e98bc8] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a396ae49d5311ee6bd1] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743aa5d56999a2ebd1c4c9] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a72f370c054587f81a5] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a3a32934e459acb2ceb] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ac10fd56a5e084aae1c] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a2ba8e27fcdbc3ab4f2] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a4a75b804eec44f3f2a] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a64ebb181fc616bfdb4] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a9aaf019a62fd907a8a] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a19730285453eb7702a] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743acced4c24d0ebee7c29] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ae458a57da6a2a6280a] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a83b9f09b407c57d07e] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743acc9fc095b3aaaef755] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a587ccf84053d9950ff] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a13d53bcf137f3784e9] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743abb79d34fb381ebd7c1] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a935ea70a3e699d23b6] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a109fcd63aefdae75a1] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743abca8d937a761f2eb46] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a314c97ff9e866a835b] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a691e4b5f67da0dea8e] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a127c680b864ee61620] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a148df8dfd47b4493f3] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a57c606ebe91374fcee] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743acec20322704f7bec44] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743abf6a27e09c6d0a9f0f] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ae2e8bdcf5850e20836] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743ab8399645bc39338a47] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743a658619de90cae5dbe1] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743aeb9db1dfeed3a7b47b] (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743abdc9db5edf43ffcb0d] (r:1 w:0)
-	fn claim_surcharge(c: u32, ) -> Weight {
-		(130_759_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((2_850_000 as Weight).saturating_mul(c as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
-	}
-	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_caller(r: u32, ) -> Weight {
-		(492_555_000 as Weight)
-			// Standard Error: 174_000
-			.saturating_add((136_915_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(426_422_000 as Weight)
+			// Standard Error: 183_000
+			.saturating_add((134_155_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_address(r: u32, ) -> Weight {
-		(487_655_000 as Weight)
-			// Standard Error: 165_000
-			.saturating_add((137_827_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(424_450_000 as Weight)
+			// Standard Error: 157_000
+			.saturating_add((134_814_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(488_993_000 as Weight)
-			// Standard Error: 195_000
-			.saturating_add((137_040_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(423_245_000 as Weight)
+			// Standard Error: 158_000
+			.saturating_add((133_566_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
+	// Storage: System Account (r:1 w:0)
 	fn seal_balance(r: u32, ) -> Weight {
-		(500_062_000 as Weight)
-			// Standard Error: 208_000
-			.saturating_add((392_337_000 as Weight).saturating_mul(r as Weight))
+		(438_039_000 as Weight)
+			// Standard Error: 216_000
+			.saturating_add((383_624_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(492_064_000 as Weight)
-			// Standard Error: 156_000
-			.saturating_add((137_082_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(421_656_000 as Weight)
+			// Standard Error: 163_000
+			.saturating_add((135_160_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(496_566_000 as Weight)
-			// Standard Error: 159_000
-			.saturating_add((137_377_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(425_416_000 as Weight)
+			// Standard Error: 177_000
+			.saturating_add((134_306_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(491_566_000 as Weight)
-			// Standard Error: 163_000
-			.saturating_add((137_586_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(422_733_000 as Weight)
+			// Standard Error: 171_000
+			.saturating_add((134_775_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
-	// Storage: Timestamp Now (r:1 w:0)
-	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(491_459_000 as Weight)
-			// Standard Error: 150_000
-			.saturating_add((137_402_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-	}
-	// Storage: Contracts ContractInfoOf (r:1 w:1)
-	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_block_number(r: u32, ) -> Weight {
-		(488_379_000 as Weight)
-			// Standard Error: 170_000
-			.saturating_add((136_564_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(425_223_000 as Weight)
+			// Standard Error: 193_000
+			.saturating_add((133_823_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_now(r: u32, ) -> Weight {
-		(494_827_000 as Weight)
-			// Standard Error: 175_000
-			.saturating_add((137_178_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(433_528_000 as Weight)
+			// Standard Error: 166_000
+			.saturating_add((133_358_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: TransactionPayment NextFeeMultiplier (r:1 w:0)
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(497_508_000 as Weight)
-			// Standard Error: 191_000
-			.saturating_add((323_559_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(432_032_000 as Weight)
+			// Standard Error: 214_000
+			.saturating_add((305_418_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_gas(r: u32, ) -> Weight {
-		(179_076_000 as Weight)
-			// Standard Error: 124_000
-			.saturating_add((62_013_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(148_160_000 as Weight)
+			// Standard Error: 120_000
+			.saturating_add((59_833_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
-	fn seal_input(r: u32, ) -> Weight {
-		(480_920_000 as Weight)
-			// Standard Error: 182_000
-			.saturating_add((3_254_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+	fn seal_input(_r: u32, ) -> Weight {
+		(420_503_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(487_910_000 as Weight)
+		(424_727_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((1_218_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add((1_017_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_return(r: u32, ) -> Weight {
-		(470_960_000 as Weight)
-			// Standard Error: 678_000
-			.saturating_add((2_506_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(397_994_000 as Weight)
+			// Standard Error: 1_720_000
+			.saturating_add((17_298_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(478_623_000 as Weight)
+		(414_811_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((749_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add((637_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: Contracts DeletionQueue (r:1 w:1)
+	// Storage: System Account (r:2 w:2)
 	fn seal_terminate(r: u32, ) -> Weight {
-		(481_930_000 as Weight)
-			// Standard Error: 511_000
-			.saturating_add((84_726_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			.saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
+		(407_583_000 as Weight)
+			// Standard Error: 4_720_000
+			.saturating_add((110_145_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
-	// Storage: Timestamp Now (r:1 w:0)
-	// Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743af3fd4cc2fc8d170b6d] (r:1 w:0)
-	fn seal_restore_to(r: u32, ) -> Weight {
-		(514_296_000 as Weight)
-			// Standard Error: 458_000
-			.saturating_add((93_769_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			.saturating_add(RocksDbWeight::get().reads((4 as Weight).saturating_mul(r as Weight)))
-			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			.saturating_add(RocksDbWeight::get().writes((5 as Weight).saturating_mul(r as Weight)))
-	}
-	// Storage: Skipped Metadata (r:0 w:0)
-	fn seal_restore_to_per_delta(d: u32, ) -> Weight {
-		(313_520_000 as Weight)
-			// Standard Error: 1_783_000
-			.saturating_add((2_435_407_000 as Weight).saturating_mul(d as Weight))
-			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
-			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
-			.saturating_add(RocksDbWeight::get().writes(7 as Weight))
-			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
-	}
-	// Storage: Contracts ContractInfoOf (r:1 w:1)
-	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: RandomnessCollectiveFlip RandomMaterial (r:1 w:0)
 	fn seal_random(r: u32, ) -> Weight {
-		(484_059_000 as Weight)
-			// Standard Error: 285_000
-			.saturating_add((443_946_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(421_151_000 as Weight)
+			// Standard Error: 239_000
+			.saturating_add((432_224_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(491_593_000 as Weight)
-			// Standard Error: 386_000
-			.saturating_add((733_958_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(417_192_000 as Weight)
+			// Standard Error: 312_000
+			.saturating_add((752_443_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System EventTopics (r:100 w:100)
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_342_357_000 as Weight)
-			// Standard Error: 2_458_000
-			.saturating_add((521_445_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 484_000
-			.saturating_add((195_792_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(1_265_810_000 as Weight)
+			// Standard Error: 2_068_000
+			.saturating_add((507_093_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 407_000
+			.saturating_add((165_100_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
-	// Storage: Timestamp Now (r:1 w:0)
-	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(209_818_000 as Weight)
-			// Standard Error: 157_000
-			.saturating_add((93_289_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-	}
-	// Storage: Contracts ContractInfoOf (r:1 w:1)
-	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_debug_message(r: u32, ) -> Weight {
-		(200_027_000 as Weight)
-			// Standard Error: 145_000
-			.saturating_add((79_038_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(161_459_000 as Weight)
+			// Standard Error: 151_000
+			.saturating_add((76_693_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(477_211_000 as Weight)
-			// Standard Error: 709_000
-			.saturating_add((407_264_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
+		(402_875_000 as Weight)
+			// Standard Error: 282_000
+			.saturating_add((258_574_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
-	// Storage: unknown [0x7afa01283080ef247df84e0ba38ea5a587d25ce6633a6bfbba02068c14023441] (r:1 w:1)
+	// Storage: unknown [0x7afa01283080ef247df84e0ba38ea5a587d25ce6633a6bfbba02068c14023441] (r:0 w:1)
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(832_538_000 as Weight)
-			// Standard Error: 262_000
-			.saturating_add((87_211_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(666_594_000 as Weight)
+			// Standard Error: 264_000
+			.saturating_add((70_365_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_clear_storage(r: u32, ) -> Weight {
-		(199_686_000 as Weight)
-			// Standard Error: 1_610_000
-			.saturating_add((905_125_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
+		(452_019_000 as Weight)
+			// Standard Error: 236_000
+			.saturating_add((233_300_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_get_storage(r: u32, ) -> Weight {
-		(335_052_000 as Weight)
-			// Standard Error: 885_000
-			.saturating_add((545_754_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(303_530_000 as Weight)
+			// Standard Error: 801_000
+			.saturating_add((532_265_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: unknown [0x7afa01283080ef247df84e0ba38ea5a587d25ce6633a6bfbba02068c14023441] (r:1 w:0)
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(800_556_000 as Weight)
-			// Standard Error: 337_000
-			.saturating_add((133_492_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+		(734_714_000 as Weight)
+			// Standard Error: 246_000
+			.saturating_add((112_631_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
+	// Storage: System Account (r:101 w:101)
 	fn seal_transfer(r: u32, ) -> Weight {
-		(317_531_000 as Weight)
-			// Standard Error: 1_627_000
-			.saturating_add((4_748_591_000 as Weight).saturating_mul(r as Weight))
+		(319_298_000 as Weight)
+			// Standard Error: 2_180_000
+			.saturating_add((4_710_724_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
@@ -1561,42 +1256,42 @@ impl WeightInfo for () {
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 8_848_000
-			.saturating_add((46_947_679_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
-			.saturating_add(RocksDbWeight::get().reads((200 as Weight).saturating_mul(r as Weight)))
+			// Standard Error: 10_059_000
+			.saturating_add((40_188_894_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	// Storage: Contracts ContractInfoOf (r:101 w:101)
 	// Storage: Contracts CodeStorage (r:2 w:0)
-	// Storage: System Account (r:101 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
+	// Storage: System Account (r:101 w:101)
 	fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight {
-		(47_469_660_000 as Weight)
-			// Standard Error: 45_192_000
-			.saturating_add((3_691_145_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 16_000
-			.saturating_add((75_339_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 17_000
-			.saturating_add((121_494_000 as Weight).saturating_mul(o as Weight))
-			.saturating_add(RocksDbWeight::get().reads(205 as Weight))
+		(39_972_999_000 as Weight)
+			// Standard Error: 56_397_000
+			.saturating_add((3_858_600_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 20_000
+			.saturating_add((62_963_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 21_000
+			.saturating_add((101_497_000 as Weight).saturating_mul(o as Weight))
+			.saturating_add(RocksDbWeight::get().reads(104 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((101 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(101 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: Contracts AccountCounter (r:1 w:1)
+	// Storage: System Account (r:101 w:101)
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 32_740_000
-			.saturating_add((55_623_588_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 103_701_000
+			.saturating_add((48_209_042_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
@@ -1604,361 +1299,353 @@ impl WeightInfo for () {
 	}
 	// Storage: Contracts ContractInfoOf (r:101 w:101)
 	// Storage: Contracts CodeStorage (r:2 w:1)
-	// Storage: System Account (r:101 w:101)
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: Contracts AccountCounter (r:1 w:1)
+	// Storage: System Account (r:101 w:101)
 	fn seal_instantiate_per_input_output_salt_kb(i: u32, o: u32, s: u32, ) -> Weight {
-		(54_718_944_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((75_276_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 29_000
-			.saturating_add((121_341_000 as Weight).saturating_mul(o as Weight))
-			// Standard Error: 29_000
-			.saturating_add((223_964_000 as Weight).saturating_mul(s as Weight))
+		(45_662_002_000 as Weight)
+			// Standard Error: 30_000
+			.saturating_add((63_978_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 30_000
+			.saturating_add((101_724_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 30_000
+			.saturating_add((201_820_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(206 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(204 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(485_310_000 as Weight)
-			// Standard Error: 169_000
-			.saturating_add((143_364_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(422_425_000 as Weight)
+			// Standard Error: 164_000
+			.saturating_add((139_580_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(632_820_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((511_722_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(691_929_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((499_602_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(484_331_000 as Weight)
-			// Standard Error: 195_000
-			.saturating_add((151_617_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(420_255_000 as Weight)
+			// Standard Error: 167_000
+			.saturating_add((148_167_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(565_213_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((359_762_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(541_872_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((347_194_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(481_843_000 as Weight)
-			// Standard Error: 186_000
-			.saturating_add((122_838_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(419_267_000 as Weight)
+			// Standard Error: 139_000
+			.saturating_add((119_855_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(582_445_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((176_329_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(547_517_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((164_328_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(486_320_000 as Weight)
-			// Standard Error: 147_000
-			.saturating_add((123_460_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(424_870_000 as Weight)
+			// Standard Error: 163_000
+			.saturating_add((118_215_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
-	// Storage: System Account (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(515_967_000 as Weight)
-			// Standard Error: 33_000
-			.saturating_add((176_423_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+		(514_057_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((164_390_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(54_127_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((10_198_000 as Weight).saturating_mul(r as Weight))
+		(51_570_000 as Weight)
+			// Standard Error: 74_000
+			.saturating_add((9_529_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(55_411_000 as Weight)
-			// Standard Error: 148_000
-			.saturating_add((22_916_000 as Weight).saturating_mul(r as Weight))
+		(38_616_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((37_349_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(55_462_000 as Weight)
-			// Standard Error: 134_000
-			.saturating_add((24_449_000 as Weight).saturating_mul(r as Weight))
+		(38_576_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((38_351_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(54_114_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((26_214_000 as Weight).saturating_mul(r as Weight))
+		(51_383_000 as Weight)
+			// Standard Error: 60_000
+			.saturating_add((27_099_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(54_118_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((26_492_000 as Weight).saturating_mul(r as Weight))
+		(38_218_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((41_226_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(54_119_000 as Weight)
-			// Standard Error: 304_000
-			.saturating_add((18_424_000 as Weight).saturating_mul(r as Weight))
+		(38_216_000 as Weight)
+			// Standard Error: 33_000
+			.saturating_add((28_483_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(55_352_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((32_291_000 as Weight).saturating_mul(r as Weight))
+		(51_637_000 as Weight)
+			// Standard Error: 56_000
+			.saturating_add((34_688_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(54_115_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((27_785_000 as Weight).saturating_mul(r as Weight))
+		(51_490_000 as Weight)
+			// Standard Error: 71_000
+			.saturating_add((27_683_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(86_048_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((82_000 as Weight).saturating_mul(e as Weight))
+		(77_260_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((130_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(54_654_000 as Weight)
-			// Standard Error: 82_000
-			.saturating_add((199_159_000 as Weight).saturating_mul(r as Weight))
+		(52_012_000 as Weight)
+			// Standard Error: 564_000
+			.saturating_add((188_018_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(67_478_000 as Weight)
-			// Standard Error: 113_000
-			.saturating_add((302_597_000 as Weight).saturating_mul(r as Weight))
+		(65_670_000 as Weight)
+			// Standard Error: 5_489_000
+			.saturating_add((294_560_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(384_281_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((9_984_000 as Weight).saturating_mul(p as Weight))
+		(368_428_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((10_469_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(55_473_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((9_287_000 as Weight).saturating_mul(r as Weight))
+		(52_091_000 as Weight)
+			// Standard Error: 32_000
+			.saturating_add((11_160_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(55_426_000 as Weight)
-			// Standard Error: 38_000
-			.saturating_add((10_559_000 as Weight).saturating_mul(r as Weight))
+		(52_145_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((12_086_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(55_332_000 as Weight)
-			// Standard Error: 8_000
-			.saturating_add((15_640_000 as Weight).saturating_mul(r as Weight))
+		(52_057_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((2_555_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(74_497_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((15_067_000 as Weight).saturating_mul(r as Weight))
+		(73_126_000 as Weight)
+			// Standard Error: 35_000
+			.saturating_add((16_004_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(74_445_000 as Weight)
-			// Standard Error: 49_000
-			.saturating_add((17_650_000 as Weight).saturating_mul(r as Weight))
+		(73_104_000 as Weight)
+			// Standard Error: 63_000
+			.saturating_add((2_267_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(54_500_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((9_307_000 as Weight).saturating_mul(r as Weight))
+		(38_596_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((22_244_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(54_382_000 as Weight)
-			// Standard Error: 5_644_000
-			.saturating_add((748_424_000 as Weight).saturating_mul(r as Weight))
+		(39_320_000 as Weight)
+			// Standard Error: 4_805_000
+			.saturating_add((642_459_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(54_133_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((15_830_000 as Weight).saturating_mul(r as Weight))
+		(51_634_000 as Weight)
+			// Standard Error: 65_000
+			.saturating_add((14_706_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(54_129_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((15_894_000 as Weight).saturating_mul(r as Weight))
+		(51_490_000 as Weight)
+			// Standard Error: 63_000
+			.saturating_add((14_759_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(54_181_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((15_847_000 as Weight).saturating_mul(r as Weight))
+		(51_278_000 as Weight)
+			// Standard Error: 37_000
+			.saturating_add((15_084_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(54_130_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((15_825_000 as Weight).saturating_mul(r as Weight))
+		(51_524_000 as Weight)
+			// Standard Error: 53_000
+			.saturating_add((14_801_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(54_122_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((15_803_000 as Weight).saturating_mul(r as Weight))
+		(50_775_000 as Weight)
+			// Standard Error: 88_000
+			.saturating_add((3_125_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(54_100_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((15_822_000 as Weight).saturating_mul(r as Weight))
+		(50_748_000 as Weight)
+			// Standard Error: 191_000
+			.saturating_add((3_785_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(54_143_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((15_868_000 as Weight).saturating_mul(r as Weight))
+		(52_621_000 as Weight)
+			// Standard Error: 60_000
+			.saturating_add((13_744_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(54_133_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((21_121_000 as Weight).saturating_mul(r as Weight))
+		(51_486_000 as Weight)
+			// Standard Error: 71_000
+			.saturating_add((21_786_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(54_177_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((21_003_000 as Weight).saturating_mul(r as Weight))
+		(51_573_000 as Weight)
+			// Standard Error: 73_000
+			.saturating_add((21_792_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(54_164_000 as Weight)
-			// Standard Error: 31_000
-			.saturating_add((21_041_000 as Weight).saturating_mul(r as Weight))
+		(51_445_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((21_838_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(54_171_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((21_101_000 as Weight).saturating_mul(r as Weight))
+		(51_609_000 as Weight)
+			// Standard Error: 61_000
+			.saturating_add((21_766_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(54_177_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((21_074_000 as Weight).saturating_mul(r as Weight))
+		(51_374_000 as Weight)
+			// Standard Error: 73_000
+			.saturating_add((22_062_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(54_073_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((21_136_000 as Weight).saturating_mul(r as Weight))
+		(51_451_000 as Weight)
+			// Standard Error: 52_000
+			.saturating_add((21_918_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(54_116_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((21_140_000 as Weight).saturating_mul(r as Weight))
+		(51_276_000 as Weight)
+			// Standard Error: 30_000
+			.saturating_add((22_040_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(54_115_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((21_164_000 as Weight).saturating_mul(r as Weight))
+		(51_401_000 as Weight)
+			// Standard Error: 46_000
+			.saturating_add((21_886_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(54_261_000 as Weight)
-			// Standard Error: 123_000
-			.saturating_add((20_921_000 as Weight).saturating_mul(r as Weight))
+		(51_480_000 as Weight)
+			// Standard Error: 35_000
+			.saturating_add((21_792_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(54_090_000 as Weight)
-			// Standard Error: 38_000
-			.saturating_add((21_171_000 as Weight).saturating_mul(r as Weight))
+		(51_771_000 as Weight)
+			// Standard Error: 63_000
+			.saturating_add((21_607_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(54_129_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((21_086_000 as Weight).saturating_mul(r as Weight))
+		(51_506_000 as Weight)
+			// Standard Error: 62_000
+			.saturating_add((21_743_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(54_126_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((21_051_000 as Weight).saturating_mul(r as Weight))
+		(51_456_000 as Weight)
+			// Standard Error: 68_000
+			.saturating_add((21_916_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(54_153_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((21_021_000 as Weight).saturating_mul(r as Weight))
+		(52_595_000 as Weight)
+			// Standard Error: 31_000
+			.saturating_add((20_604_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(54_168_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((27_336_000 as Weight).saturating_mul(r as Weight))
+		(51_575_000 as Weight)
+			// Standard Error: 101_000
+			.saturating_add((28_754_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(54_124_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((24_783_000 as Weight).saturating_mul(r as Weight))
+		(51_396_000 as Weight)
+			// Standard Error: 57_000
+			.saturating_add((26_422_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(54_203_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((27_539_000 as Weight).saturating_mul(r as Weight))
+		(51_575_000 as Weight)
+			// Standard Error: 58_000
+			.saturating_add((29_376_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(54_176_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((24_686_000 as Weight).saturating_mul(r as Weight))
+		(51_649_000 as Weight)
+			// Standard Error: 73_000
+			.saturating_add((26_067_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(54_111_000 as Weight)
-			// Standard Error: 356_000
-			.saturating_add((22_077_000 as Weight).saturating_mul(r as Weight))
+		(51_641_000 as Weight)
+			// Standard Error: 69_000
+			.saturating_add((21_615_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(54_124_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((21_060_000 as Weight).saturating_mul(r as Weight))
+		(51_246_000 as Weight)
+			// Standard Error: 35_000
+			.saturating_add((22_115_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(54_153_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((21_064_000 as Weight).saturating_mul(r as Weight))
+		(51_413_000 as Weight)
+			// Standard Error: 64_000
+			.saturating_add((21_917_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(54_122_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((21_187_000 as Weight).saturating_mul(r as Weight))
+		(51_315_000 as Weight)
+			// Standard Error: 35_000
+			.saturating_add((22_099_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(54_149_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((21_110_000 as Weight).saturating_mul(r as Weight))
+		(51_504_000 as Weight)
+			// Standard Error: 66_000
+			.saturating_add((21_901_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(54_136_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((21_066_000 as Weight).saturating_mul(r as Weight))
+		(51_487_000 as Weight)
+			// Standard Error: 68_000
+			.saturating_add((21_941_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(54_231_000 as Weight)
-			// Standard Error: 30_000
-			.saturating_add((21_073_000 as Weight).saturating_mul(r as Weight))
+		(51_893_000 as Weight)
+			// Standard Error: 59_000
+			.saturating_add((21_505_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(54_139_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((21_097_000 as Weight).saturating_mul(r as Weight))
+		(51_307_000 as Weight)
+			// Standard Error: 65_000
+			.saturating_add((22_056_000 as Weight).saturating_mul(r as Weight))
 	}
 }

From 5e93ac7ea550a68b37eeea0b5c7bb3825fcaf8da Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Mon, 6 Sep 2021 19:25:20 -0400
Subject: [PATCH 1146/1194] Allow Skipping Benchmark Errors (#9699)

* introduce benchmark skip

* fmt

* Update lib.rs

* fix up
---
 frame/benchmarking/src/lib.rs   | 64 ++++++++++++++++++++++++++-------
 frame/benchmarking/src/utils.rs | 11 +++---
 2 files changed, 58 insertions(+), 17 deletions(-)

diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
index fb602f0732b7..42eeac483fa9 100644
--- a/frame/benchmarking/src/lib.rs
+++ b/frame/benchmarking/src/lib.rs
@@ -40,7 +40,7 @@ pub use sp_io::storage::root as storage_root;
 #[doc(hidden)]
 pub use sp_runtime::traits::Zero;
 #[doc(hidden)]
-pub use sp_std::{self, boxed::Box, prelude::Vec, vec};
+pub use sp_std::{self, boxed::Box, prelude::Vec, str, vec};
 #[doc(hidden)]
 pub use sp_storage::TrackedStorageKey;
 pub use utils::*;
@@ -774,7 +774,7 @@ macro_rules! impl_benchmark {
 				internal_repeats: u32,
 			) -> Result<$crate::Vec<$crate::BenchmarkResult>, $crate::BenchmarkError> {
 				// Map the input to the selected benchmark.
-				let extrinsic = $crate::sp_std::str::from_utf8(extrinsic)
+				let extrinsic = $crate::str::from_utf8(extrinsic)
 					.map_err(|_| "`extrinsic` is not a valid utf8 string!")?;
 				let selected_benchmark = match extrinsic {
 					$( stringify!($name) => SelectedBenchmark::$name, )*
@@ -894,7 +894,7 @@ macro_rules! impl_benchmark {
 			/// author chooses not to implement benchmarks.
 			#[allow(unused)]
 			fn test_bench_by_name(name: &[u8]) -> Result<(), $crate::BenchmarkError> {
-				let name = $crate::sp_std::str::from_utf8(name)
+				let name = $crate::str::from_utf8(name)
 					.map_err(|_| -> $crate::BenchmarkError { "`name` is not a valid utf8 string!".into() })?;
 				match name {
 					$( stringify!($name) => {
@@ -1209,17 +1209,40 @@ macro_rules! impl_benchmark_test_suite {
 							$bench_module::<$test>::test_bench_by_name(benchmark_name)
 						}) {
 							Err(err) => {
-								println!("{}: {:?}", String::from_utf8_lossy(benchmark_name), err);
+								println!(
+									"{}: {:?}",
+									$crate::str::from_utf8(benchmark_name)
+										.expect("benchmark name is always a valid string!"),
+									err,
+								);
 								anything_failed = true;
 							},
 							Ok(Err(err)) => {
 								match err {
 									$crate::BenchmarkError::Stop(err) => {
-										println!("{}: {:?}", String::from_utf8_lossy(benchmark_name), err);
+										println!(
+											"{}: {:?}",
+											$crate::str::from_utf8(benchmark_name)
+												.expect("benchmark name is always a valid string!"),
+											err,
+										);
 										anything_failed = true;
 									},
 									$crate::BenchmarkError::Override(_) => {
 										// This is still considered a success condition.
+										$crate::log::error!(
+											"WARNING: benchmark error overrided - {}",
+												$crate::str::from_utf8(benchmark_name)
+													.expect("benchmark name is always a valid string!"),
+											);
+									},
+									$crate::BenchmarkError::Skip => {
+										// This is considered a success condition.
+										$crate::log::error!(
+											"WARNING: benchmark error skipped - {}",
+											$crate::str::from_utf8(benchmark_name)
+												.expect("benchmark name is always a valid string!"),
+										);
 									}
 								}
 							},
@@ -1344,13 +1367,18 @@ macro_rules! add_benchmark {
 			);
 
 			let final_results = match benchmark_result {
-				Ok(results) => results,
+				Ok(results) => Some(results),
 				Err($crate::BenchmarkError::Override(mut result)) => {
 					// Insert override warning as the first storage key.
+					$crate::log::error!(
+						"WARNING: benchmark error overrided - {}",
+						$crate::str::from_utf8(benchmark)
+							.expect("benchmark name is always a valid string!")
+					);
 					result.keys.insert(0,
 						(b"Benchmark Override".to_vec(), 0, 0, false)
 					);
-					$crate::vec![result]
+					Some($crate::vec![result])
 				},
 				Err($crate::BenchmarkError::Stop(e)) => {
 					$crate::show_benchmark_debug_info(
@@ -1362,14 +1390,24 @@ macro_rules! add_benchmark {
 					);
 					return Err(e.into());
 				},
+				Err($crate::BenchmarkError::Skip) => {
+					$crate::log::error!(
+						"WARNING: benchmark error skipped - {}",
+						$crate::str::from_utf8(benchmark)
+							.expect("benchmark name is always a valid string!")
+					);
+					None
+				}
 			};
 
-			$batches.push($crate::BenchmarkBatch {
-				pallet: name_string.to_vec(),
-				instance: instance_string.to_vec(),
-				benchmark: benchmark.clone(),
-				results: final_results,
-			});
+			if let Some(final_results) = final_results {
+				$batches.push($crate::BenchmarkBatch {
+					pallet: name_string.to_vec(),
+					instance: instance_string.to_vec(),
+					benchmark: benchmark.clone(),
+					results: final_results,
+				});
+			}
 		}
 	)
 }
diff --git a/frame/benchmarking/src/utils.rs b/frame/benchmarking/src/utils.rs
index 64eb611a187b..d54e32f0ce9d 100644
--- a/frame/benchmarking/src/utils.rs
+++ b/frame/benchmarking/src/utils.rs
@@ -119,14 +119,16 @@ impl BenchmarkResult {
 }
 
 /// Possible errors returned from the benchmarking pipeline.
-///
-/// * Stop: The benchmarking pipeline should stop and return the inner string.
-/// * WeightOverride: The benchmarking pipeline is allowed to fail here, and we should use the
-///   included weight instead.
 #[derive(Clone, PartialEq, Debug)]
 pub enum BenchmarkError {
+	/// The benchmarking pipeline should stop and return the inner string.
 	Stop(&'static str),
+	/// The benchmarking pipeline is allowed to fail here, and we should use the
+	/// included weight instead.
 	Override(BenchmarkResult),
+	/// The benchmarking pipeline is allowed to fail here, and we should simply
+	/// skip processing these results.
+	Skip,
 }
 
 impl From<BenchmarkError> for &'static str {
@@ -134,6 +136,7 @@ impl From<BenchmarkError> for &'static str {
 		match e {
 			BenchmarkError::Stop(s) => s,
 			BenchmarkError::Override(_) => "benchmark override",
+			BenchmarkError::Skip => "benchmark skip",
 		}
 	}
 }

From b5defce4bd25066a5d0b571398874f048a864a68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 7 Sep 2021 13:15:44 +0200
Subject: [PATCH 1147/1194] SimpleSlotWorker make `claim_slot` async (#9713)

* SimpleSlotWorker make `claim_slot` async

* FMT
---
 client/consensus/aura/src/lib.rs  | 34 ++++++++++++++++---------------
 client/consensus/babe/src/lib.rs  | 11 +++++-----
 client/consensus/slots/src/lib.rs | 15 ++++++++------
 3 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index d038db97cb47..946e0b90c4dd 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -188,7 +188,7 @@ where
 	L: sc_consensus::JustificationSyncLink<B>,
 	CIDP: CreateInherentDataProviders<B, ()> + Send,
 	CIDP::InherentDataProviders: InherentDataProviderExt + Send,
-	BS: BackoffAuthoringBlocksStrategy<NumberFor<B>> + Send + 'static,
+	BS: BackoffAuthoringBlocksStrategy<NumberFor<B>> + Send + Sync + 'static,
 	CAW: CanAuthorWith<B> + Send,
 	Error: std::error::Error + Send + From<sp_consensus::Error> + 'static,
 {
@@ -278,7 +278,7 @@ where
 	Error: std::error::Error + Send + From<sp_consensus::Error> + 'static,
 	SO: SyncOracle + Send + Sync + Clone,
 	L: sc_consensus::JustificationSyncLink<B>,
-	BS: BackoffAuthoringBlocksStrategy<NumberFor<B>> + Send + 'static,
+	BS: BackoffAuthoringBlocksStrategy<NumberFor<B>> + Send + Sync + 'static,
 {
 	AuraWorker {
 		client,
@@ -311,21 +311,22 @@ struct AuraWorker<C, E, I, P, SO, L, BS> {
 	_key_type: PhantomData<P>,
 }
 
+#[async_trait::async_trait]
 impl<B, C, E, I, P, Error, SO, L, BS> sc_consensus_slots::SimpleSlotWorker<B>
 	for AuraWorker<C, E, I, P, SO, L, BS>
 where
 	B: BlockT,
 	C: ProvideRuntimeApi<B> + BlockOf + ProvideCache<B> + HeaderBackend<B> + Sync,
 	C::Api: AuraApi<B, AuthorityId<P>>,
-	E: Environment<B, Error = Error>,
+	E: Environment<B, Error = Error> + Send + Sync,
 	E::Proposer: Proposer<B, Error = Error, Transaction = sp_api::TransactionFor<C, B>>,
 	I: BlockImport<B, Transaction = sp_api::TransactionFor<C, B>> + Send + Sync + 'static,
 	P: Pair + Send + Sync,
 	P::Public: AppPublic + Public + Member + Encode + Decode + Hash,
 	P::Signature: TryFrom<Vec<u8>> + Member + Encode + Decode + Hash + Debug,
-	SO: SyncOracle + Send + Clone,
+	SO: SyncOracle + Send + Clone + Sync,
 	L: sc_consensus::JustificationSyncLink<B>,
-	BS: BackoffAuthoringBlocksStrategy<NumberFor<B>> + Send + 'static,
+	BS: BackoffAuthoringBlocksStrategy<NumberFor<B>> + Send + Sync + 'static,
 	Error: std::error::Error + Send + From<sp_consensus::Error> + 'static,
 {
 	type BlockImport = I;
@@ -357,7 +358,7 @@ where
 		Some(epoch_data.len())
 	}
 
-	fn claim_slot(
+	async fn claim_slot(
 		&self,
 		_header: &B::Header,
 		slot: Slot,
@@ -557,6 +558,7 @@ where
 #[cfg(test)]
 mod tests {
 	use super::*;
+	use futures::executor;
 	use parking_lot::Mutex;
 	use sc_block_builder::BlockBuilderProvider;
 	use sc_client_api::BlockchainEvents;
@@ -777,7 +779,7 @@ mod tests {
 			);
 		}
 
-		futures::executor::block_on(future::select(
+		executor::block_on(future::select(
 			future::poll_fn(move |cx| {
 				net.lock().poll(cx);
 				Poll::<()>::Pending
@@ -846,14 +848,14 @@ mod tests {
 			Default::default(),
 			Default::default(),
 		);
-		assert!(worker.claim_slot(&head, 0.into(), &authorities).is_none());
-		assert!(worker.claim_slot(&head, 1.into(), &authorities).is_none());
-		assert!(worker.claim_slot(&head, 2.into(), &authorities).is_none());
-		assert!(worker.claim_slot(&head, 3.into(), &authorities).is_some());
-		assert!(worker.claim_slot(&head, 4.into(), &authorities).is_none());
-		assert!(worker.claim_slot(&head, 5.into(), &authorities).is_none());
-		assert!(worker.claim_slot(&head, 6.into(), &authorities).is_none());
-		assert!(worker.claim_slot(&head, 7.into(), &authorities).is_some());
+		assert!(executor::block_on(worker.claim_slot(&head, 0.into(), &authorities)).is_none());
+		assert!(executor::block_on(worker.claim_slot(&head, 1.into(), &authorities)).is_none());
+		assert!(executor::block_on(worker.claim_slot(&head, 2.into(), &authorities)).is_none());
+		assert!(executor::block_on(worker.claim_slot(&head, 3.into(), &authorities)).is_some());
+		assert!(executor::block_on(worker.claim_slot(&head, 4.into(), &authorities)).is_none());
+		assert!(executor::block_on(worker.claim_slot(&head, 5.into(), &authorities)).is_none());
+		assert!(executor::block_on(worker.claim_slot(&head, 6.into(), &authorities)).is_none());
+		assert!(executor::block_on(worker.claim_slot(&head, 7.into(), &authorities)).is_some());
 	}
 
 	#[test]
@@ -893,7 +895,7 @@ mod tests {
 
 		let head = client.header(&BlockId::Number(0)).unwrap().unwrap();
 
-		let res = futures::executor::block_on(worker.on_slot(SlotInfo {
+		let res = executor::block_on(worker.on_slot(SlotInfo {
 			slot: 0.into(),
 			timestamp: 0.into(),
 			ends_at: Instant::now() + Duration::from_secs(100),
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index 21fba61866c9..a0b6bde025b3 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -485,7 +485,7 @@ where
 	L: sc_consensus::JustificationSyncLink<B> + 'static,
 	CIDP: CreateInherentDataProviders<B, ()> + Send + Sync + 'static,
 	CIDP::InherentDataProviders: InherentDataProviderExt + Send,
-	BS: BackoffAuthoringBlocksStrategy<NumberFor<B>> + Send + 'static,
+	BS: BackoffAuthoringBlocksStrategy<NumberFor<B>> + Send + Sync + 'static,
 	CAW: CanAuthorWith<B> + Send + Sync + 'static,
 	Error: std::error::Error + Send + From<ConsensusError> + From<I::Error> + 'static,
 {
@@ -672,6 +672,7 @@ struct BabeSlotWorker<B: BlockT, C, E, I, SO, L, BS> {
 	telemetry: Option<TelemetryHandle>,
 }
 
+#[async_trait::async_trait]
 impl<B, C, E, I, Error, SO, L, BS> sc_consensus_slots::SimpleSlotWorker<B>
 	for BabeSlotWorker<B, C, E, I, SO, L, BS>
 where
@@ -681,12 +682,12 @@ where
 		+ HeaderBackend<B>
 		+ HeaderMetadata<B, Error = ClientError>,
 	C::Api: BabeApi<B>,
-	E: Environment<B, Error = Error>,
+	E: Environment<B, Error = Error> + Sync,
 	E::Proposer: Proposer<B, Error = Error, Transaction = sp_api::TransactionFor<C, B>>,
 	I: BlockImport<B, Transaction = sp_api::TransactionFor<C, B>> + Send + Sync + 'static,
-	SO: SyncOracle + Send + Clone,
+	SO: SyncOracle + Send + Clone + Sync,
 	L: sc_consensus::JustificationSyncLink<B>,
-	BS: BackoffAuthoringBlocksStrategy<NumberFor<B>>,
+	BS: BackoffAuthoringBlocksStrategy<NumberFor<B>> + Sync,
 	Error: std::error::Error + Send + From<ConsensusError> + From<I::Error> + 'static,
 {
 	type EpochData = ViableEpochDescriptor<B::Hash, NumberFor<B>, Epoch>;
@@ -730,7 +731,7 @@ where
 			.map(|epoch| epoch.as_ref().authorities.len())
 	}
 
-	fn claim_slot(
+	async fn claim_slot(
 		&self,
 		_parent_header: &B::Header,
 		slot: Slot,
diff --git a/client/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs
index da04b98ccee9..bfaa388014ef 100644
--- a/client/consensus/slots/src/lib.rs
+++ b/client/consensus/slots/src/lib.rs
@@ -108,7 +108,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 	type Claim: Send + 'static;
 
 	/// Epoch data necessary for authoring.
-	type EpochData: Send + 'static;
+	type EpochData: Send + Sync + 'static;
 
 	/// The logging target to use when logging messages.
 	fn logging_target(&self) -> &'static str;
@@ -129,7 +129,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 	fn authorities_len(&self, epoch_data: &Self::EpochData) -> Option<usize>;
 
 	/// Tries to claim the given slot, returning an object with claim data if successful.
-	fn claim_slot(
+	async fn claim_slot(
 		&self,
 		header: &B::Header,
 		slot: Slot,
@@ -200,7 +200,10 @@ pub trait SimpleSlotWorker<B: BlockT> {
 	async fn on_slot(
 		&mut self,
 		slot_info: SlotInfo<B>,
-	) -> Option<SlotResult<B, <Self::Proposer as Proposer<B>>::Proof>> {
+	) -> Option<SlotResult<B, <Self::Proposer as Proposer<B>>::Proof>>
+	where
+		Self: Sync,
+	{
 		let (timestamp, slot) = (slot_info.timestamp, slot_info.slot);
 		let telemetry = self.telemetry();
 		let logging_target = self.logging_target();
@@ -259,7 +262,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 			return None
 		}
 
-		let claim = self.claim_slot(&slot_info.chain_head, slot, &epoch_data)?;
+		let claim = self.claim_slot(&slot_info.chain_head, slot, &epoch_data).await?;
 
 		if self.should_backoff(slot, &slot_info.chain_head) {
 			return None
@@ -415,8 +418,8 @@ pub trait SimpleSlotWorker<B: BlockT> {
 }
 
 #[async_trait::async_trait]
-impl<B: BlockT, T: SimpleSlotWorker<B> + Send> SlotWorker<B, <T::Proposer as Proposer<B>>::Proof>
-	for T
+impl<B: BlockT, T: SimpleSlotWorker<B> + Send + Sync>
+	SlotWorker<B, <T::Proposer as Proposer<B>>::Proof> for T
 {
 	async fn on_slot(
 		&mut self,

From cd21e62f164466d46008f68759a87d30284846c1 Mon Sep 17 00:00:00 2001
From: Qinxuan Chen <koushiro.cqx@gmail.com>
Date: Tue, 7 Sep 2021 20:17:26 +0800
Subject: [PATCH 1148/1194] Migrate `pallet-membership` to the new pallet
 attribute macro (#9080)

* Migrate pallet-membership to new pallet attribute macro

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* Add migrations

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* more general

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* fix event metadata

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* some nits

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* fix some nits

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* apply suggestion

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* some nits

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* Fix

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* Remove useless

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* Fix migration

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* Fix format

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* Fix

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* Fix migration

now we need to store the new version manually.

* Fix migration and Add migration test

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* Fix

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* Fix format

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* Use new_test_ext

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

Co-authored-by: thiolliere <gui.thiolliere@gmail.com>
---
 frame/membership/Cargo.toml            |  14 +-
 frame/membership/src/lib.rs            | 307 +++++++++++++++----------
 frame/membership/src/migrations/mod.rs |  19 ++
 frame/membership/src/migrations/v4.rs  | 154 +++++++++++++
 4 files changed, 362 insertions(+), 132 deletions(-)
 create mode 100644 frame/membership/src/migrations/mod.rs
 create mode 100644 frame/membership/src/migrations/v4.rs

diff --git a/frame/membership/Cargo.toml b/frame/membership/Cargo.toml
index 3200d986febe..8136b818eac8 100644
--- a/frame/membership/Cargo.toml
+++ b/frame/membership/Cargo.toml
@@ -15,25 +15,25 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 log = { version = "0.4.0", default-features = false }
-sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
 sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 
-frame-benchmarking = { version = "4.0.0-dev", optional = true, default-features = false, path = "../benchmarking" }
-
-[dev-dependencies]
-sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
-
 [features]
 default = ["std"]
 std = [
 	"codec/std",
 	"log/std",
-	"sp-std/std",
+	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
+	"sp-std/std",
 	"frame-support/std",
 	"frame-system/std",
 	"frame-benchmarking/std",
diff --git a/frame/membership/src/lib.rs b/frame/membership/src/lib.rs
index a9bc59a361f0..b66dc51b3b0e 100644
--- a/frame/membership/src/lib.rs
+++ b/frame/membership/src/lib.rs
@@ -23,84 +23,118 @@
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use frame_support::{
-	decl_error, decl_event, decl_module, decl_storage,
-	traits::{ChangeMembers, Contains, EnsureOrigin, Get, InitializeMembers, SortedMembers},
+use frame_support::traits::{
+	ChangeMembers, Contains, Get, InitializeMembers, SortedMembers, StorageVersion,
 };
-use frame_system::ensure_signed;
 use sp_std::prelude::*;
 
+pub mod migrations;
 pub mod weights;
+
+pub use pallet::*;
 pub use weights::WeightInfo;
 
-pub trait Config<I = DefaultInstance>: frame_system::Config {
-	/// The overarching event type.
-	type Event: From<Event<Self, I>> + Into<<Self as frame_system::Config>::Event>;
+#[frame_support::pallet]
+pub mod pallet {
+	use super::*;
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+
+	/// The current storage version.
+	const STORAGE_VERSION: StorageVersion = StorageVersion::new(4);
 
-	/// Required origin for adding a member (though can always be Root).
-	type AddOrigin: EnsureOrigin<Self::Origin>;
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::storage_version(STORAGE_VERSION)]
+	pub struct Pallet<T, I = ()>(PhantomData<(T, I)>);
 
-	/// Required origin for removing a member (though can always be Root).
-	type RemoveOrigin: EnsureOrigin<Self::Origin>;
+	#[pallet::config]
+	pub trait Config<I: 'static = ()>: frame_system::Config {
+		/// The overarching event type.
+		type Event: From<Event<Self, I>> + IsType<<Self as frame_system::Config>::Event>;
 
-	/// Required origin for adding and removing a member in a single action.
-	type SwapOrigin: EnsureOrigin<Self::Origin>;
+		/// Required origin for adding a member (though can always be Root).
+		type AddOrigin: EnsureOrigin<Self::Origin>;
 
-	/// Required origin for resetting membership.
-	type ResetOrigin: EnsureOrigin<Self::Origin>;
+		/// Required origin for removing a member (though can always be Root).
+		type RemoveOrigin: EnsureOrigin<Self::Origin>;
 
-	/// Required origin for setting or resetting the prime member.
-	type PrimeOrigin: EnsureOrigin<Self::Origin>;
+		/// Required origin for adding and removing a member in a single action.
+		type SwapOrigin: EnsureOrigin<Self::Origin>;
 
-	/// The receiver of the signal for when the membership has been initialized. This happens pre-
-	/// genesis and will usually be the same as `MembershipChanged`. If you need to do something
-	/// different on initialization, then you can change this accordingly.
-	type MembershipInitialized: InitializeMembers<Self::AccountId>;
+		/// Required origin for resetting membership.
+		type ResetOrigin: EnsureOrigin<Self::Origin>;
 
-	/// The receiver of the signal for when the membership has changed.
-	type MembershipChanged: ChangeMembers<Self::AccountId>;
+		/// Required origin for setting or resetting the prime member.
+		type PrimeOrigin: EnsureOrigin<Self::Origin>;
 
-	/// The maximum number of members that this membership can have.
-	///
-	/// This is used for benchmarking. Re-run the benchmarks if this changes.
-	///
-	/// This is not enforced in the code; the membership size can exceed this limit.
-	type MaxMembers: Get<u32>;
+		/// The receiver of the signal for when the membership has been initialized. This happens
+		/// pre-genesis and will usually be the same as `MembershipChanged`. If you need to do
+		/// something different on initialization, then you can change this accordingly.
+		type MembershipInitialized: InitializeMembers<Self::AccountId>;
 
-	/// Weight information for extrinsics in this pallet.
-	type WeightInfo: WeightInfo;
-}
+		/// The receiver of the signal for when the membership has changed.
+		type MembershipChanged: ChangeMembers<Self::AccountId>;
 
-decl_storage! {
-	trait Store for Module<T: Config<I>, I: Instance=DefaultInstance> as Membership {
-		/// The current membership, stored as an ordered Vec.
-		Members get(fn members): Vec<T::AccountId>;
+		/// The maximum number of members that this membership can have.
+		///
+		/// This is used for benchmarking. Re-run the benchmarks if this changes.
+		///
+		/// This is not enforced in the code; the membership size can exceed this limit.
+		type MaxMembers: Get<u32>;
+
+		/// Weight information for extrinsics in this pallet.
+		type WeightInfo: WeightInfo;
+	}
 
-		/// The current prime member, if one exists.
-		Prime get(fn prime): Option<T::AccountId>;
+	/// The current membership, stored as an ordered Vec.
+	#[pallet::storage]
+	#[pallet::getter(fn members)]
+	pub type Members<T: Config<I>, I: 'static = ()> =
+		StorageValue<_, Vec<T::AccountId>, ValueQuery>;
+
+	/// The current prime member, if one exists.
+	#[pallet::storage]
+	#[pallet::getter(fn prime)]
+	pub type Prime<T: Config<I>, I: 'static = ()> = StorageValue<_, T::AccountId, OptionQuery>;
+
+	#[pallet::genesis_config]
+	pub struct GenesisConfig<T: Config<I>, I: 'static = ()> {
+		pub members: Vec<T::AccountId>,
+		pub phantom: PhantomData<I>,
 	}
-	add_extra_genesis {
-		config(members): Vec<T::AccountId>;
-		config(phantom): sp_std::marker::PhantomData<I>;
-		build(|config: &Self| {
-			let mut members = config.members.clone();
 
+	#[cfg(feature = "std")]
+	impl<T: Config<I>, I: 'static> Default for GenesisConfig<T, I> {
+		fn default() -> Self {
+			Self { members: Vec::new(), phantom: Default::default() }
+		}
+	}
+
+	#[pallet::genesis_build]
+	impl<T: Config<I>, I: 'static> GenesisBuild<T, I> for GenesisConfig<T, I> {
+		fn build(&self) {
 			use sp_std::collections::btree_set::BTreeSet;
-			let members_set: BTreeSet<_> = config.members.iter().collect();
-			assert!(members_set.len() == config.members.len(), "Members cannot contain duplicate accounts.");
+			let members_set: BTreeSet<_> = self.members.iter().collect();
+			assert_eq!(
+				members_set.len(),
+				self.members.len(),
+				"Members cannot contain duplicate accounts."
+			);
 
+			let mut members = self.members.clone();
 			members.sort();
 			T::MembershipInitialized::initialize_members(&members);
 			<Members<T, I>>::put(members);
-		})
+		}
 	}
-}
 
-decl_event!(
-	pub enum Event<T, I=DefaultInstance> where
-		<T as frame_system::Config>::AccountId,
-		<T as Config<I>>::Event,
-	{
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	#[pallet::metadata(
+		PhantomData<(T::AccountId, <T as Config<I>>::Event)> = "sp_std::marker::PhantomData<(AccountId, Event)>",
+	)]
+	pub enum Event<T: Config<I>, I: 'static = ()> {
 		/// The given member was added; see the transaction for who.
 		MemberAdded,
 		/// The given member was removed; see the transaction for who.
@@ -112,34 +146,28 @@ decl_event!(
 		/// One of the members' keys changed.
 		KeyChanged,
 		/// Phantom member, never used.
-		Dummy(sp_std::marker::PhantomData<(AccountId, Event)>),
+		Dummy(PhantomData<(T::AccountId, <T as Config<I>>::Event)>),
 	}
-);
 
-decl_error! {
-	/// Error for the nicks module.
-	pub enum Error for Module<T: Config<I>, I: Instance> {
+	/// Old name generated by `decl_event`.
+	#[deprecated(note = "use `Event` instead")]
+	pub type RawEvent<T, I = ()> = Event<T, I>;
+
+	#[pallet::error]
+	pub enum Error<T, I = ()> {
 		/// Already a member.
 		AlreadyMember,
 		/// Not a member.
 		NotMember,
 	}
-}
-
-decl_module! {
-	pub struct Module<T: Config<I>, I: Instance=DefaultInstance>
-		for enum Call
-		where origin: T::Origin
-	{
-		type Error = Error<T, I>;
-
-		fn deposit_event() = default;
 
+	#[pallet::call]
+	impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		/// Add a member `who` to the set.
 		///
 		/// May only be called from `T::AddOrigin`.
-		#[weight = 50_000_000]
-		pub fn add_member(origin, who: T::AccountId) {
+		#[pallet::weight(50_000_000)]
+		pub fn add_member(origin: OriginFor<T>, who: T::AccountId) -> DispatchResult {
 			T::AddOrigin::ensure_origin(origin)?;
 
 			let mut members = <Members<T, I>>::get();
@@ -151,14 +179,15 @@ decl_module! {
 
 			T::MembershipChanged::change_members_sorted(&[who], &[], &members[..]);
 
-			Self::deposit_event(RawEvent::MemberAdded);
+			Self::deposit_event(Event::MemberAdded);
+			Ok(())
 		}
 
 		/// Remove a member `who` from the set.
 		///
 		/// May only be called from `T::RemoveOrigin`.
-		#[weight = 50_000_000]
-		pub fn remove_member(origin, who: T::AccountId) {
+		#[pallet::weight(50_000_000)]
+		pub fn remove_member(origin: OriginFor<T>, who: T::AccountId) -> DispatchResult {
 			T::RemoveOrigin::ensure_origin(origin)?;
 
 			let mut members = <Members<T, I>>::get();
@@ -171,7 +200,8 @@ decl_module! {
 			T::MembershipChanged::change_members_sorted(&[], &[who], &members[..]);
 			Self::rejig_prime(&members);
 
-			Self::deposit_event(RawEvent::MemberRemoved);
+			Self::deposit_event(Event::MemberRemoved);
+			Ok(())
 		}
 
 		/// Swap out one member `remove` for another `add`.
@@ -179,11 +209,17 @@ decl_module! {
 		/// May only be called from `T::SwapOrigin`.
 		///
 		/// Prime membership is *not* passed from `remove` to `add`, if extant.
-		#[weight = 50_000_000]
-		pub fn swap_member(origin, remove: T::AccountId, add: T::AccountId) {
+		#[pallet::weight(50_000_000)]
+		pub fn swap_member(
+			origin: OriginFor<T>,
+			remove: T::AccountId,
+			add: T::AccountId,
+		) -> DispatchResult {
 			T::SwapOrigin::ensure_origin(origin)?;
 
-			if remove == add { return Ok(()) }
+			if remove == add {
+				return Ok(())
+			}
 
 			let mut members = <Members<T, I>>::get();
 			let location = members.binary_search(&remove).ok().ok_or(Error::<T, I>::NotMember)?;
@@ -194,22 +230,19 @@ decl_module! {
 			Self::maybe_warn_max_members(&members);
 			<Members<T, I>>::put(&members);
 
-			T::MembershipChanged::change_members_sorted(
-				&[add],
-				&[remove],
-				&members[..],
-			);
+			T::MembershipChanged::change_members_sorted(&[add], &[remove], &members[..]);
 			Self::rejig_prime(&members);
 
-			Self::deposit_event(RawEvent::MembersSwapped);
+			Self::deposit_event(Event::MembersSwapped);
+			Ok(())
 		}
 
 		/// Change the membership to a new set, disregarding the existing membership. Be nice and
 		/// pass `members` pre-sorted.
 		///
 		/// May only be called from `T::ResetOrigin`.
-		#[weight = 50_000_000]
-		pub fn reset_members(origin, members: Vec<T::AccountId>) {
+		#[pallet::weight(50_000_000)]
+		pub fn reset_members(origin: OriginFor<T>, members: Vec<T::AccountId>) -> DispatchResult {
 			T::ResetOrigin::ensure_origin(origin)?;
 
 			let mut members = members;
@@ -221,7 +254,8 @@ decl_module! {
 				*m = members;
 			});
 
-			Self::deposit_event(RawEvent::MembersReset);
+			Self::deposit_event(Event::MembersReset);
+			Ok(())
 		}
 
 		/// Swap out the sending member for some other key `new`.
@@ -229,13 +263,14 @@ decl_module! {
 		/// May only be called from `Signed` origin of a current member.
 		///
 		/// Prime membership is passed from the origin account to `new`, if extant.
-		#[weight = 50_000_000]
-		pub fn change_key(origin, new: T::AccountId) {
+		#[pallet::weight(50_000_000)]
+		pub fn change_key(origin: OriginFor<T>, new: T::AccountId) -> DispatchResult {
 			let remove = ensure_signed(origin)?;
 
 			if remove != new {
 				let mut members = <Members<T, I>>::get();
-				let location = members.binary_search(&remove).ok().ok_or(Error::<T, I>::NotMember)?;
+				let location =
+					members.binary_search(&remove).ok().ok_or(Error::<T, I>::NotMember)?;
 				let _ = members.binary_search(&new).err().ok_or(Error::<T, I>::AlreadyMember)?;
 				members[location] = new.clone();
 				members.sort();
@@ -255,33 +290,36 @@ decl_module! {
 				}
 			}
 
-			Self::deposit_event(RawEvent::KeyChanged);
+			Self::deposit_event(Event::KeyChanged);
+			Ok(())
 		}
 
 		/// Set the prime member. Must be a current member.
 		///
 		/// May only be called from `T::PrimeOrigin`.
-		#[weight = 50_000_000]
-		pub fn set_prime(origin, who: T::AccountId) {
+		#[pallet::weight(50_000_000)]
+		pub fn set_prime(origin: OriginFor<T>, who: T::AccountId) -> DispatchResult {
 			T::PrimeOrigin::ensure_origin(origin)?;
 			Self::members().binary_search(&who).ok().ok_or(Error::<T, I>::NotMember)?;
 			Prime::<T, I>::put(&who);
 			T::MembershipChanged::set_prime(Some(who));
+			Ok(())
 		}
 
 		/// Remove the prime member if it exists.
 		///
 		/// May only be called from `T::PrimeOrigin`.
-		#[weight = 50_000_000]
-		pub fn clear_prime(origin) {
+		#[pallet::weight(50_000_000)]
+		pub fn clear_prime(origin: OriginFor<T>) -> DispatchResult {
 			T::PrimeOrigin::ensure_origin(origin)?;
 			Prime::<T, I>::kill();
 			T::MembershipChanged::set_prime(None);
+			Ok(())
 		}
 	}
 }
 
-impl<T: Config<I>, I: Instance> Module<T, I> {
+impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	fn rejig_prime(members: &[T::AccountId]) {
 		if let Some(prime) = Prime::<T, I>::get() {
 			match members.binary_search(&prime) {
@@ -303,13 +341,13 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 	}
 }
 
-impl<T: Config<I>, I: Instance> Contains<T::AccountId> for Module<T, I> {
+impl<T: Config<I>, I: 'static> Contains<T::AccountId> for Pallet<T, I> {
 	fn contains(t: &T::AccountId) -> bool {
 		Self::members().binary_search(t).is_ok()
 	}
 }
 
-impl<T: Config<I>, I: Instance> SortedMembers<T::AccountId> for Module<T, I> {
+impl<T: Config<I>, I: 'static> SortedMembers<T::AccountId> for Pallet<T, I> {
 	fn sorted_members() -> Vec<T::AccountId> {
 		Self::members()
 	}
@@ -321,26 +359,28 @@ impl<T: Config<I>, I: Instance> SortedMembers<T::AccountId> for Module<T, I> {
 
 #[cfg(feature = "runtime-benchmarks")]
 mod benchmark {
-	use super::{Module as Membership, *};
-	use frame_benchmarking::{account, benchmarks_instance, impl_benchmark_test_suite, whitelist};
+	use super::{Pallet as Membership, *};
+	use frame_benchmarking::{
+		account, benchmarks_instance_pallet, impl_benchmark_test_suite, whitelist,
+	};
 	use frame_support::{assert_ok, traits::EnsureOrigin};
 	use frame_system::RawOrigin;
 
 	const SEED: u32 = 0;
 
-	fn set_members<T: Config<I>, I: Instance>(members: Vec<T::AccountId>, prime: Option<usize>) {
+	fn set_members<T: Config<I>, I: 'static>(members: Vec<T::AccountId>, prime: Option<usize>) {
 		let reset_origin = T::ResetOrigin::successful_origin();
 		let prime_origin = T::PrimeOrigin::successful_origin();
 
-		assert_ok!(<Membership<T, _>>::reset_members(reset_origin, members.clone()));
+		assert_ok!(<Membership<T, I>>::reset_members(reset_origin, members.clone()));
 		if let Some(prime) = prime.map(|i| members[i].clone()) {
-			assert_ok!(<Membership<T, _>>::set_prime(prime_origin, prime));
+			assert_ok!(<Membership<T, I>>::set_prime(prime_origin, prime));
 		} else {
-			assert_ok!(<Membership<T, _>>::clear_prime(prime_origin));
+			assert_ok!(<Membership<T, I>>::clear_prime(prime_origin));
 		}
 	}
 
-	benchmarks_instance! {
+	benchmarks_instance_pallet! {
 		add_member {
 			let m in 1 .. T::MaxMembers::get();
 
@@ -348,10 +388,10 @@ mod benchmark {
 			set_members::<T, I>(members.clone(), None);
 			let new_member = account::<T::AccountId>("add", m, SEED);
 		}: {
-			assert_ok!(<Membership<T, _>>::add_member(T::AddOrigin::successful_origin(), new_member.clone()));
+			assert_ok!(<Membership<T, I>>::add_member(T::AddOrigin::successful_origin(), new_member.clone()));
 		}
 		verify {
-			assert!(<Members<T, _>>::get().contains(&new_member));
+			assert!(<Members<T, I>>::get().contains(&new_member));
 			#[cfg(test)] crate::tests::clean();
 		}
 
@@ -365,11 +405,11 @@ mod benchmark {
 
 			let to_remove = members.first().cloned().unwrap();
 		}: {
-			assert_ok!(<Membership<T, _>>::remove_member(T::RemoveOrigin::successful_origin(), to_remove.clone()));
+			assert_ok!(<Membership<T, I>>::remove_member(T::RemoveOrigin::successful_origin(), to_remove.clone()));
 		} verify {
-			assert!(!<Members<T, _>>::get().contains(&to_remove));
+			assert!(!<Members<T, I>>::get().contains(&to_remove));
 			// prime is rejigged
-			assert!(<Prime<T, _>>::get().is_some() && T::MembershipChanged::get_prime().is_some());
+			assert!(<Prime<T, I>>::get().is_some() && T::MembershipChanged::get_prime().is_some());
 			#[cfg(test)] crate::tests::clean();
 		}
 
@@ -382,16 +422,16 @@ mod benchmark {
 			let add = account::<T::AccountId>("member", m, SEED);
 			let remove = members.first().cloned().unwrap();
 		}: {
-			assert_ok!(<Membership<T, _>>::swap_member(
+			assert_ok!(<Membership<T, I>>::swap_member(
 				T::SwapOrigin::successful_origin(),
 				remove.clone(),
 				add.clone(),
 			));
 		} verify {
-			assert!(!<Members<T, _>>::get().contains(&remove));
-			assert!(<Members<T, _>>::get().contains(&add));
+			assert!(!<Members<T, I>>::get().contains(&remove));
+			assert!(<Members<T, I>>::get().contains(&add));
 			// prime is rejigged
-			assert!(<Prime<T, _>>::get().is_some() && T::MembershipChanged::get_prime().is_some());
+			assert!(<Prime<T, I>>::get().is_some() && T::MembershipChanged::get_prime().is_some());
 			#[cfg(test)] crate::tests::clean();
 		}
 
@@ -403,12 +443,12 @@ mod benchmark {
 			set_members::<T, I>(members.clone(), Some(members.len() - 1));
 			let mut new_members = (m..2*m).map(|i| account("member", i, SEED)).collect::<Vec<T::AccountId>>();
 		}: {
-			assert_ok!(<Membership<T, _>>::reset_members(T::ResetOrigin::successful_origin(), new_members.clone()));
+			assert_ok!(<Membership<T, I>>::reset_members(T::ResetOrigin::successful_origin(), new_members.clone()));
 		} verify {
 			new_members.sort();
-			assert_eq!(<Members<T, _>>::get(), new_members);
+			assert_eq!(<Members<T, I>>::get(), new_members);
 			// prime is rejigged
-			assert!(<Prime<T, _>>::get().is_some() && T::MembershipChanged::get_prime().is_some());
+			assert!(<Prime<T, I>>::get().is_some() && T::MembershipChanged::get_prime().is_some());
 			#[cfg(test)] crate::tests::clean();
 		}
 
@@ -423,12 +463,12 @@ mod benchmark {
 			let add = account::<T::AccountId>("member", m, SEED);
 			whitelist!(prime);
 		}: {
-			assert_ok!(<Membership<T, _>>::change_key(RawOrigin::Signed(prime.clone()).into(), add.clone()));
+			assert_ok!(<Membership<T, I>>::change_key(RawOrigin::Signed(prime.clone()).into(), add.clone()));
 		} verify {
-			assert!(!<Members<T, _>>::get().contains(&prime));
-			assert!(<Members<T, _>>::get().contains(&add));
+			assert!(!<Members<T, I>>::get().contains(&prime));
+			assert!(<Members<T, I>>::get().contains(&add));
 			// prime is rejigged
-			assert_eq!(<Prime<T, _>>::get().unwrap(), add);
+			assert_eq!(<Prime<T, I>>::get().unwrap(), add);
 			#[cfg(test)] crate::tests::clean();
 		}
 
@@ -438,9 +478,9 @@ mod benchmark {
 			let prime = members.last().cloned().unwrap();
 			set_members::<T, I>(members, None);
 		}: {
-			assert_ok!(<Membership<T, _>>::set_prime(T::PrimeOrigin::successful_origin(), prime));
+			assert_ok!(<Membership<T, I>>::set_prime(T::PrimeOrigin::successful_origin(), prime));
 		} verify {
-			assert!(<Prime<T, _>>::get().is_some());
+			assert!(<Prime<T, I>>::get().is_some());
 			assert!(<T::MembershipChanged>::get_prime().is_some());
 			#[cfg(test)] crate::tests::clean();
 		}
@@ -451,9 +491,9 @@ mod benchmark {
 			let prime = members.last().cloned().unwrap();
 			set_members::<T, I>(members, None);
 		}: {
-			assert_ok!(<Membership<T, _>>::clear_prime(T::PrimeOrigin::successful_origin()));
+			assert_ok!(<Membership<T, I>>::clear_prime(T::PrimeOrigin::successful_origin()));
 		} verify {
-			assert!(<Prime<T, _>>::get().is_none());
+			assert!(<Prime<T, I>>::get().is_none());
 			assert!(<T::MembershipChanged>::get_prime().is_none());
 			#[cfg(test)] crate::tests::clean();
 		}
@@ -467,14 +507,17 @@ mod tests {
 	use super::*;
 	use crate as pallet_membership;
 
-	use frame_support::{assert_noop, assert_ok, ord_parameter_types, parameter_types};
-	use frame_system::EnsureSignedBy;
 	use sp_core::H256;
 	use sp_runtime::{
 		testing::Header,
 		traits::{BadOrigin, BlakeTwo256, IdentityLookup},
 	};
 
+	use frame_support::{
+		assert_noop, assert_ok, ord_parameter_types, parameter_types, traits::GenesisBuild,
+	};
+	use frame_system::EnsureSignedBy;
+
 	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 	type Block = frame_system::mocking::MockBlock<Test>;
 
@@ -745,4 +788,18 @@ mod tests {
 		.build_storage()
 		.unwrap();
 	}
+
+	#[test]
+	fn migration_v4() {
+		new_test_ext().execute_with(|| {
+			use frame_support::traits::PalletInfo;
+			let old_pallet_name =
+				<Test as frame_system::Config>::PalletInfo::name::<Membership>().unwrap();
+			let new_pallet_name = "NewMembership";
+
+			crate::migrations::v4::pre_migrate::<Membership, _>(old_pallet_name, new_pallet_name);
+			crate::migrations::v4::migrate::<Test, Membership, _>(old_pallet_name, new_pallet_name);
+			crate::migrations::v4::post_migrate::<Membership, _>(old_pallet_name, new_pallet_name);
+		});
+	}
 }
diff --git a/frame/membership/src/migrations/mod.rs b/frame/membership/src/migrations/mod.rs
new file mode 100644
index 000000000000..26d07a0cd5ac
--- /dev/null
+++ b/frame/membership/src/migrations/mod.rs
@@ -0,0 +1,19 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/// Version 4.
+pub mod v4;
diff --git a/frame/membership/src/migrations/v4.rs b/frame/membership/src/migrations/v4.rs
new file mode 100644
index 000000000000..9f4b15e468b3
--- /dev/null
+++ b/frame/membership/src/migrations/v4.rs
@@ -0,0 +1,154 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use sp_core::hexdisplay::HexDisplay;
+use sp_io::{hashing::twox_128, storage};
+
+use frame_support::{
+	traits::{
+		Get, GetStorageVersion, PalletInfoAccess, StorageVersion,
+		STORAGE_VERSION_STORAGE_KEY_POSTFIX,
+	},
+	weights::Weight,
+};
+
+/// Migrate the entire storage of this pallet to a new prefix.
+///
+/// This new prefix must be the same as the one set in construct_runtime. For safety, use
+/// `PalletInfo` to get it, as:
+/// `<Runtime as frame_system::Config>::PalletInfo::name::<MembershipPallet>`.
+///
+/// The migration will look into the storage version in order not to trigger a migration on an up
+/// to date storage. Thus the on chain storage version must be less than 4 in order to trigger the
+/// migration.
+pub fn migrate<T: frame_system::Config, P: GetStorageVersion + PalletInfoAccess, N: AsRef<str>>(
+	old_pallet_name: N,
+	new_pallet_name: N,
+) -> Weight {
+	let old_pallet_name = old_pallet_name.as_ref();
+	let new_pallet_name = new_pallet_name.as_ref();
+
+	if new_pallet_name == old_pallet_name {
+		log::info!(
+			target: "runtime::membership",
+			"New pallet name is equal to the old prefix. No migration needs to be done.",
+		);
+		return 0
+	}
+
+	let on_chain_storage_version = <P as GetStorageVersion>::on_chain_storage_version();
+	log::info!(
+		target: "runtime::membership",
+		"Running migration to v4 for membership with storage version {:?}",
+		on_chain_storage_version,
+	);
+
+	if on_chain_storage_version < 4 {
+		frame_support::storage::migration::move_pallet(
+			old_pallet_name.as_bytes(),
+			new_pallet_name.as_bytes(),
+		);
+		log_migration("migration", old_pallet_name, new_pallet_name);
+
+		StorageVersion::new(4).put::<P>();
+		<T as frame_system::Config>::BlockWeights::get().max_block
+	} else {
+		log::warn!(
+			target: "runtime::membership",
+			"Attempted to apply migration to v4 but failed because storage version is {:?}",
+			on_chain_storage_version,
+		);
+		0
+	}
+}
+
+/// Some checks prior to migration. This can be linked to
+/// [`frame_support::traits::OnRuntimeUpgrade::pre_upgrade`] for further testing.
+///
+/// Panics if anything goes wrong.
+pub fn pre_migrate<P: GetStorageVersion, N: AsRef<str>>(old_pallet_name: N, new_pallet_name: N) {
+	let old_pallet_name = old_pallet_name.as_ref();
+	let new_pallet_name = new_pallet_name.as_ref();
+	log_migration("pre-migration", old_pallet_name, new_pallet_name);
+
+	let old_pallet_prefix = twox_128(old_pallet_name.as_bytes());
+	assert!(storage::next_key(&old_pallet_prefix)
+		.map_or(true, |next_key| next_key.starts_with(&old_pallet_prefix)));
+
+	let new_pallet_prefix = twox_128(new_pallet_name.as_bytes());
+	let storage_version_key =
+		[&new_pallet_prefix, &twox_128(STORAGE_VERSION_STORAGE_KEY_POSTFIX)[..]].concat();
+	// ensure nothing is stored in the new prefix.
+	assert!(
+		storage::next_key(&new_pallet_prefix).map_or(
+			// either nothing is there
+			true,
+			// or we ensure that it has no common prefix with twox_128(new),
+			// or isn't the storage version that is already stored using the pallet name
+			|next_key| {
+				!next_key.starts_with(&new_pallet_prefix) || next_key == storage_version_key
+			},
+		),
+		"unexpected next_key({}) = {:?}",
+		new_pallet_name,
+		HexDisplay::from(&storage::next_key(&new_pallet_prefix).unwrap()),
+	);
+	assert!(<P as GetStorageVersion>::on_chain_storage_version() < 4);
+}
+
+/// Some checks for after migration. This can be linked to
+/// [`frame_support::traits::OnRuntimeUpgrade::post_upgrade`] for further testing.
+///
+/// Panics if anything goes wrong.
+pub fn post_migrate<P: GetStorageVersion, N: AsRef<str>>(old_pallet_name: N, new_pallet_name: N) {
+	let old_pallet_name = old_pallet_name.as_ref();
+	let new_pallet_name = new_pallet_name.as_ref();
+	log_migration("post-migration", old_pallet_name, new_pallet_name);
+
+	let old_pallet_prefix = twox_128(old_pallet_name.as_bytes());
+	#[cfg(test)]
+	{
+		let storage_version_key =
+			[&old_pallet_prefix, &twox_128(STORAGE_VERSION_STORAGE_KEY_POSTFIX)[..]].concat();
+		assert!(storage::next_key(&old_pallet_prefix)
+			.map_or(true, |next_key| !next_key.starts_with(&old_pallet_prefix) ||
+				next_key == storage_version_key));
+	}
+	#[cfg(not(test))]
+	{
+		// Assert that nothing remains at the old prefix
+		assert!(storage::next_key(&old_pallet_prefix)
+			.map_or(true, |next_key| !next_key.starts_with(&old_pallet_prefix)));
+	}
+
+	let new_pallet_prefix = twox_128(new_pallet_name.as_bytes());
+	// Assert that the storages have been moved to the new prefix
+	assert!(storage::next_key(&new_pallet_prefix)
+		.map_or(true, |next_key| next_key.starts_with(&new_pallet_prefix)));
+
+	assert_eq!(<P as GetStorageVersion>::on_chain_storage_version(), 4);
+}
+
+fn log_migration(stage: &str, old_pallet_name: &str, new_pallet_name: &str) {
+	log::info!(
+		target: "runtime::membership",
+		"{}, prefix: '{}' ==> '{}'",
+		stage,
+		old_pallet_name,
+		new_pallet_name,
+	);
+}

From 6c7adf17c6b23f2c9e6a1a740772c981389cbaa1 Mon Sep 17 00:00:00 2001
From: Sergejs Kostjucenko <85877331+sergejparity@users.noreply.github.com>
Date: Tue, 7 Sep 2021 15:38:41 +0300
Subject: [PATCH 1149/1194] Fix buildah issue 3500 (#9716)

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6f58af8c746b..0001d4f1702b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -601,7 +601,7 @@ build-rustdoc:
     - buildah push --format=v2s2 "$IMAGE_NAME:$VERSION"
     - buildah push --format=v2s2 "$IMAGE_NAME:latest"
   after_script:
-    - buildah logout "$IMAGE_NAME"
+    - buildah logout --all
     # pass artifacts to the trigger-simnet job
     - echo "SUBSTRATE_IMAGE_NAME=${IMAGE_NAME}" | tee -a ./artifacts/$PRODUCT/build.env
     - IMAGE_TAG="$(cat ./artifacts/$PRODUCT/VERSION)"

From 6e15de9703bfe09b85efa33fd6e3a94d2446dd01 Mon Sep 17 00:00:00 2001
From: Falco Hirschenberger <falco.hirschenberger@gmail.com>
Date: Tue, 7 Sep 2021 15:31:25 +0200
Subject: [PATCH 1150/1194] Store the database in a role specific subdirectory
 (#9645)

* Store the database in a role specific subdirectory

This is a cleaned up version of #8658 fixing #6880

polkadot companion: paritytech/polkadot#2923

* Disable prometheus in tests

* Also change p2p port

* Fix migration logic

* Use different identification file for rocks and parity db

Add tests for paritydb migration
---
 Cargo.lock                                    |   1 +
 bin/node/cli/Cargo.toml                       |   1 +
 bin/node/cli/tests/check_block_works.rs       |   2 +-
 bin/node/cli/tests/common.rs                  |  15 +-
 .../tests/database_role_subdir_migration.rs   | 115 ++++++++++++++
 bin/node/cli/tests/export_import_flow.rs      |   2 +-
 bin/node/cli/tests/inspect_works.rs           |   2 +-
 bin/node/cli/tests/purge_chain_works.rs       |   4 +-
 client/cli/src/config.rs                      |  11 +-
 client/db/src/lib.rs                          |  18 ++-
 client/db/src/upgrade.rs                      |  23 +--
 client/db/src/utils.rs                        | 147 +++++++++++++++++-
 12 files changed, 317 insertions(+), 24 deletions(-)
 create mode 100644 bin/node/cli/tests/database_role_subdir_migration.rs

diff --git a/Cargo.lock b/Cargo.lock
index 529fbfc17315..d5205f0dd411 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4336,6 +4336,7 @@ dependencies = [
  "sc-chain-spec",
  "sc-cli",
  "sc-client-api",
+ "sc-client-db",
  "sc-consensus",
  "sc-consensus-babe",
  "sc-consensus-epochs",
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index 75ac03266cff..acbf1b9888b8 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -109,6 +109,7 @@ sp-trie = { version = "4.0.0-dev", default-features = false, path = "../../../pr
 
 [dev-dependencies]
 sc-keystore = { version = "4.0.0-dev", path = "../../../client/keystore" }
+sc-client-db = { version = "0.10.0-dev", path = "../../../client/db" }
 sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/common" }
 sc-consensus-babe = { version = "0.10.0-dev", path = "../../../client/consensus/babe" }
 sc-consensus-epochs = { version = "0.10.0-dev", path = "../../../client/consensus/epochs" }
diff --git a/bin/node/cli/tests/check_block_works.rs b/bin/node/cli/tests/check_block_works.rs
index 39963fb00287..707fd217e33e 100644
--- a/bin/node/cli/tests/check_block_works.rs
+++ b/bin/node/cli/tests/check_block_works.rs
@@ -28,7 +28,7 @@ pub mod common;
 fn check_block_works() {
 	let base_path = tempdir().expect("could not create a temp dir");
 
-	common::run_dev_node_for_a_while(base_path.path());
+	common::run_node_for_a_while(base_path.path(), &["--dev"]);
 
 	let status = Command::new(cargo_bin("substrate"))
 		.args(&["check-block", "--dev", "--pruning", "archive", "-d"])
diff --git a/bin/node/cli/tests/common.rs b/bin/node/cli/tests/common.rs
index 50776202d79e..54b9c749bf1d 100644
--- a/bin/node/cli/tests/common.rs
+++ b/bin/node/cli/tests/common.rs
@@ -54,10 +54,10 @@ pub fn wait_for(child: &mut Child, secs: usize) -> Option<ExitStatus> {
 }
 
 /// Run the node for a while (30 seconds)
-pub fn run_dev_node_for_a_while(base_path: &Path) {
+pub fn run_node_for_a_while(base_path: &Path, args: &[&str]) {
 	let mut cmd = Command::new(cargo_bin("substrate"));
 
-	let mut cmd = cmd.args(&["--dev"]).arg("-d").arg(base_path).spawn().unwrap();
+	let mut cmd = cmd.args(args).arg("-d").arg(base_path).spawn().unwrap();
 
 	// Let it produce some blocks.
 	thread::sleep(Duration::from_secs(30));
@@ -67,3 +67,14 @@ pub fn run_dev_node_for_a_while(base_path: &Path) {
 	kill(Pid::from_raw(cmd.id().try_into().unwrap()), SIGINT).unwrap();
 	assert!(wait_for(&mut cmd, 40).map(|x| x.success()).unwrap_or_default());
 }
+
+/// Run the node asserting that it fails with an error
+pub fn run_node_assert_fail(base_path: &Path, args: &[&str]) {
+	let mut cmd = Command::new(cargo_bin("substrate"));
+
+	let mut cmd = cmd.args(args).arg("-d").arg(base_path).spawn().unwrap();
+
+	// Let it produce some blocks.
+	thread::sleep(Duration::from_secs(10));
+	assert!(cmd.try_wait().unwrap().is_some(), "the process should not be running anymore");
+}
diff --git a/bin/node/cli/tests/database_role_subdir_migration.rs b/bin/node/cli/tests/database_role_subdir_migration.rs
new file mode 100644
index 000000000000..516908111ae7
--- /dev/null
+++ b/bin/node/cli/tests/database_role_subdir_migration.rs
@@ -0,0 +1,115 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+use sc_client_db::{
+	light::LightStorage, DatabaseSettings, DatabaseSource, KeepBlocks, PruningMode,
+	TransactionStorageMode,
+};
+use sp_runtime::testing::{Block as RawBlock, ExtrinsicWrapper};
+use tempfile::tempdir;
+
+pub mod common;
+
+#[test]
+#[cfg(unix)]
+fn database_role_subdir_migration() {
+	type Block = RawBlock<ExtrinsicWrapper<u64>>;
+
+	let base_path = tempdir().expect("could not create a temp dir");
+	let path = base_path.path().join("chains/dev/db");
+	// create a dummy database dir
+	{
+		let _old_db = LightStorage::<Block>::new(DatabaseSettings {
+			state_cache_size: 0,
+			state_cache_child_ratio: None,
+			state_pruning: PruningMode::ArchiveAll,
+			source: DatabaseSource::RocksDb { path: path.to_path_buf(), cache_size: 128 },
+			keep_blocks: KeepBlocks::All,
+			transaction_storage: TransactionStorageMode::BlockBody,
+		})
+		.unwrap();
+	}
+
+	assert!(path.join("db_version").exists());
+	assert!(!path.join("light").exists());
+
+	// start a light client
+	common::run_node_for_a_while(
+		base_path.path(),
+		&[
+			"--dev",
+			"--light",
+			"--port",
+			"30335",
+			"--rpc-port",
+			"44444",
+			"--ws-port",
+			"44445",
+			"--no-prometheus",
+		],
+	);
+
+	// check if the database dir had been migrated
+	assert!(!path.join("db_version").exists());
+	assert!(path.join("light/db_version").exists());
+}
+
+#[test]
+#[cfg(unix)]
+fn database_role_subdir_migration_fail_on_different_role() {
+	type Block = RawBlock<ExtrinsicWrapper<u64>>;
+
+	let base_path = tempdir().expect("could not create a temp dir");
+	let path = base_path.path().join("chains/dev/db");
+
+	// create a database with the old layout
+	{
+		let _old_db = LightStorage::<Block>::new(DatabaseSettings {
+			state_cache_size: 0,
+			state_cache_child_ratio: None,
+			state_pruning: PruningMode::ArchiveAll,
+			source: DatabaseSource::RocksDb { path: path.to_path_buf(), cache_size: 128 },
+			keep_blocks: KeepBlocks::All,
+			transaction_storage: TransactionStorageMode::BlockBody,
+		})
+		.unwrap();
+	}
+
+	assert!(path.join("db_version").exists());
+	assert!(!path.join("light/db_version").exists());
+
+	// start a client with a different role (full), it should fail and not change any files on disk
+	common::run_node_assert_fail(
+		&base_path.path(),
+		&[
+			"--dev",
+			"--port",
+			"30334",
+			"--rpc-port",
+			"44446",
+			"--ws-port",
+			"44447",
+			"--no-prometheus",
+		],
+	);
+
+	// check if the files are unchanged
+	assert!(path.join("db_version").exists());
+	assert!(!path.join("light/db_version").exists());
+	assert!(!path.join("full/db_version").exists());
+}
diff --git a/bin/node/cli/tests/export_import_flow.rs b/bin/node/cli/tests/export_import_flow.rs
index 7bf64900b752..7cbaa152699b 100644
--- a/bin/node/cli/tests/export_import_flow.rs
+++ b/bin/node/cli/tests/export_import_flow.rs
@@ -188,7 +188,7 @@ fn export_import_revert() {
 	let exported_blocks_file = base_path.path().join("exported_blocks");
 	let db_path = base_path.path().join("db");
 
-	common::run_dev_node_for_a_while(base_path.path());
+	common::run_node_for_a_while(base_path.path(), &["--dev"]);
 
 	let mut executor = ExportImportRevertExecutor::new(&base_path, &exported_blocks_file, &db_path);
 
diff --git a/bin/node/cli/tests/inspect_works.rs b/bin/node/cli/tests/inspect_works.rs
index 67dbc97056cf..2a89801547a4 100644
--- a/bin/node/cli/tests/inspect_works.rs
+++ b/bin/node/cli/tests/inspect_works.rs
@@ -28,7 +28,7 @@ pub mod common;
 fn inspect_works() {
 	let base_path = tempdir().expect("could not create a temp dir");
 
-	common::run_dev_node_for_a_while(base_path.path());
+	common::run_node_for_a_while(base_path.path(), &["--dev"]);
 
 	let status = Command::new(cargo_bin("substrate"))
 		.args(&["inspect", "--dev", "--pruning", "archive", "-d"])
diff --git a/bin/node/cli/tests/purge_chain_works.rs b/bin/node/cli/tests/purge_chain_works.rs
index 4c0727d26cb1..0f16a51e5d0a 100644
--- a/bin/node/cli/tests/purge_chain_works.rs
+++ b/bin/node/cli/tests/purge_chain_works.rs
@@ -27,7 +27,7 @@ pub mod common;
 fn purge_chain_works() {
 	let base_path = tempdir().expect("could not create a temp dir");
 
-	common::run_dev_node_for_a_while(base_path.path());
+	common::run_node_for_a_while(base_path.path(), &["--dev"]);
 
 	let status = Command::new(cargo_bin("substrate"))
 		.args(&["purge-chain", "--dev", "-d"])
@@ -39,5 +39,5 @@ fn purge_chain_works() {
 
 	// Make sure that the `dev` chain folder exists, but the `db` is deleted.
 	assert!(base_path.path().join("chains/dev/").exists());
-	assert!(!base_path.path().join("chains/dev/db").exists());
+	assert!(!base_path.path().join("chains/dev/db/full").exists());
 }
diff --git a/client/cli/src/config.rs b/client/cli/src/config.rs
index bfc7c6eb7bac..36f267e4a300 100644
--- a/client/cli/src/config.rs
+++ b/client/cli/src/config.rs
@@ -219,9 +219,14 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 		base_path: &PathBuf,
 		cache_size: usize,
 		database: Database,
+		role: &Role,
 	) -> Result<DatabaseSource> {
-		let rocksdb_path = base_path.join("db");
-		let paritydb_path = base_path.join("paritydb");
+		let role_dir = match role {
+			Role::Light => "light",
+			Role::Full | Role::Authority => "full",
+		};
+		let rocksdb_path = base_path.join("db").join(role_dir);
+		let paritydb_path = base_path.join("paritydb").join(role_dir);
 		Ok(match database {
 			Database::RocksDb => DatabaseSource::RocksDb { path: rocksdb_path, cache_size },
 			Database::ParityDb => DatabaseSource::ParityDb { path: rocksdb_path },
@@ -499,7 +504,7 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 			)?,
 			keystore_remote,
 			keystore,
-			database: self.database_config(&config_dir, database_cache_size, database)?,
+			database: self.database_config(&config_dir, database_cache_size, database, &role)?,
 			state_cache_size: self.state_cache_size()?,
 			state_cache_child_ratio: self.state_cache_child_ratio()?,
 			state_pruning: self.state_pruning(unsafe_pruning, &role)?,
diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index c7d6029c5356..66adb64c0109 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -355,7 +355,7 @@ pub enum DatabaseSource {
 }
 
 impl DatabaseSource {
-	/// Return dabase path for databases that are on the disk.
+	/// Return path for databases that are stored on disk.
 	pub fn path(&self) -> Option<&Path> {
 		match self {
 			// as per https://github.com/paritytech/substrate/pull/9500#discussion_r684312550
@@ -367,6 +367,22 @@ impl DatabaseSource {
 			DatabaseSource::Custom(..) => None,
 		}
 	}
+
+	/// Set path for databases that are stored on disk.
+	pub fn set_path(&mut self, p: &Path) -> bool {
+		match self {
+			DatabaseSource::Auto { ref mut paritydb_path, .. } => {
+				*paritydb_path = p.into();
+				true
+			},
+			DatabaseSource::RocksDb { ref mut path, .. } |
+			DatabaseSource::ParityDb { ref mut path } => {
+				*path = p.into();
+				true
+			},
+			DatabaseSource::Custom(..) => false,
+		}
+	}
 }
 
 impl std::fmt::Display for DatabaseSource {
diff --git a/client/db/src/upgrade.rs b/client/db/src/upgrade.rs
index 5c9c2ccdc51d..0f3578ad99a3 100644
--- a/client/db/src/upgrade.rs
+++ b/client/db/src/upgrade.rs
@@ -186,7 +186,7 @@ mod tests {
 		}
 	}
 
-	fn open_database(db_path: &Path) -> sp_blockchain::Result<()> {
+	fn open_database(db_path: &Path, db_type: DatabaseType) -> sp_blockchain::Result<()> {
 		crate::utils::open_database::<Block>(
 			&DatabaseSettings {
 				state_cache_size: 0,
@@ -196,7 +196,7 @@ mod tests {
 				keep_blocks: KeepBlocks::All,
 				transaction_storage: TransactionStorageMode::BlockBody,
 			},
-			DatabaseType::Full,
+			db_type,
 		)
 		.map(|_| ())
 	}
@@ -205,25 +205,28 @@ mod tests {
 	fn downgrade_never_happens() {
 		let db_dir = tempfile::TempDir::new().unwrap();
 		create_db(db_dir.path(), Some(CURRENT_VERSION + 1));
-		assert!(open_database(db_dir.path()).is_err());
+		assert!(open_database(db_dir.path(), DatabaseType::Full).is_err());
 	}
 
 	#[test]
 	fn open_empty_database_works() {
+		let db_type = DatabaseType::Full;
 		let db_dir = tempfile::TempDir::new().unwrap();
-		open_database(db_dir.path()).unwrap();
-		open_database(db_dir.path()).unwrap();
-		assert_eq!(current_version(db_dir.path()).unwrap(), CURRENT_VERSION);
+		let db_dir = db_dir.path().join(db_type.as_str());
+		open_database(&db_dir, db_type).unwrap();
+		open_database(&db_dir, db_type).unwrap();
+		assert_eq!(current_version(&db_dir).unwrap(), CURRENT_VERSION);
 	}
 
 	#[test]
 	fn upgrade_to_3_works() {
+		let db_type = DatabaseType::Full;
 		for version_from_file in &[None, Some(1), Some(2)] {
 			let db_dir = tempfile::TempDir::new().unwrap();
-			let db_path = db_dir.path();
-			create_db(db_path, *version_from_file);
-			open_database(db_path).unwrap();
-			assert_eq!(current_version(db_path).unwrap(), CURRENT_VERSION);
+			let db_path = db_dir.path().join(db_type.as_str());
+			create_db(&db_path, *version_from_file);
+			open_database(&db_path, db_type).unwrap();
+			assert_eq!(current_version(&db_path).unwrap(), CURRENT_VERSION);
 		}
 	}
 }
diff --git a/client/db/src/utils.rs b/client/db/src/utils.rs
index 604a0e132876..ea22c774f463 100644
--- a/client/db/src/utils.rs
+++ b/client/db/src/utils.rs
@@ -19,9 +19,9 @@
 //! Db-based backend utility structures and functions, used by both
 //! full and light storages.
 
-use std::{convert::TryInto, fmt, io, path::Path, sync::Arc};
+use std::{convert::TryInto, fmt, fs, io, path::Path, sync::Arc};
 
-use log::debug;
+use log::{debug, info};
 
 use crate::{Database, DatabaseSettings, DatabaseSource, DbHash};
 use codec::Decode;
@@ -213,7 +213,21 @@ pub fn open_database<Block: BlockT>(
 	config: &DatabaseSettings,
 	db_type: DatabaseType,
 ) -> sp_blockchain::Result<Arc<dyn Database<DbHash>>> {
-	let db: Arc<dyn Database<DbHash>> = match &config.source {
+	// Maybe migrate (copy) the database to a type specific subdirectory to make it
+	// possible that light and full databases coexist
+	// NOTE: This function can be removed in a few releases
+	maybe_migrate_to_type_subdir::<Block>(&config.source, db_type).map_err(|e| {
+		sp_blockchain::Error::Backend(format!("Error in migration to role subdirectory: {}", e))
+	})?;
+
+	open_database_at::<Block>(&config.source, db_type)
+}
+
+fn open_database_at<Block: BlockT>(
+	source: &DatabaseSource,
+	db_type: DatabaseType,
+) -> sp_blockchain::Result<Arc<dyn Database<DbHash>>> {
+	let db: Arc<dyn Database<DbHash>> = match &source {
 		DatabaseSource::ParityDb { path } => open_parity_db::<Block>(&path, db_type, true)?,
 		DatabaseSource::RocksDb { path, cache_size } =>
 			open_kvdb_rocksdb::<Block>(&path, db_type, true, *cache_size)?,
@@ -394,6 +408,46 @@ pub fn check_database_type(
 	Ok(())
 }
 
+fn maybe_migrate_to_type_subdir<Block: BlockT>(
+	source: &DatabaseSource,
+	db_type: DatabaseType,
+) -> io::Result<()> {
+	if let Some(p) = source.path() {
+		let mut basedir = p.to_path_buf();
+		basedir.pop();
+
+		// Do we have to migrate to a database-type-based subdirectory layout:
+		// See if there's a file identifying a rocksdb or paritydb folder in the parent dir and
+		// the target path ends in a role specific directory
+		if (basedir.join("db_version").exists() || basedir.join("metadata").exists()) &&
+			(p.ends_with(DatabaseType::Full.as_str()) ||
+				p.ends_with(DatabaseType::Light.as_str()))
+		{
+			// Try to open the database to check if the current `DatabaseType` matches the type of
+			// database stored in the target directory and close the database on success.
+			let mut old_source = source.clone();
+			old_source.set_path(&basedir);
+			open_database_at::<Block>(&old_source, db_type)
+				.map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))?;
+
+			info!(
+				"Migrating database to a database-type-based subdirectory: '{:?}' -> '{:?}'",
+				basedir,
+				basedir.join(db_type.as_str())
+			);
+			let mut tmp_dir = basedir.clone();
+			tmp_dir.pop();
+			tmp_dir.push("tmp");
+
+			fs::rename(&basedir, &tmp_dir)?;
+			fs::create_dir_all(&p)?;
+			fs::rename(tmp_dir, &p)?;
+		}
+	}
+
+	Ok(())
+}
+
 /// Read database column entry for the given block.
 pub fn read_db<Block>(
 	db: &dyn Database<DbHash>,
@@ -570,8 +624,95 @@ mod tests {
 	use codec::Input;
 	use sc_state_db::PruningMode;
 	use sp_runtime::testing::{Block as RawBlock, ExtrinsicWrapper};
+	use std::path::PathBuf;
 	type Block = RawBlock<ExtrinsicWrapper<u32>>;
 
+	#[cfg(any(feature = "with-kvdb-rocksdb", test))]
+	#[test]
+	fn database_type_subdir_migration() {
+		type Block = RawBlock<ExtrinsicWrapper<u64>>;
+
+		fn check_dir_for_db_type(
+			db_type: DatabaseType,
+			mut source: DatabaseSource,
+			db_check_file: &str,
+		) {
+			let base_path = tempfile::TempDir::new().unwrap();
+			let old_db_path = base_path.path().join("chains/dev/db");
+
+			source.set_path(&old_db_path);
+			let settings = db_settings(source.clone());
+
+			{
+				let db_res = open_database::<Block>(&settings, db_type);
+				assert!(db_res.is_ok(), "New database should be created.");
+				assert!(old_db_path.join(db_check_file).exists());
+				assert!(!old_db_path.join(db_type.as_str()).join("db_version").exists());
+			}
+
+			source.set_path(&old_db_path.join(db_type.as_str()));
+			let settings = db_settings(source);
+			let db_res = open_database::<Block>(&settings, db_type);
+			assert!(db_res.is_ok(), "Reopening the db with the same role should work");
+			// check if the database dir had been migrated
+			assert!(!old_db_path.join(db_check_file).exists());
+			assert!(old_db_path.join(db_type.as_str()).join(db_check_file).exists());
+		}
+
+		check_dir_for_db_type(
+			DatabaseType::Light,
+			DatabaseSource::RocksDb { path: PathBuf::new(), cache_size: 128 },
+			"db_version",
+		);
+		check_dir_for_db_type(
+			DatabaseType::Full,
+			DatabaseSource::RocksDb { path: PathBuf::new(), cache_size: 128 },
+			"db_version",
+		);
+
+		#[cfg(feature = "with-parity-db")]
+		check_dir_for_db_type(
+			DatabaseType::Light,
+			DatabaseSource::ParityDb { path: PathBuf::new() },
+			"metadata",
+		);
+		#[cfg(feature = "with-parity-db")]
+		check_dir_for_db_type(
+			DatabaseType::Full,
+			DatabaseSource::ParityDb { path: PathBuf::new() },
+			"metadata",
+		);
+
+		// check failure on reopening with wrong role
+		{
+			let base_path = tempfile::TempDir::new().unwrap();
+			let old_db_path = base_path.path().join("chains/dev/db");
+
+			let source = DatabaseSource::RocksDb { path: old_db_path.clone(), cache_size: 128 };
+			let settings = db_settings(source);
+			{
+				let db_res = open_database::<Block>(&settings, DatabaseType::Full);
+				assert!(db_res.is_ok(), "New database should be created.");
+
+				// check if the database dir had been migrated
+				assert!(old_db_path.join("db_version").exists());
+				assert!(!old_db_path.join("light/db_version").exists());
+				assert!(!old_db_path.join("full/db_version").exists());
+			}
+			let source = DatabaseSource::RocksDb {
+				path: old_db_path.join(DatabaseType::Light.as_str()),
+				cache_size: 128,
+			};
+			let settings = db_settings(source);
+			let db_res = open_database::<Block>(&settings, DatabaseType::Light);
+			assert!(db_res.is_err(), "Opening a light database in full role should fail");
+			// assert nothing was changed
+			assert!(old_db_path.join("db_version").exists());
+			assert!(!old_db_path.join("light/db_version").exists());
+			assert!(!old_db_path.join("full/db_version").exists());
+		}
+	}
+
 	#[test]
 	fn number_index_key_doesnt_panic() {
 		let id = BlockId::<Block>::Number(72340207214430721);

From 8b8eb754d30a82bc94176952b14a7700514e8f3e Mon Sep 17 00:00:00 2001
From: cheme <emericchevalier.pro@gmail.com>
Date: Tue, 7 Sep 2021 18:21:42 +0200
Subject: [PATCH 1151/1194] Fix compact proof decoding unaccessed last child
 trie.  (#9715)

* fix no child proof attached but root included.

* small stress test for proof of child tries.

* rust fmt
---
 primitives/state-machine/Cargo.toml |   1 +
 primitives/state-machine/src/lib.rs | 102 ++++++++++++++++++++++++++++
 primitives/trie/src/trie_codec.rs   |   3 +-
 3 files changed, 105 insertions(+), 1 deletion(-)

diff --git a/primitives/state-machine/Cargo.toml b/primitives/state-machine/Cargo.toml
index e5c9ea989068..dc54486e2078 100644
--- a/primitives/state-machine/Cargo.toml
+++ b/primitives/state-machine/Cargo.toml
@@ -35,6 +35,7 @@ tracing = { version = "0.1.22", optional = true }
 hex-literal = "0.3.1"
 sp-runtime = { version = "4.0.0-dev", path = "../runtime" }
 pretty_assertions = "0.6.1"
+rand = { version = "0.7.2", feature = ["small_rng"] }
 
 [features]
 default = ["std"]
diff --git a/primitives/state-machine/src/lib.rs b/primitives/state-machine/src/lib.rs
index e12be0c586b7..032899faeb52 100644
--- a/primitives/state-machine/src/lib.rs
+++ b/primitives/state-machine/src/lib.rs
@@ -1515,7 +1515,9 @@ mod tests {
 	#[test]
 	fn prove_read_and_proof_check_works() {
 		let child_info = ChildInfo::new_default(b"sub1");
+		let missing_child_info = ChildInfo::new_default(b"sub1sub2"); // key will include other child root to proof.
 		let child_info = &child_info;
+		let missing_child_info = &missing_child_info;
 		// fetch read proof from 'remote' full node
 		let remote_backend = trie_backend::tests::test_trie();
 		let remote_root = remote_backend.storage_root(std::iter::empty()).0;
@@ -1553,11 +1555,111 @@ mod tests {
 			&[b"value2"],
 		)
 		.unwrap();
+		let local_result3 = read_child_proof_check::<BlakeTwo256, _>(
+			remote_root,
+			remote_proof.clone(),
+			missing_child_info,
+			&[b"dummy"],
+		)
+		.unwrap();
+
 		assert_eq!(
 			local_result1.into_iter().collect::<Vec<_>>(),
 			vec![(b"value3".to_vec(), Some(vec![142]))],
 		);
 		assert_eq!(local_result2.into_iter().collect::<Vec<_>>(), vec![(b"value2".to_vec(), None)]);
+		assert_eq!(local_result3.into_iter().collect::<Vec<_>>(), vec![(b"dummy".to_vec(), None)]);
+	}
+
+	#[test]
+	fn child_read_compact_stress_test() {
+		use rand::{rngs::SmallRng, RngCore, SeedableRng};
+		let mut storage: HashMap<Option<ChildInfo>, BTreeMap<StorageKey, StorageValue>> =
+			Default::default();
+		let mut seed = [0; 16];
+		for i in 0..50u32 {
+			let mut child_infos = Vec::new();
+			&seed[0..4].copy_from_slice(&i.to_be_bytes()[..]);
+			let mut rand = SmallRng::from_seed(seed);
+
+			let nb_child_trie = rand.next_u32() as usize % 25;
+			for _ in 0..nb_child_trie {
+				let key_len = 1 + (rand.next_u32() % 10);
+				let mut key = vec![0; key_len as usize];
+				rand.fill_bytes(&mut key[..]);
+				let child_info = ChildInfo::new_default(key.as_slice());
+				let nb_item = 1 + rand.next_u32() % 25;
+				let mut items = BTreeMap::new();
+				for item in 0..nb_item {
+					let key_len = 1 + (rand.next_u32() % 10);
+					let mut key = vec![0; key_len as usize];
+					rand.fill_bytes(&mut key[..]);
+					let value = vec![item as u8; item as usize + 28];
+					items.insert(key, value);
+				}
+				child_infos.push(child_info.clone());
+				storage.insert(Some(child_info), items);
+			}
+
+			let trie: InMemoryBackend<BlakeTwo256> = storage.clone().into();
+			let trie_root = trie.root().clone();
+			let backend = crate::ProvingBackend::new(&trie);
+			let mut queries = Vec::new();
+			for c in 0..(5 + nb_child_trie / 2) {
+				// random existing query
+				let child_info = if c < 5 {
+					// 4 missing child trie
+					let key_len = 1 + (rand.next_u32() % 10);
+					let mut key = vec![0; key_len as usize];
+					rand.fill_bytes(&mut key[..]);
+					ChildInfo::new_default(key.as_slice())
+				} else {
+					child_infos[rand.next_u32() as usize % nb_child_trie].clone()
+				};
+
+				if let Some(values) = storage.get(&Some(child_info.clone())) {
+					for _ in 0..(1 + values.len() / 2) {
+						let ix = rand.next_u32() as usize % values.len();
+						for (i, (key, value)) in values.iter().enumerate() {
+							if i == ix {
+								assert_eq!(
+									&backend
+										.child_storage(&child_info, key.as_slice())
+										.unwrap()
+										.unwrap(),
+									value
+								);
+								queries.push((
+									child_info.clone(),
+									key.clone(),
+									Some(value.clone()),
+								));
+								break
+							}
+						}
+					}
+				}
+				for _ in 0..4 {
+					let key_len = 1 + (rand.next_u32() % 10);
+					let mut key = vec![0; key_len as usize];
+					rand.fill_bytes(&mut key[..]);
+					let result = backend.child_storage(&child_info, key.as_slice()).unwrap();
+					queries.push((child_info.clone(), key, result));
+				}
+			}
+
+			let storage_proof = backend.extract_proof();
+			let remote_proof = test_compact(storage_proof, &trie_root);
+			let proof_check =
+				create_proof_check_backend::<BlakeTwo256>(trie_root, remote_proof).unwrap();
+
+			for (child_info, key, expected) in queries {
+				assert_eq!(
+					proof_check.child_storage(&child_info, key.as_slice()).unwrap(),
+					expected,
+				);
+			}
+		}
 	}
 
 	#[test]
diff --git a/primitives/trie/src/trie_codec.rs b/primitives/trie/src/trie_codec.rs
index 8f2f44317649..1596229f2b5d 100644
--- a/primitives/trie/src/trie_codec.rs
+++ b/primitives/trie/src/trie_codec.rs
@@ -161,8 +161,9 @@ where
 	}
 
 	let mut previous_extracted_child_trie = None;
+	let mut nodes_iter = nodes_iter.peekable();
 	for child_root in child_tries.into_iter() {
-		if previous_extracted_child_trie.is_none() {
+		if previous_extracted_child_trie.is_none() && nodes_iter.peek().is_some() {
 			let (top_root, _) =
 				trie_db::decode_compact_from_iter::<L, _, _, _>(db, &mut nodes_iter)?;
 			previous_extracted_child_trie = Some(top_root);

From e45dab39260c160b485d8e31a764b68da20028f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Silva=20de=20Souza?=
 <77391175+joao-paulo-parity@users.noreply.github.com>
Date: Tue, 7 Sep 2021 17:57:58 -0300
Subject: [PATCH 1152/1194] disable unleash-check (#9705)

the last successful run of this check was on f00ec46a5fd4136d48b91a5f9122f2c1f41f6ad0 and it had been failing even before that

should be re-enabled lated
---
 .gitlab-ci.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0001d4f1702b..74ed64315d62 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -365,20 +365,20 @@ test-linux-stable:                 &test-linux
     - SUBSTRATE_TEST_TIMEOUT=1 time cargo test -p substrate-test-utils --release --verbose --locked -- --ignored timeout
     - sccache -s
 
-unleash-check:
-  stage:                           test
-  <<:                              *docker-env
-  <<:                              *test-refs-no-trigger
-  script:
-    - cargo install cargo-unleash ${CARGO_UNLEASH_INSTALL_PARAMS}
-    - cargo unleash de-dev-deps
+#unleash-check:
+  #stage:                           test
+  #<<:                              *docker-env
+  #<<:                              *test-refs-no-trigger
+  #script:
+    #- cargo install cargo-unleash ${CARGO_UNLEASH_INSTALL_PARAMS}
+    #- cargo unleash de-dev-deps
     # Reuse build artifacts when running checks (cuts down check time by 3x)
     # TODO: Implement this optimization in cargo-unleash rather than here
-    - mkdir -p target/unleash
-    - export CARGO_TARGET_DIR=target/unleash
-    - cargo unleash check ${CARGO_UNLEASH_PKG_DEF}
+    #- mkdir -p target/unleash
+    #- export CARGO_TARGET_DIR=target/unleash
+    #- cargo unleash check ${CARGO_UNLEASH_PKG_DEF}
   # FIXME: this job must not fail, or unleash-to-crates-io will publish broken stuff
-  allow_failure:                   true
+  #allow_failure:                   true
 
 test-frame-examples-compile-to-wasm:
   # into one job

From 89cd02d23489f97e177c293aea603cf105b949bd Mon Sep 17 00:00:00 2001
From: Alexander Popiak <alexander.popiak@parity.io>
Date: Wed, 8 Sep 2021 10:48:49 +0200
Subject: [PATCH 1153/1194] add query types to generate_storage_alias (#9659)

* add query types to generate_storage_alias

* adjust comment

* use ValueQuery explicitly for generate_storage_alias with generic value type

* bump impl_version

* adjust line width and add import

* more compilation and formatting fixes

* formatting
---
 bin/node/runtime/src/lib.rs                   |  2 +-
 frame/elections-phragmen/src/migrations/v3.rs | 16 ++++--
 frame/offences/src/migration.rs               |  6 ++-
 frame/support/src/lib.rs                      | 51 +++++++++++++++----
 4 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 5acc429e952b..936dc1c35c84 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -118,7 +118,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	// implementation changes and behavior does not, then leave spec_version as
 	// is and increment impl_version.
 	spec_version: 267,
-	impl_version: 0,
+	impl_version: 1,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 2,
 };
diff --git a/frame/elections-phragmen/src/migrations/v3.rs b/frame/elections-phragmen/src/migrations/v3.rs
index fae191373fa1..728e0c4b0c91 100644
--- a/frame/elections-phragmen/src/migrations/v3.rs
+++ b/frame/elections-phragmen/src/migrations/v3.rs
@@ -19,6 +19,7 @@
 
 use codec::{Decode, Encode, FullCodec};
 use frame_support::{
+	pallet_prelude::ValueQuery,
 	traits::{PalletInfoAccess, StorageVersion},
 	weights::Weight,
 	RuntimeDebug, Twox64Concat,
@@ -52,13 +53,22 @@ pub trait V2ToV3 {
 }
 
 frame_support::generate_storage_alias!(
-	PhragmenElection, Candidates<T: V2ToV3> => Value<Vec<(T::AccountId, T::Balance)>>
+	PhragmenElection, Candidates<T: V2ToV3> => Value<
+		Vec<(T::AccountId, T::Balance)>,
+		ValueQuery
+	>
 );
 frame_support::generate_storage_alias!(
-	PhragmenElection, Members<T: V2ToV3> => Value<Vec<SeatHolder<T::AccountId, T::Balance>>>
+	PhragmenElection, Members<T: V2ToV3> => Value<
+		Vec<SeatHolder<T::AccountId, T::Balance>>,
+		ValueQuery
+	>
 );
 frame_support::generate_storage_alias!(
-	PhragmenElection, RunnersUp<T: V2ToV3> => Value<Vec<SeatHolder<T::AccountId, T::Balance>>>
+	PhragmenElection, RunnersUp<T: V2ToV3> => Value<
+		Vec<SeatHolder<T::AccountId, T::Balance>>,
+		ValueQuery
+	>
 );
 frame_support::generate_storage_alias!(
 	PhragmenElection, Voting<T: V2ToV3> => Map<
diff --git a/frame/offences/src/migration.rs b/frame/offences/src/migration.rs
index ee95d111a22b..b6e32cbe69e2 100644
--- a/frame/offences/src/migration.rs
+++ b/frame/offences/src/migration.rs
@@ -16,7 +16,9 @@
 // limitations under the License.
 
 use super::{Config, OffenceDetails, Perbill, SessionIndex};
-use frame_support::{generate_storage_alias, traits::Get, weights::Weight};
+use frame_support::{
+	generate_storage_alias, pallet_prelude::ValueQuery, traits::Get, weights::Weight,
+};
 use sp_staking::offence::OnOffenceHandler;
 use sp_std::vec::Vec;
 
@@ -31,7 +33,7 @@ type DeferredOffenceOf<T> = (
 // at a later time.
 generate_storage_alias!(
 	Offences,
-	DeferredOffences<T: Config> => Value<Vec<DeferredOffenceOf<T>>>
+	DeferredOffences<T: Config> => Value<Vec<DeferredOffenceOf<T>>, ValueQuery>
 );
 
 pub fn remove_deferred_storage<T: Config>() -> Weight {
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 105b2328f232..9dee6da89b25 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -130,6 +130,18 @@ impl TypeId for PalletId {
 /// 	>
 /// );
 ///
+/// // optionally specify the query type
+/// use frame_support::pallet_prelude::{ValueQuery, OptionQuery};
+/// generate_storage_alias!(Prefix, ValueName => Value<u32, OptionQuery>);
+/// generate_storage_alias!(
+/// 	Prefix, SomeStorageName => DoubleMap<
+/// 		(u32, Twox64Concat),
+/// 		(u32, Twox64Concat),
+/// 		Vec<u8>,
+/// 		ValueQuery
+/// 	>
+/// );
+///
 /// // generate a map from `Config::AccountId` (with hasher `Twox64Concat`) to `Vec<u8>`
 /// trait Config { type AccountId: codec::FullCodec; }
 /// generate_storage_alias!(
@@ -140,7 +152,7 @@ impl TypeId for PalletId {
 #[macro_export]
 macro_rules! generate_storage_alias {
 	// without generic for $name.
-	($pallet:ident, $name:ident => Map<($key:ty, $hasher:ty), $value:ty>) => {
+	($pallet:ident, $name:ident => Map<($key:ty, $hasher:ty), $value:ty $(, $querytype:ty)?>) => {
 		$crate::paste::paste! {
 			$crate::generate_storage_alias!(@GENERATE_INSTANCE_STRUCT $pallet, $name);
 			type $name = $crate::storage::types::StorageMap<
@@ -148,10 +160,15 @@ macro_rules! generate_storage_alias {
 				$hasher,
 				$key,
 				$value,
+				$( $querytype )?
 			>;
 		}
 	};
-	($pallet:ident, $name:ident => DoubleMap<($key1:ty, $hasher1:ty), ($key2:ty, $hasher2:ty), $value:ty>) => {
+	(
+		$pallet:ident,
+		$name:ident
+		=> DoubleMap<($key1:ty, $hasher1:ty), ($key2:ty, $hasher2:ty), $value:ty $(, $querytype:ty)?>
+	) => {
 		$crate::paste::paste! {
 			$crate::generate_storage_alias!(@GENERATE_INSTANCE_STRUCT $pallet, $name);
 			type $name = $crate::storage::types::StorageDoubleMap<
@@ -161,10 +178,15 @@ macro_rules! generate_storage_alias {
 				$hasher2,
 				$key2,
 				$value,
+				$( $querytype )?
 			>;
 		}
 	};
-	($pallet:ident, $name:ident => NMap<Key<$(($key:ty, $hasher:ty)),+>, $value:ty>) => {
+	(
+		$pallet:ident,
+		$name:ident
+		=> NMap<Key<$(($key:ty, $hasher:ty)),+>, $value:ty $(, $querytype:ty)?>
+	) => {
 		$crate::paste::paste! {
 			$crate::generate_storage_alias!(@GENERATE_INSTANCE_STRUCT $pallet, $name);
 			type $name = $crate::storage::types::StorageNMap<
@@ -173,20 +195,26 @@ macro_rules! generate_storage_alias {
 					$( $crate::storage::types::Key<$hasher, $key>, )+
 				),
 				$value,
+				$( $querytype )?
 			>;
 		}
 	};
-	($pallet:ident, $name:ident => Value<$value:ty>) => {
+	($pallet:ident, $name:ident => Value<$value:ty $(, $querytype:ty)?>) => {
 		$crate::paste::paste! {
 			$crate::generate_storage_alias!(@GENERATE_INSTANCE_STRUCT $pallet, $name);
 			type $name = $crate::storage::types::StorageValue<
 				[<$name Instance>],
 				$value,
+				$( $querytype )?
 			>;
 		}
 	};
 	// with generic for $name.
-	($pallet:ident, $name:ident<$t:ident : $bounds:tt> => Map<($key:ty, $hasher:ty), $value:ty>) => {
+	(
+		$pallet:ident,
+		$name:ident<$t:ident : $bounds:tt>
+		=> Map<($key:ty, $hasher:ty), $value:ty $(, $querytype:ty)?>
+	) => {
 		$crate::paste::paste! {
 			$crate::generate_storage_alias!(@GENERATE_INSTANCE_STRUCT $pallet, $name);
 			#[allow(type_alias_bounds)]
@@ -195,13 +223,15 @@ macro_rules! generate_storage_alias {
 				$key,
 				$hasher,
 				$value,
+				$( $querytype )?
 			>;
 		}
 	};
 	(
 		$pallet:ident,
 		$name:ident<$t:ident : $bounds:tt>
-		=> DoubleMap<($key1:ty, $hasher1:ty), ($key2:ty, $hasher2:ty), $value:ty>) => {
+		=> DoubleMap<($key1:ty, $hasher1:ty), ($key2:ty, $hasher2:ty), $value:ty $(, $querytype:ty)?>
+	) => {
 		$crate::paste::paste! {
 			$crate::generate_storage_alias!(@GENERATE_INSTANCE_STRUCT $pallet, $name);
 			#[allow(type_alias_bounds)]
@@ -212,12 +242,14 @@ macro_rules! generate_storage_alias {
 				$key2,
 				$hasher2,
 				$value,
+				$( $querytype )?
 			>;
 		}
 	};
 	(
 		$pallet:ident,
-		$name:ident<$t:ident : $bounds:tt> => NMap<$(($key:ty, $hasher:ty),)+ $value:ty>
+		$name:ident<$t:ident : $bounds:tt>
+		=> NMap<$(($key:ty, $hasher:ty),)+ $value:ty $(, $querytype:ty)?>
 	) => {
 		$crate::paste::paste! {
 			$crate::generate_storage_alias!(@GENERATE_INSTANCE_STRUCT $pallet, $name);
@@ -228,17 +260,18 @@ macro_rules! generate_storage_alias {
 					$( $crate::storage::types::Key<$hasher, $key>, )+
 				),
 				$value,
+				$( $querytype )?
 			>;
 		}
 	};
-	($pallet:ident, $name:ident<$t:ident : $bounds:tt> => Value<$value:ty>) => {
+	($pallet:ident, $name:ident<$t:ident : $bounds:tt> => Value<$value:ty $(, $querytype:ty)?>) => {
 		$crate::paste::paste! {
 			$crate::generate_storage_alias!(@GENERATE_INSTANCE_STRUCT $pallet, $name);
 			#[allow(type_alias_bounds)]
 			type $name<$t : $bounds> = $crate::storage::types::StorageValue<
 				[<$name Instance>],
 				$value,
-				$crate::storage::types::ValueQuery,
+				$( $querytype )?
 			>;
 		}
 	};

From 5be50ac14b23147c6f120745c2205a86a2675169 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Wed, 8 Sep 2021 12:28:23 +0200
Subject: [PATCH 1154/1194] Improve sandbox internal api (#9709)

* Improve sandbox internal api

This improves the internal sandbox api for the executor implementations.
The main point is to hide the tls in the internal api and not having it
exposed to the outside.

This is especially needed for wasmtime 0.29.0

* Fmt

* Make it nicer
---
 Cargo.lock                                   |   1 +
 client/executor/common/Cargo.toml            |   1 +
 client/executor/common/src/sandbox.rs        | 564 +++++++++----------
 client/executor/wasmi/src/lib.rs             | 187 +++---
 client/executor/wasmtime/src/host.rs         | 255 ++++-----
 client/executor/wasmtime/src/state_holder.rs |   6 +-
 6 files changed, 448 insertions(+), 566 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d5205f0dd411..698060c70d2f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7679,6 +7679,7 @@ name = "sc-executor-common"
 version = "0.10.0-dev"
 dependencies = [
  "derive_more",
+ "environmental",
  "parity-scale-codec",
  "pwasm-utils",
  "sc-allocator",
diff --git a/client/executor/common/Cargo.toml b/client/executor/common/Cargo.toml
index 402df438f645..c4fc8c27f754 100644
--- a/client/executor/common/Cargo.toml
+++ b/client/executor/common/Cargo.toml
@@ -24,6 +24,7 @@ sp-wasm-interface = { version = "4.0.0-dev", path = "../../../primitives/wasm-in
 sp-maybe-compressed-blob = { version = "4.0.0-dev", path = "../../../primitives/maybe-compressed-blob" }
 sp-serializer = { version = "3.0.0", path = "../../../primitives/serializer" }
 thiserror = "1.0.21"
+environmental = "1.1.3"
 
 wasmer = { version = "1.0", optional = true }
 wasmer-compiler-singlepass = { version = "1.0", optional = true }
diff --git a/client/executor/common/src/sandbox.rs b/client/executor/common/src/sandbox.rs
index 7a92e8e2bd29..b62729424125 100644
--- a/client/executor/common/src/sandbox.rs
+++ b/client/executor/common/src/sandbox.rs
@@ -37,6 +37,8 @@ use wasmi::{
 use crate::util::wasmer::MemoryWrapper as WasmerMemoryWrapper;
 use crate::util::wasmi::MemoryWrapper as WasmiMemoryWrapper;
 
+environmental::environmental!(SandboxContextStore: trait SandboxContext);
+
 /// Index of a function inside the supervisor.
 ///
 /// This is a typically an index in the default table of the supervisor, however
@@ -164,17 +166,11 @@ impl ImportResolver for Imports {
 	}
 }
 
-/// This trait encapsulates sandboxing capabilities.
-///
-/// Note that this functions are only called in the `supervisor` context.
-pub trait SandboxCapabilities: FunctionContext {
-	/// Represents a function reference into the supervisor environment.
-	/// Provides an abstraction over execution environment.
-	type SupervisorFuncRef;
-
+/// The sandbox context used to execute sandboxed functions.
+pub trait SandboxContext {
 	/// Invoke a function in the supervisor environment.
 	///
-	/// This first invokes the dispatch_thunk function, passing in the function index of the
+	/// This first invokes the dispatch thunk function, passing in the function index of the
 	/// desired function to call and serialized arguments. The thunk calls the desired function
 	/// with the deserialized arguments, then serializes the result into memory and returns
 	/// reference. The pointer to and length of the result in linear memory is encoded into an
@@ -187,24 +183,23 @@ pub trait SandboxCapabilities: FunctionContext {
 	/// execution.
 	fn invoke(
 		&mut self,
-		dispatch_thunk: &Self::SupervisorFuncRef,
 		invoke_args_ptr: Pointer<u8>,
 		invoke_args_len: WordSize,
 		state: u32,
 		func_idx: SupervisorFuncIndex,
 	) -> Result<i64>;
+
+	/// Returns the supervisor context.
+	fn supervisor_context(&mut self) -> &mut dyn FunctionContext;
 }
 
 /// Implementation of [`Externals`] that allows execution of guest module with
 /// [externals][`Externals`] that might refer functions defined by supervisor.
 ///
 /// [`Externals`]: ../wasmi/trait.Externals.html
-pub struct GuestExternals<'a, FE: SandboxCapabilities + 'a> {
-	/// Supervisor function environment
-	supervisor_externals: &'a mut FE,
-
+pub struct GuestExternals<'a> {
 	/// Instance of sandboxed module to be dispatched
-	sandbox_instance: &'a SandboxInstance<FE::SupervisorFuncRef>,
+	sandbox_instance: &'a SandboxInstance,
 
 	/// External state passed to guest environment, see the `instantiate` function
 	state: u32,
@@ -232,114 +227,108 @@ fn deserialize_result(
 	}
 }
 
-impl<'a, FE: SandboxCapabilities + 'a> Externals for GuestExternals<'a, FE> {
+impl<'a> Externals for GuestExternals<'a> {
 	fn invoke_index(
 		&mut self,
 		index: usize,
 		args: RuntimeArgs,
 	) -> std::result::Result<Option<RuntimeValue>, Trap> {
-		// Make `index` typesafe again.
-		let index = GuestFuncIndex(index);
-
-		// Convert function index from guest to supervisor space
-		let func_idx = self.sandbox_instance
-			.guest_to_supervisor_mapping
-			.func_by_guest_index(index)
-			.expect(
-				"`invoke_index` is called with indexes registered via `FuncInstance::alloc_host`;
-				`FuncInstance::alloc_host` is called with indexes that were obtained from `guest_to_supervisor_mapping`;
-				`func_by_guest_index` called with `index` can't return `None`;
-				qed"
-			);
+		SandboxContextStore::with(|sandbox_context| {
+			// Make `index` typesafe again.
+			let index = GuestFuncIndex(index);
+
+			// Convert function index from guest to supervisor space
+			let func_idx = self.sandbox_instance
+				.guest_to_supervisor_mapping
+				.func_by_guest_index(index)
+				.expect(
+					"`invoke_index` is called with indexes registered via `FuncInstance::alloc_host`;
+					`FuncInstance::alloc_host` is called with indexes that were obtained from `guest_to_supervisor_mapping`;
+					`func_by_guest_index` called with `index` can't return `None`;
+					qed"
+				);
+
+			// Serialize arguments into a byte vector.
+			let invoke_args_data: Vec<u8> = args
+				.as_ref()
+				.iter()
+				.cloned()
+				.map(sp_wasm_interface::Value::from)
+				.collect::<Vec<_>>()
+				.encode();
+
+			let state = self.state;
+
+			// Move serialized arguments inside the memory, invoke dispatch thunk and
+			// then free allocated memory.
+			let invoke_args_len = invoke_args_data.len() as WordSize;
+			let invoke_args_ptr = sandbox_context
+				.supervisor_context()
+				.allocate_memory(invoke_args_len)
+				.map_err(|_| trap("Can't allocate memory in supervisor for the arguments"))?;
+
+			let deallocate = |supervisor_context: &mut dyn FunctionContext, ptr, fail_msg| {
+				supervisor_context.deallocate_memory(ptr).map_err(|_| trap(fail_msg))
+			};
+
+			if sandbox_context
+				.supervisor_context()
+				.write_memory(invoke_args_ptr, &invoke_args_data)
+				.is_err()
+			{
+				deallocate(
+					sandbox_context.supervisor_context(),
+					invoke_args_ptr,
+					"Failed dealloction after failed write of invoke arguments",
+				)?;
+				return Err(trap("Can't write invoke args into memory"))
+			}
 
-		// Serialize arguments into a byte vector.
-		let invoke_args_data: Vec<u8> = args
-			.as_ref()
-			.iter()
-			.cloned()
-			.map(sp_wasm_interface::Value::from)
-			.collect::<Vec<_>>()
-			.encode();
-
-		let state = self.state;
-
-		// Move serialized arguments inside the memory, invoke dispatch thunk and
-		// then free allocated memory.
-		let invoke_args_len = invoke_args_data.len() as WordSize;
-		let invoke_args_ptr = self
-			.supervisor_externals
-			.allocate_memory(invoke_args_len)
-			.map_err(|_| trap("Can't allocate memory in supervisor for the arguments"))?;
-
-		let deallocate = |this: &mut GuestExternals<FE>, ptr, fail_msg| {
-			this.supervisor_externals.deallocate_memory(ptr).map_err(|_| trap(fail_msg))
-		};
+			let result = sandbox_context.invoke(
+				invoke_args_ptr,
+				invoke_args_len,
+				state,
+				func_idx,
+			);
 
-		if self
-			.supervisor_externals
-			.write_memory(invoke_args_ptr, &invoke_args_data)
-			.is_err()
-		{
 			deallocate(
-				self,
+				sandbox_context.supervisor_context(),
 				invoke_args_ptr,
-				"Failed dealloction after failed write of invoke arguments",
+				"Can't deallocate memory for dispatch thunk's invoke arguments",
 			)?;
-			return Err(trap("Can't write invoke args into memory"))
-		}
+			let result = result?;
+
+			// dispatch_thunk returns pointer to serialized arguments.
+			// Unpack pointer and len of the serialized result data.
+			let (serialized_result_val_ptr, serialized_result_val_len) = {
+				// Cast to u64 to use zero-extension.
+				let v = result as u64;
+				let ptr = (v as u64 >> 32) as u32;
+				let len = (v & 0xFFFFFFFF) as u32;
+				(Pointer::new(ptr), len)
+			};
+
+			let serialized_result_val = sandbox_context
+				.supervisor_context()
+				.read_memory(serialized_result_val_ptr, serialized_result_val_len)
+				.map_err(|_| trap("Can't read the serialized result from dispatch thunk"));
 
-		let result = self.supervisor_externals.invoke(
-			&self.sandbox_instance.dispatch_thunk,
-			invoke_args_ptr,
-			invoke_args_len,
-			state,
-			func_idx,
-		);
-
-		deallocate(
-			self,
-			invoke_args_ptr,
-			"Can't deallocate memory for dispatch thunk's invoke arguments",
-		)?;
-		let result = result?;
-
-		// dispatch_thunk returns pointer to serialized arguments.
-		// Unpack pointer and len of the serialized result data.
-		let (serialized_result_val_ptr, serialized_result_val_len) = {
-			// Cast to u64 to use zero-extension.
-			let v = result as u64;
-			let ptr = (v as u64 >> 32) as u32;
-			let len = (v & 0xFFFFFFFF) as u32;
-			(Pointer::new(ptr), len)
-		};
-
-		let serialized_result_val = self
-			.supervisor_externals
-			.read_memory(serialized_result_val_ptr, serialized_result_val_len)
-			.map_err(|_| trap("Can't read the serialized result from dispatch thunk"));
-
-		deallocate(
-			self,
-			serialized_result_val_ptr,
-			"Can't deallocate memory for dispatch thunk's result",
-		)
-		.and_then(|_| serialized_result_val)
-		.and_then(|serialized_result_val| deserialize_result(&serialized_result_val))
+			deallocate(
+				sandbox_context.supervisor_context(),
+				serialized_result_val_ptr,
+				"Can't deallocate memory for dispatch thunk's result",
+			)
+			.and_then(|_| serialized_result_val)
+			.and_then(|serialized_result_val| deserialize_result(&serialized_result_val))
+		}).expect("SandboxContextStore is set when invoking sandboxed functions; qed")
 	}
 }
 
-fn with_guest_externals<FE, R, F>(
-	supervisor_externals: &mut FE,
-	sandbox_instance: &SandboxInstance<FE::SupervisorFuncRef>,
-	state: u32,
-	f: F,
-) -> R
+fn with_guest_externals<R, F>(sandbox_instance: &SandboxInstance, state: u32, f: F) -> R
 where
-	FE: SandboxCapabilities,
-	F: FnOnce(&mut GuestExternals<FE>) -> R,
+	F: FnOnce(&mut GuestExternals) -> R,
 {
-	let mut guest_externals = GuestExternals { supervisor_externals, sandbox_instance, state };
-	f(&mut guest_externals)
+	f(&mut GuestExternals { sandbox_instance, state })
 }
 
 /// Module instance in terms of selected backend
@@ -366,13 +355,12 @@ enum BackendInstance {
 /// This is generic over a supervisor function reference type.
 ///
 /// [`invoke`]: #method.invoke
-pub struct SandboxInstance<FR> {
+pub struct SandboxInstance {
 	backend_instance: BackendInstance,
-	dispatch_thunk: FR,
 	guest_to_supervisor_mapping: GuestToSupervisorFunctionMapping,
 }
 
-impl<FR> SandboxInstance<FR> {
+impl SandboxInstance {
 	/// Invoke an exported function by a name.
 	///
 	/// `supervisor_externals` is required to execute the implementations
@@ -380,7 +368,7 @@ impl<FR> SandboxInstance<FR> {
 	///
 	/// The `state` parameter can be used to provide custom data for
 	/// these syscall implementations.
-	pub fn invoke<'a, FE, SCH, DTH>(
+	pub fn invoke(
 		&self,
 
 		// function to call that is exported from the module
@@ -391,68 +379,66 @@ impl<FR> SandboxInstance<FR> {
 
 		// arbitraty context data of the call
 		state: u32,
-	) -> std::result::Result<Option<wasmi::RuntimeValue>, wasmi::Error>
-	where
-		FE: SandboxCapabilities<SupervisorFuncRef = FR> + 'a,
-		SCH: SandboxCapabilitiesHolder<SupervisorFuncRef = FR, SC = FE>,
-		DTH: DispatchThunkHolder<DispatchThunk = FR>,
-	{
-		SCH::with_sandbox_capabilities(|supervisor_externals| {
-			with_guest_externals(supervisor_externals, self, state, |guest_externals| {
-				match &self.backend_instance {
-					BackendInstance::Wasmi(wasmi_instance) => {
-						let wasmi_result =
-							wasmi_instance.invoke_export(export_name, args, guest_externals)?;
-
-						Ok(wasmi_result)
-					},
-
-					#[cfg(feature = "wasmer-sandbox")]
-					BackendInstance::Wasmer(wasmer_instance) => {
-						let function = wasmer_instance
-							.exports
-							.get_function(export_name)
-							.map_err(|error| wasmi::Error::Function(error.to_string()))?;
-
-						let args: Vec<wasmer::Val> = args
-							.iter()
-							.map(|v| match *v {
-								RuntimeValue::I32(val) => wasmer::Val::I32(val),
-								RuntimeValue::I64(val) => wasmer::Val::I64(val),
-								RuntimeValue::F32(val) => wasmer::Val::F32(val.into()),
-								RuntimeValue::F64(val) => wasmer::Val::F64(val.into()),
-							})
-							.collect();
-
-						let wasmer_result =
-							DTH::initialize_thunk(&self.dispatch_thunk, || function.call(&args))
-								.map_err(|error| wasmi::Error::Function(error.to_string()))?;
-
-						if wasmer_result.len() > 1 {
-							return Err(wasmi::Error::Function(
-								"multiple return types are not supported yet".to_owned(),
-							))
-						}
-
-						let wasmer_result = if let Some(wasmer_value) = wasmer_result.first() {
-							let wasmer_value = match *wasmer_value {
-								wasmer::Val::I32(val) => RuntimeValue::I32(val),
-								wasmer::Val::I64(val) => RuntimeValue::I64(val),
-								wasmer::Val::F32(val) => RuntimeValue::F32(val.into()),
-								wasmer::Val::F64(val) => RuntimeValue::F64(val.into()),
-								_ => unreachable!(),
-							};
-
-							Some(wasmer_value)
-						} else {
-							None
-						};
 
-						Ok(wasmer_result)
-					},
+		sandbox_context: &mut dyn SandboxContext,
+	) -> std::result::Result<Option<wasmi::RuntimeValue>, wasmi::Error> {
+		match &self.backend_instance {
+			BackendInstance::Wasmi(wasmi_instance) =>
+				with_guest_externals(self, state, |guest_externals| {
+					let wasmi_result = SandboxContextStore::using(sandbox_context, || {
+						wasmi_instance.invoke_export(export_name, args, guest_externals)
+					})?;
+
+					Ok(wasmi_result)
+				}),
+
+			#[cfg(feature = "wasmer-sandbox")]
+			BackendInstance::Wasmer(wasmer_instance) => {
+				let function = wasmer_instance
+					.exports
+					.get_function(export_name)
+					.map_err(|error| wasmi::Error::Function(error.to_string()))?;
+
+				let args: Vec<wasmer::Val> = args
+					.iter()
+					.map(|v| match *v {
+						RuntimeValue::I32(val) => wasmer::Val::I32(val),
+						RuntimeValue::I64(val) => wasmer::Val::I64(val),
+						RuntimeValue::F32(val) => wasmer::Val::F32(val.into()),
+						RuntimeValue::F64(val) => wasmer::Val::F64(val.into()),
+					})
+					.collect();
+
+				let wasmer_result = SandboxContextStore::using(sandbox_context, || {
+					function.call(&args).map_err(|error| wasmi::Error::Function(error.to_string()))
+				})?;
+
+				if wasmer_result.len() > 1 {
+					return Err(wasmi::Error::Function(
+						"multiple return types are not supported yet".into(),
+					))
 				}
-			})
-		})
+
+				wasmer_result
+					.first()
+					.map(|wasm_value| {
+						let wasmer_value = match *wasm_value {
+							wasmer::Val::I32(val) => RuntimeValue::I32(val),
+							wasmer::Val::I64(val) => RuntimeValue::I64(val),
+							wasmer::Val::F32(val) => RuntimeValue::F32(val.into()),
+							wasmer::Val::F64(val) => RuntimeValue::F64(val.into()),
+							_ =>
+								return Err(wasmi::Error::Function(format!(
+									"Unsupported return value: {:?}",
+									wasm_value,
+								))),
+						};
+
+						Ok(wasmer_value)
+					})
+					.transpose()
+			},
+		}
 	}
 
 	/// Get the value from a global with the given `name`.
@@ -548,8 +534,8 @@ impl GuestEnvironment {
 	/// Decodes an environment definition from the given raw bytes.
 	///
 	/// Returns `Err` if the definition cannot be decoded.
-	pub fn decode<FR>(
-		store: &Store<FR>,
+	pub fn decode<DT>(
+		store: &Store<DT>,
 		raw_env_def: &[u8],
 	) -> std::result::Result<Self, InstantiationError> {
 		let (imports, guest_to_supervisor_mapping) =
@@ -562,47 +548,18 @@ impl GuestEnvironment {
 ///
 /// To finish off the instantiation the user must call `register`.
 #[must_use]
-pub struct UnregisteredInstance<FR> {
-	sandbox_instance: Rc<SandboxInstance<FR>>,
+pub struct UnregisteredInstance {
+	sandbox_instance: Rc<SandboxInstance>,
 }
 
-impl<FR> UnregisteredInstance<FR> {
+impl UnregisteredInstance {
 	/// Finalizes instantiation of this module.
-	pub fn register(self, store: &mut Store<FR>) -> u32 {
+	pub fn register<DT>(self, store: &mut Store<DT>, dispatch_thunk: DT) -> u32 {
 		// At last, register the instance.
-		let instance_idx = store.register_sandbox_instance(self.sandbox_instance);
-		instance_idx
+		store.register_sandbox_instance(self.sandbox_instance, dispatch_thunk)
 	}
 }
 
-/// Helper type to provide sandbox capabilities to the inner context
-pub trait SandboxCapabilitiesHolder {
-	/// Supervisor function reference
-	type SupervisorFuncRef;
-
-	/// Capabilities trait
-	type SC: SandboxCapabilities<SupervisorFuncRef = Self::SupervisorFuncRef>;
-
-	/// Wrapper that provides sandbox capabilities in a limited context
-	fn with_sandbox_capabilities<R, F: FnOnce(&mut Self::SC) -> R>(f: F) -> R;
-}
-
-/// Helper type to provide dispatch thunk to the inner context
-pub trait DispatchThunkHolder {
-	/// Dispatch thunk for this particular context
-	type DispatchThunk;
-
-	/// Provide `DispatchThunk` for the runtime method call and execute the given function `f`.
-	///
-	/// During the execution of the provided function `dispatch_thunk` will be callable.
-	fn initialize_thunk<R, F>(s: &Self::DispatchThunk, f: F) -> R
-	where
-		F: FnOnce() -> R;
-
-	/// Wrapper that provides dispatch thunk in a limited context
-	fn with_dispatch_thunk<R, F: FnOnce(&mut Self::DispatchThunk) -> R>(f: F) -> R;
-}
-
 /// Sandbox backend to use
 pub enum SandboxBackend {
 	/// Wasm interpreter
@@ -716,14 +673,17 @@ impl BackendContext {
 /// This struct keeps track of all sandboxed components.
 ///
 /// This is generic over a supervisor function reference type.
-pub struct Store<FR> {
-	// Memories and instances are `Some` until torn down.
-	instances: Vec<Option<Rc<SandboxInstance<FR>>>>,
+pub struct Store<DT> {
+	/// Stores the instance and the dispatch thunk associated to per instance.
+	///
+	/// Instances are `Some` until torn down.
+	instances: Vec<Option<(Rc<SandboxInstance>, DT)>>,
+	/// Memories are `Some` until torn down.
 	memories: Vec<Option<Memory>>,
 	backend_context: BackendContext,
 }
 
-impl<FR> Store<FR> {
+impl<DT: Clone> Store<DT> {
 	/// Create a new empty sandbox store.
 	pub fn new(backend: SandboxBackend) -> Self {
 		Store {
@@ -776,11 +736,28 @@ impl<FR> Store<FR> {
 	///
 	/// Returns `Err` If `instance_idx` isn't a valid index of an instance or
 	/// instance is already torndown.
-	pub fn instance(&self, instance_idx: u32) -> Result<Rc<SandboxInstance<FR>>> {
+	pub fn instance(&self, instance_idx: u32) -> Result<Rc<SandboxInstance>> {
 		self.instances
 			.get(instance_idx as usize)
-			.cloned()
 			.ok_or_else(|| "Trying to access a non-existent instance")?
+			.as_ref()
+			.map(|v| v.0.clone())
+			.ok_or_else(|| "Trying to access a torndown instance".into())
+	}
+
+	/// Returns dispatch thunk by `instance_idx`.
+	///
+	/// # Errors
+	///
+	/// Returns `Err` If `instance_idx` isn't a valid index of an instance or
+	/// instance is already torndown.
+	pub fn dispatch_thunk(&self, instance_idx: u32) -> Result<DT> {
+		self.instances
+			.get(instance_idx as usize)
+			.as_ref()
+			.ok_or_else(|| "Trying to access a non-existent instance")?
+			.as_ref()
+			.map(|v| v.1.clone())
 			.ok_or_else(|| "Trying to access a torndown instance".into())
 	}
 
@@ -842,27 +819,20 @@ impl<FR> Store<FR> {
 	/// Note: Due to borrowing constraints dispatch thunk is now propagated using DTH
 	///
 	/// Returns uninitialized sandboxed module instance or an instantiation error.
-	pub fn instantiate<'a, FE, SCH, DTH>(
+	pub fn instantiate(
 		&mut self,
 		wasm: &[u8],
 		guest_env: GuestEnvironment,
 		state: u32,
-	) -> std::result::Result<UnregisteredInstance<FR>, InstantiationError>
-	where
-		FR: Clone + 'static,
-		FE: SandboxCapabilities<SupervisorFuncRef = FR> + 'a,
-		SCH: SandboxCapabilitiesHolder<SupervisorFuncRef = FR, SC = FE>,
-		DTH: DispatchThunkHolder<DispatchThunk = FR>,
-	{
-		let backend_context = &self.backend_context;
-
-		let sandbox_instance = match backend_context {
+		sandbox_context: &mut dyn SandboxContext,
+	) -> std::result::Result<UnregisteredInstance, InstantiationError> {
+		let sandbox_instance = match self.backend_context {
 			BackendContext::Wasmi =>
-				Self::instantiate_wasmi::<FE, SCH, DTH>(wasm, guest_env, state)?,
+				Self::instantiate_wasmi(wasm, guest_env, state, sandbox_context)?,
 
 			#[cfg(feature = "wasmer-sandbox")]
-			BackendContext::Wasmer(context) =>
-				Self::instantiate_wasmer::<FE, SCH, DTH>(context, wasm, guest_env, state)?,
+			BackendContext::Wasmer(ref context) =>
+				Self::instantiate_wasmer(&context, wasm, guest_env, state, sandbox_context)?,
 		};
 
 		Ok(UnregisteredInstance { sandbox_instance })
@@ -870,74 +840,58 @@ impl<FR> Store<FR> {
 }
 
 // Private routines
-impl<FR> Store<FR> {
-	fn register_sandbox_instance(&mut self, sandbox_instance: Rc<SandboxInstance<FR>>) -> u32 {
+impl<DT> Store<DT> {
+	fn register_sandbox_instance(
+		&mut self,
+		sandbox_instance: Rc<SandboxInstance>,
+		dispatch_thunk: DT,
+	) -> u32 {
 		let instance_idx = self.instances.len();
-		self.instances.push(Some(sandbox_instance));
+		self.instances.push(Some((sandbox_instance, dispatch_thunk)));
 		instance_idx as u32
 	}
 
-	fn instantiate_wasmi<'a, FE, SCH, DTH>(
+	fn instantiate_wasmi(
 		wasm: &[u8],
 		guest_env: GuestEnvironment,
 		state: u32,
-	) -> std::result::Result<Rc<SandboxInstance<FR>>, InstantiationError>
-	where
-		FR: Clone + 'static,
-		FE: SandboxCapabilities<SupervisorFuncRef = FR> + 'a,
-		SCH: SandboxCapabilitiesHolder<SupervisorFuncRef = FR, SC = FE>,
-		DTH: DispatchThunkHolder<DispatchThunk = FR>,
-	{
+		sandbox_context: &mut dyn SandboxContext,
+	) -> std::result::Result<Rc<SandboxInstance>, InstantiationError> {
 		let wasmi_module =
 			Module::from_buffer(wasm).map_err(|_| InstantiationError::ModuleDecoding)?;
 		let wasmi_instance = ModuleInstance::new(&wasmi_module, &guest_env.imports)
 			.map_err(|_| InstantiationError::Instantiation)?;
 
-		let sandbox_instance = DTH::with_dispatch_thunk(|dispatch_thunk| {
-			Rc::new(SandboxInstance {
-				// In general, it's not a very good idea to use `.not_started_instance()` for
-				// anything but for extracting memory and tables. But in this particular case, we
-				// are extracting for the purpose of running `start` function which should be ok.
-				backend_instance: BackendInstance::Wasmi(
-					wasmi_instance.not_started_instance().clone(),
-				),
-				dispatch_thunk: dispatch_thunk.clone(),
-				guest_to_supervisor_mapping: guest_env.guest_to_supervisor_mapping,
-			})
+		let sandbox_instance = Rc::new(SandboxInstance {
+			// In general, it's not a very good idea to use `.not_started_instance()` for
+			// anything but for extracting memory and tables. But in this particular case, we
+			// are extracting for the purpose of running `start` function which should be ok.
+			backend_instance: BackendInstance::Wasmi(wasmi_instance.not_started_instance().clone()),
+			guest_to_supervisor_mapping: guest_env.guest_to_supervisor_mapping,
 		});
 
-		SCH::with_sandbox_capabilities(|supervisor_externals| {
-			with_guest_externals(
-				supervisor_externals,
-				&sandbox_instance,
-				state,
-				|guest_externals| {
-					wasmi_instance
-						.run_start(guest_externals)
-						.map_err(|_| InstantiationError::StartTrapped)
+		with_guest_externals(&sandbox_instance, state, |guest_externals| {
+			SandboxContextStore::using(sandbox_context, || {
+				wasmi_instance
+					.run_start(guest_externals)
+					.map_err(|_| InstantiationError::StartTrapped)
+			})
 
-					// Note: no need to run start on wasmtime instance, since it's done
-					// automatically
-				},
-			)
+			// Note: no need to run start on wasmtime instance, since it's done
+			// automatically
 		})?;
 
 		Ok(sandbox_instance)
 	}
 
 	#[cfg(feature = "wasmer-sandbox")]
-	fn instantiate_wasmer<'a, FE, SCH, DTH>(
+	fn instantiate_wasmer(
 		context: &WasmerBackend,
 		wasm: &[u8],
 		guest_env: GuestEnvironment,
 		state: u32,
-	) -> std::result::Result<Rc<SandboxInstance<FR>>, InstantiationError>
-	where
-		FR: Clone + 'static,
-		FE: SandboxCapabilities<SupervisorFuncRef = FR> + 'a,
-		SCH: SandboxCapabilitiesHolder<SupervisorFuncRef = FR, SC = FE>,
-		DTH: DispatchThunkHolder<DispatchThunk = FR>,
-	{
+		sandbox_context: &mut dyn SandboxContext,
+	) -> std::result::Result<Rc<SandboxInstance>, InstantiationError> {
 		let module = wasmer::Module::new(&context.store, wasm)
 			.map_err(|_| InstantiationError::ModuleDecoding)?;
 
@@ -991,7 +945,7 @@ impl<FR> Store<FR> {
 						.func_by_guest_index(guest_func_index)
 						.ok_or(InstantiationError::ModuleDecoding)?;
 
-					let function = Self::wasmer_dispatch_function::<FE, SCH, DTH>(
+					let function = Self::wasmer_dispatch_function(
 						supervisor_func_index,
 						&context.store,
 						func_ty,
@@ -1012,68 +966,71 @@ impl<FR> Store<FR> {
 			import_object.register(module_name, exports);
 		}
 
-		let instance =
+		let instance = SandboxContextStore::using(sandbox_context, || {
 			wasmer::Instance::new(&module, &import_object).map_err(|error| match error {
 				wasmer::InstantiationError::Link(_) => InstantiationError::Instantiation,
 				wasmer::InstantiationError::Start(_) => InstantiationError::StartTrapped,
 				wasmer::InstantiationError::HostEnvInitialization(_) =>
 					InstantiationError::EnvironmentDefinitionCorrupted,
-			})?;
+			})
+		})?;
 
 		Ok(Rc::new(SandboxInstance {
 			backend_instance: BackendInstance::Wasmer(instance),
-			dispatch_thunk: DTH::with_dispatch_thunk(|dispatch_thunk| dispatch_thunk.clone()),
 			guest_to_supervisor_mapping: guest_env.guest_to_supervisor_mapping,
 		}))
 	}
 
 	#[cfg(feature = "wasmer-sandbox")]
-	fn wasmer_dispatch_function<'a, FE, SCH, DTH>(
+	fn wasmer_dispatch_function(
 		supervisor_func_index: SupervisorFuncIndex,
 		store: &wasmer::Store,
 		func_ty: &wasmer::FunctionType,
 		state: u32,
-	) -> wasmer::Function
-	where
-		FR: Clone + 'static,
-		FE: SandboxCapabilities<SupervisorFuncRef = FR> + 'a,
-		SCH: SandboxCapabilitiesHolder<SupervisorFuncRef = FR, SC = FE>,
-		DTH: DispatchThunkHolder<DispatchThunk = FR>,
-	{
+	) -> wasmer::Function {
 		wasmer::Function::new(store, func_ty, move |params| {
-			SCH::with_sandbox_capabilities(|supervisor_externals| {
+			SandboxContextStore::with(|sandbox_context| {
 				use sp_wasm_interface::Value;
 
 				// Serialize arguments into a byte vector.
 				let invoke_args_data = params
 					.iter()
 					.map(|val| match val {
-						wasmer::Val::I32(val) => Value::I32(*val),
-						wasmer::Val::I64(val) => Value::I64(*val),
-						wasmer::Val::F32(val) => Value::F32(f32::to_bits(*val)),
-						wasmer::Val::F64(val) => Value::F64(f64::to_bits(*val)),
-						_ => unimplemented!(),
+						wasmer::Val::I32(val) => Ok(Value::I32(*val)),
+						wasmer::Val::I64(val) => Ok(Value::I64(*val)),
+						wasmer::Val::F32(val) => Ok(Value::F32(f32::to_bits(*val))),
+						wasmer::Val::F64(val) => Ok(Value::F64(f64::to_bits(*val))),
+						_ => Err(wasmer::RuntimeError::new(format!(
+							"Unsupported function argument: {:?}",
+							val
+						))),
 					})
-					.collect::<Vec<_>>()
+					.collect::<std::result::Result<Vec<_>, _>>()?
 					.encode();
 
 				// Move serialized arguments inside the memory, invoke dispatch thunk and
 				// then free allocated memory.
 				let invoke_args_len = invoke_args_data.len() as WordSize;
-				let invoke_args_ptr =
-					supervisor_externals.allocate_memory(invoke_args_len).map_err(|_| {
+				let invoke_args_ptr = sandbox_context
+					.supervisor_context()
+					.allocate_memory(invoke_args_len)
+					.map_err(|_| {
 						wasmer::RuntimeError::new(
 							"Can't allocate memory in supervisor for the arguments",
 						)
 					})?;
 
-				let deallocate = |fe: &mut FE, ptr, fail_msg| {
+				let deallocate = |fe: &mut dyn FunctionContext, ptr, fail_msg| {
 					fe.deallocate_memory(ptr).map_err(|_| wasmer::RuntimeError::new(fail_msg))
 				};
 
-				if supervisor_externals.write_memory(invoke_args_ptr, &invoke_args_data).is_err() {
+				if sandbox_context
+					.supervisor_context()
+					.write_memory(invoke_args_ptr, &invoke_args_data)
+					.is_err()
+				{
 					deallocate(
-						supervisor_externals,
+						sandbox_context.supervisor_context(),
 						invoke_args_ptr,
 						"Failed dealloction after failed write of invoke arguments",
 					)?;
@@ -1082,16 +1039,9 @@ impl<FR> Store<FR> {
 				}
 
 				// Perform the actuall call
-				let serialized_result = DTH::with_dispatch_thunk(|dispatch_thunk| {
-					supervisor_externals.invoke(
-						&dispatch_thunk,
-						invoke_args_ptr,
-						invoke_args_len,
-						state,
-						supervisor_func_index,
-					)
-				})
-				.map_err(|e| wasmer::RuntimeError::new(e.to_string()))?;
+				let serialized_result = sandbox_context
+					.invoke(invoke_args_ptr, invoke_args_len, state, supervisor_func_index)
+					.map_err(|e| wasmer::RuntimeError::new(e.to_string()))?;
 
 				// dispatch_thunk returns pointer to serialized arguments.
 				// Unpack pointer and len of the serialized result data.
@@ -1103,7 +1053,8 @@ impl<FR> Store<FR> {
 					(Pointer::new(ptr), len)
 				};
 
-				let serialized_result_val = supervisor_externals
+				let serialized_result_val = sandbox_context
+					.supervisor_context()
 					.read_memory(serialized_result_val_ptr, serialized_result_val_len)
 					.map_err(|_| {
 						wasmer::RuntimeError::new(
@@ -1112,7 +1063,7 @@ impl<FR> Store<FR> {
 					});
 
 				let deserialized_result = deallocate(
-					supervisor_externals,
+					sandbox_context.supervisor_context(),
 					serialized_result_val_ptr,
 					"Can't deallocate memory for dispatch thunk's result",
 				)
@@ -1133,6 +1084,7 @@ impl<FR> Store<FR> {
 					Ok(vec![])
 				}
 			})
+			.expect("SandboxContextStore is set when invoking sandboxed functions; qed")
 		})
 	}
 }
diff --git a/client/executor/wasmi/src/lib.rs b/client/executor/wasmi/src/lib.rs
index 3c5836c77481..6052662fa7cc 100644
--- a/client/executor/wasmi/src/lib.rs
+++ b/client/executor/wasmi/src/lib.rs
@@ -40,13 +40,8 @@ use wasmi::{
 	TableRef,
 };
 
-#[derive(Clone)]
 struct FunctionExecutor {
-	inner: Rc<Inner>,
-}
-
-struct Inner {
-	sandbox_store: RefCell<sandbox::Store<wasmi::FuncRef>>,
+	sandbox_store: Rc<RefCell<sandbox::Store<wasmi::FuncRef>>>,
 	heap: RefCell<sc_allocator::FreeingBumpHeapAllocator>,
 	memory: MemoryRef,
 	table: Option<TableRef>,
@@ -65,68 +60,73 @@ impl FunctionExecutor {
 		missing_functions: Arc<Vec<String>>,
 	) -> Result<Self, Error> {
 		Ok(FunctionExecutor {
-			inner: Rc::new(Inner {
-				sandbox_store: RefCell::new(sandbox::Store::new(sandbox::SandboxBackend::Wasmi)),
-				heap: RefCell::new(sc_allocator::FreeingBumpHeapAllocator::new(heap_base)),
-				memory: m,
-				table: t,
-				host_functions,
-				allow_missing_func_imports,
-				missing_functions,
-			}),
+			sandbox_store: Rc::new(RefCell::new(sandbox::Store::new(
+				sandbox::SandboxBackend::Wasmi,
+			))),
+			heap: RefCell::new(sc_allocator::FreeingBumpHeapAllocator::new(heap_base)),
+			memory: m,
+			table: t,
+			host_functions,
+			allow_missing_func_imports,
+			missing_functions,
 		})
 	}
 }
 
-impl sandbox::SandboxCapabilities for FunctionExecutor {
-	type SupervisorFuncRef = wasmi::FuncRef;
+struct SandboxContext<'a> {
+	executor: &'a mut FunctionExecutor,
+	dispatch_thunk: wasmi::FuncRef,
+}
 
+impl<'a> sandbox::SandboxContext for SandboxContext<'a> {
 	fn invoke(
 		&mut self,
-		dispatch_thunk: &Self::SupervisorFuncRef,
 		invoke_args_ptr: Pointer<u8>,
 		invoke_args_len: WordSize,
 		state: u32,
 		func_idx: sandbox::SupervisorFuncIndex,
 	) -> Result<i64, Error> {
 		let result = wasmi::FuncInstance::invoke(
-			dispatch_thunk,
+			&self.dispatch_thunk,
 			&[
 				RuntimeValue::I32(u32::from(invoke_args_ptr) as i32),
 				RuntimeValue::I32(invoke_args_len as i32),
 				RuntimeValue::I32(state as i32),
 				RuntimeValue::I32(usize::from(func_idx) as i32),
 			],
-			self,
+			self.executor,
 		);
+
 		match result {
 			Ok(Some(RuntimeValue::I64(val))) => Ok(val),
 			Ok(_) => return Err("Supervisor function returned unexpected result!".into()),
 			Err(err) => Err(Error::Trap(err)),
 		}
 	}
+
+	fn supervisor_context(&mut self) -> &mut dyn FunctionContext {
+		self.executor
+	}
 }
 
 impl FunctionContext for FunctionExecutor {
 	fn read_memory_into(&self, address: Pointer<u8>, dest: &mut [u8]) -> WResult<()> {
-		self.inner.memory.get_into(address.into(), dest).map_err(|e| e.to_string())
+		self.memory.get_into(address.into(), dest).map_err(|e| e.to_string())
 	}
 
 	fn write_memory(&mut self, address: Pointer<u8>, data: &[u8]) -> WResult<()> {
-		self.inner.memory.set(address.into(), data).map_err(|e| e.to_string())
+		self.memory.set(address.into(), data).map_err(|e| e.to_string())
 	}
 
 	fn allocate_memory(&mut self, size: WordSize) -> WResult<Pointer<u8>> {
-		let heap = &mut self.inner.heap.borrow_mut();
-		self.inner
-			.memory
+		let heap = &mut self.heap.borrow_mut();
+		self.memory
 			.with_direct_access_mut(|mem| heap.allocate(mem, size).map_err(|e| e.to_string()))
 	}
 
 	fn deallocate_memory(&mut self, ptr: Pointer<u8>) -> WResult<()> {
-		let heap = &mut self.inner.heap.borrow_mut();
-		self.inner
-			.memory
+		let heap = &mut self.heap.borrow_mut();
+		self.memory
 			.with_direct_access_mut(|mem| heap.deallocate(mem, ptr).map_err(|e| e.to_string()))
 	}
 
@@ -144,7 +144,7 @@ impl Sandbox for FunctionExecutor {
 		buf_len: WordSize,
 	) -> WResult<u32> {
 		let sandboxed_memory =
-			self.inner.sandbox_store.borrow().memory(memory_id).map_err(|e| e.to_string())?;
+			self.sandbox_store.borrow().memory(memory_id).map_err(|e| e.to_string())?;
 
 		let len = buf_len as usize;
 
@@ -153,7 +153,7 @@ impl Sandbox for FunctionExecutor {
 			Ok(buffer) => buffer,
 		};
 
-		if let Err(_) = self.inner.memory.set(buf_ptr.into(), &buffer) {
+		if let Err(_) = self.memory.set(buf_ptr.into(), &buffer) {
 			return Ok(sandbox_primitives::ERR_OUT_OF_BOUNDS)
 		}
 
@@ -168,11 +168,11 @@ impl Sandbox for FunctionExecutor {
 		val_len: WordSize,
 	) -> WResult<u32> {
 		let sandboxed_memory =
-			self.inner.sandbox_store.borrow().memory(memory_id).map_err(|e| e.to_string())?;
+			self.sandbox_store.borrow().memory(memory_id).map_err(|e| e.to_string())?;
 
 		let len = val_len as usize;
 
-		let buffer = match self.inner.memory.get(val_ptr.into(), len) {
+		let buffer = match self.memory.get(val_ptr.into(), len) {
 			Err(_) => return Ok(sandbox_primitives::ERR_OUT_OF_BOUNDS),
 			Ok(buffer) => buffer,
 		};
@@ -185,16 +185,14 @@ impl Sandbox for FunctionExecutor {
 	}
 
 	fn memory_teardown(&mut self, memory_id: MemoryId) -> WResult<()> {
-		self.inner
-			.sandbox_store
+		self.sandbox_store
 			.borrow_mut()
 			.memory_teardown(memory_id)
 			.map_err(|e| e.to_string())
 	}
 
 	fn memory_new(&mut self, initial: u32, maximum: u32) -> WResult<MemoryId> {
-		self.inner
-			.sandbox_store
+		self.sandbox_store
 			.borrow_mut()
 			.new_memory(initial, maximum)
 			.map_err(|e| e.to_string())
@@ -218,17 +216,21 @@ impl Sandbox for FunctionExecutor {
 			.map(Into::into)
 			.collect::<Vec<_>>();
 
-		let instance = self
-			.inner
+		let instance =
+			self.sandbox_store.borrow().instance(instance_id).map_err(|e| e.to_string())?;
+
+		let dispatch_thunk = self
 			.sandbox_store
 			.borrow()
-			.instance(instance_id)
+			.dispatch_thunk(instance_id)
 			.map_err(|e| e.to_string())?;
 
-		let result = EXECUTOR
-			.set(self, || instance.invoke::<_, CapsHolder, ThunkHolder>(export_name, &args, state));
-
-		match result {
+		match instance.invoke(
+			export_name,
+			&args,
+			state,
+			&mut SandboxContext { dispatch_thunk, executor: self },
+		) {
 			Ok(None) => Ok(sandbox_primitives::ERR_OK),
 			Ok(Some(val)) => {
 				// Serialize return value and write it back into the memory.
@@ -245,8 +247,7 @@ impl Sandbox for FunctionExecutor {
 	}
 
 	fn instance_teardown(&mut self, instance_id: u32) -> WResult<()> {
-		self.inner
-			.sandbox_store
+		self.sandbox_store
 			.borrow_mut()
 			.instance_teardown(instance_id)
 			.map_err(|e| e.to_string())
@@ -262,7 +263,6 @@ impl Sandbox for FunctionExecutor {
 		// Extract a dispatch thunk from instance's table by the specified index.
 		let dispatch_thunk = {
 			let table = self
-				.inner
 				.table
 				.as_ref()
 				.ok_or_else(|| "Runtime doesn't have a table; sandbox is unavailable")?;
@@ -272,28 +272,28 @@ impl Sandbox for FunctionExecutor {
 				.ok_or_else(|| "dispatch_thunk_idx points on an empty table entry")?
 		};
 
-		let guest_env = match sandbox::GuestEnvironment::decode(
-			&*self.inner.sandbox_store.borrow(),
-			raw_env_def,
-		) {
-			Ok(guest_env) => guest_env,
-			Err(_) => return Ok(sandbox_primitives::ERR_MODULE as u32),
-		};
+		let guest_env =
+			match sandbox::GuestEnvironment::decode(&*self.sandbox_store.borrow(), raw_env_def) {
+				Ok(guest_env) => guest_env,
+				Err(_) => return Ok(sandbox_primitives::ERR_MODULE as u32),
+			};
+
+		let store = self.sandbox_store.clone();
+		let result = store.borrow_mut().instantiate(
+			wasm,
+			guest_env,
+			state,
+			&mut SandboxContext { executor: self, dispatch_thunk: dispatch_thunk.clone() },
+		);
 
-		let store = &mut *self.inner.sandbox_store.borrow_mut();
-		let result = EXECUTOR.set(self, || {
-			DISPATCH_THUNK.set(&dispatch_thunk, || {
-				store.instantiate::<_, CapsHolder, ThunkHolder>(wasm, guest_env, state)
-			})
-		});
-
-		let instance_idx_or_err_code: u32 = match result.map(|i| i.register(store)) {
-			Ok(instance_idx) => instance_idx,
-			Err(sandbox::InstantiationError::StartTrapped) => sandbox_primitives::ERR_EXECUTION,
-			Err(_) => sandbox_primitives::ERR_MODULE,
-		};
+		let instance_idx_or_err_code =
+			match result.map(|i| i.register(&mut store.borrow_mut(), dispatch_thunk)) {
+				Ok(instance_idx) => instance_idx,
+				Err(sandbox::InstantiationError::StartTrapped) => sandbox_primitives::ERR_EXECUTION,
+				Err(_) => sandbox_primitives::ERR_MODULE,
+			};
 
-		Ok(instance_idx_or_err_code as u32)
+		Ok(instance_idx_or_err_code)
 	}
 
 	fn get_global_val(
@@ -301,8 +301,7 @@ impl Sandbox for FunctionExecutor {
 		instance_idx: u32,
 		name: &str,
 	) -> WResult<Option<sp_wasm_interface::Value>> {
-		self.inner
-			.sandbox_store
+		self.sandbox_store
 			.borrow()
 			.instance(instance_idx)
 			.map(|i| i.get_global_val(name))
@@ -310,48 +309,6 @@ impl Sandbox for FunctionExecutor {
 	}
 }
 
-/// Wasmi specific implementation of `SandboxCapabilitiesHolder` that provides
-/// sandbox with a scoped thread local access to a function executor.
-/// This is a way to calm down the borrow checker since host function closures
-/// require exclusive access to it.
-struct CapsHolder;
-
-scoped_tls::scoped_thread_local!(static EXECUTOR: FunctionExecutor);
-
-impl sandbox::SandboxCapabilitiesHolder for CapsHolder {
-	type SupervisorFuncRef = wasmi::FuncRef;
-	type SC = FunctionExecutor;
-
-	fn with_sandbox_capabilities<R, F: FnOnce(&mut Self::SC) -> R>(f: F) -> R {
-		assert!(EXECUTOR.is_set(), "wasmi executor is not set");
-		EXECUTOR.with(|executor| f(&mut executor.clone()))
-	}
-}
-
-/// Wasmi specific implementation of `DispatchThunkHolder` that provides
-/// sandbox with a scoped thread local access to a dispatch thunk.
-/// This is a way to calm down the borrow checker since host function closures
-/// require exclusive access to it.
-struct ThunkHolder;
-
-scoped_tls::scoped_thread_local!(static DISPATCH_THUNK: wasmi::FuncRef);
-
-impl sandbox::DispatchThunkHolder for ThunkHolder {
-	type DispatchThunk = wasmi::FuncRef;
-
-	fn with_dispatch_thunk<R, F: FnOnce(&mut Self::DispatchThunk) -> R>(f: F) -> R {
-		assert!(DISPATCH_THUNK.is_set(), "dispatch thunk is not set");
-		DISPATCH_THUNK.with(|thunk| f(&mut thunk.clone()))
-	}
-
-	fn initialize_thunk<R, F>(s: &Self::DispatchThunk, f: F) -> R
-	where
-		F: FnOnce() -> R,
-	{
-		DISPATCH_THUNK.set(s, f)
-	}
-}
-
 /// Will be used on initialization of a module to resolve function and memory imports.
 struct Resolver<'a> {
 	/// All the hot functions that we export for the WASM blob.
@@ -470,19 +427,19 @@ impl wasmi::Externals for FunctionExecutor {
 	) -> Result<Option<wasmi::RuntimeValue>, wasmi::Trap> {
 		let mut args = args.as_ref().iter().copied().map(Into::into);
 
-		if let Some(function) = self.inner.host_functions.clone().get(index) {
+		if let Some(function) = self.host_functions.clone().get(index) {
 			function
 				.execute(self, &mut args)
 				.map_err(|msg| Error::FunctionExecution(function.name().to_string(), msg))
 				.map_err(wasmi::Trap::from)
 				.map(|v| v.map(Into::into))
-		} else if self.inner.allow_missing_func_imports &&
-			index >= self.inner.host_functions.len() &&
-			index < self.inner.host_functions.len() + self.inner.missing_functions.len()
+		} else if self.allow_missing_func_imports &&
+			index >= self.host_functions.len() &&
+			index < self.host_functions.len() + self.missing_functions.len()
 		{
 			Err(Error::from(format!(
 				"Function `{}` is only a stub. Calling a stub is not allowed.",
-				self.inner.missing_functions[index - self.inner.host_functions.len()],
+				self.missing_functions[index - self.host_functions.len()],
 			))
 			.into())
 		} else {
diff --git a/client/executor/wasmtime/src/host.rs b/client/executor/wasmtime/src/host.rs
index 12e5ab0023ef..8453ec395435 100644
--- a/client/executor/wasmtime/src/host.rs
+++ b/client/executor/wasmtime/src/host.rs
@@ -25,7 +25,7 @@ use log::trace;
 use sc_allocator::FreeingBumpHeapAllocator;
 use sc_executor_common::{
 	error::Result,
-	sandbox::{self, SandboxCapabilities, SandboxCapabilitiesHolder, SupervisorFuncIndex},
+	sandbox::{self, SupervisorFuncIndex},
 	util::MemoryTransfer,
 };
 use sp_core::sandbox as sandbox_primitives;
@@ -33,32 +33,20 @@ use sp_wasm_interface::{FunctionContext, MemoryId, Pointer, Sandbox, WordSize};
 use std::{cell::RefCell, rc::Rc};
 use wasmtime::{Func, Val};
 
-/// Wrapper type for pointer to a Wasm table entry.
-///
-/// The wrapper type is used to ensure that the function reference is valid as it must be unsafely
-/// dereferenced from within the safe method `<HostContext as SandboxCapabilities>::invoke`.
-#[derive(Clone)]
-pub struct SupervisorFuncRef(Func);
-
 /// The state required to construct a HostContext context. The context only lasts for one host
 /// call, whereas the state is maintained for the duration of a Wasm runtime call, which may make
 /// many different host calls that must share state.
-#[derive(Clone)]
 pub struct HostState {
-	inner: Rc<Inner>,
-}
-
-struct Inner {
-	// We need some interior mutability here since the host state is shared between all host
-	// function handlers and the wasmtime backend's `impl WasmRuntime`.
-	//
-	// Furthermore, because of recursive calls (e.g. runtime can create and call an sandboxed
-	// instance which in turn can call the runtime back) we have to be very careful with borrowing
-	// those.
-	//
-	// Basically, most of the interactions should do temporary borrow immediately releasing the
-	// borrow after performing necessary queries/changes.
-	sandbox_store: RefCell<sandbox::Store<SupervisorFuncRef>>,
+	/// We need some interior mutability here since the host state is shared between all host
+	/// function handlers and the wasmtime backend's `impl WasmRuntime`.
+	///
+	/// Furthermore, because of recursive calls (e.g. runtime can create and call an sandboxed
+	/// instance which in turn can call the runtime back) we have to be very careful with borrowing
+	/// those.
+	///
+	/// Basically, most of the interactions should do temporary borrow immediately releasing the
+	/// borrow after performing necessary queries/changes.
+	sandbox_store: Rc<RefCell<sandbox::Store<Func>>>,
 	allocator: RefCell<FreeingBumpHeapAllocator>,
 	instance: Rc<InstanceWrapper>,
 }
@@ -67,81 +55,54 @@ impl HostState {
 	/// Constructs a new `HostState`.
 	pub fn new(allocator: FreeingBumpHeapAllocator, instance: Rc<InstanceWrapper>) -> Self {
 		HostState {
-			inner: Rc::new(Inner {
-				sandbox_store: RefCell::new(sandbox::Store::new(
-					sandbox::SandboxBackend::TryWasmer,
-				)),
-				allocator: RefCell::new(allocator),
-				instance,
-			}),
+			sandbox_store: Rc::new(RefCell::new(sandbox::Store::new(
+				sandbox::SandboxBackend::TryWasmer,
+			))),
+			allocator: RefCell::new(allocator),
+			instance,
 		}
 	}
-}
 
-impl SandboxCapabilities for HostState {
-	type SupervisorFuncRef = SupervisorFuncRef;
+	/// Materialize `HostContext` that can be used to invoke a substrate host `dyn Function`.
+	pub fn materialize<'a>(&'a self) -> HostContext<'a> {
+		HostContext(self)
+	}
+}
 
-	fn invoke(
-		&mut self,
-		dispatch_thunk: &Self::SupervisorFuncRef,
-		invoke_args_ptr: Pointer<u8>,
-		invoke_args_len: WordSize,
-		state: u32,
-		func_idx: SupervisorFuncIndex,
-	) -> Result<i64> {
-		let result = dispatch_thunk.0.call(&[
-			Val::I32(u32::from(invoke_args_ptr) as i32),
-			Val::I32(invoke_args_len as i32),
-			Val::I32(state as i32),
-			Val::I32(usize::from(func_idx) as i32),
-		]);
-		match result {
-			Ok(ret_vals) => {
-				let ret_val = if ret_vals.len() != 1 {
-					return Err(format!(
-						"Supervisor function returned {} results, expected 1",
-						ret_vals.len()
-					)
-					.into())
-				} else {
-					&ret_vals[0]
-				};
+/// A `HostContext` implements `FunctionContext` for making host calls from a Wasmtime
+/// runtime. The `HostContext` exists only for the lifetime of the call and borrows state from
+/// a longer-living `HostState`.
+pub struct HostContext<'a>(&'a HostState);
 
-				if let Some(ret_val) = ret_val.i64() {
-					Ok(ret_val)
-				} else {
-					return Err("Supervisor function returned unexpected result!".into())
-				}
-			},
-			Err(err) => Err(err.to_string().into()),
-		}
+impl<'a> std::ops::Deref for HostContext<'a> {
+	type Target = HostState;
+	fn deref(&self) -> &HostState {
+		self.0
 	}
 }
 
-impl sp_wasm_interface::FunctionContext for HostState {
+impl<'a> sp_wasm_interface::FunctionContext for HostContext<'a> {
 	fn read_memory_into(
 		&self,
 		address: Pointer<u8>,
 		dest: &mut [u8],
 	) -> sp_wasm_interface::Result<()> {
-		self.inner.instance.read_memory_into(address, dest).map_err(|e| e.to_string())
+		self.instance.read_memory_into(address, dest).map_err(|e| e.to_string())
 	}
 
 	fn write_memory(&mut self, address: Pointer<u8>, data: &[u8]) -> sp_wasm_interface::Result<()> {
-		self.inner.instance.write_memory_from(address, data).map_err(|e| e.to_string())
+		self.instance.write_memory_from(address, data).map_err(|e| e.to_string())
 	}
 
 	fn allocate_memory(&mut self, size: WordSize) -> sp_wasm_interface::Result<Pointer<u8>> {
-		self.inner
-			.instance
-			.allocate(&mut *self.inner.allocator.borrow_mut(), size)
+		self.instance
+			.allocate(&mut *self.allocator.borrow_mut(), size)
 			.map_err(|e| e.to_string())
 	}
 
 	fn deallocate_memory(&mut self, ptr: Pointer<u8>) -> sp_wasm_interface::Result<()> {
-		self.inner
-			.instance
-			.deallocate(&mut *self.inner.allocator.borrow_mut(), ptr)
+		self.instance
+			.deallocate(&mut *self.allocator.borrow_mut(), ptr)
 			.map_err(|e| e.to_string())
 	}
 
@@ -150,7 +111,7 @@ impl sp_wasm_interface::FunctionContext for HostState {
 	}
 }
 
-impl Sandbox for HostState {
+impl<'a> Sandbox for HostContext<'a> {
 	fn memory_get(
 		&mut self,
 		memory_id: MemoryId,
@@ -159,7 +120,7 @@ impl Sandbox for HostState {
 		buf_len: WordSize,
 	) -> sp_wasm_interface::Result<u32> {
 		let sandboxed_memory =
-			self.inner.sandbox_store.borrow().memory(memory_id).map_err(|e| e.to_string())?;
+			self.sandbox_store.borrow().memory(memory_id).map_err(|e| e.to_string())?;
 
 		let len = buf_len as usize;
 
@@ -168,7 +129,7 @@ impl Sandbox for HostState {
 			Ok(buffer) => buffer,
 		};
 
-		if let Err(_) = self.inner.instance.write_memory_from(buf_ptr, &buffer) {
+		if let Err(_) = self.instance.write_memory_from(buf_ptr, &buffer) {
 			return Ok(sandbox_primitives::ERR_OUT_OF_BOUNDS)
 		}
 
@@ -183,11 +144,11 @@ impl Sandbox for HostState {
 		val_len: WordSize,
 	) -> sp_wasm_interface::Result<u32> {
 		let sandboxed_memory =
-			self.inner.sandbox_store.borrow().memory(memory_id).map_err(|e| e.to_string())?;
+			self.sandbox_store.borrow().memory(memory_id).map_err(|e| e.to_string())?;
 
 		let len = val_len as usize;
 
-		let buffer = match self.inner.instance.read_memory(val_ptr, len) {
+		let buffer = match self.instance.read_memory(val_ptr, len) {
 			Err(_) => return Ok(sandbox_primitives::ERR_OUT_OF_BOUNDS),
 			Ok(buffer) => buffer,
 		};
@@ -200,16 +161,14 @@ impl Sandbox for HostState {
 	}
 
 	fn memory_teardown(&mut self, memory_id: MemoryId) -> sp_wasm_interface::Result<()> {
-		self.inner
-			.sandbox_store
+		self.sandbox_store
 			.borrow_mut()
 			.memory_teardown(memory_id)
 			.map_err(|e| e.to_string())
 	}
 
 	fn memory_new(&mut self, initial: u32, maximum: u32) -> sp_wasm_interface::Result<u32> {
-		self.inner
-			.sandbox_store
+		self.sandbox_store
 			.borrow_mut()
 			.new_memory(initial, maximum)
 			.map_err(|e| e.to_string())
@@ -233,14 +192,21 @@ impl Sandbox for HostState {
 			.map(Into::into)
 			.collect::<Vec<_>>();
 
-		let instance = self
-			.inner
+		let instance =
+			self.sandbox_store.borrow().instance(instance_id).map_err(|e| e.to_string())?;
+
+		let dispatch_thunk = self
 			.sandbox_store
 			.borrow()
-			.instance(instance_id)
+			.dispatch_thunk(instance_id)
 			.map_err(|e| e.to_string())?;
 
-		let result = instance.invoke::<_, CapsHolder, ThunkHolder>(export_name, &args, state);
+		let result = instance.invoke(
+			export_name,
+			&args,
+			state,
+			&mut SandboxContext { host_context: self, dispatch_thunk },
+		);
 
 		match result {
 			Ok(None) => Ok(sandbox_primitives::ERR_OK),
@@ -250,7 +216,7 @@ impl Sandbox for HostState {
 					if val.len() > return_val_len as usize {
 						Err("Return value buffer is too small")?;
 					}
-					<HostState as FunctionContext>::write_memory(self, return_val, val)
+					<HostContext as FunctionContext>::write_memory(self, return_val, val)
 						.map_err(|_| "can't write return value")?;
 					Ok(sandbox_primitives::ERR_OK)
 				})
@@ -260,8 +226,7 @@ impl Sandbox for HostState {
 	}
 
 	fn instance_teardown(&mut self, instance_id: u32) -> sp_wasm_interface::Result<()> {
-		self.inner
-			.sandbox_store
+		self.sandbox_store
 			.borrow_mut()
 			.instance_teardown(instance_id)
 			.map_err(|e| e.to_string())
@@ -277,36 +242,36 @@ impl Sandbox for HostState {
 		// Extract a dispatch thunk from the instance's table by the specified index.
 		let dispatch_thunk = {
 			let table_item = self
-				.inner
 				.instance
 				.table()
 				.as_ref()
 				.ok_or_else(|| "Runtime doesn't have a table; sandbox is unavailable")?
 				.get(dispatch_thunk_id);
 
-			let func_ref = table_item
+			table_item
 				.ok_or_else(|| "dispatch_thunk_id is out of bounds")?
 				.funcref()
 				.ok_or_else(|| "dispatch_thunk_idx should be a funcref")?
 				.ok_or_else(|| "dispatch_thunk_idx should point to actual func")?
-				.clone();
-			SupervisorFuncRef(func_ref)
-		};
-
-		let guest_env = match sandbox::GuestEnvironment::decode(
-			&*self.inner.sandbox_store.borrow(),
-			raw_env_def,
-		) {
-			Ok(guest_env) => guest_env,
-			Err(_) => return Ok(sandbox_primitives::ERR_MODULE as u32),
+				.clone()
 		};
 
-		let store = &mut *self.inner.sandbox_store.borrow_mut();
-		let result = DISPATCH_THUNK.set(&dispatch_thunk, || {
-			store
-				.instantiate::<_, CapsHolder, ThunkHolder>(wasm, guest_env, state)
-				.map(|i| i.register(store))
-		});
+		let guest_env =
+			match sandbox::GuestEnvironment::decode(&*self.sandbox_store.borrow(), raw_env_def) {
+				Ok(guest_env) => guest_env,
+				Err(_) => return Ok(sandbox_primitives::ERR_MODULE as u32),
+			};
+
+		let store = self.sandbox_store.clone();
+		let store = &mut store.borrow_mut();
+		let result = store
+			.instantiate(
+				wasm,
+				guest_env,
+				state,
+				&mut SandboxContext { host_context: self, dispatch_thunk: dispatch_thunk.clone() },
+			)
+			.map(|i| i.register(store, dispatch_thunk));
 
 		let instance_idx_or_err_code = match result {
 			Ok(instance_idx) => instance_idx,
@@ -322,8 +287,7 @@ impl Sandbox for HostState {
 		instance_idx: u32,
 		name: &str,
 	) -> sp_wasm_interface::Result<Option<sp_wasm_interface::Value>> {
-		self.inner
-			.sandbox_store
+		self.sandbox_store
 			.borrow()
 			.instance(instance_idx)
 			.map(|i| i.get_global_val(name))
@@ -331,41 +295,48 @@ impl Sandbox for HostState {
 	}
 }
 
-/// Wasmtime specific implementation of `SandboxCapabilitiesHolder` that provides
-/// sandbox with a scoped thread local access to a function executor.
-/// This is a way to calm down the borrow checker since host function closures
-/// require exclusive access to it.
-struct CapsHolder;
-
-impl SandboxCapabilitiesHolder for CapsHolder {
-	type SupervisorFuncRef = SupervisorFuncRef;
-	type SC = HostState;
-
-	fn with_sandbox_capabilities<R, F: FnOnce(&mut Self::SC) -> R>(f: F) -> R {
-		crate::state_holder::with_context(|ctx| f(&mut ctx.expect("wasmtime executor is not set")))
-	}
+struct SandboxContext<'a, 'b> {
+	host_context: &'a mut HostContext<'b>,
+	dispatch_thunk: Func,
 }
 
-/// Wasmtime specific implementation of `DispatchThunkHolder` that provides
-/// sandbox with a scoped thread local access to a dispatch thunk.
-/// This is a way to calm down the borrow checker since host function closures
-/// require exclusive access to it.
-struct ThunkHolder;
-
-scoped_tls::scoped_thread_local!(static DISPATCH_THUNK: SupervisorFuncRef);
-
-impl sandbox::DispatchThunkHolder for ThunkHolder {
-	type DispatchThunk = SupervisorFuncRef;
+impl<'a, 'b> sandbox::SandboxContext for SandboxContext<'a, 'b> {
+	fn invoke(
+		&mut self,
+		invoke_args_ptr: Pointer<u8>,
+		invoke_args_len: WordSize,
+		state: u32,
+		func_idx: SupervisorFuncIndex,
+	) -> Result<i64> {
+		let result = self.dispatch_thunk.call(&[
+			Val::I32(u32::from(invoke_args_ptr) as i32),
+			Val::I32(invoke_args_len as i32),
+			Val::I32(state as i32),
+			Val::I32(usize::from(func_idx) as i32),
+		]);
+		match result {
+			Ok(ret_vals) => {
+				let ret_val = if ret_vals.len() != 1 {
+					return Err(format!(
+						"Supervisor function returned {} results, expected 1",
+						ret_vals.len()
+					)
+					.into())
+				} else {
+					&ret_vals[0]
+				};
 
-	fn with_dispatch_thunk<R, F: FnOnce(&mut Self::DispatchThunk) -> R>(f: F) -> R {
-		assert!(DISPATCH_THUNK.is_set(), "dispatch thunk is not set");
-		DISPATCH_THUNK.with(|thunk| f(&mut thunk.clone()))
+				if let Some(ret_val) = ret_val.i64() {
+					Ok(ret_val)
+				} else {
+					return Err("Supervisor function returned unexpected result!".into())
+				}
+			},
+			Err(err) => Err(err.to_string().into()),
+		}
 	}
 
-	fn initialize_thunk<R, F>(s: &Self::DispatchThunk, f: F) -> R
-	where
-		F: FnOnce() -> R,
-	{
-		DISPATCH_THUNK.set(s, f)
+	fn supervisor_context(&mut self) -> &mut dyn FunctionContext {
+		self.host_context
 	}
 }
diff --git a/client/executor/wasmtime/src/state_holder.rs b/client/executor/wasmtime/src/state_holder.rs
index 45bddc841bde..0e2684cd2513 100644
--- a/client/executor/wasmtime/src/state_holder.rs
+++ b/client/executor/wasmtime/src/state_holder.rs
@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::host::HostState;
+use crate::host::{HostContext, HostState};
 
 scoped_tls::scoped_thread_local!(static HOST_STATE: HostState);
 
@@ -36,10 +36,10 @@ where
 /// context will be `None`.
 pub fn with_context<R, F>(f: F) -> R
 where
-	F: FnOnce(Option<HostState>) -> R,
+	F: FnOnce(Option<HostContext>) -> R,
 {
 	if !HOST_STATE.is_set() {
 		return f(None)
 	}
-	HOST_STATE.with(|state| f(Some(state.clone())))
+	HOST_STATE.with(|state| f(Some(state.materialize())))
 }

From b391b82954ad95a927a921035e3017c4a0aad516 Mon Sep 17 00:00:00 2001
From: tgmichel <telmo@purestake.com>
Date: Wed, 8 Sep 2021 15:57:34 +0200
Subject: [PATCH 1155/1194] `graph::ChainApi` and `graph::Pool` reexport
 (#9726)

* `graph::ChainApi` and `graph::Pool` reexport

* Redundant import cleanup
---
 client/transaction-pool/src/lib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/transaction-pool/src/lib.rs b/client/transaction-pool/src/lib.rs
index cd97abab933f..0f985d835c6b 100644
--- a/client/transaction-pool/src/lib.rs
+++ b/client/transaction-pool/src/lib.rs
@@ -44,7 +44,7 @@ use futures::{
 	future::{self, ready},
 	prelude::*,
 };
-pub use graph::{Options, Transaction};
+pub use graph::{ChainApi, Options, Pool, Transaction};
 use parking_lot::Mutex;
 use std::{
 	collections::{HashMap, HashSet},
@@ -451,7 +451,7 @@ where
 		at: &BlockId<Self::Block>,
 		xt: sc_transaction_pool_api::LocalTransactionFor<Self>,
 	) -> Result<Self::Hash, Self::Error> {
-		use graph::{ChainApi, ValidatedTransaction};
+		use graph::ValidatedTransaction;
 		use sp_runtime::{
 			traits::SaturatedConversion, transaction_validity::TransactionValidityError,
 		};

From 821496d19b39acdec83f1e36fc3b0d7121f991e8 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Wed, 8 Sep 2021 20:45:24 +0200
Subject: [PATCH 1156/1194] Fix flaky test (#9729)

* Fix flaky test

* Restore cargo fmt

Co-authored-by: Roman Proskuryakov <r.proskuryakoff@gmail.com>
---
 client/network/src/service/tests.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/network/src/service/tests.rs b/client/network/src/service/tests.rs
index 8cad044636c2..4bda70330bdf 100644
--- a/client/network/src/service/tests.rs
+++ b/client/network/src/service/tests.rs
@@ -527,11 +527,12 @@ fn fallback_name_working() {
 		// Wait for the `NotificationStreamOpened`.
 		loop {
 			match events_stream1.next().await.unwrap() {
-				Event::NotificationStreamOpened { protocol, negotiated_fallback, .. } => {
-					assert_eq!(protocol, NEW_PROTOCOL_NAME);
+				Event::NotificationStreamOpened { protocol, negotiated_fallback, .. }
+					if protocol == NEW_PROTOCOL_NAME =>
+				{
 					assert_eq!(negotiated_fallback, Some(PROTOCOL_NAME));
 					break
-				},
+				}
 				_ => {},
 			};
 		}

From 37aa0bda8a67686e8314915309200291ef44194d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Thu, 9 Sep 2021 11:12:08 +0200
Subject: [PATCH 1157/1194] Improve instruction benchmarks (#9712)

* seal_input can be called multiple times

* Increase size of instruction benchmarks

* Remove randomness from instr_br* benchmarks

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_contracts --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/contracts/src/weights.rs --template=./.maintain/frame-weight-template.hbs

Co-authored-by: Parity Bot <admin@parity.io>
---
 Cargo.lock                              |    4 +-
 frame/contracts/Cargo.toml              |    2 +-
 frame/contracts/src/benchmarking/mod.rs |   30 +-
 frame/contracts/src/schedule.rs         |    8 +-
 frame/contracts/src/weights.rs          | 1170 ++++++++++++-----------
 5 files changed, 608 insertions(+), 606 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 698060c70d2f..fea89d17368a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6540,9 +6540,9 @@ dependencies = [
 
 [[package]]
 name = "pwasm-utils"
-version = "0.18.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0c1a2f10b47d446372a4f397c58b329aaea72b2daf9395a623a411cb8ccb54f"
+checksum = "880b3384fb00b8f6ecccd5d358b93bd2201900ae3daad213791d1864f6441f5c"
 dependencies = [
  "byteorder",
  "log 0.4.14",
diff --git a/frame/contracts/Cargo.toml b/frame/contracts/Cargo.toml
index 3498a77b8bfd..295419a27911 100644
--- a/frame/contracts/Cargo.toml
+++ b/frame/contracts/Cargo.toml
@@ -19,7 +19,7 @@ codec = { package = "parity-scale-codec", version = "2.2.0", default-features =
 	"max-encoded-len",
 ] }
 log = { version = "0.4", default-features = false }
-pwasm-utils = { version = "0.18", default-features = false }
+pwasm-utils = { version = "0.18.2", default-features = false }
 serde = { version = "1", optional = true, features = ["derive"] }
 smallvec = { version = "1", default-features = false, features = [
 	"const_generics",
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index 509f96bf035c..f1c539fa918a 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -50,7 +50,7 @@ use sp_std::{convert::TryInto, default::Default, vec, vec::Vec};
 const API_BENCHMARK_BATCHES: u32 = 20;
 
 /// How many batches we do per Instruction benchmark.
-const INSTR_BENCHMARK_BATCHES: u32 = 1;
+const INSTR_BENCHMARK_BATCHES: u32 = 50;
 
 /// An instantiated and deployed contract.
 struct Contract<T: Config> {
@@ -444,11 +444,8 @@ benchmarks! {
 
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
-	// We cannot call seal_input multiple times. Therefore our weight determination is not
-	// as precise as with other APIs. Because this function can only be called once per
-	// contract it cannot be used for Dos.
 	seal_input {
-		let r in 0 .. 1;
+		let r in 0 .. API_BENCHMARK_BATCHES;
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
@@ -463,7 +460,7 @@ benchmarks! {
 					value: 0u32.to_le_bytes().to_vec(),
 				},
 			],
-			call_body: Some(body::repeated(r, &[
+			call_body: Some(body::repeated(r * API_BENCHMARK_BATCH_SIZE, &[
 				Instruction::I32Const(4), // ptr where to store output
 				Instruction::I32Const(0), // ptr to length
 				Instruction::Call(0),
@@ -492,11 +489,10 @@ benchmarks! {
 					value: buffer_size.to_le_bytes().to_vec(),
 				},
 			],
-			call_body: Some(body::plain(vec![
+			call_body: Some(body::repeated(API_BENCHMARK_BATCH_SIZE, &[
 				Instruction::I32Const(4), // ptr where to store output
 				Instruction::I32Const(0), // ptr to length
 				Instruction::Call(0),
-				Instruction::End,
 			])),
 			.. Default::default()
 		});
@@ -505,7 +501,9 @@ benchmarks! {
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), data)
 
-	// The same argument as for `seal_input` is true here.
+	// We cannot call `seal_return` multiple times. Therefore our weight determination is not
+	// as precise as with other APIs. Because this function can only be called once per
+	// contract it cannot be used as an attack vector.
 	seal_return {
 		let r in 0 .. 1;
 		let code = WasmModule::<T>::from(ModuleDefinition {
@@ -551,7 +549,7 @@ benchmarks! {
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
-	// The same argument as for `seal_input` is true here.
+	// The same argument as for `seal_return` is true here.
 	seal_terminate {
 		let r in 0 .. 1;
 		let beneficiary = account::<T::AccountId>("beneficiary", 0, 0);
@@ -1509,6 +1507,7 @@ benchmarks! {
 	}
 
 	// w_br = w_bench - 2 * w_param
+	// Block instructions are not counted.
 	instr_br {
 		let r in 0 .. INSTR_BENCHMARK_BATCHES;
 		let mut sbox = Sandbox::from(&WasmModule::<T>::from(ModuleDefinition {
@@ -1533,9 +1532,8 @@ benchmarks! {
 		sbox.invoke();
 	}
 
-	// w_br_if = w_bench - 5 * w_param
-	// The two additional pushes + drop are only executed 50% of the time.
-	// Making it: 3 * w_param + (50% * 4 * w_param)
+	// w_br_if = w_bench - 3 * w_param
+	// Block instructions are not counted.
 	instr_br_if {
 		let r in 0 .. INSTR_BENCHMARK_BATCHES;
 		let mut sbox = Sandbox::from(&WasmModule::<T>::from(ModuleDefinition {
@@ -1543,7 +1541,7 @@ benchmarks! {
 				Regular(Instruction::Block(BlockType::NoResult)),
 				Regular(Instruction::Block(BlockType::NoResult)),
 				Regular(Instruction::Block(BlockType::NoResult)),
-				RandomI32(0, 2),
+				Regular(Instruction::I32Const(1)),
 				Regular(Instruction::BrIf(1)),
 				RandomI64Repeated(1),
 				Regular(Instruction::Drop),
@@ -1562,11 +1560,11 @@ benchmarks! {
 	}
 
 	// w_br_table = w_bench - 3 * w_param
-	// 1 * w_param + 0.5 * 2 * w_param + 0.25 * 4 * w_param
+	// Block instructions are not counted.
 	instr_br_table {
 		let r in 0 .. INSTR_BENCHMARK_BATCHES;
 		let table = Box::new(BrTableData {
-			table: Box::new([0, 1, 2]),
+			table: Box::new([1, 1, 1]),
 			default: 1,
 		});
 		let mut sbox = Sandbox::from(&WasmModule::<T>::from(ModuleDefinition {
diff --git a/frame/contracts/src/schedule.rs b/frame/contracts/src/schedule.rs
index 2768ddf43a97..69495b3e96af 100644
--- a/frame/contracts/src/schedule.rs
+++ b/frame/contracts/src/schedule.rs
@@ -36,7 +36,7 @@ pub const API_BENCHMARK_BATCH_SIZE: u32 = 100;
 
 /// How many instructions are executed in a single batch. The reasoning is the same
 /// as for `API_BENCHMARK_BATCH_SIZE`.
-pub const INSTR_BENCHMARK_BATCH_SIZE: u32 = 1_000;
+pub const INSTR_BENCHMARK_BATCH_SIZE: u32 = 100;
 
 /// Definition of the cost schedule and other parameterizations for the wasm vm.
 ///
@@ -495,7 +495,7 @@ impl<T: Config> Default for InstructionWeights<T> {
 			select: cost_instr!(instr_select, 4),
 			r#if: cost_instr!(instr_if, 3),
 			br: cost_instr!(instr_br, 2),
-			br_if: cost_instr!(instr_br_if, 5),
+			br_if: cost_instr!(instr_br_if, 3),
 			br_table: cost_instr!(instr_br_table, 3),
 			br_table_per_entry: cost_instr!(instr_br_table_per_entry, 0),
 			call: cost_instr!(instr_call, 2),
@@ -559,8 +559,8 @@ impl<T: Config> Default for HostFnWeights<T> {
 			now: cost_batched!(seal_now),
 			weight_to_fee: cost_batched!(seal_weight_to_fee),
 			gas: cost_batched!(seal_gas),
-			input: cost!(seal_input),
-			input_per_byte: cost_byte!(seal_input_per_kb),
+			input: cost_batched!(seal_input),
+			input_per_byte: cost_byte_batched!(seal_input_per_kb),
 			r#return: cost!(seal_return),
 			return_per_byte: cost_byte!(seal_return_per_kb),
 			terminate: cost!(seal_terminate),
diff --git a/frame/contracts/src/weights.rs b/frame/contracts/src/weights.rs
index 75e5a846063d..d15badcbaf59 100644
--- a/frame/contracts/src/weights.rs
+++ b/frame/contracts/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_contracts
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2021-09-06, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-09-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -150,47 +150,47 @@ pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts DeletionQueue (r:1 w:0)
 	fn on_initialize() -> Weight {
-		(3_259_000 as Weight)
+		(3_345_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 3_000
-			.saturating_add((2_197_000 as Weight).saturating_mul(k as Weight))
+			.saturating_add((2_212_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	// Storage: Contracts DeletionQueue (r:1 w:0)
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
-		(81_940_000 as Weight)
+		(80_219_000 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((354_000 as Weight).saturating_mul(q as Weight))
+			.saturating_add((375_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts PristineCode (r:1 w:0)
 	// Storage: Contracts CodeStorage (r:0 w:1)
 	fn instrument(c: u32, ) -> Weight {
-		(32_129_000 as Weight)
-			// Standard Error: 95_000
-			.saturating_add((65_706_000 as Weight).saturating_mul(c as Weight))
+		(35_370_000 as Weight)
+			// Standard Error: 85_000
+			.saturating_add((72_516_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	fn code_load(c: u32, ) -> Weight {
-		(6_215_000 as Weight)
+		(6_479_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((1_430_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((1_426_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 	}
 	// Storage: Contracts CodeStorage (r:1 w:1)
 	fn code_refcount(c: u32, ) -> Weight {
-		(10_499_000 as Weight)
+		(10_220_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((2_278_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((2_280_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -201,11 +201,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:1)
 	// Storage: Contracts PristineCode (r:0 w:1)
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight {
-		(473_826_000 as Weight)
-			// Standard Error: 133_000
-			.saturating_add((171_504_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 8_000
-			.saturating_add((2_161_000 as Weight).saturating_mul(s as Weight))
+		(404_011_000 as Weight)
+			// Standard Error: 220_000
+			.saturating_add((181_224_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 14_000
+			.saturating_add((2_198_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
@@ -215,9 +215,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System Account (r:1 w:1)
 	fn instantiate(s: u32, ) -> Weight {
-		(215_899_000 as Weight)
+		(215_544_000 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((1_991_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((1_986_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
@@ -226,7 +226,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System Account (r:1 w:1)
 	fn call() -> Weight {
-		(176_744_000 as Weight)
+		(177_006_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
@@ -234,9 +234,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_caller(r: u32, ) -> Weight {
-		(426_422_000 as Weight)
-			// Standard Error: 183_000
-			.saturating_add((134_155_000 as Weight).saturating_mul(r as Weight))
+		(420_960_000 as Weight)
+			// Standard Error: 129_000
+			.saturating_add((133_032_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -244,9 +244,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_address(r: u32, ) -> Weight {
-		(424_450_000 as Weight)
-			// Standard Error: 157_000
-			.saturating_add((134_814_000 as Weight).saturating_mul(r as Weight))
+		(419_566_000 as Weight)
+			// Standard Error: 121_000
+			.saturating_add((133_539_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -254,9 +254,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(423_245_000 as Weight)
-			// Standard Error: 158_000
-			.saturating_add((133_566_000 as Weight).saturating_mul(r as Weight))
+		(420_772_000 as Weight)
+			// Standard Error: 146_000
+			.saturating_add((132_394_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -265,9 +265,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System Account (r:1 w:0)
 	fn seal_balance(r: u32, ) -> Weight {
-		(438_039_000 as Weight)
-			// Standard Error: 216_000
-			.saturating_add((383_624_000 as Weight).saturating_mul(r as Weight))
+		(425_259_000 as Weight)
+			// Standard Error: 237_000
+			.saturating_add((379_279_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -275,9 +275,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(421_656_000 as Weight)
-			// Standard Error: 163_000
-			.saturating_add((135_160_000 as Weight).saturating_mul(r as Weight))
+		(421_599_000 as Weight)
+			// Standard Error: 162_000
+			.saturating_add((133_964_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -285,9 +285,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(425_416_000 as Weight)
-			// Standard Error: 177_000
-			.saturating_add((134_306_000 as Weight).saturating_mul(r as Weight))
+		(414_423_000 as Weight)
+			// Standard Error: 164_000
+			.saturating_add((134_814_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -295,9 +295,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(422_733_000 as Weight)
-			// Standard Error: 171_000
-			.saturating_add((134_775_000 as Weight).saturating_mul(r as Weight))
+		(423_908_000 as Weight)
+			// Standard Error: 134_000
+			.saturating_add((133_470_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -305,9 +305,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_block_number(r: u32, ) -> Weight {
-		(425_223_000 as Weight)
-			// Standard Error: 193_000
-			.saturating_add((133_823_000 as Weight).saturating_mul(r as Weight))
+		(423_769_000 as Weight)
+			// Standard Error: 138_000
+			.saturating_add((135_123_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -315,9 +315,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_now(r: u32, ) -> Weight {
-		(433_528_000 as Weight)
-			// Standard Error: 166_000
-			.saturating_add((133_358_000 as Weight).saturating_mul(r as Weight))
+		(431_525_000 as Weight)
+			// Standard Error: 119_000
+			.saturating_add((131_528_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -326,9 +326,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: TransactionPayment NextFeeMultiplier (r:1 w:0)
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(432_032_000 as Weight)
-			// Standard Error: 214_000
-			.saturating_add((305_418_000 as Weight).saturating_mul(r as Weight))
+		(435_484_000 as Weight)
+			// Standard Error: 179_000
+			.saturating_add((298_204_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -336,17 +336,19 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_gas(r: u32, ) -> Weight {
-		(148_160_000 as Weight)
-			// Standard Error: 120_000
-			.saturating_add((59_833_000 as Weight).saturating_mul(r as Weight))
+		(144_616_000 as Weight)
+			// Standard Error: 118_000
+			.saturating_add((59_737_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
-	fn seal_input(_r: u32, ) -> Weight {
-		(420_503_000 as Weight)
+	fn seal_input(r: u32, ) -> Weight {
+		(417_893_000 as Weight)
+			// Standard Error: 138_000
+			.saturating_add((114_222_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -354,9 +356,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(424_727_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_017_000 as Weight).saturating_mul(n as Weight))
+		(558_705_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((38_111_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -364,9 +366,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_return(r: u32, ) -> Weight {
-		(397_994_000 as Weight)
-			// Standard Error: 1_720_000
-			.saturating_add((17_298_000 as Weight).saturating_mul(r as Weight))
+		(397_670_000 as Weight)
+			// Standard Error: 1_581_000
+			.saturating_add((17_618_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -374,9 +376,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(414_811_000 as Weight)
+		(415_352_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((637_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((635_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -386,9 +388,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts DeletionQueue (r:1 w:1)
 	// Storage: System Account (r:2 w:2)
 	fn seal_terminate(r: u32, ) -> Weight {
-		(407_583_000 as Weight)
-			// Standard Error: 4_720_000
-			.saturating_add((110_145_000 as Weight).saturating_mul(r as Weight))
+		(407_089_000 as Weight)
+			// Standard Error: 181_000
+			.saturating_add((98_910_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -399,9 +401,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: RandomnessCollectiveFlip RandomMaterial (r:1 w:0)
 	fn seal_random(r: u32, ) -> Weight {
-		(421_151_000 as Weight)
-			// Standard Error: 239_000
-			.saturating_add((432_224_000 as Weight).saturating_mul(r as Weight))
+		(412_468_000 as Weight)
+			// Standard Error: 385_000
+			.saturating_add((419_134_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -409,9 +411,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(417_192_000 as Weight)
-			// Standard Error: 312_000
-			.saturating_add((752_443_000 as Weight).saturating_mul(r as Weight))
+		(416_035_000 as Weight)
+			// Standard Error: 408_000
+			.saturating_add((708_750_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -420,11 +422,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System EventTopics (r:100 w:100)
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_265_810_000 as Weight)
-			// Standard Error: 2_068_000
-			.saturating_add((507_093_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 407_000
-			.saturating_add((165_100_000 as Weight).saturating_mul(n as Weight))
+		(1_251_101_000 as Weight)
+			// Standard Error: 2_553_000
+			.saturating_add((504_170_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 503_000
+			.saturating_add((165_595_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -434,17 +436,17 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_debug_message(r: u32, ) -> Weight {
-		(161_459_000 as Weight)
-			// Standard Error: 151_000
-			.saturating_add((76_693_000 as Weight).saturating_mul(r as Weight))
+		(157_690_000 as Weight)
+			// Standard Error: 144_000
+			.saturating_add((77_093_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(402_875_000 as Weight)
-			// Standard Error: 282_000
-			.saturating_add((258_574_000 as Weight).saturating_mul(r as Weight))
+		(404_827_000 as Weight)
+			// Standard Error: 229_000
+			.saturating_add((251_475_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
@@ -454,26 +456,26 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: unknown [0x7afa01283080ef247df84e0ba38ea5a587d25ce6633a6bfbba02068c14023441] (r:0 w:1)
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(666_594_000 as Weight)
-			// Standard Error: 264_000
-			.saturating_add((70_365_000 as Weight).saturating_mul(n as Weight))
+		(653_171_000 as Weight)
+			// Standard Error: 287_000
+			.saturating_add((71_526_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_clear_storage(r: u32, ) -> Weight {
-		(452_019_000 as Weight)
-			// Standard Error: 236_000
-			.saturating_add((233_300_000 as Weight).saturating_mul(r as Weight))
+		(444_692_000 as Weight)
+			// Standard Error: 214_000
+			.saturating_add((226_212_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_get_storage(r: u32, ) -> Weight {
-		(303_530_000 as Weight)
-			// Standard Error: 801_000
-			.saturating_add((532_265_000 as Weight).saturating_mul(r as Weight))
+		(278_436_000 as Weight)
+			// Standard Error: 827_000
+			.saturating_add((528_111_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -483,9 +485,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: unknown [0x7afa01283080ef247df84e0ba38ea5a587d25ce6633a6bfbba02068c14023441] (r:1 w:0)
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(734_714_000 as Weight)
-			// Standard Error: 246_000
-			.saturating_add((112_631_000 as Weight).saturating_mul(n as Weight))
+		(732_808_000 as Weight)
+			// Standard Error: 304_000
+			.saturating_add((112_394_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -494,9 +496,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System Account (r:101 w:101)
 	fn seal_transfer(r: u32, ) -> Weight {
-		(319_298_000 as Weight)
-			// Standard Error: 2_180_000
-			.saturating_add((4_710_724_000 as Weight).saturating_mul(r as Weight))
+		(257_626_000 as Weight)
+			// Standard Error: 1_850_000
+			.saturating_add((4_621_393_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
@@ -507,8 +509,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 10_059_000
-			.saturating_add((40_188_894_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 6_833_000
+			.saturating_add((39_990_561_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -519,13 +521,13 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System Account (r:101 w:101)
 	fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight {
-		(39_972_999_000 as Weight)
-			// Standard Error: 56_397_000
-			.saturating_add((3_858_600_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 20_000
-			.saturating_add((62_963_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 21_000
-			.saturating_add((101_497_000 as Weight).saturating_mul(o as Weight))
+		(39_296_507_000 as Weight)
+			// Standard Error: 98_740_000
+			.saturating_add((4_165_171_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 35_000
+			.saturating_add((63_121_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 37_000
+			.saturating_add((101_665_000 as Weight).saturating_mul(o as Weight))
 			.saturating_add(T::DbWeight::get().reads(104 as Weight))
 			.saturating_add(T::DbWeight::get().reads((101 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(T::DbWeight::get().writes(101 as Weight))
@@ -538,8 +540,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:101 w:101)
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 103_701_000
-			.saturating_add((48_209_042_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 100_794_000
+			.saturating_add((47_889_192_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
@@ -551,13 +553,13 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts AccountCounter (r:1 w:1)
 	// Storage: System Account (r:101 w:101)
 	fn seal_instantiate_per_input_output_salt_kb(i: u32, o: u32, s: u32, ) -> Weight {
-		(45_662_002_000 as Weight)
-			// Standard Error: 30_000
-			.saturating_add((63_978_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 30_000
-			.saturating_add((101_724_000 as Weight).saturating_mul(o as Weight))
-			// Standard Error: 30_000
-			.saturating_add((201_820_000 as Weight).saturating_mul(s as Weight))
+		(45_237_285_000 as Weight)
+			// Standard Error: 35_000
+			.saturating_add((64_100_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 35_000
+			.saturating_add((102_036_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 35_000
+			.saturating_add((201_375_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(206 as Weight))
 			.saturating_add(T::DbWeight::get().writes(204 as Weight))
 	}
@@ -565,9 +567,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(422_425_000 as Weight)
-			// Standard Error: 164_000
-			.saturating_add((139_580_000 as Weight).saturating_mul(r as Weight))
+		(416_807_000 as Weight)
+			// Standard Error: 153_000
+			.saturating_add((137_778_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -575,9 +577,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(691_929_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((499_602_000 as Weight).saturating_mul(n as Weight))
+		(651_244_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((499_711_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -585,9 +587,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(420_255_000 as Weight)
-			// Standard Error: 167_000
-			.saturating_add((148_167_000 as Weight).saturating_mul(r as Weight))
+		(419_157_000 as Weight)
+			// Standard Error: 146_000
+			.saturating_add((144_391_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -595,9 +597,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(541_872_000 as Weight)
+		(568_821_000 as Weight)
 			// Standard Error: 17_000
-			.saturating_add((347_194_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((346_968_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -605,9 +607,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(419_267_000 as Weight)
-			// Standard Error: 139_000
-			.saturating_add((119_855_000 as Weight).saturating_mul(r as Weight))
+		(417_978_000 as Weight)
+			// Standard Error: 163_000
+			.saturating_add((119_871_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -615,9 +617,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(547_517_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((164_328_000 as Weight).saturating_mul(n as Weight))
+		(537_541_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((164_266_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -625,9 +627,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(424_870_000 as Weight)
-			// Standard Error: 163_000
-			.saturating_add((118_215_000 as Weight).saturating_mul(r as Weight))
+		(420_244_000 as Weight)
+			// Standard Error: 152_000
+			.saturating_add((119_123_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -635,266 +637,266 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(514_057_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((164_390_000 as Weight).saturating_mul(n as Weight))
+		(486_612_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((164_406_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(51_570_000 as Weight)
-			// Standard Error: 74_000
-			.saturating_add((9_529_000 as Weight).saturating_mul(r as Weight))
+		(54_394_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((750_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(38_616_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((37_349_000 as Weight).saturating_mul(r as Weight))
+		(48_363_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((2_464_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(38_576_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((38_351_000 as Weight).saturating_mul(r as Weight))
+		(49_007_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((2_540_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(51_383_000 as Weight)
-			// Standard Error: 60_000
-			.saturating_add((27_099_000 as Weight).saturating_mul(r as Weight))
+		(51_388_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((2_188_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(38_218_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((41_226_000 as Weight).saturating_mul(r as Weight))
+		(48_672_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((2_310_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(38_216_000 as Weight)
-			// Standard Error: 33_000
-			.saturating_add((28_483_000 as Weight).saturating_mul(r as Weight))
+		(51_538_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((1_324_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(51_637_000 as Weight)
-			// Standard Error: 56_000
-			.saturating_add((34_688_000 as Weight).saturating_mul(r as Weight))
+		(45_154_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((2_002_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(51_490_000 as Weight)
-			// Standard Error: 71_000
-			.saturating_add((27_683_000 as Weight).saturating_mul(r as Weight))
+		(38_511_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((2_611_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(77_260_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((130_000 as Weight).saturating_mul(e as Weight))
+		(47_321_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((18_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(52_012_000 as Weight)
-			// Standard Error: 564_000
-			.saturating_add((188_018_000 as Weight).saturating_mul(r as Weight))
+		(40_145_000 as Weight)
+			// Standard Error: 30_000
+			.saturating_add((20_056_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(65_670_000 as Weight)
-			// Standard Error: 5_489_000
-			.saturating_add((294_560_000 as Weight).saturating_mul(r as Weight))
+		(54_566_000 as Weight)
+			// Standard Error: 32_000
+			.saturating_add((30_331_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(368_428_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((10_469_000 as Weight).saturating_mul(p as Weight))
+		(86_289_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((1_080_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(52_091_000 as Weight)
-			// Standard Error: 32_000
-			.saturating_add((11_160_000 as Weight).saturating_mul(r as Weight))
+		(49_186_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((629_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(52_145_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((12_086_000 as Weight).saturating_mul(r as Weight))
+		(49_030_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((732_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(52_057_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((2_555_000 as Weight).saturating_mul(r as Weight))
+		(45_867_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((1_281_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(73_126_000 as Weight)
-			// Standard Error: 35_000
-			.saturating_add((16_004_000 as Weight).saturating_mul(r as Weight))
+		(64_350_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((1_421_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(73_104_000 as Weight)
-			// Standard Error: 63_000
-			.saturating_add((2_267_000 as Weight).saturating_mul(r as Weight))
+		(61_716_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((1_561_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(38_596_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((22_244_000 as Weight).saturating_mul(r as Weight))
+		(53_303_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((742_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(39_320_000 as Weight)
-			// Standard Error: 4_805_000
-			.saturating_add((642_459_000 as Weight).saturating_mul(r as Weight))
+		(38_377_000 as Weight)
+			// Standard Error: 122_000
+			.saturating_add((633_403_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(51_634_000 as Weight)
-			// Standard Error: 65_000
-			.saturating_add((14_706_000 as Weight).saturating_mul(r as Weight))
+		(55_169_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((1_114_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(51_490_000 as Weight)
-			// Standard Error: 63_000
-			.saturating_add((14_759_000 as Weight).saturating_mul(r as Weight))
+		(55_406_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((1_105_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(51_278_000 as Weight)
-			// Standard Error: 37_000
-			.saturating_add((15_084_000 as Weight).saturating_mul(r as Weight))
+		(55_255_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((1_111_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(51_524_000 as Weight)
-			// Standard Error: 53_000
-			.saturating_add((14_801_000 as Weight).saturating_mul(r as Weight))
+		(55_389_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((1_102_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(50_775_000 as Weight)
-			// Standard Error: 88_000
-			.saturating_add((3_125_000 as Weight).saturating_mul(r as Weight))
+		(44_951_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((1_302_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(50_748_000 as Weight)
-			// Standard Error: 191_000
-			.saturating_add((3_785_000 as Weight).saturating_mul(r as Weight))
+		(45_263_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_292_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(52_621_000 as Weight)
-			// Standard Error: 60_000
-			.saturating_add((13_744_000 as Weight).saturating_mul(r as Weight))
+		(55_222_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((1_104_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(51_486_000 as Weight)
-			// Standard Error: 71_000
-			.saturating_add((21_786_000 as Weight).saturating_mul(r as Weight))
+		(50_838_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((1_669_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(51_573_000 as Weight)
-			// Standard Error: 73_000
-			.saturating_add((21_792_000 as Weight).saturating_mul(r as Weight))
+		(51_064_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_663_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(51_445_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((21_838_000 as Weight).saturating_mul(r as Weight))
+		(50_915_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_667_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(51_609_000 as Weight)
-			// Standard Error: 61_000
-			.saturating_add((21_766_000 as Weight).saturating_mul(r as Weight))
+		(50_868_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_669_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(51_374_000 as Weight)
-			// Standard Error: 73_000
-			.saturating_add((22_062_000 as Weight).saturating_mul(r as Weight))
+		(50_797_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((1_672_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(51_451_000 as Weight)
-			// Standard Error: 52_000
-			.saturating_add((21_918_000 as Weight).saturating_mul(r as Weight))
+		(51_497_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_656_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(51_276_000 as Weight)
-			// Standard Error: 30_000
-			.saturating_add((22_040_000 as Weight).saturating_mul(r as Weight))
+		(50_871_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_668_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(51_401_000 as Weight)
-			// Standard Error: 46_000
-			.saturating_add((21_886_000 as Weight).saturating_mul(r as Weight))
+		(50_718_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_679_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(51_480_000 as Weight)
-			// Standard Error: 35_000
-			.saturating_add((21_792_000 as Weight).saturating_mul(r as Weight))
+		(50_872_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_668_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(51_771_000 as Weight)
-			// Standard Error: 63_000
-			.saturating_add((21_607_000 as Weight).saturating_mul(r as Weight))
+		(50_736_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_678_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(51_506_000 as Weight)
-			// Standard Error: 62_000
-			.saturating_add((21_743_000 as Weight).saturating_mul(r as Weight))
+		(50_716_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_677_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(51_456_000 as Weight)
-			// Standard Error: 68_000
-			.saturating_add((21_916_000 as Weight).saturating_mul(r as Weight))
+		(51_042_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_664_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(52_595_000 as Weight)
-			// Standard Error: 31_000
-			.saturating_add((20_604_000 as Weight).saturating_mul(r as Weight))
+		(51_090_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((1_673_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(51_575_000 as Weight)
-			// Standard Error: 101_000
-			.saturating_add((28_754_000 as Weight).saturating_mul(r as Weight))
+		(50_997_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((2_339_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(51_396_000 as Weight)
-			// Standard Error: 57_000
-			.saturating_add((26_422_000 as Weight).saturating_mul(r as Weight))
+		(51_196_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((2_049_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(51_575_000 as Weight)
-			// Standard Error: 58_000
-			.saturating_add((29_376_000 as Weight).saturating_mul(r as Weight))
+		(51_336_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((2_258_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(51_649_000 as Weight)
-			// Standard Error: 73_000
-			.saturating_add((26_067_000 as Weight).saturating_mul(r as Weight))
+		(50_993_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((2_031_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(51_641_000 as Weight)
-			// Standard Error: 69_000
-			.saturating_add((21_615_000 as Weight).saturating_mul(r as Weight))
+		(51_038_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_666_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(51_246_000 as Weight)
-			// Standard Error: 35_000
-			.saturating_add((22_115_000 as Weight).saturating_mul(r as Weight))
+		(51_051_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_668_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(51_413_000 as Weight)
-			// Standard Error: 64_000
-			.saturating_add((21_917_000 as Weight).saturating_mul(r as Weight))
+		(51_137_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_667_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(51_315_000 as Weight)
-			// Standard Error: 35_000
-			.saturating_add((22_099_000 as Weight).saturating_mul(r as Weight))
+		(51_083_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_666_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(51_504_000 as Weight)
-			// Standard Error: 66_000
-			.saturating_add((21_901_000 as Weight).saturating_mul(r as Weight))
+		(51_118_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_664_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(51_487_000 as Weight)
-			// Standard Error: 68_000
-			.saturating_add((21_941_000 as Weight).saturating_mul(r as Weight))
+		(50_805_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_673_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(51_893_000 as Weight)
-			// Standard Error: 59_000
-			.saturating_add((21_505_000 as Weight).saturating_mul(r as Weight))
+		(50_835_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_682_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(51_307_000 as Weight)
-			// Standard Error: 65_000
-			.saturating_add((22_056_000 as Weight).saturating_mul(r as Weight))
+		(50_947_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_669_000 as Weight).saturating_mul(r as Weight))
 	}
 }
 
@@ -902,47 +904,47 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 impl WeightInfo for () {
 	// Storage: Contracts DeletionQueue (r:1 w:0)
 	fn on_initialize() -> Weight {
-		(3_259_000 as Weight)
+		(3_345_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 3_000
-			.saturating_add((2_197_000 as Weight).saturating_mul(k as Weight))
+			.saturating_add((2_212_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	// Storage: Contracts DeletionQueue (r:1 w:0)
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
-		(81_940_000 as Weight)
+		(80_219_000 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((354_000 as Weight).saturating_mul(q as Weight))
+			.saturating_add((375_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts PristineCode (r:1 w:0)
 	// Storage: Contracts CodeStorage (r:0 w:1)
 	fn instrument(c: u32, ) -> Weight {
-		(32_129_000 as Weight)
-			// Standard Error: 95_000
-			.saturating_add((65_706_000 as Weight).saturating_mul(c as Weight))
+		(35_370_000 as Weight)
+			// Standard Error: 85_000
+			.saturating_add((72_516_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	fn code_load(c: u32, ) -> Weight {
-		(6_215_000 as Weight)
+		(6_479_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((1_430_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((1_426_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 	}
 	// Storage: Contracts CodeStorage (r:1 w:1)
 	fn code_refcount(c: u32, ) -> Weight {
-		(10_499_000 as Weight)
+		(10_220_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((2_278_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((2_280_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -953,11 +955,11 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:1)
 	// Storage: Contracts PristineCode (r:0 w:1)
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight {
-		(473_826_000 as Weight)
-			// Standard Error: 133_000
-			.saturating_add((171_504_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 8_000
-			.saturating_add((2_161_000 as Weight).saturating_mul(s as Weight))
+		(404_011_000 as Weight)
+			// Standard Error: 220_000
+			.saturating_add((181_224_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 14_000
+			.saturating_add((2_198_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
@@ -967,9 +969,9 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System Account (r:1 w:1)
 	fn instantiate(s: u32, ) -> Weight {
-		(215_899_000 as Weight)
+		(215_544_000 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((1_991_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((1_986_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
@@ -978,7 +980,7 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System Account (r:1 w:1)
 	fn call() -> Weight {
-		(176_744_000 as Weight)
+		(177_006_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
@@ -986,9 +988,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_caller(r: u32, ) -> Weight {
-		(426_422_000 as Weight)
-			// Standard Error: 183_000
-			.saturating_add((134_155_000 as Weight).saturating_mul(r as Weight))
+		(420_960_000 as Weight)
+			// Standard Error: 129_000
+			.saturating_add((133_032_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -996,9 +998,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_address(r: u32, ) -> Weight {
-		(424_450_000 as Weight)
-			// Standard Error: 157_000
-			.saturating_add((134_814_000 as Weight).saturating_mul(r as Weight))
+		(419_566_000 as Weight)
+			// Standard Error: 121_000
+			.saturating_add((133_539_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1006,9 +1008,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(423_245_000 as Weight)
-			// Standard Error: 158_000
-			.saturating_add((133_566_000 as Weight).saturating_mul(r as Weight))
+		(420_772_000 as Weight)
+			// Standard Error: 146_000
+			.saturating_add((132_394_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1017,9 +1019,9 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System Account (r:1 w:0)
 	fn seal_balance(r: u32, ) -> Weight {
-		(438_039_000 as Weight)
-			// Standard Error: 216_000
-			.saturating_add((383_624_000 as Weight).saturating_mul(r as Weight))
+		(425_259_000 as Weight)
+			// Standard Error: 237_000
+			.saturating_add((379_279_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1027,9 +1029,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(421_656_000 as Weight)
-			// Standard Error: 163_000
-			.saturating_add((135_160_000 as Weight).saturating_mul(r as Weight))
+		(421_599_000 as Weight)
+			// Standard Error: 162_000
+			.saturating_add((133_964_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1037,9 +1039,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(425_416_000 as Weight)
-			// Standard Error: 177_000
-			.saturating_add((134_306_000 as Weight).saturating_mul(r as Weight))
+		(414_423_000 as Weight)
+			// Standard Error: 164_000
+			.saturating_add((134_814_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1047,9 +1049,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(422_733_000 as Weight)
-			// Standard Error: 171_000
-			.saturating_add((134_775_000 as Weight).saturating_mul(r as Weight))
+		(423_908_000 as Weight)
+			// Standard Error: 134_000
+			.saturating_add((133_470_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1057,9 +1059,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_block_number(r: u32, ) -> Weight {
-		(425_223_000 as Weight)
-			// Standard Error: 193_000
-			.saturating_add((133_823_000 as Weight).saturating_mul(r as Weight))
+		(423_769_000 as Weight)
+			// Standard Error: 138_000
+			.saturating_add((135_123_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1067,9 +1069,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_now(r: u32, ) -> Weight {
-		(433_528_000 as Weight)
-			// Standard Error: 166_000
-			.saturating_add((133_358_000 as Weight).saturating_mul(r as Weight))
+		(431_525_000 as Weight)
+			// Standard Error: 119_000
+			.saturating_add((131_528_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1078,9 +1080,9 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: TransactionPayment NextFeeMultiplier (r:1 w:0)
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(432_032_000 as Weight)
-			// Standard Error: 214_000
-			.saturating_add((305_418_000 as Weight).saturating_mul(r as Weight))
+		(435_484_000 as Weight)
+			// Standard Error: 179_000
+			.saturating_add((298_204_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1088,17 +1090,19 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_gas(r: u32, ) -> Weight {
-		(148_160_000 as Weight)
-			// Standard Error: 120_000
-			.saturating_add((59_833_000 as Weight).saturating_mul(r as Weight))
+		(144_616_000 as Weight)
+			// Standard Error: 118_000
+			.saturating_add((59_737_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
-	fn seal_input(_r: u32, ) -> Weight {
-		(420_503_000 as Weight)
+	fn seal_input(r: u32, ) -> Weight {
+		(417_893_000 as Weight)
+			// Standard Error: 138_000
+			.saturating_add((114_222_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1106,9 +1110,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(424_727_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_017_000 as Weight).saturating_mul(n as Weight))
+		(558_705_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((38_111_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1116,9 +1120,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_return(r: u32, ) -> Weight {
-		(397_994_000 as Weight)
-			// Standard Error: 1_720_000
-			.saturating_add((17_298_000 as Weight).saturating_mul(r as Weight))
+		(397_670_000 as Weight)
+			// Standard Error: 1_581_000
+			.saturating_add((17_618_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1126,9 +1130,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(414_811_000 as Weight)
+		(415_352_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((637_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((635_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1138,9 +1142,9 @@ impl WeightInfo for () {
 	// Storage: Contracts DeletionQueue (r:1 w:1)
 	// Storage: System Account (r:2 w:2)
 	fn seal_terminate(r: u32, ) -> Weight {
-		(407_583_000 as Weight)
-			// Standard Error: 4_720_000
-			.saturating_add((110_145_000 as Weight).saturating_mul(r as Weight))
+		(407_089_000 as Weight)
+			// Standard Error: 181_000
+			.saturating_add((98_910_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
@@ -1151,9 +1155,9 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: RandomnessCollectiveFlip RandomMaterial (r:1 w:0)
 	fn seal_random(r: u32, ) -> Weight {
-		(421_151_000 as Weight)
-			// Standard Error: 239_000
-			.saturating_add((432_224_000 as Weight).saturating_mul(r as Weight))
+		(412_468_000 as Weight)
+			// Standard Error: 385_000
+			.saturating_add((419_134_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1161,9 +1165,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(417_192_000 as Weight)
-			// Standard Error: 312_000
-			.saturating_add((752_443_000 as Weight).saturating_mul(r as Weight))
+		(416_035_000 as Weight)
+			// Standard Error: 408_000
+			.saturating_add((708_750_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1172,11 +1176,11 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System EventTopics (r:100 w:100)
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_265_810_000 as Weight)
-			// Standard Error: 2_068_000
-			.saturating_add((507_093_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 407_000
-			.saturating_add((165_100_000 as Weight).saturating_mul(n as Weight))
+		(1_251_101_000 as Weight)
+			// Standard Error: 2_553_000
+			.saturating_add((504_170_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 503_000
+			.saturating_add((165_595_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
@@ -1186,17 +1190,17 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_debug_message(r: u32, ) -> Weight {
-		(161_459_000 as Weight)
-			// Standard Error: 151_000
-			.saturating_add((76_693_000 as Weight).saturating_mul(r as Weight))
+		(157_690_000 as Weight)
+			// Standard Error: 144_000
+			.saturating_add((77_093_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(402_875_000 as Weight)
-			// Standard Error: 282_000
-			.saturating_add((258_574_000 as Weight).saturating_mul(r as Weight))
+		(404_827_000 as Weight)
+			// Standard Error: 229_000
+			.saturating_add((251_475_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
@@ -1206,26 +1210,26 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: unknown [0x7afa01283080ef247df84e0ba38ea5a587d25ce6633a6bfbba02068c14023441] (r:0 w:1)
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(666_594_000 as Weight)
-			// Standard Error: 264_000
-			.saturating_add((70_365_000 as Weight).saturating_mul(n as Weight))
+		(653_171_000 as Weight)
+			// Standard Error: 287_000
+			.saturating_add((71_526_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_clear_storage(r: u32, ) -> Weight {
-		(452_019_000 as Weight)
-			// Standard Error: 236_000
-			.saturating_add((233_300_000 as Weight).saturating_mul(r as Weight))
+		(444_692_000 as Weight)
+			// Standard Error: 214_000
+			.saturating_add((226_212_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_get_storage(r: u32, ) -> Weight {
-		(303_530_000 as Weight)
-			// Standard Error: 801_000
-			.saturating_add((532_265_000 as Weight).saturating_mul(r as Weight))
+		(278_436_000 as Weight)
+			// Standard Error: 827_000
+			.saturating_add((528_111_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
@@ -1235,9 +1239,9 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: unknown [0x7afa01283080ef247df84e0ba38ea5a587d25ce6633a6bfbba02068c14023441] (r:1 w:0)
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(734_714_000 as Weight)
-			// Standard Error: 246_000
-			.saturating_add((112_631_000 as Weight).saturating_mul(n as Weight))
+		(732_808_000 as Weight)
+			// Standard Error: 304_000
+			.saturating_add((112_394_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1246,9 +1250,9 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System Account (r:101 w:101)
 	fn seal_transfer(r: u32, ) -> Weight {
-		(319_298_000 as Weight)
-			// Standard Error: 2_180_000
-			.saturating_add((4_710_724_000 as Weight).saturating_mul(r as Weight))
+		(257_626_000 as Weight)
+			// Standard Error: 1_850_000
+			.saturating_add((4_621_393_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
@@ -1259,8 +1263,8 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 10_059_000
-			.saturating_add((40_188_894_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 6_833_000
+			.saturating_add((39_990_561_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
@@ -1271,13 +1275,13 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System Account (r:101 w:101)
 	fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight {
-		(39_972_999_000 as Weight)
-			// Standard Error: 56_397_000
-			.saturating_add((3_858_600_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 20_000
-			.saturating_add((62_963_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 21_000
-			.saturating_add((101_497_000 as Weight).saturating_mul(o as Weight))
+		(39_296_507_000 as Weight)
+			// Standard Error: 98_740_000
+			.saturating_add((4_165_171_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 35_000
+			.saturating_add((63_121_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 37_000
+			.saturating_add((101_665_000 as Weight).saturating_mul(o as Weight))
 			.saturating_add(RocksDbWeight::get().reads(104 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((101 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(101 as Weight))
@@ -1290,8 +1294,8 @@ impl WeightInfo for () {
 	// Storage: System Account (r:101 w:101)
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 103_701_000
-			.saturating_add((48_209_042_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 100_794_000
+			.saturating_add((47_889_192_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
@@ -1303,13 +1307,13 @@ impl WeightInfo for () {
 	// Storage: Contracts AccountCounter (r:1 w:1)
 	// Storage: System Account (r:101 w:101)
 	fn seal_instantiate_per_input_output_salt_kb(i: u32, o: u32, s: u32, ) -> Weight {
-		(45_662_002_000 as Weight)
-			// Standard Error: 30_000
-			.saturating_add((63_978_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 30_000
-			.saturating_add((101_724_000 as Weight).saturating_mul(o as Weight))
-			// Standard Error: 30_000
-			.saturating_add((201_820_000 as Weight).saturating_mul(s as Weight))
+		(45_237_285_000 as Weight)
+			// Standard Error: 35_000
+			.saturating_add((64_100_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 35_000
+			.saturating_add((102_036_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 35_000
+			.saturating_add((201_375_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(206 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(204 as Weight))
 	}
@@ -1317,9 +1321,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(422_425_000 as Weight)
-			// Standard Error: 164_000
-			.saturating_add((139_580_000 as Weight).saturating_mul(r as Weight))
+		(416_807_000 as Weight)
+			// Standard Error: 153_000
+			.saturating_add((137_778_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1327,9 +1331,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(691_929_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((499_602_000 as Weight).saturating_mul(n as Weight))
+		(651_244_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((499_711_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1337,9 +1341,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(420_255_000 as Weight)
-			// Standard Error: 167_000
-			.saturating_add((148_167_000 as Weight).saturating_mul(r as Weight))
+		(419_157_000 as Weight)
+			// Standard Error: 146_000
+			.saturating_add((144_391_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1347,9 +1351,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(541_872_000 as Weight)
+		(568_821_000 as Weight)
 			// Standard Error: 17_000
-			.saturating_add((347_194_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((346_968_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1357,9 +1361,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(419_267_000 as Weight)
-			// Standard Error: 139_000
-			.saturating_add((119_855_000 as Weight).saturating_mul(r as Weight))
+		(417_978_000 as Weight)
+			// Standard Error: 163_000
+			.saturating_add((119_871_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1367,9 +1371,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(547_517_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((164_328_000 as Weight).saturating_mul(n as Weight))
+		(537_541_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((164_266_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1377,9 +1381,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(424_870_000 as Weight)
-			// Standard Error: 163_000
-			.saturating_add((118_215_000 as Weight).saturating_mul(r as Weight))
+		(420_244_000 as Weight)
+			// Standard Error: 152_000
+			.saturating_add((119_123_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1387,265 +1391,265 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(514_057_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((164_390_000 as Weight).saturating_mul(n as Weight))
+		(486_612_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((164_406_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(51_570_000 as Weight)
-			// Standard Error: 74_000
-			.saturating_add((9_529_000 as Weight).saturating_mul(r as Weight))
+		(54_394_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((750_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(38_616_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((37_349_000 as Weight).saturating_mul(r as Weight))
+		(48_363_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((2_464_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(38_576_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((38_351_000 as Weight).saturating_mul(r as Weight))
+		(49_007_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((2_540_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(51_383_000 as Weight)
-			// Standard Error: 60_000
-			.saturating_add((27_099_000 as Weight).saturating_mul(r as Weight))
+		(51_388_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((2_188_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(38_218_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((41_226_000 as Weight).saturating_mul(r as Weight))
+		(48_672_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((2_310_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(38_216_000 as Weight)
-			// Standard Error: 33_000
-			.saturating_add((28_483_000 as Weight).saturating_mul(r as Weight))
+		(51_538_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((1_324_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(51_637_000 as Weight)
-			// Standard Error: 56_000
-			.saturating_add((34_688_000 as Weight).saturating_mul(r as Weight))
+		(45_154_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((2_002_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(51_490_000 as Weight)
-			// Standard Error: 71_000
-			.saturating_add((27_683_000 as Weight).saturating_mul(r as Weight))
+		(38_511_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((2_611_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(77_260_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((130_000 as Weight).saturating_mul(e as Weight))
+		(47_321_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((18_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(52_012_000 as Weight)
-			// Standard Error: 564_000
-			.saturating_add((188_018_000 as Weight).saturating_mul(r as Weight))
+		(40_145_000 as Weight)
+			// Standard Error: 30_000
+			.saturating_add((20_056_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(65_670_000 as Weight)
-			// Standard Error: 5_489_000
-			.saturating_add((294_560_000 as Weight).saturating_mul(r as Weight))
+		(54_566_000 as Weight)
+			// Standard Error: 32_000
+			.saturating_add((30_331_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(368_428_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((10_469_000 as Weight).saturating_mul(p as Weight))
+		(86_289_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((1_080_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(52_091_000 as Weight)
-			// Standard Error: 32_000
-			.saturating_add((11_160_000 as Weight).saturating_mul(r as Weight))
+		(49_186_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((629_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(52_145_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((12_086_000 as Weight).saturating_mul(r as Weight))
+		(49_030_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((732_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(52_057_000 as Weight)
-			// Standard Error: 26_000
-			.saturating_add((2_555_000 as Weight).saturating_mul(r as Weight))
+		(45_867_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((1_281_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(73_126_000 as Weight)
-			// Standard Error: 35_000
-			.saturating_add((16_004_000 as Weight).saturating_mul(r as Weight))
+		(64_350_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((1_421_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(73_104_000 as Weight)
-			// Standard Error: 63_000
-			.saturating_add((2_267_000 as Weight).saturating_mul(r as Weight))
+		(61_716_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((1_561_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(38_596_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((22_244_000 as Weight).saturating_mul(r as Weight))
+		(53_303_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((742_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(39_320_000 as Weight)
-			// Standard Error: 4_805_000
-			.saturating_add((642_459_000 as Weight).saturating_mul(r as Weight))
+		(38_377_000 as Weight)
+			// Standard Error: 122_000
+			.saturating_add((633_403_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(51_634_000 as Weight)
-			// Standard Error: 65_000
-			.saturating_add((14_706_000 as Weight).saturating_mul(r as Weight))
+		(55_169_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((1_114_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(51_490_000 as Weight)
-			// Standard Error: 63_000
-			.saturating_add((14_759_000 as Weight).saturating_mul(r as Weight))
+		(55_406_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((1_105_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(51_278_000 as Weight)
-			// Standard Error: 37_000
-			.saturating_add((15_084_000 as Weight).saturating_mul(r as Weight))
+		(55_255_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((1_111_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(51_524_000 as Weight)
-			// Standard Error: 53_000
-			.saturating_add((14_801_000 as Weight).saturating_mul(r as Weight))
+		(55_389_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((1_102_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(50_775_000 as Weight)
-			// Standard Error: 88_000
-			.saturating_add((3_125_000 as Weight).saturating_mul(r as Weight))
+		(44_951_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((1_302_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(50_748_000 as Weight)
-			// Standard Error: 191_000
-			.saturating_add((3_785_000 as Weight).saturating_mul(r as Weight))
+		(45_263_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_292_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(52_621_000 as Weight)
-			// Standard Error: 60_000
-			.saturating_add((13_744_000 as Weight).saturating_mul(r as Weight))
+		(55_222_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((1_104_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(51_486_000 as Weight)
-			// Standard Error: 71_000
-			.saturating_add((21_786_000 as Weight).saturating_mul(r as Weight))
+		(50_838_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((1_669_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(51_573_000 as Weight)
-			// Standard Error: 73_000
-			.saturating_add((21_792_000 as Weight).saturating_mul(r as Weight))
+		(51_064_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_663_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(51_445_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((21_838_000 as Weight).saturating_mul(r as Weight))
+		(50_915_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_667_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(51_609_000 as Weight)
-			// Standard Error: 61_000
-			.saturating_add((21_766_000 as Weight).saturating_mul(r as Weight))
+		(50_868_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_669_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(51_374_000 as Weight)
-			// Standard Error: 73_000
-			.saturating_add((22_062_000 as Weight).saturating_mul(r as Weight))
+		(50_797_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((1_672_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(51_451_000 as Weight)
-			// Standard Error: 52_000
-			.saturating_add((21_918_000 as Weight).saturating_mul(r as Weight))
+		(51_497_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_656_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(51_276_000 as Weight)
-			// Standard Error: 30_000
-			.saturating_add((22_040_000 as Weight).saturating_mul(r as Weight))
+		(50_871_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_668_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(51_401_000 as Weight)
-			// Standard Error: 46_000
-			.saturating_add((21_886_000 as Weight).saturating_mul(r as Weight))
+		(50_718_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_679_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(51_480_000 as Weight)
-			// Standard Error: 35_000
-			.saturating_add((21_792_000 as Weight).saturating_mul(r as Weight))
+		(50_872_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_668_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(51_771_000 as Weight)
-			// Standard Error: 63_000
-			.saturating_add((21_607_000 as Weight).saturating_mul(r as Weight))
+		(50_736_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_678_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(51_506_000 as Weight)
-			// Standard Error: 62_000
-			.saturating_add((21_743_000 as Weight).saturating_mul(r as Weight))
+		(50_716_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_677_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(51_456_000 as Weight)
-			// Standard Error: 68_000
-			.saturating_add((21_916_000 as Weight).saturating_mul(r as Weight))
+		(51_042_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_664_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(52_595_000 as Weight)
-			// Standard Error: 31_000
-			.saturating_add((20_604_000 as Weight).saturating_mul(r as Weight))
+		(51_090_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((1_673_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(51_575_000 as Weight)
-			// Standard Error: 101_000
-			.saturating_add((28_754_000 as Weight).saturating_mul(r as Weight))
+		(50_997_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((2_339_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(51_396_000 as Weight)
-			// Standard Error: 57_000
-			.saturating_add((26_422_000 as Weight).saturating_mul(r as Weight))
+		(51_196_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((2_049_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(51_575_000 as Weight)
-			// Standard Error: 58_000
-			.saturating_add((29_376_000 as Weight).saturating_mul(r as Weight))
+		(51_336_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((2_258_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(51_649_000 as Weight)
-			// Standard Error: 73_000
-			.saturating_add((26_067_000 as Weight).saturating_mul(r as Weight))
+		(50_993_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((2_031_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(51_641_000 as Weight)
-			// Standard Error: 69_000
-			.saturating_add((21_615_000 as Weight).saturating_mul(r as Weight))
+		(51_038_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_666_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(51_246_000 as Weight)
-			// Standard Error: 35_000
-			.saturating_add((22_115_000 as Weight).saturating_mul(r as Weight))
+		(51_051_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_668_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(51_413_000 as Weight)
-			// Standard Error: 64_000
-			.saturating_add((21_917_000 as Weight).saturating_mul(r as Weight))
+		(51_137_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_667_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(51_315_000 as Weight)
-			// Standard Error: 35_000
-			.saturating_add((22_099_000 as Weight).saturating_mul(r as Weight))
+		(51_083_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_666_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(51_504_000 as Weight)
-			// Standard Error: 66_000
-			.saturating_add((21_901_000 as Weight).saturating_mul(r as Weight))
+		(51_118_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_664_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(51_487_000 as Weight)
-			// Standard Error: 68_000
-			.saturating_add((21_941_000 as Weight).saturating_mul(r as Weight))
+		(50_805_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_673_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(51_893_000 as Weight)
-			// Standard Error: 59_000
-			.saturating_add((21_505_000 as Weight).saturating_mul(r as Weight))
+		(50_835_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_682_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(51_307_000 as Weight)
-			// Standard Error: 65_000
-			.saturating_add((22_056_000 as Weight).saturating_mul(r as Weight))
+		(50_947_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_669_000 as Weight).saturating_mul(r as Weight))
 	}
 }

From a8a040c400e5855ae658fc233b0f4dafa9535a61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Thu, 9 Sep 2021 11:17:16 +0200
Subject: [PATCH 1158/1194] Remove the last bits of unknown_os in the code base
 (#9718)

* Remove the last bits of unknown_os in the code base

* Fmt
---
 Cargo.lock                                    |  11 -
 client/cli/Cargo.toml                         |   2 -
 client/cli/src/params/keystore_params.rs      |   9 +-
 client/db/src/light.rs                        |   9 -
 client/executor/src/wasm_runtime.rs           |   2 -
 client/informant/src/lib.rs                   |  22 +-
 client/network/Cargo.toml                     |  21 +-
 client/network/src/discovery.rs               |  12 +-
 client/network/src/transport.rs               |   4 +-
 client/offchain/Cargo.toml                    |   2 -
 client/offchain/src/api.rs                    |   6 -
 client/offchain/src/api/http_dummy.rs         | 124 -----------
 client/rpc-servers/Cargo.toml                 |   2 -
 client/rpc-servers/src/lib.rs                 | 203 ++++++++----------
 client/rpc-servers/src/middleware.rs          |   5 -
 client/service/Cargo.toml                     |   2 -
 client/service/src/builder.rs                 |   5 +-
 client/service/src/config.rs                  |   5 -
 client/service/src/lib.rs                     |  30 ---
 .../transaction-pool/src/graph/base_pool.rs   |   3 +-
 client/transaction-pool/src/graph/future.rs   |   5 +-
 client/transaction-pool/src/graph/pool.rs     |   1 -
 .../src/graph/validated_pool.rs               |   1 -
 client/transaction-pool/src/lib.rs            |   1 -
 primitives/maybe-compressed-blob/Cargo.toml   |   5 +-
 primitives/maybe-compressed-blob/src/lib.rs   |  11 -
 utils/prometheus/Cargo.toml                   |   2 -
 utils/prometheus/src/lib.rs                   | 195 +++++++----------
 28 files changed, 187 insertions(+), 513 deletions(-)
 delete mode 100644 client/offchain/src/api/http_dummy.rs

diff --git a/Cargo.lock b/Cargo.lock
index fea89d17368a..b4bb44f927b4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7126,16 +7126,6 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd"
 
-[[package]]
-name = "ruzstd"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d425143485a37727c7a46e689bbe3b883a00f42b4a52c4ac0f44855c1009b00"
-dependencies = [
- "byteorder",
- "twox-hash",
-]
-
 [[package]]
 name = "rw-stream-sink"
 version = "0.2.1"
@@ -9139,7 +9129,6 @@ dependencies = [
 name = "sp-maybe-compressed-blob"
 version = "4.0.0-dev"
 dependencies = [
- "ruzstd",
  "zstd",
 ]
 
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index 7798507e529f..c3564e3e3a18 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -43,8 +43,6 @@ sc-tracing = { version = "4.0.0-dev", path = "../tracing" }
 chrono = "0.4.10"
 serde = "1.0.126"
 thiserror = "1.0.21"
-
-[target.'cfg(not(target_os = "unknown"))'.dependencies]
 rpassword = "5.0.0"
 
 [dev-dependencies]
diff --git a/client/cli/src/params/keystore_params.rs b/client/cli/src/params/keystore_params.rs
index 99da21a12f76..951f61bd1bc5 100644
--- a/client/cli/src/params/keystore_params.rs
+++ b/client/cli/src/params/keystore_params.rs
@@ -76,13 +76,7 @@ impl KeystoreParams {
 	/// Returns a vector of remote-urls and the local Keystore configuration
 	pub fn keystore_config(&self, config_dir: &Path) -> Result<(Option<String>, KeystoreConfig)> {
 		let password = if self.password_interactive {
-			#[cfg(not(target_os = "unknown"))]
-			{
-				let password = input_keystore_password()?;
-				Some(SecretString::new(password))
-			}
-			#[cfg(target_os = "unknown")]
-			None
+			Some(SecretString::new(input_keystore_password()?))
 		} else if let Some(ref file) = self.password_filename {
 			let password = fs::read_to_string(file).map_err(|e| format!("{}", e))?;
 			Some(SecretString::new(password))
@@ -113,7 +107,6 @@ impl KeystoreParams {
 	}
 }
 
-#[cfg(not(target_os = "unknown"))]
 fn input_keystore_password() -> Result<String> {
 	rpassword::read_password_from_tty(Some("Keystore password: "))
 		.map_err(|e| format!("{:?}", e).into())
diff --git a/client/db/src/light.rs b/client/db/src/light.rs
index d56188b70fcb..bf2da5c61d05 100644
--- a/client/db/src/light.rs
+++ b/client/db/src/light.rs
@@ -65,8 +65,6 @@ pub struct LightStorage<Block: BlockT> {
 	meta: RwLock<Meta<NumberFor<Block>, Block::Hash>>,
 	cache: Arc<DbCacheSync<Block>>,
 	header_metadata_cache: Arc<HeaderMetadataCache<Block>>,
-
-	#[cfg(not(target_os = "unknown"))]
 	io_stats: FrozenForDuration<kvdb::IoStats>,
 }
 
@@ -102,7 +100,6 @@ impl<Block: BlockT> LightStorage<Block> {
 			meta: RwLock::new(meta),
 			cache: Arc::new(DbCacheSync(RwLock::new(cache))),
 			header_metadata_cache,
-			#[cfg(not(target_os = "unknown"))]
 			io_stats: FrozenForDuration::new(std::time::Duration::from_secs(1)),
 		})
 	}
@@ -589,7 +586,6 @@ where
 		Some(self.cache.clone())
 	}
 
-	#[cfg(not(target_os = "unknown"))]
 	fn usage_info(&self) -> Option<UsageInfo> {
 		use sc_client_api::{IoInfo, MemoryInfo, MemorySize};
 
@@ -619,11 +615,6 @@ where
 			},
 		})
 	}
-
-	#[cfg(target_os = "unknown")]
-	fn usage_info(&self) -> Option<UsageInfo> {
-		None
-	}
 }
 
 impl<Block> ProvideChtRoots<Block> for LightStorage<Block>
diff --git a/client/executor/src/wasm_runtime.rs b/client/executor/src/wasm_runtime.rs
index 892c3681c7ce..b11e3958dbc8 100644
--- a/client/executor/src/wasm_runtime.rs
+++ b/client/executor/src/wasm_runtime.rs
@@ -237,7 +237,6 @@ impl RuntimeCache {
 			None => {
 				let code = runtime_code.fetch_runtime_code().ok_or(WasmError::CodeNotFound)?;
 
-				#[cfg(not(target_os = "unknown"))]
 				let time = std::time::Instant::now();
 
 				let result = create_versioned_wasm_runtime(
@@ -254,7 +253,6 @@ impl RuntimeCache {
 
 				match result {
 					Ok(ref result) => {
-						#[cfg(not(target_os = "unknown"))]
 						log::debug!(
 							target: "wasm-runtime",
 							"Prepared new runtime version {:?} in {} ms.",
diff --git a/client/informant/src/lib.rs b/client/informant/src/lib.rs
index 4f6aa2b7a3fe..f421dbbb7e56 100644
--- a/client/informant/src/lib.rs
+++ b/client/informant/src/lib.rs
@@ -52,31 +52,16 @@ impl Default for OutputFormat {
 	}
 }
 
-/// Marker trait for a type that implements `TransactionPool` and `MallocSizeOf` on `not(target_os =
-/// "unknown")`.
-#[cfg(target_os = "unknown")]
-pub trait TransactionPoolAndMaybeMallogSizeOf: TransactionPool {}
-
-/// Marker trait for a type that implements `TransactionPool` and `MallocSizeOf` on `not(target_os =
-/// "unknown")`.
-#[cfg(not(target_os = "unknown"))]
-pub trait TransactionPoolAndMaybeMallogSizeOf: TransactionPool + MallocSizeOf {}
-
-#[cfg(target_os = "unknown")]
-impl<T: TransactionPool> TransactionPoolAndMaybeMallogSizeOf for T {}
-
-#[cfg(not(target_os = "unknown"))]
-impl<T: TransactionPool + MallocSizeOf> TransactionPoolAndMaybeMallogSizeOf for T {}
-
 /// Builds the informant and returns a `Future` that drives the informant.
-pub async fn build<B: BlockT, C>(
+pub async fn build<B: BlockT, C, P>(
 	client: Arc<C>,
 	network: Arc<NetworkService<B, <B as BlockT>::Hash>>,
-	pool: Arc<impl TransactionPoolAndMaybeMallogSizeOf>,
+	pool: Arc<P>,
 	format: OutputFormat,
 ) where
 	C: UsageProvider<B> + HeaderMetadata<B> + BlockchainEvents<B>,
 	<C as HeaderMetadata<B>>::Error: Display,
+	P: TransactionPool + MallocSizeOf,
 {
 	let mut display = display::InformantDisplay::new(format.clone());
 
@@ -97,7 +82,6 @@ pub async fn build<B: BlockT, C>(
 					"Usage statistics not displayed as backend does not provide it",
 				)
 			}
-			#[cfg(not(target_os = "unknown"))]
 			trace!(
 				target: "usage",
 				"Subsystems memory [txpool: {} kB]",
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index de62a534f866..196bd419aaae 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -64,26 +64,7 @@ unsigned-varint = { version = "0.6.0", features = [
 ] }
 void = "1.0.2"
 zeroize = "1.2.0"
-
-[dependencies.libp2p]
-version = "0.39.1"
-
-[target.'cfg(target_os = "unknown")'.dependencies.libp2p]
-version = "0.39.1"
-default-features = false
-features = [
-    "identify",
-    "kad",
-    "mdns",
-    "mplex",
-    "noise",
-    "ping",
-    "request-response",
-    "tcp-async-io",
-    "websocket",
-    "yamux",
-]
-
+libp2p = "0.39.1"
 
 [dev-dependencies]
 assert_matches = "1.3"
diff --git a/client/network/src/discovery.rs b/client/network/src/discovery.rs
index f8edd0203342..3be00a52e98b 100644
--- a/client/network/src/discovery.rs
+++ b/client/network/src/discovery.rs
@@ -50,8 +50,6 @@ use crate::{config::ProtocolId, utils::LruHashSet};
 use futures::prelude::*;
 use futures_timer::Delay;
 use ip_network::IpNetwork;
-#[cfg(not(target_os = "unknown"))]
-use libp2p::mdns::{Mdns, MdnsConfig, MdnsEvent};
 use libp2p::{
 	core::{
 		connection::{ConnectionId, ListenerId},
@@ -66,6 +64,7 @@ use libp2p::{
 		GetClosestPeersError, Kademlia, KademliaBucketInserts, KademliaConfig, KademliaEvent,
 		QueryId, QueryResult, Quorum, Record,
 	},
+	mdns::{Mdns, MdnsConfig, MdnsEvent},
 	multiaddr::Protocol,
 	swarm::{
 		protocols_handler::multi::IntoMultiHandler, IntoProtocolsHandler, NetworkBehaviour,
@@ -156,9 +155,6 @@ impl DiscoveryConfig {
 
 	/// Should MDNS discovery be supported?
 	pub fn with_mdns(&mut self, value: bool) -> &mut Self {
-		if value && cfg!(target_os = "unknown") {
-			log::warn!(target: "sub-libp2p", "mDNS is not available on this platform")
-		}
 		self.enable_mdns = value;
 		self
 	}
@@ -234,7 +230,6 @@ impl DiscoveryConfig {
 			num_connections: 0,
 			allow_private_ipv4,
 			discovery_only_if_under_num,
-			#[cfg(not(target_os = "unknown"))]
 			mdns: if enable_mdns {
 				MdnsWrapper::Instantiating(Mdns::new(MdnsConfig::default()).boxed())
 			} else {
@@ -257,7 +252,6 @@ pub struct DiscoveryBehaviour {
 	/// Kademlia requests and answers.
 	kademlias: HashMap<ProtocolId, Kademlia<MemoryStore>>,
 	/// Discovers nodes on the local network.
-	#[cfg(not(target_os = "unknown"))]
 	mdns: MdnsWrapper,
 	/// Stream that fires when we need to perform the next random Kademlia query. `None` if
 	/// random walking is disabled.
@@ -505,7 +499,6 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 				list_to_filter.extend(k.addresses_of_peer(peer_id))
 			}
 
-			#[cfg(not(target_os = "unknown"))]
 			list_to_filter.extend(self.mdns.addresses_of_peer(peer_id));
 
 			if !self.allow_private_ipv4 {
@@ -840,7 +833,6 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 		}
 
 		// Poll mDNS.
-		#[cfg(not(target_os = "unknown"))]
 		while let Poll::Ready(ev) = self.mdns.poll(cx, params) {
 			match ev {
 				NetworkBehaviourAction::GenerateEvent(event) => match event {
@@ -890,14 +882,12 @@ fn protocol_name_from_protocol_id(id: &ProtocolId) -> Vec<u8> {
 
 /// [`Mdns::new`] returns a future. Instead of forcing [`DiscoveryConfig::finish`] and all its
 /// callers to be async, lazily instantiate [`Mdns`].
-#[cfg(not(target_os = "unknown"))]
 enum MdnsWrapper {
 	Instantiating(futures::future::BoxFuture<'static, std::io::Result<Mdns>>),
 	Ready(Mdns),
 	Disabled,
 }
 
-#[cfg(not(target_os = "unknown"))]
 impl MdnsWrapper {
 	fn addresses_of_peer(&mut self, peer_id: &PeerId) -> Vec<Multiaddr> {
 		match self {
diff --git a/client/network/src/transport.rs b/client/network/src/transport.rs
index 47382fa3b135..04223c6d6846 100644
--- a/client/network/src/transport.rs
+++ b/client/network/src/transport.rs
@@ -25,10 +25,8 @@ use libp2p::{
 		transport::{Boxed, OptionalTransport},
 		upgrade,
 	},
-	identity, mplex, noise, PeerId, Transport,
+	dns, identity, mplex, noise, tcp, websocket, PeerId, Transport,
 };
-#[cfg(not(target_os = "unknown"))]
-use libp2p::{dns, tcp, websocket};
 use std::{sync::Arc, time::Duration};
 
 pub use self::bandwidth::BandwidthSinks;
diff --git a/client/offchain/Cargo.toml b/client/offchain/Cargo.toml
index a7ff572e9b0b..641a1e55063d 100644
--- a/client/offchain/Cargo.toml
+++ b/client/offchain/Cargo.toml
@@ -31,8 +31,6 @@ sp-offchain = { version = "4.0.0-dev", path = "../../primitives/offchain" }
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
 sc-utils = { version = "4.0.0-dev", path = "../utils" }
 threadpool = "1.7"
-
-[target.'cfg(not(target_os = "unknown"))'.dependencies]
 hyper = "0.14.11"
 hyper-rustls = "0.22.1"
 
diff --git a/client/offchain/src/api.rs b/client/offchain/src/api.rs
index 46ba1a0f3cbc..b2276a852372 100644
--- a/client/offchain/src/api.rs
+++ b/client/offchain/src/api.rs
@@ -32,14 +32,8 @@ use sp_core::{
 };
 pub use sp_offchain::STORAGE_PREFIX;
 
-#[cfg(not(target_os = "unknown"))]
 mod http;
 
-#[cfg(target_os = "unknown")]
-use http_dummy as http;
-#[cfg(target_os = "unknown")]
-mod http_dummy;
-
 mod timestamp;
 
 fn unavailable_yet<R: Default>(name: &str) -> R {
diff --git a/client/offchain/src/api/http_dummy.rs b/client/offchain/src/api/http_dummy.rs
deleted file mode 100644
index 73d30396ab1c..000000000000
--- a/client/offchain/src/api/http_dummy.rs
+++ /dev/null
@@ -1,124 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-//! Contains the same API as the `http` module, except that everything returns an error.
-
-use sp_core::offchain::{HttpError, HttpRequestId, HttpRequestStatus, Timestamp};
-use std::{
-	future::Future,
-	pin::Pin,
-	task::{Context, Poll},
-};
-
-/// Wrapper struct (wrapping nothing in case of http_dummy) used for keeping the hyper_rustls client
-/// running.
-#[derive(Clone)]
-pub struct SharedClient;
-
-impl SharedClient {
-	pub fn new() -> Self {
-		Self
-	}
-}
-
-/// Creates a pair of [`HttpApi`] and [`HttpWorker`].
-pub fn http(_: SharedClient) -> (HttpApi, HttpWorker) {
-	(HttpApi, HttpWorker)
-}
-
-/// Dummy implementation of HTTP capabilities.
-#[derive(Debug)]
-pub struct HttpApi;
-
-/// Dummy implementation of HTTP capabilities.
-#[derive(Debug)]
-pub struct HttpWorker;
-
-impl HttpApi {
-	/// Mimics the corresponding method in the offchain API.
-	pub fn request_start(&mut self, _: &str, _: &str) -> Result<HttpRequestId, ()> {
-		/// Because this always returns an error, none of the other methods should ever be called.
-		Err(())
-	}
-
-	/// Mimics the corresponding method in the offchain API.
-	pub fn request_add_header(&mut self, _: HttpRequestId, _: &str, _: &str) -> Result<(), ()> {
-		unreachable!(
-			"Creating a request always fails, thus this function will \
-			never be called; qed"
-		)
-	}
-
-	/// Mimics the corresponding method in the offchain API.
-	pub fn request_write_body(
-		&mut self,
-		_: HttpRequestId,
-		_: &[u8],
-		_: Option<Timestamp>,
-	) -> Result<(), HttpError> {
-		unreachable!(
-			"Creating a request always fails, thus this function will \
-			never be called; qed"
-		)
-	}
-
-	/// Mimics the corresponding method in the offchain API.
-	pub fn response_wait(
-		&mut self,
-		requests: &[HttpRequestId],
-		_: Option<Timestamp>,
-	) -> Vec<HttpRequestStatus> {
-		if requests.is_empty() {
-			Vec::new()
-		} else {
-			unreachable!(
-				"Creating a request always fails, thus the list of requests should \
-				always be empty; qed"
-			)
-		}
-	}
-
-	/// Mimics the corresponding method in the offchain API.
-	pub fn response_headers(&mut self, _: HttpRequestId) -> Vec<(Vec<u8>, Vec<u8>)> {
-		unreachable!(
-			"Creating a request always fails, thus this function will \
-			never be called; qed"
-		)
-	}
-
-	/// Mimics the corresponding method in the offchain API.
-	pub fn response_read_body(
-		&mut self,
-		_: HttpRequestId,
-		_: &mut [u8],
-		_: Option<Timestamp>,
-	) -> Result<usize, HttpError> {
-		unreachable!(
-			"Creating a request always fails, thus this function will \
-			never be called; qed"
-		)
-	}
-}
-
-impl Future for HttpWorker {
-	type Output = ();
-
-	fn poll(self: Pin<&mut Self>, _: &mut Context) -> Poll<Self::Output> {
-		Poll::Ready(())
-	}
-}
diff --git a/client/rpc-servers/Cargo.toml b/client/rpc-servers/Cargo.toml
index ebb8c620193f..fede65fa7a05 100644
--- a/client/rpc-servers/Cargo.toml
+++ b/client/rpc-servers/Cargo.toml
@@ -19,8 +19,6 @@ pubsub = { package = "jsonrpc-pubsub", version = "18.0.0" }
 log = "0.4.8"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
 serde_json = "1.0.41"
-
-[target.'cfg(not(target_os = "unknown"))'.dependencies]
 http = { package = "jsonrpc-http-server", version = "18.0.0" }
 ipc = { package = "jsonrpc-ipc-server", version = "18.0.0" }
 ws = { package = "jsonrpc-ws-server", version = "18.0.0" }
diff --git a/client/rpc-servers/src/lib.rs b/client/rpc-servers/src/lib.rs
index 6e09a0ea36ac..d60e561ed775 100644
--- a/client/rpc-servers/src/lib.rs
+++ b/client/rpc-servers/src/lib.rs
@@ -42,7 +42,6 @@ const HTTP_THREADS: usize = 4;
 /// The RPC IoHandler containing all requested APIs.
 pub type RpcHandler<T> = pubsub::PubSubHandler<T, RpcMiddleware>;
 
-pub use self::inner::*;
 pub use middleware::{method_names, RpcMetrics, RpcMiddleware};
 
 /// Construct rpc `IoHandler`
@@ -111,122 +110,106 @@ impl ServerMetrics {
 	}
 }
 
-#[cfg(not(target_os = "unknown"))]
-mod inner {
-	use super::*;
+/// Type alias for ipc server
+pub type IpcServer = ipc::Server;
+/// Type alias for http server
+pub type HttpServer = http::Server;
+/// Type alias for ws server
+pub type WsServer = ws::Server;
 
-	/// Type alias for ipc server
-	pub type IpcServer = ipc::Server;
-	/// Type alias for http server
-	pub type HttpServer = http::Server;
-	/// Type alias for ws server
-	pub type WsServer = ws::Server;
-
-	impl ws::SessionStats for ServerMetrics {
-		fn open_session(&self, _id: ws::SessionId) {
-			self.session_opened.as_ref().map(|m| m.inc());
-		}
-
-		fn close_session(&self, _id: ws::SessionId) {
-			self.session_closed.as_ref().map(|m| m.inc());
-		}
+impl ws::SessionStats for ServerMetrics {
+	fn open_session(&self, _id: ws::SessionId) {
+		self.session_opened.as_ref().map(|m| m.inc());
 	}
 
-	/// Start HTTP server listening on given address.
-	///
-	/// **Note**: Only available if `not(target_os = "unknown")`.
-	pub fn start_http<M: pubsub::PubSubMetadata + Default + Unpin>(
-		addr: &std::net::SocketAddr,
-		thread_pool_size: Option<usize>,
-		cors: Option<&Vec<String>>,
-		io: RpcHandler<M>,
-		maybe_max_payload_mb: Option<usize>,
-	) -> io::Result<http::Server> {
-		let max_request_body_size = maybe_max_payload_mb
-			.map(|mb| mb.saturating_mul(MEGABYTE))
-			.unwrap_or(RPC_MAX_PAYLOAD_DEFAULT);
-
-		http::ServerBuilder::new(io)
-			.threads(thread_pool_size.unwrap_or(HTTP_THREADS))
-			.health_api(("/health", "system_health"))
-			.allowed_hosts(hosts_filtering(cors.is_some()))
-			.rest_api(if cors.is_some() { http::RestApi::Secure } else { http::RestApi::Unsecure })
-			.cors(map_cors::<http::AccessControlAllowOrigin>(cors))
-			.max_request_body_size(max_request_body_size)
-			.start_http(addr)
-	}
-
-	/// Start IPC server listening on given path.
-	///
-	/// **Note**: Only available if `not(target_os = "unknown")`.
-	pub fn start_ipc<M: pubsub::PubSubMetadata + Default>(
-		addr: &str,
-		io: RpcHandler<M>,
-		server_metrics: ServerMetrics,
-	) -> io::Result<ipc::Server> {
-		let builder = ipc::ServerBuilder::new(io);
-		#[cfg(target_os = "unix")]
-		builder.set_security_attributes({
-			let security_attributes = ipc::SecurityAttributes::empty();
-			security_attributes.set_mode(0o600)?;
-			security_attributes
-		});
-		builder.session_stats(server_metrics).start(addr)
+	fn close_session(&self, _id: ws::SessionId) {
+		self.session_closed.as_ref().map(|m| m.inc());
 	}
+}
 
-	/// Start WS server listening on given address.
-	///
-	/// **Note**: Only available if `not(target_os = "unknown")`.
-	pub fn start_ws<
-		M: pubsub::PubSubMetadata + From<futures::channel::mpsc::UnboundedSender<String>>,
-	>(
-		addr: &std::net::SocketAddr,
-		max_connections: Option<usize>,
-		cors: Option<&Vec<String>>,
-		io: RpcHandler<M>,
-		maybe_max_payload_mb: Option<usize>,
-		server_metrics: ServerMetrics,
-	) -> io::Result<ws::Server> {
-		let rpc_max_payload = maybe_max_payload_mb
-			.map(|mb| mb.saturating_mul(MEGABYTE))
-			.unwrap_or(RPC_MAX_PAYLOAD_DEFAULT);
-		ws::ServerBuilder::with_meta_extractor(io, |context: &ws::RequestContext| {
-			context.sender().into()
-		})
-		.max_payload(rpc_max_payload)
-		.max_connections(max_connections.unwrap_or(WS_MAX_CONNECTIONS))
-		.allowed_origins(map_cors(cors))
+/// Start HTTP server listening on given address.
+pub fn start_http<M: pubsub::PubSubMetadata + Default + Unpin>(
+	addr: &std::net::SocketAddr,
+	thread_pool_size: Option<usize>,
+	cors: Option<&Vec<String>>,
+	io: RpcHandler<M>,
+	maybe_max_payload_mb: Option<usize>,
+) -> io::Result<http::Server> {
+	let max_request_body_size = maybe_max_payload_mb
+		.map(|mb| mb.saturating_mul(MEGABYTE))
+		.unwrap_or(RPC_MAX_PAYLOAD_DEFAULT);
+
+	http::ServerBuilder::new(io)
+		.threads(thread_pool_size.unwrap_or(HTTP_THREADS))
+		.health_api(("/health", "system_health"))
 		.allowed_hosts(hosts_filtering(cors.is_some()))
-		.session_stats(server_metrics)
-		.start(addr)
-		.map_err(|err| match err {
-			ws::Error::Io(io) => io,
-			ws::Error::ConnectionClosed => io::ErrorKind::BrokenPipe.into(),
-			e => {
-				error!("{}", e);
-				io::ErrorKind::Other.into()
-			},
-		})
-	}
+		.rest_api(if cors.is_some() { http::RestApi::Secure } else { http::RestApi::Unsecure })
+		.cors(map_cors::<http::AccessControlAllowOrigin>(cors))
+		.max_request_body_size(max_request_body_size)
+		.start_http(addr)
+}
 
-	fn map_cors<T: for<'a> From<&'a str>>(
-		cors: Option<&Vec<String>>,
-	) -> http::DomainsValidation<T> {
-		cors.map(|x| x.iter().map(AsRef::as_ref).map(Into::into).collect::<Vec<_>>())
-			.into()
-	}
+/// Start IPC server listening on given path.
+pub fn start_ipc<M: pubsub::PubSubMetadata + Default>(
+	addr: &str,
+	io: RpcHandler<M>,
+	server_metrics: ServerMetrics,
+) -> io::Result<ipc::Server> {
+	let builder = ipc::ServerBuilder::new(io);
+	#[cfg(target_os = "unix")]
+	builder.set_security_attributes({
+		let security_attributes = ipc::SecurityAttributes::empty();
+		security_attributes.set_mode(0o600)?;
+		security_attributes
+	});
+	builder.session_stats(server_metrics).start(addr)
+}
 
-	fn hosts_filtering(enable: bool) -> http::DomainsValidation<http::Host> {
-		if enable {
-			// NOTE The listening address is whitelisted by default.
-			// Setting an empty vector here enables the validation
-			// and allows only the listening address.
-			http::DomainsValidation::AllowOnly(vec![])
-		} else {
-			http::DomainsValidation::Disabled
-		}
-	}
+/// Start WS server listening on given address.
+pub fn start_ws<
+	M: pubsub::PubSubMetadata + From<futures::channel::mpsc::UnboundedSender<String>>,
+>(
+	addr: &std::net::SocketAddr,
+	max_connections: Option<usize>,
+	cors: Option<&Vec<String>>,
+	io: RpcHandler<M>,
+	maybe_max_payload_mb: Option<usize>,
+	server_metrics: ServerMetrics,
+) -> io::Result<ws::Server> {
+	let rpc_max_payload = maybe_max_payload_mb
+		.map(|mb| mb.saturating_mul(MEGABYTE))
+		.unwrap_or(RPC_MAX_PAYLOAD_DEFAULT);
+	ws::ServerBuilder::with_meta_extractor(io, |context: &ws::RequestContext| {
+		context.sender().into()
+	})
+	.max_payload(rpc_max_payload)
+	.max_connections(max_connections.unwrap_or(WS_MAX_CONNECTIONS))
+	.allowed_origins(map_cors(cors))
+	.allowed_hosts(hosts_filtering(cors.is_some()))
+	.session_stats(server_metrics)
+	.start(addr)
+	.map_err(|err| match err {
+		ws::Error::Io(io) => io,
+		ws::Error::ConnectionClosed => io::ErrorKind::BrokenPipe.into(),
+		e => {
+			error!("{}", e);
+			io::ErrorKind::Other.into()
+		},
+	})
 }
 
-#[cfg(target_os = "unknown")]
-mod inner {}
+fn map_cors<T: for<'a> From<&'a str>>(cors: Option<&Vec<String>>) -> http::DomainsValidation<T> {
+	cors.map(|x| x.iter().map(AsRef::as_ref).map(Into::into).collect::<Vec<_>>())
+		.into()
+}
+
+fn hosts_filtering(enable: bool) -> http::DomainsValidation<http::Host> {
+	if enable {
+		// NOTE The listening address is whitelisted by default.
+		// Setting an empty vector here enables the validation
+		// and allows only the listening address.
+		http::DomainsValidation::AllowOnly(vec![])
+	} else {
+		http::DomainsValidation::Disabled
+	}
+}
diff --git a/client/rpc-servers/src/middleware.rs b/client/rpc-servers/src/middleware.rs
index 43380977455d..00532b0e8d66 100644
--- a/client/rpc-servers/src/middleware.rs
+++ b/client/rpc-servers/src/middleware.rs
@@ -175,7 +175,6 @@ impl<M: Metadata> RequestMiddleware<M> for RpcMiddleware {
 		F: Fn(jsonrpc_core::Call, M) -> X + Send + Sync,
 		X: Future<Output = Option<jsonrpc_core::Output>> + Send + 'static,
 	{
-		#[cfg(not(target_os = "unknown"))]
 		let start = std::time::Instant::now();
 		let name = call_name(&call, &self.known_rpc_method_names).to_owned();
 		let metrics = self.metrics.clone();
@@ -191,11 +190,7 @@ impl<M: Metadata> RequestMiddleware<M> for RpcMiddleware {
 		Either::Left(
 			async move {
 				let r = r.await;
-				#[cfg(not(target_os = "unknown"))]
 				let micros = start.elapsed().as_micros();
-				// seems that std::time is not implemented for browser target
-				#[cfg(target_os = "unknown")]
-				let micros = 1;
 				if let Some(ref metrics) = metrics {
 					metrics
 						.calls_time
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index b79e95fbb091..6832ed44d592 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -79,8 +79,6 @@ parity-util-mem = { version = "0.10.0", default-features = false, features = [
 	"primitive-types",
 ] }
 async-trait = "0.1.50"
-
-[target.'cfg(not(target_os = "unknown"))'.dependencies]
 tempfile = "3.1.0"
 directories = "3.0.2"
 
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index f0c037aee232..7b0e2203dffd 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -22,8 +22,7 @@ use crate::{
 	config::{Configuration, KeystoreConfig, PrometheusConfig, TransactionStorageMode},
 	error::Error,
 	metrics::MetricsService,
-	start_rpc_servers, MallocSizeOfWasm, RpcHandlers, SpawnTaskHandle, TaskManager,
-	TransactionPoolAdapter,
+	start_rpc_servers, RpcHandlers, SpawnTaskHandle, TaskManager, TransactionPoolAdapter,
 };
 use futures::{channel::oneshot, future::ready, FutureExt, StreamExt};
 use jsonrpc_pubsub::manager::SubscriptionManager;
@@ -552,7 +551,7 @@ where
 	TBl::Header: Unpin,
 	TBackend: 'static + sc_client_api::backend::Backend<TBl> + Send,
 	TExPool: MaintainedTransactionPool<Block = TBl, Hash = <TBl as BlockT>::Hash>
-		+ MallocSizeOfWasm
+		+ parity_util_mem::MallocSizeOf
 		+ 'static,
 	TRpc: sc_rpc::RpcExtension<sc_rpc::Metadata>,
 {
diff --git a/client/service/src/config.rs b/client/service/src/config.rs
index 4223a1812204..20a9f58d21fd 100644
--- a/client/service/src/config.rs
+++ b/client/service/src/config.rs
@@ -43,7 +43,6 @@ use std::{
 	pin::Pin,
 	sync::Arc,
 };
-#[cfg(not(target_os = "unknown"))]
 use tempfile::TempDir;
 
 /// Service configuration.
@@ -253,7 +252,6 @@ impl Default for RpcMethods {
 #[derive(Debug)]
 pub enum BasePath {
 	/// A temporary directory is used as base path and will be deleted when dropped.
-	#[cfg(not(target_os = "unknown"))]
 	Temporary(TempDir),
 	/// A path on the disk.
 	Permanenent(PathBuf),
@@ -265,7 +263,6 @@ impl BasePath {
 	///
 	/// Note: the temporary directory will be created automatically and deleted when the `BasePath`
 	/// instance is dropped.
-	#[cfg(not(target_os = "unknown"))]
 	pub fn new_temp_dir() -> io::Result<BasePath> {
 		Ok(BasePath::Temporary(tempfile::Builder::new().prefix("substrate").tempdir()?))
 	}
@@ -279,7 +276,6 @@ impl BasePath {
 	}
 
 	/// Create a base path from values describing the project.
-	#[cfg(not(target_os = "unknown"))]
 	pub fn from_project(qualifier: &str, organization: &str, application: &str) -> BasePath {
 		BasePath::new(
 			directories::ProjectDirs::from(qualifier, organization, application)
@@ -291,7 +287,6 @@ impl BasePath {
 	/// Retrieve the base path.
 	pub fn path(&self) -> &Path {
 		match self {
-			#[cfg(not(target_os = "unknown"))]
 			BasePath::Temporary(temp_dir) => temp_dir.path(),
 			BasePath::Permanenent(path) => path.as_path(),
 		}
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index ede6f01a4539..6e4208138a3b 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -39,7 +39,6 @@ use std::{collections::HashMap, io, net::SocketAddr, pin::Pin, task::Poll};
 use codec::{Decode, Encode};
 use futures::{stream, Future, FutureExt, Stream, StreamExt};
 use log::{debug, error, warn};
-use parity_util_mem::MallocSizeOf;
 use sc_network::PeerId;
 use sc_utils::mpsc::TracingUnboundedReceiver;
 use sp_runtime::{
@@ -81,16 +80,6 @@ pub use task_manager::{SpawnTaskHandle, TaskManager};
 
 const DEFAULT_PROTOCOL_ID: &str = "sup";
 
-/// A type that implements `MallocSizeOf` on native but not wasm.
-#[cfg(not(target_os = "unknown"))]
-pub trait MallocSizeOfWasm: MallocSizeOf {}
-#[cfg(target_os = "unknown")]
-pub trait MallocSizeOfWasm {}
-#[cfg(not(target_os = "unknown"))]
-impl<T: MallocSizeOf> MallocSizeOfWasm for T {}
-#[cfg(target_os = "unknown")]
-impl<T> MallocSizeOfWasm for T {}
-
 /// RPC handlers that can perform RPC queries.
 #[derive(Clone)]
 pub struct RpcHandlers(
@@ -305,7 +294,6 @@ async fn build_network_future<
 }
 
 // Wrapper for HTTP and WS servers that makes sure they are properly shut down.
-#[cfg(not(target_os = "unknown"))]
 mod waiting {
 	pub struct HttpServer(pub Option<sc_rpc_server::HttpServer>);
 	impl Drop for HttpServer {
@@ -340,7 +328,6 @@ mod waiting {
 
 /// Starts RPC servers that run in their own thread, and returns an opaque object that keeps them
 /// alive.
-#[cfg(not(target_os = "unknown"))]
 fn start_rpc_servers<
 	H: FnMut(
 		sc_rpc::DenyUnsafe,
@@ -445,23 +432,6 @@ fn start_rpc_servers<
 	)))
 }
 
-/// Starts RPC servers that run in their own thread, and returns an opaque object that keeps them
-/// alive.
-#[cfg(target_os = "unknown")]
-fn start_rpc_servers<
-	H: FnMut(
-		sc_rpc::DenyUnsafe,
-		sc_rpc_server::RpcMiddleware,
-	) -> Result<sc_rpc_server::RpcHandler<sc_rpc::Metadata>, Error>,
->(
-	_: &Configuration,
-	_: H,
-	_: Option<sc_rpc_server::RpcMetrics>,
-	_: sc_rpc_server::ServerMetrics,
-) -> Result<Box<dyn std::any::Any + Send + Sync>, error::Error> {
-	Ok(Box::new(()))
-}
-
 /// An RPC session. Used to perform in-memory RPC queries (ie. RPC queries that don't go through
 /// the HTTP or WebSockets server).
 #[derive(Clone)]
diff --git a/client/transaction-pool/src/graph/base_pool.rs b/client/transaction-pool/src/graph/base_pool.rs
index b5ff036c0139..890a87e82929 100644
--- a/client/transaction-pool/src/graph/base_pool.rs
+++ b/client/transaction-pool/src/graph/base_pool.rs
@@ -207,8 +207,7 @@ const RECENTLY_PRUNED_TAGS: usize = 2;
 /// as-is for the second time will fail or produce unwanted results.
 /// Most likely it is required to revalidate them and recompute set of
 /// required tags.
-#[derive(Debug)]
-#[cfg_attr(not(target_os = "unknown"), derive(parity_util_mem::MallocSizeOf))]
+#[derive(Debug, parity_util_mem::MallocSizeOf)]
 pub struct BasePool<Hash: hash::Hash + Eq, Ex> {
 	reject_future_transactions: bool,
 	future: FutureTransactions<Hash, Ex>,
diff --git a/client/transaction-pool/src/graph/future.rs b/client/transaction-pool/src/graph/future.rs
index 201d6f40e8b1..6ed1f1014304 100644
--- a/client/transaction-pool/src/graph/future.rs
+++ b/client/transaction-pool/src/graph/future.rs
@@ -28,7 +28,7 @@ use std::time::Instant;
 
 use super::base_pool::Transaction;
 
-#[cfg_attr(not(target_os = "unknown"), derive(parity_util_mem::MallocSizeOf))]
+#[derive(parity_util_mem::MallocSizeOf)]
 /// Transaction with partially satisfied dependencies.
 pub struct WaitingTransaction<Hash, Ex> {
 	/// Transaction details.
@@ -108,8 +108,7 @@ impl<Hash, Ex> WaitingTransaction<Hash, Ex> {
 ///
 /// Contains transactions that are still awaiting for some other transactions that
 /// could provide a tag that they require.
-#[derive(Debug)]
-#[cfg_attr(not(target_os = "unknown"), derive(parity_util_mem::MallocSizeOf))]
+#[derive(Debug, parity_util_mem::MallocSizeOf)]
 pub struct FutureTransactions<Hash: hash::Hash + Eq, Ex> {
 	/// tags that are not yet provided by any transaction and we await for them
 	wanted_tags: HashMap<Tag, HashSet<Hash>>,
diff --git a/client/transaction-pool/src/graph/pool.rs b/client/transaction-pool/src/graph/pool.rs
index 70de9b235668..2af5a8a19a5a 100644
--- a/client/transaction-pool/src/graph/pool.rs
+++ b/client/transaction-pool/src/graph/pool.rs
@@ -133,7 +133,6 @@ pub struct Pool<B: ChainApi> {
 	validated_pool: Arc<ValidatedPool<B>>,
 }
 
-#[cfg(not(target_os = "unknown"))]
 impl<B: ChainApi> parity_util_mem::MallocSizeOf for Pool<B>
 where
 	ExtrinsicFor<B>: parity_util_mem::MallocSizeOf,
diff --git a/client/transaction-pool/src/graph/validated_pool.rs b/client/transaction-pool/src/graph/validated_pool.rs
index 4dd5ea3b67e7..e4aad7f342b5 100644
--- a/client/transaction-pool/src/graph/validated_pool.rs
+++ b/client/transaction-pool/src/graph/validated_pool.rs
@@ -111,7 +111,6 @@ pub struct ValidatedPool<B: ChainApi> {
 	rotator: PoolRotator<ExtrinsicHash<B>>,
 }
 
-#[cfg(not(target_os = "unknown"))]
 impl<B: ChainApi> parity_util_mem::MallocSizeOf for ValidatedPool<B>
 where
 	ExtrinsicFor<B>: parity_util_mem::MallocSizeOf,
diff --git a/client/transaction-pool/src/lib.rs b/client/transaction-pool/src/lib.rs
index 0f985d835c6b..6eb5bd2f332e 100644
--- a/client/transaction-pool/src/lib.rs
+++ b/client/transaction-pool/src/lib.rs
@@ -138,7 +138,6 @@ impl<T, Block: BlockT> ReadyPoll<T, Block> {
 	}
 }
 
-#[cfg(not(target_os = "unknown"))]
 impl<PoolApi, Block> parity_util_mem::MallocSizeOf for BasicPool<PoolApi, Block>
 where
 	PoolApi: graph::ChainApi<Block = Block>,
diff --git a/primitives/maybe-compressed-blob/Cargo.toml b/primitives/maybe-compressed-blob/Cargo.toml
index 720fc4281ca7..8d47c89ea8eb 100644
--- a/primitives/maybe-compressed-blob/Cargo.toml
+++ b/primitives/maybe-compressed-blob/Cargo.toml
@@ -10,8 +10,5 @@ description = "Handling of blobs, usually Wasm code, which may be compresed"
 documentation = "https://docs.rs/sp-maybe-compressed-blob"
 readme = "README.md"
 
-[target.'cfg(not(target_os = "unknown"))'.dependencies]
+[dependencies]
 zstd = { version = "0.6.0", default-features = false }
-
-[target.'cfg(target_os = "unknown")'.dependencies]
-ruzstd = { version = "0.2.2" }
diff --git a/primitives/maybe-compressed-blob/src/lib.rs b/primitives/maybe-compressed-blob/src/lib.rs
index 4e4a3da0a82c..e8a7e42b4eac 100644
--- a/primitives/maybe-compressed-blob/src/lib.rs
+++ b/primitives/maybe-compressed-blob/src/lib.rs
@@ -70,22 +70,12 @@ fn read_from_decoder(
 	}
 }
 
-#[cfg(not(target_os = "unknown"))]
 fn decompress_zstd(blob: &[u8], bomb_limit: usize) -> Result<Vec<u8>, Error> {
 	let decoder = zstd::Decoder::new(blob).map_err(|_| Error::Invalid)?;
 
 	read_from_decoder(decoder, blob.len(), bomb_limit)
 }
 
-#[cfg(target_os = "unknown")]
-fn decompress_zstd(mut blob: &[u8], bomb_limit: usize) -> Result<Vec<u8>, Error> {
-	let blob_len = blob.len();
-	let decoder =
-		ruzstd::streaming_decoder::StreamingDecoder::new(&mut blob).map_err(|_| Error::Invalid)?;
-
-	read_from_decoder(decoder, blob_len, bomb_limit)
-}
-
 /// Decode a blob, if it indicates that it is compressed. Provide a `bomb_limit`, which
 /// is the limit of bytes which should be decompressed from the blob.
 pub fn decompress(blob: &[u8], bomb_limit: usize) -> Result<Cow<[u8]>, Error> {
@@ -99,7 +89,6 @@ pub fn decompress(blob: &[u8], bomb_limit: usize) -> Result<Cow<[u8]>, Error> {
 /// Encode a blob as compressed. If the blob's size is over the bomb limit,
 /// this will not compress the blob, as the decoder will not be able to be
 /// able to differentiate it from a compression bomb.
-#[cfg(not(target_os = "unknown"))]
 pub fn compress(blob: &[u8], bomb_limit: usize) -> Option<Vec<u8>> {
 	use std::io::Write;
 
diff --git a/utils/prometheus/Cargo.toml b/utils/prometheus/Cargo.toml
index 16feedb2b5bd..062054801da8 100644
--- a/utils/prometheus/Cargo.toml
+++ b/utils/prometheus/Cargo.toml
@@ -17,8 +17,6 @@ log = "0.4.8"
 prometheus = { version = "0.11.0", default-features = false }
 futures-util = { version = "0.3.1", default-features = false, features = ["io"] }
 derive_more = "0.99"
-
-[target.'cfg(not(target_os = "unknown"))'.dependencies]
 async-std = { version = "1.6.5", features = ["unstable"] }
 tokio = "1.10"
 hyper = { version = "0.14.11", default-features = false, features = ["http1", "server", "tcp"] }
diff --git a/utils/prometheus/src/lib.rs b/utils/prometheus/src/lib.rs
index 5771b6556757..f81b82cb1764 100644
--- a/utils/prometheus/src/lib.rs
+++ b/utils/prometheus/src/lib.rs
@@ -15,9 +15,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(not(target_os = "unknown"))]
 use futures_util::future::Future;
-use prometheus::core::Collector;
+use hyper::{
+	http::StatusCode,
+	server::Server,
+	service::{make_service_fn, service_fn},
+	Body, Request, Response,
+};
 pub use prometheus::{
 	self,
 	core::{
@@ -27,21 +31,14 @@ pub use prometheus::{
 	exponential_buckets, Error as PrometheusError, Histogram, HistogramOpts, HistogramVec, Opts,
 	Registry,
 };
-#[cfg(not(target_os = "unknown"))]
-use prometheus::{Encoder, TextEncoder};
+use prometheus::{core::Collector, Encoder, TextEncoder};
 use std::net::SocketAddr;
 
-#[cfg(not(target_os = "unknown"))]
 mod networking;
 mod sourced;
 
 pub use sourced::{MetricSource, SourcedCounter, SourcedGauge, SourcedMetric};
 
-#[cfg(not(target_os = "unknown"))]
-pub use known_os::init_prometheus;
-#[cfg(target_os = "unknown")]
-pub use unknown_os::init_prometheus;
-
 pub fn register<T: Clone + Collector + 'static>(
 	metric: T,
 	registry: &Registry,
@@ -50,126 +47,96 @@ pub fn register<T: Clone + Collector + 'static>(
 	Ok(metric)
 }
 
-// On WASM `init_prometheus` becomes a no-op.
-#[cfg(target_os = "unknown")]
-mod unknown_os {
-	use super::*;
-
-	pub enum Error {}
-
-	pub async fn init_prometheus(_: SocketAddr, _registry: Registry) -> Result<(), Error> {
-		Ok(())
-	}
+#[derive(Debug, derive_more::Display, derive_more::From)]
+pub enum Error {
+	/// Hyper internal error.
+	Hyper(hyper::Error),
+	/// Http request error.
+	Http(hyper::http::Error),
+	/// i/o error.
+	Io(std::io::Error),
+	#[display(fmt = "Prometheus port {} already in use.", _0)]
+	PortInUse(SocketAddr),
 }
 
-#[cfg(not(target_os = "unknown"))]
-mod known_os {
-	use super::*;
-	use hyper::{
-		http::StatusCode,
-		server::Server,
-		service::{make_service_fn, service_fn},
-		Body, Request, Response,
-	};
-
-	#[derive(Debug, derive_more::Display, derive_more::From)]
-	pub enum Error {
-		/// Hyper internal error.
-		Hyper(hyper::Error),
-		/// Http request error.
-		Http(hyper::http::Error),
-		/// i/o error.
-		Io(std::io::Error),
-		#[display(fmt = "Prometheus port {} already in use.", _0)]
-		PortInUse(SocketAddr),
-	}
-
-	impl std::error::Error for Error {
-		fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
-			match self {
-				Error::Hyper(error) => Some(error),
-				Error::Http(error) => Some(error),
-				Error::Io(error) => Some(error),
-				Error::PortInUse(_) => None,
-			}
+impl std::error::Error for Error {
+	fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+		match self {
+			Error::Hyper(error) => Some(error),
+			Error::Http(error) => Some(error),
+			Error::Io(error) => Some(error),
+			Error::PortInUse(_) => None,
 		}
 	}
+}
 
-	async fn request_metrics(
-		req: Request<Body>,
-		registry: Registry,
-	) -> Result<Response<Body>, Error> {
-		if req.uri().path() == "/metrics" {
-			let metric_families = registry.gather();
-			let mut buffer = vec![];
-			let encoder = TextEncoder::new();
-			encoder.encode(&metric_families, &mut buffer).unwrap();
-
-			Response::builder()
-				.status(StatusCode::OK)
-				.header("Content-Type", encoder.format_type())
-				.body(Body::from(buffer))
-				.map_err(Error::Http)
-		} else {
-			Response::builder()
-				.status(StatusCode::NOT_FOUND)
-				.body(Body::from("Not found."))
-				.map_err(Error::Http)
-		}
+async fn request_metrics(req: Request<Body>, registry: Registry) -> Result<Response<Body>, Error> {
+	if req.uri().path() == "/metrics" {
+		let metric_families = registry.gather();
+		let mut buffer = vec![];
+		let encoder = TextEncoder::new();
+		encoder.encode(&metric_families, &mut buffer).unwrap();
+
+		Response::builder()
+			.status(StatusCode::OK)
+			.header("Content-Type", encoder.format_type())
+			.body(Body::from(buffer))
+			.map_err(Error::Http)
+	} else {
+		Response::builder()
+			.status(StatusCode::NOT_FOUND)
+			.body(Body::from("Not found."))
+			.map_err(Error::Http)
 	}
+}
 
-	#[derive(Clone)]
-	pub struct Executor;
+#[derive(Clone)]
+pub struct Executor;
 
-	impl<T> hyper::rt::Executor<T> for Executor
-	where
-		T: Future + Send + 'static,
-		T::Output: Send + 'static,
-	{
-		fn execute(&self, future: T) {
-			async_std::task::spawn(future);
-		}
+impl<T> hyper::rt::Executor<T> for Executor
+where
+	T: Future + Send + 'static,
+	T::Output: Send + 'static,
+{
+	fn execute(&self, future: T) {
+		async_std::task::spawn(future);
 	}
+}
 
-	/// Initializes the metrics context, and starts an HTTP server
-	/// to serve metrics.
-	pub async fn init_prometheus(
-		prometheus_addr: SocketAddr,
-		registry: Registry,
-	) -> Result<(), Error> {
-		let listener = async_std::net::TcpListener::bind(&prometheus_addr)
-			.await
-			.map_err(|_| Error::PortInUse(prometheus_addr))?;
-
-		init_prometheus_with_listener(listener, registry).await
-	}
+/// Initializes the metrics context, and starts an HTTP server
+/// to serve metrics.
+pub async fn init_prometheus(prometheus_addr: SocketAddr, registry: Registry) -> Result<(), Error> {
+	let listener = async_std::net::TcpListener::bind(&prometheus_addr)
+		.await
+		.map_err(|_| Error::PortInUse(prometheus_addr))?;
 
-	/// Init prometheus using the given listener.
-	pub(crate) async fn init_prometheus_with_listener(
-		listener: async_std::net::TcpListener,
-		registry: Registry,
-	) -> Result<(), Error> {
-		use networking::Incoming;
+	init_prometheus_with_listener(listener, registry).await
+}
 
-		log::info!("〽️ Prometheus exporter started at {}", listener.local_addr()?);
+/// Init prometheus using the given listener.
+async fn init_prometheus_with_listener(
+	listener: async_std::net::TcpListener,
+	registry: Registry,
+) -> Result<(), Error> {
+	use networking::Incoming;
 
-		let service = make_service_fn(move |_| {
-			let registry = registry.clone();
+	log::info!("〽️ Prometheus exporter started at {}", listener.local_addr()?);
 
-			async move {
-				Ok::<_, hyper::Error>(service_fn(move |req: Request<Body>| {
-					request_metrics(req, registry.clone())
-				}))
-			}
-		});
+	let service = make_service_fn(move |_| {
+		let registry = registry.clone();
 
-		let server =
-			Server::builder(Incoming(listener.incoming())).executor(Executor).serve(service);
+		async move {
+			Ok::<_, hyper::Error>(service_fn(move |req: Request<Body>| {
+				request_metrics(req, registry.clone())
+			}))
+		}
+	});
 
-		let result = server.await.map_err(Into::into);
+	let server = Server::builder(Incoming(listener.incoming())).executor(Executor).serve(service);
 
-		result
-	}
+	let result = server.await.map_err(Into::into);
+
+	result
 }
 
 #[cfg(test)]
@@ -197,7 +164,7 @@ mod tests {
 		)
 		.expect("Registers the test metric");
 
-		runtime.spawn(known_os::init_prometheus_with_listener(listener, registry));
+		runtime.spawn(init_prometheus_with_listener(listener, registry));
 
 		runtime.block_on(async {
 			let client = Client::new();

From 267dac2afdef51554eeb881fac0d844dd2761c92 Mon Sep 17 00:00:00 2001
From: girazoki <gorka.irazoki@gmail.com>
Date: Thu, 9 Sep 2021 12:45:16 +0200
Subject: [PATCH 1159/1194] Add setter configurable only for benchmarking or
 tests (#9668)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add setter configurable only fior benchmarking or tests

* Update primitives/runtime/src/traits.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 primitives/runtime/src/traits.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/primitives/runtime/src/traits.rs b/primitives/runtime/src/traits.rs
index 15ca897e618e..312a9f6331bf 100644
--- a/primitives/runtime/src/traits.rs
+++ b/primitives/runtime/src/traits.rs
@@ -1585,6 +1585,14 @@ pub trait BlockNumberProvider {
 	/// ```
 	/// .
 	fn current_block_number() -> Self::BlockNumber;
+
+	/// Utility function only to be used in benchmarking scenarios, to be implemented optionally,
+	/// else a noop.
+	///
+	/// It allows for setting the block number that will later be fetched
+	/// This is useful in case the block number provider is different than System
+	#[cfg(feature = "runtime-benchmarks")]
+	fn set_block_number(_block: Self::BlockNumber) {}
 }
 
 #[cfg(test)]

From ea55619758414aafa66b91a34a4c4fc550864928 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 Sep 2021 13:26:25 +0200
Subject: [PATCH 1160/1194] Bump lru from 0.6.5 to 0.6.6 (#9635)

Bumps [lru](https://github.com/jeromefroe/lru-rs) from 0.6.5 to 0.6.6.
- [Release notes](https://github.com/jeromefroe/lru-rs/releases)
- [Changelog](https://github.com/jeromefroe/lru-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jeromefroe/lru-rs/compare/0.6.5...0.6.6)

---
updated-dependencies:
- dependency-name: lru
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                       | 17 ++++-------------
 client/network-gossip/Cargo.toml |  2 +-
 client/network/Cargo.toml        |  2 +-
 primitives/blockchain/Cargo.toml |  2 +-
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b4bb44f927b4..bc2d30a31131 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -71,12 +71,6 @@ dependencies = [
  "subtle 2.4.0",
 ]
 
-[[package]]
-name = "ahash"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e"
-
 [[package]]
 name = "ahash"
 version = "0.7.4"
@@ -2458,9 +2452,6 @@ name = "hashbrown"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
-dependencies = [
- "ahash 0.4.7",
-]
 
 [[package]]
 name = "hashbrown"
@@ -2468,7 +2459,7 @@ version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
 dependencies = [
- "ahash 0.7.4",
+ "ahash",
 ]
 
 [[package]]
@@ -3828,11 +3819,11 @@ dependencies = [
 
 [[package]]
 name = "lru"
-version = "0.6.5"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f374d42cdfc1d7dbf3d3dec28afab2eb97ffbf43a3234d795b5986dbf4b90ba"
+checksum = "7ea2d928b485416e8908cff2d97d621db22b27f7b3b6729e438bcf42c671ba91"
 dependencies = [
- "hashbrown 0.9.1",
+ "hashbrown 0.11.2",
 ]
 
 [[package]]
diff --git a/client/network-gossip/Cargo.toml b/client/network-gossip/Cargo.toml
index 06a68a0bda06..c078e5b892fe 100644
--- a/client/network-gossip/Cargo.toml
+++ b/client/network-gossip/Cargo.toml
@@ -19,7 +19,7 @@ futures = "0.3.9"
 futures-timer = "3.0.1"
 libp2p = { version = "0.39.1", default-features = false }
 log = "0.4.8"
-lru = "0.6.5"
+lru = "0.6.6"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.9.0", path = "../../utils/prometheus" }
 sc-network = { version = "0.10.0-dev", path = "../network" }
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index 196bd419aaae..b9eaef5e1701 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -36,7 +36,7 @@ hex = "0.4.0"
 ip_network = "0.4.0"
 linked-hash-map = "0.5.4"
 linked_hash_set = "0.1.3"
-lru = "0.6.5"
+lru = "0.6.6"
 log = "0.4.8"
 parking_lot = "0.11.1"
 pin-project = "1.0.4"
diff --git a/primitives/blockchain/Cargo.toml b/primitives/blockchain/Cargo.toml
index f3bbde497225..66d9152c230d 100644
--- a/primitives/blockchain/Cargo.toml
+++ b/primitives/blockchain/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 log = "0.4.11"
-lru = "0.6.5"
+lru = "0.6.6"
 parking_lot = "0.11.1"
 thiserror = "1.0.21"
 futures = "0.3.9"

From 88c64e06471cc12aa9b25290f24d5566bcb5dd82 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 Sep 2021 11:31:31 +0000
Subject: [PATCH 1161/1194] Bump zeroize from 1.2.0 to 1.4.1 (#9591)

Bumps [zeroize](https://github.com/iqlusioninc/crates) from 1.2.0 to 1.4.1.
- [Release notes](https://github.com/iqlusioninc/crates/releases)
- [Commits](https://github.com/iqlusioninc/crates/compare/zeroize/v1.2.0...zeroize/v1.4.1)

---
updated-dependencies:
- dependency-name: zeroize
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                 | 4 ++--
 client/network/Cargo.toml  | 2 +-
 primitives/core/Cargo.toml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bc2d30a31131..61863994c60c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -11497,9 +11497,9 @@ dependencies = [
 
 [[package]]
 name = "zeroize"
-version = "1.2.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81a974bcdd357f0dca4d41677db03436324d45a4c9ed2d0b873a5a360ce41c36"
+checksum = "377db0846015f7ae377174787dd452e1c5f5a9050bc6f954911d01f116daa0cd"
 dependencies = [
  "zeroize_derive",
 ]
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index b9eaef5e1701..283ac7c68f3e 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -63,7 +63,7 @@ unsigned-varint = { version = "0.6.0", features = [
     "asynchronous_codec",
 ] }
 void = "1.0.2"
-zeroize = "1.2.0"
+zeroize = "1.4.1"
 libp2p = "0.39.1"
 
 [dev-dependencies]
diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml
index 2e7818c3d427..add7da81c3ff 100644
--- a/primitives/core/Cargo.toml
+++ b/primitives/core/Cargo.toml
@@ -34,7 +34,7 @@ substrate-bip39 = { version = "0.4.2", optional = true }
 tiny-bip39 = { version = "0.8", optional = true }
 regex = { version = "1.4.2", optional = true }
 num-traits = { version = "0.2.8", default-features = false }
-zeroize = { version = "1.2.0", default-features = false }
+zeroize = { version = "1.4.1", default-features = false }
 secrecy = { version = "0.7.0", default-features = false }
 lazy_static = { version = "1.4.0", default-features = false, optional = true }
 parking_lot = { version = "0.11.1", optional = true }

From f84ac630acccbfadc9f7cd8364fc43e03d743103 Mon Sep 17 00:00:00 2001
From: Zeke Mostov <32168567+emostov@users.noreply.github.com>
Date: Thu, 9 Sep 2021 12:46:24 -0700
Subject: [PATCH 1162/1194] Create trait for NPoS election algorithms (#9664)

* build the template, hand it over to zeke now.

* Tests working

* save wip

* Some updates

* Some cleanup

* mo cleanin

* Link to issue

* Apply suggestions from code review

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Bound accuracy for prepare_election_result

* Use npos_election::Error for phragmms

* save

* Apply suggestions from code review

* Simplify test to use Balancing::set

* Cargo.lock after build

* Revert "Cargo.lock after build"

This reverts commit 7d726c8efa687c09e4f377196b106eb9e9760487.

* Try reduce cargo.lock diff

* Update bin/node/runtime/src/lib.rs

* Comment

* Apply suggestions from code review

* Set balancing directly

* Document som pub items

* Update frame/election-provider-multi-phase/src/unsigned.rs

* Apply suggestions from code review

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Improve some comments

* Revert accidental change to random file

* tiney

* revert

Co-authored-by: kianenigma <kian@parity.io>
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
---
 bin/node/runtime/Cargo.toml                   |   5 +-
 bin/node/runtime/src/lib.rs                   |  33 +++++-
 .../election-provider-multi-phase/src/lib.rs  |  37 +++---
 .../election-provider-multi-phase/src/mock.rs |  11 +-
 .../src/signed.rs                             |   3 +-
 .../src/unsigned.rs                           | 108 ++++++++----------
 frame/election-provider-support/src/lib.rs    |  70 +++++++++++-
 primitives/npos-elections/Cargo.toml          |   3 +-
 primitives/npos-elections/src/phragmen.rs     |  20 ++--
 primitives/npos-elections/src/phragmms.rs     |  18 +--
 10 files changed, 203 insertions(+), 105 deletions(-)

diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index d4b9975704a4..2b9accffc8c3 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -39,6 +39,7 @@ sp-session = { version = "4.0.0-dev", default-features = false, path = "../../..
 sp-transaction-pool = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/transaction-pool" }
 sp-version = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/version" }
 sp-npos-elections = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/npos-elections" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/io" }
 
 # frame dependencies
 frame-executive = { version = "4.0.0-dev", default-features = false, path = "../../../frame/executive" }
@@ -98,9 +99,6 @@ pallet-vesting = { version = "4.0.0-dev", default-features = false, path = "../.
 [build-dependencies]
 substrate-wasm-builder = { version = "5.0.0-dev", path = "../../../utils/wasm-builder" }
 
-[dev-dependencies]
-sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
-
 [features]
 default = ["std"]
 with-tracing = ["frame-executive/with-tracing"]
@@ -169,6 +167,7 @@ std = [
 	"log/std",
 	"frame-try-runtime/std",
 	"sp-npos-elections/std",
+  "sp-io/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 936dc1c35c84..7dc87c531ab5 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -534,7 +534,6 @@ parameter_types! {
 
 	// miner configs
 	pub const MultiPhaseUnsignedPriority: TransactionPriority = StakingUnsignedPriority::get() - 1u64;
-	pub const MinerMaxIterations: u32 = 10;
 	pub MinerMaxWeight: Weight = RuntimeBlockWeights::get()
 		.get(DispatchClass::Normal)
 		.max_extrinsic.expect("Normal extrinsics have a weight limit configured; qed")
@@ -570,6 +569,32 @@ impl pallet_election_provider_multi_phase::BenchmarkingConfig for BenchmarkConfi
 	const MAXIMUM_TARGETS: u32 = 2000;
 }
 
+/// Maximum number of iterations for balancing that will be executed in the embedded OCW
+/// miner of election provider multi phase.
+pub const MINER_MAX_ITERATIONS: u32 = 10;
+
+/// A source of random balance for NposSolver, which is meant to be run by the OCW election miner.
+pub struct OffchainRandomBalancing;
+impl frame_support::pallet_prelude::Get<Option<(usize, sp_npos_elections::ExtendedBalance)>>
+	for OffchainRandomBalancing
+{
+	fn get() -> Option<(usize, sp_npos_elections::ExtendedBalance)> {
+		use sp_runtime::traits::TrailingZeroInput;
+		let iters = match MINER_MAX_ITERATIONS {
+			0 => 0,
+			max @ _ => {
+				let seed = sp_io::offchain::random_seed();
+				let random = <u32>::decode(&mut TrailingZeroInput::new(&seed))
+					.expect("input is padded with zeroes; qed") %
+					max.saturating_add(1);
+				random as usize
+			},
+		};
+
+		Some((iters, 0))
+	}
+}
+
 impl pallet_election_provider_multi_phase::Config for Runtime {
 	type Event = Event;
 	type Currency = Balances;
@@ -578,7 +603,6 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
 	type UnsignedPhase = UnsignedPhase;
 	type SolutionImprovementThreshold = SolutionImprovementThreshold;
 	type OffchainRepeat = OffchainRepeat;
-	type MinerMaxIterations = MinerMaxIterations;
 	type MinerMaxWeight = MinerMaxWeight;
 	type MinerMaxLength = MinerMaxLength;
 	type MinerTxPriority = MultiPhaseUnsignedPriority;
@@ -594,6 +618,11 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
 	type OnChainAccuracy = Perbill;
 	type Solution = NposSolution16;
 	type Fallback = Fallback;
+	type Solver = frame_election_provider_support::SequentialPhragmen<
+		AccountId,
+		pallet_election_provider_multi_phase::SolutionAccuracyOf<Runtime>,
+		OffchainRandomBalancing,
+	>;
 	type WeightInfo = pallet_election_provider_multi_phase::weights::SubstrateWeight<Runtime>;
 	type ForceOrigin = EnsureRootOrHalfCouncil;
 	type BenchmarkingConfig = BenchmarkConfig;
diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index b2e0d3898428..1a130371f3b4 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -485,13 +485,13 @@ pub struct SolutionOrSnapshotSize {
 /// Internal errors of the pallet.
 ///
 /// Note that this is different from [`pallet::Error`].
-#[derive(Debug, Eq, PartialEq)]
+#[derive(frame_support::DebugNoBound, frame_support::PartialEqNoBound)]
 #[cfg_attr(feature = "runtime-benchmarks", derive(strum_macros::IntoStaticStr))]
-pub enum ElectionError {
+pub enum ElectionError<T: Config> {
 	/// An error happened in the feasibility check sub-system.
 	Feasibility(FeasibilityError),
 	/// An error in the miner (offchain) sub-system.
-	Miner(unsigned::MinerError),
+	Miner(unsigned::MinerError<T>),
 	/// An error in the on-chain fallback.
 	OnChainFallback(onchain::Error),
 	/// An error happened in the data provider.
@@ -500,20 +500,20 @@ pub enum ElectionError {
 	NoFallbackConfigured,
 }
 
-impl From<onchain::Error> for ElectionError {
+impl<T: Config> From<onchain::Error> for ElectionError<T> {
 	fn from(e: onchain::Error) -> Self {
 		ElectionError::OnChainFallback(e)
 	}
 }
 
-impl From<FeasibilityError> for ElectionError {
+impl<T: Config> From<FeasibilityError> for ElectionError<T> {
 	fn from(e: FeasibilityError) -> Self {
 		ElectionError::Feasibility(e)
 	}
 }
 
-impl From<unsigned::MinerError> for ElectionError {
-	fn from(e: unsigned::MinerError) -> Self {
+impl<T: Config> From<unsigned::MinerError<T>> for ElectionError<T> {
+	fn from(e: unsigned::MinerError<T>) -> Self {
 		ElectionError::Miner(e)
 	}
 }
@@ -555,6 +555,7 @@ pub use pallet::*;
 #[frame_support::pallet]
 pub mod pallet {
 	use super::*;
+	use frame_election_provider_support::NposSolver;
 	use frame_support::{pallet_prelude::*, traits::EstimateCallFee};
 	use frame_system::pallet_prelude::*;
 
@@ -592,10 +593,6 @@ pub mod pallet {
 		/// The priority of the unsigned transaction submitted in the unsigned-phase
 		#[pallet::constant]
 		type MinerTxPriority: Get<TransactionPriority>;
-		/// Maximum number of iteration of balancing that will be executed in the embedded miner of
-		/// the pallet.
-		#[pallet::constant]
-		type MinerMaxIterations: Get<u32>;
 
 		/// Maximum weight that the miner should consume.
 		///
@@ -668,6 +665,9 @@ pub mod pallet {
 		/// Configuration for the fallback
 		type Fallback: Get<FallbackStrategy>;
 
+		/// OCW election solution miner algorithm implementation.
+		type Solver: NposSolver<AccountId = Self::AccountId>;
+
 		/// Origin that can control this pallet. Note that any action taken by this origin (such)
 		/// as providing an emergency solution is not checked. Thus, it must be a trusted origin.
 		type ForceOrigin: EnsureOrigin<Self::Origin>;
@@ -1298,7 +1298,7 @@ impl<T: Config> Pallet<T> {
 	///
 	/// Extracted for easier weight calculation.
 	fn create_snapshot_external(
-	) -> Result<(Vec<T::AccountId>, Vec<crate::unsigned::Voter<T>>, u32), ElectionError> {
+	) -> Result<(Vec<T::AccountId>, Vec<crate::unsigned::Voter<T>>, u32), ElectionError<T>> {
 		let target_limit = <SolutionTargetIndexOf<T>>::max_value().saturated_into::<usize>();
 		let voter_limit = <SolutionVoterIndexOf<T>>::max_value().saturated_into::<usize>();
 
@@ -1328,7 +1328,7 @@ impl<T: Config> Pallet<T> {
 	///
 	/// This is a *self-weighing* function, it will register its own extra weight as
 	/// [`DispatchClass::Mandatory`] with the system pallet.
-	pub fn create_snapshot() -> Result<(), ElectionError> {
+	pub fn create_snapshot() -> Result<(), ElectionError<T>> {
 		// this is self-weighing itself..
 		let (targets, voters, desired_targets) = Self::create_snapshot_external()?;
 
@@ -1471,7 +1471,7 @@ impl<T: Config> Pallet<T> {
 	}
 
 	/// On-chain fallback of election.
-	fn onchain_fallback() -> Result<Supports<T::AccountId>, ElectionError> {
+	fn onchain_fallback() -> Result<Supports<T::AccountId>, ElectionError<T>> {
 		<onchain::OnChainSequentialPhragmen<OnChainConfig<T>> as ElectionProvider<
 			T::AccountId,
 			T::BlockNumber,
@@ -1479,7 +1479,7 @@ impl<T: Config> Pallet<T> {
 		.map_err(Into::into)
 	}
 
-	fn do_elect() -> Result<Supports<T::AccountId>, ElectionError> {
+	fn do_elect() -> Result<Supports<T::AccountId>, ElectionError<T>> {
 		// We have to unconditionally try finalizing the signed phase here. There are only two
 		// possibilities:
 		//
@@ -1530,7 +1530,7 @@ impl<T: Config> Pallet<T> {
 }
 
 impl<T: Config> ElectionProvider<T::AccountId, T::BlockNumber> for Pallet<T> {
-	type Error = ElectionError;
+	type Error = ElectionError<T>;
 	type DataProvider = T::DataProvider;
 
 	fn elect() -> Result<Supports<T::AccountId>, Self::Error> {
@@ -2013,7 +2013,10 @@ mod tests {
 			roll_to(15);
 			assert_eq!(MultiPhase::current_phase(), Phase::Signed);
 
-			let (solution, _) = MultiPhase::mine_solution(2).unwrap();
+			// set the solution balancing to get the desired score.
+			crate::mock::Balancing::set(Some((2, 0)));
+
+			let (solution, _) = MultiPhase::mine_solution::<<Runtime as Config>::Solver>().unwrap();
 			// Default solution has a score of [50, 100, 5000].
 			assert_eq!(solution.score, [50, 100, 5000]);
 
diff --git a/frame/election-provider-multi-phase/src/mock.rs b/frame/election-provider-multi-phase/src/mock.rs
index 03dc6985f313..e63c171f4dcc 100644
--- a/frame/election-provider-multi-phase/src/mock.rs
+++ b/frame/election-provider-multi-phase/src/mock.rs
@@ -17,7 +17,7 @@
 
 use super::*;
 use crate as multi_phase;
-use frame_election_provider_support::{data_provider, ElectionDataProvider};
+use frame_election_provider_support::{data_provider, ElectionDataProvider, SequentialPhragmen};
 pub use frame_support::{assert_noop, assert_ok};
 use frame_support::{parameter_types, traits::Hooks, weights::Weight};
 use multi_phase::unsigned::{IndexAssignmentOf, Voter};
@@ -31,7 +31,7 @@ use sp_core::{
 };
 use sp_npos_elections::{
 	assignment_ratio_to_staked_normalized, seq_phragmen, to_supports, to_without_backing,
-	ElectionResult, EvaluateSupport, NposSolution,
+	ElectionResult, EvaluateSupport, ExtendedBalance, NposSolution,
 };
 use sp_runtime::{
 	testing::Header,
@@ -262,7 +262,6 @@ parameter_types! {
 	pub static SignedDepositWeight: Balance = 0;
 	pub static SignedRewardBase: Balance = 7;
 	pub static SignedMaxWeight: Weight = BlockWeights::get().max_block;
-	pub static MinerMaxIterations: u32 = 5;
 	pub static MinerTxPriority: u64 = 100;
 	pub static SolutionImprovementThreshold: Perbill = Perbill::zero();
 	pub static OffchainRepeat: BlockNumber = 5;
@@ -352,6 +351,10 @@ impl multi_phase::weights::WeightInfo for DualMockWeightInfo {
 	}
 }
 
+parameter_types! {
+	pub static Balancing: Option<(usize, ExtendedBalance)> = Some((0, 0));
+}
+
 impl crate::Config for Runtime {
 	type Event = Event;
 	type Currency = Balances;
@@ -360,7 +363,6 @@ impl crate::Config for Runtime {
 	type UnsignedPhase = UnsignedPhase;
 	type SolutionImprovementThreshold = SolutionImprovementThreshold;
 	type OffchainRepeat = OffchainRepeat;
-	type MinerMaxIterations = MinerMaxIterations;
 	type MinerMaxWeight = MinerMaxWeight;
 	type MinerMaxLength = MinerMaxLength;
 	type MinerTxPriority = MinerTxPriority;
@@ -379,6 +381,7 @@ impl crate::Config for Runtime {
 	type Fallback = Fallback;
 	type ForceOrigin = frame_system::EnsureRoot<AccountId>;
 	type Solution = TestNposSolution;
+	type Solver = SequentialPhragmen<AccountId, SolutionAccuracyOf<Runtime>, Balancing>;
 }
 
 impl<LocalCall> frame_system::offchain::SendTransactionTypes<LocalCall> for Runtime
diff --git a/frame/election-provider-multi-phase/src/signed.rs b/frame/election-provider-multi-phase/src/signed.rs
index 8e140fa857b8..f83d72827852 100644
--- a/frame/election-provider-multi-phase/src/signed.rs
+++ b/frame/election-provider-multi-phase/src/signed.rs
@@ -836,7 +836,8 @@ mod tests {
 				roll_to(15);
 				assert!(MultiPhase::current_phase().is_signed());
 
-				let (raw, witness) = MultiPhase::mine_solution(2).unwrap();
+				let (raw, witness) =
+					MultiPhase::mine_solution::<<Runtime as Config>::Solver>().unwrap();
 				let solution_weight = <Runtime as Config>::WeightInfo::feasibility_check(
 					witness.voters,
 					witness.targets,
diff --git a/frame/election-provider-multi-phase/src/unsigned.rs b/frame/election-provider-multi-phase/src/unsigned.rs
index aa01920fe490..86d3a471bb7d 100644
--- a/frame/election-provider-multi-phase/src/unsigned.rs
+++ b/frame/election-provider-multi-phase/src/unsigned.rs
@@ -22,17 +22,17 @@ use crate::{
 	ReadySolution, RoundSnapshot, SolutionAccuracyOf, SolutionOf, SolutionOrSnapshotSize, Weight,
 	WeightInfo,
 };
-use codec::{Decode, Encode};
+use codec::Encode;
+use frame_election_provider_support::{NposSolver, PerThing128};
 use frame_support::{dispatch::DispatchResult, ensure, traits::Get};
 use frame_system::offchain::SubmitTransaction;
 use sp_arithmetic::Perbill;
 use sp_npos_elections::{
 	assignment_ratio_to_staked_normalized, assignment_staked_to_ratio_normalized, is_score_better,
-	seq_phragmen, ElectionResult, NposSolution,
+	ElectionResult, NposSolution,
 };
 use sp_runtime::{
 	offchain::storage::{MutateStorageError, StorageValueRef},
-	traits::TrailingZeroInput,
 	DispatchError, SaturatedConversion,
 };
 use sp_std::{boxed::Box, cmp::Ordering, convert::TryFrom, vec::Vec};
@@ -61,8 +61,11 @@ pub type Assignment<T> =
 /// runtime `T`.
 pub type IndexAssignmentOf<T> = sp_npos_elections::IndexAssignmentOf<SolutionOf<T>>;
 
-#[derive(Debug, Eq, PartialEq)]
-pub enum MinerError {
+/// Error type of the pallet's [`crate::Config::Solver`].
+pub type SolverErrorOf<T> = <<T as Config>::Solver as NposSolver>::Error;
+/// Error type for operations related to the OCW npos solution miner.
+#[derive(frame_support::DebugNoBound, frame_support::PartialEqNoBound)]
+pub enum MinerError<T: Config> {
 	/// An internal error in the NPoS elections crate.
 	NposElections(sp_npos_elections::Error),
 	/// Snapshot data was unavailable unexpectedly.
@@ -83,22 +86,24 @@ pub enum MinerError {
 	FailedToStoreSolution,
 	/// There are no more voters to remove to trim the solution.
 	NoMoreVoters,
+	/// An error from the solver.
+	Solver(SolverErrorOf<T>),
 }
 
-impl From<sp_npos_elections::Error> for MinerError {
+impl<T: Config> From<sp_npos_elections::Error> for MinerError<T> {
 	fn from(e: sp_npos_elections::Error) -> Self {
 		MinerError::NposElections(e)
 	}
 }
 
-impl From<FeasibilityError> for MinerError {
+impl<T: Config> From<FeasibilityError> for MinerError<T> {
 	fn from(e: FeasibilityError) -> Self {
 		MinerError::Feasibility(e)
 	}
 }
 
 /// Save a given call into OCW storage.
-fn save_solution<T: Config>(call: &Call<T>) -> Result<(), MinerError> {
+fn save_solution<T: Config>(call: &Call<T>) -> Result<(), MinerError<T>> {
 	log!(debug, "saving a call to the offchain storage.");
 	let storage = StorageValueRef::persistent(&OFFCHAIN_CACHED_CALL);
 	match storage.mutate::<_, (), _>(|_| Ok(call.clone())) {
@@ -116,7 +121,7 @@ fn save_solution<T: Config>(call: &Call<T>) -> Result<(), MinerError> {
 }
 
 /// Get a saved solution from OCW storage if it exists.
-fn restore_solution<T: Config>() -> Result<Call<T>, MinerError> {
+fn restore_solution<T: Config>() -> Result<Call<T>, MinerError<T>> {
 	StorageValueRef::persistent(&OFFCHAIN_CACHED_CALL)
 		.get()
 		.ok()
@@ -149,7 +154,7 @@ fn ocw_solution_exists<T: Config>() -> bool {
 impl<T: Config> Pallet<T> {
 	/// Attempt to restore a solution from cache. Otherwise, compute it fresh. Either way, submit
 	/// if our call's score is greater than that of the cached solution.
-	pub fn restore_or_compute_then_maybe_submit() -> Result<(), MinerError> {
+	pub fn restore_or_compute_then_maybe_submit() -> Result<(), MinerError<T>> {
 		log!(debug, "miner attempting to restore or compute an unsigned solution.");
 
 		let call = restore_solution::<T>()
@@ -163,7 +168,7 @@ impl<T: Config> Pallet<T> {
 					Err(MinerError::SolutionCallInvalid)
 				}
 			})
-			.or_else::<MinerError, _>(|error| {
+			.or_else::<MinerError<T>, _>(|error| {
 				log!(debug, "restoring solution failed due to {:?}", error);
 				match error {
 					MinerError::NoStoredSolution => {
@@ -194,7 +199,7 @@ impl<T: Config> Pallet<T> {
 	}
 
 	/// Mine a new solution, cache it, and submit it back to the chain as an unsigned transaction.
-	pub fn mine_check_save_submit() -> Result<(), MinerError> {
+	pub fn mine_check_save_submit() -> Result<(), MinerError<T>> {
 		log!(debug, "miner attempting to compute an unsigned solution.");
 
 		let call = Self::mine_checked_call()?;
@@ -203,10 +208,9 @@ impl<T: Config> Pallet<T> {
 	}
 
 	/// Mine a new solution as a call. Performs all checks.
-	pub fn mine_checked_call() -> Result<Call<T>, MinerError> {
-		let iters = Self::get_balancing_iters();
+	pub fn mine_checked_call() -> Result<Call<T>, MinerError<T>> {
 		// get the solution, with a load of checks to ensure if submitted, IT IS ABSOLUTELY VALID.
-		let (raw_solution, witness) = Self::mine_and_check(iters)?;
+		let (raw_solution, witness) = Self::mine_and_check()?;
 
 		let score = raw_solution.score.clone();
 		let call: Call<T> = Call::submit_unsigned(Box::new(raw_solution), witness).into();
@@ -221,7 +225,7 @@ impl<T: Config> Pallet<T> {
 		Ok(call)
 	}
 
-	fn submit_call(call: Call<T>) -> Result<(), MinerError> {
+	fn submit_call(call: Call<T>) -> Result<(), MinerError<T>> {
 		log!(debug, "miner submitting a solution as an unsigned transaction");
 
 		SubmitTransaction::<T, Call<T>>::submit_unsigned_transaction(call.into())
@@ -234,7 +238,7 @@ impl<T: Config> Pallet<T> {
 	pub fn basic_checks(
 		raw_solution: &RawSolution<SolutionOf<T>>,
 		solution_type: &str,
-	) -> Result<(), MinerError> {
+	) -> Result<(), MinerError<T>> {
 		Self::unsigned_pre_dispatch_checks(raw_solution).map_err(|err| {
 			log!(debug, "pre-dispatch checks failed for {} solution: {:?}", solution_type, err);
 			MinerError::PreDispatchChecksFailed(err)
@@ -257,38 +261,37 @@ impl<T: Config> Pallet<T> {
 	/// If you want a checked solution and submit it at the same time, use
 	/// [`Pallet::mine_check_save_submit`].
 	pub fn mine_and_check(
-		iters: usize,
-	) -> Result<(RawSolution<SolutionOf<T>>, SolutionOrSnapshotSize), MinerError> {
-		let (raw_solution, witness) = Self::mine_solution(iters)?;
+	) -> Result<(RawSolution<SolutionOf<T>>, SolutionOrSnapshotSize), MinerError<T>> {
+		let (raw_solution, witness) = Self::mine_solution::<T::Solver>()?;
 		Self::basic_checks(&raw_solution, "mined")?;
 		Ok((raw_solution, witness))
 	}
 
 	/// Mine a new npos solution.
-	pub fn mine_solution(
-		iters: usize,
-	) -> Result<(RawSolution<SolutionOf<T>>, SolutionOrSnapshotSize), MinerError> {
+	///
+	/// The Npos Solver type, `S`, must have the same AccountId and Error type as the
+	/// [`crate::Config::Solver`] in order to create a unified return type.
+	pub fn mine_solution<S>(
+	) -> Result<(RawSolution<SolutionOf<T>>, SolutionOrSnapshotSize), MinerError<T>>
+	where
+		S: NposSolver<AccountId = T::AccountId, Error = SolverErrorOf<T>>,
+	{
 		let RoundSnapshot { voters, targets } =
 			Self::snapshot().ok_or(MinerError::SnapshotUnAvailable)?;
 		let desired_targets = Self::desired_targets().ok_or(MinerError::SnapshotUnAvailable)?;
 
-		seq_phragmen::<_, SolutionAccuracyOf<T>>(
-			desired_targets as usize,
-			targets,
-			voters,
-			Some((iters, 0)),
-		)
-		.map_err(Into::into)
-		.and_then(Self::prepare_election_result)
+		S::solve(desired_targets as usize, targets, voters)
+			.map_err(|e| MinerError::Solver::<T>(e))
+			.and_then(|e| Self::prepare_election_result::<S::Accuracy>(e))
 	}
 
 	/// Convert a raw solution from [`sp_npos_elections::ElectionResult`] to [`RawSolution`], which
 	/// is ready to be submitted to the chain.
 	///
 	/// Will always reduce the solution as well.
-	pub fn prepare_election_result(
-		election_result: ElectionResult<T::AccountId, SolutionAccuracyOf<T>>,
-	) -> Result<(RawSolution<SolutionOf<T>>, SolutionOrSnapshotSize), MinerError> {
+	pub fn prepare_election_result<Accuracy: PerThing128>(
+		election_result: ElectionResult<T::AccountId, Accuracy>,
+	) -> Result<(RawSolution<SolutionOf<T>>, SolutionOrSnapshotSize), MinerError<T>> {
 		// NOTE: This code path is generally not optimized as it is run offchain. Could use some at
 		// some point though.
 
@@ -378,23 +381,6 @@ impl<T: Config> Pallet<T> {
 		Ok((RawSolution { solution, score, round }, size))
 	}
 
-	/// Get a random number of iterations to run the balancing in the OCW.
-	///
-	/// Uses the offchain seed to generate a random number, maxed with
-	/// [`Config::MinerMaxIterations`].
-	pub fn get_balancing_iters() -> usize {
-		match T::MinerMaxIterations::get() {
-			0 => 0,
-			max @ _ => {
-				let seed = sp_io::offchain::random_seed();
-				let random = <u32>::decode(&mut TrailingZeroInput::new(seed.as_ref()))
-					.expect("input is padded with zeroes; qed") %
-					max.saturating_add(1);
-				random as usize
-			},
-		}
-	}
-
 	/// Greedily reduce the size of the solution to fit into the block w.r.t. weight.
 	///
 	/// The weight of the solution is foremost a function of the number of voters (i.e.
@@ -448,7 +434,7 @@ impl<T: Config> Pallet<T> {
 		max_allowed_length: u32,
 		assignments: &mut Vec<IndexAssignmentOf<T>>,
 		encoded_size_of: impl Fn(&[IndexAssignmentOf<T>]) -> Result<usize, sp_npos_elections::Error>,
-	) -> Result<(), MinerError> {
+	) -> Result<(), MinerError<T>> {
 		// Perform a binary search for the max subset of which can fit into the allowed
 		// length. Having discovered that, we can truncate efficiently.
 		let max_allowed_length: usize = max_allowed_length.saturated_into();
@@ -584,7 +570,7 @@ impl<T: Config> Pallet<T> {
 	///
 	/// Returns `Ok(())` if offchain worker limit is respected, `Err(reason)` otherwise. If `Ok()`
 	/// is returned, `now` is written in storage and will be used in further calls as the baseline.
-	pub fn ensure_offchain_repeat_frequency(now: T::BlockNumber) -> Result<(), MinerError> {
+	pub fn ensure_offchain_repeat_frequency(now: T::BlockNumber) -> Result<(), MinerError<T>> {
 		let threshold = T::OffchainRepeat::get();
 		let last_block = StorageValueRef::persistent(&OFFCHAIN_LAST_BLOCK);
 
@@ -761,6 +747,7 @@ mod tests {
 		CurrentPhase, InvalidTransaction, Phase, QueuedSolution, TransactionSource,
 		TransactionValidityError,
 	};
+	use codec::Decode;
 	use frame_benchmarking::Zero;
 	use frame_support::{assert_noop, assert_ok, dispatch::Dispatchable, traits::OffchainWorker};
 	use sp_npos_elections::IndexAssignment;
@@ -975,7 +962,8 @@ mod tests {
 			assert_eq!(MultiPhase::desired_targets().unwrap(), 2);
 
 			// mine seq_phragmen solution with 2 iters.
-			let (solution, witness) = MultiPhase::mine_solution(2).unwrap();
+			let (solution, witness) =
+				MultiPhase::mine_solution::<<Runtime as Config>::Solver>().unwrap();
 
 			// ensure this solution is valid.
 			assert!(MultiPhase::queued_solution().is_none());
@@ -993,7 +981,8 @@ mod tests {
 				roll_to(25);
 				assert!(MultiPhase::current_phase().is_unsigned());
 
-				let (raw, witness) = MultiPhase::mine_solution(2).unwrap();
+				let (raw, witness) =
+					MultiPhase::mine_solution::<<Runtime as Config>::Solver>().unwrap();
 				let solution_weight = <Runtime as Config>::WeightInfo::submit_unsigned(
 					witness.voters,
 					witness.targets,
@@ -1007,7 +996,8 @@ mod tests {
 				// now reduce the max weight
 				<MinerMaxWeight>::set(25);
 
-				let (raw, witness) = MultiPhase::mine_solution(2).unwrap();
+				let (raw, witness) =
+					MultiPhase::mine_solution::<<Runtime as Config>::Solver>().unwrap();
 				let solution_weight = <Runtime as Config>::WeightInfo::submit_unsigned(
 					witness.voters,
 					witness.targets,
@@ -1359,7 +1349,7 @@ mod tests {
 			// OCW must have submitted now
 
 			let encoded = pool.read().transactions[0].clone();
-			let extrinsic: Extrinsic = Decode::decode(&mut &*encoded).unwrap();
+			let extrinsic: Extrinsic = codec::Decode::decode(&mut &*encoded).unwrap();
 			let call = extrinsic.call;
 			assert!(matches!(call, OuterCall::MultiPhase(Call::submit_unsigned(..))));
 		})
@@ -1534,14 +1524,14 @@ mod tests {
 			roll_to(25);
 
 			// how long would the default solution be?
-			let solution = MultiPhase::mine_solution(0).unwrap();
+			let solution = MultiPhase::mine_solution::<<Runtime as Config>::Solver>().unwrap();
 			let max_length = <Runtime as Config>::MinerMaxLength::get();
 			let solution_size = solution.0.solution.encoded_size();
 			assert!(solution_size <= max_length as usize);
 
 			// now set the max size to less than the actual size and regenerate
 			<Runtime as Config>::MinerMaxLength::set(solution_size as u32 - 1);
-			let solution = MultiPhase::mine_solution(0).unwrap();
+			let solution = MultiPhase::mine_solution::<<Runtime as Config>::Solver>().unwrap();
 			let max_length = <Runtime as Config>::MinerMaxLength::get();
 			let solution_size = solution.0.solution.encoded_size();
 			assert!(solution_size <= max_length as usize);
diff --git a/frame/election-provider-support/src/lib.rs b/frame/election-provider-support/src/lib.rs
index f2d11911c9b3..d2c4b1053cc6 100644
--- a/frame/election-provider-support/src/lib.rs
+++ b/frame/election-provider-support/src/lib.rs
@@ -161,12 +161,14 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 pub mod onchain;
+use frame_support::traits::Get;
 use sp_std::{fmt::Debug, prelude::*};
 
 /// Re-export some type as they are used in the interface.
 pub use sp_arithmetic::PerThing;
 pub use sp_npos_elections::{
-	Assignment, ExtendedBalance, PerThing128, Support, Supports, VoteWeight,
+	Assignment, ElectionResult, ExtendedBalance, IdentifierT, PerThing128, Support, Supports,
+	VoteWeight,
 };
 
 /// Types that are used by the data provider trait.
@@ -294,3 +296,69 @@ impl<AccountId, BlockNumber> ElectionProvider<AccountId, BlockNumber> for () {
 		Err("<() as ElectionProvider> cannot do anything.")
 	}
 }
+
+/// Something that can compute the result to an NPoS solution.
+pub trait NposSolver {
+	/// The account identifier type of this solver.
+	type AccountId: sp_npos_elections::IdentifierT;
+	/// The accuracy of this solver. This will affect the accuracy of the output.
+	type Accuracy: PerThing128;
+	/// The error type of this implementation.
+	type Error: sp_std::fmt::Debug + sp_std::cmp::PartialEq;
+
+	/// Solve an NPoS solution with the given `voters`, `targets`, and select `to_elect` count
+	/// of `targets`.
+	fn solve(
+		to_elect: usize,
+		targets: Vec<Self::AccountId>,
+		voters: Vec<(Self::AccountId, VoteWeight, Vec<Self::AccountId>)>,
+	) -> Result<ElectionResult<Self::AccountId, Self::Accuracy>, Self::Error>;
+}
+
+/// A wrapper for [`sp_npos_elections::seq_phragmen`] that implements [`super::NposSolver`]. See the
+/// documentation of [`sp_npos_elections::seq_phragmen`] for more info.
+pub struct SequentialPhragmen<AccountId, Accuracy, Balancing = ()>(
+	sp_std::marker::PhantomData<(AccountId, Accuracy, Balancing)>,
+);
+
+impl<
+		AccountId: IdentifierT,
+		Accuracy: PerThing128,
+		Balancing: Get<Option<(usize, ExtendedBalance)>>,
+	> NposSolver for SequentialPhragmen<AccountId, Accuracy, Balancing>
+{
+	type AccountId = AccountId;
+	type Accuracy = Accuracy;
+	type Error = sp_npos_elections::Error;
+	fn solve(
+		winners: usize,
+		targets: Vec<Self::AccountId>,
+		voters: Vec<(Self::AccountId, VoteWeight, Vec<Self::AccountId>)>,
+	) -> Result<ElectionResult<Self::AccountId, Self::Accuracy>, Self::Error> {
+		sp_npos_elections::seq_phragmen(winners, targets, voters, Balancing::get())
+	}
+}
+
+/// A wrapper for [`sp_npos_elections::phragmms`] that implements [`NposSolver`]. See the
+/// documentation of [`sp_npos_elections::phragmms`] for more info.
+pub struct PhragMMS<AccountId, Accuracy, Balancing = ()>(
+	sp_std::marker::PhantomData<(AccountId, Accuracy, Balancing)>,
+);
+
+impl<
+		AccountId: IdentifierT,
+		Accuracy: PerThing128,
+		Balancing: Get<Option<(usize, ExtendedBalance)>>,
+	> NposSolver for PhragMMS<AccountId, Accuracy, Balancing>
+{
+	type AccountId = AccountId;
+	type Accuracy = Accuracy;
+	type Error = sp_npos_elections::Error;
+	fn solve(
+		winners: usize,
+		targets: Vec<Self::AccountId>,
+		voters: Vec<(Self::AccountId, VoteWeight, Vec<Self::AccountId>)>,
+	) -> Result<ElectionResult<Self::AccountId, Self::Accuracy>, Self::Error> {
+		sp_npos_elections::phragmms(winners, targets, voters, Balancing::get())
+	}
+}
diff --git a/primitives/npos-elections/Cargo.toml b/primitives/npos-elections/Cargo.toml
index 0d1834a94ad9..5c6e5c1b13d5 100644
--- a/primitives/npos-elections/Cargo.toml
+++ b/primitives/npos-elections/Cargo.toml
@@ -19,11 +19,11 @@ sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
 sp-npos-elections-solution-type = { version = "4.0.0-dev", path = "./solution-type" }
 sp-arithmetic = { version = "4.0.0-dev", default-features = false, path = "../arithmetic" }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../core" }
+sp-runtime = { version = "4.0.0-dev", path = "../runtime", default-features = false }
 
 [dev-dependencies]
 substrate-test-utils = { version = "4.0.0-dev", path = "../../test-utils" }
 rand = "0.7.3"
-sp-runtime = { version = "4.0.0-dev", path = "../runtime" }
 
 [features]
 default = ["std"]
@@ -34,4 +34,5 @@ std = [
 	"sp-std/std",
 	"sp-arithmetic/std",
 	"sp-core/std",
+	"sp-runtime/std",
 ]
diff --git a/primitives/npos-elections/src/phragmen.rs b/primitives/npos-elections/src/phragmen.rs
index 0f9b14491976..5ed472284351 100644
--- a/primitives/npos-elections/src/phragmen.rs
+++ b/primitives/npos-elections/src/phragmen.rs
@@ -68,16 +68,16 @@ const DEN: ExtendedBalance = ExtendedBalance::max_value();
 /// check where t is the standard threshold. The underlying algorithm is sound, but the conversions
 /// between numeric types can be lossy.
 pub fn seq_phragmen<AccountId: IdentifierT, P: PerThing128>(
-	rounds: usize,
-	initial_candidates: Vec<AccountId>,
-	initial_voters: Vec<(AccountId, VoteWeight, Vec<AccountId>)>,
-	balance: Option<(usize, ExtendedBalance)>,
+	to_elect: usize,
+	candidates: Vec<AccountId>,
+	voters: Vec<(AccountId, VoteWeight, Vec<AccountId>)>,
+	balancing: Option<(usize, ExtendedBalance)>,
 ) -> Result<ElectionResult<AccountId, P>, crate::Error> {
-	let (candidates, voters) = setup_inputs(initial_candidates, initial_voters);
+	let (candidates, voters) = setup_inputs(candidates, voters);
 
-	let (candidates, mut voters) = seq_phragmen_core::<AccountId>(rounds, candidates, voters)?;
+	let (candidates, mut voters) = seq_phragmen_core::<AccountId>(to_elect, candidates, voters)?;
 
-	if let Some((iterations, tolerance)) = balance {
+	if let Some((iterations, tolerance)) = balancing {
 		// NOTE: might create zero-edges, but we will strip them again when we convert voter into
 		// assignment.
 		let _iters = balancing::balance::<AccountId>(&mut voters, iterations, tolerance);
@@ -87,7 +87,7 @@ pub fn seq_phragmen<AccountId: IdentifierT, P: PerThing128>(
 		.into_iter()
 		.filter(|c_ptr| c_ptr.borrow().elected)
 		// defensive only: seq-phragmen-core returns only up to rounds.
-		.take(rounds)
+		.take(to_elect)
 		.collect::<Vec<_>>();
 
 	// sort winners based on desirability.
@@ -116,12 +116,12 @@ pub fn seq_phragmen<AccountId: IdentifierT, P: PerThing128>(
 /// This can only fail if the normalization fails.
 // To create the inputs needed for this function, see [`crate::setup_inputs`].
 pub fn seq_phragmen_core<AccountId: IdentifierT>(
-	rounds: usize,
+	to_elect: usize,
 	candidates: Vec<CandidatePtr<AccountId>>,
 	mut voters: Vec<Voter<AccountId>>,
 ) -> Result<(Vec<CandidatePtr<AccountId>>, Vec<Voter<AccountId>>), crate::Error> {
 	// we have already checked that we have more candidates than minimum_candidate_count.
-	let to_elect = rounds.min(candidates.len());
+	let to_elect = to_elect.min(candidates.len());
 
 	// main election loop
 	for round in 0..to_elect {
diff --git a/primitives/npos-elections/src/phragmms.rs b/primitives/npos-elections/src/phragmms.rs
index 4e7316d5778b..e9135a13190c 100644
--- a/primitives/npos-elections/src/phragmms.rs
+++ b/primitives/npos-elections/src/phragmms.rs
@@ -43,11 +43,11 @@ use sp_std::{prelude::*, rc::Rc};
 /// `expect` this to return `Ok`.
 pub fn phragmms<AccountId: IdentifierT, P: PerThing128>(
 	to_elect: usize,
-	initial_candidates: Vec<AccountId>,
-	initial_voters: Vec<(AccountId, VoteWeight, Vec<AccountId>)>,
-	balancing_config: Option<(usize, ExtendedBalance)>,
-) -> Result<ElectionResult<AccountId, P>, &'static str> {
-	let (candidates, mut voters) = setup_inputs(initial_candidates, initial_voters);
+	candidates: Vec<AccountId>,
+	voters: Vec<(AccountId, VoteWeight, Vec<AccountId>)>,
+	balancing: Option<(usize, ExtendedBalance)>,
+) -> Result<ElectionResult<AccountId, P>, crate::Error> {
+	let (candidates, mut voters) = setup_inputs(candidates, voters);
 
 	let mut winners = vec![];
 	for round in 0..to_elect {
@@ -58,7 +58,7 @@ pub fn phragmms<AccountId: IdentifierT, P: PerThing128>(
 			round_winner.borrow_mut().elected = true;
 			winners.push(round_winner);
 
-			if let Some((iterations, tolerance)) = balancing_config {
+			if let Some((iterations, tolerance)) = balancing {
 				balance(&mut voters, iterations, tolerance);
 			}
 		} else {
@@ -68,7 +68,11 @@ pub fn phragmms<AccountId: IdentifierT, P: PerThing128>(
 
 	let mut assignments =
 		voters.into_iter().filter_map(|v| v.into_assignment()).collect::<Vec<_>>();
-	let _ = assignments.iter_mut().map(|a| a.try_normalize()).collect::<Result<(), _>>()?;
+	let _ = assignments
+		.iter_mut()
+		.map(|a| a.try_normalize())
+		.collect::<Result<(), _>>()
+		.map_err(|e| crate::Error::ArithmeticError(e))?;
 	let winners = winners
 		.into_iter()
 		.map(|w_ptr| (w_ptr.borrow().who.clone(), w_ptr.borrow().backed_stake))

From 558a68f8328a004f153496a192c3ac9723c763c3 Mon Sep 17 00:00:00 2001
From: Sergejs Kostjucenko <85877331+sergejparity@users.noreply.github.com>
Date: Fri, 10 Sep 2021 11:27:48 +0300
Subject: [PATCH 1163/1194] Change ci pipeline to use vault secrets (#9662)

---
 .gitlab-ci.yml | 78 ++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 75 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 74ed64315d62..bfdb5bb3d092 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,6 +42,9 @@ variables:                         &default-vars
   # FIXME set to release
   CARGO_UNLEASH_INSTALL_PARAMS:    "--version 1.0.0-alpha.12"
   CARGO_UNLEASH_PKG_DEF:           "--skip node node-* pallet-template pallet-example pallet-example-* subkey chain-spec-builder"
+  VAULT_SERVER_URL:                "https://vault.parity-mgmt-vault.parity.io"
+  VAULT_AUTH_PATH:                 "gitlab-parity-io-jwt"
+  VAULT_AUTH_ROLE:                 "cicd_gitlab_parity_${CI_PROJECT_NAME}"
 
 default:
   cache:                           {}
@@ -165,11 +168,70 @@ default:
     | tee artifacts/benches/$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA/::trie::read::small.json'
   - sccache -s
 
+#### Vault secrets
+.vault-secrets:                    &vault-secrets
+  secrets:
+    DOCKER_HUB_USER:
+      vault:                       cicd/gitlab/parity/DOCKER_HUB_USER@kv
+      file:                        false
+    DOCKER_HUB_PASS:
+      vault:                       cicd/gitlab/parity/DOCKER_HUB_PASS@kv
+      file:                        false
+    GITHUB_PR_TOKEN:
+      vault:                       cicd/gitlab/parity/GITHUB_PR_TOKEN@kv
+      file:                        false
+    AWS_ACCESS_KEY_ID:
+      vault:                       cicd/gitlab/$CI_PROJECT_PATH/AWS_ACCESS_KEY_ID@kv
+      file:                        false
+    AWS_SECRET_ACCESS_KEY:
+      vault:                       cicd/gitlab/$CI_PROJECT_PATH/AWS_SECRET_ACCESS_KEY@kv
+      file:                        false
+    AWX_TOKEN:
+      vault:                       cicd/gitlab/$CI_PROJECT_PATH/AWX_TOKEN@kv
+      file:                        false    
+    CRATES_TOKEN:
+      vault:                       cicd/gitlab/$CI_PROJECT_PATH/CRATES_TOKEN@kv
+      file:                        false
+    DOCKER_CHAOS_TOKEN:
+      vault:                       cicd/gitlab/$CI_PROJECT_PATH/DOCKER_CHAOS_TOKEN@kv
+      file:                        false   
+    DOCKER_CHAOS_USER:
+      vault:                       cicd/gitlab/$CI_PROJECT_PATH/DOCKER_CHAOS_USER@kv
+      file:                        false
+    GITHUB_EMAIL:
+      vault:                       cicd/gitlab/$CI_PROJECT_PATH/GITHUB_EMAIL@kv
+      file:                        false
+    GITHUB_RELEASE_TOKEN:
+      vault:                       cicd/gitlab/$CI_PROJECT_PATH/GITHUB_RELEASE_TOKEN@kv
+      file:                        false
+    GITHUB_TOKEN:
+      vault:                       cicd/gitlab/$CI_PROJECT_PATH/GITHUB_TOKEN@kv
+      file:                        false
+    GITHUB_USER:
+      vault:                       cicd/gitlab/$CI_PROJECT_PATH/GITHUB_USER@kv
+      file:                        false
+    MATRIX_ACCESS_TOKEN:
+      vault:                       cicd/gitlab/$CI_PROJECT_PATH/MATRIX_ACCESS_TOKEN@kv
+      file:                        false
+    MATRIX_ROOM_ID:
+      vault:                       cicd/gitlab/$CI_PROJECT_PATH/MATRIX_ROOM_ID@kv
+      file:                        false
+    PIPELINE_TOKEN:
+      vault:                       cicd/gitlab/$CI_PROJECT_PATH/PIPELINE_TOKEN@kv
+      file:                        false
+    VALIDATOR_KEYS:
+      vault:                       cicd/gitlab/$CI_PROJECT_PATH/VALIDATOR_KEYS@kv
+      file:                        false
+    VALIDATOR_KEYS_CHAOS:
+      vault:                       cicd/gitlab/$CI_PROJECT_PATH/VALIDATOR_KEYS_CHAOS@kv
+      file:                        false
+
 #### stage:                       .pre
 
 skip-if-draft:
   image:                           paritytech/tools:latest
   <<:                              *kubernetes-env
+  <<:                              *vault-secrets
   stage:                           .pre
   rules:
     - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
@@ -185,6 +247,7 @@ check-runtime:
   stage:                           check
   image:                           paritytech/tools:latest
   <<:                              *kubernetes-env
+  <<:                              *vault-secrets
   rules:
     - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
   variables:
@@ -199,6 +262,7 @@ check-signed-tag:
   stage:                           check
   image:                           paritytech/tools:latest
   <<:                              *kubernetes-env
+  <<:                              *vault-secrets
   rules:
     - if: $CI_COMMIT_REF_NAME =~ /^ci-release-.*$/
     - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
@@ -472,6 +536,7 @@ check-polkadot-companion-status:
   stage:                           build
   image:                           paritytech/tools:latest
   <<:                              *kubernetes-env
+  <<:                              *vault-secrets
   rules:
     - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
   script:
@@ -481,6 +546,7 @@ check-polkadot-companion-build:
   stage:                           build
   <<:                              *docker-env
   <<:                              *test-refs-no-trigger
+  <<:                              *vault-secrets
   needs:
     - job:                         test-linux-stable-int
       artifacts:                   false
@@ -574,6 +640,7 @@ build-rustdoc:
 .build-push-docker-image:          &build-push-docker-image
   <<:                              *build-refs
   <<:                              *kubernetes-env
+  <<:                              *vault-secrets
   image:                           quay.io/buildah/stable
   variables:                       &docker-build-vars
     <<:                            *default-vars
@@ -586,7 +653,7 @@ build-rustdoc:
     - echo "${PRODUCT} version = ${VERSION}"
     - test -z "${VERSION}" && exit 1
   script:
-    - test "$Docker_Hub_User_Parity" -a "$Docker_Hub_Pass_Parity" ||
+    - test "$DOCKER_HUB_USER" -a "$DOCKER_HUB_PASS" ||
         ( echo "no docker credentials provided"; exit 1 )
     - buildah bud
         --format=docker
@@ -595,8 +662,8 @@ build-rustdoc:
         --tag "$IMAGE_NAME:$VERSION"
         --tag "$IMAGE_NAME:latest"
         --file "$DOCKERFILE" .
-    - echo "$Docker_Hub_Pass_Parity" |
-        buildah login --username "$Docker_Hub_User_Parity" --password-stdin docker.io
+    - echo "$DOCKER_HUB_USER" |
+        buildah login --username "$DOCKER_HUB_PASS" --password-stdin docker.io
     - buildah info
     - buildah push --format=v2s2 "$IMAGE_NAME:$VERSION"
     - buildah push --format=v2s2 "$IMAGE_NAME:latest"
@@ -638,6 +705,7 @@ publish-s3-release:
   stage:                           publish
   <<:                              *build-refs
   <<:                              *kubernetes-env
+  <<:                              *vault-secrets
   needs:
     - job:                         build-linux-substrate
       artifacts:                   true
@@ -659,6 +727,7 @@ publish-s3-release:
 publish-rustdoc:
   stage:                           publish
   <<:                              *kubernetes-env
+  <<:                              *vault-secrets
   image:                           paritytech/tools:latest
   variables:
     GIT_DEPTH:                     100
@@ -702,6 +771,7 @@ publish-rustdoc:
 
 publish-draft-release:
   stage:                           publish
+  <<:                              *vault-secrets
   image:                           paritytech/tools:latest
   rules:
     - if: $CI_COMMIT_REF_NAME =~ /^ci-release-.*$/
@@ -713,6 +783,7 @@ publish-draft-release:
 unleash-to-crates-io:
   stage:                           publish
   <<:                              *docker-env
+  <<:                              *vault-secrets
   rules:
     - if: $CI_COMMIT_REF_NAME =~ /^ci-release-.*$/
     # FIXME: wait until https://github.com/paritytech/cargo-unleash/issues/50 is fixed, also
@@ -754,6 +825,7 @@ simnet-tests:
   stage:                           deploy
   image:                           docker.io/paritytech/simnet:${SIMNET_REF}
   <<:                              *kubernetes-env
+  <<:                              *vault-secrets
   rules:
     - if: $CI_PIPELINE_SOURCE == "pipeline"
       when: never

From 873e6b1de9082acebfec1de425b497b631e65bb1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 10 Sep 2021 10:56:14 +0000
Subject: [PATCH 1164/1194] Bump proc-macro2 from 1.0.28 to 1.0.29 (#9741)

Bumps [proc-macro2](https://github.com/alexcrichton/proc-macro2) from 1.0.28 to 1.0.29.
- [Release notes](https://github.com/alexcrichton/proc-macro2/releases)
- [Commits](https://github.com/alexcrichton/proc-macro2/compare/1.0.28...1.0.29)

---
updated-dependencies:
- dependency-name: proc-macro2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                                         | 4 ++--
 client/chain-spec/derive/Cargo.toml                | 2 +-
 client/tracing/proc-macro/Cargo.toml               | 2 +-
 frame/staking/reward-curve/Cargo.toml              | 2 +-
 frame/support/procedural/Cargo.toml                | 2 +-
 frame/support/procedural/tools/Cargo.toml          | 2 +-
 frame/support/procedural/tools/derive/Cargo.toml   | 2 +-
 primitives/api/proc-macro/Cargo.toml               | 2 +-
 primitives/npos-elections/solution-type/Cargo.toml | 2 +-
 primitives/runtime-interface/proc-macro/Cargo.toml | 2 +-
 primitives/version/proc-macro/Cargo.toml           | 2 +-
 test-utils/derive/Cargo.toml                       | 2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 61863994c60c..11fe02cf6a3a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6448,9 +6448,9 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.28"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612"
+checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d"
 dependencies = [
  "unicode-xid",
 ]
diff --git a/client/chain-spec/derive/Cargo.toml b/client/chain-spec/derive/Cargo.toml
index 9fd4d34587fd..b210fa1320e0 100644
--- a/client/chain-spec/derive/Cargo.toml
+++ b/client/chain-spec/derive/Cargo.toml
@@ -16,7 +16,7 @@ proc-macro = true
 
 [dependencies]
 proc-macro-crate = "1.0.0"
-proc-macro2 = "1.0.28"
+proc-macro2 = "1.0.29"
 quote = "1.0.3"
 syn = "1.0.58"
 
diff --git a/client/tracing/proc-macro/Cargo.toml b/client/tracing/proc-macro/Cargo.toml
index f88baad132a7..002370b515f2 100644
--- a/client/tracing/proc-macro/Cargo.toml
+++ b/client/tracing/proc-macro/Cargo.toml
@@ -16,6 +16,6 @@ proc-macro = true
 
 [dependencies]
 proc-macro-crate = "1.0.0"
-proc-macro2 = "1.0.28"
+proc-macro2 = "1.0.29"
 quote = { version = "1.0.3", features = ["proc-macro"] }
 syn = { version = "1.0.58", features = ["proc-macro", "full", "extra-traits", "parsing"] }
diff --git a/frame/staking/reward-curve/Cargo.toml b/frame/staking/reward-curve/Cargo.toml
index 035bc0a59c95..4cbc2473cb52 100644
--- a/frame/staking/reward-curve/Cargo.toml
+++ b/frame/staking/reward-curve/Cargo.toml
@@ -17,7 +17,7 @@ proc-macro = true
 [dependencies]
 syn = { version = "1.0.58", features = ["full", "visit"] }
 quote = "1.0.3"
-proc-macro2 = "1.0.28"
+proc-macro2 = "1.0.29"
 proc-macro-crate = "1.0.0"
 
 [dev-dependencies]
diff --git a/frame/support/procedural/Cargo.toml b/frame/support/procedural/Cargo.toml
index df57ccf2285b..e1ff6dcf39b7 100644
--- a/frame/support/procedural/Cargo.toml
+++ b/frame/support/procedural/Cargo.toml
@@ -16,7 +16,7 @@ proc-macro = true
 
 [dependencies]
 frame-support-procedural-tools = { version = "4.0.0-dev", path = "./tools" }
-proc-macro2 = "1.0.28"
+proc-macro2 = "1.0.29"
 quote = "1.0.3"
 Inflector = "0.11.4"
 syn = { version = "1.0.58", features = ["full"] }
diff --git a/frame/support/procedural/tools/Cargo.toml b/frame/support/procedural/tools/Cargo.toml
index 4c21cf00b9f0..ee59f53287ef 100644
--- a/frame/support/procedural/tools/Cargo.toml
+++ b/frame/support/procedural/tools/Cargo.toml
@@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 frame-support-procedural-tools-derive = { version = "3.0.0", path = "./derive" }
-proc-macro2 = "1.0.28"
+proc-macro2 = "1.0.29"
 quote = "1.0.3"
 syn = { version = "1.0.58", features = ["full", "visit", "extra-traits"] }
 proc-macro-crate = "1.0.0"
diff --git a/frame/support/procedural/tools/derive/Cargo.toml b/frame/support/procedural/tools/derive/Cargo.toml
index 349bbc8e8267..12ec6a69f396 100644
--- a/frame/support/procedural/tools/derive/Cargo.toml
+++ b/frame/support/procedural/tools/derive/Cargo.toml
@@ -15,6 +15,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 proc-macro = true
 
 [dependencies]
-proc-macro2 = "1.0.28"
+proc-macro2 = "1.0.29"
 quote = { version = "1.0.3", features = ["proc-macro"] }
 syn = { version = "1.0.58", features = ["proc-macro" ,"full", "extra-traits", "parsing"] }
diff --git a/primitives/api/proc-macro/Cargo.toml b/primitives/api/proc-macro/Cargo.toml
index 045c848a2cdb..d5909967ac5a 100644
--- a/primitives/api/proc-macro/Cargo.toml
+++ b/primitives/api/proc-macro/Cargo.toml
@@ -18,7 +18,7 @@ proc-macro = true
 [dependencies]
 quote = "1.0.3"
 syn = { version = "1.0.58", features = ["full", "fold", "extra-traits", "visit"] }
-proc-macro2 = "1.0.28"
+proc-macro2 = "1.0.29"
 blake2-rfc = { version = "0.2.18", default-features = false }
 proc-macro-crate = "1.0.0"
 
diff --git a/primitives/npos-elections/solution-type/Cargo.toml b/primitives/npos-elections/solution-type/Cargo.toml
index 930b7de30f6a..a061cedc9231 100644
--- a/primitives/npos-elections/solution-type/Cargo.toml
+++ b/primitives/npos-elections/solution-type/Cargo.toml
@@ -17,7 +17,7 @@ proc-macro = true
 [dependencies]
 syn = { version = "1.0.58", features = ["full", "visit"] }
 quote = "1.0"
-proc-macro2 = "1.0.28"
+proc-macro2 = "1.0.29"
 proc-macro-crate = "1.0.0"
 
 [dev-dependencies]
diff --git a/primitives/runtime-interface/proc-macro/Cargo.toml b/primitives/runtime-interface/proc-macro/Cargo.toml
index 869154e43f81..1eb3bdd9039d 100644
--- a/primitives/runtime-interface/proc-macro/Cargo.toml
+++ b/primitives/runtime-interface/proc-macro/Cargo.toml
@@ -18,6 +18,6 @@ proc-macro = true
 [dependencies]
 syn = { version = "1.0.58", features = ["full", "visit", "fold", "extra-traits"] }
 quote = "1.0.3"
-proc-macro2 = "1.0.28"
+proc-macro2 = "1.0.29"
 Inflector = "0.11.4"
 proc-macro-crate = "1.0.0"
diff --git a/primitives/version/proc-macro/Cargo.toml b/primitives/version/proc-macro/Cargo.toml
index 1221bc9a0bfe..c3c801431434 100644
--- a/primitives/version/proc-macro/Cargo.toml
+++ b/primitives/version/proc-macro/Cargo.toml
@@ -18,7 +18,7 @@ proc-macro = true
 [dependencies]
 quote = "1.0.3"
 syn = { version = "1.0.58", features = ["full", "fold", "extra-traits", "visit"] }
-proc-macro2 = "1.0.28"
+proc-macro2 = "1.0.29"
 codec = { package = "parity-scale-codec", version = "2.0.0", features = [ "derive" ] }
 
 [dev-dependencies]
diff --git a/test-utils/derive/Cargo.toml b/test-utils/derive/Cargo.toml
index 566c83f88112..545e8cf33261 100644
--- a/test-utils/derive/Cargo.toml
+++ b/test-utils/derive/Cargo.toml
@@ -12,7 +12,7 @@ description = "Substrate test utilities macros"
 quote = "1.0.6"
 syn = { version = "1.0.58", features = ["full"] }
 proc-macro-crate = "1.0.0"
-proc-macro2 = "1.0.28"
+proc-macro2 = "1.0.29"
 
 [lib]
 proc-macro = true

From 7fa40a25baedd01f0d874927c08c3cddd38f2828 Mon Sep 17 00:00:00 2001
From: GreenBaneling | Supercolony <XgreenX9999@gmail.com>
Date: Fri, 10 Sep 2021 14:30:56 +0300
Subject: [PATCH 1165/1194] Implemented `seal_ecdsa_recovery` function in the
 contract pallet (#9686)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Implemented `seal_ecdsa_recovery` function in the contract pallet.
Added benchmark and unit test.

* Run `cargo fmt`

* Skip fmt for slices

* Changes according comments in pull request.

* Fix build without `unstable-interface` feature

* Applied suggestion from the review

* Apply suggestions from code review

Co-authored-by: Alexander Theißen <alex.theissen@me.com>

* Apply suggestions from code review

Co-authored-by: Alexander Theißen <alex.theissen@me.com>

* Changed RecoveryFailed to EcdsaRecoverFailed

* Manually updated weights.rs

* Apply suggestions from code review

Co-authored-by: Michael Müller <mich@elmueller.net>

Co-authored-by: Alexander Theißen <alex.theissen@me.com>
Co-authored-by: Michael Müller <mich@elmueller.net>
---
 Cargo.lock                                 |   45 +-
 frame/contracts/COMPLEXITY.md              |   17 +
 frame/contracts/Cargo.toml                 |    7 +-
 frame/contracts/fixtures/ecdsa_recover.wat |   55 +
 frame/contracts/src/benchmarking/code.rs   |   14 +-
 frame/contracts/src/benchmarking/mod.rs    |   54 +
 frame/contracts/src/exec.rs                |    8 +
 frame/contracts/src/schedule.rs            |    4 +
 frame/contracts/src/tests.rs               |   50 +
 frame/contracts/src/wasm/mod.rs            |   56 +
 frame/contracts/src/wasm/runtime.rs        |   48 +
 frame/contracts/src/weights.rs             | 1191 ++++++++++----------
 primitives/core/src/testing.rs             |    2 +-
 13 files changed, 941 insertions(+), 610 deletions(-)
 create mode 100644 frame/contracts/fixtures/ecdsa_recover.wat

diff --git a/Cargo.lock b/Cargo.lock
index 11fe02cf6a3a..101338f2b274 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2518,6 +2518,17 @@ dependencies = [
  "digest 0.9.0",
 ]
 
+[[package]]
+name = "hmac-drbg"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6e570451493f10f6581b48cdd530413b63ea9e780f544bfd3bdcaa0d89d1a7b"
+dependencies = [
+ "digest 0.8.1",
+ "generic-array 0.12.4",
+ "hmac 0.7.1",
+]
+
 [[package]]
 name = "hmac-drbg"
 version = "0.3.0"
@@ -3659,6 +3670,22 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "libsecp256k1"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fc1e2c808481a63dc6da2074752fdd4336a3c8fcc68b83db6f1fd5224ae7962"
+dependencies = [
+ "arrayref",
+ "crunchy",
+ "digest 0.8.1",
+ "hmac-drbg 0.2.0",
+ "rand 0.7.3",
+ "sha2 0.8.2",
+ "subtle 2.4.0",
+ "typenum",
+]
+
 [[package]]
 name = "libsecp256k1"
 version = "0.5.0"
@@ -3668,7 +3695,7 @@ dependencies = [
  "arrayref",
  "base64 0.12.3",
  "digest 0.9.0",
- "hmac-drbg",
+ "hmac-drbg 0.3.0",
  "libsecp256k1-core",
  "libsecp256k1-gen-ecmult",
  "libsecp256k1-gen-genmult",
@@ -3687,7 +3714,7 @@ dependencies = [
  "arrayref",
  "base64 0.12.3",
  "digest 0.9.0",
- "hmac-drbg",
+ "hmac-drbg 0.3.0",
  "libsecp256k1-core",
  "libsecp256k1-gen-ecmult",
  "libsecp256k1-gen-genmult",
@@ -5022,6 +5049,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "hex-literal",
+ "libsecp256k1 0.3.5",
  "log 0.4.14",
  "pallet-balances",
  "pallet-contracts-primitives",
@@ -5032,8 +5060,8 @@ dependencies = [
  "parity-scale-codec",
  "pretty_assertions 0.7.2",
  "pwasm-utils",
- "rand 0.8.4",
- "rand_pcg 0.3.0",
+ "rand 0.7.3",
+ "rand_pcg 0.2.1",
  "serde",
  "smallvec 1.6.1",
  "sp-core",
@@ -6816,15 +6844,6 @@ dependencies = [
  "rand_core 0.5.1",
 ]
 
-[[package]]
-name = "rand_pcg"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7de198537002b913568a3847e53535ace266f93526caf5c360ec41d72c5787f0"
-dependencies = [
- "rand_core 0.6.2",
-]
-
 [[package]]
 name = "rand_xorshift"
 version = "0.1.1"
diff --git a/frame/contracts/COMPLEXITY.md b/frame/contracts/COMPLEXITY.md
index f0e5a035586b..1fc1932fe1b5 100644
--- a/frame/contracts/COMPLEXITY.md
+++ b/frame/contracts/COMPLEXITY.md
@@ -468,3 +468,20 @@ algorithms have different inherent complexity so users must expect the above
 mentioned crypto hashes to have varying gas costs.
 The complexity of each cryptographic hash function highly depends on the underlying
 implementation.
+
+### seal_ecdsa_recover
+
+This function receives the following arguments:
+
+- `signature` is 65 bytes buffer,
+- `message_hash` is 32 bytes buffer,
+- `output` is 33 bytes buffer to return compressed public key,
+
+It consists of the following steps:
+
+1. Loading `signature` buffer from the sandbox memory (see sandboxing memory get).
+2. Loading `message_hash` buffer from the sandbox memory.
+3. Invoking the executive function `secp256k1_ecdsa_recover_compressed`.
+4. Copy the bytes of compressed public key into the contract side output buffer.
+
+**complexity**: Complexity is partially constant(it doesn't depend on input) but still depends on points of ECDSA and calculation.
\ No newline at end of file
diff --git a/frame/contracts/Cargo.toml b/frame/contracts/Cargo.toml
index 295419a27911..36d05e35180b 100644
--- a/frame/contracts/Cargo.toml
+++ b/frame/contracts/Cargo.toml
@@ -27,8 +27,9 @@ smallvec = { version = "1", default-features = false, features = [
 wasmi-validation = { version = "0.4", default-features = false }
 
 # Only used in benchmarking to generate random contract code
-rand = { version = "0.8", optional = true, default-features = false }
-rand_pcg = { version = "0.3", optional = true }
+libsecp256k1 = { version = "0.3.5", optional = true, default-features = false, features = ["hmac"] }
+rand = { version = "0.7.3", optional = true, default-features = false }
+rand_pcg = { version = "0.2", optional = true }
 
 # Substrate Dependencies
 frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
@@ -73,9 +74,11 @@ std = [
 	"pallet-contracts-proc-macro/full",
 	"log/std",
 	"rand/std",
+	"libsecp256k1/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
+	"libsecp256k1",
 	"rand",
 	"rand_pcg",
 	"unstable-interface",
diff --git a/frame/contracts/fixtures/ecdsa_recover.wat b/frame/contracts/fixtures/ecdsa_recover.wat
new file mode 100644
index 000000000000..c196e88094d2
--- /dev/null
+++ b/frame/contracts/fixtures/ecdsa_recover.wat
@@ -0,0 +1,55 @@
+;; This contract:
+;; 1) Reads signature and message hash from the input
+;; 2) Calls ecdsa_recover
+;; 3) Validates that result is Success
+;; 4) Returns recovered compressed public key
+(module
+	(import "__unstable__" "seal_ecdsa_recover" (func $seal_ecdsa_recover (param i32 i32 i32) (result i32)))
+	(import "seal0" "seal_return" (func $seal_return (param i32 i32 i32)))
+	(import "seal0" "seal_input" (func $seal_input (param i32 i32)))
+	(import "env" "memory" (memory 1 1))
+
+	(func $assert (param i32)
+		(block $ok
+			(br_if $ok
+				(get_local 0)
+			)
+			(unreachable)
+		)
+	)
+
+	(func (export "deploy"))
+
+	;; [4, 8) len of signature + message hash - 65 bytes + 32 byte = 97 bytes
+	(data (i32.const 4) "\61")
+
+	;; Memory layout during `call`
+	;; [10, 75) signature
+	;; [75, 107) message hash
+	(func (export "call")
+		(local $signature_ptr i32)
+		(local $message_hash_ptr i32)
+		(local $result i32)
+		(local.set $signature_ptr (i32.const 10))
+		(local.set $message_hash_ptr (i32.const 75))
+		;; Read signature and message hash - 97 bytes
+		(call $seal_input (local.get $signature_ptr) (i32.const 4))
+		(local.set
+			$result
+			(call $seal_ecdsa_recover
+				(local.get $signature_ptr)
+				(local.get $message_hash_ptr)
+				(local.get $signature_ptr) ;; Store output into message signature ptr, because we don't need it anymore
+			)
+		)
+		(call $assert
+			(i32.eq
+				(local.get $result) ;; The result of recovery execution
+				(i32.const 0x0) ;; 0x0 - Success result
+			)
+		)
+
+		;; exit with success and return recovered public key
+		(call $seal_return (i32.const 0) (local.get $signature_ptr) (i32.const 33))
+	)
+)
diff --git a/frame/contracts/src/benchmarking/code.rs b/frame/contracts/src/benchmarking/code.rs
index 15abd9968cd0..b24005ec5869 100644
--- a/frame/contracts/src/benchmarking/code.rs
+++ b/frame/contracts/src/benchmarking/code.rs
@@ -492,11 +492,11 @@ pub mod body {
 					vec![Instruction::I32Const(current as i32)]
 				},
 				DynInstr::RandomUnaligned(low, high) => {
-					let unaligned = rng.gen_range(*low..*high) | 1;
+					let unaligned = rng.gen_range(*low, *high) | 1;
 					vec![Instruction::I32Const(unaligned as i32)]
 				},
 				DynInstr::RandomI32(low, high) => {
-					vec![Instruction::I32Const(rng.gen_range(*low..*high))]
+					vec![Instruction::I32Const(rng.gen_range(*low, *high))]
 				},
 				DynInstr::RandomI32Repeated(num) => (&mut rng)
 					.sample_iter(Standard)
@@ -509,19 +509,19 @@ pub mod body {
 					.map(|val| Instruction::I64Const(val))
 					.collect(),
 				DynInstr::RandomGetLocal(low, high) => {
-					vec![Instruction::GetLocal(rng.gen_range(*low..*high))]
+					vec![Instruction::GetLocal(rng.gen_range(*low, *high))]
 				},
 				DynInstr::RandomSetLocal(low, high) => {
-					vec![Instruction::SetLocal(rng.gen_range(*low..*high))]
+					vec![Instruction::SetLocal(rng.gen_range(*low, *high))]
 				},
 				DynInstr::RandomTeeLocal(low, high) => {
-					vec![Instruction::TeeLocal(rng.gen_range(*low..*high))]
+					vec![Instruction::TeeLocal(rng.gen_range(*low, *high))]
 				},
 				DynInstr::RandomGetGlobal(low, high) => {
-					vec![Instruction::GetGlobal(rng.gen_range(*low..*high))]
+					vec![Instruction::GetGlobal(rng.gen_range(*low, *high))]
 				},
 				DynInstr::RandomSetGlobal(low, high) => {
-					vec![Instruction::SetGlobal(rng.gen_range(*low..*high))]
+					vec![Instruction::SetGlobal(rng.gen_range(*low, *high))]
 				},
 			})
 			.chain(sp_std::iter::once(Instruction::End))
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index f1c539fa918a..74877e5b838d 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -1415,6 +1415,60 @@ benchmarks! {
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
 
+	// Only calling the function itself with valid arguments.
+	// It generates different private keys and signatures for the message "Hello world".
+	seal_ecdsa_recover {
+		let r in 0 .. API_BENCHMARK_BATCHES;
+		use rand::SeedableRng;
+		let mut rng = rand_pcg::Pcg32::seed_from_u64(123456);
+
+		let message_hash = sp_io::hashing::blake2_256("Hello world".as_bytes());
+		let signatures = (0..r * API_BENCHMARK_BATCH_SIZE)
+			.map(|i| {
+				use secp256k1::{SecretKey, Message, sign};
+
+				let private_key = SecretKey::random(&mut rng);
+				let (signature, recovery_id) = sign(&Message::parse(&message_hash), &private_key);
+				let mut full_signature = [0; 65];
+				full_signature[..64].copy_from_slice(&signature.serialize());
+				full_signature[64] = recovery_id.serialize();
+				full_signature
+			})
+			.collect::<Vec<_>>();
+		let signatures = signatures.iter().flatten().cloned().collect::<Vec<_>>();
+		let signatures_bytes_len = signatures.len() as i32;
+
+		let code = WasmModule::<T>::from(ModuleDefinition {
+			memory: Some(ImportedMemory::max::<T>()),
+			imported_functions: vec![ImportedFunction {
+				module: "__unstable__",
+				name: "seal_ecdsa_recover",
+				params: vec![ValueType::I32, ValueType::I32, ValueType::I32],
+				return_type: Some(ValueType::I32),
+			}],
+			data_segments: vec![
+				DataSegment {
+					offset: 0,
+					value: message_hash[..].to_vec(),
+				},
+				DataSegment {
+					offset: 32,
+					value: signatures,
+				},
+			],
+			call_body: Some(body::repeated_dyn(r * API_BENCHMARK_BATCH_SIZE, vec![
+				Counter(32, 65), // signature_ptr
+				Regular(Instruction::I32Const(0)), // message_hash_ptr
+				Regular(Instruction::I32Const(signatures_bytes_len + 32)), // output_len_ptr
+				Regular(Instruction::Call(0)),
+				Regular(Instruction::Drop),
+			])),
+			.. Default::default()
+		});
+		let instance = Contract::<T>::new(code, vec![])?;
+		let origin = RawOrigin::Signed(instance.caller.clone());
+	}: call(origin, instance.addr, 0u32.into(), Weight::max_value(), vec![])
+
 	// We make the assumption that pushing a constant and dropping a value takes roughly
 	// the same amount of time. We follow that `t.load` and `drop` both have the weight
 	// of this benchmark / 2. We need to make this assumption because there is no way
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index 4039b1d134e1..516de3a22d5a 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -30,6 +30,7 @@ use frame_system::RawOrigin;
 use pallet_contracts_primitives::ExecReturnValue;
 use smallvec::{Array, SmallVec};
 use sp_core::crypto::UncheckedFrom;
+use sp_io::crypto::secp256k1_ecdsa_recover_compressed;
 use sp_runtime::traits::{Convert, Saturating};
 use sp_std::{marker::PhantomData, mem, prelude::*};
 
@@ -205,6 +206,9 @@ pub trait Ext: sealing::Sealed {
 
 	/// Call some dispatchable and return the result.
 	fn call_runtime(&self, call: <Self::T as Config>::Call) -> DispatchResultWithPostInfo;
+
+	/// Recovers ECDSA compressed public key based on signature and message hash.
+	fn ecdsa_recover(&self, signature: &[u8; 65], message_hash: &[u8; 32]) -> Result<[u8; 33], ()>;
 }
 
 /// Describes the different functions that can be exported by an [`Executable`].
@@ -1033,6 +1037,10 @@ where
 		origin.add_filter(T::CallFilter::contains);
 		call.dispatch(origin)
 	}
+
+	fn ecdsa_recover(&self, signature: &[u8; 65], message_hash: &[u8; 32]) -> Result<[u8; 33], ()> {
+		secp256k1_ecdsa_recover_compressed(&signature, &message_hash).map_err(|_| ())
+	}
 }
 
 fn deposit_event<T: Config>(topics: Vec<T::Hash>, event: Event<T>) {
diff --git a/frame/contracts/src/schedule.rs b/frame/contracts/src/schedule.rs
index 69495b3e96af..51aefa8bdaf6 100644
--- a/frame/contracts/src/schedule.rs
+++ b/frame/contracts/src/schedule.rs
@@ -378,6 +378,9 @@ pub struct HostFnWeights<T: Config> {
 	/// Weight per byte hashed by `seal_hash_blake2_128`.
 	pub hash_blake2_128_per_byte: Weight,
 
+	/// Weight of calling `seal_ecdsa_recover`.
+	pub ecdsa_recover: Weight,
+
 	/// The type parameter is used in the default implementation.
 	#[codec(skip)]
 	pub _phantom: PhantomData<T>,
@@ -625,6 +628,7 @@ impl<T: Config> Default for HostFnWeights<T> {
 			hash_blake2_256_per_byte: cost_byte_batched!(seal_hash_blake2_256_per_kb),
 			hash_blake2_128: cost_batched!(seal_hash_blake2_128),
 			hash_blake2_128_per_byte: cost_byte_batched!(seal_hash_blake2_128_per_kb),
+			ecdsa_recover: cost_batched!(seal_ecdsa_recover),
 			_phantom: PhantomData,
 		}
 	}
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index 5d2057a0b7df..28f05fd390d5 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -1795,3 +1795,53 @@ fn gas_estimation_call_runtime() {
 		);
 	});
 }
+
+#[test]
+#[cfg(feature = "unstable-interface")]
+fn ecdsa_recover() {
+	let (wasm, code_hash) = compile_module::<Test>("ecdsa_recover").unwrap();
+
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
+
+		// Instantiate the ecdsa_recover contract.
+		assert_ok!(Contracts::instantiate_with_code(
+			Origin::signed(ALICE),
+			100_000,
+			GAS_LIMIT,
+			wasm,
+			vec![],
+			vec![],
+		));
+		let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
+
+		#[rustfmt::skip]
+		let signature: [u8; 65] = [
+			161, 234, 203,  74, 147, 96,  51, 212,   5, 174, 231,   9, 142,  48, 137, 201,
+			162, 118, 192,  67, 239, 16,  71, 216, 125,  86, 167, 139,  70,   7,  86, 241,
+			 33,  87, 154, 251,  81, 29, 160,   4, 176, 239,  88, 211, 244, 232, 232,  52,
+			211, 234, 100, 115, 230, 47,  80,  44, 152, 166,  62,  50,   8,  13,  86, 175,
+			 28,
+		];
+		#[rustfmt::skip]
+		let message_hash: [u8; 32] = [
+			162, 28, 244, 179, 96, 76, 244, 178, 188,  83, 230, 248, 143, 106,  77, 117,
+			239, 95, 244, 171, 65, 95,  62, 153, 174, 166, 182,  28, 130,  73, 196, 208
+		];
+		#[rustfmt::skip]
+		const EXPECTED_COMPRESSED_PUBLIC_KEY: [u8; 33] = [
+			  2, 121, 190, 102, 126, 249, 220, 187, 172, 85, 160,  98, 149, 206, 135, 11,
+			  7,   2, 155, 252, 219,  45, 206,  40, 217, 89, 242, 129,  91,  22, 248, 23,
+			152,
+		];
+		let mut params = vec![];
+		params.extend_from_slice(&signature);
+		params.extend_from_slice(&message_hash);
+		assert!(params.len() == 65 + 32);
+		let result = <Pallet<Test>>::bare_call(ALICE, addr.clone(), 0, GAS_LIMIT, params, false)
+			.result
+			.unwrap();
+		assert!(result.is_success());
+		assert_eq!(result.data.as_ref(), &EXPECTED_COMPRESSED_PUBLIC_KEY);
+	})
+}
diff --git a/frame/contracts/src/wasm/mod.rs b/frame/contracts/src/wasm/mod.rs
index 843c78b73ca8..b92ed111e988 100644
--- a/frame/contracts/src/wasm/mod.rs
+++ b/frame/contracts/src/wasm/mod.rs
@@ -295,6 +295,7 @@ mod tests {
 		schedule: Schedule<Test>,
 		gas_meter: GasMeter<Test>,
 		debug_buffer: Vec<u8>,
+		ecdsa_recover: RefCell<Vec<([u8; 65], [u8; 32])>>,
 	}
 
 	/// The call is mocked and just returns this hardcoded value.
@@ -315,6 +316,7 @@ mod tests {
 				schedule: Default::default(),
 				gas_meter: GasMeter::new(10_000_000_000),
 				debug_buffer: Default::default(),
+				ecdsa_recover: Default::default(),
 			}
 		}
 	}
@@ -418,6 +420,15 @@ mod tests {
 			self.runtime_calls.borrow_mut().push(call);
 			Ok(Default::default())
 		}
+
+		fn ecdsa_recover(
+			&self,
+			signature: &[u8; 65],
+			message_hash: &[u8; 32],
+		) -> Result<[u8; 33], ()> {
+			self.ecdsa_recover.borrow_mut().push((signature.clone(), message_hash.clone()));
+			Ok([3; 33])
+		}
 	}
 
 	fn execute<E: BorrowMut<MockExt>>(wat: &str, input_data: Vec<u8>, mut ext: E) -> ExecResult {
@@ -850,6 +861,51 @@ mod tests {
 		);
 	}
 
+	#[cfg(feature = "unstable-interface")]
+	const CODE_ECDSA_RECOVER: &str = r#"
+(module
+	;; seal_ecdsa_recover(
+	;;    signature_ptr: u32,
+	;;    message_hash_ptr: u32,
+	;;    output_ptr: u32
+	;; ) -> u32
+	(import "__unstable__" "seal_ecdsa_recover" (func $seal_ecdsa_recover (param i32 i32 i32) (result i32)))
+	(import "env" "memory" (memory 1 1))
+	(func (export "call")
+		(drop
+			(call $seal_ecdsa_recover
+				(i32.const 36) ;; Pointer to signature.
+				(i32.const 4)  ;; Pointer to message hash.
+				(i32.const 36) ;; Pointer for output - public key.
+			)
+		)
+	)
+	(func (export "deploy"))
+
+	;; Hash of message.
+	(data (i32.const 4)
+		"\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01"
+		"\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01"
+	)
+	;; Signature
+	(data (i32.const 36)
+		"\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01"
+		"\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01"
+		"\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01"
+		"\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01\01"
+		"\01"
+	)
+)
+"#;
+
+	#[test]
+	#[cfg(feature = "unstable-interface")]
+	fn contract_ecdsa_recover() {
+		let mut mock_ext = MockExt::default();
+		assert_ok!(execute(&CODE_ECDSA_RECOVER, vec![], &mut mock_ext));
+		assert_eq!(mock_ext.ecdsa_recover.into_inner(), [([1; 65], [1; 32])]);
+	}
+
 	const CODE_GET_STORAGE: &str = r#"
 (module
 	(import "seal0" "seal_get_storage" (func $seal_get_storage (param i32 i32 i32) (result i32)))
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index 4612cc131faf..52b864bf18ea 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -73,6 +73,9 @@ pub enum ReturnCode {
 	/// The call dispatched by `seal_call_runtime` was executed but returned an error.
 	#[cfg(feature = "unstable-interface")]
 	CallRuntimeReturnedError = 10,
+	/// ECDSA pubkey recovery failed. Most probably wrong recovery id or signature.
+	#[cfg(feature = "unstable-interface")]
+	EcdsaRecoverFailed = 11,
 }
 
 impl ConvertibleToWasm for ReturnCode {
@@ -199,6 +202,9 @@ pub enum RuntimeCosts {
 	HashBlake256(u32),
 	/// Weight of calling `seal_hash_blake2_128` for the given input size.
 	HashBlake128(u32),
+	/// Weight of calling `seal_ecdsa_recover`.
+	#[cfg(feature = "unstable-interface")]
+	EcdsaRecovery,
 	/// Weight charged by a chain extension through `seal_call_chain_extension`.
 	ChainExtension(u64),
 	/// Weight charged for copying data from the sandbox.
@@ -265,6 +271,8 @@ impl RuntimeCosts {
 			HashBlake128(len) => s
 				.hash_blake2_128
 				.saturating_add(s.hash_blake2_128_per_byte.saturating_mul(len.into())),
+			#[cfg(feature = "unstable-interface")]
+			EcdsaRecovery => s.ecdsa_recover,
 			ChainExtension(amount) => amount,
 			#[cfg(feature = "unstable-interface")]
 			CopyIn(len) => s.return_per_byte.saturating_mul(len.into()),
@@ -1712,4 +1720,44 @@ define_env!(Env, <E: Ext>,
 			Err(_) => Ok(ReturnCode::CallRuntimeReturnedError),
 		}
 	},
+
+	// Recovers the ECDSA public key from the given message hash and signature.
+	//
+	// Writes the public key into the given output buffer.
+	// Assumes the secp256k1 curve.
+	//
+	// # Parameters
+	//
+	// - `signature_ptr`: the pointer into the linear memory where the signature
+	//					  is placed. Should be decodable as a 65 bytes. Traps otherwise.
+	// - `message_hash_ptr`: the pointer into the linear memory where the message
+	// 						 hash is placed. Should be decodable as a 32 bytes. Traps otherwise.
+	// - `output_ptr`: the pointer into the linear memory where the output
+	//                 data is placed. The buffer should be 33 bytes. Traps otherwise.
+	// 				   The function will write the result directly into this buffer.
+	//
+	// # Errors
+	//
+	// `ReturnCode::EcdsaRecoverFailed`
+	[__unstable__] seal_ecdsa_recover(ctx, signature_ptr: u32, message_hash_ptr: u32, output_ptr: u32) -> ReturnCode => {
+		ctx.charge_gas(RuntimeCosts::EcdsaRecovery)?;
+
+		let mut signature: [u8; 65] = [0; 65];
+		ctx.read_sandbox_memory_into_buf(signature_ptr, &mut signature)?;
+		let mut message_hash: [u8; 32] = [0; 32];
+		ctx.read_sandbox_memory_into_buf(message_hash_ptr, &mut message_hash)?;
+
+		let result = ctx.ext.ecdsa_recover(&signature, &message_hash);
+
+		match result {
+			Ok(pub_key) => {
+				// Write the recovered compressed ecdsa public key back into the sandboxed output
+				// buffer.
+				ctx.write_sandbox_memory(output_ptr, pub_key.as_ref())?;
+
+				Ok(ReturnCode::Success)
+			},
+			Err(_) => Ok(ReturnCode::EcdsaRecoverFailed),
+		}
+	},
 );
diff --git a/frame/contracts/src/weights.rs b/frame/contracts/src/weights.rs
index d15badcbaf59..1cebcb3b5d9a 100644
--- a/frame/contracts/src/weights.rs
+++ b/frame/contracts/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_contracts
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2021-09-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-09-09, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -92,6 +92,7 @@ pub trait WeightInfo {
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight;
 	fn seal_hash_blake2_128(r: u32, ) -> Weight;
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight;
+	fn seal_ecdsa_recover(r: u32, ) -> Weight;
 	fn instr_i64const(r: u32, ) -> Weight;
 	fn instr_i64load(r: u32, ) -> Weight;
 	fn instr_i64store(r: u32, ) -> Weight;
@@ -150,47 +151,47 @@ pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts DeletionQueue (r:1 w:0)
 	fn on_initialize() -> Weight {
-		(3_345_000 as Weight)
+		(3_226_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((2_212_000 as Weight).saturating_mul(k as Weight))
+			// Standard Error: 2_000
+			.saturating_add((2_178_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	// Storage: Contracts DeletionQueue (r:1 w:0)
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
-		(80_219_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((375_000 as Weight).saturating_mul(q as Weight))
+		(78_329_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((353_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts PristineCode (r:1 w:0)
 	// Storage: Contracts CodeStorage (r:0 w:1)
 	fn instrument(c: u32, ) -> Weight {
-		(35_370_000 as Weight)
-			// Standard Error: 85_000
-			.saturating_add((72_516_000 as Weight).saturating_mul(c as Weight))
+		(37_190_000 as Weight)
+			// Standard Error: 80_000
+			.saturating_add((72_791_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	fn code_load(c: u32, ) -> Weight {
-		(6_479_000 as Weight)
+		(6_191_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((1_426_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 	}
 	// Storage: Contracts CodeStorage (r:1 w:1)
 	fn code_refcount(c: u32, ) -> Weight {
-		(10_220_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((2_280_000 as Weight).saturating_mul(c as Weight))
+		(10_333_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((2_275_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -201,11 +202,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:1)
 	// Storage: Contracts PristineCode (r:0 w:1)
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight {
-		(404_011_000 as Weight)
-			// Standard Error: 220_000
-			.saturating_add((181_224_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 14_000
-			.saturating_add((2_198_000 as Weight).saturating_mul(s as Weight))
+		(438_556_000 as Weight)
+			// Standard Error: 147_000
+			.saturating_add((179_307_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 9_000
+			.saturating_add((2_159_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
@@ -215,9 +216,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System Account (r:1 w:1)
 	fn instantiate(s: u32, ) -> Weight {
-		(215_544_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_986_000 as Weight).saturating_mul(s as Weight))
+		(186_776_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((2_033_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
@@ -226,7 +227,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System Account (r:1 w:1)
 	fn call() -> Weight {
-		(177_006_000 as Weight)
+		(159_247_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
@@ -234,9 +235,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_caller(r: u32, ) -> Weight {
-		(420_960_000 as Weight)
-			// Standard Error: 129_000
-			.saturating_add((133_032_000 as Weight).saturating_mul(r as Weight))
+		(422_263_000 as Weight)
+			// Standard Error: 159_000
+			.saturating_add((125_490_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -244,9 +245,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_address(r: u32, ) -> Weight {
-		(419_566_000 as Weight)
-			// Standard Error: 121_000
-			.saturating_add((133_539_000 as Weight).saturating_mul(r as Weight))
+		(423_009_000 as Weight)
+			// Standard Error: 183_000
+			.saturating_add((125_795_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -254,9 +255,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(420_772_000 as Weight)
-			// Standard Error: 146_000
-			.saturating_add((132_394_000 as Weight).saturating_mul(r as Weight))
+		(429_297_000 as Weight)
+			// Standard Error: 164_000
+			.saturating_add((124_324_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -265,9 +266,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System Account (r:1 w:0)
 	fn seal_balance(r: u32, ) -> Weight {
-		(425_259_000 as Weight)
-			// Standard Error: 237_000
-			.saturating_add((379_279_000 as Weight).saturating_mul(r as Weight))
+		(442_330_000 as Weight)
+			// Standard Error: 187_000
+			.saturating_add((354_665_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -275,9 +276,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(421_599_000 as Weight)
-			// Standard Error: 162_000
-			.saturating_add((133_964_000 as Weight).saturating_mul(r as Weight))
+		(411_893_000 as Weight)
+			// Standard Error: 178_000
+			.saturating_add((125_971_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -285,9 +286,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(414_423_000 as Weight)
-			// Standard Error: 164_000
-			.saturating_add((134_814_000 as Weight).saturating_mul(r as Weight))
+		(413_273_000 as Weight)
+			// Standard Error: 180_000
+			.saturating_add((125_103_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -295,9 +296,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(423_908_000 as Weight)
-			// Standard Error: 134_000
-			.saturating_add((133_470_000 as Weight).saturating_mul(r as Weight))
+		(415_613_000 as Weight)
+			// Standard Error: 192_000
+			.saturating_add((126_106_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -305,9 +306,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_block_number(r: u32, ) -> Weight {
-		(423_769_000 as Weight)
-			// Standard Error: 138_000
-			.saturating_add((135_123_000 as Weight).saturating_mul(r as Weight))
+		(414_718_000 as Weight)
+			// Standard Error: 170_000
+			.saturating_add((124_962_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -315,9 +316,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_now(r: u32, ) -> Weight {
-		(431_525_000 as Weight)
-			// Standard Error: 119_000
-			.saturating_add((131_528_000 as Weight).saturating_mul(r as Weight))
+		(419_120_000 as Weight)
+			// Standard Error: 178_000
+			.saturating_add((125_188_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -326,9 +327,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: TransactionPayment NextFeeMultiplier (r:1 w:0)
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(435_484_000 as Weight)
-			// Standard Error: 179_000
-			.saturating_add((298_204_000 as Weight).saturating_mul(r as Weight))
+		(419_125_000 as Weight)
+			// Standard Error: 216_000
+			.saturating_add((290_592_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -336,9 +337,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_gas(r: u32, ) -> Weight {
-		(144_616_000 as Weight)
-			// Standard Error: 118_000
-			.saturating_add((59_737_000 as Weight).saturating_mul(r as Weight))
+		(149_609_000 as Weight)
+			// Standard Error: 117_000
+			.saturating_add((56_860_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -346,9 +347,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_input(r: u32, ) -> Weight {
-		(417_893_000 as Weight)
-			// Standard Error: 138_000
-			.saturating_add((114_222_000 as Weight).saturating_mul(r as Weight))
+		(423_570_000 as Weight)
+			// Standard Error: 151_000
+			.saturating_add((106_985_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -356,9 +357,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(558_705_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((38_111_000 as Weight).saturating_mul(n as Weight))
+		(566_496_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((38_091_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -366,9 +367,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_return(r: u32, ) -> Weight {
-		(397_670_000 as Weight)
-			// Standard Error: 1_581_000
-			.saturating_add((17_618_000 as Weight).saturating_mul(r as Weight))
+		(406_811_000 as Weight)
+			// Standard Error: 1_833_000
+			.saturating_add((6_551_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -376,9 +377,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(415_352_000 as Weight)
+		(412_094_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((635_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((631_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -388,9 +389,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts DeletionQueue (r:1 w:1)
 	// Storage: System Account (r:2 w:2)
 	fn seal_terminate(r: u32, ) -> Weight {
-		(407_089_000 as Weight)
-			// Standard Error: 181_000
-			.saturating_add((98_910_000 as Weight).saturating_mul(r as Weight))
+		(415_716_000 as Weight)
+			// Standard Error: 1_608_000
+			.saturating_add((72_648_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -401,9 +402,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: RandomnessCollectiveFlip RandomMaterial (r:1 w:0)
 	fn seal_random(r: u32, ) -> Weight {
-		(412_468_000 as Weight)
-			// Standard Error: 385_000
-			.saturating_add((419_134_000 as Weight).saturating_mul(r as Weight))
+		(421_387_000 as Weight)
+			// Standard Error: 275_000
+			.saturating_add((393_452_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -411,9 +412,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(416_035_000 as Weight)
-			// Standard Error: 408_000
-			.saturating_add((708_750_000 as Weight).saturating_mul(r as Weight))
+		(428_591_000 as Weight)
+			// Standard Error: 293_000
+			.saturating_add((690_833_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -422,11 +423,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System EventTopics (r:100 w:100)
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_251_101_000 as Weight)
-			// Standard Error: 2_553_000
-			.saturating_add((504_170_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 503_000
-			.saturating_add((165_595_000 as Weight).saturating_mul(n as Weight))
+		(1_245_676_000 as Weight)
+			// Standard Error: 2_636_000
+			.saturating_add((484_691_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 519_000
+			.saturating_add((165_836_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -436,17 +437,17 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_debug_message(r: u32, ) -> Weight {
-		(157_690_000 as Weight)
-			// Standard Error: 144_000
-			.saturating_add((77_093_000 as Weight).saturating_mul(r as Weight))
+		(162_162_000 as Weight)
+			// Standard Error: 127_000
+			.saturating_add((72_828_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(404_827_000 as Weight)
-			// Standard Error: 229_000
-			.saturating_add((251_475_000 as Weight).saturating_mul(r as Weight))
+		(399_301_000 as Weight)
+			// Standard Error: 221_000
+			.saturating_add((245_222_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
@@ -456,26 +457,26 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: unknown [0x7afa01283080ef247df84e0ba38ea5a587d25ce6633a6bfbba02068c14023441] (r:0 w:1)
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(653_171_000 as Weight)
-			// Standard Error: 287_000
-			.saturating_add((71_526_000 as Weight).saturating_mul(n as Weight))
+		(623_011_000 as Weight)
+			// Standard Error: 246_000
+			.saturating_add((72_051_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_clear_storage(r: u32, ) -> Weight {
-		(444_692_000 as Weight)
-			// Standard Error: 214_000
-			.saturating_add((226_212_000 as Weight).saturating_mul(r as Weight))
+		(445_102_000 as Weight)
+			// Standard Error: 247_000
+			.saturating_add((224_384_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_get_storage(r: u32, ) -> Weight {
-		(278_436_000 as Weight)
-			// Standard Error: 827_000
-			.saturating_add((528_111_000 as Weight).saturating_mul(r as Weight))
+		(290_227_000 as Weight)
+			// Standard Error: 694_000
+			.saturating_add((547_193_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -485,9 +486,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: unknown [0x7afa01283080ef247df84e0ba38ea5a587d25ce6633a6bfbba02068c14023441] (r:1 w:0)
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(732_808_000 as Weight)
-			// Standard Error: 304_000
-			.saturating_add((112_394_000 as Weight).saturating_mul(n as Weight))
+		(737_772_000 as Weight)
+			// Standard Error: 267_000
+			.saturating_add((112_216_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -496,9 +497,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System Account (r:101 w:101)
 	fn seal_transfer(r: u32, ) -> Weight {
-		(257_626_000 as Weight)
-			// Standard Error: 1_850_000
-			.saturating_add((4_621_393_000 as Weight).saturating_mul(r as Weight))
+		(383_402_000 as Weight)
+			// Standard Error: 2_184_000
+			.saturating_add((4_335_681_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
@@ -509,8 +510,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 6_833_000
-			.saturating_add((39_990_561_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 11_019_000
+			.saturating_add((39_806_777_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -521,13 +522,13 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System Account (r:101 w:101)
 	fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight {
-		(39_296_507_000 as Weight)
-			// Standard Error: 98_740_000
-			.saturating_add((4_165_171_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 35_000
-			.saturating_add((63_121_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 37_000
-			.saturating_add((101_665_000 as Weight).saturating_mul(o as Weight))
+		(38_662_592_000 as Weight)
+			// Standard Error: 52_762_000
+			.saturating_add((3_888_801_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 18_000
+			.saturating_add((63_571_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 20_000
+			.saturating_add((101_610_000 as Weight).saturating_mul(o as Weight))
 			.saturating_add(T::DbWeight::get().reads(104 as Weight))
 			.saturating_add(T::DbWeight::get().reads((101 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(T::DbWeight::get().writes(101 as Weight))
@@ -539,9 +540,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts AccountCounter (r:1 w:1)
 	// Storage: System Account (r:101 w:101)
 	fn seal_instantiate(r: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 100_794_000
-			.saturating_add((47_889_192_000 as Weight).saturating_mul(r as Weight))
+		(626_132_000 as Weight)
+			// Standard Error: 39_245_000
+			.saturating_add((46_398_859_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
@@ -553,13 +554,13 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts AccountCounter (r:1 w:1)
 	// Storage: System Account (r:101 w:101)
 	fn seal_instantiate_per_input_output_salt_kb(i: u32, o: u32, s: u32, ) -> Weight {
-		(45_237_285_000 as Weight)
-			// Standard Error: 35_000
-			.saturating_add((64_100_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 35_000
-			.saturating_add((102_036_000 as Weight).saturating_mul(o as Weight))
-			// Standard Error: 35_000
-			.saturating_add((201_375_000 as Weight).saturating_mul(s as Weight))
+		(46_649_369_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((63_469_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 26_000
+			.saturating_add((100_694_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 26_000
+			.saturating_add((201_705_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(206 as Weight))
 			.saturating_add(T::DbWeight::get().writes(204 as Weight))
 	}
@@ -567,9 +568,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(416_807_000 as Weight)
-			// Standard Error: 153_000
-			.saturating_add((137_778_000 as Weight).saturating_mul(r as Weight))
+		(417_820_000 as Weight)
+			// Standard Error: 160_000
+			.saturating_add((133_795_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -577,9 +578,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(651_244_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((499_711_000 as Weight).saturating_mul(n as Weight))
+		(609_012_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((499_227_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -587,9 +588,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(419_157_000 as Weight)
-			// Standard Error: 146_000
-			.saturating_add((144_391_000 as Weight).saturating_mul(r as Weight))
+		(419_043_000 as Weight)
+			// Standard Error: 177_000
+			.saturating_add((140_704_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -597,9 +598,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(568_821_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((346_968_000 as Weight).saturating_mul(n as Weight))
+		(564_451_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((346_948_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -607,9 +608,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(417_978_000 as Weight)
+		(420_951_000 as Weight)
 			// Standard Error: 163_000
-			.saturating_add((119_871_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((113_596_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -617,9 +618,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(537_541_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((164_266_000 as Weight).saturating_mul(n as Weight))
+		(563_168_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((164_114_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -627,9 +628,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(420_244_000 as Weight)
-			// Standard Error: 152_000
-			.saturating_add((119_123_000 as Weight).saturating_mul(r as Weight))
+		(418_794_000 as Weight)
+			// Standard Error: 167_000
+			.saturating_add((113_205_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -637,266 +638,274 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(486_612_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((164_406_000 as Weight).saturating_mul(n as Weight))
+		(584_668_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((164_127_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
+	fn seal_ecdsa_recover(r: u32, ) -> Weight {
+		(435_443_000 as Weight)
+			// Standard Error: 1_408_000
+			.saturating_add((15_624_877_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(54_394_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((750_000 as Weight).saturating_mul(r as Weight))
+		(45_937_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((1_108_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(48_363_000 as Weight)
-			// Standard Error: 9_000
-			.saturating_add((2_464_000 as Weight).saturating_mul(r as Weight))
+		(44_001_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((2_412_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(49_007_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((2_540_000 as Weight).saturating_mul(r as Weight))
+		(43_157_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((2_677_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(51_388_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((2_188_000 as Weight).saturating_mul(r as Weight))
+		(48_475_000 as Weight)
+			// Standard Error: 8_000
+			.saturating_add((2_604_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(48_672_000 as Weight)
+		(50_649_000 as Weight)
 			// Standard Error: 12_000
-			.saturating_add((2_310_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((2_553_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(51_538_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((1_324_000 as Weight).saturating_mul(r as Weight))
+		(48_433_000 as Weight)
+			// Standard Error: 8_000
+			.saturating_add((1_670_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(45_154_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((2_002_000 as Weight).saturating_mul(r as Weight))
+		(49_244_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((1_946_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(38_511_000 as Weight)
+		(46_117_000 as Weight)
 			// Standard Error: 17_000
-			.saturating_add((2_611_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((2_387_000 as Weight).saturating_mul(r as Weight))
 	}
-	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(47_321_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((18_000 as Weight).saturating_mul(e as Weight))
+	fn instr_br_table_per_entry(_e: u32, ) -> Weight {
+		(55_204_000 as Weight)
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(40_145_000 as Weight)
-			// Standard Error: 30_000
-			.saturating_add((20_056_000 as Weight).saturating_mul(r as Weight))
+		(43_651_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((19_163_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(54_566_000 as Weight)
+		(54_063_000 as Weight)
 			// Standard Error: 32_000
-			.saturating_add((30_331_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((27_970_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(86_289_000 as Weight)
-			// Standard Error: 7_000
-			.saturating_add((1_080_000 as Weight).saturating_mul(p as Weight))
+		(88_527_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((958_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(49_186_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((629_000 as Weight).saturating_mul(r as Weight))
+		(55_066_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((682_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(49_030_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((732_000 as Weight).saturating_mul(r as Weight))
+		(55_298_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((778_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(45_867_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((1_281_000 as Weight).saturating_mul(r as Weight))
+		(56_302_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_079_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(64_350_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((1_421_000 as Weight).saturating_mul(r as Weight))
+		(71_567_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_107_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(61_716_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((1_561_000 as Weight).saturating_mul(r as Weight))
+		(71_186_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((1_151_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(53_303_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((742_000 as Weight).saturating_mul(r as Weight))
+		(46_240_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((1_044_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(38_377_000 as Weight)
-			// Standard Error: 122_000
-			.saturating_add((633_403_000 as Weight).saturating_mul(r as Weight))
+		(52_369_000 as Weight)
+			// Standard Error: 2_508_000
+			.saturating_add((615_448_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(55_169_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((1_114_000 as Weight).saturating_mul(r as Weight))
+		(47_623_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((1_583_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(55_406_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((1_105_000 as Weight).saturating_mul(r as Weight))
+		(47_670_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((1_583_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(55_255_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((1_111_000 as Weight).saturating_mul(r as Weight))
+		(47_508_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((1_583_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(55_389_000 as Weight)
+		(48_109_000 as Weight)
 			// Standard Error: 9_000
-			.saturating_add((1_102_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((1_580_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(44_951_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((1_302_000 as Weight).saturating_mul(r as Weight))
+		(55_270_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((1_102_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(45_263_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_292_000 as Weight).saturating_mul(r as Weight))
+		(55_093_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((1_108_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(55_222_000 as Weight)
-			// Standard Error: 9_000
-			.saturating_add((1_104_000 as Weight).saturating_mul(r as Weight))
+		(48_265_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((1_573_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(50_838_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((1_669_000 as Weight).saturating_mul(r as Weight))
+		(48_733_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((2_088_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(51_064_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_663_000 as Weight).saturating_mul(r as Weight))
+		(48_831_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((2_085_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(50_915_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_667_000 as Weight).saturating_mul(r as Weight))
+		(49_147_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((2_056_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(50_868_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_669_000 as Weight).saturating_mul(r as Weight))
+		(49_596_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((2_049_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(50_797_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((1_672_000 as Weight).saturating_mul(r as Weight))
+		(49_872_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((2_038_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(51_497_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_656_000 as Weight).saturating_mul(r as Weight))
+		(48_843_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((2_081_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(50_871_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_668_000 as Weight).saturating_mul(r as Weight))
+		(48_765_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((2_089_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(50_718_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_679_000 as Weight).saturating_mul(r as Weight))
+		(48_720_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((2_083_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(50_872_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_668_000 as Weight).saturating_mul(r as Weight))
+		(48_736_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((2_097_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(50_736_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_678_000 as Weight).saturating_mul(r as Weight))
+		(48_772_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((2_093_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(50_716_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_677_000 as Weight).saturating_mul(r as Weight))
+		(48_827_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((2_082_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(51_042_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_664_000 as Weight).saturating_mul(r as Weight))
+		(48_961_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((2_072_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(51_090_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((1_673_000 as Weight).saturating_mul(r as Weight))
+		(49_069_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((2_067_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(50_997_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((2_339_000 as Weight).saturating_mul(r as Weight))
+		(49_035_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((2_677_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(51_196_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((2_049_000 as Weight).saturating_mul(r as Weight))
+		(48_842_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((2_449_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(51_336_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((2_258_000 as Weight).saturating_mul(r as Weight))
+		(48_536_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((2_723_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(50_993_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((2_031_000 as Weight).saturating_mul(r as Weight))
+		(48_851_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((2_432_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(51_038_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_666_000 as Weight).saturating_mul(r as Weight))
+		(48_624_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((2_093_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(51_051_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_668_000 as Weight).saturating_mul(r as Weight))
+		(49_348_000 as Weight)
+			// Standard Error: 8_000
+			.saturating_add((2_073_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(51_137_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_667_000 as Weight).saturating_mul(r as Weight))
+		(49_112_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((2_055_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(51_083_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_666_000 as Weight).saturating_mul(r as Weight))
+		(49_654_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((2_051_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(51_118_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_664_000 as Weight).saturating_mul(r as Weight))
+		(48_848_000 as Weight)
+			// Standard Error: 8_000
+			.saturating_add((2_089_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(50_805_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_673_000 as Weight).saturating_mul(r as Weight))
+		(49_455_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((2_054_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(50_835_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_682_000 as Weight).saturating_mul(r as Weight))
+		(49_640_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((2_048_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(50_947_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_669_000 as Weight).saturating_mul(r as Weight))
+		(49_498_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((2_068_000 as Weight).saturating_mul(r as Weight))
 	}
 }
 
@@ -904,47 +913,47 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 impl WeightInfo for () {
 	// Storage: Contracts DeletionQueue (r:1 w:0)
 	fn on_initialize() -> Weight {
-		(3_345_000 as Weight)
+		(3_226_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((2_212_000 as Weight).saturating_mul(k as Weight))
+			// Standard Error: 2_000
+			.saturating_add((2_178_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	// Storage: Contracts DeletionQueue (r:1 w:0)
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
-		(80_219_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((375_000 as Weight).saturating_mul(q as Weight))
+		(78_329_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((353_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts PristineCode (r:1 w:0)
 	// Storage: Contracts CodeStorage (r:0 w:1)
 	fn instrument(c: u32, ) -> Weight {
-		(35_370_000 as Weight)
-			// Standard Error: 85_000
-			.saturating_add((72_516_000 as Weight).saturating_mul(c as Weight))
+		(37_190_000 as Weight)
+			// Standard Error: 80_000
+			.saturating_add((72_791_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	fn code_load(c: u32, ) -> Weight {
-		(6_479_000 as Weight)
+		(6_191_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((1_426_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 	}
 	// Storage: Contracts CodeStorage (r:1 w:1)
 	fn code_refcount(c: u32, ) -> Weight {
-		(10_220_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((2_280_000 as Weight).saturating_mul(c as Weight))
+		(10_333_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((2_275_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -955,11 +964,11 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:1)
 	// Storage: Contracts PristineCode (r:0 w:1)
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight {
-		(404_011_000 as Weight)
-			// Standard Error: 220_000
-			.saturating_add((181_224_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 14_000
-			.saturating_add((2_198_000 as Weight).saturating_mul(s as Weight))
+		(438_556_000 as Weight)
+			// Standard Error: 147_000
+			.saturating_add((179_307_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 9_000
+			.saturating_add((2_159_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
@@ -969,9 +978,9 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System Account (r:1 w:1)
 	fn instantiate(s: u32, ) -> Weight {
-		(215_544_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_986_000 as Weight).saturating_mul(s as Weight))
+		(186_776_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((2_033_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
@@ -980,7 +989,7 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System Account (r:1 w:1)
 	fn call() -> Weight {
-		(177_006_000 as Weight)
+		(159_247_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
@@ -988,9 +997,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_caller(r: u32, ) -> Weight {
-		(420_960_000 as Weight)
-			// Standard Error: 129_000
-			.saturating_add((133_032_000 as Weight).saturating_mul(r as Weight))
+		(422_263_000 as Weight)
+			// Standard Error: 159_000
+			.saturating_add((125_490_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -998,9 +1007,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_address(r: u32, ) -> Weight {
-		(419_566_000 as Weight)
-			// Standard Error: 121_000
-			.saturating_add((133_539_000 as Weight).saturating_mul(r as Weight))
+		(423_009_000 as Weight)
+			// Standard Error: 183_000
+			.saturating_add((125_795_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1008,9 +1017,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(420_772_000 as Weight)
-			// Standard Error: 146_000
-			.saturating_add((132_394_000 as Weight).saturating_mul(r as Weight))
+		(429_297_000 as Weight)
+			// Standard Error: 164_000
+			.saturating_add((124_324_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1019,9 +1028,9 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System Account (r:1 w:0)
 	fn seal_balance(r: u32, ) -> Weight {
-		(425_259_000 as Weight)
-			// Standard Error: 237_000
-			.saturating_add((379_279_000 as Weight).saturating_mul(r as Weight))
+		(442_330_000 as Weight)
+			// Standard Error: 187_000
+			.saturating_add((354_665_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1029,9 +1038,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(421_599_000 as Weight)
-			// Standard Error: 162_000
-			.saturating_add((133_964_000 as Weight).saturating_mul(r as Weight))
+		(411_893_000 as Weight)
+			// Standard Error: 178_000
+			.saturating_add((125_971_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1039,9 +1048,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(414_423_000 as Weight)
-			// Standard Error: 164_000
-			.saturating_add((134_814_000 as Weight).saturating_mul(r as Weight))
+		(413_273_000 as Weight)
+			// Standard Error: 180_000
+			.saturating_add((125_103_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1049,9 +1058,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(423_908_000 as Weight)
-			// Standard Error: 134_000
-			.saturating_add((133_470_000 as Weight).saturating_mul(r as Weight))
+		(415_613_000 as Weight)
+			// Standard Error: 192_000
+			.saturating_add((126_106_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1059,9 +1068,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_block_number(r: u32, ) -> Weight {
-		(423_769_000 as Weight)
-			// Standard Error: 138_000
-			.saturating_add((135_123_000 as Weight).saturating_mul(r as Weight))
+		(414_718_000 as Weight)
+			// Standard Error: 170_000
+			.saturating_add((124_962_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1069,9 +1078,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_now(r: u32, ) -> Weight {
-		(431_525_000 as Weight)
-			// Standard Error: 119_000
-			.saturating_add((131_528_000 as Weight).saturating_mul(r as Weight))
+		(419_120_000 as Weight)
+			// Standard Error: 178_000
+			.saturating_add((125_188_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1080,9 +1089,9 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: TransactionPayment NextFeeMultiplier (r:1 w:0)
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(435_484_000 as Weight)
-			// Standard Error: 179_000
-			.saturating_add((298_204_000 as Weight).saturating_mul(r as Weight))
+		(419_125_000 as Weight)
+			// Standard Error: 216_000
+			.saturating_add((290_592_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1090,9 +1099,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_gas(r: u32, ) -> Weight {
-		(144_616_000 as Weight)
-			// Standard Error: 118_000
-			.saturating_add((59_737_000 as Weight).saturating_mul(r as Weight))
+		(149_609_000 as Weight)
+			// Standard Error: 117_000
+			.saturating_add((56_860_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1100,9 +1109,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_input(r: u32, ) -> Weight {
-		(417_893_000 as Weight)
-			// Standard Error: 138_000
-			.saturating_add((114_222_000 as Weight).saturating_mul(r as Weight))
+		(423_570_000 as Weight)
+			// Standard Error: 151_000
+			.saturating_add((106_985_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1110,9 +1119,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(558_705_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((38_111_000 as Weight).saturating_mul(n as Weight))
+		(566_496_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((38_091_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1120,9 +1129,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_return(r: u32, ) -> Weight {
-		(397_670_000 as Weight)
-			// Standard Error: 1_581_000
-			.saturating_add((17_618_000 as Weight).saturating_mul(r as Weight))
+		(406_811_000 as Weight)
+			// Standard Error: 1_833_000
+			.saturating_add((6_551_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1130,9 +1139,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(415_352_000 as Weight)
+		(412_094_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((635_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((631_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1142,9 +1151,9 @@ impl WeightInfo for () {
 	// Storage: Contracts DeletionQueue (r:1 w:1)
 	// Storage: System Account (r:2 w:2)
 	fn seal_terminate(r: u32, ) -> Weight {
-		(407_089_000 as Weight)
-			// Standard Error: 181_000
-			.saturating_add((98_910_000 as Weight).saturating_mul(r as Weight))
+		(415_716_000 as Weight)
+			// Standard Error: 1_608_000
+			.saturating_add((72_648_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
@@ -1155,9 +1164,9 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: RandomnessCollectiveFlip RandomMaterial (r:1 w:0)
 	fn seal_random(r: u32, ) -> Weight {
-		(412_468_000 as Weight)
-			// Standard Error: 385_000
-			.saturating_add((419_134_000 as Weight).saturating_mul(r as Weight))
+		(421_387_000 as Weight)
+			// Standard Error: 275_000
+			.saturating_add((393_452_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1165,9 +1174,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(416_035_000 as Weight)
-			// Standard Error: 408_000
-			.saturating_add((708_750_000 as Weight).saturating_mul(r as Weight))
+		(428_591_000 as Weight)
+			// Standard Error: 293_000
+			.saturating_add((690_833_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1176,11 +1185,11 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System EventTopics (r:100 w:100)
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_251_101_000 as Weight)
-			// Standard Error: 2_553_000
-			.saturating_add((504_170_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 503_000
-			.saturating_add((165_595_000 as Weight).saturating_mul(n as Weight))
+		(1_245_676_000 as Weight)
+			// Standard Error: 2_636_000
+			.saturating_add((484_691_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 519_000
+			.saturating_add((165_836_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
@@ -1190,17 +1199,17 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_debug_message(r: u32, ) -> Weight {
-		(157_690_000 as Weight)
-			// Standard Error: 144_000
-			.saturating_add((77_093_000 as Weight).saturating_mul(r as Weight))
+		(162_162_000 as Weight)
+			// Standard Error: 127_000
+			.saturating_add((72_828_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(404_827_000 as Weight)
-			// Standard Error: 229_000
-			.saturating_add((251_475_000 as Weight).saturating_mul(r as Weight))
+		(399_301_000 as Weight)
+			// Standard Error: 221_000
+			.saturating_add((245_222_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
@@ -1210,26 +1219,26 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: unknown [0x7afa01283080ef247df84e0ba38ea5a587d25ce6633a6bfbba02068c14023441] (r:0 w:1)
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(653_171_000 as Weight)
-			// Standard Error: 287_000
-			.saturating_add((71_526_000 as Weight).saturating_mul(n as Weight))
+		(623_011_000 as Weight)
+			// Standard Error: 246_000
+			.saturating_add((72_051_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_clear_storage(r: u32, ) -> Weight {
-		(444_692_000 as Weight)
-			// Standard Error: 214_000
-			.saturating_add((226_212_000 as Weight).saturating_mul(r as Weight))
+		(445_102_000 as Weight)
+			// Standard Error: 247_000
+			.saturating_add((224_384_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_get_storage(r: u32, ) -> Weight {
-		(278_436_000 as Weight)
-			// Standard Error: 827_000
-			.saturating_add((528_111_000 as Weight).saturating_mul(r as Weight))
+		(290_227_000 as Weight)
+			// Standard Error: 694_000
+			.saturating_add((547_193_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
@@ -1239,9 +1248,9 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: unknown [0x7afa01283080ef247df84e0ba38ea5a587d25ce6633a6bfbba02068c14023441] (r:1 w:0)
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(732_808_000 as Weight)
-			// Standard Error: 304_000
-			.saturating_add((112_394_000 as Weight).saturating_mul(n as Weight))
+		(737_772_000 as Weight)
+			// Standard Error: 267_000
+			.saturating_add((112_216_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1250,9 +1259,9 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System Account (r:101 w:101)
 	fn seal_transfer(r: u32, ) -> Weight {
-		(257_626_000 as Weight)
-			// Standard Error: 1_850_000
-			.saturating_add((4_621_393_000 as Weight).saturating_mul(r as Weight))
+		(383_402_000 as Weight)
+			// Standard Error: 2_184_000
+			.saturating_add((4_335_681_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
@@ -1263,8 +1272,8 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 6_833_000
-			.saturating_add((39_990_561_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 11_019_000
+			.saturating_add((39_806_777_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
@@ -1275,13 +1284,13 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System Account (r:101 w:101)
 	fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight {
-		(39_296_507_000 as Weight)
-			// Standard Error: 98_740_000
-			.saturating_add((4_165_171_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 35_000
-			.saturating_add((63_121_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 37_000
-			.saturating_add((101_665_000 as Weight).saturating_mul(o as Weight))
+		(38_662_592_000 as Weight)
+			// Standard Error: 52_762_000
+			.saturating_add((3_888_801_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 18_000
+			.saturating_add((63_571_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 20_000
+			.saturating_add((101_610_000 as Weight).saturating_mul(o as Weight))
 			.saturating_add(RocksDbWeight::get().reads(104 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((101 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(101 as Weight))
@@ -1293,9 +1302,9 @@ impl WeightInfo for () {
 	// Storage: Contracts AccountCounter (r:1 w:1)
 	// Storage: System Account (r:101 w:101)
 	fn seal_instantiate(r: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 100_794_000
-			.saturating_add((47_889_192_000 as Weight).saturating_mul(r as Weight))
+		(626_132_000 as Weight)
+			// Standard Error: 39_245_000
+			.saturating_add((46_398_859_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
@@ -1307,13 +1316,13 @@ impl WeightInfo for () {
 	// Storage: Contracts AccountCounter (r:1 w:1)
 	// Storage: System Account (r:101 w:101)
 	fn seal_instantiate_per_input_output_salt_kb(i: u32, o: u32, s: u32, ) -> Weight {
-		(45_237_285_000 as Weight)
-			// Standard Error: 35_000
-			.saturating_add((64_100_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 35_000
-			.saturating_add((102_036_000 as Weight).saturating_mul(o as Weight))
-			// Standard Error: 35_000
-			.saturating_add((201_375_000 as Weight).saturating_mul(s as Weight))
+		(46_649_369_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((63_469_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 26_000
+			.saturating_add((100_694_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 26_000
+			.saturating_add((201_705_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(206 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(204 as Weight))
 	}
@@ -1321,9 +1330,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(416_807_000 as Weight)
-			// Standard Error: 153_000
-			.saturating_add((137_778_000 as Weight).saturating_mul(r as Weight))
+		(417_820_000 as Weight)
+			// Standard Error: 160_000
+			.saturating_add((133_795_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1331,9 +1340,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(651_244_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((499_711_000 as Weight).saturating_mul(n as Weight))
+		(609_012_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((499_227_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1341,9 +1350,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(419_157_000 as Weight)
-			// Standard Error: 146_000
-			.saturating_add((144_391_000 as Weight).saturating_mul(r as Weight))
+		(419_043_000 as Weight)
+			// Standard Error: 177_000
+			.saturating_add((140_704_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1351,9 +1360,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(568_821_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((346_968_000 as Weight).saturating_mul(n as Weight))
+		(564_451_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((346_948_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1361,9 +1370,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(417_978_000 as Weight)
+		(420_951_000 as Weight)
 			// Standard Error: 163_000
-			.saturating_add((119_871_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((113_596_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1371,9 +1380,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(537_541_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((164_266_000 as Weight).saturating_mul(n as Weight))
+		(563_168_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((164_114_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1381,9 +1390,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(420_244_000 as Weight)
-			// Standard Error: 152_000
-			.saturating_add((119_123_000 as Weight).saturating_mul(r as Weight))
+		(418_794_000 as Weight)
+			// Standard Error: 167_000
+			.saturating_add((113_205_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1391,265 +1400,273 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(486_612_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((164_406_000 as Weight).saturating_mul(n as Weight))
+		(584_668_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((164_127_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
+	fn seal_ecdsa_recover(r: u32, ) -> Weight {
+		(435_443_000 as Weight)
+			// Standard Error: 1_408_000
+			.saturating_add((15_624_877_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(54_394_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((750_000 as Weight).saturating_mul(r as Weight))
+		(45_937_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((1_108_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(48_363_000 as Weight)
-			// Standard Error: 9_000
-			.saturating_add((2_464_000 as Weight).saturating_mul(r as Weight))
+		(44_001_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((2_412_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(49_007_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((2_540_000 as Weight).saturating_mul(r as Weight))
+		(43_157_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((2_677_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(51_388_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((2_188_000 as Weight).saturating_mul(r as Weight))
+		(48_475_000 as Weight)
+			// Standard Error: 8_000
+			.saturating_add((2_604_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(48_672_000 as Weight)
+		(50_649_000 as Weight)
 			// Standard Error: 12_000
-			.saturating_add((2_310_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((2_553_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(51_538_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((1_324_000 as Weight).saturating_mul(r as Weight))
+		(48_433_000 as Weight)
+			// Standard Error: 8_000
+			.saturating_add((1_670_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(45_154_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((2_002_000 as Weight).saturating_mul(r as Weight))
+		(49_244_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((1_946_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(38_511_000 as Weight)
+		(46_117_000 as Weight)
 			// Standard Error: 17_000
-			.saturating_add((2_611_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((2_387_000 as Weight).saturating_mul(r as Weight))
 	}
-	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(47_321_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((18_000 as Weight).saturating_mul(e as Weight))
+	fn instr_br_table_per_entry(_e: u32, ) -> Weight {
+		(55_204_000 as Weight)
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(40_145_000 as Weight)
-			// Standard Error: 30_000
-			.saturating_add((20_056_000 as Weight).saturating_mul(r as Weight))
+		(43_651_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((19_163_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(54_566_000 as Weight)
+		(54_063_000 as Weight)
 			// Standard Error: 32_000
-			.saturating_add((30_331_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((27_970_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(86_289_000 as Weight)
-			// Standard Error: 7_000
-			.saturating_add((1_080_000 as Weight).saturating_mul(p as Weight))
+		(88_527_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((958_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(49_186_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((629_000 as Weight).saturating_mul(r as Weight))
+		(55_066_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((682_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(49_030_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((732_000 as Weight).saturating_mul(r as Weight))
+		(55_298_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((778_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(45_867_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((1_281_000 as Weight).saturating_mul(r as Weight))
+		(56_302_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_079_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(64_350_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((1_421_000 as Weight).saturating_mul(r as Weight))
+		(71_567_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((1_107_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(61_716_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((1_561_000 as Weight).saturating_mul(r as Weight))
+		(71_186_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((1_151_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(53_303_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((742_000 as Weight).saturating_mul(r as Weight))
+		(46_240_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((1_044_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(38_377_000 as Weight)
-			// Standard Error: 122_000
-			.saturating_add((633_403_000 as Weight).saturating_mul(r as Weight))
+		(52_369_000 as Weight)
+			// Standard Error: 2_508_000
+			.saturating_add((615_448_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(55_169_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((1_114_000 as Weight).saturating_mul(r as Weight))
+		(47_623_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((1_583_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(55_406_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((1_105_000 as Weight).saturating_mul(r as Weight))
+		(47_670_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((1_583_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(55_255_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((1_111_000 as Weight).saturating_mul(r as Weight))
+		(47_508_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((1_583_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(55_389_000 as Weight)
+		(48_109_000 as Weight)
 			// Standard Error: 9_000
-			.saturating_add((1_102_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((1_580_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(44_951_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((1_302_000 as Weight).saturating_mul(r as Weight))
+		(55_270_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((1_102_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(45_263_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_292_000 as Weight).saturating_mul(r as Weight))
+		(55_093_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((1_108_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(55_222_000 as Weight)
-			// Standard Error: 9_000
-			.saturating_add((1_104_000 as Weight).saturating_mul(r as Weight))
+		(48_265_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((1_573_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(50_838_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((1_669_000 as Weight).saturating_mul(r as Weight))
+		(48_733_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((2_088_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(51_064_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_663_000 as Weight).saturating_mul(r as Weight))
+		(48_831_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((2_085_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(50_915_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_667_000 as Weight).saturating_mul(r as Weight))
+		(49_147_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((2_056_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(50_868_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_669_000 as Weight).saturating_mul(r as Weight))
+		(49_596_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((2_049_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(50_797_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((1_672_000 as Weight).saturating_mul(r as Weight))
+		(49_872_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((2_038_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(51_497_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_656_000 as Weight).saturating_mul(r as Weight))
+		(48_843_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((2_081_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(50_871_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_668_000 as Weight).saturating_mul(r as Weight))
+		(48_765_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((2_089_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(50_718_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_679_000 as Weight).saturating_mul(r as Weight))
+		(48_720_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((2_083_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(50_872_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_668_000 as Weight).saturating_mul(r as Weight))
+		(48_736_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((2_097_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(50_736_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_678_000 as Weight).saturating_mul(r as Weight))
+		(48_772_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((2_093_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(50_716_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_677_000 as Weight).saturating_mul(r as Weight))
+		(48_827_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((2_082_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(51_042_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_664_000 as Weight).saturating_mul(r as Weight))
+		(48_961_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((2_072_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(51_090_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((1_673_000 as Weight).saturating_mul(r as Weight))
+		(49_069_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((2_067_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(50_997_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((2_339_000 as Weight).saturating_mul(r as Weight))
+		(49_035_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((2_677_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(51_196_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((2_049_000 as Weight).saturating_mul(r as Weight))
+		(48_842_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((2_449_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(51_336_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((2_258_000 as Weight).saturating_mul(r as Weight))
+		(48_536_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((2_723_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(50_993_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((2_031_000 as Weight).saturating_mul(r as Weight))
+		(48_851_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((2_432_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(51_038_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_666_000 as Weight).saturating_mul(r as Weight))
+		(48_624_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((2_093_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(51_051_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_668_000 as Weight).saturating_mul(r as Weight))
+		(49_348_000 as Weight)
+			// Standard Error: 8_000
+			.saturating_add((2_073_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(51_137_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_667_000 as Weight).saturating_mul(r as Weight))
+		(49_112_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((2_055_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(51_083_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_666_000 as Weight).saturating_mul(r as Weight))
+		(49_654_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((2_051_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(51_118_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_664_000 as Weight).saturating_mul(r as Weight))
+		(48_848_000 as Weight)
+			// Standard Error: 8_000
+			.saturating_add((2_089_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(50_805_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_673_000 as Weight).saturating_mul(r as Weight))
+		(49_455_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((2_054_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(50_835_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_682_000 as Weight).saturating_mul(r as Weight))
+		(49_640_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((2_048_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(50_947_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((1_669_000 as Weight).saturating_mul(r as Weight))
+		(49_498_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((2_068_000 as Weight).saturating_mul(r as Weight))
 	}
 }
diff --git a/primitives/core/src/testing.rs b/primitives/core/src/testing.rs
index 865a03714a89..a7fff0def83f 100644
--- a/primitives/core/src/testing.rs
+++ b/primitives/core/src/testing.rs
@@ -23,7 +23,7 @@ use crate::crypto::KeyTypeId;
 pub const ED25519: KeyTypeId = KeyTypeId(*b"ed25");
 /// Key type for generic Sr 25519 key.
 pub const SR25519: KeyTypeId = KeyTypeId(*b"sr25");
-/// Key type for generic Sr 25519 key.
+/// Key type for generic ECDSA key.
 pub const ECDSA: KeyTypeId = KeyTypeId(*b"ecds");
 
 /// Macro for exporting functions from wasm in with the expected signature for using it with the

From 64c3ec0e067d491725489fe3128540abb73eaa04 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Fri, 10 Sep 2021 08:06:24 -0400
Subject: [PATCH 1166/1194] Dont Convert Benchmark Error Too Early (#9743)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* dont convert benchmark error

* fix warning

* fix more warnings

* more fixes

* more fixes

* add missing feature deps

* Update frame/election-provider-multi-phase/src/benchmarking.rs

Co-authored-by: Alexander Theißen <alex.theissen@me.com>

* Update frame/election-provider-multi-phase/src/benchmarking.rs

Co-authored-by: Alexander Theißen <alex.theissen@me.com>

* use from

Co-authored-by: Alexander Theißen <alex.theissen@me.com>
---
 frame/benchmarking/src/lib.rs                     |  6 +++---
 frame/benchmarking/src/tests.rs                   | 15 +++++++++++++++
 frame/benchmarking/src/utils.rs                   |  2 +-
 frame/bounties/src/benchmarking.rs                |  8 +++++---
 frame/collective/Cargo.toml                       |  1 +
 frame/contracts/src/benchmarking/mod.rs           |  4 ++--
 .../src/benchmarking.rs                           |  5 +++--
 frame/im-online/src/benchmarking.rs               |  4 ++--
 frame/indices/Cargo.toml                          |  1 +
 frame/multisig/Cargo.toml                         |  1 +
 10 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
index 42eeac483fa9..11c755e06c95 100644
--- a/frame/benchmarking/src/lib.rs
+++ b/frame/benchmarking/src/lib.rs
@@ -644,7 +644,7 @@ macro_rules! benchmark_backend {
 				&self,
 				components: &[($crate::BenchmarkParameter, u32)],
 				verify: bool
-			) -> Result<$crate::Box<dyn FnOnce() -> Result<(), $crate::BenchmarkError>>, &'static str> {
+			) -> Result<$crate::Box<dyn FnOnce() -> Result<(), $crate::BenchmarkError>>, $crate::BenchmarkError> {
 				$(
 					// Prepare instance
 					let $param = components.iter()
@@ -717,7 +717,7 @@ macro_rules! selected_benchmark {
 				&self,
 				components: &[($crate::BenchmarkParameter, u32)],
 				verify: bool
-			) -> Result<$crate::Box<dyn FnOnce() -> Result<(), $crate::BenchmarkError>>, &'static str> {
+			) -> Result<$crate::Box<dyn FnOnce() -> Result<(), $crate::BenchmarkError>>, $crate::BenchmarkError> {
 				match self {
 					$(
 						Self::$bench => <
@@ -1246,7 +1246,7 @@ macro_rules! impl_benchmark_test_suite {
 									}
 								}
 							},
-							Ok(Ok(_)) => (),
+							Ok(Ok(())) => (),
 						}
 					}
 					assert!(!anything_failed);
diff --git a/frame/benchmarking/src/tests.rs b/frame/benchmarking/src/tests.rs
index af9a4e7f4a85..a2cf381e6ecf 100644
--- a/frame/benchmarking/src/tests.rs
+++ b/frame/benchmarking/src/tests.rs
@@ -41,6 +41,7 @@ mod pallet_test {
 	pub trait Config: frame_system::Config {
 		type LowerBound: Get<u32>;
 		type UpperBound: Get<u32>;
+		type MaybeItem: Get<Option<u32>>;
 	}
 
 	#[pallet::storage]
@@ -112,11 +113,13 @@ impl frame_system::Config for Test {
 parameter_types! {
 	pub const LowerBound: u32 = 1;
 	pub const UpperBound: u32 = 100;
+	pub const MaybeItem: Option<u32> = None;
 }
 
 impl pallet_test::Config for Test {
 	type LowerBound = LowerBound;
 	type UpperBound = UpperBound;
+	type MaybeItem = MaybeItem;
 }
 
 fn new_test_ext() -> sp_io::TestExternalities {
@@ -218,6 +221,13 @@ mod benchmarks {
 				}
 			))?;
 		}
+
+		skip_benchmark {
+			let value = T::MaybeItem::get().ok_or(BenchmarkError::Skip)?;
+		}: {
+			// This should never be reached.
+			assert!(value > 100);
+		}
 	}
 
 	#[test]
@@ -334,6 +344,11 @@ mod benchmarks {
 			assert_err!(Pallet::<Test>::test_benchmark_bad_verify(), "You forgot to sort!");
 			assert_ok!(Pallet::<Test>::test_benchmark_no_components());
 			assert_ok!(Pallet::<Test>::test_benchmark_variable_components());
+			assert!(matches!(
+				Pallet::<Test>::test_benchmark_override_benchmark(),
+				Err(BenchmarkError::Override(_)),
+			));
+			assert_eq!(Pallet::<Test>::test_benchmark_skip_benchmark(), Err(BenchmarkError::Skip),);
 		});
 	}
 }
diff --git a/frame/benchmarking/src/utils.rs b/frame/benchmarking/src/utils.rs
index d54e32f0ce9d..158f5c5b5757 100644
--- a/frame/benchmarking/src/utils.rs
+++ b/frame/benchmarking/src/utils.rs
@@ -318,7 +318,7 @@ pub trait BenchmarkingSetup<T, I = ()> {
 		&self,
 		components: &[(BenchmarkParameter, u32)],
 		verify: bool,
-	) -> Result<Box<dyn FnOnce() -> Result<(), BenchmarkError>>, &'static str>;
+	) -> Result<Box<dyn FnOnce() -> Result<(), BenchmarkError>>, BenchmarkError>;
 }
 
 /// Grab an account, seeded by a name and index.
diff --git a/frame/bounties/src/benchmarking.rs b/frame/bounties/src/benchmarking.rs
index 832c053f024d..798d929d241f 100644
--- a/frame/bounties/src/benchmarking.rs
+++ b/frame/bounties/src/benchmarking.rs
@@ -134,7 +134,8 @@ benchmarks! {
 		Bounties::<T>::on_initialize(T::BlockNumber::zero());
 
 		let bounty_id = BountyCount::get() - 1;
-		let curator = T::Lookup::lookup(curator_lookup)?;
+		let curator = T::Lookup::lookup(curator_lookup).map_err(<&str>::from)?;
+
 		let beneficiary = T::Lookup::unlookup(account("beneficiary", 0, SEED));
 	}: _(RawOrigin::Signed(curator), bounty_id, beneficiary)
 
@@ -144,7 +145,8 @@ benchmarks! {
 		Bounties::<T>::on_initialize(T::BlockNumber::zero());
 
 		let bounty_id = BountyCount::get() - 1;
-		let curator = T::Lookup::lookup(curator_lookup)?;
+		let curator = T::Lookup::lookup(curator_lookup).map_err(<&str>::from)?;
+
 
 		let beneficiary_account: T::AccountId = account("beneficiary", 0, SEED);
 		let beneficiary = T::Lookup::unlookup(beneficiary_account.clone());
@@ -181,7 +183,7 @@ benchmarks! {
 		Bounties::<T>::on_initialize(T::BlockNumber::zero());
 
 		let bounty_id = BountyCount::get() - 1;
-		let curator = T::Lookup::lookup(curator_lookup)?;
+		let curator = T::Lookup::lookup(curator_lookup).map_err(<&str>::from)?;
 	}: _(RawOrigin::Signed(curator), bounty_id, Vec::new())
 	verify {
 		assert_last_event::<T>(RawEvent::BountyExtended(bounty_id).into())
diff --git a/frame/collective/Cargo.toml b/frame/collective/Cargo.toml
index 4b1051e79304..722309ee90a1 100644
--- a/frame/collective/Cargo.toml
+++ b/frame/collective/Cargo.toml
@@ -39,6 +39,7 @@ std = [
 	"sp-runtime/std",
 	"frame-system/std",
 	"log/std",
+	"frame-benchmarking/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index 74877e5b838d..db657e618322 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -1213,7 +1213,7 @@ benchmarks! {
 
 		for addr in &addresses {
 			if let Some(_) = ContractInfoOf::<T>::get(&addr) {
-				return Err("Expected that contract does not exist at this point.");
+				return Err("Expected that contract does not exist at this point.".into());
 			}
 		}
 	}: call(origin, callee, 0u32.into(), Weight::max_value(), vec![])
@@ -2241,7 +2241,7 @@ benchmarks! {
 			);
 		}
 		#[cfg(not(feature = "std"))]
-		return Err("Run this bench with a native runtime in order to see the schedule.");
+		return Err("Run this bench with a native runtime in order to see the schedule.".into());
 	}: {}
 
 	// Execute one erc20 transfer using the ink! erc20 example contract.
diff --git a/frame/election-provider-multi-phase/src/benchmarking.rs b/frame/election-provider-multi-phase/src/benchmarking.rs
index 9c734c482354..154d3b2f26a5 100644
--- a/frame/election-provider-multi-phase/src/benchmarking.rs
+++ b/frame/election-provider-multi-phase/src/benchmarking.rs
@@ -278,7 +278,8 @@ frame_benchmarking::benchmarks! {
 		let witness = SolutionOrSnapshotSize { voters: v, targets: t };
 		let raw_solution = solution_with_size::<T>(witness, a, d)?;
 		let ready_solution =
-			<MultiPhase<T>>::feasibility_check(raw_solution, ElectionCompute::Signed)?;
+			<MultiPhase<T>>::feasibility_check(raw_solution, ElectionCompute::Signed)
+				.map_err(<&str>::from)?;
 		<CurrentPhase<T>>::put(Phase::Signed);
 		// assume a queued solution is stored, regardless of where it comes from.
 		<QueuedSolution<T>>::put(ready_solution);
@@ -307,7 +308,7 @@ frame_benchmarking::benchmarks! {
 			..Default::default()
 		};
 
-		<MultiPhase<T>>::create_snapshot()?;
+		<MultiPhase<T>>::create_snapshot().map_err(<&str>::from)?;
 		MultiPhase::<T>::on_initialize_open_signed();
 		<Round<T>>::put(1);
 
diff --git a/frame/im-online/src/benchmarking.rs b/frame/im-online/src/benchmarking.rs
index 4000ce339a16..2a2d837a4bd5 100644
--- a/frame/im-online/src/benchmarking.rs
+++ b/frame/im-online/src/benchmarking.rs
@@ -83,7 +83,7 @@ benchmarks! {
 		let call = Call::heartbeat(input_heartbeat, signature);
 	}: {
 		ImOnline::<T>::validate_unsigned(TransactionSource::InBlock, &call)
-			.map_err(|e| -> &'static str { e.into() })?;
+			.map_err(<&str>::from)?;
 	}
 
 	validate_unsigned_and_then_heartbeat {
@@ -93,7 +93,7 @@ benchmarks! {
 		let call = Call::heartbeat(input_heartbeat, signature);
 	}: {
 		ImOnline::<T>::validate_unsigned(TransactionSource::InBlock, &call)
-			.map_err(|e| -> &'static str { e.into() })?;
+			.map_err(<&str>::from)?;
 		call.dispatch_bypass_filter(RawOrigin::None.into())?;
 	}
 }
diff --git a/frame/indices/Cargo.toml b/frame/indices/Cargo.toml
index 1ef4527f607b..c226ea2cf235 100644
--- a/frame/indices/Cargo.toml
+++ b/frame/indices/Cargo.toml
@@ -42,5 +42,6 @@ std = [
 runtime-benchmarks = [
 	"frame-benchmarking",
 	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
 ]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/multisig/Cargo.toml b/frame/multisig/Cargo.toml
index 7ccdf7c7a0c9..84314256499a 100644
--- a/frame/multisig/Cargo.toml
+++ b/frame/multisig/Cargo.toml
@@ -39,5 +39,6 @@ std = [
 runtime-benchmarks = [
 	"frame-benchmarking",
 	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
 ]
 try-runtime = ["frame-support/try-runtime"]

From 63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Fri, 10 Sep 2021 16:32:46 +0200
Subject: [PATCH 1167/1194] remove unused state machine (#9747)

---
 primitives/state-machine/Cargo.toml | 2 +-
 primitives/state-machine/src/lib.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/primitives/state-machine/Cargo.toml b/primitives/state-machine/Cargo.toml
index dc54486e2078..457bbac5d264 100644
--- a/primitives/state-machine/Cargo.toml
+++ b/primitives/state-machine/Cargo.toml
@@ -35,7 +35,7 @@ tracing = { version = "0.1.22", optional = true }
 hex-literal = "0.3.1"
 sp-runtime = { version = "4.0.0-dev", path = "../runtime" }
 pretty_assertions = "0.6.1"
-rand = { version = "0.7.2", feature = ["small_rng"] }
+rand = { version = "0.7.2" }
 
 [features]
 default = ["std"]
diff --git a/primitives/state-machine/src/lib.rs b/primitives/state-machine/src/lib.rs
index 032899faeb52..e5ba9e1acb84 100644
--- a/primitives/state-machine/src/lib.rs
+++ b/primitives/state-machine/src/lib.rs
@@ -1579,7 +1579,7 @@ mod tests {
 		let mut seed = [0; 16];
 		for i in 0..50u32 {
 			let mut child_infos = Vec::new();
-			&seed[0..4].copy_from_slice(&i.to_be_bytes()[..]);
+			seed[0..4].copy_from_slice(&i.to_be_bytes()[..]);
 			let mut rand = SmallRng::from_seed(seed);
 
 			let nb_child_trie = rand.next_u32() as usize % 25;

From 31bf57f5d798f85755b64989aaf2d05c0199c533 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 10 Sep 2021 17:28:36 +0000
Subject: [PATCH 1168/1194] Bump futures-util from 0.3.16 to 0.3.17 (#9748)

Bumps [futures-util](https://github.com/rust-lang/futures-rs) from 0.3.16 to 0.3.17.
- [Release notes](https://github.com/rust-lang/futures-rs/releases)
- [Changelog](https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/futures-rs/compare/0.3.16...0.3.17)

---
updated-dependencies:
- dependency-name: futures-util
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                  | 28 ++++++++++++++--------------
 utils/prometheus/Cargo.toml |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 101338f2b274..e26c16955994 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2176,9 +2176,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74ed2411805f6e4e3d9bc904c95d5d423b89b3b25dc0250aa74729de20629ff9"
+checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -2186,9 +2186,9 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99"
+checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d"
 
 [[package]]
 name = "futures-executor"
@@ -2204,9 +2204,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b0e06c393068f3a6ef246c75cdca793d6a46347e75286933e5e75fd2fd11582"
+checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377"
 
 [[package]]
 name = "futures-lite"
@@ -2225,9 +2225,9 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57"
+checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb"
 dependencies = [
  "autocfg 1.0.1",
  "proc-macro-hack",
@@ -2249,15 +2249,15 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0f30aaa67363d119812743aa5f33c201a7a66329f97d1a887022971feea4b53"
+checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11"
 
 [[package]]
 name = "futures-task"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe54a98670017f3be909561f6ad13e810d9a51f3f061b902062ca3da80799f2"
+checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99"
 
 [[package]]
 name = "futures-timer"
@@ -2273,9 +2273,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
 
 [[package]]
 name = "futures-util"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78"
+checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481"
 dependencies = [
  "autocfg 1.0.1",
  "futures 0.1.31",
diff --git a/utils/prometheus/Cargo.toml b/utils/prometheus/Cargo.toml
index 062054801da8..4a6cec2cac77 100644
--- a/utils/prometheus/Cargo.toml
+++ b/utils/prometheus/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 log = "0.4.8"
 prometheus = { version = "0.11.0", default-features = false }
-futures-util = { version = "0.3.1", default-features = false, features = ["io"] }
+futures-util = { version = "0.3.17", default-features = false, features = ["io"] }
 derive_more = "0.99"
 async-std = { version = "1.6.5", features = ["unstable"] }
 tokio = "1.10"

From 9b15da908a2e797e7960edac7011dd9d8b1106c6 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Fri, 10 Sep 2021 19:39:48 +0100
Subject: [PATCH 1169/1194] clean the interface of supports map (#9674)

* clean the interface of supports map, make it a bit cleaner and more efficients

* Fix stiff

* fix one test

* Fix warnings
---
 .../src/benchmarking.rs                       |  2 +-
 .../election-provider-multi-phase/src/lib.rs  | 25 +----
 .../election-provider-multi-phase/src/mock.rs | 23 +++--
 .../src/signed.rs                             |  3 +-
 .../src/unsigned.rs                           |  5 +-
 .../election-provider-support/src/onchain.rs  |  5 +-
 frame/staking/src/pallet/mod.rs               | 11 ++-
 .../fuzzer/src/phragmen_balancing.rs          |  8 +-
 .../fuzzer/src/phragmms_balancing.rs          | 10 +-
 .../npos-elections/fuzzer/src/reduce.rs       |  8 +-
 primitives/npos-elections/src/helpers.rs      |  9 +-
 primitives/npos-elections/src/lib.rs          | 98 ++++---------------
 primitives/npos-elections/src/tests.rs        | 46 ++-------
 primitives/npos-elections/src/traits.rs       |  3 +-
 14 files changed, 67 insertions(+), 189 deletions(-)

diff --git a/frame/election-provider-multi-phase/src/benchmarking.rs b/frame/election-provider-multi-phase/src/benchmarking.rs
index 154d3b2f26a5..bca9c359d47f 100644
--- a/frame/election-provider-multi-phase/src/benchmarking.rs
+++ b/frame/election-provider-multi-phase/src/benchmarking.rs
@@ -143,7 +143,7 @@ fn solution_with_size<T: Config>(
 
 	let solution =
 		<SolutionOf<T>>::from_assignment(&assignments, &voter_index, &target_index).unwrap();
-	let score = solution.clone().score(&winners, stake_of, voter_at, target_at).unwrap();
+	let score = solution.clone().score(stake_of, voter_at, target_at).unwrap();
 	let round = <MultiPhase<T>>::round();
 
 	assert!(score[0] > 0, "score is zero, this probably means that the stakes are not set.");
diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index 1a130371f3b4..977a4d34e84a 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -535,8 +535,6 @@ pub enum FeasibilityError {
 	InvalidVote,
 	/// A voter is invalid.
 	InvalidVoter,
-	/// A winner is invalid.
-	InvalidWinner,
 	/// The given score was invalid.
 	InvalidScore,
 	/// The provided round is incorrect.
@@ -1395,17 +1393,8 @@ impl<T: Config> Pallet<T> {
 		let target_at = helpers::target_at_fn::<T>(&snapshot_targets);
 		let voter_index = helpers::voter_index_fn_usize::<T>(&cache);
 
-		// First, make sure that all the winners are sane.
-		// OPTIMIZATION: we could first build the assignments, and then extract the winners directly
-		// from that, as that would eliminate a little bit of duplicate work. For now, we keep them
-		// separate: First extract winners separately from solution, and then assignments. This is
-		// also better, because we can reject solutions that don't meet `desired_targets` early on.
-		let winners = winners
-			.into_iter()
-			.map(|i| target_at(i).ok_or(FeasibilityError::InvalidWinner))
-			.collect::<Result<Vec<T::AccountId>, FeasibilityError>>()?;
-
-		// Then convert solution -> assignment. This will fail if any of the indices are gibberish.
+		// Then convert solution -> assignment. This will fail if any of the indices are gibberish,
+		// namely any of the voters or targets.
 		let assignments = solution
 			.into_assignment(voter_at, target_at)
 			.map_err::<FeasibilityError, _>(Into::into)?;
@@ -1441,14 +1430,10 @@ impl<T: Config> Pallet<T> {
 		// This might fail if the normalization fails. Very unlikely. See `integrity_test`.
 		let staked_assignments = assignment_ratio_to_staked_normalized(assignments, stake_of)
 			.map_err::<FeasibilityError, _>(Into::into)?;
-
-		// This might fail if one of the voter edges is pointing to a non-winner, which is not
-		// really possible anymore because all the winners come from the same `solution`.
-		let supports = sp_npos_elections::to_supports(&winners, &staked_assignments)
-			.map_err::<FeasibilityError, _>(Into::into)?;
+		let supports = sp_npos_elections::to_supports(&staked_assignments);
 
 		// Finally, check that the claimed score was indeed correct.
-		let known_score = (&supports).evaluate();
+		let known_score = supports.evaluate();
 		ensure!(known_score == score, FeasibilityError::InvalidScore);
 
 		Ok(ReadySolution { supports, compute, score })
@@ -1653,7 +1638,7 @@ mod feasibility_check {
 			});
 			assert_noop!(
 				MultiPhase::feasibility_check(raw, COMPUTE),
-				FeasibilityError::InvalidWinner
+				FeasibilityError::NposElection(sp_npos_elections::Error::SolutionInvalidIndex)
 			);
 		})
 	}
diff --git a/frame/election-provider-multi-phase/src/mock.rs b/frame/election-provider-multi-phase/src/mock.rs
index e63c171f4dcc..a7e68491c272 100644
--- a/frame/election-provider-multi-phase/src/mock.rs
+++ b/frame/election-provider-multi-phase/src/mock.rs
@@ -30,8 +30,8 @@ use sp_core::{
 	H256,
 };
 use sp_npos_elections::{
-	assignment_ratio_to_staked_normalized, seq_phragmen, to_supports, to_without_backing,
-	ElectionResult, EvaluateSupport, ExtendedBalance, NposSolution,
+	assignment_ratio_to_staked_normalized, seq_phragmen, to_supports, ElectionResult,
+	EvaluateSupport, ExtendedBalance, NposSolution,
 };
 use sp_runtime::{
 	testing::Header,
@@ -157,13 +157,14 @@ pub fn raw_solution() -> RawSolution<SolutionOf<Runtime>> {
 	let RoundSnapshot { voters, targets } = MultiPhase::snapshot().unwrap();
 	let desired_targets = MultiPhase::desired_targets().unwrap();
 
-	let ElectionResult { winners, assignments } = seq_phragmen::<_, SolutionAccuracyOf<Runtime>>(
-		desired_targets as usize,
-		targets.clone(),
-		voters.clone(),
-		None,
-	)
-	.unwrap();
+	let ElectionResult { winners: _, assignments } =
+		seq_phragmen::<_, SolutionAccuracyOf<Runtime>>(
+			desired_targets as usize,
+			targets.clone(),
+			voters.clone(),
+			None,
+		)
+		.unwrap();
 
 	// closures
 	let cache = helpers::generate_voter_cache::<Runtime>(&voters);
@@ -171,11 +172,9 @@ pub fn raw_solution() -> RawSolution<SolutionOf<Runtime>> {
 	let target_index = helpers::target_index_fn_linear::<Runtime>(&targets);
 	let stake_of = helpers::stake_of_fn::<Runtime>(&voters, &cache);
 
-	let winners = to_without_backing(winners);
-
 	let score = {
 		let staked = assignment_ratio_to_staked_normalized(assignments.clone(), &stake_of).unwrap();
-		to_supports(&winners, &staked).unwrap().evaluate()
+		to_supports(&staked).evaluate()
 	};
 	let solution =
 		<SolutionOf<Runtime>>::from_assignment(&assignments, &voter_index, &target_index).unwrap();
diff --git a/frame/election-provider-multi-phase/src/signed.rs b/frame/election-provider-multi-phase/src/signed.rs
index f83d72827852..72aa3e668034 100644
--- a/frame/election-provider-multi-phase/src/signed.rs
+++ b/frame/election-provider-multi-phase/src/signed.rs
@@ -26,7 +26,6 @@ use codec::{Decode, Encode, HasCompact};
 use frame_support::{
 	storage::bounded_btree_map::BoundedBTreeMap,
 	traits::{Currency, Get, OnUnbalanced, ReservableCurrency},
-	DebugNoBound,
 };
 use sp_arithmetic::traits::SaturatedConversion;
 use sp_npos_elections::{is_score_better, ElectionScore, NposSolution};
@@ -113,7 +112,7 @@ pub enum InsertResult<T: Config> {
 /// Mask type which pretends to be a set of `SignedSubmissionOf<T>`, while in fact delegating to the
 /// actual implementations in `SignedSubmissionIndices<T>`, `SignedSubmissionsMap<T>`, and
 /// `SignedSubmissionNextIndex<T>`.
-#[cfg_attr(feature = "std", derive(DebugNoBound))]
+#[cfg_attr(feature = "std", derive(frame_support::DebugNoBound))]
 pub struct SignedSubmissions<T: Config> {
 	indices: SubmissionIndicesOf<T>,
 	next_idx: u32,
diff --git a/frame/election-provider-multi-phase/src/unsigned.rs b/frame/election-provider-multi-phase/src/unsigned.rs
index 86d3a471bb7d..0afb6eee1612 100644
--- a/frame/election-provider-multi-phase/src/unsigned.rs
+++ b/frame/election-provider-multi-phase/src/unsigned.rs
@@ -315,7 +315,7 @@ impl<T: Config> Pallet<T> {
 			SolutionOf::<T>::try_from(assignments).map(|s| s.encoded_size())
 		};
 
-		let ElectionResult { assignments, winners } = election_result;
+		let ElectionResult { assignments, winners: _ } = election_result;
 
 		// Reduce (requires round-trip to staked form)
 		let sorted_assignments = {
@@ -374,8 +374,7 @@ impl<T: Config> Pallet<T> {
 		let solution = SolutionOf::<T>::try_from(&index_assignments)?;
 
 		// re-calc score.
-		let winners = sp_npos_elections::to_without_backing(winners);
-		let score = solution.clone().score(&winners, stake_of, voter_at, target_at)?;
+		let score = solution.clone().score(stake_of, voter_at, target_at)?;
 
 		let round = Self::round();
 		Ok((RawSolution { solution, score, round }, size))
diff --git a/frame/election-provider-support/src/onchain.rs b/frame/election-provider-support/src/onchain.rs
index aa07a0527daa..8e548408ef1a 100644
--- a/frame/election-provider-support/src/onchain.rs
+++ b/frame/election-provider-support/src/onchain.rs
@@ -81,14 +81,13 @@ impl<T: Config> ElectionProvider<T::AccountId, T::BlockNumber> for OnChainSequen
 		let stake_of =
 			|w: &T::AccountId| -> VoteWeight { stake_map.get(w).cloned().unwrap_or_default() };
 
-		let ElectionResult { winners, assignments } =
+		let ElectionResult { winners: _, assignments } =
 			seq_phragmen::<_, T::Accuracy>(desired_targets as usize, targets, voters, None)
 				.map_err(Error::from)?;
 
 		let staked = assignment_ratio_to_staked_normalized(assignments, &stake_of)?;
-		let winners = to_without_backing(winners);
 
-		to_supports(&winners, &staked).map_err(Error::from)
+		Ok(to_supports(&staked))
 	}
 }
 
diff --git a/frame/staking/src/pallet/mod.rs b/frame/staking/src/pallet/mod.rs
index ee09660d23d2..091dd7817676 100644
--- a/frame/staking/src/pallet/mod.rs
+++ b/frame/staking/src/pallet/mod.rs
@@ -40,8 +40,8 @@ pub use impls::*;
 use crate::{
 	migrations, slashing, weights::WeightInfo, ActiveEraInfo, BalanceOf, EraIndex, EraPayout,
 	EraRewardPoints, Exposure, Forcing, NegativeImbalanceOf, Nominations, PositiveImbalanceOf,
-	Releases, RewardDestination, SessionInterface, StakerStatus, StakingLedger, UnappliedSlash,
-	UnlockChunk, ValidatorPrefs,
+	Releases, RewardDestination, SessionInterface, StakingLedger, UnappliedSlash, UnlockChunk,
+	ValidatorPrefs,
 };
 
 pub const MAX_UNLOCKING_CHUNKS: usize = 32;
@@ -453,7 +453,8 @@ pub mod pallet {
 		pub force_era: Forcing,
 		pub slash_reward_fraction: Perbill,
 		pub canceled_payout: BalanceOf<T>,
-		pub stakers: Vec<(T::AccountId, T::AccountId, BalanceOf<T>, StakerStatus<T::AccountId>)>,
+		pub stakers:
+			Vec<(T::AccountId, T::AccountId, BalanceOf<T>, crate::StakerStatus<T::AccountId>)>,
 		pub min_nominator_bond: BalanceOf<T>,
 		pub min_validator_bond: BalanceOf<T>,
 	}
@@ -502,11 +503,11 @@ pub mod pallet {
 					RewardDestination::Staked,
 				));
 				frame_support::assert_ok!(match status {
-					StakerStatus::Validator => <Pallet<T>>::validate(
+					crate::StakerStatus::Validator => <Pallet<T>>::validate(
 						T::Origin::from(Some(controller.clone()).into()),
 						Default::default(),
 					),
-					StakerStatus::Nominator(votes) => <Pallet<T>>::nominate(
+					crate::StakerStatus::Nominator(votes) => <Pallet<T>>::nominate(
 						T::Origin::from(Some(controller.clone()).into()),
 						votes.iter().map(|l| T::Lookup::unlookup(l.clone())).collect(),
 					),
diff --git a/primitives/npos-elections/fuzzer/src/phragmen_balancing.rs b/primitives/npos-elections/fuzzer/src/phragmen_balancing.rs
index 5da57ccfd9ae..0c140a8ce6fa 100644
--- a/primitives/npos-elections/fuzzer/src/phragmen_balancing.rs
+++ b/primitives/npos-elections/fuzzer/src/phragmen_balancing.rs
@@ -24,7 +24,7 @@ use honggfuzz::fuzz;
 use rand::{self, SeedableRng};
 use sp_npos_elections::{
 	assignment_ratio_to_staked_normalized, is_score_better, seq_phragmen, to_supports,
-	to_without_backing, EvaluateSupport, VoteWeight,
+	EvaluateSupport, VoteWeight,
 };
 use sp_runtime::Perbill;
 
@@ -58,8 +58,7 @@ fn main() {
 					&stake_of,
 				)
 				.unwrap();
-				let winners = to_without_backing(unbalanced.winners.clone());
-				let score = to_supports(winners.as_ref(), staked.as_ref()).unwrap().evaluate();
+				let score = to_supports(staked.as_ref()).evaluate();
 
 				if score[0] == 0 {
 					// such cases cannot be improved by balancing.
@@ -83,8 +82,7 @@ fn main() {
 						&stake_of,
 					)
 					.unwrap();
-					let winners = to_without_backing(balanced.winners);
-					to_supports(winners.as_ref(), staked.as_ref()).unwrap().evaluate()
+					to_supports(staked.as_ref()).evaluate()
 				};
 
 				let enhance = is_score_better(balanced_score, unbalanced_score, Perbill::zero());
diff --git a/primitives/npos-elections/fuzzer/src/phragmms_balancing.rs b/primitives/npos-elections/fuzzer/src/phragmms_balancing.rs
index 0d8a07489d31..7b2aacfa8588 100644
--- a/primitives/npos-elections/fuzzer/src/phragmms_balancing.rs
+++ b/primitives/npos-elections/fuzzer/src/phragmms_balancing.rs
@@ -23,8 +23,8 @@ use common::*;
 use honggfuzz::fuzz;
 use rand::{self, SeedableRng};
 use sp_npos_elections::{
-	assignment_ratio_to_staked_normalized, is_score_better, phragmms, to_supports,
-	to_without_backing, EvaluateSupport, VoteWeight,
+	assignment_ratio_to_staked_normalized, is_score_better, phragmms, to_supports, EvaluateSupport,
+	VoteWeight,
 };
 use sp_runtime::Perbill;
 
@@ -58,8 +58,7 @@ fn main() {
 					&stake_of,
 				)
 				.unwrap();
-				let winners = to_without_backing(unbalanced.winners.clone());
-				let score = to_supports(&winners, &staked).unwrap().evaluate();
+				let score = to_supports(&staked).evaluate();
 
 				if score[0] == 0 {
 					// such cases cannot be improved by balancing.
@@ -80,8 +79,7 @@ fn main() {
 				let staked =
 					assignment_ratio_to_staked_normalized(balanced.assignments.clone(), &stake_of)
 						.unwrap();
-				let winners = to_without_backing(balanced.winners);
-				to_supports(winners.as_ref(), staked.as_ref()).unwrap().evaluate()
+				to_supports(staked.as_ref()).evaluate()
 			};
 
 			let enhance = is_score_better(balanced_score, unbalanced_score, Perbill::zero());
diff --git a/primitives/npos-elections/fuzzer/src/reduce.rs b/primitives/npos-elections/fuzzer/src/reduce.rs
index a7e77fdd516a..5f8a4f0e1384 100644
--- a/primitives/npos-elections/fuzzer/src/reduce.rs
+++ b/primitives/npos-elections/fuzzer/src/reduce.rs
@@ -104,13 +104,11 @@ fn generate_random_phragmen_assignment(
 }
 
 fn assert_assignments_equal(
-	winners: &Vec<AccountId>,
 	ass1: &Vec<StakedAssignment<AccountId>>,
 	ass2: &Vec<StakedAssignment<AccountId>>,
 ) {
-	let support_1 = to_support_map::<AccountId>(winners, ass1).unwrap();
-	let support_2 = to_support_map::<AccountId>(winners, ass2).unwrap();
-
+	let support_1 = to_support_map::<AccountId>(ass1);
+	let support_2 = to_support_map::<AccountId>(ass2);
 	for (who, support) in support_1.iter() {
 		assert_eq!(support.total, support_2.get(who).unwrap().total);
 	}
@@ -134,7 +132,7 @@ fn reduce_and_compare(assignment: &Vec<StakedAssignment<AccountId>>, winners: &V
 		num_changed,
 	);
 
-	assert_assignments_equal(winners, &assignment, &altered_assignment);
+	assert_assignments_equal(&assignment, &altered_assignment);
 }
 
 fn assignment_len(assignments: &[StakedAssignment<AccountId>]) -> u32 {
diff --git a/primitives/npos-elections/src/helpers.rs b/primitives/npos-elections/src/helpers.rs
index 5b02eaf2ad2e..ca97aeb996e4 100644
--- a/primitives/npos-elections/src/helpers.rs
+++ b/primitives/npos-elections/src/helpers.rs
@@ -17,9 +17,7 @@
 
 //! Helper methods for npos-elections.
 
-use crate::{
-	Assignment, Error, IdentifierT, PerThing128, StakedAssignment, VoteWeight, WithApprovalOf,
-};
+use crate::{Assignment, Error, IdentifierT, PerThing128, StakedAssignment, VoteWeight};
 use sp_arithmetic::PerThing;
 use sp_std::prelude::*;
 
@@ -81,11 +79,6 @@ pub fn assignment_staked_to_ratio_normalized<A: IdentifierT, P: PerThing128>(
 	Ok(ratio)
 }
 
-/// consumes a vector of winners with backing stake to just winners.
-pub fn to_without_backing<A: IdentifierT>(winners: Vec<WithApprovalOf<A>>) -> Vec<A> {
-	winners.into_iter().map(|(who, _)| who).collect::<Vec<A>>()
-}
-
 #[cfg(test)]
 mod tests {
 	use super::*;
diff --git a/primitives/npos-elections/src/lib.rs b/primitives/npos-elections/src/lib.rs
index 6a7e7e8c23cc..84b5d480bef0 100644
--- a/primitives/npos-elections/src/lib.rs
+++ b/primitives/npos-elections/src/lib.rs
@@ -146,9 +146,6 @@ pub type ExtendedBalance = u128;
 /// [`EvaluateSupport::evaluate`].
 pub type ElectionScore = [ExtendedBalance; 3];
 
-/// A winner, with their respective approval stake.
-pub type WithApprovalOf<A> = (A, ExtendedBalance);
-
 /// A pointer to a candidate struct with interior mutability.
 pub type CandidatePtr<A> = Rc<RefCell<Candidate<A>>>;
 
@@ -327,7 +324,7 @@ impl<AccountId: IdentifierT> Voter<AccountId> {
 pub struct ElectionResult<AccountId, P: PerThing> {
 	/// Just winners zipped with their approval stake. Note that the approval stake is merely the
 	/// sub of their received stake and could be used for very basic sorting and approval voting.
-	pub winners: Vec<WithApprovalOf<AccountId>>,
+	pub winners: Vec<(AccountId, ExtendedBalance)>,
 	/// Individual assignments. for each tuple, the first elements is a voter and the second is the
 	/// list of candidates that it supports.
 	pub assignments: Vec<Assignment<AccountId, P>>,
@@ -361,107 +358,50 @@ pub type Supports<A> = Vec<(A, Support<A>)>;
 /// This is more helpful than a normal [`Supports`] as it allows faster error checking.
 pub type SupportMap<A> = BTreeMap<A, Support<A>>;
 
-/// Helper trait to convert from a support map to a flat support vector.
-pub trait FlattenSupportMap<A> {
-	/// Flatten the support.
-	fn flatten(self) -> Supports<A>;
-}
-
-impl<A> FlattenSupportMap<A> for SupportMap<A> {
-	fn flatten(self) -> Supports<A> {
-		self.into_iter().collect::<Vec<_>>()
-	}
-}
-
-/// Build the support map from the winners and assignments.
-///
-/// The list of winners is basically a redundancy for error checking only; It ensures that all the
-/// targets pointed to by the [`Assignment`] are present in the `winners`.
+/// Build the support map from the assignments.
 pub fn to_support_map<AccountId: IdentifierT>(
-	winners: &[AccountId],
 	assignments: &[StakedAssignment<AccountId>],
-) -> Result<SupportMap<AccountId>, Error> {
-	// Initialize the support of each candidate.
-	let mut supports = <SupportMap<AccountId>>::new();
-	winners.iter().for_each(|e| {
-		supports.insert(e.clone(), Default::default());
-	});
+) -> SupportMap<AccountId> {
+	let mut supports = <BTreeMap<AccountId, Support<AccountId>>>::new();
 
 	// build support struct.
-	for StakedAssignment { who, distribution } in assignments.iter() {
-		for (c, weight_extended) in distribution.iter() {
-			if let Some(support) = supports.get_mut(c) {
-				support.total = support.total.saturating_add(*weight_extended);
-				support.voters.push((who.clone(), *weight_extended));
-			} else {
-				return Err(Error::InvalidSupportEdge)
-			}
+	for StakedAssignment { who, distribution } in assignments.into_iter() {
+		for (c, weight_extended) in distribution.into_iter() {
+			let mut support = supports.entry(c.clone()).or_default();
+			support.total = support.total.saturating_add(*weight_extended);
+			support.voters.push((who.clone(), *weight_extended));
 		}
 	}
-	Ok(supports)
+
+	supports
 }
 
-/// Same as [`to_support_map`] except it calls `FlattenSupportMap` on top of the result to return a
+/// Same as [`to_support_map`] except it returns a
 /// flat vector.
-///
-/// Similar to [`to_support_map`], `winners` is used for error checking.
 pub fn to_supports<AccountId: IdentifierT>(
-	winners: &[AccountId],
 	assignments: &[StakedAssignment<AccountId>],
-) -> Result<Supports<AccountId>, Error> {
-	to_support_map(winners, assignments).map(FlattenSupportMap::flatten)
+) -> Supports<AccountId> {
+	to_support_map(assignments).into_iter().collect()
 }
 
 /// Extension trait for evaluating a support map or vector.
-pub trait EvaluateSupport<K> {
+pub trait EvaluateSupport {
 	/// Evaluate a support map. The returned tuple contains:
 	///
 	/// - Minimum support. This value must be **maximized**.
 	/// - Sum of all supports. This value must be **maximized**.
 	/// - Sum of all supports squared. This value must be **minimized**.
-	fn evaluate(self) -> ElectionScore;
-}
-
-/// A common wrapper trait for both (&A, &B) and &(A, B).
-///
-/// This allows us to implemented something for both `Vec<_>` and `BTreeMap<_>`, such as
-/// [`EvaluateSupport`].
-pub trait TupleRef<K, V> {
-	fn extract(&self) -> (&K, &V);
-}
-
-impl<K, V> TupleRef<K, V> for &(K, V) {
-	fn extract(&self) -> (&K, &V) {
-		(&self.0, &self.1)
-	}
-}
-
-impl<K, V> TupleRef<K, V> for (K, V) {
-	fn extract(&self) -> (&K, &V) {
-		(&self.0, &self.1)
-	}
-}
-
-impl<K, V> TupleRef<K, V> for (&K, &V) {
-	fn extract(&self) -> (&K, &V) {
-		(self.0, self.1)
-	}
+	fn evaluate(&self) -> ElectionScore;
 }
 
-impl<A, C, I> EvaluateSupport<A> for C
-where
-	C: IntoIterator<Item = I>,
-	I: TupleRef<A, Support<A>>,
-	A: IdentifierT,
-{
-	fn evaluate(self) -> ElectionScore {
+impl<AccountId: IdentifierT> EvaluateSupport for Supports<AccountId> {
+	fn evaluate(&self) -> ElectionScore {
 		let mut min_support = ExtendedBalance::max_value();
 		let mut sum: ExtendedBalance = Zero::zero();
 		// NOTE: The third element might saturate but fine for now since this will run on-chain and
 		// need to be fast.
 		let mut sum_squared: ExtendedBalance = Zero::zero();
-		for item in self {
-			let (_, support) = item.extract();
+		for (_, support) in self {
 			sum = sum.saturating_add(support.total);
 			let squared = support.total.saturating_mul(support.total);
 			sum_squared = sum_squared.saturating_add(squared);
diff --git a/primitives/npos-elections/src/tests.rs b/primitives/npos-elections/src/tests.rs
index eac218f77e38..bf9ca57677ef 100644
--- a/primitives/npos-elections/src/tests.rs
+++ b/primitives/npos-elections/src/tests.rs
@@ -19,8 +19,8 @@
 
 use crate::{
 	balancing, helpers::*, is_score_better, mock::*, seq_phragmen, seq_phragmen_core, setup_inputs,
-	to_support_map, to_supports, Assignment, ElectionResult, EvaluateSupport, ExtendedBalance,
-	IndexAssignment, NposSolution, StakedAssignment, Support, Voter,
+	to_support_map, Assignment, ElectionResult, ExtendedBalance, IndexAssignment, NposSolution,
+	StakedAssignment, Support, Voter,
 };
 use rand::{self, SeedableRng};
 use sp_arithmetic::{PerU16, Perbill, Percent, Permill};
@@ -259,8 +259,7 @@ fn phragmen_poc_works() {
 	);
 
 	let staked = assignment_ratio_to_staked(assignments, &stake_of);
-	let winners = to_without_backing(winners);
-	let support_map = to_support_map::<AccountId>(&winners, &staked).unwrap();
+	let support_map = to_support_map::<AccountId>(&staked);
 
 	assert_eq_uvec!(
 		staked,
@@ -315,8 +314,7 @@ fn phragmen_poc_works_with_balancing() {
 	);
 
 	let staked = assignment_ratio_to_staked(assignments, &stake_of);
-	let winners = to_without_backing(winners);
-	let support_map = to_support_map::<AccountId>(&winners, &staked).unwrap();
+	let support_map = to_support_map::<AccountId>(&staked);
 
 	assert_eq_uvec!(
 		staked,
@@ -515,7 +513,7 @@ fn phragmen_large_scale_test() {
 	)
 	.unwrap();
 
-	assert_eq_uvec!(to_without_backing(winners.clone()), vec![24, 22]);
+	assert_eq_uvec!(winners.iter().map(|(x, _)| *x).collect::<Vec<_>>(), vec![24, 22]);
 	check_assignments_sum(&assignments);
 }
 
@@ -649,8 +647,7 @@ fn phragmen_self_votes_should_be_kept() {
 	);
 
 	let staked_assignments = assignment_ratio_to_staked(result.assignments, &stake_of);
-	let winners = to_without_backing(result.winners);
-	let supports = to_support_map::<AccountId>(&winners, &staked_assignments).unwrap();
+	let supports = to_support_map::<AccountId>(&staked_assignments);
 
 	assert_eq!(supports.get(&5u64), None);
 	assert_eq!(
@@ -670,9 +667,8 @@ fn duplicate_target_is_ignored() {
 
 	let ElectionResult { winners, assignments } =
 		seq_phragmen::<_, Perbill>(2, candidates, voters, None).unwrap();
-	let winners = to_without_backing(winners);
 
-	assert_eq!(winners, vec![(2), (3)]);
+	assert_eq!(winners, vec![(2, 140), (3, 110)]);
 	assert_eq!(
 		assignments
 			.into_iter()
@@ -689,9 +685,8 @@ fn duplicate_target_is_ignored_when_winner() {
 
 	let ElectionResult { winners, assignments } =
 		seq_phragmen::<_, Perbill>(2, candidates, voters, None).unwrap();
-	let winners = to_without_backing(winners);
 
-	assert_eq!(winners, vec![1, 2]);
+	assert_eq!(winners, vec![(1, 100), (2, 100)]);
 	assert_eq!(
 		assignments
 			.into_iter()
@@ -701,31 +696,6 @@ fn duplicate_target_is_ignored_when_winner() {
 	);
 }
 
-#[test]
-fn support_map_and_vec_can_be_evaluated() {
-	let candidates = vec![1, 2, 3];
-	let voters = vec![(10, vec![1, 2]), (20, vec![1, 3]), (30, vec![2, 3])];
-
-	let stake_of = create_stake_of(&[(10, 10), (20, 20), (30, 30)]);
-	let ElectionResult { winners, assignments } = seq_phragmen::<_, Perbill>(
-		2,
-		candidates,
-		voters
-			.iter()
-			.map(|(ref v, ref vs)| (v.clone(), stake_of(v), vs.clone()))
-			.collect::<Vec<_>>(),
-		None,
-	)
-	.unwrap();
-
-	let staked = assignment_ratio_to_staked(assignments, &stake_of);
-	let winners = to_without_backing(winners);
-	let support_map = to_support_map::<AccountId>(&winners, &staked).unwrap();
-	let support_vec = to_supports(&winners, &staked).unwrap();
-
-	assert_eq!(support_map.evaluate(), support_vec.evaluate());
-}
-
 mod assignment_convert_normalize {
 	use super::*;
 	#[test]
diff --git a/primitives/npos-elections/src/traits.rs b/primitives/npos-elections/src/traits.rs
index ac077680167f..45b6fa368ae2 100644
--- a/primitives/npos-elections/src/traits.rs
+++ b/primitives/npos-elections/src/traits.rs
@@ -112,7 +112,6 @@ where
 	/// Compute the score of this solution type.
 	fn score<A, FS>(
 		self,
-		winners: &[A],
 		stake_of: FS,
 		voter_at: impl Fn(Self::VoterIndex) -> Option<A>,
 		target_at: impl Fn(Self::TargetIndex) -> Option<A>,
@@ -123,7 +122,7 @@ where
 	{
 		let ratio = self.into_assignment(voter_at, target_at)?;
 		let staked = crate::helpers::assignment_ratio_to_staked_normalized(ratio, stake_of)?;
-		let supports = crate::to_supports(winners, &staked)?;
+		let supports = crate::to_supports(&staked);
 		Ok(supports.evaluate())
 	}
 

From b674bd2338b645c41a7f2c21e696891c7e34500d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Sun, 12 Sep 2021 14:29:11 +0200
Subject: [PATCH 1170/1194] Use tokio runtime handle instead of `TaskExecutor`
 abstraction (#9737)

* Use tokio runtime handle instead of TaskExecutor abstraction

Before this pr we had the `TaskExecutor` abstraction which theoretically
allowed that any futures executor could have been used. However, this
was never tested and is currently not really required. Anyone running a
node currently only used tokio and nothing else (because this was hard
coded in CLI). So, this pr removes the `TaskExecutor` abstraction and
relies directly on the tokio runtime handle.

Besides this changes, this pr also makes sure that the http and ws rpc
server use the same tokio runtime. This fixes a panic that occurred when
you drop the rpc servers inside an async function (tokio doesn't like
that a tokio runtime is dropped in the async context of another tokio
runtime).

As we don't use any custom runtime in the http rpc server anymore, this
pr also removes the `rpc-http-threads` cli argument. If external parties
complain that there aren't enough threads for the rpc server, we could
bring support for increasing the thread count of the tokio runtime.

* FMT

* Fix try runtime

* Fix integration tests and some other optimizations

* Remove warnings
---
 Cargo.lock                                    |  2 +
 bin/node/cli/Cargo.toml                       |  1 +
 bin/node/cli/src/chain_spec.rs                |  2 +
 bin/node/cli/src/command.rs                   |  2 +-
 bin/node/cli/src/service.rs                   |  4 +
 .../tests/running_the_node_and_interrupt.rs   | 81 ++++++++++++++++---
 bin/node/test-runner-example/src/lib.rs       | 15 ++--
 client/cli/src/commands/run_cmd.rs            |  8 --
 client/cli/src/config.rs                      | 14 +---
 client/cli/src/lib.rs                         |  6 +-
 client/cli/src/runner.rs                      | 11 +--
 client/rpc-servers/Cargo.toml                 |  1 +
 client/rpc-servers/src/lib.rs                 | 10 +--
 client/service/Cargo.toml                     |  2 +-
 client/service/src/builder.rs                 |  4 +-
 client/service/src/config.rs                  | 68 +---------------
 client/service/src/lib.rs                     |  7 +-
 client/service/src/task_manager/mod.rs        | 67 +++++++--------
 client/service/src/task_manager/tests.rs      | 45 +++++------
 client/service/test/src/lib.rs                | 33 ++++----
 test-utils/derive/src/lib.rs                  | 19 +----
 test-utils/src/lib.rs                         |  7 +-
 test-utils/test-crate/src/main.rs             |  2 +-
 test-utils/test-runner/src/client.rs          |  8 +-
 test-utils/test-runner/src/utils.rs           | 22 +----
 test-utils/tests/basic.rs                     | 17 +---
 test-utils/tests/ui.rs                        |  1 -
 test-utils/tests/ui/missing-func-parameter.rs | 24 ------
 .../tests/ui/missing-func-parameter.stderr    |  5 --
 .../tests/ui/too-many-func-parameters.rs      |  5 +-
 .../tests/ui/too-many-func-parameters.stderr  |  8 +-
 31 files changed, 198 insertions(+), 303 deletions(-)
 delete mode 100644 test-utils/tests/ui/missing-func-parameter.rs
 delete mode 100644 test-utils/tests/ui/missing-func-parameter.stderr

diff --git a/Cargo.lock b/Cargo.lock
index e26c16955994..bb8fad054924 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4385,6 +4385,7 @@ dependencies = [
  "sp-keystore",
  "sp-runtime",
  "sp-timestamp",
+ "sp-tracing",
  "sp-transaction-pool",
  "sp-transaction-storage-proof",
  "sp-trie",
@@ -8079,6 +8080,7 @@ dependencies = [
  "log 0.4.14",
  "serde_json",
  "substrate-prometheus-endpoint",
+ "tokio",
 ]
 
 [[package]]
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index acbf1b9888b8..6a12af4b278b 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -114,6 +114,7 @@ sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/commo
 sc-consensus-babe = { version = "0.10.0-dev", path = "../../../client/consensus/babe" }
 sc-consensus-epochs = { version = "0.10.0-dev", path = "../../../client/consensus/epochs" }
 sc-service-test = { version = "2.0.0", path = "../../../client/service/test" }
+sp-tracing = { version = "4.0.0-dev", path = "../../../primitives/tracing" }
 futures = "0.3.16"
 tempfile = "3.1.0"
 assert_cmd = "1.0"
diff --git a/bin/node/cli/src/chain_spec.rs b/bin/node/cli/src/chain_spec.rs
index bbb2904beab3..352e007a891b 100644
--- a/bin/node/cli/src/chain_spec.rs
+++ b/bin/node/cli/src/chain_spec.rs
@@ -463,6 +463,8 @@ pub(crate) mod tests {
 	#[test]
 	#[ignore]
 	fn test_connectivity() {
+		sp_tracing::try_init_simple();
+
 		sc_service_test::connectivity(
 			integration_test_config_with_two_authorities(),
 			|config| {
diff --git a/bin/node/cli/src/command.rs b/bin/node/cli/src/command.rs
index a660b8985b64..17375094f2a1 100644
--- a/bin/node/cli/src/command.rs
+++ b/bin/node/cli/src/command.rs
@@ -156,7 +156,7 @@ pub fn run() -> Result<()> {
 				// manager to do `async_run`.
 				let registry = config.prometheus_config.as_ref().map(|cfg| &cfg.registry);
 				let task_manager =
-					sc_service::TaskManager::new(config.task_executor.clone(), registry)
+					sc_service::TaskManager::new(config.tokio_handle.clone(), registry)
 						.map_err(|e| sc_cli::Error::Service(sc_service::Error::Prometheus(e)))?;
 
 				Ok((cmd.run::<Block, ExecutorDispatch>(config), task_manager))
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index 845e5c83e883..9f48ab7e3ef3 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -644,6 +644,8 @@ mod tests {
 	// This can be run locally with `cargo test --release -p node-cli test_sync -- --ignored`.
 	#[ignore]
 	fn test_sync() {
+		sp_tracing::try_init_simple();
+
 		let keystore_path = tempfile::tempdir().expect("Creates keystore path");
 		let keystore: SyncCryptoStorePtr =
 			Arc::new(LocalKeystore::open(keystore_path.path(), None).expect("Creates keystore"));
@@ -843,6 +845,8 @@ mod tests {
 	#[test]
 	#[ignore]
 	fn test_consensus() {
+		sp_tracing::try_init_simple();
+
 		sc_service_test::consensus(
 			crate::chain_spec::tests::integration_test_config_with_two_authorities(),
 			|config| {
diff --git a/bin/node/cli/tests/running_the_node_and_interrupt.rs b/bin/node/cli/tests/running_the_node_and_interrupt.rs
index 7a945a30a416..03a1826f2f08 100644
--- a/bin/node/cli/tests/running_the_node_and_interrupt.rs
+++ b/bin/node/cli/tests/running_the_node_and_interrupt.rs
@@ -16,23 +16,30 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+#![cfg(unix)]
+
 use assert_cmd::cargo::cargo_bin;
-use std::{convert::TryInto, process::Command, thread, time::Duration};
+use nix::{
+	sys::signal::{
+		kill,
+		Signal::{self, SIGINT, SIGTERM},
+	},
+	unistd::Pid,
+};
+use sc_service::Deref;
+use std::{
+	convert::TryInto,
+	ops::DerefMut,
+	process::{Child, Command},
+	thread,
+	time::Duration,
+};
 use tempfile::tempdir;
 
 pub mod common;
 
 #[test]
-#[cfg(unix)]
 fn running_the_node_works_and_can_be_interrupted() {
-	use nix::{
-		sys::signal::{
-			kill,
-			Signal::{self, SIGINT, SIGTERM},
-		},
-		unistd::Pid,
-	};
-
 	fn run_command_and_kill(signal: Signal) {
 		let base_path = tempdir().expect("could not create a temp dir");
 		let mut cmd = Command::new(cargo_bin("substrate"))
@@ -55,3 +62,57 @@ fn running_the_node_works_and_can_be_interrupted() {
 	run_command_and_kill(SIGINT);
 	run_command_and_kill(SIGTERM);
 }
+
+struct KillChildOnDrop(Child);
+
+impl Drop for KillChildOnDrop {
+	fn drop(&mut self) {
+		let _ = self.0.kill();
+	}
+}
+
+impl Deref for KillChildOnDrop {
+	type Target = Child;
+
+	fn deref(&self) -> &Self::Target {
+		&self.0
+	}
+}
+
+impl DerefMut for KillChildOnDrop {
+	fn deref_mut(&mut self) -> &mut Self::Target {
+		&mut self.0
+	}
+}
+
+#[test]
+fn running_two_nodes_with_the_same_ws_port_should_work() {
+	fn start_node() -> Child {
+		Command::new(cargo_bin("substrate"))
+			.args(&["--dev", "--tmp", "--ws-port=45789"])
+			.spawn()
+			.unwrap()
+	}
+
+	let mut first_node = KillChildOnDrop(start_node());
+	let mut second_node = KillChildOnDrop(start_node());
+
+	thread::sleep(Duration::from_secs(30));
+
+	assert!(first_node.try_wait().unwrap().is_none(), "The first node should still be running");
+	assert!(second_node.try_wait().unwrap().is_none(), "The second node should still be running");
+
+	kill(Pid::from_raw(first_node.id().try_into().unwrap()), SIGINT).unwrap();
+	kill(Pid::from_raw(second_node.id().try_into().unwrap()), SIGINT).unwrap();
+
+	assert_eq!(
+		common::wait_for(&mut first_node, 30).map(|x| x.success()),
+		Some(true),
+		"The first node must exit gracefully",
+	);
+	assert_eq!(
+		common::wait_for(&mut second_node, 30).map(|x| x.success()),
+		Some(true),
+		"The second node must exit gracefully",
+	);
+}
diff --git a/bin/node/test-runner-example/src/lib.rs b/bin/node/test-runner-example/src/lib.rs
index 6164372ab4f2..e7fe1ee00242 100644
--- a/bin/node/test-runner-example/src/lib.rs
+++ b/bin/node/test-runner-example/src/lib.rs
@@ -88,18 +88,17 @@ mod tests {
 	use node_cli::chain_spec::development_config;
 	use sp_keyring::sr25519::Keyring::Alice;
 	use sp_runtime::{traits::IdentifyAccount, MultiSigner};
-	use test_runner::{build_runtime, client_parts, task_executor, ConfigOrChainSpec, Node};
+	use test_runner::{build_runtime, client_parts, ConfigOrChainSpec, Node};
 
 	#[test]
 	fn test_runner() {
 		let tokio_runtime = build_runtime().unwrap();
-		let task_executor = task_executor(tokio_runtime.handle().clone());
-		let (rpc, task_manager, client, pool, command_sink, backend) = client_parts::<
-			NodeTemplateChainInfo,
-		>(
-			ConfigOrChainSpec::ChainSpec(Box::new(development_config()), task_executor),
-		)
-		.unwrap();
+		let (rpc, task_manager, client, pool, command_sink, backend) =
+			client_parts::<NodeTemplateChainInfo>(ConfigOrChainSpec::ChainSpec(
+				Box::new(development_config()),
+				tokio_runtime.handle().clone(),
+			))
+			.unwrap();
 		let node = Node::<NodeTemplateChainInfo>::new(
 			rpc,
 			task_manager,
diff --git a/client/cli/src/commands/run_cmd.rs b/client/cli/src/commands/run_cmd.rs
index fcc486297b21..98f2090c6f44 100644
--- a/client/cli/src/commands/run_cmd.rs
+++ b/client/cli/src/commands/run_cmd.rs
@@ -127,10 +127,6 @@ pub struct RunCmd {
 	#[structopt(long = "ws-max-connections", value_name = "COUNT")]
 	pub ws_max_connections: Option<usize>,
 
-	/// Size of the RPC HTTP server thread pool.
-	#[structopt(long = "rpc-http-threads", value_name = "COUNT")]
-	pub rpc_http_threads: Option<usize>,
-
 	/// Specify browser Origins allowed to access the HTTP & WS RPC servers.
 	///
 	/// A comma-separated list of origins (protocol://domain or special `null`
@@ -381,10 +377,6 @@ impl CliConfiguration for RunCmd {
 		Ok(self.ws_max_connections)
 	}
 
-	fn rpc_http_threads(&self) -> Result<Option<usize>> {
-		Ok(self.rpc_http_threads)
-	}
-
 	fn rpc_cors(&self, is_dev: bool) -> Result<Option<Vec<String>>> {
 		Ok(self
 			.rpc_cors
diff --git a/client/cli/src/config.rs b/client/cli/src/config.rs
index 36f267e4a300..59fc6bd438a1 100644
--- a/client/cli/src/config.rs
+++ b/client/cli/src/config.rs
@@ -29,7 +29,7 @@ use sc_service::{
 	config::{
 		BasePath, Configuration, DatabaseSource, KeystoreConfig, NetworkConfiguration,
 		NodeKeyConfig, OffchainWorkerConfig, PrometheusConfig, PruningMode, Role, RpcMethods,
-		TaskExecutor, TelemetryEndpoints, TransactionPoolOptions, WasmExecutionMethod,
+		TelemetryEndpoints, TransactionPoolOptions, WasmExecutionMethod,
 	},
 	ChainSpec, KeepBlocks, TracingReceiver, TransactionStorageMode,
 };
@@ -348,13 +348,6 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 		Ok(None)
 	}
 
-	/// Get the RPC HTTP thread pool size (`None` for a default 4-thread pool config).
-	///
-	/// By default this is `None`.
-	fn rpc_http_threads(&self) -> Result<Option<usize>> {
-		Ok(None)
-	}
-
 	/// Get the RPC cors (`None` if disabled)
 	///
 	/// By default this is `Some(Vec::new())`.
@@ -465,7 +458,7 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 	fn create_configuration<C: SubstrateCli>(
 		&self,
 		cli: &C,
-		task_executor: TaskExecutor,
+		tokio_handle: tokio::runtime::Handle,
 	) -> Result<Configuration> {
 		let is_dev = self.is_dev()?;
 		let chain_id = self.chain_id(is_dev)?;
@@ -490,7 +483,7 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 		Ok(Configuration {
 			impl_name: C::impl_name(),
 			impl_version: C::impl_version(),
-			task_executor,
+			tokio_handle,
 			transaction_pool: self.transaction_pool()?,
 			network: self.network_config(
 				&chain_spec,
@@ -518,7 +511,6 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 			rpc_ipc: self.rpc_ipc()?,
 			rpc_methods: self.rpc_methods()?,
 			rpc_ws_max_connections: self.rpc_ws_max_connections()?,
-			rpc_http_threads: self.rpc_http_threads()?,
 			rpc_cors: self.rpc_cors(is_dev)?,
 			rpc_max_payload: self.rpc_max_payload()?,
 			prometheus_config: self.prometheus_config(DCV::prometheus_listen_port())?,
diff --git a/client/cli/src/lib.rs b/client/cli/src/lib.rs
index b560594f77c8..bb1bff94145f 100644
--- a/client/cli/src/lib.rs
+++ b/client/cli/src/lib.rs
@@ -35,8 +35,8 @@ pub use config::*;
 pub use error::*;
 pub use params::*;
 pub use runner::*;
+use sc_service::Configuration;
 pub use sc_service::{ChainSpec, Role};
-use sc_service::{Configuration, TaskExecutor};
 pub use sc_tracing::logging::LoggerBuilder;
 pub use sp_version::RuntimeVersion;
 use std::io::Write;
@@ -216,9 +216,9 @@ pub trait SubstrateCli: Sized {
 	fn create_configuration<T: CliConfiguration<DVC>, DVC: DefaultConfigurationValues>(
 		&self,
 		command: &T,
-		task_executor: TaskExecutor,
+		tokio_handle: tokio::runtime::Handle,
 	) -> error::Result<Configuration> {
-		command.create_configuration(self, task_executor)
+		command.create_configuration(self, tokio_handle)
 	}
 
 	/// Create a runner for the command provided in argument. This will create a Configuration and
diff --git a/client/cli/src/runner.rs b/client/cli/src/runner.rs
index 2ec200d9285b..6f03e02a12d0 100644
--- a/client/cli/src/runner.rs
+++ b/client/cli/src/runner.rs
@@ -20,7 +20,7 @@ use crate::{error::Error as CliError, CliConfiguration, Result, SubstrateCli};
 use chrono::prelude::*;
 use futures::{future, future::FutureExt, pin_mut, select, Future};
 use log::info;
-use sc_service::{Configuration, Error as ServiceError, TaskManager, TaskType};
+use sc_service::{Configuration, Error as ServiceError, TaskManager};
 use sc_utils::metrics::{TOKIO_THREADS_ALIVE, TOKIO_THREADS_TOTAL};
 use std::marker::PhantomData;
 
@@ -116,15 +116,8 @@ impl<C: SubstrateCli> Runner<C> {
 		let tokio_runtime = build_runtime()?;
 		let runtime_handle = tokio_runtime.handle().clone();
 
-		let task_executor = move |fut, task_type| match task_type {
-			TaskType::Async => runtime_handle.spawn(fut).map(drop),
-			TaskType::Blocking => runtime_handle
-				.spawn_blocking(move || futures::executor::block_on(fut))
-				.map(drop),
-		};
-
 		Ok(Runner {
-			config: command.create_configuration(cli, task_executor.into())?,
+			config: command.create_configuration(cli, runtime_handle)?,
 			tokio_runtime,
 			phantom: PhantomData,
 		})
diff --git a/client/rpc-servers/Cargo.toml b/client/rpc-servers/Cargo.toml
index fede65fa7a05..e249bb1ed8ae 100644
--- a/client/rpc-servers/Cargo.toml
+++ b/client/rpc-servers/Cargo.toml
@@ -19,6 +19,7 @@ pubsub = { package = "jsonrpc-pubsub", version = "18.0.0" }
 log = "0.4.8"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
 serde_json = "1.0.41"
+tokio = "1.10"
 http = { package = "jsonrpc-http-server", version = "18.0.0" }
 ipc = { package = "jsonrpc-ipc-server", version = "18.0.0" }
 ws = { package = "jsonrpc-ws-server", version = "18.0.0" }
diff --git a/client/rpc-servers/src/lib.rs b/client/rpc-servers/src/lib.rs
index d60e561ed775..65ed6a914b19 100644
--- a/client/rpc-servers/src/lib.rs
+++ b/client/rpc-servers/src/lib.rs
@@ -36,9 +36,6 @@ pub const RPC_MAX_PAYLOAD_DEFAULT: usize = 15 * MEGABYTE;
 /// Default maximum number of connections for WS RPC servers.
 const WS_MAX_CONNECTIONS: usize = 100;
 
-/// Default thread pool size for RPC HTTP servers.
-const HTTP_THREADS: usize = 4;
-
 /// The RPC IoHandler containing all requested APIs.
 pub type RpcHandler<T> = pubsub::PubSubHandler<T, RpcMiddleware>;
 
@@ -130,17 +127,18 @@ impl ws::SessionStats for ServerMetrics {
 /// Start HTTP server listening on given address.
 pub fn start_http<M: pubsub::PubSubMetadata + Default + Unpin>(
 	addr: &std::net::SocketAddr,
-	thread_pool_size: Option<usize>,
 	cors: Option<&Vec<String>>,
 	io: RpcHandler<M>,
 	maybe_max_payload_mb: Option<usize>,
+	tokio_handle: tokio::runtime::Handle,
 ) -> io::Result<http::Server> {
 	let max_request_body_size = maybe_max_payload_mb
 		.map(|mb| mb.saturating_mul(MEGABYTE))
 		.unwrap_or(RPC_MAX_PAYLOAD_DEFAULT);
 
 	http::ServerBuilder::new(io)
-		.threads(thread_pool_size.unwrap_or(HTTP_THREADS))
+		.threads(1)
+		.event_loop_executor(tokio_handle)
 		.health_api(("/health", "system_health"))
 		.allowed_hosts(hosts_filtering(cors.is_some()))
 		.rest_api(if cors.is_some() { http::RestApi::Secure } else { http::RestApi::Unsecure })
@@ -175,6 +173,7 @@ pub fn start_ws<
 	io: RpcHandler<M>,
 	maybe_max_payload_mb: Option<usize>,
 	server_metrics: ServerMetrics,
+	tokio_handle: tokio::runtime::Handle,
 ) -> io::Result<ws::Server> {
 	let rpc_max_payload = maybe_max_payload_mb
 		.map(|mb| mb.saturating_mul(MEGABYTE))
@@ -182,6 +181,7 @@ pub fn start_ws<
 	ws::ServerBuilder::with_meta_extractor(io, |context: &ws::RequestContext| {
 		context.sender().into()
 	})
+	.event_loop_executor(tokio_handle)
 	.max_payload(rpc_max_payload)
 	.max_connections(max_connections.unwrap_or(WS_MAX_CONNECTIONS))
 	.allowed_origins(map_cors(cors))
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index 6832ed44d592..ca81ede9a6a9 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -79,11 +79,11 @@ parity-util-mem = { version = "0.10.0", default-features = false, features = [
 	"primitive-types",
 ] }
 async-trait = "0.1.50"
+tokio = { version = "1.10", features = ["time", "rt-multi-thread"] }
 tempfile = "3.1.0"
 directories = "3.0.2"
 
 [dev-dependencies]
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 substrate-test-runtime = { version = "2.0.0", path = "../../test-utils/runtime/" }
-tokio = { version = "1.10", features = ["time"] }
 async-std = { version = "1.6.5", default-features = false }
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index 7b0e2203dffd..e01a85878817 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -286,7 +286,7 @@ where
 
 	let task_manager = {
 		let registry = config.prometheus_config.as_ref().map(|cfg| &cfg.registry);
-		TaskManager::new(config.task_executor.clone(), registry)?
+		TaskManager::new(config.tokio_handle.clone(), registry)?
 	};
 
 	let chain_spec = &config.chain_spec;
@@ -372,7 +372,7 @@ where
 	let keystore_container = KeystoreContainer::new(&config.keystore)?;
 	let task_manager = {
 		let registry = config.prometheus_config.as_ref().map(|cfg| &cfg.registry);
-		TaskManager::new(config.task_executor.clone(), registry)?
+		TaskManager::new(config.tokio_handle.clone(), registry)?
 	};
 
 	let db_storage = {
diff --git a/client/service/src/config.rs b/client/service/src/config.rs
index 20a9f58d21fd..a98a34b473ce 100644
--- a/client/service/src/config.rs
+++ b/client/service/src/config.rs
@@ -36,12 +36,9 @@ pub use sc_telemetry::TelemetryEndpoints;
 pub use sc_transaction_pool::Options as TransactionPoolOptions;
 use sp_core::crypto::SecretString;
 use std::{
-	future::Future,
 	io,
 	net::SocketAddr,
 	path::{Path, PathBuf},
-	pin::Pin,
-	sync::Arc,
 };
 use tempfile::TempDir;
 
@@ -54,8 +51,8 @@ pub struct Configuration {
 	pub impl_version: String,
 	/// Node role.
 	pub role: Role,
-	/// How to spawn background tasks. Mandatory, otherwise creating a `Service` will error.
-	pub task_executor: TaskExecutor,
+	/// Handle to the tokio runtime. Will be used to spawn futures by the task manager.
+	pub tokio_handle: tokio::runtime::Handle,
 	/// Extrinsic pool configuration.
 	pub transaction_pool: TransactionPoolOptions,
 	/// Network configuration.
@@ -94,8 +91,6 @@ pub struct Configuration {
 	pub rpc_ipc: Option<String>,
 	/// Maximum number of connections for WebSockets RPC server. `None` if default.
 	pub rpc_ws_max_connections: Option<usize>,
-	/// Size of the RPC HTTP server thread pool. `None` if default.
-	pub rpc_http_threads: Option<usize>,
 	/// CORS settings for HTTP & WS servers. `None` if all origins are allowed.
 	pub rpc_cors: Option<Vec<String>>,
 	/// RPC methods to expose (by default only a safe subset or all of them).
@@ -305,62 +300,3 @@ impl std::convert::From<PathBuf> for BasePath {
 		BasePath::new(path)
 	}
 }
-
-// NOTE: here for code readability.
-pub(crate) type SomeFuture = Pin<Box<dyn Future<Output = ()> + Send>>;
-pub(crate) type JoinFuture = Pin<Box<dyn Future<Output = ()> + Send>>;
-
-/// Callable object that execute tasks.
-///
-/// This struct can be created easily using `Into`.
-///
-/// # Examples
-///
-/// ## Using tokio
-///
-/// ```
-/// # use sc_service::TaskExecutor;
-/// use futures::future::FutureExt;
-/// use tokio::runtime::Runtime;
-///
-/// let runtime = Runtime::new().unwrap();
-/// let handle = runtime.handle().clone();
-/// let task_executor: TaskExecutor = (move |future, _task_type| {
-///     handle.spawn(future).map(|_| ())
-/// }).into();
-/// ```
-///
-/// ## Using async-std
-///
-/// ```
-/// # use sc_service::TaskExecutor;
-/// let task_executor: TaskExecutor = (|future, _task_type| {
-///     // NOTE: async-std's JoinHandle is not a Result so we don't need to map the result
-///     async_std::task::spawn(future)
-/// }).into();
-/// ```
-#[derive(Clone)]
-pub struct TaskExecutor(Arc<dyn Fn(SomeFuture, TaskType) -> JoinFuture + Send + Sync>);
-
-impl std::fmt::Debug for TaskExecutor {
-	fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-		write!(f, "TaskExecutor")
-	}
-}
-
-impl<F, FUT> std::convert::From<F> for TaskExecutor
-where
-	F: Fn(SomeFuture, TaskType) -> FUT + Send + Sync + 'static,
-	FUT: Future<Output = ()> + Send + 'static,
-{
-	fn from(func: F) -> Self {
-		Self(Arc::new(move |fut, tt| Box::pin(func(fut, tt))))
-	}
-}
-
-impl TaskExecutor {
-	/// Spawns a new asynchronous task.
-	pub fn spawn(&self, future: SomeFuture, task_type: TaskType) -> JoinFuture {
-		self.0(future, task_type)
-	}
-}
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index 6e4208138a3b..7284747424aa 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -58,8 +58,8 @@ pub use self::{
 	error::Error,
 };
 pub use config::{
-	BasePath, Configuration, DatabaseSource, KeepBlocks, PruningMode, Role, RpcMethods,
-	TaskExecutor, TaskType, TransactionStorageMode,
+	BasePath, Configuration, DatabaseSource, KeepBlocks, PruningMode, Role, RpcMethods, TaskType,
+	TransactionStorageMode,
 };
 pub use sc_chain_spec::{
 	ChainSpec, ChainType, Extension as ChainSpecExtension, GenericChainSpec, NoExtension,
@@ -395,7 +395,6 @@ fn start_rpc_servers<
 		maybe_start_server(config.rpc_http, |address| {
 			sc_rpc_server::start_http(
 				address,
-				config.rpc_http_threads,
 				config.rpc_cors.as_ref(),
 				gen_handler(
 					deny_unsafe(&address, &config.rpc_methods),
@@ -406,6 +405,7 @@ fn start_rpc_servers<
 					),
 				)?,
 				config.rpc_max_payload,
+				config.tokio_handle.clone(),
 			)
 			.map_err(Error::from)
 		})?
@@ -425,6 +425,7 @@ fn start_rpc_servers<
 				)?,
 				config.rpc_max_payload,
 				server_metrics.clone(),
+				config.tokio_handle.clone(),
 			)
 			.map_err(Error::from)
 		})?
diff --git a/client/service/src/task_manager/mod.rs b/client/service/src/task_manager/mod.rs
index 7842acdf0455..c827aa71dac2 100644
--- a/client/service/src/task_manager/mod.rs
+++ b/client/service/src/task_manager/mod.rs
@@ -18,23 +18,20 @@
 
 //! Substrate service tasks management module.
 
-use crate::{
-	config::{JoinFuture, TaskExecutor, TaskType},
-	Error,
-};
+use crate::{config::TaskType, Error};
 use exit_future::Signal;
 use futures::{
 	future::{join_all, pending, select, try_join_all, BoxFuture, Either},
-	sink::SinkExt,
 	Future, FutureExt, StreamExt,
 };
-use log::{debug, error};
+use log::debug;
 use prometheus_endpoint::{
 	exponential_buckets, register, CounterVec, HistogramOpts, HistogramVec, Opts, PrometheusError,
 	Registry, U64,
 };
 use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use std::{panic, pin::Pin, result::Result};
+use tokio::{runtime::Handle, task::JoinHandle};
 use tracing_futures::Instrument;
 
 mod prometheus_future;
@@ -45,9 +42,9 @@ mod tests;
 #[derive(Clone)]
 pub struct SpawnTaskHandle {
 	on_exit: exit_future::Exit,
-	executor: TaskExecutor,
+	tokio_handle: Handle,
 	metrics: Option<Metrics>,
-	task_notifier: TracingUnboundedSender<JoinFuture>,
+	task_notifier: TracingUnboundedSender<JoinHandle<()>>,
 }
 
 impl SpawnTaskHandle {
@@ -126,19 +123,20 @@ impl SpawnTaskHandle {
 				futures::pin_mut!(task);
 				let _ = select(on_exit, task).await;
 			}
+		}
+		.in_current_span();
+
+		let join_handle = match task_type {
+			TaskType::Async => self.tokio_handle.spawn(future),
+			TaskType::Blocking => {
+				let handle = self.tokio_handle.clone();
+				self.tokio_handle.spawn_blocking(move || {
+					handle.block_on(future);
+				})
+			},
 		};
 
-		let join_handle = self.executor.spawn(future.in_current_span().boxed(), task_type);
-
-		let mut task_notifier = self.task_notifier.clone();
-		self.executor.spawn(
-			Box::pin(async move {
-				if let Err(err) = task_notifier.send(join_handle).await {
-					error!("Could not send spawned task handle to queue: {}", err);
-				}
-			}),
-			TaskType::Async,
-		);
+		let _ = self.task_notifier.unbounded_send(join_handle);
 	}
 }
 
@@ -222,8 +220,8 @@ pub struct TaskManager {
 	on_exit: exit_future::Exit,
 	/// A signal that makes the exit future above resolve, fired on service drop.
 	signal: Option<Signal>,
-	/// How to spawn background tasks.
-	executor: TaskExecutor,
+	/// Tokio runtime handle that is used to spawn futures.
+	tokio_handle: Handle,
 	/// Prometheus metric where to report the polling times.
 	metrics: Option<Metrics>,
 	/// Send a signal when a spawned essential task has concluded. The next time
@@ -234,9 +232,9 @@ pub struct TaskManager {
 	/// Things to keep alive until the task manager is dropped.
 	keep_alive: Box<dyn std::any::Any + Send>,
 	/// A sender to a stream of background tasks. This is used for the completion future.
-	task_notifier: TracingUnboundedSender<JoinFuture>,
+	task_notifier: TracingUnboundedSender<JoinHandle<()>>,
 	/// This future will complete when all the tasks are joined and the stream is closed.
-	completion_future: JoinFuture,
+	completion_future: JoinHandle<()>,
 	/// A list of other `TaskManager`'s to terminate and gracefully shutdown when the parent
 	/// terminates and gracefully shutdown. Also ends the parent `future()` if a child's essential
 	/// task fails.
@@ -247,7 +245,7 @@ impl TaskManager {
 	/// If a Prometheus registry is passed, it will be used to report statistics about the
 	/// service tasks.
 	pub fn new(
-		executor: TaskExecutor,
+		tokio_handle: Handle,
 		prometheus_registry: Option<&Registry>,
 	) -> Result<Self, PrometheusError> {
 		let (signal, on_exit) = exit_future::signal();
@@ -261,13 +259,15 @@ impl TaskManager {
 		// NOTE: for_each_concurrent will await on all the JoinHandle futures at the same time. It
 		// is possible to limit this but it's actually better for the memory foot print to await
 		// them all to not accumulate anything on that stream.
-		let completion_future = executor
-			.spawn(Box::pin(background_tasks.for_each_concurrent(None, |x| x)), TaskType::Async);
+		let completion_future =
+			tokio_handle.spawn(background_tasks.for_each_concurrent(None, |x| async move {
+				let _ = x.await;
+			}));
 
 		Ok(Self {
 			on_exit,
 			signal: Some(signal),
-			executor,
+			tokio_handle,
 			metrics,
 			essential_failed_tx,
 			essential_failed_rx,
@@ -282,7 +282,7 @@ impl TaskManager {
 	pub fn spawn_handle(&self) -> SpawnTaskHandle {
 		SpawnTaskHandle {
 			on_exit: self.on_exit.clone(),
-			executor: self.executor.clone(),
+			tokio_handle: self.tokio_handle.clone(),
 			metrics: self.metrics.clone(),
 			task_notifier: self.task_notifier.clone(),
 		}
@@ -310,14 +310,9 @@ impl TaskManager {
 
 		Box::pin(async move {
 			join_all(children_shutdowns).await;
-			completion_future.await;
-
-			// The keep_alive stuff is holding references to some RPC handles etc. These
-			// RPC handles spawn their own tokio stuff and that doesn't like to be closed in an
-			// async context. So, we move the deletion to some other thread.
-			std::thread::spawn(move || {
-				let _ = keep_alive;
-			});
+			let _ = completion_future.await;
+
+			let _ = keep_alive;
 		})
 	}
 
diff --git a/client/service/src/task_manager/tests.rs b/client/service/src/task_manager/tests.rs
index 5b6cd7acdd4a..291d71ebaf03 100644
--- a/client/service/src/task_manager/tests.rs
+++ b/client/service/src/task_manager/tests.rs
@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::{config::TaskExecutor, task_manager::TaskManager};
+use crate::task_manager::TaskManager;
 use futures::{future::FutureExt, pin_mut, select};
 use parking_lot::Mutex;
 use std::{any::Any, sync::Arc, time::Duration};
@@ -84,17 +84,16 @@ async fn run_background_task_blocking(duration: Duration, _keep_alive: impl Any)
 	}
 }
 
-fn new_task_manager(task_executor: TaskExecutor) -> TaskManager {
-	TaskManager::new(task_executor, None).unwrap()
+fn new_task_manager(tokio_handle: tokio::runtime::Handle) -> TaskManager {
+	TaskManager::new(tokio_handle, None).unwrap()
 }
 
 #[test]
 fn ensure_tasks_are_awaited_on_shutdown() {
 	let runtime = tokio::runtime::Runtime::new().unwrap();
 	let handle = runtime.handle().clone();
-	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
-	let task_manager = new_task_manager(task_executor);
+	let task_manager = new_task_manager(handle);
 	let spawn_handle = task_manager.spawn_handle();
 	let drop_tester = DropTester::new();
 	spawn_handle.spawn("task1", run_background_task(drop_tester.new_ref()));
@@ -111,9 +110,8 @@ fn ensure_tasks_are_awaited_on_shutdown() {
 fn ensure_keep_alive_during_shutdown() {
 	let runtime = tokio::runtime::Runtime::new().unwrap();
 	let handle = runtime.handle().clone();
-	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
-	let mut task_manager = new_task_manager(task_executor);
+	let mut task_manager = new_task_manager(handle);
 	let spawn_handle = task_manager.spawn_handle();
 	let drop_tester = DropTester::new();
 	task_manager.keep_alive(drop_tester.new_ref());
@@ -130,9 +128,8 @@ fn ensure_keep_alive_during_shutdown() {
 fn ensure_blocking_futures_are_awaited_on_shutdown() {
 	let runtime = tokio::runtime::Runtime::new().unwrap();
 	let handle = runtime.handle().clone();
-	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
-	let task_manager = new_task_manager(task_executor);
+	let task_manager = new_task_manager(handle);
 	let spawn_handle = task_manager.spawn_handle();
 	let drop_tester = DropTester::new();
 	spawn_handle.spawn(
@@ -155,9 +152,8 @@ fn ensure_blocking_futures_are_awaited_on_shutdown() {
 fn ensure_no_task_can_be_spawn_after_terminate() {
 	let runtime = tokio::runtime::Runtime::new().unwrap();
 	let handle = runtime.handle().clone();
-	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
-	let mut task_manager = new_task_manager(task_executor);
+	let mut task_manager = new_task_manager(handle);
 	let spawn_handle = task_manager.spawn_handle();
 	let drop_tester = DropTester::new();
 	spawn_handle.spawn("task1", run_background_task(drop_tester.new_ref()));
@@ -176,9 +172,8 @@ fn ensure_no_task_can_be_spawn_after_terminate() {
 fn ensure_task_manager_future_ends_when_task_manager_terminated() {
 	let runtime = tokio::runtime::Runtime::new().unwrap();
 	let handle = runtime.handle().clone();
-	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
-	let mut task_manager = new_task_manager(task_executor);
+	let mut task_manager = new_task_manager(handle);
 	let spawn_handle = task_manager.spawn_handle();
 	let drop_tester = DropTester::new();
 	spawn_handle.spawn("task1", run_background_task(drop_tester.new_ref()));
@@ -197,9 +192,8 @@ fn ensure_task_manager_future_ends_when_task_manager_terminated() {
 fn ensure_task_manager_future_ends_with_error_when_essential_task_fails() {
 	let runtime = tokio::runtime::Runtime::new().unwrap();
 	let handle = runtime.handle().clone();
-	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
-	let mut task_manager = new_task_manager(task_executor);
+	let mut task_manager = new_task_manager(handle);
 	let spawn_handle = task_manager.spawn_handle();
 	let spawn_essential_handle = task_manager.spawn_essential_handle();
 	let drop_tester = DropTester::new();
@@ -222,12 +216,11 @@ fn ensure_task_manager_future_ends_with_error_when_essential_task_fails() {
 fn ensure_children_tasks_ends_when_task_manager_terminated() {
 	let runtime = tokio::runtime::Runtime::new().unwrap();
 	let handle = runtime.handle().clone();
-	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
-	let mut task_manager = new_task_manager(task_executor.clone());
-	let child_1 = new_task_manager(task_executor.clone());
+	let mut task_manager = new_task_manager(handle.clone());
+	let child_1 = new_task_manager(handle.clone());
 	let spawn_handle_child_1 = child_1.spawn_handle();
-	let child_2 = new_task_manager(task_executor.clone());
+	let child_2 = new_task_manager(handle.clone());
 	let spawn_handle_child_2 = child_2.spawn_handle();
 	task_manager.add_child(child_1);
 	task_manager.add_child(child_2);
@@ -251,13 +244,12 @@ fn ensure_children_tasks_ends_when_task_manager_terminated() {
 fn ensure_task_manager_future_ends_with_error_when_childs_essential_task_fails() {
 	let runtime = tokio::runtime::Runtime::new().unwrap();
 	let handle = runtime.handle().clone();
-	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
-	let mut task_manager = new_task_manager(task_executor.clone());
-	let child_1 = new_task_manager(task_executor.clone());
+	let mut task_manager = new_task_manager(handle.clone());
+	let child_1 = new_task_manager(handle.clone());
 	let spawn_handle_child_1 = child_1.spawn_handle();
 	let spawn_essential_handle_child_1 = child_1.spawn_essential_handle();
-	let child_2 = new_task_manager(task_executor.clone());
+	let child_2 = new_task_manager(handle.clone());
 	let spawn_handle_child_2 = child_2.spawn_handle();
 	task_manager.add_child(child_1);
 	task_manager.add_child(child_2);
@@ -284,12 +276,11 @@ fn ensure_task_manager_future_ends_with_error_when_childs_essential_task_fails()
 fn ensure_task_manager_future_continues_when_childs_not_essential_task_fails() {
 	let runtime = tokio::runtime::Runtime::new().unwrap();
 	let handle = runtime.handle().clone();
-	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
-	let mut task_manager = new_task_manager(task_executor.clone());
-	let child_1 = new_task_manager(task_executor.clone());
+	let mut task_manager = new_task_manager(handle.clone());
+	let child_1 = new_task_manager(handle.clone());
 	let spawn_handle_child_1 = child_1.spawn_handle();
-	let child_2 = new_task_manager(task_executor.clone());
+	let child_2 = new_task_manager(handle.clone());
 	let spawn_handle_child_2 = child_2.spawn_handle();
 	task_manager.add_child(child_1);
 	task_manager.add_child(child_2);
diff --git a/client/service/test/src/lib.rs b/client/service/test/src/lib.rs
index 61313b4488cb..8000c536cdf9 100644
--- a/client/service/test/src/lib.rs
+++ b/client/service/test/src/lib.rs
@@ -18,7 +18,7 @@
 
 //! Service integration test utils.
 
-use futures::{task::Poll, Future, FutureExt, TryFutureExt as _};
+use futures::{task::Poll, Future, TryFutureExt as _};
 use log::{debug, info};
 use parking_lot::Mutex;
 use sc_client_api::{Backend, CallExecutor};
@@ -30,7 +30,7 @@ use sc_service::{
 	client::Client,
 	config::{BasePath, DatabaseSource, KeystoreConfig},
 	ChainSpecExtension, Configuration, Error, GenericChainSpec, KeepBlocks, Role, RuntimeGenesis,
-	SpawnTaskHandle, TaskExecutor, TaskManager, TransactionStorageMode,
+	SpawnTaskHandle, TaskManager, TransactionStorageMode,
 };
 use sc_transaction_pool_api::TransactionPool;
 use sp_blockchain::HeaderBackend;
@@ -55,6 +55,16 @@ struct TestNet<G, E, F, L, U> {
 	nodes: usize,
 }
 
+impl<G, E, F, L, U> Drop for TestNet<G, E, F, L, U> {
+	fn drop(&mut self) {
+		// Drop the nodes before dropping the runtime, as the runtime otherwise waits for all
+		// futures to be ended and we run into a dead lock.
+		self.full_nodes.drain(..);
+		self.light_nodes.drain(..);
+		self.authority_nodes.drain(..);
+	}
+}
+
 pub trait TestNetNode:
 	Clone + Future<Output = Result<(), sc_service::Error>> + Send + 'static
 {
@@ -200,7 +210,7 @@ fn node_config<
 	index: usize,
 	spec: &GenericChainSpec<G, E>,
 	role: Role,
-	task_executor: TaskExecutor,
+	tokio_handle: tokio::runtime::Handle,
 	key_seed: Option<String>,
 	base_port: u16,
 	root: &TempDir,
@@ -229,7 +239,7 @@ fn node_config<
 		impl_name: String::from("network-test-impl"),
 		impl_version: String::from("0.1"),
 		role,
-		task_executor,
+		tokio_handle,
 		transaction_pool: Default::default(),
 		network: network_config,
 		keystore_remote: Default::default(),
@@ -248,7 +258,6 @@ fn node_config<
 		rpc_ipc: None,
 		rpc_ws: None,
 		rpc_ws_max_connections: None,
-		rpc_http_threads: None,
 		rpc_cors: None,
 		rpc_methods: Default::default(),
 		rpc_max_payload: None,
@@ -308,21 +317,13 @@ where
 		authorities: impl Iterator<Item = (String, impl FnOnce(Configuration) -> Result<(F, U), Error>)>,
 	) {
 		let handle = self.runtime.handle().clone();
-		let task_executor: TaskExecutor = {
-			let executor = handle.clone();
-			(move |fut: Pin<Box<dyn futures::Future<Output = ()> + Send>>, _| {
-				executor.spawn(fut.unit_error());
-				async {}
-			})
-			.into()
-		};
 
 		for (key, authority) in authorities {
 			let node_config = node_config(
 				self.nodes,
 				&self.chain_spec,
 				Role::Authority,
-				task_executor.clone(),
+				handle.clone(),
 				Some(key),
 				self.base_port,
 				&temp,
@@ -343,7 +344,7 @@ where
 				self.nodes,
 				&self.chain_spec,
 				Role::Full,
-				task_executor.clone(),
+				handle.clone(),
 				None,
 				self.base_port,
 				&temp,
@@ -363,7 +364,7 @@ where
 				self.nodes,
 				&self.chain_spec,
 				Role::Light,
-				task_executor.clone(),
+				handle.clone(),
 				None,
 				self.base_port,
 				&temp,
diff --git a/test-utils/derive/src/lib.rs b/test-utils/derive/src/lib.rs
index 2205b259e3e6..3f14f67477fa 100644
--- a/test-utils/derive/src/lib.rs
+++ b/test-utils/derive/src/lib.rs
@@ -36,18 +36,9 @@ fn parse_knobs(
 	let attrs = &input.attrs;
 	let vis = input.vis;
 
-	if sig.inputs.len() != 1 {
-		let msg = "the test function accepts only one argument of type sc_service::TaskExecutor";
-		return Err(syn::Error::new_spanned(&sig, msg))
+	if !sig.inputs.is_empty() {
+		return Err(syn::Error::new_spanned(&sig, "No arguments expected for tests."))
 	}
-	let (task_executor_name, task_executor_type) = match sig.inputs.pop().map(|x| x.into_value()) {
-		Some(syn::FnArg::Typed(x)) => (x.pat, x.ty),
-		_ => {
-			let msg =
-				"the test function accepts only one argument of type sc_service::TaskExecutor";
-			return Err(syn::Error::new_spanned(&sig, msg))
-		},
-	};
 
 	let crate_name = match crate_name("substrate-test-utils") {
 		Ok(FoundCrate::Itself) => syn::Ident::new("substrate_test_utils", Span::call_site().into()),
@@ -65,12 +56,6 @@ fn parse_knobs(
 		#header
 		#(#attrs)*
 		#vis #sig {
-			use #crate_name::futures::future::FutureExt;
-
-			let #task_executor_name: #task_executor_type = (|fut, _| {
-				#crate_name::tokio::spawn(fut).map(drop)
-			})
-			.into();
 			if #crate_name::tokio::time::timeout(
 				std::time::Duration::from_secs(
 					std::env::var("SUBSTRATE_TEST_TIMEOUT")
diff --git a/test-utils/src/lib.rs b/test-utils/src/lib.rs
index 27f13e2a7b30..b68994926533 100644
--- a/test-utils/src/lib.rs
+++ b/test-utils/src/lib.rs
@@ -19,8 +19,7 @@
 
 #[doc(hidden)]
 pub use futures;
-/// Marks async function to be executed by an async runtime and provide a `TaskExecutor`,
-/// suitable to test environment.
+/// Marks async function to be executed by an async runtime suitable to test environment.
 ///
 /// # Requirements
 ///
@@ -30,10 +29,8 @@ pub use futures;
 ///
 /// ```
 /// #[substrate_test_utils::test]
-/// async fn basic_test(task_executor: TaskExecutor) {
+/// async fn basic_test() {
 ///     assert!(true);
-///     // create your node in here and use task_executor
-///     // then don't forget to gracefully shutdown your node before exit
 /// }
 /// ```
 pub use substrate_test_utils_derive::test;
diff --git a/test-utils/test-crate/src/main.rs b/test-utils/test-crate/src/main.rs
index 2f04568591af..554adcb88406 100644
--- a/test-utils/test-crate/src/main.rs
+++ b/test-utils/test-crate/src/main.rs
@@ -18,7 +18,7 @@
 
 #[cfg(test)]
 #[test_utils::test]
-async fn basic_test(_: sc_service::TaskExecutor) {
+async fn basic_test() {
 	assert!(true);
 }
 
diff --git a/test-utils/test-runner/src/client.rs b/test-utils/test-runner/src/client.rs
index 6622c1f91942..58c4cf6503a9 100644
--- a/test-utils/test-runner/src/client.rs
+++ b/test-utils/test-runner/src/client.rs
@@ -29,7 +29,7 @@ use sc_client_api::backend::Backend;
 use sc_executor::NativeElseWasmExecutor;
 use sc_service::{
 	build_network, new_full_parts, spawn_tasks, BuildNetworkParams, ChainSpec, Configuration,
-	SpawnTasksParams, TFullBackend, TFullClient, TaskExecutor, TaskManager,
+	SpawnTasksParams, TFullBackend, TFullClient, TaskManager,
 };
 use sc_transaction_pool::BasicPool;
 use sc_transaction_pool_api::TransactionPool;
@@ -74,7 +74,7 @@ pub enum ConfigOrChainSpec {
 	/// Configuration object
 	Config(Configuration),
 	/// Chain spec object
-	ChainSpec(Box<dyn ChainSpec>, TaskExecutor),
+	ChainSpec(Box<dyn ChainSpec>, tokio::runtime::Handle),
 }
 /// Creates all the client parts you need for [`Node`](crate::node::Node)
 pub fn client_parts<T>(
@@ -103,8 +103,8 @@ where
 	use sp_consensus_babe::AuthorityId;
 	let config = match config_or_chain_spec {
 		ConfigOrChainSpec::Config(config) => config,
-		ConfigOrChainSpec::ChainSpec(chain_spec, task_executor) =>
-			default_config(task_executor, chain_spec),
+		ConfigOrChainSpec::ChainSpec(chain_spec, tokio_handle) =>
+			default_config(tokio_handle, chain_spec),
 	};
 
 	let executor = NativeElseWasmExecutor::<T::ExecutorDispatch>::new(
diff --git a/test-utils/test-runner/src/utils.rs b/test-utils/test-runner/src/utils.rs
index 3caba633dcfa..8e8c84e6b4f8 100644
--- a/test-utils/test-runner/src/utils.rs
+++ b/test-utils/test-runner/src/utils.rs
@@ -16,7 +16,6 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use futures::FutureExt;
 use sc_client_api::execution_extensions::ExecutionStrategies;
 use sc_executor::WasmExecutionMethod;
 use sc_informant::OutputFormat;
@@ -26,7 +25,7 @@ use sc_network::{
 };
 use sc_service::{
 	config::KeystoreConfig, BasePath, ChainSpec, Configuration, DatabaseSource, KeepBlocks,
-	TaskExecutor, TaskType, TransactionStorageMode,
+	TransactionStorageMode,
 };
 use sp_keyring::sr25519::Keyring::Alice;
 use tokio::runtime::Handle;
@@ -43,10 +42,7 @@ pub fn base_path() -> BasePath {
 }
 
 /// Produces a default configuration object, suitable for use with most set ups.
-pub fn default_config(
-	task_executor: TaskExecutor,
-	mut chain_spec: Box<dyn ChainSpec>,
-) -> Configuration {
+pub fn default_config(tokio_handle: Handle, mut chain_spec: Box<dyn ChainSpec>) -> Configuration {
 	let base_path = base_path();
 	let root_path = base_path.path().to_path_buf().join("chains").join(chain_spec.id());
 
@@ -75,7 +71,7 @@ pub fn default_config(
 		impl_name: "test-node".to_string(),
 		impl_version: "0.1".to_string(),
 		role: Role::Authority,
-		task_executor: task_executor.into(),
+		tokio_handle,
 		transaction_pool: Default::default(),
 		network: network_config,
 		keystore: KeystoreConfig::Path { path: root_path.join("key"), password: None },
@@ -95,7 +91,6 @@ pub fn default_config(
 		rpc_ws: None,
 		rpc_ipc: None,
 		rpc_ws_max_connections: None,
-		rpc_http_threads: None,
 		rpc_cors: None,
 		rpc_methods: Default::default(),
 		rpc_max_payload: None,
@@ -120,14 +115,3 @@ pub fn default_config(
 		transaction_storage: TransactionStorageMode::BlockBody,
 	}
 }
-
-/// Produce a task executor given a handle to a tokio runtime
-pub fn task_executor(handle: Handle) -> TaskExecutor {
-	let task_executor = move |fut, task_type| match task_type {
-		TaskType::Async => handle.spawn(fut).map(drop),
-		TaskType::Blocking =>
-			handle.spawn_blocking(move || futures::executor::block_on(fut)).map(drop),
-	};
-
-	task_executor.into()
-}
diff --git a/test-utils/tests/basic.rs b/test-utils/tests/basic.rs
index b94f85ccba57..527ca3e365ed 100644
--- a/test-utils/tests/basic.rs
+++ b/test-utils/tests/basic.rs
@@ -16,28 +16,19 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use sc_service::{TaskExecutor, TaskType};
-
 #[substrate_test_utils::test]
-async fn basic_test(_: TaskExecutor) {
+async fn basic_test() {
 	assert!(true);
 }
 
 #[substrate_test_utils::test]
 #[should_panic(expected = "boo!")]
-async fn panicking_test(_: TaskExecutor) {
+async fn panicking_test() {
 	panic!("boo!");
 }
 
 #[substrate_test_utils::test(flavor = "multi_thread", worker_threads = 1)]
-async fn basic_test_with_args(_: TaskExecutor) {
-	assert!(true);
-}
-
-#[substrate_test_utils::test]
-async fn rename_argument(ex: TaskExecutor) {
-	let ex2 = ex.clone();
-	ex2.spawn(Box::pin(async { () }), TaskType::Blocking);
+async fn basic_test_with_args() {
 	assert!(true);
 }
 
@@ -47,7 +38,7 @@ async fn rename_argument(ex: TaskExecutor) {
 #[substrate_test_utils::test]
 #[should_panic(expected = "test took too long")]
 #[ignore]
-async fn timeout(_: TaskExecutor) {
+async fn timeout() {
 	tokio::time::sleep(std::time::Duration::from_secs(
 		std::env::var("SUBSTRATE_TEST_TIMEOUT")
 			.expect("env var SUBSTRATE_TEST_TIMEOUT has been provided by the user")
diff --git a/test-utils/tests/ui.rs b/test-utils/tests/ui.rs
index 13602f25572d..119162fdc21b 100644
--- a/test-utils/tests/ui.rs
+++ b/test-utils/tests/ui.rs
@@ -19,6 +19,5 @@
 #[test]
 fn substrate_test_utils_derive_trybuild() {
 	let t = trybuild::TestCases::new();
-	t.compile_fail("tests/ui/missing-func-parameter.rs");
 	t.compile_fail("tests/ui/too-many-func-parameters.rs");
 }
diff --git a/test-utils/tests/ui/missing-func-parameter.rs b/test-utils/tests/ui/missing-func-parameter.rs
deleted file mode 100644
index e08d8ae13100..000000000000
--- a/test-utils/tests/ui/missing-func-parameter.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-#[substrate_test_utils::test]
-async fn missing_func_parameter() {
-	assert!(true);
-}
-
-fn main() {}
diff --git a/test-utils/tests/ui/missing-func-parameter.stderr b/test-utils/tests/ui/missing-func-parameter.stderr
deleted file mode 100644
index fbe0bc69918e..000000000000
--- a/test-utils/tests/ui/missing-func-parameter.stderr
+++ /dev/null
@@ -1,5 +0,0 @@
-error: the test function accepts only one argument of type sc_service::TaskExecutor
-  --> $DIR/missing-func-parameter.rs:20:1
-   |
-20 | async fn missing_func_parameter() {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/test-utils/tests/ui/too-many-func-parameters.rs b/test-utils/tests/ui/too-many-func-parameters.rs
index 3b742fac7a60..b1789b9d3ee7 100644
--- a/test-utils/tests/ui/too-many-func-parameters.rs
+++ b/test-utils/tests/ui/too-many-func-parameters.rs
@@ -16,11 +16,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-#[allow(unused_imports)]
-use sc_service::TaskExecutor;
-
 #[substrate_test_utils::test]
-async fn too_many_func_parameters(task_executor_1: TaskExecutor, task_executor_2: TaskExecutor) {
+async fn too_many_func_parameters(_: u32) {
 	assert!(true);
 }
 
diff --git a/test-utils/tests/ui/too-many-func-parameters.stderr b/test-utils/tests/ui/too-many-func-parameters.stderr
index e30bb4ed8ee8..1b1630022e4f 100644
--- a/test-utils/tests/ui/too-many-func-parameters.stderr
+++ b/test-utils/tests/ui/too-many-func-parameters.stderr
@@ -1,5 +1,5 @@
-error: the test function accepts only one argument of type sc_service::TaskExecutor
-  --> $DIR/too-many-func-parameters.rs:23:1
+error: No arguments expected for tests.
+  --> $DIR/too-many-func-parameters.rs:20:1
    |
-23 | async fn too_many_func_parameters(task_executor_1: TaskExecutor, task_executor_2: TaskExecutor) {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+20 | async fn too_many_func_parameters(_: u32) {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

From 2ec7f55c8ab8e8d5241515076aba4770562d87cd Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Sun, 12 Sep 2021 15:38:32 +0100
Subject: [PATCH 1171/1194] Recursive election provider as fallback (#9648)

* Recursive election provider as fallback

* minor fix

* Fix integrity tests

* Update frame/election-provider-multi-phase/src/lib.rs

Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com>

* Fix everything

* fmt again

* Fix test

* Fix state machine warning

* Fix build

Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com>
---
 Cargo.lock                                    |   2 +
 bin/node/runtime/src/lib.rs                   |  31 ++--
 frame/babe/src/mock.rs                        |   2 -
 .../election-provider-multi-phase/src/lib.rs  | 171 +++++++-----------
 .../election-provider-multi-phase/src/mock.rs |  49 +++--
 frame/election-provider-support/Cargo.toml    |   2 +
 .../election-provider-support/src/onchain.rs  |  79 ++++++--
 frame/grandpa/src/mock.rs                     |   2 -
 frame/offences/benchmarking/src/mock.rs       |   2 -
 frame/session/benchmarking/src/mock.rs        |   2 -
 frame/staking/src/mock.rs                     |   2 -
 primitives/state-machine/src/lib.rs           |   3 +-
 12 files changed, 190 insertions(+), 157 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bb8fad054924..31de4625e56d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1925,6 +1925,8 @@ dependencies = [
  "frame-system",
  "parity-scale-codec",
  "sp-arithmetic",
+ "sp-core",
+ "sp-io",
  "sp-npos-elections",
  "sp-runtime",
  "sp-std",
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 7dc87c531ab5..d7257a9ea71b 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -42,7 +42,6 @@ use frame_system::{
 pub use node_primitives::{AccountId, Signature};
 use node_primitives::{AccountIndex, Balance, BlockNumber, Hash, Index, Moment};
 use pallet_contracts::weights::WeightInfo;
-use pallet_election_provider_multi_phase::FallbackStrategy;
 use pallet_grandpa::{
 	fg_primitives, AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList,
 };
@@ -487,6 +486,11 @@ parameter_types! {
 }
 
 use frame_election_provider_support::onchain;
+impl onchain::Config for Runtime {
+	type Accuracy = Perbill;
+	type DataProvider = Staking;
+}
+
 impl pallet_staking::Config for Runtime {
 	const MAX_NOMINATIONS: u32 = MAX_NOMINATIONS;
 	type Currency = Balances;
@@ -510,9 +514,7 @@ impl pallet_staking::Config for Runtime {
 	type NextNewSession = Session;
 	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
 	type ElectionProvider = ElectionProviderMultiPhase;
-	type GenesisElectionProvider = onchain::OnChainSequentialPhragmen<
-		pallet_election_provider_multi_phase::OnChainConfig<Self>,
-	>;
+	type GenesisElectionProvider = onchain::OnChainSequentialPhragmen<Self>;
 	type WeightInfo = pallet_staking::weights::SubstrateWeight<Runtime>;
 }
 
@@ -527,9 +529,6 @@ parameter_types! {
 	pub const SignedDepositBase: Balance = 1 * DOLLARS;
 	pub const SignedDepositByte: Balance = 1 * CENTS;
 
-	// fallback: no on-chain fallback.
-	pub const Fallback: FallbackStrategy = FallbackStrategy::Nothing;
-
 	pub SolutionImprovementThreshold: Perbill = Perbill::from_rational(1u32, 10_000);
 
 	// miner configs
@@ -615,15 +614,14 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
 	type SlashHandler = (); // burn slashes
 	type RewardHandler = (); // nothing to do upon rewards
 	type DataProvider = Staking;
-	type OnChainAccuracy = Perbill;
 	type Solution = NposSolution16;
-	type Fallback = Fallback;
+	type Fallback = pallet_election_provider_multi_phase::NoFallback<Self>;
 	type Solver = frame_election_provider_support::SequentialPhragmen<
 		AccountId,
-		pallet_election_provider_multi_phase::SolutionAccuracyOf<Runtime>,
+		pallet_election_provider_multi_phase::SolutionAccuracyOf<Self>,
 		OffchainRandomBalancing,
 	>;
-	type WeightInfo = pallet_election_provider_multi_phase::weights::SubstrateWeight<Runtime>;
+	type WeightInfo = pallet_election_provider_multi_phase::weights::SubstrateWeight<Self>;
 	type ForceOrigin = EnsureRootOrHalfCouncil;
 	type BenchmarkingConfig = BenchmarkConfig;
 }
@@ -1686,6 +1684,7 @@ impl_runtime_apis! {
 mod tests {
 	use super::*;
 	use frame_system::offchain::CreateSignedTransaction;
+	use sp_runtime::UpperOf;
 
 	#[test]
 	fn validate_transaction_submitter_bounds() {
@@ -1698,6 +1697,16 @@ mod tests {
 		is_submit_signed_transaction::<Runtime>();
 	}
 
+	#[test]
+	fn perbill_as_onchain_accuracy() {
+		type OnChainAccuracy = <Runtime as onchain::Config>::Accuracy;
+		let maximum_chain_accuracy: Vec<UpperOf<OnChainAccuracy>> = (0..MAX_NOMINATIONS)
+			.map(|_| <UpperOf<OnChainAccuracy>>::from(OnChainAccuracy::one().deconstruct()))
+			.collect();
+		let _: UpperOf<OnChainAccuracy> =
+			maximum_chain_accuracy.iter().fold(0, |acc, x| acc.checked_add(*x).unwrap());
+	}
+
 	#[test]
 	fn call_size() {
 		assert!(
diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index f4f1310e8356..bc0be32624cb 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -192,8 +192,6 @@ parameter_types! {
 }
 
 impl onchain::Config for Test {
-	type AccountId = <Self as frame_system::Config>::AccountId;
-	type BlockNumber = <Self as frame_system::Config>::BlockNumber;
 	type Accuracy = Perbill;
 	type DataProvider = Staking;
 }
diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index 977a4d34e84a..a3b6083914ca 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -114,8 +114,8 @@
 //! If we reach the end of both phases (i.e. call to [`ElectionProvider::elect`] happens) and no
 //! good solution is queued, then the fallback strategy [`pallet::Config::Fallback`] is used to
 //! determine what needs to be done. The on-chain election is slow, and contains no balancing or
-//! reduction post-processing. See [`onchain::OnChainSequentialPhragmen`]. The
-//! [`FallbackStrategy::Nothing`] just returns an error, and enables the [`Phase::Emergency`].
+//! reduction post-processing. [`NoFallback`] does nothing and enables [`Phase::Emergency`], which
+//! is a more *fail-safe* approach.
 //!
 //! ### Emergency Phase
 //!
@@ -146,13 +146,11 @@
 //!
 //! ## Accuracy
 //!
-//! The accuracy of the election is configured via two trait parameters. namely,
-//! [`OnChainAccuracyOf`] dictates the accuracy used to compute the on-chain fallback election and
-//! [`SolutionAccuracyOf`] is the accuracy that the submitted solutions must adhere to.
+//! The accuracy of the election is configured via
+//! [`SolutionAccuracyOf`] which is the accuracy that the submitted solutions must adhere to.
 //!
-//! Note that both accuracies are of great importance. The offchain solution should be as small as
-//! possible, reducing solutions size/weight. The on-chain solution can use more space for accuracy,
-//! but should still be fast to prevent massively large blocks in case of a fallback.
+//! Note that the accuracy is of great importance. The offchain solution should be as small as
+//! possible, reducing solutions size/weight.
 //!
 //! ## Error types
 //!
@@ -201,26 +199,9 @@
 //! [`DesiredTargets`], no more, no less. Over time, we can change this to a [min, max] where any
 //! solution within this range is acceptable, where bigger solutions are prioritized.
 //!
-//! **Recursive Fallback**: Currently, the fallback is a separate enum. A different and fancier way
-//! of doing this would be to have the fallback be another
-//! [`frame_election_provider_support::ElectionProvider`]. In this case, this pallet can even have
-//! the on-chain election provider as fallback, or special _noop_ fallback that simply returns an
-//! error, thus replicating [`FallbackStrategy::Nothing`]. In this case, we won't need the
-//! additional config OnChainAccuracy either.
-//!
 //! **Score based on (byte) size**: We should always prioritize small solutions over bigger ones, if
 //! there is a tie. Even more harsh should be to enforce the bound of the `reduce` algorithm.
 //!
-//! **Make the number of nominators configurable from the runtime**. Remove `sp_npos_elections`
-//! dependency from staking and the solution type. It should be generated at runtime, there
-//! it should be encoded how many votes each nominators have. Essentially translate
-//! <https://github.com/paritytech/substrate/pull/7929> to this pallet.
-//!
-//! **More accurate weight for error cases**: Both `ElectionDataProvider` and `ElectionProvider`
-//! assume no weight is consumed in their functions, when operations fail with `Err`. This can
-//! clearly be improved, but not a priority as we generally expect snapshot creation to fail only
-//! due to extreme circumstances.
-//!
 //! **Take into account the encode/decode weight in benchmarks.** Currently, we only take into
 //! account the weight of encode/decode in the `submit_unsigned` given its priority. Nonetheless,
 //! all operations on the solution and the snapshot are worthy of taking this into account.
@@ -228,7 +209,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use codec::{Decode, Encode};
-use frame_election_provider_support::{onchain, ElectionDataProvider, ElectionProvider};
+use frame_election_provider_support::{ElectionDataProvider, ElectionProvider};
 use frame_support::{
 	dispatch::DispatchResultWithPostInfo,
 	ensure,
@@ -241,8 +222,8 @@ use sp_arithmetic::{
 	UpperOf,
 };
 use sp_npos_elections::{
-	assignment_ratio_to_staked_normalized, ElectionScore, EvaluateSupport, NposSolution,
-	PerThing128, Supports, VoteWeight,
+	assignment_ratio_to_staked_normalized, ElectionScore, EvaluateSupport, NposSolution, Supports,
+	VoteWeight,
 };
 use sp_runtime::{
 	traits::Bounded,
@@ -282,17 +263,11 @@ pub type SolutionVoterIndexOf<T> = <SolutionOf<T> as NposSolution>::VoterIndex;
 pub type SolutionTargetIndexOf<T> = <SolutionOf<T> as NposSolution>::TargetIndex;
 /// The accuracy of the election, when submitted from offchain. Derived from [`SolutionOf`].
 pub type SolutionAccuracyOf<T> = <SolutionOf<T> as NposSolution>::Accuracy;
-/// The accuracy of the election, when computed on-chain. Equal to [`Config::OnChainAccuracy`].
-pub type OnChainAccuracyOf<T> = <T as Config>::OnChainAccuracy;
-
-/// Wrapper type that implements the configurations needed for the on-chain backup.
-pub struct OnChainConfig<T: Config>(sp_std::marker::PhantomData<T>);
-impl<T: Config> onchain::Config for OnChainConfig<T> {
-	type AccountId = T::AccountId;
-	type BlockNumber = T::BlockNumber;
-	type Accuracy = T::OnChainAccuracy;
-	type DataProvider = T::DataProvider;
-}
+/// The fallback election type.
+pub type FallbackErrorOf<T> = <<T as crate::Config>::Fallback as ElectionProvider<
+	<T as frame_system::Config>::AccountId,
+	<T as frame_system::Config>::BlockNumber,
+>>::Error;
 
 /// Configuration for the benchmarks of the pallet.
 pub trait BenchmarkingConfig {
@@ -322,6 +297,19 @@ impl BenchmarkingConfig for () {
 	const MAXIMUM_TARGETS: u32 = 2_000;
 }
 
+/// A fallback implementation that transitions the pallet to the emergency phase.
+pub struct NoFallback<T>(sp_std::marker::PhantomData<T>);
+
+impl<T: Config> ElectionProvider<T::AccountId, T::BlockNumber> for NoFallback<T> {
+	type DataProvider = T::DataProvider;
+	type Error = &'static str;
+
+	fn elect() -> Result<Supports<T::AccountId>, Self::Error> {
+		// Do nothing, this will enable the emergency phase.
+		Err("NoFallback.")
+	}
+}
+
 /// Current phase of the pallet.
 #[derive(PartialEq, Eq, Clone, Copy, Encode, Decode, Debug)]
 pub enum Phase<Bn> {
@@ -384,19 +372,6 @@ impl<Bn: PartialEq + Eq> Phase<Bn> {
 	}
 }
 
-/// A configuration for the pallet to indicate what should happen in the case of a fallback i.e.
-/// reaching a call to `elect` with no good solution.
-#[cfg_attr(test, derive(Clone))]
-pub enum FallbackStrategy {
-	/// Run a on-chain sequential phragmen.
-	///
-	/// This might burn the chain for a few minutes due to a stall, but is generally a safe
-	/// approach to maintain a sensible validator set.
-	OnChain,
-	/// Nothing. Return an error.
-	Nothing,
-}
-
 /// The type of `Computation` that provided this election data.
 #[derive(PartialEq, Eq, Clone, Copy, Encode, Decode, Debug)]
 pub enum ElectionCompute {
@@ -406,6 +381,8 @@ pub enum ElectionCompute {
 	Signed,
 	/// Election was computed with an unsigned submission.
 	Unsigned,
+	/// Election was computed using the fallback
+	Fallback,
 	/// Election was computed with emergency status.
 	Emergency,
 }
@@ -485,24 +462,35 @@ pub struct SolutionOrSnapshotSize {
 /// Internal errors of the pallet.
 ///
 /// Note that this is different from [`pallet::Error`].
-#[derive(frame_support::DebugNoBound, frame_support::PartialEqNoBound)]
+#[derive(frame_support::DebugNoBound)]
 #[cfg_attr(feature = "runtime-benchmarks", derive(strum_macros::IntoStaticStr))]
 pub enum ElectionError<T: Config> {
 	/// An error happened in the feasibility check sub-system.
 	Feasibility(FeasibilityError),
 	/// An error in the miner (offchain) sub-system.
 	Miner(unsigned::MinerError<T>),
-	/// An error in the on-chain fallback.
-	OnChainFallback(onchain::Error),
 	/// An error happened in the data provider.
 	DataProvider(&'static str),
-	/// No fallback is configured. This is a special case.
-	NoFallbackConfigured,
+	/// An error nested in the fallback.
+	Fallback(FallbackErrorOf<T>),
 }
 
-impl<T: Config> From<onchain::Error> for ElectionError<T> {
-	fn from(e: onchain::Error) -> Self {
-		ElectionError::OnChainFallback(e)
+// NOTE: we have to do this manually because of the additional where clause needed on
+// `FallbackErrorOf<T>`.
+#[cfg(test)]
+impl<T: Config> PartialEq for ElectionError<T>
+where
+	FallbackErrorOf<T>: PartialEq,
+{
+	fn eq(&self, other: &Self) -> bool {
+		use ElectionError::*;
+		match (self, other) {
+			(&Feasibility(ref x), &Feasibility(ref y)) if x == y => true,
+			(&Miner(ref x), &Miner(ref y)) if x == y => true,
+			(&DataProvider(ref x), &DataProvider(ref y)) if x == y => true,
+			(&Fallback(ref x), &Fallback(ref y)) if x == y => true,
+			_ => false,
+		}
 	}
 }
 
@@ -657,11 +645,12 @@ pub mod pallet {
 			+ Ord
 			+ NposSolution;
 
-		/// Accuracy used for fallback on-chain election.
-		type OnChainAccuracy: PerThing128;
-
 		/// Configuration for the fallback
-		type Fallback: Get<FallbackStrategy>;
+		type Fallback: ElectionProvider<
+			Self::AccountId,
+			Self::BlockNumber,
+			DataProvider = Self::DataProvider,
+		>;
 
 		/// OCW election solution miner algorithm implementation.
 		type Solver: NposSolver<AccountId = Self::AccountId>;
@@ -789,18 +778,6 @@ pub mod pallet {
 			// Based on the requirements of [`sp_npos_elections::Assignment::try_normalize`].
 			let max_vote: usize = <SolutionOf<T> as NposSolution>::LIMIT;
 
-			// 1. Maximum sum of [ChainAccuracy; 16] must fit into `UpperOf<ChainAccuracy>`..
-			let maximum_chain_accuracy: Vec<UpperOf<OnChainAccuracyOf<T>>> = (0..max_vote)
-				.map(|_| {
-					<UpperOf<OnChainAccuracyOf<T>>>::from(
-						<OnChainAccuracyOf<T>>::one().deconstruct(),
-					)
-				})
-				.collect();
-			let _: UpperOf<OnChainAccuracyOf<T>> = maximum_chain_accuracy
-				.iter()
-				.fold(Zero::zero(), |acc, x| acc.checked_add(x).unwrap());
-
 			// 2. Maximum sum of [SolutionAccuracy; 16] must fit into `UpperOf<OffchainAccuracy>`.
 			let maximum_chain_accuracy: Vec<UpperOf<SolutionAccuracyOf<T>>> = (0..max_vote)
 				.map(|_| {
@@ -1455,15 +1432,6 @@ impl<T: Config> Pallet<T> {
 		Self::kill_snapshot();
 	}
 
-	/// On-chain fallback of election.
-	fn onchain_fallback() -> Result<Supports<T::AccountId>, ElectionError<T>> {
-		<onchain::OnChainSequentialPhragmen<OnChainConfig<T>> as ElectionProvider<
-			T::AccountId,
-			T::BlockNumber,
-		>>::elect()
-		.map_err(Into::into)
-	}
-
 	fn do_elect() -> Result<Supports<T::AccountId>, ElectionError<T>> {
 		// We have to unconditionally try finalizing the signed phase here. There are only two
 		// possibilities:
@@ -1475,15 +1443,10 @@ impl<T: Config> Pallet<T> {
 		let _ = Self::finalize_signed_phase();
 		<QueuedSolution<T>>::take()
 			.map_or_else(
-				|| match T::Fallback::get() {
-					FallbackStrategy::OnChain => Self::onchain_fallback()
-						.map(|s| {
-							// onchain election incurs maximum block weight
-							Self::register_weight(T::BlockWeights::get().max_block);
-							(s, ElectionCompute::OnChain)
-						})
-						.map_err(Into::into),
-					FallbackStrategy::Nothing => Err(ElectionError::NoFallbackConfigured),
+				|| {
+					T::Fallback::elect()
+						.map_err(|fe| ElectionError::Fallback(fe))
+						.map(|supports| (supports, ElectionCompute::Fallback))
 				},
 				|ReadySolution { supports, compute, .. }| Ok((supports, compute)),
 			)
@@ -1889,7 +1852,7 @@ mod tests {
 				multi_phase_events(),
 				vec![
 					Event::SignedPhaseStarted(1),
-					Event::ElectionFinalized(Some(ElectionCompute::OnChain))
+					Event::ElectionFinalized(Some(ElectionCompute::Fallback))
 				],
 			);
 			// All storage items must be cleared.
@@ -1941,14 +1904,12 @@ mod tests {
 
 	#[test]
 	fn fallback_strategy_works() {
-		ExtBuilder::default().fallback(FallbackStrategy::OnChain).build_and_execute(|| {
-			roll_to(15);
-			assert_eq!(MultiPhase::current_phase(), Phase::Signed);
-
+		ExtBuilder::default().onchain_fallback(true).build_and_execute(|| {
 			roll_to(25);
 			assert_eq!(MultiPhase::current_phase(), Phase::Unsigned((true, 25)));
 
-			// Zilch solutions thus far.
+			// Zilch solutions thus far, but we get a result.
+			assert!(MultiPhase::queued_solution().is_none());
 			let supports = MultiPhase::elect().unwrap();
 
 			assert_eq!(
@@ -1960,15 +1921,15 @@ mod tests {
 			)
 		});
 
-		ExtBuilder::default().fallback(FallbackStrategy::Nothing).build_and_execute(|| {
-			roll_to(15);
-			assert_eq!(MultiPhase::current_phase(), Phase::Signed);
-
+		ExtBuilder::default().onchain_fallback(false).build_and_execute(|| {
 			roll_to(25);
 			assert_eq!(MultiPhase::current_phase(), Phase::Unsigned((true, 25)));
 
 			// Zilch solutions thus far.
-			assert_eq!(MultiPhase::elect().unwrap_err(), ElectionError::NoFallbackConfigured);
+			assert!(MultiPhase::queued_solution().is_none());
+			assert_eq!(MultiPhase::elect().unwrap_err(), ElectionError::Fallback("NoFallback."));
+			// phase is now emergency.
+			assert_eq!(MultiPhase::current_phase(), Phase::Emergency);
 		})
 	}
 
diff --git a/frame/election-provider-multi-phase/src/mock.rs b/frame/election-provider-multi-phase/src/mock.rs
index a7e68491c272..28a15291e652 100644
--- a/frame/election-provider-multi-phase/src/mock.rs
+++ b/frame/election-provider-multi-phase/src/mock.rs
@@ -17,7 +17,9 @@
 
 use super::*;
 use crate as multi_phase;
-use frame_election_provider_support::{data_provider, ElectionDataProvider, SequentialPhragmen};
+use frame_election_provider_support::{
+	data_provider, onchain, ElectionDataProvider, SequentialPhragmen,
+};
 pub use frame_support::{assert_noop, assert_ok};
 use frame_support::{parameter_types, traits::Hooks, weights::Weight};
 use multi_phase::unsigned::{IndexAssignmentOf, Voter};
@@ -57,7 +59,7 @@ frame_support::construct_runtime!(
 
 pub(crate) type Balance = u64;
 pub(crate) type AccountId = u64;
-pub(crate) type BlockNumber = u32;
+pub(crate) type BlockNumber = u64;
 pub(crate) type VoterIndex = u32;
 pub(crate) type TargetIndex = u16;
 
@@ -76,7 +78,7 @@ pub(crate) fn multi_phase_events() -> Vec<super::Event<Runtime>> {
 }
 
 /// To from `now` to block `n`.
-pub fn roll_to(n: u64) {
+pub fn roll_to(n: BlockNumber) {
 	let now = System::block_number();
 	for i in now + 1..=n {
 		System::set_block_number(i);
@@ -84,7 +86,7 @@ pub fn roll_to(n: u64) {
 	}
 }
 
-pub fn roll_to_with_ocw(n: u64) {
+pub fn roll_to_with_ocw(n: BlockNumber) {
 	let now = System::block_number();
 	for i in now + 1..=n {
 		System::set_block_number(i);
@@ -197,7 +199,7 @@ impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type Origin = Origin;
 	type Index = u64;
-	type BlockNumber = u64;
+	type BlockNumber = BlockNumber;
 	type Call = Call;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
@@ -251,10 +253,9 @@ parameter_types! {
 		(40, 40, vec![40]),
 	];
 
-	pub static Fallback: FallbackStrategy = FallbackStrategy::OnChain;
 	pub static DesiredTargets: u32 = 2;
-	pub static SignedPhase: u64 = 10;
-	pub static UnsignedPhase: u64 = 5;
+	pub static SignedPhase: BlockNumber = 10;
+	pub static UnsignedPhase: BlockNumber = 5;
 	pub static SignedMaxSubmissions: u32 = 5;
 	pub static SignedDepositBase: Balance = 5;
 	pub static SignedDepositByte: Balance = 0;
@@ -269,6 +270,27 @@ parameter_types! {
 	pub static MockWeightInfo: bool = false;
 
 	pub static EpochLength: u64 = 30;
+	pub static OnChianFallback: bool = true;
+}
+
+impl onchain::Config for Runtime {
+	type Accuracy = sp_runtime::Perbill;
+	type DataProvider = StakingMock;
+}
+
+pub struct MockFallback;
+impl ElectionProvider<AccountId, u64> for MockFallback {
+	type Error = &'static str;
+	type DataProvider = StakingMock;
+
+	fn elect() -> Result<Supports<AccountId>, Self::Error> {
+		if OnChianFallback::get() {
+			onchain::OnChainSequentialPhragmen::<Runtime>::elect()
+				.map_err(|_| "OnChainSequentialPhragmen failed")
+		} else {
+			super::NoFallback::<Runtime>::elect()
+		}
+	}
 }
 
 // Hopefully this won't be too much of a hassle to maintain.
@@ -376,8 +398,7 @@ impl crate::Config for Runtime {
 	type DataProvider = StakingMock;
 	type WeightInfo = DualMockWeightInfo;
 	type BenchmarkingConfig = ();
-	type OnChainAccuracy = Perbill;
-	type Fallback = Fallback;
+	type Fallback = MockFallback;
 	type ForceOrigin = frame_system::EnsureRoot<AccountId>;
 	type Solution = TestNposSolution;
 	type Solver = SequentialPhragmen<AccountId, SolutionAccuracyOf<Runtime>, Balancing>;
@@ -474,13 +495,13 @@ impl ExtBuilder {
 		<SolutionImprovementThreshold>::set(p);
 		self
 	}
-	pub fn phases(self, signed: u64, unsigned: u64) -> Self {
+	pub fn phases(self, signed: BlockNumber, unsigned: BlockNumber) -> Self {
 		<SignedPhase>::set(signed);
 		<UnsignedPhase>::set(unsigned);
 		self
 	}
-	pub fn fallback(self, fallback: FallbackStrategy) -> Self {
-		<Fallback>::set(fallback);
+	pub fn onchain_fallback(self, onchain: bool) -> Self {
+		<OnChianFallback>::set(onchain);
 		self
 	}
 	pub fn miner_weight(self, weight: Weight) -> Self {
@@ -555,6 +576,6 @@ impl ExtBuilder {
 	}
 }
 
-pub(crate) fn balances(who: &u64) -> (u64, u64) {
+pub(crate) fn balances(who: &AccountId) -> (Balance, Balance) {
 	(Balances::free_balance(who), Balances::reserved_balance(who))
 }
diff --git a/frame/election-provider-support/Cargo.toml b/frame/election-provider-support/Cargo.toml
index c0d332315b02..d713b98fcefa 100644
--- a/frame/election-provider-support/Cargo.toml
+++ b/frame/election-provider-support/Cargo.toml
@@ -23,6 +23,8 @@ frame-system = { version = "4.0.0-dev", default-features = false, path = "../sys
 [dev-dependencies]
 sp-npos-elections = { version = "4.0.0-dev", path = "../../primitives/npos-elections" }
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
+sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
+sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
 
 [features]
 default = ["std"]
diff --git a/frame/election-provider-support/src/onchain.rs b/frame/election-provider-support/src/onchain.rs
index 8e548408ef1a..fb1ccfdfe256 100644
--- a/frame/election-provider-support/src/onchain.rs
+++ b/frame/election-provider-support/src/onchain.rs
@@ -18,6 +18,7 @@
 //! An implementation of [`ElectionProvider`] that does an on-chain sequential phragmen.
 
 use crate::{ElectionDataProvider, ElectionProvider};
+use frame_support::{traits::Get, weights::DispatchClass};
 use sp_npos_elections::*;
 use sp_std::{collections::btree_map::BTreeMap, marker::PhantomData, prelude::*};
 
@@ -53,11 +54,11 @@ pub struct OnChainSequentialPhragmen<T: Config>(PhantomData<T>);
 /// Configuration trait of [`OnChainSequentialPhragmen`].
 ///
 /// Note that this is similar to a pallet traits, but [`OnChainSequentialPhragmen`] is not a pallet.
-pub trait Config {
-	/// The account identifier type.
-	type AccountId: IdentifierT;
-	/// The block number type.
-	type BlockNumber;
+///
+/// WARNING: the user of this pallet must ensure that the `Accuracy` type will work nicely with the
+/// normalization operation done inside `seq_phragmen`. See
+/// [`sp_npos_elections::assignment::try_normalize`] for more info.
+pub trait Config: frame_system::Config {
 	/// The accuracy used to compute the election:
 	type Accuracy: PerThing128;
 	/// Something that provides the data for election.
@@ -87,6 +88,12 @@ impl<T: Config> ElectionProvider<T::AccountId, T::BlockNumber> for OnChainSequen
 
 		let staked = assignment_ratio_to_staked_normalized(assignments, &stake_of)?;
 
+		let weight = T::BlockWeights::get().max_block;
+		frame_system::Pallet::<T>::register_extra_weight_unchecked(
+			weight,
+			DispatchClass::Mandatory,
+		);
+
 		Ok(to_supports(&staked))
 	}
 }
@@ -98,11 +105,49 @@ mod tests {
 	use sp_runtime::Perbill;
 
 	type AccountId = u64;
-	type BlockNumber = u32;
-	struct Runtime;
-	impl Config for Runtime {
-		type AccountId = AccountId;
+	type BlockNumber = u64;
+
+	pub type Header = sp_runtime::generic::Header<BlockNumber, sp_runtime::traits::BlakeTwo256>;
+	pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<AccountId, (), (), ()>;
+	pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;
+
+	frame_support::construct_runtime!(
+		pub enum Runtime where
+			Block = Block,
+			NodeBlock = Block,
+			UncheckedExtrinsic = UncheckedExtrinsic
+		{
+			System: frame_system::{Pallet, Call, Event<T>},
+		}
+	);
+
+	impl frame_system::Config for Runtime {
+		type SS58Prefix = ();
+		type BaseCallFilter = frame_support::traits::Everything;
+		type Origin = Origin;
+		type Index = AccountId;
 		type BlockNumber = BlockNumber;
+		type Call = Call;
+		type Hash = sp_core::H256;
+		type Hashing = sp_runtime::traits::BlakeTwo256;
+		type AccountId = AccountId;
+		type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
+		type Header = sp_runtime::testing::Header;
+		type Event = ();
+		type BlockHashCount = ();
+		type DbWeight = ();
+		type BlockLength = ();
+		type BlockWeights = ();
+		type Version = ();
+		type PalletInfo = PalletInfo;
+		type AccountData = ();
+		type OnNewAccount = ();
+		type OnKilledAccount = ();
+		type SystemWeightInfo = ();
+		type OnSetCode = ();
+	}
+
+	impl Config for Runtime {
 		type Accuracy = Perbill;
 		type DataProvider = mock_data_provider::DataProvider;
 	}
@@ -138,12 +183,14 @@ mod tests {
 
 	#[test]
 	fn onchain_seq_phragmen_works() {
-		assert_eq!(
-			OnChainPhragmen::elect().unwrap(),
-			vec![
-				(10, Support { total: 25, voters: vec![(1, 10), (3, 15)] }),
-				(30, Support { total: 35, voters: vec![(2, 20), (3, 15)] })
-			]
-		);
+		sp_io::TestExternalities::new_empty().execute_with(|| {
+			assert_eq!(
+				OnChainPhragmen::elect().unwrap(),
+				vec![
+					(10, Support { total: 25, voters: vec![(1, 10), (3, 15)] }),
+					(30, Support { total: 35, voters: vec![(2, 20), (3, 15)] })
+				]
+			);
+		})
 	}
 }
diff --git a/frame/grandpa/src/mock.rs b/frame/grandpa/src/mock.rs
index b8d6f699f890..26dda514516a 100644
--- a/frame/grandpa/src/mock.rs
+++ b/frame/grandpa/src/mock.rs
@@ -194,8 +194,6 @@ parameter_types! {
 }
 
 impl onchain::Config for Test {
-	type AccountId = <Self as frame_system::Config>::AccountId;
-	type BlockNumber = <Self as frame_system::Config>::BlockNumber;
 	type Accuracy = Perbill;
 	type DataProvider = Staking;
 }
diff --git a/frame/offences/benchmarking/src/mock.rs b/frame/offences/benchmarking/src/mock.rs
index 431877c3a8f9..c4fd88def0e3 100644
--- a/frame/offences/benchmarking/src/mock.rs
+++ b/frame/offences/benchmarking/src/mock.rs
@@ -151,8 +151,6 @@ parameter_types! {
 pub type Extrinsic = sp_runtime::testing::TestXt<Call, ()>;
 
 impl onchain::Config for Test {
-	type AccountId = AccountId;
-	type BlockNumber = BlockNumber;
 	type Accuracy = Perbill;
 	type DataProvider = Staking;
 }
diff --git a/frame/session/benchmarking/src/mock.rs b/frame/session/benchmarking/src/mock.rs
index 9de4a0320d15..c685db2bb252 100644
--- a/frame/session/benchmarking/src/mock.rs
+++ b/frame/session/benchmarking/src/mock.rs
@@ -159,8 +159,6 @@ where
 }
 
 impl onchain::Config for Test {
-	type AccountId = AccountId;
-	type BlockNumber = BlockNumber;
 	type Accuracy = sp_runtime::Perbill;
 	type DataProvider = Staking;
 }
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index 82eca58e5355..0357fa05cb1d 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -243,8 +243,6 @@ impl OnUnbalanced<NegativeImbalanceOf<Test>> for RewardRemainderMock {
 }
 
 impl onchain::Config for Test {
-	type AccountId = AccountId;
-	type BlockNumber = BlockNumber;
 	type Accuracy = Perbill;
 	type DataProvider = Staking;
 }
diff --git a/primitives/state-machine/src/lib.rs b/primitives/state-machine/src/lib.rs
index e5ba9e1acb84..05d2c6d20cce 100644
--- a/primitives/state-machine/src/lib.rs
+++ b/primitives/state-machine/src/lib.rs
@@ -1579,7 +1579,8 @@ mod tests {
 		let mut seed = [0; 16];
 		for i in 0..50u32 {
 			let mut child_infos = Vec::new();
-			seed[0..4].copy_from_slice(&i.to_be_bytes()[..]);
+			let seed_partial = &mut seed[0..4];
+			seed_partial.copy_from_slice(&i.to_be_bytes()[..]);
 			let mut rand = SmallRng::from_seed(seed);
 
 			let nb_child_trie = rand.next_u32() as usize % 25;

From 5810c460803d790a3cdab45fa9807abde9b7776e Mon Sep 17 00:00:00 2001
From: Liu-Cheng Xu <xuliuchengxlc@gmail.com>
Date: Mon, 13 Sep 2021 11:12:37 +0800
Subject: [PATCH 1172/1194] Use the precise number of approvals when
 constructing RawOrgin::Members (#9647)

* Use the precise number of approvals when constructing RawOrgin::Members

Close #9604

* Split out tests.rs

* Add a test for dispatching with yes votes instead of voting threshold

* Simplify tests

- Also add copyright header.

* Remove unused hex_literal::hex in collective tests

* Extract the helper function record()

* Try fixing ci

* Add a test case with only two votes

* Nit

* Fix typo
---
 Cargo.lock                    |    1 -
 frame/collective/Cargo.toml   |    3 -
 frame/collective/src/lib.rs   | 1190 +--------------------------------
 frame/collective/src/tests.rs | 1007 ++++++++++++++++++++++++++++
 4 files changed, 1014 insertions(+), 1187 deletions(-)
 create mode 100644 frame/collective/src/tests.rs

diff --git a/Cargo.lock b/Cargo.lock
index 31de4625e56d..9c902b7d089e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5033,7 +5033,6 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "hex-literal",
  "log 0.4.14",
  "parity-scale-codec",
  "sp-core",
diff --git a/frame/collective/Cargo.toml b/frame/collective/Cargo.toml
index 722309ee90a1..9fc5c7a3de4e 100644
--- a/frame/collective/Cargo.toml
+++ b/frame/collective/Cargo.toml
@@ -25,9 +25,6 @@ frame-support = { version = "4.0.0-dev", default-features = false, path = "../su
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 log = { version = "0.4.14", default-features = false }
 
-[dev-dependencies]
-hex-literal = "0.3.1"
-
 [features]
 default = ["std"]
 std = [
diff --git a/frame/collective/src/lib.rs b/frame/collective/src/lib.rs
index 39da8e2c45fb..fc40fd554129 100644
--- a/frame/collective/src/lib.rs
+++ b/frame/collective/src/lib.rs
@@ -61,6 +61,9 @@ use frame_support::{
 };
 use frame_system::{self as system, ensure_root, ensure_signed};
 
+#[cfg(test)]
+mod tests;
+
 #[cfg(feature = "runtime-benchmarks")]
 mod benchmarking;
 
@@ -643,7 +646,7 @@ decl_module! {
 				)?;
 				Self::deposit_event(RawEvent::Closed(proposal_hash, yes_votes, no_votes));
 				let (proposal_weight, proposal_count) =
-					Self::do_approve_proposal(seats, voting, proposal_hash, proposal);
+					Self::do_approve_proposal(seats, yes_votes, proposal_hash, proposal);
 				return Ok((
 					Some(T::WeightInfo::close_early_approved(len as u32, seats, proposal_count)
 					.saturating_add(proposal_weight)),
@@ -682,7 +685,7 @@ decl_module! {
 				)?;
 				Self::deposit_event(RawEvent::Closed(proposal_hash, yes_votes, no_votes));
 				let (proposal_weight, proposal_count) =
-					Self::do_approve_proposal(seats, voting, proposal_hash, proposal);
+					Self::do_approve_proposal(seats, yes_votes, proposal_hash, proposal);
 				return Ok((
 					Some(T::WeightInfo::close_approved(len as u32, seats, proposal_count)
 					.saturating_add(proposal_weight)),
@@ -764,14 +767,14 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 	/// - `P` is number of active proposals
 	fn do_approve_proposal(
 		seats: MemberCount,
-		voting: Votes<T::AccountId, T::BlockNumber>,
+		yes_votes: MemberCount,
 		proposal_hash: T::Hash,
 		proposal: <T as Config<I>>::Proposal,
 	) -> (Weight, u32) {
 		Self::deposit_event(RawEvent::Approved(proposal_hash));
 
 		let dispatch_weight = proposal.get_dispatch_info().weight;
-		let origin = RawOrigin::Members(voting.threshold, seats).into();
+		let origin = RawOrigin::Members(yes_votes, seats).into();
 		let result = proposal.dispatch(origin);
 		Self::deposit_event(RawEvent::Executed(
 			proposal_hash,
@@ -987,1182 +990,3 @@ impl<
 		O::from(RawOrigin::Members(0u32, 0u32))
 	}
 }
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate as collective;
-	use frame_support::{assert_noop, assert_ok, parameter_types, Hashable};
-	use frame_system::{self as system, EventRecord, Phase};
-	use hex_literal::hex;
-	use sp_core::H256;
-	use sp_runtime::{
-		testing::Header,
-		traits::{BlakeTwo256, IdentityLookup},
-		BuildStorage,
-	};
-
-	parameter_types! {
-		pub const BlockHashCount: u64 = 250;
-		pub const MotionDuration: u64 = 3;
-		pub const MaxProposals: u32 = 100;
-		pub const MaxMembers: u32 = 100;
-		pub BlockWeights: frame_system::limits::BlockWeights =
-			frame_system::limits::BlockWeights::simple_max(1024);
-	}
-	impl frame_system::Config for Test {
-		type BaseCallFilter = frame_support::traits::Everything;
-		type BlockWeights = ();
-		type BlockLength = ();
-		type DbWeight = ();
-		type Origin = Origin;
-		type Index = u64;
-		type BlockNumber = u64;
-		type Call = Call;
-		type Hash = H256;
-		type Hashing = BlakeTwo256;
-		type AccountId = u64;
-		type Lookup = IdentityLookup<Self::AccountId>;
-		type Header = Header;
-		type Event = Event;
-		type BlockHashCount = BlockHashCount;
-		type Version = ();
-		type PalletInfo = PalletInfo;
-		type AccountData = ();
-		type OnNewAccount = ();
-		type OnKilledAccount = ();
-		type SystemWeightInfo = ();
-		type SS58Prefix = ();
-		type OnSetCode = ();
-	}
-	impl Config<Instance1> for Test {
-		type Origin = Origin;
-		type Proposal = Call;
-		type Event = Event;
-		type MotionDuration = MotionDuration;
-		type MaxProposals = MaxProposals;
-		type MaxMembers = MaxMembers;
-		type DefaultVote = PrimeDefaultVote;
-		type WeightInfo = ();
-	}
-	impl Config<Instance2> for Test {
-		type Origin = Origin;
-		type Proposal = Call;
-		type Event = Event;
-		type MotionDuration = MotionDuration;
-		type MaxProposals = MaxProposals;
-		type MaxMembers = MaxMembers;
-		type DefaultVote = MoreThanMajorityThenPrimeDefaultVote;
-		type WeightInfo = ();
-	}
-	impl Config for Test {
-		type Origin = Origin;
-		type Proposal = Call;
-		type Event = Event;
-		type MotionDuration = MotionDuration;
-		type MaxProposals = MaxProposals;
-		type MaxMembers = MaxMembers;
-		type DefaultVote = PrimeDefaultVote;
-		type WeightInfo = ();
-	}
-
-	pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;
-	pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<u32, u64, Call, ()>;
-
-	frame_support::construct_runtime!(
-		pub enum Test where
-			Block = Block,
-			NodeBlock = Block,
-			UncheckedExtrinsic = UncheckedExtrinsic
-		{
-			System: system::{Pallet, Call, Event<T>},
-			Collective: collective::<Instance1>::{Pallet, Call, Event<T>, Origin<T>, Config<T>},
-			CollectiveMajority: collective::<Instance2>::{Pallet, Call, Event<T>, Origin<T>, Config<T>},
-			DefaultCollective: collective::{Pallet, Call, Event<T>, Origin<T>, Config<T>},
-		}
-	);
-
-	pub fn new_test_ext() -> sp_io::TestExternalities {
-		let mut ext: sp_io::TestExternalities = GenesisConfig {
-			collective: collective::GenesisConfig {
-				members: vec![1, 2, 3],
-				phantom: Default::default(),
-			},
-			collective_majority: collective::GenesisConfig {
-				members: vec![1, 2, 3, 4, 5],
-				phantom: Default::default(),
-			},
-			default_collective: Default::default(),
-		}
-		.build_storage()
-		.unwrap()
-		.into();
-		ext.execute_with(|| System::set_block_number(1));
-		ext
-	}
-
-	fn make_proposal(value: u64) -> Call {
-		Call::System(frame_system::Call::remark(value.encode()))
-	}
-
-	#[test]
-	fn motions_basic_environment_works() {
-		new_test_ext().execute_with(|| {
-			assert_eq!(Collective::members(), vec![1, 2, 3]);
-			assert_eq!(*Collective::proposals(), Vec::<H256>::new());
-		});
-	}
-
-	#[test]
-	fn close_works() {
-		new_test_ext().execute_with(|| {
-			let proposal = make_proposal(42);
-			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
-			let proposal_weight = proposal.get_dispatch_info().weight;
-			let hash = BlakeTwo256::hash_of(&proposal);
-
-			assert_ok!(Collective::propose(
-				Origin::signed(1),
-				3,
-				Box::new(proposal.clone()),
-				proposal_len
-			));
-			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, true));
-			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 0, true));
-
-			System::set_block_number(3);
-			assert_noop!(
-				Collective::close(
-					Origin::signed(4),
-					hash.clone(),
-					0,
-					proposal_weight,
-					proposal_len
-				),
-				Error::<Test, Instance1>::TooEarly
-			);
-
-			System::set_block_number(4);
-			assert_ok!(Collective::close(
-				Origin::signed(4),
-				hash.clone(),
-				0,
-				proposal_weight,
-				proposal_len
-			));
-
-			let record =
-				|event| EventRecord { phase: Phase::Initialization, event, topics: vec![] };
-			assert_eq!(
-				System::events(),
-				vec![
-					record(Event::Collective(RawEvent::Proposed(1, 0, hash.clone(), 3))),
-					record(Event::Collective(RawEvent::Voted(1, hash.clone(), true, 1, 0))),
-					record(Event::Collective(RawEvent::Voted(2, hash.clone(), true, 2, 0))),
-					record(Event::Collective(RawEvent::Closed(hash.clone(), 2, 1))),
-					record(Event::Collective(RawEvent::Disapproved(hash.clone())))
-				]
-			);
-		});
-	}
-
-	#[test]
-	fn proposal_weight_limit_works_on_approve() {
-		new_test_ext().execute_with(|| {
-			let proposal =
-				Call::Collective(crate::Call::set_members(vec![1, 2, 3], None, MaxMembers::get()));
-			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
-			let proposal_weight = proposal.get_dispatch_info().weight;
-			let hash = BlakeTwo256::hash_of(&proposal);
-			// Set 1 as prime voter
-			Prime::<Test, Instance1>::set(Some(1));
-			assert_ok!(Collective::propose(
-				Origin::signed(1),
-				3,
-				Box::new(proposal.clone()),
-				proposal_len
-			));
-			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, true));
-			// With 1's prime vote, this should pass
-			System::set_block_number(4);
-			assert_noop!(
-				Collective::close(
-					Origin::signed(4),
-					hash.clone(),
-					0,
-					proposal_weight - 100,
-					proposal_len
-				),
-				Error::<Test, Instance1>::WrongProposalWeight
-			);
-			assert_ok!(Collective::close(
-				Origin::signed(4),
-				hash.clone(),
-				0,
-				proposal_weight,
-				proposal_len
-			));
-		})
-	}
-
-	#[test]
-	fn proposal_weight_limit_ignored_on_disapprove() {
-		new_test_ext().execute_with(|| {
-			let proposal =
-				Call::Collective(crate::Call::set_members(vec![1, 2, 3], None, MaxMembers::get()));
-			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
-			let proposal_weight = proposal.get_dispatch_info().weight;
-			let hash = BlakeTwo256::hash_of(&proposal);
-
-			assert_ok!(Collective::propose(
-				Origin::signed(1),
-				3,
-				Box::new(proposal.clone()),
-				proposal_len
-			));
-			// No votes, this proposal wont pass
-			System::set_block_number(4);
-			assert_ok!(Collective::close(
-				Origin::signed(4),
-				hash.clone(),
-				0,
-				proposal_weight - 100,
-				proposal_len
-			));
-		})
-	}
-
-	#[test]
-	fn close_with_prime_works() {
-		new_test_ext().execute_with(|| {
-			let proposal = make_proposal(42);
-			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
-			let proposal_weight = proposal.get_dispatch_info().weight;
-			let hash = BlakeTwo256::hash_of(&proposal);
-			assert_ok!(Collective::set_members(
-				Origin::root(),
-				vec![1, 2, 3],
-				Some(3),
-				MaxMembers::get()
-			));
-
-			assert_ok!(Collective::propose(
-				Origin::signed(1),
-				3,
-				Box::new(proposal.clone()),
-				proposal_len
-			));
-			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, true));
-			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 0, true));
-
-			System::set_block_number(4);
-			assert_ok!(Collective::close(
-				Origin::signed(4),
-				hash.clone(),
-				0,
-				proposal_weight,
-				proposal_len
-			));
-
-			let record =
-				|event| EventRecord { phase: Phase::Initialization, event, topics: vec![] };
-			assert_eq!(
-				System::events(),
-				vec![
-					record(Event::Collective(RawEvent::Proposed(1, 0, hash.clone(), 3))),
-					record(Event::Collective(RawEvent::Voted(1, hash.clone(), true, 1, 0))),
-					record(Event::Collective(RawEvent::Voted(2, hash.clone(), true, 2, 0))),
-					record(Event::Collective(RawEvent::Closed(hash.clone(), 2, 1))),
-					record(Event::Collective(RawEvent::Disapproved(hash.clone())))
-				]
-			);
-		});
-	}
-
-	#[test]
-	fn close_with_voting_prime_works() {
-		new_test_ext().execute_with(|| {
-			let proposal = make_proposal(42);
-			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
-			let proposal_weight = proposal.get_dispatch_info().weight;
-			let hash = BlakeTwo256::hash_of(&proposal);
-			assert_ok!(Collective::set_members(
-				Origin::root(),
-				vec![1, 2, 3],
-				Some(1),
-				MaxMembers::get()
-			));
-
-			assert_ok!(Collective::propose(
-				Origin::signed(1),
-				3,
-				Box::new(proposal.clone()),
-				proposal_len
-			));
-			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, true));
-			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 0, true));
-
-			System::set_block_number(4);
-			assert_ok!(Collective::close(
-				Origin::signed(4),
-				hash.clone(),
-				0,
-				proposal_weight,
-				proposal_len
-			));
-
-			let record =
-				|event| EventRecord { phase: Phase::Initialization, event, topics: vec![] };
-			assert_eq!(
-				System::events(),
-				vec![
-					record(Event::Collective(RawEvent::Proposed(1, 0, hash.clone(), 3))),
-					record(Event::Collective(RawEvent::Voted(1, hash.clone(), true, 1, 0))),
-					record(Event::Collective(RawEvent::Voted(2, hash.clone(), true, 2, 0))),
-					record(Event::Collective(RawEvent::Closed(hash.clone(), 3, 0))),
-					record(Event::Collective(RawEvent::Approved(hash.clone()))),
-					record(Event::Collective(RawEvent::Executed(
-						hash.clone(),
-						Err(DispatchError::BadOrigin)
-					)))
-				]
-			);
-		});
-	}
-
-	#[test]
-	fn close_with_no_prime_but_majority_works() {
-		new_test_ext().execute_with(|| {
-			let proposal = make_proposal(42);
-			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
-			let proposal_weight = proposal.get_dispatch_info().weight;
-			let hash = BlakeTwo256::hash_of(&proposal);
-			assert_ok!(CollectiveMajority::set_members(
-				Origin::root(),
-				vec![1, 2, 3, 4, 5],
-				Some(5),
-				MaxMembers::get()
-			));
-
-			assert_ok!(CollectiveMajority::propose(
-				Origin::signed(1),
-				5,
-				Box::new(proposal.clone()),
-				proposal_len
-			));
-			assert_ok!(CollectiveMajority::vote(Origin::signed(1), hash.clone(), 0, true));
-			assert_ok!(CollectiveMajority::vote(Origin::signed(2), hash.clone(), 0, true));
-			assert_ok!(CollectiveMajority::vote(Origin::signed(3), hash.clone(), 0, true));
-
-			System::set_block_number(4);
-			assert_ok!(CollectiveMajority::close(
-				Origin::signed(4),
-				hash.clone(),
-				0,
-				proposal_weight,
-				proposal_len
-			));
-
-			let record =
-				|event| EventRecord { phase: Phase::Initialization, event, topics: vec![] };
-			assert_eq!(
-				System::events(),
-				vec![
-					record(Event::CollectiveMajority(RawEvent::Proposed(1, 0, hash.clone(), 5))),
-					record(Event::CollectiveMajority(RawEvent::Voted(1, hash.clone(), true, 1, 0))),
-					record(Event::CollectiveMajority(RawEvent::Voted(2, hash.clone(), true, 2, 0))),
-					record(Event::CollectiveMajority(RawEvent::Voted(3, hash.clone(), true, 3, 0))),
-					record(Event::CollectiveMajority(RawEvent::Closed(hash.clone(), 5, 0))),
-					record(Event::CollectiveMajority(RawEvent::Approved(hash.clone()))),
-					record(Event::CollectiveMajority(RawEvent::Executed(
-						hash.clone(),
-						Err(DispatchError::BadOrigin)
-					)))
-				]
-			);
-		});
-	}
-
-	#[test]
-	fn removal_of_old_voters_votes_works() {
-		new_test_ext().execute_with(|| {
-			let proposal = make_proposal(42);
-			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
-			let hash = BlakeTwo256::hash_of(&proposal);
-			let end = 4;
-			assert_ok!(Collective::propose(
-				Origin::signed(1),
-				3,
-				Box::new(proposal.clone()),
-				proposal_len
-			));
-			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, true));
-			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 0, true));
-			assert_eq!(
-				Collective::voting(&hash),
-				Some(Votes { index: 0, threshold: 3, ayes: vec![1, 2], nays: vec![], end })
-			);
-			Collective::change_members_sorted(&[4], &[1], &[2, 3, 4]);
-			assert_eq!(
-				Collective::voting(&hash),
-				Some(Votes { index: 0, threshold: 3, ayes: vec![2], nays: vec![], end })
-			);
-
-			let proposal = make_proposal(69);
-			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
-			let hash = BlakeTwo256::hash_of(&proposal);
-			assert_ok!(Collective::propose(
-				Origin::signed(2),
-				2,
-				Box::new(proposal.clone()),
-				proposal_len
-			));
-			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 1, true));
-			assert_ok!(Collective::vote(Origin::signed(3), hash.clone(), 1, false));
-			assert_eq!(
-				Collective::voting(&hash),
-				Some(Votes { index: 1, threshold: 2, ayes: vec![2], nays: vec![3], end })
-			);
-			Collective::change_members_sorted(&[], &[3], &[2, 4]);
-			assert_eq!(
-				Collective::voting(&hash),
-				Some(Votes { index: 1, threshold: 2, ayes: vec![2], nays: vec![], end })
-			);
-		});
-	}
-
-	#[test]
-	fn removal_of_old_voters_votes_works_with_set_members() {
-		new_test_ext().execute_with(|| {
-			let proposal = make_proposal(42);
-			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
-			let hash = BlakeTwo256::hash_of(&proposal);
-			let end = 4;
-			assert_ok!(Collective::propose(
-				Origin::signed(1),
-				3,
-				Box::new(proposal.clone()),
-				proposal_len
-			));
-			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, true));
-			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 0, true));
-			assert_eq!(
-				Collective::voting(&hash),
-				Some(Votes { index: 0, threshold: 3, ayes: vec![1, 2], nays: vec![], end })
-			);
-			assert_ok!(Collective::set_members(
-				Origin::root(),
-				vec![2, 3, 4],
-				None,
-				MaxMembers::get()
-			));
-			assert_eq!(
-				Collective::voting(&hash),
-				Some(Votes { index: 0, threshold: 3, ayes: vec![2], nays: vec![], end })
-			);
-
-			let proposal = make_proposal(69);
-			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
-			let hash = BlakeTwo256::hash_of(&proposal);
-			assert_ok!(Collective::propose(
-				Origin::signed(2),
-				2,
-				Box::new(proposal.clone()),
-				proposal_len
-			));
-			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 1, true));
-			assert_ok!(Collective::vote(Origin::signed(3), hash.clone(), 1, false));
-			assert_eq!(
-				Collective::voting(&hash),
-				Some(Votes { index: 1, threshold: 2, ayes: vec![2], nays: vec![3], end })
-			);
-			assert_ok!(Collective::set_members(
-				Origin::root(),
-				vec![2, 4],
-				None,
-				MaxMembers::get()
-			));
-			assert_eq!(
-				Collective::voting(&hash),
-				Some(Votes { index: 1, threshold: 2, ayes: vec![2], nays: vec![], end })
-			);
-		});
-	}
-
-	#[test]
-	fn propose_works() {
-		new_test_ext().execute_with(|| {
-			let proposal = make_proposal(42);
-			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
-			let hash = proposal.blake2_256().into();
-			let end = 4;
-			assert_ok!(Collective::propose(
-				Origin::signed(1),
-				3,
-				Box::new(proposal.clone()),
-				proposal_len
-			));
-			assert_eq!(*Collective::proposals(), vec![hash]);
-			assert_eq!(Collective::proposal_of(&hash), Some(proposal));
-			assert_eq!(
-				Collective::voting(&hash),
-				Some(Votes { index: 0, threshold: 3, ayes: vec![], nays: vec![], end })
-			);
-
-			assert_eq!(
-				System::events(),
-				vec![EventRecord {
-					phase: Phase::Initialization,
-					event: Event::Collective(RawEvent::Proposed(
-						1,
-						0,
-						hex!["68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"]
-							.into(),
-						3,
-					)),
-					topics: vec![],
-				}]
-			);
-		});
-	}
-
-	#[test]
-	fn limit_active_proposals() {
-		new_test_ext().execute_with(|| {
-			for i in 0..MaxProposals::get() {
-				let proposal = make_proposal(i as u64);
-				let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
-				assert_ok!(Collective::propose(
-					Origin::signed(1),
-					3,
-					Box::new(proposal.clone()),
-					proposal_len
-				));
-			}
-			let proposal = make_proposal(MaxProposals::get() as u64 + 1);
-			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
-			assert_noop!(
-				Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone()), proposal_len),
-				Error::<Test, Instance1>::TooManyProposals
-			);
-		})
-	}
-
-	#[test]
-	fn correct_validate_and_get_proposal() {
-		new_test_ext().execute_with(|| {
-			let proposal =
-				Call::Collective(crate::Call::set_members(vec![1, 2, 3], None, MaxMembers::get()));
-			let length = proposal.encode().len() as u32;
-			assert_ok!(Collective::propose(
-				Origin::signed(1),
-				3,
-				Box::new(proposal.clone()),
-				length
-			));
-
-			let hash = BlakeTwo256::hash_of(&proposal);
-			let weight = proposal.get_dispatch_info().weight;
-			assert_noop!(
-				Collective::validate_and_get_proposal(
-					&BlakeTwo256::hash_of(&vec![3; 4]),
-					length,
-					weight
-				),
-				Error::<Test, Instance1>::ProposalMissing
-			);
-			assert_noop!(
-				Collective::validate_and_get_proposal(&hash, length - 2, weight),
-				Error::<Test, Instance1>::WrongProposalLength
-			);
-			assert_noop!(
-				Collective::validate_and_get_proposal(&hash, length, weight - 10),
-				Error::<Test, Instance1>::WrongProposalWeight
-			);
-			let res = Collective::validate_and_get_proposal(&hash, length, weight);
-			assert_ok!(res.clone());
-			let (retrieved_proposal, len) = res.unwrap();
-			assert_eq!(length as usize, len);
-			assert_eq!(proposal, retrieved_proposal);
-		})
-	}
-
-	#[test]
-	fn motions_ignoring_non_collective_proposals_works() {
-		new_test_ext().execute_with(|| {
-			let proposal = make_proposal(42);
-			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
-			assert_noop!(
-				Collective::propose(
-					Origin::signed(42),
-					3,
-					Box::new(proposal.clone()),
-					proposal_len
-				),
-				Error::<Test, Instance1>::NotMember
-			);
-		});
-	}
-
-	#[test]
-	fn motions_ignoring_non_collective_votes_works() {
-		new_test_ext().execute_with(|| {
-			let proposal = make_proposal(42);
-			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
-			let hash: H256 = proposal.blake2_256().into();
-			assert_ok!(Collective::propose(
-				Origin::signed(1),
-				3,
-				Box::new(proposal.clone()),
-				proposal_len
-			));
-			assert_noop!(
-				Collective::vote(Origin::signed(42), hash.clone(), 0, true),
-				Error::<Test, Instance1>::NotMember,
-			);
-		});
-	}
-
-	#[test]
-	fn motions_ignoring_bad_index_collective_vote_works() {
-		new_test_ext().execute_with(|| {
-			System::set_block_number(3);
-			let proposal = make_proposal(42);
-			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
-			let hash: H256 = proposal.blake2_256().into();
-			assert_ok!(Collective::propose(
-				Origin::signed(1),
-				3,
-				Box::new(proposal.clone()),
-				proposal_len
-			));
-			assert_noop!(
-				Collective::vote(Origin::signed(2), hash.clone(), 1, true),
-				Error::<Test, Instance1>::WrongIndex,
-			);
-		});
-	}
-
-	#[test]
-	fn motions_vote_after_works() {
-		new_test_ext().execute_with(|| {
-			let proposal = make_proposal(42);
-			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
-			let hash: H256 = proposal.blake2_256().into();
-			let end = 4;
-			assert_ok!(Collective::propose(
-				Origin::signed(1),
-				2,
-				Box::new(proposal.clone()),
-				proposal_len
-			));
-			// Initially there a no votes when the motion is proposed.
-			assert_eq!(
-				Collective::voting(&hash),
-				Some(Votes { index: 0, threshold: 2, ayes: vec![], nays: vec![], end })
-			);
-			// Cast first aye vote.
-			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, true));
-			assert_eq!(
-				Collective::voting(&hash),
-				Some(Votes { index: 0, threshold: 2, ayes: vec![1], nays: vec![], end })
-			);
-			// Try to cast a duplicate aye vote.
-			assert_noop!(
-				Collective::vote(Origin::signed(1), hash.clone(), 0, true),
-				Error::<Test, Instance1>::DuplicateVote,
-			);
-			// Cast a nay vote.
-			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, false));
-			assert_eq!(
-				Collective::voting(&hash),
-				Some(Votes { index: 0, threshold: 2, ayes: vec![], nays: vec![1], end })
-			);
-			// Try to cast a duplicate nay vote.
-			assert_noop!(
-				Collective::vote(Origin::signed(1), hash.clone(), 0, false),
-				Error::<Test, Instance1>::DuplicateVote,
-			);
-
-			assert_eq!(
-				System::events(),
-				vec![
-					EventRecord {
-						phase: Phase::Initialization,
-						event: Event::Collective(RawEvent::Proposed(
-							1,
-							0,
-							hex![
-								"68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"
-							]
-							.into(),
-							2,
-						)),
-						topics: vec![],
-					},
-					EventRecord {
-						phase: Phase::Initialization,
-						event: Event::Collective(RawEvent::Voted(
-							1,
-							hex![
-								"68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"
-							]
-							.into(),
-							true,
-							1,
-							0,
-						)),
-						topics: vec![],
-					},
-					EventRecord {
-						phase: Phase::Initialization,
-						event: Event::Collective(RawEvent::Voted(
-							1,
-							hex![
-								"68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"
-							]
-							.into(),
-							false,
-							0,
-							1,
-						)),
-						topics: vec![],
-					}
-				]
-			);
-		});
-	}
-
-	#[test]
-	fn motions_all_first_vote_free_works() {
-		new_test_ext().execute_with(|| {
-			let proposal = make_proposal(42);
-			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
-			let hash: H256 = proposal.blake2_256().into();
-			let end = 4;
-			assert_ok!(Collective::propose(
-				Origin::signed(1),
-				2,
-				Box::new(proposal.clone()),
-				proposal_len,
-			));
-			assert_eq!(
-				Collective::voting(&hash),
-				Some(Votes { index: 0, threshold: 2, ayes: vec![], nays: vec![], end })
-			);
-
-			// For the motion, acc 2's first vote, expecting Ok with Pays::No.
-			let vote_rval: DispatchResultWithPostInfo =
-				Collective::vote(Origin::signed(2), hash.clone(), 0, true);
-			assert_eq!(vote_rval.unwrap().pays_fee, Pays::No);
-
-			// Duplicate vote, expecting error with Pays::Yes.
-			let vote_rval: DispatchResultWithPostInfo =
-				Collective::vote(Origin::signed(2), hash.clone(), 0, true);
-			assert_eq!(vote_rval.unwrap_err().post_info.pays_fee, Pays::Yes);
-
-			// Modifying vote, expecting ok with Pays::Yes.
-			let vote_rval: DispatchResultWithPostInfo =
-				Collective::vote(Origin::signed(2), hash.clone(), 0, false);
-			assert_eq!(vote_rval.unwrap().pays_fee, Pays::Yes);
-
-			// For the motion, acc 3's first vote, expecting Ok with Pays::No.
-			let vote_rval: DispatchResultWithPostInfo =
-				Collective::vote(Origin::signed(3), hash.clone(), 0, true);
-			assert_eq!(vote_rval.unwrap().pays_fee, Pays::No);
-
-			// acc 3 modify the vote, expecting Ok with Pays::Yes.
-			let vote_rval: DispatchResultWithPostInfo =
-				Collective::vote(Origin::signed(3), hash.clone(), 0, false);
-			assert_eq!(vote_rval.unwrap().pays_fee, Pays::Yes);
-
-			// Test close() Extrincis | Check DispatchResultWithPostInfo with Pay Info
-
-			let proposal_weight = proposal.get_dispatch_info().weight;
-			let close_rval: DispatchResultWithPostInfo = Collective::close(
-				Origin::signed(2),
-				hash.clone(),
-				0,
-				proposal_weight,
-				proposal_len,
-			);
-			assert_eq!(close_rval.unwrap().pays_fee, Pays::No);
-
-			// trying to close the proposal, which is already closed.
-			// Expecting error "ProposalMissing" with Pays::Yes
-			let close_rval: DispatchResultWithPostInfo = Collective::close(
-				Origin::signed(2),
-				hash.clone(),
-				0,
-				proposal_weight,
-				proposal_len,
-			);
-			assert_eq!(close_rval.unwrap_err().post_info.pays_fee, Pays::Yes);
-		});
-	}
-
-	#[test]
-	fn motions_reproposing_disapproved_works() {
-		new_test_ext().execute_with(|| {
-			let proposal = make_proposal(42);
-			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
-			let proposal_weight = proposal.get_dispatch_info().weight;
-			let hash: H256 = proposal.blake2_256().into();
-			assert_ok!(Collective::propose(
-				Origin::signed(1),
-				3,
-				Box::new(proposal.clone()),
-				proposal_len
-			));
-			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 0, false));
-			assert_ok!(Collective::close(
-				Origin::signed(2),
-				hash.clone(),
-				0,
-				proposal_weight,
-				proposal_len
-			));
-			assert_eq!(*Collective::proposals(), vec![]);
-			assert_ok!(Collective::propose(
-				Origin::signed(1),
-				2,
-				Box::new(proposal.clone()),
-				proposal_len
-			));
-			assert_eq!(*Collective::proposals(), vec![hash]);
-		});
-	}
-
-	#[test]
-	fn motions_disapproval_works() {
-		new_test_ext().execute_with(|| {
-			let proposal = make_proposal(42);
-			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
-			let proposal_weight = proposal.get_dispatch_info().weight;
-			let hash: H256 = proposal.blake2_256().into();
-			assert_ok!(Collective::propose(
-				Origin::signed(1),
-				3,
-				Box::new(proposal.clone()),
-				proposal_len
-			));
-			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, true));
-			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 0, false));
-			assert_ok!(Collective::close(
-				Origin::signed(2),
-				hash.clone(),
-				0,
-				proposal_weight,
-				proposal_len
-			));
-
-			assert_eq!(
-				System::events(),
-				vec![
-					EventRecord {
-						phase: Phase::Initialization,
-						event: Event::Collective(RawEvent::Proposed(
-							1,
-							0,
-							hex![
-								"68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"
-							]
-							.into(),
-							3,
-						)),
-						topics: vec![],
-					},
-					EventRecord {
-						phase: Phase::Initialization,
-						event: Event::Collective(RawEvent::Voted(
-							1,
-							hex![
-								"68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"
-							]
-							.into(),
-							true,
-							1,
-							0,
-						)),
-						topics: vec![],
-					},
-					EventRecord {
-						phase: Phase::Initialization,
-						event: Event::Collective(RawEvent::Voted(
-							2,
-							hex![
-								"68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"
-							]
-							.into(),
-							false,
-							1,
-							1,
-						)),
-						topics: vec![],
-					},
-					EventRecord {
-						phase: Phase::Initialization,
-						event: Event::Collective(RawEvent::Closed(
-							hex![
-								"68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"
-							]
-							.into(),
-							1,
-							1,
-						)),
-						topics: vec![],
-					},
-					EventRecord {
-						phase: Phase::Initialization,
-						event: Event::Collective(RawEvent::Disapproved(
-							hex![
-								"68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"
-							]
-							.into(),
-						)),
-						topics: vec![],
-					}
-				]
-			);
-		});
-	}
-
-	#[test]
-	fn motions_approval_works() {
-		new_test_ext().execute_with(|| {
-			let proposal = make_proposal(42);
-			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
-			let proposal_weight = proposal.get_dispatch_info().weight;
-			let hash: H256 = proposal.blake2_256().into();
-			assert_ok!(Collective::propose(
-				Origin::signed(1),
-				2,
-				Box::new(proposal.clone()),
-				proposal_len
-			));
-			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, true));
-			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 0, true));
-			assert_ok!(Collective::close(
-				Origin::signed(2),
-				hash.clone(),
-				0,
-				proposal_weight,
-				proposal_len
-			));
-
-			assert_eq!(
-				System::events(),
-				vec![
-					EventRecord {
-						phase: Phase::Initialization,
-						event: Event::Collective(RawEvent::Proposed(
-							1,
-							0,
-							hex![
-								"68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"
-							]
-							.into(),
-							2,
-						)),
-						topics: vec![],
-					},
-					EventRecord {
-						phase: Phase::Initialization,
-						event: Event::Collective(RawEvent::Voted(
-							1,
-							hex![
-								"68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"
-							]
-							.into(),
-							true,
-							1,
-							0,
-						)),
-						topics: vec![],
-					},
-					EventRecord {
-						phase: Phase::Initialization,
-						event: Event::Collective(RawEvent::Voted(
-							2,
-							hex![
-								"68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"
-							]
-							.into(),
-							true,
-							2,
-							0,
-						)),
-						topics: vec![],
-					},
-					EventRecord {
-						phase: Phase::Initialization,
-						event: Event::Collective(RawEvent::Closed(
-							hex![
-								"68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"
-							]
-							.into(),
-							2,
-							0,
-						)),
-						topics: vec![],
-					},
-					EventRecord {
-						phase: Phase::Initialization,
-						event: Event::Collective(RawEvent::Approved(
-							hex![
-								"68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"
-							]
-							.into(),
-						)),
-						topics: vec![],
-					},
-					EventRecord {
-						phase: Phase::Initialization,
-						event: Event::Collective(RawEvent::Executed(
-							hex![
-								"68eea8f20b542ec656c6ac2d10435ae3bd1729efc34d1354ab85af840aad2d35"
-							]
-							.into(),
-							Err(DispatchError::BadOrigin),
-						)),
-						topics: vec![],
-					}
-				]
-			);
-		});
-	}
-
-	#[test]
-	fn motion_with_no_votes_closes_with_disapproval() {
-		new_test_ext().execute_with(|| {
-			let record =
-				|event| EventRecord { phase: Phase::Initialization, event, topics: vec![] };
-			let proposal = make_proposal(42);
-			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
-			let proposal_weight = proposal.get_dispatch_info().weight;
-			let hash: H256 = proposal.blake2_256().into();
-			assert_ok!(Collective::propose(
-				Origin::signed(1),
-				3,
-				Box::new(proposal.clone()),
-				proposal_len
-			));
-			assert_eq!(
-				System::events()[0],
-				record(Event::Collective(RawEvent::Proposed(1, 0, hash.clone(), 3)))
-			);
-
-			// Closing the motion too early is not possible because it has neither
-			// an approving or disapproving simple majority due to the lack of votes.
-			assert_noop!(
-				Collective::close(
-					Origin::signed(2),
-					hash.clone(),
-					0,
-					proposal_weight,
-					proposal_len
-				),
-				Error::<Test, Instance1>::TooEarly
-			);
-
-			// Once the motion duration passes,
-			let closing_block = System::block_number() + MotionDuration::get();
-			System::set_block_number(closing_block);
-			// we can successfully close the motion.
-			assert_ok!(Collective::close(
-				Origin::signed(2),
-				hash.clone(),
-				0,
-				proposal_weight,
-				proposal_len
-			));
-
-			// Events show that the close ended in a disapproval.
-			assert_eq!(
-				System::events()[1],
-				record(Event::Collective(RawEvent::Closed(hash.clone(), 0, 3)))
-			);
-			assert_eq!(
-				System::events()[2],
-				record(Event::Collective(RawEvent::Disapproved(hash.clone())))
-			);
-		})
-	}
-
-	#[test]
-	fn close_disapprove_does_not_care_about_weight_or_len() {
-		// This test confirms that if you close a proposal that would be disapproved,
-		// we do not care about the proposal length or proposal weight since it will
-		// not be read from storage or executed.
-		new_test_ext().execute_with(|| {
-			let proposal = make_proposal(42);
-			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
-			let hash: H256 = proposal.blake2_256().into();
-			assert_ok!(Collective::propose(
-				Origin::signed(1),
-				2,
-				Box::new(proposal.clone()),
-				proposal_len
-			));
-			// First we make the proposal succeed
-			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, true));
-			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 0, true));
-			// It will not close with bad weight/len information
-			assert_noop!(
-				Collective::close(Origin::signed(2), hash.clone(), 0, 0, 0),
-				Error::<Test, Instance1>::WrongProposalLength,
-			);
-			assert_noop!(
-				Collective::close(Origin::signed(2), hash.clone(), 0, 0, proposal_len),
-				Error::<Test, Instance1>::WrongProposalWeight,
-			);
-			// Now we make the proposal fail
-			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, false));
-			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 0, false));
-			// It can close even if the weight/len information is bad
-			assert_ok!(Collective::close(Origin::signed(2), hash.clone(), 0, 0, 0));
-		})
-	}
-
-	#[test]
-	fn disapprove_proposal_works() {
-		new_test_ext().execute_with(|| {
-			let proposal = make_proposal(42);
-			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
-			let hash: H256 = proposal.blake2_256().into();
-			assert_ok!(Collective::propose(
-				Origin::signed(1),
-				2,
-				Box::new(proposal.clone()),
-				proposal_len
-			));
-			// Proposal would normally succeed
-			assert_ok!(Collective::vote(Origin::signed(1), hash.clone(), 0, true));
-			assert_ok!(Collective::vote(Origin::signed(2), hash.clone(), 0, true));
-			// But Root can disapprove and remove it anyway
-			assert_ok!(Collective::disapprove_proposal(Origin::root(), hash.clone()));
-			let record =
-				|event| EventRecord { phase: Phase::Initialization, event, topics: vec![] };
-			assert_eq!(
-				System::events(),
-				vec![
-					record(Event::Collective(RawEvent::Proposed(1, 0, hash.clone(), 2))),
-					record(Event::Collective(RawEvent::Voted(1, hash.clone(), true, 1, 0))),
-					record(Event::Collective(RawEvent::Voted(2, hash.clone(), true, 2, 0))),
-					record(Event::Collective(RawEvent::Disapproved(hash.clone()))),
-				]
-			);
-		})
-	}
-
-	#[test]
-	#[should_panic(expected = "Members cannot contain duplicate accounts.")]
-	fn genesis_build_panics_with_duplicate_members() {
-		collective::GenesisConfig::<Test> {
-			members: vec![1, 2, 3, 1],
-			phantom: Default::default(),
-		}
-		.build_storage()
-		.unwrap();
-	}
-}
diff --git a/frame/collective/src/tests.rs b/frame/collective/src/tests.rs
new file mode 100644
index 000000000000..aa6ea090f4ee
--- /dev/null
+++ b/frame/collective/src/tests.rs
@@ -0,0 +1,1007 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use super::*;
+use crate as collective;
+use frame_support::{assert_noop, assert_ok, parameter_types, Hashable};
+use frame_system::{self as system, EventRecord, Phase};
+use sp_core::{
+	u32_trait::{_3, _4},
+	H256,
+};
+use sp_runtime::{
+	testing::Header,
+	traits::{BlakeTwo256, IdentityLookup},
+	BuildStorage,
+};
+
+pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;
+pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<u32, u64, Call, ()>;
+
+frame_support::construct_runtime!(
+	pub enum Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic
+	{
+		System: system::{Pallet, Call, Event<T>},
+		Collective: collective::<Instance1>::{Pallet, Call, Event<T>, Origin<T>, Config<T>},
+		CollectiveMajority: collective::<Instance2>::{Pallet, Call, Event<T>, Origin<T>, Config<T>},
+		DefaultCollective: collective::{Pallet, Call, Event<T>, Origin<T>, Config<T>},
+		Democracy: mock_democracy::{Pallet, Call, Event<T>},
+	}
+);
+
+mod mock_democracy {
+	pub use pallet::*;
+	#[frame_support::pallet]
+	pub mod pallet {
+		use frame_support::{pallet_prelude::*, traits::EnsureOrigin};
+		use frame_system::pallet_prelude::*;
+		use sp_runtime::DispatchResult;
+
+		#[pallet::pallet]
+		#[pallet::generate_store(pub(super) trait Store)]
+		pub struct Pallet<T>(_);
+
+		#[pallet::config]
+		pub trait Config: frame_system::Config + Sized {
+			type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
+			type ExternalMajorityOrigin: EnsureOrigin<Self::Origin>;
+		}
+
+		#[pallet::call]
+		impl<T: Config> Pallet<T> {
+			#[pallet::weight(0)]
+			pub fn external_propose_majority(origin: OriginFor<T>) -> DispatchResult {
+				T::ExternalMajorityOrigin::ensure_origin(origin)?;
+				Self::deposit_event(Event::<T>::ExternalProposed);
+				Ok(())
+			}
+		}
+
+		#[pallet::event]
+		#[pallet::generate_deposit(pub(super) fn deposit_event)]
+		pub enum Event<T: Config> {
+			ExternalProposed,
+		}
+	}
+}
+
+parameter_types! {
+	pub const BlockHashCount: u64 = 250;
+	pub const MotionDuration: u64 = 3;
+	pub const MaxProposals: u32 = 100;
+	pub const MaxMembers: u32 = 100;
+	pub BlockWeights: frame_system::limits::BlockWeights =
+		frame_system::limits::BlockWeights::simple_max(1024);
+}
+impl frame_system::Config for Test {
+	type BaseCallFilter = frame_support::traits::Everything;
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
+	type Origin = Origin;
+	type Index = u64;
+	type BlockNumber = u64;
+	type Call = Call;
+	type Hash = H256;
+	type Hashing = BlakeTwo256;
+	type AccountId = u64;
+	type Lookup = IdentityLookup<Self::AccountId>;
+	type Header = Header;
+	type Event = Event;
+	type BlockHashCount = BlockHashCount;
+	type Version = ();
+	type PalletInfo = PalletInfo;
+	type AccountData = ();
+	type OnNewAccount = ();
+	type OnKilledAccount = ();
+	type SystemWeightInfo = ();
+	type SS58Prefix = ();
+	type OnSetCode = ();
+}
+impl Config<Instance1> for Test {
+	type Origin = Origin;
+	type Proposal = Call;
+	type Event = Event;
+	type MotionDuration = MotionDuration;
+	type MaxProposals = MaxProposals;
+	type MaxMembers = MaxMembers;
+	type DefaultVote = PrimeDefaultVote;
+	type WeightInfo = ();
+}
+impl Config<Instance2> for Test {
+	type Origin = Origin;
+	type Proposal = Call;
+	type Event = Event;
+	type MotionDuration = MotionDuration;
+	type MaxProposals = MaxProposals;
+	type MaxMembers = MaxMembers;
+	type DefaultVote = MoreThanMajorityThenPrimeDefaultVote;
+	type WeightInfo = ();
+}
+impl mock_democracy::Config for Test {
+	type Event = Event;
+	type ExternalMajorityOrigin = EnsureProportionAtLeast<_3, _4, u64, Instance1>;
+}
+impl Config for Test {
+	type Origin = Origin;
+	type Proposal = Call;
+	type Event = Event;
+	type MotionDuration = MotionDuration;
+	type MaxProposals = MaxProposals;
+	type MaxMembers = MaxMembers;
+	type DefaultVote = PrimeDefaultVote;
+	type WeightInfo = ();
+}
+
+pub fn new_test_ext() -> sp_io::TestExternalities {
+	let mut ext: sp_io::TestExternalities = GenesisConfig {
+		collective: collective::GenesisConfig {
+			members: vec![1, 2, 3],
+			phantom: Default::default(),
+		},
+		collective_majority: collective::GenesisConfig {
+			members: vec![1, 2, 3, 4, 5],
+			phantom: Default::default(),
+		},
+		default_collective: Default::default(),
+	}
+	.build_storage()
+	.unwrap()
+	.into();
+	ext.execute_with(|| System::set_block_number(1));
+	ext
+}
+
+fn make_proposal(value: u64) -> Call {
+	Call::System(frame_system::Call::remark(value.encode()))
+}
+
+fn record(event: Event) -> EventRecord<Event, H256> {
+	EventRecord { phase: Phase::Initialization, event, topics: vec![] }
+}
+
+#[test]
+fn motions_basic_environment_works() {
+	new_test_ext().execute_with(|| {
+		assert_eq!(Collective::members(), vec![1, 2, 3]);
+		assert_eq!(*Collective::proposals(), Vec::<H256>::new());
+	});
+}
+
+#[test]
+fn close_works() {
+	new_test_ext().execute_with(|| {
+		let proposal = make_proposal(42);
+		let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
+		let proposal_weight = proposal.get_dispatch_info().weight;
+		let hash = BlakeTwo256::hash_of(&proposal);
+
+		assert_ok!(Collective::propose(
+			Origin::signed(1),
+			3,
+			Box::new(proposal.clone()),
+			proposal_len
+		));
+		assert_ok!(Collective::vote(Origin::signed(1), hash, 0, true));
+		assert_ok!(Collective::vote(Origin::signed(2), hash, 0, true));
+
+		System::set_block_number(3);
+		assert_noop!(
+			Collective::close(Origin::signed(4), hash, 0, proposal_weight, proposal_len),
+			Error::<Test, Instance1>::TooEarly
+		);
+
+		System::set_block_number(4);
+		assert_ok!(Collective::close(Origin::signed(4), hash, 0, proposal_weight, proposal_len));
+
+		assert_eq!(
+			System::events(),
+			vec![
+				record(Event::Collective(RawEvent::Proposed(1, 0, hash, 3))),
+				record(Event::Collective(RawEvent::Voted(1, hash, true, 1, 0))),
+				record(Event::Collective(RawEvent::Voted(2, hash, true, 2, 0))),
+				record(Event::Collective(RawEvent::Closed(hash, 2, 1))),
+				record(Event::Collective(RawEvent::Disapproved(hash)))
+			]
+		);
+	});
+}
+
+#[test]
+fn proposal_weight_limit_works_on_approve() {
+	new_test_ext().execute_with(|| {
+		let proposal =
+			Call::Collective(crate::Call::set_members(vec![1, 2, 3], None, MaxMembers::get()));
+		let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
+		let proposal_weight = proposal.get_dispatch_info().weight;
+		let hash = BlakeTwo256::hash_of(&proposal);
+		// Set 1 as prime voter
+		Prime::<Test, Instance1>::set(Some(1));
+		assert_ok!(Collective::propose(
+			Origin::signed(1),
+			3,
+			Box::new(proposal.clone()),
+			proposal_len
+		));
+		assert_ok!(Collective::vote(Origin::signed(1), hash, 0, true));
+		// With 1's prime vote, this should pass
+		System::set_block_number(4);
+		assert_noop!(
+			Collective::close(Origin::signed(4), hash, 0, proposal_weight - 100, proposal_len),
+			Error::<Test, Instance1>::WrongProposalWeight
+		);
+		assert_ok!(Collective::close(Origin::signed(4), hash, 0, proposal_weight, proposal_len));
+	})
+}
+
+#[test]
+fn proposal_weight_limit_ignored_on_disapprove() {
+	new_test_ext().execute_with(|| {
+		let proposal =
+			Call::Collective(crate::Call::set_members(vec![1, 2, 3], None, MaxMembers::get()));
+		let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
+		let proposal_weight = proposal.get_dispatch_info().weight;
+		let hash = BlakeTwo256::hash_of(&proposal);
+
+		assert_ok!(Collective::propose(
+			Origin::signed(1),
+			3,
+			Box::new(proposal.clone()),
+			proposal_len
+		));
+		// No votes, this proposal wont pass
+		System::set_block_number(4);
+		assert_ok!(Collective::close(
+			Origin::signed(4),
+			hash,
+			0,
+			proposal_weight - 100,
+			proposal_len
+		));
+	})
+}
+
+#[test]
+fn close_with_prime_works() {
+	new_test_ext().execute_with(|| {
+		let proposal = make_proposal(42);
+		let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
+		let proposal_weight = proposal.get_dispatch_info().weight;
+		let hash = BlakeTwo256::hash_of(&proposal);
+		assert_ok!(Collective::set_members(
+			Origin::root(),
+			vec![1, 2, 3],
+			Some(3),
+			MaxMembers::get()
+		));
+
+		assert_ok!(Collective::propose(
+			Origin::signed(1),
+			3,
+			Box::new(proposal.clone()),
+			proposal_len
+		));
+		assert_ok!(Collective::vote(Origin::signed(1), hash, 0, true));
+		assert_ok!(Collective::vote(Origin::signed(2), hash, 0, true));
+
+		System::set_block_number(4);
+		assert_ok!(Collective::close(Origin::signed(4), hash, 0, proposal_weight, proposal_len));
+
+		assert_eq!(
+			System::events(),
+			vec![
+				record(Event::Collective(RawEvent::Proposed(1, 0, hash, 3))),
+				record(Event::Collective(RawEvent::Voted(1, hash, true, 1, 0))),
+				record(Event::Collective(RawEvent::Voted(2, hash, true, 2, 0))),
+				record(Event::Collective(RawEvent::Closed(hash, 2, 1))),
+				record(Event::Collective(RawEvent::Disapproved(hash)))
+			]
+		);
+	});
+}
+
+#[test]
+fn close_with_voting_prime_works() {
+	new_test_ext().execute_with(|| {
+		let proposal = make_proposal(42);
+		let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
+		let proposal_weight = proposal.get_dispatch_info().weight;
+		let hash = BlakeTwo256::hash_of(&proposal);
+		assert_ok!(Collective::set_members(
+			Origin::root(),
+			vec![1, 2, 3],
+			Some(1),
+			MaxMembers::get()
+		));
+
+		assert_ok!(Collective::propose(
+			Origin::signed(1),
+			3,
+			Box::new(proposal.clone()),
+			proposal_len
+		));
+		assert_ok!(Collective::vote(Origin::signed(1), hash, 0, true));
+		assert_ok!(Collective::vote(Origin::signed(2), hash, 0, true));
+
+		System::set_block_number(4);
+		assert_ok!(Collective::close(Origin::signed(4), hash, 0, proposal_weight, proposal_len));
+
+		assert_eq!(
+			System::events(),
+			vec![
+				record(Event::Collective(RawEvent::Proposed(1, 0, hash, 3))),
+				record(Event::Collective(RawEvent::Voted(1, hash, true, 1, 0))),
+				record(Event::Collective(RawEvent::Voted(2, hash, true, 2, 0))),
+				record(Event::Collective(RawEvent::Closed(hash, 3, 0))),
+				record(Event::Collective(RawEvent::Approved(hash))),
+				record(Event::Collective(RawEvent::Executed(hash, Err(DispatchError::BadOrigin))))
+			]
+		);
+	});
+}
+
+#[test]
+fn close_with_no_prime_but_majority_works() {
+	new_test_ext().execute_with(|| {
+		let proposal = make_proposal(42);
+		let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
+		let proposal_weight = proposal.get_dispatch_info().weight;
+		let hash = BlakeTwo256::hash_of(&proposal);
+		assert_ok!(CollectiveMajority::set_members(
+			Origin::root(),
+			vec![1, 2, 3, 4, 5],
+			Some(5),
+			MaxMembers::get()
+		));
+
+		assert_ok!(CollectiveMajority::propose(
+			Origin::signed(1),
+			5,
+			Box::new(proposal.clone()),
+			proposal_len
+		));
+		assert_ok!(CollectiveMajority::vote(Origin::signed(1), hash, 0, true));
+		assert_ok!(CollectiveMajority::vote(Origin::signed(2), hash, 0, true));
+		assert_ok!(CollectiveMajority::vote(Origin::signed(3), hash, 0, true));
+
+		System::set_block_number(4);
+		assert_ok!(CollectiveMajority::close(
+			Origin::signed(4),
+			hash,
+			0,
+			proposal_weight,
+			proposal_len
+		));
+
+		assert_eq!(
+			System::events(),
+			vec![
+				record(Event::CollectiveMajority(RawEvent::Proposed(1, 0, hash, 5))),
+				record(Event::CollectiveMajority(RawEvent::Voted(1, hash, true, 1, 0))),
+				record(Event::CollectiveMajority(RawEvent::Voted(2, hash, true, 2, 0))),
+				record(Event::CollectiveMajority(RawEvent::Voted(3, hash, true, 3, 0))),
+				record(Event::CollectiveMajority(RawEvent::Closed(hash, 5, 0))),
+				record(Event::CollectiveMajority(RawEvent::Approved(hash))),
+				record(Event::CollectiveMajority(RawEvent::Executed(
+					hash,
+					Err(DispatchError::BadOrigin)
+				)))
+			]
+		);
+	});
+}
+
+#[test]
+fn removal_of_old_voters_votes_works() {
+	new_test_ext().execute_with(|| {
+		let proposal = make_proposal(42);
+		let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
+		let hash = BlakeTwo256::hash_of(&proposal);
+		let end = 4;
+		assert_ok!(Collective::propose(
+			Origin::signed(1),
+			3,
+			Box::new(proposal.clone()),
+			proposal_len
+		));
+		assert_ok!(Collective::vote(Origin::signed(1), hash, 0, true));
+		assert_ok!(Collective::vote(Origin::signed(2), hash, 0, true));
+		assert_eq!(
+			Collective::voting(&hash),
+			Some(Votes { index: 0, threshold: 3, ayes: vec![1, 2], nays: vec![], end })
+		);
+		Collective::change_members_sorted(&[4], &[1], &[2, 3, 4]);
+		assert_eq!(
+			Collective::voting(&hash),
+			Some(Votes { index: 0, threshold: 3, ayes: vec![2], nays: vec![], end })
+		);
+
+		let proposal = make_proposal(69);
+		let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
+		let hash = BlakeTwo256::hash_of(&proposal);
+		assert_ok!(Collective::propose(
+			Origin::signed(2),
+			2,
+			Box::new(proposal.clone()),
+			proposal_len
+		));
+		assert_ok!(Collective::vote(Origin::signed(2), hash, 1, true));
+		assert_ok!(Collective::vote(Origin::signed(3), hash, 1, false));
+		assert_eq!(
+			Collective::voting(&hash),
+			Some(Votes { index: 1, threshold: 2, ayes: vec![2], nays: vec![3], end })
+		);
+		Collective::change_members_sorted(&[], &[3], &[2, 4]);
+		assert_eq!(
+			Collective::voting(&hash),
+			Some(Votes { index: 1, threshold: 2, ayes: vec![2], nays: vec![], end })
+		);
+	});
+}
+
+#[test]
+fn removal_of_old_voters_votes_works_with_set_members() {
+	new_test_ext().execute_with(|| {
+		let proposal = make_proposal(42);
+		let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
+		let hash = BlakeTwo256::hash_of(&proposal);
+		let end = 4;
+		assert_ok!(Collective::propose(
+			Origin::signed(1),
+			3,
+			Box::new(proposal.clone()),
+			proposal_len
+		));
+		assert_ok!(Collective::vote(Origin::signed(1), hash, 0, true));
+		assert_ok!(Collective::vote(Origin::signed(2), hash, 0, true));
+		assert_eq!(
+			Collective::voting(&hash),
+			Some(Votes { index: 0, threshold: 3, ayes: vec![1, 2], nays: vec![], end })
+		);
+		assert_ok!(Collective::set_members(Origin::root(), vec![2, 3, 4], None, MaxMembers::get()));
+		assert_eq!(
+			Collective::voting(&hash),
+			Some(Votes { index: 0, threshold: 3, ayes: vec![2], nays: vec![], end })
+		);
+
+		let proposal = make_proposal(69);
+		let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
+		let hash = BlakeTwo256::hash_of(&proposal);
+		assert_ok!(Collective::propose(
+			Origin::signed(2),
+			2,
+			Box::new(proposal.clone()),
+			proposal_len
+		));
+		assert_ok!(Collective::vote(Origin::signed(2), hash, 1, true));
+		assert_ok!(Collective::vote(Origin::signed(3), hash, 1, false));
+		assert_eq!(
+			Collective::voting(&hash),
+			Some(Votes { index: 1, threshold: 2, ayes: vec![2], nays: vec![3], end })
+		);
+		assert_ok!(Collective::set_members(Origin::root(), vec![2, 4], None, MaxMembers::get()));
+		assert_eq!(
+			Collective::voting(&hash),
+			Some(Votes { index: 1, threshold: 2, ayes: vec![2], nays: vec![], end })
+		);
+	});
+}
+
+#[test]
+fn propose_works() {
+	new_test_ext().execute_with(|| {
+		let proposal = make_proposal(42);
+		let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
+		let hash = proposal.blake2_256().into();
+		let end = 4;
+		assert_ok!(Collective::propose(
+			Origin::signed(1),
+			3,
+			Box::new(proposal.clone()),
+			proposal_len
+		));
+		assert_eq!(*Collective::proposals(), vec![hash]);
+		assert_eq!(Collective::proposal_of(&hash), Some(proposal));
+		assert_eq!(
+			Collective::voting(&hash),
+			Some(Votes { index: 0, threshold: 3, ayes: vec![], nays: vec![], end })
+		);
+
+		assert_eq!(
+			System::events(),
+			vec![record(Event::Collective(RawEvent::Proposed(1, 0, hash, 3)))]
+		);
+	});
+}
+
+#[test]
+fn limit_active_proposals() {
+	new_test_ext().execute_with(|| {
+		for i in 0..MaxProposals::get() {
+			let proposal = make_proposal(i as u64);
+			let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
+			assert_ok!(Collective::propose(
+				Origin::signed(1),
+				3,
+				Box::new(proposal.clone()),
+				proposal_len
+			));
+		}
+		let proposal = make_proposal(MaxProposals::get() as u64 + 1);
+		let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
+		assert_noop!(
+			Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone()), proposal_len),
+			Error::<Test, Instance1>::TooManyProposals
+		);
+	})
+}
+
+#[test]
+fn correct_validate_and_get_proposal() {
+	new_test_ext().execute_with(|| {
+		let proposal =
+			Call::Collective(crate::Call::set_members(vec![1, 2, 3], None, MaxMembers::get()));
+		let length = proposal.encode().len() as u32;
+		assert_ok!(Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone()), length));
+
+		let hash = BlakeTwo256::hash_of(&proposal);
+		let weight = proposal.get_dispatch_info().weight;
+		assert_noop!(
+			Collective::validate_and_get_proposal(
+				&BlakeTwo256::hash_of(&vec![3; 4]),
+				length,
+				weight
+			),
+			Error::<Test, Instance1>::ProposalMissing
+		);
+		assert_noop!(
+			Collective::validate_and_get_proposal(&hash, length - 2, weight),
+			Error::<Test, Instance1>::WrongProposalLength
+		);
+		assert_noop!(
+			Collective::validate_and_get_proposal(&hash, length, weight - 10),
+			Error::<Test, Instance1>::WrongProposalWeight
+		);
+		let res = Collective::validate_and_get_proposal(&hash, length, weight);
+		assert_ok!(res.clone());
+		let (retrieved_proposal, len) = res.unwrap();
+		assert_eq!(length as usize, len);
+		assert_eq!(proposal, retrieved_proposal);
+	})
+}
+
+#[test]
+fn motions_ignoring_non_collective_proposals_works() {
+	new_test_ext().execute_with(|| {
+		let proposal = make_proposal(42);
+		let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
+		assert_noop!(
+			Collective::propose(Origin::signed(42), 3, Box::new(proposal.clone()), proposal_len),
+			Error::<Test, Instance1>::NotMember
+		);
+	});
+}
+
+#[test]
+fn motions_ignoring_non_collective_votes_works() {
+	new_test_ext().execute_with(|| {
+		let proposal = make_proposal(42);
+		let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
+		let hash: H256 = proposal.blake2_256().into();
+		assert_ok!(Collective::propose(
+			Origin::signed(1),
+			3,
+			Box::new(proposal.clone()),
+			proposal_len
+		));
+		assert_noop!(
+			Collective::vote(Origin::signed(42), hash, 0, true),
+			Error::<Test, Instance1>::NotMember,
+		);
+	});
+}
+
+#[test]
+fn motions_ignoring_bad_index_collective_vote_works() {
+	new_test_ext().execute_with(|| {
+		System::set_block_number(3);
+		let proposal = make_proposal(42);
+		let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
+		let hash: H256 = proposal.blake2_256().into();
+		assert_ok!(Collective::propose(
+			Origin::signed(1),
+			3,
+			Box::new(proposal.clone()),
+			proposal_len
+		));
+		assert_noop!(
+			Collective::vote(Origin::signed(2), hash, 1, true),
+			Error::<Test, Instance1>::WrongIndex,
+		);
+	});
+}
+
+#[test]
+fn motions_vote_after_works() {
+	new_test_ext().execute_with(|| {
+		let proposal = make_proposal(42);
+		let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
+		let hash: H256 = proposal.blake2_256().into();
+		let end = 4;
+		assert_ok!(Collective::propose(
+			Origin::signed(1),
+			2,
+			Box::new(proposal.clone()),
+			proposal_len
+		));
+		// Initially there a no votes when the motion is proposed.
+		assert_eq!(
+			Collective::voting(&hash),
+			Some(Votes { index: 0, threshold: 2, ayes: vec![], nays: vec![], end })
+		);
+		// Cast first aye vote.
+		assert_ok!(Collective::vote(Origin::signed(1), hash, 0, true));
+		assert_eq!(
+			Collective::voting(&hash),
+			Some(Votes { index: 0, threshold: 2, ayes: vec![1], nays: vec![], end })
+		);
+		// Try to cast a duplicate aye vote.
+		assert_noop!(
+			Collective::vote(Origin::signed(1), hash, 0, true),
+			Error::<Test, Instance1>::DuplicateVote,
+		);
+		// Cast a nay vote.
+		assert_ok!(Collective::vote(Origin::signed(1), hash, 0, false));
+		assert_eq!(
+			Collective::voting(&hash),
+			Some(Votes { index: 0, threshold: 2, ayes: vec![], nays: vec![1], end })
+		);
+		// Try to cast a duplicate nay vote.
+		assert_noop!(
+			Collective::vote(Origin::signed(1), hash, 0, false),
+			Error::<Test, Instance1>::DuplicateVote,
+		);
+
+		assert_eq!(
+			System::events(),
+			vec![
+				record(Event::Collective(RawEvent::Proposed(1, 0, hash, 2))),
+				record(Event::Collective(RawEvent::Voted(1, hash, true, 1, 0))),
+				record(Event::Collective(RawEvent::Voted(1, hash, false, 0, 1))),
+			]
+		);
+	});
+}
+
+#[test]
+fn motions_all_first_vote_free_works() {
+	new_test_ext().execute_with(|| {
+		let proposal = make_proposal(42);
+		let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
+		let hash: H256 = proposal.blake2_256().into();
+		let end = 4;
+		assert_ok!(Collective::propose(
+			Origin::signed(1),
+			2,
+			Box::new(proposal.clone()),
+			proposal_len,
+		));
+		assert_eq!(
+			Collective::voting(&hash),
+			Some(Votes { index: 0, threshold: 2, ayes: vec![], nays: vec![], end })
+		);
+
+		// For the motion, acc 2's first vote, expecting Ok with Pays::No.
+		let vote_rval: DispatchResultWithPostInfo =
+			Collective::vote(Origin::signed(2), hash, 0, true);
+		assert_eq!(vote_rval.unwrap().pays_fee, Pays::No);
+
+		// Duplicate vote, expecting error with Pays::Yes.
+		let vote_rval: DispatchResultWithPostInfo =
+			Collective::vote(Origin::signed(2), hash, 0, true);
+		assert_eq!(vote_rval.unwrap_err().post_info.pays_fee, Pays::Yes);
+
+		// Modifying vote, expecting ok with Pays::Yes.
+		let vote_rval: DispatchResultWithPostInfo =
+			Collective::vote(Origin::signed(2), hash, 0, false);
+		assert_eq!(vote_rval.unwrap().pays_fee, Pays::Yes);
+
+		// For the motion, acc 3's first vote, expecting Ok with Pays::No.
+		let vote_rval: DispatchResultWithPostInfo =
+			Collective::vote(Origin::signed(3), hash, 0, true);
+		assert_eq!(vote_rval.unwrap().pays_fee, Pays::No);
+
+		// acc 3 modify the vote, expecting Ok with Pays::Yes.
+		let vote_rval: DispatchResultWithPostInfo =
+			Collective::vote(Origin::signed(3), hash, 0, false);
+		assert_eq!(vote_rval.unwrap().pays_fee, Pays::Yes);
+
+		// Test close() Extrincis | Check DispatchResultWithPostInfo with Pay Info
+
+		let proposal_weight = proposal.get_dispatch_info().weight;
+		let close_rval: DispatchResultWithPostInfo =
+			Collective::close(Origin::signed(2), hash, 0, proposal_weight, proposal_len);
+		assert_eq!(close_rval.unwrap().pays_fee, Pays::No);
+
+		// trying to close the proposal, which is already closed.
+		// Expecting error "ProposalMissing" with Pays::Yes
+		let close_rval: DispatchResultWithPostInfo =
+			Collective::close(Origin::signed(2), hash, 0, proposal_weight, proposal_len);
+		assert_eq!(close_rval.unwrap_err().post_info.pays_fee, Pays::Yes);
+	});
+}
+
+#[test]
+fn motions_reproposing_disapproved_works() {
+	new_test_ext().execute_with(|| {
+		let proposal = make_proposal(42);
+		let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
+		let proposal_weight = proposal.get_dispatch_info().weight;
+		let hash: H256 = proposal.blake2_256().into();
+		assert_ok!(Collective::propose(
+			Origin::signed(1),
+			3,
+			Box::new(proposal.clone()),
+			proposal_len
+		));
+		assert_ok!(Collective::vote(Origin::signed(2), hash, 0, false));
+		assert_ok!(Collective::close(Origin::signed(2), hash, 0, proposal_weight, proposal_len));
+		assert_eq!(*Collective::proposals(), vec![]);
+		assert_ok!(Collective::propose(
+			Origin::signed(1),
+			2,
+			Box::new(proposal.clone()),
+			proposal_len
+		));
+		assert_eq!(*Collective::proposals(), vec![hash]);
+	});
+}
+
+#[test]
+fn motions_approval_with_enough_votes_and_lower_voting_threshold_works() {
+	new_test_ext().execute_with(|| {
+		let proposal = Call::Democracy(mock_democracy::Call::external_propose_majority());
+		let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
+		let proposal_weight = proposal.get_dispatch_info().weight;
+		let hash: H256 = proposal.blake2_256().into();
+		// The voting threshold is 2, but the required votes for `ExternalMajorityOrigin` is 3.
+		// The proposal will be executed regardless of the voting threshold
+		// as long as we have enough yes votes.
+		//
+		// Failed to execute with only 2 yes votes.
+		assert_ok!(Collective::propose(
+			Origin::signed(1),
+			2,
+			Box::new(proposal.clone()),
+			proposal_len
+		));
+		assert_ok!(Collective::vote(Origin::signed(1), hash, 0, true));
+		assert_ok!(Collective::vote(Origin::signed(2), hash, 0, true));
+		assert_ok!(Collective::close(Origin::signed(2), hash, 0, proposal_weight, proposal_len));
+		assert_eq!(
+			System::events(),
+			vec![
+				record(Event::Collective(RawEvent::Proposed(1, 0, hash, 2))),
+				record(Event::Collective(RawEvent::Voted(1, hash, true, 1, 0))),
+				record(Event::Collective(RawEvent::Voted(2, hash, true, 2, 0))),
+				record(Event::Collective(RawEvent::Closed(hash, 2, 0))),
+				record(Event::Collective(RawEvent::Approved(hash))),
+				record(Event::Collective(RawEvent::Executed(hash, Err(DispatchError::BadOrigin)))),
+			]
+		);
+
+		System::reset_events();
+
+		// Executed with 3 yes votes.
+		assert_ok!(Collective::propose(
+			Origin::signed(1),
+			2,
+			Box::new(proposal.clone()),
+			proposal_len
+		));
+		assert_ok!(Collective::vote(Origin::signed(1), hash, 1, true));
+		assert_ok!(Collective::vote(Origin::signed(2), hash, 1, true));
+		assert_ok!(Collective::vote(Origin::signed(3), hash, 1, true));
+		assert_ok!(Collective::close(Origin::signed(2), hash, 1, proposal_weight, proposal_len));
+		assert_eq!(
+			System::events(),
+			vec![
+				record(Event::Collective(RawEvent::Proposed(1, 1, hash, 2))),
+				record(Event::Collective(RawEvent::Voted(1, hash, true, 1, 0))),
+				record(Event::Collective(RawEvent::Voted(2, hash, true, 2, 0))),
+				record(Event::Collective(RawEvent::Voted(3, hash, true, 3, 0))),
+				record(Event::Collective(RawEvent::Closed(hash, 3, 0))),
+				record(Event::Collective(RawEvent::Approved(hash))),
+				record(Event::Democracy(mock_democracy::pallet::Event::<Test>::ExternalProposed)),
+				record(Event::Collective(RawEvent::Executed(hash, Ok(())))),
+			]
+		);
+	});
+}
+
+#[test]
+fn motions_disapproval_works() {
+	new_test_ext().execute_with(|| {
+		let proposal = make_proposal(42);
+		let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
+		let proposal_weight = proposal.get_dispatch_info().weight;
+		let hash: H256 = proposal.blake2_256().into();
+		assert_ok!(Collective::propose(
+			Origin::signed(1),
+			3,
+			Box::new(proposal.clone()),
+			proposal_len
+		));
+		assert_ok!(Collective::vote(Origin::signed(1), hash, 0, true));
+		assert_ok!(Collective::vote(Origin::signed(2), hash, 0, false));
+		assert_ok!(Collective::close(Origin::signed(2), hash, 0, proposal_weight, proposal_len));
+
+		assert_eq!(
+			System::events(),
+			vec![
+				record(Event::Collective(RawEvent::Proposed(1, 0, hash, 3))),
+				record(Event::Collective(RawEvent::Voted(1, hash, true, 1, 0))),
+				record(Event::Collective(RawEvent::Voted(2, hash, false, 1, 1))),
+				record(Event::Collective(RawEvent::Closed(hash, 1, 1))),
+				record(Event::Collective(RawEvent::Disapproved(hash))),
+			]
+		);
+	});
+}
+
+#[test]
+fn motions_approval_works() {
+	new_test_ext().execute_with(|| {
+		let proposal = make_proposal(42);
+		let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
+		let proposal_weight = proposal.get_dispatch_info().weight;
+		let hash: H256 = proposal.blake2_256().into();
+		assert_ok!(Collective::propose(
+			Origin::signed(1),
+			2,
+			Box::new(proposal.clone()),
+			proposal_len
+		));
+		assert_ok!(Collective::vote(Origin::signed(1), hash, 0, true));
+		assert_ok!(Collective::vote(Origin::signed(2), hash, 0, true));
+		assert_ok!(Collective::close(Origin::signed(2), hash, 0, proposal_weight, proposal_len));
+
+		assert_eq!(
+			System::events(),
+			vec![
+				record(Event::Collective(RawEvent::Proposed(1, 0, hash, 2))),
+				record(Event::Collective(RawEvent::Voted(1, hash, true, 1, 0))),
+				record(Event::Collective(RawEvent::Voted(2, hash, true, 2, 0))),
+				record(Event::Collective(RawEvent::Closed(hash, 2, 0))),
+				record(Event::Collective(RawEvent::Approved(hash))),
+				record(Event::Collective(RawEvent::Executed(hash, Err(DispatchError::BadOrigin)))),
+			]
+		);
+	});
+}
+
+#[test]
+fn motion_with_no_votes_closes_with_disapproval() {
+	new_test_ext().execute_with(|| {
+		let proposal = make_proposal(42);
+		let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
+		let proposal_weight = proposal.get_dispatch_info().weight;
+		let hash: H256 = proposal.blake2_256().into();
+		assert_ok!(Collective::propose(
+			Origin::signed(1),
+			3,
+			Box::new(proposal.clone()),
+			proposal_len
+		));
+		assert_eq!(
+			System::events()[0],
+			record(Event::Collective(RawEvent::Proposed(1, 0, hash, 3)))
+		);
+
+		// Closing the motion too early is not possible because it has neither
+		// an approving or disapproving simple majority due to the lack of votes.
+		assert_noop!(
+			Collective::close(Origin::signed(2), hash, 0, proposal_weight, proposal_len),
+			Error::<Test, Instance1>::TooEarly
+		);
+
+		// Once the motion duration passes,
+		let closing_block = System::block_number() + MotionDuration::get();
+		System::set_block_number(closing_block);
+		// we can successfully close the motion.
+		assert_ok!(Collective::close(Origin::signed(2), hash, 0, proposal_weight, proposal_len));
+
+		// Events show that the close ended in a disapproval.
+		assert_eq!(System::events()[1], record(Event::Collective(RawEvent::Closed(hash, 0, 3))));
+		assert_eq!(System::events()[2], record(Event::Collective(RawEvent::Disapproved(hash))));
+	})
+}
+
+#[test]
+fn close_disapprove_does_not_care_about_weight_or_len() {
+	// This test confirms that if you close a proposal that would be disapproved,
+	// we do not care about the proposal length or proposal weight since it will
+	// not be read from storage or executed.
+	new_test_ext().execute_with(|| {
+		let proposal = make_proposal(42);
+		let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
+		let hash: H256 = proposal.blake2_256().into();
+		assert_ok!(Collective::propose(
+			Origin::signed(1),
+			2,
+			Box::new(proposal.clone()),
+			proposal_len
+		));
+		// First we make the proposal succeed
+		assert_ok!(Collective::vote(Origin::signed(1), hash, 0, true));
+		assert_ok!(Collective::vote(Origin::signed(2), hash, 0, true));
+		// It will not close with bad weight/len information
+		assert_noop!(
+			Collective::close(Origin::signed(2), hash, 0, 0, 0),
+			Error::<Test, Instance1>::WrongProposalLength,
+		);
+		assert_noop!(
+			Collective::close(Origin::signed(2), hash, 0, 0, proposal_len),
+			Error::<Test, Instance1>::WrongProposalWeight,
+		);
+		// Now we make the proposal fail
+		assert_ok!(Collective::vote(Origin::signed(1), hash, 0, false));
+		assert_ok!(Collective::vote(Origin::signed(2), hash, 0, false));
+		// It can close even if the weight/len information is bad
+		assert_ok!(Collective::close(Origin::signed(2), hash, 0, 0, 0));
+	})
+}
+
+#[test]
+fn disapprove_proposal_works() {
+	new_test_ext().execute_with(|| {
+		let proposal = make_proposal(42);
+		let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
+		let hash: H256 = proposal.blake2_256().into();
+		assert_ok!(Collective::propose(
+			Origin::signed(1),
+			2,
+			Box::new(proposal.clone()),
+			proposal_len
+		));
+		// Proposal would normally succeed
+		assert_ok!(Collective::vote(Origin::signed(1), hash, 0, true));
+		assert_ok!(Collective::vote(Origin::signed(2), hash, 0, true));
+		// But Root can disapprove and remove it anyway
+		assert_ok!(Collective::disapprove_proposal(Origin::root(), hash));
+		assert_eq!(
+			System::events(),
+			vec![
+				record(Event::Collective(RawEvent::Proposed(1, 0, hash, 2))),
+				record(Event::Collective(RawEvent::Voted(1, hash, true, 1, 0))),
+				record(Event::Collective(RawEvent::Voted(2, hash, true, 2, 0))),
+				record(Event::Collective(RawEvent::Disapproved(hash))),
+			]
+		);
+	})
+}
+
+#[test]
+#[should_panic(expected = "Members cannot contain duplicate accounts.")]
+fn genesis_build_panics_with_duplicate_members() {
+	collective::GenesisConfig::<Test> { members: vec![1, 2, 3, 1], phantom: Default::default() }
+		.build_storage()
+		.unwrap();
+}

From e232df15bd4ccb834ebc16eaaab494938eb080c2 Mon Sep 17 00:00:00 2001
From: Chevdor <chevdor@users.noreply.github.com>
Date: Mon, 13 Sep 2021 10:52:41 +0200
Subject: [PATCH 1173/1194] update crate names and rand deps (#9762)

---
 Cargo.lock            | 33 +++++----------------------------
 client/cli/Cargo.toml |  2 +-
 2 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9c902b7d089e..1bcdb7522956 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4233,11 +4233,11 @@ dependencies = [
 
 [[package]]
 name = "names"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef320dab323286b50fb5cdda23f61c796a72a89998ab565ca32525c5c556f2da"
+checksum = "10a8690bf09abf659851e58cd666c3d37ac6af07c2bd7a9e332cfba471715775"
 dependencies = [
- "rand 0.3.23",
+ "rand 0.8.4",
 ]
 
 [[package]]
@@ -6625,29 +6625,6 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb"
 
-[[package]]
-name = "rand"
-version = "0.3.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c"
-dependencies = [
- "libc",
- "rand 0.4.6",
-]
-
-[[package]]
-name = "rand"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
-dependencies = [
- "fuchsia-cprng",
- "libc",
- "rand_core 0.3.1",
- "rdrand",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "rand"
 version = "0.6.5"
@@ -9886,9 +9863,9 @@ checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2"
 
 [[package]]
 name = "syn"
-version = "1.0.69"
+version = "1.0.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48fe99c6bd8b1cc636890bcc071842de909d902c81ac7dab53ba33c421ab8ffb"
+checksum = "c6f107db402c2c2055242dbf4d2af0e69197202e9faacbef9571bbe47f5a1b84"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index c3564e3e3a18..97058110ad92 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -37,7 +37,7 @@ sp-keystore = { version = "0.10.0-dev", path = "../../primitives/keystore" }
 sc-service = { version = "0.10.0-dev", default-features = false, path = "../service" }
 sc-telemetry = { version = "4.0.0-dev", path = "../telemetry" }
 sp-keyring = { version = "4.0.0-dev", path = "../../primitives/keyring" }
-names = "0.11.0"
+names = { version = "0.12.0", default-features = false }
 structopt = "0.3.8"
 sc-tracing = { version = "4.0.0-dev", path = "../tracing" }
 chrono = "0.4.10"

From b13319a076bbc17ac86e31828143a0c185467263 Mon Sep 17 00:00:00 2001
From: Seun Lanlege <seunlanlege@gmail.com>
Date: Mon, 13 Sep 2021 09:54:13 +0100
Subject: [PATCH 1174/1194] Adds composable.finance to ss58 registry (#9608)

* adds composable.finance ss58 registry

* adds composable ss58 format

* correct prefix

* dedupe

Co-authored-by: CI system <>
---
 primitives/core/src/crypto.rs |  4 ++++
 ss58-registry.json            | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index 5346ea66fe8a..b52dd97a3821 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -576,6 +576,10 @@ ss58_address_format!(
 		(47, "reserved47", "Reserved for future use (47).")
 	NeatcoinAccount =>
 		(48, "neatcoin", "Neatcoin mainnet, standard account (*25519).")
+	PicassoAccount =>
+		(49, "picasso", "Composable Canary Network, standard account (*25519).")
+	ComposableAccount =>
+		(50, "composable", "Composable mainnet, standard account (*25519).")
 	HydraDXAccount =>
 		(63, "hydradx", "HydraDX standard account (*25519).")
 	AventusAccount =>
diff --git a/ss58-registry.json b/ss58-registry.json
index fc5de1033566..25d3c1383b33 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -442,6 +442,24 @@
 			"standardAccount": "*25519",
 			"website": "https://neatcoin.org"
 		},
+		{
+			"prefix": 49,
+			"network": "picasso",
+			"displayName": "Picasso",
+			"symbols": ["PICA"],
+			"decimals": [12],
+			"standardAccount": "*25519",
+			"website": "https://picasso.composable.finance"
+		},
+		{
+			"prefix": 50,
+			"network": "composable",
+			"displayName": "Composable",
+			"symbols": ["LAYR"],
+			"decimals": [12],
+			"standardAccount": "*25519",
+			"website": "https://composable.finance"
+		},
 		{
 			"prefix": 63,
 			"network": "hydradx",

From c022f88977643f8669f63f7f7e38d3f215aac565 Mon Sep 17 00:00:00 2001
From: Falco Hirschenberger <falco.hirschenberger@gmail.com>
Date: Mon, 13 Sep 2021 11:42:08 +0200
Subject: [PATCH 1175/1194] Add `childstate_getStorageEntries` RPC (#9459)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add storage query functions for multiple keys

fixes #9203

* Query all keys in one request and add more tests

* Make it compatible with stable release channel

* Update to new futures

* Update client/rpc/src/state/state_full.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/rpc/src/state/state_full.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/rpc/src/state/state_full.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/rpc/src/state/state_full.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/rpc/src/state/state_full.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/rpc/src/state/state_light.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/rpc/src/state/state_light.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Satisfy borrowck

* Remove non-RPC `storage_entries` functions.

* Revert "Remove non-RPC `storage_entries` functions."

This reverts commit d840015c59ce865f879178594088c79082e8d151.

* Revert "Revert "Remove non-RPC `storage_entries` functions.""

This reverts commit 5813b439a4b467e022c627e3fe60cf2fa5520db4.

* Finally some formatting

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 client/rpc-api/src/child_state/mod.rs |   9 +++
 client/rpc/src/state/mod.rs           |  17 ++++
 client/rpc/src/state/state_full.rs    |  33 +++++++-
 client/rpc/src/state/state_light.rs   |  44 +++++++++++
 client/rpc/src/state/tests.rs         | 108 ++++++++++++++++++++++++++
 5 files changed, 210 insertions(+), 1 deletion(-)

diff --git a/client/rpc-api/src/child_state/mod.rs b/client/rpc-api/src/child_state/mod.rs
index 7abda0a63134..de94790d0990 100644
--- a/client/rpc-api/src/child_state/mod.rs
+++ b/client/rpc-api/src/child_state/mod.rs
@@ -66,6 +66,15 @@ pub trait ChildStateApi<Hash> {
 		hash: Option<Hash>,
 	) -> FutureResult<Option<StorageData>>;
 
+	/// Returns child storage entries for multiple keys at a specific block's state.
+	#[rpc(name = "childstate_getStorageEntries")]
+	fn storage_entries(
+		&self,
+		child_storage_key: PrefixedStorageKey,
+		keys: Vec<StorageKey>,
+		hash: Option<Hash>,
+	) -> FutureResult<Vec<Option<StorageData>>>;
+
 	/// Returns the hash of a child storage entry at a block's state.
 	#[rpc(name = "childstate_getStorageHash")]
 	fn storage_hash(
diff --git a/client/rpc/src/state/mod.rs b/client/rpc/src/state/mod.rs
index 5413264de4d5..80eccc2c97de 100644
--- a/client/rpc/src/state/mod.rs
+++ b/client/rpc/src/state/mod.rs
@@ -465,6 +465,14 @@ where
 		key: StorageKey,
 	) -> FutureResult<Option<StorageData>>;
 
+	/// Returns child storage entries at a specific block's state.
+	fn storage_entries(
+		&self,
+		block: Option<Block::Hash>,
+		storage_key: PrefixedStorageKey,
+		keys: Vec<StorageKey>,
+	) -> FutureResult<Vec<Option<StorageData>>>;
+
 	/// Returns the hash of a child storage entry at a block's state.
 	fn storage_hash(
 		&self,
@@ -516,6 +524,15 @@ where
 		self.backend.storage(block, storage_key, key)
 	}
 
+	fn storage_entries(
+		&self,
+		storage_key: PrefixedStorageKey,
+		keys: Vec<StorageKey>,
+		block: Option<Block::Hash>,
+	) -> FutureResult<Vec<Option<StorageData>>> {
+		self.backend.storage_entries(block, storage_key, keys)
+	}
+
 	fn storage_keys(
 		&self,
 		storage_key: PrefixedStorageKey,
diff --git a/client/rpc/src/state/state_full.rs b/client/rpc/src/state/state_full.rs
index 54124ad95888..97f77a407796 100644
--- a/client/rpc/src/state/state_full.rs
+++ b/client/rpc/src/state/state_full.rs
@@ -18,7 +18,11 @@
 
 //! State API backend for full nodes.
 
-use futures::{future, stream, FutureExt, SinkExt, StreamExt};
+use futures::{
+	future,
+	future::{err, try_join_all},
+	stream, FutureExt, SinkExt, StreamExt,
+};
 use jsonrpc_pubsub::{manager::SubscriptionManager, typed::Subscriber, SubscriptionId};
 use log::warn;
 use rpc::Result as RpcResult;
@@ -715,6 +719,33 @@ where
 		async move { r }.boxed()
 	}
 
+	fn storage_entries(
+		&self,
+		block: Option<Block::Hash>,
+		storage_key: PrefixedStorageKey,
+		keys: Vec<StorageKey>,
+	) -> FutureResult<Vec<Option<StorageData>>> {
+		let child_info = match ChildType::from_prefixed_key(&storage_key) {
+			Some((ChildType::ParentKeyId, storage_key)) =>
+				Arc::new(ChildInfo::new_default(storage_key)),
+			None => return err(client_err(sp_blockchain::Error::InvalidChildStorageKey)).boxed(),
+		};
+		let block = match self.block_or_best(block) {
+			Ok(b) => b,
+			Err(e) => return err(client_err(e)).boxed(),
+		};
+		let client = self.client.clone();
+		try_join_all(keys.into_iter().map(move |key| {
+			let res = client
+				.clone()
+				.child_storage(&BlockId::Hash(block), &child_info, &key)
+				.map_err(client_err);
+
+			async move { res }
+		}))
+		.boxed()
+	}
+
 	fn storage_hash(
 		&self,
 		block: Option<Block::Hash>,
diff --git a/client/rpc/src/state/state_light.rs b/client/rpc/src/state/state_light.rs
index b89b0638badd..749e57c365cc 100644
--- a/client/rpc/src/state/state_light.rs
+++ b/client/rpc/src/state/state_light.rs
@@ -531,6 +531,50 @@ where
 		child_storage.boxed()
 	}
 
+	fn storage_entries(
+		&self,
+		block: Option<Block::Hash>,
+		storage_key: PrefixedStorageKey,
+		keys: Vec<StorageKey>,
+	) -> FutureResult<Vec<Option<StorageData>>> {
+		let block = self.block_or_best(block);
+		let fetcher = self.fetcher.clone();
+		let keys = keys.iter().map(|k| k.0.clone()).collect::<Vec<_>>();
+		let child_storage =
+			resolve_header(&*self.remote_blockchain, &*self.fetcher, block).then(move |result| {
+				match result {
+					Ok(header) => Either::Left(
+						fetcher
+							.remote_read_child(RemoteReadChildRequest {
+								block,
+								header,
+								storage_key,
+								keys: keys.clone(),
+								retry_count: Default::default(),
+							})
+							.then(move |result| {
+								ready(
+									result
+										.map(|data| {
+											data.iter()
+												.filter_map(|(k, d)| {
+													keys.contains(k).then(|| {
+														d.as_ref().map(|v| StorageData(v.to_vec()))
+													})
+												})
+												.collect::<Vec<_>>()
+										})
+										.map_err(client_err),
+								)
+							}),
+					),
+					Err(error) => Either::Right(ready(Err(error))),
+				}
+			});
+
+		child_storage.boxed()
+	}
+
 	fn storage_hash(
 		&self,
 		block: Option<Block::Hash>,
diff --git a/client/rpc/src/state/tests.rs b/client/rpc/src/state/tests.rs
index ef13b37ce42f..712fe00c5438 100644
--- a/client/rpc/src/state/tests.rs
+++ b/client/rpc/src/state/tests.rs
@@ -93,6 +93,54 @@ fn should_return_storage() {
 	);
 }
 
+#[test]
+fn should_return_storage_entries() {
+	const KEY1: &[u8] = b":mock";
+	const KEY2: &[u8] = b":turtle";
+	const VALUE: &[u8] = b"hello world";
+	const CHILD_VALUE1: &[u8] = b"hello world !";
+	const CHILD_VALUE2: &[u8] = b"hello world    !";
+
+	let child_info = ChildInfo::new_default(STORAGE_KEY);
+	let client = TestClientBuilder::new()
+		.add_extra_storage(KEY1.to_vec(), VALUE.to_vec())
+		.add_extra_child_storage(&child_info, KEY1.to_vec(), CHILD_VALUE1.to_vec())
+		.add_extra_child_storage(&child_info, KEY2.to_vec(), CHILD_VALUE2.to_vec())
+		.build();
+	let genesis_hash = client.genesis_hash();
+	let (_client, child) = new_full(
+		Arc::new(client),
+		SubscriptionManager::new(Arc::new(TaskExecutor)),
+		DenyUnsafe::No,
+		None,
+	);
+
+	let keys = &[StorageKey(KEY1.to_vec()), StorageKey(KEY2.to_vec())];
+	assert_eq!(
+		executor::block_on(child.storage_entries(
+			prefixed_storage_key(),
+			keys.to_vec(),
+			Some(genesis_hash).into()
+		))
+		.map(|x| x.into_iter().map(|x| x.map(|x| x.0.len()).unwrap()).sum::<usize>())
+		.unwrap(),
+		CHILD_VALUE1.len() + CHILD_VALUE2.len()
+	);
+
+	// should fail if not all keys exist.
+	let mut failing_keys = vec![StorageKey(b":soup".to_vec())];
+	failing_keys.extend_from_slice(keys);
+	assert_matches!(
+		executor::block_on(child.storage_entries(
+			prefixed_storage_key(),
+			failing_keys,
+			Some(genesis_hash).into()
+		))
+		.map(|x| x.iter().all(|x| x.is_some())),
+		Ok(false)
+	);
+}
+
 #[test]
 fn should_return_child_storage() {
 	let child_info = ChildInfo::new_default(STORAGE_KEY);
@@ -115,6 +163,19 @@ fn should_return_child_storage() {
 		)),
 		Ok(Some(StorageData(ref d))) if d[0] == 42 && d.len() == 1
 	);
+
+	// should fail if key does not exist.
+	let failing_key = StorageKey(b":soup".to_vec());
+	assert_matches!(
+		executor::block_on(child.storage(
+			prefixed_storage_key(),
+			failing_key,
+			Some(genesis_hash).into()
+		))
+		.map(|x| x.is_some()),
+		Ok(false)
+	);
+
 	assert_matches!(
 		executor::block_on(child.storage_hash(
 			child_key.clone(),
@@ -130,6 +191,53 @@ fn should_return_child_storage() {
 	);
 }
 
+#[test]
+fn should_return_child_storage_entries() {
+	let child_info = ChildInfo::new_default(STORAGE_KEY);
+	let client = Arc::new(
+		substrate_test_runtime_client::TestClientBuilder::new()
+			.add_child_storage(&child_info, "key1", vec![42_u8])
+			.add_child_storage(&child_info, "key2", vec![43_u8, 44])
+			.build(),
+	);
+	let genesis_hash = client.genesis_hash();
+	let (_client, child) =
+		new_full(client, SubscriptionManager::new(Arc::new(TaskExecutor)), DenyUnsafe::No, None);
+	let child_key = prefixed_storage_key();
+	let keys = vec![StorageKey(b"key1".to_vec()), StorageKey(b"key2".to_vec())];
+
+	let res = executor::block_on(child.storage_entries(
+		child_key.clone(),
+		keys.clone(),
+		Some(genesis_hash).into(),
+	))
+	.unwrap();
+
+	assert_matches!(
+		res[0],
+		Some(StorageData(ref d))
+			if d[0] == 42 && d.len() == 1
+	);
+	assert_matches!(
+		res[1],
+		Some(StorageData(ref d))
+			if d[0] == 43 && d[1] == 44 && d.len() == 2
+	);
+	assert_matches!(
+		executor::block_on(child.storage_hash(
+			child_key.clone(),
+			keys[0].clone(),
+			Some(genesis_hash).into()
+		))
+		.map(|x| x.is_some()),
+		Ok(true)
+	);
+	assert_matches!(
+		executor::block_on(child.storage_size(child_key.clone(), keys[0].clone(), None)),
+		Ok(Some(1))
+	);
+}
+
 #[test]
 fn should_call_contract() {
 	let client = Arc::new(substrate_test_runtime_client::new());

From 6120eda98650244e45151f58822e7ef7a8161bfd Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Mon, 13 Sep 2021 13:31:04 +0200
Subject: [PATCH 1176/1194] Purge addresses that fail to reach a peer (#8843)

Co-authored-by: Roman Proskuryakov <r.proskuryakoff@gmail.com>
---
 client/network/src/discovery.rs | 44 ++++++++++++++++++++++-----------
 client/network/src/service.rs   |  2 +-
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/client/network/src/discovery.rs b/client/network/src/discovery.rs
index 3be00a52e98b..6c5f3d768534 100644
--- a/client/network/src/discovery.rs
+++ b/client/network/src/discovery.rs
@@ -93,7 +93,7 @@ const MAX_KNOWN_EXTERNAL_ADDRESSES: usize = 32;
 ///       one protocol via [`DiscoveryConfig::add_protocol`].
 pub struct DiscoveryConfig {
 	local_peer_id: PeerId,
-	user_defined: Vec<(PeerId, Multiaddr)>,
+	permanent_addresses: Vec<(PeerId, Multiaddr)>,
 	dht_random_walk: bool,
 	allow_private_ipv4: bool,
 	allow_non_globals_in_dht: bool,
@@ -108,7 +108,7 @@ impl DiscoveryConfig {
 	pub fn new(local_public_key: PublicKey) -> Self {
 		DiscoveryConfig {
 			local_peer_id: local_public_key.into_peer_id(),
-			user_defined: Vec::new(),
+			permanent_addresses: Vec::new(),
 			dht_random_walk: true,
 			allow_private_ipv4: true,
 			allow_non_globals_in_dht: false,
@@ -126,11 +126,11 @@ impl DiscoveryConfig {
 	}
 
 	/// Set custom nodes which never expire, e.g. bootstrap or reserved nodes.
-	pub fn with_user_defined<I>(&mut self, user_defined: I) -> &mut Self
+	pub fn with_permanent_addresses<I>(&mut self, permanent_addresses: I) -> &mut Self
 	where
 		I: IntoIterator<Item = (PeerId, Multiaddr)>,
 	{
-		self.user_defined.extend(user_defined);
+		self.permanent_addresses.extend(permanent_addresses);
 		self
 	}
 
@@ -182,7 +182,7 @@ impl DiscoveryConfig {
 	pub fn finish(self) -> DiscoveryBehaviour {
 		let DiscoveryConfig {
 			local_peer_id,
-			user_defined,
+			permanent_addresses,
 			dht_random_walk,
 			allow_private_ipv4,
 			allow_non_globals_in_dht,
@@ -208,7 +208,7 @@ impl DiscoveryConfig {
 				let store = MemoryStore::new(local_peer_id.clone());
 				let mut kad = Kademlia::with_config(local_peer_id.clone(), store, config);
 
-				for (peer_id, addr) in &user_defined {
+				for (peer_id, addr) in &permanent_addresses {
 					kad.add_address(peer_id, addr.clone());
 				}
 
@@ -217,7 +217,8 @@ impl DiscoveryConfig {
 			.collect();
 
 		DiscoveryBehaviour {
-			user_defined,
+			permanent_addresses,
+			ephemeral_addresses: HashMap::new(),
 			kademlias,
 			next_kad_random_query: if dht_random_walk {
 				Some(Delay::new(Duration::new(0, 0)))
@@ -248,7 +249,10 @@ impl DiscoveryConfig {
 pub struct DiscoveryBehaviour {
 	/// User-defined list of nodes and their addresses. Typically includes bootstrap nodes and
 	/// reserved nodes.
-	user_defined: Vec<(PeerId, Multiaddr)>,
+	permanent_addresses: Vec<(PeerId, Multiaddr)>,
+	/// Same as `permanent_addresses`, except that addresses that fail to reach a peer are
+	/// removed.
+	ephemeral_addresses: HashMap<PeerId, Vec<Multiaddr>>,
 	/// Kademlia requests and answers.
 	kademlias: HashMap<ProtocolId, Kademlia<MemoryStore>>,
 	/// Discovers nodes on the local network.
@@ -265,7 +269,7 @@ pub struct DiscoveryBehaviour {
 	/// Number of nodes we're currently connected to.
 	num_connections: u64,
 	/// If false, `addresses_of_peer` won't return any private IPv4 address, except for the ones
-	/// stored in `user_defined`.
+	/// stored in `permanent_addresses` or `ephemeral_addresses`.
 	allow_private_ipv4: bool,
 	/// Number of active connections over which we interrupt the discovery process.
 	discovery_only_if_under_num: u64,
@@ -297,12 +301,14 @@ impl DiscoveryBehaviour {
 	///
 	/// If we didn't know this address before, also generates a `Discovered` event.
 	pub fn add_known_address(&mut self, peer_id: PeerId, addr: Multiaddr) {
-		if self.user_defined.iter().all(|(p, a)| *p != peer_id && *a != addr) {
+		let addrs_list = self.ephemeral_addresses.entry(peer_id).or_default();
+		if !addrs_list.iter().any(|a| *a == addr) {
 			for k in self.kademlias.values_mut() {
 				k.add_address(&peer_id, addr.clone());
 			}
+
 			self.pending_events.push_back(DiscoveryOut::Discovered(peer_id.clone()));
-			self.user_defined.push((peer_id, addr));
+			addrs_list.push(addr);
 		}
 	}
 
@@ -488,11 +494,15 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 
 	fn addresses_of_peer(&mut self, peer_id: &PeerId) -> Vec<Multiaddr> {
 		let mut list = self
-			.user_defined
+			.permanent_addresses
 			.iter()
 			.filter_map(|(p, a)| if p == peer_id { Some(a.clone()) } else { None })
 			.collect::<Vec<_>>();
 
+		if let Some(ephemeral_addresses) = self.ephemeral_addresses.get(peer_id) {
+			list.extend(ephemeral_addresses.clone());
+		}
+
 		{
 			let mut list_to_filter = Vec::new();
 			for k in self.kademlias.values_mut() {
@@ -563,6 +573,12 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 		addr: &Multiaddr,
 		error: &dyn std::error::Error,
 	) {
+		if let Some(peer_id) = peer_id {
+			if let Some(list) = self.ephemeral_addresses.get_mut(peer_id) {
+				list.retain(|a| a != addr);
+			}
+		}
+
 		for k in self.kademlias.values_mut() {
 			NetworkBehaviour::inject_addr_reach_failure(k, peer_id, addr, error)
 		}
@@ -942,7 +958,7 @@ mod tests {
 		let protocol_id = ProtocolId::from("dot");
 
 		// Build swarms whose behaviour is `DiscoveryBehaviour`, each aware of
-		// the first swarm via `with_user_defined`.
+		// the first swarm via `with_permanent_addresses`.
 		let mut swarms = (0..25)
 			.map(|i| {
 				let keypair = Keypair::generate_ed25519();
@@ -959,7 +975,7 @@ mod tests {
 				let behaviour = {
 					let mut config = DiscoveryConfig::new(keypair.public());
 					config
-						.with_user_defined(first_swarm_peer_id_and_addr.clone())
+						.with_permanent_addresses(first_swarm_peer_id_and_addr.clone())
 						.allow_private_ipv4(true)
 						.allow_non_globals_in_dht(true)
 						.discovery_limit(50)
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 6b2928510760..6b75cb282f04 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -265,7 +265,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 
 			let discovery_config = {
 				let mut config = DiscoveryConfig::new(local_public.clone());
-				config.with_user_defined(known_addresses);
+				config.with_permanent_addresses(known_addresses);
 				config.discovery_limit(
 					u64::from(params.network_config.default_peers_set.out_peers) + 15,
 				);

From 5e5474d833ed53f10a591ddfa52625a4b0eb601f Mon Sep 17 00:00:00 2001
From: Robert Klotzner <eskimor@users.noreply.github.com>
Date: Mon, 13 Sep 2021 14:02:00 +0200
Subject: [PATCH 1177/1194] More descriptive errors. (#9768)

---
 client/network/src/request_responses.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/network/src/request_responses.rs b/client/network/src/request_responses.rs
index 6e09208dd45d..6ebc7416c2a3 100644
--- a/client/network/src/request_responses.rs
+++ b/client/network/src/request_responses.rs
@@ -778,16 +778,16 @@ pub enum RequestFailure {
 	/// The remote replied, but the local node is no longer interested in the response.
 	Obsolete,
 	/// Problem on the network.
-	#[display(fmt = "Problem on the network")]
-	Network(#[error(ignore)] OutboundFailure),
+	#[display(fmt = "Problem on the network: {}", _0)]
+	Network(OutboundFailure),
 }
 
 /// Error when processing a request sent by a remote.
 #[derive(Debug, derive_more::Display, derive_more::Error)]
 pub enum ResponseFailure {
 	/// Problem on the network.
-	#[display(fmt = "Problem on the network")]
-	Network(#[error(ignore)] InboundFailure),
+	#[display(fmt = "Problem on the network: {}", _0)]
+	Network(InboundFailure),
 }
 
 /// Implements the libp2p [`RequestResponseCodec`] trait. Defines how streams of bytes are turned

From 7fbec2f9d22adc6bf968a048d768b2e30b46ac30 Mon Sep 17 00:00:00 2001
From: Denis Pisarev <denis.pisarev@parity.io>
Date: Mon, 13 Sep 2021 14:33:34 +0200
Subject: [PATCH 1178/1194] dockerfiles: upgrade to ubuntu:20.04 (#9753)

* dockerfiles: upgrade to ubuntu:20.04

* dockerfiles: fq container name
---
 .maintain/docker/subkey.Dockerfile    | 3 +--
 .maintain/docker/substrate.Dockerfile | 3 +--
 README.md                             | 5 ++---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.maintain/docker/subkey.Dockerfile b/.maintain/docker/subkey.Dockerfile
index 9184cad5b405..5797295806d0 100644
--- a/.maintain/docker/subkey.Dockerfile
+++ b/.maintain/docker/subkey.Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:stretch-slim
+FROM docker.io/library/ubuntu:20.04
 
 # metadata
 ARG VCS_REF
@@ -28,4 +28,3 @@ USER subkey
 RUN /usr/local/bin/subkey --version
 
 ENTRYPOINT ["/usr/local/bin/subkey"]
-
diff --git a/.maintain/docker/substrate.Dockerfile b/.maintain/docker/substrate.Dockerfile
index 7cd4576a9e89..e13dfb426adf 100644
--- a/.maintain/docker/substrate.Dockerfile
+++ b/.maintain/docker/substrate.Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:stretch-slim
+FROM docker.io/library/ubuntu:20.04
 
 # metadata
 ARG VCS_REF
@@ -42,4 +42,3 @@ EXPOSE 30333 9933 9944
 VOLUME ["/substrate"]
 
 ENTRYPOINT ["/usr/local/bin/substrate"]
-
diff --git a/README.md b/README.md
index 1ccebac90818..6288540548a0 100644
--- a/README.md
+++ b/README.md
@@ -4,13 +4,12 @@
   <img src="/docs/media/sub.gif">
 </p>
 
-
 Substrate is a next-generation framework for blockchain innovation 🚀.
 
 ## Trying it out
 
-Simply go to [substrate.dev](https://substrate.dev) and follow the 
-[installation](https://substrate.dev/docs/en/knowledgebase/getting-started/) instructions. You can 
+Simply go to [substrate.dev](https://substrate.dev) and follow the
+[installation](https://substrate.dev/docs/en/knowledgebase/getting-started/) instructions. You can
 also try out one of the [tutorials](https://substrate.dev/en/tutorials).
 
 ## Contributions & Code of Conduct

From 1fca377715819c516e6bac43c9b0085ba8aadaf8 Mon Sep 17 00:00:00 2001
From: Liu-Cheng Xu <xuliuchengxlc@gmail.com>
Date: Tue, 14 Sep 2021 02:11:29 +0800
Subject: [PATCH 1179/1194] Clean up sc-network (#9761)

* Clean up sc-network

- Avoid using clone() for the Copy type `PeerId`.
- Use `find_map` for `filter_map` and `next`.
- Use `Self`.

* More on Copy types

* Cargo +nightly fmt --all

* More ..

* fmt

* Revert vec![default_notif_handshake_message]
---
 client/authority-discovery/src/tests.rs       |   2 +-
 client/authority-discovery/src/worker.rs      |   2 +-
 .../src/worker/addr_cache.rs                  |   2 +-
 .../authority-discovery/src/worker/tests.rs   |   2 +-
 .../src/communication/gossip.rs               |  10 +-
 client/network-gossip/src/state_machine.rs    |   4 +-
 client/network/src/behaviour.rs               |   2 +-
 client/network/src/bitswap.rs                 |   4 +-
 client/network/src/config.rs                  |  44 +--
 client/network/src/discovery.rs               | 118 +++++---
 client/network/src/error.rs                   |  12 +-
 client/network/src/gossip.rs                  |   2 +-
 .../src/light_client_requests/handler.rs      |  29 +-
 .../src/light_client_requests/sender.rs       |   6 +-
 client/network/src/network_state.rs           |   4 +-
 client/network/src/on_demand_layer.rs         |   2 +-
 client/network/src/peer_info.rs               |   6 +-
 client/network/src/protocol.rs                |  98 +++---
 client/network/src/protocol/event.rs          |   2 +-
 client/network/src/protocol/message.rs        |  16 +-
 .../src/protocol/notifications/behaviour.rs   | 279 ++++++++----------
 .../src/protocol/notifications/handler.rs     |   6 +-
 .../protocol/notifications/upgrade/collec.rs  |   4 +-
 .../notifications/upgrade/notifications.rs    |  15 +-
 client/network/src/protocol/sync.rs           | 133 +++++----
 client/network/src/protocol/sync/blocks.rs    |  11 +-
 .../src/protocol/sync/extra_requests.rs       |  42 ++-
 client/network/src/protocol/sync/state.rs     |  42 +--
 client/network/src/protocol/sync/warp.rs      |   5 +-
 client/network/src/service.rs                 |  60 ++--
 client/network/src/service/out_events.rs      |   2 +-
 client/network/src/service/tests.rs           |   6 +-
 client/network/src/state_request_handler.rs   |   6 +-
 client/network/test/src/block_import.rs       |   4 +-
 client/peerset/src/lib.rs                     |  10 +-
 client/peerset/src/peersstate.rs              |   6 +-
 client/rpc/src/system/tests.rs                |   3 +-
 37 files changed, 475 insertions(+), 526 deletions(-)

diff --git a/client/authority-discovery/src/tests.rs b/client/authority-discovery/src/tests.rs
index ef2c2f24634b..3784b4c83426 100644
--- a/client/authority-discovery/src/tests.rs
+++ b/client/authority-discovery/src/tests.rs
@@ -56,7 +56,7 @@ fn get_addresses_and_authority_id() {
 	let remote_addr = "/ip6/2001:db8:0:0:0:0:0:2/tcp/30333"
 		.parse::<Multiaddr>()
 		.unwrap()
-		.with(Protocol::P2p(remote_peer_id.clone().into()));
+		.with(Protocol::P2p(remote_peer_id.into()));
 
 	let test_api = Arc::new(TestApi { authorities: vec![] });
 
diff --git a/client/authority-discovery/src/worker.rs b/client/authority-discovery/src/worker.rs
index 5974bb7afb0a..a689d0bafd26 100644
--- a/client/authority-discovery/src/worker.rs
+++ b/client/authority-discovery/src/worker.rs
@@ -289,7 +289,7 @@ where
 				if a.iter().any(|p| matches!(p, multiaddr::Protocol::P2p(_))) {
 					a
 				} else {
-					a.with(multiaddr::Protocol::P2p(peer_id.clone()))
+					a.with(multiaddr::Protocol::P2p(peer_id))
 				}
 			})
 	}
diff --git a/client/authority-discovery/src/worker/addr_cache.rs b/client/authority-discovery/src/worker/addr_cache.rs
index 3f9cee476d68..e770297f6f3b 100644
--- a/client/authority-discovery/src/worker/addr_cache.rs
+++ b/client/authority-discovery/src/worker/addr_cache.rs
@@ -199,7 +199,7 @@ mod tests {
 			let multiaddr1 = "/ip6/2001:db8:0:0:0:0:0:2/tcp/30333"
 				.parse::<Multiaddr>()
 				.unwrap()
-				.with(Protocol::P2p(peer_id.clone().into()));
+				.with(Protocol::P2p(peer_id.into()));
 			let multiaddr2 = "/ip6/2002:db8:0:0:0:0:0:2/tcp/30133"
 				.parse::<Multiaddr>()
 				.unwrap()
diff --git a/client/authority-discovery/src/worker/tests.rs b/client/authority-discovery/src/worker/tests.rs
index b2f6ff544cb0..f10d2751ccd3 100644
--- a/client/authority-discovery/src/worker/tests.rs
+++ b/client/authority-discovery/src/worker/tests.rs
@@ -167,7 +167,7 @@ impl NetworkProvider for TestNetwork {
 
 impl NetworkStateInfo for TestNetwork {
 	fn local_peer_id(&self) -> PeerId {
-		self.peer_id.clone()
+		self.peer_id
 	}
 
 	fn external_addresses(&self) -> Vec<Multiaddr> {
diff --git a/client/finality-grandpa/src/communication/gossip.rs b/client/finality-grandpa/src/communication/gossip.rs
index d64c7421afa6..2e50a3bac01d 100644
--- a/client/finality-grandpa/src/communication/gossip.rs
+++ b/client/finality-grandpa/src/communication/gossip.rs
@@ -593,7 +593,7 @@ impl<N: Ord> Peers<N> {
 			let mut peers = self
 				.inner
 				.iter()
-				.map(|(peer_id, info)| (peer_id.clone(), info.clone()))
+				.map(|(peer_id, info)| (*peer_id, info.clone()))
 				.collect::<Vec<_>>();
 
 			peers.shuffle(&mut rand::thread_rng());
@@ -618,9 +618,9 @@ impl<N: Ord> Peers<N> {
 		let mut n_authorities_added = 0;
 		for peer_id in shuffled_authorities {
 			if n_authorities_added < half_lucky {
-				first_stage_peers.insert(peer_id.clone());
+				first_stage_peers.insert(*peer_id);
 			} else if n_authorities_added < one_and_a_half_lucky {
-				second_stage_peers.insert(peer_id.clone());
+				second_stage_peers.insert(*peer_id);
 			} else {
 				break
 			}
@@ -637,11 +637,11 @@ impl<N: Ord> Peers<N> {
 			}
 
 			if first_stage_peers.len() < LUCKY_PEERS {
-				first_stage_peers.insert(peer_id.clone());
+				first_stage_peers.insert(*peer_id);
 				second_stage_peers.remove(peer_id);
 			} else if second_stage_peers.len() < n_second_stage_peers {
 				if !first_stage_peers.contains(peer_id) {
-					second_stage_peers.insert(peer_id.clone());
+					second_stage_peers.insert(*peer_id);
 				}
 			} else {
 				break
diff --git a/client/network-gossip/src/state_machine.rs b/client/network-gossip/src/state_machine.rs
index f7851e497474..920b44d8c1e5 100644
--- a/client/network-gossip/src/state_machine.rs
+++ b/client/network-gossip/src/state_machine.rs
@@ -696,10 +696,10 @@ mod tests {
 		let mut network = NoOpNetwork::default();
 
 		let peer_id = PeerId::random();
-		consensus.new_peer(&mut network, peer_id.clone(), ObservedRole::Full);
+		consensus.new_peer(&mut network, peer_id, ObservedRole::Full);
 		assert!(consensus.peers.contains_key(&peer_id));
 
-		consensus.peer_disconnected(&mut network, peer_id.clone());
+		consensus.peer_disconnected(&mut network, peer_id);
 		assert!(!consensus.peers.contains_key(&peer_id));
 	}
 
diff --git a/client/network/src/behaviour.rs b/client/network/src/behaviour.rs
index cb3b19d96c6d..08d061ee26b2 100644
--- a/client/network/src/behaviour.rs
+++ b/client/network/src/behaviour.rs
@@ -222,7 +222,7 @@ impl<B: BlockT> Behaviour<B> {
 		request_response_protocols.push(state_request_protocol_config);
 		request_response_protocols.push(light_client_request_protocol_config);
 
-		Ok(Behaviour {
+		Ok(Self {
 			substrate,
 			peer_info: peer_info::PeerInfoBehaviour::new(user_agent, local_public_key),
 			discovery: disco_config.finish(),
diff --git a/client/network/src/bitswap.rs b/client/network/src/bitswap.rs
index 2f0885c9347f..6b53dce62650 100644
--- a/client/network/src/bitswap.rs
+++ b/client/network/src/bitswap.rs
@@ -190,7 +190,7 @@ pub struct Bitswap<B> {
 impl<B: BlockT> Bitswap<B> {
 	/// Create a new instance of the bitswap protocol handler.
 	pub fn new(client: Arc<dyn Client<B>>) -> Self {
-		Bitswap { client, ready_blocks: Default::default() }
+		Self { client, ready_blocks: Default::default() }
 	}
 }
 
@@ -305,7 +305,7 @@ impl<B: BlockT> NetworkBehaviour for Bitswap<B> {
 	>{
 		if let Some((peer_id, message)) = self.ready_blocks.pop_front() {
 			return Poll::Ready(NetworkBehaviourAction::NotifyHandler {
-				peer_id: peer_id.clone(),
+				peer_id,
 				handler: NotifyHandler::Any,
 				event: message,
 			})
diff --git a/client/network/src/config.rs b/client/network/src/config.rs
index 02ee73e8d521..d08e29ef8589 100644
--- a/client/network/src/config.rs
+++ b/client/network/src/config.rs
@@ -169,9 +169,9 @@ impl Role {
 impl fmt::Display for Role {
 	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 		match self {
-			Role::Full => write!(f, "FULL"),
-			Role::Light => write!(f, "LIGHT"),
-			Role::Authority { .. } => write!(f, "AUTHORITY"),
+			Self::Full => write!(f, "FULL"),
+			Self::Light => write!(f, "LIGHT"),
+			Self::Authority { .. } => write!(f, "AUTHORITY"),
 		}
 	}
 }
@@ -242,7 +242,7 @@ pub struct ProtocolId(smallvec::SmallVec<[u8; 6]>);
 
 impl<'a> From<&'a str> for ProtocolId {
 	fn from(bytes: &'a str) -> ProtocolId {
-		ProtocolId(bytes.as_bytes().into())
+		Self(bytes.as_bytes().into())
 	}
 }
 
@@ -313,7 +313,7 @@ pub struct MultiaddrWithPeerId {
 impl MultiaddrWithPeerId {
 	/// Concatenates the multiaddress and peer ID into one multiaddress containing both.
 	pub fn concat(&self) -> Multiaddr {
-		let proto = multiaddr::Protocol::P2p(From::from(self.peer_id.clone()));
+		let proto = multiaddr::Protocol::P2p(From::from(self.peer_id));
 		self.multiaddr.clone().with(proto)
 	}
 }
@@ -360,9 +360,9 @@ pub enum ParseErr {
 impl fmt::Display for ParseErr {
 	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 		match self {
-			ParseErr::MultiaddrParse(err) => write!(f, "{}", err),
-			ParseErr::InvalidPeerId => write!(f, "Peer id at the end of the address is invalid"),
-			ParseErr::PeerIdMissing => write!(f, "Peer id is missing from the address"),
+			Self::MultiaddrParse(err) => write!(f, "{}", err),
+			Self::InvalidPeerId => write!(f, "Peer id at the end of the address is invalid"),
+			Self::PeerIdMissing => write!(f, "Peer id is missing from the address"),
 		}
 	}
 }
@@ -370,16 +370,16 @@ impl fmt::Display for ParseErr {
 impl std::error::Error for ParseErr {
 	fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
 		match self {
-			ParseErr::MultiaddrParse(err) => Some(err),
-			ParseErr::InvalidPeerId => None,
-			ParseErr::PeerIdMissing => None,
+			Self::MultiaddrParse(err) => Some(err),
+			Self::InvalidPeerId => None,
+			Self::PeerIdMissing => None,
 		}
 	}
 }
 
 impl From<multiaddr::Error> for ParseErr {
 	fn from(err: multiaddr::Error) -> ParseErr {
-		ParseErr::MultiaddrParse(err)
+		Self::MultiaddrParse(err)
 	}
 }
 
@@ -401,7 +401,7 @@ pub enum SyncMode {
 
 impl Default for SyncMode {
 	fn default() -> Self {
-		SyncMode::Full
+		Self::Full
 	}
 }
 
@@ -479,7 +479,7 @@ impl NetworkConfiguration {
 		node_key: NodeKeyConfig,
 		net_config_path: Option<PathBuf>,
 	) -> Self {
-		NetworkConfiguration {
+		Self {
 			net_config_path,
 			listen_addresses: Vec::new(),
 			public_addresses: Vec::new(),
@@ -548,7 +548,7 @@ pub struct SetConfig {
 
 impl Default for SetConfig {
 	fn default() -> Self {
-		SetConfig {
+		Self {
 			in_peers: 25,
 			out_peers: 75,
 			reserved_nodes: Vec::new(),
@@ -585,7 +585,7 @@ pub struct NonDefaultSetConfig {
 impl NonDefaultSetConfig {
 	/// Creates a new [`NonDefaultSetConfig`]. Zero slots and accepts only reserved nodes.
 	pub fn new(notifications_protocol: Cow<'static, str>, max_notification_size: u64) -> Self {
-		NonDefaultSetConfig {
+		Self {
 			notifications_protocol,
 			max_notification_size,
 			fallback_names: Vec::new(),
@@ -644,8 +644,8 @@ impl NonReservedPeerMode {
 	/// Attempt to parse the peer mode from a string.
 	pub fn parse(s: &str) -> Option<Self> {
 		match s {
-			"accept" => Some(NonReservedPeerMode::Accept),
-			"deny" => Some(NonReservedPeerMode::Deny),
+			"accept" => Some(Self::Accept),
+			"deny" => Some(Self::Deny),
 			_ => None,
 		}
 	}
@@ -662,7 +662,7 @@ pub enum NodeKeyConfig {
 
 impl Default for NodeKeyConfig {
 	fn default() -> NodeKeyConfig {
-		NodeKeyConfig::Ed25519(Secret::New)
+		Self::Ed25519(Secret::New)
 	}
 }
 
@@ -687,9 +687,9 @@ pub enum Secret<K> {
 impl<K> fmt::Debug for Secret<K> {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		match self {
-			Secret::Input(_) => f.debug_tuple("Secret::Input").finish(),
-			Secret::File(path) => f.debug_tuple("Secret::File").field(path).finish(),
-			Secret::New => f.debug_tuple("Secret::New").finish(),
+			Self::Input(_) => f.debug_tuple("Secret::Input").finish(),
+			Self::File(path) => f.debug_tuple("Secret::File").field(path).finish(),
+			Self::New => f.debug_tuple("Secret::New").finish(),
 		}
 	}
 }
diff --git a/client/network/src/discovery.rs b/client/network/src/discovery.rs
index 6c5f3d768534..71e46f73234c 100644
--- a/client/network/src/discovery.rs
+++ b/client/network/src/discovery.rs
@@ -71,7 +71,7 @@ use libp2p::{
 		NetworkBehaviourAction, PollParameters, ProtocolsHandler,
 	},
 };
-use log::{debug, info, trace, warn};
+use log::{debug, error, info, trace, warn};
 use sp_core::hexdisplay::HexDisplay;
 use std::{
 	cmp,
@@ -106,7 +106,7 @@ pub struct DiscoveryConfig {
 impl DiscoveryConfig {
 	/// Create a default configuration with the given public key.
 	pub fn new(local_public_key: PublicKey) -> Self {
-		DiscoveryConfig {
+		Self {
 			local_peer_id: local_public_key.into_peer_id(),
 			permanent_addresses: Vec::new(),
 			dht_random_walk: true,
@@ -180,7 +180,7 @@ impl DiscoveryConfig {
 
 	/// Create a `DiscoveryBehaviour` from this config.
 	pub fn finish(self) -> DiscoveryBehaviour {
-		let DiscoveryConfig {
+		let Self {
 			local_peer_id,
 			permanent_addresses,
 			dht_random_walk,
@@ -205,8 +205,8 @@ impl DiscoveryConfig {
 				config.set_kbucket_inserts(KademliaBucketInserts::Manual);
 				config.disjoint_query_paths(kademlia_disjoint_query_paths);
 
-				let store = MemoryStore::new(local_peer_id.clone());
-				let mut kad = Kademlia::with_config(local_peer_id.clone(), store, config);
+				let store = MemoryStore::new(local_peer_id);
+				let mut kad = Kademlia::with_config(local_peer_id, store, config);
 
 				for (peer_id, addr) in &permanent_addresses {
 					kad.add_address(peer_id, addr.clone());
@@ -324,7 +324,7 @@ impl DiscoveryBehaviour {
 		addr: Multiaddr,
 	) {
 		if !self.allow_non_globals_in_dht && !self.can_add_to_dht(&addr) {
-			log::trace!(target: "sub-libp2p", "Ignoring self-reported non-global address {} from {}.", addr, peer_id);
+			trace!(target: "sub-libp2p", "Ignoring self-reported non-global address {} from {}.", addr, peer_id);
 			return
 		}
 
@@ -332,7 +332,7 @@ impl DiscoveryBehaviour {
 		for protocol in supported_protocols {
 			for kademlia in self.kademlias.values_mut() {
 				if protocol.as_ref() == kademlia.protocol_name() {
-					log::trace!(
+					trace!(
 						target: "sub-libp2p",
 						"Adding self-reported address {} from {} to Kademlia DHT {}.",
 						addr, peer_id, String::from_utf8_lossy(kademlia.protocol_name()),
@@ -344,7 +344,7 @@ impl DiscoveryBehaviour {
 		}
 
 		if !added {
-			log::trace!(
+			trace!(
 				target: "sub-libp2p",
 				"Ignoring self-reported address {} from {} as remote node is not part of any \
 				 Kademlia DHTs supported by the local node.", addr, peer_id,
@@ -593,18 +593,21 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 		if let Some(kad) = self.kademlias.get_mut(&pid) {
 			return kad.inject_event(peer_id, connection, event)
 		}
-		log::error!(target: "sub-libp2p",
+		error!(
+			target: "sub-libp2p",
 			"inject_node_event: no kademlia instance registered for protocol {:?}",
-			pid)
+			pid,
+		)
 	}
 
 	fn inject_new_external_addr(&mut self, addr: &Multiaddr) {
-		let new_addr = addr.clone().with(Protocol::P2p(self.local_peer_id.clone().into()));
+		let new_addr = addr.clone().with(Protocol::P2p(self.local_peer_id.into()));
 
 		// NOTE: we might re-discover the same address multiple times
 		// in which case we just want to refrain from logging.
 		if self.known_external_addresses.insert(new_addr.clone()) {
-			info!(target: "sub-libp2p",
+			info!(
+				target: "sub-libp2p",
 				"🔍 Discovered new external address for our node: {}",
 				new_addr,
 			);
@@ -680,11 +683,13 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 			while let Poll::Ready(_) = next_kad_random_query.poll_unpin(cx) {
 				let actually_started = if self.num_connections < self.discovery_only_if_under_num {
 					let random_peer_id = PeerId::random();
-					debug!(target: "sub-libp2p",
+					debug!(
+						target: "sub-libp2p",
 						"Libp2p <= Starting random Kademlia request for {:?}",
-						random_peer_id);
+						random_peer_id,
+					);
 					for k in self.kademlias.values_mut() {
-						k.get_closest_peers(random_peer_id.clone());
+						k.get_closest_peers(random_peer_id);
 					}
 					true
 				} else {
@@ -736,17 +741,23 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 							..
 						} => match res {
 							Err(GetClosestPeersError::Timeout { key, peers }) => {
-								debug!(target: "sub-libp2p",
-										"Libp2p => Query for {:?} timed out with {} results",
-										HexDisplay::from(&key), peers.len());
+								debug!(
+									target: "sub-libp2p",
+									"Libp2p => Query for {:?} timed out with {} results",
+									HexDisplay::from(&key), peers.len(),
+								);
 							},
 							Ok(ok) => {
-								trace!(target: "sub-libp2p",
-										"Libp2p => Query for {:?} yielded {:?} results",
-										HexDisplay::from(&ok.key), ok.peers.len());
+								trace!(
+									target: "sub-libp2p",
+									"Libp2p => Query for {:?} yielded {:?} results",
+									HexDisplay::from(&ok.key), ok.peers.len(),
+								);
 								if ok.peers.is_empty() && self.num_connections != 0 {
-									debug!(target: "sub-libp2p", "Libp2p => Random Kademlia query has yielded empty \
-											results");
+									debug!(
+										target: "sub-libp2p",
+										"Libp2p => Random Kademlia query has yielded empty results",
+									);
 								}
 							},
 						},
@@ -769,16 +780,22 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 									)
 								},
 								Err(e @ libp2p::kad::GetRecordError::NotFound { .. }) => {
-									trace!(target: "sub-libp2p",
-										"Libp2p => Failed to get record: {:?}", e);
+									trace!(
+										target: "sub-libp2p",
+										"Libp2p => Failed to get record: {:?}",
+										e,
+									);
 									DiscoveryOut::ValueNotFound(
 										e.into_key(),
 										stats.duration().unwrap_or_else(Default::default),
 									)
 								},
 								Err(e) => {
-									debug!(target: "sub-libp2p",
-										"Libp2p => Failed to get record: {:?}", e);
+									debug!(
+										target: "sub-libp2p",
+										"Libp2p => Failed to get record: {:?}",
+										e,
+									);
 									DiscoveryOut::ValueNotFound(
 										e.into_key(),
 										stats.duration().unwrap_or_else(Default::default),
@@ -798,8 +815,11 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 									stats.duration().unwrap_or_else(Default::default),
 								),
 								Err(e) => {
-									debug!(target: "sub-libp2p",
-										"Libp2p => Failed to put record: {:?}", e);
+									debug!(
+										target: "sub-libp2p",
+										"Libp2p => Failed to put record: {:?}",
+										e,
+									);
 									DiscoveryOut::ValuePutFailed(
 										e.into_key(),
 										stats.duration().unwrap_or_else(Default::default),
@@ -812,12 +832,16 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 							result: QueryResult::RepublishRecord(res),
 							..
 						} => match res {
-							Ok(ok) => debug!(target: "sub-libp2p",
-									"Libp2p => Record republished: {:?}",
-									ok.key),
-							Err(e) => debug!(target: "sub-libp2p",
-									"Libp2p => Republishing of record {:?} failed with: {:?}",
-									e.key(), e),
+							Ok(ok) => debug!(
+								target: "sub-libp2p",
+								"Libp2p => Record republished: {:?}",
+								ok.key,
+							),
+							Err(e) => debug!(
+								target: "sub-libp2p",
+								"Libp2p => Republishing of record {:?} failed with: {:?}",
+								e.key(), e,
+							),
 						},
 						// We never start any other type of query.
 						e => {
@@ -907,9 +931,9 @@ enum MdnsWrapper {
 impl MdnsWrapper {
 	fn addresses_of_peer(&mut self, peer_id: &PeerId) -> Vec<Multiaddr> {
 		match self {
-			MdnsWrapper::Instantiating(_) => Vec::new(),
-			MdnsWrapper::Ready(mdns) => mdns.addresses_of_peer(peer_id),
-			MdnsWrapper::Disabled => Vec::new(),
+			Self::Instantiating(_) => Vec::new(),
+			Self::Ready(mdns) => mdns.addresses_of_peer(peer_id),
+			Self::Disabled => Vec::new(),
 		}
 	}
 
@@ -920,16 +944,16 @@ impl MdnsWrapper {
 	) -> Poll<NetworkBehaviourAction<void::Void, MdnsEvent>> {
 		loop {
 			match self {
-				MdnsWrapper::Instantiating(fut) =>
+				Self::Instantiating(fut) =>
 					*self = match futures::ready!(fut.as_mut().poll(cx)) {
-						Ok(mdns) => MdnsWrapper::Ready(mdns),
+						Ok(mdns) => Self::Ready(mdns),
 						Err(err) => {
 							warn!(target: "sub-libp2p", "Failed to initialize mDNS: {:?}", err);
-							MdnsWrapper::Disabled
+							Self::Disabled
 						},
 					},
-				MdnsWrapper::Ready(mdns) => return mdns.poll(cx, params),
-				MdnsWrapper::Disabled => return Poll::Pending,
+				Self::Ready(mdns) => return mdns.poll(cx, params),
+				Self::Disabled => return Poll::Pending,
 			}
 		}
 	}
@@ -1100,7 +1124,7 @@ mod tests {
 		for kademlia in discovery.kademlias.values_mut() {
 			assert!(
 				kademlia
-					.kbucket(remote_peer_id.clone())
+					.kbucket(remote_peer_id)
 					.expect("Remote peer id not to be equal to local peer id.")
 					.is_empty(),
 				"Expect peer with unsupported protocol not to be added."
@@ -1118,7 +1142,7 @@ mod tests {
 			assert_eq!(
 				1,
 				kademlia
-					.kbucket(remote_peer_id.clone())
+					.kbucket(remote_peer_id)
 					.expect("Remote peer id not to be equal to local peer id.")
 					.num_entries(),
 				"Expect peer with supported protocol to be added."
@@ -1159,7 +1183,7 @@ mod tests {
 				.kademlias
 				.get_mut(&protocol_a)
 				.expect("Kademlia instance to exist.")
-				.kbucket(remote_peer_id.clone())
+				.kbucket(remote_peer_id)
 				.expect("Remote peer id not to be equal to local peer id.")
 				.num_entries(),
 			"Expected remote peer to be added to `protocol_a` Kademlia instance.",
@@ -1170,7 +1194,7 @@ mod tests {
 				.kademlias
 				.get_mut(&protocol_b)
 				.expect("Kademlia instance to exist.")
-				.kbucket(remote_peer_id.clone())
+				.kbucket(remote_peer_id)
 				.expect("Remote peer id not to be equal to local peer id.")
 				.is_empty(),
 			"Expected remote peer not to be added to `protocol_b` Kademlia instance.",
diff --git a/client/network/src/error.rs b/client/network/src/error.rs
index 32fc6f9e1e31..b8a31def7dc6 100644
--- a/client/network/src/error.rs
+++ b/client/network/src/error.rs
@@ -79,12 +79,12 @@ impl fmt::Debug for Error {
 impl std::error::Error for Error {
 	fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
 		match self {
-			Error::Io(ref err) => Some(err),
-			Error::Client(ref err) => Some(err),
-			Error::DuplicateBootnode { .. } => None,
-			Error::Prometheus(ref err) => Some(err),
-			Error::AddressesForAnotherTransport { .. } => None,
-			Error::DuplicateRequestResponseProtocol { .. } => None,
+			Self::Io(ref err) => Some(err),
+			Self::Client(ref err) => Some(err),
+			Self::Prometheus(ref err) => Some(err),
+			Self::DuplicateBootnode { .. } |
+			Self::AddressesForAnotherTransport { .. } |
+			Self::DuplicateRequestResponseProtocol { .. } => None,
 		}
 	}
 }
diff --git a/client/network/src/gossip.rs b/client/network/src/gossip.rs
index 4e6845e34126..0bc46b2164bc 100644
--- a/client/network/src/gossip.rs
+++ b/client/network/src/gossip.rs
@@ -108,7 +108,7 @@ impl<M> QueuedSender<M> {
 			messages_encode
 		);
 
-		let sender = QueuedSender {
+		let sender = Self {
 			shared_message_queue,
 			notify_background_future,
 			queue_size_limit,
diff --git a/client/network/src/light_client_requests/handler.rs b/client/network/src/light_client_requests/handler.rs
index 609ed35f4a9d..43504edddd73 100644
--- a/client/network/src/light_client_requests/handler.rs
+++ b/client/network/src/light_client_requests/handler.rs
@@ -158,12 +158,7 @@ impl<B: Block> LightClientRequestHandler<B> {
 		peer: &PeerId,
 		request: &schema::v1::light::RemoteCallRequest,
 	) -> Result<schema::v1::light::Response, HandleRequestError> {
-		log::trace!(
-			"Remote call request from {} ({} at {:?}).",
-			peer,
-			request.method,
-			request.block,
-		);
+		trace!("Remote call request from {} ({} at {:?}).", peer, request.method, request.block,);
 
 		let block = Decode::decode(&mut request.block.as_ref())?;
 
@@ -174,7 +169,7 @@ impl<B: Block> LightClientRequestHandler<B> {
 			{
 				Ok((_, proof)) => proof,
 				Err(e) => {
-					log::trace!(
+					trace!(
 						"remote call request from {} ({} at {:?}) failed with: {}",
 						peer,
 						request.method,
@@ -199,11 +194,11 @@ impl<B: Block> LightClientRequestHandler<B> {
 		request: &schema::v1::light::RemoteReadRequest,
 	) -> Result<schema::v1::light::Response, HandleRequestError> {
 		if request.keys.is_empty() {
-			log::debug!("Invalid remote read request sent by {}.", peer);
+			debug!("Invalid remote read request sent by {}.", peer);
 			return Err(HandleRequestError::BadRequest("Remote read request without keys."))
 		}
 
-		log::trace!(
+		trace!(
 			"Remote read request from {} ({} at {:?}).",
 			peer,
 			fmt_keys(request.keys.first(), request.keys.last()),
@@ -218,7 +213,7 @@ impl<B: Block> LightClientRequestHandler<B> {
 		{
 			Ok(proof) => proof,
 			Err(error) => {
-				log::trace!(
+				trace!(
 					"remote read request from {} ({} at {:?}) failed with: {}",
 					peer,
 					fmt_keys(request.keys.first(), request.keys.last()),
@@ -243,11 +238,11 @@ impl<B: Block> LightClientRequestHandler<B> {
 		request: &schema::v1::light::RemoteReadChildRequest,
 	) -> Result<schema::v1::light::Response, HandleRequestError> {
 		if request.keys.is_empty() {
-			log::debug!("Invalid remote child read request sent by {}.", peer);
+			debug!("Invalid remote child read request sent by {}.", peer);
 			return Err(HandleRequestError::BadRequest("Remove read child request without keys."))
 		}
 
-		log::trace!(
+		trace!(
 			"Remote read child request from {} ({} {} at {:?}).",
 			peer,
 			HexDisplay::from(&request.storage_key),
@@ -271,7 +266,7 @@ impl<B: Block> LightClientRequestHandler<B> {
 		}) {
 			Ok(proof) => proof,
 			Err(error) => {
-				log::trace!(
+				trace!(
 					"remote read child request from {} ({} {} at {:?}) failed with: {}",
 					peer,
 					HexDisplay::from(&request.storage_key),
@@ -296,13 +291,13 @@ impl<B: Block> LightClientRequestHandler<B> {
 		peer: &PeerId,
 		request: &schema::v1::light::RemoteHeaderRequest,
 	) -> Result<schema::v1::light::Response, HandleRequestError> {
-		log::trace!("Remote header proof request from {} ({:?}).", peer, request.block);
+		trace!("Remote header proof request from {} ({:?}).", peer, request.block);
 
 		let block = Decode::decode(&mut request.block.as_ref())?;
 		let (header, proof) = match self.client.header_proof(&BlockId::Number(block)) {
 			Ok((header, proof)) => (header.encode(), proof),
 			Err(error) => {
-				log::trace!(
+				trace!(
 					"Remote header proof request from {} ({:?}) failed with: {}.",
 					peer,
 					request.block,
@@ -325,7 +320,7 @@ impl<B: Block> LightClientRequestHandler<B> {
 		peer: &PeerId,
 		request: &schema::v1::light::RemoteChangesRequest,
 	) -> Result<schema::v1::light::Response, HandleRequestError> {
-		log::trace!(
+		trace!(
 			"Remote changes proof request from {} for key {} ({:?}..{:?}).",
 			peer,
 			if !request.storage_key.is_empty() {
@@ -356,7 +351,7 @@ impl<B: Block> LightClientRequestHandler<B> {
 			match self.client.key_changes_proof(first, last, min, max, storage_key, &key) {
 				Ok(proof) => proof,
 				Err(error) => {
-					log::trace!(
+					trace!(
 					"Remote changes proof request from {} for key {} ({:?}..{:?}) failed with: {}.",
 					peer,
 					format!("{} : {}", HexDisplay::from(&request.storage_key), HexDisplay::from(&key.0)),
diff --git a/client/network/src/light_client_requests/sender.rs b/client/network/src/light_client_requests/sender.rs
index 9e3185d94438..284db827594b 100644
--- a/client/network/src/light_client_requests/sender.rs
+++ b/client/network/src/light_client_requests/sender.rs
@@ -72,7 +72,7 @@ struct Config {
 impl Config {
 	/// Create a new [`LightClientRequestSender`] configuration.
 	pub fn new(id: &ProtocolId) -> Self {
-		Config {
+		Self {
 			max_pending_requests: 128,
 			light_protocol: super::generate_protocol_name(id),
 			block_protocol: crate::block_request_handler::generate_protocol_name(id),
@@ -112,7 +112,7 @@ struct PendingRequest<B: Block> {
 
 impl<B: Block> PendingRequest<B> {
 	fn new(req: Request<B>) -> Self {
-		PendingRequest {
+		Self {
 			// Number of retries + one for the initial attempt.
 			attempts_left: req.retries() + 1,
 			request: req,
@@ -153,7 +153,7 @@ where
 		checker: Arc<dyn light::FetchChecker<B>>,
 		peerset: sc_peerset::PeersetHandle,
 	) -> Self {
-		LightClientRequestSender {
+		Self {
 			config: Config::new(id),
 			checker,
 			peers: Default::default(),
diff --git a/client/network/src/network_state.rs b/client/network/src/network_state.rs
index 3f3d0596f16a..6f5f031bf35d 100644
--- a/client/network/src/network_state.rs
+++ b/client/network/src/network_state.rs
@@ -93,9 +93,9 @@ pub enum PeerEndpoint {
 impl From<ConnectedPoint> for PeerEndpoint {
 	fn from(endpoint: ConnectedPoint) -> Self {
 		match endpoint {
-			ConnectedPoint::Dialer { address } => PeerEndpoint::Dialing(address),
+			ConnectedPoint::Dialer { address } => Self::Dialing(address),
 			ConnectedPoint::Listener { local_addr, send_back_addr } =>
-				PeerEndpoint::Listening { local_addr, send_back_addr },
+				Self::Listening { local_addr, send_back_addr },
 		}
 	}
 }
diff --git a/client/network/src/on_demand_layer.rs b/client/network/src/on_demand_layer.rs
index 5bac05c7aefa..eaeb0bee98f2 100644
--- a/client/network/src/on_demand_layer.rs
+++ b/client/network/src/on_demand_layer.rs
@@ -135,7 +135,7 @@ where
 		let (requests_send, requests_queue) = tracing_unbounded("mpsc_ondemand");
 		let requests_queue = Mutex::new(Some(requests_queue));
 
-		OnDemand { checker, requests_queue, requests_send }
+		Self { checker, requests_queue, requests_send }
 	}
 
 	/// Get checker reference.
diff --git a/client/network/src/peer_info.rs b/client/network/src/peer_info.rs
index ba60c57e8b3c..141cc59247d1 100644
--- a/client/network/src/peer_info.rs
+++ b/client/network/src/peer_info.rs
@@ -78,7 +78,7 @@ impl NodeInfo {
 	fn new(endpoint: ConnectedPoint) -> Self {
 		let mut endpoints = SmallVec::new();
 		endpoints.push(endpoint);
-		NodeInfo { info_expire: None, endpoints, client_version: None, latest_ping: None }
+		Self { info_expire: None, endpoints, client_version: None, latest_ping: None }
 	}
 }
 
@@ -91,7 +91,7 @@ impl PeerInfoBehaviour {
 			Identify::new(cfg)
 		};
 
-		PeerInfoBehaviour {
+		Self {
 			ping: Ping::new(PingConfig::new()),
 			identify,
 			nodes_info: FnvHashMap::default(),
@@ -199,7 +199,7 @@ impl NetworkBehaviour for PeerInfoBehaviour {
 	) {
 		self.ping.inject_connection_established(peer_id, conn, endpoint);
 		self.identify.inject_connection_established(peer_id, conn, endpoint);
-		match self.nodes_info.entry(peer_id.clone()) {
+		match self.nodes_info.entry(*peer_id) {
 			Entry::Vacant(e) => {
 				e.insert(NodeInfo::new(endpoint.clone()));
 			},
diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index 4d9fe269f2b6..e22d96f32aeb 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -41,7 +41,7 @@ use libp2p::{
 	},
 	Multiaddr, PeerId,
 };
-use log::{debug, error, log, trace, warn, Level};
+use log::{debug, error, info, log, trace, warn, Level};
 use message::{
 	generic::{Message as GenericMessage, Roles},
 	BlockAnnounce, Message,
@@ -130,7 +130,7 @@ struct Metrics {
 
 impl Metrics {
 	fn register(r: &Registry) -> Result<Self, PrometheusError> {
-		Ok(Metrics {
+		Ok(Self {
 			peers: {
 				let g = Gauge::new("sync_peers", "Number of peers we sync with")?;
 				register(g, r)?
@@ -249,11 +249,7 @@ impl ProtocolConfig {
 
 impl Default for ProtocolConfig {
 	fn default() -> ProtocolConfig {
-		ProtocolConfig {
-			roles: Roles::FULL,
-			max_parallel_downloads: 5,
-			sync_mode: config::SyncMode::Full,
-		}
+		Self { roles: Roles::FULL, max_parallel_downloads: 5, sync_mode: config::SyncMode::Full }
 	}
 }
 
@@ -277,12 +273,7 @@ impl<B: BlockT> BlockAnnouncesHandshake<B> {
 		best_hash: B::Hash,
 		genesis_hash: B::Hash,
 	) -> Self {
-		BlockAnnouncesHandshake {
-			genesis_hash,
-			roles: protocol_config.roles,
-			best_number,
-			best_hash,
-		}
+		Self { genesis_hash, roles: protocol_config.roles, best_number, best_hash }
 	}
 }
 
@@ -311,7 +302,7 @@ impl<B: BlockT> Protocol<B> {
 		let boot_node_ids = {
 			let mut list = HashSet::new();
 			for node in &network_config.boot_nodes {
-				list.insert(node.peer_id.clone());
+				list.insert(node.peer_id);
 			}
 			list.shrink_to_fit();
 			list
@@ -320,14 +311,14 @@ impl<B: BlockT> Protocol<B> {
 		let important_peers = {
 			let mut imp_p = HashSet::new();
 			for reserved in &network_config.default_peers_set.reserved_nodes {
-				imp_p.insert(reserved.peer_id.clone());
+				imp_p.insert(reserved.peer_id);
 			}
 			for reserved in network_config
 				.extra_sets
 				.iter()
 				.flat_map(|s| s.set_config.reserved_nodes.iter())
 			{
-				imp_p.insert(reserved.peer_id.clone());
+				imp_p.insert(reserved.peer_id);
 			}
 			imp_p.shrink_to_fit();
 			imp_p
@@ -341,14 +332,14 @@ impl<B: BlockT> Protocol<B> {
 
 			let mut default_sets_reserved = HashSet::new();
 			for reserved in network_config.default_peers_set.reserved_nodes.iter() {
-				default_sets_reserved.insert(reserved.peer_id.clone());
-				known_addresses.push((reserved.peer_id.clone(), reserved.multiaddr.clone()));
+				default_sets_reserved.insert(reserved.peer_id);
+				known_addresses.push((reserved.peer_id, reserved.multiaddr.clone()));
 			}
 
 			let mut bootnodes = Vec::with_capacity(network_config.boot_nodes.len());
 			for bootnode in network_config.boot_nodes.iter() {
-				bootnodes.push(bootnode.peer_id.clone());
-				known_addresses.push((bootnode.peer_id.clone(), bootnode.multiaddr.clone()));
+				bootnodes.push(bootnode.peer_id);
+				known_addresses.push((bootnode.peer_id, bootnode.multiaddr.clone()));
 			}
 
 			// Set number 0 is used for block announces.
@@ -364,8 +355,8 @@ impl<B: BlockT> Protocol<B> {
 			for set_cfg in &network_config.extra_sets {
 				let mut reserved_nodes = HashSet::new();
 				for reserved in set_cfg.set_config.reserved_nodes.iter() {
-					reserved_nodes.insert(reserved.peer_id.clone());
-					known_addresses.push((reserved.peer_id.clone(), reserved.multiaddr.clone()));
+					reserved_nodes.insert(reserved.peer_id);
+					known_addresses.push((reserved.peer_id, reserved.multiaddr.clone()));
 				}
 
 				let reserved_only =
@@ -427,7 +418,7 @@ impl<B: BlockT> Protocol<B> {
 				network_config.default_peers_set.out_peers as usize,
 		);
 
-		let protocol = Protocol {
+		let protocol = Self {
 			tick_timeout: Box::pin(interval(TICK_TIMEOUT)),
 			pending_messages: VecDeque::new(),
 			config,
@@ -481,7 +472,7 @@ impl<B: BlockT> Protocol<B> {
 				sc_peerset::SetId::from(position + NUM_HARDCODED_PEERSETS),
 			);
 		} else {
-			log::warn!(target: "sub-libp2p", "disconnect_peer() with invalid protocol name")
+			warn!(target: "sub-libp2p", "disconnect_peer() with invalid protocol name")
 		}
 	}
 
@@ -769,7 +760,7 @@ impl<B: BlockT> Protocol<B> {
 		trace!(target: "sync", "New peer {} {:?}", who, status);
 
 		if self.peers.contains_key(&who) {
-			log::error!(target: "sync", "Called on_sync_peer_connected with already connected peer {}", who);
+			error!(target: "sync", "Called on_sync_peer_connected with already connected peer {}", who);
 			debug_assert!(false);
 			return Err(())
 		}
@@ -781,7 +772,7 @@ impl<B: BlockT> Protocol<B> {
 				"Peer is on different chain (our genesis: {} theirs: {})",
 				self.genesis_hash, status.genesis_hash
 			);
-			self.peerset_handle.report_peer(who.clone(), rep::GENESIS_MISMATCH);
+			self.peerset_handle.report_peer(who, rep::GENESIS_MISMATCH);
 			self.behaviour.disconnect_peer(&who, HARDCODED_PEERSETS_SYNC);
 
 			if self.boot_node_ids.contains(&who) {
@@ -801,7 +792,7 @@ impl<B: BlockT> Protocol<B> {
 			// we're not interested in light peers
 			if status.roles.is_light() {
 				debug!(target: "sync", "Peer {} is unable to serve light requests", who);
-				self.peerset_handle.report_peer(who.clone(), rep::BAD_ROLE);
+				self.peerset_handle.report_peer(who, rep::BAD_ROLE);
 				self.behaviour.disconnect_peer(&who, HARDCODED_PEERSETS_SYNC);
 				return Err(())
 			}
@@ -814,7 +805,7 @@ impl<B: BlockT> Protocol<B> {
 				.saturated_into::<u64>();
 			if blocks_difference > LIGHT_MAXIMAL_BLOCKS_DIFFERENCE {
 				debug!(target: "sync", "Peer {} is far behind us and will unable to serve light requests", who);
-				self.peerset_handle.report_peer(who.clone(), rep::PEER_BEHIND_US_LIGHT);
+				self.peerset_handle.report_peer(who, rep::PEER_BEHIND_US_LIGHT);
 				self.behaviour.disconnect_peer(&who, HARDCODED_PEERSETS_SYNC);
 				return Err(())
 			}
@@ -833,7 +824,7 @@ impl<B: BlockT> Protocol<B> {
 		};
 
 		let req = if peer.info.roles.is_full() {
-			match self.sync.new_peer(who.clone(), peer.info.best_hash, peer.info.best_number) {
+			match self.sync.new_peer(who, peer.info.best_hash, peer.info.best_number) {
 				Ok(req) => req,
 				Err(sync::BadPeer(id, repu)) => {
 					self.behaviour.disconnect_peer(&id, HARDCODED_PEERSETS_SYNC);
@@ -847,12 +838,12 @@ impl<B: BlockT> Protocol<B> {
 
 		debug!(target: "sync", "Connected {}", who);
 
-		self.peers.insert(who.clone(), peer);
+		self.peers.insert(who, peer);
 		self.pending_messages
-			.push_back(CustomMessageOutcome::PeerNewBest(who.clone(), status.best_number));
+			.push_back(CustomMessageOutcome::PeerNewBest(who, status.best_number));
 
 		if let Some(req) = req {
-			let event = self.prepare_block_request(who.clone(), req);
+			let event = self.prepare_block_request(who, req);
 			self.pending_messages.push_back(event);
 		}
 
@@ -1101,7 +1092,7 @@ impl<B: BlockT> Protocol<B> {
 	) {
 		self.sync.on_justification_import(hash, number, success);
 		if !success {
-			log::info!("💔 Invalid justification provided by {} for #{}", who, hash);
+			info!("💔 Invalid justification provided by {} for #{}", who, hash);
 			self.behaviour.disconnect_peer(&who, HARDCODED_PEERSETS_SYNC);
 			self.peerset_handle
 				.report_peer(who, sc_peerset::ReputationChange::new_fatal("Invalid justification"));
@@ -1141,7 +1132,7 @@ impl<B: BlockT> Protocol<B> {
 				peer,
 			);
 		} else {
-			log::error!(
+			error!(
 				target: "sub-libp2p",
 				"remove_set_reserved_peer with unknown protocol: {}",
 				protocol
@@ -1155,7 +1146,7 @@ impl<B: BlockT> Protocol<B> {
 			self.peerset_handle
 				.add_reserved_peer(sc_peerset::SetId::from(index + NUM_HARDCODED_PEERSETS), peer);
 		} else {
-			log::error!(
+			error!(
 				target: "sub-libp2p",
 				"add_set_reserved_peer with unknown protocol: {}",
 				protocol
@@ -1178,7 +1169,7 @@ impl<B: BlockT> Protocol<B> {
 			self.peerset_handle
 				.add_to_peers_set(sc_peerset::SetId::from(index + NUM_HARDCODED_PEERSETS), peer);
 		} else {
-			log::error!(
+			error!(
 				target: "sub-libp2p",
 				"add_to_peers_set with unknown protocol: {}",
 				protocol
@@ -1194,7 +1185,7 @@ impl<B: BlockT> Protocol<B> {
 				peer,
 			);
 		} else {
-			log::error!(
+			error!(
 				target: "sub-libp2p",
 				"remove_from_peers_set with unknown protocol: {}",
 				protocol
@@ -1426,8 +1417,7 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 												id,
 												e
 											);
-											self.peerset_handle
-												.report_peer(id.clone(), rep::BAD_MESSAGE);
+											self.peerset_handle.report_peer(*id, rep::BAD_MESSAGE);
 											self.behaviour
 												.disconnect_peer(id, HARDCODED_PEERSETS_SYNC);
 											continue
@@ -1447,18 +1437,17 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 												id,
 												e
 											);
-											self.peerset_handle
-												.report_peer(id.clone(), rep::BAD_MESSAGE);
+											self.peerset_handle.report_peer(*id, rep::BAD_MESSAGE);
 											self.behaviour
 												.disconnect_peer(id, HARDCODED_PEERSETS_SYNC);
 											continue
 										},
 									};
 
-								finished_state_requests.push((id.clone(), protobuf_response));
+								finished_state_requests.push((*id, protobuf_response));
 							},
 							PeerRequest::WarpProof => {
-								finished_warp_sync_requests.push((id.clone(), resp));
+								finished_warp_sync_requests.push((*id, resp));
 							},
 						}
 					},
@@ -1468,18 +1457,18 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 
 						match e {
 							RequestFailure::Network(OutboundFailure::Timeout) => {
-								self.peerset_handle.report_peer(id.clone(), rep::TIMEOUT);
+								self.peerset_handle.report_peer(*id, rep::TIMEOUT);
 								self.behaviour.disconnect_peer(id, HARDCODED_PEERSETS_SYNC);
 							},
 							RequestFailure::Network(OutboundFailure::UnsupportedProtocols) => {
-								self.peerset_handle.report_peer(id.clone(), rep::BAD_PROTOCOL);
+								self.peerset_handle.report_peer(*id, rep::BAD_PROTOCOL);
 								self.behaviour.disconnect_peer(id, HARDCODED_PEERSETS_SYNC);
 							},
 							RequestFailure::Network(OutboundFailure::DialFailure) => {
 								self.behaviour.disconnect_peer(id, HARDCODED_PEERSETS_SYNC);
 							},
 							RequestFailure::Refused => {
-								self.peerset_handle.report_peer(id.clone(), rep::REFUSED);
+								self.peerset_handle.report_peer(*id, rep::REFUSED);
 								self.behaviour.disconnect_peer(id, HARDCODED_PEERSETS_SYNC);
 							},
 							RequestFailure::Network(OutboundFailure::ConnectionClosed) |
@@ -1603,7 +1592,7 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 								genesis_hash: handshake.genesis_hash,
 							};
 
-							if self.on_sync_peer_connected(peer_id.clone(), handshake).is_ok() {
+							if self.on_sync_peer_connected(peer_id, handshake).is_ok() {
 								CustomMessageOutcome::SyncConnected(peer_id)
 							} else {
 								CustomMessageOutcome::None
@@ -1624,10 +1613,7 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 								&mut &received_handshake[..],
 							) {
 								Ok(handshake) => {
-									if self
-										.on_sync_peer_connected(peer_id.clone(), handshake)
-										.is_ok()
-									{
+									if self.on_sync_peer_connected(peer_id, handshake).is_ok() {
 										CustomMessageOutcome::SyncConnected(peer_id)
 									} else {
 										CustomMessageOutcome::None
@@ -1679,7 +1665,7 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 						},
 						(Err(err), _) => {
 							debug!(target: "sync", "Failed to parse remote handshake: {}", err);
-							self.bad_handshake_substreams.insert((peer_id.clone(), set_id));
+							self.bad_handshake_substreams.insert((peer_id, set_id));
 							self.behaviour.disconnect_peer(&peer_id, set_id);
 							self.peerset_handle.report_peer(peer_id, rep::BAD_MESSAGE);
 							CustomMessageOutcome::None
@@ -1690,7 +1676,7 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 			NotificationsOut::CustomProtocolReplaced { peer_id, notifications_sink, set_id } =>
 				if set_id == HARDCODED_PEERSETS_SYNC {
 					CustomMessageOutcome::None
-				} else if self.bad_handshake_substreams.contains(&(peer_id.clone(), set_id)) {
+				} else if self.bad_handshake_substreams.contains(&(peer_id, set_id)) {
 					CustomMessageOutcome::None
 				} else {
 					CustomMessageOutcome::NotificationStreamReplaced {
@@ -1704,7 +1690,7 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 			NotificationsOut::CustomProtocolClosed { peer_id, set_id } => {
 				// Set number 0 is hardcoded the default set of peers we sync from.
 				if set_id == HARDCODED_PEERSETS_SYNC {
-					if self.on_sync_peer_disconnected(peer_id.clone()).is_ok() {
+					if self.on_sync_peer_disconnected(peer_id).is_ok() {
 						CustomMessageOutcome::SyncDisconnected(peer_id)
 					} else {
 						log::trace!(
@@ -1714,7 +1700,7 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 						);
 						CustomMessageOutcome::None
 					}
-				} else if self.bad_handshake_substreams.remove(&(peer_id.clone(), set_id)) {
+				} else if self.bad_handshake_substreams.remove(&(peer_id, set_id)) {
 					// The substream that has just been closed had been opened with a bad
 					// handshake. The outer layers have never received an opening event about this
 					// substream, and consequently shouldn't receive a closing event either.
@@ -1753,7 +1739,7 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 					);
 					CustomMessageOutcome::None
 				},
-				_ if self.bad_handshake_substreams.contains(&(peer_id.clone(), set_id)) =>
+				_ if self.bad_handshake_substreams.contains(&(peer_id, set_id)) =>
 					CustomMessageOutcome::None,
 				_ => {
 					let protocol_name = self.notification_protocols
diff --git a/client/network/src/protocol/event.rs b/client/network/src/protocol/event.rs
index df56f426ad1f..e0b35647c753 100644
--- a/client/network/src/protocol/event.rs
+++ b/client/network/src/protocol/event.rs
@@ -117,6 +117,6 @@ pub enum ObservedRole {
 impl ObservedRole {
 	/// Returns `true` for `ObservedRole::Light`.
 	pub fn is_light(&self) -> bool {
-		matches!(self, ObservedRole::Light)
+		matches!(self, Self::Light)
 	}
 }
diff --git a/client/network/src/protocol/message.rs b/client/network/src/protocol/message.rs
index 1ffc57de181c..8938c27aeddd 100644
--- a/client/network/src/protocol/message.rs
+++ b/client/network/src/protocol/message.rs
@@ -85,7 +85,7 @@ impl BlockAttributes {
 
 	/// Decodes attributes, encoded with the `encode_to_be_u32()` call.
 	pub fn from_be_u32(encoded: u32) -> Result<Self, Error> {
-		BlockAttributes::from_bits(encoded.to_be_bytes()[0])
+		Self::from_bits(encoded.to_be_bytes()[0])
 			.ok_or_else(|| Error::from("Invalid BlockAttributes"))
 	}
 }
@@ -187,12 +187,12 @@ pub mod generic {
 	impl Roles {
 		/// Does this role represents a client that holds full chain data locally?
 		pub fn is_full(&self) -> bool {
-			self.intersects(Roles::FULL | Roles::AUTHORITY)
+			self.intersects(Self::FULL | Self::AUTHORITY)
 		}
 
 		/// Does this role represents a client that does not participates in the consensus?
 		pub fn is_authority(&self) -> bool {
-			*self == Roles::AUTHORITY
+			*self == Self::AUTHORITY
 		}
 
 		/// Does this role represents a client that does not hold full chain data locally?
@@ -204,9 +204,9 @@ pub mod generic {
 	impl<'a> From<&'a crate::config::Role> for Roles {
 		fn from(roles: &'a crate::config::Role) -> Self {
 			match roles {
-				crate::config::Role::Full => Roles::FULL,
-				crate::config::Role::Light => Roles::LIGHT,
-				crate::config::Role::Authority { .. } => Roles::AUTHORITY,
+				crate::config::Role::Full => Self::FULL,
+				crate::config::Role::Light => Self::LIGHT,
+				crate::config::Role::Authority { .. } => Self::AUTHORITY,
 			}
 		}
 	}
@@ -368,7 +368,7 @@ pub mod generic {
 				genesis_hash,
 			} = compact;
 
-			Ok(Status {
+			Ok(Self {
 				version,
 				min_supported_version,
 				roles,
@@ -438,7 +438,7 @@ pub mod generic {
 			let header = H::decode(input)?;
 			let state = BlockState::decode(input).ok();
 			let data = Vec::decode(input).ok();
-			Ok(BlockAnnounce { header, state, data })
+			Ok(Self { header, state, data })
 		}
 	}
 
diff --git a/client/network/src/protocol/notifications/behaviour.rs b/client/network/src/protocol/notifications/behaviour.rs
index 1cc63872673c..da2967d6f26e 100644
--- a/client/network/src/protocol/notifications/behaviour.rs
+++ b/client/network/src/protocol/notifications/behaviour.rs
@@ -32,6 +32,7 @@ use libp2p::{
 use log::{error, trace, warn};
 use parking_lot::RwLock;
 use rand::distributions::{Distribution as _, Uniform};
+use sc_peerset::DropReason;
 use smallvec::SmallVec;
 use std::{
 	borrow::Cow,
@@ -242,35 +243,22 @@ impl PeerState {
 	/// that is open for custom protocol traffic.
 	fn get_open(&self) -> Option<&NotificationsSink> {
 		match self {
-			PeerState::Enabled { connections, .. } => connections
-				.iter()
-				.filter_map(|(_, s)| match s {
-					ConnectionState::Open(s) => Some(s),
-					_ => None,
-				})
-				.next(),
-			PeerState::Poisoned => None,
-			PeerState::Backoff { .. } => None,
-			PeerState::PendingRequest { .. } => None,
-			PeerState::Requested => None,
-			PeerState::Disabled { .. } => None,
-			PeerState::DisabledPendingEnable { .. } => None,
-			PeerState::Incoming { .. } => None,
+			Self::Enabled { connections, .. } => connections.iter().find_map(|(_, s)| match s {
+				ConnectionState::Open(s) => Some(s),
+				_ => None,
+			}),
+			_ => None,
 		}
 	}
 
 	/// True if that node has been requested by the PSM.
 	fn is_requested(&self) -> bool {
-		match self {
-			PeerState::Poisoned => false,
-			PeerState::Backoff { .. } => false,
-			PeerState::PendingRequest { .. } => true,
-			PeerState::Requested => true,
-			PeerState::Disabled { .. } => false,
-			PeerState::DisabledPendingEnable { .. } => true,
-			PeerState::Enabled { .. } => true,
-			PeerState::Incoming { .. } => false,
-		}
+		matches!(
+			self,
+			Self::PendingRequest { .. } |
+				Self::Requested | Self::DisabledPendingEnable { .. } |
+				Self::Enabled { .. }
+		)
 	}
 }
 
@@ -391,7 +379,7 @@ impl Notifications {
 
 		assert!(!notif_protocols.is_empty());
 
-		Notifications {
+		Self {
 			notif_protocols,
 			peerset,
 			peers: FnvHashMap::default(),
@@ -446,8 +434,7 @@ impl Notifications {
 		set_id: sc_peerset::SetId,
 		ban: Option<Duration>,
 	) {
-		let mut entry = if let Entry::Occupied(entry) = self.peers.entry((peer_id.clone(), set_id))
-		{
+		let mut entry = if let Entry::Occupied(entry) = self.peers.entry((*peer_id, set_id)) {
 			entry
 		} else {
 			return
@@ -463,7 +450,7 @@ impl Notifications {
 			// DisabledPendingEnable => Disabled.
 			PeerState::DisabledPendingEnable { connections, timer_deadline, timer: _ } => {
 				trace!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
-				self.peerset.dropped(set_id, peer_id.clone(), sc_peerset::DropReason::Unknown);
+				self.peerset.dropped(set_id, *peer_id, DropReason::Unknown);
 				let backoff_until = Some(if let Some(ban) = ban {
 					cmp::max(timer_deadline, Instant::now() + ban)
 				} else {
@@ -477,12 +464,12 @@ impl Notifications {
 			// If relevant, the external API is instantly notified.
 			PeerState::Enabled { mut connections } => {
 				trace!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
-				self.peerset.dropped(set_id, peer_id.clone(), sc_peerset::DropReason::Unknown);
+				self.peerset.dropped(set_id, *peer_id, DropReason::Unknown);
 
 				if connections.iter().any(|(_, s)| matches!(s, ConnectionState::Open(_))) {
 					trace!(target: "sub-libp2p", "External API <= Closed({}, {:?})", peer_id, set_id);
 					let event =
-						NotificationsOut::CustomProtocolClosed { peer_id: peer_id.clone(), set_id };
+						NotificationsOut::CustomProtocolClosed { peer_id: *peer_id, set_id };
 					self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
 				}
 
@@ -491,7 +478,7 @@ impl Notifications {
 				{
 					trace!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close({:?})", peer_id, *connec_id, set_id);
 					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
-						peer_id: peer_id.clone(),
+						peer_id: *peer_id,
 						handler: NotifyHandler::One(*connec_id),
 						event: NotifsHandlerIn::Close { protocol_index: set_id.into() },
 					});
@@ -503,7 +490,7 @@ impl Notifications {
 				{
 					trace!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close({:?})", peer_id, *connec_id, set_id);
 					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
-						peer_id: peer_id.clone(),
+						peer_id: *peer_id,
 						handler: NotifyHandler::One(*connec_id),
 						event: NotifsHandlerIn::Close { protocol_index: set_id.into() },
 					});
@@ -531,8 +518,10 @@ impl Notifications {
 				{
 					inc
 				} else {
-					error!(target: "sub-libp2p", "State mismatch in libp2p: no entry in \
-						incoming for incoming peer");
+					error!(
+						target: "sub-libp2p",
+						"State mismatch in libp2p: no entry in incoming for incoming peer"
+					);
 					return
 				};
 
@@ -544,7 +533,7 @@ impl Notifications {
 				{
 					trace!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close({:?})", peer_id, *connec_id, set_id);
 					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
-						peer_id: peer_id.clone(),
+						peer_id: *peer_id,
 						handler: NotifyHandler::One(*connec_id),
 						event: NotifsHandlerIn::Close { protocol_index: set_id.into() },
 					});
@@ -605,12 +594,13 @@ impl Notifications {
 		set_id: sc_peerset::SetId,
 		message: impl Into<Vec<u8>>,
 	) {
-		let notifs_sink = match self.peers.get(&(target.clone(), set_id)).and_then(|p| p.get_open())
-		{
+		let notifs_sink = match self.peers.get(&(*target, set_id)).and_then(|p| p.get_open()) {
 			None => {
-				trace!(target: "sub-libp2p",
+				trace!(
+					target: "sub-libp2p",
 					"Tried to sent notification to {:?} without an open channel.",
-					target);
+					target,
+				);
 				return
 			},
 			Some(sink) => sink,
@@ -638,12 +628,16 @@ impl Notifications {
 	/// Function that is called when the peerset wants us to connect to a peer.
 	fn peerset_report_connect(&mut self, peer_id: PeerId, set_id: sc_peerset::SetId) {
 		// If `PeerId` is unknown to us, insert an entry, start dialing, and return early.
-		let mut occ_entry = match self.peers.entry((peer_id.clone(), set_id)) {
+		let mut occ_entry = match self.peers.entry((peer_id, set_id)) {
 			Entry::Occupied(entry) => entry,
 			Entry::Vacant(entry) => {
 				// If there's no entry in `self.peers`, start dialing.
-				trace!(target: "sub-libp2p", "PSM => Connect({}, {:?}): Starting to connect",
-					entry.key().0, set_id);
+				trace!(
+					target: "sub-libp2p",
+					"PSM => Connect({}, {:?}): Starting to connect",
+					entry.key().0,
+					set_id,
+				);
 				trace!(target: "sub-libp2p", "Libp2p <= Dial {}", entry.key().0);
 				// The `DialPeerCondition` ensures that dial attempts are de-duplicated
 				self.events.push_back(NetworkBehaviourAction::DialPeer {
@@ -661,16 +655,25 @@ impl Notifications {
 			// Backoff (not expired) => PendingRequest
 			PeerState::Backoff { ref timer, ref timer_deadline } if *timer_deadline > now => {
 				let peer_id = occ_entry.key().0.clone();
-				trace!(target: "sub-libp2p", "PSM => Connect({}, {:?}): Will start to connect at \
-					until {:?}", peer_id, set_id, timer_deadline);
+				trace!(
+					target: "sub-libp2p",
+					"PSM => Connect({}, {:?}): Will start to connect at until {:?}",
+					peer_id,
+					set_id,
+					timer_deadline,
+				);
 				*occ_entry.into_mut() =
 					PeerState::PendingRequest { timer: *timer, timer_deadline: *timer_deadline };
 			},
 
 			// Backoff (expired) => Requested
 			PeerState::Backoff { .. } => {
-				trace!(target: "sub-libp2p", "PSM => Connect({}, {:?}): Starting to connect",
-					occ_entry.key().0, set_id);
+				trace!(
+					target: "sub-libp2p",
+					"PSM => Connect({}, {:?}): Starting to connect",
+					occ_entry.key().0,
+					set_id,
+				);
 				trace!(target: "sub-libp2p", "Libp2p <= Dial {:?}", occ_entry.key());
 				// The `DialPeerCondition` ensures that dial attempts are de-duplicated
 				self.events.push_back(NetworkBehaviourAction::DialPeer {
@@ -685,8 +688,13 @@ impl Notifications {
 				if *backoff > now =>
 			{
 				let peer_id = occ_entry.key().0.clone();
-				trace!(target: "sub-libp2p", "PSM => Connect({}, {:?}): But peer is backed-off until {:?}",
-					peer_id, set_id, backoff);
+				trace!(
+					target: "sub-libp2p",
+					"PSM => Connect({}, {:?}): But peer is backed-off until {:?}",
+					peer_id,
+					set_id,
+					backoff,
+				);
 
 				let delay_id = self.next_delay_id;
 				self.next_delay_id.0 += 1;
@@ -720,7 +728,7 @@ impl Notifications {
 						occ_entry.key().0, set_id);
 					trace!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open({:?})", peer_id, *connec_id, set_id);
 					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
-						peer_id: peer_id.clone(),
+						peer_id,
 						handler: NotifyHandler::One(*connec_id),
 						event: NotifsHandlerIn::Open { protocol_index: set_id.into() },
 					});
@@ -778,8 +786,10 @@ impl Notifications {
 				{
 					inc.alive = false;
 				} else {
-					error!(target: "sub-libp2p", "State mismatch in libp2p: no entry in \
-						incoming for incoming peer")
+					error!(
+						target: "sub-libp2p",
+						"State mismatch in libp2p: no entry in incoming for incoming peer",
+					)
 				}
 
 				debug_assert!(connections
@@ -953,23 +963,19 @@ impl Notifications {
 		if !incoming.alive {
 			trace!(target: "sub-libp2p", "PSM => Accept({:?}, {}, {:?}): Obsolete incoming",
 				index, incoming.peer_id, incoming.set_id);
-			match self.peers.get_mut(&(incoming.peer_id.clone(), incoming.set_id)) {
+			match self.peers.get_mut(&(incoming.peer_id, incoming.set_id)) {
 				Some(PeerState::DisabledPendingEnable { .. }) | Some(PeerState::Enabled { .. }) => {
 				},
 				_ => {
 					trace!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})",
 						incoming.peer_id, incoming.set_id);
-					self.peerset.dropped(
-						incoming.set_id,
-						incoming.peer_id,
-						sc_peerset::DropReason::Unknown,
-					);
+					self.peerset.dropped(incoming.set_id, incoming.peer_id, DropReason::Unknown);
 				},
 			}
 			return
 		}
 
-		let state = match self.peers.get_mut(&(incoming.peer_id.clone(), incoming.set_id)) {
+		let state = match self.peers.get_mut(&(incoming.peer_id, incoming.set_id)) {
 			Some(s) => s,
 			None => {
 				debug_assert!(false);
@@ -993,7 +999,7 @@ impl Notifications {
 					trace!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open({:?})",
 						incoming.peer_id, *connec_id, incoming.set_id);
 					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
-						peer_id: incoming.peer_id.clone(),
+						peer_id: incoming.peer_id,
 						handler: NotifyHandler::One(*connec_id),
 						event: NotifsHandlerIn::Open { protocol_index: incoming.set_id.into() },
 					});
@@ -1029,7 +1035,7 @@ impl Notifications {
 			return
 		}
 
-		let state = match self.peers.get_mut(&(incoming.peer_id.clone(), incoming.set_id)) {
+		let state = match self.peers.get_mut(&(incoming.peer_id, incoming.set_id)) {
 			Some(s) => s,
 			None => {
 				debug_assert!(false);
@@ -1053,7 +1059,7 @@ impl Notifications {
 					trace!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Close({:?})",
 						incoming.peer_id, connec_id, incoming.set_id);
 					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
-						peer_id: incoming.peer_id.clone(),
+						peer_id: incoming.peer_id,
 						handler: NotifyHandler::One(*connec_id),
 						event: NotifsHandlerIn::Close { protocol_index: incoming.set_id.into() },
 					});
@@ -1090,7 +1096,7 @@ impl NetworkBehaviour for Notifications {
 		endpoint: &ConnectedPoint,
 	) {
 		for set_id in (0..self.notif_protocols.len()).map(sc_peerset::SetId::from) {
-			match self.peers.entry((peer_id.clone(), set_id)).or_insert(PeerState::Poisoned) {
+			match self.peers.entry((*peer_id, set_id)).or_insert(PeerState::Poisoned) {
 				// Requested | PendingRequest => Enabled
 				st @ &mut PeerState::Requested | st @ &mut PeerState::PendingRequest { .. } => {
 					trace!(target: "sub-libp2p",
@@ -1099,7 +1105,7 @@ impl NetworkBehaviour for Notifications {
 					);
 					trace!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open({:?})", peer_id, *conn, set_id);
 					self.events.push_back(NetworkBehaviourAction::NotifyHandler {
-						peer_id: peer_id.clone(),
+						peer_id: *peer_id,
 						handler: NotifyHandler::One(*conn),
 						event: NotifsHandlerIn::Open { protocol_index: set_id.into() },
 					});
@@ -1148,9 +1154,7 @@ impl NetworkBehaviour for Notifications {
 		_endpoint: &ConnectedPoint,
 	) {
 		for set_id in (0..self.notif_protocols.len()).map(sc_peerset::SetId::from) {
-			let mut entry = if let Entry::Occupied(entry) =
-				self.peers.entry((peer_id.clone(), set_id))
-			{
+			let mut entry = if let Entry::Occupied(entry) = self.peers.entry((*peer_id, set_id)) {
 				entry
 			} else {
 				error!(target: "sub-libp2p", "inject_connection_closed: State mismatch in the custom protos handler");
@@ -1179,7 +1183,7 @@ impl NetworkBehaviour for Notifications {
 								let delay_id = self.next_delay_id;
 								self.next_delay_id.0 += 1;
 								let delay = futures_timer::Delay::new(until - now);
-								let peer_id = peer_id.clone();
+								let peer_id = *peer_id;
 								self.delays.push(
 									async move {
 										delay.await;
@@ -1219,11 +1223,7 @@ impl NetworkBehaviour for Notifications {
 
 					if connections.is_empty() {
 						trace!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
-						self.peerset.dropped(
-							set_id,
-							peer_id.clone(),
-							sc_peerset::DropReason::Unknown,
-						);
+						self.peerset.dropped(set_id, *peer_id, DropReason::Unknown);
 						*entry.get_mut() = PeerState::Backoff { timer, timer_deadline };
 					} else {
 						*entry.get_mut() =
@@ -1246,9 +1246,9 @@ impl NetworkBehaviour for Notifications {
 					if let Some(pos) = connections.iter().position(|(c, _)| *c == *conn) {
 						connections.remove(pos);
 					} else {
-						debug_assert!(false);
 						error!(target: "sub-libp2p",
 							"inject_connection_closed: State mismatch in the custom protos handler");
+						debug_assert!(false);
 					}
 
 					let no_desired_left = !connections
@@ -1280,7 +1280,7 @@ impl NetworkBehaviour for Notifications {
 								let delay_id = self.next_delay_id;
 								self.next_delay_id.0 += 1;
 								let delay = futures_timer::Delay::new(until - now);
-								let peer_id = peer_id.clone();
+								let peer_id = *peer_id;
 								self.delays.push(
 									async move {
 										delay.await;
@@ -1322,15 +1322,11 @@ impl NetworkBehaviour for Notifications {
 					if let Some(pos) = connections.iter().position(|(c, _)| *c == *conn) {
 						let (_, state) = connections.remove(pos);
 						if let ConnectionState::Open(_) = state {
-							if let Some((replacement_pos, replacement_sink)) = connections
-								.iter()
-								.enumerate()
-								.filter_map(|(num, (_, s))| match s {
+							if let Some((replacement_pos, replacement_sink)) =
+								connections.iter().enumerate().find_map(|(num, (_, s))| match s {
 									ConnectionState::Open(s) => Some((num, s.clone())),
 									_ => None,
-								})
-								.next()
-							{
+								}) {
 								if pos <= replacement_pos {
 									trace!(
 										target: "sub-libp2p",
@@ -1338,7 +1334,7 @@ impl NetworkBehaviour for Notifications {
 										peer_id, set_id
 									);
 									let event = NotificationsOut::CustomProtocolReplaced {
-										peer_id: peer_id.clone(),
+										peer_id: *peer_id,
 										set_id,
 										notifications_sink: replacement_sink,
 									};
@@ -1351,7 +1347,7 @@ impl NetworkBehaviour for Notifications {
 									peer_id, set_id
 								);
 								let event = NotificationsOut::CustomProtocolClosed {
-									peer_id: peer_id.clone(),
+									peer_id: *peer_id,
 									set_id,
 								};
 								self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
@@ -1365,17 +1361,13 @@ impl NetworkBehaviour for Notifications {
 
 					if connections.is_empty() {
 						trace!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
-						self.peerset.dropped(
-							set_id,
-							peer_id.clone(),
-							sc_peerset::DropReason::Unknown,
-						);
+						self.peerset.dropped(set_id, *peer_id, DropReason::Unknown);
 						let ban_dur = Uniform::new(5, 10).sample(&mut rand::thread_rng());
 
 						let delay_id = self.next_delay_id;
 						self.next_delay_id.0 += 1;
 						let delay = futures_timer::Delay::new(Duration::from_secs(ban_dur));
-						let peer_id = peer_id.clone();
+						let peer_id = *peer_id;
 						self.delays.push(
 							async move {
 								delay.await;
@@ -1392,11 +1384,7 @@ impl NetworkBehaviour for Notifications {
 						matches!(s, ConnectionState::Opening | ConnectionState::Open(_))
 					}) {
 						trace!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
-						self.peerset.dropped(
-							set_id,
-							peer_id.clone(),
-							sc_peerset::DropReason::Unknown,
-						);
+						self.peerset.dropped(set_id, *peer_id, DropReason::Unknown);
 
 						*entry.get_mut() = PeerState::Disabled { connections, backoff_until: None };
 					} else {
@@ -1446,11 +1434,7 @@ impl NetworkBehaviour for Notifications {
 					// "Basic" situation: we failed to reach a peer that the peerset requested.
 					st @ PeerState::Requested | st @ PeerState::PendingRequest { .. } => {
 						trace!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", peer_id, set_id);
-						self.peerset.dropped(
-							set_id,
-							peer_id.clone(),
-							sc_peerset::DropReason::Unknown,
-						);
+						self.peerset.dropped(set_id, *peer_id, DropReason::Unknown);
 
 						let now = Instant::now();
 						let ban_duration = match st {
@@ -1463,7 +1447,7 @@ impl NetworkBehaviour for Notifications {
 						let delay_id = self.next_delay_id;
 						self.next_delay_id.0 += 1;
 						let delay = futures_timer::Delay::new(ban_duration);
-						let peer_id = peer_id.clone();
+						let peer_id = *peer_id;
 						self.delays.push(
 							async move {
 								delay.await;
@@ -1505,14 +1489,16 @@ impl NetworkBehaviour for Notifications {
 					"Handler({:?}, {:?}]) => OpenDesiredByRemote({:?})",
 					source, connection, set_id);
 
-				let mut entry =
-					if let Entry::Occupied(entry) = self.peers.entry((source.clone(), set_id)) {
-						entry
-					} else {
-						error!(target: "sub-libp2p", "OpenDesiredByRemote: State mismatch in the custom protos handler");
-						debug_assert!(false);
-						return
-					};
+				let mut entry = if let Entry::Occupied(entry) = self.peers.entry((source, set_id)) {
+					entry
+				} else {
+					error!(
+						target: "sub-libp2p",
+						"OpenDesiredByRemote: State mismatch in the custom protos handler"
+					);
+					debug_assert!(false);
+					return
+				};
 
 				match mem::replace(entry.get_mut(), PeerState::Poisoned) {
 					// Incoming => Incoming
@@ -1601,9 +1587,9 @@ impl NetworkBehaviour for Notifications {
 
 								trace!(target: "sub-libp2p", "PSM <= Incoming({}, {:?}).",
 									source, incoming_id);
-								self.peerset.incoming(set_id, source.clone(), incoming_id);
+								self.peerset.incoming(set_id, source, incoming_id);
 								self.incoming.push(IncomingPeer {
-									peer_id: source.clone(),
+									peer_id: source,
 									set_id,
 									alive: true,
 									incoming_id,
@@ -1641,7 +1627,7 @@ impl NetworkBehaviour for Notifications {
 								trace!(target: "sub-libp2p", "Handler({:?}, {:?}) <= Open({:?})",
 									source, connection, set_id);
 								self.events.push_back(NetworkBehaviourAction::NotifyHandler {
-									peer_id: source.clone(),
+									peer_id: source,
 									handler: NotifyHandler::One(connection),
 									event: NotifsHandlerIn::Open { protocol_index: set_id.into() },
 								});
@@ -1689,14 +1675,13 @@ impl NetworkBehaviour for Notifications {
 					"Handler({}, {:?}) => CloseDesired({:?})",
 					source, connection, set_id);
 
-				let mut entry =
-					if let Entry::Occupied(entry) = self.peers.entry((source.clone(), set_id)) {
-						entry
-					} else {
-						error!(target: "sub-libp2p", "CloseDesired: State mismatch in the custom protos handler");
-						debug_assert!(false);
-						return
-					};
+				let mut entry = if let Entry::Occupied(entry) = self.peers.entry((source, set_id)) {
+					entry
+				} else {
+					error!(target: "sub-libp2p", "CloseDesired: State mismatch in the custom protos handler");
+					debug_assert!(false);
+					return
+				};
 
 				match mem::replace(entry.get_mut(), PeerState::Poisoned) {
 					// Enabled => Enabled | Disabled
@@ -1727,20 +1712,16 @@ impl NetworkBehaviour for Notifications {
 
 						trace!(target: "sub-libp2p", "Handler({}, {:?}) <= Close({:?})", source, connection, set_id);
 						self.events.push_back(NetworkBehaviourAction::NotifyHandler {
-							peer_id: source.clone(),
+							peer_id: source,
 							handler: NotifyHandler::One(connection),
 							event: NotifsHandlerIn::Close { protocol_index: set_id.into() },
 						});
 
-						if let Some((replacement_pos, replacement_sink)) = connections
-							.iter()
-							.enumerate()
-							.filter_map(|(num, (_, s))| match s {
+						if let Some((replacement_pos, replacement_sink)) =
+							connections.iter().enumerate().find_map(|(num, (_, s))| match s {
 								ConnectionState::Open(s) => Some((num, s.clone())),
 								_ => None,
-							})
-							.next()
-						{
+							}) {
 							if pos <= replacement_pos {
 								trace!(target: "sub-libp2p", "External API <= Sink replaced({:?})", source);
 								let event = NotificationsOut::CustomProtocolReplaced {
@@ -1759,11 +1740,7 @@ impl NetworkBehaviour for Notifications {
 								.any(|(_, s)| matches!(s, ConnectionState::Opening))
 							{
 								trace!(target: "sub-libp2p", "PSM <= Dropped({}, {:?})", source, set_id);
-								self.peerset.dropped(
-									set_id,
-									source.clone(),
-									sc_peerset::DropReason::Refused,
-								);
+								self.peerset.dropped(set_id, source, DropReason::Refused);
 								*entry.into_mut() =
 									PeerState::Disabled { connections, backoff_until: None };
 							} else {
@@ -1838,7 +1815,7 @@ impl NetworkBehaviour for Notifications {
 					"Handler({}, {:?}) => OpenResultOk({:?})",
 					source, connection, set_id);
 
-				match self.peers.get_mut(&(source.clone(), set_id)) {
+				match self.peers.get_mut(&(source, set_id)) {
 					Some(PeerState::Enabled { connections, .. }) => {
 						debug_assert!(connections.iter().any(|(_, s)| matches!(
 							s,
@@ -1868,9 +1845,9 @@ impl NetworkBehaviour for Notifications {
 							}) {
 							*connec_state = ConnectionState::Closing;
 						} else {
-							debug_assert!(false);
 							error!(target: "sub-libp2p",
 								"OpenResultOk State mismatch in the custom protos handler");
+							debug_assert!(false);
 						}
 					},
 
@@ -1904,15 +1881,13 @@ impl NetworkBehaviour for Notifications {
 					"Handler({:?}, {:?}) => OpenResultErr({:?})",
 					source, connection, set_id);
 
-				let mut entry =
-					if let Entry::Occupied(entry) = self.peers.entry((source.clone(), set_id)) {
-						entry
-					} else {
-						error!(target: "sub-libp2p", "OpenResultErr: State mismatch in the custom protos handler");
-						debug_assert!(false);
-						debug_assert!(false);
-						return
-					};
+				let mut entry = if let Entry::Occupied(entry) = self.peers.entry((source, set_id)) {
+					entry
+				} else {
+					error!(target: "sub-libp2p", "OpenResultErr: State mismatch in the custom protos handler");
+					debug_assert!(false);
+					return
+				};
 
 				match mem::replace(entry.get_mut(), PeerState::Poisoned) {
 					PeerState::Enabled { mut connections } => {
@@ -1940,11 +1915,7 @@ impl NetworkBehaviour for Notifications {
 							matches!(s, ConnectionState::Opening | ConnectionState::Open(_))
 						}) {
 							trace!(target: "sub-libp2p", "PSM <= Dropped({:?})", source);
-							self.peerset.dropped(
-								set_id,
-								source.clone(),
-								sc_peerset::DropReason::Refused,
-							);
+							self.peerset.dropped(set_id, source, DropReason::Refused);
 
 							let ban_dur = Uniform::new(5, 10).sample(&mut rand::thread_rng());
 							*entry.into_mut() = PeerState::Disabled {
@@ -2002,8 +1973,12 @@ impl NetworkBehaviour for Notifications {
 						set_id,
 						message.len()
 					);
-					trace!(target: "sub-libp2p", "External API <= Message({}, {:?})",
-						source, set_id);
+					trace!(
+						target: "sub-libp2p",
+						"External API <= Message({}, {:?})",
+						source,
+						set_id,
+					);
 					let event = NotificationsOut::Notification { peer_id: source, set_id, message };
 
 					self.events.push_back(NetworkBehaviourAction::GenerateEvent(event));
@@ -2057,7 +2032,7 @@ impl NetworkBehaviour for Notifications {
 		while let Poll::Ready(Some((delay_id, peer_id, set_id))) =
 			Pin::new(&mut self.delays).poll_next(cx)
 		{
-			let peer_state = match self.peers.get_mut(&(peer_id.clone(), set_id)) {
+			let peer_state = match self.peers.get_mut(&(peer_id, set_id)) {
 				Some(s) => s,
 				// We intentionally never remove elements from `delays`, and it may
 				// thus contain peers which are now gone. This is a normal situation.
@@ -2090,7 +2065,7 @@ impl NetworkBehaviour for Notifications {
 						trace!(target: "sub-libp2p", "Handler({}, {:?}) <= Open({:?}) (ban expired)",
 							peer_id, *connec_id, set_id);
 						self.events.push_back(NetworkBehaviourAction::NotifyHandler {
-							peer_id: peer_id.clone(),
+							peer_id,
 							handler: NotifyHandler::One(*connec_id),
 							event: NotifsHandlerIn::Open { protocol_index: set_id.into() },
 						});
diff --git a/client/network/src/protocol/notifications/handler.rs b/client/network/src/protocol/notifications/handler.rs
index 9d063eb5b1be..a0c49fa592b2 100644
--- a/client/network/src/protocol/notifications/handler.rs
+++ b/client/network/src/protocol/notifications/handler.rs
@@ -256,7 +256,7 @@ impl IntoProtocolsHandler for NotifsHandlerProto {
 					Protocol { config, in_upgrade, state: State::Closed { pending_opening: false } }
 				})
 				.collect(),
-			peer_id: peer_id.clone(),
+			peer_id: *peer_id,
 			endpoint: connected_point.clone(),
 			when_connection_open: Instant::now(),
 			events_queue: VecDeque::with_capacity(16),
@@ -463,7 +463,7 @@ impl NotifsHandlerProto {
 	/// is always the same whether we open a substream ourselves or respond to handshake from
 	/// the remote.
 	pub fn new(list: impl Into<Vec<ProtocolConfig>>) -> Self {
-		NotifsHandlerProto { protocols: list.into() }
+		Self { protocols: list.into() }
 	}
 }
 
@@ -552,7 +552,7 @@ impl ProtocolsHandler for NotifsHandler {
 				let (sync_tx, sync_rx) = mpsc::channel(SYNC_NOTIFICATIONS_BUFFER_SIZE);
 				let notifications_sink = NotificationsSink {
 					inner: Arc::new(NotificationsSinkInner {
-						peer_id: self.peer_id.clone(),
+						peer_id: self.peer_id,
 						async_channel: FuturesMutex::new(async_tx),
 						sync_channel: Mutex::new(sync_tx),
 					}),
diff --git a/client/network/src/protocol/notifications/upgrade/collec.rs b/client/network/src/protocol/notifications/upgrade/collec.rs
index 8a2a7f794202..2462d2becf4b 100644
--- a/client/network/src/protocol/notifications/upgrade/collec.rs
+++ b/client/network/src/protocol/notifications/upgrade/collec.rs
@@ -34,13 +34,13 @@ pub struct UpgradeCollec<T>(pub Vec<T>);
 
 impl<T> From<Vec<T>> for UpgradeCollec<T> {
 	fn from(list: Vec<T>) -> Self {
-		UpgradeCollec(list)
+		Self(list)
 	}
 }
 
 impl<T> FromIterator<T> for UpgradeCollec<T> {
 	fn from_iter<I: IntoIterator<Item = T>>(iter: I) -> Self {
-		UpgradeCollec(iter.into_iter().collect())
+		Self(iter.into_iter().collect())
 	}
 }
 
diff --git a/client/network/src/protocol/notifications/upgrade/notifications.rs b/client/network/src/protocol/notifications/upgrade/notifications.rs
index 068b92c0685b..997a1ccf1dec 100644
--- a/client/network/src/protocol/notifications/upgrade/notifications.rs
+++ b/client/network/src/protocol/notifications/upgrade/notifications.rs
@@ -38,7 +38,7 @@ use asynchronous_codec::Framed;
 use bytes::BytesMut;
 use futures::prelude::*;
 use libp2p::core::{upgrade, InboundUpgrade, OutboundUpgrade, UpgradeInfo};
-use log::error;
+use log::{error, warn};
 use std::{
 	borrow::Cow,
 	convert::{Infallible, TryFrom as _},
@@ -121,7 +121,7 @@ impl NotificationsIn {
 		let mut protocol_names = fallback_names;
 		protocol_names.insert(0, main_protocol_name.into());
 
-		NotificationsIn { protocol_names, max_notification_size }
+		Self { protocol_names, max_notification_size }
 	}
 }
 
@@ -347,7 +347,7 @@ impl NotificationsOut {
 		let mut protocol_names = fallback_names;
 		protocol_names.insert(0, main_protocol_name.into());
 
-		NotificationsOut { protocol_names, initial_message, max_notification_size }
+		Self { protocol_names, initial_message, max_notification_size }
 	}
 }
 
@@ -478,12 +478,11 @@ pub enum NotificationsHandshakeError {
 impl From<unsigned_varint::io::ReadError> for NotificationsHandshakeError {
 	fn from(err: unsigned_varint::io::ReadError) -> Self {
 		match err {
-			unsigned_varint::io::ReadError::Io(err) => NotificationsHandshakeError::Io(err),
-			unsigned_varint::io::ReadError::Decode(err) =>
-				NotificationsHandshakeError::VarintDecode(err),
+			unsigned_varint::io::ReadError::Io(err) => Self::Io(err),
+			unsigned_varint::io::ReadError::Decode(err) => Self::VarintDecode(err),
 			_ => {
-				log::warn!("Unrecognized varint decoding error");
-				NotificationsHandshakeError::Io(From::from(io::ErrorKind::InvalidData))
+				warn!("Unrecognized varint decoding error");
+				Self::Io(From::from(io::ErrorKind::InvalidData))
 			},
 		}
 	}
diff --git a/client/network/src/protocol/sync.rs b/client/network/src/protocol/sync.rs
index b10a3d72138b..07f5f76fce7f 100644
--- a/client/network/src/protocol/sync.rs
+++ b/client/network/src/protocol/sync.rs
@@ -148,40 +148,37 @@ enum PendingRequests {
 
 impl PendingRequests {
 	fn add(&mut self, id: &PeerId) {
-		match self {
-			PendingRequests::Some(set) => {
-				set.insert(id.clone());
-			},
-			PendingRequests::All => {},
+		if let Self::Some(ref mut set) = self {
+			set.insert(*id);
 		}
 	}
 
-	fn take(&mut self) -> PendingRequests {
+	fn take(&mut self) -> Self {
 		std::mem::take(self)
 	}
 
 	fn set_all(&mut self) {
-		*self = PendingRequests::All;
+		*self = Self::All;
 	}
 
 	fn contains(&self, id: &PeerId) -> bool {
 		match self {
-			PendingRequests::Some(set) => set.contains(id),
-			PendingRequests::All => true,
+			Self::Some(set) => set.contains(id),
+			Self::All => true,
 		}
 	}
 
 	fn is_empty(&self) -> bool {
 		match self {
-			PendingRequests::Some(set) => set.is_empty(),
-			PendingRequests::All => false,
+			Self::Some(set) => set.is_empty(),
+			Self::All => false,
 		}
 	}
 }
 
 impl Default for PendingRequests {
 	fn default() -> Self {
-		PendingRequests::Some(HashSet::default())
+		Self::Some(HashSet::default())
 	}
 }
 
@@ -343,10 +340,10 @@ pub enum WarpSyncPhase {
 impl fmt::Display for WarpSyncPhase {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		match self {
-			WarpSyncPhase::AwaitingPeers => write!(f, "Waiting for peers"),
-			WarpSyncPhase::DownloadingWarpProofs => write!(f, "Downloading finality proofs"),
-			WarpSyncPhase::DownloadingState => write!(f, "Downloading state"),
-			WarpSyncPhase::ImportingState => write!(f, "Importing state"),
+			Self::AwaitingPeers => write!(f, "Waiting for peers"),
+			Self::DownloadingWarpProofs => write!(f, "Downloading finality proofs"),
+			Self::DownloadingState => write!(f, "Downloading state"),
+			Self::ImportingState => write!(f, "Importing state"),
 		}
 	}
 }
@@ -538,7 +535,7 @@ impl<B: BlockT> ChainSync<B> {
 		max_parallel_downloads: u32,
 		warp_sync_provider: Option<Arc<dyn WarpSyncProvider<B>>>,
 	) -> Result<Self, ClientError> {
-		let mut sync = ChainSync {
+		let mut sync = Self {
 			client,
 			peers: HashMap::new(),
 			blocks: BlockCollection::new(),
@@ -732,7 +729,7 @@ impl<B: BlockT> ChainSync<B> {
 
 				self.pending_requests.add(&who);
 				self.peers.insert(
-					who.clone(),
+					who,
 					PeerSync {
 						peer_id: who,
 						common_number: Zero::zero(),
@@ -754,9 +751,9 @@ impl<B: BlockT> ChainSync<B> {
 					best_number,
 				);
 				self.peers.insert(
-					who.clone(),
+					who,
 					PeerSync {
-						peer_id: who.clone(),
+						peer_id: who,
 						common_number: std::cmp::min(self.best_queued_number, best_number),
 						best_hash,
 						best_number,
@@ -835,7 +832,7 @@ impl<B: BlockT> ChainSync<B> {
 		}
 
 		self.fork_targets
-			.entry(hash.clone())
+			.entry(*hash)
 			.or_insert_with(|| ForkTarget { number, peers: Default::default(), parent_hash: None })
 			.peers
 			.extend(peers);
@@ -972,7 +969,7 @@ impl<B: BlockT> ChainSync<B> {
 					trace!(target: "sync", "New StateRequest for {}", id);
 					peer.state = PeerSyncState::DownloadingState;
 					let request = sync.next_request();
-					return Some((id.clone(), request))
+					return Some((*id, request))
 				}
 			}
 		}
@@ -987,7 +984,7 @@ impl<B: BlockT> ChainSync<B> {
 					if peer.state.is_available() && peer.best_number >= target {
 						trace!(target: "sync", "New StateRequest for {}", id);
 						peer.state = PeerSyncState::DownloadingState;
-						return Some((id.clone(), request))
+						return Some((*id, request))
 					}
 				}
 			}
@@ -1019,7 +1016,7 @@ impl<B: BlockT> ChainSync<B> {
 						if peer.state.is_available() && peer.best_number >= median {
 							trace!(target: "sync", "New WarpProofRequest for {}", id);
 							peer.state = PeerSyncState::DownloadingWarpProof;
-							return Some((id.clone(), request))
+							return Some((*id, request))
 						}
 					}
 				}
@@ -1068,7 +1065,7 @@ impl<B: BlockT> ChainSync<B> {
 						peer.state = PeerSyncState::Available;
 						if blocks.is_empty() {
 							debug!(target: "sync", "Empty block response from {}", who);
-							return Err(BadPeer(who.clone(), rep::NO_BLOCK))
+							return Err(BadPeer(*who, rep::NO_BLOCK))
 						}
 						validate_blocks::<B>(&blocks, who, Some(request))?;
 						blocks
@@ -1083,7 +1080,7 @@ impl<B: BlockT> ChainSync<B> {
 									body: b.body,
 									indexed_body: None,
 									justifications,
-									origin: Some(who.clone()),
+									origin: Some(*who),
 									allow_missing_state: true,
 									import_existing: self.import_existing,
 									skip_execution: self.skip_execution(),
@@ -1110,7 +1107,7 @@ impl<B: BlockT> ChainSync<B> {
 									"Invalid response when searching for ancestor from {}",
 									who,
 								);
-								return Err(BadPeer(who.clone(), rep::UNKNOWN_ANCESTOR))
+								return Err(BadPeer(*who, rep::UNKNOWN_ANCESTOR))
 							},
 							(_, Err(e)) => {
 								info!(
@@ -1118,7 +1115,7 @@ impl<B: BlockT> ChainSync<B> {
 									"❌ Error answering legitimate blockchain query: {:?}",
 									e,
 								);
-								return Err(BadPeer(who.clone(), rep::BLOCKCHAIN_READ_ERROR))
+								return Err(BadPeer(*who, rep::BLOCKCHAIN_READ_ERROR))
 							},
 						};
 						if matching_hash.is_some() {
@@ -1135,7 +1132,7 @@ impl<B: BlockT> ChainSync<B> {
 						}
 						if matching_hash.is_none() && current.is_zero() {
 							trace!(target:"sync", "Ancestry search: genesis mismatch for peer {}", who);
-							return Err(BadPeer(who.clone(), rep::GENESIS_MISMATCH))
+							return Err(BadPeer(*who, rep::GENESIS_MISMATCH))
 						}
 						if let Some((next_state, next_num)) =
 							handle_ancestor_search_state(state, *current, matching_hash.is_some())
@@ -1145,10 +1142,7 @@ impl<B: BlockT> ChainSync<B> {
 								start: *start,
 								state: next_state,
 							};
-							return Ok(OnBlockData::Request(
-								who.clone(),
-								ancestry_request::<B>(next_num),
-							))
+							return Ok(OnBlockData::Request(*who, ancestry_request::<B>(next_num)))
 						} else {
 							// Ancestry search is complete. Check if peer is on a stale fork unknown
 							// to us and add it to sync targets if necessary.
@@ -1172,14 +1166,14 @@ impl<B: BlockT> ChainSync<B> {
 									who,
 								);
 								self.fork_targets
-									.entry(peer.best_hash.clone())
+									.entry(peer.best_hash)
 									.or_insert_with(|| ForkTarget {
 										number: peer.best_number,
 										parent_hash: None,
 										peers: Default::default(),
 									})
 									.peers
-									.insert(who.clone());
+									.insert(*who);
 							}
 							peer.state = PeerSyncState::Available;
 							Vec::new()
@@ -1204,7 +1198,7 @@ impl<B: BlockT> ChainSync<B> {
 							body: b.body,
 							indexed_body: None,
 							justifications,
-							origin: Some(who.clone()),
+							origin: Some(*who),
 							allow_missing_state: true,
 							import_existing: false,
 							skip_execution: true,
@@ -1215,7 +1209,7 @@ impl<B: BlockT> ChainSync<B> {
 			}
 		} else {
 			// We don't know of this peer, so we also did not request anything from it.
-			return Err(BadPeer(who.clone(), rep::NOT_REQUESTED))
+			return Err(BadPeer(*who, rep::NOT_REQUESTED))
 		};
 
 		Ok(self.validate_and_queue_blocks(new_blocks))
@@ -1249,7 +1243,7 @@ impl<B: BlockT> ChainSync<B> {
 			sync.import_state(response)
 		} else {
 			debug!(target: "sync", "Ignored obsolete state response from {}", who);
-			return Err(BadPeer(who.clone(), rep::NOT_REQUESTED))
+			return Err(BadPeer(*who, rep::NOT_REQUESTED))
 		};
 
 		match import_result {
@@ -1274,7 +1268,7 @@ impl<B: BlockT> ChainSync<B> {
 				Ok(OnStateData::Request(who.clone(), request)),
 			state::ImportResult::BadResponse => {
 				debug!(target: "sync", "Bad state data received from {}", who);
-				Err(BadPeer(who.clone(), rep::BAD_BLOCK))
+				Err(BadPeer(*who, rep::BAD_BLOCK))
 			},
 		}
 	}
@@ -1297,17 +1291,17 @@ impl<B: BlockT> ChainSync<B> {
 			sync.import_warp_proof(response)
 		} else {
 			debug!(target: "sync", "Ignored obsolete warp sync response from {}", who);
-			return Err(BadPeer(who.clone(), rep::NOT_REQUESTED))
+			return Err(BadPeer(*who, rep::NOT_REQUESTED))
 		};
 
 		match import_result {
 			warp::WarpProofImportResult::StateRequest(request) =>
-				Ok(OnWarpSyncData::StateRequest(who.clone(), request)),
+				Ok(OnWarpSyncData::StateRequest(*who, request)),
 			warp::WarpProofImportResult::WarpProofRequest(request) =>
-				Ok(OnWarpSyncData::WarpProofRequest(who.clone(), request)),
+				Ok(OnWarpSyncData::WarpProofRequest(*who, request)),
 			warp::WarpProofImportResult::BadResponse => {
 				debug!(target: "sync", "Bad proof data received from {}", who);
-				Err(BadPeer(who.clone(), rep::BAD_BLOCK))
+				Err(BadPeer(*who, rep::BAD_BLOCK))
 			},
 		}
 	}
@@ -1319,7 +1313,11 @@ impl<B: BlockT> ChainSync<B> {
 		let orig_len = new_blocks.len();
 		new_blocks.retain(|b| !self.queue_blocks.contains(&b.hash));
 		if new_blocks.len() != orig_len {
-			debug!(target: "sync", "Ignoring {} blocks that are already queued", orig_len - new_blocks.len());
+			debug!(
+				target: "sync",
+				"Ignoring {} blocks that are already queued",
+				orig_len - new_blocks.len(),
+			);
 		}
 
 		let origin = if self.status().state != SyncState::Downloading {
@@ -1372,7 +1370,10 @@ impl<B: BlockT> ChainSync<B> {
 				if hash != block.hash {
 					warn!(
 						target: "sync",
-						"💔 Invalid block justification provided by {}: requested: {:?} got: {:?}", who, hash, block.hash
+						"💔 Invalid block justification provided by {}: requested: {:?} got: {:?}",
+						who,
+						hash,
+						block.hash,
 					);
 					return Err(BadPeer(who, rep::BAD_JUSTIFICATION))
 				}
@@ -1381,7 +1382,8 @@ impl<B: BlockT> ChainSync<B> {
 			} else {
 				// we might have asked the peer for a justification on a block that we assumed it
 				// had but didn't (regardless of whether it had a justification for it or not).
-				trace!(target: "sync",
+				trace!(
+					target: "sync",
 					"Peer {:?} provided empty response for justification request {:?}",
 					who,
 					hash,
@@ -1441,7 +1443,7 @@ impl<B: BlockT> ChainSync<B> {
 							target: "sync",
 							"Block imported clears all pending justification requests {}: {:?}",
 							number,
-							hash
+							hash,
 						);
 						self.clear_justification_requests();
 					}
@@ -1459,7 +1461,7 @@ impl<B: BlockT> ChainSync<B> {
 					if aux.bad_justification {
 						if let Some(ref peer) = who {
 							warn!("💔 Sent block with bad justification to import");
-							output.push(Err(BadPeer(peer.clone(), rep::BAD_JUSTIFICATION)));
+							output.push(Err(BadPeer(*peer, rep::BAD_JUSTIFICATION)));
 						}
 					}
 
@@ -1934,14 +1936,14 @@ impl<B: BlockT> ChainSync<B> {
 				announce.summary(),
 			);
 			self.fork_targets
-				.entry(hash.clone())
+				.entry(hash)
 				.or_insert_with(|| ForkTarget {
 					number,
 					parent_hash: Some(*announce.header.parent_hash()),
 					peers: Default::default(),
 				})
 				.peers
-				.insert(who.clone());
+				.insert(who);
 		}
 
 		PollBlockAnnounceValidation::Nothing { is_best, who, announce }
@@ -2008,14 +2010,14 @@ impl<B: BlockT> ChainSync<B> {
 	fn reset_sync_start_point(&mut self) -> Result<(), ClientError> {
 		let info = self.client.info();
 		if matches!(self.mode, SyncMode::LightState { .. }) && info.finalized_state.is_some() {
-			log::warn!(
+			warn!(
 				target: "sync",
 				"Can't use fast sync mode with a partially synced database. Reverting to full sync mode."
 			);
 			self.mode = SyncMode::Full;
 		}
 		if matches!(self.mode, SyncMode::Warp) && info.finalized_state.is_some() {
-			log::warn!(
+			warn!(
 				target: "sync",
 				"Can't use warp sync mode with a partially synced database. Reverting to full sync mode."
 			);
@@ -2031,17 +2033,17 @@ impl<B: BlockT> ChainSync<B> {
 				self.import_existing = true;
 				// Latest state is missing, start with the last finalized state or genesis instead.
 				if let Some((hash, number)) = info.finalized_state {
-					log::debug!(target: "sync", "Starting from finalized state #{}", number);
+					debug!(target: "sync", "Starting from finalized state #{}", number);
 					self.best_queued_hash = hash;
 					self.best_queued_number = number;
 				} else {
-					log::debug!(target: "sync", "Restarting from genesis");
+					debug!(target: "sync", "Restarting from genesis");
 					self.best_queued_hash = Default::default();
 					self.best_queued_number = Zero::zero();
 				}
 			}
 		}
-		log::trace!(target: "sync", "Restarted sync at #{} ({:?})", self.best_queued_number, self.best_queued_hash);
+		trace!(target: "sync", "Restarted sync at #{} ({:?})", self.best_queued_number, self.best_queued_hash);
 		Ok(())
 	}
 
@@ -2219,7 +2221,7 @@ fn peer_block_request<B: BlockT>(
 		);
 	}
 	let range = blocks.needed_blocks(
-		id.clone(),
+		*id,
 		MAX_BLOCKS_TO_REQUEST,
 		peer.best_number,
 		peer.common_number,
@@ -2335,7 +2337,7 @@ fn validate_blocks<Block: BlockT>(
 				blocks.len(),
 			);
 
-			return Err(BadPeer(who.clone(), rep::NOT_REQUESTED))
+			return Err(BadPeer(*who, rep::NOT_REQUESTED))
 		}
 
 		let block_header = if request.direction == message::Direction::Descending {
@@ -2358,7 +2360,7 @@ fn validate_blocks<Block: BlockT>(
 				block_header,
 			);
 
-			return Err(BadPeer(who.clone(), rep::NOT_REQUESTED))
+			return Err(BadPeer(*who, rep::NOT_REQUESTED))
 		}
 
 		if request.fields.contains(message::BlockAttributes::HEADER) &&
@@ -2370,7 +2372,7 @@ fn validate_blocks<Block: BlockT>(
 				who,
 			);
 
-			return Err(BadPeer(who.clone(), rep::BAD_RESPONSE))
+			return Err(BadPeer(*who, rep::BAD_RESPONSE))
 		}
 
 		if request.fields.contains(message::BlockAttributes::BODY) &&
@@ -2382,7 +2384,7 @@ fn validate_blocks<Block: BlockT>(
 				who,
 			);
 
-			return Err(BadPeer(who.clone(), rep::BAD_RESPONSE))
+			return Err(BadPeer(*who, rep::BAD_RESPONSE))
 		}
 	}
 
@@ -2397,7 +2399,7 @@ fn validate_blocks<Block: BlockT>(
 					b.hash,
 					hash,
 				);
-				return Err(BadPeer(who.clone(), rep::BAD_BLOCK))
+				return Err(BadPeer(*who, rep::BAD_BLOCK))
 			}
 		}
 		if let (Some(header), Some(body)) = (&b.header, &b.body) {
@@ -2413,7 +2415,7 @@ fn validate_blocks<Block: BlockT>(
 					expected,
 					got,
 				);
-				return Err(BadPeer(who.clone(), rep::BAD_BLOCK))
+				return Err(BadPeer(*who, rep::BAD_BLOCK))
 			}
 		}
 	}
@@ -2457,7 +2459,7 @@ mod test {
 		};
 
 		// add a new peer with the same best block
-		sync.new_peer(peer_id.clone(), a1_hash, a1_number).unwrap();
+		sync.new_peer(peer_id, a1_hash, a1_number).unwrap();
 
 		// and request a justification for the block
 		sync.request_justification(&a1_hash, a1_number);
@@ -2478,10 +2480,7 @@ mod test {
 		// if the peer replies with an empty response (i.e. it doesn't know the block),
 		// the active request should be cleared.
 		assert_eq!(
-			sync.on_block_justification(
-				peer_id.clone(),
-				BlockResponse::<Block> { id: 0, blocks: vec![] }
-			),
+			sync.on_block_justification(peer_id, BlockResponse::<Block> { id: 0, blocks: vec![] }),
 			Ok(OnBlockJustification::Nothing),
 		);
 
diff --git a/client/network/src/protocol/sync/blocks.rs b/client/network/src/protocol/sync/blocks.rs
index e8851b9b2eb7..30ba7ffafeff 100644
--- a/client/network/src/protocol/sync/blocks.rs
+++ b/client/network/src/protocol/sync/blocks.rs
@@ -44,8 +44,8 @@ enum BlockRangeState<B: BlockT> {
 impl<B: BlockT> BlockRangeState<B> {
 	pub fn len(&self) -> NumberFor<B> {
 		match *self {
-			BlockRangeState::Downloading { len, .. } => len,
-			BlockRangeState::Complete(ref blocks) => (blocks.len() as u32).into(),
+			Self::Downloading { len, .. } => len,
+			Self::Complete(ref blocks) => (blocks.len() as u32).into(),
 		}
 	}
 }
@@ -61,7 +61,7 @@ pub struct BlockCollection<B: BlockT> {
 impl<B: BlockT> BlockCollection<B> {
 	/// Create a new instance.
 	pub fn new() -> Self {
-		BlockCollection { blocks: BTreeMap::new(), peer_requests: HashMap::new() }
+		Self { blocks: BTreeMap::new(), peer_requests: HashMap::new() }
 	}
 
 	/// Clear everything.
@@ -90,10 +90,7 @@ impl<B: BlockT> BlockCollection<B> {
 		self.blocks.insert(
 			start,
 			BlockRangeState::Complete(
-				blocks
-					.into_iter()
-					.map(|b| BlockData { origin: Some(who.clone()), block: b })
-					.collect(),
+				blocks.into_iter().map(|b| BlockData { origin: Some(who), block: b }).collect(),
 			),
 		);
 	}
diff --git a/client/network/src/protocol/sync/extra_requests.rs b/client/network/src/protocol/sync/extra_requests.rs
index f00c41612335..226762b9658d 100644
--- a/client/network/src/protocol/sync/extra_requests.rs
+++ b/client/network/src/protocol/sync/extra_requests.rs
@@ -67,7 +67,7 @@ pub(crate) struct Metrics {
 
 impl<B: BlockT> ExtraRequests<B> {
 	pub(crate) fn new(request_type_name: &'static str) -> Self {
-		ExtraRequests {
+		Self {
 			tree: ForkTree::new(),
 			best_seen_finalized_number: Zero::zero(),
 			pending_requests: VecDeque::new(),
@@ -132,27 +132,25 @@ impl<B: BlockT> ExtraRequests<B> {
 		// messages to chain sync.
 		if let Some(request) = self.active_requests.remove(&who) {
 			if let Some(r) = resp {
-				trace!(target: "sync", "Queuing import of {} from {:?} for {:?}",
-					self.request_type_name,
-					who,
-					request,
+				trace!(target: "sync",
+					"Queuing import of {} from {:?} for {:?}",
+					self.request_type_name, who, request,
 				);
 
 				self.importing_requests.insert(request);
 				return Some((who, request.0, request.1, r))
 			} else {
-				trace!(target: "sync", "Empty {} response from {:?} for {:?}",
-					self.request_type_name,
-					who,
-					request,
+				trace!(target: "sync",
+					"Empty {} response from {:?} for {:?}",
+					self.request_type_name, who, request,
 				);
 			}
 			self.failed_requests.entry(request).or_default().push((who, Instant::now()));
 			self.pending_requests.push_front(request);
 		} else {
-			trace!(target: "sync", "No active {} request to {:?}",
-				self.request_type_name,
-				who,
+			trace!(target: "sync",
+				"No active {} request to {:?}",
+				self.request_type_name, who,
 			);
 		}
 		None
@@ -227,10 +225,9 @@ impl<B: BlockT> ExtraRequests<B> {
 		};
 
 		if self.tree.finalize_root(&finalized_hash).is_none() {
-			warn!(target: "sync", "‼️ Imported {:?} {:?} which isn't a root in the tree: {:?}",
-				finalized_hash,
-				finalized_number,
-				self.tree.roots().collect::<Vec<_>>()
+			warn!(target: "sync",
+				"‼️ Imported {:?} {:?} which isn't a root in the tree: {:?}",
+				finalized_hash, finalized_number, self.tree.roots().collect::<Vec<_>>()
 			);
 			return true
 		}
@@ -280,7 +277,7 @@ pub(crate) struct Matcher<'a, B: BlockT> {
 
 impl<'a, B: BlockT> Matcher<'a, B> {
 	fn new(extras: &'a mut ExtraRequests<B>) -> Self {
-		Matcher { remaining: extras.pending_requests.len(), extras }
+		Self { remaining: extras.pending_requests.len(), extras }
 	}
 
 	/// Finds a peer to which a pending request can be sent.
@@ -335,13 +332,12 @@ impl<'a, B: BlockT> Matcher<'a, B> {
 				}
 				self.extras.active_requests.insert(peer.clone(), request);
 
-				trace!(target: "sync", "Sending {} request to {:?} for {:?}",
-					self.extras.request_type_name,
-					peer,
-					request,
+				trace!(target: "sync",
+					"Sending {} request to {:?} for {:?}",
+					self.extras.request_type_name, peer, request,
 				);
 
-				return Some((peer.clone(), request))
+				return Some((*peer, request))
 			}
 
 			self.extras.pending_requests.push_back(request);
@@ -594,7 +590,7 @@ mod tests {
 			let mut peers = HashMap::with_capacity(g.size());
 			for _ in 0..g.size() {
 				let ps = ArbitraryPeerSync::arbitrary(g).0;
-				peers.insert(ps.peer_id.clone(), ps);
+				peers.insert(ps.peer_id, ps);
 			}
 			ArbitraryPeers(peers)
 		}
diff --git a/client/network/src/protocol/sync/state.rs b/client/network/src/protocol/sync/state.rs
index 73e4eac1f5bc..d2e4463f9891 100644
--- a/client/network/src/protocol/sync/state.rs
+++ b/client/network/src/protocol/sync/state.rs
@@ -22,6 +22,7 @@ use crate::{
 	schema::v1::{StateEntry, StateRequest, StateResponse},
 };
 use codec::{Decode, Encode};
+use log::debug;
 use sc_client_api::StorageProof;
 use sp_runtime::traits::{Block as BlockT, Header, NumberFor};
 use std::sync::Arc;
@@ -55,7 +56,7 @@ pub enum ImportResult<B: BlockT> {
 impl<B: BlockT> StateSync<B> {
 	///  Create a new instance.
 	pub fn new(client: Arc<dyn Client<B>>, target: B::Header, skip_proof: bool) -> Self {
-		StateSync {
+		Self {
 			client,
 			target_block: target.hash(),
 			target_root: target.state_root().clone(),
@@ -71,46 +72,32 @@ impl<B: BlockT> StateSync<B> {
 	///  Validate and import a state reponse.
 	pub fn import(&mut self, response: StateResponse) -> ImportResult<B> {
 		if response.entries.is_empty() && response.proof.is_empty() && !response.complete {
-			log::debug!(
-				target: "sync",
-				"Bad state response",
-			);
+			debug!(target: "sync", "Bad state response");
 			return ImportResult::BadResponse
 		}
 		if !self.skip_proof && response.proof.is_empty() {
-			log::debug!(
-				target: "sync",
-				"Missing proof",
-			);
+			debug!(target: "sync", "Missing proof");
 			return ImportResult::BadResponse
 		}
 		let complete = if !self.skip_proof {
-			log::debug!(
-				target: "sync",
-				"Importing state from {} trie nodes",
-				response.proof.len(),
-			);
+			debug!(target: "sync", "Importing state from {} trie nodes", response.proof.len());
 			let proof_size = response.proof.len() as u64;
 			let proof = match StorageProof::decode(&mut response.proof.as_ref()) {
 				Ok(proof) => proof,
 				Err(e) => {
-					log::debug!(target: "sync", "Error decoding proof: {:?}", e);
+					debug!(target: "sync", "Error decoding proof: {:?}", e);
 					return ImportResult::BadResponse
 				},
 			};
 			let (values, complete) =
 				match self.client.verify_range_proof(self.target_root, proof, &self.last_key) {
 					Err(e) => {
-						log::debug!(
-							target: "sync",
-							"StateResponse failed proof verification: {:?}",
-							e,
-						);
+						debug!(target: "sync", "StateResponse failed proof verification: {:?}", e);
 						return ImportResult::BadResponse
 					},
 					Ok(values) => values,
 				};
-			log::debug!(target: "sync", "Imported with {} keys", values.len());
+			debug!(target: "sync", "Imported with {} keys", values.len());
 
 			if let Some(last) = values.last().map(|(k, _)| k) {
 				self.last_key = last.clone();
@@ -123,7 +110,7 @@ impl<B: BlockT> StateSync<B> {
 			self.imported_bytes += proof_size;
 			complete
 		} else {
-			log::debug!(
+			debug!(
 				target: "sync",
 				"Importing state from {:?} to {:?}",
 				response.entries.last().map(|e| sp_core::hexdisplay::HexDisplay::from(&e.key)),
@@ -142,12 +129,9 @@ impl<B: BlockT> StateSync<B> {
 		if complete {
 			self.complete = true;
 			ImportResult::Import(
-				self.target_block.clone(),
+				self.target_block,
 				self.target_header.clone(),
-				ImportedState {
-					block: self.target_block.clone(),
-					state: std::mem::take(&mut self.state),
-				},
+				ImportedState { block: self.target_block, state: std::mem::take(&mut self.state) },
 			)
 		} else {
 			ImportResult::Continue(self.next_request())
@@ -170,12 +154,12 @@ impl<B: BlockT> StateSync<B> {
 
 	/// Returns target block number.
 	pub fn target_block_num(&self) -> NumberFor<B> {
-		self.target_header.number().clone()
+		*self.target_header.number()
 	}
 
 	/// Returns target block hash.
 	pub fn target(&self) -> B::Hash {
-		self.target_block.clone()
+		self.target_block
 	}
 
 	/// Returns state sync estimated progress.
diff --git a/client/network/src/protocol/sync/warp.rs b/client/network/src/protocol/sync/warp.rs
index fae0e2f5452a..32bd5cb9ed79 100644
--- a/client/network/src/protocol/sync/warp.rs
+++ b/client/network/src/protocol/sync/warp.rs
@@ -66,7 +66,7 @@ impl<B: BlockT> WarpSync<B> {
 			authorities: warp_sync_provider.current_authorities(),
 			last_hash,
 		};
-		WarpSync { client, warp_sync_provider, phase, total_proof_bytes: 0 }
+		Self { client, warp_sync_provider, phase, total_proof_bytes: 0 }
 	}
 
 	///  Validate and import a state reponse.
@@ -132,8 +132,7 @@ impl<B: BlockT> WarpSync<B> {
 	pub fn next_warp_poof_request(&self) -> Option<WarpProofRequest<B>> {
 		match &self.phase {
 			Phase::State(_) => None,
-			Phase::WarpProof { last_hash, .. } =>
-				Some(WarpProofRequest { begin: last_hash.clone() }),
+			Phase::WarpProof { last_hash, .. } => Some(WarpProofRequest { begin: *last_hash }),
 		}
 	}
 
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 6b75cb282f04..525470145b78 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -132,7 +132,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 	/// Returns a `NetworkWorker` that implements `Future` and must be regularly polled in order
 	/// for the network processing to advance. From it, you can extract a `NetworkService` using
 	/// `worker.service()`. The `NetworkService` can be shared through the codebase.
-	pub fn new(mut params: Params<B, H>) -> Result<NetworkWorker<B, H>, Error> {
+	pub fn new(mut params: Params<B, H>) -> Result<Self, Error> {
 		// Ensure the listen addresses are consistent with the transport.
 		ensure_addresses_consistent_with_transport(
 			params.network_config.listen_addresses.iter(),
@@ -218,9 +218,9 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 
 		// Process the bootnodes.
 		for bootnode in params.network_config.boot_nodes.iter() {
-			bootnodes.push(bootnode.peer_id.clone());
-			boot_node_ids.insert(bootnode.peer_id.clone());
-			known_addresses.push((bootnode.peer_id.clone(), bootnode.multiaddr.clone()));
+			bootnodes.push(bootnode.peer_id);
+			boot_node_ids.insert(bootnode.peer_id);
+			known_addresses.push((bootnode.peer_id, bootnode.multiaddr.clone()));
 		}
 
 		let boot_node_ids = Arc::new(boot_node_ids);
@@ -230,7 +230,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 			if let Some(other) = known_addresses.iter().find(|o| o.1 == *addr && o.0 != *peer_id) {
 				Err(Error::DuplicateBootnode {
 					address: addr.clone(),
-					first_id: peer_id.clone(),
+					first_id: *peer_id,
 					second_id: other.0.clone(),
 				})
 			} else {
@@ -364,7 +364,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
 				}
 			};
 
-			let mut builder = SwarmBuilder::new(transport, behaviour, local_peer_id.clone())
+			let mut builder = SwarmBuilder::new(transport, behaviour, local_peer_id)
 				.connection_limits(
 					ConnectionLimits::default()
 						.with_max_established_per_peer(Some(crate::MAX_CONNECTIONS_PER_PEER as u32))
@@ -743,7 +743,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 				sink.clone()
 			} else {
 				// Notification silently discarded, as documented.
-				log::debug!(
+				debug!(
 					target: "sub-libp2p",
 					"Attempted to send notification on missing or closed substream: {}, {:?}",
 					target, protocol,
@@ -762,9 +762,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 		trace!(
 			target: "sub-libp2p",
 			"External API => Notification({:?}, {:?}, {} bytes)",
-			target,
-			protocol,
-			message.len()
+			target, protocol, message.len()
 		);
 		trace!(target: "sub-libp2p", "Handler({:?}) <= Sync notification", target);
 		sink.send_sync_notification(message);
@@ -1260,7 +1258,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkService<B, H> {
 
 impl<B: BlockT + 'static, H: ExHashT> sp_consensus::SyncOracle for NetworkService<B, H> {
 	fn is_major_syncing(&mut self) -> bool {
-		NetworkService::is_major_syncing(self)
+		Self::is_major_syncing(self)
 	}
 
 	fn is_offline(&mut self) -> bool {
@@ -1280,11 +1278,11 @@ impl<'a, B: BlockT + 'static, H: ExHashT> sp_consensus::SyncOracle for &'a Netwo
 
 impl<B: BlockT, H: ExHashT> sc_consensus::JustificationSyncLink<B> for NetworkService<B, H> {
 	fn request_justification(&self, hash: &B::Hash, number: NumberFor<B>) {
-		NetworkService::request_justification(self, hash, number);
+		Self::request_justification(self, hash, number);
 	}
 
 	fn clear_justification_requests(&self) {
-		NetworkService::clear_justification_requests(self);
+		Self::clear_justification_requests(self);
 	}
 }
 
@@ -1300,7 +1298,7 @@ where
 
 	/// Returns the local Peer ID.
 	fn local_peer_id(&self) -> PeerId {
-		self.local_peer_id.clone()
+		self.local_peer_id
 	}
 }
 
@@ -1363,9 +1361,7 @@ impl<'a> NotificationSenderReady<'a> {
 		trace!(
 			target: "sub-libp2p",
 			"External API => Notification({:?}, {}, {} bytes)",
-			self.peer_id,
-			self.protocol_name,
-			notification.len()
+			self.peer_id, self.protocol_name, notification.len(),
 		);
 		trace!(target: "sub-libp2p", "Handler({:?}) <= Async notification", self.peer_id);
 
@@ -1477,9 +1473,7 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 				match result {
 					Ok(()) => {},
 					Err(light_client_requests::sender::SendRequestError::TooManyRequests) => {
-						log::warn!(
-							"Couldn't start light client request: too many pending requests"
-						);
+						warn!("Couldn't start light client request: too many pending requests");
 					},
 				}
 
@@ -1771,7 +1765,7 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 					if let Some(s) = peers_notifications_sinks.get_mut(&(remote, protocol)) {
 						*s = notifications_sink;
 					} else {
-						log::error!(
+						error!(
 							target: "sub-libp2p",
 							"NotificationStreamReplaced for non-existing substream"
 						);
@@ -1931,18 +1925,16 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 				},
 				Poll::Ready(SwarmEvent::UnreachableAddr { peer_id, address, error, .. }) => {
 					trace!(
-						target: "sub-libp2p", "Libp2p => Failed to reach {:?} through {:?}: {}",
-						peer_id,
-						address,
-						error,
+						target: "sub-libp2p",
+						"Libp2p => Failed to reach {:?} through {:?}: {}",
+						peer_id, address, error,
 					);
 
 					if this.boot_node_ids.contains(&peer_id) {
 						if let PendingConnectionError::InvalidPeerId = error {
 							error!(
 								"💔 The bootnode you want to connect to at `{}` provided a different peer ID than the one you expect: `{}`.",
-								address,
-								peer_id,
+								address, peer_id,
 							);
 						}
 					}
@@ -1980,8 +1972,11 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 					send_back_addr,
 					error,
 				}) => {
-					debug!(target: "sub-libp2p", "Libp2p => IncomingConnectionError({},{}): {}",
-						local_addr, send_back_addr, error);
+					debug!(
+						target: "sub-libp2p",
+						"Libp2p => IncomingConnectionError({},{}): {}",
+						local_addr, send_back_addr, error,
+					);
 					if let Some(metrics) = this.metrics.as_ref() {
 						let reason = match error {
 							PendingConnectionError::ConnectionLimit(_) => "limit-reached",
@@ -1997,8 +1992,11 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
 					}
 				},
 				Poll::Ready(SwarmEvent::BannedPeer { peer_id, endpoint }) => {
-					debug!(target: "sub-libp2p", "Libp2p => BannedPeer({}). Connected via {:?}.",
-						peer_id, endpoint);
+					debug!(
+						target: "sub-libp2p",
+						"Libp2p => BannedPeer({}). Connected via {:?}.",
+						peer_id, endpoint,
+					);
 					if let Some(metrics) = this.metrics.as_ref() {
 						metrics
 							.incoming_connections_errors_total
diff --git a/client/network/src/service/out_events.rs b/client/network/src/service/out_events.rs
index fad61491fb22..2d6241278005 100644
--- a/client/network/src/service/out_events.rs
+++ b/client/network/src/service/out_events.rs
@@ -142,7 +142,7 @@ impl OutChannels {
 		let metrics =
 			if let Some(registry) = registry { Some(Metrics::register(registry)?) } else { None };
 
-		Ok(OutChannels { event_streams: Vec::new(), metrics: Arc::new(metrics) })
+		Ok(Self { event_streams: Vec::new(), metrics: Arc::new(metrics) })
 	}
 
 	/// Adds a new [`Sender`] to the collection.
diff --git a/client/network/src/service/tests.rs b/client/network/src/service/tests.rs
index 4bda70330bdf..69b172d07edf 100644
--- a/client/network/src/service/tests.rs
+++ b/client/network/src/service/tests.rs
@@ -356,15 +356,13 @@ fn lots_of_incoming_peers_works() {
 		..config::NetworkConfiguration::new_local()
 	});
 
-	let main_node_peer_id = main_node.local_peer_id().clone();
+	let main_node_peer_id = *main_node.local_peer_id();
 
 	// We spawn background tasks and push them in this `Vec`. They will all be waited upon before
 	// this test ends.
 	let mut background_tasks_to_wait = Vec::new();
 
 	for _ in 0..32 {
-		let main_node_peer_id = main_node_peer_id.clone();
-
 		let (_dialing_node, event_stream) = build_test_full_node(config::NetworkConfiguration {
 			listen_addresses: vec![],
 			extra_sets: vec![config::NonDefaultSetConfig {
@@ -374,7 +372,7 @@ fn lots_of_incoming_peers_works() {
 				set_config: config::SetConfig {
 					reserved_nodes: vec![config::MultiaddrWithPeerId {
 						multiaddr: listen_addr.clone(),
-						peer_id: main_node_peer_id.clone(),
+						peer_id: main_node_peer_id,
 					}],
 					..Default::default()
 				},
diff --git a/client/network/src/state_request_handler.rs b/client/network/src/state_request_handler.rs
index a15ee246a2ef..b4e5320ebfda 100644
--- a/client/network/src/state_request_handler.rs
+++ b/client/network/src/state_request_handler.rs
@@ -29,7 +29,7 @@ use futures::{
 	channel::{mpsc, oneshot},
 	stream::StreamExt,
 };
-use log::debug;
+use log::{debug, trace};
 use lru::LruCache;
 use prost::Message;
 use sp_runtime::{generic::BlockId, traits::Block as BlockT};
@@ -166,7 +166,7 @@ impl<B: BlockT> StateRequestHandler<B> {
 			},
 		}
 
-		log::trace!(
+		trace!(
 			target: LOG_TARGET,
 			"Handling state request from {}: Block {:?}, Starting at {:?}, no_proof={}",
 			peer,
@@ -201,7 +201,7 @@ impl<B: BlockT> StateRequestHandler<B> {
 				}
 			}
 
-			log::trace!(
+			trace!(
 				target: LOG_TARGET,
 				"StateResponse contains {} keys, {}, proof nodes, complete={}, from {:?} to {:?}",
 				response.entries.len(),
diff --git a/client/network/test/src/block_import.rs b/client/network/test/src/block_import.rs
index 7b5804e0edb7..7a4c4f6c8308 100644
--- a/client/network/test/src/block_import.rs
+++ b/client/network/test/src/block_import.rs
@@ -46,14 +46,14 @@ fn prepare_good_block() -> (TestClient, Hash, u64, PeerId, IncomingBlock<Block>)
 		client,
 		hash,
 		number,
-		peer_id.clone(),
+		peer_id,
 		IncomingBlock {
 			hash,
 			header,
 			body: Some(Vec::new()),
 			indexed_body: None,
 			justifications,
-			origin: Some(peer_id.clone()),
+			origin: Some(peer_id),
 			allow_missing_state: false,
 			import_existing: false,
 			state: None,
diff --git a/client/peerset/src/lib.rs b/client/peerset/src/lib.rs
index ecaa1d9f576f..9c6c5617c34b 100644
--- a/client/peerset/src/lib.rs
+++ b/client/peerset/src/lib.rs
@@ -426,7 +426,7 @@ impl Peerset {
 		// We want reputations to be up-to-date before adjusting them.
 		self.update_time();
 
-		let mut reputation = self.data.peer_reputation(peer_id.clone());
+		let mut reputation = self.data.peer_reputation(peer_id);
 		reputation.add_reputation(change.value);
 		if reputation.reputation() >= BANNED_THRESHOLD {
 			trace!(target: "peerset", "Report {}: {:+} to {}. Reason: {}",
@@ -486,7 +486,7 @@ impl Peerset {
 					reput.saturating_sub(diff)
 				}
 
-				let mut peer_reputation = self.data.peer_reputation(peer_id.clone());
+				let mut peer_reputation = self.data.peer_reputation(peer_id);
 
 				let before = peer_reputation.reputation();
 				let after = reput_tick(before);
@@ -920,7 +920,7 @@ mod tests {
 			assert_eq!(Stream::poll_next(Pin::new(&mut peerset), cx), Poll::Pending);
 
 			// Check that an incoming connection from that node gets refused.
-			peerset.incoming(SetId::from(0), peer_id.clone(), IncomingIndex(1));
+			peerset.incoming(SetId::from(0), peer_id, IncomingIndex(1));
 			if let Poll::Ready(msg) = Stream::poll_next(Pin::new(&mut peerset), cx) {
 				assert_eq!(msg.unwrap(), Message::Reject(IncomingIndex(1)));
 			} else {
@@ -931,7 +931,7 @@ mod tests {
 			thread::sleep(Duration::from_millis(1500));
 
 			// Try again. This time the node should be accepted.
-			peerset.incoming(SetId::from(0), peer_id.clone(), IncomingIndex(2));
+			peerset.incoming(SetId::from(0), peer_id, IncomingIndex(2));
 			while let Poll::Ready(msg) = Stream::poll_next(Pin::new(&mut peerset), cx) {
 				assert_eq!(msg.unwrap(), Message::Accept(IncomingIndex(2)));
 			}
@@ -965,7 +965,7 @@ mod tests {
 			// Check that an incoming connection from that node gets refused.
 			// This is already tested in other tests, but it is done again here because it doesn't
 			// hurt.
-			peerset.incoming(SetId::from(0), peer_id.clone(), IncomingIndex(1));
+			peerset.incoming(SetId::from(0), peer_id, IncomingIndex(1));
 			if let Poll::Ready(msg) = Stream::poll_next(Pin::new(&mut peerset), cx) {
 				assert_eq!(msg.unwrap(), Message::Reject(IncomingIndex(1)));
 			} else {
diff --git a/client/peerset/src/peersstate.rs b/client/peerset/src/peersstate.rs
index de79ee520f9c..7717620eae3a 100644
--- a/client/peerset/src/peersstate.rs
+++ b/client/peerset/src/peersstate.rs
@@ -167,7 +167,7 @@ impl PeersState {
 	/// Returns an object that grants access to the reputation value of a peer.
 	pub fn peer_reputation(&mut self, peer_id: PeerId) -> Reputation {
 		if !self.nodes.contains_key(&peer_id) {
-			self.nodes.insert(peer_id.clone(), Node::new(self.sets.len()));
+			self.nodes.insert(peer_id, Node::new(self.sets.len()));
 		}
 
 		let entry = match self.nodes.entry(peer_id) {
@@ -256,7 +256,7 @@ impl PeersState {
 				}
 				Some(to_try)
 			})
-			.map(|(peer_id, _)| peer_id.clone());
+			.map(|(peer_id, _)| *peer_id);
 
 		outcome.map(move |peer_id| NotConnectedPeer {
 			state: self,
@@ -275,7 +275,7 @@ impl PeersState {
 	/// Has no effect if the node was already in the group.
 	pub fn add_no_slot_node(&mut self, set: usize, peer_id: PeerId) {
 		// Reminder: `HashSet::insert` returns false if the node was already in the set
-		if !self.sets[set].no_slot_nodes.insert(peer_id.clone()) {
+		if !self.sets[set].no_slot_nodes.insert(peer_id) {
 			return
 		}
 
diff --git a/client/rpc/src/system/tests.rs b/client/rpc/src/system/tests.rs
index cc794b884f06..14997545031d 100644
--- a/client/rpc/src/system/tests.rs
+++ b/client/rpc/src/system/tests.rs
@@ -223,8 +223,7 @@ fn system_local_listen_addresses_works() {
 #[test]
 fn system_peers() {
 	let peer_id = PeerId::random();
-	let req = api(Status { peer_id: peer_id.clone(), peers: 1, is_syncing: false, is_dev: true })
-		.system_peers();
+	let req = api(Status { peer_id, peers: 1, is_syncing: false, is_dev: true }).system_peers();
 	let res = executor::block_on(req).unwrap();
 
 	assert_eq!(

From 9d19a24a941cf18e6281e6860e46e18037972233 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Sep 2021 21:07:18 +0000
Subject: [PATCH 1180/1194] Bump primitive-types from 0.10.0 to 0.10.1 (#9754)

Bumps [primitive-types](https://github.com/paritytech/parity-common) from 0.10.0 to 0.10.1.
- [Release notes](https://github.com/paritytech/parity-common/releases)
- [Commits](https://github.com/paritytech/parity-common/commits)

---
updated-dependencies:
- dependency-name: primitive-types
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                              | 4 ++--
 primitives/arithmetic/Cargo.toml        | 2 +-
 primitives/arithmetic/fuzzer/Cargo.toml | 2 +-
 primitives/core/Cargo.toml              | 2 +-
 primitives/runtime-interface/Cargo.toml | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1bcdb7522956..28a1c2c4f3a8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6385,9 +6385,9 @@ dependencies = [
 
 [[package]]
 name = "primitive-types"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e90f6931e6b3051e208a449c342246cb7c786ef300789b95619f46f1dd75d9b0"
+checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373"
 dependencies = [
  "fixed-hash",
  "impl-codec",
diff --git a/primitives/arithmetic/Cargo.toml b/primitives/arithmetic/Cargo.toml
index 0b7913a01c04..8a97f7ce5042 100644
--- a/primitives/arithmetic/Cargo.toml
+++ b/primitives/arithmetic/Cargo.toml
@@ -28,7 +28,7 @@ sp-debug-derive = { version = "3.0.0", default-features = false, path = "../debu
 [dev-dependencies]
 rand = "0.7.2"
 criterion = "0.3"
-primitive-types = "0.10.0"
+primitive-types = "0.10.1"
 
 [features]
 default = ["std"]
diff --git a/primitives/arithmetic/fuzzer/Cargo.toml b/primitives/arithmetic/fuzzer/Cargo.toml
index fa951a143370..d10eccfc7c74 100644
--- a/primitives/arithmetic/fuzzer/Cargo.toml
+++ b/primitives/arithmetic/fuzzer/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 sp-arithmetic = { version = "4.0.0-dev", path = ".." }
 honggfuzz = "0.5.49"
-primitive-types = "0.10.0"
+primitive-types = "0.10.1"
 num-bigint = "0.2"
 
 [[bin]]
diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml
index add7da81c3ff..b2c5230975ec 100644
--- a/primitives/core/Cargo.toml
+++ b/primitives/core/Cargo.toml
@@ -21,7 +21,7 @@ codec = { package = "parity-scale-codec", version = "2.2.0", default-features =
 log = { version = "0.4.11", default-features = false }
 serde = { version = "1.0.126", optional = true, features = ["derive"] }
 byteorder = { version = "1.3.2", default-features = false }
-primitive-types = { version = "0.10.0", default-features = false, features = [
+primitive-types = { version = "0.10.1", default-features = false, features = [
 	"codec",
 ] }
 impl-serde = { version = "0.3.0", optional = true }
diff --git a/primitives/runtime-interface/Cargo.toml b/primitives/runtime-interface/Cargo.toml
index 22ce22e8160a..dd1b84eabfe9 100644
--- a/primitives/runtime-interface/Cargo.toml
+++ b/primitives/runtime-interface/Cargo.toml
@@ -21,7 +21,7 @@ sp-runtime-interface-proc-macro = { version = "4.0.0-dev", path = "proc-macro" }
 sp-externalities = { version = "0.10.0-dev", optional = true, path = "../externalities" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 static_assertions = "1.0.0"
-primitive-types = { version = "0.10.0", default-features = false }
+primitive-types = { version = "0.10.1", default-features = false }
 sp-storage = { version = "4.0.0-dev", default-features = false, path = "../storage" }
 impl-trait-for-tuples = "0.2.1"
 

From 630422d6108cbaaca893ab213dde69f3bdaa1f6b Mon Sep 17 00:00:00 2001
From: Qinxuan Chen <koushiro.cqx@gmail.com>
Date: Tue, 14 Sep 2021 08:04:09 +0800
Subject: [PATCH 1181/1194] Migrate `pallet-tips` to the new pallet attribute
 macro (#9711)

* Migrate pallet-tips to the new pallet attribute macro

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* Fix migration

Signed-off-by: koushiro <koushiro.cqx@gmail.com>
---
 Cargo.lock                       |   1 +
 frame/tips/Cargo.toml            |  19 ++-
 frame/tips/README.md             |   4 +-
 frame/tips/src/benchmarking.rs   |   6 +-
 frame/tips/src/lib.rs            | 285 ++++++++++++++++---------------
 frame/tips/src/migrations/mod.rs |  23 +++
 frame/tips/src/migrations/v4.rs  | 195 +++++++++++++++++++++
 frame/tips/src/tests.rs          | 227 ++++++++++++++----------
 8 files changed, 522 insertions(+), 238 deletions(-)
 create mode 100644 frame/tips/src/migrations/mod.rs
 create mode 100644 frame/tips/src/migrations/v4.rs

diff --git a/Cargo.lock b/Cargo.lock
index 28a1c2c4f3a8..3741a23d3c14 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5736,6 +5736,7 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "log 0.4.14",
  "pallet-balances",
  "pallet-treasury",
  "parity-scale-codec",
diff --git a/frame/tips/Cargo.toml b/frame/tips/Cargo.toml
index a0b554166c04..d706552393e6 100644
--- a/frame/tips/Cargo.toml
+++ b/frame/tips/Cargo.toml
@@ -13,10 +13,15 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.126", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+log = { version = "0.4.0", default-features = false }
+serde = { version = "1.0.126", features = ["derive"], optional = true }
+
+sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 pallet-treasury = { version = "4.0.0-dev", default-features = false, path = "../treasury" }
@@ -24,18 +29,20 @@ pallet-treasury = { version = "4.0.0-dev", default-features = false, path = "../
 frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
-sp-io ={ version = "4.0.0-dev", path = "../../primitives/io" }
-sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 sp-storage = { version = "4.0.0-dev", path = "../../primitives/storage" }
 pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 
 [features]
 default = ["std"]
 std = [
-	"serde",
 	"codec/std",
-	"sp-std/std",
+	"log/std",
+	"serde",
+
+	"sp-core/std",
+	"sp-io/std",
 	"sp-runtime/std",
+	"sp-std/std",
 	"frame-support/std",
 	"frame-system/std",
 	"pallet-treasury/std",
diff --git a/frame/tips/README.md b/frame/tips/README.md
index 36148e276edc..d885ce770f79 100644
--- a/frame/tips/README.md
+++ b/frame/tips/README.md
@@ -1,11 +1,11 @@
-# Tipping Module ( pallet-tips )
+# Tipping Pallet ( pallet-tips )
 
 **Note :: This pallet is tightly coupled to pallet-treasury**
 
 A subsystem to allow for an agile "tipping" process, whereby a reward may be given without first
 having a pre-determined stakeholder group come to consensus on how much should be paid.
 
-A group of `Tippers` is determined through the config `Trait`. After half of these have declared
+A group of `Tippers` is determined through the config `Config`. After half of these have declared
 some amount that they believe a particular reported reason deserves, then a countdown period is
 entered where any remaining members can declare their tip amounts also. After the close of the
 countdown period, the median of all declared tips is paid to the reported beneficiary, along with
diff --git a/frame/tips/src/benchmarking.rs b/frame/tips/src/benchmarking.rs
index 2c51f6394a52..5e0812185521 100644
--- a/frame/tips/src/benchmarking.rs
+++ b/frame/tips/src/benchmarking.rs
@@ -19,13 +19,13 @@
 
 #![cfg(feature = "runtime-benchmarks")]
 
-use super::*;
-
 use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, whitelisted_caller};
+use frame_support::ensure;
 use frame_system::RawOrigin;
 use sp_runtime::traits::Saturating;
 
-use crate::Module as TipsMod;
+use super::*;
+use crate::Pallet as TipsMod;
 
 const SEED: u32 = 0;
 
diff --git a/frame/tips/src/lib.rs b/frame/tips/src/lib.rs
index ca327f6c8710..50abe4684cde 100644
--- a/frame/tips/src/lib.rs
+++ b/frame/tips/src/lib.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! # Tipping Module ( pallet-tips )
+//! # Tipping Pallet ( pallet-tips )
 //!
 //! > NOTE: This pallet is tightly coupled with pallet-treasury.
 //!
@@ -56,55 +56,31 @@
 
 mod benchmarking;
 mod tests;
+
+pub mod migrations;
 pub mod weights;
 
-use frame_support::{
-	decl_error, decl_event, decl_module, decl_storage, ensure,
-	traits::{Currency, ExistenceRequirement::KeepAlive, Get, ReservableCurrency},
-	Parameter,
+use sp_runtime::{
+	traits::{AccountIdConversion, BadOrigin, Hash, Zero},
+	Percent, RuntimeDebug,
 };
 use sp_std::prelude::*;
 
 use codec::{Decode, Encode};
-use frame_support::traits::{ContainsLengthBound, EnsureOrigin, OnUnbalanced, SortedMembers};
-use frame_system::{self as system, ensure_signed};
-use sp_runtime::{
-	traits::{AccountIdConversion, BadOrigin, Hash, Zero},
-	Percent, RuntimeDebug,
+use frame_support::{
+	traits::{
+		ContainsLengthBound, Currency, EnsureOrigin, ExistenceRequirement::KeepAlive, Get,
+		OnUnbalanced, ReservableCurrency, SortedMembers, StorageVersion,
+	},
+	Parameter,
 };
+
+pub use pallet::*;
 pub use weights::WeightInfo;
 
 pub type BalanceOf<T> = pallet_treasury::BalanceOf<T>;
 pub type NegativeImbalanceOf<T> = pallet_treasury::NegativeImbalanceOf<T>;
 
-pub trait Config: frame_system::Config + pallet_treasury::Config {
-	/// Maximum acceptable reason length.
-	type MaximumReasonLength: Get<u32>;
-
-	/// The amount held on deposit per byte within the tip report reason or bounty description.
-	type DataDepositPerByte: Get<BalanceOf<Self>>;
-
-	/// Origin from which tippers must come.
-	///
-	/// `ContainsLengthBound::max_len` must be cost free (i.e. no storage read or heavy operation).
-	type Tippers: SortedMembers<Self::AccountId> + ContainsLengthBound;
-
-	/// The period for which a tip remains open after is has achieved threshold tippers.
-	type TipCountdown: Get<Self::BlockNumber>;
-
-	/// The percent of the final tip which goes to the original reporter of the tip.
-	type TipFindersFee: Get<Percent>;
-
-	/// The amount held on deposit for placing a tip report.
-	type TipReportDepositBase: Get<BalanceOf<Self>>;
-
-	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
-
-	/// Weight information for extrinsics in this pallet.
-	type WeightInfo: WeightInfo;
-}
-
 /// An open tipping "motion". Retains all details of a tip including information on the finder
 /// and the members who have voted.
 #[derive(Clone, Eq, PartialEq, Encode, Decode, RuntimeDebug)]
@@ -132,50 +108,96 @@ pub struct OpenTip<
 	finders_fee: bool,
 }
 
-// Note :: For backward compatability reasons,
-// pallet-tips uses Treasury for storage.
-// This is temporary solution, soon will get replaced with
-// Own storage identifier.
-decl_storage! {
-	trait Store for Module<T: Config> as Treasury {
+#[frame_support::pallet]
+pub mod pallet {
+	use super::*;
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+
+	/// The current storage version.
+	const STORAGE_VERSION: StorageVersion = StorageVersion::new(4);
+
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::storage_version(STORAGE_VERSION)]
+	pub struct Pallet<T>(_);
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config + pallet_treasury::Config {
+		/// The overarching event type.
+		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
 
-		/// TipsMap that are not yet completed. Keyed by the hash of `(reason, who)` from the value.
-		/// This has the insecure enumerable hash function since the key itself is already
-		/// guaranteed to be a secure hash.
-		pub Tips get(fn tips):
-			map hasher(twox_64_concat) T::Hash
-			=> Option<OpenTip<T::AccountId, BalanceOf<T>, T::BlockNumber, T::Hash>>;
+		/// Maximum acceptable reason length.
+		#[pallet::constant]
+		type MaximumReasonLength: Get<u32>;
+
+		/// The amount held on deposit per byte within the tip report reason or bounty description.
+		#[pallet::constant]
+		type DataDepositPerByte: Get<BalanceOf<Self>>;
+
+		/// The period for which a tip remains open after is has achieved threshold tippers.
+		#[pallet::constant]
+		type TipCountdown: Get<Self::BlockNumber>;
 
-		/// Simple preimage lookup from the reason's hash to the original data. Again, has an
-		/// insecure enumerable hash since the key is guaranteed to be the result of a secure hash.
-		pub Reasons get(fn reasons): map hasher(identity) T::Hash => Option<Vec<u8>>;
+		/// The percent of the final tip which goes to the original reporter of the tip.
+		#[pallet::constant]
+		type TipFindersFee: Get<Percent>;
 
+		/// The amount held on deposit for placing a tip report.
+		#[pallet::constant]
+		type TipReportDepositBase: Get<BalanceOf<Self>>;
+
+		/// Origin from which tippers must come.
+		///
+		/// `ContainsLengthBound::max_len` must be cost free (i.e. no storage read or heavy
+		/// operation).
+		type Tippers: SortedMembers<Self::AccountId> + ContainsLengthBound;
+
+		/// Weight information for extrinsics in this pallet.
+		type WeightInfo: WeightInfo;
 	}
-}
 
-decl_event!(
-	pub enum Event<T>
-	where
-		Balance = BalanceOf<T>,
-		<T as frame_system::Config>::AccountId,
-		<T as frame_system::Config>::Hash,
-	{
+	/// TipsMap that are not yet completed. Keyed by the hash of `(reason, who)` from the value.
+	/// This has the insecure enumerable hash function since the key itself is already
+	/// guaranteed to be a secure hash.
+	#[pallet::storage]
+	#[pallet::getter(fn tips)]
+	pub type Tips<T: Config> = StorageMap<
+		_,
+		Twox64Concat,
+		T::Hash,
+		OpenTip<T::AccountId, BalanceOf<T>, T::BlockNumber, T::Hash>,
+		OptionQuery,
+	>;
+
+	/// Simple preimage lookup from the reason's hash to the original data. Again, has an
+	/// insecure enumerable hash since the key is guaranteed to be the result of a secure hash.
+	#[pallet::storage]
+	#[pallet::getter(fn reasons)]
+	pub type Reasons<T: Config> = StorageMap<_, Identity, T::Hash, Vec<u8>, OptionQuery>;
+
+	#[pallet::event]
+	#[pallet::metadata(T::Hash = "Hash", T::AccountId = "AccountId", BalanceOf<T> = "Balance")]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	pub enum Event<T: Config> {
 		/// A new tip suggestion has been opened. \[tip_hash\]
-		NewTip(Hash),
+		NewTip(T::Hash),
 		/// A tip suggestion has reached threshold and is closing. \[tip_hash\]
-		TipClosing(Hash),
+		TipClosing(T::Hash),
 		/// A tip suggestion has been closed. \[tip_hash, who, payout\]
-		TipClosed(Hash, AccountId, Balance),
+		TipClosed(T::Hash, T::AccountId, BalanceOf<T>),
 		/// A tip suggestion has been retracted. \[tip_hash\]
-		TipRetracted(Hash),
+		TipRetracted(T::Hash),
 		/// A tip suggestion has been slashed. \[tip_hash, finder, deposit\]
-		TipSlashed(Hash, AccountId, Balance),
+		TipSlashed(T::Hash, T::AccountId, BalanceOf<T>),
 	}
-);
 
-decl_error! {
-	/// Error for the tips module.
-	pub enum Error for Module<T: Config> {
+	/// Old name generated by `decl_event`.
+	#[deprecated(note = "use `Event` instead")]
+	pub type RawEvent<T> = Event<T>;
+
+	#[pallet::error]
+	pub enum Error<T> {
 		/// The reason given is just too big.
 		ReasonTooBig,
 		/// The tip was already found/started.
@@ -189,32 +211,9 @@ decl_error! {
 		/// The tip cannot be claimed/closed because it's still in the countdown period.
 		Premature,
 	}
-}
-
-decl_module! {
-	pub struct Module<T: Config>
-		for enum Call
-		where origin: T::Origin
-	{
-		/// The period for which a tip remains open after is has achieved threshold tippers.
-		const TipCountdown: T::BlockNumber = T::TipCountdown::get();
-
-		/// The amount of the final tip which goes to the original reporter of the tip.
-		const TipFindersFee: Percent = T::TipFindersFee::get();
-
-		/// The amount held on deposit for placing a tip report.
-		const TipReportDepositBase: BalanceOf<T> = T::TipReportDepositBase::get();
-
-		/// The amount held on deposit per byte within the tip report reason.
-		const DataDepositPerByte: BalanceOf<T> = T::DataDepositPerByte::get();
-
-		/// Maximum acceptable reason length.
-		const MaximumReasonLength: u32 = T::MaximumReasonLength::get();
-
-		type Error = Error<T>;
-
-		fn deposit_event() = default;
 
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
 		/// Report something `reason` that deserves a tip and claim any eventual the finder's fee.
 		///
 		/// The dispatch origin for this call must be _Signed_.
@@ -234,19 +233,26 @@ decl_module! {
 		/// - DbReads: `Reasons`, `Tips`
 		/// - DbWrites: `Reasons`, `Tips`
 		/// # </weight>
-		#[weight = <T as Config>::WeightInfo::report_awesome(reason.len() as u32)]
-		fn report_awesome(origin, reason: Vec<u8>, who: T::AccountId) {
+		#[pallet::weight(<T as Config>::WeightInfo::report_awesome(reason.len() as u32))]
+		pub fn report_awesome(
+			origin: OriginFor<T>,
+			reason: Vec<u8>,
+			who: T::AccountId,
+		) -> DispatchResult {
 			let finder = ensure_signed(origin)?;
 
-			ensure!(reason.len() <= T::MaximumReasonLength::get() as usize, Error::<T>::ReasonTooBig);
+			ensure!(
+				reason.len() <= T::MaximumReasonLength::get() as usize,
+				Error::<T>::ReasonTooBig
+			);
 
 			let reason_hash = T::Hashing::hash(&reason[..]);
 			ensure!(!Reasons::<T>::contains_key(&reason_hash), Error::<T>::AlreadyKnown);
 			let hash = T::Hashing::hash_of(&(&reason_hash, &who));
 			ensure!(!Tips::<T>::contains_key(&hash), Error::<T>::AlreadyKnown);
 
-			let deposit = T::TipReportDepositBase::get()
-				+ T::DataDepositPerByte::get() * (reason.len() as u32).into();
+			let deposit = T::TipReportDepositBase::get() +
+				T::DataDepositPerByte::get() * (reason.len() as u32).into();
 			T::Currency::reserve(&finder, deposit)?;
 
 			Reasons::<T>::insert(&reason_hash, &reason);
@@ -257,10 +263,11 @@ decl_module! {
 				deposit,
 				closes: None,
 				tips: vec![],
-				finders_fee: true
+				finders_fee: true,
 			};
 			Tips::<T>::insert(&hash, tip);
-			Self::deposit_event(RawEvent::NewTip(hash));
+			Self::deposit_event(Event::NewTip(hash));
+			Ok(())
 		}
 
 		/// Retract a prior tip-report from `report_awesome`, and cancel the process of tipping.
@@ -282,8 +289,8 @@ decl_module! {
 		/// - DbReads: `Tips`, `origin account`
 		/// - DbWrites: `Reasons`, `Tips`, `origin account`
 		/// # </weight>
-		#[weight = <T as Config>::WeightInfo::retract_tip()]
-		fn retract_tip(origin, hash: T::Hash) {
+		#[pallet::weight(<T as Config>::WeightInfo::retract_tip())]
+		pub fn retract_tip(origin: OriginFor<T>, hash: T::Hash) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			let tip = Tips::<T>::get(&hash).ok_or(Error::<T>::UnknownTip)?;
 			ensure!(tip.finder == who, Error::<T>::NotFinder);
@@ -294,7 +301,8 @@ decl_module! {
 				let err_amount = T::Currency::unreserve(&who, tip.deposit);
 				debug_assert!(err_amount.is_zero());
 			}
-			Self::deposit_event(RawEvent::TipRetracted(hash));
+			Self::deposit_event(Event::TipRetracted(hash));
+			Ok(())
 		}
 
 		/// Give a tip for something new; no finder's fee will be taken.
@@ -312,15 +320,20 @@ decl_module! {
 		///
 		/// # <weight>
 		/// - Complexity: `O(R + T)` where `R` length of `reason`, `T` is the number of tippers.
-		///   - `O(T)`: decoding `Tipper` vec of length `T`
-		///     `T` is charged as upper bound given by `ContainsLengthBound`.
-		///     The actual cost depends on the implementation of `T::Tippers`.
+		///   - `O(T)`: decoding `Tipper` vec of length `T`. `T` is charged as upper bound given by
+		///     `ContainsLengthBound`. The actual cost depends on the implementation of
+		///     `T::Tippers`.
 		///   - `O(R)`: hashing and encoding of reason of length `R`
 		/// - DbReads: `Tippers`, `Reasons`
 		/// - DbWrites: `Reasons`, `Tips`
 		/// # </weight>
-		#[weight = <T as Config>::WeightInfo::tip_new(reason.len() as u32, T::Tippers::max_len() as u32)]
-		fn tip_new(origin, reason: Vec<u8>, who: T::AccountId, #[compact] tip_value: BalanceOf<T>) {
+		#[pallet::weight(<T as Config>::WeightInfo::tip_new(reason.len() as u32, T::Tippers::max_len() as u32))]
+		pub fn tip_new(
+			origin: OriginFor<T>,
+			reason: Vec<u8>,
+			who: T::AccountId,
+			#[pallet::compact] tip_value: BalanceOf<T>,
+		) -> DispatchResult {
 			let tipper = ensure_signed(origin)?;
 			ensure!(T::Tippers::contains(&tipper), BadOrigin);
 			let reason_hash = T::Hashing::hash(&reason[..]);
@@ -328,7 +341,7 @@ decl_module! {
 			let hash = T::Hashing::hash_of(&(&reason_hash, &who));
 
 			Reasons::<T>::insert(&reason_hash, &reason);
-			Self::deposit_event(RawEvent::NewTip(hash.clone()));
+			Self::deposit_event(Event::NewTip(hash.clone()));
 			let tips = vec![(tipper.clone(), tip_value)];
 			let tip = OpenTip {
 				reason: reason_hash,
@@ -340,6 +353,7 @@ decl_module! {
 				finders_fee: false,
 			};
 			Tips::<T>::insert(&hash, tip);
+			Ok(())
 		}
 
 		/// Declare a tip value for an already-open tip.
@@ -357,26 +371,30 @@ decl_module! {
 		/// has started.
 		///
 		/// # <weight>
-		/// - Complexity: `O(T)` where `T` is the number of tippers.
-		///   decoding `Tipper` vec of length `T`, insert tip and check closing,
-		///   `T` is charged as upper bound given by `ContainsLengthBound`.
-		///   The actual cost depends on the implementation of `T::Tippers`.
+		/// - Complexity: `O(T)` where `T` is the number of tippers. decoding `Tipper` vec of length
+		///   `T`, insert tip and check closing, `T` is charged as upper bound given by
+		///   `ContainsLengthBound`. The actual cost depends on the implementation of `T::Tippers`.
 		///
 		///   Actually weight could be lower as it depends on how many tips are in `OpenTip` but it
 		///   is weighted as if almost full i.e of length `T-1`.
 		/// - DbReads: `Tippers`, `Tips`
 		/// - DbWrites: `Tips`
 		/// # </weight>
-		#[weight = <T as Config>::WeightInfo::tip(T::Tippers::max_len() as u32)]
-		fn tip(origin, hash: T::Hash, #[compact] tip_value: BalanceOf<T>) {
+		#[pallet::weight(<T as Config>::WeightInfo::tip(T::Tippers::max_len() as u32))]
+		pub fn tip(
+			origin: OriginFor<T>,
+			hash: T::Hash,
+			#[pallet::compact] tip_value: BalanceOf<T>,
+		) -> DispatchResult {
 			let tipper = ensure_signed(origin)?;
 			ensure!(T::Tippers::contains(&tipper), BadOrigin);
 
 			let mut tip = Tips::<T>::get(hash).ok_or(Error::<T>::UnknownTip)?;
 			if Self::insert_tip_and_check_closing(&mut tip, tipper, tip_value) {
-				Self::deposit_event(RawEvent::TipClosing(hash.clone()));
+				Self::deposit_event(Event::TipClosing(hash.clone()));
 			}
 			Tips::<T>::insert(&hash, tip);
+			Ok(())
 		}
 
 		/// Close and payout a tip.
@@ -389,24 +407,24 @@ decl_module! {
 		///   as the hash of the tuple of the original tip `reason` and the beneficiary account ID.
 		///
 		/// # <weight>
-		/// - Complexity: `O(T)` where `T` is the number of tippers.
-		///   decoding `Tipper` vec of length `T`.
-		///   `T` is charged as upper bound given by `ContainsLengthBound`.
-		///   The actual cost depends on the implementation of `T::Tippers`.
+		/// - Complexity: `O(T)` where `T` is the number of tippers. decoding `Tipper` vec of length
+		///   `T`. `T` is charged as upper bound given by `ContainsLengthBound`. The actual cost
+		///   depends on the implementation of `T::Tippers`.
 		/// - DbReads: `Tips`, `Tippers`, `tip finder`
 		/// - DbWrites: `Reasons`, `Tips`, `Tippers`, `tip finder`
 		/// # </weight>
-		#[weight = <T as Config>::WeightInfo::close_tip(T::Tippers::max_len() as u32)]
-		fn close_tip(origin, hash: T::Hash) {
+		#[pallet::weight(<T as Config>::WeightInfo::close_tip(T::Tippers::max_len() as u32))]
+		pub fn close_tip(origin: OriginFor<T>, hash: T::Hash) -> DispatchResult {
 			ensure_signed(origin)?;
 
 			let tip = Tips::<T>::get(hash).ok_or(Error::<T>::UnknownTip)?;
 			let n = tip.closes.as_ref().ok_or(Error::<T>::StillOpen)?;
-			ensure!(system::Pallet::<T>::block_number() >= *n, Error::<T>::Premature);
+			ensure!(frame_system::Pallet::<T>::block_number() >= *n, Error::<T>::Premature);
 			// closed.
 			Reasons::<T>::remove(&tip.reason);
 			Tips::<T>::remove(hash);
 			Self::payout_tip(hash, tip);
+			Ok(())
 		}
 
 		/// Remove and slash an already-open tip.
@@ -421,8 +439,8 @@ decl_module! {
 		///   `T` is charged as upper bound given by `ContainsLengthBound`.
 		///   The actual cost depends on the implementation of `T::Tippers`.
 		/// # </weight>
-		#[weight = <T as Config>::WeightInfo::slash_tip(T::Tippers::max_len() as u32)]
-		fn slash_tip(origin, hash: T::Hash) {
+		#[pallet::weight(<T as Config>::WeightInfo::slash_tip(T::Tippers::max_len() as u32))]
+		pub fn slash_tip(origin: OriginFor<T>, hash: T::Hash) -> DispatchResult {
 			T::RejectOrigin::ensure_origin(origin)?;
 
 			let tip = Tips::<T>::take(hash).ok_or(Error::<T>::UnknownTip)?;
@@ -432,12 +450,13 @@ decl_module! {
 				T::OnSlash::on_unbalanced(imbalance);
 			}
 			Reasons::<T>::remove(&tip.reason);
-			Self::deposit_event(RawEvent::TipSlashed(hash, tip.finder, tip.deposit));
+			Self::deposit_event(Event::TipSlashed(hash, tip.finder, tip.deposit));
+			Ok(())
 		}
 	}
 }
 
-impl<T: Config> Module<T> {
+impl<T: Config> Pallet<T> {
 	// Add public immutables and private mutables.
 
 	/// The account ID of the treasury pot.
@@ -464,7 +483,7 @@ impl<T: Config> Module<T> {
 		Self::retain_active_tips(&mut tip.tips);
 		let threshold = (T::Tippers::count() + 1) / 2;
 		if tip.tips.len() >= threshold && tip.closes.is_none() {
-			tip.closes = Some(system::Pallet::<T>::block_number() + T::TipCountdown::get());
+			tip.closes = Some(frame_system::Pallet::<T>::block_number() + T::TipCountdown::get());
 			true
 		} else {
 			false
@@ -526,10 +545,10 @@ impl<T: Config> Module<T> {
 		// same as above: best-effort only.
 		let res = T::Currency::transfer(&treasury, &tip.who, payout, KeepAlive);
 		debug_assert!(res.is_ok());
-		Self::deposit_event(RawEvent::TipClosed(hash, tip.who, payout));
+		Self::deposit_event(Event::TipClosed(hash, tip.who, payout));
 	}
 
-	pub fn migrate_retract_tip_for_tip_new() {
+	pub fn migrate_retract_tip_for_tip_new(module: &[u8], item: &[u8]) {
 		/// An open tipping "motion". Retains all details of a tip including information on the
 		/// finder and the members who have voted.
 		#[derive(Clone, Eq, PartialEq, Encode, Decode, RuntimeDebug)]
@@ -559,7 +578,7 @@ impl<T: Config> Module<T> {
 			T::Hash,
 			OldOpenTip<T::AccountId, BalanceOf<T>, T::BlockNumber, T::Hash>,
 			Twox64Concat,
-		>(b"Treasury", b"Tips")
+		>(module, item)
 		.drain()
 		{
 			let (finder, deposit, finders_fee) = match old_tip.finder {
diff --git a/frame/tips/src/migrations/mod.rs b/frame/tips/src/migrations/mod.rs
new file mode 100644
index 000000000000..81139120da1c
--- /dev/null
+++ b/frame/tips/src/migrations/mod.rs
@@ -0,0 +1,23 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/// Version 4.
+///
+/// For backward compatability reasons, pallet-tips uses `Treasury` for storage module prefix
+/// before calling this migration. After calling this migration, it will get replaced with
+/// own storage identifier.
+pub mod v4;
diff --git a/frame/tips/src/migrations/v4.rs b/frame/tips/src/migrations/v4.rs
new file mode 100644
index 000000000000..69df1d08d2c8
--- /dev/null
+++ b/frame/tips/src/migrations/v4.rs
@@ -0,0 +1,195 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use sp_io::hashing::twox_128;
+use sp_std::str;
+
+use frame_support::{
+	storage::StoragePrefixedMap,
+	traits::{
+		Get, GetStorageVersion, PalletInfoAccess, StorageVersion,
+		STORAGE_VERSION_STORAGE_KEY_POSTFIX,
+	},
+	weights::Weight,
+};
+
+use crate as pallet_tips;
+
+/// Migrate the entire storage of this pallet to a new prefix.
+///
+/// This new prefix must be the same as the one set in construct_runtime.
+/// For safety, use `PalletInfo` to get it, as:
+/// `<Runtime as frame_system::Config>::PalletInfo::name::<TipsPallet>`.
+///
+/// The migration will look into the storage version in order not to trigger a migration on an up
+/// to date storage. Thus the on chain storage version must be less than 4 in order to trigger the
+/// migration.
+pub fn migrate<T: pallet_tips::Config, P: GetStorageVersion + PalletInfoAccess, N: AsRef<str>>(
+	old_pallet_name: N,
+) -> Weight {
+	let old_pallet_name = old_pallet_name.as_ref();
+	let new_pallet_name = <P as PalletInfoAccess>::name();
+
+	if new_pallet_name == old_pallet_name {
+		log::info!(
+			target: "runtime::tips",
+			"New pallet name is equal to the old prefix. No migration needs to be done.",
+		);
+		return 0
+	}
+
+	let on_chain_storage_version = <P as GetStorageVersion>::on_chain_storage_version();
+	log::info!(
+		target: "runtime::tips",
+		"Running migration to v4 for tips with storage version {:?}",
+		on_chain_storage_version,
+	);
+
+	if on_chain_storage_version < 4 {
+		let storage_prefix = pallet_tips::Tips::<T>::storage_prefix();
+		frame_support::storage::migration::move_storage_from_pallet(
+			storage_prefix,
+			old_pallet_name.as_bytes(),
+			new_pallet_name.as_bytes(),
+		);
+		log_migration("migration", storage_prefix, old_pallet_name, new_pallet_name);
+
+		let storage_prefix = pallet_tips::Reasons::<T>::storage_prefix();
+		frame_support::storage::migration::move_storage_from_pallet(
+			storage_prefix,
+			old_pallet_name.as_bytes(),
+			new_pallet_name.as_bytes(),
+		);
+		log_migration("migration", storage_prefix, old_pallet_name, new_pallet_name);
+
+		StorageVersion::new(4).put::<P>();
+		<T as frame_system::Config>::BlockWeights::get().max_block
+	} else {
+		log::warn!(
+			target: "runtime::tips",
+			"Attempted to apply migration to v4 but failed because storage version is {:?}",
+			on_chain_storage_version,
+		);
+		0
+	}
+}
+
+/// Some checks prior to migration. This can be linked to
+/// [`frame_support::traits::OnRuntimeUpgrade::pre_upgrade`] for further testing.
+///
+/// Panics if anything goes wrong.
+pub fn pre_migrate<
+	T: pallet_tips::Config,
+	P: GetStorageVersion + PalletInfoAccess,
+	N: AsRef<str>,
+>(
+	old_pallet_name: N,
+) {
+	let old_pallet_name = old_pallet_name.as_ref();
+	let new_pallet_name = <P as PalletInfoAccess>::name();
+
+	let storage_prefix_tips = pallet_tips::Tips::<T>::storage_prefix();
+	let storage_prefix_reasons = pallet_tips::Reasons::<T>::storage_prefix();
+
+	log_migration("pre-migration", storage_prefix_tips, old_pallet_name, new_pallet_name);
+	log_migration("pre-migration", storage_prefix_reasons, old_pallet_name, new_pallet_name);
+
+	if new_pallet_name == old_pallet_name {
+		return
+	}
+
+	let new_pallet_prefix = twox_128(new_pallet_name.as_bytes());
+	let storage_version_key = twox_128(STORAGE_VERSION_STORAGE_KEY_POSTFIX);
+
+	let mut new_pallet_prefix_iter = frame_support::storage::KeyPrefixIterator::new(
+		new_pallet_prefix.to_vec(),
+		new_pallet_prefix.to_vec(),
+		|key| Ok(key.to_vec()),
+	);
+
+	// Ensure nothing except the storage_version_key is stored in the new prefix.
+	assert!(new_pallet_prefix_iter.all(|key| key == storage_version_key));
+
+	assert!(<P as GetStorageVersion>::on_chain_storage_version() < 4);
+}
+
+/// Some checks for after migration. This can be linked to
+/// [`frame_support::traits::OnRuntimeUpgrade::post_upgrade`] for further testing.
+///
+/// Panics if anything goes wrong.
+pub fn post_migrate<
+	T: pallet_tips::Config,
+	P: GetStorageVersion + PalletInfoAccess,
+	N: AsRef<str>,
+>(
+	old_pallet_name: N,
+) {
+	let old_pallet_name = old_pallet_name.as_ref();
+	let new_pallet_name = <P as PalletInfoAccess>::name();
+
+	let storage_prefix_tips = pallet_tips::Tips::<T>::storage_prefix();
+	let storage_prefix_reasons = pallet_tips::Reasons::<T>::storage_prefix();
+
+	log_migration("post-migration", storage_prefix_tips, old_pallet_name, new_pallet_name);
+	log_migration("post-migration", storage_prefix_reasons, old_pallet_name, new_pallet_name);
+
+	if new_pallet_name == old_pallet_name {
+		return
+	}
+
+	// Assert that no `Tips` and `Reasons` storages remains at the old prefix.
+	let old_pallet_prefix = twox_128(old_pallet_name.as_bytes());
+	let old_tips_key = [&old_pallet_prefix, &twox_128(storage_prefix_tips)[..]].concat();
+	let old_tips_key_iter = frame_support::storage::KeyPrefixIterator::new(
+		old_tips_key.to_vec(),
+		old_tips_key.to_vec(),
+		|_| Ok(()),
+	);
+	assert_eq!(old_tips_key_iter.count(), 0);
+
+	let old_reasons_key = [&old_pallet_prefix, &twox_128(storage_prefix_reasons)[..]].concat();
+	let old_reasons_key_iter = frame_support::storage::KeyPrefixIterator::new(
+		old_reasons_key.to_vec(),
+		old_reasons_key.to_vec(),
+		|_| Ok(()),
+	);
+	assert_eq!(old_reasons_key_iter.count(), 0);
+
+	// Assert that the `Tips` and `Reasons` storages (if they exist) have been moved to the new
+	// prefix.
+	// NOTE: storage_version_key is already in the new prefix.
+	let new_pallet_prefix = twox_128(new_pallet_name.as_bytes());
+	let new_pallet_prefix_iter = frame_support::storage::KeyPrefixIterator::new(
+		new_pallet_prefix.to_vec(),
+		new_pallet_prefix.to_vec(),
+		|_| Ok(()),
+	);
+	assert!(new_pallet_prefix_iter.count() >= 1);
+
+	assert_eq!(<P as GetStorageVersion>::on_chain_storage_version(), 4);
+}
+
+fn log_migration(stage: &str, storage_prefix: &[u8], old_pallet_name: &str, new_pallet_name: &str) {
+	log::info!(
+		target: "runtime::tips",
+		"{} prefix of storage '{}': '{}' ==> '{}'",
+		stage,
+		str::from_utf8(storage_prefix).unwrap_or("<Invalid UTF8>"),
+		old_pallet_name,
+		new_pallet_name,
+	);
+}
diff --git a/frame/tips/src/tests.rs b/frame/tips/src/tests.rs
index 8611320563c7..7ea80d78c553 100644
--- a/frame/tips/src/tests.rs
+++ b/frame/tips/src/tests.rs
@@ -19,19 +19,23 @@
 
 #![cfg(test)]
 
-use super::*;
-use crate as tips;
-use frame_support::{
-	assert_noop, assert_ok, pallet_prelude::GenesisBuild, parameter_types, traits::SortedMembers,
-	weights::Weight, PalletId,
-};
+use std::cell::RefCell;
+
 use sp_core::H256;
 use sp_runtime::{
 	testing::Header,
 	traits::{BadOrigin, BlakeTwo256, IdentityLookup},
 	Perbill, Permill,
 };
-use std::cell::RefCell;
+use sp_storage::Storage;
+
+use frame_support::{
+	assert_noop, assert_ok, pallet_prelude::GenesisBuild, parameter_types,
+	storage::StoragePrefixedMap, traits::SortedMembers, weights::Weight, PalletId,
+};
+
+use super::*;
+use crate::{self as pallet_tips, Event as TipEvent};
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -45,7 +49,7 @@ frame_support::construct_runtime!(
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
 		Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>},
-		TipsModTestInst: tips::{Pallet, Call, Storage, Event<T>},
+		Tips: pallet_tips::{Pallet, Call, Storage, Event<T>},
 	}
 );
 
@@ -173,11 +177,11 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 	t.into()
 }
 
-fn last_event() -> RawEvent<u64, u128, H256> {
+fn last_event() -> TipEvent<Test> {
 	System::events()
 		.into_iter()
 		.map(|r| r.event)
-		.filter_map(|e| if let Event::TipsModTestInst(inner) = e { Some(inner) } else { None })
+		.filter_map(|e| if let Event::Tips(inner) = e { Some(inner) } else { None })
 		.last()
 		.unwrap()
 }
@@ -198,9 +202,9 @@ fn tip_hash() -> H256 {
 fn tip_new_cannot_be_used_twice() {
 	new_test_ext().execute_with(|| {
 		Balances::make_free_balance_be(&Treasury::account_id(), 101);
-		assert_ok!(TipsModTestInst::tip_new(Origin::signed(10), b"awesome.dot".to_vec(), 3, 10));
+		assert_ok!(Tips::tip_new(Origin::signed(10), b"awesome.dot".to_vec(), 3, 10));
 		assert_noop!(
-			TipsModTestInst::tip_new(Origin::signed(11), b"awesome.dot".to_vec(), 3, 10),
+			Tips::tip_new(Origin::signed(11), b"awesome.dot".to_vec(), 3, 10),
 			Error::<Test>::AlreadyKnown
 		);
 	});
@@ -210,23 +214,23 @@ fn tip_new_cannot_be_used_twice() {
 fn report_awesome_and_tip_works() {
 	new_test_ext().execute_with(|| {
 		Balances::make_free_balance_be(&Treasury::account_id(), 101);
-		assert_ok!(TipsModTestInst::report_awesome(Origin::signed(0), b"awesome.dot".to_vec(), 3));
+		assert_ok!(Tips::report_awesome(Origin::signed(0), b"awesome.dot".to_vec(), 3));
 		assert_eq!(Balances::reserved_balance(0), 12);
 		assert_eq!(Balances::free_balance(0), 88);
 
 		// other reports don't count.
 		assert_noop!(
-			TipsModTestInst::report_awesome(Origin::signed(1), b"awesome.dot".to_vec(), 3),
+			Tips::report_awesome(Origin::signed(1), b"awesome.dot".to_vec(), 3),
 			Error::<Test>::AlreadyKnown
 		);
 
 		let h = tip_hash();
-		assert_ok!(TipsModTestInst::tip(Origin::signed(10), h.clone(), 10));
-		assert_ok!(TipsModTestInst::tip(Origin::signed(11), h.clone(), 10));
-		assert_ok!(TipsModTestInst::tip(Origin::signed(12), h.clone(), 10));
-		assert_noop!(TipsModTestInst::tip(Origin::signed(9), h.clone(), 10), BadOrigin);
+		assert_ok!(Tips::tip(Origin::signed(10), h.clone(), 10));
+		assert_ok!(Tips::tip(Origin::signed(11), h.clone(), 10));
+		assert_ok!(Tips::tip(Origin::signed(12), h.clone(), 10));
+		assert_noop!(Tips::tip(Origin::signed(9), h.clone(), 10), BadOrigin);
 		System::set_block_number(2);
-		assert_ok!(TipsModTestInst::close_tip(Origin::signed(100), h.into()));
+		assert_ok!(Tips::close_tip(Origin::signed(100), h.into()));
 		assert_eq!(Balances::reserved_balance(0), 0);
 		assert_eq!(Balances::free_balance(0), 102);
 		assert_eq!(Balances::free_balance(3), 8);
@@ -237,15 +241,15 @@ fn report_awesome_and_tip_works() {
 fn report_awesome_from_beneficiary_and_tip_works() {
 	new_test_ext().execute_with(|| {
 		Balances::make_free_balance_be(&Treasury::account_id(), 101);
-		assert_ok!(TipsModTestInst::report_awesome(Origin::signed(0), b"awesome.dot".to_vec(), 0));
+		assert_ok!(Tips::report_awesome(Origin::signed(0), b"awesome.dot".to_vec(), 0));
 		assert_eq!(Balances::reserved_balance(0), 12);
 		assert_eq!(Balances::free_balance(0), 88);
 		let h = BlakeTwo256::hash_of(&(BlakeTwo256::hash(b"awesome.dot"), 0u128));
-		assert_ok!(TipsModTestInst::tip(Origin::signed(10), h.clone(), 10));
-		assert_ok!(TipsModTestInst::tip(Origin::signed(11), h.clone(), 10));
-		assert_ok!(TipsModTestInst::tip(Origin::signed(12), h.clone(), 10));
+		assert_ok!(Tips::tip(Origin::signed(10), h.clone(), 10));
+		assert_ok!(Tips::tip(Origin::signed(11), h.clone(), 10));
+		assert_ok!(Tips::tip(Origin::signed(12), h.clone(), 10));
 		System::set_block_number(2);
-		assert_ok!(TipsModTestInst::close_tip(Origin::signed(100), h.into()));
+		assert_ok!(Tips::close_tip(Origin::signed(100), h.into()));
 		assert_eq!(Balances::reserved_balance(0), 0);
 		assert_eq!(Balances::free_balance(0), 110);
 	});
@@ -259,39 +263,30 @@ fn close_tip_works() {
 		Balances::make_free_balance_be(&Treasury::account_id(), 101);
 		assert_eq!(Treasury::pot(), 100);
 
-		assert_ok!(TipsModTestInst::tip_new(Origin::signed(10), b"awesome.dot".to_vec(), 3, 10));
+		assert_ok!(Tips::tip_new(Origin::signed(10), b"awesome.dot".to_vec(), 3, 10));
 
 		let h = tip_hash();
 
-		assert_eq!(last_event(), RawEvent::NewTip(h));
+		assert_eq!(last_event(), TipEvent::NewTip(h));
 
-		assert_ok!(TipsModTestInst::tip(Origin::signed(11), h.clone(), 10));
+		assert_ok!(Tips::tip(Origin::signed(11), h.clone(), 10));
 
-		assert_noop!(
-			TipsModTestInst::close_tip(Origin::signed(0), h.into()),
-			Error::<Test>::StillOpen
-		);
+		assert_noop!(Tips::close_tip(Origin::signed(0), h.into()), Error::<Test>::StillOpen);
 
-		assert_ok!(TipsModTestInst::tip(Origin::signed(12), h.clone(), 10));
+		assert_ok!(Tips::tip(Origin::signed(12), h.clone(), 10));
 
-		assert_eq!(last_event(), RawEvent::TipClosing(h));
+		assert_eq!(last_event(), TipEvent::TipClosing(h));
 
-		assert_noop!(
-			TipsModTestInst::close_tip(Origin::signed(0), h.into()),
-			Error::<Test>::Premature
-		);
+		assert_noop!(Tips::close_tip(Origin::signed(0), h.into()), Error::<Test>::Premature);
 
 		System::set_block_number(2);
-		assert_noop!(TipsModTestInst::close_tip(Origin::none(), h.into()), BadOrigin);
-		assert_ok!(TipsModTestInst::close_tip(Origin::signed(0), h.into()));
+		assert_noop!(Tips::close_tip(Origin::none(), h.into()), BadOrigin);
+		assert_ok!(Tips::close_tip(Origin::signed(0), h.into()));
 		assert_eq!(Balances::free_balance(3), 10);
 
-		assert_eq!(last_event(), RawEvent::TipClosed(h, 3, 10));
+		assert_eq!(last_event(), TipEvent::TipClosed(h, 3, 10));
 
-		assert_noop!(
-			TipsModTestInst::close_tip(Origin::signed(100), h.into()),
-			Error::<Test>::UnknownTip
-		);
+		assert_noop!(Tips::close_tip(Origin::signed(100), h.into()), Error::<Test>::UnknownTip);
 	});
 }
 
@@ -305,20 +300,20 @@ fn slash_tip_works() {
 		assert_eq!(Balances::reserved_balance(0), 0);
 		assert_eq!(Balances::free_balance(0), 100);
 
-		assert_ok!(TipsModTestInst::report_awesome(Origin::signed(0), b"awesome.dot".to_vec(), 3));
+		assert_ok!(Tips::report_awesome(Origin::signed(0), b"awesome.dot".to_vec(), 3));
 
 		assert_eq!(Balances::reserved_balance(0), 12);
 		assert_eq!(Balances::free_balance(0), 88);
 
 		let h = tip_hash();
-		assert_eq!(last_event(), RawEvent::NewTip(h));
+		assert_eq!(last_event(), TipEvent::NewTip(h));
 
 		// can't remove from any origin
-		assert_noop!(TipsModTestInst::slash_tip(Origin::signed(0), h.clone()), BadOrigin);
+		assert_noop!(Tips::slash_tip(Origin::signed(0), h.clone()), BadOrigin);
 
 		// can remove from root.
-		assert_ok!(TipsModTestInst::slash_tip(Origin::root(), h.clone()));
-		assert_eq!(last_event(), RawEvent::TipSlashed(h, 0, 12));
+		assert_ok!(Tips::slash_tip(Origin::root(), h.clone()));
+		assert_eq!(last_event(), TipEvent::TipSlashed(h, 0, 12));
 
 		// tipper slashed
 		assert_eq!(Balances::reserved_balance(0), 0);
@@ -331,38 +326,26 @@ fn retract_tip_works() {
 	new_test_ext().execute_with(|| {
 		// with report awesome
 		Balances::make_free_balance_be(&Treasury::account_id(), 101);
-		assert_ok!(TipsModTestInst::report_awesome(Origin::signed(0), b"awesome.dot".to_vec(), 3));
+		assert_ok!(Tips::report_awesome(Origin::signed(0), b"awesome.dot".to_vec(), 3));
 		let h = tip_hash();
-		assert_ok!(TipsModTestInst::tip(Origin::signed(10), h.clone(), 10));
-		assert_ok!(TipsModTestInst::tip(Origin::signed(11), h.clone(), 10));
-		assert_ok!(TipsModTestInst::tip(Origin::signed(12), h.clone(), 10));
-		assert_noop!(
-			TipsModTestInst::retract_tip(Origin::signed(10), h.clone()),
-			Error::<Test>::NotFinder
-		);
-		assert_ok!(TipsModTestInst::retract_tip(Origin::signed(0), h.clone()));
+		assert_ok!(Tips::tip(Origin::signed(10), h.clone(), 10));
+		assert_ok!(Tips::tip(Origin::signed(11), h.clone(), 10));
+		assert_ok!(Tips::tip(Origin::signed(12), h.clone(), 10));
+		assert_noop!(Tips::retract_tip(Origin::signed(10), h.clone()), Error::<Test>::NotFinder);
+		assert_ok!(Tips::retract_tip(Origin::signed(0), h.clone()));
 		System::set_block_number(2);
-		assert_noop!(
-			TipsModTestInst::close_tip(Origin::signed(0), h.into()),
-			Error::<Test>::UnknownTip
-		);
+		assert_noop!(Tips::close_tip(Origin::signed(0), h.into()), Error::<Test>::UnknownTip);
 
 		// with tip new
 		Balances::make_free_balance_be(&Treasury::account_id(), 101);
-		assert_ok!(TipsModTestInst::tip_new(Origin::signed(10), b"awesome.dot".to_vec(), 3, 10));
+		assert_ok!(Tips::tip_new(Origin::signed(10), b"awesome.dot".to_vec(), 3, 10));
 		let h = tip_hash();
-		assert_ok!(TipsModTestInst::tip(Origin::signed(11), h.clone(), 10));
-		assert_ok!(TipsModTestInst::tip(Origin::signed(12), h.clone(), 10));
-		assert_noop!(
-			TipsModTestInst::retract_tip(Origin::signed(0), h.clone()),
-			Error::<Test>::NotFinder
-		);
-		assert_ok!(TipsModTestInst::retract_tip(Origin::signed(10), h.clone()));
+		assert_ok!(Tips::tip(Origin::signed(11), h.clone(), 10));
+		assert_ok!(Tips::tip(Origin::signed(12), h.clone(), 10));
+		assert_noop!(Tips::retract_tip(Origin::signed(0), h.clone()), Error::<Test>::NotFinder);
+		assert_ok!(Tips::retract_tip(Origin::signed(10), h.clone()));
 		System::set_block_number(2);
-		assert_noop!(
-			TipsModTestInst::close_tip(Origin::signed(10), h.into()),
-			Error::<Test>::UnknownTip
-		);
+		assert_noop!(Tips::close_tip(Origin::signed(10), h.into()), Error::<Test>::UnknownTip);
 	});
 }
 
@@ -370,12 +353,12 @@ fn retract_tip_works() {
 fn tip_median_calculation_works() {
 	new_test_ext().execute_with(|| {
 		Balances::make_free_balance_be(&Treasury::account_id(), 101);
-		assert_ok!(TipsModTestInst::tip_new(Origin::signed(10), b"awesome.dot".to_vec(), 3, 0));
+		assert_ok!(Tips::tip_new(Origin::signed(10), b"awesome.dot".to_vec(), 3, 0));
 		let h = tip_hash();
-		assert_ok!(TipsModTestInst::tip(Origin::signed(11), h.clone(), 10));
-		assert_ok!(TipsModTestInst::tip(Origin::signed(12), h.clone(), 1000000));
+		assert_ok!(Tips::tip(Origin::signed(11), h.clone(), 10));
+		assert_ok!(Tips::tip(Origin::signed(12), h.clone(), 1000000));
 		System::set_block_number(2);
-		assert_ok!(TipsModTestInst::close_tip(Origin::signed(0), h.into()));
+		assert_ok!(Tips::close_tip(Origin::signed(0), h.into()));
 		assert_eq!(Balances::free_balance(3), 10);
 	});
 }
@@ -384,25 +367,23 @@ fn tip_median_calculation_works() {
 fn tip_changing_works() {
 	new_test_ext().execute_with(|| {
 		Balances::make_free_balance_be(&Treasury::account_id(), 101);
-		assert_ok!(TipsModTestInst::tip_new(Origin::signed(10), b"awesome.dot".to_vec(), 3, 10000));
+		assert_ok!(Tips::tip_new(Origin::signed(10), b"awesome.dot".to_vec(), 3, 10000));
 		let h = tip_hash();
-		assert_ok!(TipsModTestInst::tip(Origin::signed(11), h.clone(), 10000));
-		assert_ok!(TipsModTestInst::tip(Origin::signed(12), h.clone(), 10000));
-		assert_ok!(TipsModTestInst::tip(Origin::signed(13), h.clone(), 0));
-		assert_ok!(TipsModTestInst::tip(Origin::signed(14), h.clone(), 0));
-		assert_ok!(TipsModTestInst::tip(Origin::signed(12), h.clone(), 1000));
-		assert_ok!(TipsModTestInst::tip(Origin::signed(11), h.clone(), 100));
-		assert_ok!(TipsModTestInst::tip(Origin::signed(10), h.clone(), 10));
+		assert_ok!(Tips::tip(Origin::signed(11), h.clone(), 10000));
+		assert_ok!(Tips::tip(Origin::signed(12), h.clone(), 10000));
+		assert_ok!(Tips::tip(Origin::signed(13), h.clone(), 0));
+		assert_ok!(Tips::tip(Origin::signed(14), h.clone(), 0));
+		assert_ok!(Tips::tip(Origin::signed(12), h.clone(), 1000));
+		assert_ok!(Tips::tip(Origin::signed(11), h.clone(), 100));
+		assert_ok!(Tips::tip(Origin::signed(10), h.clone(), 10));
 		System::set_block_number(2);
-		assert_ok!(TipsModTestInst::close_tip(Origin::signed(0), h.into()));
+		assert_ok!(Tips::close_tip(Origin::signed(0), h.into()));
 		assert_eq!(Balances::free_balance(3), 10);
 	});
 }
 
 #[test]
 fn test_last_reward_migration() {
-	use sp_storage::Storage;
-
 	let mut s = Storage::default();
 
 	#[derive(Clone, Eq, PartialEq, Encode, Decode, RuntimeDebug)]
@@ -449,18 +430,20 @@ fn test_last_reward_migration() {
 	};
 
 	let data = vec![
-		(Tips::<Test>::hashed_key_for(hash1), old_tip_finder.encode().to_vec()),
-		(Tips::<Test>::hashed_key_for(hash2), old_tip_no_finder.encode().to_vec()),
+		(pallet_tips::Tips::<Test>::hashed_key_for(hash1), old_tip_finder.encode().to_vec()),
+		(pallet_tips::Tips::<Test>::hashed_key_for(hash2), old_tip_no_finder.encode().to_vec()),
 	];
 
 	s.top = data.into_iter().collect();
 
 	sp_io::TestExternalities::new(s).execute_with(|| {
-		TipsModTestInst::migrate_retract_tip_for_tip_new();
+		let module = pallet_tips::Tips::<Test>::module_prefix();
+		let item = pallet_tips::Tips::<Test>::storage_prefix();
+		Tips::migrate_retract_tip_for_tip_new(module, item);
 
 		// Test w/ finder
 		assert_eq!(
-			Tips::<Test>::get(hash1),
+			pallet_tips::Tips::<Test>::get(hash1),
 			Some(OpenTip {
 				reason: reason1,
 				who: 10,
@@ -474,7 +457,7 @@ fn test_last_reward_migration() {
 
 		// Test w/o finder
 		assert_eq!(
-			Tips::<Test>::get(hash2),
+			pallet_tips::Tips::<Test>::get(hash2),
 			Some(OpenTip {
 				reason: reason2,
 				who: 20,
@@ -488,6 +471,62 @@ fn test_last_reward_migration() {
 	});
 }
 
+#[test]
+fn test_migration_v4() {
+	let reason1 = BlakeTwo256::hash(b"reason1");
+	let hash1 = BlakeTwo256::hash_of(&(reason1, 10u64));
+
+	let tip = OpenTip::<u128, u64, u64, H256> {
+		reason: reason1,
+		who: 10,
+		finder: 20,
+		deposit: 30,
+		closes: Some(13),
+		tips: vec![(40, 50), (60, 70)],
+		finders_fee: true,
+	};
+
+	let data = vec![
+		(pallet_tips::Reasons::<Test>::hashed_key_for(hash1), reason1.encode().to_vec()),
+		(pallet_tips::Tips::<Test>::hashed_key_for(hash1), tip.encode().to_vec()),
+	];
+
+	let mut s = Storage::default();
+	s.top = data.into_iter().collect();
+
+	sp_io::TestExternalities::new(s).execute_with(|| {
+		use frame_support::traits::PalletInfoAccess;
+
+		let old_pallet = "Treasury";
+		let new_pallet = <Tips as PalletInfoAccess>::name();
+		frame_support::storage::migration::move_pallet(
+			new_pallet.as_bytes(),
+			old_pallet.as_bytes(),
+		);
+		StorageVersion::new(0).put::<Tips>();
+
+		crate::migrations::v4::pre_migrate::<Test, Tips, _>(old_pallet);
+		crate::migrations::v4::migrate::<Test, Tips, _>(old_pallet);
+		crate::migrations::v4::post_migrate::<Test, Tips, _>(old_pallet);
+	});
+
+	sp_io::TestExternalities::new(Storage::default()).execute_with(|| {
+		use frame_support::traits::PalletInfoAccess;
+
+		let old_pallet = "Treasury";
+		let new_pallet = <Tips as PalletInfoAccess>::name();
+		frame_support::storage::migration::move_pallet(
+			new_pallet.as_bytes(),
+			old_pallet.as_bytes(),
+		);
+		StorageVersion::new(0).put::<Tips>();
+
+		crate::migrations::v4::pre_migrate::<Test, Tips, _>(old_pallet);
+		crate::migrations::v4::migrate::<Test, Tips, _>(old_pallet);
+		crate::migrations::v4::post_migrate::<Test, Tips, _>(old_pallet);
+	});
+}
+
 #[test]
 fn genesis_funding_works() {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();

From 82e0e632a3fdab8296e667fb82fb46d72956a68e Mon Sep 17 00:00:00 2001
From: Squirrel <gilescope@gmail.com>
Date: Tue, 14 Sep 2021 11:13:36 +0100
Subject: [PATCH 1182/1194] substrate depends on openssl at the moment (#9556)

in some circumstances...
---
 shell.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shell.nix b/shell.nix
index 65a330bf33e1..9a2d30400631 100644
--- a/shell.nix
+++ b/shell.nix
@@ -13,6 +13,7 @@ in
 with nixpkgs; pkgs.mkShell {
   buildInputs = [
     clang
+    openssl.dev
     pkg-config
     rust-nightly
   ] ++ lib.optionals stdenv.isDarwin [

From f022e144bd3f06775d16015cce4375c9761cdede Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Sep 2021 10:36:11 +0000
Subject: [PATCH 1183/1194] Bump wat from 1.0.37 to 1.0.40 (#9771)

Bumps [wat](https://github.com/bytecodealliance/wasm-tools) from 1.0.37 to 1.0.40.
- [Release notes](https://github.com/bytecodealliance/wasm-tools/releases)
- [Commits](https://github.com/bytecodealliance/wasm-tools/compare/wat-1.0.37...wat-1.0.40)

---
updated-dependencies:
- dependency-name: wat
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3741a23d3c14..f1f3b7e00c65 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -11291,18 +11291,18 @@ dependencies = [
 
 [[package]]
 name = "wast"
-version = "35.0.0"
+version = "38.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db5ae96da18bb5926341516fd409b5a8ce4e4714da7f0a1063d3b20ac9f9a1e1"
+checksum = "0ebc29df4629f497e0893aacd40f13a4a56b85ef6eb4ab6d603f07244f1a7bf2"
 dependencies = [
  "leb128",
 ]
 
 [[package]]
 name = "wat"
-version = "1.0.37"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ec280a739b69173e0ffd12c1658507996836ba4e992ed9bc1e5385a0bd72a02"
+checksum = "adcfaeb27e2578d2c6271a45609f4a055e6d7ba3a12eff35b1fd5ba147bdf046"
 dependencies = [
  "wast",
 ]

From 644c17eda766f392b787c8c0e01e25748d644b29 Mon Sep 17 00:00:00 2001
From: Qinxuan Chen <koushiro.cqx@gmail.com>
Date: Tue, 14 Sep 2021 19:42:26 +0800
Subject: [PATCH 1184/1194] Migrate `pallet-collective` to the new pallet
 attribute macro (#9115)

* Migrate pallet-collective to the new pallet attribute macro

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* Add migrations

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* some nits

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* fix some indent

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* Fix

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* Fix

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* fmt

* fix migration

* fix migration

* fmt

* finally fix migration

* keep the storages public as they were

* Some nits

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* Fix migration

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* Fix migration and Add test

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* Some nits

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* improve test

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* improve test

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* Revert the changes of membership

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* Some nits

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* Fix test

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* Fix test

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* Some nits

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* don't assert that there is something at the old prefix in the pre-migrate

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

* cargo fmt

Co-authored-by: thiolliere <gui.thiolliere@gmail.com>
---
 frame/collective/Cargo.toml            |  19 +-
 frame/collective/src/benchmarking.rs   | 125 +++---
 frame/collective/src/lib.rs            | 501 ++++++++++++++-----------
 frame/collective/src/migrations/mod.rs |  19 +
 frame/collective/src/migrations/v4.rs  | 147 ++++++++
 frame/collective/src/tests.rs          | 205 ++++++----
 6 files changed, 655 insertions(+), 361 deletions(-)
 create mode 100644 frame/collective/src/migrations/mod.rs
 create mode 100644 frame/collective/src/migrations/v4.rs

diff --git a/frame/collective/Cargo.toml b/frame/collective/Cargo.toml
index 9fc5c7a3de4e..8828c6a61cd3 100644
--- a/frame/collective/Cargo.toml
+++ b/frame/collective/Cargo.toml
@@ -13,34 +13,35 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
-	"derive",
-] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+log = { version = "0.4.14", default-features = false }
+
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
-sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+
 frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
-log = { version = "0.4.14", default-features = false }
 
 [features]
 default = ["std"]
 std = [
 	"codec/std",
+	"log/std",
 	"sp-core/std",
-	"sp-std/std",
 	"sp-io/std",
-	"frame-support/std",
 	"sp-runtime/std",
-	"frame-system/std",
-	"log/std",
+	"sp-std/std",
 	"frame-benchmarking/std",
+	"frame-support/std",
+	"frame-system/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
 	"sp-runtime/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 ]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/collective/src/benchmarking.rs b/frame/collective/src/benchmarking.rs
index b966279a42ff..1ce7750278bc 100644
--- a/frame/collective/src/benchmarking.rs
+++ b/frame/collective/src/benchmarking.rs
@@ -18,26 +18,25 @@
 //! Staking pallet benchmarking.
 
 use super::*;
+use crate::Pallet as Collective;
 
-use frame_benchmarking::{
-	account, benchmarks_instance, impl_benchmark_test_suite, whitelisted_caller,
-};
-use frame_system::RawOrigin as SystemOrigin;
 use sp_runtime::traits::Bounded;
 use sp_std::mem::size_of;
 
-use crate::Module as Collective;
-use frame_system::{Call as SystemCall, Pallet as System};
+use frame_benchmarking::{
+	account, benchmarks_instance_pallet, impl_benchmark_test_suite, whitelisted_caller,
+};
+use frame_system::{Call as SystemCall, Pallet as System, RawOrigin as SystemOrigin};
 
 const SEED: u32 = 0;
 
 const MAX_BYTES: u32 = 1_024;
 
-fn assert_last_event<T: Config<I>, I: Instance>(generic_event: <T as Config<I>>::Event) {
+fn assert_last_event<T: Config<I>, I: 'static>(generic_event: <T as Config<I>>::Event) {
 	frame_system::Pallet::<T>::assert_last_event(generic_event.into());
 }
 
-benchmarks_instance! {
+benchmarks_instance_pallet! {
 	set_members {
 		let m in 1 .. T::MaxMembers::get();
 		let n in 1 .. T::MaxMembers::get();
@@ -53,7 +52,7 @@ benchmarks_instance! {
 		}
 		let old_members_count = old_members.len() as u32;
 
-		Collective::<T, _>::set_members(
+		Collective::<T, I>::set_members(
 			SystemOrigin::Root.into(),
 			old_members.clone(),
 			Some(last_old_member.clone()),
@@ -67,7 +66,7 @@ benchmarks_instance! {
 		for i in 0 .. p {
 			// Proposals should be different so that different proposal hashes are generated
 			let proposal: T::Proposal = SystemCall::<T>::remark(vec![i as u8; length]).into();
-			Collective::<T, _>::propose(
+			Collective::<T, I>::propose(
 				SystemOrigin::Signed(last_old_member.clone()).into(),
 				threshold,
 				Box::new(proposal.clone()),
@@ -80,7 +79,7 @@ benchmarks_instance! {
 			for j in 2 .. m - 1 {
 				let voter = &old_members[j as usize];
 				let approve = true;
-				Collective::<T, _>::vote(
+				Collective::<T, I>::vote(
 					SystemOrigin::Signed(voter.clone()).into(),
 					hash,
 					i,
@@ -101,7 +100,7 @@ benchmarks_instance! {
 	}: _(SystemOrigin::Root, new_members.clone(), Some(last_member), T::MaxMembers::get())
 	verify {
 		new_members.sort();
-		assert_eq!(Collective::<T, _>::members(), new_members);
+		assert_eq!(Collective::<T, I>::members(), new_members);
 	}
 
 	execute {
@@ -120,7 +119,7 @@ benchmarks_instance! {
 		let caller: T::AccountId = whitelisted_caller();
 		members.push(caller.clone());
 
-		Collective::<T, _>::set_members(SystemOrigin::Root.into(), members, None, T::MaxMembers::get())?;
+		Collective::<T, I>::set_members(SystemOrigin::Root.into(), members, None, T::MaxMembers::get())?;
 
 		let proposal: T::Proposal = SystemCall::<T>::remark(vec![1; b as usize]).into();
 
@@ -129,7 +128,7 @@ benchmarks_instance! {
 		let proposal_hash = T::Hashing::hash_of(&proposal);
 		// Note that execution fails due to mis-matched origin
 		assert_last_event::<T, I>(
-			RawEvent::MemberExecuted(proposal_hash, Err(DispatchError::BadOrigin)).into()
+			Event::MemberExecuted(proposal_hash, Err(DispatchError::BadOrigin)).into()
 		);
 	}
 
@@ -150,7 +149,7 @@ benchmarks_instance! {
 		let caller: T::AccountId = whitelisted_caller();
 		members.push(caller.clone());
 
-		Collective::<T, _>::set_members(SystemOrigin::Root.into(), members, None, T::MaxMembers::get())?;
+		Collective::<T, I>::set_members(SystemOrigin::Root.into(), members, None, T::MaxMembers::get())?;
 
 		let proposal: T::Proposal = SystemCall::<T>::remark(vec![1; b as usize]).into();
 		let threshold = 1;
@@ -160,7 +159,7 @@ benchmarks_instance! {
 		let proposal_hash = T::Hashing::hash_of(&proposal);
 		// Note that execution fails due to mis-matched origin
 		assert_last_event::<T, I>(
-			RawEvent::Executed(proposal_hash, Err(DispatchError::BadOrigin)).into()
+			Event::Executed(proposal_hash, Err(DispatchError::BadOrigin)).into()
 		);
 	}
 
@@ -180,14 +179,14 @@ benchmarks_instance! {
 		}
 		let caller: T::AccountId = whitelisted_caller();
 		members.push(caller.clone());
-		Collective::<T, _>::set_members(SystemOrigin::Root.into(), members, None, T::MaxMembers::get())?;
+		Collective::<T, I>::set_members(SystemOrigin::Root.into(), members, None, T::MaxMembers::get())?;
 
 		let threshold = m;
 		// Add previous proposals.
 		for i in 0 .. p - 1 {
 			// Proposals should be different so that different proposal hashes are generated
 			let proposal: T::Proposal = SystemCall::<T>::remark(vec![i as u8; b as usize]).into();
-			Collective::<T, _>::propose(
+			Collective::<T, I>::propose(
 				SystemOrigin::Signed(caller.clone()).into(),
 				threshold,
 				Box::new(proposal),
@@ -195,16 +194,16 @@ benchmarks_instance! {
 			)?;
 		}
 
-		assert_eq!(Collective::<T, _>::proposals().len(), (p - 1) as usize);
+		assert_eq!(Collective::<T, I>::proposals().len(), (p - 1) as usize);
 
 		let proposal: T::Proposal = SystemCall::<T>::remark(vec![p as u8; b as usize]).into();
 
 	}: propose(SystemOrigin::Signed(caller.clone()), threshold, Box::new(proposal.clone()), bytes_in_storage)
 	verify {
 		// New proposal is recorded
-		assert_eq!(Collective::<T, _>::proposals().len(), p as usize);
+		assert_eq!(Collective::<T, I>::proposals().len(), p as usize);
 		let proposal_hash = T::Hashing::hash_of(&proposal);
-		assert_last_event::<T, I>(RawEvent::Proposed(caller, p - 1, proposal_hash, threshold).into());
+		assert_last_event::<T, I>(Event::Proposed(caller, p - 1, proposal_hash, threshold).into());
 	}
 
 	vote {
@@ -225,7 +224,7 @@ benchmarks_instance! {
 		}
 		let voter: T::AccountId = account("voter", 0, SEED);
 		members.push(voter.clone());
-		Collective::<T, _>::set_members(SystemOrigin::Root.into(), members.clone(), None, T::MaxMembers::get())?;
+		Collective::<T, I>::set_members(SystemOrigin::Root.into(), members.clone(), None, T::MaxMembers::get())?;
 
 		// Threshold is 1 less than the number of members so that one person can vote nay
 		let threshold = m - 1;
@@ -235,7 +234,7 @@ benchmarks_instance! {
 		for i in 0 .. p {
 			// Proposals should be different so that different proposal hashes are generated
 			let proposal: T::Proposal = SystemCall::<T>::remark(vec![i as u8; b as usize]).into();
-			Collective::<T, _>::propose(
+			Collective::<T, I>::propose(
 				SystemOrigin::Signed(proposer.clone()).into(),
 				threshold,
 				Box::new(proposal.clone()),
@@ -249,7 +248,7 @@ benchmarks_instance! {
 		for j in 0 .. m - 3 {
 			let voter = &members[j as usize];
 			let approve = true;
-			Collective::<T, _>::vote(
+			Collective::<T, I>::vote(
 				SystemOrigin::Signed(voter.clone()).into(),
 				last_hash.clone(),
 				index,
@@ -258,14 +257,14 @@ benchmarks_instance! {
 		}
 		// Voter votes aye without resolving the vote.
 		let approve = true;
-		Collective::<T, _>::vote(
+		Collective::<T, I>::vote(
 			SystemOrigin::Signed(voter.clone()).into(),
 			last_hash.clone(),
 			index,
 			approve,
 		)?;
 
-		assert_eq!(Collective::<T, _>::proposals().len(), p as usize);
+		assert_eq!(Collective::<T, I>::proposals().len(), p as usize);
 
 		// Voter switches vote to nay, but does not kill the vote, just updates + inserts
 		let approve = false;
@@ -276,8 +275,8 @@ benchmarks_instance! {
 	}: _(SystemOrigin::Signed(voter), last_hash.clone(), index, approve)
 	verify {
 		// All proposals exist and the last proposal has just been updated.
-		assert_eq!(Collective::<T, _>::proposals().len(), p as usize);
-		let voting = Collective::<T, _>::voting(&last_hash).ok_or("Proposal Missing")?;
+		assert_eq!(Collective::<T, I>::proposals().len(), p as usize);
+		let voting = Collective::<T, I>::voting(&last_hash).ok_or("Proposal Missing")?;
 		assert_eq!(voting.ayes.len(), (m - 3) as usize);
 		assert_eq!(voting.nays.len(), 1);
 	}
@@ -300,7 +299,7 @@ benchmarks_instance! {
 		}
 		let voter: T::AccountId = account("voter", 0, SEED);
 		members.push(voter.clone());
-		Collective::<T, _>::set_members(SystemOrigin::Root.into(), members.clone(), None, T::MaxMembers::get())?;
+		Collective::<T, I>::set_members(SystemOrigin::Root.into(), members.clone(), None, T::MaxMembers::get())?;
 
 		// Threshold is total members so that one nay will disapprove the vote
 		let threshold = m;
@@ -310,7 +309,7 @@ benchmarks_instance! {
 		for i in 0 .. p {
 			// Proposals should be different so that different proposal hashes are generated
 			let proposal: T::Proposal = SystemCall::<T>::remark(vec![i as u8; bytes as usize]).into();
-			Collective::<T, _>::propose(
+			Collective::<T, I>::propose(
 				SystemOrigin::Signed(proposer.clone()).into(),
 				threshold,
 				Box::new(proposal.clone()),
@@ -324,7 +323,7 @@ benchmarks_instance! {
 		for j in 0 .. m - 2 {
 			let voter = &members[j as usize];
 			let approve = true;
-			Collective::<T, _>::vote(
+			Collective::<T, I>::vote(
 				SystemOrigin::Signed(voter.clone()).into(),
 				last_hash.clone(),
 				index,
@@ -333,18 +332,18 @@ benchmarks_instance! {
 		}
 		// Voter votes aye without resolving the vote.
 		let approve = true;
-		Collective::<T, _>::vote(
+		Collective::<T, I>::vote(
 			SystemOrigin::Signed(voter.clone()).into(),
 			last_hash.clone(),
 			index,
 			approve,
 		)?;
 
-		assert_eq!(Collective::<T, _>::proposals().len(), p as usize);
+		assert_eq!(Collective::<T, I>::proposals().len(), p as usize);
 
 		// Voter switches vote to nay, which kills the vote
 		let approve = false;
-		Collective::<T, _>::vote(
+		Collective::<T, I>::vote(
 			SystemOrigin::Signed(voter.clone()).into(),
 			last_hash.clone(),
 			index,
@@ -357,8 +356,8 @@ benchmarks_instance! {
 	}: close(SystemOrigin::Signed(voter), last_hash.clone(), index, Weight::max_value(), bytes_in_storage)
 	verify {
 		// The last proposal is removed.
-		assert_eq!(Collective::<T, _>::proposals().len(), (p - 1) as usize);
-		assert_last_event::<T, I>(RawEvent::Disapproved(last_hash).into());
+		assert_eq!(Collective::<T, I>::proposals().len(), (p - 1) as usize);
+		assert_last_event::<T, I>(Event::Disapproved(last_hash).into());
 	}
 
 	close_early_approved {
@@ -377,7 +376,7 @@ benchmarks_instance! {
 		}
 		let caller: T::AccountId = whitelisted_caller();
 		members.push(caller.clone());
-		Collective::<T, _>::set_members(SystemOrigin::Root.into(), members.clone(), None, T::MaxMembers::get())?;
+		Collective::<T, I>::set_members(SystemOrigin::Root.into(), members.clone(), None, T::MaxMembers::get())?;
 
 		// Threshold is 2 so any two ayes will approve the vote
 		let threshold = 2;
@@ -387,7 +386,7 @@ benchmarks_instance! {
 		for i in 0 .. p {
 			// Proposals should be different so that different proposal hashes are generated
 			let proposal: T::Proposal = SystemCall::<T>::remark(vec![i as u8; b as usize]).into();
-			Collective::<T, _>::propose(
+			Collective::<T, I>::propose(
 				SystemOrigin::Signed(caller.clone()).into(),
 				threshold,
 				Box::new(proposal.clone()),
@@ -397,7 +396,7 @@ benchmarks_instance! {
 		}
 
 		// Caller switches vote to nay on their own proposal, allowing them to be the deciding approval vote
-		Collective::<T, _>::vote(
+		Collective::<T, I>::vote(
 			SystemOrigin::Signed(caller.clone()).into(),
 			last_hash.clone(),
 			p - 1,
@@ -408,7 +407,7 @@ benchmarks_instance! {
 		for j in 2 .. m - 1 {
 			let voter = &members[j as usize];
 			let approve = false;
-			Collective::<T, _>::vote(
+			Collective::<T, I>::vote(
 				SystemOrigin::Signed(voter.clone()).into(),
 				last_hash.clone(),
 				p - 1,
@@ -417,19 +416,19 @@ benchmarks_instance! {
 		}
 
 		// Member zero is the first aye
-		Collective::<T, _>::vote(
+		Collective::<T, I>::vote(
 			SystemOrigin::Signed(members[0].clone()).into(),
 			last_hash.clone(),
 			p - 1,
 			true,
 		)?;
 
-		assert_eq!(Collective::<T, _>::proposals().len(), p as usize);
+		assert_eq!(Collective::<T, I>::proposals().len(), p as usize);
 
 		// Caller switches vote to aye, which passes the vote
 		let index = p - 1;
 		let approve = true;
-		Collective::<T, _>::vote(
+		Collective::<T, I>::vote(
 			SystemOrigin::Signed(caller.clone()).into(),
 			last_hash.clone(),
 			index, approve,
@@ -438,8 +437,8 @@ benchmarks_instance! {
 	}: close(SystemOrigin::Signed(caller), last_hash.clone(), index, Weight::max_value(), bytes_in_storage)
 	verify {
 		// The last proposal is removed.
-		assert_eq!(Collective::<T, _>::proposals().len(), (p - 1) as usize);
-		assert_last_event::<T, I>(RawEvent::Executed(last_hash, Err(DispatchError::BadOrigin)).into());
+		assert_eq!(Collective::<T, I>::proposals().len(), (p - 1) as usize);
+		assert_last_event::<T, I>(Event::Executed(last_hash, Err(DispatchError::BadOrigin)).into());
 	}
 
 	close_disapproved {
@@ -458,7 +457,7 @@ benchmarks_instance! {
 		}
 		let caller: T::AccountId = whitelisted_caller();
 		members.push(caller.clone());
-		Collective::<T, _>::set_members(
+		Collective::<T, I>::set_members(
 			SystemOrigin::Root.into(),
 			members.clone(),
 			Some(caller.clone()),
@@ -473,7 +472,7 @@ benchmarks_instance! {
 		for i in 0 .. p {
 			// Proposals should be different so that different proposal hashes are generated
 			let proposal: T::Proposal = SystemCall::<T>::remark(vec![i as u8; bytes as usize]).into();
-			Collective::<T, _>::propose(
+			Collective::<T, I>::propose(
 				SystemOrigin::Signed(caller.clone()).into(),
 				threshold,
 				Box::new(proposal.clone()),
@@ -488,7 +487,7 @@ benchmarks_instance! {
 		for j in 2 .. m - 1 {
 			let voter = &members[j as usize];
 			let approve = true;
-			Collective::<T, _>::vote(
+			Collective::<T, I>::vote(
 				SystemOrigin::Signed(voter.clone()).into(),
 				last_hash.clone(),
 				index,
@@ -497,7 +496,7 @@ benchmarks_instance! {
 		}
 
 		// caller is prime, prime votes nay
-		Collective::<T, _>::vote(
+		Collective::<T, I>::vote(
 			SystemOrigin::Signed(caller.clone()).into(),
 			last_hash.clone(),
 			index,
@@ -505,13 +504,13 @@ benchmarks_instance! {
 		)?;
 
 		System::<T>::set_block_number(T::BlockNumber::max_value());
-		assert_eq!(Collective::<T, _>::proposals().len(), p as usize);
+		assert_eq!(Collective::<T, I>::proposals().len(), p as usize);
 
 		// Prime nay will close it as disapproved
 	}: close(SystemOrigin::Signed(caller), last_hash, index, Weight::max_value(), bytes_in_storage)
 	verify {
-		assert_eq!(Collective::<T, _>::proposals().len(), (p - 1) as usize);
-		assert_last_event::<T, I>(RawEvent::Disapproved(last_hash).into());
+		assert_eq!(Collective::<T, I>::proposals().len(), (p - 1) as usize);
+		assert_last_event::<T, I>(Event::Disapproved(last_hash).into());
 	}
 
 	close_approved {
@@ -530,7 +529,7 @@ benchmarks_instance! {
 		}
 		let caller: T::AccountId = whitelisted_caller();
 		members.push(caller.clone());
-		Collective::<T, _>::set_members(
+		Collective::<T, I>::set_members(
 			SystemOrigin::Root.into(),
 			members.clone(),
 			Some(caller.clone()),
@@ -545,7 +544,7 @@ benchmarks_instance! {
 		for i in 0 .. p {
 			// Proposals should be different so that different proposal hashes are generated
 			let proposal: T::Proposal = SystemCall::<T>::remark(vec![i as u8; b as usize]).into();
-			Collective::<T, _>::propose(
+			Collective::<T, I>::propose(
 				SystemOrigin::Signed(caller.clone()).into(),
 				threshold,
 				Box::new(proposal.clone()),
@@ -567,7 +566,7 @@ benchmarks_instance! {
 		for j in 2 .. m - 1 {
 			let voter = &members[j as usize];
 			let approve = false;
-			Collective::<T, _>::vote(
+			Collective::<T, I>::vote(
 				SystemOrigin::Signed(voter.clone()).into(),
 				last_hash.clone(),
 				p - 1,
@@ -577,13 +576,13 @@ benchmarks_instance! {
 
 		// caller is prime, prime already votes aye by creating the proposal
 		System::<T>::set_block_number(T::BlockNumber::max_value());
-		assert_eq!(Collective::<T, _>::proposals().len(), p as usize);
+		assert_eq!(Collective::<T, I>::proposals().len(), p as usize);
 
 		// Prime aye will close it as approved
 	}: close(SystemOrigin::Signed(caller), last_hash, p - 1, Weight::max_value(), bytes_in_storage)
 	verify {
-		assert_eq!(Collective::<T, _>::proposals().len(), (p - 1) as usize);
-		assert_last_event::<T, I>(RawEvent::Executed(last_hash, Err(DispatchError::BadOrigin)).into());
+		assert_eq!(Collective::<T, I>::proposals().len(), (p - 1) as usize);
+		assert_last_event::<T, I>(Event::Executed(last_hash, Err(DispatchError::BadOrigin)).into());
 	}
 
 	disapprove_proposal {
@@ -601,7 +600,7 @@ benchmarks_instance! {
 		}
 		let caller: T::AccountId = account("caller", 0, SEED);
 		members.push(caller.clone());
-		Collective::<T, _>::set_members(
+		Collective::<T, I>::set_members(
 			SystemOrigin::Root.into(),
 			members.clone(),
 			Some(caller.clone()),
@@ -616,7 +615,7 @@ benchmarks_instance! {
 		for i in 0 .. p {
 			// Proposals should be different so that different proposal hashes are generated
 			let proposal: T::Proposal = SystemCall::<T>::remark(vec![i as u8; b as usize]).into();
-			Collective::<T, _>::propose(
+			Collective::<T, I>::propose(
 				SystemOrigin::Signed(caller.clone()).into(),
 				threshold,
 				Box::new(proposal.clone()),
@@ -626,12 +625,12 @@ benchmarks_instance! {
 		}
 
 		System::<T>::set_block_number(T::BlockNumber::max_value());
-		assert_eq!(Collective::<T, _>::proposals().len(), p as usize);
+		assert_eq!(Collective::<T, I>::proposals().len(), p as usize);
 
 	}: _(SystemOrigin::Root, last_hash)
 	verify {
-		assert_eq!(Collective::<T, _>::proposals().len(), (p - 1) as usize);
-		assert_last_event::<T, I>(RawEvent::Disapproved(last_hash).into());
+		assert_eq!(Collective::<T, I>::proposals().len(), (p - 1) as usize);
+		assert_last_event::<T, I>(Event::Disapproved(last_hash).into());
 	}
 }
 
diff --git a/frame/collective/src/lib.rs b/frame/collective/src/lib.rs
index fc40fd554129..fa537a0a439a 100644
--- a/frame/collective/src/lib.rs
+++ b/frame/collective/src/lib.rs
@@ -45,29 +45,27 @@
 use sp_core::u32_trait::Value as U32;
 use sp_io::storage;
 use sp_runtime::{traits::Hash, RuntimeDebug};
-use sp_std::{prelude::*, result};
+use sp_std::{marker::PhantomData, prelude::*, result};
 
 use frame_support::{
 	codec::{Decode, Encode},
-	decl_error, decl_event, decl_module, decl_storage,
-	dispatch::{
-		DispatchError, DispatchResult, DispatchResultWithPostInfo, Dispatchable, Parameter,
-		PostDispatchInfo,
-	},
+	dispatch::{DispatchError, DispatchResultWithPostInfo, Dispatchable, PostDispatchInfo},
 	ensure,
-	traits::{Backing, ChangeMembers, EnsureOrigin, Get, GetBacking, InitializeMembers},
-	weights::{DispatchClass, GetDispatchInfo, Pays, Weight},
-	BoundedVec,
+	traits::{
+		Backing, ChangeMembers, EnsureOrigin, Get, GetBacking, InitializeMembers, StorageVersion,
+	},
+	weights::{GetDispatchInfo, Weight},
 };
-use frame_system::{self as system, ensure_root, ensure_signed};
 
 #[cfg(test)]
 mod tests;
 
 #[cfg(feature = "runtime-benchmarks")]
 mod benchmarking;
-
+pub mod migrations;
 pub mod weights;
+
+pub use pallet::*;
 pub use weights::WeightInfo;
 
 /// Simple index type for proposal counting.
@@ -125,39 +123,6 @@ impl DefaultVote for MoreThanMajorityThenPrimeDefaultVote {
 	}
 }
 
-pub trait Config<I: Instance = DefaultInstance>: frame_system::Config {
-	/// The outer origin type.
-	type Origin: From<RawOrigin<Self::AccountId, I>>;
-
-	/// The outer call dispatch type.
-	type Proposal: Parameter
-		+ Dispatchable<Origin = <Self as Config<I>>::Origin, PostInfo = PostDispatchInfo>
-		+ From<frame_system::Call<Self>>
-		+ GetDispatchInfo;
-
-	/// The outer event type.
-	type Event: From<Event<Self, I>> + Into<<Self as frame_system::Config>::Event>;
-
-	/// The time-out for council motions.
-	type MotionDuration: Get<Self::BlockNumber>;
-
-	/// Maximum number of proposals allowed to be active in parallel.
-	type MaxProposals: Get<ProposalIndex>;
-
-	/// The maximum number of members supported by the pallet. Used for weight estimation.
-	///
-	/// NOTE:
-	/// + Benchmarks will need to be re-run and weights adjusted if this changes.
-	/// + This pallet assumes that dependents keep to the limit without enforcing it.
-	type MaxMembers: Get<MemberCount>;
-
-	/// Default vote strategy of this collective.
-	type DefaultVote: DefaultVote;
-
-	/// Weight information for extrinsics in this pallet.
-	type WeightInfo: WeightInfo;
-}
-
 /// Origin for the collective module.
 #[derive(PartialEq, Eq, Clone, RuntimeDebug, Encode, Decode)]
 pub enum RawOrigin<AccountId, I> {
@@ -166,7 +131,7 @@ pub enum RawOrigin<AccountId, I> {
 	/// It has been condoned by a single member of the collective.
 	Member(AccountId),
 	/// Dummy to manage the fact we have instancing.
-	_Phantom(sp_std::marker::PhantomData<I>),
+	_Phantom(PhantomData<I>),
 }
 
 impl<AccountId, I> GetBacking for RawOrigin<AccountId, I> {
@@ -178,11 +143,8 @@ impl<AccountId, I> GetBacking for RawOrigin<AccountId, I> {
 	}
 }
 
-/// Origin for the collective module.
-pub type Origin<T, I = DefaultInstance> = RawOrigin<<T as frame_system::Config>::AccountId, I>;
-
-#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug)]
 /// Info for keeping track of a motion being voted on.
+#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug)]
 pub struct Votes<AccountId, BlockNumber> {
 	/// The proposal's unique index.
 	index: ProposalIndex,
@@ -196,69 +158,155 @@ pub struct Votes<AccountId, BlockNumber> {
 	end: BlockNumber,
 }
 
-decl_storage! {
-	trait Store for Module<T: Config<I>, I: Instance=DefaultInstance> as Collective {
-		/// The hashes of the active proposals.
-		pub Proposals get(fn proposals): BoundedVec<T::Hash, T::MaxProposals>;
-		/// Actual proposal for a given hash, if it's current.
-		pub ProposalOf get(fn proposal_of):
-			map hasher(identity) T::Hash => Option<<T as Config<I>>::Proposal>;
-		/// Votes on a given proposal, if it is ongoing.
-		pub Voting get(fn voting):
-			map hasher(identity) T::Hash => Option<Votes<T::AccountId, T::BlockNumber>>;
-		/// Proposals so far.
-		pub ProposalCount get(fn proposal_count): u32;
-		/// The current members of the collective. This is stored sorted (just by value).
-		pub Members get(fn members): Vec<T::AccountId>;
-		/// The prime member that helps determine the default vote behavior in case of absentations.
-		pub Prime get(fn prime): Option<T::AccountId>;
+#[frame_support::pallet]
+pub mod pallet {
+	use super::*;
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+
+	/// The current storage version.
+	const STORAGE_VERSION: StorageVersion = StorageVersion::new(4);
+
+	#[pallet::pallet]
+	#[pallet::generate_store(pub(super) trait Store)]
+	#[pallet::storage_version(STORAGE_VERSION)]
+	pub struct Pallet<T, I = ()>(PhantomData<(T, I)>);
+
+	#[pallet::config]
+	pub trait Config<I: 'static = ()>: frame_system::Config {
+		/// The outer origin type.
+		type Origin: From<RawOrigin<Self::AccountId, I>>;
+
+		/// The outer call dispatch type.
+		type Proposal: Parameter
+			+ Dispatchable<Origin = <Self as Config<I>>::Origin, PostInfo = PostDispatchInfo>
+			+ From<frame_system::Call<Self>>
+			+ GetDispatchInfo;
+
+		/// The outer event type.
+		type Event: From<Event<Self, I>> + IsType<<Self as frame_system::Config>::Event>;
+
+		/// The time-out for council motions.
+		type MotionDuration: Get<Self::BlockNumber>;
+
+		/// Maximum number of proposals allowed to be active in parallel.
+		type MaxProposals: Get<ProposalIndex>;
+
+		/// The maximum number of members supported by the pallet. Used for weight estimation.
+		///
+		/// NOTE:
+		/// + Benchmarks will need to be re-run and weights adjusted if this changes.
+		/// + This pallet assumes that dependents keep to the limit without enforcing it.
+		type MaxMembers: Get<MemberCount>;
+
+		/// Default vote strategy of this collective.
+		type DefaultVote: DefaultVote;
+
+		/// Weight information for extrinsics in this pallet.
+		type WeightInfo: WeightInfo;
+	}
+
+	#[pallet::genesis_config]
+	pub struct GenesisConfig<T: Config<I>, I: 'static = ()> {
+		pub phantom: PhantomData<I>,
+		pub members: Vec<T::AccountId>,
+	}
+
+	#[cfg(feature = "std")]
+	impl<T: Config<I>, I: 'static> Default for GenesisConfig<T, I> {
+		fn default() -> Self {
+			Self { phantom: Default::default(), members: Default::default() }
+		}
 	}
-	add_extra_genesis {
-		config(phantom): sp_std::marker::PhantomData<I>;
-		config(members): Vec<T::AccountId>;
-		build(|config| {
+
+	#[pallet::genesis_build]
+	impl<T: Config<I>, I: 'static> GenesisBuild<T, I> for GenesisConfig<T, I> {
+		fn build(&self) {
 			use sp_std::collections::btree_set::BTreeSet;
-			let members_set: BTreeSet<_> = config.members.iter().collect();
-			assert!(members_set.len() == config.members.len(), "Members cannot contain duplicate accounts.");
+			let members_set: BTreeSet<_> = self.members.iter().collect();
+			assert_eq!(
+				members_set.len(),
+				self.members.len(),
+				"Members cannot contain duplicate accounts."
+			);
 
-			Module::<T, I>::initialize_members(&config.members)
-		});
+			Pallet::<T, I>::initialize_members(&self.members)
+		}
 	}
-}
 
-decl_event! {
-	pub enum Event<T, I=DefaultInstance> where
-		<T as frame_system::Config>::Hash,
-		<T as frame_system::Config>::AccountId,
-	{
+	/// Origin for the collective pallet.
+	#[pallet::origin]
+	pub type Origin<T, I = ()> = RawOrigin<<T as frame_system::Config>::AccountId, I>;
+
+	/// The hashes of the active proposals.
+	#[pallet::storage]
+	#[pallet::getter(fn proposals)]
+	pub type Proposals<T: Config<I>, I: 'static = ()> =
+		StorageValue<_, BoundedVec<T::Hash, T::MaxProposals>, ValueQuery>;
+
+	/// Actual proposal for a given hash, if it's current.
+	#[pallet::storage]
+	#[pallet::getter(fn proposal_of)]
+	pub type ProposalOf<T: Config<I>, I: 'static = ()> =
+		StorageMap<_, Identity, T::Hash, <T as Config<I>>::Proposal, OptionQuery>;
+
+	/// Votes on a given proposal, if it is ongoing.
+	#[pallet::storage]
+	#[pallet::getter(fn voting)]
+	pub type Voting<T: Config<I>, I: 'static = ()> =
+		StorageMap<_, Identity, T::Hash, Votes<T::AccountId, T::BlockNumber>, OptionQuery>;
+
+	/// Proposals so far.
+	#[pallet::storage]
+	#[pallet::getter(fn proposal_count)]
+	pub type ProposalCount<T: Config<I>, I: 'static = ()> = StorageValue<_, u32, ValueQuery>;
+
+	/// The current members of the collective. This is stored sorted (just by value).
+	#[pallet::storage]
+	#[pallet::getter(fn members)]
+	pub type Members<T: Config<I>, I: 'static = ()> =
+		StorageValue<_, Vec<T::AccountId>, ValueQuery>;
+
+	/// The prime member that helps determine the default vote behavior in case of absentations.
+	#[pallet::storage]
+	#[pallet::getter(fn prime)]
+	pub type Prime<T: Config<I>, I: 'static = ()> = StorageValue<_, T::AccountId, OptionQuery>;
+
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	#[pallet::metadata(T::AccountId = "AccountId", T::Hash = "Hash")]
+	pub enum Event<T: Config<I>, I: 'static = ()> {
 		/// A motion (given hash) has been proposed (by given account) with a threshold (given
 		/// `MemberCount`).
 		/// \[account, proposal_index, proposal_hash, threshold\]
-		Proposed(AccountId, ProposalIndex, Hash, MemberCount),
+		Proposed(T::AccountId, ProposalIndex, T::Hash, MemberCount),
 		/// A motion (given hash) has been voted on by given account, leaving
 		/// a tally (yes votes and no votes given respectively as `MemberCount`).
 		/// \[account, proposal_hash, voted, yes, no\]
-		Voted(AccountId, Hash, bool, MemberCount, MemberCount),
+		Voted(T::AccountId, T::Hash, bool, MemberCount, MemberCount),
 		/// A motion was approved by the required threshold.
 		/// \[proposal_hash\]
-		Approved(Hash),
+		Approved(T::Hash),
 		/// A motion was not approved by the required threshold.
 		/// \[proposal_hash\]
-		Disapproved(Hash),
+		Disapproved(T::Hash),
 		/// A motion was executed; result will be `Ok` if it returned without error.
 		/// \[proposal_hash, result\]
-		Executed(Hash, DispatchResult),
+		Executed(T::Hash, DispatchResult),
 		/// A single member did some action; result will be `Ok` if it returned without error.
 		/// \[proposal_hash, result\]
-		MemberExecuted(Hash, DispatchResult),
+		MemberExecuted(T::Hash, DispatchResult),
 		/// A proposal was closed because its threshold was reached or after its duration was up.
 		/// \[proposal_hash, yes, no\]
-		Closed(Hash, MemberCount, MemberCount),
+		Closed(T::Hash, MemberCount, MemberCount),
 	}
-}
 
-decl_error! {
-	pub enum Error for Module<T: Config<I>, I: Instance> {
+	/// Old name generated by `decl_event`.
+	#[deprecated(note = "use `Event` instead")]
+	pub type RawEvent<T, I = ()> = Event<T, I>;
+
+	#[pallet::error]
+	pub enum Error<T, I = ()> {
 		/// Account is not a member
 		NotMember,
 		/// Duplicate proposals not allowed
@@ -280,31 +328,16 @@ decl_error! {
 		/// The given length bound for the proposal was too low.
 		WrongProposalLength,
 	}
-}
-
-/// Return the weight of a dispatch call result as an `Option`.
-///
-/// Will return the weight regardless of what the state of the result is.
-fn get_result_weight(result: DispatchResultWithPostInfo) -> Option<Weight> {
-	match result {
-		Ok(post_info) => post_info.actual_weight,
-		Err(err) => err.post_info.actual_weight,
-	}
-}
-
-// Note that councillor operations are assigned to the operational class.
-decl_module! {
-	pub struct Module<T: Config<I>, I: Instance=DefaultInstance> for enum Call where origin: <T as frame_system::Config>::Origin {
-		type Error = Error<T, I>;
-
-		fn deposit_event() = default;
 
+	// Note that councillor operations are assigned to the operational class.
+	#[pallet::call]
+	impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		/// Set the collective's membership.
 		///
 		/// - `new_members`: The new member list. Be nice to the chain and provide it sorted.
 		/// - `prime`: The prime member whose vote sets the default.
-		/// - `old_count`: The upper bound for the previous number of members in storage.
-		///                Used for weight estimation.
+		/// - `old_count`: The upper bound for the previous number of members in storage. Used for
+		///   weight estimation.
 		///
 		/// Requires root origin.
 		///
@@ -318,20 +351,22 @@ decl_module! {
 		///   - `N` new-members-count (code- and governance-bounded)
 		///   - `P` proposals-count (code-bounded)
 		/// - DB:
-		///   - 1 storage mutation (codec `O(M)` read, `O(N)` write) for reading and writing the members
+		///   - 1 storage mutation (codec `O(M)` read, `O(N)` write) for reading and writing the
+		///     members
 		///   - 1 storage read (codec `O(P)`) for reading the proposals
 		///   - `P` storage mutations (codec `O(M)`) for updating the votes for each proposal
 		///   - 1 storage write (codec `O(1)`) for deleting the old `prime` and setting the new one
 		/// # </weight>
-		#[weight = (
+		#[pallet::weight((
 			T::WeightInfo::set_members(
 				*old_count, // M
 				new_members.len() as u32, // N
 				T::MaxProposals::get() // P
 			),
 			DispatchClass::Operational
-		)]
-		fn set_members(origin,
+		))]
+		pub fn set_members(
+			origin: OriginFor<T>,
 			new_members: Vec<T::AccountId>,
 			prime: Option<T::AccountId>,
 			old_count: MemberCount,
@@ -361,10 +396,11 @@ decl_module! {
 			Prime::<T, I>::set(prime);
 
 			Ok(Some(T::WeightInfo::set_members(
-				old.len() as u32, // M
+				old.len() as u32,         // M
 				new_members.len() as u32, // N
-				T::MaxProposals::get(), // P
-			)).into())
+				T::MaxProposals::get(),   // P
+			))
+			.into())
 		}
 
 		/// Dispatch a proposal from a member using the `Member` origin.
@@ -373,20 +409,22 @@ decl_module! {
 		///
 		/// # <weight>
 		/// ## Weight
-		/// - `O(M + P)` where `M` members-count (code-bounded) and `P` complexity of dispatching `proposal`
+		/// - `O(M + P)` where `M` members-count (code-bounded) and `P` complexity of dispatching
+		///   `proposal`
 		/// - DB: 1 read (codec `O(M)`) + DB access of `proposal`
 		/// - 1 event
 		/// # </weight>
-		#[weight = (
+		#[pallet::weight((
 			T::WeightInfo::execute(
 				*length_bound, // B
 				T::MaxMembers::get(), // M
 			).saturating_add(proposal.get_dispatch_info().weight), // P
 			DispatchClass::Operational
-		)]
-		fn execute(origin,
+		))]
+		pub fn execute(
+			origin: OriginFor<T>,
 			proposal: Box<<T as Config<I>>::Proposal>,
-			#[compact] length_bound: u32,
+			#[pallet::compact] length_bound: u32,
 		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
 			let members = Self::members();
@@ -396,16 +434,20 @@ decl_module! {
 
 			let proposal_hash = T::Hashing::hash_of(&proposal);
 			let result = proposal.dispatch(RawOrigin::Member(who).into());
-			Self::deposit_event(
-				RawEvent::MemberExecuted(proposal_hash, result.map(|_| ()).map_err(|e| e.error))
-			);
-
-			Ok(get_result_weight(result).map(|w| {
-				T::WeightInfo::execute(
-					proposal_len as u32,  // B
-					members.len() as u32, // M
-				).saturating_add(w) // P
-			}).into())
+			Self::deposit_event(Event::MemberExecuted(
+				proposal_hash,
+				result.map(|_| ()).map_err(|e| e.error),
+			));
+
+			Ok(get_result_weight(result)
+				.map(|w| {
+					T::WeightInfo::execute(
+						proposal_len as u32,  // B
+						members.len() as u32, // M
+					)
+					.saturating_add(w) // P
+				})
+				.into())
 		}
 
 		/// Add a new proposal to either be voted on or executed directly.
@@ -435,7 +477,7 @@ decl_module! {
 		///       - 1 storage write `Voting` (codec `O(M)`)
 		///   - 1 event
 		/// # </weight>
-		#[weight = (
+		#[pallet::weight((
 			if *threshold < 2 {
 				T::WeightInfo::propose_execute(
 					*length_bound, // B
@@ -449,11 +491,12 @@ decl_module! {
 				)
 			},
 			DispatchClass::Operational
-		)]
-		fn propose(origin,
-			#[compact] threshold: MemberCount,
+		))]
+		pub fn propose(
+			origin: OriginFor<T>,
+			#[pallet::compact] threshold: MemberCount,
 			proposal: Box<<T as Config<I>>::Proposal>,
-			#[compact] length_bound: u32
+			#[pallet::compact] length_bound: u32,
 		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
 			let members = Self::members();
@@ -462,43 +505,53 @@ decl_module! {
 			let proposal_len = proposal.using_encoded(|x| x.len());
 			ensure!(proposal_len <= length_bound as usize, Error::<T, I>::WrongProposalLength);
 			let proposal_hash = T::Hashing::hash_of(&proposal);
-			ensure!(!<ProposalOf<T, I>>::contains_key(proposal_hash), Error::<T, I>::DuplicateProposal);
+			ensure!(
+				!<ProposalOf<T, I>>::contains_key(proposal_hash),
+				Error::<T, I>::DuplicateProposal
+			);
 
 			if threshold < 2 {
 				let seats = Self::members().len() as MemberCount;
 				let result = proposal.dispatch(RawOrigin::Members(1, seats).into());
-				Self::deposit_event(
-					RawEvent::Executed(proposal_hash, result.map(|_| ()).map_err(|e| e.error))
-				);
-
-				Ok(get_result_weight(result).map(|w| {
-					T::WeightInfo::propose_execute(
-						proposal_len as u32, // B
-						members.len() as u32, // M
-					).saturating_add(w) // P1
-				}).into())
+				Self::deposit_event(Event::Executed(
+					proposal_hash,
+					result.map(|_| ()).map_err(|e| e.error),
+				));
+
+				Ok(get_result_weight(result)
+					.map(|w| {
+						T::WeightInfo::propose_execute(
+							proposal_len as u32,  // B
+							members.len() as u32, // M
+						)
+						.saturating_add(w) // P1
+					})
+					.into())
 			} else {
 				let active_proposals =
 					<Proposals<T, I>>::try_mutate(|proposals| -> Result<usize, DispatchError> {
-						proposals.try_push(proposal_hash).map_err(|_| Error::<T, I>::TooManyProposals)?;
+						proposals
+							.try_push(proposal_hash)
+							.map_err(|_| Error::<T, I>::TooManyProposals)?;
 						Ok(proposals.len())
 					})?;
 				let index = Self::proposal_count();
-				<ProposalCount<I>>::mutate(|i| *i += 1);
+				<ProposalCount<T, I>>::mutate(|i| *i += 1);
 				<ProposalOf<T, I>>::insert(proposal_hash, *proposal);
 				let votes = {
-					let end = system::Pallet::<T>::block_number() + T::MotionDuration::get();
+					let end = frame_system::Pallet::<T>::block_number() + T::MotionDuration::get();
 					Votes { index, threshold, ayes: vec![], nays: vec![], end }
 				};
 				<Voting<T, I>>::insert(proposal_hash, votes);
 
-				Self::deposit_event(RawEvent::Proposed(who, index, proposal_hash, threshold));
+				Self::deposit_event(Event::Proposed(who, index, proposal_hash, threshold));
 
 				Ok(Some(T::WeightInfo::propose_proposed(
-					proposal_len as u32, // B
-					members.len() as u32, // M
+					proposal_len as u32,     // B
+					members.len() as u32,    // M
 					active_proposals as u32, // P2
-				)).into())
+				))
+				.into())
 			}
 		}
 
@@ -507,7 +560,8 @@ decl_module! {
 		/// Requires the sender to be a member.
 		///
 		/// Transaction fees will be waived if the member is voting on any particular proposal
-		/// for the first time and the call is successful. Subsequent vote changes will charge a fee.
+		/// for the first time and the call is successful. Subsequent vote changes will charge a
+		/// fee.
 		/// # <weight>
 		/// ## Weight
 		/// - `O(M)` where `M` is members-count (code- and governance-bounded)
@@ -516,13 +570,11 @@ decl_module! {
 		///   - 1 storage mutation `Voting` (codec `O(M)`)
 		/// - 1 event
 		/// # </weight>
-		#[weight = (
-			T::WeightInfo::vote(T::MaxMembers::get()),
-			DispatchClass::Operational
-		)]
-		fn vote(origin,
+		#[pallet::weight((T::WeightInfo::vote(T::MaxMembers::get()), DispatchClass::Operational))]
+		pub fn vote(
+			origin: OriginFor<T>,
 			proposal: T::Hash,
-			#[compact] index: ProposalIndex,
+			#[pallet::compact] index: ProposalIndex,
 			approve: bool,
 		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
@@ -542,7 +594,7 @@ decl_module! {
 				if position_yes.is_none() {
 					voting.ayes.push(who.clone());
 				} else {
-					Err(Error::<T, I>::DuplicateVote)?
+					return Err(Error::<T, I>::DuplicateVote.into())
 				}
 				if let Some(pos) = position_no {
 					voting.nays.swap_remove(pos);
@@ -551,7 +603,7 @@ decl_module! {
 				if position_no.is_none() {
 					voting.nays.push(who.clone());
 				} else {
-					Err(Error::<T, I>::DuplicateVote)?
+					return Err(Error::<T, I>::DuplicateVote.into())
 				}
 				if let Some(pos) = position_yes {
 					voting.ayes.swap_remove(pos);
@@ -560,20 +612,14 @@ decl_module! {
 
 			let yes_votes = voting.ayes.len() as MemberCount;
 			let no_votes = voting.nays.len() as MemberCount;
-			Self::deposit_event(RawEvent::Voted(who, proposal, approve, yes_votes, no_votes));
+			Self::deposit_event(Event::Voted(who, proposal, approve, yes_votes, no_votes));
 
 			Voting::<T, I>::insert(&proposal, voting);
 
 			if is_account_voting_first_time {
-				Ok((
-					Some(T::WeightInfo::vote(members.len() as u32)),
-					Pays::No,
-				).into())
+				Ok((Some(T::WeightInfo::vote(members.len() as u32)), Pays::No).into())
 			} else {
-				Ok((
-					Some(T::WeightInfo::vote(members.len() as u32)),
-					Pays::Yes,
-				).into())
+				Ok((Some(T::WeightInfo::vote(members.len() as u32)), Pays::Yes).into())
 			}
 		}
 
@@ -590,9 +636,10 @@ decl_module! {
 		/// If the close operation completes successfully with disapproval, the transaction fee will
 		/// be waived. Otherwise execution of the approved operation will be charged to the caller.
 		///
-		/// + `proposal_weight_bound`: The maximum amount of weight consumed by executing the closed proposal.
+		/// + `proposal_weight_bound`: The maximum amount of weight consumed by executing the closed
+		/// proposal.
 		/// + `length_bound`: The upper bound for the length of the proposal in storage. Checked via
-		///                   `storage::read` so it is `size_of::<u32>() == 4` larger than the pure length.
+		/// `storage::read` so it is `size_of::<u32>() == 4` larger than the pure length.
 		///
 		/// # <weight>
 		/// ## Weight
@@ -603,11 +650,12 @@ decl_module! {
 		///   - `P2` is proposal-count (code-bounded)
 		/// - DB:
 		///  - 2 storage reads (`Members`: codec `O(M)`, `Prime`: codec `O(1)`)
-		///  - 3 mutations (`Voting`: codec `O(M)`, `ProposalOf`: codec `O(B)`, `Proposals`: codec `O(P2)`)
+		///  - 3 mutations (`Voting`: codec `O(M)`, `ProposalOf`: codec `O(B)`, `Proposals`: codec
+		///    `O(P2)`)
 		///  - any mutations done while executing `proposal` (`P1`)
 		/// - up to 3 events
 		/// # </weight>
-		#[weight = (
+		#[pallet::weight((
 			{
 				let b = *length_bound;
 				let m = T::MaxMembers::get();
@@ -620,12 +668,13 @@ decl_module! {
 					.saturating_add(p1)
 			},
 			DispatchClass::Operational
-		)]
-		fn close(origin,
+		))]
+		pub fn close(
+			origin: OriginFor<T>,
 			proposal_hash: T::Hash,
-			#[compact] index: ProposalIndex,
-			#[compact] proposal_weight_bound: Weight,
-			#[compact] length_bound: u32
+			#[pallet::compact] index: ProposalIndex,
+			#[pallet::compact] proposal_weight_bound: Weight,
+			#[pallet::compact] length_bound: u32,
 		) -> DispatchResultWithPostInfo {
 			let _ = ensure_signed(origin)?;
 
@@ -644,26 +693,32 @@ decl_module! {
 					length_bound,
 					proposal_weight_bound,
 				)?;
-				Self::deposit_event(RawEvent::Closed(proposal_hash, yes_votes, no_votes));
+				Self::deposit_event(Event::Closed(proposal_hash, yes_votes, no_votes));
 				let (proposal_weight, proposal_count) =
 					Self::do_approve_proposal(seats, yes_votes, proposal_hash, proposal);
 				return Ok((
-					Some(T::WeightInfo::close_early_approved(len as u32, seats, proposal_count)
-					.saturating_add(proposal_weight)),
+					Some(
+						T::WeightInfo::close_early_approved(len as u32, seats, proposal_count)
+							.saturating_add(proposal_weight),
+					),
 					Pays::Yes,
-				).into());
-
+				)
+					.into())
 			} else if disapproved {
-				Self::deposit_event(RawEvent::Closed(proposal_hash, yes_votes, no_votes));
+				Self::deposit_event(Event::Closed(proposal_hash, yes_votes, no_votes));
 				let proposal_count = Self::do_disapprove_proposal(proposal_hash);
 				return Ok((
 					Some(T::WeightInfo::close_early_disapproved(seats, proposal_count)),
 					Pays::No,
-				).into());
+				)
+					.into())
 			}
 
 			// Only allow actual closing of the proposal after the voting period has ended.
-			ensure!(system::Pallet::<T>::block_number() >= voting.end, Error::<T, I>::TooEarly);
+			ensure!(
+				frame_system::Pallet::<T>::block_number() >= voting.end,
+				Error::<T, I>::TooEarly
+			);
 
 			let prime_vote = Self::prime().map(|who| voting.ayes.iter().any(|a| a == &who));
 
@@ -683,25 +738,26 @@ decl_module! {
 					length_bound,
 					proposal_weight_bound,
 				)?;
-				Self::deposit_event(RawEvent::Closed(proposal_hash, yes_votes, no_votes));
+				Self::deposit_event(Event::Closed(proposal_hash, yes_votes, no_votes));
 				let (proposal_weight, proposal_count) =
 					Self::do_approve_proposal(seats, yes_votes, proposal_hash, proposal);
-				return Ok((
-					Some(T::WeightInfo::close_approved(len as u32, seats, proposal_count)
-					.saturating_add(proposal_weight)),
+				Ok((
+					Some(
+						T::WeightInfo::close_approved(len as u32, seats, proposal_count)
+							.saturating_add(proposal_weight),
+					),
 					Pays::Yes,
-				).into());
+				)
+					.into())
 			} else {
-				Self::deposit_event(RawEvent::Closed(proposal_hash, yes_votes, no_votes));
+				Self::deposit_event(Event::Closed(proposal_hash, yes_votes, no_votes));
 				let proposal_count = Self::do_disapprove_proposal(proposal_hash);
-				return Ok((
-					Some(T::WeightInfo::close_disapproved(seats, proposal_count)),
-					Pays::No,
-				).into());
+				Ok((Some(T::WeightInfo::close_disapproved(seats, proposal_count)), Pays::No).into())
 			}
 		}
 
-		/// Disapprove a proposal, close, and remove it from the system, regardless of its current state.
+		/// Disapprove a proposal, close, and remove it from the system, regardless of its current
+		/// state.
 		///
 		/// Must be called by the Root origin.
 		///
@@ -714,8 +770,11 @@ decl_module! {
 		/// * Reads: Proposals
 		/// * Writes: Voting, Proposals, ProposalOf
 		/// # </weight>
-		#[weight = T::WeightInfo::disapprove_proposal(T::MaxProposals::get())]
-		fn disapprove_proposal(origin, proposal_hash: T::Hash) -> DispatchResultWithPostInfo {
+		#[pallet::weight(T::WeightInfo::disapprove_proposal(T::MaxProposals::get()))]
+		pub fn disapprove_proposal(
+			origin: OriginFor<T>,
+			proposal_hash: T::Hash,
+		) -> DispatchResultWithPostInfo {
 			ensure_root(origin)?;
 			let proposal_count = Self::do_disapprove_proposal(proposal_hash);
 			Ok(Some(T::WeightInfo::disapprove_proposal(proposal_count)).into())
@@ -723,7 +782,17 @@ decl_module! {
 	}
 }
 
-impl<T: Config<I>, I: Instance> Module<T, I> {
+/// Return the weight of a dispatch call result as an `Option`.
+///
+/// Will return the weight regardless of what the state of the result is.
+fn get_result_weight(result: DispatchResultWithPostInfo) -> Option<Weight> {
+	match result {
+		Ok(post_info) => post_info.actual_weight,
+		Err(err) => err.post_info.actual_weight,
+	}
+}
+
+impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	/// Check whether `who` is a member of the collective.
 	pub fn is_member(who: &T::AccountId) -> bool {
 		// Note: The dispatchables *do not* use this to check membership so make sure
@@ -771,12 +840,12 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 		proposal_hash: T::Hash,
 		proposal: <T as Config<I>>::Proposal,
 	) -> (Weight, u32) {
-		Self::deposit_event(RawEvent::Approved(proposal_hash));
+		Self::deposit_event(Event::Approved(proposal_hash));
 
 		let dispatch_weight = proposal.get_dispatch_info().weight;
 		let origin = RawOrigin::Members(yes_votes, seats).into();
 		let result = proposal.dispatch(origin);
-		Self::deposit_event(RawEvent::Executed(
+		Self::deposit_event(Event::Executed(
 			proposal_hash,
 			result.map(|_| ()).map_err(|e| e.error),
 		));
@@ -789,7 +858,7 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 
 	fn do_disapprove_proposal(proposal_hash: T::Hash) -> u32 {
 		// disapproved
-		Self::deposit_event(RawEvent::Disapproved(proposal_hash));
+		Self::deposit_event(Event::Disapproved(proposal_hash));
 		Self::remove_proposal(proposal_hash)
 	}
 
@@ -806,7 +875,7 @@ impl<T: Config<I>, I: Instance> Module<T, I> {
 	}
 }
 
-impl<T: Config<I>, I: Instance> ChangeMembers<T::AccountId> for Module<T, I> {
+impl<T: Config<I>, I: 'static> ChangeMembers<T::AccountId> for Pallet<T, I> {
 	/// Update the members of the collective. Votes are updated and the prime is reset.
 	///
 	/// NOTE: Does not enforce the expected `MaxMembers` limit on the amount of members, but
@@ -870,7 +939,7 @@ impl<T: Config<I>, I: Instance> ChangeMembers<T::AccountId> for Module<T, I> {
 	}
 }
 
-impl<T: Config<I>, I: Instance> InitializeMembers<T::AccountId> for Module<T, I> {
+impl<T: Config<I>, I: 'static> InitializeMembers<T::AccountId> for Pallet<T, I> {
 	fn initialize_members(members: &[T::AccountId]) {
 		if !members.is_empty() {
 			assert!(<Members<T, I>>::get().is_empty(), "Members are already initialized!");
@@ -894,9 +963,7 @@ where
 	}
 }
 
-pub struct EnsureMember<AccountId, I = DefaultInstance>(
-	sp_std::marker::PhantomData<(AccountId, I)>,
-);
+pub struct EnsureMember<AccountId, I: 'static>(PhantomData<(AccountId, I)>);
 impl<
 		O: Into<Result<RawOrigin<AccountId, I>, O>> + From<RawOrigin<AccountId, I>>,
 		AccountId: Default,
@@ -917,9 +984,7 @@ impl<
 	}
 }
 
-pub struct EnsureMembers<N: U32, AccountId, I = DefaultInstance>(
-	sp_std::marker::PhantomData<(N, AccountId, I)>,
-);
+pub struct EnsureMembers<N: U32, AccountId, I: 'static>(PhantomData<(N, AccountId, I)>);
 impl<
 		O: Into<Result<RawOrigin<AccountId, I>, O>> + From<RawOrigin<AccountId, I>>,
 		N: U32,
@@ -941,8 +1006,8 @@ impl<
 	}
 }
 
-pub struct EnsureProportionMoreThan<N: U32, D: U32, AccountId, I = DefaultInstance>(
-	sp_std::marker::PhantomData<(N, D, AccountId, I)>,
+pub struct EnsureProportionMoreThan<N: U32, D: U32, AccountId, I: 'static>(
+	PhantomData<(N, D, AccountId, I)>,
 );
 impl<
 		O: Into<Result<RawOrigin<AccountId, I>, O>> + From<RawOrigin<AccountId, I>>,
@@ -966,8 +1031,8 @@ impl<
 	}
 }
 
-pub struct EnsureProportionAtLeast<N: U32, D: U32, AccountId, I = DefaultInstance>(
-	sp_std::marker::PhantomData<(N, D, AccountId, I)>,
+pub struct EnsureProportionAtLeast<N: U32, D: U32, AccountId, I: 'static>(
+	PhantomData<(N, D, AccountId, I)>,
 );
 impl<
 		O: Into<Result<RawOrigin<AccountId, I>, O>> + From<RawOrigin<AccountId, I>>,
diff --git a/frame/collective/src/migrations/mod.rs b/frame/collective/src/migrations/mod.rs
new file mode 100644
index 000000000000..26d07a0cd5ac
--- /dev/null
+++ b/frame/collective/src/migrations/mod.rs
@@ -0,0 +1,19 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/// Version 4.
+pub mod v4;
diff --git a/frame/collective/src/migrations/v4.rs b/frame/collective/src/migrations/v4.rs
new file mode 100644
index 000000000000..68284ba4df91
--- /dev/null
+++ b/frame/collective/src/migrations/v4.rs
@@ -0,0 +1,147 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use sp_io::hashing::twox_128;
+
+use frame_support::{
+	traits::{
+		Get, GetStorageVersion, PalletInfoAccess, StorageVersion,
+		STORAGE_VERSION_STORAGE_KEY_POSTFIX,
+	},
+	weights::Weight,
+};
+
+/// Migrate the entire storage of this pallet to a new prefix.
+///
+/// This new prefix must be the same as the one set in construct_runtime. For safety, use
+/// `PalletInfo` to get it, as:
+/// `<Runtime as frame_system::Config>::PalletInfo::name::<CollectivePallet>`.
+///
+/// The migration will look into the storage version in order not to trigger a migration on an up
+/// to date storage. Thus the on chain storage version must be less than 4 in order to trigger the
+/// migration.
+pub fn migrate<T: frame_system::Config, P: GetStorageVersion + PalletInfoAccess, N: AsRef<str>>(
+	old_pallet_name: N,
+) -> Weight {
+	let old_pallet_name = old_pallet_name.as_ref();
+	let new_pallet_name = <P as PalletInfoAccess>::name();
+
+	if new_pallet_name == old_pallet_name {
+		log::info!(
+			target: "runtime::collective",
+			"New pallet name is equal to the old pallet name. No migration needs to be done.",
+		);
+		return 0
+	}
+
+	let on_chain_storage_version = <P as GetStorageVersion>::on_chain_storage_version();
+	log::info!(
+		target: "runtime::collective",
+		"Running migration to v4 for collective with storage version {:?}",
+		on_chain_storage_version,
+	);
+
+	if on_chain_storage_version < 4 {
+		frame_support::storage::migration::move_pallet(
+			old_pallet_name.as_bytes(),
+			new_pallet_name.as_bytes(),
+		);
+		log_migration("migration", old_pallet_name, new_pallet_name);
+
+		StorageVersion::new(4).put::<P>();
+		<T as frame_system::Config>::BlockWeights::get().max_block
+	} else {
+		log::warn!(
+			target: "runtime::collective",
+			"Attempted to apply migration to v4 but failed because storage version is {:?}",
+			on_chain_storage_version,
+		);
+		0
+	}
+}
+
+/// Some checks prior to migration. This can be linked to
+/// [`frame_support::traits::OnRuntimeUpgrade::pre_upgrade`] for further testing.
+///
+/// Panics if anything goes wrong.
+pub fn pre_migrate<P: GetStorageVersion + PalletInfoAccess, N: AsRef<str>>(old_pallet_name: N) {
+	let old_pallet_name = old_pallet_name.as_ref();
+	let new_pallet_name = <P as PalletInfoAccess>::name();
+	log_migration("pre-migration", old_pallet_name, new_pallet_name);
+
+	if new_pallet_name == old_pallet_name {
+		return
+	}
+
+	let new_pallet_prefix = twox_128(new_pallet_name.as_bytes());
+	let storage_version_key = twox_128(STORAGE_VERSION_STORAGE_KEY_POSTFIX);
+
+	let mut new_pallet_prefix_iter = frame_support::storage::KeyPrefixIterator::new(
+		new_pallet_prefix.to_vec(),
+		new_pallet_prefix.to_vec(),
+		|key| Ok(key.to_vec()),
+	);
+
+	// Ensure nothing except the storage_version_key is stored in the new prefix.
+	assert!(new_pallet_prefix_iter.all(|key| key == storage_version_key));
+
+	assert!(<P as GetStorageVersion>::on_chain_storage_version() < 4);
+}
+
+/// Some checks for after migration. This can be linked to
+/// [`frame_support::traits::OnRuntimeUpgrade::post_upgrade`] for further testing.
+///
+/// Panics if anything goes wrong.
+pub fn post_migrate<P: GetStorageVersion + PalletInfoAccess, N: AsRef<str>>(old_pallet_name: N) {
+	let old_pallet_name = old_pallet_name.as_ref();
+	let new_pallet_name = <P as PalletInfoAccess>::name();
+	log_migration("post-migration", old_pallet_name, new_pallet_name);
+
+	if new_pallet_name == old_pallet_name {
+		return
+	}
+
+	// Assert that nothing remains at the old prefix.
+	let old_pallet_prefix = twox_128(old_pallet_name.as_bytes());
+	let old_pallet_prefix_iter = frame_support::storage::KeyPrefixIterator::new(
+		old_pallet_prefix.to_vec(),
+		old_pallet_prefix.to_vec(),
+		|_| Ok(()),
+	);
+	assert_eq!(old_pallet_prefix_iter.count(), 0);
+
+	// NOTE: storage_version_key is already in the new prefix.
+	let new_pallet_prefix = twox_128(new_pallet_name.as_bytes());
+	let new_pallet_prefix_iter = frame_support::storage::KeyPrefixIterator::new(
+		new_pallet_prefix.to_vec(),
+		new_pallet_prefix.to_vec(),
+		|_| Ok(()),
+	);
+	assert!(new_pallet_prefix_iter.count() >= 1);
+
+	assert_eq!(<P as GetStorageVersion>::on_chain_storage_version(), 4);
+}
+
+fn log_migration(stage: &str, old_pallet_name: &str, new_pallet_name: &str) {
+	log::info!(
+		target: "runtime::collective",
+		"{}, prefix: '{}' ==> '{}'",
+		stage,
+		old_pallet_name,
+		new_pallet_name,
+	);
+}
diff --git a/frame/collective/src/tests.rs b/frame/collective/src/tests.rs
index aa6ea090f4ee..5c662428fd99 100644
--- a/frame/collective/src/tests.rs
+++ b/frame/collective/src/tests.rs
@@ -15,10 +15,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use super::*;
-use crate as collective;
-use frame_support::{assert_noop, assert_ok, parameter_types, Hashable};
-use frame_system::{self as system, EventRecord, Phase};
+use super::{Event as CollectiveEvent, *};
+use crate as pallet_collective;
+use frame_support::{
+	assert_noop, assert_ok, parameter_types, traits::GenesisBuild, weights::Pays, Hashable,
+};
+use frame_system::{EventRecord, Phase};
 use sp_core::{
 	u32_trait::{_3, _4},
 	H256,
@@ -38,10 +40,10 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: system::{Pallet, Call, Event<T>},
-		Collective: collective::<Instance1>::{Pallet, Call, Event<T>, Origin<T>, Config<T>},
-		CollectiveMajority: collective::<Instance2>::{Pallet, Call, Event<T>, Origin<T>, Config<T>},
-		DefaultCollective: collective::{Pallet, Call, Event<T>, Origin<T>, Config<T>},
+		System: frame_system::{Pallet, Call, Event<T>},
+		Collective: pallet_collective::<Instance1>::{Pallet, Call, Event<T>, Origin<T>, Config<T>},
+		CollectiveMajority: pallet_collective::<Instance2>::{Pallet, Call, Event<T>, Origin<T>, Config<T>},
+		DefaultCollective: pallet_collective::{Pallet, Call, Event<T>, Origin<T>, Config<T>},
 		Democracy: mock_democracy::{Pallet, Call, Event<T>},
 	}
 );
@@ -152,11 +154,11 @@ impl Config for Test {
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let mut ext: sp_io::TestExternalities = GenesisConfig {
-		collective: collective::GenesisConfig {
+		collective: pallet_collective::GenesisConfig {
 			members: vec![1, 2, 3],
 			phantom: Default::default(),
 		},
-		collective_majority: collective::GenesisConfig {
+		collective_majority: pallet_collective::GenesisConfig {
 			members: vec![1, 2, 3, 4, 5],
 			phantom: Default::default(),
 		},
@@ -214,11 +216,11 @@ fn close_works() {
 		assert_eq!(
 			System::events(),
 			vec![
-				record(Event::Collective(RawEvent::Proposed(1, 0, hash, 3))),
-				record(Event::Collective(RawEvent::Voted(1, hash, true, 1, 0))),
-				record(Event::Collective(RawEvent::Voted(2, hash, true, 2, 0))),
-				record(Event::Collective(RawEvent::Closed(hash, 2, 1))),
-				record(Event::Collective(RawEvent::Disapproved(hash)))
+				record(Event::Collective(CollectiveEvent::Proposed(1, 0, hash, 3))),
+				record(Event::Collective(CollectiveEvent::Voted(1, hash, true, 1, 0))),
+				record(Event::Collective(CollectiveEvent::Voted(2, hash, true, 2, 0))),
+				record(Event::Collective(CollectiveEvent::Closed(hash, 2, 1))),
+				record(Event::Collective(CollectiveEvent::Disapproved(hash)))
 			]
 		);
 	});
@@ -307,11 +309,11 @@ fn close_with_prime_works() {
 		assert_eq!(
 			System::events(),
 			vec![
-				record(Event::Collective(RawEvent::Proposed(1, 0, hash, 3))),
-				record(Event::Collective(RawEvent::Voted(1, hash, true, 1, 0))),
-				record(Event::Collective(RawEvent::Voted(2, hash, true, 2, 0))),
-				record(Event::Collective(RawEvent::Closed(hash, 2, 1))),
-				record(Event::Collective(RawEvent::Disapproved(hash)))
+				record(Event::Collective(CollectiveEvent::Proposed(1, 0, hash, 3))),
+				record(Event::Collective(CollectiveEvent::Voted(1, hash, true, 1, 0))),
+				record(Event::Collective(CollectiveEvent::Voted(2, hash, true, 2, 0))),
+				record(Event::Collective(CollectiveEvent::Closed(hash, 2, 1))),
+				record(Event::Collective(CollectiveEvent::Disapproved(hash)))
 			]
 		);
 	});
@@ -346,12 +348,15 @@ fn close_with_voting_prime_works() {
 		assert_eq!(
 			System::events(),
 			vec![
-				record(Event::Collective(RawEvent::Proposed(1, 0, hash, 3))),
-				record(Event::Collective(RawEvent::Voted(1, hash, true, 1, 0))),
-				record(Event::Collective(RawEvent::Voted(2, hash, true, 2, 0))),
-				record(Event::Collective(RawEvent::Closed(hash, 3, 0))),
-				record(Event::Collective(RawEvent::Approved(hash))),
-				record(Event::Collective(RawEvent::Executed(hash, Err(DispatchError::BadOrigin))))
+				record(Event::Collective(CollectiveEvent::Proposed(1, 0, hash, 3))),
+				record(Event::Collective(CollectiveEvent::Voted(1, hash, true, 1, 0))),
+				record(Event::Collective(CollectiveEvent::Voted(2, hash, true, 2, 0))),
+				record(Event::Collective(CollectiveEvent::Closed(hash, 3, 0))),
+				record(Event::Collective(CollectiveEvent::Approved(hash))),
+				record(Event::Collective(CollectiveEvent::Executed(
+					hash,
+					Err(DispatchError::BadOrigin)
+				)))
 			]
 		);
 	});
@@ -393,13 +398,13 @@ fn close_with_no_prime_but_majority_works() {
 		assert_eq!(
 			System::events(),
 			vec![
-				record(Event::CollectiveMajority(RawEvent::Proposed(1, 0, hash, 5))),
-				record(Event::CollectiveMajority(RawEvent::Voted(1, hash, true, 1, 0))),
-				record(Event::CollectiveMajority(RawEvent::Voted(2, hash, true, 2, 0))),
-				record(Event::CollectiveMajority(RawEvent::Voted(3, hash, true, 3, 0))),
-				record(Event::CollectiveMajority(RawEvent::Closed(hash, 5, 0))),
-				record(Event::CollectiveMajority(RawEvent::Approved(hash))),
-				record(Event::CollectiveMajority(RawEvent::Executed(
+				record(Event::CollectiveMajority(CollectiveEvent::Proposed(1, 0, hash, 5))),
+				record(Event::CollectiveMajority(CollectiveEvent::Voted(1, hash, true, 1, 0))),
+				record(Event::CollectiveMajority(CollectiveEvent::Voted(2, hash, true, 2, 0))),
+				record(Event::CollectiveMajority(CollectiveEvent::Voted(3, hash, true, 3, 0))),
+				record(Event::CollectiveMajority(CollectiveEvent::Closed(hash, 5, 0))),
+				record(Event::CollectiveMajority(CollectiveEvent::Approved(hash))),
+				record(Event::CollectiveMajority(CollectiveEvent::Executed(
 					hash,
 					Err(DispatchError::BadOrigin)
 				)))
@@ -526,7 +531,7 @@ fn propose_works() {
 
 		assert_eq!(
 			System::events(),
-			vec![record(Event::Collective(RawEvent::Proposed(1, 0, hash, 3)))]
+			vec![record(Event::Collective(CollectiveEvent::Proposed(1, 0, hash, 3)))]
 		);
 	});
 }
@@ -682,9 +687,9 @@ fn motions_vote_after_works() {
 		assert_eq!(
 			System::events(),
 			vec![
-				record(Event::Collective(RawEvent::Proposed(1, 0, hash, 2))),
-				record(Event::Collective(RawEvent::Voted(1, hash, true, 1, 0))),
-				record(Event::Collective(RawEvent::Voted(1, hash, false, 0, 1))),
+				record(Event::Collective(CollectiveEvent::Proposed(1, 0, hash, 2))),
+				record(Event::Collective(CollectiveEvent::Voted(1, hash, true, 1, 0))),
+				record(Event::Collective(CollectiveEvent::Voted(1, hash, false, 0, 1))),
 			]
 		);
 	});
@@ -798,12 +803,15 @@ fn motions_approval_with_enough_votes_and_lower_voting_threshold_works() {
 		assert_eq!(
 			System::events(),
 			vec![
-				record(Event::Collective(RawEvent::Proposed(1, 0, hash, 2))),
-				record(Event::Collective(RawEvent::Voted(1, hash, true, 1, 0))),
-				record(Event::Collective(RawEvent::Voted(2, hash, true, 2, 0))),
-				record(Event::Collective(RawEvent::Closed(hash, 2, 0))),
-				record(Event::Collective(RawEvent::Approved(hash))),
-				record(Event::Collective(RawEvent::Executed(hash, Err(DispatchError::BadOrigin)))),
+				record(Event::Collective(CollectiveEvent::Proposed(1, 0, hash, 2))),
+				record(Event::Collective(CollectiveEvent::Voted(1, hash, true, 1, 0))),
+				record(Event::Collective(CollectiveEvent::Voted(2, hash, true, 2, 0))),
+				record(Event::Collective(CollectiveEvent::Closed(hash, 2, 0))),
+				record(Event::Collective(CollectiveEvent::Approved(hash))),
+				record(Event::Collective(CollectiveEvent::Executed(
+					hash,
+					Err(DispatchError::BadOrigin)
+				))),
 			]
 		);
 
@@ -823,14 +831,14 @@ fn motions_approval_with_enough_votes_and_lower_voting_threshold_works() {
 		assert_eq!(
 			System::events(),
 			vec![
-				record(Event::Collective(RawEvent::Proposed(1, 1, hash, 2))),
-				record(Event::Collective(RawEvent::Voted(1, hash, true, 1, 0))),
-				record(Event::Collective(RawEvent::Voted(2, hash, true, 2, 0))),
-				record(Event::Collective(RawEvent::Voted(3, hash, true, 3, 0))),
-				record(Event::Collective(RawEvent::Closed(hash, 3, 0))),
-				record(Event::Collective(RawEvent::Approved(hash))),
+				record(Event::Collective(CollectiveEvent::Proposed(1, 1, hash, 2))),
+				record(Event::Collective(CollectiveEvent::Voted(1, hash, true, 1, 0))),
+				record(Event::Collective(CollectiveEvent::Voted(2, hash, true, 2, 0))),
+				record(Event::Collective(CollectiveEvent::Voted(3, hash, true, 3, 0))),
+				record(Event::Collective(CollectiveEvent::Closed(hash, 3, 0))),
+				record(Event::Collective(CollectiveEvent::Approved(hash))),
 				record(Event::Democracy(mock_democracy::pallet::Event::<Test>::ExternalProposed)),
-				record(Event::Collective(RawEvent::Executed(hash, Ok(())))),
+				record(Event::Collective(CollectiveEvent::Executed(hash, Ok(())))),
 			]
 		);
 	});
@@ -856,11 +864,11 @@ fn motions_disapproval_works() {
 		assert_eq!(
 			System::events(),
 			vec![
-				record(Event::Collective(RawEvent::Proposed(1, 0, hash, 3))),
-				record(Event::Collective(RawEvent::Voted(1, hash, true, 1, 0))),
-				record(Event::Collective(RawEvent::Voted(2, hash, false, 1, 1))),
-				record(Event::Collective(RawEvent::Closed(hash, 1, 1))),
-				record(Event::Collective(RawEvent::Disapproved(hash))),
+				record(Event::Collective(CollectiveEvent::Proposed(1, 0, hash, 3))),
+				record(Event::Collective(CollectiveEvent::Voted(1, hash, true, 1, 0))),
+				record(Event::Collective(CollectiveEvent::Voted(2, hash, false, 1, 1))),
+				record(Event::Collective(CollectiveEvent::Closed(hash, 1, 1))),
+				record(Event::Collective(CollectiveEvent::Disapproved(hash))),
 			]
 		);
 	});
@@ -886,12 +894,15 @@ fn motions_approval_works() {
 		assert_eq!(
 			System::events(),
 			vec![
-				record(Event::Collective(RawEvent::Proposed(1, 0, hash, 2))),
-				record(Event::Collective(RawEvent::Voted(1, hash, true, 1, 0))),
-				record(Event::Collective(RawEvent::Voted(2, hash, true, 2, 0))),
-				record(Event::Collective(RawEvent::Closed(hash, 2, 0))),
-				record(Event::Collective(RawEvent::Approved(hash))),
-				record(Event::Collective(RawEvent::Executed(hash, Err(DispatchError::BadOrigin)))),
+				record(Event::Collective(CollectiveEvent::Proposed(1, 0, hash, 2))),
+				record(Event::Collective(CollectiveEvent::Voted(1, hash, true, 1, 0))),
+				record(Event::Collective(CollectiveEvent::Voted(2, hash, true, 2, 0))),
+				record(Event::Collective(CollectiveEvent::Closed(hash, 2, 0))),
+				record(Event::Collective(CollectiveEvent::Approved(hash))),
+				record(Event::Collective(CollectiveEvent::Executed(
+					hash,
+					Err(DispatchError::BadOrigin)
+				))),
 			]
 		);
 	});
@@ -912,7 +923,7 @@ fn motion_with_no_votes_closes_with_disapproval() {
 		));
 		assert_eq!(
 			System::events()[0],
-			record(Event::Collective(RawEvent::Proposed(1, 0, hash, 3)))
+			record(Event::Collective(CollectiveEvent::Proposed(1, 0, hash, 3)))
 		);
 
 		// Closing the motion too early is not possible because it has neither
@@ -929,8 +940,14 @@ fn motion_with_no_votes_closes_with_disapproval() {
 		assert_ok!(Collective::close(Origin::signed(2), hash, 0, proposal_weight, proposal_len));
 
 		// Events show that the close ended in a disapproval.
-		assert_eq!(System::events()[1], record(Event::Collective(RawEvent::Closed(hash, 0, 3))));
-		assert_eq!(System::events()[2], record(Event::Collective(RawEvent::Disapproved(hash))));
+		assert_eq!(
+			System::events()[1],
+			record(Event::Collective(CollectiveEvent::Closed(hash, 0, 3)))
+		);
+		assert_eq!(
+			System::events()[2],
+			record(Event::Collective(CollectiveEvent::Disapproved(hash)))
+		);
 	})
 }
 
@@ -989,10 +1006,10 @@ fn disapprove_proposal_works() {
 		assert_eq!(
 			System::events(),
 			vec![
-				record(Event::Collective(RawEvent::Proposed(1, 0, hash, 2))),
-				record(Event::Collective(RawEvent::Voted(1, hash, true, 1, 0))),
-				record(Event::Collective(RawEvent::Voted(2, hash, true, 2, 0))),
-				record(Event::Collective(RawEvent::Disapproved(hash))),
+				record(Event::Collective(CollectiveEvent::Proposed(1, 0, hash, 2))),
+				record(Event::Collective(CollectiveEvent::Voted(1, hash, true, 1, 0))),
+				record(Event::Collective(CollectiveEvent::Voted(2, hash, true, 2, 0))),
+				record(Event::Collective(CollectiveEvent::Disapproved(hash))),
 			]
 		);
 	})
@@ -1001,7 +1018,53 @@ fn disapprove_proposal_works() {
 #[test]
 #[should_panic(expected = "Members cannot contain duplicate accounts.")]
 fn genesis_build_panics_with_duplicate_members() {
-	collective::GenesisConfig::<Test> { members: vec![1, 2, 3, 1], phantom: Default::default() }
-		.build_storage()
-		.unwrap();
+	pallet_collective::GenesisConfig::<Test> {
+		members: vec![1, 2, 3, 1],
+		phantom: Default::default(),
+	}
+	.build_storage()
+	.unwrap();
+}
+
+#[test]
+fn migration_v4() {
+	new_test_ext().execute_with(|| {
+		use frame_support::traits::PalletInfoAccess;
+
+		let old_pallet = "OldCollective";
+		let new_pallet = <Collective as PalletInfoAccess>::name();
+		frame_support::storage::migration::move_pallet(
+			new_pallet.as_bytes(),
+			old_pallet.as_bytes(),
+		);
+		StorageVersion::new(0).put::<Collective>();
+
+		crate::migrations::v4::pre_migrate::<Collective, _>(old_pallet);
+		crate::migrations::v4::migrate::<Test, Collective, _>(old_pallet);
+		crate::migrations::v4::post_migrate::<Collective, _>(old_pallet);
+
+		let old_pallet = "OldCollectiveMajority";
+		let new_pallet = <CollectiveMajority as PalletInfoAccess>::name();
+		frame_support::storage::migration::move_pallet(
+			new_pallet.as_bytes(),
+			old_pallet.as_bytes(),
+		);
+		StorageVersion::new(0).put::<CollectiveMajority>();
+
+		crate::migrations::v4::pre_migrate::<CollectiveMajority, _>(old_pallet);
+		crate::migrations::v4::migrate::<Test, CollectiveMajority, _>(old_pallet);
+		crate::migrations::v4::post_migrate::<CollectiveMajority, _>(old_pallet);
+
+		let old_pallet = "OldDefaultCollective";
+		let new_pallet = <DefaultCollective as PalletInfoAccess>::name();
+		frame_support::storage::migration::move_pallet(
+			new_pallet.as_bytes(),
+			old_pallet.as_bytes(),
+		);
+		StorageVersion::new(0).put::<DefaultCollective>();
+
+		crate::migrations::v4::pre_migrate::<DefaultCollective, _>(old_pallet);
+		crate::migrations::v4::migrate::<Test, DefaultCollective, _>(old_pallet);
+		crate::migrations::v4::post_migrate::<DefaultCollective, _>(old_pallet);
+	});
 }

From ce1746ddf6588c8f9ecfb77411c3cac7a2c09db3 Mon Sep 17 00:00:00 2001
From: pangwa <pangwa@gmail.com>
Date: Tue, 14 Sep 2021 22:22:10 +0800
Subject: [PATCH 1185/1194] Add Clover Finance to SS58 Registry (#9236)

* Add Clover Finance to SS58 Registry

* Merge and fix spaces

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 primitives/core/src/crypto.rs |  2 ++
 ss58-registry.json            | 11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index b52dd97a3821..b86663956549 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -604,6 +604,8 @@ ss58_address_format!(
 		(101, "origintrail-parachain", "OriginTrail Parachain, ethereumm account (ECDSA).")
 	HeikoAccount =>
 		(110, "heiko", "Heiko, session key (*25519).")
+	CloverAccount =>
+		(128, "clover", "Clover Finance, standard account (*25519).")
 	ParallelAccount =>
 		(172, "parallel", "Parallel, session key (*25519).")
 	SocialAccount =>
diff --git a/ss58-registry.json b/ss58-registry.json
index 25d3c1383b33..563cc248db9d 100644
--- a/ss58-registry.json
+++ b/ss58-registry.json
@@ -567,7 +567,7 @@
 			"decimals": [12],
 			"standardAccount": "*25519",
 			"website": "https://parallel.fi/"
-		},  
+		},
 		{
 			"prefix": 113,
 			"network": "integritee-incognito",
@@ -577,6 +577,15 @@
 			"standardAccount": "*25519",
 			"website": "https://integritee.network"
     },
+		{
+			"prefix": 128,
+			"network": "clover",
+			"displayName": "Clover Finance",
+			"symbols": ["CLV"],
+			"decimals": [18],
+			"standardAccount": "*25519",
+			"website": "https://clover.finance" 
+		},  
 		{
 			"prefix": 136,
 			"network": "altair",

From 598d74bc067ab4532ee008e339f48278d3bf568b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomusdrw@users.noreply.github.com>
Date: Wed, 15 Sep 2021 10:07:06 +0200
Subject: [PATCH 1186/1194] Emit log on Runtime Code change. (#9580)

* Emit digest item on Runtime Code changes.

* Add tests.

* cargo +nightly fmt --all

* Rename.

* Add comment.

* Move generic parameter to the trait.

* cargo +nightly fmt --all

* Elaborate in doc.

* Revert to RuntimeUpdated name

* cargo +nightly fmt --all

* Rename to RuntimeEnvironmentUpdated
---
 frame/system/src/lib.rs                  | 37 +++++++++++++++++-------
 frame/system/src/tests.rs                | 22 ++++++++++++++
 primitives/runtime/src/generic/digest.rs | 16 ++++++++++
 3 files changed, 65 insertions(+), 10 deletions(-)

diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index 7b6ec9856d9f..3d89e09a25a7 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -138,14 +138,14 @@ pub type ConsumedWeight = PerDispatchClass<Weight>;
 pub use pallet::*;
 
 /// Do something when we should be setting the code.
-pub trait SetCode {
+pub trait SetCode<T: Config> {
 	/// Set the code to the given blob.
 	fn set_code(code: Vec<u8>) -> DispatchResult;
 }
 
-impl SetCode for () {
+impl<T: Config> SetCode<T> for () {
 	fn set_code(code: Vec<u8>) -> DispatchResult {
-		storage::unhashed::put_raw(well_known_keys::CODE, &code);
+		<Pallet<T>>::update_code_in_storage(&code)?;
 		Ok(())
 	}
 }
@@ -296,9 +296,13 @@ pub mod pallet {
 		#[pallet::constant]
 		type SS58Prefix: Get<u16>;
 
-		/// What to do if the user wants the code set to something. Just use `()` unless you are in
-		/// cumulus.
-		type OnSetCode: SetCode;
+		/// What to do if the runtime wants to change the code to something new.
+		///
+		/// The default (`()`) implementation is responsible for setting the correct storage
+		/// entry and emitting corresponding event and log item. (see [`update_code_in_storage`]).
+		/// It's unlikely that this needs to be customized, unless you are writing a parachain using
+		/// `Cumulus`, where the actual code change is deferred.
+		type OnSetCode: SetCode<Self>;
 	}
 
 	#[pallet::pallet]
@@ -350,11 +354,13 @@ pub mod pallet {
 		/// - 1 storage write.
 		/// - Base Weight: 1.405 µs
 		/// - 1 write to HEAP_PAGES
+		/// - 1 digest item
 		/// # </weight>
 		#[pallet::weight((T::SystemWeightInfo::set_heap_pages(), DispatchClass::Operational))]
 		pub fn set_heap_pages(origin: OriginFor<T>, pages: u64) -> DispatchResultWithPostInfo {
 			ensure_root(origin)?;
 			storage::unhashed::put_raw(well_known_keys::HEAP_PAGES, &pages.encode());
+			Self::deposit_log(generic::DigestItem::RuntimeEnvironmentUpdated);
 			Ok(().into())
 		}
 
@@ -362,9 +368,10 @@ pub mod pallet {
 		///
 		/// # <weight>
 		/// - `O(C + S)` where `C` length of `code` and `S` complexity of `can_set_code`
-		/// - 1 storage write (codec `O(C)`).
 		/// - 1 call to `can_set_code`: `O(S)` (calls `sp_io::misc::runtime_version` which is
 		///   expensive).
+		/// - 1 storage write (codec `O(C)`).
+		/// - 1 digest item.
 		/// - 1 event.
 		/// The weight of this function is dependent on the runtime, but generally this is very
 		/// expensive. We will treat this as a full block.
@@ -373,9 +380,7 @@ pub mod pallet {
 		pub fn set_code(origin: OriginFor<T>, code: Vec<u8>) -> DispatchResultWithPostInfo {
 			ensure_root(origin)?;
 			Self::can_set_code(&code)?;
-
 			T::OnSetCode::set_code(code)?;
-			Self::deposit_event(Event::CodeUpdated);
 			Ok(().into())
 		}
 
@@ -384,6 +389,7 @@ pub mod pallet {
 		/// # <weight>
 		/// - `O(C)` where `C` length of `code`
 		/// - 1 storage write (codec `O(C)`).
+		/// - 1 digest item.
 		/// - 1 event.
 		/// The weight of this function is dependent on the runtime. We will treat this as a full
 		/// block. # </weight>
@@ -394,7 +400,6 @@ pub mod pallet {
 		) -> DispatchResultWithPostInfo {
 			ensure_root(origin)?;
 			T::OnSetCode::set_code(code)?;
-			Self::deposit_event(Event::CodeUpdated);
 			Ok(().into())
 		}
 
@@ -1071,6 +1076,18 @@ impl<T: Config> Pallet<T> {
 		Account::<T>::contains_key(who)
 	}
 
+	/// Write code to the storage and emit related events and digest items.
+	///
+	/// Note this function almost never should be used directly. It is exposed
+	/// for `OnSetCode` implementations that defer actual code being written to
+	/// the storage (for instance in case of parachains).
+	pub fn update_code_in_storage(code: &[u8]) -> DispatchResult {
+		storage::unhashed::put_raw(well_known_keys::CODE, code);
+		Self::deposit_log(generic::DigestItem::RuntimeEnvironmentUpdated);
+		Self::deposit_event(Event::CodeUpdated);
+		Ok(())
+	}
+
 	/// Increment the reference counter on an account.
 	#[deprecated = "Use `inc_consumers` instead"]
 	pub fn inc_ref(who: &T::AccountId) {
diff --git a/frame/system/src/tests.rs b/frame/system/src/tests.rs
index f0a6a96ccc1e..a4dd3403f2c3 100644
--- a/frame/system/src/tests.rs
+++ b/frame/system/src/tests.rs
@@ -390,11 +390,24 @@ fn set_code_checks_works() {
 		ext.execute_with(|| {
 			let res = System::set_code(RawOrigin::Root.into(), vec![1, 2, 3, 4]);
 
+			assert_runtime_updated_digest(if res.is_ok() { 1 } else { 0 });
 			assert_eq!(expected.map_err(DispatchErrorWithPostInfo::from), res);
 		});
 	}
 }
 
+fn assert_runtime_updated_digest(num: usize) {
+	assert_eq!(
+		System::digest()
+			.logs
+			.into_iter()
+			.filter(|item| *item == generic::DigestItem::RuntimeEnvironmentUpdated)
+			.count(),
+		num,
+		"Incorrect number of Runtime Updated digest items",
+	);
+}
+
 #[test]
 fn set_code_with_real_wasm_blob() {
 	let executor = substrate_test_runtime_client::new_native_executor();
@@ -478,3 +491,12 @@ fn extrinsics_root_is_calculated_correctly() {
 		assert_eq!(ext_root, *header.extrinsics_root());
 	});
 }
+
+#[test]
+fn runtime_updated_digest_emitted_when_heap_pages_changed() {
+	new_test_ext().execute_with(|| {
+		System::initialize(&1, &[0u8; 32].into(), &Default::default(), InitKind::Full);
+		System::set_heap_pages(RawOrigin::Root.into(), 5).unwrap();
+		assert_runtime_updated_digest(1);
+	});
+}
diff --git a/primitives/runtime/src/generic/digest.rs b/primitives/runtime/src/generic/digest.rs
index 390acb87f690..99d27ad5826c 100644
--- a/primitives/runtime/src/generic/digest.rs
+++ b/primitives/runtime/src/generic/digest.rs
@@ -118,6 +118,14 @@ pub enum DigestItem<Hash> {
 
 	/// Some other thing. Unsupported and experimental.
 	Other(Vec<u8>),
+
+	/// An indication for the light clients that the runtime execution
+	/// environment is updated.
+	///
+	/// Currently this is triggered when:
+	/// 1. Runtime code blob is changed or
+	/// 2. `heap_pages` value is changed.
+	RuntimeEnvironmentUpdated,
 }
 
 /// Available changes trie signals.
@@ -184,6 +192,8 @@ pub enum DigestItemRef<'a, Hash: 'a> {
 	ChangesTrieSignal(&'a ChangesTrieSignal),
 	/// Any 'non-system' digest item, opaque to the native code.
 	Other(&'a Vec<u8>),
+	/// Runtime code or heap pages updated.
+	RuntimeEnvironmentUpdated,
 }
 
 /// Type of the digest item. Used to gain explicit control over `DigestItem` encoding
@@ -199,6 +209,7 @@ pub enum DigestItemType {
 	Seal = 5,
 	PreRuntime = 6,
 	ChangesTrieSignal = 7,
+	RuntimeEnvironmentUpdated = 8,
 }
 
 /// Type of a digest item that contains raw data; this also names the consensus engine ID where
@@ -225,6 +236,7 @@ impl<Hash> DigestItem<Hash> {
 			Self::Seal(ref v, ref s) => DigestItemRef::Seal(v, s),
 			Self::ChangesTrieSignal(ref s) => DigestItemRef::ChangesTrieSignal(s),
 			Self::Other(ref v) => DigestItemRef::Other(v),
+			Self::RuntimeEnvironmentUpdated => DigestItemRef::RuntimeEnvironmentUpdated,
 		}
 	}
 
@@ -322,6 +334,7 @@ impl<Hash: Decode> Decode for DigestItem<Hash> {
 			DigestItemType::ChangesTrieSignal =>
 				Ok(Self::ChangesTrieSignal(Decode::decode(input)?)),
 			DigestItemType::Other => Ok(Self::Other(Decode::decode(input)?)),
+			DigestItemType::RuntimeEnvironmentUpdated => Ok(Self::RuntimeEnvironmentUpdated),
 		}
 	}
 }
@@ -457,6 +470,9 @@ impl<'a, Hash: Encode> Encode for DigestItemRef<'a, Hash> {
 				DigestItemType::Other.encode_to(&mut v);
 				val.encode_to(&mut v);
 			},
+			Self::RuntimeEnvironmentUpdated => {
+				DigestItemType::RuntimeEnvironmentUpdated.encode_to(&mut v);
+			},
 		}
 
 		v

From e1ddbb3ffec3c8f05de6cb05d9f5f7a922788c3f Mon Sep 17 00:00:00 2001
From: Qinxuan Chen <koushiro.cqx@gmail.com>
Date: Wed, 15 Sep 2021 17:24:13 +0800
Subject: [PATCH 1187/1194] pallet-utility: use new pallet attribute macro for
 tests (#9780)

Signed-off-by: koushiro <koushiro.cqx@gmail.com>
---
 frame/utility/src/tests.rs | 61 ++++++++++++++++++++++----------------
 1 file changed, 35 insertions(+), 26 deletions(-)

diff --git a/frame/utility/src/tests.rs b/frame/utility/src/tests.rs
index 2731b6ca0b8b..0a780550f355 100644
--- a/frame/utility/src/tests.rs
+++ b/frame/utility/src/tests.rs
@@ -23,7 +23,7 @@ use super::*;
 
 use crate as utility;
 use frame_support::{
-	assert_err_ignore_postinfo, assert_noop, assert_ok, decl_module,
+	assert_err_ignore_postinfo, assert_noop, assert_ok,
 	dispatch::{DispatchError, DispatchErrorWithPostInfo, Dispatchable},
 	parameter_types, storage,
 	traits::Contains,
@@ -36,39 +36,48 @@ use sp_runtime::{
 };
 
 // example module to test behaviors.
+#[frame_support::pallet]
 pub mod example {
 	use super::*;
-	use frame_support::dispatch::{DispatchResultWithPostInfo, WithPostDispatchInfo};
-	use frame_system::ensure_signed;
+	use frame_support::{dispatch::WithPostDispatchInfo, pallet_prelude::*};
+	use frame_system::pallet_prelude::*;
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(_);
+
+	#[pallet::config]
 	pub trait Config: frame_system::Config {}
 
-	decl_module! {
-		pub struct Module<T: Config> for enum Call where origin: <T as frame_system::Config>::Origin {
-			#[weight = *_weight]
-			fn noop(_origin, _weight: Weight) { }
-
-			#[weight = *_start_weight]
-			fn foobar(
-				origin,
-				err: bool,
-				_start_weight: Weight,
-				end_weight: Option<Weight>,
-			) -> DispatchResultWithPostInfo {
-				let _ = ensure_signed(origin)?;
-				if err {
-					let error: DispatchError = "The cake is a lie.".into();
-					if let Some(weight) = end_weight {
-						Err(error.with_weight(weight))
-					} else {
-						Err(error)?
-					}
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		#[pallet::weight(*_weight)]
+		pub fn noop(_origin: OriginFor<T>, _weight: Weight) -> DispatchResult {
+			Ok(())
+		}
+
+		#[pallet::weight(*_start_weight)]
+		pub fn foobar(
+			origin: OriginFor<T>,
+			err: bool,
+			_start_weight: Weight,
+			end_weight: Option<Weight>,
+		) -> DispatchResultWithPostInfo {
+			let _ = ensure_signed(origin)?;
+			if err {
+				let error: DispatchError = "The cake is a lie.".into();
+				if let Some(weight) = end_weight {
+					Err(error.with_weight(weight))
 				} else {
-					Ok(end_weight.into())
+					Err(error)?
 				}
+			} else {
+				Ok(end_weight.into())
 			}
+		}
 
-			#[weight = 0]
-			fn big_variant(_origin, _arg: [u8; 400]) {}
+		#[pallet::weight(0)]
+		pub fn big_variant(_origin: OriginFor<T>, _arg: [u8; 400]) -> DispatchResult {
+			Ok(())
 		}
 	}
 }

From eb4de697ccd45948254db422abbcd735ae3c295a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Sep 2021 10:20:07 +0000
Subject: [PATCH 1188/1194] Bump serde_json from 1.0.64 to 1.0.68 (#9783)

Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.64 to 1.0.68.
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/v1.0.64...v1.0.68)

---
updated-dependencies:
- dependency-name: serde_json
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                                 | 4 ++--
 bin/node/bench/Cargo.toml                  | 2 +-
 client/chain-spec/Cargo.toml               | 2 +-
 client/cli/Cargo.toml                      | 2 +-
 client/consensus/babe/rpc/Cargo.toml       | 2 +-
 client/finality-grandpa/Cargo.toml         | 2 +-
 client/keystore/Cargo.toml                 | 2 +-
 client/network/Cargo.toml                  | 2 +-
 client/peerset/Cargo.toml                  | 2 +-
 client/rpc-api/Cargo.toml                  | 2 +-
 client/rpc-servers/Cargo.toml              | 2 +-
 client/rpc/Cargo.toml                      | 2 +-
 client/service/Cargo.toml                  | 2 +-
 client/sync-state-rpc/Cargo.toml           | 2 +-
 client/telemetry/Cargo.toml                | 2 +-
 frame/merkle-mountain-range/rpc/Cargo.toml | 2 +-
 frame/transaction-payment/Cargo.toml       | 2 +-
 primitives/rpc/Cargo.toml                  | 2 +-
 primitives/runtime/Cargo.toml              | 2 +-
 primitives/serializer/Cargo.toml           | 2 +-
 primitives/tracing/Cargo.toml              | 2 +-
 test-utils/client/Cargo.toml               | 2 +-
 22 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f1f3b7e00c65..ff21ec8dd010 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8490,9 +8490,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.64"
+version = "1.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79"
+checksum = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8"
 dependencies = [
  "itoa",
  "ryu",
diff --git a/bin/node/bench/Cargo.toml b/bin/node/bench/Cargo.toml
index dee927cf944b..b19a71966fb8 100644
--- a/bin/node/bench/Cargo.toml
+++ b/bin/node/bench/Cargo.toml
@@ -17,7 +17,7 @@ sc-client-api = { version = "4.0.0-dev", path = "../../../client/api/" }
 sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
 sp-state-machine = { version = "0.10.0-dev", path = "../../../primitives/state-machine" }
 serde = "1.0.126"
-serde_json = "1.0.41"
+serde_json = "1.0.68"
 structopt = "0.3"
 derive_more = "0.99.2"
 kvdb = "0.10.0"
diff --git a/client/chain-spec/Cargo.toml b/client/chain-spec/Cargo.toml
index 3243430989c7..8af2996e968d 100644
--- a/client/chain-spec/Cargo.toml
+++ b/client/chain-spec/Cargo.toml
@@ -18,7 +18,7 @@ impl-trait-for-tuples = "0.2.1"
 sc-network = { version = "0.10.0-dev", path = "../network" }
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 serde = { version = "1.0.126", features = ["derive"] }
-serde_json = "1.0.41"
+serde_json = "1.0.68"
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
 sc-telemetry = { version = "4.0.0-dev", path = "../telemetry" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index 97058110ad92..e7a0330e76e0 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -23,7 +23,7 @@ parity-scale-codec = "2.0.0"
 hex = "0.4.2"
 rand = "0.7.3"
 tiny-bip39 = "0.8.0"
-serde_json = "1.0.41"
+serde_json = "1.0.68"
 sc-keystore = { version = "4.0.0-dev", path = "../keystore" }
 sp-panic-handler = { version = "3.0.0", path = "../../primitives/panic-handler" }
 sc-client-api = { version = "4.0.0-dev", path = "../api" }
diff --git a/client/consensus/babe/rpc/Cargo.toml b/client/consensus/babe/rpc/Cargo.toml
index 0f6c411a730e..8d5625705a48 100644
--- a/client/consensus/babe/rpc/Cargo.toml
+++ b/client/consensus/babe/rpc/Cargo.toml
@@ -33,7 +33,7 @@ sp-keystore = { version = "0.10.0-dev", path = "../../../../primitives/keystore"
 
 [dev-dependencies]
 sc-consensus = { version = "0.10.0-dev", path = "../../../consensus/common" }
-serde_json = "1.0.50"
+serde_json = "1.0.68"
 sp-keyring = { version = "4.0.0-dev", path = "../../../../primitives/keyring" }
 sc-keystore = { version = "4.0.0-dev", path = "../../../keystore" }
 substrate-test-runtime-client = { version = "2.0.0", path = "../../../../test-utils/runtime/client" }
diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml
index 40385a2faea5..ffdfc80c4eb9 100644
--- a/client/finality-grandpa/Cargo.toml
+++ b/client/finality-grandpa/Cargo.toml
@@ -35,7 +35,7 @@ sp-keystore = { version = "0.10.0-dev", path = "../../primitives/keystore" }
 sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
 sc-telemetry = { version = "4.0.0-dev", path = "../telemetry" }
 sc-keystore = { version = "4.0.0-dev", path = "../keystore" }
-serde_json = "1.0.41"
+serde_json = "1.0.68"
 sc-client-api = { version = "4.0.0-dev", path = "../api" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
 sc-network = { version = "0.10.0-dev", path = "../network" }
diff --git a/client/keystore/Cargo.toml b/client/keystore/Cargo.toml
index 11d6f5cb1e24..17c651a91dec 100644
--- a/client/keystore/Cargo.toml
+++ b/client/keystore/Cargo.toml
@@ -22,7 +22,7 @@ sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 sp-keystore = { version = "0.10.0-dev", path = "../../primitives/keystore" }
 hex = "0.4.0"
 parking_lot = "0.11.1"
-serde_json = "1.0.41"
+serde_json = "1.0.68"
 
 [dev-dependencies]
 tempfile = "3.1.0"
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index 283ac7c68f3e..873c2a847a29 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -47,7 +47,7 @@ sc-block-builder = { version = "0.10.0-dev", path = "../block-builder" }
 sc-client-api = { version = "4.0.0-dev", path = "../api" }
 sc-peerset = { version = "4.0.0-dev", path = "../peerset" }
 serde = { version = "1.0.126", features = ["derive"] }
-serde_json = "1.0.41"
+serde_json = "1.0.68"
 smallvec = "1.5.0"
 sp-arithmetic = { version = "4.0.0-dev", path = "../../primitives/arithmetic" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
diff --git a/client/peerset/Cargo.toml b/client/peerset/Cargo.toml
index 9e83ede675d0..5962620d6e06 100644
--- a/client/peerset/Cargo.toml
+++ b/client/peerset/Cargo.toml
@@ -19,7 +19,7 @@ futures = "0.3.9"
 libp2p = { version = "0.39.1", default-features = false }
 sc-utils = { version = "4.0.0-dev", path = "../utils"}
 log = "0.4.8"
-serde_json = "1.0.41"
+serde_json = "1.0.68"
 wasm-timer = "0.2"
 
 [dev-dependencies]
diff --git a/client/rpc-api/Cargo.toml b/client/rpc-api/Cargo.toml
index 86fd24c24e7f..6342abb1a3c4 100644
--- a/client/rpc-api/Cargo.toml
+++ b/client/rpc-api/Cargo.toml
@@ -28,7 +28,7 @@ sp-version = { version = "4.0.0-dev", path = "../../primitives/version" }
 sp-runtime = { path = "../../primitives/runtime", version = "4.0.0-dev" }
 sc-chain-spec = { path = "../chain-spec", version = "4.0.0-dev" }
 serde = { version = "1.0.126", features = ["derive"] }
-serde_json = "1.0.41"
+serde_json = "1.0.68"
 sc-transaction-pool-api = { version = "4.0.0-dev", path = "../transaction-pool/api" }
 sp-rpc = { version = "4.0.0-dev", path = "../../primitives/rpc" }
 sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
diff --git a/client/rpc-servers/Cargo.toml b/client/rpc-servers/Cargo.toml
index e249bb1ed8ae..26a05a8263dc 100644
--- a/client/rpc-servers/Cargo.toml
+++ b/client/rpc-servers/Cargo.toml
@@ -18,7 +18,7 @@ jsonrpc-core = "18.0.0"
 pubsub = { package = "jsonrpc-pubsub", version = "18.0.0" }
 log = "0.4.8"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
-serde_json = "1.0.41"
+serde_json = "1.0.68"
 tokio = "1.10"
 http = { package = "jsonrpc-http-server", version = "18.0.0" }
 ipc = { package = "jsonrpc-ipc-server", version = "18.0.0" }
diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml
index 9957bc999a8b..427800f74ddf 100644
--- a/client/rpc/Cargo.toml
+++ b/client/rpc/Cargo.toml
@@ -23,7 +23,7 @@ log = "0.4.8"
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 rpc = { package = "jsonrpc-core", version = "18.0.0" }
 sp-version = { version = "4.0.0-dev", path = "../../primitives/version" }
-serde_json = "1.0.41"
+serde_json = "1.0.68"
 sp-session = { version = "4.0.0-dev", path = "../../primitives/session" }
 sp-offchain = { version = "4.0.0-dev", path = "../../primitives/offchain" }
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index ca81ede9a6a9..5120cc8f4dfa 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -34,7 +34,7 @@ exit-future = "0.2.0"
 pin-project = "1.0.4"
 hash-db = "0.15.2"
 serde = "1.0.126"
-serde_json = "1.0.41"
+serde_json = "1.0.68"
 sc-keystore = { version = "4.0.0-dev", path = "../keystore" }
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
 sp-trie = { version = "4.0.0-dev", path = "../../primitives/trie" }
diff --git a/client/sync-state-rpc/Cargo.toml b/client/sync-state-rpc/Cargo.toml
index 9da9944a5454..b81fd1fd5c61 100644
--- a/client/sync-state-rpc/Cargo.toml
+++ b/client/sync-state-rpc/Cargo.toml
@@ -23,7 +23,7 @@ sc-consensus-babe = { version = "0.10.0-dev", path = "../consensus/babe" }
 sc-consensus-epochs = { version = "0.10.0-dev", path = "../consensus/epochs" }
 sc-finality-grandpa = { version = "0.10.0-dev", path = "../finality-grandpa" }
 sc-rpc-api = { version = "0.10.0-dev", path = "../rpc-api" }
-serde_json = "1.0.58"
+serde_json = "1.0.68"
 serde = { version = "1.0.126", features = ["derive"] }
 sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
diff --git a/client/telemetry/Cargo.toml b/client/telemetry/Cargo.toml
index 4dafeb205544..f115017f0970 100644
--- a/client/telemetry/Cargo.toml
+++ b/client/telemetry/Cargo.toml
@@ -23,6 +23,6 @@ log = "0.4.8"
 pin-project = "1.0.4"
 rand = "0.7.2"
 serde = { version = "1.0.126", features = ["derive"] }
-serde_json = "1.0.41"
+serde_json = "1.0.68"
 chrono = "0.4.19"
 thiserror = "1.0.21"
diff --git a/frame/merkle-mountain-range/rpc/Cargo.toml b/frame/merkle-mountain-range/rpc/Cargo.toml
index 9182afbb1f5f..5a0f114e5017 100644
--- a/frame/merkle-mountain-range/rpc/Cargo.toml
+++ b/frame/merkle-mountain-range/rpc/Cargo.toml
@@ -27,4 +27,4 @@ sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
 pallet-mmr-primitives = { version = "4.0.0-dev", path = "../primitives" }
 
 [dev-dependencies]
-serde_json = "1.0.41"
+serde_json = "1.0.68"
diff --git a/frame/transaction-payment/Cargo.toml b/frame/transaction-payment/Cargo.toml
index 12b7622c1b18..0bcc422bb847 100644
--- a/frame/transaction-payment/Cargo.toml
+++ b/frame/transaction-payment/Cargo.toml
@@ -28,7 +28,7 @@ frame-support = { version = "4.0.0-dev", default-features = false, path = "../su
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 
 [dev-dependencies]
-serde_json = "1.0.41"
+serde_json = "1.0.68"
 pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 
 [features]
diff --git a/primitives/rpc/Cargo.toml b/primitives/rpc/Cargo.toml
index 73c42555f1f1..8e1b91a9acb2 100644
--- a/primitives/rpc/Cargo.toml
+++ b/primitives/rpc/Cargo.toml
@@ -18,4 +18,4 @@ sp-core = { version = "4.0.0-dev", path = "../core" }
 rustc-hash = "1.1.0"
 
 [dev-dependencies]
-serde_json = "1.0.41"
+serde_json = "1.0.68"
diff --git a/primitives/runtime/Cargo.toml b/primitives/runtime/Cargo.toml
index ad4b0477184e..017c6a75efd9 100644
--- a/primitives/runtime/Cargo.toml
+++ b/primitives/runtime/Cargo.toml
@@ -31,7 +31,7 @@ hash256-std-hasher = { version = "0.15.2", default-features = false }
 either = { version = "1.5", default-features = false }
 
 [dev-dependencies]
-serde_json = "1.0.41"
+serde_json = "1.0.68"
 rand = "0.7.2"
 sp-state-machine = { version = "0.10.0-dev", path = "../state-machine" }
 sp-api = { version = "4.0.0-dev", path = "../api" }
diff --git a/primitives/serializer/Cargo.toml b/primitives/serializer/Cargo.toml
index 8f03d8f97293..2200274e0628 100644
--- a/primitives/serializer/Cargo.toml
+++ b/primitives/serializer/Cargo.toml
@@ -15,4 +15,4 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = "1.0.126"
-serde_json = "1.0.41"
+serde_json = "1.0.68"
diff --git a/primitives/tracing/Cargo.toml b/primitives/tracing/Cargo.toml
index aba918c9c553..3be09dcd576d 100644
--- a/primitives/tracing/Cargo.toml
+++ b/primitives/tracing/Cargo.toml
@@ -31,7 +31,7 @@ tracing-subscriber = { version = "0.2.19", optional = true, features = [
 parking_lot = { version = "0.10.0", optional = true }
 erased-serde = { version = "0.3.9", optional = true }
 serde = { version = "1.0.126", optional = true }
-serde_json = { version = "1.0.41", optional = true }
+serde_json = { version = "1.0.68", optional = true }
 slog = { version = "2.5.2", features = ["nested-values"], optional = true }
 
 [features]
diff --git a/test-utils/client/Cargo.toml b/test-utils/client/Cargo.toml
index a6f152edafaa..34238872cad8 100644
--- a/test-utils/client/Cargo.toml
+++ b/test-utils/client/Cargo.toml
@@ -16,7 +16,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0" }
 futures = "0.3.16"
 hex = "0.4"
 serde = "1.0.126"
-serde_json = "1.0.55"
+serde_json = "1.0.68"
 sc-client-api = { version = "4.0.0-dev", path = "../../client/api" }
 sc-client-db = { version = "0.10.0-dev", features = [
     "test-helpers",

From ba153b9ae050eda022f002d74d76f98d1e339a81 Mon Sep 17 00:00:00 2001
From: Andrew Jones <ascjones@gmail.com>
Date: Wed, 15 Sep 2021 12:40:41 +0100
Subject: [PATCH 1189/1194] Enrich metadata with type information (#8615)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Cargo.lock after merge

* Restore scale-info feature

* Fully qualify TypeInfo derive

* Skip PendingSwap T

* Add missing skip_type_params attr

* metadata docs features

* Reduce pallet event attribute to struct

* Cargo.lock

* Update frame/balances/src/tests_composite.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Line widths check

* Cargo.lock

* Add scale-info/std

* Update frame/system/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Use `skip_type_params` to remove `TypeInfo` requirements on checks

* Revert "Remove unused Call metadata stuff"

This reverts commit 41311f85

* Skip BalanceSwapAction type parameter

* Remove unused event metadata macro

* Update frame-metadata

* Update primitives/npos-elections/compact/src/codec.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Manual TypeInfo for Header

* Remove TypeInfo requirement for consts in BoundedVec etc.

* Another TypeInfo bound removed

* review: fix indentation

* TypeInfo impls for Identity types

* Add some todos to add custom TypeInfo impls

* Update frame/support/procedural/src/pallet/expand/pallet_struct.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Add some todos to add custom TypeInfo impls

* Add a test for manual Data TypeInfo impl

* Add custom TypeInfo impl for Vote

* Era custom TypeInfo crimes

* Revert finality-grandpa version to 0.14.z

* review: renamed module to pallet_constants_metadata

* New line at end of file

* Add missing scale-info/std

* Update frame/support/src/storage/types/mod.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Remove StorageEntryType::Map unused flag

* Add missing scale-info dependency after merge

* SignedExtension::AdditionalSigned metadata

* Update frame-metadata, use abbreviated docs and args fields

* Update frame/example/Cargo.toml

Co-authored-by: Keith Yeung <kungfukeith11@gmail.com>

* Add scale_info/std and remove unused scale-info dependency

* Remove scale-info dependency

* Remove treasury pallet::metadata

* Remove redundant Event test

* Add back scale-info as dev dependency

* fix error metadata when no error defined in decl_module

* Add Module3 to tests

* Fix metadata test

* Add docs feature to frame-support test

* WIP fixing pallet metadata test

* Remove redundant FunctionMetadata, FunctionArgumentMetadata as per https://github.com/paritytech/frame-metadata/pull/20

* Use main branch of frame-metadata

* Use patch of scale-info for latest changes

* Use latest patched scale-info

* Manual TypeInfo for DigestItem

* Manual TypeInfo for DigestItem

* Update scale-info

* Skip __Ignore variants for Error, depends on https://github.com/paritytech/scale-info/pull/117

* Named fields for FRAME v2 pallet Call variants

* Named fields for FRAME v1 pallet Call variants

* Add missing scale-info dependency

* WIP expand benchmark call variant

* fix benchmark with new function

create a new function for each variant of a pallet call.
This function is called by benchmarking macro in order not to break call
creation with unnamed argument

* fix tests

* more fix

* Fix staking tests

* Fix offchain workers calls

* Cherry pick rustfmt.toml from master

* cargo +nightly-2021-06-22 fmt --all

* Update to new call variant structs

* More call variant struct updates

* Remove unused import

* More call variant structs

* More call variant structs

* Even more call variant structs

* Mooar variant structs

* Evermore variant structs

* Call variant structs ad infinitum

* Fmt

* More call variants

* Last call variant

* Call variants all done?

* Fix SS58Prefix type

* Potential workaround for BitFlags<IdentityFields> TypeInfo

* Enable docs capturing for Call, Event, and Error types

* Fix IdentityFields TypeInfo

* Remove metadata-docs feature

* Add capture_docs = true for legacy Call, Event and Error types

* Fmt

* Fix metadata test type

* Update benchmarks with call struct variants

* Fmt

* More test fixes

* Fmt

* Fix benches

* Use latest capture_docs attr

* Latest scale_info

* Fmt

* review: change &Vec to &[]

* Remove pallet metadata attr

* review: remove commented out test code

* review: skip_type_params trailing comma suggestion

* Update to scale-info 0.10.0

* Update construct_runtime ui tests, different because of metadata TypeInfo impls

* Add some TypeInfo derives for UI tests

* Update storage ensure span ui stderrs

* Update call argument bound ui tests

Possibly changed because change from tuple to struct variants?

* Add scale-info dev dependency

* Update to latest finality-grandpa release

* review: missing newline

* review: missing scale-info/std

* review: remove duplicate scale-info/std

* review: remove fully qualified TypeInfo

* review: add missing scale-info/std

* review: remove unnecessary imports.

* Fmt

* Use crates.io RC version of frame-metadata

* Remove scale-info/std because it is a dev dependency

* Add missing scale_info dev-dependency for test

* Delete empty metadata folder

* Fix sp_std import

* review: improve manual UncheckedExtrinsic TypeInfo impl

* review: use full scale-info for dev-dependency

* Remove DefaultByteGetter impl

* review: derive TypeInfo for generic header

* Fmt

* Update primitives/runtime/src/generic/unchecked_extrinsic.rs

Co-authored-by: Keith Yeung <kungfukeith11@gmail.com>

* Update primitives/runtime/src/generic/unchecked_extrinsic.rs

Co-authored-by: Keith Yeung <kungfukeith11@gmail.com>

* Update bin/node/executor/Cargo.toml

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update frame/identity/src/types.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update frame/support/src/dispatch.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Remove redundant derive

* Simplify scale-info dependency

* Strip underscore prefix from call variant struct names

* Another underscore field

* More underscore fields

* Another underscore field

* Update to frame-metadata 14.0.0-rc.2 with combined StorageEntryType::Map

* Fmt

* Revert weights formatting

* Fix up some tests

* Fix up some tests for StorageEntryTypeMetadata

* scale-info dev dependency

* Fix test error

* Add missing TypeInfo derives

* Add back missing scale-info dependency

* Add back missing scale-info dependency

* Fix npos compact impls

* Cargo.lock

* Fmt

* Fix errors

* Fmt

* Fix renamed raw_solution field

* Fix error

* Fmt

* Fix some benchmarks

* Fmt

* Stray R

* Fix

* Add missing TypeInfos

* ui test fix

* Fix line widths

* Revert "ui test fix"

This reverts commit 2d15ec058a216e3f92d713f1174603a2bb1eac65.

* Upgrade to scale-info 0.11.0

* Revert "Upgrade to scale-info 0.11.0"

This reverts commit 047bb179085a0059c36cd20ab405f55cf0867e28.

* Add Runtime type

* Update to scale-info 0.12

* Update to scale-info 1.0

* Update frame-metadata to version 14.0.0

* Patch finality-grandpa until release available

* Fix metadata tests

* Fix metadata tests

* Fmt

* Remove patched finality-grandpa

* Fix tests, use scale_info imports

* Fix pallet tests

* Add BlockNumber TypeInfo bound

* ui test fix

* Cargo.lock

* Remove pallet metadata

* Cargo.lock

* Add missing scale-info dependency

* Remove pallet event metadata

* Fix error

* Fix collective errors

* Semicolol

* Fmt

* Remove another metadata attribute

* Add new variant to custom digest TypeInfo

* Fmt

* Cargo.lock from master

* Remove comma lol

* Fix example call error

* Fix example call error properly

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Keith Yeung <kungfukeith11@gmail.com>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
---
 Cargo.lock                                    | 126 ++-
 Cargo.toml                                    |   4 +-
 bin/node-template/pallets/template/Cargo.toml |   2 +
 bin/node-template/pallets/template/src/lib.rs |   1 -
 bin/node-template/runtime/Cargo.toml          |   2 +
 bin/node-template/runtime/src/lib.rs          |   2 +-
 bin/node/cli/src/service.rs                   |   3 +-
 bin/node/executor/Cargo.toml                  |   1 +
 bin/node/executor/benches/bench.rs            |   7 +-
 bin/node/executor/tests/basic.rs              |  72 +-
 bin/node/executor/tests/common.rs             |   2 +-
 bin/node/executor/tests/fees.rs               |  18 +-
 bin/node/executor/tests/submit_transaction.rs |  26 +-
 bin/node/primitives/Cargo.toml                |   2 +
 bin/node/runtime/Cargo.toml                   |   2 +
 bin/node/runtime/src/lib.rs                   |  18 +-
 bin/node/test-runner-example/src/lib.rs       |   2 +-
 bin/node/testing/src/bench.rs                 |  18 +-
 client/finality-grandpa-warp-sync/Cargo.toml  |   2 +-
 client/finality-grandpa/Cargo.toml            |   2 +-
 client/finality-grandpa/rpc/Cargo.toml        |   2 +-
 frame/assets/Cargo.toml                       |   2 +
 frame/assets/src/benchmarking.rs              |  34 +-
 frame/assets/src/lib.rs                       |   1 -
 frame/assets/src/types.rs                     |  11 +-
 frame/atomic-swap/Cargo.toml                  |   2 +
 frame/atomic-swap/src/lib.rs                  |   8 +-
 frame/aura/Cargo.toml                         |   2 +
 frame/authority-discovery/Cargo.toml          |   2 +
 frame/authorship/Cargo.toml                   |   2 +
 frame/authorship/src/lib.rs                   |  16 +-
 frame/babe/Cargo.toml                         |   2 +
 frame/babe/src/equivocation.rs                |  10 +-
 frame/babe/src/tests.rs                       |  16 +-
 frame/balances/Cargo.toml                     |   2 +
 frame/balances/src/lib.rs                     |  15 +-
 frame/balances/src/tests.rs                   |   2 +-
 frame/benchmarking/Cargo.toml                 |   2 +
 frame/benchmarking/src/lib.rs                 |  52 +-
 frame/bounties/Cargo.toml                     |   2 +
 frame/bounties/src/lib.rs                     |   5 +-
 frame/collective/Cargo.toml                   |   2 +
 frame/collective/src/benchmarking.rs          |  28 +-
 frame/collective/src/lib.rs                   |   7 +-
 frame/collective/src/tests.rs                 |  25 +-
 frame/contracts/Cargo.toml                    |   2 +
 frame/contracts/common/Cargo.toml             |   2 +
 frame/contracts/rpc/runtime-api/Cargo.toml    |   2 +
 frame/contracts/src/exec.rs                   |  19 +-
 frame/contracts/src/lib.rs                    |   1 -
 frame/contracts/src/schedule.rs               |  12 +-
 frame/contracts/src/storage.rs                |   5 +-
 frame/contracts/src/tests.rs                  |   7 +-
 frame/contracts/src/wasm/mod.rs               |   5 +-
 frame/democracy/Cargo.toml                    |   2 +
 frame/democracy/src/benchmarking.rs           |  24 +-
 frame/democracy/src/conviction.rs             |   3 +-
 frame/democracy/src/lib.rs                    |  14 +-
 frame/democracy/src/tests.rs                  |   5 +-
 frame/democracy/src/types.rs                  |   9 +-
 frame/democracy/src/vote.rs                   |  22 +-
 frame/democracy/src/vote_threshold.rs         |   3 +-
 .../election-provider-multi-phase/Cargo.toml  |   2 +
 .../src/benchmarking.rs                       |   5 +-
 .../election-provider-multi-phase/src/lib.rs  |  35 +-
 .../src/signed.rs                             |   2 +-
 .../src/unsigned.rs                           |  39 +-
 frame/election-provider-support/Cargo.toml    |   1 +
 frame/elections-phragmen/Cargo.toml           |   2 +
 frame/elections-phragmen/src/lib.rs           |  12 +-
 frame/elections/Cargo.toml                    |   2 +
 frame/elections/src/lib.rs                    |   5 +-
 frame/example-offchain-worker/Cargo.toml      |   2 +
 frame/example-offchain-worker/src/lib.rs      |  24 +-
 frame/example-offchain-worker/src/tests.rs    |  19 +-
 frame/example-parallel/Cargo.toml             |   2 +
 frame/example-parallel/src/lib.rs             |   2 +-
 frame/example/Cargo.toml                      |   2 +
 frame/example/src/lib.rs                      |  16 +-
 frame/example/src/tests.rs                    |   6 +-
 frame/executive/Cargo.toml                    |   2 +
 frame/executive/src/lib.rs                    |  66 +-
 frame/gilt/Cargo.toml                         |   2 +
 frame/gilt/src/benchmarking.rs                |   6 +-
 frame/gilt/src/lib.rs                         |  11 +-
 frame/grandpa/Cargo.toml                      |   2 +
 frame/grandpa/src/equivocation.rs             |  10 +-
 frame/grandpa/src/lib.rs                      |   6 +-
 frame/grandpa/src/tests.rs                    |  16 +-
 frame/identity/Cargo.toml                     |   2 +
 frame/identity/src/lib.rs                     |   4 -
 frame/identity/src/types.rs                   | 170 +++-
 frame/im-online/Cargo.toml                    |   2 +
 frame/im-online/src/benchmarking.rs           |   4 +-
 frame/im-online/src/lib.rs                    |  16 +-
 frame/im-online/src/tests.rs                  |  21 +-
 frame/indices/Cargo.toml                      |   2 +
 frame/indices/src/lib.rs                      |   1 -
 frame/lottery/Cargo.toml                      |   2 +
 frame/lottery/src/benchmarking.rs             |  20 +-
 frame/lottery/src/lib.rs                      |   3 +-
 frame/lottery/src/tests.rs                    |  45 +-
 frame/membership/Cargo.toml                   |   2 +
 frame/membership/src/lib.rs                   |   3 -
 frame/merkle-mountain-range/Cargo.toml        |   2 +
 frame/merkle-mountain-range/src/lib.rs        |   3 +-
 frame/metadata/Cargo.toml                     |  28 -
 frame/metadata/README.md                      |   7 -
 frame/metadata/src/lib.rs                     | 466 -----------
 frame/multisig/Cargo.toml                     |   2 +
 frame/multisig/src/benchmarking.rs            |   7 +-
 frame/multisig/src/lib.rs                     |  10 +-
 frame/multisig/src/tests.rs                   |  52 +-
 frame/nicks/Cargo.toml                        |   2 +
 frame/nicks/src/lib.rs                        |   1 -
 frame/node-authorization/Cargo.toml           |   2 +
 frame/node-authorization/src/lib.rs           |   1 -
 frame/offences/Cargo.toml                     |   2 +
 frame/offences/benchmarking/Cargo.toml        |   2 +
 frame/proxy/Cargo.toml                        |   2 +
 frame/proxy/src/benchmarking.rs               |  10 +-
 frame/proxy/src/lib.rs                        |  28 +-
 frame/proxy/src/tests.rs                      |  64 +-
 frame/randomness-collective-flip/Cargo.toml   |   2 +
 frame/recovery/Cargo.toml                     |   2 +
 frame/recovery/src/lib.rs                     |   6 +-
 frame/recovery/src/tests.rs                   |   8 +-
 frame/scheduler/Cargo.toml                    |   2 +
 frame/scheduler/src/benchmarking.rs           |   6 +-
 frame/scheduler/src/lib.rs                    | 120 +--
 frame/scored-pool/Cargo.toml                  |   2 +
 frame/scored-pool/src/lib.rs                  |   3 +-
 frame/session/Cargo.toml                      |   2 +
 frame/session/benchmarking/Cargo.toml         |   1 +
 frame/society/Cargo.toml                      |   2 +
 frame/society/src/lib.rs                      |  13 +-
 frame/staking/Cargo.toml                      |   2 +
 frame/staking/src/lib.rs                      |  29 +-
 frame/staking/src/pallet/mod.rs               |   1 -
 frame/staking/src/slashing.rs                 |   7 +-
 frame/staking/src/tests.rs                    |  15 +-
 frame/sudo/Cargo.toml                         |   2 +
 frame/sudo/src/lib.rs                         |   1 -
 frame/sudo/src/mock.rs                        |   1 -
 frame/sudo/src/tests.rs                       |  24 +-
 frame/support/Cargo.toml                      |   5 +-
 .../src/construct_runtime/expand/call.rs      |   1 +
 .../src/construct_runtime/expand/event.rs     |   1 +
 .../src/construct_runtime/expand/metadata.rs  |  80 +-
 .../src/construct_runtime/expand/origin.rs    |   5 +-
 .../procedural/src/construct_runtime/mod.rs   |   5 +-
 frame/support/procedural/src/key_prefix.rs    |   4 +-
 .../procedural/src/pallet/expand/call.rs      | 115 ++-
 .../procedural/src/pallet/expand/config.rs    |   3 +-
 .../procedural/src/pallet/expand/constants.rs |  52 +-
 .../procedural/src/pallet/expand/error.rs     |  31 +-
 .../procedural/src/pallet/expand/event.rs     |  35 +-
 .../src/pallet/expand/genesis_config.rs       |   6 +-
 .../procedural/src/pallet/expand/mod.rs       |   3 +-
 .../src/pallet/expand/pallet_struct.rs        |  31 +-
 .../procedural/src/pallet/expand/storage.rs   | 109 +--
 .../procedural/src/pallet/parse/call.rs       |   5 +-
 .../procedural/src/pallet/parse/config.rs     |   3 +-
 .../procedural/src/pallet/parse/error.rs      |   3 +-
 .../procedural/src/pallet/parse/event.rs      | 141 +---
 .../src/pallet/parse/extra_constants.rs       |   3 +-
 .../procedural/src/pallet/parse/helper.rs     |  18 -
 .../procedural/src/pallet/parse/storage.rs    |   3 +-
 .../procedural/src/storage/instance_trait.rs  |   1 +
 .../procedural/src/storage/metadata.rs        |  84 +-
 frame/support/procedural/tools/src/lib.rs     |  18 +
 frame/support/src/dispatch.rs                 | 353 +++-----
 frame/support/src/error.rs                    |  23 +-
 frame/support/src/event.rs                    | 268 +-----
 frame/support/src/hash.rs                     |  17 +-
 frame/support/src/lib.rs                      | 254 +++---
 .../support/src/storage/bounded_btree_map.rs  |   3 +-
 frame/support/src/storage/bounded_vec.rs      |   3 +-
 frame/support/src/storage/mod.rs              |   1 +
 frame/support/src/storage/types/double_map.rs |  75 +-
 frame/support/src/storage/types/key.rs        |  23 +-
 frame/support/src/storage/types/map.rs        |  64 +-
 frame/support/src/storage/types/mod.rs        |  30 +-
 frame/support/src/storage/types/nmap.rs       |  49 +-
 frame/support/src/storage/types/value.rs      |  32 +-
 frame/support/src/storage/weak_bounded_vec.rs |   3 +-
 frame/support/src/traits/tokens/misc.rs       |  12 +-
 frame/support/src/weights.rs                  |  31 +-
 frame/support/test/Cargo.toml                 |   5 +-
 frame/support/test/pallet/Cargo.toml          |   2 +
 frame/support/test/src/lib.rs                 |   4 +-
 frame/support/test/tests/construct_runtime.rs | 539 ++++--------
 .../no_std_genesis_config.stderr              |  22 +
 .../undefined_call_part.stderr                |  24 +
 .../undefined_event_part.stderr               |  32 +-
 .../undefined_genesis_config_part.stderr      |  24 +
 .../undefined_inherent_part.stderr            |  24 +
 .../undefined_origin_part.stderr              |  24 +
 .../undefined_validate_unsigned_part.stderr   |  24 +
 frame/support/test/tests/decl_storage.rs      | 593 ++++++-------
 frame/support/test/tests/instance.rs          |  90 +-
 frame/support/test/tests/issue2219.rs         |   7 +-
 frame/support/test/tests/pallet.rs            | 784 +++++++++++-------
 .../test/tests/pallet_compatibility.rs        |  79 +-
 .../tests/pallet_compatibility_instance.rs    |  73 +-
 frame/support/test/tests/pallet_instance.rs   | 320 +++----
 .../pallet_ui/call_argument_invalid_bound.rs  |   2 +-
 .../call_argument_invalid_bound.stderr        |  12 +-
 .../call_argument_invalid_bound_2.rs          |   2 +-
 .../call_argument_invalid_bound_2.stderr      |  22 +-
 .../call_argument_invalid_bound_3.rs          |   2 +-
 .../call_argument_invalid_bound_3.stderr      |  12 +-
 ...age_ensure_span_are_ok_on_wrong_gen.stderr |  26 +-
 ...re_span_are_ok_on_wrong_gen_unnamed.stderr |  26 +-
 .../pallet_ui/storage_info_unsatisfied.rs     |   2 +-
 .../storage_info_unsatisfied_nmap.rs          |   2 +-
 .../storage_info_unsatisfied_nmap.stderr      |   4 +-
 frame/support/test/tests/system.rs            |   6 +-
 frame/system/Cargo.toml                       |   2 +
 frame/system/benchmarking/Cargo.toml          |   2 +
 frame/system/src/extensions/check_genesis.rs  |   4 +-
 .../system/src/extensions/check_mortality.rs  |   4 +-
 frame/system/src/extensions/check_nonce.rs    |   4 +-
 .../src/extensions/check_spec_version.rs      |   4 +-
 .../system/src/extensions/check_tx_version.rs |   4 +-
 frame/system/src/extensions/check_weight.rs   |   4 +-
 frame/system/src/lib.rs                       |  19 +-
 frame/system/src/limits.rs                    |   7 +-
 frame/system/src/mock.rs                      |   3 +-
 frame/system/src/offchain.rs                  |   5 +-
 frame/timestamp/Cargo.toml                    |   2 +
 frame/timestamp/src/lib.rs                    |   9 +-
 frame/tips/Cargo.toml                         |   2 +
 frame/tips/src/lib.rs                         |   3 +-
 frame/transaction-payment/Cargo.toml          |   2 +
 frame/transaction-payment/src/lib.rs          |  10 +-
 frame/transaction-payment/src/payment.rs      |   3 +-
 frame/transaction-storage/Cargo.toml          |   2 +
 frame/transaction-storage/src/lib.rs          |   6 +-
 frame/treasury/Cargo.toml                     |   2 +
 frame/treasury/src/lib.rs                     |   4 +-
 frame/uniques/Cargo.toml                      |   2 +
 frame/uniques/src/benchmarking.rs             |  16 +-
 frame/uniques/src/lib.rs                      |   5 -
 frame/uniques/src/types.rs                    |  13 +-
 frame/utility/Cargo.toml                      |   2 +
 frame/utility/src/benchmarking.rs             |   6 +-
 frame/utility/src/lib.rs                      |   2 +-
 frame/utility/src/tests.rs                    | 156 ++--
 frame/vesting/Cargo.toml                      |   2 +
 frame/vesting/src/lib.rs                      |   6 +-
 frame/vesting/src/vesting_info.rs             |   2 +-
 primitives/application-crypto/Cargo.toml      |   2 +
 primitives/application-crypto/src/lib.rs      |   6 +
 primitives/application-crypto/src/traits.rs   |   2 +-
 primitives/arithmetic/Cargo.toml              |   2 +
 primitives/arithmetic/src/fixed_point.rs      |  12 +-
 primitives/arithmetic/src/per_things.rs       |   2 +-
 primitives/authority-discovery/Cargo.toml     |   2 +
 primitives/consensus/aura/Cargo.toml          |   2 +
 primitives/consensus/babe/Cargo.toml          |   2 +
 primitives/consensus/babe/src/digests.rs      |   2 +-
 primitives/consensus/babe/src/lib.rs          |   5 +-
 primitives/consensus/slots/Cargo.toml         |   2 +
 primitives/consensus/slots/src/lib.rs         |   5 +-
 primitives/core/Cargo.toml                    |   3 +
 primitives/core/src/changes_trie.rs           |   2 +-
 primitives/core/src/crypto.rs                 |   6 +-
 primitives/core/src/ecdsa.rs                  |   5 +-
 primitives/core/src/ed25519.rs                |  16 +-
 primitives/core/src/lib.rs                    |  15 +-
 primitives/core/src/offchain/mod.rs           |   5 +-
 primitives/core/src/sr25519.rs                |  16 +-
 primitives/finality-grandpa/Cargo.toml        |   2 +
 primitives/finality-grandpa/src/lib.rs        |   5 +-
 primitives/npos-elections/Cargo.toml          |   2 +
 primitives/npos-elections/fuzzer/Cargo.toml   |   1 +
 .../npos-elections/solution-type/Cargo.toml   |   1 +
 .../npos-elections/solution-type/src/codec.rs |  90 +-
 .../solution-type/src/single_page.rs          |  13 +-
 primitives/npos-elections/src/lib.rs          |   4 +-
 primitives/runtime/Cargo.toml                 |   2 +
 primitives/runtime/src/curve.rs               |   2 +-
 primitives/runtime/src/generic/digest.rs      | 119 ++-
 primitives/runtime/src/generic/era.rs         |  44 +
 primitives/runtime/src/generic/header.rs      |   3 +-
 .../src/generic/unchecked_extrinsic.rs        |  37 +-
 primitives/runtime/src/lib.rs                 |  13 +-
 primitives/runtime/src/multiaddress.rs        |   2 +-
 primitives/runtime/src/runtime_string.rs      |   8 +
 primitives/runtime/src/testing.rs             |   6 +-
 primitives/runtime/src/traits.rs              |  58 +-
 primitives/session/Cargo.toml                 |   2 +
 primitives/session/src/lib.rs                 |   2 +-
 primitives/staking/Cargo.toml                 |   2 +
 primitives/staking/src/offence.rs             |   2 +-
 .../transaction-storage-proof/Cargo.toml      |   2 +
 .../transaction-storage-proof/src/lib.rs      |   2 +-
 primitives/trie/Cargo.toml                    |   2 +
 primitives/trie/src/storage_proof.rs          |   5 +-
 primitives/version/Cargo.toml                 |   2 +
 primitives/version/src/lib.rs                 |   3 +-
 test-utils/runtime/Cargo.toml                 |   2 +
 test-utils/runtime/src/lib.rs                 |   5 +-
 utils/frame/rpc/support/Cargo.toml            |   1 +
 305 files changed, 3989 insertions(+), 3921 deletions(-)
 delete mode 100644 frame/metadata/Cargo.toml
 delete mode 100644 frame/metadata/README.md
 delete mode 100644 frame/metadata/src/lib.rs

diff --git a/Cargo.lock b/Cargo.lock
index ff21ec8dd010..7754e0ae6b62 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1790,9 +1790,9 @@ dependencies = [
 
 [[package]]
 name = "finality-grandpa"
-version = "0.14.1"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74a1bfdcc776e63e49f741c7ce6116fa1b887e8ac2e3ccb14dd4aa113e54feb9"
+checksum = "e8ac3ff5224ef91f3c97e03eb1de2db82743427e91aaa5ac635f454f0b164f5a"
 dependencies = [
  "either",
  "futures 0.3.16",
@@ -1802,6 +1802,7 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.11.1",
  "rand 0.8.4",
+ "scale-info",
 ]
 
 [[package]]
@@ -1884,6 +1885,7 @@ dependencies = [
  "log 0.4.14",
  "parity-scale-codec",
  "paste 1.0.4",
+ "scale-info",
  "sp-api",
  "sp-io",
  "sp-runtime",
@@ -1924,6 +1926,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "parity-scale-codec",
+ "scale-info",
  "sp-arithmetic",
  "sp-core",
  "sp-io",
@@ -1942,6 +1945,7 @@ dependencies = [
  "pallet-balances",
  "pallet-transaction-payment",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-inherents",
  "sp-io",
@@ -1953,18 +1957,21 @@ dependencies = [
 
 [[package]]
 name = "frame-metadata"
-version = "14.0.0-dev"
+version = "14.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96616f82e069102b95a72c87de4c84d2f87ef7f0f20630e78ce3824436483110"
 dependencies = [
+ "cfg-if 1.0.0",
  "parity-scale-codec",
+ "scale-info",
  "serde",
- "sp-core",
- "sp-std",
 ]
 
 [[package]]
 name = "frame-support"
 version = "4.0.0-dev"
 dependencies = [
+ "assert_matches",
  "bitflags",
  "frame-metadata",
  "frame-support-procedural",
@@ -1976,6 +1983,7 @@ dependencies = [
  "parity-util-mem",
  "paste 1.0.4",
  "pretty_assertions 0.6.1",
+ "scale-info",
  "serde",
  "smallvec 1.6.1",
  "sp-arithmetic",
@@ -2024,19 +2032,21 @@ dependencies = [
 name = "frame-support-test"
 version = "3.0.0"
 dependencies = [
- "frame-metadata",
  "frame-support",
  "frame-support-test-pallet",
  "frame-system",
  "parity-scale-codec",
  "pretty_assertions 0.6.1",
  "rustversion",
+ "scale-info",
  "serde",
+ "sp-arithmetic",
  "sp-core",
  "sp-io",
  "sp-runtime",
  "sp-state-machine",
  "sp-std",
+ "sp-version",
  "trybuild",
 ]
 
@@ -2047,6 +2057,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "parity-scale-codec",
+ "scale-info",
 ]
 
 [[package]]
@@ -2057,6 +2068,7 @@ dependencies = [
  "frame-support",
  "log 0.4.14",
  "parity-scale-codec",
+ "scale-info",
  "serde",
  "sp-core",
  "sp-externalities",
@@ -2075,6 +2087,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -4417,6 +4430,7 @@ dependencies = [
  "pallet-treasury",
  "parity-scale-codec",
  "sc-executor",
+ "scale-info",
  "sp-application-crypto",
  "sp-consensus-babe",
  "sp-core",
@@ -4450,6 +4464,7 @@ version = "2.0.0"
 dependencies = [
  "frame-system",
  "parity-scale-codec",
+ "scale-info",
  "sp-application-crypto",
  "sp-core",
  "sp-runtime",
@@ -4555,6 +4570,7 @@ dependencies = [
  "pallet-utility",
  "pallet-vesting",
  "parity-scale-codec",
+ "scale-info",
  "sp-api",
  "sp-authority-discovery",
  "sp-block-builder",
@@ -4633,6 +4649,7 @@ dependencies = [
  "pallet-transaction-payment",
  "pallet-transaction-payment-rpc-runtime-api",
  "parity-scale-codec",
+ "scale-info",
  "sp-api",
  "sp-block-builder",
  "sp-consensus-aura",
@@ -4899,6 +4916,7 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -4913,6 +4931,7 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -4927,6 +4946,7 @@ dependencies = [
  "frame-system",
  "pallet-timestamp",
  "parity-scale-codec",
+ "scale-info",
  "sp-application-crypto",
  "sp-consensus-aura",
  "sp-core",
@@ -4943,6 +4963,7 @@ dependencies = [
  "frame-system",
  "pallet-session",
  "parity-scale-codec",
+ "scale-info",
  "sp-application-crypto",
  "sp-authority-discovery",
  "sp-core",
@@ -4959,6 +4980,7 @@ dependencies = [
  "frame-system",
  "impl-trait-for-tuples",
  "parity-scale-codec",
+ "scale-info",
  "sp-authorship",
  "sp-core",
  "sp-io",
@@ -4983,6 +5005,7 @@ dependencies = [
  "pallet-staking-reward-curve",
  "pallet-timestamp",
  "parity-scale-codec",
+ "scale-info",
  "sp-application-crypto",
  "sp-consensus-babe",
  "sp-consensus-vrf",
@@ -5004,6 +5027,7 @@ dependencies = [
  "log 0.4.14",
  "pallet-transaction-payment",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5020,6 +5044,7 @@ dependencies = [
  "pallet-balances",
  "pallet-treasury",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5035,6 +5060,7 @@ dependencies = [
  "frame-system",
  "log 0.4.14",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5064,6 +5090,7 @@ dependencies = [
  "pwasm-utils",
  "rand 0.7.3",
  "rand_pcg 0.2.1",
+ "scale-info",
  "serde",
  "smallvec 1.6.1",
  "sp-core",
@@ -5081,6 +5108,7 @@ version = "4.0.0-dev"
 dependencies = [
  "bitflags",
  "parity-scale-codec",
+ "scale-info",
  "serde",
  "sp-core",
  "sp-runtime",
@@ -5121,6 +5149,7 @@ version = "4.0.0-dev"
 dependencies = [
  "pallet-contracts-primitives",
  "parity-scale-codec",
+ "scale-info",
  "sp-api",
  "sp-runtime",
  "sp-std",
@@ -5136,6 +5165,7 @@ dependencies = [
  "pallet-balances",
  "pallet-scheduler",
  "parity-scale-codec",
+ "scale-info",
  "serde",
  "sp-core",
  "sp-io",
@@ -5156,6 +5186,7 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.11.1",
  "rand 0.7.3",
+ "scale-info",
  "sp-arithmetic",
  "sp-core",
  "sp-io",
@@ -5176,6 +5207,7 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5192,6 +5224,7 @@ dependencies = [
  "log 0.4.14",
  "pallet-balances",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-io",
  "sp-npos-elections",
@@ -5210,6 +5243,7 @@ dependencies = [
  "log 0.4.14",
  "pallet-balances",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5225,6 +5259,7 @@ dependencies = [
  "lite-json",
  "log 0.4.14",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-io",
  "sp-keystore",
@@ -5239,6 +5274,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5255,6 +5291,7 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "parity-scale-codec",
+ "scale-info",
  "sp-arithmetic",
  "sp-core",
  "sp-io",
@@ -5280,6 +5317,7 @@ dependencies = [
  "pallet-staking-reward-curve",
  "pallet-timestamp",
  "parity-scale-codec",
+ "scale-info",
  "sp-application-crypto",
  "sp-core",
  "sp-finality-grandpa",
@@ -5301,6 +5339,7 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5318,6 +5357,7 @@ dependencies = [
  "pallet-authorship",
  "pallet-session",
  "parity-scale-codec",
+ "scale-info",
  "sp-application-crypto",
  "sp-core",
  "sp-io",
@@ -5335,6 +5375,7 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-io",
  "sp-keyring",
@@ -5352,6 +5393,7 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5367,6 +5409,7 @@ dependencies = [
  "frame-system",
  "log 0.4.14",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5385,6 +5428,7 @@ dependencies = [
  "hex-literal",
  "pallet-mmr-primitives",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5433,6 +5477,7 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5447,6 +5492,7 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5461,6 +5507,7 @@ dependencies = [
  "frame-system",
  "log 0.4.14",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5476,6 +5523,7 @@ dependencies = [
  "log 0.4.14",
  "pallet-balances",
  "parity-scale-codec",
+ "scale-info",
  "serde",
  "sp-core",
  "sp-io",
@@ -5502,6 +5550,7 @@ dependencies = [
  "pallet-staking-reward-curve",
  "pallet-timestamp",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5519,6 +5568,7 @@ dependencies = [
  "pallet-balances",
  "pallet-utility",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5533,6 +5583,7 @@ dependencies = [
  "frame-system",
  "parity-scale-codec",
  "safe-mix",
+ "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5547,6 +5598,7 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5562,6 +5614,7 @@ dependencies = [
  "frame-system",
  "log 0.4.14",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5577,6 +5630,7 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5593,6 +5647,7 @@ dependencies = [
  "log 0.4.14",
  "pallet-timestamp",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5617,6 +5672,7 @@ dependencies = [
  "pallet-timestamp",
  "parity-scale-codec",
  "rand 0.7.3",
+ "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5634,6 +5690,7 @@ dependencies = [
  "pallet-balances",
  "parity-scale-codec",
  "rand_chacha 0.2.2",
+ "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5656,6 +5713,7 @@ dependencies = [
  "pallet-timestamp",
  "parity-scale-codec",
  "rand_chacha 0.2.2",
+ "scale-info",
  "serde",
  "sp-application-crypto",
  "sp-core",
@@ -5693,6 +5751,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5707,6 +5766,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5721,6 +5781,7 @@ dependencies = [
  "frame-system",
  "log 0.4.14",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-inherents",
  "sp-io",
@@ -5740,6 +5801,7 @@ dependencies = [
  "pallet-balances",
  "pallet-treasury",
  "parity-scale-codec",
+ "scale-info",
  "serde",
  "sp-core",
  "sp-io",
@@ -5756,6 +5818,7 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "parity-scale-codec",
+ "scale-info",
  "serde",
  "serde_json",
  "smallvec 1.6.1",
@@ -5801,6 +5864,7 @@ dependencies = [
  "hex-literal",
  "pallet-balances",
  "parity-scale-codec",
+ "scale-info",
  "serde",
  "sp-core",
  "sp-inherents",
@@ -5820,6 +5884,7 @@ dependencies = [
  "impl-trait-for-tuples",
  "pallet-balances",
  "parity-scale-codec",
+ "scale-info",
  "serde",
  "sp-core",
  "sp-io",
@@ -5836,6 +5901,7 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5851,6 +5917,7 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5867,6 +5934,7 @@ dependencies = [
  "log 0.4.14",
  "pallet-balances",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -6393,6 +6461,7 @@ dependencies = [
  "fixed-hash",
  "impl-codec",
  "impl-serde",
+ "scale-info",
  "uint",
 ]
 
@@ -8324,6 +8393,32 @@ dependencies = [
  "prometheus",
 ]
 
+[[package]]
+name = "scale-info"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c55b744399c25532d63a0d2789b109df8d46fc93752d46b0782991a931a782f"
+dependencies = [
+ "bitvec 0.20.2",
+ "cfg-if 1.0.0",
+ "derive_more",
+ "parity-scale-codec",
+ "scale-info-derive",
+ "serde",
+]
+
+[[package]]
+name = "scale-info-derive"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baeb2780690380592f86205aa4ee49815feb2acad8c2f59e6dd207148c3f1fcd"
+dependencies = [
+ "proc-macro-crate 1.0.0",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "schannel"
 version = "0.1.19"
@@ -8779,6 +8874,7 @@ name = "sp-application-crypto"
 version = "4.0.0-dev"
 dependencies = [
  "parity-scale-codec",
+ "scale-info",
  "serde",
  "sp-core",
  "sp-io",
@@ -8807,6 +8903,7 @@ dependencies = [
  "parity-scale-codec",
  "primitive-types",
  "rand 0.7.3",
+ "scale-info",
  "serde",
  "sp-debug-derive",
  "sp-std",
@@ -8828,6 +8925,7 @@ name = "sp-authority-discovery"
 version = "4.0.0-dev"
 dependencies = [
  "parity-scale-codec",
+ "scale-info",
  "sp-api",
  "sp-application-crypto",
  "sp-runtime",
@@ -8898,6 +8996,7 @@ version = "0.10.0-dev"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
+ "scale-info",
  "sp-api",
  "sp-application-crypto",
  "sp-consensus",
@@ -8915,6 +9014,7 @@ dependencies = [
  "async-trait",
  "merlin",
  "parity-scale-codec",
+ "scale-info",
  "serde",
  "sp-api",
  "sp-application-crypto",
@@ -8945,6 +9045,7 @@ name = "sp-consensus-slots"
 version = "0.10.0-dev"
 dependencies = [
  "parity-scale-codec",
+ "scale-info",
  "sp-arithmetic",
  "sp-runtime",
 ]
@@ -8987,6 +9088,7 @@ dependencies = [
  "primitive-types",
  "rand 0.7.3",
  "regex",
+ "scale-info",
  "schnorrkel",
  "secrecy",
  "serde",
@@ -9041,6 +9143,7 @@ dependencies = [
  "finality-grandpa",
  "log 0.4.14",
  "parity-scale-codec",
+ "scale-info",
  "serde",
  "sp-api",
  "sp-application-crypto",
@@ -9129,6 +9232,7 @@ version = "4.0.0-dev"
 dependencies = [
  "parity-scale-codec",
  "rand 0.7.3",
+ "scale-info",
  "serde",
  "sp-arithmetic",
  "sp-core",
@@ -9145,6 +9249,7 @@ dependencies = [
  "honggfuzz",
  "parity-scale-codec",
  "rand 0.7.3",
+ "scale-info",
  "sp-npos-elections",
  "sp-runtime",
  "structopt",
@@ -9158,6 +9263,7 @@ dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
  "quote",
+ "scale-info",
  "sp-arithmetic",
  "sp-npos-elections",
  "syn",
@@ -9202,6 +9308,7 @@ dependencies = [
  "parity-util-mem",
  "paste 1.0.4",
  "rand 0.7.3",
+ "scale-info",
  "serde",
  "serde_json",
  "sp-api",
@@ -9314,6 +9421,7 @@ name = "sp-session"
 version = "4.0.0-dev"
 dependencies = [
  "parity-scale-codec",
+ "scale-info",
  "sp-api",
  "sp-core",
  "sp-runtime",
@@ -9326,6 +9434,7 @@ name = "sp-staking"
 version = "4.0.0-dev"
 dependencies = [
  "parity-scale-codec",
+ "scale-info",
  "sp-runtime",
  "sp-std",
 ]
@@ -9443,6 +9552,7 @@ dependencies = [
  "async-trait",
  "log 0.4.14",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-inherents",
  "sp-runtime",
@@ -9459,6 +9569,7 @@ dependencies = [
  "hex-literal",
  "memory-db",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-runtime",
  "sp-std",
@@ -9475,6 +9586,7 @@ dependencies = [
  "impl-serde",
  "parity-scale-codec",
  "parity-wasm 0.42.2",
+ "scale-info",
  "serde",
  "sp-runtime",
  "sp-std",
@@ -9659,6 +9771,7 @@ dependencies = [
  "jsonrpc-client-transports",
  "parity-scale-codec",
  "sc-rpc-api",
+ "scale-info",
  "serde",
  "sp-storage",
  "tokio",
@@ -9745,6 +9858,7 @@ dependencies = [
  "sc-block-builder",
  "sc-executor",
  "sc-service",
+ "scale-info",
  "serde",
  "sp-api",
  "sp-application-crypto",
diff --git a/Cargo.toml b/Cargo.toml
index 64cbbf38966c..bca0c816217e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -94,7 +94,6 @@ members = [
 	"frame/merkle-mountain-range",
 	"frame/merkle-mountain-range/primitives",
 	"frame/merkle-mountain-range/rpc",
-	"frame/metadata",
 	"frame/multisig",
 	"frame/nicks",
 	"frame/node-authorization",
@@ -261,7 +260,6 @@ wasmi = { opt-level = 3 }
 x25519-dalek = { opt-level = 3 }
 yamux = { opt-level = 3 }
 zeroize = { opt-level = 3 }
-
 [profile.release]
 # Substrate runtime requires unwinding.
-panic = "unwind"
+panic = "unwind"
\ No newline at end of file
diff --git a/bin/node-template/pallets/template/Cargo.toml b/bin/node-template/pallets/template/Cargo.toml
index bd4a91f0146a..b3eb747625b4 100644
--- a/bin/node-template/pallets/template/Cargo.toml
+++ b/bin/node-template/pallets/template/Cargo.toml
@@ -17,6 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
 	"derive",
 ] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 frame-support = { default-features = false, version = "4.0.0-dev", path = "../../../../frame/support" }
 frame-system = { default-features = false, version = "4.0.0-dev", path = "../../../../frame/system" }
 frame-benchmarking = { default-features = false, version = "4.0.0-dev", path = "../../../../frame/benchmarking", optional = true }
@@ -30,6 +31,7 @@ sp-runtime = { default-features = false, version = "4.0.0-dev", path = "../../..
 default = ['std']
 std = [
 	'codec/std',
+	'scale-info/std',
 	'frame-support/std',
 	'frame-system/std',
 	'frame-benchmarking/std',
diff --git a/bin/node-template/pallets/template/src/lib.rs b/bin/node-template/pallets/template/src/lib.rs
index 7a9830a21eb2..ee3ca695b64d 100644
--- a/bin/node-template/pallets/template/src/lib.rs
+++ b/bin/node-template/pallets/template/src/lib.rs
@@ -41,7 +41,6 @@ pub mod pallet {
 	// Pallets use events to inform users when important changes are made.
 	// https://substrate.dev/docs/en/knowledgebase/runtime/events
 	#[pallet::event]
-	#[pallet::metadata(T::AccountId = "AccountId")]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
 	pub enum Event<T: Config> {
 		/// Event documentation should end with an array that provides descriptive names for event
diff --git a/bin/node-template/runtime/Cargo.toml b/bin/node-template/runtime/Cargo.toml
index 72e19cc62b0b..47e67af2b9ae 100644
--- a/bin/node-template/runtime/Cargo.toml
+++ b/bin/node-template/runtime/Cargo.toml
@@ -13,6 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 
 pallet-aura = { version = "4.0.0-dev", default-features = false, path = "../../../frame/aura" }
 pallet-balances = { version = "4.0.0-dev", default-features = false, path = "../../../frame/balances" }
@@ -54,6 +55,7 @@ substrate-wasm-builder = { version = "5.0.0-dev", path = "../../../utils/wasm-bu
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"frame-executive/std",
 	"frame-support/std",
 	"frame-system-rpc-runtime-api/std",
diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index eae40e1ab356..eecc93e16666 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -340,7 +340,7 @@ impl_runtime_apis! {
 
 	impl sp_api::Metadata<Block> for Runtime {
 		fn metadata() -> OpaqueMetadata {
-			Runtime::metadata().into()
+			OpaqueMetadata::new(Runtime::metadata().into())
 		}
 	}
 
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index 9f48ab7e3ef3..acc7df5b1e5a 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -810,7 +810,8 @@ mod tests {
 				};
 				let signer = charlie.clone();
 
-				let function = Call::Balances(BalancesCall::transfer(to.into(), amount));
+				let function =
+					Call::Balances(BalancesCall::transfer { dest: to.into(), value: amount });
 
 				let check_spec_version = frame_system::CheckSpecVersion::new();
 				let check_tx_version = frame_system::CheckTxVersion::new();
diff --git a/bin/node/executor/Cargo.toml b/bin/node/executor/Cargo.toml
index 0db8a9e411bf..f283a913915f 100644
--- a/bin/node/executor/Cargo.toml
+++ b/bin/node/executor/Cargo.toml
@@ -13,6 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0" }
+scale-info = { version = "1.0", features = ["derive"] }
 node-primitives = { version = "2.0.0", path = "../primitives" }
 node-runtime = { version = "3.0.0-dev", path = "../runtime" }
 sc-executor = { version = "0.10.0-dev", path = "../../../client/executor" }
diff --git a/bin/node/executor/benches/bench.rs b/bin/node/executor/benches/bench.rs
index 0058a5c70340..1a39c9decb32 100644
--- a/bin/node/executor/benches/bench.rs
+++ b/bin/node/executor/benches/bench.rs
@@ -162,11 +162,14 @@ fn test_blocks(
 	let mut test_ext = new_test_ext(genesis_config);
 	let mut block1_extrinsics = vec![CheckedExtrinsic {
 		signed: None,
-		function: Call::Timestamp(pallet_timestamp::Call::set(0)),
+		function: Call::Timestamp(pallet_timestamp::Call::set { now: 0 }),
 	}];
 	block1_extrinsics.extend((0..20).map(|i| CheckedExtrinsic {
 		signed: Some((alice(), signed_extra(i, 0))),
-		function: Call::Balances(pallet_balances::Call::transfer(bob().into(), 1 * DOLLARS)),
+		function: Call::Balances(pallet_balances::Call::transfer {
+			dest: bob().into(),
+			value: 1 * DOLLARS,
+		}),
 	}));
 	let block1 =
 		construct_block(executor, &mut test_ext.ext(), 1, GENESIS_HASH.into(), block1_extrinsics);
diff --git a/bin/node/executor/tests/basic.rs b/bin/node/executor/tests/basic.rs
index e9e21e541e75..c1ab5e5a0fe1 100644
--- a/bin/node/executor/tests/basic.rs
+++ b/bin/node/executor/tests/basic.rs
@@ -84,14 +84,14 @@ fn changes_trie_block() -> (Vec<u8>, Hash) {
 		vec![
 			CheckedExtrinsic {
 				signed: None,
-				function: Call::Timestamp(pallet_timestamp::Call::set(time)),
+				function: Call::Timestamp(pallet_timestamp::Call::set { now: time }),
 			},
 			CheckedExtrinsic {
 				signed: Some((alice(), signed_extra(0, 0))),
-				function: Call::Balances(pallet_balances::Call::transfer(
-					bob().into(),
-					69 * DOLLARS,
-				)),
+				function: Call::Balances(pallet_balances::Call::transfer {
+					dest: bob().into(),
+					value: 69 * DOLLARS,
+				}),
 			},
 		],
 		(time / SLOT_DURATION).into(),
@@ -111,14 +111,14 @@ fn blocks() -> ((Vec<u8>, Hash), (Vec<u8>, Hash)) {
 		vec![
 			CheckedExtrinsic {
 				signed: None,
-				function: Call::Timestamp(pallet_timestamp::Call::set(time1)),
+				function: Call::Timestamp(pallet_timestamp::Call::set { now: time1 }),
 			},
 			CheckedExtrinsic {
 				signed: Some((alice(), signed_extra(0, 0))),
-				function: Call::Balances(pallet_balances::Call::transfer(
-					bob().into(),
-					69 * DOLLARS,
-				)),
+				function: Call::Balances(pallet_balances::Call::transfer {
+					dest: bob().into(),
+					value: 69 * DOLLARS,
+				}),
 			},
 		],
 		(time1 / SLOT_DURATION).into(),
@@ -131,21 +131,21 @@ fn blocks() -> ((Vec<u8>, Hash), (Vec<u8>, Hash)) {
 		vec![
 			CheckedExtrinsic {
 				signed: None,
-				function: Call::Timestamp(pallet_timestamp::Call::set(time2)),
+				function: Call::Timestamp(pallet_timestamp::Call::set { now: time2 }),
 			},
 			CheckedExtrinsic {
 				signed: Some((bob(), signed_extra(0, 0))),
-				function: Call::Balances(pallet_balances::Call::transfer(
-					alice().into(),
-					5 * DOLLARS,
-				)),
+				function: Call::Balances(pallet_balances::Call::transfer {
+					dest: alice().into(),
+					value: 5 * DOLLARS,
+				}),
 			},
 			CheckedExtrinsic {
 				signed: Some((alice(), signed_extra(1, 0))),
-				function: Call::Balances(pallet_balances::Call::transfer(
-					bob().into(),
-					15 * DOLLARS,
-				)),
+				function: Call::Balances(pallet_balances::Call::transfer {
+					dest: bob().into(),
+					value: 15 * DOLLARS,
+				}),
 			},
 		],
 		(time2 / SLOT_DURATION).into(),
@@ -166,11 +166,11 @@ fn block_with_size(time: u64, nonce: u32, size: usize) -> (Vec<u8>, Hash) {
 		vec![
 			CheckedExtrinsic {
 				signed: None,
-				function: Call::Timestamp(pallet_timestamp::Call::set(time * 1000)),
+				function: Call::Timestamp(pallet_timestamp::Call::set { now: time * 1000 }),
 			},
 			CheckedExtrinsic {
 				signed: Some((alice(), signed_extra(nonce, 0))),
-				function: Call::System(frame_system::Call::remark(vec![0; size])),
+				function: Call::System(frame_system::Call::remark { remark: vec![0; size] }),
 			},
 		],
 		(time * 1000 / SLOT_DURATION).into(),
@@ -357,7 +357,7 @@ fn full_native_block_import_works() {
 	let mut fees = t.execute_with(|| transfer_fee(&xt()));
 
 	let transfer_weight = default_transfer_call().get_dispatch_info().weight;
-	let timestamp_weight = pallet_timestamp::Call::set::<Runtime>(Default::default())
+	let timestamp_weight = pallet_timestamp::Call::set::<Runtime> { now: Default::default() }
 		.get_dispatch_info()
 		.weight;
 
@@ -646,28 +646,28 @@ fn deploying_wasm_contract_should_work() {
 		vec![
 			CheckedExtrinsic {
 				signed: None,
-				function: Call::Timestamp(pallet_timestamp::Call::set(time)),
+				function: Call::Timestamp(pallet_timestamp::Call::set { now: time }),
 			},
 			CheckedExtrinsic {
 				signed: Some((charlie(), signed_extra(0, 0))),
 				function: Call::Contracts(
-					pallet_contracts::Call::instantiate_with_code::<Runtime>(
-						1000 * DOLLARS + subsistence,
-						500_000_000,
-						transfer_code,
-						Vec::new(),
-						Vec::new(),
-					),
+					pallet_contracts::Call::instantiate_with_code::<Runtime> {
+						endowment: 1000 * DOLLARS + subsistence,
+						gas_limit: 500_000_000,
+						code: transfer_code,
+						data: Vec::new(),
+						salt: Vec::new(),
+					},
 				),
 			},
 			CheckedExtrinsic {
 				signed: Some((charlie(), signed_extra(1, 0))),
-				function: Call::Contracts(pallet_contracts::Call::call::<Runtime>(
-					sp_runtime::MultiAddress::Id(addr.clone()),
-					10,
-					500_000_000,
-					vec![0x00, 0x01, 0x02, 0x03],
-				)),
+				function: Call::Contracts(pallet_contracts::Call::call::<Runtime> {
+					dest: sp_runtime::MultiAddress::Id(addr.clone()),
+					value: 10,
+					gas_limit: 500_000_000,
+					data: vec![0x00, 0x01, 0x02, 0x03],
+				}),
 			},
 		],
 		(time / SLOT_DURATION).into(),
diff --git a/bin/node/executor/tests/common.rs b/bin/node/executor/tests/common.rs
index a0edb46a0d6a..d1c24c83c836 100644
--- a/bin/node/executor/tests/common.rs
+++ b/bin/node/executor/tests/common.rs
@@ -88,7 +88,7 @@ pub fn sign(xt: CheckedExtrinsic) -> UncheckedExtrinsic {
 }
 
 pub fn default_transfer_call() -> pallet_balances::Call<Runtime> {
-	pallet_balances::Call::transfer::<Runtime>(bob().into(), 69 * DOLLARS)
+	pallet_balances::Call::<Runtime>::transfer { dest: bob().into(), value: 69 * DOLLARS }
 }
 
 pub fn from_block_number(n: u32) -> Header {
diff --git a/bin/node/executor/tests/fees.rs b/bin/node/executor/tests/fees.rs
index 3bc9179da2b3..379cdda5b76a 100644
--- a/bin/node/executor/tests/fees.rs
+++ b/bin/node/executor/tests/fees.rs
@@ -56,11 +56,13 @@ fn fee_multiplier_increases_and_decreases_on_big_weight() {
 		vec![
 			CheckedExtrinsic {
 				signed: None,
-				function: Call::Timestamp(pallet_timestamp::Call::set(time1)),
+				function: Call::Timestamp(pallet_timestamp::Call::set { now: time1 }),
 			},
 			CheckedExtrinsic {
 				signed: Some((charlie(), signed_extra(0, 0))),
-				function: Call::System(frame_system::Call::fill_block(Perbill::from_percent(60))),
+				function: Call::System(frame_system::Call::fill_block {
+					ratio: Perbill::from_percent(60),
+				}),
 			},
 		],
 		(time1 / SLOT_DURATION).into(),
@@ -75,11 +77,11 @@ fn fee_multiplier_increases_and_decreases_on_big_weight() {
 		vec![
 			CheckedExtrinsic {
 				signed: None,
-				function: Call::Timestamp(pallet_timestamp::Call::set(time2)),
+				function: Call::Timestamp(pallet_timestamp::Call::set { now: time2 }),
 			},
 			CheckedExtrinsic {
 				signed: Some((charlie(), signed_extra(1, 0))),
-				function: Call::System(frame_system::Call::remark(vec![0; 1])),
+				function: Call::System(frame_system::Call::remark { remark: vec![0; 1] }),
 			},
 		],
 		(time2 / SLOT_DURATION).into(),
@@ -321,11 +323,9 @@ fn block_length_capacity_report() {
 				},
 				CheckedExtrinsic {
 					signed: Some((charlie(), signed_extra(nonce, 0))),
-					function: Call::System(frame_system::Call::remark(vec![
-						0u8;
-						(block_number * factor)
-							as usize
-					])),
+					function: Call::System(frame_system::Call::remark {
+						remark: vec![0u8; (block_number * factor) as usize],
+					}),
 				},
 			],
 			(time * 1000 / SLOT_DURATION).into(),
diff --git a/bin/node/executor/tests/submit_transaction.rs b/bin/node/executor/tests/submit_transaction.rs
index c83e48c8c933..19ca8e5677c4 100644
--- a/bin/node/executor/tests/submit_transaction.rs
+++ b/bin/node/executor/tests/submit_transaction.rs
@@ -42,7 +42,7 @@ fn should_submit_unsigned_transaction() {
 			validators_len: 0,
 		};
 
-		let call = pallet_im_online::Call::heartbeat(heartbeat_data, signature);
+		let call = pallet_im_online::Call::heartbeat { heartbeat: heartbeat_data, signature };
 		SubmitTransaction::<Runtime, pallet_im_online::Call<Runtime>>::submit_unsigned_transaction(
 			call.into(),
 		)
@@ -84,7 +84,10 @@ fn should_submit_signed_transaction() {
 	t.execute_with(|| {
 		let results =
 			Signer::<Runtime, TestAuthorityId>::all_accounts().send_signed_transaction(|_| {
-				pallet_balances::Call::transfer(Default::default(), Default::default())
+				pallet_balances::Call::transfer {
+					dest: Default::default(),
+					value: Default::default(),
+				}
 			});
 
 		let len = results.len();
@@ -118,7 +121,10 @@ fn should_submit_signed_twice_from_the_same_account() {
 	t.execute_with(|| {
 		let result =
 			Signer::<Runtime, TestAuthorityId>::any_account().send_signed_transaction(|_| {
-				pallet_balances::Call::transfer(Default::default(), Default::default())
+				pallet_balances::Call::transfer {
+					dest: Default::default(),
+					value: Default::default(),
+				}
 			});
 
 		assert!(result.is_some());
@@ -127,7 +133,10 @@ fn should_submit_signed_twice_from_the_same_account() {
 		// submit another one from the same account. The nonce should be incremented.
 		let result =
 			Signer::<Runtime, TestAuthorityId>::any_account().send_signed_transaction(|_| {
-				pallet_balances::Call::transfer(Default::default(), Default::default())
+				pallet_balances::Call::transfer {
+					dest: Default::default(),
+					value: Default::default(),
+				}
 			});
 
 		assert!(result.is_some());
@@ -163,7 +172,7 @@ fn should_submit_signed_twice_from_all_accounts() {
 	t.execute_with(|| {
 		let results = Signer::<Runtime, TestAuthorityId>::all_accounts()
 			.send_signed_transaction(|_| {
-				pallet_balances::Call::transfer(Default::default(), Default::default())
+				pallet_balances::Call::transfer { dest: Default::default(), value: Default::default() }
 			});
 
 		let len = results.len();
@@ -174,7 +183,7 @@ fn should_submit_signed_twice_from_all_accounts() {
 		// submit another one from the same account. The nonce should be incremented.
 		let results = Signer::<Runtime, TestAuthorityId>::all_accounts()
 			.send_signed_transaction(|_| {
-				pallet_balances::Call::transfer(Default::default(), Default::default())
+				pallet_balances::Call::transfer { dest: Default::default(), value: Default::default() }
 			});
 
 		let len = results.len();
@@ -227,7 +236,10 @@ fn submitted_transaction_should_be_valid() {
 	t.execute_with(|| {
 		let results =
 			Signer::<Runtime, TestAuthorityId>::all_accounts().send_signed_transaction(|_| {
-				pallet_balances::Call::transfer(Default::default(), Default::default())
+				pallet_balances::Call::transfer {
+					dest: Default::default(),
+					value: Default::default(),
+				}
 			});
 		let len = results.len();
 		assert_eq!(len, 1);
diff --git a/bin/node/primitives/Cargo.toml b/bin/node/primitives/Cargo.toml
index de6000b60206..12ec57e4d55b 100644
--- a/bin/node/primitives/Cargo.toml
+++ b/bin/node/primitives/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
 	"derive",
 ] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../../../frame/system" }
 sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/application-crypto" }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/core" }
@@ -23,6 +24,7 @@ sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../..
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"frame-system/std",
 	"sp-application-crypto/std",
 	"sp-core/std",
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index 2b9accffc8c3..dafd9db8bab9 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -18,6 +18,7 @@ codec = { package = "parity-scale-codec", version = "2.2.0", default-features =
 	"derive",
 	"max-encoded-len",
 ] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 static_assertions = "1.1.0"
 hex-literal = { version = "0.3.1", optional = true }
 log = { version = "0.4.14", default-features = false }
@@ -113,6 +114,7 @@ std = [
 	"pallet-bounties/std",
 	"sp-block-builder/std",
 	"codec/std",
+	"scale-info/std",
 	"pallet-collective/std",
 	"pallet-contracts/std",
 	"pallet-contracts-primitives/std",
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index d7257a9ea71b..7c6475bd18d6 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -255,7 +255,17 @@ parameter_types! {
 
 /// The type used to represent the kinds of proxying allowed.
 #[derive(
-	Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, RuntimeDebug, MaxEncodedLen,
+	Copy,
+	Clone,
+	Eq,
+	PartialEq,
+	Ord,
+	PartialOrd,
+	Encode,
+	Decode,
+	RuntimeDebug,
+	MaxEncodedLen,
+	scale_info::TypeInfo,
 )]
 pub enum ProxyType {
 	Any,
@@ -276,8 +286,8 @@ impl InstanceFilter<Call> for ProxyType {
 				c,
 				Call::Balances(..) |
 					Call::Assets(..) | Call::Uniques(..) |
-					Call::Vesting(pallet_vesting::Call::vested_transfer(..)) |
-					Call::Indices(pallet_indices::Call::transfer(..))
+					Call::Vesting(pallet_vesting::Call::vested_transfer { .. }) |
+					Call::Indices(pallet_indices::Call::transfer { .. })
 			),
 			ProxyType::Governance => matches!(
 				c,
@@ -1314,7 +1324,7 @@ impl_runtime_apis! {
 
 	impl sp_api::Metadata<Block> for Runtime {
 		fn metadata() -> OpaqueMetadata {
-			Runtime::metadata().into()
+			OpaqueMetadata::new(Runtime::metadata().into())
 		}
 	}
 
diff --git a/bin/node/test-runner-example/src/lib.rs b/bin/node/test-runner-example/src/lib.rs
index e7fe1ee00242..0de7f5a4e2b7 100644
--- a/bin/node/test-runner-example/src/lib.rs
+++ b/bin/node/test-runner-example/src/lib.rs
@@ -115,7 +115,7 @@ mod tests {
 			let alice = MultiSigner::from(Alice.public()).into_account();
 			let _hash = node
 				.submit_extrinsic(
-					frame_system::Call::remark((b"hello world").to_vec()),
+					frame_system::Call::remark { remark: (b"hello world").to_vec() },
 					Some(alice),
 				)
 				.await
diff --git a/bin/node/testing/src/bench.rs b/bin/node/testing/src/bench.rs
index a1f9bc871056..cf0a463cc3e9 100644
--- a/bin/node/testing/src/bench.rs
+++ b/bin/node/testing/src/bench.rs
@@ -299,19 +299,19 @@ impl<'a> Iterator for BlockContentIterator<'a> {
 				)),
 				function: match self.content.block_type {
 					BlockType::RandomTransfersKeepAlive =>
-						Call::Balances(BalancesCall::transfer_keep_alive(
-							sp_runtime::MultiAddress::Id(receiver),
-							node_runtime::ExistentialDeposit::get() + 1,
-						)),
+						Call::Balances(BalancesCall::transfer_keep_alive {
+							dest: sp_runtime::MultiAddress::Id(receiver),
+							value: node_runtime::ExistentialDeposit::get() + 1,
+						}),
 					BlockType::RandomTransfersReaping => {
-						Call::Balances(BalancesCall::transfer(
-							sp_runtime::MultiAddress::Id(receiver),
+						Call::Balances(BalancesCall::transfer {
+							dest: sp_runtime::MultiAddress::Id(receiver),
 							// Transfer so that ending balance would be 1 less than existential
 							// deposit so that we kill the sender account.
-							100 * DOLLARS - (node_runtime::ExistentialDeposit::get() - 1),
-						))
+							value: 100 * DOLLARS - (node_runtime::ExistentialDeposit::get() - 1),
+						})
 					},
-					BlockType::Noop => Call::System(SystemCall::remark(Vec::new())),
+					BlockType::Noop => Call::System(SystemCall::remark { remark: Vec::new() }),
 				},
 			},
 			self.runtime_version.spec_version,
diff --git a/client/finality-grandpa-warp-sync/Cargo.toml b/client/finality-grandpa-warp-sync/Cargo.toml
index 6bb00b936574..a444125fdfa1 100644
--- a/client/finality-grandpa-warp-sync/Cargo.toml
+++ b/client/finality-grandpa-warp-sync/Cargo.toml
@@ -26,7 +26,7 @@ sp-finality-grandpa = { version = "4.0.0-dev", path = "../../primitives/finality
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
 
 [dev-dependencies]
-finality-grandpa = { version = "0.14.1" }
+finality-grandpa = { version = "0.14.4" }
 rand = "0.8"
 sc-block-builder = { version = "0.10.0-dev", path = "../block-builder" }
 sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml
index ffdfc80c4eb9..7fdd91e557ab 100644
--- a/client/finality-grandpa/Cargo.toml
+++ b/client/finality-grandpa/Cargo.toml
@@ -43,7 +43,7 @@ sc-network-gossip = { version = "0.10.0-dev", path = "../network-gossip" }
 sp-finality-grandpa = { version = "4.0.0-dev", path = "../../primitives/finality-grandpa" }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0" }
 sc-block-builder = { version = "0.10.0-dev", path = "../block-builder" }
-finality-grandpa = { version = "0.14.1", features = ["derive-codec"] }
+finality-grandpa = { version = "0.14.4", features = ["derive-codec"] }
 async-trait = "0.1.50"
 
 [dev-dependencies]
diff --git a/client/finality-grandpa/rpc/Cargo.toml b/client/finality-grandpa/rpc/Cargo.toml
index 4f989ad4964c..d2976ee71275 100644
--- a/client/finality-grandpa/rpc/Cargo.toml
+++ b/client/finality-grandpa/rpc/Cargo.toml
@@ -14,7 +14,7 @@ sc-rpc = { version = "4.0.0-dev", path = "../../rpc" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
 sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
 sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
-finality-grandpa = { version = "0.14.1", features = ["derive-codec"] }
+finality-grandpa = { version = "0.14.4", features = ["derive-codec"] }
 jsonrpc-core = "18.0.0"
 jsonrpc-core-client = "18.0.0"
 jsonrpc-derive = "18.0.0"
diff --git a/frame/assets/Cargo.toml b/frame/assets/Cargo.toml
index 504dd6957aeb..05e7912dd07c 100644
--- a/frame/assets/Cargo.toml
+++ b/frame/assets/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 # Needed for various traits. In our case, `OnFinalize`.
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
@@ -33,6 +34,7 @@ pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"sp-std/std",
 	"sp-runtime/std",
 	"frame-support/std",
diff --git a/frame/assets/src/benchmarking.rs b/frame/assets/src/benchmarking.rs
index 89a1308db171..43eadffbe849 100644
--- a/frame/assets/src/benchmarking.rs
+++ b/frame/assets/src/benchmarking.rs
@@ -330,13 +330,13 @@ benchmarks_instance_pallet! {
 		create_default_asset::<T, I>(true);
 
 		let origin = T::ForceOrigin::successful_origin();
-		let call = Call::<T, I>::force_set_metadata(
-			Default::default(),
-			name.clone(),
-			symbol.clone(),
+		let call = Call::<T, I>::force_set_metadata {
+			id: Default::default(),
+			name: name.clone(),
+			symbol: symbol.clone(),
 			decimals,
-			false,
-		);
+			is_frozen: false,
+		};
 	}: { call.dispatch_bypass_filter(origin)? }
 	verify {
 		let id = Default::default();
@@ -351,7 +351,7 @@ benchmarks_instance_pallet! {
 		Assets::<T, I>::set_metadata(origin, Default::default(), dummy.clone(), dummy, 12)?;
 
 		let origin = T::ForceOrigin::successful_origin();
-		let call = Call::<T, I>::force_clear_metadata(Default::default());
+		let call = Call::<T, I>::force_clear_metadata { id: Default::default() };
 	}: { call.dispatch_bypass_filter(origin)? }
 	verify {
 		assert_last_event::<T, I>(Event::MetadataCleared(Default::default()).into());
@@ -361,16 +361,16 @@ benchmarks_instance_pallet! {
 		let (caller, caller_lookup) = create_default_asset::<T, I>(true);
 
 		let origin = T::ForceOrigin::successful_origin();
-		let call = Call::<T, I>::force_asset_status(
-			Default::default(),
-			caller_lookup.clone(),
-			caller_lookup.clone(),
-			caller_lookup.clone(),
-			caller_lookup.clone(),
-			100u32.into(),
-			true,
-			false,
-		);
+		let call = Call::<T, I>::force_asset_status {
+			id: Default::default(),
+			owner: caller_lookup.clone(),
+			issuer: caller_lookup.clone(),
+			admin: caller_lookup.clone(),
+			freezer: caller_lookup.clone(),
+			min_balance: 100u32.into(),
+			is_sufficient: true,
+			is_frozen: false,
+		};
 	}: { call.dispatch_bypass_filter(origin)? }
 	verify {
 		assert_last_event::<T, I>(Event::AssetStatusChanged(Default::default()).into());
diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index 386a3ea05c08..797a3ae7ee9f 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -277,7 +277,6 @@ pub mod pallet {
 
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
-	#[pallet::metadata(T::AccountId = "AccountId", T::Balance = "Balance", T::AssetId = "AssetId")]
 	pub enum Event<T: Config<I>, I: 'static = ()> {
 		/// Some asset class was created. \[asset_id, creator, owner\]
 		Created(T::AssetId, T::AccountId, T::AccountId),
diff --git a/frame/assets/src/types.rs b/frame/assets/src/types.rs
index 5e867550b380..bc2edce848a6 100644
--- a/frame/assets/src/types.rs
+++ b/frame/assets/src/types.rs
@@ -19,6 +19,7 @@
 
 use super::*;
 use frame_support::pallet_prelude::*;
+use scale_info::TypeInfo;
 
 use frame_support::traits::{fungible, tokens::BalanceConversion};
 use sp_runtime::{traits::Convert, FixedPointNumber, FixedPointOperand, FixedU128};
@@ -26,7 +27,7 @@ use sp_runtime::{traits::Convert, FixedPointNumber, FixedPointOperand, FixedU128
 pub(super) type DepositBalanceOf<T, I = ()> =
 	<<T as Config<I>>::Currency as Currency<<T as SystemConfig>::AccountId>>::Balance;
 
-#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, MaxEncodedLen)]
+#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, MaxEncodedLen, TypeInfo)]
 pub struct AssetDetails<Balance, AccountId, DepositBalance> {
 	/// Can change `owner`, `issuer`, `freezer` and `admin` accounts.
 	pub(super) owner: AccountId,
@@ -66,7 +67,7 @@ impl<Balance, AccountId, DepositBalance> AssetDetails<Balance, AccountId, Deposi
 }
 
 /// Data concerning an approval.
-#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default, MaxEncodedLen)]
+#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default, MaxEncodedLen, TypeInfo)]
 pub struct Approval<Balance, DepositBalance> {
 	/// The amount of funds approved for the balance transfer from the owner to some delegated
 	/// target.
@@ -75,7 +76,7 @@ pub struct Approval<Balance, DepositBalance> {
 	pub(super) deposit: DepositBalance,
 }
 
-#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default, MaxEncodedLen)]
+#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default, MaxEncodedLen, TypeInfo)]
 pub struct AssetBalance<Balance, Extra> {
 	/// The balance.
 	pub(super) balance: Balance,
@@ -87,7 +88,7 @@ pub struct AssetBalance<Balance, Extra> {
 	pub(super) extra: Extra,
 }
 
-#[derive(Clone, Encode, Decode, Eq, PartialEq, Default, RuntimeDebug, MaxEncodedLen)]
+#[derive(Clone, Encode, Decode, Eq, PartialEq, Default, RuntimeDebug, MaxEncodedLen, TypeInfo)]
 pub struct AssetMetadata<DepositBalance, BoundedString> {
 	/// The balance deposited for this metadata.
 	///
@@ -104,7 +105,7 @@ pub struct AssetMetadata<DepositBalance, BoundedString> {
 }
 
 /// Witness data for the destroy transactions.
-#[derive(Copy, Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, MaxEncodedLen)]
+#[derive(Copy, Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, MaxEncodedLen, TypeInfo)]
 pub struct DestroyWitness {
 	/// The number of accounts holding the asset.
 	#[codec(compact)]
diff --git a/frame/atomic-swap/Cargo.toml b/frame/atomic-swap/Cargo.toml
index 2519772ed46d..53a8c3a81165 100644
--- a/frame/atomic-swap/Cargo.toml
+++ b/frame/atomic-swap/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
@@ -28,6 +29,7 @@ pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"frame-support/std",
 	"frame-system/std",
 	"sp-runtime/std",
diff --git a/frame/atomic-swap/src/lib.rs b/frame/atomic-swap/src/lib.rs
index b068dc7ba1a9..9cf92c3bd233 100644
--- a/frame/atomic-swap/src/lib.rs
+++ b/frame/atomic-swap/src/lib.rs
@@ -49,6 +49,7 @@ use frame_support::{
 	weights::Weight,
 	RuntimeDebugNoBound,
 };
+use scale_info::TypeInfo;
 use sp_io::hashing::blake2_256;
 use sp_runtime::RuntimeDebug;
 use sp_std::{
@@ -58,7 +59,8 @@ use sp_std::{
 };
 
 /// Pending atomic swap operation.
-#[derive(Clone, Eq, PartialEq, RuntimeDebugNoBound, Encode, Decode)]
+#[derive(Clone, Eq, PartialEq, RuntimeDebugNoBound, Encode, Decode, TypeInfo)]
+#[scale_info(skip_type_params(T))]
 pub struct PendingSwap<T: Config> {
 	/// Source of the swap.
 	pub source: T::AccountId,
@@ -91,7 +93,8 @@ pub trait SwapAction<AccountId, T: Config> {
 }
 
 /// A swap action that only allows transferring balances.
-#[derive(Clone, RuntimeDebug, Eq, PartialEq, Encode, Decode)]
+#[derive(Clone, RuntimeDebug, Eq, PartialEq, Encode, Decode, TypeInfo)]
+#[scale_info(skip_type_params(C))]
 pub struct BalanceSwapAction<AccountId, C: ReservableCurrency<AccountId>> {
 	value: <C as Currency<AccountId>>::Balance,
 	_marker: PhantomData<C>,
@@ -213,7 +216,6 @@ pub mod pallet {
 
 	/// Event of atomic swap pallet.
 	#[pallet::event]
-	#[pallet::metadata(T::AccountId = "AccountId", PendingSwap<T> = "PendingSwap")]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
 	pub enum Event<T: Config> {
 		/// Swap created. \[account, proof, swap\]
diff --git a/frame/aura/Cargo.toml b/frame/aura/Cargo.toml
index ee7b15f91e35..8f5c42bc3c46 100644
--- a/frame/aura/Cargo.toml
+++ b/frame/aura/Cargo.toml
@@ -15,6 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../../primitives/application-crypto" }
 codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
@@ -31,6 +32,7 @@ default = ["std"]
 std = [
 	"sp-application-crypto/std",
 	"codec/std",
+	"scale-info/std",
 	"sp-std/std",
 	"sp-runtime/std",
 	"frame-support/std",
diff --git a/frame/authority-discovery/Cargo.toml b/frame/authority-discovery/Cargo.toml
index f5f695b0a064..80a320c31e77 100644
--- a/frame/authority-discovery/Cargo.toml
+++ b/frame/authority-discovery/Cargo.toml
@@ -18,6 +18,7 @@ sp-application-crypto = { version = "4.0.0-dev", default-features = false, path
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
 	"derive",
 ] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 pallet-session = { version = "4.0.0-dev", features = [
 	"historical",
@@ -36,6 +37,7 @@ std = [
 	"sp-application-crypto/std",
 	"sp-authority-discovery/std",
 	"codec/std",
+	"scale-info/std",
 	"sp-std/std",
 	"pallet-session/std",
 	"sp-runtime/std",
diff --git a/frame/authorship/Cargo.toml b/frame/authorship/Cargo.toml
index a5b8d9616091..120b72f8e651 100644
--- a/frame/authorship/Cargo.toml
+++ b/frame/authorship/Cargo.toml
@@ -16,6 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
 	"derive",
 ] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-authorship = { version = "4.0.0-dev", default-features = false, path = "../../primitives/authorship" }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
@@ -31,6 +32,7 @@ sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"sp-runtime/std",
 	"sp-std/std",
 	"frame-support/std",
diff --git a/frame/authorship/src/lib.rs b/frame/authorship/src/lib.rs
index 325f80c74aa1..5d36adabe888 100644
--- a/frame/authorship/src/lib.rs
+++ b/frame/authorship/src/lib.rs
@@ -115,7 +115,7 @@ where
 	}
 }
 
-#[derive(Encode, Decode, sp_runtime::RuntimeDebug)]
+#[derive(Encode, Decode, sp_runtime::RuntimeDebug, scale_info::TypeInfo)]
 #[cfg_attr(any(feature = "std", test), derive(PartialEq))]
 enum UncleEntryItem<BlockNumber, Hash, Author> {
 	InclusionHeight(BlockNumber),
@@ -238,7 +238,7 @@ pub mod pallet {
 
 		fn create_inherent(data: &InherentData) -> Option<Self::Call> {
 			let uncles = data.uncles().unwrap_or_default();
-			let mut set_uncles = Vec::new();
+			let mut new_uncles = Vec::new();
 
 			if !uncles.is_empty() {
 				let prev_uncles = <Uncles<T>>::get();
@@ -257,10 +257,10 @@ pub mod pallet {
 					match Self::verify_uncle(&uncle, &existing_hashes, &mut acc) {
 						Ok(_) => {
 							let hash = uncle.hash();
-							set_uncles.push(uncle);
+							new_uncles.push(uncle);
 							existing_hashes.push(hash);
 
-							if set_uncles.len() == MAX_UNCLES {
+							if new_uncles.len() == MAX_UNCLES {
 								break
 							}
 						},
@@ -271,10 +271,10 @@ pub mod pallet {
 				}
 			}
 
-			if set_uncles.is_empty() {
+			if new_uncles.is_empty() {
 				None
 			} else {
-				Some(Call::set_uncles(set_uncles))
+				Some(Call::set_uncles { new_uncles })
 			}
 		}
 
@@ -283,14 +283,14 @@ pub mod pallet {
 			_data: &InherentData,
 		) -> result::Result<(), Self::Error> {
 			match call {
-				Call::set_uncles(ref uncles) if uncles.len() > MAX_UNCLES =>
+				Call::set_uncles { ref new_uncles } if new_uncles.len() > MAX_UNCLES =>
 					Err(InherentError::Uncles(Error::<T>::TooManyUncles.as_str().into())),
 				_ => Ok(()),
 			}
 		}
 
 		fn is_inherent(call: &Self::Call) -> bool {
-			matches!(call, Call::set_uncles(_))
+			matches!(call, Call::set_uncles { .. })
 		}
 	}
 }
diff --git a/frame/babe/Cargo.toml b/frame/babe/Cargo.toml
index f1a93bb418e9..d95f1419fd03 100644
--- a/frame/babe/Cargo.toml
+++ b/frame/babe/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
@@ -42,6 +43,7 @@ frame-election-provider-support = { version = "4.0.0-dev", path = "../election-p
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"frame-benchmarking/std",
 	"frame-support/std",
 	"frame-system/std",
diff --git a/frame/babe/src/equivocation.rs b/frame/babe/src/equivocation.rs
index 2558ca8a6e25..2397918d1ef1 100644
--- a/frame/babe/src/equivocation.rs
+++ b/frame/babe/src/equivocation.rs
@@ -155,8 +155,10 @@ where
 	) -> DispatchResult {
 		use frame_system::offchain::SubmitTransaction;
 
-		let call =
-			Call::report_equivocation_unsigned(Box::new(equivocation_proof), key_owner_proof);
+		let call = Call::report_equivocation_unsigned {
+			equivocation_proof: Box::new(equivocation_proof),
+			key_owner_proof,
+		};
 
 		match SubmitTransaction::<T, Call<T>>::submit_unsigned_transaction(call.into()) {
 			Ok(()) => log::info!(
@@ -184,7 +186,7 @@ where
 /// unsigned equivocation reports.
 impl<T: Config> Pallet<T> {
 	pub fn validate_unsigned(source: TransactionSource, call: &Call<T>) -> TransactionValidity {
-		if let Call::report_equivocation_unsigned(equivocation_proof, key_owner_proof) = call {
+		if let Call::report_equivocation_unsigned { equivocation_proof, key_owner_proof } = call {
 			// discard equivocation report not coming from the local node
 			match source {
 				TransactionSource::Local | TransactionSource::InBlock => { /* allowed */ },
@@ -219,7 +221,7 @@ impl<T: Config> Pallet<T> {
 	}
 
 	pub fn pre_dispatch(call: &Call<T>) -> Result<(), TransactionValidityError> {
-		if let Call::report_equivocation_unsigned(equivocation_proof, key_owner_proof) = call {
+		if let Call::report_equivocation_unsigned { equivocation_proof, key_owner_proof } = call {
 			is_known_offence::<T>(equivocation_proof, key_owner_proof)
 		} else {
 			Err(InvalidTransaction::Call.into())
diff --git a/frame/babe/src/tests.rs b/frame/babe/src/tests.rs
index edb3eeb059d8..dc2f74c71951 100644
--- a/frame/babe/src/tests.rs
+++ b/frame/babe/src/tests.rs
@@ -726,10 +726,10 @@ fn report_equivocation_validate_unsigned_prevents_duplicates() {
 		let key = (sp_consensus_babe::KEY_TYPE, &offending_authority_pair.public());
 		let key_owner_proof = Historical::prove(key).unwrap();
 
-		let inner = Call::report_equivocation_unsigned(
-			Box::new(equivocation_proof.clone()),
-			key_owner_proof.clone(),
-		);
+		let inner = Call::report_equivocation_unsigned {
+			equivocation_proof: Box::new(equivocation_proof.clone()),
+			key_owner_proof: key_owner_proof.clone(),
+		};
 
 		// only local/inblock reports are allowed
 		assert_eq!(
@@ -822,10 +822,10 @@ fn valid_equivocation_reports_dont_pay_fees() {
 				.unwrap();
 
 		// check the dispatch info for the call.
-		let info = Call::<Test>::report_equivocation_unsigned(
-			Box::new(equivocation_proof.clone()),
-			key_owner_proof.clone(),
-		)
+		let info = Call::<Test>::report_equivocation_unsigned {
+			equivocation_proof: Box::new(equivocation_proof.clone()),
+			key_owner_proof: key_owner_proof.clone(),
+		}
 		.get_dispatch_info();
 
 		// it should have non-zero weight and the fee has to be paid.
diff --git a/frame/balances/Cargo.toml b/frame/balances/Cargo.toml
index 8b66f08d45d9..2263387d6d8e 100644
--- a/frame/balances/Cargo.toml
+++ b/frame/balances/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
@@ -30,6 +31,7 @@ pallet-transaction-payment = { version = "4.0.0-dev", path = "../transaction-pay
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"sp-std/std",
 	"sp-runtime/std",
 	"frame-benchmarking/std",
diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index 7ab8a54de232..f7102ad4895f 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -177,6 +177,7 @@ use frame_support::{
 	WeakBoundedVec,
 };
 use frame_system as system;
+use scale_info::TypeInfo;
 use sp_runtime::{
 	traits::{
 		AtLeast32BitUnsigned, Bounded, CheckedAdd, CheckedSub, MaybeSerializeDeserialize,
@@ -206,7 +207,8 @@ pub mod pallet {
 			+ Copy
 			+ MaybeSerializeDeserialize
 			+ Debug
-			+ MaxEncodedLen;
+			+ MaxEncodedLen
+			+ TypeInfo;
 
 		/// Handler for the unbalanced reduction when removing a dust account.
 		type DustRemoval: OnUnbalanced<NegativeImbalance<Self, I>>;
@@ -435,7 +437,6 @@ pub mod pallet {
 
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
-	#[pallet::metadata(T::AccountId = "AccountId", T::Balance = "Balance")]
 	pub enum Event<T: Config<I>, I: 'static = ()> {
 		/// An account was created with some free balance. \[account, free_balance\]
 		Endowed(T::AccountId, T::Balance),
@@ -599,7 +600,7 @@ impl<T: Config<I>, I: 'static> GenesisConfig<T, I> {
 }
 
 /// Simplified reasons for withdrawing balance.
-#[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, RuntimeDebug, MaxEncodedLen)]
+#[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, RuntimeDebug, MaxEncodedLen, TypeInfo)]
 pub enum Reasons {
 	/// Paying system transaction fees.
 	Fee = 0,
@@ -633,7 +634,7 @@ impl BitOr for Reasons {
 
 /// A single lock on a balance. There can be many of these on an account and they "overlap", so the
 /// same balance is frozen by multiple locks.
-#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, MaxEncodedLen)]
+#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, MaxEncodedLen, TypeInfo)]
 pub struct BalanceLock<Balance> {
 	/// An identifier for this lock. Only one lock may be in existence for each identifier.
 	pub id: LockIdentifier,
@@ -644,7 +645,7 @@ pub struct BalanceLock<Balance> {
 }
 
 /// Store named reserved balance.
-#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, MaxEncodedLen)]
+#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, MaxEncodedLen, TypeInfo)]
 pub struct ReserveData<ReserveIdentifier, Balance> {
 	/// The identifier for the named reserve.
 	pub id: ReserveIdentifier,
@@ -653,7 +654,7 @@ pub struct ReserveData<ReserveIdentifier, Balance> {
 }
 
 /// All balance information for an account.
-#[derive(Encode, Decode, Clone, PartialEq, Eq, Default, RuntimeDebug, MaxEncodedLen)]
+#[derive(Encode, Decode, Clone, PartialEq, Eq, Default, RuntimeDebug, MaxEncodedLen, TypeInfo)]
 pub struct AccountData<Balance> {
 	/// Non-reserved part of the balance. There may still be restrictions on this, but it is the
 	/// total pool what may in principle be transferred, reserved and used for tipping.
@@ -700,7 +701,7 @@ impl<Balance: Saturating + Copy + Ord> AccountData<Balance> {
 // A value placed in storage that represents the current version of the Balances storage.
 // This value is used by the `on_runtime_upgrade` logic to determine whether we run
 // storage migration logic. This should match directly with the semantic versions of the Rust crate.
-#[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, RuntimeDebug, MaxEncodedLen)]
+#[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, RuntimeDebug, MaxEncodedLen, TypeInfo)]
 enum Releases {
 	V1_0_0,
 	V2_0_0,
diff --git a/frame/balances/src/tests.rs b/frame/balances/src/tests.rs
index fd57371b3a16..a08643821eba 100644
--- a/frame/balances/src/tests.rs
+++ b/frame/balances/src/tests.rs
@@ -39,7 +39,7 @@ macro_rules! decl_tests {
 		const ID_2: LockIdentifier = *b"2       ";
 
 		pub const CALL: &<$test as frame_system::Config>::Call =
-			&Call::Balances(pallet_balances::Call::transfer(0, 0));
+			&Call::Balances(pallet_balances::Call::transfer { dest: 0, value: 0 });
 
 		/// create a transaction info struct from weight. Handy to avoid building the whole struct.
 		pub fn info_from_weight(w: Weight) -> DispatchInfo {
diff --git a/frame/benchmarking/Cargo.toml b/frame/benchmarking/Cargo.toml
index ad15b8e6042e..ea690d966c97 100644
--- a/frame/benchmarking/Cargo.toml
+++ b/frame/benchmarking/Cargo.toml
@@ -16,6 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 linregress = { version = "0.4.3", optional = true }
 paste = "1.0"
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-api = { version = "4.0.0-dev", path = "../../primitives/api", default-features = false }
 sp-runtime-interface = { version = "4.0.0-dev", path = "../../primitives/runtime-interface", default-features = false }
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime", default-features = false }
@@ -33,6 +34,7 @@ hex-literal = "0.3.1"
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"sp-runtime-interface/std",
 	"sp-runtime/std",
 	"sp-api/std",
diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
index 11c755e06c95..6c124a8a7576 100644
--- a/frame/benchmarking/src/lib.rs
+++ b/frame/benchmarking/src/lib.rs
@@ -331,30 +331,38 @@ macro_rules! benchmarks_iter {
 		verify $postcode:block
 		$( $rest:tt )*
 	) => {
-		$crate::benchmarks_iter! {
-			{ $( $instance: $instance_bound )? }
-			{ $( $where_clause )* }
-			( $( $names )* )
-			( $( $names_extra )* )
-			( $( $names_skip_meta )* )
-			$name {
-				$( $code )*
-				let __benchmarked_call_encoded = $crate::frame_support::codec::Encode::encode(
-					&<Call<T $(, $instance )?>>::$dispatch($( $arg ),*)
-				);
-			}: {
-				let call_decoded = <
-					Call<T $(, $instance )?>
-					as $crate::frame_support::codec::Decode
-				>::decode(&mut &__benchmarked_call_encoded[..])
-					.expect("call is encoded above, encoding must be correct");
+		$crate::paste::paste! {
+			$crate::benchmarks_iter! {
+				{ $( $instance: $instance_bound )? }
+				{ $( $where_clause )* }
+				( $( $names )* )
+				( $( $names_extra )* )
+				( $( $names_skip_meta )* )
+				$name {
+					$( $code )*
+					let __call = Call::<
+						T
+						$( , $instance )?
+					>:: [< new_call_variant_ $dispatch >] (
+						$($arg),*
+					);
+					let __benchmarked_call_encoded = $crate::frame_support::codec::Encode::encode(
+						&__call
+					);
+				}: {
+					let call_decoded = <
+						Call<T $(, $instance )?>
+						as $crate::frame_support::codec::Decode
+					>::decode(&mut &__benchmarked_call_encoded[..])
+						.expect("call is encoded above, encoding must be correct");
 
-				<
-					Call<T $(, $instance)? > as $crate::frame_support::traits::UnfilteredDispatchable
-				>::dispatch_bypass_filter(call_decoded, $origin.into())?;
+					<
+						Call<T $(, $instance)? > as $crate::frame_support::traits::UnfilteredDispatchable
+					>::dispatch_bypass_filter(call_decoded, $origin.into())?;
+				}
+				verify $postcode
+				$( $rest )*
 			}
-			verify $postcode
-			$( $rest )*
 		}
 	};
 	// iteration arm:
diff --git a/frame/bounties/Cargo.toml b/frame/bounties/Cargo.toml
index 84147b96f910..3bb184d5b339 100644
--- a/frame/bounties/Cargo.toml
+++ b/frame/bounties/Cargo.toml
@@ -16,6 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
 	"derive",
 ] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
@@ -33,6 +34,7 @@ pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"sp-std/std",
 	"sp-runtime/std",
 	"frame-support/std",
diff --git a/frame/bounties/src/lib.rs b/frame/bounties/src/lib.rs
index a5be4a00cb94..77a8e4717401 100644
--- a/frame/bounties/src/lib.rs
+++ b/frame/bounties/src/lib.rs
@@ -97,6 +97,7 @@ use frame_support::weights::Weight;
 
 use codec::{Decode, Encode};
 use frame_system::{self as system, ensure_signed};
+use scale_info::TypeInfo;
 pub use weights::WeightInfo;
 
 type BalanceOf<T> = pallet_treasury::BalanceOf<T>;
@@ -136,7 +137,7 @@ pub trait Config: frame_system::Config + pallet_treasury::Config {
 pub type BountyIndex = u32;
 
 /// A bounty proposal.
-#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug)]
+#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, TypeInfo)]
 pub struct Bounty<AccountId, Balance, BlockNumber> {
 	/// The account proposing it.
 	proposer: AccountId,
@@ -153,7 +154,7 @@ pub struct Bounty<AccountId, Balance, BlockNumber> {
 }
 
 /// The status of a bounty proposal.
-#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug)]
+#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, TypeInfo)]
 pub enum BountyStatus<AccountId, BlockNumber> {
 	/// The bounty is proposed and waiting for approval.
 	Proposed,
diff --git a/frame/collective/Cargo.toml b/frame/collective/Cargo.toml
index 8828c6a61cd3..e88f28d41773 100644
--- a/frame/collective/Cargo.toml
+++ b/frame/collective/Cargo.toml
@@ -15,6 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 log = { version = "0.4.14", default-features = false }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
 sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
@@ -30,6 +31,7 @@ default = ["std"]
 std = [
 	"codec/std",
 	"log/std",
+	"scale-info/std",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
diff --git a/frame/collective/src/benchmarking.rs b/frame/collective/src/benchmarking.rs
index 1ce7750278bc..c7e695babf27 100644
--- a/frame/collective/src/benchmarking.rs
+++ b/frame/collective/src/benchmarking.rs
@@ -65,7 +65,9 @@ benchmarks_instance_pallet! {
 		let length = 100;
 		for i in 0 .. p {
 			// Proposals should be different so that different proposal hashes are generated
-			let proposal: T::Proposal = SystemCall::<T>::remark(vec![i as u8; length]).into();
+			let proposal: T::Proposal = SystemCall::<T>::remark {
+				remark: vec![i as u8; length]
+			}.into();
 			Collective::<T, I>::propose(
 				SystemOrigin::Signed(last_old_member.clone()).into(),
 				threshold,
@@ -121,7 +123,7 @@ benchmarks_instance_pallet! {
 
 		Collective::<T, I>::set_members(SystemOrigin::Root.into(), members, None, T::MaxMembers::get())?;
 
-		let proposal: T::Proposal = SystemCall::<T>::remark(vec![1; b as usize]).into();
+		let proposal: T::Proposal = SystemCall::<T>::remark { remark: vec![1; b as usize] }.into();
 
 	}: _(SystemOrigin::Signed(caller), Box::new(proposal.clone()), bytes_in_storage)
 	verify {
@@ -151,7 +153,7 @@ benchmarks_instance_pallet! {
 
 		Collective::<T, I>::set_members(SystemOrigin::Root.into(), members, None, T::MaxMembers::get())?;
 
-		let proposal: T::Proposal = SystemCall::<T>::remark(vec![1; b as usize]).into();
+		let proposal: T::Proposal = SystemCall::<T>::remark { remark: vec![1; b as usize] }.into();
 		let threshold = 1;
 
 	}: propose(SystemOrigin::Signed(caller), threshold, Box::new(proposal.clone()), bytes_in_storage)
@@ -185,7 +187,7 @@ benchmarks_instance_pallet! {
 		// Add previous proposals.
 		for i in 0 .. p - 1 {
 			// Proposals should be different so that different proposal hashes are generated
-			let proposal: T::Proposal = SystemCall::<T>::remark(vec![i as u8; b as usize]).into();
+			let proposal: T::Proposal = SystemCall::<T>::remark { remark: vec![i as u8; b as usize] }.into();
 			Collective::<T, I>::propose(
 				SystemOrigin::Signed(caller.clone()).into(),
 				threshold,
@@ -196,7 +198,7 @@ benchmarks_instance_pallet! {
 
 		assert_eq!(Collective::<T, I>::proposals().len(), (p - 1) as usize);
 
-		let proposal: T::Proposal = SystemCall::<T>::remark(vec![p as u8; b as usize]).into();
+		let proposal: T::Proposal = SystemCall::<T>::remark { remark: vec![p as u8; b as usize] }.into();
 
 	}: propose(SystemOrigin::Signed(caller.clone()), threshold, Box::new(proposal.clone()), bytes_in_storage)
 	verify {
@@ -233,7 +235,7 @@ benchmarks_instance_pallet! {
 		let mut last_hash = T::Hash::default();
 		for i in 0 .. p {
 			// Proposals should be different so that different proposal hashes are generated
-			let proposal: T::Proposal = SystemCall::<T>::remark(vec![i as u8; b as usize]).into();
+			let proposal: T::Proposal = SystemCall::<T>::remark { remark: vec![i as u8; b as usize] }.into();
 			Collective::<T, I>::propose(
 				SystemOrigin::Signed(proposer.clone()).into(),
 				threshold,
@@ -308,7 +310,9 @@ benchmarks_instance_pallet! {
 		let mut last_hash = T::Hash::default();
 		for i in 0 .. p {
 			// Proposals should be different so that different proposal hashes are generated
-			let proposal: T::Proposal = SystemCall::<T>::remark(vec![i as u8; bytes as usize]).into();
+			let proposal: T::Proposal = SystemCall::<T>::remark {
+				remark: vec![i as u8; bytes as usize]
+			}.into();
 			Collective::<T, I>::propose(
 				SystemOrigin::Signed(proposer.clone()).into(),
 				threshold,
@@ -385,7 +389,7 @@ benchmarks_instance_pallet! {
 		let mut last_hash = T::Hash::default();
 		for i in 0 .. p {
 			// Proposals should be different so that different proposal hashes are generated
-			let proposal: T::Proposal = SystemCall::<T>::remark(vec![i as u8; b as usize]).into();
+			let proposal: T::Proposal = SystemCall::<T>::remark { remark: vec![i as u8; b as usize] }.into();
 			Collective::<T, I>::propose(
 				SystemOrigin::Signed(caller.clone()).into(),
 				threshold,
@@ -471,7 +475,9 @@ benchmarks_instance_pallet! {
 		let mut last_hash = T::Hash::default();
 		for i in 0 .. p {
 			// Proposals should be different so that different proposal hashes are generated
-			let proposal: T::Proposal = SystemCall::<T>::remark(vec![i as u8; bytes as usize]).into();
+			let proposal: T::Proposal = SystemCall::<T>::remark {
+				remark: vec![i as u8; bytes as usize]
+			}.into();
 			Collective::<T, I>::propose(
 				SystemOrigin::Signed(caller.clone()).into(),
 				threshold,
@@ -543,7 +549,7 @@ benchmarks_instance_pallet! {
 		let mut last_hash = T::Hash::default();
 		for i in 0 .. p {
 			// Proposals should be different so that different proposal hashes are generated
-			let proposal: T::Proposal = SystemCall::<T>::remark(vec![i as u8; b as usize]).into();
+			let proposal: T::Proposal = SystemCall::<T>::remark { remark: vec![i as u8; b as usize] }.into();
 			Collective::<T, I>::propose(
 				SystemOrigin::Signed(caller.clone()).into(),
 				threshold,
@@ -614,7 +620,7 @@ benchmarks_instance_pallet! {
 		let mut last_hash = T::Hash::default();
 		for i in 0 .. p {
 			// Proposals should be different so that different proposal hashes are generated
-			let proposal: T::Proposal = SystemCall::<T>::remark(vec![i as u8; b as usize]).into();
+			let proposal: T::Proposal = SystemCall::<T>::remark { remark: vec![i as u8; b as usize] }.into();
 			Collective::<T, I>::propose(
 				SystemOrigin::Signed(caller.clone()).into(),
 				threshold,
diff --git a/frame/collective/src/lib.rs b/frame/collective/src/lib.rs
index fa537a0a439a..89d4c8a150c3 100644
--- a/frame/collective/src/lib.rs
+++ b/frame/collective/src/lib.rs
@@ -42,6 +42,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 #![recursion_limit = "128"]
 
+use scale_info::TypeInfo;
 use sp_core::u32_trait::Value as U32;
 use sp_io::storage;
 use sp_runtime::{traits::Hash, RuntimeDebug};
@@ -124,7 +125,8 @@ impl DefaultVote for MoreThanMajorityThenPrimeDefaultVote {
 }
 
 /// Origin for the collective module.
-#[derive(PartialEq, Eq, Clone, RuntimeDebug, Encode, Decode)]
+#[derive(PartialEq, Eq, Clone, RuntimeDebug, Encode, Decode, TypeInfo)]
+#[scale_info(skip_type_params(I))]
 pub enum RawOrigin<AccountId, I> {
 	/// It has been condoned by a given number of members of the collective from a given total.
 	Members(MemberCount, MemberCount),
@@ -144,7 +146,7 @@ impl<AccountId, I> GetBacking for RawOrigin<AccountId, I> {
 }
 
 /// Info for keeping track of a motion being voted on.
-#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug)]
+#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, TypeInfo)]
 pub struct Votes<AccountId, BlockNumber> {
 	/// The proposal's unique index.
 	index: ProposalIndex,
@@ -274,7 +276,6 @@ pub mod pallet {
 
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
-	#[pallet::metadata(T::AccountId = "AccountId", T::Hash = "Hash")]
 	pub enum Event<T: Config<I>, I: 'static = ()> {
 		/// A motion (given hash) has been proposed (by given account) with a threshold (given
 		/// `MemberCount`).
diff --git a/frame/collective/src/tests.rs b/frame/collective/src/tests.rs
index 5c662428fd99..b8feb64867cf 100644
--- a/frame/collective/src/tests.rs
+++ b/frame/collective/src/tests.rs
@@ -172,7 +172,7 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 }
 
 fn make_proposal(value: u64) -> Call {
-	Call::System(frame_system::Call::remark(value.encode()))
+	Call::System(frame_system::Call::remark { remark: value.encode() })
 }
 
 fn record(event: Event) -> EventRecord<Event, H256> {
@@ -229,8 +229,11 @@ fn close_works() {
 #[test]
 fn proposal_weight_limit_works_on_approve() {
 	new_test_ext().execute_with(|| {
-		let proposal =
-			Call::Collective(crate::Call::set_members(vec![1, 2, 3], None, MaxMembers::get()));
+		let proposal = Call::Collective(crate::Call::set_members {
+			new_members: vec![1, 2, 3],
+			prime: None,
+			old_count: MaxMembers::get(),
+		});
 		let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
 		let proposal_weight = proposal.get_dispatch_info().weight;
 		let hash = BlakeTwo256::hash_of(&proposal);
@@ -256,8 +259,11 @@ fn proposal_weight_limit_works_on_approve() {
 #[test]
 fn proposal_weight_limit_ignored_on_disapprove() {
 	new_test_ext().execute_with(|| {
-		let proposal =
-			Call::Collective(crate::Call::set_members(vec![1, 2, 3], None, MaxMembers::get()));
+		let proposal = Call::Collective(crate::Call::set_members {
+			new_members: vec![1, 2, 3],
+			prime: None,
+			old_count: MaxMembers::get(),
+		});
 		let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
 		let proposal_weight = proposal.get_dispatch_info().weight;
 		let hash = BlakeTwo256::hash_of(&proposal);
@@ -561,8 +567,11 @@ fn limit_active_proposals() {
 #[test]
 fn correct_validate_and_get_proposal() {
 	new_test_ext().execute_with(|| {
-		let proposal =
-			Call::Collective(crate::Call::set_members(vec![1, 2, 3], None, MaxMembers::get()));
+		let proposal = Call::Collective(crate::Call::set_members {
+			new_members: vec![1, 2, 3],
+			prime: None,
+			old_count: MaxMembers::get(),
+		});
 		let length = proposal.encode().len() as u32;
 		assert_ok!(Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone()), length));
 
@@ -782,7 +791,7 @@ fn motions_reproposing_disapproved_works() {
 #[test]
 fn motions_approval_with_enough_votes_and_lower_voting_threshold_works() {
 	new_test_ext().execute_with(|| {
-		let proposal = Call::Democracy(mock_democracy::Call::external_propose_majority());
+		let proposal = Call::Democracy(mock_democracy::Call::external_propose_majority {});
 		let proposal_len: u32 = proposal.using_encoded(|p| p.len() as u32);
 		let proposal_weight = proposal.get_dispatch_info().weight;
 		let hash: H256 = proposal.blake2_256().into();
diff --git a/frame/contracts/Cargo.toml b/frame/contracts/Cargo.toml
index 36d05e35180b..80dc0b05e751 100644
--- a/frame/contracts/Cargo.toml
+++ b/frame/contracts/Cargo.toml
@@ -18,6 +18,7 @@ codec = { package = "parity-scale-codec", version = "2.2.0", default-features =
 	"derive",
 	"max-encoded-len",
 ] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 log = { version = "0.4", default-features = false }
 pwasm-utils = { version = "0.18.2", default-features = false }
 serde = { version = "1", optional = true, features = ["derive"] }
@@ -60,6 +61,7 @@ default = ["std"]
 std = [
 	"serde",
 	"codec/std",
+	"scale-info/std",
 	"sp-core/std",
 	"sp-runtime/std",
 	"sp-io/std",
diff --git a/frame/contracts/common/Cargo.toml b/frame/contracts/common/Cargo.toml
index e353b3af0471..b441d88453ae 100644
--- a/frame/contracts/common/Cargo.toml
+++ b/frame/contracts/common/Cargo.toml
@@ -15,6 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 bitflags = "1.0"
 codec = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 serde = { version = "1", features = ["derive"], optional = true }
 
 # Substrate Dependencies (This crate should not rely on frame)
@@ -26,6 +27,7 @@ sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../..
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"sp-core/std",
 	"sp-runtime/std",
 	"sp-std/std",
diff --git a/frame/contracts/rpc/runtime-api/Cargo.toml b/frame/contracts/rpc/runtime-api/Cargo.toml
index fb5addc5a437..e5f6d1ec7eb8 100644
--- a/frame/contracts/rpc/runtime-api/Cargo.toml
+++ b/frame/contracts/rpc/runtime-api/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 
 # Substrate Dependencies
 pallet-contracts-primitives = { version = "4.0.0-dev", default-features = false, path = "../../common" }
@@ -26,6 +27,7 @@ default = ["std"]
 std = [
 	"sp-api/std",
 	"codec/std",
+	"scale-info/std",
 	"sp-std/std",
 	"sp-runtime/std",
 	"pallet-contracts-primitives/std",
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index 516de3a22d5a..cc468466c292 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -2060,7 +2060,9 @@ mod tests {
 	#[test]
 	fn call_runtime_works() {
 		let code_hash = MockLoader::insert(Call, |ctx, _| {
-			let call = Call::System(frame_system::Call::remark_with_event(b"Hello World".to_vec()));
+			let call = Call::System(frame_system::Call::remark_with_event {
+				remark: b"Hello World".to_vec(),
+			});
 			ctx.ext.call_runtime(call).unwrap();
 			exec_success()
 		});
@@ -2094,20 +2096,19 @@ mod tests {
 			use pallet_utility::Call as UtilCall;
 
 			// remark should still be allowed
-			let allowed_call = Call::System(SysCall::remark_with_event(b"Hello".to_vec()));
+			let allowed_call =
+				Call::System(SysCall::remark_with_event { remark: b"Hello".to_vec() });
 
 			// transfers are disallowed by the `TestFiler` (see below)
-			let forbidden_call = Call::Balances(BalanceCall::transfer(CHARLIE, 22));
+			let forbidden_call = Call::Balances(BalanceCall::transfer { dest: CHARLIE, value: 22 });
 
 			// simple cases: direct call
 			assert_err!(ctx.ext.call_runtime(forbidden_call.clone()), BadOrigin);
 
 			// as part of a patch: return is OK (but it interrupted the batch)
-			assert_ok!(ctx.ext.call_runtime(Call::Utility(UtilCall::batch(vec![
-				allowed_call.clone(),
-				forbidden_call,
-				allowed_call
-			]))),);
+			assert_ok!(ctx.ext.call_runtime(Call::Utility(UtilCall::batch {
+				calls: vec![allowed_call.clone(), forbidden_call, allowed_call]
+			})),);
 
 			// the transfer wasn't performed
 			assert_eq!(get_balance(&CHARLIE), 0);
@@ -2116,7 +2117,7 @@ mod tests {
 		});
 
 		TestFilter::set_filter(|call| match call {
-			Call::Balances(pallet_balances::Call::transfer(_, _)) => false,
+			Call::Balances(pallet_balances::Call::transfer { .. }) => false,
 			_ => true,
 		});
 
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index 7b165e51dcfe..77efcc6986e6 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -386,7 +386,6 @@ pub mod pallet {
 
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
-	#[pallet::metadata(T::AccountId = "AccountId", T::Hash = "Hash", BalanceOf<T> = "Balance")]
 	pub enum Event<T: Config> {
 		/// Contract deployed by address at the specified address. \[deployer, contract\]
 		Instantiated(T::AccountId, T::AccountId),
diff --git a/frame/contracts/src/schedule.rs b/frame/contracts/src/schedule.rs
index 51aefa8bdaf6..c14165b4c6ae 100644
--- a/frame/contracts/src/schedule.rs
+++ b/frame/contracts/src/schedule.rs
@@ -24,6 +24,7 @@ use codec::{Decode, Encode};
 use frame_support::{weights::Weight, DefaultNoBound};
 use pallet_contracts_proc_macro::{ScheduleDebug, WeightDebug};
 use pwasm_utils::{parity_wasm::elements, rules};
+use scale_info::TypeInfo;
 #[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 use sp_runtime::RuntimeDebug;
@@ -72,7 +73,8 @@ pub const INSTR_BENCHMARK_BATCH_SIZE: u32 = 100;
 /// changes are made to its values.
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "std", serde(bound(serialize = "", deserialize = "")))]
-#[derive(Clone, Encode, Decode, PartialEq, Eq, ScheduleDebug, DefaultNoBound)]
+#[derive(Clone, Encode, Decode, PartialEq, Eq, ScheduleDebug, DefaultNoBound, TypeInfo)]
+#[scale_info(skip_type_params(T))]
 pub struct Schedule<T: Config> {
 	/// Describes the upper limits on various metrics.
 	pub limits: Limits,
@@ -92,7 +94,7 @@ pub struct Schedule<T: Config> {
 /// values will break existing contracts which are above the new limits when a
 /// re-instrumentation is triggered.
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-#[derive(Clone, Encode, Decode, PartialEq, Eq, RuntimeDebug)]
+#[derive(Clone, Encode, Decode, PartialEq, Eq, RuntimeDebug, TypeInfo)]
 pub struct Limits {
 	/// The maximum number of topics supported by an event.
 	pub event_topics: u32,
@@ -174,7 +176,8 @@ impl Limits {
 ///    that use them as supporting instructions. Supporting means mainly pushing arguments
 ///    and dropping return values in order to maintain a valid module.
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-#[derive(Clone, Encode, Decode, PartialEq, Eq, WeightDebug)]
+#[derive(Clone, Encode, Decode, PartialEq, Eq, WeightDebug, TypeInfo)]
+#[scale_info(skip_type_params(T))]
 pub struct InstructionWeights<T: Config> {
 	/// Version of the instruction weights.
 	///
@@ -247,7 +250,8 @@ pub struct InstructionWeights<T: Config> {
 
 /// Describes the weight for each imported function that a contract is allowed to call.
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-#[derive(Clone, Encode, Decode, PartialEq, Eq, WeightDebug)]
+#[derive(Clone, Encode, Decode, PartialEq, Eq, WeightDebug, TypeInfo)]
+#[scale_info(skip_type_params(T))]
 pub struct HostFnWeights<T: Config> {
 	/// Weight of calling `seal_caller`.
 	pub caller: Weight,
diff --git a/frame/contracts/src/storage.rs b/frame/contracts/src/storage.rs
index 510a1c95f9a3..41db0796717e 100644
--- a/frame/contracts/src/storage.rs
+++ b/frame/contracts/src/storage.rs
@@ -29,6 +29,7 @@ use frame_support::{
 	traits::Get,
 	weights::Weight,
 };
+use scale_info::TypeInfo;
 use sp_core::crypto::UncheckedFrom;
 use sp_io::hashing::blake2_256;
 use sp_runtime::{traits::Hash, RuntimeDebug};
@@ -38,7 +39,7 @@ pub type ContractInfo<T> = RawContractInfo<CodeHash<T>>;
 
 /// Information for managing an account and its sub trie abstraction.
 /// This is the required info to cache for an account.
-#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug)]
+#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, TypeInfo)]
 pub struct RawContractInfo<CodeHash> {
 	/// Unique ID for the subtree encoded as a bytes vector.
 	pub trie_id: TrieId,
@@ -61,7 +62,7 @@ fn child_trie_info(trie_id: &[u8]) -> ChildInfo {
 	ChildInfo::new_default(trie_id)
 }
 
-#[derive(Encode, Decode)]
+#[derive(Encode, Decode, TypeInfo)]
 pub struct DeletedContract {
 	pub(crate) trie_id: TrieId,
 }
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index 28f05fd390d5..f5b95c192c42 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -1781,7 +1781,12 @@ fn gas_estimation_call_runtime() {
 
 		// Call something trivial with a huge gas limit so that we can observe the effects
 		// of pre-charging. This should create a difference between consumed and required.
-		let call = Call::Contracts(crate::Call::call(addr_callee, 0, GAS_LIMIT / 3, vec![]));
+		let call = Call::Contracts(crate::Call::call {
+			dest: addr_callee,
+			value: 0,
+			gas_limit: GAS_LIMIT / 3,
+			data: vec![],
+		});
 		let result =
 			Contracts::bare_call(ALICE, addr_caller.clone(), 0, GAS_LIMIT, call.encode(), false);
 		assert_ok!(&result.result);
diff --git a/frame/contracts/src/wasm/mod.rs b/frame/contracts/src/wasm/mod.rs
index b92ed111e988..855cb6e45091 100644
--- a/frame/contracts/src/wasm/mod.rs
+++ b/frame/contracts/src/wasm/mod.rs
@@ -50,7 +50,8 @@ pub use tests::MockExt;
 /// `instruction_weights_version` and `code` when a contract with an outdated instrumention is
 /// called. Therefore one must be careful when holding any in-memory representation of this
 /// type while calling into a contract as those fields can get out of date.
-#[derive(Clone, Encode, Decode)]
+#[derive(Clone, Encode, Decode, scale_info::TypeInfo)]
+#[scale_info(skip_type_params(T))]
 pub struct PrefabWasmModule<T: Config> {
 	/// Version of the instruction weights with which the code was instrumented.
 	#[codec(compact)]
@@ -1967,7 +1968,7 @@ mod tests {
 	#[cfg(feature = "unstable-interface")]
 	fn call_runtime_works() {
 		use std::convert::TryInto;
-		let call = Call::System(frame_system::Call::remark(b"Hello World".to_vec()));
+		let call = Call::System(frame_system::Call::remark { remark: b"Hello World".to_vec() });
 		let mut ext = MockExt::default();
 		let result = execute(CODE_CALL_RUNTIME, call.encode(), &mut ext).unwrap();
 		assert_eq!(*ext.runtime_calls.borrow(), vec![call]);
diff --git a/frame/democracy/Cargo.toml b/frame/democracy/Cargo.toml
index 98b034c3ce7e..94719553e28a 100644
--- a/frame/democracy/Cargo.toml
+++ b/frame/democracy/Cargo.toml
@@ -17,6 +17,7 @@ serde = { version = "1.0.126", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
 	"derive",
 ] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
@@ -34,6 +35,7 @@ default = ["std"]
 std = [
 	"serde",
 	"codec/std",
+	"scale-info/std",
 	"sp-std/std",
 	"sp-io/std",
 	"frame-benchmarking/std",
diff --git a/frame/democracy/src/benchmarking.rs b/frame/democracy/src/benchmarking.rs
index 487a52571941..7d4d7aee140b 100644
--- a/frame/democracy/src/benchmarking.rs
+++ b/frame/democracy/src/benchmarking.rs
@@ -73,7 +73,7 @@ fn add_referendum<T: Config>(n: u32) -> Result<ReferendumIndex, &'static str> {
 		None,
 		63,
 		frame_system::RawOrigin::Root.into(),
-		Call::enact_proposal(proposal_hash, referendum_index).into(),
+		Call::enact_proposal { proposal_hash, index: referendum_index }.into(),
 	)
 	.map_err(|_| "failed to schedule named")?;
 	Ok(referendum_index)
@@ -194,7 +194,7 @@ benchmarks! {
 	emergency_cancel {
 		let origin = T::CancellationOrigin::successful_origin();
 		let referendum_index = add_referendum::<T>(0)?;
-		let call = Call::<T>::emergency_cancel(referendum_index);
+		let call = Call::<T>::emergency_cancel { ref_index: referendum_index };
 		assert_ok!(Democracy::<T>::referendum_status(referendum_index));
 	}: { call.dispatch_bypass_filter(origin)? }
 	verify {
@@ -224,7 +224,7 @@ benchmarks! {
 		let referendum_index = add_referendum::<T>(0)?;
 		assert_ok!(Democracy::<T>::referendum_status(referendum_index));
 
-		let call = Call::<T>::blacklist(hash, Some(referendum_index));
+		let call = Call::<T>::blacklist { proposal_hash: hash, maybe_ref_index: Some(referendum_index) };
 		let origin = T::BlacklistOrigin::successful_origin();
 	}: { call.dispatch_bypass_filter(origin)? }
 	verify {
@@ -247,7 +247,7 @@ benchmarks! {
 			(T::BlockNumber::zero(), vec![T::AccountId::default(); v as usize])
 		);
 
-		let call = Call::<T>::external_propose(proposal_hash);
+		let call = Call::<T>::external_propose { proposal_hash };
 	}: { call.dispatch_bypass_filter(origin)? }
 	verify {
 		// External proposal created
@@ -257,7 +257,7 @@ benchmarks! {
 	external_propose_majority {
 		let origin = T::ExternalMajorityOrigin::successful_origin();
 		let proposal_hash = T::Hashing::hash_of(&0);
-		let call = Call::<T>::external_propose_majority(proposal_hash);
+		let call = Call::<T>::external_propose_majority { proposal_hash };
 	}: { call.dispatch_bypass_filter(origin)? }
 	verify {
 		// External proposal created
@@ -267,7 +267,7 @@ benchmarks! {
 	external_propose_default {
 		let origin = T::ExternalDefaultOrigin::successful_origin();
 		let proposal_hash = T::Hashing::hash_of(&0);
-		let call = Call::<T>::external_propose_default(proposal_hash);
+		let call = Call::<T>::external_propose_default { proposal_hash };
 	}: { call.dispatch_bypass_filter(origin)? }
 	verify {
 		// External proposal created
@@ -283,7 +283,11 @@ benchmarks! {
 		let origin_fast_track = T::FastTrackOrigin::successful_origin();
 		let voting_period = T::FastTrackVotingPeriod::get();
 		let delay = 0u32;
-		let call = Call::<T>::fast_track(proposal_hash, voting_period.into(), delay.into());
+		let call = Call::<T>::fast_track {
+			proposal_hash,
+			voting_period: voting_period.into(),
+			delay: delay.into()
+		};
 
 	}: { call.dispatch_bypass_filter(origin_fast_track)? }
 	verify {
@@ -306,7 +310,7 @@ benchmarks! {
 		vetoers.sort();
 		Blacklist::<T>::insert(proposal_hash, (T::BlockNumber::zero(), vetoers));
 
-		let call = Call::<T>::veto_external(proposal_hash);
+		let call = Call::<T>::veto_external { proposal_hash };
 		let origin = T::VetoOrigin::successful_origin();
 		ensure!(NextExternal::<T>::get().is_some(), "no external proposal");
 	}: { call.dispatch_bypass_filter(origin)? }
@@ -356,7 +360,7 @@ benchmarks! {
 
 		let origin = T::ExternalMajorityOrigin::successful_origin();
 		let proposal_hash = T::Hashing::hash_of(&r);
-		let call = Call::<T>::external_propose_majority(proposal_hash);
+		let call = Call::<T>::external_propose_majority { proposal_hash };
 		call.dispatch_bypass_filter(origin)?;
 		// External proposal created
 		ensure!(<NextExternal<T>>::exists(), "External proposal didn't work");
@@ -739,7 +743,7 @@ benchmarks! {
 		let b in 0 .. MAX_BYTES;
 
 		let proposer = funded_account::<T>("proposer", 0);
-		let raw_call = Call::note_preimage(vec![1; b as usize]);
+		let raw_call = Call::note_preimage { encoded_proposal: vec![1; b as usize] };
 		let generic_call: T::Proposal = raw_call.into();
 		let encoded_proposal = generic_call.encode();
 		let proposal_hash = T::Hashing::hash(&encoded_proposal[..]);
diff --git a/frame/democracy/src/conviction.rs b/frame/democracy/src/conviction.rs
index 6b77acfab5b0..b4f24c93bb40 100644
--- a/frame/democracy/src/conviction.rs
+++ b/frame/democracy/src/conviction.rs
@@ -19,6 +19,7 @@
 
 use crate::types::Delegations;
 use codec::{Decode, Encode};
+use scale_info::TypeInfo;
 use sp_runtime::{
 	traits::{Bounded, CheckedDiv, CheckedMul, Zero},
 	RuntimeDebug,
@@ -26,7 +27,7 @@ use sp_runtime::{
 use sp_std::{convert::TryFrom, result::Result};
 
 /// A value denoting the strength of conviction of a vote.
-#[derive(Encode, Decode, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, RuntimeDebug)]
+#[derive(Encode, Decode, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, RuntimeDebug, TypeInfo)]
 pub enum Conviction {
 	/// 0.1x votes, unlocked.
 	None,
diff --git a/frame/democracy/src/lib.rs b/frame/democracy/src/lib.rs
index 473ac964692c..8bc6921c4f8a 100644
--- a/frame/democracy/src/lib.rs
+++ b/frame/democracy/src/lib.rs
@@ -162,6 +162,7 @@ use frame_support::{
 	},
 	weights::Weight,
 };
+use scale_info::TypeInfo;
 use sp_runtime::{
 	traits::{Bounded, Dispatchable, Hash, Saturating, Zero},
 	ArithmeticError, DispatchError, DispatchResult, RuntimeDebug,
@@ -205,7 +206,7 @@ type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<
 	<T as frame_system::Config>::AccountId,
 >>::NegativeImbalance;
 
-#[derive(Clone, Encode, Decode, RuntimeDebug)]
+#[derive(Clone, Encode, Decode, RuntimeDebug, TypeInfo)]
 pub enum PreimageStatus<AccountId, Balance, BlockNumber> {
 	/// The preimage is imminently needed at the argument.
 	Missing(BlockNumber),
@@ -232,7 +233,7 @@ impl<AccountId, Balance, BlockNumber> PreimageStatus<AccountId, Balance, BlockNu
 // A value placed in storage that represents the current version of the Democracy storage.
 // This value is used by the `on_runtime_upgrade` logic to determine whether we run
 // storage migration logic.
-#[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, RuntimeDebug)]
+#[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, RuntimeDebug, TypeInfo)]
 enum Releases {
 	V1,
 }
@@ -505,13 +506,6 @@ pub mod pallet {
 
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
-	#[pallet::metadata(
-		T::AccountId = "AccountId",
-		Vec<T::AccountId> = "Vec<AccountId>",
-		BalanceOf<T> = "Balance",
-		T::BlockNumber = "BlockNumber",
-		T::Hash = "Hash",
-	)]
 	pub enum Event<T: Config> {
 		/// A motion has been proposed by a public account. \[proposal_index, deposit\]
 		Proposed(PropIndex, BalanceOf<T>),
@@ -1714,7 +1708,7 @@ impl<T: Config> Pallet<T> {
 					None,
 					63,
 					frame_system::RawOrigin::Root.into(),
-					Call::enact_proposal(status.proposal_hash, index).into(),
+					Call::enact_proposal { proposal_hash: status.proposal_hash, index }.into(),
 				)
 				.is_err()
 				{
diff --git a/frame/democracy/src/tests.rs b/frame/democracy/src/tests.rs
index 9a5e47c89ac7..75104db51b97 100644
--- a/frame/democracy/src/tests.rs
+++ b/frame/democracy/src/tests.rs
@@ -72,7 +72,7 @@ frame_support::construct_runtime!(
 pub struct BaseFilter;
 impl Contains<Call> for BaseFilter {
 	fn contains(call: &Call) -> bool {
-		!matches!(call, &Call::Balances(pallet_balances::Call::set_balance(..)))
+		!matches!(call, &Call::Balances(pallet_balances::Call::set_balance { .. }))
 	}
 }
 
@@ -226,7 +226,8 @@ fn params_should_work() {
 }
 
 fn set_balance_proposal(value: u64) -> Vec<u8> {
-	Call::Balances(pallet_balances::Call::set_balance(42, value, 0)).encode()
+	Call::Balances(pallet_balances::Call::set_balance { who: 42, new_free: value, new_reserved: 0 })
+		.encode()
 }
 
 #[test]
diff --git a/frame/democracy/src/types.rs b/frame/democracy/src/types.rs
index 5c4002a46dd3..2eb004ba61bc 100644
--- a/frame/democracy/src/types.rs
+++ b/frame/democracy/src/types.rs
@@ -19,13 +19,14 @@
 
 use crate::{AccountVote, Conviction, Vote, VoteThreshold};
 use codec::{Decode, Encode};
+use scale_info::TypeInfo;
 use sp_runtime::{
 	traits::{Bounded, CheckedAdd, CheckedDiv, CheckedMul, CheckedSub, Saturating, Zero},
 	RuntimeDebug,
 };
 
 /// Info regarding an ongoing referendum.
-#[derive(Encode, Decode, Default, Clone, PartialEq, Eq, RuntimeDebug)]
+#[derive(Encode, Decode, Default, Clone, PartialEq, Eq, RuntimeDebug, TypeInfo)]
 pub struct Tally<Balance> {
 	/// The number of aye votes, expressed in terms of post-conviction lock-vote.
 	pub ayes: Balance,
@@ -36,7 +37,7 @@ pub struct Tally<Balance> {
 }
 
 /// Amount of votes and capital placed in delegation for an account.
-#[derive(Encode, Decode, Default, Copy, Clone, PartialEq, Eq, RuntimeDebug)]
+#[derive(Encode, Decode, Default, Copy, Clone, PartialEq, Eq, RuntimeDebug, TypeInfo)]
 pub struct Delegations<Balance> {
 	/// The number of votes (this is post-conviction).
 	pub votes: Balance,
@@ -159,7 +160,7 @@ impl<
 }
 
 /// Info regarding an ongoing referendum.
-#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug)]
+#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, TypeInfo)]
 pub struct ReferendumStatus<BlockNumber, Hash, Balance> {
 	/// When voting on this referendum will end.
 	pub end: BlockNumber,
@@ -174,7 +175,7 @@ pub struct ReferendumStatus<BlockNumber, Hash, Balance> {
 }
 
 /// Info regarding a referendum, present or past.
-#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug)]
+#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, TypeInfo)]
 pub enum ReferendumInfo<BlockNumber, Hash, Balance> {
 	/// Referendum is happening, the arg is the block number at which it will end.
 	Ongoing(ReferendumStatus<BlockNumber, Hash, Balance>),
diff --git a/frame/democracy/src/vote.rs b/frame/democracy/src/vote.rs
index 7b1b32ea37f5..03ca020ca094 100644
--- a/frame/democracy/src/vote.rs
+++ b/frame/democracy/src/vote.rs
@@ -19,6 +19,7 @@
 
 use crate::{Conviction, Delegations, ReferendumIndex};
 use codec::{Decode, Encode, EncodeLike, Input, Output};
+use scale_info::TypeInfo;
 use sp_runtime::{
 	traits::{Saturating, Zero},
 	RuntimeDebug,
@@ -51,8 +52,21 @@ impl Decode for Vote {
 	}
 }
 
+impl TypeInfo for Vote {
+	type Identity = Self;
+
+	fn type_info() -> scale_info::Type {
+		scale_info::Type::builder()
+			.path(scale_info::Path::new("Vote", module_path!()))
+			.composite(
+				scale_info::build::Fields::unnamed()
+					.field(|f| f.ty::<u8>().docs(&["Raw vote byte, encodes aye + conviction"])),
+			)
+	}
+}
+
 /// A vote for a referendum of a particular account.
-#[derive(Encode, Decode, Copy, Clone, Eq, PartialEq, RuntimeDebug)]
+#[derive(Encode, Decode, Copy, Clone, Eq, PartialEq, RuntimeDebug, TypeInfo)]
 pub enum AccountVote<Balance> {
 	/// A standard vote, one-way (approve or reject) with a given amount of conviction.
 	Standard { vote: Vote, balance: Balance },
@@ -92,7 +106,9 @@ impl<Balance: Saturating> AccountVote<Balance> {
 }
 
 /// A "prior" lock, i.e. a lock for some now-forgotten reason.
-#[derive(Encode, Decode, Default, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, RuntimeDebug)]
+#[derive(
+	Encode, Decode, Default, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, RuntimeDebug, TypeInfo,
+)]
 pub struct PriorLock<BlockNumber, Balance>(BlockNumber, Balance);
 
 impl<BlockNumber: Ord + Copy + Zero, Balance: Ord + Copy + Zero> PriorLock<BlockNumber, Balance> {
@@ -115,7 +131,7 @@ impl<BlockNumber: Ord + Copy + Zero, Balance: Ord + Copy + Zero> PriorLock<Block
 }
 
 /// An indicator for what an account is doing; it can either be delegating or voting.
-#[derive(Encode, Decode, Clone, Eq, PartialEq, RuntimeDebug)]
+#[derive(Encode, Decode, Clone, Eq, PartialEq, RuntimeDebug, TypeInfo)]
 pub enum Voting<Balance, AccountId, BlockNumber> {
 	/// The account is voting directly. `delegations` is the total amount of post-conviction voting
 	/// weight that it controls from those that have delegated to it.
diff --git a/frame/democracy/src/vote_threshold.rs b/frame/democracy/src/vote_threshold.rs
index feaa596921c4..ad8bce290ed4 100644
--- a/frame/democracy/src/vote_threshold.rs
+++ b/frame/democracy/src/vote_threshold.rs
@@ -19,13 +19,14 @@
 
 use crate::Tally;
 use codec::{Decode, Encode};
+use scale_info::TypeInfo;
 #[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 use sp_runtime::traits::{IntegerSquareRoot, Zero};
 use sp_std::ops::{Add, Div, Mul, Rem};
 
 /// A means of determining if a vote is past pass threshold.
-#[derive(Clone, Copy, PartialEq, Eq, Encode, Decode, sp_runtime::RuntimeDebug)]
+#[derive(Clone, Copy, PartialEq, Eq, Encode, Decode, sp_runtime::RuntimeDebug, TypeInfo)]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 pub enum VoteThreshold {
 	/// A supermajority of approvals is needed to pass this vote.
diff --git a/frame/election-provider-multi-phase/Cargo.toml b/frame/election-provider-multi-phase/Cargo.toml
index 2dca7ed0a4f9..b2d50321e8cd 100644
--- a/frame/election-provider-multi-phase/Cargo.toml
+++ b/frame/election-provider-multi-phase/Cargo.toml
@@ -17,6 +17,7 @@ static_assertions = "1.1.0"
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
 	"derive",
 ] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 log = { version = "0.4.14", default-features = false }
 
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
@@ -55,6 +56,7 @@ frame-benchmarking = { version = "4.0.0-dev", path = "../benchmarking" }
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"log/std",
 
 	"frame-support/std",
diff --git a/frame/election-provider-multi-phase/src/benchmarking.rs b/frame/election-provider-multi-phase/src/benchmarking.rs
index bca9c359d47f..fb5adda52e16 100644
--- a/frame/election-provider-multi-phase/src/benchmarking.rs
+++ b/frame/election-provider-multi-phase/src/benchmarking.rs
@@ -353,7 +353,10 @@ frame_benchmarking::benchmarks! {
 
 		// encode the most significant storage item that needs to be decoded in the dispatch.
 		let encoded_snapshot = <MultiPhase<T>>::snapshot().ok_or("missing snapshot")?.encode();
-		let encoded_call = <Call<T>>::submit_unsigned(Box::new(raw_solution.clone()), witness).encode();
+		let encoded_call = Call::<T>::submit_unsigned {
+			raw_solution: Box::new(raw_solution.clone()),
+			witness
+		}.encode();
 	}: {
 		assert_ok!(
 			<MultiPhase<T>>::submit_unsigned(
diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index a3b6083914ca..269057b55b09 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -217,6 +217,7 @@ use frame_support::{
 	weights::{DispatchClass, Weight},
 };
 use frame_system::{ensure_none, offchain::SendTransactionTypes};
+use scale_info::TypeInfo;
 use sp_arithmetic::{
 	traits::{CheckedAdd, Saturating, Zero},
 	UpperOf,
@@ -311,7 +312,7 @@ impl<T: Config> ElectionProvider<T::AccountId, T::BlockNumber> for NoFallback<T>
 }
 
 /// Current phase of the pallet.
-#[derive(PartialEq, Eq, Clone, Copy, Encode, Decode, Debug)]
+#[derive(PartialEq, Eq, Clone, Copy, Encode, Decode, Debug, TypeInfo)]
 pub enum Phase<Bn> {
 	/// Nothing, the election is not happening.
 	Off,
@@ -373,7 +374,7 @@ impl<Bn: PartialEq + Eq> Phase<Bn> {
 }
 
 /// The type of `Computation` that provided this election data.
-#[derive(PartialEq, Eq, Clone, Copy, Encode, Decode, Debug)]
+#[derive(PartialEq, Eq, Clone, Copy, Encode, Decode, Debug, TypeInfo)]
 pub enum ElectionCompute {
 	/// Election was computed on-chain.
 	OnChain,
@@ -399,7 +400,7 @@ impl Default for ElectionCompute {
 ///
 /// Such a solution should never become effective in anyway before being checked by the
 /// `Pallet::feasibility_check`.
-#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, PartialOrd, Ord)]
+#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, PartialOrd, Ord, TypeInfo)]
 pub struct RawSolution<S> {
 	/// the solution itself.
 	pub solution: S,
@@ -417,7 +418,7 @@ impl<C: Default> Default for RawSolution<C> {
 }
 
 /// A checked solution, ready to be enacted.
-#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, Default)]
+#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, Default, TypeInfo)]
 pub struct ReadySolution<A> {
 	/// The final supports of the solution.
 	///
@@ -436,7 +437,7 @@ pub struct ReadySolution<A> {
 /// [`ElectionDataProvider`] and are kept around until the round is finished.
 ///
 /// These are stored together because they are often accessed together.
-#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, Default)]
+#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, Default, TypeInfo)]
 pub struct RoundSnapshot<A> {
 	/// All of the voters.
 	pub voters: Vec<(A, VoteWeight, Vec<A>)>,
@@ -449,7 +450,7 @@ pub struct RoundSnapshot<A> {
 /// This is stored automatically on-chain, and it contains the **size of the entire snapshot**.
 /// This is also used in dispatchables as weight witness data and should **only contain the size of
 /// the presented solution**, not the entire snapshot.
-#[derive(PartialEq, Eq, Clone, Copy, Encode, Decode, Debug, Default)]
+#[derive(PartialEq, Eq, Clone, Copy, Encode, Decode, Debug, Default, TypeInfo)]
 pub struct SolutionOrSnapshotSize {
 	/// The length of voters.
 	#[codec(compact)]
@@ -643,7 +644,8 @@ pub mod pallet {
 			+ Clone
 			+ sp_std::fmt::Debug
 			+ Ord
-			+ NposSolution;
+			+ NposSolution
+			+ TypeInfo;
 
 		/// Configuration for the fallback
 		type Fallback: ElectionProvider<
@@ -949,7 +951,8 @@ pub mod pallet {
 			// create the submission
 			let deposit = Self::deposit_for(&raw_solution, size);
 			let reward = {
-				let call = Call::submit(raw_solution.clone(), num_signed_submissions);
+				let call =
+					Call::submit { raw_solution: raw_solution.clone(), num_signed_submissions };
 				let call_fee = T::EstimateCallFee::estimate_call_fee(&call, None.into());
 				T::SignedRewardBase::get().saturating_add(call_fee)
 			};
@@ -985,10 +988,6 @@ pub mod pallet {
 	}
 
 	#[pallet::event]
-	#[pallet::metadata(
-		<T as frame_system::Config>::AccountId = "AccountId",
-		BalanceOf<T> = "Balance"
-	)]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
 	pub enum Event<T: Config> {
 		/// A solution was stored with the given compute.
@@ -1042,14 +1041,14 @@ pub mod pallet {
 	impl<T: Config> ValidateUnsigned for Pallet<T> {
 		type Call = Call<T>;
 		fn validate_unsigned(source: TransactionSource, call: &Self::Call) -> TransactionValidity {
-			if let Call::submit_unsigned(solution, _) = call {
+			if let Call::submit_unsigned { raw_solution, .. } = call {
 				// Discard solution not coming from the local OCW.
 				match source {
 					TransactionSource::Local | TransactionSource::InBlock => { /* allowed */ },
 					_ => return InvalidTransaction::Call.into(),
 				}
 
-				let _ = Self::unsigned_pre_dispatch_checks(solution)
+				let _ = Self::unsigned_pre_dispatch_checks(raw_solution)
 					.map_err(|err| {
 						log!(debug, "unsigned transaction validation failed due to {:?}", err);
 						err
@@ -1060,11 +1059,11 @@ pub mod pallet {
 					// The higher the score[0], the better a solution is.
 					.priority(
 						T::MinerTxPriority::get()
-							.saturating_add(solution.score[0].saturated_into()),
+							.saturating_add(raw_solution.score[0].saturated_into()),
 					)
 					// Used to deduplicate unsigned solutions: each validator should produce one
 					// solution per round at most, and solutions are not propagate.
-					.and_provides(solution.round)
+					.and_provides(raw_solution.round)
 					// Transaction should stay in the pool for the duration of the unsigned phase.
 					.longevity(T::UnsignedPhase::get().saturated_into::<u64>())
 					// We don't propagate this. This can never be validated at a remote node.
@@ -1076,8 +1075,8 @@ pub mod pallet {
 		}
 
 		fn pre_dispatch(call: &Self::Call) -> Result<(), TransactionValidityError> {
-			if let Call::submit_unsigned(solution, _) = call {
-				Self::unsigned_pre_dispatch_checks(solution)
+			if let Call::submit_unsigned { raw_solution, .. } = call {
+				Self::unsigned_pre_dispatch_checks(raw_solution)
 					.map_err(dispatch_error_to_invalid)
 					.map_err(Into::into)
 			} else {
diff --git a/frame/election-provider-multi-phase/src/signed.rs b/frame/election-provider-multi-phase/src/signed.rs
index 72aa3e668034..61215059c53a 100644
--- a/frame/election-provider-multi-phase/src/signed.rs
+++ b/frame/election-provider-multi-phase/src/signed.rs
@@ -42,7 +42,7 @@ use sp_std::{
 /// A raw, unchecked signed submission.
 ///
 /// This is just a wrapper around [`RawSolution`] and some additional info.
-#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, Default)]
+#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, Default, scale_info::TypeInfo)]
 pub struct SignedSubmission<AccountId, Balance: HasCompact, Solution> {
 	/// Who submitted this solution.
 	pub who: AccountId,
diff --git a/frame/election-provider-multi-phase/src/unsigned.rs b/frame/election-provider-multi-phase/src/unsigned.rs
index 0afb6eee1612..af0b79177d86 100644
--- a/frame/election-provider-multi-phase/src/unsigned.rs
+++ b/frame/election-provider-multi-phase/src/unsigned.rs
@@ -160,9 +160,9 @@ impl<T: Config> Pallet<T> {
 		let call = restore_solution::<T>()
 			.and_then(|call| {
 				// ensure the cached call is still current before submitting
-				if let Call::submit_unsigned(solution, _) = &call {
+				if let Call::submit_unsigned { raw_solution, .. } = &call {
 					// prevent errors arising from state changes in a forkful chain
-					Self::basic_checks(solution, "restored")?;
+					Self::basic_checks(raw_solution, "restored")?;
 					Ok(call)
 				} else {
 					Err(MinerError::SolutionCallInvalid)
@@ -213,7 +213,8 @@ impl<T: Config> Pallet<T> {
 		let (raw_solution, witness) = Self::mine_and_check()?;
 
 		let score = raw_solution.score.clone();
-		let call: Call<T> = Call::submit_unsigned(Box::new(raw_solution), witness).into();
+		let call: Call<T> =
+			Call::submit_unsigned { raw_solution: Box::new(raw_solution), witness }.into();
 
 		log!(
 			debug,
@@ -763,7 +764,10 @@ mod tests {
 		ExtBuilder::default().desired_targets(0).build_and_execute(|| {
 			let solution =
 				RawSolution::<TestNposSolution> { score: [5, 0, 0], ..Default::default() };
-			let call = Call::submit_unsigned(Box::new(solution.clone()), witness());
+			let call = Call::submit_unsigned {
+				raw_solution: Box::new(solution.clone()),
+				witness: witness(),
+			};
 
 			// initial
 			assert_eq!(MultiPhase::current_phase(), Phase::Off);
@@ -833,7 +837,10 @@ mod tests {
 
 			let solution =
 				RawSolution::<TestNposSolution> { score: [5, 0, 0], ..Default::default() };
-			let call = Call::submit_unsigned(Box::new(solution.clone()), witness());
+			let call = Call::submit_unsigned {
+				raw_solution: Box::new(solution.clone()),
+				witness: witness(),
+			};
 
 			// initial
 			assert!(<MultiPhase as ValidateUnsigned>::validate_unsigned(
@@ -870,7 +877,8 @@ mod tests {
 			assert!(MultiPhase::current_phase().is_unsigned());
 
 			let raw = RawSolution::<TestNposSolution> { score: [5, 0, 0], ..Default::default() };
-			let call = Call::submit_unsigned(Box::new(raw.clone()), witness());
+			let call =
+				Call::submit_unsigned { raw_solution: Box::new(raw.clone()), witness: witness() };
 			assert_eq!(raw.solution.unique_targets().len(), 0);
 
 			// won't work anymore.
@@ -896,7 +904,10 @@ mod tests {
 
 				let solution =
 					RawSolution::<TestNposSolution> { score: [5, 0, 0], ..Default::default() };
-				let call = Call::submit_unsigned(Box::new(solution.clone()), witness());
+				let call = Call::submit_unsigned {
+					raw_solution: Box::new(solution.clone()),
+					witness: witness(),
+				};
 
 				assert_eq!(
 					<MultiPhase as ValidateUnsigned>::validate_unsigned(
@@ -923,7 +934,10 @@ mod tests {
 			// This is in itself an invalid BS solution.
 			let solution =
 				RawSolution::<TestNposSolution> { score: [5, 0, 0], ..Default::default() };
-			let call = Call::submit_unsigned(Box::new(solution.clone()), witness());
+			let call = Call::submit_unsigned {
+				raw_solution: Box::new(solution.clone()),
+				witness: witness(),
+			};
 			let outer_call: OuterCall = call.into();
 			let _ = outer_call.dispatch(Origin::none());
 		})
@@ -944,7 +958,10 @@ mod tests {
 			let mut correct_witness = witness();
 			correct_witness.voters += 1;
 			correct_witness.targets -= 1;
-			let call = Call::submit_unsigned(Box::new(solution.clone()), correct_witness);
+			let call = Call::submit_unsigned {
+				raw_solution: Box::new(solution.clone()),
+				witness: correct_witness,
+			};
 			let outer_call: OuterCall = call.into();
 			let _ = outer_call.dispatch(Origin::none());
 		})
@@ -1350,7 +1367,7 @@ mod tests {
 			let encoded = pool.read().transactions[0].clone();
 			let extrinsic: Extrinsic = codec::Decode::decode(&mut &*encoded).unwrap();
 			let call = extrinsic.call;
-			assert!(matches!(call, OuterCall::MultiPhase(Call::submit_unsigned(..))));
+			assert!(matches!(call, OuterCall::MultiPhase(Call::submit_unsigned { .. })));
 		})
 	}
 
@@ -1367,7 +1384,7 @@ mod tests {
 			let encoded = pool.read().transactions[0].clone();
 			let extrinsic = Extrinsic::decode(&mut &*encoded).unwrap();
 			let call = match extrinsic.call {
-				OuterCall::MultiPhase(call @ Call::submit_unsigned(..)) => call,
+				OuterCall::MultiPhase(call @ Call::submit_unsigned { .. }) => call,
 				_ => panic!("bad call: unexpected submission"),
 			};
 
diff --git a/frame/election-provider-support/Cargo.toml b/frame/election-provider-support/Cargo.toml
index d713b98fcefa..dfe2b1102433 100644
--- a/frame/election-provider-support/Cargo.toml
+++ b/frame/election-provider-support/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-arithmetic = { version = "4.0.0-dev", default-features = false, path = "../../primitives/arithmetic" }
 sp-npos-elections = { version = "4.0.0-dev", default-features = false, path = "../../primitives/npos-elections" }
diff --git a/frame/elections-phragmen/Cargo.toml b/frame/elections-phragmen/Cargo.toml
index 930c9c2c8083..f2771a9f7278 100644
--- a/frame/elections-phragmen/Cargo.toml
+++ b/frame/elections-phragmen/Cargo.toml
@@ -16,6 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
 	"derive",
 ] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 sp-npos-elections = { version = "4.0.0-dev", default-features = false, path = "../../primitives/npos-elections" }
 sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
@@ -35,6 +36,7 @@ substrate-test-utils = { version = "4.0.0-dev", path = "../../test-utils" }
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"frame-support/std",
 	"sp-runtime/std",
 	"sp-npos-elections/std",
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index 8e0a31377f98..d7b42383da75 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -108,6 +108,7 @@ use frame_support::{
 	},
 	weights::Weight,
 };
+use scale_info::TypeInfo;
 use sp_npos_elections::{ElectionResult, ExtendedBalance};
 use sp_runtime::{
 	traits::{Saturating, StaticLookup, Zero},
@@ -135,7 +136,7 @@ type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<
 >>::NegativeImbalance;
 
 /// An indication that the renouncing account currently has which of the below roles.
-#[derive(Encode, Decode, Clone, PartialEq, RuntimeDebug)]
+#[derive(Encode, Decode, Clone, PartialEq, RuntimeDebug, TypeInfo)]
 pub enum Renouncing {
 	/// A member is renouncing.
 	Member,
@@ -146,7 +147,7 @@ pub enum Renouncing {
 }
 
 /// An active voter.
-#[derive(Encode, Decode, Clone, Default, RuntimeDebug, PartialEq)]
+#[derive(Encode, Decode, Clone, Default, RuntimeDebug, PartialEq, TypeInfo)]
 pub struct Voter<AccountId, Balance> {
 	/// The members being backed.
 	pub votes: Vec<AccountId>,
@@ -159,7 +160,7 @@ pub struct Voter<AccountId, Balance> {
 }
 
 /// A holder of a seat as either a member or a runner-up.
-#[derive(Encode, Decode, Clone, Default, RuntimeDebug, PartialEq)]
+#[derive(Encode, Decode, Clone, Default, RuntimeDebug, PartialEq, TypeInfo)]
 pub struct SeatHolder<AccountId, Balance> {
 	/// The holder.
 	pub who: AccountId,
@@ -531,11 +532,6 @@ pub mod pallet {
 	}
 
 	#[pallet::event]
-	#[pallet::metadata(
-		<T as frame_system::Config>::AccountId = "AccountId",
-		BalanceOf<T> = "Balance",
-		Vec<(<T as frame_system::Config>::AccountId, BalanceOf<T>)> = "Vec<(AccountId, Balance)>",
-	)]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
 	pub enum Event<T: Config> {
 		/// A new term with \[new_members\]. This indicates that enough candidates existed to run
diff --git a/frame/elections/Cargo.toml b/frame/elections/Cargo.toml
index 29bc8f8a5cea..8557cfba6b58 100644
--- a/frame/elections/Cargo.toml
+++ b/frame/elections/Cargo.toml
@@ -16,6 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
 	"derive",
 ] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
@@ -30,6 +31,7 @@ pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"sp-core/std",
 	"sp-std/std",
 	"sp-io/std",
diff --git a/frame/elections/src/lib.rs b/frame/elections/src/lib.rs
index 5057a6e00f56..ac13bce31b0f 100644
--- a/frame/elections/src/lib.rs
+++ b/frame/elections/src/lib.rs
@@ -111,7 +111,9 @@ mod tests;
 // entries before they increase the capacity.
 
 /// The activity status of a voter.
-#[derive(PartialEq, Eq, Copy, Clone, Encode, Decode, Default, RuntimeDebug)]
+#[derive(
+	PartialEq, Eq, Copy, Clone, Encode, Decode, Default, RuntimeDebug, scale_info::TypeInfo,
+)]
 pub struct VoterInfo<Balance> {
 	/// Last VoteIndex in which this voter assigned (or initialized) approvals.
 	last_active: VoteIndex,
@@ -462,7 +464,6 @@ pub mod pallet {
 
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
-	#[pallet::metadata(T::AccountId = "AccountId", Vec<T::AccountId> = "Vec<AccountId>")]
 	pub enum Event<T: Config> {
 		/// Reaped \[voter, reaper\].
 		VoterReaped(T::AccountId, T::AccountId),
diff --git a/frame/example-offchain-worker/Cargo.toml b/frame/example-offchain-worker/Cargo.toml
index 69a562174862..1ccd9f33f031 100644
--- a/frame/example-offchain-worker/Cargo.toml
+++ b/frame/example-offchain-worker/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
@@ -28,6 +29,7 @@ log = { version = "0.4.14", default-features = false }
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"frame-support/std",
 	"frame-system/std",
 	"lite-json/std",
diff --git a/frame/example-offchain-worker/src/lib.rs b/frame/example-offchain-worker/src/lib.rs
index 9e043c8bfb25..644e1ca299a3 100644
--- a/frame/example-offchain-worker/src/lib.rs
+++ b/frame/example-offchain-worker/src/lib.rs
@@ -294,8 +294,10 @@ pub mod pallet {
 		/// are being whitelisted and marked as valid.
 		fn validate_unsigned(_source: TransactionSource, call: &Self::Call) -> TransactionValidity {
 			// Firstly let's check that we call the right function.
-			if let Call::submit_price_unsigned_with_signed_payload(ref payload, ref signature) =
-				call
+			if let Call::submit_price_unsigned_with_signed_payload {
+				price_payload: ref payload,
+				ref signature,
+			} = call
 			{
 				let signature_valid =
 					SignedPayload::<T>::verify::<T::AuthorityId>(payload, signature.clone());
@@ -303,7 +305,7 @@ pub mod pallet {
 					return InvalidTransaction::BadProof.into()
 				}
 				Self::validate_transaction_parameters(&payload.block_number, &payload.price)
-			} else if let Call::submit_price_unsigned(block_number, new_price) = call {
+			} else if let Call::submit_price_unsigned { block_number, price: new_price } = call {
 				Self::validate_transaction_parameters(block_number, new_price)
 			} else {
 				InvalidTransaction::Call.into()
@@ -330,7 +332,7 @@ pub mod pallet {
 
 /// Payload used by this example crate to hold price
 /// data required to submit a transaction.
-#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug)]
+#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, scale_info::TypeInfo)]
 pub struct PricePayload<Public, BlockNumber> {
 	block_number: BlockNumber,
 	price: u32,
@@ -443,7 +445,7 @@ impl<T: Config> Pallet<T> {
 			// Received price is wrapped into a call to `submit_price` public function of this
 			// pallet. This means that the transaction, when executed, will simply call that
 			// function passing `price` as an argument.
-			Call::submit_price(price)
+			Call::submit_price { price }
 		});
 
 		for (acc, res) in &results {
@@ -472,7 +474,7 @@ impl<T: Config> Pallet<T> {
 		// Received price is wrapped into a call to `submit_price_unsigned` public function of this
 		// pallet. This means that the transaction, when executed, will simply call that function
 		// passing `price` as an argument.
-		let call = Call::submit_price_unsigned(block_number, price);
+		let call = Call::submit_price_unsigned { block_number, price };
 
 		// Now let's create a transaction out of this call and submit it to the pool.
 		// Here we showcase two ways to send an unsigned transaction / unsigned payload (raw)
@@ -507,8 +509,9 @@ impl<T: Config> Pallet<T> {
 		let (_, result) = Signer::<T, T::AuthorityId>::any_account()
 			.send_unsigned_transaction(
 				|account| PricePayload { price, block_number, public: account.public.clone() },
-				|payload, signature| {
-					Call::submit_price_unsigned_with_signed_payload(payload, signature)
+				|payload, signature| Call::submit_price_unsigned_with_signed_payload {
+					price_payload: payload,
+					signature,
 				},
 			)
 			.ok_or("No local accounts accounts available.")?;
@@ -536,8 +539,9 @@ impl<T: Config> Pallet<T> {
 		let transaction_results = Signer::<T, T::AuthorityId>::all_accounts()
 			.send_unsigned_transaction(
 				|account| PricePayload { price, block_number, public: account.public.clone() },
-				|payload, signature| {
-					Call::submit_price_unsigned_with_signed_payload(payload, signature)
+				|payload, signature| Call::submit_price_unsigned_with_signed_payload {
+					price_payload: payload,
+					signature,
 				},
 			);
 		for (_account_id, result) in transaction_results.into_iter() {
diff --git a/frame/example-offchain-worker/src/tests.rs b/frame/example-offchain-worker/src/tests.rs
index d0a3664abf4a..1dde8a1df60c 100644
--- a/frame/example-offchain-worker/src/tests.rs
+++ b/frame/example-offchain-worker/src/tests.rs
@@ -227,7 +227,7 @@ fn should_submit_signed_transaction_on_chain() {
 		assert!(pool_state.read().transactions.is_empty());
 		let tx = Extrinsic::decode(&mut &*tx).unwrap();
 		assert_eq!(tx.signature.unwrap().0, 0);
-		assert_eq!(tx.call, Call::Example(crate::Call::submit_price(15523)));
+		assert_eq!(tx.call, Call::Example(crate::Call::submit_price { price: 15523 }));
 	});
 }
 
@@ -273,10 +273,10 @@ fn should_submit_unsigned_transaction_on_chain_for_any_account() {
 		let tx = pool_state.write().transactions.pop().unwrap();
 		let tx = Extrinsic::decode(&mut &*tx).unwrap();
 		assert_eq!(tx.signature, None);
-		if let Call::Example(crate::Call::submit_price_unsigned_with_signed_payload(
-			body,
+		if let Call::Example(crate::Call::submit_price_unsigned_with_signed_payload {
+			price_payload: body,
 			signature,
-		)) = tx.call
+		}) = tx.call
 		{
 			assert_eq!(body, price_payload);
 
@@ -333,10 +333,10 @@ fn should_submit_unsigned_transaction_on_chain_for_all_accounts() {
 		let tx = pool_state.write().transactions.pop().unwrap();
 		let tx = Extrinsic::decode(&mut &*tx).unwrap();
 		assert_eq!(tx.signature, None);
-		if let Call::Example(crate::Call::submit_price_unsigned_with_signed_payload(
-			body,
+		if let Call::Example(crate::Call::submit_price_unsigned_with_signed_payload {
+			price_payload: body,
 			signature,
-		)) = tx.call
+		}) = tx.call
 		{
 			assert_eq!(body, price_payload);
 
@@ -373,7 +373,10 @@ fn should_submit_raw_unsigned_transaction_on_chain() {
 		assert!(pool_state.read().transactions.is_empty());
 		let tx = Extrinsic::decode(&mut &*tx).unwrap();
 		assert_eq!(tx.signature, None);
-		assert_eq!(tx.call, Call::Example(crate::Call::submit_price_unsigned(1, 15523)));
+		assert_eq!(
+			tx.call,
+			Call::Example(crate::Call::submit_price_unsigned { block_number: 1, price: 15523 })
+		);
 	});
 }
 
diff --git a/frame/example-parallel/Cargo.toml b/frame/example-parallel/Cargo.toml
index 4d14d635201f..5e0f6d4bc255 100644
--- a/frame/example-parallel/Cargo.toml
+++ b/frame/example-parallel/Cargo.toml
@@ -13,6 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
@@ -25,6 +26,7 @@ sp-tasks = { version = "4.0.0-dev", default-features = false, path = "../../prim
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"frame-support/std",
 	"frame-system/std",
 	"sp-core/std",
diff --git a/frame/example-parallel/src/lib.rs b/frame/example-parallel/src/lib.rs
index c41cd2401dd2..c86cac429568 100644
--- a/frame/example-parallel/src/lib.rs
+++ b/frame/example-parallel/src/lib.rs
@@ -95,7 +95,7 @@ pub mod pallet {
 }
 
 /// Request to enlist participant.
-#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug)]
+#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, scale_info::TypeInfo)]
 pub struct EnlistedParticipant {
 	pub account: Vec<u8>,
 	pub signature: Vec<u8>,
diff --git a/frame/example/Cargo.toml b/frame/example/Cargo.toml
index 08d7af4ef673..58daaf1c7555 100644
--- a/frame/example/Cargo.toml
+++ b/frame/example/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 pallet-balances = { version = "4.0.0-dev", default-features = false, path = "../balances" }
@@ -35,6 +36,7 @@ std = [
 	"frame-system/std",
 	"log/std",
 	"pallet-balances/std",
+	"scale-info/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std"
diff --git a/frame/example/src/lib.rs b/frame/example/src/lib.rs
index f588e11a6164..3f56b57dac8c 100644
--- a/frame/example/src/lib.rs
+++ b/frame/example/src/lib.rs
@@ -277,6 +277,7 @@ use frame_support::{
 };
 use frame_system::ensure_signed;
 use log::info;
+use scale_info::TypeInfo;
 use sp_runtime::{
 	traits::{Bounded, DispatchInfoOf, SaturatedConversion, Saturating, SignedExtension},
 	transaction_validity::{
@@ -688,12 +689,13 @@ impl<T: Config> Pallet<T> {
 // types defined in the runtime. Lookup `pub type SignedExtra = (...)` in `node/runtime` and
 // `node-template` for an example of this.
 
-// A simple signed extension that checks for the `set_dummy` call. In that case, it increases the
-// priority and prints some log.
-//
-// Additionally, it drops any transaction with an encoded length higher than 200 bytes. No
-// particular reason why, just to demonstrate the power of signed extensions.
-#[derive(Encode, Decode, Clone, Eq, PartialEq)]
+/// A simple signed extension that checks for the `set_dummy` call. In that case, it increases the
+/// priority and prints some log.
+///
+/// Additionally, it drops any transaction with an encoded length higher than 200 bytes. No
+/// particular reason why, just to demonstrate the power of signed extensions.
+#[derive(Encode, Decode, Clone, Eq, PartialEq, TypeInfo)]
+#[scale_info(skip_type_params(T))]
 pub struct WatchDummy<T: Config + Send + Sync>(PhantomData<T>);
 
 impl<T: Config + Send + Sync> sp_std::fmt::Debug for WatchDummy<T> {
@@ -730,7 +732,7 @@ where
 
 		// check for `set_dummy`
 		match call.is_sub_type() {
-			Some(Call::set_dummy(..)) => {
+			Some(Call::set_dummy { .. }) => {
 				sp_runtime::print("set_dummy was received.");
 
 				let mut valid_tx = ValidTransaction::default();
diff --git a/frame/example/src/tests.rs b/frame/example/src/tests.rs
index 645b5c9bc13a..87c2404f5b10 100644
--- a/frame/example/src/tests.rs
+++ b/frame/example/src/tests.rs
@@ -163,7 +163,7 @@ fn set_dummy_works() {
 #[test]
 fn signed_ext_watch_dummy_works() {
 	new_test_ext().execute_with(|| {
-		let call = <pallet_example::Call<Test>>::set_dummy(10).into();
+		let call = pallet_example::Call::set_dummy { new_value: 10 }.into();
 		let info = DispatchInfo::default();
 
 		assert_eq!(
@@ -183,14 +183,14 @@ fn signed_ext_watch_dummy_works() {
 #[test]
 fn weights_work() {
 	// must have a defined weight.
-	let default_call = <pallet_example::Call<Test>>::accumulate_dummy(10);
+	let default_call = pallet_example::Call::<Test>::accumulate_dummy { increase_by: 10 };
 	let info1 = default_call.get_dispatch_info();
 	// aka. `let info = <Call<Test> as GetDispatchInfo>::get_dispatch_info(&default_call);`
 	assert!(info1.weight > 0);
 
 	// `set_dummy` is simpler than `accumulate_dummy`, and the weight
 	//   should be less.
-	let custom_call = <pallet_example::Call<Test>>::set_dummy(20);
+	let custom_call = pallet_example::Call::<Test>::set_dummy { new_value: 20 };
 	let info2 = custom_call.get_dispatch_info();
 	assert!(info1.weight > info2.weight);
 }
diff --git a/frame/executive/Cargo.toml b/frame/executive/Cargo.toml
index a809da6f1cd3..1abbf50e6a4c 100644
--- a/frame/executive/Cargo.toml
+++ b/frame/executive/Cargo.toml
@@ -16,6 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
 	"derive",
 ] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
@@ -38,6 +39,7 @@ default = ["std"]
 with-tracing = ["sp-tracing/with-tracing"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"frame-support/std",
 	"frame-system/std",
 	"sp-core/std",
diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index 5f1ae23c2f53..655a38fe1b54 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -645,7 +645,7 @@ mod tests {
 				None
 			}
 			fn is_inherent(call: &Self::Call) -> bool {
-				*call == Call::<T>::inherent_call()
+				*call == Call::<T>::inherent_call {}
 			}
 		}
 
@@ -658,7 +658,7 @@ mod tests {
 				call: &Self::Call,
 			) -> TransactionValidity {
 				match call {
-					Call::allowed_unsigned(..) => Ok(Default::default()),
+					Call::allowed_unsigned { .. } => Ok(Default::default()),
 					_ => UnknownTransaction::NoUnsignedValidator.into(),
 				}
 			}
@@ -666,8 +666,8 @@ mod tests {
 			// Inherent call is accepted for being dispatched
 			fn pre_dispatch(call: &Self::Call) -> Result<(), TransactionValidityError> {
 				match call {
-					Call::allowed_unsigned(..) => Ok(()),
-					Call::inherent_call(..) => Ok(()),
+					Call::allowed_unsigned { .. } => Ok(()),
+					Call::inherent_call { .. } => Ok(()),
 					_ => Err(UnknownTransaction::NoUnsignedValidator.into()),
 				}
 			}
@@ -809,13 +809,17 @@ mod tests {
 		Some((who, extra(nonce, fee)))
 	}
 
+	fn call_transfer(dest: u64, value: u64) -> Call {
+		Call::Balances(BalancesCall::transfer { dest, value })
+	}
+
 	#[test]
 	fn balance_transfer_dispatch_works() {
 		let mut t = frame_system::GenesisConfig::default().build_storage::<Runtime>().unwrap();
 		pallet_balances::GenesisConfig::<Runtime> { balances: vec![(1, 211)] }
 			.assimilate_storage(&mut t)
 			.unwrap();
-		let xt = TestXt::new(Call::Balances(BalancesCall::transfer(2, 69)), sign_extra(1, 0, 0));
+		let xt = TestXt::new(call_transfer(2, 69), sign_extra(1, 0, 0));
 		let weight = xt.get_dispatch_info().weight +
 			<Runtime as frame_system::Config>::BlockWeights::get()
 				.get(DispatchClass::Normal)
@@ -912,7 +916,7 @@ mod tests {
 	fn bad_extrinsic_not_inserted() {
 		let mut t = new_test_ext(1);
 		// bad nonce check!
-		let xt = TestXt::new(Call::Balances(BalancesCall::transfer(33, 69)), sign_extra(1, 30, 0));
+		let xt = TestXt::new(call_transfer(33, 69), sign_extra(1, 30, 0));
 		t.execute_with(|| {
 			Executive::initialize_block(&Header::new(
 				1,
@@ -933,7 +937,10 @@ mod tests {
 	fn block_weight_limit_enforced() {
 		let mut t = new_test_ext(10000);
 		// given: TestXt uses the encoded len as fixed Len:
-		let xt = TestXt::new(Call::Balances(BalancesCall::transfer(33, 0)), sign_extra(1, 0, 0));
+		let xt = TestXt::new(
+			Call::Balances(BalancesCall::transfer { dest: 33, value: 0 }),
+			sign_extra(1, 0, 0),
+		);
 		let encoded = xt.encode();
 		let encoded_len = encoded.len() as Weight;
 		// on_initialize weight + base block execution weight
@@ -954,7 +961,7 @@ mod tests {
 
 			for nonce in 0..=num_to_exhaust_block {
 				let xt = TestXt::new(
-					Call::Balances(BalancesCall::transfer(33, 0)),
+					Call::Balances(BalancesCall::transfer { dest: 33, value: 0 }),
 					sign_extra(1, nonce.into(), 0),
 				);
 				let res = Executive::apply_extrinsic(xt);
@@ -978,9 +985,18 @@ mod tests {
 
 	#[test]
 	fn block_weight_and_size_is_stored_per_tx() {
-		let xt = TestXt::new(Call::Balances(BalancesCall::transfer(33, 0)), sign_extra(1, 0, 0));
-		let x1 = TestXt::new(Call::Balances(BalancesCall::transfer(33, 0)), sign_extra(1, 1, 0));
-		let x2 = TestXt::new(Call::Balances(BalancesCall::transfer(33, 0)), sign_extra(1, 2, 0));
+		let xt = TestXt::new(
+			Call::Balances(BalancesCall::transfer { dest: 33, value: 0 }),
+			sign_extra(1, 0, 0),
+		);
+		let x1 = TestXt::new(
+			Call::Balances(BalancesCall::transfer { dest: 33, value: 0 }),
+			sign_extra(1, 1, 0),
+		);
+		let x2 = TestXt::new(
+			Call::Balances(BalancesCall::transfer { dest: 33, value: 0 }),
+			sign_extra(1, 2, 0),
+		);
 		let len = xt.clone().encode().len() as u32;
 		let mut t = new_test_ext(1);
 		t.execute_with(|| {
@@ -1034,8 +1050,8 @@ mod tests {
 
 	#[test]
 	fn validate_unsigned() {
-		let valid = TestXt::new(Call::Custom(custom::Call::allowed_unsigned()), None);
-		let invalid = TestXt::new(Call::Custom(custom::Call::unallowed_unsigned()), None);
+		let valid = TestXt::new(Call::Custom(custom::Call::allowed_unsigned {}), None);
+		let invalid = TestXt::new(Call::Custom(custom::Call::unallowed_unsigned {}), None);
 		let mut t = new_test_ext(1);
 
 		let mut default_with_prio_3 = ValidTransaction::default();
@@ -1074,8 +1090,10 @@ mod tests {
 				<pallet_balances::Pallet<Runtime> as LockableCurrency<Balance>>::set_lock(
 					id, &1, 110, lock,
 				);
-				let xt =
-					TestXt::new(Call::System(SystemCall::remark(vec![1u8])), sign_extra(1, 0, 0));
+				let xt = TestXt::new(
+					Call::System(SystemCall::remark { remark: vec![1u8] }),
+					sign_extra(1, 0, 0),
+				);
 				let weight = xt.get_dispatch_info().weight +
 					<Runtime as frame_system::Config>::BlockWeights::get()
 						.get(DispatchClass::Normal)
@@ -1222,7 +1240,10 @@ mod tests {
 	/// used through the `ExecuteBlock` trait.
 	#[test]
 	fn custom_runtime_upgrade_is_called_when_using_execute_block_trait() {
-		let xt = TestXt::new(Call::Balances(BalancesCall::transfer(33, 0)), sign_extra(1, 0, 0));
+		let xt = TestXt::new(
+			Call::Balances(BalancesCall::transfer { dest: 33, value: 0 }),
+			sign_extra(1, 0, 0),
+		);
 
 		let header = new_test_ext(1).execute_with(|| {
 			// Make sure `on_runtime_upgrade` is called.
@@ -1326,7 +1347,7 @@ mod tests {
 
 	#[test]
 	fn calculating_storage_root_twice_works() {
-		let call = Call::Custom(custom::Call::calculate_storage_root());
+		let call = Call::Custom(custom::Call::calculate_storage_root {});
 		let xt = TestXt::new(call, sign_extra(1, 0, 0));
 
 		let header = new_test_ext(1).execute_with(|| {
@@ -1352,8 +1373,11 @@ mod tests {
 	#[test]
 	#[should_panic(expected = "Invalid inherent position for extrinsic at index 1")]
 	fn invalid_inherent_position_fail() {
-		let xt1 = TestXt::new(Call::Balances(BalancesCall::transfer(33, 0)), sign_extra(1, 0, 0));
-		let xt2 = TestXt::new(Call::Custom(custom::Call::inherent_call()), None);
+		let xt1 = TestXt::new(
+			Call::Balances(BalancesCall::transfer { dest: 33, value: 0 }),
+			sign_extra(1, 0, 0),
+		);
+		let xt2 = TestXt::new(Call::Custom(custom::Call::inherent_call {}), None);
 
 		let header = new_test_ext(1).execute_with(|| {
 			// Let's build some fake block.
@@ -1378,8 +1402,8 @@ mod tests {
 
 	#[test]
 	fn valid_inherents_position_works() {
-		let xt1 = TestXt::new(Call::Custom(custom::Call::inherent_call()), None);
-		let xt2 = TestXt::new(Call::Balances(BalancesCall::transfer(33, 0)), sign_extra(1, 0, 0));
+		let xt1 = TestXt::new(Call::Custom(custom::Call::inherent_call {}), None);
+		let xt2 = TestXt::new(call_transfer(33, 0), sign_extra(1, 0, 0));
 
 		let header = new_test_ext(1).execute_with(|| {
 			// Let's build some fake block.
diff --git a/frame/gilt/Cargo.toml b/frame/gilt/Cargo.toml
index a6e59a2dcd65..c275b693d8f2 100644
--- a/frame/gilt/Cargo.toml
+++ b/frame/gilt/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 sp-arithmetic = { version = "4.0.0-dev", default-features = false, path = "../../primitives/arithmetic" }
@@ -30,6 +31,7 @@ pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"sp-std/std",
 	"sp-runtime/std",
 	"sp-arithmetic/std",
diff --git a/frame/gilt/src/benchmarking.rs b/frame/gilt/src/benchmarking.rs
index befa373e6e7f..55d34a35a7ce 100644
--- a/frame/gilt/src/benchmarking.rs
+++ b/frame/gilt/src/benchmarking.rs
@@ -81,7 +81,7 @@ benchmarks! {
 	}
 
 	set_target {
-		let call = Call::<T>::set_target(Default::default());
+		let call = Call::<T>::set_target { target: Default::default() };
 		let origin = T::AdminOrigin::successful_origin();
 	}: { call.dispatch_bypass_filter(origin)? }
 
@@ -111,7 +111,7 @@ benchmarks! {
 			Gilt::<T>::place_bid(RawOrigin::Signed(caller.clone()).into(), T::MinFreeze::get(), 1)?;
 		}
 
-		Call::<T>::set_target(Perquintill::from_percent(100))
+		Call::<T>::set_target { target: Perquintill::from_percent(100) }
 			.dispatch_bypass_filter(T::AdminOrigin::successful_origin())?;
 
 	}: { Gilt::<T>::pursue_target(b) }
@@ -127,7 +127,7 @@ benchmarks! {
 			Gilt::<T>::place_bid(RawOrigin::Signed(caller.clone()).into(), T::MinFreeze::get(), i + 1)?;
 		}
 
-		Call::<T>::set_target(Perquintill::from_percent(100))
+		Call::<T>::set_target { target: Perquintill::from_percent(100) }
 			.dispatch_bypass_filter(T::AdminOrigin::successful_origin())?;
 
 	}: { Gilt::<T>::pursue_target(q) }
diff --git a/frame/gilt/src/lib.rs b/frame/gilt/src/lib.rs
index 7bfca872dc3f..de114e4bb87d 100644
--- a/frame/gilt/src/lib.rs
+++ b/frame/gilt/src/lib.rs
@@ -82,6 +82,7 @@ pub mod pallet {
 		traits::{Currency, OnUnbalanced, ReservableCurrency},
 	};
 	use frame_system::pallet_prelude::*;
+	use scale_info::TypeInfo;
 	use sp_arithmetic::{PerThing, Perquintill};
 	use sp_runtime::traits::{Saturating, Zero};
 	use sp_std::prelude::*;
@@ -111,7 +112,8 @@ pub mod pallet {
 			+ MaybeSerializeDeserialize
 			+ sp_std::fmt::Debug
 			+ Default
-			+ From<u64>;
+			+ From<u64>
+			+ TypeInfo;
 
 		/// Origin required for setting the target proportion to be under gilt.
 		type AdminOrigin: EnsureOrigin<Self::Origin>;
@@ -181,7 +183,7 @@ pub mod pallet {
 	pub struct Pallet<T>(_);
 
 	/// A single bid on a gilt, an item of a *queue* in `Queues`.
-	#[derive(Clone, Eq, PartialEq, Default, Encode, Decode, RuntimeDebug)]
+	#[derive(Clone, Eq, PartialEq, Default, Encode, Decode, RuntimeDebug, TypeInfo)]
 	pub struct GiltBid<Balance, AccountId> {
 		/// The amount bid.
 		pub amount: Balance,
@@ -190,7 +192,7 @@ pub mod pallet {
 	}
 
 	/// Information representing an active gilt.
-	#[derive(Clone, Eq, PartialEq, Default, Encode, Decode, RuntimeDebug)]
+	#[derive(Clone, Eq, PartialEq, Default, Encode, Decode, RuntimeDebug, TypeInfo)]
 	pub struct ActiveGilt<Balance, AccountId, BlockNumber> {
 		/// The proportion of the effective total issuance (i.e. accounting for any eventual gilt
 		/// expansion or contraction that may eventually be claimed).
@@ -214,7 +216,7 @@ pub mod pallet {
 	/// `issuance - frozen + proportion * issuance`
 	///
 	/// where `issuance = total_issuance - IgnoredIssuance`
-	#[derive(Clone, Eq, PartialEq, Default, Encode, Decode, RuntimeDebug)]
+	#[derive(Clone, Eq, PartialEq, Default, Encode, Decode, RuntimeDebug, TypeInfo)]
 	pub struct ActiveGiltsTotal<Balance> {
 		/// The total amount of funds held in reserve for all active gilts.
 		pub frozen: Balance,
@@ -269,7 +271,6 @@ pub mod pallet {
 	}
 
 	#[pallet::event]
-	#[pallet::metadata(T::AccountId = "AccountId")]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
 	pub enum Event<T: Config> {
 		/// A bid was successfully placed.
diff --git a/frame/grandpa/Cargo.toml b/frame/grandpa/Cargo.toml
index 9e60ad0fb3c8..53ab443783e5 100644
--- a/frame/grandpa/Cargo.toml
+++ b/frame/grandpa/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../../primitives/application-crypto" }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
 sp-finality-grandpa = { version = "4.0.0-dev", default-features = false, path = "../../primitives/finality-grandpa" }
@@ -44,6 +45,7 @@ frame-election-provider-support = { version = "4.0.0-dev", path = "../election-p
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"frame-benchmarking/std",
 	"sp-application-crypto/std",
 	"sp-core/std",
diff --git a/frame/grandpa/src/equivocation.rs b/frame/grandpa/src/equivocation.rs
index 40d8535dabb6..8a23ce6e1ef1 100644
--- a/frame/grandpa/src/equivocation.rs
+++ b/frame/grandpa/src/equivocation.rs
@@ -164,8 +164,10 @@ where
 	) -> DispatchResult {
 		use frame_system::offchain::SubmitTransaction;
 
-		let call =
-			Call::report_equivocation_unsigned(Box::new(equivocation_proof), key_owner_proof);
+		let call = Call::report_equivocation_unsigned {
+			equivocation_proof: Box::new(equivocation_proof),
+			key_owner_proof,
+		};
 
 		match SubmitTransaction::<T, Call<T>>::submit_unsigned_transaction(call.into()) {
 			Ok(()) => log::info!(
@@ -203,7 +205,7 @@ pub struct GrandpaTimeSlot {
 /// unsigned equivocation reports.
 impl<T: Config> Pallet<T> {
 	pub fn validate_unsigned(source: TransactionSource, call: &Call<T>) -> TransactionValidity {
-		if let Call::report_equivocation_unsigned(equivocation_proof, key_owner_proof) = call {
+		if let Call::report_equivocation_unsigned { equivocation_proof, key_owner_proof } = call {
 			// discard equivocation report not coming from the local node
 			match source {
 				TransactionSource::Local | TransactionSource::InBlock => { /* allowed */ },
@@ -242,7 +244,7 @@ impl<T: Config> Pallet<T> {
 	}
 
 	pub fn pre_dispatch(call: &Call<T>) -> Result<(), TransactionValidityError> {
-		if let Call::report_equivocation_unsigned(equivocation_proof, key_owner_proof) = call {
+		if let Call::report_equivocation_unsigned { equivocation_proof, key_owner_proof } = call {
 			is_known_offence::<T>(equivocation_proof, key_owner_proof)
 		} else {
 			Err(InvalidTransaction::Call.into())
diff --git a/frame/grandpa/src/lib.rs b/frame/grandpa/src/lib.rs
index 7cad0d477c9e..cd75deea770b 100644
--- a/frame/grandpa/src/lib.rs
+++ b/frame/grandpa/src/lib.rs
@@ -67,6 +67,8 @@ pub use equivocation::{
 
 pub use pallet::*;
 
+use scale_info::TypeInfo;
+
 /// The current storage version.
 const STORAGE_VERSION: StorageVersion = StorageVersion::new(4);
 
@@ -354,7 +356,7 @@ pub trait WeightInfo {
 }
 
 /// A stored pending change.
-#[derive(Encode, Decode)]
+#[derive(Encode, Decode, TypeInfo)]
 pub struct StoredPendingChange<N> {
 	/// The block number this was scheduled at.
 	pub scheduled_at: N,
@@ -370,7 +372,7 @@ pub struct StoredPendingChange<N> {
 /// Current state of the GRANDPA authority set. State transitions must happen in
 /// the same order of states defined below, e.g. `Paused` implies a prior
 /// `PendingPause`.
-#[derive(Decode, Encode)]
+#[derive(Decode, Encode, TypeInfo)]
 #[cfg_attr(test, derive(Debug, PartialEq))]
 pub enum StoredState<N> {
 	/// The current authority set is live, and GRANDPA is enabled.
diff --git a/frame/grandpa/src/tests.rs b/frame/grandpa/src/tests.rs
index 034758e0a21b..98f54f966fad 100644
--- a/frame/grandpa/src/tests.rs
+++ b/frame/grandpa/src/tests.rs
@@ -681,10 +681,10 @@ fn report_equivocation_validate_unsigned_prevents_duplicates() {
 		let key_owner_proof =
 			Historical::prove((sp_finality_grandpa::KEY_TYPE, &equivocation_key)).unwrap();
 
-		let call = Call::report_equivocation_unsigned(
-			Box::new(equivocation_proof.clone()),
-			key_owner_proof.clone(),
-		);
+		let call = Call::report_equivocation_unsigned {
+			equivocation_proof: Box::new(equivocation_proof.clone()),
+			key_owner_proof: key_owner_proof.clone(),
+		};
 
 		// only local/inblock reports are allowed
 		assert_eq!(
@@ -843,10 +843,10 @@ fn valid_equivocation_reports_dont_pay_fees() {
 			Historical::prove((sp_finality_grandpa::KEY_TYPE, &equivocation_key)).unwrap();
 
 		// check the dispatch info for the call.
-		let info = Call::<Test>::report_equivocation_unsigned(
-			Box::new(equivocation_proof.clone()),
-			key_owner_proof.clone(),
-		)
+		let info = Call::<Test>::report_equivocation_unsigned {
+			equivocation_proof: Box::new(equivocation_proof.clone()),
+			key_owner_proof: key_owner_proof.clone(),
+		}
 		.get_dispatch_info();
 
 		// it should have non-zero weight and the fee has to be paid.
diff --git a/frame/identity/Cargo.toml b/frame/identity/Cargo.toml
index 489a01b27da6..598be25c5ef3 100644
--- a/frame/identity/Cargo.toml
+++ b/frame/identity/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 enumflags2 = { version = "0.6.2" }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
@@ -30,6 +31,7 @@ pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"sp-std/std",
 	"sp-io/std",
 	"sp-runtime/std",
diff --git a/frame/identity/src/lib.rs b/frame/identity/src/lib.rs
index b56df59e113c..a91381f1edd8 100644
--- a/frame/identity/src/lib.rs
+++ b/frame/identity/src/lib.rs
@@ -240,10 +240,6 @@ pub mod pallet {
 
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
-	#[pallet::metadata(
-		T::AccountId = "AccountId",
-		BalanceOf<T> = "Balance"
-	)]
 	pub enum Event<T: Config> {
 		/// A name was set or reset (which will remove all judgements). \[who\]
 		IdentitySet(T::AccountId),
diff --git a/frame/identity/src/types.rs b/frame/identity/src/types.rs
index 86e461c644d1..ed6aeb18e96a 100644
--- a/frame/identity/src/types.rs
+++ b/frame/identity/src/types.rs
@@ -22,6 +22,10 @@ use frame_support::{
 	traits::{ConstU32, Get},
 	BoundedVec, CloneNoBound, PartialEqNoBound, RuntimeDebugNoBound,
 };
+use scale_info::{
+	build::{Fields, Variants},
+	meta_type, Path, Type, TypeInfo, TypeParameter,
+};
 use sp_runtime::{traits::Zero, RuntimeDebug};
 use sp_std::{fmt::Debug, iter::once, ops::Add, prelude::*};
 
@@ -89,6 +93,81 @@ impl Encode for Data {
 }
 impl codec::EncodeLike for Data {}
 
+/// Add a Raw variant with the given index and a fixed sized byte array
+macro_rules! data_raw_variants {
+    ($variants:ident, $(($index:literal, $size:literal)),* ) => {
+		$variants
+		$(
+			.variant(concat!("Raw", stringify!($size)), |v| v
+				.index($index)
+				.fields(Fields::unnamed().field(|f| f.ty::<[u8; $size]>()))
+			)
+		)*
+    }
+}
+
+impl TypeInfo for Data {
+	type Identity = Self;
+
+	fn type_info() -> Type {
+		let variants = Variants::new().variant("None", |v| v.index(0));
+
+		// create a variant for all sizes of Raw data from 0-32
+		let variants = data_raw_variants!(
+			variants,
+			(1, 0),
+			(2, 1),
+			(3, 2),
+			(4, 3),
+			(5, 4),
+			(6, 5),
+			(7, 6),
+			(8, 7),
+			(9, 8),
+			(10, 9),
+			(11, 10),
+			(12, 11),
+			(13, 12),
+			(14, 13),
+			(15, 14),
+			(16, 15),
+			(17, 16),
+			(18, 17),
+			(19, 18),
+			(20, 19),
+			(21, 20),
+			(22, 21),
+			(23, 22),
+			(24, 23),
+			(25, 24),
+			(26, 25),
+			(27, 26),
+			(28, 27),
+			(29, 28),
+			(30, 29),
+			(31, 30),
+			(32, 31),
+			(33, 32)
+		);
+
+		let variants = variants
+			.variant("BlakeTwo256", |v| {
+				v.index(34).fields(Fields::unnamed().field(|f| f.ty::<[u8; 32]>()))
+			})
+			.variant("Sha256", |v| {
+				v.index(35).fields(Fields::unnamed().field(|f| f.ty::<[u8; 32]>()))
+			})
+			.variant("Keccak256", |v| {
+				v.index(36).fields(Fields::unnamed().field(|f| f.ty::<[u8; 32]>()))
+			})
+			.variant("ShaThree256", |v| {
+				v.index(37).fields(Fields::unnamed().field(|f| f.ty::<[u8; 32]>()))
+			});
+
+		Type::builder().path(Path::new("Data", module_path!())).variant(variants)
+	}
+}
+
 impl Default for Data {
 	fn default() -> Self {
 		Self::None
@@ -102,7 +181,7 @@ pub type RegistrarIndex = u32;
 ///
 /// NOTE: Registrars may pay little attention to some fields. Registrars may want to make clear
 /// which fields their attestation is relevant for by off-chain means.
-#[derive(Copy, Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, MaxEncodedLen)]
+#[derive(Copy, Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, MaxEncodedLen, TypeInfo)]
 pub enum Judgement<Balance: Encode + Decode + MaxEncodedLen + Copy + Clone + Debug + Eq + PartialEq>
 {
 	/// The default value; no opinion is held.
@@ -152,7 +231,7 @@ impl<Balance: Encode + Decode + MaxEncodedLen + Copy + Clone + Debug + Eq + Part
 /// The fields that we use to identify the owner of an account with. Each corresponds to a field
 /// in the `IdentityInfo` struct.
 #[repr(u64)]
-#[derive(Clone, Copy, PartialEq, Eq, BitFlags, RuntimeDebug)]
+#[derive(Clone, Copy, PartialEq, Eq, BitFlags, RuntimeDebug, TypeInfo)]
 pub enum IdentityField {
 	Display = 0b0000000000000000000000000000000000000000000000000000000000000001,
 	Legal = 0b0000000000000000000000000000000000000000000000000000000000000010,
@@ -186,16 +265,27 @@ impl Decode for IdentityFields {
 		Ok(Self(<BitFlags<IdentityField>>::from_bits(field as u64).map_err(|_| "invalid value")?))
 	}
 }
+impl TypeInfo for IdentityFields {
+	type Identity = Self;
+
+	fn type_info() -> Type {
+		Type::builder()
+			.path(Path::new("BitFlags", module_path!()))
+			.type_params(vec![TypeParameter::new("T", Some(meta_type::<IdentityField>()))])
+			.composite(Fields::unnamed().field(|f| f.ty::<u64>().type_name("IdentityField")))
+	}
+}
 
 /// Information concerning the identity of the controller of an account.
 ///
 /// NOTE: This should be stored at the end of the storage item to facilitate the addition of extra
 /// fields in a backwards compatible way through a specialized `Decode` impl.
 #[derive(
-	CloneNoBound, Encode, Decode, Eq, MaxEncodedLen, PartialEqNoBound, RuntimeDebugNoBound,
+	CloneNoBound, Encode, Decode, Eq, MaxEncodedLen, PartialEqNoBound, RuntimeDebugNoBound, TypeInfo,
 )]
 #[codec(mel_bound(FieldLimit: Get<u32>))]
 #[cfg_attr(test, derive(frame_support::DefaultNoBound))]
+#[scale_info(skip_type_params(FieldLimit))]
 pub struct IdentityInfo<FieldLimit: Get<u32>> {
 	/// Additional fields of the identity that are not catered for with the struct's explicit
 	/// fields.
@@ -246,12 +336,15 @@ pub struct IdentityInfo<FieldLimit: Get<u32>> {
 ///
 /// NOTE: This is stored separately primarily to facilitate the addition of extra fields in a
 /// backwards compatible way through a specialized `Decode` impl.
-#[derive(CloneNoBound, Encode, Eq, MaxEncodedLen, PartialEqNoBound, RuntimeDebugNoBound)]
+#[derive(
+	CloneNoBound, Encode, Eq, MaxEncodedLen, PartialEqNoBound, RuntimeDebugNoBound, TypeInfo,
+)]
 #[codec(mel_bound(
 	Balance: Encode + Decode + MaxEncodedLen + Copy + Clone + Debug + Eq + PartialEq + Zero + Add,
 	MaxJudgements: Get<u32>,
 	MaxAdditionalFields: Get<u32>,
 ))]
+#[scale_info(skip_type_params(MaxJudgements, MaxAdditionalFields))]
 pub struct Registration<
 	Balance: Encode + Decode + MaxEncodedLen + Copy + Clone + Debug + Eq + PartialEq,
 	MaxJudgements: Get<u32>,
@@ -296,7 +389,7 @@ impl<
 }
 
 /// Information concerning a registrar.
-#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, MaxEncodedLen)]
+#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, MaxEncodedLen, TypeInfo)]
 pub struct RegistrarInfo<
 	Balance: Encode + Decode + Clone + Debug + Eq + PartialEq,
 	AccountId: Encode + Decode + Clone + Debug + Eq + PartialEq,
@@ -311,3 +404,70 @@ pub struct RegistrarInfo<
 	/// these fields.
 	pub fields: IdentityFields,
 }
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+
+	#[test]
+	fn manual_data_type_info() {
+		let mut registry = scale_info::Registry::new();
+		let type_id = registry.register_type(&scale_info::meta_type::<Data>());
+		let registry: scale_info::PortableRegistry = registry.into();
+		let type_info = registry.resolve(type_id.id()).unwrap();
+
+		let check_type_info = |data: &Data| {
+			let variant_name = match data {
+				Data::None => "None".to_string(),
+				Data::BlakeTwo256(_) => "BlakeTwo256".to_string(),
+				Data::Sha256(_) => "Sha256".to_string(),
+				Data::Keccak256(_) => "Keccak256".to_string(),
+				Data::ShaThree256(_) => "ShaThree256".to_string(),
+				Data::Raw(bytes) => format!("Raw{}", bytes.len()),
+			};
+			if let scale_info::TypeDef::Variant(variant) = type_info.type_def() {
+				let variant = variant
+					.variants()
+					.iter()
+					.find(|v| v.name() == &variant_name)
+					.expect(&format!("Expected to find variant {}", variant_name));
+
+				let field_arr_len = variant
+					.fields()
+					.first()
+					.and_then(|f| registry.resolve(f.ty().id()))
+					.map(|ty| {
+						if let scale_info::TypeDef::Array(arr) = ty.type_def() {
+							arr.len()
+						} else {
+							panic!("Should be an array type")
+						}
+					})
+					.unwrap_or(0);
+
+				let encoded = data.encode();
+				assert_eq!(encoded[0], variant.index());
+				assert_eq!(encoded.len() as u32 - 1, field_arr_len);
+			} else {
+				panic!("Should be a variant type")
+			};
+		};
+
+		let mut data = vec![
+			Data::None,
+			Data::BlakeTwo256(Default::default()),
+			Data::Sha256(Default::default()),
+			Data::Keccak256(Default::default()),
+			Data::ShaThree256(Default::default()),
+		];
+
+		// A Raw instance for all possible sizes of the Raw data
+		for n in 0..32 {
+			data.push(Data::Raw(vec![0u8; n as usize].try_into().unwrap()))
+		}
+
+		for d in data.iter() {
+			check_type_info(d);
+		}
+	}
+}
diff --git a/frame/im-online/Cargo.toml b/frame/im-online/Cargo.toml
index 1208da3b3f3d..a1efd626c069 100644
--- a/frame/im-online/Cargo.toml
+++ b/frame/im-online/Cargo.toml
@@ -16,6 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../../primitives/application-crypto" }
 pallet-authorship = { version = "4.0.0-dev", default-features = false, path = "../authorship" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
@@ -36,6 +37,7 @@ std = [
 	"sp-application-crypto/std",
 	"pallet-authorship/std",
 	"codec/std",
+	"scale-info/std",
 	"sp-core/std",
 	"sp-std/std",
 	"sp-io/std",
diff --git a/frame/im-online/src/benchmarking.rs b/frame/im-online/src/benchmarking.rs
index 2a2d837a4bd5..1043a97f67de 100644
--- a/frame/im-online/src/benchmarking.rs
+++ b/frame/im-online/src/benchmarking.rs
@@ -80,7 +80,7 @@ benchmarks! {
 		let k in 1 .. MAX_KEYS;
 		let e in 1 .. MAX_EXTERNAL_ADDRESSES;
 		let (input_heartbeat, signature) = create_heartbeat::<T>(k, e)?;
-		let call = Call::heartbeat(input_heartbeat, signature);
+		let call = Call::heartbeat { heartbeat: input_heartbeat, signature };
 	}: {
 		ImOnline::<T>::validate_unsigned(TransactionSource::InBlock, &call)
 			.map_err(<&str>::from)?;
@@ -90,7 +90,7 @@ benchmarks! {
 		let k in 1 .. MAX_KEYS;
 		let e in 1 .. MAX_EXTERNAL_ADDRESSES;
 		let (input_heartbeat, signature) = create_heartbeat::<T>(k, e)?;
-		let call = Call::heartbeat(input_heartbeat, signature);
+		let call = Call::heartbeat { heartbeat: input_heartbeat, signature };
 	}: {
 		ImOnline::<T>::validate_unsigned(TransactionSource::InBlock, &call)
 			.map_err(<&str>::from)?;
diff --git a/frame/im-online/src/lib.rs b/frame/im-online/src/lib.rs
index 3a040c7b5e21..ab4f7001574e 100644
--- a/frame/im-online/src/lib.rs
+++ b/frame/im-online/src/lib.rs
@@ -80,6 +80,7 @@ use frame_support::traits::{
 };
 use frame_system::offchain::{SendTransactionTypes, SubmitTransaction};
 pub use pallet::*;
+use scale_info::TypeInfo;
 use sp_application_crypto::RuntimeAppPublic;
 use sp_core::offchain::OpaqueNetworkState;
 use sp_runtime::{
@@ -140,7 +141,7 @@ const INCLUDE_THRESHOLD: u32 = 3;
 /// This stores the block number at which heartbeat was requested and when the worker
 /// has actually managed to produce it.
 /// Note we store such status for every `authority_index` separately.
-#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug)]
+#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, TypeInfo)]
 struct HeartbeatStatus<BlockNumber> {
 	/// An index of the session that we are supposed to send heartbeat for.
 	pub session_index: SessionIndex,
@@ -202,7 +203,7 @@ impl<BlockNumber: sp_std::fmt::Debug> sp_std::fmt::Debug for OffchainErr<BlockNu
 pub type AuthIndex = u32;
 
 /// Heartbeat which is sent/received.
-#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug)]
+#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, TypeInfo)]
 pub struct Heartbeat<BlockNumber>
 where
 	BlockNumber: PartialEq + Eq + Decode + Encode,
@@ -297,7 +298,6 @@ pub mod pallet {
 
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
-	#[pallet::metadata(T::AuthorityId = "AuthorityId", Vec<IdentificationTuple<T>> = "Vec<IdentificationTuple>")]
 	pub enum Event<T: Config> {
 		/// A new heartbeat was received from `AuthorityId` \[authority_id\]
 		HeartbeatReceived(T::AuthorityId),
@@ -459,7 +459,7 @@ pub mod pallet {
 		type Call = Call<T>;
 
 		fn validate_unsigned(_source: TransactionSource, call: &Self::Call) -> TransactionValidity {
-			if let Call::heartbeat(heartbeat, signature) = call {
+			if let Call::heartbeat { heartbeat, signature } = call {
 				if <Pallet<T>>::is_online(heartbeat.authority_index) {
 					// we already received a heartbeat for this authority
 					return InvalidTransaction::Stale.into()
@@ -631,7 +631,7 @@ impl<T: Config> Pallet<T> {
 		let prepare_heartbeat = || -> OffchainResult<T, Call<T>> {
 			let network_state =
 				sp_io::offchain::network_state().map_err(|_| OffchainErr::NetworkState)?;
-			let heartbeat_data = Heartbeat {
+			let heartbeat = Heartbeat {
 				block_number,
 				network_state,
 				session_index,
@@ -639,9 +639,9 @@ impl<T: Config> Pallet<T> {
 				validators_len,
 			};
 
-			let signature = key.sign(&heartbeat_data.encode()).ok_or(OffchainErr::FailedSigning)?;
+			let signature = key.sign(&heartbeat.encode()).ok_or(OffchainErr::FailedSigning)?;
 
-			Ok(Call::heartbeat(heartbeat_data, signature))
+			Ok(Call::heartbeat { heartbeat, signature })
 		};
 
 		if Self::is_online(authority_index) {
@@ -820,7 +820,7 @@ impl<T: Config> OneSessionHandler<T::AccountId> for Pallet<T> {
 }
 
 /// An offence that is filed if a validator didn't send a heartbeat message.
-#[derive(RuntimeDebug)]
+#[derive(RuntimeDebug, TypeInfo)]
 #[cfg_attr(feature = "std", derive(Clone, PartialEq, Eq))]
 pub struct UnresponsivenessOffence<Offender> {
 	/// The current session index in which we report the unresponsive validators.
diff --git a/frame/im-online/src/tests.rs b/frame/im-online/src/tests.rs
index 2492e46ef18a..bb2c4c7cae54 100644
--- a/frame/im-online/src/tests.rs
+++ b/frame/im-online/src/tests.rs
@@ -130,14 +130,15 @@ fn heartbeat(
 	};
 	let signature = id.sign(&heartbeat.encode()).unwrap();
 
-	ImOnline::pre_dispatch(&crate::Call::heartbeat(heartbeat.clone(), signature.clone())).map_err(
-		|e| match e {
-			TransactionValidityError::Invalid(InvalidTransaction::Custom(
-				INVALID_VALIDATORS_LEN,
-			)) => "invalid validators len",
-			e @ _ => <&'static str>::from(e),
-		},
-	)?;
+	ImOnline::pre_dispatch(&crate::Call::heartbeat {
+		heartbeat: heartbeat.clone(),
+		signature: signature.clone(),
+	})
+	.map_err(|e| match e {
+		TransactionValidityError::Invalid(InvalidTransaction::Custom(INVALID_VALIDATORS_LEN)) =>
+			"invalid validators len",
+		e @ _ => <&'static str>::from(e),
+	})?;
 	ImOnline::heartbeat(Origin::none(), heartbeat, signature)
 }
 
@@ -237,7 +238,7 @@ fn should_generate_heartbeats() {
 		// check stuff about the transaction.
 		let ex: Extrinsic = Decode::decode(&mut &*transaction).unwrap();
 		let heartbeat = match ex.call {
-			crate::mock::Call::ImOnline(crate::Call::heartbeat(h, ..)) => h,
+			crate::mock::Call::ImOnline(crate::Call::heartbeat { heartbeat, .. }) => heartbeat,
 			e => panic!("Unexpected call: {:?}", e),
 		};
 
@@ -352,7 +353,7 @@ fn should_not_send_a_report_if_already_online() {
 		// check stuff about the transaction.
 		let ex: Extrinsic = Decode::decode(&mut &*transaction).unwrap();
 		let heartbeat = match ex.call {
-			crate::mock::Call::ImOnline(crate::Call::heartbeat(h, ..)) => h,
+			crate::mock::Call::ImOnline(crate::Call::heartbeat { heartbeat, .. }) => heartbeat,
 			e => panic!("Unexpected call: {:?}", e),
 		};
 
diff --git a/frame/indices/Cargo.toml b/frame/indices/Cargo.toml
index c226ea2cf235..17d04c43fa5d 100644
--- a/frame/indices/Cargo.toml
+++ b/frame/indices/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-keyring = { version = "4.0.0-dev", optional = true, path = "../../primitives/keyring" }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
@@ -32,6 +33,7 @@ default = ["std"]
 std = [
 	"sp-keyring",
 	"codec/std",
+	"scale-info/std",
 	"sp-core/std",
 	"sp-std/std",
 	"sp-io/std",
diff --git a/frame/indices/src/lib.rs b/frame/indices/src/lib.rs
index 331873d42451..0901a89d41ad 100644
--- a/frame/indices/src/lib.rs
+++ b/frame/indices/src/lib.rs
@@ -260,7 +260,6 @@ pub mod pallet {
 
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
-	#[pallet::metadata(T::AccountId = "AccountId", T::AccountIndex = "AccountIndex")]
 	pub enum Event<T: Config> {
 		/// A account index was assigned. \[index, who\]
 		IndexAssigned(T::AccountId, T::AccountIndex),
diff --git a/frame/lottery/Cargo.toml b/frame/lottery/Cargo.toml
index 351e72a77a55..f14d65310cc7 100644
--- a/frame/lottery/Cargo.toml
+++ b/frame/lottery/Cargo.toml
@@ -16,6 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
 	"derive",
 ] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
@@ -33,6 +34,7 @@ sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"sp-std/std",
 	"frame-support/std",
 	"sp-runtime/std",
diff --git a/frame/lottery/src/benchmarking.rs b/frame/lottery/src/benchmarking.rs
index 706561471ee5..3b7035c72deb 100644
--- a/frame/lottery/src/benchmarking.rs
+++ b/frame/lottery/src/benchmarking.rs
@@ -35,11 +35,11 @@ fn setup_lottery<T: Config>(repeat: bool) -> Result<(), &'static str> {
 	let delay = 5u32.into();
 	// Calls will be maximum length...
 	let mut calls = vec![
-		frame_system::Call::<T>::set_code(vec![]).into();
+		frame_system::Call::<T>::set_code { code: vec![] }.into();
 		T::MaxCalls::get().saturating_sub(1) as usize
 	];
 	// Last call will be the match for worst case scenario.
-	calls.push(frame_system::Call::<T>::remark(vec![]).into());
+	calls.push(frame_system::Call::<T>::remark { remark: vec![] }.into());
 	let origin = T::ManagerOrigin::successful_origin();
 	Lottery::<T>::set_calls(origin.clone(), calls)?;
 	Lottery::<T>::start_lottery(origin, price, length, delay, repeat)?;
@@ -53,7 +53,7 @@ benchmarks! {
 		setup_lottery::<T>(false)?;
 		// force user to have a long vec of calls participating
 		let set_code_index: CallIndex = Lottery::<T>::call_to_index(
-			&frame_system::Call::<T>::set_code(vec![]).into()
+			&frame_system::Call::<T>::set_code{ code: vec![] }.into()
 		)?;
 		let already_called: (u32, Vec<CallIndex>) = (
 			LotteryIndex::<T>::get(),
@@ -64,7 +64,7 @@ benchmarks! {
 		);
 		Participants::<T>::insert(&caller, already_called);
 
-		let call = frame_system::Call::<T>::remark(vec![]);
+		let call = frame_system::Call::<T>::remark { remark: vec![] };
 	}: _(RawOrigin::Signed(caller), Box::new(call.into()))
 	verify {
 		assert_eq!(TicketsCount::<T>::get(), 1);
@@ -72,9 +72,9 @@ benchmarks! {
 
 	set_calls {
 		let n in 0 .. T::MaxCalls::get() as u32;
-		let calls = vec![frame_system::Call::<T>::remark(vec![]).into(); n as usize];
+		let calls = vec![frame_system::Call::<T>::remark { remark: vec![] }.into(); n as usize];
 
-		let call = Call::<T>::set_calls(calls);
+		let call = Call::<T>::set_calls { calls };
 		let origin = T::ManagerOrigin::successful_origin();
 		assert!(CallIndices::<T>::get().is_empty());
 	}: { call.dispatch_bypass_filter(origin)? }
@@ -89,7 +89,7 @@ benchmarks! {
 		let end = 10u32.into();
 		let payout = 5u32.into();
 
-		let call = Call::<T>::start_lottery(price, end, payout, true);
+		let call = Call::<T>::start_lottery { price, length: end, delay: payout, repeat: true };
 		let origin = T::ManagerOrigin::successful_origin();
 	}: { call.dispatch_bypass_filter(origin)? }
 	verify {
@@ -99,7 +99,7 @@ benchmarks! {
 	stop_repeat {
 		setup_lottery::<T>(true)?;
 		assert_eq!(crate::Lottery::<T>::get().unwrap().repeat, true);
-		let call = Call::<T>::stop_repeat();
+		let call = Call::<T>::stop_repeat {};
 		let origin = T::ManagerOrigin::successful_origin();
 	}: { call.dispatch_bypass_filter(origin)? }
 	verify {
@@ -115,7 +115,7 @@ benchmarks! {
 		let lottery_account = Lottery::<T>::account_id();
 		T::Currency::make_free_balance_be(&lottery_account, T::Currency::minimum_balance() * 10u32.into());
 		// Buy a ticket
-		let call = frame_system::Call::<T>::remark(vec![]);
+		let call = frame_system::Call::<T>::remark { remark: vec![] };
 		Lottery::<T>::buy_ticket(RawOrigin::Signed(winner.clone()).into(), Box::new(call.into()))?;
 		// Kill user account for worst case
 		T::Currency::make_free_balance_be(&winner, 0u32.into());
@@ -146,7 +146,7 @@ benchmarks! {
 		let lottery_account = Lottery::<T>::account_id();
 		T::Currency::make_free_balance_be(&lottery_account, T::Currency::minimum_balance() * 10u32.into());
 		// Buy a ticket
-		let call = frame_system::Call::<T>::remark(vec![]);
+		let call = frame_system::Call::<T>::remark { remark: vec![] };
 		Lottery::<T>::buy_ticket(RawOrigin::Signed(winner.clone()).into(), Box::new(call.into()))?;
 		// Kill user account for worst case
 		T::Currency::make_free_balance_be(&winner, 0u32.into());
diff --git a/frame/lottery/src/lib.rs b/frame/lottery/src/lib.rs
index c879a819b0b7..260b4c2d76ae 100644
--- a/frame/lottery/src/lib.rs
+++ b/frame/lottery/src/lib.rs
@@ -76,7 +76,7 @@ type BalanceOf<T> =
 // We use this to uniquely match someone's incoming call with the calls configured for the lottery.
 type CallIndex = (u8, u8);
 
-#[derive(Encode, Decode, Default, Eq, PartialEq, RuntimeDebug)]
+#[derive(Encode, Decode, Default, Eq, PartialEq, RuntimeDebug, scale_info::TypeInfo)]
 pub struct LotteryConfig<BlockNumber, Balance> {
 	/// Price per entry.
 	price: Balance,
@@ -170,7 +170,6 @@ pub mod pallet {
 
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
-	#[pallet::metadata(T::AccountId = "AccountId", BalanceOf<T> = "Balance")]
 	pub enum Event<T: Config> {
 		/// A lottery has been started!
 		LotteryStarted,
diff --git a/frame/lottery/src/tests.rs b/frame/lottery/src/tests.rs
index 9cc4c582943e..623beea4a6b5 100644
--- a/frame/lottery/src/tests.rs
+++ b/frame/lottery/src/tests.rs
@@ -43,8 +43,8 @@ fn basic_end_to_end_works() {
 		let length = 20;
 		let delay = 5;
 		let calls = vec![
-			Call::Balances(BalancesCall::force_transfer(0, 0, 0)),
-			Call::Balances(BalancesCall::transfer(0, 0)),
+			Call::Balances(BalancesCall::force_transfer { source: 0, dest: 0, value: 0 }),
+			Call::Balances(BalancesCall::transfer { dest: 0, value: 0 }),
 		];
 
 		// Set calls for the lottery
@@ -55,7 +55,7 @@ fn basic_end_to_end_works() {
 		assert!(crate::Lottery::<Test>::get().is_some());
 
 		assert_eq!(Balances::free_balance(&1), 100);
-		let call = Box::new(Call::Balances(BalancesCall::transfer(2, 20)));
+		let call = Box::new(Call::Balances(BalancesCall::transfer { dest: 2, value: 20 }));
 		assert_ok!(Lottery::buy_ticket(Origin::signed(1), call.clone()));
 		// 20 from the transfer, 10 from buying a ticket
 		assert_eq!(Balances::free_balance(&1), 100 - 20 - 10);
@@ -96,17 +96,17 @@ fn set_calls_works() {
 		assert!(!CallIndices::<Test>::exists());
 
 		let calls = vec![
-			Call::Balances(BalancesCall::force_transfer(0, 0, 0)),
-			Call::Balances(BalancesCall::transfer(0, 0)),
+			Call::Balances(BalancesCall::force_transfer { source: 0, dest: 0, value: 0 }),
+			Call::Balances(BalancesCall::transfer { dest: 0, value: 0 }),
 		];
 
 		assert_ok!(Lottery::set_calls(Origin::root(), calls));
 		assert!(CallIndices::<Test>::exists());
 
 		let too_many_calls = vec![
-			Call::Balances(BalancesCall::force_transfer(0, 0, 0)),
-			Call::Balances(BalancesCall::transfer(0, 0)),
-			Call::System(SystemCall::remark(vec![])),
+			Call::Balances(BalancesCall::force_transfer { source: 0, dest: 0, value: 0 }),
+			Call::Balances(BalancesCall::transfer { dest: 0, value: 0 }),
+			Call::System(SystemCall::remark { remark: vec![] }),
 		];
 
 		assert_noop!(
@@ -150,7 +150,7 @@ fn buy_ticket_works_as_simple_passthrough() {
 	// as a simple passthrough to the real call.
 	new_test_ext().execute_with(|| {
 		// No lottery set up
-		let call = Box::new(Call::Balances(BalancesCall::transfer(2, 20)));
+		let call = Box::new(Call::Balances(BalancesCall::transfer { dest: 2, value: 20 }));
 		// This is just a basic transfer then
 		assert_ok!(Lottery::buy_ticket(Origin::signed(1), call.clone()));
 		assert_eq!(Balances::free_balance(&1), 100 - 20);
@@ -158,8 +158,8 @@ fn buy_ticket_works_as_simple_passthrough() {
 
 		// Lottery is set up, but too expensive to enter, so `do_buy_ticket` fails.
 		let calls = vec![
-			Call::Balances(BalancesCall::force_transfer(0, 0, 0)),
-			Call::Balances(BalancesCall::transfer(0, 0)),
+			Call::Balances(BalancesCall::force_transfer { source: 0, dest: 0, value: 0 }),
+			Call::Balances(BalancesCall::transfer { dest: 0, value: 0 }),
 		];
 		assert_ok!(Lottery::set_calls(Origin::root(), calls));
 
@@ -170,21 +170,24 @@ fn buy_ticket_works_as_simple_passthrough() {
 		assert_eq!(TicketsCount::<Test>::get(), 0);
 
 		// If call would fail, the whole thing still fails the same
-		let fail_call = Box::new(Call::Balances(BalancesCall::transfer(2, 1000)));
+		let fail_call = Box::new(Call::Balances(BalancesCall::transfer { dest: 2, value: 1000 }));
 		assert_noop!(
 			Lottery::buy_ticket(Origin::signed(1), fail_call),
 			BalancesError::<Test, _>::InsufficientBalance,
 		);
 
-		let bad_origin_call = Box::new(Call::Balances(BalancesCall::force_transfer(0, 0, 0)));
-		assert_noop!(Lottery::buy_ticket(Origin::signed(1), bad_origin_call), BadOrigin);
+		let bad_origin_call =
+			Box::new(Call::Balances(BalancesCall::force_transfer { source: 0, dest: 0, value: 0 }));
+		assert_noop!(Lottery::buy_ticket(Origin::signed(1), bad_origin_call), BadOrigin,);
 
 		// User can call other txs, but doesn't get a ticket
-		let remark_call = Box::new(Call::System(SystemCall::remark(b"hello, world!".to_vec())));
+		let remark_call =
+			Box::new(Call::System(SystemCall::remark { remark: b"hello, world!".to_vec() }));
 		assert_ok!(Lottery::buy_ticket(Origin::signed(2), remark_call));
 		assert_eq!(TicketsCount::<Test>::get(), 0);
 
-		let successful_call = Box::new(Call::Balances(BalancesCall::transfer(2, 1)));
+		let successful_call =
+			Box::new(Call::Balances(BalancesCall::transfer { dest: 2, value: 1 }));
 		assert_ok!(Lottery::buy_ticket(Origin::signed(2), successful_call));
 		assert_eq!(TicketsCount::<Test>::get(), 1);
 	});
@@ -195,13 +198,13 @@ fn buy_ticket_works() {
 	new_test_ext().execute_with(|| {
 		// Set calls for the lottery.
 		let calls = vec![
-			Call::System(SystemCall::remark(vec![])),
-			Call::Balances(BalancesCall::transfer(0, 0)),
+			Call::System(SystemCall::remark { remark: vec![] }),
+			Call::Balances(BalancesCall::transfer { dest: 0, value: 0 }),
 		];
 		assert_ok!(Lottery::set_calls(Origin::root(), calls));
 
 		// Can't buy ticket before start
-		let call = Box::new(Call::Balances(BalancesCall::transfer(2, 1)));
+		let call = Box::new(Call::Balances(BalancesCall::transfer { dest: 2, value: 1 }));
 		assert_ok!(Lottery::buy_ticket(Origin::signed(1), call.clone()));
 		assert_eq!(TicketsCount::<Test>::get(), 0);
 
@@ -214,12 +217,12 @@ fn buy_ticket_works() {
 		assert_eq!(TicketsCount::<Test>::get(), 1);
 
 		// Can't buy another of the same ticket (even if call is slightly changed)
-		let call = Box::new(Call::Balances(BalancesCall::transfer(3, 30)));
+		let call = Box::new(Call::Balances(BalancesCall::transfer { dest: 3, value: 30 }));
 		assert_ok!(Lottery::buy_ticket(Origin::signed(1), call));
 		assert_eq!(TicketsCount::<Test>::get(), 1);
 
 		// Buy ticket for remark
-		let call = Box::new(Call::System(SystemCall::remark(b"hello, world!".to_vec())));
+		let call = Box::new(Call::System(SystemCall::remark { remark: b"hello, world!".to_vec() }));
 		assert_ok!(Lottery::buy_ticket(Origin::signed(1), call.clone()));
 		assert_eq!(TicketsCount::<Test>::get(), 2);
 
diff --git a/frame/membership/Cargo.toml b/frame/membership/Cargo.toml
index 8136b818eac8..acc82f7678de 100644
--- a/frame/membership/Cargo.toml
+++ b/frame/membership/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 log = { version = "0.4.0", default-features = false }
 
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
@@ -29,6 +30,7 @@ frame-system = { version = "4.0.0-dev", default-features = false, path = "../sys
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"log/std",
 	"sp-core/std",
 	"sp-io/std",
diff --git a/frame/membership/src/lib.rs b/frame/membership/src/lib.rs
index b66dc51b3b0e..7922d9efaf56 100644
--- a/frame/membership/src/lib.rs
+++ b/frame/membership/src/lib.rs
@@ -131,9 +131,6 @@ pub mod pallet {
 
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
-	#[pallet::metadata(
-		PhantomData<(T::AccountId, <T as Config<I>>::Event)> = "sp_std::marker::PhantomData<(AccountId, Event)>",
-	)]
 	pub enum Event<T: Config<I>, I: 'static = ()> {
 		/// The given member was added; see the transaction for who.
 		MemberAdded,
diff --git a/frame/merkle-mountain-range/Cargo.toml b/frame/merkle-mountain-range/Cargo.toml
index eecdfd7a9e84..02b4be182ef8 100644
--- a/frame/merkle-mountain-range/Cargo.toml
+++ b/frame/merkle-mountain-range/Cargo.toml
@@ -13,6 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 mmr-lib = { package = "ckb-merkle-mountain-range", default-features = false, version = "0.3.1" }
 
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
@@ -34,6 +35,7 @@ hex-literal = "0.3"
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"mmr-lib/std",
 	"sp-core/std",
 	"sp-io/std",
diff --git a/frame/merkle-mountain-range/src/lib.rs b/frame/merkle-mountain-range/src/lib.rs
index 83fdc5b1715c..01bf1b2254f0 100644
--- a/frame/merkle-mountain-range/src/lib.rs
+++ b/frame/merkle-mountain-range/src/lib.rs
@@ -124,7 +124,8 @@ pub mod pallet {
 			+ Copy
 			+ Default
 			+ codec::Codec
-			+ codec::EncodeLike;
+			+ codec::EncodeLike
+			+ scale_info::TypeInfo;
 
 		/// Data stored in the leaf nodes.
 		///
diff --git a/frame/metadata/Cargo.toml b/frame/metadata/Cargo.toml
deleted file mode 100644
index 332ce5b70c26..000000000000
--- a/frame/metadata/Cargo.toml
+++ /dev/null
@@ -1,28 +0,0 @@
-[package]
-name = "frame-metadata"
-version = "14.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-license = "Apache-2.0"
-homepage = "https://substrate.dev"
-repository = "https://github.com/paritytech/substrate/"
-description = "Decodable variant of the RuntimeMetadata."
-readme = "README.md"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[dependencies]
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.126", optional = true, features = ["derive"] }
-sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
-sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
-
-[features]
-default = ["std"]
-std = [
-	"codec/std",
-	"sp-std/std",
-	"sp-core/std",
-	"serde",
-]
diff --git a/frame/metadata/README.md b/frame/metadata/README.md
deleted file mode 100644
index 423af8602e3f..000000000000
--- a/frame/metadata/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-Decodable variant of the RuntimeMetadata.
-
-This really doesn't belong here, but is necessary for the moment. In the future
-it should be removed entirely to an external module for shimming on to the
-codec-encoded metadata.
-
-License: Apache-2.0
\ No newline at end of file
diff --git a/frame/metadata/src/lib.rs b/frame/metadata/src/lib.rs
deleted file mode 100644
index 7dcf5932df28..000000000000
--- a/frame/metadata/src/lib.rs
+++ /dev/null
@@ -1,466 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Decodable variant of the RuntimeMetadata.
-//!
-//! This really doesn't belong here, but is necessary for the moment. In the future
-//! it should be removed entirely to an external module for shimming on to the
-//! codec-encoded metadata.
-
-#![cfg_attr(not(feature = "std"), no_std)]
-
-#[cfg(feature = "std")]
-use codec::{Decode, Error, Input};
-use codec::{Encode, Output};
-#[cfg(feature = "std")]
-use serde::Serialize;
-use sp_core::RuntimeDebug;
-use sp_std::vec::Vec;
-
-#[cfg(feature = "std")]
-type StringBuf = String;
-
-/// Current prefix of metadata
-pub const META_RESERVED: u32 = 0x6174656d; // 'meta' warn endianness
-
-/// On `no_std` we do not support `Decode` and thus `StringBuf` is just `&'static str`.
-/// So, if someone tries to decode this stuff on `no_std`, they will get a compilation error.
-#[cfg(not(feature = "std"))]
-type StringBuf = &'static str;
-
-/// A type that decodes to a different type than it encodes.
-/// The user needs to make sure that both types use the same encoding.
-///
-/// For example a `&'static [ &'static str ]` can be decoded to a `Vec<String>`.
-#[derive(Clone)]
-pub enum DecodeDifferent<B, O>
-where
-	B: 'static,
-	O: 'static,
-{
-	Encode(B),
-	Decoded(O),
-}
-
-impl<B, O> Encode for DecodeDifferent<B, O>
-where
-	B: Encode + 'static,
-	O: Encode + 'static,
-{
-	fn encode_to<W: Output + ?Sized>(&self, dest: &mut W) {
-		match self {
-			DecodeDifferent::Encode(b) => b.encode_to(dest),
-			DecodeDifferent::Decoded(o) => o.encode_to(dest),
-		}
-	}
-}
-
-impl<B, O> codec::EncodeLike for DecodeDifferent<B, O>
-where
-	B: Encode + 'static,
-	O: Encode + 'static,
-{
-}
-
-#[cfg(feature = "std")]
-impl<B, O> Decode for DecodeDifferent<B, O>
-where
-	B: 'static,
-	O: Decode + 'static,
-{
-	fn decode<I: Input>(input: &mut I) -> Result<Self, Error> {
-		<O>::decode(input).map(|val| DecodeDifferent::Decoded(val))
-	}
-}
-
-impl<B, O> PartialEq for DecodeDifferent<B, O>
-where
-	B: Encode + Eq + PartialEq + 'static,
-	O: Encode + Eq + PartialEq + 'static,
-{
-	fn eq(&self, other: &Self) -> bool {
-		self.encode() == other.encode()
-	}
-}
-
-impl<B, O> Eq for DecodeDifferent<B, O>
-where
-	B: Encode + Eq + PartialEq + 'static,
-	O: Encode + Eq + PartialEq + 'static,
-{
-}
-
-impl<B, O> sp_std::fmt::Debug for DecodeDifferent<B, O>
-where
-	B: sp_std::fmt::Debug + Eq + 'static,
-	O: sp_std::fmt::Debug + Eq + 'static,
-{
-	fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
-		match self {
-			DecodeDifferent::Encode(b) => b.fmt(f),
-			DecodeDifferent::Decoded(o) => o.fmt(f),
-		}
-	}
-}
-
-#[cfg(feature = "std")]
-impl<B, O> serde::Serialize for DecodeDifferent<B, O>
-where
-	B: serde::Serialize + 'static,
-	O: serde::Serialize + 'static,
-{
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-	where
-		S: serde::Serializer,
-	{
-		match self {
-			DecodeDifferent::Encode(b) => b.serialize(serializer),
-			DecodeDifferent::Decoded(o) => o.serialize(serializer),
-		}
-	}
-}
-
-pub type DecodeDifferentArray<B, O = B> = DecodeDifferent<&'static [B], Vec<O>>;
-
-type DecodeDifferentStr = DecodeDifferent<&'static str, StringBuf>;
-
-/// All the metadata about a function.
-#[derive(Clone, PartialEq, Eq, Encode, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Decode, Serialize))]
-pub struct FunctionMetadata {
-	pub name: DecodeDifferentStr,
-	pub arguments: DecodeDifferentArray<FunctionArgumentMetadata>,
-	pub documentation: DecodeDifferentArray<&'static str, StringBuf>,
-}
-
-/// All the metadata about a function argument.
-#[derive(Clone, PartialEq, Eq, Encode, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Decode, Serialize))]
-pub struct FunctionArgumentMetadata {
-	pub name: DecodeDifferentStr,
-	pub ty: DecodeDifferentStr,
-}
-
-/// Newtype wrapper for support encoding functions (actual the result of the function).
-#[derive(Clone, Eq)]
-pub struct FnEncode<E>(pub fn() -> E)
-where
-	E: Encode + 'static;
-
-impl<E: Encode> Encode for FnEncode<E> {
-	fn encode_to<W: Output + ?Sized>(&self, dest: &mut W) {
-		self.0().encode_to(dest);
-	}
-}
-
-impl<E: Encode> codec::EncodeLike for FnEncode<E> {}
-
-impl<E: Encode + PartialEq> PartialEq for FnEncode<E> {
-	fn eq(&self, other: &Self) -> bool {
-		self.0().eq(&other.0())
-	}
-}
-
-impl<E: Encode + sp_std::fmt::Debug> sp_std::fmt::Debug for FnEncode<E> {
-	fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
-		self.0().fmt(f)
-	}
-}
-
-#[cfg(feature = "std")]
-impl<E: Encode + serde::Serialize> serde::Serialize for FnEncode<E> {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-	where
-		S: serde::Serializer,
-	{
-		self.0().serialize(serializer)
-	}
-}
-
-/// All the metadata about an outer event.
-#[derive(Clone, PartialEq, Eq, Encode, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Decode, Serialize))]
-pub struct OuterEventMetadata {
-	pub name: DecodeDifferentStr,
-	pub events: DecodeDifferentArray<
-		(&'static str, FnEncode<&'static [EventMetadata]>),
-		(StringBuf, Vec<EventMetadata>),
-	>,
-}
-
-/// All the metadata about an event.
-#[derive(Clone, PartialEq, Eq, Encode, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Decode, Serialize))]
-pub struct EventMetadata {
-	pub name: DecodeDifferentStr,
-	pub arguments: DecodeDifferentArray<&'static str, StringBuf>,
-	pub documentation: DecodeDifferentArray<&'static str, StringBuf>,
-}
-
-/// All the metadata about one storage entry.
-#[derive(Clone, PartialEq, Eq, Encode, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Decode, Serialize))]
-pub struct StorageEntryMetadata {
-	pub name: DecodeDifferentStr,
-	pub modifier: StorageEntryModifier,
-	pub ty: StorageEntryType,
-	pub default: ByteGetter,
-	pub documentation: DecodeDifferentArray<&'static str, StringBuf>,
-}
-
-/// All the metadata about one module constant.
-#[derive(Clone, PartialEq, Eq, Encode, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Decode, Serialize))]
-pub struct ModuleConstantMetadata {
-	pub name: DecodeDifferentStr,
-	pub ty: DecodeDifferentStr,
-	pub value: ByteGetter,
-	pub documentation: DecodeDifferentArray<&'static str, StringBuf>,
-}
-
-/// All the metadata about a module error.
-#[derive(Clone, PartialEq, Eq, Encode, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Decode, Serialize))]
-pub struct ErrorMetadata {
-	pub name: DecodeDifferentStr,
-	pub documentation: DecodeDifferentArray<&'static str, StringBuf>,
-}
-
-/// All the metadata about errors in a module.
-pub trait ModuleErrorMetadata {
-	fn metadata() -> &'static [ErrorMetadata];
-}
-
-impl ModuleErrorMetadata for &'static str {
-	fn metadata() -> &'static [ErrorMetadata] {
-		&[]
-	}
-}
-
-/// A technical trait to store lazy initiated vec value as static dyn pointer.
-pub trait DefaultByte: Send + Sync {
-	fn default_byte(&self) -> Vec<u8>;
-}
-
-/// Wrapper over dyn pointer for accessing a cached once byte value.
-#[derive(Clone)]
-pub struct DefaultByteGetter(pub &'static dyn DefaultByte);
-
-/// Decode different for static lazy initiated byte value.
-pub type ByteGetter = DecodeDifferent<DefaultByteGetter, Vec<u8>>;
-
-impl Encode for DefaultByteGetter {
-	fn encode_to<W: Output + ?Sized>(&self, dest: &mut W) {
-		self.0.default_byte().encode_to(dest)
-	}
-}
-
-impl codec::EncodeLike for DefaultByteGetter {}
-
-impl PartialEq<DefaultByteGetter> for DefaultByteGetter {
-	fn eq(&self, other: &DefaultByteGetter) -> bool {
-		let left = self.0.default_byte();
-		let right = other.0.default_byte();
-		left.eq(&right)
-	}
-}
-
-impl Eq for DefaultByteGetter {}
-
-#[cfg(feature = "std")]
-impl serde::Serialize for DefaultByteGetter {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-	where
-		S: serde::Serializer,
-	{
-		self.0.default_byte().serialize(serializer)
-	}
-}
-
-impl sp_std::fmt::Debug for DefaultByteGetter {
-	fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
-		self.0.default_byte().fmt(f)
-	}
-}
-
-/// Hasher used by storage maps
-#[derive(Clone, PartialEq, Eq, Encode, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Decode, Serialize))]
-pub enum StorageHasher {
-	Blake2_128,
-	Blake2_256,
-	Blake2_128Concat,
-	Twox128,
-	Twox256,
-	Twox64Concat,
-	Identity,
-}
-
-/// A storage entry type.
-#[derive(Clone, PartialEq, Eq, Encode, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Decode, Serialize))]
-pub enum StorageEntryType {
-	Plain(DecodeDifferentStr),
-	Map {
-		hasher: StorageHasher,
-		key: DecodeDifferentStr,
-		value: DecodeDifferentStr,
-		// is_linked flag previously, unused now to keep backwards compat
-		unused: bool,
-	},
-	DoubleMap {
-		hasher: StorageHasher,
-		key1: DecodeDifferentStr,
-		key2: DecodeDifferentStr,
-		value: DecodeDifferentStr,
-		key2_hasher: StorageHasher,
-	},
-	NMap {
-		keys: DecodeDifferentArray<&'static str, StringBuf>,
-		hashers: DecodeDifferentArray<StorageHasher>,
-		value: DecodeDifferentStr,
-	},
-}
-
-/// A storage entry modifier.
-#[derive(Clone, PartialEq, Eq, Encode, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Decode, Serialize))]
-pub enum StorageEntryModifier {
-	Optional,
-	Default,
-}
-
-/// All metadata of the storage.
-#[derive(Clone, PartialEq, Eq, Encode, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Decode, Serialize))]
-pub struct StorageMetadata {
-	/// The common prefix used by all storage entries.
-	pub prefix: DecodeDifferent<&'static str, StringBuf>,
-	pub entries: DecodeDifferent<&'static [StorageEntryMetadata], Vec<StorageEntryMetadata>>,
-}
-
-/// Metadata prefixed by a u32 for reserved usage
-#[derive(Eq, Encode, PartialEq, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Decode, Serialize))]
-pub struct RuntimeMetadataPrefixed(pub u32, pub RuntimeMetadata);
-
-/// Metadata of the extrinsic used by the runtime.
-#[derive(Eq, Encode, PartialEq, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Decode, Serialize))]
-pub struct ExtrinsicMetadata {
-	/// Extrinsic version.
-	pub version: u8,
-	/// The signed extensions in the order they appear in the extrinsic.
-	pub signed_extensions: Vec<DecodeDifferentStr>,
-}
-
-/// The metadata of a runtime.
-/// The version ID encoded/decoded through
-/// the enum nature of `RuntimeMetadata`.
-#[derive(Eq, Encode, PartialEq, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Decode, Serialize))]
-pub enum RuntimeMetadata {
-	/// Unused; enum filler.
-	V0(RuntimeMetadataDeprecated),
-	/// Version 1 for runtime metadata. No longer used.
-	V1(RuntimeMetadataDeprecated),
-	/// Version 2 for runtime metadata. No longer used.
-	V2(RuntimeMetadataDeprecated),
-	/// Version 3 for runtime metadata. No longer used.
-	V3(RuntimeMetadataDeprecated),
-	/// Version 4 for runtime metadata. No longer used.
-	V4(RuntimeMetadataDeprecated),
-	/// Version 5 for runtime metadata. No longer used.
-	V5(RuntimeMetadataDeprecated),
-	/// Version 6 for runtime metadata. No longer used.
-	V6(RuntimeMetadataDeprecated),
-	/// Version 7 for runtime metadata. No longer used.
-	V7(RuntimeMetadataDeprecated),
-	/// Version 8 for runtime metadata. No longer used.
-	V8(RuntimeMetadataDeprecated),
-	/// Version 9 for runtime metadata. No longer used.
-	V9(RuntimeMetadataDeprecated),
-	/// Version 10 for runtime metadata. No longer used.
-	V10(RuntimeMetadataDeprecated),
-	/// Version 11 for runtime metadata. No longer used.
-	V11(RuntimeMetadataDeprecated),
-	/// Version 12 for runtime metadata. No longer used.
-	V12(RuntimeMetadataDeprecated),
-	/// Version 13 for runtime metadata.
-	V13(RuntimeMetadataV13),
-}
-
-/// Enum that should fail.
-#[derive(Eq, PartialEq, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Serialize))]
-pub enum RuntimeMetadataDeprecated {}
-
-impl Encode for RuntimeMetadataDeprecated {
-	fn encode_to<W: Output + ?Sized>(&self, _dest: &mut W) {}
-}
-
-impl codec::EncodeLike for RuntimeMetadataDeprecated {}
-
-#[cfg(feature = "std")]
-impl Decode for RuntimeMetadataDeprecated {
-	fn decode<I: Input>(_input: &mut I) -> Result<Self, Error> {
-		Err("Decoding is not supported".into())
-	}
-}
-
-/// The metadata of a runtime.
-#[derive(Eq, Encode, PartialEq, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Decode, Serialize))]
-pub struct RuntimeMetadataV13 {
-	/// Metadata of all the modules.
-	pub modules: DecodeDifferentArray<ModuleMetadata>,
-	/// Metadata of the extrinsic.
-	pub extrinsic: ExtrinsicMetadata,
-}
-
-/// The latest version of the metadata.
-pub type RuntimeMetadataLastVersion = RuntimeMetadataV13;
-
-/// All metadata about an runtime module.
-#[derive(Clone, PartialEq, Eq, Encode, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Decode, Serialize))]
-pub struct ModuleMetadata {
-	pub name: DecodeDifferentStr,
-	pub storage: Option<DecodeDifferent<FnEncode<StorageMetadata>, StorageMetadata>>,
-	pub calls: ODFnA<FunctionMetadata>,
-	pub event: ODFnA<EventMetadata>,
-	pub constants: DFnA<ModuleConstantMetadata>,
-	pub errors: DFnA<ErrorMetadata>,
-	/// Define the index of the module, this index will be used for the encoding of module event,
-	/// call and origin variants.
-	pub index: u8,
-}
-
-type ODFnA<T> = Option<DFnA<T>>;
-type DFnA<T> = DecodeDifferent<FnEncode<&'static [T]>, Vec<T>>;
-
-impl Into<sp_core::OpaqueMetadata> for RuntimeMetadataPrefixed {
-	fn into(self) -> sp_core::OpaqueMetadata {
-		sp_core::OpaqueMetadata::new(self.encode())
-	}
-}
-
-impl Into<RuntimeMetadataPrefixed> for RuntimeMetadataLastVersion {
-	fn into(self) -> RuntimeMetadataPrefixed {
-		RuntimeMetadataPrefixed(META_RESERVED, RuntimeMetadata::V13(self))
-	}
-}
diff --git a/frame/multisig/Cargo.toml b/frame/multisig/Cargo.toml
index 84314256499a..177334d4ccf8 100644
--- a/frame/multisig/Cargo.toml
+++ b/frame/multisig/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
@@ -30,6 +31,7 @@ pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"sp-runtime/std",
 	"frame-support/std",
 	"frame-system/std",
diff --git a/frame/multisig/src/benchmarking.rs b/frame/multisig/src/benchmarking.rs
index 6847036ce471..2e23dff156e0 100644
--- a/frame/multisig/src/benchmarking.rs
+++ b/frame/multisig/src/benchmarking.rs
@@ -40,7 +40,8 @@ fn setup_multi<T: Config>(s: u32, z: u32) -> Result<(Vec<T::AccountId>, Vec<u8>)
 	}
 	signatories.sort();
 	// Must first convert to outer call type.
-	let call: <T as Config>::Call = frame_system::Call::<T>::remark(vec![0; z as usize]).into();
+	let call: <T as Config>::Call =
+		frame_system::Call::<T>::remark { remark: vec![0; z as usize] }.into();
 	let call_data = call.encode();
 	return Ok((signatories, call_data))
 }
@@ -51,7 +52,9 @@ benchmarks! {
 		let z in 0 .. 10_000;
 		let max_signatories = T::MaxSignatories::get().into();
 		let (mut signatories, _) = setup_multi::<T>(max_signatories, z)?;
-		let call: <T as Config>::Call = frame_system::Call::<T>::remark(vec![0; z as usize]).into();
+		let call: <T as Config>::Call = frame_system::Call::<T>::remark {
+			remark: vec![0; z as usize]
+		}.into();
 		let call_hash = call.using_encoded(blake2_256);
 		let multi_account_id = Multisig::<T>::multi_account_id(&signatories, 1);
 		let caller = signatories.pop().ok_or("signatories should have len 2 or more")?;
diff --git a/frame/multisig/src/lib.rs b/frame/multisig/src/lib.rs
index b1ef5f11a5e3..43040ada45a9 100644
--- a/frame/multisig/src/lib.rs
+++ b/frame/multisig/src/lib.rs
@@ -61,6 +61,7 @@ use frame_support::{
 	RuntimeDebug,
 };
 use frame_system::{self as system, RawOrigin};
+use scale_info::TypeInfo;
 use sp_io::hashing::blake2_256;
 use sp_runtime::{
 	traits::{Dispatchable, Zero},
@@ -79,7 +80,7 @@ pub type OpaqueCall = Vec<u8>;
 /// A global extrinsic index, formed as the extrinsic index within a block, together with that
 /// block's height. This allows a transaction in which a multisig operation of a particular
 /// composite was created to be uniquely identified.
-#[derive(Copy, Clone, Eq, PartialEq, Encode, Decode, Default, RuntimeDebug)]
+#[derive(Copy, Clone, Eq, PartialEq, Encode, Decode, Default, RuntimeDebug, TypeInfo)]
 pub struct Timepoint<BlockNumber> {
 	/// The height of the chain at the point in time.
 	height: BlockNumber,
@@ -88,7 +89,7 @@ pub struct Timepoint<BlockNumber> {
 }
 
 /// An open multisig operation.
-#[derive(Clone, Eq, PartialEq, Encode, Decode, Default, RuntimeDebug)]
+#[derive(Clone, Eq, PartialEq, Encode, Decode, Default, RuntimeDebug, TypeInfo)]
 pub struct Multisig<BlockNumber, Balance, AccountId> {
 	/// The extrinsic when the multisig operation was opened.
 	when: Timepoint<BlockNumber>,
@@ -203,11 +204,6 @@ pub mod pallet {
 
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
-	#[pallet::metadata(
-		T::AccountId = "AccountId",
-		T::BlockNumber = "BlockNumber",
-		Timepoint<T::BlockNumber> = "Timepoint<BlockNumber>"
-	)]
 	pub enum Event<T: Config> {
 		/// A new multisig operation has begun. \[approving, multisig, call_hash\]
 		NewMultisig(T::AccountId, T::AccountId, CallHash),
diff --git a/frame/multisig/src/tests.rs b/frame/multisig/src/tests.rs
index 2809a106d66e..3d311cf5d3dc 100644
--- a/frame/multisig/src/tests.rs
+++ b/frame/multisig/src/tests.rs
@@ -99,7 +99,7 @@ impl Contains<Call> for TestBaseCallFilter {
 		match *c {
 			Call::Balances(_) => true,
 			// Needed for benchmarking
-			Call::System(frame_system::Call::remark(_)) => true,
+			Call::System(frame_system::Call::remark { .. }) => true,
 			_ => false,
 		}
 	}
@@ -132,6 +132,10 @@ fn now() -> Timepoint<u64> {
 	Multisig::timepoint()
 }
 
+fn call_transfer(dest: u64, value: u64) -> Call {
+	Call::Balances(BalancesCall::transfer { dest, value })
+}
+
 #[test]
 fn multisig_deposit_is_taken_and_returned() {
 	new_test_ext().execute_with(|| {
@@ -140,7 +144,7 @@ fn multisig_deposit_is_taken_and_returned() {
 		assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
 		assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
 
-		let call = Call::Balances(BalancesCall::transfer(6, 15));
+		let call = call_transfer(6, 15);
 		let call_weight = call.get_dispatch_info().weight;
 		let data = call.encode();
 		assert_ok!(Multisig::as_multi(
@@ -177,7 +181,7 @@ fn multisig_deposit_is_taken_and_returned_with_call_storage() {
 		assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
 		assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
 
-		let call = Call::Balances(BalancesCall::transfer(6, 15));
+		let call = call_transfer(6, 15);
 		let call_weight = call.get_dispatch_info().weight;
 		let data = call.encode();
 		let hash = blake2_256(&data);
@@ -206,7 +210,7 @@ fn multisig_deposit_is_taken_and_returned_with_alt_call_storage() {
 		assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
 		assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
 
-		let call = Call::Balances(BalancesCall::transfer(6, 15));
+		let call = call_transfer(6, 15);
 		let call_weight = call.get_dispatch_info().weight;
 		let data = call.encode();
 		let hash = blake2_256(&data);
@@ -254,7 +258,7 @@ fn multisig_deposit_is_taken_and_returned_with_alt_call_storage() {
 #[test]
 fn cancel_multisig_returns_deposit() {
 	new_test_ext().execute_with(|| {
-		let call = Call::Balances(BalancesCall::transfer(6, 15)).encode();
+		let call = call_transfer(6, 15).encode();
 		let hash = blake2_256(&call);
 		assert_ok!(Multisig::approve_as_multi(
 			Origin::signed(1),
@@ -294,7 +298,7 @@ fn timepoint_checking_works() {
 		assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
 		assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
 
-		let call = Call::Balances(BalancesCall::transfer(6, 15)).encode();
+		let call = call_transfer(6, 15).encode();
 		let hash = blake2_256(&call);
 
 		assert_noop!(
@@ -339,7 +343,7 @@ fn multisig_2_of_3_works_with_call_storing() {
 		assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
 		assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
 
-		let call = Call::Balances(BalancesCall::transfer(6, 15));
+		let call = call_transfer(6, 15);
 		let call_weight = call.get_dispatch_info().weight;
 		let data = call.encode();
 		let hash = blake2_256(&data);
@@ -366,7 +370,7 @@ fn multisig_2_of_3_works() {
 		assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
 		assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
 
-		let call = Call::Balances(BalancesCall::transfer(6, 15));
+		let call = call_transfer(6, 15);
 		let call_weight = call.get_dispatch_info().weight;
 		let data = call.encode();
 		let hash = blake2_256(&data);
@@ -394,7 +398,7 @@ fn multisig_3_of_3_works() {
 		assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
 		assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
 
-		let call = Call::Balances(BalancesCall::transfer(6, 15));
+		let call = call_transfer(6, 15);
 		let call_weight = call.get_dispatch_info().weight;
 		let data = call.encode();
 		let hash = blake2_256(&data);
@@ -432,7 +436,7 @@ fn multisig_3_of_3_works() {
 #[test]
 fn cancel_multisig_works() {
 	new_test_ext().execute_with(|| {
-		let call = Call::Balances(BalancesCall::transfer(6, 15)).encode();
+		let call = call_transfer(6, 15).encode();
 		let hash = blake2_256(&call);
 		assert_ok!(Multisig::approve_as_multi(
 			Origin::signed(1),
@@ -467,7 +471,7 @@ fn cancel_multisig_works() {
 #[test]
 fn cancel_multisig_with_call_storage_works() {
 	new_test_ext().execute_with(|| {
-		let call = Call::Balances(BalancesCall::transfer(6, 15)).encode();
+		let call = call_transfer(6, 15).encode();
 		let hash = blake2_256(&call);
 		assert_ok!(Multisig::as_multi(Origin::signed(1), 3, vec![2, 3], None, call, true, 0));
 		assert_eq!(Balances::free_balance(1), 4);
@@ -497,7 +501,7 @@ fn cancel_multisig_with_call_storage_works() {
 #[test]
 fn cancel_multisig_with_alt_call_storage_works() {
 	new_test_ext().execute_with(|| {
-		let call = Call::Balances(BalancesCall::transfer(6, 15)).encode();
+		let call = call_transfer(6, 15).encode();
 		let hash = blake2_256(&call);
 		assert_ok!(Multisig::approve_as_multi(
 			Origin::signed(1),
@@ -532,7 +536,7 @@ fn multisig_2_of_3_as_multi_works() {
 		assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
 		assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
 
-		let call = Call::Balances(BalancesCall::transfer(6, 15));
+		let call = call_transfer(6, 15);
 		let call_weight = call.get_dispatch_info().weight;
 		let data = call.encode();
 		assert_ok!(Multisig::as_multi(
@@ -567,10 +571,10 @@ fn multisig_2_of_3_as_multi_with_many_calls_works() {
 		assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
 		assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
 
-		let call1 = Call::Balances(BalancesCall::transfer(6, 10));
+		let call1 = call_transfer(6, 10);
 		let call1_weight = call1.get_dispatch_info().weight;
 		let data1 = call1.encode();
-		let call2 = Call::Balances(BalancesCall::transfer(7, 5));
+		let call2 = call_transfer(7, 5);
 		let call2_weight = call2.get_dispatch_info().weight;
 		let data2 = call2.encode();
 
@@ -624,7 +628,7 @@ fn multisig_2_of_3_cannot_reissue_same_call() {
 		assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
 		assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
 
-		let call = Call::Balances(BalancesCall::transfer(6, 10));
+		let call = call_transfer(6, 10);
 		let call_weight = call.get_dispatch_info().weight;
 		let data = call.encode();
 		let hash = blake2_256(&data);
@@ -677,7 +681,7 @@ fn multisig_2_of_3_cannot_reissue_same_call() {
 #[test]
 fn minimum_threshold_check_works() {
 	new_test_ext().execute_with(|| {
-		let call = Call::Balances(BalancesCall::transfer(6, 15)).encode();
+		let call = call_transfer(6, 15).encode();
 		assert_noop!(
 			Multisig::as_multi(Origin::signed(1), 0, vec![2], None, call.clone(), false, 0),
 			Error::<Test>::MinimumThreshold,
@@ -692,7 +696,7 @@ fn minimum_threshold_check_works() {
 #[test]
 fn too_many_signatories_fails() {
 	new_test_ext().execute_with(|| {
-		let call = Call::Balances(BalancesCall::transfer(6, 15)).encode();
+		let call = call_transfer(6, 15).encode();
 		assert_noop!(
 			Multisig::as_multi(Origin::signed(1), 2, vec![2, 3, 4], None, call.clone(), false, 0),
 			Error::<Test>::TooManySignatories,
@@ -703,7 +707,7 @@ fn too_many_signatories_fails() {
 #[test]
 fn duplicate_approvals_are_ignored() {
 	new_test_ext().execute_with(|| {
-		let call = Call::Balances(BalancesCall::transfer(6, 15)).encode();
+		let call = call_transfer(6, 15).encode();
 		let hash = blake2_256(&call);
 		assert_ok!(Multisig::approve_as_multi(
 			Origin::signed(1),
@@ -754,7 +758,7 @@ fn multisig_1_of_3_works() {
 		assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
 		assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
 
-		let call = Call::Balances(BalancesCall::transfer(6, 15)).encode();
+		let call = call_transfer(6, 15).encode();
 		let hash = blake2_256(&call);
 		assert_noop!(
 			Multisig::approve_as_multi(Origin::signed(1), 1, vec![2, 3], None, hash.clone(), 0),
@@ -764,7 +768,7 @@ fn multisig_1_of_3_works() {
 			Multisig::as_multi(Origin::signed(1), 1, vec![2, 3], None, call.clone(), false, 0),
 			Error::<Test>::MinimumThreshold,
 		);
-		let boxed_call = Box::new(Call::Balances(BalancesCall::transfer(6, 15)));
+		let boxed_call = Box::new(call_transfer(6, 15));
 		assert_ok!(Multisig::as_multi_threshold_1(Origin::signed(1), vec![2, 3], boxed_call));
 
 		assert_eq!(Balances::free_balance(6), 15);
@@ -774,7 +778,7 @@ fn multisig_1_of_3_works() {
 #[test]
 fn multisig_filters() {
 	new_test_ext().execute_with(|| {
-		let call = Box::new(Call::System(frame_system::Call::set_code(vec![])));
+		let call = Box::new(Call::System(frame_system::Call::set_code { code: vec![] }));
 		assert_noop!(
 			Multisig::as_multi_threshold_1(Origin::signed(1), vec![2], call.clone()),
 			DispatchError::BadOrigin,
@@ -790,7 +794,7 @@ fn weight_check_works() {
 		assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
 		assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
 
-		let call = Call::Balances(BalancesCall::transfer(6, 15));
+		let call = call_transfer(6, 15);
 		let data = call.encode();
 		assert_ok!(Multisig::as_multi(
 			Origin::signed(1),
@@ -821,7 +825,7 @@ fn multisig_handles_no_preimage_after_all_approve() {
 		assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
 		assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
 
-		let call = Call::Balances(BalancesCall::transfer(6, 15));
+		let call = call_transfer(6, 15);
 		let call_weight = call.get_dispatch_info().weight;
 		let data = call.encode();
 		let hash = blake2_256(&data);
diff --git a/frame/nicks/Cargo.toml b/frame/nicks/Cargo.toml
index 02e64491650c..431ee2c84157 100644
--- a/frame/nicks/Cargo.toml
+++ b/frame/nicks/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
@@ -28,6 +29,7 @@ pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"sp-std/std",
 	"sp-io/std",
 	"sp-runtime/std",
diff --git a/frame/nicks/src/lib.rs b/frame/nicks/src/lib.rs
index a5c22b619a5e..16c7e2042dda 100644
--- a/frame/nicks/src/lib.rs
+++ b/frame/nicks/src/lib.rs
@@ -91,7 +91,6 @@ pub mod pallet {
 
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
-	#[pallet::metadata(T::AccountId = "AccountId", BalanceOf<T> = "Balance")]
 	pub enum Event<T: Config> {
 		/// A name was set. \[who\]
 		NameSet(T::AccountId),
diff --git a/frame/node-authorization/Cargo.toml b/frame/node-authorization/Cargo.toml
index 35b02747e400..635e72e3a8b8 100644
--- a/frame/node-authorization/Cargo.toml
+++ b/frame/node-authorization/Cargo.toml
@@ -13,6 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
@@ -25,6 +26,7 @@ log = { version = "0.4.14", default-features = false }
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"frame-support/std",
 	"frame-system/std",
 	"sp-core/std",
diff --git a/frame/node-authorization/src/lib.rs b/frame/node-authorization/src/lib.rs
index 5551ec2ad2c4..016f12d2eb83 100644
--- a/frame/node-authorization/src/lib.rs
+++ b/frame/node-authorization/src/lib.rs
@@ -126,7 +126,6 @@ pub mod pallet {
 
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
-	#[pallet::metadata(T::AccountId = "AccountId")]
 	pub enum Event<T: Config> {
 		/// The given well known node was added.
 		NodeAdded(PeerId, T::AccountId),
diff --git a/frame/offences/Cargo.toml b/frame/offences/Cargo.toml
index c4295747d649..8fdcbf46fa3e 100644
--- a/frame/offences/Cargo.toml
+++ b/frame/offences/Cargo.toml
@@ -15,6 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 pallet-balances = { version = "4.0.0-dev", default-features = false, path = "../balances" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 serde = { version = "1.0.126", optional = true }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
@@ -32,6 +33,7 @@ default = ["std"]
 std = [
 	"pallet-balances/std",
 	"codec/std",
+	"scale-info/std",
 	"sp-std/std",
 	"serde",
 	"sp-runtime/std",
diff --git a/frame/offences/benchmarking/Cargo.toml b/frame/offences/benchmarking/Cargo.toml
index dc408ee8121d..b21e6cf9b7e1 100644
--- a/frame/offences/benchmarking/Cargo.toml
+++ b/frame/offences/benchmarking/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../../benchmarking" }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../../support" }
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../../system" }
@@ -57,4 +58,5 @@ std = [
 	"frame-election-provider-support/std",
 	"sp-std/std",
 	"codec/std",
+	"scale-info/std",
 ]
diff --git a/frame/proxy/Cargo.toml b/frame/proxy/Cargo.toml
index 22edf1f3c20a..83db82990d10 100644
--- a/frame/proxy/Cargo.toml
+++ b/frame/proxy/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["max-encoded-len"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
@@ -31,6 +32,7 @@ pallet-utility = { version = "4.0.0-dev", path = "../utility" }
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"sp-runtime/std",
 	"frame-support/std",
 	"frame-system/std",
diff --git a/frame/proxy/src/benchmarking.rs b/frame/proxy/src/benchmarking.rs
index 77cdff11de9c..e66f6782c19e 100644
--- a/frame/proxy/src/benchmarking.rs
+++ b/frame/proxy/src/benchmarking.rs
@@ -83,7 +83,7 @@ benchmarks! {
 		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 		// ... and "real" is the traditional caller. This is not a typo.
 		let real: T::AccountId = whitelisted_caller();
-		let call: <T as Config>::Call = frame_system::Call::<T>::remark(vec![]).into();
+		let call: <T as Config>::Call = frame_system::Call::<T>::remark { remark: vec![] }.into();
 	}: _(RawOrigin::Signed(caller), real, Some(T::ProxyType::default()), Box::new(call))
 	verify {
 		assert_last_event::<T>(Event::ProxyExecuted(Ok(())).into())
@@ -98,7 +98,7 @@ benchmarks! {
 		T::Currency::make_free_balance_be(&delegate, BalanceOf::<T>::max_value());
 		// ... and "real" is the traditional caller. This is not a typo.
 		let real: T::AccountId = whitelisted_caller();
-		let call: <T as Config>::Call = frame_system::Call::<T>::remark(vec![]).into();
+		let call: <T as Config>::Call = frame_system::Call::<T>::remark { remark: vec![] }.into();
 		Proxy::<T>::announce(
 			RawOrigin::Signed(delegate.clone()).into(),
 			real.clone(),
@@ -118,7 +118,7 @@ benchmarks! {
 		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 		// ... and "real" is the traditional caller. This is not a typo.
 		let real: T::AccountId = whitelisted_caller();
-		let call: <T as Config>::Call = frame_system::Call::<T>::remark(vec![]).into();
+		let call: <T as Config>::Call = frame_system::Call::<T>::remark { remark: vec![] }.into();
 		Proxy::<T>::announce(
 			RawOrigin::Signed(caller.clone()).into(),
 			real.clone(),
@@ -139,7 +139,7 @@ benchmarks! {
 		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 		// ... and "real" is the traditional caller. This is not a typo.
 		let real: T::AccountId = whitelisted_caller();
-		let call: <T as Config>::Call = frame_system::Call::<T>::remark(vec![]).into();
+		let call: <T as Config>::Call = frame_system::Call::<T>::remark { remark: vec![] }.into();
 		Proxy::<T>::announce(
 			RawOrigin::Signed(caller.clone()).into(),
 			real.clone(),
@@ -161,7 +161,7 @@ benchmarks! {
 		// ... and "real" is the traditional caller. This is not a typo.
 		let real: T::AccountId = whitelisted_caller();
 		add_announcements::<T>(a, Some(caller.clone()), None)?;
-		let call: <T as Config>::Call = frame_system::Call::<T>::remark(vec![]).into();
+		let call: <T as Config>::Call = frame_system::Call::<T>::remark { remark: vec![] }.into();
 		let call_hash = T::CallHasher::hash_of(&call);
 	}: _(RawOrigin::Signed(caller.clone()), real.clone(), call_hash)
 	verify {
diff --git a/frame/proxy/src/lib.rs b/frame/proxy/src/lib.rs
index 0537ed4a3239..b73101fa7348 100644
--- a/frame/proxy/src/lib.rs
+++ b/frame/proxy/src/lib.rs
@@ -42,6 +42,7 @@ use frame_support::{
 	RuntimeDebug,
 };
 use frame_system::{self as system};
+use scale_info::TypeInfo;
 use sp_io::hashing::blake2_256;
 use sp_runtime::{
 	traits::{Dispatchable, Hash, Saturating, Zero},
@@ -60,7 +61,17 @@ type BalanceOf<T> =
 /// The parameters under which a particular account has a proxy relationship with some other
 /// account.
 #[derive(
-	Encode, Decode, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, RuntimeDebug, MaxEncodedLen,
+	Encode,
+	Decode,
+	Clone,
+	Copy,
+	Eq,
+	PartialEq,
+	Ord,
+	PartialOrd,
+	RuntimeDebug,
+	MaxEncodedLen,
+	TypeInfo,
 )]
 pub struct ProxyDefinition<AccountId, ProxyType, BlockNumber> {
 	/// The account which may act on behalf of another.
@@ -73,7 +84,7 @@ pub struct ProxyDefinition<AccountId, ProxyType, BlockNumber> {
 }
 
 /// Details surrounding a specific instance of an announcement to make a call.
-#[derive(Encode, Decode, Clone, Copy, Eq, PartialEq, RuntimeDebug, MaxEncodedLen)]
+#[derive(Encode, Decode, Clone, Copy, Eq, PartialEq, RuntimeDebug, MaxEncodedLen, TypeInfo)]
 pub struct Announcement<AccountId, Hash, BlockNumber> {
 	/// The account which made the announcement.
 	real: AccountId,
@@ -534,12 +545,6 @@ pub mod pallet {
 	}
 
 	#[pallet::event]
-	#[pallet::metadata(
-		T::AccountId = "AccountId",
-		T::ProxyType = "ProxyType",
-		CallHashOf<T> = "Hash",
-		T::BlockNumber = "BlockNumber",
-	)]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
 	pub enum Event<T: Config> {
 		/// A proxy was executed correctly, with the given \[result\].
@@ -782,12 +787,13 @@ impl<T: Config> Pallet<T> {
 			match c.is_sub_type() {
 				// Proxy call cannot add or remove a proxy with more permissions than it already
 				// has.
-				Some(Call::add_proxy(_, ref pt, _)) | Some(Call::remove_proxy(_, ref pt, _))
-					if !def.proxy_type.is_superset(&pt) =>
+				Some(Call::add_proxy { ref proxy_type, .. }) |
+				Some(Call::remove_proxy { ref proxy_type, .. })
+					if !def.proxy_type.is_superset(&proxy_type) =>
 					false,
 				// Proxy call cannot remove all proxies or kill anonymous proxies unless it has full
 				// permissions.
-				Some(Call::remove_proxies(..)) | Some(Call::kill_anonymous(..))
+				Some(Call::remove_proxies { .. }) | Some(Call::kill_anonymous { .. })
 					if def.proxy_type != T::ProxyType::default() =>
 					false,
 				_ => def.proxy_type.filter(c),
diff --git a/frame/proxy/src/tests.rs b/frame/proxy/src/tests.rs
index eb4193a18d93..d319ebb1a5ab 100644
--- a/frame/proxy/src/tests.rs
+++ b/frame/proxy/src/tests.rs
@@ -107,7 +107,17 @@ parameter_types! {
 	pub const AnnouncementDepositFactor: u64 = 1;
 }
 #[derive(
-	Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, RuntimeDebug, MaxEncodedLen,
+	Copy,
+	Clone,
+	Eq,
+	PartialEq,
+	Ord,
+	PartialOrd,
+	Encode,
+	Decode,
+	RuntimeDebug,
+	MaxEncodedLen,
+	scale_info::TypeInfo,
 )]
 pub enum ProxyType {
 	Any,
@@ -124,9 +134,9 @@ impl InstanceFilter<Call> for ProxyType {
 		match self {
 			ProxyType::Any => true,
 			ProxyType::JustTransfer => {
-				matches!(c, Call::Balances(pallet_balances::Call::transfer(..)))
+				matches!(c, Call::Balances(pallet_balances::Call::transfer { .. }))
 			},
-			ProxyType::JustUtility => matches!(c, Call::Utility(..)),
+			ProxyType::JustUtility => matches!(c, Call::Utility { .. }),
 		}
 	}
 	fn is_superset(&self, o: &Self) -> bool {
@@ -138,7 +148,7 @@ impl Contains<Call> for BaseFilter {
 	fn contains(c: &Call) -> bool {
 		match *c {
 			// Remark is used as a no-op call in the benchmarking
-			Call::System(SystemCall::remark(_)) => true,
+			Call::System(SystemCall::remark { .. }) => true,
 			Call::System(_) => false,
 			_ => true,
 		}
@@ -190,6 +200,10 @@ fn expect_events(e: Vec<Event>) {
 	assert_eq!(last_events(e.len()), e);
 }
 
+fn call_transfer(dest: u64, value: u64) -> Call {
+	Call::Balances(BalancesCall::transfer { dest, value })
+}
+
 #[test]
 fn announcement_works() {
 	new_test_ext().execute_with(|| {
@@ -272,7 +286,7 @@ fn announcer_must_be_proxy() {
 fn delayed_requires_pre_announcement() {
 	new_test_ext().execute_with(|| {
 		assert_ok!(Proxy::add_proxy(Origin::signed(1), 2, ProxyType::Any, 1));
-		let call = Box::new(Call::Balances(BalancesCall::transfer(6, 1)));
+		let call = Box::new(call_transfer(6, 1));
 		let e = Error::<Test>::Unannounced;
 		assert_noop!(Proxy::proxy(Origin::signed(2), 1, None, call.clone()), e);
 		let e = Error::<Test>::Unannounced;
@@ -289,7 +303,7 @@ fn proxy_announced_removes_announcement_and_returns_deposit() {
 	new_test_ext().execute_with(|| {
 		assert_ok!(Proxy::add_proxy(Origin::signed(1), 3, ProxyType::Any, 1));
 		assert_ok!(Proxy::add_proxy(Origin::signed(2), 3, ProxyType::Any, 1));
-		let call = Box::new(Call::Balances(BalancesCall::transfer(6, 1)));
+		let call = Box::new(call_transfer(6, 1));
 		let call_hash = BlakeTwo256::hash_of(&call);
 		assert_ok!(Proxy::announce(Origin::signed(3), 1, call_hash));
 		assert_ok!(Proxy::announce(Origin::signed(3), 2, call_hash));
@@ -313,7 +327,7 @@ fn filtering_works() {
 		assert_ok!(Proxy::add_proxy(Origin::signed(1), 3, ProxyType::JustTransfer, 0));
 		assert_ok!(Proxy::add_proxy(Origin::signed(1), 4, ProxyType::JustUtility, 0));
 
-		let call = Box::new(Call::Balances(BalancesCall::transfer(6, 1)));
+		let call = Box::new(call_transfer(6, 1));
 		assert_ok!(Proxy::proxy(Origin::signed(2), 1, None, call.clone()));
 		System::assert_last_event(ProxyEvent::ProxyExecuted(Ok(())).into());
 		assert_ok!(Proxy::proxy(Origin::signed(3), 1, None, call.clone()));
@@ -323,9 +337,10 @@ fn filtering_works() {
 
 		let derivative_id = Utility::derivative_account_id(1, 0);
 		assert!(Balances::mutate_account(&derivative_id, |a| a.free = 1000).is_ok());
-		let inner = Box::new(Call::Balances(BalancesCall::transfer(6, 1)));
+		let inner = Box::new(call_transfer(6, 1));
 
-		let call = Box::new(Call::Utility(UtilityCall::as_derivative(0, inner.clone())));
+		let call =
+			Box::new(Call::Utility(UtilityCall::as_derivative { index: 0, call: inner.clone() }));
 		assert_ok!(Proxy::proxy(Origin::signed(2), 1, None, call.clone()));
 		System::assert_last_event(ProxyEvent::ProxyExecuted(Ok(())).into());
 		assert_ok!(Proxy::proxy(Origin::signed(3), 1, None, call.clone()));
@@ -333,7 +348,7 @@ fn filtering_works() {
 		assert_ok!(Proxy::proxy(Origin::signed(4), 1, None, call.clone()));
 		System::assert_last_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)).into());
 
-		let call = Box::new(Call::Utility(UtilityCall::batch(vec![*inner])));
+		let call = Box::new(Call::Utility(UtilityCall::batch { calls: vec![*inner] }));
 		assert_ok!(Proxy::proxy(Origin::signed(2), 1, None, call.clone()));
 		expect_events(vec![
 			UtilityEvent::BatchCompleted.into(),
@@ -347,8 +362,9 @@ fn filtering_works() {
 			ProxyEvent::ProxyExecuted(Ok(())).into(),
 		]);
 
-		let inner = Box::new(Call::Proxy(ProxyCall::add_proxy(5, ProxyType::Any, 0)));
-		let call = Box::new(Call::Utility(UtilityCall::batch(vec![*inner])));
+		let inner =
+			Box::new(Call::Proxy(ProxyCall::new_call_variant_add_proxy(5, ProxyType::Any, 0)));
+		let call = Box::new(Call::Utility(UtilityCall::batch { calls: vec![*inner] }));
 		assert_ok!(Proxy::proxy(Origin::signed(2), 1, None, call.clone()));
 		expect_events(vec![
 			UtilityEvent::BatchCompleted.into(),
@@ -362,7 +378,7 @@ fn filtering_works() {
 			ProxyEvent::ProxyExecuted(Ok(())).into(),
 		]);
 
-		let call = Box::new(Call::Proxy(ProxyCall::remove_proxies()));
+		let call = Box::new(Call::Proxy(ProxyCall::remove_proxies {}));
 		assert_ok!(Proxy::proxy(Origin::signed(3), 1, None, call.clone()));
 		System::assert_last_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)).into());
 		assert_ok!(Proxy::proxy(Origin::signed(4), 1, None, call.clone()));
@@ -431,7 +447,7 @@ fn proxying_works() {
 		assert_ok!(Proxy::add_proxy(Origin::signed(1), 2, ProxyType::JustTransfer, 0));
 		assert_ok!(Proxy::add_proxy(Origin::signed(1), 3, ProxyType::Any, 0));
 
-		let call = Box::new(Call::Balances(BalancesCall::transfer(6, 1)));
+		let call = Box::new(call_transfer(6, 1));
 		assert_noop!(
 			Proxy::proxy(Origin::signed(4), 1, None, call.clone()),
 			Error::<Test>::NotProxy
@@ -444,14 +460,14 @@ fn proxying_works() {
 		System::assert_last_event(ProxyEvent::ProxyExecuted(Ok(())).into());
 		assert_eq!(Balances::free_balance(6), 1);
 
-		let call = Box::new(Call::System(SystemCall::set_code(vec![])));
+		let call = Box::new(Call::System(SystemCall::set_code { code: vec![] }));
 		assert_ok!(Proxy::proxy(Origin::signed(3), 1, None, call.clone()));
 		System::assert_last_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)).into());
 
-		let call = Box::new(Call::Balances(BalancesCall::transfer_keep_alive(6, 1)));
-		assert_ok!(
-			Call::Proxy(super::Call::proxy(1, None, call.clone())).dispatch(Origin::signed(2))
-		);
+		let call =
+			Box::new(Call::Balances(BalancesCall::transfer_keep_alive { dest: 6, value: 1 }));
+		assert_ok!(Call::Proxy(super::Call::new_call_variant_proxy(1, None, call.clone()))
+			.dispatch(Origin::signed(2)));
 		System::assert_last_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)).into());
 		assert_ok!(Proxy::proxy(Origin::signed(3), 1, None, call.clone()));
 		System::assert_last_event(ProxyEvent::ProxyExecuted(Ok(())).into());
@@ -483,13 +499,19 @@ fn anonymous_works() {
 		System::set_block_number(2);
 		assert_ok!(Proxy::anonymous(Origin::signed(1), ProxyType::Any, 0, 0));
 
-		let call = Box::new(Call::Balances(BalancesCall::transfer(6, 1)));
+		let call = Box::new(call_transfer(6, 1));
 		assert_ok!(Balances::transfer(Origin::signed(3), anon, 5));
 		assert_ok!(Proxy::proxy(Origin::signed(1), anon, None, call));
 		System::assert_last_event(ProxyEvent::ProxyExecuted(Ok(())).into());
 		assert_eq!(Balances::free_balance(6), 1);
 
-		let call = Box::new(Call::Proxy(ProxyCall::kill_anonymous(1, ProxyType::Any, 0, 1, 0)));
+		let call = Box::new(Call::Proxy(ProxyCall::new_call_variant_kill_anonymous(
+			1,
+			ProxyType::Any,
+			0,
+			1,
+			0,
+		)));
 		assert_ok!(Proxy::proxy(Origin::signed(2), anon2, None, call.clone()));
 		let de = DispatchError::from(Error::<Test>::NoPermission).stripped();
 		System::assert_last_event(ProxyEvent::ProxyExecuted(Err(de)).into());
diff --git a/frame/randomness-collective-flip/Cargo.toml b/frame/randomness-collective-flip/Cargo.toml
index 016d56142eca..5e8eb6b08287 100644
--- a/frame/randomness-collective-flip/Cargo.toml
+++ b/frame/randomness-collective-flip/Cargo.toml
@@ -15,6 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 safe-mix = { version = "1.0", default-features = false }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 
@@ -30,6 +31,7 @@ default = ["std"]
 std = [
 	"safe-mix/std",
 	"codec/std",
+	"scale-info/std",
 	"sp-runtime/std",
 	"sp-std/std",
 	"frame-system/std",
diff --git a/frame/recovery/Cargo.toml b/frame/recovery/Cargo.toml
index b8601d0852f6..40a89e9b59f8 100644
--- a/frame/recovery/Cargo.toml
+++ b/frame/recovery/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
@@ -28,6 +29,7 @@ pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"sp-std/std",
 	"sp-io/std",
 	"sp-runtime/std",
diff --git a/frame/recovery/src/lib.rs b/frame/recovery/src/lib.rs
index ad61baae60c9..797581788077 100644
--- a/frame/recovery/src/lib.rs
+++ b/frame/recovery/src/lib.rs
@@ -155,6 +155,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use codec::{Decode, Encode};
+use scale_info::TypeInfo;
 use sp_runtime::traits::{CheckedAdd, CheckedMul, Dispatchable, SaturatedConversion};
 use sp_std::prelude::*;
 
@@ -176,7 +177,7 @@ type BalanceOf<T> =
 	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 
 /// An active recovery process.
-#[derive(Clone, Eq, PartialEq, Encode, Decode, Default, RuntimeDebug)]
+#[derive(Clone, Eq, PartialEq, Encode, Decode, Default, RuntimeDebug, TypeInfo)]
 pub struct ActiveRecovery<BlockNumber, Balance, AccountId> {
 	/// The block number when the recovery process started.
 	created: BlockNumber,
@@ -188,7 +189,7 @@ pub struct ActiveRecovery<BlockNumber, Balance, AccountId> {
 }
 
 /// Configuration for recovering an account.
-#[derive(Clone, Eq, PartialEq, Encode, Decode, Default, RuntimeDebug)]
+#[derive(Clone, Eq, PartialEq, Encode, Decode, Default, RuntimeDebug, TypeInfo)]
 pub struct RecoveryConfig<BlockNumber, Balance, AccountId> {
 	/// The minimum number of blocks since the start of the recovery process before the account
 	/// can be recovered.
@@ -260,7 +261,6 @@ pub mod pallet {
 	/// Events type.
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
-	#[pallet::metadata(T::AccountId = "AccountId")]
 	pub enum Event<T: Config> {
 		/// A recovery process has been set up for an \[account\].
 		RecoveryCreated(T::AccountId),
diff --git a/frame/recovery/src/tests.rs b/frame/recovery/src/tests.rs
index 122088bf5ed6..fe971319bc97 100644
--- a/frame/recovery/src/tests.rs
+++ b/frame/recovery/src/tests.rs
@@ -44,7 +44,7 @@ fn set_recovered_works() {
 		// Root can set a recovered account though
 		assert_ok!(Recovery::set_recovered(Origin::root(), 5, 1));
 		// Account 1 should now be able to make a call through account 5
-		let call = Box::new(Call::Balances(BalancesCall::transfer(1, 100)));
+		let call = Box::new(Call::Balances(BalancesCall::transfer { dest: 1, value: 100 }));
 		assert_ok!(Recovery::as_recovered(Origin::signed(1), 5, call));
 		// Account 1 has successfully drained the funds from account 5
 		assert_eq!(Balances::free_balance(1), 200);
@@ -76,15 +76,15 @@ fn recovery_life_cycle_works() {
 		assert_ok!(Recovery::claim_recovery(Origin::signed(1), 5));
 		// Account 1 can use account 5 to close the active recovery process, claiming the deposited
 		// funds used to initiate the recovery process into account 5.
-		let call = Box::new(Call::Recovery(RecoveryCall::close_recovery(1)));
+		let call = Box::new(Call::Recovery(RecoveryCall::close_recovery { rescuer: 1 }));
 		assert_ok!(Recovery::as_recovered(Origin::signed(1), 5, call));
 		// Account 1 can then use account 5 to remove the recovery configuration, claiming the
 		// deposited funds used to create the recovery configuration into account 5.
-		let call = Box::new(Call::Recovery(RecoveryCall::remove_recovery()));
+		let call = Box::new(Call::Recovery(RecoveryCall::remove_recovery {}));
 		assert_ok!(Recovery::as_recovered(Origin::signed(1), 5, call));
 		// Account 1 should now be able to make a call through account 5 to get all of their funds
 		assert_eq!(Balances::free_balance(5), 110);
-		let call = Box::new(Call::Balances(BalancesCall::transfer(1, 110)));
+		let call = Box::new(Call::Balances(BalancesCall::transfer { dest: 1, value: 110 }));
 		assert_ok!(Recovery::as_recovered(Origin::signed(1), 5, call));
 		// All funds have been fully recovered!
 		assert_eq!(Balances::free_balance(1), 200);
diff --git a/frame/scheduler/Cargo.toml b/frame/scheduler/Cargo.toml
index 93f76b2369f2..62b21fe04c9d 100644
--- a/frame/scheduler/Cargo.toml
+++ b/frame/scheduler/Cargo.toml
@@ -11,6 +11,7 @@ readme = "README.md"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
@@ -28,6 +29,7 @@ substrate-test-utils = { version = "4.0.0-dev", path = "../../test-utils" }
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"sp-runtime/std",
 	"frame-benchmarking/std",
 	"frame-support/std",
diff --git a/frame/scheduler/src/benchmarking.rs b/frame/scheduler/src/benchmarking.rs
index c122bed71b1f..2c164eaede22 100644
--- a/frame/scheduler/src/benchmarking.rs
+++ b/frame/scheduler/src/benchmarking.rs
@@ -33,7 +33,7 @@ const BLOCK_NUMBER: u32 = 2;
 // Add `n` named items to the schedule
 fn fill_schedule<T: Config>(when: T::BlockNumber, n: u32) -> Result<(), &'static str> {
 	// Essentially a no-op call.
-	let call = frame_system::Call::set_storage(vec![]);
+	let call = frame_system::Call::set_storage { items: vec![] };
 	for i in 0..n {
 		// Named schedule is strictly heavier than anonymous
 		Scheduler::<T>::do_schedule_named(
@@ -58,7 +58,7 @@ benchmarks! {
 		let periodic = Some((T::BlockNumber::one(), 100));
 		let priority = 0;
 		// Essentially a no-op call.
-		let call = Box::new(frame_system::Call::set_storage(vec![]).into());
+		let call = Box::new(frame_system::Call::set_storage { items: vec![] }.into());
 
 		fill_schedule::<T>(when, s)?;
 	}: _(RawOrigin::Root, when, periodic, priority, call)
@@ -95,7 +95,7 @@ benchmarks! {
 		let periodic = Some((T::BlockNumber::one(), 100));
 		let priority = 0;
 		// Essentially a no-op call.
-		let call = Box::new(frame_system::Call::set_storage(vec![]).into());
+		let call = Box::new(frame_system::Call::set_storage { items: vec![] }.into());
 
 		fill_schedule::<T>(when, s)?;
 	}: _(RawOrigin::Root, id, when, periodic, priority, call)
diff --git a/frame/scheduler/src/lib.rs b/frame/scheduler/src/lib.rs
index ceb163a432e7..ca9e15812a76 100644
--- a/frame/scheduler/src/lib.rs
+++ b/frame/scheduler/src/lib.rs
@@ -64,6 +64,7 @@ use frame_support::{
 };
 use frame_system::{self as system, ensure_signed};
 pub use pallet::*;
+use scale_info::TypeInfo;
 use sp_runtime::{
 	traits::{BadOrigin, One, Saturating, Zero},
 	RuntimeDebug,
@@ -87,7 +88,7 @@ struct ScheduledV1<Call, BlockNumber> {
 
 /// Information regarding an item to be executed in the future.
 #[cfg_attr(any(feature = "std", test), derive(PartialEq, Eq))]
-#[derive(Clone, RuntimeDebug, Encode, Decode)]
+#[derive(Clone, RuntimeDebug, Encode, Decode, TypeInfo)]
 pub struct ScheduledV2<Call, BlockNumber, PalletsOrigin, AccountId> {
 	/// The unique identity for this task, if there is one.
 	maybe_id: Option<Vec<u8>>,
@@ -109,7 +110,7 @@ pub type Scheduled<Call, BlockNumber, PalletsOrigin, AccountId> =
 // A value placed in storage that represents the current version of the Scheduler storage.
 // This value is used by the `on_runtime_upgrade` logic to determine whether we run
 // storage migration logic.
-#[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, RuntimeDebug)]
+#[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, RuntimeDebug, TypeInfo)]
 enum Releases {
 	V1,
 	V2,
@@ -143,7 +144,7 @@ pub mod pallet {
 			+ IsType<<Self as system::Config>::Origin>;
 
 		/// The caller origin, overarching type of all pallets origins.
-		type PalletsOrigin: From<system::RawOrigin<Self::AccountId>> + Codec + Clone + Eq;
+		type PalletsOrigin: From<system::RawOrigin<Self::AccountId>> + Codec + Clone + Eq + TypeInfo;
 
 		/// The aggregated call type.
 		type Call: Parameter
@@ -192,7 +193,6 @@ pub mod pallet {
 	/// Events type.
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
-	#[pallet::metadata(T::BlockNumber = "BlockNumber", TaskAddress<T::BlockNumber> = "TaskAddress<BlockNumber>")]
 	pub enum Event<T: Config> {
 		/// Scheduled some task. \[when, index\]
 		Scheduled(T::BlockNumber, u32),
@@ -926,7 +926,7 @@ mod tests {
 	pub struct BaseFilter;
 	impl Contains<Call> for BaseFilter {
 		fn contains(call: &Call) -> bool {
-			!matches!(call, Call::Logger(LoggerCall::log(_, _)))
+			!matches!(call, Call::Logger(LoggerCall::log { .. }))
 		}
 	}
 
@@ -1004,7 +1004,7 @@ mod tests {
 	#[test]
 	fn basic_scheduling_works() {
 		new_test_ext().execute_with(|| {
-			let call = Call::Logger(LoggerCall::log(42, 1000));
+			let call = Call::Logger(LoggerCall::log { i: 42, weight: 1000 });
 			assert!(!<Test as frame_system::Config>::BaseCallFilter::contains(&call));
 			assert_ok!(Scheduler::do_schedule(DispatchTime::At(4), None, 127, root(), call));
 			run_to_block(3);
@@ -1020,7 +1020,7 @@ mod tests {
 	fn schedule_after_works() {
 		new_test_ext().execute_with(|| {
 			run_to_block(2);
-			let call = Call::Logger(LoggerCall::log(42, 1000));
+			let call = Call::Logger(LoggerCall::log { i: 42, weight: 1000 });
 			assert!(!<Test as frame_system::Config>::BaseCallFilter::contains(&call));
 			// This will schedule the call 3 blocks after the next block... so block 3 + 3 = 6
 			assert_ok!(Scheduler::do_schedule(DispatchTime::After(3), None, 127, root(), call));
@@ -1037,7 +1037,7 @@ mod tests {
 	fn schedule_after_zero_works() {
 		new_test_ext().execute_with(|| {
 			run_to_block(2);
-			let call = Call::Logger(LoggerCall::log(42, 1000));
+			let call = Call::Logger(LoggerCall::log { i: 42, weight: 1000 });
 			assert!(!<Test as frame_system::Config>::BaseCallFilter::contains(&call));
 			assert_ok!(Scheduler::do_schedule(DispatchTime::After(0), None, 127, root(), call));
 			// Will trigger on the next block.
@@ -1057,7 +1057,7 @@ mod tests {
 				Some((3, 3)),
 				127,
 				root(),
-				Call::Logger(logger::Call::log(42, 1000))
+				Call::Logger(logger::Call::log { i: 42, weight: 1000 })
 			));
 			run_to_block(3);
 			assert!(logger::log().is_empty());
@@ -1079,7 +1079,7 @@ mod tests {
 	#[test]
 	fn reschedule_works() {
 		new_test_ext().execute_with(|| {
-			let call = Call::Logger(LoggerCall::log(42, 1000));
+			let call = Call::Logger(LoggerCall::log { i: 42, weight: 1000 });
 			assert!(!<Test as frame_system::Config>::BaseCallFilter::contains(&call));
 			assert_eq!(
 				Scheduler::do_schedule(DispatchTime::At(4), None, 127, root(), call).unwrap(),
@@ -1110,7 +1110,7 @@ mod tests {
 	#[test]
 	fn reschedule_named_works() {
 		new_test_ext().execute_with(|| {
-			let call = Call::Logger(LoggerCall::log(42, 1000));
+			let call = Call::Logger(LoggerCall::log { i: 42, weight: 1000 });
 			assert!(!<Test as frame_system::Config>::BaseCallFilter::contains(&call));
 			assert_eq!(
 				Scheduler::do_schedule_named(
@@ -1152,7 +1152,7 @@ mod tests {
 	#[test]
 	fn reschedule_named_perodic_works() {
 		new_test_ext().execute_with(|| {
-			let call = Call::Logger(LoggerCall::log(42, 1000));
+			let call = Call::Logger(LoggerCall::log { i: 42, weight: 1000 });
 			assert!(!<Test as frame_system::Config>::BaseCallFilter::contains(&call));
 			assert_eq!(
 				Scheduler::do_schedule_named(
@@ -1214,7 +1214,7 @@ mod tests {
 				None,
 				127,
 				root(),
-				Call::Logger(LoggerCall::log(69, 1000)),
+				Call::Logger(LoggerCall::log { i: 69, weight: 1000 }),
 			)
 			.unwrap();
 			let i = Scheduler::do_schedule(
@@ -1222,7 +1222,7 @@ mod tests {
 				None,
 				127,
 				root(),
-				Call::Logger(LoggerCall::log(42, 1000)),
+				Call::Logger(LoggerCall::log { i: 42, weight: 1000 }),
 			)
 			.unwrap();
 			run_to_block(3);
@@ -1244,7 +1244,7 @@ mod tests {
 				Some((3, 3)),
 				127,
 				root(),
-				Call::Logger(LoggerCall::log(42, 1000)),
+				Call::Logger(LoggerCall::log { i: 42, weight: 1000 }),
 			)
 			.unwrap();
 			// same id results in error.
@@ -1254,7 +1254,7 @@ mod tests {
 				None,
 				127,
 				root(),
-				Call::Logger(LoggerCall::log(69, 1000))
+				Call::Logger(LoggerCall::log { i: 69, weight: 1000 })
 			)
 			.is_err());
 			// different id is ok.
@@ -1264,7 +1264,7 @@ mod tests {
 				None,
 				127,
 				root(),
-				Call::Logger(LoggerCall::log(69, 1000)),
+				Call::Logger(LoggerCall::log { i: 69, weight: 1000 }),
 			)
 			.unwrap();
 			run_to_block(3);
@@ -1286,14 +1286,14 @@ mod tests {
 				None,
 				127,
 				root(),
-				Call::Logger(LoggerCall::log(42, MaximumSchedulerWeight::get() / 2))
+				Call::Logger(LoggerCall::log { i: 42, weight: MaximumSchedulerWeight::get() / 2 })
 			));
 			assert_ok!(Scheduler::do_schedule(
 				DispatchTime::At(4),
 				None,
 				127,
 				root(),
-				Call::Logger(LoggerCall::log(69, MaximumSchedulerWeight::get() / 2))
+				Call::Logger(LoggerCall::log { i: 69, weight: MaximumSchedulerWeight::get() / 2 })
 			));
 			// 69 and 42 do not fit together
 			run_to_block(4);
@@ -1311,14 +1311,14 @@ mod tests {
 				None,
 				0,
 				root(),
-				Call::Logger(LoggerCall::log(42, MaximumSchedulerWeight::get() / 2))
+				Call::Logger(LoggerCall::log { i: 42, weight: MaximumSchedulerWeight::get() / 2 })
 			));
 			assert_ok!(Scheduler::do_schedule(
 				DispatchTime::At(4),
 				None,
 				0,
 				root(),
-				Call::Logger(LoggerCall::log(69, MaximumSchedulerWeight::get() / 2))
+				Call::Logger(LoggerCall::log { i: 69, weight: MaximumSchedulerWeight::get() / 2 })
 			));
 			// With base weights, 69 and 42 should not fit together, but do because of hard
 			// deadlines
@@ -1335,14 +1335,14 @@ mod tests {
 				None,
 				1,
 				root(),
-				Call::Logger(LoggerCall::log(42, MaximumSchedulerWeight::get() / 2))
+				Call::Logger(LoggerCall::log { i: 42, weight: MaximumSchedulerWeight::get() / 2 })
 			));
 			assert_ok!(Scheduler::do_schedule(
 				DispatchTime::At(4),
 				None,
 				0,
 				root(),
-				Call::Logger(LoggerCall::log(69, MaximumSchedulerWeight::get() / 2))
+				Call::Logger(LoggerCall::log { i: 69, weight: MaximumSchedulerWeight::get() / 2 })
 			));
 			run_to_block(4);
 			assert_eq!(logger::log(), vec![(root(), 69u32), (root(), 42u32)]);
@@ -1357,21 +1357,24 @@ mod tests {
 				None,
 				255,
 				root(),
-				Call::Logger(LoggerCall::log(42, MaximumSchedulerWeight::get() / 3))
+				Call::Logger(LoggerCall::log { i: 42, weight: MaximumSchedulerWeight::get() / 3 })
 			));
 			assert_ok!(Scheduler::do_schedule(
 				DispatchTime::At(4),
 				None,
 				127,
 				root(),
-				Call::Logger(LoggerCall::log(69, MaximumSchedulerWeight::get() / 2))
+				Call::Logger(LoggerCall::log { i: 69, weight: MaximumSchedulerWeight::get() / 2 })
 			));
 			assert_ok!(Scheduler::do_schedule(
 				DispatchTime::At(4),
 				None,
 				126,
 				root(),
-				Call::Logger(LoggerCall::log(2600, MaximumSchedulerWeight::get() / 2))
+				Call::Logger(LoggerCall::log {
+					i: 2600,
+					weight: MaximumSchedulerWeight::get() / 2
+				})
 			));
 
 			// 2600 does not fit with 69 or 42, but has higher priority, so will go through
@@ -1400,7 +1403,7 @@ mod tests {
 				None,
 				255,
 				root(),
-				Call::Logger(LoggerCall::log(3, MaximumSchedulerWeight::get() / 3))
+				Call::Logger(LoggerCall::log { i: 3, weight: MaximumSchedulerWeight::get() / 3 })
 			));
 			// Anon Periodic
 			assert_ok!(Scheduler::do_schedule(
@@ -1408,7 +1411,7 @@ mod tests {
 				Some((1000, 3)),
 				128,
 				root(),
-				Call::Logger(LoggerCall::log(42, MaximumSchedulerWeight::get() / 3))
+				Call::Logger(LoggerCall::log { i: 42, weight: MaximumSchedulerWeight::get() / 3 })
 			));
 			// Anon
 			assert_ok!(Scheduler::do_schedule(
@@ -1416,7 +1419,7 @@ mod tests {
 				None,
 				127,
 				root(),
-				Call::Logger(LoggerCall::log(69, MaximumSchedulerWeight::get() / 2))
+				Call::Logger(LoggerCall::log { i: 69, weight: MaximumSchedulerWeight::get() / 2 })
 			));
 			// Named Periodic
 			assert_ok!(Scheduler::do_schedule_named(
@@ -1425,7 +1428,10 @@ mod tests {
 				Some((1000, 3)),
 				126,
 				root(),
-				Call::Logger(LoggerCall::log(2600, MaximumSchedulerWeight::get() / 2))
+				Call::Logger(LoggerCall::log {
+					i: 2600,
+					weight: MaximumSchedulerWeight::get() / 2
+				})
 			));
 
 			// Will include the named periodic only
@@ -1469,8 +1475,8 @@ mod tests {
 	#[test]
 	fn root_calls_works() {
 		new_test_ext().execute_with(|| {
-			let call = Box::new(Call::Logger(LoggerCall::log(69, 1000)));
-			let call2 = Box::new(Call::Logger(LoggerCall::log(42, 1000)));
+			let call = Box::new(Call::Logger(LoggerCall::log { i: 69, weight: 1000 }));
+			let call2 = Box::new(Call::Logger(LoggerCall::log { i: 42, weight: 1000 }));
 			assert_ok!(Scheduler::schedule_named(
 				Origin::root(),
 				1u32.encode(),
@@ -1497,8 +1503,8 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			run_to_block(3);
 
-			let call = Box::new(Call::Logger(LoggerCall::log(69, 1000)));
-			let call2 = Box::new(Call::Logger(LoggerCall::log(42, 1000)));
+			let call = Box::new(Call::Logger(LoggerCall::log { i: 69, weight: 1000 }));
+			let call2 = Box::new(Call::Logger(LoggerCall::log { i: 42, weight: 1000 }));
 
 			assert_err!(
 				Scheduler::schedule_named(Origin::root(), 1u32.encode(), 2, None, 127, call),
@@ -1520,8 +1526,8 @@ mod tests {
 	#[test]
 	fn should_use_orign() {
 		new_test_ext().execute_with(|| {
-			let call = Box::new(Call::Logger(LoggerCall::log(69, 1000)));
-			let call2 = Box::new(Call::Logger(LoggerCall::log(42, 1000)));
+			let call = Box::new(Call::Logger(LoggerCall::log { i: 69, weight: 1000 }));
+			let call2 = Box::new(Call::Logger(LoggerCall::log { i: 42, weight: 1000 }));
 			assert_ok!(Scheduler::schedule_named(
 				system::RawOrigin::Signed(1).into(),
 				1u32.encode(),
@@ -1552,8 +1558,8 @@ mod tests {
 	#[test]
 	fn should_check_orign() {
 		new_test_ext().execute_with(|| {
-			let call = Box::new(Call::Logger(LoggerCall::log(69, 1000)));
-			let call2 = Box::new(Call::Logger(LoggerCall::log(42, 1000)));
+			let call = Box::new(Call::Logger(LoggerCall::log { i: 69, weight: 1000 }));
+			let call2 = Box::new(Call::Logger(LoggerCall::log { i: 42, weight: 1000 }));
 			assert_noop!(
 				Scheduler::schedule_named(
 					system::RawOrigin::Signed(2).into(),
@@ -1575,8 +1581,10 @@ mod tests {
 	#[test]
 	fn should_check_orign_for_cancel() {
 		new_test_ext().execute_with(|| {
-			let call = Box::new(Call::Logger(LoggerCall::log_without_filter(69, 1000)));
-			let call2 = Box::new(Call::Logger(LoggerCall::log_without_filter(42, 1000)));
+			let call =
+				Box::new(Call::Logger(LoggerCall::log_without_filter { i: 69, weight: 1000 }));
+			let call2 =
+				Box::new(Call::Logger(LoggerCall::log_without_filter { i: 42, weight: 1000 }));
 			assert_ok!(Scheduler::schedule_named(
 				system::RawOrigin::Signed(1).into(),
 				1u32.encode(),
@@ -1626,14 +1634,14 @@ mod tests {
 					Some(ScheduledV1 {
 						maybe_id: None,
 						priority: i as u8 + 10,
-						call: Call::Logger(LoggerCall::log(96, 100)),
+						call: Call::Logger(LoggerCall::log { i: 96, weight: 100 }),
 						maybe_periodic: None,
 					}),
 					None,
 					Some(ScheduledV1 {
 						maybe_id: Some(b"test".to_vec()),
 						priority: 123,
-						call: Call::Logger(LoggerCall::log(69, 1000)),
+						call: Call::Logger(LoggerCall::log { i: 69, weight: 1000 }),
 						maybe_periodic: Some((456u64, 10)),
 					}),
 				];
@@ -1653,7 +1661,7 @@ mod tests {
 							Some(ScheduledV2 {
 								maybe_id: None,
 								priority: 10,
-								call: Call::Logger(LoggerCall::log(96, 100)),
+								call: Call::Logger(LoggerCall::log { i: 96, weight: 100 }),
 								maybe_periodic: None,
 								origin: root(),
 								_phantom: PhantomData::<u64>::default(),
@@ -1662,7 +1670,7 @@ mod tests {
 							Some(ScheduledV2 {
 								maybe_id: Some(b"test".to_vec()),
 								priority: 123,
-								call: Call::Logger(LoggerCall::log(69, 1000)),
+								call: Call::Logger(LoggerCall::log { i: 69, weight: 1000 }),
 								maybe_periodic: Some((456u64, 10)),
 								origin: root(),
 								_phantom: PhantomData::<u64>::default(),
@@ -1675,7 +1683,7 @@ mod tests {
 							Some(ScheduledV2 {
 								maybe_id: None,
 								priority: 11,
-								call: Call::Logger(LoggerCall::log(96, 100)),
+								call: Call::Logger(LoggerCall::log { i: 96, weight: 100 }),
 								maybe_periodic: None,
 								origin: root(),
 								_phantom: PhantomData::<u64>::default(),
@@ -1684,7 +1692,7 @@ mod tests {
 							Some(ScheduledV2 {
 								maybe_id: Some(b"test".to_vec()),
 								priority: 123,
-								call: Call::Logger(LoggerCall::log(69, 1000)),
+								call: Call::Logger(LoggerCall::log { i: 69, weight: 1000 }),
 								maybe_periodic: Some((456u64, 10)),
 								origin: root(),
 								_phantom: PhantomData::<u64>::default(),
@@ -1697,7 +1705,7 @@ mod tests {
 							Some(ScheduledV2 {
 								maybe_id: None,
 								priority: 12,
-								call: Call::Logger(LoggerCall::log(96, 100)),
+								call: Call::Logger(LoggerCall::log { i: 96, weight: 100 }),
 								maybe_periodic: None,
 								origin: root(),
 								_phantom: PhantomData::<u64>::default(),
@@ -1706,7 +1714,7 @@ mod tests {
 							Some(ScheduledV2 {
 								maybe_id: Some(b"test".to_vec()),
 								priority: 123,
-								call: Call::Logger(LoggerCall::log(69, 1000)),
+								call: Call::Logger(LoggerCall::log { i: 69, weight: 1000 }),
 								maybe_periodic: Some((456u64, 10)),
 								origin: root(),
 								_phantom: PhantomData::<u64>::default(),
@@ -1729,7 +1737,7 @@ mod tests {
 					Some(Scheduled {
 						maybe_id: None,
 						priority: i as u8 + 10,
-						call: Call::Logger(LoggerCall::log(96, 100)),
+						call: Call::Logger(LoggerCall::log { i: 96, weight: 100 }),
 						origin: 3u32,
 						maybe_periodic: None,
 						_phantom: Default::default(),
@@ -1739,7 +1747,7 @@ mod tests {
 						maybe_id: Some(b"test".to_vec()),
 						priority: 123,
 						origin: 2u32,
-						call: Call::Logger(LoggerCall::log(69, 1000)),
+						call: Call::Logger(LoggerCall::log { i: 69, weight: 1000 }),
 						maybe_periodic: Some((456u64, 10)),
 						_phantom: Default::default(),
 					}),
@@ -1768,7 +1776,7 @@ mod tests {
 							Some(ScheduledV2::<_, _, OriginCaller, u64> {
 								maybe_id: None,
 								priority: 10,
-								call: Call::Logger(LoggerCall::log(96, 100)),
+								call: Call::Logger(LoggerCall::log { i: 96, weight: 100 }),
 								maybe_periodic: None,
 								origin: system::RawOrigin::Root.into(),
 								_phantom: PhantomData::<u64>::default(),
@@ -1777,7 +1785,7 @@ mod tests {
 							Some(ScheduledV2 {
 								maybe_id: Some(b"test".to_vec()),
 								priority: 123,
-								call: Call::Logger(LoggerCall::log(69, 1000)),
+								call: Call::Logger(LoggerCall::log { i: 69, weight: 1000 }),
 								maybe_periodic: Some((456u64, 10)),
 								origin: system::RawOrigin::None.into(),
 								_phantom: PhantomData::<u64>::default(),
@@ -1790,7 +1798,7 @@ mod tests {
 							Some(ScheduledV2 {
 								maybe_id: None,
 								priority: 11,
-								call: Call::Logger(LoggerCall::log(96, 100)),
+								call: Call::Logger(LoggerCall::log { i: 96, weight: 100 }),
 								maybe_periodic: None,
 								origin: system::RawOrigin::Root.into(),
 								_phantom: PhantomData::<u64>::default(),
@@ -1799,7 +1807,7 @@ mod tests {
 							Some(ScheduledV2 {
 								maybe_id: Some(b"test".to_vec()),
 								priority: 123,
-								call: Call::Logger(LoggerCall::log(69, 1000)),
+								call: Call::Logger(LoggerCall::log { i: 69, weight: 1000 }),
 								maybe_periodic: Some((456u64, 10)),
 								origin: system::RawOrigin::None.into(),
 								_phantom: PhantomData::<u64>::default(),
@@ -1812,7 +1820,7 @@ mod tests {
 							Some(ScheduledV2 {
 								maybe_id: None,
 								priority: 12,
-								call: Call::Logger(LoggerCall::log(96, 100)),
+								call: Call::Logger(LoggerCall::log { i: 96, weight: 100 }),
 								maybe_periodic: None,
 								origin: system::RawOrigin::Root.into(),
 								_phantom: PhantomData::<u64>::default(),
@@ -1821,7 +1829,7 @@ mod tests {
 							Some(ScheduledV2 {
 								maybe_id: Some(b"test".to_vec()),
 								priority: 123,
-								call: Call::Logger(LoggerCall::log(69, 1000)),
+								call: Call::Logger(LoggerCall::log { i: 69, weight: 1000 }),
 								maybe_periodic: Some((456u64, 10)),
 								origin: system::RawOrigin::None.into(),
 								_phantom: PhantomData::<u64>::default(),
diff --git a/frame/scored-pool/Cargo.toml b/frame/scored-pool/Cargo.toml
index dc85e8d2ca81..9d5f156c175d 100644
--- a/frame/scored-pool/Cargo.toml
+++ b/frame/scored-pool/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
@@ -28,6 +29,7 @@ sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
diff --git a/frame/scored-pool/src/lib.rs b/frame/scored-pool/src/lib.rs
index fc25004eda68..a5cdb6274f99 100644
--- a/frame/scored-pool/src/lib.rs
+++ b/frame/scored-pool/src/lib.rs
@@ -136,7 +136,8 @@ pub mod pallet {
 			+ Default
 			+ FullCodec
 			+ MaybeSerializeDeserialize
-			+ Debug;
+			+ Debug
+			+ scale_info::TypeInfo;
 
 		/// The overarching event type.
 		type Event: From<Event<Self, I>> + IsType<<Self as frame_system::Config>::Event>;
diff --git a/frame/session/Cargo.toml b/frame/session/Cargo.toml
index b5841319000b..8f07de2e7a6d 100644
--- a/frame/session/Cargo.toml
+++ b/frame/session/Cargo.toml
@@ -16,6 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
 	"derive",
 ] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
@@ -34,6 +35,7 @@ default = ["std", "historical"]
 historical = ["sp-trie"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"sp-std/std",
 	"sp-io/std",
 	"frame-support/std",
diff --git a/frame/session/benchmarking/Cargo.toml b/frame/session/benchmarking/Cargo.toml
index c559b29f14ee..cc242085bf5e 100644
--- a/frame/session/benchmarking/Cargo.toml
+++ b/frame/session/benchmarking/Cargo.toml
@@ -29,6 +29,7 @@ rand = { version = "0.7.2", default-features = false }
 codec = { package = "parity-scale-codec", version = "2.0.0", features = [
 	"derive",
 ] }
+scale-info = "1.0"
 sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
 pallet-staking-reward-curve = { version = "4.0.0-dev", path = "../../staking/reward-curve" }
 sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
diff --git a/frame/society/Cargo.toml b/frame/society/Cargo.toml
index b058733b3ce4..942b2844195f 100644
--- a/frame/society/Cargo.toml
+++ b/frame/society/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
@@ -30,6 +31,7 @@ pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"sp-runtime/std",
 	"rand_chacha/std",
 	"sp-std/std",
diff --git a/frame/society/src/lib.rs b/frame/society/src/lib.rs
index c19cd35ae7db..c6d63eed20ac 100644
--- a/frame/society/src/lib.rs
+++ b/frame/society/src/lib.rs
@@ -268,6 +268,7 @@ use rand_chacha::{
 	rand_core::{RngCore, SeedableRng},
 	ChaChaRng,
 };
+use scale_info::TypeInfo;
 use sp_runtime::{
 	traits::{
 		AccountIdConversion, CheckedSub, Hash, IntegerSquareRoot, Saturating, StaticLookup,
@@ -334,7 +335,7 @@ pub trait Config<I = DefaultInstance>: system::Config {
 }
 
 /// A vote by a member on a candidate application.
-#[derive(Encode, Decode, Copy, Clone, PartialEq, Eq, RuntimeDebug)]
+#[derive(Encode, Decode, Copy, Clone, PartialEq, Eq, RuntimeDebug, TypeInfo)]
 pub enum Vote {
 	/// The member has been chosen to be skeptic and has not yet taken any action.
 	Skeptic,
@@ -345,7 +346,7 @@ pub enum Vote {
 }
 
 /// A judgement by the suspension judgement origin on a suspended candidate.
-#[derive(Encode, Decode, Copy, Clone, PartialEq, Eq, RuntimeDebug)]
+#[derive(Encode, Decode, Copy, Clone, PartialEq, Eq, RuntimeDebug, TypeInfo)]
 pub enum Judgement {
 	/// The suspension judgement origin takes no direct judgment
 	/// and places the candidate back into the bid pool.
@@ -357,7 +358,7 @@ pub enum Judgement {
 }
 
 /// Details of a payout given as a per-block linear "trickle".
-#[derive(Encode, Decode, Copy, Clone, PartialEq, Eq, RuntimeDebug, Default)]
+#[derive(Encode, Decode, Copy, Clone, PartialEq, Eq, RuntimeDebug, Default, TypeInfo)]
 pub struct Payout<Balance, BlockNumber> {
 	/// Total value of the payout.
 	value: Balance,
@@ -370,7 +371,7 @@ pub struct Payout<Balance, BlockNumber> {
 }
 
 /// Status of a vouching member.
-#[derive(Encode, Decode, Copy, Clone, PartialEq, Eq, RuntimeDebug)]
+#[derive(Encode, Decode, Copy, Clone, PartialEq, Eq, RuntimeDebug, TypeInfo)]
 pub enum VouchingStatus {
 	/// Member is currently vouching for a user.
 	Vouching,
@@ -382,7 +383,7 @@ pub enum VouchingStatus {
 pub type StrikeCount = u32;
 
 /// A bid for entry into society.
-#[derive(Encode, Decode, Copy, Clone, PartialEq, Eq, RuntimeDebug)]
+#[derive(Encode, Decode, Copy, Clone, PartialEq, Eq, RuntimeDebug, TypeInfo)]
 pub struct Bid<AccountId, Balance> {
 	/// The bidder/candidate trying to enter society
 	who: AccountId,
@@ -393,7 +394,7 @@ pub struct Bid<AccountId, Balance> {
 }
 
 /// A vote by a member on a candidate application.
-#[derive(Encode, Decode, Copy, Clone, PartialEq, Eq, RuntimeDebug)]
+#[derive(Encode, Decode, Copy, Clone, PartialEq, Eq, RuntimeDebug, TypeInfo)]
 pub enum BidKind<AccountId, Balance> {
 	/// The CandidateDeposit was paid for this bid.
 	Deposit(Balance),
diff --git a/frame/staking/Cargo.toml b/frame/staking/Cargo.toml
index 5859cf27788f..aba19ba56357 100644
--- a/frame/staking/Cargo.toml
+++ b/frame/staking/Cargo.toml
@@ -17,6 +17,7 @@ serde = { version = "1.0.126", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
 	"derive",
 ] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
@@ -51,6 +52,7 @@ default = ["std"]
 std = [
 	"serde",
 	"codec/std",
+	"scale-info/std",
 	"sp-std/std",
 	"sp-io/std",
 	"frame-support/std",
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index e424b724b4c2..31b35acdd99a 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -288,6 +288,7 @@ use frame_support::{
 	traits::{Currency, Get},
 	weights::Weight,
 };
+use scale_info::TypeInfo;
 use sp_runtime::{
 	curve::PiecewiseLinear,
 	traits::{AtLeast32BitUnsigned, Convert, Saturating, Zero},
@@ -333,7 +334,7 @@ type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<
 >>::NegativeImbalance;
 
 /// Information regarding the active era (era in used in session).
-#[derive(Encode, Decode, RuntimeDebug)]
+#[derive(Encode, Decode, RuntimeDebug, TypeInfo)]
 pub struct ActiveEraInfo {
 	/// Index of era.
 	pub index: EraIndex,
@@ -347,7 +348,7 @@ pub struct ActiveEraInfo {
 /// Reward points of an era. Used to split era total payout between validators.
 ///
 /// This points will be used to reward validators and their respective nominators.
-#[derive(PartialEq, Encode, Decode, Default, RuntimeDebug)]
+#[derive(PartialEq, Encode, Decode, Default, RuntimeDebug, TypeInfo)]
 pub struct EraRewardPoints<AccountId: Ord> {
 	/// Total number of points. Equals the sum of reward points for each validator.
 	total: RewardPoint,
@@ -356,7 +357,7 @@ pub struct EraRewardPoints<AccountId: Ord> {
 }
 
 /// Indicates the initial status of the staker.
-#[derive(RuntimeDebug)]
+#[derive(RuntimeDebug, TypeInfo)]
 #[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
 pub enum StakerStatus<AccountId> {
 	/// Chilling.
@@ -368,7 +369,7 @@ pub enum StakerStatus<AccountId> {
 }
 
 /// A destination account for payment.
-#[derive(PartialEq, Eq, Copy, Clone, Encode, Decode, RuntimeDebug)]
+#[derive(PartialEq, Eq, Copy, Clone, Encode, Decode, RuntimeDebug, TypeInfo)]
 pub enum RewardDestination<AccountId> {
 	/// Pay into the stash account, increasing the amount at stake accordingly.
 	Staked,
@@ -389,7 +390,7 @@ impl<AccountId> Default for RewardDestination<AccountId> {
 }
 
 /// Preference of what happens regarding validation.
-#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug)]
+#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, TypeInfo)]
 pub struct ValidatorPrefs {
 	/// Reward that validator takes up-front; only the rest is split between themselves and
 	/// nominators.
@@ -408,7 +409,7 @@ impl Default for ValidatorPrefs {
 }
 
 /// Just a Balance/BlockNumber tuple to encode when a chunk of funds will be unlocked.
-#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug)]
+#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, TypeInfo)]
 pub struct UnlockChunk<Balance: HasCompact> {
 	/// Amount of funds to be unlocked.
 	#[codec(compact)]
@@ -419,7 +420,7 @@ pub struct UnlockChunk<Balance: HasCompact> {
 }
 
 /// The ledger of a (bonded) stash.
-#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug)]
+#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, TypeInfo)]
 pub struct StakingLedger<AccountId, Balance: HasCompact> {
 	/// The stash account whose balance is actually locked and at stake.
 	pub stash: AccountId,
@@ -547,7 +548,7 @@ where
 }
 
 /// A record of the nominations made by a specific account.
-#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug)]
+#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, TypeInfo)]
 pub struct Nominations<AccountId> {
 	/// The targets of nomination.
 	pub targets: Vec<AccountId>,
@@ -563,7 +564,7 @@ pub struct Nominations<AccountId> {
 }
 
 /// The amount of exposure (to slashing) than an individual nominator has.
-#[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Encode, Decode, RuntimeDebug)]
+#[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Encode, Decode, RuntimeDebug, TypeInfo)]
 pub struct IndividualExposure<AccountId, Balance: HasCompact> {
 	/// The stash account of the nominator in question.
 	pub who: AccountId,
@@ -573,7 +574,9 @@ pub struct IndividualExposure<AccountId, Balance: HasCompact> {
 }
 
 /// A snapshot of the stake backing a single validator in the system.
-#[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Encode, Decode, Default, RuntimeDebug)]
+#[derive(
+	PartialEq, Eq, PartialOrd, Ord, Clone, Encode, Decode, Default, RuntimeDebug, TypeInfo,
+)]
 pub struct Exposure<AccountId, Balance: HasCompact> {
 	/// The total balance backing this validator.
 	#[codec(compact)]
@@ -587,7 +590,7 @@ pub struct Exposure<AccountId, Balance: HasCompact> {
 
 /// A pending slash record. The value of the slash has been computed but not applied yet,
 /// rather deferred for several eras.
-#[derive(Encode, Decode, Default, RuntimeDebug)]
+#[derive(Encode, Decode, Default, RuntimeDebug, TypeInfo)]
 pub struct UnappliedSlash<AccountId, Balance: HasCompact> {
 	/// The stash ID of the offending validator.
 	validator: AccountId,
@@ -691,7 +694,7 @@ impl<Balance: AtLeast32BitUnsigned + Clone, T: Get<&'static PiecewiseLinear<'sta
 }
 
 /// Mode of era-forcing.
-#[derive(Copy, Clone, PartialEq, Eq, Encode, Decode, RuntimeDebug)]
+#[derive(Copy, Clone, PartialEq, Eq, Encode, Decode, RuntimeDebug, TypeInfo)]
 #[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
 pub enum Forcing {
 	/// Not forcing anything - just let whatever happen.
@@ -715,7 +718,7 @@ impl Default for Forcing {
 // A value placed in storage that represents the current version of the Staking storage. This value
 // is used by the `on_runtime_upgrade` logic to determine whether we run storage migration logic.
 // This should match directly with the semantic versions of the Rust crate.
-#[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, RuntimeDebug)]
+#[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, RuntimeDebug, TypeInfo)]
 enum Releases {
 	V1_0_0Ancient,
 	V2_0_0,
diff --git a/frame/staking/src/pallet/mod.rs b/frame/staking/src/pallet/mod.rs
index 091dd7817676..d99cd89f3b06 100644
--- a/frame/staking/src/pallet/mod.rs
+++ b/frame/staking/src/pallet/mod.rs
@@ -519,7 +519,6 @@ pub mod pallet {
 
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(crate) fn deposit_event)]
-	#[pallet::metadata(T::AccountId = "AccountId", BalanceOf<T> = "Balance")]
 	pub enum Event<T: Config> {
 		/// The era payout has been set; the first balance is the validator-payout; the second is
 		/// the remainder from the maximum amount of reward.
diff --git a/frame/staking/src/slashing.rs b/frame/staking/src/slashing.rs
index 3da79924d0a0..15ca85b4d046 100644
--- a/frame/staking/src/slashing.rs
+++ b/frame/staking/src/slashing.rs
@@ -58,6 +58,7 @@ use frame_support::{
 	ensure,
 	traits::{Currency, Imbalance, OnUnbalanced},
 };
+use scale_info::TypeInfo;
 use sp_runtime::{
 	traits::{Saturating, Zero},
 	DispatchResult, RuntimeDebug,
@@ -72,7 +73,7 @@ const REWARD_F1: Perbill = Perbill::from_percent(50);
 pub type SpanIndex = u32;
 
 // A range of start..end eras for a slashing span.
-#[derive(Encode, Decode)]
+#[derive(Encode, Decode, TypeInfo)]
 #[cfg_attr(test, derive(Debug, PartialEq))]
 pub(crate) struct SlashingSpan {
 	pub(crate) index: SpanIndex,
@@ -87,7 +88,7 @@ impl SlashingSpan {
 }
 
 /// An encoding of all of a nominator's slashing spans.
-#[derive(Encode, Decode, RuntimeDebug)]
+#[derive(Encode, Decode, RuntimeDebug, TypeInfo)]
 pub struct SlashingSpans {
 	// the index of the current slashing span of the nominator. different for
 	// every stash, resets when the account hits free balance 0.
@@ -180,7 +181,7 @@ impl SlashingSpans {
 }
 
 /// A slashing-span record for a particular stash.
-#[derive(Encode, Decode, Default)]
+#[derive(Encode, Decode, Default, TypeInfo)]
 pub(crate) struct SpanRecord<Balance> {
 	slashed: Balance,
 	paid_out: Balance,
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index 931ffaa10386..97dfaa39c84a 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -3355,7 +3355,8 @@ fn payout_stakers_handles_weight_refund() {
 		start_active_era(2);
 
 		// Collect payouts when there are no nominators
-		let call = TestRuntimeCall::Staking(StakingCall::payout_stakers(11, 1));
+		let call =
+			TestRuntimeCall::Staking(StakingCall::payout_stakers { validator_stash: 11, era: 1 });
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(Origin::signed(20));
 		assert_ok!(result);
@@ -3368,7 +3369,8 @@ fn payout_stakers_handles_weight_refund() {
 		start_active_era(3);
 
 		// Collect payouts for an era where the validator did not receive any points.
-		let call = TestRuntimeCall::Staking(StakingCall::payout_stakers(11, 2));
+		let call =
+			TestRuntimeCall::Staking(StakingCall::payout_stakers { validator_stash: 11, era: 2 });
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(Origin::signed(20));
 		assert_ok!(result);
@@ -3381,7 +3383,8 @@ fn payout_stakers_handles_weight_refund() {
 		start_active_era(4);
 
 		// Collect payouts when the validator has `half_max_nom_rewarded` nominators.
-		let call = TestRuntimeCall::Staking(StakingCall::payout_stakers(11, 3));
+		let call =
+			TestRuntimeCall::Staking(StakingCall::payout_stakers { validator_stash: 11, era: 3 });
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(Origin::signed(20));
 		assert_ok!(result);
@@ -3404,14 +3407,16 @@ fn payout_stakers_handles_weight_refund() {
 		start_active_era(6);
 
 		// Collect payouts when the validator had `half_max_nom_rewarded` nominators.
-		let call = TestRuntimeCall::Staking(StakingCall::payout_stakers(11, 5));
+		let call =
+			TestRuntimeCall::Staking(StakingCall::payout_stakers { validator_stash: 11, era: 5 });
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(Origin::signed(20));
 		assert_ok!(result);
 		assert_eq!(extract_actual_weight(&result, &info), max_nom_rewarded_weight);
 
 		// Try and collect payouts for an era that has already been collected.
-		let call = TestRuntimeCall::Staking(StakingCall::payout_stakers(11, 5));
+		let call =
+			TestRuntimeCall::Staking(StakingCall::payout_stakers { validator_stash: 11, era: 5 });
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(Origin::signed(20));
 		assert!(result.is_err());
diff --git a/frame/sudo/Cargo.toml b/frame/sudo/Cargo.toml
index f19afd2d61a0..baacb66d5c75 100644
--- a/frame/sudo/Cargo.toml
+++ b/frame/sudo/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
@@ -27,6 +28,7 @@ sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"sp-std/std",
 	"sp-io/std",
 	"sp-runtime/std",
diff --git a/frame/sudo/src/lib.rs b/frame/sudo/src/lib.rs
index 6dcb3bf5e44c..bab93ffcee16 100644
--- a/frame/sudo/src/lib.rs
+++ b/frame/sudo/src/lib.rs
@@ -249,7 +249,6 @@ pub mod pallet {
 
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
-	#[pallet::metadata(T::AccountId = "AccountId")]
 	pub enum Event<T: Config> {
 		/// A sudo just took place. \[result\]
 		Sudid(DispatchResult),
diff --git a/frame/sudo/src/mock.rs b/frame/sudo/src/mock.rs
index 7fd55a618a6b..dad17384d560 100644
--- a/frame/sudo/src/mock.rs
+++ b/frame/sudo/src/mock.rs
@@ -79,7 +79,6 @@ pub mod logger {
 
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
-	#[pallet::metadata(T::AccountId = "AccountId")]
 	pub enum Event<T: Config> {
 		AppendI32(i32, Weight),
 		AppendI32AndAccount(T::AccountId, i32, Weight),
diff --git a/frame/sudo/src/tests.rs b/frame/sudo/src/tests.rs
index ebd7a11a70f1..2eb558e9471c 100644
--- a/frame/sudo/src/tests.rs
+++ b/frame/sudo/src/tests.rs
@@ -39,12 +39,12 @@ fn sudo_basics() {
 	// Configure a default test environment and set the root `key` to 1.
 	new_test_ext(1).execute_with(|| {
 		// A privileged function should work when `sudo` is passed the root `key` as `origin`.
-		let call = Box::new(Call::Logger(LoggerCall::privileged_i32_log(42, 1_000)));
+		let call = Box::new(Call::Logger(LoggerCall::privileged_i32_log { i: 42, weight: 1_000 }));
 		assert_ok!(Sudo::sudo(Origin::signed(1), call));
 		assert_eq!(Logger::i32_log(), vec![42i32]);
 
 		// A privileged function should not work when `sudo` is passed a non-root `key` as `origin`.
-		let call = Box::new(Call::Logger(LoggerCall::privileged_i32_log(42, 1_000)));
+		let call = Box::new(Call::Logger(LoggerCall::privileged_i32_log { i: 42, weight: 1_000 }));
 		assert_noop!(Sudo::sudo(Origin::signed(2), call), Error::<Test>::RequireSudo);
 	});
 }
@@ -56,7 +56,7 @@ fn sudo_emits_events_correctly() {
 		System::set_block_number(1);
 
 		// Should emit event to indicate success when called with the root `key` and `call` is `Ok`.
-		let call = Box::new(Call::Logger(LoggerCall::privileged_i32_log(42, 1)));
+		let call = Box::new(Call::Logger(LoggerCall::privileged_i32_log { i: 42, weight: 1 }));
 		assert_ok!(Sudo::sudo(Origin::signed(1), call));
 		System::assert_has_event(TestEvent::Sudo(Event::Sudid(Ok(()))));
 	})
@@ -66,12 +66,12 @@ fn sudo_emits_events_correctly() {
 fn sudo_unchecked_weight_basics() {
 	new_test_ext(1).execute_with(|| {
 		// A privileged function should work when `sudo` is passed the root `key` as origin.
-		let call = Box::new(Call::Logger(LoggerCall::privileged_i32_log(42, 1_000)));
+		let call = Box::new(Call::Logger(LoggerCall::privileged_i32_log { i: 42, weight: 1_000 }));
 		assert_ok!(Sudo::sudo_unchecked_weight(Origin::signed(1), call, 1_000));
 		assert_eq!(Logger::i32_log(), vec![42i32]);
 
 		// A privileged function should not work when called with a non-root `key`.
-		let call = Box::new(Call::Logger(LoggerCall::privileged_i32_log(42, 1_000)));
+		let call = Box::new(Call::Logger(LoggerCall::privileged_i32_log { i: 42, weight: 1_000 }));
 		assert_noop!(
 			Sudo::sudo_unchecked_weight(Origin::signed(2), call, 1_000),
 			Error::<Test>::RequireSudo,
@@ -80,8 +80,8 @@ fn sudo_unchecked_weight_basics() {
 		assert_eq!(Logger::i32_log(), vec![42i32]);
 
 		// Controls the dispatched weight.
-		let call = Box::new(Call::Logger(LoggerCall::privileged_i32_log(42, 1)));
-		let sudo_unchecked_weight_call = SudoCall::sudo_unchecked_weight(call, 1_000);
+		let call = Box::new(Call::Logger(LoggerCall::privileged_i32_log { i: 42, weight: 1 }));
+		let sudo_unchecked_weight_call = SudoCall::sudo_unchecked_weight { call, weight: 1_000 };
 		let info = sudo_unchecked_weight_call.get_dispatch_info();
 		assert_eq!(info.weight, 1_000);
 	});
@@ -94,7 +94,7 @@ fn sudo_unchecked_weight_emits_events_correctly() {
 		System::set_block_number(1);
 
 		// Should emit event to indicate success when called with the root `key` and `call` is `Ok`.
-		let call = Box::new(Call::Logger(LoggerCall::privileged_i32_log(42, 1)));
+		let call = Box::new(Call::Logger(LoggerCall::privileged_i32_log { i: 42, weight: 1 }));
 		assert_ok!(Sudo::sudo_unchecked_weight(Origin::signed(1), call, 1_000));
 		System::assert_has_event(TestEvent::Sudo(Event::Sudid(Ok(()))));
 	})
@@ -134,17 +134,17 @@ fn set_key_emits_events_correctly() {
 fn sudo_as_basics() {
 	new_test_ext(1).execute_with(|| {
 		// A privileged function will not work when passed to `sudo_as`.
-		let call = Box::new(Call::Logger(LoggerCall::privileged_i32_log(42, 1_000)));
+		let call = Box::new(Call::Logger(LoggerCall::privileged_i32_log { i: 42, weight: 1_000 }));
 		assert_ok!(Sudo::sudo_as(Origin::signed(1), 2, call));
 		assert!(Logger::i32_log().is_empty());
 		assert!(Logger::account_log().is_empty());
 
 		// A non-privileged function should not work when called with a non-root `key`.
-		let call = Box::new(Call::Logger(LoggerCall::non_privileged_log(42, 1)));
+		let call = Box::new(Call::Logger(LoggerCall::non_privileged_log { i: 42, weight: 1 }));
 		assert_noop!(Sudo::sudo_as(Origin::signed(3), 2, call), Error::<Test>::RequireSudo);
 
 		// A non-privileged function will work when passed to `sudo_as` with the root `key`.
-		let call = Box::new(Call::Logger(LoggerCall::non_privileged_log(42, 1)));
+		let call = Box::new(Call::Logger(LoggerCall::non_privileged_log { i: 42, weight: 1 }));
 		assert_ok!(Sudo::sudo_as(Origin::signed(1), 2, call));
 		assert_eq!(Logger::i32_log(), vec![42i32]);
 		// The correct user makes the call within `sudo_as`.
@@ -159,7 +159,7 @@ fn sudo_as_emits_events_correctly() {
 		System::set_block_number(1);
 
 		// A non-privileged function will work when passed to `sudo_as` with the root `key`.
-		let call = Box::new(Call::Logger(LoggerCall::non_privileged_log(42, 1)));
+		let call = Box::new(Call::Logger(LoggerCall::non_privileged_log { i: 42, weight: 1 }));
 		assert_ok!(Sudo::sudo_as(Origin::signed(1), 2, call));
 		System::assert_has_event(TestEvent::Sudo(Event::SudoAsDone(Ok(()))));
 	});
diff --git a/frame/support/Cargo.toml b/frame/support/Cargo.toml
index 9b515c3aa84a..b09ed65a114d 100644
--- a/frame/support/Cargo.toml
+++ b/frame/support/Cargo.toml
@@ -15,7 +15,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.126", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
-frame-metadata = { version = "14.0.0-dev", default-features = false, path = "../metadata" }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
+frame-metadata = { version = "14.0.0", default-features = false, features = ["v14"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
@@ -34,6 +35,7 @@ smallvec = "1.4.1"
 log = { version = "0.4.14", default-features = false }
 
 [dev-dependencies]
+assert_matches = "1.3.0"
 pretty_assertions = "0.6.1"
 frame-system = { version = "4.0.0-dev", path = "../system" }
 parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
@@ -45,6 +47,7 @@ std = [
 	"serde",
 	"sp-io/std",
 	"codec/std",
+	"scale-info/std",
 	"sp-std/std",
 	"sp-runtime/std",
 	"sp-tracing/std",
diff --git a/frame/support/procedural/src/construct_runtime/expand/call.rs b/frame/support/procedural/src/construct_runtime/expand/call.rs
index f847bc6dbfbd..2532a680e21b 100644
--- a/frame/support/procedural/src/construct_runtime/expand/call.rs
+++ b/frame/support/procedural/src/construct_runtime/expand/call.rs
@@ -54,6 +54,7 @@ pub fn expand_outer_dispatch(
 			Clone, PartialEq, Eq,
 			#scrate::codec::Encode,
 			#scrate::codec::Decode,
+			#scrate::scale_info::TypeInfo,
 			#scrate::RuntimeDebug,
 		)]
 		pub enum Call {
diff --git a/frame/support/procedural/src/construct_runtime/expand/event.rs b/frame/support/procedural/src/construct_runtime/expand/event.rs
index a04759ec972b..798646bf2733 100644
--- a/frame/support/procedural/src/construct_runtime/expand/event.rs
+++ b/frame/support/procedural/src/construct_runtime/expand/event.rs
@@ -75,6 +75,7 @@ pub fn expand_outer_event(
 			Clone, PartialEq, Eq,
 			#scrate::codec::Encode,
 			#scrate::codec::Decode,
+			#scrate::scale_info::TypeInfo,
 			#scrate::RuntimeDebug,
 		)]
 		#[allow(non_camel_case_types)]
diff --git a/frame/support/procedural/src/construct_runtime/expand/metadata.rs b/frame/support/procedural/src/construct_runtime/expand/metadata.rs
index fa12242f4fcd..c8445e0bbc25 100644
--- a/frame/support/procedural/src/construct_runtime/expand/metadata.rs
+++ b/frame/support/procedural/src/construct_runtime/expand/metadata.rs
@@ -26,7 +26,7 @@ pub fn expand_runtime_metadata(
 	scrate: &TokenStream,
 	extrinsic: &TypePath,
 ) -> TokenStream {
-	let modules = pallet_declarations
+	let pallets = pallet_declarations
 		.iter()
 		.filter_map(|pallet_declaration| {
 			pallet_declaration.find_part("Pallet").map(|_| {
@@ -42,21 +42,21 @@ pub fn expand_runtime_metadata(
 		.map(|(decl, filtered_names)| {
 			let name = &decl.name;
 			let index = &decl.index;
-			let storage = expand_pallet_metadata_storage(&filtered_names, runtime, scrate, decl);
-			let calls = expand_pallet_metadata_calls(&filtered_names, runtime, scrate, decl);
+			let storage = expand_pallet_metadata_storage(&filtered_names, runtime, decl);
+			let calls = expand_pallet_metadata_calls(&filtered_names, runtime, decl);
 			let event = expand_pallet_metadata_events(&filtered_names, runtime, scrate, decl);
-			let constants = expand_pallet_metadata_constants(runtime, scrate, decl);
-			let errors = expand_pallet_metadata_errors(runtime, scrate, decl);
+			let constants = expand_pallet_metadata_constants(runtime, decl);
+			let errors = expand_pallet_metadata_errors(runtime, decl);
 
 			quote! {
-				#scrate::metadata::ModuleMetadata {
-					name: #scrate::metadata::DecodeDifferent::Encode(stringify!(#name)),
+				#scrate::metadata::PalletMetadata {
+					name: stringify!(#name),
 					index: #index,
 					storage: #storage,
 					calls: #calls,
 					event: #event,
 					constants: #constants,
-					errors: #errors,
+					error: #errors,
 				}
 			}
 		})
@@ -65,20 +65,26 @@ pub fn expand_runtime_metadata(
 	quote! {
 		impl #runtime {
 			pub fn metadata() -> #scrate::metadata::RuntimeMetadataPrefixed {
-				#scrate::metadata::RuntimeMetadataLastVersion {
-					modules: #scrate::metadata::DecodeDifferent::Encode(&[ #(#modules),* ]),
-					extrinsic: #scrate::metadata::ExtrinsicMetadata {
+				#scrate::metadata::RuntimeMetadataLastVersion::new(
+					#scrate::sp_std::vec![ #(#pallets),* ],
+					#scrate::metadata::ExtrinsicMetadata {
+						ty: #scrate::scale_info::meta_type::<#extrinsic>(),
 						version: <#extrinsic as #scrate::sp_runtime::traits::ExtrinsicMetadata>::VERSION,
 						signed_extensions: <
 								<
 									#extrinsic as #scrate::sp_runtime::traits::ExtrinsicMetadata
 								>::SignedExtensions as #scrate::sp_runtime::traits::SignedExtension
-							>::identifier()
+							>::metadata()
 								.into_iter()
-								.map(#scrate::metadata::DecodeDifferent::Encode)
+								.map(|meta| #scrate::metadata::SignedExtensionMetadata {
+									identifier: meta.identifier,
+									ty: meta.ty,
+									additional_signed: meta.additional_signed,
+								})
 								.collect(),
 					},
-				}.into()
+					#scrate::scale_info::meta_type::<#runtime>()
+				).into()
 			}
 		}
 	}
@@ -87,7 +93,6 @@ pub fn expand_runtime_metadata(
 fn expand_pallet_metadata_storage(
 	filtered_names: &[&'static str],
 	runtime: &Ident,
-	scrate: &TokenStream,
 	decl: &Pallet,
 ) -> TokenStream {
 	if filtered_names.contains(&"Storage") {
@@ -95,11 +100,7 @@ fn expand_pallet_metadata_storage(
 		let path = &decl.path;
 
 		quote! {
-			Some(#scrate::metadata::DecodeDifferent::Encode(
-				#scrate::metadata::FnEncode(
-					#path::Pallet::<#runtime #(, #path::#instance)*>::storage_metadata
-				)
-			))
+			Some(#path::Pallet::<#runtime #(, #path::#instance)*>::storage_metadata())
 		}
 	} else {
 		quote!(None)
@@ -109,7 +110,6 @@ fn expand_pallet_metadata_storage(
 fn expand_pallet_metadata_calls(
 	filtered_names: &[&'static str],
 	runtime: &Ident,
-	scrate: &TokenStream,
 	decl: &Pallet,
 ) -> TokenStream {
 	if filtered_names.contains(&"Call") {
@@ -117,11 +117,7 @@ fn expand_pallet_metadata_calls(
 		let path = &decl.path;
 
 		quote! {
-			Some(#scrate::metadata::DecodeDifferent::Encode(
-				#scrate::metadata::FnEncode(
-					#path::Pallet::<#runtime #(, #path::#instance)*>::call_functions
-				)
-			))
+			Some(#path::Pallet::<#runtime #(, #path::#instance)*>::call_functions())
 		}
 	} else {
 		quote!(None)
@@ -150,45 +146,31 @@ fn expand_pallet_metadata_events(
 		};
 
 		quote! {
-			Some(#scrate::metadata::DecodeDifferent::Encode(
-				#scrate::metadata::FnEncode(#pallet_event::metadata)
-			))
+			Some(
+				#scrate::metadata::PalletEventMetadata {
+					ty: #scrate::scale_info::meta_type::<#pallet_event>()
+				}
+			)
 		}
 	} else {
 		quote!(None)
 	}
 }
 
-fn expand_pallet_metadata_constants(
-	runtime: &Ident,
-	scrate: &TokenStream,
-	decl: &Pallet,
-) -> TokenStream {
+fn expand_pallet_metadata_constants(runtime: &Ident, decl: &Pallet) -> TokenStream {
 	let path = &decl.path;
 	let instance = decl.instance.as_ref().into_iter();
 
 	quote! {
-		#scrate::metadata::DecodeDifferent::Encode(
-			#scrate::metadata::FnEncode(
-				#path::Pallet::<#runtime #(, #path::#instance)*>::module_constants_metadata
-			)
-		)
+		#path::Pallet::<#runtime #(, #path::#instance)*>::pallet_constants_metadata()
 	}
 }
 
-fn expand_pallet_metadata_errors(
-	runtime: &Ident,
-	scrate: &TokenStream,
-	decl: &Pallet,
-) -> TokenStream {
+fn expand_pallet_metadata_errors(runtime: &Ident, decl: &Pallet) -> TokenStream {
 	let path = &decl.path;
 	let instance = decl.instance.as_ref().into_iter();
 
 	quote! {
-		#scrate::metadata::DecodeDifferent::Encode(
-			#scrate::metadata::FnEncode(
-				<#path::Pallet::<#runtime #(, #path::#instance)*> as #scrate::metadata::ModuleErrorMetadata>::metadata
-			)
-		)
+		#path::Pallet::<#runtime #(, #path::#instance)*>::error_metadata()
 	}
 }
diff --git a/frame/support/procedural/src/construct_runtime/expand/origin.rs b/frame/support/procedural/src/construct_runtime/expand/origin.rs
index 10ab9e9347eb..a65ad78527ff 100644
--- a/frame/support/procedural/src/construct_runtime/expand/origin.rs
+++ b/frame/support/procedural/src/construct_runtime/expand/origin.rs
@@ -171,7 +171,10 @@ pub fn expand_outer_origin(
 			}
 		}
 
-		#[derive(Clone, PartialEq, Eq, #scrate::RuntimeDebug, #scrate::codec::Encode, #scrate::codec::Decode)]
+		#[derive(
+			Clone, PartialEq, Eq, #scrate::RuntimeDebug, #scrate::codec::Encode,
+			#scrate::codec::Decode, #scrate::scale_info::TypeInfo,
+		)]
 		#[allow(non_camel_case_types)]
 		pub enum OriginCaller {
 			#[codec(index = #system_index)]
diff --git a/frame/support/procedural/src/construct_runtime/mod.rs b/frame/support/procedural/src/construct_runtime/mod.rs
index 402cb5458851..8aacd8f0aa81 100644
--- a/frame/support/procedural/src/construct_runtime/mod.rs
+++ b/frame/support/procedural/src/construct_runtime/mod.rs
@@ -151,7 +151,10 @@ fn construct_runtime_parsed(definition: RuntimeDefinition) -> Result<TokenStream
 			type __hidden_use_of_unchecked_extrinsic = #unchecked_extrinsic;
 		};
 
-		#[derive(Clone, Copy, PartialEq, Eq, #scrate::sp_runtime::RuntimeDebug)]
+		#[derive(
+			Clone, Copy, PartialEq, Eq, #scrate::sp_runtime::RuntimeDebug,
+			#scrate::scale_info::TypeInfo
+		)]
 		pub struct #name;
 		impl #scrate::sp_runtime::traits::GetNodeBlockType for #name {
 			type NodeBlock = #node_block;
diff --git a/frame/support/procedural/src/key_prefix.rs b/frame/support/procedural/src/key_prefix.rs
index c4683bc456da..3f424e8b8b8d 100644
--- a/frame/support/procedural/src/key_prefix.rs
+++ b/frame/support/procedural/src/key_prefix.rs
@@ -48,7 +48,7 @@ pub fn impl_key_prefix_for_tuples(input: proc_macro::TokenStream) -> Result<Toke
 
 			let trait_impls = quote! {
 				impl<
-					#(#current_tuple: FullCodec,)*
+					#(#current_tuple: FullCodec + StaticTypeInfo,)*
 					#(#hashers: StorageHasher,)*
 					#(#kargs: EncodeLike<#prefixes>),*
 				> HasKeyPrefix<( #( #kargs, )* )> for ( #( Key<#hashers, #current_tuple>, )* ) {
@@ -60,7 +60,7 @@ pub fn impl_key_prefix_for_tuples(input: proc_macro::TokenStream) -> Result<Toke
 				}
 
 				impl<
-					#(#current_tuple: FullCodec,)*
+					#(#current_tuple: FullCodec + StaticTypeInfo,)*
 					#(#hashers: ReversibleStorageHasher,)*
 					#(#kargs: EncodeLike<#prefixes>),*
 				> HasReversibleKeyPrefix<( #( #kargs, )* )> for ( #( Key<#hashers, #current_tuple>, )* ) {
diff --git a/frame/support/procedural/src/pallet/expand/call.rs b/frame/support/procedural/src/pallet/expand/call.rs
index 23ea9be9eac7..8f7bcdccaf22 100644
--- a/frame/support/procedural/src/pallet/expand/call.rs
+++ b/frame/support/procedural/src/pallet/expand/call.rs
@@ -16,7 +16,6 @@
 // limitations under the License.
 
 use crate::{pallet::Def, COUNTER};
-use frame_support_procedural_tools::clean_type_string;
 use syn::spanned::Spanned;
 
 ///
@@ -43,6 +42,15 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
 	let pallet_ident = &def.pallet_struct.pallet;
 
 	let fn_name = methods.iter().map(|method| &method.name).collect::<Vec<_>>();
+	let new_call_variant_fn_name = fn_name
+		.iter()
+		.map(|fn_name| quote::format_ident!("new_call_variant_{}", fn_name))
+		.collect::<Vec<_>>();
+
+	let new_call_variant_doc = fn_name
+		.iter()
+		.map(|fn_name| format!("Create a call with the variant `{}`.", fn_name))
+		.collect::<Vec<_>>();
 
 	let fn_weight = methods.iter().map(|method| &method.weight);
 
@@ -53,6 +61,42 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
 		.map(|method| method.args.iter().map(|(_, name, _)| name.clone()).collect::<Vec<_>>())
 		.collect::<Vec<_>>();
 
+	let args_name_stripped = methods
+		.iter()
+		.map(|method| {
+			method
+				.args
+				.iter()
+				.map(|(_, name, _)| {
+					syn::Ident::new(&name.to_string().trim_start_matches('_'), name.span())
+				})
+				.collect::<Vec<_>>()
+		})
+		.collect::<Vec<_>>();
+
+	let make_args_name_pattern = |ref_tok| {
+		args_name
+			.iter()
+			.zip(args_name_stripped.iter())
+			.map(|(args_name, args_name_stripped)| {
+				args_name
+					.iter()
+					.zip(args_name_stripped)
+					.map(|(args_name, args_name_stripped)| {
+						if args_name == args_name_stripped {
+							quote::quote!( #ref_tok #args_name )
+						} else {
+							quote::quote!( #args_name_stripped: #ref_tok #args_name )
+						}
+					})
+					.collect::<Vec<_>>()
+			})
+			.collect::<Vec<_>>()
+	};
+
+	let args_name_pattern = make_args_name_pattern(None);
+	let args_name_pattern_ref = make_args_name_pattern(Some(quote::quote!(ref)));
+
 	let args_type = methods
 		.iter()
 		.map(|method| method.args.iter().map(|(_, _, type_)| type_.clone()).collect::<Vec<_>>())
@@ -72,21 +116,6 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
 			.collect::<Vec<_>>()
 	});
 
-	let args_metadata_type = methods.iter().map(|method| {
-		method
-			.args
-			.iter()
-			.map(|(is_compact, _, type_)| {
-				let final_type = if *is_compact {
-					quote::quote_spanned!(type_.span() => Compact<#type_>)
-				} else {
-					quote::quote!(#type_)
-				};
-				clean_type_string(&final_type.to_string())
-			})
-			.collect::<Vec<_>>()
-	});
-
 	let default_docs = [syn::parse_quote!(
 		r"Contains one variant per dispatchable that can be called by an extrinsic."
 	)];
@@ -131,9 +160,11 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
 			#frame_support::PartialEqNoBound,
 			#frame_support::codec::Encode,
 			#frame_support::codec::Decode,
+			#frame_support::scale_info::TypeInfo,
 		)]
 		#[codec(encode_bound())]
 		#[codec(decode_bound())]
+		#[scale_info(skip_type_params(#type_use_gen), capture_docs = "always")]
 		#[allow(non_camel_case_types)]
 		pub enum #call_ident<#type_decl_bounded_gen> #where_clause {
 			#[doc(hidden)]
@@ -142,7 +173,25 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
 				#frame_support::sp_std::marker::PhantomData<(#type_use_gen,)>,
 				#frame_support::Never,
 			),
-			#( #( #[doc = #fn_doc] )* #fn_name( #( #args_compact_attr #args_type ),* ), )*
+			#(
+				#( #[doc = #fn_doc] )*
+				#fn_name {
+					#( #args_compact_attr #args_name_stripped: #args_type ),*
+				},
+			)*
+		}
+
+		impl<#type_impl_gen> #call_ident<#type_use_gen> #where_clause {
+			#(
+				#[doc = #new_call_variant_doc]
+				pub fn #new_call_variant_fn_name(
+					#( #args_name_stripped: #args_type ),*
+				) -> Self {
+					Self::#fn_name {
+						#( #args_name_stripped ),*
+					}
+				}
+			)*
 		}
 
 		impl<#type_impl_gen> #frame_support::dispatch::GetDispatchInfo
@@ -152,7 +201,7 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
 			fn get_dispatch_info(&self) -> #frame_support::dispatch::DispatchInfo {
 				match *self {
 					#(
-						Self::#fn_name ( #( ref #args_name, )* ) => {
+						Self::#fn_name { #( #args_name_pattern_ref, )* } => {
 							let __pallet_base_weight = #fn_weight;
 
 							let __pallet_weight = <
@@ -186,7 +235,7 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
 		{
 			fn get_call_name(&self) -> &'static str {
 				match *self {
-					#( Self::#fn_name(..) => stringify!(#fn_name), )*
+					#( Self::#fn_name { .. } => stringify!(#fn_name), )*
 					Self::__Ignore(_, _) => unreachable!("__PhantomItem cannot be used."),
 				}
 			}
@@ -207,7 +256,7 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
 			) -> #frame_support::dispatch::DispatchResultWithPostInfo {
 				match self {
 					#(
-						Self::#fn_name( #( #args_name, )* ) => {
+						Self::#fn_name { #( #args_name_pattern, )* } => {
 							#frame_support::sp_tracing::enter_span!(
 								#frame_support::sp_tracing::trace_span!(stringify!(#fn_name))
 							);
@@ -231,30 +280,8 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
 
 		impl<#type_impl_gen> #pallet_ident<#type_use_gen> #where_clause {
 			#[doc(hidden)]
-			#[allow(dead_code)]
-			pub fn call_functions() -> &'static [#frame_support::dispatch::FunctionMetadata] {
-				&[ #(
-					#frame_support::dispatch::FunctionMetadata {
-						name: #frame_support::dispatch::DecodeDifferent::Encode(
-							stringify!(#fn_name)
-						),
-						arguments: #frame_support::dispatch::DecodeDifferent::Encode(
-							&[ #(
-								#frame_support::dispatch::FunctionArgumentMetadata {
-									name: #frame_support::dispatch::DecodeDifferent::Encode(
-										stringify!(#args_name)
-									),
-									ty: #frame_support::dispatch::DecodeDifferent::Encode(
-										#args_metadata_type
-									),
-								},
-							)* ]
-						),
-						documentation: #frame_support::dispatch::DecodeDifferent::Encode(
-							&[ #( #fn_doc ),* ]
-						),
-					},
-				)* ]
+			pub fn call_functions() -> #frame_support::metadata::PalletCallMetadata {
+				#frame_support::scale_info::meta_type::<#call_ident<#type_use_gen>>().into()
 			}
 		}
 	)
diff --git a/frame/support/procedural/src/pallet/expand/config.rs b/frame/support/procedural/src/pallet/expand/config.rs
index 17101b0be8f5..dad26ccad6dc 100644
--- a/frame/support/procedural/src/pallet/expand/config.rs
+++ b/frame/support/procedural/src/pallet/expand/config.rs
@@ -15,7 +15,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::pallet::{parse::helper::get_doc_literals, Def};
+use crate::pallet::Def;
+use frame_support_procedural_tools::get_doc_literals;
 
 ///
 /// * Generate default rust doc
diff --git a/frame/support/procedural/src/pallet/expand/constants.rs b/frame/support/procedural/src/pallet/expand/constants.rs
index fcf77ae8e4b7..7cc245e8089d 100644
--- a/frame/support/procedural/src/pallet/expand/constants.rs
+++ b/frame/support/procedural/src/pallet/expand/constants.rs
@@ -16,8 +16,6 @@
 // limitations under the License.
 
 use crate::pallet::Def;
-use frame_support_procedural_tools::clean_type_string;
-use quote::ToTokens;
 
 struct ConstDef {
 	/// Name of the associated type.
@@ -35,7 +33,6 @@ struct ConstDef {
 pub fn expand_constants(def: &mut Def) -> proc_macro2::TokenStream {
 	let frame_support = &def.frame_support;
 	let type_impl_gen = &def.type_impl_generics(proc_macro2::Span::call_site());
-	let type_decl_gen = &def.type_decl_generics(proc_macro2::Span::call_site());
 	let type_use_gen = &def.type_use_generics(proc_macro2::Span::call_site());
 	let pallet_ident = &def.pallet_struct.pallet;
 
@@ -74,50 +71,17 @@ pub fn expand_constants(def: &mut Def) -> proc_macro2::TokenStream {
 
 	let consts = config_consts.chain(extra_consts).map(|const_| {
 		let const_type = &const_.type_;
-		let const_type_str = clean_type_string(&const_type.to_token_stream().to_string());
 		let ident = &const_.ident;
 		let ident_str = format!("{}", ident);
 		let doc = const_.doc.clone().into_iter();
 		let default_byte_impl = &const_.default_byte_impl;
-		let default_byte_getter =
-			syn::Ident::new(&format!("{}DefaultByteGetter", ident), ident.span());
 
 		quote::quote!({
-			#[allow(non_upper_case_types)]
-			#[allow(non_camel_case_types)]
-			struct #default_byte_getter<#type_decl_gen>(
-				#frame_support::sp_std::marker::PhantomData<(#type_use_gen)>
-			);
-
-			impl<#type_impl_gen> #frame_support::dispatch::DefaultByte for
-				#default_byte_getter<#type_use_gen>
-				#completed_where_clause
-			{
-				fn default_byte(&self) -> #frame_support::sp_std::vec::Vec<u8> {
-					#default_byte_impl
-				}
-			}
-
-			unsafe impl<#type_impl_gen> Send for #default_byte_getter<#type_use_gen>
-				#completed_where_clause
-			{}
-			unsafe impl<#type_impl_gen> Sync for #default_byte_getter<#type_use_gen>
-				#completed_where_clause
-			{}
-
-			#frame_support::dispatch::ModuleConstantMetadata {
-				name: #frame_support::dispatch::DecodeDifferent::Encode(#ident_str),
-				ty: #frame_support::dispatch::DecodeDifferent::Encode(#const_type_str),
-				value: #frame_support::dispatch::DecodeDifferent::Encode(
-					#frame_support::dispatch::DefaultByteGetter(
-						&#default_byte_getter::<#type_use_gen>(
-							#frame_support::sp_std::marker::PhantomData
-						)
-					)
-				),
-				documentation: #frame_support::dispatch::DecodeDifferent::Encode(
-					&[ #( #doc ),* ]
-				),
+			#frame_support::metadata::PalletConstantMetadata {
+				name: #ident_str,
+				ty: #frame_support::scale_info::meta_type::<#const_type>(),
+				value: { #default_byte_impl },
+				docs: #frame_support::sp_std::vec![ #( #doc ),* ],
 			}
 		})
 	});
@@ -126,10 +90,10 @@ pub fn expand_constants(def: &mut Def) -> proc_macro2::TokenStream {
 		impl<#type_impl_gen> #pallet_ident<#type_use_gen> #completed_where_clause{
 
 			#[doc(hidden)]
-			pub fn module_constants_metadata()
-				-> &'static [#frame_support::dispatch::ModuleConstantMetadata]
+			pub fn pallet_constants_metadata()
+				-> #frame_support::sp_std::vec::Vec<#frame_support::metadata::PalletConstantMetadata>
 			{
-				&[ #( #consts ),* ]
+				#frame_support::sp_std::vec![ #( #consts ),* ]
 			}
 		}
 	)
diff --git a/frame/support/procedural/src/pallet/expand/error.rs b/frame/support/procedural/src/pallet/expand/error.rs
index 19c4296ad02f..7a058bb32c92 100644
--- a/frame/support/procedural/src/pallet/expand/error.rs
+++ b/frame/support/procedural/src/pallet/expand/error.rs
@@ -15,11 +15,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::pallet::{parse::helper::get_doc_literals, Def};
+use crate::pallet::Def;
+use frame_support_procedural_tools::get_doc_literals;
 
 ///
 /// * impl various trait on Error
-/// * impl ModuleErrorMetadata for Error
 pub fn expand_error(def: &mut Def) -> proc_macro2::TokenStream {
 	let error = if let Some(error) = &def.error { error } else { return Default::default() };
 
@@ -32,6 +32,7 @@ pub fn expand_error(def: &mut Def) -> proc_macro2::TokenStream {
 
 	let phantom_variant: syn::Variant = syn::parse_quote!(
 		#[doc(hidden)]
+		#[codec(skip)]
 		__Ignore(
 			#frame_support::sp_std::marker::PhantomData<(#type_use_gen)>,
 			#frame_support::Never,
@@ -47,16 +48,6 @@ pub fn expand_error(def: &mut Def) -> proc_macro2::TokenStream {
 		quote::quote_spanned!(error.attr_span => Self::#variant => #variant_str,)
 	});
 
-	let metadata = error.variants.iter().map(|(variant, doc)| {
-		let variant_str = format!("{}", variant);
-		quote::quote_spanned!(error.attr_span =>
-			#frame_support::error::ErrorMetadata {
-				name: #frame_support::error::DecodeDifferent::Encode(#variant_str),
-				documentation: #frame_support::error::DecodeDifferent::Encode(&[ #( #doc, )* ]),
-			},
-		)
-	});
-
 	let error_item = {
 		let item = &mut def.item.content.as_mut().expect("Checked by def parser").1[error.index];
 		if let syn::Item::Enum(item) = item {
@@ -67,6 +58,13 @@ pub fn expand_error(def: &mut Def) -> proc_macro2::TokenStream {
 	};
 
 	error_item.variants.insert(0, phantom_variant);
+	// derive TypeInfo for error metadata
+	error_item
+		.attrs
+		.push(syn::parse_quote!( #[derive(#frame_support::scale_info::TypeInfo)] ));
+	error_item.attrs.push(syn::parse_quote!(
+		#[scale_info(skip_type_params(#type_use_gen), capture_docs = "always")]
+	));
 
 	if get_doc_literals(&error_item.attrs).is_empty() {
 		error_item.attrs.push(syn::parse_quote!(
@@ -130,14 +128,5 @@ pub fn expand_error(def: &mut Def) -> proc_macro2::TokenStream {
 				}
 			}
 		}
-
-		impl<#type_impl_gen> #frame_support::error::ModuleErrorMetadata
-			for #error_ident<#type_use_gen>
-			#config_where_clause
-		{
-			fn metadata() -> &'static [#frame_support::error::ErrorMetadata] {
-				&[ #( #metadata )* ]
-			}
-		}
 	)
 }
diff --git a/frame/support/procedural/src/pallet/expand/event.rs b/frame/support/procedural/src/pallet/expand/event.rs
index 2a2a3020a96b..ebd2d7aeabaf 100644
--- a/frame/support/procedural/src/pallet/expand/event.rs
+++ b/frame/support/procedural/src/pallet/expand/event.rs
@@ -16,9 +16,10 @@
 // limitations under the License.
 
 use crate::{
-	pallet::{parse::helper::get_doc_literals, Def},
+	pallet::{parse::event::PalletEventDepositAttr, Def},
 	COUNTER,
 };
+use frame_support_procedural_tools::get_doc_literals;
 use syn::{spanned::Spanned, Ident};
 
 ///
@@ -69,20 +70,6 @@ pub fn expand_event(def: &mut Def) -> proc_macro2::TokenStream {
 	let frame_support = &def.frame_support;
 	let event_use_gen = &event.gen_kind.type_use_gen(event.attr_span);
 	let event_impl_gen = &event.gen_kind.type_impl_gen(event.attr_span);
-	let metadata = event.metadata.iter().map(|(ident, args, docs)| {
-		let name = format!("{}", ident);
-		quote::quote_spanned!(event.attr_span =>
-			#frame_support::event::EventMetadata {
-				name: #frame_support::event::DecodeDifferent::Encode(#name),
-				arguments: #frame_support::event::DecodeDifferent::Encode(&[
-					#( #args, )*
-				]),
-				documentation: #frame_support::event::DecodeDifferent::Encode(&[
-					#( #docs, )*
-				]),
-			},
-		)
-	});
 
 	let event_item = {
 		let item = &mut def.item.content.as_mut().expect("Checked by def parser").1[event.index];
@@ -126,15 +113,23 @@ pub fn expand_event(def: &mut Def) -> proc_macro2::TokenStream {
 			#frame_support::RuntimeDebugNoBound,
 			#frame_support::codec::Encode,
 			#frame_support::codec::Decode,
+			#frame_support::scale_info::TypeInfo,
 		)]
 	));
 
-	let deposit_event = if let Some((fn_vis, fn_span)) = &event.deposit_event {
+	// skip requirement for type params to implement `TypeInfo`, and require docs capture
+	event_item.attrs.push(syn::parse_quote!(
+		#[scale_info(skip_type_params(#event_use_gen), capture_docs = "always")]
+	));
+
+	let deposit_event = if let Some(deposit_event) = &event.deposit_event {
 		let event_use_gen = &event.gen_kind.type_use_gen(event.attr_span);
 		let trait_use_gen = &def.trait_use_generics(event.attr_span);
 		let type_impl_gen = &def.type_impl_generics(event.attr_span);
 		let type_use_gen = &def.type_use_generics(event.attr_span);
 
+		let PalletEventDepositAttr { fn_vis, fn_span, .. } = deposit_event;
+
 		quote::quote_spanned!(*fn_span =>
 			impl<#type_impl_gen> Pallet<#type_use_gen> #completed_where_clause {
 				#fn_vis fn deposit_event(event: Event<#event_use_gen>) {
@@ -174,13 +169,5 @@ pub fn expand_event(def: &mut Def) -> proc_macro2::TokenStream {
 		impl<#event_impl_gen> From<#event_ident<#event_use_gen>> for () #event_where_clause {
 			fn from(_: #event_ident<#event_use_gen>) {}
 		}
-
-		impl<#event_impl_gen> #event_ident<#event_use_gen> #event_where_clause {
-			#[allow(dead_code)]
-			#[doc(hidden)]
-			pub fn metadata() -> &'static [#frame_support::event::EventMetadata] {
-				&[ #( #metadata )* ]
-			}
-		}
 	)
 }
diff --git a/frame/support/procedural/src/pallet/expand/genesis_config.rs b/frame/support/procedural/src/pallet/expand/genesis_config.rs
index 8c540209f40c..4bbba2c05908 100644
--- a/frame/support/procedural/src/pallet/expand/genesis_config.rs
+++ b/frame/support/procedural/src/pallet/expand/genesis_config.rs
@@ -15,10 +15,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::{
-	pallet::{parse::helper::get_doc_literals, Def},
-	COUNTER,
-};
+use crate::{pallet::Def, COUNTER};
+use frame_support_procedural_tools::get_doc_literals;
 use syn::{spanned::Spanned, Ident};
 
 ///
diff --git a/frame/support/procedural/src/pallet/expand/mod.rs b/frame/support/procedural/src/pallet/expand/mod.rs
index cfb61e700ac2..1c8883977c76 100644
--- a/frame/support/procedural/src/pallet/expand/mod.rs
+++ b/frame/support/procedural/src/pallet/expand/mod.rs
@@ -32,7 +32,8 @@ mod store_trait;
 mod type_value;
 mod validate_unsigned;
 
-use crate::pallet::{parse::helper::get_doc_literals, Def};
+use crate::pallet::Def;
+use frame_support_procedural_tools::get_doc_literals;
 use quote::ToTokens;
 
 /// Merge where clause together, `where` token span is taken from the first not none one.
diff --git a/frame/support/procedural/src/pallet/expand/pallet_struct.rs b/frame/support/procedural/src/pallet/expand/pallet_struct.rs
index 40fc39b161f1..a217742fec55 100644
--- a/frame/support/procedural/src/pallet/expand/pallet_struct.rs
+++ b/frame/support/procedural/src/pallet/expand/pallet_struct.rs
@@ -15,13 +15,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::pallet::{expand::merge_where_clauses, parse::helper::get_doc_literals, Def};
+use crate::pallet::{expand::merge_where_clauses, Def};
+use frame_support_procedural_tools::get_doc_literals;
 
 ///
 /// * Add derive trait on Pallet
 /// * Implement GetStorageVersion on Pallet
 /// * Implement OnGenesis on Pallet
-/// * Implement ModuleErrorMetadata on Pallet
+/// * Implement `fn error_metadata` on Pallet
 /// * declare Module type alias for construct_runtime
 /// * replace the first field type of `struct Pallet` with `PhantomData` if it is `_`
 /// * implementation of `PalletInfoAccess` information
@@ -76,28 +77,22 @@ pub fn expand_pallet_struct(def: &mut Def) -> proc_macro2::TokenStream {
 		)]
 	));
 
-	let module_error_metadata = if let Some(error_def) = &def.error {
+	let pallet_error_metadata = if let Some(error_def) = &def.error {
 		let error_ident = &error_def.error;
 		quote::quote_spanned!(def.pallet_struct.attr_span =>
-			impl<#type_impl_gen> #frame_support::error::ModuleErrorMetadata
-				for #pallet_ident<#type_use_gen>
-				#config_where_clause
-			{
-				fn metadata() -> &'static [#frame_support::error::ErrorMetadata] {
-					<
-						#error_ident<#type_use_gen> as #frame_support::error::ModuleErrorMetadata
-					>::metadata()
+			impl<#type_impl_gen> #pallet_ident<#type_use_gen> #config_where_clause {
+				pub fn error_metadata() -> Option<#frame_support::metadata::PalletErrorMetadata> {
+					Some(#frame_support::metadata::PalletErrorMetadata {
+						ty: #frame_support::scale_info::meta_type::<#error_ident<#type_use_gen>>()
+					})
 				}
 			}
 		)
 	} else {
 		quote::quote_spanned!(def.pallet_struct.attr_span =>
-			impl<#type_impl_gen> #frame_support::error::ModuleErrorMetadata
-				for #pallet_ident<#type_use_gen>
-				#config_where_clause
-			{
-				fn metadata() -> &'static [#frame_support::error::ErrorMetadata] {
-					&[]
+			impl<#type_impl_gen> #pallet_ident<#type_use_gen> #config_where_clause {
+				pub fn error_metadata() -> Option<#frame_support::metadata::PalletErrorMetadata> {
+					None
 				}
 			}
 		)
@@ -159,7 +154,7 @@ pub fn expand_pallet_struct(def: &mut Def) -> proc_macro2::TokenStream {
 	};
 
 	quote::quote_spanned!(def.pallet_struct.attr_span =>
-		#module_error_metadata
+		#pallet_error_metadata
 
 		/// Type alias to `Pallet`, to be used by `construct_runtime`.
 		///
diff --git a/frame/support/procedural/src/pallet/expand/storage.rs b/frame/support/procedural/src/pallet/expand/storage.rs
index ac03a41deb99..0f7133f10dd4 100644
--- a/frame/support/procedural/src/pallet/expand/storage.rs
+++ b/frame/support/procedural/src/pallet/expand/storage.rs
@@ -19,7 +19,6 @@ use crate::pallet::{
 	parse::storage::{Metadata, QueryKind, StorageDef, StorageGenerics},
 	Def,
 };
-use frame_support_procedural_tools::clean_type_string;
 use std::collections::HashSet;
 
 /// Generate the prefix_ident related the the storage.
@@ -176,89 +175,15 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 
 		let cfg_attrs = &storage.cfg_attrs;
 
-		let metadata_trait = match &storage.metadata {
-			Metadata::Value { .. } => quote::quote_spanned!(storage.attr_span =>
-				#frame_support::storage::types::StorageValueMetadata
-			),
-			Metadata::Map { .. } => quote::quote_spanned!(storage.attr_span =>
-				#frame_support::storage::types::StorageMapMetadata
-			),
-			Metadata::DoubleMap { .. } => quote::quote_spanned!(storage.attr_span =>
-				#frame_support::storage::types::StorageDoubleMapMetadata
-			),
-			Metadata::NMap { .. } => quote::quote_spanned!(storage.attr_span =>
-				#frame_support::storage::types::StorageNMapMetadata
-			),
-		};
-
-		let ty = match &storage.metadata {
-			Metadata::Value { value } => {
-				let value = clean_type_string(&quote::quote!(#value).to_string());
-				quote::quote_spanned!(storage.attr_span =>
-					#frame_support::metadata::StorageEntryType::Plain(
-						#frame_support::metadata::DecodeDifferent::Encode(#value)
-					)
-				)
-			},
-			Metadata::Map { key, value } => {
-				let value = clean_type_string(&quote::quote!(#value).to_string());
-				let key = clean_type_string(&quote::quote!(#key).to_string());
-				quote::quote_spanned!(storage.attr_span =>
-					#frame_support::metadata::StorageEntryType::Map {
-						hasher: <#full_ident as #metadata_trait>::HASHER,
-						key: #frame_support::metadata::DecodeDifferent::Encode(#key),
-						value: #frame_support::metadata::DecodeDifferent::Encode(#value),
-						unused: false,
-					}
-				)
-			},
-			Metadata::DoubleMap { key1, key2, value } => {
-				let value = clean_type_string(&quote::quote!(#value).to_string());
-				let key1 = clean_type_string(&quote::quote!(#key1).to_string());
-				let key2 = clean_type_string(&quote::quote!(#key2).to_string());
-				quote::quote_spanned!(storage.attr_span =>
-					#frame_support::metadata::StorageEntryType::DoubleMap {
-						hasher: <#full_ident as #metadata_trait>::HASHER1,
-						key2_hasher: <#full_ident as #metadata_trait>::HASHER2,
-						key1: #frame_support::metadata::DecodeDifferent::Encode(#key1),
-						key2: #frame_support::metadata::DecodeDifferent::Encode(#key2),
-						value: #frame_support::metadata::DecodeDifferent::Encode(#value),
-					}
-				)
-			},
-			Metadata::NMap { keys, value, .. } => {
-				let keys = keys
-					.iter()
-					.map(|key| clean_type_string(&quote::quote!(#key).to_string()))
-					.collect::<Vec<_>>();
-				let value = clean_type_string(&quote::quote!(#value).to_string());
-				quote::quote_spanned!(storage.attr_span =>
-					#frame_support::metadata::StorageEntryType::NMap {
-						keys: #frame_support::metadata::DecodeDifferent::Encode(&[
-							#( #keys, )*
-						]),
-						hashers: #frame_support::metadata::DecodeDifferent::Encode(
-							<#full_ident as #metadata_trait>::HASHERS,
-						),
-						value: #frame_support::metadata::DecodeDifferent::Encode(#value),
-					}
-				)
-			},
-		};
-
 		quote::quote_spanned!(storage.attr_span =>
 			#(#cfg_attrs)* #frame_support::metadata::StorageEntryMetadata {
-				name: #frame_support::metadata::DecodeDifferent::Encode(
-					<#full_ident as #metadata_trait>::NAME
-				),
-				modifier: <#full_ident as #metadata_trait>::MODIFIER,
-				ty: #ty,
-				default: #frame_support::metadata::DecodeDifferent::Encode(
-					<#full_ident as #metadata_trait>::DEFAULT
-				),
-				documentation: #frame_support::metadata::DecodeDifferent::Encode(&[
+				name: <#full_ident as #frame_support::storage::StorageEntryMetadata>::NAME,
+				modifier: <#full_ident as #frame_support::storage::StorageEntryMetadata>::MODIFIER,
+				ty: <#full_ident as #frame_support::storage::StorageEntryMetadata>::ty(),
+				default: <#full_ident as #frame_support::storage::StorageEntryMetadata>::default(),
+				docs: #frame_support::sp_std::vec![
 					#( #docs, )*
-				]),
+				],
 			}
 		)
 	});
@@ -419,18 +344,16 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 			#completed_where_clause
 		{
 			#[doc(hidden)]
-			pub fn storage_metadata() -> #frame_support::metadata::StorageMetadata {
-				#frame_support::metadata::StorageMetadata {
-					prefix: #frame_support::metadata::DecodeDifferent::Encode(
-						<
-							<T as #frame_system::Config>::PalletInfo as
-							#frame_support::traits::PalletInfo
-						>::name::<#pallet_ident<#type_use_gen>>()
-							.expect("Every active pallet has a name in the runtime; qed")
-					),
-					entries: #frame_support::metadata::DecodeDifferent::Encode(
-						&[ #( #entries, )* ]
-					),
+			pub fn storage_metadata() -> #frame_support::metadata::PalletStorageMetadata {
+				#frame_support::metadata::PalletStorageMetadata {
+					prefix: <
+						<T as #frame_system::Config>::PalletInfo as
+						#frame_support::traits::PalletInfo
+					>::name::<#pallet_ident<#type_use_gen>>()
+						.expect("Every active pallet has a name in the runtime; qed"),
+					entries: #frame_support::sp_std::vec![
+						#( #entries, )*
+					],
 				}
 			}
 		}
diff --git a/frame/support/procedural/src/pallet/parse/call.rs b/frame/support/procedural/src/pallet/parse/call.rs
index d022e8025aab..0563568f3331 100644
--- a/frame/support/procedural/src/pallet/parse/call.rs
+++ b/frame/support/procedural/src/pallet/parse/call.rs
@@ -16,6 +16,7 @@
 // limitations under the License.
 
 use super::helper;
+use frame_support_procedural_tools::get_doc_literals;
 use quote::ToTokens;
 use syn::spanned::Spanned;
 
@@ -219,7 +220,7 @@ impl CallDef {
 					args.push((!arg_attrs.is_empty(), arg_ident, arg.ty.clone()));
 				}
 
-				let docs = helper::get_doc_literals(&method.attrs);
+				let docs = get_doc_literals(&method.attrs);
 
 				methods.push(CallVariantDef { name: method.sig.ident.clone(), weight, args, docs });
 			} else {
@@ -234,7 +235,7 @@ impl CallDef {
 			instances,
 			methods,
 			where_clause: item.generics.where_clause.clone(),
-			docs: helper::get_doc_literals(&item.attrs),
+			docs: get_doc_literals(&item.attrs),
 		})
 	}
 }
diff --git a/frame/support/procedural/src/pallet/parse/config.rs b/frame/support/procedural/src/pallet/parse/config.rs
index b006aadf51a0..712c20ffc7b4 100644
--- a/frame/support/procedural/src/pallet/parse/config.rs
+++ b/frame/support/procedural/src/pallet/parse/config.rs
@@ -17,6 +17,7 @@
 
 use super::helper;
 use core::convert::TryFrom;
+use frame_support_procedural_tools::get_doc_literals;
 use quote::ToTokens;
 use syn::spanned::Spanned;
 
@@ -69,7 +70,7 @@ impl TryFrom<&syn::TraitItemType> for ConstMetadataDef {
 		let err = |span, msg| {
 			syn::Error::new(span, format!("Invalid usage of `#[pallet::constant]`: {}", msg))
 		};
-		let doc = helper::get_doc_literals(&trait_ty.attrs);
+		let doc = get_doc_literals(&trait_ty.attrs);
 		let ident = trait_ty.ident.clone();
 		let bound = trait_ty
 			.bounds
diff --git a/frame/support/procedural/src/pallet/parse/error.rs b/frame/support/procedural/src/pallet/parse/error.rs
index 9b96a1876917..9c9a95105c53 100644
--- a/frame/support/procedural/src/pallet/parse/error.rs
+++ b/frame/support/procedural/src/pallet/parse/error.rs
@@ -16,6 +16,7 @@
 // limitations under the License.
 
 use super::helper;
+use frame_support_procedural_tools::get_doc_literals;
 use quote::ToTokens;
 use syn::spanned::Spanned;
 
@@ -80,7 +81,7 @@ impl ErrorDef {
 					return Err(syn::Error::new(span, msg))
 				}
 
-				Ok((variant.ident.clone(), helper::get_doc_literals(&variant.attrs)))
+				Ok((variant.ident.clone(), get_doc_literals(&variant.attrs)))
 			})
 			.collect::<Result<_, _>>()?;
 
diff --git a/frame/support/procedural/src/pallet/parse/event.rs b/frame/support/procedural/src/pallet/parse/event.rs
index d66e35e09025..33de4aca8b59 100644
--- a/frame/support/procedural/src/pallet/parse/event.rs
+++ b/frame/support/procedural/src/pallet/parse/event.rs
@@ -16,13 +16,11 @@
 // limitations under the License.
 
 use super::helper;
-use frame_support_procedural_tools::clean_type_string;
 use quote::ToTokens;
 use syn::spanned::Spanned;
 
 /// List of additional token to be used for parsing.
 mod keyword {
-	syn::custom_keyword!(metadata);
 	syn::custom_keyword!(Event);
 	syn::custom_keyword!(pallet);
 	syn::custom_keyword!(generate_deposit);
@@ -35,60 +33,31 @@ pub struct EventDef {
 	pub index: usize,
 	/// The keyword Event used (contains span).
 	pub event: keyword::Event,
-	/// Event metadatas: `(name, args, docs)`.
-	pub metadata: Vec<(syn::Ident, Vec<String>, Vec<syn::Lit>)>,
 	/// A set of usage of instance, must be check for consistency with trait.
 	pub instances: Vec<helper::InstanceUsage>,
 	/// The kind of generic the type `Event` has.
 	pub gen_kind: super::GenericKind,
 	/// Whether the function `deposit_event` must be generated.
-	pub deposit_event: Option<(syn::Visibility, proc_macro2::Span)>,
+	pub deposit_event: Option<PalletEventDepositAttr>,
 	/// Where clause used in event definition.
 	pub where_clause: Option<syn::WhereClause>,
 	/// The span of the pallet::event attribute.
 	pub attr_span: proc_macro2::Span,
 }
 
-/// Attribute for Event: defines metadata name to use.
+/// Attribute for a pallet's Event.
 ///
 /// Syntax is:
-/// * `#[pallet::metadata(SomeType = MetadataName, ...)]`
 /// * `#[pallet::generate_deposit($vis fn deposit_event)]`
-enum PalletEventAttr {
-	Metadata {
-		metadata: Vec<(syn::Type, String)>,
-		// Span of the attribute
-		span: proc_macro2::Span,
-	},
-	DepositEvent {
-		fn_vis: syn::Visibility,
-		// Span for the keyword deposit_event
-		fn_span: proc_macro2::Span,
-		// Span of the attribute
-		span: proc_macro2::Span,
-	},
+pub struct PalletEventDepositAttr {
+	pub fn_vis: syn::Visibility,
+	// Span for the keyword deposit_event
+	pub fn_span: proc_macro2::Span,
+	// Span of the attribute
+	pub span: proc_macro2::Span,
 }
 
-impl PalletEventAttr {
-	fn span(&self) -> proc_macro2::Span {
-		match self {
-			Self::Metadata { span, .. } => *span,
-			Self::DepositEvent { span, .. } => *span,
-		}
-	}
-}
-
-/// Parse for syntax `$Type = "$SomeString"`.
-fn parse_event_metadata_element(
-	input: syn::parse::ParseStream,
-) -> syn::Result<(syn::Type, String)> {
-	let typ = input.parse::<syn::Type>()?;
-	input.parse::<syn::Token![=]>()?;
-	let ident = input.parse::<syn::LitStr>()?;
-	Ok((typ, ident.value()))
-}
-
-impl syn::parse::Parse for PalletEventAttr {
+impl syn::parse::Parse for PalletEventDepositAttr {
 	fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
 		input.parse::<syn::Token![#]>()?;
 		let content;
@@ -96,56 +65,33 @@ impl syn::parse::Parse for PalletEventAttr {
 		content.parse::<keyword::pallet>()?;
 		content.parse::<syn::Token![::]>()?;
 
-		let lookahead = content.lookahead1();
-		if lookahead.peek(keyword::metadata) {
-			let span = content.parse::<keyword::metadata>()?.span();
-			let metadata_content;
-			syn::parenthesized!(metadata_content in content);
-
-			let metadata = metadata_content
-				.parse_terminated::<_, syn::Token![,]>(parse_event_metadata_element)?
-				.into_pairs()
-				.map(syn::punctuated::Pair::into_value)
-				.collect();
-
-			Ok(PalletEventAttr::Metadata { metadata, span })
-		} else if lookahead.peek(keyword::generate_deposit) {
-			let span = content.parse::<keyword::generate_deposit>()?.span();
-
-			let generate_content;
-			syn::parenthesized!(generate_content in content);
-			let fn_vis = generate_content.parse::<syn::Visibility>()?;
-			generate_content.parse::<syn::Token![fn]>()?;
-			let fn_span = generate_content.parse::<keyword::deposit_event>()?.span();
-
-			Ok(PalletEventAttr::DepositEvent { fn_vis, span, fn_span })
-		} else {
-			Err(lookahead.error())
-		}
+		let span = content.parse::<keyword::generate_deposit>()?.span();
+		let generate_content;
+		syn::parenthesized!(generate_content in content);
+		let fn_vis = generate_content.parse::<syn::Visibility>()?;
+		generate_content.parse::<syn::Token![fn]>()?;
+		let fn_span = generate_content.parse::<keyword::deposit_event>()?.span();
+
+		Ok(PalletEventDepositAttr { fn_vis, span, fn_span })
 	}
 }
 
 struct PalletEventAttrInfo {
-	metadata: Option<Vec<(syn::Type, String)>>,
-	deposit_event: Option<(syn::Visibility, proc_macro2::Span)>,
+	deposit_event: Option<PalletEventDepositAttr>,
 }
 
 impl PalletEventAttrInfo {
-	fn from_attrs(attrs: Vec<PalletEventAttr>) -> syn::Result<Self> {
-		let mut metadata = None;
+	fn from_attrs(attrs: Vec<PalletEventDepositAttr>) -> syn::Result<Self> {
 		let mut deposit_event = None;
 		for attr in attrs {
-			match attr {
-				PalletEventAttr::Metadata { metadata: m, .. } if metadata.is_none() =>
-					metadata = Some(m),
-				PalletEventAttr::DepositEvent { fn_vis, fn_span, .. }
-					if deposit_event.is_none() =>
-					deposit_event = Some((fn_vis, fn_span)),
-				attr => return Err(syn::Error::new(attr.span(), "Duplicate attribute")),
+			if deposit_event.is_none() {
+				deposit_event = Some(attr)
+			} else {
+				return Err(syn::Error::new(attr.span, "Duplicate attribute"))
 			}
 		}
 
-		Ok(PalletEventAttrInfo { metadata, deposit_event })
+		Ok(PalletEventAttrInfo { deposit_event })
 	}
 }
 
@@ -161,9 +107,9 @@ impl EventDef {
 			return Err(syn::Error::new(item.span(), "Invalid pallet::event, expected item enum"))
 		};
 
-		let event_attrs: Vec<PalletEventAttr> = helper::take_item_pallet_attrs(&mut item.attrs)?;
+		let event_attrs: Vec<PalletEventDepositAttr> =
+			helper::take_item_pallet_attrs(&mut item.attrs)?;
 		let attr_info = PalletEventAttrInfo::from_attrs(event_attrs)?;
-		let metadata = attr_info.metadata.unwrap_or_else(Vec::new);
 		let deposit_event = attr_info.deposit_event;
 
 		if !matches!(item.vis, syn::Visibility::Public(_)) {
@@ -190,39 +136,6 @@ impl EventDef {
 
 		let event = syn::parse2::<keyword::Event>(item.ident.to_token_stream())?;
 
-		let metadata = item
-			.variants
-			.iter()
-			.map(|variant| {
-				let name = variant.ident.clone();
-				let docs = helper::get_doc_literals(&variant.attrs);
-				let args = variant
-					.fields
-					.iter()
-					.map(|field| {
-						metadata
-							.iter()
-							.find(|m| m.0 == field.ty)
-							.map(|m| m.1.clone())
-							.unwrap_or_else(|| {
-								clean_type_string(&field.ty.to_token_stream().to_string())
-							})
-					})
-					.collect();
-
-				(name, args, docs)
-			})
-			.collect();
-
-		Ok(EventDef {
-			attr_span,
-			index,
-			metadata,
-			instances,
-			deposit_event,
-			event,
-			gen_kind,
-			where_clause,
-		})
+		Ok(EventDef { attr_span, index, instances, deposit_event, event, gen_kind, where_clause })
 	}
 }
diff --git a/frame/support/procedural/src/pallet/parse/extra_constants.rs b/frame/support/procedural/src/pallet/parse/extra_constants.rs
index 71208f3329a1..c1324df6c22f 100644
--- a/frame/support/procedural/src/pallet/parse/extra_constants.rs
+++ b/frame/support/procedural/src/pallet/parse/extra_constants.rs
@@ -16,6 +16,7 @@
 // limitations under the License.
 
 use super::helper;
+use frame_support_procedural_tools::get_doc_literals;
 use syn::spanned::Spanned;
 
 /// List of additional token to be used for parsing.
@@ -104,7 +105,7 @@ impl ExtraConstantsDef {
 			extra_constants.push(ExtraConstantDef {
 				ident: method.sig.ident.clone(),
 				type_,
-				doc: helper::get_doc_literals(&method.attrs),
+				doc: get_doc_literals(&method.attrs),
 			});
 		}
 
diff --git a/frame/support/procedural/src/pallet/parse/helper.rs b/frame/support/procedural/src/pallet/parse/helper.rs
index 211f1ed5ee42..2590e86b58b0 100644
--- a/frame/support/procedural/src/pallet/parse/helper.rs
+++ b/frame/support/procedural/src/pallet/parse/helper.rs
@@ -139,24 +139,6 @@ impl MutItemAttrs for syn::ItemMod {
 	}
 }
 
-/// Return all doc attributes literals found.
-pub fn get_doc_literals(attrs: &Vec<syn::Attribute>) -> Vec<syn::Lit> {
-	attrs
-		.iter()
-		.filter_map(|attr| {
-			if let Ok(syn::Meta::NameValue(meta)) = attr.parse_meta() {
-				if meta.path.get_ident().map_or(false, |ident| ident == "doc") {
-					Some(meta.lit)
-				} else {
-					None
-				}
-			} else {
-				None
-			}
-		})
-		.collect()
-}
-
 /// Parse for `()`
 struct Unit;
 impl syn::parse::Parse for Unit {
diff --git a/frame/support/procedural/src/pallet/parse/storage.rs b/frame/support/procedural/src/pallet/parse/storage.rs
index 5df7bc132dff..e58b5d204886 100644
--- a/frame/support/procedural/src/pallet/parse/storage.rs
+++ b/frame/support/procedural/src/pallet/parse/storage.rs
@@ -16,6 +16,7 @@
 // limitations under the License.
 
 use super::helper;
+use frame_support_procedural_tools::get_doc_literals;
 use quote::ToTokens;
 use std::collections::HashMap;
 use syn::spanned::Spanned;
@@ -609,7 +610,7 @@ impl StorageDef {
 		instances.push(helper::check_type_def_gen(&item.generics, item.ident.span())?);
 
 		let where_clause = item.generics.where_clause.clone();
-		let docs = helper::get_doc_literals(&item.attrs);
+		let docs = get_doc_literals(&item.attrs);
 
 		let typ = if let syn::Type::Path(typ) = &*item.ty {
 			typ
diff --git a/frame/support/procedural/src/storage/instance_trait.rs b/frame/support/procedural/src/storage/instance_trait.rs
index 4f55d3859666..00a73d6fbd6e 100644
--- a/frame/support/procedural/src/storage/instance_trait.rs
+++ b/frame/support/procedural/src/storage/instance_trait.rs
@@ -126,6 +126,7 @@ fn create_and_impl_instance_struct(
 			Clone, Eq, PartialEq,
 			#scrate::codec::Encode,
 			#scrate::codec::Decode,
+			#scrate::scale_info::TypeInfo,
 			#scrate::RuntimeDebug,
 		)]
 		#doc
diff --git a/frame/support/procedural/src/storage/metadata.rs b/frame/support/procedural/src/storage/metadata.rs
index ca7dd97c155f..a90e5051c5b2 100644
--- a/frame/support/procedural/src/storage/metadata.rs
+++ b/frame/support/procedural/src/storage/metadata.rs
@@ -18,31 +18,28 @@
 //! Implementation of `storage_metadata` on module structure, used by construct_runtime.
 
 use super::{DeclStorageDefExt, StorageLineDefExt, StorageLineTypeDef};
-use frame_support_procedural_tools::clean_type_string;
+use frame_support_procedural_tools::get_doc_literals;
 use proc_macro2::TokenStream;
 use quote::quote;
 
 fn storage_line_metadata_type(scrate: &TokenStream, line: &StorageLineDefExt) -> TokenStream {
 	let value_type = &line.value_type;
-	let value_type = clean_type_string(&quote!( #value_type ).to_string());
 	match &line.storage_type {
 		StorageLineTypeDef::Simple(_) => {
 			quote! {
 				#scrate::metadata::StorageEntryType::Plain(
-					#scrate::metadata::DecodeDifferent::Encode(#value_type),
+					#scrate::scale_info::meta_type::<#value_type>()
 				)
 			}
 		},
 		StorageLineTypeDef::Map(map) => {
 			let hasher = map.hasher.into_metadata();
 			let key = &map.key;
-			let key = clean_type_string(&quote!(#key).to_string());
 			quote! {
 				#scrate::metadata::StorageEntryType::Map {
-					hasher: #scrate::metadata::#hasher,
-					key: #scrate::metadata::DecodeDifferent::Encode(#key),
-					value: #scrate::metadata::DecodeDifferent::Encode(#value_type),
-					unused: false,
+					hashers: #scrate::sp_std::vec! [ #scrate::metadata::#hasher ],
+					key: #scrate::scale_info::meta_type::<#key>(),
+					value: #scrate::scale_info::meta_type::<#value_type>(),
 				}
 			}
 		},
@@ -50,39 +47,32 @@ fn storage_line_metadata_type(scrate: &TokenStream, line: &StorageLineDefExt) ->
 			let hasher1 = map.hasher1.into_metadata();
 			let hasher2 = map.hasher2.into_metadata();
 			let key1 = &map.key1;
-			let key1 = clean_type_string(&quote!(#key1).to_string());
 			let key2 = &map.key2;
-			let key2 = clean_type_string(&quote!(#key2).to_string());
 			quote! {
-				#scrate::metadata::StorageEntryType::DoubleMap {
-					hasher: #scrate::metadata::#hasher1,
-					key1: #scrate::metadata::DecodeDifferent::Encode(#key1),
-					key2: #scrate::metadata::DecodeDifferent::Encode(#key2),
-					value: #scrate::metadata::DecodeDifferent::Encode(#value_type),
-					key2_hasher: #scrate::metadata::#hasher2,
+				#scrate::metadata::StorageEntryType::Map {
+					hashers: #scrate::sp_std::vec! [
+						#scrate::metadata::#hasher1,
+						#scrate::metadata::#hasher2,
+					],
+					key: #scrate::scale_info::meta_type::<(#key1, #key2)>(),
+					value: #scrate::scale_info::meta_type::<#value_type>(),
 				}
 			}
 		},
 		StorageLineTypeDef::NMap(map) => {
-			let keys = map
-				.keys
-				.iter()
-				.map(|key| clean_type_string(&quote!(#key).to_string()))
-				.collect::<Vec<_>>();
+			let key_tuple = &map.to_key_tuple();
 			let hashers = map
 				.hashers
 				.iter()
 				.map(|hasher| hasher.to_storage_hasher_struct())
 				.collect::<Vec<_>>();
 			quote! {
-				#scrate::metadata::StorageEntryType::NMap {
-					keys: #scrate::metadata::DecodeDifferent::Encode(&[
-						#( #keys, )*
-					]),
-					hashers: #scrate::metadata::DecodeDifferent::Encode(&[
+				#scrate::metadata::StorageEntryType::Map {
+					hashers: #scrate::sp_std::vec! [
 						#( #scrate::metadata::StorageHasher::#hashers, )*
-					]),
-					value: #scrate::metadata::DecodeDifferent::Encode(#value_type),
+					],
+					key: #scrate::scale_info::meta_type::<#key_tuple>(),
+					value: #scrate::scale_info::meta_type::<#value_type>(),
 				}
 			}
 		},
@@ -129,8 +119,7 @@ fn default_byte_getter(
 
 		#[cfg(feature = "std")]
 		impl<#runtime_generic: #runtime_trait, #optional_instance_bound>
-			#scrate::metadata::DefaultByte
-			for #struct_name<#runtime_generic, #optional_instance>
+			#struct_name<#runtime_generic, #optional_instance>
 			#where_clause
 		{
 			fn default_byte(&self) -> #scrate::sp_std::vec::Vec<u8> {
@@ -142,16 +131,9 @@ fn default_byte_getter(
 			}
 		}
 
-		unsafe impl<#runtime_generic: #runtime_trait, #optional_instance_bound> Send
-			for #struct_name<#runtime_generic, #optional_instance> #where_clause {}
-
-		unsafe impl<#runtime_generic: #runtime_trait, #optional_instance_bound> Sync
-			for #struct_name<#runtime_generic, #optional_instance> #where_clause {}
-
 		#[cfg(not(feature = "std"))]
 		impl<#runtime_generic: #runtime_trait, #optional_instance_bound>
-			#scrate::metadata::DefaultByte
-			for #struct_name<#runtime_generic, #optional_instance>
+			#struct_name<#runtime_generic, #optional_instance>
 			#where_clause
 		{
 			fn default_byte(&self) -> #scrate::sp_std::vec::Vec<u8> {
@@ -187,25 +169,15 @@ pub fn impl_metadata(def: &DeclStorageDefExt) -> TokenStream {
 		let (default_byte_getter_struct_def, default_byte_getter_struct_instance) =
 			default_byte_getter(scrate, line, def);
 
-		let mut docs = TokenStream::new();
-		for attr in line.attrs.iter().filter_map(|v| v.parse_meta().ok()) {
-			if let syn::Meta::NameValue(meta) = attr {
-				if meta.path.is_ident("doc") {
-					let lit = meta.lit;
-					docs.extend(quote!(#lit,));
-				}
-			}
-		}
+		let docs = get_doc_literals(&line.attrs);
 
 		let entry = quote! {
 			#scrate::metadata::StorageEntryMetadata {
-				name: #scrate::metadata::DecodeDifferent::Encode(#str_name),
+				name: #str_name,
 				modifier: #modifier,
 				ty: #ty,
-				default: #scrate::metadata::DecodeDifferent::Encode(
-					#scrate::metadata::DefaultByteGetter(&#default_byte_getter_struct_instance)
-				),
-				documentation: #scrate::metadata::DecodeDifferent::Encode(&[ #docs ]),
+				default: #default_byte_getter_struct_instance.default_byte(),
+				docs: #scrate::sp_std::vec![ #( #docs ),* ],
 			},
 		};
 
@@ -222,9 +194,9 @@ pub fn impl_metadata(def: &DeclStorageDefExt) -> TokenStream {
 	};
 
 	let store_metadata = quote!(
-		#scrate::metadata::StorageMetadata {
-			prefix: #scrate::metadata::DecodeDifferent::Encode(#prefix),
-			entries: #scrate::metadata::DecodeDifferent::Encode(&[ #entries ][..]),
+		#scrate::metadata::PalletStorageMetadata {
+			prefix: #prefix,
+			entries: #scrate::sp_std::vec![ #entries ],
 		}
 	);
 
@@ -237,7 +209,7 @@ pub fn impl_metadata(def: &DeclStorageDefExt) -> TokenStream {
 
 		impl#module_impl #module_struct #where_clause {
 			#[doc(hidden)]
-			pub fn storage_metadata() -> #scrate::metadata::StorageMetadata {
+			pub fn storage_metadata() -> #scrate::metadata::PalletStorageMetadata {
 				#store_metadata
 			}
 		}
diff --git a/frame/support/procedural/tools/src/lib.rs b/frame/support/procedural/tools/src/lib.rs
index 19242db4594c..d7aba4c7cbf1 100644
--- a/frame/support/procedural/tools/src/lib.rs
+++ b/frame/support/procedural/tools/src/lib.rs
@@ -100,3 +100,21 @@ pub fn clean_type_string(input: &str) -> String {
 		.replace("< ", "<")
 		.replace(" >", ">")
 }
+
+/// Return all doc attributes literals found.
+pub fn get_doc_literals(attrs: &[syn::Attribute]) -> Vec<syn::Lit> {
+	attrs
+		.iter()
+		.filter_map(|attr| {
+			if let Ok(syn::Meta::NameValue(meta)) = attr.parse_meta() {
+				if meta.path.get_ident().map_or(false, |ident| ident == "doc") {
+					Some(meta.lit)
+				} else {
+					None
+				}
+			} else {
+				None
+			}
+		})
+		.collect()
+}
diff --git a/frame/support/src/dispatch.rs b/frame/support/src/dispatch.rs
index a4644cebeeb5..2e6777fee2af 100644
--- a/frame/support/src/dispatch.rs
+++ b/frame/support/src/dispatch.rs
@@ -33,10 +33,6 @@ pub use crate::{
 		TransactionPriority, WeighData, Weight, WithPostDispatchInfo,
 	},
 };
-pub use frame_metadata::{
-	DecodeDifferent, DecodeDifferentArray, DefaultByte, DefaultByteGetter, ErrorMetadata,
-	FunctionArgumentMetadata, FunctionMetadata, ModuleConstantMetadata, ModuleErrorMetadata,
-};
 pub use sp_runtime::{traits::Dispatchable, DispatchError};
 
 /// The return type of a `Dispatchable` in frame. When returned explicitly from
@@ -67,8 +63,8 @@ pub type CallableCallFor<A, R> = <A as Callable<R>>::Call;
 /// A type that can be used as a parameter in a dispatchable function.
 ///
 /// When using `decl_module` all arguments for call functions must implement this trait.
-pub trait Parameter: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
-impl<T> Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
+pub trait Parameter: Codec + EncodeLike + Clone + Eq + fmt::Debug + scale_info::TypeInfo {}
+impl<T> Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug + scale_info::TypeInfo {}
 
 /// Declares a `Module` struct and a `Call` enum, which implements the dispatch logic.
 ///
@@ -1169,7 +1165,7 @@ macro_rules! decl_module {
 			{ $( $on_finalize )* }
 			{ $( $offchain )* }
 			{ $( $constants )* }
-			{ &'static str }
+			{ __NO_ERROR_DEFINED }
 			{ $( $integrity_test )* }
 			{ $( $storage_version )* }
 			[ $($t)* ]
@@ -1239,7 +1235,7 @@ macro_rules! decl_module {
 		{ $( $on_finalize:tt )* }
 		{ $( $offchain:tt )* }
 		{ $( $constants:tt )* }
-		{ $error_type:ty }
+		{ $( $error_type:tt )* }
 		{ $( $integrity_test:tt )* }
 		{ $( $storage_version:tt )* }
 		[ $( $dispatchables:tt )* ]
@@ -1265,8 +1261,8 @@ macro_rules! decl_module {
 			{ $( $on_finalize )* }
 			{ $( $offchain )* }
 			{ $( $constants )* }
-			{ $error_type }
-			{ $( $integrity_test )* }
+			{ $( $error_type )* }
+			{ $( $integrity_test)* }
 			{ $( $storage_version )* }
 			[
 				$( $dispatchables )*
@@ -1750,7 +1746,6 @@ macro_rules! decl_module {
 	(@impl_function
 		$module:ident<$trait_instance:ident: $trait_name:ident$(<I>, $instance:ident: $instantiable:path)?>;
 		$origin_ty:ty;
-		$error_type:ty;
 		$ignore:ident;
 		$(#[$fn_attr:meta])*
 		$vis:vis fn $name:ident (
@@ -1772,7 +1767,6 @@ macro_rules! decl_module {
 	(@impl_function
 		$module:ident<$trait_instance:ident: $trait_name:ident$(<I>, $instance:ident: $instantiable:path)?>;
 		$origin_ty:ty;
-		$error_type:ty;
 		$ignore:ident;
 		$(#[$fn_attr:meta])*
 		$vis:vis fn $name:ident (
@@ -1796,7 +1790,7 @@ macro_rules! decl_module {
 		variant $fn_name:ident;
 		$( #[doc = $doc_attr:tt] )*
 		#[compact]
-		$type:ty;
+		$name:ident : $type:ty;
 		$( $rest:tt )*
 	) => {
 		$crate::decl_module! {
@@ -1808,7 +1802,7 @@ macro_rules! decl_module {
 			{
 				$( $current_params )*
 				#[codec(compact)]
-				$type,
+				$name: $type,
 			}
 			variant $fn_name;
 			$( #[doc = $doc_attr] )*
@@ -1825,7 +1819,7 @@ macro_rules! decl_module {
 		{ $( $current_params:tt )* }
 		variant $fn_name:ident;
 		$(#[doc = $doc_attr:tt])*
-		$type:ty;
+		$name:ident : $type:ty;
 		$( $rest:tt )*
 	) => {
 		$crate::decl_module! {
@@ -1836,7 +1830,7 @@ macro_rules! decl_module {
 			{ $( $generated_variants )* }
 			{
 				$( $current_params )*
-				$type,
+				$name: $type,
 			}
 			variant $fn_name;
 			$( #[doc = $doc_attr] )*
@@ -1866,9 +1860,9 @@ macro_rules! decl_module {
 				$( $generated_variants )*
 				#[allow(non_camel_case_types)]
 				$(#[doc = $doc_attr])*
-				$fn_name (
+				$fn_name {
 					$( $current_params )*
-				),
+				},
 			}
 			{}
 			$(
@@ -1888,7 +1882,8 @@ macro_rules! decl_module {
 		/// Dispatchable calls.
 		///
 		/// Each variant of this enum maps to a dispatchable function from the associated module.
-		#[derive($crate::codec::Encode, $crate::codec::Decode)]
+		#[derive($crate::codec::Encode, $crate::codec::Decode, $crate::scale_info::TypeInfo)]
+		#[scale_info(skip_type_params($trait_instance $(, $instance)?), capture_docs = "always")]
 		pub enum $call_type<$trait_instance: $trait_name$(<I>, $instance: $instantiable $( = $module_default_instance)?)?>
 			where $( $other_where_bounds )*
 		{
@@ -1965,7 +1960,7 @@ macro_rules! decl_module {
 		{ $( $on_finalize:tt )* }
 		{ $( $offchain:tt )* }
 		{ $( $constants:tt )* }
-		{ $error_type:ty }
+		{ $( $error_type:tt )* }
 		{ $( $integrity_test:tt )* }
 		{ $( $storage_version:tt )* }
 	) => {
@@ -2051,7 +2046,6 @@ macro_rules! decl_module {
 					@impl_function
 					$mod_type<$trait_instance: $trait_name $(<I>, $fn_instance: $fn_instantiable)?>;
 					$origin_type;
-					$error_type;
 					$from;
 					$(#[doc = $doc_attr])*
 					///
@@ -2076,11 +2070,28 @@ macro_rules! decl_module {
 				$(#[doc = $doc_attr])*
 				$(
 					$(#[$codec_attr])*
-					$param;
+					$param_name : $param;
 				)*
 			)*
 		}
 
+		$crate::paste::paste! {
+			impl<$trait_instance: $trait_name $(<I>, $instance: $instantiable)?>
+				$call_type<$trait_instance $(, $instance)?> where $( $other_where_bounds )*
+			{
+				$(
+					#[doc = "Create a call with the variant `" $fn_name "`."]
+					pub fn [< new_call_variant_ $fn_name >](
+						$( $param_name: $param ),*
+					) -> Self {
+						Self::$fn_name {
+							$( $param_name ),*
+						}
+					}
+				)*
+			}
+		}
+
 		$crate::decl_module! {
 			@impl_get_storage_version
 			$mod_type<$trait_instance: $trait_name $(<I>, $instance: $instantiable)?>;
@@ -2095,7 +2106,7 @@ macro_rules! decl_module {
 			fn get_dispatch_info(&self) -> $crate::dispatch::DispatchInfo {
 				match *self {
 					$(
-						$call_type::$fn_name( $( ref $param_name ),* ) => {
+						$call_type::$fn_name { $( ref $param_name ),* } => {
 							let __pallet_base_weight = $weight;
 							let __pallet_weight = <dyn $crate::dispatch::WeighData<( $( & $param, )* )>>::weigh_data(
 								&__pallet_base_weight,
@@ -2149,7 +2160,7 @@ macro_rules! decl_module {
 			fn get_call_name(&self) -> &'static str {
 				match *self {
 					$(
-						$call_type::$fn_name( $( ref $param_name ),* ) => {
+						$call_type::$fn_name { $( ref $param_name ),* } => {
 							// Don't generate any warnings for unused variables
 							let _ = ( $( $param_name ),* );
 							stringify!($fn_name)
@@ -2186,8 +2197,8 @@ macro_rules! decl_module {
 			fn clone(&self) -> Self {
 				match *self {
 					$(
-						$call_type::$fn_name( $( ref $param_name ),* ) =>
-							$call_type::$fn_name( $( (*$param_name).clone() ),* )
+						$call_type::$fn_name { $( ref $param_name ),* } =>
+							$call_type::$fn_name { $( $param_name: (*$param_name).clone() ),* }
 					,)*
 					_ => unreachable!(),
 				}
@@ -2200,9 +2211,9 @@ macro_rules! decl_module {
 			fn eq(&self, _other: &Self) -> bool {
 				match *self {
 					$(
-						$call_type::$fn_name( $( ref $param_name ),* ) => {
+						$call_type::$fn_name { $( ref $param_name ),* } => {
 							let self_params = ( $( $param_name, )* );
-							if let $call_type::$fn_name( $( ref $param_name ),* ) = *_other {
+							if let $call_type::$fn_name { $( ref $param_name ),* } = *_other {
 								self_params == ( $( $param_name, )* )
 							} else {
 								match *_other {
@@ -2230,7 +2241,7 @@ macro_rules! decl_module {
 			) -> $crate::dispatch::result::Result<(), $crate::dispatch::fmt::Error> {
 				match *self {
 					$(
-						$call_type::$fn_name( $( ref $param_name ),* ) =>
+						$call_type::$fn_name { $( ref $param_name ),* } =>
 							write!(_f, "{}{:?}",
 								stringify!($fn_name),
 								( $( $param_name.clone(), )* )
@@ -2248,7 +2259,7 @@ macro_rules! decl_module {
 			fn dispatch_bypass_filter(self, _origin: Self::Origin) -> $crate::dispatch::DispatchResultWithPostInfo {
 				match self {
 					$(
-						$call_type::$fn_name( $( $param_name ),* ) => {
+						$call_type::$fn_name { $( $param_name ),* } => {
 							$crate::decl_module!(
 								@call
 								$from
@@ -2277,20 +2288,17 @@ macro_rules! decl_module {
 				)*
 			}
 		}
+		$crate::__impl_error_metadata! {
+			$mod_type<$trait_instance: $trait_name $(<I>, $instance: $instantiable)?>
+			{ $( $other_where_bounds )* }
+			$( $error_type )*
+		}
 		$crate::__impl_module_constants_metadata ! {
 			$mod_type<$trait_instance: $trait_name $(<I>, $instance: $instantiable)?>
 			{ $( $other_where_bounds )* }
 			$( $constants )*
 		}
 
-		impl<$trait_instance: $trait_name $(<I>, $instance: $instantiable)?> $crate::dispatch::ModuleErrorMetadata
-			for $mod_type<$trait_instance $(, $instance)?> where $( $other_where_bounds )*
-		{
-			fn metadata() -> &'static [$crate::dispatch::ErrorMetadata] {
-				<$error_type as $crate::dispatch::ModuleErrorMetadata>::metadata()
-			}
-		}
-
 		$crate::__generate_dummy_part_checker!();
 	}
 }
@@ -2302,6 +2310,7 @@ macro_rules! __dispatch_impl_metadata {
 	(
 		$mod_type:ident<$trait_instance:ident: $trait_name:ident$(<I>, $instance:ident: $instantiable:path)?>
 		{ $( $other_where_bounds:tt )* }
+		$call_type:ident
 		$($rest:tt)*
 	) => {
 		impl<$trait_instance: $trait_name $(<I>, $instance: $instantiable)?> $mod_type<$trait_instance $(, $instance)?>
@@ -2309,13 +2318,51 @@ macro_rules! __dispatch_impl_metadata {
 		{
 			#[doc(hidden)]
 			#[allow(dead_code)]
-			pub fn call_functions() -> &'static [$crate::dispatch::FunctionMetadata] {
-				$crate::__call_to_functions!($($rest)*)
+			pub fn call_functions() -> $crate::metadata::PalletCallMetadata {
+				$crate::scale_info::meta_type::<$call_type<$trait_instance $(, $instance)?>>().into()
 			}
 		}
 	}
 }
 
+/// Implement metadata for pallet error.
+#[macro_export]
+#[doc(hidden)]
+macro_rules! __impl_error_metadata {
+	(
+		$mod_type:ident<$trait_instance:ident: $trait_name:ident$(<I>, $instance:ident: $instantiable:path)?>
+		{ $( $other_where_bounds:tt )* }
+		__NO_ERROR_DEFINED
+	) => {
+		impl<$trait_instance: $trait_name $(<I>, $instance: $instantiable)?> $mod_type<$trait_instance $(, $instance)?>
+			where $( $other_where_bounds )*
+		{
+			#[doc(hidden)]
+			#[allow(dead_code)]
+			pub fn error_metadata() -> Option<$crate::metadata::PalletErrorMetadata> {
+				None
+			}
+		}
+	};
+	(
+		$mod_type:ident<$trait_instance:ident: $trait_name:ident$(<I>, $instance:ident: $instantiable:path)?>
+		{ $( $other_where_bounds:tt )* }
+		$( $error_type:tt )*
+	) => {
+		impl<$trait_instance: $trait_name $(<I>, $instance: $instantiable)?> $mod_type<$trait_instance $(, $instance)?>
+			where $( $other_where_bounds )*
+		{
+			#[doc(hidden)]
+			#[allow(dead_code)]
+			pub fn error_metadata() -> Option<$crate::metadata::PalletErrorMetadata> {
+				Some($crate::metadata::PalletErrorMetadata {
+					ty: $crate::scale_info::meta_type::<$( $error_type )*>()
+				})
+			}
+		}
+	};
+}
+
 /// Implement metadata for module constants.
 #[macro_export]
 #[doc(hidden)]
@@ -2383,7 +2430,7 @@ macro_rules! __impl_module_constants_metadata {
 		{
 			#[doc(hidden)]
 			#[allow(dead_code)]
-			pub fn module_constants_metadata() -> &'static [$crate::dispatch::ModuleConstantMetadata] {
+			pub fn pallet_constants_metadata() -> $crate::sp_std::vec::Vec<$crate::metadata::PalletConstantMetadata> {
 				// Create the `ByteGetter`s
 				$(
 					#[allow(non_upper_case_types)]
@@ -2397,40 +2444,23 @@ macro_rules! __impl_module_constants_metadata {
 					>);
 					impl<$const_trait_instance: 'static + $const_trait_name $(
 						<I>, $const_instance: $const_instantiable)?
-					> $crate::dispatch::DefaultByte
-						for $default_byte_name <$const_trait_instance $(, $const_instance)?>
+					> $default_byte_name <$const_trait_instance $(, $const_instance)?>
 					{
 						fn default_byte(&self) -> $crate::dispatch::Vec<u8> {
 							let value: $type = $value;
 							$crate::dispatch::Encode::encode(&value)
 						}
 					}
-
-					unsafe impl<$const_trait_instance: 'static + $const_trait_name $(
-						<I>, $const_instance: $const_instantiable)?
-					> Send for $default_byte_name <$const_trait_instance $(, $const_instance)?> {}
-
-					unsafe impl<$const_trait_instance: 'static + $const_trait_name $(
-						<I>, $const_instance: $const_instantiable)?
-					> Sync for $default_byte_name <$const_trait_instance $(, $const_instance)?> {}
 				)*
-				&[
+				$crate::sp_std::vec![
 					$(
-						$crate::dispatch::ModuleConstantMetadata {
-							name: $crate::dispatch::DecodeDifferent::Encode(stringify!($name)),
-							ty: $crate::dispatch::DecodeDifferent::Encode(stringify!($type)),
-							value: $crate::dispatch::DecodeDifferent::Encode(
-								$crate::dispatch::DefaultByteGetter(
-									&$default_byte_name::<
-										$const_trait_instance $(, $const_instance)?
-									>(
-										$crate::dispatch::marker::PhantomData
-									)
-								)
-							),
-							documentation: $crate::dispatch::DecodeDifferent::Encode(
-								&[ $( $doc_attr ),* ]
-							),
+						$crate::metadata::PalletConstantMetadata {
+							name: stringify!($name),
+							ty: $crate::scale_info::meta_type::<$type>(),
+							value: $default_byte_name::<$const_trait_instance $(, $const_instance)?>(
+								Default::default()
+							).default_byte(),
+							docs: $crate::sp_std::vec![ $( $doc_attr ),* ],
 						}
 					),*
 				]
@@ -2439,106 +2469,6 @@ macro_rules! __impl_module_constants_metadata {
 	}
 }
 
-/// Convert the list of calls into their JSON representation, joined by ",".
-#[macro_export]
-#[doc(hidden)]
-macro_rules! __call_to_functions {
-	(
-		$call_type:ident $origin_type:ty
-		{
-			$(
-				$(#[doc = $doc_attr:tt])*
-				fn $fn_name:ident($from:ident
-					$(
-						, $(#[$codec_attr:ident])* $param_name:ident : $param:ty
-					)*
-				);
-			)*
-		}
-	) => {
-		$crate::__functions_to_metadata!(0; $origin_type;; $(
-			fn $fn_name( $($(#[$codec_attr])* $param_name: $param ),* );
-			$( $doc_attr ),*;
-		)*)
-	};
-}
-
-/// Convert a list of functions into a list of `FunctionMetadata` items.
-#[macro_export]
-#[doc(hidden)]
-macro_rules! __functions_to_metadata{
-	(
-		$fn_id:expr;
-		$origin_type:ty;
-		$( $function_metadata:expr ),*;
-		fn $fn_name:ident(
-			$(
-				$(#[$codec_attr:ident])* $param_name:ident : $param:ty
-			),*
-		);
-		$( $fn_doc:expr ),*;
-		$( $rest:tt )*
-	) => {
-		$crate::__functions_to_metadata!(
-			$fn_id + 1; $origin_type;
-			$( $function_metadata, )* $crate::__function_to_metadata!(
-				fn $fn_name($( $(#[$codec_attr])* $param_name : $param ),*); $( $fn_doc ),*; $fn_id;
-			);
-			$($rest)*
-		)
-	};
-	(
-		$fn_id:expr;
-		$origin_type:ty;
-		$( $function_metadata:expr ),*;
-	) => {
-		&[ $( $function_metadata ),* ]
-	}
-}
-
-/// Convert a function into its metadata representation.
-#[macro_export]
-#[doc(hidden)]
-macro_rules! __function_to_metadata {
-	(
-		fn $fn_name:ident(
-			$( $(#[$codec_attr:ident])* $param_name:ident : $param:ty),*
-		);
-		$( $fn_doc:expr ),*;
-		$fn_id:expr;
-	) => {
-		$crate::dispatch::FunctionMetadata {
-			name: $crate::dispatch::DecodeDifferent::Encode(stringify!($fn_name)),
-			arguments: $crate::dispatch::DecodeDifferent::Encode(&[
-				$(
-					$crate::dispatch::FunctionArgumentMetadata {
-						name: $crate::dispatch::DecodeDifferent::Encode(stringify!($param_name)),
-						ty: $crate::dispatch::DecodeDifferent::Encode(
-							$crate::__function_to_metadata!(@stringify_expand_attr
-								$(#[$codec_attr])* $param_name: $param
-							)
-						),
-					}
-				),*
-			]),
-			documentation: $crate::dispatch::DecodeDifferent::Encode(&[ $( $fn_doc ),* ]),
-		}
-	};
-
-	(@stringify_expand_attr #[compact] $param_name:ident : $param:ty) => {
-		concat!("Compact<", stringify!($param), ">")
-	};
-
-	(@stringify_expand_attr $param_name:ident : $param:ty) => { stringify!($param) };
-
-	(@stringify_expand_attr $(#[codec_attr:ident])* $param_name:ident : $param:ty) => {
-		compile_error!(concat!(
-			"Invalid attribute for parameter `", stringify!($param_name),
-			"`, the following attributes are supported: `#[compact]`"
-		));
-	}
-}
-
 #[macro_export]
 #[doc(hidden)]
 macro_rules! __check_reserved_fn_name {
@@ -2597,6 +2527,7 @@ macro_rules! __check_reserved_fn_name {
 mod tests {
 	use super::*;
 	use crate::{
+		metadata::*,
 		traits::{
 			Get, GetCallName, IntegrityTest, OnFinalize, OnIdle, OnInitialize, OnRuntimeUpgrade,
 			PalletInfo,
@@ -2623,7 +2554,7 @@ mod tests {
 			type DbWeight: Get<RuntimeDbWeight>;
 		}
 
-		#[derive(Clone, PartialEq, Eq, Debug, Encode, Decode)]
+		#[derive(Clone, PartialEq, Eq, Debug, Encode, Decode, scale_info::TypeInfo)]
 		pub enum RawOrigin<AccountId> {
 			Root,
 			Signed(AccountId),
@@ -2679,68 +2610,7 @@ mod tests {
 		}
 	}
 
-	const EXPECTED_METADATA: &'static [FunctionMetadata] = &[
-		FunctionMetadata {
-			name: DecodeDifferent::Encode("aux_0"),
-			arguments: DecodeDifferent::Encode(&[]),
-			documentation: DecodeDifferent::Encode(&[" Hi, this is a comment."]),
-		},
-		FunctionMetadata {
-			name: DecodeDifferent::Encode("aux_1"),
-			arguments: DecodeDifferent::Encode(&[FunctionArgumentMetadata {
-				name: DecodeDifferent::Encode("_data"),
-				ty: DecodeDifferent::Encode("Compact<u32>"),
-			}]),
-			documentation: DecodeDifferent::Encode(&[]),
-		},
-		FunctionMetadata {
-			name: DecodeDifferent::Encode("aux_2"),
-			arguments: DecodeDifferent::Encode(&[
-				FunctionArgumentMetadata {
-					name: DecodeDifferent::Encode("_data"),
-					ty: DecodeDifferent::Encode("i32"),
-				},
-				FunctionArgumentMetadata {
-					name: DecodeDifferent::Encode("_data2"),
-					ty: DecodeDifferent::Encode("String"),
-				},
-			]),
-			documentation: DecodeDifferent::Encode(&[]),
-		},
-		FunctionMetadata {
-			name: DecodeDifferent::Encode("aux_3"),
-			arguments: DecodeDifferent::Encode(&[]),
-			documentation: DecodeDifferent::Encode(&[]),
-		},
-		FunctionMetadata {
-			name: DecodeDifferent::Encode("aux_4"),
-			arguments: DecodeDifferent::Encode(&[FunctionArgumentMetadata {
-				name: DecodeDifferent::Encode("_data"),
-				ty: DecodeDifferent::Encode("i32"),
-			}]),
-			documentation: DecodeDifferent::Encode(&[]),
-		},
-		FunctionMetadata {
-			name: DecodeDifferent::Encode("aux_5"),
-			arguments: DecodeDifferent::Encode(&[
-				FunctionArgumentMetadata {
-					name: DecodeDifferent::Encode("_data"),
-					ty: DecodeDifferent::Encode("i32"),
-				},
-				FunctionArgumentMetadata {
-					name: DecodeDifferent::Encode("_data2"),
-					ty: DecodeDifferent::Encode("Compact<u32>"),
-				},
-			]),
-			documentation: DecodeDifferent::Encode(&[]),
-		},
-		FunctionMetadata {
-			name: DecodeDifferent::Encode("operational"),
-			arguments: DecodeDifferent::Encode(&[]),
-			documentation: DecodeDifferent::Encode(&[]),
-		},
-	];
-
+	#[derive(scale_info::TypeInfo)]
 	pub struct TraitImpl {}
 	impl Config for TraitImpl {}
 
@@ -2823,17 +2693,19 @@ mod tests {
 	#[test]
 	fn module_json_metadata() {
 		let metadata = Module::<TraitImpl>::call_functions();
-		assert_eq!(EXPECTED_METADATA, metadata);
+		let expected_metadata =
+			PalletCallMetadata { ty: scale_info::meta_type::<Call<TraitImpl>>() };
+		assert_eq!(expected_metadata, metadata);
 	}
 
 	#[test]
 	fn compact_attr() {
-		let call: Call<TraitImpl> = Call::aux_1(1);
+		let call: Call<TraitImpl> = Call::aux_1 { _data: 1 };
 		let encoded = call.encode();
 		assert_eq!(2, encoded.len());
 		assert_eq!(vec![1, 4], encoded);
 
-		let call: Call<TraitImpl> = Call::aux_5(1, 2);
+		let call: Call<TraitImpl> = Call::aux_5 { _data: 1, _data2: 2 };
 		let encoded = call.encode();
 		assert_eq!(6, encoded.len());
 		assert_eq!(vec![5, 1, 0, 0, 0, 8], encoded);
@@ -2841,13 +2713,13 @@ mod tests {
 
 	#[test]
 	fn encode_is_correct_and_decode_works() {
-		let call: Call<TraitImpl> = Call::aux_0();
+		let call: Call<TraitImpl> = Call::aux_0 {};
 		let encoded = call.encode();
 		assert_eq!(vec![0], encoded);
 		let decoded = Call::<TraitImpl>::decode(&mut &encoded[..]).unwrap();
 		assert_eq!(decoded, call);
 
-		let call: Call<TraitImpl> = Call::aux_2(32, "hello".into());
+		let call: Call<TraitImpl> = Call::aux_2 { _data: 32, _data2: "hello".into() };
 		let encoded = call.encode();
 		assert_eq!(vec![2, 32, 0, 0, 0, 20, 104, 101, 108, 108, 111], encoded);
 		let decoded = Call::<TraitImpl>::decode(&mut &encoded[..]).unwrap();
@@ -2899,19 +2771,19 @@ mod tests {
 	fn weight_should_attach_to_call_enum() {
 		// operational.
 		assert_eq!(
-			Call::<TraitImpl>::operational().get_dispatch_info(),
+			Call::<TraitImpl>::operational {}.get_dispatch_info(),
 			DispatchInfo { weight: 5, class: DispatchClass::Operational, pays_fee: Pays::Yes },
 		);
 		// custom basic
 		assert_eq!(
-			Call::<TraitImpl>::aux_3().get_dispatch_info(),
+			Call::<TraitImpl>::aux_3 {}.get_dispatch_info(),
 			DispatchInfo { weight: 3, class: DispatchClass::Normal, pays_fee: Pays::Yes },
 		);
 	}
 
 	#[test]
 	fn call_name() {
-		let name = Call::<TraitImpl>::aux_3().get_call_name();
+		let name = Call::<TraitImpl>::aux_3 {}.get_call_name();
 		assert_eq!("aux_3", name);
 	}
 
@@ -2929,4 +2801,9 @@ mod tests {
 	fn integrity_test_should_work() {
 		<Module<TraitImpl> as IntegrityTest>::integrity_test();
 	}
+
+	#[test]
+	fn test_new_call_variant() {
+		Call::<TraitImpl>::new_call_variant_aux_0();
+	}
 }
diff --git a/frame/support/src/error.rs b/frame/support/src/error.rs
index f0c6ba0f3b1c..836428c6bc7d 100644
--- a/frame/support/src/error.rs
+++ b/frame/support/src/error.rs
@@ -17,8 +17,6 @@
 
 //! Macro for declaring a module error.
 
-#[doc(hidden)]
-pub use frame_metadata::{DecodeDifferent, ErrorMetadata, ModuleErrorMetadata};
 #[doc(hidden)]
 pub use sp_runtime::traits::{BadOrigin, LookupError};
 
@@ -87,10 +85,13 @@ macro_rules! decl_error {
 		}
 	) => {
 		$(#[$attr])*
+		#[derive($crate::scale_info::TypeInfo)]
+		#[scale_info(skip_type_params($generic $(, $inst_generic)?), capture_docs = "always")]
 		pub enum $error<$generic: $trait $(, $inst_generic: $instance)?>
 		$( where $( $where_ty: $where_bound ),* )?
 		{
 			#[doc(hidden)]
+			#[codec(skip)]
 			__Ignore(
 				$crate::sp_std::marker::PhantomData<($generic, $( $inst_generic)?)>,
 				$crate::Never,
@@ -159,24 +160,6 @@ macro_rules! decl_error {
 				}
 			}
 		}
-
-		impl<$generic: $trait $(, $inst_generic: $instance)?> $crate::error::ModuleErrorMetadata
-			for $error<$generic $(, $inst_generic)?>
-		$( where $( $where_ty: $where_bound ),* )?
-		{
-			fn metadata() -> &'static [$crate::error::ErrorMetadata] {
-				&[
-					$(
-						$crate::error::ErrorMetadata {
-							name: $crate::error::DecodeDifferent::Encode(stringify!($name)),
-							documentation: $crate::error::DecodeDifferent::Encode(&[
-								$( $doc_attr ),*
-							]),
-						}
-					),*
-				]
-			}
-		}
 	};
 	(@GENERATE_AS_U8
 		$self:ident
diff --git a/frame/support/src/event.rs b/frame/support/src/event.rs
index 6e0d4ba6b47b..3d042a3122db 100644
--- a/frame/support/src/event.rs
+++ b/frame/support/src/event.rs
@@ -21,8 +21,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
-pub use frame_metadata::{DecodeDifferent, EventMetadata, FnEncode, OuterEventMetadata};
-
 /// Implement the `Event` for a module.
 ///
 /// # Simple Event Example:
@@ -129,8 +127,10 @@ macro_rules! decl_event {
 			Clone, PartialEq, Eq,
 			$crate::codec::Encode,
 			$crate::codec::Decode,
+			$crate::scale_info::TypeInfo,
 			$crate::RuntimeDebug,
 		)]
+		#[scale_info(capture_docs = "always")]
 		/// Events for this module.
 		///
 		$(#[$attr])*
@@ -142,13 +142,6 @@ macro_rules! decl_event {
 		impl From<Event> for () {
 			fn from(_: Event) -> () { () }
 		}
-		impl Event {
-			#[allow(dead_code)]
-			#[doc(hidden)]
-			pub fn metadata() -> &'static [ $crate::event::EventMetadata ] {
-				$crate::__events_to_metadata!(; $( $events )* )
-			}
-		}
 	}
 }
 
@@ -272,8 +265,10 @@ macro_rules! __decl_generic_event {
 			Clone, PartialEq, Eq,
 			$crate::codec::Encode,
 			$crate::codec::Decode,
+			$crate::scale_info::TypeInfo,
 			$crate::RuntimeDebug,
 		)]
+		#[scale_info(capture_docs = "always")]
 		/// Events for this module.
 		///
 		$(#[$attr])*
@@ -290,263 +285,8 @@ macro_rules! __decl_generic_event {
 		impl<$( $generic_param ),* $(, $instance)? > From<RawEvent<$( $generic_param ),* $(, $instance)?>> for () {
 			fn from(_: RawEvent<$( $generic_param ),* $(, $instance)?>) -> () { () }
 		}
-		impl<$( $generic_param ),* $(, $instance)?> RawEvent<$( $generic_param ),* $(, $instance)?> {
-			#[allow(dead_code)]
-			#[doc(hidden)]
-			pub fn metadata() -> &'static [$crate::event::EventMetadata] {
-				$crate::__events_to_metadata!(; $( $events )* )
-			}
-		}
 	};
 	(@cannot_parse $ty:ty) => {
 		compile_error!(concat!("The type `", stringify!($ty), "` can't be parsed as an unnamed one, please name it `Name = ", stringify!($ty), "`"));
 	}
 }
-
-#[macro_export]
-#[doc(hidden)]
-macro_rules! __events_to_metadata {
-	(
-		$( $metadata:expr ),*;
-		$( #[doc = $doc_attr:tt] )*
-		$event:ident $( ( $( $param:path ),* $(,)? ) )*,
-		$( $rest:tt )*
-	) => {
-		$crate::__events_to_metadata!(
-			$( $metadata, )*
-			$crate::event::EventMetadata {
-				name: $crate::event::DecodeDifferent::Encode(stringify!($event)),
-				arguments: $crate::event::DecodeDifferent::Encode(&[
-					$( $( stringify!($param) ),* )*
-				]),
-				documentation: $crate::event::DecodeDifferent::Encode(&[
-					$( $doc_attr ),*
-				]),
-			};
-			$( $rest )*
-		)
-	};
-	(
-		$( $metadata:expr ),*;
-	) => {
-		&[ $( $metadata ),* ]
-	}
-}
-
-#[cfg(test)]
-#[allow(dead_code)]
-mod tests {
-	use super::*;
-	use codec::{Decode, Encode};
-	use serde::Serialize;
-
-	mod system {
-		pub trait Config: 'static {
-			type Origin;
-			type BlockNumber;
-			type PalletInfo: crate::traits::PalletInfo;
-			type DbWeight: crate::traits::Get<crate::weights::RuntimeDbWeight>;
-		}
-
-		decl_module! {
-			pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {}
-		}
-
-		decl_event!(
-			pub enum Event {
-				SystemEvent,
-			}
-		);
-	}
-
-	mod system_renamed {
-		pub trait Config: 'static {
-			type Origin;
-			type BlockNumber;
-			type PalletInfo: crate::traits::PalletInfo;
-			type DbWeight: crate::traits::Get<crate::weights::RuntimeDbWeight>;
-		}
-
-		decl_module! {
-			pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {}
-		}
-
-		decl_event!(
-			pub enum Event {
-				SystemEvent,
-			}
-		);
-	}
-
-	mod event_module {
-		use super::system;
-
-		pub trait Config: system::Config {
-			type Balance;
-		}
-
-		decl_module! {
-			pub struct Module<T: Config> for enum Call where origin: T::Origin, system=system {}
-		}
-
-		decl_event!(
-			/// Event without renaming the generic parameter `Balance` and `Origin`.
-			pub enum Event<T> where <T as Config>::Balance, <T as system::Config>::Origin
-			{
-				/// Hi, I am a comment.
-				TestEvent(Balance, Origin),
-				/// Dog
-				EventWithoutParams,
-			}
-		);
-	}
-
-	mod event_module2 {
-		use super::system;
-
-		pub trait Config: system::Config {
-			type Balance;
-		}
-
-		decl_module! {
-			pub struct Module<T: Config> for enum Call where origin: T::Origin, system=system {}
-		}
-
-		decl_event!(
-			/// Event with renamed generic parameter
-			pub enum Event<T>
-			where
-				BalanceRenamed = <T as Config>::Balance,
-				OriginRenamed = <T as system::Config>::Origin,
-			{
-				TestEvent(BalanceRenamed),
-				TestOrigin(OriginRenamed),
-			}
-		);
-	}
-
-	mod event_module3 {
-		decl_event!(
-			pub enum Event {
-				HiEvent,
-			}
-		);
-	}
-
-	mod event_module4 {
-		use super::system;
-
-		pub trait Config: system::Config {
-			type Balance;
-		}
-
-		decl_module! {
-			pub struct Module<T: Config> for enum Call where origin: T::Origin, system=system {}
-		}
-
-		decl_event!(
-			/// Event finish formatting on an unnamed one with trailing comma
-			pub enum Event<T> where
-				<T as Config>::Balance,
-				<T as system::Config>::Origin,
-			{
-				TestEvent(Balance, Origin),
-			}
-		);
-	}
-
-	mod event_module5 {
-		use super::system;
-
-		pub trait Config: system::Config {
-			type Balance;
-		}
-
-		decl_module! {
-			pub struct Module<T: Config> for enum Call where origin: T::Origin, system=system {}
-		}
-
-		decl_event!(
-			/// Event finish formatting on an named one with trailing comma
-			pub enum Event<T>
-			where
-				BalanceRenamed = <T as Config>::Balance,
-				OriginRenamed = <T as system::Config>::Origin,
-			{
-				TestEvent(BalanceRenamed, OriginRenamed),
-				TrailingCommaInArgs(u32, u32),
-			}
-		);
-	}
-
-	#[derive(Debug, Clone, PartialEq, Eq, Encode, Decode, Serialize)]
-	pub struct TestRuntime;
-
-	#[derive(Debug, Clone, PartialEq, Eq, Encode, Decode, Serialize)]
-	pub struct TestRuntime2;
-
-	impl event_module::Config for TestRuntime {
-		type Balance = u32;
-	}
-
-	impl event_module2::Config for TestRuntime {
-		type Balance = u32;
-	}
-
-	impl system::Config for TestRuntime {
-		type Origin = u32;
-		type BlockNumber = u32;
-		type PalletInfo = crate::tests::PanicPalletInfo;
-		type DbWeight = ();
-	}
-
-	#[test]
-	fn event_metadata() {
-		assert_eq!(
-			system_renamed::Event::metadata(),
-			&[EventMetadata {
-				name: DecodeDifferent::Encode("SystemEvent"),
-				arguments: DecodeDifferent::Encode(&[]),
-				documentation: DecodeDifferent::Encode(&[]),
-			},]
-		);
-		assert_eq!(
-			event_module::Event::<TestRuntime>::metadata(),
-			&[
-				EventMetadata {
-					name: DecodeDifferent::Encode("TestEvent"),
-					arguments: DecodeDifferent::Encode(&["Balance", "Origin"]),
-					documentation: DecodeDifferent::Encode(&[" Hi, I am a comment."])
-				},
-				EventMetadata {
-					name: DecodeDifferent::Encode("EventWithoutParams"),
-					arguments: DecodeDifferent::Encode(&[]),
-					documentation: DecodeDifferent::Encode(&[" Dog"]),
-				},
-			]
-		);
-		assert_eq!(
-			event_module2::Event::<TestRuntime>::metadata(),
-			&[
-				EventMetadata {
-					name: DecodeDifferent::Encode("TestEvent"),
-					arguments: DecodeDifferent::Encode(&["BalanceRenamed"]),
-					documentation: DecodeDifferent::Encode(&[])
-				},
-				EventMetadata {
-					name: DecodeDifferent::Encode("TestOrigin"),
-					arguments: DecodeDifferent::Encode(&["OriginRenamed"]),
-					documentation: DecodeDifferent::Encode(&[]),
-				},
-			]
-		);
-		assert_eq!(
-			event_module3::Event::metadata(),
-			&[EventMetadata {
-				name: DecodeDifferent::Encode("HiEvent"),
-				arguments: DecodeDifferent::Encode(&[]),
-				documentation: DecodeDifferent::Encode(&[])
-			}],
-		);
-	}
-}
diff --git a/frame/support/src/hash.rs b/frame/support/src/hash.rs
index 4136bd518f4c..f943bcf32309 100644
--- a/frame/support/src/hash.rs
+++ b/frame/support/src/hash.rs
@@ -17,6 +17,7 @@
 
 //! Hash utilities.
 
+use crate::metadata;
 use codec::{Codec, MaxEncodedLen};
 use sp_io::hashing::{blake2_128, blake2_256, twox_128, twox_256, twox_64};
 use sp_std::prelude::Vec;
@@ -58,7 +59,7 @@ impl<T: Codec> Hashable for T {
 
 /// Hasher to use to hash keys to insert to storage.
 pub trait StorageHasher: 'static {
-	const METADATA: frame_metadata::StorageHasher;
+	const METADATA: metadata::StorageHasher;
 	type Output: AsRef<[u8]>;
 	fn hash(x: &[u8]) -> Self::Output;
 
@@ -79,7 +80,7 @@ pub trait ReversibleStorageHasher: StorageHasher {
 /// Store the key directly.
 pub struct Identity;
 impl StorageHasher for Identity {
-	const METADATA: frame_metadata::StorageHasher = frame_metadata::StorageHasher::Identity;
+	const METADATA: metadata::StorageHasher = metadata::StorageHasher::Identity;
 	type Output = Vec<u8>;
 	fn hash(x: &[u8]) -> Vec<u8> {
 		x.to_vec()
@@ -97,7 +98,7 @@ impl ReversibleStorageHasher for Identity {
 /// Hash storage keys with `concat(twox64(key), key)`
 pub struct Twox64Concat;
 impl StorageHasher for Twox64Concat {
-	const METADATA: frame_metadata::StorageHasher = frame_metadata::StorageHasher::Twox64Concat;
+	const METADATA: metadata::StorageHasher = metadata::StorageHasher::Twox64Concat;
 	type Output = Vec<u8>;
 	fn hash(x: &[u8]) -> Vec<u8> {
 		twox_64(x).iter().chain(x.into_iter()).cloned().collect::<Vec<_>>()
@@ -119,7 +120,7 @@ impl ReversibleStorageHasher for Twox64Concat {
 /// Hash storage keys with `concat(blake2_128(key), key)`
 pub struct Blake2_128Concat;
 impl StorageHasher for Blake2_128Concat {
-	const METADATA: frame_metadata::StorageHasher = frame_metadata::StorageHasher::Blake2_128Concat;
+	const METADATA: metadata::StorageHasher = metadata::StorageHasher::Blake2_128Concat;
 	type Output = Vec<u8>;
 	fn hash(x: &[u8]) -> Vec<u8> {
 		blake2_128(x).iter().chain(x.into_iter()).cloned().collect::<Vec<_>>()
@@ -141,7 +142,7 @@ impl ReversibleStorageHasher for Blake2_128Concat {
 /// Hash storage keys with blake2 128
 pub struct Blake2_128;
 impl StorageHasher for Blake2_128 {
-	const METADATA: frame_metadata::StorageHasher = frame_metadata::StorageHasher::Blake2_128;
+	const METADATA: metadata::StorageHasher = metadata::StorageHasher::Blake2_128;
 	type Output = [u8; 16];
 	fn hash(x: &[u8]) -> [u8; 16] {
 		blake2_128(x)
@@ -154,7 +155,7 @@ impl StorageHasher for Blake2_128 {
 /// Hash storage keys with blake2 256
 pub struct Blake2_256;
 impl StorageHasher for Blake2_256 {
-	const METADATA: frame_metadata::StorageHasher = frame_metadata::StorageHasher::Blake2_256;
+	const METADATA: metadata::StorageHasher = metadata::StorageHasher::Blake2_256;
 	type Output = [u8; 32];
 	fn hash(x: &[u8]) -> [u8; 32] {
 		blake2_256(x)
@@ -167,7 +168,7 @@ impl StorageHasher for Blake2_256 {
 /// Hash storage keys with twox 128
 pub struct Twox128;
 impl StorageHasher for Twox128 {
-	const METADATA: frame_metadata::StorageHasher = frame_metadata::StorageHasher::Twox128;
+	const METADATA: metadata::StorageHasher = metadata::StorageHasher::Twox128;
 	type Output = [u8; 16];
 	fn hash(x: &[u8]) -> [u8; 16] {
 		twox_128(x)
@@ -180,7 +181,7 @@ impl StorageHasher for Twox128 {
 /// Hash storage keys with twox 256
 pub struct Twox256;
 impl StorageHasher for Twox256 {
-	const METADATA: frame_metadata::StorageHasher = frame_metadata::StorageHasher::Twox256;
+	const METADATA: metadata::StorageHasher = metadata::StorageHasher::Twox256;
 	type Output = [u8; 32];
 	fn hash(x: &[u8]) -> [u8; 32] {
 		twox_256(x)
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 9dee6da89b25..cce03f1e8ce6 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -36,6 +36,8 @@ pub use log;
 pub use once_cell;
 #[doc(hidden)]
 pub use paste;
+#[doc(hidden)]
+pub use scale_info;
 #[cfg(feature = "std")]
 pub use serde;
 pub use sp_core::Void;
@@ -90,17 +92,18 @@ pub use self::{
 pub use sp_runtime::{self, print, traits::Printable, ConsensusEngineId};
 
 use codec::{Decode, Encode};
+use scale_info::TypeInfo;
 use sp_runtime::TypeId;
 
 /// A unified log target for support operations.
 pub const LOG_TARGET: &'static str = "runtime::frame-support";
 
 /// A type that cannot be instantiated.
-#[derive(Debug, PartialEq, Eq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone, TypeInfo)]
 pub enum Never {}
 
 /// A pallet identifier. These are per pallet and should be stored in a registry somewhere.
-#[derive(Clone, Copy, Eq, PartialEq, Encode, Decode)]
+#[derive(Clone, Copy, Eq, PartialEq, Encode, Decode, TypeInfo)]
 pub struct PalletId(pub [u8; 8]);
 
 impl TypeId for PalletId {
@@ -811,13 +814,13 @@ pub use serde::{Deserialize, Serialize};
 #[cfg(test)]
 pub mod tests {
 	use super::*;
-	use codec::{Codec, EncodeLike};
-	use frame_metadata::{
-		DecodeDifferent, DefaultByteGetter, StorageEntryMetadata, StorageEntryModifier,
-		StorageEntryType, StorageHasher, StorageMetadata,
+	use crate::metadata::{
+		PalletStorageMetadata, StorageEntryMetadata, StorageEntryModifier, StorageEntryType,
+		StorageHasher,
 	};
+	use codec::{Codec, EncodeLike};
 	use sp_io::TestExternalities;
-	use sp_std::{marker::PhantomData, result};
+	use sp_std::result;
 
 	/// A PalletInfo implementation which just panics.
 	pub struct PanicPalletInfo;
@@ -832,7 +835,7 @@ pub mod tests {
 	}
 
 	pub trait Config: 'static {
-		type BlockNumber: Codec + EncodeLike + Default;
+		type BlockNumber: Codec + EncodeLike + Default + TypeInfo;
 		type Origin;
 		type PalletInfo: crate::traits::PalletInfo;
 		type DbWeight: crate::traits::Get<crate::weights::RuntimeDbWeight>;
@@ -1150,132 +1153,109 @@ pub mod tests {
 		});
 	}
 
-	const EXPECTED_METADATA: StorageMetadata = StorageMetadata {
-		prefix: DecodeDifferent::Encode("Test"),
-		entries: DecodeDifferent::Encode(&[
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("Data"),
-				modifier: StorageEntryModifier::Default,
-				ty: StorageEntryType::Map {
-					hasher: StorageHasher::Twox64Concat,
-					key: DecodeDifferent::Encode("u32"),
-					value: DecodeDifferent::Encode("u64"),
-					unused: false,
+	fn expected_metadata() -> PalletStorageMetadata {
+		PalletStorageMetadata {
+			prefix: "Test",
+			entries: vec![
+				StorageEntryMetadata {
+					name: "Data",
+					modifier: StorageEntryModifier::Default,
+					ty: StorageEntryType::Map {
+						hashers: vec![StorageHasher::Twox64Concat],
+						key: scale_info::meta_type::<u32>(),
+						value: scale_info::meta_type::<u64>(),
+					},
+					default: vec![0, 0, 0, 0, 0, 0, 0, 0],
+					docs: vec![],
 				},
-				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructData(
-					PhantomData::<Test>,
-				))),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("OptionLinkedMap"),
-				modifier: StorageEntryModifier::Optional,
-				ty: StorageEntryType::Map {
-					hasher: StorageHasher::Blake2_128Concat,
-					key: DecodeDifferent::Encode("u32"),
-					value: DecodeDifferent::Encode("u32"),
-					unused: false,
+				StorageEntryMetadata {
+					name: "OptionLinkedMap",
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::Map {
+						hashers: vec![StorageHasher::Blake2_128Concat],
+						key: scale_info::meta_type::<u32>(),
+						value: scale_info::meta_type::<u32>(),
+					},
+					default: vec![0],
+					docs: vec![],
 				},
-				default: DecodeDifferent::Encode(DefaultByteGetter(
-					&__GetByteStructOptionLinkedMap(PhantomData::<Test>),
-				)),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("GenericData"),
-				modifier: StorageEntryModifier::Default,
-				ty: StorageEntryType::Map {
-					hasher: StorageHasher::Identity,
-					key: DecodeDifferent::Encode("T::BlockNumber"),
-					value: DecodeDifferent::Encode("T::BlockNumber"),
-					unused: false,
+				StorageEntryMetadata {
+					name: "GenericData",
+					modifier: StorageEntryModifier::Default,
+					ty: StorageEntryType::Map {
+						hashers: vec![StorageHasher::Identity],
+						key: scale_info::meta_type::<u32>(),
+						value: scale_info::meta_type::<u32>(),
+					},
+					default: vec![0, 0, 0, 0],
+					docs: vec![],
 				},
-				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructGenericData(
-					PhantomData::<Test>,
-				))),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("GenericData2"),
-				modifier: StorageEntryModifier::Optional,
-				ty: StorageEntryType::Map {
-					hasher: StorageHasher::Blake2_128Concat,
-					key: DecodeDifferent::Encode("T::BlockNumber"),
-					value: DecodeDifferent::Encode("T::BlockNumber"),
-					unused: false,
+				StorageEntryMetadata {
+					name: "GenericData2",
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::Map {
+						hashers: vec![StorageHasher::Blake2_128Concat],
+						key: scale_info::meta_type::<u32>(),
+						value: scale_info::meta_type::<u32>(),
+					},
+					default: vec![0],
+					docs: vec![],
 				},
-				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructGenericData2(
-					PhantomData::<Test>,
-				))),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("DataDM"),
-				modifier: StorageEntryModifier::Default,
-				ty: StorageEntryType::DoubleMap {
-					hasher: StorageHasher::Twox64Concat,
-					key1: DecodeDifferent::Encode("u32"),
-					key2: DecodeDifferent::Encode("u32"),
-					value: DecodeDifferent::Encode("u64"),
-					key2_hasher: StorageHasher::Blake2_128Concat,
+				StorageEntryMetadata {
+					name: "DataDM",
+					modifier: StorageEntryModifier::Default,
+					ty: StorageEntryType::Map {
+						hashers: vec![StorageHasher::Twox64Concat, StorageHasher::Blake2_128Concat],
+						key: scale_info::meta_type::<(u32, u32)>(),
+						value: scale_info::meta_type::<u64>(),
+					},
+					default: vec![0, 0, 0, 0, 0, 0, 0, 0],
+					docs: vec![],
 				},
-				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructDataDM(
-					PhantomData::<Test>,
-				))),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("GenericDataDM"),
-				modifier: StorageEntryModifier::Default,
-				ty: StorageEntryType::DoubleMap {
-					hasher: StorageHasher::Blake2_128Concat,
-					key1: DecodeDifferent::Encode("T::BlockNumber"),
-					key2: DecodeDifferent::Encode("T::BlockNumber"),
-					value: DecodeDifferent::Encode("T::BlockNumber"),
-					key2_hasher: StorageHasher::Identity,
+				StorageEntryMetadata {
+					name: "GenericDataDM",
+					modifier: StorageEntryModifier::Default,
+					ty: StorageEntryType::Map {
+						hashers: vec![StorageHasher::Blake2_128Concat, StorageHasher::Identity],
+						key: scale_info::meta_type::<(u32, u32)>(),
+						value: scale_info::meta_type::<u32>(),
+					},
+					default: vec![0, 0, 0, 0],
+					docs: vec![],
 				},
-				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructGenericDataDM(
-					PhantomData::<Test>,
-				))),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("GenericData2DM"),
-				modifier: StorageEntryModifier::Optional,
-				ty: StorageEntryType::DoubleMap {
-					hasher: StorageHasher::Blake2_128Concat,
-					key1: DecodeDifferent::Encode("T::BlockNumber"),
-					key2: DecodeDifferent::Encode("T::BlockNumber"),
-					value: DecodeDifferent::Encode("T::BlockNumber"),
-					key2_hasher: StorageHasher::Twox64Concat,
+				StorageEntryMetadata {
+					name: "GenericData2DM",
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::Map {
+						hashers: vec![StorageHasher::Blake2_128Concat, StorageHasher::Twox64Concat],
+						key: scale_info::meta_type::<(u32, u32)>(),
+						value: scale_info::meta_type::<u32>(),
+					},
+					default: vec![0],
+					docs: vec![],
 				},
-				default: DecodeDifferent::Encode(DefaultByteGetter(
-					&__GetByteStructGenericData2DM(PhantomData::<Test>),
-				)),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("AppendableDM"),
-				modifier: StorageEntryModifier::Default,
-				ty: StorageEntryType::DoubleMap {
-					hasher: StorageHasher::Blake2_128Concat,
-					key1: DecodeDifferent::Encode("u32"),
-					key2: DecodeDifferent::Encode("T::BlockNumber"),
-					value: DecodeDifferent::Encode("Vec<u32>"),
-					key2_hasher: StorageHasher::Blake2_128Concat,
+				StorageEntryMetadata {
+					name: "AppendableDM",
+					modifier: StorageEntryModifier::Default,
+					ty: StorageEntryType::Map {
+						hashers: vec![
+							StorageHasher::Blake2_128Concat,
+							StorageHasher::Blake2_128Concat,
+						],
+						key: scale_info::meta_type::<(u32, u32)>(),
+						value: scale_info::meta_type::<Vec<u32>>(),
+					},
+					default: vec![0],
+					docs: vec![],
 				},
-				default: DecodeDifferent::Encode(DefaultByteGetter(
-					&__GetByteStructGenericData2DM(PhantomData::<Test>),
-				)),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-		]),
-	};
+			],
+		}
+	}
 
 	#[test]
 	fn store_metadata() {
 		let metadata = Module::<Test>::storage_metadata();
-		pretty_assertions::assert_eq!(EXPECTED_METADATA, metadata);
+		pretty_assertions::assert_eq!(expected_metadata(), metadata);
 	}
 
 	parameter_types! {
@@ -1470,7 +1450,7 @@ pub mod pallet_prelude {
 /// It implements on pallet:
 /// * [`traits::GetStorageVersion`]
 /// * [`traits::OnGenesis`]: contains some logic to write pallet version into storage.
-/// * `ModuleErrorMetadata`: using error declared or no metadata.
+/// * `PalletErrorTypeInfo`: provides the type information for the pallet error, if defined.
 ///
 /// It declare `type Module` type alias for `Pallet`, used by [`construct_runtime`].
 ///
@@ -1623,9 +1603,6 @@ pub mod pallet_prelude {
 /// The macro implements `From<Error<T>>` for `&'static str`.
 /// The macro implements `From<Error<T>>` for `DispatchError`.
 ///
-/// The macro implements `ModuleErrorMetadata` on `Pallet` defining the `ErrorMetadata` of the
-/// pallet.
-///
 /// # Event: `#[pallet::event]` optional
 ///
 /// Allow to define pallet events, pallet events are stored in the block when they deposited
@@ -1634,7 +1611,6 @@ pub mod pallet_prelude {
 /// Item is defined as:
 /// ```ignore
 /// #[pallet::event]
-/// #[pallet::metadata($SomeType = "$Metadata", $SomeOtherType = "$Metadata", ..)] // Optional
 /// #[pallet::generate_deposit($visibility fn deposit_event)] // Optional
 /// pub enum Event<$some_generic> $optional_where_clause {
 /// 	/// Some doc
@@ -1649,24 +1625,6 @@ pub mod pallet_prelude {
 /// std only).
 /// For ease of use, bound the trait `Member` available in frame_support::pallet_prelude.
 ///
-/// Variant documentations and field types are put into metadata.
-/// The attribute `#[pallet::metadata(..)]` allows to specify the metadata to put for some
-/// types.
-///
-/// The metadata of a type is defined by:
-/// * if matching a type in `#[pallet::metadata(..)]`, then the corresponding metadata.
-/// * otherwise the type stringified.
-///
-/// E.g.:
-/// ```ignore
-/// #[pallet::event]
-/// #[pallet::metadata(u32 = "SpecialU32")]
-/// pub enum Event<T: Config> {
-/// 	Proposed(u32, T::AccountId),
-/// }
-/// ```
-/// will write in event variant metadata `"SpecialU32"` and `"T::AccountId"`.
-///
 /// The attribute `#[pallet::generate_deposit($visibility fn deposit_event)]` generate a helper
 /// function on `Pallet` to deposit event.
 ///
@@ -2027,8 +1985,6 @@ pub mod pallet_prelude {
 /// 	//
 /// 	// The macro generates event metadata, and derive Clone, Debug, Eq, PartialEq and Codec
 /// 	#[pallet::event]
-/// 	// Additional argument to specify the metadata to use for given type.
-/// 	#[pallet::metadata(BalanceOf<T> = "Balance", u32 = "Other")]
 /// 	// Generate a funciton on Pallet to deposit an event.
 /// 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
 /// 	pub enum Event<T: Config> {
@@ -2192,7 +2148,6 @@ pub mod pallet_prelude {
 /// 	}
 ///
 /// 	#[pallet::event]
-/// 	#[pallet::metadata(BalanceOf<T> = "Balance", u32 = "Other")]
 /// 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
 /// 	pub enum Event<T: Config<I>, I: 'static = ()> {
 /// 		/// doc comment put in metadata
@@ -2342,8 +2297,7 @@ pub mod pallet_prelude {
 /// 7. **migrate event**:
 /// 	rewrite as a simple enum under with the attribute `#[pallet::event]`,
 /// 	use `#[pallet::generate_deposit($vis fn deposit_event)]` to generate deposit_event,
-/// 	use `#[pallet::metadata(...)]` to configure the metadata for types in order not to break
-/// them. 8. **migrate error**: rewrite it with attribute `#[pallet::error]`.
+/// 8. **migrate error**: rewrite it with attribute `#[pallet::error]`.
 /// 9. **migrate storage**:
 /// 	decl_storage provide an upgrade template (see 3.). All storages, genesis config, genesis
 /// 	build and default implementation of genesis config can be taken from it directly.
diff --git a/frame/support/src/storage/bounded_btree_map.rs b/frame/support/src/storage/bounded_btree_map.rs
index 737c8953d29e..d0c0aa7c4f15 100644
--- a/frame/support/src/storage/bounded_btree_map.rs
+++ b/frame/support/src/storage/bounded_btree_map.rs
@@ -31,7 +31,8 @@ use sp_std::{
 ///
 /// Unlike a standard `BTreeMap`, there is an enforced upper limit to the number of items in the
 /// map. All internal operations ensure this bound is respected.
-#[derive(Encode)]
+#[derive(Encode, scale_info::TypeInfo)]
+#[scale_info(skip_type_params(S))]
 pub struct BoundedBTreeMap<K, V, S>(BTreeMap<K, V>, PhantomData<S>);
 
 impl<K, V, S> Decode for BoundedBTreeMap<K, V, S>
diff --git a/frame/support/src/storage/bounded_vec.rs b/frame/support/src/storage/bounded_vec.rs
index 0f56511e6edd..b45c294f8d4a 100644
--- a/frame/support/src/storage/bounded_vec.rs
+++ b/frame/support/src/storage/bounded_vec.rs
@@ -37,7 +37,8 @@ use sp_std::{convert::TryFrom, fmt, marker::PhantomData, prelude::*};
 ///
 /// As the name suggests, the length of the queue is always bounded. All internal operations ensure
 /// this bound is respected.
-#[derive(Encode)]
+#[derive(Encode, scale_info::TypeInfo)]
+#[scale_info(skip_type_params(S))]
 pub struct BoundedVec<T, S>(Vec<T>, PhantomData<S>);
 
 /// A bounded slice.
diff --git a/frame/support/src/storage/mod.rs b/frame/support/src/storage/mod.rs
index 8cee9faf6e81..e57a876bf983 100644
--- a/frame/support/src/storage/mod.rs
+++ b/frame/support/src/storage/mod.rs
@@ -17,6 +17,7 @@
 
 //! Stuff to do with the runtime's storage.
 
+pub use self::types::StorageEntryMetadata;
 use crate::{
 	hash::{ReversibleStorageHasher, StorageHasher},
 	storage::types::{
diff --git a/frame/support/src/storage/types/double_map.rs b/frame/support/src/storage/types/double_map.rs
index 2db8a845c568..775011005086 100644
--- a/frame/support/src/storage/types/double_map.rs
+++ b/frame/support/src/storage/types/double_map.rs
@@ -19,14 +19,14 @@
 //! StoragePrefixedDoubleMap traits and their methods directly.
 
 use crate::{
+	metadata::{StorageEntryModifier, StorageEntryType},
 	storage::{
-		types::{OnEmptyGetter, OptionQuery, QueryKindTrait},
+		types::{OptionQuery, QueryKindTrait, StorageEntryMetadata},
 		StorageAppend, StorageDecodeLength, StoragePrefixedMap, StorageTryAppend,
 	},
 	traits::{Get, GetDefault, StorageInfo, StorageInstance},
 };
 use codec::{Decode, Encode, EncodeLike, FullCodec, MaxEncodedLen};
-use frame_metadata::{DefaultByteGetter, StorageEntryModifier};
 use sp_arithmetic::traits::SaturatedConversion;
 use sp_std::prelude::*;
 
@@ -511,37 +511,34 @@ where
 	}
 }
 
-/// Part of storage metadata for a storage double map.
-///
-/// NOTE: Generic hashers is supported.
-pub trait StorageDoubleMapMetadata {
-	const MODIFIER: StorageEntryModifier;
-	const NAME: &'static str;
-	const DEFAULT: DefaultByteGetter;
-	const HASHER1: frame_metadata::StorageHasher;
-	const HASHER2: frame_metadata::StorageHasher;
-}
-
 impl<Prefix, Hasher1, Hasher2, Key1, Key2, Value, QueryKind, OnEmpty, MaxValues>
-	StorageDoubleMapMetadata
+	StorageEntryMetadata
 	for StorageDoubleMap<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty, MaxValues>
 where
 	Prefix: StorageInstance,
 	Hasher1: crate::hash::StorageHasher,
 	Hasher2: crate::hash::StorageHasher,
-	Key1: FullCodec,
-	Key2: FullCodec,
-	Value: FullCodec,
+	Key1: FullCodec + scale_info::StaticTypeInfo,
+	Key2: FullCodec + scale_info::StaticTypeInfo,
+	Value: FullCodec + scale_info::StaticTypeInfo,
 	QueryKind: QueryKindTrait<Value, OnEmpty>,
 	OnEmpty: Get<QueryKind::Query> + 'static,
 	MaxValues: Get<Option<u32>>,
 {
 	const MODIFIER: StorageEntryModifier = QueryKind::METADATA;
-	const HASHER1: frame_metadata::StorageHasher = Hasher1::METADATA;
-	const HASHER2: frame_metadata::StorageHasher = Hasher2::METADATA;
 	const NAME: &'static str = Prefix::STORAGE_PREFIX;
-	const DEFAULT: DefaultByteGetter =
-		DefaultByteGetter(&OnEmptyGetter::<QueryKind::Query, OnEmpty>(core::marker::PhantomData));
+
+	fn ty() -> StorageEntryType {
+		StorageEntryType::Map {
+			hashers: vec![Hasher1::METADATA, Hasher2::METADATA],
+			key: scale_info::meta_type::<(Key1, Key2)>(),
+			value: scale_info::meta_type::<Value>(),
+		}
+	}
+
+	fn default() -> Vec<u8> {
+		OnEmpty::get().encode()
+	}
 }
 
 impl<Prefix, Hasher1, Hasher2, Key1, Key2, Value, QueryKind, OnEmpty, MaxValues>
@@ -603,8 +600,12 @@ where
 #[cfg(test)]
 mod test {
 	use super::*;
-	use crate::{hash::*, storage::types::ValueQuery};
-	use frame_metadata::StorageEntryModifier;
+	use crate::{
+		hash::*,
+		metadata::{StorageEntryModifier, StorageEntryType, StorageHasher},
+		storage::types::ValueQuery,
+	};
+	use assert_matches::assert_matches;
 	use sp_io::{hashing::twox_128, TestExternalities};
 
 	struct Prefix;
@@ -768,19 +769,27 @@ mod test {
 
 			assert_eq!(A::MODIFIER, StorageEntryModifier::Optional);
 			assert_eq!(AValueQueryWithAnOnEmpty::MODIFIER, StorageEntryModifier::Default);
-			assert_eq!(A::HASHER1, frame_metadata::StorageHasher::Blake2_128Concat);
-			assert_eq!(A::HASHER2, frame_metadata::StorageHasher::Twox64Concat);
-			assert_eq!(
-				AValueQueryWithAnOnEmpty::HASHER1,
-				frame_metadata::StorageHasher::Blake2_128Concat
+
+			let assert_map_hashers = |ty, expected_hashers| {
+				if let StorageEntryType::Map { hashers, .. } = ty {
+					assert_eq!(hashers, expected_hashers)
+				} else {
+					assert_matches!(ty, StorageEntryType::Map { .. })
+				}
+			};
+
+			assert_map_hashers(
+				A::ty(),
+				vec![StorageHasher::Blake2_128Concat, StorageHasher::Twox64Concat],
 			);
-			assert_eq!(
-				AValueQueryWithAnOnEmpty::HASHER2,
-				frame_metadata::StorageHasher::Twox64Concat
+			assert_map_hashers(
+				AValueQueryWithAnOnEmpty::ty(),
+				vec![StorageHasher::Blake2_128Concat, StorageHasher::Twox64Concat],
 			);
+
 			assert_eq!(A::NAME, "foo");
-			assert_eq!(AValueQueryWithAnOnEmpty::DEFAULT.0.default_byte(), 97u32.encode());
-			assert_eq!(A::DEFAULT.0.default_byte(), Option::<u32>::None.encode());
+			assert_eq!(AValueQueryWithAnOnEmpty::default(), 97u32.encode());
+			assert_eq!(A::default(), Option::<u32>::None.encode());
 
 			WithLen::remove_all(None);
 			assert_eq!(WithLen::decode_len(3, 30), None);
diff --git a/frame/support/src/storage/types/key.rs b/frame/support/src/storage/types/key.rs
index db66838e3ff1..da265fd6e6c8 100755
--- a/frame/support/src/storage/types/key.rs
+++ b/frame/support/src/storage/types/key.rs
@@ -20,6 +20,7 @@
 use crate::hash::{ReversibleStorageHasher, StorageHasher};
 use codec::{Encode, EncodeLike, FullCodec, MaxEncodedLen};
 use paste::paste;
+use scale_info::StaticTypeInfo;
 use sp_std::prelude::*;
 
 /// A type used exclusively by storage maps as their key type.
@@ -35,14 +36,14 @@ pub struct Key<Hasher, KeyType>(core::marker::PhantomData<(Hasher, KeyType)>);
 
 /// A trait that contains the current key as an associated type.
 pub trait KeyGenerator {
-	type Key: EncodeLike<Self::Key>;
+	type Key: EncodeLike<Self::Key> + StaticTypeInfo;
 	type KArg: Encode;
 	type HashFn: FnOnce(&[u8]) -> Vec<u8>;
 	type HArg;
 
-	const HASHER_METADATA: &'static [frame_metadata::StorageHasher];
+	const HASHER_METADATA: &'static [crate::metadata::StorageHasher];
 
-	/// Given a `key` tuple, calculate the final key by encoding each element individuallly and
+	/// Given a `key` tuple, calculate the final key by encoding each element individually and
 	/// hashing them using the corresponding hasher in the `KeyGenerator`.
 	fn final_key<KArg: EncodeLikeTuple<Self::KArg> + TupleToEncodedIter>(key: KArg) -> Vec<u8>;
 	/// Given a `key` tuple, migrate the keys from using the old hashers as given by `hash_fns`
@@ -67,13 +68,13 @@ pub trait KeyGeneratorInner: KeyGenerator {
 	fn final_hash(encoded: &[u8]) -> Vec<u8>;
 }
 
-impl<H: StorageHasher, K: FullCodec> KeyGenerator for Key<H, K> {
+impl<H: StorageHasher, K: FullCodec + StaticTypeInfo> KeyGenerator for Key<H, K> {
 	type Key = K;
 	type KArg = (K,);
 	type HashFn = Box<dyn FnOnce(&[u8]) -> Vec<u8>>;
 	type HArg = (Self::HashFn,);
 
-	const HASHER_METADATA: &'static [frame_metadata::StorageHasher] = &[H::METADATA];
+	const HASHER_METADATA: &'static [crate::metadata::StorageHasher] = &[H::METADATA];
 
 	fn final_key<KArg: EncodeLikeTuple<Self::KArg> + TupleToEncodedIter>(key: KArg) -> Vec<u8> {
 		H::hash(&key.to_encoded_iter().next().expect("should have at least one element!"))
@@ -89,13 +90,15 @@ impl<H: StorageHasher, K: FullCodec> KeyGenerator for Key<H, K> {
 	}
 }
 
-impl<H: StorageHasher, K: FullCodec + MaxEncodedLen> KeyGeneratorMaxEncodedLen for Key<H, K> {
+impl<H: StorageHasher, K: FullCodec + MaxEncodedLen + StaticTypeInfo> KeyGeneratorMaxEncodedLen
+	for Key<H, K>
+{
 	fn key_max_encoded_len() -> usize {
 		H::max_len::<K>()
 	}
 }
 
-impl<H: StorageHasher, K: FullCodec> KeyGeneratorInner for Key<H, K> {
+impl<H: StorageHasher, K: FullCodec + StaticTypeInfo> KeyGeneratorInner for Key<H, K> {
 	type Hasher = H;
 
 	fn final_hash(encoded: &[u8]) -> Vec<u8> {
@@ -111,7 +114,7 @@ impl KeyGenerator for Tuple {
 	for_tuples!( type HArg = ( #(Tuple::HashFn),* ); );
 	type HashFn = Box<dyn FnOnce(&[u8]) -> Vec<u8>>;
 
-	const HASHER_METADATA: &'static [frame_metadata::StorageHasher] =
+	const HASHER_METADATA: &'static [crate::metadata::StorageHasher] =
 		&[for_tuples!( #(Tuple::Hasher::METADATA),* )];
 
 	fn final_key<KArg: EncodeLikeTuple<Self::KArg> + TupleToEncodedIter>(key: KArg) -> Vec<u8> {
@@ -218,7 +221,9 @@ pub trait ReversibleKeyGenerator: KeyGenerator {
 	fn decode_final_key(key_material: &[u8]) -> Result<(Self::Key, &[u8]), codec::Error>;
 }
 
-impl<H: ReversibleStorageHasher, K: FullCodec> ReversibleKeyGenerator for Key<H, K> {
+impl<H: ReversibleStorageHasher, K: FullCodec + StaticTypeInfo> ReversibleKeyGenerator
+	for Key<H, K>
+{
 	type ReversibleHasher = H;
 
 	fn decode_final_key(key_material: &[u8]) -> Result<(Self::Key, &[u8]), codec::Error> {
diff --git a/frame/support/src/storage/types/map.rs b/frame/support/src/storage/types/map.rs
index 6b3cfe64eaec..a31224f15c80 100644
--- a/frame/support/src/storage/types/map.rs
+++ b/frame/support/src/storage/types/map.rs
@@ -19,14 +19,14 @@
 //! methods directly.
 
 use crate::{
+	metadata::{StorageEntryModifier, StorageEntryType},
 	storage::{
-		types::{OnEmptyGetter, OptionQuery, QueryKindTrait},
+		types::{OptionQuery, QueryKindTrait, StorageEntryMetadata},
 		StorageAppend, StorageDecodeLength, StoragePrefixedMap, StorageTryAppend,
 	},
 	traits::{Get, GetDefault, StorageInfo, StorageInstance},
 };
 use codec::{Decode, Encode, EncodeLike, FullCodec, MaxEncodedLen};
-use frame_metadata::{DefaultByteGetter, StorageEntryModifier};
 use sp_arithmetic::traits::SaturatedConversion;
 use sp_std::prelude::*;
 
@@ -336,32 +336,31 @@ where
 	}
 }
 
-/// Part of storage metadata for a storage map.
-///
-/// NOTE: Generic hasher is supported.
-pub trait StorageMapMetadata {
-	const MODIFIER: StorageEntryModifier;
-	const NAME: &'static str;
-	const DEFAULT: DefaultByteGetter;
-	const HASHER: frame_metadata::StorageHasher;
-}
-
-impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues> StorageMapMetadata
+impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues> StorageEntryMetadata
 	for StorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
 where
 	Prefix: StorageInstance,
 	Hasher: crate::hash::StorageHasher,
-	Key: FullCodec,
-	Value: FullCodec,
+	Key: FullCodec + scale_info::StaticTypeInfo,
+	Value: FullCodec + scale_info::StaticTypeInfo,
 	QueryKind: QueryKindTrait<Value, OnEmpty>,
 	OnEmpty: Get<QueryKind::Query> + 'static,
 	MaxValues: Get<Option<u32>>,
 {
 	const MODIFIER: StorageEntryModifier = QueryKind::METADATA;
-	const HASHER: frame_metadata::StorageHasher = Hasher::METADATA;
 	const NAME: &'static str = Prefix::STORAGE_PREFIX;
-	const DEFAULT: DefaultByteGetter =
-		DefaultByteGetter(&OnEmptyGetter::<QueryKind::Query, OnEmpty>(core::marker::PhantomData));
+
+	fn ty() -> StorageEntryType {
+		StorageEntryType::Map {
+			hashers: vec![Hasher::METADATA],
+			key: scale_info::meta_type::<Key>(),
+			value: scale_info::meta_type::<Value>(),
+		}
+	}
+
+	fn default() -> Vec<u8> {
+		OnEmpty::get().encode()
+	}
 }
 
 impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues> crate::traits::StorageInfoTrait
@@ -417,8 +416,12 @@ where
 #[cfg(test)]
 mod test {
 	use super::*;
-	use crate::{hash::*, storage::types::ValueQuery};
-	use frame_metadata::StorageEntryModifier;
+	use crate::{
+		hash::*,
+		metadata::{StorageEntryModifier, StorageEntryType, StorageHasher},
+		storage::types::ValueQuery,
+	};
+	use assert_matches::assert_matches;
 	use sp_io::{hashing::twox_128, TestExternalities};
 
 	struct Prefix;
@@ -572,14 +575,23 @@ mod test {
 
 			assert_eq!(A::MODIFIER, StorageEntryModifier::Optional);
 			assert_eq!(AValueQueryWithAnOnEmpty::MODIFIER, StorageEntryModifier::Default);
-			assert_eq!(A::HASHER, frame_metadata::StorageHasher::Blake2_128Concat);
-			assert_eq!(
-				AValueQueryWithAnOnEmpty::HASHER,
-				frame_metadata::StorageHasher::Blake2_128Concat
+
+			let assert_map_hashers = |ty, expected_hashers| {
+				if let StorageEntryType::Map { hashers, .. } = ty {
+					assert_eq!(hashers, expected_hashers)
+				} else {
+					assert_matches!(ty, StorageEntryType::Map { .. })
+				}
+			};
+
+			assert_map_hashers(A::ty(), vec![StorageHasher::Blake2_128Concat]);
+			assert_map_hashers(
+				AValueQueryWithAnOnEmpty::ty(),
+				vec![StorageHasher::Blake2_128Concat],
 			);
 			assert_eq!(A::NAME, "foo");
-			assert_eq!(AValueQueryWithAnOnEmpty::DEFAULT.0.default_byte(), 97u32.encode());
-			assert_eq!(A::DEFAULT.0.default_byte(), Option::<u32>::None.encode());
+			assert_eq!(AValueQueryWithAnOnEmpty::default(), 97u32.encode());
+			assert_eq!(A::default(), Option::<u32>::None.encode());
 
 			WithLen::remove_all(None);
 			assert_eq!(WithLen::decode_len(3), None);
diff --git a/frame/support/src/storage/types/mod.rs b/frame/support/src/storage/types/mod.rs
index d61ca6813c9d..76fed0b8cb32 100644
--- a/frame/support/src/storage/types/mod.rs
+++ b/frame/support/src/storage/types/mod.rs
@@ -18,8 +18,9 @@
 //! Storage types to build abstraction on storage, they implements storage traits such as
 //! StorageMap and others.
 
+use crate::metadata::{StorageEntryModifier, StorageEntryType};
 use codec::FullCodec;
-use frame_metadata::{DefaultByte, StorageEntryModifier};
+use sp_std::prelude::*;
 
 mod double_map;
 mod key;
@@ -27,14 +28,14 @@ mod map;
 mod nmap;
 mod value;
 
-pub use double_map::{StorageDoubleMap, StorageDoubleMapMetadata};
+pub use double_map::StorageDoubleMap;
 pub use key::{
 	EncodeLikeTuple, HasKeyPrefix, HasReversibleKeyPrefix, Key, KeyGenerator,
 	KeyGeneratorMaxEncodedLen, ReversibleKeyGenerator, TupleToEncodedIter,
 };
-pub use map::{StorageMap, StorageMapMetadata};
-pub use nmap::{StorageNMap, StorageNMapMetadata};
-pub use value::{StorageValue, StorageValueMetadata};
+pub use map::StorageMap;
+pub use nmap::StorageNMap;
+pub use value::StorageValue;
 
 /// Trait implementing how the storage optional value is converted into the queried type.
 ///
@@ -102,14 +103,13 @@ where
 	}
 }
 
-/// A helper struct which implements DefaultByte using `Get<Value>` and encode it.
-struct OnEmptyGetter<Value, OnEmpty>(core::marker::PhantomData<(Value, OnEmpty)>);
-impl<Value: FullCodec, OnEmpty: crate::traits::Get<Value>> DefaultByte
-	for OnEmptyGetter<Value, OnEmpty>
-{
-	fn default_byte(&self) -> sp_std::vec::Vec<u8> {
-		OnEmpty::get().encode()
-	}
+/// Provide metadata for a storage entry.
+///
+/// Implemented by each of the storage entry kinds: value, map, doublemap and nmap.
+pub trait StorageEntryMetadata {
+	const MODIFIER: StorageEntryModifier;
+	const NAME: &'static str;
+
+	fn ty() -> StorageEntryType;
+	fn default() -> Vec<u8>;
 }
-unsafe impl<Value, OnEmpty: crate::traits::Get<Value>> Send for OnEmptyGetter<Value, OnEmpty> {}
-unsafe impl<Value, OnEmpty: crate::traits::Get<Value>> Sync for OnEmptyGetter<Value, OnEmpty> {}
diff --git a/frame/support/src/storage/types/nmap.rs b/frame/support/src/storage/types/nmap.rs
index 149872ccba9a..7048a69d59c2 100755
--- a/frame/support/src/storage/types/nmap.rs
+++ b/frame/support/src/storage/types/nmap.rs
@@ -19,17 +19,17 @@
 //! StoragePrefixedDoubleMap traits and their methods directly.
 
 use crate::{
+	metadata::{StorageEntryModifier, StorageEntryType},
 	storage::{
 		types::{
-			EncodeLikeTuple, HasKeyPrefix, HasReversibleKeyPrefix, OnEmptyGetter, OptionQuery,
-			QueryKindTrait, TupleToEncodedIter,
+			EncodeLikeTuple, HasKeyPrefix, HasReversibleKeyPrefix, OptionQuery, QueryKindTrait,
+			StorageEntryMetadata, TupleToEncodedIter,
 		},
 		KeyGenerator, PrefixIterator, StorageAppend, StorageDecodeLength, StoragePrefixedMap,
 	},
 	traits::{Get, GetDefault, StorageInfo, StorageInstance},
 };
 use codec::{Decode, Encode, EncodeLike, FullCodec, MaxEncodedLen};
-use frame_metadata::{DefaultByteGetter, StorageEntryModifier};
 use sp_runtime::SaturatedConversion;
 use sp_std::prelude::*;
 
@@ -440,31 +440,30 @@ where
 	}
 }
 
-/// Part of storage metadata for a storage n map.
-///
-/// NOTE: Generic hashers is supported.
-pub trait StorageNMapMetadata {
-	const MODIFIER: StorageEntryModifier;
-	const NAME: &'static str;
-	const DEFAULT: DefaultByteGetter;
-	const HASHERS: &'static [frame_metadata::StorageHasher];
-}
-
-impl<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues> StorageNMapMetadata
+impl<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues> StorageEntryMetadata
 	for StorageNMap<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues>
 where
 	Prefix: StorageInstance,
 	Key: super::key::KeyGenerator,
-	Value: FullCodec,
+	Value: FullCodec + scale_info::StaticTypeInfo,
 	QueryKind: QueryKindTrait<Value, OnEmpty>,
 	OnEmpty: Get<QueryKind::Query> + 'static,
 	MaxValues: Get<Option<u32>>,
 {
 	const MODIFIER: StorageEntryModifier = QueryKind::METADATA;
 	const NAME: &'static str = Prefix::STORAGE_PREFIX;
-	const DEFAULT: DefaultByteGetter =
-		DefaultByteGetter(&OnEmptyGetter::<QueryKind::Query, OnEmpty>(core::marker::PhantomData));
-	const HASHERS: &'static [frame_metadata::StorageHasher] = Key::HASHER_METADATA;
+
+	fn ty() -> StorageEntryType {
+		StorageEntryType::Map {
+			key: scale_info::meta_type::<Key::Key>(),
+			hashers: Key::HASHER_METADATA.iter().cloned().collect(),
+			value: scale_info::meta_type::<Value>(),
+		}
+	}
+
+	fn default() -> Vec<u8> {
+		OnEmpty::get().encode()
+	}
 }
 
 impl<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues> crate::traits::StorageInfoTrait
@@ -518,9 +517,9 @@ mod test {
 	use super::*;
 	use crate::{
 		hash::*,
+		metadata::StorageEntryModifier,
 		storage::types::{Key, ValueQuery},
 	};
-	use frame_metadata::StorageEntryModifier;
 	use sp_io::{hashing::twox_128, TestExternalities};
 
 	struct Prefix;
@@ -688,8 +687,8 @@ mod test {
 			assert_eq!(A::MODIFIER, StorageEntryModifier::Optional);
 			assert_eq!(AValueQueryWithAnOnEmpty::MODIFIER, StorageEntryModifier::Default);
 			assert_eq!(A::NAME, "Foo");
-			assert_eq!(AValueQueryWithAnOnEmpty::DEFAULT.0.default_byte(), 98u32.encode());
-			assert_eq!(A::DEFAULT.0.default_byte(), Option::<u32>::None.encode());
+			assert_eq!(AValueQueryWithAnOnEmpty::default(), 98u32.encode());
+			assert_eq!(A::default(), Option::<u32>::None.encode());
 
 			WithLen::remove_all(None);
 			assert_eq!(WithLen::decode_len((3,)), None);
@@ -856,8 +855,8 @@ mod test {
 			assert_eq!(A::MODIFIER, StorageEntryModifier::Optional);
 			assert_eq!(AValueQueryWithAnOnEmpty::MODIFIER, StorageEntryModifier::Default);
 			assert_eq!(A::NAME, "Foo");
-			assert_eq!(AValueQueryWithAnOnEmpty::DEFAULT.0.default_byte(), 98u32.encode());
-			assert_eq!(A::DEFAULT.0.default_byte(), Option::<u32>::None.encode());
+			assert_eq!(AValueQueryWithAnOnEmpty::default(), 98u32.encode());
+			assert_eq!(A::default(), Option::<u32>::None.encode());
 
 			WithLen::remove_all(None);
 			assert_eq!(WithLen::decode_len((3, 30)), None);
@@ -1046,8 +1045,8 @@ mod test {
 			assert_eq!(A::MODIFIER, StorageEntryModifier::Optional);
 			assert_eq!(AValueQueryWithAnOnEmpty::MODIFIER, StorageEntryModifier::Default);
 			assert_eq!(A::NAME, "Foo");
-			assert_eq!(AValueQueryWithAnOnEmpty::DEFAULT.0.default_byte(), 98u32.encode());
-			assert_eq!(A::DEFAULT.0.default_byte(), Option::<u32>::None.encode());
+			assert_eq!(AValueQueryWithAnOnEmpty::default(), 98u32.encode());
+			assert_eq!(A::default(), Option::<u32>::None.encode());
 
 			WithLen::remove_all(None);
 			assert_eq!(WithLen::decode_len((3, 30, 300)), None);
diff --git a/frame/support/src/storage/types/value.rs b/frame/support/src/storage/types/value.rs
index ad835e928bdd..d7f15487592b 100644
--- a/frame/support/src/storage/types/value.rs
+++ b/frame/support/src/storage/types/value.rs
@@ -18,15 +18,15 @@
 //! Storage value type. Implements StorageValue trait and its method directly.
 
 use crate::{
+	metadata::{StorageEntryModifier, StorageEntryType},
 	storage::{
 		generator::StorageValue as StorageValueT,
-		types::{OnEmptyGetter, OptionQuery, QueryKindTrait},
+		types::{OptionQuery, QueryKindTrait, StorageEntryMetadata},
 		StorageAppend, StorageDecodeLength, StorageTryAppend,
 	},
 	traits::{GetDefault, StorageInfo, StorageInstance},
 };
 use codec::{Decode, Encode, EncodeLike, FullCodec, MaxEncodedLen};
-use frame_metadata::{DefaultByteGetter, StorageEntryModifier};
 use sp_arithmetic::traits::SaturatedConversion;
 use sp_std::prelude::*;
 
@@ -201,25 +201,24 @@ where
 	}
 }
 
-/// Part of storage metadata for storage value.
-pub trait StorageValueMetadata {
-	const MODIFIER: StorageEntryModifier;
-	const NAME: &'static str;
-	const DEFAULT: DefaultByteGetter;
-}
-
-impl<Prefix, Value, QueryKind, OnEmpty> StorageValueMetadata
+impl<Prefix, Value, QueryKind, OnEmpty> StorageEntryMetadata
 	for StorageValue<Prefix, Value, QueryKind, OnEmpty>
 where
 	Prefix: StorageInstance,
-	Value: FullCodec,
+	Value: FullCodec + scale_info::StaticTypeInfo,
 	QueryKind: QueryKindTrait<Value, OnEmpty>,
 	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
 {
 	const MODIFIER: StorageEntryModifier = QueryKind::METADATA;
 	const NAME: &'static str = Prefix::STORAGE_PREFIX;
-	const DEFAULT: DefaultByteGetter =
-		DefaultByteGetter(&OnEmptyGetter::<QueryKind::Query, OnEmpty>(core::marker::PhantomData));
+
+	fn ty() -> StorageEntryType {
+		StorageEntryType::Plain(scale_info::meta_type::<Value>())
+	}
+
+	fn default() -> Vec<u8> {
+		OnEmpty::get().encode()
+	}
 }
 
 impl<Prefix, Value, QueryKind, OnEmpty> crate::traits::StorageInfoTrait
@@ -264,8 +263,7 @@ where
 #[cfg(test)]
 mod test {
 	use super::*;
-	use crate::storage::types::ValueQuery;
-	use frame_metadata::StorageEntryModifier;
+	use crate::{metadata::StorageEntryModifier, storage::types::ValueQuery};
 	use sp_io::{hashing::twox_128, TestExternalities};
 
 	struct Prefix;
@@ -347,8 +345,8 @@ mod test {
 			assert_eq!(A::MODIFIER, StorageEntryModifier::Optional);
 			assert_eq!(AValueQueryWithAnOnEmpty::MODIFIER, StorageEntryModifier::Default);
 			assert_eq!(A::NAME, "foo");
-			assert_eq!(A::DEFAULT.0.default_byte(), Option::<u32>::None.encode());
-			assert_eq!(AValueQueryWithAnOnEmpty::DEFAULT.0.default_byte(), 97u32.encode());
+			assert_eq!(A::default(), Option::<u32>::None.encode());
+			assert_eq!(AValueQueryWithAnOnEmpty::default(), 97u32.encode());
 
 			WithLen::kill();
 			assert_eq!(WithLen::decode_len(), None);
diff --git a/frame/support/src/storage/weak_bounded_vec.rs b/frame/support/src/storage/weak_bounded_vec.rs
index f60e4d87bde8..9c30c45c3e2e 100644
--- a/frame/support/src/storage/weak_bounded_vec.rs
+++ b/frame/support/src/storage/weak_bounded_vec.rs
@@ -36,7 +36,8 @@ use sp_std::{convert::TryFrom, fmt, marker::PhantomData, prelude::*};
 ///
 /// The length of the vec is not strictly bounded. Decoding a vec with more element that the bound
 /// is accepted, and some method allow to bypass the restriction with warnings.
-#[derive(Encode)]
+#[derive(Encode, scale_info::TypeInfo)]
+#[scale_info(skip_type_params(S))]
 pub struct WeakBoundedVec<T, S>(Vec<T>, PhantomData<S>);
 
 impl<T: Decode, S: Get<u32>> Decode for WeakBoundedVec<T, S> {
diff --git a/frame/support/src/traits/tokens/misc.rs b/frame/support/src/traits/tokens/misc.rs
index bea6e664cf2c..214c28708a19 100644
--- a/frame/support/src/traits/tokens/misc.rs
+++ b/frame/support/src/traits/tokens/misc.rs
@@ -116,7 +116,7 @@ pub enum ExistenceRequirement {
 }
 
 /// Status of funds.
-#[derive(PartialEq, Eq, Clone, Copy, Encode, Decode, RuntimeDebug)]
+#[derive(PartialEq, Eq, Clone, Copy, Encode, Decode, RuntimeDebug, scale_info::TypeInfo)]
 pub enum BalanceStatus {
 	/// Funds are free, as corresponding to `free` item in Balances.
 	Free,
@@ -165,8 +165,14 @@ pub trait AssetId: FullCodec + Copy + Eq + PartialEq + Debug {}
 impl<T: FullCodec + Copy + Eq + PartialEq + Debug> AssetId for T {}
 
 /// Simple amalgamation trait to collect together properties for a Balance under one roof.
-pub trait Balance: AtLeast32BitUnsigned + FullCodec + Copy + Default + Debug {}
-impl<T: AtLeast32BitUnsigned + FullCodec + Copy + Default + Debug> Balance for T {}
+pub trait Balance:
+	AtLeast32BitUnsigned + FullCodec + Copy + Default + Debug + scale_info::TypeInfo
+{
+}
+impl<T: AtLeast32BitUnsigned + FullCodec + Copy + Default + Debug + scale_info::TypeInfo> Balance
+	for T
+{
+}
 
 /// Converts a balance value into an asset balance.
 pub trait BalanceConversion<InBalance, AssetId, OutBalance> {
diff --git a/frame/support/src/weights.rs b/frame/support/src/weights.rs
index 7af6d440aa40..115470a9bf03 100644
--- a/frame/support/src/weights.rs
+++ b/frame/support/src/weights.rs
@@ -129,6 +129,7 @@
 
 use crate::dispatch::{DispatchError, DispatchErrorWithPostInfo, DispatchResultWithPostInfo};
 use codec::{Decode, Encode};
+use scale_info::TypeInfo;
 #[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 use smallvec::{smallvec, SmallVec};
@@ -201,7 +202,7 @@ pub trait PaysFee<T> {
 }
 
 /// Explicit enum to denote if a transaction pays fee or not.
-#[derive(Clone, Copy, Eq, PartialEq, RuntimeDebug, Encode, Decode)]
+#[derive(Clone, Copy, Eq, PartialEq, RuntimeDebug, Encode, Decode, TypeInfo)]
 pub enum Pays {
 	/// Transactor will pay related fees.
 	Yes,
@@ -221,7 +222,7 @@ impl Default for Pays {
 /// [DispatchClass::all] and [DispatchClass::non_mandatory] helper functions.
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
-#[derive(PartialEq, Eq, Clone, Copy, Encode, Decode, RuntimeDebug)]
+#[derive(PartialEq, Eq, Clone, Copy, Encode, Decode, RuntimeDebug, TypeInfo)]
 pub enum DispatchClass {
 	/// A normal dispatch.
 	Normal,
@@ -311,7 +312,7 @@ pub mod priority {
 }
 
 /// A bundle of static information collected from the `#[weight = $x]` attributes.
-#[derive(Clone, Copy, Eq, PartialEq, Default, RuntimeDebug, Encode, Decode)]
+#[derive(Clone, Copy, Eq, PartialEq, Default, RuntimeDebug, Encode, Decode, TypeInfo)]
 pub struct DispatchInfo {
 	/// Weight of this transaction.
 	pub weight: Weight,
@@ -338,7 +339,7 @@ impl GetDispatchInfo for () {
 
 /// Weight information that is only available post dispatch.
 /// NOTE: This can only be used to reduce the weight or fee, not increase it.
-#[derive(Clone, Copy, Eq, PartialEq, Default, RuntimeDebug, Encode, Decode)]
+#[derive(Clone, Copy, Eq, PartialEq, Default, RuntimeDebug, Encode, Decode, TypeInfo)]
 pub struct PostDispatchInfo {
 	/// Actual weight consumed by a call or `None` which stands for the worst case static weight.
 	pub actual_weight: Option<Weight>,
@@ -627,7 +628,7 @@ impl<Call: Encode, Extra: Encode> GetDispatchInfo for sp_runtime::testing::TestX
 }
 
 /// The weight of database operations that the runtime can invoke.
-#[derive(Clone, Copy, Eq, PartialEq, Default, RuntimeDebug, Encode, Decode)]
+#[derive(Clone, Copy, Eq, PartialEq, Default, RuntimeDebug, Encode, Decode, TypeInfo)]
 pub struct RuntimeDbWeight {
 	pub read: Weight,
 	pub write: Weight,
@@ -659,7 +660,7 @@ impl RuntimeDbWeight {
 ///
 /// The `negative` value encodes whether the term is added or substracted from the
 /// overall polynomial result.
-#[derive(Clone, Encode, Decode)]
+#[derive(Clone, Encode, Decode, TypeInfo)]
 pub struct WeightToFeeCoefficient<Balance> {
 	/// The integral part of the coefficient.
 	pub coeff_integer: Balance,
@@ -737,7 +738,7 @@ where
 }
 
 /// A struct holding value for each `DispatchClass`.
-#[derive(Clone, Eq, PartialEq, Default, RuntimeDebug, Encode, Decode)]
+#[derive(Clone, Eq, PartialEq, Default, RuntimeDebug, Encode, Decode, TypeInfo)]
 pub struct PerDispatchClass<T> {
 	/// Value for `Normal` extrinsics.
 	normal: T,
@@ -882,49 +883,49 @@ mod tests {
 	#[test]
 	fn weights_are_correct() {
 		// #[weight = 1000]
-		let info = Call::<TraitImpl>::f00().get_dispatch_info();
+		let info = Call::<TraitImpl>::f00 {}.get_dispatch_info();
 		assert_eq!(info.weight, 1000);
 		assert_eq!(info.class, DispatchClass::Normal);
 		assert_eq!(info.pays_fee, Pays::Yes);
 
 		// #[weight = (1000, DispatchClass::Mandatory)]
-		let info = Call::<TraitImpl>::f01().get_dispatch_info();
+		let info = Call::<TraitImpl>::f01 {}.get_dispatch_info();
 		assert_eq!(info.weight, 1000);
 		assert_eq!(info.class, DispatchClass::Mandatory);
 		assert_eq!(info.pays_fee, Pays::Yes);
 
 		// #[weight = (1000, Pays::No)]
-		let info = Call::<TraitImpl>::f02().get_dispatch_info();
+		let info = Call::<TraitImpl>::f02 {}.get_dispatch_info();
 		assert_eq!(info.weight, 1000);
 		assert_eq!(info.class, DispatchClass::Normal);
 		assert_eq!(info.pays_fee, Pays::No);
 
 		// #[weight = (1000, DispatchClass::Operational, Pays::No)]
-		let info = Call::<TraitImpl>::f03().get_dispatch_info();
+		let info = Call::<TraitImpl>::f03 {}.get_dispatch_info();
 		assert_eq!(info.weight, 1000);
 		assert_eq!(info.class, DispatchClass::Operational);
 		assert_eq!(info.pays_fee, Pays::No);
 
 		// #[weight = ((_a * 10 + _eb * 1) as Weight, DispatchClass::Normal, Pays::Yes)]
-		let info = Call::<TraitImpl>::f11(13, 20).get_dispatch_info();
+		let info = Call::<TraitImpl>::f11 { _a: 13, _eb: 20 }.get_dispatch_info();
 		assert_eq!(info.weight, 150); // 13*10 + 20
 		assert_eq!(info.class, DispatchClass::Normal);
 		assert_eq!(info.pays_fee, Pays::Yes);
 
 		// #[weight = (0, DispatchClass::Operational, Pays::Yes)]
-		let info = Call::<TraitImpl>::f12(10, 20).get_dispatch_info();
+		let info = Call::<TraitImpl>::f12 { _a: 10, _eb: 20 }.get_dispatch_info();
 		assert_eq!(info.weight, 0);
 		assert_eq!(info.class, DispatchClass::Operational);
 		assert_eq!(info.pays_fee, Pays::Yes);
 
 		// #[weight = T::DbWeight::get().reads(3) + T::DbWeight::get().writes(2) + 10_000]
-		let info = Call::<TraitImpl>::f20().get_dispatch_info();
+		let info = Call::<TraitImpl>::f20 {}.get_dispatch_info();
 		assert_eq!(info.weight, 12300); // 100*3 + 1000*2 + 10_1000
 		assert_eq!(info.class, DispatchClass::Normal);
 		assert_eq!(info.pays_fee, Pays::Yes);
 
 		// #[weight = T::DbWeight::get().reads_writes(6, 5) + 40_000]
-		let info = Call::<TraitImpl>::f21().get_dispatch_info();
+		let info = Call::<TraitImpl>::f21 {}.get_dispatch_info();
 		assert_eq!(info.weight, 45600); // 100*6 + 1000*5 + 40_1000
 		assert_eq!(info.class, DispatchClass::Normal);
 		assert_eq!(info.pays_fee, Pays::Yes);
diff --git a/frame/support/test/Cargo.toml b/frame/support/test/Cargo.toml
index c8f746c7cb9d..e12880871e5c 100644
--- a/frame/support/test/Cargo.toml
+++ b/frame/support/test/Cargo.toml
@@ -14,16 +14,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.126", default-features = false, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
+sp-arithmetic = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/arithmetic" }
 sp-io = { version = "4.0.0-dev", path = "../../../primitives/io", default-features = false }
 sp-state-machine = { version = "0.10.0-dev", optional = true, path = "../../../primitives/state-machine" }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/runtime" }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/core" }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/std" }
+sp-version = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/version" }
 trybuild = "1.0.43"
 pretty_assertions = "0.6.1"
 rustversion = "1.0.0"
-frame-metadata = { version = "14.0.0-dev", default-features = false, path = "../../metadata" }
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../../system" }
 # The "std" feature for this pallet is never activated on purpose, in order to test construct_runtime error message
 test-pallet = { package = "frame-support-test-pallet", default-features = false, path = "pallet" }
@@ -33,6 +35,7 @@ default = ["std"]
 std = [
 	"serde/std",
 	"codec/std",
+	"scale-info/std",
 	"sp-io/std",
 	"frame-support/std",
 	"frame-system/std",
diff --git a/frame/support/test/pallet/Cargo.toml b/frame/support/test/pallet/Cargo.toml
index 3a421ecc461f..35eb4f34acae 100644
--- a/frame/support/test/pallet/Cargo.toml
+++ b/frame/support/test/pallet/Cargo.toml
@@ -13,6 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../../" }
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../../../system" }
 
@@ -20,6 +21,7 @@ frame-system = { version = "4.0.0-dev", default-features = false, path = "../../
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"frame-support/std",
 	"frame-system/std",
 ]
diff --git a/frame/support/test/src/lib.rs b/frame/support/test/src/lib.rs
index 78317a1a2f90..52c0a6270d47 100644
--- a/frame/support/test/src/lib.rs
+++ b/frame/support/test/src/lib.rs
@@ -25,9 +25,9 @@
 /// The configuration trait
 pub trait Config: 'static {
 	/// The runtime origin type.
-	type Origin: codec::Codec + codec::EncodeLike + Default;
+	type Origin: codec::Codec + codec::EncodeLike + Default + scale_info::TypeInfo;
 	/// The block number type.
-	type BlockNumber: codec::Codec + codec::EncodeLike + Default;
+	type BlockNumber: codec::Codec + codec::EncodeLike + Default + scale_info::TypeInfo;
 	/// The information about the pallet setup in the runtime.
 	type PalletInfo: frame_support::traits::PalletInfo;
 	/// The db weights.
diff --git a/frame/support/test/tests/construct_runtime.rs b/frame/support/test/tests/construct_runtime.rs
index 5ddcb89a7dca..062993fe10fb 100644
--- a/frame/support/test/tests/construct_runtime.rs
+++ b/frame/support/test/tests/construct_runtime.rs
@@ -22,6 +22,7 @@
 #![recursion_limit = "128"]
 
 use frame_support::traits::PalletInfo as _;
+use scale_info::TypeInfo;
 use sp_core::{sr25519, H256};
 use sp_runtime::{
 	generic,
@@ -54,7 +55,7 @@ mod module1 {
 		}
 	}
 
-	#[derive(Clone, PartialEq, Eq, Debug, codec::Encode, codec::Decode)]
+	#[derive(Clone, PartialEq, Eq, Debug, codec::Encode, codec::Decode, TypeInfo)]
 	pub struct Origin<T, I: Instance = DefaultInstance>(pub core::marker::PhantomData<(T, I)>);
 
 	frame_support::decl_event! {
@@ -96,7 +97,7 @@ mod module2 {
 		}
 	}
 
-	#[derive(Clone, PartialEq, Eq, Debug, codec::Encode, codec::Decode)]
+	#[derive(Clone, PartialEq, Eq, Debug, codec::Encode, codec::Decode, TypeInfo)]
 	pub struct Origin;
 
 	frame_support::decl_event! {
@@ -139,7 +140,7 @@ mod nested {
 			}
 		}
 
-		#[derive(Clone, PartialEq, Eq, Debug, codec::Encode, codec::Decode)]
+		#[derive(Clone, PartialEq, Eq, Debug, codec::Encode, codec::Decode, TypeInfo)]
 		pub struct Origin;
 
 		frame_support::decl_event! {
@@ -195,7 +196,7 @@ pub mod module3 {
 		}
 	}
 
-	#[derive(Clone, PartialEq, Eq, Debug, codec::Encode, codec::Decode)]
+	#[derive(Clone, PartialEq, Eq, Debug, codec::Encode, codec::Decode, TypeInfo)]
 	pub struct Origin<T>(pub core::marker::PhantomData<T>);
 
 	frame_support::decl_event! {
@@ -309,8 +310,8 @@ mod origin_test {
 
 	#[test]
 	fn origin_default_filter() {
-		let accepted_call = nested::module3::Call::fail().into();
-		let rejected_call = module3::Call::fail().into();
+		let accepted_call = nested::module3::Call::fail {}.into();
+		let rejected_call = module3::Call::fail {}.into();
 
 		assert_eq!(Origin::root().filter_call(&accepted_call), true);
 		assert_eq!(Origin::root().filter_call(&rejected_call), true);
@@ -472,28 +473,28 @@ fn event_codec() {
 #[test]
 fn call_codec() {
 	use codec::Encode;
-	assert_eq!(Call::System(system::Call::noop()).encode()[0], 30);
-	assert_eq!(Call::Module1_1(module1::Call::fail()).encode()[0], 31);
-	assert_eq!(Call::Module2(module2::Call::fail()).encode()[0], 32);
-	assert_eq!(Call::Module1_2(module1::Call::fail()).encode()[0], 33);
-	assert_eq!(Call::NestedModule3(nested::module3::Call::fail()).encode()[0], 34);
-	assert_eq!(Call::Module3(module3::Call::fail()).encode()[0], 35);
-	assert_eq!(Call::Module1_4(module1::Call::fail()).encode()[0], 3);
-	assert_eq!(Call::Module1_6(module1::Call::fail()).encode()[0], 1);
-	assert_eq!(Call::Module1_7(module1::Call::fail()).encode()[0], 2);
-	assert_eq!(Call::Module1_8(module1::Call::fail()).encode()[0], 12);
-	assert_eq!(Call::Module1_9(module1::Call::fail()).encode()[0], 13);
+	assert_eq!(Call::System(system::Call::noop {}).encode()[0], 30);
+	assert_eq!(Call::Module1_1(module1::Call::fail {}).encode()[0], 31);
+	assert_eq!(Call::Module2(module2::Call::fail {}).encode()[0], 32);
+	assert_eq!(Call::Module1_2(module1::Call::fail {}).encode()[0], 33);
+	assert_eq!(Call::NestedModule3(nested::module3::Call::fail {}).encode()[0], 34);
+	assert_eq!(Call::Module3(module3::Call::fail {}).encode()[0], 35);
+	assert_eq!(Call::Module1_4(module1::Call::fail {}).encode()[0], 3);
+	assert_eq!(Call::Module1_6(module1::Call::fail {}).encode()[0], 1);
+	assert_eq!(Call::Module1_7(module1::Call::fail {}).encode()[0], 2);
+	assert_eq!(Call::Module1_8(module1::Call::fail {}).encode()[0], 12);
+	assert_eq!(Call::Module1_9(module1::Call::fail {}).encode()[0], 13);
 }
 
 #[test]
 fn call_compact_attr() {
 	use codec::Encode;
-	let call: module3::Call<Runtime> = module3::Call::aux_1(1);
+	let call: module3::Call<Runtime> = module3::Call::aux_1 { _data: 1 };
 	let encoded = call.encode();
 	assert_eq!(2, encoded.len());
 	assert_eq!(vec![1, 4], encoded);
 
-	let call: module3::Call<Runtime> = module3::Call::aux_2(1, 2);
+	let call: module3::Call<Runtime> = module3::Call::aux_2 { _data: 1, _data2: 2 };
 	let encoded = call.encode();
 	assert_eq!(6, encoded.len());
 	assert_eq!(vec![2, 1, 0, 0, 0, 8], encoded);
@@ -502,13 +503,13 @@ fn call_compact_attr() {
 #[test]
 fn call_encode_is_correct_and_decode_works() {
 	use codec::{Decode, Encode};
-	let call: module3::Call<Runtime> = module3::Call::fail();
+	let call: module3::Call<Runtime> = module3::Call::fail {};
 	let encoded = call.encode();
 	assert_eq!(vec![0], encoded);
 	let decoded = module3::Call::<Runtime>::decode(&mut &encoded[..]).unwrap();
 	assert_eq!(decoded, call);
 
-	let call: module3::Call<Runtime> = module3::Call::aux_3(32, "hello".into());
+	let call: module3::Call<Runtime> = module3::Call::aux_3 { _data: 32, _data2: "hello".into() };
 	let encoded = call.encode();
 	assert_eq!(vec![3, 32, 0, 0, 0, 20, 104, 101, 108, 108, 111], encoded);
 	let decoded = module3::Call::<Runtime>::decode(&mut &encoded[..]).unwrap();
@@ -523,12 +524,12 @@ fn call_weight_should_attach_to_call_enum() {
 	};
 	// operational.
 	assert_eq!(
-		module3::Call::<Runtime>::operational().get_dispatch_info(),
+		module3::Call::<Runtime>::operational {}.get_dispatch_info(),
 		DispatchInfo { weight: 5, class: DispatchClass::Operational, pays_fee: Pays::Yes },
 	);
 	// custom basic
 	assert_eq!(
-		module3::Call::<Runtime>::aux_4().get_dispatch_info(),
+		module3::Call::<Runtime>::aux_4 {}.get_dispatch_info(),
 		DispatchInfo { weight: 3, class: DispatchClass::Normal, pays_fee: Pays::Yes },
 	);
 }
@@ -536,14 +537,14 @@ fn call_weight_should_attach_to_call_enum() {
 #[test]
 fn call_name() {
 	use frame_support::dispatch::GetCallName;
-	let name = module3::Call::<Runtime>::aux_4().get_call_name();
+	let name = module3::Call::<Runtime>::aux_4 {}.get_call_name();
 	assert_eq!("aux_4", name);
 }
 
 #[test]
 fn call_metadata() {
 	use frame_support::dispatch::{CallMetadata, GetCallMetadata};
-	let call = Call::Module3(module3::Call::<Runtime>::aux_4());
+	let call = Call::Module3(module3::Call::<Runtime>::aux_4 {});
 	let metadata = call.get_call_metadata();
 	let expected = CallMetadata { function_name: "aux_4".into(), pallet_name: "Module3".into() };
 	assert_eq!(metadata, expected);
@@ -581,10 +582,10 @@ fn get_module_names() {
 #[test]
 fn call_subtype_conversion() {
 	use frame_support::{dispatch::CallableCallFor, traits::IsSubType};
-	let call = Call::Module3(module3::Call::<Runtime>::fail());
+	let call = Call::Module3(module3::Call::<Runtime>::fail {});
 	let subcall: Option<&CallableCallFor<Module3, Runtime>> = call.is_sub_type();
 	let subcall_none: Option<&CallableCallFor<Module2, Runtime>> = call.is_sub_type();
-	assert_eq!(Some(&module3::Call::<Runtime>::fail()), subcall);
+	assert_eq!(Some(&module3::Call::<Runtime>::fail {}), subcall);
 	assert_eq!(None, subcall_none);
 
 	let from = Call::from(subcall.unwrap().clone());
@@ -593,355 +594,145 @@ fn call_subtype_conversion() {
 
 #[test]
 fn test_metadata() {
-	use frame_metadata::*;
-	let expected_metadata: RuntimeMetadataLastVersion = RuntimeMetadataLastVersion {
-		modules: DecodeDifferent::Encode(&[
-			ModuleMetadata {
-				name: DecodeDifferent::Encode("System"),
-				storage: None,
-				calls: Some(DecodeDifferent::Encode(FnEncode(|| {
-					&[FunctionMetadata {
-						name: DecodeDifferent::Encode("noop"),
-						arguments: DecodeDifferent::Encode(&[]),
-						documentation: DecodeDifferent::Encode(&[]),
-					}]
-				}))),
-				event: Some(DecodeDifferent::Encode(FnEncode(|| {
-					&[
-						EventMetadata {
-							name: DecodeDifferent::Encode("ExtrinsicSuccess"),
-							arguments: DecodeDifferent::Encode(&[]),
-							documentation: DecodeDifferent::Encode(&[]),
-						},
-						EventMetadata {
-							name: DecodeDifferent::Encode("ExtrinsicFailed"),
-							arguments: DecodeDifferent::Encode(&[]),
-							documentation: DecodeDifferent::Encode(&[]),
-						},
-						EventMetadata {
-							name: DecodeDifferent::Encode("Ignore"),
-							arguments: DecodeDifferent::Encode(&["BlockNumber"]),
-							documentation: DecodeDifferent::Encode(&[]),
-						},
-					]
-				}))),
-				constants: DecodeDifferent::Encode(FnEncode(|| &[])),
-				errors: DecodeDifferent::Encode(FnEncode(|| &[])),
-				index: 30,
-			},
-			ModuleMetadata {
-				name: DecodeDifferent::Encode("Module1_1"),
-				storage: Some(DecodeDifferent::Encode(FnEncode(|| StorageMetadata {
-					prefix: DecodeDifferent::Encode("Instance1Module"),
-					entries: DecodeDifferent::Encode(&[]),
-				}))),
-				calls: Some(DecodeDifferent::Encode(FnEncode(|| {
-					&[FunctionMetadata {
-						name: DecodeDifferent::Encode("fail"),
-						arguments: DecodeDifferent::Encode(&[]),
-						documentation: DecodeDifferent::Encode(&[]),
-					}]
-				}))),
-				event: Some(DecodeDifferent::Encode(FnEncode(|| {
-					&[EventMetadata {
-						name: DecodeDifferent::Encode("A"),
-						arguments: DecodeDifferent::Encode(&["AccountId"]),
-						documentation: DecodeDifferent::Encode(&[]),
-					}]
-				}))),
-				constants: DecodeDifferent::Encode(FnEncode(|| &[])),
-				errors: DecodeDifferent::Encode(FnEncode(|| &[])),
-				index: 31,
-			},
-			ModuleMetadata {
-				name: DecodeDifferent::Encode("Module2"),
-				storage: Some(DecodeDifferent::Encode(FnEncode(|| StorageMetadata {
-					prefix: DecodeDifferent::Encode("Module"),
-					entries: DecodeDifferent::Encode(&[]),
-				}))),
-				calls: Some(DecodeDifferent::Encode(FnEncode(|| {
-					&[FunctionMetadata {
-						name: DecodeDifferent::Encode("fail"),
-						arguments: DecodeDifferent::Encode(&[]),
-						documentation: DecodeDifferent::Encode(&[]),
-					}]
-				}))),
-				event: Some(DecodeDifferent::Encode(FnEncode(|| {
-					&[EventMetadata {
-						name: DecodeDifferent::Encode("A"),
-						arguments: DecodeDifferent::Encode(&[]),
-						documentation: DecodeDifferent::Encode(&[]),
-					}]
-				}))),
-				constants: DecodeDifferent::Encode(FnEncode(|| &[])),
-				errors: DecodeDifferent::Encode(FnEncode(|| &[])),
-				index: 32,
-			},
-			ModuleMetadata {
-				name: DecodeDifferent::Encode("Module1_2"),
-				storage: Some(DecodeDifferent::Encode(FnEncode(|| StorageMetadata {
-					prefix: DecodeDifferent::Encode("Instance2Module"),
-					entries: DecodeDifferent::Encode(&[]),
-				}))),
-				calls: Some(DecodeDifferent::Encode(FnEncode(|| {
-					&[FunctionMetadata {
-						name: DecodeDifferent::Encode("fail"),
-						arguments: DecodeDifferent::Encode(&[]),
-						documentation: DecodeDifferent::Encode(&[]),
-					}]
-				}))),
-				event: Some(DecodeDifferent::Encode(FnEncode(|| {
-					&[EventMetadata {
-						name: DecodeDifferent::Encode("A"),
-						arguments: DecodeDifferent::Encode(&["AccountId"]),
-						documentation: DecodeDifferent::Encode(&[]),
-					}]
-				}))),
-				constants: DecodeDifferent::Encode(FnEncode(|| &[])),
-				errors: DecodeDifferent::Encode(FnEncode(|| &[])),
-				index: 33,
-			},
-			ModuleMetadata {
-				name: DecodeDifferent::Encode("NestedModule3"),
-				storage: Some(DecodeDifferent::Encode(FnEncode(|| StorageMetadata {
-					prefix: DecodeDifferent::Encode("Module"),
-					entries: DecodeDifferent::Encode(&[]),
-				}))),
-				calls: Some(DecodeDifferent::Encode(FnEncode(|| {
-					&[FunctionMetadata {
-						name: DecodeDifferent::Encode("fail"),
-						arguments: DecodeDifferent::Encode(&[]),
-						documentation: DecodeDifferent::Encode(&[]),
-					}]
-				}))),
-				event: Some(DecodeDifferent::Encode(FnEncode(|| {
-					&[EventMetadata {
-						name: DecodeDifferent::Encode("A"),
-						arguments: DecodeDifferent::Encode(&[]),
-						documentation: DecodeDifferent::Encode(&[]),
-					}]
-				}))),
-				constants: DecodeDifferent::Encode(FnEncode(|| &[])),
-				errors: DecodeDifferent::Encode(FnEncode(|| &[])),
-				index: 34,
-			},
-			ModuleMetadata {
-				name: DecodeDifferent::Encode("Module3"),
-				storage: Some(DecodeDifferent::Encode(FnEncode(|| StorageMetadata {
-					prefix: DecodeDifferent::Encode("Module"),
-					entries: DecodeDifferent::Encode(&[]),
-				}))),
-				calls: Some(DecodeDifferent::Encode(FnEncode(|| {
-					&[
-						FunctionMetadata {
-							name: DecodeDifferent::Encode("fail"),
-							arguments: DecodeDifferent::Encode(&[]),
-							documentation: DecodeDifferent::Encode(&[]),
-						},
-						FunctionMetadata {
-							name: DecodeDifferent::Encode("aux_1"),
-							arguments: DecodeDifferent::Encode(&[FunctionArgumentMetadata {
-								name: DecodeDifferent::Encode("_data"),
-								ty: DecodeDifferent::Encode("Compact<u32>"),
-							}]),
-							documentation: DecodeDifferent::Encode(&[]),
-						},
-						FunctionMetadata {
-							name: DecodeDifferent::Encode("aux_2"),
-							arguments: DecodeDifferent::Encode(&[
-								FunctionArgumentMetadata {
-									name: DecodeDifferent::Encode("_data"),
-									ty: DecodeDifferent::Encode("i32"),
-								},
-								FunctionArgumentMetadata {
-									name: DecodeDifferent::Encode("_data2"),
-									ty: DecodeDifferent::Encode("Compact<u32>"),
-								},
-							]),
-							documentation: DecodeDifferent::Encode(&[]),
-						},
-						FunctionMetadata {
-							name: DecodeDifferent::Encode("aux_3"),
-							arguments: DecodeDifferent::Encode(&[
-								FunctionArgumentMetadata {
-									name: DecodeDifferent::Encode("_data"),
-									ty: DecodeDifferent::Encode("i32"),
-								},
-								FunctionArgumentMetadata {
-									name: DecodeDifferent::Encode("_data2"),
-									ty: DecodeDifferent::Encode("String"),
-								},
-							]),
-							documentation: DecodeDifferent::Encode(&[]),
-						},
-						FunctionMetadata {
-							name: DecodeDifferent::Encode("aux_4"),
-							arguments: DecodeDifferent::Encode(&[]),
-							documentation: DecodeDifferent::Encode(&[]),
-						},
-						FunctionMetadata {
-							name: DecodeDifferent::Encode("operational"),
-							arguments: DecodeDifferent::Encode(&[]),
-							documentation: DecodeDifferent::Encode(&[]),
-						},
-					]
-				}))),
-				event: Some(DecodeDifferent::Encode(FnEncode(|| {
-					&[EventMetadata {
-						name: DecodeDifferent::Encode("A"),
-						arguments: DecodeDifferent::Encode(&[]),
-						documentation: DecodeDifferent::Encode(&[]),
-					}]
-				}))),
-				constants: DecodeDifferent::Encode(FnEncode(|| &[])),
-				errors: DecodeDifferent::Encode(FnEncode(|| &[])),
-				index: 35,
-			},
-			ModuleMetadata {
-				name: DecodeDifferent::Encode("Module1_3"),
-				storage: Some(DecodeDifferent::Encode(FnEncode(|| StorageMetadata {
-					prefix: DecodeDifferent::Encode("Instance3Module"),
-					entries: DecodeDifferent::Encode(&[]),
-				}))),
-				calls: None,
-				event: None,
-				constants: DecodeDifferent::Encode(FnEncode(|| &[])),
-				errors: DecodeDifferent::Encode(FnEncode(|| &[])),
-				index: 6,
-			},
-			ModuleMetadata {
-				name: DecodeDifferent::Encode("Module1_4"),
-				storage: None,
-				calls: Some(DecodeDifferent::Encode(FnEncode(|| {
-					&[FunctionMetadata {
-						name: DecodeDifferent::Encode("fail"),
-						arguments: DecodeDifferent::Encode(&[]),
-						documentation: DecodeDifferent::Encode(&[]),
-					}]
-				}))),
-				event: None,
-				constants: DecodeDifferent::Encode(FnEncode(|| &[])),
-				errors: DecodeDifferent::Encode(FnEncode(|| &[])),
-				index: 3,
-			},
-			ModuleMetadata {
-				name: DecodeDifferent::Encode("Module1_5"),
-				storage: None,
-				calls: None,
-				event: Some(DecodeDifferent::Encode(FnEncode(|| {
-					&[EventMetadata {
-						name: DecodeDifferent::Encode("A"),
-						arguments: DecodeDifferent::Encode(&["AccountId"]),
-						documentation: DecodeDifferent::Encode(&[]),
-					}]
-				}))),
-				constants: DecodeDifferent::Encode(FnEncode(|| &[])),
-				errors: DecodeDifferent::Encode(FnEncode(|| &[])),
-				index: 4,
-			},
-			ModuleMetadata {
-				name: DecodeDifferent::Encode("Module1_6"),
-				storage: Some(DecodeDifferent::Encode(FnEncode(|| StorageMetadata {
-					prefix: DecodeDifferent::Encode("Instance6Module"),
-					entries: DecodeDifferent::Encode(&[]),
-				}))),
-				calls: Some(DecodeDifferent::Encode(FnEncode(|| {
-					&[FunctionMetadata {
-						name: DecodeDifferent::Encode("fail"),
-						arguments: DecodeDifferent::Encode(&[]),
-						documentation: DecodeDifferent::Encode(&[]),
-					}]
-				}))),
-				event: Some(DecodeDifferent::Encode(FnEncode(|| {
-					&[EventMetadata {
-						name: DecodeDifferent::Encode("A"),
-						arguments: DecodeDifferent::Encode(&["AccountId"]),
-						documentation: DecodeDifferent::Encode(&[]),
-					}]
-				}))),
-				constants: DecodeDifferent::Encode(FnEncode(|| &[])),
-				errors: DecodeDifferent::Encode(FnEncode(|| &[])),
-				index: 1,
-			},
-			ModuleMetadata {
-				name: DecodeDifferent::Encode("Module1_7"),
-				storage: Some(DecodeDifferent::Encode(FnEncode(|| StorageMetadata {
-					prefix: DecodeDifferent::Encode("Instance7Module"),
-					entries: DecodeDifferent::Encode(&[]),
-				}))),
-				calls: Some(DecodeDifferent::Encode(FnEncode(|| {
-					&[FunctionMetadata {
-						name: DecodeDifferent::Encode("fail"),
-						arguments: DecodeDifferent::Encode(&[]),
-						documentation: DecodeDifferent::Encode(&[]),
-					}]
-				}))),
-				event: Some(DecodeDifferent::Encode(FnEncode(|| {
-					&[EventMetadata {
-						name: DecodeDifferent::Encode("A"),
-						arguments: DecodeDifferent::Encode(&["AccountId"]),
-						documentation: DecodeDifferent::Encode(&[]),
-					}]
-				}))),
-				constants: DecodeDifferent::Encode(FnEncode(|| &[])),
-				errors: DecodeDifferent::Encode(FnEncode(|| &[])),
-				index: 2,
-			},
-			ModuleMetadata {
-				name: DecodeDifferent::Encode("Module1_8"),
-				storage: Some(DecodeDifferent::Encode(FnEncode(|| StorageMetadata {
-					prefix: DecodeDifferent::Encode("Instance8Module"),
-					entries: DecodeDifferent::Encode(&[]),
-				}))),
-				calls: Some(DecodeDifferent::Encode(FnEncode(|| {
-					&[FunctionMetadata {
-						name: DecodeDifferent::Encode("fail"),
-						arguments: DecodeDifferent::Encode(&[]),
-						documentation: DecodeDifferent::Encode(&[]),
-					}]
-				}))),
-				event: Some(DecodeDifferent::Encode(FnEncode(|| {
-					&[EventMetadata {
-						name: DecodeDifferent::Encode("A"),
-						arguments: DecodeDifferent::Encode(&["AccountId"]),
-						documentation: DecodeDifferent::Encode(&[]),
-					}]
-				}))),
-				constants: DecodeDifferent::Encode(FnEncode(|| &[])),
-				errors: DecodeDifferent::Encode(FnEncode(|| &[])),
-				index: 12,
-			},
-			ModuleMetadata {
-				name: DecodeDifferent::Encode("Module1_9"),
-				storage: Some(DecodeDifferent::Encode(FnEncode(|| StorageMetadata {
-					prefix: DecodeDifferent::Encode("Instance9Module"),
-					entries: DecodeDifferent::Encode(&[]),
-				}))),
-				calls: Some(DecodeDifferent::Encode(FnEncode(|| {
-					&[FunctionMetadata {
-						name: DecodeDifferent::Encode("fail"),
-						arguments: DecodeDifferent::Encode(&[]),
-						documentation: DecodeDifferent::Encode(&[]),
-					}]
-				}))),
-				event: Some(DecodeDifferent::Encode(FnEncode(|| {
-					&[EventMetadata {
-						name: DecodeDifferent::Encode("A"),
-						arguments: DecodeDifferent::Encode(&["AccountId"]),
-						documentation: DecodeDifferent::Encode(&[]),
-					}]
-				}))),
-				constants: DecodeDifferent::Encode(FnEncode(|| &[])),
-				errors: DecodeDifferent::Encode(FnEncode(|| &[])),
-				index: 13,
-			},
-		]),
-		extrinsic: ExtrinsicMetadata {
-			version: 4,
-			signed_extensions: vec![DecodeDifferent::Encode("UnitSignedExtension")],
+	use frame_support::metadata::*;
+	use scale_info::meta_type;
+
+	let pallets = vec![
+		PalletMetadata {
+			name: "System",
+			storage: None,
+			calls: Some(meta_type::<system::Call<Runtime>>().into()),
+			event: Some(meta_type::<system::Event<Runtime>>().into()),
+			constants: vec![],
+			error: None,
+			index: 30,
 		},
+		PalletMetadata {
+			name: "Module1_1",
+			storage: Some(PalletStorageMetadata { prefix: "Instance1Module", entries: vec![] }),
+			calls: Some(meta_type::<module1::Call<Runtime, module1::Instance1>>().into()),
+			event: Some(meta_type::<module1::Event<Runtime, module1::Instance1>>().into()),
+			constants: vec![],
+			error: None,
+			index: 31,
+		},
+		PalletMetadata {
+			name: "Module2",
+			storage: Some(PalletStorageMetadata { prefix: "Module", entries: vec![] }),
+			calls: Some(meta_type::<module2::Call<Runtime>>().into()),
+			event: Some(meta_type::<module2::Event>().into()),
+			constants: vec![],
+			error: None,
+			index: 32,
+		},
+		PalletMetadata {
+			name: "Module1_2",
+			storage: Some(PalletStorageMetadata { prefix: "Instance2Module", entries: vec![] }),
+			calls: Some(meta_type::<module1::Call<Runtime, module1::Instance2>>().into()),
+			event: Some(meta_type::<module1::Event<Runtime, module1::Instance2>>().into()),
+			constants: vec![],
+			error: None,
+			index: 33,
+		},
+		PalletMetadata {
+			name: "NestedModule3",
+			storage: Some(PalletStorageMetadata { prefix: "Module", entries: vec![] }),
+			calls: Some(meta_type::<nested::module3::Call<Runtime>>().into()),
+			event: Some(meta_type::<nested::module3::Event>().into()),
+			constants: vec![],
+			error: None,
+			index: 34,
+		},
+		PalletMetadata {
+			name: "Module3",
+			storage: Some(PalletStorageMetadata { prefix: "Module", entries: vec![] }),
+			calls: Some(meta_type::<module3::Call<Runtime>>().into()),
+			event: Some(meta_type::<module3::Event>().into()),
+			constants: vec![],
+			error: None,
+			index: 35,
+		},
+		PalletMetadata {
+			name: "Module1_3",
+			storage: Some(PalletStorageMetadata { prefix: "Instance3Module", entries: vec![] }),
+			calls: None,
+			event: None,
+			constants: vec![],
+			error: None,
+			index: 6,
+		},
+		PalletMetadata {
+			name: "Module1_4",
+			storage: None,
+			calls: Some(meta_type::<module1::Call<Runtime, module1::Instance4>>().into()),
+			event: None,
+			constants: vec![],
+			error: None,
+			index: 3,
+		},
+		PalletMetadata {
+			name: "Module1_5",
+			storage: None,
+			calls: None,
+			event: Some(meta_type::<module1::Event<Runtime, module1::Instance5>>().into()),
+			constants: vec![],
+			error: None,
+			index: 4,
+		},
+		PalletMetadata {
+			name: "Module1_6",
+			storage: Some(PalletStorageMetadata { prefix: "Instance6Module", entries: vec![] }),
+			calls: Some(meta_type::<module1::Call<Runtime, module1::Instance6>>().into()),
+			event: Some(meta_type::<module1::Event<Runtime, module1::Instance6>>().into()),
+			constants: vec![],
+			error: None,
+			index: 1,
+		},
+		PalletMetadata {
+			name: "Module1_7",
+			storage: Some(PalletStorageMetadata { prefix: "Instance7Module", entries: vec![] }),
+			calls: Some(meta_type::<module1::Call<Runtime, module1::Instance7>>().into()),
+			event: Some(PalletEventMetadata {
+				ty: meta_type::<module1::Event<Runtime, module1::Instance7>>(),
+			}),
+			constants: vec![],
+			error: None,
+			index: 2,
+		},
+		PalletMetadata {
+			name: "Module1_8",
+			storage: Some(PalletStorageMetadata { prefix: "Instance8Module", entries: vec![] }),
+			calls: Some(meta_type::<module1::Call<Runtime, module1::Instance8>>().into()),
+			event: Some(meta_type::<module1::Event<Runtime, module1::Instance8>>().into()),
+			constants: vec![],
+			error: None,
+			index: 12,
+		},
+		PalletMetadata {
+			name: "Module1_9",
+			storage: Some(PalletStorageMetadata { prefix: "Instance9Module", entries: vec![] }),
+			calls: Some(meta_type::<module1::Call<Runtime, module1::Instance9>>().into()),
+			event: Some(meta_type::<module1::Event<Runtime, module1::Instance9>>().into()),
+			constants: vec![],
+			error: None,
+			index: 13,
+		},
+	];
+
+	let extrinsic = ExtrinsicMetadata {
+		ty: meta_type::<UncheckedExtrinsic>(),
+		version: 4,
+		signed_extensions: vec![SignedExtensionMetadata {
+			identifier: "UnitSignedExtension",
+			ty: meta_type::<()>(),
+			additional_signed: meta_type::<()>(),
+		}],
 	};
-	pretty_assertions::assert_eq!(Runtime::metadata().1, RuntimeMetadata::V13(expected_metadata));
+
+	let expected_metadata: RuntimeMetadataPrefixed =
+		RuntimeMetadataLastVersion::new(pallets, extrinsic, meta_type::<Runtime>()).into();
+	let actual_metadata = Runtime::metadata();
+	pretty_assertions::assert_eq!(actual_metadata, expected_metadata);
 }
 
 #[test]
diff --git a/frame/support/test/tests/construct_runtime_ui/no_std_genesis_config.stderr b/frame/support/test/tests/construct_runtime_ui/no_std_genesis_config.stderr
index 6ae37ccf9b92..5bc831f58988 100644
--- a/frame/support/test/tests/construct_runtime_ui/no_std_genesis_config.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/no_std_genesis_config.stderr
@@ -36,6 +36,28 @@ help: consider importing this enum
 1  | use frame_system::RawOrigin;
    |
 
+error[E0433]: failed to resolve: use of undeclared crate or module `system`
+  --> $DIR/no_std_genesis_config.rs:13:1
+   |
+13 | / construct_runtime! {
+14 | |     pub enum Runtime where
+15 | |         Block = Block,
+16 | |         NodeBlock = Block,
+...  |
+21 | |     }
+22 | | }
+   | |_^ not found in `system`
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+help: consider importing one of these items
+   |
+1  | use frame_support_test::Pallet;
+   |
+1  | use frame_system::Pallet;
+   |
+1  | use test_pallet::Pallet;
+   |
+
 error[E0412]: cannot find type `GenesisConfig` in crate `test_pallet`
   --> $DIR/no_std_genesis_config.rs:13:1
    |
diff --git a/frame/support/test/tests/construct_runtime_ui/undefined_call_part.stderr b/frame/support/test/tests/construct_runtime_ui/undefined_call_part.stderr
index 201609b2abaf..8781fe0df201 100644
--- a/frame/support/test/tests/construct_runtime_ui/undefined_call_part.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/undefined_call_part.stderr
@@ -39,6 +39,30 @@ help: consider importing this enum
 1  | use frame_system::RawOrigin;
    |
 
+error[E0433]: failed to resolve: use of undeclared crate or module `system`
+  --> $DIR/undefined_call_part.rs:22:1
+   |
+22 | / construct_runtime! {
+23 | |     pub enum Runtime where
+24 | |         Block = Block,
+25 | |         NodeBlock = Block,
+...  |
+30 | |     }
+31 | | }
+   | |_^ not found in `system`
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+help: consider importing one of these items
+   |
+1  | use crate::pallet::Pallet;
+   |
+1  | use frame_support_test::Pallet;
+   |
+1  | use frame_system::Pallet;
+   |
+1  | use test_pallet::Pallet;
+   |
+
 error[E0277]: the trait bound `Runtime: frame_system::Config` is not satisfied
   --> $DIR/undefined_call_part.rs:20:6
    |
diff --git a/frame/support/test/tests/construct_runtime_ui/undefined_event_part.stderr b/frame/support/test/tests/construct_runtime_ui/undefined_event_part.stderr
index b68beb2b3fc6..fa837698aa64 100644
--- a/frame/support/test/tests/construct_runtime_ui/undefined_event_part.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/undefined_event_part.stderr
@@ -21,7 +21,7 @@ error[E0433]: failed to resolve: use of undeclared crate or module `system`
 28 |         System: system::{Pallet, Call, Storage, Config, Event<T>},
    |                 ^^^^^^ use of undeclared crate or module `system`
 
-error[E0433]: failed to resolve: could not find `Event` in `pallet`
+error[E0412]: cannot find type `Event` in module `pallet`
   --> $DIR/undefined_event_part.rs:22:1
    |
 22 | / construct_runtime! {
@@ -31,9 +31,13 @@ error[E0433]: failed to resolve: could not find `Event` in `pallet`
 ...  |
 30 | |     }
 31 | | }
-   | |_^ could not find `Event` in `pallet`
+   | |_^ not found in `pallet`
    |
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+help: consider importing this enum
+   |
+1  | use frame_system::Event;
+   |
 
 error[E0412]: cannot find type `Event` in module `pallet`
   --> $DIR/undefined_event_part.rs:22:1
@@ -48,12 +52,14 @@ error[E0412]: cannot find type `Event` in module `pallet`
    | |_^ not found in `pallet`
    |
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-help: consider importing this enum
+help: consider importing one of these items
+   |
+1  | use crate::Event;
    |
 1  | use frame_system::Event;
    |
 
-error[E0412]: cannot find type `Event` in module `pallet`
+error[E0433]: failed to resolve: use of undeclared crate or module `system`
   --> $DIR/undefined_event_part.rs:22:1
    |
 22 | / construct_runtime! {
@@ -63,14 +69,12 @@ error[E0412]: cannot find type `Event` in module `pallet`
 ...  |
 30 | |     }
 31 | | }
-   | |_^ not found in `pallet`
+   | |_^ not found in `system`
    |
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-help: consider importing one of these items
-   |
-1  | use crate::Event;
+help: consider importing this enum
    |
-1  | use frame_system::Event;
+1  | use frame_system::RawOrigin;
    |
 
 error[E0433]: failed to resolve: use of undeclared crate or module `system`
@@ -86,9 +90,15 @@ error[E0433]: failed to resolve: use of undeclared crate or module `system`
    | |_^ not found in `system`
    |
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-help: consider importing this enum
+help: consider importing one of these items
    |
-1  | use frame_system::RawOrigin;
+1  | use crate::pallet::Pallet;
+   |
+1  | use frame_support_test::Pallet;
+   |
+1  | use frame_system::Pallet;
+   |
+1  | use test_pallet::Pallet;
    |
 
 error[E0277]: the trait bound `Runtime: frame_system::Config` is not satisfied
diff --git a/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.stderr b/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.stderr
index 686875d83a4f..699f66a414ed 100644
--- a/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.stderr
@@ -39,6 +39,30 @@ help: consider importing this enum
 1  | use frame_system::RawOrigin;
    |
 
+error[E0433]: failed to resolve: use of undeclared crate or module `system`
+  --> $DIR/undefined_genesis_config_part.rs:22:1
+   |
+22 | / construct_runtime! {
+23 | |     pub enum Runtime where
+24 | |         Block = Block,
+25 | |         NodeBlock = Block,
+...  |
+30 | |     }
+31 | | }
+   | |_^ not found in `system`
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+help: consider importing one of these items
+   |
+1  | use crate::pallet::Pallet;
+   |
+1  | use frame_support_test::Pallet;
+   |
+1  | use frame_system::Pallet;
+   |
+1  | use test_pallet::Pallet;
+   |
+
 error[E0412]: cannot find type `GenesisConfig` in module `pallet`
   --> $DIR/undefined_genesis_config_part.rs:22:1
    |
diff --git a/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.stderr b/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.stderr
index 303819b45dd7..88ff9ee91093 100644
--- a/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.stderr
@@ -39,6 +39,30 @@ help: consider importing this enum
 1  | use frame_system::RawOrigin;
    |
 
+error[E0433]: failed to resolve: use of undeclared crate or module `system`
+  --> $DIR/undefined_inherent_part.rs:22:1
+   |
+22 | / construct_runtime! {
+23 | |     pub enum Runtime where
+24 | |         Block = Block,
+25 | |         NodeBlock = Block,
+...  |
+30 | |     }
+31 | | }
+   | |_^ not found in `system`
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+help: consider importing one of these items
+   |
+1  | use crate::pallet::Pallet;
+   |
+1  | use frame_support_test::Pallet;
+   |
+1  | use frame_system::Pallet;
+   |
+1  | use test_pallet::Pallet;
+   |
+
 error[E0277]: the trait bound `Runtime: frame_system::Config` is not satisfied
   --> $DIR/undefined_inherent_part.rs:20:6
    |
diff --git a/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.stderr b/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.stderr
index f49dcf5783e7..3b3aa75c1ea0 100644
--- a/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.stderr
@@ -77,6 +77,30 @@ help: consider importing one of these items
 1  | use frame_system::Origin;
    |
 
+error[E0433]: failed to resolve: use of undeclared crate or module `system`
+  --> $DIR/undefined_origin_part.rs:22:1
+   |
+22 | / construct_runtime! {
+23 | |     pub enum Runtime where
+24 | |         Block = Block,
+25 | |         NodeBlock = Block,
+...  |
+30 | |     }
+31 | | }
+   | |_^ not found in `system`
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+help: consider importing one of these items
+   |
+1  | use crate::pallet::Pallet;
+   |
+1  | use frame_support_test::Pallet;
+   |
+1  | use frame_system::Pallet;
+   |
+1  | use test_pallet::Pallet;
+   |
+
 error[E0277]: the trait bound `Runtime: frame_system::Config` is not satisfied
   --> $DIR/undefined_origin_part.rs:20:6
    |
diff --git a/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.stderr b/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.stderr
index 41202c3b005b..ac12c56d5c27 100644
--- a/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.stderr
@@ -39,6 +39,30 @@ help: consider importing this enum
 1  | use frame_system::RawOrigin;
    |
 
+error[E0433]: failed to resolve: use of undeclared crate or module `system`
+  --> $DIR/undefined_validate_unsigned_part.rs:22:1
+   |
+22 | / construct_runtime! {
+23 | |     pub enum Runtime where
+24 | |         Block = Block,
+25 | |         NodeBlock = Block,
+...  |
+30 | |     }
+31 | | }
+   | |_^ not found in `system`
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+help: consider importing one of these items
+   |
+1  | use crate::pallet::Pallet;
+   |
+1  | use frame_support_test::Pallet;
+   |
+1  | use frame_system::Pallet;
+   |
+1  | use test_pallet::Pallet;
+   |
+
 error[E0277]: the trait bound `Runtime: frame_system::Config` is not satisfied
   --> $DIR/undefined_validate_unsigned_part.rs:20:6
    |
diff --git a/frame/support/test/tests/decl_storage.rs b/frame/support/test/tests/decl_storage.rs
index 50c8387bca55..347a3130daa7 100644
--- a/frame/support/test/tests/decl_storage.rs
+++ b/frame/support/test/tests/decl_storage.rs
@@ -21,14 +21,17 @@
 mod tests {
 	use frame_support::metadata::*;
 	use sp_io::TestExternalities;
-	use std::marker::PhantomData;
 
 	frame_support::decl_module! {
 		pub struct Module<T: Config> for enum Call where origin: T::Origin, system=frame_support_test {}
 	}
 
 	pub trait Config: frame_support_test::Config {
-		type Origin2: codec::Codec + codec::EncodeLike + Default + codec::MaxEncodedLen;
+		type Origin2: codec::Codec
+			+ codec::EncodeLike
+			+ Default
+			+ codec::MaxEncodedLen
+			+ scale_info::TypeInfo;
 	}
 
 	frame_support::decl_storage! {
@@ -101,329 +104,265 @@ mod tests {
 		type Origin2 = u32;
 	}
 
-	const EXPECTED_METADATA: StorageMetadata = StorageMetadata {
-		prefix: DecodeDifferent::Encode("TestStorage"),
-		entries: DecodeDifferent::Encode(&[
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("U32"),
-				modifier: StorageEntryModifier::Optional,
-				ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
-				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructU32(
-					PhantomData::<TraitImpl>,
-				))),
-				documentation: DecodeDifferent::Encode(&[" Hello, this is doc!"]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("PUBU32"),
-				modifier: StorageEntryModifier::Optional,
-				ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
-				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructPUBU32(
-					PhantomData::<TraitImpl>,
-				))),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("U32MYDEF"),
-				modifier: StorageEntryModifier::Optional,
-				ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
-				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructU32MYDEF(
-					PhantomData::<TraitImpl>,
-				))),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("PUBU32MYDEF"),
-				modifier: StorageEntryModifier::Optional,
-				ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
-				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructPUBU32MYDEF(
-					PhantomData::<TraitImpl>,
-				))),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("GETU32"),
-				modifier: StorageEntryModifier::Default,
-				ty: StorageEntryType::Plain(DecodeDifferent::Encode("T::Origin2")),
-				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructGETU32(
-					PhantomData::<TraitImpl>,
-				))),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("PUBGETU32"),
-				modifier: StorageEntryModifier::Default,
-				ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
-				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructPUBGETU32(
-					PhantomData::<TraitImpl>,
-				))),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("GETU32WITHCONFIG"),
-				modifier: StorageEntryModifier::Default,
-				ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
-				default: DecodeDifferent::Encode(DefaultByteGetter(
-					&__GetByteStructGETU32WITHCONFIG(PhantomData::<TraitImpl>),
-				)),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("PUBGETU32WITHCONFIG"),
-				modifier: StorageEntryModifier::Default,
-				ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
-				default: DecodeDifferent::Encode(DefaultByteGetter(
-					&__GetByteStructPUBGETU32WITHCONFIG(PhantomData::<TraitImpl>),
-				)),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("GETU32MYDEF"),
-				modifier: StorageEntryModifier::Optional,
-				ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
-				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructGETU32MYDEF(
-					PhantomData::<TraitImpl>,
-				))),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("PUBGETU32MYDEF"),
-				modifier: StorageEntryModifier::Default,
-				ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
-				default: DecodeDifferent::Encode(DefaultByteGetter(
-					&__GetByteStructPUBGETU32MYDEF(PhantomData::<TraitImpl>),
-				)),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("GETU32WITHCONFIGMYDEF"),
-				modifier: StorageEntryModifier::Default,
-				ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
-				default: DecodeDifferent::Encode(DefaultByteGetter(
-					&__GetByteStructGETU32WITHCONFIGMYDEF(PhantomData::<TraitImpl>),
-				)),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("PUBGETU32WITHCONFIGMYDEF"),
-				modifier: StorageEntryModifier::Default,
-				ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
-				default: DecodeDifferent::Encode(DefaultByteGetter(
-					&__GetByteStructPUBGETU32WITHCONFIGMYDEF(PhantomData::<TraitImpl>),
-				)),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("PUBGETU32WITHCONFIGMYDEFOPT"),
-				modifier: StorageEntryModifier::Optional,
-				ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
-				default: DecodeDifferent::Encode(DefaultByteGetter(
-					&__GetByteStructPUBGETU32WITHCONFIGMYDEFOPT(PhantomData::<TraitImpl>),
-				)),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("GetU32WithBuilder"),
-				modifier: StorageEntryModifier::Default,
-				ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
-				default: DecodeDifferent::Encode(DefaultByteGetter(
-					&__GetByteStructGetU32WithBuilder(PhantomData::<TraitImpl>),
-				)),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("GetOptU32WithBuilderSome"),
-				modifier: StorageEntryModifier::Optional,
-				ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
-				default: DecodeDifferent::Encode(DefaultByteGetter(
-					&__GetByteStructGetOptU32WithBuilderSome(PhantomData::<TraitImpl>),
-				)),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("GetOptU32WithBuilderNone"),
-				modifier: StorageEntryModifier::Optional,
-				ty: StorageEntryType::Plain(DecodeDifferent::Encode("u32")),
-				default: DecodeDifferent::Encode(DefaultByteGetter(
-					&__GetByteStructGetOptU32WithBuilderNone(PhantomData::<TraitImpl>),
-				)),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("MAPU32"),
-				modifier: StorageEntryModifier::Optional,
-				ty: StorageEntryType::Map {
-					hasher: StorageHasher::Blake2_128Concat,
-					key: DecodeDifferent::Encode("u32"),
-					value: DecodeDifferent::Encode("[u8; 4]"),
-					unused: false,
-				},
-				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructMAPU32(
-					PhantomData::<TraitImpl>,
-				))),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("PUBMAPU32"),
-				modifier: StorageEntryModifier::Optional,
-				ty: StorageEntryType::Map {
-					hasher: StorageHasher::Blake2_128Concat,
-					key: DecodeDifferent::Encode("u32"),
-					value: DecodeDifferent::Encode("[u8; 4]"),
-					unused: false,
-				},
-				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructPUBMAPU32(
-					PhantomData::<TraitImpl>,
-				))),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("GETMAPU32"),
-				modifier: StorageEntryModifier::Default,
-				ty: StorageEntryType::Map {
-					hasher: StorageHasher::Blake2_128Concat,
-					key: DecodeDifferent::Encode("u32"),
-					value: DecodeDifferent::Encode("[u8; 4]"),
-					unused: false,
-				},
-				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructGETMAPU32(
-					PhantomData::<TraitImpl>,
-				))),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("PUBGETMAPU32"),
-				modifier: StorageEntryModifier::Default,
-				ty: StorageEntryType::Map {
-					hasher: StorageHasher::Blake2_128Concat,
-					key: DecodeDifferent::Encode("u32"),
-					value: DecodeDifferent::Encode("[u8; 4]"),
-					unused: false,
-				},
-				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructPUBGETMAPU32(
-					PhantomData::<TraitImpl>,
-				))),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("GETMAPU32MYDEF"),
-				modifier: StorageEntryModifier::Default,
-				ty: StorageEntryType::Map {
-					hasher: StorageHasher::Blake2_128Concat,
-					key: DecodeDifferent::Encode("u32"),
-					value: DecodeDifferent::Encode("[u8; 4]"),
-					unused: false,
-				},
-				default: DecodeDifferent::Encode(DefaultByteGetter(
-					&__GetByteStructGETMAPU32MYDEF(PhantomData::<TraitImpl>),
-				)),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("PUBGETMAPU32MYDEF"),
-				modifier: StorageEntryModifier::Default,
-				ty: StorageEntryType::Map {
-					hasher: StorageHasher::Blake2_128Concat,
-					key: DecodeDifferent::Encode("u32"),
-					value: DecodeDifferent::Encode("[u8; 4]"),
-					unused: false,
-				},
-				default: DecodeDifferent::Encode(DefaultByteGetter(
-					&__GetByteStructPUBGETMAPU32MYDEF(PhantomData::<TraitImpl>),
-				)),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("DOUBLEMAP"),
-				modifier: StorageEntryModifier::Optional,
-				ty: StorageEntryType::DoubleMap {
-					hasher: StorageHasher::Blake2_128Concat,
-					key1: DecodeDifferent::Encode("u32"),
-					key2: DecodeDifferent::Encode("u32"),
-					value: DecodeDifferent::Encode("[u8; 4]"),
-					key2_hasher: StorageHasher::Blake2_128Concat,
-				},
-				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructDOUBLEMAP(
-					PhantomData::<TraitImpl>,
-				))),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("DOUBLEMAP2"),
-				modifier: StorageEntryModifier::Optional,
-				ty: StorageEntryType::DoubleMap {
-					hasher: StorageHasher::Blake2_128Concat,
-					key1: DecodeDifferent::Encode("u32"),
-					key2: DecodeDifferent::Encode("u32"),
-					value: DecodeDifferent::Encode("[u8; 4]"),
-					key2_hasher: StorageHasher::Blake2_128Concat,
-				},
-				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructDOUBLEMAP2(
-					PhantomData::<TraitImpl>,
-				))),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("COMPLEXTYPE1"),
-				modifier: StorageEntryModifier::Default,
-				ty: StorageEntryType::Plain(DecodeDifferent::Encode(
-					"(::std::option::Option<T::Origin2>,)",
-				)),
-				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructCOMPLEXTYPE1(
-					PhantomData::<TraitImpl>,
-				))),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("COMPLEXTYPE2"),
-				modifier: StorageEntryModifier::Default,
-				ty: StorageEntryType::Plain(DecodeDifferent::Encode(
-					"([[(u16, Option<()>); 32]; 12], u32)",
-				)),
-				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructCOMPLEXTYPE2(
-					PhantomData::<TraitImpl>,
-				))),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("COMPLEXTYPE3"),
-				modifier: StorageEntryModifier::Default,
-				ty: StorageEntryType::Plain(DecodeDifferent::Encode("[u32; 25]")),
-				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructCOMPLEXTYPE3(
-					PhantomData::<TraitImpl>,
-				))),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("NMAP"),
-				modifier: StorageEntryModifier::Default,
-				ty: StorageEntryType::NMap {
-					keys: DecodeDifferent::Encode(&["u32", "u16"]),
-					hashers: DecodeDifferent::Encode(&[
-						StorageHasher::Blake2_128Concat,
-						StorageHasher::Twox64Concat,
-					]),
-					value: DecodeDifferent::Encode("u8"),
-				},
-				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructNMAP(
-					PhantomData::<TraitImpl>,
-				))),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-			StorageEntryMetadata {
-				name: DecodeDifferent::Encode("NMAP2"),
-				modifier: StorageEntryModifier::Default,
-				ty: StorageEntryType::NMap {
-					keys: DecodeDifferent::Encode(&["u32"]),
-					hashers: DecodeDifferent::Encode(&[StorageHasher::Blake2_128Concat]),
-					value: DecodeDifferent::Encode("u8"),
-				},
-				default: DecodeDifferent::Encode(DefaultByteGetter(&__GetByteStructNMAP(
-					PhantomData::<TraitImpl>,
-				))),
-				documentation: DecodeDifferent::Encode(&[]),
-			},
-		]),
-	};
+	fn expected_metadata() -> PalletStorageMetadata {
+		PalletStorageMetadata {
+			prefix: "TestStorage",
+			entries: vec![
+				StorageEntryMetadata {
+					name: "U32",
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::Plain(scale_info::meta_type::<u32>()),
+					default: vec![0],
+					docs: vec![" Hello, this is doc!"],
+				},
+				StorageEntryMetadata {
+					name: "PUBU32",
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::Plain(scale_info::meta_type::<u32>()),
+					default: vec![0],
+					docs: vec![],
+				},
+				StorageEntryMetadata {
+					name: "U32MYDEF",
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::Plain(scale_info::meta_type::<u32>()),
+					default: vec![0],
+					docs: vec![],
+				},
+				StorageEntryMetadata {
+					name: "PUBU32MYDEF",
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::Plain(scale_info::meta_type::<u32>()),
+					default: vec![0],
+					docs: vec![],
+				},
+				StorageEntryMetadata {
+					name: "GETU32",
+					modifier: StorageEntryModifier::Default,
+					ty: StorageEntryType::Plain(scale_info::meta_type::<u32>()),
+					default: vec![0, 0, 0, 0],
+					docs: vec![],
+				},
+				StorageEntryMetadata {
+					name: "PUBGETU32",
+					modifier: StorageEntryModifier::Default,
+					ty: StorageEntryType::Plain(scale_info::meta_type::<u32>()),
+					default: vec![0, 0, 0, 0],
+					docs: vec![],
+				},
+				StorageEntryMetadata {
+					name: "GETU32WITHCONFIG",
+					modifier: StorageEntryModifier::Default,
+					ty: StorageEntryType::Plain(scale_info::meta_type::<u32>()),
+					default: vec![0, 0, 0, 0],
+					docs: vec![],
+				},
+				StorageEntryMetadata {
+					name: "PUBGETU32WITHCONFIG",
+					modifier: StorageEntryModifier::Default,
+					ty: StorageEntryType::Plain(scale_info::meta_type::<u32>()),
+					default: vec![0, 0, 0, 0],
+					docs: vec![],
+				},
+				StorageEntryMetadata {
+					name: "GETU32MYDEF",
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::Plain(scale_info::meta_type::<u32>()),
+					default: vec![0],
+					docs: vec![],
+				},
+				StorageEntryMetadata {
+					name: "PUBGETU32MYDEF",
+					modifier: StorageEntryModifier::Default,
+					ty: StorageEntryType::Plain(scale_info::meta_type::<u32>()),
+					default: vec![3, 0, 0, 0],
+					docs: vec![],
+				},
+				StorageEntryMetadata {
+					name: "GETU32WITHCONFIGMYDEF",
+					modifier: StorageEntryModifier::Default,
+					ty: StorageEntryType::Plain(scale_info::meta_type::<u32>()),
+					default: vec![2, 0, 0, 0],
+					docs: vec![],
+				},
+				StorageEntryMetadata {
+					name: "PUBGETU32WITHCONFIGMYDEF",
+					modifier: StorageEntryModifier::Default,
+					ty: StorageEntryType::Plain(scale_info::meta_type::<u32>()),
+					default: vec![1, 0, 0, 0],
+					docs: vec![],
+				},
+				StorageEntryMetadata {
+					name: "PUBGETU32WITHCONFIGMYDEFOPT",
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::Plain(scale_info::meta_type::<u32>()),
+					default: vec![0],
+					docs: vec![],
+				},
+				StorageEntryMetadata {
+					name: "GetU32WithBuilder",
+					modifier: StorageEntryModifier::Default,
+					ty: StorageEntryType::Plain(scale_info::meta_type::<u32>()),
+					default: vec![0, 0, 0, 0],
+					docs: vec![],
+				},
+				StorageEntryMetadata {
+					name: "GetOptU32WithBuilderSome",
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::Plain(scale_info::meta_type::<u32>()),
+					default: vec![0],
+					docs: vec![],
+				},
+				StorageEntryMetadata {
+					name: "GetOptU32WithBuilderNone",
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::Plain(scale_info::meta_type::<u32>()),
+					default: vec![0],
+					docs: vec![],
+				},
+				StorageEntryMetadata {
+					name: "MAPU32",
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::Map {
+						hashers: vec![StorageHasher::Blake2_128Concat],
+						key: scale_info::meta_type::<u32>(),
+						value: scale_info::meta_type::<[u8; 4]>(),
+					},
+					default: vec![0],
+					docs: vec![],
+				},
+				StorageEntryMetadata {
+					name: "PUBMAPU32",
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::Map {
+						hashers: vec![StorageHasher::Blake2_128Concat],
+						key: scale_info::meta_type::<u32>(),
+						value: scale_info::meta_type::<[u8; 4]>(),
+					},
+					default: vec![0],
+					docs: vec![],
+				},
+				StorageEntryMetadata {
+					name: "GETMAPU32",
+					modifier: StorageEntryModifier::Default,
+					ty: StorageEntryType::Map {
+						hashers: vec![StorageHasher::Blake2_128Concat],
+						key: scale_info::meta_type::<u32>(),
+						value: scale_info::meta_type::<[u8; 4]>(),
+					},
+					default: vec![0, 0, 0, 0],
+					docs: vec![],
+				},
+				StorageEntryMetadata {
+					name: "PUBGETMAPU32",
+					modifier: StorageEntryModifier::Default,
+					ty: StorageEntryType::Map {
+						hashers: vec![StorageHasher::Blake2_128Concat],
+						key: scale_info::meta_type::<u32>(),
+						value: scale_info::meta_type::<[u8; 4]>(),
+					},
+					default: vec![0, 0, 0, 0],
+					docs: vec![],
+				},
+				StorageEntryMetadata {
+					name: "GETMAPU32MYDEF",
+					modifier: StorageEntryModifier::Default,
+					ty: StorageEntryType::Map {
+						hashers: vec![StorageHasher::Blake2_128Concat],
+						key: scale_info::meta_type::<u32>(),
+						value: scale_info::meta_type::<[u8; 4]>(),
+					},
+					default: vec![109, 97, 112, 100], // "map"
+					docs: vec![],
+				},
+				StorageEntryMetadata {
+					name: "PUBGETMAPU32MYDEF",
+					modifier: StorageEntryModifier::Default,
+					ty: StorageEntryType::Map {
+						hashers: vec![StorageHasher::Blake2_128Concat],
+						key: scale_info::meta_type::<u32>(),
+						value: scale_info::meta_type::<[u8; 4]>(),
+					},
+					default: vec![112, 117, 98, 109], // "pubmap"
+					docs: vec![],
+				},
+				StorageEntryMetadata {
+					name: "DOUBLEMAP",
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::Map {
+						hashers: vec![
+							StorageHasher::Blake2_128Concat,
+							StorageHasher::Blake2_128Concat,
+						],
+						key: scale_info::meta_type::<(u32, u32)>(),
+						value: scale_info::meta_type::<[u8; 4]>(),
+					},
+					default: vec![0],
+					docs: vec![],
+				},
+				StorageEntryMetadata {
+					name: "DOUBLEMAP2",
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::Map {
+						hashers: vec![
+							StorageHasher::Blake2_128Concat,
+							StorageHasher::Blake2_128Concat,
+						],
+						key: scale_info::meta_type::<(u32, u32)>(),
+						value: scale_info::meta_type::<[u8; 4]>(),
+					},
+					default: vec![0],
+					docs: vec![],
+				},
+				StorageEntryMetadata {
+					name: "COMPLEXTYPE1",
+					modifier: StorageEntryModifier::Default,
+					ty: StorageEntryType::Plain(scale_info::meta_type::<(Option<u32>,)>()),
+					default: vec![0],
+					docs: vec![],
+				},
+				StorageEntryMetadata {
+					name: "COMPLEXTYPE2",
+					modifier: StorageEntryModifier::Default,
+					ty: StorageEntryType::Plain(scale_info::meta_type::<(
+						[[(u16, Option<()>); 32]; 12],
+						u32,
+					)>()),
+					default: [0u8; 1156].to_vec(),
+					docs: vec![],
+				},
+				StorageEntryMetadata {
+					name: "COMPLEXTYPE3",
+					modifier: StorageEntryModifier::Default,
+					ty: StorageEntryType::Plain(scale_info::meta_type::<[u32; 25]>()),
+					default: [0u8; 100].to_vec(),
+					docs: vec![],
+				},
+				StorageEntryMetadata {
+					name: "NMAP",
+					modifier: StorageEntryModifier::Default,
+					ty: StorageEntryType::Map {
+						key: scale_info::meta_type::<(u32, u16)>(),
+						hashers: vec![StorageHasher::Blake2_128Concat, StorageHasher::Twox64Concat],
+						value: scale_info::meta_type::<u8>(),
+					},
+					default: vec![0],
+					docs: vec![],
+				},
+				StorageEntryMetadata {
+					name: "NMAP2",
+					modifier: StorageEntryModifier::Default,
+					ty: StorageEntryType::Map {
+						key: scale_info::meta_type::<u32>(),
+						hashers: vec![StorageHasher::Blake2_128Concat],
+						value: scale_info::meta_type::<u8>(),
+					},
+					default: vec![0],
+					docs: vec![],
+				},
+			],
+		}
+	}
 
 	#[test]
 	fn storage_info() {
@@ -645,7 +584,7 @@ mod tests {
 	#[test]
 	fn store_metadata() {
 		let metadata = Module::<TraitImpl>::storage_metadata();
-		pretty_assertions::assert_eq!(EXPECTED_METADATA, metadata);
+		pretty_assertions::assert_eq!(expected_metadata(), metadata);
 	}
 
 	#[test]
@@ -790,7 +729,7 @@ mod test_append_and_len {
 		pub struct Module<T: Config> for enum Call where origin: T::Origin, system=frame_support_test {}
 	}
 
-	#[derive(PartialEq, Eq, Clone, Encode, Decode)]
+	#[derive(PartialEq, Eq, Clone, Encode, Decode, scale_info::TypeInfo)]
 	struct NoDef(u32);
 
 	frame_support::decl_storage! {
diff --git a/frame/support/test/tests/instance.rs b/frame/support/test/tests/instance.rs
index a948853ff2a4..809edae14f80 100644
--- a/frame/support/test/tests/instance.rs
+++ b/frame/support/test/tests/instance.rs
@@ -21,13 +21,14 @@ use codec::{Codec, Decode, Encode, EncodeLike};
 use frame_support::{
 	inherent::{InherentData, InherentIdentifier, MakeFatalError, ProvideInherent},
 	metadata::{
-		DecodeDifferent, DefaultByteGetter, StorageEntryMetadata, StorageEntryModifier,
-		StorageEntryType, StorageHasher, StorageMetadata,
+		PalletStorageMetadata, StorageEntryMetadata, StorageEntryModifier, StorageEntryType,
+		StorageHasher,
 	},
 	parameter_types,
 	traits::Get,
 	Parameter, StorageDoubleMap, StorageMap, StorageValue,
 };
+use scale_info::TypeInfo;
 use sp_core::{sr25519, H256};
 use sp_runtime::{
 	generic,
@@ -53,7 +54,7 @@ mod module1 {
 		type Event: From<Event<Self, I>> + Into<<Self as system::Config>::Event>;
 		type Origin: From<Origin<Self, I>>;
 		type SomeParameter: Get<u32>;
-		type GenericType: Default + Clone + Codec + EncodeLike;
+		type GenericType: Default + Clone + Codec + EncodeLike + TypeInfo;
 	}
 
 	frame_support::decl_module! {
@@ -108,7 +109,7 @@ mod module1 {
 		}
 	}
 
-	#[derive(PartialEq, Eq, Clone, sp_runtime::RuntimeDebug, Encode, Decode)]
+	#[derive(PartialEq, Eq, Clone, sp_runtime::RuntimeDebug, Encode, Decode, TypeInfo)]
 	pub enum Origin<T: Config<I>, I>
 	where
 		T::BlockNumber: From<u32>,
@@ -181,7 +182,7 @@ mod module2 {
 		}
 	}
 
-	#[derive(PartialEq, Eq, Clone, sp_runtime::RuntimeDebug, Encode, Decode)]
+	#[derive(PartialEq, Eq, Clone, sp_runtime::RuntimeDebug, Encode, Decode, TypeInfo)]
 	pub enum Origin<T: Config<I>, I = DefaultInstance> {
 		Members(u32),
 		_Phantom(std::marker::PhantomData<(T, I)>),
@@ -410,54 +411,45 @@ fn storage_with_instance_basic_operation() {
 	});
 }
 
-const EXPECTED_METADATA: StorageMetadata = StorageMetadata {
-	prefix: DecodeDifferent::Encode("Instance2Module2"),
-	entries: DecodeDifferent::Encode(&[
-		StorageEntryMetadata {
-			name: DecodeDifferent::Encode("Value"),
-			modifier: StorageEntryModifier::Default,
-			ty: StorageEntryType::Plain(DecodeDifferent::Encode("T::Amount")),
-			default: DecodeDifferent::Encode(DefaultByteGetter(&module2::__GetByteStructValue(
-				std::marker::PhantomData::<(Runtime, module2::Instance2)>,
-			))),
-			documentation: DecodeDifferent::Encode(&[]),
-		},
-		StorageEntryMetadata {
-			name: DecodeDifferent::Encode("Map"),
-			modifier: StorageEntryModifier::Default,
-			ty: StorageEntryType::Map {
-				hasher: StorageHasher::Identity,
-				key: DecodeDifferent::Encode("u64"),
-				value: DecodeDifferent::Encode("u64"),
-				unused: false,
+fn expected_metadata() -> PalletStorageMetadata {
+	PalletStorageMetadata {
+		prefix: "Instance2Module2",
+		entries: vec![
+			StorageEntryMetadata {
+				name: "Value",
+				modifier: StorageEntryModifier::Default,
+				ty: StorageEntryType::Plain(scale_info::meta_type::<u32>()),
+				default: vec![0, 0, 0, 0],
+				docs: vec![],
 			},
-			default: DecodeDifferent::Encode(DefaultByteGetter(&module2::__GetByteStructMap(
-				std::marker::PhantomData::<(Runtime, module2::Instance2)>,
-			))),
-			documentation: DecodeDifferent::Encode(&[]),
-		},
-		StorageEntryMetadata {
-			name: DecodeDifferent::Encode("DoubleMap"),
-			modifier: StorageEntryModifier::Default,
-			ty: StorageEntryType::DoubleMap {
-				hasher: StorageHasher::Identity,
-				key2_hasher: StorageHasher::Identity,
-				key1: DecodeDifferent::Encode("u64"),
-				key2: DecodeDifferent::Encode("u64"),
-				value: DecodeDifferent::Encode("u64"),
+			StorageEntryMetadata {
+				name: "Map",
+				modifier: StorageEntryModifier::Default,
+				ty: StorageEntryType::Map {
+					hashers: vec![StorageHasher::Identity],
+					key: scale_info::meta_type::<u64>(),
+					value: scale_info::meta_type::<u64>(),
+				},
+				default: [0u8; 8].to_vec(),
+				docs: vec![],
 			},
-			default: DecodeDifferent::Encode(DefaultByteGetter(
-				&module2::__GetByteStructDoubleMap(
-					std::marker::PhantomData::<(Runtime, module2::Instance2)>,
-				),
-			)),
-			documentation: DecodeDifferent::Encode(&[]),
-		},
-	]),
-};
+			StorageEntryMetadata {
+				name: "DoubleMap",
+				modifier: StorageEntryModifier::Default,
+				ty: StorageEntryType::Map {
+					hashers: vec![StorageHasher::Identity, StorageHasher::Identity],
+					key: scale_info::meta_type::<(u64, u64)>(),
+					value: scale_info::meta_type::<u64>(),
+				},
+				default: [0u8; 8].to_vec(),
+				docs: vec![],
+			},
+		],
+	}
+}
 
 #[test]
 fn test_instance_storage_metadata() {
 	let metadata = Module2_2::storage_metadata();
-	pretty_assertions::assert_eq!(EXPECTED_METADATA, metadata);
+	pretty_assertions::assert_eq!(expected_metadata(), metadata);
 }
diff --git a/frame/support/test/tests/issue2219.rs b/frame/support/test/tests/issue2219.rs
index 17eebf2d1022..68ad2a50a21b 100644
--- a/frame/support/test/tests/issue2219.rs
+++ b/frame/support/test/tests/issue2219.rs
@@ -17,6 +17,7 @@
 
 use frame_support::{
 	codec::{Decode, Encode},
+	scale_info::TypeInfo,
 	sp_runtime::{
 		generic,
 		traits::{BlakeTwo256, Verify},
@@ -34,12 +35,12 @@ mod module {
 		(<T as system::Config>::AccountId, Role, <T as system::Config>::BlockNumber);
 	pub type Requests<T> = Vec<Request<T>>;
 
-	#[derive(Encode, Decode, Copy, Clone, Eq, PartialEq, Debug)]
+	#[derive(Encode, Decode, Copy, Clone, Eq, PartialEq, Debug, TypeInfo)]
 	pub enum Role {
 		Storage,
 	}
 
-	#[derive(Encode, Decode, Copy, Clone, Eq, PartialEq, Debug)]
+	#[derive(Encode, Decode, Copy, Clone, Eq, PartialEq, Debug, TypeInfo)]
 	pub struct RoleParameters<T: Config> {
 		// minimum actors to maintain - if role is unstaking
 		// and remaining actors would be less that this value - prevent or punish for unstaking
@@ -82,7 +83,7 @@ mod module {
 		}
 	}
 
-	pub trait Config: system::Config {}
+	pub trait Config: system::Config + TypeInfo {}
 
 	frame_support::decl_module! {
 		pub struct Module<T: Config> for enum Call where origin: T::Origin, system=system {}
diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index 80bae000b6c7..2874ef6bd768 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -24,6 +24,7 @@ use frame_support::{
 	},
 	weights::{DispatchClass, DispatchInfo, GetDispatchInfo, Pays, RuntimeDbWeight},
 };
+use scale_info::{meta_type, TypeInfo};
 use sp_io::{
 	hashing::{blake2_128, twox_128, twox_64},
 	TestExternalities,
@@ -80,14 +81,14 @@ impl From<SomeType7> for u64 {
 }
 
 pub trait SomeAssociation1 {
-	type _1: Parameter + codec::MaxEncodedLen;
+	type _1: Parameter + codec::MaxEncodedLen + TypeInfo;
 }
 impl SomeAssociation1 for u64 {
 	type _1 = u64;
 }
 
 pub trait SomeAssociation2 {
-	type _2: Parameter + codec::MaxEncodedLen;
+	type _2: Parameter + codec::MaxEncodedLen + TypeInfo;
 }
 impl SomeAssociation2 for u64 {
 	type _2 = u64;
@@ -101,6 +102,7 @@ pub mod pallet {
 	};
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
+	use scale_info::TypeInfo;
 
 	type BalanceOf<T> = <T as Config>::Balance;
 
@@ -124,7 +126,7 @@ pub mod pallet {
 		#[pallet::constant]
 		type MyGetParam3: Get<<Self::AccountId as SomeAssociation1>::_1>;
 
-		type Balance: Parameter + Default;
+		type Balance: Parameter + Default + TypeInfo;
 
 		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
 	}
@@ -228,7 +230,6 @@ pub mod pallet {
 	}
 
 	#[pallet::event]
-	#[pallet::metadata(BalanceOf<T> = "Balance", u32 = "Other")]
 	#[pallet::generate_deposit(fn deposit_event)]
 	pub enum Event<T: Config>
 	where
@@ -340,7 +341,9 @@ pub mod pallet {
 	}
 
 	#[pallet::origin]
-	#[derive(EqNoBound, RuntimeDebugNoBound, CloneNoBound, PartialEqNoBound, Encode, Decode)]
+	#[derive(
+		EqNoBound, RuntimeDebugNoBound, CloneNoBound, PartialEqNoBound, Encode, Decode, TypeInfo,
+	)]
 	pub struct Origin<T>(PhantomData<T>);
 
 	#[pallet::validate_unsigned]
@@ -352,7 +355,7 @@ pub mod pallet {
 		fn validate_unsigned(_source: TransactionSource, call: &Self::Call) -> TransactionValidity {
 			T::AccountId::from(SomeType1); // Test for where clause
 			T::AccountId::from(SomeType5); // Test for where clause
-			if matches!(call, Call::foo_transactional(_)) {
+			if matches!(call, Call::foo_transactional { .. }) {
 				return Ok(ValidTransaction::default())
 			}
 			Err(TransactionValidityError::Invalid(InvalidTransaction::Call))
@@ -372,18 +375,18 @@ pub mod pallet {
 		fn create_inherent(_data: &InherentData) -> Option<Self::Call> {
 			T::AccountId::from(SomeType1); // Test for where clause
 			T::AccountId::from(SomeType6); // Test for where clause
-			Some(Call::foo_no_post_info())
+			Some(Call::foo_no_post_info {})
 		}
 
 		fn is_inherent(call: &Self::Call) -> bool {
-			matches!(call, Call::foo_no_post_info() | Call::foo(..))
+			matches!(call, Call::foo_no_post_info {} | Call::foo { .. })
 		}
 
 		fn check_inherent(call: &Self::Call, _: &InherentData) -> Result<(), Self::Error> {
 			match call {
-				Call::foo_no_post_info() => Ok(()),
-				Call::foo(0, 0) => Err(InherentError::Fatal),
-				Call::foo(..) => Ok(()),
+				Call::foo_no_post_info {} => Ok(()),
+				Call::foo { foo: 0, bar: 0 } => Err(InherentError::Fatal),
+				Call::foo { .. } => Ok(()),
 				_ => unreachable!("other calls are not inherents"),
 			}
 		}
@@ -550,13 +553,13 @@ fn transactional_works() {
 	TestExternalities::default().execute_with(|| {
 		frame_system::Pallet::<Runtime>::set_block_number(1);
 
-		pallet::Call::<Runtime>::foo_transactional(0)
+		pallet::Call::<Runtime>::foo_transactional { foo: 0 }
 			.dispatch_bypass_filter(None.into())
 			.err()
 			.unwrap();
 		assert!(frame_system::Pallet::<Runtime>::events().is_empty());
 
-		pallet::Call::<Runtime>::foo_transactional(1)
+		pallet::Call::<Runtime>::foo_transactional { foo: 1 }
 			.dispatch_bypass_filter(None.into())
 			.unwrap();
 		assert_eq!(
@@ -571,7 +574,7 @@ fn transactional_works() {
 
 #[test]
 fn call_expand() {
-	let call_foo = pallet::Call::<Runtime>::foo(3, 0);
+	let call_foo = pallet::Call::<Runtime>::foo { foo: 3, bar: 0 };
 	assert_eq!(
 		call_foo.get_dispatch_info(),
 		DispatchInfo { weight: 3, class: DispatchClass::Normal, pays_fee: Pays::Yes }
@@ -620,7 +623,7 @@ fn inherent_expand() {
 	let inherents = InherentData::new().create_extrinsics();
 
 	let expected = vec![UncheckedExtrinsic {
-		function: Call::Example(pallet::Call::foo_no_post_info()),
+		function: Call::Example(pallet::Call::foo_no_post_info {}),
 		signature: None,
 	}];
 	assert_eq!(expected, inherents);
@@ -635,11 +638,11 @@ fn inherent_expand() {
 		),
 		vec![
 			UncheckedExtrinsic {
-				function: Call::Example(pallet::Call::foo_no_post_info()),
+				function: Call::Example(pallet::Call::foo_no_post_info {}),
 				signature: None,
 			},
 			UncheckedExtrinsic {
-				function: Call::Example(pallet::Call::foo(1, 0)),
+				function: Call::Example(pallet::Call::foo { foo: 1, bar: 0 }),
 				signature: None,
 			},
 		],
@@ -657,11 +660,11 @@ fn inherent_expand() {
 		),
 		vec![
 			UncheckedExtrinsic {
-				function: Call::Example(pallet::Call::foo_no_post_info()),
+				function: Call::Example(pallet::Call::foo_no_post_info {}),
 				signature: None,
 			},
 			UncheckedExtrinsic {
-				function: Call::Example(pallet::Call::foo(0, 0)),
+				function: Call::Example(pallet::Call::foo { foo: 0, bar: 0 }),
 				signature: None,
 			},
 		],
@@ -678,7 +681,7 @@ fn inherent_expand() {
 			Digest::default(),
 		),
 		vec![UncheckedExtrinsic {
-			function: Call::Example(pallet::Call::foo_transactional(0)),
+			function: Call::Example(pallet::Call::foo_transactional { foo: 0 }),
 			signature: None,
 		}],
 	);
@@ -696,7 +699,7 @@ fn inherent_expand() {
 			Digest::default(),
 		),
 		vec![UncheckedExtrinsic {
-			function: Call::Example(pallet::Call::foo_no_post_info()),
+			function: Call::Example(pallet::Call::foo_no_post_info {}),
 			signature: Some((1, (), ())),
 		}],
 	);
@@ -715,11 +718,11 @@ fn inherent_expand() {
 		),
 		vec![
 			UncheckedExtrinsic {
-				function: Call::Example(pallet::Call::foo(1, 1)),
+				function: Call::Example(pallet::Call::foo { foo: 1, bar: 1 }),
 				signature: None,
 			},
 			UncheckedExtrinsic {
-				function: Call::Example(pallet::Call::foo_transactional(0)),
+				function: Call::Example(pallet::Call::foo_transactional { foo: 0 }),
 				signature: None,
 			},
 		],
@@ -737,15 +740,15 @@ fn inherent_expand() {
 		),
 		vec![
 			UncheckedExtrinsic {
-				function: Call::Example(pallet::Call::foo(1, 1)),
+				function: Call::Example(pallet::Call::foo { foo: 1, bar: 1 }),
 				signature: None,
 			},
 			UncheckedExtrinsic {
-				function: Call::Example(pallet::Call::foo_transactional(0)),
+				function: Call::Example(pallet::Call::foo_transactional { foo: 0 }),
 				signature: None,
 			},
 			UncheckedExtrinsic {
-				function: Call::Example(pallet::Call::foo_no_post_info()),
+				function: Call::Example(pallet::Call::foo_no_post_info {}),
 				signature: None,
 			},
 		],
@@ -763,15 +766,15 @@ fn inherent_expand() {
 		),
 		vec![
 			UncheckedExtrinsic {
-				function: Call::Example(pallet::Call::foo(1, 1)),
+				function: Call::Example(pallet::Call::foo { foo: 1, bar: 1 }),
 				signature: None,
 			},
 			UncheckedExtrinsic {
-				function: Call::Example(pallet::Call::foo(1, 0)),
+				function: Call::Example(pallet::Call::foo { foo: 1, bar: 0 }),
 				signature: Some((1, (), ())),
 			},
 			UncheckedExtrinsic {
-				function: Call::Example(pallet::Call::foo_no_post_info()),
+				function: Call::Example(pallet::Call::foo_no_post_info {}),
 				signature: None,
 			},
 		],
@@ -786,12 +789,12 @@ fn validate_unsigned_expand() {
 		InvalidTransaction, TransactionSource, TransactionValidityError, ValidTransaction,
 		ValidateUnsigned,
 	};
-	let call = pallet::Call::<Runtime>::foo_no_post_info();
+	let call = pallet::Call::<Runtime>::foo_no_post_info {};
 
 	let validity = pallet::Pallet::validate_unsigned(TransactionSource::Local, &call).unwrap_err();
 	assert_eq!(validity, TransactionValidityError::Invalid(InvalidTransaction::Call));
 
-	let call = pallet::Call::<Runtime>::foo_transactional(0);
+	let call = pallet::Call::<Runtime>::foo_transactional { foo: 0 };
 
 	let validity = pallet::Pallet::validate_unsigned(TransactionSource::External, &call).unwrap();
 	assert_eq!(validity, ValidTransaction::default());
@@ -810,7 +813,9 @@ fn trait_store_expand() {
 fn pallet_expand_deposit_event() {
 	TestExternalities::default().execute_with(|| {
 		frame_system::Pallet::<Runtime>::set_block_number(1);
-		pallet::Call::<Runtime>::foo(3, 0).dispatch_bypass_filter(None.into()).unwrap();
+		pallet::Call::<Runtime>::foo { foo: 3, bar: 0 }
+			.dispatch_bypass_filter(None.into())
+			.unwrap();
 		assert_eq!(
 			frame_system::Pallet::<Runtime>::events()[0].event,
 			Event::Example(pallet::Event::Something(3)),
@@ -818,6 +823,11 @@ fn pallet_expand_deposit_event() {
 	})
 }
 
+#[test]
+fn pallet_new_call_variant() {
+	Call::Example(pallet::Call::new_call_variant_foo(3, 4));
+}
+
 #[test]
 fn storage_expand() {
 	use frame_support::{pallet_prelude::*, storage::StoragePrefixedMap};
@@ -969,288 +979,478 @@ fn migrate_from_pallet_version_to_storage_version() {
 
 #[test]
 fn metadata() {
-	use codec::{Decode, Encode};
-	use frame_metadata::*;
-
-	let expected_pallet_metadata = ModuleMetadata {
-		index: 1,
-		name: DecodeDifferent::Decoded("Example".to_string()),
-		storage: Some(DecodeDifferent::Decoded(StorageMetadata {
-			prefix: DecodeDifferent::Decoded("Example".to_string()),
-			entries: DecodeDifferent::Decoded(vec![
-				StorageEntryMetadata {
-					name: DecodeDifferent::Decoded("ValueWhereClause".to_string()),
-					modifier: StorageEntryModifier::Optional,
-					ty: StorageEntryType::Plain(DecodeDifferent::Decoded(
-						"<T::AccountId as SomeAssociation2>::_2".to_string(),
-					)),
-					default: DecodeDifferent::Decoded(vec![0]),
-					documentation: DecodeDifferent::Decoded(vec![]),
+	use frame_support::metadata::*;
+
+	let pallets = vec![
+		PalletMetadata {
+			index: 0,
+			name: "System",
+			storage: None,
+			calls: Some(meta_type::<frame_system::Call<Runtime>>().into()),
+			event: Some(meta_type::<frame_system::Event<Runtime>>().into()),
+			constants: vec![
+				PalletConstantMetadata {
+					name: "BlockWeights",
+					ty: meta_type::<frame_system::limits::BlockWeights>(),
+					value: vec![],
+					docs: vec![],
 				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Decoded("Value".to_string()),
-					modifier: StorageEntryModifier::Optional,
-					ty: StorageEntryType::Plain(DecodeDifferent::Decoded("u32".to_string())),
-					default: DecodeDifferent::Decoded(vec![0]),
-					documentation: DecodeDifferent::Decoded(vec![]),
+				PalletConstantMetadata {
+					name: "BlockLength",
+					ty: meta_type::<frame_system::limits::BlockLength>(),
+					value: vec![],
+					docs: vec![],
 				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Decoded("Value2".to_string()),
-					modifier: StorageEntryModifier::Optional,
-					ty: StorageEntryType::Plain(DecodeDifferent::Decoded("u64".to_string())),
-					default: DecodeDifferent::Decoded(vec![0]),
-					documentation: DecodeDifferent::Decoded(vec![]),
+				PalletConstantMetadata {
+					name: "BlockHashCount",
+					ty: meta_type::<u32>(),
+					value: vec![],
+					docs: vec![],
 				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Decoded("Map".to_string()),
-					modifier: StorageEntryModifier::Default,
-					ty: StorageEntryType::Map {
-						key: DecodeDifferent::Decoded("u8".to_string()),
-						value: DecodeDifferent::Decoded("u16".to_string()),
-						hasher: StorageHasher::Blake2_128Concat,
-						unused: false,
-					},
-					default: DecodeDifferent::Decoded(vec![4, 0]),
-					documentation: DecodeDifferent::Decoded(vec![]),
+				PalletConstantMetadata {
+					name: "DbWeight",
+					ty: meta_type::<frame_support::weights::RuntimeDbWeight>(),
+					value: vec![],
+					docs: vec![],
 				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Decoded("Map2".to_string()),
-					modifier: StorageEntryModifier::Optional,
-					ty: StorageEntryType::Map {
-						key: DecodeDifferent::Decoded("u16".to_string()),
-						value: DecodeDifferent::Decoded("u32".to_string()),
-						hasher: StorageHasher::Twox64Concat,
-						unused: false,
-					},
-					default: DecodeDifferent::Decoded(vec![0]),
-					documentation: DecodeDifferent::Decoded(vec![]),
+				PalletConstantMetadata {
+					name: "Version",
+					ty: meta_type::<sp_version::RuntimeVersion>(),
+					value: vec![],
+					docs: vec![],
 				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Decoded("DoubleMap".to_string()),
-					modifier: StorageEntryModifier::Optional,
-					ty: StorageEntryType::DoubleMap {
-						value: DecodeDifferent::Decoded("u32".to_string()),
-						key1: DecodeDifferent::Decoded("u8".to_string()),
-						key2: DecodeDifferent::Decoded("u16".to_string()),
-						hasher: StorageHasher::Blake2_128Concat,
-						key2_hasher: StorageHasher::Twox64Concat,
-					},
-					default: DecodeDifferent::Decoded(vec![0]),
-					documentation: DecodeDifferent::Decoded(vec![]),
+				PalletConstantMetadata {
+					name: "SS58Prefix",
+					ty: meta_type::<u16>(),
+					value: vec![],
+					docs: vec![],
 				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Decoded("DoubleMap2".to_string()),
-					modifier: StorageEntryModifier::Optional,
-					ty: StorageEntryType::DoubleMap {
-						value: DecodeDifferent::Decoded("u64".to_string()),
-						key1: DecodeDifferent::Decoded("u16".to_string()),
-						key2: DecodeDifferent::Decoded("u32".to_string()),
-						hasher: StorageHasher::Twox64Concat,
-						key2_hasher: StorageHasher::Blake2_128Concat,
+			],
+			error: Some(meta_type::<frame_system::Error<Runtime>>().into()),
+		},
+		PalletMetadata {
+			index: 1,
+			name: "Example",
+			storage: Some(PalletStorageMetadata {
+				prefix: "Example",
+				entries: vec![
+					StorageEntryMetadata {
+						name: "ValueWhereClause",
+						modifier: StorageEntryModifier::Optional,
+						ty: StorageEntryType::Plain(meta_type::<u64>()),
+						default: vec![0],
+						docs: vec![],
 					},
-					default: DecodeDifferent::Decoded(vec![0]),
-					documentation: DecodeDifferent::Decoded(vec![]),
-				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Decoded("NMap".to_string()),
-					modifier: StorageEntryModifier::Optional,
-					ty: StorageEntryType::NMap {
-						keys: DecodeDifferent::Decoded(vec!["u8".to_string()]),
-						hashers: DecodeDifferent::Decoded(vec![StorageHasher::Blake2_128Concat]),
-						value: DecodeDifferent::Decoded("u32".to_string()),
+					StorageEntryMetadata {
+						name: "Value",
+						modifier: StorageEntryModifier::Optional,
+						ty: StorageEntryType::Plain(meta_type::<u32>()),
+						default: vec![0],
+						docs: vec![],
 					},
-					default: DecodeDifferent::Decoded(vec![0]),
-					documentation: DecodeDifferent::Decoded(vec![]),
-				},
-				StorageEntryMetadata {
-					name: DecodeDifferent::Decoded("NMap2".to_string()),
-					modifier: StorageEntryModifier::Optional,
-					ty: StorageEntryType::NMap {
-						keys: DecodeDifferent::Decoded(vec!["u16".to_string(), "u32".to_string()]),
-						hashers: DecodeDifferent::Decoded(vec![
-							StorageHasher::Twox64Concat,
-							StorageHasher::Blake2_128Concat,
-						]),
-						value: DecodeDifferent::Decoded("u64".to_string()),
+					StorageEntryMetadata {
+						name: "Value2",
+						modifier: StorageEntryModifier::Optional,
+						ty: StorageEntryType::Plain(meta_type::<u64>()),
+						default: vec![0],
+						docs: vec![],
+					},
+					StorageEntryMetadata {
+						name: "Map",
+						modifier: StorageEntryModifier::Default,
+						ty: StorageEntryType::Map {
+							key: meta_type::<u8>(),
+							value: meta_type::<u16>(),
+							hashers: vec![StorageHasher::Blake2_128Concat],
+						},
+						default: vec![4, 0],
+						docs: vec![],
+					},
+					StorageEntryMetadata {
+						name: "Map2",
+						modifier: StorageEntryModifier::Optional,
+						ty: StorageEntryType::Map {
+							key: meta_type::<u16>(),
+							value: meta_type::<u32>(),
+							hashers: vec![StorageHasher::Twox64Concat],
+						},
+						default: vec![0],
+						docs: vec![],
+					},
+					StorageEntryMetadata {
+						name: "DoubleMap",
+						modifier: StorageEntryModifier::Optional,
+						ty: StorageEntryType::Map {
+							value: meta_type::<u32>(),
+							hashers: vec![
+								StorageHasher::Blake2_128Concat,
+								StorageHasher::Twox64Concat,
+							],
+							key: meta_type::<(u8, u16)>(),
+						},
+						default: vec![0],
+						docs: vec![],
+					},
+					StorageEntryMetadata {
+						name: "DoubleMap2",
+						modifier: StorageEntryModifier::Optional,
+						ty: StorageEntryType::Map {
+							value: meta_type::<u64>(),
+							key: meta_type::<(u16, u32)>(),
+							hashers: vec![
+								StorageHasher::Twox64Concat,
+								StorageHasher::Blake2_128Concat,
+							],
+						},
+						default: vec![0],
+						docs: vec![],
+					},
+					StorageEntryMetadata {
+						name: "NMap",
+						modifier: StorageEntryModifier::Optional,
+						ty: StorageEntryType::Map {
+							key: meta_type::<u8>(),
+							hashers: vec![StorageHasher::Blake2_128Concat],
+							value: meta_type::<u32>(),
+						},
+						default: vec![0],
+						docs: vec![],
+					},
+					StorageEntryMetadata {
+						name: "NMap2",
+						modifier: StorageEntryModifier::Optional,
+						ty: StorageEntryType::Map {
+							key: meta_type::<(u16, u32)>(),
+							hashers: vec![
+								StorageHasher::Twox64Concat,
+								StorageHasher::Blake2_128Concat,
+							],
+							value: meta_type::<u64>(),
+						},
+						default: vec![0],
+						docs: vec![],
+					},
+					#[cfg(feature = "conditional-storage")]
+					StorageEntryMetadata {
+						name: "ConditionalValue",
+						modifier: StorageEntryModifier::Optional,
+						ty: StorageEntryType::Plain(meta_type::<u32>()),
+						default: vec![0],
+						docs: vec![],
 					},
-					default: DecodeDifferent::Decoded(vec![0]),
-					documentation: DecodeDifferent::Decoded(vec![]),
+					#[cfg(feature = "conditional-storage")]
+					StorageEntryMetadata {
+						name: "ConditionalMap",
+						modifier: StorageEntryModifier::Optional,
+						ty: StorageEntryType::Map {
+							key: meta_type::<u16>(),
+							value: meta_type::<u32>(),
+							hashers: vec![StorageHasher::Twox64Concat],
+						},
+						default: vec![0],
+						docs: vec![],
+					},
+					#[cfg(feature = "conditional-storage")]
+					StorageEntryMetadata {
+						name: "ConditionalDoubleMap",
+						modifier: StorageEntryModifier::Optional,
+						ty: StorageEntryType::Map {
+							value: meta_type::<u32>(),
+							key: meta_type::<(u8, u16)>(),
+							hashers: vec![
+								StorageHasher::Blake2_128Concat,
+								StorageHasher::Twox64Concat,
+							],
+						},
+						default: vec![0],
+						docs: vec![],
+					},
+					#[cfg(feature = "conditional-storage")]
+					StorageEntryMetadata {
+						name: "ConditionalNMap",
+						modifier: StorageEntryModifier::Optional,
+						ty: StorageEntryType::Map {
+							key: meta_type::<(u8, u16)>(),
+							hashers: vec![
+								StorageHasher::Blake2_128Concat,
+								StorageHasher::Twox64Concat,
+							],
+							value: meta_type::<u32>(),
+						},
+						default: vec![0],
+						docs: vec![],
+					},
+				],
+			}),
+			calls: Some(meta_type::<pallet::Call<Runtime>>().into()),
+			event: Some(meta_type::<pallet::Event<Runtime>>().into()),
+			constants: vec![
+				PalletConstantMetadata {
+					name: "MyGetParam",
+					ty: meta_type::<u32>(),
+					value: vec![10, 0, 0, 0],
+					docs: vec![" Some comment", " Some comment"],
 				},
-				#[cfg(feature = "conditional-storage")]
-				StorageEntryMetadata {
-					name: DecodeDifferent::Decoded("ConditionalValue".to_string()),
-					modifier: StorageEntryModifier::Optional,
-					ty: StorageEntryType::Plain(DecodeDifferent::Decoded("u32".to_string())),
-					default: DecodeDifferent::Decoded(vec![0]),
-					documentation: DecodeDifferent::Decoded(vec![]),
+				PalletConstantMetadata {
+					name: "MyGetParam2",
+					ty: meta_type::<u32>(),
+					value: vec![11, 0, 0, 0],
+					docs: vec![" Some comment", " Some comment"],
 				},
-				#[cfg(feature = "conditional-storage")]
-				StorageEntryMetadata {
-					name: DecodeDifferent::Decoded("ConditionalMap".to_string()),
-					modifier: StorageEntryModifier::Optional,
-					ty: StorageEntryType::Map {
-						key: DecodeDifferent::Decoded("u16".to_string()),
-						value: DecodeDifferent::Decoded("u32".to_string()),
-						hasher: StorageHasher::Twox64Concat,
-						unused: false,
-					},
-					default: DecodeDifferent::Decoded(vec![0]),
-					documentation: DecodeDifferent::Decoded(vec![]),
+				PalletConstantMetadata {
+					name: "MyGetParam3",
+					ty: meta_type::<u64>(),
+					value: vec![12, 0, 0, 0, 0, 0, 0, 0],
+					docs: vec![],
 				},
-				#[cfg(feature = "conditional-storage")]
-				StorageEntryMetadata {
-					name: DecodeDifferent::Decoded("ConditionalDoubleMap".to_string()),
-					modifier: StorageEntryModifier::Optional,
-					ty: StorageEntryType::DoubleMap {
-						value: DecodeDifferent::Decoded("u32".to_string()),
-						key1: DecodeDifferent::Decoded("u8".to_string()),
-						key2: DecodeDifferent::Decoded("u16".to_string()),
-						hasher: StorageHasher::Blake2_128Concat,
-						key2_hasher: StorageHasher::Twox64Concat,
-					},
-					default: DecodeDifferent::Decoded(vec![0]),
-					documentation: DecodeDifferent::Decoded(vec![]),
+				PalletConstantMetadata {
+					name: "some_extra",
+					ty: meta_type::<u64>(),
+					value: vec![100, 0, 0, 0, 0, 0, 0, 0],
+					docs: vec![" Some doc", " Some doc"],
 				},
-				#[cfg(feature = "conditional-storage")]
-				StorageEntryMetadata {
-					name: DecodeDifferent::Decoded("ConditionalNMap".to_string()),
-					modifier: StorageEntryModifier::Optional,
-					ty: StorageEntryType::NMap {
-						keys: DecodeDifferent::Decoded(vec!["u8".to_string(), "u16".to_string()]),
-						hashers: DecodeDifferent::Decoded(vec![
-							StorageHasher::Blake2_128Concat,
-							StorageHasher::Twox64Concat,
-						]),
-						value: DecodeDifferent::Decoded("u32".to_string()),
-					},
-					default: DecodeDifferent::Decoded(vec![0]),
-					documentation: DecodeDifferent::Decoded(vec![]),
+				PalletConstantMetadata {
+					name: "some_extra_extra",
+					ty: meta_type::<u64>(),
+					value: vec![0, 0, 0, 0, 0, 0, 0, 0],
+					docs: vec![" Some doc"],
 				},
-			]),
-		})),
-		calls: Some(DecodeDifferent::Decoded(vec![
-			FunctionMetadata {
-				name: DecodeDifferent::Decoded("foo".to_string()),
-				arguments: DecodeDifferent::Decoded(vec![
-					FunctionArgumentMetadata {
-						name: DecodeDifferent::Decoded("_foo".to_string()),
-						ty: DecodeDifferent::Decoded("Compact<u32>".to_string()),
+			],
+			error: Some(PalletErrorMetadata { ty: meta_type::<pallet::Error<Runtime>>() }),
+		},
+		PalletMetadata {
+			index: 1,
+			name: "Example",
+			storage: Some(PalletStorageMetadata {
+				prefix: "Example",
+				entries: vec![
+					StorageEntryMetadata {
+						name: "ValueWhereClause",
+						modifier: StorageEntryModifier::Optional,
+						ty: StorageEntryType::Plain(meta_type::<u64>()),
+						default: vec![0],
+						docs: vec![],
 					},
-					FunctionArgumentMetadata {
-						name: DecodeDifferent::Decoded("_bar".to_string()),
-						ty: DecodeDifferent::Decoded("u32".to_string()),
+					StorageEntryMetadata {
+						name: "Value",
+						modifier: StorageEntryModifier::Optional,
+						ty: StorageEntryType::Plain(meta_type::<u32>()),
+						default: vec![0],
+						docs: vec![],
 					},
-				]),
-				documentation: DecodeDifferent::Decoded(vec![
-					" Doc comment put in metadata".to_string()
-				]),
-			},
-			FunctionMetadata {
-				name: DecodeDifferent::Decoded("foo_transactional".to_string()),
-				arguments: DecodeDifferent::Decoded(vec![FunctionArgumentMetadata {
-					name: DecodeDifferent::Decoded("foo".to_string()),
-					ty: DecodeDifferent::Decoded("Compact<u32>".to_string()),
-				}]),
-				documentation: DecodeDifferent::Decoded(vec![
-					" Doc comment put in metadata".to_string()
-				]),
-			},
-			FunctionMetadata {
-				name: DecodeDifferent::Decoded("foo_no_post_info".to_string()),
-				arguments: DecodeDifferent::Decoded(vec![]),
-				documentation: DecodeDifferent::Decoded(vec![]),
-			},
-		])),
-		event: Some(DecodeDifferent::Decoded(vec![
-			EventMetadata {
-				name: DecodeDifferent::Decoded("Proposed".to_string()),
-				arguments: DecodeDifferent::Decoded(vec![
-					"<T as frame_system::Config>::AccountId".to_string()
-				]),
-				documentation: DecodeDifferent::Decoded(vec![
-					" doc comment put in metadata".to_string()
-				]),
-			},
-			EventMetadata {
-				name: DecodeDifferent::Decoded("Spending".to_string()),
-				arguments: DecodeDifferent::Decoded(vec!["Balance".to_string()]),
-				documentation: DecodeDifferent::Decoded(vec![" doc".to_string()]),
-			},
-			EventMetadata {
-				name: DecodeDifferent::Decoded("Something".to_string()),
-				arguments: DecodeDifferent::Decoded(vec!["Other".to_string()]),
-				documentation: DecodeDifferent::Decoded(vec![]),
-			},
-			EventMetadata {
-				name: DecodeDifferent::Decoded("SomethingElse".to_string()),
-				arguments: DecodeDifferent::Decoded(vec![
-					"<T::AccountId as SomeAssociation1>::_1".to_string()
-				]),
-				documentation: DecodeDifferent::Decoded(vec![]),
-			},
-		])),
-		constants: DecodeDifferent::Decoded(vec![
-			ModuleConstantMetadata {
-				name: DecodeDifferent::Decoded("MyGetParam".to_string()),
-				ty: DecodeDifferent::Decoded("u32".to_string()),
-				value: DecodeDifferent::Decoded(vec![10, 0, 0, 0]),
-				documentation: DecodeDifferent::Decoded(vec![
-					" Some comment".to_string(),
-					" Some comment".to_string(),
-				]),
-			},
-			ModuleConstantMetadata {
-				name: DecodeDifferent::Decoded("MyGetParam2".to_string()),
-				ty: DecodeDifferent::Decoded("u32".to_string()),
-				value: DecodeDifferent::Decoded(vec![11, 0, 0, 0]),
-				documentation: DecodeDifferent::Decoded(vec![
-					" Some comment".to_string(),
-					" Some comment".to_string(),
-				]),
-			},
-			ModuleConstantMetadata {
-				name: DecodeDifferent::Decoded("MyGetParam3".to_string()),
-				ty: DecodeDifferent::Decoded("<T::AccountId as SomeAssociation1>::_1".to_string()),
-				value: DecodeDifferent::Decoded(vec![12, 0, 0, 0, 0, 0, 0, 0]),
-				documentation: DecodeDifferent::Decoded(vec![]),
-			},
-			ModuleConstantMetadata {
-				name: DecodeDifferent::Decoded("some_extra".to_string()),
-				ty: DecodeDifferent::Decoded("T::AccountId".to_string()),
-				value: DecodeDifferent::Decoded(vec![100, 0, 0, 0, 0, 0, 0, 0]),
-				documentation: DecodeDifferent::Decoded(vec![
-					" Some doc".to_string(),
-					" Some doc".to_string(),
-				]),
-			},
-			ModuleConstantMetadata {
-				name: DecodeDifferent::Decoded("some_extra_extra".to_string()),
-				ty: DecodeDifferent::Decoded("T::AccountId".to_string()),
-				value: DecodeDifferent::Decoded(vec![0, 0, 0, 0, 0, 0, 0, 0]),
-				documentation: DecodeDifferent::Decoded(vec![" Some doc".to_string()]),
-			},
-		]),
-		errors: DecodeDifferent::Decoded(vec![ErrorMetadata {
-			name: DecodeDifferent::Decoded("InsufficientProposersBalance".to_string()),
-			documentation: DecodeDifferent::Decoded(vec![
-				" doc comment put into metadata".to_string()
-			]),
-		}]),
+					StorageEntryMetadata {
+						name: "Value2",
+						modifier: StorageEntryModifier::Optional,
+						ty: StorageEntryType::Plain(meta_type::<u64>()),
+						default: vec![0],
+						docs: vec![],
+					},
+					StorageEntryMetadata {
+						name: "Map",
+						modifier: StorageEntryModifier::Default,
+						ty: StorageEntryType::Map {
+							key: meta_type::<u8>(),
+							value: meta_type::<u16>(),
+							hashers: vec![StorageHasher::Blake2_128Concat],
+						},
+						default: vec![4, 0],
+						docs: vec![],
+					},
+					StorageEntryMetadata {
+						name: "Map2",
+						modifier: StorageEntryModifier::Optional,
+						ty: StorageEntryType::Map {
+							key: meta_type::<u16>(),
+							value: meta_type::<u32>(),
+							hashers: vec![StorageHasher::Twox64Concat],
+						},
+						default: vec![0],
+						docs: vec![],
+					},
+					StorageEntryMetadata {
+						name: "DoubleMap",
+						modifier: StorageEntryModifier::Optional,
+						ty: StorageEntryType::Map {
+							value: meta_type::<u32>(),
+							key: meta_type::<(u8, u16)>(),
+							hashers: vec![
+								StorageHasher::Blake2_128Concat,
+								StorageHasher::Twox64Concat,
+							],
+						},
+						default: vec![0],
+						docs: vec![],
+					},
+					StorageEntryMetadata {
+						name: "DoubleMap2",
+						modifier: StorageEntryModifier::Optional,
+						ty: StorageEntryType::Map {
+							value: meta_type::<u64>(),
+							key: meta_type::<(u16, u32)>(),
+							hashers: vec![
+								StorageHasher::Twox64Concat,
+								StorageHasher::Blake2_128Concat,
+							],
+						},
+						default: vec![0],
+						docs: vec![],
+					},
+					StorageEntryMetadata {
+						name: "NMap",
+						modifier: StorageEntryModifier::Optional,
+						ty: StorageEntryType::Map {
+							key: meta_type::<u8>(),
+							hashers: vec![StorageHasher::Blake2_128Concat],
+							value: meta_type::<u32>(),
+						},
+						default: vec![0],
+						docs: vec![],
+					},
+					StorageEntryMetadata {
+						name: "NMap2",
+						modifier: StorageEntryModifier::Optional,
+						ty: StorageEntryType::Map {
+							key: meta_type::<(u16, u32)>(),
+							hashers: vec![
+								StorageHasher::Twox64Concat,
+								StorageHasher::Blake2_128Concat,
+							],
+							value: meta_type::<u64>(),
+						},
+						default: vec![0],
+						docs: vec![],
+					},
+					#[cfg(feature = "conditional-storage")]
+					StorageEntryMetadata {
+						name: "ConditionalValue",
+						modifier: StorageEntryModifier::Optional,
+						ty: StorageEntryType::Plain(meta_type::<u32>()),
+						default: vec![0],
+						docs: vec![],
+					},
+					#[cfg(feature = "conditional-storage")]
+					StorageEntryMetadata {
+						name: "ConditionalMap",
+						modifier: StorageEntryModifier::Optional,
+						ty: StorageEntryType::Map {
+							key: meta_type::<u16>(),
+							value: meta_type::<u32>(),
+							hashers: vec![StorageHasher::Twox64Concat],
+						},
+						default: vec![0],
+						docs: vec![],
+					},
+					#[cfg(feature = "conditional-storage")]
+					StorageEntryMetadata {
+						name: "ConditionalDoubleMap",
+						modifier: StorageEntryModifier::Optional,
+						ty: StorageEntryType::Map {
+							value: meta_type::<u32>(),
+							key: meta_type::<(u8, u16)>(),
+							hashers: vec![
+								StorageHasher::Blake2_128Concat,
+								StorageHasher::Twox64Concat,
+							],
+						},
+						default: vec![0],
+						docs: vec![],
+					},
+					#[cfg(feature = "conditional-storage")]
+					StorageEntryMetadata {
+						name: "ConditionalNMap",
+						modifier: StorageEntryModifier::Optional,
+						ty: StorageEntryType::Map {
+							key: meta_type::<(u8, u16)>(),
+							hashers: vec![
+								StorageHasher::Blake2_128Concat,
+								StorageHasher::Twox64Concat,
+							],
+							value: meta_type::<u32>(),
+						},
+						default: vec![0],
+						docs: vec![],
+					},
+				],
+			}),
+			calls: Some(meta_type::<pallet::Call<Runtime>>().into()),
+			event: Some(meta_type::<pallet::Event<Runtime>>().into()),
+			constants: vec![
+				PalletConstantMetadata {
+					name: "MyGetParam",
+					ty: meta_type::<u32>(),
+					value: vec![10, 0, 0, 0],
+					docs: vec![" Some comment", " Some comment"],
+				},
+				PalletConstantMetadata {
+					name: "MyGetParam2",
+					ty: meta_type::<u32>(),
+					value: vec![11, 0, 0, 0],
+					docs: vec![" Some comment", " Some comment"],
+				},
+				PalletConstantMetadata {
+					name: "MyGetParam3",
+					ty: meta_type::<u64>(),
+					value: vec![12, 0, 0, 0, 0, 0, 0, 0],
+					docs: vec![],
+				},
+				PalletConstantMetadata {
+					name: "some_extra",
+					ty: meta_type::<u64>(),
+					value: vec![100, 0, 0, 0, 0, 0, 0, 0],
+					docs: vec![" Some doc", " Some doc"],
+				},
+				PalletConstantMetadata {
+					name: "some_extra_extra",
+					ty: meta_type::<u64>(),
+					value: vec![0, 0, 0, 0, 0, 0, 0, 0],
+					docs: vec![" Some doc"],
+				},
+			],
+			error: Some(PalletErrorMetadata { ty: meta_type::<pallet::Error<Runtime>>() }),
+		},
+		PalletMetadata {
+			index: 2,
+			name: "Example2",
+			storage: Some(PalletStorageMetadata {
+				prefix: "Example2",
+				entries: vec![StorageEntryMetadata {
+					name: "SomeValue",
+					modifier: StorageEntryModifier::Optional,
+					ty: StorageEntryType::Plain(meta_type::<Vec<u32>>()),
+					default: vec![0],
+					docs: vec![],
+				}],
+			}),
+			calls: Some(meta_type::<pallet2::Call<Runtime>>().into()),
+			event: Some(PalletEventMetadata { ty: meta_type::<pallet2::Event>() }),
+			constants: vec![],
+			error: None,
+		},
+	];
+
+	let extrinsic = ExtrinsicMetadata {
+		ty: meta_type::<UncheckedExtrinsic>(),
+		version: 4,
+		signed_extensions: vec![SignedExtensionMetadata {
+			identifier: "UnitSignedExtension",
+			ty: meta_type::<()>(),
+			additional_signed: meta_type::<()>(),
+		}],
 	};
 
-	let metadata = match Runtime::metadata().1 {
-		RuntimeMetadata::V13(metadata) => metadata,
-		_ => panic!("metadata has been bump, test needs to be updated"),
+	let expected_metadata: RuntimeMetadataPrefixed =
+		RuntimeMetadataLastVersion::new(pallets, extrinsic, meta_type::<Runtime>()).into();
+	let expected_metadata = match expected_metadata.1 {
+		RuntimeMetadata::V14(metadata) => metadata,
+		_ => panic!("metadata has been bumped, test needs to be updated"),
 	};
 
-	let modules_metadata = match metadata.modules {
-		DecodeDifferent::Encode(modules_metadata) => modules_metadata,
-		_ => unreachable!(),
+	let actual_metadata = match Runtime::metadata().1 {
+		RuntimeMetadata::V14(metadata) => metadata,
+		_ => panic!("metadata has been bumped, test needs to be updated"),
 	};
 
-	let pallet_metadata = ModuleMetadata::decode(&mut &modules_metadata[1].encode()[..]).unwrap();
-
-	pretty_assertions::assert_eq!(pallet_metadata, expected_pallet_metadata);
+	pretty_assertions::assert_eq!(actual_metadata.pallets[1], expected_metadata.pallets[1]);
 }
 
 #[test]
diff --git a/frame/support/test/tests/pallet_compatibility.rs b/frame/support/test/tests/pallet_compatibility.rs
index 9814fcb392b5..4523063252ab 100644
--- a/frame/support/test/tests/pallet_compatibility.rs
+++ b/frame/support/test/tests/pallet_compatibility.rs
@@ -99,7 +99,7 @@ mod pallet_old {
 #[frame_support::pallet]
 pub mod pallet {
 	use super::SomeAssociation;
-	use frame_support::pallet_prelude::*;
+	use frame_support::{pallet_prelude::*, scale_info};
 	use frame_system::{ensure_root, pallet_prelude::*};
 
 	#[pallet::config]
@@ -110,7 +110,8 @@ pub mod pallet {
 			+ Into<Weight>
 			+ Default
 			+ MaybeSerializeDeserialize
-			+ SomeAssociation;
+			+ SomeAssociation
+			+ scale_info::StaticTypeInfo;
 		#[pallet::constant]
 		type SomeConst: Get<Self::Balance>;
 		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
@@ -155,7 +156,6 @@ pub mod pallet {
 
 	#[pallet::event]
 	#[pallet::generate_deposit(fn deposit_event)]
-	#[pallet::metadata(T::Balance = "Balance")]
 	pub enum Event<T: Config> {
 		/// Dummy event, just here so there's a generic type that's used.
 		Dummy(T::Balance),
@@ -279,22 +279,71 @@ frame_support::construct_runtime!(
 mod test {
 	use super::{pallet, pallet_old, Runtime};
 	use codec::{Decode, Encode};
+	use scale_info::{form::PortableForm, Variant};
 
 	#[test]
 	fn metadata() {
 		let metadata = Runtime::metadata();
-		let modules = match metadata.1 {
-			frame_metadata::RuntimeMetadata::V13(frame_metadata::RuntimeMetadataV13 {
-				modules: frame_metadata::DecodeDifferent::Encode(m),
-				..
-			}) => m,
+		let (pallets, types) = match metadata.1 {
+			frame_support::metadata::RuntimeMetadata::V14(metadata) =>
+				(metadata.pallets, metadata.types),
 			_ => unreachable!(),
 		};
-		pretty_assertions::assert_eq!(modules[1].storage, modules[2].storage);
-		pretty_assertions::assert_eq!(modules[1].calls, modules[2].calls);
-		pretty_assertions::assert_eq!(modules[1].event, modules[2].event);
-		pretty_assertions::assert_eq!(modules[1].constants, modules[2].constants);
-		pretty_assertions::assert_eq!(modules[1].errors, modules[2].errors);
+
+		let assert_meta_types = |ty_id1, ty_id2| {
+			let ty1 = types.resolve(ty_id1).map(|ty| ty.type_def());
+			let ty2 = types.resolve(ty_id2).map(|ty| ty.type_def());
+			pretty_assertions::assert_eq!(ty1, ty2);
+		};
+
+		let get_enum_variants = |ty_id| match types.resolve(ty_id).map(|ty| ty.type_def()) {
+			Some(ty) => match ty {
+				scale_info::TypeDef::Variant(var) => var.variants(),
+				_ => panic!("Expected variant type"),
+			},
+			_ => panic!("No type found"),
+		};
+
+		let assert_enum_variants = |vs1: &[Variant<PortableForm>],
+		                            vs2: &[Variant<PortableForm>]| {
+			assert_eq!(vs1.len(), vs2.len());
+			for i in 0..vs1.len() {
+				let v1 = &vs2[i];
+				let v2 = &vs2[i];
+				assert_eq!(v1.fields().len(), v2.fields().len());
+				for f in 0..v1.fields().len() {
+					let f1 = &v1.fields()[f];
+					let f2 = &v2.fields()[f];
+					pretty_assertions::assert_eq!(f1.name(), f2.name());
+					pretty_assertions::assert_eq!(f1.ty(), f2.ty());
+				}
+			}
+		};
+
+		pretty_assertions::assert_eq!(pallets[1].storage, pallets[2].storage);
+
+		let calls1 = pallets[1].calls.as_ref().unwrap();
+		let calls2 = pallets[2].calls.as_ref().unwrap();
+		assert_meta_types(calls1.ty.id(), calls2.ty.id());
+
+		// event: check variants and fields but ignore the type name which will be different
+		let event1_variants = get_enum_variants(pallets[1].event.as_ref().unwrap().ty.id());
+		let event2_variants = get_enum_variants(pallets[2].event.as_ref().unwrap().ty.id());
+		assert_enum_variants(event1_variants, event2_variants);
+
+		let err1 = get_enum_variants(pallets[1].error.as_ref().unwrap().ty.id())
+			.iter()
+			.filter(|v| v.name() == "__Ignore")
+			.cloned()
+			.collect::<Vec<_>>();
+		let err2 = get_enum_variants(pallets[2].error.as_ref().unwrap().ty.id())
+			.iter()
+			.filter(|v| v.name() == "__Ignore")
+			.cloned()
+			.collect::<Vec<_>>();
+		assert_enum_variants(&err1, &err2);
+
+		pretty_assertions::assert_eq!(pallets[1].constants, pallets[2].constants);
 	}
 
 	#[test]
@@ -309,10 +358,10 @@ mod test {
 
 		assert_eq!(
 			pallet_old::Call::<Runtime>::decode(
-				&mut &pallet::Call::<Runtime>::set_dummy(10).encode()[..]
+				&mut &pallet::Call::<Runtime>::set_dummy { new_value: 10 }.encode()[..]
 			)
 			.unwrap(),
-			pallet_old::Call::<Runtime>::set_dummy(10),
+			pallet_old::Call::<Runtime>::set_dummy { new_value: 10 },
 		);
 	}
 }
diff --git a/frame/support/test/tests/pallet_compatibility_instance.rs b/frame/support/test/tests/pallet_compatibility_instance.rs
index b8d43b5e32bf..768b9f28d35f 100644
--- a/frame/support/test/tests/pallet_compatibility_instance.rs
+++ b/frame/support/test/tests/pallet_compatibility_instance.rs
@@ -85,7 +85,7 @@ mod pallet_old {
 
 #[frame_support::pallet]
 pub mod pallet {
-	use frame_support::pallet_prelude::*;
+	use frame_support::{pallet_prelude::*, scale_info};
 	use frame_system::{ensure_root, pallet_prelude::*};
 
 	#[pallet::config]
@@ -95,7 +95,8 @@ pub mod pallet {
 			+ From<u32>
 			+ Into<Weight>
 			+ Default
-			+ MaybeSerializeDeserialize;
+			+ MaybeSerializeDeserialize
+			+ scale_info::StaticTypeInfo;
 		#[pallet::constant]
 		type SomeConst: Get<Self::Balance>;
 		type Event: From<Event<Self, I>> + IsType<<Self as frame_system::Config>::Event>;
@@ -140,7 +141,6 @@ pub mod pallet {
 
 	#[pallet::event]
 	#[pallet::generate_deposit(fn deposit_event)]
-	#[pallet::metadata(T::Balance = "Balance")]
 	pub enum Event<T: Config<I>, I: 'static = ()> {
 		/// Dummy event, just here so there's a generic type that's used.
 		Dummy(T::Balance),
@@ -282,23 +282,66 @@ frame_support::construct_runtime!(
 mod test {
 	use super::{pallet, pallet_old, Runtime};
 	use codec::{Decode, Encode};
+	use scale_info::{form::PortableForm, Variant};
 
 	#[test]
 	fn metadata() {
 		let metadata = Runtime::metadata();
-		let modules = match metadata.1 {
-			frame_metadata::RuntimeMetadata::V13(frame_metadata::RuntimeMetadataV13 {
-				modules: frame_metadata::DecodeDifferent::Encode(m),
-				..
-			}) => m,
+		let (pallets, types) = match metadata.1 {
+			frame_support::metadata::RuntimeMetadata::V14(metadata) =>
+				(metadata.pallets, metadata.types),
 			_ => unreachable!(),
 		};
+
+		let get_enum_variants = |ty_id| match types.resolve(ty_id).map(|ty| ty.type_def()) {
+			Some(ty) => match ty {
+				scale_info::TypeDef::Variant(var) => var.variants(),
+				_ => panic!("Expected variant type"),
+			},
+			_ => panic!("No type found"),
+		};
+
+		let assert_enum_variants = |vs1: &[Variant<PortableForm>],
+		                            vs2: &[Variant<PortableForm>]| {
+			assert_eq!(vs1.len(), vs2.len());
+			for i in 0..vs1.len() {
+				let v1 = &vs2[i];
+				let v2 = &vs2[i];
+				assert_eq!(v1.fields().len(), v2.fields().len());
+				for f in 0..v1.fields().len() {
+					let f1 = &v1.fields()[f];
+					let f2 = &v2.fields()[f];
+					pretty_assertions::assert_eq!(f1.name(), f2.name());
+					pretty_assertions::assert_eq!(f1.ty(), f2.ty());
+				}
+			}
+		};
+
 		for i in vec![1, 3, 5].into_iter() {
-			pretty_assertions::assert_eq!(modules[i].storage, modules[i + 1].storage);
-			pretty_assertions::assert_eq!(modules[i].calls, modules[i + 1].calls);
-			pretty_assertions::assert_eq!(modules[i].event, modules[i + 1].event);
-			pretty_assertions::assert_eq!(modules[i].constants, modules[i + 1].constants);
-			pretty_assertions::assert_eq!(modules[i].errors, modules[i + 1].errors);
+			pretty_assertions::assert_eq!(pallets[i].storage, pallets[i + 1].storage);
+
+			let call1_variants = get_enum_variants(pallets[i].calls.as_ref().unwrap().ty.id());
+			let call2_variants = get_enum_variants(pallets[i + 1].calls.as_ref().unwrap().ty.id());
+			assert_enum_variants(call1_variants, call2_variants);
+
+			// event: check variants and fields but ignore the type name which will be different
+			let event1_variants = get_enum_variants(pallets[i].event.as_ref().unwrap().ty.id());
+			let event2_variants = get_enum_variants(pallets[i + 1].event.as_ref().unwrap().ty.id());
+			assert_enum_variants(event1_variants, event2_variants);
+
+			let err1 = get_enum_variants(pallets[i].error.as_ref().unwrap().ty.id())
+				.iter()
+				.filter(|v| v.name() == "__Ignore")
+				.cloned()
+				.collect::<Vec<_>>();
+			let err2 = get_enum_variants(pallets[i + 1].error.as_ref().unwrap().ty.id())
+				.iter()
+				.filter(|v| v.name() == "__Ignore")
+				.cloned()
+				.collect::<Vec<_>>();
+			assert_enum_variants(&err1, &err2);
+
+			pretty_assertions::assert_eq!(pallets[i].constants, pallets[i + 1].constants);
 		}
 	}
 
@@ -314,10 +357,10 @@ mod test {
 
 		assert_eq!(
 			pallet_old::Call::<Runtime>::decode(
-				&mut &pallet::Call::<Runtime>::set_dummy(10).encode()[..]
+				&mut &pallet::Call::<Runtime>::set_dummy { new_value: 10 }.encode()[..]
 			)
 			.unwrap(),
-			pallet_old::Call::<Runtime>::set_dummy(10),
+			pallet_old::Call::<Runtime>::set_dummy { new_value: 10 },
 		);
 	}
 }
diff --git a/frame/support/test/tests/pallet_instance.rs b/frame/support/test/tests/pallet_instance.rs
index adfbc7a64f0e..34586e841421 100644
--- a/frame/support/test/tests/pallet_instance.rs
+++ b/frame/support/test/tests/pallet_instance.rs
@@ -29,7 +29,7 @@ use sp_runtime::DispatchError;
 
 #[frame_support::pallet]
 pub mod pallet {
-	use frame_support::pallet_prelude::*;
+	use frame_support::{pallet_prelude::*, scale_info};
 	use frame_system::pallet_prelude::*;
 	use sp_std::any::TypeId;
 
@@ -39,7 +39,7 @@ pub mod pallet {
 	pub trait Config<I: 'static = ()>: frame_system::Config {
 		#[pallet::constant]
 		type MyGetParam: Get<u32>;
-		type Balance: Parameter + Default;
+		type Balance: Parameter + Default + scale_info::StaticTypeInfo;
 		type Event: From<Event<Self, I>> + IsType<<Self as frame_system::Config>::Event>;
 	}
 
@@ -109,7 +109,6 @@ pub mod pallet {
 	}
 
 	#[pallet::event]
-	#[pallet::metadata(BalanceOf<T, I> = "Balance", u32 = "Other")]
 	#[pallet::generate_deposit(fn deposit_event)]
 	pub enum Event<T: Config<I>, I: 'static = ()> {
 		/// doc comment put in metadata
@@ -157,7 +156,16 @@ pub mod pallet {
 	}
 
 	#[pallet::origin]
-	#[derive(EqNoBound, RuntimeDebugNoBound, CloneNoBound, PartialEqNoBound, Encode, Decode)]
+	#[derive(
+		EqNoBound,
+		RuntimeDebugNoBound,
+		CloneNoBound,
+		PartialEqNoBound,
+		Encode,
+		Decode,
+		scale_info::TypeInfo,
+	)]
+	#[scale_info(skip_type_params(T, I))]
 	pub struct Origin<T, I = ()>(PhantomData<(T, I)>);
 
 	#[pallet::validate_unsigned]
@@ -306,7 +314,7 @@ frame_support::construct_runtime!(
 
 #[test]
 fn call_expand() {
-	let call_foo = pallet::Call::<Runtime>::foo(3);
+	let call_foo = pallet::Call::<Runtime>::foo { foo: 3 };
 	assert_eq!(
 		call_foo.get_dispatch_info(),
 		DispatchInfo { weight: 3, class: DispatchClass::Normal, pays_fee: Pays::Yes }
@@ -314,7 +322,7 @@ fn call_expand() {
 	assert_eq!(call_foo.get_call_name(), "foo");
 	assert_eq!(pallet::Call::<Runtime>::get_call_names(), &["foo", "foo_transactional"]);
 
-	let call_foo = pallet::Call::<Runtime, pallet::Instance1>::foo(3);
+	let call_foo = pallet::Call::<Runtime, pallet::Instance1>::foo { foo: 3 };
 	assert_eq!(
 		call_foo.get_dispatch_info(),
 		DispatchInfo { weight: 3, class: DispatchClass::Normal, pays_fee: Pays::Yes }
@@ -369,7 +377,9 @@ fn instance_expand() {
 fn pallet_expand_deposit_event() {
 	TestExternalities::default().execute_with(|| {
 		frame_system::Pallet::<Runtime>::set_block_number(1);
-		pallet::Call::<Runtime>::foo(3).dispatch_bypass_filter(None.into()).unwrap();
+		pallet::Call::<Runtime>::foo { foo: 3 }
+			.dispatch_bypass_filter(None.into())
+			.unwrap();
 		assert_eq!(
 			frame_system::Pallet::<Runtime>::events()[0].event,
 			Event::Example(pallet::Event::Something(3)),
@@ -378,7 +388,7 @@ fn pallet_expand_deposit_event() {
 
 	TestExternalities::default().execute_with(|| {
 		frame_system::Pallet::<Runtime>::set_block_number(1);
-		pallet::Call::<Runtime, pallet::Instance1>::foo(3)
+		pallet::Call::<Runtime, pallet::Instance1>::foo { foo: 3 }
 			.dispatch_bypass_filter(None.into())
 			.unwrap();
 		assert_eq!(
@@ -544,183 +554,207 @@ fn pallet_on_genesis() {
 
 #[test]
 fn metadata() {
-	use codec::{Decode, Encode};
-	use frame_metadata::*;
+	use frame_support::metadata::*;
+
+	let system_pallet_metadata = PalletMetadata {
+		index: 0,
+		name: "System",
+		storage: None,
+		calls: Some(scale_info::meta_type::<frame_system::Call<Runtime>>().into()),
+		event: Some(PalletEventMetadata {
+			ty: scale_info::meta_type::<frame_system::Event<Runtime>>(),
+		}),
+		constants: vec![
+			PalletConstantMetadata {
+				name: "BlockWeights",
+				ty: scale_info::meta_type::<frame_system::limits::BlockWeights>(),
+				value: vec![],
+				docs: vec![],
+			},
+			PalletConstantMetadata {
+				name: "BlockLength",
+				ty: scale_info::meta_type::<frame_system::limits::BlockLength>(),
+				value: vec![],
+				docs: vec![],
+			},
+			PalletConstantMetadata {
+				name: "BlockHashCount",
+				ty: scale_info::meta_type::<u32>(),
+				value: vec![],
+				docs: vec![],
+			},
+			PalletConstantMetadata {
+				name: "DbWeight",
+				ty: scale_info::meta_type::<frame_support::weights::RuntimeDbWeight>(),
+				value: vec![],
+				docs: vec![],
+			},
+			PalletConstantMetadata {
+				name: "Version",
+				ty: scale_info::meta_type::<sp_version::RuntimeVersion>(),
+				value: vec![],
+				docs: vec![],
+			},
+			PalletConstantMetadata {
+				name: "SS58Prefix",
+				ty: scale_info::meta_type::<u16>(),
+				value: vec![],
+				docs: vec![],
+			},
+		],
+		error: Some(PalletErrorMetadata {
+			ty: scale_info::meta_type::<frame_system::Error<Runtime>>(),
+		}),
+	};
 
-	let expected_pallet_metadata = ModuleMetadata {
+	let example_pallet_metadata = PalletMetadata {
 		index: 1,
-		name: DecodeDifferent::Decoded("Example".to_string()),
-		storage: Some(DecodeDifferent::Decoded(StorageMetadata {
-			prefix: DecodeDifferent::Decoded("Example".to_string()),
-			entries: DecodeDifferent::Decoded(vec![
+		name: "Example",
+		storage: Some(PalletStorageMetadata {
+			prefix: "Example",
+			entries: vec![
 				StorageEntryMetadata {
-					name: DecodeDifferent::Decoded("Value".to_string()),
+					name: "Value",
 					modifier: StorageEntryModifier::Optional,
-					ty: StorageEntryType::Plain(DecodeDifferent::Decoded("u32".to_string())),
-					default: DecodeDifferent::Decoded(vec![0]),
-					documentation: DecodeDifferent::Decoded(vec![]),
+					ty: StorageEntryType::Plain(scale_info::meta_type::<u32>()),
+					default: vec![0],
+					docs: vec![],
 				},
 				StorageEntryMetadata {
-					name: DecodeDifferent::Decoded("Map".to_string()),
+					name: "Map",
 					modifier: StorageEntryModifier::Optional,
 					ty: StorageEntryType::Map {
-						key: DecodeDifferent::Decoded("u8".to_string()),
-						value: DecodeDifferent::Decoded("u16".to_string()),
-						hasher: StorageHasher::Blake2_128Concat,
-						unused: false,
+						key: scale_info::meta_type::<u8>(),
+						value: scale_info::meta_type::<u16>(),
+						hashers: vec![StorageHasher::Blake2_128Concat],
 					},
-					default: DecodeDifferent::Decoded(vec![0]),
-					documentation: DecodeDifferent::Decoded(vec![]),
+					default: vec![0],
+					docs: vec![],
 				},
 				StorageEntryMetadata {
-					name: DecodeDifferent::Decoded("Map2".to_string()),
+					name: "Map2",
 					modifier: StorageEntryModifier::Optional,
 					ty: StorageEntryType::Map {
-						key: DecodeDifferent::Decoded("u16".to_string()),
-						value: DecodeDifferent::Decoded("u32".to_string()),
-						hasher: StorageHasher::Twox64Concat,
-						unused: false,
+						key: scale_info::meta_type::<u16>(),
+						value: scale_info::meta_type::<u32>(),
+						hashers: vec![StorageHasher::Twox64Concat],
 					},
-					default: DecodeDifferent::Decoded(vec![0]),
-					documentation: DecodeDifferent::Decoded(vec![]),
+					default: vec![0],
+					docs: vec![],
 				},
 				StorageEntryMetadata {
-					name: DecodeDifferent::Decoded("DoubleMap".to_string()),
+					name: "DoubleMap",
 					modifier: StorageEntryModifier::Optional,
-					ty: StorageEntryType::DoubleMap {
-						value: DecodeDifferent::Decoded("u32".to_string()),
-						key1: DecodeDifferent::Decoded("u8".to_string()),
-						key2: DecodeDifferent::Decoded("u16".to_string()),
-						hasher: StorageHasher::Blake2_128Concat,
-						key2_hasher: StorageHasher::Twox64Concat,
+					ty: StorageEntryType::Map {
+						value: scale_info::meta_type::<u32>(),
+						key: scale_info::meta_type::<(u8, u16)>(),
+						hashers: vec![StorageHasher::Blake2_128Concat, StorageHasher::Twox64Concat],
 					},
-					default: DecodeDifferent::Decoded(vec![0]),
-					documentation: DecodeDifferent::Decoded(vec![]),
+					default: vec![0],
+					docs: vec![],
 				},
 				StorageEntryMetadata {
-					name: DecodeDifferent::Decoded("DoubleMap2".to_string()),
+					name: "DoubleMap2",
 					modifier: StorageEntryModifier::Optional,
-					ty: StorageEntryType::DoubleMap {
-						value: DecodeDifferent::Decoded("u64".to_string()),
-						key1: DecodeDifferent::Decoded("u16".to_string()),
-						key2: DecodeDifferent::Decoded("u32".to_string()),
-						hasher: StorageHasher::Twox64Concat,
-						key2_hasher: StorageHasher::Blake2_128Concat,
+					ty: StorageEntryType::Map {
+						value: scale_info::meta_type::<u64>(),
+						key: scale_info::meta_type::<(u16, u32)>(),
+						hashers: vec![StorageHasher::Twox64Concat, StorageHasher::Blake2_128Concat],
 					},
-					default: DecodeDifferent::Decoded(vec![0]),
-					documentation: DecodeDifferent::Decoded(vec![]),
+					default: vec![0],
+					docs: vec![],
 				},
 				StorageEntryMetadata {
-					name: DecodeDifferent::Decoded("NMap".to_string()),
+					name: "NMap",
 					modifier: StorageEntryModifier::Optional,
-					ty: StorageEntryType::NMap {
-						keys: DecodeDifferent::Decoded(vec!["u8".to_string()]),
-						hashers: DecodeDifferent::Decoded(vec![StorageHasher::Blake2_128Concat]),
-						value: DecodeDifferent::Decoded("u32".to_string()),
+					ty: StorageEntryType::Map {
+						key: scale_info::meta_type::<u8>(),
+						hashers: vec![StorageHasher::Blake2_128Concat],
+						value: scale_info::meta_type::<u32>(),
 					},
-					default: DecodeDifferent::Decoded(vec![0]),
-					documentation: DecodeDifferent::Decoded(vec![]),
+					default: vec![0],
+					docs: vec![],
 				},
 				StorageEntryMetadata {
-					name: DecodeDifferent::Decoded("NMap2".to_string()),
+					name: "NMap2",
 					modifier: StorageEntryModifier::Optional,
-					ty: StorageEntryType::NMap {
-						keys: DecodeDifferent::Decoded(vec!["u16".to_string(), "u32".to_string()]),
-						hashers: DecodeDifferent::Decoded(vec![
-							StorageHasher::Twox64Concat,
-							StorageHasher::Blake2_128Concat,
-						]),
-						value: DecodeDifferent::Decoded("u64".to_string()),
+					ty: StorageEntryType::Map {
+						key: scale_info::meta_type::<(u16, u32)>(),
+						hashers: vec![StorageHasher::Twox64Concat, StorageHasher::Blake2_128Concat],
+						value: scale_info::meta_type::<u64>(),
 					},
-					default: DecodeDifferent::Decoded(vec![0]),
-					documentation: DecodeDifferent::Decoded(vec![]),
+					default: vec![0],
+					docs: vec![],
 				},
-			]),
-		})),
-		calls: Some(DecodeDifferent::Decoded(vec![
-			FunctionMetadata {
-				name: DecodeDifferent::Decoded("foo".to_string()),
-				arguments: DecodeDifferent::Decoded(vec![FunctionArgumentMetadata {
-					name: DecodeDifferent::Decoded("_foo".to_string()),
-					ty: DecodeDifferent::Decoded("Compact<u32>".to_string()),
-				}]),
-				documentation: DecodeDifferent::Decoded(vec![
-					" Doc comment put in metadata".to_string()
-				]),
-			},
-			FunctionMetadata {
-				name: DecodeDifferent::Decoded("foo_transactional".to_string()),
-				arguments: DecodeDifferent::Decoded(vec![FunctionArgumentMetadata {
-					name: DecodeDifferent::Decoded("_foo".to_string()),
-					ty: DecodeDifferent::Decoded("Compact<u32>".to_string()),
-				}]),
-				documentation: DecodeDifferent::Decoded(vec![
-					" Doc comment put in metadata".to_string()
-				]),
-			},
-		])),
-		event: Some(DecodeDifferent::Decoded(vec![
-			EventMetadata {
-				name: DecodeDifferent::Decoded("Proposed".to_string()),
-				arguments: DecodeDifferent::Decoded(vec![
-					"<T as frame_system::Config>::AccountId".to_string()
-				]),
-				documentation: DecodeDifferent::Decoded(vec![
-					" doc comment put in metadata".to_string()
-				]),
-			},
-			EventMetadata {
-				name: DecodeDifferent::Decoded("Spending".to_string()),
-				arguments: DecodeDifferent::Decoded(vec!["Balance".to_string()]),
-				documentation: DecodeDifferent::Decoded(vec![" doc".to_string()]),
-			},
-			EventMetadata {
-				name: DecodeDifferent::Decoded("Something".to_string()),
-				arguments: DecodeDifferent::Decoded(vec!["Other".to_string()]),
-				documentation: DecodeDifferent::Decoded(vec![]),
-			},
-		])),
-		constants: DecodeDifferent::Decoded(vec![ModuleConstantMetadata {
-			name: DecodeDifferent::Decoded("MyGetParam".to_string()),
-			ty: DecodeDifferent::Decoded("u32".to_string()),
-			value: DecodeDifferent::Decoded(vec![10, 0, 0, 0]),
-			documentation: DecodeDifferent::Decoded(vec![]),
-		}]),
-		errors: DecodeDifferent::Decoded(vec![ErrorMetadata {
-			name: DecodeDifferent::Decoded("InsufficientProposersBalance".to_string()),
-			documentation: DecodeDifferent::Decoded(vec![
-				" doc comment put into metadata".to_string()
-			]),
-		}]),
+			],
+		}),
+		calls: Some(scale_info::meta_type::<pallet::Call<Runtime>>().into()),
+		event: Some(PalletEventMetadata { ty: scale_info::meta_type::<pallet::Event<Runtime>>() }),
+		constants: vec![PalletConstantMetadata {
+			name: "MyGetParam",
+			ty: scale_info::meta_type::<u32>(),
+			value: vec![10, 0, 0, 0],
+			docs: vec![],
+		}],
+		error: Some(PalletErrorMetadata { ty: scale_info::meta_type::<pallet::Error<Runtime>>() }),
 	};
 
-	let mut expected_pallet_instance1_metadata = expected_pallet_metadata.clone();
-	expected_pallet_instance1_metadata.name =
-		DecodeDifferent::Decoded("Instance1Example".to_string());
-	expected_pallet_instance1_metadata.index = 2;
-	match expected_pallet_instance1_metadata.storage {
-		Some(DecodeDifferent::Decoded(ref mut storage_meta)) => {
-			storage_meta.prefix = DecodeDifferent::Decoded("Instance1Example".to_string());
+	let mut example_pallet_instance1_metadata = example_pallet_metadata.clone();
+	example_pallet_instance1_metadata.name = "Instance1Example";
+	example_pallet_instance1_metadata.index = 2;
+	match example_pallet_instance1_metadata.calls {
+		Some(ref mut calls_meta) => {
+			calls_meta.ty = scale_info::meta_type::<pallet::Call<Runtime, pallet::Instance1>>();
+		},
+		_ => unreachable!(),
+	}
+	match example_pallet_instance1_metadata.event {
+		Some(ref mut event_meta) => {
+			event_meta.ty = scale_info::meta_type::<pallet::Event<Runtime, pallet::Instance1>>();
+		},
+		_ => unreachable!(),
+	}
+	match example_pallet_instance1_metadata.error {
+		Some(ref mut error_meta) => {
+			error_meta.ty = scale_info::meta_type::<pallet::Error<Runtime, pallet::Instance1>>();
+		},
+		_ => unreachable!(),
+	}
+	match example_pallet_instance1_metadata.storage {
+		Some(ref mut storage_meta) => {
+			storage_meta.prefix = "Instance1Example";
 		},
 		_ => unreachable!(),
 	}
 
-	let metadata = match Runtime::metadata().1 {
-		RuntimeMetadata::V13(metadata) => metadata,
-		_ => panic!("metadata has been bump, test needs to be updated"),
+	let pallets =
+		vec![system_pallet_metadata, example_pallet_metadata, example_pallet_instance1_metadata];
+
+	let extrinsic = ExtrinsicMetadata {
+		ty: scale_info::meta_type::<UncheckedExtrinsic>(),
+		version: 4,
+		signed_extensions: vec![SignedExtensionMetadata {
+			identifier: "UnitSignedExtension",
+			ty: scale_info::meta_type::<()>(),
+			additional_signed: scale_info::meta_type::<()>(),
+		}],
 	};
 
-	let modules_metadata = match metadata.modules {
-		DecodeDifferent::Encode(modules_metadata) => modules_metadata,
-		_ => unreachable!(),
+	let expected_metadata: RuntimeMetadataPrefixed =
+		RuntimeMetadataLastVersion::new(pallets, extrinsic, scale_info::meta_type::<Runtime>())
+			.into();
+	let expected_metadata = match expected_metadata.1 {
+		RuntimeMetadata::V14(metadata) => metadata,
+		_ => panic!("metadata has been bumped, test needs to be updated"),
 	};
 
-	let pallet_metadata = ModuleMetadata::decode(&mut &modules_metadata[1].encode()[..]).unwrap();
-	let pallet_instance1_metadata =
-		ModuleMetadata::decode(&mut &modules_metadata[2].encode()[..]).unwrap();
+	let actual_metadata = match Runtime::metadata().1 {
+		RuntimeMetadata::V14(metadata) => metadata,
+		_ => panic!("metadata has been bumped, test needs to be updated"),
+	};
 
-	pretty_assertions::assert_eq!(pallet_metadata, expected_pallet_metadata);
-	pretty_assertions::assert_eq!(pallet_instance1_metadata, expected_pallet_instance1_metadata);
+	pretty_assertions::assert_eq!(actual_metadata.pallets[1], expected_metadata.pallets[1]);
+	pretty_assertions::assert_eq!(actual_metadata.pallets[2], expected_metadata.pallets[2]);
 }
 
 #[test]
diff --git a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.rs b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.rs
index 0f58187f73eb..ee9d692eba9b 100644
--- a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.rs
+++ b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.rs
@@ -5,7 +5,7 @@ mod pallet {
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
-		type Bar: codec::Codec;
+		type Bar: codec::Codec + scale_info::TypeInfo;
 	}
 
 	#[pallet::pallet]
diff --git a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.stderr b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.stderr
index d32d8ada7a11..d1b040c16091 100644
--- a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.stderr
+++ b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.stderr
@@ -1,26 +1,26 @@
 error[E0277]: `<T as pallet::Config>::Bar` doesn't implement `std::fmt::Debug`
-  --> $DIR/call_argument_invalid_bound.rs:20:41
+  --> $DIR/call_argument_invalid_bound.rs:20:36
    |
 20 |         pub fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
-   |                                               ^ `<T as pallet::Config>::Bar` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
+   |                                          ^^^ `<T as pallet::Config>::Bar` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
    |
    = help: the trait `std::fmt::Debug` is not implemented for `<T as pallet::Config>::Bar`
    = note: required because of the requirements on the impl of `std::fmt::Debug` for `&<T as pallet::Config>::Bar`
    = note: required for the cast to the object type `dyn std::fmt::Debug`
 
 error[E0277]: the trait bound `<T as pallet::Config>::Bar: Clone` is not satisfied
-  --> $DIR/call_argument_invalid_bound.rs:20:41
+  --> $DIR/call_argument_invalid_bound.rs:20:36
    |
 20 |         pub fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
-   |                                               ^ the trait `Clone` is not implemented for `<T as pallet::Config>::Bar`
+   |                                          ^^^ the trait `Clone` is not implemented for `<T as pallet::Config>::Bar`
    |
    = note: required by `clone`
 
 error[E0369]: binary operation `==` cannot be applied to type `&<T as pallet::Config>::Bar`
-  --> $DIR/call_argument_invalid_bound.rs:20:41
+  --> $DIR/call_argument_invalid_bound.rs:20:36
    |
 20 |         pub fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
-   |                                               ^
+   |                                          ^^^
    |
 help: consider further restricting this bound
    |
diff --git a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.rs b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.rs
index da87046822eb..d981b55c4862 100644
--- a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.rs
+++ b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.rs
@@ -5,7 +5,7 @@ mod pallet {
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
-		type Bar;
+		type Bar: scale_info::TypeInfo;
 	}
 
 	#[pallet::pallet]
diff --git a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr
index 0e1ebbf52525..84d486367295 100644
--- a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr
+++ b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr
@@ -1,26 +1,26 @@
 error[E0277]: `<T as pallet::Config>::Bar` doesn't implement `std::fmt::Debug`
-  --> $DIR/call_argument_invalid_bound_2.rs:20:41
+  --> $DIR/call_argument_invalid_bound_2.rs:20:36
    |
 20 |         pub fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
-   |                                               ^ `<T as pallet::Config>::Bar` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
+   |                                          ^^^ `<T as pallet::Config>::Bar` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
    |
    = help: the trait `std::fmt::Debug` is not implemented for `<T as pallet::Config>::Bar`
    = note: required because of the requirements on the impl of `std::fmt::Debug` for `&<T as pallet::Config>::Bar`
    = note: required for the cast to the object type `dyn std::fmt::Debug`
 
 error[E0277]: the trait bound `<T as pallet::Config>::Bar: Clone` is not satisfied
-  --> $DIR/call_argument_invalid_bound_2.rs:20:41
+  --> $DIR/call_argument_invalid_bound_2.rs:20:36
    |
 20 |         pub fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
-   |                                               ^ the trait `Clone` is not implemented for `<T as pallet::Config>::Bar`
+   |                                          ^^^ the trait `Clone` is not implemented for `<T as pallet::Config>::Bar`
    |
    = note: required by `clone`
 
 error[E0369]: binary operation `==` cannot be applied to type `&<T as pallet::Config>::Bar`
-  --> $DIR/call_argument_invalid_bound_2.rs:20:41
+  --> $DIR/call_argument_invalid_bound_2.rs:20:36
    |
 20 |         pub fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
-   |                                               ^
+   |                                          ^^^
    |
 help: consider further restricting this bound
    |
@@ -28,23 +28,23 @@ help: consider further restricting this bound
    |                    ^^^^^^^^^^^^^^^^^^^^^
 
 error[E0277]: the trait bound `<T as pallet::Config>::Bar: WrapperTypeEncode` is not satisfied
-   --> $DIR/call_argument_invalid_bound_2.rs:20:41
+   --> $DIR/call_argument_invalid_bound_2.rs:20:36
     |
 20  |         pub fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
-    |                                               ^ the trait `WrapperTypeEncode` is not implemented for `<T as pallet::Config>::Bar`
+    |                                          ^^^ the trait `WrapperTypeEncode` is not implemented for `<T as pallet::Config>::Bar`
     |
    ::: $CARGO/parity-scale-codec-2.2.0/src/codec.rs
     |
     |     fn encode_to<T: Output + ?Sized>(&self, dest: &mut T) {
     |                     ------ required by this bound in `encode_to`
     |
-    = note: required because of the requirements on the impl of `pallet::_::_parity_scale_codec::Encode` for `<T as pallet::Config>::Bar`
+    = note: required because of the requirements on the impl of `Encode` for `<T as pallet::Config>::Bar`
 
 error[E0277]: the trait bound `<T as pallet::Config>::Bar: WrapperTypeDecode` is not satisfied
-   --> $DIR/call_argument_invalid_bound_2.rs:20:41
+   --> $DIR/call_argument_invalid_bound_2.rs:20:36
     |
 20  |         pub fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
-    |                                               ^ the trait `WrapperTypeDecode` is not implemented for `<T as pallet::Config>::Bar`
+    |                                          ^^^ the trait `WrapperTypeDecode` is not implemented for `<T as pallet::Config>::Bar`
     |
    ::: $CARGO/parity-scale-codec-2.2.0/src/codec.rs
     |
diff --git a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.rs b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.rs
index 4a6a781ff44a..e7f99d7ca4f2 100644
--- a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.rs
+++ b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.rs
@@ -13,7 +13,7 @@ mod pallet {
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
 
-	#[derive(Encode, Decode)]
+	#[derive(Encode, Decode, scale_info::TypeInfo)]
 	struct Bar;
 
 	#[pallet::call]
diff --git a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.stderr b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.stderr
index b6f4494033f7..73513907e85f 100644
--- a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.stderr
+++ b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.stderr
@@ -1,8 +1,8 @@
 error[E0277]: `Bar` doesn't implement `std::fmt::Debug`
-  --> $DIR/call_argument_invalid_bound_3.rs:22:41
+  --> $DIR/call_argument_invalid_bound_3.rs:22:36
    |
 22 |         pub fn foo(origin: OriginFor<T>, bar: Bar) -> DispatchResultWithPostInfo {
-   |                                               ^^^ `Bar` cannot be formatted using `{:?}`
+   |                                          ^^^ `Bar` cannot be formatted using `{:?}`
    |
    = help: the trait `std::fmt::Debug` is not implemented for `Bar`
    = note: add `#[derive(Debug)]` or manually implement `std::fmt::Debug`
@@ -10,17 +10,17 @@ error[E0277]: `Bar` doesn't implement `std::fmt::Debug`
    = note: required for the cast to the object type `dyn std::fmt::Debug`
 
 error[E0277]: the trait bound `Bar: Clone` is not satisfied
-  --> $DIR/call_argument_invalid_bound_3.rs:22:41
+  --> $DIR/call_argument_invalid_bound_3.rs:22:36
    |
 22 |         pub fn foo(origin: OriginFor<T>, bar: Bar) -> DispatchResultWithPostInfo {
-   |                                               ^^^ the trait `Clone` is not implemented for `Bar`
+   |                                          ^^^ the trait `Clone` is not implemented for `Bar`
    |
    = note: required by `clone`
 
 error[E0369]: binary operation `==` cannot be applied to type `&Bar`
-  --> $DIR/call_argument_invalid_bound_3.rs:22:41
+  --> $DIR/call_argument_invalid_bound_3.rs:22:36
    |
 22 |         pub fn foo(origin: OriginFor<T>, bar: Bar) -> DispatchResultWithPostInfo {
-   |                                               ^^^
+   |                                          ^^^
    |
    = note: an implementation of `std::cmp::PartialEq` might be missing for `&Bar`
diff --git a/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.stderr b/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.stderr
index aff86e333457..e78eb7ff9537 100644
--- a/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.stderr
+++ b/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.stderr
@@ -1,3 +1,13 @@
+error[E0277]: the trait bound `Bar: TypeInfo` is not satisfied
+  --> $DIR/storage_ensure_span_are_ok_on_wrong_gen.rs:20:12
+   |
+20 |     #[pallet::storage]
+   |               ^^^^^^^ the trait `TypeInfo` is not implemented for `Bar`
+   |
+   = note: required because of the requirements on the impl of `StaticTypeInfo` for `Bar`
+   = note: required because of the requirements on the impl of `frame_support::storage::StorageEntryMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+   = note: required by `NAME`
+
 error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
   --> $DIR/storage_ensure_span_are_ok_on_wrong_gen.rs:20:12
    |
@@ -6,8 +16,8 @@ error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
    |
    = note: required because of the requirements on the impl of `Decode` for `Bar`
    = note: required because of the requirements on the impl of `FullCodec` for `Bar`
-   = note: required because of the requirements on the impl of `StorageValueMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
-   = note: required by `frame_support::storage::types::StorageValueMetadata::NAME`
+   = note: required because of the requirements on the impl of `frame_support::storage::StorageEntryMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+   = note: required by `NAME`
 
 error[E0277]: the trait bound `Bar: EncodeLike` is not satisfied
   --> $DIR/storage_ensure_span_are_ok_on_wrong_gen.rs:20:12
@@ -17,8 +27,8 @@ error[E0277]: the trait bound `Bar: EncodeLike` is not satisfied
    |
    = note: required because of the requirements on the impl of `FullEncode` for `Bar`
    = note: required because of the requirements on the impl of `FullCodec` for `Bar`
-   = note: required because of the requirements on the impl of `StorageValueMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
-   = note: required by `frame_support::storage::types::StorageValueMetadata::NAME`
+   = note: required because of the requirements on the impl of `frame_support::storage::StorageEntryMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+   = note: required by `NAME`
 
 error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
   --> $DIR/storage_ensure_span_are_ok_on_wrong_gen.rs:20:12
@@ -26,11 +36,11 @@ error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
 20 |     #[pallet::storage]
    |               ^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `Bar`
    |
-   = note: required because of the requirements on the impl of `pallet::_::_parity_scale_codec::Encode` for `Bar`
+   = note: required because of the requirements on the impl of `Encode` for `Bar`
    = note: required because of the requirements on the impl of `FullEncode` for `Bar`
    = note: required because of the requirements on the impl of `FullCodec` for `Bar`
-   = note: required because of the requirements on the impl of `StorageValueMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
-   = note: required by `frame_support::storage::types::StorageValueMetadata::NAME`
+   = note: required because of the requirements on the impl of `frame_support::storage::StorageEntryMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+   = note: required by `NAME`
 
 error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
  --> $DIR/storage_ensure_span_are_ok_on_wrong_gen.rs:9:12
@@ -60,7 +70,7 @@ error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
 9 |     #[pallet::pallet]
   |               ^^^^^^ the trait `WrapperTypeEncode` is not implemented for `Bar`
   |
-  = note: required because of the requirements on the impl of `pallet::_::_parity_scale_codec::Encode` for `Bar`
+  = note: required because of the requirements on the impl of `Encode` for `Bar`
   = note: required because of the requirements on the impl of `FullEncode` for `Bar`
   = note: required because of the requirements on the impl of `FullCodec` for `Bar`
   = note: required because of the requirements on the impl of `PartialStorageInfoTrait` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
diff --git a/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.stderr b/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.stderr
index 2f4876554aa5..d9a7ddbf3443 100644
--- a/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.stderr
+++ b/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.stderr
@@ -1,3 +1,13 @@
+error[E0277]: the trait bound `Bar: TypeInfo` is not satisfied
+  --> $DIR/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:20:12
+   |
+20 |     #[pallet::storage]
+   |               ^^^^^^^ the trait `TypeInfo` is not implemented for `Bar`
+   |
+   = note: required because of the requirements on the impl of `StaticTypeInfo` for `Bar`
+   = note: required because of the requirements on the impl of `frame_support::storage::StorageEntryMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+   = note: required by `NAME`
+
 error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
   --> $DIR/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:20:12
    |
@@ -6,8 +16,8 @@ error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
    |
    = note: required because of the requirements on the impl of `Decode` for `Bar`
    = note: required because of the requirements on the impl of `FullCodec` for `Bar`
-   = note: required because of the requirements on the impl of `StorageValueMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
-   = note: required by `frame_support::storage::types::StorageValueMetadata::NAME`
+   = note: required because of the requirements on the impl of `frame_support::storage::StorageEntryMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+   = note: required by `NAME`
 
 error[E0277]: the trait bound `Bar: EncodeLike` is not satisfied
   --> $DIR/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:20:12
@@ -17,8 +27,8 @@ error[E0277]: the trait bound `Bar: EncodeLike` is not satisfied
    |
    = note: required because of the requirements on the impl of `FullEncode` for `Bar`
    = note: required because of the requirements on the impl of `FullCodec` for `Bar`
-   = note: required because of the requirements on the impl of `StorageValueMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
-   = note: required by `frame_support::storage::types::StorageValueMetadata::NAME`
+   = note: required because of the requirements on the impl of `frame_support::storage::StorageEntryMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+   = note: required by `NAME`
 
 error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
   --> $DIR/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:20:12
@@ -26,11 +36,11 @@ error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
 20 |     #[pallet::storage]
    |               ^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `Bar`
    |
-   = note: required because of the requirements on the impl of `pallet::_::_parity_scale_codec::Encode` for `Bar`
+   = note: required because of the requirements on the impl of `Encode` for `Bar`
    = note: required because of the requirements on the impl of `FullEncode` for `Bar`
    = note: required because of the requirements on the impl of `FullCodec` for `Bar`
-   = note: required because of the requirements on the impl of `StorageValueMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
-   = note: required by `frame_support::storage::types::StorageValueMetadata::NAME`
+   = note: required because of the requirements on the impl of `frame_support::storage::StorageEntryMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+   = note: required by `NAME`
 
 error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
  --> $DIR/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:9:12
@@ -60,7 +70,7 @@ error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
 9 |     #[pallet::pallet]
   |               ^^^^^^ the trait `WrapperTypeEncode` is not implemented for `Bar`
   |
-  = note: required because of the requirements on the impl of `pallet::_::_parity_scale_codec::Encode` for `Bar`
+  = note: required because of the requirements on the impl of `Encode` for `Bar`
   = note: required because of the requirements on the impl of `FullEncode` for `Bar`
   = note: required because of the requirements on the impl of `FullCodec` for `Bar`
   = note: required because of the requirements on the impl of `PartialStorageInfoTrait` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
diff --git a/frame/support/test/tests/pallet_ui/storage_info_unsatisfied.rs b/frame/support/test/tests/pallet_ui/storage_info_unsatisfied.rs
index 569e59ef6ec2..76e356610064 100644
--- a/frame/support/test/tests/pallet_ui/storage_info_unsatisfied.rs
+++ b/frame/support/test/tests/pallet_ui/storage_info_unsatisfied.rs
@@ -16,7 +16,7 @@ mod pallet {
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {}
 
-	#[derive(codec::Encode, codec::Decode)]
+	#[derive(codec::Encode, codec::Decode, scale_info::TypeInfo)]
 	struct Bar;
 
 	#[pallet::storage]
diff --git a/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.rs b/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.rs
index 3d03099c3c4b..c5d773d71611 100644
--- a/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.rs
+++ b/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.rs
@@ -16,7 +16,7 @@ mod pallet {
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {}
 
-	#[derive(codec::Encode, codec::Decode)]
+	#[derive(codec::Encode, codec::Decode, scale_info::TypeInfo)]
 	struct Bar;
 
 	#[pallet::storage]
diff --git a/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.stderr b/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.stderr
index 6c92423c6a7f..545520124bfe 100644
--- a/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.stderr
+++ b/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.stderr
@@ -4,6 +4,6 @@ error[E0277]: the trait bound `Bar: MaxEncodedLen` is not satisfied
 10 |     #[pallet::generate_storage_info]
    |               ^^^^^^^^^^^^^^^^^^^^^ the trait `MaxEncodedLen` is not implemented for `Bar`
    |
-   = note: required because of the requirements on the impl of `KeyGeneratorMaxEncodedLen` for `Key<frame_support::Twox64Concat, Bar>`
-   = note: required because of the requirements on the impl of `StorageInfoTrait` for `frame_support::pallet_prelude::StorageNMap<_GeneratedPrefixForStorageFoo<T>, Key<frame_support::Twox64Concat, Bar>, u32>`
+   = note: required because of the requirements on the impl of `KeyGeneratorMaxEncodedLen` for `NMapKey<frame_support::Twox64Concat, Bar>`
+   = note: required because of the requirements on the impl of `StorageInfoTrait` for `frame_support::pallet_prelude::StorageNMap<_GeneratedPrefixForStorageFoo<T>, NMapKey<frame_support::Twox64Concat, Bar>, u32>`
    = note: required by `storage_info`
diff --git a/frame/support/test/tests/system.rs b/frame/support/test/tests/system.rs
index 041932629926..4acc248d25f2 100644
--- a/frame/support/test/tests/system.rs
+++ b/frame/support/test/tests/system.rs
@@ -26,9 +26,9 @@ pub trait Config: 'static + Eq + Clone {
 		+ From<RawOrigin<Self::AccountId>>;
 
 	type BaseCallFilter: frame_support::traits::Contains<Self::Call>;
-	type BlockNumber: Decode + Encode + EncodeLike + Clone + Default;
+	type BlockNumber: Decode + Encode + EncodeLike + Clone + Default + scale_info::TypeInfo;
 	type Hash;
-	type AccountId: Encode + EncodeLike + Decode;
+	type AccountId: Encode + EncodeLike + Decode + scale_info::TypeInfo;
 	type Call;
 	type Event: From<Event<Self>>;
 	type PalletInfo: frame_support::traits::PalletInfo;
@@ -68,7 +68,7 @@ frame_support::decl_error! {
 }
 
 /// Origin for the system module.
-#[derive(PartialEq, Eq, Clone, sp_runtime::RuntimeDebug, Encode, Decode)]
+#[derive(PartialEq, Eq, Clone, sp_runtime::RuntimeDebug, Encode, Decode, scale_info::TypeInfo)]
 pub enum RawOrigin<AccountId> {
 	Root,
 	Signed(AccountId),
diff --git a/frame/system/Cargo.toml b/frame/system/Cargo.toml
index d6e34de2a082..389730107b43 100644
--- a/frame/system/Cargo.toml
+++ b/frame/system/Cargo.toml
@@ -15,6 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.126", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "4.0.0-dev", path = "../../primitives/io", default-features = false }
@@ -33,6 +34,7 @@ default = ["std"]
 std = [
 	"serde",
 	"codec/std",
+	"scale-info/std",
 	"sp-core/std",
 	"sp-std/std",
 	"sp-io/std",
diff --git a/frame/system/benchmarking/Cargo.toml b/frame/system/benchmarking/Cargo.toml
index d7e4e2641d39..29bcccfd7d83 100644
--- a/frame/system/benchmarking/Cargo.toml
+++ b/frame/system/benchmarking/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/std" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/runtime" }
 frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../../benchmarking" }
@@ -28,6 +29,7 @@ sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"sp-runtime/std",
 	"sp-std/std",
 	"frame-benchmarking/std",
diff --git a/frame/system/src/extensions/check_genesis.rs b/frame/system/src/extensions/check_genesis.rs
index 4f561f17c356..6f409d5d3d4a 100644
--- a/frame/system/src/extensions/check_genesis.rs
+++ b/frame/system/src/extensions/check_genesis.rs
@@ -17,13 +17,15 @@
 
 use crate::{Config, Pallet};
 use codec::{Decode, Encode};
+use scale_info::TypeInfo;
 use sp_runtime::{
 	traits::{SignedExtension, Zero},
 	transaction_validity::TransactionValidityError,
 };
 
 /// Genesis hash check to provide replay protection between different networks.
-#[derive(Encode, Decode, Clone, Eq, PartialEq)]
+#[derive(Encode, Decode, Clone, Eq, PartialEq, TypeInfo)]
+#[scale_info(skip_type_params(T))]
 pub struct CheckGenesis<T: Config + Send + Sync>(sp_std::marker::PhantomData<T>);
 
 impl<T: Config + Send + Sync> sp_std::fmt::Debug for CheckGenesis<T> {
diff --git a/frame/system/src/extensions/check_mortality.rs b/frame/system/src/extensions/check_mortality.rs
index 6596939eb9d6..69cca765efea 100644
--- a/frame/system/src/extensions/check_mortality.rs
+++ b/frame/system/src/extensions/check_mortality.rs
@@ -17,6 +17,7 @@
 
 use crate::{BlockHash, Config, Pallet};
 use codec::{Decode, Encode};
+use scale_info::TypeInfo;
 use sp_runtime::{
 	generic::Era,
 	traits::{DispatchInfoOf, SaturatedConversion, SignedExtension},
@@ -26,7 +27,8 @@ use sp_runtime::{
 };
 
 /// Check for transaction mortality.
-#[derive(Encode, Decode, Clone, Eq, PartialEq)]
+#[derive(Encode, Decode, Clone, Eq, PartialEq, TypeInfo)]
+#[scale_info(skip_type_params(T))]
 pub struct CheckMortality<T: Config + Send + Sync>(Era, sp_std::marker::PhantomData<T>);
 
 impl<T: Config + Send + Sync> CheckMortality<T> {
diff --git a/frame/system/src/extensions/check_nonce.rs b/frame/system/src/extensions/check_nonce.rs
index 6eaa9f9e02a4..081a0efa3db7 100644
--- a/frame/system/src/extensions/check_nonce.rs
+++ b/frame/system/src/extensions/check_nonce.rs
@@ -18,6 +18,7 @@
 use crate::Config;
 use codec::{Decode, Encode};
 use frame_support::weights::DispatchInfo;
+use scale_info::TypeInfo;
 use sp_runtime::{
 	traits::{DispatchInfoOf, Dispatchable, One, SignedExtension},
 	transaction_validity::{
@@ -31,7 +32,8 @@ use sp_std::vec;
 ///
 /// Note that this does not set any priority by default. Make sure that AT LEAST one of the signed
 /// extension sets some kind of priority upon validating transactions.
-#[derive(Encode, Decode, Clone, Eq, PartialEq)]
+#[derive(Encode, Decode, Clone, Eq, PartialEq, TypeInfo)]
+#[scale_info(skip_type_params(T))]
 pub struct CheckNonce<T: Config>(#[codec(compact)] T::Index);
 
 impl<T: Config> CheckNonce<T> {
diff --git a/frame/system/src/extensions/check_spec_version.rs b/frame/system/src/extensions/check_spec_version.rs
index 7f5629fefa92..0217aefae6b9 100644
--- a/frame/system/src/extensions/check_spec_version.rs
+++ b/frame/system/src/extensions/check_spec_version.rs
@@ -17,10 +17,12 @@
 
 use crate::{Config, Pallet};
 use codec::{Decode, Encode};
+use scale_info::TypeInfo;
 use sp_runtime::{traits::SignedExtension, transaction_validity::TransactionValidityError};
 
 /// Ensure the runtime version registered in the transaction is the same as at present.
-#[derive(Encode, Decode, Clone, Eq, PartialEq)]
+#[derive(Encode, Decode, Clone, Eq, PartialEq, TypeInfo)]
+#[scale_info(skip_type_params(T))]
 pub struct CheckSpecVersion<T: Config + Send + Sync>(sp_std::marker::PhantomData<T>);
 
 impl<T: Config + Send + Sync> sp_std::fmt::Debug for CheckSpecVersion<T> {
diff --git a/frame/system/src/extensions/check_tx_version.rs b/frame/system/src/extensions/check_tx_version.rs
index badf0292601b..9418d3ff5d93 100644
--- a/frame/system/src/extensions/check_tx_version.rs
+++ b/frame/system/src/extensions/check_tx_version.rs
@@ -17,10 +17,12 @@
 
 use crate::{Config, Pallet};
 use codec::{Decode, Encode};
+use scale_info::TypeInfo;
 use sp_runtime::{traits::SignedExtension, transaction_validity::TransactionValidityError};
 
 /// Ensure the transaction version registered in the transaction is the same as at present.
-#[derive(Encode, Decode, Clone, Eq, PartialEq)]
+#[derive(Encode, Decode, Clone, Eq, PartialEq, TypeInfo)]
+#[scale_info(skip_type_params(T))]
 pub struct CheckTxVersion<T: Config + Send + Sync>(sp_std::marker::PhantomData<T>);
 
 impl<T: Config + Send + Sync> sp_std::fmt::Debug for CheckTxVersion<T> {
diff --git a/frame/system/src/extensions/check_weight.rs b/frame/system/src/extensions/check_weight.rs
index 1e7ad9454b4c..92dc7382fa2d 100644
--- a/frame/system/src/extensions/check_weight.rs
+++ b/frame/system/src/extensions/check_weight.rs
@@ -21,6 +21,7 @@ use frame_support::{
 	traits::Get,
 	weights::{priority::FrameTransactionPriority, DispatchClass, DispatchInfo, PostDispatchInfo},
 };
+use scale_info::TypeInfo;
 use sp_runtime::{
 	traits::{DispatchInfoOf, Dispatchable, PostDispatchInfoOf, SignedExtension},
 	transaction_validity::{
@@ -31,7 +32,8 @@ use sp_runtime::{
 };
 
 /// Block resource (weight) limit check.
-#[derive(Encode, Decode, Clone, Eq, PartialEq, Default)]
+#[derive(Encode, Decode, Clone, Eq, PartialEq, Default, TypeInfo)]
+#[scale_info(skip_type_params(T))]
 pub struct CheckWeight<T: Config + Send + Sync>(sp_std::marker::PhantomData<T>);
 
 impl<T: Config + Send + Sync> CheckWeight<T>
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index 3d89e09a25a7..2e7f26eef16f 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -94,6 +94,7 @@ use frame_support::{
 	},
 	Parameter,
 };
+use scale_info::TypeInfo;
 use sp_core::{storage::well_known_keys, ChangesTrieConfiguration};
 
 #[cfg(feature = "std")]
@@ -204,7 +205,8 @@ pub mod pallet {
 			+ sp_std::hash::Hash
 			+ sp_std::str::FromStr
 			+ MaybeMallocSizeOf
-			+ MaxEncodedLen;
+			+ MaxEncodedLen
+			+ TypeInfo;
 
 		/// The output of the `Hashing` function.
 		type Hash: Parameter
@@ -224,7 +226,7 @@ pub mod pallet {
 			+ MaxEncodedLen;
 
 		/// The hashing system (algorithm) being used in the runtime (e.g. Blake2).
-		type Hashing: Hash<Output = Self::Hash>;
+		type Hashing: Hash<Output = Self::Hash> + TypeInfo;
 
 		/// The user account identifier type for the runtime.
 		type AccountId: Parameter
@@ -276,7 +278,7 @@ pub mod pallet {
 
 		/// Data to be associated with an account (other than nonce/transaction counter, which this
 		/// pallet does regardless).
-		type AccountData: Member + FullCodec + Clone + Default;
+		type AccountData: Member + FullCodec + Clone + Default + TypeInfo;
 
 		/// Handler for when a new account has just been created.
 		type OnNewAccount: OnNewAccount<Self::AccountId>;
@@ -522,7 +524,6 @@ pub mod pallet {
 
 	/// Event for the System pallet.
 	#[pallet::event]
-	#[pallet::metadata(T::AccountId = "AccountId", T::Hash = "Hash")]
 	pub enum Event<T: Config> {
 		/// An extrinsic completed successfully. \[info\]
 		ExtrinsicSuccess(DispatchInfo),
@@ -763,7 +764,7 @@ pub type Key = Vec<u8>;
 pub type KeyValue = (Vec<u8>, Vec<u8>);
 
 /// A phase of a block's execution.
-#[derive(Encode, Decode, RuntimeDebug)]
+#[derive(Encode, Decode, RuntimeDebug, TypeInfo)]
 #[cfg_attr(feature = "std", derive(Serialize, PartialEq, Eq, Clone))]
 pub enum Phase {
 	/// Applying an extrinsic.
@@ -781,7 +782,7 @@ impl Default for Phase {
 }
 
 /// Record of an event happening.
-#[derive(Encode, Decode, RuntimeDebug)]
+#[derive(Encode, Decode, RuntimeDebug, TypeInfo)]
 #[cfg_attr(feature = "std", derive(Serialize, PartialEq, Eq, Clone))]
 pub struct EventRecord<E: Parameter + Member, T> {
 	/// The phase of the block it happened in.
@@ -793,7 +794,7 @@ pub struct EventRecord<E: Parameter + Member, T> {
 }
 
 /// Origin for the System pallet.
-#[derive(PartialEq, Eq, Clone, RuntimeDebug, Encode, Decode)]
+#[derive(PartialEq, Eq, Clone, RuntimeDebug, Encode, Decode, TypeInfo)]
 pub enum RawOrigin<AccountId> {
 	/// The system itself ordained this dispatch to happen: this is the highest privilege level.
 	Root,
@@ -833,7 +834,7 @@ type EventIndex = u32;
 pub type RefCount = u32;
 
 /// Information of an account.
-#[derive(Clone, Eq, PartialEq, Default, RuntimeDebug, Encode, Decode)]
+#[derive(Clone, Eq, PartialEq, Default, RuntimeDebug, Encode, Decode, TypeInfo)]
 pub struct AccountInfo<Index, AccountData> {
 	/// The number of transactions this account has sent.
 	pub nonce: Index,
@@ -853,7 +854,7 @@ pub struct AccountInfo<Index, AccountData> {
 
 /// Stores the `spec_version` and `spec_name` of when the last runtime upgrade
 /// happened.
-#[derive(sp_runtime::RuntimeDebug, Encode, Decode)]
+#[derive(sp_runtime::RuntimeDebug, Encode, Decode, TypeInfo)]
 #[cfg_attr(feature = "std", derive(PartialEq))]
 pub struct LastRuntimeUpgradeInfo {
 	pub spec_version: codec::Compact<u32>,
diff --git a/frame/system/src/limits.rs b/frame/system/src/limits.rs
index 74ffc828314b..687fb6f3dd36 100644
--- a/frame/system/src/limits.rs
+++ b/frame/system/src/limits.rs
@@ -26,10 +26,11 @@
 //! which should be passed to `frame_system` configuration when runtime is being set up.
 
 use frame_support::weights::{constants, DispatchClass, OneOrMany, PerDispatchClass, Weight};
+use scale_info::TypeInfo;
 use sp_runtime::{Perbill, RuntimeDebug};
 
 /// Block length limit configuration.
-#[derive(RuntimeDebug, Clone, codec::Encode, codec::Decode)]
+#[derive(RuntimeDebug, Clone, codec::Encode, codec::Decode, TypeInfo)]
 pub struct BlockLength {
 	/// Maximal total length in bytes for each extrinsic class.
 	///
@@ -91,7 +92,7 @@ pub type ValidationResult = Result<BlockWeights, ValidationErrors>;
 const DEFAULT_NORMAL_RATIO: Perbill = Perbill::from_percent(75);
 
 /// `DispatchClass`-specific weight configuration.
-#[derive(RuntimeDebug, Clone, codec::Encode, codec::Decode)]
+#[derive(RuntimeDebug, Clone, codec::Encode, codec::Decode, TypeInfo)]
 pub struct WeightsPerClass {
 	/// Base weight of single extrinsic of given class.
 	pub base_extrinsic: Weight,
@@ -191,7 +192,7 @@ pub struct WeightsPerClass {
 ///
 /// As a consequence of `reserved` space, total consumed block weight might exceed `max_block`
 /// value, so this parameter should rather be thought of as "target block weight" than a hard limit.
-#[derive(RuntimeDebug, Clone, codec::Encode, codec::Decode)]
+#[derive(RuntimeDebug, Clone, codec::Encode, codec::Decode, TypeInfo)]
 pub struct BlockWeights {
 	/// Base weight of block execution.
 	pub base_block: Weight,
diff --git a/frame/system/src/mock.rs b/frame/system/src/mock.rs
index 8039b73445ae..9dd35691cab8 100644
--- a/frame/system/src/mock.rs
+++ b/frame/system/src/mock.rs
@@ -116,7 +116,8 @@ impl Config for Test {
 pub type SysEvent = frame_system::Event<Test>;
 
 /// A simple call, which one doesn't matter.
-pub const CALL: &<Test as Config>::Call = &Call::System(frame_system::Call::set_heap_pages(0u64));
+pub const CALL: &<Test as Config>::Call =
+	&Call::System(frame_system::Call::set_heap_pages { pages: 0u64 });
 
 /// Create new externalities for `System` module tests.
 pub fn new_test_ext() -> sp_io::TestExternalities {
diff --git a/frame/system/src/offchain.rs b/frame/system/src/offchain.rs
index e9f3d82ea3c2..ed758a2556b7 100644
--- a/frame/system/src/offchain.rs
+++ b/frame/system/src/offchain.rs
@@ -453,10 +453,11 @@ pub trait SigningTypes: crate::Config {
 		+ IdentifyAccount<AccountId = Self::AccountId>
 		+ core::fmt::Debug
 		+ codec::Codec
-		+ Ord;
+		+ Ord
+		+ scale_info::TypeInfo;
 
 	/// A matching `Signature` type.
-	type Signature: Clone + PartialEq + core::fmt::Debug + codec::Codec;
+	type Signature: Clone + PartialEq + core::fmt::Debug + codec::Codec + scale_info::TypeInfo;
 }
 
 /// A definition of types required to submit transactions from within the runtime.
diff --git a/frame/timestamp/Cargo.toml b/frame/timestamp/Cargo.toml
index cdf31b1e7ae2..1c95c4782b5c 100644
--- a/frame/timestamp/Cargo.toml
+++ b/frame/timestamp/Cargo.toml
@@ -16,6 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io", optional = true }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
@@ -35,6 +36,7 @@ default = ["std"]
 std = [
 	"sp-inherents/std",
 	"codec/std",
+	"scale-info/std",
 	"sp-std/std",
 	"sp-runtime/std",
 	"frame-benchmarking/std",
diff --git a/frame/timestamp/src/lib.rs b/frame/timestamp/src/lib.rs
index a1ff8d37ff88..153606bedbac 100644
--- a/frame/timestamp/src/lib.rs
+++ b/frame/timestamp/src/lib.rs
@@ -120,7 +120,8 @@ pub mod pallet {
 			+ AtLeast32Bit
 			+ Scale<Self::BlockNumber, Output = Self::Moment>
 			+ Copy
-			+ MaxEncodedLen;
+			+ MaxEncodedLen
+			+ scale_info::StaticTypeInfo;
 
 		/// Something which can be notified when the timestamp is set. Set this to `()` if not
 		/// needed.
@@ -221,7 +222,7 @@ pub mod pallet {
 			let data = (*inherent_data).saturated_into::<T::Moment>();
 
 			let next_time = cmp::max(data, Self::now() + T::MinimumPeriod::get());
-			Some(Call::set(next_time.into()))
+			Some(Call::set { now: next_time.into() })
 		}
 
 		fn check_inherent(
@@ -232,7 +233,7 @@ pub mod pallet {
 				sp_timestamp::Timestamp::new(30 * 1000);
 
 			let t: u64 = match call {
-				Call::set(ref t) => t.clone().saturated_into::<u64>(),
+				Call::set { ref now } => now.clone().saturated_into::<u64>(),
 				_ => return Ok(()),
 			};
 
@@ -252,7 +253,7 @@ pub mod pallet {
 		}
 
 		fn is_inherent(call: &Self::Call) -> bool {
-			matches!(call, Call::set(_))
+			matches!(call, Call::set { .. })
 		}
 	}
 }
diff --git a/frame/tips/Cargo.toml b/frame/tips/Cargo.toml
index d706552393e6..8ca395e1c541 100644
--- a/frame/tips/Cargo.toml
+++ b/frame/tips/Cargo.toml
@@ -15,6 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 log = { version = "0.4.0", default-features = false }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.126", features = ["derive"], optional = true }
 
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
@@ -37,6 +38,7 @@ default = ["std"]
 std = [
 	"codec/std",
 	"log/std",
+	"scale-info/std",
 	"serde",
 
 	"sp-core/std",
diff --git a/frame/tips/src/lib.rs b/frame/tips/src/lib.rs
index 50abe4684cde..f4a4edb7b399 100644
--- a/frame/tips/src/lib.rs
+++ b/frame/tips/src/lib.rs
@@ -83,7 +83,7 @@ pub type NegativeImbalanceOf<T> = pallet_treasury::NegativeImbalanceOf<T>;
 
 /// An open tipping "motion". Retains all details of a tip including information on the finder
 /// and the members who have voted.
-#[derive(Clone, Eq, PartialEq, Encode, Decode, RuntimeDebug)]
+#[derive(Clone, Eq, PartialEq, Encode, Decode, RuntimeDebug, scale_info::TypeInfo)]
 pub struct OpenTip<
 	AccountId: Parameter,
 	Balance: Parameter,
@@ -177,7 +177,6 @@ pub mod pallet {
 	pub type Reasons<T: Config> = StorageMap<_, Identity, T::Hash, Vec<u8>, OptionQuery>;
 
 	#[pallet::event]
-	#[pallet::metadata(T::Hash = "Hash", T::AccountId = "AccountId", BalanceOf<T> = "Balance")]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
 	pub enum Event<T: Config> {
 		/// A new tip suggestion has been opened. \[tip_hash\]
diff --git a/frame/transaction-payment/Cargo.toml b/frame/transaction-payment/Cargo.toml
index 0bcc422bb847..546939692bba 100644
--- a/frame/transaction-payment/Cargo.toml
+++ b/frame/transaction-payment/Cargo.toml
@@ -16,6 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
 	"derive",
 ] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.126", optional = true }
 smallvec = "1.4.1"
 
@@ -36,6 +37,7 @@ default = ["std"]
 std = [
 	"serde",
 	"codec/std",
+	"scale-info/std",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
index 9e8dbf6cb5d1..e3a3bccc3d39 100644
--- a/frame/transaction-payment/src/lib.rs
+++ b/frame/transaction-payment/src/lib.rs
@@ -48,6 +48,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use codec::{Decode, Encode};
+use scale_info::TypeInfo;
 
 use sp_runtime::{
 	traits::{
@@ -225,7 +226,7 @@ where
 }
 
 /// Storage releases of the pallet.
-#[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, RuntimeDebug)]
+#[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, RuntimeDebug, TypeInfo)]
 enum Releases {
 	/// Original version of the pallet.
 	V1Ancient,
@@ -522,7 +523,8 @@ where
 
 /// Require the transactor pay for themselves and maybe include a tip to gain additional priority
 /// in the queue.
-#[derive(Encode, Decode, Clone, Eq, PartialEq)]
+#[derive(Encode, Decode, Clone, Eq, PartialEq, TypeInfo)]
+#[scale_info(skip_type_params(T))]
 pub struct ChargeTransactionPayment<T: Config>(#[codec(compact)] BalanceOf<T>);
 
 impl<T: Config> ChargeTransactionPayment<T>
@@ -714,7 +716,7 @@ mod tests {
 	);
 
 	const CALL: &<Runtime as frame_system::Config>::Call =
-		&Call::Balances(BalancesCall::transfer(2, 69));
+		&Call::Balances(BalancesCall::transfer { dest: 2, value: 69 });
 
 	thread_local! {
 		static EXTRINSIC_BASE_WEIGHT: RefCell<u64> = RefCell::new(0);
@@ -1054,7 +1056,7 @@ mod tests {
 
 	#[test]
 	fn query_info_works() {
-		let call = Call::Balances(BalancesCall::transfer(2, 69));
+		let call = Call::Balances(BalancesCall::transfer { dest: 2, value: 69 });
 		let origin = 111111;
 		let extra = ();
 		let xt = TestXt::new(call, Some((origin, extra)));
diff --git a/frame/transaction-payment/src/payment.rs b/frame/transaction-payment/src/payment.rs
index 832e4d5359a1..58e6ef63109a 100644
--- a/frame/transaction-payment/src/payment.rs
+++ b/frame/transaction-payment/src/payment.rs
@@ -27,7 +27,8 @@ pub trait OnChargeTransaction<T: Config> {
 		+ Copy
 		+ MaybeSerializeDeserialize
 		+ Debug
-		+ Default;
+		+ Default
+		+ scale_info::TypeInfo;
 	type LiquidityInfo: Default;
 
 	/// Before the transaction is executed the payment of the transaction fees
diff --git a/frame/transaction-storage/Cargo.toml b/frame/transaction-storage/Cargo.toml
index 74f31ffed4b3..a4ebd5cfbc87 100644
--- a/frame/transaction-storage/Cargo.toml
+++ b/frame/transaction-storage/Cargo.toml
@@ -16,6 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 serde = { version = "1.0.126", optional = true }
 hex-literal = { version = "0.3.1", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 pallet-balances = { version = "4.0.0-dev", default-features = false, path = "../balances" }
@@ -36,6 +37,7 @@ runtime-benchmarks = ["frame-benchmarking", "hex-literal"]
 std = [
 	"serde",
 	"codec/std",
+	"scale-info/std",
 	"sp-runtime/std",
 	"frame-support/std",
 	"frame-system/std",
diff --git a/frame/transaction-storage/src/lib.rs b/frame/transaction-storage/src/lib.rs
index 1b751f3b214c..2fe3c04e0229 100644
--- a/frame/transaction-storage/src/lib.rs
+++ b/frame/transaction-storage/src/lib.rs
@@ -57,7 +57,7 @@ pub const DEFAULT_MAX_TRANSACTION_SIZE: u32 = 8 * 1024 * 1024;
 pub const DEFAULT_MAX_BLOCK_TRANSACTIONS: u32 = 512;
 
 /// State data for a stored transaction.
-#[derive(Encode, Decode, Clone, sp_runtime::RuntimeDebug, PartialEq, Eq)]
+#[derive(Encode, Decode, Clone, sp_runtime::RuntimeDebug, PartialEq, Eq, scale_info::TypeInfo)]
 pub struct TransactionInfo {
 	/// Chunk trie root.
 	chunk_root: <BlakeTwo256 as Hash>::Output,
@@ -408,7 +408,7 @@ pub mod pallet {
 			let proof = data
 				.get_data::<TransactionStorageProof>(&Self::INHERENT_IDENTIFIER)
 				.unwrap_or(None);
-			proof.map(Call::check_proof)
+			proof.map(|proof| Call::check_proof { proof })
 		}
 
 		fn check_inherent(
@@ -419,7 +419,7 @@ pub mod pallet {
 		}
 
 		fn is_inherent(call: &Self::Call) -> bool {
-			matches!(call, Call::check_proof(_))
+			matches!(call, Call::check_proof { .. })
 		}
 	}
 
diff --git a/frame/treasury/Cargo.toml b/frame/treasury/Cargo.toml
index c670cc1e439f..b2991f3febca 100644
--- a/frame/treasury/Cargo.toml
+++ b/frame/treasury/Cargo.toml
@@ -17,6 +17,7 @@ codec = { package = "parity-scale-codec", version = "2.2.0", default-features =
 	"derive",
 	"max-encoded-len",
 ] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.126", features = ["derive"], optional = true }
 impl-trait-for-tuples = "0.2.1"
 
@@ -37,6 +38,7 @@ sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"serde",
 	"sp-std/std",
 	"sp-runtime/std",
diff --git a/frame/treasury/src/lib.rs b/frame/treasury/src/lib.rs
index 965f06731c94..646baa99b99b 100644
--- a/frame/treasury/src/lib.rs
+++ b/frame/treasury/src/lib.rs
@@ -63,6 +63,7 @@ mod tests;
 pub mod weights;
 
 use codec::{Decode, Encode, MaxEncodedLen};
+use scale_info::TypeInfo;
 
 use sp_runtime::{
 	traits::{AccountIdConversion, Saturating, StaticLookup, Zero},
@@ -118,7 +119,7 @@ pub type ProposalIndex = u32;
 
 /// A spending proposal.
 #[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Encode, Decode, Clone, PartialEq, Eq, MaxEncodedLen, RuntimeDebug)]
+#[derive(Encode, Decode, Clone, PartialEq, Eq, MaxEncodedLen, RuntimeDebug, TypeInfo)]
 pub struct Proposal<AccountId, Balance> {
 	/// The account proposing it.
 	proposer: AccountId,
@@ -253,7 +254,6 @@ pub mod pallet {
 
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
-	#[pallet::metadata(T::AccountId = "AccountId", BalanceOf<T, I> = "Balance")]
 	pub enum Event<T: Config<I>, I: 'static = ()> {
 		/// New proposal. \[proposal_index\]
 		Proposed(ProposalIndex),
diff --git a/frame/uniques/Cargo.toml b/frame/uniques/Cargo.toml
index 32a283fc36d2..4f664ecc2b6a 100644
--- a/frame/uniques/Cargo.toml
+++ b/frame/uniques/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
@@ -30,6 +31,7 @@ pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"sp-std/std",
 	"sp-runtime/std",
 	"frame-support/std",
diff --git a/frame/uniques/src/benchmarking.rs b/frame/uniques/src/benchmarking.rs
index 20ddbb15d536..5c777dc961e9 100644
--- a/frame/uniques/src/benchmarking.rs
+++ b/frame/uniques/src/benchmarking.rs
@@ -286,15 +286,15 @@ benchmarks_instance_pallet! {
 	force_asset_status {
 		let (class, caller, caller_lookup) = create_class::<T, I>();
 		let origin = T::ForceOrigin::successful_origin();
-		let call = Call::<T, I>::force_asset_status(
+		let call = Call::<T, I>::force_asset_status {
 			class,
-			caller_lookup.clone(),
-			caller_lookup.clone(),
-			caller_lookup.clone(),
-			caller_lookup.clone(),
-			true,
-			false,
-		);
+			owner: caller_lookup.clone(),
+			issuer: caller_lookup.clone(),
+			admin: caller_lookup.clone(),
+			freezer: caller_lookup.clone(),
+			free_holding: true,
+			is_frozen: false,
+		};
 	}: { call.dispatch_bypass_filter(origin)? }
 	verify {
 		assert_last_event::<T, I>(Event::AssetStatusChanged(class).into());
diff --git a/frame/uniques/src/lib.rs b/frame/uniques/src/lib.rs
index b4a0b9821683..8c716694051b 100644
--- a/frame/uniques/src/lib.rs
+++ b/frame/uniques/src/lib.rs
@@ -190,11 +190,6 @@ pub mod pallet {
 
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
-	#[pallet::metadata(
-		T::AccountId = "AccountId",
-		T::ClassId = "ClassId",
-		T::InstanceId = "InstanceId"
-	)]
 	pub enum Event<T: Config<I>, I: 'static = ()> {
 		/// An asset class was created. \[ class, creator, owner \]
 		Created(T::ClassId, T::AccountId, T::AccountId),
diff --git a/frame/uniques/src/types.rs b/frame/uniques/src/types.rs
index ae61b6b5e1fd..1e4405aa09c8 100644
--- a/frame/uniques/src/types.rs
+++ b/frame/uniques/src/types.rs
@@ -19,6 +19,7 @@
 
 use super::*;
 use frame_support::{traits::Get, BoundedVec};
+use scale_info::TypeInfo;
 
 pub(super) type DepositBalanceOf<T, I = ()> =
 	<<T as Config<I>>::Currency as Currency<<T as SystemConfig>::AccountId>>::Balance;
@@ -27,7 +28,7 @@ pub(super) type ClassDetailsFor<T, I> =
 pub(super) type InstanceDetailsFor<T, I> =
 	InstanceDetails<<T as SystemConfig>::AccountId, DepositBalanceOf<T, I>>;
 
-#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug)]
+#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, TypeInfo)]
 pub struct ClassDetails<AccountId, DepositBalance> {
 	/// Can change `owner`, `issuer`, `freezer` and `admin` accounts.
 	pub(super) owner: AccountId,
@@ -53,7 +54,7 @@ pub struct ClassDetails<AccountId, DepositBalance> {
 }
 
 /// Witness data for the destroy transactions.
-#[derive(Copy, Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug)]
+#[derive(Copy, Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, TypeInfo)]
 pub struct DestroyWitness {
 	/// The total number of outstanding instances of this asset class.
 	#[codec(compact)]
@@ -77,7 +78,7 @@ impl<AccountId, DepositBalance> ClassDetails<AccountId, DepositBalance> {
 }
 
 /// Information concerning the ownership of a single unique asset.
-#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default)]
+#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default, TypeInfo)]
 pub struct InstanceDetails<AccountId, DepositBalance> {
 	/// The owner of this asset.
 	pub(super) owner: AccountId,
@@ -90,7 +91,8 @@ pub struct InstanceDetails<AccountId, DepositBalance> {
 	pub(super) deposit: DepositBalance,
 }
 
-#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default)]
+#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default, TypeInfo)]
+#[scale_info(skip_type_params(StringLimit))]
 pub struct ClassMetadata<DepositBalance, StringLimit: Get<u32>> {
 	/// The balance deposited for this metadata.
 	///
@@ -104,7 +106,8 @@ pub struct ClassMetadata<DepositBalance, StringLimit: Get<u32>> {
 	pub(super) is_frozen: bool,
 }
 
-#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default)]
+#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default, TypeInfo)]
+#[scale_info(skip_type_params(StringLimit))]
 pub struct InstanceMetadata<DepositBalance, StringLimit: Get<u32>> {
 	/// The balance deposited for this metadata.
 	///
diff --git a/frame/utility/Cargo.toml b/frame/utility/Cargo.toml
index d3e2933faf9a..b5b8eab9cdbf 100644
--- a/frame/utility/Cargo.toml
+++ b/frame/utility/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
@@ -31,6 +32,7 @@ pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"sp-runtime/std",
 	"frame-support/std",
 	"frame-system/std",
diff --git a/frame/utility/src/benchmarking.rs b/frame/utility/src/benchmarking.rs
index 9fd0184b8fa3..210a6156499c 100644
--- a/frame/utility/src/benchmarking.rs
+++ b/frame/utility/src/benchmarking.rs
@@ -34,7 +34,7 @@ benchmarks! {
 		let c in 0 .. 1000;
 		let mut calls: Vec<<T as Config>::Call> = Vec::new();
 		for i in 0 .. c {
-			let call = frame_system::Call::remark(vec![]).into();
+			let call = frame_system::Call::remark { remark: vec![] }.into();
 			calls.push(call);
 		}
 		let caller = whitelisted_caller();
@@ -45,7 +45,7 @@ benchmarks! {
 
 	as_derivative {
 		let caller = account("caller", SEED, SEED);
-		let call = Box::new(frame_system::Call::remark(vec![]).into());
+		let call = Box::new(frame_system::Call::remark { remark: vec![] }.into());
 		// Whitelist caller account from further DB operations.
 		let caller_key = frame_system::Account::<T>::hashed_key_for(&caller);
 		frame_benchmarking::benchmarking::add_to_whitelist(caller_key.into());
@@ -55,7 +55,7 @@ benchmarks! {
 		let c in 0 .. 1000;
 		let mut calls: Vec<<T as Config>::Call> = Vec::new();
 		for i in 0 .. c {
-			let call = frame_system::Call::remark(vec![]).into();
+			let call = frame_system::Call::remark { remark: vec![] }.into();
 			calls.push(call);
 		}
 		let caller = whitelisted_caller();
diff --git a/frame/utility/src/lib.rs b/frame/utility/src/lib.rs
index 2e34502494c7..54de87c4740c 100644
--- a/frame/utility/src/lib.rs
+++ b/frame/utility/src/lib.rs
@@ -304,7 +304,7 @@ pub mod pallet {
 					// Don't allow users to nest `batch_all` calls.
 					filtered_origin.add_filter(move |c: &<T as frame_system::Config>::Call| {
 						let c = <T as Config>::Call::from_ref(c);
-						!matches!(c.is_sub_type(), Some(Call::batch_all(_)))
+						!matches!(c.is_sub_type(), Some(Call::batch_all { .. }))
 					});
 					call.dispatch(filtered_origin)
 				};
diff --git a/frame/utility/src/tests.rs b/frame/utility/src/tests.rs
index 0a780550f355..bbfbb417e23d 100644
--- a/frame/utility/src/tests.rs
+++ b/frame/utility/src/tests.rs
@@ -155,10 +155,10 @@ impl Contains<Call> for TestBaseCallFilter {
 	fn contains(c: &Call) -> bool {
 		match *c {
 			// Transfer works. Use `transfer_keep_alive` for a call that doesn't pass the filter.
-			Call::Balances(pallet_balances::Call::transfer(..)) => true,
+			Call::Balances(pallet_balances::Call::transfer { .. }) => true,
 			Call::Utility(_) => true,
 			// For benchmarking, this acts as a noop call
-			Call::System(frame_system::Call::remark(..)) => true,
+			Call::System(frame_system::Call::remark { .. }) => true,
 			// For tests
 			Call::Example(_) => true,
 			_ => false,
@@ -189,24 +189,24 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 	ext
 }
 
+fn call_transfer(dest: u64, value: u64) -> Call {
+	Call::Balances(BalancesCall::transfer { dest, value })
+}
+
+fn call_foobar(err: bool, start_weight: u64, end_weight: Option<u64>) -> Call {
+	Call::Example(ExampleCall::foobar { err, start_weight, end_weight })
+}
+
 #[test]
 fn as_derivative_works() {
 	new_test_ext().execute_with(|| {
 		let sub_1_0 = Utility::derivative_account_id(1, 0);
 		assert_ok!(Balances::transfer(Origin::signed(1), sub_1_0, 5));
 		assert_err_ignore_postinfo!(
-			Utility::as_derivative(
-				Origin::signed(1),
-				1,
-				Box::new(Call::Balances(BalancesCall::transfer(6, 3))),
-			),
+			Utility::as_derivative(Origin::signed(1), 1, Box::new(call_transfer(6, 3)),),
 			BalancesError::<Test, _>::InsufficientBalance
 		);
-		assert_ok!(Utility::as_derivative(
-			Origin::signed(1),
-			0,
-			Box::new(Call::Balances(BalancesCall::transfer(2, 3))),
-		));
+		assert_ok!(Utility::as_derivative(Origin::signed(1), 0, Box::new(call_transfer(2, 3)),));
 		assert_eq!(Balances::free_balance(sub_1_0), 2);
 		assert_eq!(Balances::free_balance(2), 13);
 	});
@@ -220,16 +220,18 @@ fn as_derivative_handles_weight_refund() {
 		let diff = start_weight - end_weight;
 
 		// Full weight when ok
-		let inner_call = Call::Example(ExampleCall::foobar(false, start_weight, None));
-		let call = Call::Utility(UtilityCall::as_derivative(0, Box::new(inner_call)));
+		let inner_call = call_foobar(false, start_weight, None);
+		let call =
+			Call::Utility(UtilityCall::as_derivative { index: 0, call: Box::new(inner_call) });
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(Origin::signed(1));
 		assert_ok!(result);
 		assert_eq!(extract_actual_weight(&result, &info), info.weight);
 
 		// Refund weight when ok
-		let inner_call = Call::Example(ExampleCall::foobar(false, start_weight, Some(end_weight)));
-		let call = Call::Utility(UtilityCall::as_derivative(0, Box::new(inner_call)));
+		let inner_call = call_foobar(false, start_weight, Some(end_weight));
+		let call =
+			Call::Utility(UtilityCall::as_derivative { index: 0, call: Box::new(inner_call) });
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(Origin::signed(1));
 		assert_ok!(result);
@@ -237,8 +239,9 @@ fn as_derivative_handles_weight_refund() {
 		assert_eq!(extract_actual_weight(&result, &info), info.weight - diff);
 
 		// Full weight when err
-		let inner_call = Call::Example(ExampleCall::foobar(true, start_weight, None));
-		let call = Call::Utility(UtilityCall::as_derivative(0, Box::new(inner_call)));
+		let inner_call = call_foobar(true, start_weight, None);
+		let call =
+			Call::Utility(UtilityCall::as_derivative { index: 0, call: Box::new(inner_call) });
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(Origin::signed(1));
 		assert_noop!(
@@ -254,8 +257,9 @@ fn as_derivative_handles_weight_refund() {
 		);
 
 		// Refund weight when err
-		let inner_call = Call::Example(ExampleCall::foobar(true, start_weight, Some(end_weight)));
-		let call = Call::Utility(UtilityCall::as_derivative(0, Box::new(inner_call)));
+		let inner_call = call_foobar(true, start_weight, Some(end_weight));
+		let call =
+			Call::Utility(UtilityCall::as_derivative { index: 0, call: Box::new(inner_call) });
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(Origin::signed(1));
 		assert_noop!(
@@ -279,7 +283,10 @@ fn as_derivative_filters() {
 			Utility::as_derivative(
 				Origin::signed(1),
 				1,
-				Box::new(Call::Balances(pallet_balances::Call::transfer_keep_alive(2, 1))),
+				Box::new(Call::Balances(pallet_balances::Call::transfer_keep_alive {
+					dest: 2,
+					value: 1
+				})),
 			),
 			DispatchError::BadOrigin
 		);
@@ -290,15 +297,16 @@ fn as_derivative_filters() {
 fn batch_with_root_works() {
 	new_test_ext().execute_with(|| {
 		let k = b"a".to_vec();
-		let call = Call::System(frame_system::Call::set_storage(vec![(k.clone(), k.clone())]));
+		let call =
+			Call::System(frame_system::Call::set_storage { items: vec![(k.clone(), k.clone())] });
 		assert!(!TestBaseCallFilter::contains(&call));
 		assert_eq!(Balances::free_balance(1), 10);
 		assert_eq!(Balances::free_balance(2), 10);
 		assert_ok!(Utility::batch(
 			Origin::root(),
 			vec![
-				Call::Balances(BalancesCall::force_transfer(1, 2, 5)),
-				Call::Balances(BalancesCall::force_transfer(1, 2, 5)),
+				Call::Balances(BalancesCall::force_transfer { source: 1, dest: 2, value: 5 }),
+				Call::Balances(BalancesCall::force_transfer { source: 1, dest: 2, value: 5 }),
 				call, // Check filters are correctly bypassed
 			]
 		));
@@ -315,10 +323,7 @@ fn batch_with_signed_works() {
 		assert_eq!(Balances::free_balance(2), 10);
 		assert_ok!(Utility::batch(
 			Origin::signed(1),
-			vec![
-				Call::Balances(BalancesCall::transfer(2, 5)),
-				Call::Balances(BalancesCall::transfer(2, 5))
-			]
+			vec![call_transfer(2, 5), call_transfer(2, 5)]
 		),);
 		assert_eq!(Balances::free_balance(1), 0);
 		assert_eq!(Balances::free_balance(2), 20);
@@ -330,7 +335,7 @@ fn batch_with_signed_filters() {
 	new_test_ext().execute_with(|| {
 		assert_ok!(Utility::batch(
 			Origin::signed(1),
-			vec![Call::Balances(pallet_balances::Call::transfer_keep_alive(2, 1))]
+			vec![Call::Balances(pallet_balances::Call::transfer_keep_alive { dest: 2, value: 1 })]
 		),);
 		System::assert_last_event(
 			utility::Event::BatchInterrupted(0, DispatchError::BadOrigin).into(),
@@ -345,11 +350,7 @@ fn batch_early_exit_works() {
 		assert_eq!(Balances::free_balance(2), 10);
 		assert_ok!(Utility::batch(
 			Origin::signed(1),
-			vec![
-				Call::Balances(BalancesCall::transfer(2, 5)),
-				Call::Balances(BalancesCall::transfer(2, 10)),
-				Call::Balances(BalancesCall::transfer(2, 5)),
-			]
+			vec![call_transfer(2, 5), call_transfer(2, 10), call_transfer(2, 5),]
 		),);
 		assert_eq!(Balances::free_balance(1), 5);
 		assert_eq!(Balances::free_balance(2), 15);
@@ -360,15 +361,13 @@ fn batch_early_exit_works() {
 fn batch_weight_calculation_doesnt_overflow() {
 	use sp_runtime::Perbill;
 	new_test_ext().execute_with(|| {
-		let big_call = Call::System(SystemCall::fill_block(Perbill::from_percent(50)));
+		let big_call = Call::System(SystemCall::fill_block { ratio: Perbill::from_percent(50) });
 		assert_eq!(big_call.get_dispatch_info().weight, Weight::max_value() / 2);
 
 		// 3 * 50% saturates to 100%
-		let batch_call = Call::Utility(crate::Call::batch(vec![
-			big_call.clone(),
-			big_call.clone(),
-			big_call.clone(),
-		]));
+		let batch_call = Call::Utility(crate::Call::batch {
+			calls: vec![big_call.clone(), big_call.clone(), big_call.clone()],
+		});
 
 		assert_eq!(batch_call.get_dispatch_info().weight, Weight::max_value());
 	});
@@ -383,18 +382,18 @@ fn batch_handles_weight_refund() {
 		let batch_len: Weight = 4;
 
 		// Full weight when ok
-		let inner_call = Call::Example(ExampleCall::foobar(false, start_weight, None));
+		let inner_call = call_foobar(false, start_weight, None);
 		let batch_calls = vec![inner_call; batch_len as usize];
-		let call = Call::Utility(UtilityCall::batch(batch_calls));
+		let call = Call::Utility(UtilityCall::batch { calls: batch_calls });
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(Origin::signed(1));
 		assert_ok!(result);
 		assert_eq!(extract_actual_weight(&result, &info), info.weight);
 
 		// Refund weight when ok
-		let inner_call = Call::Example(ExampleCall::foobar(false, start_weight, Some(end_weight)));
+		let inner_call = call_foobar(false, start_weight, Some(end_weight));
 		let batch_calls = vec![inner_call; batch_len as usize];
-		let call = Call::Utility(UtilityCall::batch(batch_calls));
+		let call = Call::Utility(UtilityCall::batch { calls: batch_calls });
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(Origin::signed(1));
 		assert_ok!(result);
@@ -402,10 +401,10 @@ fn batch_handles_weight_refund() {
 		assert_eq!(extract_actual_weight(&result, &info), info.weight - diff * batch_len);
 
 		// Full weight when err
-		let good_call = Call::Example(ExampleCall::foobar(false, start_weight, None));
-		let bad_call = Call::Example(ExampleCall::foobar(true, start_weight, None));
+		let good_call = call_foobar(false, start_weight, None);
+		let bad_call = call_foobar(true, start_weight, None);
 		let batch_calls = vec![good_call, bad_call];
-		let call = Call::Utility(UtilityCall::batch(batch_calls));
+		let call = Call::Utility(UtilityCall::batch { calls: batch_calls });
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(Origin::signed(1));
 		assert_ok!(result);
@@ -416,11 +415,11 @@ fn batch_handles_weight_refund() {
 		assert_eq!(extract_actual_weight(&result, &info), info.weight);
 
 		// Refund weight when err
-		let good_call = Call::Example(ExampleCall::foobar(false, start_weight, Some(end_weight)));
-		let bad_call = Call::Example(ExampleCall::foobar(true, start_weight, Some(end_weight)));
+		let good_call = call_foobar(false, start_weight, Some(end_weight));
+		let bad_call = call_foobar(true, start_weight, Some(end_weight));
 		let batch_calls = vec![good_call, bad_call];
 		let batch_len = batch_calls.len() as Weight;
-		let call = Call::Utility(UtilityCall::batch(batch_calls));
+		let call = Call::Utility(UtilityCall::batch { calls: batch_calls });
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(Origin::signed(1));
 		assert_ok!(result);
@@ -430,10 +429,10 @@ fn batch_handles_weight_refund() {
 		assert_eq!(extract_actual_weight(&result, &info), info.weight - diff * batch_len);
 
 		// Partial batch completion
-		let good_call = Call::Example(ExampleCall::foobar(false, start_weight, Some(end_weight)));
-		let bad_call = Call::Example(ExampleCall::foobar(true, start_weight, Some(end_weight)));
+		let good_call = call_foobar(false, start_weight, Some(end_weight));
+		let bad_call = call_foobar(true, start_weight, Some(end_weight));
 		let batch_calls = vec![good_call, bad_call.clone(), bad_call];
-		let call = Call::Utility(UtilityCall::batch(batch_calls));
+		let call = Call::Utility(UtilityCall::batch { calls: batch_calls });
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(Origin::signed(1));
 		assert_ok!(result);
@@ -455,10 +454,7 @@ fn batch_all_works() {
 		assert_eq!(Balances::free_balance(2), 10);
 		assert_ok!(Utility::batch_all(
 			Origin::signed(1),
-			vec![
-				Call::Balances(BalancesCall::transfer(2, 5)),
-				Call::Balances(BalancesCall::transfer(2, 5))
-			]
+			vec![call_transfer(2, 5), call_transfer(2, 5)]
 		),);
 		assert_eq!(Balances::free_balance(1), 0);
 		assert_eq!(Balances::free_balance(2), 20);
@@ -468,7 +464,7 @@ fn batch_all_works() {
 #[test]
 fn batch_all_revert() {
 	new_test_ext().execute_with(|| {
-		let call = Call::Balances(BalancesCall::transfer(2, 5));
+		let call = call_transfer(2, 5);
 		let info = call.get_dispatch_info();
 
 		assert_eq!(Balances::free_balance(1), 10);
@@ -476,11 +472,7 @@ fn batch_all_revert() {
 		assert_noop!(
 			Utility::batch_all(
 				Origin::signed(1),
-				vec![
-					Call::Balances(BalancesCall::transfer(2, 5)),
-					Call::Balances(BalancesCall::transfer(2, 10)),
-					Call::Balances(BalancesCall::transfer(2, 5)),
-				]
+				vec![call_transfer(2, 5), call_transfer(2, 10), call_transfer(2, 5),]
 			),
 			DispatchErrorWithPostInfo {
 				post_info: PostDispatchInfo {
@@ -506,18 +498,18 @@ fn batch_all_handles_weight_refund() {
 		let batch_len: Weight = 4;
 
 		// Full weight when ok
-		let inner_call = Call::Example(ExampleCall::foobar(false, start_weight, None));
+		let inner_call = call_foobar(false, start_weight, None);
 		let batch_calls = vec![inner_call; batch_len as usize];
-		let call = Call::Utility(UtilityCall::batch_all(batch_calls));
+		let call = Call::Utility(UtilityCall::batch_all { calls: batch_calls });
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(Origin::signed(1));
 		assert_ok!(result);
 		assert_eq!(extract_actual_weight(&result, &info), info.weight);
 
 		// Refund weight when ok
-		let inner_call = Call::Example(ExampleCall::foobar(false, start_weight, Some(end_weight)));
+		let inner_call = call_foobar(false, start_weight, Some(end_weight));
 		let batch_calls = vec![inner_call; batch_len as usize];
-		let call = Call::Utility(UtilityCall::batch_all(batch_calls));
+		let call = Call::Utility(UtilityCall::batch_all { calls: batch_calls });
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(Origin::signed(1));
 		assert_ok!(result);
@@ -525,10 +517,10 @@ fn batch_all_handles_weight_refund() {
 		assert_eq!(extract_actual_weight(&result, &info), info.weight - diff * batch_len);
 
 		// Full weight when err
-		let good_call = Call::Example(ExampleCall::foobar(false, start_weight, None));
-		let bad_call = Call::Example(ExampleCall::foobar(true, start_weight, None));
+		let good_call = call_foobar(false, start_weight, None);
+		let bad_call = call_foobar(true, start_weight, None);
 		let batch_calls = vec![good_call, bad_call];
-		let call = Call::Utility(UtilityCall::batch_all(batch_calls));
+		let call = Call::Utility(UtilityCall::batch_all { calls: batch_calls });
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(Origin::signed(1));
 		assert_err_ignore_postinfo!(result, "The cake is a lie.");
@@ -536,21 +528,21 @@ fn batch_all_handles_weight_refund() {
 		assert_eq!(extract_actual_weight(&result, &info), info.weight);
 
 		// Refund weight when err
-		let good_call = Call::Example(ExampleCall::foobar(false, start_weight, Some(end_weight)));
-		let bad_call = Call::Example(ExampleCall::foobar(true, start_weight, Some(end_weight)));
+		let good_call = call_foobar(false, start_weight, Some(end_weight));
+		let bad_call = call_foobar(true, start_weight, Some(end_weight));
 		let batch_calls = vec![good_call, bad_call];
 		let batch_len = batch_calls.len() as Weight;
-		let call = Call::Utility(UtilityCall::batch_all(batch_calls));
+		let call = Call::Utility(UtilityCall::batch_all { calls: batch_calls });
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(Origin::signed(1));
 		assert_err_ignore_postinfo!(result, "The cake is a lie.");
 		assert_eq!(extract_actual_weight(&result, &info), info.weight - diff * batch_len);
 
 		// Partial batch completion
-		let good_call = Call::Example(ExampleCall::foobar(false, start_weight, Some(end_weight)));
-		let bad_call = Call::Example(ExampleCall::foobar(true, start_weight, Some(end_weight)));
+		let good_call = call_foobar(false, start_weight, Some(end_weight));
+		let bad_call = call_foobar(true, start_weight, Some(end_weight));
 		let batch_calls = vec![good_call, bad_call.clone(), bad_call];
-		let call = Call::Utility(UtilityCall::batch_all(batch_calls));
+		let call = Call::Utility(UtilityCall::batch_all { calls: batch_calls });
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(Origin::signed(1));
 		assert_err_ignore_postinfo!(result, "The cake is a lie.");
@@ -565,11 +557,9 @@ fn batch_all_handles_weight_refund() {
 #[test]
 fn batch_all_does_not_nest() {
 	new_test_ext().execute_with(|| {
-		let batch_all = Call::Utility(UtilityCall::batch_all(vec![
-			Call::Balances(BalancesCall::transfer(2, 1)),
-			Call::Balances(BalancesCall::transfer(2, 1)),
-			Call::Balances(BalancesCall::transfer(2, 1)),
-		]));
+		let batch_all = Call::Utility(UtilityCall::batch_all {
+			calls: vec![call_transfer(2, 1), call_transfer(2, 1), call_transfer(2, 1)],
+		});
 
 		let info = batch_all.get_dispatch_info();
 
@@ -590,7 +580,7 @@ fn batch_all_does_not_nest() {
 		// And for those who want to get a little fancy, we check that the filter persists across
 		// other kinds of dispatch wrapping functions... in this case
 		// `batch_all(batch(batch_all(..)))`
-		let batch_nested = Call::Utility(UtilityCall::batch(vec![batch_all]));
+		let batch_nested = Call::Utility(UtilityCall::batch { calls: vec![batch_all] });
 		// Batch will end with `Ok`, but does not actually execute as we can see from the event
 		// and balances.
 		assert_ok!(Utility::batch_all(Origin::signed(1), vec![batch_nested]));
@@ -605,7 +595,7 @@ fn batch_all_does_not_nest() {
 #[test]
 fn batch_limit() {
 	new_test_ext().execute_with(|| {
-		let calls = vec![Call::System(SystemCall::remark(vec![])); 40_000];
+		let calls = vec![Call::System(SystemCall::remark { remark: vec![] }); 40_000];
 		assert_noop!(Utility::batch(Origin::signed(1), calls.clone()), Error::<Test>::TooManyCalls);
 		assert_noop!(Utility::batch_all(Origin::signed(1), calls), Error::<Test>::TooManyCalls);
 	});
diff --git a/frame/vesting/Cargo.toml b/frame/vesting/Cargo.toml
index 96af259959c3..806e0e603686 100644
--- a/frame/vesting/Cargo.toml
+++ b/frame/vesting/Cargo.toml
@@ -16,6 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
 	"derive",
 ] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
@@ -32,6 +33,7 @@ pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"sp-std/std",
 	"sp-runtime/std",
 	"frame-support/std",
diff --git a/frame/vesting/src/lib.rs b/frame/vesting/src/lib.rs
index 7e4a11fbd5c3..27862a5ca4b7 100644
--- a/frame/vesting/src/lib.rs
+++ b/frame/vesting/src/lib.rs
@@ -65,6 +65,7 @@ use frame_support::{
 };
 use frame_system::{ensure_root, ensure_signed, pallet_prelude::*};
 pub use pallet::*;
+use scale_info::TypeInfo;
 use sp_runtime::{
 	traits::{
 		AtLeast32BitUnsigned, Bounded, Convert, MaybeSerializeDeserialize, One, Saturating,
@@ -85,7 +86,7 @@ const VESTING_ID: LockIdentifier = *b"vesting ";
 
 // A value placed in storage that represents the current version of the Vesting storage.
 // This value is used by `on_runtime_upgrade` to determine whether we run storage migration logic.
-#[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, RuntimeDebug, MaxEncodedLen)]
+#[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, RuntimeDebug, MaxEncodedLen, TypeInfo)]
 enum Releases {
 	V0,
 	V1,
@@ -271,9 +272,6 @@ pub mod pallet {
 
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
-	#[pallet::metadata(
-		T::AccountId = "AccountId", BalanceOf<T> = "Balance", T::BlockNumber = "BlockNumber"
-	)]
 	pub enum Event<T: Config> {
 		/// The amount vested has been updated. This could indicate a change in funds available.
 		/// The balance given is the amount which is left unvested (and thus locked).
diff --git a/frame/vesting/src/vesting_info.rs b/frame/vesting/src/vesting_info.rs
index 72171910086c..81bffa199fd7 100644
--- a/frame/vesting/src/vesting_info.rs
+++ b/frame/vesting/src/vesting_info.rs
@@ -20,7 +20,7 @@
 use super::*;
 
 /// Struct to encode the vesting schedule of an individual account.
-#[derive(Encode, Decode, Copy, Clone, PartialEq, Eq, RuntimeDebug, MaxEncodedLen)]
+#[derive(Encode, Decode, Copy, Clone, PartialEq, Eq, RuntimeDebug, MaxEncodedLen, TypeInfo)]
 pub struct VestingInfo<Balance, BlockNumber> {
 	/// Locked amount at genesis.
 	locked: Balance,
diff --git a/primitives/application-crypto/Cargo.toml b/primitives/application-crypto/Cargo.toml
index dd9d7f22d242..6849dc25f856 100644
--- a/primitives/application-crypto/Cargo.toml
+++ b/primitives/application-crypto/Cargo.toml
@@ -17,6 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../core" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.126", optional = true, features = ["derive"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
 sp-io = { version = "4.0.0-dev", default-features = false, path = "../io" }
@@ -27,6 +28,7 @@ std = [
 	"full_crypto",
 	"sp-core/std",
 	"codec/std",
+	"scale-info/std",
 	"serde",
 	"sp-std/std",
 	"sp-io/std",
diff --git a/primitives/application-crypto/src/lib.rs b/primitives/application-crypto/src/lib.rs
index 43a14e29f4ee..baa656066705 100644
--- a/primitives/application-crypto/src/lib.rs
+++ b/primitives/application-crypto/src/lib.rs
@@ -34,6 +34,8 @@ pub use sp_core::{
 #[doc(hidden)]
 pub use codec;
 #[doc(hidden)]
+pub use scale_info;
+#[doc(hidden)]
 #[cfg(feature = "std")]
 pub use serde;
 #[doc(hidden)]
@@ -224,6 +226,7 @@ macro_rules! app_crypto_public_full_crypto {
 				$crate::codec::Decode,
 				$crate::RuntimeDebug,
 				$crate::codec::MaxEncodedLen,
+				$crate::scale_info::TypeInfo,
 			)]
 			#[codec(crate = $crate::codec)]
 			pub struct Public($public);
@@ -260,6 +263,7 @@ macro_rules! app_crypto_public_not_full_crypto {
 				$crate::codec::Decode,
 				$crate::RuntimeDebug,
 				$crate::codec::MaxEncodedLen,
+				$crate::scale_info::TypeInfo,
 			)]
 			pub struct Public($public);
 		}
@@ -435,6 +439,7 @@ macro_rules! app_crypto_signature_full_crypto {
 				$crate::codec::Encode,
 				$crate::codec::Decode,
 				$crate::RuntimeDebug,
+				$crate::scale_info::TypeInfo,
 			)]
 			#[derive(Hash)]
 			pub struct Signature($sig);
@@ -468,6 +473,7 @@ macro_rules! app_crypto_signature_not_full_crypto {
 			#[derive(Clone, Default, Eq, PartialEq,
 				$crate::codec::Encode,
 				$crate::codec::Decode,
+				$crate::scale_info::TypeInfo,
 				$crate::RuntimeDebug,
 			)]
 			pub struct Signature($sig);
diff --git a/primitives/application-crypto/src/traits.rs b/primitives/application-crypto/src/traits.rs
index 2f7fd139c018..376d12f0c7a3 100644
--- a/primitives/application-crypto/src/traits.rs
+++ b/primitives/application-crypto/src/traits.rs
@@ -130,7 +130,7 @@ pub trait RuntimeAppPublic: Sized {
 	const CRYPTO_ID: CryptoTypeId;
 
 	/// The signature that will be generated when signing with the corresponding private key.
-	type Signature: Codec + Debug + MaybeHash + Eq + PartialEq + Clone;
+	type Signature: Codec + Debug + MaybeHash + Eq + PartialEq + Clone + scale_info::TypeInfo;
 
 	/// Returns all public keys for this application in the keystore.
 	fn all() -> crate::Vec<Self>;
diff --git a/primitives/arithmetic/Cargo.toml b/primitives/arithmetic/Cargo.toml
index 8a97f7ce5042..abdbd4e60d04 100644
--- a/primitives/arithmetic/Cargo.toml
+++ b/primitives/arithmetic/Cargo.toml
@@ -18,6 +18,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
 	"derive",
 ] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 integer-sqrt = "0.1.2"
 static_assertions = "1.1.0"
 num-traits = { version = "0.2.8", default-features = false }
@@ -34,6 +35,7 @@ primitive-types = "0.10.1"
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"num-traits/std",
 	"sp-std/std",
 	"serde",
diff --git a/primitives/arithmetic/src/fixed_point.rs b/primitives/arithmetic/src/fixed_point.rs
index 1515573b4674..7a81f222c492 100644
--- a/primitives/arithmetic/src/fixed_point.rs
+++ b/primitives/arithmetic/src/fixed_point.rs
@@ -363,7 +363,17 @@ macro_rules! implement_fixed {
 		/// A fixed point number representation in the range.
 		#[doc = $title]
 		#[derive(
-			Encode, Decode, CompactAs, Default, Copy, Clone, PartialEq, Eq, PartialOrd, Ord,
+			Encode,
+			Decode,
+			CompactAs,
+			Default,
+			Copy,
+			Clone,
+			PartialEq,
+			Eq,
+			PartialOrd,
+			Ord,
+			scale_info::TypeInfo,
 		)]
 		pub struct $name($inner_type);
 
diff --git a/primitives/arithmetic/src/per_things.rs b/primitives/arithmetic/src/per_things.rs
index f9c048e55b6f..f388c19de6b4 100644
--- a/primitives/arithmetic/src/per_things.rs
+++ b/primitives/arithmetic/src/per_things.rs
@@ -425,7 +425,7 @@ macro_rules! implement_per_thing {
 		///
 		#[doc = $title]
 		#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-		#[derive(Encode, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, RuntimeDebug)]
+		#[derive(Encode, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, RuntimeDebug, scale_info::TypeInfo)]
 		pub struct $name($type);
 
 		/// Implementation makes any compact encoding of `PerThing::Inner` valid,
diff --git a/primitives/authority-discovery/Cargo.toml b/primitives/authority-discovery/Cargo.toml
index c900324d8551..6638e478b4cd 100644
--- a/primitives/authority-discovery/Cargo.toml
+++ b/primitives/authority-discovery/Cargo.toml
@@ -15,6 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../application-crypto" }
 codec = { package = "parity-scale-codec", default-features = false, version = "2.0.0" }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
 sp-api = { version = "4.0.0-dev", default-features = false, path = "../api" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../runtime" }
@@ -24,6 +25,7 @@ default = ["std"]
 std = [
 	"sp-application-crypto/std",
 	"codec/std",
+	"scale-info/std",
 	"sp-std/std",
 	"sp-api/std",
 	"sp-runtime/std"
diff --git a/primitives/consensus/aura/Cargo.toml b/primitives/consensus/aura/Cargo.toml
index 1feb04b5bc57..c228b88fd657 100644
--- a/primitives/consensus/aura/Cargo.toml
+++ b/primitives/consensus/aura/Cargo.toml
@@ -15,6 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../../application-crypto" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../std" }
 sp-api = { version = "4.0.0-dev", default-features = false, path = "../../api" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../runtime" }
@@ -29,6 +30,7 @@ default = ["std"]
 std = [
 	"sp-application-crypto/std",
 	"codec/std",
+	"scale-info/std",
 	"sp-std/std",
 	"sp-api/std",
 	"sp-runtime/std",
diff --git a/primitives/consensus/babe/Cargo.toml b/primitives/consensus/babe/Cargo.toml
index 0428d8e22288..5f6bfec21973 100644
--- a/primitives/consensus/babe/Cargo.toml
+++ b/primitives/consensus/babe/Cargo.toml
@@ -15,6 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../../application-crypto" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 merlin = { version = "2.0", default-features = false }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../../std" }
 sp-api = { version = "4.0.0-dev", default-features = false, path = "../../api" }
@@ -34,6 +35,7 @@ default = ["std"]
 std = [
 	"sp-application-crypto/std",
 	"codec/std",
+	"scale-info/std",
 	"merlin/std",
 	"sp-std/std",
 	"sp-api/std",
diff --git a/primitives/consensus/babe/src/digests.rs b/primitives/consensus/babe/src/digests.rs
index 682894f5837b..470a028021ca 100644
--- a/primitives/consensus/babe/src/digests.rs
+++ b/primitives/consensus/babe/src/digests.rs
@@ -134,7 +134,7 @@ pub struct NextEpochDescriptor {
 
 /// Information about the next epoch config, if changed. This is broadcast in the first
 /// block of the epoch, and applies using the same rules as `NextEpochDescriptor`.
-#[derive(Decode, Encode, PartialEq, Eq, Clone, RuntimeDebug)]
+#[derive(Decode, Encode, PartialEq, Eq, Clone, RuntimeDebug, scale_info::TypeInfo)]
 pub enum NextConfigDescriptor {
 	/// Version 1.
 	#[codec(index = 1)]
diff --git a/primitives/consensus/babe/src/lib.rs b/primitives/consensus/babe/src/lib.rs
index 3f2fc7e1f5e6..4417670f4144 100644
--- a/primitives/consensus/babe/src/lib.rs
+++ b/primitives/consensus/babe/src/lib.rs
@@ -29,6 +29,7 @@ pub use sp_consensus_vrf::schnorrkel::{
 };
 
 use codec::{Decode, Encode};
+use scale_info::TypeInfo;
 #[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 #[cfg(feature = "std")]
@@ -213,7 +214,7 @@ pub struct BabeGenesisConfiguration {
 }
 
 /// Types of allowed slots.
-#[derive(Clone, Copy, PartialEq, Eq, Encode, Decode, RuntimeDebug)]
+#[derive(Clone, Copy, PartialEq, Eq, Encode, Decode, RuntimeDebug, TypeInfo)]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 pub enum AllowedSlots {
 	/// Only allow primary slots.
@@ -246,7 +247,7 @@ impl sp_consensus::SlotData for BabeGenesisConfiguration {
 }
 
 /// Configuration data used by the BABE consensus engine.
-#[derive(Clone, PartialEq, Eq, Encode, Decode, RuntimeDebug)]
+#[derive(Clone, PartialEq, Eq, Encode, Decode, RuntimeDebug, TypeInfo)]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 pub struct BabeEpochConfiguration {
 	/// A constant value that is used in the threshold calculation formula.
diff --git a/primitives/consensus/slots/Cargo.toml b/primitives/consensus/slots/Cargo.toml
index 2718158cfb7d..3ad204f97396 100644
--- a/primitives/consensus/slots/Cargo.toml
+++ b/primitives/consensus/slots/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../runtime" }
 sp-arithmetic = { version = "4.0.0-dev", default-features = false, path = "../../arithmetic" }
 
@@ -21,6 +22,7 @@ sp-arithmetic = { version = "4.0.0-dev", default-features = false, path = "../..
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"sp-runtime/std",
 	"sp-arithmetic/std",
 ]
diff --git a/primitives/consensus/slots/src/lib.rs b/primitives/consensus/slots/src/lib.rs
index 0b66ac8c9cb6..89b57dca8308 100644
--- a/primitives/consensus/slots/src/lib.rs
+++ b/primitives/consensus/slots/src/lib.rs
@@ -20,9 +20,10 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use codec::{Decode, Encode, MaxEncodedLen};
+use scale_info::TypeInfo;
 
 /// Unit type wrapper that represents a slot.
-#[derive(Debug, Encode, MaxEncodedLen, Decode, Eq, Clone, Copy, Default, Ord)]
+#[derive(Debug, Encode, MaxEncodedLen, Decode, Eq, Clone, Copy, Default, Ord, TypeInfo)]
 pub struct Slot(u64);
 
 impl core::ops::Deref for Slot {
@@ -96,7 +97,7 @@ impl From<Slot> for u64 {
 /// produces more than one block on the same slot. The proof of equivocation
 /// are the given distinct headers that were signed by the validator and which
 /// include the slot number.
-#[derive(Clone, Debug, Decode, Encode, PartialEq)]
+#[derive(Clone, Debug, Decode, Encode, PartialEq, TypeInfo)]
 pub struct EquivocationProof<Header, Id> {
 	/// Returns the authority id of the equivocator.
 	pub offender: Id,
diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml
index b2c5230975ec..73c3d454ed58 100644
--- a/primitives/core/Cargo.toml
+++ b/primitives/core/Cargo.toml
@@ -18,11 +18,13 @@ codec = { package = "parity-scale-codec", version = "2.2.0", default-features =
 	"derive",
 	"max-encoded-len",
 ] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 log = { version = "0.4.11", default-features = false }
 serde = { version = "1.0.126", optional = true, features = ["derive"] }
 byteorder = { version = "1.3.2", default-features = false }
 primitive-types = { version = "0.10.1", default-features = false, features = [
 	"codec",
+	"scale-info"
 ] }
 impl-serde = { version = "0.3.0", optional = true }
 wasmi = { version = "0.9.0", optional = true }
@@ -96,6 +98,7 @@ std = [
 	"primitive-types/rustc-hex",
 	"impl-serde",
 	"codec/std",
+	"scale-info/std",
 	"hash256-std-hasher/std",
 	"hash-db/std",
 	"sp-std/std",
diff --git a/primitives/core/src/changes_trie.rs b/primitives/core/src/changes_trie.rs
index dd99a5f769ce..f4ce83dc2c87 100644
--- a/primitives/core/src/changes_trie.rs
+++ b/primitives/core/src/changes_trie.rs
@@ -27,7 +27,7 @@ use serde::{Deserialize, Serialize};
 	any(feature = "std", test),
 	derive(Serialize, Deserialize, parity_util_mem::MallocSizeOf)
 )]
-#[derive(Debug, Clone, PartialEq, Eq, Default, Encode, Decode)]
+#[derive(Debug, Clone, PartialEq, Eq, Default, Encode, Decode, scale_info::TypeInfo)]
 pub struct ChangesTrieConfiguration {
 	/// Interval (in blocks) at which level1-digests are created. Digests are not
 	/// created when this is less or equal to 1.
diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index b86663956549..4764a0cac1b1 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -31,6 +31,7 @@ use parking_lot::Mutex;
 use rand::{rngs::OsRng, RngCore};
 #[cfg(feature = "std")]
 use regex::Regex;
+use scale_info::TypeInfo;
 /// Trait for accessing reference to `SecretString`.
 pub use secrecy::ExposeSecret;
 /// A store for sensitive data.
@@ -715,7 +716,9 @@ pub trait Public:
 }
 
 /// An opaque 32-byte cryptographic identifier.
-#[derive(Clone, Eq, PartialEq, Ord, PartialOrd, Default, Encode, Decode, MaxEncodedLen)]
+#[derive(
+	Clone, Eq, PartialEq, Ord, PartialOrd, Default, Encode, Decode, MaxEncodedLen, TypeInfo,
+)]
 #[cfg_attr(feature = "std", derive(Hash))]
 pub struct AccountId32([u8; 32]);
 
@@ -1175,6 +1178,7 @@ pub trait CryptoType {
 	Decode,
 	PassByInner,
 	crate::RuntimeDebug,
+	TypeInfo,
 )]
 #[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
 pub struct KeyTypeId(pub [u8; 4]);
diff --git a/primitives/core/src/ecdsa.rs b/primitives/core/src/ecdsa.rs
index 147569d52b89..11e9b9d71d80 100644
--- a/primitives/core/src/ecdsa.rs
+++ b/primitives/core/src/ecdsa.rs
@@ -20,6 +20,7 @@
 // end::description[]
 
 use codec::{Decode, Encode, MaxEncodedLen};
+use scale_info::TypeInfo;
 use sp_runtime_interface::pass_by::PassByInner;
 use sp_std::cmp::Ordering;
 
@@ -54,7 +55,7 @@ pub const CRYPTO_ID: CryptoTypeId = CryptoTypeId(*b"ecds");
 type Seed = [u8; 32];
 
 /// The ECDSA compressed public key.
-#[derive(Clone, Encode, Decode, PassByInner, MaxEncodedLen)]
+#[derive(Clone, Encode, Decode, PassByInner, MaxEncodedLen, TypeInfo)]
 pub struct Public(pub [u8; 33]);
 
 impl PartialOrd for Public {
@@ -234,7 +235,7 @@ impl sp_std::hash::Hash for Public {
 }
 
 /// A signature (a 512-bit value, plus 8 bits for recovery ID).
-#[derive(Encode, Decode, PassByInner)]
+#[derive(Encode, Decode, PassByInner, TypeInfo)]
 pub struct Signature(pub [u8; 65]);
 
 impl sp_std::convert::TryFrom<&[u8]> for Signature {
diff --git a/primitives/core/src/ed25519.rs b/primitives/core/src/ed25519.rs
index be70da31e641..d786ee9d255f 100644
--- a/primitives/core/src/ed25519.rs
+++ b/primitives/core/src/ed25519.rs
@@ -24,6 +24,7 @@ use sp_std::vec::Vec;
 
 use crate::hash::{H256, H512};
 use codec::{Decode, Encode, MaxEncodedLen};
+use scale_info::TypeInfo;
 
 #[cfg(feature = "std")]
 use crate::crypto::Ss58Codec;
@@ -57,7 +58,18 @@ type Seed = [u8; 32];
 /// A public key.
 #[cfg_attr(feature = "full_crypto", derive(Hash))]
 #[derive(
-	PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Encode, Decode, Default, PassByInner, MaxEncodedLen,
+	PartialEq,
+	Eq,
+	PartialOrd,
+	Ord,
+	Clone,
+	Copy,
+	Encode,
+	Decode,
+	Default,
+	PassByInner,
+	MaxEncodedLen,
+	TypeInfo,
 )]
 pub struct Public(pub [u8; 32]);
 
@@ -198,7 +210,7 @@ impl<'de> Deserialize<'de> for Public {
 }
 
 /// A signature (a 512-bit value).
-#[derive(Encode, Decode, PassByInner)]
+#[derive(Encode, Decode, PassByInner, TypeInfo)]
 pub struct Signature(pub [u8; 64]);
 
 impl sp_std::convert::TryFrom<&[u8]> for Signature {
diff --git a/primitives/core/src/lib.rs b/primitives/core/src/lib.rs
index 0a61c90d7135..a6229fe43a1a 100644
--- a/primitives/core/src/lib.rs
+++ b/primitives/core/src/lib.rs
@@ -33,6 +33,7 @@ macro_rules! map {
 
 #[doc(hidden)]
 pub use codec::{Decode, Encode};
+use scale_info::TypeInfo;
 #[cfg(feature = "std")]
 pub use serde;
 #[cfg(feature = "std")]
@@ -191,7 +192,17 @@ impl sp_std::ops::Deref for OpaqueMetadata {
 
 /// Simple blob to hold a `PeerId` without committing to its format.
 #[derive(
-	Default, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, RuntimeDebug, PassByInner,
+	Default,
+	Clone,
+	Eq,
+	PartialEq,
+	Ord,
+	PartialOrd,
+	Encode,
+	Decode,
+	RuntimeDebug,
+	PassByInner,
+	TypeInfo,
 )]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 pub struct OpaquePeerId(pub Vec<u8>);
@@ -414,7 +425,7 @@ pub fn to_substrate_wasm_fn_return_value(value: &impl Encode) -> u64 {
 
 /// The void type - it cannot exist.
 // Oh rust, you crack me up...
-#[derive(Clone, Decode, Encode, Eq, PartialEq, RuntimeDebug)]
+#[derive(Clone, Decode, Encode, Eq, PartialEq, RuntimeDebug, TypeInfo)]
 pub enum Void {}
 
 /// Macro for creating `Maybe*` marker traits.
diff --git a/primitives/core/src/offchain/mod.rs b/primitives/core/src/offchain/mod.rs
index 59c92f540bad..640f4d2583b7 100644
--- a/primitives/core/src/offchain/mod.rs
+++ b/primitives/core/src/offchain/mod.rs
@@ -19,6 +19,7 @@
 
 use crate::{OpaquePeerId, RuntimeDebug};
 use codec::{Decode, Encode};
+use scale_info::TypeInfo;
 use sp_runtime_interface::pass_by::{PassByCodec, PassByEnum, PassByInner};
 use sp_std::{
 	convert::TryFrom,
@@ -186,7 +187,7 @@ impl TryFrom<u32> for HttpRequestStatus {
 
 /// A blob to hold information about the local node's network state
 /// without committing to its format.
-#[derive(Clone, Eq, PartialEq, Encode, Decode, RuntimeDebug, PassByCodec)]
+#[derive(Clone, Eq, PartialEq, Encode, Decode, RuntimeDebug, PassByCodec, TypeInfo)]
 #[cfg_attr(feature = "std", derive(Default))]
 pub struct OpaqueNetworkState {
 	/// PeerId of the local node in SCALE encoded.
@@ -196,7 +197,7 @@ pub struct OpaqueNetworkState {
 }
 
 /// Simple blob to hold a `Multiaddr` without committing to its format.
-#[derive(Clone, Eq, PartialEq, Encode, Decode, RuntimeDebug, PassByInner)]
+#[derive(Clone, Eq, PartialEq, Encode, Decode, RuntimeDebug, PassByInner, TypeInfo)]
 pub struct OpaqueMultiaddr(pub Vec<u8>);
 
 impl OpaqueMultiaddr {
diff --git a/primitives/core/src/sr25519.rs b/primitives/core/src/sr25519.rs
index 4c5122162d65..4787c2d9d13e 100644
--- a/primitives/core/src/sr25519.rs
+++ b/primitives/core/src/sr25519.rs
@@ -47,6 +47,7 @@ use crate::{
 	hash::{H256, H512},
 };
 use codec::{Decode, Encode, MaxEncodedLen};
+use scale_info::TypeInfo;
 use sp_std::ops::Deref;
 
 #[cfg(feature = "full_crypto")]
@@ -65,7 +66,18 @@ pub const CRYPTO_ID: CryptoTypeId = CryptoTypeId(*b"sr25");
 /// An Schnorrkel/Ristretto x25519 ("sr25519") public key.
 #[cfg_attr(feature = "full_crypto", derive(Hash))]
 #[derive(
-	PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Encode, Decode, Default, PassByInner, MaxEncodedLen,
+	PartialEq,
+	Eq,
+	PartialOrd,
+	Ord,
+	Clone,
+	Copy,
+	Encode,
+	Decode,
+	Default,
+	PassByInner,
+	MaxEncodedLen,
+	TypeInfo,
 )]
 pub struct Public(pub [u8; 32]);
 
@@ -201,7 +213,7 @@ impl<'de> Deserialize<'de> for Public {
 /// An Schnorrkel/Ristretto x25519 ("sr25519") signature.
 ///
 /// Instead of importing it for the local module, alias it to be available as a public type
-#[derive(Encode, Decode, PassByInner)]
+#[derive(Encode, Decode, PassByInner, TypeInfo)]
 pub struct Signature(pub [u8; 64]);
 
 impl sp_std::convert::TryFrom<&[u8]> for Signature {
diff --git a/primitives/finality-grandpa/Cargo.toml b/primitives/finality-grandpa/Cargo.toml
index 895270d01219..c0c2a654270f 100644
--- a/primitives/finality-grandpa/Cargo.toml
+++ b/primitives/finality-grandpa/Cargo.toml
@@ -16,6 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 grandpa = { package = "finality-grandpa", version = "0.14.1", default-features = false, features = ["derive-codec"] }
 log = { version = "0.4.8", optional = true }
 serde = { version = "1.0.126", optional = true, features = ["derive"] }
@@ -32,6 +33,7 @@ std = [
 	"log",
 	"serde",
 	"codec/std",
+	"scale-info/std",
 	"grandpa/std",
 	"sp-api/std",
 	"sp-application-crypto/std",
diff --git a/primitives/finality-grandpa/src/lib.rs b/primitives/finality-grandpa/src/lib.rs
index 353a3cd07822..d99a4c188222 100644
--- a/primitives/finality-grandpa/src/lib.rs
+++ b/primitives/finality-grandpa/src/lib.rs
@@ -26,6 +26,7 @@ extern crate alloc;
 use serde::Serialize;
 
 use codec::{Codec, Decode, Encode, Input};
+use scale_info::TypeInfo;
 #[cfg(feature = "std")]
 use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr};
 use sp_runtime::{traits::NumberFor, ConsensusEngineId, RuntimeDebug};
@@ -170,7 +171,7 @@ impl<N: Codec> ConsensusLog<N> {
 /// GRANDPA happens when a voter votes on the same round (either at prevote or
 /// precommit stage) for different blocks. Proving is achieved by collecting the
 /// signed messages of conflicting votes.
-#[derive(Clone, Debug, Decode, Encode, PartialEq)]
+#[derive(Clone, Debug, Decode, Encode, PartialEq, TypeInfo)]
 pub struct EquivocationProof<H, N> {
 	set_id: SetId,
 	equivocation: Equivocation<H, N>,
@@ -204,7 +205,7 @@ impl<H, N> EquivocationProof<H, N> {
 
 /// Wrapper object for GRANDPA equivocation proofs, useful for unifying prevote
 /// and precommit equivocations under a common type.
-#[derive(Clone, Debug, Decode, Encode, PartialEq)]
+#[derive(Clone, Debug, Decode, Encode, PartialEq, TypeInfo)]
 pub enum Equivocation<H, N> {
 	/// Proof of equivocation at prevote stage.
 	Prevote(grandpa::Equivocation<AuthorityId, grandpa::Prevote<H, N>, AuthoritySignature>),
diff --git a/primitives/npos-elections/Cargo.toml b/primitives/npos-elections/Cargo.toml
index 5c6e5c1b13d5..b277df8f58f1 100644
--- a/primitives/npos-elections/Cargo.toml
+++ b/primitives/npos-elections/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.126", optional = true, features = ["derive"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
 sp-npos-elections-solution-type = { version = "4.0.0-dev", path = "./solution-type" }
@@ -30,6 +31,7 @@ default = ["std"]
 bench = []
 std = [
 	"codec/std",
+	"scale-info/std",
 	"serde",
 	"sp-std/std",
 	"sp-arithmetic/std",
diff --git a/primitives/npos-elections/fuzzer/Cargo.toml b/primitives/npos-elections/fuzzer/Cargo.toml
index a8d0524fb871..d6fcc09c8b58 100644
--- a/primitives/npos-elections/fuzzer/Cargo.toml
+++ b/primitives/npos-elections/fuzzer/Cargo.toml
@@ -15,6 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 honggfuzz = "0.5"
 rand = { version = "0.7.3", features = ["std", "small_rng"] }
 sp-npos-elections = { version = "4.0.0-dev", path = ".." }
diff --git a/primitives/npos-elections/solution-type/Cargo.toml b/primitives/npos-elections/solution-type/Cargo.toml
index a061cedc9231..cbe6750266f0 100644
--- a/primitives/npos-elections/solution-type/Cargo.toml
+++ b/primitives/npos-elections/solution-type/Cargo.toml
@@ -22,6 +22,7 @@ proc-macro-crate = "1.0.0"
 
 [dev-dependencies]
 parity-scale-codec = "2.0.1"
+scale-info = "1.0"
 sp-arithmetic = { path = "../../arithmetic", version = "4.0.0-dev" }
 # used by generate_solution_type:
 sp-npos-elections = { path = "..", version = "4.0.0-dev" }
diff --git a/primitives/npos-elections/solution-type/src/codec.rs b/primitives/npos-elections/solution-type/src/codec.rs
index 21688c03ace5..2dac076fcde4 100644
--- a/primitives/npos-elections/solution-type/src/codec.rs
+++ b/primitives/npos-elections/solution-type/src/codec.rs
@@ -15,33 +15,35 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Code generation for the ratio assignment type' encode/decode impl.
+//! Code generation for the ratio assignment type' encode/decode/info impl.
 
 use crate::vote_field;
 use proc_macro2::TokenStream as TokenStream2;
 use quote::quote;
 
-pub(crate) fn codec_impl(
+pub(crate) fn codec_and_info_impl(
 	ident: syn::Ident,
 	voter_type: syn::Type,
 	target_type: syn::Type,
 	weight_type: syn::Type,
 	count: usize,
 ) -> TokenStream2 {
-	let encode = encode_impl(ident.clone(), count);
-	let decode = decode_impl(ident, voter_type, target_type, weight_type, count);
+	let encode = encode_impl(&ident, count);
+	let decode = decode_impl(&ident, &voter_type, &target_type, &weight_type, count);
+	let scale_info = scale_info_impl(&ident, &voter_type, &target_type, &weight_type, count);
 
 	quote! {
 		#encode
 		#decode
+		#scale_info
 	}
 }
 
 fn decode_impl(
-	ident: syn::Ident,
-	voter_type: syn::Type,
-	target_type: syn::Type,
-	weight_type: syn::Type,
+	ident: &syn::Ident,
+	voter_type: &syn::Type,
+	target_type: &syn::Type,
+	weight_type: &syn::Type,
 	count: usize,
 ) -> TokenStream2 {
 	let decode_impl_single = {
@@ -114,7 +116,7 @@ fn decode_impl(
 
 // General attitude is that we will convert inner values to `Compact` and then use the normal
 // `Encode` implementation.
-fn encode_impl(ident: syn::Ident, count: usize) -> TokenStream2 {
+fn encode_impl(ident: &syn::Ident, count: usize) -> TokenStream2 {
 	let encode_impl_single = {
 		let name = vote_field(1);
 		quote! {
@@ -168,3 +170,73 @@ fn encode_impl(ident: syn::Ident, count: usize) -> TokenStream2 {
 		}
 	)
 }
+
+fn scale_info_impl(
+	ident: &syn::Ident,
+	voter_type: &syn::Type,
+	target_type: &syn::Type,
+	weight_type: &syn::Type,
+	count: usize,
+) -> TokenStream2 {
+	let scale_info_impl_single = {
+		let name = format!("{}", vote_field(1));
+		quote! {
+			.field(|f|
+				f.ty::<_npos::sp_std::prelude::Vec<
+				   (_npos::codec::Compact<#voter_type>, _npos::codec::Compact<#target_type>)
+				>>()
+				.name(#name)
+			)
+		}
+	};
+
+	let scale_info_impl_double = {
+		let name = format!("{}", vote_field(2));
+		quote! {
+			.field(|f|
+				f.ty::<_npos::sp_std::prelude::Vec<(
+					_npos::codec::Compact<#voter_type>,
+					(_npos::codec::Compact<#target_type>, _npos::codec::Compact<#weight_type>),
+					_npos::codec::Compact<#target_type>
+				)>>()
+				.name(#name)
+			)
+		}
+	};
+
+	let scale_info_impl_rest = (3..=count)
+		.map(|c| {
+			let name = format!("{}", vote_field(c));
+			quote! {
+				.field(|f|
+					f.ty::<_npos::sp_std::prelude::Vec<(
+						_npos::codec::Compact<#voter_type>,
+						[
+							(_npos::codec::Compact<#target_type>, _npos::codec::Compact<#weight_type>);
+							#c - 1
+						],
+						_npos::codec::Compact<#target_type>
+					)>>()
+					.name(#name)
+				)
+			}
+		})
+		.collect::<TokenStream2>();
+
+	quote!(
+		 impl _npos::scale_info::TypeInfo for #ident {
+			 type Identity = Self;
+
+			 fn type_info() -> _npos::scale_info::Type<_npos::scale_info::form::MetaForm> {
+				 _npos::scale_info::Type::builder()
+					 .path(_npos::scale_info::Path::new(stringify!(#ident), module_path!()))
+					 .composite(
+						 _npos::scale_info::build::Fields::named()
+						 #scale_info_impl_single
+						 #scale_info_impl_double
+						 #scale_info_impl_rest
+					 )
+			 }
+		 }
+	)
+}
diff --git a/primitives/npos-elections/solution-type/src/single_page.rs b/primitives/npos-elections/solution-type/src/single_page.rs
index 7dfd0e56618f..33017d558331 100644
--- a/primitives/npos-elections/solution-type/src/single_page.rs
+++ b/primitives/npos-elections/solution-type/src/single_page.rs
@@ -64,7 +64,7 @@ pub(crate) fn generate(def: crate::SolutionDef) -> Result<TokenStream2> {
 
 	let derives_and_maybe_compact_encoding = if compact_encoding {
 		// custom compact encoding.
-		let compact_impl = crate::codec::codec_impl(
+		let compact_impl = crate::codec::codec_and_info_impl(
 			ident.clone(),
 			voter_type.clone(),
 			target_type.clone(),
@@ -77,7 +77,16 @@ pub(crate) fn generate(def: crate::SolutionDef) -> Result<TokenStream2> {
 		}
 	} else {
 		// automatically derived.
-		quote!(#[derive(Default, PartialEq, Eq, Clone, Debug, _npos::codec::Encode, _npos::codec::Decode)])
+		quote!(#[derive(
+			Default,
+			PartialEq,
+			Eq,
+			Clone,
+			Debug,
+			_npos::codec::Encode,
+			_npos::codec::Decode,
+			_npos::scale_info::TypeInfo,
+		)])
 	};
 
 	let struct_name = syn::Ident::new("solution", proc_macro2::Span::call_site());
diff --git a/primitives/npos-elections/src/lib.rs b/primitives/npos-elections/src/lib.rs
index 84b5d480bef0..afe85ef53b3a 100644
--- a/primitives/npos-elections/src/lib.rs
+++ b/primitives/npos-elections/src/lib.rs
@@ -110,6 +110,8 @@ pub use traits::{IdentifierT, NposSolution, PerThing128, __OrInvalidIndex};
 #[doc(hidden)]
 pub use codec;
 #[doc(hidden)]
+pub use scale_info;
+#[doc(hidden)]
 pub use sp_arithmetic;
 #[doc(hidden)]
 pub use sp_std;
@@ -337,7 +339,7 @@ pub struct ElectionResult<AccountId, P: PerThing> {
 ///
 /// This, at the current version, resembles the `Exposure` defined in the Staking pallet, yet they
 /// do not necessarily have to be the same.
-#[derive(Default, RuntimeDebug, Encode, Decode, Clone, Eq, PartialEq)]
+#[derive(Default, RuntimeDebug, Encode, Decode, Clone, Eq, PartialEq, scale_info::TypeInfo)]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 pub struct Support<AccountId> {
 	/// Total support.
diff --git a/primitives/runtime/Cargo.toml b/primitives/runtime/Cargo.toml
index 017c6a75efd9..5ac5bcf1963e 100644
--- a/primitives/runtime/Cargo.toml
+++ b/primitives/runtime/Cargo.toml
@@ -17,6 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.126", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../core" }
 sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../application-crypto" }
 sp-arithmetic = { version = "4.0.0-dev", default-features = false, path = "../arithmetic" }
@@ -46,6 +47,7 @@ std = [
 	"sp-application-crypto/std",
 	"sp-arithmetic/std",
 	"codec/std",
+	"scale-info/std",
 	"log/std",
 	"sp-core/std",
 	"rand",
diff --git a/primitives/runtime/src/curve.rs b/primitives/runtime/src/curve.rs
index 72d64cf4b8e1..d6bd94c2bff7 100644
--- a/primitives/runtime/src/curve.rs
+++ b/primitives/runtime/src/curve.rs
@@ -24,7 +24,7 @@ use crate::{
 use core::ops::Sub;
 
 /// Piecewise Linear function in [0, 1] -> [0, 1].
-#[derive(PartialEq, Eq, sp_core::RuntimeDebug)]
+#[derive(PartialEq, Eq, sp_core::RuntimeDebug, scale_info::TypeInfo)]
 pub struct PiecewiseLinear<'a> {
 	/// Array of points. Must be in order from the lowest abscissas to the highest.
 	pub points: &'a [(Perbill, Perbill)],
diff --git a/primitives/runtime/src/generic/digest.rs b/primitives/runtime/src/generic/digest.rs
index 99d27ad5826c..87af9bc77a5f 100644
--- a/primitives/runtime/src/generic/digest.rs
+++ b/primitives/runtime/src/generic/digest.rs
@@ -24,12 +24,16 @@ use sp_std::prelude::*;
 
 use crate::{
 	codec::{Decode, Encode, Error, Input},
+	scale_info::{
+		build::{Fields, Variants},
+		meta_type, Path, Type, TypeInfo, TypeParameter,
+	},
 	ConsensusEngineId,
 };
 use sp_core::{ChangesTrieConfiguration, RuntimeDebug};
 
 /// Generic header digest.
-#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug)]
+#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, TypeInfo)]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize, parity_util_mem::MallocSizeOf))]
 pub struct Digest<Hash> {
 	/// A list of logs in the digest.
@@ -129,7 +133,7 @@ pub enum DigestItem<Hash> {
 }
 
 /// Available changes trie signals.
-#[derive(PartialEq, Eq, Clone, Encode, Decode)]
+#[derive(PartialEq, Eq, Clone, Encode, Decode, TypeInfo)]
 #[cfg_attr(feature = "std", derive(Debug, parity_util_mem::MallocSizeOf))]
 pub enum ChangesTrieSignal {
 	/// New changes trie configuration is enacted, starting from **next block**.
@@ -167,6 +171,69 @@ impl<'a, Hash: Decode> serde::Deserialize<'a> for DigestItem<Hash> {
 	}
 }
 
+impl<Hash> TypeInfo for DigestItem<Hash>
+where
+	Hash: TypeInfo + 'static,
+{
+	type Identity = Self;
+
+	fn type_info() -> Type {
+		Type::builder()
+			.path(Path::new("DigestItem", module_path!()))
+			.type_params(vec![TypeParameter::new("Hash", Some(meta_type::<Hash>()))])
+			.variant(
+				Variants::new()
+					.variant("ChangesTrieRoot", |v| {
+						v.index(DigestItemType::ChangesTrieRoot as u8)
+							.fields(Fields::unnamed().field(|f| f.ty::<Hash>().type_name("Hash")))
+					})
+					.variant("PreRuntime", |v| {
+						v.index(DigestItemType::PreRuntime as u8).fields(
+							Fields::unnamed()
+								.field(|f| {
+									f.ty::<ConsensusEngineId>().type_name("ConsensusEngineId")
+								})
+								.field(|f| f.ty::<Vec<u8>>().type_name("Vec<u8>")),
+						)
+					})
+					.variant("Consensus", |v| {
+						v.index(DigestItemType::Consensus as u8).fields(
+							Fields::unnamed()
+								.field(|f| {
+									f.ty::<ConsensusEngineId>().type_name("ConsensusEngineId")
+								})
+								.field(|f| f.ty::<Vec<u8>>().type_name("Vec<u8>")),
+						)
+					})
+					.variant("Seal", |v| {
+						v.index(DigestItemType::Seal as u8).fields(
+							Fields::unnamed()
+								.field(|f| {
+									f.ty::<ConsensusEngineId>().type_name("ConsensusEngineId")
+								})
+								.field(|f| f.ty::<Vec<u8>>().type_name("Vec<u8>")),
+						)
+					})
+					.variant("ChangesTrieSignal", |v| {
+						v.index(DigestItemType::ChangesTrieSignal as u8).fields(
+							Fields::unnamed().field(|f| {
+								f.ty::<ChangesTrieSignal>().type_name("ChangesTrieSignal")
+							}),
+						)
+					})
+					.variant("Other", |v| {
+						v.index(DigestItemType::Other as u8).fields(
+							Fields::unnamed().field(|f| f.ty::<Vec<u8>>().type_name("Vec<u8>")),
+						)
+					})
+					.variant("RuntimeEnvironmentUpdated", |v| {
+						v.index(DigestItemType::RuntimeEnvironmentUpdated as u8)
+							.fields(Fields::unit())
+					}),
+			)
+	}
+}
+
 /// A 'referencing view' for digest item. Does not own its contents. Used by
 /// final runtime implementations for encoding/decoding its log items.
 #[derive(PartialEq, Eq, Clone, RuntimeDebug)]
@@ -509,4 +576,52 @@ mod tests {
 			r#"{"logs":["0x0204000000","0x000c010203","0x05746573740c010203"]}"#
 		);
 	}
+
+	#[test]
+	fn digest_item_type_info() {
+		let type_info = DigestItem::<u32>::type_info();
+		let variants = if let scale_info::TypeDef::Variant(variant) = type_info.type_def() {
+			variant.variants()
+		} else {
+			panic!("Should be a TypeDef::TypeDefVariant")
+		};
+
+		// ensure that all variants are covered by manual TypeInfo impl
+		let check = |digest_item_type: DigestItemType| {
+			let (variant_name, digest_item) = match digest_item_type {
+				DigestItemType::Other => ("Other", DigestItem::<u32>::Other(Default::default())),
+				DigestItemType::ChangesTrieRoot =>
+					("ChangesTrieRoot", DigestItem::ChangesTrieRoot(Default::default())),
+				DigestItemType::Consensus =>
+					("Consensus", DigestItem::Consensus(Default::default(), Default::default())),
+				DigestItemType::Seal =>
+					("Seal", DigestItem::Seal(Default::default(), Default::default())),
+				DigestItemType::PreRuntime =>
+					("PreRuntime", DigestItem::PreRuntime(Default::default(), Default::default())),
+				DigestItemType::ChangesTrieSignal => (
+					"ChangesTrieSignal",
+					DigestItem::ChangesTrieSignal(ChangesTrieSignal::NewConfiguration(
+						Default::default(),
+					)),
+				),
+				DigestItemType::RuntimeEnvironmentUpdated =>
+					("RuntimeEnvironmentUpdated", DigestItem::RuntimeEnvironmentUpdated),
+			};
+			let encoded = digest_item.encode();
+			let variant = variants
+				.iter()
+				.find(|v| v.name() == &variant_name)
+				.expect(&format!("Variant {} not found", variant_name));
+
+			assert_eq!(encoded[0], variant.index())
+		};
+
+		check(DigestItemType::Other);
+		check(DigestItemType::ChangesTrieRoot);
+		check(DigestItemType::Consensus);
+		check(DigestItemType::Seal);
+		check(DigestItemType::PreRuntime);
+		check(DigestItemType::ChangesTrieSignal);
+		check(DigestItemType::RuntimeEnvironmentUpdated);
+	}
 }
diff --git a/primitives/runtime/src/generic/era.rs b/primitives/runtime/src/generic/era.rs
index 1a7239ab6e3e..9d831b679c5e 100644
--- a/primitives/runtime/src/generic/era.rs
+++ b/primitives/runtime/src/generic/era.rs
@@ -134,6 +134,50 @@ impl Decode for Era {
 	}
 }
 
+/// Add Mortal{N}(u8) variants with the given indices, to describe custom encoding.
+macro_rules! mortal_variants {
+    ($variants:ident, $($index:literal),* ) => {
+		$variants
+		$(
+			.variant(concat!(stringify!(Mortal), stringify!($index)), |v| v
+				.index($index)
+				.fields(scale_info::build::Fields::unnamed().field(|f| f.ty::<u8>()))
+			)
+		)*
+    }
+}
+
+impl scale_info::TypeInfo for Era {
+	type Identity = Self;
+
+	fn type_info() -> scale_info::Type {
+		let variants = scale_info::build::Variants::new().variant("Immortal", |v| v.index(0));
+
+		// this is necessary since the size of the encoded Mortal variant is `u16`, conditional on
+		// the value of the first byte being > 0.
+		let variants = mortal_variants!(
+			variants, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+			22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
+			44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
+			66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87,
+			88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107,
+			108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
+			125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
+			142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158,
+			159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+			176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192,
+			193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+			210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226,
+			227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243,
+			244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255
+		);
+
+		scale_info::Type::builder()
+			.path(scale_info::Path::new("Era", module_path!()))
+			.variant(variants)
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;
diff --git a/primitives/runtime/src/generic/header.rs b/primitives/runtime/src/generic/header.rs
index d28f663db003..82f081c0d70b 100644
--- a/primitives/runtime/src/generic/header.rs
+++ b/primitives/runtime/src/generic/header.rs
@@ -20,6 +20,7 @@
 use crate::{
 	codec::{Codec, Decode, Encode},
 	generic::Digest,
+	scale_info::TypeInfo,
 	traits::{
 		self, AtLeast32BitUnsigned, Hash as HashT, MaybeDisplay, MaybeMallocSizeOf, MaybeSerialize,
 		MaybeSerializeDeserialize, Member, SimpleBitOps,
@@ -31,7 +32,7 @@ use sp_core::U256;
 use sp_std::{convert::TryFrom, fmt::Debug};
 
 /// Abstraction over a block header for a substrate chain.
-#[derive(Encode, Decode, PartialEq, Eq, Clone, sp_core::RuntimeDebug)]
+#[derive(Encode, Decode, PartialEq, Eq, Clone, sp_core::RuntimeDebug, TypeInfo)]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
 #[cfg_attr(feature = "std", serde(deny_unknown_fields))]
diff --git a/primitives/runtime/src/generic/unchecked_extrinsic.rs b/primitives/runtime/src/generic/unchecked_extrinsic.rs
index f0e00b7b8297..95f4f2f3584d 100644
--- a/primitives/runtime/src/generic/unchecked_extrinsic.rs
+++ b/primitives/runtime/src/generic/unchecked_extrinsic.rs
@@ -27,6 +27,7 @@ use crate::{
 	OpaqueExtrinsic,
 };
 use codec::{Compact, Decode, Encode, EncodeLike, Error, Input};
+use scale_info::{build::Fields, meta_type, Path, StaticTypeInfo, Type, TypeInfo, TypeParameter};
 use sp_io::hashing::blake2_256;
 use sp_std::{fmt, prelude::*};
 
@@ -48,6 +49,40 @@ where
 	pub function: Call,
 }
 
+/// Manual [`TypeInfo`] implementation because of custom encoding. The data is a valid encoded
+/// `Vec<u8>`, but requires some logic to extract the signature and payload.
+///
+/// See [`UncheckedExtrinsic::encode`] and [`UncheckedExtrinsic::decode`].
+impl<Address, Call, Signature, Extra> TypeInfo
+	for UncheckedExtrinsic<Address, Call, Signature, Extra>
+where
+	Address: StaticTypeInfo,
+	Call: StaticTypeInfo,
+	Signature: StaticTypeInfo,
+	Extra: SignedExtension + StaticTypeInfo,
+{
+	type Identity = UncheckedExtrinsic<Address, Call, Signature, Extra>;
+
+	fn type_info() -> Type {
+		Type::builder()
+			.path(Path::new("UncheckedExtrinsic", module_path!()))
+			// Include the type parameter types, even though they are not used directly in any of
+			// the described fields. These type definitions can be used by downstream consumers
+			// to help construct the custom decoding from the opaque bytes (see below).
+			.type_params(vec![
+				TypeParameter::new("Address", Some(meta_type::<Address>())),
+				TypeParameter::new("Call", Some(meta_type::<Call>())),
+				TypeParameter::new("Signature", Some(meta_type::<Signature>())),
+				TypeParameter::new("Extra", Some(meta_type::<Extra>())),
+			])
+			.docs(&["UncheckedExtrinsic raw bytes, requires custom decoding routine"])
+			// Because of the custom encoding, we can only accurately describe the encoding as an
+			// opaque `Vec<u8>`. Downstream consumers will need to manually implement the codec to
+			// encode/decode the `signature` and `function` fields.
+			.composite(Fields::unnamed().field(|f| f.ty::<Vec<u8>>()))
+	}
+}
+
 #[cfg(feature = "std")]
 impl<Address, Call, Signature, Extra> parity_util_mem::MallocSizeOf
 	for UncheckedExtrinsic<Address, Call, Signature, Extra>
@@ -340,7 +375,7 @@ mod tests {
 	const TEST_ACCOUNT: TestAccountId = 0;
 
 	// NOTE: this is demonstration. One can simply use `()` for testing.
-	#[derive(Debug, Encode, Decode, Clone, Eq, PartialEq, Ord, PartialOrd)]
+	#[derive(Debug, Encode, Decode, Clone, Eq, PartialEq, Ord, PartialOrd, TypeInfo)]
 	struct TestExtra;
 	impl SignedExtension for TestExtra {
 		const IDENTIFIER: &'static str = "TestExtra";
diff --git a/primitives/runtime/src/lib.rs b/primitives/runtime/src/lib.rs
index 4a9c6087fa5c..80293fe73484 100644
--- a/primitives/runtime/src/lib.rs
+++ b/primitives/runtime/src/lib.rs
@@ -26,6 +26,8 @@ extern crate test;
 
 #[doc(hidden)]
 pub use codec;
+#[doc(hidden)]
+pub use scale_info;
 #[cfg(feature = "std")]
 #[doc(hidden)]
 pub use serde;
@@ -50,6 +52,7 @@ use sp_core::{
 use sp_std::{convert::TryFrom, prelude::*};
 
 use codec::{Decode, Encode};
+use scale_info::TypeInfo;
 
 pub mod curve;
 pub mod generic;
@@ -220,7 +223,7 @@ pub type ConsensusEngineId = [u8; 4];
 
 /// Signature verify that can work with any known signature types..
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-#[derive(Eq, PartialEq, Clone, Encode, Decode, RuntimeDebug)]
+#[derive(Eq, PartialEq, Clone, Encode, Decode, RuntimeDebug, TypeInfo)]
 pub enum MultiSignature {
 	/// An Ed25519 signature.
 	Ed25519(ed25519::Signature),
@@ -288,7 +291,7 @@ impl Default for MultiSignature {
 }
 
 /// Public key for any known crypto algorithm.
-#[derive(Eq, PartialEq, Ord, PartialOrd, Clone, Encode, Decode, RuntimeDebug)]
+#[derive(Eq, PartialEq, Ord, PartialOrd, Clone, Encode, Decode, RuntimeDebug, TypeInfo)]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 pub enum MultiSigner {
 	/// An Ed25519 identity.
@@ -463,7 +466,7 @@ pub type DispatchResult = sp_std::result::Result<(), DispatchError>;
 pub type DispatchResultWithInfo<T> = sp_std::result::Result<T, DispatchErrorWithPostInfo<T>>;
 
 /// Reason why a dispatch call failed.
-#[derive(Eq, Clone, Copy, Encode, Decode, Debug)]
+#[derive(Eq, Clone, Copy, Encode, Decode, Debug, TypeInfo)]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 pub enum DispatchError {
 	/// Some error occurred.
@@ -544,7 +547,7 @@ impl From<crate::traits::BadOrigin> for DispatchError {
 }
 
 /// Description of what went wrong when trying to complete an operation on a token.
-#[derive(Eq, PartialEq, Clone, Copy, Encode, Decode, Debug)]
+#[derive(Eq, PartialEq, Clone, Copy, Encode, Decode, Debug, TypeInfo)]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 pub enum TokenError {
 	/// Funds are unavailable.
@@ -584,7 +587,7 @@ impl From<TokenError> for DispatchError {
 }
 
 /// Arithmetic errors.
-#[derive(Eq, PartialEq, Clone, Copy, Encode, Decode, Debug)]
+#[derive(Eq, PartialEq, Clone, Copy, Encode, Decode, Debug, TypeInfo)]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 pub enum ArithmeticError {
 	/// Underflow.
diff --git a/primitives/runtime/src/multiaddress.rs b/primitives/runtime/src/multiaddress.rs
index 28031461cf32..46d80608352d 100644
--- a/primitives/runtime/src/multiaddress.rs
+++ b/primitives/runtime/src/multiaddress.rs
@@ -21,7 +21,7 @@ use codec::{Decode, Encode};
 use sp_std::vec::Vec;
 
 /// A multi-format address wrapper for on-chain accounts.
-#[derive(Encode, Decode, PartialEq, Eq, Clone, crate::RuntimeDebug)]
+#[derive(Encode, Decode, PartialEq, Eq, Clone, crate::RuntimeDebug, scale_info::TypeInfo)]
 #[cfg_attr(feature = "std", derive(Hash))]
 pub enum MultiAddress<AccountId, AccountIndex> {
 	/// It's an account ID (pubkey).
diff --git a/primitives/runtime/src/runtime_string.rs b/primitives/runtime/src/runtime_string.rs
index 273a22e98f33..179e88145181 100644
--- a/primitives/runtime/src/runtime_string.rs
+++ b/primitives/runtime/src/runtime_string.rs
@@ -32,6 +32,14 @@ pub enum RuntimeString {
 	Owned(Vec<u8>),
 }
 
+impl scale_info::TypeInfo for RuntimeString {
+	type Identity = str;
+
+	fn type_info() -> scale_info::Type {
+		Self::Identity::type_info()
+	}
+}
+
 /// Convenience macro to use the format! interface to get a `RuntimeString::Owned`
 #[macro_export]
 macro_rules! format_runtime_string {
diff --git a/primitives/runtime/src/testing.rs b/primitives/runtime/src/testing.rs
index 60dc54e09534..781f342d43c1 100644
--- a/primitives/runtime/src/testing.rs
+++ b/primitives/runtime/src/testing.rs
@@ -20,6 +20,7 @@
 use crate::{
 	codec::{Codec, Decode, Encode},
 	generic,
+	scale_info::TypeInfo,
 	traits::{
 		self, Applyable, BlakeTwo256, Checkable, DispatchInfoOf, Dispatchable, OpaqueKeys,
 		PostDispatchInfoOf, SignedExtension, ValidateUnsigned,
@@ -58,6 +59,7 @@ use std::{
 	Deserialize,
 	PartialOrd,
 	Ord,
+	TypeInfo,
 )]
 pub struct UintAuthorityId(pub u64);
 
@@ -167,7 +169,7 @@ impl traits::IdentifyAccount for UintAuthorityId {
 }
 
 /// A dummy signature type, to match `UintAuthorityId`.
-#[derive(Eq, PartialEq, Clone, Debug, Hash, Serialize, Deserialize, Encode, Decode)]
+#[derive(Eq, PartialEq, Clone, Debug, Hash, Serialize, Deserialize, Encode, Decode, TypeInfo)]
 pub struct TestSignature(pub u64, pub Vec<u8>);
 
 impl traits::Verify for TestSignature {
@@ -288,7 +290,7 @@ where
 /// with index only used if sender is some.
 ///
 /// If sender is some then the transaction is signed otherwise it is unsigned.
-#[derive(PartialEq, Eq, Clone, Encode, Decode)]
+#[derive(PartialEq, Eq, Clone, Encode, Decode, TypeInfo)]
 pub struct TestXt<Call, Extra> {
 	/// Signature of the extrinsic.
 	pub signature: Option<(u64, Extra)>,
diff --git a/primitives/runtime/src/traits.rs b/primitives/runtime/src/traits.rs
index 312a9f6331bf..65c063fde169 100644
--- a/primitives/runtime/src/traits.rs
+++ b/primitives/runtime/src/traits.rs
@@ -20,6 +20,7 @@
 use crate::{
 	codec::{Codec, Decode, Encode, MaxEncodedLen},
 	generic::{Digest, DigestItem},
+	scale_info::{MetaType, StaticTypeInfo, TypeInfo},
 	transaction_validity::{
 		TransactionSource, TransactionValidity, TransactionValidityError, UnknownTransaction,
 		ValidTransaction,
@@ -210,7 +211,7 @@ pub trait Lookup {
 /// context.
 pub trait StaticLookup {
 	/// Type to lookup from.
-	type Source: Codec + Clone + PartialEq + Debug;
+	type Source: Codec + Clone + PartialEq + Debug + TypeInfo;
 	/// Type to lookup into.
 	type Target;
 	/// Attempt a lookup.
@@ -222,7 +223,7 @@ pub trait StaticLookup {
 /// A lookup implementation returning the input value.
 #[derive(Default)]
 pub struct IdentityLookup<T>(PhantomData<T>);
-impl<T: Codec + Clone + PartialEq + Debug> StaticLookup for IdentityLookup<T> {
+impl<T: Codec + Clone + PartialEq + Debug + TypeInfo> StaticLookup for IdentityLookup<T> {
 	type Source = T;
 	type Target = T;
 	fn lookup(x: T) -> Result<T, LookupError> {
@@ -247,7 +248,7 @@ impl<AccountId, AccountIndex> StaticLookup for AccountIdLookup<AccountId, Accoun
 where
 	AccountId: Codec + Clone + PartialEq + Debug,
 	AccountIndex: Codec + Clone + PartialEq + Debug,
-	crate::MultiAddress<AccountId, AccountIndex>: Codec,
+	crate::MultiAddress<AccountId, AccountIndex>: Codec + StaticTypeInfo,
 {
 	type Source = crate::MultiAddress<AccountId, AccountIndex>;
 	type Target = AccountId;
@@ -444,7 +445,8 @@ pub trait Hash:
 		+ Default
 		+ Encode
 		+ Decode
-		+ MaxEncodedLen;
+		+ MaxEncodedLen
+		+ TypeInfo;
 
 	/// Produce the hash of some byte-slice.
 	fn hash(s: &[u8]) -> Self::Output {
@@ -464,7 +466,7 @@ pub trait Hash:
 }
 
 /// Blake2-256 Hash implementation.
-#[derive(PartialEq, Eq, Clone, RuntimeDebug)]
+#[derive(PartialEq, Eq, Clone, RuntimeDebug, TypeInfo)]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 pub struct BlakeTwo256;
 
@@ -491,7 +493,7 @@ impl Hash for BlakeTwo256 {
 }
 
 /// Keccak-256 Hash implementation.
-#[derive(PartialEq, Eq, Clone, RuntimeDebug)]
+#[derive(PartialEq, Eq, Clone, RuntimeDebug, TypeInfo)]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 pub struct Keccak256;
 
@@ -629,7 +631,8 @@ pub trait Header:
 		+ Codec
 		+ AsRef<[u8]>
 		+ AsMut<[u8]>
-		+ MaybeMallocSizeOf;
+		+ MaybeMallocSizeOf
+		+ TypeInfo;
 	/// Hashing algorithm
 	type Hashing: Hash<Output = Self::Hash>;
 
@@ -697,7 +700,8 @@ pub trait Block:
 		+ Codec
 		+ AsRef<[u8]>
 		+ AsMut<[u8]>
-		+ MaybeMallocSizeOf;
+		+ MaybeMallocSizeOf
+		+ TypeInfo;
 
 	/// Returns a reference to the header.
 	fn header(&self) -> &Self::Header;
@@ -833,7 +837,9 @@ impl Dispatchable for () {
 
 /// Means by which a transaction may be extended. This type embodies both the data and the logic
 /// that should be additionally associated with the transaction. It should be plain old data.
-pub trait SignedExtension: Codec + Debug + Sync + Send + Clone + Eq + PartialEq {
+pub trait SignedExtension:
+	Codec + Debug + Sync + Send + Clone + Eq + PartialEq + StaticTypeInfo
+{
 	/// Unique identifier of this signed extension.
 	///
 	/// This will be exposed in the metadata to identify the signed extension used
@@ -848,7 +854,7 @@ pub trait SignedExtension: Codec + Debug + Sync + Send + Clone + Eq + PartialEq
 
 	/// Any additional data that will go into the signed payload. This may be created dynamically
 	/// from the transaction using the `additional_signed` function.
-	type AdditionalSigned: Encode;
+	type AdditionalSigned: Encode + TypeInfo;
 
 	/// The type that encodes information that can be passed from pre_dispatch to post-dispatch.
 	type Pre: Default;
@@ -953,18 +959,33 @@ pub trait SignedExtension: Codec + Debug + Sync + Send + Clone + Eq + PartialEq
 		Ok(())
 	}
 
-	/// Returns the list of unique identifier for this signed extension.
+	/// Returns the metadata for this signed extension.
 	///
 	/// As a [`SignedExtension`] can be a tuple of [`SignedExtension`]s we need to return a `Vec`
-	/// that holds all the unique identifiers. Each individual `SignedExtension` must return
-	/// *exactly* one identifier.
+	/// that holds the metadata of each one. Each individual `SignedExtension` must return
+	/// *exactly* one [`SignedExtensionMetadata`].
 	///
-	/// This method provides a default implementation that returns `vec![SELF::IDENTIFIER]`.
-	fn identifier() -> Vec<&'static str> {
-		sp_std::vec![Self::IDENTIFIER]
+	/// This method provides a default implementation that returns a vec containing a single
+	/// [`SignedExtensionMetadata`].
+	fn metadata() -> Vec<SignedExtensionMetadata> {
+		sp_std::vec![SignedExtensionMetadata {
+			identifier: Self::IDENTIFIER,
+			ty: scale_info::meta_type::<Self>(),
+			additional_signed: scale_info::meta_type::<Self::AdditionalSigned>()
+		}]
 	}
 }
 
+/// Information about a [`SignedExtension`] for the runtime metadata.
+pub struct SignedExtensionMetadata {
+	/// The unique identifier of the [`SignedExtension`].
+	pub identifier: &'static str,
+	/// The type of the [`SignedExtension`].
+	pub ty: MetaType,
+	/// The type of the [`SignedExtension`] additional signed data for the payload.
+	pub additional_signed: MetaType,
+}
+
 #[impl_for_tuples(1, 12)]
 impl<AccountId, Call: Dispatchable> SignedExtension for Tuple {
 	for_tuples!( where #( Tuple: SignedExtension<AccountId=AccountId, Call=Call,> )* );
@@ -1029,9 +1050,9 @@ impl<AccountId, Call: Dispatchable> SignedExtension for Tuple {
 		Ok(())
 	}
 
-	fn identifier() -> Vec<&'static str> {
+	fn metadata() -> Vec<SignedExtensionMetadata> {
 		let mut ids = Vec::new();
-		for_tuples!( #( ids.extend(Tuple::identifier()); )* );
+		for_tuples!( #( ids.extend(Tuple::metadata()); )* );
 		ids
 	}
 }
@@ -1305,6 +1326,7 @@ macro_rules! impl_opaque_keys_inner {
 			Default, Clone, PartialEq, Eq,
 			$crate::codec::Encode,
 			$crate::codec::Decode,
+			$crate::scale_info::TypeInfo,
 			$crate::RuntimeDebug,
 		)]
 		pub struct $name {
diff --git a/primitives/session/Cargo.toml b/primitives/session/Cargo.toml
index 91677b474d95..8e1e2464e49e 100644
--- a/primitives/session/Cargo.toml
+++ b/primitives/session/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-api = { version = "4.0.0-dev", default-features = false, path = "../api" }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../core" }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
@@ -24,6 +25,7 @@ sp-runtime = { version = "4.0.0-dev", optional = true, path = "../runtime" }
 default = [ "std" ]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"sp-api/std",
 	"sp-core/std",
 	"sp-std/std",
diff --git a/primitives/session/src/lib.rs b/primitives/session/src/lib.rs
index 22d6b0b4a592..d85b6af4349e 100644
--- a/primitives/session/src/lib.rs
+++ b/primitives/session/src/lib.rs
@@ -53,7 +53,7 @@ sp_api::decl_runtime_apis! {
 pub type ValidatorCount = u32;
 
 /// Proof of membership of a specific key in a given session.
-#[derive(Encode, Decode, Clone, Eq, PartialEq, Default, RuntimeDebug)]
+#[derive(Encode, Decode, Clone, Eq, PartialEq, Default, RuntimeDebug, scale_info::TypeInfo)]
 pub struct MembershipProof {
 	/// The session index on which the specific key is a member.
 	pub session: SessionIndex,
diff --git a/primitives/staking/Cargo.toml b/primitives/staking/Cargo.toml
index 85f5487da884..9e852319ede4 100644
--- a/primitives/staking/Cargo.toml
+++ b/primitives/staking/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../runtime" }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
 
@@ -21,6 +22,7 @@ sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
 default = ["std"]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"sp-runtime/std",
 	"sp-std/std",
 ]
diff --git a/primitives/staking/src/offence.rs b/primitives/staking/src/offence.rs
index b9afda41c5e7..a91cb47c117b 100644
--- a/primitives/staking/src/offence.rs
+++ b/primitives/staking/src/offence.rs
@@ -170,7 +170,7 @@ impl<Reporter, Offender, Res: Default> OnOffenceHandler<Reporter, Offender, Res>
 }
 
 /// A details about an offending authority for a particular kind of offence.
-#[derive(Clone, PartialEq, Eq, Encode, Decode, sp_runtime::RuntimeDebug)]
+#[derive(Clone, PartialEq, Eq, Encode, Decode, sp_runtime::RuntimeDebug, scale_info::TypeInfo)]
 pub struct OffenceDetails<Reporter, Offender> {
 	/// The offending authority id
 	pub offender: Offender,
diff --git a/primitives/transaction-storage-proof/Cargo.toml b/primitives/transaction-storage-proof/Cargo.toml
index 0b5065be8219..8a41105b20b7 100644
--- a/primitives/transaction-storage-proof/Cargo.toml
+++ b/primitives/transaction-storage-proof/Cargo.toml
@@ -19,6 +19,7 @@ sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
 sp-trie = { version = "4.0.0-dev", optional = true, path = "../trie" }
 sp-core = { version = "4.0.0-dev", path = "../core", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 log = { version = "0.4.8", optional = true }
 async-trait = { version = "0.1.50", optional = true }
 
@@ -26,6 +27,7 @@ async-trait = { version = "0.1.50", optional = true }
 default = [ "std" ]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"sp-std/std",
 	"sp-inherents/std",
 	"sp-runtime/std",
diff --git a/primitives/transaction-storage-proof/src/lib.rs b/primitives/transaction-storage-proof/src/lib.rs
index d159aa735c26..4b01a8d45d45 100644
--- a/primitives/transaction-storage-proof/src/lib.rs
+++ b/primitives/transaction-storage-proof/src/lib.rs
@@ -51,7 +51,7 @@ impl IsFatalError for InherentError {
 
 /// Holds a chunk of data retrieved from storage along with
 /// a proof that the data was stored at that location in the trie.
-#[derive(Encode, Decode, Clone, PartialEq, Debug)]
+#[derive(Encode, Decode, Clone, PartialEq, Debug, scale_info::TypeInfo)]
 pub struct TransactionStorageProof {
 	/// Data chunk that is proved to exist.
 	pub chunk: Vec<u8>,
diff --git a/primitives/trie/Cargo.toml b/primitives/trie/Cargo.toml
index 60356e0a8d6d..5a2de4f16f9a 100644
--- a/primitives/trie/Cargo.toml
+++ b/primitives/trie/Cargo.toml
@@ -19,6 +19,7 @@ harness = false
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
 hash-db = { version = "0.15.2", default-features = false }
 trie-db = { version = "0.22.6", default-features = false }
@@ -38,6 +39,7 @@ default = ["std"]
 std = [
 	"sp-std/std",
 	"codec/std",
+	"scale-info/std",
 	"hash-db/std",
 	"memory-db/std",
 	"trie-db/std",
diff --git a/primitives/trie/src/storage_proof.rs b/primitives/trie/src/storage_proof.rs
index 410ad44e75a6..cfdb8566ea75 100644
--- a/primitives/trie/src/storage_proof.rs
+++ b/primitives/trie/src/storage_proof.rs
@@ -17,6 +17,7 @@
 
 use codec::{Decode, Encode};
 use hash_db::{HashDB, Hasher};
+use scale_info::TypeInfo;
 use sp_std::vec::Vec;
 
 /// A proof that some set of key-value pairs are included in the storage trie. The proof contains
@@ -26,13 +27,13 @@ use sp_std::vec::Vec;
 /// The proof consists of the set of serialized nodes in the storage trie accessed when looking up
 /// the keys covered by the proof. Verifying the proof requires constructing the partial trie from
 /// the serialized nodes and performing the key lookups.
-#[derive(Debug, PartialEq, Eq, Clone, Encode, Decode)]
+#[derive(Debug, PartialEq, Eq, Clone, Encode, Decode, TypeInfo)]
 pub struct StorageProof {
 	trie_nodes: Vec<Vec<u8>>,
 }
 
 /// Storage proof in compact form.
-#[derive(Debug, PartialEq, Eq, Clone, Encode, Decode)]
+#[derive(Debug, PartialEq, Eq, Clone, Encode, Decode, TypeInfo)]
 pub struct CompactProof {
 	pub encoded_nodes: Vec<Vec<u8>>,
 }
diff --git a/primitives/version/Cargo.toml b/primitives/version/Cargo.toml
index 1cd3e7c72475..fcab1eeabcaf 100644
--- a/primitives/version/Cargo.toml
+++ b/primitives/version/Cargo.toml
@@ -18,6 +18,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 impl-serde = { version = "0.3.1", optional = true }
 serde = { version = "1.0.126", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../runtime" }
 sp-version-proc-macro = { version = "4.0.0-dev", default-features = false, path = "proc-macro" }
@@ -30,6 +31,7 @@ std = [
 	"impl-serde",
 	"serde",
 	"codec/std",
+	"scale-info/std",
 	"sp-std/std",
 	"sp-runtime/std",
 	"parity-wasm",
diff --git a/primitives/version/src/lib.rs b/primitives/version/src/lib.rs
index 65b22436a5ba..58216bc494dd 100644
--- a/primitives/version/src/lib.rs
+++ b/primitives/version/src/lib.rs
@@ -27,6 +27,7 @@ use std::collections::HashSet;
 use std::fmt;
 
 use codec::{Decode, Encode};
+use scale_info::TypeInfo;
 pub use sp_runtime::create_runtime_str;
 use sp_runtime::RuntimeString;
 #[doc(hidden)]
@@ -123,7 +124,7 @@ macro_rules! create_apis_vec {
 /// In particular: bug fixes should result in an increment of `spec_version` and possibly
 /// `authoring_version`, absolutely not `impl_version` since they change the semantics of the
 /// runtime.
-#[derive(Clone, PartialEq, Eq, Encode, Decode, Default, sp_runtime::RuntimeDebug)]
+#[derive(Clone, PartialEq, Eq, Encode, Decode, Default, sp_runtime::RuntimeDebug, TypeInfo)]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
 pub struct RuntimeVersion {
diff --git a/test-utils/runtime/Cargo.toml b/test-utils/runtime/Cargo.toml
index cc57f12ea31a..24f4d404c18b 100644
--- a/test-utils/runtime/Cargo.toml
+++ b/test-utils/runtime/Cargo.toml
@@ -18,6 +18,7 @@ sp-consensus-aura = { version = "0.10.0-dev", default-features = false, path = "
 sp-consensus-babe = { version = "0.10.0-dev", default-features = false, path = "../../primitives/consensus/babe" }
 sp-block-builder = { version = "4.0.0-dev", default-features = false, path = "../../primitives/block-builder" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 sp-inherents = { version = "4.0.0-dev", default-features = false, path = "../../primitives/inherents" }
 sp-keyring = { version = "4.0.0-dev", optional = true, path = "../../primitives/keyring" }
 memory-db = { version = "0.27.0", default-features = false }
@@ -69,6 +70,7 @@ std = [
 	"sp-consensus-babe/std",
 	"sp-block-builder/std",
 	"codec/std",
+	"scale-info/std",
 	"sp-inherents/std",
 	"sp-keyring",
 	"log/std",
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index bdb872412081..0d880d508ef3 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -24,6 +24,7 @@ pub mod genesismap;
 pub mod system;
 
 use codec::{Decode, Encode, Error, Input};
+use scale_info::TypeInfo;
 use sp_std::{marker::PhantomData, prelude::*};
 
 use sp_application_crypto::{ecdsa, ed25519, sr25519, RuntimeAppPublic};
@@ -415,7 +416,7 @@ cfg_if! {
 	}
 }
 
-#[derive(Clone, Eq, PartialEq)]
+#[derive(Clone, Eq, PartialEq, TypeInfo)]
 pub struct Runtime;
 
 impl GetNodeBlockType for Runtime {
@@ -483,7 +484,7 @@ impl frame_support::traits::OriginTrait for Origin {
 	}
 }
 
-#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug)]
+#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, TypeInfo)]
 pub struct Event;
 
 impl From<frame_system::Event<Runtime>> for Event {
diff --git a/utils/frame/rpc/support/Cargo.toml b/utils/frame/rpc/support/Cargo.toml
index aa9f1bbef802..a94f18d0e892 100644
--- a/utils/frame/rpc/support/Cargo.toml
+++ b/utils/frame/rpc/support/Cargo.toml
@@ -25,4 +25,5 @@ sc-rpc-api = { version = "0.10.0-dev", path = "../../../../client/rpc-api" }
 
 [dev-dependencies]
 frame-system = { version = "4.0.0-dev", path = "../../../../frame/system" }
+scale-info = "1.0"
 tokio = "1.10"

From 435f56edc14a3a7e895ff5370f6e5179dc547cc4 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Thu, 16 Sep 2021 15:20:29 +0200
Subject: [PATCH 1190/1194] Implement a `CountedStorageMap` (#9125)

* initial impl

* expose in pallet_prelude

* temp test

* Apply suggestions from code review

Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
Co-authored-by: Xiliang Chen <xlchen1291@gmail.com>

* implement with macro help.

* test for macro generation

* add iterable functions, some test and fixes

* fix merge

* doc

* Update frame/support/src/storage/types/counted_map.rs

Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com>

* fix merge

* fmt

* fix spelling

* improve on removal

* fix partial storage info

* fmt

* add license

* suggested renames

* fix typo

* fix test

* fmt

* fix ui tests

* clearer doc

* better doc

* add metadata test

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
Co-authored-by: Xiliang Chen <xlchen1291@gmail.com>
Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com>
---
 frame/example/src/lib.rs                      |    3 +
 frame/example/src/tests.rs                    |    9 +
 .../procedural/src/pallet/expand/storage.rs   |  172 ++-
 .../procedural/src/pallet/parse/storage.rs    |   45 +
 frame/support/src/lib.rs                      |   21 +-
 .../src/storage/generator/double_map.rs       |    3 +
 frame/support/src/storage/generator/map.rs    |    1 +
 frame/support/src/storage/generator/nmap.rs   |    3 +
 frame/support/src/storage/migration.rs        |    7 +-
 frame/support/src/storage/mod.rs              |   40 +-
 .../support/src/storage/types/counted_map.rs  | 1040 +++++++++++++++++
 frame/support/src/storage/types/double_map.rs |   93 +-
 frame/support/src/storage/types/map.rs        |   83 +-
 frame/support/src/storage/types/mod.rs        |   17 +-
 frame/support/src/storage/types/nmap.rs       |  156 ++-
 frame/support/src/storage/types/value.rs      |   52 +-
 frame/support/test/tests/pallet.rs            |   98 +-
 .../pallet_ui/duplicate_storage_prefix.rs     |   14 +-
 .../pallet_ui/duplicate_storage_prefix.stderr |   38 +-
 ...age_ensure_span_are_ok_on_wrong_gen.stderr |   16 +-
 ...re_span_are_ok_on_wrong_gen_unnamed.stderr |   16 +-
 .../storage_info_unsatisfied_nmap.stderr      |    4 +-
 22 files changed, 1724 insertions(+), 207 deletions(-)
 create mode 100644 frame/support/src/storage/types/counted_map.rs

diff --git a/frame/example/src/lib.rs b/frame/example/src/lib.rs
index 3f56b57dac8c..23c4951c1a60 100644
--- a/frame/example/src/lib.rs
+++ b/frame/example/src/lib.rs
@@ -605,6 +605,9 @@ pub mod pallet {
 	#[pallet::getter(fn foo)]
 	pub(super) type Foo<T: Config> = StorageValue<_, T::Balance, ValueQuery>;
 
+	#[pallet::storage]
+	pub type CountedMap<T> = CountedStorageMap<_, Blake2_128Concat, u8, u16>;
+
 	// The genesis config type.
 	#[pallet::genesis_config]
 	pub struct GenesisConfig<T: Config> {
diff --git a/frame/example/src/tests.rs b/frame/example/src/tests.rs
index 87c2404f5b10..4c2274572db8 100644
--- a/frame/example/src/tests.rs
+++ b/frame/example/src/tests.rs
@@ -180,6 +180,15 @@ fn signed_ext_watch_dummy_works() {
 	})
 }
 
+#[test]
+fn counted_map_works() {
+	new_test_ext().execute_with(|| {
+		assert_eq!(CountedMap::<Test>::count(), 0);
+		CountedMap::<Test>::insert(3, 3);
+		assert_eq!(CountedMap::<Test>::count(), 1);
+	})
+}
+
 #[test]
 fn weights_work() {
 	// must have a defined weight.
diff --git a/frame/support/procedural/src/pallet/expand/storage.rs b/frame/support/procedural/src/pallet/expand/storage.rs
index 0f7133f10dd4..a4f030722f1c 100644
--- a/frame/support/procedural/src/pallet/expand/storage.rs
+++ b/frame/support/procedural/src/pallet/expand/storage.rs
@@ -19,27 +19,68 @@ use crate::pallet::{
 	parse::storage::{Metadata, QueryKind, StorageDef, StorageGenerics},
 	Def,
 };
-use std::collections::HashSet;
+use std::collections::HashMap;
 
-/// Generate the prefix_ident related the the storage.
+/// Generate the prefix_ident related to the storage.
 /// prefix_ident is used for the prefix struct to be given to storage as first generic param.
 fn prefix_ident(storage: &StorageDef) -> syn::Ident {
 	let storage_ident = &storage.ident;
 	syn::Ident::new(&format!("_GeneratedPrefixForStorage{}", storage_ident), storage_ident.span())
 }
 
+/// Generate the counter_prefix_ident related to the storage.
+/// counter_prefix_ident is used for the prefix struct to be given to counted storage map.
+fn counter_prefix_ident(storage_ident: &syn::Ident) -> syn::Ident {
+	syn::Ident::new(
+		&format!("_GeneratedCounterPrefixForStorage{}", storage_ident),
+		storage_ident.span(),
+	)
+}
+
+/// Generate the counter_prefix related to the storage.
+/// counter_prefix is used by counted storage map.
+fn counter_prefix(prefix: &str) -> String {
+	format!("CounterFor{}", prefix)
+}
+
 /// Check for duplicated storage prefixes. This step is necessary since users can specify an
 /// alternative storage prefix using the #[pallet::storage_prefix] syntax, and we need to ensure
 /// that the prefix specified by the user is not a duplicate of an existing one.
-fn check_prefix_duplicates(storage_def: &StorageDef, set: &mut HashSet<String>) -> syn::Result<()> {
+fn check_prefix_duplicates(
+	storage_def: &StorageDef,
+	// A hashmap of all already used prefix and their associated error if duplication
+	used_prefixes: &mut HashMap<String, syn::Error>,
+) -> syn::Result<()> {
 	let prefix = storage_def.prefix();
+	let dup_err = syn::Error::new(
+		storage_def.prefix_span(),
+		format!("Duplicate storage prefixes found for `{}`", prefix),
+	);
+
+	if let Some(other_dup_err) = used_prefixes.insert(prefix.clone(), dup_err.clone()) {
+		let mut err = dup_err;
+		err.combine(other_dup_err);
+		return Err(err)
+	}
 
-	if !set.insert(prefix.clone()) {
-		let err = syn::Error::new(
+	if let Metadata::CountedMap { .. } = storage_def.metadata {
+		let counter_prefix = counter_prefix(&prefix);
+		let counter_dup_err = syn::Error::new(
 			storage_def.prefix_span(),
-			format!("Duplicate storage prefixes found for `{}`", prefix),
+			format!(
+				"Duplicate storage prefixes found for `{}`, used for counter associated to \
+				counted storage map",
+				counter_prefix,
+			),
 		);
-		return Err(err)
+
+		if let Some(other_dup_err) =
+			used_prefixes.insert(counter_prefix.clone(), counter_dup_err.clone())
+		{
+			let mut err = counter_dup_err;
+			err.combine(other_dup_err);
+			return Err(err)
+		}
 	}
 
 	Ok(())
@@ -51,11 +92,8 @@ fn check_prefix_duplicates(storage_def: &StorageDef, set: &mut HashSet<String>)
 /// * Add `#[allow(type_alias_bounds)]`
 pub fn process_generics(def: &mut Def) -> syn::Result<()> {
 	let frame_support = &def.frame_support;
-	let mut prefix_set = HashSet::new();
 
 	for storage_def in def.storages.iter_mut() {
-		check_prefix_duplicates(storage_def, &mut prefix_set)?;
-
 		let item = &mut def.item.content.as_mut().expect("Checked by def").1[storage_def.index];
 
 		let typ_item = match item {
@@ -109,6 +147,24 @@ pub fn process_generics(def: &mut Def) -> syn::Result<()> {
 					let max_values = max_values.unwrap_or_else(|| default_max_values.clone());
 					args.args.push(syn::GenericArgument::Type(max_values));
 				},
+				StorageGenerics::CountedMap {
+					hasher,
+					key,
+					value,
+					query_kind,
+					on_empty,
+					max_values,
+				} => {
+					args.args.push(syn::GenericArgument::Type(hasher));
+					args.args.push(syn::GenericArgument::Type(key));
+					args.args.push(syn::GenericArgument::Type(value));
+					let query_kind = query_kind.unwrap_or_else(|| default_query_kind.clone());
+					args.args.push(syn::GenericArgument::Type(query_kind));
+					let on_empty = on_empty.unwrap_or_else(|| default_on_empty.clone());
+					args.args.push(syn::GenericArgument::Type(on_empty));
+					let max_values = max_values.unwrap_or_else(|| default_max_values.clone());
+					args.args.push(syn::GenericArgument::Type(max_values));
+				},
 				StorageGenerics::DoubleMap {
 					hasher1,
 					key1,
@@ -162,11 +218,22 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 		return e.into_compile_error().into()
 	}
 
+	// Check for duplicate prefixes
+	let mut prefix_set = HashMap::new();
+	let mut errors = def
+		.storages
+		.iter()
+		.filter_map(|storage_def| check_prefix_duplicates(storage_def, &mut prefix_set).err());
+	if let Some(mut final_error) = errors.next() {
+		errors.for_each(|error| final_error.combine(error));
+		return final_error.into_compile_error()
+	}
+
 	let frame_support = &def.frame_support;
 	let frame_system = &def.frame_system;
 	let pallet_ident = &def.pallet_struct.pallet;
 
-	let entries = def.storages.iter().map(|storage| {
+	let entries_builder = def.storages.iter().map(|storage| {
 		let docs = &storage.docs;
 
 		let ident = &storage.ident;
@@ -176,14 +243,14 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 		let cfg_attrs = &storage.cfg_attrs;
 
 		quote::quote_spanned!(storage.attr_span =>
-			#(#cfg_attrs)* #frame_support::metadata::StorageEntryMetadata {
-				name: <#full_ident as #frame_support::storage::StorageEntryMetadata>::NAME,
-				modifier: <#full_ident as #frame_support::storage::StorageEntryMetadata>::MODIFIER,
-				ty: <#full_ident as #frame_support::storage::StorageEntryMetadata>::ty(),
-				default: <#full_ident as #frame_support::storage::StorageEntryMetadata>::default(),
-				docs: #frame_support::sp_std::vec![
-					#( #docs, )*
-				],
+			#(#cfg_attrs)*
+			{
+				<#full_ident as #frame_support::storage::StorageEntryMetadataBuilder>::build_metadata(
+					#frame_support::sp_std::vec![
+						#( #docs, )*
+					],
+					&mut entries,
+				);
 			}
 		)
 	});
@@ -246,6 +313,27 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 						}
 					)
 				},
+				Metadata::CountedMap { key, value } => {
+					let query = match storage.query_kind.as_ref().expect("Checked by def") {
+						QueryKind::OptionQuery => quote::quote_spanned!(storage.attr_span =>
+							Option<#value>
+						),
+						QueryKind::ValueQuery => quote::quote!(#value),
+					};
+					quote::quote_spanned!(storage.attr_span =>
+						#(#cfg_attrs)*
+						impl<#type_impl_gen> #pallet_ident<#type_use_gen> #completed_where_clause {
+							#( #docs )*
+							pub fn #getter<KArg>(k: KArg) -> #query where
+								KArg: #frame_support::codec::EncodeLike<#key>,
+							{
+								// NOTE: we can't use any trait here because CountedStorageMap
+								// doesn't implement any.
+								<#full_ident>::get(k)
+							}
+						}
+					)
+				},
 				Metadata::DoubleMap { key1, key2, value } => {
 					let query = match storage.query_kind.as_ref().expect("Checked by def") {
 						QueryKind::OptionQuery => quote::quote_spanned!(storage.attr_span =>
@@ -311,7 +399,44 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 
 		let cfg_attrs = &storage_def.cfg_attrs;
 
+		let maybe_counter = if let Metadata::CountedMap { .. } = storage_def.metadata {
+			let counter_prefix_struct_ident = counter_prefix_ident(&storage_def.ident);
+			let counter_prefix_struct_const = counter_prefix(&prefix_struct_const);
+
+			quote::quote_spanned!(storage_def.attr_span =>
+				#(#cfg_attrs)*
+				#prefix_struct_vis struct #counter_prefix_struct_ident<#type_use_gen>(
+					core::marker::PhantomData<(#type_use_gen,)>
+				);
+				#(#cfg_attrs)*
+				impl<#type_impl_gen> #frame_support::traits::StorageInstance
+					for #counter_prefix_struct_ident<#type_use_gen>
+					#config_where_clause
+				{
+					fn pallet_prefix() -> &'static str {
+						<
+							<T as #frame_system::Config>::PalletInfo
+							as #frame_support::traits::PalletInfo
+						>::name::<Pallet<#type_use_gen>>()
+							.expect("Every active pallet has a name in the runtime; qed")
+					}
+					const STORAGE_PREFIX: &'static str = #counter_prefix_struct_const;
+				}
+				#(#cfg_attrs)*
+				impl<#type_impl_gen> #frame_support::storage::types::CountedStorageMapInstance
+					for #prefix_struct_ident<#type_use_gen>
+					#config_where_clause
+				{
+					type CounterPrefix = #counter_prefix_struct_ident<#type_use_gen>;
+				}
+			)
+		} else {
+			proc_macro2::TokenStream::default()
+		};
+
 		quote::quote_spanned!(storage_def.attr_span =>
+			#maybe_counter
+
 			#(#cfg_attrs)*
 			#prefix_struct_vis struct #prefix_struct_ident<#type_use_gen>(
 				core::marker::PhantomData<(#type_use_gen,)>
@@ -351,9 +476,12 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 						#frame_support::traits::PalletInfo
 					>::name::<#pallet_ident<#type_use_gen>>()
 						.expect("Every active pallet has a name in the runtime; qed"),
-					entries: #frame_support::sp_std::vec![
-						#( #entries, )*
-					],
+					entries: {
+						#[allow(unused_mut)]
+						let mut entries = #frame_support::sp_std::vec![];
+						#( #entries_builder )*
+						entries
+					},
 				}
 			}
 		}
diff --git a/frame/support/procedural/src/pallet/parse/storage.rs b/frame/support/procedural/src/pallet/parse/storage.rs
index e58b5d204886..8075daacb6f4 100644
--- a/frame/support/procedural/src/pallet/parse/storage.rs
+++ b/frame/support/procedural/src/pallet/parse/storage.rs
@@ -86,6 +86,7 @@ impl syn::parse::Parse for PalletStorageAttr {
 pub enum Metadata {
 	Value { value: syn::Type },
 	Map { value: syn::Type, key: syn::Type },
+	CountedMap { value: syn::Type, key: syn::Type },
 	DoubleMap { value: syn::Type, key1: syn::Type, key2: syn::Type },
 	NMap { keys: Vec<syn::Type>, keygen: syn::Type, value: syn::Type },
 }
@@ -153,6 +154,14 @@ pub enum StorageGenerics {
 		on_empty: Option<syn::Type>,
 		max_values: Option<syn::Type>,
 	},
+	CountedMap {
+		hasher: syn::Type,
+		key: syn::Type,
+		value: syn::Type,
+		query_kind: Option<syn::Type>,
+		on_empty: Option<syn::Type>,
+		max_values: Option<syn::Type>,
+	},
 	Value {
 		value: syn::Type,
 		query_kind: Option<syn::Type>,
@@ -173,6 +182,7 @@ impl StorageGenerics {
 		let res = match self.clone() {
 			Self::DoubleMap { value, key1, key2, .. } => Metadata::DoubleMap { value, key1, key2 },
 			Self::Map { value, key, .. } => Metadata::Map { value, key },
+			Self::CountedMap { value, key, .. } => Metadata::CountedMap { value, key },
 			Self::Value { value, .. } => Metadata::Value { value },
 			Self::NMap { keygen, value, .. } =>
 				Metadata::NMap { keys: collect_keys(&keygen)?, keygen, value },
@@ -186,6 +196,7 @@ impl StorageGenerics {
 		match &self {
 			Self::DoubleMap { query_kind, .. } |
 			Self::Map { query_kind, .. } |
+			Self::CountedMap { query_kind, .. } |
 			Self::Value { query_kind, .. } |
 			Self::NMap { query_kind, .. } => query_kind.clone(),
 		}
@@ -195,6 +206,7 @@ impl StorageGenerics {
 enum StorageKind {
 	Value,
 	Map,
+	CountedMap,
 	DoubleMap,
 	NMap,
 }
@@ -324,6 +336,33 @@ fn process_named_generics(
 				max_values: parsed.remove("MaxValues").map(|binding| binding.ty),
 			}
 		},
+		StorageKind::CountedMap => {
+			check_generics(
+				&parsed,
+				&["Hasher", "Key", "Value"],
+				&["QueryKind", "OnEmpty", "MaxValues"],
+				"CountedStorageMap",
+				args_span,
+			)?;
+
+			StorageGenerics::CountedMap {
+				hasher: parsed
+					.remove("Hasher")
+					.map(|binding| binding.ty)
+					.expect("checked above as mandatory generic"),
+				key: parsed
+					.remove("Key")
+					.map(|binding| binding.ty)
+					.expect("checked above as mandatory generic"),
+				value: parsed
+					.remove("Value")
+					.map(|binding| binding.ty)
+					.expect("checked above as mandatory generic"),
+				query_kind: parsed.remove("QueryKind").map(|binding| binding.ty),
+				on_empty: parsed.remove("OnEmpty").map(|binding| binding.ty),
+				max_values: parsed.remove("MaxValues").map(|binding| binding.ty),
+			}
+		},
 		StorageKind::DoubleMap => {
 			check_generics(
 				&parsed,
@@ -425,6 +464,11 @@ fn process_unnamed_generics(
 			Metadata::Map { key: retrieve_arg(2)?, value: retrieve_arg(3)? },
 			retrieve_arg(4).ok(),
 		),
+		StorageKind::CountedMap => (
+			None,
+			Metadata::CountedMap { key: retrieve_arg(2)?, value: retrieve_arg(3)? },
+			retrieve_arg(4).ok(),
+		),
 		StorageKind::DoubleMap => (
 			None,
 			Metadata::DoubleMap {
@@ -451,6 +495,7 @@ fn process_generics(
 	let storage_kind = match &*segment.ident.to_string() {
 		"StorageValue" => StorageKind::Value,
 		"StorageMap" => StorageKind::Map,
+		"CountedStorageMap" => StorageKind::CountedMap,
 		"StorageDoubleMap" => StorageKind::DoubleMap,
 		"StorageNMap" => StorageKind::NMap,
 		found => {
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index cce03f1e8ce6..459698707366 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -1293,8 +1293,8 @@ pub mod pallet_prelude {
 		storage::{
 			bounded_vec::BoundedVec,
 			types::{
-				Key as NMapKey, OptionQuery, StorageDoubleMap, StorageMap, StorageNMap,
-				StorageValue, ValueQuery,
+				CountedStorageMap, Key as NMapKey, OptionQuery, StorageDoubleMap, StorageMap,
+				StorageNMap, StorageValue, ValueQuery,
 			},
 		},
 		traits::{
@@ -1673,6 +1673,8 @@ pub mod pallet_prelude {
 /// * [`pallet_prelude::StorageValue`] expect `Value` and optionally `QueryKind` and `OnEmpty`,
 /// * [`pallet_prelude::StorageMap`] expect `Hasher`, `Key`, `Value` and optionally `QueryKind`
 ///   and `OnEmpty`,
+/// * [`pallet_prelude::CountedStorageMap`] expect `Hasher`, `Key`, `Value` and optionally
+///   `QueryKind` and `OnEmpty`,
 /// * [`pallet_prelude::StorageDoubleMap`] expect `Hasher1`, `Key1`, `Hasher2`, `Key2`, `Value`
 ///   and optionally `QueryKind` and `OnEmpty`.
 ///
@@ -1684,13 +1686,16 @@ pub mod pallet_prelude {
 /// E.g. if runtime names the pallet "MyExample" then the storage `type Foo<T> = ...` use the
 /// prefix: `Twox128(b"MyExample") ++ Twox128(b"Foo")`.
 ///
-/// The optional attribute `#[pallet::storage_prefix = "$custom_name"]` allows to define a
-/// specific name to use for the prefix.
+/// For the `CountedStorageMap` variant, the Prefix also implements
+/// `CountedStorageMapInstance`. It associate a `CounterPrefix`, which is implemented same as
+/// above, but the storage prefix is prepend with `"CounterFor"`.
+/// E.g. if runtime names the pallet "MyExample" then the storage
+/// `type Foo<T> = CountedStorageaMap<...>` will store its counter at the prefix:
+/// `Twox128(b"MyExample") ++ Twox128(b"CounterForFoo")`.
 ///
 /// E.g:
 /// ```ignore
 /// #[pallet::storage]
-/// #[pallet::storage_prefix = "OtherName"]
 /// pub(super) type MyStorage<T> = StorageMap<Hasher = Blake2_128Concat, Key = u32, Value = u32>;
 /// ```
 /// In this case the final prefix used by the map is
@@ -1699,9 +1704,13 @@ pub mod pallet_prelude {
 /// The optional attribute `#[pallet::getter(fn $my_getter_fn_name)]` allows to define a
 /// getter function on `Pallet`.
 ///
+/// The optional attribute `#[pallet::storage_prefix = "SomeName"]` allow to define the storage
+/// prefix to use, see how `Prefix` generic is implemented above.
+///
 /// E.g:
 /// ```ignore
 /// #[pallet::storage]
+/// #[pallet::storage_prefix = "foo"]
 /// #[pallet::getter(fn my_storage)]
 /// pub(super) type MyStorage<T> = StorageMap<Hasher = Blake2_128Concat, Key = u32, Value = u32>;
 /// ```
@@ -1738,6 +1747,8 @@ pub mod pallet_prelude {
 /// `_GeneratedPrefixForStorage$NameOfStorage`, and implements
 /// [`StorageInstance`](traits::StorageInstance) on it using the pallet and storage name. It
 /// then uses it as the first generic of the aliased type.
+/// For `CountedStorageMap`, `CountedStorageMapInstance` is implemented, and another similar
+/// struct is generated.
 ///
 /// For named generic, the macro will reorder the generics, and remove the names.
 ///
diff --git a/frame/support/src/storage/generator/double_map.rs b/frame/support/src/storage/generator/double_map.rs
index d28e42028de5..636a10feb1ab 100644
--- a/frame/support/src/storage/generator/double_map.rs
+++ b/frame/support/src/storage/generator/double_map.rs
@@ -219,6 +219,7 @@ where
 			previous_key: prefix,
 			drain: false,
 			closure: |_raw_key, mut raw_value| V::decode(&mut raw_value),
+			phantom: Default::default(),
 		}
 	}
 
@@ -345,6 +346,7 @@ where
 				let mut key_material = G::Hasher2::reverse(raw_key_without_prefix);
 				Ok((K2::decode(&mut key_material)?, V::decode(&mut raw_value)?))
 			},
+			phantom: Default::default(),
 		}
 	}
 
@@ -398,6 +400,7 @@ where
 				let k2 = K2::decode(&mut k2_material)?;
 				Ok((k1, k2, V::decode(&mut raw_value)?))
 			},
+			phantom: Default::default(),
 		}
 	}
 
diff --git a/frame/support/src/storage/generator/map.rs b/frame/support/src/storage/generator/map.rs
index 3fd3b9a0ea7b..1a4225173c4a 100644
--- a/frame/support/src/storage/generator/map.rs
+++ b/frame/support/src/storage/generator/map.rs
@@ -138,6 +138,7 @@ where
 				let mut key_material = G::Hasher::reverse(raw_key_without_prefix);
 				Ok((K::decode(&mut key_material)?, V::decode(&mut raw_value)?))
 			},
+			phantom: Default::default(),
 		}
 	}
 
diff --git a/frame/support/src/storage/generator/nmap.rs b/frame/support/src/storage/generator/nmap.rs
index 592bcc81341b..4845673d3d8c 100755
--- a/frame/support/src/storage/generator/nmap.rs
+++ b/frame/support/src/storage/generator/nmap.rs
@@ -196,6 +196,7 @@ where
 			previous_key: prefix,
 			drain: false,
 			closure: |_raw_key, mut raw_value| V::decode(&mut raw_value),
+			phantom: Default::default(),
 		}
 	}
 
@@ -305,6 +306,7 @@ impl<K: ReversibleKeyGenerator, V: FullCodec, G: StorageNMap<K, V>>
 				let partial_key = K::decode_partial_key(raw_key_without_prefix)?;
 				Ok((partial_key, V::decode(&mut raw_value)?))
 			},
+			phantom: Default::default(),
 		}
 	}
 
@@ -368,6 +370,7 @@ impl<K: ReversibleKeyGenerator, V: FullCodec, G: StorageNMap<K, V>>
 				let (final_key, _) = K::decode_final_key(raw_key_without_prefix)?;
 				Ok((final_key, V::decode(&mut raw_value)?))
 			},
+			phantom: Default::default(),
 		}
 	}
 
diff --git a/frame/support/src/storage/migration.rs b/frame/support/src/storage/migration.rs
index eae45b1e96ad..59422a282aab 100644
--- a/frame/support/src/storage/migration.rs
+++ b/frame/support/src/storage/migration.rs
@@ -186,7 +186,7 @@ pub fn storage_iter_with_suffix<T: Decode + Sized>(
 		Ok((raw_key_without_prefix.to_vec(), value))
 	};
 
-	PrefixIterator { prefix, previous_key, drain: false, closure }
+	PrefixIterator { prefix, previous_key, drain: false, closure, phantom: Default::default() }
 }
 
 /// Construct iterator to iterate over map items in `module` for the map called `item`.
@@ -219,7 +219,7 @@ pub fn storage_key_iter_with_suffix<
 		let value = T::decode(&mut &raw_value[..])?;
 		Ok((key, value))
 	};
-	PrefixIterator { prefix, previous_key, drain: false, closure }
+	PrefixIterator { prefix, previous_key, drain: false, closure, phantom: Default::default() }
 }
 
 /// Get a particular value in storage by the `module`, the map's `item` name and the key `hash`.
@@ -344,11 +344,12 @@ pub fn move_prefix(from_prefix: &[u8], to_prefix: &[u8]) {
 		return
 	}
 
-	let iter = PrefixIterator {
+	let iter = PrefixIterator::<_> {
 		prefix: from_prefix.to_vec(),
 		previous_key: from_prefix.to_vec(),
 		drain: true,
 		closure: |key, value| Ok((key.to_vec(), value.to_vec())),
+		phantom: Default::default(),
 	};
 
 	for (key, value) in iter {
diff --git a/frame/support/src/storage/mod.rs b/frame/support/src/storage/mod.rs
index e57a876bf983..35552e08fef1 100644
--- a/frame/support/src/storage/mod.rs
+++ b/frame/support/src/storage/mod.rs
@@ -17,7 +17,7 @@
 
 //! Stuff to do with the runtime's storage.
 
-pub use self::types::StorageEntryMetadata;
+pub use self::types::StorageEntryMetadataBuilder;
 use crate::{
 	hash::{ReversibleStorageHasher, StorageHasher},
 	storage::types::{
@@ -786,10 +786,12 @@ pub trait StorageNMap<K: KeyGenerator, V: FullCodec> {
 		KArg: EncodeLikeTuple<K::KArg> + TupleToEncodedIter;
 }
 
-/// Iterate over a prefix and decode raw_key and raw_value into `T`.
+/// Iterate or drain over a prefix and decode raw_key and raw_value into `T`.
 ///
 /// If any decoding fails it skips it and continues to the next key.
-pub struct PrefixIterator<T> {
+///
+/// If draining, then the hook `OnRemoval::on_removal` is called after each removal.
+pub struct PrefixIterator<T, OnRemoval = ()> {
 	prefix: Vec<u8>,
 	previous_key: Vec<u8>,
 	/// If true then value are removed while iterating
@@ -797,9 +799,21 @@ pub struct PrefixIterator<T> {
 	/// Function that take `(raw_key_without_prefix, raw_value)` and decode `T`.
 	/// `raw_key_without_prefix` is the raw storage key without the prefix iterated on.
 	closure: fn(&[u8], &[u8]) -> Result<T, codec::Error>,
+	phantom: core::marker::PhantomData<OnRemoval>,
+}
+
+/// Trait for specialising on removal logic of [`PrefixIterator`].
+pub trait PrefixIteratorOnRemoval {
+	/// This function is called whenever a key/value is removed.
+	fn on_removal(key: &[u8], value: &[u8]);
+}
+
+/// No-op implementation.
+impl PrefixIteratorOnRemoval for () {
+	fn on_removal(_key: &[u8], _value: &[u8]) {}
 }
 
-impl<T> PrefixIterator<T> {
+impl<T, OnRemoval> PrefixIterator<T, OnRemoval> {
 	/// Creates a new `PrefixIterator`, iterating after `previous_key` and filtering out keys that
 	/// are not prefixed with `prefix`.
 	///
@@ -813,7 +827,13 @@ impl<T> PrefixIterator<T> {
 		previous_key: Vec<u8>,
 		decode_fn: fn(&[u8], &[u8]) -> Result<T, codec::Error>,
 	) -> Self {
-		PrefixIterator { prefix, previous_key, drain: false, closure: decode_fn }
+		PrefixIterator {
+			prefix,
+			previous_key,
+			drain: false,
+			closure: decode_fn,
+			phantom: Default::default(),
+		}
 	}
 
 	/// Get the last key that has been iterated upon and return it.
@@ -838,7 +858,7 @@ impl<T> PrefixIterator<T> {
 	}
 }
 
-impl<T> Iterator for PrefixIterator<T> {
+impl<T, OnRemoval: PrefixIteratorOnRemoval> Iterator for PrefixIterator<T, OnRemoval> {
 	type Item = T;
 
 	fn next(&mut self) -> Option<Self::Item> {
@@ -859,7 +879,8 @@ impl<T> Iterator for PrefixIterator<T> {
 						},
 					};
 					if self.drain {
-						unhashed::kill(&self.previous_key)
+						unhashed::kill(&self.previous_key);
+						OnRemoval::on_removal(&self.previous_key, &raw_value);
 					}
 					let raw_key_without_prefix = &self.previous_key[self.prefix.len()..];
 					let item = match (self.closure)(raw_key_without_prefix, &raw_value[..]) {
@@ -1119,7 +1140,7 @@ pub trait StoragePrefixedMap<Value: FullCodec> {
 
 	/// Iter over all value of the storage.
 	///
-	/// NOTE: If a value failed to decode becaues storage is corrupted then it is skipped.
+	/// NOTE: If a value failed to decode because storage is corrupted then it is skipped.
 	fn iter_values() -> PrefixIterator<Value> {
 		let prefix = Self::final_prefix();
 		PrefixIterator {
@@ -1127,6 +1148,7 @@ pub trait StoragePrefixedMap<Value: FullCodec> {
 			previous_key: prefix.to_vec(),
 			drain: false,
 			closure: |_raw_key, mut raw_value| Value::decode(&mut raw_value),
+			phantom: Default::default(),
 		}
 	}
 
@@ -1613,7 +1635,7 @@ mod test {
 
 			assert_eq!(final_vec, vec![1, 2, 3, 4, 5]);
 
-			let mut iter = PrefixIterator::new(
+			let mut iter = PrefixIterator::<_>::new(
 				iter.prefix().to_vec(),
 				stored_key,
 				|mut raw_key_without_prefix, mut raw_value| {
diff --git a/frame/support/src/storage/types/counted_map.rs b/frame/support/src/storage/types/counted_map.rs
new file mode 100644
index 000000000000..0860a4ed541c
--- /dev/null
+++ b/frame/support/src/storage/types/counted_map.rs
@@ -0,0 +1,1040 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Storage counted map type.
+
+use crate::{
+	metadata::StorageEntryMetadata,
+	storage::{
+		generator::StorageMap as _,
+		types::{
+			OptionQuery, QueryKindTrait, StorageEntryMetadataBuilder, StorageMap, StorageValue,
+			ValueQuery,
+		},
+		StorageAppend, StorageDecodeLength, StorageTryAppend,
+	},
+	traits::{Get, GetDefault, StorageInfo, StorageInfoTrait, StorageInstance},
+	Never,
+};
+use codec::{Decode, Encode, EncodeLike, FullCodec, MaxEncodedLen, Ref};
+use sp_runtime::traits::Saturating;
+use sp_std::prelude::*;
+
+/// A wrapper around a `StorageMap` and a `StorageValue<Value=u32>` to keep track of how many items
+/// are in a map, without needing to iterate all the values.
+///
+/// This storage item has additional storage read and write overhead when manipulating values
+/// compared to a regular storage map.
+///
+/// For functions where we only add or remove a value, a single storage read is needed to check if
+/// that value already exists. For mutate functions, two storage reads are used to check if the
+/// value existed before and after the mutation.
+///
+/// Whenever the counter needs to be updated, an additional read and write occurs to update that
+/// counter.
+pub struct CountedStorageMap<
+	Prefix,
+	Hasher,
+	Key,
+	Value,
+	QueryKind = OptionQuery,
+	OnEmpty = GetDefault,
+	MaxValues = GetDefault,
+>(core::marker::PhantomData<(Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues)>);
+
+/// The requirement for an instance of [`CountedStorageMap`].
+pub trait CountedStorageMapInstance: StorageInstance {
+	/// The prefix to use for the counter storage value.
+	type CounterPrefix: StorageInstance;
+}
+
+// Private helper trait to access map from counted storage map.
+trait MapWrapper {
+	type Map;
+}
+
+impl<P: CountedStorageMapInstance, H, K, V, Q, O, M> MapWrapper
+	for CountedStorageMap<P, H, K, V, Q, O, M>
+{
+	type Map = StorageMap<P, H, K, V, Q, O, M>;
+}
+
+type CounterFor<P> = StorageValue<<P as CountedStorageMapInstance>::CounterPrefix, u32, ValueQuery>;
+
+/// On removal logic for updating counter while draining upon some prefix with
+/// [`crate::storage::PrefixIterator`].
+pub struct OnRemovalCounterUpdate<Prefix>(core::marker::PhantomData<Prefix>);
+
+impl<Prefix: CountedStorageMapInstance> crate::storage::PrefixIteratorOnRemoval
+	for OnRemovalCounterUpdate<Prefix>
+{
+	fn on_removal(_key: &[u8], _value: &[u8]) {
+		CounterFor::<Prefix>::mutate(|value| value.saturating_dec());
+	}
+}
+
+impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
+	CountedStorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
+where
+	Prefix: CountedStorageMapInstance,
+	Hasher: crate::hash::StorageHasher,
+	Key: FullCodec,
+	Value: FullCodec,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: Get<QueryKind::Query> + 'static,
+	MaxValues: Get<Option<u32>>,
+{
+	/// Get the storage key used to fetch a value corresponding to a specific key.
+	pub fn hashed_key_for<KeyArg: EncodeLike<Key>>(key: KeyArg) -> Vec<u8> {
+		<Self as MapWrapper>::Map::hashed_key_for(key)
+	}
+
+	/// Does the value (explicitly) exist in storage?
+	pub fn contains_key<KeyArg: EncodeLike<Key>>(key: KeyArg) -> bool {
+		<Self as MapWrapper>::Map::contains_key(key)
+	}
+
+	/// Load the value associated with the given key from the map.
+	pub fn get<KeyArg: EncodeLike<Key>>(key: KeyArg) -> QueryKind::Query {
+		<Self as MapWrapper>::Map::get(key)
+	}
+
+	/// Try to get the value for the given key from the map.
+	///
+	/// Returns `Ok` if it exists, `Err` if not.
+	pub fn try_get<KeyArg: EncodeLike<Key>>(key: KeyArg) -> Result<Value, ()> {
+		<Self as MapWrapper>::Map::try_get(key)
+	}
+
+	/// Swap the values of two keys.
+	pub fn swap<KeyArg1: EncodeLike<Key>, KeyArg2: EncodeLike<Key>>(key1: KeyArg1, key2: KeyArg2) {
+		<Self as MapWrapper>::Map::swap(key1, key2)
+	}
+
+	/// Store a value to be associated with the given key from the map.
+	pub fn insert<KeyArg: EncodeLike<Key> + Clone, ValArg: EncodeLike<Value>>(
+		key: KeyArg,
+		val: ValArg,
+	) {
+		if !<Self as MapWrapper>::Map::contains_key(Ref::from(&key)) {
+			CounterFor::<Prefix>::mutate(|value| value.saturating_inc());
+		}
+		<Self as MapWrapper>::Map::insert(key, val)
+	}
+
+	/// Remove the value under a key.
+	pub fn remove<KeyArg: EncodeLike<Key> + Clone>(key: KeyArg) {
+		if <Self as MapWrapper>::Map::contains_key(Ref::from(&key)) {
+			CounterFor::<Prefix>::mutate(|value| value.saturating_dec());
+		}
+		<Self as MapWrapper>::Map::remove(key)
+	}
+
+	/// Mutate the value under a key.
+	pub fn mutate<KeyArg: EncodeLike<Key> + Clone, R, F: FnOnce(&mut QueryKind::Query) -> R>(
+		key: KeyArg,
+		f: F,
+	) -> R {
+		Self::try_mutate(key, |v| Ok::<R, Never>(f(v)))
+			.expect("`Never` can not be constructed; qed")
+	}
+
+	/// Mutate the item, only if an `Ok` value is returned.
+	pub fn try_mutate<KeyArg, R, E, F>(key: KeyArg, f: F) -> Result<R, E>
+	where
+		KeyArg: EncodeLike<Key> + Clone,
+		F: FnOnce(&mut QueryKind::Query) -> Result<R, E>,
+	{
+		Self::try_mutate_exists(key, |option_value_ref| {
+			let option_value = core::mem::replace(option_value_ref, None);
+			let mut query = <Self as MapWrapper>::Map::from_optional_value_to_query(option_value);
+			let res = f(&mut query);
+			let option_value = <Self as MapWrapper>::Map::from_query_to_optional_value(query);
+			let _ = core::mem::replace(option_value_ref, option_value);
+			res
+		})
+	}
+
+	/// Mutate the value under a key. Deletes the item if mutated to a `None`.
+	pub fn mutate_exists<KeyArg: EncodeLike<Key> + Clone, R, F: FnOnce(&mut Option<Value>) -> R>(
+		key: KeyArg,
+		f: F,
+	) -> R {
+		Self::try_mutate_exists(key, |v| Ok::<R, Never>(f(v)))
+			.expect("`Never` can not be constructed; qed")
+	}
+
+	/// Mutate the item, only if an `Ok` value is returned. Deletes the item if mutated to a `None`.
+	pub fn try_mutate_exists<KeyArg, R, E, F>(key: KeyArg, f: F) -> Result<R, E>
+	where
+		KeyArg: EncodeLike<Key> + Clone,
+		F: FnOnce(&mut Option<Value>) -> Result<R, E>,
+	{
+		<Self as MapWrapper>::Map::try_mutate_exists(key, |option_value| {
+			let existed = option_value.is_some();
+			let res = f(option_value);
+			let exist = option_value.is_some();
+
+			if res.is_ok() {
+				if existed && !exist {
+					// Value was deleted
+					CounterFor::<Prefix>::mutate(|value| value.saturating_dec());
+				} else if !existed && exist {
+					// Value was added
+					CounterFor::<Prefix>::mutate(|value| value.saturating_inc());
+				}
+			}
+			res
+		})
+	}
+
+	/// Take the value under a key.
+	pub fn take<KeyArg: EncodeLike<Key> + Clone>(key: KeyArg) -> QueryKind::Query {
+		let removed_value =
+			<Self as MapWrapper>::Map::mutate_exists(key, |value| core::mem::replace(value, None));
+		if removed_value.is_some() {
+			CounterFor::<Prefix>::mutate(|value| value.saturating_dec());
+		}
+		<Self as MapWrapper>::Map::from_optional_value_to_query(removed_value)
+	}
+
+	/// Append the given items to the value in the storage.
+	///
+	/// `Value` is required to implement `codec::EncodeAppend`.
+	///
+	/// # Warning
+	///
+	/// If the storage item is not encoded properly, the storage will be overwritten and set to
+	/// `[item]`. Any default value set for the storage item will be ignored on overwrite.
+	pub fn append<Item, EncodeLikeItem, EncodeLikeKey>(key: EncodeLikeKey, item: EncodeLikeItem)
+	where
+		EncodeLikeKey: EncodeLike<Key> + Clone,
+		Item: Encode,
+		EncodeLikeItem: EncodeLike<Item>,
+		Value: StorageAppend<Item>,
+	{
+		if !<Self as MapWrapper>::Map::contains_key(Ref::from(&key)) {
+			CounterFor::<Prefix>::mutate(|value| value.saturating_inc());
+		}
+		<Self as MapWrapper>::Map::append(key, item)
+	}
+
+	/// Read the length of the storage value without decoding the entire value under the given
+	/// `key`.
+	///
+	/// `Value` is required to implement [`StorageDecodeLength`].
+	///
+	/// If the value does not exists or it fails to decode the length, `None` is returned. Otherwise
+	/// `Some(len)` is returned.
+	///
+	/// # Warning
+	///
+	/// `None` does not mean that `get()` does not return a value. The default value is completly
+	/// ignored by this function.
+	pub fn decode_len<KeyArg: EncodeLike<Key>>(key: KeyArg) -> Option<usize>
+	where
+		Value: StorageDecodeLength,
+	{
+		<Self as MapWrapper>::Map::decode_len(key)
+	}
+
+	/// Migrate an item with the given `key` from a defunct `OldHasher` to the current hasher.
+	///
+	/// If the key doesn't exist, then it's a no-op. If it does, then it returns its value.
+	pub fn migrate_key<OldHasher: crate::hash::StorageHasher, KeyArg: EncodeLike<Key>>(
+		key: KeyArg,
+	) -> Option<Value> {
+		<Self as MapWrapper>::Map::migrate_key::<OldHasher, _>(key)
+	}
+
+	/// Remove all value of the storage.
+	pub fn remove_all() {
+		CounterFor::<Prefix>::set(0u32);
+		<Self as MapWrapper>::Map::remove_all(None);
+	}
+
+	/// Iter over all value of the storage.
+	///
+	/// NOTE: If a value failed to decode because storage is corrupted then it is skipped.
+	pub fn iter_values() -> crate::storage::PrefixIterator<Value, OnRemovalCounterUpdate<Prefix>> {
+		let map_iterator = <Self as MapWrapper>::Map::iter_values();
+		crate::storage::PrefixIterator {
+			prefix: map_iterator.prefix,
+			previous_key: map_iterator.previous_key,
+			drain: map_iterator.drain,
+			closure: map_iterator.closure,
+			phantom: Default::default(),
+		}
+	}
+
+	/// Translate the values of all elements by a function `f`, in the map in no particular order.
+	///
+	/// By returning `None` from `f` for an element, you'll remove it from the map.
+	///
+	/// NOTE: If a value fail to decode because storage is corrupted then it is skipped.
+	///
+	/// # Warning
+	///
+	/// This function must be used with care, before being updated the storage still contains the
+	/// old type, thus other calls (such as `get`) will fail at decoding it.
+	///
+	/// # Usage
+	///
+	/// This would typically be called inside the module implementation of on_runtime_upgrade.
+	pub fn translate_values<OldValue: Decode, F: FnMut(OldValue) -> Option<Value>>(mut f: F) {
+		<Self as MapWrapper>::Map::translate_values(|old_value| {
+			let res = f(old_value);
+			if res.is_none() {
+				CounterFor::<Prefix>::mutate(|value| value.saturating_dec());
+			}
+			res
+		})
+	}
+
+	/// Try and append the given item to the value in the storage.
+	///
+	/// Is only available if `Value` of the storage implements [`StorageTryAppend`].
+	pub fn try_append<KArg, Item, EncodeLikeItem>(key: KArg, item: EncodeLikeItem) -> Result<(), ()>
+	where
+		KArg: EncodeLike<Key> + Clone,
+		Item: Encode,
+		EncodeLikeItem: EncodeLike<Item>,
+		Value: StorageTryAppend<Item>,
+	{
+		let bound = Value::bound();
+		let current = <Self as MapWrapper>::Map::decode_len(Ref::from(&key)).unwrap_or_default();
+		if current < bound {
+			CounterFor::<Prefix>::mutate(|value| value.saturating_inc());
+			let key = <Self as MapWrapper>::Map::hashed_key_for(key);
+			sp_io::storage::append(&key, item.encode());
+			Ok(())
+		} else {
+			Err(())
+		}
+	}
+
+	/// Initialize the counter with the actual number of items in the map.
+	///
+	/// This function iterates through all the items in the map and sets the counter. This operation
+	/// can be very heavy, so use with caution.
+	///
+	/// Returns the number of items in the map which is used to set the counter.
+	pub fn initialize_counter() -> u32 {
+		let count = Self::iter_values().count() as u32;
+		CounterFor::<Prefix>::set(count);
+		count
+	}
+
+	/// Return the count.
+	pub fn count() -> u32 {
+		CounterFor::<Prefix>::get()
+	}
+}
+
+impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
+	CountedStorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
+where
+	Prefix: CountedStorageMapInstance,
+	Hasher: crate::hash::StorageHasher + crate::ReversibleStorageHasher,
+	Key: FullCodec,
+	Value: FullCodec,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: Get<QueryKind::Query> + 'static,
+	MaxValues: Get<Option<u32>>,
+{
+	/// Enumerate all elements in the map in no particular order.
+	///
+	/// If you alter the map while doing this, you'll get undefined results.
+	pub fn iter() -> crate::storage::PrefixIterator<(Key, Value), OnRemovalCounterUpdate<Prefix>> {
+		let map_iterator = <Self as MapWrapper>::Map::iter();
+		crate::storage::PrefixIterator {
+			prefix: map_iterator.prefix,
+			previous_key: map_iterator.previous_key,
+			drain: map_iterator.drain,
+			closure: map_iterator.closure,
+			phantom: Default::default(),
+		}
+	}
+
+	/// Remove all elements from the map and iterate through them in no particular order.
+	///
+	/// If you add elements to the map while doing this, you'll get undefined results.
+	pub fn drain() -> crate::storage::PrefixIterator<(Key, Value), OnRemovalCounterUpdate<Prefix>> {
+		let map_iterator = <Self as MapWrapper>::Map::drain();
+		crate::storage::PrefixIterator {
+			prefix: map_iterator.prefix,
+			previous_key: map_iterator.previous_key,
+			drain: map_iterator.drain,
+			closure: map_iterator.closure,
+			phantom: Default::default(),
+		}
+	}
+
+	/// Translate the values of all elements by a function `f`, in the map in no particular order.
+	///
+	/// By returning `None` from `f` for an element, you'll remove it from the map.
+	///
+	/// NOTE: If a value fail to decode because storage is corrupted then it is skipped.
+	pub fn translate<O: Decode, F: FnMut(Key, O) -> Option<Value>>(mut f: F) {
+		<Self as MapWrapper>::Map::translate(|key, old_value| {
+			let res = f(key, old_value);
+			if res.is_none() {
+				CounterFor::<Prefix>::mutate(|value| value.saturating_dec());
+			}
+			res
+		})
+	}
+}
+
+impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues> StorageEntryMetadataBuilder
+	for CountedStorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
+where
+	Prefix: CountedStorageMapInstance,
+	Hasher: crate::hash::StorageHasher,
+	Key: FullCodec + scale_info::StaticTypeInfo,
+	Value: FullCodec + scale_info::StaticTypeInfo,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: Get<QueryKind::Query> + 'static,
+	MaxValues: Get<Option<u32>>,
+{
+	fn build_metadata(docs: Vec<&'static str>, entries: &mut Vec<StorageEntryMetadata>) {
+		<Self as MapWrapper>::Map::build_metadata(docs, entries);
+		CounterFor::<Prefix>::build_metadata(
+			vec![&"Counter for the related counted storage map"],
+			entries,
+		);
+	}
+}
+
+impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues> crate::traits::StorageInfoTrait
+	for CountedStorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
+where
+	Prefix: CountedStorageMapInstance,
+	Hasher: crate::hash::StorageHasher,
+	Key: FullCodec + MaxEncodedLen,
+	Value: FullCodec + MaxEncodedLen,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: Get<QueryKind::Query> + 'static,
+	MaxValues: Get<Option<u32>>,
+{
+	fn storage_info() -> Vec<StorageInfo> {
+		[<Self as MapWrapper>::Map::storage_info(), CounterFor::<Prefix>::storage_info()].concat()
+	}
+}
+
+/// It doesn't require to implement `MaxEncodedLen` and give no information for `max_size`.
+impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
+	crate::traits::PartialStorageInfoTrait
+	for CountedStorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
+where
+	Prefix: CountedStorageMapInstance,
+	Hasher: crate::hash::StorageHasher,
+	Key: FullCodec,
+	Value: FullCodec,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: Get<QueryKind::Query> + 'static,
+	MaxValues: Get<Option<u32>>,
+{
+	fn partial_storage_info() -> Vec<StorageInfo> {
+		[<Self as MapWrapper>::Map::partial_storage_info(), CounterFor::<Prefix>::storage_info()]
+			.concat()
+	}
+}
+
+#[cfg(test)]
+mod test {
+	use super::*;
+	use crate::{
+		hash::*,
+		metadata::{StorageEntryModifier, StorageEntryType, StorageHasher},
+		storage::{bounded_vec::BoundedVec, types::ValueQuery},
+		traits::ConstU32,
+	};
+	use sp_io::{hashing::twox_128, TestExternalities};
+
+	struct Prefix;
+	impl StorageInstance for Prefix {
+		fn pallet_prefix() -> &'static str {
+			"test"
+		}
+		const STORAGE_PREFIX: &'static str = "foo";
+	}
+
+	struct CounterPrefix;
+	impl StorageInstance for CounterPrefix {
+		fn pallet_prefix() -> &'static str {
+			"test"
+		}
+		const STORAGE_PREFIX: &'static str = "counter_for_foo";
+	}
+	impl CountedStorageMapInstance for Prefix {
+		type CounterPrefix = CounterPrefix;
+	}
+
+	struct ADefault;
+	impl crate::traits::Get<u32> for ADefault {
+		fn get() -> u32 {
+			97
+		}
+	}
+
+	#[test]
+	fn test_value_query() {
+		type A = CountedStorageMap<Prefix, Twox64Concat, u16, u32, ValueQuery, ADefault>;
+
+		TestExternalities::default().execute_with(|| {
+			let mut k: Vec<u8> = vec![];
+			k.extend(&twox_128(b"test"));
+			k.extend(&twox_128(b"foo"));
+			k.extend(&3u16.twox_64_concat());
+			assert_eq!(A::hashed_key_for(3).to_vec(), k);
+
+			assert_eq!(A::contains_key(3), false);
+			assert_eq!(A::get(3), ADefault::get());
+			assert_eq!(A::try_get(3), Err(()));
+			assert_eq!(A::count(), 0);
+
+			// Insert non-existing.
+			A::insert(3, 10);
+
+			assert_eq!(A::contains_key(3), true);
+			assert_eq!(A::get(3), 10);
+			assert_eq!(A::try_get(3), Ok(10));
+			assert_eq!(A::count(), 1);
+
+			// Swap non-existing with existing.
+			A::swap(4, 3);
+
+			assert_eq!(A::contains_key(3), false);
+			assert_eq!(A::get(3), ADefault::get());
+			assert_eq!(A::try_get(3), Err(()));
+			assert_eq!(A::contains_key(4), true);
+			assert_eq!(A::get(4), 10);
+			assert_eq!(A::try_get(4), Ok(10));
+			assert_eq!(A::count(), 1);
+
+			// Swap existing with non-existing.
+			A::swap(4, 3);
+
+			assert_eq!(A::try_get(3), Ok(10));
+			assert_eq!(A::contains_key(4), false);
+			assert_eq!(A::get(4), ADefault::get());
+			assert_eq!(A::try_get(4), Err(()));
+			assert_eq!(A::count(), 1);
+
+			A::insert(4, 11);
+
+			assert_eq!(A::try_get(3), Ok(10));
+			assert_eq!(A::try_get(4), Ok(11));
+			assert_eq!(A::count(), 2);
+
+			// Swap 2 existing.
+			A::swap(3, 4);
+
+			assert_eq!(A::try_get(3), Ok(11));
+			assert_eq!(A::try_get(4), Ok(10));
+			assert_eq!(A::count(), 2);
+
+			// Insert an existing key, shouldn't increment counted values.
+			A::insert(3, 11);
+
+			assert_eq!(A::count(), 2);
+
+			// Remove non-existing.
+			A::remove(2);
+
+			assert_eq!(A::contains_key(2), false);
+			assert_eq!(A::count(), 2);
+
+			// Remove existing.
+			A::remove(3);
+
+			assert_eq!(A::try_get(3), Err(()));
+			assert_eq!(A::count(), 1);
+
+			// Mutate non-existing to existing.
+			A::mutate(3, |query| {
+				assert_eq!(*query, ADefault::get());
+				*query = 40;
+			});
+
+			assert_eq!(A::try_get(3), Ok(40));
+			assert_eq!(A::count(), 2);
+
+			// Mutate existing to existing.
+			A::mutate(3, |query| {
+				assert_eq!(*query, 40);
+				*query = 40;
+			});
+
+			assert_eq!(A::try_get(3), Ok(40));
+			assert_eq!(A::count(), 2);
+
+			// Try fail mutate non-existing to existing.
+			A::try_mutate(2, |query| {
+				assert_eq!(*query, ADefault::get());
+				*query = 4;
+				Result::<(), ()>::Err(())
+			})
+			.err()
+			.unwrap();
+
+			assert_eq!(A::try_get(2), Err(()));
+			assert_eq!(A::count(), 2);
+
+			// Try succeed mutate non-existing to existing.
+			A::try_mutate(2, |query| {
+				assert_eq!(*query, ADefault::get());
+				*query = 41;
+				Result::<(), ()>::Ok(())
+			})
+			.unwrap();
+
+			assert_eq!(A::try_get(2), Ok(41));
+			assert_eq!(A::count(), 3);
+
+			// Try succeed mutate existing to existing.
+			A::try_mutate(2, |query| {
+				assert_eq!(*query, 41);
+				*query = 41;
+				Result::<(), ()>::Ok(())
+			})
+			.unwrap();
+
+			assert_eq!(A::try_get(2), Ok(41));
+			assert_eq!(A::count(), 3);
+
+			// Try fail mutate non-existing to existing.
+			A::try_mutate_exists(1, |query| {
+				assert_eq!(*query, None);
+				*query = Some(4);
+				Result::<(), ()>::Err(())
+			})
+			.err()
+			.unwrap();
+
+			assert_eq!(A::try_get(1), Err(()));
+			assert_eq!(A::count(), 3);
+
+			// Try succeed mutate non-existing to existing.
+			A::try_mutate_exists(1, |query| {
+				assert_eq!(*query, None);
+				*query = Some(43);
+				Result::<(), ()>::Ok(())
+			})
+			.unwrap();
+
+			assert_eq!(A::try_get(1), Ok(43));
+			assert_eq!(A::count(), 4);
+
+			// Try succeed mutate existing to existing.
+			A::try_mutate_exists(1, |query| {
+				assert_eq!(*query, Some(43));
+				*query = Some(43);
+				Result::<(), ()>::Ok(())
+			})
+			.unwrap();
+
+			assert_eq!(A::try_get(1), Ok(43));
+			assert_eq!(A::count(), 4);
+
+			// Try succeed mutate existing to non-existing.
+			A::try_mutate_exists(1, |query| {
+				assert_eq!(*query, Some(43));
+				*query = None;
+				Result::<(), ()>::Ok(())
+			})
+			.unwrap();
+
+			assert_eq!(A::try_get(1), Err(()));
+			assert_eq!(A::count(), 3);
+
+			// Take exsisting.
+			assert_eq!(A::take(4), 10);
+
+			assert_eq!(A::try_get(4), Err(()));
+			assert_eq!(A::count(), 2);
+
+			// Take non-exsisting.
+			assert_eq!(A::take(4), ADefault::get());
+
+			assert_eq!(A::try_get(4), Err(()));
+			assert_eq!(A::count(), 2);
+
+			// Remove all.
+			A::remove_all();
+
+			assert_eq!(A::count(), 0);
+			assert_eq!(A::initialize_counter(), 0);
+
+			A::insert(1, 1);
+			A::insert(2, 2);
+
+			// Iter values.
+			assert_eq!(A::iter_values().collect::<Vec<_>>(), vec![2, 1]);
+
+			// Iter drain values.
+			assert_eq!(A::iter_values().drain().collect::<Vec<_>>(), vec![2, 1]);
+			assert_eq!(A::count(), 0);
+
+			A::insert(1, 1);
+			A::insert(2, 2);
+
+			// Test initialize_counter.
+			assert_eq!(A::initialize_counter(), 2);
+		})
+	}
+
+	#[test]
+	fn test_option_query() {
+		type B = CountedStorageMap<Prefix, Twox64Concat, u16, u32>;
+
+		TestExternalities::default().execute_with(|| {
+			let mut k: Vec<u8> = vec![];
+			k.extend(&twox_128(b"test"));
+			k.extend(&twox_128(b"foo"));
+			k.extend(&3u16.twox_64_concat());
+			assert_eq!(B::hashed_key_for(3).to_vec(), k);
+
+			assert_eq!(B::contains_key(3), false);
+			assert_eq!(B::get(3), None);
+			assert_eq!(B::try_get(3), Err(()));
+			assert_eq!(B::count(), 0);
+
+			// Insert non-existing.
+			B::insert(3, 10);
+
+			assert_eq!(B::contains_key(3), true);
+			assert_eq!(B::get(3), Some(10));
+			assert_eq!(B::try_get(3), Ok(10));
+			assert_eq!(B::count(), 1);
+
+			// Swap non-existing with existing.
+			B::swap(4, 3);
+
+			assert_eq!(B::contains_key(3), false);
+			assert_eq!(B::get(3), None);
+			assert_eq!(B::try_get(3), Err(()));
+			assert_eq!(B::contains_key(4), true);
+			assert_eq!(B::get(4), Some(10));
+			assert_eq!(B::try_get(4), Ok(10));
+			assert_eq!(B::count(), 1);
+
+			// Swap existing with non-existing.
+			B::swap(4, 3);
+
+			assert_eq!(B::try_get(3), Ok(10));
+			assert_eq!(B::contains_key(4), false);
+			assert_eq!(B::get(4), None);
+			assert_eq!(B::try_get(4), Err(()));
+			assert_eq!(B::count(), 1);
+
+			B::insert(4, 11);
+
+			assert_eq!(B::try_get(3), Ok(10));
+			assert_eq!(B::try_get(4), Ok(11));
+			assert_eq!(B::count(), 2);
+
+			// Swap 2 existing.
+			B::swap(3, 4);
+
+			assert_eq!(B::try_get(3), Ok(11));
+			assert_eq!(B::try_get(4), Ok(10));
+			assert_eq!(B::count(), 2);
+
+			// Insert an existing key, shouldn't increment counted values.
+			B::insert(3, 11);
+
+			assert_eq!(B::count(), 2);
+
+			// Remove non-existing.
+			B::remove(2);
+
+			assert_eq!(B::contains_key(2), false);
+			assert_eq!(B::count(), 2);
+
+			// Remove existing.
+			B::remove(3);
+
+			assert_eq!(B::try_get(3), Err(()));
+			assert_eq!(B::count(), 1);
+
+			// Mutate non-existing to existing.
+			B::mutate(3, |query| {
+				assert_eq!(*query, None);
+				*query = Some(40)
+			});
+
+			assert_eq!(B::try_get(3), Ok(40));
+			assert_eq!(B::count(), 2);
+
+			// Mutate existing to existing.
+			B::mutate(3, |query| {
+				assert_eq!(*query, Some(40));
+				*query = Some(40)
+			});
+
+			assert_eq!(B::try_get(3), Ok(40));
+			assert_eq!(B::count(), 2);
+
+			// Mutate existing to non-existing.
+			B::mutate(3, |query| {
+				assert_eq!(*query, Some(40));
+				*query = None
+			});
+
+			assert_eq!(B::try_get(3), Err(()));
+			assert_eq!(B::count(), 1);
+
+			B::insert(3, 40);
+
+			// Try fail mutate non-existing to existing.
+			B::try_mutate(2, |query| {
+				assert_eq!(*query, None);
+				*query = Some(4);
+				Result::<(), ()>::Err(())
+			})
+			.err()
+			.unwrap();
+
+			assert_eq!(B::try_get(2), Err(()));
+			assert_eq!(B::count(), 2);
+
+			// Try succeed mutate non-existing to existing.
+			B::try_mutate(2, |query| {
+				assert_eq!(*query, None);
+				*query = Some(41);
+				Result::<(), ()>::Ok(())
+			})
+			.unwrap();
+
+			assert_eq!(B::try_get(2), Ok(41));
+			assert_eq!(B::count(), 3);
+
+			// Try succeed mutate existing to existing.
+			B::try_mutate(2, |query| {
+				assert_eq!(*query, Some(41));
+				*query = Some(41);
+				Result::<(), ()>::Ok(())
+			})
+			.unwrap();
+
+			assert_eq!(B::try_get(2), Ok(41));
+			assert_eq!(B::count(), 3);
+
+			// Try succeed mutate existing to non-existing.
+			B::try_mutate(2, |query| {
+				assert_eq!(*query, Some(41));
+				*query = None;
+				Result::<(), ()>::Ok(())
+			})
+			.unwrap();
+
+			assert_eq!(B::try_get(2), Err(()));
+			assert_eq!(B::count(), 2);
+
+			B::insert(2, 41);
+
+			// Try fail mutate non-existing to existing.
+			B::try_mutate_exists(1, |query| {
+				assert_eq!(*query, None);
+				*query = Some(4);
+				Result::<(), ()>::Err(())
+			})
+			.err()
+			.unwrap();
+
+			assert_eq!(B::try_get(1), Err(()));
+			assert_eq!(B::count(), 3);
+
+			// Try succeed mutate non-existing to existing.
+			B::try_mutate_exists(1, |query| {
+				assert_eq!(*query, None);
+				*query = Some(43);
+				Result::<(), ()>::Ok(())
+			})
+			.unwrap();
+
+			assert_eq!(B::try_get(1), Ok(43));
+			assert_eq!(B::count(), 4);
+
+			// Try succeed mutate existing to existing.
+			B::try_mutate_exists(1, |query| {
+				assert_eq!(*query, Some(43));
+				*query = Some(43);
+				Result::<(), ()>::Ok(())
+			})
+			.unwrap();
+
+			assert_eq!(B::try_get(1), Ok(43));
+			assert_eq!(B::count(), 4);
+
+			// Try succeed mutate existing to non-existing.
+			B::try_mutate_exists(1, |query| {
+				assert_eq!(*query, Some(43));
+				*query = None;
+				Result::<(), ()>::Ok(())
+			})
+			.unwrap();
+
+			assert_eq!(B::try_get(1), Err(()));
+			assert_eq!(B::count(), 3);
+
+			// Take exsisting.
+			assert_eq!(B::take(4), Some(10));
+
+			assert_eq!(B::try_get(4), Err(()));
+			assert_eq!(B::count(), 2);
+
+			// Take non-exsisting.
+			assert_eq!(B::take(4), None);
+
+			assert_eq!(B::try_get(4), Err(()));
+			assert_eq!(B::count(), 2);
+
+			// Remove all.
+			B::remove_all();
+
+			assert_eq!(B::count(), 0);
+			assert_eq!(B::initialize_counter(), 0);
+
+			B::insert(1, 1);
+			B::insert(2, 2);
+
+			// Iter values.
+			assert_eq!(B::iter_values().collect::<Vec<_>>(), vec![2, 1]);
+
+			// Iter drain values.
+			assert_eq!(B::iter_values().drain().collect::<Vec<_>>(), vec![2, 1]);
+			assert_eq!(B::count(), 0);
+
+			B::insert(1, 1);
+			B::insert(2, 2);
+
+			// Test initialize_counter.
+			assert_eq!(B::initialize_counter(), 2);
+		})
+	}
+
+	#[test]
+	fn append_decode_len_works() {
+		type B = CountedStorageMap<Prefix, Twox64Concat, u16, Vec<u32>>;
+
+		TestExternalities::default().execute_with(|| {
+			assert_eq!(B::decode_len(0), None);
+			B::append(0, 3);
+			assert_eq!(B::decode_len(0), Some(1));
+			B::append(0, 3);
+			assert_eq!(B::decode_len(0), Some(2));
+			B::append(0, 3);
+			assert_eq!(B::decode_len(0), Some(3));
+		})
+	}
+
+	#[test]
+	fn try_append_decode_len_works() {
+		type B = CountedStorageMap<Prefix, Twox64Concat, u16, BoundedVec<u32, ConstU32<3u32>>>;
+
+		TestExternalities::default().execute_with(|| {
+			assert_eq!(B::decode_len(0), None);
+			B::try_append(0, 3).unwrap();
+			assert_eq!(B::decode_len(0), Some(1));
+			B::try_append(0, 3).unwrap();
+			assert_eq!(B::decode_len(0), Some(2));
+			B::try_append(0, 3).unwrap();
+			assert_eq!(B::decode_len(0), Some(3));
+			B::try_append(0, 3).err().unwrap();
+			assert_eq!(B::decode_len(0), Some(3));
+		})
+	}
+
+	#[test]
+	fn migrate_keys_works() {
+		type A = CountedStorageMap<Prefix, Twox64Concat, u16, u32>;
+		type B = CountedStorageMap<Prefix, Blake2_128Concat, u16, u32>;
+		TestExternalities::default().execute_with(|| {
+			A::insert(1, 1);
+			assert_eq!(B::migrate_key::<Twox64Concat, _>(1), Some(1));
+			assert_eq!(B::get(1), Some(1));
+		})
+	}
+
+	#[test]
+	fn translate_values() {
+		type A = CountedStorageMap<Prefix, Twox64Concat, u16, u32>;
+		TestExternalities::default().execute_with(|| {
+			A::insert(1, 1);
+			A::insert(2, 2);
+			A::translate_values::<u32, _>(|old_value| if old_value == 1 { None } else { Some(1) });
+			assert_eq!(A::count(), 1);
+			assert_eq!(A::get(2), Some(1));
+		})
+	}
+
+	#[test]
+	fn test_iter_drain_translate() {
+		type A = CountedStorageMap<Prefix, Twox64Concat, u16, u32>;
+		TestExternalities::default().execute_with(|| {
+			A::insert(1, 1);
+			A::insert(2, 2);
+
+			assert_eq!(A::iter().collect::<Vec<_>>(), vec![(2, 2), (1, 1)]);
+
+			assert_eq!(A::count(), 2);
+
+			A::translate::<u32, _>(
+				|key, value| if key == 1 { None } else { Some(key as u32 * value) },
+			);
+
+			assert_eq!(A::count(), 1);
+
+			assert_eq!(A::drain().collect::<Vec<_>>(), vec![(2, 4)]);
+
+			assert_eq!(A::count(), 0);
+		})
+	}
+
+	#[test]
+	fn test_metadata() {
+		type A = CountedStorageMap<Prefix, Twox64Concat, u16, u32, ValueQuery, ADefault>;
+		let mut entries = vec![];
+		A::build_metadata(vec![], &mut entries);
+		assert_eq!(
+			entries,
+			vec![
+				StorageEntryMetadata {
+					name: "foo",
+					modifier: StorageEntryModifier::Default,
+					ty: StorageEntryType::Map {
+						hashers: vec![StorageHasher::Twox64Concat],
+						key: scale_info::meta_type::<u16>(),
+						value: scale_info::meta_type::<u32>(),
+					},
+					default: 97u32.encode(),
+					docs: vec![],
+				},
+				StorageEntryMetadata {
+					name: "counter_for_foo",
+					modifier: StorageEntryModifier::Default,
+					ty: StorageEntryType::Plain(scale_info::meta_type::<u32>()),
+					default: vec![0, 0, 0, 0],
+					docs: vec!["Counter for the related counted storage map"],
+				},
+			]
+		);
+	}
+}
diff --git a/frame/support/src/storage/types/double_map.rs b/frame/support/src/storage/types/double_map.rs
index 775011005086..b9af4a621b92 100644
--- a/frame/support/src/storage/types/double_map.rs
+++ b/frame/support/src/storage/types/double_map.rs
@@ -19,9 +19,9 @@
 //! StoragePrefixedDoubleMap traits and their methods directly.
 
 use crate::{
-	metadata::{StorageEntryModifier, StorageEntryType},
+	metadata::{StorageEntryMetadata, StorageEntryType},
 	storage::{
-		types::{OptionQuery, QueryKindTrait, StorageEntryMetadata},
+		types::{OptionQuery, QueryKindTrait, StorageEntryMetadataBuilder},
 		StorageAppend, StorageDecodeLength, StoragePrefixedMap, StorageTryAppend,
 	},
 	traits::{Get, GetDefault, StorageInfo, StorageInstance},
@@ -342,7 +342,7 @@ where
 
 	/// Iter over all value of the storage.
 	///
-	/// NOTE: If a value failed to decode becaues storage is corrupted then it is skipped.
+	/// NOTE: If a value failed to decode because storage is corrupted then it is skipped.
 	pub fn iter_values() -> crate::storage::PrefixIterator<Value> {
 		<Self as crate::storage::StoragePrefixedMap<Value>>::iter_values()
 	}
@@ -512,7 +512,7 @@ where
 }
 
 impl<Prefix, Hasher1, Hasher2, Key1, Key2, Value, QueryKind, OnEmpty, MaxValues>
-	StorageEntryMetadata
+	StorageEntryMetadataBuilder
 	for StorageDoubleMap<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty, MaxValues>
 where
 	Prefix: StorageInstance,
@@ -525,19 +525,20 @@ where
 	OnEmpty: Get<QueryKind::Query> + 'static,
 	MaxValues: Get<Option<u32>>,
 {
-	const MODIFIER: StorageEntryModifier = QueryKind::METADATA;
-	const NAME: &'static str = Prefix::STORAGE_PREFIX;
-
-	fn ty() -> StorageEntryType {
-		StorageEntryType::Map {
-			hashers: vec![Hasher1::METADATA, Hasher2::METADATA],
-			key: scale_info::meta_type::<(Key1, Key2)>(),
-			value: scale_info::meta_type::<Value>(),
-		}
-	}
-
-	fn default() -> Vec<u8> {
-		OnEmpty::get().encode()
+	fn build_metadata(docs: Vec<&'static str>, entries: &mut Vec<StorageEntryMetadata>) {
+		let entry = StorageEntryMetadata {
+			name: Prefix::STORAGE_PREFIX,
+			modifier: QueryKind::METADATA,
+			ty: StorageEntryType::Map {
+				hashers: vec![Hasher1::METADATA, Hasher2::METADATA],
+				key: scale_info::meta_type::<(Key1, Key2)>(),
+				value: scale_info::meta_type::<Value>(),
+			},
+			default: OnEmpty::get().encode(),
+			docs,
+		};
+
+		entries.push(entry);
 	}
 }
 
@@ -605,7 +606,6 @@ mod test {
 		metadata::{StorageEntryModifier, StorageEntryType, StorageHasher},
 		storage::types::ValueQuery,
 	};
-	use assert_matches::assert_matches;
 	use sp_io::{hashing::twox_128, TestExternalities};
 
 	struct Prefix;
@@ -767,30 +767,43 @@ mod test {
 			A::translate::<u8, _>(|k1, k2, v| Some((k1 * k2 as u16 * v as u16).into()));
 			assert_eq!(A::iter().collect::<Vec<_>>(), vec![(4, 40, 1600), (3, 30, 900)]);
 
-			assert_eq!(A::MODIFIER, StorageEntryModifier::Optional);
-			assert_eq!(AValueQueryWithAnOnEmpty::MODIFIER, StorageEntryModifier::Default);
-
-			let assert_map_hashers = |ty, expected_hashers| {
-				if let StorageEntryType::Map { hashers, .. } = ty {
-					assert_eq!(hashers, expected_hashers)
-				} else {
-					assert_matches!(ty, StorageEntryType::Map { .. })
-				}
-			};
-
-			assert_map_hashers(
-				A::ty(),
-				vec![StorageHasher::Blake2_128Concat, StorageHasher::Twox64Concat],
-			);
-			assert_map_hashers(
-				AValueQueryWithAnOnEmpty::ty(),
-				vec![StorageHasher::Blake2_128Concat, StorageHasher::Twox64Concat],
+			let mut entries = vec![];
+			A::build_metadata(vec![], &mut entries);
+			AValueQueryWithAnOnEmpty::build_metadata(vec![], &mut entries);
+			assert_eq!(
+				entries,
+				vec![
+					StorageEntryMetadata {
+						name: "foo",
+						modifier: StorageEntryModifier::Optional,
+						ty: StorageEntryType::Map {
+							hashers: vec![
+								StorageHasher::Blake2_128Concat,
+								StorageHasher::Twox64Concat
+							],
+							key: scale_info::meta_type::<(u16, u8)>(),
+							value: scale_info::meta_type::<u32>(),
+						},
+						default: Option::<u32>::None.encode(),
+						docs: vec![],
+					},
+					StorageEntryMetadata {
+						name: "foo",
+						modifier: StorageEntryModifier::Default,
+						ty: StorageEntryType::Map {
+							hashers: vec![
+								StorageHasher::Blake2_128Concat,
+								StorageHasher::Twox64Concat
+							],
+							key: scale_info::meta_type::<(u16, u8)>(),
+							value: scale_info::meta_type::<u32>(),
+						},
+						default: 97u32.encode(),
+						docs: vec![],
+					}
+				]
 			);
 
-			assert_eq!(A::NAME, "foo");
-			assert_eq!(AValueQueryWithAnOnEmpty::default(), 97u32.encode());
-			assert_eq!(A::default(), Option::<u32>::None.encode());
-
 			WithLen::remove_all(None);
 			assert_eq!(WithLen::decode_len(3, 30), None);
 			WithLen::append(0, 100, 10);
diff --git a/frame/support/src/storage/types/map.rs b/frame/support/src/storage/types/map.rs
index a31224f15c80..45340f9015ea 100644
--- a/frame/support/src/storage/types/map.rs
+++ b/frame/support/src/storage/types/map.rs
@@ -19,9 +19,9 @@
 //! methods directly.
 
 use crate::{
-	metadata::{StorageEntryModifier, StorageEntryType},
+	metadata::{StorageEntryMetadata, StorageEntryType},
 	storage::{
-		types::{OptionQuery, QueryKindTrait, StorageEntryMetadata},
+		types::{OptionQuery, QueryKindTrait, StorageEntryMetadataBuilder},
 		StorageAppend, StorageDecodeLength, StoragePrefixedMap, StorageTryAppend,
 	},
 	traits::{Get, GetDefault, StorageInfo, StorageInstance},
@@ -241,7 +241,7 @@ where
 
 	/// Iter over all value of the storage.
 	///
-	/// NOTE: If a value failed to decode becaues storage is corrupted then it is skipped.
+	/// NOTE: If a value failed to decode because storage is corrupted then it is skipped.
 	pub fn iter_values() -> crate::storage::PrefixIterator<Value> {
 		<Self as crate::storage::StoragePrefixedMap<Value>>::iter_values()
 	}
@@ -336,7 +336,7 @@ where
 	}
 }
 
-impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues> StorageEntryMetadata
+impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues> StorageEntryMetadataBuilder
 	for StorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
 where
 	Prefix: StorageInstance,
@@ -347,19 +347,20 @@ where
 	OnEmpty: Get<QueryKind::Query> + 'static,
 	MaxValues: Get<Option<u32>>,
 {
-	const MODIFIER: StorageEntryModifier = QueryKind::METADATA;
-	const NAME: &'static str = Prefix::STORAGE_PREFIX;
-
-	fn ty() -> StorageEntryType {
-		StorageEntryType::Map {
-			hashers: vec![Hasher::METADATA],
-			key: scale_info::meta_type::<Key>(),
-			value: scale_info::meta_type::<Value>(),
-		}
-	}
-
-	fn default() -> Vec<u8> {
-		OnEmpty::get().encode()
+	fn build_metadata(docs: Vec<&'static str>, entries: &mut Vec<StorageEntryMetadata>) {
+		let entry = StorageEntryMetadata {
+			name: Prefix::STORAGE_PREFIX,
+			modifier: QueryKind::METADATA,
+			ty: StorageEntryType::Map {
+				hashers: vec![Hasher::METADATA],
+				key: scale_info::meta_type::<Key>(),
+				value: scale_info::meta_type::<Value>(),
+			},
+			default: OnEmpty::get().encode(),
+			docs,
+		};
+
+		entries.push(entry);
 	}
 }
 
@@ -421,7 +422,6 @@ mod test {
 		metadata::{StorageEntryModifier, StorageEntryType, StorageHasher},
 		storage::types::ValueQuery,
 	};
-	use assert_matches::assert_matches;
 	use sp_io::{hashing::twox_128, TestExternalities};
 
 	struct Prefix;
@@ -573,25 +573,36 @@ mod test {
 			A::translate::<u8, _>(|k, v| Some((k * v as u16).into()));
 			assert_eq!(A::iter().collect::<Vec<_>>(), vec![(4, 40), (3, 30)]);
 
-			assert_eq!(A::MODIFIER, StorageEntryModifier::Optional);
-			assert_eq!(AValueQueryWithAnOnEmpty::MODIFIER, StorageEntryModifier::Default);
-
-			let assert_map_hashers = |ty, expected_hashers| {
-				if let StorageEntryType::Map { hashers, .. } = ty {
-					assert_eq!(hashers, expected_hashers)
-				} else {
-					assert_matches!(ty, StorageEntryType::Map { .. })
-				}
-			};
-
-			assert_map_hashers(A::ty(), vec![StorageHasher::Blake2_128Concat]);
-			assert_map_hashers(
-				AValueQueryWithAnOnEmpty::ty(),
-				vec![StorageHasher::Blake2_128Concat],
+			let mut entries = vec![];
+			A::build_metadata(vec![], &mut entries);
+			AValueQueryWithAnOnEmpty::build_metadata(vec![], &mut entries);
+			assert_eq!(
+				entries,
+				vec![
+					StorageEntryMetadata {
+						name: "foo",
+						modifier: StorageEntryModifier::Optional,
+						ty: StorageEntryType::Map {
+							hashers: vec![StorageHasher::Blake2_128Concat],
+							key: scale_info::meta_type::<u16>(),
+							value: scale_info::meta_type::<u32>(),
+						},
+						default: Option::<u32>::None.encode(),
+						docs: vec![],
+					},
+					StorageEntryMetadata {
+						name: "foo",
+						modifier: StorageEntryModifier::Default,
+						ty: StorageEntryType::Map {
+							hashers: vec![StorageHasher::Blake2_128Concat],
+							key: scale_info::meta_type::<u16>(),
+							value: scale_info::meta_type::<u32>(),
+						},
+						default: 97u32.encode(),
+						docs: vec![],
+					}
+				]
 			);
-			assert_eq!(A::NAME, "foo");
-			assert_eq!(AValueQueryWithAnOnEmpty::default(), 97u32.encode());
-			assert_eq!(A::default(), Option::<u32>::None.encode());
 
 			WithLen::remove_all(None);
 			assert_eq!(WithLen::decode_len(3), None);
diff --git a/frame/support/src/storage/types/mod.rs b/frame/support/src/storage/types/mod.rs
index 76fed0b8cb32..bcab996f6832 100644
--- a/frame/support/src/storage/types/mod.rs
+++ b/frame/support/src/storage/types/mod.rs
@@ -18,16 +18,18 @@
 //! Storage types to build abstraction on storage, they implements storage traits such as
 //! StorageMap and others.
 
-use crate::metadata::{StorageEntryModifier, StorageEntryType};
+use crate::metadata::{StorageEntryMetadata, StorageEntryModifier};
 use codec::FullCodec;
 use sp_std::prelude::*;
 
+mod counted_map;
 mod double_map;
 mod key;
 mod map;
 mod nmap;
 mod value;
 
+pub use counted_map::{CountedStorageMap, CountedStorageMapInstance};
 pub use double_map::StorageDoubleMap;
 pub use key::{
 	EncodeLikeTuple, HasKeyPrefix, HasReversibleKeyPrefix, Key, KeyGenerator,
@@ -103,13 +105,10 @@ where
 	}
 }
 
-/// Provide metadata for a storage entry.
+/// Build the metadata of a storage.
 ///
-/// Implemented by each of the storage entry kinds: value, map, doublemap and nmap.
-pub trait StorageEntryMetadata {
-	const MODIFIER: StorageEntryModifier;
-	const NAME: &'static str;
-
-	fn ty() -> StorageEntryType;
-	fn default() -> Vec<u8>;
+/// Implemented by each of the storage types: value, map, countedmap, doublemap and nmap.
+pub trait StorageEntryMetadataBuilder {
+	/// Build into `entries` the storage metadata entries of a storage given some `docs`.
+	fn build_metadata(doc: Vec<&'static str>, entries: &mut Vec<StorageEntryMetadata>);
 }
diff --git a/frame/support/src/storage/types/nmap.rs b/frame/support/src/storage/types/nmap.rs
index 7048a69d59c2..96d6f383ae11 100755
--- a/frame/support/src/storage/types/nmap.rs
+++ b/frame/support/src/storage/types/nmap.rs
@@ -19,11 +19,11 @@
 //! StoragePrefixedDoubleMap traits and their methods directly.
 
 use crate::{
-	metadata::{StorageEntryModifier, StorageEntryType},
+	metadata::{StorageEntryMetadata, StorageEntryType},
 	storage::{
 		types::{
 			EncodeLikeTuple, HasKeyPrefix, HasReversibleKeyPrefix, OptionQuery, QueryKindTrait,
-			StorageEntryMetadata, TupleToEncodedIter,
+			StorageEntryMetadataBuilder, TupleToEncodedIter,
 		},
 		KeyGenerator, PrefixIterator, StorageAppend, StorageDecodeLength, StoragePrefixedMap,
 	},
@@ -440,7 +440,7 @@ where
 	}
 }
 
-impl<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues> StorageEntryMetadata
+impl<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues> StorageEntryMetadataBuilder
 	for StorageNMap<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues>
 where
 	Prefix: StorageInstance,
@@ -450,19 +450,20 @@ where
 	OnEmpty: Get<QueryKind::Query> + 'static,
 	MaxValues: Get<Option<u32>>,
 {
-	const MODIFIER: StorageEntryModifier = QueryKind::METADATA;
-	const NAME: &'static str = Prefix::STORAGE_PREFIX;
-
-	fn ty() -> StorageEntryType {
-		StorageEntryType::Map {
-			key: scale_info::meta_type::<Key::Key>(),
-			hashers: Key::HASHER_METADATA.iter().cloned().collect(),
-			value: scale_info::meta_type::<Value>(),
-		}
-	}
-
-	fn default() -> Vec<u8> {
-		OnEmpty::get().encode()
+	fn build_metadata(docs: Vec<&'static str>, entries: &mut Vec<StorageEntryMetadata>) {
+		let entry = StorageEntryMetadata {
+			name: Prefix::STORAGE_PREFIX,
+			modifier: QueryKind::METADATA,
+			ty: StorageEntryType::Map {
+				key: scale_info::meta_type::<Key::Key>(),
+				hashers: Key::HASHER_METADATA.iter().cloned().collect(),
+				value: scale_info::meta_type::<Value>(),
+			},
+			default: OnEmpty::get().encode(),
+			docs,
+		};
+
+		entries.push(entry);
 	}
 }
 
@@ -516,8 +517,8 @@ where
 mod test {
 	use super::*;
 	use crate::{
-		hash::*,
-		metadata::StorageEntryModifier,
+		hash::{StorageHasher as _, *},
+		metadata::{StorageEntryModifier, StorageHasher},
 		storage::types::{Key, ValueQuery},
 	};
 	use sp_io::{hashing::twox_128, TestExternalities};
@@ -684,11 +685,36 @@ mod test {
 			A::translate::<u8, _>(|k1, v| Some((k1 as u16 * v as u16).into()));
 			assert_eq!(A::iter().collect::<Vec<_>>(), vec![(4, 40), (3, 30)]);
 
-			assert_eq!(A::MODIFIER, StorageEntryModifier::Optional);
-			assert_eq!(AValueQueryWithAnOnEmpty::MODIFIER, StorageEntryModifier::Default);
-			assert_eq!(A::NAME, "Foo");
-			assert_eq!(AValueQueryWithAnOnEmpty::default(), 98u32.encode());
-			assert_eq!(A::default(), Option::<u32>::None.encode());
+			let mut entries = vec![];
+			A::build_metadata(vec![], &mut entries);
+			AValueQueryWithAnOnEmpty::build_metadata(vec![], &mut entries);
+			assert_eq!(
+				entries,
+				vec![
+					StorageEntryMetadata {
+						name: "Foo",
+						modifier: StorageEntryModifier::Optional,
+						ty: StorageEntryType::Map {
+							hashers: vec![StorageHasher::Blake2_128Concat],
+							key: scale_info::meta_type::<u16>(),
+							value: scale_info::meta_type::<u32>(),
+						},
+						default: Option::<u32>::None.encode(),
+						docs: vec![],
+					},
+					StorageEntryMetadata {
+						name: "Foo",
+						modifier: StorageEntryModifier::Default,
+						ty: StorageEntryType::Map {
+							hashers: vec![StorageHasher::Blake2_128Concat],
+							key: scale_info::meta_type::<u16>(),
+							value: scale_info::meta_type::<u32>(),
+						},
+						default: 98u32.encode(),
+						docs: vec![],
+					}
+				]
+			);
 
 			WithLen::remove_all(None);
 			assert_eq!(WithLen::decode_len((3,)), None);
@@ -852,11 +878,42 @@ mod test {
 			A::translate::<u8, _>(|(k1, k2), v| Some((k1 * k2 as u16 * v as u16).into()));
 			assert_eq!(A::iter().collect::<Vec<_>>(), vec![((4, 40), 1600), ((3, 30), 900)]);
 
-			assert_eq!(A::MODIFIER, StorageEntryModifier::Optional);
-			assert_eq!(AValueQueryWithAnOnEmpty::MODIFIER, StorageEntryModifier::Default);
-			assert_eq!(A::NAME, "Foo");
-			assert_eq!(AValueQueryWithAnOnEmpty::default(), 98u32.encode());
-			assert_eq!(A::default(), Option::<u32>::None.encode());
+			let mut entries = vec![];
+			A::build_metadata(vec![], &mut entries);
+			AValueQueryWithAnOnEmpty::build_metadata(vec![], &mut entries);
+			assert_eq!(
+				entries,
+				vec![
+					StorageEntryMetadata {
+						name: "Foo",
+						modifier: StorageEntryModifier::Optional,
+						ty: StorageEntryType::Map {
+							hashers: vec![
+								StorageHasher::Blake2_128Concat,
+								StorageHasher::Twox64Concat
+							],
+							key: scale_info::meta_type::<(u16, u8)>(),
+							value: scale_info::meta_type::<u32>(),
+						},
+						default: Option::<u32>::None.encode(),
+						docs: vec![],
+					},
+					StorageEntryMetadata {
+						name: "Foo",
+						modifier: StorageEntryModifier::Default,
+						ty: StorageEntryType::Map {
+							hashers: vec![
+								StorageHasher::Blake2_128Concat,
+								StorageHasher::Twox64Concat
+							],
+							key: scale_info::meta_type::<(u16, u8)>(),
+							value: scale_info::meta_type::<u32>(),
+						},
+						default: 98u32.encode(),
+						docs: vec![],
+					}
+				]
+			);
 
 			WithLen::remove_all(None);
 			assert_eq!(WithLen::decode_len((3, 30)), None);
@@ -1042,11 +1099,44 @@ mod test {
 			});
 			assert_eq!(A::iter().collect::<Vec<_>>(), vec![((4, 40, 400), 4), ((3, 30, 300), 3)]);
 
-			assert_eq!(A::MODIFIER, StorageEntryModifier::Optional);
-			assert_eq!(AValueQueryWithAnOnEmpty::MODIFIER, StorageEntryModifier::Default);
-			assert_eq!(A::NAME, "Foo");
-			assert_eq!(AValueQueryWithAnOnEmpty::default(), 98u32.encode());
-			assert_eq!(A::default(), Option::<u32>::None.encode());
+			let mut entries = vec![];
+			A::build_metadata(vec![], &mut entries);
+			AValueQueryWithAnOnEmpty::build_metadata(vec![], &mut entries);
+			assert_eq!(
+				entries,
+				vec![
+					StorageEntryMetadata {
+						name: "Foo",
+						modifier: StorageEntryModifier::Optional,
+						ty: StorageEntryType::Map {
+							hashers: vec![
+								StorageHasher::Blake2_128Concat,
+								StorageHasher::Blake2_128Concat,
+								StorageHasher::Twox64Concat
+							],
+							key: scale_info::meta_type::<(u16, u16, u16)>(),
+							value: scale_info::meta_type::<u32>(),
+						},
+						default: Option::<u32>::None.encode(),
+						docs: vec![],
+					},
+					StorageEntryMetadata {
+						name: "Foo",
+						modifier: StorageEntryModifier::Default,
+						ty: StorageEntryType::Map {
+							hashers: vec![
+								StorageHasher::Blake2_128Concat,
+								StorageHasher::Blake2_128Concat,
+								StorageHasher::Twox64Concat
+							],
+							key: scale_info::meta_type::<(u16, u16, u16)>(),
+							value: scale_info::meta_type::<u32>(),
+						},
+						default: 98u32.encode(),
+						docs: vec![],
+					}
+				]
+			);
 
 			WithLen::remove_all(None);
 			assert_eq!(WithLen::decode_len((3, 30, 300)), None);
diff --git a/frame/support/src/storage/types/value.rs b/frame/support/src/storage/types/value.rs
index d7f15487592b..c5e7173bd0af 100644
--- a/frame/support/src/storage/types/value.rs
+++ b/frame/support/src/storage/types/value.rs
@@ -18,10 +18,10 @@
 //! Storage value type. Implements StorageValue trait and its method directly.
 
 use crate::{
-	metadata::{StorageEntryModifier, StorageEntryType},
+	metadata::{StorageEntryMetadata, StorageEntryType},
 	storage::{
 		generator::StorageValue as StorageValueT,
-		types::{OptionQuery, QueryKindTrait, StorageEntryMetadata},
+		types::{OptionQuery, QueryKindTrait, StorageEntryMetadataBuilder},
 		StorageAppend, StorageDecodeLength, StorageTryAppend,
 	},
 	traits::{GetDefault, StorageInfo, StorageInstance},
@@ -201,7 +201,7 @@ where
 	}
 }
 
-impl<Prefix, Value, QueryKind, OnEmpty> StorageEntryMetadata
+impl<Prefix, Value, QueryKind, OnEmpty> StorageEntryMetadataBuilder
 	for StorageValue<Prefix, Value, QueryKind, OnEmpty>
 where
 	Prefix: StorageInstance,
@@ -209,15 +209,16 @@ where
 	QueryKind: QueryKindTrait<Value, OnEmpty>,
 	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
 {
-	const MODIFIER: StorageEntryModifier = QueryKind::METADATA;
-	const NAME: &'static str = Prefix::STORAGE_PREFIX;
-
-	fn ty() -> StorageEntryType {
-		StorageEntryType::Plain(scale_info::meta_type::<Value>())
-	}
-
-	fn default() -> Vec<u8> {
-		OnEmpty::get().encode()
+	fn build_metadata(docs: Vec<&'static str>, entries: &mut Vec<StorageEntryMetadata>) {
+		let entry = StorageEntryMetadata {
+			name: Prefix::STORAGE_PREFIX,
+			modifier: QueryKind::METADATA,
+			ty: StorageEntryType::Plain(scale_info::meta_type::<Value>()),
+			default: OnEmpty::get().encode(),
+			docs,
+		};
+
+		entries.push(entry);
 	}
 }
 
@@ -342,11 +343,28 @@ mod test {
 			A::kill();
 			assert_eq!(A::try_get(), Err(()));
 
-			assert_eq!(A::MODIFIER, StorageEntryModifier::Optional);
-			assert_eq!(AValueQueryWithAnOnEmpty::MODIFIER, StorageEntryModifier::Default);
-			assert_eq!(A::NAME, "foo");
-			assert_eq!(A::default(), Option::<u32>::None.encode());
-			assert_eq!(AValueQueryWithAnOnEmpty::default(), 97u32.encode());
+			let mut entries = vec![];
+			A::build_metadata(vec![], &mut entries);
+			AValueQueryWithAnOnEmpty::build_metadata(vec![], &mut entries);
+			assert_eq!(
+				entries,
+				vec![
+					StorageEntryMetadata {
+						name: "foo",
+						modifier: StorageEntryModifier::Optional,
+						ty: StorageEntryType::Plain(scale_info::meta_type::<u32>()),
+						default: Option::<u32>::None.encode(),
+						docs: vec![],
+					},
+					StorageEntryMetadata {
+						name: "foo",
+						modifier: StorageEntryModifier::Default,
+						ty: StorageEntryType::Plain(scale_info::meta_type::<u32>()),
+						default: 97u32.encode(),
+						docs: vec![],
+					}
+				]
+			);
 
 			WithLen::kill();
 			assert_eq!(WithLen::decode_len(), None);
diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index 2874ef6bd768..6a9a18ea48d4 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -323,6 +323,12 @@ pub mod pallet {
 	pub type ConditionalNMap<T> =
 		StorageNMap<_, (storage::Key<Blake2_128Concat, u8>, storage::Key<Twox64Concat, u16>), u32>;
 
+	#[pallet::storage]
+	#[pallet::storage_prefix = "RenamedCountedMap"]
+	#[pallet::getter(fn counted_storage_map)]
+	pub type SomeCountedStorageMap<T> =
+		CountedStorageMap<Hasher = Twox64Concat, Key = u8, Value = u32>;
+
 	#[pallet::genesis_config]
 	#[derive(Default)]
 	pub struct GenesisConfig {
@@ -416,6 +422,7 @@ pub mod pallet {
 }
 
 // Test that a pallet with non generic event and generic genesis_config is correctly handled
+// and that a pallet without the attribute generate_storage_info is correctly handled.
 #[frame_support::pallet]
 pub mod pallet2 {
 	use super::{SomeAssociation1, SomeType1};
@@ -446,6 +453,10 @@ pub mod pallet2 {
 	#[pallet::storage]
 	pub type SomeValue<T: Config> = StorageValue<_, Vec<u32>>;
 
+	#[pallet::storage]
+	pub type SomeCountedStorageMap<T> =
+		CountedStorageMap<Hasher = Twox64Concat, Key = u8, Value = u32>;
+
 	#[pallet::event]
 	pub enum Event {
 		/// Something
@@ -899,6 +910,13 @@ fn storage_expand() {
 			pallet::ConditionalDoubleMap::<Runtime>::insert(1, 2, 3);
 			pallet::ConditionalNMap::<Runtime>::insert((1, 2), 3);
 		}
+
+		pallet::SomeCountedStorageMap::<Runtime>::insert(1, 2);
+		let mut k = [twox_128(b"Example"), twox_128(b"RenamedCountedMap")].concat();
+		k.extend(1u8.using_encoded(twox_64_concat));
+		assert_eq!(unhashed::get::<u32>(&k), Some(2u32));
+		let k = [twox_128(b"Example"), twox_128(b"CounterForRenamedCountedMap")].concat();
+		assert_eq!(unhashed::get::<u32>(&k), Some(1u32));
 	})
 }
 
@@ -1180,6 +1198,24 @@ fn metadata() {
 						default: vec![0],
 						docs: vec![],
 					},
+					StorageEntryMetadata {
+						name: "RenamedCountedMap",
+						modifier: StorageEntryModifier::Optional,
+						ty: StorageEntryType::Map {
+							hashers: vec![StorageHasher::Twox64Concat],
+							key: meta_type::<u8>(),
+							value: meta_type::<u32>(),
+						},
+						default: vec![0],
+						docs: vec![],
+					},
+					StorageEntryMetadata {
+						name: "CounterForRenamedCountedMap",
+						modifier: StorageEntryModifier::Default,
+						ty: StorageEntryType::Plain(meta_type::<u32>()),
+						default: vec![0, 0, 0, 0],
+						docs: vec!["Counter for the related counted storage map"],
+					},
 				],
 			}),
 			calls: Some(meta_type::<pallet::Call<Runtime>>().into()),
@@ -1370,6 +1406,24 @@ fn metadata() {
 						default: vec![0],
 						docs: vec![],
 					},
+					StorageEntryMetadata {
+						name: "RenamedCountedMap",
+						modifier: StorageEntryModifier::Optional,
+						ty: StorageEntryType::Map {
+							hashers: vec![StorageHasher::Twox64Concat],
+							key: meta_type::<u8>(),
+							value: meta_type::<u32>(),
+						},
+						default: vec![0],
+						docs: vec![],
+					},
+					StorageEntryMetadata {
+						name: "CounterForRenamedCountedMap",
+						modifier: StorageEntryModifier::Default,
+						ty: StorageEntryType::Plain(meta_type::<u32>()),
+						default: vec![0, 0, 0, 0],
+						docs: vec!["Counter for the related counted storage map"],
+					},
 				],
 			}),
 			calls: Some(meta_type::<pallet::Call<Runtime>>().into()),
@@ -1577,17 +1631,47 @@ fn test_storage_info() {
 					max_size: Some(7 + 16 + 8),
 				}
 			},
+			StorageInfo {
+				pallet_name: b"Example".to_vec(),
+				storage_name: b"RenamedCountedMap".to_vec(),
+				prefix: prefix(b"Example", b"RenamedCountedMap").to_vec(),
+				max_values: None,
+				max_size: Some(1 + 4 + 8),
+			},
+			StorageInfo {
+				pallet_name: b"Example".to_vec(),
+				storage_name: b"CounterForRenamedCountedMap".to_vec(),
+				prefix: prefix(b"Example", b"CounterForRenamedCountedMap").to_vec(),
+				max_values: Some(1),
+				max_size: Some(4),
+			},
 		],
 	);
 
 	assert_eq!(
 		Example2::storage_info(),
-		vec![StorageInfo {
-			pallet_name: b"Example2".to_vec(),
-			storage_name: b"SomeValue".to_vec(),
-			prefix: prefix(b"Example2", b"SomeValue").to_vec(),
-			max_values: Some(1),
-			max_size: None,
-		},],
+		vec![
+			StorageInfo {
+				pallet_name: b"Example2".to_vec(),
+				storage_name: b"SomeValue".to_vec(),
+				prefix: prefix(b"Example2", b"SomeValue").to_vec(),
+				max_values: Some(1),
+				max_size: None,
+			},
+			StorageInfo {
+				pallet_name: b"Example2".to_vec(),
+				storage_name: b"SomeCountedStorageMap".to_vec(),
+				prefix: prefix(b"Example2", b"SomeCountedStorageMap").to_vec(),
+				max_values: None,
+				max_size: None,
+			},
+			StorageInfo {
+				pallet_name: b"Example2".to_vec(),
+				storage_name: b"CounterForSomeCountedStorageMap".to_vec(),
+				prefix: prefix(b"Example2", b"CounterForSomeCountedStorageMap").to_vec(),
+				max_values: Some(1),
+				max_size: Some(4),
+			},
+		],
 	);
 }
diff --git a/frame/support/test/tests/pallet_ui/duplicate_storage_prefix.rs b/frame/support/test/tests/pallet_ui/duplicate_storage_prefix.rs
index d103fa09d991..5e99c84050c9 100644
--- a/frame/support/test/tests/pallet_ui/duplicate_storage_prefix.rs
+++ b/frame/support/test/tests/pallet_ui/duplicate_storage_prefix.rs
@@ -1,6 +1,6 @@
 #[frame_support::pallet]
 mod pallet {
-	use frame_support::pallet_prelude::StorageValue;
+	use frame_support::pallet_prelude::*;
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {}
@@ -12,9 +12,15 @@ mod pallet {
 	#[pallet::storage]
 	type Foo<T> = StorageValue<_, u8>;
 
-    #[pallet::storage]
-    #[pallet::storage_prefix = "Foo"]
-    type NotFoo<T> = StorageValue<_, u16>;
+	#[pallet::storage]
+	#[pallet::storage_prefix = "Foo"]
+	type NotFoo<T> = StorageValue<_, u16>;
+
+	#[pallet::storage]
+	type CounterForBar<T> = StorageValue<_, u16>;
+
+	#[pallet::storage]
+	type Bar<T> = CountedStorageMap<_, Twox64Concat, u16, u16>;
 }
 
 fn main() {
diff --git a/frame/support/test/tests/pallet_ui/duplicate_storage_prefix.stderr b/frame/support/test/tests/pallet_ui/duplicate_storage_prefix.stderr
index 63a6e71e4404..716888c9d8b6 100644
--- a/frame/support/test/tests/pallet_ui/duplicate_storage_prefix.stderr
+++ b/frame/support/test/tests/pallet_ui/duplicate_storage_prefix.stderr
@@ -1,17 +1,47 @@
 error: Duplicate storage prefixes found for `Foo`
-  --> $DIR/duplicate_storage_prefix.rs:16:32
+  --> $DIR/duplicate_storage_prefix.rs:16:29
    |
 16 |     #[pallet::storage_prefix = "Foo"]
    |                                ^^^^^
 
+error: Duplicate storage prefixes found for `Foo`
+  --> $DIR/duplicate_storage_prefix.rs:13:7
+   |
+13 |     type Foo<T> = StorageValue<_, u8>;
+   |          ^^^
+
+error: Duplicate storage prefixes found for `CounterForBar`, used for counter associated to counted storage map
+  --> $DIR/duplicate_storage_prefix.rs:23:7
+   |
+23 |     type Bar<T> = CountedStorageMap<_, Twox64Concat, u16, u16>;
+   |          ^^^
+
+error: Duplicate storage prefixes found for `CounterForBar`
+  --> $DIR/duplicate_storage_prefix.rs:20:7
+   |
+20 |     type CounterForBar<T> = StorageValue<_, u16>;
+   |          ^^^^^^^^^^^^^
+
 error[E0412]: cannot find type `_GeneratedPrefixForStorageFoo` in this scope
   --> $DIR/duplicate_storage_prefix.rs:13:7
    |
 13 |     type Foo<T> = StorageValue<_, u8>;
    |          ^^^ not found in this scope
 
-error[E0121]: the type placeholder `_` is not allowed within types on item signatures
-  --> $DIR/duplicate_storage_prefix.rs:17:35
+error[E0412]: cannot find type `_GeneratedPrefixForStorageNotFoo` in this scope
+  --> $DIR/duplicate_storage_prefix.rs:17:7
    |
 17 |     type NotFoo<T> = StorageValue<_, u16>;
-   |                                   ^ not allowed in type signatures
+   |          ^^^^^^ not found in this scope
+
+error[E0412]: cannot find type `_GeneratedPrefixForStorageCounterForBar` in this scope
+  --> $DIR/duplicate_storage_prefix.rs:20:7
+   |
+20 |     type CounterForBar<T> = StorageValue<_, u16>;
+   |          ^^^^^^^^^^^^^ not found in this scope
+
+error[E0412]: cannot find type `_GeneratedPrefixForStorageBar` in this scope
+  --> $DIR/duplicate_storage_prefix.rs:23:7
+   |
+23 |     type Bar<T> = CountedStorageMap<_, Twox64Concat, u16, u16>;
+   |          ^^^ not found in this scope
diff --git a/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.stderr b/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.stderr
index e78eb7ff9537..239de4dba949 100644
--- a/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.stderr
+++ b/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.stderr
@@ -5,8 +5,8 @@ error[E0277]: the trait bound `Bar: TypeInfo` is not satisfied
    |               ^^^^^^^ the trait `TypeInfo` is not implemented for `Bar`
    |
    = note: required because of the requirements on the impl of `StaticTypeInfo` for `Bar`
-   = note: required because of the requirements on the impl of `frame_support::storage::StorageEntryMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
-   = note: required by `NAME`
+   = note: required because of the requirements on the impl of `StorageEntryMetadataBuilder` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+   = note: required by `build_metadata`
 
 error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
   --> $DIR/storage_ensure_span_are_ok_on_wrong_gen.rs:20:12
@@ -16,8 +16,8 @@ error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
    |
    = note: required because of the requirements on the impl of `Decode` for `Bar`
    = note: required because of the requirements on the impl of `FullCodec` for `Bar`
-   = note: required because of the requirements on the impl of `frame_support::storage::StorageEntryMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
-   = note: required by `NAME`
+   = note: required because of the requirements on the impl of `StorageEntryMetadataBuilder` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+   = note: required by `build_metadata`
 
 error[E0277]: the trait bound `Bar: EncodeLike` is not satisfied
   --> $DIR/storage_ensure_span_are_ok_on_wrong_gen.rs:20:12
@@ -27,8 +27,8 @@ error[E0277]: the trait bound `Bar: EncodeLike` is not satisfied
    |
    = note: required because of the requirements on the impl of `FullEncode` for `Bar`
    = note: required because of the requirements on the impl of `FullCodec` for `Bar`
-   = note: required because of the requirements on the impl of `frame_support::storage::StorageEntryMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
-   = note: required by `NAME`
+   = note: required because of the requirements on the impl of `StorageEntryMetadataBuilder` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+   = note: required by `build_metadata`
 
 error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
   --> $DIR/storage_ensure_span_are_ok_on_wrong_gen.rs:20:12
@@ -39,8 +39,8 @@ error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
    = note: required because of the requirements on the impl of `Encode` for `Bar`
    = note: required because of the requirements on the impl of `FullEncode` for `Bar`
    = note: required because of the requirements on the impl of `FullCodec` for `Bar`
-   = note: required because of the requirements on the impl of `frame_support::storage::StorageEntryMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
-   = note: required by `NAME`
+   = note: required because of the requirements on the impl of `StorageEntryMetadataBuilder` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+   = note: required by `build_metadata`
 
 error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
  --> $DIR/storage_ensure_span_are_ok_on_wrong_gen.rs:9:12
diff --git a/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.stderr b/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.stderr
index d9a7ddbf3443..a5bf32a0ef2d 100644
--- a/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.stderr
+++ b/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.stderr
@@ -5,8 +5,8 @@ error[E0277]: the trait bound `Bar: TypeInfo` is not satisfied
    |               ^^^^^^^ the trait `TypeInfo` is not implemented for `Bar`
    |
    = note: required because of the requirements on the impl of `StaticTypeInfo` for `Bar`
-   = note: required because of the requirements on the impl of `frame_support::storage::StorageEntryMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
-   = note: required by `NAME`
+   = note: required because of the requirements on the impl of `StorageEntryMetadataBuilder` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+   = note: required by `build_metadata`
 
 error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
   --> $DIR/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:20:12
@@ -16,8 +16,8 @@ error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
    |
    = note: required because of the requirements on the impl of `Decode` for `Bar`
    = note: required because of the requirements on the impl of `FullCodec` for `Bar`
-   = note: required because of the requirements on the impl of `frame_support::storage::StorageEntryMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
-   = note: required by `NAME`
+   = note: required because of the requirements on the impl of `StorageEntryMetadataBuilder` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+   = note: required by `build_metadata`
 
 error[E0277]: the trait bound `Bar: EncodeLike` is not satisfied
   --> $DIR/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:20:12
@@ -27,8 +27,8 @@ error[E0277]: the trait bound `Bar: EncodeLike` is not satisfied
    |
    = note: required because of the requirements on the impl of `FullEncode` for `Bar`
    = note: required because of the requirements on the impl of `FullCodec` for `Bar`
-   = note: required because of the requirements on the impl of `frame_support::storage::StorageEntryMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
-   = note: required by `NAME`
+   = note: required because of the requirements on the impl of `StorageEntryMetadataBuilder` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+   = note: required by `build_metadata`
 
 error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
   --> $DIR/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:20:12
@@ -39,8 +39,8 @@ error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
    = note: required because of the requirements on the impl of `Encode` for `Bar`
    = note: required because of the requirements on the impl of `FullEncode` for `Bar`
    = note: required because of the requirements on the impl of `FullCodec` for `Bar`
-   = note: required because of the requirements on the impl of `frame_support::storage::StorageEntryMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
-   = note: required by `NAME`
+   = note: required because of the requirements on the impl of `StorageEntryMetadataBuilder` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+   = note: required by `build_metadata`
 
 error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
  --> $DIR/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:9:12
diff --git a/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.stderr b/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.stderr
index 545520124bfe..6c92423c6a7f 100644
--- a/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.stderr
+++ b/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.stderr
@@ -4,6 +4,6 @@ error[E0277]: the trait bound `Bar: MaxEncodedLen` is not satisfied
 10 |     #[pallet::generate_storage_info]
    |               ^^^^^^^^^^^^^^^^^^^^^ the trait `MaxEncodedLen` is not implemented for `Bar`
    |
-   = note: required because of the requirements on the impl of `KeyGeneratorMaxEncodedLen` for `NMapKey<frame_support::Twox64Concat, Bar>`
-   = note: required because of the requirements on the impl of `StorageInfoTrait` for `frame_support::pallet_prelude::StorageNMap<_GeneratedPrefixForStorageFoo<T>, NMapKey<frame_support::Twox64Concat, Bar>, u32>`
+   = note: required because of the requirements on the impl of `KeyGeneratorMaxEncodedLen` for `Key<frame_support::Twox64Concat, Bar>`
+   = note: required because of the requirements on the impl of `StorageInfoTrait` for `frame_support::pallet_prelude::StorageNMap<_GeneratedPrefixForStorageFoo<T>, Key<frame_support::Twox64Concat, Bar>, u32>`
    = note: required by `storage_info`

From d67e5f4a8d27206c7b473fa6a9218c1a34ffa29b Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Thu, 16 Sep 2021 09:21:33 -0400
Subject: [PATCH 1191/1194] Fix Spellcheck for Template (#9795)

---
 utils/frame/benchmarking-cli/src/template.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/frame/benchmarking-cli/src/template.hbs b/utils/frame/benchmarking-cli/src/template.hbs
index 4acb8c7baa23..36abf27f59a6 100644
--- a/utils/frame/benchmarking-cli/src/template.hbs
+++ b/utils/frame/benchmarking-cli/src/template.hbs
@@ -17,7 +17,7 @@
 use frame_support::{traits::Get, weights::Weight};
 use sp_std::marker::PhantomData;
 
-/// Weight functions for {{pallet}}.
+/// Weight functions for `{{pallet}}`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> {{pallet}}::WeightInfo for WeightInfo<T> {
 	{{~#each benchmarks as |benchmark|}}

From 25eb7ac459211d8f06a98713d9ef60a4f7dd6b69 Mon Sep 17 00:00:00 2001
From: Roman <humbug@deeptown.org>
Date: Thu, 16 Sep 2021 17:31:44 +0300
Subject: [PATCH 1192/1194] Reduce the number of types in build_transport for
 transport (#9793)

---
 client/network/src/transport.rs | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/client/network/src/transport.rs b/client/network/src/transport.rs
index 04223c6d6846..3f977a21b116 100644
--- a/client/network/src/transport.rs
+++ b/client/network/src/transport.rs
@@ -58,20 +58,16 @@ pub fn build_transport(
 		let desktop_trans =
 			websocket::WsConfig::new(desktop_trans.clone()).or_transport(desktop_trans);
 		let dns_init = futures::executor::block_on(dns::DnsConfig::system(desktop_trans.clone()));
-		OptionalTransport::some(if let Ok(dns) = dns_init {
+		EitherTransport::Left(if let Ok(dns) = dns_init {
 			EitherTransport::Left(dns)
 		} else {
 			EitherTransport::Right(desktop_trans.map_err(dns::DnsErr::Transport))
 		})
 	} else {
-		// For the in-memory case we set up the transport with an `.or_transport` below.
-		OptionalTransport::none()
+		EitherTransport::Right(OptionalTransport::some(
+			libp2p::core::transport::MemoryTransport::default(),
+		))
 	};
-	let transport = transport.or_transport(if memory_only {
-		OptionalTransport::some(libp2p::core::transport::MemoryTransport::default())
-	} else {
-		OptionalTransport::none()
-	});
 
 	let (transport, bandwidth) = bandwidth::BandwidthLogging::new(transport);
 

From 95a5337c33ff6123918720ef3c11493628bca5b9 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Thu, 16 Sep 2021 14:36:26 -0400
Subject: [PATCH 1193/1194] Add Force Unreserve to Balances (#9764)

* force unreserve

* add benchmark

* cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs

Co-authored-by: Parity Bot <admin@parity.io>
---
 frame/balances/src/benchmarking.rs | 20 +++++++++++++++
 frame/balances/src/lib.rs          | 22 ++++++++++++++---
 frame/balances/src/weights.rs      | 39 ++++++++++++++++++++----------
 3 files changed, 65 insertions(+), 16 deletions(-)

diff --git a/frame/balances/src/benchmarking.rs b/frame/balances/src/benchmarking.rs
index 97c3c4309a80..06d202ea3700 100644
--- a/frame/balances/src/benchmarking.rs
+++ b/frame/balances/src/benchmarking.rs
@@ -195,6 +195,26 @@ benchmarks_instance_pallet! {
 		assert!(Balances::<T, I>::free_balance(&caller).is_zero());
 		assert_eq!(Balances::<T, I>::free_balance(&recipient), balance);
 	}
+
+	force_unreserve {
+		let user: T::AccountId = account("user", 0, SEED);
+		let user_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(user.clone());
+
+		// Give some multiple of the existential deposit
+		let existential_deposit = T::ExistentialDeposit::get();
+		let balance = existential_deposit.saturating_mul(ED_MULTIPLIER.into());
+		let _ = <Balances<T, I> as Currency<_>>::make_free_balance_be(&user, balance);
+
+		// Reserve the balance
+		<Balances<T, I> as ReservableCurrency<_>>::reserve(&user, balance)?;
+		assert_eq!(Balances::<T, I>::reserved_balance(&user), balance);
+		assert!(Balances::<T, I>::free_balance(&user).is_zero());
+
+	}: _(RawOrigin::Root, user_lookup, balance)
+	verify {
+		assert!(Balances::<T, I>::reserved_balance(&user).is_zero());
+		assert_eq!(Balances::<T, I>::free_balance(&user), balance);
+	}
 }
 
 impl_benchmark_test_suite!(
diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index f7102ad4895f..afd2331c8e3c 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -167,6 +167,7 @@ use codec::{Codec, Decode, Encode, MaxEncodedLen};
 use frame_support::traits::GenesisBuild;
 use frame_support::{
 	ensure,
+	pallet_prelude::DispatchResult,
 	traits::{
 		tokens::{fungible, BalanceStatus as Status, DepositConsequence, WithdrawConsequence},
 		Currency, ExistenceRequirement,
@@ -183,7 +184,7 @@ use sp_runtime::{
 		AtLeast32BitUnsigned, Bounded, CheckedAdd, CheckedSub, MaybeSerializeDeserialize,
 		Saturating, StaticLookup, Zero,
 	},
-	ArithmeticError, DispatchError, DispatchResult, RuntimeDebug,
+	ArithmeticError, DispatchError, RuntimeDebug,
 };
 use sp_std::{cmp, fmt::Debug, mem, ops::BitOr, prelude::*, result};
 pub use weights::WeightInfo;
@@ -419,7 +420,7 @@ pub mod pallet {
 			origin: OriginFor<T>,
 			dest: <T::Lookup as StaticLookup>::Source,
 			keep_alive: bool,
-		) -> DispatchResultWithPostInfo {
+		) -> DispatchResult {
 			use fungible::Inspect;
 			let transactor = ensure_signed(origin)?;
 			let reducible_balance = Self::reducible_balance(&transactor, keep_alive);
@@ -431,7 +432,22 @@ pub mod pallet {
 				reducible_balance,
 				keep_alive.into(),
 			)?;
-			Ok(().into())
+			Ok(())
+		}
+
+		/// Unreserve some balance from a user by force.
+		///
+		/// Can only be called by ROOT.
+		#[pallet::weight(T::WeightInfo::force_unreserve())]
+		pub fn force_unreserve(
+			origin: OriginFor<T>,
+			who: <T::Lookup as StaticLookup>::Source,
+			amount: T::Balance,
+		) -> DispatchResult {
+			ensure_root(origin)?;
+			let who = T::Lookup::lookup(who)?;
+			let _leftover = <Self as ReservableCurrency<_>>::unreserve(&who, amount);
+			Ok(())
 		}
 	}
 
diff --git a/frame/balances/src/weights.rs b/frame/balances/src/weights.rs
index 9fce8d4fde26..6f333bfc0500 100644
--- a/frame/balances/src/weights.rs
+++ b/frame/balances/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_balances
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-09-13, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -51,6 +51,7 @@ pub trait WeightInfo {
 	fn set_balance_killing() -> Weight;
 	fn force_transfer() -> Weight;
 	fn transfer_all() -> Weight;
+	fn force_unreserve() -> Weight;
 }
 
 /// Weights for pallet_balances using the Substrate node and recommended hardware.
@@ -58,37 +59,43 @@ pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:1)
 	fn transfer() -> Weight {
-		(72_229_000 as Weight)
+		(70_952_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: System Account (r:1 w:1)
 	fn transfer_keep_alive() -> Weight {
-		(55_013_000 as Weight)
+		(54_410_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: System Account (r:1 w:1)
 	fn set_balance_creating() -> Weight {
-		(29_404_000 as Weight)
+		(29_176_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: System Account (r:1 w:1)
 	fn set_balance_killing() -> Weight {
-		(36_311_000 as Weight)
+		(35_214_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: System Account (r:2 w:2)
 	fn force_transfer() -> Weight {
-		(73_125_000 as Weight)
+		(71_780_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	// Storage: System Account (r:1 w:1)
 	fn transfer_all() -> Weight {
-		(67_749_000 as Weight)
+		(66_475_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(1 as Weight))
+			.saturating_add(T::DbWeight::get().writes(1 as Weight))
+	}
+	// Storage: System Account (r:1 w:1)
+	fn force_unreserve() -> Weight {
+		(27_766_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -98,37 +105,43 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 impl WeightInfo for () {
 	// Storage: System Account (r:1 w:1)
 	fn transfer() -> Weight {
-		(72_229_000 as Weight)
+		(70_952_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: System Account (r:1 w:1)
 	fn transfer_keep_alive() -> Weight {
-		(55_013_000 as Weight)
+		(54_410_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: System Account (r:1 w:1)
 	fn set_balance_creating() -> Weight {
-		(29_404_000 as Weight)
+		(29_176_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: System Account (r:1 w:1)
 	fn set_balance_killing() -> Weight {
-		(36_311_000 as Weight)
+		(35_214_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: System Account (r:2 w:2)
 	fn force_transfer() -> Weight {
-		(73_125_000 as Weight)
+		(71_780_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	// Storage: System Account (r:1 w:1)
 	fn transfer_all() -> Weight {
-		(67_749_000 as Weight)
+		(66_475_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
+	}
+	// Storage: System Account (r:1 w:1)
+	fn force_unreserve() -> Weight {
+		(27_766_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}

From 88b4fc861129b63b445492e3088d7f12382f0128 Mon Sep 17 00:00:00 2001
From: Sergejs Kostjucenko <85877331+sergejparity@users.noreply.github.com>
Date: Thu, 16 Sep 2021 23:50:43 +0300
Subject: [PATCH 1194/1194] Fix buildah login (#9786)

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bfdb5bb3d092..ecafc9338a58 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -662,8 +662,8 @@ build-rustdoc:
         --tag "$IMAGE_NAME:$VERSION"
         --tag "$IMAGE_NAME:latest"
         --file "$DOCKERFILE" .
-    - echo "$DOCKER_HUB_USER" |
-        buildah login --username "$DOCKER_HUB_PASS" --password-stdin docker.io
+    - echo "$DOCKER_HUB_PASS" |
+        buildah login --username "$DOCKER_HUB_USER" --password-stdin docker.io
     - buildah info
     - buildah push --format=v2s2 "$IMAGE_NAME:$VERSION"
     - buildah push --format=v2s2 "$IMAGE_NAME:latest"